diff --git a/client.txt b/client.txt
index a71c154..1f1d2d7 100644
--- a/client.txt
+++ b/client.txt
@@ -1,8 +1,8 @@
 # (c) 2019 Microsoft Corporation.  All rights reserved.  This information is provided "as-is" and you bear the risk of using it. This information does not provide you with any legal rights to any intellectual property in any Microsoft product. You may copy and use this information for your internal, reference purposes. Microsoft makes no warranties, express or implied, with respect to the information provided here.
-com.mojang.blaze3d.Blaze3D -> cwr:
+com.mojang.blaze3d.Blaze3D -> dfs:
     21:22:void youJustLostTheGame() -> a
     25:25:double getTime() -> b
-com.mojang.blaze3d.audio.Channel -> cws:
+com.mojang.blaze3d.audio.Channel -> dft:
     org.apache.logging.log4j.Logger LOGGER -> a
     int source -> b
     java.util.concurrent.atomic.AtomicBoolean initialized -> c
@@ -33,7 +33,7 @@ com.mojang.blaze3d.audio.Channel -> cws:
     154:154:void lambda$pumpBuffers$1(int) -> b
     133:133:void lambda$attachStaticBuffer$0(int) -> c
     17:17:void <clinit>() -> <clinit>
-com.mojang.blaze3d.audio.Library -> cwt:
+com.mojang.blaze3d.audio.Library -> dfu:
     org.apache.logging.log4j.Logger LOGGER -> a
     long device -> b
     long context -> c
@@ -41,39 +41,40 @@ com.mojang.blaze3d.audio.Library -> cwt:
     com.mojang.blaze3d.audio.Library$ChannelPool staticChannels -> e
     com.mojang.blaze3d.audio.Library$ChannelPool streamingChannels -> f
     com.mojang.blaze3d.audio.Listener listener -> g
-    23:132:void <init>() -> <init>
-    135:170:void init() -> a
-    173:198:int getChannelCount() -> e
-    202:210:long tryOpenDevice() -> f
-    214:221:void cleanup() -> b
-    224:224:com.mojang.blaze3d.audio.Listener getListener() -> c
-    229:229:com.mojang.blaze3d.audio.Channel acquireChannel(com.mojang.blaze3d.audio.Library$Pool) -> a
-    233:236:void releaseChannel(com.mojang.blaze3d.audio.Channel) -> a
-    239:239:java.lang.String getDebugString() -> d
+    23:133:void <init>() -> <init>
+    136:171:void init() -> a
+    174:199:int getChannelCount() -> f
+    203:211:long tryOpenDevice() -> g
+    215:222:void cleanup() -> b
+    225:225:com.mojang.blaze3d.audio.Listener getListener() -> c
+    230:230:com.mojang.blaze3d.audio.Channel acquireChannel(com.mojang.blaze3d.audio.Library$Pool) -> a
+    234:237:void releaseChannel(com.mojang.blaze3d.audio.Channel) -> a
+    240:240:java.lang.String getDebugString() -> d
+    23:23:org.apache.logging.log4j.Logger access$000() -> e
     32:53:void <clinit>() -> <clinit>
-com.mojang.blaze3d.audio.Library$1 -> cwt$1:
+com.mojang.blaze3d.audio.Library$1 -> dfu$1:
     53:53:void <init>() -> <init>
     57:57:com.mojang.blaze3d.audio.Channel acquire() -> a
     62:62:boolean release(com.mojang.blaze3d.audio.Channel) -> a
     67:67:void cleanup() -> b
     71:71:int getMaxCount() -> c
     76:76:int getUsedCount() -> d
-com.mojang.blaze3d.audio.Library$ChannelPool -> cwt$a:
+com.mojang.blaze3d.audio.Library$ChannelPool -> dfu$a:
     com.mojang.blaze3d.audio.Channel acquire() -> a
     boolean release(com.mojang.blaze3d.audio.Channel) -> a
     void cleanup() -> b
     int getMaxCount() -> c
     int getUsedCount() -> d
-com.mojang.blaze3d.audio.Library$CountingChannelPool -> cwt$b:
+com.mojang.blaze3d.audio.Library$CountingChannelPool -> dfu$b:
     int limit -> a
     java.util.Set activeChannels -> b
     82:86:void <init>(int) -> <init>
-    91:100:com.mojang.blaze3d.audio.Channel acquire() -> a
-    105:109:boolean release(com.mojang.blaze3d.audio.Channel) -> a
-    114:116:void cleanup() -> b
-    120:120:int getMaxCount() -> c
-    125:125:int getUsedCount() -> d
-com.mojang.blaze3d.audio.Library$Pool -> cwt$c:
+    91:101:com.mojang.blaze3d.audio.Channel acquire() -> a
+    106:110:boolean release(com.mojang.blaze3d.audio.Channel) -> a
+    115:117:void cleanup() -> b
+    121:121:int getMaxCount() -> c
+    126:126:int getUsedCount() -> d
+com.mojang.blaze3d.audio.Library$Pool -> dfu$c:
     com.mojang.blaze3d.audio.Library$Pool STATIC -> a
     com.mojang.blaze3d.audio.Library$Pool STREAMING -> b
     com.mojang.blaze3d.audio.Library$Pool[] $VALUES -> c
@@ -81,40 +82,42 @@ com.mojang.blaze3d.audio.Library$Pool -> cwt$c:
     26:26:com.mojang.blaze3d.audio.Library$Pool valueOf(java.lang.String) -> valueOf
     26:26:void <init>(java.lang.String,int) -> <init>
     26:28:void <clinit>() -> <clinit>
-com.mojang.blaze3d.audio.Listener -> cwu:
+com.mojang.blaze3d.audio.Listener -> dfv:
     float gain -> a
-    7:8:void <init>() -> <init>
-    11:12:void setListenerPosition(net.minecraft.world.phys.Vec3) -> a
-    15:16:void setListenerOrientation(com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> a
-    19:21:void setGain(float) -> a
-    24:24:float getGain() -> a
-    28:30:void reset() -> b
-com.mojang.blaze3d.audio.OggAudioStream -> cwv:
+    net.minecraft.world.phys.Vec3 position -> b
+    7:9:void <init>() -> <init>
+    12:14:void setListenerPosition(net.minecraft.world.phys.Vec3) -> a
+    17:17:net.minecraft.world.phys.Vec3 getListenerPosition() -> a
+    21:22:void setListenerOrientation(com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> a
+    25:27:void setGain(float) -> a
+    30:30:float getGain() -> b
+    34:36:void reset() -> c
+com.mojang.blaze3d.audio.OggAudioStream -> dfw:
     long handle -> a
     javax.sound.sampled.AudioFormat audioFormat -> b
     java.io.InputStream input -> c
     java.nio.ByteBuffer buffer -> d
-    72:104:void <init>(java.io.InputStream) -> <init>
-    107:123:boolean refillFromStream() -> c
-    128:142:void forwardBuffer() -> d
-    145:191:boolean readFrame(com.mojang.blaze3d.audio.OggAudioStream$OutputConcat) -> a
-    195:198:void convertMono(java.nio.FloatBuffer,com.mojang.blaze3d.audio.OggAudioStream$OutputConcat) -> a
-    201:205:void convertStereo(java.nio.FloatBuffer,java.nio.FloatBuffer,com.mojang.blaze3d.audio.OggAudioStream$OutputConcat) -> a
-    209:215:void close() -> close
-    219:219:javax.sound.sampled.AudioFormat getFormat() -> a
-    225:229:java.nio.ByteBuffer read(int) -> a
-    234:238:java.nio.ByteBuffer readAll() -> b
-com.mojang.blaze3d.audio.OggAudioStream$OutputConcat -> cwv$a:
+    71:103:void <init>(java.io.InputStream) -> <init>
+    106:122:boolean refillFromStream() -> c
+    127:141:void forwardBuffer() -> d
+    144:190:boolean readFrame(com.mojang.blaze3d.audio.OggAudioStream$OutputConcat) -> a
+    194:197:void convertMono(java.nio.FloatBuffer,com.mojang.blaze3d.audio.OggAudioStream$OutputConcat) -> a
+    200:204:void convertStereo(java.nio.FloatBuffer,java.nio.FloatBuffer,com.mojang.blaze3d.audio.OggAudioStream$OutputConcat) -> a
+    208:214:void close() -> close
+    218:218:javax.sound.sampled.AudioFormat getFormat() -> a
+    223:227:java.nio.ByteBuffer read(int) -> a
+    231:235:java.nio.ByteBuffer readAll() -> b
+com.mojang.blaze3d.audio.OggAudioStream$OutputConcat -> dfw$a:
     java.util.List buffers -> a
     int bufferSize -> b
     int byteCount -> c
     java.nio.ByteBuffer currentBuffer -> d
-    27:36:void <init>(int) -> <init>
-    39:40:void createNewBuffer() -> b
-    43:52:void put(float) -> a
-    55:65:java.nio.ByteBuffer get() -> a
-    26:26:int access$000(com.mojang.blaze3d.audio.OggAudioStream$OutputConcat) -> a
-com.mojang.blaze3d.audio.OpenAlUtil -> cww:
+    26:35:void <init>(int) -> <init>
+    38:39:void createNewBuffer() -> b
+    42:51:void put(float) -> a
+    54:64:java.nio.ByteBuffer get() -> a
+    25:25:int access$000(com.mojang.blaze3d.audio.OggAudioStream$OutputConcat) -> a
+com.mojang.blaze3d.audio.OpenAlUtil -> dfx:
     org.apache.logging.log4j.Logger LOGGER -> a
     14:26:java.lang.String alErrorToString(int) -> a
     31:36:boolean checkALError(java.lang.String) -> a
@@ -122,7 +125,7 @@ com.mojang.blaze3d.audio.OpenAlUtil -> cww:
     57:62:boolean checkALCError(long,java.lang.String) -> a
     66:86:int audioFormatToOpenAl(javax.sound.sampled.AudioFormat) -> a
     11:11:void <clinit>() -> <clinit>
-com.mojang.blaze3d.audio.SoundBuffer -> cwx:
+com.mojang.blaze3d.audio.SoundBuffer -> dfy:
     java.nio.ByteBuffer data -> a
     javax.sound.sampled.AudioFormat format -> b
     boolean hasAlBuffer -> c
@@ -131,16 +134,17 @@ com.mojang.blaze3d.audio.SoundBuffer -> cwx:
     25:44:java.util.OptionalInt getAlBuffer() -> a
     48:55:void discardAlBuffer() -> b
     58:60:java.util.OptionalInt releaseAlBuffer() -> c
-com.mojang.blaze3d.font.GlyphInfo -> cwy:
+com.mojang.blaze3d.font.GlyphInfo -> dfz:
     float getAdvance() -> getAdvance
     7:7:float getAdvance(boolean) -> a
     11:11:float getBearingX() -> a
     19:19:float getBoldOffset() -> b
     23:23:float getShadowOffset() -> c
-com.mojang.blaze3d.font.GlyphProvider -> cwz:
-    10:10:void close() -> close
-    14:14:com.mojang.blaze3d.font.RawGlyph getGlyph(char) -> a
-com.mojang.blaze3d.font.RawGlyph -> cxa:
+com.mojang.blaze3d.font.GlyphProvider -> dga:
+    12:12:void close() -> close
+    16:16:com.mojang.blaze3d.font.RawGlyph getGlyph(int) -> a
+    it.unimi.dsi.fastutil.ints.IntSet getSupportedGlyphs() -> a
+com.mojang.blaze3d.font.RawGlyph -> dgb:
     int getPixelWidth() -> d
     int getPixelHeight() -> e
     void upload(int,int) -> a
@@ -151,28 +155,29 @@ com.mojang.blaze3d.font.RawGlyph -> cxa:
     23:23:float getUp() -> j
     27:27:float getDown() -> k
     32:32:float getBearingY() -> l
-com.mojang.blaze3d.font.TrueTypeGlyphProvider -> cxb:
+com.mojang.blaze3d.font.TrueTypeGlyphProvider -> dgc:
     java.nio.ByteBuffer fontMemory -> a
     org.lwjgl.stb.STBTTFontinfo font -> b
     float oversample -> c
-    it.unimi.dsi.fastutil.chars.CharSet skip -> d
+    it.unimi.dsi.fastutil.ints.IntSet skip -> d
     float shiftX -> e
     float shiftY -> f
     float pointScale -> g
     float ascent -> h
-    21:48:void <init>(java.nio.ByteBuffer,org.lwjgl.stb.STBTTFontinfo,float,float,float,float,java.lang.String) -> <init>
-    53:83:com.mojang.blaze3d.font.TrueTypeGlyphProvider$Glyph getGlyph(char) -> b
-    88:90:void close() -> close
-    16:16:com.mojang.blaze3d.font.RawGlyph getGlyph(char) -> a
-    33:33:void lambda$new$0(int) -> a
-    16:16:float access$100(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> a
-    16:16:float access$200(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> b
-    16:16:float access$300(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> c
-    16:16:float access$400(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> d
-    16:16:org.lwjgl.stb.STBTTFontinfo access$500(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> e
-    16:16:float access$600(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> f
-com.mojang.blaze3d.font.TrueTypeGlyphProvider$1 -> cxb$1:
-com.mojang.blaze3d.font.TrueTypeGlyphProvider$Glyph -> cxb$a:
+    23:50:void <init>(java.nio.ByteBuffer,org.lwjgl.stb.STBTTFontinfo,float,float,float,float,java.lang.String) -> <init>
+    55:85:com.mojang.blaze3d.font.TrueTypeGlyphProvider$Glyph getGlyph(int) -> b
+    90:92:void close() -> close
+    97:97:it.unimi.dsi.fastutil.ints.IntSet getSupportedGlyphs() -> a
+    18:18:com.mojang.blaze3d.font.RawGlyph getGlyph(int) -> a
+    97:97:boolean lambda$getSupportedGlyphs$0(int) -> c
+    18:18:float access$100(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> a
+    18:18:float access$200(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> b
+    18:18:float access$300(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> c
+    18:18:float access$400(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> d
+    18:18:org.lwjgl.stb.STBTTFontinfo access$500(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> e
+    18:18:float access$600(com.mojang.blaze3d.font.TrueTypeGlyphProvider) -> f
+com.mojang.blaze3d.font.TrueTypeGlyphProvider$1 -> dgc$1:
+com.mojang.blaze3d.font.TrueTypeGlyphProvider$Glyph -> dgc$a:
     int width -> b
     int height -> c
     float bearingX -> d
@@ -180,25 +185,25 @@ com.mojang.blaze3d.font.TrueTypeGlyphProvider$Glyph -> cxb$a:
     float advance -> f
     int index -> g
     com.mojang.blaze3d.font.TrueTypeGlyphProvider this$0 -> a
-    100:110:void <init>(com.mojang.blaze3d.font.TrueTypeGlyphProvider,int,int,int,int,float,float,int) -> <init>
-    114:114:int getPixelWidth() -> d
-    119:119:int getPixelHeight() -> e
-    124:124:float getOversample() -> g
-    129:129:float getAdvance() -> getAdvance
-    134:134:float getBearingX() -> a
-    139:139:float getBearingY() -> l
-    144:147:void upload(int,int) -> a
-    151:151:boolean isColored() -> f
-    92:92:void <init>(com.mojang.blaze3d.font.TrueTypeGlyphProvider,int,int,int,int,float,float,int,com.mojang.blaze3d.font.TrueTypeGlyphProvider$1) -> <init>
-com.mojang.blaze3d.pipeline.RenderCall -> cxc:
+    108:118:void <init>(com.mojang.blaze3d.font.TrueTypeGlyphProvider,int,int,int,int,float,float,int) -> <init>
+    122:122:int getPixelWidth() -> d
+    127:127:int getPixelHeight() -> e
+    132:132:float getOversample() -> g
+    137:137:float getAdvance() -> getAdvance
+    142:142:float getBearingX() -> a
+    147:147:float getBearingY() -> l
+    152:155:void upload(int,int) -> a
+    159:159:boolean isColored() -> f
+    100:100:void <init>(com.mojang.blaze3d.font.TrueTypeGlyphProvider,int,int,int,int,float,float,int,com.mojang.blaze3d.font.TrueTypeGlyphProvider$1) -> <init>
+com.mojang.blaze3d.pipeline.RenderCall -> dgd:
     void execute() -> execute
-com.mojang.blaze3d.pipeline.RenderPipeline -> cxd:
+com.mojang.blaze3d.pipeline.RenderPipeline -> dge:
     java.util.List renderCalls -> a
     int recordingBuffer -> b
     int processedBuffer -> c
     int renderingBuffer -> d
     19:28:void <init>() -> <init>
-com.mojang.blaze3d.pipeline.RenderTarget -> cxe:
+com.mojang.blaze3d.pipeline.RenderTarget -> dgf:
     int width -> a
     int height -> b
     int viewWidth -> c
@@ -213,36 +218,37 @@ com.mojang.blaze3d.pipeline.RenderTarget -> cxe:
     49:56:void resize(int,int,boolean) -> a
     59:69:void _resize(int,int,boolean) -> d
     72:89:void destroyBuffers() -> a
-    92:127:void createBuffers(int,int,boolean) -> b
-    130:138:void setFilterMode(int) -> a
-    141:154:void checkStatus() -> b
-    159:161:void bindRead() -> c
-    170:172:void unbindRead() -> d
-    176:183:void bindWrite(boolean) -> a
-    186:191:void _bindWrite(boolean) -> c
-    195:202:void unbindWrite() -> e
-    205:209:void setClearColor(float,float,float,float) -> a
-    212:213:void blitToScreen(int,int) -> a
-    216:224:void blitToScreen(int,int,boolean) -> c
-    227:271:void _blitToScreen(int,int,boolean) -> e
-    274:284:void clear(boolean) -> b
-    219:220:void lambda$blitToScreen$3(int,int,boolean) -> f
-    197:198:void lambda$unbindWrite$2() -> f
-    178:179:void lambda$bindWrite$1(boolean) -> d
+    92:114:void copyDepthFrom(com.mojang.blaze3d.pipeline.RenderTarget) -> a
+    117:153:void createBuffers(int,int,boolean) -> b
+    156:164:void setFilterMode(int) -> a
+    167:180:void checkStatus() -> b
+    185:187:void bindRead() -> c
+    196:198:void unbindRead() -> d
+    202:209:void bindWrite(boolean) -> a
+    212:217:void _bindWrite(boolean) -> c
+    221:228:void unbindWrite() -> e
+    231:235:void setClearColor(float,float,float,float) -> a
+    238:239:void blitToScreen(int,int) -> a
+    242:250:void blitToScreen(int,int,boolean) -> c
+    253:297:void _blitToScreen(int,int,boolean) -> e
+    300:310:void clear(boolean) -> b
+    245:246:void lambda$blitToScreen$3(int,int,boolean) -> f
+    223:224:void lambda$unbindWrite$2() -> f
+    204:205:void lambda$bindWrite$1(boolean) -> d
     51:52:void lambda$resize$0(int,int,boolean) -> g
-com.mojang.blaze3d.platform.ClipboardManager -> cxf:
+com.mojang.blaze3d.platform.ClipboardManager -> dgg:
     java.nio.ByteBuffer clipboardScratchBuffer -> a
     13:16:void <init>() -> <init>
     19:26:java.lang.String getClipboard(long,org.lwjgl.glfw.GLFWErrorCallbackI) -> a
     31:36:void pushClipboard(long,java.nio.ByteBuffer,byte[]) -> a
     39:52:void setClipboard(long,java.lang.String) -> a
-com.mojang.blaze3d.platform.DebugMemoryUntracker -> cxg:
+com.mojang.blaze3d.platform.DebugMemoryUntracker -> dgh:
     java.lang.invoke.MethodHandle UNTRACK -> a
     35:43:void untrack(long) -> a
     46:47:void untrack(org.lwjgl.system.Pointer) -> a
     15:30:java.lang.invoke.MethodHandle lambda$static$0() -> a
     13:13:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.DisplayData -> cxh:
+com.mojang.blaze3d.platform.DisplayData -> dgi:
     int width -> a
     int height -> b
     java.util.OptionalInt fullscreenWidth -> c
@@ -274,7 +280,7 @@ com.mojang.blaze3d.platform.GLX -> com.mojang.blaze3d.platform.GLX:
     69:69:void lambda$_initGlfw$1(java.util.List,int,long) -> lambda$_initGlfw$1
     64:64:void lambda$_initGlfw$0(java.lang.Integer,java.lang.String) -> lambda$_initGlfw$0
     36:175:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlConst -> cxi:
+com.mojang.blaze3d.platform.GlConst -> dgj:
     int GL_FRAMEBUFFER -> a
     int GL_RENDERBUFFER -> b
     int GL_COLOR_ATTACHMENT0 -> c
@@ -284,7 +290,7 @@ com.mojang.blaze3d.platform.GlConst -> cxi:
     int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT -> g
     int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER -> h
     int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER -> i
-com.mojang.blaze3d.platform.GlDebug -> cxj:
+com.mojang.blaze3d.platform.GlDebug -> dgk:
     org.apache.logging.log4j.Logger LOGGER -> d
     java.nio.ByteBuffer BYTE_BUFFER -> a
     java.nio.FloatBuffer FLOAT_BUFFER -> b
@@ -304,7 +310,7 @@ com.mojang.blaze3d.platform.GlDebug -> cxj:
     1336:1362:void enableDebugCallback(int,boolean) -> a
     1267:1267:java.lang.String lambda$setup$0(java.lang.String,java.lang.String) -> a
     33:1275:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlStateManager -> cxk:
+com.mojang.blaze3d.platform.GlStateManager -> dgl:
     java.nio.FloatBuffer MATRIX_BUFFER -> a
     com.mojang.blaze3d.platform.GlStateManager$AlphaState ALPHA_TEST -> b
     com.mojang.blaze3d.platform.GlStateManager$BooleanState LIGHTING -> c
@@ -317,258 +323,251 @@ com.mojang.blaze3d.platform.GlStateManager -> cxk:
     com.mojang.blaze3d.platform.GlStateManager$PolygonOffsetState POLY_OFFSET -> j
     com.mojang.blaze3d.platform.GlStateManager$ColorLogicState COLOR_LOGIC -> k
     com.mojang.blaze3d.platform.GlStateManager$TexGenState TEX_GEN -> l
-    com.mojang.blaze3d.platform.GlStateManager$ClearState CLEAR -> m
-    com.mojang.blaze3d.platform.GlStateManager$StencilState STENCIL -> n
-    java.nio.FloatBuffer FLOAT_ARG_BUFFER -> o
-    com.mojang.math.Vector3f DIFFUSE_LIGHT_0 -> p
-    com.mojang.math.Vector3f DIFFUSE_LIGHT_1 -> q
-    int activeTexture -> r
-    com.mojang.blaze3d.platform.GlStateManager$TextureState[] TEXTURES -> s
-    int shadeModel -> t
-    com.mojang.blaze3d.platform.GlStateManager$BooleanState RESCALE_NORMAL -> u
-    com.mojang.blaze3d.platform.GlStateManager$ColorMask COLOR_MASK -> v
-    com.mojang.blaze3d.platform.GlStateManager$Color COLOR -> w
-    com.mojang.blaze3d.platform.GlStateManager$FboMode fboMode -> x
-    76:78:void _pushLightingAttributes() -> a
-    82:84:void _pushTextureAttributes() -> b
-    88:90:void _popAttributes() -> c
-    94:96:void _disableAlphaTest() -> d
-    100:102:void _enableAlphaTest() -> e
-    106:112:void _alphaFunc(int,float) -> a
-    116:118:void _enableLighting() -> f
-    122:124:void _disableLighting() -> g
-    128:130:void _enableLight(int) -> a
-    140:142:void _enableColorMaterial() -> h
-    146:148:void _disableColorMaterial() -> i
-    152:158:void _colorMaterial(int,int) -> a
-    162:164:void _light(int,int,java.nio.FloatBuffer) -> a
-    168:170:void _lightModel(int,java.nio.FloatBuffer) -> a
-    174:176:void _normal3f(float,float,float) -> a
-    179:181:void _disableDepthTest() -> j
-    184:186:void _enableDepthTest() -> k
-    189:194:void _depthFunc(int) -> b
-    197:202:void _depthMask(boolean) -> a
-    205:207:void _disableBlend() -> l
-    210:212:void _enableBlend() -> m
-    215:221:void _blendFunc(int,int) -> b
-    224:232:void _blendFuncSeparate(int,int,int,int) -> a
-    235:236:void _blendColor(float,float,float,float) -> a
-    239:241:void _blendEquation(int) -> c
-    244:282:java.lang.String _init_fbo(org.lwjgl.opengl.GLCapabilities) -> a
-    286:287:int glGetProgrami(int,int) -> c
-    291:293:void glAttachShader(int,int) -> d
-    296:298:void glDeleteShader(int) -> d
-    301:302:int glCreateShader(int) -> e
-    306:308:void glShaderSource(int,java.lang.CharSequence) -> a
-    311:313:void glCompileShader(int) -> f
-    316:317:int glGetShaderi(int,int) -> e
-    321:323:void _glUseProgram(int) -> g
-    326:327:int glCreateProgram() -> n
-    331:333:void glDeleteProgram(int) -> h
-    336:338:void glLinkProgram(int) -> i
-    341:342:int _glGetUniformLocation(int,java.lang.CharSequence) -> b
-    346:348:void _glUniform1(int,java.nio.IntBuffer) -> a
-    351:353:void _glUniform1i(int,int) -> f
-    356:358:void _glUniform1(int,java.nio.FloatBuffer) -> b
-    361:363:void _glUniform2(int,java.nio.IntBuffer) -> b
-    366:368:void _glUniform2(int,java.nio.FloatBuffer) -> c
-    371:373:void _glUniform3(int,java.nio.IntBuffer) -> c
-    376:378:void _glUniform3(int,java.nio.FloatBuffer) -> d
-    381:383:void _glUniform4(int,java.nio.IntBuffer) -> d
-    386:388:void _glUniform4(int,java.nio.FloatBuffer) -> e
-    391:393:void _glUniformMatrix2(int,boolean,java.nio.FloatBuffer) -> a
-    396:398:void _glUniformMatrix3(int,boolean,java.nio.FloatBuffer) -> b
-    401:403:void _glUniformMatrix4(int,boolean,java.nio.FloatBuffer) -> c
-    406:407:int _glGetAttribLocation(int,java.lang.CharSequence) -> c
-    411:412:int _glGenBuffers() -> o
-    416:418:void _glBindBuffer(int,int) -> g
-    421:423:void _glBufferData(int,java.nio.ByteBuffer,int) -> a
-    426:428:void _glDeleteBuffers(int) -> j
-    431:443:void _glBindFramebuffer(int,int) -> h
-    446:458:void _glBindRenderbuffer(int,int) -> i
-    461:473:void _glDeleteRenderbuffers(int) -> k
-    476:488:void _glDeleteFramebuffers(int) -> l
-    491:500:int glGenFramebuffers() -> p
-    504:513:int glGenRenderbuffers() -> q
-    517:529:void _glRenderbufferStorage(int,int,int,int) -> b
-    532:544:void _glFramebufferRenderbuffer(int,int,int,int) -> c
-    547:556:int glCheckFramebufferStatus(int) -> m
-    560:572:void _glFramebufferTexture2D(int,int,int,int,int) -> a
-    588:590:void glActiveTexture(int) -> n
-    594:596:void _glClientActiveTexture(int) -> o
-    600:602:void _glMultiTexCoord2f(int,float,float) -> a
-    611:613:void glBlendFuncSeparate(int,int,int,int) -> d
-    616:617:java.lang.String glGetShaderInfoLog(int,int) -> j
-    621:622:java.lang.String glGetProgramInfoLog(int,int) -> k
-    626:631:void setupOutline() -> r
-    634:639:void teardownOutline() -> s
-    643:667:void setupOverlayColor(int,int) -> l
-    671:676:void teardownOverlayColor() -> t
-    679:683:void color1arg(int,int) -> p
-    686:696:void color3arg(int,int,int,int) -> f
-    699:702:void alpha1arg(int,int) -> q
-    802:829:void setupLevelDiffuseLighting(com.mojang.math.Matrix4f) -> a
-    832:840:void setupGuiFlatDiffuseLighting() -> u
-    843:856:void setupGui3DDiffuseLighting() -> v
-    859:862:java.nio.FloatBuffer getBuffer(float,float,float,float) -> e
-    866:875:void setupEndPortalTexGen() -> w
-    878:881:void clearTexGen() -> x
-    884:889:void mulTextureByProjModelView() -> y
-    908:910:void _enableFog() -> z
-    914:916:void _disableFog() -> A
-    920:925:void _fogMode(int) -> p
-    929:934:void _fogDensity(float) -> a
-    938:943:void _fogStart(float) -> b
-    947:952:void _fogEnd(float) -> c
-    956:958:void _fog(int,float[]) -> a
-    962:964:void _fogi(int,int) -> m
-    967:969:void _enableCull() -> B
-    972:974:void _disableCull() -> C
-    977:979:void _polygonMode(int,int) -> n
-    982:984:void _enablePolygonOffset() -> D
-    987:989:void _disablePolygonOffset() -> E
-    992:994:void _enableLineOffset() -> F
-    997:999:void _disableLineOffset() -> G
-    1002:1008:void _polygonOffset(float,float) -> a
-    1038:1040:void _enableColorLogicOp() -> H
-    1043:1045:void _disableColorLogicOp() -> I
-    1048:1053:void _logicOp(int) -> q
-    1057:1059:void _enableTexGen(com.mojang.blaze3d.platform.GlStateManager$TexGen) -> a
-    1063:1065:void _disableTexGen(com.mojang.blaze3d.platform.GlStateManager$TexGen) -> b
-    1069:1075:void _texGenMode(com.mojang.blaze3d.platform.GlStateManager$TexGen,int) -> a
-    1079:1081:void _texGenParam(com.mojang.blaze3d.platform.GlStateManager$TexGen,int,java.nio.FloatBuffer) -> a
-    1085:1096:com.mojang.blaze3d.platform.GlStateManager$TexGenCoord getTexGen(com.mojang.blaze3d.platform.GlStateManager$TexGen) -> c
-    1100:1105:void _activeTexture(int) -> r
-    1108:1110:void _enableTexture() -> J
-    1113:1115:void _disableTexture() -> K
-    1125:1127:void _texEnv(int,int,int) -> a
-    1136:1138:void _texParameter(int,int,float) -> a
-    1141:1143:void _texParameter(int,int,int) -> b
-    1146:1147:int _getTexLevelParameter(int,int,int) -> c
-    1151:1152:int _genTexture() -> L
-    1156:1163:void _deleteTexture(int) -> s
-    1166:1171:void _bindTexture(int) -> t
-    1174:1176:void _texImage2D(int,int,int,int,int,int,int,int,java.nio.IntBuffer) -> a
-    1179:1181:void _texSubImage2D(int,int,int,int,int,int,int,int,long) -> a
-    1184:1186:void _getTexImage(int,int,int,int,long) -> a
-    1190:1195:void _shadeModel(int) -> u
-    1199:1201:void _enableRescaleNormal() -> M
-    1205:1207:void _disableRescaleNormal() -> N
-    1210:1216:void _viewport(int,int,int,int) -> e
-    1219:1227:void _colorMask(boolean,boolean,boolean,boolean) -> a
-    1230:1237:void _stencilFunc(int,int,int) -> d
-    1240:1245:void _stencilMask(int) -> v
-    1248:1255:void _stencilOp(int,int,int) -> e
-    1258:1263:void _clearDepth(double) -> a
-    1266:1274:void _clearColor(float,float,float,float) -> b
-    1277:1282:void _clearStencil(int) -> w
-    1285:1291:void _clear(int,boolean) -> a
-    1295:1297:void _matrixMode(int) -> x
-    1301:1303:void _loadIdentity() -> O
-    1307:1309:void _pushMatrix() -> P
-    1313:1315:void _popMatrix() -> Q
-    1319:1321:void _getMatrix(int,java.nio.FloatBuffer) -> f
-    1325:1327:void _ortho(double,double,double,double,double,double) -> a
-    1331:1333:void _rotatef(float,float,float,float) -> c
-    1337:1339:void _scalef(float,float,float) -> b
-    1343:1345:void _scaled(double,double,double) -> a
-    1349:1351:void _translatef(float,float,float) -> c
-    1355:1357:void _translated(double,double,double) -> b
-    1361:1363:void _multMatrix(java.nio.FloatBuffer) -> a
-    1367:1371:void _multMatrix(com.mojang.math.Matrix4f) -> b
-    1375:1383:void _color4f(float,float,float,float) -> d
-    1387:1397:void _clearCurrentColor() -> R
-    1401:1403:void _normalPointer(int,int,long) -> a
-    1407:1409:void _texCoordPointer(int,int,int,long) -> a
-    1413:1415:void _vertexPointer(int,int,int,long) -> b
-    1419:1421:void _colorPointer(int,int,int,long) -> c
-    1424:1426:void _vertexAttribPointer(int,int,int,boolean,int,long) -> a
-    1430:1432:void _enableClientState(int) -> y
-    1436:1438:void _disableClientState(int) -> z
-    1441:1443:void _enableVertexAttribArray(int) -> A
-    1446:1448:void _disableVertexAttribArray(int) -> B
-    1451:1453:void _drawArrays(int,int,int) -> f
-    1456:1458:void _lineWidth(float) -> d
-    1461:1463:void _pixelStore(int,int) -> o
-    1466:1468:void _pixelTransfer(int,float) -> b
-    1471:1473:void _readPixels(int,int,int,int,int,int,java.nio.ByteBuffer) -> a
-    1481:1482:int _getError() -> S
-    1486:1487:java.lang.String _getString(int) -> C
-    1491:1492:int _getInteger(int) -> D
-    59:59:com.mojang.blaze3d.platform.GlStateManager$TextureState[] lambda$static$4(int) -> E
-    59:59:com.mojang.blaze3d.platform.GlStateManager$TextureState lambda$static$3(int) -> F
-    40:40:com.mojang.blaze3d.platform.GlStateManager$BooleanState[] lambda$static$2(int) -> G
-    40:40:com.mojang.blaze3d.platform.GlStateManager$BooleanState lambda$static$1(int) -> H
-    35:35:void lambda$static$0(java.nio.FloatBuffer) -> b
-    35:66:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlStateManager$1 -> cxk$1:
+    com.mojang.blaze3d.platform.GlStateManager$StencilState STENCIL -> m
+    java.nio.FloatBuffer FLOAT_ARG_BUFFER -> n
+    int activeTexture -> o
+    com.mojang.blaze3d.platform.GlStateManager$TextureState[] TEXTURES -> p
+    int shadeModel -> q
+    com.mojang.blaze3d.platform.GlStateManager$BooleanState RESCALE_NORMAL -> r
+    com.mojang.blaze3d.platform.GlStateManager$ColorMask COLOR_MASK -> s
+    com.mojang.blaze3d.platform.GlStateManager$Color COLOR -> t
+    com.mojang.blaze3d.platform.GlStateManager$FboMode fboMode -> u
+    com.mojang.blaze3d.platform.GlStateManager$FboBlitMode fboBlitMode -> v
+    75:77:void _pushLightingAttributes() -> a
+    81:83:void _pushTextureAttributes() -> b
+    87:89:void _popAttributes() -> c
+    93:95:void _disableAlphaTest() -> d
+    99:101:void _enableAlphaTest() -> e
+    105:111:void _alphaFunc(int,float) -> a
+    115:117:void _enableLighting() -> f
+    121:123:void _disableLighting() -> g
+    127:129:void _enableLight(int) -> a
+    139:141:void _enableColorMaterial() -> h
+    145:147:void _disableColorMaterial() -> i
+    151:157:void _colorMaterial(int,int) -> a
+    161:163:void _light(int,int,java.nio.FloatBuffer) -> a
+    167:169:void _lightModel(int,java.nio.FloatBuffer) -> a
+    173:175:void _normal3f(float,float,float) -> a
+    178:180:void _disableDepthTest() -> j
+    183:185:void _enableDepthTest() -> k
+    188:193:void _depthFunc(int) -> b
+    196:201:void _depthMask(boolean) -> a
+    204:206:void _disableBlend() -> l
+    209:211:void _enableBlend() -> m
+    214:220:void _blendFunc(int,int) -> b
+    223:231:void _blendFuncSeparate(int,int,int,int) -> a
+    234:235:void _blendColor(float,float,float,float) -> a
+    238:240:void _blendEquation(int) -> c
+    243:289:java.lang.String _init_fbo(org.lwjgl.opengl.GLCapabilities) -> a
+    293:294:int glGetProgrami(int,int) -> c
+    298:300:void glAttachShader(int,int) -> d
+    303:305:void glDeleteShader(int) -> d
+    308:309:int glCreateShader(int) -> e
+    313:315:void glShaderSource(int,java.lang.CharSequence) -> a
+    318:320:void glCompileShader(int) -> f
+    323:324:int glGetShaderi(int,int) -> e
+    328:330:void _glUseProgram(int) -> g
+    333:334:int glCreateProgram() -> n
+    338:340:void glDeleteProgram(int) -> h
+    343:345:void glLinkProgram(int) -> i
+    348:349:int _glGetUniformLocation(int,java.lang.CharSequence) -> b
+    353:355:void _glUniform1(int,java.nio.IntBuffer) -> a
+    358:360:void _glUniform1i(int,int) -> f
+    363:365:void _glUniform1(int,java.nio.FloatBuffer) -> b
+    368:370:void _glUniform2(int,java.nio.IntBuffer) -> b
+    373:375:void _glUniform2(int,java.nio.FloatBuffer) -> c
+    378:380:void _glUniform3(int,java.nio.IntBuffer) -> c
+    383:385:void _glUniform3(int,java.nio.FloatBuffer) -> d
+    388:390:void _glUniform4(int,java.nio.IntBuffer) -> d
+    393:395:void _glUniform4(int,java.nio.FloatBuffer) -> e
+    398:400:void _glUniformMatrix2(int,boolean,java.nio.FloatBuffer) -> a
+    403:405:void _glUniformMatrix3(int,boolean,java.nio.FloatBuffer) -> b
+    408:410:void _glUniformMatrix4(int,boolean,java.nio.FloatBuffer) -> c
+    413:414:int _glGetAttribLocation(int,java.lang.CharSequence) -> c
+    418:419:int _glGenBuffers() -> o
+    423:425:void _glBindBuffer(int,int) -> g
+    428:430:void _glBufferData(int,java.nio.ByteBuffer,int) -> a
+    433:435:void _glDeleteBuffers(int) -> j
+    438:440:void _glCopyTexSubImage2D(int,int,int,int,int,int,int,int) -> a
+    443:455:void _glBindFramebuffer(int,int) -> h
+    458:476:int getFramebufferDepthTexture() -> p
+    480:491:void _glBlitFrameBuffer(int,int,int,int,int,int,int,int,int,int) -> a
+    524:536:void _glDeleteFramebuffers(int) -> k
+    539:548:int glGenFramebuffers() -> q
+    595:604:int glCheckFramebufferStatus(int) -> l
+    608:620:void _glFramebufferTexture2D(int,int,int,int,int) -> a
+    637:637:int getActiveTextureName() -> r
+    641:643:void glActiveTexture(int) -> m
+    647:649:void _glClientActiveTexture(int) -> n
+    653:655:void _glMultiTexCoord2f(int,float,float) -> a
+    664:666:void glBlendFuncSeparate(int,int,int,int) -> b
+    669:670:java.lang.String glGetShaderInfoLog(int,int) -> i
+    674:675:java.lang.String glGetProgramInfoLog(int,int) -> j
+    679:684:void setupOutline() -> s
+    687:692:void teardownOutline() -> t
+    696:720:void setupOverlayColor(int,int) -> k
+    724:729:void teardownOverlayColor() -> u
+    732:736:void color1arg(int,int) -> o
+    739:749:void color3arg(int,int,int,int) -> d
+    752:755:void alpha1arg(int,int) -> p
+    855:882:void setupLevelDiffuseLighting(com.mojang.math.Vector3f,com.mojang.math.Vector3f,com.mojang.math.Matrix4f) -> a
+    885:893:void setupGuiFlatDiffuseLighting(com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> a
+    896:909:void setupGui3DDiffuseLighting(com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> b
+    912:915:java.nio.FloatBuffer getBuffer(float,float,float,float) -> e
+    919:928:void setupEndPortalTexGen() -> v
+    931:934:void clearTexGen() -> w
+    937:942:void mulTextureByProjModelView() -> x
+    969:971:void _enableFog() -> y
+    975:977:void _disableFog() -> z
+    981:986:void _fogMode(int) -> o
+    990:995:void _fogDensity(float) -> a
+    999:1004:void _fogStart(float) -> b
+    1008:1013:void _fogEnd(float) -> c
+    1017:1019:void _fog(int,float[]) -> a
+    1023:1025:void _fogi(int,int) -> l
+    1028:1030:void _enableCull() -> A
+    1033:1035:void _disableCull() -> B
+    1038:1040:void _polygonMode(int,int) -> m
+    1043:1045:void _enablePolygonOffset() -> C
+    1048:1050:void _disablePolygonOffset() -> D
+    1053:1055:void _enableLineOffset() -> E
+    1058:1060:void _disableLineOffset() -> F
+    1063:1069:void _polygonOffset(float,float) -> a
+    1099:1101:void _enableColorLogicOp() -> G
+    1104:1106:void _disableColorLogicOp() -> H
+    1109:1114:void _logicOp(int) -> p
+    1118:1120:void _enableTexGen(com.mojang.blaze3d.platform.GlStateManager$TexGen) -> a
+    1124:1126:void _disableTexGen(com.mojang.blaze3d.platform.GlStateManager$TexGen) -> b
+    1130:1136:void _texGenMode(com.mojang.blaze3d.platform.GlStateManager$TexGen,int) -> a
+    1140:1142:void _texGenParam(com.mojang.blaze3d.platform.GlStateManager$TexGen,int,java.nio.FloatBuffer) -> a
+    1146:1157:com.mojang.blaze3d.platform.GlStateManager$TexGenCoord getTexGen(com.mojang.blaze3d.platform.GlStateManager$TexGen) -> c
+    1161:1166:void _activeTexture(int) -> q
+    1169:1171:void _enableTexture() -> I
+    1174:1176:void _disableTexture() -> J
+    1186:1188:void _texEnv(int,int,int) -> a
+    1197:1199:void _texParameter(int,int,float) -> a
+    1202:1204:void _texParameter(int,int,int) -> b
+    1207:1208:int _getTexLevelParameter(int,int,int) -> c
+    1212:1213:int _genTexture() -> K
+    1217:1224:void _deleteTexture(int) -> r
+    1227:1232:void _bindTexture(int) -> s
+    1235:1237:void _texImage2D(int,int,int,int,int,int,int,int,java.nio.IntBuffer) -> a
+    1240:1242:void _texSubImage2D(int,int,int,int,int,int,int,int,long) -> a
+    1245:1247:void _getTexImage(int,int,int,int,long) -> a
+    1251:1256:void _shadeModel(int) -> t
+    1260:1262:void _enableRescaleNormal() -> L
+    1266:1268:void _disableRescaleNormal() -> M
+    1271:1277:void _viewport(int,int,int,int) -> c
+    1280:1288:void _colorMask(boolean,boolean,boolean,boolean) -> a
+    1291:1298:void _stencilFunc(int,int,int) -> d
+    1301:1306:void _stencilMask(int) -> u
+    1309:1316:void _stencilOp(int,int,int) -> e
+    1319:1321:void _clearDepth(double) -> a
+    1324:1326:void _clearColor(float,float,float,float) -> b
+    1329:1331:void _clearStencil(int) -> v
+    1334:1340:void _clear(int,boolean) -> a
+    1344:1346:void _matrixMode(int) -> w
+    1350:1352:void _loadIdentity() -> N
+    1356:1358:void _pushMatrix() -> O
+    1362:1364:void _popMatrix() -> P
+    1368:1370:void _getMatrix(int,java.nio.FloatBuffer) -> f
+    1374:1376:void _ortho(double,double,double,double,double,double) -> a
+    1380:1382:void _rotatef(float,float,float,float) -> c
+    1386:1388:void _scalef(float,float,float) -> b
+    1392:1394:void _scaled(double,double,double) -> a
+    1398:1400:void _translatef(float,float,float) -> c
+    1404:1406:void _translated(double,double,double) -> b
+    1410:1412:void _multMatrix(java.nio.FloatBuffer) -> a
+    1416:1420:void _multMatrix(com.mojang.math.Matrix4f) -> a
+    1424:1432:void _color4f(float,float,float,float) -> d
+    1436:1446:void _clearCurrentColor() -> Q
+    1450:1452:void _normalPointer(int,int,long) -> a
+    1456:1458:void _texCoordPointer(int,int,int,long) -> a
+    1462:1464:void _vertexPointer(int,int,int,long) -> b
+    1468:1470:void _colorPointer(int,int,int,long) -> c
+    1473:1475:void _vertexAttribPointer(int,int,int,boolean,int,long) -> a
+    1479:1481:void _enableClientState(int) -> x
+    1485:1487:void _disableClientState(int) -> y
+    1490:1492:void _enableVertexAttribArray(int) -> z
+    1495:1497:void _disableVertexAttribArray(int) -> A
+    1500:1502:void _drawArrays(int,int,int) -> f
+    1505:1507:void _lineWidth(float) -> d
+    1510:1512:void _pixelStore(int,int) -> n
+    1515:1517:void _pixelTransfer(int,float) -> b
+    1520:1522:void _readPixels(int,int,int,int,int,int,java.nio.ByteBuffer) -> a
+    1530:1531:int _getError() -> R
+    1535:1536:java.lang.String _getString(int) -> B
+    1540:1541:int _getInteger(int) -> C
+    1580:1580:boolean supportsFramebufferBlit() -> S
+    57:57:com.mojang.blaze3d.platform.GlStateManager$TextureState[] lambda$static$4(int) -> D
+    57:57:com.mojang.blaze3d.platform.GlStateManager$TextureState lambda$static$3(int) -> E
+    41:41:com.mojang.blaze3d.platform.GlStateManager$BooleanState[] lambda$static$2(int) -> F
+    41:41:com.mojang.blaze3d.platform.GlStateManager$BooleanState lambda$static$1(int) -> G
+    36:36:void lambda$static$0(java.nio.FloatBuffer) -> b
+    36:64:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.GlStateManager$1 -> dgl$1:
     int[] $SwitchMap$com$mojang$blaze3d$platform$GlStateManager$FboMode -> a
-    int[] $SwitchMap$com$mojang$blaze3d$platform$GlStateManager$TexGen -> b
-    432:1086:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlStateManager$AlphaState -> cxk$a:
+    int[] $SwitchMap$com$mojang$blaze3d$platform$GlStateManager$FboBlitMode -> b
+    int[] $SwitchMap$com$mojang$blaze3d$platform$GlStateManager$TexGen -> c
+    444:1147:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.GlStateManager$AlphaState -> dgl$a:
     com.mojang.blaze3d.platform.GlStateManager$BooleanState mode -> a
     int func -> b
     float reference -> c
-    1531:1534:void <init>() -> <init>
-    1531:1531:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$BlendState -> cxk$b:
+    1589:1592:void <init>() -> <init>
+    1589:1589:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$BlendState -> dgl$b:
     com.mojang.blaze3d.platform.GlStateManager$BooleanState mode -> a
     int srcRgb -> b
     int dstRgb -> c
     int srcAlpha -> d
     int dstAlpha -> e
-    1544:1549:void <init>() -> <init>
-    1544:1544:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$BooleanState -> cxk$c:
+    1602:1607:void <init>() -> <init>
+    1602:1602:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$BooleanState -> dgl$c:
     int state -> a
     boolean enabled -> b
-    1659:1661:void <init>(int) -> <init>
-    1664:1665:void disable() -> a
-    1668:1669:void enable() -> b
-    1672:1681:void setEnabled(boolean) -> a
-com.mojang.blaze3d.platform.GlStateManager$ClearState -> cxk$d:
-    double depth -> a
-    com.mojang.blaze3d.platform.GlStateManager$Color color -> b
-    int stencil -> c
-    1584:1586:void <init>() -> <init>
-    1584:1584:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$Color -> cxk$e:
+    1717:1719:void <init>(int) -> <init>
+    1722:1723:void disable() -> a
+    1726:1727:void enable() -> b
+    1730:1739:void setEnabled(boolean) -> a
+com.mojang.blaze3d.platform.GlStateManager$Color -> dgl$d:
     float r -> a
     float g -> b
     float b -> c
     float a -> d
-    1644:1645:void <init>() -> <init>
-    1638:1652:void <init>(float,float,float,float) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$ColorLogicState -> cxk$f:
+    1702:1703:void <init>() -> <init>
+    1696:1710:void <init>(float,float,float,float) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$ColorLogicState -> dgl$e:
     com.mojang.blaze3d.platform.GlStateManager$BooleanState enable -> a
     int op -> b
-    1579:1581:void <init>() -> <init>
-    1579:1579:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$ColorMask -> cxk$g:
+    1637:1639:void <init>() -> <init>
+    1637:1637:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$ColorMask -> dgl$f:
     boolean red -> a
     boolean green -> b
     boolean blue -> c
     boolean alpha -> d
-    1629:1633:void <init>() -> <init>
-    1629:1629:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$ColorMaterialState -> cxk$h:
+    1687:1691:void <init>() -> <init>
+    1687:1687:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$ColorMaterialState -> dgl$g:
     com.mojang.blaze3d.platform.GlStateManager$BooleanState enable -> a
     int face -> b
     int mode -> c
-    1538:1541:void <init>() -> <init>
-    1538:1538:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$CullState -> cxk$i:
+    1596:1599:void <init>() -> <init>
+    1596:1596:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$CullState -> dgl$h:
     com.mojang.blaze3d.platform.GlStateManager$BooleanState enable -> a
     int mode -> b
-    1567:1569:void <init>() -> <init>
-    1567:1567:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$DepthState -> cxk$j:
+    1625:1627:void <init>() -> <init>
+    1625:1625:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$DepthState -> dgl$i:
     com.mojang.blaze3d.platform.GlStateManager$BooleanState mode -> a
     boolean mask -> b
     int func -> c
-    1552:1555:void <init>() -> <init>
-    1552:1552:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$DestFactor -> cxk$k:
+    1610:1613:void <init>() -> <init>
+    1610:1610:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$DestFactor -> dgl$j:
     com.mojang.blaze3d.platform.GlStateManager$DestFactor CONSTANT_ALPHA -> a
     com.mojang.blaze3d.platform.GlStateManager$DestFactor CONSTANT_COLOR -> b
     com.mojang.blaze3d.platform.GlStateManager$DestFactor DST_ALPHA -> c
@@ -585,38 +584,47 @@ com.mojang.blaze3d.platform.GlStateManager$DestFactor -> cxk$k:
     com.mojang.blaze3d.platform.GlStateManager$DestFactor ZERO -> n
     int value -> o
     com.mojang.blaze3d.platform.GlStateManager$DestFactor[] $VALUES -> p
-    1710:1710:com.mojang.blaze3d.platform.GlStateManager$DestFactor[] values() -> values
-    1710:1710:com.mojang.blaze3d.platform.GlStateManager$DestFactor valueOf(java.lang.String) -> valueOf
-    1730:1732:void <init>(java.lang.String,int,int) -> <init>
-    1710:1725:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlStateManager$FboMode -> cxk$l:
+    1768:1768:com.mojang.blaze3d.platform.GlStateManager$DestFactor[] values() -> values
+    1768:1768:com.mojang.blaze3d.platform.GlStateManager$DestFactor valueOf(java.lang.String) -> valueOf
+    1788:1790:void <init>(java.lang.String,int,int) -> <init>
+    1768:1783:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.GlStateManager$FboBlitMode -> dgl$k:
+    com.mojang.blaze3d.platform.GlStateManager$FboBlitMode BASE -> a
+    com.mojang.blaze3d.platform.GlStateManager$FboBlitMode EXT -> b
+    com.mojang.blaze3d.platform.GlStateManager$FboBlitMode NONE -> c
+    com.mojang.blaze3d.platform.GlStateManager$FboBlitMode[] $VALUES -> d
+    1575:1575:com.mojang.blaze3d.platform.GlStateManager$FboBlitMode[] values() -> values
+    1575:1575:com.mojang.blaze3d.platform.GlStateManager$FboBlitMode valueOf(java.lang.String) -> valueOf
+    1575:1575:void <init>(java.lang.String,int) -> <init>
+    1575:1576:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.GlStateManager$FboMode -> dgl$l:
     com.mojang.blaze3d.platform.GlStateManager$FboMode BASE -> a
     com.mojang.blaze3d.platform.GlStateManager$FboMode ARB -> b
     com.mojang.blaze3d.platform.GlStateManager$FboMode EXT -> c
     com.mojang.blaze3d.platform.GlStateManager$FboMode[] $VALUES -> d
-    1521:1521:com.mojang.blaze3d.platform.GlStateManager$FboMode[] values() -> values
-    1521:1521:com.mojang.blaze3d.platform.GlStateManager$FboMode valueOf(java.lang.String) -> valueOf
-    1521:1521:void <init>(java.lang.String,int) -> <init>
-    1521:1522:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlStateManager$FogMode -> cxk$m:
+    1570:1570:com.mojang.blaze3d.platform.GlStateManager$FboMode[] values() -> values
+    1570:1570:com.mojang.blaze3d.platform.GlStateManager$FboMode valueOf(java.lang.String) -> valueOf
+    1570:1570:void <init>(java.lang.String,int) -> <init>
+    1570:1571:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.GlStateManager$FogMode -> dgl$m:
     com.mojang.blaze3d.platform.GlStateManager$FogMode LINEAR -> a
     com.mojang.blaze3d.platform.GlStateManager$FogMode EXP -> b
     com.mojang.blaze3d.platform.GlStateManager$FogMode EXP2 -> c
     int value -> d
     com.mojang.blaze3d.platform.GlStateManager$FogMode[] $VALUES -> e
-    892:892:com.mojang.blaze3d.platform.GlStateManager$FogMode[] values() -> values
-    892:892:com.mojang.blaze3d.platform.GlStateManager$FogMode valueOf(java.lang.String) -> valueOf
-    901:903:void <init>(java.lang.String,int,int) -> <init>
-    892:896:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlStateManager$FogState -> cxk$n:
+    953:953:com.mojang.blaze3d.platform.GlStateManager$FogMode[] values() -> values
+    953:953:com.mojang.blaze3d.platform.GlStateManager$FogMode valueOf(java.lang.String) -> valueOf
+    962:964:void <init>(java.lang.String,int,int) -> <init>
+    953:957:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.GlStateManager$FogState -> dgl$n:
     com.mojang.blaze3d.platform.GlStateManager$BooleanState enable -> a
     int mode -> b
     float density -> c
     float start -> d
     float end -> e
-    1559:1564:void <init>() -> <init>
-    1559:1559:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$LogicOp -> cxk$o:
+    1617:1622:void <init>() -> <init>
+    1617:1617:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$LogicOp -> dgl$o:
     com.mojang.blaze3d.platform.GlStateManager$LogicOp AND -> a
     com.mojang.blaze3d.platform.GlStateManager$LogicOp AND_INVERTED -> b
     com.mojang.blaze3d.platform.GlStateManager$LogicOp AND_REVERSE -> c
@@ -635,18 +643,18 @@ com.mojang.blaze3d.platform.GlStateManager$LogicOp -> cxk$o:
     com.mojang.blaze3d.platform.GlStateManager$LogicOp XOR -> p
     int value -> q
     com.mojang.blaze3d.platform.GlStateManager$LogicOp[] $VALUES -> r
-    1011:1011:com.mojang.blaze3d.platform.GlStateManager$LogicOp[] values() -> values
-    1011:1011:com.mojang.blaze3d.platform.GlStateManager$LogicOp valueOf(java.lang.String) -> valueOf
-    1032:1034:void <init>(java.lang.String,int,int) -> <init>
-    1011:1027:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlStateManager$PolygonOffsetState -> cxk$p:
+    1072:1072:com.mojang.blaze3d.platform.GlStateManager$LogicOp[] values() -> values
+    1072:1072:com.mojang.blaze3d.platform.GlStateManager$LogicOp valueOf(java.lang.String) -> valueOf
+    1093:1095:void <init>(java.lang.String,int,int) -> <init>
+    1072:1088:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.GlStateManager$PolygonOffsetState -> dgl$p:
     com.mojang.blaze3d.platform.GlStateManager$BooleanState fill -> a
     com.mojang.blaze3d.platform.GlStateManager$BooleanState line -> b
     float factor -> c
     float units -> d
-    1572:1574:void <init>() -> <init>
-    1572:1572:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$SourceFactor -> cxk$q:
+    1630:1632:void <init>() -> <init>
+    1630:1630:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$SourceFactor -> dgl$q:
     com.mojang.blaze3d.platform.GlStateManager$SourceFactor CONSTANT_ALPHA -> a
     com.mojang.blaze3d.platform.GlStateManager$SourceFactor CONSTANT_COLOR -> b
     com.mojang.blaze3d.platform.GlStateManager$SourceFactor DST_ALPHA -> c
@@ -664,63 +672,63 @@ com.mojang.blaze3d.platform.GlStateManager$SourceFactor -> cxk$q:
     com.mojang.blaze3d.platform.GlStateManager$SourceFactor ZERO -> o
     int value -> p
     com.mojang.blaze3d.platform.GlStateManager$SourceFactor[] $VALUES -> q
-    1684:1684:com.mojang.blaze3d.platform.GlStateManager$SourceFactor[] values() -> values
-    1684:1684:com.mojang.blaze3d.platform.GlStateManager$SourceFactor valueOf(java.lang.String) -> valueOf
-    1705:1707:void <init>(java.lang.String,int,int) -> <init>
-    1684:1700:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlStateManager$StencilFunc -> cxk$r:
+    1742:1742:com.mojang.blaze3d.platform.GlStateManager$SourceFactor[] values() -> values
+    1742:1742:com.mojang.blaze3d.platform.GlStateManager$SourceFactor valueOf(java.lang.String) -> valueOf
+    1763:1765:void <init>(java.lang.String,int,int) -> <init>
+    1742:1758:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.GlStateManager$StencilFunc -> dgl$r:
     int func -> a
     int ref -> b
     int mask -> c
-    1590:1593:void <init>() -> <init>
-    1590:1590:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$StencilState -> cxk$s:
+    1648:1651:void <init>() -> <init>
+    1648:1648:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$StencilState -> dgl$s:
     com.mojang.blaze3d.platform.GlStateManager$StencilFunc func -> a
     int mask -> b
     int fail -> c
     int zfail -> d
     int zpass -> e
-    1596:1601:void <init>() -> <init>
-    1596:1596:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$TexGen -> cxk$t:
+    1654:1659:void <init>() -> <init>
+    1654:1654:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$TexGen -> dgl$t:
     com.mojang.blaze3d.platform.GlStateManager$TexGen S -> a
     com.mojang.blaze3d.platform.GlStateManager$TexGen T -> b
     com.mojang.blaze3d.platform.GlStateManager$TexGen R -> c
     com.mojang.blaze3d.platform.GlStateManager$TexGen Q -> d
     com.mojang.blaze3d.platform.GlStateManager$TexGen[] $VALUES -> e
-    1624:1624:com.mojang.blaze3d.platform.GlStateManager$TexGen[] values() -> values
-    1624:1624:com.mojang.blaze3d.platform.GlStateManager$TexGen valueOf(java.lang.String) -> valueOf
-    1625:1625:void <init>(java.lang.String,int) -> <init>
-    1624:1626:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlStateManager$TexGenCoord -> cxk$u:
+    1682:1682:com.mojang.blaze3d.platform.GlStateManager$TexGen[] values() -> values
+    1682:1682:com.mojang.blaze3d.platform.GlStateManager$TexGen valueOf(java.lang.String) -> valueOf
+    1683:1683:void <init>(java.lang.String,int) -> <init>
+    1682:1684:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.GlStateManager$TexGenCoord -> dgl$u:
     com.mojang.blaze3d.platform.GlStateManager$BooleanState enable -> a
     int coord -> b
     int mode -> c
-    1616:1621:void <init>(int,int) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$TexGenState -> cxk$v:
+    1674:1679:void <init>(int,int) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$TexGenState -> dgl$v:
     com.mojang.blaze3d.platform.GlStateManager$TexGenCoord s -> a
     com.mojang.blaze3d.platform.GlStateManager$TexGenCoord t -> b
     com.mojang.blaze3d.platform.GlStateManager$TexGenCoord r -> c
     com.mojang.blaze3d.platform.GlStateManager$TexGenCoord q -> d
-    1605:1609:void <init>() -> <init>
-    1605:1605:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$TextureState -> cxk$w:
+    1663:1667:void <init>() -> <init>
+    1663:1663:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$TextureState -> dgl$w:
     com.mojang.blaze3d.platform.GlStateManager$BooleanState enable -> a
     int binding -> b
-    1525:1526:void <init>() -> <init>
-    1525:1525:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
-com.mojang.blaze3d.platform.GlStateManager$Viewport -> cxk$x:
+    1583:1584:void <init>() -> <init>
+    1583:1583:void <init>(com.mojang.blaze3d.platform.GlStateManager$1) -> <init>
+com.mojang.blaze3d.platform.GlStateManager$Viewport -> dgl$x:
     com.mojang.blaze3d.platform.GlStateManager$Viewport INSTANCE -> a
     int x -> b
     int y -> c
     int width -> d
     int height -> e
     com.mojang.blaze3d.platform.GlStateManager$Viewport[] $VALUES -> f
-    1496:1496:com.mojang.blaze3d.platform.GlStateManager$Viewport[] values() -> values
-    1496:1496:com.mojang.blaze3d.platform.GlStateManager$Viewport valueOf(java.lang.String) -> valueOf
-    1496:1496:void <init>(java.lang.String,int) -> <init>
-    1496:1497:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.GlUtil -> cxl:
+    1545:1545:com.mojang.blaze3d.platform.GlStateManager$Viewport[] values() -> values
+    1545:1545:com.mojang.blaze3d.platform.GlStateManager$Viewport valueOf(java.lang.String) -> valueOf
+    1545:1545:void <init>(java.lang.String,int) -> <init>
+    1545:1546:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.GlUtil -> dgm:
     16:16:void populateSnooperWithOpenGL(com.mojang.blaze3d.platform.SnooperAccess) -> a
     130:130:java.nio.ByteBuffer allocateMemory(int) -> a
     134:135:void freeMemory(java.nio.Buffer) -> a
@@ -728,63 +736,75 @@ com.mojang.blaze3d.platform.GlUtil -> cxl:
     142:142:java.lang.String getCpuInfo() -> b
     146:146:java.lang.String getRenderer() -> c
     150:150:java.lang.String getOpenGLVersion() -> d
-com.mojang.blaze3d.platform.InputConstants -> cxm:
+com.mojang.blaze3d.platform.InputConstants -> dgn:
     java.lang.invoke.MethodHandle glfwRawMouseMotionSupported -> b
     int GLFW_RAW_MOUSE_MOTION -> c
     com.mojang.blaze3d.platform.InputConstants$Key UNKNOWN -> a
-    424:427:com.mojang.blaze3d.platform.InputConstants$Key getKey(int,int) -> a
-    431:441:com.mojang.blaze3d.platform.InputConstants$Key getKey(java.lang.String) -> a
-    445:445:boolean isKeyDown(long,int) -> a
-    449:451:void setupKeyboardCallbacks(long,org.lwjgl.glfw.GLFWKeyCallbackI,org.lwjgl.glfw.GLFWCharModsCallbackI) -> a
-    454:457:void setupMouseCallbacks(long,org.lwjgl.glfw.GLFWCursorPosCallbackI,org.lwjgl.glfw.GLFWMouseButtonCallbackI,org.lwjgl.glfw.GLFWScrollCallbackI) -> a
-    460:462:void grabOrReleaseMouse(long,int,double,double) -> a
-    466:468:boolean isRawMouseInputSupported() -> a
-    473:476:void updateRawMouseInput(long,boolean) -> a
-    480:480:java.lang.String translateKeyCode(int) -> a
-    485:485:java.lang.String translateScanCode(int) -> b
-    26:183:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.InputConstants$1 -> cxm$1:
-com.mojang.blaze3d.platform.InputConstants$Key -> cxm$a:
+    444:447:com.mojang.blaze3d.platform.InputConstants$Key getKey(int,int) -> a
+    451:461:com.mojang.blaze3d.platform.InputConstants$Key getKey(java.lang.String) -> a
+    465:465:boolean isKeyDown(long,int) -> a
+    469:471:void setupKeyboardCallbacks(long,org.lwjgl.glfw.GLFWKeyCallbackI,org.lwjgl.glfw.GLFWCharModsCallbackI) -> a
+    474:478:void setupMouseCallbacks(long,org.lwjgl.glfw.GLFWCursorPosCallbackI,org.lwjgl.glfw.GLFWMouseButtonCallbackI,org.lwjgl.glfw.GLFWScrollCallbackI,org.lwjgl.glfw.GLFWDropCallbackI) -> a
+    481:483:void grabOrReleaseMouse(long,int,double,double) -> a
+    487:489:boolean isRawMouseInputSupported() -> a
+    494:497:void updateRawMouseInput(long,boolean) -> a
+    34:191:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.InputConstants$1 -> dgn$1:
+com.mojang.blaze3d.platform.InputConstants$Key -> dgn$a:
     java.lang.String name -> a
     com.mojang.blaze3d.platform.InputConstants$Type type -> b
     int value -> c
-    java.util.Map NAME_MAP -> d
-    381:386:void <init>(java.lang.String,com.mojang.blaze3d.platform.InputConstants$Type,int) -> <init>
-    389:389:com.mojang.blaze3d.platform.InputConstants$Type getType() -> a
-    393:393:int getValue() -> b
-    397:397:java.lang.String getName() -> c
-    402:409:boolean equals(java.lang.Object) -> equals
-    414:414:int hashCode() -> hashCode
-    419:419:java.lang.String toString() -> toString
-    374:374:void <init>(java.lang.String,com.mojang.blaze3d.platform.InputConstants$Type,int,com.mojang.blaze3d.platform.InputConstants$1) -> <init>
-    374:374:java.util.Map access$100() -> d
-    379:379:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.InputConstants$Type -> cxm$b:
+    net.minecraft.util.LazyLoadedValue displayName -> d
+    java.util.Map NAME_MAP -> e
+    385:392:void <init>(java.lang.String,com.mojang.blaze3d.platform.InputConstants$Type,int) -> <init>
+    395:395:com.mojang.blaze3d.platform.InputConstants$Type getType() -> a
+    399:399:int getValue() -> b
+    403:403:java.lang.String getName() -> c
+    407:407:net.minecraft.network.chat.Component getDisplayName() -> d
+    411:417:java.util.OptionalInt getNumericKeyValue() -> e
+    422:429:boolean equals(java.lang.Object) -> equals
+    434:434:int hashCode() -> hashCode
+    439:439:java.lang.String toString() -> toString
+    390:390:net.minecraft.network.chat.Component lambda$new$0(com.mojang.blaze3d.platform.InputConstants$Type,int,java.lang.String) -> a
+    377:377:void <init>(java.lang.String,com.mojang.blaze3d.platform.InputConstants$Type,int,com.mojang.blaze3d.platform.InputConstants$1) -> <init>
+    377:377:java.util.Map access$200() -> f
+    383:383:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.InputConstants$Type -> dgn$b:
     com.mojang.blaze3d.platform.InputConstants$Type KEYSYM -> a
     com.mojang.blaze3d.platform.InputConstants$Type SCANCODE -> b
     com.mojang.blaze3d.platform.InputConstants$Type MOUSE -> c
-    java.lang.String[] MOUSE_BUTTON_NAMES -> d
-    it.unimi.dsi.fastutil.ints.Int2ObjectMap map -> e
-    java.lang.String defaultPrefix -> f
+    it.unimi.dsi.fastutil.ints.Int2ObjectMap map -> d
+    java.lang.String defaultPrefix -> e
+    java.util.function.BiFunction displayTextSupplier -> f
     com.mojang.blaze3d.platform.InputConstants$Type[] $VALUES -> g
-    185:185:com.mojang.blaze3d.platform.InputConstants$Type[] values() -> values
-    185:185:com.mojang.blaze3d.platform.InputConstants$Type valueOf(java.lang.String) -> valueOf
-    191:193:void addKey(com.mojang.blaze3d.platform.InputConstants$Type,java.lang.String,int) -> a
-    341:347:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    350:366:com.mojang.blaze3d.platform.InputConstants$Key getOrCreate(int) -> a
-    370:370:java.lang.String getDefaultPrefix() -> a
-    185:185:java.lang.String access$200(com.mojang.blaze3d.platform.InputConstants$Type) -> a
-    185:339:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.Lighting -> cxn:
-    8:11:void turnBackOn() -> a
-    14:16:void turnOff() -> b
-    19:20:void setupLevel(com.mojang.math.Matrix4f) -> a
-    23:24:void setupForFlatItems() -> c
-    27:28:void setupFor3DItems() -> d
-com.mojang.blaze3d.platform.MemoryTracker -> cxo:
+    193:193:com.mojang.blaze3d.platform.InputConstants$Type[] values() -> values
+    193:193:com.mojang.blaze3d.platform.InputConstants$Type valueOf(java.lang.String) -> valueOf
+    205:207:void addKey(com.mojang.blaze3d.platform.InputConstants$Type,java.lang.String,int) -> a
+    353:362:void <init>(java.lang.String,int,java.lang.String,java.util.function.BiFunction) -> <init>
+    365:365:com.mojang.blaze3d.platform.InputConstants$Key getOrCreate(int) -> a
+    366:372:com.mojang.blaze3d.platform.InputConstants$Key lambda$getOrCreate$3(int) -> b
+    202:202:net.minecraft.network.chat.Component lambda$static$2(java.lang.Integer,java.lang.String) -> a
+    199:200:net.minecraft.network.chat.Component lambda$static$1(java.lang.Integer,java.lang.String) -> b
+    195:196:net.minecraft.network.chat.Component lambda$static$0(java.lang.Integer,java.lang.String) -> c
+    193:193:java.util.function.BiFunction access$100(com.mojang.blaze3d.platform.InputConstants$Type) -> a
+    193:193:java.lang.String access$300(com.mojang.blaze3d.platform.InputConstants$Type) -> b
+    193:351:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.Lighting -> dgo:
+    com.mojang.math.Vector3f DIFFUSE_LIGHT_0 -> a
+    com.mojang.math.Vector3f DIFFUSE_LIGHT_1 -> b
+    com.mojang.math.Vector3f NETHER_DIFFUSE_LIGHT_0 -> c
+    com.mojang.math.Vector3f NETHER_DIFFUSE_LIGHT_1 -> d
+    16:19:void turnBackOn() -> a
+    22:24:void turnOff() -> b
+    27:28:void setupNetherLevel(com.mojang.math.Matrix4f) -> a
+    31:32:void setupLevel(com.mojang.math.Matrix4f) -> b
+    35:36:void setupForFlatItems() -> c
+    39:40:void setupFor3DItems() -> d
+    9:13:void <clinit>() -> <clinit>
+com.mojang.blaze3d.platform.MemoryTracker -> dgp:
     18:18:java.nio.ByteBuffer createByteBuffer(int) -> a
     38:38:java.nio.FloatBuffer createFloatBuffer(int) -> b
-com.mojang.blaze3d.platform.Monitor -> cxp:
+com.mojang.blaze3d.platform.Monitor -> dgq:
     long monitor -> a
     java.util.List videoModes -> b
     com.mojang.blaze3d.platform.VideoMode currentMode -> c
@@ -801,9 +821,9 @@ com.mojang.blaze3d.platform.Monitor -> cxp:
     80:80:int getModeCount() -> e
     84:84:long getMonitor() -> f
     89:89:java.lang.String toString() -> toString
-com.mojang.blaze3d.platform.MonitorCreator -> cxq:
+com.mojang.blaze3d.platform.MonitorCreator -> dgr:
     com.mojang.blaze3d.platform.Monitor createMonitor(long) -> createMonitor
-com.mojang.blaze3d.platform.NativeImage -> cxr:
+com.mojang.blaze3d.platform.NativeImage -> dgs:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Set OPEN_OPTIONS -> b
     com.mojang.blaze3d.platform.NativeImage$Format format -> c
@@ -830,7 +850,6 @@ com.mojang.blaze3d.platform.NativeImage -> cxr:
     188:195:int getPixelRGBA(int,int) -> a
     201:209:void setPixelRGBA(int,int,int) -> a
     262:269:byte getLuminanceOrAlpha(int,int) -> b
-    277:319:void blendPixel(int,int,int) -> b
     324:340:int[] makePixelArray() -> d
     344:345:void upload(int,int,int,boolean) -> a
     348:349:void upload(int,int,int,int,int,int,int,boolean,boolean) -> a
@@ -856,8 +875,8 @@ com.mojang.blaze3d.platform.NativeImage -> cxr:
     640:640:int combine(int,int,int,int) -> a
     356:357:void lambda$upload$0(int,int,int,int,int,int,int,boolean,boolean,boolean,boolean) -> c
     41:48:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.NativeImage$1 -> cxr$1:
-com.mojang.blaze3d.platform.NativeImage$Format -> cxr$a:
+com.mojang.blaze3d.platform.NativeImage$1 -> dgs$1:
+com.mojang.blaze3d.platform.NativeImage$Format -> dgs$a:
     com.mojang.blaze3d.platform.NativeImage$Format RGBA -> a
     com.mojang.blaze3d.platform.NativeImage$Format RGB -> b
     com.mojang.blaze3d.platform.NativeImage$Format LUMINANCE_ALPHA -> c
@@ -892,7 +911,7 @@ com.mojang.blaze3d.platform.NativeImage$Format -> cxr$a:
     662:662:int access$000(com.mojang.blaze3d.platform.NativeImage$Format) -> a
     662:662:com.mojang.blaze3d.platform.NativeImage$Format access$100(int) -> a
     662:684:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.NativeImage$InternalGlFormat -> cxr$b:
+com.mojang.blaze3d.platform.NativeImage$InternalGlFormat -> dgs$b:
     com.mojang.blaze3d.platform.NativeImage$InternalGlFormat RGBA -> a
     com.mojang.blaze3d.platform.NativeImage$InternalGlFormat RGB -> b
     com.mojang.blaze3d.platform.NativeImage$InternalGlFormat LUMINANCE_ALPHA -> c
@@ -905,20 +924,20 @@ com.mojang.blaze3d.platform.NativeImage$InternalGlFormat -> cxr$b:
     653:655:void <init>(java.lang.String,int,int) -> <init>
     658:658:int glFormat() -> a
     643:648:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.NativeImage$WriteCallback -> cxr$c:
+com.mojang.blaze3d.platform.NativeImage$WriteCallback -> dgs$c:
     java.nio.channels.WritableByteChannel output -> a
     java.io.IOException exception -> b
     464:466:void <init>(java.nio.channels.WritableByteChannel) -> <init>
     470:476:void invoke(long,long,int) -> invoke
     479:482:void throwIfException() -> a
     459:459:void <init>(java.nio.channels.WritableByteChannel,com.mojang.blaze3d.platform.NativeImage$1) -> <init>
-com.mojang.blaze3d.platform.PngInfo -> cxs:
+com.mojang.blaze3d.platform.PngInfo -> dgt:
     int width -> a
     int height -> b
     25:46:void <init>(java.lang.String,java.io.InputStream) -> <init>
     179:182:com.mojang.blaze3d.platform.PngInfo$StbReader createCallbacks(java.io.InputStream) -> a
-com.mojang.blaze3d.platform.PngInfo$1 -> cxs$1:
-com.mojang.blaze3d.platform.PngInfo$StbReader -> cxs$a:
+com.mojang.blaze3d.platform.PngInfo$1 -> dgt$1:
+com.mojang.blaze3d.platform.PngInfo$StbReader -> dgt$a:
     boolean closed -> a
     48:48:void <init>() -> <init>
     53:56:int read(long,long,int) -> a
@@ -928,7 +947,7 @@ com.mojang.blaze3d.platform.PngInfo$StbReader -> cxs$a:
     void skip(int) -> a
     void close() -> close
     48:48:void <init>(com.mojang.blaze3d.platform.PngInfo$1) -> <init>
-com.mojang.blaze3d.platform.PngInfo$StbReaderBufferedChannel -> cxs$b:
+com.mojang.blaze3d.platform.PngInfo$StbReaderBufferedChannel -> dgt$b:
     java.nio.channels.ReadableByteChannel channel -> b
     long readBufferAddress -> c
     int bufferSize -> d
@@ -940,7 +959,7 @@ com.mojang.blaze3d.platform.PngInfo$StbReaderBufferedChannel -> cxs$b:
     159:169:void skip(int) -> a
     173:175:void close() -> close
     109:109:void <init>(java.nio.channels.ReadableByteChannel,com.mojang.blaze3d.platform.PngInfo$1) -> <init>
-com.mojang.blaze3d.platform.PngInfo$StbReaderSeekableByteChannel -> cxs$c:
+com.mojang.blaze3d.platform.PngInfo$StbReaderSeekableByteChannel -> dgt$c:
     java.nio.channels.SeekableByteChannel channel -> b
     83:85:void <init>(java.nio.channels.SeekableByteChannel) -> <init>
     89:90:int read(long,int) -> b
@@ -948,7 +967,7 @@ com.mojang.blaze3d.platform.PngInfo$StbReaderSeekableByteChannel -> cxs$c:
     100:100:int eof(long) -> a
     105:106:void close() -> close
     80:80:void <init>(java.nio.channels.SeekableByteChannel,com.mojang.blaze3d.platform.PngInfo$1) -> <init>
-com.mojang.blaze3d.platform.ScreenManager -> cxt:
+com.mojang.blaze3d.platform.ScreenManager -> dgu:
     it.unimi.dsi.fastutil.longs.Long2ObjectMap monitors -> a
     com.mojang.blaze3d.platform.MonitorCreator monitorCreator -> b
     14:28:void <init>(com.mojang.blaze3d.platform.MonitorCreator) -> <init>
@@ -957,8 +976,8 @@ com.mojang.blaze3d.platform.ScreenManager -> cxt:
     48:79:com.mojang.blaze3d.platform.Monitor findBestMonitor(com.mojang.blaze3d.platform.Window) -> a
     83:89:int clamp(int,int,int) -> a
     93:98:void shutdown() -> a
-com.mojang.blaze3d.platform.SnooperAccess -> cxu:
-com.mojang.blaze3d.platform.TextureUtil -> cxv:
+com.mojang.blaze3d.platform.SnooperAccess -> dgv:
+com.mojang.blaze3d.platform.TextureUtil -> dgw:
     org.apache.logging.log4j.Logger LOGGER -> a
     32:33:int generateTextureId() -> a
     37:39:void releaseTextureId(int) -> a
@@ -971,7 +990,7 @@ com.mojang.blaze3d.platform.TextureUtil -> cxv:
     97:111:java.lang.String readResourceAsString(java.io.InputStream) -> b
     135:150:void initTexture(java.nio.IntBuffer,int,int) -> a
     24:24:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.VideoMode -> cxw:
+com.mojang.blaze3d.platform.VideoMode -> dgx:
     int width -> a
     int height -> b
     int redBits -> c
@@ -994,7 +1013,7 @@ com.mojang.blaze3d.platform.VideoMode -> cxw:
     102:130:java.util.Optional read(java.lang.String) -> a
     134:134:java.lang.String write() -> g
     99:99:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.Window -> cxx:
+com.mojang.blaze3d.platform.Window -> dgy:
     org.apache.logging.log4j.Logger LOGGER -> a
     org.lwjgl.glfw.GLFWErrorCallback defaultErrorCallback -> b
     com.mojang.blaze3d.platform.WindowEventHandler eventHandler -> c
@@ -1020,60 +1039,62 @@ com.mojang.blaze3d.platform.Window -> cxx:
     boolean dirty -> w
     int framerateLimit -> x
     boolean vsync -> y
-    30:116:void <init>(com.mojang.blaze3d.platform.WindowEventHandler,com.mojang.blaze3d.platform.ScreenManager,com.mojang.blaze3d.platform.DisplayData,java.lang.String,java.lang.String) -> <init>
-    119:120:int getRefreshRate() -> a
-    125:125:boolean shouldClose() -> b
-    129:139:void checkGlfwError(java.util.function.BiConsumer) -> a
-    142:183:void setIcon(java.io.InputStream,java.io.InputStream) -> a
-    187:197:java.nio.ByteBuffer readIconPixels(java.io.InputStream,java.nio.IntBuffer,java.nio.IntBuffer,java.nio.IntBuffer) -> a
-    201:202:void setErrorSection(java.lang.String) -> a
-    205:209:void setBootErrorCallback() -> u
-    212:215:void bootCrash(int,long) -> b
-    219:224:void defaultErrorCallback(int,long) -> a
-    227:231:void setDefaultErrorCallback() -> c
-    234:237:void updateVsync(boolean) -> a
-    241:246:void close() -> close
-    249:251:void onMove(long,int,int) -> a
-    254:269:void onFramebufferResize(long,int,int) -> b
-    272:279:void refreshFramebufferSize() -> v
-    282:284:void onResize(long,int,int) -> c
-    287:290:void onFocus(long,boolean) -> a
-    293:294:void setFramerateLimit(int) -> a
-    297:297:int getFramerateLimit() -> d
-    301:306:void updateDisplay() -> e
-    309:309:java.util.Optional getPreferredFullscreenVideoMode() -> f
-    313:318:void setPreferredFullscreenVideoMode(java.util.Optional) -> a
-    321:326:void changeFullscreenVideoMode() -> g
-    329:359:void setMode() -> w
-    362:363:void toggleFullScreen() -> h
-    366:375:void updateFullscreen(boolean) -> c
-    378:385:int calculateScale(int,boolean) -> a
-    389:394:void setGuiScale(double) -> a
-    397:398:void setTitle(java.lang.String) -> b
-    401:401:long getWindow() -> i
-    405:405:boolean isFullscreen() -> j
-    409:409:int getWidth() -> k
-    413:413:int getHeight() -> l
-    417:418:void setWidth(int) -> b
-    421:422:void setHeight(int) -> c
-    425:425:int getScreenWidth() -> m
-    429:429:int getScreenHeight() -> n
-    433:433:int getGuiScaledWidth() -> o
-    437:437:int getGuiScaledHeight() -> p
-    441:441:int getX() -> q
-    445:445:int getY() -> r
-    449:449:double getGuiScale() -> s
-    454:454:com.mojang.blaze3d.platform.Monitor findBestMonitor() -> t
-    458:459:void updateRawMouseInput(boolean) -> b
+    30:117:void <init>(com.mojang.blaze3d.platform.WindowEventHandler,com.mojang.blaze3d.platform.ScreenManager,com.mojang.blaze3d.platform.DisplayData,java.lang.String,java.lang.String) -> <init>
+    120:121:int getRefreshRate() -> a
+    126:126:boolean shouldClose() -> b
+    130:140:void checkGlfwError(java.util.function.BiConsumer) -> a
+    143:184:void setIcon(java.io.InputStream,java.io.InputStream) -> a
+    188:198:java.nio.ByteBuffer readIconPixels(java.io.InputStream,java.nio.IntBuffer,java.nio.IntBuffer,java.nio.IntBuffer) -> a
+    202:203:void setErrorSection(java.lang.String) -> a
+    206:210:void setBootErrorCallback() -> u
+    213:216:void bootCrash(int,long) -> b
+    220:225:void defaultErrorCallback(int,long) -> a
+    228:232:void setDefaultErrorCallback() -> c
+    235:238:void updateVsync(boolean) -> a
+    242:247:void close() -> close
+    250:252:void onMove(long,int,int) -> a
+    255:270:void onFramebufferResize(long,int,int) -> b
+    273:280:void refreshFramebufferSize() -> v
+    283:285:void onResize(long,int,int) -> c
+    288:291:void onFocus(long,boolean) -> a
+    294:297:void onEnter(long,boolean) -> b
+    300:301:void setFramerateLimit(int) -> a
+    304:304:int getFramerateLimit() -> d
+    308:313:void updateDisplay() -> e
+    316:316:java.util.Optional getPreferredFullscreenVideoMode() -> f
+    320:325:void setPreferredFullscreenVideoMode(java.util.Optional) -> a
+    328:333:void changeFullscreenVideoMode() -> g
+    336:366:void setMode() -> w
+    369:370:void toggleFullScreen() -> h
+    373:382:void updateFullscreen(boolean) -> c
+    385:392:int calculateScale(int,boolean) -> a
+    396:401:void setGuiScale(double) -> a
+    404:405:void setTitle(java.lang.String) -> b
+    408:408:long getWindow() -> i
+    412:412:boolean isFullscreen() -> j
+    416:416:int getWidth() -> k
+    420:420:int getHeight() -> l
+    424:425:void setWidth(int) -> b
+    428:429:void setHeight(int) -> c
+    432:432:int getScreenWidth() -> m
+    436:436:int getScreenHeight() -> n
+    440:440:int getGuiScaledWidth() -> o
+    444:444:int getGuiScaledHeight() -> p
+    448:448:int getX() -> q
+    452:452:int getY() -> r
+    456:456:double getGuiScale() -> s
+    461:461:com.mojang.blaze3d.platform.Monitor findBestMonitor() -> t
+    465:466:void updateRawMouseInput(boolean) -> b
     28:28:void <clinit>() -> <clinit>
-com.mojang.blaze3d.platform.Window$1 -> cxx$1:
-com.mojang.blaze3d.platform.Window$WindowInitFailed -> cxx$a:
-    463:464:void <init>(java.lang.String) -> <init>
-    461:461:void <init>(java.lang.String,com.mojang.blaze3d.platform.Window$1) -> <init>
-com.mojang.blaze3d.platform.WindowEventHandler -> cxy:
+com.mojang.blaze3d.platform.Window$1 -> dgy$1:
+com.mojang.blaze3d.platform.Window$WindowInitFailed -> dgy$a:
+    470:471:void <init>(java.lang.String) -> <init>
+    468:468:void <init>(java.lang.String,com.mojang.blaze3d.platform.Window$1) -> <init>
+com.mojang.blaze3d.platform.WindowEventHandler -> dgz:
     void setWindowActive(boolean) -> a
     void resizeDisplay() -> a
-com.mojang.blaze3d.shaders.AbstractUniform -> cxz:
+    void cursorEntered() -> b
+com.mojang.blaze3d.shaders.AbstractUniform -> dha:
     5:5:void <init>() -> <init>
     7:7:void set(float) -> a
     10:10:void set(float,float) -> a
@@ -1083,7 +1104,7 @@ com.mojang.blaze3d.shaders.AbstractUniform -> cxz:
     22:22:void setSafe(int,int,int,int) -> a
     37:37:void set(float[]) -> a
     100:100:void set(com.mojang.math.Matrix4f) -> a
-com.mojang.blaze3d.shaders.BlendMode -> cya:
+com.mojang.blaze3d.shaders.BlendMode -> dhb:
     com.mojang.blaze3d.shaders.BlendMode lastApplied -> a
     int srcColorFactor -> b
     int srcAlphaFactor -> c
@@ -1102,12 +1123,12 @@ com.mojang.blaze3d.shaders.BlendMode -> cya:
     112:112:boolean isOpaque() -> b
     116:132:int stringToBlendFunc(java.lang.String) -> a
     136:163:int stringToBlendFactor(java.lang.String) -> b
-com.mojang.blaze3d.shaders.Effect -> cyb:
+com.mojang.blaze3d.shaders.Effect -> dhc:
     int getId() -> a
     void markDirty() -> b
     com.mojang.blaze3d.shaders.Program getVertexProgram() -> c
     com.mojang.blaze3d.shaders.Program getFragmentProgram() -> d
-com.mojang.blaze3d.shaders.Program -> cyc:
+com.mojang.blaze3d.shaders.Program -> dhd:
     com.mojang.blaze3d.shaders.Program$Type type -> a
     java.lang.String name -> b
     int id -> c
@@ -1117,7 +1138,7 @@ com.mojang.blaze3d.shaders.Program -> cyc:
     37:44:void close() -> a
     47:47:java.lang.String getName() -> b
     51:67:com.mojang.blaze3d.shaders.Program compileShader(com.mojang.blaze3d.shaders.Program$Type,java.lang.String,java.io.InputStream) -> a
-com.mojang.blaze3d.shaders.Program$Type -> cyc$a:
+com.mojang.blaze3d.shaders.Program$Type -> dhd$a:
     com.mojang.blaze3d.shaders.Program$Type VERTEX -> a
     com.mojang.blaze3d.shaders.Program$Type FRAGMENT -> b
     java.lang.String name -> c
@@ -1134,14 +1155,14 @@ com.mojang.blaze3d.shaders.Program$Type -> cyc$a:
     98:98:java.util.Map getPrograms() -> c
     70:70:int access$000(com.mojang.blaze3d.shaders.Program$Type) -> a
     70:72:void <clinit>() -> <clinit>
-com.mojang.blaze3d.shaders.ProgramManager -> cyd:
+com.mojang.blaze3d.shaders.ProgramManager -> dhe:
     org.apache.logging.log4j.Logger LOGGER -> a
     15:17:void glUseProgram(int) -> a
     20:25:void releaseProgram(com.mojang.blaze3d.shaders.Effect) -> a
     28:35:int createProgram() -> a
     39:49:void linkProgram(com.mojang.blaze3d.shaders.Effect) -> b
     12:12:void <clinit>() -> <clinit>
-com.mojang.blaze3d.shaders.Uniform -> cye:
+com.mojang.blaze3d.shaders.Uniform -> dhf:
     org.apache.logging.log4j.Logger LOGGER -> a
     int location -> b
     int count -> c
@@ -1185,237 +1206,218 @@ com.mojang.blaze3d.systems.RenderSystem -> com.mojang.blaze3d.systems.RenderSyst
     int MAX_SUPPORTED_TEXTURE_SIZE -> MAX_SUPPORTED_TEXTURE_SIZE
     boolean isInInit -> isInInit
     double lastDrawTime -> lastDrawTime
-    27:27:void <init>() -> <init>
-    43:47:void initRenderThread() -> initRenderThread
-    51:51:boolean isOnRenderThread() -> isOnRenderThread
-    57:57:boolean isOnRenderThreadOrInit() -> isOnRenderThreadOrInit
-    61:66:void initGameThread(boolean) -> initGameThread
-    70:70:boolean isOnGameThread() -> isOnGameThread
-    76:76:boolean isOnGameThreadOrInit() -> isOnGameThreadOrInit
-    80:83:void assertThread(java.util.function.Supplier) -> assertThread
-    87:87:boolean isInInitPhase() -> isInInitPhase
-    93:94:void recordRenderCall(com.mojang.blaze3d.pipeline.RenderCall) -> recordRenderCall
-    98:106:void flipFrame(long) -> flipFrame
-    109:115:void replayQueue() -> replayQueue
-    120:127:void limitDisplayFPS(int) -> limitDisplayFPS
-    131:137:void pushLightingAttributes() -> pushLightingAttributes
-    141:147:void pushTextureAttributes() -> pushTextureAttributes
-    150:156:void popAttributes() -> popAttributes
-    160:166:void disableAlphaTest() -> disableAlphaTest
-    169:175:void enableAlphaTest() -> enableAlphaTest
-    178:186:void alphaFunc(int,float) -> alphaFunc
-    190:196:void enableLighting() -> enableLighting
-    199:205:void disableLighting() -> disableLighting
-    209:215:void enableColorMaterial() -> enableColorMaterial
-    218:224:void disableColorMaterial() -> disableColorMaterial
-    227:235:void colorMaterial(int,int) -> colorMaterial
-    238:246:void normal3f(float,float,float) -> normal3f
-    250:256:void disableDepthTest() -> disableDepthTest
-    259:265:void enableDepthTest() -> enableDepthTest
-    268:276:void depthFunc(int) -> depthFunc
-    279:287:void depthMask(boolean) -> depthMask
-    290:296:void enableBlend() -> enableBlend
-    300:306:void disableBlend() -> disableBlend
-    309:317:void blendFunc(com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor) -> blendFunc
-    320:328:void blendFunc(int,int) -> blendFunc
-    331:339:void blendFuncSeparate(com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor,com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor) -> blendFuncSeparate
-    342:350:void blendFuncSeparate(int,int,int,int) -> blendFuncSeparate
-    353:361:void blendEquation(int) -> blendEquation
-    364:372:void blendColor(float,float,float,float) -> blendColor
-    375:381:void enableFog() -> enableFog
-    384:390:void disableFog() -> disableFog
-    393:401:void fogMode(com.mojang.blaze3d.platform.GlStateManager$FogMode) -> fogMode
-    404:412:void fogMode(int) -> fogMode
-    415:423:void fogDensity(float) -> fogDensity
-    426:434:void fogStart(float) -> fogStart
-    437:445:void fogEnd(float) -> fogEnd
-    448:456:void fog(int,float,float,float,float) -> fog
-    459:467:void fogi(int,int) -> fogi
-    470:476:void enableCull() -> enableCull
-    479:485:void disableCull() -> disableCull
-    489:497:void polygonMode(int,int) -> polygonMode
-    500:506:void enablePolygonOffset() -> enablePolygonOffset
-    509:515:void disablePolygonOffset() -> disablePolygonOffset
-    518:524:void enableLineOffset() -> enableLineOffset
-    527:533:void disableLineOffset() -> disableLineOffset
-    536:544:void polygonOffset(float,float) -> polygonOffset
-    547:553:void enableColorLogicOp() -> enableColorLogicOp
-    556:562:void disableColorLogicOp() -> disableColorLogicOp
-    565:573:void logicOp(com.mojang.blaze3d.platform.GlStateManager$LogicOp) -> logicOp
-    577:585:void activeTexture(int) -> activeTexture
-    588:594:void enableTexture() -> enableTexture
-    597:603:void disableTexture() -> disableTexture
-    612:614:void texParameter(int,int,int) -> texParameter
-    617:625:void deleteTexture(int) -> deleteTexture
-    634:636:void bindTexture(int) -> bindTexture
-    639:647:void shadeModel(int) -> shadeModel
-    650:656:void enableRescaleNormal() -> enableRescaleNormal
-    659:665:void disableRescaleNormal() -> disableRescaleNormal
-    668:676:void viewport(int,int,int,int) -> viewport
-    680:688:void colorMask(boolean,boolean,boolean,boolean) -> colorMask
-    692:700:void stencilFunc(int,int,int) -> stencilFunc
-    703:711:void stencilMask(int) -> stencilMask
-    714:722:void stencilOp(int,int,int) -> stencilOp
-    726:734:void clearDepth(double) -> clearDepth
-    737:745:void clearColor(float,float,float,float) -> clearColor
-    748:756:void clearStencil(int) -> clearStencil
-    759:767:void clear(int,boolean) -> clear
-    771:779:void matrixMode(int) -> matrixMode
-    782:788:void loadIdentity() -> loadIdentity
-    791:797:void pushMatrix() -> pushMatrix
-    800:806:void popMatrix() -> popMatrix
-    809:817:void ortho(double,double,double,double,double,double) -> ortho
-    820:828:void rotatef(float,float,float,float) -> rotatef
-    831:839:void scalef(float,float,float) -> scalef
-    842:850:void scaled(double,double,double) -> scaled
-    853:861:void translatef(float,float,float) -> translatef
-    864:872:void translated(double,double,double) -> translated
-    875:884:void multMatrix(com.mojang.math.Matrix4f) -> multMatrix
-    887:895:void color4f(float,float,float,float) -> color4f
-    898:906:void color3f(float,float,float) -> color3f
-    909:915:void clearCurrentColor() -> clearCurrentColor
-    918:926:void drawArrays(int,int,int) -> drawArrays
-    929:937:void lineWidth(float) -> lineWidth
-    940:948:void pixelStore(int,int) -> pixelStore
-    957:959:void pixelTransfer(int,float) -> pixelTransfer
-    962:970:void readPixels(int,int,int,int,int,int,java.nio.ByteBuffer) -> readPixels
-    973:982:void getString(int,java.util.function.Consumer) -> getString
-    985:986:java.lang.String getBackendDescription() -> getBackendDescription
-    990:991:java.lang.String getApiDescription() -> getApiDescription
-    995:996:java.util.function.LongSupplier initBackendSystem() -> initBackendSystem
-    1000:1002:void initRenderer(int,boolean) -> initRenderer
-    1005:1007:void setErrorCallback(org.lwjgl.glfw.GLFWErrorCallbackI) -> setErrorCallback
-    1010:1018:void renderCrosshair(int) -> renderCrosshair
-    1021:1027:void setupNvFogDistance() -> setupNvFogDistance
-    1030:1038:void glMultiTexCoord2f(int,float,float) -> glMultiTexCoord2f
-    1041:1042:java.lang.String getCapsString() -> getCapsString
-    1046:1060:void setupDefaultState(int,int,int,int) -> setupDefaultState
-    1063:1079:int maxSupportedTextureSize() -> maxSupportedTextureSize
-    1089:1091:void glBindBuffer(int,java.util.function.Supplier) -> glBindBuffer
-    1094:1096:void glBufferData(int,java.nio.ByteBuffer,int) -> glBufferData
-    1099:1107:void glDeleteBuffers(int) -> glDeleteBuffers
-    1110:1118:void glUniform1i(int,int) -> glUniform1i
-    1121:1129:void glUniform1(int,java.nio.IntBuffer) -> glUniform1
-    1132:1140:void glUniform2(int,java.nio.IntBuffer) -> glUniform2
-    1143:1151:void glUniform3(int,java.nio.IntBuffer) -> glUniform3
-    1154:1162:void glUniform4(int,java.nio.IntBuffer) -> glUniform4
-    1165:1173:void glUniform1(int,java.nio.FloatBuffer) -> glUniform1
-    1176:1184:void glUniform2(int,java.nio.FloatBuffer) -> glUniform2
-    1187:1195:void glUniform3(int,java.nio.FloatBuffer) -> glUniform3
-    1198:1206:void glUniform4(int,java.nio.FloatBuffer) -> glUniform4
-    1209:1217:void glUniformMatrix2(int,boolean,java.nio.FloatBuffer) -> glUniformMatrix2
-    1220:1228:void glUniformMatrix3(int,boolean,java.nio.FloatBuffer) -> glUniformMatrix3
-    1231:1239:void glUniformMatrix4(int,boolean,java.nio.FloatBuffer) -> glUniformMatrix4
-    1242:1248:void setupOutline() -> setupOutline
-    1251:1257:void teardownOutline() -> teardownOutline
-    1260:1268:void setupOverlayColor(java.util.function.IntSupplier,int) -> setupOverlayColor
-    1271:1277:void teardownOverlayColor() -> teardownOverlayColor
-    1280:1286:void setupLevelDiffuseLighting(com.mojang.math.Matrix4f) -> setupLevelDiffuseLighting
-    1289:1295:void setupGuiFlatDiffuseLighting() -> setupGuiFlatDiffuseLighting
-    1298:1304:void setupGui3DDiffuseLighting() -> setupGui3DDiffuseLighting
-    1307:1313:void mulTextureByProjModelView() -> mulTextureByProjModelView
-    1316:1322:void setupEndPortalTexGen() -> setupEndPortalTexGen
-    1325:1331:void clearTexGen() -> clearTexGen
-    1334:1335:void beginInitialization() -> beginInitialization
-    1338:1345:void finishInitialization() -> finishInitialization
-    1348:1355:void glGenBuffers(java.util.function.Consumer) -> glGenBuffers
-    1358:1359:com.mojang.blaze3d.vertex.Tesselator renderThreadTesselator() -> renderThreadTesselator
-    1363:1364:void defaultBlendFunc() -> defaultBlendFunc
-    1367:1368:void defaultAlphaFunc() -> defaultAlphaFunc
-    1350:1351:void lambda$glGenBuffers$69(java.util.function.Consumer) -> lambda$glGenBuffers$69
-    1282:1282:void lambda$setupLevelDiffuseLighting$68(com.mojang.math.Matrix4f) -> lambda$setupLevelDiffuseLighting$68
-    1263:1264:void lambda$setupOverlayColor$67(java.util.function.IntSupplier,int) -> lambda$setupOverlayColor$67
-    1234:1235:void lambda$glUniformMatrix4$66(int,boolean,java.nio.FloatBuffer) -> lambda$glUniformMatrix4$66
-    1223:1224:void lambda$glUniformMatrix3$65(int,boolean,java.nio.FloatBuffer) -> lambda$glUniformMatrix3$65
-    1212:1213:void lambda$glUniformMatrix2$64(int,boolean,java.nio.FloatBuffer) -> lambda$glUniformMatrix2$64
-    1201:1202:void lambda$glUniform4$63(int,java.nio.FloatBuffer) -> lambda$glUniform4$63
-    1190:1191:void lambda$glUniform3$62(int,java.nio.FloatBuffer) -> lambda$glUniform3$62
-    1179:1180:void lambda$glUniform2$61(int,java.nio.FloatBuffer) -> lambda$glUniform2$61
-    1168:1169:void lambda$glUniform1$60(int,java.nio.FloatBuffer) -> lambda$glUniform1$60
-    1157:1158:void lambda$glUniform4$59(int,java.nio.IntBuffer) -> lambda$glUniform4$59
-    1146:1147:void lambda$glUniform3$58(int,java.nio.IntBuffer) -> lambda$glUniform3$58
-    1135:1136:void lambda$glUniform2$57(int,java.nio.IntBuffer) -> lambda$glUniform2$57
-    1124:1125:void lambda$glUniform1$56(int,java.nio.IntBuffer) -> lambda$glUniform1$56
-    1113:1114:void lambda$glUniform1i$55(int,int) -> lambda$glUniform1i$55
-    1102:1103:void lambda$glDeleteBuffers$54(int) -> lambda$glDeleteBuffers$54
-    1086:1087:void lambda$glBindBuffer$53(int,java.util.function.Supplier) -> lambda$glBindBuffer$53
-    1033:1034:void lambda$glMultiTexCoord2f$52(int,float,float) -> lambda$glMultiTexCoord2f$52
-    1013:1014:void lambda$renderCrosshair$51(int) -> lambda$renderCrosshair$51
-    976:978:void lambda$getString$50(int,java.util.function.Consumer) -> lambda$getString$50
-    965:966:void lambda$readPixels$49(int,int,int,int,int,int,java.nio.ByteBuffer) -> lambda$readPixels$49
-    954:955:void lambda$pixelTransfer$48(int,float) -> lambda$pixelTransfer$48
-    943:944:void lambda$pixelStore$47(int,int) -> lambda$pixelStore$47
-    932:933:void lambda$lineWidth$46(float) -> lambda$lineWidth$46
-    921:922:void lambda$drawArrays$45(int,int,int) -> lambda$drawArrays$45
-    901:902:void lambda$color3f$44(float,float,float) -> lambda$color3f$44
-    890:891:void lambda$color4f$43(float,float,float,float) -> lambda$color4f$43
-    879:880:void lambda$multMatrix$42(com.mojang.math.Matrix4f) -> lambda$multMatrix$42
-    867:868:void lambda$translated$41(double,double,double) -> lambda$translated$41
-    856:857:void lambda$translatef$40(float,float,float) -> lambda$translatef$40
-    845:846:void lambda$scaled$39(double,double,double) -> lambda$scaled$39
-    834:835:void lambda$scalef$38(float,float,float) -> lambda$scalef$38
-    823:824:void lambda$rotatef$37(float,float,float,float) -> lambda$rotatef$37
-    812:813:void lambda$ortho$36(double,double,double,double,double,double) -> lambda$ortho$36
-    774:775:void lambda$matrixMode$35(int) -> lambda$matrixMode$35
-    762:763:void lambda$clear$34(int,boolean) -> lambda$clear$34
-    751:752:void lambda$clearStencil$33(int) -> lambda$clearStencil$33
-    740:741:void lambda$clearColor$32(float,float,float,float) -> lambda$clearColor$32
-    729:730:void lambda$clearDepth$31(double) -> lambda$clearDepth$31
-    717:718:void lambda$stencilOp$30(int,int,int) -> lambda$stencilOp$30
-    706:707:void lambda$stencilMask$29(int) -> lambda$stencilMask$29
-    695:696:void lambda$stencilFunc$28(int,int,int) -> lambda$stencilFunc$28
-    683:684:void lambda$colorMask$27(boolean,boolean,boolean,boolean) -> lambda$colorMask$27
-    671:672:void lambda$viewport$26(int,int,int,int) -> lambda$viewport$26
-    642:643:void lambda$shadeModel$25(int) -> lambda$shadeModel$25
-    631:632:void lambda$bindTexture$24(int) -> lambda$bindTexture$24
-    620:621:void lambda$deleteTexture$23(int) -> lambda$deleteTexture$23
-    609:610:void lambda$texParameter$22(int,int,int) -> lambda$texParameter$22
-    580:581:void lambda$activeTexture$21(int) -> lambda$activeTexture$21
-    568:569:void lambda$logicOp$20(com.mojang.blaze3d.platform.GlStateManager$LogicOp) -> lambda$logicOp$20
-    539:540:void lambda$polygonOffset$19(float,float) -> lambda$polygonOffset$19
-    492:493:void lambda$polygonMode$18(int,int) -> lambda$polygonMode$18
-    462:463:void lambda$fogi$17(int,int) -> lambda$fogi$17
-    451:452:void lambda$fog$16(int,float,float,float,float) -> lambda$fog$16
-    440:441:void lambda$fogEnd$15(float) -> lambda$fogEnd$15
-    429:430:void lambda$fogStart$14(float) -> lambda$fogStart$14
-    418:419:void lambda$fogDensity$13(float) -> lambda$fogDensity$13
-    407:408:void lambda$fogMode$12(int) -> lambda$fogMode$12
-    396:397:void lambda$fogMode$11(com.mojang.blaze3d.platform.GlStateManager$FogMode) -> lambda$fogMode$11
-    367:368:void lambda$blendColor$10(float,float,float,float) -> lambda$blendColor$10
-    356:357:void lambda$blendEquation$9(int) -> lambda$blendEquation$9
-    345:346:void lambda$blendFuncSeparate$8(int,int,int,int) -> lambda$blendFuncSeparate$8
-    334:335:void lambda$blendFuncSeparate$7(com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor,com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor) -> lambda$blendFuncSeparate$7
-    323:324:void lambda$blendFunc$6(int,int) -> lambda$blendFunc$6
-    312:313:void lambda$blendFunc$5(com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor) -> lambda$blendFunc$5
-    282:283:void lambda$depthMask$4(boolean) -> lambda$depthMask$4
-    271:272:void lambda$depthFunc$3(int) -> lambda$depthFunc$3
-    241:242:void lambda$normal3f$2(float,float,float) -> lambda$normal3f$2
-    230:231:void lambda$colorMaterial$1(int,int) -> lambda$colorMaterial$1
-    181:182:void lambda$alphaFunc$0(int,float) -> lambda$alphaFunc$0
-    28:40:void <clinit>() -> <clinit>
-com.mojang.blaze3d.vertex.BreakingTextureGenerator -> cyf:
-    com.mojang.blaze3d.vertex.VertexConsumer delegate -> g
-    com.mojang.math.Matrix4f cameraInversePose -> h
-    com.mojang.math.Matrix3f normalPose -> i
-    float x -> j
-    float y -> k
-    float z -> l
-    int overlayU -> m
-    int overlayV -> n
-    int lightCoords -> o
-    float nx -> p
-    float ny -> q
-    float nz -> r
-    29:36:void <init>(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.blaze3d.vertex.PoseStack$Pose) -> <init>
-    39:48:void resetState() -> b
-    52:70:void endVertex() -> a
-    74:77:com.mojang.blaze3d.vertex.VertexConsumer vertex(double,double,double) -> a
-    83:83:com.mojang.blaze3d.vertex.VertexConsumer color(int,int,int,int) -> a
-    89:89:com.mojang.blaze3d.vertex.VertexConsumer uv(float,float) -> a
-    94:96:com.mojang.blaze3d.vertex.VertexConsumer overlayCoords(int,int) -> a
-    101:102:com.mojang.blaze3d.vertex.VertexConsumer uv2(int,int) -> b
-    107:110:com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> a
-com.mojang.blaze3d.vertex.BufferBuilder -> cyg:
+    31:31:void <init>() -> <init>
+    47:51:void initRenderThread() -> initRenderThread
+    55:55:boolean isOnRenderThread() -> isOnRenderThread
+    61:61:boolean isOnRenderThreadOrInit() -> isOnRenderThreadOrInit
+    65:70:void initGameThread(boolean) -> initGameThread
+    74:74:boolean isOnGameThread() -> isOnGameThread
+    80:80:boolean isOnGameThreadOrInit() -> isOnGameThreadOrInit
+    84:87:void assertThread(java.util.function.Supplier) -> assertThread
+    91:91:boolean isInInitPhase() -> isInInitPhase
+    97:98:void recordRenderCall(com.mojang.blaze3d.pipeline.RenderCall) -> recordRenderCall
+    102:110:void flipFrame(long) -> flipFrame
+    113:119:void replayQueue() -> replayQueue
+    124:131:void limitDisplayFPS(int) -> limitDisplayFPS
+    136:142:void pushLightingAttributes() -> pushLightingAttributes
+    147:153:void pushTextureAttributes() -> pushTextureAttributes
+    157:163:void popAttributes() -> popAttributes
+    168:174:void disableAlphaTest() -> disableAlphaTest
+    178:184:void enableAlphaTest() -> enableAlphaTest
+    188:196:void alphaFunc(int,float) -> alphaFunc
+    201:207:void enableLighting() -> enableLighting
+    211:217:void disableLighting() -> disableLighting
+    222:228:void enableColorMaterial() -> enableColorMaterial
+    232:238:void disableColorMaterial() -> disableColorMaterial
+    242:250:void colorMaterial(int,int) -> colorMaterial
+    254:262:void normal3f(float,float,float) -> normal3f
+    266:272:void disableDepthTest() -> disableDepthTest
+    275:281:void enableDepthTest() -> enableDepthTest
+    284:292:void depthFunc(int) -> depthFunc
+    295:303:void depthMask(boolean) -> depthMask
+    306:312:void enableBlend() -> enableBlend
+    316:322:void disableBlend() -> disableBlend
+    325:333:void blendFunc(com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor) -> blendFunc
+    336:344:void blendFunc(int,int) -> blendFunc
+    347:355:void blendFuncSeparate(com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor,com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor) -> blendFuncSeparate
+    358:366:void blendFuncSeparate(int,int,int,int) -> blendFuncSeparate
+    369:377:void blendEquation(int) -> blendEquation
+    380:388:void blendColor(float,float,float,float) -> blendColor
+    392:398:void enableFog() -> enableFog
+    402:408:void disableFog() -> disableFog
+    412:420:void fogMode(com.mojang.blaze3d.platform.GlStateManager$FogMode) -> fogMode
+    424:432:void fogMode(int) -> fogMode
+    436:444:void fogDensity(float) -> fogDensity
+    448:456:void fogStart(float) -> fogStart
+    460:468:void fogEnd(float) -> fogEnd
+    472:480:void fog(int,float,float,float,float) -> fog
+    484:492:void fogi(int,int) -> fogi
+    495:501:void enableCull() -> enableCull
+    504:510:void disableCull() -> disableCull
+    514:522:void polygonMode(int,int) -> polygonMode
+    525:531:void enablePolygonOffset() -> enablePolygonOffset
+    534:540:void disablePolygonOffset() -> disablePolygonOffset
+    543:549:void enableLineOffset() -> enableLineOffset
+    552:558:void disableLineOffset() -> disableLineOffset
+    561:569:void polygonOffset(float,float) -> polygonOffset
+    572:578:void enableColorLogicOp() -> enableColorLogicOp
+    581:587:void disableColorLogicOp() -> disableColorLogicOp
+    590:598:void logicOp(com.mojang.blaze3d.platform.GlStateManager$LogicOp) -> logicOp
+    602:610:void activeTexture(int) -> activeTexture
+    613:619:void enableTexture() -> enableTexture
+    622:628:void disableTexture() -> disableTexture
+    637:639:void texParameter(int,int,int) -> texParameter
+    642:650:void deleteTexture(int) -> deleteTexture
+    659:661:void bindTexture(int) -> bindTexture
+    665:673:void shadeModel(int) -> shadeModel
+    677:683:void enableRescaleNormal() -> enableRescaleNormal
+    687:693:void disableRescaleNormal() -> disableRescaleNormal
+    696:704:void viewport(int,int,int,int) -> viewport
+    708:716:void colorMask(boolean,boolean,boolean,boolean) -> colorMask
+    720:728:void stencilFunc(int,int,int) -> stencilFunc
+    731:739:void stencilMask(int) -> stencilMask
+    742:750:void stencilOp(int,int,int) -> stencilOp
+    754:762:void clearDepth(double) -> clearDepth
+    765:773:void clearColor(float,float,float,float) -> clearColor
+    776:784:void clearStencil(int) -> clearStencil
+    787:795:void clear(int,boolean) -> clear
+    800:808:void matrixMode(int) -> matrixMode
+    812:818:void loadIdentity() -> loadIdentity
+    822:828:void pushMatrix() -> pushMatrix
+    832:838:void popMatrix() -> popMatrix
+    842:850:void ortho(double,double,double,double,double,double) -> ortho
+    854:862:void rotatef(float,float,float,float) -> rotatef
+    866:874:void scalef(float,float,float) -> scalef
+    878:886:void scaled(double,double,double) -> scaled
+    890:898:void translatef(float,float,float) -> translatef
+    902:910:void translated(double,double,double) -> translated
+    914:923:void multMatrix(com.mojang.math.Matrix4f) -> multMatrix
+    927:935:void color4f(float,float,float,float) -> color4f
+    939:947:void color3f(float,float,float) -> color3f
+    951:957:void clearCurrentColor() -> clearCurrentColor
+    960:968:void drawArrays(int,int,int) -> drawArrays
+    971:979:void lineWidth(float) -> lineWidth
+    982:990:void pixelStore(int,int) -> pixelStore
+    999:1001:void pixelTransfer(int,float) -> pixelTransfer
+    1004:1012:void readPixels(int,int,int,int,int,int,java.nio.ByteBuffer) -> readPixels
+    1015:1024:void getString(int,java.util.function.Consumer) -> getString
+    1027:1028:java.lang.String getBackendDescription() -> getBackendDescription
+    1032:1033:java.lang.String getApiDescription() -> getApiDescription
+    1037:1038:java.util.function.LongSupplier initBackendSystem() -> initBackendSystem
+    1042:1044:void initRenderer(int,boolean) -> initRenderer
+    1047:1049:void setErrorCallback(org.lwjgl.glfw.GLFWErrorCallbackI) -> setErrorCallback
+    1052:1060:void renderCrosshair(int) -> renderCrosshair
+    1063:1069:void setupNvFogDistance() -> setupNvFogDistance
+    1073:1081:void glMultiTexCoord2f(int,float,float) -> glMultiTexCoord2f
+    1084:1085:java.lang.String getCapsString() -> getCapsString
+    1089:1103:void setupDefaultState(int,int,int,int) -> setupDefaultState
+    1106:1122:int maxSupportedTextureSize() -> maxSupportedTextureSize
+    1132:1134:void glBindBuffer(int,java.util.function.Supplier) -> glBindBuffer
+    1137:1139:void glBufferData(int,java.nio.ByteBuffer,int) -> glBufferData
+    1142:1150:void glDeleteBuffers(int) -> glDeleteBuffers
+    1153:1161:void glUniform1i(int,int) -> glUniform1i
+    1164:1172:void glUniform1(int,java.nio.IntBuffer) -> glUniform1
+    1175:1183:void glUniform2(int,java.nio.IntBuffer) -> glUniform2
+    1186:1194:void glUniform3(int,java.nio.IntBuffer) -> glUniform3
+    1197:1205:void glUniform4(int,java.nio.IntBuffer) -> glUniform4
+    1208:1216:void glUniform1(int,java.nio.FloatBuffer) -> glUniform1
+    1219:1227:void glUniform2(int,java.nio.FloatBuffer) -> glUniform2
+    1230:1238:void glUniform3(int,java.nio.FloatBuffer) -> glUniform3
+    1241:1249:void glUniform4(int,java.nio.FloatBuffer) -> glUniform4
+    1252:1260:void glUniformMatrix2(int,boolean,java.nio.FloatBuffer) -> glUniformMatrix2
+    1263:1271:void glUniformMatrix3(int,boolean,java.nio.FloatBuffer) -> glUniformMatrix3
+    1274:1282:void glUniformMatrix4(int,boolean,java.nio.FloatBuffer) -> glUniformMatrix4
+    1285:1291:void setupOutline() -> setupOutline
+    1294:1300:void teardownOutline() -> teardownOutline
+    1303:1311:void setupOverlayColor(java.util.function.IntSupplier,int) -> setupOverlayColor
+    1314:1320:void teardownOverlayColor() -> teardownOverlayColor
+    1323:1329:void setupLevelDiffuseLighting(com.mojang.math.Vector3f,com.mojang.math.Vector3f,com.mojang.math.Matrix4f) -> setupLevelDiffuseLighting
+    1332:1338:void setupGuiFlatDiffuseLighting(com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> setupGuiFlatDiffuseLighting
+    1341:1347:void setupGui3DDiffuseLighting(com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> setupGui3DDiffuseLighting
+    1350:1356:void mulTextureByProjModelView() -> mulTextureByProjModelView
+    1359:1365:void setupEndPortalTexGen() -> setupEndPortalTexGen
+    1368:1374:void clearTexGen() -> clearTexGen
+    1377:1378:void beginInitialization() -> beginInitialization
+    1381:1388:void finishInitialization() -> finishInitialization
+    1391:1398:void glGenBuffers(java.util.function.Consumer) -> glGenBuffers
+    1401:1402:com.mojang.blaze3d.vertex.Tesselator renderThreadTesselator() -> renderThreadTesselator
+    1406:1407:void defaultBlendFunc() -> defaultBlendFunc
+    1410:1411:void defaultAlphaFunc() -> defaultAlphaFunc
+    1415:1427:void runAsFancy(java.lang.Runnable) -> runAsFancy
+    1393:1394:void lambda$glGenBuffers$71(java.util.function.Consumer) -> lambda$glGenBuffers$71
+    1343:1343:void lambda$setupGui3DDiffuseLighting$70(com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> lambda$setupGui3DDiffuseLighting$70
+    1334:1334:void lambda$setupGuiFlatDiffuseLighting$69(com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> lambda$setupGuiFlatDiffuseLighting$69
+    1325:1325:void lambda$setupLevelDiffuseLighting$68(com.mojang.math.Vector3f,com.mojang.math.Vector3f,com.mojang.math.Matrix4f) -> lambda$setupLevelDiffuseLighting$68
+    1306:1307:void lambda$setupOverlayColor$67(java.util.function.IntSupplier,int) -> lambda$setupOverlayColor$67
+    1277:1278:void lambda$glUniformMatrix4$66(int,boolean,java.nio.FloatBuffer) -> lambda$glUniformMatrix4$66
+    1266:1267:void lambda$glUniformMatrix3$65(int,boolean,java.nio.FloatBuffer) -> lambda$glUniformMatrix3$65
+    1255:1256:void lambda$glUniformMatrix2$64(int,boolean,java.nio.FloatBuffer) -> lambda$glUniformMatrix2$64
+    1244:1245:void lambda$glUniform4$63(int,java.nio.FloatBuffer) -> lambda$glUniform4$63
+    1233:1234:void lambda$glUniform3$62(int,java.nio.FloatBuffer) -> lambda$glUniform3$62
+    1222:1223:void lambda$glUniform2$61(int,java.nio.FloatBuffer) -> lambda$glUniform2$61
+    1211:1212:void lambda$glUniform1$60(int,java.nio.FloatBuffer) -> lambda$glUniform1$60
+    1200:1201:void lambda$glUniform4$59(int,java.nio.IntBuffer) -> lambda$glUniform4$59
+    1189:1190:void lambda$glUniform3$58(int,java.nio.IntBuffer) -> lambda$glUniform3$58
+    1178:1179:void lambda$glUniform2$57(int,java.nio.IntBuffer) -> lambda$glUniform2$57
+    1167:1168:void lambda$glUniform1$56(int,java.nio.IntBuffer) -> lambda$glUniform1$56
+    1156:1157:void lambda$glUniform1i$55(int,int) -> lambda$glUniform1i$55
+    1145:1146:void lambda$glDeleteBuffers$54(int) -> lambda$glDeleteBuffers$54
+    1129:1130:void lambda$glBindBuffer$53(int,java.util.function.Supplier) -> lambda$glBindBuffer$53
+    1076:1077:void lambda$glMultiTexCoord2f$52(int,float,float) -> lambda$glMultiTexCoord2f$52
+    1055:1056:void lambda$renderCrosshair$51(int) -> lambda$renderCrosshair$51
+    1018:1020:void lambda$getString$50(int,java.util.function.Consumer) -> lambda$getString$50
+    1007:1008:void lambda$readPixels$49(int,int,int,int,int,int,java.nio.ByteBuffer) -> lambda$readPixels$49
+    996:997:void lambda$pixelTransfer$48(int,float) -> lambda$pixelTransfer$48
+    985:986:void lambda$pixelStore$47(int,int) -> lambda$pixelStore$47
+    974:975:void lambda$lineWidth$46(float) -> lambda$lineWidth$46
+    963:964:void lambda$drawArrays$45(int,int,int) -> lambda$drawArrays$45
+    942:943:void lambda$color3f$44(float,float,float) -> lambda$color3f$44
+    930:931:void lambda$color4f$43(float,float,float,float) -> lambda$color4f$43
+    918:919:void lambda$multMatrix$42(com.mojang.math.Matrix4f) -> lambda$multMatrix$42
+    905:906:void lambda$translated$41(double,double,double) -> lambda$translated$41
+    893:894:void lambda$translatef$40(float,float,float) -> lambda$translatef$40
+    881:882:void lambda$scaled$39(double,double,double) -> lambda$scaled$39
+    869:870:void lambda$scalef$38(float,float,float) -> lambda$scalef$38
+    857:858:void lambda$rotatef$37(float,float,float,float) -> lambda$rotatef$37
+    845:846:void lambda$ortho$36(double,double,double,double,double,double) -> lambda$ortho$36
+    803:804:void lambda$matrixMode$35(int) -> lambda$matrixMode$35
+    790:791:void lambda$clear$34(int,boolean) -> lambda$clear$34
+    779:780:void lambda$clearStencil$33(int) -> lambda$clearStencil$33
+    768:769:void lambda$clearColor$32(float,float,float,float) -> lambda$clearColor$32
+    757:758:void lambda$clearDepth$31(double) -> lambda$clearDepth$31
+    745:746:void lambda$stencilOp$30(int,int,int) -> lambda$stencilOp$30
+    734:735:void lambda$stencilMask$29(int) -> lambda$stencilMask$29
+    723:724:void lambda$stencilFunc$28(int,int,int) -> lambda$stencilFunc$28
+    711:712:void lambda$colorMask$27(boolean,boolean,boolean,boolean) -> lambda$colorMask$27
+    699:700:void lambda$viewport$26(int,int,int,int) -> lambda$viewport$26
+    668:669:void lambda$shadeModel$25(int) -> lambda$shadeModel$25
+    656:657:void lambda$bindTexture$24(int) -> lambda$bindTexture$24
+    645:646:void lambda$deleteTexture$23(int) -> lambda$deleteTexture$23
+    634:635:void lambda$texParameter$22(int,int,int) -> lambda$texParameter$22
+    605:606:void lambda$activeTexture$21(int) -> lambda$activeTexture$21
+    593:594:void lambda$logicOp$20(com.mojang.blaze3d.platform.GlStateManager$LogicOp) -> lambda$logicOp$20
+    564:565:void lambda$polygonOffset$19(float,float) -> lambda$polygonOffset$19
+    517:518:void lambda$polygonMode$18(int,int) -> lambda$polygonMode$18
+    487:488:void lambda$fogi$17(int,int) -> lambda$fogi$17
+    475:476:void lambda$fog$16(int,float,float,float,float) -> lambda$fog$16
+    463:464:void lambda$fogEnd$15(float) -> lambda$fogEnd$15
+    451:452:void lambda$fogStart$14(float) -> lambda$fogStart$14
+    439:440:void lambda$fogDensity$13(float) -> lambda$fogDensity$13
+    427:428:void lambda$fogMode$12(int) -> lambda$fogMode$12
+    415:416:void lambda$fogMode$11(com.mojang.blaze3d.platform.GlStateManager$FogMode) -> lambda$fogMode$11
+    383:384:void lambda$blendColor$10(float,float,float,float) -> lambda$blendColor$10
+    372:373:void lambda$blendEquation$9(int) -> lambda$blendEquation$9
+    361:362:void lambda$blendFuncSeparate$8(int,int,int,int) -> lambda$blendFuncSeparate$8
+    350:351:void lambda$blendFuncSeparate$7(com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor,com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor) -> lambda$blendFuncSeparate$7
+    339:340:void lambda$blendFunc$6(int,int) -> lambda$blendFunc$6
+    328:329:void lambda$blendFunc$5(com.mojang.blaze3d.platform.GlStateManager$SourceFactor,com.mojang.blaze3d.platform.GlStateManager$DestFactor) -> lambda$blendFunc$5
+    298:299:void lambda$depthMask$4(boolean) -> lambda$depthMask$4
+    287:288:void lambda$depthFunc$3(int) -> lambda$depthFunc$3
+    257:258:void lambda$normal3f$2(float,float,float) -> lambda$normal3f$2
+    245:246:void lambda$colorMaterial$1(int,int) -> lambda$colorMaterial$1
+    191:192:void lambda$alphaFunc$0(int,float) -> lambda$alphaFunc$0
+    32:44:void <clinit>() -> <clinit>
+com.mojang.blaze3d.vertex.BufferBuilder -> dhg:
     org.apache.logging.log4j.Logger LOGGER -> g
     java.nio.ByteBuffer buffer -> h
     java.util.List vertexCounts -> i
@@ -1432,21 +1434,21 @@ com.mojang.blaze3d.vertex.BufferBuilder -> cyg:
     boolean fullFormat -> t
     boolean building -> u
     27:48:void <init>(int) -> <init>
-    51:52:void ensureVertexCapacity() -> b
+    51:52:void ensureVertexCapacity() -> a
     55:69:void ensureCapacity(int) -> c
     72:86:int roundUp(int) -> d
-    93:159:void sortQuads(float,float,float) -> b
+    93:159:void sortQuads(float,float,float) -> a
     162:165:void limitToVertex(java.nio.FloatBuffer,int) -> a
-    168:173:com.mojang.blaze3d.vertex.BufferBuilder$State getState() -> c
+    168:173:com.mojang.blaze3d.vertex.BufferBuilder$State getState() -> b
     177:194:float getQuadDistanceFromPlayer(java.nio.FloatBuffer,float,float,float,int,int) -> a
     198:211:void restoreState(com.mojang.blaze3d.vertex.BufferBuilder$State) -> a
     214:225:void begin(int,com.mojang.blaze3d.vertex.VertexFormat) -> a
     228:239:void switchFormat(com.mojang.blaze3d.vertex.VertexFormat) -> a
-    242:253:void end() -> d
+    242:253:void end() -> c
     257:258:void putByte(int,byte) -> a
     262:263:void putShort(int,short) -> a
     267:268:void putFloat(int,float) -> a
-    272:277:void endVertex() -> a
+    272:277:void endVertex() -> d
     281:294:void nextElement() -> e
     298:301:com.mojang.blaze3d.vertex.VertexConsumer color(int,int,int,int) -> a
     306:345:void vertex(float,float,float,float,float,float,float,float,float,int,int,float,float,float) -> a
@@ -1457,8 +1459,8 @@ com.mojang.blaze3d.vertex.BufferBuilder -> cyg:
     384:384:boolean building() -> j
     109:109:int lambda$sortQuads$0(float[],int,int) -> a
     22:22:void <clinit>() -> <clinit>
-com.mojang.blaze3d.vertex.BufferBuilder$1 -> cyg$1:
-com.mojang.blaze3d.vertex.BufferBuilder$DrawState -> cyg$a:
+com.mojang.blaze3d.vertex.BufferBuilder$1 -> dhg$1:
+com.mojang.blaze3d.vertex.BufferBuilder$DrawState -> dhg$a:
     com.mojang.blaze3d.vertex.VertexFormat format -> a
     int vertexCount -> b
     int mode -> c
@@ -1467,18 +1469,18 @@ com.mojang.blaze3d.vertex.BufferBuilder$DrawState -> cyg$a:
     413:413:int vertexCount() -> b
     417:417:int mode() -> c
     397:397:void <init>(com.mojang.blaze3d.vertex.VertexFormat,int,int,com.mojang.blaze3d.vertex.BufferBuilder$1) -> <init>
-com.mojang.blaze3d.vertex.BufferBuilder$State -> cyg$b:
+com.mojang.blaze3d.vertex.BufferBuilder$State -> dhg$b:
     java.nio.ByteBuffer data -> a
     com.mojang.blaze3d.vertex.VertexFormat format -> b
     391:394:void <init>(java.nio.ByteBuffer,com.mojang.blaze3d.vertex.VertexFormat) -> <init>
     387:387:void <init>(java.nio.ByteBuffer,com.mojang.blaze3d.vertex.VertexFormat,com.mojang.blaze3d.vertex.BufferBuilder$1) -> <init>
     387:387:java.nio.ByteBuffer access$100(com.mojang.blaze3d.vertex.BufferBuilder$State) -> a
     387:387:com.mojang.blaze3d.vertex.VertexFormat access$200(com.mojang.blaze3d.vertex.BufferBuilder$State) -> b
-com.mojang.blaze3d.vertex.BufferUploader -> cyh:
+com.mojang.blaze3d.vertex.BufferUploader -> dhh:
     15:26:void end(com.mojang.blaze3d.vertex.BufferBuilder) -> a
     39:48:void _end(java.nio.ByteBuffer,int,com.mojang.blaze3d.vertex.VertexFormat,int) -> a
     17:20:void lambda$end$0(com.mojang.blaze3d.vertex.BufferBuilder) -> b
-com.mojang.blaze3d.vertex.BufferVertexConsumer -> cyi:
+com.mojang.blaze3d.vertex.BufferVertexConsumer -> dhi:
     com.mojang.blaze3d.vertex.VertexFormatElement currentElement() -> i
     void nextElement() -> e
     void putByte(int,byte) -> a
@@ -1490,9 +1492,9 @@ com.mojang.blaze3d.vertex.BufferVertexConsumer -> cyi:
     63:63:com.mojang.blaze3d.vertex.VertexConsumer overlayCoords(int,int) -> a
     68:68:com.mojang.blaze3d.vertex.VertexConsumer uv2(int,int) -> b
     73:83:com.mojang.blaze3d.vertex.VertexConsumer uvShort(short,short,int) -> a
-    88:99:com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> a
+    88:99:com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> b
     103:103:byte normalIntValue(float) -> a
-com.mojang.blaze3d.vertex.DefaultVertexFormat -> cyj:
+com.mojang.blaze3d.vertex.DefaultVertexFormat -> dhj:
     com.mojang.blaze3d.vertex.VertexFormatElement ELEMENT_POSITION -> a
     com.mojang.blaze3d.vertex.VertexFormatElement ELEMENT_COLOR -> b
     com.mojang.blaze3d.vertex.VertexFormatElement ELEMENT_UV0 -> c
@@ -1513,7 +1515,7 @@ com.mojang.blaze3d.vertex.DefaultVertexFormat -> cyj:
     com.mojang.blaze3d.vertex.VertexFormat POSITION_TEX_LIGHTMAP_COLOR -> r
     com.mojang.blaze3d.vertex.VertexFormat POSITION_TEX_COLOR_NORMAL -> s
     7:97:void <clinit>() -> <clinit>
-com.mojang.blaze3d.vertex.DefaultedVertexConsumer -> cyk:
+com.mojang.blaze3d.vertex.DefaultedVertexConsumer -> dhk:
     boolean defaultColorSet -> a
     int defaultR -> b
     int defaultG -> c
@@ -1522,7 +1524,7 @@ com.mojang.blaze3d.vertex.DefaultedVertexConsumer -> cyk:
     3:8:void <init>() -> <init>
     12:17:void defaultColor(int,int,int,int) -> b
     21:22:void unsetDefaultColor() -> k
-com.mojang.blaze3d.vertex.PoseStack -> cyl:
+com.mojang.blaze3d.vertex.PoseStack -> dhl:
     java.util.Deque poseStack -> a
     12:13:void <init>() -> <init>
     24:26:void translate(double,double,double) -> a
@@ -1533,8 +1535,8 @@ com.mojang.blaze3d.vertex.PoseStack -> cyl:
     65:65:com.mojang.blaze3d.vertex.PoseStack$Pose last() -> c
     69:69:boolean clear() -> d
     14:21:void lambda$new$0(java.util.ArrayDeque) -> a
-com.mojang.blaze3d.vertex.PoseStack$1 -> cyl$1:
-com.mojang.blaze3d.vertex.PoseStack$Pose -> cyl$a:
+com.mojang.blaze3d.vertex.PoseStack$1 -> dhl$1:
+com.mojang.blaze3d.vertex.PoseStack$Pose -> dhl$a:
     com.mojang.math.Matrix4f pose -> a
     com.mojang.math.Matrix3f normal -> b
     76:79:void <init>(com.mojang.math.Matrix4f,com.mojang.math.Matrix3f) -> <init>
@@ -1543,7 +1545,29 @@ com.mojang.blaze3d.vertex.PoseStack$Pose -> cyl$a:
     72:72:com.mojang.math.Matrix4f access$000(com.mojang.blaze3d.vertex.PoseStack$Pose) -> a
     72:72:com.mojang.math.Matrix3f access$100(com.mojang.blaze3d.vertex.PoseStack$Pose) -> b
     72:72:void <init>(com.mojang.math.Matrix4f,com.mojang.math.Matrix3f,com.mojang.blaze3d.vertex.PoseStack$1) -> <init>
-com.mojang.blaze3d.vertex.Tesselator -> cym:
+com.mojang.blaze3d.vertex.SheetedDecalTextureGenerator -> dhm:
+    com.mojang.blaze3d.vertex.VertexConsumer delegate -> g
+    com.mojang.math.Matrix4f cameraInversePose -> h
+    com.mojang.math.Matrix3f normalInversePose -> i
+    float x -> j
+    float y -> k
+    float z -> l
+    int overlayU -> m
+    int overlayV -> n
+    int lightCoords -> o
+    float nx -> p
+    float ny -> q
+    float nz -> r
+    29:36:void <init>(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,com.mojang.math.Matrix3f) -> <init>
+    39:48:void resetState() -> a
+    52:70:void endVertex() -> d
+    74:77:com.mojang.blaze3d.vertex.VertexConsumer vertex(double,double,double) -> a
+    83:83:com.mojang.blaze3d.vertex.VertexConsumer color(int,int,int,int) -> a
+    89:89:com.mojang.blaze3d.vertex.VertexConsumer uv(float,float) -> a
+    94:96:com.mojang.blaze3d.vertex.VertexConsumer overlayCoords(int,int) -> a
+    101:102:com.mojang.blaze3d.vertex.VertexConsumer uv2(int,int) -> b
+    107:110:com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> b
+com.mojang.blaze3d.vertex.Tesselator -> dhn:
     com.mojang.blaze3d.vertex.BufferBuilder builder -> a
     com.mojang.blaze3d.vertex.Tesselator INSTANCE -> b
     14:15:com.mojang.blaze3d.vertex.Tesselator getInstance() -> a
@@ -1552,7 +1576,7 @@ com.mojang.blaze3d.vertex.Tesselator -> cym:
     27:29:void end() -> b
     32:32:com.mojang.blaze3d.vertex.BufferBuilder getBuilder() -> c
     11:11:void <clinit>() -> <clinit>
-com.mojang.blaze3d.vertex.VertexBuffer -> cyn:
+com.mojang.blaze3d.vertex.VertexBuffer -> dho:
     int id -> a
     com.mojang.blaze3d.vertex.VertexFormat format -> b
     int vertexCount -> c
@@ -1570,15 +1594,15 @@ com.mojang.blaze3d.vertex.VertexBuffer -> cyn:
     28:29:void lambda$upload$2(com.mojang.blaze3d.vertex.BufferBuilder) -> e
     22:22:java.lang.Integer lambda$bind$1() -> d
     18:18:void lambda$new$0(java.lang.Integer) -> a
-com.mojang.blaze3d.vertex.VertexConsumer -> cyo:
+com.mojang.blaze3d.vertex.VertexConsumer -> dhp:
     org.apache.logging.log4j.Logger LOGGER -> f
     com.mojang.blaze3d.vertex.VertexConsumer vertex(double,double,double) -> a
     com.mojang.blaze3d.vertex.VertexConsumer color(int,int,int,int) -> a
     com.mojang.blaze3d.vertex.VertexConsumer uv(float,float) -> a
     com.mojang.blaze3d.vertex.VertexConsumer overlayCoords(int,int) -> a
     com.mojang.blaze3d.vertex.VertexConsumer uv2(int,int) -> b
-    com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> a
-    void endVertex() -> a
+    com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> b
+    void endVertex() -> d
     34:41:void vertex(float,float,float,float,float,float,float,float,float,int,int,float,float,float) -> a
     void defaultColor(int,int,int,int) -> b
     void unsetDefaultColor() -> k
@@ -1590,7 +1614,7 @@ com.mojang.blaze3d.vertex.VertexConsumer -> cyo:
     122:124:com.mojang.blaze3d.vertex.VertexConsumer vertex(com.mojang.math.Matrix4f,float,float,float) -> a
     128:130:com.mojang.blaze3d.vertex.VertexConsumer normal(com.mojang.math.Matrix3f,float,float,float) -> a
     17:17:void <clinit>() -> <clinit>
-com.mojang.blaze3d.vertex.VertexFormat -> cyp:
+com.mojang.blaze3d.vertex.VertexFormat -> dhq:
     com.google.common.collect.ImmutableList elements -> a
     it.unimi.dsi.fastutil.ints.IntList offsets -> b
     int vertexSize -> c
@@ -1604,7 +1628,7 @@ com.mojang.blaze3d.vertex.VertexFormat -> cyp:
     69:78:void setupBufferState(long) -> a
     81:88:void clearBufferState() -> d
     70:70:void lambda$setupBufferState$0(long) -> b
-com.mojang.blaze3d.vertex.VertexFormatElement -> cyq:
+com.mojang.blaze3d.vertex.VertexFormatElement -> dhr:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.mojang.blaze3d.vertex.VertexFormatElement$Type type -> b
     com.mojang.blaze3d.vertex.VertexFormatElement$Usage usage -> c
@@ -1615,17 +1639,15 @@ com.mojang.blaze3d.vertex.VertexFormatElement -> cyq:
     35:35:boolean supportsUsage(int,com.mojang.blaze3d.vertex.VertexFormatElement$Usage) -> a
     39:39:com.mojang.blaze3d.vertex.VertexFormatElement$Type getType() -> a
     43:43:com.mojang.blaze3d.vertex.VertexFormatElement$Usage getUsage() -> b
-    47:47:int getCount() -> c
-    51:51:int getIndex() -> d
+    51:51:int getIndex() -> c
     56:56:java.lang.String toString() -> toString
-    60:60:int getByteSize() -> e
-    64:64:boolean isPosition() -> f
+    60:60:int getByteSize() -> d
     69:87:boolean equals(java.lang.Object) -> equals
     92:96:int hashCode() -> hashCode
     100:101:void setupBufferState(long,int) -> a
-    104:105:void clearBufferState() -> g
+    104:105:void clearBufferState() -> e
     11:11:void <clinit>() -> <clinit>
-com.mojang.blaze3d.vertex.VertexFormatElement$Type -> cyq$a:
+com.mojang.blaze3d.vertex.VertexFormatElement$Type -> dhr$a:
     com.mojang.blaze3d.vertex.VertexFormatElement$Type FLOAT -> a
     com.mojang.blaze3d.vertex.VertexFormatElement$Type UBYTE -> b
     com.mojang.blaze3d.vertex.VertexFormatElement$Type BYTE -> c
@@ -1644,7 +1666,7 @@ com.mojang.blaze3d.vertex.VertexFormatElement$Type -> cyq$a:
     194:194:java.lang.String getName() -> b
     198:198:int getGlType() -> c
     170:177:void <clinit>() -> <clinit>
-com.mojang.blaze3d.vertex.VertexFormatElement$Usage -> cyq$b:
+com.mojang.blaze3d.vertex.VertexFormatElement$Usage -> dhr$b:
     com.mojang.blaze3d.vertex.VertexFormatElement$Usage POSITION -> a
     com.mojang.blaze3d.vertex.VertexFormatElement$Usage NORMAL -> b
     com.mojang.blaze3d.vertex.VertexFormatElement$Usage COLOR -> c
@@ -1674,11 +1696,11 @@ com.mojang.blaze3d.vertex.VertexFormatElement$Usage -> cyq$b:
     109:111:void lambda$static$0(int,int,int,long,int) -> g
     107:107:void access$000(com.mojang.blaze3d.vertex.VertexFormatElement$Usage,int,int,int,long,int) -> a
     107:138:void <clinit>() -> <clinit>
-com.mojang.blaze3d.vertex.VertexFormatElement$Usage$SetupState -> cyq$b$a:
+com.mojang.blaze3d.vertex.VertexFormatElement$Usage$SetupState -> dhr$b$a:
     void setupBufferState(int,int,int,long,int) -> setupBufferState
-com.mojang.blaze3d.vertex.VertexMultiConsumer -> cyr:
+com.mojang.blaze3d.vertex.VertexMultiConsumer -> dhs:
     15:15:com.mojang.blaze3d.vertex.VertexConsumer create(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.blaze3d.vertex.VertexConsumer) -> a
-com.mojang.blaze3d.vertex.VertexMultiConsumer$Double -> cyr$a:
+com.mojang.blaze3d.vertex.VertexMultiConsumer$Double -> dhs$a:
     com.mojang.blaze3d.vertex.VertexConsumer first -> a
     com.mojang.blaze3d.vertex.VertexConsumer second -> b
     27:33:void <init>(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.blaze3d.vertex.VertexConsumer) -> <init>
@@ -1687,9 +1709,9 @@ com.mojang.blaze3d.vertex.VertexMultiConsumer$Double -> cyr$a:
     51:53:com.mojang.blaze3d.vertex.VertexConsumer uv(float,float) -> a
     58:60:com.mojang.blaze3d.vertex.VertexConsumer overlayCoords(int,int) -> a
     65:67:com.mojang.blaze3d.vertex.VertexConsumer uv2(int,int) -> b
-    72:74:com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> a
+    72:74:com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> b
     79:81:void vertex(float,float,float,float,float,float,float,float,float,int,int,float,float,float) -> a
-    85:87:void endVertex() -> a
+    85:87:void endVertex() -> d
     91:93:void defaultColor(int,int,int,int) -> b
     97:99:void unsetDefaultColor() -> k
 com.mojang.math.Matrix3f -> a:
@@ -1723,10 +1745,11 @@ com.mojang.math.Matrix3f -> a:
     533:544:void setIdentity() -> c
     551:579:float adjugateAndDet() -> e
     591:596:boolean invert() -> f
-    600:619:void mul(com.mojang.math.Matrix3f) -> b
-    622:623:void mul(com.mojang.math.Quaternion) -> a
-    626:637:void mul(float) -> a
-    672:672:com.mojang.math.Matrix3f copy() -> d
+    600:625:void set(int,int,float) -> a
+    628:647:void mul(com.mojang.math.Matrix3f) -> b
+    650:651:void mul(com.mojang.math.Quaternion) -> a
+    654:665:void mul(float) -> a
+    700:700:com.mojang.math.Matrix3f copy() -> d
     15:18:void <clinit>() -> <clinit>
 com.mojang.math.Matrix4f -> b:
     float m00 -> a
@@ -1766,7 +1789,86 @@ com.mojang.math.Matrix4f -> b:
     613:613:com.mojang.math.Matrix4f copy() -> d
     617:622:com.mojang.math.Matrix4f createScaleMatrix(float,float,float) -> a
     626:635:com.mojang.math.Matrix4f createTranslateMatrix(float,float,float) -> b
-com.mojang.math.Quaternion -> c:
+com.mojang.math.OctahedralGroup -> c:
+    com.mojang.math.OctahedralGroup IDENTITY -> a
+    com.mojang.math.OctahedralGroup ROT_180_FACE_XY -> b
+    com.mojang.math.OctahedralGroup ROT_180_FACE_XZ -> c
+    com.mojang.math.OctahedralGroup ROT_180_FACE_YZ -> d
+    com.mojang.math.OctahedralGroup ROT_120_NNN -> e
+    com.mojang.math.OctahedralGroup ROT_120_NNP -> f
+    com.mojang.math.OctahedralGroup ROT_120_NPN -> g
+    com.mojang.math.OctahedralGroup ROT_120_NPP -> h
+    com.mojang.math.OctahedralGroup ROT_120_PNN -> i
+    com.mojang.math.OctahedralGroup ROT_120_PNP -> j
+    com.mojang.math.OctahedralGroup ROT_120_PPN -> k
+    com.mojang.math.OctahedralGroup ROT_120_PPP -> l
+    com.mojang.math.OctahedralGroup ROT_180_EDGE_XY_NEG -> m
+    com.mojang.math.OctahedralGroup ROT_180_EDGE_XY_POS -> n
+    com.mojang.math.OctahedralGroup ROT_180_EDGE_XZ_NEG -> o
+    com.mojang.math.OctahedralGroup ROT_180_EDGE_XZ_POS -> p
+    com.mojang.math.OctahedralGroup ROT_180_EDGE_YZ_NEG -> q
+    com.mojang.math.OctahedralGroup ROT_180_EDGE_YZ_POS -> r
+    com.mojang.math.OctahedralGroup ROT_90_X_NEG -> s
+    com.mojang.math.OctahedralGroup ROT_90_X_POS -> t
+    com.mojang.math.OctahedralGroup ROT_90_Y_NEG -> u
+    com.mojang.math.OctahedralGroup ROT_90_Y_POS -> v
+    com.mojang.math.OctahedralGroup ROT_90_Z_NEG -> w
+    com.mojang.math.OctahedralGroup ROT_90_Z_POS -> x
+    com.mojang.math.OctahedralGroup INVERSION -> y
+    com.mojang.math.OctahedralGroup INVERT_X -> z
+    com.mojang.math.OctahedralGroup INVERT_Y -> A
+    com.mojang.math.OctahedralGroup INVERT_Z -> B
+    com.mojang.math.OctahedralGroup ROT_60_REF_NNN -> C
+    com.mojang.math.OctahedralGroup ROT_60_REF_NNP -> D
+    com.mojang.math.OctahedralGroup ROT_60_REF_NPN -> E
+    com.mojang.math.OctahedralGroup ROT_60_REF_NPP -> F
+    com.mojang.math.OctahedralGroup ROT_60_REF_PNN -> G
+    com.mojang.math.OctahedralGroup ROT_60_REF_PNP -> H
+    com.mojang.math.OctahedralGroup ROT_60_REF_PPN -> I
+    com.mojang.math.OctahedralGroup ROT_60_REF_PPP -> J
+    com.mojang.math.OctahedralGroup SWAP_XY -> K
+    com.mojang.math.OctahedralGroup SWAP_YZ -> L
+    com.mojang.math.OctahedralGroup SWAP_XZ -> M
+    com.mojang.math.OctahedralGroup SWAP_NEG_XY -> N
+    com.mojang.math.OctahedralGroup SWAP_NEG_YZ -> O
+    com.mojang.math.OctahedralGroup SWAP_NEG_XZ -> P
+    com.mojang.math.OctahedralGroup ROT_90_REF_X_NEG -> Q
+    com.mojang.math.OctahedralGroup ROT_90_REF_X_POS -> R
+    com.mojang.math.OctahedralGroup ROT_90_REF_Y_NEG -> S
+    com.mojang.math.OctahedralGroup ROT_90_REF_Y_POS -> T
+    com.mojang.math.OctahedralGroup ROT_90_REF_Z_NEG -> U
+    com.mojang.math.OctahedralGroup ROT_90_REF_Z_POS -> V
+    com.mojang.math.Matrix3f transformation -> W
+    java.lang.String name -> X
+    java.util.Map rotatedDirections -> Y
+    boolean invertX -> Z
+    boolean invertY -> aa
+    boolean invertZ -> ab
+    com.mojang.math.SymmetricGroup3 permutation -> ac
+    com.mojang.math.OctahedralGroup[][] cayleyTable -> ad
+    com.mojang.math.OctahedralGroup[] inverseTable -> ae
+    com.mojang.math.OctahedralGroup[] $VALUES -> af
+    21:21:com.mojang.math.OctahedralGroup[] values() -> values
+    21:21:com.mojang.math.OctahedralGroup valueOf(java.lang.String) -> valueOf
+    105:118:void <init>(java.lang.String,int,java.lang.String,com.mojang.math.SymmetricGroup3,boolean,boolean,boolean) -> <init>
+    121:121:it.unimi.dsi.fastutil.booleans.BooleanList packInversions() -> b
+    148:148:com.mojang.math.OctahedralGroup compose(com.mojang.math.OctahedralGroup) -> a
+    161:161:java.lang.String toString() -> toString
+    166:166:java.lang.String getSerializedName() -> a
+    171:187:net.minecraft.core.Direction rotate(net.minecraft.core.Direction) -> a
+    191:198:boolean inverts(net.minecraft.core.Direction$Axis) -> a
+    203:203:net.minecraft.core.FrontAndTop rotate(net.minecraft.core.FrontAndTop) -> a
+    145:145:com.mojang.math.OctahedralGroup[] lambda$static$5(int) -> a
+    144:144:com.mojang.math.OctahedralGroup lambda$static$4(com.mojang.math.OctahedralGroup) -> b
+    144:144:boolean lambda$null$3(com.mojang.math.OctahedralGroup,com.mojang.math.OctahedralGroup) -> a
+    125:141:void lambda$static$2(com.mojang.math.OctahedralGroup[][]) -> a
+    125:125:com.mojang.math.OctahedralGroup lambda$null$1(com.mojang.math.OctahedralGroup) -> c
+    125:125:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.math.OctahedralGroup) -> d
+    21:145:void <clinit>() -> <clinit>
+com.mojang.math.OctahedralGroup$1 -> c$1:
+    int[] $SwitchMap$net$minecraft$core$Direction$Axis -> a
+    191:191:void <clinit>() -> <clinit>
+com.mojang.math.Quaternion -> d:
     com.mojang.math.Quaternion ONE -> a
     float i -> b
     float j -> c
@@ -1792,7 +1894,27 @@ com.mojang.math.Quaternion -> c:
     247:260:void normalize() -> f
     267:267:com.mojang.math.Quaternion copy() -> g
     8:8:void <clinit>() -> <clinit>
-com.mojang.math.Transformation -> d:
+com.mojang.math.SymmetricGroup3 -> e:
+    com.mojang.math.SymmetricGroup3 P123 -> a
+    com.mojang.math.SymmetricGroup3 P213 -> b
+    com.mojang.math.SymmetricGroup3 P132 -> c
+    com.mojang.math.SymmetricGroup3 P231 -> d
+    com.mojang.math.SymmetricGroup3 P312 -> e
+    com.mojang.math.SymmetricGroup3 P321 -> f
+    int[] permutation -> g
+    com.mojang.math.Matrix3f transformation -> h
+    com.mojang.math.SymmetricGroup3[][] cayleyTable -> i
+    com.mojang.math.SymmetricGroup3[] $VALUES -> j
+    7:7:com.mojang.math.SymmetricGroup3[] values() -> values
+    7:7:com.mojang.math.SymmetricGroup3 valueOf(java.lang.String) -> valueOf
+    19:25:void <init>(java.lang.String,int,int,int,int) -> <init>
+    46:46:com.mojang.math.SymmetricGroup3 compose(com.mojang.math.SymmetricGroup3) -> a
+    50:50:int permutation(int) -> a
+    54:54:com.mojang.math.Matrix3f transformation() -> a
+    30:43:void lambda$static$1(com.mojang.math.SymmetricGroup3[][]) -> a
+    38:38:boolean lambda$null$0(int[],com.mojang.math.SymmetricGroup3) -> a
+    7:29:void <clinit>() -> <clinit>
+com.mojang.math.Transformation -> f:
     com.mojang.math.Matrix4f matrix -> a
     boolean decomposed -> b
     com.mojang.math.Vector3f translation -> c
@@ -1814,12 +1936,12 @@ com.mojang.math.Transformation -> d:
     167:167:int hashCode() -> hashCode
     54:58:com.mojang.math.Transformation lambda$static$0() -> f
     53:53:void <clinit>() -> <clinit>
-com.mojang.math.Vector3d -> cys:
+com.mojang.math.Vector3d -> dht:
     double x -> a
     double y -> b
     double z -> c
     8:12:void <init>(double,double,double) -> <init>
-com.mojang.math.Vector3f -> e:
+com.mojang.math.Vector3f -> g:
     com.mojang.math.Vector3f XN -> a
     com.mojang.math.Vector3f XP -> b
     com.mojang.math.Vector3f YN -> c
@@ -1856,7 +1978,7 @@ com.mojang.math.Vector3f -> e:
     209:212:void map(it.unimi.dsi.fastutil.floats.Float2FloatFunction) -> a
     216:216:java.lang.String toString() -> toString
     8:13:void <clinit>() -> <clinit>
-com.mojang.math.Vector4f -> f:
+com.mojang.math.Vector4f -> h:
     float x -> a
     float y -> b
     float z -> c
@@ -1878,284 +2000,344 @@ com.mojang.math.Vector4f -> f:
     135:142:void transform(com.mojang.math.Quaternion) -> a
     146:150:void perspectiveDivide() -> f
     162:162:java.lang.String toString() -> toString
-com.mojang.realmsclient.KeyCombo -> cyt:
+com.mojang.realmsclient.KeyCombo -> dhu:
     char[] chars -> a
     int matchIndex -> b
     java.lang.Runnable onCompletion -> c
-    10:17:void <init>(char[],java.lang.Runnable) -> <init>
-    24:35:boolean keyPressed(char) -> a
-    41:42:void reset() -> a
-    46:47:java.lang.String toString() -> toString
-com.mojang.realmsclient.RealmsMainScreen -> cyu:
+    10:16:void <init>(char[],java.lang.Runnable) -> <init>
+    23:34:boolean keyPressed(char) -> a
+    38:39:void reset() -> a
+    43:44:java.lang.String toString() -> toString
+com.mojang.realmsclient.RealmsMainScreen -> dhv:
     org.apache.logging.log4j.Logger LOGGER -> a
-    boolean overrideConfigure -> b
-    com.google.common.util.concurrent.RateLimiter inviteNarrationLimiter -> c
-    boolean dontSetConnectedToRealms -> d
-    java.util.List teaserImages -> e
-    com.mojang.realmsclient.gui.RealmsDataFetcher realmsDataFetcher -> f
-    int lastScrollYPosition -> g
-    net.minecraft.realms.RealmsScreen lastScreen -> h
-    com.mojang.realmsclient.RealmsMainScreen$RealmSelectionList realmSelectionList -> i
-    long selectedServerId -> j
-    net.minecraft.realms.RealmsButton playButton -> k
-    net.minecraft.realms.RealmsButton backButton -> l
-    net.minecraft.realms.RealmsButton renewButton -> m
-    net.minecraft.realms.RealmsButton configureButton -> n
-    net.minecraft.realms.RealmsButton leaveButton -> o
-    java.lang.String toolTip -> p
-    java.util.List realmsServers -> q
-    int numberOfPendingInvites -> r
-    int animTick -> s
-    boolean hasParentalConsent -> t
-    boolean checkedParentalConsent -> u
-    boolean checkedClientCompatability -> v
-    boolean hasFetchedServers -> w
-    boolean popupOpenedByUser -> x
-    boolean justClosedPopup -> y
-    boolean trialsAvailable -> z
-    boolean createdTrial -> A
-    boolean showingPopup -> B
-    boolean hasUnreadNews -> C
-    java.lang.String newsLink -> D
-    int carouselIndex -> E
-    int carouselTick -> F
-    boolean hasSwitchedCarouselImage -> G
-    net.minecraft.realms.RealmsScreen realmsGenericErrorScreen -> H
-    boolean regionsPinged -> I
-    java.util.List keyCombos -> J
-    int clicks -> K
-    java.util.concurrent.locks.ReentrantLock connectLock -> L
-    boolean expiredHover -> M
-    com.mojang.realmsclient.RealmsMainScreen$ShowPopupButton showPopupButton -> N
-    com.mojang.realmsclient.RealmsMainScreen$PendingInvitesButton pendingInvitesButton -> O
-    com.mojang.realmsclient.RealmsMainScreen$NewsButton newsButton -> P
-    net.minecraft.realms.RealmsButton createTrialButton -> Q
-    net.minecraft.realms.RealmsButton buyARealmButton -> R
-    net.minecraft.realms.RealmsButton closeButton -> S
-    99:152:void <init>(net.minecraft.realms.RealmsScreen) -> <init>
-    155:169:boolean shouldShowMessageInList() -> a
-    173:185:boolean shouldShowPopup() -> b
-    190:234:void init() -> init
-    237:237:boolean hasParentalConsent() -> k
-    241:292:void addButtons() -> c
-    295:315:void updateButtonStates(com.mojang.realmsclient.dto.RealmsServer) -> a
-    318:318:boolean shouldShowPopupButton() -> l
-    322:322:boolean shouldPlayButtonBeActive(com.mojang.realmsclient.dto.RealmsServer) -> b
-    326:326:boolean shouldRenewButtonBeActive(com.mojang.realmsclient.dto.RealmsServer) -> c
-    330:330:boolean shouldConfigureButtonBeVisible(com.mojang.realmsclient.dto.RealmsServer) -> d
-    334:334:boolean shouldLeaveButtonBeVisible(com.mojang.realmsclient.dto.RealmsServer) -> e
-    338:349:void postInit() -> d
-    353:453:void tick() -> tick
-    459:461:void browseURL(java.lang.String) -> a
-    464:477:void pingRegions() -> m
-    480:488:java.util.List getOwnedNonExpiredWorldIds() -> n
-    493:495:void removed() -> removed
-    502:509:void onPlay() -> o
-    512:520:void onRenew() -> p
-    523:529:void createTrial() -> q
-    532:575:void checkClientCompatability() -> r
-    578:578:void checkUnreadNews() -> s
-    581:608:void checkParentalConsent() -> t
-    611:632:void switchToStage() -> u
-    635:656:void switchToLocal() -> v
-    659:661:void switchToProd() -> w
-    664:665:void stopRealmsFetcher() -> x
-    668:674:void configureClicked(com.mojang.realmsclient.dto.RealmsServer) -> f
-    677:683:void leaveClicked(com.mojang.realmsclient.dto.RealmsServer) -> g
-    686:687:void saveListScrollPosition() -> y
-    690:696:com.mojang.realmsclient.dto.RealmsServer findServer(long) -> a
-    710:739:void confirmResult(boolean,int) -> confirmResult
-    742:743:void removeSelection() -> e
-    747:755:boolean keyPressed(int,int,int) -> keyPressed
-    759:764:void onClosePopup() -> z
-    768:769:boolean charTyped(char,int) -> charTyped
-    774:832:void render(int,int,float) -> render
-    835:842:void drawRealmsLogo(int,int) -> a
-    846:851:boolean mouseClicked(double,double,int) -> mouseClicked
-    855:858:boolean isOutsidePopup(double,double) -> a
-    862:927:void drawPopup(int,int) -> b
-    930:930:int popupX0() -> A
-    934:934:int popupY0() -> B
-    938:987:void drawInvitationPendingIcon(int,int,int,int,boolean,boolean) -> a
-    990:1002:boolean inPendingInvitationArea(double,double) -> b
-    1006:1022:void play(com.mojang.realmsclient.dto.RealmsServer,net.minecraft.realms.RealmsScreen) -> a
-    1025:1028:void connectToServer(com.mojang.realmsclient.dto.RealmsServer,net.minecraft.realms.RealmsScreen) -> b
-    1353:1353:boolean isSelfOwnedServer(com.mojang.realmsclient.dto.RealmsServer) -> h
-    1357:1357:boolean isSelfOwnedNonExpiredServer(com.mojang.realmsclient.dto.RealmsServer) -> i
-    1361:1370:void drawExpired(int,int,int,int) -> a
-    1373:1395:void drawExpiring(int,int,int,int,int) -> a
-    1398:1407:void drawOpen(int,int,int,int) -> b
-    1410:1419:void drawClose(int,int,int,int) -> c
-    1422:1437:void drawLeave(int,int,int,int) -> d
-    1440:1455:void drawConfigure(int,int,int,int) -> e
-    1458:1486:void renderMousehoverTooltip(java.lang.String,int,int) -> a
-    1489:1504:void renderMoreInfo(int,int,int,int,boolean) -> a
-    1507:1538:void renderNews(int,int,boolean,int,int,boolean,boolean) -> a
-    1541:1553:void renderLocal() -> C
-    1556:1568:void renderStage() -> D
-    1571:1571:com.mojang.realmsclient.RealmsMainScreen newScreen() -> f
-    1581:1583:void updateTeaserImages(net.minecraft.server.packs.resources.ResourceManager) -> a
-    1582:1582:boolean lambda$updateTeaserImages$7(net.minecraft.resources.ResourceLocation) -> a
-    1581:1581:boolean lambda$updateTeaserImages$6(java.lang.String) -> b
-    768:768:void lambda$charTyped$5(char,com.mojang.realmsclient.KeyCombo) -> a
-    672:672:void lambda$configureClicked$4(net.minecraft.client.Minecraft,com.mojang.realmsclient.dto.RealmsServer) -> a
-    465:476:void lambda$pingRegions$3() -> E
-    200:205:void lambda$init$2() -> F
-    193:198:void lambda$init$1() -> G
-    191:191:void lambda$init$0() -> H
-    52:52:long access$000(com.mojang.realmsclient.RealmsMainScreen) -> a
-    52:52:com.mojang.realmsclient.dto.RealmsServer access$100(com.mojang.realmsclient.RealmsMainScreen,long) -> a
-    52:52:void access$200(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> a
-    52:52:void access$300(com.mojang.realmsclient.RealmsMainScreen) -> b
-    52:52:boolean access$400(com.mojang.realmsclient.RealmsMainScreen) -> c
-    52:52:net.minecraft.realms.RealmsScreen access$500(com.mojang.realmsclient.RealmsMainScreen) -> d
-    52:52:void access$600(com.mojang.realmsclient.RealmsMainScreen) -> e
-    52:52:void access$700(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> b
-    52:52:void access$800(com.mojang.realmsclient.RealmsMainScreen) -> f
-    52:52:net.minecraft.realms.RealmsScreen access$902(net.minecraft.realms.RealmsScreen) -> a
-    52:52:net.minecraft.realms.RealmsScreen access$900() -> g
-    52:52:void access$1000(com.mojang.realmsclient.RealmsMainScreen) -> g
-    52:52:boolean access$1102(boolean) -> a
-    52:52:org.apache.logging.log4j.Logger access$1200() -> h
-    52:52:boolean access$1302(boolean) -> b
-    52:52:boolean access$1402(boolean) -> c
-    52:52:com.mojang.realmsclient.gui.RealmsDataFetcher access$1500() -> i
-    52:52:java.util.List access$1600(com.mojang.realmsclient.RealmsMainScreen) -> h
-    52:52:com.mojang.realmsclient.RealmsMainScreen$RealmSelectionList access$1700(com.mojang.realmsclient.RealmsMainScreen) -> i
-    52:52:void access$1800(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> c
-    52:52:long access$002(com.mojang.realmsclient.RealmsMainScreen,long) -> b
-    52:52:net.minecraft.realms.RealmsButton access$1900(com.mojang.realmsclient.RealmsMainScreen) -> j
-    52:52:int access$2000(com.mojang.realmsclient.RealmsMainScreen) -> k
-    52:52:int access$2002(com.mojang.realmsclient.RealmsMainScreen,int) -> a
-    52:52:boolean access$2102(com.mojang.realmsclient.RealmsMainScreen,boolean) -> a
-    52:52:java.lang.String access$2200(com.mojang.realmsclient.RealmsMainScreen) -> l
-    52:52:boolean access$2300(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> d
-    52:52:boolean access$2400(com.mojang.realmsclient.RealmsMainScreen) -> m
-    52:52:int access$2500(com.mojang.realmsclient.RealmsMainScreen) -> n
-    52:52:void access$2600(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int) -> a
-    52:52:void access$2700(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int) -> b
-    52:52:void access$2800(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int,int) -> a
-    52:52:void access$2900(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int) -> c
-    52:52:boolean access$3000() -> j
-    52:52:void access$3100(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int) -> d
-    52:52:void access$3200(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int) -> e
-    52:52:java.lang.String access$2202(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> a
-    52:52:boolean access$2402(com.mojang.realmsclient.RealmsMainScreen,boolean) -> b
-    52:52:int access$3300(com.mojang.realmsclient.RealmsMainScreen) -> o
-    52:52:void access$3400(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int,boolean,boolean) -> a
-    52:52:java.lang.String access$3500(com.mojang.realmsclient.RealmsMainScreen) -> p
-    52:52:boolean access$3600(com.mojang.realmsclient.RealmsMainScreen) -> q
-    52:52:boolean access$3602(com.mojang.realmsclient.RealmsMainScreen,boolean) -> c
-    52:52:void access$3700(com.mojang.realmsclient.RealmsMainScreen,int,int,boolean,int,int,boolean,boolean) -> a
-    52:52:void access$3800(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int,boolean) -> a
-    52:52:boolean access$2100(com.mojang.realmsclient.RealmsMainScreen) -> r
-    52:52:int access$3900(com.mojang.realmsclient.RealmsMainScreen) -> s
-    52:52:int access$4000(com.mojang.realmsclient.RealmsMainScreen) -> t
-    52:52:void access$4100(com.mojang.realmsclient.RealmsMainScreen) -> u
-    53:94:void <clinit>() -> <clinit>
-com.mojang.realmsclient.RealmsMainScreen$1 -> cyu$1:
+    net.minecraft.resources.ResourceLocation ON_ICON_LOCATION -> b
+    net.minecraft.resources.ResourceLocation OFF_ICON_LOCATION -> c
+    net.minecraft.resources.ResourceLocation EXPIRED_ICON_LOCATION -> p
+    net.minecraft.resources.ResourceLocation EXPIRES_SOON_ICON_LOCATION -> q
+    net.minecraft.resources.ResourceLocation LEAVE_ICON_LOCATION -> r
+    net.minecraft.resources.ResourceLocation INVITATION_ICONS_LOCATION -> s
+    net.minecraft.resources.ResourceLocation INVITE_ICON_LOCATION -> t
+    net.minecraft.resources.ResourceLocation WORLDICON_LOCATION -> u
+    net.minecraft.resources.ResourceLocation LOGO_LOCATION -> v
+    net.minecraft.resources.ResourceLocation CONFIGURE_LOCATION -> w
+    net.minecraft.resources.ResourceLocation QUESTIONMARK_LOCATION -> x
+    net.minecraft.resources.ResourceLocation NEWS_LOCATION -> y
+    net.minecraft.resources.ResourceLocation POPUP_LOCATION -> z
+    net.minecraft.resources.ResourceLocation DARKEN_LOCATION -> A
+    net.minecraft.resources.ResourceLocation CROSS_ICON_LOCATION -> B
+    net.minecraft.resources.ResourceLocation TRIAL_ICON_LOCATION -> C
+    net.minecraft.resources.ResourceLocation BUTTON_LOCATION -> D
+    java.util.List teaserImages -> E
+    com.mojang.realmsclient.gui.RealmsDataFetcher REALMS_DATA_FETCHER -> F
+    boolean overrideConfigure -> G
+    int lastScrollYPosition -> H
+    boolean hasParentalConsent -> I
+    boolean checkedParentalConsent -> J
+    boolean checkedClientCompatability -> K
+    net.minecraft.client.gui.screens.Screen realmsGenericErrorScreen -> L
+    boolean regionsPinged -> M
+    com.google.common.util.concurrent.RateLimiter inviteNarrationLimiter -> N
+    boolean dontSetConnectedToRealms -> O
+    net.minecraft.client.gui.screens.Screen lastScreen -> P
+    com.mojang.realmsclient.RealmsMainScreen$RealmSelectionList realmSelectionList -> Q
+    long selectedServerId -> R
+    net.minecraft.client.gui.components.Button playButton -> S
+    net.minecraft.client.gui.components.Button backButton -> T
+    net.minecraft.client.gui.components.Button renewButton -> U
+    net.minecraft.client.gui.components.Button configureButton -> V
+    net.minecraft.client.gui.components.Button leaveButton -> W
+    java.util.List toolTip -> X
+    java.util.List realmsServers -> Y
+    int numberOfPendingInvites -> Z
+    int animTick -> aa
+    boolean hasFetchedServers -> ab
+    boolean popupOpenedByUser -> ac
+    boolean justClosedPopup -> ad
+    boolean trialsAvailable -> ae
+    boolean createdTrial -> af
+    boolean showingPopup -> ag
+    boolean hasUnreadNews -> ah
+    java.lang.String newsLink -> ai
+    int carouselIndex -> aj
+    int carouselTick -> ak
+    boolean hasSwitchedCarouselImage -> al
+    java.util.List keyCombos -> am
+    int clicks -> an
+    java.util.concurrent.locks.ReentrantLock connectLock -> ao
+    com.mojang.realmsclient.RealmsMainScreen$HoveredElement hoveredElement -> ap
+    net.minecraft.client.gui.components.Button showPopupButton -> aq
+    net.minecraft.client.gui.components.Button pendingInvitesButton -> ar
+    net.minecraft.client.gui.components.Button newsButton -> as
+    net.minecraft.client.gui.components.Button createTrialButton -> at
+    net.minecraft.client.gui.components.Button buyARealmButton -> au
+    net.minecraft.client.gui.components.Button closeButton -> av
+    103:156:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
+    159:173:boolean shouldShowMessageInList() -> v
+    177:189:boolean shouldShowPopup() -> aq_
+    194:248:void init() -> b
+    251:251:boolean hasParentalConsent() -> w
+    255:298:void addButtons() -> c
+    301:321:void updateButtonStates(com.mojang.realmsclient.dto.RealmsServer) -> a
+    324:324:boolean shouldShowPopupButton() -> x
+    328:328:boolean shouldPlayButtonBeActive(com.mojang.realmsclient.dto.RealmsServer) -> b
+    332:332:boolean shouldRenewButtonBeActive(com.mojang.realmsclient.dto.RealmsServer) -> c
+    336:336:boolean shouldConfigureButtonBeVisible(com.mojang.realmsclient.dto.RealmsServer) -> d
+    340:340:boolean shouldLeaveButtonBeVisible(com.mojang.realmsclient.dto.RealmsServer) -> e
+    345:445:void tick() -> d
+    448:461:void pingRegions() -> y
+    464:472:java.util.List getOwnedNonExpiredWorldIds() -> z
+    477:479:void removed() -> e
+    486:495:void onRenew() -> A
+    498:534:void checkClientCompatability() -> B
+    537:537:void checkUnreadNews() -> C
+    540:563:void checkParentalConsent() -> D
+    566:585:void switchToStage() -> E
+    588:607:void switchToLocal() -> F
+    610:612:void switchToProd() -> G
+    615:616:void stopRealmsFetcher() -> H
+    619:623:void configureClicked(com.mojang.realmsclient.dto.RealmsServer) -> f
+    626:632:void leaveClicked(com.mojang.realmsclient.dto.RealmsServer) -> g
+    635:636:void saveListScrollPosition() -> I
+    640:646:com.mojang.realmsclient.dto.RealmsServer findServer(long) -> a
+    650:677:void leaveServer(boolean) -> d
+    680:681:void removeSelection() -> ar_
+    685:692:boolean keyPressed(int,int,int) -> a
+    696:701:void onClosePopup() -> J
+    705:706:boolean charTyped(char,int) -> a
+    711:766:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    769:776:void drawRealmsLogo(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    780:785:boolean mouseClicked(double,double,int) -> a
+    789:792:boolean isOutsidePopup(double,double) -> a
+    796:859:void drawPopup(com.mojang.blaze3d.vertex.PoseStack,int,int) -> b
+    862:862:int popupX0() -> K
+    866:866:int popupY0() -> L
+    870:917:void drawInvitationPendingIcon(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,boolean,boolean) -> a
+    920:932:boolean inPendingInvitationArea(double,double) -> c
+    936:952:void play(com.mojang.realmsclient.dto.RealmsServer,net.minecraft.client.gui.screens.Screen) -> a
+    1294:1294:boolean isSelfOwnedServer(com.mojang.realmsclient.dto.RealmsServer) -> h
+    1298:1298:boolean isSelfOwnedNonExpiredServer(com.mojang.realmsclient.dto.RealmsServer) -> i
+    1302:1309:void drawExpired(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> c
+    1312:1331:void drawExpiring(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int) -> b
+    1334:1341:void drawOpen(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> d
+    1344:1351:void drawClose(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> e
+    1354:1369:void drawLeave(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> f
+    1372:1387:void drawConfigure(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> g
+    1390:1418:void renderMousehoverTooltip(com.mojang.blaze3d.vertex.PoseStack,java.util.List,int,int) -> a
+    1421:1435:void renderMoreInfo(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,boolean) -> a
+    1438:1465:void renderNews(com.mojang.blaze3d.vertex.PoseStack,int,int,boolean,int,int,boolean,boolean) -> a
+    1468:1480:void renderLocal(com.mojang.blaze3d.vertex.PoseStack) -> b
+    1483:1495:void renderStage(com.mojang.blaze3d.vertex.PoseStack) -> c
+    1498:1500:com.mojang.realmsclient.RealmsMainScreen newScreen() -> g
+    1510:1512:void updateTeaserImages(net.minecraft.server.packs.resources.ResourceManager) -> a
+    1515:1516:void setTooltip(net.minecraft.network.chat.Component[]) -> a
+    1540:1541:void pendingButtonPress(net.minecraft.client.gui.components.Button) -> a
+    1511:1511:boolean lambda$updateTeaserImages$13(net.minecraft.resources.ResourceLocation) -> a
+    1510:1510:boolean lambda$updateTeaserImages$12(java.lang.String) -> a
+    705:705:void lambda$charTyped$11(char,com.mojang.realmsclient.KeyCombo) -> a
+    449:460:void lambda$pingRegions$10() -> M
+    293:293:void lambda$addButtons$9(net.minecraft.client.gui.components.Button) -> b
+    285:291:void lambda$addButtons$8(net.minecraft.client.gui.components.Button) -> c
+    278:278:void lambda$addButtons$7(net.minecraft.client.gui.components.Button) -> d
+    275:275:void lambda$addButtons$6(net.minecraft.client.gui.components.Button) -> e
+    269:272:void lambda$addButtons$5(net.minecraft.client.gui.components.Button) -> f
+    259:266:void lambda$addButtons$4(net.minecraft.client.gui.components.Button) -> g
+    256:256:void lambda$addButtons$3(net.minecraft.client.gui.components.Button) -> h
+    204:209:void lambda$init$2() -> N
+    197:202:void lambda$init$1() -> O
+    195:195:void lambda$init$0() -> P
+    62:62:net.minecraft.client.gui.screens.Screen access$102(net.minecraft.client.gui.screens.Screen) -> a
+    62:62:net.minecraft.client.gui.screens.Screen access$200(com.mojang.realmsclient.RealmsMainScreen) -> a
+    62:62:net.minecraft.client.Minecraft access$300(com.mojang.realmsclient.RealmsMainScreen) -> b
+    62:62:net.minecraft.client.Minecraft access$400(com.mojang.realmsclient.RealmsMainScreen) -> c
+    62:62:void access$500(com.mojang.realmsclient.RealmsMainScreen) -> d
+    62:62:boolean access$602(boolean) -> a
+    62:62:org.apache.logging.log4j.Logger access$700() -> h
+    62:62:net.minecraft.client.Minecraft access$800(com.mojang.realmsclient.RealmsMainScreen) -> e
+    62:62:net.minecraft.client.Minecraft access$900(com.mojang.realmsclient.RealmsMainScreen) -> f
+    62:62:net.minecraft.client.Minecraft access$1000(com.mojang.realmsclient.RealmsMainScreen) -> g
+    62:62:net.minecraft.client.gui.screens.Screen access$100() -> i
+    62:62:net.minecraft.client.Minecraft access$1100(com.mojang.realmsclient.RealmsMainScreen) -> h
+    62:62:net.minecraft.client.Minecraft access$1200(com.mojang.realmsclient.RealmsMainScreen) -> i
+    62:62:net.minecraft.client.Minecraft access$1300(com.mojang.realmsclient.RealmsMainScreen) -> j
+    62:62:boolean access$1402(boolean) -> b
+    62:62:net.minecraft.client.Minecraft access$1500(com.mojang.realmsclient.RealmsMainScreen) -> k
+    62:62:boolean access$1602(boolean) -> c
+    62:62:net.minecraft.client.Minecraft access$1700(com.mojang.realmsclient.RealmsMainScreen) -> l
+    62:62:net.minecraft.client.Minecraft access$1800(com.mojang.realmsclient.RealmsMainScreen) -> m
+    62:62:net.minecraft.client.Minecraft access$1900(com.mojang.realmsclient.RealmsMainScreen) -> n
+    62:62:com.mojang.realmsclient.gui.RealmsDataFetcher access$2000() -> j
+    62:62:long access$2100(com.mojang.realmsclient.RealmsMainScreen) -> o
+    62:62:com.mojang.realmsclient.dto.RealmsServer access$2200(com.mojang.realmsclient.RealmsMainScreen,long) -> a
+    62:62:java.util.List access$2300(com.mojang.realmsclient.RealmsMainScreen) -> p
+    62:62:com.mojang.realmsclient.RealmsMainScreen$RealmSelectionList access$2400(com.mojang.realmsclient.RealmsMainScreen) -> q
+    62:62:void access$2500(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> a
+    62:62:long access$2102(com.mojang.realmsclient.RealmsMainScreen,long) -> b
+    62:62:net.minecraft.client.gui.components.Button access$2600(com.mojang.realmsclient.RealmsMainScreen) -> r
+    62:62:net.minecraft.client.Minecraft access$2700(com.mojang.realmsclient.RealmsMainScreen) -> s
+    62:62:net.minecraft.client.Minecraft access$2800(com.mojang.realmsclient.RealmsMainScreen) -> t
+    62:62:int access$3000(com.mojang.realmsclient.RealmsMainScreen) -> u
+    62:62:int access$3002(com.mojang.realmsclient.RealmsMainScreen,int) -> a
+    62:62:boolean access$3102(com.mojang.realmsclient.RealmsMainScreen,boolean) -> a
+    62:62:com.mojang.realmsclient.RealmsMainScreen$HoveredElement access$3200(com.mojang.realmsclient.RealmsMainScreen) -> v
+    62:62:void access$3300(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> b
+    62:62:void access$3400(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> c
+    62:62:void access$3500(com.mojang.realmsclient.RealmsMainScreen) -> w
+    62:62:net.minecraft.client.gui.Font access$3700(com.mojang.realmsclient.RealmsMainScreen) -> x
+    62:62:net.minecraft.client.Minecraft access$3800(com.mojang.realmsclient.RealmsMainScreen) -> y
+    62:62:net.minecraft.resources.ResourceLocation access$3900() -> k
+    62:62:net.minecraft.client.Minecraft access$4000(com.mojang.realmsclient.RealmsMainScreen) -> z
+    62:62:int access$4100(com.mojang.realmsclient.RealmsMainScreen) -> A
+    62:62:net.minecraft.client.gui.Font access$4200(com.mojang.realmsclient.RealmsMainScreen) -> B
+    62:62:void access$4300(com.mojang.realmsclient.RealmsMainScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> a
+    62:62:void access$4400(com.mojang.realmsclient.RealmsMainScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> b
+    62:62:boolean access$4500(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> d
+    62:62:void access$4600(com.mojang.realmsclient.RealmsMainScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int) -> a
+    62:62:void access$4700(com.mojang.realmsclient.RealmsMainScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> c
+    62:62:boolean access$4800() -> l
+    62:62:void access$4900(com.mojang.realmsclient.RealmsMainScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> d
+    62:62:void access$5000(com.mojang.realmsclient.RealmsMainScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> e
+    62:62:net.minecraft.client.gui.Font access$5100(com.mojang.realmsclient.RealmsMainScreen) -> C
+    62:62:net.minecraft.client.gui.Font access$5200(com.mojang.realmsclient.RealmsMainScreen) -> D
+    62:62:net.minecraft.client.gui.Font access$5300(com.mojang.realmsclient.RealmsMainScreen) -> E
+    62:62:void access$5400(com.mojang.realmsclient.RealmsMainScreen,net.minecraft.network.chat.Component[]) -> a
+    62:62:net.minecraft.resources.ResourceLocation access$5500() -> m
+    62:62:net.minecraft.client.Minecraft access$5600(com.mojang.realmsclient.RealmsMainScreen) -> F
+    62:62:net.minecraft.client.gui.Font access$5700(com.mojang.realmsclient.RealmsMainScreen) -> G
+    62:62:net.minecraft.client.gui.Font access$5800(com.mojang.realmsclient.RealmsMainScreen) -> H
+    62:62:com.mojang.realmsclient.RealmsMainScreen$HoveredElement access$3202(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.RealmsMainScreen$HoveredElement) -> a
+    62:62:net.minecraft.client.gui.Font access$5900(com.mojang.realmsclient.RealmsMainScreen) -> I
+    62:62:net.minecraft.client.gui.Font access$6000(com.mojang.realmsclient.RealmsMainScreen) -> J
+    62:62:net.minecraft.client.gui.Font access$6100(com.mojang.realmsclient.RealmsMainScreen) -> K
+    62:62:net.minecraft.client.gui.Font access$6200(com.mojang.realmsclient.RealmsMainScreen) -> L
+    62:62:net.minecraft.client.gui.Font access$6300(com.mojang.realmsclient.RealmsMainScreen) -> M
+    62:62:net.minecraft.client.gui.Font access$6400(com.mojang.realmsclient.RealmsMainScreen) -> N
+    62:62:net.minecraft.client.gui.Font access$6500(com.mojang.realmsclient.RealmsMainScreen) -> O
+    62:62:net.minecraft.client.gui.Font access$6600(com.mojang.realmsclient.RealmsMainScreen) -> P
+    62:62:int access$6700(com.mojang.realmsclient.RealmsMainScreen) -> Q
+    62:62:void access$6800(com.mojang.realmsclient.RealmsMainScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,boolean,boolean) -> a
+    62:62:void access$6900(com.mojang.realmsclient.RealmsMainScreen,net.minecraft.client.gui.components.Button) -> a
+    62:62:boolean access$7000(com.mojang.realmsclient.RealmsMainScreen) -> R
+    62:62:void access$7100(com.mojang.realmsclient.RealmsMainScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,boolean,int,int,boolean,boolean) -> a
+    62:62:java.lang.String access$7200(com.mojang.realmsclient.RealmsMainScreen) -> S
+    62:62:boolean access$7002(com.mojang.realmsclient.RealmsMainScreen,boolean) -> b
+    62:62:void access$7300(com.mojang.realmsclient.RealmsMainScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,boolean) -> a
+    62:62:boolean access$3100(com.mojang.realmsclient.RealmsMainScreen) -> T
+    62:62:int access$7400(com.mojang.realmsclient.RealmsMainScreen) -> U
+    62:62:int access$7500(com.mojang.realmsclient.RealmsMainScreen) -> V
+    62:62:net.minecraft.resources.ResourceLocation access$7600() -> n
+    62:62:net.minecraft.client.Minecraft access$7700(com.mojang.realmsclient.RealmsMainScreen) -> W
+    62:62:void access$7800(com.mojang.realmsclient.RealmsMainScreen) -> X
+    63:88:void <clinit>() -> <clinit>
+com.mojang.realmsclient.RealmsMainScreen$1 -> dhv$1:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    241:241:void <init>(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int,int,java.lang.String) -> <init>
-    244:245:void onPress() -> onPress
-com.mojang.realmsclient.RealmsMainScreen$10 -> cyu$2:
+    501:501:void <init>(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> <init>
+    504:531:void run() -> run
+    528:528:void lambda$run$3(com.mojang.realmsclient.exception.RealmsServiceException) -> a
+    526:526:void lambda$run$2() -> a
+    515:515:void lambda$run$1() -> b
+    511:511:void lambda$run$0() -> c
+com.mojang.realmsclient.RealmsMainScreen$2 -> dhv$2:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    612:612:void <init>(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> <init>
-    615:629:void run() -> run
-com.mojang.realmsclient.RealmsMainScreen$11 -> cyu$3:
+    540:540:void <init>(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> <init>
+    543:561:void run() -> run
+    559:559:void lambda$run$1(com.mojang.realmsclient.exception.RealmsServiceException) -> a
+    553:553:void lambda$run$0() -> a
+com.mojang.realmsclient.RealmsMainScreen$3 -> dhv$3:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    636:636:void <init>(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> <init>
-    639:653:void run() -> run
-com.mojang.realmsclient.RealmsMainScreen$12 -> cyu$4:
+    567:567:void <init>(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> <init>
+    570:582:void run() -> run
+com.mojang.realmsclient.RealmsMainScreen$4 -> dhv$4:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    712:712:void <init>(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> <init>
-    716:733:void run() -> run
-    723:723:boolean lambda$run$0(net.minecraft.realms.RealmListEntry) -> a
-com.mojang.realmsclient.RealmsMainScreen$2 -> cyu$5:
+    589:589:void <init>(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> <init>
+    592:604:void run() -> run
+com.mojang.realmsclient.RealmsMainScreen$5 -> dhv$5:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    247:247:void <init>(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int,int,java.lang.String) -> <init>
-    250:251:void onPress() -> onPress
-com.mojang.realmsclient.RealmsMainScreen$3 -> cyu$6:
+    651:651:void <init>(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> <init>
+    655:672:void run() -> run
+    670:670:void lambda$run$1(com.mojang.realmsclient.exception.RealmsServiceException) -> a
+    662:662:boolean lambda$run$0(com.mojang.realmsclient.RealmsMainScreen$Entry) -> a
+com.mojang.realmsclient.RealmsMainScreen$CloseButton -> dhv$a:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    253:253:void <init>(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int,int,java.lang.String) -> <init>
-    256:259:void onPress() -> onPress
-com.mojang.realmsclient.RealmsMainScreen$4 -> cyu$7:
+    1582:1584:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1588:1596:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    1583:1583:void lambda$new$0(com.mojang.realmsclient.RealmsMainScreen,net.minecraft.client.gui.components.Button) -> a
+com.mojang.realmsclient.RealmsMainScreen$Entry -> dhv$b:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    261:261:void <init>(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int,int,java.lang.String) -> <init>
-    264:265:void onPress() -> onPress
-com.mojang.realmsclient.RealmsMainScreen$5 -> cyu$8:
+    1109:1109:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1109:1109:void <init>(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.RealmsMainScreen$1) -> <init>
+com.mojang.realmsclient.RealmsMainScreen$HoveredElement -> dhv$c:
+    com.mojang.realmsclient.RealmsMainScreen$HoveredElement NONE -> a
+    com.mojang.realmsclient.RealmsMainScreen$HoveredElement EXPIRED -> b
+    com.mojang.realmsclient.RealmsMainScreen$HoveredElement LEAVE -> c
+    com.mojang.realmsclient.RealmsMainScreen$HoveredElement CONFIGURE -> d
+    com.mojang.realmsclient.RealmsMainScreen$HoveredElement[] $VALUES -> e
+    136:136:com.mojang.realmsclient.RealmsMainScreen$HoveredElement[] values() -> values
+    136:136:com.mojang.realmsclient.RealmsMainScreen$HoveredElement valueOf(java.lang.String) -> valueOf
+    136:136:void <init>(java.lang.String,int) -> <init>
+    136:140:void <clinit>() -> <clinit>
+com.mojang.realmsclient.RealmsMainScreen$NewsButton -> dhv$d:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    267:267:void <init>(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int,int,java.lang.String) -> <init>
-    270:271:void onPress() -> onPress
-com.mojang.realmsclient.RealmsMainScreen$6 -> cyu$9:
+    1544:1560:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1564:1565:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    1546:1558:void lambda$new$0(com.mojang.realmsclient.RealmsMainScreen,net.minecraft.client.gui.components.Button) -> a
+com.mojang.realmsclient.RealmsMainScreen$PendingInvitesButton -> dhv$e:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    277:277:void <init>(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int,int,java.lang.String) -> <init>
-    280:281:void onPress() -> onPress
-com.mojang.realmsclient.RealmsMainScreen$7 -> cyu$10:
+    1523:1525:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1529:1530:void tick() -> d
+    1534:1535:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    1524:1524:void lambda$new$0(com.mojang.realmsclient.RealmsMainScreen,net.minecraft.client.gui.components.Button) -> a
+com.mojang.realmsclient.RealmsMainScreen$RealmSelectionList -> dhv$f:
+    boolean showingMessage -> o
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    283:283:void <init>(com.mojang.realmsclient.RealmsMainScreen,int,int,int,int,int,java.lang.String) -> <init>
-    286:287:void onPress() -> onPress
-com.mojang.realmsclient.RealmsMainScreen$8 -> cyu$11:
-    com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    535:535:void <init>(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> <init>
-    538:572:void run() -> run
-com.mojang.realmsclient.RealmsMainScreen$9 -> cyu$12:
-    com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    581:581:void <init>(com.mojang.realmsclient.RealmsMainScreen,java.lang.String) -> <init>
-    584:606:void run() -> run
-com.mojang.realmsclient.RealmsMainScreen$CloseButton -> cyu$a:
-    com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    1676:1678:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
-    1682:1683:void tick() -> tick
-    1687:1688:void render(int,int,float) -> render
-    1692:1701:void renderButton(int,int,float) -> renderButton
-    1705:1706:void onPress() -> onPress
-com.mojang.realmsclient.RealmsMainScreen$NewsButton -> cyu$b:
-    com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    1613:1615:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
-    1619:1620:void tick() -> tick
-    1624:1625:void render(int,int,float) -> render
-    1629:1641:void onPress() -> onPress
-    1645:1646:void renderButton(int,int,float) -> renderButton
-com.mojang.realmsclient.RealmsMainScreen$PendingInvitesButton -> cyu$c:
-    com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    1586:1588:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
-    1592:1593:void tick() -> tick
-    1597:1598:void render(int,int,float) -> render
-    1602:1604:void onPress() -> onPress
-    1608:1609:void renderButton(int,int,float) -> renderButton
-com.mojang.realmsclient.RealmsMainScreen$RealmSelectionList -> cyu$d:
-    com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    1031:1033:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
-    1037:1037:boolean isFocused() -> isFocused
-    1042:1049:boolean keyPressed(int,int,int) -> keyPressed
-    1054:1069:boolean mouseClicked(double,double,int) -> mouseClicked
-    1074:1112:void selectItem(int) -> selectItem
-    1116:1151:void itemClicked(int,int,double,double,int) -> itemClicked
-    1155:1155:int getMaxPosition() -> getMaxPosition
-    1160:1160:int getRowWidth() -> getRowWidth
-com.mojang.realmsclient.RealmsMainScreen$RealmSelectionListEntry -> cyu$e:
-    com.mojang.realmsclient.dto.RealmsServer mServerData -> a
+    957:959:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    963:965:void clear() -> a
+    968:969:int addMessageEntry(com.mojang.realmsclient.RealmsMainScreen$Entry) -> a
+    974:974:boolean isFocused() -> b
+    979:986:boolean keyPressed(int,int,int) -> a
+    991:1006:boolean mouseClicked(double,double,int) -> a
+    1011:1049:void selectItem(int) -> a
+    1053:1057:void setSelected(com.mojang.realmsclient.RealmsMainScreen$Entry) -> b
+    1061:1096:void itemClicked(int,int,double,double,int) -> a
+    1100:1100:int getMaxPosition() -> c
+    1105:1105:int getRowWidth() -> d
+    954:954:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+com.mojang.realmsclient.RealmsMainScreen$ServerEntry -> dhv$g:
+    com.mojang.realmsclient.dto.RealmsServer serverData -> c
     com.mojang.realmsclient.RealmsMainScreen this$0 -> b
-    1208:1210:void <init>(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
-    1214:1215:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    1219:1225:boolean mouseClicked(double,double,int) -> mouseClicked
-    1229:1230:void renderMcoServerItem(com.mojang.realmsclient.dto.RealmsServer,int,int,int,int) -> a
-    1233:1349:void renderLegacy(com.mojang.realmsclient.dto.RealmsServer,int,int,int,int) -> b
-    1345:1348:void lambda$renderLegacy$0(int,int) -> a
-com.mojang.realmsclient.RealmsMainScreen$RealmSelectionListTrialEntry -> cyu$f:
+    1154:1156:void <init>(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
+    1160:1161:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    1165:1171:boolean mouseClicked(double,double,int) -> a
+    1175:1176:void renderMcoServerItem(com.mojang.realmsclient.dto.RealmsServer,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> a
+    1179:1290:void renderLegacy(com.mojang.realmsclient.dto.RealmsServer,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> b
+    1286:1289:void lambda$renderLegacy$0(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    1149:1149:com.mojang.realmsclient.dto.RealmsServer access$2900(com.mojang.realmsclient.RealmsMainScreen$ServerEntry) -> a
+com.mojang.realmsclient.RealmsMainScreen$ShowPopupButton -> dhv$h:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    1165:1166:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
-    1170:1171:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    1175:1176:boolean mouseClicked(double,double,int) -> mouseClicked
-    1180:1201:void renderTrialItem(int,int,int,int,int) -> a
-com.mojang.realmsclient.RealmsMainScreen$ShowPopupButton -> cyu$g:
-    com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    1650:1652:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
-    1656:1657:void tick() -> tick
-    1661:1662:void render(int,int,float) -> render
-    1666:1667:void renderButton(int,int,float) -> renderButton
-    1671:1672:void onPress() -> onPress
-com.mojang.realmsclient.client.FileDownload -> cyv:
+    1569:1573:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1577:1578:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    1571:1571:void lambda$new$0(com.mojang.realmsclient.RealmsMainScreen,net.minecraft.client.gui.components.Button) -> a
+com.mojang.realmsclient.RealmsMainScreen$TrialEntry -> dhv$i:
+    com.mojang.realmsclient.RealmsMainScreen this$0 -> b
+    1112:1112:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1115:1116:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    1120:1121:boolean mouseClicked(double,double,int) -> a
+    1125:1146:void renderTrialItem(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int) -> a
+    1112:1112:void <init>(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.RealmsMainScreen$1) -> <init>
+com.mojang.realmsclient.Unit -> dhw:
+    com.mojang.realmsclient.Unit B -> a
+    com.mojang.realmsclient.Unit KB -> b
+    com.mojang.realmsclient.Unit MB -> c
+    com.mojang.realmsclient.Unit GB -> d
+    com.mojang.realmsclient.Unit[] $VALUES -> e
+    5:5:com.mojang.realmsclient.Unit[] values() -> values
+    5:5:com.mojang.realmsclient.Unit valueOf(java.lang.String) -> valueOf
+    5:5:void <init>(java.lang.String,int) -> <init>
+    15:25:com.mojang.realmsclient.Unit getLargest(long) -> a
+    30:34:double convertTo(long,com.mojang.realmsclient.Unit) -> a
+    38:44:java.lang.String humanReadable(long) -> b
+    48:48:java.lang.String humanReadable(long,com.mojang.realmsclient.Unit) -> b
+    5:9:void <clinit>() -> <clinit>
+com.mojang.realmsclient.client.FileDownload -> dhx:
     org.apache.logging.log4j.Logger LOGGER -> a
     boolean cancelled -> b
     boolean finished -> c
@@ -2167,51 +2349,51 @@ com.mojang.realmsclient.client.FileDownload -> cyv:
     java.lang.Thread currentThread -> i
     org.apache.http.client.config.RequestConfig requestConfig -> j
     java.lang.String[] INVALID_FILE_NAMES -> k
-    41:58:void <init>() -> <init>
-    61:84:long contentLength(java.lang.String) -> a
-    88:175:void download(com.mojang.realmsclient.dto.WorldDownload,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,net.minecraft.realms.RealmsAnvilLevelStorageSource) -> a
-    178:187:void cancel() -> a
-    190:190:boolean isFinished() -> b
-    194:194:boolean isError() -> c
-    198:198:boolean isExtracting() -> d
-    207:215:java.lang.String findAvailableFolderName(java.lang.String) -> b
-    219:321:void untarGzipArchive(java.lang.String,java.io.File,net.minecraft.realms.RealmsAnvilLevelStorageSource) -> a
-    93:172:void lambda$download$0(com.mojang.realmsclient.dto.WorldDownload,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,java.lang.String,net.minecraft.realms.RealmsAnvilLevelStorageSource) -> a
-    41:41:boolean access$000(com.mojang.realmsclient.client.FileDownload) -> a
-    41:41:boolean access$100(com.mojang.realmsclient.client.FileDownload) -> b
-    41:41:boolean access$202(com.mojang.realmsclient.client.FileDownload,boolean) -> a
-    41:41:void access$300(com.mojang.realmsclient.client.FileDownload,java.lang.String,java.io.File,net.minecraft.realms.RealmsAnvilLevelStorageSource) -> a
-    41:41:org.apache.logging.log4j.Logger access$400() -> e
-    41:41:boolean access$102(com.mojang.realmsclient.client.FileDownload,boolean) -> b
-    41:41:java.io.File access$500(com.mojang.realmsclient.client.FileDownload) -> c
-    41:41:boolean access$602(com.mojang.realmsclient.client.FileDownload,boolean) -> c
-    42:202:void <clinit>() -> <clinit>
-com.mojang.realmsclient.client.FileDownload$1 -> cyv$1:
-com.mojang.realmsclient.client.FileDownload$DownloadCountingOutputStream -> cyv$a:
+    44:61:void <init>() -> <init>
+    64:87:long contentLength(java.lang.String) -> a
+    91:178:void download(com.mojang.realmsclient.dto.WorldDownload,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,net.minecraft.world.level.storage.LevelStorageSource) -> a
+    181:190:void cancel() -> a
+    193:193:boolean isFinished() -> b
+    197:197:boolean isError() -> c
+    201:201:boolean isExtracting() -> d
+    210:218:java.lang.String findAvailableFolderName(java.lang.String) -> b
+    222:320:void untarGzipArchive(java.lang.String,java.io.File,net.minecraft.world.level.storage.LevelStorageSource) -> a
+    323:333:void deletePlayerTag(java.io.File) -> a
+    96:175:void lambda$download$0(com.mojang.realmsclient.dto.WorldDownload,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,java.lang.String,net.minecraft.world.level.storage.LevelStorageSource) -> a
+    44:44:boolean access$000(com.mojang.realmsclient.client.FileDownload) -> a
+    44:44:boolean access$100(com.mojang.realmsclient.client.FileDownload) -> b
+    44:44:boolean access$202(com.mojang.realmsclient.client.FileDownload,boolean) -> a
+    44:44:void access$300(com.mojang.realmsclient.client.FileDownload,java.lang.String,java.io.File,net.minecraft.world.level.storage.LevelStorageSource) -> a
+    44:44:org.apache.logging.log4j.Logger access$400() -> e
+    44:44:boolean access$102(com.mojang.realmsclient.client.FileDownload,boolean) -> b
+    44:44:java.io.File access$500(com.mojang.realmsclient.client.FileDownload) -> c
+    44:44:boolean access$602(com.mojang.realmsclient.client.FileDownload,boolean) -> c
+    45:205:void <clinit>() -> <clinit>
+com.mojang.realmsclient.client.FileDownload$1 -> dhx$1:
+com.mojang.realmsclient.client.FileDownload$DownloadCountingOutputStream -> dhx$a:
     java.awt.event.ActionListener listener -> b
     com.mojang.realmsclient.client.FileDownload this$0 -> a
-    396:398:void <init>(com.mojang.realmsclient.client.FileDownload,java.io.OutputStream) -> <init>
-    401:402:void setListener(java.awt.event.ActionListener) -> a
-    406:410:void afterWrite(int) -> afterWrite
-com.mojang.realmsclient.client.FileDownload$ProgressListener -> cyv$b:
+    403:405:void <init>(com.mojang.realmsclient.client.FileDownload,java.io.OutputStream) -> <init>
+    408:409:void setListener(java.awt.event.ActionListener) -> a
+    413:417:void afterWrite(int) -> afterWrite
+com.mojang.realmsclient.client.FileDownload$ProgressListener -> dhx$b:
     java.lang.String worldName -> b
     java.io.File tempFile -> c
-    net.minecraft.realms.RealmsAnvilLevelStorageSource levelStorageSource -> d
+    net.minecraft.world.level.storage.LevelStorageSource levelStorageSource -> d
     com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus downloadStatus -> e
-    com.mojang.realmsclient.dto.WorldDownload worldDownload -> f
     com.mojang.realmsclient.client.FileDownload this$0 -> a
-    333:339:void <init>(com.mojang.realmsclient.client.FileDownload,java.lang.String,java.io.File,net.minecraft.realms.RealmsAnvilLevelStorageSource,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,com.mojang.realmsclient.dto.WorldDownload) -> <init>
-    343:354:void actionPerformed(java.awt.event.ActionEvent) -> actionPerformed
-    326:326:void <init>(com.mojang.realmsclient.client.FileDownload,java.lang.String,java.io.File,net.minecraft.realms.RealmsAnvilLevelStorageSource,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,com.mojang.realmsclient.dto.WorldDownload,com.mojang.realmsclient.client.FileDownload$1) -> <init>
-com.mojang.realmsclient.client.FileDownload$ResourcePackProgressListener -> cyv$c:
+    341:346:void <init>(com.mojang.realmsclient.client.FileDownload,java.lang.String,java.io.File,net.minecraft.world.level.storage.LevelStorageSource,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus) -> <init>
+    350:361:void actionPerformed(java.awt.event.ActionEvent) -> actionPerformed
+    335:335:void <init>(com.mojang.realmsclient.client.FileDownload,java.lang.String,java.io.File,net.minecraft.world.level.storage.LevelStorageSource,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,com.mojang.realmsclient.client.FileDownload$1) -> <init>
+com.mojang.realmsclient.client.FileDownload$ResourcePackProgressListener -> dhx$c:
     java.io.File tempFile -> b
     com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus downloadStatus -> c
     com.mojang.realmsclient.dto.WorldDownload worldDownload -> d
     com.mojang.realmsclient.client.FileDownload this$0 -> a
-    362:366:void <init>(com.mojang.realmsclient.client.FileDownload,java.io.File,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,com.mojang.realmsclient.dto.WorldDownload) -> <init>
-    370:390:void actionPerformed(java.awt.event.ActionEvent) -> actionPerformed
-    357:357:void <init>(com.mojang.realmsclient.client.FileDownload,java.io.File,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,com.mojang.realmsclient.dto.WorldDownload,com.mojang.realmsclient.client.FileDownload$1) -> <init>
-com.mojang.realmsclient.client.FileUpload -> cyw:
+    369:373:void <init>(com.mojang.realmsclient.client.FileDownload,java.io.File,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,com.mojang.realmsclient.dto.WorldDownload) -> <init>
+    377:397:void actionPerformed(java.awt.event.ActionEvent) -> actionPerformed
+    364:364:void <init>(com.mojang.realmsclient.client.FileDownload,java.io.File,com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus,com.mojang.realmsclient.dto.WorldDownload,com.mojang.realmsclient.client.FileDownload$1) -> <init>
+com.mojang.realmsclient.client.FileUpload -> dhy:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.io.File file -> b
     long worldId -> c
@@ -2224,32 +2406,32 @@ com.mojang.realmsclient.client.FileUpload -> cyw:
     java.util.concurrent.atomic.AtomicBoolean cancelled -> j
     java.util.concurrent.CompletableFuture uploadTask -> k
     org.apache.http.client.config.RequestConfig requestConfig -> l
-    47:64:void <init>(java.io.File,long,int,com.mojang.realmsclient.dto.UploadInfo,java.lang.String,java.lang.String,java.lang.String,com.mojang.realmsclient.client.UploadStatus) -> <init>
-    67:73:void upload(java.util.function.Consumer) -> a
-    76:81:void cancel() -> a
-    84:106:com.mojang.realmsclient.gui.screens.UploadResult requestUpload(int) -> a
-    110:118:void cleanup(org.apache.http.client.methods.HttpPost,org.apache.http.impl.client.CloseableHttpClient) -> a
-    121:125:void setupRequest(org.apache.http.client.methods.HttpPost) -> a
-    128:146:void handleResponse(org.apache.http.HttpResponse,com.mojang.realmsclient.gui.screens.UploadResult$Builder) -> a
-    149:149:boolean shouldRetry(long,int) -> a
-    153:154:com.mojang.realmsclient.gui.screens.UploadResult retryUploadAfter(long,int) -> b
-    158:161:long getRetryDelaySeconds(org.apache.http.HttpResponse) -> a
-    165:165:boolean isFinished() -> b
-    71:71:com.mojang.realmsclient.gui.screens.UploadResult lambda$upload$0() -> c
-    33:33:void <clinit>() -> <clinit>
-com.mojang.realmsclient.client.FileUpload$CustomInputStreamEntity -> cyw$a:
+    48:65:void <init>(java.io.File,long,int,com.mojang.realmsclient.dto.UploadInfo,net.minecraft.client.User,java.lang.String,com.mojang.realmsclient.client.UploadStatus) -> <init>
+    68:74:void upload(java.util.function.Consumer) -> a
+    77:82:void cancel() -> a
+    85:107:com.mojang.realmsclient.gui.screens.UploadResult requestUpload(int) -> a
+    111:119:void cleanup(org.apache.http.client.methods.HttpPost,org.apache.http.impl.client.CloseableHttpClient) -> a
+    122:126:void setupRequest(org.apache.http.client.methods.HttpPost) -> a
+    129:147:void handleResponse(org.apache.http.HttpResponse,com.mojang.realmsclient.gui.screens.UploadResult$Builder) -> a
+    150:150:boolean shouldRetry(long,int) -> a
+    154:155:com.mojang.realmsclient.gui.screens.UploadResult retryUploadAfter(long,int) -> b
+    159:162:long getRetryDelaySeconds(org.apache.http.HttpResponse) -> a
+    166:166:boolean isFinished() -> b
+    72:72:com.mojang.realmsclient.gui.screens.UploadResult lambda$upload$0() -> c
+    34:34:void <clinit>() -> <clinit>
+com.mojang.realmsclient.client.FileUpload$CustomInputStreamEntity -> dhy$a:
     long length -> a
     java.io.InputStream content -> b
     com.mojang.realmsclient.client.UploadStatus uploadStatus -> c
-    174:178:void <init>(java.io.InputStream,long,com.mojang.realmsclient.client.UploadStatus) -> <init>
-    182:210:void writeTo(java.io.OutputStream) -> writeTo
-com.mojang.realmsclient.client.Ping -> cyx:
-    15:27:java.util.List ping(com.mojang.realmsclient.client.Ping$Region[]) -> a
-    31:47:int ping(java.lang.String) -> a
-    52:57:void close(java.net.Socket) -> a
-    60:60:long now() -> b
-    64:64:java.util.List pingAllRegions() -> a
-com.mojang.realmsclient.client.Ping$Region -> cyx$a:
+    175:179:void <init>(java.io.InputStream,long,com.mojang.realmsclient.client.UploadStatus) -> <init>
+    183:211:void writeTo(java.io.OutputStream) -> writeTo
+com.mojang.realmsclient.client.Ping -> dhz:
+    16:28:java.util.List ping(com.mojang.realmsclient.client.Ping$Region[]) -> a
+    32:48:int ping(java.lang.String) -> a
+    53:58:void close(java.net.Socket) -> a
+    61:61:long now() -> b
+    65:65:java.util.List pingAllRegions() -> a
+com.mojang.realmsclient.client.Ping$Region -> dhz$a:
     com.mojang.realmsclient.client.Ping$Region US_EAST_1 -> a
     com.mojang.realmsclient.client.Ping$Region US_WEST_2 -> b
     com.mojang.realmsclient.client.Ping$Region US_WEST_1 -> c
@@ -2261,97 +2443,98 @@ com.mojang.realmsclient.client.Ping$Region -> cyx$a:
     java.lang.String name -> i
     java.lang.String endpoint -> j
     com.mojang.realmsclient.client.Ping$Region[] $VALUES -> k
-    70:70:com.mojang.realmsclient.client.Ping$Region[] values() -> values
-    70:70:com.mojang.realmsclient.client.Ping$Region valueOf(java.lang.String) -> valueOf
-    80:83:void <init>(java.lang.String,int,java.lang.String,java.lang.String) -> <init>
-    70:70:java.lang.String access$000(com.mojang.realmsclient.client.Ping$Region) -> a
-    70:70:java.lang.String access$100(com.mojang.realmsclient.client.Ping$Region) -> b
-    70:78:void <clinit>() -> <clinit>
-com.mojang.realmsclient.client.RealmsClient -> cyy:
+    68:68:com.mojang.realmsclient.client.Ping$Region[] values() -> values
+    68:68:com.mojang.realmsclient.client.Ping$Region valueOf(java.lang.String) -> valueOf
+    78:81:void <init>(java.lang.String,int,java.lang.String,java.lang.String) -> <init>
+    68:68:java.lang.String access$000(com.mojang.realmsclient.client.Ping$Region) -> a
+    68:68:java.lang.String access$100(com.mojang.realmsclient.client.Ping$Region) -> b
+    68:76:void <clinit>() -> <clinit>
+com.mojang.realmsclient.client.RealmsClient -> dia:
     com.mojang.realmsclient.client.RealmsClient$Environment currentEnvironment -> a
     boolean initialized -> b
     org.apache.logging.log4j.Logger LOGGER -> c
     java.lang.String sessionId -> d
     java.lang.String username -> e
-    com.google.gson.Gson gson -> f
-    103:128:com.mojang.realmsclient.client.RealmsClient createRealmsClient() -> a
-    132:133:void switchToStage() -> b
-    136:137:void switchToProd() -> c
-    140:141:void switchToLocal() -> d
-    143:148:void <init>(java.lang.String,java.lang.String,java.net.Proxy) -> <init>
-    152:154:com.mojang.realmsclient.dto.RealmsServerList listWorlds() -> e
-    158:160:com.mojang.realmsclient.dto.RealmsServer getOwnWorld(long) -> a
-    170:172:com.mojang.realmsclient.dto.RealmsServerPlayerLists getLiveStats() -> f
-    176:178:com.mojang.realmsclient.dto.RealmsServerAddress join(long) -> b
-    182:186:void initializeWorld(long,java.lang.String,java.lang.String) -> a
-    189:191:java.lang.Boolean mcoEnabled() -> g
-    195:197:java.lang.Boolean stageAvailable() -> h
-    201:211:com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse clientCompatible() -> i
-    215:217:void uninvite(long,java.lang.String) -> a
-    220:222:void uninviteMyselfFrom(long) -> c
-    225:230:com.mojang.realmsclient.dto.RealmsServer invite(long,java.lang.String) -> b
-    234:236:com.mojang.realmsclient.dto.BackupList backupsFor(long) -> d
-    240:243:void update(long,java.lang.String,java.lang.String) -> b
-    246:249:void updateSlot(long,int,com.mojang.realmsclient.dto.RealmsWorldOptions) -> a
-    253:255:boolean switchSlot(long,int) -> a
-    259:261:void restoreWorld(long,java.lang.String) -> c
-    264:266:com.mojang.realmsclient.dto.WorldTemplatePaginatedList fetchWorldTemplates(int,int,com.mojang.realmsclient.dto.RealmsServer$WorldType) -> a
-    270:272:java.lang.Boolean putIntoMinigameMode(long,java.lang.String) -> d
-    276:278:com.mojang.realmsclient.dto.Ops op(long,java.lang.String) -> e
-    282:284:com.mojang.realmsclient.dto.Ops deop(long,java.lang.String) -> f
-    288:290:java.lang.Boolean open(long) -> e
-    294:296:java.lang.Boolean close(long) -> f
-    300:303:java.lang.Boolean resetWorldWithSeed(long,java.lang.String,java.lang.Integer,boolean) -> a
-    307:310:java.lang.Boolean resetWorldWithTemplate(long,java.lang.String) -> g
-    314:316:com.mojang.realmsclient.dto.Subscription subscriptionFor(long) -> g
-    320:322:int pendingInvitesCount() -> j
-    326:328:com.mojang.realmsclient.dto.PendingInvitesList pendingInvites() -> k
-    332:334:void acceptInvitation(java.lang.String) -> a
-    337:339:com.mojang.realmsclient.dto.WorldDownload download(long,int) -> b
-    343:355:com.mojang.realmsclient.dto.UploadInfo upload(long,java.lang.String) -> h
-    359:361:void rejectInvitation(java.lang.String) -> b
-    364:366:void agreeToTos() -> l
-    369:371:com.mojang.realmsclient.dto.RealmsNews getNews() -> m
-    375:377:void sendPingResults(com.mojang.realmsclient.dto.PingResult) -> a
-    380:382:java.lang.Boolean trialAvailable() -> n
-    390:392:void deleteWorld(long) -> h
-    395:395:java.lang.String url(java.lang.String) -> c
-    400:404:java.lang.String url(java.lang.String,java.lang.String) -> a
-    409:442:java.lang.String execute(com.mojang.realmsclient.client.Request) -> a
-    51:100:void <clinit>() -> <clinit>
-com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse -> cyy$a:
+    com.mojang.realmsclient.dto.GuardedSerializer GSON -> f
+    104:126:com.mojang.realmsclient.client.RealmsClient create() -> a
+    130:131:void switchToStage() -> b
+    134:135:void switchToProd() -> c
+    138:139:void switchToLocal() -> d
+    141:146:void <init>(java.lang.String,java.lang.String,java.net.Proxy) -> <init>
+    149:151:com.mojang.realmsclient.dto.RealmsServerList listWorlds() -> e
+    155:157:com.mojang.realmsclient.dto.RealmsServer getOwnWorld(long) -> a
+    167:169:com.mojang.realmsclient.dto.RealmsServerPlayerLists getLiveStats() -> f
+    173:175:com.mojang.realmsclient.dto.RealmsServerAddress join(long) -> b
+    179:183:void initializeWorld(long,java.lang.String,java.lang.String) -> a
+    186:188:java.lang.Boolean mcoEnabled() -> g
+    192:194:java.lang.Boolean stageAvailable() -> h
+    198:208:com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse clientCompatible() -> i
+    212:214:void uninvite(long,java.lang.String) -> a
+    217:219:void uninviteMyselfFrom(long) -> c
+    222:227:com.mojang.realmsclient.dto.RealmsServer invite(long,java.lang.String) -> b
+    231:233:com.mojang.realmsclient.dto.BackupList backupsFor(long) -> d
+    237:240:void update(long,java.lang.String,java.lang.String) -> b
+    243:246:void updateSlot(long,int,com.mojang.realmsclient.dto.RealmsWorldOptions) -> a
+    250:252:boolean switchSlot(long,int) -> a
+    256:258:void restoreWorld(long,java.lang.String) -> c
+    261:263:com.mojang.realmsclient.dto.WorldTemplatePaginatedList fetchWorldTemplates(int,int,com.mojang.realmsclient.dto.RealmsServer$WorldType) -> a
+    267:269:java.lang.Boolean putIntoMinigameMode(long,java.lang.String) -> d
+    273:275:com.mojang.realmsclient.dto.Ops op(long,java.lang.String) -> e
+    279:281:com.mojang.realmsclient.dto.Ops deop(long,java.lang.String) -> f
+    285:287:java.lang.Boolean open(long) -> e
+    291:293:java.lang.Boolean close(long) -> f
+    297:300:java.lang.Boolean resetWorldWithSeed(long,java.lang.String,java.lang.Integer,boolean) -> a
+    304:307:java.lang.Boolean resetWorldWithTemplate(long,java.lang.String) -> g
+    311:313:com.mojang.realmsclient.dto.Subscription subscriptionFor(long) -> g
+    317:319:int pendingInvitesCount() -> j
+    323:325:com.mojang.realmsclient.dto.PendingInvitesList pendingInvites() -> k
+    329:331:void acceptInvitation(java.lang.String) -> a
+    334:336:com.mojang.realmsclient.dto.WorldDownload download(long,int) -> b
+    340:352:com.mojang.realmsclient.dto.UploadInfo upload(long,java.lang.String) -> h
+    356:358:void rejectInvitation(java.lang.String) -> b
+    361:363:void agreeToTos() -> l
+    366:368:com.mojang.realmsclient.dto.RealmsNews getNews() -> m
+    372:374:void sendPingResults(com.mojang.realmsclient.dto.PingResult) -> a
+    377:379:java.lang.Boolean trialAvailable() -> n
+    387:389:void deleteWorld(long) -> h
+    393:393:java.lang.String url(java.lang.String) -> c
+    399:402:java.lang.String url(java.lang.String,java.lang.String) -> a
+    407:440:java.lang.String execute(com.mojang.realmsclient.client.Request) -> a
+    52:101:void <clinit>() -> <clinit>
+com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse -> dia$a:
     com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse COMPATIBLE -> a
     com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse OUTDATED -> b
     com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse OTHER -> c
     com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse[] $VALUES -> d
-    446:446:com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse[] values() -> values
-    446:446:com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse valueOf(java.lang.String) -> valueOf
-    446:446:void <init>(java.lang.String,int) -> <init>
-    446:449:void <clinit>() -> <clinit>
-com.mojang.realmsclient.client.RealmsClient$Environment -> cyy$b:
+    444:444:com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse[] values() -> values
+    444:444:com.mojang.realmsclient.client.RealmsClient$CompatibleVersionResponse valueOf(java.lang.String) -> valueOf
+    444:444:void <init>(java.lang.String,int) -> <init>
+    444:447:void <clinit>() -> <clinit>
+com.mojang.realmsclient.client.RealmsClient$Environment -> dia$b:
     com.mojang.realmsclient.client.RealmsClient$Environment PRODUCTION -> a
     com.mojang.realmsclient.client.RealmsClient$Environment STAGE -> b
     com.mojang.realmsclient.client.RealmsClient$Environment LOCAL -> c
     java.lang.String baseUrl -> d
     java.lang.String protocol -> e
     com.mojang.realmsclient.client.RealmsClient$Environment[] $VALUES -> f
-    37:37:com.mojang.realmsclient.client.RealmsClient$Environment[] values() -> values
-    37:37:com.mojang.realmsclient.client.RealmsClient$Environment valueOf(java.lang.String) -> valueOf
-    45:48:void <init>(java.lang.String,int,java.lang.String,java.lang.String) -> <init>
-    37:40:void <clinit>() -> <clinit>
-com.mojang.realmsclient.client.RealmsClientConfig -> cyz:
+    38:38:com.mojang.realmsclient.client.RealmsClient$Environment[] values() -> values
+    38:38:com.mojang.realmsclient.client.RealmsClient$Environment valueOf(java.lang.String) -> valueOf
+    46:49:void <init>(java.lang.String,int,java.lang.String,java.lang.String) -> <init>
+    38:41:void <clinit>() -> <clinit>
+com.mojang.realmsclient.client.RealmsClientConfig -> dib:
     java.net.Proxy proxy -> a
     9:9:java.net.Proxy getProxy() -> a
     13:16:void setProxy(java.net.Proxy) -> a
-com.mojang.realmsclient.client.RealmsError -> cza:
+com.mojang.realmsclient.client.RealmsError -> dic:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.lang.String errorMessage -> b
     int errorCode -> c
-    17:27:void <init>(java.lang.String) -> <init>
-    30:30:java.lang.String getErrorMessage() -> a
-    34:34:int getErrorCode() -> b
+    17:20:void <init>(java.lang.String,int) -> <init>
+    24:32:com.mojang.realmsclient.client.RealmsError create(java.lang.String) -> a
+    37:37:java.lang.String getErrorMessage() -> a
+    41:41:int getErrorCode() -> b
     12:12:void <clinit>() -> <clinit>
-com.mojang.realmsclient.client.Request -> czb:
+com.mojang.realmsclient.client.Request -> did:
     java.net.HttpURLConnection connection -> a
     boolean connected -> c
     java.lang.String url -> b
@@ -2363,359 +2546,343 @@ com.mojang.realmsclient.client.Request -> czb:
     77:80:int responseCode() -> b
     86:98:java.lang.String text() -> c
     103:112:java.lang.String read(java.io.InputStream) -> a
-    116:144:void dispose() -> f
-    148:153:com.mojang.realmsclient.client.Request connect() -> d
+    116:141:void dispose() -> f
+    145:150:com.mojang.realmsclient.client.Request connect() -> d
     com.mojang.realmsclient.client.Request doConnect() -> e
-    160:160:com.mojang.realmsclient.client.Request get(java.lang.String) -> a
-    164:164:com.mojang.realmsclient.client.Request get(java.lang.String,int,int) -> a
-    168:168:com.mojang.realmsclient.client.Request post(java.lang.String,java.lang.String) -> b
-    172:172:com.mojang.realmsclient.client.Request post(java.lang.String,java.lang.String,int,int) -> a
-    176:176:com.mojang.realmsclient.client.Request delete(java.lang.String) -> b
-    180:180:com.mojang.realmsclient.client.Request put(java.lang.String,java.lang.String) -> c
-    184:184:com.mojang.realmsclient.client.Request put(java.lang.String,java.lang.String,int,int) -> b
-    188:188:java.lang.String getHeader(java.lang.String) -> c
-    193:195:java.lang.String getHeader(java.net.HttpURLConnection,java.lang.String) -> a
-com.mojang.realmsclient.client.Request$Delete -> czb$a:
-    201:202:void <init>(java.lang.String,int,int) -> <init>
-    207:212:com.mojang.realmsclient.client.Request$Delete doConnect() -> f
-    199:199:com.mojang.realmsclient.client.Request doConnect() -> e
-com.mojang.realmsclient.client.Request$Get -> czb$b:
-    219:220:void <init>(java.lang.String,int,int) -> <init>
-    225:231:com.mojang.realmsclient.client.Request$Get doConnect() -> f
-    217:217:com.mojang.realmsclient.client.Request doConnect() -> e
-com.mojang.realmsclient.client.Request$Post -> czb$c:
+    157:157:com.mojang.realmsclient.client.Request get(java.lang.String) -> a
+    161:161:com.mojang.realmsclient.client.Request get(java.lang.String,int,int) -> a
+    165:165:com.mojang.realmsclient.client.Request post(java.lang.String,java.lang.String) -> b
+    169:169:com.mojang.realmsclient.client.Request post(java.lang.String,java.lang.String,int,int) -> a
+    173:173:com.mojang.realmsclient.client.Request delete(java.lang.String) -> b
+    177:177:com.mojang.realmsclient.client.Request put(java.lang.String,java.lang.String) -> c
+    181:181:com.mojang.realmsclient.client.Request put(java.lang.String,java.lang.String,int,int) -> b
+    185:185:java.lang.String getHeader(java.lang.String) -> c
+    190:192:java.lang.String getHeader(java.net.HttpURLConnection,java.lang.String) -> a
+com.mojang.realmsclient.client.Request$Delete -> did$a:
+    198:199:void <init>(java.lang.String,int,int) -> <init>
+    204:209:com.mojang.realmsclient.client.Request$Delete doConnect() -> f
+    196:196:com.mojang.realmsclient.client.Request doConnect() -> e
+com.mojang.realmsclient.client.Request$Get -> did$b:
+    216:217:void <init>(java.lang.String,int,int) -> <init>
+    222:228:com.mojang.realmsclient.client.Request$Get doConnect() -> f
+    214:214:com.mojang.realmsclient.client.Request doConnect() -> e
+com.mojang.realmsclient.client.Request$Post -> did$c:
     java.lang.String content -> c
-    270:272:void <init>(java.lang.String,java.lang.String,int,int) -> <init>
-    277:292:com.mojang.realmsclient.client.Request$Post doConnect() -> f
-    266:266:com.mojang.realmsclient.client.Request doConnect() -> e
-com.mojang.realmsclient.client.Request$Put -> czb$d:
+    267:269:void <init>(java.lang.String,java.lang.String,int,int) -> <init>
+    274:289:com.mojang.realmsclient.client.Request$Post doConnect() -> f
+    263:263:com.mojang.realmsclient.client.Request doConnect() -> e
+com.mojang.realmsclient.client.Request$Put -> did$d:
     java.lang.String content -> c
-    240:242:void <init>(java.lang.String,java.lang.String,int,int) -> <init>
-    247:261:com.mojang.realmsclient.client.Request$Put doConnect() -> f
-    236:236:com.mojang.realmsclient.client.Request doConnect() -> e
-com.mojang.realmsclient.client.UploadStatus -> czc:
+    237:239:void <init>(java.lang.String,java.lang.String,int,int) -> <init>
+    244:258:com.mojang.realmsclient.client.Request$Put doConnect() -> f
+    233:233:com.mojang.realmsclient.client.Request doConnect() -> e
+com.mojang.realmsclient.client.UploadStatus -> die:
     java.lang.Long bytesWritten -> a
     java.lang.Long totalBytes -> b
     3:5:void <init>() -> <init>
-com.mojang.realmsclient.dto.Backup -> com.mojang.realmsclient.dto.Backup:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.lang.String backupId -> backupId
-    java.util.Date lastModifiedDate -> lastModifiedDate
-    long size -> size
-    boolean uploadedVersion -> uploadedVersion
-    java.util.Map metadata -> metadata
-    java.util.Map changeList -> changeList
-    19:31:void <init>() -> <init>
-    34:52:com.mojang.realmsclient.dto.Backup parse(com.google.gson.JsonElement) -> parse
-    56:68:java.lang.String format(java.lang.String) -> format
-    72:72:boolean isUploadedVersion() -> isUploadedVersion
-    76:77:void setUploadedVersion(boolean) -> setUploadedVersion
-    20:20:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.BackupList -> com.mojang.realmsclient.dto.BackupList:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.util.List backups -> backups
-    14:14:void <init>() -> <init>
-    20:35:com.mojang.realmsclient.dto.BackupList parse(java.lang.String) -> parse
-    15:15:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.Ops -> com.mojang.realmsclient.dto.Ops:
-    java.util.Set ops -> ops
-    12:13:void <init>() -> <init>
-    16:29:com.mojang.realmsclient.dto.Ops parse(java.lang.String) -> parse
-com.mojang.realmsclient.dto.PendingInvite -> com.mojang.realmsclient.dto.PendingInvite:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.lang.String invitationId -> invitationId
-    java.lang.String worldName -> worldName
-    java.lang.String worldOwnerName -> worldOwnerName
-    java.lang.String worldOwnerUuid -> worldOwnerUuid
-    java.util.Date date -> date
-    14:14:void <init>() -> <init>
-    24:34:com.mojang.realmsclient.dto.PendingInvite parse(com.google.gson.JsonObject) -> parse
-    15:15:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.PendingInvitesList -> com.mojang.realmsclient.dto.PendingInvitesList:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.util.List pendingInvites -> pendingInvites
-    15:18:void <init>() -> <init>
-    21:34:com.mojang.realmsclient.dto.PendingInvitesList parse(java.lang.String) -> parse
-    16:16:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.PingResult -> com.mojang.realmsclient.dto.PingResult:
-    java.util.List pingResults -> pingResults
-    java.util.List worldIds -> worldIds
-    9:11:void <init>() -> <init>
-com.mojang.realmsclient.dto.PlayerInfo -> com.mojang.realmsclient.dto.PlayerInfo:
-    java.lang.String name -> name
-    java.lang.String uuid -> uuid
-    boolean operator -> operator
-    boolean accepted -> accepted
-    boolean online -> online
-    6:6:void <init>() -> <init>
-    14:14:java.lang.String getName() -> getName
-    18:19:void setName(java.lang.String) -> setName
-    22:22:java.lang.String getUuid() -> getUuid
-    26:27:void setUuid(java.lang.String) -> setUuid
-    30:30:boolean isOperator() -> isOperator
-    34:35:void setOperator(boolean) -> setOperator
-    38:38:boolean getAccepted() -> getAccepted
-    42:43:void setAccepted(boolean) -> setAccepted
-    46:46:boolean getOnline() -> getOnline
-    50:51:void setOnline(boolean) -> setOnline
-com.mojang.realmsclient.dto.RealmsDescriptionDto -> com.mojang.realmsclient.dto.RealmsDescriptionDto:
-    java.lang.String name -> name
-    java.lang.String description -> description
-    10:13:void <init>(java.lang.String,java.lang.String) -> <init>
-com.mojang.realmsclient.dto.RealmsNews -> com.mojang.realmsclient.dto.RealmsNews:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.lang.String newsLink -> newsLink
+com.mojang.realmsclient.dto.Backup -> dif:
+    org.apache.logging.log4j.Logger LOGGER -> f
+    java.lang.String backupId -> a
+    java.util.Date lastModifiedDate -> b
+    long size -> c
+    boolean uploadedVersion -> g
+    java.util.Map metadata -> d
+    java.util.Map changeList -> e
+    17:29:void <init>() -> <init>
+    32:50:com.mojang.realmsclient.dto.Backup parse(com.google.gson.JsonElement) -> a
+    54:66:java.lang.String format(java.lang.String) -> a
+    70:70:boolean isUploadedVersion() -> a
+    74:75:void setUploadedVersion(boolean) -> a
+    18:18:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.BackupList -> dig:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    java.util.List backups -> a
     12:12:void <init>() -> <init>
-    18:28:com.mojang.realmsclient.dto.RealmsNews parse(java.lang.String) -> parse
+    18:33:com.mojang.realmsclient.dto.BackupList parse(java.lang.String) -> a
     13:13:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.RealmsServer -> com.mojang.realmsclient.dto.RealmsServer:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    long id -> id
-    java.lang.String remoteSubscriptionId -> remoteSubscriptionId
-    java.lang.String name -> name
-    java.lang.String motd -> motd
-    com.mojang.realmsclient.dto.RealmsServer$State state -> state
-    java.lang.String owner -> owner
-    java.lang.String ownerUUID -> ownerUUID
-    java.util.List players -> players
-    java.util.Map slots -> slots
-    boolean expired -> expired
-    boolean expiredTrial -> expiredTrial
-    int daysLeft -> daysLeft
-    com.mojang.realmsclient.dto.RealmsServer$WorldType worldType -> worldType
-    int activeSlot -> activeSlot
-    java.lang.String minigameName -> minigameName
-    int minigameId -> minigameId
-    java.lang.String minigameImage -> minigameImage
-    com.mojang.realmsclient.dto.RealmsServerPing serverPing -> serverPing
-    29:53:void <init>() -> <init>
-    56:56:java.lang.String getDescription() -> getDescription
-    60:60:java.lang.String getName() -> getName
-    64:64:java.lang.String getMinigameName() -> getMinigameName
-    68:69:void setName(java.lang.String) -> setName
-    72:73:void setDescription(java.lang.String) -> setDescription
-    76:105:void updateServerPing(com.mojang.realmsclient.dto.RealmsServerPlayerList) -> updateServerPing
-    108:141:com.mojang.realmsclient.dto.RealmsServer parse(com.google.gson.JsonObject) -> parse
-    145:146:void sortInvited(com.mojang.realmsclient.dto.RealmsServer) -> sortInvited
-    149:163:java.util.List parseInvited(com.google.gson.JsonArray) -> parseInvited
-    167:195:java.util.Map parseSlots(com.google.gson.JsonArray) -> parseSlots
-    199:204:java.util.Map getEmptySlots() -> getEmptySlots
-    208:216:com.mojang.realmsclient.dto.RealmsServer parse(java.lang.String) -> parse
-    221:223:com.mojang.realmsclient.dto.RealmsServer$State getState(java.lang.String) -> getState
-    229:231:com.mojang.realmsclient.dto.RealmsServer$WorldType getWorldType(java.lang.String) -> getWorldType
-    237:238:int hashCode() -> hashCode
-    243:261:boolean equals(java.lang.Object) -> equals
-    266:287:com.mojang.realmsclient.dto.RealmsServer clone() -> clone
-    291:297:java.util.Map cloneSlots(java.util.Map) -> cloneSlots
+com.mojang.realmsclient.dto.GuardedSerializer -> dih:
+    com.google.gson.Gson gson -> a
+    5:6:void <init>() -> <init>
+    9:9:java.lang.String toJson(com.mojang.realmsclient.dto.ReflectionBasedSerialization) -> a
+    13:13:com.mojang.realmsclient.dto.ReflectionBasedSerialization fromJson(java.lang.String,java.lang.Class) -> a
+com.mojang.realmsclient.dto.Ops -> dii:
+    java.util.Set ops -> a
+    10:11:void <init>() -> <init>
+    14:27:com.mojang.realmsclient.dto.Ops parse(java.lang.String) -> a
+com.mojang.realmsclient.dto.PendingInvite -> dij:
+    org.apache.logging.log4j.Logger LOGGER -> f
+    java.lang.String invitationId -> a
+    java.lang.String worldName -> b
+    java.lang.String worldOwnerName -> c
+    java.lang.String worldOwnerUuid -> d
+    java.util.Date date -> e
+    12:12:void <init>() -> <init>
+    22:32:com.mojang.realmsclient.dto.PendingInvite parse(com.google.gson.JsonObject) -> a
+    13:13:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.PendingInvitesList -> dik:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    java.util.List pendingInvites -> a
+    13:16:void <init>() -> <init>
+    19:32:com.mojang.realmsclient.dto.PendingInvitesList parse(java.lang.String) -> a
+    14:14:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.PingResult -> dil:
+    java.util.List pingResults -> a
+    java.util.List worldIds -> b
+    8:13:void <init>() -> <init>
+com.mojang.realmsclient.dto.PlayerInfo -> dim:
+    java.lang.String name -> a
+    java.lang.String uuid -> b
+    boolean operator -> c
+    boolean accepted -> d
+    boolean online -> e
+    5:5:void <init>() -> <init>
+    22:22:java.lang.String getName() -> a
+    26:27:void setName(java.lang.String) -> a
+    30:30:java.lang.String getUuid() -> b
+    34:35:void setUuid(java.lang.String) -> b
+    38:38:boolean isOperator() -> c
+    42:43:void setOperator(boolean) -> a
+    46:46:boolean getAccepted() -> d
+    50:51:void setAccepted(boolean) -> b
+    54:54:boolean getOnline() -> e
+    58:59:void setOnline(boolean) -> c
+com.mojang.realmsclient.dto.RealmsDescriptionDto -> din:
+    java.lang.String name -> a
+    java.lang.String description -> b
+    12:15:void <init>(java.lang.String,java.lang.String) -> <init>
+com.mojang.realmsclient.dto.RealmsNews -> dio:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    java.lang.String newsLink -> a
+    10:10:void <init>() -> <init>
+    16:26:com.mojang.realmsclient.dto.RealmsNews parse(java.lang.String) -> a
+    11:11:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.RealmsServer -> dip:
+    org.apache.logging.log4j.Logger LOGGER -> s
+    long id -> a
+    java.lang.String remoteSubscriptionId -> b
+    java.lang.String name -> c
+    java.lang.String motd -> d
+    com.mojang.realmsclient.dto.RealmsServer$State state -> e
+    java.lang.String owner -> f
+    java.lang.String ownerUUID -> g
+    java.util.List players -> h
+    java.util.Map slots -> i
+    boolean expired -> j
+    boolean expiredTrial -> k
+    int daysLeft -> l
+    com.mojang.realmsclient.dto.RealmsServer$WorldType worldType -> m
+    int activeSlot -> n
+    java.lang.String minigameName -> o
+    int minigameId -> p
+    java.lang.String minigameImage -> q
+    com.mojang.realmsclient.dto.RealmsServerPing serverPing -> r
+    28:52:void <init>() -> <init>
+    55:55:java.lang.String getDescription() -> a
+    59:59:java.lang.String getName() -> b
+    63:63:java.lang.String getMinigameName() -> c
+    67:68:void setName(java.lang.String) -> a
+    71:72:void setDescription(java.lang.String) -> b
+    75:100:void updateServerPing(com.mojang.realmsclient.dto.RealmsServerPlayerList) -> a
+    103:136:com.mojang.realmsclient.dto.RealmsServer parse(com.google.gson.JsonObject) -> a
+    140:141:void sortInvited(com.mojang.realmsclient.dto.RealmsServer) -> a
+    144:158:java.util.List parseInvited(com.google.gson.JsonArray) -> a
+    162:190:java.util.Map parseSlots(com.google.gson.JsonArray) -> b
+    194:199:java.util.Map createEmptySlots() -> e
+    204:208:com.mojang.realmsclient.dto.RealmsServer parse(java.lang.String) -> c
+    213:215:com.mojang.realmsclient.dto.RealmsServer$State getState(java.lang.String) -> d
+    221:223:com.mojang.realmsclient.dto.RealmsServer$WorldType getWorldType(java.lang.String) -> e
+    229:229:int hashCode() -> hashCode
+    234:252:boolean equals(java.lang.Object) -> equals
+    257:278:com.mojang.realmsclient.dto.RealmsServer clone() -> d
+    282:288:java.util.Map cloneSlots(java.util.Map) -> a
+    292:292:java.lang.String getWorldName(int) -> a
     28:28:java.lang.Object clone() -> clone
-    145:145:int lambda$sortInvited$0(com.mojang.realmsclient.dto.PlayerInfo,com.mojang.realmsclient.dto.PlayerInfo) -> lambda$sortInvited$0
-    30:30:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.RealmsServer$McoServerComparator -> com.mojang.realmsclient.dto.RealmsServer$a:
+    140:140:int lambda$sortInvited$0(com.mojang.realmsclient.dto.PlayerInfo,com.mojang.realmsclient.dto.PlayerInfo) -> a
+    29:29:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.RealmsServer$McoServerComparator -> dip$a:
     java.lang.String refOwner -> a
-    306:308:void <init>(java.lang.String) -> <init>
-    312:318:int compare(com.mojang.realmsclient.dto.RealmsServer,com.mojang.realmsclient.dto.RealmsServer) -> a
-    303:303:int compare(java.lang.Object,java.lang.Object) -> compare
-com.mojang.realmsclient.dto.RealmsServer$State -> com.mojang.realmsclient.dto.RealmsServer$b:
+    298:300:void <init>(java.lang.String) -> <init>
+    304:310:int compare(com.mojang.realmsclient.dto.RealmsServer,com.mojang.realmsclient.dto.RealmsServer) -> a
+    295:295:int compare(java.lang.Object,java.lang.Object) -> compare
+com.mojang.realmsclient.dto.RealmsServer$State -> dip$b:
     com.mojang.realmsclient.dto.RealmsServer$State CLOSED -> a
     com.mojang.realmsclient.dto.RealmsServer$State OPEN -> b
     com.mojang.realmsclient.dto.RealmsServer$State UNINITIALIZED -> c
     com.mojang.realmsclient.dto.RealmsServer$State[] $VALUES -> d
-    325:325:com.mojang.realmsclient.dto.RealmsServer$State[] values() -> values
-    325:325:com.mojang.realmsclient.dto.RealmsServer$State valueOf(java.lang.String) -> valueOf
-    325:325:void <init>(java.lang.String,int) -> <init>
-    325:328:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.RealmsServer$WorldType -> com.mojang.realmsclient.dto.RealmsServer$c:
+    314:314:com.mojang.realmsclient.dto.RealmsServer$State[] values() -> values
+    314:314:com.mojang.realmsclient.dto.RealmsServer$State valueOf(java.lang.String) -> valueOf
+    314:314:void <init>(java.lang.String,int) -> <init>
+    314:317:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.RealmsServer$WorldType -> dip$c:
     com.mojang.realmsclient.dto.RealmsServer$WorldType NORMAL -> a
     com.mojang.realmsclient.dto.RealmsServer$WorldType MINIGAME -> b
     com.mojang.realmsclient.dto.RealmsServer$WorldType ADVENTUREMAP -> c
     com.mojang.realmsclient.dto.RealmsServer$WorldType EXPERIENCE -> d
     com.mojang.realmsclient.dto.RealmsServer$WorldType INSPIRATION -> e
     com.mojang.realmsclient.dto.RealmsServer$WorldType[] $VALUES -> f
-    334:334:com.mojang.realmsclient.dto.RealmsServer$WorldType[] values() -> values
-    334:334:com.mojang.realmsclient.dto.RealmsServer$WorldType valueOf(java.lang.String) -> valueOf
-    334:334:void <init>(java.lang.String,int) -> <init>
-    334:339:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.RealmsServerAddress -> com.mojang.realmsclient.dto.RealmsServerAddress:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.lang.String address -> address
-    java.lang.String resourcePackUrl -> resourcePackUrl
-    java.lang.String resourcePackHash -> resourcePackHash
-    12:12:void <init>() -> <init>
-    20:31:com.mojang.realmsclient.dto.RealmsServerAddress parse(java.lang.String) -> parse
-    13:13:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.RealmsServerList -> com.mojang.realmsclient.dto.RealmsServerList:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.util.List servers -> servers
-    16:16:void <init>() -> <init>
-    22:37:com.mojang.realmsclient.dto.RealmsServerList parse(java.lang.String) -> parse
-    17:17:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.RealmsServerPing -> com.mojang.realmsclient.dto.RealmsServerPing:
-    java.lang.String nrOfPlayers -> nrOfPlayers
-    java.lang.String playerList -> playerList
-    6:8:void <init>() -> <init>
-com.mojang.realmsclient.dto.RealmsServerPlayerList -> com.mojang.realmsclient.dto.RealmsServerPlayerList:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    com.google.gson.JsonParser jsonParser -> jsonParser
-    long serverId -> serverId
-    java.util.List players -> players
-    18:18:void <init>() -> <init>
-    26:48:com.mojang.realmsclient.dto.RealmsServerPlayerList parse(com.google.gson.JsonObject) -> parse
-    52:61:java.util.List parsePlayers(com.google.gson.JsonArray) -> parsePlayers
-    19:20:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.RealmsServerPlayerLists -> com.mojang.realmsclient.dto.RealmsServerPlayerLists:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.util.List servers -> servers
-    16:16:void <init>() -> <init>
-    22:42:com.mojang.realmsclient.dto.RealmsServerPlayerLists parse(java.lang.String) -> parse
-    17:17:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.RealmsWorldOptions -> com.mojang.realmsclient.dto.RealmsWorldOptions:
-    java.lang.Boolean pvp -> pvp
-    java.lang.Boolean spawnAnimals -> spawnAnimals
-    java.lang.Boolean spawnMonsters -> spawnMonsters
-    java.lang.Boolean spawnNPCs -> spawnNPCs
-    java.lang.Integer spawnProtection -> spawnProtection
-    java.lang.Boolean commandBlocks -> commandBlocks
-    java.lang.Boolean forceGameMode -> forceGameMode
-    java.lang.Integer difficulty -> difficulty
-    java.lang.Integer gameMode -> gameMode
-    java.lang.String slotName -> slotName
-    long templateId -> templateId
-    java.lang.String templateImage -> templateImage
-    boolean adventureMap -> adventureMap
-    boolean empty -> empty
-    boolean forceGameModeDefault -> forceGameModeDefault
-    boolean pvpDefault -> pvpDefault
-    boolean spawnAnimalsDefault -> spawnAnimalsDefault
-    boolean spawnMonstersDefault -> spawnMonstersDefault
-    boolean spawnNPCsDefault -> spawnNPCsDefault
-    int spawnProtectionDefault -> spawnProtectionDefault
-    boolean commandBlocksDefault -> commandBlocksDefault
-    int difficultyDefault -> difficultyDefault
-    int gameModeDefault -> gameModeDefault
-    java.lang.String slotNameDefault -> slotNameDefault
-    long templateIdDefault -> templateIdDefault
-    java.lang.String templateImageDefault -> templateImageDefault
-    boolean adventureMapDefault -> adventureMapDefault
-    44:55:void <init>(java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Integer,java.lang.Boolean,java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.String) -> <init>
-    58:58:com.mojang.realmsclient.dto.RealmsWorldOptions getDefaults() -> getDefaults
-    62:64:com.mojang.realmsclient.dto.RealmsWorldOptions getEmptyDefaults() -> getEmptyDefaults
-    68:69:void setEmpty(boolean) -> setEmpty
-    72:87:com.mojang.realmsclient.dto.RealmsWorldOptions parse(com.google.gson.JsonObject) -> parse
-    91:98:java.lang.String getSlotName(int) -> getSlotName
-    103:103:java.lang.String getDefaultSlotName(int) -> getDefaultSlotName
-    107:149:java.lang.String toJson() -> toJson
-    154:154:com.mojang.realmsclient.dto.RealmsWorldOptions clone() -> clone
-    12:12:java.lang.Object clone() -> clone
-    41:41:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.RealmsWorldResetDto -> com.mojang.realmsclient.dto.RealmsWorldResetDto:
-    java.lang.String seed -> seed
-    long worldTemplateId -> worldTemplateId
-    int levelType -> levelType
-    boolean generateStructures -> generateStructures
-    12:17:void <init>(java.lang.String,long,int,boolean) -> <init>
-com.mojang.realmsclient.dto.RegionPingResult -> com.mojang.realmsclient.dto.RegionPingResult:
-    java.lang.String regionName -> regionName
-    int ping -> ping
-    12:15:void <init>(java.lang.String,int) -> <init>
-    18:18:int ping() -> ping
-    23:23:java.lang.String toString() -> toString
-com.mojang.realmsclient.dto.ServerActivity -> com.mojang.realmsclient.dto.ServerActivity:
-    java.lang.String profileUuid -> profileUuid
-    long joinTime -> joinTime
-    long leaveTime -> leaveTime
+    320:320:com.mojang.realmsclient.dto.RealmsServer$WorldType[] values() -> values
+    320:320:com.mojang.realmsclient.dto.RealmsServer$WorldType valueOf(java.lang.String) -> valueOf
+    320:320:void <init>(java.lang.String,int) -> <init>
+    320:325:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.RealmsServerAddress -> diq:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    java.lang.String address -> a
+    java.lang.String resourcePackUrl -> b
+    java.lang.String resourcePackHash -> c
     10:10:void <init>() -> <init>
-    16:23:com.mojang.realmsclient.dto.ServerActivity parse(com.google.gson.JsonObject) -> parse
-com.mojang.realmsclient.dto.ServerActivityList -> com.mojang.realmsclient.dto.ServerActivityList:
-    long periodInMillis -> periodInMillis
-    java.util.List serverActivities -> serverActivities
-    15:17:void <init>() -> <init>
-    20:36:com.mojang.realmsclient.dto.ServerActivityList parse(java.lang.String) -> parse
-com.mojang.realmsclient.dto.Subscription -> com.mojang.realmsclient.dto.Subscription:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    long startDate -> startDate
-    int daysLeft -> daysLeft
-    com.mojang.realmsclient.dto.Subscription$SubscriptionType type -> type
-    14:19:void <init>() -> <init>
-    22:32:com.mojang.realmsclient.dto.Subscription parse(java.lang.String) -> parse
-    37:39:com.mojang.realmsclient.dto.Subscription$SubscriptionType typeFrom(java.lang.String) -> typeFrom
+    18:29:com.mojang.realmsclient.dto.RealmsServerAddress parse(java.lang.String) -> a
+    11:11:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.RealmsServerList -> dir:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    java.util.List servers -> a
+    14:14:void <init>() -> <init>
+    20:35:com.mojang.realmsclient.dto.RealmsServerList parse(java.lang.String) -> a
     15:15:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.Subscription$SubscriptionType -> com.mojang.realmsclient.dto.Subscription$a:
+com.mojang.realmsclient.dto.RealmsServerPing -> dis:
+    java.lang.String nrOfPlayers -> a
+    java.lang.String playerList -> b
+    3:5:void <init>() -> <init>
+com.mojang.realmsclient.dto.RealmsServerPlayerList -> dit:
+    org.apache.logging.log4j.Logger LOGGER -> c
+    com.google.gson.JsonParser JSON_PARSER -> d
+    long serverId -> a
+    java.util.List players -> b
+    16:16:void <init>() -> <init>
+    24:46:com.mojang.realmsclient.dto.RealmsServerPlayerList parse(com.google.gson.JsonObject) -> a
+    50:59:java.util.List parsePlayers(com.google.gson.JsonArray) -> a
+    17:18:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.RealmsServerPlayerLists -> diu:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    java.util.List servers -> a
+    14:14:void <init>() -> <init>
+    20:40:com.mojang.realmsclient.dto.RealmsServerPlayerLists parse(java.lang.String) -> a
+    15:15:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.RealmsWorldOptions -> div:
+    java.lang.Boolean pvp -> a
+    java.lang.Boolean spawnAnimals -> b
+    java.lang.Boolean spawnMonsters -> c
+    java.lang.Boolean spawnNPCs -> d
+    java.lang.Integer spawnProtection -> e
+    java.lang.Boolean commandBlocks -> f
+    java.lang.Boolean forceGameMode -> g
+    java.lang.Integer difficulty -> h
+    java.lang.Integer gameMode -> i
+    java.lang.String slotName -> j
+    long templateId -> k
+    java.lang.String templateImage -> l
+    boolean adventureMap -> m
+    boolean empty -> n
+    java.lang.String DEFAULT_TEMPLATE_IMAGE -> o
+    44:55:void <init>(java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Integer,java.lang.Boolean,java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.String) -> <init>
+    58:58:com.mojang.realmsclient.dto.RealmsWorldOptions createDefaults() -> a
+    62:64:com.mojang.realmsclient.dto.RealmsWorldOptions createEmptyDefaults() -> b
+    68:69:void setEmpty(boolean) -> a
+    72:89:com.mojang.realmsclient.dto.RealmsWorldOptions parse(com.google.gson.JsonObject) -> a
+    93:100:java.lang.String getSlotName(int) -> a
+    105:105:java.lang.String getDefaultSlotName(int) -> b
+    109:151:java.lang.String toJson() -> c
+    156:156:com.mojang.realmsclient.dto.RealmsWorldOptions clone() -> d
+    13:13:java.lang.Object clone() -> clone
+    41:41:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.RealmsWorldResetDto -> diw:
+    java.lang.String seed -> a
+    long worldTemplateId -> b
+    int levelType -> c
+    boolean generateStructures -> d
+    18:23:void <init>(java.lang.String,long,int,boolean) -> <init>
+com.mojang.realmsclient.dto.ReflectionBasedSerialization -> dix:
+com.mojang.realmsclient.dto.RegionPingResult -> diy:
+    java.lang.String regionName -> a
+    int ping -> b
+    14:17:void <init>(java.lang.String,int) -> <init>
+    20:20:int ping() -> a
+    25:25:java.lang.String toString() -> toString
+com.mojang.realmsclient.dto.Subscription -> diz:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    long startDate -> a
+    int daysLeft -> b
+    com.mojang.realmsclient.dto.Subscription$SubscriptionType type -> c
+    12:17:void <init>() -> <init>
+    20:30:com.mojang.realmsclient.dto.Subscription parse(java.lang.String) -> a
+    35:37:com.mojang.realmsclient.dto.Subscription$SubscriptionType typeFrom(java.lang.String) -> b
+    13:13:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.Subscription$SubscriptionType -> diz$a:
     com.mojang.realmsclient.dto.Subscription$SubscriptionType NORMAL -> a
     com.mojang.realmsclient.dto.Subscription$SubscriptionType RECURRING -> b
     com.mojang.realmsclient.dto.Subscription$SubscriptionType[] $VALUES -> c
-    46:46:com.mojang.realmsclient.dto.Subscription$SubscriptionType[] values() -> values
-    46:46:com.mojang.realmsclient.dto.Subscription$SubscriptionType valueOf(java.lang.String) -> valueOf
-    46:46:void <init>(java.lang.String,int) -> <init>
-    46:47:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.UploadInfo -> com.mojang.realmsclient.dto.UploadInfo:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    boolean worldClosed -> worldClosed
-    java.lang.String token -> token
-    java.lang.String uploadEndpoint -> uploadEndpoint
-    int port -> port
-    15:22:void <init>() -> <init>
-    27:40:com.mojang.realmsclient.dto.UploadInfo parse(java.lang.String) -> parse
-    44:44:java.lang.String getToken() -> getToken
-    48:48:java.lang.String getUploadEndpoint() -> getUploadEndpoint
-    52:52:boolean isWorldClosed() -> isWorldClosed
-    56:57:void setToken(java.lang.String) -> setToken
-    60:60:int getPort() -> getPort
-    16:16:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.ValueObject -> czd:
-    9:9:void <init>() -> <init>
-    12:24:java.lang.String toString() -> toString
-    28:28:boolean isStatic(java.lang.reflect.Field) -> isStatic
-com.mojang.realmsclient.dto.WorldDownload -> com.mojang.realmsclient.dto.WorldDownload:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.lang.String downloadLink -> downloadLink
-    java.lang.String resourcePackUrl -> resourcePackUrl
-    java.lang.String resourcePackHash -> resourcePackHash
-    12:12:void <init>() -> <init>
-    20:33:com.mojang.realmsclient.dto.WorldDownload parse(java.lang.String) -> parse
+    41:41:com.mojang.realmsclient.dto.Subscription$SubscriptionType[] values() -> values
+    41:41:com.mojang.realmsclient.dto.Subscription$SubscriptionType valueOf(java.lang.String) -> valueOf
+    41:41:void <init>(java.lang.String,int) -> <init>
+    41:42:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.UploadInfo -> dja:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    boolean worldClosed -> b
+    java.lang.String token -> c
+    java.lang.String uploadEndpoint -> d
+    int port -> e
+    12:17:void <init>() -> <init>
+    21:34:com.mojang.realmsclient.dto.UploadInfo parse(java.lang.String) -> a
+    38:38:java.lang.String getToken() -> a
+    42:42:java.lang.String getUploadEndpoint() -> b
+    46:46:boolean isWorldClosed() -> c
+    50:51:void setToken(java.lang.String) -> b
+    54:54:int getPort() -> d
     13:13:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.WorldTemplate -> com.mojang.realmsclient.dto.WorldTemplate:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.lang.String id -> id
-    java.lang.String name -> name
-    java.lang.String version -> version
-    java.lang.String author -> author
-    java.lang.String link -> link
-    java.lang.String image -> image
-    java.lang.String trailer -> trailer
-    java.lang.String recommendedPlayers -> recommendedPlayers
-    com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType type -> type
-    11:11:void <init>() -> <init>
-    25:39:com.mojang.realmsclient.dto.WorldTemplate parse(com.google.gson.JsonObject) -> parse
+com.mojang.realmsclient.dto.ValueObject -> djb:
+    8:8:void <init>() -> <init>
+    11:22:java.lang.String toString() -> toString
+    26:27:java.lang.String getName(java.lang.reflect.Field) -> a
+    31:31:boolean isStatic(java.lang.reflect.Field) -> b
+com.mojang.realmsclient.dto.WorldDownload -> djc:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    java.lang.String downloadLink -> a
+    java.lang.String resourcePackUrl -> b
+    java.lang.String resourcePackHash -> c
+    10:10:void <init>() -> <init>
+    18:31:com.mojang.realmsclient.dto.WorldDownload parse(java.lang.String) -> a
+    11:11:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.WorldTemplate -> djd:
+    org.apache.logging.log4j.Logger LOGGER -> j
+    java.lang.String id -> a
+    java.lang.String name -> b
+    java.lang.String version -> c
+    java.lang.String author -> d
+    java.lang.String link -> e
+    java.lang.String image -> f
+    java.lang.String trailer -> g
+    java.lang.String recommendedPlayers -> h
+    com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType type -> i
+    11:23:void <init>() -> <init>
+    26:40:com.mojang.realmsclient.dto.WorldTemplate parse(com.google.gson.JsonObject) -> a
     12:12:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType -> com.mojang.realmsclient.dto.WorldTemplate$a:
+com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType -> djd$a:
     com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType WORLD_TEMPLATE -> a
     com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType MINIGAME -> b
     com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType ADVENTUREMAP -> c
     com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType EXPERIENCE -> d
     com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType INSPIRATION -> e
     com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType[] $VALUES -> f
-    42:42:com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType[] values() -> values
-    42:42:com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType valueOf(java.lang.String) -> valueOf
-    42:42:void <init>(java.lang.String,int) -> <init>
-    42:47:void <clinit>() -> <clinit>
-com.mojang.realmsclient.dto.WorldTemplatePaginatedList -> com.mojang.realmsclient.dto.WorldTemplatePaginatedList:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.util.List templates -> templates
-    int page -> page
-    int size -> size
-    int total -> total
-    20:21:void <init>() -> <init>
-    23:28:void <init>(int) -> <init>
-    45:45:boolean isLastPage() -> isLastPage
-    49:67:com.mojang.realmsclient.dto.WorldTemplatePaginatedList parse(java.lang.String) -> parse
-    18:18:void <clinit>() -> <clinit>
-com.mojang.realmsclient.exception.RealmsDefaultUncaughtExceptionHandler -> cze:
+    43:43:com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType[] values() -> values
+    43:43:com.mojang.realmsclient.dto.WorldTemplate$WorldTemplateType valueOf(java.lang.String) -> valueOf
+    43:43:void <init>(java.lang.String,int) -> <init>
+    43:48:void <clinit>() -> <clinit>
+com.mojang.realmsclient.dto.WorldTemplatePaginatedList -> dje:
+    org.apache.logging.log4j.Logger LOGGER -> e
+    java.util.List templates -> a
+    int page -> b
+    int size -> c
+    int total -> d
+    18:19:void <init>() -> <init>
+    21:26:void <init>(int) -> <init>
+    47:65:com.mojang.realmsclient.dto.WorldTemplatePaginatedList parse(java.lang.String) -> a
+    16:16:void <clinit>() -> <clinit>
+com.mojang.realmsclient.exception.RealmsDefaultUncaughtExceptionHandler -> djf:
     org.apache.logging.log4j.Logger logger -> a
     8:10:void <init>(org.apache.logging.log4j.Logger) -> <init>
     14:16:void uncaughtException(java.lang.Thread,java.lang.Throwable) -> uncaughtException
-com.mojang.realmsclient.exception.RealmsHttpException -> czf:
+com.mojang.realmsclient.exception.RealmsHttpException -> djg:
     5:6:void <init>(java.lang.String,java.lang.Exception) -> <init>
-com.mojang.realmsclient.exception.RealmsServiceException -> czg:
+com.mojang.realmsclient.exception.RealmsServiceException -> djh:
     int httpResultCode -> a
     java.lang.String httpResponseContent -> b
     int errorCode -> c
@@ -2723,70 +2890,21 @@ com.mojang.realmsclient.exception.RealmsServiceException -> czg:
     13:18:void <init>(int,java.lang.String,com.mojang.realmsclient.client.RealmsError) -> <init>
     21:26:void <init>(int,java.lang.String,int,java.lang.String) -> <init>
     30:36:java.lang.String toString() -> toString
-com.mojang.realmsclient.exception.RetryCallException -> czh:
+com.mojang.realmsclient.exception.RetryCallException -> dji:
     int delaySeconds -> e
     9:16:void <init>(int) -> <init>
-com.mojang.realmsclient.gui.ChatFormatting -> czi:
-    com.mojang.realmsclient.gui.ChatFormatting BLACK -> a
-    com.mojang.realmsclient.gui.ChatFormatting DARK_BLUE -> b
-    com.mojang.realmsclient.gui.ChatFormatting DARK_GREEN -> c
-    com.mojang.realmsclient.gui.ChatFormatting DARK_AQUA -> d
-    com.mojang.realmsclient.gui.ChatFormatting DARK_RED -> e
-    com.mojang.realmsclient.gui.ChatFormatting DARK_PURPLE -> f
-    com.mojang.realmsclient.gui.ChatFormatting GOLD -> g
-    com.mojang.realmsclient.gui.ChatFormatting GRAY -> h
-    com.mojang.realmsclient.gui.ChatFormatting DARK_GRAY -> i
-    com.mojang.realmsclient.gui.ChatFormatting BLUE -> j
-    com.mojang.realmsclient.gui.ChatFormatting GREEN -> k
-    com.mojang.realmsclient.gui.ChatFormatting AQUA -> l
-    com.mojang.realmsclient.gui.ChatFormatting RED -> m
-    com.mojang.realmsclient.gui.ChatFormatting LIGHT_PURPLE -> n
-    com.mojang.realmsclient.gui.ChatFormatting YELLOW -> o
-    com.mojang.realmsclient.gui.ChatFormatting WHITE -> p
-    com.mojang.realmsclient.gui.ChatFormatting OBFUSCATED -> q
-    com.mojang.realmsclient.gui.ChatFormatting BOLD -> r
-    com.mojang.realmsclient.gui.ChatFormatting STRIKETHROUGH -> s
-    com.mojang.realmsclient.gui.ChatFormatting UNDERLINE -> t
-    com.mojang.realmsclient.gui.ChatFormatting ITALIC -> u
-    com.mojang.realmsclient.gui.ChatFormatting RESET -> v
-    java.util.Map FORMATTING_BY_CHAR -> w
-    java.util.Map FORMATTING_BY_NAME -> x
-    java.util.regex.Pattern STRIP_FORMATTING_PATTERN -> y
-    char code -> z
-    boolean isFormat -> A
-    java.lang.String toString -> B
-    com.mojang.realmsclient.gui.ChatFormatting[] $VALUES -> C
-    13:13:com.mojang.realmsclient.gui.ChatFormatting[] values() -> values
-    13:13:com.mojang.realmsclient.gui.ChatFormatting valueOf(java.lang.String) -> valueOf
-    47:48:void <init>(java.lang.String,int,char) -> <init>
-    50:55:void <init>(java.lang.String,int,char,boolean) -> <init>
-    58:58:char getChar() -> a
-    70:70:java.lang.String getName() -> b
-    75:75:java.lang.String toString() -> toString
-    39:39:com.mojang.realmsclient.gui.ChatFormatting lambda$static$1(com.mojang.realmsclient.gui.ChatFormatting) -> a
-    38:38:com.mojang.realmsclient.gui.ChatFormatting lambda$static$0(com.mojang.realmsclient.gui.ChatFormatting) -> b
-    13:40:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.LongRunningTask -> czj:
-    com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen -> a
-    5:5:void <init>() -> <init>
-    9:10:void setScreen(com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen) -> a
-    14:15:void error(java.lang.String) -> a
-    18:19:void setTitle(java.lang.String) -> b
-    22:22:boolean aborted() -> a
-    27:27:void tick() -> b
-    30:30:void init() -> c
-    33:33:void abortTask() -> d
-com.mojang.realmsclient.gui.RealmsConstants -> czk:
-    13:13:int row(int) -> a
-com.mojang.realmsclient.gui.RealmsDataFetcher -> czl:
+com.mojang.realmsclient.gui.ErrorCallback -> djj:
+    void error(net.minecraft.network.chat.Component) -> a
+    10:11:void error(java.lang.String) -> a
+com.mojang.realmsclient.gui.RealmsDataFetcher -> djk:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.concurrent.ScheduledExecutorService scheduler -> b
     boolean stopped -> c
-    com.mojang.realmsclient.gui.RealmsDataFetcher$ServerListUpdateTask serverListUpdateTask -> d
-    com.mojang.realmsclient.gui.RealmsDataFetcher$PendingInviteUpdateTask pendingInviteUpdateTask -> e
-    com.mojang.realmsclient.gui.RealmsDataFetcher$TrialAvailabilityTask trialAvailabilityTask -> f
-    com.mojang.realmsclient.gui.RealmsDataFetcher$LiveStatsTask liveStatsTask -> g
-    com.mojang.realmsclient.gui.RealmsDataFetcher$UnreadNewsTask unreadNewsTask -> h
+    java.lang.Runnable serverListUpdateTask -> d
+    java.lang.Runnable pendingInviteUpdateTask -> e
+    java.lang.Runnable trialAvailabilityTask -> f
+    java.lang.Runnable liveStatsTask -> g
+    java.lang.Runnable unreadNewsTask -> h
     java.util.Set removedServers -> i
     java.util.List servers -> j
     com.mojang.realmsclient.dto.RealmsServerPlayerLists livestats -> k
@@ -2800,1029 +2918,841 @@ com.mojang.realmsclient.gui.RealmsDataFetcher -> czl:
     java.util.concurrent.ScheduledFuture liveStatsScheduledFuture -> s
     java.util.concurrent.ScheduledFuture unreadNewsScheduledFuture -> t
     java.util.Map fetchStatus -> u
-    23:56:void <init>() -> <init>
-    59:59:boolean isStopped() -> a
-    63:68:void init() -> b
-    71:97:void initWithSpecificTaskList(java.util.List) -> a
-    100:101:boolean isFetchedSinceLastTry(com.mojang.realmsclient.gui.RealmsDataFetcher$Task) -> a
-    105:108:void markClean() -> c
-    111:113:void forceUpdate() -> d
-    116:116:java.util.List getServers() -> e
-    120:120:int getPendingInvitesCount() -> f
-    124:124:boolean isTrialAvailable() -> g
-    128:128:com.mojang.realmsclient.dto.RealmsServerPlayerLists getLivestats() -> h
-    132:132:boolean hasUnreadNews() -> i
-    136:136:java.lang.String newsLink() -> j
-    140:142:void stop() -> k
-    145:154:void scheduleTasks() -> m
-    158:180:void cancelTasks() -> n
-    183:196:void setServers(java.util.List) -> b
-    199:201:void removeItem(com.mojang.realmsclient.dto.RealmsServer) -> a
-    204:205:void sort(java.util.List) -> c
-    210:210:boolean isActive() -> o
+    23:57:void <init>() -> <init>
+    60:60:boolean isStopped() -> a
+    64:69:void init() -> b
+    72:85:void initWithSpecificTaskList() -> c
+    88:89:boolean isFetchedSinceLastTry(com.mojang.realmsclient.gui.RealmsDataFetcher$Task) -> a
+    93:96:void markClean() -> d
+    99:101:void forceUpdate() -> e
+    104:104:java.util.List getServers() -> f
+    108:108:int getPendingInvitesCount() -> g
+    112:112:boolean isTrialAvailable() -> h
+    116:116:com.mojang.realmsclient.dto.RealmsServerPlayerLists getLivestats() -> i
+    120:120:boolean hasUnreadNews() -> j
+    124:124:java.lang.String newsLink() -> k
+    128:130:void stop() -> l
+    133:142:void scheduleTasks() -> n
+    146:168:void cancelTasks() -> o
+    171:184:void setServers(java.util.List) -> a
+    187:189:void removeItem(com.mojang.realmsclient.dto.RealmsServer) -> a
+    193:193:boolean isActive() -> p
     23:23:boolean access$500(com.mojang.realmsclient.gui.RealmsDataFetcher) -> a
     23:23:void access$600(com.mojang.realmsclient.gui.RealmsDataFetcher,java.util.List) -> a
-    23:23:void access$700(com.mojang.realmsclient.gui.RealmsDataFetcher,java.util.List) -> b
-    23:23:java.util.Map access$800(com.mojang.realmsclient.gui.RealmsDataFetcher) -> b
-    23:23:org.apache.logging.log4j.Logger access$900() -> l
-    23:23:int access$1002(com.mojang.realmsclient.gui.RealmsDataFetcher,int) -> a
-    23:23:boolean access$1102(com.mojang.realmsclient.gui.RealmsDataFetcher,boolean) -> a
-    23:23:com.mojang.realmsclient.dto.RealmsServerPlayerLists access$1202(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.dto.RealmsServerPlayerLists) -> a
-    23:23:boolean access$1302(com.mojang.realmsclient.gui.RealmsDataFetcher,boolean) -> b
-    23:23:java.lang.String access$1402(com.mojang.realmsclient.gui.RealmsDataFetcher,java.lang.String) -> a
+    23:23:java.util.Map access$700(com.mojang.realmsclient.gui.RealmsDataFetcher) -> b
+    23:23:org.apache.logging.log4j.Logger access$800() -> m
+    23:23:int access$902(com.mojang.realmsclient.gui.RealmsDataFetcher,int) -> a
+    23:23:boolean access$1002(com.mojang.realmsclient.gui.RealmsDataFetcher,boolean) -> a
+    23:23:com.mojang.realmsclient.dto.RealmsServerPlayerLists access$1102(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.dto.RealmsServerPlayerLists) -> a
+    23:23:boolean access$1202(com.mojang.realmsclient.gui.RealmsDataFetcher,boolean) -> b
+    23:23:java.lang.String access$1302(com.mojang.realmsclient.gui.RealmsDataFetcher,java.lang.String) -> a
     24:24:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.RealmsDataFetcher$1 -> czl$1:
-    int[] $SwitchMap$com$mojang$realmsclient$gui$RealmsDataFetcher$Task -> a
-    78:78:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.RealmsDataFetcher$LiveStatsTask -> czl$a:
+com.mojang.realmsclient.gui.RealmsDataFetcher$1 -> djk$1:
+com.mojang.realmsclient.gui.RealmsDataFetcher$LiveStatsTask -> djk$a:
     com.mojang.realmsclient.gui.RealmsDataFetcher this$0 -> a
-    293:293:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher) -> <init>
-    296:299:void run() -> run
-    303:312:void getLiveStats() -> a
-    293:293:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.gui.RealmsDataFetcher$1) -> <init>
-com.mojang.realmsclient.gui.RealmsDataFetcher$PendingInviteUpdateTask -> czl$b:
+    263:263:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher) -> <init>
+    266:269:void run() -> run
+    273:279:void getLiveStats() -> a
+    263:263:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.gui.RealmsDataFetcher$1) -> <init>
+com.mojang.realmsclient.gui.RealmsDataFetcher$PendingInviteUpdateTask -> djk$b:
     com.mojang.realmsclient.gui.RealmsDataFetcher this$0 -> a
-    249:249:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher) -> <init>
-    252:255:void run() -> run
-    259:268:void updatePendingInvites() -> a
-    249:249:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.gui.RealmsDataFetcher$1) -> <init>
-com.mojang.realmsclient.gui.RealmsDataFetcher$ServerListUpdateTask -> czl$c:
+    224:224:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher) -> <init>
+    227:230:void run() -> run
+    234:240:void updatePendingInvites() -> a
+    224:224:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.gui.RealmsDataFetcher$1) -> <init>
+com.mojang.realmsclient.gui.RealmsDataFetcher$ServerListUpdateTask -> djk$c:
     com.mojang.realmsclient.gui.RealmsDataFetcher this$0 -> a
-    216:216:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher) -> <init>
-    219:222:void run() -> run
-    226:243:void updateServersList() -> a
-    216:216:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.gui.RealmsDataFetcher$1) -> <init>
-com.mojang.realmsclient.gui.RealmsDataFetcher$Task -> czl$d:
+    196:196:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher) -> <init>
+    199:202:void run() -> run
+    206:221:void updateServersList() -> a
+    196:196:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.gui.RealmsDataFetcher$1) -> <init>
+com.mojang.realmsclient.gui.RealmsDataFetcher$Task -> djk$d:
     com.mojang.realmsclient.gui.RealmsDataFetcher$Task SERVER_LIST -> a
     com.mojang.realmsclient.gui.RealmsDataFetcher$Task PENDING_INVITE -> b
     com.mojang.realmsclient.gui.RealmsDataFetcher$Task TRIAL_AVAILABLE -> c
     com.mojang.realmsclient.gui.RealmsDataFetcher$Task LIVE_STATS -> d
     com.mojang.realmsclient.gui.RealmsDataFetcher$Task UNREAD_NEWS -> e
     com.mojang.realmsclient.gui.RealmsDataFetcher$Task[] $VALUES -> f
-    360:360:com.mojang.realmsclient.gui.RealmsDataFetcher$Task[] values() -> values
-    360:360:com.mojang.realmsclient.gui.RealmsDataFetcher$Task valueOf(java.lang.String) -> valueOf
-    360:360:void <init>(java.lang.String,int) -> <init>
-    360:365:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.RealmsDataFetcher$TrialAvailabilityTask -> czl$e:
+    325:325:com.mojang.realmsclient.gui.RealmsDataFetcher$Task[] values() -> values
+    325:325:com.mojang.realmsclient.gui.RealmsDataFetcher$Task valueOf(java.lang.String) -> valueOf
+    325:325:void <init>(java.lang.String,int) -> <init>
+    325:330:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.RealmsDataFetcher$TrialAvailabilityTask -> djk$e:
     com.mojang.realmsclient.gui.RealmsDataFetcher this$0 -> a
-    271:271:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher) -> <init>
-    274:277:void run() -> run
-    281:290:void getTrialAvailable() -> a
-    271:271:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.gui.RealmsDataFetcher$1) -> <init>
-com.mojang.realmsclient.gui.RealmsDataFetcher$UnreadNewsTask -> czl$f:
+    243:243:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher) -> <init>
+    246:249:void run() -> run
+    253:260:void getTrialAvailable() -> a
+    243:243:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.gui.RealmsDataFetcher$1) -> <init>
+com.mojang.realmsclient.gui.RealmsDataFetcher$UnreadNewsTask -> djk$f:
     com.mojang.realmsclient.gui.RealmsDataFetcher this$0 -> a
-    315:315:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher) -> <init>
-    318:321:void run() -> run
-    325:357:void getUnreadNews() -> a
-    315:315:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.gui.RealmsDataFetcher$1) -> <init>
-com.mojang.realmsclient.gui.RealmsWorldSlotButton -> czm:
-    java.util.function.Supplier serverDataProvider -> a
-    java.util.function.Consumer toolTipSetter -> b
-    com.mojang.realmsclient.gui.RealmsWorldSlotButton$Listener listener -> c
-    int slotIndex -> d
-    int animTick -> e
-    com.mojang.realmsclient.gui.RealmsWorldSlotButton$State state -> f
-    33:38:void <init>(int,int,int,int,java.util.function.Supplier,java.util.function.Consumer,int,int,com.mojang.realmsclient.gui.RealmsWorldSlotButton$Listener) -> <init>
-    42:43:void render(int,int,float) -> render
-    75:141:void tick() -> tick
-    145:150:void renderButton(int,int,float) -> renderButton
-    153:203:void drawSlotFrame(int,int,int,int,boolean,java.lang.String,int,long,java.lang.String,boolean,boolean,com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action,java.lang.String) -> a
-    207:210:void onPress() -> onPress
-com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action -> czm$a:
+    282:282:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher) -> <init>
+    285:288:void run() -> run
+    292:322:void getUnreadNews() -> a
+    282:282:void <init>(com.mojang.realmsclient.gui.RealmsDataFetcher,com.mojang.realmsclient.gui.RealmsDataFetcher$1) -> <init>
+com.mojang.realmsclient.gui.RealmsWorldSlotButton -> djl:
+    net.minecraft.resources.ResourceLocation SLOT_FRAME_LOCATION -> a
+    net.minecraft.resources.ResourceLocation EMPTY_SLOT_LOCATION -> b
+    net.minecraft.resources.ResourceLocation DEFAULT_WORLD_SLOT_1 -> c
+    net.minecraft.resources.ResourceLocation DEFAULT_WORLD_SLOT_2 -> d
+    net.minecraft.resources.ResourceLocation DEFAULT_WORLD_SLOT_3 -> e
+    java.util.function.Supplier serverDataProvider -> v
+    java.util.function.Consumer toolTipSetter -> w
+    int slotIndex -> x
+    int animTick -> y
+    com.mojang.realmsclient.gui.RealmsWorldSlotButton$State state -> z
+    38:42:void <init>(int,int,int,int,java.util.function.Supplier,java.util.function.Consumer,int,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    46:46:com.mojang.realmsclient.gui.RealmsWorldSlotButton$State getState() -> a
+    80:113:void tick() -> d
+    116:129:com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action getAction(com.mojang.realmsclient.dto.RealmsServer,boolean,boolean) -> a
+    133:156:com.mojang.datafixers.util.Pair getTooltipAndNarration(com.mojang.realmsclient.dto.RealmsServer,java.lang.String,boolean,boolean,com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action) -> a
+    161:165:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    168:219:void drawSlotFrame(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,boolean,java.lang.String,int,long,java.lang.String,boolean,boolean,com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action,net.minecraft.network.chat.Component) -> a
+    25:29:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action -> djl$a:
     com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action NOTHING -> a
     com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action SWITCH_SLOT -> b
     com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action JOIN -> c
     com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action[] $VALUES -> d
-    45:45:com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action[] values() -> values
-    45:45:com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action valueOf(java.lang.String) -> valueOf
-    45:45:void <init>(java.lang.String,int) -> <init>
-    45:48:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.RealmsWorldSlotButton$Listener -> czm$b:
-    void onSlotClick(int,com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action,boolean,boolean) -> a
-com.mojang.realmsclient.gui.RealmsWorldSlotButton$State -> czm$c:
-    boolean isCurrentlyActiveSlot -> a
-    java.lang.String slotName -> b
-    long imageId -> c
-    java.lang.String image -> d
-    boolean empty -> e
-    boolean minigame -> f
-    com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action action -> g
-    java.lang.String actionPrompt -> h
-    61:70:void <init>(boolean,java.lang.String,long,java.lang.String,boolean,boolean,com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action,java.lang.String) -> <init>
-com.mojang.realmsclient.gui.RowButton -> czn:
+    49:49:com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action[] values() -> values
+    49:49:com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action valueOf(java.lang.String) -> valueOf
+    49:49:void <init>(java.lang.String,int) -> <init>
+    49:52:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.RealmsWorldSlotButton$State -> djl$b:
+    boolean isCurrentlyActiveSlot -> d
+    java.lang.String slotName -> e
+    long imageId -> f
+    java.lang.String image -> g
+    boolean empty -> a
+    boolean minigame -> b
+    com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action action -> c
+    net.minecraft.network.chat.Component actionPrompt -> h
+    66:75:void <init>(boolean,java.lang.String,long,java.lang.String,boolean,boolean,com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action,net.minecraft.network.chat.Component) -> <init>
+    55:55:boolean access$000(com.mojang.realmsclient.gui.RealmsWorldSlotButton$State) -> a
+    55:55:java.lang.String access$100(com.mojang.realmsclient.gui.RealmsWorldSlotButton$State) -> b
+    55:55:long access$200(com.mojang.realmsclient.gui.RealmsWorldSlotButton$State) -> c
+    55:55:java.lang.String access$300(com.mojang.realmsclient.gui.RealmsWorldSlotButton$State) -> d
+    55:55:net.minecraft.network.chat.Component access$400(com.mojang.realmsclient.gui.RealmsWorldSlotButton$State) -> e
+com.mojang.realmsclient.gui.RowButton -> djm:
     int width -> a
     int height -> b
     int xOffset -> c
     int yOffset -> d
-    15:20:void <init>(int,int,int,int) -> <init>
-    23:30:void drawForRowAt(int,int,int,int) -> a
-    void draw(int,int,boolean) -> a
-    35:35:int getRight() -> a
-    39:39:int getBottom() -> b
+    16:21:void <init>(int,int,int,int) -> <init>
+    24:31:void drawForRowAt(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> a
+    void draw(com.mojang.blaze3d.vertex.PoseStack,int,int,boolean) -> a
+    36:36:int getRight() -> a
+    40:40:int getBottom() -> b
     void onClick(int) -> a
-    45:50:void drawButtonsInRow(java.util.List,net.minecraft.realms.RealmsObjectSelectionList,int,int,int,int) -> a
-    53:70:void rowButtonMouseClicked(net.minecraft.realms.RealmsObjectSelectionList,net.minecraft.realms.RealmListEntry,java.util.List,int,double,double) -> a
-com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen -> czo:
-    net.minecraft.realms.RealmsScreen lastScreen -> c
-    int BUTTON_BACK_ID -> d
-    com.mojang.realmsclient.dto.Backup backup -> e
-    java.util.List keys -> f
-    com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen$BackupInfoList backupInfoList -> g
-    java.lang.String[] difficulties -> a
-    java.lang.String[] gameModes -> b
-    19:47:void <init>(net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.dto.Backup) -> <init>
-    51:51:void tick() -> tick
-    55:67:void init() -> init
-    71:72:void removed() -> removed
-    76:80:boolean keyPressed(int,int,int) -> keyPressed
-    85:92:void render(int,int,float) -> render
-    95:101:java.lang.String checkForSpecificMetadata(java.lang.String,java.lang.String) -> a
-    106:108:java.lang.String gameDifficultyMetadata(java.lang.String) -> a
-    114:116:java.lang.String gameModeMetadata(java.lang.String) -> b
-    17:17:net.minecraft.realms.RealmsScreen access$000(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen) -> a
-    17:17:com.mojang.realmsclient.dto.Backup access$100(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen) -> b
-    17:17:java.util.List access$200(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen) -> c
-    17:17:java.lang.String access$300(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen,java.lang.String,java.lang.String) -> a
-com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen$1 -> czo$1:
+    46:51:void drawButtonsInRow(com.mojang.blaze3d.vertex.PoseStack,java.util.List,net.minecraft.realms.RealmsObjectSelectionList,int,int,int,int) -> a
+    54:71:void rowButtonMouseClicked(net.minecraft.realms.RealmsObjectSelectionList,net.minecraft.client.gui.components.ObjectSelectionList$Entry,java.util.List,int,double,double) -> a
+com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen -> djn:
+    net.minecraft.client.gui.screens.Screen lastScreen -> a
+    com.mojang.realmsclient.dto.Backup backup -> b
+    com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen$BackupInfoList backupInfoList -> c
+    25:28:void <init>(net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.dto.Backup) -> <init>
+    32:32:void tick() -> d
+    36:45:void init() -> b
+    49:50:void removed() -> e
+    54:58:boolean keyPressed(int,int,int) -> a
+    63:70:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    73:79:net.minecraft.network.chat.Component checkForSpecificMetadata(java.lang.String,java.lang.String) -> a
+    84:86:net.minecraft.network.chat.Component gameDifficultyMetadata(java.lang.String) -> a
+    92:94:net.minecraft.network.chat.Component gameModeMetadata(java.lang.String) -> b
+    39:39:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+    18:18:net.minecraft.client.Minecraft access$000(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen) -> a
+    18:18:net.minecraft.network.chat.Component access$100(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen,java.lang.String,java.lang.String) -> a
+    18:18:com.mojang.realmsclient.dto.Backup access$200(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen) -> b
+com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen$BackupInfoList -> djn$a:
     com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen this$0 -> a
-    57:57:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen,int,int,int,java.lang.String) -> <init>
-    60:61:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen$BackupInfoList -> czo$a:
+    116:122:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen,net.minecraft.client.Minecraft) -> <init>
+    120:120:void lambda$new$0(java.lang.String,java.lang.String) -> a
+com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen$BackupInfoListEntry -> djn$b:
+    java.lang.String key -> b
+    java.lang.String value -> c
     com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen this$0 -> a
-    121:123:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen) -> <init>
-    127:127:int getItemCount() -> getItemCount
-    132:132:boolean isSelectedItem(int) -> isSelectedItem
-    137:137:int getMaxPosition() -> getMaxPosition
-    142:142:void renderBackground() -> renderBackground
-    146:150:void renderItem(int,int,int,int,net.minecraft.realms.Tezzelator,int,int) -> renderItem
-com.mojang.realmsclient.gui.screens.RealmsBackupScreen -> czp:
+    102:105:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupInfoScreen,java.lang.String,java.lang.String) -> <init>
+    109:112:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+com.mojang.realmsclient.gui.screens.RealmsBackupScreen -> djo:
     org.apache.logging.log4j.Logger LOGGER -> a
-    int lastScrollPosition -> b
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen lastScreen -> c
-    java.util.List backups -> d
-    java.lang.String toolTip -> e
-    com.mojang.realmsclient.gui.screens.RealmsBackupScreen$BackupObjectSelectionList backupObjectSelectionList -> f
-    int selectedBackup -> g
-    int slotId -> h
-    net.minecraft.realms.RealmsButton downloadButton -> i
-    net.minecraft.realms.RealmsButton restoreButton -> j
-    net.minecraft.realms.RealmsButton changesButton -> k
-    java.lang.Boolean noBackups -> l
-    com.mojang.realmsclient.dto.RealmsServer serverData -> m
-    net.minecraft.realms.RealmsLabel titleLabel -> n
-    36:66:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,com.mojang.realmsclient.dto.RealmsServer,int) -> <init>
-    70:100:void init() -> init
-    103:125:void generateChangeList() -> b
-    128:135:void addToChangeList(com.mojang.realmsclient.dto.Backup,java.lang.String) -> a
-    138:170:void postInit() -> c
-    173:175:void updateButtonStates() -> d
-    178:182:boolean shouldChangesButtonBeVisible() -> e
-    186:189:boolean shouldRestoreButtonBeVisible() -> f
-    194:195:void tick() -> tick
-    199:203:boolean keyPressed(int,int,int) -> keyPressed
-    207:216:void restoreClicked(int) -> b
-    219:222:void downloadClicked() -> g
-    225:229:void downloadWorldData() -> h
-    233:243:void confirmResult(boolean,int) -> confirmResult
-    246:252:void restore() -> i
-    256:274:void render(int,int,float) -> render
-    277:287:void renderMousehoverTooltip(java.lang.String,int,int) -> a
-    26:26:com.mojang.realmsclient.dto.RealmsServer access$000(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> a
-    26:26:org.apache.logging.log4j.Logger access$100() -> a
-    26:26:java.util.List access$202(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,java.util.List) -> a
-    26:26:java.lang.Boolean access$302(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,java.lang.Boolean) -> a
-    26:26:java.util.List access$200(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> b
-    26:26:com.mojang.realmsclient.gui.screens.RealmsBackupScreen$BackupObjectSelectionList access$400(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> c
-    26:26:void access$500(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> d
-    26:26:void access$600(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> e
-    26:26:int access$700(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> f
-    26:26:void access$800(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,int) -> a
-    26:26:int access$702(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,int) -> b
-    26:26:com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen access$900(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> g
-    26:26:int access$1002(int) -> a
-    26:26:void access$1100(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> h
-    26:26:java.lang.String access$1202(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,java.lang.String) -> a
-    27:32:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsBackupScreen$1 -> czp$1:
+    net.minecraft.resources.ResourceLocation PLUS_ICON_LOCATION -> b
+    net.minecraft.resources.ResourceLocation RESTORE_ICON_LOCATION -> c
+    int lastScrollPosition -> p
+    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen lastScreen -> q
+    java.util.List backups -> r
+    java.lang.String toolTip -> s
+    com.mojang.realmsclient.gui.screens.RealmsBackupScreen$BackupObjectSelectionList backupObjectSelectionList -> t
+    int selectedBackup -> u
+    int slotId -> v
+    net.minecraft.client.gui.components.Button downloadButton -> w
+    net.minecraft.client.gui.components.Button restoreButton -> x
+    net.minecraft.client.gui.components.Button changesButton -> y
+    java.lang.Boolean noBackups -> z
+    com.mojang.realmsclient.dto.RealmsServer serverData -> A
+    net.minecraft.realms.RealmsLabel titleLabel -> B
+    44:68:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,com.mojang.realmsclient.dto.RealmsServer,int) -> <init>
+    72:121:void init() -> b
+    124:146:void generateChangeList() -> i
+    149:156:void addToChangeList(com.mojang.realmsclient.dto.Backup,java.lang.String) -> a
+    159:161:void updateButtonStates() -> k
+    164:168:boolean shouldChangesButtonBeVisible() -> l
+    172:175:boolean shouldRestoreButtonBeVisible() -> m
+    180:184:boolean keyPressed(int,int,int) -> a
+    188:204:void restoreClicked(int) -> b
+    207:216:void downloadClicked() -> n
+    219:220:void downloadWorldData() -> v
+    223:226:void restore() -> w
+    230:248:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    251:261:void renderMousehoverTooltip(com.mojang.blaze3d.vertex.PoseStack,java.lang.String,int,int) -> a
+    210:215:void lambda$downloadClicked$5(boolean) -> c
+    196:202:void lambda$restoreClicked$4(boolean) -> d
+    112:112:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
+    108:110:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
+    105:105:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
+    102:102:void lambda$init$0(net.minecraft.client.gui.components.Button) -> d
+    34:34:com.mojang.realmsclient.dto.RealmsServer access$000(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> a
+    34:34:net.minecraft.client.Minecraft access$100(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> b
+    34:34:org.apache.logging.log4j.Logger access$200() -> a
+    34:34:java.util.List access$302(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,java.util.List) -> a
+    34:34:java.lang.Boolean access$402(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,java.lang.Boolean) -> a
+    34:34:java.util.List access$300(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> c
+    34:34:com.mojang.realmsclient.gui.screens.RealmsBackupScreen$BackupObjectSelectionList access$500(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> d
+    34:34:void access$600(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> e
+    34:34:int access$702(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,int) -> a
+    34:34:int access$802(int) -> a
+    34:34:void access$900(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,int) -> b
+    34:34:void access$1000(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> f
+    34:34:net.minecraft.client.gui.Font access$1100(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> g
+    34:34:net.minecraft.client.gui.Font access$1200(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> h
+    34:34:net.minecraft.resources.ResourceLocation access$1300() -> c
+    34:34:net.minecraft.client.Minecraft access$1400(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> i
+    34:34:java.lang.String access$1502(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,java.lang.String) -> a
+    34:34:net.minecraft.resources.ResourceLocation access$1600() -> f
+    34:34:net.minecraft.client.Minecraft access$1700(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> j
+    35:40:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsBackupScreen$1 -> djo$1:
     com.mojang.realmsclient.gui.screens.RealmsBackupScreen this$0 -> a
-    78:78:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,java.lang.String) -> <init>
-    81:96:void run() -> run
-    85:92:void lambda$run$0(java.util.List) -> a
-com.mojang.realmsclient.gui.screens.RealmsBackupScreen$2 -> czp$2:
+    80:80:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,java.lang.String) -> <init>
+    83:98:void run() -> run
+    87:94:void lambda$run$0(java.util.List) -> a
+com.mojang.realmsclient.gui.screens.RealmsBackupScreen$BackupObjectSelectionList -> djo$a:
     com.mojang.realmsclient.gui.screens.RealmsBackupScreen this$0 -> a
-    138:138:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,int,int,int,int,int,java.lang.String) -> <init>
-    141:142:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsBackupScreen$3 -> czp$3:
+    264:266:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> <init>
+    269:270:void addEntry(com.mojang.realmsclient.dto.Backup) -> a
+    274:274:int getRowWidth() -> d
+    279:279:boolean isFocused() -> b
+    284:284:int getMaxPosition() -> c
+    289:290:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    294:309:boolean mouseClicked(double,double,int) -> a
+    314:314:int getScrollbarPosition() -> e
+    319:335:void itemClicked(int,int,double,double,int) -> a
+    339:344:void selectItem(int) -> a
+    347:349:void selectInviteListItem(int) -> b
+    353:357:void setSelected(com.mojang.realmsclient.gui.screens.RealmsBackupScreen$Entry) -> a
+    263:263:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+com.mojang.realmsclient.gui.screens.RealmsBackupScreen$Entry -> djo$b:
+    com.mojang.realmsclient.dto.Backup backup -> b
     com.mojang.realmsclient.gui.screens.RealmsBackupScreen this$0 -> a
-    144:144:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,int,int,int,int,int,java.lang.String) -> <init>
-    147:148:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsBackupScreen$4 -> czp$4:
-    com.mojang.realmsclient.gui.screens.RealmsBackupScreen this$0 -> a
-    150:150:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,int,int,int,int,int,java.lang.String) -> <init>
-    153:155:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsBackupScreen$5 -> czp$5:
-    com.mojang.realmsclient.gui.screens.RealmsBackupScreen this$0 -> a
-    157:157:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,int,int,int,int,int,java.lang.String) -> <init>
-    160:161:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsBackupScreen$BackupObjectSelectionList -> czp$a:
-    com.mojang.realmsclient.gui.screens.RealmsBackupScreen this$0 -> a
-    294:296:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupScreen) -> <init>
-    299:300:void addEntry(com.mojang.realmsclient.dto.Backup) -> a
-    304:304:int getRowWidth() -> getRowWidth
-    309:309:boolean isFocused() -> isFocused
-    314:314:int getItemCount() -> getItemCount
-    319:319:int getMaxPosition() -> getMaxPosition
-    324:325:void renderBackground() -> renderBackground
-    329:344:boolean mouseClicked(double,double,int) -> mouseClicked
-    349:349:int getScrollbarPosition() -> getScrollbarPosition
-    354:370:void itemClicked(int,int,double,double,int) -> itemClicked
-    374:379:void selectItem(int) -> selectItem
-    382:384:void selectInviteListItem(int) -> a
-com.mojang.realmsclient.gui.screens.RealmsBackupScreen$BackupObjectSelectionListEntry -> czp$b:
-    com.mojang.realmsclient.dto.Backup mBackup -> a
-    com.mojang.realmsclient.gui.screens.RealmsBackupScreen this$0 -> b
-    390:392:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,com.mojang.realmsclient.dto.Backup) -> <init>
-    396:397:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    400:417:void renderBackupItem(com.mojang.realmsclient.dto.Backup,int,int,int,int) -> a
-    420:420:java.lang.String getMediumDatePresentation(java.util.Date) -> a
-    424:436:void drawRestore(int,int,int,int) -> a
-    439:451:void drawInfo(int,int,int,int) -> b
-com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen -> czq:
+    363:365:void <init>(com.mojang.realmsclient.gui.screens.RealmsBackupScreen,com.mojang.realmsclient.dto.Backup) -> <init>
+    369:370:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    373:390:void renderBackupItem(com.mojang.blaze3d.vertex.PoseStack,com.mojang.realmsclient.dto.Backup,int,int,int,int) -> a
+    393:393:java.lang.String getMediumDatePresentation(java.util.Date) -> a
+    397:410:void drawRestore(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> a
+    413:426:void drawInfo(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> b
+com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen -> djp:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.realms.RealmsScreen lastScreen -> b
+    net.minecraft.client.gui.screens.Screen lastScreen -> b
     com.mojang.realmsclient.RealmsMainScreen mainScreen -> c
-    com.mojang.realmsclient.dto.RealmsServer serverData -> d
-    long serverId -> e
-    java.lang.String title -> f
-    java.lang.String message -> g
-    int left_x -> h
-    int right_x -> i
-    int default_button_width -> j
-    int default_button_offset -> k
-    java.util.List playButtonIds -> l
-    java.util.List resetButtonIds -> m
-    java.util.List downloadButtonIds -> n
-    java.util.List downloadConfirmationIds -> o
-    java.util.List slotsThatHasBeenDownloaded -> p
-    int animTick -> q
-    39:73:void <init>(net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.RealmsMainScreen,long) -> <init>
-    76:77:void setTitle(java.lang.String) -> a
-    81:98:void init() -> init
-    101:136:void addButtons() -> a
-    140:141:void tick() -> tick
-    145:168:void render(int,int,float) -> render
-    171:171:int getFramePositionX(int) -> a
-    176:177:void removed() -> removed
-    215:219:boolean keyPressed(int,int,int) -> keyPressed
-    223:224:void backButtonClicked() -> d
-    227:240:void fetchServerData(long) -> a
-    244:278:void confirmResult(boolean,int) -> confirmResult
-    281:292:void downloadWorld(int) -> b
-    295:295:boolean isMinigame() -> e
-    299:333:void drawSlotFrame(int,int,int,int,boolean,java.lang.String,int,long,java.lang.String,boolean) -> a
-    336:340:void switchSlot(int) -> c
-    251:269:void lambda$confirmResult$1() -> f
-    228:239:void lambda$fetchServerData$0(long) -> b
-    27:27:void access$000(com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen) -> a
-    27:27:java.util.List access$100() -> b
-    27:27:com.mojang.realmsclient.dto.RealmsServer access$200(com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen) -> b
-    27:27:java.util.List access$300() -> c
-    27:27:void access$400(com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen,int) -> a
-    28:60:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen$1 -> czq$1:
-    com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen this$0 -> a
-    84:84:void <init>(com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    87:88:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen$2 -> czq$2:
-    com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen this$0 -> a
-    119:119:void <init>(com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    122:133:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen$DownloadButton -> czq$a:
-    com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen this$0 -> a
-    201:203:void <init>(com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen,int,int,java.lang.String) -> <init>
-    207:210:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen$PlayButton -> czq$b:
-    com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen this$0 -> a
-    180:182:void <init>(com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen,int,int,java.lang.String) -> <init>
-    186:197:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsClientOutdatedScreen -> czr:
-    net.minecraft.realms.RealmsScreen lastScreen -> a
+    com.mojang.realmsclient.dto.RealmsServer serverData -> p
+    long serverId -> q
+    net.minecraft.network.chat.Component header -> r
+    net.minecraft.network.chat.Component[] message -> s
+    int leftX -> t
+    int rightX -> u
+    java.util.List slotsThatHasBeenDownloaded -> v
+    int animTick -> w
+    47:64:void <init>(net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.RealmsMainScreen,long,boolean) -> <init>
+    68:83:void init() -> b
+    86:140:void addButtons() -> i
+    144:145:void tick() -> d
+    149:170:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    173:173:int getFramePositionX(int) -> a
+    178:179:void removed() -> e
+    183:187:boolean keyPressed(int,int,int) -> a
+    191:192:void backButtonClicked() -> k
+    195:206:void fetchServerData(long) -> a
+    209:223:void doSwitchOrReset() -> a
+    226:245:void downloadWorld(int) -> b
+    248:248:boolean isMinigame() -> l
+    253:287:void drawSlotFrame(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,boolean,java.lang.String,int,long,java.lang.String,boolean) -> a
+    231:239:void lambda$downloadWorld$11(int,boolean) -> a
+    210:222:void lambda$doSwitchOrReset$10() -> m
+    219:219:void lambda$null$9() -> n
+    213:213:void lambda$null$8() -> v
+    196:205:void lambda$fetchServerData$7(long) -> b
+    127:138:void lambda$addButtons$6(int,net.minecraft.client.gui.components.Button) -> a
+    128:131:void lambda$null$5() -> w
+    108:117:void lambda$addButtons$4(int,net.minecraft.client.gui.components.Button) -> b
+    111:116:void lambda$null$3(int,boolean) -> b
+    93:105:void lambda$addButtons$2(int,net.minecraft.client.gui.components.Button) -> c
+    95:98:void lambda$null$1() -> x
+    72:72:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+    36:36:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsClientOutdatedScreen -> djq:
+    net.minecraft.client.gui.screens.Screen lastScreen -> a
     boolean outdated -> b
-    14:17:void <init>(net.minecraft.realms.RealmsScreen,boolean) -> <init>
-    21:27:void init() -> init
-    31:45:void render(int,int,float) -> render
-    49:53:boolean keyPressed(int,int,int) -> keyPressed
-    9:9:net.minecraft.realms.RealmsScreen access$000(com.mojang.realmsclient.gui.screens.RealmsClientOutdatedScreen) -> a
-com.mojang.realmsclient.gui.screens.RealmsClientOutdatedScreen$1 -> czr$1:
-    com.mojang.realmsclient.gui.screens.RealmsClientOutdatedScreen this$0 -> a
-    21:21:void <init>(com.mojang.realmsclient.gui.screens.RealmsClientOutdatedScreen,int,int,int,java.lang.String) -> <init>
-    24:25:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen -> czs:
+    16:19:void <init>(net.minecraft.client.gui.screens.Screen,boolean) -> <init>
+    23:24:void init() -> b
+    28:42:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    46:50:boolean keyPressed(int,int,int) -> a
+    23:23:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen -> djr:
     org.apache.logging.log4j.Logger LOGGER -> a
-    java.lang.String toolTip -> b
-    com.mojang.realmsclient.RealmsMainScreen lastScreen -> c
-    com.mojang.realmsclient.dto.RealmsServer serverData -> d
-    long serverId -> e
-    int left_x -> f
-    int right_x -> g
-    int default_button_width -> h
-    int default_button_offset -> i
-    net.minecraft.realms.RealmsButton playersButton -> j
-    net.minecraft.realms.RealmsButton settingsButton -> k
-    net.minecraft.realms.RealmsButton subscriptionButton -> l
-    net.minecraft.realms.RealmsButton optionsButton -> m
-    net.minecraft.realms.RealmsButton backupButton -> n
-    net.minecraft.realms.RealmsButton resetWorldButton -> o
-    net.minecraft.realms.RealmsButton switchMinigameButton -> p
-    boolean stateChanged -> q
-    int animTick -> r
-    int clicks -> s
-    42:78:void <init>(com.mojang.realmsclient.RealmsMainScreen,long) -> <init>
-    82:166:void init() -> init
-    169:174:void addSlotButton(int) -> a
-    177:177:int leftButton(int) -> b
-    181:181:int centerButton(int,int) -> a
-    186:192:void tick() -> tick
-    196:228:void render(int,int,float) -> render
-    231:231:int frame(int) -> c
-    236:237:void removed() -> removed
-    241:245:boolean keyPressed(int,int,int) -> keyPressed
-    249:253:void backButtonClicked() -> c
-    256:275:void fetchServerData(long) -> a
-    278:286:void disableButtons() -> d
-    290:290:boolean mouseClicked(double,double,int) -> mouseClicked
-    294:299:void joinRealm(com.mojang.realmsclient.dto.RealmsServer) -> a
-    303:323:void onSlotClick(int,com.mojang.realmsclient.gui.RealmsWorldSlotButton$Action,boolean,boolean) -> a
-    326:330:void switchToMinigame() -> e
-    333:342:void switchToFullSlot(int,com.mojang.realmsclient.dto.RealmsServer) -> a
-    345:357:void switchToEmptySlot(int,com.mojang.realmsclient.dto.RealmsServer) -> b
-    360:375:void renderMousehoverTooltip(java.lang.String,int,int) -> a
-    378:389:void drawServerStatus(int,int,int,int) -> a
-    392:401:void drawExpired(int,int,int,int) -> b
-    404:424:void drawExpiring(int,int,int,int,int) -> a
-    427:436:void drawOpen(int,int,int,int) -> c
-    439:448:void drawClose(int,int,int,int) -> d
-    451:451:boolean isMinigame() -> f
-    455:458:void hideRegularButtons() -> g
-    461:463:void hide(net.minecraft.realms.RealmsButton) -> a
-    466:469:void showRegularButtons() -> h
-    472:474:void show(net.minecraft.realms.RealmsButton) -> b
-    477:478:void hideMinigameButtons() -> i
-    481:482:void showMinigameButtons() -> j
-    485:503:void saveSlotSettings(com.mojang.realmsclient.dto.RealmsWorldOptions) -> a
-    506:523:void saveSettings(java.lang.String,java.lang.String) -> a
-    526:530:void openTheWorld(boolean,net.minecraft.realms.RealmsScreen) -> a
-    533:537:void closeTheWorld(net.minecraft.realms.RealmsScreen) -> a
-    540:541:void stateChanged() -> a
-    545:552:void callback(com.mojang.realmsclient.dto.WorldTemplate) -> a
-    555:560:void switchSlot(long,int) -> a
-    563:567:void switchMinigame(com.mojang.realmsclient.dto.WorldTemplate) -> b
-    570:570:com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen getNewScreen() -> b
-    24:24:void callback(java.lang.Object) -> a
-    556:556:void lambda$switchSlot$5(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,boolean,int) -> a
-    348:356:void lambda$switchToEmptySlot$4(com.mojang.realmsclient.dto.RealmsServer,int,boolean,int) -> a
-    336:341:void lambda$switchToFullSlot$3(com.mojang.realmsclient.dto.RealmsServer,int,boolean,int) -> b
-    257:274:void lambda$fetchServerData$2(long) -> b
-    172:172:void lambda$addSlotButton$1(java.lang.String) -> a
-    172:172:com.mojang.realmsclient.dto.RealmsServer lambda$addSlotButton$0() -> k
-    24:24:com.mojang.realmsclient.dto.RealmsServer access$000(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen) -> a
-    24:24:com.mojang.realmsclient.RealmsMainScreen access$100(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen) -> b
-    24:24:void access$200(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen) -> c
-    25:25:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen$1 -> czs$1:
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen this$0 -> a
-    91:91:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    94:95:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen$2 -> czs$2:
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen this$0 -> a
-    97:97:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    100:101:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen$3 -> czs$3:
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen this$0 -> a
-    103:103:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    106:107:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen$4 -> czs$4:
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen this$0 -> a
-    114:114:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    117:120:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen$5 -> czs$5:
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen this$0 -> a
-    123:123:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    126:127:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen$6 -> czs$6:
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen this$0 -> a
-    129:129:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    132:133:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen$7 -> czs$7:
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen this$0 -> a
-    135:135:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    138:139:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen$8 -> czs$8:
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen this$0 -> a
-    141:141:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    144:145:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen$9 -> czs$9:
+    net.minecraft.resources.ResourceLocation ON_ICON_LOCATION -> b
+    net.minecraft.resources.ResourceLocation OFF_ICON_LOCATION -> c
+    net.minecraft.resources.ResourceLocation EXPIRED_ICON_LOCATION -> p
+    net.minecraft.resources.ResourceLocation EXPIRES_SOON_ICON_LOCATION -> q
+    net.minecraft.network.chat.Component toolTip -> r
+    com.mojang.realmsclient.RealmsMainScreen lastScreen -> s
+    com.mojang.realmsclient.dto.RealmsServer serverData -> t
+    long serverId -> u
+    int leftX -> v
+    int rightX -> w
+    net.minecraft.client.gui.components.Button playersButton -> x
+    net.minecraft.client.gui.components.Button settingsButton -> y
+    net.minecraft.client.gui.components.Button subscriptionButton -> z
+    net.minecraft.client.gui.components.Button optionsButton -> A
+    net.minecraft.client.gui.components.Button backupButton -> B
+    net.minecraft.client.gui.components.Button resetWorldButton -> C
+    net.minecraft.client.gui.components.Button switchMinigameButton -> D
+    boolean stateChanged -> E
+    int animTick -> F
+    int clicks -> G
+    65:68:void <init>(com.mojang.realmsclient.RealmsMainScreen,long) -> <init>
+    72:136:void init() -> b
+    139:167:void addSlotButton(int) -> a
+    170:170:int leftButton(int) -> b
+    174:174:int centerButton(int,int) -> b
+    179:185:void tick() -> d
+    189:221:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    224:224:int frame(int) -> c
+    229:230:void removed() -> e
+    234:238:boolean keyPressed(int,int,int) -> a
+    242:246:void backButtonClicked() -> i
+    249:268:void fetchServerData(long) -> a
+    271:279:void disableButtons() -> k
+    282:287:void joinRealm(com.mojang.realmsclient.dto.RealmsServer) -> a
+    290:294:void switchToMinigame() -> l
+    297:308:void switchToFullSlot(int,com.mojang.realmsclient.dto.RealmsServer) -> a
+    311:326:void switchToEmptySlot(int,com.mojang.realmsclient.dto.RealmsServer) -> b
+    329:340:void renderMousehoverTooltip(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.network.chat.Component,int,int) -> a
+    343:354:void drawServerStatus(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> c
+    357:364:void drawExpired(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> d
+    367:385:void drawExpiring(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int) -> b
+    388:395:void drawOpen(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> e
+    398:405:void drawClose(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> f
+    408:408:boolean isMinigame() -> m
+    412:415:void hideRegularButtons() -> n
+    418:421:void hide(net.minecraft.client.gui.components.Button) -> a
+    424:426:void show(net.minecraft.client.gui.components.Button) -> b
+    429:430:void hideMinigameButtons() -> v
+    433:449:void saveSlotSettings(com.mojang.realmsclient.dto.RealmsWorldOptions) -> a
+    452:467:void saveSettings(java.lang.String,java.lang.String) -> a
+    470:471:void openTheWorld(boolean,net.minecraft.client.gui.screens.Screen) -> a
+    474:475:void closeTheWorld(net.minecraft.client.gui.screens.Screen) -> a
+    478:479:void stateChanged() -> a
+    483:490:void callback(com.mojang.realmsclient.dto.WorldTemplate) -> a
+    493:493:com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen getNewScreen() -> c
+    314:325:void lambda$switchToEmptySlot$19(com.mojang.realmsclient.dto.RealmsServer,int,boolean) -> a
+    317:317:void lambda$null$18() -> w
+    316:316:void lambda$null$17() -> x
+    300:307:void lambda$switchToFullSlot$16(com.mojang.realmsclient.dto.RealmsServer,int,boolean) -> b
+    302:303:void lambda$null$15() -> y
+    250:267:void lambda$fetchServerData$14(long) -> b
+    265:265:void lambda$null$13(com.mojang.realmsclient.exception.RealmsServiceException) -> a
+    142:165:void lambda$addSlotButton$12(int,net.minecraft.client.gui.components.Button) -> a
+    141:141:void lambda$addSlotButton$11(net.minecraft.network.chat.Component) -> a
+    141:141:com.mojang.realmsclient.dto.RealmsServer lambda$addSlotButton$10() -> z
+    115:115:void lambda$init$9(net.minecraft.client.gui.components.Button) -> c
+    108:108:void lambda$init$8(net.minecraft.client.gui.components.Button) -> d
+    111:112:void lambda$null$7() -> A
+    109:110:void lambda$null$6() -> B
+    105:105:void lambda$init$5(net.minecraft.client.gui.components.Button) -> e
+    102:102:void lambda$init$4(net.minecraft.client.gui.components.Button) -> f
+    96:99:void lambda$init$3(net.minecraft.client.gui.components.Button) -> g
+    88:88:void lambda$init$2(net.minecraft.client.gui.components.Button) -> h
+    85:85:void lambda$init$1(net.minecraft.client.gui.components.Button) -> i
+    82:82:void lambda$init$0(net.minecraft.client.gui.components.Button) -> j
+    31:36:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen$1 -> djr$1:
     int[] $SwitchMap$com$mojang$realmsclient$gui$RealmsWorldSlotButton$Action -> a
-    303:303:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsConfirmScreen -> czt:
-    net.minecraft.realms.RealmsScreen parent -> a
-    java.lang.String title1 -> b
-    java.lang.String title2 -> f
-    java.lang.String yesButton -> c
-    java.lang.String noButton -> d
-    int id -> e
-    int delayTicker -> g
-    17:25:void <init>(net.minecraft.realms.RealmsScreen,java.lang.String,java.lang.String,int) -> <init>
-    38:50:void init() -> init
-    54:60:void render(int,int,float) -> render
-    72:79:void tick() -> tick
-com.mojang.realmsclient.gui.screens.RealmsConfirmScreen$1 -> czt$1:
-    com.mojang.realmsclient.gui.screens.RealmsConfirmScreen this$0 -> a
-    38:38:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfirmScreen,int,int,int,int,int,java.lang.String) -> <init>
-    41:42:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsConfirmScreen$2 -> czt$2:
-    com.mojang.realmsclient.gui.screens.RealmsConfirmScreen this$0 -> a
-    44:44:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfirmScreen,int,int,int,int,int,java.lang.String) -> <init>
-    47:48:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen -> czu:
+    144:144:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsConfirmScreen -> djs:
+    it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> a
+    net.minecraft.network.chat.Component title1 -> b
+    net.minecraft.network.chat.Component title2 -> c
+    int delayTicker -> p
+    17:21:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
+    25:27:void init() -> b
+    31:37:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    49:56:void tick() -> d
+    26:26:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    25:25:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen -> djt:
     com.mojang.realmsclient.dto.RealmsServer server -> a
     com.mojang.realmsclient.RealmsMainScreen lastScreen -> b
-    net.minecraft.realms.RealmsEditBox nameBox -> c
-    net.minecraft.realms.RealmsEditBox descriptionBox -> d
-    net.minecraft.realms.RealmsButton createButton -> e
-    net.minecraft.realms.RealmsLabel createRealmLabel -> f
-    30:33:void <init>(com.mojang.realmsclient.dto.RealmsServer,com.mojang.realmsclient.RealmsMainScreen) -> <init>
-    37:44:void tick() -> tick
-    48:76:void init() -> init
-    80:81:void removed() -> removed
-    85:86:boolean charTyped(char,int) -> charTyped
-    91:98:boolean keyPressed(int,int,int) -> keyPressed
-    102:110:void createWorld() -> a
-    113:113:boolean valid() -> b
-    118:133:void render(int,int,float) -> render
-    14:14:void access$000(com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen) -> a
-    14:14:com.mojang.realmsclient.RealmsMainScreen access$100(com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen) -> b
-com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen$1 -> czu$1:
-    com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen this$0 -> a
-    50:50:void <init>(com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen,int,int,int,int,int,java.lang.String) -> <init>
-    53:54:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen$2 -> czu$2:
-    com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen this$0 -> a
-    56:56:void <init>(com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen,int,int,int,int,int,java.lang.String) -> <init>
-    59:60:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen -> czv:
+    net.minecraft.client.gui.components.EditBox nameBox -> c
+    net.minecraft.client.gui.components.EditBox descriptionBox -> p
+    net.minecraft.client.gui.components.Button createButton -> q
+    net.minecraft.realms.RealmsLabel createRealmLabel -> r
+    26:29:void <init>(com.mojang.realmsclient.dto.RealmsServer,com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    33:40:void tick() -> d
+    44:62:void init() -> b
+    66:67:void removed() -> e
+    71:74:boolean charTyped(char,int) -> a
+    79:87:boolean keyPressed(int,int,int) -> a
+    91:99:void createWorld() -> i
+    102:102:boolean valid() -> k
+    107:122:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    94:94:void lambda$createWorld$3() -> l
+    93:93:void lambda$createWorld$2() -> m
+    47:47:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    46:46:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen -> dju:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.realms.RealmsScreen lastScreen -> b
-    com.mojang.realmsclient.dto.WorldDownload worldDownload -> c
-    java.lang.String downloadTitle -> d
-    com.google.common.util.concurrent.RateLimiter narrationRateLimiter -> e
-    net.minecraft.realms.RealmsButton cancelButton -> f
-    java.lang.String worldName -> g
-    com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus downloadStatus -> h
-    java.lang.String errorMessage -> i
-    java.lang.String status -> j
-    java.lang.String progress -> k
-    boolean cancelled -> l
-    boolean showDots -> m
-    boolean finished -> n
-    boolean extracting -> o
-    java.lang.Long previousWrittenBytes -> p
-    java.lang.Long previousTimeSnapshot -> q
-    long bytesPersSecond -> r
-    int animTick -> s
-    java.lang.String[] DOTS -> t
-    int dotIndex -> u
-    int WARNING_ID -> v
-    int confirmationId -> w
-    boolean checked -> x
-    java.util.concurrent.locks.ReentrantLock downloadLock -> y
-    40:66:void <init>(net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.dto.WorldDownload,java.lang.String) -> <init>
-    69:70:void setConfirmationId(int) -> a
-    74:83:void init() -> init
-    86:97:void checkDownloadSize() -> a
-    101:104:void confirmResult(boolean,int) -> confirmResult
-    107:108:long getContentLength(java.lang.String) -> a
-    113:133:void tick() -> tick
-    137:142:boolean keyPressed(int,int,int) -> keyPressed
-    146:151:void backButtonClicked() -> b
-    155:179:void render(int,int,float) -> render
-    182:189:void drawDots() -> c
-    192:217:void drawProgressBar() -> d
-    220:234:void drawDownloadSpeed() -> e
-    237:242:void drawDownloadSpeed0(long) -> c
-    245:251:java.lang.String humanReadableSpeed(long) -> a
-    255:261:java.lang.String humanReadableSize(long) -> b
-    265:328:void downloadSave() -> f
-    331:332:void downloadCancelled() -> g
-    267:327:void lambda$downloadSave$0() -> h
-    25:25:boolean access$002(com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen,boolean) -> a
-    25:25:void access$100(com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen) -> a
-    26:57:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$1 -> czv$1:
-    com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen this$0 -> a
-    75:75:void <init>(com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    78:80:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus -> czv$a:
+    java.util.concurrent.locks.ReentrantLock DOWNLOAD_LOCK -> b
+    net.minecraft.client.gui.screens.Screen lastScreen -> c
+    com.mojang.realmsclient.dto.WorldDownload worldDownload -> p
+    net.minecraft.network.chat.Component downloadTitle -> q
+    com.google.common.util.concurrent.RateLimiter narrationRateLimiter -> r
+    net.minecraft.client.gui.components.Button cancelButton -> s
+    java.lang.String worldName -> t
+    com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus downloadStatus -> u
+    net.minecraft.network.chat.Component errorMessage -> v
+    net.minecraft.network.chat.Component status -> w
+    java.lang.String progress -> x
+    boolean cancelled -> y
+    boolean showDots -> z
+    boolean finished -> A
+    boolean extracting -> B
+    java.lang.Long previousWrittenBytes -> C
+    java.lang.Long previousTimeSnapshot -> D
+    long bytesPersSecond -> E
+    int animTick -> F
+    java.lang.String[] DOTS -> G
+    int dotIndex -> H
+    boolean checked -> I
+    it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> J
+    48:74:void <init>(net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.dto.WorldDownload,java.lang.String,it.unimi.dsi.fastutil.booleans.BooleanConsumer) -> <init>
+    78:84:void init() -> b
+    87:102:void checkDownloadSize() -> i
+    105:106:long getContentLength(java.lang.String) -> a
+    111:131:void tick() -> d
+    135:140:boolean keyPressed(int,int,int) -> a
+    144:149:void backButtonClicked() -> k
+    153:177:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    180:187:void drawDots(com.mojang.blaze3d.vertex.PoseStack) -> b
+    190:216:void drawProgressBar(com.mojang.blaze3d.vertex.PoseStack) -> c
+    219:233:void drawDownloadSpeed(com.mojang.blaze3d.vertex.PoseStack) -> d
+    236:241:void drawDownloadSpeed0(com.mojang.blaze3d.vertex.PoseStack,long) -> a
+    244:306:void downloadSave() -> l
+    309:310:void downloadCancelled() -> m
+    246:305:void lambda$downloadSave$2() -> n
+    95:98:void lambda$checkDownloadSize$1(boolean) -> c
+    80:82:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+    36:60:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen$DownloadStatus -> dju$a:
     java.lang.Long bytesWritten -> a
     java.lang.Long totalBytes -> b
     com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen this$0 -> c
-    334:336:void <init>(com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen) -> <init>
-com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen -> czw:
-    net.minecraft.realms.RealmsScreen nextScreen -> a
-    java.lang.String line1 -> b
-    java.lang.String line2 -> c
-    17:20:void <init>(com.mojang.realmsclient.exception.RealmsServiceException,net.minecraft.realms.RealmsScreen) -> <init>
-    22:25:void <init>(java.lang.String,net.minecraft.realms.RealmsScreen) -> <init>
-    27:30:void <init>(java.lang.String,java.lang.String,net.minecraft.realms.RealmsScreen) -> <init>
-    33:42:void errorMessage(com.mojang.realmsclient.exception.RealmsServiceException) -> a
-    45:47:void errorMessage(java.lang.String) -> a
-    50:52:void errorMessage(java.lang.String,java.lang.String) -> a
-    56:63:void init() -> init
-    67:68:void tick() -> tick
-    72:85:void render(int,int,float) -> render
-    9:9:net.minecraft.realms.RealmsScreen access$000(com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen) -> a
-com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen$1 -> czw$1:
-    com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen this$0 -> a
-    57:57:void <init>(com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen,int,int,int,int,int,java.lang.String) -> <init>
-    60:61:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsInviteScreen -> czx:
+    312:314:void <init>(com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen) -> <init>
+com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen -> djv:
+    net.minecraft.client.gui.screens.Screen nextScreen -> a
+    net.minecraft.network.chat.Component line1 -> b
+    net.minecraft.network.chat.Component line2 -> c
+    20:23:void <init>(com.mojang.realmsclient.exception.RealmsServiceException,net.minecraft.client.gui.screens.Screen) -> <init>
+    25:28:void <init>(net.minecraft.network.chat.Component,net.minecraft.client.gui.screens.Screen) -> <init>
+    30:33:void <init>(net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.client.gui.screens.Screen) -> <init>
+    36:44:void errorMessage(com.mojang.realmsclient.exception.RealmsServiceException) -> a
+    47:49:void errorMessage(net.minecraft.network.chat.Component) -> a
+    52:54:void errorMessage(net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> a
+    58:60:void init() -> b
+    64:70:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    59:59:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+com.mojang.realmsclient.gui.screens.RealmsInviteScreen -> djw:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.realms.RealmsEditBox profileName -> b
+    net.minecraft.client.gui.components.EditBox profileName -> b
     com.mojang.realmsclient.dto.RealmsServer serverData -> c
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen configureScreen -> d
-    net.minecraft.realms.RealmsScreen lastScreen -> e
-    int BUTTON_INVITE_ID -> f
-    int BUTTON_CANCEL_ID -> g
-    net.minecraft.realms.RealmsButton inviteButton -> h
-    int PROFILENAME_EDIT_BOX -> i
-    java.lang.String errorMsg -> j
-    boolean showError -> k
-    23:37:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
-    41:42:void tick() -> tick
-    46:63:void init() -> init
-    67:68:void removed() -> removed
-    71:91:void onInvite() -> a
-    94:97:void showError(java.lang.String) -> a
-    101:106:boolean keyPressed(int,int,int) -> keyPressed
-    111:122:void render(int,int,float) -> render
-    14:14:void access$000(com.mojang.realmsclient.gui.screens.RealmsInviteScreen) -> a
-    14:14:net.minecraft.realms.RealmsScreen access$100(com.mojang.realmsclient.gui.screens.RealmsInviteScreen) -> b
-    15:15:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsInviteScreen$1 -> czx$1:
-    com.mojang.realmsclient.gui.screens.RealmsInviteScreen this$0 -> a
-    47:47:void <init>(com.mojang.realmsclient.gui.screens.RealmsInviteScreen,int,int,int,java.lang.String) -> <init>
-    50:51:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsInviteScreen$2 -> czx$2:
-    com.mojang.realmsclient.gui.screens.RealmsInviteScreen this$0 -> a
-    53:53:void <init>(com.mojang.realmsclient.gui.screens.RealmsInviteScreen,int,int,int,java.lang.String) -> <init>
-    56:57:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen -> czy:
-    com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type type -> e
-    java.lang.String line2 -> f
-    java.lang.String line3 -> g
-    net.minecraft.realms.RealmsConfirmResultListener listener -> a
-    java.lang.String yesButton -> b
-    java.lang.String noButton -> c
-    java.lang.String okButton -> h
-    int id -> d
-    boolean yesNoQuestion -> i
-    22:32:void <init>(net.minecraft.realms.RealmsConfirmResultListener,com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type,java.lang.String,java.lang.String,boolean,int) -> <init>
-    36:58:void init() -> init
-    62:66:boolean keyPressed(int,int,int) -> keyPressed
-    71:79:void render(int,int,float) -> render
-com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$1 -> czy$1:
-    com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen this$0 -> a
-    38:38:void <init>(com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen,int,int,int,int,int,java.lang.String) -> <init>
-    41:42:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$2 -> czy$2:
-    com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen this$0 -> a
-    44:44:void <init>(com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen,int,int,int,int,int,java.lang.String) -> <init>
-    47:48:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$3 -> czy$3:
-    com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen this$0 -> a
-    51:51:void <init>(com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen,int,int,int,int,int,java.lang.String) -> <init>
-    54:55:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type -> czy$a:
+    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen configureScreen -> p
+    net.minecraft.client.gui.screens.Screen lastScreen -> q
+    java.lang.String errorMsg -> r
+    boolean showError -> s
+    30:34:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
+    38:39:void tick() -> d
+    43:51:void init() -> b
+    55:56:void removed() -> e
+    59:79:void onInvite() -> i
+    82:85:void showError(java.lang.String) -> a
+    89:94:boolean keyPressed(int,int,int) -> a
+    99:110:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    50:50:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    49:49:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+    19:19:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen -> djx:
+    com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type type -> b
+    net.minecraft.network.chat.Component line2 -> c
+    net.minecraft.network.chat.Component line3 -> p
+    it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> a
+    boolean yesNoQuestion -> q
+    21:27:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,boolean) -> <init>
+    31:38:void init() -> b
+    42:46:boolean keyPressed(int,int,int) -> a
+    51:59:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    36:36:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    34:34:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    33:33:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
+com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type -> djx$a:
     com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type Warning -> a
     com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type Info -> b
     int colorCode -> c
     java.lang.String text -> d
     com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type[] $VALUES -> e
-    81:81:com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type[] values() -> values
-    81:81:com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type valueOf(java.lang.String) -> valueOf
-    85:88:void <init>(java.lang.String,int,java.lang.String,int) -> <init>
-    81:83:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen -> czz:
+    62:62:com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type[] values() -> values
+    62:62:com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen$Type valueOf(java.lang.String) -> valueOf
+    66:69:void <init>(java.lang.String,int,java.lang.String,int) -> <init>
+    62:64:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen -> djy:
     org.apache.logging.log4j.Logger LOGGER -> b
-    int BUTTON_CANCEL_ID -> c
-    int BUTTON_BACK_ID -> d
-    net.minecraft.realms.RealmsScreen lastScreen -> e
-    com.mojang.realmsclient.gui.LongRunningTask taskThread -> f
-    java.lang.String title -> g
-    boolean error -> h
-    java.lang.String errorMessage -> i
-    boolean aborted -> j
-    int animTicks -> k
-    com.mojang.realmsclient.gui.LongRunningTask task -> l
-    int buttonLength -> m
-    java.lang.String[] symbols -> a
-    17:38:void <init>(net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.gui.LongRunningTask) -> <init>
-    41:44:void start() -> a
-    48:54:void tick() -> tick
-    58:62:boolean keyPressed(int,int,int) -> keyPressed
-    67:75:void init() -> init
-    78:81:void cancelOrBackButtonClicked() -> c
-    85:99:void render(int,int,float) -> render
-    103:113:void error(java.lang.String) -> a
-    116:117:void setTitle(java.lang.String) -> b
-    120:120:boolean aborted() -> b
-    14:14:void access$000(com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen) -> a
-    15:124:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen$1 -> czz$1:
-    com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen this$0 -> a
-    69:69:void <init>(com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen,int,int,int,int,int,java.lang.String) -> <init>
-    72:73:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen$2 -> czz$2:
-    com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen this$0 -> a
-    107:107:void <init>(com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen,int,int,int,java.lang.String) -> <init>
-    110:111:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsNotificationsScreen -> daa:
-    com.mojang.realmsclient.gui.RealmsDataFetcher realmsDataFetcher -> a
-    int numberOfPendingInvites -> b
-    boolean checkedMcoAvailability -> c
-    boolean trialAvailable -> d
-    boolean validClient -> e
-    boolean hasUnreadNews -> f
-    java.util.List tasks -> g
-    30:31:void <init>(net.minecraft.realms.RealmsScreen) -> <init>
-    35:37:void init() -> init
-    41:65:void tick() -> tick
-    68:98:void checkIfMcoEnabled() -> a
-    102:107:void render(int,int,float) -> render
-    112:112:boolean mouseClicked(double,double,int) -> mouseClicked
-    116:161:void drawIcons(int,int) -> a
-    165:166:void removed() -> removed
+    net.minecraft.client.gui.screens.Screen lastScreen -> c
+    java.lang.String title -> p
+    boolean error -> q
+    net.minecraft.network.chat.Component errorMessage -> r
+    boolean aborted -> s
+    int animTicks -> t
+    com.mojang.realmsclient.util.task.LongRunningTask task -> u
+    int buttonLength -> v
+    java.lang.String[] SYMBOLS -> a
+    26:44:void <init>(net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.util.task.LongRunningTask) -> <init>
+    48:54:void tick() -> d
+    58:62:boolean keyPressed(int,int,int) -> a
+    67:72:void init() -> b
+    75:78:void cancelOrBackButtonClicked() -> i
+    82:95:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    99:106:void error(net.minecraft.network.chat.Component) -> a
+    109:114:void buttonsClear() -> a
+    117:118:void setTitle(java.lang.String) -> b
+    121:121:boolean aborted() -> c
+    104:104:void lambda$error$1(net.minecraft.client.gui.components.Button) -> a
+    70:70:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+    22:125:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsNotificationsScreen -> djz:
+    net.minecraft.resources.ResourceLocation INVITE_ICON_LOCATION -> a
+    net.minecraft.resources.ResourceLocation TRIAL_ICON_LOCATION -> b
+    net.minecraft.resources.ResourceLocation NEWS_ICON_LOCATION -> c
+    com.mojang.realmsclient.gui.RealmsDataFetcher REALMS_DATA_FETCHER -> p
+    int numberOfPendingInvites -> q
+    boolean checkedMcoAvailability -> r
+    boolean trialAvailable -> s
+    boolean validClient -> t
+    boolean hasUnreadNews -> u
+    14:14:void <init>() -> <init>
+    30:32:void init() -> b
+    36:60:void tick() -> d
+    63:63:boolean getRealmsNotificationsEnabled() -> i
+    67:67:boolean inTitleScreen() -> k
+    71:98:void checkIfMcoEnabled() -> l
+    102:107:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    110:150:void drawIcons(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    154:155:void removed() -> e
     14:14:boolean access$002(boolean) -> a
     14:14:boolean access$102(boolean) -> b
-    19:28:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsNotificationsScreen$1 -> daa$1:
+    15:19:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsNotificationsScreen$1 -> djz$1:
     com.mojang.realmsclient.gui.screens.RealmsNotificationsScreen this$0 -> a
-    71:71:void <init>(com.mojang.realmsclient.gui.screens.RealmsNotificationsScreen,java.lang.String) -> <init>
-    74:95:void run() -> run
-com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen -> dab:
-    net.minecraft.realms.RealmsScreen nextScreen -> a
-    18:20:void <init>(net.minecraft.realms.RealmsScreen) -> <init>
-    24:49:void init() -> init
-    53:54:void tick() -> tick
-    58:58:boolean mouseClicked(double,double,int) -> mouseClicked
-    63:73:void render(int,int,float) -> render
-    11:11:net.minecraft.realms.RealmsScreen access$000(com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen) -> a
-com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen$1 -> dab$1:
-    com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen this$0 -> a
-    31:31:void <init>(com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen,int,int,int,int,int,java.lang.String) -> <init>
-    34:35:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen$2 -> dab$2:
-    com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen this$0 -> a
-    37:37:void <init>(com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen,int,int,int,int,int,java.lang.String) -> <init>
-    40:41:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen$3 -> dab$3:
-    com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen this$0 -> a
-    43:43:void <init>(com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen,int,int,int,int,int,java.lang.String) -> <init>
-    46:47:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen -> dac:
+    74:74:void <init>(com.mojang.realmsclient.gui.screens.RealmsNotificationsScreen,java.lang.String) -> <init>
+    77:95:void run() -> run
+com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen -> dka:
+    net.minecraft.client.gui.screens.Screen nextScreen -> a
+    20:22:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
+    26:42:void init() -> b
+    46:56:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    40:41:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    37:38:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    34:35:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
+com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen -> dkb:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.realms.RealmsScreen lastScreen -> b
-    java.lang.String toolTip -> c
-    boolean loaded -> d
-    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionList pendingInvitationSelectionList -> e
-    net.minecraft.realms.RealmsLabel titleLabel -> f
-    int selectedInvite -> g
-    net.minecraft.realms.RealmsButton acceptButton -> h
-    net.minecraft.realms.RealmsButton rejectButton -> i
-    44:51:void <init>(net.minecraft.realms.RealmsScreen) -> <init>
-    55:106:void init() -> init
-    110:111:void tick() -> tick
-    115:119:boolean keyPressed(int,int,int) -> keyPressed
-    123:124:void updateList(int) -> a
-    127:141:void reject(int) -> b
-    144:158:void accept(int) -> c
-    162:178:void render(int,int,float) -> render
-    181:191:void renderMousehoverTooltip(java.lang.String,int,int) -> a
-    194:196:void updateButtonStates() -> b
-    199:199:boolean shouldAcceptAndRejectButtonBeVisible(int) -> d
-    338:338:java.lang.String getAge(com.mojang.realmsclient.dto.PendingInvite) -> a
-    26:26:org.apache.logging.log4j.Logger access$000() -> a
-    26:26:boolean access$102(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,boolean) -> a
-    26:26:com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionList access$200(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> a
-    26:26:int access$300(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> b
-    26:26:void access$400(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int) -> a
-    26:26:int access$302(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int) -> b
-    26:26:void access$500(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> c
-    26:26:net.minecraft.realms.RealmsScreen access$600(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> d
-    26:26:void access$700(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int) -> c
-    26:26:void access$800(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int) -> d
-    26:26:java.lang.String access$902(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,java.lang.String) -> a
-    27:27:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$1 -> dac$1:
+    net.minecraft.resources.ResourceLocation ACCEPT_ICON_LOCATION -> b
+    net.minecraft.resources.ResourceLocation REJECT_ICON_LOCATION -> c
+    net.minecraft.client.gui.screens.Screen lastScreen -> p
+    java.lang.String toolTip -> q
+    boolean loaded -> r
+    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionList pendingInvitationSelectionList -> s
+    net.minecraft.realms.RealmsLabel titleLabel -> t
+    int selectedInvite -> u
+    net.minecraft.client.gui.components.Button acceptButton -> v
+    net.minecraft.client.gui.components.Button rejectButton -> w
+    47:54:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
+    58:101:void init() -> b
+    105:109:boolean keyPressed(int,int,int) -> a
+    113:114:void updateList(int) -> a
+    117:131:void reject(int) -> b
+    134:148:void accept(int) -> c
+    152:168:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    171:181:void renderMousehoverTooltip(com.mojang.blaze3d.vertex.PoseStack,java.lang.String,int,int) -> a
+    184:186:void updateButtonStates() -> i
+    189:189:boolean shouldAcceptAndRejectButtonBeVisible(int) -> d
+    90:93:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    86:86:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    80:83:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
+    33:33:net.minecraft.client.Minecraft access$000(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> a
+    33:33:org.apache.logging.log4j.Logger access$100() -> a
+    33:33:boolean access$202(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,boolean) -> a
+    33:33:com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionList access$300(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> b
+    33:33:net.minecraft.client.Minecraft access$500(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> c
+    33:33:void access$600(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int) -> a
+    33:33:net.minecraft.client.Minecraft access$700(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> d
+    33:33:int access$802(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int) -> b
+    33:33:void access$900(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> e
+    33:33:net.minecraft.resources.ResourceLocation access$1000() -> c
+    33:33:net.minecraft.client.Minecraft access$1100(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> f
+    33:33:java.lang.String access$1202(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,java.lang.String) -> a
+    33:33:void access$1300(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int) -> c
+    33:33:net.minecraft.resources.ResourceLocation access$1400() -> f
+    33:33:net.minecraft.client.Minecraft access$1500(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> g
+    33:33:void access$1600(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int) -> d
+    33:33:net.minecraft.client.gui.Font access$1700(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> h
+    33:33:net.minecraft.client.gui.Font access$1800(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> i
+    33:33:net.minecraft.client.gui.Font access$1900(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> j
+    34:37:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$1 -> dkb$1:
     com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen this$0 -> a
-    58:58:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,java.lang.String) -> <init>
-    61:71:void run() -> run
-    65:65:void lambda$run$1(java.util.List) -> a
-    64:64:com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionListEntry lambda$run$0(com.mojang.realmsclient.dto.PendingInvite) -> a
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$2 -> dac$2:
-    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen this$0 -> a
-    74:74:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int,int,int,int,int,java.lang.String) -> <init>
-    77:80:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$3 -> dac$3:
-    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen this$0 -> a
-    83:83:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int,int,int,int,int,java.lang.String) -> <init>
-    86:87:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$4 -> dac$4:
-    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen this$0 -> a
-    90:90:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,int,int,int,int,int,java.lang.String) -> <init>
-    93:96:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$5 -> dac$5:
+    61:61:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,java.lang.String) -> <init>
+    64:74:void run() -> run
+    68:68:void lambda$run$1(java.util.List) -> a
+    67:67:com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$Entry lambda$run$0(com.mojang.realmsclient.dto.PendingInvite) -> a
+com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$2 -> dkb$2:
     int val$slot -> a
     com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen this$0 -> b
-    128:128:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,java.lang.String,int) -> <init>
-    132:138:void run() -> run
-    134:134:void lambda$run$0(int) -> a
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$6 -> dac$6:
+    118:118:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,java.lang.String,int) -> <init>
+    122:128:void run() -> run
+    124:124:void lambda$run$0(int) -> a
+com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$3 -> dkb$3:
     int val$slot -> a
     com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen this$0 -> b
-    145:145:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,java.lang.String,int) -> <init>
-    149:155:void run() -> run
-    151:151:void lambda$run$0(int) -> a
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionList -> dac$a:
-    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen this$0 -> a
-    203:205:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> <init>
-    208:209:void removeAtIndex(int) -> a
-    213:213:int getMaxPosition() -> getMaxPosition
-    218:218:int getRowWidth() -> getRowWidth
-    223:223:boolean isFocused() -> isFocused
-    228:229:void renderBackground() -> renderBackground
-    233:243:void selectItem(int) -> selectItem
-    246:248:void selectInviteListItem(int) -> b
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionListEntry -> dac$b:
-    com.mojang.realmsclient.dto.PendingInvite pendingInvite -> a
+    135:135:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,java.lang.String,int) -> <init>
+    139:145:void run() -> run
+    141:141:void lambda$run$0(int) -> a
+com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$Entry -> dkb$a:
+    com.mojang.realmsclient.dto.PendingInvite pendingInvite -> b
     java.util.List rowButtons -> c
-    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen this$0 -> b
-    305:308:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,com.mojang.realmsclient.dto.PendingInvite) -> <init>
-    312:313:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    317:318:boolean mouseClicked(double,double,int) -> mouseClicked
-    322:334:void renderPendingInvitationItem(com.mojang.realmsclient.dto.PendingInvite,int,int,int,int) -> a
-    330:333:void lambda$renderPendingInvitationItem$0(int,int) -> a
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionListEntry$AcceptRowButton -> dac$b$a:
-    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionListEntry this$1 -> e
-    253:255:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionListEntry) -> <init>
-    259:269:void draw(int,int,boolean) -> a
-    273:274:void onClick(int) -> a
-com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionListEntry$RejectRowButton -> dac$b$b:
-    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionListEntry this$1 -> e
-    278:280:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionListEntry) -> <init>
-    284:293:void draw(int,int,boolean) -> a
-    297:298:void onClick(int) -> a
-com.mojang.realmsclient.gui.screens.RealmsPlayerScreen -> dad:
+    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen this$0 -> a
+    300:303:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen,com.mojang.realmsclient.dto.PendingInvite) -> <init>
+    307:308:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    312:313:boolean mouseClicked(double,double,int) -> a
+    317:329:void renderPendingInvitationItem(com.mojang.blaze3d.vertex.PoseStack,com.mojang.realmsclient.dto.PendingInvite,int,int,int,int) -> a
+    325:328:void lambda$renderPendingInvitationItem$0(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    248:248:com.mojang.realmsclient.dto.PendingInvite access$400(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$Entry) -> a
+com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$Entry$AcceptRowButton -> dkb$a$a:
+    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$Entry this$1 -> e
+    250:252:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$Entry) -> <init>
+    256:264:void draw(com.mojang.blaze3d.vertex.PoseStack,int,int,boolean) -> a
+    268:269:void onClick(int) -> a
+com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$Entry$RejectRowButton -> dkb$a$b:
+    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$Entry this$1 -> e
+    273:275:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$Entry) -> <init>
+    279:287:void draw(com.mojang.blaze3d.vertex.PoseStack,int,int,boolean) -> a
+    291:292:void onClick(int) -> a
+com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$PendingInvitationSelectionList -> dkb$b:
+    com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen this$0 -> a
+    193:195:void <init>(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen) -> <init>
+    198:199:void removeAtIndex(int) -> b
+    203:203:int getMaxPosition() -> c
+    208:208:int getRowWidth() -> d
+    213:213:boolean isFocused() -> b
+    218:219:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    223:232:void selectItem(int) -> a
+    235:237:void selectInviteListItem(int) -> c
+    241:245:void setSelected(com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen$Entry) -> a
+    192:192:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+com.mojang.realmsclient.gui.screens.RealmsPlayerScreen -> dkc:
     org.apache.logging.log4j.Logger LOGGER -> a
-    java.lang.String toolTip -> b
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen lastScreen -> c
-    com.mojang.realmsclient.dto.RealmsServer serverData -> d
-    com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$InvitedObjectSelectionList invitedObjectSelectionList -> e
-    int column1_x -> f
-    int column_width -> g
-    int column2_x -> h
-    net.minecraft.realms.RealmsButton removeButton -> i
-    net.minecraft.realms.RealmsButton opdeopButton -> j
-    int selectedInvitedIndex -> k
-    java.lang.String selectedInvited -> l
-    int player -> m
-    boolean stateChanged -> n
-    net.minecraft.realms.RealmsLabel titleLabel -> o
-    53:63:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
-    67:68:void tick() -> tick
-    72:130:void init() -> init
-    133:135:void updateButtonStates() -> a
-    138:138:boolean shouldRemoveAndOpdeopButtonBeVisible(int) -> a
-    143:144:void removed() -> removed
-    148:152:boolean keyPressed(int,int,int) -> keyPressed
-    156:161:void backButtonClicked() -> b
-    164:173:void op(int) -> b
-    176:185:void deop(int) -> c
-    188:191:void updateOps(com.mojang.realmsclient.dto.Ops) -> a
-    194:202:void uninvite(int) -> d
-    206:221:void confirmResult(boolean,int) -> confirmResult
-    224:225:void deleteFromInvitedList(int) -> e
-    229:266:void render(int,int,float) -> render
-    269:279:void renderMousehoverTooltip(java.lang.String,int,int) -> a
-    418:429:void drawRemoveIcon(int,int,int,int) -> a
-    432:443:void drawOpped(int,int,int,int) -> b
-    446:457:void drawNormal(int,int,int,int) -> c
-    24:24:com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen access$000(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> a
-    24:24:com.mojang.realmsclient.dto.RealmsServer access$100(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> b
-    24:24:int access$200(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> c
-    24:24:void access$300(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int) -> a
-    24:24:void access$400(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int) -> b
-    24:24:void access$500(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int) -> c
-    24:24:void access$600(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> d
-    24:24:int access$700(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> e
-    24:24:int access$800(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> f
-    24:24:java.lang.String access$900(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> g
-    24:24:int access$202(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int) -> d
-    24:24:void access$1000(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> h
-    24:24:void access$1100(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int,int,int,int) -> a
-    24:24:void access$1200(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int,int,int,int) -> b
-    24:24:void access$1300(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int,int,int,int) -> c
-    24:24:int access$1400(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> i
-    25:25:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$1 -> dad$1:
+    net.minecraft.resources.ResourceLocation OP_ICON_LOCATION -> b
+    net.minecraft.resources.ResourceLocation USER_ICON_LOCATION -> c
+    net.minecraft.resources.ResourceLocation CROSS_ICON_LOCATION -> p
+    net.minecraft.resources.ResourceLocation OPTIONS_BACKGROUND -> q
+    java.lang.String toolTip -> r
+    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen lastScreen -> s
+    com.mojang.realmsclient.dto.RealmsServer serverData -> t
+    com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$InvitedObjectSelectionList invitedObjectSelectionList -> u
+    int column1X -> v
+    int columnWidth -> w
+    int column2X -> x
+    net.minecraft.client.gui.components.Button removeButton -> y
+    net.minecraft.client.gui.components.Button opdeopButton -> z
+    int selectedInvitedIndex -> A
+    java.lang.String selectedInvited -> B
+    int player -> C
+    boolean stateChanged -> D
+    net.minecraft.realms.RealmsLabel titleLabel -> E
+    55:65:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
+    69:106:void init() -> b
+    109:111:void updateButtonStates() -> i
+    114:114:boolean shouldRemoveAndOpdeopButtonBeVisible(int) -> l
+    119:120:void removed() -> e
+    124:128:boolean keyPressed(int,int,int) -> a
+    132:137:void backButtonClicked() -> k
+    140:149:void op(int) -> m
+    152:161:void deop(int) -> n
+    164:167:void updateOps(com.mojang.realmsclient.dto.Ops) -> a
+    170:192:void uninvite(int) -> o
+    195:196:void deleteFromInvitedList(int) -> p
+    200:238:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    241:251:void renderMousehoverTooltip(com.mojang.blaze3d.vertex.PoseStack,java.lang.String,int,int) -> a
+    392:402:void drawRemoveIcon(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> c
+    405:415:void drawOpped(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> d
+    418:428:void drawNormal(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> e
+    176:189:void lambda$uninvite$4(boolean) -> c
+    100:100:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
+    92:97:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
+    88:88:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
+    84:84:void lambda$init$0(net.minecraft.client.gui.components.Button) -> d
+    33:33:int access$000(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> a
+    33:33:int access$100(int) -> a
+    33:33:int access$200(int) -> b
+    33:33:int access$300(int) -> c
+    33:33:int access$400(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> b
+    33:33:com.mojang.realmsclient.dto.RealmsServer access$500(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> c
+    33:33:java.lang.String access$600(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> d
+    33:33:void access$700(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int) -> a
+    33:33:void access$800(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int) -> b
+    33:33:void access$900(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int) -> c
+    33:33:int access$1002(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int) -> d
+    33:33:void access$1100(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> e
+    33:33:net.minecraft.client.gui.Font access$1200(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> f
+    33:33:void access$1300(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> a
+    33:33:void access$1400(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> b
+    33:33:void access$1500(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> c
+    33:33:int access$1600(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> g
+    33:33:int access$1700(int) -> d
+    33:33:net.minecraft.client.gui.Font access$1800(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> h
+    34:39:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$Entry -> dkc$a:
+    com.mojang.realmsclient.dto.PlayerInfo playerInfo -> b
     com.mojang.realmsclient.gui.screens.RealmsPlayerScreen this$0 -> a
-    78:78:void <init>(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int,int,int,int,int,java.lang.String) -> <init>
-    81:82:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$2 -> dad$2:
+    348:350:void <init>(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,com.mojang.realmsclient.dto.PlayerInfo) -> <init>
+    354:355:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    360:388:void renderInvitedItem(com.mojang.blaze3d.vertex.PoseStack,com.mojang.realmsclient.dto.PlayerInfo,int,int,int,int) -> a
+    384:387:void lambda$renderInvitedItem$0(com.mojang.blaze3d.vertex.PoseStack,int) -> a
+com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$InvitedObjectSelectionList -> dkc$b:
     com.mojang.realmsclient.gui.screens.RealmsPlayerScreen this$0 -> a
-    94:94:void <init>(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int,int,int,int,int,java.lang.String) -> <init>
-    97:98:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$3 -> dad$3:
-    com.mojang.realmsclient.gui.screens.RealmsPlayerScreen this$0 -> a
-    101:101:void <init>(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int,int,int,int,int,java.lang.String) -> <init>
-    104:109:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$4 -> dad$4:
-    com.mojang.realmsclient.gui.screens.RealmsPlayerScreen this$0 -> a
-    112:112:void <init>(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,int,int,int,int,int,java.lang.String) -> <init>
-    115:116:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$InvitedObjectSelectionList -> dad$a:
-    com.mojang.realmsclient.gui.screens.RealmsPlayerScreen this$0 -> a
-    282:284:void <init>(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> <init>
-    287:288:void addEntry(com.mojang.realmsclient.dto.PlayerInfo) -> a
-    292:292:int getRowWidth() -> getRowWidth
-    297:297:boolean isFocused() -> isFocused
-    303:315:boolean mouseClicked(double,double,int) -> mouseClicked
-    320:333:void itemClicked(int,int,double,double,int) -> itemClicked
-    337:342:void selectItem(int) -> selectItem
-    345:348:void selectInviteListItem(int) -> a
-    352:353:void renderBackground() -> renderBackground
-    357:357:int getScrollbarPosition() -> getScrollbarPosition
-    362:362:int getItemCount() -> getItemCount
-    367:367:int getMaxPosition() -> getMaxPosition
-com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$InvitedObjectSelectionListEntry -> dad$b:
-    com.mojang.realmsclient.dto.PlayerInfo mPlayerInfo -> a
-    com.mojang.realmsclient.gui.screens.RealmsPlayerScreen this$0 -> b
-    374:376:void <init>(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen,com.mojang.realmsclient.dto.PlayerInfo) -> <init>
-    380:381:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    386:414:void renderInvitedItem(com.mojang.realmsclient.dto.PlayerInfo,int,int,int,int) -> a
-    410:413:void lambda$renderInvitedItem$0(int) -> a
-com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen -> dae:
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen lastScreen -> b
-    net.minecraft.realms.RealmsLabel titleLabel -> c
-    net.minecraft.realms.RealmsEditBox seedEdit -> d
-    java.lang.Boolean generateStructures -> e
-    java.lang.Integer levelTypeIndex -> f
-    java.lang.String[] levelTypes -> a
-    int BUTTON_CANCEL_ID -> g
-    int BUTTON_RESET_ID -> h
-    int SEED_EDIT_BOX -> i
-    net.minecraft.realms.RealmsButton resetButton -> j
-    net.minecraft.realms.RealmsButton levelTypeButton -> k
-    net.minecraft.realms.RealmsButton generateStructuresButton -> l
-    java.lang.String buttonTitle -> m
-    16:36:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen) -> <init>
-    39:41:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,java.lang.String) -> <init>
-    45:47:void tick() -> tick
-    51:97:void init() -> init
-    101:102:void removed() -> removed
-    106:110:boolean keyPressed(int,int,int) -> keyPressed
-    114:115:void onReset() -> a
-    119:127:void render(int,int,float) -> render
-    130:131:java.lang.String levelTypeTitle() -> b
-    135:135:java.lang.String generateStructuresTitle() -> c
-    11:11:com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen access$000(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen) -> a
-    11:11:void access$100(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen) -> b
-    11:11:java.lang.Integer access$202(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen,java.lang.Integer) -> a
-    11:11:java.lang.Integer access$200(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen) -> c
-    11:11:java.lang.String access$300(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen) -> d
-    11:11:java.lang.Boolean access$402(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen,java.lang.Boolean) -> a
-    11:11:java.lang.Boolean access$400(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen) -> e
-    11:11:java.lang.String access$500(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen) -> f
-com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen$1 -> dae$1:
-    com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen this$0 -> a
-    60:60:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    63:64:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen$2 -> dae$2:
-    com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen this$0 -> a
-    67:67:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    70:71:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen$3 -> dae$3:
-    com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen this$0 -> a
-    80:80:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    83:85:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen$4 -> dae$4:
-    com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen this$0 -> a
-    87:87:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    90:92:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen -> daf:
+    254:256:void <init>(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen) -> <init>
+    259:260:void addEntry(com.mojang.realmsclient.dto.PlayerInfo) -> a
+    264:264:int getRowWidth() -> d
+    269:269:boolean isFocused() -> b
+    275:287:boolean mouseClicked(double,double,int) -> a
+    292:305:void itemClicked(int,int,double,double,int) -> a
+    309:314:void selectItem(int) -> a
+    317:320:void selectInviteListItem(int) -> b
+    324:327:void setSelected(com.mojang.realmsclient.gui.screens.RealmsPlayerScreen$Entry) -> a
+    331:332:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    336:336:int getScrollbarPosition() -> e
+    341:341:int getMaxPosition() -> c
+    253:253:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+com.mojang.realmsclient.gui.screens.RealmsResetNormalWorldScreen -> dkd:
+    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen lastScreen -> a
+    net.minecraft.realms.RealmsLabel titleLabel -> b
+    net.minecraft.client.gui.components.EditBox seedEdit -> c
+    java.lang.Boolean generateStructures -> p
+    java.lang.Integer levelTypeIndex -> q
+    net.minecraft.network.chat.Component[] levelTypes -> r
+    net.minecraft.network.chat.Component buttonTitle -> s
+    19:34:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,net.minecraft.network.chat.Component) -> <init>
+    38:40:void tick() -> d
+    44:71:void init() -> b
+    75:76:void removed() -> e
+    80:84:boolean keyPressed(int,int,int) -> a
+    89:97:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    100:100:net.minecraft.network.chat.Component levelTypeTitle() -> i
+    104:105:net.minecraft.network.chat.Component generateStructuresTitle() -> k
+    68:68:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
+    64:65:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
+    59:61:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
+    55:57:void lambda$init$0(net.minecraft.client.gui.components.Button) -> d
+com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen -> dke:
     org.apache.logging.log4j.Logger LOGGER -> b
-    net.minecraft.realms.RealmsScreen lastScreen -> c
-    com.mojang.realmsclient.dto.RealmsServer serverData -> d
-    net.minecraft.realms.RealmsScreen returnScreen -> e
-    net.minecraft.realms.RealmsLabel titleLabel -> f
-    net.minecraft.realms.RealmsLabel subtitleLabel -> g
-    java.lang.String title -> h
-    java.lang.String subtitle -> i
-    java.lang.String buttonTitle -> j
-    int subtitleColor -> k
-    int BUTTON_CANCEL_ID -> l
-    int BUTTON_FRAME_START -> m
-    com.mojang.realmsclient.dto.WorldTemplatePaginatedList templates -> n
-    com.mojang.realmsclient.dto.WorldTemplatePaginatedList adventuremaps -> o
-    com.mojang.realmsclient.dto.WorldTemplatePaginatedList experiences -> p
-    com.mojang.realmsclient.dto.WorldTemplatePaginatedList inspirations -> q
+    net.minecraft.client.gui.screens.Screen lastScreen -> c
+    com.mojang.realmsclient.dto.RealmsServer serverData -> p
+    net.minecraft.realms.RealmsLabel titleLabel -> q
+    net.minecraft.realms.RealmsLabel subtitleLabel -> r
+    net.minecraft.network.chat.Component title -> s
+    net.minecraft.network.chat.Component subtitle -> t
+    net.minecraft.network.chat.Component buttonTitle -> u
+    int subtitleColor -> v
+    net.minecraft.resources.ResourceLocation SLOT_FRAME_LOCATION -> w
+    net.minecraft.resources.ResourceLocation UPLOAD_LOCATION -> x
+    net.minecraft.resources.ResourceLocation ADVENTURE_MAP_LOCATION -> y
+    net.minecraft.resources.ResourceLocation SURVIVAL_SPAWN_LOCATION -> z
+    net.minecraft.resources.ResourceLocation NEW_WORLD_LOCATION -> A
+    net.minecraft.resources.ResourceLocation EXPERIENCE_LOCATION -> B
+    net.minecraft.resources.ResourceLocation INSPIRATION_LOCATION -> C
+    com.mojang.realmsclient.dto.WorldTemplatePaginatedList templates -> D
+    com.mojang.realmsclient.dto.WorldTemplatePaginatedList adventuremaps -> E
+    com.mojang.realmsclient.dto.WorldTemplatePaginatedList experiences -> F
+    com.mojang.realmsclient.dto.WorldTemplatePaginatedList inspirations -> G
     int slot -> a
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType typeToReset -> r
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo worldInfoToReset -> s
-    com.mojang.realmsclient.dto.WorldTemplate worldTemplateToReset -> t
-    java.lang.String resetTitle -> u
-    int confirmationId -> v
-    28:63:void <init>(net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.dto.RealmsServer,net.minecraft.realms.RealmsScreen) -> <init>
-    66:71:void <init>(net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.dto.RealmsServer,net.minecraft.realms.RealmsScreen,java.lang.String,java.lang.String,int,java.lang.String) -> <init>
-    74:75:void setConfirmationId(int) -> a
-    78:79:void setSlot(int) -> b
+    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType typeToReset -> H
+    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo worldInfoToReset -> I
+    com.mojang.realmsclient.dto.WorldTemplate worldTemplateToReset -> J
+    java.lang.String resetTitle -> K
+    java.lang.Runnable resetWorldRunnable -> L
+    java.lang.Runnable callback -> M
+    33:67:void <init>(net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.dto.RealmsServer,java.lang.Runnable,java.lang.Runnable) -> <init>
+    70:75:void <init>(net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.dto.RealmsServer,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,int,net.minecraft.network.chat.Component,java.lang.Runnable,java.lang.Runnable) -> <init>
+    78:79:void setSlot(int) -> a
     82:83:void setResetTitle(java.lang.String) -> a
-    87:165:void init() -> init
-    169:170:void removed() -> removed
-    174:178:boolean keyPressed(int,int,int) -> keyPressed
-    183:183:boolean mouseClicked(double,double,int) -> mouseClicked
-    187:187:int frame(int) -> c
-    192:198:void render(int,int,float) -> render
-    201:226:void drawFrame(int,int,java.lang.String,long,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType,boolean,boolean) -> a
-    230:252:void callback(com.mojang.realmsclient.dto.WorldTemplate) -> a
-    255:256:void switchSlot() -> b
-    259:263:void switchSlot(net.minecraft.realms.RealmsScreen) -> a
-    277:308:void confirmResult(boolean,int) -> confirmResult
-    311:324:void resetWorldWithTemplate(com.mojang.realmsclient.dto.WorldTemplate) -> b
-    339:346:void resetWorld(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo) -> a
-    349:362:void triggerResetWorld(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo) -> b
-    20:20:void callback(java.lang.Object) -> a
-    20:20:net.minecraft.realms.RealmsScreen access$000(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen) -> a
-    20:20:org.apache.logging.log4j.Logger access$100() -> a
-    20:20:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$202(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> a
-    20:20:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$302(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> b
-    20:20:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$402(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> c
-    20:20:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$502(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> d
-    20:20:java.lang.String access$600(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen) -> b
-    20:20:com.mojang.realmsclient.dto.RealmsServer access$700(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen) -> c
-    20:20:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$200(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen) -> d
-    20:20:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$300(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen) -> e
-    20:20:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$400(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen) -> f
-    20:20:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$500(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen) -> g
-    20:20:void access$800(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,int,int,java.lang.String,long,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType,boolean,boolean) -> a
-    21:21:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$1 -> daf$1:
+    87:145:void init() -> b
+    149:150:void removed() -> e
+    154:158:boolean keyPressed(int,int,int) -> a
+    162:162:int frame(int) -> b
+    167:173:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    176:198:void drawFrame(com.mojang.blaze3d.vertex.PoseStack,int,int,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation,boolean,boolean) -> a
+    202:226:void callback(com.mojang.realmsclient.dto.WorldTemplate) -> a
+    229:250:void switchSlot() -> i
+    253:254:void switchSlot(java.lang.Runnable) -> a
+    267:268:void resetWorldWithTemplate(com.mojang.realmsclient.dto.WorldTemplate) -> b
+    271:272:void triggerResetWorld(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo) -> b
+    275:276:void resetWorld(java.lang.String,com.mojang.realmsclient.dto.WorldTemplate,int,boolean) -> a
+    291:298:void resetWorld(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo) -> a
+    230:249:void lambda$switchSlot$7() -> k
+    139:142:void lambda$init$6(net.minecraft.client.gui.components.Button) -> a
+    134:137:void lambda$init$5(net.minecraft.client.gui.components.Button) -> b
+    129:132:void lambda$init$4(net.minecraft.client.gui.components.Button) -> c
+    124:127:void lambda$init$3(net.minecraft.client.gui.components.Button) -> d
+    120:122:void lambda$init$2(net.minecraft.client.gui.components.Button) -> e
+    116:116:void lambda$init$1(net.minecraft.client.gui.components.Button) -> f
+    88:89:void lambda$init$0(net.minecraft.client.gui.components.Button) -> g
+    26:26:net.minecraft.client.Minecraft access$000(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen) -> a
+    26:26:org.apache.logging.log4j.Logger access$100() -> a
+    26:26:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$202(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> a
+    26:26:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$302(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> b
+    26:26:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$402(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> c
+    26:26:com.mojang.realmsclient.dto.WorldTemplatePaginatedList access$502(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> d
+    26:26:void access$900(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation,boolean,boolean) -> a
+    27:44:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$1 -> dke$1:
     com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen this$0 -> a
-    87:87:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,int,int,int,int,int,java.lang.String) -> <init>
-    90:91:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$2 -> daf$2:
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen this$0 -> a
-    94:94:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,java.lang.String) -> <init>
-    97:112:void run() -> run
-    104:108:void lambda$run$0(com.mojang.realmsclient.dto.WorldTemplatePaginatedList,com.mojang.realmsclient.dto.WorldTemplatePaginatedList,com.mojang.realmsclient.dto.WorldTemplatePaginatedList,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> a
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$3 -> daf$3:
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen this$0 -> a
-    118:118:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,int,int,java.lang.String,long,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType) -> <init>
-    121:122:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$4 -> daf$4:
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen this$0 -> a
-    125:125:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,int,int,java.lang.String,long,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType) -> <init>
-    128:129:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$5 -> daf$5:
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen this$0 -> a
-    131:131:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,int,int,java.lang.String,long,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType) -> <init>
-    134:137:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$6 -> daf$6:
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen this$0 -> a
-    139:139:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,int,int,java.lang.String,long,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType) -> <init>
-    142:145:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$7 -> daf$7:
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen this$0 -> a
-    147:147:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,int,int,java.lang.String,long,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType) -> <init>
-    150:153:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$8 -> daf$8:
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen this$0 -> a
-    155:155:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,int,int,java.lang.String,long,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType) -> <init>
-    158:161:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$9 -> daf$9:
+    91:91:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,java.lang.String) -> <init>
+    94:109:void run() -> run
+    101:105:void lambda$run$0(com.mojang.realmsclient.dto.WorldTemplatePaginatedList,com.mojang.realmsclient.dto.WorldTemplatePaginatedList,com.mojang.realmsclient.dto.WorldTemplatePaginatedList,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> a
+com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$2 -> dke$2:
     int[] $SwitchMap$com$mojang$realmsclient$dto$WorldTemplate$WorldTemplateType -> a
     int[] $SwitchMap$com$mojang$realmsclient$gui$screens$RealmsResetWorldScreen$ResetType -> b
-    234:278:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$FrameButton -> daf$a:
-    long imageId -> a
-    java.lang.String image -> c
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType resetType -> d
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen this$0 -> b
-    369:374:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,int,int,java.lang.String,long,java.lang.String,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType) -> <init>
-    378:379:void tick() -> tick
-    383:384:void render(int,int,float) -> render
-    388:389:void renderButton(int,int,float) -> renderButton
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType -> daf$b:
+    209:230:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$FrameButton -> dke$a:
+    net.minecraft.resources.ResourceLocation image -> b
+    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen this$0 -> a
+    303:306:void <init>(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,int,int,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    310:311:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType -> dke$b:
     com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType NONE -> a
     com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType GENERATE -> b
     com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType UPLOAD -> c
@@ -3831,672 +3761,575 @@ com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType -> daf$b:
     com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType EXPERIENCE -> f
     com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType INSPIRATION -> g
     com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType[] $VALUES -> h
-    265:265:com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType[] values() -> values
-    265:265:com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType valueOf(java.lang.String) -> valueOf
-    265:265:void <init>(java.lang.String,int) -> <init>
-    265:272:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo -> daf$c:
+    256:256:com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType[] values() -> values
+    256:256:com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetType valueOf(java.lang.String) -> valueOf
+    256:256:void <init>(java.lang.String,int) -> <init>
+    256:263:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo -> dke$c:
     java.lang.String seed -> a
     int levelType -> b
     boolean generateStructures -> c
-    331:335:void <init>(java.lang.String,int,boolean) -> <init>
-com.mojang.realmsclient.gui.screens.RealmsResourcePackScreen -> dag:
+    283:287:void <init>(java.lang.String,int,boolean) -> <init>
+    278:278:java.lang.String access$600(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo) -> a
+    278:278:int access$700(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo) -> b
+    278:278:boolean access$800(com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen$ResetWorldInfo) -> c
+com.mojang.realmsclient.gui.screens.RealmsScreenWithCallback -> dkf:
+    8:8:void <init>() -> <init>
+    void callback(com.mojang.realmsclient.dto.WorldTemplate) -> a
+com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen -> dkg:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.realms.RealmsScreen lastScreen -> b
-    com.mojang.realmsclient.dto.RealmsServerAddress serverAddress -> c
-    java.util.concurrent.locks.ReentrantLock connectLock -> d
-    18:22:void <init>(net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.dto.RealmsServerAddress,java.util.concurrent.locks.ReentrantLock) -> <init>
-    27:52:void confirmResult(boolean,int) -> confirmResult
-    36:39:java.lang.Void lambda$confirmResult$1(java.lang.Throwable) -> a
-    32:35:void lambda$confirmResult$0() -> a
-    13:13:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsScreenWithCallback -> dah:
-    5:5:void <init>() -> <init>
-    void callback(java.lang.Object) -> a
-com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen -> dai:
+    java.text.DateFormat DATE_FORMAT -> b
+    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen lastScreen -> c
+    long worldId -> p
+    int slotId -> q
+    net.minecraft.client.gui.components.Button uploadButton -> r
+    java.util.List levelList -> s
+    int selectedWorld -> t
+    com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$WorldSelectionList worldSelectionList -> u
+    java.lang.String worldLang -> v
+    java.lang.String conversionLang -> w
+    net.minecraft.realms.RealmsLabel titleLabel -> x
+    net.minecraft.realms.RealmsLabel subtitleLabel -> y
+    net.minecraft.realms.RealmsLabel noWorldsLabel -> z
+    java.lang.Runnable callback -> A
+    41:57:void <init>(long,int,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,java.lang.Runnable) -> <init>
+    61:74:void loadLevelList() -> i
+    78:110:void init() -> b
+    114:115:void removed() -> e
+    118:122:void upload() -> k
+    126:138:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    142:146:boolean keyPressed(int,int,int) -> a
+    244:244:java.lang.String gameModeName(net.minecraft.world.level.storage.LevelSummary) -> c
+    248:248:java.lang.String formatLastPlayed(net.minecraft.world.level.storage.LevelSummary) -> d
+    99:99:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    94:94:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    62:68:int lambda$loadLevelList$0(net.minecraft.world.level.storage.LevelSummary,net.minecraft.world.level.storage.LevelSummary) -> a
+    30:30:int access$000(int) -> a
+    30:30:java.util.List access$100(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> a
+    30:30:java.lang.String access$200(net.minecraft.world.level.storage.LevelSummary) -> a
+    30:30:java.lang.String access$300(net.minecraft.world.level.storage.LevelSummary) -> b
+    30:30:int access$402(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen,int) -> a
+    30:30:net.minecraft.client.gui.components.Button access$500(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> b
+    30:30:int access$400(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> c
+    30:30:com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$WorldSelectionList access$600(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> d
+    30:30:java.lang.String access$700(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> e
+    30:30:java.lang.String access$800(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> f
+    30:30:net.minecraft.client.gui.Font access$900(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> g
+    30:30:net.minecraft.client.gui.Font access$1000(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> h
+    30:30:net.minecraft.client.gui.Font access$1100(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> i
+    31:33:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$Entry -> dkg$a:
+    net.minecraft.world.level.storage.LevelSummary levelSummary -> b
+    com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen this$0 -> a
+    196:198:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen,net.minecraft.world.level.storage.LevelSummary) -> <init>
+    202:203:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    207:208:boolean mouseClicked(double,double,int) -> a
+    212:240:void renderItem(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.level.storage.LevelSummary,int,int,int) -> a
+com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$WorldSelectionList -> dkg$b:
+    com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen this$0 -> a
+    150:152:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> <init>
+    155:156:void addEntry(net.minecraft.world.level.storage.LevelSummary) -> a
+    160:160:int getMaxPosition() -> c
+    165:165:boolean isFocused() -> b
+    170:171:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    175:182:void selectItem(int) -> a
+    186:190:void setSelected(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$Entry) -> a
+    149:149:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen -> dkh:
     org.apache.logging.log4j.Logger LOGGER -> a
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen lastScreen -> b
-    long worldId -> c
-    int slotId -> d
-    net.minecraft.realms.RealmsButton uploadButton -> e
-    java.text.DateFormat DATE_FORMAT -> f
-    java.util.List levelList -> g
-    int selectedWorld -> h
-    com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$WorldSelectionList worldSelectionList -> i
-    java.lang.String worldLang -> j
-    java.lang.String conversionLang -> k
-    java.lang.String[] gameModesLang -> l
-    net.minecraft.realms.RealmsLabel titleLabel -> m
-    net.minecraft.realms.RealmsLabel subtitleLabel -> n
-    net.minecraft.realms.RealmsLabel noWorldsLabel -> o
-    38:54:void <init>(long,int,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen) -> <init>
-    57:63:void loadLevelList() -> a
-    67:110:void init() -> init
-    114:115:void removed() -> removed
-    118:122:void upload() -> b
-    126:138:void render(int,int,float) -> render
-    142:146:boolean keyPressed(int,int,int) -> keyPressed
-    151:152:void tick() -> tick
-    248:248:java.lang.String gameModeName(net.minecraft.realms.RealmsLevelSummary) -> a
-    252:252:java.lang.String formatLastPlayed(net.minecraft.realms.RealmsLevelSummary) -> b
-    26:26:com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen access$000(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> a
-    26:26:void access$100(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> b
-    26:26:java.util.List access$200(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> c
-    26:26:java.lang.String access$300(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen,net.minecraft.realms.RealmsLevelSummary) -> a
-    26:26:java.lang.String access$400(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen,net.minecraft.realms.RealmsLevelSummary) -> b
-    26:26:int access$502(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen,int) -> a
-    26:26:int access$500(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> d
-    26:26:net.minecraft.realms.RealmsButton access$600(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> e
-    26:26:com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$WorldSelectionList access$700(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> f
-    26:26:java.lang.String access$800(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> g
-    26:26:java.lang.String access$900(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> h
-    27:27:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$1 -> dai$1:
-    com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen this$0 -> a
-    87:87:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen,int,int,int,int,int,java.lang.String) -> <init>
-    90:91:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$2 -> dai$2:
-    com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen this$0 -> a
-    93:93:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen,int,int,int,int,int,java.lang.String) -> <init>
-    96:97:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$WorldListEntry -> dai$a:
-    net.minecraft.realms.RealmsLevelSummary levelSummary -> a
-    com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen this$0 -> b
-    200:202:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen,net.minecraft.realms.RealmsLevelSummary) -> <init>
-    206:207:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    211:212:boolean mouseClicked(double,double,int) -> mouseClicked
-    216:244:void renderItem(net.minecraft.realms.RealmsLevelSummary,int,int,int,int,net.minecraft.realms.Tezzelator,int,int) -> a
-com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen$WorldSelectionList -> dai$b:
-    com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen this$0 -> a
-    155:157:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectFileToUploadScreen) -> <init>
-    160:161:void addEntry(net.minecraft.realms.RealmsLevelSummary) -> a
-    165:165:int getItemCount() -> getItemCount
-    170:170:int getMaxPosition() -> getMaxPosition
-    175:175:boolean isFocused() -> isFocused
-    180:181:void renderBackground() -> renderBackground
-    184:194:void selectItem(int) -> selectItem
-com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen -> daj:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    com.mojang.realmsclient.gui.screens.RealmsScreenWithCallback lastScreen -> b
-    com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$WorldTemplateObjectSelectionList worldTemplateObjectSelectionList -> c
-    int selectedTemplate -> d
-    java.lang.String title -> e
-    net.minecraft.realms.RealmsButton selectButton -> f
-    net.minecraft.realms.RealmsButton trailerButton -> g
-    net.minecraft.realms.RealmsButton publisherButton -> h
-    java.lang.String toolTip -> i
-    java.lang.String currentLink -> j
-    com.mojang.realmsclient.dto.RealmsServer$WorldType worldType -> k
-    int clicks -> l
-    java.lang.String warning -> m
-    java.lang.String warningURL -> n
-    boolean displayWarning -> o
-    boolean hoverWarning -> p
-    java.util.List noTemplatesMessage -> q
-    75:76:void <init>(com.mojang.realmsclient.gui.screens.RealmsScreenWithCallback,com.mojang.realmsclient.dto.RealmsServer$WorldType) -> <init>
-    46:91:void <init>(com.mojang.realmsclient.gui.screens.RealmsScreenWithCallback,com.mojang.realmsclient.dto.RealmsServer$WorldType,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> <init>
-    94:95:void setTitle(java.lang.String) -> a
-    98:100:void setWarning(java.lang.String) -> b
-    104:108:boolean mouseClicked(double,double,int) -> mouseClicked
-    113:151:void init() -> init
-    154:157:void updateButtonStates() -> b
-    160:160:boolean shouldSelectButtonBeActive() -> c
-    164:164:boolean shouldPublisherBeVisible() -> d
-    168:168:com.mojang.realmsclient.dto.WorldTemplate getSelectedTemplate() -> e
-    172:172:boolean shouldTrailerBeVisible() -> f
-    177:183:void tick() -> tick
-    187:192:boolean keyPressed(int,int,int) -> keyPressed
-    196:198:void backButtonClicked() -> g
-    201:205:void selectTemplate() -> h
-    208:214:void onTrailer() -> i
-    217:223:void onPublish() -> j
-    226:263:void fetchTemplatesAsync(com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> a
-    267:269:com.mojang.datafixers.util.Either fetchTemplates(com.mojang.realmsclient.dto.WorldTemplatePaginatedList,com.mojang.realmsclient.client.RealmsClient) -> a
-    275:324:void render(int,int,float) -> render
-    327:342:void renderMultilineMessage(int,int,java.util.List) -> a
-    534:543:void renderMousehoverTooltip(java.lang.String,int,int) -> a
-    330:330:int lambda$renderMultilineMessage$0(com.mojang.realmsclient.util.TextRenderingUtils$LineSegment) -> a
-    35:35:void access$000(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> a
-    35:35:void access$100(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> b
-    35:35:void access$200(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> c
-    35:35:void access$300(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> d
-    35:35:com.mojang.datafixers.util.Either access$400(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,com.mojang.realmsclient.dto.WorldTemplatePaginatedList,com.mojang.realmsclient.client.RealmsClient) -> a
-    35:35:org.apache.logging.log4j.Logger access$500() -> a
-    35:35:com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$WorldTemplateObjectSelectionList access$600(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> e
-    35:35:java.util.List access$702(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,java.util.List) -> a
-    35:35:boolean access$800(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> f
-    35:35:java.lang.String access$900(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> g
-    35:35:int access$1002(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,int) -> a
-    35:35:void access$1100(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> h
-    35:35:int access$1200(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> i
-    35:35:int access$1202(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,int) -> b
-    35:35:java.lang.String access$1302(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,java.lang.String) -> a
-    35:35:java.lang.String access$902(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,java.lang.String) -> b
-    36:36:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$1 -> daj$1:
-    com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen this$0 -> a
-    117:117:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,int,int,int,int,int,java.lang.String) -> <init>
-    120:121:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$2 -> daj$2:
-    com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen this$0 -> a
-    123:123:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,int,int,int,int,int,java.lang.String) -> <init>
-    126:127:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$3 -> daj$3:
-    com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen this$0 -> a
-    129:129:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,int,int,int,int,int,java.lang.String) -> <init>
-    132:133:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$4 -> daj$4:
-    com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen this$0 -> a
-    135:135:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,int,int,int,int,int,java.lang.String) -> <init>
-    138:139:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$5 -> daj$5:
-    boolean $assertionsDisabled -> a
-    com.mojang.realmsclient.dto.WorldTemplatePaginatedList val$startPage -> b
-    com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen this$0 -> c
-    226:226:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,java.lang.String,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> <init>
-    229:261:void run() -> run
-    236:258:com.mojang.realmsclient.dto.WorldTemplatePaginatedList lambda$run$0(com.mojang.datafixers.util.Either) -> a
-    226:226:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$WorldTemplateObjectSelectionList -> daj$a:
-    com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen this$0 -> a
-    346:347:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> <init>
-    349:352:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,java.lang.Iterable) -> <init>
-    355:356:void addEntry(com.mojang.realmsclient.dto.WorldTemplate) -> a
-    360:389:boolean mouseClicked(double,double,int) -> mouseClicked
-    394:406:void selectItem(int) -> selectItem
-    410:413:void itemClicked(int,int,double,double,int) -> itemClicked
-    417:417:int getMaxPosition() -> getMaxPosition
-    422:422:int getRowWidth() -> getRowWidth
-    427:428:void renderBackground() -> renderBackground
-    432:432:boolean isFocused() -> isFocused
-    436:436:boolean isEmpty() -> a
-    440:440:com.mojang.realmsclient.dto.WorldTemplate get(int) -> a
-    444:444:java.util.List getTemplates() -> b
-    444:444:com.mojang.realmsclient.dto.WorldTemplate lambda$getTemplates$0(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$WorldTemplateObjectSelectionListEntry) -> a
-com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$WorldTemplateObjectSelectionListEntry -> daj$b:
-    com.mojang.realmsclient.dto.WorldTemplate template -> a
+    net.minecraft.resources.ResourceLocation LINK_ICON -> b
+    net.minecraft.resources.ResourceLocation TRAILER_ICON -> c
+    net.minecraft.resources.ResourceLocation SLOT_FRAME_LOCATION -> p
+    com.mojang.realmsclient.gui.screens.RealmsScreenWithCallback lastScreen -> q
+    com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$WorldTemplateObjectSelectionList worldTemplateObjectSelectionList -> r
+    int selectedTemplate -> s
+    net.minecraft.network.chat.Component title -> t
+    net.minecraft.client.gui.components.Button selectButton -> u
+    net.minecraft.client.gui.components.Button trailerButton -> v
+    net.minecraft.client.gui.components.Button publisherButton -> w
+    java.lang.String toolTip -> x
+    java.lang.String currentLink -> y
+    com.mojang.realmsclient.dto.RealmsServer$WorldType worldType -> z
+    int clicks -> A
+    net.minecraft.network.chat.Component[] warning -> B
+    java.lang.String warningURL -> C
+    boolean displayWarning -> D
+    boolean hoverWarning -> E
+    java.util.List noTemplatesMessage -> F
+    78:79:void <init>(com.mojang.realmsclient.gui.screens.RealmsScreenWithCallback,com.mojang.realmsclient.dto.RealmsServer$WorldType) -> <init>
+    53:94:void <init>(com.mojang.realmsclient.gui.screens.RealmsScreenWithCallback,com.mojang.realmsclient.dto.RealmsServer$WorldType,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> <init>
+    97:98:void setTitle(net.minecraft.network.chat.Component) -> a
+    101:103:void setWarning(net.minecraft.network.chat.Component[]) -> a
+    107:111:boolean mouseClicked(double,double,int) -> a
+    116:139:void init() -> b
+    142:145:void updateButtonStates() -> i
+    148:148:boolean shouldSelectButtonBeActive() -> k
+    152:152:boolean shouldPublisherBeVisible() -> l
+    156:156:com.mojang.realmsclient.dto.WorldTemplate getSelectedTemplate() -> m
+    160:160:boolean shouldTrailerBeVisible() -> n
+    165:171:void tick() -> d
+    175:179:boolean keyPressed(int,int,int) -> a
+    183:185:void backButtonClicked() -> v
+    188:191:void selectTemplate() -> w
+    194:194:boolean hasValidTemplate() -> x
+    198:204:void onTrailer() -> y
+    207:213:void onPublish() -> z
+    216:253:void fetchTemplatesAsync(com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> a
+    257:259:com.mojang.datafixers.util.Either fetchTemplates(com.mojang.realmsclient.dto.WorldTemplatePaginatedList,com.mojang.realmsclient.client.RealmsClient) -> a
+    265:314:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    317:332:void renderMultilineMessage(com.mojang.blaze3d.vertex.PoseStack,int,int,java.util.List) -> a
+    521:530:void renderMousehoverTooltip(com.mojang.blaze3d.vertex.PoseStack,java.lang.String,int,int) -> a
+    320:320:int lambda$renderMultilineMessage$4(com.mojang.realmsclient.util.TextRenderingUtils$LineSegment) -> a
+    125:125:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
+    123:123:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
+    121:121:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
+    120:120:void lambda$init$0(net.minecraft.client.gui.components.Button) -> d
+    42:42:com.mojang.datafixers.util.Either access$000(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,com.mojang.realmsclient.dto.WorldTemplatePaginatedList,com.mojang.realmsclient.client.RealmsClient) -> a
+    42:42:net.minecraft.client.Minecraft access$100(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> a
+    42:42:org.apache.logging.log4j.Logger access$200() -> a
+    42:42:com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$WorldTemplateObjectSelectionList access$300(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> b
+    42:42:java.util.List access$402(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,java.util.List) -> a
+    42:42:boolean access$500(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> c
+    42:42:int access$600(int) -> a
+    42:42:java.lang.String access$700(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> d
+    42:42:int access$800(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> e
+    42:42:int access$802(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,int) -> a
+    42:42:void access$900(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> f
+    42:42:int access$1002(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,int) -> b
+    42:42:void access$1100(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> g
+    42:42:net.minecraft.client.gui.Font access$1300(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> h
+    42:42:net.minecraft.client.gui.Font access$1400(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> i
+    42:42:net.minecraft.client.gui.Font access$1500(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> j
+    42:42:net.minecraft.client.gui.Font access$1600(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> k
+    42:42:net.minecraft.resources.ResourceLocation access$1700() -> c
+    42:42:net.minecraft.client.Minecraft access$1800(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> l
+    42:42:net.minecraft.client.gui.Font access$1900(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> m
+    42:42:net.minecraft.client.gui.Font access$2000(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> n
+    42:42:net.minecraft.resources.ResourceLocation access$2100() -> f
+    42:42:net.minecraft.client.Minecraft access$2200(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> o
+    42:42:net.minecraft.resources.ResourceLocation access$2300() -> g
+    42:42:net.minecraft.client.Minecraft access$2400(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> p
+    42:42:java.lang.String access$2502(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,java.lang.String) -> a
+    42:42:java.lang.String access$702(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,java.lang.String) -> b
+    43:47:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$1 -> dkh$1:
+    com.mojang.realmsclient.dto.WorldTemplatePaginatedList val$startPage -> a
     com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen this$0 -> b
-    451:453:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,com.mojang.realmsclient.dto.WorldTemplate) -> <init>
-    457:458:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    461:471:void renderWorldTemplateItem(com.mojang.realmsclient.dto.WorldTemplate,int,int,int,int) -> a
-    474:481:void drawImage(int,int,int,int,com.mojang.realmsclient.dto.WorldTemplate) -> a
-    484:530:void drawIcons(int,int,int,int,java.lang.String,java.lang.String,java.lang.String) -> a
-com.mojang.realmsclient.gui.screens.RealmsSettingsScreen -> dak:
+    216:216:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,java.lang.String,com.mojang.realmsclient.dto.WorldTemplatePaginatedList) -> <init>
+    219:251:void run() -> run
+    227:248:com.mojang.realmsclient.dto.WorldTemplatePaginatedList lambda$run$0(com.mojang.datafixers.util.Either) -> a
+com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$Entry -> dkh$a:
+    com.mojang.realmsclient.dto.WorldTemplate template -> b
+    com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen this$0 -> a
+    435:437:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,com.mojang.realmsclient.dto.WorldTemplate) -> <init>
+    441:442:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    445:455:void renderWorldTemplateItem(com.mojang.blaze3d.vertex.PoseStack,com.mojang.realmsclient.dto.WorldTemplate,int,int,int,int) -> a
+    458:465:void drawImage(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,com.mojang.realmsclient.dto.WorldTemplate) -> a
+    468:517:void drawIcons(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,java.lang.String,java.lang.String,java.lang.String) -> a
+    432:432:com.mojang.realmsclient.dto.WorldTemplate access$1200(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$Entry) -> a
+com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$WorldTemplateObjectSelectionList -> dkh$b:
+    com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen this$0 -> a
+    336:337:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen) -> <init>
+    339:342:void <init>(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen,java.lang.Iterable) -> <init>
+    345:346:void addEntry(com.mojang.realmsclient.dto.WorldTemplate) -> a
+    350:376:boolean mouseClicked(double,double,int) -> a
+    381:390:void selectItem(int) -> a
+    394:397:void setSelected(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$Entry) -> a
+    401:401:int getMaxPosition() -> c
+    406:406:int getRowWidth() -> d
+    411:412:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    416:416:boolean isFocused() -> b
+    420:420:boolean isEmpty() -> f
+    424:424:com.mojang.realmsclient.dto.WorldTemplate get(int) -> b
+    428:428:java.util.List getTemplates() -> g
+    334:334:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+    428:428:com.mojang.realmsclient.dto.WorldTemplate lambda$getTemplates$0(com.mojang.realmsclient.gui.screens.RealmsSelectWorldTemplateScreen$Entry) -> b
+com.mojang.realmsclient.gui.screens.RealmsSettingsScreen -> dki:
     com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen configureWorldScreen -> a
     com.mojang.realmsclient.dto.RealmsServer serverData -> b
-    int COMPONENT_WIDTH -> c
-    net.minecraft.realms.RealmsButton doneButton -> d
-    net.minecraft.realms.RealmsEditBox descEdit -> e
-    net.minecraft.realms.RealmsEditBox nameEdit -> f
-    net.minecraft.realms.RealmsLabel titleLabel -> g
-    26:37:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
-    41:45:void tick() -> tick
-    49:97:void init() -> init
-    101:102:void removed() -> removed
-    106:116:void confirmResult(boolean,int) -> confirmResult
-    120:125:boolean keyPressed(int,int,int) -> keyPressed
-    130:141:void render(int,int,float) -> render
-    144:145:void save() -> a
-    12:12:com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen access$000(com.mojang.realmsclient.gui.screens.RealmsSettingsScreen) -> a
-    12:12:com.mojang.realmsclient.dto.RealmsServer access$100(com.mojang.realmsclient.gui.screens.RealmsSettingsScreen) -> b
-com.mojang.realmsclient.gui.screens.RealmsSettingsScreen$1 -> dak$1:
-    com.mojang.realmsclient.gui.screens.RealmsSettingsScreen this$0 -> a
-    53:53:void <init>(com.mojang.realmsclient.gui.screens.RealmsSettingsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    56:57:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSettingsScreen$2 -> dak$2:
-    com.mojang.realmsclient.gui.screens.RealmsSettingsScreen this$0 -> a
-    59:59:void <init>(com.mojang.realmsclient.gui.screens.RealmsSettingsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    62:63:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSettingsScreen$3 -> dak$3:
-    com.mojang.realmsclient.gui.screens.RealmsSettingsScreen this$0 -> a
-    65:65:void <init>(com.mojang.realmsclient.gui.screens.RealmsSettingsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    68:75:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen -> dal:
-    net.minecraft.realms.RealmsEditBox nameEdit -> e
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen parent -> a
-    int column1_x -> f
-    int column_width -> g
-    int column2_x -> h
-    com.mojang.realmsclient.dto.RealmsWorldOptions options -> i
-    com.mojang.realmsclient.dto.RealmsServer$WorldType worldType -> j
-    int activeSlot -> k
-    int difficultyIndex -> l
-    int gameModeIndex -> m
-    java.lang.Boolean pvp -> n
-    java.lang.Boolean spawnNPCs -> o
-    java.lang.Boolean spawnAnimals -> p
-    java.lang.Boolean spawnMonsters -> q
-    java.lang.Integer spawnProtection -> r
-    java.lang.Boolean commandBlocks -> s
-    java.lang.Boolean forceGameMode -> t
-    net.minecraft.realms.RealmsButton pvpButton -> u
-    net.minecraft.realms.RealmsButton spawnAnimalsButton -> v
-    net.minecraft.realms.RealmsButton spawnMonstersButton -> w
-    net.minecraft.realms.RealmsButton spawnNPCsButton -> x
-    net.minecraft.realms.RealmsSliderButton spawnProtectionButton -> y
-    net.minecraft.realms.RealmsButton commandBlocksButton -> z
-    net.minecraft.realms.RealmsButton forceGameModeButton -> A
-    java.lang.String[] difficulties -> b
-    java.lang.String[] gameModes -> c
-    java.lang.String[][] gameModeHints -> d
-    net.minecraft.realms.RealmsLabel titleLabel -> B
-    net.minecraft.realms.RealmsLabel warningLabel -> C
-    66:71:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,com.mojang.realmsclient.dto.RealmsWorldOptions,com.mojang.realmsclient.dto.RealmsServer$WorldType,int) -> <init>
-    75:76:void removed() -> removed
-    80:81:void tick() -> tick
-    85:90:boolean keyPressed(int,int,int) -> keyPressed
-    95:239:void init() -> init
-    242:260:void createDifficultyAndGameMode() -> a
-    263:264:java.lang.String difficultyTitle() -> b
-    268:269:java.lang.String gameModeTitle() -> c
-    273:273:java.lang.String pvpTitle() -> d
-    277:277:java.lang.String spawnAnimalsTitle() -> e
-    281:284:java.lang.String spawnMonstersTitle() -> f
-    289:289:java.lang.String spawnNPCsTitle() -> g
-    293:293:java.lang.String commandBlocksTitle() -> h
-    297:297:java.lang.String forceGameModeTitle() -> i
-    302:316:void render(int,int,float) -> render
-    339:342:java.lang.String getSlotName() -> j
-    347:352:void saveSettings() -> k
-    14:14:java.lang.Boolean access$002(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,java.lang.Boolean) -> a
-    14:14:java.lang.Boolean access$000(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> a
-    14:14:java.lang.String access$100(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> b
-    14:14:int access$202(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int) -> a
-    14:14:int access$200(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> c
-    14:14:java.lang.String access$300(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> d
-    14:14:java.lang.Boolean access$402(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,java.lang.Boolean) -> b
-    14:14:java.lang.Boolean access$400(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> e
-    14:14:java.lang.String access$500(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> f
-    14:14:int access$602(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int) -> b
-    14:14:int access$600(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> g
-    14:14:java.lang.String access$700(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> h
-    14:14:com.mojang.realmsclient.dto.RealmsServer$WorldType access$800(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> i
-    14:14:net.minecraft.realms.RealmsButton access$900(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> j
-    14:14:java.lang.String access$1000(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> k
-    14:14:java.lang.Boolean access$1102(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,java.lang.Boolean) -> c
-    14:14:java.lang.Boolean access$1100(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> l
-    14:14:java.lang.Boolean access$1202(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,java.lang.Boolean) -> d
-    14:14:java.lang.Boolean access$1200(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> m
-    14:14:java.lang.String access$1300(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> n
-    14:14:java.lang.Boolean access$1402(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,java.lang.Boolean) -> e
-    14:14:java.lang.Boolean access$1400(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> o
-    14:14:java.lang.String access$1500(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> p
-    14:14:java.lang.Boolean access$1602(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,java.lang.Boolean) -> f
-    14:14:java.lang.Boolean access$1600(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> q
-    14:14:java.lang.String access$1700(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> r
-    14:14:void access$1800(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> s
-    14:14:net.minecraft.realms.RealmsSliderButton access$1900(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> t
-    14:14:java.lang.Integer access$2002(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,java.lang.Integer) -> a
-    14:14:java.lang.Integer access$2000(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> u
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$1 -> dal$1:
+    net.minecraft.client.gui.components.Button doneButton -> c
+    net.minecraft.client.gui.components.EditBox descEdit -> p
+    net.minecraft.client.gui.components.EditBox nameEdit -> q
+    net.minecraft.realms.RealmsLabel titleLabel -> r
+    26:29:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
+    33:37:void tick() -> d
+    41:82:void init() -> b
+    86:87:void removed() -> e
+    91:95:boolean keyPressed(int,int,int) -> a
+    100:111:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    114:115:void save() -> a
+    51:64:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
+    55:60:void lambda$null$2(boolean) -> c
+    47:47:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    45:45:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
+com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen -> dkj:
+    net.minecraft.network.chat.Component[] DIFFICULTIES -> a
+    net.minecraft.network.chat.Component[] GAME_MODES -> b
+    net.minecraft.network.chat.TranslatableComponent TEXT_ON -> p
+    net.minecraft.network.chat.TranslatableComponent TEXT_OFF -> q
+    net.minecraft.client.gui.components.EditBox nameEdit -> r
+    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen parent -> c
+    int column1X -> s
+    int columnWidth -> t
+    int column2X -> u
+    com.mojang.realmsclient.dto.RealmsWorldOptions options -> v
+    com.mojang.realmsclient.dto.RealmsServer$WorldType worldType -> w
+    int activeSlot -> x
+    int difficulty -> y
+    int gameMode -> z
+    java.lang.Boolean pvp -> A
+    java.lang.Boolean spawnNPCs -> B
+    java.lang.Boolean spawnAnimals -> C
+    java.lang.Boolean spawnMonsters -> D
+    java.lang.Integer spawnProtection -> E
+    java.lang.Boolean commandBlocks -> F
+    java.lang.Boolean forceGameMode -> G
+    net.minecraft.client.gui.components.Button pvpButton -> H
+    net.minecraft.client.gui.components.Button spawnAnimalsButton -> I
+    net.minecraft.client.gui.components.Button spawnMonstersButton -> J
+    net.minecraft.client.gui.components.Button spawnNPCsButton -> K
+    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$SettingsSlider spawnProtectionButton -> L
+    net.minecraft.client.gui.components.Button commandBlocksButton -> M
+    net.minecraft.client.gui.components.Button forceGameModeButton -> N
+    net.minecraft.realms.RealmsLabel titleLabel -> O
+    net.minecraft.realms.RealmsLabel warningLabel -> P
+    67:72:void <init>(com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen,com.mojang.realmsclient.dto.RealmsWorldOptions,com.mojang.realmsclient.dto.RealmsServer$WorldType,int) -> <init>
+    76:77:void removed() -> e
+    81:82:void tick() -> d
+    86:90:boolean keyPressed(int,int,int) -> a
+    95:202:void init() -> b
+    205:205:net.minecraft.network.chat.Component difficultyTitle() -> i
+    209:209:net.minecraft.network.chat.Component gameModeTitle() -> k
+    213:213:net.minecraft.network.chat.Component pvpTitle() -> l
+    217:217:net.minecraft.network.chat.Component spawnAnimalsTitle() -> m
+    221:224:net.minecraft.network.chat.Component spawnMonstersTitle() -> n
+    229:229:net.minecraft.network.chat.Component spawnNPCsTitle() -> v
+    233:233:net.minecraft.network.chat.Component commandBlocksTitle() -> w
+    237:237:net.minecraft.network.chat.Component forceGameModeTitle() -> x
+    241:241:net.minecraft.network.chat.Component getOnOff(boolean) -> c
+    246:260:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    303:306:java.lang.String getSlotName() -> y
+    311:316:void saveSettings() -> z
+    195:195:void lambda$init$9(net.minecraft.client.gui.components.Button) -> a
+    194:194:void lambda$init$8(net.minecraft.client.gui.components.Button) -> b
+    176:178:void lambda$init$7(net.minecraft.client.gui.components.Button) -> c
+    172:174:void lambda$init$6(net.minecraft.client.gui.components.Button) -> d
+    167:169:void lambda$init$5(net.minecraft.client.gui.components.Button) -> e
+    161:163:void lambda$init$4(net.minecraft.client.gui.components.Button) -> f
+    152:159:void lambda$init$3(net.minecraft.client.gui.components.Button) -> g
+    147:149:void lambda$init$2(net.minecraft.client.gui.components.Button) -> h
+    143:145:void lambda$init$1(net.minecraft.client.gui.components.Button) -> i
+    138:140:void lambda$init$0(net.minecraft.client.gui.components.Button) -> j
+    19:19:com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$SettingsSlider access$000(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> a
+    19:19:java.lang.Integer access$102(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,java.lang.Integer) -> a
+    19:19:java.lang.Integer access$100(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen) -> b
+    20:32:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$SettingsSlider -> dkj$a:
+    double minValue -> c
+    double maxValue -> d
     com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    139:139:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    142:144:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$10 -> dal$2:
-    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    227:227:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    230:231:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$2 -> dal$3:
-    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    147:147:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    150:152:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$3 -> dal$4:
-    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    154:154:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    157:159:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$4 -> dal$5:
-    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    162:162:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    165:172:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$5 -> dal$6:
-    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    174:174:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    177:179:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$6 -> dal$7:
-    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    183:183:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    186:188:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$7 -> dal$8:
-    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    191:191:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    194:196:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$8 -> dal$9:
-    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    198:198:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    201:203:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$9 -> dal$10:
-    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    221:221:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    224:225:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen$SettingsSlider -> dal$a:
-    com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen this$0 -> a
-    319:321:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,int,float,float) -> <init>
-    325:330:void applyValue() -> applyValue
-    334:334:java.lang.String getMessage() -> getMessage
-com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen -> dam:
+    266:275:void <init>(com.mojang.realmsclient.gui.screens.RealmsSlotOptionsScreen,int,int,int,int,float,float) -> <init>
+    279:284:void applyValue() -> a
+    288:289:void updateMessage() -> b
+    294:294:void onClick(double,double) -> a
+    299:299:void onRelease(double,double) -> a_
+com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen -> dkk:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.realms.RealmsScreen lastScreen -> b
+    net.minecraft.client.gui.screens.Screen lastScreen -> b
     com.mojang.realmsclient.dto.RealmsServer serverData -> c
-    net.minecraft.realms.RealmsScreen mainScreen -> d
-    int BUTTON_BACK_ID -> e
-    int BUTTON_DELETE_ID -> f
-    int BUTTON_SUBSCRIPTION_ID -> g
-    java.lang.String subscriptionTitle -> h
-    java.lang.String subscriptionStartLabelText -> i
-    java.lang.String timeLeftLabelText -> j
-    java.lang.String daysLeftLabelText -> k
-    int daysLeft -> l
-    java.lang.String startDate -> m
-    com.mojang.realmsclient.dto.Subscription$SubscriptionType type -> n
-    java.lang.String PURCHASE_LINK -> o
-    30:52:void <init>(net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.dto.RealmsServer,net.minecraft.realms.RealmsScreen) -> <init>
-    56:89:void init() -> init
-    92:104:void getSubscription(long) -> a
-    108:129:void confirmResult(boolean,int) -> confirmResult
-    132:135:java.lang.String localPresentation(long) -> b
-    140:141:void removed() -> removed
-    145:149:boolean keyPressed(int,int,int) -> keyPressed
-    154:171:void render(int,int,float) -> render
-    174:207:java.lang.String daysLeftPresentation(int) -> a
-    23:23:com.mojang.realmsclient.dto.RealmsServer access$000(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen) -> a
-    23:23:net.minecraft.realms.RealmsScreen access$100(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen) -> b
-    23:23:org.apache.logging.log4j.Logger access$200() -> a
-    23:23:net.minecraft.realms.RealmsScreen access$300(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen) -> c
-    24:24:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen$1 -> dam$1:
+    net.minecraft.client.gui.screens.Screen mainScreen -> p
+    java.lang.String subscriptionTitle -> q
+    java.lang.String subscriptionStartLabelText -> r
+    java.lang.String timeLeftLabelText -> s
+    java.lang.String daysLeftLabelText -> t
+    int daysLeft -> u
+    java.lang.String startDate -> v
+    com.mojang.realmsclient.dto.Subscription$SubscriptionType type -> w
+    45:53:void <init>(net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.dto.RealmsServer,net.minecraft.client.gui.screens.Screen) -> <init>
+    57:78:void init() -> b
+    81:99:void deleteRealm(boolean) -> c
+    102:112:void getSubscription(long) -> a
+    115:118:java.lang.String localPresentation(long) -> b
+    123:124:void removed() -> e
+    128:132:boolean keyPressed(int,int,int) -> a
+    137:154:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    157:190:java.lang.String daysLeftPresentation(int) -> a
+    73:76:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    69:69:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    64:67:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
+    27:27:com.mojang.realmsclient.dto.RealmsServer access$000(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen) -> a
+    27:27:org.apache.logging.log4j.Logger access$100() -> a
+    27:27:net.minecraft.client.Minecraft access$200(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen) -> b
+    27:27:net.minecraft.client.gui.screens.Screen access$300(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen) -> c
+    27:27:net.minecraft.client.Minecraft access$400(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen) -> d
+    28:28:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen$1 -> dkk$1:
     com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen this$0 -> a
-    62:62:void <init>(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen,int,int,int,java.lang.String) -> <init>
-    66:69:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen$2 -> dam$2:
-    com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen this$0 -> a
-    72:72:void <init>(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen,int,int,int,java.lang.String) -> <init>
-    75:76:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen$3 -> dam$3:
-    com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen this$0 -> a
-    80:80:void <init>(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen,int,int,int,java.lang.String) -> <init>
-    83:86:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen$4 -> dam$4:
-    com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen this$0 -> a
-    109:109:void <init>(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen,java.lang.String) -> <init>
-    113:124:void run() -> run
-com.mojang.realmsclient.gui.screens.RealmsTermsScreen -> dan:
+    82:82:void <init>(com.mojang.realmsclient.gui.screens.RealmsSubscriptionInfoScreen,java.lang.String) -> <init>
+    86:94:void run() -> run
+    93:93:void lambda$run$0() -> a
+com.mojang.realmsclient.gui.screens.RealmsTermsScreen -> dkl:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.realms.RealmsScreen lastScreen -> b
+    net.minecraft.client.gui.screens.Screen lastScreen -> b
     com.mojang.realmsclient.RealmsMainScreen mainScreen -> c
-    com.mojang.realmsclient.dto.RealmsServer realmsServer -> d
-    net.minecraft.realms.RealmsButton agreeButton -> e
-    boolean onLink -> f
-    java.lang.String realmsToSUrl -> g
-    30:36:void <init>(net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
-    40:58:void init() -> init
-    62:63:void removed() -> removed
-    67:71:boolean keyPressed(int,int,int) -> keyPressed
-    75:84:void agreedToTos() -> a
-    88:94:boolean mouseClicked(double,double,int) -> mouseClicked
-    99:119:void render(int,int,float) -> render
-    19:19:void access$000(com.mojang.realmsclient.gui.screens.RealmsTermsScreen) -> a
-    19:19:net.minecraft.realms.RealmsScreen access$100(com.mojang.realmsclient.gui.screens.RealmsTermsScreen) -> b
-    20:20:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsTermsScreen$1 -> dan$1:
-    com.mojang.realmsclient.gui.screens.RealmsTermsScreen this$0 -> a
-    46:46:void <init>(com.mojang.realmsclient.gui.screens.RealmsTermsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    49:50:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsTermsScreen$2 -> dan$2:
-    com.mojang.realmsclient.gui.screens.RealmsTermsScreen this$0 -> a
-    52:52:void <init>(com.mojang.realmsclient.gui.screens.RealmsTermsScreen,int,int,int,int,int,java.lang.String) -> <init>
-    55:56:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsUploadScreen -> dao:
+    com.mojang.realmsclient.dto.RealmsServer realmsServer -> p
+    boolean onLink -> q
+    java.lang.String realmsToSUrl -> r
+    29:35:void <init>(net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
+    39:45:void init() -> b
+    49:50:void removed() -> e
+    54:58:boolean keyPressed(int,int,int) -> a
+    62:69:void agreedToTos() -> i
+    73:79:boolean mouseClicked(double,double,int) -> a
+    84:104:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    44:44:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    43:43:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+    22:22:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.RealmsUploadScreen -> dkm:
     org.apache.logging.log4j.Logger LOGGER -> a
-    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen lastScreen -> b
-    net.minecraft.realms.RealmsLevelSummary selectedLevel -> c
-    long worldId -> d
-    int slotId -> e
-    com.mojang.realmsclient.client.UploadStatus uploadStatus -> f
-    com.google.common.util.concurrent.RateLimiter narrationRateLimiter -> g
-    java.lang.String errorMessage -> h
-    java.lang.String status -> i
-    java.lang.String progress -> j
-    boolean cancelled -> k
-    boolean uploadFinished -> l
-    boolean showDots -> m
-    boolean uploadStarted -> n
-    net.minecraft.realms.RealmsButton backButton -> o
-    net.minecraft.realms.RealmsButton cancelButton -> p
-    int animTick -> q
-    java.lang.String[] DOTS -> r
-    int dotIndex -> s
-    java.lang.Long previousWrittenBytes -> t
-    java.lang.Long previousTimeSnapshot -> u
-    long bytesPersSecond -> v
-    java.util.concurrent.locks.ReentrantLock uploadLock -> w
-    57:81:void <init>(long,int,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,net.minecraft.realms.RealmsLevelSummary) -> <init>
-    85:107:void init() -> init
-    111:116:void confirmResult(boolean,int) -> confirmResult
-    120:121:void removed() -> removed
-    124:125:void onBack() -> a
-    128:130:void onCancel() -> b
-    134:142:boolean keyPressed(int,int,int) -> keyPressed
-    147:174:void render(int,int,float) -> render
-    177:184:void drawDots() -> c
-    187:218:void drawProgressBar() -> d
-    221:236:void drawUploadSpeed() -> e
-    239:244:void drawUploadSpeed0(long) -> c
-    247:253:java.lang.String humanReadableByteCount(long) -> a
-    258:275:void tick() -> tick
-    287:297:com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit getLargestUnit(long) -> b
-    302:306:double convertToUnit(long,com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit) -> a
-    310:310:java.lang.String humanReadableSize(long,com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit) -> b
-    314:442:void upload() -> f
-    445:447:void uploadCancelled() -> g
-    450:450:boolean verify(java.io.File) -> a
-    454:466:java.io.File tarGzipArchive(java.io.File) -> b
-    470:492:void addFileToTarGz(org.apache.commons.compress.archivers.tar.TarArchiveOutputStream,java.lang.String,java.lang.String,boolean) -> a
-    317:441:void lambda$upload$1() -> h
-    390:402:void lambda$null$0(long,com.mojang.realmsclient.gui.screens.UploadResult) -> a
-    39:39:void access$000(com.mojang.realmsclient.gui.screens.RealmsUploadScreen) -> a
-    39:39:void access$100(com.mojang.realmsclient.gui.screens.RealmsUploadScreen) -> b
-    40:72:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.RealmsUploadScreen$1 -> dao$1:
-    com.mojang.realmsclient.gui.screens.RealmsUploadScreen this$0 -> a
-    87:87:void <init>(com.mojang.realmsclient.gui.screens.RealmsUploadScreen,int,int,int,int,int,java.lang.String) -> <init>
-    90:91:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsUploadScreen$2 -> dao$2:
-    com.mojang.realmsclient.gui.screens.RealmsUploadScreen this$0 -> a
-    93:93:void <init>(com.mojang.realmsclient.gui.screens.RealmsUploadScreen,int,int,int,int,int,java.lang.String) -> <init>
-    96:97:void onPress() -> onPress
-com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit -> dao$a:
-    com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit B -> a
-    com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit KB -> b
-    com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit MB -> c
-    com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit GB -> d
-    com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit[] $VALUES -> e
-    277:277:com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit[] values() -> values
-    277:277:com.mojang.realmsclient.gui.screens.RealmsUploadScreen$Unit valueOf(java.lang.String) -> valueOf
-    277:277:void <init>(java.lang.String,int) -> <init>
-    277:281:void <clinit>() -> <clinit>
-com.mojang.realmsclient.gui.screens.UploadResult -> dap:
+    java.util.concurrent.locks.ReentrantLock UPLOAD_LOCK -> b
+    java.lang.String[] DOTS -> c
+    com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen lastScreen -> p
+    net.minecraft.world.level.storage.LevelSummary selectedLevel -> q
+    long worldId -> r
+    int slotId -> s
+    com.mojang.realmsclient.client.UploadStatus uploadStatus -> t
+    com.google.common.util.concurrent.RateLimiter narrationRateLimiter -> u
+    net.minecraft.network.chat.Component[] errorMessage -> v
+    net.minecraft.network.chat.Component status -> w
+    java.lang.String progress -> x
+    boolean cancelled -> y
+    boolean uploadFinished -> z
+    boolean showDots -> A
+    boolean uploadStarted -> B
+    net.minecraft.client.gui.components.Button backButton -> C
+    net.minecraft.client.gui.components.Button cancelButton -> D
+    int tickCount -> E
+    java.lang.Long previousWrittenBytes -> F
+    java.lang.Long previousTimeSnapshot -> G
+    long bytesPersSecond -> H
+    java.lang.Runnable callback -> I
+    64:87:void <init>(long,int,com.mojang.realmsclient.gui.screens.RealmsResetWorldScreen,net.minecraft.world.level.storage.LevelSummary,java.lang.Runnable) -> <init>
+    91:109:void init() -> b
+    113:114:void removed() -> e
+    117:118:void onBack() -> i
+    121:123:void onCancel() -> k
+    127:135:boolean keyPressed(int,int,int) -> a
+    140:165:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    168:171:void drawDots(com.mojang.blaze3d.vertex.PoseStack) -> b
+    174:206:void drawProgressBar(com.mojang.blaze3d.vertex.PoseStack) -> c
+    209:224:void drawUploadSpeed(com.mojang.blaze3d.vertex.PoseStack) -> d
+    227:232:void drawUploadSpeed0(com.mojang.blaze3d.vertex.PoseStack,long) -> a
+    236:253:void tick() -> d
+    256:391:void upload() -> l
+    394:395:void setErrorMessage(net.minecraft.network.chat.Component[]) -> a
+    398:400:void uploadCancelled() -> m
+    403:403:boolean verify(java.io.File) -> a
+    407:419:java.io.File tarGzipArchive(java.io.File) -> b
+    423:445:void addFileToTarGz(org.apache.commons.compress.archivers.tar.TarArchiveOutputStream,java.lang.String,java.lang.String,boolean) -> a
+    259:390:void lambda$upload$4() -> n
+    339:351:void lambda$null$3(long,com.mojang.realmsclient.gui.screens.UploadResult) -> a
+    101:106:void lambda$init$2() -> v
+    94:94:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    93:93:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+    47:50:void <clinit>() -> <clinit>
+com.mojang.realmsclient.gui.screens.UploadResult -> dkn:
     int statusCode -> a
     java.lang.String errorMessage -> b
     7:10:void <init>(int,java.lang.String) -> <init>
-com.mojang.realmsclient.gui.screens.UploadResult$Builder -> dap$a:
+    3:3:void <init>(int,java.lang.String,com.mojang.realmsclient.gui.screens.UploadResult$1) -> <init>
+com.mojang.realmsclient.gui.screens.UploadResult$1 -> dkn$1:
+com.mojang.realmsclient.gui.screens.UploadResult$Builder -> dkn$a:
     int statusCode -> a
     java.lang.String errorMessage -> b
     12:13:void <init>() -> <init>
     17:18:com.mojang.realmsclient.gui.screens.UploadResult$Builder withStatusCode(int) -> a
     22:23:com.mojang.realmsclient.gui.screens.UploadResult$Builder withErrorMessage(java.lang.String) -> a
     27:27:com.mojang.realmsclient.gui.screens.UploadResult build() -> a
-com.mojang.realmsclient.util.JsonUtils -> daq:
+com.mojang.realmsclient.util.JsonUtils -> dko:
     10:14:java.lang.String getStringOr(java.lang.String,com.google.gson.JsonObject,java.lang.String) -> a
     19:23:int getIntOr(java.lang.String,com.google.gson.JsonObject,int) -> a
     28:32:long getLongOr(java.lang.String,com.google.gson.JsonObject,long) -> a
     37:41:boolean getBooleanOr(java.lang.String,com.google.gson.JsonObject,boolean) -> a
     46:50:java.util.Date getDateOr(java.lang.String,com.google.gson.JsonObject) -> a
-com.mojang.realmsclient.util.RealmsPersistence -> dar:
-    14:20:com.mojang.realmsclient.util.RealmsPersistence$RealmsPersistenceData readFile() -> a
-    25:34:void writeFile(com.mojang.realmsclient.util.RealmsPersistence$RealmsPersistenceData) -> a
-com.mojang.realmsclient.util.RealmsPersistence$1 -> dar$1:
-com.mojang.realmsclient.util.RealmsPersistence$RealmsPersistenceData -> dar$a:
+com.mojang.realmsclient.util.RealmsPersistence -> dkp:
+    com.mojang.realmsclient.dto.GuardedSerializer GSON -> a
+    18:23:com.mojang.realmsclient.util.RealmsPersistence$RealmsPersistenceData readFile() -> a
+    28:34:void writeFile(com.mojang.realmsclient.util.RealmsPersistence$RealmsPersistenceData) -> a
+    37:37:java.io.File getPathToData() -> b
+    15:15:void <clinit>() -> <clinit>
+com.mojang.realmsclient.util.RealmsPersistence$RealmsPersistenceData -> dkp$a:
     java.lang.String newsLink -> a
     boolean hasUnreadNews -> b
-    40:41:void <init>() -> <init>
-    36:36:void <init>(com.mojang.realmsclient.util.RealmsPersistence$1) -> <init>
-com.mojang.realmsclient.util.RealmsTasks -> das:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    41:45:void pause(int) -> b
-    34:34:void access$000(int) -> a
-    34:34:org.apache.logging.log4j.Logger access$100() -> a
-    35:35:void <clinit>() -> <clinit>
-com.mojang.realmsclient.util.RealmsTasks$CloseServerTask -> das$a:
-    com.mojang.realmsclient.dto.RealmsServer serverData -> b
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen configureScreen -> c
-    107:110:void <init>(com.mojang.realmsclient.dto.RealmsServer,com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen) -> <init>
-    114:143:void run() -> run
-com.mojang.realmsclient.util.RealmsTasks$DownloadTask -> das$b:
-    long worldId -> b
-    int slot -> c
-    net.minecraft.realms.RealmsScreen lastScreen -> d
-    java.lang.String downloadName -> e
-    593:598:void <init>(long,int,java.lang.String,net.minecraft.realms.RealmsScreen) -> <init>
-    602:638:void run() -> run
-com.mojang.realmsclient.util.RealmsTasks$OpenServerTask -> das$c:
-    com.mojang.realmsclient.dto.RealmsServer serverData -> b
-    net.minecraft.realms.RealmsScreen returnScreen -> c
-    boolean join -> d
-    net.minecraft.realms.RealmsScreen mainScreen -> e
-    53:58:void <init>(com.mojang.realmsclient.dto.RealmsServer,net.minecraft.realms.RealmsScreen,net.minecraft.realms.RealmsScreen,boolean) -> <init>
-    62:100:void run() -> run
-com.mojang.realmsclient.util.RealmsTasks$RealmsConnectTask -> das$d:
-    net.minecraft.realms.RealmsConnect realmsConnect -> b
-    com.mojang.realmsclient.dto.RealmsServerAddress a -> c
-    427:430:void <init>(net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.dto.RealmsServerAddress) -> <init>
-    434:438:void run() -> run
-    442:444:void abortTask() -> d
-    448:449:void tick() -> b
-com.mojang.realmsclient.util.RealmsTasks$RealmsGetServerDetailsTask -> das$e:
-    com.mojang.realmsclient.dto.RealmsServer server -> b
-    net.minecraft.realms.RealmsScreen lastScreen -> c
-    com.mojang.realmsclient.RealmsMainScreen mainScreen -> d
-    java.util.concurrent.locks.ReentrantLock connectLock -> e
-    322:327:void <init>(com.mojang.realmsclient.RealmsMainScreen,net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.dto.RealmsServer,java.util.concurrent.locks.ReentrantLock) -> <init>
-    331:411:void run() -> run
-    415:419:void sleep(int) -> a
-com.mojang.realmsclient.util.RealmsTasks$ResettingWorldTask -> das$f:
-    java.lang.String seed -> b
-    com.mojang.realmsclient.dto.WorldTemplate worldTemplate -> c
-    int levelType -> d
-    boolean generateStructures -> e
-    long serverId -> f
-    net.minecraft.realms.RealmsScreen lastScreen -> g
-    int confirmationId -> h
-    java.lang.String title -> i
-    242:253:void <init>(long,net.minecraft.realms.RealmsScreen,com.mojang.realmsclient.dto.WorldTemplate) -> <init>
-    242:262:void <init>(long,net.minecraft.realms.RealmsScreen,java.lang.String,int,boolean) -> <init>
-    265:266:void setConfirmationId(int) -> a
-    269:270:void setResetTitle(java.lang.String) -> c
-    274:313:void run() -> run
-com.mojang.realmsclient.util.RealmsTasks$RestoreTask -> das$g:
-    com.mojang.realmsclient.dto.Backup backup -> b
-    long worldId -> c
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen lastScreen -> d
-    540:544:void <init>(com.mojang.realmsclient.dto.Backup,long,com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen) -> <init>
-    548:584:void run() -> run
-com.mojang.realmsclient.util.RealmsTasks$SwitchMinigameTask -> das$h:
-    long worldId -> b
-    com.mojang.realmsclient.dto.WorldTemplate worldTemplate -> c
-    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen lastScreen -> d
-    197:201:void <init>(long,com.mojang.realmsclient.dto.WorldTemplate,com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen) -> <init>
-    205:232:void run() -> run
-com.mojang.realmsclient.util.RealmsTasks$SwitchSlotTask -> das$i:
-    long worldId -> b
-    int slot -> c
-    net.minecraft.realms.RealmsConfirmResultListener listener -> d
-    int confirmId -> e
-    152:157:void <init>(long,int,net.minecraft.realms.RealmsConfirmResultListener,int) -> <init>
-    161:189:void run() -> run
-com.mojang.realmsclient.util.RealmsTasks$WorldCreationTask -> das$j:
-    java.lang.String name -> b
-    java.lang.String motd -> c
-    long worldId -> d
-    net.minecraft.realms.RealmsScreen lastScreen -> e
-    458:463:void <init>(long,java.lang.String,java.lang.String,net.minecraft.realms.RealmsScreen) -> <init>
-    467:487:void run() -> run
-com.mojang.realmsclient.util.RealmsTextureManager -> dat:
-    java.util.Map textures -> a
-    java.util.Map skinFetchStatus -> b
-    java.util.Map fetchedSkins -> c
+    40:40:void <init>() -> <init>
+com.mojang.realmsclient.util.RealmsTextureManager -> dkq:
+    java.util.Map TEXTURES -> a
+    java.util.Map SKIN_FETCH_STATUS -> b
+    java.util.Map FETCHED_SKINS -> c
     org.apache.logging.log4j.Logger LOGGER -> d
+    net.minecraft.resources.ResourceLocation TEMPLATE_ICON_LOCATION -> e
     42:50:void bindWorldTemplate(java.lang.String,java.lang.String) -> a
     53:60:void withBoundFace(java.lang.String,java.lang.Runnable) -> a
     63:64:void bindDefaultFace(java.util.UUID) -> a
-    67:150:void bindFace(java.lang.String) -> a
-    155:202:int getTextureId(java.lang.String,java.lang.String) -> b
-    31:31:org.apache.logging.log4j.Logger access$000() -> a
-    31:31:java.util.Map access$100() -> b
-    31:31:java.util.Map access$200() -> c
-    32:36:void <clinit>() -> <clinit>
-com.mojang.realmsclient.util.RealmsTextureManager$1 -> dat$1:
+    67:151:void bindFace(java.lang.String) -> a
+    156:203:int getTextureId(java.lang.String,java.lang.String) -> b
+    33:33:org.apache.logging.log4j.Logger access$100() -> a
+    33:33:java.util.Map access$200() -> b
+    33:33:java.util.Map access$300() -> c
+    34:39:void <clinit>() -> <clinit>
+com.mojang.realmsclient.util.RealmsTextureManager$1 -> dkq$1:
     java.lang.String val$uuid -> a
     92:92:void <init>(java.lang.String,java.lang.String) -> <init>
-    95:145:void run() -> run
-com.mojang.realmsclient.util.RealmsTextureManager$RealmsTexture -> dat$a:
+    95:146:void run() -> run
+com.mojang.realmsclient.util.RealmsTextureManager$RealmsTexture -> dkq$a:
     java.lang.String image -> a
     int textureId -> b
-    209:212:void <init>(java.lang.String,int) -> <init>
-com.mojang.realmsclient.util.RealmsUtil -> dau:
-    com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService authenticationService -> b
-    com.mojang.authlib.minecraft.MinecraftSessionService sessionService -> c
+    210:213:void <init>(java.lang.String,int) -> <init>
+    206:206:int access$000(com.mojang.realmsclient.util.RealmsTextureManager$RealmsTexture) -> a
+    206:206:java.lang.String access$400(com.mojang.realmsclient.util.RealmsTextureManager$RealmsTexture) -> b
+com.mojang.realmsclient.util.RealmsUtil -> dkr:
+    com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService AUTHENTICATION_SERVICE -> b
+    com.mojang.authlib.minecraft.MinecraftSessionService SESSION_SERVICE -> c
     com.google.common.cache.LoadingCache gameProfileCache -> a
-    38:39:java.lang.String uuidToName(java.lang.String) -> a
-    44:47:java.util.Map getTextures(java.lang.String) -> b
-    52:53:void browseTo(java.lang.String) -> c
-    60:82:java.lang.String convertToAgePresentation(java.lang.Long) -> a
-    18:18:com.mojang.authlib.minecraft.MinecraftSessionService access$000() -> a
-    19:24:void <clinit>() -> <clinit>
-com.mojang.realmsclient.util.RealmsUtil$1 -> dau$1:
-    24:24:void <init>() -> <init>
-    27:32:com.mojang.authlib.GameProfile load(java.lang.String) -> a
-    24:24:java.lang.Object load(java.lang.Object) -> load
-com.mojang.realmsclient.util.SkinProcessor -> dav:
+    39:40:java.lang.String uuidToName(java.lang.String) -> a
+    45:48:java.util.Map getTextures(java.lang.String) -> b
+    57:79:java.lang.String convertToAgePresentation(long) -> a
+    83:83:java.lang.String convertToAgePresentationFromInstant(java.util.Date) -> a
+    19:19:com.mojang.authlib.minecraft.MinecraftSessionService access$000() -> a
+    20:25:void <clinit>() -> <clinit>
+com.mojang.realmsclient.util.RealmsUtil$1 -> dkr$1:
+    25:25:void <init>() -> <init>
+    28:33:com.mojang.authlib.GameProfile load(java.lang.String) -> a
+    25:25:java.lang.Object load(java.lang.Object) -> load
+com.mojang.realmsclient.util.SkinProcessor -> dks:
     int[] pixels -> a
     int width -> b
     int height -> c
-    9:9:void <init>() -> <init>
-    15:60:java.awt.image.BufferedImage process(java.awt.image.BufferedImage) -> a
-    64:78:void doLegacyTransparencyHack(int,int,int,int) -> a
-    81:86:void setNoAlpha(int,int,int,int) -> b
-com.mojang.realmsclient.util.TextRenderingUtils -> daw:
-    111:111:java.util.List lineBreak(java.lang.String) -> a
-    119:119:java.util.List decompose(java.lang.String,com.mojang.realmsclient.util.TextRenderingUtils$LineSegment[]) -> a
-    123:124:java.util.List decompose(java.lang.String,java.util.List) -> a
-    128:142:java.util.List insertLinks(java.util.List,java.util.List) -> a
-    146:161:java.util.List split(java.lang.String,java.lang.String) -> a
-com.mojang.realmsclient.util.TextRenderingUtils$Line -> daw$a:
+    10:10:void <init>() -> <init>
+    16:61:java.awt.image.BufferedImage process(java.awt.image.BufferedImage) -> a
+    65:79:void doLegacyTransparencyHack(int,int,int,int) -> a
+    82:87:void setNoAlpha(int,int,int,int) -> b
+com.mojang.realmsclient.util.TextRenderingUtils -> dkt:
+    122:122:java.util.List lineBreak(java.lang.String) -> a
+    130:130:java.util.List decompose(java.lang.String,com.mojang.realmsclient.util.TextRenderingUtils$LineSegment[]) -> a
+    134:135:java.util.List decompose(java.lang.String,java.util.List) -> a
+    139:153:java.util.List insertLinks(java.util.List,java.util.List) -> a
+    157:172:java.util.List split(java.lang.String,java.lang.String) -> a
+com.mojang.realmsclient.util.TextRenderingUtils$Line -> dkt$a:
     java.util.List segments -> a
-    20:22:void <init>(java.util.List) -> <init>
-    26:26:java.lang.String toString() -> toString
-    33:36:boolean equals(java.lang.Object) -> equals
-    41:41:int hashCode() -> hashCode
-com.mojang.realmsclient.util.TextRenderingUtils$LineSegment -> daw$b:
+    21:23:void <init>(java.util.List) -> <init>
+    27:27:java.lang.String toString() -> toString
+    34:41:boolean equals(java.lang.Object) -> equals
+    46:46:int hashCode() -> hashCode
+com.mojang.realmsclient.util.TextRenderingUtils$LineSegment -> dkt$b:
     java.lang.String fullText -> a
     java.lang.String linkTitle -> b
     java.lang.String linkUrl -> c
-    50:54:void <init>(java.lang.String) -> <init>
-    56:60:void <init>(java.lang.String,java.lang.String,java.lang.String) -> <init>
-    64:69:boolean equals(java.lang.Object) -> equals
-    74:74:int hashCode() -> hashCode
-    79:79:java.lang.String toString() -> toString
-    87:87:java.lang.String renderedText() -> a
-    91:91:boolean isLink() -> b
-    95:98:java.lang.String getLinkUrl() -> c
-    102:102:com.mojang.realmsclient.util.TextRenderingUtils$LineSegment link(java.lang.String,java.lang.String) -> a
-    106:106:com.mojang.realmsclient.util.TextRenderingUtils$LineSegment text(java.lang.String) -> a
-com.mojang.realmsclient.util.UploadTokenCache -> dax:
-    java.util.Map tokenCache -> a
-    11:11:java.lang.String get(long) -> a
-    15:16:void invalidate(long) -> b
-    19:20:void put(long,java.lang.String) -> a
-    8:8:void <clinit>() -> <clinit>
-net.minecraft.ChatFormatting -> g:
+    55:59:void <init>(java.lang.String) -> <init>
+    61:65:void <init>(java.lang.String,java.lang.String,java.lang.String) -> <init>
+    69:78:boolean equals(java.lang.Object) -> equals
+    83:83:int hashCode() -> hashCode
+    88:88:java.lang.String toString() -> toString
+    96:96:java.lang.String renderedText() -> a
+    100:100:boolean isLink() -> b
+    104:107:java.lang.String getLinkUrl() -> c
+    111:111:com.mojang.realmsclient.util.TextRenderingUtils$LineSegment link(java.lang.String,java.lang.String) -> a
+    116:116:com.mojang.realmsclient.util.TextRenderingUtils$LineSegment text(java.lang.String) -> a
+com.mojang.realmsclient.util.UploadTokenCache -> dku:
+    it.unimi.dsi.fastutil.longs.Long2ObjectMap TOKEN_CACHE -> a
+    10:10:java.lang.String get(long) -> a
+    14:15:void invalidate(long) -> b
+    18:19:void put(long,java.lang.String) -> a
+    7:7:void <clinit>() -> <clinit>
+com.mojang.realmsclient.util.task.CloseServerTask -> dkv:
+    com.mojang.realmsclient.dto.RealmsServer serverData -> c
+    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen configureScreen -> d
+    13:16:void <init>(com.mojang.realmsclient.dto.RealmsServer,com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen) -> <init>
+    20:49:void run() -> run
+com.mojang.realmsclient.util.task.ConnectTask -> dkw:
+    net.minecraft.realms.RealmsConnect realmsConnect -> c
+    com.mojang.realmsclient.dto.RealmsServerAddress address -> d
+    14:17:void <init>(net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.dto.RealmsServerAddress) -> <init>
+    21:25:void run() -> run
+    29:31:void abortTask() -> a
+    35:36:void tick() -> b
+com.mojang.realmsclient.util.task.DownloadTask -> dkx:
+    long worldId -> c
+    int slot -> d
+    net.minecraft.client.gui.screens.Screen lastScreen -> e
+    java.lang.String downloadName -> f
+    18:23:void <init>(long,int,java.lang.String,net.minecraft.client.gui.screens.Screen) -> <init>
+    27:63:void run() -> run
+    40:40:void lambda$run$0(boolean) -> a
+com.mojang.realmsclient.util.task.GetServerDetailsTask -> dky:
+    com.mojang.realmsclient.dto.RealmsServer server -> c
+    net.minecraft.client.gui.screens.Screen lastScreen -> d
+    com.mojang.realmsclient.RealmsMainScreen mainScreen -> e
+    java.util.concurrent.locks.ReentrantLock connectLock -> f
+    30:35:void <init>(com.mojang.realmsclient.RealmsMainScreen,net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.dto.RealmsServer,java.util.concurrent.locks.ReentrantLock) -> <init>
+    39:135:void run() -> run
+    139:143:void sleep(int) -> b
+    104:127:void lambda$run$2(com.mojang.realmsclient.dto.RealmsServerAddress,boolean) -> a
+    114:115:void lambda$null$1(com.mojang.realmsclient.dto.RealmsServerAddress) -> a
+    106:109:java.lang.Void lambda$null$0(java.lang.Throwable) -> a
+com.mojang.realmsclient.util.task.LongRunningTask -> dkz:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen -> b
+    12:12:void <init>() -> <init>
+    19:23:void pause(int) -> a
+    27:31:void setScreen(net.minecraft.client.gui.screens.Screen) -> a
+    34:35:void setScreen(com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen) -> a
+    39:40:void error(net.minecraft.network.chat.Component) -> a
+    43:44:void setTitle(java.lang.String) -> b
+    47:47:boolean aborted() -> c
+    52:52:void tick() -> b
+    55:55:void init() -> d
+    58:58:void abortTask() -> a
+    29:30:void lambda$setScreen$0(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.Screen) -> a
+    14:14:void <clinit>() -> <clinit>
+com.mojang.realmsclient.util.task.OpenServerTask -> dla:
+    com.mojang.realmsclient.dto.RealmsServer serverData -> c
+    net.minecraft.client.gui.screens.Screen returnScreen -> d
+    boolean join -> e
+    com.mojang.realmsclient.RealmsMainScreen mainScreen -> f
+    17:22:void <init>(com.mojang.realmsclient.dto.RealmsServer,net.minecraft.client.gui.screens.Screen,com.mojang.realmsclient.RealmsMainScreen,boolean) -> <init>
+    26:64:void run() -> run
+com.mojang.realmsclient.util.task.ResettingWorldTask -> dlb:
+    java.lang.String seed -> c
+    com.mojang.realmsclient.dto.WorldTemplate worldTemplate -> d
+    int levelType -> e
+    boolean generateStructures -> f
+    long serverId -> g
+    java.lang.String title -> h
+    java.lang.Runnable callback -> i
+    17:30:void <init>(java.lang.String,com.mojang.realmsclient.dto.WorldTemplate,int,boolean,long,java.lang.String,java.lang.Runnable) -> <init>
+    34:69:void run() -> run
+com.mojang.realmsclient.util.task.RestoreTask -> dlc:
+    com.mojang.realmsclient.dto.Backup backup -> c
+    long worldId -> d
+    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen lastScreen -> e
+    16:20:void <init>(com.mojang.realmsclient.dto.Backup,long,com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen) -> <init>
+    24:60:void run() -> run
+com.mojang.realmsclient.util.task.SwitchMinigameTask -> dld:
+    long worldId -> c
+    com.mojang.realmsclient.dto.WorldTemplate worldTemplate -> d
+    com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen lastScreen -> e
+    14:18:void <init>(long,com.mojang.realmsclient.dto.WorldTemplate,com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen) -> <init>
+    22:49:void run() -> run
+com.mojang.realmsclient.util.task.SwitchSlotTask -> dle:
+    long worldId -> c
+    int slot -> d
+    java.lang.Runnable callback -> e
+    12:16:void <init>(long,int,java.lang.Runnable) -> <init>
+    20:48:void run() -> run
+com.mojang.realmsclient.util.task.WorldCreationTask -> dlf:
+    java.lang.String name -> c
+    java.lang.String motd -> d
+    long worldId -> e
+    net.minecraft.client.gui.screens.Screen lastScreen -> f
+    14:19:void <init>(long,java.lang.String,java.lang.String,net.minecraft.client.gui.screens.Screen) -> <init>
+    23:37:void run() -> run
+net.minecraft.ChatFormatting -> i:
     net.minecraft.ChatFormatting BLACK -> a
     net.minecraft.ChatFormatting DARK_BLUE -> b
     net.minecraft.ChatFormatting DARK_GREEN -> c
@@ -4530,28 +4363,26 @@ net.minecraft.ChatFormatting -> g:
     net.minecraft.ChatFormatting[] $VALUES -> E
     14:14:net.minecraft.ChatFormatting[] values() -> values
     14:14:net.minecraft.ChatFormatting valueOf(java.lang.String) -> valueOf
-    43:43:java.lang.String cleanName(java.lang.String) -> d
+    43:43:java.lang.String cleanName(java.lang.String) -> c
     55:56:void <init>(java.lang.String,int,java.lang.String,char,int,java.lang.Integer) -> <init>
     59:60:void <init>(java.lang.String,int,java.lang.String,char,boolean) -> <init>
     62:70:void <init>(java.lang.String,int,java.lang.String,char,boolean,int,java.lang.Integer) -> <init>
-    73:93:java.lang.String getLastColors(java.lang.String) -> a
-    97:97:char getChar() -> a
-    101:101:int getId() -> b
-    105:105:boolean isFormat() -> c
-    109:109:boolean isColor() -> d
-    114:114:java.lang.Integer getColor() -> e
-    118:118:boolean shouldReset() -> f
-    122:122:java.lang.String getName() -> g
-    127:127:java.lang.String toString() -> toString
-    132:132:java.lang.String stripFormatting(java.lang.String) -> b
-    137:140:net.minecraft.ChatFormatting getByName(java.lang.String) -> c
-    145:153:net.minecraft.ChatFormatting getById(int) -> a
-    158:164:net.minecraft.ChatFormatting getByCode(char) -> a
-    168:180:java.util.Collection getNames(boolean,boolean) -> a
+    73:73:char getChar() -> a
+    77:77:int getId() -> b
+    81:81:boolean isFormat() -> c
+    85:85:boolean isColor() -> d
+    90:90:java.lang.Integer getColor() -> e
+    94:94:java.lang.String getName() -> f
+    99:99:java.lang.String toString() -> toString
+    104:104:java.lang.String stripFormatting(java.lang.String) -> a
+    109:112:net.minecraft.ChatFormatting getByName(java.lang.String) -> b
+    117:125:net.minecraft.ChatFormatting getById(int) -> a
+    130:136:net.minecraft.ChatFormatting getByCode(char) -> a
+    140:152:java.util.Collection getNames(boolean,boolean) -> a
     39:39:net.minecraft.ChatFormatting lambda$static$1(net.minecraft.ChatFormatting) -> a
     39:39:java.lang.String lambda$static$0(net.minecraft.ChatFormatting) -> b
     14:40:void <clinit>() -> <clinit>
-net.minecraft.CrashReport -> h:
+net.minecraft.CrashReport -> j:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.lang.String title -> b
     java.lang.Throwable exception -> c
@@ -4584,7 +4415,7 @@ net.minecraft.CrashReport -> h:
     42:42:java.lang.String lambda$initDetails$1() -> p
     41:41:java.lang.String lambda$initDetails$0() -> q
     23:23:void <clinit>() -> <clinit>
-net.minecraft.CrashReportCategory -> i:
+net.minecraft.CrashReportCategory -> k:
     net.minecraft.CrashReport report -> a
     java.lang.String title -> b
     java.util.List entries -> c
@@ -4603,45 +4434,46 @@ net.minecraft.CrashReportCategory -> i:
     164:164:java.lang.StackTraceElement[] getStacktrace() -> a
     168:173:void populateBlockDetails(net.minecraft.CrashReportCategory,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     172:172:java.lang.String lambda$populateBlockDetails$0(net.minecraft.core.BlockPos) -> b
-net.minecraft.CrashReportCategory$Entry -> i$a:
+net.minecraft.CrashReportCategory$Entry -> k$a:
     java.lang.String key -> a
     java.lang.String value -> b
     179:190:void <init>(java.lang.String,java.lang.Object) -> <init>
     193:193:java.lang.String getKey() -> a
     197:197:java.lang.String getValue() -> b
-net.minecraft.CrashReportDetail -> j:
-net.minecraft.DefaultUncaughtExceptionHandler -> k:
+net.minecraft.CrashReportDetail -> l:
+net.minecraft.DefaultUncaughtExceptionHandler -> m:
     org.apache.logging.log4j.Logger logger -> a
     8:10:void <init>(org.apache.logging.log4j.Logger) -> <init>
     14:15:void uncaughtException(java.lang.Thread,java.lang.Throwable) -> uncaughtException
-net.minecraft.DefaultUncaughtExceptionHandlerWithName -> l:
+net.minecraft.DefaultUncaughtExceptionHandlerWithName -> n:
     org.apache.logging.log4j.Logger logger -> a
     8:10:void <init>(org.apache.logging.log4j.Logger) -> <init>
     14:16:void uncaughtException(java.lang.Thread,java.lang.Throwable) -> uncaughtException
-net.minecraft.DetectedVersion -> m:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    java.lang.String id -> b
-    java.lang.String name -> c
-    boolean stable -> d
-    int worldVersion -> e
-    int protocolVersion -> f
-    int packVersion -> g
-    java.util.Date buildTime -> h
-    java.lang.String releaseTarget -> i
-    29:38:void <init>() -> <init>
-    40:49:void <init>(com.google.gson.JsonObject) -> <init>
-    52:62:com.mojang.bridge.game.GameVersion tryDetectVersion() -> a
-    68:68:java.lang.String getId() -> getId
-    73:73:java.lang.String getName() -> getName
-    78:78:java.lang.String getReleaseTarget() -> getReleaseTarget
-    83:83:int getWorldVersion() -> getWorldVersion
-    88:88:int getProtocolVersion() -> getProtocolVersion
-    93:93:int getPackVersion() -> getPackVersion
-    98:98:java.util.Date getBuildTime() -> getBuildTime
-    103:103:boolean isStable() -> isStable
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.FieldsAreNonnullByDefault -> n:
-net.minecraft.FileUtil -> o:
+net.minecraft.DetectedVersion -> o:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    com.mojang.bridge.game.GameVersion BUILT_IN -> a
+    java.lang.String id -> c
+    java.lang.String name -> d
+    boolean stable -> e
+    int worldVersion -> f
+    int protocolVersion -> g
+    int packVersion -> h
+    java.util.Date buildTime -> i
+    java.lang.String releaseTarget -> j
+    31:40:void <init>() -> <init>
+    42:51:void <init>(com.google.gson.JsonObject) -> <init>
+    54:64:com.mojang.bridge.game.GameVersion tryDetectVersion() -> a
+    70:70:java.lang.String getId() -> getId
+    75:75:java.lang.String getName() -> getName
+    80:80:java.lang.String getReleaseTarget() -> getReleaseTarget
+    85:85:int getWorldVersion() -> getWorldVersion
+    90:90:int getProtocolVersion() -> getProtocolVersion
+    95:95:int getPackVersion() -> getPackVersion
+    100:100:java.util.Date getBuildTime() -> getBuildTime
+    105:105:boolean isStable() -> isStable
+    18:20:void <clinit>() -> <clinit>
+net.minecraft.FieldsAreNonnullByDefault -> p:
+net.minecraft.FileUtil -> q:
     java.util.regex.Pattern COPY_COUNTER_PATTERN -> a
     java.util.regex.Pattern RESERVED_WINDOWS_FILENAMES -> b
     12:12:void <init>() -> <init>
@@ -4650,108 +4482,127 @@ net.minecraft.FileUtil -> o:
     71:77:boolean isPathPortable(java.nio.file.Path) -> b
     81:88:java.nio.file.Path createPathToResource(java.nio.file.Path,java.lang.String,java.lang.String) -> b
     13:16:void <clinit>() -> <clinit>
-net.minecraft.MethodsReturnNonnullByDefault -> p:
-net.minecraft.ReportedException -> q:
+net.minecraft.MethodsReturnNonnullByDefault -> r:
+net.minecraft.ReportedException -> s:
     net.minecraft.CrashReport report -> a
     6:8:void <init>(net.minecraft.CrashReport) -> <init>
     11:11:net.minecraft.CrashReport getReport() -> a
     16:16:java.lang.Throwable getCause() -> getCause
     21:21:java.lang.String getMessage() -> getMessage
-net.minecraft.ResourceLocationException -> r:
+net.minecraft.ResourceLocationException -> t:
     5:6:void <init>(java.lang.String) -> <init>
     9:10:void <init>(java.lang.String,java.lang.Throwable) -> <init>
-net.minecraft.SharedConstants -> s:
+net.minecraft.SharedConstants -> u:
     io.netty.util.ResourceLeakDetector$Level NETTY_LEAK_DETECTION -> a
-    boolean IS_RUNNING_IN_IDE -> b
-    char[] ILLEGAL_FILE_CHARACTERS -> c
-    com.mojang.bridge.game.GameVersion CURRENT_VERSION -> d
+    long MAXIMUM_TICK_TIME_NANOS -> b
+    boolean CHECK_DATA_FIXER_SCHEMA -> c
+    boolean IS_RUNNING_IN_IDE -> d
+    char[] ILLEGAL_FILE_CHARACTERS -> e
+    com.mojang.bridge.game.GameVersion CURRENT_VERSION -> f
     10:10:void <init>() -> <init>
-    87:87:boolean isAllowedChatCharacter(char) -> a
-    99:107:java.lang.String filterText(java.lang.String) -> a
-    111:123:java.lang.String filterUnicodeSupplementary(java.lang.String) -> b
-    129:134:void setVersion(com.mojang.bridge.game.GameVersion) -> a
-    137:140:com.mojang.bridge.game.GameVersion getCurrentVersion() -> a
-    74:148:void <clinit>() -> <clinit>
-net.minecraft.Util -> t:
-    java.util.concurrent.atomic.AtomicInteger WORKER_COUNT -> b
-    java.util.concurrent.ExecutorService BACKGROUND_EXECUTOR -> c
+    102:102:boolean isAllowedChatCharacter(char) -> a
+    114:122:java.lang.String filterText(java.lang.String) -> a
+    128:133:void setVersion(com.mojang.bridge.game.GameVersion) -> a
+    136:139:com.mojang.bridge.game.GameVersion getCurrentVersion() -> a
+    84:146:void <clinit>() -> <clinit>
+net.minecraft.Util -> v:
+    java.util.concurrent.atomic.AtomicInteger WORKER_COUNT -> c
+    java.util.concurrent.ExecutorService BOOTSTRAP_EXECUTOR -> d
+    java.util.concurrent.ExecutorService BACKGROUND_EXECUTOR -> e
+    java.util.concurrent.ExecutorService IO_POOL -> f
     java.util.function.LongSupplier timeSource -> a
-    org.apache.logging.log4j.Logger LOGGER -> d
-    51:51:void <init>() -> <init>
-    59:59:java.util.stream.Collector toMap() -> a
-    64:64:java.lang.String getPropertyName(net.minecraft.world.level.block.state.properties.Property,java.lang.Object) -> a
-    68:71:java.lang.String makeDescriptionId(java.lang.String,net.minecraft.resources.ResourceLocation) -> a
-    75:75:long getMillis() -> b
-    79:79:long getNanos() -> c
-    83:83:long getEpochMillis() -> d
-    87:118:java.util.concurrent.ExecutorService makeBackgroundExecutor() -> k
-    122:122:java.util.concurrent.Executor backgroundExecutor() -> e
-    126:136:void shutdownBackgroundExecutor() -> f
-    140:142:java.util.concurrent.CompletableFuture failedFuture(java.lang.Throwable) -> a
-    146:146:void throwAsRuntime(java.lang.Throwable) -> b
-    216:235:net.minecraft.Util$OS getPlatform() -> g
-    239:240:java.util.stream.Stream getVmArguments() -> h
-    244:244:java.lang.Object lastOf(java.util.List) -> a
-    248:266:java.lang.Object findNextInIterable(java.lang.Iterable,java.lang.Object) -> a
-    270:282:java.lang.Object findPreviousInIterable(java.lang.Iterable,java.lang.Object) -> b
-    286:286:java.lang.Object make(java.util.function.Supplier) -> a
-    290:291:java.lang.Object make(java.lang.Object,java.util.function.Consumer) -> a
-    310:310:it.unimi.dsi.fastutil.Hash$Strategy identityStrategy() -> i
-    314:331:java.util.concurrent.CompletableFuture sequence(java.util.List) -> b
-    336:336:java.util.stream.Stream toStream(java.util.Optional) -> a
-    340:345:java.util.Optional ifElse(java.util.Optional,java.util.function.Consumer,java.lang.Runnable) -> a
-    363:363:java.lang.Runnable name(java.lang.Runnable,java.util.function.Supplier) -> a
-    368:368:java.util.Optional readUUID(java.lang.String,com.mojang.datafixers.Dynamic) -> a
-    376:378:com.mojang.datafixers.Dynamic writeUUID(java.lang.String,java.util.UUID,com.mojang.datafixers.Dynamic) -> a
-    382:393:java.lang.Throwable pauseInIde(java.lang.Throwable) -> c
-    397:402:java.lang.String describeError(java.lang.Throwable) -> d
-    369:369:java.util.Optional lambda$readUUID$7(com.mojang.datafixers.Dynamic,java.lang.String,java.lang.Number) -> a
-    370:370:java.util.UUID lambda$null$6(java.lang.Number,java.lang.Number) -> a
-    331:331:java.util.List lambda$sequence$5(java.util.List,java.lang.Void) -> a
-    320:329:void lambda$sequence$4(java.util.List,java.util.concurrent.CompletableFuture[],java.util.concurrent.CompletableFuture,java.util.concurrent.CompletableFuture) -> a
-    323:328:void lambda$null$3(java.util.concurrent.CompletableFuture,java.util.List,int,java.lang.Object,java.lang.Throwable) -> a
-    240:240:boolean lambda$getVmArguments$2(java.lang.String) -> a
-    107:116:void lambda$makeBackgroundExecutor$1(java.lang.Thread,java.lang.Throwable) -> a
-    93:105:java.util.concurrent.ForkJoinWorkerThread lambda$makeBackgroundExecutor$0(java.util.concurrent.ForkJoinPool) -> a
-    51:51:org.apache.logging.log4j.Logger access$100() -> j
-    52:56:void <clinit>() -> <clinit>
-net.minecraft.Util$1 -> t$1:
-    93:93:void <init>(java.util.concurrent.ForkJoinPool) -> <init>
-    96:102:void onTermination(java.lang.Throwable) -> onTermination
-net.minecraft.Util$IdentityStrategy -> t$a:
+    java.util.UUID NIL_UUID -> b
+    org.apache.logging.log4j.Logger LOGGER -> g
+    60:60:void <init>() -> <init>
+    72:72:java.util.stream.Collector toMap() -> a
+    77:77:java.lang.String getPropertyName(net.minecraft.world.level.block.state.properties.Property,java.lang.Object) -> a
+    81:84:java.lang.String makeDescriptionId(java.lang.String,net.minecraft.resources.ResourceLocation) -> a
+    88:88:long getMillis() -> b
+    92:92:long getNanos() -> c
+    96:96:long getEpochMillis() -> d
+    100:121:java.util.concurrent.ExecutorService makeExecutor(java.lang.String) -> a
+    126:126:java.util.concurrent.Executor bootstrapExecutor() -> e
+    130:130:java.util.concurrent.Executor backgroundExecutor() -> f
+    134:134:java.util.concurrent.Executor ioPool() -> g
+    138:140:void shutdownExecutors() -> h
+    143:153:void shutdownExecutor(java.util.concurrent.ExecutorService) -> a
+    156:156:java.util.concurrent.ExecutorService makeIoExecutor() -> n
+    166:168:java.util.concurrent.CompletableFuture failedFuture(java.lang.Throwable) -> a
+    172:172:void throwAsRuntime(java.lang.Throwable) -> b
+    176:185:void onThreadException(java.lang.Thread,java.lang.Throwable) -> a
+    189:192:com.mojang.datafixers.types.Type fetchChoiceType(com.mojang.datafixers.DSL$TypeReference,java.lang.String) -> a
+    197:206:com.mojang.datafixers.types.Type doFetchChoiceType(com.mojang.datafixers.DSL$TypeReference,java.lang.String) -> b
+    276:295:net.minecraft.Util$OS getPlatform() -> i
+    299:300:java.util.stream.Stream getVmArguments() -> j
+    304:304:java.lang.Object lastOf(java.util.List) -> a
+    308:326:java.lang.Object findNextInIterable(java.lang.Iterable,java.lang.Object) -> a
+    330:342:java.lang.Object findPreviousInIterable(java.lang.Iterable,java.lang.Object) -> b
+    346:346:java.lang.Object make(java.util.function.Supplier) -> a
+    350:351:java.lang.Object make(java.lang.Object,java.util.function.Consumer) -> a
+    370:370:it.unimi.dsi.fastutil.Hash$Strategy identityStrategy() -> k
+    374:391:java.util.concurrent.CompletableFuture sequence(java.util.List) -> b
+    396:396:java.util.stream.Stream toStream(java.util.Optional) -> a
+    400:405:java.util.Optional ifElse(java.util.Optional,java.util.function.Consumer,java.lang.Runnable) -> a
+    423:423:java.lang.Runnable name(java.lang.Runnable,java.util.function.Supplier) -> a
+    428:439:java.lang.Throwable pauseInIde(java.lang.Throwable) -> c
+    443:448:java.lang.String describeError(java.lang.Throwable) -> d
+    453:453:java.lang.Object getRandom(java.lang.Object[],java.util.Random) -> a
+    458:458:int getRandom(int[],java.util.Random) -> a
+    462:473:void safeReplaceFile(java.io.File,java.io.File,java.io.File) -> a
+    477:493:int offsetByCodepoints(java.lang.String,int,int) -> a
+    497:497:java.util.function.Consumer prefix(java.lang.String,java.util.function.Consumer) -> a
+    504:513:com.mojang.serialization.DataResult fixedSize(java.util.stream.IntStream,int) -> a
+    519:535:void startTimerHackThread() -> l
+    538:541:void copyBetweenDirs(java.nio.file.Path,java.nio.file.Path,java.nio.file.Path) -> a
+    497:497:void lambda$prefix$6(java.util.function.Consumer,java.lang.String,java.lang.String) -> a
+    391:391:java.util.List lambda$sequence$5(java.util.List,java.lang.Void) -> a
+    380:389:void lambda$sequence$4(java.util.List,java.util.concurrent.CompletableFuture[],java.util.concurrent.CompletableFuture,java.util.concurrent.CompletableFuture) -> a
+    383:388:void lambda$null$3(java.util.concurrent.CompletableFuture,java.util.List,int,java.lang.Object,java.lang.Throwable) -> a
+    300:300:boolean lambda$getVmArguments$2(java.lang.String) -> b
+    157:160:java.lang.Thread lambda$makeIoExecutor$1(java.lang.Runnable) -> a
+    106:118:java.util.concurrent.ForkJoinWorkerThread lambda$makeExecutor$0(java.lang.String,java.util.concurrent.ForkJoinPool) -> a
+    60:60:org.apache.logging.log4j.Logger access$100() -> m
+    61:69:void <clinit>() -> <clinit>
+net.minecraft.Util$1 -> v$1:
+    106:106:void <init>(java.util.concurrent.ForkJoinPool) -> <init>
+    109:115:void onTermination(java.lang.Throwable) -> onTermination
+net.minecraft.Util$3 -> v$2:
+    519:519:void <init>(java.lang.String) -> <init>
+    524:530:void run() -> run
+net.minecraft.Util$IdentityStrategy -> v$a:
     net.minecraft.Util$IdentityStrategy INSTANCE -> a
     net.minecraft.Util$IdentityStrategy[] $VALUES -> b
-    294:294:net.minecraft.Util$IdentityStrategy[] values() -> values
-    294:294:net.minecraft.Util$IdentityStrategy valueOf(java.lang.String) -> valueOf
-    294:294:void <init>(java.lang.String,int) -> <init>
-    299:299:int hashCode(java.lang.Object) -> hashCode
-    304:304:boolean equals(java.lang.Object,java.lang.Object) -> equals
-    294:295:void <clinit>() -> <clinit>
-net.minecraft.Util$OS -> t$b:
+    354:354:net.minecraft.Util$IdentityStrategy[] values() -> values
+    354:354:net.minecraft.Util$IdentityStrategy valueOf(java.lang.String) -> valueOf
+    354:354:void <init>(java.lang.String,int) -> <init>
+    359:359:int hashCode(java.lang.Object) -> hashCode
+    364:364:boolean equals(java.lang.Object,java.lang.Object) -> equals
+    354:355:void <clinit>() -> <clinit>
+net.minecraft.Util$OS -> v$b:
     net.minecraft.Util$OS LINUX -> a
     net.minecraft.Util$OS SOLARIS -> b
     net.minecraft.Util$OS WINDOWS -> c
     net.minecraft.Util$OS OSX -> d
     net.minecraft.Util$OS UNKNOWN -> e
     net.minecraft.Util$OS[] $VALUES -> f
-    149:149:net.minecraft.Util$OS[] values() -> values
-    149:149:net.minecraft.Util$OS valueOf(java.lang.String) -> valueOf
-    149:149:void <init>(java.lang.String,int) -> <init>
-    168:178:void openUrl(java.net.URL) -> a
-    182:186:void openUri(java.net.URI) -> a
-    190:194:void openFile(java.io.File) -> a
-    197:202:java.lang.String[] getOpenUrlArguments(java.net.URL) -> b
-    207:212:void openUri(java.lang.String) -> a
-    168:168:java.lang.Process lambda$openUrl$0(java.net.URL) -> c
-    149:149:void <init>(java.lang.String,int,net.minecraft.Util$1) -> <init>
-    149:164:void <clinit>() -> <clinit>
-net.minecraft.Util$OS$1 -> t$b$1:
-    152:152:void <init>(java.lang.String,int) -> <init>
-    155:155:java.lang.String[] getOpenUrlArguments(java.net.URL) -> b
-net.minecraft.Util$OS$2 -> t$b$2:
-    158:158:void <init>(java.lang.String,int) -> <init>
-    161:161:java.lang.String[] getOpenUrlArguments(java.net.URL) -> b
-net.minecraft.advancements.Advancement -> u:
+    209:209:net.minecraft.Util$OS[] values() -> values
+    209:209:net.minecraft.Util$OS valueOf(java.lang.String) -> valueOf
+    209:209:void <init>(java.lang.String,int) -> <init>
+    228:238:void openUrl(java.net.URL) -> a
+    242:246:void openUri(java.net.URI) -> a
+    250:254:void openFile(java.io.File) -> a
+    257:262:java.lang.String[] getOpenUrlArguments(java.net.URL) -> b
+    267:272:void openUri(java.lang.String) -> a
+    228:228:java.lang.Process lambda$openUrl$0(java.net.URL) -> c
+    209:209:void <init>(java.lang.String,int,net.minecraft.Util$1) -> <init>
+    209:224:void <clinit>() -> <clinit>
+net.minecraft.Util$OS$1 -> v$b$1:
+    212:212:void <init>(java.lang.String,int) -> <init>
+    215:215:java.lang.String[] getOpenUrlArguments(java.net.URL) -> b
+net.minecraft.Util$OS$2 -> v$b$2:
+    218:218:void <init>(java.lang.String,int) -> <init>
+    221:221:java.lang.String[] getOpenUrlArguments(java.net.URL) -> b
+net.minecraft.advancements.Advancement -> w:
     net.minecraft.advancements.Advancement parent -> a
     net.minecraft.advancements.DisplayInfo display -> b
     net.minecraft.advancements.AdvancementRewards rewards -> c
@@ -4760,24 +4611,24 @@ net.minecraft.advancements.Advancement -> u:
     java.lang.String[][] requirements -> f
     java.util.Set children -> g
     net.minecraft.network.chat.Component chatComponent -> h
-    35:60:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.Advancement,net.minecraft.advancements.DisplayInfo,net.minecraft.advancements.AdvancementRewards,java.util.Map,java.lang.String[][]) -> <init>
-    63:63:net.minecraft.advancements.Advancement$Builder deconstruct() -> a
-    68:68:net.minecraft.advancements.Advancement getParent() -> b
-    73:73:net.minecraft.advancements.DisplayInfo getDisplay() -> c
-    77:77:net.minecraft.advancements.AdvancementRewards getRewards() -> d
-    82:88:java.lang.String toString() -> toString
-    93:93:java.lang.Iterable getChildren() -> e
-    97:97:java.util.Map getCriteria() -> f
-    101:101:int getMaxCriteraRequired() -> g
-    105:106:void addChild(net.minecraft.advancements.Advancement) -> a
-    109:109:net.minecraft.resources.ResourceLocation getId() -> h
-    114:121:boolean equals(java.lang.Object) -> equals
-    126:126:int hashCode() -> hashCode
-    130:130:java.lang.String[][] getRequirements() -> i
-    134:134:net.minecraft.network.chat.Component getChatComponent() -> j
-    56:56:void lambda$new$0(net.minecraft.network.chat.Component,net.minecraft.network.chat.Style) -> a
-net.minecraft.advancements.Advancement$1 -> u$1:
-net.minecraft.advancements.Advancement$Builder -> u$a:
+    37:62:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.Advancement,net.minecraft.advancements.DisplayInfo,net.minecraft.advancements.AdvancementRewards,java.util.Map,java.lang.String[][]) -> <init>
+    65:65:net.minecraft.advancements.Advancement$Builder deconstruct() -> a
+    70:70:net.minecraft.advancements.Advancement getParent() -> b
+    75:75:net.minecraft.advancements.DisplayInfo getDisplay() -> c
+    79:79:net.minecraft.advancements.AdvancementRewards getRewards() -> d
+    84:90:java.lang.String toString() -> toString
+    95:95:java.lang.Iterable getChildren() -> e
+    99:99:java.util.Map getCriteria() -> f
+    103:103:int getMaxCriteraRequired() -> g
+    107:108:void addChild(net.minecraft.advancements.Advancement) -> a
+    111:111:net.minecraft.resources.ResourceLocation getId() -> h
+    116:123:boolean equals(java.lang.Object) -> equals
+    128:128:int hashCode() -> hashCode
+    132:132:java.lang.String[][] getRequirements() -> i
+    136:136:net.minecraft.network.chat.Component getChatComponent() -> j
+    58:58:net.minecraft.network.chat.Style lambda$new$0(net.minecraft.network.chat.Component,net.minecraft.network.chat.Style) -> a
+net.minecraft.advancements.Advancement$1 -> w$1:
+net.minecraft.advancements.Advancement$Builder -> w$a:
     net.minecraft.resources.ResourceLocation parentId -> a
     net.minecraft.advancements.Advancement parent -> b
     net.minecraft.advancements.DisplayInfo display -> c
@@ -4785,32 +4636,32 @@ net.minecraft.advancements.Advancement$Builder -> u$a:
     java.util.Map criteria -> e
     java.lang.String[][] requirements -> f
     net.minecraft.advancements.RequirementsStrategy requirementsStrategy -> g
-    141:152:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.DisplayInfo,net.minecraft.advancements.AdvancementRewards,java.util.Map,java.lang.String[][]) -> <init>
-    141:155:void <init>() -> <init>
-    158:158:net.minecraft.advancements.Advancement$Builder advancement() -> a
-    162:163:net.minecraft.advancements.Advancement$Builder parent(net.minecraft.advancements.Advancement) -> a
-    167:168:net.minecraft.advancements.Advancement$Builder parent(net.minecraft.resources.ResourceLocation) -> a
-    172:172:net.minecraft.advancements.Advancement$Builder display(net.minecraft.world.item.ItemStack,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation,net.minecraft.advancements.FrameType,boolean,boolean,boolean) -> a
-    176:176:net.minecraft.advancements.Advancement$Builder display(net.minecraft.world.level.ItemLike,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation,net.minecraft.advancements.FrameType,boolean,boolean,boolean) -> a
-    180:181:net.minecraft.advancements.Advancement$Builder display(net.minecraft.advancements.DisplayInfo) -> a
-    185:185:net.minecraft.advancements.Advancement$Builder rewards(net.minecraft.advancements.AdvancementRewards$Builder) -> a
-    189:190:net.minecraft.advancements.Advancement$Builder rewards(net.minecraft.advancements.AdvancementRewards) -> a
-    194:194:net.minecraft.advancements.Advancement$Builder addCriterion(java.lang.String,net.minecraft.advancements.CriterionTriggerInstance) -> a
-    198:202:net.minecraft.advancements.Advancement$Builder addCriterion(java.lang.String,net.minecraft.advancements.Criterion) -> a
-    206:207:net.minecraft.advancements.Advancement$Builder requirements(net.minecraft.advancements.RequirementsStrategy) -> a
-    211:212:net.minecraft.advancements.Advancement$Builder requirements(java.lang.String[][]) -> a
-    216:221:boolean canBuild(java.util.function.Function) -> a
-    225:231:net.minecraft.advancements.Advancement build(net.minecraft.resources.ResourceLocation) -> b
-    235:237:net.minecraft.advancements.Advancement save(java.util.function.Consumer,java.lang.String) -> a
-    241:275:com.google.gson.JsonObject serializeToJson() -> b
-    279:299:void serializeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
-    303:308:java.lang.String toString() -> toString
-    313:358:net.minecraft.advancements.Advancement$Builder fromJson(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    362:372:net.minecraft.advancements.Advancement$Builder fromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
-    376:376:java.util.Map getCriteria() -> c
-    225:225:net.minecraft.advancements.Advancement lambda$build$0(net.minecraft.resources.ResourceLocation) -> c
-    137:137:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.DisplayInfo,net.minecraft.advancements.AdvancementRewards,java.util.Map,java.lang.String[][],net.minecraft.advancements.Advancement$1) -> <init>
-net.minecraft.advancements.AdvancementList -> v:
+    143:154:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.DisplayInfo,net.minecraft.advancements.AdvancementRewards,java.util.Map,java.lang.String[][]) -> <init>
+    143:157:void <init>() -> <init>
+    160:160:net.minecraft.advancements.Advancement$Builder advancement() -> a
+    164:165:net.minecraft.advancements.Advancement$Builder parent(net.minecraft.advancements.Advancement) -> a
+    169:170:net.minecraft.advancements.Advancement$Builder parent(net.minecraft.resources.ResourceLocation) -> a
+    174:174:net.minecraft.advancements.Advancement$Builder display(net.minecraft.world.item.ItemStack,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation,net.minecraft.advancements.FrameType,boolean,boolean,boolean) -> a
+    178:178:net.minecraft.advancements.Advancement$Builder display(net.minecraft.world.level.ItemLike,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation,net.minecraft.advancements.FrameType,boolean,boolean,boolean) -> a
+    182:183:net.minecraft.advancements.Advancement$Builder display(net.minecraft.advancements.DisplayInfo) -> a
+    187:187:net.minecraft.advancements.Advancement$Builder rewards(net.minecraft.advancements.AdvancementRewards$Builder) -> a
+    191:192:net.minecraft.advancements.Advancement$Builder rewards(net.minecraft.advancements.AdvancementRewards) -> a
+    196:196:net.minecraft.advancements.Advancement$Builder addCriterion(java.lang.String,net.minecraft.advancements.CriterionTriggerInstance) -> a
+    200:204:net.minecraft.advancements.Advancement$Builder addCriterion(java.lang.String,net.minecraft.advancements.Criterion) -> a
+    208:209:net.minecraft.advancements.Advancement$Builder requirements(net.minecraft.advancements.RequirementsStrategy) -> a
+    213:214:net.minecraft.advancements.Advancement$Builder requirements(java.lang.String[][]) -> a
+    218:223:boolean canBuild(java.util.function.Function) -> a
+    227:233:net.minecraft.advancements.Advancement build(net.minecraft.resources.ResourceLocation) -> b
+    237:239:net.minecraft.advancements.Advancement save(java.util.function.Consumer,java.lang.String) -> a
+    243:277:com.google.gson.JsonObject serializeToJson() -> b
+    281:301:void serializeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
+    305:310:java.lang.String toString() -> toString
+    315:360:net.minecraft.advancements.Advancement$Builder fromJson(com.google.gson.JsonObject,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    364:374:net.minecraft.advancements.Advancement$Builder fromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
+    378:378:java.util.Map getCriteria() -> c
+    227:227:net.minecraft.advancements.Advancement lambda$build$0(net.minecraft.resources.ResourceLocation) -> c
+    139:139:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.DisplayInfo,net.minecraft.advancements.AdvancementRewards,java.util.Map,java.lang.String[][],net.minecraft.advancements.Advancement$1) -> <init>
+net.minecraft.advancements.AdvancementList -> x:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Map advancements -> b
     java.util.Set roots -> c
@@ -4826,13 +4677,13 @@ net.minecraft.advancements.AdvancementList -> v:
     114:114:net.minecraft.advancements.Advancement get(net.minecraft.resources.ResourceLocation) -> a
     118:127:void setListener(net.minecraft.advancements.AdvancementList$Listener) -> a
     18:18:void <clinit>() -> <clinit>
-net.minecraft.advancements.AdvancementList$Listener -> v$a:
+net.minecraft.advancements.AdvancementList$Listener -> x$a:
     void onAddAdvancementRoot(net.minecraft.advancements.Advancement) -> a
     void onRemoveAdvancementRoot(net.minecraft.advancements.Advancement) -> b
     void onAddAdvancementTask(net.minecraft.advancements.Advancement) -> c
     void onRemoveAdvancementTask(net.minecraft.advancements.Advancement) -> d
     void onAdvancementsCleared() -> a
-net.minecraft.advancements.AdvancementProgress -> w:
+net.minecraft.advancements.AdvancementProgress -> y:
     java.util.Map criteria -> a
     java.lang.String[][] requirements -> b
     24:28:void <init>() -> <init>
@@ -4855,46 +4706,43 @@ net.minecraft.advancements.AdvancementProgress -> w:
     23:23:int compareTo(java.lang.Object) -> compareTo
     32:32:boolean lambda$update$0(java.util.Set,java.util.Map$Entry) -> a
     23:23:java.util.Map access$000(net.minecraft.advancements.AdvancementProgress) -> b
-net.minecraft.advancements.AdvancementProgress$Serializer -> w$a:
+net.minecraft.advancements.AdvancementProgress$Serializer -> y$a:
     211:211:void <init>() -> <init>
     214:226:com.google.gson.JsonElement serialize(net.minecraft.advancements.AdvancementProgress,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
     231:240:net.minecraft.advancements.AdvancementProgress deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     211:211:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
     211:211:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
-net.minecraft.advancements.AdvancementRewards -> x:
+net.minecraft.advancements.AdvancementRewards -> z:
     net.minecraft.advancements.AdvancementRewards EMPTY -> a
     int experience -> b
     net.minecraft.resources.ResourceLocation[] loot -> c
     net.minecraft.resources.ResourceLocation[] recipes -> d
     net.minecraft.commands.CommandFunction$CacheableFunction function -> e
-    39:44:void <init>(int,net.minecraft.resources.ResourceLocation[],net.minecraft.resources.ResourceLocation[],net.minecraft.commands.CommandFunction$CacheableFunction) -> <init>
-    47:47:net.minecraft.resources.ResourceLocation[] getRecipes() -> a
-    51:82:void grant(net.minecraft.server.level.ServerPlayer) -> a
-    86:89:java.lang.String toString() -> toString
-    95:125:com.google.gson.JsonElement serializeToJson() -> b
-    81:81:void lambda$grant$0(net.minecraft.server.MinecraftServer,net.minecraft.server.level.ServerPlayer,net.minecraft.commands.CommandFunction) -> a
-    32:32:void <clinit>() -> <clinit>
-net.minecraft.advancements.AdvancementRewards$Builder -> x$a:
+    35:40:void <init>(int,net.minecraft.resources.ResourceLocation[],net.minecraft.resources.ResourceLocation[],net.minecraft.commands.CommandFunction$CacheableFunction) -> <init>
+    43:43:net.minecraft.resources.ResourceLocation[] getRecipes() -> a
+    47:78:void grant(net.minecraft.server.level.ServerPlayer) -> a
+    82:85:java.lang.String toString() -> toString
+    91:121:com.google.gson.JsonElement serializeToJson() -> b
+    126:143:net.minecraft.advancements.AdvancementRewards deserialize(com.google.gson.JsonObject) -> a
+    77:77:void lambda$grant$0(net.minecraft.server.MinecraftServer,net.minecraft.server.level.ServerPlayer,net.minecraft.commands.CommandFunction) -> a
+    28:28:void <clinit>() -> <clinit>
+net.minecraft.advancements.AdvancementRewards$Builder -> z$a:
     int experience -> a
     java.util.List loot -> b
     java.util.List recipes -> c
     net.minecraft.resources.ResourceLocation function -> d
-    153:156:void <init>() -> <init>
-    161:161:net.minecraft.advancements.AdvancementRewards$Builder experience(int) -> a
-    165:166:net.minecraft.advancements.AdvancementRewards$Builder addExperience(int) -> b
-    170:170:net.minecraft.advancements.AdvancementRewards$Builder loot(net.minecraft.resources.ResourceLocation) -> a
-    174:175:net.minecraft.advancements.AdvancementRewards$Builder addLootTable(net.minecraft.resources.ResourceLocation) -> b
-    179:179:net.minecraft.advancements.AdvancementRewards$Builder recipe(net.minecraft.resources.ResourceLocation) -> c
-    183:184:net.minecraft.advancements.AdvancementRewards$Builder addRecipe(net.minecraft.resources.ResourceLocation) -> d
-    188:188:net.minecraft.advancements.AdvancementRewards$Builder function(net.minecraft.resources.ResourceLocation) -> e
-    192:193:net.minecraft.advancements.AdvancementRewards$Builder runs(net.minecraft.resources.ResourceLocation) -> f
-    197:197:net.minecraft.advancements.AdvancementRewards build() -> a
-net.minecraft.advancements.AdvancementRewards$Deserializer -> x$b:
-    128:128:void <init>() -> <init>
-    131:149:net.minecraft.advancements.AdvancementRewards deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    128:128:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.advancements.CriteriaTriggers -> y:
-    java.util.Map CRITERIA -> M
+    146:149:void <init>() -> <init>
+    154:154:net.minecraft.advancements.AdvancementRewards$Builder experience(int) -> a
+    158:159:net.minecraft.advancements.AdvancementRewards$Builder addExperience(int) -> b
+    163:163:net.minecraft.advancements.AdvancementRewards$Builder loot(net.minecraft.resources.ResourceLocation) -> a
+    167:168:net.minecraft.advancements.AdvancementRewards$Builder addLootTable(net.minecraft.resources.ResourceLocation) -> b
+    172:172:net.minecraft.advancements.AdvancementRewards$Builder recipe(net.minecraft.resources.ResourceLocation) -> c
+    176:177:net.minecraft.advancements.AdvancementRewards$Builder addRecipe(net.minecraft.resources.ResourceLocation) -> d
+    181:181:net.minecraft.advancements.AdvancementRewards$Builder function(net.minecraft.resources.ResourceLocation) -> e
+    185:186:net.minecraft.advancements.AdvancementRewards$Builder runs(net.minecraft.resources.ResourceLocation) -> f
+    190:190:net.minecraft.advancements.AdvancementRewards build() -> a
+net.minecraft.advancements.CriteriaTriggers -> aa:
+    java.util.Map CRITERIA -> Q
     net.minecraft.advancements.critereon.ImpossibleTrigger IMPOSSIBLE -> a
     net.minecraft.advancements.critereon.KilledTrigger PLAYER_KILLED_ENTITY -> b
     net.minecraft.advancements.critereon.KilledTrigger ENTITY_KILLED_PLAYER -> c
@@ -4930,27 +4778,31 @@ net.minecraft.advancements.CriteriaTriggers -> y:
     net.minecraft.advancements.critereon.KilledByCrossbowTrigger KILLED_BY_CROSSBOW -> G
     net.minecraft.advancements.critereon.LocationTrigger RAID_WIN -> H
     net.minecraft.advancements.critereon.LocationTrigger BAD_OMEN -> I
-    net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger SAFELY_HARVEST_HONEY -> J
-    net.minecraft.advancements.critereon.SlideDownBlockTrigger HONEY_BLOCK_SLIDE -> K
-    net.minecraft.advancements.critereon.BeeNestDestroyedTrigger BEE_NEST_DESTROYED -> L
-    43:43:void <init>() -> <init>
-    86:90:net.minecraft.advancements.CriterionTrigger register(net.minecraft.advancements.CriterionTrigger) -> a
-    96:96:net.minecraft.advancements.CriterionTrigger getCriterion(net.minecraft.resources.ResourceLocation) -> a
-    100:100:java.lang.Iterable all() -> a
-    44:83:void <clinit>() -> <clinit>
-net.minecraft.advancements.Criterion -> z:
+    net.minecraft.advancements.critereon.SlideDownBlockTrigger HONEY_BLOCK_SLIDE -> J
+    net.minecraft.advancements.critereon.BeeNestDestroyedTrigger BEE_NEST_DESTROYED -> K
+    net.minecraft.advancements.critereon.TargetBlockTrigger TARGET_BLOCK_HIT -> L
+    net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger ITEM_USED_ON_BLOCK -> M
+    net.minecraft.advancements.critereon.LootTableTrigger GENERATE_LOOT -> N
+    net.minecraft.advancements.critereon.ItemPickedUpByEntityTrigger ITEM_PICKED_UP_BY_ENTITY -> O
+    net.minecraft.advancements.critereon.PlayerInteractTrigger PLAYER_INTERACTED_WITH_ENTITY -> P
+    47:47:void <init>() -> <init>
+    94:98:net.minecraft.advancements.CriterionTrigger register(net.minecraft.advancements.CriterionTrigger) -> a
+    104:104:net.minecraft.advancements.CriterionTrigger getCriterion(net.minecraft.resources.ResourceLocation) -> a
+    108:108:java.lang.Iterable all() -> a
+    48:91:void <clinit>() -> <clinit>
+net.minecraft.advancements.Criterion -> ab:
     net.minecraft.advancements.CriterionTriggerInstance trigger -> a
-    18:20:void <init>(net.minecraft.advancements.CriterionTriggerInstance) -> <init>
-    22:24:void <init>() -> <init>
-    27:27:void serializeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
-    30:36:net.minecraft.advancements.Criterion criterionFromJson(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    40:40:net.minecraft.advancements.Criterion criterionFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
-    44:48:java.util.Map criteriaFromJson(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    52:57:java.util.Map criteriaFromNetwork(net.minecraft.network.FriendlyByteBuf) -> c
-    61:66:void serializeToNetwork(java.util.Map,net.minecraft.network.FriendlyByteBuf) -> a
-    70:70:net.minecraft.advancements.CriterionTriggerInstance getTrigger() -> a
-    74:78:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.CriterionProgress -> aa:
+    19:21:void <init>(net.minecraft.advancements.CriterionTriggerInstance) -> <init>
+    23:25:void <init>() -> <init>
+    28:28:void serializeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
+    31:37:net.minecraft.advancements.Criterion criterionFromJson(com.google.gson.JsonObject,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    41:41:net.minecraft.advancements.Criterion criterionFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
+    45:49:java.util.Map criteriaFromJson(com.google.gson.JsonObject,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    53:58:java.util.Map criteriaFromNetwork(net.minecraft.network.FriendlyByteBuf) -> c
+    62:67:void serializeToNetwork(java.util.Map,net.minecraft.network.FriendlyByteBuf) -> a
+    71:71:net.minecraft.advancements.CriterionTriggerInstance getTrigger() -> a
+    75:81:com.google.gson.JsonElement serializeToJson() -> b
+net.minecraft.advancements.CriterionProgress -> ac:
     java.text.SimpleDateFormat DATE_FORMAT -> a
     java.util.Date obtained -> b
     13:13:void <init>() -> <init>
@@ -4964,13 +4816,13 @@ net.minecraft.advancements.CriterionProgress -> aa:
     57:61:net.minecraft.advancements.CriterionProgress fromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
     65:71:net.minecraft.advancements.CriterionProgress fromJson(java.lang.String) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.advancements.CriterionTrigger -> ab:
+net.minecraft.advancements.CriterionTrigger -> ad:
     net.minecraft.resources.ResourceLocation getId() -> a
     void addPlayerListener(net.minecraft.server.PlayerAdvancements,net.minecraft.advancements.CriterionTrigger$Listener) -> a
     void removePlayerListener(net.minecraft.server.PlayerAdvancements,net.minecraft.advancements.CriterionTrigger$Listener) -> b
     void removePlayerListeners(net.minecraft.server.PlayerAdvancements) -> a
-    net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-net.minecraft.advancements.CriterionTrigger$Listener -> ab$a:
+    net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.DeserializationContext) -> a
+net.minecraft.advancements.CriterionTrigger$Listener -> ad$a:
     net.minecraft.advancements.CriterionTriggerInstance trigger -> a
     net.minecraft.advancements.Advancement advancement -> b
     java.lang.String criterion -> c
@@ -4979,10 +4831,10 @@ net.minecraft.advancements.CriterionTrigger$Listener -> ab$a:
     35:36:void run(net.minecraft.server.PlayerAdvancements) -> a
     40:55:boolean equals(java.lang.Object) -> equals
     60:63:int hashCode() -> hashCode
-net.minecraft.advancements.CriterionTriggerInstance -> ac:
+net.minecraft.advancements.CriterionTriggerInstance -> ae:
     net.minecraft.resources.ResourceLocation getCriterion() -> a
-    11:11:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.DisplayInfo -> ad:
+    com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.DisplayInfo -> af:
     net.minecraft.network.chat.Component title -> a
     net.minecraft.network.chat.Component description -> b
     net.minecraft.world.item.ItemStack icon -> c
@@ -4993,25 +4845,25 @@ net.minecraft.advancements.DisplayInfo -> ad:
     boolean hidden -> h
     float x -> i
     float y -> j
-    33:42:void <init>(net.minecraft.world.item.ItemStack,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation,net.minecraft.advancements.FrameType,boolean,boolean,boolean) -> <init>
-    45:47:void setLocation(float,float) -> a
-    50:50:net.minecraft.network.chat.Component getTitle() -> a
-    54:54:net.minecraft.network.chat.Component getDescription() -> b
-    58:58:net.minecraft.world.item.ItemStack getIcon() -> c
-    63:63:net.minecraft.resources.ResourceLocation getBackground() -> d
-    67:67:net.minecraft.advancements.FrameType getFrame() -> e
-    71:71:float getX() -> f
-    75:75:float getY() -> g
-    79:79:boolean shouldShowToast() -> h
-    83:83:boolean shouldAnnounceChat() -> i
-    87:87:boolean isHidden() -> j
-    91:102:net.minecraft.advancements.DisplayInfo fromJson(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    106:123:net.minecraft.world.item.ItemStack getIcon(com.google.gson.JsonObject) -> a
-    127:147:void serializeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
-    150:160:net.minecraft.advancements.DisplayInfo fromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
-    164:178:com.google.gson.JsonElement serializeToJson() -> k
-    182:187:com.google.gson.JsonObject serializeIcon() -> l
-net.minecraft.advancements.FrameType -> ae:
+    32:41:void <init>(net.minecraft.world.item.ItemStack,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation,net.minecraft.advancements.FrameType,boolean,boolean,boolean) -> <init>
+    44:46:void setLocation(float,float) -> a
+    49:49:net.minecraft.network.chat.Component getTitle() -> a
+    53:53:net.minecraft.network.chat.Component getDescription() -> b
+    57:57:net.minecraft.world.item.ItemStack getIcon() -> c
+    62:62:net.minecraft.resources.ResourceLocation getBackground() -> d
+    66:66:net.minecraft.advancements.FrameType getFrame() -> e
+    70:70:float getX() -> f
+    74:74:float getY() -> g
+    78:78:boolean shouldShowToast() -> h
+    82:82:boolean shouldAnnounceChat() -> i
+    86:86:boolean isHidden() -> j
+    90:101:net.minecraft.advancements.DisplayInfo fromJson(com.google.gson.JsonObject) -> a
+    105:122:net.minecraft.world.item.ItemStack getIcon(com.google.gson.JsonObject) -> b
+    126:146:void serializeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
+    149:159:net.minecraft.advancements.DisplayInfo fromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
+    163:177:com.google.gson.JsonElement serializeToJson() -> k
+    181:186:com.google.gson.JsonObject serializeIcon() -> l
+net.minecraft.advancements.FrameType -> ag:
     net.minecraft.advancements.FrameType TASK -> a
     net.minecraft.advancements.FrameType CHALLENGE -> b
     net.minecraft.advancements.FrameType GOAL -> c
@@ -5027,14 +4879,14 @@ net.minecraft.advancements.FrameType -> ae:
     30:35:net.minecraft.advancements.FrameType byName(java.lang.String) -> a
     39:39:net.minecraft.ChatFormatting getChatColor() -> c
     5:8:void <clinit>() -> <clinit>
-net.minecraft.advancements.RequirementsStrategy -> af:
+net.minecraft.advancements.RequirementsStrategy -> ah:
     net.minecraft.advancements.RequirementsStrategy AND -> a
     net.minecraft.advancements.RequirementsStrategy OR -> b
     java.lang.String[][] createRequirements(java.util.Collection) -> createRequirements
     15:15:java.lang.String[][] lambda$static$1(java.util.Collection) -> a
     7:12:java.lang.String[][] lambda$static$0(java.util.Collection) -> b
     6:15:void <clinit>() -> <clinit>
-net.minecraft.advancements.TreeNodePosition -> ag:
+net.minecraft.advancements.TreeNodePosition -> ai:
     net.minecraft.advancements.Advancement advancement -> a
     net.minecraft.advancements.TreeNodePosition parent -> b
     net.minecraft.advancements.TreeNodePosition previousSibling -> c
@@ -5060,32 +4912,35 @@ net.minecraft.advancements.TreeNodePosition -> ag:
     194:197:net.minecraft.advancements.TreeNodePosition getAncestor(net.minecraft.advancements.TreeNodePosition,net.minecraft.advancements.TreeNodePosition) -> a
     202:211:void finalizePosition() -> e
     214:224:void run(net.minecraft.advancements.Advancement) -> a
-net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance -> ah:
+net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance -> aj:
     net.minecraft.resources.ResourceLocation criterion -> a
-    9:11:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    15:15:net.minecraft.resources.ResourceLocation getCriterion() -> a
-    20:20:java.lang.String toString() -> toString
-net.minecraft.advancements.critereon.BeeNestDestroyedTrigger -> ai:
+    net.minecraft.advancements.critereon.EntityPredicate$Composite player -> b
+    11:14:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> <init>
+    18:18:net.minecraft.resources.ResourceLocation getCriterion() -> a
+    22:22:net.minecraft.advancements.critereon.EntityPredicate$Composite getPlayerPredicate() -> b
+    27:29:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+    34:34:java.lang.String toString() -> toString
+net.minecraft.advancements.critereon.BeeNestDestroyedTrigger -> ak:
     net.minecraft.resources.ResourceLocation ID -> a
-    16:16:void <init>() -> <init>
-    21:21:net.minecraft.resources.ResourceLocation getId() -> a
-    26:30:net.minecraft.advancements.critereon.BeeNestDestroyedTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    35:39:net.minecraft.world.level.block.Block deserializeBlock(com.google.gson.JsonObject) -> a
-    43:44:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.block.Block,net.minecraft.world.item.ItemStack,int) -> a
-    16:16:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    43:43:boolean lambda$trigger$1(net.minecraft.world.level.block.Block,net.minecraft.world.item.ItemStack,int,net.minecraft.advancements.critereon.BeeNestDestroyedTrigger$TriggerInstance) -> a
-    37:37:com.google.gson.JsonSyntaxException lambda$deserializeBlock$0(net.minecraft.resources.ResourceLocation) -> a
-    16:16:net.minecraft.resources.ResourceLocation access$000() -> b
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.BeeNestDestroyedTrigger$TriggerInstance -> ai$a:
+    14:14:void <init>() -> <init>
+    19:19:net.minecraft.resources.ResourceLocation getId() -> a
+    24:28:net.minecraft.advancements.critereon.BeeNestDestroyedTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    33:37:net.minecraft.world.level.block.Block deserializeBlock(com.google.gson.JsonObject) -> a
+    41:42:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.block.Block,net.minecraft.world.item.ItemStack,int) -> a
+    14:14:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    41:41:boolean lambda$trigger$1(net.minecraft.world.level.block.Block,net.minecraft.world.item.ItemStack,int,net.minecraft.advancements.critereon.BeeNestDestroyedTrigger$TriggerInstance) -> a
+    35:35:com.google.gson.JsonSyntaxException lambda$deserializeBlock$0(net.minecraft.resources.ResourceLocation) -> a
+    14:14:net.minecraft.resources.ResourceLocation access$000() -> b
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.BeeNestDestroyedTrigger$TriggerInstance -> ak$a:
     net.minecraft.world.level.block.Block block -> a
     net.minecraft.advancements.critereon.ItemPredicate item -> b
     net.minecraft.advancements.critereon.MinMaxBounds$Ints numBees -> c
-    52:56:void <init>(net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
-    59:59:net.minecraft.advancements.critereon.BeeNestDestroyedTrigger$TriggerInstance destroyedBeeNest(net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.ItemPredicate$Builder,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> a
-    63:69:boolean matches(net.minecraft.world.level.block.Block,net.minecraft.world.item.ItemStack,int) -> a
-    74:82:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.BlockPredicate -> aj:
+    51:55:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
+    58:58:net.minecraft.advancements.critereon.BeeNestDestroyedTrigger$TriggerInstance destroyedBeeNest(net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.ItemPredicate$Builder,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> a
+    62:68:boolean matches(net.minecraft.world.level.block.Block,net.minecraft.world.item.ItemStack,int) -> a
+    73:81:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.BlockPredicate -> al:
     net.minecraft.advancements.critereon.BlockPredicate ANY -> a
     net.minecraft.tags.Tag tag -> b
     net.minecraft.world.level.block.Block block -> c
@@ -5096,7 +4951,7 @@ net.minecraft.advancements.critereon.BlockPredicate -> aj:
     67:88:net.minecraft.advancements.critereon.BlockPredicate fromJson(com.google.gson.JsonElement) -> a
     92:106:com.google.gson.JsonElement serializeToJson() -> a
     22:22:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.BlockPredicate$Builder -> aj$a:
+net.minecraft.advancements.critereon.BlockPredicate$Builder -> al$a:
     net.minecraft.world.level.block.Block block -> a
     net.minecraft.tags.Tag blocks -> b
     net.minecraft.advancements.critereon.StatePropertiesPredicate properties -> c
@@ -5108,131 +4963,134 @@ net.minecraft.advancements.critereon.BlockPredicate$Builder -> aj$a:
     135:136:net.minecraft.advancements.critereon.BlockPredicate$Builder hasNbt(net.minecraft.nbt.CompoundTag) -> a
     140:141:net.minecraft.advancements.critereon.BlockPredicate$Builder setProperties(net.minecraft.advancements.critereon.StatePropertiesPredicate) -> a
     145:145:net.minecraft.advancements.critereon.BlockPredicate build() -> b
-net.minecraft.advancements.critereon.BredAnimalsTrigger -> ak:
-    net.minecraft.resources.ResourceLocation ID -> a
-    13:13:void <init>() -> <init>
-    18:18:net.minecraft.resources.ResourceLocation getId() -> a
-    23:26:net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    30:31:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.animal.Animal,net.minecraft.world.entity.animal.Animal,net.minecraft.world.entity.AgableMob) -> a
-    13:13:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    30:30:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.animal.Animal,net.minecraft.world.entity.animal.Animal,net.minecraft.world.entity.AgableMob,net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance) -> a
-    13:13:net.minecraft.resources.ResourceLocation access$000() -> b
-    14:14:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance -> ak$a:
-    net.minecraft.advancements.critereon.EntityPredicate parent -> a
-    net.minecraft.advancements.critereon.EntityPredicate partner -> b
-    net.minecraft.advancements.critereon.EntityPredicate child -> c
-    39:43:void <init>(net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.EntityPredicate) -> <init>
-    46:46:net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance bredAnimals() -> c
-    50:50:net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance bredAnimals(net.minecraft.advancements.critereon.EntityPredicate$Builder) -> a
-    54:58:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.animal.Animal,net.minecraft.world.entity.animal.Animal,net.minecraft.world.entity.AgableMob) -> a
-    63:69:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.BrewedPotionTrigger -> al:
-    net.minecraft.resources.ResourceLocation ID -> a
-    15:15:void <init>() -> <init>
-    20:20:net.minecraft.resources.ResourceLocation getId() -> a
-    25:30:net.minecraft.advancements.critereon.BrewedPotionTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    34:35:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.alchemy.Potion) -> a
-    15:15:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    34:34:boolean lambda$trigger$1(net.minecraft.world.item.alchemy.Potion,net.minecraft.advancements.critereon.BrewedPotionTrigger$TriggerInstance) -> a
-    28:28:com.google.gson.JsonSyntaxException lambda$createInstance$0(net.minecraft.resources.ResourceLocation) -> a
-    15:15:net.minecraft.resources.ResourceLocation access$000() -> b
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.BrewedPotionTrigger$TriggerInstance -> al$a:
-    net.minecraft.world.item.alchemy.Potion potion -> a
-    41:43:void <init>(net.minecraft.world.item.alchemy.Potion) -> <init>
-    46:46:net.minecraft.advancements.critereon.BrewedPotionTrigger$TriggerInstance brewedPotion() -> c
-    50:53:boolean matches(net.minecraft.world.item.alchemy.Potion) -> a
-    58:64:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.ChangeDimensionTrigger -> am:
-    net.minecraft.resources.ResourceLocation ID -> a
-    13:13:void <init>() -> <init>
-    18:18:net.minecraft.resources.ResourceLocation getId() -> a
-    23:25:net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    29:30:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.dimension.DimensionType,net.minecraft.world.level.dimension.DimensionType) -> a
-    13:13:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    29:29:boolean lambda$trigger$0(net.minecraft.world.level.dimension.DimensionType,net.minecraft.world.level.dimension.DimensionType,net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance) -> a
-    13:13:net.minecraft.resources.ResourceLocation access$000() -> b
-    14:14:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance -> am$a:
-    net.minecraft.world.level.dimension.DimensionType from -> a
-    net.minecraft.world.level.dimension.DimensionType to -> b
-    39:42:void <init>(net.minecraft.world.level.dimension.DimensionType,net.minecraft.world.level.dimension.DimensionType) -> <init>
-    45:45:net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance changedDimension() -> c
-    49:49:net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance changedDimension(net.minecraft.world.level.dimension.DimensionType,net.minecraft.world.level.dimension.DimensionType) -> a
-    53:53:net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance changedDimensionTo(net.minecraft.world.level.dimension.DimensionType) -> a
-    57:57:net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance changedDimensionFrom(net.minecraft.world.level.dimension.DimensionType) -> b
-    61:67:boolean matches(net.minecraft.world.level.dimension.DimensionType,net.minecraft.world.level.dimension.DimensionType) -> b
-    72:79:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.ChanneledLightningTrigger -> an:
+net.minecraft.advancements.critereon.BredAnimalsTrigger -> am:
     net.minecraft.resources.ResourceLocation ID -> a
     12:12:void <init>() -> <init>
     17:17:net.minecraft.resources.ResourceLocation getId() -> a
-    22:23:net.minecraft.advancements.critereon.ChanneledLightningTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    27:28:void trigger(net.minecraft.server.level.ServerPlayer,java.util.Collection) -> a
-    12:12:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    27:27:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,java.util.Collection,net.minecraft.advancements.critereon.ChanneledLightningTrigger$TriggerInstance) -> a
+    22:25:net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    29:34:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.animal.Animal,net.minecraft.world.entity.animal.Animal,net.minecraft.world.entity.AgableMob) -> a
+    12:12:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    33:33:boolean lambda$trigger$0(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance) -> a
     12:12:net.minecraft.resources.ResourceLocation access$000() -> b
     13:13:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.ChanneledLightningTrigger$TriggerInstance -> an$a:
-    net.minecraft.advancements.critereon.EntityPredicate[] victims -> a
-    34:36:void <init>(net.minecraft.advancements.critereon.EntityPredicate[]) -> <init>
-    39:39:net.minecraft.advancements.critereon.ChanneledLightningTrigger$TriggerInstance channeledLightning(net.minecraft.advancements.critereon.EntityPredicate[]) -> a
-    43:55:boolean matches(net.minecraft.server.level.ServerPlayer,java.util.Collection) -> a
-    60:64:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.ConstructBeaconTrigger -> ao:
+net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance -> am$a:
+    net.minecraft.advancements.critereon.EntityPredicate$Composite parent -> a
+    net.minecraft.advancements.critereon.EntityPredicate$Composite partner -> b
+    net.minecraft.advancements.critereon.EntityPredicate$Composite child -> c
+    42:46:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> <init>
+    49:49:net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance bredAnimals() -> c
+    53:53:net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance bredAnimals(net.minecraft.advancements.critereon.EntityPredicate$Builder) -> a
+    57:57:net.minecraft.advancements.critereon.BredAnimalsTrigger$TriggerInstance bredAnimals(net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.EntityPredicate) -> a
+    61:65:boolean matches(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.level.storage.loot.LootContext) -> a
+    70:76:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.BrewedPotionTrigger -> an:
+    net.minecraft.resources.ResourceLocation ID -> a
+    13:13:void <init>() -> <init>
+    18:18:net.minecraft.resources.ResourceLocation getId() -> a
+    23:28:net.minecraft.advancements.critereon.BrewedPotionTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    32:33:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.alchemy.Potion) -> a
+    13:13:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    32:32:boolean lambda$trigger$1(net.minecraft.world.item.alchemy.Potion,net.minecraft.advancements.critereon.BrewedPotionTrigger$TriggerInstance) -> a
+    26:26:com.google.gson.JsonSyntaxException lambda$createInstance$0(net.minecraft.resources.ResourceLocation) -> a
+    13:13:net.minecraft.resources.ResourceLocation access$000() -> b
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.BrewedPotionTrigger$TriggerInstance -> an$a:
+    net.minecraft.world.item.alchemy.Potion potion -> a
+    39:41:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.world.item.alchemy.Potion) -> <init>
+    44:44:net.minecraft.advancements.critereon.BrewedPotionTrigger$TriggerInstance brewedPotion() -> c
+    48:51:boolean matches(net.minecraft.world.item.alchemy.Potion) -> a
+    56:62:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.ChangeDimensionTrigger -> ao:
+    net.minecraft.resources.ResourceLocation ID -> a
+    13:13:void <init>() -> <init>
+    18:18:net.minecraft.resources.ResourceLocation getId() -> a
+    23:25:net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    29:30:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey) -> a
+    13:13:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    29:29:boolean lambda$trigger$0(net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey,net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance) -> a
+    13:13:net.minecraft.resources.ResourceLocation access$000() -> b
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance -> ao$a:
+    net.minecraft.resources.ResourceKey from -> a
+    net.minecraft.resources.ResourceKey to -> b
+    39:42:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey) -> <init>
+    45:45:net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance changedDimension() -> c
+    49:49:net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance changedDimension(net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey) -> a
+    53:53:net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance changedDimensionTo(net.minecraft.resources.ResourceKey) -> a
+    57:57:net.minecraft.advancements.critereon.ChangeDimensionTrigger$TriggerInstance changedDimensionFrom(net.minecraft.resources.ResourceKey) -> b
+    61:67:boolean matches(net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey) -> b
+    72:79:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.ChanneledLightningTrigger -> ap:
+    net.minecraft.resources.ResourceLocation ID -> a
+    14:14:void <init>() -> <init>
+    19:19:net.minecraft.resources.ResourceLocation getId() -> a
+    24:25:net.minecraft.advancements.critereon.ChanneledLightningTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    29:31:void trigger(net.minecraft.server.level.ServerPlayer,java.util.Collection) -> a
+    14:14:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    30:30:boolean lambda$trigger$1(java.util.List,net.minecraft.advancements.critereon.ChanneledLightningTrigger$TriggerInstance) -> a
+    29:29:net.minecraft.world.level.storage.loot.LootContext lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity) -> a
+    14:14:net.minecraft.resources.ResourceLocation access$000() -> b
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.ChanneledLightningTrigger$TriggerInstance -> ap$a:
+    net.minecraft.advancements.critereon.EntityPredicate$Composite[] victims -> a
+    37:39:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite[]) -> <init>
+    42:42:net.minecraft.advancements.critereon.ChanneledLightningTrigger$TriggerInstance channeledLightning(net.minecraft.advancements.critereon.EntityPredicate[]) -> a
+    46:58:boolean matches(java.util.Collection) -> a
+    63:67:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+    42:42:net.minecraft.advancements.critereon.EntityPredicate$Composite[] lambda$channeledLightning$0(int) -> a
+net.minecraft.advancements.critereon.ConstructBeaconTrigger -> aq:
+    net.minecraft.resources.ResourceLocation ID -> a
+    8:8:void <init>() -> <init>
+    13:13:net.minecraft.resources.ResourceLocation getId() -> a
+    18:19:net.minecraft.advancements.critereon.ConstructBeaconTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    23:24:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.block.entity.BeaconBlockEntity) -> a
+    8:8:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    23:23:boolean lambda$trigger$0(net.minecraft.world.level.block.entity.BeaconBlockEntity,net.minecraft.advancements.critereon.ConstructBeaconTrigger$TriggerInstance) -> a
+    8:8:net.minecraft.resources.ResourceLocation access$000() -> b
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.ConstructBeaconTrigger$TriggerInstance -> aq$a:
+    net.minecraft.advancements.critereon.MinMaxBounds$Ints level -> a
+    30:32:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
+    35:35:net.minecraft.advancements.critereon.ConstructBeaconTrigger$TriggerInstance constructedBeacon() -> c
+    39:39:net.minecraft.advancements.critereon.ConstructBeaconTrigger$TriggerInstance constructedBeacon(net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> a
+    43:43:boolean matches(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> a
+    48:52:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.ConsumeItemTrigger -> ar:
+    net.minecraft.resources.ResourceLocation ID -> a
+    9:9:void <init>() -> <init>
+    14:14:net.minecraft.resources.ResourceLocation getId() -> a
+    19:19:net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    23:24:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack) -> a
+    9:9:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    23:23:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance) -> a
+    9:9:net.minecraft.resources.ResourceLocation access$000() -> b
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance -> ar$a:
+    net.minecraft.advancements.critereon.ItemPredicate item -> a
+    30:32:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
+    35:35:net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance usedItem() -> c
+    39:39:net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance usedItem(net.minecraft.advancements.critereon.ItemPredicate) -> a
+    43:43:net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance usedItem(net.minecraft.world.level.ItemLike) -> a
+    47:47:boolean matches(net.minecraft.world.item.ItemStack) -> a
+    52:56:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.CuredZombieVillagerTrigger -> as:
     net.minecraft.resources.ResourceLocation ID -> a
     10:10:void <init>() -> <init>
     15:15:net.minecraft.resources.ResourceLocation getId() -> a
-    20:21:net.minecraft.advancements.critereon.ConstructBeaconTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    25:26:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.block.entity.BeaconBlockEntity) -> a
-    10:10:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    25:25:boolean lambda$trigger$0(net.minecraft.world.level.block.entity.BeaconBlockEntity,net.minecraft.advancements.critereon.ConstructBeaconTrigger$TriggerInstance) -> a
+    20:22:net.minecraft.advancements.critereon.CuredZombieVillagerTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    26:30:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.monster.Zombie,net.minecraft.world.entity.npc.Villager) -> a
+    10:10:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    29:29:boolean lambda$trigger$0(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.advancements.critereon.CuredZombieVillagerTrigger$TriggerInstance) -> a
     10:10:net.minecraft.resources.ResourceLocation access$000() -> b
     11:11:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.ConstructBeaconTrigger$TriggerInstance -> ao$a:
-    net.minecraft.advancements.critereon.MinMaxBounds$Ints level -> a
-    32:34:void <init>(net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
-    37:37:net.minecraft.advancements.critereon.ConstructBeaconTrigger$TriggerInstance constructedBeacon() -> c
-    41:41:net.minecraft.advancements.critereon.ConstructBeaconTrigger$TriggerInstance constructedBeacon(net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> a
-    45:45:boolean matches(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> a
-    50:54:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.ConsumeItemTrigger -> ap:
-    net.minecraft.resources.ResourceLocation ID -> a
-    11:11:void <init>() -> <init>
-    16:16:net.minecraft.resources.ResourceLocation getId() -> a
-    21:21:net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    25:26:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack) -> a
-    11:11:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    25:25:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance) -> a
-    11:11:net.minecraft.resources.ResourceLocation access$000() -> b
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance -> ap$a:
-    net.minecraft.advancements.critereon.ItemPredicate item -> a
-    32:34:void <init>(net.minecraft.advancements.critereon.ItemPredicate) -> <init>
-    37:37:net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance usedItem() -> c
-    41:41:net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance usedItem(net.minecraft.advancements.critereon.ItemPredicate) -> a
-    45:45:net.minecraft.advancements.critereon.ConsumeItemTrigger$TriggerInstance usedItem(net.minecraft.world.level.ItemLike) -> a
-    49:49:boolean matches(net.minecraft.world.item.ItemStack) -> a
-    54:58:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.CuredZombieVillagerTrigger -> aq:
-    net.minecraft.resources.ResourceLocation ID -> a
-    11:11:void <init>() -> <init>
-    16:16:net.minecraft.resources.ResourceLocation getId() -> a
-    21:23:net.minecraft.advancements.critereon.CuredZombieVillagerTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    27:28:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.monster.Zombie,net.minecraft.world.entity.npc.Villager) -> a
-    11:11:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    27:27:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.monster.Zombie,net.minecraft.world.entity.npc.Villager,net.minecraft.advancements.critereon.CuredZombieVillagerTrigger$TriggerInstance) -> a
-    11:11:net.minecraft.resources.ResourceLocation access$000() -> b
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.CuredZombieVillagerTrigger$TriggerInstance -> aq$a:
-    net.minecraft.advancements.critereon.EntityPredicate zombie -> a
-    net.minecraft.advancements.critereon.EntityPredicate villager -> b
-    35:38:void <init>(net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.EntityPredicate) -> <init>
-    41:41:net.minecraft.advancements.critereon.CuredZombieVillagerTrigger$TriggerInstance curedZombieVillager() -> c
-    45:51:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.monster.Zombie,net.minecraft.world.entity.npc.Villager) -> a
-    56:61:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.DamagePredicate -> ar:
+net.minecraft.advancements.critereon.CuredZombieVillagerTrigger$TriggerInstance -> as$a:
+    net.minecraft.advancements.critereon.EntityPredicate$Composite zombie -> a
+    net.minecraft.advancements.critereon.EntityPredicate$Composite villager -> b
+    37:40:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> <init>
+    43:43:net.minecraft.advancements.critereon.CuredZombieVillagerTrigger$TriggerInstance curedZombieVillager() -> c
+    47:53:boolean matches(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.level.storage.loot.LootContext) -> a
+    58:63:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.DamagePredicate -> at:
     net.minecraft.advancements.critereon.DamagePredicate ANY -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Floats dealtDamage -> b
     net.minecraft.advancements.critereon.MinMaxBounds$Floats takenDamage -> c
@@ -5245,7 +5103,7 @@ net.minecraft.advancements.critereon.DamagePredicate -> ar:
     60:69:net.minecraft.advancements.critereon.DamagePredicate fromJson(com.google.gson.JsonElement) -> a
     73:88:com.google.gson.JsonElement serializeToJson() -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.DamagePredicate$Builder -> ar$a:
+net.minecraft.advancements.critereon.DamagePredicate$Builder -> at$a:
     net.minecraft.advancements.critereon.MinMaxBounds$Floats dealtDamage -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Floats takenDamage -> b
     net.minecraft.advancements.critereon.EntityPredicate sourceEntity -> c
@@ -5260,7 +5118,7 @@ net.minecraft.advancements.critereon.DamagePredicate$Builder -> ar$a:
     123:124:net.minecraft.advancements.critereon.DamagePredicate$Builder type(net.minecraft.advancements.critereon.DamageSourcePredicate) -> a
     128:129:net.minecraft.advancements.critereon.DamagePredicate$Builder type(net.minecraft.advancements.critereon.DamageSourcePredicate$Builder) -> a
     133:133:net.minecraft.advancements.critereon.DamagePredicate build() -> b
-net.minecraft.advancements.critereon.DamageSourcePredicate -> as:
+net.minecraft.advancements.critereon.DamageSourcePredicate -> au:
     net.minecraft.advancements.critereon.DamageSourcePredicate ANY -> a
     java.lang.Boolean isProjectile -> b
     java.lang.Boolean isExplosion -> c
@@ -5280,7 +5138,7 @@ net.minecraft.advancements.critereon.DamageSourcePredicate -> as:
     106:123:com.google.gson.JsonElement serializeToJson() -> a
     127:130:void addOptionally(com.google.gson.JsonObject,java.lang.String,java.lang.Boolean) -> a
     15:15:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.DamageSourcePredicate$Builder -> as$a:
+net.minecraft.advancements.critereon.DamageSourcePredicate$Builder -> au$a:
     java.lang.Boolean isProjectile -> a
     java.lang.Boolean isExplosion -> b
     java.lang.Boolean bypassesArmor -> c
@@ -5306,7 +5164,18 @@ net.minecraft.advancements.critereon.DamageSourcePredicate$Builder -> as$a:
     199:200:net.minecraft.advancements.critereon.DamageSourcePredicate$Builder source(net.minecraft.advancements.critereon.EntityPredicate) -> b
     204:205:net.minecraft.advancements.critereon.DamageSourcePredicate$Builder source(net.minecraft.advancements.critereon.EntityPredicate$Builder) -> b
     209:209:net.minecraft.advancements.critereon.DamageSourcePredicate build() -> b
-net.minecraft.advancements.critereon.DistancePredicate -> at:
+net.minecraft.advancements.critereon.DeserializationContext -> av:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.resources.ResourceLocation id -> b
+    net.minecraft.world.level.storage.loot.PredicateManager predicateManager -> c
+    com.google.gson.Gson predicateGson -> d
+    18:23:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.PredicateManager) -> <init>
+    26:32:net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] deserializeConditions(com.google.gson.JsonArray,java.lang.String,net.minecraft.world.level.storage.loot.parameters.LootContextParamSet) -> a
+    36:36:net.minecraft.resources.ResourceLocation getAdvancementId() -> a
+    30:30:void lambda$deserializeConditions$1(java.lang.String,java.lang.String,java.lang.String) -> a
+    27:27:net.minecraft.world.level.storage.loot.LootTable lambda$deserializeConditions$0(net.minecraft.resources.ResourceLocation) -> a
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.DistancePredicate -> aw:
     net.minecraft.advancements.critereon.DistancePredicate ANY -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Floats x -> b
     net.minecraft.advancements.critereon.MinMaxBounds$Floats y -> c
@@ -5320,40 +5189,40 @@ net.minecraft.advancements.critereon.DistancePredicate -> at:
     53:62:net.minecraft.advancements.critereon.DistancePredicate fromJson(com.google.gson.JsonElement) -> a
     66:78:com.google.gson.JsonElement serializeToJson() -> a
     12:12:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.EffectsChangedTrigger -> au:
+net.minecraft.advancements.critereon.EffectsChangedTrigger -> ax:
     net.minecraft.resources.ResourceLocation ID -> a
-    9:9:void <init>() -> <init>
-    14:14:net.minecraft.resources.ResourceLocation getId() -> a
-    19:20:net.minecraft.advancements.critereon.EffectsChangedTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    24:25:void trigger(net.minecraft.server.level.ServerPlayer) -> a
-    9:9:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    24:24:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.advancements.critereon.EffectsChangedTrigger$TriggerInstance) -> a
-    9:9:net.minecraft.resources.ResourceLocation access$000() -> b
-    10:10:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.EffectsChangedTrigger$TriggerInstance -> au$a:
+    7:7:void <init>() -> <init>
+    12:12:net.minecraft.resources.ResourceLocation getId() -> a
+    17:18:net.minecraft.advancements.critereon.EffectsChangedTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    22:23:void trigger(net.minecraft.server.level.ServerPlayer) -> a
+    7:7:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    22:22:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.advancements.critereon.EffectsChangedTrigger$TriggerInstance) -> a
+    7:7:net.minecraft.resources.ResourceLocation access$000() -> b
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.EffectsChangedTrigger$TriggerInstance -> ax$a:
     net.minecraft.advancements.critereon.MobEffectsPredicate effects -> a
-    31:33:void <init>(net.minecraft.advancements.critereon.MobEffectsPredicate) -> <init>
-    36:36:net.minecraft.advancements.critereon.EffectsChangedTrigger$TriggerInstance hasEffects(net.minecraft.advancements.critereon.MobEffectsPredicate) -> a
-    40:40:boolean matches(net.minecraft.server.level.ServerPlayer) -> a
-    45:49:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.EnchantedItemTrigger -> av:
+    29:31:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.MobEffectsPredicate) -> <init>
+    34:34:net.minecraft.advancements.critereon.EffectsChangedTrigger$TriggerInstance hasEffects(net.minecraft.advancements.critereon.MobEffectsPredicate) -> a
+    38:38:boolean matches(net.minecraft.server.level.ServerPlayer) -> a
+    43:47:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.EnchantedItemTrigger -> ay:
     net.minecraft.resources.ResourceLocation ID -> a
-    10:10:void <init>() -> <init>
-    15:15:net.minecraft.resources.ResourceLocation getId() -> a
-    20:22:net.minecraft.advancements.critereon.EnchantedItemTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    26:27:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,int) -> a
-    10:10:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    26:26:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,int,net.minecraft.advancements.critereon.EnchantedItemTrigger$TriggerInstance) -> a
-    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.EnchantedItemTrigger$TriggerInstance -> av$a:
+    8:8:void <init>() -> <init>
+    13:13:net.minecraft.resources.ResourceLocation getId() -> a
+    18:20:net.minecraft.advancements.critereon.EnchantedItemTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    24:25:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,int) -> a
+    8:8:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    24:24:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,int,net.minecraft.advancements.critereon.EnchantedItemTrigger$TriggerInstance) -> a
+    8:8:net.minecraft.resources.ResourceLocation access$000() -> b
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.EnchantedItemTrigger$TriggerInstance -> ay$a:
     net.minecraft.advancements.critereon.ItemPredicate item -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Ints levels -> b
-    34:37:void <init>(net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
-    40:40:net.minecraft.advancements.critereon.EnchantedItemTrigger$TriggerInstance enchantedItem() -> c
-    44:50:boolean matches(net.minecraft.world.item.ItemStack,int) -> a
-    55:60:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.EnchantmentPredicate -> aw:
+    32:35:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
+    38:38:net.minecraft.advancements.critereon.EnchantedItemTrigger$TriggerInstance enchantedItem() -> c
+    42:48:boolean matches(net.minecraft.world.item.ItemStack,int) -> a
+    53:58:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.EnchantmentPredicate -> az:
     net.minecraft.advancements.critereon.EnchantmentPredicate ANY -> a
     net.minecraft.advancements.critereon.EnchantmentPredicate[] NONE -> b
     net.minecraft.world.item.enchantment.Enchantment enchantment -> c
@@ -5366,27 +5235,27 @@ net.minecraft.advancements.critereon.EnchantmentPredicate -> aw:
     88:98:net.minecraft.advancements.critereon.EnchantmentPredicate[] fromJsonArray(com.google.gson.JsonElement) -> b
     80:80:com.google.gson.JsonSyntaxException lambda$fromJson$0(net.minecraft.resources.ResourceLocation) -> a
     17:18:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.EnterBlockTrigger -> ax:
+net.minecraft.advancements.critereon.EnterBlockTrigger -> ba:
     net.minecraft.resources.ResourceLocation ID -> a
-    16:16:void <init>() -> <init>
-    21:21:net.minecraft.resources.ResourceLocation getId() -> a
-    26:33:net.minecraft.advancements.critereon.EnterBlockTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    38:42:net.minecraft.world.level.block.Block deserializeBlock(com.google.gson.JsonObject) -> a
-    46:47:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.block.state.BlockState) -> a
-    16:16:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    46:46:boolean lambda$trigger$2(net.minecraft.world.level.block.state.BlockState,net.minecraft.advancements.critereon.EnterBlockTrigger$TriggerInstance) -> a
-    40:40:com.google.gson.JsonSyntaxException lambda$deserializeBlock$1(net.minecraft.resources.ResourceLocation) -> a
-    30:30:void lambda$createInstance$0(net.minecraft.world.level.block.Block,java.lang.String) -> a
-    16:16:net.minecraft.resources.ResourceLocation access$000() -> b
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.EnterBlockTrigger$TriggerInstance -> ax$a:
+    14:14:void <init>() -> <init>
+    19:19:net.minecraft.resources.ResourceLocation getId() -> a
+    24:31:net.minecraft.advancements.critereon.EnterBlockTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    36:40:net.minecraft.world.level.block.Block deserializeBlock(com.google.gson.JsonObject) -> a
+    44:45:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.block.state.BlockState) -> a
+    14:14:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    44:44:boolean lambda$trigger$2(net.minecraft.world.level.block.state.BlockState,net.minecraft.advancements.critereon.EnterBlockTrigger$TriggerInstance) -> a
+    38:38:com.google.gson.JsonSyntaxException lambda$deserializeBlock$1(net.minecraft.resources.ResourceLocation) -> a
+    28:28:void lambda$createInstance$0(net.minecraft.world.level.block.Block,java.lang.String) -> a
+    14:14:net.minecraft.resources.ResourceLocation access$000() -> b
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.EnterBlockTrigger$TriggerInstance -> ba$a:
     net.minecraft.world.level.block.Block block -> a
     net.minecraft.advancements.critereon.StatePropertiesPredicate state -> b
-    54:57:void <init>(net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.StatePropertiesPredicate) -> <init>
-    60:60:net.minecraft.advancements.critereon.EnterBlockTrigger$TriggerInstance entersBlock(net.minecraft.world.level.block.Block) -> a
-    65:70:com.google.gson.JsonElement serializeToJson() -> b
-    74:80:boolean matches(net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.advancements.critereon.EntityEquipmentPredicate -> ay:
+    52:55:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.StatePropertiesPredicate) -> <init>
+    58:58:net.minecraft.advancements.critereon.EnterBlockTrigger$TriggerInstance entersBlock(net.minecraft.world.level.block.Block) -> a
+    63:68:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+    72:78:boolean matches(net.minecraft.world.level.block.state.BlockState) -> a
+net.minecraft.advancements.critereon.EntityEquipmentPredicate -> bb:
     net.minecraft.advancements.critereon.EntityEquipmentPredicate ANY -> a
     net.minecraft.advancements.critereon.EntityEquipmentPredicate CAPTAIN -> b
     net.minecraft.advancements.critereon.ItemPredicate head -> c
@@ -5400,7 +5269,7 @@ net.minecraft.advancements.critereon.EntityEquipmentPredicate -> ay:
     67:78:net.minecraft.advancements.critereon.EntityEquipmentPredicate fromJson(com.google.gson.JsonElement) -> a
     82:93:com.google.gson.JsonElement serializeToJson() -> a
     16:17:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.EntityEquipmentPredicate$Builder -> ay$a:
+net.minecraft.advancements.critereon.EntityEquipmentPredicate$Builder -> bb$a:
     net.minecraft.advancements.critereon.ItemPredicate head -> a
     net.minecraft.advancements.critereon.ItemPredicate chest -> b
     net.minecraft.advancements.critereon.ItemPredicate legs -> c
@@ -5416,7 +5285,7 @@ net.minecraft.advancements.critereon.EntityEquipmentPredicate$Builder -> ay$a:
     129:130:net.minecraft.advancements.critereon.EntityEquipmentPredicate$Builder mainhand(net.minecraft.advancements.critereon.ItemPredicate) -> e
     134:135:net.minecraft.advancements.critereon.EntityEquipmentPredicate$Builder offhand(net.minecraft.advancements.critereon.ItemPredicate) -> f
     139:139:net.minecraft.advancements.critereon.EntityEquipmentPredicate build() -> b
-net.minecraft.advancements.critereon.EntityFlagsPredicate -> az:
+net.minecraft.advancements.critereon.EntityFlagsPredicate -> bc:
     net.minecraft.advancements.critereon.EntityFlagsPredicate ANY -> a
     java.lang.Boolean isOnFire -> b
     java.lang.Boolean isCrouching -> c
@@ -5430,7 +5299,7 @@ net.minecraft.advancements.critereon.EntityFlagsPredicate -> az:
     84:87:void addOptionalBoolean(com.google.gson.JsonObject,java.lang.String,java.lang.Boolean) -> a
     90:101:com.google.gson.JsonElement serializeToJson() -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.EntityFlagsPredicate$Builder -> az$a:
+net.minecraft.advancements.critereon.EntityFlagsPredicate$Builder -> bc$a:
     java.lang.Boolean isOnFire -> a
     java.lang.Boolean isCrouching -> b
     java.lang.Boolean isSprinting -> c
@@ -5444,48 +5313,50 @@ net.minecraft.advancements.critereon.EntityFlagsPredicate$Builder -> az$a:
     140:141:net.minecraft.advancements.critereon.EntityFlagsPredicate$Builder setSwimming(java.lang.Boolean) -> d
     145:146:net.minecraft.advancements.critereon.EntityFlagsPredicate$Builder setIsBaby(java.lang.Boolean) -> e
     150:150:net.minecraft.advancements.critereon.EntityFlagsPredicate build() -> b
-net.minecraft.advancements.critereon.EntityHurtPlayerTrigger -> ba:
+net.minecraft.advancements.critereon.EntityHurtPlayerTrigger -> bd:
     net.minecraft.resources.ResourceLocation ID -> a
-    10:10:void <init>() -> <init>
-    15:15:net.minecraft.resources.ResourceLocation getId() -> a
-    20:21:net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    25:26:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.damagesource.DamageSource,float,float,boolean) -> a
-    10:10:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    25:25:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.damagesource.DamageSource,float,float,boolean,net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance) -> a
-    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance -> ba$a:
+    8:8:void <init>() -> <init>
+    13:13:net.minecraft.resources.ResourceLocation getId() -> a
+    18:19:net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    23:24:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.damagesource.DamageSource,float,float,boolean) -> a
+    8:8:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    23:23:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.damagesource.DamageSource,float,float,boolean,net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance) -> a
+    8:8:net.minecraft.resources.ResourceLocation access$000() -> b
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance -> bd$a:
     net.minecraft.advancements.critereon.DamagePredicate damage -> a
-    32:34:void <init>(net.minecraft.advancements.critereon.DamagePredicate) -> <init>
-    37:37:net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance entityHurtPlayer() -> c
-    41:41:net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance entityHurtPlayer(net.minecraft.advancements.critereon.DamagePredicate) -> a
-    45:45:net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance entityHurtPlayer(net.minecraft.advancements.critereon.DamagePredicate$Builder) -> a
-    49:52:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.damagesource.DamageSource,float,float,boolean) -> a
-    57:61:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.EntityPredicate -> bb:
+    30:32:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DamagePredicate) -> <init>
+    35:35:net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance entityHurtPlayer() -> c
+    39:39:net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance entityHurtPlayer(net.minecraft.advancements.critereon.DamagePredicate) -> a
+    43:43:net.minecraft.advancements.critereon.EntityHurtPlayerTrigger$TriggerInstance entityHurtPlayer(net.minecraft.advancements.critereon.DamagePredicate$Builder) -> a
+    47:50:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.damagesource.DamageSource,float,float,boolean) -> a
+    55:59:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.EntityPredicate -> be:
     net.minecraft.advancements.critereon.EntityPredicate ANY -> a
-    net.minecraft.advancements.critereon.EntityPredicate[] ANY_ARRAY -> b
-    net.minecraft.advancements.critereon.EntityTypePredicate entityType -> c
-    net.minecraft.advancements.critereon.DistancePredicate distanceToPlayer -> d
-    net.minecraft.advancements.critereon.LocationPredicate location -> e
-    net.minecraft.advancements.critereon.MobEffectsPredicate effects -> f
-    net.minecraft.advancements.critereon.NbtPredicate nbt -> g
-    net.minecraft.advancements.critereon.EntityFlagsPredicate flags -> h
-    net.minecraft.advancements.critereon.EntityEquipmentPredicate equipment -> i
-    net.minecraft.advancements.critereon.PlayerPredicate player -> j
-    java.lang.String team -> k
-    net.minecraft.resources.ResourceLocation catType -> l
-    37:48:void <init>(net.minecraft.advancements.critereon.EntityTypePredicate,net.minecraft.advancements.critereon.DistancePredicate,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.MobEffectsPredicate,net.minecraft.advancements.critereon.NbtPredicate,net.minecraft.advancements.critereon.EntityFlagsPredicate,net.minecraft.advancements.critereon.EntityEquipmentPredicate,net.minecraft.advancements.critereon.PlayerPredicate,java.lang.String,net.minecraft.resources.ResourceLocation) -> <init>
-    51:51:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity) -> a
-    55:107:boolean matches(net.minecraft.server.level.ServerLevel,net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> a
-    111:139:net.minecraft.advancements.critereon.EntityPredicate fromJson(com.google.gson.JsonElement) -> a
-    143:153:net.minecraft.advancements.critereon.EntityPredicate[] fromJsonArray(com.google.gson.JsonElement) -> b
-    157:176:com.google.gson.JsonElement serializeToJson() -> a
-    180:193:com.google.gson.JsonElement serializeArrayToJson(net.minecraft.advancements.critereon.EntityPredicate[]) -> a
-    20:20:void <init>(net.minecraft.advancements.critereon.EntityTypePredicate,net.minecraft.advancements.critereon.DistancePredicate,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.MobEffectsPredicate,net.minecraft.advancements.critereon.NbtPredicate,net.minecraft.advancements.critereon.EntityFlagsPredicate,net.minecraft.advancements.critereon.EntityEquipmentPredicate,net.minecraft.advancements.critereon.PlayerPredicate,java.lang.String,net.minecraft.resources.ResourceLocation,net.minecraft.advancements.critereon.EntityPredicate$1) -> <init>
-    21:22:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.EntityPredicate$1 -> bb$1:
-net.minecraft.advancements.critereon.EntityPredicate$Builder -> bb$a:
+    net.minecraft.advancements.critereon.EntityTypePredicate entityType -> b
+    net.minecraft.advancements.critereon.DistancePredicate distanceToPlayer -> c
+    net.minecraft.advancements.critereon.LocationPredicate location -> d
+    net.minecraft.advancements.critereon.MobEffectsPredicate effects -> e
+    net.minecraft.advancements.critereon.NbtPredicate nbt -> f
+    net.minecraft.advancements.critereon.EntityFlagsPredicate flags -> g
+    net.minecraft.advancements.critereon.EntityEquipmentPredicate equipment -> h
+    net.minecraft.advancements.critereon.PlayerPredicate player -> i
+    net.minecraft.advancements.critereon.FishingHookPredicate fishingHook -> j
+    net.minecraft.advancements.critereon.EntityPredicate vehicle -> k
+    net.minecraft.advancements.critereon.EntityPredicate targetedEntity -> l
+    java.lang.String team -> m
+    net.minecraft.resources.ResourceLocation catType -> n
+    50:64:void <init>(net.minecraft.advancements.critereon.EntityTypePredicate,net.minecraft.advancements.critereon.DistancePredicate,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.MobEffectsPredicate,net.minecraft.advancements.critereon.NbtPredicate,net.minecraft.advancements.critereon.EntityFlagsPredicate,net.minecraft.advancements.critereon.EntityEquipmentPredicate,net.minecraft.advancements.critereon.PlayerPredicate,net.minecraft.advancements.critereon.FishingHookPredicate,java.lang.String,net.minecraft.resources.ResourceLocation) -> <init>
+    66:80:void <init>(net.minecraft.advancements.critereon.EntityTypePredicate,net.minecraft.advancements.critereon.DistancePredicate,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.MobEffectsPredicate,net.minecraft.advancements.critereon.NbtPredicate,net.minecraft.advancements.critereon.EntityFlagsPredicate,net.minecraft.advancements.critereon.EntityEquipmentPredicate,net.minecraft.advancements.critereon.PlayerPredicate,net.minecraft.advancements.critereon.FishingHookPredicate,net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.EntityPredicate,java.lang.String,net.minecraft.resources.ResourceLocation) -> <init>
+    83:83:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity) -> a
+    87:151:boolean matches(net.minecraft.server.level.ServerLevel,net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> a
+    155:189:net.minecraft.advancements.critereon.EntityPredicate fromJson(com.google.gson.JsonElement) -> a
+    193:215:com.google.gson.JsonElement serializeToJson() -> a
+    219:224:net.minecraft.world.level.storage.loot.LootContext createContext(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity) -> b
+    28:28:void <init>(net.minecraft.advancements.critereon.EntityTypePredicate,net.minecraft.advancements.critereon.DistancePredicate,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.MobEffectsPredicate,net.minecraft.advancements.critereon.NbtPredicate,net.minecraft.advancements.critereon.EntityFlagsPredicate,net.minecraft.advancements.critereon.EntityEquipmentPredicate,net.minecraft.advancements.critereon.PlayerPredicate,net.minecraft.advancements.critereon.FishingHookPredicate,net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.EntityPredicate,java.lang.String,net.minecraft.resources.ResourceLocation,net.minecraft.advancements.critereon.EntityPredicate$1) -> <init>
+    29:29:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.EntityPredicate$1 -> be$1:
+net.minecraft.advancements.critereon.EntityPredicate$Builder -> be$a:
     net.minecraft.advancements.critereon.EntityTypePredicate entityType -> a
     net.minecraft.advancements.critereon.DistancePredicate distanceToPlayer -> b
     net.minecraft.advancements.critereon.LocationPredicate location -> c
@@ -5494,84 +5365,113 @@ net.minecraft.advancements.critereon.EntityPredicate$Builder -> bb$a:
     net.minecraft.advancements.critereon.EntityFlagsPredicate flags -> f
     net.minecraft.advancements.critereon.EntityEquipmentPredicate equipment -> g
     net.minecraft.advancements.critereon.PlayerPredicate player -> h
-    java.lang.String team -> i
-    net.minecraft.resources.ResourceLocation catType -> j
-    196:204:void <init>() -> <init>
-    209:209:net.minecraft.advancements.critereon.EntityPredicate$Builder entity() -> a
-    213:214:net.minecraft.advancements.critereon.EntityPredicate$Builder of(net.minecraft.world.entity.EntityType) -> a
-    218:219:net.minecraft.advancements.critereon.EntityPredicate$Builder of(net.minecraft.tags.Tag) -> a
-    223:224:net.minecraft.advancements.critereon.EntityPredicate$Builder of(net.minecraft.resources.ResourceLocation) -> a
-    228:229:net.minecraft.advancements.critereon.EntityPredicate$Builder entityType(net.minecraft.advancements.critereon.EntityTypePredicate) -> a
-    233:234:net.minecraft.advancements.critereon.EntityPredicate$Builder distance(net.minecraft.advancements.critereon.DistancePredicate) -> a
-    238:239:net.minecraft.advancements.critereon.EntityPredicate$Builder located(net.minecraft.advancements.critereon.LocationPredicate) -> a
-    243:244:net.minecraft.advancements.critereon.EntityPredicate$Builder effects(net.minecraft.advancements.critereon.MobEffectsPredicate) -> a
-    248:249:net.minecraft.advancements.critereon.EntityPredicate$Builder nbt(net.minecraft.advancements.critereon.NbtPredicate) -> a
-    253:254:net.minecraft.advancements.critereon.EntityPredicate$Builder flags(net.minecraft.advancements.critereon.EntityFlagsPredicate) -> a
-    258:259:net.minecraft.advancements.critereon.EntityPredicate$Builder equipment(net.minecraft.advancements.critereon.EntityEquipmentPredicate) -> a
-    263:264:net.minecraft.advancements.critereon.EntityPredicate$Builder player(net.minecraft.advancements.critereon.PlayerPredicate) -> a
-    268:269:net.minecraft.advancements.critereon.EntityPredicate$Builder team(java.lang.String) -> a
-    273:274:net.minecraft.advancements.critereon.EntityPredicate$Builder catType(net.minecraft.resources.ResourceLocation) -> b
-    278:278:net.minecraft.advancements.critereon.EntityPredicate build() -> b
-net.minecraft.advancements.critereon.EntityTypePredicate -> bc:
+    net.minecraft.advancements.critereon.FishingHookPredicate fishingHook -> i
+    net.minecraft.advancements.critereon.EntityPredicate vehicle -> j
+    net.minecraft.advancements.critereon.EntityPredicate targetedEntity -> k
+    java.lang.String team -> l
+    net.minecraft.resources.ResourceLocation catType -> m
+    227:238:void <init>() -> <init>
+    243:243:net.minecraft.advancements.critereon.EntityPredicate$Builder entity() -> a
+    247:248:net.minecraft.advancements.critereon.EntityPredicate$Builder of(net.minecraft.world.entity.EntityType) -> a
+    252:253:net.minecraft.advancements.critereon.EntityPredicate$Builder of(net.minecraft.tags.Tag) -> a
+    257:258:net.minecraft.advancements.critereon.EntityPredicate$Builder of(net.minecraft.resources.ResourceLocation) -> a
+    262:263:net.minecraft.advancements.critereon.EntityPredicate$Builder entityType(net.minecraft.advancements.critereon.EntityTypePredicate) -> a
+    267:268:net.minecraft.advancements.critereon.EntityPredicate$Builder distance(net.minecraft.advancements.critereon.DistancePredicate) -> a
+    272:273:net.minecraft.advancements.critereon.EntityPredicate$Builder located(net.minecraft.advancements.critereon.LocationPredicate) -> a
+    277:278:net.minecraft.advancements.critereon.EntityPredicate$Builder effects(net.minecraft.advancements.critereon.MobEffectsPredicate) -> a
+    282:283:net.minecraft.advancements.critereon.EntityPredicate$Builder nbt(net.minecraft.advancements.critereon.NbtPredicate) -> a
+    287:288:net.minecraft.advancements.critereon.EntityPredicate$Builder flags(net.minecraft.advancements.critereon.EntityFlagsPredicate) -> a
+    292:293:net.minecraft.advancements.critereon.EntityPredicate$Builder equipment(net.minecraft.advancements.critereon.EntityEquipmentPredicate) -> a
+    297:298:net.minecraft.advancements.critereon.EntityPredicate$Builder player(net.minecraft.advancements.critereon.PlayerPredicate) -> a
+    302:303:net.minecraft.advancements.critereon.EntityPredicate$Builder fishingHook(net.minecraft.advancements.critereon.FishingHookPredicate) -> a
+    307:308:net.minecraft.advancements.critereon.EntityPredicate$Builder vehicle(net.minecraft.advancements.critereon.EntityPredicate) -> a
+    312:313:net.minecraft.advancements.critereon.EntityPredicate$Builder targetedEntity(net.minecraft.advancements.critereon.EntityPredicate) -> b
+    317:318:net.minecraft.advancements.critereon.EntityPredicate$Builder team(java.lang.String) -> a
+    322:323:net.minecraft.advancements.critereon.EntityPredicate$Builder catType(net.minecraft.resources.ResourceLocation) -> b
+    327:327:net.minecraft.advancements.critereon.EntityPredicate build() -> b
+net.minecraft.advancements.critereon.EntityPredicate$Composite -> be$b:
+    net.minecraft.advancements.critereon.EntityPredicate$Composite ANY -> a
+    net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] conditions -> b
+    java.util.function.Predicate compositePredicates -> c
+    337:340:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
+    343:343:net.minecraft.advancements.critereon.EntityPredicate$Composite create(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    347:348:net.minecraft.advancements.critereon.EntityPredicate$Composite fromJson(com.google.gson.JsonObject,java.lang.String,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    352:363:net.minecraft.advancements.critereon.EntityPredicate$Composite[] fromJsonArray(com.google.gson.JsonObject,java.lang.String,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    367:374:net.minecraft.advancements.critereon.EntityPredicate$Composite fromElement(java.lang.String,net.minecraft.advancements.critereon.DeserializationContext,com.google.gson.JsonElement) -> a
+    378:382:net.minecraft.advancements.critereon.EntityPredicate$Composite wrap(net.minecraft.advancements.critereon.EntityPredicate) -> a
+    386:386:boolean matches(net.minecraft.world.level.storage.loot.LootContext) -> a
+    390:394:com.google.gson.JsonElement toJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+    398:406:com.google.gson.JsonElement toJson(net.minecraft.advancements.critereon.EntityPredicate$Composite[],net.minecraft.advancements.critereon.SerializationContext) -> a
+    332:332:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.EntityTypePredicate -> bf:
     net.minecraft.advancements.critereon.EntityTypePredicate ANY -> a
     com.google.common.base.Joiner COMMA_JOINER -> b
     17:17:void <init>() -> <init>
     boolean matches(net.minecraft.world.entity.EntityType) -> a
     com.google.gson.JsonElement serializeToJson() -> a
-    73:87:net.minecraft.advancements.critereon.EntityTypePredicate fromJson(com.google.gson.JsonElement) -> a
-    92:92:net.minecraft.advancements.critereon.EntityTypePredicate of(net.minecraft.world.entity.EntityType) -> b
-    96:96:net.minecraft.advancements.critereon.EntityTypePredicate of(net.minecraft.tags.Tag) -> a
-    86:86:com.google.gson.JsonSyntaxException lambda$fromJson$0(net.minecraft.resources.ResourceLocation) -> a
+    73:86:net.minecraft.advancements.critereon.EntityTypePredicate fromJson(com.google.gson.JsonElement) -> a
+    91:91:net.minecraft.advancements.critereon.EntityTypePredicate of(net.minecraft.world.entity.EntityType) -> b
+    95:95:net.minecraft.advancements.critereon.EntityTypePredicate of(net.minecraft.tags.Tag) -> a
+    85:85:com.google.gson.JsonSyntaxException lambda$fromJson$0(net.minecraft.resources.ResourceLocation) -> a
     18:30:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.EntityTypePredicate$1 -> bc$1:
+net.minecraft.advancements.critereon.EntityTypePredicate$1 -> bf$1:
     18:18:void <init>() -> <init>
     21:21:boolean matches(net.minecraft.world.entity.EntityType) -> a
     26:26:com.google.gson.JsonElement serializeToJson() -> a
-net.minecraft.advancements.critereon.EntityTypePredicate$TagPredicate -> bc$a:
+net.minecraft.advancements.critereon.EntityTypePredicate$TagPredicate -> bf$a:
     net.minecraft.tags.Tag tag -> b
     57:59:void <init>(net.minecraft.tags.Tag) -> <init>
     63:63:boolean matches(net.minecraft.world.entity.EntityType) -> a
     68:68:com.google.gson.JsonElement serializeToJson() -> a
-net.minecraft.advancements.critereon.EntityTypePredicate$TypePredicate -> bc$b:
+net.minecraft.advancements.critereon.EntityTypePredicate$TypePredicate -> bf$b:
     net.minecraft.world.entity.EntityType type -> b
     39:41:void <init>(net.minecraft.world.entity.EntityType) -> <init>
     45:45:boolean matches(net.minecraft.world.entity.EntityType) -> a
     50:50:com.google.gson.JsonElement serializeToJson() -> a
-net.minecraft.advancements.critereon.FilledBucketTrigger -> bd:
+net.minecraft.advancements.critereon.FilledBucketTrigger -> bg:
     net.minecraft.resources.ResourceLocation ID -> a
-    10:10:void <init>() -> <init>
-    15:15:net.minecraft.resources.ResourceLocation getId() -> a
-    20:21:net.minecraft.advancements.critereon.FilledBucketTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    25:26:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack) -> a
-    10:10:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    25:25:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.FilledBucketTrigger$TriggerInstance) -> a
-    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.FilledBucketTrigger$TriggerInstance -> bd$a:
+    8:8:void <init>() -> <init>
+    13:13:net.minecraft.resources.ResourceLocation getId() -> a
+    18:19:net.minecraft.advancements.critereon.FilledBucketTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    23:24:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack) -> a
+    8:8:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    23:23:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.FilledBucketTrigger$TriggerInstance) -> a
+    8:8:net.minecraft.resources.ResourceLocation access$000() -> b
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.FilledBucketTrigger$TriggerInstance -> bg$a:
     net.minecraft.advancements.critereon.ItemPredicate item -> a
-    32:34:void <init>(net.minecraft.advancements.critereon.ItemPredicate) -> <init>
-    37:37:net.minecraft.advancements.critereon.FilledBucketTrigger$TriggerInstance filledBucket(net.minecraft.advancements.critereon.ItemPredicate) -> a
-    41:44:boolean matches(net.minecraft.world.item.ItemStack) -> a
-    49:53:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.FishingRodHookedTrigger -> be:
+    30:32:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
+    35:35:net.minecraft.advancements.critereon.FilledBucketTrigger$TriggerInstance filledBucket(net.minecraft.advancements.critereon.ItemPredicate) -> a
+    39:42:boolean matches(net.minecraft.world.item.ItemStack) -> a
+    47:51:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.FishingHookPredicate -> bh:
+    net.minecraft.advancements.critereon.FishingHookPredicate ANY -> a
+    boolean inOpenWater -> b
+    19:21:void <init>(boolean) -> <init>
+    24:24:net.minecraft.advancements.critereon.FishingHookPredicate inOpenWater(boolean) -> a
+    28:37:net.minecraft.advancements.critereon.FishingHookPredicate fromJson(com.google.gson.JsonElement) -> a
+    41:47:com.google.gson.JsonElement serializeToJson() -> a
+    51:60:boolean matches(net.minecraft.world.entity.Entity) -> a
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.FishingRodHookedTrigger -> bi:
     net.minecraft.resources.ResourceLocation ID -> a
-    14:14:void <init>() -> <init>
-    19:19:net.minecraft.resources.ResourceLocation getId() -> a
-    24:27:net.minecraft.advancements.critereon.FishingRodHookedTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    31:32:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.fishing.FishingHook,java.util.Collection) -> a
-    14:14:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    31:31:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.fishing.FishingHook,java.util.Collection,net.minecraft.advancements.critereon.FishingRodHookedTrigger$TriggerInstance) -> a
-    14:14:net.minecraft.resources.ResourceLocation access$000() -> b
-    15:15:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.FishingRodHookedTrigger$TriggerInstance -> be$a:
+    15:15:void <init>() -> <init>
+    20:20:net.minecraft.resources.ResourceLocation getId() -> a
+    25:28:net.minecraft.advancements.critereon.FishingRodHookedTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    32:34:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.FishingHook,java.util.Collection) -> a
+    15:15:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    33:33:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext,java.util.Collection,net.minecraft.advancements.critereon.FishingRodHookedTrigger$TriggerInstance) -> a
+    15:15:net.minecraft.resources.ResourceLocation access$000() -> b
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.FishingRodHookedTrigger$TriggerInstance -> bi$a:
     net.minecraft.advancements.critereon.ItemPredicate rod -> a
-    net.minecraft.advancements.critereon.EntityPredicate entity -> b
+    net.minecraft.advancements.critereon.EntityPredicate$Composite entity -> b
     net.minecraft.advancements.critereon.ItemPredicate item -> c
-    40:44:void <init>(net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
-    47:47:net.minecraft.advancements.critereon.FishingRodHookedTrigger$TriggerInstance fishedItem(net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.ItemPredicate) -> a
-    51:75:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.fishing.FishingHook,java.util.Collection) -> a
-    80:86:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.FluidPredicate -> bf:
+    42:46:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
+    49:49:net.minecraft.advancements.critereon.FishingRodHookedTrigger$TriggerInstance fishedItem(net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.ItemPredicate) -> a
+    53:79:boolean matches(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext,java.util.Collection) -> a
+    84:90:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.FluidPredicate -> bj:
     net.minecraft.advancements.critereon.FluidPredicate ANY -> a
     net.minecraft.tags.Tag tag -> b
     net.minecraft.world.level.material.Fluid fluid -> c
@@ -5581,7 +5481,7 @@ net.minecraft.advancements.critereon.FluidPredicate -> bf:
     57:77:net.minecraft.advancements.critereon.FluidPredicate fromJson(com.google.gson.JsonElement) -> a
     81:94:com.google.gson.JsonElement serializeToJson() -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.FluidPredicate$Builder -> bf$a:
+net.minecraft.advancements.critereon.FluidPredicate$Builder -> bj$a:
     net.minecraft.world.level.material.Fluid fluid -> a
     net.minecraft.tags.Tag fluids -> b
     net.minecraft.advancements.critereon.StatePropertiesPredicate properties -> c
@@ -5591,58 +5491,80 @@ net.minecraft.advancements.critereon.FluidPredicate$Builder -> bf$a:
     117:118:net.minecraft.advancements.critereon.FluidPredicate$Builder of(net.minecraft.tags.Tag) -> a
     122:123:net.minecraft.advancements.critereon.FluidPredicate$Builder setProperties(net.minecraft.advancements.critereon.StatePropertiesPredicate) -> a
     127:127:net.minecraft.advancements.critereon.FluidPredicate build() -> b
-net.minecraft.advancements.critereon.ImpossibleTrigger -> bg:
+net.minecraft.advancements.critereon.ImpossibleTrigger -> bk:
     net.minecraft.resources.ResourceLocation ID -> a
     9:9:void <init>() -> <init>
     14:14:net.minecraft.resources.ResourceLocation getId() -> a
     19:19:void addPlayerListener(net.minecraft.server.PlayerAdvancements,net.minecraft.advancements.CriterionTrigger$Listener) -> a
     23:23:void removePlayerListener(net.minecraft.server.PlayerAdvancements,net.minecraft.advancements.CriterionTrigger$Listener) -> b
     27:27:void removePlayerListeners(net.minecraft.server.PlayerAdvancements) -> a
-    31:31:net.minecraft.advancements.critereon.ImpossibleTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    9:9:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    31:31:net.minecraft.advancements.critereon.ImpossibleTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    9:9:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.DeserializationContext) -> a
     9:9:net.minecraft.resources.ResourceLocation access$000() -> b
     10:10:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.ImpossibleTrigger$TriggerInstance -> bg$a:
-    36:37:void <init>() -> <init>
-net.minecraft.advancements.critereon.InventoryChangeTrigger -> bh:
+net.minecraft.advancements.critereon.ImpossibleTrigger$TriggerInstance -> bk$a:
+    34:34:void <init>() -> <init>
+    37:37:net.minecraft.resources.ResourceLocation getCriterion() -> a
+    42:42:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.InventoryChangeTrigger -> bl:
     net.minecraft.resources.ResourceLocation ID -> a
-    18:18:void <init>() -> <init>
-    23:23:net.minecraft.resources.ResourceLocation getId() -> a
-    28:33:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    37:38:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.player.Inventory) -> a
-    18:18:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    37:37:boolean lambda$trigger$0(net.minecraft.world.entity.player.Inventory,net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance) -> a
-    18:18:net.minecraft.resources.ResourceLocation access$000() -> b
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance -> bh$a:
+    15:15:void <init>() -> <init>
+    20:20:net.minecraft.resources.ResourceLocation getId() -> a
+    25:30:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    34:51:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.player.Inventory,net.minecraft.world.item.ItemStack) -> a
+    54:55:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.player.Inventory,net.minecraft.world.item.ItemStack,int,int,int) -> a
+    15:15:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    54:54:boolean lambda$trigger$0(net.minecraft.world.entity.player.Inventory,net.minecraft.world.item.ItemStack,int,int,int,net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance) -> a
+    15:15:net.minecraft.resources.ResourceLocation access$000() -> b
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance -> bl$a:
     net.minecraft.advancements.critereon.MinMaxBounds$Ints slotsOccupied -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Ints slotsFull -> b
     net.minecraft.advancements.critereon.MinMaxBounds$Ints slotsEmpty -> c
     net.minecraft.advancements.critereon.ItemPredicate[] predicates -> d
-    47:52:void <init>(net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.ItemPredicate[]) -> <init>
-    55:55:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance hasItem(net.minecraft.advancements.critereon.ItemPredicate[]) -> a
-    59:63:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance hasItem(net.minecraft.world.level.ItemLike[]) -> a
-    68:86:com.google.gson.JsonElement serializeToJson() -> b
-    91:124:boolean matches(net.minecraft.world.entity.player.Inventory) -> a
-net.minecraft.advancements.critereon.ItemDurabilityTrigger -> bi:
+    64:69:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.ItemPredicate[]) -> <init>
+    72:72:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance hasItems(net.minecraft.advancements.critereon.ItemPredicate[]) -> a
+    76:80:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance hasItems(net.minecraft.world.level.ItemLike[]) -> a
+    85:103:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+    107:140:boolean matches(net.minecraft.world.entity.player.Inventory,net.minecraft.world.item.ItemStack,int,int,int) -> a
+    137:137:boolean lambda$matches$0(net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.ItemPredicate) -> a
+net.minecraft.advancements.critereon.ItemDurabilityTrigger -> bm:
     net.minecraft.resources.ResourceLocation ID -> a
-    10:10:void <init>() -> <init>
-    15:15:net.minecraft.resources.ResourceLocation getId() -> a
-    20:23:net.minecraft.advancements.critereon.ItemDurabilityTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    27:28:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,int) -> a
-    10:10:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    27:27:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,int,net.minecraft.advancements.critereon.ItemDurabilityTrigger$TriggerInstance) -> a
-    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.ItemDurabilityTrigger$TriggerInstance -> bi$a:
+    8:8:void <init>() -> <init>
+    13:13:net.minecraft.resources.ResourceLocation getId() -> a
+    18:21:net.minecraft.advancements.critereon.ItemDurabilityTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    25:26:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,int) -> a
+    8:8:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    25:25:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,int,net.minecraft.advancements.critereon.ItemDurabilityTrigger$TriggerInstance) -> a
+    8:8:net.minecraft.resources.ResourceLocation access$000() -> b
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.ItemDurabilityTrigger$TriggerInstance -> bm$a:
     net.minecraft.advancements.critereon.ItemPredicate item -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Ints durability -> b
     net.minecraft.advancements.critereon.MinMaxBounds$Ints delta -> c
-    36:40:void <init>(net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
-    43:43:net.minecraft.advancements.critereon.ItemDurabilityTrigger$TriggerInstance changedDurability(net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> a
-    47:56:boolean matches(net.minecraft.world.item.ItemStack,int) -> a
-    61:67:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.ItemPredicate -> bj:
+    34:38:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
+    41:41:net.minecraft.advancements.critereon.ItemDurabilityTrigger$TriggerInstance changedDurability(net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> a
+    45:45:net.minecraft.advancements.critereon.ItemDurabilityTrigger$TriggerInstance changedDurability(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> a
+    49:58:boolean matches(net.minecraft.world.item.ItemStack,int) -> a
+    63:69:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.ItemPickedUpByEntityTrigger -> bn:
+    net.minecraft.resources.ResourceLocation ID -> a
+    10:10:void <init>() -> <init>
+    15:15:net.minecraft.resources.ResourceLocation getId() -> a
+    20:22:net.minecraft.advancements.critereon.ItemPickedUpByEntityTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    26:28:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.Entity) -> a
+    10:10:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    27:27:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.advancements.critereon.ItemPickedUpByEntityTrigger$TriggerInstance) -> a
+    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.ItemPickedUpByEntityTrigger$TriggerInstance -> bn$a:
+    net.minecraft.advancements.critereon.ItemPredicate item -> a
+    net.minecraft.advancements.critereon.EntityPredicate$Composite entity -> b
+    35:38:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> <init>
+    41:41:net.minecraft.advancements.critereon.ItemPickedUpByEntityTrigger$TriggerInstance itemPickedUpByEntity(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate$Builder,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> a
+    45:53:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    58:61:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.ItemPredicate -> bo:
     net.minecraft.advancements.critereon.ItemPredicate ANY -> a
     net.minecraft.tags.Tag tag -> b
     net.minecraft.world.item.Item item -> c
@@ -5661,7 +5583,7 @@ net.minecraft.advancements.critereon.ItemPredicate -> bj:
     140:140:com.google.gson.JsonSyntaxException lambda$fromJson$1(net.minecraft.resources.ResourceLocation) -> a
     127:127:com.google.gson.JsonSyntaxException lambda$fromJson$0(net.minecraft.resources.ResourceLocation) -> b
     30:30:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.ItemPredicate$Builder -> bj$a:
+net.minecraft.advancements.critereon.ItemPredicate$Builder -> bo$a:
     java.util.List enchantments -> a
     java.util.List storedEnchantments -> b
     net.minecraft.world.item.Item item -> c
@@ -5681,54 +5603,54 @@ net.minecraft.advancements.critereon.ItemPredicate$Builder -> bj$a:
     256:257:net.minecraft.advancements.critereon.ItemPredicate$Builder hasEnchantment(net.minecraft.advancements.critereon.EnchantmentPredicate) -> a
     261:262:net.minecraft.advancements.critereon.ItemPredicate$Builder hasStoredEnchantment(net.minecraft.advancements.critereon.EnchantmentPredicate) -> b
     266:266:net.minecraft.advancements.critereon.ItemPredicate build() -> b
-net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger -> bk:
-    net.minecraft.resources.ResourceLocation id -> a
-    17:19:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    23:23:net.minecraft.resources.ResourceLocation getId() -> a
-    28:32:net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    36:39:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    14:14:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    38:38:boolean lambda$trigger$0(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerPlayer,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger$TriggerInstance) -> a
-    14:14:net.minecraft.resources.ResourceLocation access$000(net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger) -> a
-net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger$TriggerInstance -> bk$a:
-    net.minecraft.advancements.critereon.BlockPredicate block -> a
-    net.minecraft.advancements.critereon.StatePropertiesPredicate state -> b
-    net.minecraft.advancements.critereon.ItemPredicate item -> c
-    47:51:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.critereon.BlockPredicate,net.minecraft.advancements.critereon.StatePropertiesPredicate,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
-    54:54:net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger$TriggerInstance safelyHarvestedHoney(net.minecraft.advancements.critereon.BlockPredicate$Builder,net.minecraft.advancements.critereon.ItemPredicate$Builder) -> a
-    58:67:boolean matches(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    72:78:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.KilledByCrossbowTrigger -> bl:
+net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger -> bp:
     net.minecraft.resources.ResourceLocation ID -> a
-    18:18:void <init>() -> <init>
-    23:23:net.minecraft.resources.ResourceLocation getId() -> a
-    28:30:net.minecraft.advancements.critereon.KilledByCrossbowTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    34:35:void trigger(net.minecraft.server.level.ServerPlayer,java.util.Collection,int) -> a
-    18:18:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    34:34:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,java.util.Collection,int,net.minecraft.advancements.critereon.KilledByCrossbowTrigger$TriggerInstance) -> a
-    18:18:net.minecraft.resources.ResourceLocation access$000() -> b
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.KilledByCrossbowTrigger$TriggerInstance -> bl$a:
-    net.minecraft.advancements.critereon.EntityPredicate[] victims -> a
+    11:11:void <init>() -> <init>
+    16:16:net.minecraft.resources.ResourceLocation getId() -> a
+    21:24:net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    28:31:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    11:11:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    30:30:boolean lambda$trigger$0(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerPlayer,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger$TriggerInstance) -> a
+    11:11:net.minecraft.resources.ResourceLocation access$000() -> b
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger$TriggerInstance -> bp$a:
+    net.minecraft.advancements.critereon.LocationPredicate location -> a
+    net.minecraft.advancements.critereon.ItemPredicate item -> b
+    38:41:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
+    44:44:net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger$TriggerInstance itemUsedOnBlock(net.minecraft.advancements.critereon.LocationPredicate$Builder,net.minecraft.advancements.critereon.ItemPredicate$Builder) -> a
+    48:51:boolean matches(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    56:61:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.KilledByCrossbowTrigger -> bq:
+    net.minecraft.resources.ResourceLocation ID -> a
+    17:17:void <init>() -> <init>
+    22:22:net.minecraft.resources.ResourceLocation getId() -> a
+    27:29:net.minecraft.advancements.critereon.KilledByCrossbowTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    33:41:void trigger(net.minecraft.server.level.ServerPlayer,java.util.Collection) -> a
+    17:17:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    40:40:boolean lambda$trigger$0(java.util.List,java.util.Set,net.minecraft.advancements.critereon.KilledByCrossbowTrigger$TriggerInstance) -> a
+    17:17:net.minecraft.resources.ResourceLocation access$000() -> b
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.KilledByCrossbowTrigger$TriggerInstance -> bq$a:
+    net.minecraft.advancements.critereon.EntityPredicate$Composite[] victims -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Ints uniqueEntityTypes -> b
-    42:45:void <init>(net.minecraft.advancements.critereon.EntityPredicate[],net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
-    48:53:net.minecraft.advancements.critereon.KilledByCrossbowTrigger$TriggerInstance crossbowKilled(net.minecraft.advancements.critereon.EntityPredicate$Builder[]) -> a
-    57:58:net.minecraft.advancements.critereon.KilledByCrossbowTrigger$TriggerInstance crossbowKilled(net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> a
-    62:89:boolean matches(net.minecraft.server.level.ServerPlayer,java.util.Collection,int) -> a
-    94:99:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.KilledTrigger -> bm:
+    48:51:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite[],net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
+    54:59:net.minecraft.advancements.critereon.KilledByCrossbowTrigger$TriggerInstance crossbowKilled(net.minecraft.advancements.critereon.EntityPredicate$Builder[]) -> a
+    63:64:net.minecraft.advancements.critereon.KilledByCrossbowTrigger$TriggerInstance crossbowKilled(net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> a
+    68:87:boolean matches(java.util.Collection,int) -> a
+    92:97:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.KilledTrigger -> br:
     net.minecraft.resources.ResourceLocation id -> a
-    15:17:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    21:21:net.minecraft.resources.ResourceLocation getId() -> a
-    26:26:net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    30:31:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource) -> a
-    12:12:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    30:30:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource,net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance) -> a
-    12:12:net.minecraft.resources.ResourceLocation access$000(net.minecraft.advancements.critereon.KilledTrigger) -> a
-net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance -> bm$a:
-    net.minecraft.advancements.critereon.EntityPredicate entityPredicate -> a
+    14:16:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
+    20:20:net.minecraft.resources.ResourceLocation getId() -> a
+    25:25:net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    29:31:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource) -> a
+    11:11:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    30:30:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.damagesource.DamageSource,net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance) -> a
+    11:11:net.minecraft.resources.ResourceLocation access$000(net.minecraft.advancements.critereon.KilledTrigger) -> a
+net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance -> br$a:
+    net.minecraft.advancements.critereon.EntityPredicate$Composite entityPredicate -> a
     net.minecraft.advancements.critereon.DamageSourcePredicate killingBlow -> b
-    38:41:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.DamageSourcePredicate) -> <init>
+    38:41:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DamageSourcePredicate) -> <init>
     44:44:net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance playerKilledEntity(net.minecraft.advancements.critereon.EntityPredicate) -> a
     48:48:net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance playerKilledEntity(net.minecraft.advancements.critereon.EntityPredicate$Builder) -> a
     52:52:net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance playerKilledEntity() -> c
@@ -5743,26 +5665,26 @@ net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance -> bm$a:
     88:88:net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance entityKilledPlayer(net.minecraft.advancements.critereon.EntityPredicate$Builder,net.minecraft.advancements.critereon.DamageSourcePredicate) -> b
     92:92:net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance entityKilledPlayer(net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.DamageSourcePredicate$Builder) -> b
     96:96:net.minecraft.advancements.critereon.KilledTrigger$TriggerInstance entityKilledPlayer(net.minecraft.advancements.critereon.EntityPredicate$Builder,net.minecraft.advancements.critereon.DamageSourcePredicate$Builder) -> b
-    100:103:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource) -> a
-    108:113:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.LevitationTrigger -> bn:
+    100:103:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.damagesource.DamageSource) -> a
+    108:113:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.LevitationTrigger -> bs:
     net.minecraft.resources.ResourceLocation ID -> a
-    10:10:void <init>() -> <init>
-    15:15:net.minecraft.resources.ResourceLocation getId() -> a
-    20:22:net.minecraft.advancements.critereon.LevitationTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    26:27:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.phys.Vec3,int) -> a
-    10:10:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    26:26:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.phys.Vec3,int,net.minecraft.advancements.critereon.LevitationTrigger$TriggerInstance) -> a
-    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.LevitationTrigger$TriggerInstance -> bn$a:
+    8:8:void <init>() -> <init>
+    13:13:net.minecraft.resources.ResourceLocation getId() -> a
+    18:20:net.minecraft.advancements.critereon.LevitationTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    24:25:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.phys.Vec3,int) -> a
+    8:8:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    24:24:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.phys.Vec3,int,net.minecraft.advancements.critereon.LevitationTrigger$TriggerInstance) -> a
+    8:8:net.minecraft.resources.ResourceLocation access$000() -> b
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.LevitationTrigger$TriggerInstance -> bs$a:
     net.minecraft.advancements.critereon.DistancePredicate distance -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Ints duration -> b
-    34:37:void <init>(net.minecraft.advancements.critereon.DistancePredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
-    40:40:net.minecraft.advancements.critereon.LevitationTrigger$TriggerInstance levitated(net.minecraft.advancements.critereon.DistancePredicate) -> a
-    44:50:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.phys.Vec3,int) -> a
-    55:60:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.LightPredicate -> bo:
+    32:35:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DistancePredicate,net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
+    38:38:net.minecraft.advancements.critereon.LevitationTrigger$TriggerInstance levitated(net.minecraft.advancements.critereon.DistancePredicate) -> a
+    42:48:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.phys.Vec3,int) -> a
+    53:58:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.LightPredicate -> bt:
     net.minecraft.advancements.critereon.LightPredicate ANY -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Ints composite -> b
     17:19:void <init>(net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> <init>
@@ -5771,74 +5693,96 @@ net.minecraft.advancements.critereon.LightPredicate -> bo:
     45:50:net.minecraft.advancements.critereon.LightPredicate fromJson(com.google.gson.JsonElement) -> a
     12:12:void <init>(net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.LightPredicate$1) -> <init>
     13:13:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.LightPredicate$1 -> bo$1:
-net.minecraft.advancements.critereon.LightPredicate$Builder -> bo$a:
+net.minecraft.advancements.critereon.LightPredicate$1 -> bt$1:
+net.minecraft.advancements.critereon.LightPredicate$Builder -> bt$a:
     net.minecraft.advancements.critereon.MinMaxBounds$Ints composite -> a
     53:54:void <init>() -> <init>
     57:57:net.minecraft.advancements.critereon.LightPredicate$Builder light() -> a
     61:62:net.minecraft.advancements.critereon.LightPredicate$Builder setComposite(net.minecraft.advancements.critereon.MinMaxBounds$Ints) -> a
     66:66:net.minecraft.advancements.critereon.LightPredicate build() -> b
-net.minecraft.advancements.critereon.LocationPredicate -> bp:
+net.minecraft.advancements.critereon.LocationPredicate -> bu:
+    org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.advancements.critereon.LocationPredicate ANY -> a
-    net.minecraft.advancements.critereon.MinMaxBounds$Floats x -> b
-    net.minecraft.advancements.critereon.MinMaxBounds$Floats y -> c
-    net.minecraft.advancements.critereon.MinMaxBounds$Floats z -> d
-    net.minecraft.world.level.biome.Biome biome -> e
-    net.minecraft.world.level.levelgen.feature.StructureFeature feature -> f
-    net.minecraft.world.level.dimension.DimensionType dimension -> g
-    net.minecraft.advancements.critereon.LightPredicate light -> h
-    net.minecraft.advancements.critereon.BlockPredicate block -> i
-    net.minecraft.advancements.critereon.FluidPredicate fluid -> j
-    35:45:void <init>(net.minecraft.advancements.critereon.MinMaxBounds$Floats,net.minecraft.advancements.critereon.MinMaxBounds$Floats,net.minecraft.advancements.critereon.MinMaxBounds$Floats,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.dimension.DimensionType,net.minecraft.advancements.critereon.LightPredicate,net.minecraft.advancements.critereon.BlockPredicate,net.minecraft.advancements.critereon.FluidPredicate) -> <init>
-    48:48:net.minecraft.advancements.critereon.LocationPredicate inBiome(net.minecraft.world.level.biome.Biome) -> a
-    52:52:net.minecraft.advancements.critereon.LocationPredicate inDimension(net.minecraft.world.level.dimension.DimensionType) -> a
-    56:56:net.minecraft.advancements.critereon.LocationPredicate inFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
-    60:60:boolean matches(net.minecraft.server.level.ServerLevel,double,double,double) -> a
-    64:96:boolean matches(net.minecraft.server.level.ServerLevel,float,float,float) -> a
-    100:126:com.google.gson.JsonElement serializeToJson() -> a
-    130:148:net.minecraft.advancements.critereon.LocationPredicate fromJson(com.google.gson.JsonElement) -> a
-    143:143:com.google.gson.JsonSyntaxException lambda$fromJson$0(net.minecraft.resources.ResourceLocation) -> a
-    20:20:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.LocationPredicate$Builder -> bp$a:
+    net.minecraft.advancements.critereon.MinMaxBounds$Floats x -> c
+    net.minecraft.advancements.critereon.MinMaxBounds$Floats y -> d
+    net.minecraft.advancements.critereon.MinMaxBounds$Floats z -> e
+    net.minecraft.world.level.biome.Biome biome -> f
+    net.minecraft.world.level.levelgen.feature.StructureFeature feature -> g
+    net.minecraft.resources.ResourceKey dimension -> h
+    java.lang.Boolean smokey -> i
+    net.minecraft.advancements.critereon.LightPredicate light -> j
+    net.minecraft.advancements.critereon.BlockPredicate block -> k
+    net.minecraft.advancements.critereon.FluidPredicate fluid -> l
+    43:54:void <init>(net.minecraft.advancements.critereon.MinMaxBounds$Floats,net.minecraft.advancements.critereon.MinMaxBounds$Floats,net.minecraft.advancements.critereon.MinMaxBounds$Floats,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.resources.ResourceKey,java.lang.Boolean,net.minecraft.advancements.critereon.LightPredicate,net.minecraft.advancements.critereon.BlockPredicate,net.minecraft.advancements.critereon.FluidPredicate) -> <init>
+    57:57:net.minecraft.advancements.critereon.LocationPredicate inBiome(net.minecraft.world.level.biome.Biome) -> a
+    61:61:net.minecraft.advancements.critereon.LocationPredicate inDimension(net.minecraft.resources.ResourceKey) -> a
+    65:65:net.minecraft.advancements.critereon.LocationPredicate inFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    69:69:boolean matches(net.minecraft.server.level.ServerLevel,double,double,double) -> a
+    73:108:boolean matches(net.minecraft.server.level.ServerLevel,float,float,float) -> a
+    112:141:com.google.gson.JsonElement serializeToJson() -> a
+    145:164:net.minecraft.advancements.critereon.LocationPredicate fromJson(com.google.gson.JsonElement) -> a
+    158:158:com.google.gson.JsonSyntaxException lambda$fromJson$2(net.minecraft.resources.ResourceLocation) -> a
+    153:153:net.minecraft.resources.ResourceKey lambda$fromJson$1(net.minecraft.resources.ResourceLocation) -> b
+    126:126:void lambda$serializeToJson$0(com.google.gson.JsonObject,com.google.gson.JsonElement) -> a
+    24:26:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.LocationPredicate$Builder -> bu$a:
     net.minecraft.advancements.critereon.MinMaxBounds$Floats x -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Floats y -> b
     net.minecraft.advancements.critereon.MinMaxBounds$Floats z -> c
     net.minecraft.world.level.biome.Biome biome -> d
     net.minecraft.world.level.levelgen.feature.StructureFeature feature -> e
-    net.minecraft.world.level.dimension.DimensionType dimension -> f
-    net.minecraft.advancements.critereon.LightPredicate light -> g
-    net.minecraft.advancements.critereon.BlockPredicate block -> h
-    net.minecraft.advancements.critereon.FluidPredicate fluid -> i
-    151:165:void <init>() -> <init>
-    168:168:net.minecraft.advancements.critereon.LocationPredicate$Builder location() -> a
-    172:173:net.minecraft.advancements.critereon.LocationPredicate$Builder setX(net.minecraft.advancements.critereon.MinMaxBounds$Floats) -> a
-    177:178:net.minecraft.advancements.critereon.LocationPredicate$Builder setY(net.minecraft.advancements.critereon.MinMaxBounds$Floats) -> b
-    182:183:net.minecraft.advancements.critereon.LocationPredicate$Builder setZ(net.minecraft.advancements.critereon.MinMaxBounds$Floats) -> c
-    187:188:net.minecraft.advancements.critereon.LocationPredicate$Builder setBiome(net.minecraft.world.level.biome.Biome) -> a
-    192:193:net.minecraft.advancements.critereon.LocationPredicate$Builder setFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
-    197:198:net.minecraft.advancements.critereon.LocationPredicate$Builder setDimension(net.minecraft.world.level.dimension.DimensionType) -> a
-    202:203:net.minecraft.advancements.critereon.LocationPredicate$Builder setLight(net.minecraft.advancements.critereon.LightPredicate) -> a
-    207:208:net.minecraft.advancements.critereon.LocationPredicate$Builder setBlock(net.minecraft.advancements.critereon.BlockPredicate) -> a
-    212:213:net.minecraft.advancements.critereon.LocationPredicate$Builder setFluid(net.minecraft.advancements.critereon.FluidPredicate) -> a
-    217:217:net.minecraft.advancements.critereon.LocationPredicate build() -> b
-net.minecraft.advancements.critereon.LocationTrigger -> bq:
+    net.minecraft.resources.ResourceKey dimension -> f
+    java.lang.Boolean smokey -> g
+    net.minecraft.advancements.critereon.LightPredicate light -> h
+    net.minecraft.advancements.critereon.BlockPredicate block -> i
+    net.minecraft.advancements.critereon.FluidPredicate fluid -> j
+    167:183:void <init>() -> <init>
+    186:186:net.minecraft.advancements.critereon.LocationPredicate$Builder location() -> a
+    190:191:net.minecraft.advancements.critereon.LocationPredicate$Builder setX(net.minecraft.advancements.critereon.MinMaxBounds$Floats) -> a
+    195:196:net.minecraft.advancements.critereon.LocationPredicate$Builder setY(net.minecraft.advancements.critereon.MinMaxBounds$Floats) -> b
+    200:201:net.minecraft.advancements.critereon.LocationPredicate$Builder setZ(net.minecraft.advancements.critereon.MinMaxBounds$Floats) -> c
+    205:206:net.minecraft.advancements.critereon.LocationPredicate$Builder setBiome(net.minecraft.world.level.biome.Biome) -> a
+    210:211:net.minecraft.advancements.critereon.LocationPredicate$Builder setFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    215:216:net.minecraft.advancements.critereon.LocationPredicate$Builder setDimension(net.minecraft.resources.ResourceKey) -> a
+    220:221:net.minecraft.advancements.critereon.LocationPredicate$Builder setLight(net.minecraft.advancements.critereon.LightPredicate) -> a
+    225:226:net.minecraft.advancements.critereon.LocationPredicate$Builder setBlock(net.minecraft.advancements.critereon.BlockPredicate) -> a
+    230:231:net.minecraft.advancements.critereon.LocationPredicate$Builder setFluid(net.minecraft.advancements.critereon.FluidPredicate) -> a
+    235:236:net.minecraft.advancements.critereon.LocationPredicate$Builder setSmokey(java.lang.Boolean) -> a
+    240:240:net.minecraft.advancements.critereon.LocationPredicate build() -> b
+net.minecraft.advancements.critereon.LocationTrigger -> bv:
     net.minecraft.resources.ResourceLocation id -> a
-    14:16:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    20:20:net.minecraft.resources.ResourceLocation getId() -> a
-    25:26:net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    30:31:void trigger(net.minecraft.server.level.ServerPlayer) -> a
-    11:11:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    30:30:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance) -> a
-    11:11:net.minecraft.resources.ResourceLocation access$000(net.minecraft.advancements.critereon.LocationTrigger) -> a
-net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance -> bq$a:
+    13:15:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
+    19:19:net.minecraft.resources.ResourceLocation getId() -> a
+    25:27:net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    31:32:void trigger(net.minecraft.server.level.ServerPlayer) -> a
+    10:10:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    31:31:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance) -> a
+    10:10:net.minecraft.resources.ResourceLocation access$000(net.minecraft.advancements.critereon.LocationTrigger) -> a
+net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance -> bv$a:
     net.minecraft.advancements.critereon.LocationPredicate location -> a
-    37:39:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.critereon.LocationPredicate) -> <init>
-    42:42:net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance located(net.minecraft.advancements.critereon.LocationPredicate) -> a
-    46:46:net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance sleptInBed() -> c
-    50:50:net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance raidWon() -> d
-    54:54:boolean matches(net.minecraft.server.level.ServerLevel,double,double,double) -> a
-    59:59:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.MinMaxBounds -> br:
+    38:40:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.LocationPredicate) -> <init>
+    43:43:net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance located(net.minecraft.advancements.critereon.LocationPredicate) -> a
+    47:47:net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance sleptInBed() -> c
+    51:51:net.minecraft.advancements.critereon.LocationTrigger$TriggerInstance raidWon() -> d
+    55:55:boolean matches(net.minecraft.server.level.ServerLevel,double,double,double) -> a
+    60:62:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.LootTableTrigger -> bw:
+    net.minecraft.resources.ResourceLocation ID -> a
+    8:8:void <init>() -> <init>
+    13:13:net.minecraft.resources.ResourceLocation getId() -> a
+    18:20:net.minecraft.advancements.critereon.LootTableTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    24:25:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.resources.ResourceLocation) -> a
+    8:8:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    24:24:boolean lambda$trigger$0(net.minecraft.resources.ResourceLocation,net.minecraft.advancements.critereon.LootTableTrigger$TriggerInstance) -> a
+    8:8:net.minecraft.resources.ResourceLocation access$000() -> b
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.LootTableTrigger$TriggerInstance -> bw$a:
+    net.minecraft.resources.ResourceLocation lootTable -> a
+    31:33:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.resources.ResourceLocation) -> <init>
+    36:36:net.minecraft.advancements.critereon.LootTableTrigger$TriggerInstance lootTableUsed(net.minecraft.resources.ResourceLocation) -> a
+    40:40:boolean matches(net.minecraft.resources.ResourceLocation) -> b
+    45:47:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.MinMaxBounds -> bx:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_EMPTY -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_SWAPPED -> b
     java.lang.Number min -> c
@@ -5854,11 +5798,11 @@ net.minecraft.advancements.critereon.MinMaxBounds -> br:
     287:296:boolean isAllowedInputChat(com.mojang.brigadier.StringReader) -> a
     301:301:java.lang.Object optionallyFormat(java.lang.Object,java.util.function.Function) -> a
     168:169:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.MinMaxBounds$BoundsFactory -> br$a:
+net.minecraft.advancements.critereon.MinMaxBounds$BoundsFactory -> bx$a:
     net.minecraft.advancements.critereon.MinMaxBounds create(java.lang.Number,java.lang.Number) -> create
-net.minecraft.advancements.critereon.MinMaxBounds$BoundsFromReaderFactory -> br$b:
+net.minecraft.advancements.critereon.MinMaxBounds$BoundsFromReaderFactory -> bx$b:
     net.minecraft.advancements.critereon.MinMaxBounds create(com.mojang.brigadier.StringReader,java.lang.Number,java.lang.Number) -> create
-net.minecraft.advancements.critereon.MinMaxBounds$Floats -> br$c:
+net.minecraft.advancements.critereon.MinMaxBounds$Floats -> bx$c:
     net.minecraft.advancements.critereon.MinMaxBounds$Floats ANY -> e
     java.lang.Double minSq -> f
     java.lang.Double maxSq -> g
@@ -5876,7 +5820,7 @@ net.minecraft.advancements.critereon.MinMaxBounds$Floats -> br$c:
     164:164:net.minecraft.advancements.critereon.MinMaxBounds$Floats fromReader(com.mojang.brigadier.StringReader,java.util.function.Function) -> a
     160:160:java.lang.Float lambda$fromReader$0(java.lang.Float) -> b
     95:95:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.MinMaxBounds$Ints -> br$d:
+net.minecraft.advancements.critereon.MinMaxBounds$Ints -> bx$d:
     net.minecraft.advancements.critereon.MinMaxBounds$Ints ANY -> e
     java.lang.Long minSq -> f
     java.lang.Long maxSq -> g
@@ -5894,7 +5838,7 @@ net.minecraft.advancements.critereon.MinMaxBounds$Ints -> br$d:
     90:90:net.minecraft.advancements.critereon.MinMaxBounds$Ints fromReader(com.mojang.brigadier.StringReader,java.util.function.Function) -> a
     86:86:java.lang.Integer lambda$fromReader$0(java.lang.Integer) -> b
     21:21:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.MobEffectsPredicate -> bs:
+net.minecraft.advancements.critereon.MobEffectsPredicate -> by:
     net.minecraft.advancements.critereon.MobEffectsPredicate ANY -> a
     java.util.Map effects -> b
     25:27:void <init>(java.util.Map) -> <init>
@@ -5908,7 +5852,7 @@ net.minecraft.advancements.critereon.MobEffectsPredicate -> bs:
     93:103:com.google.gson.JsonElement serializeToJson() -> b
     84:84:com.google.gson.JsonSyntaxException lambda$fromJson$0(net.minecraft.resources.ResourceLocation) -> a
     21:21:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.MobEffectsPredicate$MobEffectInstancePredicate -> bs$a:
+net.minecraft.advancements.critereon.MobEffectsPredicate$MobEffectInstancePredicate -> by$a:
     net.minecraft.advancements.critereon.MinMaxBounds$Ints amplifier -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Ints duration -> b
     java.lang.Boolean ambient -> c
@@ -5918,7 +5862,7 @@ net.minecraft.advancements.critereon.MobEffectsPredicate$MobEffectInstancePredic
     126:141:boolean matches(net.minecraft.world.effect.MobEffectInstance) -> a
     145:152:com.google.gson.JsonElement serializeToJson() -> a
     156:160:net.minecraft.advancements.critereon.MobEffectsPredicate$MobEffectInstancePredicate fromJson(com.google.gson.JsonObject) -> a
-net.minecraft.advancements.critereon.NbtPredicate -> bt:
+net.minecraft.advancements.critereon.NbtPredicate -> bz:
     net.minecraft.advancements.critereon.NbtPredicate ANY -> a
     net.minecraft.nbt.CompoundTag tag -> b
     25:27:void <init>(net.minecraft.nbt.CompoundTag) -> <init>
@@ -5929,69 +5873,86 @@ net.minecraft.advancements.critereon.NbtPredicate -> bt:
     64:73:net.minecraft.advancements.critereon.NbtPredicate fromJson(com.google.gson.JsonElement) -> a
     77:84:net.minecraft.nbt.CompoundTag getEntityTagToCompare(net.minecraft.world.entity.Entity) -> b
     20:20:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.NetherTravelTrigger -> bu:
+net.minecraft.advancements.critereon.NetherTravelTrigger -> ca:
     net.minecraft.resources.ResourceLocation ID -> a
-    11:11:void <init>() -> <init>
-    16:16:net.minecraft.resources.ResourceLocation getId() -> a
-    21:24:net.minecraft.advancements.critereon.NetherTravelTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    28:29:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.phys.Vec3) -> a
-    11:11:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    28:28:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.phys.Vec3,net.minecraft.advancements.critereon.NetherTravelTrigger$TriggerInstance) -> a
-    11:11:net.minecraft.resources.ResourceLocation access$000() -> b
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.NetherTravelTrigger$TriggerInstance -> bu$a:
+    9:9:void <init>() -> <init>
+    14:14:net.minecraft.resources.ResourceLocation getId() -> a
+    19:22:net.minecraft.advancements.critereon.NetherTravelTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    26:27:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.phys.Vec3) -> a
+    9:9:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    26:26:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.phys.Vec3,net.minecraft.advancements.critereon.NetherTravelTrigger$TriggerInstance) -> a
+    9:9:net.minecraft.resources.ResourceLocation access$000() -> b
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.NetherTravelTrigger$TriggerInstance -> ca$a:
     net.minecraft.advancements.critereon.LocationPredicate entered -> a
     net.minecraft.advancements.critereon.LocationPredicate exited -> b
     net.minecraft.advancements.critereon.DistancePredicate distance -> c
-    37:41:void <init>(net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.DistancePredicate) -> <init>
-    44:44:net.minecraft.advancements.critereon.NetherTravelTrigger$TriggerInstance travelledThroughNether(net.minecraft.advancements.critereon.DistancePredicate) -> a
-    48:57:boolean matches(net.minecraft.server.level.ServerLevel,net.minecraft.world.phys.Vec3,double,double,double) -> a
-    62:68:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.PlacedBlockTrigger -> bv:
+    35:39:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.DistancePredicate) -> <init>
+    42:42:net.minecraft.advancements.critereon.NetherTravelTrigger$TriggerInstance travelledThroughNether(net.minecraft.advancements.critereon.DistancePredicate) -> a
+    46:55:boolean matches(net.minecraft.server.level.ServerLevel,net.minecraft.world.phys.Vec3,double,double,double) -> a
+    60:66:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.PlacedBlockTrigger -> cb:
     net.minecraft.resources.ResourceLocation ID -> a
-    19:19:void <init>() -> <init>
-    24:24:net.minecraft.resources.ResourceLocation getId() -> a
-    29:39:net.minecraft.advancements.critereon.PlacedBlockTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    44:48:net.minecraft.world.level.block.Block deserializeBlock(com.google.gson.JsonObject) -> a
-    52:54:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    19:19:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    53:53:boolean lambda$trigger$2(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.PlacedBlockTrigger$TriggerInstance) -> a
-    46:46:com.google.gson.JsonSyntaxException lambda$deserializeBlock$1(net.minecraft.resources.ResourceLocation) -> a
-    33:33:void lambda$createInstance$0(net.minecraft.world.level.block.Block,java.lang.String) -> a
-    19:19:net.minecraft.resources.ResourceLocation access$000() -> b
-    20:20:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.PlacedBlockTrigger$TriggerInstance -> bv$a:
+    17:17:void <init>() -> <init>
+    22:22:net.minecraft.resources.ResourceLocation getId() -> a
+    27:37:net.minecraft.advancements.critereon.PlacedBlockTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    42:46:net.minecraft.world.level.block.Block deserializeBlock(com.google.gson.JsonObject) -> a
+    50:52:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    17:17:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    51:51:boolean lambda$trigger$2(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.PlacedBlockTrigger$TriggerInstance) -> a
+    44:44:com.google.gson.JsonSyntaxException lambda$deserializeBlock$1(net.minecraft.resources.ResourceLocation) -> a
+    31:31:void lambda$createInstance$0(net.minecraft.world.level.block.Block,java.lang.String) -> a
+    17:17:net.minecraft.resources.ResourceLocation access$000() -> b
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.PlacedBlockTrigger$TriggerInstance -> cb$a:
     net.minecraft.world.level.block.Block block -> a
     net.minecraft.advancements.critereon.StatePropertiesPredicate state -> b
     net.minecraft.advancements.critereon.LocationPredicate location -> c
     net.minecraft.advancements.critereon.ItemPredicate item -> d
-    63:68:void <init>(net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.StatePropertiesPredicate,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
-    71:71:net.minecraft.advancements.critereon.PlacedBlockTrigger$TriggerInstance placedBlock(net.minecraft.world.level.block.Block) -> a
-    75:87:boolean matches(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel,net.minecraft.world.item.ItemStack) -> a
-    92:101:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.PlayerHurtEntityTrigger -> bw:
+    61:66:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.StatePropertiesPredicate,net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
+    69:69:net.minecraft.advancements.critereon.PlacedBlockTrigger$TriggerInstance placedBlock(net.minecraft.world.level.block.Block) -> a
+    73:85:boolean matches(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel,net.minecraft.world.item.ItemStack) -> a
+    90:99:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.PlayerHurtEntityTrigger -> cc:
     net.minecraft.resources.ResourceLocation ID -> a
-    11:11:void <init>() -> <init>
-    16:16:net.minecraft.resources.ResourceLocation getId() -> a
-    21:23:net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    27:28:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource,float,float,boolean) -> a
-    11:11:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    27:27:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource,float,float,boolean,net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance) -> a
-    11:11:net.minecraft.resources.ResourceLocation access$000() -> b
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance -> bw$a:
+    10:10:void <init>() -> <init>
+    15:15:net.minecraft.resources.ResourceLocation getId() -> a
+    20:22:net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    26:28:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource,float,float,boolean) -> a
+    10:10:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    27:27:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.damagesource.DamageSource,float,float,boolean,net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance) -> a
+    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance -> cc$a:
     net.minecraft.advancements.critereon.DamagePredicate damage -> a
-    net.minecraft.advancements.critereon.EntityPredicate entity -> b
-    35:38:void <init>(net.minecraft.advancements.critereon.DamagePredicate,net.minecraft.advancements.critereon.EntityPredicate) -> <init>
+    net.minecraft.advancements.critereon.EntityPredicate$Composite entity -> b
+    35:38:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DamagePredicate,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> <init>
     41:41:net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance playerHurtEntity() -> c
     45:45:net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance playerHurtEntity(net.minecraft.advancements.critereon.DamagePredicate) -> a
     49:49:net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance playerHurtEntity(net.minecraft.advancements.critereon.DamagePredicate$Builder) -> a
     53:53:net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance playerHurtEntity(net.minecraft.advancements.critereon.EntityPredicate) -> a
     57:57:net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance playerHurtEntity(net.minecraft.advancements.critereon.DamagePredicate,net.minecraft.advancements.critereon.EntityPredicate) -> a
     61:61:net.minecraft.advancements.critereon.PlayerHurtEntityTrigger$TriggerInstance playerHurtEntity(net.minecraft.advancements.critereon.DamagePredicate$Builder,net.minecraft.advancements.critereon.EntityPredicate) -> a
-    65:71:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource,float,float,boolean) -> a
-    76:81:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.PlayerPredicate -> bx:
+    65:71:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.damagesource.DamageSource,float,float,boolean) -> a
+    76:81:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.PlayerInteractTrigger -> cd:
+    net.minecraft.resources.ResourceLocation ID -> a
+    10:10:void <init>() -> <init>
+    15:15:net.minecraft.resources.ResourceLocation getId() -> a
+    20:22:net.minecraft.advancements.critereon.PlayerInteractTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    26:28:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.Entity) -> a
+    10:10:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    27:27:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.advancements.critereon.PlayerInteractTrigger$TriggerInstance) -> a
+    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.PlayerInteractTrigger$TriggerInstance -> cd$a:
+    net.minecraft.advancements.critereon.ItemPredicate item -> a
+    net.minecraft.advancements.critereon.EntityPredicate$Composite entity -> b
+    35:38:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> <init>
+    41:41:net.minecraft.advancements.critereon.PlayerInteractTrigger$TriggerInstance itemUsedOnEntity(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate$Builder,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> a
+    45:49:boolean matches(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    54:57:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.PlayerPredicate -> ce:
     net.minecraft.advancements.critereon.PlayerPredicate ANY -> a
     net.minecraft.advancements.critereon.MinMaxBounds$Ints level -> b
     net.minecraft.world.level.GameType gameType -> c
@@ -6011,22 +5972,22 @@ net.minecraft.advancements.critereon.PlayerPredicate -> bx:
     92:94:void lambda$advancementPredicateFromJson$0(it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Map$Entry) -> a
     32:32:void <init>(net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.world.level.GameType,java.util.Map,it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Map,net.minecraft.advancements.critereon.PlayerPredicate$1) -> <init>
     33:33:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.PlayerPredicate$1 -> bx$1:
-net.minecraft.advancements.critereon.PlayerPredicate$AdvancementCriterionsPredicate -> bx$a:
+net.minecraft.advancements.critereon.PlayerPredicate$1 -> ce$1:
+net.minecraft.advancements.critereon.PlayerPredicate$AdvancementCriterionsPredicate -> ce$a:
     it.unimi.dsi.fastutil.objects.Object2BooleanMap criterions -> a
     60:62:void <init>(it.unimi.dsi.fastutil.objects.Object2BooleanMap) -> <init>
     66:68:com.google.gson.JsonElement toJson() -> a
     73:79:boolean test(net.minecraft.advancements.AdvancementProgress) -> a
     57:57:boolean test(java.lang.Object) -> test
-net.minecraft.advancements.critereon.PlayerPredicate$AdvancementDonePredicate -> bx$b:
+net.minecraft.advancements.critereon.PlayerPredicate$AdvancementDonePredicate -> ce$b:
     boolean state -> a
     42:44:void <init>(boolean) -> <init>
     48:48:com.google.gson.JsonElement toJson() -> a
     53:53:boolean test(net.minecraft.advancements.AdvancementProgress) -> a
     39:39:boolean test(java.lang.Object) -> test
-net.minecraft.advancements.critereon.PlayerPredicate$AdvancementPredicate -> bx$c:
+net.minecraft.advancements.critereon.PlayerPredicate$AdvancementPredicate -> ce$c:
     com.google.gson.JsonElement toJson() -> a
-net.minecraft.advancements.critereon.PlayerPredicate$Builder -> bx$d:
+net.minecraft.advancements.critereon.PlayerPredicate$Builder -> ce$d:
     net.minecraft.advancements.critereon.MinMaxBounds$Ints level -> a
     net.minecraft.world.level.GameType gameType -> b
     java.util.Map stats -> c
@@ -6041,68 +6002,77 @@ net.minecraft.advancements.critereon.PlayerPredicate$Builder -> bx$d:
     296:297:net.minecraft.advancements.critereon.PlayerPredicate$Builder checkAdvancementDone(net.minecraft.resources.ResourceLocation,boolean) -> b
     301:302:net.minecraft.advancements.critereon.PlayerPredicate$Builder checkAdvancementCriterions(net.minecraft.resources.ResourceLocation,java.util.Map) -> a
     306:306:net.minecraft.advancements.critereon.PlayerPredicate build() -> b
-net.minecraft.advancements.critereon.RecipeUnlockedTrigger -> by:
+net.minecraft.advancements.critereon.RecipeUnlockedTrigger -> cf:
+    net.minecraft.resources.ResourceLocation ID -> a
+    9:9:void <init>() -> <init>
+    14:14:net.minecraft.resources.ResourceLocation getId() -> a
+    19:20:net.minecraft.advancements.critereon.RecipeUnlockedTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    24:25:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.crafting.Recipe) -> a
+    28:28:net.minecraft.advancements.critereon.RecipeUnlockedTrigger$TriggerInstance unlocked(net.minecraft.resources.ResourceLocation) -> a
+    9:9:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    24:24:boolean lambda$trigger$0(net.minecraft.world.item.crafting.Recipe,net.minecraft.advancements.critereon.RecipeUnlockedTrigger$TriggerInstance) -> a
+    9:9:net.minecraft.resources.ResourceLocation access$000() -> b
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.RecipeUnlockedTrigger$TriggerInstance -> cf$a:
+    net.minecraft.resources.ResourceLocation recipe -> a
+    35:37:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.resources.ResourceLocation) -> <init>
+    41:43:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+    47:47:boolean matches(net.minecraft.world.item.crafting.Recipe) -> a
+net.minecraft.advancements.critereon.SerializationContext -> cg:
+    net.minecraft.advancements.critereon.SerializationContext INSTANCE -> a
+    com.google.gson.Gson predicateGson -> b
+    8:12:void <init>() -> <init>
+    15:15:com.google.gson.JsonElement serializeConditions(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.ShotCrossbowTrigger -> ch:
     net.minecraft.resources.ResourceLocation ID -> a
     11:11:void <init>() -> <init>
     16:16:net.minecraft.resources.ResourceLocation getId() -> a
-    21:22:net.minecraft.advancements.critereon.RecipeUnlockedTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    26:27:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.crafting.Recipe) -> a
-    11:11:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    26:26:boolean lambda$trigger$0(net.minecraft.world.item.crafting.Recipe,net.minecraft.advancements.critereon.RecipeUnlockedTrigger$TriggerInstance) -> a
+    21:22:net.minecraft.advancements.critereon.ShotCrossbowTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    26:27:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack) -> a
+    11:11:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    26:26:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.ShotCrossbowTrigger$TriggerInstance) -> a
     11:11:net.minecraft.resources.ResourceLocation access$000() -> b
     12:12:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.RecipeUnlockedTrigger$TriggerInstance -> by$a:
-    net.minecraft.resources.ResourceLocation recipe -> a
-    33:35:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    39:41:com.google.gson.JsonElement serializeToJson() -> b
-    45:45:boolean matches(net.minecraft.world.item.crafting.Recipe) -> a
-net.minecraft.advancements.critereon.ShotCrossbowTrigger -> bz:
-    net.minecraft.resources.ResourceLocation ID -> a
-    13:13:void <init>() -> <init>
-    18:18:net.minecraft.resources.ResourceLocation getId() -> a
-    23:24:net.minecraft.advancements.critereon.ShotCrossbowTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    28:29:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack) -> a
-    13:13:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    28:28:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.ShotCrossbowTrigger$TriggerInstance) -> a
-    13:13:net.minecraft.resources.ResourceLocation access$000() -> b
-    14:14:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.ShotCrossbowTrigger$TriggerInstance -> bz$a:
+net.minecraft.advancements.critereon.ShotCrossbowTrigger$TriggerInstance -> ch$a:
     net.minecraft.advancements.critereon.ItemPredicate item -> a
-    35:37:void <init>(net.minecraft.advancements.critereon.ItemPredicate) -> <init>
-    40:40:net.minecraft.advancements.critereon.ShotCrossbowTrigger$TriggerInstance shotCrossbow(net.minecraft.advancements.critereon.ItemPredicate) -> a
-    44:44:net.minecraft.advancements.critereon.ShotCrossbowTrigger$TriggerInstance shotCrossbow(net.minecraft.world.level.ItemLike) -> a
-    48:48:boolean matches(net.minecraft.world.item.ItemStack) -> a
-    53:57:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.SimpleCriterionTrigger -> ca:
+    33:35:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
+    38:38:net.minecraft.advancements.critereon.ShotCrossbowTrigger$TriggerInstance shotCrossbow(net.minecraft.advancements.critereon.ItemPredicate) -> a
+    42:42:net.minecraft.advancements.critereon.ShotCrossbowTrigger$TriggerInstance shotCrossbow(net.minecraft.world.level.ItemLike) -> a
+    46:46:boolean matches(net.minecraft.world.item.ItemStack) -> a
+    51:55:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.SimpleCriterionTrigger -> ci:
     java.util.Map players -> a
-    16:17:void <init>() -> <init>
-    21:22:void addPlayerListener(net.minecraft.server.PlayerAdvancements,net.minecraft.advancements.CriterionTrigger$Listener) -> a
-    26:33:void removePlayerListener(net.minecraft.server.PlayerAdvancements,net.minecraft.advancements.CriterionTrigger$Listener) -> b
-    37:38:void removePlayerListeners(net.minecraft.server.PlayerAdvancements) -> a
-    41:62:void trigger(net.minecraft.server.PlayerAdvancements,java.util.function.Predicate) -> a
-    65:72:void trigger(net.minecraft.server.PlayerAdvancements) -> b
-    21:21:java.util.Set lambda$addPlayerListener$0(net.minecraft.server.PlayerAdvancements) -> c
-net.minecraft.advancements.critereon.SlideDownBlockTrigger -> cb:
+    17:18:void <init>() -> <init>
+    22:23:void addPlayerListener(net.minecraft.server.PlayerAdvancements,net.minecraft.advancements.CriterionTrigger$Listener) -> a
+    27:34:void removePlayerListener(net.minecraft.server.PlayerAdvancements,net.minecraft.advancements.CriterionTrigger$Listener) -> b
+    38:39:void removePlayerListeners(net.minecraft.server.PlayerAdvancements) -> a
+    net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    45:46:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    50:75:void trigger(net.minecraft.server.level.ServerPlayer,java.util.function.Predicate) -> a
+    17:17:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    22:22:java.util.Set lambda$addPlayerListener$0(net.minecraft.server.PlayerAdvancements) -> b
+net.minecraft.advancements.critereon.SlideDownBlockTrigger -> cj:
     net.minecraft.resources.ResourceLocation ID -> a
-    16:16:void <init>() -> <init>
-    21:21:net.minecraft.resources.ResourceLocation getId() -> a
-    26:33:net.minecraft.advancements.critereon.SlideDownBlockTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    38:42:net.minecraft.world.level.block.Block deserializeBlock(com.google.gson.JsonObject) -> a
-    46:47:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.block.state.BlockState) -> a
-    16:16:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    46:46:boolean lambda$trigger$2(net.minecraft.world.level.block.state.BlockState,net.minecraft.advancements.critereon.SlideDownBlockTrigger$TriggerInstance) -> a
-    40:40:com.google.gson.JsonSyntaxException lambda$deserializeBlock$1(net.minecraft.resources.ResourceLocation) -> a
-    30:30:void lambda$createInstance$0(net.minecraft.world.level.block.Block,java.lang.String) -> a
-    16:16:net.minecraft.resources.ResourceLocation access$000() -> b
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.SlideDownBlockTrigger$TriggerInstance -> cb$a:
+    14:14:void <init>() -> <init>
+    19:19:net.minecraft.resources.ResourceLocation getId() -> a
+    24:31:net.minecraft.advancements.critereon.SlideDownBlockTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    36:40:net.minecraft.world.level.block.Block deserializeBlock(com.google.gson.JsonObject) -> a
+    44:45:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.block.state.BlockState) -> a
+    14:14:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    44:44:boolean lambda$trigger$2(net.minecraft.world.level.block.state.BlockState,net.minecraft.advancements.critereon.SlideDownBlockTrigger$TriggerInstance) -> a
+    38:38:com.google.gson.JsonSyntaxException lambda$deserializeBlock$1(net.minecraft.resources.ResourceLocation) -> a
+    28:28:void lambda$createInstance$0(net.minecraft.world.level.block.Block,java.lang.String) -> a
+    14:14:net.minecraft.resources.ResourceLocation access$000() -> b
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.SlideDownBlockTrigger$TriggerInstance -> cj$a:
     net.minecraft.world.level.block.Block block -> a
     net.minecraft.advancements.critereon.StatePropertiesPredicate state -> b
-    54:57:void <init>(net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.StatePropertiesPredicate) -> <init>
-    60:60:net.minecraft.advancements.critereon.SlideDownBlockTrigger$TriggerInstance slidesDownBlock(net.minecraft.world.level.block.Block) -> a
-    65:70:com.google.gson.JsonElement serializeToJson() -> b
-    74:80:boolean matches(net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.advancements.critereon.StatePropertiesPredicate -> cc:
+    52:55:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.StatePropertiesPredicate) -> <init>
+    58:58:net.minecraft.advancements.critereon.SlideDownBlockTrigger$TriggerInstance slidesDownBlock(net.minecraft.world.level.block.Block) -> a
+    63:68:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+    72:78:boolean matches(net.minecraft.world.level.block.state.BlockState) -> a
+net.minecraft.advancements.critereon.StatePropertiesPredicate -> ck:
     net.minecraft.advancements.critereon.StatePropertiesPredicate ANY -> a
     java.util.List properties -> b
     127:135:net.minecraft.advancements.critereon.StatePropertiesPredicate$PropertyMatcher fromJson(java.lang.String,com.google.gson.JsonElement) -> a
@@ -6118,8 +6088,8 @@ net.minecraft.advancements.critereon.StatePropertiesPredicate -> cc:
     170:170:void lambda$checkState$0(net.minecraft.world.level.block.state.StateDefinition,java.util.function.Consumer,net.minecraft.advancements.critereon.StatePropertiesPredicate$PropertyMatcher) -> a
     23:23:void <init>(java.util.List,net.minecraft.advancements.critereon.StatePropertiesPredicate$1) -> <init>
     24:24:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.StatePropertiesPredicate$1 -> cc$1:
-net.minecraft.advancements.critereon.StatePropertiesPredicate$Builder -> cc$a:
+net.minecraft.advancements.critereon.StatePropertiesPredicate$1 -> ck$1:
+net.minecraft.advancements.critereon.StatePropertiesPredicate$Builder -> ck$a:
     java.util.List matchers -> a
     202:205:void <init>() -> <init>
     208:208:net.minecraft.advancements.critereon.StatePropertiesPredicate$Builder properties() -> a
@@ -6128,12 +6098,12 @@ net.minecraft.advancements.critereon.StatePropertiesPredicate$Builder -> cc$a:
     221:221:net.minecraft.advancements.critereon.StatePropertiesPredicate$Builder hasProperty(net.minecraft.world.level.block.state.properties.Property,boolean) -> a
     225:225:net.minecraft.advancements.critereon.StatePropertiesPredicate$Builder hasProperty(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
     229:229:net.minecraft.advancements.critereon.StatePropertiesPredicate build() -> b
-net.minecraft.advancements.critereon.StatePropertiesPredicate$ExactPropertyMatcher -> cc$b:
+net.minecraft.advancements.critereon.StatePropertiesPredicate$ExactPropertyMatcher -> ck$b:
     java.lang.String value -> a
     62:64:void <init>(java.lang.String,java.lang.String) -> <init>
     68:70:boolean match(net.minecraft.world.level.block.state.StateHolder,net.minecraft.world.level.block.state.properties.Property) -> a
     75:75:com.google.gson.JsonElement toJson() -> a
-net.minecraft.advancements.critereon.StatePropertiesPredicate$PropertyMatcher -> cc$c:
+net.minecraft.advancements.critereon.StatePropertiesPredicate$PropertyMatcher -> ck$c:
     java.lang.String name -> a
     29:31:void <init>(java.lang.String) -> <init>
     34:39:boolean match(net.minecraft.world.level.block.state.StateDefinition,net.minecraft.world.level.block.state.StateHolder) -> a
@@ -6141,104 +6111,122 @@ net.minecraft.advancements.critereon.StatePropertiesPredicate$PropertyMatcher ->
     com.google.gson.JsonElement toJson() -> a
     47:47:java.lang.String getName() -> b
     51:55:void checkState(net.minecraft.world.level.block.state.StateDefinition,java.util.function.Consumer) -> a
-net.minecraft.advancements.critereon.StatePropertiesPredicate$RangedPropertyMatcher -> cc$d:
+net.minecraft.advancements.critereon.StatePropertiesPredicate$RangedPropertyMatcher -> ck$d:
     java.lang.String minValue -> a
     java.lang.String maxValue -> b
     87:90:void <init>(java.lang.String,java.lang.String,java.lang.String) -> <init>
     94:110:boolean match(net.minecraft.world.level.block.state.StateHolder,net.minecraft.world.level.block.state.properties.Property) -> a
     115:122:com.google.gson.JsonElement toJson() -> a
-net.minecraft.advancements.critereon.SummonedEntityTrigger -> cd:
-    net.minecraft.resources.ResourceLocation ID -> a
-    10:10:void <init>() -> <init>
-    15:15:net.minecraft.resources.ResourceLocation getId() -> a
-    20:21:net.minecraft.advancements.critereon.SummonedEntityTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    25:26:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity) -> a
-    10:10:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    25:25:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity,net.minecraft.advancements.critereon.SummonedEntityTrigger$TriggerInstance) -> a
-    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.SummonedEntityTrigger$TriggerInstance -> cd$a:
-    net.minecraft.advancements.critereon.EntityPredicate entity -> a
-    32:34:void <init>(net.minecraft.advancements.critereon.EntityPredicate) -> <init>
-    37:37:net.minecraft.advancements.critereon.SummonedEntityTrigger$TriggerInstance summonedEntity(net.minecraft.advancements.critereon.EntityPredicate$Builder) -> a
-    41:41:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity) -> a
-    46:50:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.TameAnimalTrigger -> ce:
-    net.minecraft.resources.ResourceLocation ID -> a
-    10:10:void <init>() -> <init>
-    15:15:net.minecraft.resources.ResourceLocation getId() -> a
-    20:21:net.minecraft.advancements.critereon.TameAnimalTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    25:26:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.animal.Animal) -> a
-    10:10:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    25:25:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.animal.Animal,net.minecraft.advancements.critereon.TameAnimalTrigger$TriggerInstance) -> a
-    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.TameAnimalTrigger$TriggerInstance -> ce$a:
-    net.minecraft.advancements.critereon.EntityPredicate entity -> a
-    32:34:void <init>(net.minecraft.advancements.critereon.EntityPredicate) -> <init>
-    37:37:net.minecraft.advancements.critereon.TameAnimalTrigger$TriggerInstance tamedAnimal() -> c
-    41:41:net.minecraft.advancements.critereon.TameAnimalTrigger$TriggerInstance tamedAnimal(net.minecraft.advancements.critereon.EntityPredicate) -> a
-    45:45:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.animal.Animal) -> a
-    50:54:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.TickTrigger -> cf:
-    net.minecraft.resources.ResourceLocation ID -> a
-    8:8:void <init>() -> <init>
-    13:13:net.minecraft.resources.ResourceLocation getId() -> a
-    18:18:net.minecraft.advancements.critereon.TickTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    22:23:void trigger(net.minecraft.server.level.ServerPlayer) -> a
-    8:8:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    9:9:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.TickTrigger$TriggerInstance -> cf$a:
-    27:28:void <init>() -> <init>
-net.minecraft.advancements.critereon.TradeTrigger -> cg:
-    net.minecraft.resources.ResourceLocation ID -> a
-    11:11:void <init>() -> <init>
-    16:16:net.minecraft.resources.ResourceLocation getId() -> a
-    21:23:net.minecraft.advancements.critereon.TradeTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    27:28:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.npc.AbstractVillager,net.minecraft.world.item.ItemStack) -> a
-    11:11:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    27:27:boolean lambda$trigger$0(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.npc.AbstractVillager,net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.TradeTrigger$TriggerInstance) -> a
-    11:11:net.minecraft.resources.ResourceLocation access$000() -> b
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.TradeTrigger$TriggerInstance -> cg$a:
-    net.minecraft.advancements.critereon.EntityPredicate villager -> a
-    net.minecraft.advancements.critereon.ItemPredicate item -> b
-    35:38:void <init>(net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
-    41:41:net.minecraft.advancements.critereon.TradeTrigger$TriggerInstance tradedWithVillager() -> c
-    45:51:boolean matches(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.npc.AbstractVillager,net.minecraft.world.item.ItemStack) -> a
-    56:61:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.UsedEnderEyeTrigger -> ch:
+net.minecraft.advancements.critereon.SummonedEntityTrigger -> cl:
     net.minecraft.resources.ResourceLocation ID -> a
     9:9:void <init>() -> <init>
     14:14:net.minecraft.resources.ResourceLocation getId() -> a
-    19:20:net.minecraft.advancements.critereon.UsedEnderEyeTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    24:28:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.core.BlockPos) -> a
-    9:9:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    27:27:boolean lambda$trigger$0(double,net.minecraft.advancements.critereon.UsedEnderEyeTrigger$TriggerInstance) -> a
+    19:20:net.minecraft.advancements.critereon.SummonedEntityTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    24:26:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity) -> a
+    9:9:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    25:25:boolean lambda$trigger$0(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.advancements.critereon.SummonedEntityTrigger$TriggerInstance) -> a
     9:9:net.minecraft.resources.ResourceLocation access$000() -> b
     10:10:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.UsedEnderEyeTrigger$TriggerInstance -> ch$a:
-    net.minecraft.advancements.critereon.MinMaxBounds$Floats level -> a
-    34:36:void <init>(net.minecraft.advancements.critereon.MinMaxBounds$Floats) -> <init>
-    39:39:boolean matches(double) -> a
-net.minecraft.advancements.critereon.UsedTotemTrigger -> ci:
+net.minecraft.advancements.critereon.SummonedEntityTrigger$TriggerInstance -> cl$a:
+    net.minecraft.advancements.critereon.EntityPredicate$Composite entity -> a
+    32:34:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> <init>
+    37:37:net.minecraft.advancements.critereon.SummonedEntityTrigger$TriggerInstance summonedEntity(net.minecraft.advancements.critereon.EntityPredicate$Builder) -> a
+    41:41:boolean matches(net.minecraft.world.level.storage.loot.LootContext) -> a
+    46:50:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.TameAnimalTrigger -> cm:
     net.minecraft.resources.ResourceLocation ID -> a
-    13:13:void <init>() -> <init>
-    18:18:net.minecraft.resources.ResourceLocation getId() -> a
-    23:24:net.minecraft.advancements.critereon.UsedTotemTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    28:29:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack) -> a
-    13:13:net.minecraft.advancements.CriterionTriggerInstance createInstance(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    28:28:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.UsedTotemTrigger$TriggerInstance) -> a
-    13:13:net.minecraft.resources.ResourceLocation access$000() -> b
-    14:14:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.UsedTotemTrigger$TriggerInstance -> ci$a:
+    9:9:void <init>() -> <init>
+    14:14:net.minecraft.resources.ResourceLocation getId() -> a
+    19:20:net.minecraft.advancements.critereon.TameAnimalTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    24:26:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.animal.Animal) -> a
+    9:9:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    25:25:boolean lambda$trigger$0(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.advancements.critereon.TameAnimalTrigger$TriggerInstance) -> a
+    9:9:net.minecraft.resources.ResourceLocation access$000() -> b
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.TameAnimalTrigger$TriggerInstance -> cm$a:
+    net.minecraft.advancements.critereon.EntityPredicate$Composite entity -> a
+    32:34:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> <init>
+    37:37:net.minecraft.advancements.critereon.TameAnimalTrigger$TriggerInstance tamedAnimal() -> c
+    41:41:net.minecraft.advancements.critereon.TameAnimalTrigger$TriggerInstance tamedAnimal(net.minecraft.advancements.critereon.EntityPredicate) -> a
+    45:45:boolean matches(net.minecraft.world.level.storage.loot.LootContext) -> a
+    50:54:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.TargetBlockTrigger -> cn:
+    net.minecraft.resources.ResourceLocation ID -> a
+    10:10:void <init>() -> <init>
+    15:15:net.minecraft.resources.ResourceLocation getId() -> a
+    20:22:net.minecraft.advancements.critereon.TargetBlockTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    26:28:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3,int) -> a
+    10:10:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    27:27:boolean lambda$trigger$0(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.phys.Vec3,int,net.minecraft.advancements.critereon.TargetBlockTrigger$TriggerInstance) -> a
+    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.TargetBlockTrigger$TriggerInstance -> cn$a:
+    net.minecraft.advancements.critereon.MinMaxBounds$Ints signalStrength -> a
+    net.minecraft.advancements.critereon.EntityPredicate$Composite projectile -> b
+    35:38:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> <init>
+    41:41:net.minecraft.advancements.critereon.TargetBlockTrigger$TriggerInstance targetHit(net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.advancements.critereon.EntityPredicate$Composite) -> a
+    46:49:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+    53:59:boolean matches(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.phys.Vec3,int) -> a
+net.minecraft.advancements.critereon.TickTrigger -> co:
+    net.minecraft.resources.ResourceLocation ID -> a
+    7:7:void <init>() -> <init>
+    12:12:net.minecraft.resources.ResourceLocation getId() -> a
+    17:17:net.minecraft.advancements.critereon.TickTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    21:22:void trigger(net.minecraft.server.level.ServerPlayer) -> a
+    7:7:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    21:21:boolean lambda$trigger$0(net.minecraft.advancements.critereon.TickTrigger$TriggerInstance) -> a
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.TickTrigger$TriggerInstance -> co$a:
+    26:27:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite) -> <init>
+net.minecraft.advancements.critereon.TradeTrigger -> cp:
+    net.minecraft.resources.ResourceLocation ID -> a
+    10:10:void <init>() -> <init>
+    15:15:net.minecraft.resources.ResourceLocation getId() -> a
+    20:22:net.minecraft.advancements.critereon.TradeTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    26:28:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.entity.npc.AbstractVillager,net.minecraft.world.item.ItemStack) -> a
+    10:10:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    27:27:boolean lambda$trigger$0(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.TradeTrigger$TriggerInstance) -> a
+    10:10:net.minecraft.resources.ResourceLocation access$000() -> b
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.TradeTrigger$TriggerInstance -> cp$a:
+    net.minecraft.advancements.critereon.EntityPredicate$Composite villager -> a
+    net.minecraft.advancements.critereon.ItemPredicate item -> b
+    35:38:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
+    41:41:net.minecraft.advancements.critereon.TradeTrigger$TriggerInstance tradedWithVillager() -> c
+    45:51:boolean matches(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.item.ItemStack) -> a
+    56:61:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.UsedEnderEyeTrigger -> cq:
+    net.minecraft.resources.ResourceLocation ID -> a
+    8:8:void <init>() -> <init>
+    13:13:net.minecraft.resources.ResourceLocation getId() -> a
+    18:19:net.minecraft.advancements.critereon.UsedEnderEyeTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    23:27:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.core.BlockPos) -> a
+    8:8:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    26:26:boolean lambda$trigger$0(double,net.minecraft.advancements.critereon.UsedEnderEyeTrigger$TriggerInstance) -> a
+    8:8:net.minecraft.resources.ResourceLocation access$000() -> b
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.UsedEnderEyeTrigger$TriggerInstance -> cq$a:
+    net.minecraft.advancements.critereon.MinMaxBounds$Floats level -> a
+    33:35:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.MinMaxBounds$Floats) -> <init>
+    38:38:boolean matches(double) -> a
+net.minecraft.advancements.critereon.UsedTotemTrigger -> cr:
+    net.minecraft.resources.ResourceLocation ID -> a
+    11:11:void <init>() -> <init>
+    16:16:net.minecraft.resources.ResourceLocation getId() -> a
+    21:22:net.minecraft.advancements.critereon.UsedTotemTrigger$TriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> a
+    26:27:void trigger(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack) -> a
+    11:11:net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance createInstance(com.google.gson.JsonObject,net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.DeserializationContext) -> b
+    26:26:boolean lambda$trigger$0(net.minecraft.world.item.ItemStack,net.minecraft.advancements.critereon.UsedTotemTrigger$TriggerInstance) -> a
+    11:11:net.minecraft.resources.ResourceLocation access$000() -> b
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.advancements.critereon.UsedTotemTrigger$TriggerInstance -> cr$a:
     net.minecraft.advancements.critereon.ItemPredicate item -> a
-    35:37:void <init>(net.minecraft.advancements.critereon.ItemPredicate) -> <init>
-    40:40:net.minecraft.advancements.critereon.UsedTotemTrigger$TriggerInstance usedTotem(net.minecraft.advancements.critereon.ItemPredicate) -> a
-    44:44:net.minecraft.advancements.critereon.UsedTotemTrigger$TriggerInstance usedTotem(net.minecraft.world.level.ItemLike) -> a
-    48:48:boolean matches(net.minecraft.world.item.ItemStack) -> a
-    53:57:com.google.gson.JsonElement serializeToJson() -> b
-net.minecraft.advancements.critereon.WrappedMinMaxBounds -> cj:
+    33:35:void <init>(net.minecraft.advancements.critereon.EntityPredicate$Composite,net.minecraft.advancements.critereon.ItemPredicate) -> <init>
+    38:38:net.minecraft.advancements.critereon.UsedTotemTrigger$TriggerInstance usedTotem(net.minecraft.advancements.critereon.ItemPredicate) -> a
+    42:42:net.minecraft.advancements.critereon.UsedTotemTrigger$TriggerInstance usedTotem(net.minecraft.world.level.ItemLike) -> a
+    46:46:boolean matches(net.minecraft.world.item.ItemStack) -> a
+    51:55:com.google.gson.JsonObject serializeToJson(net.minecraft.advancements.critereon.SerializationContext) -> a
+net.minecraft.advancements.critereon.WrappedMinMaxBounds -> cs:
     net.minecraft.advancements.critereon.WrappedMinMaxBounds ANY -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INTS_ONLY -> b
     java.lang.Float min -> c
@@ -6261,9 +6249,9 @@ net.minecraft.advancements.critereon.WrappedMinMaxBounds -> cj:
     184:184:java.lang.Float optionallyFormat(java.lang.Float,java.util.function.Function) -> a
     117:117:java.lang.Float lambda$fromReader$0(java.lang.Float) -> a
     17:19:void <clinit>() -> <clinit>
-net.minecraft.advancements.critereon.package-info -> ck:
-net.minecraft.advancements.package-info -> cl:
-net.minecraft.client.AmbientOcclusionStatus -> day:
+net.minecraft.advancements.critereon.package-info -> ct:
+net.minecraft.advancements.package-info -> cu:
+net.minecraft.client.AmbientOcclusionStatus -> dlg:
     net.minecraft.client.AmbientOcclusionStatus OFF -> a
     net.minecraft.client.AmbientOcclusionStatus MIN -> b
     net.minecraft.client.AmbientOcclusionStatus MAX -> c
@@ -6279,7 +6267,7 @@ net.minecraft.client.AmbientOcclusionStatus -> day:
     33:33:net.minecraft.client.AmbientOcclusionStatus byId(int) -> a
     14:14:net.minecraft.client.AmbientOcclusionStatus[] lambda$static$0(int) -> b
     8:14:void <clinit>() -> <clinit>
-net.minecraft.client.AttackIndicatorStatus -> daz:
+net.minecraft.client.AttackIndicatorStatus -> dlh:
     net.minecraft.client.AttackIndicatorStatus OFF -> a
     net.minecraft.client.AttackIndicatorStatus CROSSHAIR -> b
     net.minecraft.client.AttackIndicatorStatus HOTBAR -> c
@@ -6295,18 +6283,18 @@ net.minecraft.client.AttackIndicatorStatus -> daz:
     33:33:net.minecraft.client.AttackIndicatorStatus byId(int) -> a
     14:14:net.minecraft.client.AttackIndicatorStatus[] lambda$static$0(int) -> b
     8:14:void <clinit>() -> <clinit>
-net.minecraft.client.BooleanOption -> dba:
-    java.util.function.Predicate getter -> S
-    java.util.function.BiConsumer setter -> T
-    15:18:void <init>(java.lang.String,java.util.function.Predicate,java.util.function.BiConsumer) -> <init>
-    21:22:void set(net.minecraft.client.Options,java.lang.String) -> a
-    25:28:void toggle(net.minecraft.client.Options) -> a
-    31:32:void set(net.minecraft.client.Options,boolean) -> a
-    35:35:boolean get(net.minecraft.client.Options) -> b
-    40:40:net.minecraft.client.gui.components.AbstractWidget createButton(net.minecraft.client.Options,int,int,int) -> a
-    48:48:java.lang.String getMessage(net.minecraft.client.Options) -> c
-    41:43:void lambda$createButton$0(net.minecraft.client.Options,net.minecraft.client.gui.components.Button) -> a
-net.minecraft.client.Camera -> dbb:
+net.minecraft.client.BooleanOption -> dli:
+    java.util.function.Predicate getter -> V
+    java.util.function.BiConsumer setter -> W
+    16:19:void <init>(java.lang.String,java.util.function.Predicate,java.util.function.BiConsumer) -> <init>
+    22:23:void set(net.minecraft.client.Options,java.lang.String) -> a
+    26:29:void toggle(net.minecraft.client.Options) -> a
+    32:33:void set(net.minecraft.client.Options,boolean) -> a
+    36:36:boolean get(net.minecraft.client.Options) -> b
+    41:41:net.minecraft.client.gui.components.AbstractWidget createButton(net.minecraft.client.Options,int,int,int) -> a
+    49:49:net.minecraft.network.chat.Component getMessage(net.minecraft.client.Options) -> c
+    42:44:void lambda$createButton$0(net.minecraft.client.Options,net.minecraft.client.gui.components.Button) -> a
+net.minecraft.client.Camera -> dlj:
     boolean initialized -> a
     net.minecraft.world.level.BlockGetter level -> b
     net.minecraft.world.entity.Entity entity -> c
@@ -6347,21 +6335,24 @@ net.minecraft.client.Camera -> dbb:
 net.minecraft.client.ClientBrandRetriever -> net.minecraft.client.ClientBrandRetriever:
     5:5:void <init>() -> <init>
     12:12:java.lang.String getClientModName() -> getClientModName
-net.minecraft.client.ClientRecipeBook -> dbc:
-    net.minecraft.world.item.crafting.RecipeManager recipes -> k
-    java.util.Map collectionsByTab -> l
-    java.util.List collections -> m
-    28:33:void <init>(net.minecraft.world.item.crafting.RecipeManager) -> <init>
-    36:60:void setupCollections() -> i
-    63:80:net.minecraft.client.gui.screens.recipebook.RecipeCollection createCollection(net.minecraft.client.RecipeBookCategories) -> b
-    84:85:void addToCollection(net.minecraft.client.RecipeBookCategories,net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> a
-    88:123:net.minecraft.client.RecipeBookCategories getCategory(net.minecraft.world.item.crafting.Recipe) -> g
-    127:137:java.util.List getCategories(net.minecraft.world.inventory.RecipeBookMenu) -> b
-    141:141:java.util.List getCollections() -> j
-    145:145:java.util.List getCollection(net.minecraft.client.RecipeBookCategories) -> a
-    84:84:java.util.List lambda$addToCollection$1(net.minecraft.client.RecipeBookCategories) -> c
-    65:65:java.util.List lambda$createCollection$0(net.minecraft.client.RecipeBookCategories) -> d
-net.minecraft.client.CloudStatus -> dbd:
+net.minecraft.client.ClientRecipeBook -> dlk:
+    org.apache.logging.log4j.Logger LOGGER -> k
+    net.minecraft.world.item.crafting.RecipeManager recipes -> l
+    java.util.Map collectionsByTab -> m
+    java.util.List collections -> n
+    33:38:void <init>(net.minecraft.world.item.crafting.RecipeManager) -> <init>
+    41:65:void setupCollections() -> i
+    68:81:net.minecraft.client.gui.screens.recipebook.RecipeCollection createCollection(net.minecraft.client.RecipeBookCategories) -> b
+    85:86:void addToCollection(net.minecraft.client.RecipeBookCategories,net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> a
+    89:137:net.minecraft.client.RecipeBookCategories getCategory(net.minecraft.world.item.crafting.Recipe) -> g
+    141:151:java.util.List getCategories(net.minecraft.world.inventory.RecipeBookMenu) -> b
+    155:155:java.util.List getCollections() -> j
+    159:159:java.util.List getCollection(net.minecraft.client.RecipeBookCategories) -> a
+    136:136:java.lang.Object lambda$getCategory$2(net.minecraft.world.item.crafting.Recipe) -> h
+    85:85:java.util.List lambda$addToCollection$1(net.minecraft.client.RecipeBookCategories) -> c
+    70:70:java.util.List lambda$createCollection$0(net.minecraft.client.RecipeBookCategories) -> d
+    30:30:void <clinit>() -> <clinit>
+net.minecraft.client.CloudStatus -> dll:
     net.minecraft.client.CloudStatus OFF -> a
     net.minecraft.client.CloudStatus FAST -> b
     net.minecraft.client.CloudStatus FANCY -> c
@@ -6377,15 +6368,22 @@ net.minecraft.client.CloudStatus -> dbd:
     33:33:net.minecraft.client.CloudStatus byId(int) -> a
     14:14:net.minecraft.client.CloudStatus[] lambda$static$0(int) -> b
     8:14:void <clinit>() -> <clinit>
-net.minecraft.client.CycleOption -> dbe:
-    java.util.function.BiConsumer setter -> S
-    java.util.function.BiFunction toString -> T
-    14:17:void <init>(java.lang.String,java.util.function.BiConsumer,java.util.function.BiFunction) -> <init>
-    20:23:void toggle(net.minecraft.client.Options,int) -> a
-    27:27:net.minecraft.client.gui.components.AbstractWidget createButton(net.minecraft.client.Options,int,int,int) -> a
-    35:35:java.lang.String getMessage(net.minecraft.client.Options) -> c
-    28:30:void lambda$createButton$0(net.minecraft.client.Options,net.minecraft.client.gui.components.Button) -> a
-net.minecraft.client.DebugQueryHandler -> dbf:
+net.minecraft.client.ComponentCollector -> dlm:
+    java.util.List parts -> a
+    9:10:void <init>() -> <init>
+    13:14:void append(net.minecraft.network.chat.FormattedText) -> a
+    18:24:net.minecraft.network.chat.FormattedText getResult() -> a
+    28:29:net.minecraft.network.chat.FormattedText getResultOrEmpty() -> b
+    33:34:void reset() -> c
+net.minecraft.client.CycleOption -> dln:
+    java.util.function.BiConsumer setter -> V
+    java.util.function.BiFunction toString -> W
+    15:18:void <init>(java.lang.String,java.util.function.BiConsumer,java.util.function.BiFunction) -> <init>
+    21:24:void toggle(net.minecraft.client.Options,int) -> a
+    28:28:net.minecraft.client.gui.components.AbstractWidget createButton(net.minecraft.client.Options,int,int,int) -> a
+    36:36:net.minecraft.network.chat.Component getMessage(net.minecraft.client.Options) -> c
+    29:31:void lambda$createButton$0(net.minecraft.client.Options,net.minecraft.client.gui.components.Button) -> a
+net.minecraft.client.DebugQueryHandler -> dlo:
     net.minecraft.client.multiplayer.ClientPacketListener connection -> a
     int transactionId -> b
     java.util.function.Consumer callback -> c
@@ -6394,14 +6392,14 @@ net.minecraft.client.DebugQueryHandler -> dbf:
     35:36:int startTransaction(java.util.function.Consumer) -> a
     40:42:void queryEntityTag(int,java.util.function.Consumer) -> a
     45:47:void queryBlockEntityTag(net.minecraft.core.BlockPos,java.util.function.Consumer) -> a
-net.minecraft.client.FullscreenResolutionProgressOption -> dbg:
-    15:16:void <init>(com.mojang.blaze3d.platform.Window) -> <init>
-    19:49:void <init>(com.mojang.blaze3d.platform.Window,com.mojang.blaze3d.platform.Monitor) -> <init>
-    37:47:java.lang.String lambda$new$3(com.mojang.blaze3d.platform.Monitor,net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> a
-    27:35:void lambda$new$2(com.mojang.blaze3d.platform.Monitor,com.mojang.blaze3d.platform.Window,net.minecraft.client.Options,java.lang.Double) -> a
-    20:24:java.lang.Double lambda$new$1(com.mojang.blaze3d.platform.Monitor,com.mojang.blaze3d.platform.Window,net.minecraft.client.Options) -> a
-    24:24:java.lang.Double lambda$null$0(com.mojang.blaze3d.platform.Monitor,com.mojang.blaze3d.platform.VideoMode) -> a
-net.minecraft.client.Game -> dbh:
+net.minecraft.client.FullscreenResolutionProgressOption -> dlp:
+    16:17:void <init>(com.mojang.blaze3d.platform.Window) -> <init>
+    20:50:void <init>(com.mojang.blaze3d.platform.Window,com.mojang.blaze3d.platform.Monitor) -> <init>
+    38:48:net.minecraft.network.chat.Component lambda$new$3(com.mojang.blaze3d.platform.Monitor,net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> a
+    28:36:void lambda$new$2(com.mojang.blaze3d.platform.Monitor,com.mojang.blaze3d.platform.Window,net.minecraft.client.Options,java.lang.Double) -> a
+    21:25:java.lang.Double lambda$new$1(com.mojang.blaze3d.platform.Monitor,com.mojang.blaze3d.platform.Window,net.minecraft.client.Options) -> a
+    25:25:java.lang.Double lambda$null$0(com.mojang.blaze3d.platform.Monitor,com.mojang.blaze3d.platform.VideoMode) -> a
+net.minecraft.client.Game -> dlq:
     net.minecraft.client.Minecraft minecraft -> a
     com.mojang.bridge.launcher.Launcher launcher -> b
     com.mojang.bridge.launcher.SessionEventListener listener -> c
@@ -6413,7 +6411,7 @@ net.minecraft.client.Game -> dbh:
     65:66:void setSessionEventListener(com.mojang.bridge.launcher.SessionEventListener) -> setSessionEventListener
     69:70:void onStartGameSession() -> a
     73:74:void onLeaveGameSession() -> b
-net.minecraft.client.Game$Metrics -> dbh$a:
+net.minecraft.client.Game$Metrics -> dlq$a:
     int min -> a
     int max -> b
     int average -> c
@@ -6423,15 +6421,36 @@ net.minecraft.client.Game$Metrics -> dbh$a:
     96:96:int getMaxTime() -> getMaxTime
     101:101:int getAverageTime() -> getAverageTime
     106:106:int getSampleCount() -> getSampleCount
-net.minecraft.client.GuiMessage -> dbi:
+net.minecraft.client.GraphicsStatus -> dlr:
+    net.minecraft.client.GraphicsStatus FAST -> a
+    net.minecraft.client.GraphicsStatus FANCY -> b
+    net.minecraft.client.GraphicsStatus FABULOUS -> c
+    net.minecraft.client.GraphicsStatus[] BY_ID -> d
+    int id -> e
+    java.lang.String key -> f
+    net.minecraft.client.GraphicsStatus[] $VALUES -> g
+    8:8:net.minecraft.client.GraphicsStatus[] values() -> values
+    8:8:net.minecraft.client.GraphicsStatus valueOf(java.lang.String) -> valueOf
+    19:22:void <init>(java.lang.String,int,int,java.lang.String) -> <init>
+    25:25:int getId() -> a
+    29:29:java.lang.String getKey() -> b
+    33:33:net.minecraft.client.GraphicsStatus cycleNext() -> c
+    38:46:java.lang.String toString() -> toString
+    50:50:net.minecraft.client.GraphicsStatus byId(int) -> a
+    14:14:net.minecraft.client.GraphicsStatus[] lambda$static$0(int) -> b
+    8:14:void <clinit>() -> <clinit>
+net.minecraft.client.GraphicsStatus$1 -> dlr$1:
+    int[] $SwitchMap$net$minecraft$client$GraphicsStatus -> a
+    38:38:void <clinit>() -> <clinit>
+net.minecraft.client.GuiMessage -> dls:
     int addedTime -> a
-    net.minecraft.network.chat.Component message -> b
+    net.minecraft.network.chat.FormattedText message -> b
     int id -> c
-    10:14:void <init>(int,net.minecraft.network.chat.Component,int) -> <init>
-    17:17:net.minecraft.network.chat.Component getMessage() -> a
+    10:14:void <init>(int,net.minecraft.network.chat.FormattedText,int) -> <init>
+    17:17:net.minecraft.network.chat.FormattedText getMessage() -> a
     21:21:int getAddedTime() -> b
     25:25:int getId() -> c
-net.minecraft.client.HotbarManager -> dbj:
+net.minecraft.client.HotbarManager -> dlt:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.io.File optionsFile -> b
     com.mojang.datafixers.DataFixer fixerUpper -> c
@@ -6442,7 +6461,7 @@ net.minecraft.client.HotbarManager -> dbj:
     58:67:void save() -> a
     70:74:net.minecraft.client.player.inventory.Hotbar get(int) -> a
     17:17:void <clinit>() -> <clinit>
-net.minecraft.client.KeyMapping -> dbk:
+net.minecraft.client.KeyMapping -> dlu:
     java.util.Map ALL -> a
     java.util.Map MAP -> b
     java.util.Set CATEGORIES -> c
@@ -6453,38 +6472,35 @@ net.minecraft.client.KeyMapping -> dbk:
     com.mojang.blaze3d.platform.InputConstants$Key key -> h
     boolean isDown -> i
     int clickCount -> j
-    39:43:void click(com.mojang.blaze3d.platform.InputConstants$Key) -> a
-    46:50:void set(com.mojang.blaze3d.platform.InputConstants$Key,boolean) -> a
-    54:59:void setAll() -> a
-    62:65:void releaseAll() -> b
-    68:72:void resetMapping() -> c
-    82:83:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    85:94:void <init>(java.lang.String,com.mojang.blaze3d.platform.InputConstants$Type,int,java.lang.String) -> <init>
-    97:97:boolean isDown() -> d
-    101:101:java.lang.String getCategory() -> e
-    105:109:boolean consumeClick() -> f
-    113:115:void release() -> m
-    118:118:java.lang.String getName() -> g
-    122:122:com.mojang.blaze3d.platform.InputConstants$Key getDefaultKey() -> h
-    126:127:void setKey(com.mojang.blaze3d.platform.InputConstants$Key) -> b
-    131:134:int compareTo(net.minecraft.client.KeyMapping) -> a
-    138:142:java.util.function.Supplier createNameSupplier(java.lang.String) -> a
-    147:147:boolean same(net.minecraft.client.KeyMapping) -> b
-    151:151:boolean isUnbound() -> i
-    155:158:boolean matches(int,int) -> a
-    162:162:boolean matchesMouse(int) -> a
-    166:181:java.lang.String getTranslatedKeyMessage() -> j
-    185:185:boolean isDefault() -> k
-    189:189:java.lang.String saveString() -> l
-    193:194:void setDown(boolean) -> a
-    14:14:int compareTo(java.lang.Object) -> compareTo
-    140:140:java.lang.String lambda$createNameSupplier$1(java.lang.String) -> b
-    29:36:void lambda$static$0(java.util.HashMap) -> a
-    15:28:void <clinit>() -> <clinit>
-net.minecraft.client.KeyMapping$1 -> dbk$1:
-    int[] $SwitchMap$com$mojang$blaze3d$platform$InputConstants$Type -> a
-    170:170:void <clinit>() -> <clinit>
-net.minecraft.client.KeyboardHandler -> dbl:
+    40:44:void click(com.mojang.blaze3d.platform.InputConstants$Key) -> a
+    47:51:void set(com.mojang.blaze3d.platform.InputConstants$Key,boolean) -> a
+    55:60:void setAll() -> a
+    63:66:void releaseAll() -> b
+    69:73:void resetMapping() -> c
+    83:84:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    86:95:void <init>(java.lang.String,com.mojang.blaze3d.platform.InputConstants$Type,int,java.lang.String) -> <init>
+    98:98:boolean isDown() -> d
+    102:102:java.lang.String getCategory() -> e
+    106:110:boolean consumeClick() -> f
+    114:116:void release() -> m
+    119:119:java.lang.String getName() -> g
+    123:123:com.mojang.blaze3d.platform.InputConstants$Key getDefaultKey() -> h
+    127:128:void setKey(com.mojang.blaze3d.platform.InputConstants$Key) -> b
+    132:135:int compareTo(net.minecraft.client.KeyMapping) -> a
+    139:143:java.util.function.Supplier createNameSupplier(java.lang.String) -> a
+    148:148:boolean same(net.minecraft.client.KeyMapping) -> b
+    152:152:boolean isUnbound() -> i
+    156:159:boolean matches(int,int) -> a
+    163:163:boolean matchesMouse(int) -> a
+    167:167:net.minecraft.network.chat.Component getTranslatedKeyMessage() -> j
+    171:171:boolean isDefault() -> k
+    175:175:java.lang.String saveString() -> l
+    179:180:void setDown(boolean) -> a
+    15:15:int compareTo(java.lang.Object) -> compareTo
+    141:141:net.minecraft.network.chat.Component lambda$createNameSupplier$1(java.lang.String) -> b
+    30:37:void lambda$static$0(java.util.HashMap) -> a
+    16:29:void <clinit>() -> <clinit>
+net.minecraft.client.KeyboardHandler -> dlv:
     net.minecraft.client.Minecraft minecraft -> a
     boolean sendRepeatsToGui -> b
     com.mojang.blaze3d.platform.ClipboardManager clipboardManager -> c
@@ -6492,306 +6508,351 @@ net.minecraft.client.KeyboardHandler -> dbl:
     long debugCrashKeyReportedTime -> e
     long debugCrashKeyReportedCount -> f
     boolean handledDebugKey -> g
-    46:54:void <init>(net.minecraft.client.Minecraft) -> <init>
-    58:85:boolean handleChunkDebugKeys(int) -> a
-    90:91:void debugFeedbackTranslated(java.lang.String,java.lang.Object[]) -> a
-    94:95:void debugWarningTranslated(java.lang.String,java.lang.Object[]) -> b
-    98:99:void debugFeedback(java.lang.String,java.lang.Object[]) -> c
-    102:186:boolean handleDebugKeys(int) -> b
-    191:242:void copyRecreateCommand(boolean,boolean) -> a
-    245:257:void copyCreateBlockCommand(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.nbt.CompoundTag) -> a
-    261:272:void copyCreateEntityCommand(net.minecraft.resources.ResourceLocation,net.minecraft.world.phys.Vec3,net.minecraft.nbt.CompoundTag) -> a
-    275:404:void keyPress(long,int,int,int,int) -> a
-    407:421:void charTyped(long,int,int) -> a
-    424:425:void setSendRepeatsToGui(boolean) -> a
-    428:431:void setup(long) -> a
-    434:434:java.lang.String getClipboard() -> a
-    442:443:void setClipboard(java.lang.String) -> a
-    446:466:void tick() -> b
-    435:438:void lambda$getClipboard$11(int,long) -> a
-    430:430:void lambda$setup$10(long,int,int) -> b
-    430:430:void lambda$null$9(long,int,int) -> c
-    429:429:void lambda$setup$8(long,int,int,int,int) -> b
-    429:429:void lambda$null$7(long,int,int,int,int) -> c
-    418:418:void lambda$charTyped$6(net.minecraft.client.gui.components.events.GuiEventListener,char,int) -> a
-    415:415:void lambda$charTyped$5(net.minecraft.client.gui.components.events.GuiEventListener,int,int) -> a
-    335:340:void lambda$keyPress$4(int,boolean[],net.minecraft.client.gui.components.events.ContainerEventHandler,int,int,int) -> a
-    308:308:void lambda$keyPress$3(net.minecraft.network.chat.Component) -> a
-    308:308:void lambda$null$2(net.minecraft.network.chat.Component) -> b
-    225:227:void lambda$copyRecreateCommand$1(net.minecraft.resources.ResourceLocation,net.minecraft.world.entity.Entity,net.minecraft.nbt.CompoundTag) -> a
-    204:206:void lambda$copyRecreateCommand$0(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.nbt.CompoundTag) -> b
-net.minecraft.client.KeyboardHandler$1 -> dbl$1:
+    48:56:void <init>(net.minecraft.client.Minecraft) -> <init>
+    60:87:boolean handleChunkDebugKeys(int) -> a
+    92:93:void debugFeedbackTranslated(java.lang.String,java.lang.Object[]) -> a
+    96:97:void debugWarningTranslated(java.lang.String,java.lang.Object[]) -> b
+    100:101:void debugFeedback(java.lang.String,java.lang.Object[]) -> c
+    104:200:boolean handleDebugKeys(int) -> b
+    205:256:void copyRecreateCommand(boolean,boolean) -> a
+    259:271:void copyCreateBlockCommand(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.nbt.CompoundTag) -> a
+    275:285:void copyCreateEntityCommand(net.minecraft.resources.ResourceLocation,net.minecraft.world.phys.Vec3,net.minecraft.nbt.CompoundTag) -> a
+    288:413:void keyPress(long,int,int,int,int) -> a
+    416:430:void charTyped(long,int,int) -> a
+    433:434:void setSendRepeatsToGui(boolean) -> a
+    437:440:void setup(long) -> a
+    443:443:java.lang.String getClipboard() -> a
+    451:452:void setClipboard(java.lang.String) -> a
+    455:475:void tick() -> b
+    444:447:void lambda$getClipboard$11(int,long) -> a
+    439:439:void lambda$setup$10(long,int,int) -> b
+    439:439:void lambda$null$9(long,int,int) -> c
+    438:438:void lambda$setup$8(long,int,int,int,int) -> b
+    438:438:void lambda$null$7(long,int,int,int,int) -> c
+    427:427:void lambda$charTyped$6(net.minecraft.client.gui.components.events.GuiEventListener,char,int) -> a
+    424:424:void lambda$charTyped$5(net.minecraft.client.gui.components.events.GuiEventListener,int,int) -> a
+    349:354:void lambda$keyPress$4(int,boolean[],net.minecraft.client.gui.components.events.ContainerEventHandler,int,int,int) -> a
+    322:322:void lambda$keyPress$3(net.minecraft.network.chat.Component) -> a
+    322:322:void lambda$null$2(net.minecraft.network.chat.Component) -> b
+    239:241:void lambda$copyRecreateCommand$1(net.minecraft.resources.ResourceLocation,net.minecraft.world.entity.Entity,net.minecraft.nbt.CompoundTag) -> a
+    218:220:void lambda$copyRecreateCommand$0(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.nbt.CompoundTag) -> b
+net.minecraft.client.KeyboardHandler$1 -> dlv$1:
     int[] $SwitchMap$net$minecraft$world$phys$HitResult$Type -> a
-    196:196:void <clinit>() -> <clinit>
-net.minecraft.client.LogaritmicProgressOption -> dbm:
-    9:10:void <init>(java.lang.String,double,double,float,java.util.function.Function,java.util.function.BiConsumer,java.util.function.BiFunction) -> <init>
-    14:14:double toPct(double) -> a
-    19:19:double toValue(double) -> b
-net.minecraft.client.Minecraft -> dbn:
-    net.minecraft.client.Minecraft instance -> E
-    org.apache.logging.log4j.Logger LOGGER -> F
+    210:210:void <clinit>() -> <clinit>
+net.minecraft.client.LogaritmicProgressOption -> dlw:
+    11:12:void <init>(java.lang.String,double,double,float,java.util.function.Function,java.util.function.BiConsumer,java.util.function.BiFunction) -> <init>
+    16:16:double toPct(double) -> a
+    21:21:double toValue(double) -> b
+net.minecraft.client.Minecraft -> dlx:
+    net.minecraft.client.Minecraft instance -> F
+    org.apache.logging.log4j.Logger LOGGER -> G
     boolean ON_OSX -> a
     net.minecraft.resources.ResourceLocation DEFAULT_FONT -> b
-    net.minecraft.resources.ResourceLocation ALT_FONT -> c
-    java.util.concurrent.CompletableFuture RESOURCE_RELOAD_INITIAL_TASK -> G
-    java.io.File resourcePackDirectory -> H
-    com.mojang.authlib.properties.PropertyMap profileProperties -> I
-    net.minecraft.client.renderer.texture.TextureManager textureManager -> J
-    com.mojang.datafixers.DataFixer fixerUpper -> K
-    net.minecraft.client.renderer.VirtualScreen virtualScreen -> L
-    com.mojang.blaze3d.platform.Window window -> M
-    net.minecraft.client.Timer timer -> N
-    net.minecraft.world.Snooper snooper -> O
-    net.minecraft.client.renderer.RenderBuffers renderBuffers -> P
-    net.minecraft.client.renderer.LevelRenderer levelRenderer -> d
-    net.minecraft.client.renderer.entity.EntityRenderDispatcher entityRenderDispatcher -> Q
-    net.minecraft.client.renderer.entity.ItemRenderer itemRenderer -> R
-    net.minecraft.client.renderer.ItemInHandRenderer itemInHandRenderer -> S
-    net.minecraft.client.particle.ParticleEngine particleEngine -> e
-    net.minecraft.client.searchtree.SearchRegistry searchRegistry -> T
-    net.minecraft.client.User user -> U
-    net.minecraft.client.gui.Font font -> f
-    net.minecraft.client.renderer.GameRenderer gameRenderer -> g
-    net.minecraft.client.renderer.debug.DebugRenderer debugRenderer -> h
-    java.util.concurrent.atomic.AtomicReference progressListener -> V
-    net.minecraft.client.gui.Gui gui -> i
-    net.minecraft.client.Options options -> j
-    net.minecraft.client.HotbarManager hotbarManager -> W
-    net.minecraft.client.MouseHandler mouseHandler -> k
-    net.minecraft.client.KeyboardHandler keyboardHandler -> l
-    java.io.File gameDirectory -> m
-    java.lang.String launchedVersion -> X
-    java.lang.String versionType -> Y
-    java.net.Proxy proxy -> Z
-    net.minecraft.world.level.storage.LevelStorageSource levelSource -> aa
-    net.minecraft.util.FrameTimer frameTimer -> n
-    boolean is64bit -> ab
-    boolean demo -> ac
-    net.minecraft.util.profiling.GameProfiler profiler -> ad
-    net.minecraft.server.packs.resources.ReloadableResourceManager resourceManager -> ae
-    net.minecraft.client.resources.ClientPackSource clientPackSource -> af
-    net.minecraft.server.packs.repository.PackRepository resourcePackRepository -> ag
-    net.minecraft.client.resources.language.LanguageManager languageManager -> ah
-    net.minecraft.client.color.block.BlockColors blockColors -> ai
-    net.minecraft.client.color.item.ItemColors itemColors -> aj
-    com.mojang.blaze3d.pipeline.RenderTarget mainRenderTarget -> ak
-    net.minecraft.client.sounds.SoundManager soundManager -> al
-    net.minecraft.client.sounds.MusicManager musicManager -> am
-    net.minecraft.client.gui.font.FontManager fontManager -> an
-    net.minecraft.client.resources.SplashManager splashManager -> ao
-    com.mojang.authlib.minecraft.MinecraftSessionService minecraftSessionService -> ap
-    net.minecraft.client.resources.SkinManager skinManager -> aq
-    net.minecraft.client.resources.model.ModelManager modelManager -> ar
-    net.minecraft.client.renderer.block.BlockRenderDispatcher blockRenderer -> as
-    net.minecraft.client.resources.PaintingTextureManager paintingTextures -> at
-    net.minecraft.client.resources.MobEffectTextureManager mobEffectTextures -> au
-    net.minecraft.client.gui.components.toasts.ToastComponent toast -> av
-    net.minecraft.client.Game game -> aw
-    net.minecraft.client.tutorial.Tutorial tutorial -> ax
-    byte[] reserve -> o
-    net.minecraft.client.multiplayer.MultiPlayerGameMode gameMode -> p
-    net.minecraft.client.multiplayer.ClientLevel level -> q
-    net.minecraft.client.player.LocalPlayer player -> r
-    net.minecraft.client.server.IntegratedServer singleplayerServer -> ay
-    net.minecraft.client.multiplayer.ServerData currentServer -> az
-    net.minecraft.network.Connection pendingConnection -> aA
-    boolean isLocalServer -> aB
-    net.minecraft.world.entity.Entity cameraEntity -> s
-    net.minecraft.world.entity.Entity crosshairPickEntity -> t
-    net.minecraft.world.phys.HitResult hitResult -> u
-    int rightClickDelay -> aC
-    int missTime -> v
-    boolean pause -> aD
-    float pausePartialTick -> aE
-    long lastNanoTime -> aF
-    long lastTime -> aG
-    int frames -> aH
-    boolean noRender -> w
-    net.minecraft.client.gui.screens.Screen screen -> x
-    net.minecraft.client.gui.screens.Overlay overlay -> y
-    boolean connectedToRealms -> aI
-    java.lang.Thread gameThread -> aJ
-    boolean running -> aK
-    net.minecraft.CrashReport delayedCrash -> aL
-    int fps -> aM
-    java.lang.String fpsString -> z
-    boolean wireframe -> A
-    boolean chunkPath -> B
-    boolean chunkVisibility -> C
-    boolean smartCull -> D
-    boolean windowActive -> aN
-    java.util.Queue progressTasks -> aO
-    java.util.concurrent.CompletableFuture pendingReload -> aP
-    java.lang.String debugPath -> aQ
-    233:1099:void <init>(net.minecraft.client.main.GameConfig) -> <init>
-    551:552:void updateTitle() -> b
-    555:576:java.lang.String createTitle() -> ax
-    580:580:boolean isProbablyModded() -> c
-    584:606:void rollbackResourcePacks(java.lang.Throwable) -> a
-    609:644:void run() -> d
-    647:673:void createSearchTrees() -> aA
-    676:678:void onFullscreenError(int,long) -> a
-    681:692:boolean checkIs64Bit() -> aB
-    696:696:com.mojang.blaze3d.pipeline.RenderTarget getMainRenderTarget() -> e
-    700:700:java.lang.String getLaunchedVersion() -> f
-    704:704:java.lang.String getVersionType() -> g
-    709:723:void startTimerHackThread() -> aC
-    726:727:void delayCrash(net.minecraft.CrashReport) -> a
-    730:745:void crash(net.minecraft.CrashReport) -> b
-    748:748:boolean isEnforceUnicode() -> h
-    754:774:java.util.concurrent.CompletableFuture reloadResourcePacks() -> i
-    778:829:void selfTest() -> aD
-    832:832:net.minecraft.world.level.storage.LevelStorageSource getLevelSource() -> j
-    836:873:void setScreen(net.minecraft.client.gui.screens.Screen) -> a
-    876:877:void setOverlay(net.minecraft.client.gui.screens.Overlay) -> a
-    881:905:void destroy() -> k
-    910:928:void close() -> close
-    931:1057:void runTick(boolean) -> d
-    1061:1072:void resizeDisplay() -> a
-    1075:1078:int getFramerateLimit() -> aE
-    1084:1097:void emergencySave() -> l
-    1102:1125:void debugFpsMeterKeyPress(int) -> a
-    1128:1232:void renderFpsMeter() -> aF
-    1235:1236:void stop() -> m
-    1239:1239:boolean isRunning() -> n
-    1243:1254:void pauseGame(boolean) -> b
-    1257:1279:void continueAttack(boolean) -> e
-    1282:1321:void startAttack() -> aG
-    1324:1394:void startUseItem() -> aH
-    1397:1397:net.minecraft.client.sounds.MusicManager getMusicManager() -> o
-    1401:1514:void tick() -> p
-    1517:1610:void handleKeybinds() -> aI
-    1613:1682:void selectLevel(java.lang.String,java.lang.String,net.minecraft.world.level.LevelSettings) -> a
-    1685:1701:void setLevel(net.minecraft.client.multiplayer.ClientLevel) -> a
-    1704:1705:void clearLevel() -> q
-    1709:1740:void clearLevel(net.minecraft.client.gui.screens.Screen) -> b
-    1743:1751:void updateScreenAndTick(net.minecraft.client.gui.screens.Screen) -> c
-    1754:1758:void updateLevelInEngines(net.minecraft.client.multiplayer.ClientLevel) -> b
-    1761:1761:boolean isDemo() -> r
-    1766:1766:net.minecraft.client.multiplayer.ClientPacketListener getConnection() -> s
-    1770:1770:boolean renderNames() -> t
-    1774:1774:boolean useFancyGraphics() -> u
-    1778:1778:boolean useAmbientOcclusion() -> v
-    1782:1895:void pickBlock() -> aJ
-    1898:1914:net.minecraft.world.item.ItemStack addCustomNbtData(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.entity.BlockEntity) -> a
-    1918:1924:net.minecraft.CrashReport fillReport(net.minecraft.CrashReport) -> c
-    1928:1967:void fillReport(net.minecraft.client.resources.language.LanguageManager,java.lang.String,net.minecraft.client.Options,net.minecraft.CrashReport) -> a
-    1970:1970:net.minecraft.client.Minecraft getInstance() -> x
-    1974:1974:java.util.concurrent.CompletableFuture delayTextureReload() -> y
-    1982:2006:void populateSnooper(net.minecraft.world.Snooper) -> a
-    2009:2023:java.lang.String getCurrentSnooperAction() -> aK
-    2028:2037:void populateSnooperInitial(net.minecraft.world.Snooper) -> b
-    2040:2041:void populateSnooperWithOpenGL(net.minecraft.world.Snooper) -> c
-    2045:2045:boolean isSnooperEnabled() -> W
-    2049:2050:void setCurrentServer(net.minecraft.client.multiplayer.ServerData) -> a
-    2054:2054:net.minecraft.client.multiplayer.ServerData getCurrentServer() -> z
-    2058:2058:boolean isLocalServer() -> A
-    2062:2062:boolean hasSingleplayerServer() -> B
-    2067:2067:net.minecraft.client.server.IntegratedServer getSingleplayerServer() -> C
-    2071:2071:net.minecraft.world.Snooper getSnooper() -> D
-    2075:2075:net.minecraft.client.User getUser() -> E
-    2079:2084:com.mojang.authlib.properties.PropertyMap getProfileProperties() -> F
-    2088:2088:java.net.Proxy getProxy() -> G
-    2092:2092:net.minecraft.client.renderer.texture.TextureManager getTextureManager() -> H
-    2096:2096:net.minecraft.server.packs.resources.ResourceManager getResourceManager() -> I
-    2100:2100:net.minecraft.server.packs.repository.PackRepository getResourcePackRepository() -> J
-    2104:2104:net.minecraft.client.resources.ClientPackSource getClientPackSource() -> K
-    2108:2108:java.io.File getResourcePackDirectory() -> L
-    2112:2112:net.minecraft.client.resources.language.LanguageManager getLanguageManager() -> M
-    2116:2116:java.util.function.Function getTextureAtlas(net.minecraft.resources.ResourceLocation) -> a
-    2120:2120:boolean is64Bit() -> N
-    2124:2124:boolean isPaused() -> O
-    2128:2128:net.minecraft.client.sounds.SoundManager getSoundManager() -> P
-    2132:2159:net.minecraft.client.sounds.MusicManager$Music getSituationalMusic() -> Q
-    2163:2163:com.mojang.authlib.minecraft.MinecraftSessionService getMinecraftSessionService() -> R
-    2167:2167:net.minecraft.client.resources.SkinManager getSkinManager() -> S
-    2172:2172:net.minecraft.world.entity.Entity getCameraEntity() -> T
-    2176:2178:void setCameraEntity(net.minecraft.world.entity.Entity) -> a
-    2182:2182:java.lang.Thread getRunningThread() -> az
-    2187:2187:java.lang.Runnable wrapRunnable(java.lang.Runnable) -> e
-    2192:2192:boolean shouldRun(java.lang.Runnable) -> d
-    2196:2196:net.minecraft.client.renderer.block.BlockRenderDispatcher getBlockRenderer() -> U
-    2200:2200:net.minecraft.client.renderer.entity.EntityRenderDispatcher getEntityRenderDispatcher() -> V
-    2204:2204:net.minecraft.client.renderer.entity.ItemRenderer getItemRenderer() -> X
-    2208:2208:net.minecraft.client.renderer.ItemInHandRenderer getItemInHandRenderer() -> Y
-    2212:2212:net.minecraft.client.searchtree.MutableSearchTree getSearchTree(net.minecraft.client.searchtree.SearchRegistry$Key) -> a
-    2216:2216:int getAverageFps() -> Z
-    2220:2220:net.minecraft.util.FrameTimer getFrameTimer() -> aa
-    2224:2224:boolean isConnectedToRealms() -> ab
-    2228:2229:void setConnectedToRealms(boolean) -> c
-    2232:2232:com.mojang.datafixers.DataFixer getFixerUpper() -> ac
-    2236:2236:float getFrameTime() -> ad
-    2240:2240:float getDeltaFrameTime() -> ae
-    2244:2244:net.minecraft.client.color.block.BlockColors getBlockColors() -> af
-    2248:2248:boolean showOnlyReducedInfo() -> ag
-    2252:2252:net.minecraft.client.gui.components.toasts.ToastComponent getToasts() -> ah
-    2256:2256:net.minecraft.client.tutorial.Tutorial getTutorial() -> ai
-    2260:2260:boolean isWindowActive() -> aj
-    2264:2264:net.minecraft.client.HotbarManager getHotbarManager() -> ak
-    2268:2268:net.minecraft.client.resources.model.ModelManager getModelManager() -> al
-    2272:2272:net.minecraft.client.gui.font.FontManager getFontManager() -> am
-    2276:2276:net.minecraft.client.resources.PaintingTextureManager getPaintingTextures() -> an
-    2280:2280:net.minecraft.client.resources.MobEffectTextureManager getMobEffectTextures() -> ao
-    2285:2286:void setWindowActive(boolean) -> a
-    2289:2360:net.minecraft.network.chat.Component grabPanoramixScreenshot(java.io.File,int,int) -> a
-    2369:2403:net.minecraft.network.chat.Component grabHugeScreenshot(java.io.File,int,int,int,int) -> a
-    2408:2408:net.minecraft.util.profiling.ProfilerFiller getProfiler() -> ap
-    2412:2412:net.minecraft.client.Game getGame() -> aq
-    2417:2417:net.minecraft.server.level.progress.StoringChunkProgressListener getProgressListener() -> ar
-    2421:2421:net.minecraft.client.resources.SplashManager getSplashManager() -> as
-    2426:2426:net.minecraft.client.gui.screens.Overlay getOverlay() -> at
-    2430:2430:boolean renderOnThread() -> au
-    2434:2434:com.mojang.blaze3d.platform.Window getWindow() -> av
-    2438:2438:net.minecraft.client.renderer.RenderBuffers renderBuffers() -> aw
-    2442:2452:net.minecraft.client.resources.UnopenedResourcePack createClientPackAdapter(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.server.packs.Pack,net.minecraft.server.packs.metadata.pack.PackMetadataSection,net.minecraft.server.packs.repository.UnopenedPack$Position) -> a
-    2456:2456:java.util.function.Supplier adaptV3(java.util.function.Supplier) -> b
-    2460:2460:java.util.function.Supplier adaptV4(java.util.function.Supplier) -> c
-    2464:2465:void updateMaxMipLevel(int) -> b
-    2460:2460:net.minecraft.server.packs.Pack lambda$adaptV4$33(java.util.function.Supplier) -> d
-    2456:2456:net.minecraft.server.packs.Pack lambda$adaptV3$32(java.util.function.Supplier) -> e
-    2398:2398:void lambda$grabHugeScreenshot$31(java.io.File,net.minecraft.network.chat.Style) -> a
-    2342:2342:void lambda$grabPanoramixScreenshot$30(java.io.File,net.minecraft.network.chat.Style) -> b
-    2338:2338:void lambda$grabPanoramixScreenshot$29(net.minecraft.network.chat.Component) -> a
-    1974:1974:java.util.concurrent.CompletionStage lambda$delayTextureReload$28(java.util.concurrent.CompletableFuture) -> a
-    1964:1964:java.lang.String lambda$fillReport$27(net.minecraft.client.resources.language.LanguageManager) -> a
-    1949:1959:java.lang.String lambda$fillReport$26(net.minecraft.client.Options) -> a
-    1936:1943:java.lang.String lambda$fillReport$25() -> aL
-    1934:1934:java.lang.String lambda$fillReport$24() -> aM
-    1929:1929:java.lang.String lambda$fillReport$23(java.lang.String) -> a
-    1678:1678:void lambda$selectLevel$22(net.minecraft.network.chat.Component) -> b
-    1640:1643:net.minecraft.server.level.progress.ChunkProgressListener lambda$selectLevel$21(int) -> c
-    1485:1485:boolean lambda$tick$20() -> aN
-    1437:1437:void lambda$tick$19() -> aO
-    944:944:void lambda$runTick$18(java.util.concurrent.CompletableFuture) -> b
-    768:768:void lambda$reloadResourcePacks$17(java.util.List,java.util.concurrent.CompletableFuture,java.util.Optional) -> a
-    769:772:void lambda$null$16(java.util.List,java.util.concurrent.CompletableFuture) -> a
-    667:667:java.util.stream.Stream lambda$createSearchTrees$15(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> a
-    667:667:net.minecraft.resources.ResourceLocation lambda$null$14(net.minecraft.world.item.crafting.Recipe) -> a
-    666:666:java.util.stream.Stream lambda$createSearchTrees$13(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> b
-    666:666:boolean lambda$null$12(java.lang.String) -> b
-    666:666:java.lang.String lambda$null$11(net.minecraft.network.chat.Component) -> c
-    666:666:java.util.stream.Stream lambda$null$10(net.minecraft.world.item.crafting.Recipe) -> b
-    661:663:void lambda$createSearchTrees$9(net.minecraft.client.searchtree.ReloadableSearchTree,net.minecraft.client.searchtree.ReloadableIdSearchTree,net.minecraft.world.item.ItemStack) -> a
-    653:653:java.util.stream.Stream lambda$createSearchTrees$8(net.minecraft.world.item.ItemStack) -> a
-    649:649:java.util.stream.Stream lambda$createSearchTrees$7(net.minecraft.world.item.ItemStack) -> b
-    648:648:java.util.stream.Stream lambda$createSearchTrees$6(net.minecraft.world.item.ItemStack) -> c
-    648:648:boolean lambda$null$5(java.lang.String) -> c
-    648:648:java.lang.String lambda$null$4(net.minecraft.network.chat.Component) -> d
-    600:602:void lambda$rollbackResourcePacks$3(net.minecraft.network.chat.Component) -> e
-    541:541:void lambda$new$2(java.util.List,java.util.Optional) -> a
-    542:546:void lambda$null$1(java.util.List) -> a
-    266:266:int lambda$new$0() -> aP
-    212:212:boolean access$000(net.minecraft.client.Minecraft) -> a
-    216:289:void <clinit>() -> <clinit>
-net.minecraft.client.Minecraft$1 -> dbn$1:
-    net.minecraft.client.Minecraft this$0 -> a
-    709:709:void <init>(net.minecraft.client.Minecraft,java.lang.String) -> <init>
-    712:718:void run() -> run
-net.minecraft.client.Minecraft$2 -> dbn$2:
+    net.minecraft.resources.ResourceLocation UNIFORM_FONT -> c
+    net.minecraft.resources.ResourceLocation ALT_FONT -> d
+    java.util.concurrent.CompletableFuture RESOURCE_RELOAD_INITIAL_TASK -> H
+    java.io.File resourcePackDirectory -> I
+    com.mojang.authlib.properties.PropertyMap profileProperties -> J
+    net.minecraft.client.renderer.texture.TextureManager textureManager -> K
+    com.mojang.datafixers.DataFixer fixerUpper -> L
+    net.minecraft.client.renderer.VirtualScreen virtualScreen -> M
+    com.mojang.blaze3d.platform.Window window -> N
+    net.minecraft.client.Timer timer -> O
+    net.minecraft.world.Snooper snooper -> P
+    net.minecraft.client.renderer.RenderBuffers renderBuffers -> Q
+    net.minecraft.client.renderer.LevelRenderer levelRenderer -> e
+    net.minecraft.client.renderer.entity.EntityRenderDispatcher entityRenderDispatcher -> R
+    net.minecraft.client.renderer.entity.ItemRenderer itemRenderer -> S
+    net.minecraft.client.renderer.ItemInHandRenderer itemInHandRenderer -> T
+    net.minecraft.client.particle.ParticleEngine particleEngine -> f
+    net.minecraft.client.searchtree.SearchRegistry searchRegistry -> U
+    net.minecraft.client.User user -> V
+    net.minecraft.client.gui.Font font -> g
+    net.minecraft.client.renderer.GameRenderer gameRenderer -> h
+    net.minecraft.client.renderer.debug.DebugRenderer debugRenderer -> i
+    java.util.concurrent.atomic.AtomicReference progressListener -> W
+    net.minecraft.client.gui.Gui gui -> j
+    net.minecraft.client.Options options -> k
+    net.minecraft.client.HotbarManager hotbarManager -> X
+    net.minecraft.client.MouseHandler mouseHandler -> l
+    net.minecraft.client.KeyboardHandler keyboardHandler -> m
+    java.io.File gameDirectory -> n
+    java.lang.String launchedVersion -> Y
+    java.lang.String versionType -> Z
+    java.net.Proxy proxy -> aa
+    net.minecraft.world.level.storage.LevelStorageSource levelSource -> ab
+    net.minecraft.util.FrameTimer frameTimer -> o
+    boolean is64bit -> ac
+    boolean demo -> ad
+    boolean allowsMultiplayer -> ae
+    boolean allowsChat -> af
+    net.minecraft.server.packs.resources.ReloadableResourceManager resourceManager -> ag
+    net.minecraft.client.resources.ClientPackSource clientPackSource -> ah
+    net.minecraft.server.packs.repository.PackRepository resourcePackRepository -> ai
+    net.minecraft.client.resources.language.LanguageManager languageManager -> aj
+    net.minecraft.client.color.block.BlockColors blockColors -> ak
+    net.minecraft.client.color.item.ItemColors itemColors -> al
+    com.mojang.blaze3d.pipeline.RenderTarget mainRenderTarget -> am
+    net.minecraft.client.sounds.SoundManager soundManager -> an
+    net.minecraft.client.sounds.MusicManager musicManager -> ao
+    net.minecraft.client.gui.font.FontManager fontManager -> ap
+    net.minecraft.client.resources.SplashManager splashManager -> aq
+    net.minecraft.client.renderer.GpuWarnlistManager gpuWarnlistManager -> ar
+    com.mojang.authlib.minecraft.MinecraftSessionService minecraftSessionService -> as
+    net.minecraft.client.resources.SkinManager skinManager -> at
+    net.minecraft.client.resources.model.ModelManager modelManager -> au
+    net.minecraft.client.renderer.block.BlockRenderDispatcher blockRenderer -> av
+    net.minecraft.client.resources.PaintingTextureManager paintingTextures -> aw
+    net.minecraft.client.resources.MobEffectTextureManager mobEffectTextures -> ax
+    net.minecraft.client.gui.components.toasts.ToastComponent toast -> ay
+    net.minecraft.client.Game game -> az
+    net.minecraft.client.tutorial.Tutorial tutorial -> aA
+    byte[] reserve -> p
+    net.minecraft.client.multiplayer.MultiPlayerGameMode gameMode -> q
+    net.minecraft.client.multiplayer.ClientLevel level -> r
+    net.minecraft.client.player.LocalPlayer player -> s
+    net.minecraft.client.server.IntegratedServer singleplayerServer -> aB
+    net.minecraft.client.multiplayer.ServerData currentServer -> aC
+    net.minecraft.network.Connection pendingConnection -> aD
+    boolean isLocalServer -> aE
+    net.minecraft.world.entity.Entity cameraEntity -> t
+    net.minecraft.world.entity.Entity crosshairPickEntity -> u
+    net.minecraft.world.phys.HitResult hitResult -> v
+    int rightClickDelay -> aF
+    int missTime -> w
+    boolean pause -> aG
+    float pausePartialTick -> aH
+    long lastNanoTime -> aI
+    long lastTime -> aJ
+    int frames -> aK
+    boolean noRender -> x
+    net.minecraft.client.gui.screens.Screen screen -> y
+    net.minecraft.client.gui.screens.Overlay overlay -> z
+    boolean connectedToRealms -> aL
+    java.lang.Thread gameThread -> aM
+    boolean running -> aN
+    net.minecraft.CrashReport delayedCrash -> aO
+    int fps -> aP
+    java.lang.String fpsString -> A
+    boolean wireframe -> B
+    boolean chunkPath -> C
+    boolean chunkVisibility -> D
+    boolean smartCull -> E
+    boolean windowActive -> aQ
+    java.util.Queue progressTasks -> aR
+    java.util.concurrent.CompletableFuture pendingReload -> aS
+    net.minecraft.util.profiling.ProfilerFiller profiler -> aT
+    int fpsPieRenderTicks -> aU
+    net.minecraft.util.profiling.ContinuousProfiler fpsPieProfiler -> aV
+    net.minecraft.util.profiling.ProfileResults fpsPieResults -> aW
+    java.lang.String debugPath -> aX
+    261:1163:void <init>(net.minecraft.client.main.GameConfig) -> <init>
+    581:582:void updateTitle() -> c
+    585:606:java.lang.String createTitle() -> aD
+    610:610:boolean isProbablyModded() -> d
+    614:636:void rollbackResourcePacks(java.lang.Throwable) -> a
+    639:682:void run() -> e
+    685:686:void selectMainFont(boolean) -> b
+    689:715:void createSearchTrees() -> aE
+    718:720:void onFullscreenError(int,long) -> a
+    723:734:boolean checkIs64Bit() -> aF
+    738:738:com.mojang.blaze3d.pipeline.RenderTarget getMainRenderTarget() -> f
+    742:742:java.lang.String getLaunchedVersion() -> g
+    746:746:java.lang.String getVersionType() -> h
+    750:751:void delayCrash(net.minecraft.CrashReport) -> a
+    754:769:void crash(net.minecraft.CrashReport) -> b
+    772:772:boolean isEnforceUnicode() -> i
+    778:796:java.util.concurrent.CompletableFuture reloadResourcePacks() -> j
+    800:851:void selfTest() -> aG
+    854:854:net.minecraft.world.level.storage.LevelStorageSource getLevelSource() -> k
+    858:865:void openChatScreen(java.lang.String) -> b
+    868:905:void setScreen(net.minecraft.client.gui.screens.Screen) -> a
+    908:909:void setOverlay(net.minecraft.client.gui.screens.Overlay) -> a
+    913:937:void destroy() -> l
+    942:961:void close() -> close
+    965:1087:void runTick(boolean) -> e
+    1090:1090:boolean shouldRenderFpsPie() -> aH
+    1094:1104:void startProfilers(boolean,net.minecraft.util.profiling.SingleTickProfiler) -> a
+    1107:1116:void finishProfilers(boolean,net.minecraft.util.profiling.SingleTickProfiler) -> b
+    1120:1131:void resizeDisplay() -> a
+    1135:1136:void cursorEntered() -> b
+    1139:1142:int getFramerateLimit() -> aI
+    1148:1161:void emergencySave() -> m
+    1166:1191:void debugFpsMeterKeyPress(int) -> a
+    1194:1294:void renderFpsMeter(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.util.profiling.ProfileResults) -> a
+    1297:1298:void stop() -> n
+    1301:1301:boolean isRunning() -> o
+    1305:1316:void pauseGame(boolean) -> c
+    1319:1341:void continueAttack(boolean) -> f
+    1344:1383:void startAttack() -> aJ
+    1386:1456:void startUseItem() -> aK
+    1459:1459:net.minecraft.client.sounds.MusicManager getMusicManager() -> p
+    1463:1575:void tick() -> q
+    1578:1671:void handleKeybinds() -> aL
+    1674:1679:net.minecraft.world.level.DataPackConfig loadDataPacks(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess) -> a
+    1683:1688:net.minecraft.world.level.storage.WorldData loadWorldData(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.world.level.DataPackConfig) -> a
+    1698:1699:void loadLevel(java.lang.String) -> a
+    1702:1709:void createLevel(java.lang.String,net.minecraft.world.level.LevelSettings,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.levelgen.WorldGenSettings) -> a
+    1744:1843:void doLoadLevel(java.lang.String,net.minecraft.core.RegistryAccess$RegistryHolder,java.util.function.Function,com.mojang.datafixers.util.Function4,boolean,net.minecraft.client.Minecraft$ExperimentalDialogType) -> a
+    1846:1891:void displayExperimentalConfirmationDialog(net.minecraft.client.Minecraft$ExperimentalDialogType,java.lang.String,boolean,java.lang.Runnable) -> a
+    1894:1911:net.minecraft.client.Minecraft$ServerStem makeServerStem(net.minecraft.core.RegistryAccess$RegistryHolder,java.util.function.Function,com.mojang.datafixers.util.Function4,boolean,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess) -> a
+    1916:1932:void setLevel(net.minecraft.client.multiplayer.ClientLevel) -> a
+    1935:1936:void clearLevel() -> r
+    1940:1973:void clearLevel(net.minecraft.client.gui.screens.Screen) -> b
+    1976:1985:void updateScreenAndTick(net.minecraft.client.gui.screens.Screen) -> d
+    1988:1992:void forceSetScreen(net.minecraft.client.gui.screens.Screen) -> c
+    1995:1999:void updateLevelInEngines(net.minecraft.client.multiplayer.ClientLevel) -> b
+    2002:2002:boolean allowsMultiplayer() -> s
+    2006:2009:boolean isBlocked(java.util.UUID) -> a
+    2013:2013:boolean allowsChat() -> t
+    2017:2017:boolean isDemo() -> u
+    2022:2022:net.minecraft.client.multiplayer.ClientPacketListener getConnection() -> v
+    2026:2026:boolean renderNames() -> w
+    2030:2030:boolean useFancyGraphics() -> y
+    2034:2034:boolean useShaderTransparency() -> z
+    2038:2038:boolean useAmbientOcclusion() -> A
+    2042:2155:void pickBlock() -> aM
+    2158:2174:net.minecraft.world.item.ItemStack addCustomNbtData(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.entity.BlockEntity) -> a
+    2178:2184:net.minecraft.CrashReport fillReport(net.minecraft.CrashReport) -> c
+    2188:2227:void fillReport(net.minecraft.client.resources.language.LanguageManager,java.lang.String,net.minecraft.client.Options,net.minecraft.CrashReport) -> a
+    2230:2230:net.minecraft.client.Minecraft getInstance() -> B
+    2234:2234:java.util.concurrent.CompletableFuture delayTextureReload() -> C
+    2242:2266:void populateSnooper(net.minecraft.world.Snooper) -> a
+    2269:2283:java.lang.String getCurrentSnooperAction() -> aN
+    2288:2297:void populateSnooperInitial(net.minecraft.world.Snooper) -> b
+    2300:2301:void populateSnooperWithOpenGL(net.minecraft.world.Snooper) -> c
+    2305:2305:boolean isSnooperEnabled() -> S
+    2309:2310:void setCurrentServer(net.minecraft.client.multiplayer.ServerData) -> a
+    2314:2314:net.minecraft.client.multiplayer.ServerData getCurrentServer() -> D
+    2318:2318:boolean isLocalServer() -> E
+    2322:2322:boolean hasSingleplayerServer() -> F
+    2327:2327:net.minecraft.client.server.IntegratedServer getSingleplayerServer() -> G
+    2331:2331:net.minecraft.world.Snooper getSnooper() -> H
+    2335:2335:net.minecraft.client.User getUser() -> I
+    2339:2344:com.mojang.authlib.properties.PropertyMap getProfileProperties() -> J
+    2348:2348:java.net.Proxy getProxy() -> K
+    2352:2352:net.minecraft.client.renderer.texture.TextureManager getTextureManager() -> L
+    2356:2356:net.minecraft.server.packs.resources.ResourceManager getResourceManager() -> M
+    2360:2360:net.minecraft.server.packs.repository.PackRepository getResourcePackRepository() -> N
+    2364:2364:net.minecraft.client.resources.ClientPackSource getClientPackSource() -> O
+    2368:2368:java.io.File getResourcePackDirectory() -> P
+    2372:2372:net.minecraft.client.resources.language.LanguageManager getLanguageManager() -> Q
+    2376:2376:java.util.function.Function getTextureAtlas(net.minecraft.resources.ResourceLocation) -> a
+    2380:2380:boolean is64Bit() -> R
+    2384:2384:boolean isPaused() -> T
+    2388:2388:net.minecraft.client.renderer.GpuWarnlistManager getGpuWarnlistManager() -> U
+    2392:2392:net.minecraft.client.sounds.SoundManager getSoundManager() -> V
+    2396:2420:net.minecraft.sounds.Music getSituationalMusic() -> W
+    2424:2424:com.mojang.authlib.minecraft.MinecraftSessionService getMinecraftSessionService() -> X
+    2428:2428:net.minecraft.client.resources.SkinManager getSkinManager() -> Y
+    2433:2433:net.minecraft.world.entity.Entity getCameraEntity() -> Z
+    2437:2439:void setCameraEntity(net.minecraft.world.entity.Entity) -> a
+    2442:2442:boolean shouldEntityAppearGlowing(net.minecraft.world.entity.Entity) -> b
+    2447:2447:java.lang.Thread getRunningThread() -> au
+    2452:2452:java.lang.Runnable wrapRunnable(java.lang.Runnable) -> e
+    2457:2457:boolean shouldRun(java.lang.Runnable) -> d
+    2461:2461:net.minecraft.client.renderer.block.BlockRenderDispatcher getBlockRenderer() -> aa
+    2465:2465:net.minecraft.client.renderer.entity.EntityRenderDispatcher getEntityRenderDispatcher() -> ab
+    2469:2469:net.minecraft.client.renderer.entity.ItemRenderer getItemRenderer() -> ac
+    2473:2473:net.minecraft.client.renderer.ItemInHandRenderer getItemInHandRenderer() -> ad
+    2477:2477:net.minecraft.client.searchtree.MutableSearchTree getSearchTree(net.minecraft.client.searchtree.SearchRegistry$Key) -> a
+    2481:2481:int getAverageFps() -> ae
+    2485:2485:net.minecraft.util.FrameTimer getFrameTimer() -> af
+    2489:2489:boolean isConnectedToRealms() -> ag
+    2493:2494:void setConnectedToRealms(boolean) -> d
+    2497:2497:com.mojang.datafixers.DataFixer getFixerUpper() -> ah
+    2501:2501:float getFrameTime() -> ai
+    2505:2505:float getDeltaFrameTime() -> aj
+    2509:2509:net.minecraft.client.color.block.BlockColors getBlockColors() -> ak
+    2513:2513:boolean showOnlyReducedInfo() -> al
+    2517:2517:net.minecraft.client.gui.components.toasts.ToastComponent getToasts() -> am
+    2521:2521:net.minecraft.client.tutorial.Tutorial getTutorial() -> an
+    2525:2525:boolean isWindowActive() -> ao
+    2529:2529:net.minecraft.client.HotbarManager getHotbarManager() -> ap
+    2533:2533:net.minecraft.client.resources.model.ModelManager getModelManager() -> aq
+    2537:2537:net.minecraft.client.resources.PaintingTextureManager getPaintingTextures() -> ar
+    2541:2541:net.minecraft.client.resources.MobEffectTextureManager getMobEffectTextures() -> as
+    2546:2547:void setWindowActive(boolean) -> a
+    2550:2621:net.minecraft.network.chat.Component grabPanoramixScreenshot(java.io.File,int,int) -> a
+    2630:2664:net.minecraft.network.chat.Component grabHugeScreenshot(java.io.File,int,int,int,int) -> a
+    2669:2669:net.minecraft.util.profiling.ProfilerFiller getProfiler() -> av
+    2673:2673:net.minecraft.client.Game getGame() -> aw
+    2678:2678:net.minecraft.server.level.progress.StoringChunkProgressListener getProgressListener() -> ax
+    2682:2682:net.minecraft.client.resources.SplashManager getSplashManager() -> ay
+    2687:2687:net.minecraft.client.gui.screens.Overlay getOverlay() -> az
+    2691:2691:boolean renderOnThread() -> aA
+    2695:2695:com.mojang.blaze3d.platform.Window getWindow() -> aB
+    2699:2699:net.minecraft.client.renderer.RenderBuffers renderBuffers() -> aC
+    2703:2713:net.minecraft.client.resources.ResourcePack createClientPackAdapter(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.server.packs.PackResources,net.minecraft.server.packs.metadata.pack.PackMetadataSection,net.minecraft.server.packs.repository.Pack$Position,net.minecraft.server.packs.repository.PackSource) -> a
+    2717:2717:java.util.function.Supplier adaptV3(java.util.function.Supplier) -> b
+    2721:2721:java.util.function.Supplier adaptV4(java.util.function.Supplier) -> c
+    2725:2726:void updateMaxMipLevel(int) -> b
+    2721:2721:net.minecraft.server.packs.PackResources lambda$adaptV4$40(java.util.function.Supplier) -> d
+    2717:2717:net.minecraft.server.packs.PackResources lambda$adaptV3$39(java.util.function.Supplier) -> e
+    2659:2659:net.minecraft.network.chat.Style lambda$grabHugeScreenshot$38(java.io.File,net.minecraft.network.chat.Style) -> a
+    2603:2603:net.minecraft.network.chat.Style lambda$grabPanoramixScreenshot$37(java.io.File,net.minecraft.network.chat.Style) -> b
+    2599:2599:void lambda$grabPanoramixScreenshot$36(net.minecraft.network.chat.Component) -> a
+    2234:2234:java.util.concurrent.CompletionStage lambda$delayTextureReload$35(java.util.concurrent.CompletableFuture) -> a
+    2224:2224:java.lang.String lambda$fillReport$34(net.minecraft.client.resources.language.LanguageManager) -> a
+    2209:2219:java.lang.String lambda$fillReport$33(net.minecraft.client.Options) -> a
+    2196:2203:java.lang.String lambda$fillReport$32() -> aO
+    2194:2194:java.lang.String lambda$fillReport$31() -> aP
+    2189:2189:java.lang.String lambda$fillReport$30(java.lang.String) -> c
+    1872:1884:void lambda$displayExperimentalConfirmationDialog$29(java.lang.Runnable,java.lang.String,boolean) -> a
+    1860:1864:void lambda$displayExperimentalConfirmationDialog$28(java.lang.String,java.lang.Runnable,boolean,boolean) -> a
+    1839:1839:void lambda$doLoadLevel$27(net.minecraft.network.chat.Component) -> b
+    1799:1799:net.minecraft.client.server.IntegratedServer lambda$doLoadLevel$26(net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.client.Minecraft$ServerStem,net.minecraft.world.level.storage.WorldData,com.mojang.authlib.minecraft.MinecraftSessionService,com.mojang.authlib.GameProfileRepository,net.minecraft.server.players.GameProfileCache,java.lang.Thread) -> a
+    1800:1803:net.minecraft.server.level.progress.ChunkProgressListener lambda$null$25(int) -> c
+    1772:1772:void lambda$doLoadLevel$24(java.lang.String,net.minecraft.core.RegistryAccess$RegistryHolder,java.util.function.Function,com.mojang.datafixers.util.Function4,boolean) -> a
+    1757:1757:void lambda$doLoadLevel$23(java.lang.String,net.minecraft.core.RegistryAccess$RegistryHolder,java.util.function.Function,com.mojang.datafixers.util.Function4,net.minecraft.client.Minecraft$ExperimentalDialogType) -> a
+    1704:1707:net.minecraft.world.level.storage.WorldData lambda$createLevel$22(net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.levelgen.WorldGenSettings,net.minecraft.world.level.LevelSettings,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.world.level.DataPackConfig) -> a
+    1702:1702:net.minecraft.world.level.DataPackConfig lambda$createLevel$21(net.minecraft.world.level.LevelSettings,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess) -> a
+    1546:1546:boolean lambda$tick$20() -> aQ
+    1499:1499:void lambda$tick$19() -> aR
+    976:976:void lambda$runTick$18(java.util.concurrent.CompletableFuture) -> b
+    791:791:void lambda$reloadResourcePacks$17(java.util.concurrent.CompletableFuture,java.util.Optional) -> a
+    792:794:void lambda$null$16(java.util.concurrent.CompletableFuture) -> c
+    709:709:java.util.stream.Stream lambda$createSearchTrees$15(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> a
+    709:709:net.minecraft.resources.ResourceLocation lambda$null$14(net.minecraft.world.item.crafting.Recipe) -> a
+    708:708:java.util.stream.Stream lambda$createSearchTrees$13(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> b
+    708:708:boolean lambda$null$12(java.lang.String) -> d
+    708:708:java.lang.String lambda$null$11(net.minecraft.network.chat.Component) -> c
+    708:708:java.util.stream.Stream lambda$null$10(net.minecraft.world.item.crafting.Recipe) -> b
+    703:705:void lambda$createSearchTrees$9(net.minecraft.client.searchtree.ReloadableSearchTree,net.minecraft.client.searchtree.ReloadableIdSearchTree,net.minecraft.world.item.ItemStack) -> a
+    695:695:java.util.stream.Stream lambda$createSearchTrees$8(net.minecraft.world.item.ItemStack) -> a
+    691:691:java.util.stream.Stream lambda$createSearchTrees$7(net.minecraft.world.item.ItemStack) -> b
+    690:690:java.util.stream.Stream lambda$createSearchTrees$6(net.minecraft.world.item.ItemStack) -> c
+    690:690:boolean lambda$null$5(java.lang.String) -> e
+    690:690:java.lang.String lambda$null$4(net.minecraft.network.chat.Component) -> d
+    630:632:void lambda$rollbackResourcePacks$3(net.minecraft.network.chat.Component) -> e
+    572:572:void lambda$new$2(java.util.Optional) -> a
+    573:576:void lambda$null$1() -> aS
+    380:380:int lambda$new$0() -> aT
+    243:319:void <clinit>() -> <clinit>
+net.minecraft.client.Minecraft$1 -> dlx$1:
     int[] $SwitchMap$net$minecraft$world$phys$HitResult$Type -> a
     int[] $SwitchMap$net$minecraft$world$entity$vehicle$AbstractMinecart$Type -> b
-    1298:1827:void <clinit>() -> <clinit>
-net.minecraft.client.MouseHandler -> dbo:
+    1360:2087:void <clinit>() -> <clinit>
+net.minecraft.client.Minecraft$ExperimentalDialogType -> dlx$a:
+    net.minecraft.client.Minecraft$ExperimentalDialogType NONE -> a
+    net.minecraft.client.Minecraft$ExperimentalDialogType CREATE -> b
+    net.minecraft.client.Minecraft$ExperimentalDialogType BACKUP -> c
+    net.minecraft.client.Minecraft$ExperimentalDialogType[] $VALUES -> d
+    1691:1691:net.minecraft.client.Minecraft$ExperimentalDialogType[] values() -> values
+    1691:1691:net.minecraft.client.Minecraft$ExperimentalDialogType valueOf(java.lang.String) -> valueOf
+    1691:1691:void <init>(java.lang.String,int) -> <init>
+    1691:1694:void <clinit>() -> <clinit>
+net.minecraft.client.Minecraft$ServerStem -> dlx$b:
+    net.minecraft.server.packs.repository.PackRepository packRepository -> a
+    net.minecraft.server.ServerResources serverResources -> b
+    net.minecraft.world.level.storage.WorldData worldData -> c
+    1716:1720:void <init>(net.minecraft.server.packs.repository.PackRepository,net.minecraft.server.ServerResources,net.minecraft.world.level.storage.WorldData) -> <init>
+    1723:1723:net.minecraft.server.packs.repository.PackRepository packRepository() -> a
+    1727:1727:net.minecraft.server.ServerResources serverResources() -> b
+    1731:1731:net.minecraft.world.level.storage.WorldData worldData() -> c
+    1736:1738:void close() -> close
+    1711:1711:void <init>(net.minecraft.server.packs.repository.PackRepository,net.minecraft.server.ServerResources,net.minecraft.world.level.storage.WorldData,net.minecraft.client.Minecraft$1) -> <init>
+net.minecraft.client.MouseHandler -> dly:
     net.minecraft.client.Minecraft minecraft -> a
     boolean isLeftPressed -> b
     boolean isMiddlePressed -> c
@@ -6810,333 +6871,359 @@ net.minecraft.client.MouseHandler -> dbo:
     double accumulatedScroll -> p
     double lastMouseEventTime -> q
     boolean mouseGrabbed -> r
-    22:39:void <init>(net.minecraft.client.Minecraft) -> <init>
-    42:109:void onPress(long,int,int,int) -> a
-    112:145:void onScroll(long,double,double) -> a
-    148:152:void setup(long) -> a
-    155:191:void onMove(long,double,double) -> b
-    195:237:void turnPlayer() -> a
-    240:240:boolean isLeftPressed() -> b
-    244:244:boolean isMiddlePressed() -> c
-    248:248:boolean isRightPressed() -> d
-    252:252:double xpos() -> e
-    256:256:double ypos() -> f
-    260:261:void setIgnoreFirstMove() -> g
-    266:266:boolean isMouseGrabbed() -> h
-    270:286:void grabMouse() -> i
-    289:296:void releaseMouse() -> j
-    174:174:void lambda$onMove$9(net.minecraft.client.gui.components.events.GuiEventListener,double,double,double,double) -> a
-    169:169:void lambda$onMove$8(net.minecraft.client.gui.components.events.GuiEventListener,double,double) -> a
-    151:151:void lambda$setup$7(long,double,double) -> c
-    151:151:void lambda$null$6(long,double,double) -> d
-    150:150:void lambda$setup$5(long,int,int,int) -> b
-    150:150:void lambda$null$4(long,int,int,int) -> c
-    149:149:void lambda$setup$3(long,double,double) -> e
-    149:149:void lambda$null$2(long,double,double) -> f
-    88:88:void lambda$onPress$1(boolean[],double,double,int) -> a
-    86:86:void lambda$onPress$0(boolean[],double,double,int) -> b
-net.minecraft.client.NarratorStatus -> dbp:
+    28:45:void <init>(net.minecraft.client.Minecraft) -> <init>
+    48:115:void onPress(long,int,int,int) -> a
+    118:151:void onScroll(long,double,double) -> a
+    154:157:void onDrop(long,java.util.List) -> a
+    160:172:void setup(long) -> a
+    175:211:void onMove(long,double,double) -> b
+    215:257:void turnPlayer() -> a
+    260:260:boolean isLeftPressed() -> b
+    264:264:boolean isMiddlePressed() -> c
+    268:268:boolean isRightPressed() -> d
+    272:272:double xpos() -> e
+    276:276:double ypos() -> f
+    280:281:void setIgnoreFirstMove() -> g
+    286:286:boolean isMouseGrabbed() -> h
+    290:306:void grabMouse() -> i
+    309:316:void releaseMouse() -> j
+    319:320:void cursorEntered() -> k
+    194:194:void lambda$onMove$11(net.minecraft.client.gui.components.events.GuiEventListener,double,double,double,double) -> a
+    189:189:void lambda$onMove$10(net.minecraft.client.gui.components.events.GuiEventListener,double,double) -> a
+    165:170:void lambda$setup$9(long,int,long) -> a
+    169:169:void lambda$null$8(long,java.nio.file.Path[]) -> a
+    163:163:void lambda$setup$7(long,double,double) -> c
+    163:163:void lambda$null$6(long,double,double) -> d
+    162:162:void lambda$setup$5(long,int,int,int) -> b
+    162:162:void lambda$null$4(long,int,int,int) -> c
+    161:161:void lambda$setup$3(long,double,double) -> e
+    161:161:void lambda$null$2(long,double,double) -> f
+    94:94:void lambda$onPress$1(boolean[],double,double,int) -> a
+    92:92:void lambda$onPress$0(boolean[],double,double,int) -> b
+net.minecraft.client.NarratorStatus -> dlz:
     net.minecraft.client.NarratorStatus OFF -> a
     net.minecraft.client.NarratorStatus ALL -> b
     net.minecraft.client.NarratorStatus CHAT -> c
     net.minecraft.client.NarratorStatus SYSTEM -> d
     net.minecraft.client.NarratorStatus[] BY_ID -> e
     int id -> f
-    java.lang.String key -> g
+    net.minecraft.network.chat.Component name -> g
     net.minecraft.client.NarratorStatus[] $VALUES -> h
-    8:8:net.minecraft.client.NarratorStatus[] values() -> values
-    8:8:net.minecraft.client.NarratorStatus valueOf(java.lang.String) -> valueOf
-    20:23:void <init>(java.lang.String,int,int,java.lang.String) -> <init>
-    26:26:int getId() -> a
-    30:30:java.lang.String getKey() -> b
-    34:34:net.minecraft.client.NarratorStatus byId(int) -> a
-    15:15:net.minecraft.client.NarratorStatus[] lambda$static$0(int) -> b
-    8:15:void <clinit>() -> <clinit>
-net.minecraft.client.Option -> dbq:
+    10:10:net.minecraft.client.NarratorStatus[] values() -> values
+    10:10:net.minecraft.client.NarratorStatus valueOf(java.lang.String) -> valueOf
+    22:25:void <init>(java.lang.String,int,int,java.lang.String) -> <init>
+    28:28:int getId() -> a
+    32:32:net.minecraft.network.chat.Component getName() -> b
+    36:36:net.minecraft.client.NarratorStatus byId(int) -> a
+    17:17:net.minecraft.client.NarratorStatus[] lambda$static$0(int) -> b
+    10:17:void <clinit>() -> <clinit>
+net.minecraft.client.Option -> dma:
     net.minecraft.client.ProgressOption BIOME_BLEND_RADIUS -> a
     net.minecraft.client.ProgressOption CHAT_HEIGHT_FOCUSED -> b
     net.minecraft.client.ProgressOption CHAT_HEIGHT_UNFOCUSED -> c
     net.minecraft.client.ProgressOption CHAT_OPACITY -> d
     net.minecraft.client.ProgressOption CHAT_SCALE -> e
     net.minecraft.client.ProgressOption CHAT_WIDTH -> f
-    net.minecraft.client.ProgressOption FOV -> g
-    net.minecraft.client.ProgressOption FRAMERATE_LIMIT -> h
-    net.minecraft.client.ProgressOption GAMMA -> i
-    net.minecraft.client.ProgressOption MIPMAP_LEVELS -> j
-    net.minecraft.client.ProgressOption MOUSE_WHEEL_SENSITIVITY -> k
-    net.minecraft.client.BooleanOption RAW_MOUSE_INPUT -> l
-    net.minecraft.client.ProgressOption RENDER_DISTANCE -> m
-    net.minecraft.client.ProgressOption SENSITIVITY -> n
-    net.minecraft.client.ProgressOption TEXT_BACKGROUND_OPACITY -> o
-    net.minecraft.client.CycleOption AMBIENT_OCCLUSION -> p
-    net.minecraft.client.CycleOption ATTACK_INDICATOR -> q
-    net.minecraft.client.CycleOption CHAT_VISIBILITY -> r
-    net.minecraft.client.CycleOption GRAPHICS -> s
-    net.minecraft.client.CycleOption GUI_SCALE -> t
-    net.minecraft.client.CycleOption MAIN_HAND -> u
-    net.minecraft.client.CycleOption NARRATOR -> v
-    net.minecraft.client.CycleOption PARTICLES -> w
-    net.minecraft.client.CycleOption RENDER_CLOUDS -> x
-    net.minecraft.client.CycleOption TEXT_BACKGROUND -> y
-    net.minecraft.client.BooleanOption AUTO_JUMP -> z
-    net.minecraft.client.BooleanOption AUTO_SUGGESTIONS -> A
-    net.minecraft.client.BooleanOption CHAT_COLOR -> B
-    net.minecraft.client.BooleanOption CHAT_LINKS -> C
-    net.minecraft.client.BooleanOption CHAT_LINKS_PROMPT -> D
-    net.minecraft.client.BooleanOption DISCRETE_MOUSE_SCROLL -> E
-    net.minecraft.client.BooleanOption ENABLE_VSYNC -> F
-    net.minecraft.client.BooleanOption ENTITY_SHADOWS -> G
-    net.minecraft.client.BooleanOption FORCE_UNICODE_FONT -> H
-    net.minecraft.client.BooleanOption INVERT_MOUSE -> I
-    net.minecraft.client.BooleanOption REALMS_NOTIFICATIONS -> J
-    net.minecraft.client.BooleanOption REDUCED_DEBUG_INFO -> K
-    net.minecraft.client.BooleanOption SHOW_SUBTITLES -> L
-    net.minecraft.client.BooleanOption SNOOPER_ENABLED -> M
-    net.minecraft.client.CycleOption TOGGLE_CROUCH -> N
-    net.minecraft.client.CycleOption TOGGLE_SPRINT -> O
-    net.minecraft.client.BooleanOption TOUCHSCREEN -> P
-    net.minecraft.client.BooleanOption USE_FULLSCREEN -> Q
-    net.minecraft.client.BooleanOption VIEW_BOBBING -> R
-    java.lang.String captionId -> S
-    245:247:void <init>(java.lang.String) -> <init>
+    net.minecraft.client.ProgressOption CHAT_LINE_SPACING -> g
+    net.minecraft.client.ProgressOption CHAT_DELAY -> h
+    net.minecraft.client.ProgressOption FOV -> i
+    net.minecraft.client.ProgressOption FRAMERATE_LIMIT -> j
+    net.minecraft.client.ProgressOption GAMMA -> k
+    net.minecraft.client.ProgressOption MIPMAP_LEVELS -> l
+    net.minecraft.client.ProgressOption MOUSE_WHEEL_SENSITIVITY -> m
+    net.minecraft.client.BooleanOption RAW_MOUSE_INPUT -> n
+    net.minecraft.client.ProgressOption RENDER_DISTANCE -> o
+    net.minecraft.client.ProgressOption ENTITY_DISTANCE_SCALING -> p
+    net.minecraft.client.ProgressOption SENSITIVITY -> q
+    net.minecraft.client.ProgressOption TEXT_BACKGROUND_OPACITY -> r
+    net.minecraft.client.CycleOption AMBIENT_OCCLUSION -> s
+    net.minecraft.client.CycleOption ATTACK_INDICATOR -> t
+    net.minecraft.client.CycleOption CHAT_VISIBILITY -> u
+    net.minecraft.network.chat.Component GRAPHICS_TOOLTIP_FAST -> V
+    net.minecraft.network.chat.Component GRAPHICS_TOOLTIP_FABULOUS -> W
+    net.minecraft.network.chat.Component GRAPHICS_TOOLTIP_FANCY -> X
+    net.minecraft.client.CycleOption GRAPHICS -> v
+    net.minecraft.client.CycleOption GUI_SCALE -> w
+    net.minecraft.client.CycleOption MAIN_HAND -> x
+    net.minecraft.client.CycleOption NARRATOR -> y
+    net.minecraft.client.CycleOption PARTICLES -> z
+    net.minecraft.client.CycleOption RENDER_CLOUDS -> A
+    net.minecraft.client.CycleOption TEXT_BACKGROUND -> B
+    net.minecraft.client.BooleanOption AUTO_JUMP -> C
+    net.minecraft.client.BooleanOption AUTO_SUGGESTIONS -> D
+    net.minecraft.client.BooleanOption CHAT_COLOR -> E
+    net.minecraft.client.BooleanOption CHAT_LINKS -> F
+    net.minecraft.client.BooleanOption CHAT_LINKS_PROMPT -> G
+    net.minecraft.client.BooleanOption DISCRETE_MOUSE_SCROLL -> H
+    net.minecraft.client.BooleanOption ENABLE_VSYNC -> I
+    net.minecraft.client.BooleanOption ENTITY_SHADOWS -> J
+    net.minecraft.client.BooleanOption FORCE_UNICODE_FONT -> K
+    net.minecraft.client.BooleanOption INVERT_MOUSE -> L
+    net.minecraft.client.BooleanOption REALMS_NOTIFICATIONS -> M
+    net.minecraft.client.BooleanOption REDUCED_DEBUG_INFO -> N
+    net.minecraft.client.BooleanOption SHOW_SUBTITLES -> O
+    net.minecraft.client.BooleanOption SNOOPER_ENABLED -> P
+    net.minecraft.client.CycleOption TOGGLE_CROUCH -> Q
+    net.minecraft.client.CycleOption TOGGLE_SPRINT -> R
+    net.minecraft.client.BooleanOption TOUCHSCREEN -> S
+    net.minecraft.client.BooleanOption USE_FULLSCREEN -> T
+    net.minecraft.client.BooleanOption VIEW_BOBBING -> U
+    java.lang.String captionId -> Y
+    java.util.Optional toolTip -> Z
+    314:317:void <init>(java.lang.String) -> <init>
     net.minecraft.client.gui.components.AbstractWidget createButton(net.minecraft.client.Options,int,int,int) -> a
-    252:252:java.lang.String getCaption() -> a
-    java.lang.String getMessage(net.minecraft.client.Options) -> c
-    241:241:void lambda$static$101(net.minecraft.client.Options,java.lang.Boolean) -> a
-    241:241:boolean lambda$static$100(net.minecraft.client.Options) -> a
-    234:240:void lambda$static$99(net.minecraft.client.Options,java.lang.Boolean) -> b
-    233:233:boolean lambda$static$98(net.minecraft.client.Options) -> b
-    232:232:void lambda$static$97(net.minecraft.client.Options,java.lang.Boolean) -> c
-    232:232:boolean lambda$static$96(net.minecraft.client.Options) -> d
-    230:230:java.lang.String lambda$static$95(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> a
-    229:229:void lambda$static$94(net.minecraft.client.Options,java.lang.Integer) -> a
-    227:227:java.lang.String lambda$static$93(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> b
-    226:226:void lambda$static$92(net.minecraft.client.Options,java.lang.Integer) -> b
-    225:225:void lambda$static$91(net.minecraft.client.Options,java.lang.Boolean) -> d
-    224:224:boolean lambda$static$90(net.minecraft.client.Options) -> e
-    222:222:void lambda$static$89(net.minecraft.client.Options,java.lang.Boolean) -> e
-    222:222:boolean lambda$static$88(net.minecraft.client.Options) -> f
-    221:221:void lambda$static$87(net.minecraft.client.Options,java.lang.Boolean) -> f
-    221:221:boolean lambda$static$86(net.minecraft.client.Options) -> g
-    220:220:void lambda$static$85(net.minecraft.client.Options,java.lang.Boolean) -> g
-    220:220:boolean lambda$static$84(net.minecraft.client.Options) -> h
-    219:219:void lambda$static$83(net.minecraft.client.Options,java.lang.Boolean) -> h
-    219:219:boolean lambda$static$82(net.minecraft.client.Options) -> i
-    213:218:void lambda$static$81(net.minecraft.client.Options,java.lang.Boolean) -> i
-    212:212:boolean lambda$static$80(net.minecraft.client.Options) -> j
-    211:211:void lambda$static$79(net.minecraft.client.Options,java.lang.Boolean) -> j
-    211:211:boolean lambda$static$78(net.minecraft.client.Options) -> k
-    206:210:void lambda$static$77(net.minecraft.client.Options,java.lang.Boolean) -> k
-    205:205:boolean lambda$static$76(net.minecraft.client.Options) -> l
-    204:204:void lambda$static$75(net.minecraft.client.Options,java.lang.Boolean) -> l
-    204:204:boolean lambda$static$74(net.minecraft.client.Options) -> m
-    203:203:void lambda$static$73(net.minecraft.client.Options,java.lang.Boolean) -> m
-    203:203:boolean lambda$static$72(net.minecraft.client.Options) -> n
-    202:202:void lambda$static$71(net.minecraft.client.Options,java.lang.Boolean) -> n
-    202:202:boolean lambda$static$70(net.minecraft.client.Options) -> o
-    201:201:void lambda$static$69(net.minecraft.client.Options,java.lang.Boolean) -> o
-    201:201:boolean lambda$static$68(net.minecraft.client.Options) -> p
-    200:200:void lambda$static$67(net.minecraft.client.Options,java.lang.Boolean) -> p
-    200:200:boolean lambda$static$66(net.minecraft.client.Options) -> q
-    199:199:void lambda$static$65(net.minecraft.client.Options,java.lang.Boolean) -> q
-    199:199:boolean lambda$static$64(net.minecraft.client.Options) -> r
-    196:196:java.lang.String lambda$static$63(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> c
-    195:195:void lambda$static$62(net.minecraft.client.Options,java.lang.Integer) -> c
-    193:193:java.lang.String lambda$static$61(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> d
-    192:192:void lambda$static$60(net.minecraft.client.Options,java.lang.Integer) -> d
-    190:190:java.lang.String lambda$static$59(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> e
-    189:189:void lambda$static$58(net.minecraft.client.Options,java.lang.Integer) -> e
-    183:186:java.lang.String lambda$static$57(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> f
-    176:182:void lambda$static$56(net.minecraft.client.Options,java.lang.Integer) -> f
-    173:173:java.lang.String lambda$static$55(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> g
-    172:172:void lambda$static$54(net.minecraft.client.Options,java.lang.Integer) -> g
-    170:170:java.lang.String lambda$static$53(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> h
-    169:169:void lambda$static$52(net.minecraft.client.Options,java.lang.Integer) -> h
-    164:167:java.lang.String lambda$static$51(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> i
-    161:163:void lambda$static$50(net.minecraft.client.Options,java.lang.Integer) -> i
-    158:158:java.lang.String lambda$static$49(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> j
-    157:157:void lambda$static$48(net.minecraft.client.Options,java.lang.Integer) -> j
-    155:155:java.lang.String lambda$static$47(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> k
-    154:154:void lambda$static$46(net.minecraft.client.Options,java.lang.Integer) -> k
-    152:152:java.lang.String lambda$static$45(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> l
-    149:151:void lambda$static$44(net.minecraft.client.Options,java.lang.Integer) -> l
-    146:146:java.lang.String lambda$static$43(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> a
-    144:146:void lambda$static$42(net.minecraft.client.Options,java.lang.Double) -> a
-    143:143:java.lang.Double lambda$static$41(net.minecraft.client.Options) -> s
-    132:141:java.lang.String lambda$static$40(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> b
-    131:131:void lambda$static$39(net.minecraft.client.Options,java.lang.Double) -> b
-    131:131:java.lang.Double lambda$static$38(net.minecraft.client.Options) -> t
-    128:129:java.lang.String lambda$static$37(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> c
-    125:127:void lambda$static$36(net.minecraft.client.Options,java.lang.Double) -> c
-    124:124:java.lang.Double lambda$static$35(net.minecraft.client.Options) -> u
-    118:123:void lambda$static$34(net.minecraft.client.Options,java.lang.Boolean) -> r
-    117:117:boolean lambda$static$33(net.minecraft.client.Options) -> v
-    113:115:java.lang.String lambda$static$32(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> d
-    112:112:void lambda$static$31(net.minecraft.client.Options,java.lang.Double) -> d
-    112:112:java.lang.Double lambda$static$30(net.minecraft.client.Options) -> w
-    104:110:java.lang.String lambda$static$29(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> e
-    102:103:void lambda$static$28(net.minecraft.client.Options,java.lang.Double) -> e
-    101:101:java.lang.Double lambda$static$27(net.minecraft.client.Options) -> x
-    90:99:java.lang.String lambda$static$26(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> f
-    89:89:void lambda$static$25(net.minecraft.client.Options,java.lang.Double) -> f
-    89:89:java.lang.Double lambda$static$24(net.minecraft.client.Options) -> y
-    80:86:java.lang.String lambda$static$23(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> g
-    77:79:void lambda$static$22(net.minecraft.client.Options,java.lang.Double) -> g
-    76:76:java.lang.Double lambda$static$21(net.minecraft.client.Options) -> z
-    65:74:java.lang.String lambda$static$20(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> h
-    64:64:void lambda$static$19(net.minecraft.client.Options,java.lang.Double) -> h
-    64:64:java.lang.Double lambda$static$18(net.minecraft.client.Options) -> A
-    61:62:java.lang.String lambda$static$17(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> i
-    58:60:void lambda$static$16(net.minecraft.client.Options,java.lang.Double) -> i
-    57:57:java.lang.Double lambda$static$15(net.minecraft.client.Options) -> B
-    49:55:java.lang.String lambda$static$14(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> j
-    46:48:void lambda$static$13(net.minecraft.client.Options,java.lang.Double) -> j
-    45:45:java.lang.Double lambda$static$12(net.minecraft.client.Options) -> C
-    42:43:java.lang.String lambda$static$11(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> k
-    39:41:void lambda$static$10(net.minecraft.client.Options,java.lang.Double) -> k
-    38:38:java.lang.Double lambda$static$9(net.minecraft.client.Options) -> D
-    35:36:java.lang.String lambda$static$8(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> l
-    32:34:void lambda$static$7(net.minecraft.client.Options,java.lang.Double) -> l
-    31:31:java.lang.Double lambda$static$6(net.minecraft.client.Options) -> E
-    28:29:java.lang.String lambda$static$5(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> m
-    25:27:void lambda$static$4(net.minecraft.client.Options,java.lang.Double) -> m
-    24:24:java.lang.Double lambda$static$3(net.minecraft.client.Options) -> F
-    18:22:java.lang.String lambda$static$2(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> n
-    15:17:void lambda$static$1(net.minecraft.client.Options,java.lang.Double) -> n
-    14:14:java.lang.Double lambda$static$0(net.minecraft.client.Options) -> G
-    14:241:void <clinit>() -> <clinit>
-net.minecraft.client.Options -> dbr:
-    org.apache.logging.log4j.Logger LOGGER -> aP
-    com.google.gson.Gson GSON -> aQ
-    java.lang.reflect.Type RESOURCE_PACK_TYPE -> aR
-    com.google.common.base.Splitter OPTION_SPLITTER -> aS
+    322:322:net.minecraft.network.chat.MutableComponent createCaption() -> a
+    326:327:void setTooltip(java.util.List) -> a
+    330:330:java.util.Optional getTooltip() -> b
+    net.minecraft.network.chat.Component getMessage(net.minecraft.client.Options) -> c
+    309:309:void lambda$static$110(net.minecraft.client.Options,java.lang.Boolean) -> a
+    309:309:boolean lambda$static$109(net.minecraft.client.Options) -> a
+    302:308:void lambda$static$108(net.minecraft.client.Options,java.lang.Boolean) -> b
+    301:301:boolean lambda$static$107(net.minecraft.client.Options) -> b
+    300:300:void lambda$static$106(net.minecraft.client.Options,java.lang.Boolean) -> c
+    300:300:boolean lambda$static$105(net.minecraft.client.Options) -> d
+    298:298:net.minecraft.network.chat.Component lambda$static$104(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> a
+    297:297:void lambda$static$103(net.minecraft.client.Options,java.lang.Integer) -> a
+    295:295:net.minecraft.network.chat.Component lambda$static$102(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> b
+    294:294:void lambda$static$101(net.minecraft.client.Options,java.lang.Integer) -> b
+    293:293:void lambda$static$100(net.minecraft.client.Options,java.lang.Boolean) -> d
+    292:292:boolean lambda$static$99(net.minecraft.client.Options) -> e
+    290:290:void lambda$static$98(net.minecraft.client.Options,java.lang.Boolean) -> e
+    290:290:boolean lambda$static$97(net.minecraft.client.Options) -> f
+    289:289:void lambda$static$96(net.minecraft.client.Options,java.lang.Boolean) -> f
+    289:289:boolean lambda$static$95(net.minecraft.client.Options) -> g
+    288:288:void lambda$static$94(net.minecraft.client.Options,java.lang.Boolean) -> g
+    288:288:boolean lambda$static$93(net.minecraft.client.Options) -> h
+    287:287:void lambda$static$92(net.minecraft.client.Options,java.lang.Boolean) -> h
+    287:287:boolean lambda$static$91(net.minecraft.client.Options) -> i
+    281:286:void lambda$static$90(net.minecraft.client.Options,java.lang.Boolean) -> i
+    280:280:boolean lambda$static$89(net.minecraft.client.Options) -> j
+    279:279:void lambda$static$88(net.minecraft.client.Options,java.lang.Boolean) -> j
+    279:279:boolean lambda$static$87(net.minecraft.client.Options) -> k
+    274:278:void lambda$static$86(net.minecraft.client.Options,java.lang.Boolean) -> k
+    273:273:boolean lambda$static$85(net.minecraft.client.Options) -> l
+    272:272:void lambda$static$84(net.minecraft.client.Options,java.lang.Boolean) -> l
+    272:272:boolean lambda$static$83(net.minecraft.client.Options) -> m
+    271:271:void lambda$static$82(net.minecraft.client.Options,java.lang.Boolean) -> m
+    271:271:boolean lambda$static$81(net.minecraft.client.Options) -> n
+    270:270:void lambda$static$80(net.minecraft.client.Options,java.lang.Boolean) -> n
+    270:270:boolean lambda$static$79(net.minecraft.client.Options) -> o
+    269:269:void lambda$static$78(net.minecraft.client.Options,java.lang.Boolean) -> o
+    269:269:boolean lambda$static$77(net.minecraft.client.Options) -> p
+    268:268:void lambda$static$76(net.minecraft.client.Options,java.lang.Boolean) -> p
+    268:268:boolean lambda$static$75(net.minecraft.client.Options) -> q
+    267:267:void lambda$static$74(net.minecraft.client.Options,java.lang.Boolean) -> q
+    267:267:boolean lambda$static$73(net.minecraft.client.Options) -> r
+    265:265:net.minecraft.network.chat.Component lambda$static$72(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> c
+    264:264:void lambda$static$71(net.minecraft.client.Options,java.lang.Integer) -> c
+    262:262:net.minecraft.network.chat.Component lambda$static$70(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> d
+    255:262:void lambda$static$69(net.minecraft.client.Options,java.lang.Integer) -> d
+    252:252:net.minecraft.network.chat.Component lambda$static$68(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> e
+    251:251:void lambda$static$67(net.minecraft.client.Options,java.lang.Integer) -> e
+    245:248:net.minecraft.network.chat.Component lambda$static$66(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> f
+    238:244:void lambda$static$65(net.minecraft.client.Options,java.lang.Integer) -> f
+    235:235:net.minecraft.network.chat.Component lambda$static$64(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> g
+    234:234:void lambda$static$63(net.minecraft.client.Options,java.lang.Integer) -> g
+    228:232:net.minecraft.network.chat.Component lambda$static$62(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> h
+    227:227:void lambda$static$61(net.minecraft.client.Options,java.lang.Integer) -> h
+    207:223:net.minecraft.network.chat.Component lambda$static$60(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> i
+    192:206:void lambda$static$59(net.minecraft.client.Options,java.lang.Integer) -> i
+    184:184:net.minecraft.network.chat.Component lambda$static$58(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> j
+    183:183:void lambda$static$57(net.minecraft.client.Options,java.lang.Integer) -> j
+    181:181:net.minecraft.network.chat.Component lambda$static$56(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> k
+    180:180:void lambda$static$55(net.minecraft.client.Options,java.lang.Integer) -> k
+    178:178:net.minecraft.network.chat.Component lambda$static$54(net.minecraft.client.Options,net.minecraft.client.CycleOption) -> l
+    176:178:void lambda$static$53(net.minecraft.client.Options,java.lang.Integer) -> l
+    173:173:net.minecraft.network.chat.Component lambda$static$52(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> a
+    171:173:void lambda$static$51(net.minecraft.client.Options,java.lang.Double) -> a
+    170:170:java.lang.Double lambda$static$50(net.minecraft.client.Options) -> s
+    159:168:net.minecraft.network.chat.Component lambda$static$49(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> b
+    158:158:void lambda$static$48(net.minecraft.client.Options,java.lang.Double) -> b
+    158:158:java.lang.Double lambda$static$47(net.minecraft.client.Options) -> t
+    155:156:net.minecraft.network.chat.Component lambda$static$46(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> c
+    154:154:void lambda$static$45(net.minecraft.client.Options,java.lang.Double) -> c
+    154:154:java.lang.Double lambda$static$44(net.minecraft.client.Options) -> u
+    151:152:net.minecraft.network.chat.Component lambda$static$43(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> d
+    148:150:void lambda$static$42(net.minecraft.client.Options,java.lang.Double) -> d
+    147:147:java.lang.Double lambda$static$41(net.minecraft.client.Options) -> v
+    141:146:void lambda$static$40(net.minecraft.client.Options,java.lang.Boolean) -> r
+    140:140:boolean lambda$static$39(net.minecraft.client.Options) -> w
+    136:138:net.minecraft.network.chat.Component lambda$static$38(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> e
+    135:135:void lambda$static$37(net.minecraft.client.Options,java.lang.Double) -> e
+    135:135:java.lang.Double lambda$static$36(net.minecraft.client.Options) -> x
+    127:133:net.minecraft.network.chat.Component lambda$static$35(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> f
+    125:126:void lambda$static$34(net.minecraft.client.Options,java.lang.Double) -> f
+    124:124:java.lang.Double lambda$static$33(net.minecraft.client.Options) -> y
+    113:122:net.minecraft.network.chat.Component lambda$static$32(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> g
+    112:112:void lambda$static$31(net.minecraft.client.Options,java.lang.Double) -> g
+    112:112:java.lang.Double lambda$static$30(net.minecraft.client.Options) -> z
+    103:109:net.minecraft.network.chat.Component lambda$static$29(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> h
+    100:102:void lambda$static$28(net.minecraft.client.Options,java.lang.Double) -> h
+    99:99:java.lang.Double lambda$static$27(net.minecraft.client.Options) -> A
+    88:97:net.minecraft.network.chat.Component lambda$static$26(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> i
+    87:87:void lambda$static$25(net.minecraft.client.Options,java.lang.Double) -> i
+    87:87:java.lang.Double lambda$static$24(net.minecraft.client.Options) -> B
+    80:84:net.minecraft.network.chat.Component lambda$static$23(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> j
+    79:79:void lambda$static$22(net.minecraft.client.Options,java.lang.Double) -> j
+    79:79:java.lang.Double lambda$static$21(net.minecraft.client.Options) -> C
+    77:77:net.minecraft.network.chat.Component lambda$static$20(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> k
+    76:76:void lambda$static$19(net.minecraft.client.Options,java.lang.Double) -> k
+    75:75:java.lang.Double lambda$static$18(net.minecraft.client.Options) -> D
+    71:72:net.minecraft.network.chat.Component lambda$static$17(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> l
+    68:70:void lambda$static$16(net.minecraft.client.Options,java.lang.Double) -> l
+    67:67:java.lang.Double lambda$static$15(net.minecraft.client.Options) -> E
+    59:65:net.minecraft.network.chat.Component lambda$static$14(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> m
+    56:58:void lambda$static$13(net.minecraft.client.Options,java.lang.Double) -> m
+    55:55:java.lang.Double lambda$static$12(net.minecraft.client.Options) -> F
+    52:53:net.minecraft.network.chat.Component lambda$static$11(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> n
+    49:51:void lambda$static$10(net.minecraft.client.Options,java.lang.Double) -> n
+    48:48:java.lang.Double lambda$static$9(net.minecraft.client.Options) -> G
+    45:46:net.minecraft.network.chat.Component lambda$static$8(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> o
+    42:44:void lambda$static$7(net.minecraft.client.Options,java.lang.Double) -> o
+    41:41:java.lang.Double lambda$static$6(net.minecraft.client.Options) -> H
+    38:39:net.minecraft.network.chat.Component lambda$static$5(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> p
+    35:37:void lambda$static$4(net.minecraft.client.Options,java.lang.Double) -> p
+    34:34:java.lang.Double lambda$static$3(net.minecraft.client.Options) -> I
+    29:32:net.minecraft.network.chat.Component lambda$static$2(net.minecraft.client.Options,net.minecraft.client.ProgressOption) -> q
+    26:28:void lambda$static$1(net.minecraft.client.Options,java.lang.Double) -> q
+    25:25:java.lang.Double lambda$static$0(net.minecraft.client.Options) -> J
+    25:309:void <clinit>() -> <clinit>
+net.minecraft.client.Option$1 -> dma$1:
+    int[] $SwitchMap$net$minecraft$client$GraphicsStatus -> a
+    207:207:void <clinit>() -> <clinit>
+net.minecraft.client.Options -> dmb:
+    org.apache.logging.log4j.Logger LOGGER -> aT
+    com.google.gson.Gson GSON -> aU
+    com.google.gson.reflect.TypeToken RESOURCE_PACK_TYPE -> aV
+    com.google.common.base.Splitter OPTION_SPLITTER -> aW
     double sensitivity -> a
     int renderDistance -> b
-    int framerateLimit -> c
-    net.minecraft.client.CloudStatus renderClouds -> d
-    boolean fancyGraphics -> e
-    net.minecraft.client.AmbientOcclusionStatus ambientOcclusion -> f
-    java.util.List resourcePacks -> g
-    java.util.List incompatibleResourcePacks -> h
-    net.minecraft.world.entity.player.ChatVisiblity chatVisibility -> i
-    double chatOpacity -> j
-    double textBackgroundOpacity -> k
-    java.lang.String fullscreenVideoModeString -> l
-    boolean hideServerAddress -> m
-    boolean advancedItemTooltips -> n
-    boolean pauseOnLostFocus -> o
-    java.util.Set modelParts -> aT
-    net.minecraft.world.entity.HumanoidArm mainHand -> p
-    int overrideWidth -> q
-    int overrideHeight -> r
-    boolean heldItemTooltips -> s
-    double chatScale -> t
-    double chatWidth -> u
-    double chatHeightUnfocused -> v
-    double chatHeightFocused -> w
-    int mipmapLevels -> x
-    java.util.Map sourceVolumes -> aU
-    boolean useNativeTransport -> y
-    net.minecraft.client.AttackIndicatorStatus attackIndicator -> z
-    net.minecraft.client.tutorial.TutorialSteps tutorialStep -> A
-    int biomeBlendRadius -> B
-    double mouseWheelSensitivity -> C
-    boolean rawMouseInput -> D
-    int glDebugVerbosity -> E
-    boolean autoJump -> F
-    boolean autoSuggestions -> G
-    boolean chatColors -> H
-    boolean chatLinks -> I
-    boolean chatLinksPrompt -> J
-    boolean enableVsync -> K
-    boolean entityShadows -> L
-    boolean forceUnicodeFont -> M
-    boolean invertYMouse -> N
-    boolean discreteMouseScroll -> O
-    boolean realmsNotifications -> P
-    boolean reducedDebugInfo -> Q
-    boolean snooperEnabled -> R
-    boolean showSubtitles -> S
-    boolean backgroundForChatOnly -> T
-    boolean touchscreen -> U
-    boolean fullscreen -> V
-    boolean bobView -> W
-    boolean toggleCrouch -> X
-    boolean toggleSprint -> Y
-    boolean skipMultiplayerWarning -> Z
-    net.minecraft.client.KeyMapping keyUp -> aa
-    net.minecraft.client.KeyMapping keyLeft -> ab
-    net.minecraft.client.KeyMapping keyDown -> ac
-    net.minecraft.client.KeyMapping keyRight -> ad
-    net.minecraft.client.KeyMapping keyJump -> ae
-    net.minecraft.client.KeyMapping keyShift -> af
-    net.minecraft.client.KeyMapping keySprint -> ag
-    net.minecraft.client.KeyMapping keyInventory -> ah
-    net.minecraft.client.KeyMapping keySwapHands -> ai
-    net.minecraft.client.KeyMapping keyDrop -> aj
-    net.minecraft.client.KeyMapping keyUse -> ak
-    net.minecraft.client.KeyMapping keyAttack -> al
-    net.minecraft.client.KeyMapping keyPickItem -> am
-    net.minecraft.client.KeyMapping keyChat -> an
-    net.minecraft.client.KeyMapping keyPlayerList -> ao
-    net.minecraft.client.KeyMapping keyCommand -> ap
-    net.minecraft.client.KeyMapping keyScreenshot -> aq
-    net.minecraft.client.KeyMapping keyTogglePerspective -> ar
-    net.minecraft.client.KeyMapping keySmoothCamera -> as
-    net.minecraft.client.KeyMapping keyFullscreen -> at
-    net.minecraft.client.KeyMapping keySpectatorOutlines -> au
-    net.minecraft.client.KeyMapping keyAdvancements -> av
-    net.minecraft.client.KeyMapping[] keyHotbarSlots -> aw
-    net.minecraft.client.KeyMapping keySaveHotbarActivator -> ax
-    net.minecraft.client.KeyMapping keyLoadHotbarActivator -> ay
-    net.minecraft.client.KeyMapping[] keyMappings -> az
-    net.minecraft.client.Minecraft minecraft -> aA
-    java.io.File optionsFile -> aV
-    net.minecraft.world.Difficulty difficulty -> aB
-    boolean hideGui -> aC
-    int thirdPersonView -> aD
-    boolean renderDebug -> aE
-    boolean renderDebugCharts -> aF
-    boolean renderFpsChart -> aG
-    java.lang.String lastMpIp -> aH
-    boolean smoothCamera -> aI
-    double fov -> aJ
-    double gamma -> aK
-    int guiScale -> aL
-    net.minecraft.client.ParticleStatus particles -> aM
-    net.minecraft.client.NarratorStatus narratorStatus -> aN
-    java.lang.String languageCode -> aO
-    76:217:void <init>(net.minecraft.client.Minecraft,java.io.File) -> <init>
-    220:220:float getBackgroundOpacity(float) -> a
-    224:224:int getBackgroundColor(float) -> b
-    228:228:int getBackgroundColor(int) -> a
-    232:234:void setKey(net.minecraft.client.KeyMapping,com.mojang.blaze3d.platform.InputConstants$Key) -> a
-    238:491:void load() -> a
-    494:500:net.minecraft.nbt.CompoundTag dataFix(net.minecraft.nbt.CompoundTag) -> a
-    504:510:float readFloat(java.lang.String) -> a
-    514:609:void save() -> b
-    612:616:float getSoundSourceVolume(net.minecraft.sounds.SoundSource) -> a
-    620:622:void setSoundCategoryVolume(net.minecraft.sounds.SoundSource,float) -> a
-    625:632:void broadcastOptions() -> c
-    635:635:java.util.Set getModelParts() -> d
-    639:645:void setModelPart(net.minecraft.world.entity.player.PlayerModelPart,boolean) -> a
-    648:654:void toggleModelPart(net.minecraft.world.entity.player.PlayerModelPart) -> a
-    657:660:net.minecraft.client.CloudStatus getCloudsType() -> e
-    665:665:boolean useNativeTransport() -> f
-    669:694:void loadResourcePacks(net.minecraft.server.packs.repository.PackRepository) -> a
-    247:252:void lambda$load$2(net.minecraft.nbt.CompoundTag,java.lang.String) -> a
-    141:141:boolean lambda$new$1() -> g
-    140:140:boolean lambda$new$0() -> h
-    46:74:void <clinit>() -> <clinit>
-net.minecraft.client.Options$1 -> dbr$1:
+    float entityDistanceScaling -> c
+    int framerateLimit -> d
+    net.minecraft.client.CloudStatus renderClouds -> e
+    net.minecraft.client.GraphicsStatus graphicsMode -> f
+    net.minecraft.client.AmbientOcclusionStatus ambientOcclusion -> g
+    java.util.List resourcePacks -> h
+    java.util.List incompatibleResourcePacks -> i
+    net.minecraft.world.entity.player.ChatVisiblity chatVisibility -> j
+    double chatOpacity -> k
+    double chatLineSpacing -> l
+    double textBackgroundOpacity -> m
+    java.lang.String fullscreenVideoModeString -> n
+    boolean hideServerAddress -> o
+    boolean advancedItemTooltips -> p
+    boolean pauseOnLostFocus -> q
+    java.util.Set modelParts -> aX
+    net.minecraft.world.entity.HumanoidArm mainHand -> r
+    int overrideWidth -> s
+    int overrideHeight -> t
+    boolean heldItemTooltips -> u
+    double chatScale -> v
+    double chatWidth -> w
+    double chatHeightUnfocused -> x
+    double chatHeightFocused -> y
+    double chatDelay -> z
+    int mipmapLevels -> A
+    java.util.Map sourceVolumes -> aY
+    boolean useNativeTransport -> B
+    net.minecraft.client.AttackIndicatorStatus attackIndicator -> C
+    net.minecraft.client.tutorial.TutorialSteps tutorialStep -> D
+    int biomeBlendRadius -> E
+    double mouseWheelSensitivity -> F
+    boolean rawMouseInput -> G
+    int glDebugVerbosity -> H
+    boolean autoJump -> I
+    boolean autoSuggestions -> J
+    boolean chatColors -> K
+    boolean chatLinks -> L
+    boolean chatLinksPrompt -> M
+    boolean enableVsync -> N
+    boolean entityShadows -> O
+    boolean forceUnicodeFont -> P
+    boolean invertYMouse -> Q
+    boolean discreteMouseScroll -> R
+    boolean realmsNotifications -> S
+    boolean reducedDebugInfo -> T
+    boolean snooperEnabled -> U
+    boolean showSubtitles -> V
+    boolean backgroundForChatOnly -> W
+    boolean touchscreen -> X
+    boolean fullscreen -> Y
+    boolean bobView -> Z
+    boolean toggleCrouch -> aa
+    boolean toggleSprint -> ab
+    boolean skipMultiplayerWarning -> ac
+    net.minecraft.client.KeyMapping keyUp -> ad
+    net.minecraft.client.KeyMapping keyLeft -> ae
+    net.minecraft.client.KeyMapping keyDown -> af
+    net.minecraft.client.KeyMapping keyRight -> ag
+    net.minecraft.client.KeyMapping keyJump -> ah
+    net.minecraft.client.KeyMapping keyShift -> ai
+    net.minecraft.client.KeyMapping keySprint -> aj
+    net.minecraft.client.KeyMapping keyInventory -> ak
+    net.minecraft.client.KeyMapping keySwapOffhand -> al
+    net.minecraft.client.KeyMapping keyDrop -> am
+    net.minecraft.client.KeyMapping keyUse -> an
+    net.minecraft.client.KeyMapping keyAttack -> ao
+    net.minecraft.client.KeyMapping keyPickItem -> ap
+    net.minecraft.client.KeyMapping keyChat -> aq
+    net.minecraft.client.KeyMapping keyPlayerList -> ar
+    net.minecraft.client.KeyMapping keyCommand -> as
+    net.minecraft.client.KeyMapping keyScreenshot -> at
+    net.minecraft.client.KeyMapping keyTogglePerspective -> au
+    net.minecraft.client.KeyMapping keySmoothCamera -> av
+    net.minecraft.client.KeyMapping keyFullscreen -> aw
+    net.minecraft.client.KeyMapping keySpectatorOutlines -> ax
+    net.minecraft.client.KeyMapping keyAdvancements -> ay
+    net.minecraft.client.KeyMapping[] keyHotbarSlots -> az
+    net.minecraft.client.KeyMapping keySaveHotbarActivator -> aA
+    net.minecraft.client.KeyMapping keyLoadHotbarActivator -> aB
+    net.minecraft.client.KeyMapping[] keyMappings -> aC
+    net.minecraft.client.Minecraft minecraft -> aD
+    java.io.File optionsFile -> aZ
+    net.minecraft.world.Difficulty difficulty -> aE
+    boolean hideGui -> aF
+    int thirdPersonView -> aG
+    boolean renderDebug -> aH
+    boolean renderDebugCharts -> aI
+    boolean renderFpsChart -> aJ
+    java.lang.String lastMpIp -> aK
+    boolean smoothCamera -> aL
+    double fov -> aM
+    double gamma -> aN
+    int guiScale -> aO
+    net.minecraft.client.ParticleStatus particles -> aP
+    net.minecraft.client.NarratorStatus narratorStatus -> aQ
+    java.lang.String languageCode -> aR
+    boolean syncWrites -> aS
+    59:208:void <init>(net.minecraft.client.Minecraft,java.io.File) -> <init>
+    211:211:float getBackgroundOpacity(float) -> a
+    215:215:int getBackgroundColor(float) -> b
+    219:219:int getBackgroundColor(int) -> a
+    223:225:void setKey(net.minecraft.client.KeyMapping,com.mojang.blaze3d.platform.InputConstants$Key) -> a
+    229:503:void load() -> a
+    506:512:net.minecraft.nbt.CompoundTag dataFix(net.minecraft.nbt.CompoundTag) -> a
+    516:522:float readFloat(java.lang.String) -> a
+    526:625:void save() -> b
+    628:632:float getSoundSourceVolume(net.minecraft.sounds.SoundSource) -> a
+    636:638:void setSoundCategoryVolume(net.minecraft.sounds.SoundSource,float) -> a
+    641:648:void broadcastOptions() -> c
+    651:651:java.util.Set getModelParts() -> d
+    655:661:void setModelPart(net.minecraft.world.entity.player.PlayerModelPart,boolean) -> a
+    664:670:void toggleModelPart(net.minecraft.world.entity.player.PlayerModelPart) -> a
+    673:676:net.minecraft.client.CloudStatus getCloudsType() -> e
+    681:681:boolean useNativeTransport() -> f
+    685:709:void loadSelectedResourcePacks(net.minecraft.server.packs.repository.PackRepository) -> a
+    238:243:void lambda$load$2(net.minecraft.nbt.CompoundTag,java.lang.String) -> a
+    127:127:boolean lambda$new$1() -> g
+    126:126:boolean lambda$new$0() -> h
+    46:57:void <clinit>() -> <clinit>
+net.minecraft.client.Options$1 -> dmb$1:
     48:48:void <init>() -> <init>
-    51:51:java.lang.reflect.Type[] getActualTypeArguments() -> getActualTypeArguments
-    58:58:java.lang.reflect.Type getRawType() -> getRawType
-    63:63:java.lang.reflect.Type getOwnerType() -> getOwnerType
-net.minecraft.client.Options$2 -> dbr$2:
+net.minecraft.client.Options$2 -> dmb$2:
     int[] $SwitchMap$net$minecraft$client$CloudStatus -> a
-    549:549:void <clinit>() -> <clinit>
-net.minecraft.client.ParticleStatus -> dbs:
+    562:562:void <clinit>() -> <clinit>
+net.minecraft.client.ParticleStatus -> dmc:
     net.minecraft.client.ParticleStatus ALL -> a
     net.minecraft.client.ParticleStatus DECREASED -> b
     net.minecraft.client.ParticleStatus MINIMAL -> c
@@ -7152,30 +7239,30 @@ net.minecraft.client.ParticleStatus -> dbs:
     33:33:net.minecraft.client.ParticleStatus byId(int) -> a
     14:14:net.minecraft.client.ParticleStatus[] lambda$static$0(int) -> b
     8:14:void <clinit>() -> <clinit>
-net.minecraft.client.ProgressOption -> dbt:
-    float steps -> S
-    double minValue -> T
-    double maxValue -> U
-    java.util.function.Function getter -> V
-    java.util.function.BiConsumer setter -> W
-    java.util.function.BiFunction toString -> X
-    20:28:void <init>(java.lang.String,double,double,float,java.util.function.Function,java.util.function.BiConsumer,java.util.function.BiFunction) -> <init>
-    32:32:net.minecraft.client.gui.components.AbstractWidget createButton(net.minecraft.client.Options,int,int,int) -> a
-    36:36:double toPct(double) -> a
-    40:40:double toValue(double) -> b
-    44:47:double clamp(double) -> c
-    51:51:double getMinValue() -> b
-    55:55:double getMaxValue() -> c
-    59:60:void setMaxValue(float) -> a
-    63:64:void set(net.minecraft.client.Options,double) -> a
-    67:67:double get(net.minecraft.client.Options) -> a
-    72:72:java.lang.String getMessage(net.minecraft.client.Options) -> c
-net.minecraft.client.RecipeBookCategories -> dbu:
+net.minecraft.client.ProgressOption -> dmd:
+    float steps -> V
+    double minValue -> W
+    double maxValue -> X
+    java.util.function.Function getter -> Y
+    java.util.function.BiConsumer setter -> Z
+    java.util.function.BiFunction toString -> aa
+    21:29:void <init>(java.lang.String,double,double,float,java.util.function.Function,java.util.function.BiConsumer,java.util.function.BiFunction) -> <init>
+    33:33:net.minecraft.client.gui.components.AbstractWidget createButton(net.minecraft.client.Options,int,int,int) -> a
+    37:37:double toPct(double) -> a
+    41:41:double toValue(double) -> b
+    45:48:double clamp(double) -> c
+    52:52:double getMinValue() -> c
+    56:56:double getMaxValue() -> d
+    60:61:void setMaxValue(float) -> a
+    64:65:void set(net.minecraft.client.Options,double) -> a
+    68:68:double get(net.minecraft.client.Options) -> a
+    73:73:net.minecraft.network.chat.Component getMessage(net.minecraft.client.Options) -> c
+net.minecraft.client.RecipeBookCategories -> dme:
     net.minecraft.client.RecipeBookCategories SEARCH -> a
-    net.minecraft.client.RecipeBookCategories BUILDING_BLOCKS -> b
-    net.minecraft.client.RecipeBookCategories REDSTONE -> c
-    net.minecraft.client.RecipeBookCategories EQUIPMENT -> d
-    net.minecraft.client.RecipeBookCategories MISC -> e
+    net.minecraft.client.RecipeBookCategories CRAFTING_BUILDING_BLOCKS -> b
+    net.minecraft.client.RecipeBookCategories CRAFTING_REDSTONE -> c
+    net.minecraft.client.RecipeBookCategories CRAFTING_EQUIPMENT -> d
+    net.minecraft.client.RecipeBookCategories CRAFTING_MISC -> e
     net.minecraft.client.RecipeBookCategories FURNACE_SEARCH -> f
     net.minecraft.client.RecipeBookCategories FURNACE_FOOD -> g
     net.minecraft.client.RecipeBookCategories FURNACE_BLOCKS -> h
@@ -7186,15 +7273,17 @@ net.minecraft.client.RecipeBookCategories -> dbu:
     net.minecraft.client.RecipeBookCategories SMOKER_SEARCH -> m
     net.minecraft.client.RecipeBookCategories SMOKER_FOOD -> n
     net.minecraft.client.RecipeBookCategories STONECUTTER -> o
-    net.minecraft.client.RecipeBookCategories CAMPFIRE -> p
-    java.util.List itemIcons -> q
-    net.minecraft.client.RecipeBookCategories[] $VALUES -> r
+    net.minecraft.client.RecipeBookCategories SMITHING -> p
+    net.minecraft.client.RecipeBookCategories CAMPFIRE -> q
+    net.minecraft.client.RecipeBookCategories UNKNOWN -> r
+    java.util.List itemIcons -> s
+    net.minecraft.client.RecipeBookCategories[] $VALUES -> t
     10:10:net.minecraft.client.RecipeBookCategories[] values() -> values
     10:10:net.minecraft.client.RecipeBookCategories valueOf(java.lang.String) -> valueOf
-    36:38:void <init>(java.lang.String,int,net.minecraft.world.item.ItemStack[]) -> <init>
-    41:41:java.util.List getIconItems() -> a
-    10:31:void <clinit>() -> <clinit>
-net.minecraft.client.Screenshot -> dbv:
+    40:42:void <init>(java.lang.String,int,net.minecraft.world.item.ItemStack[]) -> <init>
+    45:45:java.util.List getIconItems() -> a
+    10:35:void <clinit>() -> <clinit>
+net.minecraft.client.Screenshot -> dmf:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.text.DateFormat DATE_FORMAT -> b
     int rowHeight -> c
@@ -7213,10 +7302,10 @@ net.minecraft.client.Screenshot -> dbv:
     151:152:void saveRow() -> a
     155:156:java.io.File close() -> b
     59:69:void lambda$_grab$2(com.mojang.blaze3d.platform.NativeImage,java.io.File,java.util.function.Consumer) -> a
-    61:61:void lambda$null$1(java.io.File,net.minecraft.network.chat.Style) -> a
+    61:61:net.minecraft.network.chat.Style lambda$null$1(java.io.File,net.minecraft.network.chat.Style) -> a
     38:39:void lambda$grab$0(java.io.File,java.lang.String,int,int,com.mojang.blaze3d.pipeline.RenderTarget,java.util.function.Consumer) -> c
     28:29:void <clinit>() -> <clinit>
-net.minecraft.client.Session -> dbw:
+net.minecraft.client.Session -> dmg:
     int players -> a
     boolean isRemoteServer -> b
     java.lang.String difficulty -> c
@@ -7228,19 +7317,113 @@ net.minecraft.client.Session -> dbw:
     43:43:java.lang.String getDifficulty() -> getDifficulty
     48:48:java.lang.String getGameMode() -> getGameMode
     53:53:java.util.UUID getSessionId() -> getSessionId
-net.minecraft.client.Timer -> dbx:
-    int ticks -> a
-    float partialTick -> b
-    float tickDelta -> c
-    long lastMs -> d
-    float msPerTick -> e
-    11:14:void <init>(float,long) -> <init>
-    17:23:void advanceTime(long) -> a
-net.minecraft.client.ToggleKeyMapping -> dby:
+net.minecraft.client.StringDecomposer -> dmh:
+    java.util.Optional STOP_ITERATION -> a
+    10:10:void <init>() -> <init>
+    20:23:boolean feedChar(net.minecraft.network.chat.Style,net.minecraft.client.StringDecomposer$Output,int,char) -> a
+    28:53:boolean iterate(java.lang.String,net.minecraft.network.chat.Style,net.minecraft.client.StringDecomposer$Output) -> a
+    57:82:boolean iterateBackwards(java.lang.String,net.minecraft.network.chat.Style,net.minecraft.client.StringDecomposer$Output) -> b
+    86:86:boolean iterateFormatted(java.lang.String,net.minecraft.network.chat.Style,net.minecraft.client.StringDecomposer$Output) -> c
+    90:90:boolean iterateFormatted(java.lang.String,int,net.minecraft.network.chat.Style,net.minecraft.client.StringDecomposer$Output) -> a
+    94:130:boolean iterateFormatted(java.lang.String,int,net.minecraft.network.chat.Style,net.minecraft.network.chat.Style,net.minecraft.client.StringDecomposer$Output) -> a
+    134:134:boolean iterateFormatted(net.minecraft.network.chat.FormattedText,net.minecraft.network.chat.Style,net.minecraft.client.StringDecomposer$Output) -> a
+    138:143:java.lang.String filterBrokenSurrogates(java.lang.String) -> a
+    140:141:boolean lambda$filterBrokenSurrogates$1(java.lang.StringBuilder,int,net.minecraft.network.chat.Style,int) -> a
+    134:134:java.util.Optional lambda$iterateFormatted$0(net.minecraft.client.StringDecomposer$Output,net.minecraft.network.chat.Style,java.lang.String) -> a
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.client.StringDecomposer$Output -> dmh$a:
+    boolean onChar(int,net.minecraft.network.chat.Style,int) -> onChar
+net.minecraft.client.StringSplitter -> dmi:
+    net.minecraft.client.StringSplitter$WidthProvider widthProvider -> a
+    23:25:void <init>(net.minecraft.client.StringSplitter$WidthProvider) -> <init>
+    28:37:float stringWidth(java.lang.String) -> a
+    41:46:float stringWidth(net.minecraft.network.chat.FormattedText) -> a
+    77:79:int plainIndexAtWidth(java.lang.String,int,net.minecraft.network.chat.Style) -> a
+    83:83:java.lang.String plainHeadByWidth(java.lang.String,int,net.minecraft.network.chat.Style) -> b
+    87:99:java.lang.String plainTailByWidth(java.lang.String,int,net.minecraft.network.chat.Style) -> c
+    103:105:int formattedIndexByWidth(java.lang.String,int,net.minecraft.network.chat.Style) -> d
+    110:111:net.minecraft.network.chat.Style componentStyleAtWidth(net.minecraft.network.chat.FormattedText,int) -> a
+    115:115:java.lang.String formattedHeadByWidth(java.lang.String,int,net.minecraft.network.chat.Style) -> e
+    119:139:net.minecraft.network.chat.FormattedText headByWidth(net.minecraft.network.chat.FormattedText,int,net.minecraft.network.chat.Style) -> a
+    209:211:int findLineBreak(java.lang.String,int,net.minecraft.network.chat.Style) -> f
+    215:252:int getWordPosition(java.lang.String,int,int,boolean) -> a
+    261:279:void splitLines(java.lang.String,int,net.minecraft.network.chat.Style,boolean,net.minecraft.client.StringSplitter$LinePosConsumer) -> a
+    282:284:java.util.List splitLines(java.lang.String,int,net.minecraft.network.chat.Style) -> g
+    375:375:java.util.List splitLines(net.minecraft.network.chat.FormattedText,int,net.minecraft.network.chat.Style) -> b
+    379:426:java.util.List splitLines(net.minecraft.network.chat.FormattedText,int,net.minecraft.network.chat.Style,net.minecraft.network.chat.FormattedText) -> a
+    430:433:net.minecraft.network.chat.FormattedText formattedLine(net.minecraft.network.chat.FormattedText,boolean,net.minecraft.network.chat.FormattedText) -> a
+    384:387:java.util.Optional lambda$splitLines$5(java.util.List,net.minecraft.network.chat.Style,java.lang.String) -> a
+    283:283:void lambda$splitLines$4(java.util.List,java.lang.String,net.minecraft.network.chat.Style,int,int) -> a
+    111:111:java.util.Optional lambda$componentStyleAtWidth$3(net.minecraft.client.StringSplitter$WidthLimitedCharSink,net.minecraft.network.chat.Style,java.lang.String) -> a
+    90:96:boolean lambda$plainTailByWidth$2(org.apache.commons.lang3.mutable.MutableFloat,int,org.apache.commons.lang3.mutable.MutableInt,int,net.minecraft.network.chat.Style,int) -> a
+    43:44:boolean lambda$stringWidth$1(org.apache.commons.lang3.mutable.MutableFloat,int,net.minecraft.network.chat.Style,int) -> a
+    34:35:boolean lambda$stringWidth$0(org.apache.commons.lang3.mutable.MutableFloat,int,net.minecraft.network.chat.Style,int) -> b
+    15:15:net.minecraft.client.StringSplitter$WidthProvider access$000(net.minecraft.client.StringSplitter) -> a
+net.minecraft.client.StringSplitter$1 -> dmi$1:
+    net.minecraft.client.ComponentCollector collector -> c
+    net.minecraft.client.StringSplitter$WidthLimitedCharSink val$output -> a
+    net.minecraft.client.StringSplitter this$0 -> b
+    121:122:void <init>(net.minecraft.client.StringSplitter,net.minecraft.client.StringSplitter$WidthLimitedCharSink) -> <init>
+    126:137:java.util.Optional accept(net.minecraft.network.chat.Style,java.lang.String) -> accept
+net.minecraft.client.StringSplitter$FlatComponents -> dmi$a:
+    java.util.List parts -> a
+    java.lang.String flatParts -> b
+    311:314:void <init>(java.util.List) -> <init>
+    317:317:char charAt(int) -> a
+    321:362:net.minecraft.network.chat.FormattedText splitAt(int,int,net.minecraft.network.chat.Style) -> a
+    367:370:net.minecraft.network.chat.FormattedText getRemainder() -> a
+    313:313:java.lang.String lambda$new$0(net.minecraft.client.StringSplitter$LineComponent) -> a
+    307:307:java.util.List access$300(net.minecraft.client.StringSplitter$FlatComponents) -> a
+net.minecraft.client.StringSplitter$LineBreakFinder -> dmi$b:
+    float maxWidth -> b
+    int lineBreak -> c
+    net.minecraft.network.chat.Style lineBreakStyle -> d
+    boolean hadNonZeroWidthChar -> e
+    float width -> f
+    int lastSpace -> g
+    net.minecraft.network.chat.Style lastSpaceStyle -> h
+    int nextChar -> i
+    int offset -> j
+    net.minecraft.client.StringSplitter this$0 -> a
+    145:156:void <init>(net.minecraft.client.StringSplitter,float) -> <init>
+    160:180:boolean onChar(int,net.minecraft.network.chat.Style,int) -> onChar
+    186:188:boolean finishIteration(int,net.minecraft.network.chat.Style) -> a
+    192:192:boolean lineBreakFound() -> c
+    196:196:int getSplitPosition() -> a
+    200:200:net.minecraft.network.chat.Style getSplitStyle() -> b
+    204:205:void addToOffset(int) -> a
+net.minecraft.client.StringSplitter$LineComponent -> dmi$c:
+    java.lang.String contents -> a
+    net.minecraft.network.chat.Style style -> d
+    291:294:void <init>(java.lang.String,net.minecraft.network.chat.Style) -> <init>
+    298:298:java.util.Optional visit(net.minecraft.network.chat.FormattedText$ContentConsumer) -> a
+    303:303:java.util.Optional visit(net.minecraft.network.chat.FormattedText$StyledContentConsumer,net.minecraft.network.chat.Style) -> a
+    287:287:java.lang.String access$100(net.minecraft.client.StringSplitter$LineComponent) -> a
+    287:287:net.minecraft.network.chat.Style access$200(net.minecraft.client.StringSplitter$LineComponent) -> b
+net.minecraft.client.StringSplitter$LinePosConsumer -> dmi$d:
+    void accept(net.minecraft.network.chat.Style,int,int) -> accept
+net.minecraft.client.StringSplitter$WidthLimitedCharSink -> dmi$e:
+    float maxWidth -> b
+    int position -> c
+    net.minecraft.client.StringSplitter this$0 -> a
+    53:55:void <init>(net.minecraft.client.StringSplitter,float) -> <init>
+    59:64:boolean onChar(int,net.minecraft.network.chat.Style,int) -> onChar
+    68:68:int getPosition() -> a
+    72:73:void resetPosition() -> b
+net.minecraft.client.StringSplitter$WidthProvider -> dmi$f:
+    float getWidth(int,net.minecraft.network.chat.Style) -> getWidth
+net.minecraft.client.Timer -> dmj:
+    float partialTick -> a
+    float tickDelta -> b
+    long lastMs -> c
+    float msPerTick -> d
+    10:13:void <init>(float,long) -> <init>
+    16:22:int advanceTime(long) -> a
+net.minecraft.client.ToggleKeyMapping -> dmk:
     java.util.function.BooleanSupplier needsToggle -> a
     11:13:void <init>(java.lang.String,int,java.lang.String,java.util.function.BooleanSupplier) -> <init>
     17:24:void setDown(boolean) -> a
-net.minecraft.client.User -> dbz:
+net.minecraft.client.User -> dml:
     java.lang.String name -> a
     java.lang.String uuid -> b
     java.lang.String accessToken -> c
@@ -7252,7 +7435,7 @@ net.minecraft.client.User -> dbz:
     40:40:java.lang.String getAccessToken() -> d
     45:48:com.mojang.authlib.GameProfile getGameProfile() -> e
     53:53:net.minecraft.client.User$Type getType() -> f
-net.minecraft.client.User$Type -> dbz$a:
+net.minecraft.client.User$Type -> dml$a:
     net.minecraft.client.User$Type LEGACY -> a
     net.minecraft.client.User$Type MOJANG -> b
     java.util.Map BY_NAME -> c
@@ -7264,9 +7447,9 @@ net.minecraft.client.User$Type -> dbz$a:
     70:70:net.minecraft.client.User$Type byName(java.lang.String) -> a
     60:60:java.lang.String lambda$static$0(net.minecraft.client.User$Type) -> a
     56:60:void <clinit>() -> <clinit>
-net.minecraft.client.color.block.BlockColor -> dca:
+net.minecraft.client.color.block.BlockColor -> dmm:
     int getColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos,int) -> getColor
-net.minecraft.client.color.block.BlockColors -> dcb:
+net.minecraft.client.color.block.BlockColors -> dmn:
     net.minecraft.core.IdMapper blockColors -> a
     java.util.Map coloringStates -> b
     27:31:void <init>() -> <init>
@@ -7288,7 +7471,7 @@ net.minecraft.client.color.block.BlockColors -> dcb:
     51:51:int lambda$createDefault$2(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos,int) -> j
     45:48:int lambda$createDefault$1(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos,int) -> k
     37:40:int lambda$createDefault$0(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos,int) -> l
-net.minecraft.client.color.block.BlockTintCache -> dcc:
+net.minecraft.client.color.block.BlockTintCache -> dmo:
     java.lang.ThreadLocal latestChunkOnThread -> a
     it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap cache -> b
     java.util.concurrent.locks.ReentrantReadWriteLock lock -> c
@@ -7298,17 +7481,17 @@ net.minecraft.client.color.block.BlockTintCache -> dcc:
     65:70:void invalidateAll() -> a
     73:97:int[] findOrCreateChunkCache(int,int) -> b
     22:22:net.minecraft.client.color.block.BlockTintCache$LatestCacheInfo lambda$new$0() -> b
-net.minecraft.client.color.block.BlockTintCache$1 -> dcc$1:
-net.minecraft.client.color.block.BlockTintCache$LatestCacheInfo -> dcc$a:
+net.minecraft.client.color.block.BlockTintCache$1 -> dmo$1:
+net.minecraft.client.color.block.BlockTintCache$LatestCacheInfo -> dmo$a:
     int x -> a
     int z -> b
     int[] cache -> c
     14:16:void <init>() -> <init>
     14:14:void <init>(net.minecraft.client.color.block.BlockTintCache$1) -> <init>
-net.minecraft.client.color.block.package-info -> dcd:
-net.minecraft.client.color.item.ItemColor -> dce:
+net.minecraft.client.color.block.package-info -> dmp:
+net.minecraft.client.color.item.ItemColor -> dmq:
     int getColor(net.minecraft.world.item.ItemStack,int) -> getColor
-net.minecraft.client.color.item.ItemColors -> dcf:
+net.minecraft.client.color.item.ItemColors -> dmr:
     net.minecraft.core.IdMapper itemColors -> a
     22:25:void <init>() -> <init>
     28:78:net.minecraft.client.color.item.ItemColors createDefault(net.minecraft.client.color.block.BlockColors) -> a
@@ -7322,408 +7505,466 @@ net.minecraft.client.color.item.ItemColors -> dcf:
     33:61:int lambda$createDefault$2(net.minecraft.world.item.ItemStack,int) -> e
     31:31:int lambda$createDefault$1(net.minecraft.world.item.ItemStack,int) -> f
     30:30:int lambda$createDefault$0(net.minecraft.world.item.ItemStack,int) -> g
-net.minecraft.client.color.item.package-info -> dcg:
-net.minecraft.client.gui.Font -> dch:
+net.minecraft.client.color.item.package-info -> dms:
+net.minecraft.client.gui.Font -> dmt:
+    com.mojang.math.Vector3f SHADOW_OFFSET -> c
     int lineHeight -> a
     java.util.Random random -> b
-    net.minecraft.client.renderer.texture.TextureManager textureManager -> c
-    net.minecraft.client.gui.font.FontSet fonts -> d
-    boolean bidirectional -> e
-    29:40:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.client.gui.font.FontSet) -> <init>
-    43:44:void reload(java.util.List) -> a
-    48:49:void close() -> close
-    52:54:int drawShadow(java.lang.String,float,float,int) -> a
-    58:60:int draw(java.lang.String,float,float,int) -> b
-    65:71:java.lang.String bidirectionalShaping(java.lang.String) -> a
-    75:82:int drawInternal(java.lang.String,float,float,int,com.mojang.math.Matrix4f,boolean) -> a
-    86:86:int drawInBatch(java.lang.String,float,float,int,boolean,com.mojang.math.Matrix4f,net.minecraft.client.renderer.MultiBufferSource,boolean,int,int) -> a
-    90:106:int drawInternal(java.lang.String,float,float,int,boolean,com.mojang.math.Matrix4f,net.minecraft.client.renderer.MultiBufferSource,boolean,int,int) -> b
-    110:229:float renderText(java.lang.String,float,float,int,boolean,com.mojang.math.Matrix4f,net.minecraft.client.renderer.MultiBufferSource,boolean,int,int) -> c
-    233:237:void renderChar(net.minecraft.client.gui.font.glyphs.BakedGlyph,boolean,boolean,float,float,float,com.mojang.math.Matrix4f,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,float,int) -> a
-    240:262:int width(java.lang.String) -> b
-    266:270:float charWidth(char) -> a
-    274:274:java.lang.String substrByWidth(java.lang.String,int) -> a
-    278:317:java.lang.String substrByWidth(java.lang.String,int,boolean) -> a
-    328:331:java.lang.String eraseTrailingNewLines(java.lang.String) -> c
-    335:338:void drawWordWrap(java.lang.String,int,int,int,int) -> a
-    341:352:void drawWordWrapInternal(java.lang.String,int,int,int,int) -> b
-    355:355:int wordWrapHeight(java.lang.String,int) -> b
-    359:360:void setBidirectional(boolean) -> a
-    363:363:java.util.List split(java.lang.String,int) -> c
-    367:382:java.lang.String insertLineBreaks(java.lang.String,int) -> d
-    386:441:int indexAtWidth(java.lang.String,int) -> e
-    445:482:int getWordPosition(java.lang.String,int,int,boolean) -> a
-    486:486:boolean isBidirectional() -> a
-net.minecraft.client.gui.Gui -> dci:
+    java.util.function.Function fonts -> d
+    net.minecraft.client.StringSplitter splitter -> e
+    38:48:void <init>(java.util.function.Function) -> <init>
+    51:51:net.minecraft.client.gui.font.FontSet getFontSet(net.minecraft.resources.ResourceLocation) -> a
+    55:55:int drawShadow(com.mojang.blaze3d.vertex.PoseStack,java.lang.String,float,float,int) -> a
+    59:60:int drawShadow(com.mojang.blaze3d.vertex.PoseStack,java.lang.String,float,float,int,boolean) -> a
+    64:65:int draw(com.mojang.blaze3d.vertex.PoseStack,java.lang.String,float,float,int) -> b
+    69:70:int drawRaw(com.mojang.blaze3d.vertex.PoseStack,java.lang.String,float,float,int,boolean) -> b
+    74:75:int drawShadow(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.network.chat.FormattedText,float,float,int) -> a
+    79:80:int draw(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.network.chat.FormattedText,float,float,int) -> b
+    85:91:java.lang.String bidirectionalShaping(java.lang.String) -> a
+    95:102:int drawInternal(java.lang.String,float,float,int,com.mojang.math.Matrix4f,boolean,boolean) -> a
+    106:109:int drawInternal(net.minecraft.network.chat.FormattedText,float,float,int,com.mojang.math.Matrix4f,boolean) -> a
+    113:113:int drawInBatch(java.lang.String,float,float,int,boolean,com.mojang.math.Matrix4f,net.minecraft.client.renderer.MultiBufferSource,boolean,int,int) -> a
+    117:117:int drawInBatch(java.lang.String,float,float,int,boolean,com.mojang.math.Matrix4f,net.minecraft.client.renderer.MultiBufferSource,boolean,int,int,boolean) -> a
+    121:121:int drawInBatch(net.minecraft.network.chat.FormattedText,float,float,int,boolean,com.mojang.math.Matrix4f,net.minecraft.client.renderer.MultiBufferSource,boolean,int,int) -> a
+    126:129:int adjustColor(int) -> a
+    133:147:int drawInternal(java.lang.String,float,float,int,boolean,com.mojang.math.Matrix4f,net.minecraft.client.renderer.MultiBufferSource,boolean,int,int,boolean) -> b
+    151:161:int drawInternal(net.minecraft.network.chat.FormattedText,float,float,int,boolean,com.mojang.math.Matrix4f,net.minecraft.client.renderer.MultiBufferSource,boolean,int,int) -> b
+    294:296:float renderText(java.lang.String,float,float,int,boolean,com.mojang.math.Matrix4f,net.minecraft.client.renderer.MultiBufferSource,boolean,int,int) -> b
+    300:302:float renderText(net.minecraft.network.chat.FormattedText,float,float,int,boolean,com.mojang.math.Matrix4f,net.minecraft.client.renderer.MultiBufferSource,boolean,int,int) -> c
+    306:310:void renderChar(net.minecraft.client.gui.font.glyphs.BakedGlyph,boolean,boolean,float,float,float,com.mojang.math.Matrix4f,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,float,int) -> a
+    313:313:int width(java.lang.String) -> b
+    317:317:int width(net.minecraft.network.chat.FormattedText) -> a
+    321:321:java.lang.String plainSubstrByWidth(java.lang.String,int,boolean) -> a
+    325:325:java.lang.String plainSubstrByWidth(java.lang.String,int) -> a
+    329:329:net.minecraft.network.chat.FormattedText substrByWidth(net.minecraft.network.chat.FormattedText,int) -> a
+    333:338:void drawWordWrap(net.minecraft.network.chat.FormattedText,int,int,int,int) -> a
+    341:341:int wordWrapHeight(java.lang.String,int) -> b
+    345:345:java.util.List split(net.minecraft.network.chat.FormattedText,int) -> b
+    349:349:boolean isBidirectional() -> a
+    353:353:net.minecraft.client.StringSplitter getSplitter() -> b
+    47:47:float lambda$new$0(int,net.minecraft.network.chat.Style) -> a
+    34:34:net.minecraft.client.gui.font.FontSet access$000(net.minecraft.client.gui.Font,net.minecraft.resources.ResourceLocation) -> a
+    34:34:void access$100(net.minecraft.client.gui.Font,net.minecraft.client.gui.font.glyphs.BakedGlyph,boolean,boolean,float,float,float,com.mojang.math.Matrix4f,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,float,int) -> a
+    37:37:void <clinit>() -> <clinit>
+net.minecraft.client.gui.Font$StringRenderOutput -> dmt$a:
+    net.minecraft.client.renderer.MultiBufferSource bufferSource -> a
+    boolean dropShadow -> c
+    float dimFactor -> d
+    float r -> e
+    float g -> f
+    float b -> g
+    float a -> h
+    com.mojang.math.Matrix4f pose -> i
+    boolean seeThrough -> j
+    int packedLightCoords -> k
+    float x -> l
+    float y -> m
+    java.util.List effects -> n
+    net.minecraft.client.gui.Font this$0 -> b
+    183:187:void addEffect(net.minecraft.client.gui.font.glyphs.BakedGlyph$Effect) -> a
+    189:202:void <init>(net.minecraft.client.gui.Font,net.minecraft.client.renderer.MultiBufferSource,float,float,int,boolean,com.mojang.math.Matrix4f,boolean,int) -> <init>
+    206:262:boolean onChar(int,net.minecraft.network.chat.Style,int) -> onChar
+    267:289:float finish(int,float) -> a
+net.minecraft.client.gui.Gui -> dmu:
     net.minecraft.resources.ResourceLocation VIGNETTE_LOCATION -> b
     net.minecraft.resources.ResourceLocation WIDGETS_LOCATION -> c
     net.minecraft.resources.ResourceLocation PUMPKIN_BLUR_LOCATION -> d
     java.util.Random random -> e
-    net.minecraft.client.Minecraft minecraft -> f
-    net.minecraft.client.renderer.entity.ItemRenderer itemRenderer -> g
-    net.minecraft.client.gui.components.ChatComponent chat -> h
-    int tickCount -> i
-    java.lang.String overlayMessageString -> j
-    int overlayMessageTime -> k
-    boolean animateOverlayMessageColor -> l
+    net.minecraft.client.Minecraft minecraft -> i
+    net.minecraft.client.renderer.entity.ItemRenderer itemRenderer -> j
+    net.minecraft.client.gui.components.ChatComponent chat -> k
+    int tickCount -> l
+    net.minecraft.network.chat.Component overlayMessageString -> m
+    int overlayMessageTime -> n
+    boolean animateOverlayMessageColor -> o
     float vignetteBrightness -> a
-    int toolHighlightTimer -> m
-    net.minecraft.world.item.ItemStack lastToolHighlight -> n
-    net.minecraft.client.gui.components.DebugScreenOverlay debugScreen -> o
-    net.minecraft.client.gui.components.SubtitleOverlay subtitleOverlay -> p
-    net.minecraft.client.gui.components.spectator.SpectatorGui spectatorGui -> q
-    net.minecraft.client.gui.components.PlayerTabOverlay tabList -> r
-    net.minecraft.client.gui.components.BossHealthOverlay bossOverlay -> s
-    int titleTime -> t
-    java.lang.String title -> u
-    java.lang.String subtitle -> v
-    int titleFadeInTime -> w
-    int titleStayTime -> x
-    int titleFadeOutTime -> y
-    int lastHealth -> z
-    int displayHealth -> A
-    long lastHealthTime -> B
-    long healthBlinkTime -> C
-    int screenWidth -> D
-    int screenHeight -> E
-    java.util.Map chatListeners -> F
-    88:145:void <init>(net.minecraft.client.Minecraft) -> <init>
-    148:151:void resetTitleTimes() -> a
-    154:365:void render(float) -> a
-    368:373:void drawBackdrop(net.minecraft.client.gui.Font,int,int) -> a
-    376:423:void renderCrosshair() -> n
-    426:438:boolean canRenderCrosshairForSpectator(net.minecraft.world.phys.HitResult) -> a
-    442:502:void renderEffects() -> b
-    505:575:void renderHotbar(float) -> b
-    579:592:void renderJumpMeter(int) -> a
-    595:625:void renderExperienceBar(int) -> b
-    628:661:void renderSelectedItemName() -> c
-    664:676:void renderDemoOverlay() -> d
-    679:725:void displayScoreboardSidebar(net.minecraft.world.scores.Objective) -> a
-    728:731:net.minecraft.world.entity.player.Player getCameraPlayer() -> o
-    735:745:net.minecraft.world.entity.LivingEntity getPlayerVehicleWithHealth() -> p
-    749:758:int getVehicleMaxHearts(net.minecraft.world.entity.LivingEntity) -> a
-    762:762:int getVisibleVehicleHeartRows(int) -> c
-    766:940:void renderPlayerHealth() -> q
-    943:986:void renderVehicleHealth() -> r
-    989:1008:void renderPumpkin() -> s
-    1011:1016:void updateVignetteBrightness(net.minecraft.world.entity.Entity) -> a
-    1019:1053:void renderVignette(net.minecraft.world.entity.Entity) -> b
-    1056:1087:void renderPortalOverlay(float) -> c
-    1090:1110:void renderSlot(int,int,float,net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
-    1113:1142:void tick() -> e
-    1145:1146:void setNowPlaying(java.lang.String) -> a
-    1149:1152:void setOverlayMessage(java.lang.String,boolean) -> a
-    1155:1184:void setTitles(java.lang.String,java.lang.String,int,int,int) -> a
-    1187:1188:void setOverlayMessage(net.minecraft.network.chat.Component,boolean) -> a
-    1191:1194:void handleChat(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component) -> a
-    1197:1197:net.minecraft.client.gui.components.ChatComponent getChat() -> f
-    1201:1201:int getGuiTicks() -> g
-    1205:1205:net.minecraft.client.gui.Font getFont() -> h
-    1209:1209:net.minecraft.client.gui.components.spectator.SpectatorGui getSpectatorGui() -> i
-    1213:1213:net.minecraft.client.gui.components.PlayerTabOverlay getTabList() -> j
-    1217:1220:void onDisconnected() -> k
-    1223:1223:net.minecraft.client.gui.components.BossHealthOverlay getBossOverlay() -> l
-    1227:1228:void clearCache() -> m
-    681:681:boolean lambda$displayScoreboardSidebar$1(net.minecraft.world.scores.Score) -> a
-    494:497:void lambda$renderEffects$0(net.minecraft.client.renderer.texture.TextureAtlasSprite,float,int,int) -> a
-    78:80:void <clinit>() -> <clinit>
-net.minecraft.client.gui.GuiComponent -> dcj:
-    net.minecraft.resources.ResourceLocation BACKGROUND_LOCATION -> BACKGROUND_LOCATION
-    net.minecraft.resources.ResourceLocation STATS_ICON_LOCATION -> STATS_ICON_LOCATION
-    net.minecraft.resources.ResourceLocation GUI_ICONS_LOCATION -> GUI_ICONS_LOCATION
-    int blitOffset -> blitOffset
-    14:14:void <init>() -> <init>
-    21:27:void hLine(int,int,int,int) -> hLine
-    30:36:void vLine(int,int,int,int) -> vLine
-    39:40:void fill(int,int,int,int,int) -> fill
-    43:70:void fill(com.mojang.math.Matrix4f,int,int,int,int,int) -> fill
-    73:101:void fillGradient(int,int,int,int,int,int) -> fillGradient
-    104:105:void drawCenteredString(net.minecraft.client.gui.Font,java.lang.String,int,int,int) -> drawCenteredString
-    108:109:void drawRightAlignedString(net.minecraft.client.gui.Font,java.lang.String,int,int,int) -> drawRightAlignedString
-    112:113:void drawString(net.minecraft.client.gui.Font,java.lang.String,int,int,int) -> drawString
-    116:123:void blit(int,int,int,int,int,net.minecraft.client.renderer.texture.TextureAtlasSprite) -> blit
-    126:133:void blit(int,int,int,int,int,int) -> blit
-    136:144:void blit(int,int,int,float,float,int,int,int,int) -> blit
-    147:155:void blit(int,int,int,int,float,float,int,int,int,int) -> blit
-    158:159:void blit(int,int,float,float,int,int,int,int) -> blit
-    162:168:void innerBlit(int,int,int,int,int,int,int,float,float,int,int) -> innerBlit
-    171:181:void innerBlit(int,int,int,int,int,float,float,float,float) -> innerBlit
-    184:184:int getBlitOffset() -> getBlitOffset
-    188:189:void setBlitOffset(int) -> setBlitOffset
-    15:17:void <clinit>() -> <clinit>
-net.minecraft.client.gui.MapRenderer -> dck:
+    int toolHighlightTimer -> p
+    net.minecraft.world.item.ItemStack lastToolHighlight -> q
+    net.minecraft.client.gui.components.DebugScreenOverlay debugScreen -> r
+    net.minecraft.client.gui.components.SubtitleOverlay subtitleOverlay -> s
+    net.minecraft.client.gui.components.spectator.SpectatorGui spectatorGui -> t
+    net.minecraft.client.gui.components.PlayerTabOverlay tabList -> u
+    net.minecraft.client.gui.components.BossHealthOverlay bossOverlay -> v
+    int titleTime -> w
+    net.minecraft.network.chat.Component title -> x
+    net.minecraft.network.chat.Component subtitle -> y
+    int titleFadeInTime -> z
+    int titleStayTime -> A
+    int titleFadeOutTime -> B
+    int lastHealth -> C
+    int displayHealth -> D
+    long lastHealthTime -> E
+    long healthBlinkTime -> F
+    int screenWidth -> G
+    int screenHeight -> H
+    java.util.Map chatListeners -> I
+    95:155:void <init>(net.minecraft.client.Minecraft) -> <init>
+    158:161:void resetTitleTimes() -> a
+    164:376:void render(com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    379:384:void drawBackdrop(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.Font,int,int,int) -> a
+    387:434:void renderCrosshair(com.mojang.blaze3d.vertex.PoseStack) -> d
+    437:449:boolean canRenderCrosshairForSpectator(net.minecraft.world.phys.HitResult) -> a
+    453:513:void renderEffects(com.mojang.blaze3d.vertex.PoseStack) -> a
+    516:586:void renderHotbar(float,com.mojang.blaze3d.vertex.PoseStack) -> a
+    590:603:void renderJumpMeter(com.mojang.blaze3d.vertex.PoseStack,int) -> a
+    606:636:void renderExperienceBar(com.mojang.blaze3d.vertex.PoseStack,int) -> b
+    639:671:void renderSelectedItemName(com.mojang.blaze3d.vertex.PoseStack) -> b
+    674:686:void renderDemoOverlay(com.mojang.blaze3d.vertex.PoseStack) -> c
+    689:739:void displayScoreboardSidebar(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.scores.Objective) -> a
+    742:745:net.minecraft.world.entity.player.Player getCameraPlayer() -> k
+    749:759:net.minecraft.world.entity.LivingEntity getPlayerVehicleWithHealth() -> l
+    763:772:int getVehicleMaxHearts(net.minecraft.world.entity.LivingEntity) -> a
+    776:776:int getVisibleVehicleHeartRows(int) -> a
+    780:953:void renderPlayerHealth(com.mojang.blaze3d.vertex.PoseStack) -> e
+    956:999:void renderVehicleHealth(com.mojang.blaze3d.vertex.PoseStack) -> f
+    1002:1021:void renderPumpkin() -> m
+    1024:1029:void updateVignetteBrightness(net.minecraft.world.entity.Entity) -> a
+    1032:1066:void renderVignette(net.minecraft.world.entity.Entity) -> b
+    1069:1100:void renderPortalOverlay(float) -> a
+    1103:1123:void renderSlot(int,int,float,net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+    1126:1155:void tick() -> b
+    1158:1159:void setNowPlaying(net.minecraft.network.chat.Component) -> a
+    1162:1165:void setOverlayMessage(net.minecraft.network.chat.Component,boolean) -> a
+    1168:1197:void setTitles(net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,int,int,int) -> a
+    1200:1203:void handleChat(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component,java.util.UUID) -> a
+    1206:1206:net.minecraft.client.gui.components.ChatComponent getChat() -> c
+    1210:1210:int getGuiTicks() -> d
+    1214:1214:net.minecraft.client.gui.Font getFont() -> e
+    1218:1218:net.minecraft.client.gui.components.spectator.SpectatorGui getSpectatorGui() -> f
+    1222:1222:net.minecraft.client.gui.components.PlayerTabOverlay getTabList() -> g
+    1226:1229:void onDisconnected() -> h
+    1232:1232:net.minecraft.client.gui.components.BossHealthOverlay getBossOverlay() -> i
+    1236:1237:void clearCache() -> j
+    691:691:boolean lambda$displayScoreboardSidebar$1(net.minecraft.world.scores.Score) -> a
+    505:508:void lambda$renderEffects$0(net.minecraft.client.renderer.texture.TextureAtlasSprite,float,com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    84:86:void <clinit>() -> <clinit>
+net.minecraft.client.gui.GuiComponent -> dmv:
+    net.minecraft.resources.ResourceLocation BACKGROUND_LOCATION -> f
+    net.minecraft.resources.ResourceLocation STATS_ICON_LOCATION -> g
+    net.minecraft.resources.ResourceLocation GUI_ICONS_LOCATION -> h
+    int blitOffset -> a
+    18:18:void <init>() -> <init>
+    25:31:void hLine(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> a
+    34:40:void vLine(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> b
+    43:44:void fill(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int) -> a
+    47:74:void innerFill(com.mojang.math.Matrix4f,int,int,int,int,int) -> a
+    77:93:void fillGradient(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int) -> a
+    96:110:void fillGradient(com.mojang.math.Matrix4f,com.mojang.blaze3d.vertex.BufferBuilder,int,int,int,int,int,int,int) -> a
+    113:114:void drawCenteredString(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.Font,java.lang.String,int,int,int) -> a
+    117:118:void drawCenteredString(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.Font,net.minecraft.network.chat.FormattedText,int,int,int) -> a
+    121:122:void drawRightAlignedString(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.Font,java.lang.String,int,int,int) -> b
+    125:126:void drawString(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.Font,java.lang.String,int,int,int) -> c
+    129:130:void drawString(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.Font,net.minecraft.network.chat.FormattedText,int,int,int) -> b
+    133:143:void blitOutlineBlack(int,int,java.util.function.BiConsumer) -> a
+    146:153:void blit(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,net.minecraft.client.renderer.texture.TextureAtlasSprite) -> a
+    156:163:void blit(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int) -> b
+    166:174:void blit(com.mojang.blaze3d.vertex.PoseStack,int,int,int,float,float,int,int,int,int) -> a
+    177:185:void blit(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,float,float,int,int,int,int) -> a
+    188:189:void blit(com.mojang.blaze3d.vertex.PoseStack,int,int,float,float,int,int,int,int) -> a
+    192:198:void innerBlit(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,float,float,int,int) -> a
+    201:211:void innerBlit(com.mojang.math.Matrix4f,int,int,int,int,int,float,float,float,float) -> a
+    214:214:int getBlitOffset() -> o
+    218:219:void setBlitOffset(int) -> e
+    19:21:void <clinit>() -> <clinit>
+net.minecraft.client.gui.MapRenderer -> dmw:
     net.minecraft.resources.ResourceLocation MAP_ICONS_LOCATION -> a
     net.minecraft.client.renderer.RenderType MAP_ICONS -> b
     net.minecraft.client.renderer.texture.TextureManager textureManager -> c
     java.util.Map maps -> d
-    30:34:void <init>(net.minecraft.client.renderer.texture.TextureManager) -> <init>
-    37:38:void update(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
-    41:42:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.level.saveddata.maps.MapItemSavedData,boolean,int) -> a
-    45:51:net.minecraft.client.gui.MapRenderer$MapInstance getMapInstance(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> b
-    56:56:net.minecraft.client.gui.MapRenderer$MapInstance getMapInstanceIfExists(java.lang.String) -> a
-    60:65:void resetData() -> a
-    69:72:net.minecraft.world.level.saveddata.maps.MapItemSavedData getData(net.minecraft.client.gui.MapRenderer$MapInstance) -> a
-    77:78:void close() -> close
-    23:23:net.minecraft.client.renderer.texture.TextureManager access$400(net.minecraft.client.gui.MapRenderer) -> a
-    23:23:net.minecraft.client.renderer.RenderType access$500() -> b
-    24:25:void <clinit>() -> <clinit>
-net.minecraft.client.gui.MapRenderer$1 -> dck$1:
-net.minecraft.client.gui.MapRenderer$MapInstance -> dck$a:
+    31:35:void <init>(net.minecraft.client.renderer.texture.TextureManager) -> <init>
+    38:39:void update(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
+    42:43:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.level.saveddata.maps.MapItemSavedData,boolean,int) -> a
+    46:52:net.minecraft.client.gui.MapRenderer$MapInstance getMapInstance(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> b
+    57:57:net.minecraft.client.gui.MapRenderer$MapInstance getMapInstanceIfExists(java.lang.String) -> a
+    61:66:void resetData() -> a
+    70:73:net.minecraft.world.level.saveddata.maps.MapItemSavedData getData(net.minecraft.client.gui.MapRenderer$MapInstance) -> a
+    78:79:void close() -> close
+    24:24:net.minecraft.client.renderer.texture.TextureManager access$400(net.minecraft.client.gui.MapRenderer) -> a
+    24:24:net.minecraft.client.renderer.RenderType access$500() -> b
+    25:26:void <clinit>() -> <clinit>
+net.minecraft.client.gui.MapRenderer$1 -> dmw$1:
+net.minecraft.client.gui.MapRenderer$MapInstance -> dmw$a:
     net.minecraft.world.level.saveddata.maps.MapItemSavedData data -> b
     net.minecraft.client.renderer.texture.DynamicTexture texture -> c
     net.minecraft.client.renderer.RenderType renderType -> d
     net.minecraft.client.gui.MapRenderer this$0 -> a
-    85:90:void <init>(net.minecraft.client.gui.MapRenderer,net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> <init>
-    93:105:void updateTexture() -> a
-    108:165:void draw(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,boolean,int) -> a
-    169:170:void close() -> close
-    80:80:void access$000(net.minecraft.client.gui.MapRenderer$MapInstance) -> a
-    80:80:void access$100(net.minecraft.client.gui.MapRenderer$MapInstance,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,boolean,int) -> a
-    80:80:void <init>(net.minecraft.client.gui.MapRenderer,net.minecraft.world.level.saveddata.maps.MapItemSavedData,net.minecraft.client.gui.MapRenderer$1) -> <init>
-    80:80:net.minecraft.world.level.saveddata.maps.MapItemSavedData access$300(net.minecraft.client.gui.MapRenderer$MapInstance) -> b
-net.minecraft.client.gui.chat.ChatListener -> dcl:
-    void handle(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component) -> a
-net.minecraft.client.gui.chat.NarratorChatListener -> dcm:
+    86:91:void <init>(net.minecraft.client.gui.MapRenderer,net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> <init>
+    94:106:void updateTexture() -> a
+    109:166:void draw(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,boolean,int) -> a
+    170:171:void close() -> close
+    81:81:void access$000(net.minecraft.client.gui.MapRenderer$MapInstance) -> a
+    81:81:void access$100(net.minecraft.client.gui.MapRenderer$MapInstance,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,boolean,int) -> a
+    81:81:void <init>(net.minecraft.client.gui.MapRenderer,net.minecraft.world.level.saveddata.maps.MapItemSavedData,net.minecraft.client.gui.MapRenderer$1) -> <init>
+    81:81:net.minecraft.world.level.saveddata.maps.MapItemSavedData access$300(net.minecraft.client.gui.MapRenderer$MapInstance) -> b
+net.minecraft.client.gui.chat.ChatListener -> dmx:
+    void handle(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component,java.util.UUID) -> a
+net.minecraft.client.gui.chat.NarratorChatListener -> dmy:
     net.minecraft.network.chat.Component NO_TITLE -> a
     org.apache.logging.log4j.Logger LOGGER -> c
     net.minecraft.client.gui.chat.NarratorChatListener INSTANCE -> b
     com.mojang.text2speech.Narrator narrator -> d
-    16:24:void <init>() -> <init>
-    28:42:void handle(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component) -> a
-    45:50:void sayNow(java.lang.String) -> a
-    53:53:net.minecraft.client.NarratorStatus getStatus() -> d
-    57:62:void doSay(boolean,java.lang.String) -> a
-    65:79:void updateNarratorStatus(net.minecraft.client.NarratorStatus) -> a
-    82:82:boolean isActive() -> a
-    86:90:void clear() -> b
-    93:94:void destroy() -> c
-    17:22:void <clinit>() -> <clinit>
-net.minecraft.client.gui.chat.OverlayChatListener -> dcn:
+    18:26:void <init>() -> <init>
+    30:48:void handle(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component,java.util.UUID) -> a
+    51:56:void sayNow(java.lang.String) -> a
+    59:59:net.minecraft.client.NarratorStatus getStatus() -> d
+    63:68:void doSay(boolean,java.lang.String) -> a
+    71:85:void updateNarratorStatus(net.minecraft.client.NarratorStatus) -> a
+    88:88:boolean isActive() -> a
+    92:96:void clear() -> b
+    99:100:void destroy() -> c
+    19:24:void <clinit>() -> <clinit>
+net.minecraft.client.gui.chat.OverlayChatListener -> dmz:
     net.minecraft.client.Minecraft minecraft -> a
-    10:12:void <init>(net.minecraft.client.Minecraft) -> <init>
-    16:17:void handle(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component) -> a
-net.minecraft.client.gui.chat.StandardChatListener -> dco:
+    12:14:void <init>(net.minecraft.client.Minecraft) -> <init>
+    18:23:void handle(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component,java.util.UUID) -> a
+net.minecraft.client.gui.chat.StandardChatListener -> dna:
     net.minecraft.client.Minecraft minecraft -> a
-    10:12:void <init>(net.minecraft.client.Minecraft) -> <init>
-    16:17:void handle(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component) -> a
-net.minecraft.client.gui.chat.package-info -> dcp:
-net.minecraft.client.gui.components.AbstractButton -> dcq:
-    8:9:void <init>(int,int,int,int,java.lang.String) -> <init>
-    void onPress() -> onPress
-    15:16:void onClick(double,double) -> onClick
-    20:28:boolean keyPressed(int,int,int) -> keyPressed
-net.minecraft.client.gui.components.AbstractSelectionList -> dcr:
-    int DRAG_OUTSIDE -> DRAG_OUTSIDE
-    net.minecraft.client.Minecraft minecraft -> minecraft
-    int itemHeight -> itemHeight
-    java.util.List children -> children
-    int width -> width
-    int height -> height
-    int y0 -> y0
-    int y1 -> y1
-    int x1 -> x1
-    int x0 -> x0
-    boolean centerListVertically -> centerListVertically
-    int yDrag -> yDrag
-    double scrollAmount -> scrollAmount
-    boolean renderSelection -> renderSelection
-    boolean renderHeader -> renderHeader
-    int headerHeight -> headerHeight
-    boolean scrolling -> scrolling
-    net.minecraft.client.gui.components.AbstractSelectionList$Entry selected -> selected
-    29:54:void <init>(net.minecraft.client.Minecraft,int,int,int,int,int) -> <init>
-    58:59:void setRenderSelection(boolean) -> setRenderSelection
-    62:68:void setRenderHeader(boolean,int) -> setRenderHeader
-    72:72:int getRowWidth() -> getRowWidth
-    77:77:net.minecraft.client.gui.components.AbstractSelectionList$Entry getSelected() -> getSelected
-    81:82:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> setSelected
-    88:88:net.minecraft.client.gui.components.AbstractSelectionList$Entry getFocused() -> getFocused
-    93:93:java.util.List children() -> children
-    97:98:void clearEntries() -> clearEntries
-    101:103:void replaceEntries(java.util.Collection) -> replaceEntries
-    106:106:net.minecraft.client.gui.components.AbstractSelectionList$Entry getEntry(int) -> getEntry
-    110:111:int addEntry(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> addEntry
-    115:115:int getItemCount() -> getItemCount
-    119:119:boolean isSelectedItem(int) -> isSelectedItem
-    124:135:net.minecraft.client.gui.components.AbstractSelectionList$Entry getEntryAtPosition(double,double) -> getEntryAtPosition
-    140:146:void updateSize(int,int,int,int) -> updateSize
-    149:151:void setLeftPos(int) -> setLeftPos
-    154:154:int getMaxPosition() -> getMaxPosition
-    158:158:void clickedHeader(int,int) -> clickedHeader
-    161:161:void renderHeader(int,int,com.mojang.blaze3d.vertex.Tesselator) -> renderHeader
-    164:164:void renderBackground() -> renderBackground
-    167:167:void renderDecorations(int,int) -> renderDecorations
-    171:264:void render(int,int,float) -> render
-    268:269:void centerScrollOn(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> centerScrollOn
-    272:282:void ensureVisible(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> ensureVisible
-    285:287:void scroll(int) -> scroll
-    290:290:double getScrollAmount() -> getScrollAmount
-    294:295:void setScrollAmount(double) -> setScrollAmount
-    298:298:int getMaxScroll() -> getMaxScroll
-    302:302:int getScrollBottom() -> getScrollBottom
-    306:307:void updateScrollingState(double,double,int) -> updateScrollingState
-    310:310:int getScrollbarPosition() -> getScrollbarPosition
-    315:332:boolean mouseClicked(double,double,int) -> mouseClicked
-    337:340:boolean mouseReleased(double,double,int) -> mouseReleased
-    345:363:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    368:369:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    375:385:boolean keyPressed(int,int,int) -> keyPressed
-    389:397:void moveSelection(int) -> moveSelection
-    401:401:boolean isMouseOver(double,double) -> isMouseOver
-    405:448:void renderList(int,int,int,int,float) -> renderList
-    451:451:int getRowLeft() -> getRowLeft
-    455:455:int getRowTop(int) -> getRowTop
-    459:459:int getRowBottom(int) -> getRowBottom
-    463:463:boolean isFocused() -> isFocused
-    467:478:void renderHoleBackground(int,int,int,int) -> renderHoleBackground
-    481:485:net.minecraft.client.gui.components.AbstractSelectionList$Entry remove(int) -> remove
-    490:494:boolean removeEntry(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> removeEntry
-    24:24:net.minecraft.client.gui.components.events.GuiEventListener getFocused() -> getFocused
-net.minecraft.client.gui.components.AbstractSelectionList$1 -> dcr$1:
-net.minecraft.client.gui.components.AbstractSelectionList$Entry -> dcr$a:
-    net.minecraft.client.gui.components.AbstractSelectionList list -> list
-    498:498:void <init>() -> <init>
-    void render(int,int,int,int,int,int,int,boolean,float) -> render
-    506:506:boolean isMouseOver(double,double) -> isMouseOver
-net.minecraft.client.gui.components.AbstractSelectionList$TrackedList -> dcr$b:
+    12:14:void <init>(net.minecraft.client.Minecraft) -> <init>
+    18:27:void handle(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component,java.util.UUID) -> a
+net.minecraft.client.gui.chat.package-info -> dnb:
+net.minecraft.client.gui.components.AbstractButton -> dnc:
+    9:10:void <init>(int,int,int,int,net.minecraft.network.chat.Component) -> <init>
+    void onPress() -> b
+    16:17:void onClick(double,double) -> a
+    21:29:boolean keyPressed(int,int,int) -> a
+net.minecraft.client.gui.components.AbstractOptionSliderButton -> dnd:
+    net.minecraft.client.Options options -> a
+    10:12:void <init>(net.minecraft.client.Options,int,int,int,int,double) -> <init>
+net.minecraft.client.gui.components.AbstractSelectionList -> dne:
+    net.minecraft.client.Minecraft minecraft -> b
+    int itemHeight -> c
+    java.util.List children -> a
+    int width -> d
+    int height -> e
+    int y0 -> i
+    int y1 -> j
+    int x1 -> k
+    int x0 -> l
+    boolean centerListVertically -> m
+    double scrollAmount -> o
+    boolean renderSelection -> p
+    boolean renderHeader -> q
+    int headerHeight -> n
+    boolean scrolling -> r
+    net.minecraft.client.gui.components.AbstractSelectionList$Entry selected -> s
+    29:53:void <init>(net.minecraft.client.Minecraft,int,int,int,int,int) -> <init>
+    57:58:void setRenderSelection(boolean) -> a
+    61:67:void setRenderHeader(boolean,int) -> a
+    71:71:int getRowWidth() -> d
+    76:76:net.minecraft.client.gui.components.AbstractSelectionList$Entry getSelected() -> h
+    80:81:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+    87:87:net.minecraft.client.gui.components.AbstractSelectionList$Entry getFocused() -> i
+    92:92:java.util.List children() -> av_
+    96:97:void clearEntries() -> k
+    100:102:void replaceEntries(java.util.Collection) -> a
+    105:105:net.minecraft.client.gui.components.AbstractSelectionList$Entry getEntry(int) -> d
+    109:110:int addEntry(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> b
+    114:114:int getItemCount() -> l
+    118:118:boolean isSelectedItem(int) -> f
+    123:134:net.minecraft.client.gui.components.AbstractSelectionList$Entry getEntryAtPosition(double,double) -> a
+    139:145:void updateSize(int,int,int,int) -> a
+    148:150:void setLeftPos(int) -> g
+    153:153:int getMaxPosition() -> c
+    157:157:void clickedHeader(int,int) -> a
+    160:160:void renderHeader(com.mojang.blaze3d.vertex.PoseStack,int,int,com.mojang.blaze3d.vertex.Tesselator) -> a
+    163:163:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    166:166:void renderDecorations(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    170:275:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    279:280:void centerScrollOn(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> c
+    283:293:void ensureVisible(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> d
+    296:297:void scroll(int) -> a
+    300:300:double getScrollAmount() -> m
+    304:305:void setScrollAmount(double) -> a
+    308:308:int getMaxScroll() -> f
+    312:312:int getScrollBottom() -> n
+    316:317:void updateScrollingState(double,double,int) -> b
+    320:320:int getScrollbarPosition() -> e
+    325:342:boolean mouseClicked(double,double,int) -> a
+    347:350:boolean mouseReleased(double,double,int) -> c
+    355:373:boolean mouseDragged(double,double,int,double,double) -> a
+    378:379:boolean mouseScrolled(double,double,double) -> a
+    385:395:boolean keyPressed(int,int,int) -> a
+    399:400:void moveSelection(net.minecraft.client.gui.components.AbstractSelectionList$SelectionDirection) -> a
+    403:408:void refreshSelection() -> p
+    417:437:void moveSelection(net.minecraft.client.gui.components.AbstractSelectionList$SelectionDirection,java.util.function.Predicate) -> a
+    441:441:boolean isMouseOver(double,double) -> b
+    445:488:void renderList(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,float) -> a
+    491:491:int getRowLeft() -> q
+    495:495:int getRowTop(int) -> h
+    499:499:int getRowBottom(int) -> b
+    503:503:boolean isFocused() -> b
+    507:511:net.minecraft.client.gui.components.AbstractSelectionList$Entry remove(int) -> i
+    516:520:boolean removeEntry(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> e
+    524:525:void bindEntryToSelf(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> f
+    26:26:net.minecraft.client.gui.components.events.GuiEventListener getFocused() -> r
+    399:399:boolean lambda$moveSelection$0(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> g
+    26:26:void access$200(net.minecraft.client.gui.components.AbstractSelectionList,net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+net.minecraft.client.gui.components.AbstractSelectionList$1 -> dne$1:
+net.minecraft.client.gui.components.AbstractSelectionList$Entry -> dne$a:
+    net.minecraft.client.gui.components.AbstractSelectionList list -> a
+    528:528:void <init>() -> <init>
+    void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    536:536:boolean isMouseOver(double,double) -> b
+    528:528:net.minecraft.client.gui.components.AbstractSelectionList access$102(net.minecraft.client.gui.components.AbstractSelectionList$Entry,net.minecraft.client.gui.components.AbstractSelectionList) -> a
+net.minecraft.client.gui.components.AbstractSelectionList$SelectionDirection -> dne$b:
+    net.minecraft.client.gui.components.AbstractSelectionList$SelectionDirection UP -> a
+    net.minecraft.client.gui.components.AbstractSelectionList$SelectionDirection DOWN -> b
+    net.minecraft.client.gui.components.AbstractSelectionList$SelectionDirection[] $VALUES -> c
+    410:410:net.minecraft.client.gui.components.AbstractSelectionList$SelectionDirection[] values() -> values
+    410:410:net.minecraft.client.gui.components.AbstractSelectionList$SelectionDirection valueOf(java.lang.String) -> valueOf
+    410:410:void <init>(java.lang.String,int) -> <init>
+    410:412:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.AbstractSelectionList$TrackedList -> dne$c:
     java.util.List delegate -> b
     net.minecraft.client.gui.components.AbstractSelectionList this$0 -> a
-    510:511:void <init>(net.minecraft.client.gui.components.AbstractSelectionList) -> <init>
-    515:515:net.minecraft.client.gui.components.AbstractSelectionList$Entry get(int) -> a
-    520:520:int size() -> size
-    525:527:net.minecraft.client.gui.components.AbstractSelectionList$Entry set(int,net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
-    532:534:void add(int,net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> b
-    538:538:net.minecraft.client.gui.components.AbstractSelectionList$Entry remove(int) -> b
-    510:510:java.lang.Object remove(int) -> remove
-    510:510:void add(int,java.lang.Object) -> add
-    510:510:java.lang.Object set(int,java.lang.Object) -> set
-    510:510:java.lang.Object get(int) -> get
-    510:510:void <init>(net.minecraft.client.gui.components.AbstractSelectionList,net.minecraft.client.gui.components.AbstractSelectionList$1) -> <init>
-net.minecraft.client.gui.components.AbstractSliderButton -> dcs:
-    net.minecraft.client.Options options -> options
-    double value -> value
-    16:17:void <init>(int,int,int,int,double) -> <init>
-    20:23:void <init>(net.minecraft.client.Options,int,int,int,int,double) -> <init>
-    27:27:int getYImage(boolean) -> getYImage
-    32:32:java.lang.String getNarrationMessage() -> getNarrationMessage
-    37:42:void renderBg(net.minecraft.client.Minecraft,int,int) -> renderBg
-    46:47:void onClick(double,double) -> onClick
-    51:56:boolean keyPressed(int,int,int) -> keyPressed
-    60:61:void setValueFromMouse(double) -> setValueFromMouse
-    64:70:void setValue(double) -> setValue
-    74:76:void onDrag(double,double,double,double) -> onDrag
-    80:80:void playDownSound(net.minecraft.client.sounds.SoundManager) -> playDownSound
-    84:85:void onRelease(double,double) -> onRelease
-    void updateMessage() -> updateMessage
-    void applyValue() -> applyValue
-net.minecraft.client.gui.components.AbstractWidget -> dct:
-    net.minecraft.resources.ResourceLocation WIDGETS_LOCATION -> WIDGETS_LOCATION
-    int NARRATE_DELAY_MOUSE -> NARRATE_DELAY_MOUSE
-    int NARRATE_DELAY_FOCUS -> NARRATE_DELAY_FOCUS
-    int width -> width
-    int height -> height
-    int x -> x
-    int y -> y
-    java.lang.String message -> message
-    boolean wasHovered -> wasHovered
-    boolean isHovered -> isHovered
-    boolean active -> active
-    boolean visible -> visible
-    float alpha -> alpha
-    long nextNarration -> nextNarration
-    boolean focused -> focused
-    42:43:void <init>(int,int,java.lang.String) -> <init>
-    34:51:void <init>(int,int,int,int,java.lang.String) -> <init>
-    54:60:int getYImage(boolean) -> getYImage
-    65:89:void render(int,int,float) -> render
-    92:99:void narrate() -> narrate
-    102:105:java.lang.String getNarrationMessage() -> getNarrationMessage
-    109:127:void renderButton(int,int,float) -> renderButton
-    130:130:void renderBg(net.minecraft.client.Minecraft,int,int) -> renderBg
-    133:133:void onClick(double,double) -> onClick
-    136:136:void onRelease(double,double) -> onRelease
-    139:139:void onDrag(double,double,double,double) -> onDrag
-    143:154:boolean mouseClicked(double,double,int) -> mouseClicked
-    159:163:boolean mouseReleased(double,double,int) -> mouseReleased
-    167:167:boolean isValidClickButton(int) -> isValidClickButton
-    172:176:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    180:180:boolean clicked(double,double) -> clicked
-    184:184:boolean isHovered() -> isHovered
-    189:195:boolean changeFocus(boolean) -> changeFocus
-    199:199:void onFocusedChanged(boolean) -> onFocusedChanged
-    203:203:boolean isMouseOver(double,double) -> isMouseOver
-    207:207:void renderToolTip(int,int) -> renderToolTip
-    210:211:void playDownSound(net.minecraft.client.sounds.SoundManager) -> playDownSound
-    214:214:int getWidth() -> getWidth
-    218:219:void setWidth(int) -> setWidth
-    222:223:void setAlpha(float) -> setAlpha
-    226:230:void setMessage(java.lang.String) -> setMessage
-    233:234:void queueNarration(int) -> queueNarration
-    237:237:java.lang.String getMessage() -> getMessage
-    241:241:boolean isFocused() -> isFocused
-    248:249:void setFocused(boolean) -> setFocused
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.BossHealthOverlay -> dcu:
+    540:541:void <init>(net.minecraft.client.gui.components.AbstractSelectionList) -> <init>
+    545:545:net.minecraft.client.gui.components.AbstractSelectionList$Entry get(int) -> a
+    550:550:int size() -> size
+    555:557:net.minecraft.client.gui.components.AbstractSelectionList$Entry set(int,net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+    562:564:void add(int,net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> b
+    568:568:net.minecraft.client.gui.components.AbstractSelectionList$Entry remove(int) -> b
+    540:540:java.lang.Object remove(int) -> remove
+    540:540:void add(int,java.lang.Object) -> add
+    540:540:java.lang.Object set(int,java.lang.Object) -> set
+    540:540:java.lang.Object get(int) -> get
+    540:540:void <init>(net.minecraft.client.gui.components.AbstractSelectionList,net.minecraft.client.gui.components.AbstractSelectionList$1) -> <init>
+net.minecraft.client.gui.components.AbstractSliderButton -> dnf:
+    double value -> b
+    17:19:void <init>(int,int,int,int,net.minecraft.network.chat.Component,double) -> <init>
+    23:23:int getYImage(boolean) -> a
+    28:28:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+    33:38:void renderBg(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.Minecraft,int,int) -> a
+    42:43:void onClick(double,double) -> a
+    47:52:boolean keyPressed(int,int,int) -> a
+    56:57:void setValueFromMouse(double) -> a
+    60:66:void setValue(double) -> b
+    70:72:void onDrag(double,double,double,double) -> a
+    76:76:void playDownSound(net.minecraft.client.sounds.SoundManager) -> a
+    80:81:void onRelease(double,double) -> a_
+    void updateMessage() -> b
+    void applyValue() -> a
+net.minecraft.client.gui.components.AbstractWidget -> dng:
+    net.minecraft.resources.ResourceLocation WIDGETS_LOCATION -> i
+    int width -> j
+    int height -> k
+    int x -> l
+    int y -> m
+    net.minecraft.network.chat.Component message -> a
+    boolean wasHovered -> b
+    boolean isHovered -> n
+    boolean active -> o
+    boolean visible -> p
+    float alpha -> q
+    long nextNarration -> r
+    boolean focused -> c
+    36:49:void <init>(int,int,int,int,net.minecraft.network.chat.Component) -> <init>
+    52:52:int getHeight() -> e
+    56:62:int getYImage(boolean) -> a
+    67:91:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    94:101:void narrate() -> f
+    104:104:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+    108:126:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    129:129:void renderBg(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.Minecraft,int,int) -> a
+    132:132:void onClick(double,double) -> a
+    135:135:void onRelease(double,double) -> a_
+    138:138:void onDrag(double,double,double,double) -> a
+    142:153:boolean mouseClicked(double,double,int) -> a
+    158:162:boolean mouseReleased(double,double,int) -> c
+    166:166:boolean isValidClickButton(int) -> a
+    171:175:boolean mouseDragged(double,double,int,double,double) -> a
+    179:179:boolean clicked(double,double) -> c
+    183:183:boolean isHovered() -> g
+    188:194:boolean changeFocus(boolean) -> c_
+    198:198:void onFocusedChanged(boolean) -> c
+    202:202:boolean isMouseOver(double,double) -> b
+    206:206:void renderToolTip(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    209:210:void playDownSound(net.minecraft.client.sounds.SoundManager) -> a
+    213:213:int getWidth() -> h
+    217:218:void setWidth(int) -> b
+    221:222:void setAlpha(float) -> a
+    225:229:void setMessage(net.minecraft.network.chat.Component) -> a
+    232:233:void queueNarration(int) -> c
+    236:236:net.minecraft.network.chat.Component getMessage() -> i
+    240:240:boolean isFocused() -> j
+    247:248:void setFocused(boolean) -> d
+    24:24:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.BossHealthOverlay -> dnh:
     net.minecraft.resources.ResourceLocation GUI_BARS_LOCATION -> a
     net.minecraft.client.Minecraft minecraft -> b
     java.util.Map events -> c
-    21:25:void <init>(net.minecraft.client.Minecraft) -> <init>
-    28:54:void render() -> a
-    57:68:void drawBar(int,int,net.minecraft.world.BossEvent) -> a
-    71:78:void update(net.minecraft.network.protocol.game.ClientboundBossEventPacket) -> a
-    81:82:void reset() -> b
-    85:85:boolean hasBoss() -> c
-    89:97:boolean shouldPlayMusic() -> d
-    101:109:boolean shouldDarkenScreen() -> e
-    113:121:boolean shouldCreateWorldFog() -> f
-    15:15:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.Button -> dcv:
-    net.minecraft.client.gui.components.Button$OnPress onPress -> onPress
-    11:14:void <init>(int,int,int,int,java.lang.String,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    18:19:void onPress() -> onPress
-net.minecraft.client.gui.components.Button$OnPress -> dcv$a:
+    23:27:void <init>(net.minecraft.client.Minecraft) -> <init>
+    30:56:void render(com.mojang.blaze3d.vertex.PoseStack) -> a
+    59:70:void drawBar(com.mojang.blaze3d.vertex.PoseStack,int,int,net.minecraft.world.BossEvent) -> a
+    73:80:void update(net.minecraft.network.protocol.game.ClientboundBossEventPacket) -> a
+    83:84:void reset() -> a
+    87:87:boolean hasBoss() -> b
+    91:99:boolean shouldPlayMusic() -> c
+    103:111:boolean shouldDarkenScreen() -> d
+    115:123:boolean shouldCreateWorldFog() -> e
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.Button -> dni:
+    net.minecraft.client.gui.components.Button$OnTooltip NO_TOOLTIP -> s
+    net.minecraft.client.gui.components.Button$OnPress onPress -> t
+    net.minecraft.client.gui.components.Button$OnTooltip onTooltip -> u
+    21:22:void <init>(int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    25:29:void <init>(int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress,net.minecraft.client.gui.components.Button$OnTooltip) -> <init>
+    33:34:void onPress() -> b
+    38:43:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    47:48:void renderToolTip(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    7:7:void lambda$static$0(net.minecraft.client.gui.components.Button,com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.Button$OnPress -> dni$a:
     void onPress(net.minecraft.client.gui.components.Button) -> onPress
-net.minecraft.client.gui.components.ChatComponent -> dcw:
+net.minecraft.client.gui.components.Button$OnTooltip -> dni$b:
+    void onTooltip(net.minecraft.client.gui.components.Button,com.mojang.blaze3d.vertex.PoseStack,int,int) -> onTooltip
+net.minecraft.client.gui.components.ChatComponent -> dnj:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.client.Minecraft minecraft -> b
     java.util.List recentChat -> c
     java.util.List allMessages -> d
     java.util.List trimmedMessages -> e
-    int chatScrollbarPos -> f
-    boolean newMessageSinceScroll -> g
-    26:34:void <init>(net.minecraft.client.Minecraft) -> <init>
-    37:113:void render(int) -> a
-    116:116:boolean isChatVisible() -> i
-    120:125:double getTimeFactor(int) -> c
-    129:134:void clearMessages(boolean) -> a
-    137:138:void addMessage(net.minecraft.network.chat.Component) -> a
-    141:143:void addMessage(net.minecraft.network.chat.Component,int) -> a
-    146:174:void addMessage(net.minecraft.network.chat.Component,int,int,boolean) -> a
-    177:184:void rescaleChat() -> a
-    187:187:java.util.List getRecentChat() -> b
-    191:194:void addRecentChat(java.lang.String) -> a
-    197:199:void resetChatScroll() -> c
-    202:213:void scrollChat(double) -> a
-    217:252:net.minecraft.network.chat.Component getClickedComponentAt(double,double) -> a
-    256:256:boolean isChatFocused() -> d
-    260:280:void removeById(int) -> b
-    283:283:int getWidth() -> e
-    287:287:int getHeight() -> f
-    291:291:double getScale() -> g
-    295:297:int getWidth(double) -> b
-    301:303:int getHeight(double) -> c
-    307:307:int getLinesPerPage() -> h
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.Checkbox -> dcx:
-    net.minecraft.resources.ResourceLocation TEXTURE -> b
-    boolean selected -> a
-    16:18:void <init>(int,int,int,int,java.lang.String,boolean) -> <init>
-    22:23:void onPress() -> onPress
-    26:26:boolean selected() -> a
-    31:47:void renderButton(int,int,float) -> renderButton
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.CommandSuggestions -> dcy:
+    java.util.Deque chatQueue -> i
+    int chatScrollbarPos -> j
+    boolean newMessageSinceScroll -> k
+    long lastMessage -> l
+    30:40:void <init>(net.minecraft.client.Minecraft) -> <init>
+    43:140:void render(com.mojang.blaze3d.vertex.PoseStack,int) -> a
+    143:143:boolean isChatHidden() -> i
+    147:152:double getTimeFactor(int) -> b
+    156:161:void clearMessages(boolean) -> a
+    164:165:void addMessage(net.minecraft.network.chat.Component) -> a
+    168:170:void addMessage(net.minecraft.network.chat.Component,int) -> a
+    173:201:void addMessage(net.minecraft.network.chat.FormattedText,int,int,boolean) -> a
+    204:211:void rescaleChat() -> a
+    214:214:java.util.List getRecentChat() -> b
+    218:221:void addRecentChat(java.lang.String) -> a
+    224:226:void resetChatScroll() -> c
+    229:240:void scrollChat(double) -> a
+    243:256:boolean handleChatQueueClicked(double,double) -> a
+    261:284:net.minecraft.network.chat.Style getClickedComponentStyleAt(double,double) -> b
+    288:288:boolean isChatFocused() -> d
+    292:312:void removeById(int) -> a
+    315:315:int getWidth() -> e
+    319:319:int getHeight() -> f
+    323:323:double getScale() -> g
+    327:329:int getWidth(double) -> b
+    333:335:int getHeight(double) -> c
+    339:339:int getLinesPerPage() -> h
+    343:343:long getChatRateMillis() -> j
+    347:356:void processPendingMessages() -> k
+    359:370:void enqueueMessage(net.minecraft.network.chat.Component) -> b
+    26:26:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.Checkbox -> dnk:
+    net.minecraft.resources.ResourceLocation TEXTURE -> a
+    boolean selected -> b
+    boolean showLabel -> c
+    20:21:void <init>(int,int,int,int,net.minecraft.network.chat.Component,boolean) -> <init>
+    24:27:void <init>(int,int,int,int,net.minecraft.network.chat.Component,boolean,boolean) -> <init>
+    31:32:void onPress() -> b
+    35:35:boolean selected() -> a
+    40:57:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.CommandSuggestions -> dnl:
     java.util.regex.Pattern WHITESPACE_PATTERN -> a
     net.minecraft.client.Minecraft minecraft -> b
     net.minecraft.client.gui.screens.Screen screen -> c
@@ -7743,207 +7984,214 @@ net.minecraft.client.gui.components.CommandSuggestions -> dcy:
     net.minecraft.client.gui.components.CommandSuggestions$SuggestionsList suggestions -> q
     boolean allowSuggestions -> r
     boolean keepSuggestions -> s
-    55:77:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.Screen,net.minecraft.client.gui.components.EditBox,net.minecraft.client.gui.Font,boolean,boolean,int,int,boolean,int) -> <init>
-    80:84:void setAllowSuggestions(boolean) -> a
-    87:93:boolean keyPressed(int,int,int) -> a
-    97:97:boolean mouseScrolled(double) -> a
-    101:101:boolean mouseClicked(double,double,int) -> a
-    105:118:void showSuggestions(boolean) -> b
-    121:165:void updateCommandInfo() -> a
-    168:179:int getLastWordIndex(java.lang.String) -> a
-    184:214:void updateUsageInfo() -> b
-    217:235:void fillNodeUsage(net.minecraft.ChatFormatting) -> a
-    238:241:java.lang.String formatChat(java.lang.String,int) -> a
-    247:251:java.lang.String calculateSuggestionSuffix(java.lang.String,java.lang.String) -> b
-    255:293:java.lang.String formatText(com.mojang.brigadier.ParseResults,java.lang.String,int) -> a
-    297:308:void render(int,int) -> a
-    311:314:java.lang.String getNarrationMessage() -> c
-    153:157:void lambda$updateCommandInfo$0() -> d
-    41:41:boolean access$200(net.minecraft.client.gui.components.CommandSuggestions) -> a
-    41:41:int access$300(net.minecraft.client.gui.components.CommandSuggestions) -> b
-    41:41:net.minecraft.client.gui.components.EditBox access$400(net.minecraft.client.gui.components.CommandSuggestions) -> c
-    41:41:int access$500(net.minecraft.client.gui.components.CommandSuggestions) -> d
-    41:41:net.minecraft.client.gui.Font access$600(net.minecraft.client.gui.components.CommandSuggestions) -> e
-    41:41:net.minecraft.client.gui.screens.Screen access$700(net.minecraft.client.gui.components.CommandSuggestions) -> f
-    41:41:net.minecraft.client.Minecraft access$800(net.minecraft.client.gui.components.CommandSuggestions) -> g
-    41:41:int access$900(net.minecraft.client.gui.components.CommandSuggestions) -> h
-    41:41:java.lang.String access$1000(java.lang.String,java.lang.String) -> a
-    41:41:boolean access$1102(net.minecraft.client.gui.components.CommandSuggestions,boolean) -> a
-    41:41:net.minecraft.client.gui.components.CommandSuggestions$SuggestionsList access$1202(net.minecraft.client.gui.components.CommandSuggestions,net.minecraft.client.gui.components.CommandSuggestions$SuggestionsList) -> a
-    42:42:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.CommandSuggestions$1 -> dcy$1:
-net.minecraft.client.gui.components.CommandSuggestions$SuggestionsList -> dcy$a:
+    57:79:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.Screen,net.minecraft.client.gui.components.EditBox,net.minecraft.client.gui.Font,boolean,boolean,int,int,boolean,int) -> <init>
+    82:86:void setAllowSuggestions(boolean) -> a
+    89:95:boolean keyPressed(int,int,int) -> a
+    99:99:boolean mouseScrolled(double) -> a
+    103:103:boolean mouseClicked(double,double,int) -> a
+    107:120:void showSuggestions(boolean) -> b
+    124:138:java.util.List sortSuggestions(com.mojang.brigadier.suggestion.Suggestions) -> a
+    142:186:void updateCommandInfo() -> a
+    189:200:int getLastWordIndex(java.lang.String) -> a
+    205:235:void updateUsageInfo() -> b
+    238:256:void fillNodeUsage(net.minecraft.ChatFormatting) -> a
+    259:262:java.lang.String formatChat(java.lang.String,int) -> a
+    268:272:java.lang.String calculateSuggestionSuffix(java.lang.String,java.lang.String) -> b
+    276:314:java.lang.String formatText(com.mojang.brigadier.ParseResults,java.lang.String,int) -> a
+    318:329:void render(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    332:335:java.lang.String getNarrationMessage() -> c
+    174:178:void lambda$updateCommandInfo$0() -> d
+    43:43:boolean access$200(net.minecraft.client.gui.components.CommandSuggestions) -> a
+    43:43:int access$300(net.minecraft.client.gui.components.CommandSuggestions) -> b
+    43:43:net.minecraft.client.gui.components.EditBox access$400(net.minecraft.client.gui.components.CommandSuggestions) -> c
+    43:43:int access$500(net.minecraft.client.gui.components.CommandSuggestions) -> d
+    43:43:net.minecraft.client.gui.Font access$600(net.minecraft.client.gui.components.CommandSuggestions) -> e
+    43:43:net.minecraft.client.gui.screens.Screen access$700(net.minecraft.client.gui.components.CommandSuggestions) -> f
+    43:43:net.minecraft.client.Minecraft access$800(net.minecraft.client.gui.components.CommandSuggestions) -> g
+    43:43:int access$900(net.minecraft.client.gui.components.CommandSuggestions) -> h
+    43:43:java.lang.String access$1000(java.lang.String,java.lang.String) -> a
+    43:43:boolean access$1102(net.minecraft.client.gui.components.CommandSuggestions,boolean) -> a
+    43:43:net.minecraft.client.gui.components.CommandSuggestions$SuggestionsList access$1202(net.minecraft.client.gui.components.CommandSuggestions,net.minecraft.client.gui.components.CommandSuggestions$SuggestionsList) -> a
+    44:44:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.CommandSuggestions$1 -> dnl$1:
+net.minecraft.client.gui.components.CommandSuggestions$SuggestionsList -> dnl$a:
     net.minecraft.client.renderer.Rect2i rect -> b
-    com.mojang.brigadier.suggestion.Suggestions suggestions -> c
-    java.lang.String originalContents -> d
+    java.lang.String originalContents -> c
+    java.util.List suggestionList -> d
     int offset -> e
     int current -> f
     net.minecraft.world.phys.Vec2 lastMouse -> g
     boolean tabCycles -> h
     int lastNarratedEntry -> i
     net.minecraft.client.gui.components.CommandSuggestions this$0 -> a
-    323:335:void <init>(net.minecraft.client.gui.components.CommandSuggestions,int,int,int,com.mojang.brigadier.suggestion.Suggestions,boolean) -> <init>
-    338:387:void render(int,int) -> a
-    390:400:boolean mouseClicked(int,int,int) -> a
-    404:412:boolean mouseScrolled(double) -> a
-    416:435:boolean keyPressed(int,int,int) -> b
-    439:447:void cycle(int) -> a
-    450:465:void select(int) -> b
-    468:477:void useSuggestion() -> a
-    480:487:java.lang.String getNarrationMessage() -> c
-    492:493:void hide() -> b
-    317:317:void <init>(net.minecraft.client.gui.components.CommandSuggestions,int,int,int,com.mojang.brigadier.suggestion.Suggestions,boolean,net.minecraft.client.gui.components.CommandSuggestions$1) -> <init>
-    317:317:java.lang.String access$100(net.minecraft.client.gui.components.CommandSuggestions$SuggestionsList) -> a
-net.minecraft.client.gui.components.ComponentRenderUtils -> dcz:
-    12:12:void <init>() -> <init>
-    14:17:java.lang.String stripColor(java.lang.String,boolean) -> a
-    22:88:java.util.List wrapComponents(net.minecraft.network.chat.Component,int,net.minecraft.client.gui.Font,boolean,boolean) -> a
-net.minecraft.client.gui.components.ContainerObjectSelectionList -> dda:
+    344:356:void <init>(net.minecraft.client.gui.components.CommandSuggestions,int,int,int,java.util.List,boolean) -> <init>
+    359:408:void render(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    411:421:boolean mouseClicked(int,int,int) -> a
+    425:433:boolean mouseScrolled(double) -> a
+    437:456:boolean keyPressed(int,int,int) -> b
+    460:468:void cycle(int) -> a
+    471:486:void select(int) -> b
+    489:498:void useSuggestion() -> a
+    501:507:java.lang.String getNarrationMessage() -> c
+    512:513:void hide() -> b
+    338:338:void <init>(net.minecraft.client.gui.components.CommandSuggestions,int,int,int,java.util.List,boolean,net.minecraft.client.gui.components.CommandSuggestions$1) -> <init>
+    338:338:java.lang.String access$100(net.minecraft.client.gui.components.CommandSuggestions$SuggestionsList) -> a
+net.minecraft.client.gui.components.ComponentRenderUtils -> dnm:
+    net.minecraft.network.chat.FormattedText INDENT -> a
+    14:14:void <init>() -> <init>
+    18:18:java.lang.String stripColor(java.lang.String) -> a
+    22:33:java.util.List wrapComponents(net.minecraft.network.chat.FormattedText,int,net.minecraft.client.gui.Font) -> a
+    24:25:java.util.Optional lambda$wrapComponents$0(net.minecraft.client.ComponentCollector,net.minecraft.network.chat.Style,java.lang.String) -> a
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.ContainerObjectSelectionList -> dnn:
     12:13:void <init>(net.minecraft.client.Minecraft,int,int,int,int,int) -> <init>
-    17:21:boolean changeFocus(boolean) -> changeFocus
-    26:26:boolean isSelectedItem(int) -> isSelectedItem
-net.minecraft.client.gui.components.ContainerObjectSelectionList$Entry -> dda$a:
+    17:21:boolean changeFocus(boolean) -> c_
+    26:26:boolean isSelectedItem(int) -> f
+net.minecraft.client.gui.components.ContainerObjectSelectionList$Entry -> dnn$a:
     net.minecraft.client.gui.components.events.GuiEventListener focused -> a
     boolean dragging -> b
     29:29:void <init>() -> <init>
-    37:37:boolean isDragging() -> isDragging
-    42:43:void setDragging(boolean) -> setDragging
-    47:48:void setFocused(net.minecraft.client.gui.components.events.GuiEventListener) -> setFocused
-    53:53:net.minecraft.client.gui.components.events.GuiEventListener getFocused() -> getFocused
-net.minecraft.client.gui.components.DebugScreenOverlay -> ddb:
+    37:37:boolean isDragging() -> aw_
+    42:43:void setDragging(boolean) -> b_
+    47:48:void setFocused(net.minecraft.client.gui.components.events.GuiEventListener) -> a
+    53:53:net.minecraft.client.gui.components.events.GuiEventListener getFocused() -> r
+net.minecraft.client.gui.components.DebugScreenOverlay -> dno:
     java.util.Map HEIGHTMAP_NAMES -> a
     net.minecraft.client.Minecraft minecraft -> b
     net.minecraft.client.gui.Font font -> c
     net.minecraft.world.phys.HitResult block -> d
     net.minecraft.world.phys.HitResult liquid -> e
-    net.minecraft.world.level.ChunkPos lastPos -> f
-    net.minecraft.world.level.chunk.LevelChunk clientChunk -> g
-    java.util.concurrent.CompletableFuture serverChunk -> h
-    87:90:void <init>(net.minecraft.client.Minecraft) -> <init>
-    93:95:void clearChunkCache() -> a
-    98:130:void render() -> b
-    133:151:void drawGameInformation() -> c
-    154:167:void drawSystemInformation() -> d
-    172:324:java.util.List getGameInformation() -> e
-    329:336:java.lang.String getServerChunkStats() -> g
-    340:341:net.minecraft.world.level.Level getLevel() -> h
-    348:360:net.minecraft.world.level.chunk.LevelChunk getServerChunk() -> i
-    364:367:net.minecraft.world.level.chunk.LevelChunk getClientChunk() -> j
-    372:431:java.util.List getSystemInformation() -> f
-    435:445:java.lang.String getPropertyValueString(java.util.Map$Entry) -> a
-    449:538:void drawChart(net.minecraft.util.FrameTimer,int,int,boolean) -> a
-    545:548:int getSampleColor(int,int,int,int) -> a
-    552:564:int colorLerp(int,int,float) -> a
-    568:568:long bytesToMegabytes(long) -> a
-    353:353:net.minecraft.world.level.chunk.LevelChunk lambda$getServerChunk$4(com.mojang.datafixers.util.Either) -> a
-    353:353:net.minecraft.world.level.chunk.LevelChunk lambda$null$3(net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure) -> a
-    353:353:net.minecraft.world.level.chunk.LevelChunk lambda$null$2(net.minecraft.world.level.chunk.ChunkAccess) -> a
-    341:341:net.minecraft.server.level.ServerLevel lambda$getLevel$1(net.minecraft.client.server.IntegratedServer) -> a
-    67:73:void lambda$static$0(java.util.EnumMap) -> a
-    66:66:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.DebugScreenOverlay$1 -> ddb$1:
+    net.minecraft.world.level.ChunkPos lastPos -> i
+    net.minecraft.world.level.chunk.LevelChunk clientChunk -> j
+    java.util.concurrent.CompletableFuture serverChunk -> k
+    92:95:void <init>(net.minecraft.client.Minecraft) -> <init>
+    98:100:void clearChunkCache() -> a
+    103:135:void render(com.mojang.blaze3d.vertex.PoseStack) -> a
+    138:156:void drawGameInformation(com.mojang.blaze3d.vertex.PoseStack) -> b
+    159:172:void drawSystemInformation(com.mojang.blaze3d.vertex.PoseStack) -> c
+    177:331:java.util.List getGameInformation() -> b
+    336:341:net.minecraft.server.level.ServerLevel getServerLevel() -> d
+    346:350:java.lang.String getServerChunkStats() -> e
+    354:355:net.minecraft.world.level.Level getLevel() -> f
+    362:372:net.minecraft.world.level.chunk.LevelChunk getServerChunk() -> g
+    376:379:net.minecraft.world.level.chunk.LevelChunk getClientChunk() -> h
+    384:443:java.util.List getSystemInformation() -> c
+    447:457:java.lang.String getPropertyValueString(java.util.Map$Entry) -> a
+    461:550:void drawChart(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.util.FrameTimer,int,int,boolean) -> a
+    557:560:int getSampleColor(int,int,int,int) -> a
+    564:576:int colorLerp(int,int,float) -> a
+    580:580:long bytesToMegabytes(long) -> a
+    365:365:net.minecraft.world.level.chunk.LevelChunk lambda$getServerChunk$5(com.mojang.datafixers.util.Either) -> a
+    365:365:net.minecraft.world.level.chunk.LevelChunk lambda$null$4(net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure) -> a
+    365:365:net.minecraft.world.level.chunk.LevelChunk lambda$null$3(net.minecraft.world.level.chunk.ChunkAccess) -> a
+    355:355:java.util.Optional lambda$getLevel$2(net.minecraft.client.server.IntegratedServer) -> a
+    318:318:java.lang.String lambda$getGameInformation$1(it.unimi.dsi.fastutil.objects.Object2IntMap,net.minecraft.world.entity.MobCategory) -> a
+    72:78:void lambda$static$0(java.util.EnumMap) -> a
+    71:71:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.DebugScreenOverlay$1 -> dno$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    200:200:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.EditBox -> ddc:
+    205:205:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.EditBox -> dnp:
     net.minecraft.client.gui.Font font -> a
     java.lang.String value -> b
     int maxLength -> c
     int frame -> d
     boolean bordered -> e
-    boolean canLoseFocus -> f
-    boolean isEditable -> g
-    boolean shiftPressed -> h
-    int displayPos -> i
-    int cursorPos -> j
-    int highlightPos -> k
-    int textColor -> l
-    int textColorUneditable -> m
-    java.lang.String suggestion -> n
-    java.util.function.Consumer responder -> o
-    java.util.function.Predicate filter -> p
-    java.util.function.BiFunction formatter -> q
-    53:54:void <init>(net.minecraft.client.gui.Font,int,int,int,int,java.lang.String) -> <init>
-    35:62:void <init>(net.minecraft.client.gui.Font,int,int,int,int,net.minecraft.client.gui.components.EditBox,java.lang.String) -> <init>
-    65:66:void setResponder(java.util.function.Consumer) -> a
-    69:70:void setFormatter(java.util.function.BiFunction) -> a
-    73:74:void tick() -> a
-    78:82:java.lang.String getNarrationMessage() -> getNarrationMessage
-    86:99:void setValue(java.lang.String) -> a
-    102:102:java.lang.String getValue() -> b
-    106:109:java.lang.String getHighlighted() -> c
-    113:114:void setFilter(java.util.function.Predicate) -> a
-    117:149:void insertText(java.lang.String) -> b
-    152:156:void onValueChange(java.lang.String) -> d
-    159:164:void deleteText(int) -> m
-    167:177:void deleteWords(int) -> a
-    180:212:void deleteChars(int) -> b
-    215:215:int getWordPosition(int) -> c
-    219:219:int getWordPosition(int,int) -> a
-    223:249:int getWordPosition(int,int,boolean) -> a
-    253:254:void moveCursor(int) -> d
-    257:264:void moveCursorTo(int) -> e
-    267:268:void setCursorPosition(int) -> f
-    271:272:void moveCursorToStart() -> d
-    275:276:void moveCursorToEnd() -> e
-    280:349:boolean keyPressed(int,int,int) -> keyPressed
-    353:353:boolean canConsumeInput() -> f
-    358:369:boolean charTyped(char,int) -> charTyped
-    375:396:boolean mouseClicked(double,double,int) -> mouseClicked
-    400:401:void setFocus(boolean) -> a
-    405:463:void renderButton(int,int,float) -> renderButton
-    466:501:void renderHighlight(int,int,int,int) -> a
-    504:510:void setMaxLength(int) -> g
-    513:513:int getMaxLength() -> j
-    517:517:int getCursorPosition() -> g
-    521:521:boolean isBordered() -> k
-    525:526:void setBordered(boolean) -> b
-    529:530:void setTextColor(int) -> h
-    533:534:void setTextColorUneditable(int) -> i
-    538:541:boolean changeFocus(boolean) -> changeFocus
-    546:546:boolean isMouseOver(double,double) -> isMouseOver
-    551:554:void onFocusedChanged(boolean) -> onFocusedChanged
-    557:557:boolean isEditable() -> l
-    561:562:void setEditable(boolean) -> c
-    565:565:int getInnerWidth() -> h
-    569:592:void setHighlightPos(int) -> j
-    595:596:void setCanLoseFocus(boolean) -> d
-    599:599:boolean isVisible() -> i
-    603:604:void setVisible(boolean) -> e
-    607:608:void setSuggestion(java.lang.String) -> c
-    611:614:int getScreenX(int) -> k
-    618:619:void setX(int) -> l
-    50:50:java.lang.String lambda$new$0(java.lang.String,java.lang.Integer) -> a
-net.minecraft.client.gui.components.ImageButton -> ddd:
+    boolean canLoseFocus -> s
+    boolean isEditable -> t
+    boolean shiftPressed -> u
+    int displayPos -> v
+    int cursorPos -> w
+    int highlightPos -> x
+    int textColor -> y
+    int textColorUneditable -> z
+    java.lang.String suggestion -> A
+    java.util.function.Consumer responder -> B
+    java.util.function.Predicate filter -> C
+    java.util.function.BiFunction formatter -> D
+    60:61:void <init>(net.minecraft.client.gui.Font,int,int,int,int,net.minecraft.network.chat.Component) -> <init>
+    42:69:void <init>(net.minecraft.client.gui.Font,int,int,int,int,net.minecraft.client.gui.components.EditBox,net.minecraft.network.chat.Component) -> <init>
+    72:73:void setResponder(java.util.function.Consumer) -> a
+    76:77:void setFormatter(java.util.function.BiFunction) -> a
+    80:81:void tick() -> a
+    85:86:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+    90:103:void setValue(java.lang.String) -> a
+    106:106:java.lang.String getValue() -> b
+    110:113:java.lang.String getHighlighted() -> d
+    117:118:void setFilter(java.util.function.Predicate) -> a
+    121:142:void insertText(java.lang.String) -> b
+    145:149:void onValueChange(java.lang.String) -> d
+    152:157:void deleteText(int) -> q
+    160:170:void deleteWords(int) -> d
+    173:198:void deleteChars(int) -> f
+    201:201:int getWordPosition(int) -> g
+    205:205:int getWordPosition(int,int) -> a
+    209:235:int getWordPosition(int,int,boolean) -> a
+    239:240:void moveCursor(int) -> h
+    243:243:int getCursorPos(int) -> r
+    247:254:void moveCursorTo(int) -> i
+    257:258:void setCursorPosition(int) -> j
+    261:262:void moveCursorToStart() -> k
+    265:266:void moveCursorToEnd() -> l
+    270:339:boolean keyPressed(int,int,int) -> a
+    343:343:boolean canConsumeInput() -> m
+    348:359:boolean charTyped(char,int) -> a
+    365:386:boolean mouseClicked(double,double,int) -> a
+    390:391:void setFocus(boolean) -> e
+    395:454:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    457:492:void renderHighlight(int,int,int,int) -> a
+    495:501:void setMaxLength(int) -> k
+    504:504:int getMaxLength() -> r
+    508:508:int getCursorPosition() -> n
+    512:512:boolean isBordered() -> s
+    516:517:void setBordered(boolean) -> f
+    520:521:void setTextColor(int) -> l
+    524:525:void setTextColorUneditable(int) -> m
+    529:532:boolean changeFocus(boolean) -> c_
+    537:537:boolean isMouseOver(double,double) -> b
+    542:545:void onFocusedChanged(boolean) -> c
+    548:548:boolean isEditable() -> t
+    552:553:void setEditable(boolean) -> g
+    556:556:int getInnerWidth() -> p
+    560:583:void setHighlightPos(int) -> n
+    586:587:void setCanLoseFocus(boolean) -> h
+    590:590:boolean isVisible() -> q
+    594:595:void setVisible(boolean) -> i
+    598:599:void setSuggestion(java.lang.String) -> c
+    602:605:int getScreenX(int) -> o
+    609:610:void setX(int) -> p
+    57:57:java.lang.String lambda$new$0(java.lang.String,java.lang.Integer) -> a
+net.minecraft.client.gui.components.ImageButton -> dnq:
     net.minecraft.resources.ResourceLocation resourceLocation -> a
     int xTexStart -> b
     int yTexStart -> c
     int yDiffTex -> d
     int textureWidth -> e
-    int textureHeight -> f
-    16:17:void <init>(int,int,int,int,int,int,net.minecraft.resources.ResourceLocation,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    20:21:void <init>(int,int,int,int,int,int,int,net.minecraft.resources.ResourceLocation,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    24:25:void <init>(int,int,int,int,int,int,int,net.minecraft.resources.ResourceLocation,int,int,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    28:35:void <init>(int,int,int,int,int,int,int,net.minecraft.resources.ResourceLocation,int,int,net.minecraft.client.gui.components.Button$OnPress,java.lang.String) -> <init>
-    38:40:void setPosition(int,int) -> a
-    44:55:void renderButton(int,int,float) -> renderButton
-net.minecraft.client.gui.components.LerpingBossEvent -> dde:
+    int textureHeight -> v
+    19:20:void <init>(int,int,int,int,int,int,net.minecraft.resources.ResourceLocation,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    23:24:void <init>(int,int,int,int,int,int,int,net.minecraft.resources.ResourceLocation,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    27:28:void <init>(int,int,int,int,int,int,int,net.minecraft.resources.ResourceLocation,int,int,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    31:38:void <init>(int,int,int,int,int,int,int,net.minecraft.resources.ResourceLocation,int,int,net.minecraft.client.gui.components.Button$OnPress,net.minecraft.network.chat.Component) -> <init>
+    41:43:void setPosition(int,int) -> a
+    47:57:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+net.minecraft.client.gui.components.LerpingBossEvent -> dnr:
     float targetPercent -> h
     long setTime -> i
     14:21:void <init>(net.minecraft.network.protocol.game.ClientboundBossEventPacket) -> <init>
     25:28:void setPercent(float) -> a
     32:34:float getPercent() -> k
     38:53:void update(net.minecraft.network.protocol.game.ClientboundBossEventPacket) -> a
-net.minecraft.client.gui.components.LerpingBossEvent$1 -> dde$1:
+net.minecraft.client.gui.components.LerpingBossEvent$1 -> dnr$1:
     int[] $SwitchMap$net$minecraft$network$protocol$game$ClientboundBossEventPacket$Operation -> a
     38:38:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.LockIconButton -> ddf:
+net.minecraft.client.gui.components.LockIconButton -> dns:
     boolean locked -> a
-    11:12:void <init>(int,int,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    16:16:java.lang.String getNarrationMessage() -> getNarrationMessage
-    20:20:boolean isLocked() -> a
-    24:25:void setLocked(boolean) -> a
-    29:42:void renderButton(int,int,float) -> renderButton
-net.minecraft.client.gui.components.LockIconButton$Icon -> ddf$a:
+    13:14:void <init>(int,int,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    18:18:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+    22:22:boolean isLocked() -> a
+    26:27:void setLocked(boolean) -> e
+    31:44:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+net.minecraft.client.gui.components.LockIconButton$Icon -> dns$a:
     net.minecraft.client.gui.components.LockIconButton$Icon LOCKED -> a
     net.minecraft.client.gui.components.LockIconButton$Icon LOCKED_HOVER -> b
     net.minecraft.client.gui.components.LockIconButton$Icon LOCKED_DISABLED -> c
@@ -7953,312 +8201,271 @@ net.minecraft.client.gui.components.LockIconButton$Icon -> ddf$a:
     int x -> g
     int y -> h
     net.minecraft.client.gui.components.LockIconButton$Icon[] $VALUES -> i
-    44:44:net.minecraft.client.gui.components.LockIconButton$Icon[] values() -> values
-    44:44:net.minecraft.client.gui.components.LockIconButton$Icon valueOf(java.lang.String) -> valueOf
-    56:59:void <init>(java.lang.String,int,int,int) -> <init>
-    62:62:int getX() -> a
-    66:66:int getY() -> b
-    44:50:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.ObjectSelectionList -> ddg:
-    boolean inFocus -> inFocus
+    46:46:net.minecraft.client.gui.components.LockIconButton$Icon[] values() -> values
+    46:46:net.minecraft.client.gui.components.LockIconButton$Icon valueOf(java.lang.String) -> valueOf
+    58:61:void <init>(java.lang.String,int,int,int) -> <init>
+    64:64:int getX() -> a
+    68:68:int getY() -> b
+    46:52:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.ObjectSelectionList -> dnt:
+    boolean inFocus -> a
     10:11:void <init>(net.minecraft.client.Minecraft,int,int,int,int,int) -> <init>
-    15:26:boolean changeFocus(boolean) -> changeFocus
-net.minecraft.client.gui.components.ObjectSelectionList$Entry -> ddg$a:
+    15:26:boolean changeFocus(boolean) -> c_
+net.minecraft.client.gui.components.ObjectSelectionList$Entry -> dnt$a:
     29:29:void <init>() -> <init>
-    32:32:boolean changeFocus(boolean) -> changeFocus
-net.minecraft.client.gui.components.OptionButton -> ddh:
+    32:32:boolean changeFocus(boolean) -> c_
+net.minecraft.client.gui.components.OptionButton -> dnu:
     net.minecraft.client.Option option -> a
-    9:11:void <init>(int,int,int,int,net.minecraft.client.Option,java.lang.String,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    14:14:net.minecraft.client.Option getOption() -> a
-net.minecraft.client.gui.components.OptionsList -> ddi:
-    14:16:void <init>(net.minecraft.client.Minecraft,int,int,int,int,int) -> <init>
-    19:19:int addBig(net.minecraft.client.Option) -> a
-    23:24:void addSmall(net.minecraft.client.Option,net.minecraft.client.Option) -> a
-    27:30:void addSmall(net.minecraft.client.Option[]) -> a
-    34:34:int getRowWidth() -> getRowWidth
-    39:39:int getScrollbarPosition() -> getScrollbarPosition
-net.minecraft.client.gui.components.OptionsList$Entry -> ddi$a:
+    10:12:void <init>(int,int,int,int,net.minecraft.client.Option,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    15:15:net.minecraft.client.Option getOption() -> a
+net.minecraft.client.gui.components.OptionsList -> dnv:
+    16:18:void <init>(net.minecraft.client.Minecraft,int,int,int,int,int) -> <init>
+    21:21:int addBig(net.minecraft.client.Option) -> a
+    25:26:void addSmall(net.minecraft.client.Option,net.minecraft.client.Option) -> a
+    29:32:void addSmall(net.minecraft.client.Option[]) -> a
+    36:36:int getRowWidth() -> d
+    41:41:int getScrollbarPosition() -> e
+    45:52:java.util.Optional getMouseOver(double,double) -> c
+net.minecraft.client.gui.components.OptionsList$Entry -> dnv$a:
     java.util.List children -> a
-    45:47:void <init>(java.util.List) -> <init>
-    50:50:net.minecraft.client.gui.components.OptionsList$Entry big(net.minecraft.client.Options,int,net.minecraft.client.Option) -> a
-    54:58:net.minecraft.client.gui.components.OptionsList$Entry small(net.minecraft.client.Options,int,net.minecraft.client.Option,net.minecraft.client.Option) -> a
-    63:67:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    71:71:java.util.List children() -> children
-    64:66:void lambda$render$0(int,int,int,float,net.minecraft.client.gui.components.AbstractWidget) -> a
-net.minecraft.client.gui.components.PlayerTabOverlay -> ddj:
+    58:60:void <init>(java.util.List) -> <init>
+    63:63:net.minecraft.client.gui.components.OptionsList$Entry big(net.minecraft.client.Options,int,net.minecraft.client.Option) -> a
+    67:71:net.minecraft.client.gui.components.OptionsList$Entry small(net.minecraft.client.Options,int,net.minecraft.client.Option,net.minecraft.client.Option) -> a
+    76:80:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    84:84:java.util.List children() -> av_
+    77:79:void lambda$render$0(int,com.mojang.blaze3d.vertex.PoseStack,int,int,float,net.minecraft.client.gui.components.AbstractWidget) -> a
+    55:55:java.util.List access$000(net.minecraft.client.gui.components.OptionsList$Entry) -> a
+net.minecraft.client.gui.components.PlayerTabOverlay -> dnw:
     com.google.common.collect.Ordering PLAYER_ORDERING -> a
     net.minecraft.client.Minecraft minecraft -> b
     net.minecraft.client.gui.Gui gui -> c
     net.minecraft.network.chat.Component footer -> d
     net.minecraft.network.chat.Component header -> e
-    long visibilityId -> f
-    boolean visible -> g
-    49:52:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.gui.Gui) -> <init>
-    55:58:net.minecraft.network.chat.Component getNameForDisplay(net.minecraft.client.multiplayer.PlayerInfo) -> a
-    63:67:void setVisible(boolean) -> a
-    70:207:void render(int,net.minecraft.world.scores.Scoreboard,net.minecraft.world.scores.Objective) -> a
-    210:232:void renderPingIcon(int,int,int,net.minecraft.client.multiplayer.PlayerInfo) -> a
-    235:307:void renderTablistScore(net.minecraft.world.scores.Objective,int,java.lang.String,int,int,net.minecraft.client.multiplayer.PlayerInfo) -> a
-    310:311:void setFooter(net.minecraft.network.chat.Component) -> a
-    314:315:void setHeader(net.minecraft.network.chat.Component) -> b
-    318:320:void reset() -> a
-    31:31:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.PlayerTabOverlay$1 -> ddj$1:
-net.minecraft.client.gui.components.PlayerTabOverlay$PlayerInfoComparator -> ddj$a:
-    322:322:void <init>() -> <init>
-    325:335:int compare(net.minecraft.client.multiplayer.PlayerInfo,net.minecraft.client.multiplayer.PlayerInfo) -> a
-    322:322:int compare(java.lang.Object,java.lang.Object) -> compare
-    322:322:void <init>(net.minecraft.client.gui.components.PlayerTabOverlay$1) -> <init>
-net.minecraft.client.gui.components.ScrolledSelectionList -> ddk:
-    int NO_DRAG -> NO_DRAG
-    int DRAG_OUTSIDE -> DRAG_OUTSIDE
-    net.minecraft.client.Minecraft minecraft -> minecraft
-    int width -> width
-    int height -> height
-    int y0 -> y0
-    int y1 -> y1
-    int x1 -> x1
-    int x0 -> x0
-    int itemHeight -> itemHeight
-    boolean centerListVertically -> centerListVertically
-    int yDrag -> yDrag
-    double yo -> yo
-    boolean visible -> visible
-    boolean renderSelection -> renderSelection
-    boolean renderHeader -> renderHeader
-    int headerHeight -> headerHeight
-    boolean scrolling -> scrolling
-    31:51:void <init>(net.minecraft.client.Minecraft,int,int,int,int,int) -> <init>
-    54:60:void updateSize(int,int,int,int) -> updateSize
-    63:64:void setRenderSelection(boolean) -> setRenderSelection
-    67:73:void setRenderHeader(boolean,int) -> setRenderHeader
-    76:77:void setVisible(boolean) -> setVisible
-    80:80:boolean isVisible() -> isVisible
-    int getItemCount() -> getItemCount
-    87:87:java.util.List children() -> children
-    91:91:boolean selectItem(int,int,double,double) -> selectItem
-    boolean isSelectedItem(int) -> isSelectedItem
-    97:97:int getMaxPosition() -> getMaxPosition
-    void renderBackground() -> renderBackground
-    103:103:void updateItemPosition(int,int,int,float) -> updateItemPosition
-    void renderItem(int,int,int,int,int,int,float) -> renderItem
-    108:108:void renderHeader(int,int,com.mojang.blaze3d.vertex.Tesselator) -> renderHeader
-    111:111:void clickedHeader(int,int) -> clickedHeader
-    114:114:void renderDecorations(int,int) -> renderDecorations
-    117:125:int getItemAtPosition(double,double) -> getItemAtPosition
-    129:130:void capYPosition() -> capYPosition
-    133:133:int getMaxScroll() -> getMaxScroll
-    137:139:void centerScrollOn(int) -> centerScrollOn
-    142:142:int getScroll() -> getScroll
-    146:146:boolean isMouseInList(double,double) -> isMouseInList
-    150:150:int getScrollBottom() -> getScrollBottom
-    154:157:void scroll(int) -> scroll
-    161:260:void render(int,int,float) -> render
-    263:264:void updateScrollingState(double,double,int) -> updateScrollingState
-    268:283:boolean mouseClicked(double,double,int) -> mouseClicked
-    288:291:boolean mouseReleased(double,double,int) -> mouseReleased
-    296:321:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    326:330:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    336:349:boolean keyPressed(int,int,int) -> keyPressed
-    353:353:void moveSelection(int) -> moveSelection
-    357:360:boolean charTyped(char,int) -> charTyped
-    365:365:boolean isMouseOver(double,double) -> isMouseOver
-    369:369:int getRowWidth() -> getRowWidth
-    373:411:void renderList(int,int,int,int,float) -> renderList
-    414:414:boolean isFocused() -> isFocused
-    418:418:int getScrollbarPosition() -> getScrollbarPosition
-    422:433:void renderHoleBackground(int,int,int,int) -> renderHoleBackground
-    436:438:void setLeftPos(int) -> setLeftPos
-    441:441:int getItemHeight() -> getItemHeight
-net.minecraft.client.gui.components.SliderButton -> ddl:
-    net.minecraft.client.ProgressOption option -> a
+    long visibilityId -> i
+    boolean visible -> j
+    52:55:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.gui.Gui) -> <init>
+    58:61:net.minecraft.network.chat.Component getNameForDisplay(net.minecraft.client.multiplayer.PlayerInfo) -> a
+    66:66:net.minecraft.network.chat.Component decorateName(net.minecraft.client.multiplayer.PlayerInfo,net.minecraft.network.chat.MutableComponent) -> a
+    70:74:void setVisible(boolean) -> a
+    77:209:void render(com.mojang.blaze3d.vertex.PoseStack,int,net.minecraft.world.scores.Scoreboard,net.minecraft.world.scores.Objective) -> a
+    212:234:void renderPingIcon(com.mojang.blaze3d.vertex.PoseStack,int,int,int,net.minecraft.client.multiplayer.PlayerInfo) -> a
+    237:309:void renderTablistScore(net.minecraft.world.scores.Objective,int,java.lang.String,int,int,net.minecraft.client.multiplayer.PlayerInfo,com.mojang.blaze3d.vertex.PoseStack) -> a
+    312:313:void setFooter(net.minecraft.network.chat.Component) -> a
+    316:317:void setHeader(net.minecraft.network.chat.Component) -> b
+    320:322:void reset() -> a
+    34:34:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.PlayerTabOverlay$1 -> dnw$1:
+net.minecraft.client.gui.components.PlayerTabOverlay$PlayerInfoComparator -> dnw$a:
+    324:324:void <init>() -> <init>
+    327:337:int compare(net.minecraft.client.multiplayer.PlayerInfo,net.minecraft.client.multiplayer.PlayerInfo) -> a
+    324:324:int compare(java.lang.Object,java.lang.Object) -> compare
+    324:324:void <init>(net.minecraft.client.gui.components.PlayerTabOverlay$1) -> <init>
+net.minecraft.client.gui.components.SliderButton -> dnx:
+    net.minecraft.client.ProgressOption option -> c
     10:13:void <init>(net.minecraft.client.Options,int,int,int,int,net.minecraft.client.ProgressOption) -> <init>
-    17:19:void applyValue() -> applyValue
-    23:24:void updateMessage() -> updateMessage
-net.minecraft.client.gui.components.StateSwitchingButton -> ddm:
+    17:19:void applyValue() -> a
+    23:24:void updateMessage() -> b
+net.minecraft.client.gui.components.StateSwitchingButton -> dny:
     net.minecraft.resources.ResourceLocation resourceLocation -> a
     boolean isStateTriggered -> b
     int xTexStart -> c
     int yTexStart -> d
     int xDiffTex -> e
-    int yDiffTex -> f
-    16:18:void <init>(int,int,int,int,boolean) -> <init>
-    21:26:void initTextureValues(int,int,int,int,net.minecraft.resources.ResourceLocation) -> a
-    29:30:void setStateTriggered(boolean) -> a
-    33:33:boolean isStateTriggered() -> a
-    37:39:void setPosition(int,int) -> a
-    43:58:void renderButton(int,int,float) -> renderButton
-net.minecraft.client.gui.components.SubtitleOverlay -> ddn:
+    int yDiffTex -> s
+    18:20:void <init>(int,int,int,int,boolean) -> <init>
+    23:28:void initTextureValues(int,int,int,int,net.minecraft.resources.ResourceLocation) -> a
+    31:32:void setStateTriggered(boolean) -> e
+    35:35:boolean isStateTriggered() -> a
+    39:41:void setPosition(int,int) -> a
+    45:60:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+net.minecraft.client.gui.components.SubtitleOverlay -> dnz:
     net.minecraft.client.Minecraft minecraft -> a
     java.util.List subtitles -> b
     boolean isListening -> c
-    21:26:void <init>(net.minecraft.client.Minecraft) -> <init>
-    29:102:void render() -> a
-    106:120:void onPlaySound(net.minecraft.client.resources.sounds.SoundInstance,net.minecraft.client.sounds.WeighedSoundEvents) -> a
-net.minecraft.client.gui.components.SubtitleOverlay$Subtitle -> ddn$a:
-    java.lang.String text -> b
+    23:28:void <init>(net.minecraft.client.Minecraft) -> <init>
+    31:104:void render(com.mojang.blaze3d.vertex.PoseStack) -> a
+    108:122:void onPlaySound(net.minecraft.client.resources.sounds.SoundInstance,net.minecraft.client.sounds.WeighedSoundEvents) -> a
+net.minecraft.client.gui.components.SubtitleOverlay$Subtitle -> dnz$a:
+    net.minecraft.network.chat.Component text -> b
     long time -> c
     net.minecraft.world.phys.Vec3 location -> d
     net.minecraft.client.gui.components.SubtitleOverlay this$0 -> a
-    127:131:void <init>(net.minecraft.client.gui.components.SubtitleOverlay,java.lang.String,net.minecraft.world.phys.Vec3) -> <init>
-    134:134:java.lang.String getText() -> a
-    138:138:long getTime() -> b
-    142:142:net.minecraft.world.phys.Vec3 getLocation() -> c
-    146:148:void refresh(net.minecraft.world.phys.Vec3) -> a
-net.minecraft.client.gui.components.VolumeSlider -> ddo:
-    net.minecraft.sounds.SoundSource source -> a
-    11:15:void <init>(net.minecraft.client.Minecraft,int,int,net.minecraft.sounds.SoundSource,int) -> <init>
-    19:21:void updateMessage() -> updateMessage
-    25:27:void applyValue() -> applyValue
-net.minecraft.client.gui.components.Widget -> ddp:
-    void render(int,int,float) -> render
-net.minecraft.client.gui.components.events.AbstractContainerEventHandler -> ddq:
-    net.minecraft.client.gui.components.events.GuiEventListener focused -> focused
-    boolean isDragging -> isDragging
+    129:133:void <init>(net.minecraft.client.gui.components.SubtitleOverlay,net.minecraft.network.chat.Component,net.minecraft.world.phys.Vec3) -> <init>
+    136:136:net.minecraft.network.chat.Component getText() -> a
+    140:140:long getTime() -> b
+    144:144:net.minecraft.world.phys.Vec3 getLocation() -> c
+    148:150:void refresh(net.minecraft.world.phys.Vec3) -> a
+net.minecraft.client.gui.components.TickableWidget -> doa:
+    void tick() -> d
+net.minecraft.client.gui.components.VolumeSlider -> dob:
+    net.minecraft.sounds.SoundSource source -> c
+    14:18:void <init>(net.minecraft.client.Minecraft,int,int,net.minecraft.sounds.SoundSource,int) -> <init>
+    22:24:void updateMessage() -> b
+    28:30:void applyValue() -> a
+net.minecraft.client.gui.components.Widget -> doc:
+    void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+net.minecraft.client.gui.components.events.AbstractContainerEventHandler -> dod:
+    net.minecraft.client.gui.components.events.GuiEventListener focused -> a
+    boolean isDragging -> b
     13:13:void <init>() -> <init>
-    21:21:boolean isDragging() -> isDragging
-    26:27:void setDragging(boolean) -> setDragging
-    32:32:net.minecraft.client.gui.components.events.GuiEventListener getFocused() -> getFocused
-    37:38:void setFocused(net.minecraft.client.gui.components.events.GuiEventListener) -> setFocused
-net.minecraft.client.gui.components.events.ContainerEventHandler -> ddr:
-    java.util.List children() -> children
-    16:21:java.util.Optional getChildAt(double,double) -> a
-    26:35:boolean mouseClicked(double,double,int) -> mouseClicked
-    40:41:boolean mouseReleased(double,double,int) -> mouseReleased
-    46:49:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    boolean isDragging() -> isDragging
-    void setDragging(boolean) -> setDragging
-    58:58:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    64:64:boolean keyPressed(int,int,int) -> keyPressed
-    69:69:boolean keyReleased(int,int,int) -> a
-    74:74:boolean charTyped(char,int) -> charTyped
-    net.minecraft.client.gui.components.events.GuiEventListener getFocused() -> getFocused
-    void setFocused(net.minecraft.client.gui.components.events.GuiEventListener) -> setFocused
-    83:84:void setInitialFocus(net.minecraft.client.gui.components.events.GuiEventListener) -> a
-    87:88:void magicalSpecialHackyFocus(net.minecraft.client.gui.components.events.GuiEventListener) -> b
-    98:135:boolean changeFocus(boolean) -> changeFocus
+    21:21:boolean isDragging() -> aw_
+    26:27:void setDragging(boolean) -> b_
+    32:32:net.minecraft.client.gui.components.events.GuiEventListener getFocused() -> r
+    37:38:void setFocused(net.minecraft.client.gui.components.events.GuiEventListener) -> a
+net.minecraft.client.gui.components.events.ContainerEventHandler -> doe:
+    java.util.List children() -> av_
+    16:21:java.util.Optional getChildAt(double,double) -> d
+    26:35:boolean mouseClicked(double,double,int) -> a
+    40:41:boolean mouseReleased(double,double,int) -> c
+    46:49:boolean mouseDragged(double,double,int,double,double) -> a
+    boolean isDragging() -> aw_
+    void setDragging(boolean) -> b_
+    58:58:boolean mouseScrolled(double,double,double) -> a
+    64:64:boolean keyPressed(int,int,int) -> a
+    69:69:boolean keyReleased(int,int,int) -> b
+    74:74:boolean charTyped(char,int) -> a
+    net.minecraft.client.gui.components.events.GuiEventListener getFocused() -> r
+    void setFocused(net.minecraft.client.gui.components.events.GuiEventListener) -> a
+    83:85:void setInitialFocus(net.minecraft.client.gui.components.events.GuiEventListener) -> b
+    88:89:void magicalSpecialHackyFocus(net.minecraft.client.gui.components.events.GuiEventListener) -> c
+    99:136:boolean changeFocus(boolean) -> c_
     58:58:boolean lambda$mouseScrolled$1(double,double,double,net.minecraft.client.gui.components.events.GuiEventListener) -> a
     41:41:boolean lambda$mouseReleased$0(double,double,int,net.minecraft.client.gui.components.events.GuiEventListener) -> a
-net.minecraft.client.gui.components.events.GuiEventListener -> dds:
-    9:9:void mouseMoved(double,double) -> b
-    12:12:boolean mouseClicked(double,double,int) -> mouseClicked
-    16:16:boolean mouseReleased(double,double,int) -> mouseReleased
-    20:20:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    24:24:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    28:28:boolean keyPressed(int,int,int) -> keyPressed
-    32:32:boolean keyReleased(int,int,int) -> a
-    36:36:boolean charTyped(char,int) -> charTyped
-    44:44:boolean changeFocus(boolean) -> changeFocus
-    48:48:boolean isMouseOver(double,double) -> isMouseOver
-net.minecraft.client.gui.components.events.package-info -> ddt:
-net.minecraft.client.gui.components.package-info -> ddu:
-net.minecraft.client.gui.components.spectator.SpectatorGui -> ddv:
+net.minecraft.client.gui.components.events.GuiEventListener -> dof:
+    9:9:void mouseMoved(double,double) -> e
+    12:12:boolean mouseClicked(double,double,int) -> a
+    16:16:boolean mouseReleased(double,double,int) -> c
+    20:20:boolean mouseDragged(double,double,int,double,double) -> a
+    24:24:boolean mouseScrolled(double,double,double) -> a
+    28:28:boolean keyPressed(int,int,int) -> a
+    32:32:boolean keyReleased(int,int,int) -> b
+    36:36:boolean charTyped(char,int) -> a
+    44:44:boolean changeFocus(boolean) -> c_
+    48:48:boolean isMouseOver(double,double) -> b
+net.minecraft.client.gui.components.events.package-info -> dog:
+net.minecraft.client.gui.components.package-info -> doh:
+net.minecraft.client.gui.components.spectator.SpectatorGui -> doi:
     net.minecraft.resources.ResourceLocation WIDGETS_LOCATION -> b
     net.minecraft.resources.ResourceLocation SPECTATOR_LOCATION -> a
     net.minecraft.client.Minecraft minecraft -> c
     long lastSelectionTime -> d
     net.minecraft.client.gui.spectator.SpectatorMenu menu -> e
-    24:26:void <init>(net.minecraft.client.Minecraft) -> <init>
-    29:36:void onHotbarSelected(int) -> a
-    39:40:float getHotbarAlpha() -> d
-    44:64:void renderHotbar(float) -> a
-    67:84:void renderPage(float,int,int,net.minecraft.client.gui.spectator.categories.SpectatorPage) -> a
-    87:104:void renderSlot(int,int,float,float,net.minecraft.client.gui.spectator.SpectatorMenuItem) -> a
-    107:125:void renderTooltip() -> a
-    129:131:void onSpectatorMenuClosed(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-    134:134:boolean isMenuActive() -> b
-    138:147:void onMouseScrolled(double) -> a
-    150:160:void onMouseMiddleClick() -> c
-    15:16:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.spectator.package-info -> ddw:
-net.minecraft.client.gui.components.toasts.AdvancementToast -> ddx:
+    26:28:void <init>(net.minecraft.client.Minecraft) -> <init>
+    31:38:void onHotbarSelected(int) -> a
+    41:42:float getHotbarAlpha() -> c
+    46:66:void renderHotbar(com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    69:86:void renderPage(com.mojang.blaze3d.vertex.PoseStack,float,int,int,net.minecraft.client.gui.spectator.categories.SpectatorPage) -> a
+    89:106:void renderSlot(com.mojang.blaze3d.vertex.PoseStack,int,int,float,float,net.minecraft.client.gui.spectator.SpectatorMenuItem) -> a
+    109:127:void renderTooltip(com.mojang.blaze3d.vertex.PoseStack) -> a
+    131:133:void onSpectatorMenuClosed(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
+    136:136:boolean isMenuActive() -> a
+    140:149:void onMouseScrolled(double) -> a
+    152:162:void onMouseMiddleClick() -> b
+    17:18:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.spectator.package-info -> doj:
+net.minecraft.client.gui.components.toasts.AdvancementToast -> dok:
     net.minecraft.advancements.Advancement advancement -> c
     boolean playedSound -> d
-    18:20:void <init>(net.minecraft.advancements.Advancement) -> <init>
-    24:62:net.minecraft.client.gui.components.toasts.Toast$Visibility render(net.minecraft.client.gui.components.toasts.ToastComponent,long) -> a
-net.minecraft.client.gui.components.toasts.RecipeToast -> ddy:
+    20:22:void <init>(net.minecraft.advancements.Advancement) -> <init>
+    26:64:net.minecraft.client.gui.components.toasts.Toast$Visibility render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.components.toasts.ToastComponent,long) -> a
+net.minecraft.client.gui.components.toasts.RecipeToast -> dol:
     java.util.List recipes -> c
     long lastChanged -> d
     boolean changed -> e
-    14:20:void <init>(net.minecraft.world.item.crafting.Recipe) -> <init>
-    24:49:net.minecraft.client.gui.components.toasts.Toast$Visibility render(net.minecraft.client.gui.components.toasts.ToastComponent,long) -> a
-    53:56:void addItem(net.minecraft.world.item.crafting.Recipe) -> a
-    59:65:void addOrUpdate(net.minecraft.client.gui.components.toasts.ToastComponent,net.minecraft.world.item.crafting.Recipe) -> a
-net.minecraft.client.gui.components.toasts.SystemToast -> ddz:
+    15:21:void <init>(net.minecraft.world.item.crafting.Recipe) -> <init>
+    25:50:net.minecraft.client.gui.components.toasts.Toast$Visibility render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.components.toasts.ToastComponent,long) -> a
+    54:57:void addItem(net.minecraft.world.item.crafting.Recipe) -> a
+    60:66:void addOrUpdate(net.minecraft.client.gui.components.toasts.ToastComponent,net.minecraft.world.item.crafting.Recipe) -> a
+net.minecraft.client.gui.components.toasts.SystemToast -> dom:
     net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds id -> c
-    java.lang.String title -> d
-    java.lang.String message -> e
+    net.minecraft.network.chat.FormattedText title -> d
+    java.util.List messageLines -> e
     long lastChanged -> f
     boolean changed -> g
-    17:21:void <init>(net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
-    25:41:net.minecraft.client.gui.components.toasts.Toast$Visibility render(net.minecraft.client.gui.components.toasts.ToastComponent,long) -> a
-    45:48:void reset(net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> a
-    52:52:net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds getToken() -> a
-    63:69:void addOrUpdate(net.minecraft.client.gui.components.toasts.ToastComponent,net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> a
-    8:8:java.lang.Object getToken() -> b
-net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds -> ddz$a:
+    int width -> h
+    29:30:void <init>(net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
+    33:36:net.minecraft.client.gui.components.toasts.SystemToast multiline(net.minecraft.client.Minecraft,net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> a
+    39:44:void <init>(net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds,net.minecraft.network.chat.Component,java.util.List,int) -> <init>
+    47:47:com.google.common.collect.ImmutableList nullToEmpty(net.minecraft.network.chat.Component) -> a
+    52:52:int width() -> a
+    57:91:net.minecraft.client.gui.components.toasts.Toast$Visibility render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.components.toasts.ToastComponent,long) -> a
+    95:103:void renderBackgroundRow(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.components.toasts.ToastComponent,int,int,int,int) -> a
+    106:109:void reset(net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> a
+    113:113:net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds getToken() -> b
+    128:129:void add(net.minecraft.client.gui.components.toasts.ToastComponent,net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> a
+    132:138:void addOrUpdate(net.minecraft.client.gui.components.toasts.ToastComponent,net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> b
+    141:142:void onWorldAccessFailure(net.minecraft.client.Minecraft,java.lang.String) -> a
+    145:146:void onWorldDeleteFailure(net.minecraft.client.Minecraft,java.lang.String) -> b
+    149:150:void onPackCopyFailure(net.minecraft.client.Minecraft,java.lang.String) -> c
+    17:17:java.lang.Object getToken() -> c
+net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds -> dom$a:
     net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds TUTORIAL_HINT -> a
     net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds NARRATOR_TOGGLE -> b
     net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds WORLD_BACKUP -> c
-    net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds PACK_LOAD_FAILURE -> d
-    net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds[] $VALUES -> e
-    55:55:net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds[] values() -> values
-    55:55:net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds valueOf(java.lang.String) -> valueOf
-    55:55:void <init>(java.lang.String,int) -> <init>
-    55:59:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.toasts.Toast -> dea:
+    net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds WORLD_GEN_SETTINGS_TRANSFER -> d
+    net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds PACK_LOAD_FAILURE -> e
+    net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds WORLD_ACCESS_FAILURE -> f
+    net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds PACK_COPY_FAILURE -> g
+    net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds[] $VALUES -> h
+    116:116:net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds[] values() -> values
+    116:116:net.minecraft.client.gui.components.toasts.SystemToast$SystemToastIds valueOf(java.lang.String) -> valueOf
+    116:116:void <init>(java.lang.String,int) -> <init>
+    116:123:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.toasts.Toast -> don:
     net.minecraft.resources.ResourceLocation TEXTURE -> a
     java.lang.Object NO_TOKEN -> b
-    net.minecraft.client.gui.components.toasts.Toast$Visibility render(net.minecraft.client.gui.components.toasts.ToastComponent,long) -> a
-    18:18:java.lang.Object getToken() -> b
-    10:11:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.toasts.Toast$Visibility -> dea$a:
+    net.minecraft.client.gui.components.toasts.Toast$Visibility render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.components.toasts.ToastComponent,long) -> a
+    17:17:java.lang.Object getToken() -> c
+    21:21:int width() -> a
+    25:25:int height() -> d
+    11:12:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.toasts.Toast$Visibility -> don$a:
     net.minecraft.client.gui.components.toasts.Toast$Visibility SHOW -> a
     net.minecraft.client.gui.components.toasts.Toast$Visibility HIDE -> b
     net.minecraft.sounds.SoundEvent soundEvent -> c
     net.minecraft.client.gui.components.toasts.Toast$Visibility[] $VALUES -> d
-    21:21:net.minecraft.client.gui.components.toasts.Toast$Visibility[] values() -> values
-    21:21:net.minecraft.client.gui.components.toasts.Toast$Visibility valueOf(java.lang.String) -> valueOf
-    28:30:void <init>(java.lang.String,int,net.minecraft.sounds.SoundEvent) -> <init>
-    33:34:void playSound(net.minecraft.client.sounds.SoundManager) -> a
-    21:23:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.toasts.ToastComponent -> deb:
+    28:28:net.minecraft.client.gui.components.toasts.Toast$Visibility[] values() -> values
+    28:28:net.minecraft.client.gui.components.toasts.Toast$Visibility valueOf(java.lang.String) -> valueOf
+    35:37:void <init>(java.lang.String,int,net.minecraft.sounds.SoundEvent) -> <init>
+    40:41:void playSound(net.minecraft.client.sounds.SoundManager) -> a
+    28:30:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.toasts.ToastComponent -> doo:
     net.minecraft.client.Minecraft minecraft -> a
     net.minecraft.client.gui.components.toasts.ToastComponent$ToastInstance[] visible -> b
     java.util.Deque queued -> c
-    18:23:void <init>(net.minecraft.client.Minecraft) -> <init>
-    26:39:void render() -> a
-    44:54:net.minecraft.client.gui.components.toasts.Toast getToast(java.lang.Class,java.lang.Object) -> a
-    58:61:void clear() -> b
-    64:65:void addToast(net.minecraft.client.gui.components.toasts.Toast) -> a
-    68:68:net.minecraft.client.Minecraft getMinecraft() -> c
-    14:14:net.minecraft.client.Minecraft access$100(net.minecraft.client.gui.components.toasts.ToastComponent) -> a
-net.minecraft.client.gui.components.toasts.ToastComponent$1 -> deb$1:
-net.minecraft.client.gui.components.toasts.ToastComponent$ToastInstance -> deb$a:
+    19:24:void <init>(net.minecraft.client.Minecraft) -> <init>
+    27:40:void render(com.mojang.blaze3d.vertex.PoseStack) -> a
+    45:55:net.minecraft.client.gui.components.toasts.Toast getToast(java.lang.Class,java.lang.Object) -> a
+    59:62:void clear() -> a
+    65:66:void addToast(net.minecraft.client.gui.components.toasts.Toast) -> a
+    69:69:net.minecraft.client.Minecraft getMinecraft() -> b
+    15:15:net.minecraft.client.Minecraft access$100(net.minecraft.client.gui.components.toasts.ToastComponent) -> a
+net.minecraft.client.gui.components.toasts.ToastComponent$1 -> doo$1:
+net.minecraft.client.gui.components.toasts.ToastComponent$ToastInstance -> doo$a:
     net.minecraft.client.gui.components.toasts.Toast toast -> b
     long animationTime -> c
     long visibleTime -> d
     net.minecraft.client.gui.components.toasts.Toast$Visibility visibility -> e
     net.minecraft.client.gui.components.toasts.ToastComponent this$0 -> a
-    75:81:void <init>(net.minecraft.client.gui.components.toasts.ToastComponent,net.minecraft.client.gui.components.toasts.Toast) -> <init>
-    84:84:net.minecraft.client.gui.components.toasts.Toast getToast() -> a
-    88:93:float getVisibility(long) -> a
-    98:120:boolean render(int,int) -> a
-    71:71:void <init>(net.minecraft.client.gui.components.toasts.ToastComponent,net.minecraft.client.gui.components.toasts.Toast,net.minecraft.client.gui.components.toasts.ToastComponent$1) -> <init>
-net.minecraft.client.gui.components.toasts.TutorialToast -> dec:
+    76:82:void <init>(net.minecraft.client.gui.components.toasts.ToastComponent,net.minecraft.client.gui.components.toasts.Toast) -> <init>
+    85:85:net.minecraft.client.gui.components.toasts.Toast getToast() -> a
+    89:94:float getVisibility(long) -> a
+    99:121:boolean render(int,int,com.mojang.blaze3d.vertex.PoseStack) -> a
+    72:72:void <init>(net.minecraft.client.gui.components.toasts.ToastComponent,net.minecraft.client.gui.components.toasts.Toast,net.minecraft.client.gui.components.toasts.ToastComponent$1) -> <init>
+net.minecraft.client.gui.components.toasts.TutorialToast -> dop:
     net.minecraft.client.gui.components.toasts.TutorialToast$Icons icon -> c
-    java.lang.String title -> d
-    java.lang.String message -> e
+    net.minecraft.network.chat.Component title -> d
+    net.minecraft.network.chat.Component message -> e
     net.minecraft.client.gui.components.toasts.Toast$Visibility visibility -> f
     long lastProgressTime -> g
     float lastProgress -> h
     float progress -> i
     boolean progressable -> j
-    19:30:void <init>(net.minecraft.client.gui.components.toasts.TutorialToast$Icons,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,boolean) -> <init>
-    34:60:net.minecraft.client.gui.components.toasts.Toast$Visibility render(net.minecraft.client.gui.components.toasts.ToastComponent,long) -> a
-    64:65:void hide() -> a
-    68:69:void updateProgress(float) -> a
-net.minecraft.client.gui.components.toasts.TutorialToast$Icons -> dec$a:
+    20:31:void <init>(net.minecraft.client.gui.components.toasts.TutorialToast$Icons,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,boolean) -> <init>
+    35:61:net.minecraft.client.gui.components.toasts.Toast$Visibility render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.components.toasts.ToastComponent,long) -> a
+    65:66:void hide() -> b
+    69:70:void updateProgress(float) -> a
+net.minecraft.client.gui.components.toasts.TutorialToast$Icons -> dop$a:
     net.minecraft.client.gui.components.toasts.TutorialToast$Icons MOVEMENT_KEYS -> a
     net.minecraft.client.gui.components.toasts.TutorialToast$Icons MOUSE -> b
     net.minecraft.client.gui.components.toasts.TutorialToast$Icons TREE -> c
@@ -8267,79 +8474,78 @@ net.minecraft.client.gui.components.toasts.TutorialToast$Icons -> dec$a:
     int x -> f
     int y -> g
     net.minecraft.client.gui.components.toasts.TutorialToast$Icons[] $VALUES -> h
-    71:71:net.minecraft.client.gui.components.toasts.TutorialToast$Icons[] values() -> values
-    71:71:net.minecraft.client.gui.components.toasts.TutorialToast$Icons valueOf(java.lang.String) -> valueOf
-    82:85:void <init>(java.lang.String,int,int,int) -> <init>
-    88:91:void render(net.minecraft.client.gui.GuiComponent,int,int) -> a
-    71:76:void <clinit>() -> <clinit>
-net.minecraft.client.gui.components.toasts.package-info -> ded:
-net.minecraft.client.gui.font.AllMissingGlyphProvider -> dee:
-    9:9:void <init>() -> <init>
-    13:13:com.mojang.blaze3d.font.RawGlyph getGlyph(char) -> a
-net.minecraft.client.gui.font.FontManager -> def:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    java.util.Map fonts -> b
-    net.minecraft.client.renderer.texture.TextureManager textureManager -> c
-    boolean forceUnicode -> d
-    net.minecraft.server.packs.resources.PreparableReloadListener reloadListener -> e
-    43:52:void <init>(net.minecraft.client.renderer.texture.TextureManager,boolean) -> <init>
-    151:151:net.minecraft.client.gui.Font get(net.minecraft.resources.ResourceLocation) -> a
-    159:173:void setForceUnicode(boolean,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
-    176:176:net.minecraft.server.packs.resources.PreparableReloadListener getReloadListener() -> a
-    181:182:void close() -> close
-    152:154:net.minecraft.client.gui.Font lambda$get$0(net.minecraft.resources.ResourceLocation) -> b
-    39:39:boolean access$000(net.minecraft.client.gui.font.FontManager) -> a
-    39:39:org.apache.logging.log4j.Logger access$100() -> b
-    39:39:java.util.Map access$200(net.minecraft.client.gui.font.FontManager) -> b
-    39:39:net.minecraft.client.renderer.texture.TextureManager access$300(net.minecraft.client.gui.font.FontManager) -> c
-    40:40:void <clinit>() -> <clinit>
-net.minecraft.client.gui.font.FontManager$1 -> def$1:
-    net.minecraft.client.gui.font.FontManager this$0 -> a
-    52:52:void <init>(net.minecraft.client.gui.font.FontManager) -> <init>
-    55:123:java.util.Map prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    128:141:void apply(java.util.Map,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    145:145:java.lang.String getName() -> i
-    52:52:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    52:52:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
-    133:136:void lambda$apply$3(java.util.Map,net.minecraft.resources.ResourceLocation) -> a
-    135:135:net.minecraft.client.gui.Font lambda$null$2(net.minecraft.resources.ResourceLocation) -> a
-    63:63:java.util.List lambda$prepare$1(net.minecraft.resources.ResourceLocation) -> b
-    60:60:boolean lambda$prepare$0(java.lang.String) -> a
-net.minecraft.client.gui.font.FontManager$2 -> def$2:
-    net.minecraft.client.gui.font.FontManager this$0 -> a
-    166:166:void <init>(net.minecraft.client.gui.font.FontManager) -> <init>
-    169:169:java.util.concurrent.CompletableFuture wait(java.lang.Object) -> a
-net.minecraft.client.gui.font.FontSet -> deg:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.client.gui.font.glyphs.EmptyGlyph SPACE_GLYPH -> b
-    com.mojang.blaze3d.font.GlyphInfo SPACE_INFO -> c
-    java.util.Random RANDOM -> d
+    72:72:net.minecraft.client.gui.components.toasts.TutorialToast$Icons[] values() -> values
+    72:72:net.minecraft.client.gui.components.toasts.TutorialToast$Icons valueOf(java.lang.String) -> valueOf
+    83:86:void <init>(java.lang.String,int,int,int) -> <init>
+    89:92:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.GuiComponent,int,int) -> a
+    72:77:void <clinit>() -> <clinit>
+net.minecraft.client.gui.components.toasts.package-info -> doq:
+net.minecraft.client.gui.font.AllMissingGlyphProvider -> dor:
+    11:11:void <init>() -> <init>
+    15:15:com.mojang.blaze3d.font.RawGlyph getGlyph(int) -> a
+    21:21:it.unimi.dsi.fastutil.ints.IntSet getSupportedGlyphs() -> a
+net.minecraft.client.gui.font.FontManager -> dos:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    net.minecraft.resources.ResourceLocation MISSING_FONT -> a
+    net.minecraft.client.gui.font.FontSet missingFontSet -> c
+    java.util.Map fontSets -> d
     net.minecraft.client.renderer.texture.TextureManager textureManager -> e
-    net.minecraft.resources.ResourceLocation name -> f
-    net.minecraft.client.gui.font.glyphs.BakedGlyph missingGlyph -> g
-    net.minecraft.client.gui.font.glyphs.BakedGlyph whiteGlyph -> h
-    java.util.List providers -> i
-    it.unimi.dsi.fastutil.chars.Char2ObjectMap glyphs -> j
-    it.unimi.dsi.fastutil.chars.Char2ObjectMap glyphInfos -> k
-    it.unimi.dsi.fastutil.ints.Int2ObjectMap glyphsByWidth -> l
-    java.util.List textures -> m
-    40:49:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.resources.ResourceLocation) -> <init>
-    52:77:void reload(java.util.List) -> a
-    81:83:void close() -> close
-    86:90:void closeProviders() -> b
-    93:97:void closeTextures() -> c
-    100:100:com.mojang.blaze3d.font.GlyphInfo getGlyphInfo(char) -> a
-    104:111:com.mojang.blaze3d.font.RawGlyph getRaw(char) -> c
-    115:115:net.minecraft.client.gui.font.glyphs.BakedGlyph getGlyph(char) -> b
-    119:131:net.minecraft.client.gui.font.glyphs.BakedGlyph stitch(com.mojang.blaze3d.font.RawGlyph) -> a
-    135:139:net.minecraft.client.gui.font.glyphs.BakedGlyph getRandomGlyph(com.mojang.blaze3d.font.GlyphInfo) -> a
-    143:143:net.minecraft.client.gui.font.glyphs.BakedGlyph whiteGlyph() -> a
-    115:115:net.minecraft.client.gui.font.glyphs.BakedGlyph lambda$getGlyph$3(int) -> a
-    100:100:com.mojang.blaze3d.font.GlyphInfo lambda$getGlyphInfo$2(int) -> b
-    69:69:it.unimi.dsi.fastutil.chars.CharList lambda$reload$1(int) -> c
-    31:31:float lambda$static$0() -> d
-    29:33:void <clinit>() -> <clinit>
-net.minecraft.client.gui.font.FontTexture -> deh:
+    java.util.Map renames -> f
+    net.minecraft.server.packs.resources.PreparableReloadListener reloadListener -> g
+    42:51:void <init>(net.minecraft.client.renderer.texture.TextureManager) -> <init>
+    156:157:void setRenames(java.util.Map) -> a
+    160:160:net.minecraft.client.gui.Font createFont() -> a
+    164:164:net.minecraft.server.packs.resources.PreparableReloadListener getReloadListener() -> b
+    169:171:void close() -> close
+    160:160:net.minecraft.client.gui.font.FontSet lambda$createFont$1(net.minecraft.resources.ResourceLocation) -> a
+    48:48:void lambda$new$0(net.minecraft.client.gui.font.FontSet) -> a
+    36:36:org.apache.logging.log4j.Logger access$000() -> c
+    36:36:java.util.Map access$100(net.minecraft.client.gui.font.FontManager) -> a
+    36:36:net.minecraft.client.renderer.texture.TextureManager access$200(net.minecraft.client.gui.font.FontManager) -> b
+    37:39:void <clinit>() -> <clinit>
+net.minecraft.client.gui.font.FontManager$1 -> dos$1:
+    net.minecraft.client.gui.font.FontManager this$0 -> a
+    51:51:void <init>(net.minecraft.client.gui.font.FontManager) -> <init>
+    54:126:java.util.Map prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    131:147:void apply(java.util.Map,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    151:151:java.lang.String getName() -> c
+    51:51:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    51:51:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
+    140:143:void lambda$apply$3(net.minecraft.resources.ResourceLocation,java.util.List) -> a
+    111:119:void lambda$prepare$2(java.util.List,int) -> a
+    62:62:java.util.List lambda$prepare$1(net.minecraft.resources.ResourceLocation) -> a
+    59:59:boolean lambda$prepare$0(java.lang.String) -> a
+net.minecraft.client.gui.font.FontSet -> dot:
+    net.minecraft.client.gui.font.glyphs.EmptyGlyph SPACE_GLYPH -> a
+    com.mojang.blaze3d.font.GlyphInfo SPACE_INFO -> b
+    java.util.Random RANDOM -> c
+    net.minecraft.client.renderer.texture.TextureManager textureManager -> d
+    net.minecraft.resources.ResourceLocation name -> e
+    net.minecraft.client.gui.font.glyphs.BakedGlyph missingGlyph -> f
+    net.minecraft.client.gui.font.glyphs.BakedGlyph whiteGlyph -> g
+    java.util.List providers -> h
+    it.unimi.dsi.fastutil.ints.Int2ObjectMap glyphs -> i
+    it.unimi.dsi.fastutil.ints.Int2ObjectMap glyphInfos -> j
+    it.unimi.dsi.fastutil.ints.Int2ObjectMap glyphsByWidth -> k
+    java.util.List textures -> l
+    37:46:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.resources.ResourceLocation) -> <init>
+    49:79:void reload(java.util.List) -> a
+    83:85:void close() -> close
+    88:92:void closeProviders() -> b
+    95:99:void closeTextures() -> c
+    102:102:com.mojang.blaze3d.font.GlyphInfo getGlyphInfo(int) -> a
+    106:113:com.mojang.blaze3d.font.RawGlyph getRaw(int) -> c
+    117:117:net.minecraft.client.gui.font.glyphs.BakedGlyph getGlyph(int) -> b
+    121:133:net.minecraft.client.gui.font.glyphs.BakedGlyph stitch(com.mojang.blaze3d.font.RawGlyph) -> a
+    137:141:net.minecraft.client.gui.font.glyphs.BakedGlyph getRandomGlyph(com.mojang.blaze3d.font.GlyphInfo) -> a
+    145:145:net.minecraft.client.gui.font.glyphs.BakedGlyph whiteGlyph() -> a
+    117:117:net.minecraft.client.gui.font.glyphs.BakedGlyph lambda$getGlyph$4(int) -> d
+    102:102:com.mojang.blaze3d.font.GlyphInfo lambda$getGlyphInfo$3(int) -> e
+    66:76:void lambda$reload$2(java.util.List,java.util.Set,int) -> a
+    71:71:it.unimi.dsi.fastutil.ints.IntList lambda$null$1(int) -> f
+    28:28:float lambda$static$0() -> d
+    27:30:void <clinit>() -> <clinit>
+net.minecraft.client.gui.font.FontTexture -> dou:
     net.minecraft.resources.ResourceLocation name -> d
     net.minecraft.client.renderer.RenderType normalType -> e
     net.minecraft.client.renderer.RenderType seeThroughType -> f
@@ -8350,8 +8556,8 @@ net.minecraft.client.gui.font.FontTexture -> deh:
     40:41:void close() -> close
     45:75:net.minecraft.client.gui.font.glyphs.BakedGlyph add(com.mojang.blaze3d.font.RawGlyph) -> a
     79:79:net.minecraft.resources.ResourceLocation getName() -> a
-net.minecraft.client.gui.font.FontTexture$1 -> deh$1:
-net.minecraft.client.gui.font.FontTexture$Node -> deh$a:
+net.minecraft.client.gui.font.FontTexture$1 -> dou$1:
+net.minecraft.client.gui.font.FontTexture$Node -> dou$a:
     int x -> a
     int y -> b
     int width -> c
@@ -8364,25 +8570,50 @@ net.minecraft.client.gui.font.FontTexture$Node -> deh$a:
     82:82:void <init>(int,int,int,int,net.minecraft.client.gui.font.FontTexture$1) -> <init>
     82:82:int access$100(net.minecraft.client.gui.font.FontTexture$Node) -> a
     82:82:int access$200(net.minecraft.client.gui.font.FontTexture$Node) -> b
-net.minecraft.client.gui.font.TextFieldHelper -> dei:
-    net.minecraft.client.Minecraft minecraft -> a
-    net.minecraft.client.gui.Font font -> b
-    java.util.function.Supplier getMessageFn -> c
-    java.util.function.Consumer setMessageFn -> d
-    int maxWidth -> e
+net.minecraft.client.gui.font.TextFieldHelper -> dov:
+    java.util.function.Supplier getMessageFn -> a
+    java.util.function.Consumer setMessageFn -> b
+    java.util.function.Supplier getClipboardFn -> c
+    java.util.function.Consumer setClipboardFn -> d
+    java.util.function.Predicate stringValidator -> e
     int cursorPos -> f
     int selectionPos -> g
-    26:34:void <init>(net.minecraft.client.Minecraft,java.util.function.Supplier,java.util.function.Consumer,int) -> <init>
-    37:40:boolean charTyped(char) -> a
-    44:55:void insertText(java.lang.String) -> a
-    58:133:boolean keyPressed(int) -> a
-    137:140:java.lang.String getSelected() -> e
-    144:154:void deleteSelection() -> f
-    157:158:void setStart() -> a
-    161:162:void setEnd() -> b
-    165:165:int getCursorPos() -> c
-    169:169:int getSelectionPos() -> d
-net.minecraft.client.gui.font.glyphs.BakedGlyph -> dej:
+    28:36:void <init>(java.util.function.Supplier,java.util.function.Consumer,java.util.function.Supplier,java.util.function.Consumer,java.util.function.Predicate) -> <init>
+    39:39:java.util.function.Supplier createClipboardGetter(net.minecraft.client.Minecraft) -> a
+    43:43:java.lang.String getClipboardContents(net.minecraft.client.Minecraft) -> b
+    47:47:java.util.function.Consumer createClipboardSetter(net.minecraft.client.Minecraft) -> c
+    51:52:void setClipboardContents(net.minecraft.client.Minecraft,java.lang.String) -> a
+    55:58:boolean charTyped(char) -> a
+    62:102:boolean keyPressed(int) -> a
+    106:106:int clampToMsgLength(int) -> g
+    110:120:void insertText(java.lang.String,java.lang.String) -> a
+    123:124:void insertText(java.lang.String) -> a
+    127:130:void resetSelectionIfNeeded(boolean) -> a
+    133:134:void moveByChars(int) -> b
+    137:139:void moveByChars(int,boolean) -> a
+    142:143:void moveByWords(int) -> c
+    146:148:void moveByWords(int,boolean) -> b
+    151:167:void removeCharsFromCursor(int) -> d
+    170:173:void cut() -> a
+    176:178:void paste() -> b
+    181:182:void copy() -> c
+    185:187:void selectAll() -> d
+    190:192:java.lang.String getSelected(java.lang.String) -> b
+    196:203:java.lang.String deleteSelection(java.lang.String) -> c
+    207:208:void setCursorToStart() -> e
+    211:213:void setCursorToStart(boolean) -> b
+    216:217:void setCursorToEnd() -> f
+    220:222:void setCursorToEnd(boolean) -> c
+    225:225:int getCursorPos() -> g
+    229:230:void setCursorPos(int) -> e
+    233:235:void setCursorPos(int,boolean) -> c
+    238:238:int getSelectionPos() -> h
+    242:243:void setSelectionPos(int) -> f
+    246:249:void setSelectionRange(int,int) -> a
+    252:252:boolean isSelecting() -> i
+    47:47:void lambda$createClipboardSetter$1(net.minecraft.client.Minecraft,java.lang.String) -> b
+    39:39:java.lang.String lambda$createClipboardGetter$0(net.minecraft.client.Minecraft) -> d
+net.minecraft.client.gui.font.glyphs.BakedGlyph -> dow:
     net.minecraft.client.renderer.RenderType normalType -> a
     net.minecraft.client.renderer.RenderType seeThroughType -> b
     float u0 -> c
@@ -8397,7 +8628,7 @@ net.minecraft.client.gui.font.glyphs.BakedGlyph -> dej:
     34:52:void render(boolean,float,float,com.mojang.math.Matrix4f,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,float,int) -> a
     55:59:void renderEffect(net.minecraft.client.gui.font.glyphs.BakedGlyph$Effect,com.mojang.math.Matrix4f,com.mojang.blaze3d.vertex.VertexConsumer,int) -> a
     62:62:net.minecraft.client.renderer.RenderType renderType(boolean) -> a
-net.minecraft.client.gui.font.glyphs.BakedGlyph$Effect -> dej$a:
+net.minecraft.client.gui.font.glyphs.BakedGlyph$Effect -> dow$a:
     float x0 -> a
     float y0 -> b
     float x1 -> c
@@ -8408,10 +8639,10 @@ net.minecraft.client.gui.font.glyphs.BakedGlyph$Effect -> dej$a:
     float b -> h
     float a -> i
     76:86:void <init>(float,float,float,float,float,float,float,float,float) -> <init>
-net.minecraft.client.gui.font.glyphs.EmptyGlyph -> dek:
+net.minecraft.client.gui.font.glyphs.EmptyGlyph -> dox:
     10:11:void <init>() -> <init>
     15:15:void render(boolean,float,float,com.mojang.math.Matrix4f,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,float,int) -> a
-net.minecraft.client.gui.font.glyphs.MissingGlyph -> del:
+net.minecraft.client.gui.font.glyphs.MissingGlyph -> doy:
     net.minecraft.client.gui.font.glyphs.MissingGlyph INSTANCE -> a
     com.mojang.blaze3d.platform.NativeImage IMAGE_DATA -> b
     net.minecraft.client.gui.font.glyphs.MissingGlyph[] $VALUES -> c
@@ -8426,7 +8657,7 @@ net.minecraft.client.gui.font.glyphs.MissingGlyph -> del:
     51:51:boolean isColored() -> f
     15:22:void lambda$static$0(com.mojang.blaze3d.platform.NativeImage) -> a
     8:14:void <clinit>() -> <clinit>
-net.minecraft.client.gui.font.glyphs.WhiteGlyph -> dem:
+net.minecraft.client.gui.font.glyphs.WhiteGlyph -> doz:
     net.minecraft.client.gui.font.glyphs.WhiteGlyph INSTANCE -> a
     com.mojang.blaze3d.platform.NativeImage IMAGE_DATA -> b
     net.minecraft.client.gui.font.glyphs.WhiteGlyph[] $VALUES -> c
@@ -8441,28 +8672,30 @@ net.minecraft.client.gui.font.glyphs.WhiteGlyph -> dem:
     51:51:boolean isColored() -> f
     15:22:void lambda$static$0(com.mojang.blaze3d.platform.NativeImage) -> a
     8:14:void <clinit>() -> <clinit>
-net.minecraft.client.gui.font.glyphs.package-info -> den:
-net.minecraft.client.gui.font.package-info -> deo:
-net.minecraft.client.gui.font.providers.BitmapProvider -> dep:
+net.minecraft.client.gui.font.glyphs.package-info -> dpa:
+net.minecraft.client.gui.font.package-info -> dpb:
+net.minecraft.client.gui.font.providers.BitmapProvider -> dpc:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.mojang.blaze3d.platform.NativeImage image -> b
-    it.unimi.dsi.fastutil.chars.Char2ObjectMap glyphs -> c
-    30:33:void <init>(com.mojang.blaze3d.platform.NativeImage,it.unimi.dsi.fastutil.chars.Char2ObjectMap) -> <init>
-    37:38:void close() -> close
-    43:43:com.mojang.blaze3d.font.RawGlyph getGlyph(char) -> a
-    24:24:org.apache.logging.log4j.Logger access$100() -> a
-    25:25:void <clinit>() -> <clinit>
-net.minecraft.client.gui.font.providers.BitmapProvider$1 -> dep$1:
-net.minecraft.client.gui.font.providers.BitmapProvider$Builder -> dep$a:
+    it.unimi.dsi.fastutil.ints.Int2ObjectMap glyphs -> c
+    32:35:void <init>(com.mojang.blaze3d.platform.NativeImage,it.unimi.dsi.fastutil.ints.Int2ObjectMap) -> <init>
+    39:40:void close() -> close
+    45:45:com.mojang.blaze3d.font.RawGlyph getGlyph(int) -> a
+    50:50:it.unimi.dsi.fastutil.ints.IntSet getSupportedGlyphs() -> a
+    26:26:org.apache.logging.log4j.Logger access$100() -> b
+    26:26:void <init>(com.mojang.blaze3d.platform.NativeImage,it.unimi.dsi.fastutil.ints.Int2ObjectMap,net.minecraft.client.gui.font.providers.BitmapProvider$1) -> <init>
+    27:27:void <clinit>() -> <clinit>
+net.minecraft.client.gui.font.providers.BitmapProvider$1 -> dpc$1:
+net.minecraft.client.gui.font.providers.BitmapProvider$Builder -> dpc$a:
     net.minecraft.resources.ResourceLocation texture -> a
     java.util.List chars -> b
     int height -> c
     int ascent -> d
-    52:57:void <init>(net.minecraft.resources.ResourceLocation,int,int,java.util.List) -> <init>
-    60:85:net.minecraft.client.gui.font.providers.BitmapProvider$Builder fromJson(com.google.gson.JsonObject) -> a
-    91:124:com.mojang.blaze3d.font.GlyphProvider create(net.minecraft.server.packs.resources.ResourceManager) -> a
-    129:140:int getActualGlyphWidth(com.mojang.blaze3d.platform.NativeImage,int,int,int,int) -> a
-net.minecraft.client.gui.font.providers.BitmapProvider$Glyph -> dep$b:
+    59:64:void <init>(net.minecraft.resources.ResourceLocation,int,int,java.util.List) -> <init>
+    67:92:net.minecraft.client.gui.font.providers.BitmapProvider$Builder fromJson(com.google.gson.JsonObject) -> a
+    98:129:com.mojang.blaze3d.font.GlyphProvider create(net.minecraft.server.packs.resources.ResourceManager) -> a
+    134:145:int getActualGlyphWidth(com.mojang.blaze3d.platform.NativeImage,int,int,int,int) -> a
+net.minecraft.client.gui.font.providers.BitmapProvider$Glyph -> dpc$b:
     float scale -> a
     com.mojang.blaze3d.platform.NativeImage image -> b
     int offsetX -> c
@@ -8471,18 +8704,18 @@ net.minecraft.client.gui.font.providers.BitmapProvider$Glyph -> dep$b:
     int height -> f
     int advance -> g
     int ascent -> h
-    154:163:void <init>(float,com.mojang.blaze3d.platform.NativeImage,int,int,int,int,int,int) -> <init>
-    167:167:float getOversample() -> g
-    172:172:int getPixelWidth() -> d
-    177:177:int getPixelHeight() -> e
-    182:182:float getAdvance() -> getAdvance
-    187:187:float getBearingY() -> l
-    192:193:void upload(int,int) -> a
-    197:197:boolean isColored() -> f
-    144:144:void <init>(float,com.mojang.blaze3d.platform.NativeImage,int,int,int,int,int,int,net.minecraft.client.gui.font.providers.BitmapProvider$1) -> <init>
-net.minecraft.client.gui.font.providers.GlyphProviderBuilder -> deq:
+    159:168:void <init>(float,com.mojang.blaze3d.platform.NativeImage,int,int,int,int,int,int) -> <init>
+    172:172:float getOversample() -> g
+    177:177:int getPixelWidth() -> d
+    182:182:int getPixelHeight() -> e
+    187:187:float getAdvance() -> getAdvance
+    192:192:float getBearingY() -> l
+    197:198:void upload(int,int) -> a
+    202:202:boolean isColored() -> f
+    149:149:void <init>(float,com.mojang.blaze3d.platform.NativeImage,int,int,int,int,int,int,net.minecraft.client.gui.font.providers.BitmapProvider$1) -> <init>
+net.minecraft.client.gui.font.providers.GlyphProviderBuilder -> dpd:
     com.mojang.blaze3d.font.GlyphProvider create(net.minecraft.server.packs.resources.ResourceManager) -> a
-net.minecraft.client.gui.font.providers.GlyphProviderBuilderType -> der:
+net.minecraft.client.gui.font.providers.GlyphProviderBuilderType -> dpe:
     net.minecraft.client.gui.font.providers.GlyphProviderBuilderType BITMAP -> a
     net.minecraft.client.gui.font.providers.GlyphProviderBuilderType TTF -> b
     net.minecraft.client.gui.font.providers.GlyphProviderBuilderType LEGACY_UNICODE -> c
@@ -8497,45 +8730,46 @@ net.minecraft.client.gui.font.providers.GlyphProviderBuilderType -> der:
     39:39:net.minecraft.client.gui.font.providers.GlyphProviderBuilder create(com.google.gson.JsonObject) -> a
     17:20:void lambda$static$0(java.util.HashMap) -> a
     10:16:void <clinit>() -> <clinit>
-net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider -> des:
+net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider -> dpf:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.server.packs.resources.ResourceManager resourceManager -> b
     byte[] sizes -> c
     java.lang.String texturePattern -> d
     java.util.Map textures -> e
-    32:62:void <init>(net.minecraft.server.packs.resources.ResourceManager,byte[],java.lang.String) -> <init>
-    66:67:void close() -> close
-    70:71:net.minecraft.resources.ResourceLocation getSheetLocation(char) -> b
-    77:86:com.mojang.blaze3d.font.RawGlyph getGlyph(char) -> a
-    91:95:com.mojang.blaze3d.platform.NativeImage loadTexture(net.minecraft.resources.ResourceLocation) -> a
-    100:100:int getLeft(byte) -> a
-    104:104:int getRight(byte) -> b
-    22:22:org.apache.logging.log4j.Logger access$100() -> a
-    23:23:void <clinit>() -> <clinit>
-net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider$1 -> des$1:
-net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider$Builder -> des$a:
+    34:64:void <init>(net.minecraft.server.packs.resources.ResourceManager,byte[],java.lang.String) -> <init>
+    68:69:void close() -> close
+    72:73:net.minecraft.resources.ResourceLocation getSheetLocation(int) -> b
+    79:91:com.mojang.blaze3d.font.RawGlyph getGlyph(int) -> a
+    96:102:it.unimi.dsi.fastutil.ints.IntSet getSupportedGlyphs() -> a
+    107:111:com.mojang.blaze3d.platform.NativeImage loadTexture(net.minecraft.resources.ResourceLocation) -> a
+    116:116:int getLeft(byte) -> a
+    120:120:int getRight(byte) -> b
+    24:24:org.apache.logging.log4j.Logger access$100() -> b
+    25:25:void <clinit>() -> <clinit>
+net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider$1 -> dpf$1:
+net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider$Builder -> dpf$a:
     net.minecraft.resources.ResourceLocation metadata -> a
     java.lang.String texturePattern -> b
-    111:114:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String) -> <init>
-    117:119:net.minecraft.client.gui.font.providers.GlyphProviderBuilder fromJson(com.google.gson.JsonObject) -> a
-    126:133:com.mojang.blaze3d.font.GlyphProvider create(net.minecraft.server.packs.resources.ResourceManager) -> a
-net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider$Glyph -> des$b:
+    127:130:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String) -> <init>
+    133:135:net.minecraft.client.gui.font.providers.GlyphProviderBuilder fromJson(com.google.gson.JsonObject) -> a
+    142:149:com.mojang.blaze3d.font.GlyphProvider create(net.minecraft.server.packs.resources.ResourceManager) -> a
+net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider$Glyph -> dpf$b:
     int width -> a
     int height -> b
     int sourceX -> c
     int sourceY -> d
     com.mojang.blaze3d.platform.NativeImage source -> e
-    144:150:void <init>(int,int,int,int,com.mojang.blaze3d.platform.NativeImage) -> <init>
-    154:154:float getOversample() -> g
-    159:159:int getPixelWidth() -> d
-    164:164:int getPixelHeight() -> e
-    169:169:float getAdvance() -> getAdvance
-    174:175:void upload(int,int) -> a
-    179:179:boolean isColored() -> f
-    184:184:float getShadowOffset() -> c
-    189:189:float getBoldOffset() -> b
-    137:137:void <init>(int,int,int,int,com.mojang.blaze3d.platform.NativeImage,net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider$1) -> <init>
-net.minecraft.client.gui.font.providers.TrueTypeGlyphProviderBuilder -> det:
+    160:166:void <init>(int,int,int,int,com.mojang.blaze3d.platform.NativeImage) -> <init>
+    170:170:float getOversample() -> g
+    175:175:int getPixelWidth() -> d
+    180:180:int getPixelHeight() -> e
+    185:185:float getAdvance() -> getAdvance
+    190:191:void upload(int,int) -> a
+    195:195:boolean isColored() -> f
+    200:200:float getShadowOffset() -> c
+    205:205:float getBoldOffset() -> b
+    153:153:void <init>(int,int,int,int,com.mojang.blaze3d.platform.NativeImage,net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider$1) -> <init>
+net.minecraft.client.gui.font.providers.TrueTypeGlyphProviderBuilder -> dpg:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.resources.ResourceLocation location -> b
     float size -> c
@@ -8547,819 +8781,882 @@ net.minecraft.client.gui.font.providers.TrueTypeGlyphProviderBuilder -> det:
     43:75:net.minecraft.client.gui.font.providers.GlyphProviderBuilder fromJson(com.google.gson.JsonObject) -> a
     82:101:com.mojang.blaze3d.font.GlyphProvider create(net.minecraft.server.packs.resources.ResourceManager) -> a
     25:25:void <clinit>() -> <clinit>
-net.minecraft.client.gui.font.providers.package-info -> deu:
-net.minecraft.client.gui.package-info -> dev:
-net.minecraft.client.gui.screens.AccessibilityOptionsScreen -> dew:
+net.minecraft.client.gui.font.providers.package-info -> dph:
+net.minecraft.client.gui.package-info -> dpi:
+net.minecraft.client.gui.screens.AccessibilityOptionsScreen -> dpj:
     net.minecraft.client.Option[] OPTIONS -> c
-    net.minecraft.client.gui.components.AbstractWidget narratorButton -> d
-    22:23:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
-    27:43:void init() -> init
-    47:51:void render(int,int,float) -> render
-    54:55:void updateNarratorButton() -> a
-    42:42:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.AlertScreen -> dex:
+    net.minecraft.client.gui.components.AbstractWidget narratorButton -> p
+    24:25:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
+    29:45:void init() -> b
+    49:53:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    56:57:void updateNarratorButton() -> c
+    44:44:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.AlertScreen -> dpk:
     java.lang.Runnable callback -> c
     net.minecraft.network.chat.Component text -> a
-    java.util.List lines -> d
-    java.lang.String okButton -> b
-    int delayTicker -> e
-    19:20:void <init>(java.lang.Runnable,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
-    14:27:void <init>(java.lang.Runnable,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,java.lang.String) -> <init>
-    31:36:void init() -> init
-    40:51:void render(int,int,float) -> render
-    54:59:void setDelay(int) -> a
-    63:70:void tick() -> tick
-    32:32:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-net.minecraft.client.gui.screens.BackupConfirmScreen -> dey:
+    java.util.List lines -> p
+    net.minecraft.network.chat.Component okButton -> b
+    int delayTicker -> q
+    21:22:void <init>(java.lang.Runnable,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
+    16:29:void <init>(java.lang.Runnable,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
+    33:38:void init() -> b
+    42:52:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    55:60:void setDelay(int) -> a
+    64:71:void tick() -> d
+    34:34:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+net.minecraft.client.gui.screens.BackupConfirmScreen -> dpl:
     net.minecraft.client.gui.screens.Screen lastScreen -> b
     net.minecraft.client.gui.screens.BackupConfirmScreen$Listener listener -> a
     net.minecraft.network.chat.Component description -> c
-    boolean promptForCacheErase -> d
-    java.util.List lines -> e
-    java.lang.String eraseCacheText -> f
-    java.lang.String backupButton -> g
-    java.lang.String continueButton -> h
-    java.lang.String cancelButton -> i
-    net.minecraft.client.gui.components.Checkbox eraseCache -> j
-    17:36:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.gui.screens.BackupConfirmScreen$Listener,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,boolean) -> <init>
-    40:53:void init() -> init
-    57:68:void render(int,int,float) -> render
-    72:72:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    77:81:boolean keyPressed(int,int,int) -> keyPressed
-    48:48:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
-    47:47:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
-    46:46:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
-net.minecraft.client.gui.screens.BackupConfirmScreen$Listener -> dey$a:
+    boolean promptForCacheErase -> p
+    java.util.List lines -> q
+    net.minecraft.client.gui.components.Checkbox eraseCache -> r
+    22:32:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.gui.screens.BackupConfirmScreen$Listener,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,boolean) -> <init>
+    36:49:void init() -> b
+    53:64:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    68:68:boolean shouldCloseOnEsc() -> at_
+    73:77:boolean keyPressed(int,int,int) -> a
+    44:44:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    43:43:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    42:42:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
+net.minecraft.client.gui.screens.BackupConfirmScreen$Listener -> dpl$a:
     void proceed(boolean,boolean) -> proceed
-net.minecraft.client.gui.screens.ChatOptionsScreen -> dez:
+net.minecraft.client.gui.screens.ChatOptionsScreen -> dpm:
     net.minecraft.client.Option[] CHAT_OPTIONS -> c
-    net.minecraft.client.gui.components.AbstractWidget narratorButton -> d
-    25:26:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
-    30:46:void init() -> init
-    50:54:void render(int,int,float) -> render
-    57:58:void updateNarratorButton() -> a
-    45:45:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.ChatScreen -> dfa:
+    net.minecraft.client.gui.components.AbstractWidget narratorButton -> p
+    26:27:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
+    31:47:void init() -> b
+    51:55:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    58:59:void updateNarratorButton() -> f
+    46:46:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.ChatScreen -> dpn:
     java.lang.String historyBuffer -> b
     int historyPos -> c
     net.minecraft.client.gui.components.EditBox input -> a
-    java.lang.String initial -> d
-    net.minecraft.client.gui.components.CommandSuggestions commandSuggestions -> e
-    16:27:void <init>(java.lang.String) -> <init>
-    31:49:void init() -> init
-    53:58:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    62:64:void removed() -> removed
-    68:69:void tick() -> tick
-    72:75:void onEdited(java.lang.String) -> a
-    80:113:boolean keyPressed(int,int,int) -> keyPressed
-    118:131:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    136:150:boolean mouseClicked(double,double,int) -> mouseClicked
-    155:160:void insertText(java.lang.String,boolean) -> insertText
-    163:184:void moveInHistory(int) -> a
-    189:202:void render(int,int,float) -> render
-    206:206:boolean isPauseScreen() -> isPauseScreen
-    210:211:void setChatLine(java.lang.String) -> b
-    13:13:net.minecraft.client.gui.components.CommandSuggestions access$000(net.minecraft.client.gui.screens.ChatScreen) -> a
-net.minecraft.client.gui.screens.ChatScreen$1 -> dfa$1:
+    java.lang.String initial -> p
+    net.minecraft.client.gui.components.CommandSuggestions commandSuggestions -> q
+    19:30:void <init>(java.lang.String) -> <init>
+    34:52:void init() -> b
+    56:61:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    65:67:void removed() -> e
+    71:72:void tick() -> d
+    75:78:void onEdited(java.lang.String) -> a
+    83:116:boolean keyPressed(int,int,int) -> a
+    121:134:boolean mouseScrolled(double,double,double) -> a
+    139:158:boolean mouseClicked(double,double,int) -> a
+    163:168:void insertText(java.lang.String,boolean) -> a
+    171:192:void moveInHistory(int) -> a
+    197:210:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    214:214:boolean isPauseScreen() -> ax_
+    218:219:void setChatLine(java.lang.String) -> b
+    16:16:net.minecraft.client.gui.components.CommandSuggestions access$000(net.minecraft.client.gui.screens.ChatScreen) -> a
+net.minecraft.client.gui.screens.ChatScreen$1 -> dpn$1:
     net.minecraft.client.gui.screens.ChatScreen this$0 -> a
-    34:34:void <init>(net.minecraft.client.gui.screens.ChatScreen,net.minecraft.client.gui.Font,int,int,int,int,java.lang.String) -> <init>
-    37:37:java.lang.String getNarrationMessage() -> getNarrationMessage
-net.minecraft.client.gui.screens.ConfirmLinkScreen -> dfb:
-    java.lang.String warning -> d
-    java.lang.String copyButton -> e
-    java.lang.String url -> f
-    boolean showWarning -> g
-    16:24:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,java.lang.String,boolean) -> <init>
-    28:37:void init() -> init
-    40:41:void copyToClipboard() -> a
-    45:50:void render(int,int,float) -> render
-    36:36:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
-    33:35:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
-    31:31:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
-net.minecraft.client.gui.screens.ConfirmScreen -> dfc:
-    net.minecraft.network.chat.Component title2 -> d
-    java.util.List lines -> e
-    java.lang.String yesButton -> a
-    java.lang.String noButton -> b
-    int delayTicker -> f
+    37:37:void <init>(net.minecraft.client.gui.screens.ChatScreen,net.minecraft.client.gui.Font,int,int,int,int,net.minecraft.network.chat.Component) -> <init>
+    40:40:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+net.minecraft.client.gui.screens.ConfirmLinkScreen -> dpo:
+    net.minecraft.network.chat.Component warning -> p
+    net.minecraft.network.chat.Component copyButton -> q
+    java.lang.String url -> r
+    boolean showWarning -> s
+    18:26:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,java.lang.String,boolean) -> <init>
+    30:39:void init() -> b
+    42:43:void copyToClipboard() -> g
+    47:52:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    38:38:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    35:37:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    33:33:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
+net.minecraft.client.gui.screens.ConfirmScreen -> dpp:
+    net.minecraft.network.chat.Component title2 -> p
+    java.util.List lines -> q
+    net.minecraft.network.chat.Component yesButton -> a
+    net.minecraft.network.chat.Component noButton -> b
+    int delayTicker -> r
     it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> c
-    22:23:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
-    15:31:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,java.lang.String,java.lang.String) -> <init>
-    35:35:java.lang.String getNarrationMessage() -> getNarrationMessage
-    40:47:void init() -> init
-    51:62:void render(int,int,float) -> render
-    65:70:void setDelay(int) -> a
-    74:81:void tick() -> tick
-    85:85:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    90:94:boolean keyPressed(int,int,int) -> keyPressed
-    43:43:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    42:42:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
-net.minecraft.client.gui.screens.ConnectScreen -> dfd:
+    24:25:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
+    17:33:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
+    37:37:java.lang.String getNarrationMessage() -> as_
+    42:49:void init() -> b
+    53:64:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    67:72:void setDelay(int) -> a
+    76:83:void tick() -> d
+    87:87:boolean shouldCloseOnEsc() -> at_
+    92:96:boolean keyPressed(int,int,int) -> a
+    45:45:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    44:44:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+net.minecraft.client.gui.screens.ConnectScreen -> dpq:
     java.util.concurrent.atomic.AtomicInteger UNIQUE_THREAD_ID -> a
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.network.Connection connection -> c
-    boolean aborted -> d
-    net.minecraft.client.gui.screens.Screen parent -> e
-    net.minecraft.network.chat.Component status -> f
-    long lastNarration -> g
-    33:45:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Minecraft,net.minecraft.client.multiplayer.ServerData) -> <init>
-    33:53:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Minecraft,java.lang.String,int) -> <init>
-    56:88:void connect(java.lang.String,int) -> a
-    91:92:void updateStatus(net.minecraft.network.chat.Component) -> a
-    96:103:void tick() -> tick
-    107:107:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    112:119:void init() -> init
-    123:135:void render(int,int,float) -> render
-    113:118:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-    25:25:boolean access$000(net.minecraft.client.gui.screens.ConnectScreen) -> a
-    25:25:net.minecraft.network.Connection access$102(net.minecraft.client.gui.screens.ConnectScreen,net.minecraft.network.Connection) -> a
-    25:25:net.minecraft.network.Connection access$100(net.minecraft.client.gui.screens.ConnectScreen) -> b
-    25:25:net.minecraft.client.gui.screens.Screen access$200(net.minecraft.client.gui.screens.ConnectScreen) -> c
-    25:25:org.apache.logging.log4j.Logger access$300() -> a
-    25:25:void access$400(net.minecraft.client.gui.screens.ConnectScreen,net.minecraft.network.chat.Component) -> a
-    26:27:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.ConnectScreen$1 -> dfd$1:
+    boolean aborted -> p
+    net.minecraft.client.gui.screens.Screen parent -> q
+    net.minecraft.network.chat.Component status -> r
+    long lastNarration -> s
+    34:46:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Minecraft,net.minecraft.client.multiplayer.ServerData) -> <init>
+    34:54:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Minecraft,java.lang.String,int) -> <init>
+    57:89:void connect(java.lang.String,int) -> a
+    92:93:void updateStatus(net.minecraft.network.chat.Component) -> a
+    97:104:void tick() -> d
+    108:108:boolean shouldCloseOnEsc() -> at_
+    113:120:void init() -> b
+    124:136:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    114:119:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+    26:26:boolean access$000(net.minecraft.client.gui.screens.ConnectScreen) -> a
+    26:26:net.minecraft.network.Connection access$102(net.minecraft.client.gui.screens.ConnectScreen,net.minecraft.network.Connection) -> a
+    26:26:net.minecraft.network.Connection access$100(net.minecraft.client.gui.screens.ConnectScreen) -> b
+    26:26:net.minecraft.client.gui.screens.Screen access$200(net.minecraft.client.gui.screens.ConnectScreen) -> c
+    26:26:org.apache.logging.log4j.Logger access$300() -> g
+    26:26:void access$400(net.minecraft.client.gui.screens.ConnectScreen,net.minecraft.network.chat.Component) -> a
+    27:28:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.ConnectScreen$1 -> dpq$1:
     java.lang.String val$hostname -> a
     int val$port -> b
     net.minecraft.client.gui.screens.ConnectScreen this$0 -> c
-    57:57:void <init>(net.minecraft.client.gui.screens.ConnectScreen,java.lang.String,java.lang.String,int) -> <init>
-    60:84:void run() -> run
-    82:82:void lambda$run$2(java.lang.String) -> a
-    75:75:void lambda$run$1() -> a
-    67:67:void lambda$run$0(net.minecraft.client.gui.screens.ConnectScreen,net.minecraft.network.chat.Component) -> a
-net.minecraft.client.gui.screens.CreateBuffetWorldScreen -> dfe:
-    java.util.List GENERATORS -> a
-    net.minecraft.client.gui.screens.worldselection.CreateWorldScreen parent -> b
-    net.minecraft.nbt.CompoundTag optionsTag -> c
-    net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList list -> d
-    int generatorIndex -> e
-    net.minecraft.client.gui.components.Button doneButton -> f
-    37:41:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.nbt.CompoundTag) -> <init>
-    45:68:void init() -> init
-    71:91:void loadOptions() -> b
-    94:115:net.minecraft.nbt.CompoundTag saveOptions() -> c
-    119:120:void updateButtonValidity() -> a
-    124:130:void render(int,int,float) -> render
-    84:84:boolean lambda$loadOptions$4(net.minecraft.resources.ResourceLocation,net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList$Entry) -> a
-    63:63:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
-    59:61:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
-    48:53:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
-    27:27:boolean lambda$static$0(net.minecraft.resources.ResourceLocation) -> a
-    27:27:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.CreateBuffetWorldScreen$1 -> dfe$1:
-net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList -> dfe$a:
+    58:58:void <init>(net.minecraft.client.gui.screens.ConnectScreen,java.lang.String,java.lang.String,int) -> <init>
+    61:85:void run() -> run
+    83:83:void lambda$run$2(java.lang.String) -> a
+    76:76:void lambda$run$1() -> a
+    68:68:void lambda$run$0(net.minecraft.client.gui.screens.ConnectScreen,net.minecraft.network.chat.Component) -> a
+net.minecraft.client.gui.screens.CreateBuffetWorldScreen -> dpr:
+    net.minecraft.client.gui.screens.Screen parent -> a
+    java.util.function.Consumer applySettings -> b
+    net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList list -> c
+    net.minecraft.world.level.biome.Biome biome -> p
+    net.minecraft.client.gui.components.Button doneButton -> q
+    28:33:void <init>(net.minecraft.client.gui.screens.Screen,java.util.function.Consumer,net.minecraft.world.level.biome.Biome) -> <init>
+    37:38:void onClose() -> au_
+    42:55:void init() -> b
+    58:59:void updateButtonValidity() -> i
+    63:68:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    54:54:boolean lambda$init$2(net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList$Entry) -> a
+    52:52:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    48:50:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+    19:19:net.minecraft.world.level.biome.Biome access$102(net.minecraft.client.gui.screens.CreateBuffetWorldScreen,net.minecraft.world.level.biome.Biome) -> a
+    19:19:void access$300(net.minecraft.client.gui.screens.CreateBuffetWorldScreen) -> a
+net.minecraft.client.gui.screens.CreateBuffetWorldScreen$1 -> dpr$1:
+net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList -> dpr$a:
     net.minecraft.client.gui.screens.CreateBuffetWorldScreen this$0 -> a
-    133:139:void <init>(net.minecraft.client.gui.screens.CreateBuffetWorldScreen) -> <init>
-    143:143:boolean isFocused() -> isFocused
-    148:153:void setSelected(net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList$Entry) -> a
-    157:159:void moveSelection(int) -> moveSelection
-    132:132:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> setSelected
-    137:137:void lambda$new$1(net.minecraft.resources.ResourceLocation) -> a
-    136:136:java.lang.String lambda$new$0(net.minecraft.resources.ResourceLocation) -> b
-    132:132:void <init>(net.minecraft.client.gui.screens.CreateBuffetWorldScreen,net.minecraft.client.gui.screens.CreateBuffetWorldScreen$1) -> <init>
-net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList$Entry -> dfe$a$a:
-    net.minecraft.resources.ResourceLocation key -> b
+    71:77:void <init>(net.minecraft.client.gui.screens.CreateBuffetWorldScreen) -> <init>
+    81:81:boolean isFocused() -> b
+    86:93:void setSelected(net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList$Entry) -> a
+    70:70:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+    75:75:void lambda$new$1(net.minecraft.world.level.biome.Biome) -> a
+    74:74:java.lang.String lambda$new$0(net.minecraft.world.level.biome.Biome) -> b
+    70:70:void <init>(net.minecraft.client.gui.screens.CreateBuffetWorldScreen,net.minecraft.client.gui.screens.CreateBuffetWorldScreen$1) -> <init>
+net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList$Entry -> dpr$a$a:
+    net.minecraft.world.level.biome.Biome biome -> b
     net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList this$1 -> a
-    164:166:void <init>(net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList,net.minecraft.resources.ResourceLocation) -> <init>
-    170:171:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    175:182:boolean mouseClicked(double,double,int) -> mouseClicked
-    161:161:net.minecraft.resources.ResourceLocation access$100(net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList$Entry) -> a
-net.minecraft.client.gui.screens.CreateFlatWorldScreen -> dff:
-    net.minecraft.client.gui.screens.worldselection.CreateWorldScreen parent -> a
-    net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings generator -> b
-    java.lang.String columnType -> c
-    java.lang.String columnHeight -> d
-    net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList list -> e
-    net.minecraft.client.gui.components.Button deleteLayerButton -> f
-    36:47:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.nbt.CompoundTag) -> <init>
-    50:50:java.lang.String saveLayerString() -> a
-    54:54:net.minecraft.nbt.CompoundTag saveLayers() -> b
-    58:59:void loadLayers(java.lang.String) -> a
-    62:63:void loadLayers(net.minecraft.nbt.CompoundTag) -> a
-    67:108:void init() -> init
-    111:113:void updateButtonValidity() -> c
-    116:116:boolean hasValidSelection() -> d
-    121:122:void onClose() -> onClose
-    126:136:void render(int,int,float) -> render
-    101:104:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
-    94:98:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
-    88:91:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
-    74:85:void lambda$init$0(net.minecraft.client.gui.components.Button) -> d
-    26:26:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings access$000(net.minecraft.client.gui.screens.CreateFlatWorldScreen) -> a
-net.minecraft.client.gui.screens.CreateFlatWorldScreen$1 -> dff$1:
-net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList -> dff$a:
+    98:100:void <init>(net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList,net.minecraft.world.level.biome.Biome) -> <init>
+    104:105:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    109:115:boolean mouseClicked(double,double,int) -> a
+    95:95:net.minecraft.world.level.biome.Biome access$200(net.minecraft.client.gui.screens.CreateBuffetWorldScreen$BiomeList$Entry) -> a
+net.minecraft.client.gui.screens.CreateFlatWorldScreen -> dps:
+    net.minecraft.client.gui.screens.Screen parent -> a
+    java.util.function.Consumer applySettings -> b
+    net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings generator -> c
+    net.minecraft.network.chat.Component columnType -> p
+    net.minecraft.network.chat.Component columnHeight -> q
+    net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList list -> r
+    net.minecraft.client.gui.components.Button deleteLayerButton -> s
+    43:47:void <init>(net.minecraft.client.gui.screens.Screen,java.util.function.Consumer,net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> <init>
+    50:50:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings settings() -> i
+    54:55:void setConfig(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> a
+    59:99:void init() -> b
+    102:103:void updateButtonValidity() -> k
+    106:106:boolean hasValidSelection() -> l
+    111:112:void onClose() -> au_
+    116:126:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    93:95:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
+    87:90:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
+    81:84:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
+    66:78:void lambda$init$0(net.minecraft.client.gui.components.Button) -> d
+    25:25:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings access$000(net.minecraft.client.gui.screens.CreateFlatWorldScreen) -> a
+    25:25:void access$200(net.minecraft.client.gui.screens.CreateFlatWorldScreen) -> b
+net.minecraft.client.gui.screens.CreateFlatWorldScreen$1 -> dps$1:
+net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList -> dps$a:
     net.minecraft.client.gui.screens.CreateFlatWorldScreen this$0 -> a
-    139:145:void <init>(net.minecraft.client.gui.screens.CreateFlatWorldScreen) -> <init>
-    149:158:void setSelected(net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList$Entry) -> a
-    162:164:void moveSelection(int) -> moveSelection
-    168:168:boolean isFocused() -> isFocused
-    173:173:int getScrollbarPosition() -> getScrollbarPosition
-    177:187:void resetRows() -> a
-    138:138:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> setSelected
-    138:138:net.minecraft.client.Minecraft access$200(net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList) -> a
-net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList$Entry -> dff$a$a:
+    129:135:void <init>(net.minecraft.client.gui.screens.CreateFlatWorldScreen) -> <init>
+    139:149:void setSelected(net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList$Entry) -> a
+    153:153:boolean isFocused() -> b
+    158:158:int getScrollbarPosition() -> e
+    162:172:void resetRows() -> f
+    128:128:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+    128:128:net.minecraft.client.Minecraft access$300(net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList) -> a
+net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList$Entry -> dps$a$a:
     net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList this$1 -> a
-    189:189:void <init>(net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList) -> <init>
-    192:222:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    226:231:boolean mouseClicked(double,double,int) -> mouseClicked
-    235:244:void blitSlot(int,int,net.minecraft.world.item.ItemStack) -> a
-    247:251:void blitSlotBg(int,int) -> a
-    189:189:void <init>(net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList,net.minecraft.client.gui.screens.CreateFlatWorldScreen$1) -> <init>
-net.minecraft.client.gui.screens.DeathScreen -> dfg:
+    174:174:void <init>(net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList) -> <init>
+    177:203:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    207:211:boolean mouseClicked(double,double,int) -> a
+    215:224:void blitSlot(com.mojang.blaze3d.vertex.PoseStack,int,int,net.minecraft.world.item.ItemStack) -> a
+    227:231:void blitSlotBg(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    174:174:void <init>(net.minecraft.client.gui.screens.CreateFlatWorldScreen$DetailsList,net.minecraft.client.gui.screens.CreateFlatWorldScreen$1) -> <init>
+net.minecraft.client.gui.screens.DataPackSelectScreen -> dpt:
+    net.minecraft.resources.ResourceLocation DEFAULT_ICON -> a
+    17:18:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.server.packs.repository.PackRepository,java.util.function.Consumer,java.io.File) -> <init>
+    17:17:net.minecraft.client.gui.screens.packs.PackSelectionModel lambda$new$1(net.minecraft.server.packs.repository.PackRepository,java.util.function.Consumer,java.lang.Runnable) -> a
+    17:17:void lambda$null$0(net.minecraft.server.packs.repository.Pack,net.minecraft.client.renderer.texture.TextureManager) -> a
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.DatapackLoadFailureScreen -> dpu:
+    java.util.List lines -> a
+    java.lang.Runnable callback -> b
+    12:19:void <init>(java.lang.Runnable) -> <init>
+    23:30:void init() -> b
+    34:43:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    47:47:boolean shouldCloseOnEsc() -> at_
+    29:29:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    28:28:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+net.minecraft.client.gui.screens.DeathScreen -> dpv:
     int delayTicker -> a
     net.minecraft.network.chat.Component causeOfDeath -> b
     boolean hardcore -> c
-    23:26:void <init>(net.minecraft.network.chat.Component,boolean) -> <init>
-    30:51:void init() -> init
-    55:55:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    59:65:void confirmResult(boolean) -> a
-    68:73:void exitToTitleScreen() -> a
-    77:98:void render(int,int,float) -> render
-    102:122:net.minecraft.network.chat.Component getClickedComponentAt(int) -> a
-    127:134:boolean mouseClicked(double,double,int) -> mouseClicked
-    139:139:boolean isPauseScreen() -> isPauseScreen
-    144:152:void tick() -> tick
-    36:43:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    32:34:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
-net.minecraft.client.gui.screens.DemoIntroScreen -> dfh:
+    24:27:void <init>(net.minecraft.network.chat.Component,boolean) -> <init>
+    31:52:void init() -> b
+    56:56:boolean shouldCloseOnEsc() -> at_
+    60:66:void confirmResult(boolean) -> c
+    69:74:void exitToTitleScreen() -> i
+    78:97:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    101:111:net.minecraft.network.chat.Style getClickedComponentStyleAt(int) -> a
+    116:123:boolean mouseClicked(double,double,int) -> a
+    128:128:boolean isPauseScreen() -> ax_
+    133:141:void tick() -> d
+    37:44:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    33:35:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+net.minecraft.client.gui.screens.DemoIntroScreen -> dpw:
     net.minecraft.resources.ResourceLocation DEMO_BACKGROUND_LOCATION -> a
     15:16:void <init>() -> <init>
-    20:30:void init() -> init
-    34:41:void renderBackground() -> renderBackground
-    45:67:void render(int,int,float) -> render
+    20:30:void init() -> b
+    34:41:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    45:67:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
     27:29:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
     23:25:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
     12:12:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.DirectJoinServerScreen -> dfi:
+net.minecraft.client.gui.screens.DirectJoinServerScreen -> dpx:
     net.minecraft.client.gui.components.Button selectButton -> a
     net.minecraft.client.multiplayer.ServerData serverData -> b
     net.minecraft.client.gui.components.EditBox ipEdit -> c
-    it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> d
-    net.minecraft.client.gui.screens.Screen lastScreen -> e
-    20:24:void <init>(net.minecraft.client.gui.screens.Screen,it.unimi.dsi.fastutil.booleans.BooleanConsumer,net.minecraft.client.multiplayer.ServerData) -> <init>
-    28:29:void tick() -> tick
-    33:37:boolean keyPressed(int,int,int) -> keyPressed
-    42:55:void init() -> init
-    59:62:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    65:67:void onSelect() -> a
-    71:72:void onClose() -> onClose
-    77:80:void removed() -> removed
-    83:85:void updateSelectButtonStatus() -> b
-    89:97:void render(int,int,float) -> render
-    50:50:void lambda$init$2(java.lang.String) -> a
-    44:44:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    43:43:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
-net.minecraft.client.gui.screens.DisconnectedScreen -> dfj:
+    it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> p
+    net.minecraft.client.gui.screens.Screen lastScreen -> q
+    22:26:void <init>(net.minecraft.client.gui.screens.Screen,it.unimi.dsi.fastutil.booleans.BooleanConsumer,net.minecraft.client.multiplayer.ServerData) -> <init>
+    30:31:void tick() -> d
+    35:39:boolean keyPressed(int,int,int) -> a
+    44:57:void init() -> b
+    61:64:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    67:69:void onSelect() -> i
+    73:74:void onClose() -> au_
+    79:82:void removed() -> e
+    85:87:void updateSelectButtonStatus() -> k
+    91:99:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    52:52:void lambda$init$2(java.lang.String) -> a
+    46:46:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    45:45:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+net.minecraft.client.gui.screens.DisconnectedScreen -> dpy:
     net.minecraft.network.chat.Component reason -> a
     java.util.List lines -> b
     net.minecraft.client.gui.screens.Screen parent -> c
-    int textHeight -> d
-    17:20:void <init>(net.minecraft.client.gui.screens.Screen,java.lang.String,net.minecraft.network.chat.Component) -> <init>
-    24:24:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    29:33:void init() -> init
-    37:51:void render(int,int,float) -> render
-    32:32:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-net.minecraft.client.gui.screens.EditServerScreen -> dfk:
+    int textHeight -> p
+    20:23:void <init>(net.minecraft.client.gui.screens.Screen,java.lang.String,net.minecraft.network.chat.Component) -> <init>
+    27:27:boolean shouldCloseOnEsc() -> at_
+    32:36:void init() -> b
+    40:54:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    35:35:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+net.minecraft.client.gui.screens.EditServerScreen -> dpz:
     net.minecraft.client.gui.components.Button addButton -> a
     it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> b
     net.minecraft.client.multiplayer.ServerData serverData -> c
-    net.minecraft.client.gui.components.EditBox ipEdit -> d
-    net.minecraft.client.gui.components.EditBox nameEdit -> e
-    net.minecraft.client.gui.components.Button serverPackButton -> f
-    net.minecraft.client.gui.screens.Screen lastScreen -> g
-    java.util.function.Predicate addressFilter -> h
-    24:47:void <init>(net.minecraft.client.gui.screens.Screen,it.unimi.dsi.fastutil.booleans.BooleanConsumer,net.minecraft.client.multiplayer.ServerData) -> <init>
-    51:53:void tick() -> tick
-    57:80:void init() -> init
-    84:89:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    92:93:void onEdited(java.lang.String) -> a
-    97:98:void removed() -> removed
-    101:104:void onAdd() -> a
-    108:111:void onClose() -> onClose
-    114:117:void cleanUp() -> b
-    121:131:void render(int,int,float) -> render
-    77:77:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
-    76:76:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
-    73:75:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
-    25:38:boolean lambda$new$0(java.lang.String) -> b
-net.minecraft.client.gui.screens.ErrorScreen -> dfl:
-    java.lang.String message -> a
-    11:13:void <init>(net.minecraft.network.chat.Component,java.lang.String) -> <init>
-    17:20:void init() -> init
-    24:30:void render(int,int,float) -> render
-    34:34:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    19:19:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-net.minecraft.client.gui.screens.GenericDirtMessageScreen -> dfm:
-    7:8:void <init>(net.minecraft.network.chat.Component) -> <init>
-    12:12:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    17:20:void render(int,int,float) -> render
-net.minecraft.client.gui.screens.InBedChatScreen -> dfn:
+    net.minecraft.client.gui.components.EditBox ipEdit -> p
+    net.minecraft.client.gui.components.EditBox nameEdit -> q
+    net.minecraft.client.gui.components.Button serverPackButton -> r
+    net.minecraft.client.gui.screens.Screen lastScreen -> s
+    java.util.function.Predicate addressFilter -> t
+    27:50:void <init>(net.minecraft.client.gui.screens.Screen,it.unimi.dsi.fastutil.booleans.BooleanConsumer,net.minecraft.client.multiplayer.ServerData) -> <init>
+    54:56:void tick() -> d
+    60:83:void init() -> b
+    86:86:net.minecraft.network.chat.Component createServerButtonText(net.minecraft.client.multiplayer.ServerData$ServerPackStatus) -> a
+    91:96:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    99:100:void onEdited(java.lang.String) -> a
+    104:105:void removed() -> e
+    108:111:void onAdd() -> i
+    115:118:void onClose() -> au_
+    121:124:void cleanUp() -> k
+    128:138:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    80:80:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
+    79:79:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
+    76:78:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
+    28:41:boolean lambda$new$0(java.lang.String) -> b
+net.minecraft.client.gui.screens.ErrorScreen -> dqa:
+    net.minecraft.network.chat.Component message -> a
+    12:14:void <init>(net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
+    18:21:void init() -> b
+    25:31:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    35:35:boolean shouldCloseOnEsc() -> at_
+    20:20:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+net.minecraft.client.gui.screens.GenericDirtMessageScreen -> dqb:
+    8:9:void <init>(net.minecraft.network.chat.Component) -> <init>
+    13:13:boolean shouldCloseOnEsc() -> at_
+    18:21:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+net.minecraft.client.gui.screens.InBedChatScreen -> dqc:
     16:17:void <init>() -> <init>
-    21:24:void init() -> init
-    28:29:void onClose() -> onClose
-    34:47:boolean keyPressed(int,int,int) -> keyPressed
-    51:53:void sendWakeUp() -> a
+    21:24:void init() -> b
+    28:29:void onClose() -> au_
+    34:47:boolean keyPressed(int,int,int) -> a
+    51:53:void sendWakeUp() -> i
     23:23:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-net.minecraft.client.gui.screens.LanguageSelectScreen -> dfo:
+net.minecraft.client.gui.screens.LanguageSelectScreen -> dqd:
     net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList packSelectionList -> c
-    net.minecraft.client.resources.language.LanguageManager languageManager -> d
-    net.minecraft.client.gui.components.OptionButton forceUnicodeButton -> e
-    net.minecraft.client.gui.components.Button doneButton -> f
-    25:27:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options,net.minecraft.client.resources.language.LanguageManager) -> <init>
-    31:59:void init() -> init
-    63:69:void render(int,int,float) -> render
-    42:56:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    35:40:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
-    18:18:net.minecraft.client.resources.language.LanguageManager access$000(net.minecraft.client.gui.screens.LanguageSelectScreen) -> a
-net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList -> dfo$a:
+    net.minecraft.client.resources.language.LanguageManager languageManager -> p
+    net.minecraft.client.gui.components.OptionButton forceUnicodeButton -> q
+    net.minecraft.client.gui.components.Button doneButton -> r
+    27:29:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options,net.minecraft.client.resources.language.LanguageManager) -> <init>
+    33:59:void init() -> b
+    63:69:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    44:56:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    37:42:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+    20:20:net.minecraft.client.resources.language.LanguageManager access$000(net.minecraft.client.gui.screens.LanguageSelectScreen) -> a
+net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList -> dqd$a:
     net.minecraft.client.gui.screens.LanguageSelectScreen this$0 -> a
     72:86:void <init>(net.minecraft.client.gui.screens.LanguageSelectScreen,net.minecraft.client.Minecraft) -> <init>
-    90:90:int getScrollbarPosition() -> getScrollbarPosition
-    95:95:int getRowWidth() -> getRowWidth
+    90:90:int getScrollbarPosition() -> e
+    95:95:int getRowWidth() -> d
     100:105:void setSelected(net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList$Entry) -> a
-    109:110:void renderBackground() -> renderBackground
-    114:114:boolean isFocused() -> isFocused
-    71:71:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> setSelected
+    109:110:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    114:114:boolean isFocused() -> b
+    71:71:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
     71:71:int access$200(net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList) -> a
-net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList$Entry -> dfo$a$a:
-    net.minecraft.client.resources.language.Language language -> b
+net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList$Entry -> dqd$a$a:
+    net.minecraft.client.resources.language.LanguageInfo language -> b
     net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList this$1 -> a
-    120:122:void <init>(net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList,net.minecraft.client.resources.language.Language) -> <init>
-    126:129:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    133:137:boolean mouseClicked(double,double,int) -> mouseClicked
-    141:142:void select() -> a
-    117:117:net.minecraft.client.resources.language.Language access$100(net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList$Entry) -> a
-net.minecraft.client.gui.screens.LevelLoadingScreen -> dfp:
+    120:122:void <init>(net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList,net.minecraft.client.resources.language.LanguageInfo) -> <init>
+    126:128:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    132:136:boolean mouseClicked(double,double,int) -> a
+    140:141:void select() -> a
+    117:117:net.minecraft.client.resources.language.LanguageInfo access$100(net.minecraft.client.gui.screens.LanguageSelectScreen$LanguageSelectionList$Entry) -> a
+net.minecraft.client.gui.screens.LevelLoadingScreen -> dqe:
     net.minecraft.server.level.progress.StoringChunkProgressListener progressListener -> a
     long lastNarration -> b
     it.unimi.dsi.fastutil.objects.Object2IntMap COLORS -> c
     18:23:void <init>(net.minecraft.server.level.progress.StoringChunkProgressListener) -> <init>
-    27:27:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    32:33:void removed() -> removed
-    37:55:void render(int,int,float) -> render
-    58:93:void renderChunks(net.minecraft.server.level.progress.StoringChunkProgressListener,int,int,int,int) -> a
+    27:27:boolean shouldCloseOnEsc() -> at_
+    32:33:void removed() -> e
+    37:55:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    58:93:void renderChunks(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.server.level.progress.StoringChunkProgressListener,int,int,int,int) -> a
     96:110:void lambda$static$0(it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap) -> a
     95:95:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.LoadingOverlay -> dfq:
-    net.minecraft.resources.ResourceLocation MOJANG_LOGO_LOCATION -> a
-    net.minecraft.client.Minecraft minecraft -> b
-    net.minecraft.server.packs.resources.ReloadInstance reload -> c
-    java.util.function.Consumer onFinish -> d
-    boolean fadeIn -> e
-    float currentProgress -> f
-    long fadeOutStart -> g
-    long fadeInStart -> h
-    32:40:void <init>(net.minecraft.client.Minecraft,net.minecraft.server.packs.resources.ReloadInstance,java.util.function.Consumer,boolean) -> <init>
-    43:44:void registerTextures(net.minecraft.client.Minecraft) -> a
-    48:110:void render(int,int,float) -> render
-    113:117:void drawProgressBar(int,int,int,int,float) -> a
-    121:121:boolean isPauseScreen() -> a
-    20:20:net.minecraft.resources.ResourceLocation access$000() -> b
-    21:21:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.LoadingOverlay$LogoTexture -> dfq$a:
-    126:127:void <init>() -> <init>
-    131:136:net.minecraft.client.renderer.texture.SimpleTexture$TextureImage getTextureImage(net.minecraft.server.packs.resources.ResourceManager) -> b
-net.minecraft.client.gui.screens.MenuScreens -> dfr:
+net.minecraft.client.gui.screens.LoadingOverlay -> dqf:
+    net.minecraft.resources.ResourceLocation MOJANG_STUDIOS_LOGO_LOCATION -> a
+    int BRAND_BACKGROUND -> b
+    int BRAND_BACKGROUND_NO_ALPHA -> c
+    net.minecraft.client.Minecraft minecraft -> d
+    net.minecraft.server.packs.resources.ReloadInstance reload -> e
+    java.util.function.Consumer onFinish -> i
+    boolean fadeIn -> j
+    float currentProgress -> k
+    long fadeOutStart -> l
+    long fadeInStart -> m
+    45:53:void <init>(net.minecraft.client.Minecraft,net.minecraft.server.packs.resources.ReloadInstance,java.util.function.Consumer,boolean) -> <init>
+    56:57:void registerTextures(net.minecraft.client.Minecraft) -> a
+    61:142:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    145:155:void drawProgressBar(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,float) -> a
+    159:159:boolean isPauseScreen() -> a
+    24:24:net.minecraft.resources.ResourceLocation access$000() -> b
+    25:28:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.LoadingOverlay$LogoTexture -> dqf$a:
+    164:165:void <init>() -> <init>
+    169:174:net.minecraft.client.renderer.texture.SimpleTexture$TextureImage getTextureImage(net.minecraft.server.packs.resources.ResourceManager) -> b
+net.minecraft.client.gui.screens.MenuScreens -> dqg:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Map SCREENS -> b
-    35:35:void <init>() -> <init>
-    39:51:void create(net.minecraft.world.inventory.MenuType,net.minecraft.client.Minecraft,int,net.minecraft.network.chat.Component) -> a
-    56:56:net.minecraft.client.gui.screens.MenuScreens$ScreenConstructor getConstructor(net.minecraft.world.inventory.MenuType) -> a
-    73:77:void register(net.minecraft.world.inventory.MenuType,net.minecraft.client.gui.screens.MenuScreens$ScreenConstructor) -> a
-    108:115:boolean selfTest() -> a
-    36:105:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.MenuScreens$ScreenConstructor -> dfr$a:
-    61:65:void fromPacket(net.minecraft.network.chat.Component,net.minecraft.world.inventory.MenuType,net.minecraft.client.Minecraft,int) -> a
+    36:36:void <init>() -> <init>
+    40:52:void create(net.minecraft.world.inventory.MenuType,net.minecraft.client.Minecraft,int,net.minecraft.network.chat.Component) -> a
+    57:57:net.minecraft.client.gui.screens.MenuScreens$ScreenConstructor getConstructor(net.minecraft.world.inventory.MenuType) -> a
+    74:78:void register(net.minecraft.world.inventory.MenuType,net.minecraft.client.gui.screens.MenuScreens$ScreenConstructor) -> a
+    110:117:boolean selfTest() -> a
+    37:107:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.MenuScreens$ScreenConstructor -> dqg$a:
+    62:66:void fromPacket(net.minecraft.network.chat.Component,net.minecraft.world.inventory.MenuType,net.minecraft.client.Minecraft,int) -> a
     net.minecraft.client.gui.screens.Screen create(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> create
-net.minecraft.client.gui.screens.MouseSettingsScreen -> dfs:
+net.minecraft.client.gui.screens.MouseSettingsScreen -> dqh:
     net.minecraft.client.gui.components.OptionsList list -> c
-    net.minecraft.client.Option[] OPTIONS -> d
-    26:27:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
-    31:45:void init() -> init
-    49:55:void render(int,int,float) -> render
-    42:44:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    34:34:net.minecraft.client.Option[] lambda$init$0(int) -> a
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.OptionsScreen -> dft:
+    net.minecraft.client.Option[] OPTIONS -> p
+    27:28:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
+    32:46:void init() -> b
+    50:56:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    43:45:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    35:35:net.minecraft.client.Option[] lambda$init$0(int) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.OptionsScreen -> dqi:
     net.minecraft.client.Option[] OPTION_SCREEN_OPTIONS -> a
     net.minecraft.client.gui.screens.Screen lastScreen -> b
     net.minecraft.client.Options options -> c
-    net.minecraft.client.gui.components.Button difficultyButton -> d
-    net.minecraft.client.gui.components.LockIconButton lockButton -> e
-    net.minecraft.world.Difficulty currentDifficulty -> f
-    29:32:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
-    36:91:void init() -> init
-    94:94:java.lang.String getDifficultyText(net.minecraft.world.Difficulty) -> a
-    98:105:void lockCallback(boolean) -> a
-    109:110:void removed() -> removed
-    114:117:void render(int,int,float) -> render
-    90:90:void lambda$init$11(net.minecraft.client.gui.components.Button) -> a
-    88:88:void lambda$init$10(net.minecraft.client.gui.components.Button) -> b
-    87:87:void lambda$init$9(net.minecraft.client.gui.components.Button) -> c
-    85:85:void lambda$init$8(net.minecraft.client.gui.components.Button) -> d
-    84:84:void lambda$init$7(net.minecraft.client.gui.components.Button) -> e
-    82:82:void lambda$init$6(net.minecraft.client.gui.components.Button) -> f
-    81:81:void lambda$init$5(net.minecraft.client.gui.components.Button) -> g
-    79:79:void lambda$init$4(net.minecraft.client.gui.components.Button) -> h
-    78:78:void lambda$init$3(net.minecraft.client.gui.components.Button) -> i
-    72:75:void lambda$init$2(net.minecraft.client.gui.components.Button) -> j
-    57:62:void lambda$init$1(net.minecraft.client.gui.components.Button) -> k
-    49:52:void lambda$init$0(net.minecraft.client.gui.components.Button) -> l
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.OptionsSubScreen -> dfu:
+    net.minecraft.client.gui.components.Button difficultyButton -> p
+    net.minecraft.client.gui.components.LockIconButton lockButton -> q
+    net.minecraft.world.Difficulty currentDifficulty -> r
+    35:38:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
+    42:97:void init() -> b
+    100:119:void updatePackList(net.minecraft.server.packs.repository.PackRepository) -> a
+    122:122:net.minecraft.network.chat.Component getDifficultyText(net.minecraft.world.Difficulty) -> a
+    126:133:void lockCallback(boolean) -> c
+    137:138:void removed() -> e
+    142:145:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    96:96:void lambda$init$11(net.minecraft.client.gui.components.Button) -> a
+    94:94:void lambda$init$10(net.minecraft.client.gui.components.Button) -> b
+    93:93:void lambda$init$9(net.minecraft.client.gui.components.Button) -> c
+    91:91:void lambda$init$8(net.minecraft.client.gui.components.Button) -> d
+    90:90:void lambda$init$7(net.minecraft.client.gui.components.Button) -> e
+    88:88:void lambda$init$6(net.minecraft.client.gui.components.Button) -> f
+    87:87:void lambda$init$5(net.minecraft.client.gui.components.Button) -> g
+    85:85:void lambda$init$4(net.minecraft.client.gui.components.Button) -> h
+    84:84:void lambda$init$3(net.minecraft.client.gui.components.Button) -> i
+    78:81:void lambda$init$2(net.minecraft.client.gui.components.Button) -> j
+    63:68:void lambda$init$1(net.minecraft.client.gui.components.Button) -> k
+    55:58:void lambda$init$0(net.minecraft.client.gui.components.Button) -> l
+    24:24:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.OptionsSubScreen -> dqj:
     net.minecraft.client.gui.screens.Screen lastScreen -> a
     net.minecraft.client.Options options -> b
     11:14:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options,net.minecraft.network.chat.Component) -> <init>
-    18:19:void removed() -> removed
-    23:24:void onClose() -> onClose
-net.minecraft.client.gui.screens.OutOfMemoryScreen -> dfv:
-    9:10:void <init>() -> <init>
-    14:16:void init() -> init
-    20:20:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    25:38:void render(int,int,float) -> render
-    15:15:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    14:14:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
-net.minecraft.client.gui.screens.Overlay -> dfw:
+    18:19:void removed() -> e
+    23:24:void onClose() -> au_
+net.minecraft.client.gui.screens.OutOfMemoryScreen -> dqk:
+    10:11:void <init>() -> <init>
+    15:17:void init() -> b
+    21:21:boolean shouldCloseOnEsc() -> at_
+    26:39:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    16:16:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    15:15:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+net.minecraft.client.gui.screens.Overlay -> dql:
     6:6:void <init>() -> <init>
     8:8:boolean isPauseScreen() -> a
-net.minecraft.client.gui.screens.PauseScreen -> dfx:
+net.minecraft.client.gui.screens.PauseScreen -> dqm:
     boolean showPauseMenu -> a
     20:22:void <init>(boolean) -> <init>
-    26:29:void init() -> init
-    32:92:void createPauseMenu() -> a
-    96:97:void tick() -> tick
-    101:108:void render(int,int,float) -> render
+    26:29:void init() -> b
+    32:92:void createPauseMenu() -> i
+    96:97:void tick() -> d
+    101:108:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
     70:88:void lambda$createPauseMenu$9(net.minecraft.client.gui.components.Button) -> a
-    64:65:void lambda$createPauseMenu$8(net.minecraft.client.gui.components.Button) -> b
+    64:64:void lambda$createPauseMenu$8(net.minecraft.client.gui.components.Button) -> b
     61:61:void lambda$createPauseMenu$7(net.minecraft.client.gui.components.Button) -> c
     53:53:void lambda$createPauseMenu$6(net.minecraft.client.gui.components.Button) -> d
-    54:58:void lambda$null$5(boolean) -> a
+    54:58:void lambda$null$5(boolean) -> c
     45:45:void lambda$createPauseMenu$4(java.lang.String,net.minecraft.client.gui.components.Button) -> a
-    46:50:void lambda$null$3(java.lang.String,boolean) -> a
+    46:50:void lambda$null$3(java.lang.String,boolean) -> c
     41:41:void lambda$createPauseMenu$2(net.minecraft.client.gui.components.Button) -> e
     40:40:void lambda$createPauseMenu$1(net.minecraft.client.gui.components.Button) -> f
     36:38:void lambda$createPauseMenu$0(net.minecraft.client.gui.components.Button) -> g
-net.minecraft.client.gui.screens.PresetFlatWorldScreen -> dfy:
-    java.util.List PRESETS -> a
-    net.minecraft.client.gui.screens.CreateFlatWorldScreen parent -> b
-    java.lang.String shareText -> c
-    java.lang.String listText -> d
-    net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList list -> e
-    net.minecraft.client.gui.components.Button selectButton -> f
-    net.minecraft.client.gui.components.EditBox export -> g
-    144:146:void <init>(net.minecraft.client.gui.screens.CreateFlatWorldScreen) -> <init>
-    150:170:void init() -> init
-    175:175:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    180:183:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    187:188:void onClose() -> onClose
-    192:193:void removed() -> removed
-    197:209:void render(int,int,float) -> render
-    213:215:void tick() -> tick
-    218:219:void updateButtonValidity(boolean) -> a
-    305:319:void preset(java.lang.String,net.minecraft.world.level.ItemLike,net.minecraft.world.level.biome.Biome,java.util.List,net.minecraft.world.level.levelgen.flat.FlatLayerInfo[]) -> a
-    167:167:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    164:166:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
-    31:31:java.util.List access$000() -> a
-    31:31:net.minecraft.client.gui.components.EditBox access$200(net.minecraft.client.gui.screens.PresetFlatWorldScreen) -> a
-    40:141:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetInfo -> dfy$a:
+net.minecraft.client.gui.screens.PopupScreen -> dqn:
+    net.minecraft.network.chat.FormattedText message -> a
+    com.google.common.collect.ImmutableList buttonOptions -> b
+    java.util.List messageLines -> c
+    int contentTop -> p
+    int buttonWidth -> q
+    25:28:void <init>(net.minecraft.network.chat.Component,java.util.List,com.google.common.collect.ImmutableList) -> <init>
+    32:32:java.lang.String getNarrationMessage() -> as_
+    37:57:void init(net.minecraft.client.Minecraft,int,int) -> b
+    61:72:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    76:76:boolean shouldCloseOnEsc() -> at_
+net.minecraft.client.gui.screens.PopupScreen$ButtonOption -> dqn$a:
+    net.minecraft.network.chat.Component message -> a
+    net.minecraft.client.gui.components.Button$OnPress onPress -> b
+    83:86:void <init>(net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    79:79:net.minecraft.network.chat.Component access$000(net.minecraft.client.gui.screens.PopupScreen$ButtonOption) -> a
+    79:79:net.minecraft.client.gui.components.Button$OnPress access$100(net.minecraft.client.gui.screens.PopupScreen$ButtonOption) -> b
+net.minecraft.client.gui.screens.PresetFlatWorldScreen -> dqo:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    java.util.List PRESETS -> b
+    net.minecraft.client.gui.screens.CreateFlatWorldScreen parent -> c
+    net.minecraft.network.chat.Component shareText -> p
+    net.minecraft.network.chat.Component listText -> q
+    net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList list -> r
+    net.minecraft.client.gui.components.Button selectButton -> s
+    net.minecraft.client.gui.components.EditBox export -> t
+    net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings settings -> u
+    190:192:void <init>(net.minecraft.client.gui.screens.CreateFlatWorldScreen) -> <init>
+    196:229:net.minecraft.world.level.levelgen.flat.FlatLayerInfo getLayerInfoFromString(java.lang.String,int) -> a
+    233:246:java.util.List getLayersInfoFromString(java.lang.String) -> a
+    250:274:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings fromString(java.lang.String,net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> a
+    278:290:java.lang.String save(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> b
+    295:317:void init() -> b
+    322:322:boolean mouseScrolled(double,double,double) -> a
+    327:330:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    334:335:void onClose() -> au_
+    339:340:void removed() -> e
+    344:356:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    360:362:void tick() -> d
+    365:366:void updateButtonValidity(boolean) -> c
+    448:473:void preset(net.minecraft.network.chat.Component,net.minecraft.world.level.ItemLike,net.minecraft.world.level.biome.Biome,java.util.List,boolean,boolean,boolean,net.minecraft.world.level.levelgen.flat.FlatLayerInfo[]) -> a
+    314:314:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    310:313:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    267:267:java.lang.IllegalArgumentException lambda$fromString$0(net.minecraft.resources.ResourceLocation) -> a
+    45:45:java.util.List access$000() -> i
+    45:45:java.lang.String access$200(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> a
+    45:45:net.minecraft.client.gui.components.EditBox access$300(net.minecraft.client.gui.screens.PresetFlatWorldScreen) -> a
+    45:45:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings access$402(net.minecraft.client.gui.screens.PresetFlatWorldScreen,net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> a
+    46:187:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetInfo -> dqo$a:
     net.minecraft.world.item.Item icon -> a
-    java.lang.String name -> b
-    java.lang.String value -> c
-    326:330:void <init>(net.minecraft.world.item.Item,java.lang.String,java.lang.String) -> <init>
-net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList -> dfy$b:
+    net.minecraft.network.chat.Component name -> b
+    net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings settings -> c
+    480:484:void <init>(net.minecraft.world.item.Item,net.minecraft.network.chat.Component,net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> <init>
+    487:487:net.minecraft.network.chat.Component getName() -> a
+net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList -> dqo$b:
     net.minecraft.client.gui.screens.PresetFlatWorldScreen this$0 -> a
-    222:227:void <init>(net.minecraft.client.gui.screens.PresetFlatWorldScreen) -> <init>
-    231:236:void setSelected(net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList$Entry) -> a
-    240:242:void moveSelection(int) -> moveSelection
-    246:246:boolean isFocused() -> isFocused
-    251:259:boolean keyPressed(int,int,int) -> keyPressed
-    221:221:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> setSelected
-    221:221:net.minecraft.client.Minecraft access$300(net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList) -> a
-net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList$Entry -> dfy$b$a:
+    369:374:void <init>(net.minecraft.client.gui.screens.PresetFlatWorldScreen) -> <init>
+    378:384:void setSelected(net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList$Entry) -> a
+    388:388:boolean isFocused() -> b
+    393:401:boolean keyPressed(int,int,int) -> a
+    368:368:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+    368:368:net.minecraft.client.Minecraft access$500(net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList) -> a
+net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList$Entry -> dqo$b$a:
     net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList this$1 -> a
-    262:262:void <init>(net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList) -> <init>
-    265:268:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    272:275:boolean mouseClicked(double,double,int) -> mouseClicked
-    279:283:void select() -> a
-    286:293:void blitSlot(int,int,net.minecraft.world.item.Item) -> a
-    296:300:void blitSlotBg(int,int) -> a
-    262:262:void access$100(net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList$Entry) -> a
-net.minecraft.client.gui.screens.ProgressScreen -> dfz:
-    java.lang.String title -> a
-    java.lang.String stage -> b
+    404:404:void <init>(net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList) -> <init>
+    407:410:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    414:417:boolean mouseClicked(double,double,int) -> a
+    421:426:void select() -> a
+    429:436:void blitSlot(com.mojang.blaze3d.vertex.PoseStack,int,int,net.minecraft.world.item.Item) -> a
+    439:443:void blitSlotBg(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    404:404:void access$100(net.minecraft.client.gui.screens.PresetFlatWorldScreen$PresetsList$Entry) -> a
+net.minecraft.client.gui.screens.ProgressScreen -> dqp:
+    net.minecraft.network.chat.Component header -> a
+    net.minecraft.network.chat.Component stage -> b
     int progress -> c
-    boolean stop -> d
-    11:18:void <init>() -> <init>
-    22:22:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    27:28:void progressStartNoAbort(net.minecraft.network.chat.Component) -> a
-    32:35:void progressStart(net.minecraft.network.chat.Component) -> b
-    39:42:void progressStage(net.minecraft.network.chat.Component) -> c
-    46:47:void progressStagePercentage(int) -> a
-    51:52:void stop() -> a
-    56:72:void render(int,int,float) -> render
-net.minecraft.client.gui.screens.ReceivingLevelScreen -> dga:
-    8:9:void <init>() -> <init>
-    13:13:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    18:23:void render(int,int,float) -> render
-    27:27:boolean isPauseScreen() -> isPauseScreen
-net.minecraft.client.gui.screens.Screen -> dgb:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    java.util.Set ALLOWED_PROTOCOLS -> ALLOWED_PROTOCOLS
-    net.minecraft.network.chat.Component title -> title
-    java.util.List children -> children
-    net.minecraft.client.Minecraft minecraft -> minecraft
-    net.minecraft.client.renderer.entity.ItemRenderer itemRenderer -> itemRenderer
-    int width -> width
-    int height -> height
-    java.util.List buttons -> buttons
-    boolean passEvents -> passEvents
-    net.minecraft.client.gui.Font font -> font
-    java.net.URI clickedLink -> clickedLink
+    boolean stop -> p
+    21:22:void <init>() -> <init>
+    26:26:boolean shouldCloseOnEsc() -> at_
+    31:32:void progressStartNoAbort(net.minecraft.network.chat.Component) -> a
+    36:38:void progressStart(net.minecraft.network.chat.Component) -> b
+    42:44:void progressStage(net.minecraft.network.chat.Component) -> c
+    48:49:void progressStagePercentage(int) -> a
+    53:54:void stop() -> a
+    58:76:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+net.minecraft.client.gui.screens.ReceivingLevelScreen -> dqq:
+    9:10:void <init>() -> <init>
+    14:14:boolean shouldCloseOnEsc() -> at_
+    19:24:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    28:28:boolean isPauseScreen() -> ax_
+net.minecraft.client.gui.screens.ResourcePackSelectScreen -> dqr:
+    14:15:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.server.packs.repository.PackRepository,java.util.function.Consumer,java.io.File) -> <init>
+    14:14:net.minecraft.client.gui.screens.packs.PackSelectionModel lambda$new$0(net.minecraft.server.packs.repository.PackRepository,java.util.function.Consumer,java.lang.Runnable) -> a
+net.minecraft.client.gui.screens.Screen -> dqs:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    java.util.Set ALLOWED_PROTOCOLS -> b
+    net.minecraft.network.chat.Component title -> d
+    java.util.List children -> e
+    net.minecraft.client.Minecraft minecraft -> i
+    net.minecraft.client.renderer.entity.ItemRenderer itemRenderer -> j
+    int width -> k
+    int height -> l
+    java.util.List buttons -> m
+    boolean passEvents -> n
+    net.minecraft.client.gui.Font font -> o
+    java.net.URI clickedLink -> c
     55:68:void <init>(net.minecraft.network.chat.Component) -> <init>
-    71:71:net.minecraft.network.chat.Component getTitle() -> getTitle
-    75:75:java.lang.String getNarrationMessage() -> getNarrationMessage
-    80:83:void render(int,int,float) -> render
-    87:98:boolean keyPressed(int,int,int) -> keyPressed
-    102:102:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    106:107:void onClose() -> onClose
-    110:112:net.minecraft.client.gui.components.AbstractWidget addButton(net.minecraft.client.gui.components.AbstractWidget) -> addButton
-    116:117:void renderTooltip(net.minecraft.world.item.ItemStack,int,int) -> renderTooltip
-    120:127:java.util.List getTooltipFromItem(net.minecraft.world.item.ItemStack) -> getTooltipFromItem
-    131:132:void renderTooltip(java.lang.String,int,int) -> renderTooltip
-    135:214:void renderTooltip(java.util.List,int,int) -> renderTooltip
-    217:260:void renderComponentHoverEffect(net.minecraft.network.chat.Component,int,int) -> renderComponentHoverEffect
-    263:263:void insertText(java.lang.String,boolean) -> insertText
-    266:315:boolean handleComponentClicked(net.minecraft.network.chat.Component) -> handleComponentClicked
-    319:320:void sendMessage(java.lang.String) -> sendMessage
-    323:327:void sendMessage(java.lang.String,boolean) -> sendMessage
-    330:339:void init(net.minecraft.client.Minecraft,int,int) -> init
-    342:344:void setSize(int,int) -> setSize
-    348:348:java.util.List children() -> children
-    357:357:void init() -> init
-    360:360:void tick() -> tick
-    363:363:void removed() -> removed
-    366:367:void renderBackground() -> renderBackground
-    370:375:void renderBackground(int) -> renderBackground
-    378:389:void renderDirtBackground(int) -> renderDirtBackground
-    392:392:boolean isPauseScreen() -> isPauseScreen
-    396:402:void confirmLink(boolean) -> confirmLink
-    405:406:void openLink(java.net.URI) -> openLink
-    410:414:boolean hasControlDown() -> hasControlDown
-    418:418:boolean hasShiftDown() -> hasShiftDown
-    422:422:boolean hasAltDown() -> hasAltDown
-    426:426:boolean isCut(int) -> isCut
-    430:430:boolean isPaste(int) -> isPaste
-    434:434:boolean isCopy(int) -> isCopy
-    438:438:boolean isSelectAll(int) -> isSelectAll
-    442:443:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    447:454:void wrapScreenError(java.lang.Runnable,java.lang.String,java.lang.String) -> wrapScreenError
-    457:468:boolean isValidCharacterForName(java.lang.String,char,int) -> isValidCharacterForName
-    473:473:boolean isMouseOver(double,double) -> isMouseOver
-    451:451:java.lang.String lambda$wrapScreenError$0(java.lang.String) -> lambda$wrapScreenError$0
+    71:71:net.minecraft.network.chat.Component getTitle() -> p
+    75:75:java.lang.String getNarrationMessage() -> as_
+    80:83:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    87:98:boolean keyPressed(int,int,int) -> a
+    102:102:boolean shouldCloseOnEsc() -> at_
+    106:107:void onClose() -> au_
+    110:111:net.minecraft.client.gui.components.AbstractWidget addButton(net.minecraft.client.gui.components.AbstractWidget) -> a
+    115:116:net.minecraft.client.gui.components.events.GuiEventListener addWidget(net.minecraft.client.gui.components.events.GuiEventListener) -> d
+    120:121:void renderTooltip(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.item.ItemStack,int,int) -> a
+    124:124:java.util.List getTooltipFromItem(net.minecraft.world.item.ItemStack) -> a
+    128:129:void renderTooltip(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.network.chat.FormattedText,int,int) -> a
+    132:218:void renderTooltip(com.mojang.blaze3d.vertex.PoseStack,java.util.List,int,int) -> b
+    221:243:void renderComponentHoverEffect(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.network.chat.Style,int,int) -> a
+    246:246:void insertText(java.lang.String,boolean) -> a
+    249:298:boolean handleComponentClicked(net.minecraft.network.chat.Style) -> a
+    302:303:void sendMessage(java.lang.String) -> c
+    306:310:void sendMessage(java.lang.String,boolean) -> b
+    313:322:void init(net.minecraft.client.Minecraft,int,int) -> b
+    325:327:void setSize(int,int) -> a
+    331:331:java.util.List children() -> av_
+    340:340:void init() -> b
+    344:344:void tick() -> d
+    347:347:void removed() -> e
+    350:351:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    354:359:void renderBackground(com.mojang.blaze3d.vertex.PoseStack,int) -> a
+    362:373:void renderDirtBackground(int) -> f
+    376:376:boolean isPauseScreen() -> ax_
+    380:386:void confirmLink(boolean) -> c
+    389:390:void openLink(java.net.URI) -> a
+    394:398:boolean hasControlDown() -> q
+    402:402:boolean hasShiftDown() -> s
+    406:406:boolean hasAltDown() -> t
+    410:410:boolean isCut(int) -> g
+    414:414:boolean isPaste(int) -> h
+    418:418:boolean isCopy(int) -> i
+    422:422:boolean isSelectAll(int) -> j
+    426:427:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    431:438:void wrapScreenError(java.lang.Runnable,java.lang.String,java.lang.String) -> a
+    441:452:boolean isValidCharacterForName(java.lang.String,char,int) -> a
+    457:457:boolean isMouseOver(double,double) -> b
+    461:461:void onFilesDrop(java.util.List) -> a
+    435:435:java.lang.String lambda$wrapScreenError$0(java.lang.String) -> b
     50:51:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.ShareToLanScreen -> dgc:
+net.minecraft.client.gui.screens.ShareToLanScreen -> dqt:
     net.minecraft.client.gui.screens.Screen lastScreen -> a
     net.minecraft.client.gui.components.Button commandsButton -> b
     net.minecraft.client.gui.components.Button modeButton -> c
-    java.lang.String gameModeName -> d
-    boolean commands -> e
-    15:21:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
-    25:59:void init() -> init
-    62:65:void updateSelectionStrings() -> a
-    69:75:void render(int,int,float) -> render
-    54:56:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
-    42:52:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
-    39:39:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
-    26:38:void lambda$init$0(net.minecraft.client.gui.components.Button) -> d
-net.minecraft.client.gui.screens.SkinCustomizationScreen -> dgd:
-    13:14:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
-    18:41:void init() -> init
-    45:49:void render(int,int,float) -> render
-    54:60:java.lang.String getMessage(net.minecraft.world.entity.player.PlayerModelPart) -> a
-    40:40:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
-    29:33:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
-    22:24:void lambda$init$0(net.minecraft.world.entity.player.PlayerModelPart,net.minecraft.client.gui.components.Button) -> a
-net.minecraft.client.gui.screens.SoundOptionsScreen -> dge:
-    14:15:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
-    19:37:void init() -> init
-    41:44:void render(int,int,float) -> render
-    36:36:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    32:35:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
-net.minecraft.client.gui.screens.TitleScreen -> dgf:
+    java.lang.String gameModeName -> p
+    boolean commands -> q
+    17:23:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
+    27:61:void init() -> b
+    64:67:void updateSelectionStrings() -> i
+    71:77:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    56:58:void lambda$init$3(net.minecraft.client.gui.components.Button) -> a
+    44:54:void lambda$init$2(net.minecraft.client.gui.components.Button) -> b
+    41:41:void lambda$init$1(net.minecraft.client.gui.components.Button) -> c
+    28:40:void lambda$init$0(net.minecraft.client.gui.components.Button) -> d
+net.minecraft.client.gui.screens.SkinCustomizationScreen -> dqu:
+    15:16:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
+    20:43:void init() -> b
+    47:51:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    54:54:net.minecraft.network.chat.Component getMessage(net.minecraft.world.entity.player.PlayerModelPart) -> a
+    42:42:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    31:35:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    24:26:void lambda$init$0(net.minecraft.world.entity.player.PlayerModelPart,net.minecraft.client.gui.components.Button) -> a
+net.minecraft.client.gui.screens.SoundOptionsScreen -> dqv:
+    15:16:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
+    20:38:void init() -> b
+    42:45:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    37:37:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    33:36:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+net.minecraft.client.gui.screens.TitleScreen -> dqw:
+    org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.client.renderer.CubeMap CUBE_MAP -> a
-    net.minecraft.resources.ResourceLocation PANORAMA_OVERLAY -> b
-    net.minecraft.resources.ResourceLocation ACCESSIBILITY_TEXTURE -> c
-    boolean minceraftEasterEgg -> d
-    java.lang.String splash -> e
-    net.minecraft.client.gui.components.Button resetDemoButton -> f
-    net.minecraft.resources.ResourceLocation MINECRAFT_LOGO -> g
-    net.minecraft.resources.ResourceLocation MINECRAFT_EDITION -> h
-    boolean realmsNotificationsInitialized -> i
-    net.minecraft.client.gui.screens.Screen realmsNotificationsScreen -> j
-    int copyrightWidth -> k
-    int copyrightX -> l
-    net.minecraft.client.renderer.PanoramaRenderer panorama -> m
-    boolean fading -> n
-    long fadeInStart -> o
-    57:58:void <init>() -> <init>
-    52:64:void <init>(boolean) -> <init>
-    67:67:boolean realmsNotificationsEnabled() -> a
-    72:75:void tick() -> tick
-    78:82:java.util.concurrent.CompletableFuture preloadResources(net.minecraft.client.renderer.texture.TextureManager,java.util.concurrent.Executor) -> a
-    88:88:boolean isPauseScreen() -> isPauseScreen
-    93:93:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    98:129:void init() -> init
-    132:141:void createNormalMenuOptions(int,int) -> a
-    144:163:void createDemoMenuOptions(int,int) -> b
-    166:168:void realmsButtonClicked() -> b
-    172:256:void render(int,int,float) -> render
-    260:271:boolean mouseClicked(double,double,int) -> mouseClicked
-    276:279:void removed() -> removed
-    282:287:void confirmDemo(boolean) -> a
-    146:156:void lambda$createDemoMenuOptions$8(net.minecraft.client.gui.components.Button) -> a
-    144:144:void lambda$createDemoMenuOptions$7(net.minecraft.client.gui.components.Button) -> b
-    140:140:void lambda$createNormalMenuOptions$6(net.minecraft.client.gui.components.Button) -> c
-    134:139:void lambda$createNormalMenuOptions$5(net.minecraft.client.gui.components.Button) -> d
-    132:132:void lambda$createNormalMenuOptions$4(net.minecraft.client.gui.components.Button) -> e
-    116:116:void lambda$init$3(net.minecraft.client.gui.components.Button) -> f
-    115:115:void lambda$init$2(net.minecraft.client.gui.components.Button) -> g
-    114:114:void lambda$init$1(net.minecraft.client.gui.components.Button) -> h
-    113:113:void lambda$init$0(net.minecraft.client.gui.components.Button) -> i
-    35:46:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.VideoSettingsScreen -> dgg:
-    net.minecraft.client.gui.components.OptionsList list -> c
-    net.minecraft.client.Option[] OPTIONS -> d
-    int oldMipmaps -> e
-    33:34:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
-    38:52:void init() -> init
-    56:61:void removed() -> removed
-    65:73:boolean mouseClicked(double,double,int) -> mouseClicked
-    78:89:boolean mouseReleased(double,double,int) -> mouseReleased
-    94:100:void render(int,int,float) -> render
-    48:51:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-    14:14:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.WinScreen -> dgh:
+    net.minecraft.resources.ResourceLocation PANORAMA_OVERLAY -> c
+    net.minecraft.resources.ResourceLocation ACCESSIBILITY_TEXTURE -> p
+    boolean minceraftEasterEgg -> q
+    java.lang.String splash -> r
+    net.minecraft.client.gui.components.Button resetDemoButton -> s
+    net.minecraft.resources.ResourceLocation MINECRAFT_LOGO -> t
+    net.minecraft.resources.ResourceLocation MINECRAFT_EDITION -> u
+    boolean realmsNotificationsInitialized -> v
+    net.minecraft.client.gui.screens.Screen realmsNotificationsScreen -> w
+    int copyrightWidth -> x
+    int copyrightX -> y
+    net.minecraft.client.renderer.PanoramaRenderer panorama -> z
+    boolean fading -> A
+    long fadeInStart -> B
+    66:67:void <init>() -> <init>
+    61:73:void <init>(boolean) -> <init>
+    76:76:boolean realmsNotificationsEnabled() -> i
+    81:84:void tick() -> d
+    87:91:java.util.concurrent.CompletableFuture preloadResources(net.minecraft.client.renderer.texture.TextureManager,java.util.concurrent.Executor) -> a
+    97:97:boolean isPauseScreen() -> ax_
+    102:102:boolean shouldCloseOnEsc() -> at_
+    107:138:void init() -> b
+    141:154:void createNormalMenuOptions(int,int) -> b
+    157:185:void createDemoMenuOptions(int,int) -> c
+    188:190:void realmsButtonClicked() -> k
+    194:282:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    286:297:boolean mouseClicked(double,double,int) -> a
+    302:305:void removed() -> e
+    308:317:void confirmDemo(boolean) -> c
+    234:236:void lambda$render$11(com.mojang.blaze3d.vertex.PoseStack,java.lang.Integer,java.lang.Integer) -> a
+    226:231:void lambda$render$10(com.mojang.blaze3d.vertex.PoseStack,java.lang.Integer,java.lang.Integer) -> b
+    159:174:void lambda$createDemoMenuOptions$9(net.minecraft.client.gui.components.Button) -> a
+    157:157:void lambda$createDemoMenuOptions$8(net.minecraft.client.gui.components.Button) -> b
+    153:153:void lambda$createNormalMenuOptions$7(net.minecraft.client.gui.components.Button) -> c
+    149:152:void lambda$createNormalMenuOptions$6(net.minecraft.client.gui.components.Button) -> d
+    144:147:void lambda$createNormalMenuOptions$5(net.minecraft.client.gui.components.Button,com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    141:141:void lambda$createNormalMenuOptions$4(net.minecraft.client.gui.components.Button) -> e
+    125:125:void lambda$init$3(net.minecraft.client.gui.components.Button) -> f
+    124:124:void lambda$init$2(net.minecraft.client.gui.components.Button) -> g
+    123:123:void lambda$init$1(net.minecraft.client.gui.components.Button) -> h
+    122:122:void lambda$init$0(net.minecraft.client.gui.components.Button) -> i
+    40:55:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.VideoSettingsScreen -> dqx:
+    net.minecraft.network.chat.Component FABULOUS -> c
+    net.minecraft.network.chat.Component WARNING_MESSAGE -> p
+    net.minecraft.network.chat.Component WARNING_TITLE -> q
+    net.minecraft.network.chat.Component BUTTON_ACCEPT -> r
+    net.minecraft.network.chat.Component BUTTON_CANCEL -> s
+    net.minecraft.network.chat.Component NEW_LINE -> t
+    net.minecraft.client.Option[] OPTIONS -> u
+    java.util.List tooltip -> v
+    net.minecraft.client.gui.components.OptionsList list -> w
+    net.minecraft.client.renderer.GpuWarnlistManager gpuWarnlistManager -> x
+    int oldMipmaps -> y
+    61:71:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
+    75:87:void init() -> b
+    91:96:void removed() -> e
+    100:148:boolean mouseClicked(double,double,int) -> a
+    153:164:boolean mouseReleased(double,double,int) -> c
+    169:187:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    190:193:void reinitialize() -> i
+    174:174:void lambda$render$3(java.util.List) -> b
+    140:142:void lambda$mouseClicked$2(net.minecraft.client.gui.components.Button) -> a
+    132:137:void lambda$mouseClicked$1(net.minecraft.client.gui.components.Button) -> b
+    83:86:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
+    28:35:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.WinScreen -> dqy:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.resources.ResourceLocation LOGO_LOCATION -> b
     net.minecraft.resources.ResourceLocation EDITION_LOCATION -> c
-    net.minecraft.resources.ResourceLocation VIGNETTE_LOCATION -> d
-    boolean poem -> e
-    java.lang.Runnable onFinished -> f
-    float time -> g
-    java.util.List lines -> h
-    int totalScrollLength -> i
-    float scrollSpeed -> j
-    38:47:void <init>(boolean,java.lang.Runnable) -> <init>
-    51:57:void tick() -> tick
-    61:62:void onClose() -> onClose
-    65:67:void respawn() -> a
-    71:124:void init() -> init
-    127:154:void renderBg(int,int,float) -> a
-    158:218:void render(int,int,float) -> render
-    27:30:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.achievement.StatsScreen -> dgi:
+    net.minecraft.resources.ResourceLocation VIGNETTE_LOCATION -> p
+    java.lang.String OBFUSCATE_TOKEN -> q
+    boolean poem -> r
+    java.lang.Runnable onFinished -> s
+    float time -> t
+    java.util.List lines -> u
+    it.unimi.dsi.fastutil.ints.IntSet centeredLines -> v
+    int totalScrollLength -> w
+    float scrollSpeed -> x
+    46:55:void <init>(boolean,java.lang.Runnable) -> <init>
+    59:65:void tick() -> d
+    69:70:void onClose() -> au_
+    73:75:void respawn() -> i
+    79:146:void init() -> b
+    149:176:void renderBg(int,int,float) -> a
+    180:246:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    196:198:void lambda$render$0(com.mojang.blaze3d.vertex.PoseStack,java.lang.Integer,java.lang.Integer) -> a
+    32:37:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.achievement.StatsScreen -> dqz:
     net.minecraft.client.gui.screens.Screen lastScreen -> a
     net.minecraft.client.gui.screens.achievement.StatsScreen$GeneralStatisticsList statsList -> c
-    net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList itemStatsList -> d
-    net.minecraft.client.gui.screens.achievement.StatsScreen$MobsStatisticsList mobsStatsList -> e
-    net.minecraft.stats.StatsCounter stats -> f
-    net.minecraft.client.gui.components.ObjectSelectionList activeList -> g
-    boolean isLoading -> h
-    45:52:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.stats.StatsCounter) -> <init>
-    56:58:void init() -> init
-    61:64:void initLists() -> a
-    67:79:void initButtons() -> b
-    83:92:void render(int,int,float) -> render
-    96:102:void onStatsUpdated() -> c
-    106:106:boolean isPauseScreen() -> isPauseScreen
-    111:111:net.minecraft.client.gui.components.ObjectSelectionList getActiveList() -> d
-    115:123:void setActiveList(net.minecraft.client.gui.components.ObjectSelectionList) -> a
-    172:172:int getColumnX(int) -> a
-    176:183:void blitSlot(int,int,net.minecraft.world.item.Item) -> a
-    186:190:void blitSlotIcon(int,int,int,int) -> a
-    71:71:void lambda$initButtons$3(net.minecraft.client.gui.components.Button) -> a
-    69:69:void lambda$initButtons$2(net.minecraft.client.gui.components.Button) -> b
-    68:68:void lambda$initButtons$1(net.minecraft.client.gui.components.Button) -> c
-    67:67:void lambda$initButtons$0(net.minecraft.client.gui.components.Button) -> d
-    36:36:net.minecraft.client.gui.Font access$100(net.minecraft.client.gui.screens.achievement.StatsScreen) -> a
-    36:36:net.minecraft.stats.StatsCounter access$200(net.minecraft.client.gui.screens.achievement.StatsScreen) -> b
-    36:36:net.minecraft.client.gui.Font access$300(net.minecraft.client.gui.screens.achievement.StatsScreen) -> c
-    36:36:net.minecraft.client.gui.Font access$400(net.minecraft.client.gui.screens.achievement.StatsScreen) -> d
-    36:36:int access$700(net.minecraft.client.gui.screens.achievement.StatsScreen,int) -> a
-    36:36:void access$800(net.minecraft.client.gui.screens.achievement.StatsScreen,int,int,int,int) -> a
-    36:36:net.minecraft.client.gui.Font access$900(net.minecraft.client.gui.screens.achievement.StatsScreen) -> e
-    36:36:net.minecraft.client.gui.Font access$1000(net.minecraft.client.gui.screens.achievement.StatsScreen) -> f
-    36:36:net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList access$1100(net.minecraft.client.gui.screens.achievement.StatsScreen) -> g
-    36:36:void access$1200(net.minecraft.client.gui.screens.achievement.StatsScreen,int,int,net.minecraft.world.item.Item) -> a
-    36:36:net.minecraft.client.gui.Font access$1300(net.minecraft.client.gui.screens.achievement.StatsScreen) -> h
-    36:36:net.minecraft.client.gui.Font access$1400(net.minecraft.client.gui.screens.achievement.StatsScreen) -> i
-    36:36:net.minecraft.client.gui.Font access$1500(net.minecraft.client.gui.screens.achievement.StatsScreen) -> j
-    36:36:net.minecraft.client.gui.Font access$1600(net.minecraft.client.gui.screens.achievement.StatsScreen) -> k
-    36:36:net.minecraft.client.gui.Font access$1700(net.minecraft.client.gui.screens.achievement.StatsScreen) -> l
-    36:36:net.minecraft.client.gui.Font access$1800(net.minecraft.client.gui.screens.achievement.StatsScreen) -> m
-    36:36:net.minecraft.client.gui.Font access$1900(net.minecraft.client.gui.screens.achievement.StatsScreen) -> n
-    36:36:net.minecraft.client.gui.Font access$2000(net.minecraft.client.gui.screens.achievement.StatsScreen) -> o
-net.minecraft.client.gui.screens.achievement.StatsScreen$1 -> dgi$1:
-net.minecraft.client.gui.screens.achievement.StatsScreen$GeneralStatisticsList -> dgi$a:
+    net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList itemStatsList -> p
+    net.minecraft.client.gui.screens.achievement.StatsScreen$MobsStatisticsList mobsStatsList -> q
+    net.minecraft.stats.StatsCounter stats -> r
+    net.minecraft.client.gui.components.ObjectSelectionList activeList -> s
+    boolean isLoading -> t
+    48:55:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.stats.StatsCounter) -> <init>
+    59:61:void init() -> b
+    64:67:void initLists() -> i
+    70:82:void initButtons() -> k
+    86:95:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    99:105:void onStatsUpdated() -> l
+    109:109:boolean isPauseScreen() -> ax_
+    114:114:net.minecraft.client.gui.components.ObjectSelectionList getActiveList() -> m
+    118:126:void setActiveList(net.minecraft.client.gui.components.ObjectSelectionList) -> a
+    163:163:java.lang.String getTranslationKey(net.minecraft.stats.Stat) -> b
+    181:181:int getColumnX(int) -> a
+    185:192:void blitSlot(com.mojang.blaze3d.vertex.PoseStack,int,int,net.minecraft.world.item.Item) -> a
+    195:199:void blitSlotIcon(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> c
+    74:74:void lambda$initButtons$3(net.minecraft.client.gui.components.Button) -> a
+    72:72:void lambda$initButtons$2(net.minecraft.client.gui.components.Button) -> b
+    71:71:void lambda$initButtons$1(net.minecraft.client.gui.components.Button) -> c
+    70:70:void lambda$initButtons$0(net.minecraft.client.gui.components.Button) -> d
+    39:39:java.lang.String access$100(net.minecraft.stats.Stat) -> a
+    39:39:net.minecraft.client.gui.Font access$200(net.minecraft.client.gui.screens.achievement.StatsScreen) -> a
+    39:39:net.minecraft.stats.StatsCounter access$300(net.minecraft.client.gui.screens.achievement.StatsScreen) -> b
+    39:39:net.minecraft.client.gui.Font access$400(net.minecraft.client.gui.screens.achievement.StatsScreen) -> c
+    39:39:net.minecraft.client.gui.Font access$500(net.minecraft.client.gui.screens.achievement.StatsScreen) -> d
+    39:39:int access$800(net.minecraft.client.gui.screens.achievement.StatsScreen,int) -> a
+    39:39:void access$900(net.minecraft.client.gui.screens.achievement.StatsScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> a
+    39:39:net.minecraft.client.gui.Font access$1000(net.minecraft.client.gui.screens.achievement.StatsScreen) -> e
+    39:39:net.minecraft.client.gui.Font access$1100(net.minecraft.client.gui.screens.achievement.StatsScreen) -> f
+    39:39:net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList access$1200(net.minecraft.client.gui.screens.achievement.StatsScreen) -> g
+    39:39:void access$1300(net.minecraft.client.gui.screens.achievement.StatsScreen,com.mojang.blaze3d.vertex.PoseStack,int,int,net.minecraft.world.item.Item) -> a
+    39:39:net.minecraft.client.gui.Font access$1400(net.minecraft.client.gui.screens.achievement.StatsScreen) -> h
+    39:39:net.minecraft.client.gui.Font access$1500(net.minecraft.client.gui.screens.achievement.StatsScreen) -> i
+    39:39:net.minecraft.client.gui.Font access$1600(net.minecraft.client.gui.screens.achievement.StatsScreen) -> j
+    39:39:net.minecraft.client.gui.Font access$1700(net.minecraft.client.gui.screens.achievement.StatsScreen) -> k
+    39:39:net.minecraft.client.gui.Font access$1800(net.minecraft.client.gui.screens.achievement.StatsScreen) -> l
+    39:39:net.minecraft.client.gui.Font access$1900(net.minecraft.client.gui.screens.achievement.StatsScreen) -> m
+    39:39:net.minecraft.client.gui.Font access$2000(net.minecraft.client.gui.screens.achievement.StatsScreen) -> n
+    39:39:net.minecraft.client.gui.Font access$2100(net.minecraft.client.gui.screens.achievement.StatsScreen) -> o
+net.minecraft.client.gui.screens.achievement.StatsScreen$1 -> dqz$1:
+net.minecraft.client.gui.screens.achievement.StatsScreen$GeneralStatisticsList -> dqz$a:
     net.minecraft.client.gui.screens.achievement.StatsScreen this$0 -> a
-    126:132:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen,net.minecraft.client.Minecraft) -> <init>
-    136:137:void renderBackground() -> renderBackground
-net.minecraft.client.gui.screens.achievement.StatsScreen$GeneralStatisticsList$Entry -> dgi$a$a:
+    129:137:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen,net.minecraft.client.Minecraft) -> <init>
+    141:142:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    133:133:java.lang.String lambda$new$0(net.minecraft.stats.Stat) -> a
+net.minecraft.client.gui.screens.achievement.StatsScreen$GeneralStatisticsList$Entry -> dqz$a$a:
     net.minecraft.stats.Stat stat -> b
     net.minecraft.client.gui.screens.achievement.StatsScreen$GeneralStatisticsList this$1 -> a
-    142:144:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$GeneralStatisticsList,net.minecraft.stats.Stat) -> <init>
-    148:153:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    139:139:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$GeneralStatisticsList,net.minecraft.stats.Stat,net.minecraft.client.gui.screens.achievement.StatsScreen$1) -> <init>
-net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList -> dgi$b:
+    147:149:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$GeneralStatisticsList,net.minecraft.stats.Stat) -> <init>
+    153:158:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    144:144:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$GeneralStatisticsList,net.minecraft.stats.Stat,net.minecraft.client.gui.screens.achievement.StatsScreen$1) -> <init>
+net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList -> dqz$b:
     java.util.List blockColumns -> a
-    java.util.List itemColumns -> b
-    int[] iconOffsets -> i
-    int headerPressed -> c
-    java.util.List statItemList -> d
-    java.util.Comparator itemStatSorter -> e
-    net.minecraft.stats.StatType sortColumn -> f
-    int sortOrder -> g
-    net.minecraft.client.gui.screens.achievement.StatsScreen this$0 -> h
-    195:245:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen,net.minecraft.client.Minecraft) -> <init>
-    249:268:void renderHeader(int,int,com.mojang.blaze3d.vertex.Tesselator) -> renderHeader
-    272:272:int getRowWidth() -> getRowWidth
-    277:277:int getScrollbarPosition() -> getScrollbarPosition
-    282:283:void renderBackground() -> renderBackground
-    287:299:void clickedHeader(int,int) -> clickedHeader
-    302:302:net.minecraft.stats.StatType getColumn(int) -> a
-    307:315:int getColumnIndex(net.minecraft.stats.StatType) -> b
-    320:347:void renderDecorations(int,int) -> renderDecorations
-    350:364:void renderMousehoverTooltip(net.minecraft.network.chat.Component,int,int) -> a
-    367:367:net.minecraft.network.chat.Component getString(net.minecraft.world.item.Item) -> a
-    371:382:void sortByColumn(net.minecraft.stats.StatType) -> a
-net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList$ItemComparator -> dgi$b$a:
+    java.util.List itemColumns -> o
+    int[] iconOffsets -> v
+    int headerPressed -> p
+    java.util.List statItemList -> q
+    java.util.Comparator itemStatSorter -> r
+    net.minecraft.stats.StatType sortColumn -> s
+    int sortOrder -> t
+    net.minecraft.client.gui.screens.achievement.StatsScreen this$0 -> u
+    204:254:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen,net.minecraft.client.Minecraft) -> <init>
+    258:277:void renderHeader(com.mojang.blaze3d.vertex.PoseStack,int,int,com.mojang.blaze3d.vertex.Tesselator) -> a
+    281:281:int getRowWidth() -> d
+    286:286:int getScrollbarPosition() -> e
+    291:292:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+    296:308:void clickedHeader(int,int) -> a
+    311:311:net.minecraft.stats.StatType getColumn(int) -> a
+    316:324:int getColumnIndex(net.minecraft.stats.StatType) -> b
+    329:356:void renderDecorations(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    359:372:void renderMousehoverTooltip(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.network.chat.Component,int,int) -> a
+    375:375:net.minecraft.network.chat.Component getString(net.minecraft.world.item.Item) -> a
+    379:390:void sortByColumn(net.minecraft.stats.StatType) -> a
+net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList$ItemComparator -> dqz$b$a:
     net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList this$1 -> a
-    384:384:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList) -> <init>
-    391:408:int compare(net.minecraft.world.item.Item,net.minecraft.world.item.Item) -> a
-    384:384:int compare(java.lang.Object,java.lang.Object) -> compare
-    384:384:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList,net.minecraft.client.gui.screens.achievement.StatsScreen$1) -> <init>
-net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList$ItemRow -> dgi$b$b:
+    392:392:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList) -> <init>
+    399:416:int compare(net.minecraft.world.item.Item,net.minecraft.world.item.Item) -> a
+    392:392:int compare(java.lang.Object,java.lang.Object) -> compare
+    392:392:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList,net.minecraft.client.gui.screens.achievement.StatsScreen$1) -> <init>
+net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList$ItemRow -> dqz$b$b:
     net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList this$1 -> a
-    412:412:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList) -> <init>
-    415:431:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    434:436:void renderStat(net.minecraft.stats.Stat,int,int,boolean) -> a
-    412:412:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList,net.minecraft.client.gui.screens.achievement.StatsScreen$1) -> <init>
-net.minecraft.client.gui.screens.achievement.StatsScreen$MobsStatisticsList -> dgi$c:
+    420:420:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList) -> <init>
+    423:439:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    442:444:void renderStat(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.stats.Stat,int,int,boolean) -> a
+    420:420:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$ItemStatisticsList,net.minecraft.client.gui.screens.achievement.StatsScreen$1) -> <init>
+net.minecraft.client.gui.screens.achievement.StatsScreen$MobsStatisticsList -> dqz$c:
     net.minecraft.client.gui.screens.achievement.StatsScreen this$0 -> a
-    441:449:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen,net.minecraft.client.Minecraft) -> <init>
-    453:454:void renderBackground() -> renderBackground
-net.minecraft.client.gui.screens.achievement.StatsScreen$MobsStatisticsList$MobRow -> dgi$c$a:
+    449:457:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen,net.minecraft.client.Minecraft) -> <init>
+    461:462:void renderBackground(com.mojang.blaze3d.vertex.PoseStack) -> a
+net.minecraft.client.gui.screens.achievement.StatsScreen$MobsStatisticsList$MobRow -> dqz$c$a:
     net.minecraft.world.entity.EntityType type -> b
     net.minecraft.client.gui.screens.achievement.StatsScreen$MobsStatisticsList this$1 -> a
-    459:461:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$MobsStatisticsList,net.minecraft.world.entity.EntityType) -> <init>
-    465:473:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    476:480:java.lang.String killsMessage(java.lang.String,int) -> a
-    485:489:java.lang.String killedByMessage(java.lang.String,int) -> b
-net.minecraft.client.gui.screens.achievement.StatsUpdateListener -> dgj:
+    467:469:void <init>(net.minecraft.client.gui.screens.achievement.StatsScreen$MobsStatisticsList,net.minecraft.world.entity.EntityType) -> <init>
+    473:481:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    484:488:java.lang.String killsMessage(java.lang.String,int) -> a
+    493:497:java.lang.String killedByMessage(java.lang.String,int) -> b
+net.minecraft.client.gui.screens.achievement.StatsUpdateListener -> dra:
     java.lang.String[] LOADING_SYMBOLS -> b
-    void onStatsUpdated() -> c
+    void onStatsUpdated() -> l
     4:4:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.achievement.package-info -> dgk:
-net.minecraft.client.gui.screens.advancements.AdvancementTab -> dgl:
+net.minecraft.client.gui.screens.achievement.package-info -> drb:
+net.minecraft.client.gui.screens.advancements.AdvancementTab -> drc:
     net.minecraft.client.Minecraft minecraft -> a
     net.minecraft.client.gui.screens.advancements.AdvancementsScreen screen -> b
     net.minecraft.client.gui.screens.advancements.AdvancementTabType type -> c
     int index -> d
     net.minecraft.advancements.Advancement advancement -> e
-    net.minecraft.advancements.DisplayInfo display -> f
-    net.minecraft.world.item.ItemStack icon -> g
-    java.lang.String title -> h
-    net.minecraft.client.gui.screens.advancements.AdvancementWidget root -> i
-    java.util.Map widgets -> j
-    double scrollX -> k
-    double scrollY -> l
-    int minX -> m
-    int minY -> n
-    int maxX -> o
-    int maxY -> p
-    float fade -> q
-    boolean centered -> r
-    29:50:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.advancements.AdvancementsScreen,net.minecraft.client.gui.screens.advancements.AdvancementTabType,int,net.minecraft.advancements.Advancement,net.minecraft.advancements.DisplayInfo) -> <init>
-    53:53:net.minecraft.client.gui.screens.advancements.AdvancementTabType getType() -> a
-    57:57:int getIndex() -> b
-    61:61:net.minecraft.advancements.Advancement getAdvancement() -> c
-    65:65:java.lang.String getTitle() -> d
-    69:69:net.minecraft.advancements.DisplayInfo getDisplay() -> e
-    73:74:void drawTab(int,int,boolean) -> a
-    77:78:void drawIcon(int,int,net.minecraft.client.renderer.entity.ItemRenderer) -> a
-    81:129:void drawContents() -> f
-    132:155:void drawTooltips(int,int,int,int) -> a
-    158:158:boolean isMouseOver(int,int,double,double) -> a
-    163:173:net.minecraft.client.gui.screens.advancements.AdvancementTab create(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.advancements.AdvancementsScreen,int,net.minecraft.advancements.Advancement) -> a
-    177:183:void scroll(double,double) -> a
-    186:192:void addAdvancement(net.minecraft.advancements.Advancement) -> a
-    195:208:void addWidget(net.minecraft.client.gui.screens.advancements.AdvancementWidget,net.minecraft.advancements.Advancement) -> a
-    212:212:net.minecraft.client.gui.screens.advancements.AdvancementWidget getWidget(net.minecraft.advancements.Advancement) -> b
-    216:216:net.minecraft.client.gui.screens.advancements.AdvancementsScreen getScreen() -> g
-net.minecraft.client.gui.screens.advancements.AdvancementTabType -> dgm:
+    net.minecraft.advancements.DisplayInfo display -> i
+    net.minecraft.world.item.ItemStack icon -> j
+    net.minecraft.network.chat.Component title -> k
+    net.minecraft.client.gui.screens.advancements.AdvancementWidget root -> l
+    java.util.Map widgets -> m
+    double scrollX -> n
+    double scrollY -> o
+    int minX -> p
+    int minY -> q
+    int maxX -> r
+    int maxY -> s
+    float fade -> t
+    boolean centered -> u
+    31:52:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.advancements.AdvancementsScreen,net.minecraft.client.gui.screens.advancements.AdvancementTabType,int,net.minecraft.advancements.Advancement,net.minecraft.advancements.DisplayInfo) -> <init>
+    55:55:net.minecraft.client.gui.screens.advancements.AdvancementTabType getType() -> a
+    59:59:int getIndex() -> b
+    63:63:net.minecraft.advancements.Advancement getAdvancement() -> c
+    67:67:net.minecraft.network.chat.Component getTitle() -> d
+    71:71:net.minecraft.advancements.DisplayInfo getDisplay() -> e
+    75:76:void drawTab(com.mojang.blaze3d.vertex.PoseStack,int,int,boolean) -> a
+    79:80:void drawIcon(int,int,net.minecraft.client.renderer.entity.ItemRenderer) -> a
+    83:131:void drawContents(com.mojang.blaze3d.vertex.PoseStack) -> a
+    134:157:void drawTooltips(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> c
+    160:160:boolean isMouseOver(int,int,double,double) -> a
+    165:175:net.minecraft.client.gui.screens.advancements.AdvancementTab create(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.advancements.AdvancementsScreen,int,net.minecraft.advancements.Advancement) -> a
+    179:185:void scroll(double,double) -> a
+    188:194:void addAdvancement(net.minecraft.advancements.Advancement) -> a
+    197:210:void addWidget(net.minecraft.client.gui.screens.advancements.AdvancementWidget,net.minecraft.advancements.Advancement) -> a
+    214:214:net.minecraft.client.gui.screens.advancements.AdvancementWidget getWidget(net.minecraft.advancements.Advancement) -> b
+    218:218:net.minecraft.client.gui.screens.advancements.AdvancementsScreen getScreen() -> f
+net.minecraft.client.gui.screens.advancements.AdvancementTabType -> drd:
     net.minecraft.client.gui.screens.advancements.AdvancementTabType ABOVE -> a
     net.minecraft.client.gui.screens.advancements.AdvancementTabType BELOW -> b
     net.minecraft.client.gui.screens.advancements.AdvancementTabType LEFT -> c
@@ -9370,51 +9667,52 @@ net.minecraft.client.gui.screens.advancements.AdvancementTabType -> dgm:
     int height -> h
     int max -> i
     net.minecraft.client.gui.screens.advancements.AdvancementTabType[] $VALUES -> j
-    17:17:net.minecraft.client.gui.screens.advancements.AdvancementTabType[] values() -> values
-    17:17:net.minecraft.client.gui.screens.advancements.AdvancementTabType valueOf(java.lang.String) -> valueOf
-    31:37:void <init>(java.lang.String,int,int,int,int,int,int) -> <init>
-    40:40:int getMax() -> a
-    44:53:void draw(net.minecraft.client.gui.GuiComponent,int,int,boolean,int) -> a
-    56:77:void drawIcon(int,int,int,net.minecraft.client.renderer.entity.ItemRenderer,net.minecraft.world.item.ItemStack) -> a
-    80:90:int getX(int) -> a
-    94:104:int getY(int) -> b
-    108:110:boolean isMouseOver(int,int,int,double,double) -> a
-    17:21:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.advancements.AdvancementTabType$1 -> dgm$1:
+    18:18:net.minecraft.client.gui.screens.advancements.AdvancementTabType[] values() -> values
+    18:18:net.minecraft.client.gui.screens.advancements.AdvancementTabType valueOf(java.lang.String) -> valueOf
+    32:38:void <init>(java.lang.String,int,int,int,int,int,int) -> <init>
+    41:41:int getMax() -> a
+    45:54:void draw(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.GuiComponent,int,int,boolean,int) -> a
+    57:78:void drawIcon(int,int,int,net.minecraft.client.renderer.entity.ItemRenderer,net.minecraft.world.item.ItemStack) -> a
+    81:91:int getX(int) -> a
+    95:105:int getY(int) -> b
+    109:111:boolean isMouseOver(int,int,int,double,double) -> a
+    18:22:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.advancements.AdvancementTabType$1 -> drd$1:
     int[] $SwitchMap$net$minecraft$client$gui$screens$advancements$AdvancementTabType -> a
-    58:58:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.advancements.AdvancementWidget -> dgn:
+    59:59:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.advancements.AdvancementWidget -> dre:
     net.minecraft.resources.ResourceLocation WIDGETS_LOCATION -> a
-    java.util.regex.Pattern LAST_WORD -> b
+    int[] TEST_SPLIT_OFFSETS -> b
     net.minecraft.client.gui.screens.advancements.AdvancementTab tab -> c
     net.minecraft.advancements.Advancement advancement -> d
     net.minecraft.advancements.DisplayInfo display -> e
-    java.lang.String title -> f
-    int width -> g
-    java.util.List description -> h
-    net.minecraft.client.Minecraft minecraft -> i
-    net.minecraft.client.gui.screens.advancements.AdvancementWidget parent -> j
-    java.util.List children -> k
-    net.minecraft.advancements.AdvancementProgress progress -> l
-    int x -> m
-    int y -> n
-    44:68:void <init>(net.minecraft.client.gui.screens.advancements.AdvancementTab,net.minecraft.client.Minecraft,net.minecraft.advancements.Advancement,net.minecraft.advancements.DisplayInfo) -> <init>
-    71:94:java.util.List findOptimalLines(java.lang.String,int) -> a
-    100:105:net.minecraft.client.gui.screens.advancements.AdvancementWidget getFirstVisibleParent(net.minecraft.advancements.Advancement) -> a
-    109:135:void drawConnectivity(int,int,boolean) -> a
-    138:156:void draw(int,int) -> a
-    159:159:int getWidth() -> a
-    163:164:void setProgress(net.minecraft.advancements.AdvancementProgress) -> a
-    167:168:void addChild(net.minecraft.client.gui.screens.advancements.AdvancementWidget) -> a
-    171:252:void drawHover(int,int,float,int,int) -> a
-    256:273:void render9Sprite(int,int,int,int,int,int,int,int,int) -> a
-    276:287:void renderRepeating(int,int,int,int,int,int,int,int) -> a
-    290:297:boolean isMouseOver(int,int,int,int) -> a
-    301:307:void attachToParent() -> b
-    310:310:int getY() -> c
-    314:314:int getX() -> d
-    20:34:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.advancements.AdvancementWidgetType -> dgo:
+    net.minecraft.network.chat.FormattedText title -> i
+    int width -> j
+    java.util.List description -> k
+    net.minecraft.client.Minecraft minecraft -> l
+    net.minecraft.client.gui.screens.advancements.AdvancementWidget parent -> m
+    java.util.List children -> n
+    net.minecraft.advancements.AdvancementProgress progress -> o
+    int x -> p
+    int y -> q
+    46:69:void <init>(net.minecraft.client.gui.screens.advancements.AdvancementTab,net.minecraft.client.Minecraft,net.minecraft.advancements.Advancement,net.minecraft.advancements.DisplayInfo) -> <init>
+    72:72:float getMaxWidth(net.minecraft.client.StringSplitter,java.util.List) -> a
+    76:93:java.util.List findOptimalLines(net.minecraft.network.chat.Component,int) -> a
+    99:104:net.minecraft.client.gui.screens.advancements.AdvancementWidget getFirstVisibleParent(net.minecraft.advancements.Advancement) -> a
+    108:134:void drawConnectivity(com.mojang.blaze3d.vertex.PoseStack,int,int,boolean) -> a
+    137:155:void draw(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    158:158:int getWidth() -> a
+    162:163:void setProgress(net.minecraft.advancements.AdvancementProgress) -> a
+    166:167:void addChild(net.minecraft.client.gui.screens.advancements.AdvancementWidget) -> a
+    170:251:void drawHover(com.mojang.blaze3d.vertex.PoseStack,int,int,float,int,int) -> a
+    255:272:void render9Sprite(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,int,int) -> a
+    275:286:void renderRepeating(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,int) -> a
+    289:296:boolean isMouseOver(int,int,int,int) -> a
+    300:306:void attachToParent() -> b
+    309:309:int getY() -> c
+    313:313:int getX() -> d
+    23:36:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.advancements.AdvancementWidgetType -> drf:
     net.minecraft.client.gui.screens.advancements.AdvancementWidgetType OBTAINED -> a
     net.minecraft.client.gui.screens.advancements.AdvancementWidgetType UNOBTAINED -> b
     int y -> c
@@ -9424,966 +9722,1096 @@ net.minecraft.client.gui.screens.advancements.AdvancementWidgetType -> dgo:
     10:12:void <init>(java.lang.String,int,int) -> <init>
     15:15:int getIndex() -> a
     3:5:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.advancements.AdvancementsScreen -> dgp:
+net.minecraft.client.gui.screens.advancements.AdvancementsScreen -> drg:
     net.minecraft.resources.ResourceLocation WINDOW_LOCATION -> a
     net.minecraft.resources.ResourceLocation TABS_LOCATION -> b
     net.minecraft.client.multiplayer.ClientAdvancements advancements -> c
-    java.util.Map tabs -> d
-    net.minecraft.client.gui.screens.advancements.AdvancementTab selectedTab -> e
-    boolean isScrolling -> f
-    42:49:void <init>(net.minecraft.client.multiplayer.ClientAdvancements) -> <init>
-    53:62:void init() -> init
-    66:71:void removed() -> removed
-    75:86:boolean mouseClicked(double,double,int) -> mouseClicked
-    91:96:boolean keyPressed(int,int,int) -> keyPressed
-    101:108:void render(int,int,float) -> render
-    112:122:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    126:144:void renderInside(int,int,int,int) -> a
-    147:168:void renderWindow(int,int) -> a
-    171:189:void renderTooltips(int,int,int,int) -> b
-    193:198:void onAddAdvancementRoot(net.minecraft.advancements.Advancement) -> a
-    202:202:void onRemoveAdvancementRoot(net.minecraft.advancements.Advancement) -> b
-    206:210:void onAddAdvancementTask(net.minecraft.advancements.Advancement) -> c
-    214:214:void onRemoveAdvancementTask(net.minecraft.advancements.Advancement) -> d
-    218:222:void onUpdateAdvancementProgress(net.minecraft.advancements.Advancement,net.minecraft.advancements.AdvancementProgress) -> a
-    226:227:void onSelectedTabChanged(net.minecraft.advancements.Advancement) -> e
-    231:233:void onAdvancementsCleared() -> a
-    237:238:net.minecraft.client.gui.screens.advancements.AdvancementWidget getAdvancementWidget(net.minecraft.advancements.Advancement) -> f
-    244:247:net.minecraft.client.gui.screens.advancements.AdvancementTab getTab(net.minecraft.advancements.Advancement) -> g
-    21:22:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.advancements.package-info -> dgq:
-net.minecraft.client.gui.screens.controls.ControlList -> dgr:
+    java.util.Map tabs -> p
+    net.minecraft.client.gui.screens.advancements.AdvancementTab selectedTab -> q
+    boolean isScrolling -> r
+    43:50:void <init>(net.minecraft.client.multiplayer.ClientAdvancements) -> <init>
+    54:63:void init() -> b
+    67:72:void removed() -> e
+    76:87:boolean mouseClicked(double,double,int) -> a
+    92:97:boolean keyPressed(int,int,int) -> a
+    102:109:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    113:123:boolean mouseDragged(double,double,int,double,double) -> a
+    127:145:void renderInside(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> c
+    148:169:void renderWindow(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    172:190:void renderTooltips(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> d
+    194:199:void onAddAdvancementRoot(net.minecraft.advancements.Advancement) -> a
+    203:203:void onRemoveAdvancementRoot(net.minecraft.advancements.Advancement) -> b
+    207:211:void onAddAdvancementTask(net.minecraft.advancements.Advancement) -> c
+    215:215:void onRemoveAdvancementTask(net.minecraft.advancements.Advancement) -> d
+    219:223:void onUpdateAdvancementProgress(net.minecraft.advancements.Advancement,net.minecraft.advancements.AdvancementProgress) -> a
+    227:228:void onSelectedTabChanged(net.minecraft.advancements.Advancement) -> e
+    232:234:void onAdvancementsCleared() -> a
+    238:239:net.minecraft.client.gui.screens.advancements.AdvancementWidget getAdvancementWidget(net.minecraft.advancements.Advancement) -> f
+    245:248:net.minecraft.client.gui.screens.advancements.AdvancementTab getTab(net.minecraft.advancements.Advancement) -> g
+    22:23:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.advancements.package-info -> drh:
+net.minecraft.client.gui.screens.controls.ControlList -> dri:
     net.minecraft.client.gui.screens.controls.ControlsScreen controlsScreen -> a
-    int maxNameWidth -> b
-    22:43:void <init>(net.minecraft.client.gui.screens.controls.ControlsScreen,net.minecraft.client.Minecraft) -> <init>
-    160:160:int getScrollbarPosition() -> getScrollbarPosition
-    165:165:int getRowWidth() -> getRowWidth
-    17:17:net.minecraft.client.Minecraft access$100(net.minecraft.client.gui.screens.controls.ControlList) -> a
-    17:17:net.minecraft.client.Minecraft access$200(net.minecraft.client.gui.screens.controls.ControlList) -> b
-    17:17:net.minecraft.client.Minecraft access$300(net.minecraft.client.gui.screens.controls.ControlList) -> c
-    17:17:net.minecraft.client.Minecraft access$400(net.minecraft.client.gui.screens.controls.ControlList) -> d
-    17:17:net.minecraft.client.gui.screens.controls.ControlsScreen access$600(net.minecraft.client.gui.screens.controls.ControlList) -> e
-    17:17:int access$700(net.minecraft.client.gui.screens.controls.ControlList) -> f
-    17:17:net.minecraft.client.Minecraft access$800(net.minecraft.client.gui.screens.controls.ControlList) -> g
-    17:17:net.minecraft.client.Minecraft access$900(net.minecraft.client.gui.screens.controls.ControlList) -> h
-    17:17:net.minecraft.client.Minecraft access$1000(net.minecraft.client.gui.screens.controls.ControlList) -> i
-    17:17:net.minecraft.client.Minecraft access$1100(net.minecraft.client.gui.screens.controls.ControlList) -> j
-net.minecraft.client.gui.screens.controls.ControlList$1 -> dgr$1:
-net.minecraft.client.gui.screens.controls.ControlList$CategoryEntry -> dgr$a:
-    java.lang.String name -> b
+    int maxNameWidth -> o
+    26:48:void <init>(net.minecraft.client.gui.screens.controls.ControlsScreen,net.minecraft.client.Minecraft) -> <init>
+    165:165:int getScrollbarPosition() -> e
+    170:170:int getRowWidth() -> d
+    21:21:net.minecraft.client.Minecraft access$100(net.minecraft.client.gui.screens.controls.ControlList) -> a
+    21:21:net.minecraft.client.Minecraft access$200(net.minecraft.client.gui.screens.controls.ControlList) -> b
+    21:21:net.minecraft.client.Minecraft access$300(net.minecraft.client.gui.screens.controls.ControlList) -> c
+    21:21:net.minecraft.client.Minecraft access$400(net.minecraft.client.gui.screens.controls.ControlList) -> d
+    21:21:net.minecraft.client.gui.screens.controls.ControlsScreen access$500(net.minecraft.client.gui.screens.controls.ControlList) -> e
+    21:21:int access$600(net.minecraft.client.gui.screens.controls.ControlList) -> f
+    21:21:net.minecraft.client.Minecraft access$700(net.minecraft.client.gui.screens.controls.ControlList) -> g
+    21:21:net.minecraft.client.Minecraft access$800(net.minecraft.client.gui.screens.controls.ControlList) -> h
+    21:21:net.minecraft.client.Minecraft access$900(net.minecraft.client.gui.screens.controls.ControlList) -> i
+    21:21:net.minecraft.client.Minecraft access$1000(net.minecraft.client.gui.screens.controls.ControlList) -> j
+net.minecraft.client.gui.screens.controls.ControlList$1 -> dri$1:
+net.minecraft.client.gui.screens.controls.ControlList$CategoryEntry -> dri$a:
+    net.minecraft.network.chat.Component name -> b
     int width -> c
     net.minecraft.client.gui.screens.controls.ControlList this$0 -> a
-    51:54:void <init>(net.minecraft.client.gui.screens.controls.ControlList,java.lang.String) -> <init>
-    58:59:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    63:63:boolean changeFocus(boolean) -> changeFocus
-    68:68:java.util.List children() -> children
-net.minecraft.client.gui.screens.controls.ControlList$Entry -> dgr$b:
-    45:45:void <init>() -> <init>
-net.minecraft.client.gui.screens.controls.ControlList$KeyEntry -> dgr$c:
+    56:59:void <init>(net.minecraft.client.gui.screens.controls.ControlList,net.minecraft.network.chat.Component) -> <init>
+    63:64:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    68:68:boolean changeFocus(boolean) -> c_
+    73:73:java.util.List children() -> av_
+net.minecraft.client.gui.screens.controls.ControlList$Entry -> dri$b:
+    50:50:void <init>() -> <init>
+net.minecraft.client.gui.screens.controls.ControlList$KeyEntry -> dri$c:
     net.minecraft.client.KeyMapping key -> b
-    java.lang.String name -> c
+    net.minecraft.network.chat.Component name -> c
     net.minecraft.client.gui.components.Button changeButton -> d
     net.minecraft.client.gui.components.Button resetButton -> e
     net.minecraft.client.gui.screens.controls.ControlList this$0 -> a
-    78:100:void <init>(net.minecraft.client.gui.screens.controls.ControlList,net.minecraft.client.KeyMapping) -> <init>
-    104:134:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    138:138:java.util.List children() -> children
-    143:149:boolean mouseClicked(double,double,int) -> mouseClicked
-    154:154:boolean mouseReleased(double,double,int) -> mouseReleased
-    92:94:void lambda$new$1(net.minecraft.client.KeyMapping,net.minecraft.client.gui.components.Button) -> a
-    81:81:void lambda$new$0(net.minecraft.client.KeyMapping,net.minecraft.client.gui.components.Button) -> b
-    72:72:void <init>(net.minecraft.client.gui.screens.controls.ControlList,net.minecraft.client.KeyMapping,net.minecraft.client.gui.screens.controls.ControlList$1) -> <init>
-    72:72:java.lang.String access$500(net.minecraft.client.gui.screens.controls.ControlList$KeyEntry) -> a
-net.minecraft.client.gui.screens.controls.ControlList$KeyEntry$1 -> dgr$c$1:
+    83:105:void <init>(net.minecraft.client.gui.screens.controls.ControlList,net.minecraft.client.KeyMapping,net.minecraft.network.chat.Component) -> <init>
+    109:139:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    143:143:java.util.List children() -> av_
+    148:154:boolean mouseClicked(double,double,int) -> a
+    159:159:boolean mouseReleased(double,double,int) -> c
+    97:99:void lambda$new$1(net.minecraft.client.KeyMapping,net.minecraft.client.gui.components.Button) -> a
+    86:86:void lambda$new$0(net.minecraft.client.KeyMapping,net.minecraft.client.gui.components.Button) -> b
+    77:77:void <init>(net.minecraft.client.gui.screens.controls.ControlList,net.minecraft.client.KeyMapping,net.minecraft.network.chat.Component,net.minecraft.client.gui.screens.controls.ControlList$1) -> <init>
+net.minecraft.client.gui.screens.controls.ControlList$KeyEntry$1 -> dri$c$1:
     net.minecraft.client.gui.screens.controls.ControlList val$this$0 -> a
     net.minecraft.client.KeyMapping val$key -> b
-    net.minecraft.client.gui.screens.controls.ControlList$KeyEntry this$1 -> c
-    81:81:void <init>(net.minecraft.client.gui.screens.controls.ControlList$KeyEntry,int,int,int,int,java.lang.String,net.minecraft.client.gui.components.Button$OnPress,net.minecraft.client.gui.screens.controls.ControlList,net.minecraft.client.KeyMapping) -> <init>
-    84:87:java.lang.String getNarrationMessage() -> getNarrationMessage
-net.minecraft.client.gui.screens.controls.ControlList$KeyEntry$2 -> dgr$c$2:
+    net.minecraft.network.chat.Component val$name -> c
+    net.minecraft.client.gui.screens.controls.ControlList$KeyEntry this$1 -> d
+    86:86:void <init>(net.minecraft.client.gui.screens.controls.ControlList$KeyEntry,int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress,net.minecraft.client.gui.screens.controls.ControlList,net.minecraft.client.KeyMapping,net.minecraft.network.chat.Component) -> <init>
+    89:92:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+net.minecraft.client.gui.screens.controls.ControlList$KeyEntry$2 -> dri$c$2:
     net.minecraft.client.gui.screens.controls.ControlList val$this$0 -> a
-    net.minecraft.client.gui.screens.controls.ControlList$KeyEntry this$1 -> b
-    94:94:void <init>(net.minecraft.client.gui.screens.controls.ControlList$KeyEntry,int,int,int,int,java.lang.String,net.minecraft.client.gui.components.Button$OnPress,net.minecraft.client.gui.screens.controls.ControlList) -> <init>
-    97:97:java.lang.String getNarrationMessage() -> getNarrationMessage
-net.minecraft.client.gui.screens.controls.ControlsScreen -> dgs:
+    net.minecraft.network.chat.Component val$name -> b
+    net.minecraft.client.gui.screens.controls.ControlList$KeyEntry this$1 -> c
+    99:99:void <init>(net.minecraft.client.gui.screens.controls.ControlList$KeyEntry,int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress,net.minecraft.client.gui.screens.controls.ControlList,net.minecraft.network.chat.Component) -> <init>
+    102:102:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+net.minecraft.client.gui.screens.controls.ControlsScreen -> drj:
     net.minecraft.client.KeyMapping selectedKey -> c
-    long lastKeySelection -> d
-    net.minecraft.client.gui.screens.controls.ControlList controlList -> e
-    net.minecraft.client.gui.components.Button resetButton -> f
-    22:23:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
-    27:40:void init() -> init
-    44:50:boolean mouseClicked(double,double,int) -> mouseClicked
-    55:67:boolean keyPressed(int,int,int) -> keyPressed
-    73:89:void render(int,int,float) -> render
-    39:39:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
-    34:38:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
-    27:27:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
-net.minecraft.client.gui.screens.controls.package-info -> dgt:
-net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen -> dgu:
+    long lastKeySelection -> p
+    net.minecraft.client.gui.screens.controls.ControlList controlList -> q
+    net.minecraft.client.gui.components.Button resetButton -> r
+    23:24:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
+    28:41:void init() -> b
+    45:51:boolean mouseClicked(double,double,int) -> a
+    56:68:boolean keyPressed(int,int,int) -> a
+    74:90:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    40:40:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    35:39:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    28:28:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
+net.minecraft.client.gui.screens.controls.package-info -> drk:
+net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen -> drl:
+    net.minecraft.resources.ResourceLocation GAMEMODE_SWITCHER_LOCATION -> a
+    int ALL_SLOTS_WIDTH -> b
+    net.minecraft.network.chat.Component SELECT_KEY -> c
+    java.util.Optional previousHovered -> p
+    java.util.Optional currentlyHovered -> q
+    int firstMouseX -> r
+    int firstMouseY -> s
+    boolean setFirstMousePos -> t
+    java.util.List slots -> u
+    92:104:void <init>() -> <init>
+    107:118:net.minecraft.world.level.GameType getDefaultSelected() -> k
+    123:131:void init() -> b
+    135:173:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    176:177:void switchToHoveredGameMode() -> l
+    180:190:void switchToHoveredGameMode(net.minecraft.client.Minecraft,java.util.Optional) -> a
+    193:200:boolean checkToClose() -> m
+    205:211:boolean keyPressed(int,int,int) -> a
+    216:216:boolean isPauseScreen() -> ax_
+    167:167:void lambda$render$1(net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeSlot,net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon) -> a
+    150:150:void lambda$render$0(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon) -> a
+    26:26:net.minecraft.client.renderer.entity.ItemRenderer access$500(net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen) -> a
+    26:26:net.minecraft.resources.ResourceLocation access$700() -> i
+    79:89:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$1 -> drl$1:
+    int[] $SwitchMap$net$minecraft$client$gui$screens$debug$GameModeSwitcherScreen$GameModeIcon -> a
+    int[] $SwitchMap$net$minecraft$world$level$GameType -> b
+    60:69:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon -> drl$a:
+    net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon CREATIVE -> a
+    net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon SURVIVAL -> b
+    net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon ADVENTURE -> c
+    net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon SPECTATOR -> d
+    net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon[] VALUES -> e
+    net.minecraft.network.chat.Component name -> f
+    java.lang.String command -> g
+    net.minecraft.world.item.ItemStack renderStack -> h
+    net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon[] $VALUES -> i
+    27:27:net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon[] values() -> values
+    27:27:net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon valueOf(java.lang.String) -> valueOf
+    41:45:void <init>(java.lang.String,int,net.minecraft.network.chat.Component,java.lang.String,net.minecraft.world.item.ItemStack) -> <init>
+    48:49:void drawIcon(net.minecraft.client.renderer.entity.ItemRenderer,int,int) -> a
+    52:52:net.minecraft.network.chat.Component getName() -> a
+    56:56:java.lang.String getCommand() -> b
+    60:64:java.util.Optional getNext() -> c
+    69:74:java.util.Optional getFromGameType(net.minecraft.world.level.GameType) -> b
+    27:27:java.util.Optional access$000(net.minecraft.world.level.GameType) -> a
+    27:27:java.lang.String access$200(net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon) -> a
+    27:27:java.util.Optional access$300(net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon) -> b
+    27:27:net.minecraft.network.chat.Component access$400(net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon) -> c
+    27:27:void access$600(net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon,net.minecraft.client.renderer.entity.ItemRenderer,int,int) -> a
+    27:33:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeSlot -> drl$b:
+    net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon icon -> b
+    boolean isSelected -> c
+    net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen this$0 -> a
+    223:226:void <init>(net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen,net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon,int,int) -> <init>
+    230:238:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    242:242:boolean isHovered() -> g
+    246:248:void setSelected(boolean) -> e
+    251:259:void drawSlot(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.texture.TextureManager) -> a
+    262:270:void drawSelection(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.texture.TextureManager) -> b
+    219:219:net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeIcon access$100(net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen$GameModeSlot) -> a
+net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen -> drm:
     net.minecraft.client.gui.components.EditBox commandEdit -> a
     net.minecraft.client.gui.components.EditBox previousEdit -> b
     net.minecraft.client.gui.components.Button doneButton -> c
-    net.minecraft.client.gui.components.Button cancelButton -> d
-    net.minecraft.client.gui.components.Button outputButton -> e
-    boolean trackOutput -> f
-    net.minecraft.client.gui.components.CommandSuggestions commandSuggestions -> g
-    25:26:void <init>() -> <init>
-    30:31:void tick() -> tick
-    net.minecraft.world.level.BaseCommandBlock getCommandBlock() -> a
-    int getPreviousY() -> b
-    39:70:void init() -> init
-    74:79:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    82:89:void updateCommandOutput() -> c
-    92:99:void onDone() -> d
-    103:104:void removed() -> removed
+    net.minecraft.client.gui.components.Button cancelButton -> p
+    net.minecraft.client.gui.components.Button outputButton -> q
+    boolean trackOutput -> r
+    net.minecraft.client.gui.components.CommandSuggestions commandSuggestions -> s
+    30:31:void <init>() -> <init>
+    35:36:void tick() -> d
+    net.minecraft.world.level.BaseCommandBlock getCommandBlock() -> i
+    int getPreviousY() -> k
+    44:75:void init() -> b
+    79:84:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    87:94:void updateCommandOutput() -> l
+    97:104:void onDone() -> m
+    108:109:void removed() -> e
     void populateAndSendPacket(net.minecraft.world.level.BaseCommandBlock) -> a
-    110:112:void onClose() -> onClose
-    115:116:void onEdited(java.lang.String) -> a
-    121:134:boolean keyPressed(int,int,int) -> keyPressed
-    139:143:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    148:152:boolean mouseClicked(double,double,int) -> mouseClicked
-    157:172:void render(int,int,float) -> render
-    43:46:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
-    41:41:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
-    40:40:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
-    14:14:net.minecraft.client.gui.components.CommandSuggestions access$000(net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen) -> a
-net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen$1 -> dgu$1:
+    115:117:void onClose() -> au_
+    120:121:void onEdited(java.lang.String) -> a
+    126:139:boolean keyPressed(int,int,int) -> a
+    144:148:boolean mouseScrolled(double,double,double) -> a
+    153:157:boolean mouseClicked(double,double,int) -> a
+    162:177:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    48:51:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
+    46:46:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    45:45:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
+    19:19:net.minecraft.client.gui.components.CommandSuggestions access$000(net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen) -> a
+net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen$1 -> drm$1:
     net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen this$0 -> a
-    48:48:void <init>(net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen,net.minecraft.client.gui.Font,int,int,int,int,java.lang.String) -> <init>
-    51:51:java.lang.String getNarrationMessage() -> getNarrationMessage
-net.minecraft.client.gui.screens.inventory.AbstractContainerScreen -> dgv:
+    53:53:void <init>(net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen,net.minecraft.client.gui.Font,int,int,int,int,net.minecraft.network.chat.Component) -> <init>
+    56:56:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+net.minecraft.client.gui.screens.inventory.AbstractContainerScreen -> drn:
     net.minecraft.resources.ResourceLocation INVENTORY_LOCATION -> a
     int imageWidth -> b
     int imageHeight -> c
-    net.minecraft.world.inventory.AbstractContainerMenu menu -> d
-    net.minecraft.world.entity.player.Inventory inventory -> e
-    int leftPos -> f
-    int topPos -> g
-    net.minecraft.world.inventory.Slot hoveredSlot -> h
-    net.minecraft.world.inventory.Slot clickedSlot -> k
-    boolean isSplittingStack -> l
-    net.minecraft.world.item.ItemStack draggingItem -> m
-    int snapbackStartX -> n
-    int snapbackStartY -> o
-    net.minecraft.world.inventory.Slot snapbackEnd -> p
-    long snapbackTime -> q
-    net.minecraft.world.item.ItemStack snapbackItem -> r
-    net.minecraft.world.inventory.Slot quickdropSlot -> s
-    long quickdropTime -> t
-    java.util.Set quickCraftSlots -> i
-    boolean isQuickCrafting -> j
-    int quickCraftingType -> u
-    int quickCraftingButton -> v
-    boolean skipNextRelease -> w
-    int quickCraftingRemainder -> x
-    long lastClickTime -> y
-    net.minecraft.world.inventory.Slot lastClickSlot -> z
-    int lastClickButton -> A
-    boolean doubleclick -> B
-    net.minecraft.world.item.ItemStack lastQuickMoved -> C
-    31:68:void <init>(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    72:75:void init() -> init
-    79:166:void render(int,int,float) -> render
-    169:172:void renderTooltip(int,int) -> a
-    175:183:void renderFloatingItem(net.minecraft.world.item.ItemStack,int,int,java.lang.String) -> a
-    186:186:void renderLabels(int,int) -> b
-    void renderBg(float,int,int) -> a
-    191:245:void renderSlot(net.minecraft.world.inventory.Slot) -> a
-    248:272:void recalculateQuickCraftRemaining() -> d
-    275:281:net.minecraft.world.inventory.Slot findSlot(double,double) -> c
-    286:360:boolean mouseClicked(double,double,int) -> mouseClicked
-    364:364:boolean hasClickedOutside(double,double,int,int,int) -> a
-    369:400:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    405:504:boolean mouseReleased(double,double,int) -> mouseReleased
-    508:508:boolean isHovering(net.minecraft.world.inventory.Slot,double,double) -> a
-    512:517:boolean isHovering(int,int,int,int,double,double) -> a
-    521:525:void slotClicked(net.minecraft.world.inventory.Slot,int,int,net.minecraft.world.inventory.ClickType) -> a
-    529:529:boolean shouldCloseOnEsc() -> shouldCloseOnEsc
-    534:550:boolean keyPressed(int,int,int) -> keyPressed
-    554:563:boolean checkNumkeyPressed(int,int) -> c
-    568:572:void removed() -> removed
-    576:576:boolean isPauseScreen() -> isPauseScreen
-    581:585:void tick() -> tick
-    589:589:net.minecraft.world.inventory.AbstractContainerMenu getMenu() -> a
-    25:25:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.AbstractFurnaceScreen -> dgw:
-    net.minecraft.resources.ResourceLocation RECIPE_BUTTON_LOCATION -> l
-    net.minecraft.client.gui.screens.recipebook.AbstractFurnaceRecipeBookComponent recipeBookComponent -> k
-    boolean widthTooNarrow -> m
-    net.minecraft.resources.ResourceLocation texture -> n
-    23:27:void <init>(net.minecraft.world.inventory.AbstractFurnaceMenu,net.minecraft.client.gui.screens.recipebook.AbstractFurnaceRecipeBookComponent,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation) -> <init>
-    31:45:void init() -> init
-    49:52:void tick() -> tick
-    56:69:void render(int,int,float) -> render
-    73:76:void renderLabels(int,int) -> b
-    80:92:void renderBg(float,int,int) -> a
-    96:104:boolean mouseClicked(double,double,int) -> mouseClicked
-    109:112:void slotClicked(net.minecraft.world.inventory.Slot,int,int,net.minecraft.world.inventory.ClickType) -> a
-    116:119:boolean keyPressed(int,int,int) -> keyPressed
-    124:125:boolean hasClickedOutside(double,double,int,int,int) -> a
-    130:133:boolean charTyped(char,int) -> charTyped
-    138:139:void recipesUpdated() -> ae_
-    143:143:net.minecraft.client.gui.screens.recipebook.RecipeBookComponent getRecipeBookComponent() -> c
-    148:150:void removed() -> removed
-    38:44:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.AnvilScreen -> dgx:
-    net.minecraft.resources.ResourceLocation ANVIL_LOCATION -> k
-    net.minecraft.client.gui.components.EditBox name -> l
-    25:26:void <init>(net.minecraft.world.inventory.AnvilMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    30:48:void init() -> init
-    52:55:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    59:63:void removed() -> removed
-    67:74:boolean keyPressed(int,int,int) -> keyPressed
-    79:103:void renderLabels(int,int) -> b
-    106:120:void onNameChanged(java.lang.String) -> a
-    124:131:void render(int,int,float) -> render
-    135:146:void renderBg(float,int,int) -> a
-    150:151:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.core.NonNullList) -> a
-    155:159:void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
-    163:163:void setContainerData(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> a
-    20:20:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.BeaconScreen -> dgy:
-    net.minecraft.resources.ResourceLocation BEACON_LOCATION -> k
-    net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconConfirmButton confirmButton -> l
-    boolean initPowerButtons -> m
-    net.minecraft.world.effect.MobEffect primary -> n
-    net.minecraft.world.effect.MobEffect secondary -> o
-    34:55:void <init>(net.minecraft.world.inventory.BeaconMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    59:67:void init() -> init
-    71:122:void tick() -> tick
-    126:135:void renderLabels(int,int) -> b
-    139:151:void renderBg(float,int,int) -> a
-    155:158:void render(int,int,float) -> render
-    24:24:net.minecraft.world.effect.MobEffect access$002(net.minecraft.client.gui.screens.inventory.BeaconScreen,net.minecraft.world.effect.MobEffect) -> a
-    24:24:net.minecraft.world.effect.MobEffect access$102(net.minecraft.client.gui.screens.inventory.BeaconScreen,net.minecraft.world.effect.MobEffect) -> b
-    24:24:boolean access$202(net.minecraft.client.gui.screens.inventory.BeaconScreen,boolean) -> a
-    24:24:net.minecraft.resources.ResourceLocation access$300() -> b
-    24:24:java.util.List access$400(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> a
-    24:24:java.util.List access$500(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> b
-    24:24:net.minecraft.world.effect.MobEffect access$000(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> c
-    24:24:net.minecraft.world.effect.MobEffect access$100(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> d
-    24:24:net.minecraft.client.Minecraft access$600(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> e
-    24:24:net.minecraft.client.Minecraft access$700(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> f
-    24:24:net.minecraft.client.Minecraft access$800(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> g
-    24:24:net.minecraft.client.Minecraft access$900(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> h
-    24:24:net.minecraft.client.Minecraft access$1000(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> i
-    24:24:net.minecraft.client.Minecraft access$1100(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> j
-    24:24:net.minecraft.client.Minecraft access$1200(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> k
-    25:25:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.BeaconScreen$1 -> dgy$1:
+    int titleLabelX -> p
+    int titleLabelY -> q
+    int inventoryLabelX -> r
+    int inventoryLabelY -> s
+    net.minecraft.world.inventory.AbstractContainerMenu menu -> t
+    net.minecraft.world.entity.player.Inventory inventory -> u
+    net.minecraft.world.inventory.Slot hoveredSlot -> v
+    net.minecraft.world.inventory.Slot clickedSlot -> A
+    net.minecraft.world.inventory.Slot snapbackEnd -> B
+    net.minecraft.world.inventory.Slot quickdropSlot -> C
+    net.minecraft.world.inventory.Slot lastClickSlot -> D
+    int leftPos -> w
+    int topPos -> x
+    boolean isSplittingStack -> E
+    net.minecraft.world.item.ItemStack draggingItem -> F
+    int snapbackStartX -> G
+    int snapbackStartY -> H
+    long snapbackTime -> I
+    net.minecraft.world.item.ItemStack snapbackItem -> J
+    long quickdropTime -> K
+    java.util.Set quickCraftSlots -> y
+    boolean isQuickCrafting -> z
+    int quickCraftingType -> L
+    int quickCraftingButton -> M
+    boolean skipNextRelease -> N
+    int quickCraftingRemainder -> O
+    long lastClickTime -> P
+    int lastClickButton -> Q
+    boolean doubleclick -> R
+    net.minecraft.world.item.ItemStack lastQuickMoved -> S
+    35:87:void <init>(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    91:94:void init() -> b
+    98:185:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    188:191:void renderTooltip(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    194:202:void renderFloatingItem(net.minecraft.world.item.ItemStack,int,int,java.lang.String) -> a
+    205:207:void renderLabels(com.mojang.blaze3d.vertex.PoseStack,int,int) -> b
+    void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    212:266:void renderSlot(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.inventory.Slot) -> a
+    269:293:void recalculateQuickCraftRemaining() -> m
+    297:303:net.minecraft.world.inventory.Slot findSlot(double,double) -> a
+    308:384:boolean mouseClicked(double,double,int) -> a
+    388:399:void checkHotbarMouseClicked(int) -> a
+    402:402:boolean hasClickedOutside(double,double,int,int,int) -> a
+    407:438:boolean mouseDragged(double,double,int,double,double) -> a
+    443:542:boolean mouseReleased(double,double,int) -> c
+    546:546:boolean isHovering(net.minecraft.world.inventory.Slot,double,double) -> a
+    550:555:boolean isHovering(int,int,int,int,double,double) -> a
+    559:563:void slotClicked(net.minecraft.world.inventory.Slot,int,int,net.minecraft.world.inventory.ClickType) -> a
+    567:567:boolean shouldCloseOnEsc() -> at_
+    572:589:boolean keyPressed(int,int,int) -> a
+    593:606:boolean checkHotbarKeyPressed(int,int) -> b
+    611:615:void removed() -> e
+    619:619:boolean isPauseScreen() -> ax_
+    624:628:void tick() -> d
+    632:632:net.minecraft.world.inventory.AbstractContainerMenu getMenu() -> i
+    27:27:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.AbstractFurnaceScreen -> dro:
+    net.minecraft.resources.ResourceLocation RECIPE_BUTTON_LOCATION -> B
+    net.minecraft.client.gui.screens.recipebook.AbstractFurnaceRecipeBookComponent recipeBookComponent -> A
+    boolean widthTooNarrow -> C
+    net.minecraft.resources.ResourceLocation texture -> D
+    24:28:void <init>(net.minecraft.world.inventory.AbstractFurnaceMenu,net.minecraft.client.gui.screens.recipebook.AbstractFurnaceRecipeBookComponent,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation) -> <init>
+    32:48:void init() -> b
+    52:55:void tick() -> d
+    59:72:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    76:88:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    92:100:boolean mouseClicked(double,double,int) -> a
+    105:108:void slotClicked(net.minecraft.world.inventory.Slot,int,int,net.minecraft.world.inventory.ClickType) -> a
+    112:115:boolean keyPressed(int,int,int) -> a
+    120:121:boolean hasClickedOutside(double,double,int,int,int) -> a
+    126:129:boolean charTyped(char,int) -> a
+    134:135:void recipesUpdated() -> ay_
+    139:139:net.minecraft.client.gui.screens.recipebook.RecipeBookComponent getRecipeBookComponent() -> l
+    144:146:void removed() -> e
+    39:45:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.AnvilScreen -> drp:
+    net.minecraft.resources.ResourceLocation ANVIL_LOCATION -> A
+    net.minecraft.client.gui.components.EditBox name -> B
+    25:27:void <init>(net.minecraft.world.inventory.AnvilMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    31:46:void subInit() -> k
+    50:53:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    57:60:void removed() -> e
+    64:71:boolean keyPressed(int,int,int) -> a
+    75:89:void onNameChanged(java.lang.String) -> a
+    93:117:void renderLabels(com.mojang.blaze3d.vertex.PoseStack,int,int) -> b
+    121:122:void renderFg(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    126:131:void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
+    21:21:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.BeaconScreen -> drq:
+    net.minecraft.resources.ResourceLocation BEACON_LOCATION -> A
+    net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconConfirmButton confirmButton -> B
+    boolean initPowerButtons -> C
+    net.minecraft.world.effect.MobEffect primary -> D
+    net.minecraft.world.effect.MobEffect secondary -> E
+    39:60:void <init>(net.minecraft.world.inventory.BeaconMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    64:72:void init() -> b
+    76:127:void tick() -> d
+    131:140:void renderLabels(com.mojang.blaze3d.vertex.PoseStack,int,int) -> b
+    144:157:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    161:164:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    29:29:net.minecraft.world.effect.MobEffect access$002(net.minecraft.client.gui.screens.inventory.BeaconScreen,net.minecraft.world.effect.MobEffect) -> a
+    29:29:net.minecraft.world.effect.MobEffect access$102(net.minecraft.client.gui.screens.inventory.BeaconScreen,net.minecraft.world.effect.MobEffect) -> b
+    29:29:boolean access$202(net.minecraft.client.gui.screens.inventory.BeaconScreen,boolean) -> a
+    29:29:net.minecraft.resources.ResourceLocation access$300() -> k
+    29:29:java.util.List access$400(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> a
+    29:29:java.util.List access$500(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> b
+    29:29:net.minecraft.world.effect.MobEffect access$000(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> c
+    29:29:net.minecraft.world.effect.MobEffect access$100(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> d
+    29:29:net.minecraft.client.Minecraft access$600(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> e
+    29:29:net.minecraft.client.Minecraft access$700(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> f
+    29:29:net.minecraft.client.Minecraft access$800(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> g
+    29:29:net.minecraft.client.Minecraft access$900(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> h
+    29:29:net.minecraft.client.Minecraft access$1000(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> i
+    29:29:net.minecraft.client.Minecraft access$1100(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> j
+    29:29:net.minecraft.client.Minecraft access$1200(net.minecraft.client.gui.screens.inventory.BeaconScreen) -> k
+    30:30:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.BeaconScreen$1 -> drq$1:
     net.minecraft.world.inventory.BeaconMenu val$menu -> a
     net.minecraft.client.gui.screens.inventory.BeaconScreen this$0 -> b
-    39:39:void <init>(net.minecraft.client.gui.screens.inventory.BeaconScreen,net.minecraft.world.inventory.BeaconMenu) -> <init>
-    42:42:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.core.NonNullList) -> a
-    46:46:void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
-    50:53:void setContainerData(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> a
-net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconCancelButton -> dgy$a:
+    44:44:void <init>(net.minecraft.client.gui.screens.inventory.BeaconScreen,net.minecraft.world.inventory.BeaconMenu) -> <init>
+    47:47:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.core.NonNullList) -> a
+    51:51:void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
+    55:58:void setContainerData(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> a
+net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconCancelButton -> drq$a:
     net.minecraft.client.gui.screens.inventory.BeaconScreen this$0 -> a
-    283:285:void <init>(net.minecraft.client.gui.screens.inventory.BeaconScreen,int,int) -> <init>
-    289:291:void onPress() -> onPress
-    295:296:void renderToolTip(int,int) -> renderToolTip
-net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconConfirmButton -> dgy$b:
+    289:291:void <init>(net.minecraft.client.gui.screens.inventory.BeaconScreen,int,int) -> <init>
+    295:297:void onPress() -> b
+    301:302:void renderToolTip(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconConfirmButton -> drq$b:
     net.minecraft.client.gui.screens.inventory.BeaconScreen this$0 -> a
-    265:267:void <init>(net.minecraft.client.gui.screens.inventory.BeaconScreen,int,int) -> <init>
-    271:274:void onPress() -> onPress
-    278:279:void renderToolTip(int,int) -> renderToolTip
-net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconPowerButton -> dgy$c:
+    271:273:void <init>(net.minecraft.client.gui.screens.inventory.BeaconScreen,int,int) -> <init>
+    277:280:void onPress() -> b
+    284:285:void renderToolTip(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconPowerButton -> drq$c:
     net.minecraft.world.effect.MobEffect effect -> b
     net.minecraft.client.renderer.texture.TextureAtlasSprite sprite -> c
     boolean isPrimary -> d
     net.minecraft.client.gui.screens.inventory.BeaconScreen this$0 -> a
-    203:208:void <init>(net.minecraft.client.gui.screens.inventory.BeaconScreen,int,int,net.minecraft.world.effect.MobEffect,boolean) -> <init>
-    212:228:void onPress() -> onPress
-    232:239:void renderToolTip(int,int) -> renderToolTip
-    243:245:void renderIcon() -> a
-net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconScreenButton -> dgy$d:
+    209:214:void <init>(net.minecraft.client.gui.screens.inventory.BeaconScreen,int,int,net.minecraft.world.effect.MobEffect,boolean) -> <init>
+    218:234:void onPress() -> b
+    238:245:void renderToolTip(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    249:251:void renderIcon(com.mojang.blaze3d.vertex.PoseStack) -> a
+net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconScreenButton -> drq$d:
     boolean selected -> a
-    164:165:void <init>(int,int) -> <init>
-    169:185:void renderButton(int,int,float) -> renderButton
-    void renderIcon() -> a
-    190:190:boolean isSelected() -> b
-    194:195:void setSelected(boolean) -> a
-net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconSpriteScreenButton -> dgy$e:
+    170:171:void <init>(int,int) -> <init>
+    175:191:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    void renderIcon(com.mojang.blaze3d.vertex.PoseStack) -> a
+    196:196:boolean isSelected() -> a
+    200:201:void setSelected(boolean) -> e
+net.minecraft.client.gui.screens.inventory.BeaconScreen$BeaconSpriteScreenButton -> drq$e:
     int iconX -> a
     int iconY -> b
-    253:256:void <init>(int,int,int,int) -> <init>
-    260:261:void renderIcon() -> a
-net.minecraft.client.gui.screens.inventory.BlastFurnaceScreen -> dgz:
-    net.minecraft.resources.ResourceLocation TEXTURE -> l
+    259:262:void <init>(int,int,int,int) -> <init>
+    266:267:void renderIcon(com.mojang.blaze3d.vertex.PoseStack) -> a
+net.minecraft.client.gui.screens.inventory.BlastFurnaceScreen -> drr:
+    net.minecraft.resources.ResourceLocation TEXTURE -> B
     13:14:void <init>(net.minecraft.world.inventory.BlastFurnaceMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
     10:10:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.BookEditScreen -> dha:
+net.minecraft.client.gui.screens.inventory.BookEditScreen -> drs:
     net.minecraft.world.entity.player.Player owner -> a
     net.minecraft.world.item.ItemStack book -> b
     boolean isModified -> c
-    boolean isSigning -> d
-    int frameTick -> e
-    int currentPage -> f
-    java.util.List pages -> g
-    java.lang.String title -> h
-    int cursorPos -> i
-    int selectionPos -> j
-    long lastClickTime -> k
-    int lastIndex -> l
-    net.minecraft.client.gui.screens.inventory.PageButton forwardButton -> m
-    net.minecraft.client.gui.screens.inventory.PageButton backButton -> n
-    net.minecraft.client.gui.components.Button doneButton -> o
-    net.minecraft.client.gui.components.Button signButton -> p
-    net.minecraft.client.gui.components.Button finalizeButton -> q
-    net.minecraft.client.gui.components.Button cancelButton -> r
-    net.minecraft.world.InteractionHand hand -> s
-    49:83:void <init>(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> <init>
-    86:86:int getNumPages() -> a
-    91:93:void tick() -> tick
-    97:128:void init() -> init
-    131:139:java.lang.String filterText(java.lang.String) -> a
-    143:149:void pageBack() -> b
-    152:167:void pageForward() -> c
-    171:172:void removed() -> removed
-    175:183:void updateButtonVisibility() -> d
-    186:190:void eraseEmptyTrailingPages() -> e
-    193:211:void saveChanges(boolean) -> a
-    214:219:void appendPageToBook() -> f
-    223:230:boolean keyPressed(int,int,int) -> keyPressed
-    236:253:boolean charTyped(char,int) -> charTyped
-    258:315:boolean bookKeyPressed(int,int,int) -> b
-    319:329:void keyBackspace(java.lang.String) -> b
-    332:340:void keyDelete(java.lang.String) -> c
-    343:352:void keyLeft(java.lang.String) -> d
-    355:364:void keyRight(java.lang.String) -> e
-    367:384:void keyUp(java.lang.String) -> f
-    387:405:void keyDown(java.lang.String) -> g
-    408:412:void keyHome(java.lang.String) -> h
-    415:419:void keyEnd(java.lang.String) -> i
-    422:432:void deleteSelection() -> g
-    435:435:int getWidthAt(java.lang.String,int) -> a
-    439:456:boolean titleKeyPressed(int,int,int) -> c
-    460:463:java.lang.String getCurrentPageText() -> h
-    467:471:void setCurrentPageText(java.lang.String) -> j
-    474:486:void insertText(java.lang.String) -> k
-    490:549:void render(int,int,float) -> render
-    552:552:int strWidth(java.lang.String) -> l
-    556:556:int strIndexAtWidth(java.lang.String,int) -> b
-    560:563:java.lang.String getSelected() -> i
-    567:601:void renderSelection(java.lang.String) -> m
-    604:634:void renderHighlight(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i,net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> a
-    637:665:net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i getPositionAtIndex(java.lang.String,int) -> c
-    669:672:void handleBidi(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> a
-    675:677:void convertScreenToLocal(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> b
-    680:682:void convertLocalToScreen(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> c
-    685:724:int indexInLine(java.lang.String,int) -> d
-    728:761:int getIndexAtPosition(java.lang.String,net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> a
-    766:798:boolean mouseClicked(double,double,int) -> mouseClicked
-    803:814:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    125:125:void lambda$init$5(net.minecraft.client.gui.components.Button) -> a
-    124:124:void lambda$init$4(net.minecraft.client.gui.components.Button) -> b
-    115:119:void lambda$init$3(net.minecraft.client.gui.components.Button) -> c
-    109:113:void lambda$init$2(net.minecraft.client.gui.components.Button) -> d
-    104:106:void lambda$init$1(net.minecraft.client.gui.components.Button) -> e
-    100:102:void lambda$init$0(net.minecraft.client.gui.components.Button) -> f
-net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i -> dha$a:
-    int x -> b
-    int y -> c
-    net.minecraft.client.gui.screens.inventory.BookEditScreen this$0 -> a
-    821:822:void <init>(net.minecraft.client.gui.screens.inventory.BookEditScreen) -> <init>
-    824:827:void <init>(net.minecraft.client.gui.screens.inventory.BookEditScreen,int,int) -> <init>
-    817:817:int access$000(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> a
-    817:817:int access$100(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> b
-    817:817:int access$102(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i,int) -> a
-    817:817:int access$002(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i,int) -> b
-net.minecraft.client.gui.screens.inventory.BookViewScreen -> dhb:
+    boolean isSigning -> p
+    int frameTick -> q
+    int currentPage -> r
+    java.util.List pages -> s
+    java.lang.String title -> t
+    net.minecraft.client.gui.font.TextFieldHelper pageEdit -> u
+    net.minecraft.client.gui.font.TextFieldHelper titleEdit -> v
+    long lastClickTime -> w
+    int lastIndex -> x
+    net.minecraft.client.gui.screens.inventory.PageButton forwardButton -> y
+    net.minecraft.client.gui.screens.inventory.PageButton backButton -> z
+    net.minecraft.client.gui.components.Button doneButton -> A
+    net.minecraft.client.gui.components.Button signButton -> B
+    net.minecraft.client.gui.components.Button finalizeButton -> C
+    net.minecraft.client.gui.components.Button cancelButton -> D
+    net.minecraft.world.InteractionHand hand -> E
+    net.minecraft.client.gui.screens.inventory.BookEditScreen$DisplayCache displayCache -> F
+    65:115:void <init>(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> <init>
+    118:121:void setClipboard(java.lang.String) -> a
+    124:124:java.lang.String getClipboard() -> i
+    128:128:int getNumPages() -> k
+    133:135:void tick() -> d
+    139:171:void init() -> b
+    174:179:void pageBack() -> l
+    182:192:void pageForward() -> m
+    196:197:void removed() -> e
+    200:208:void updateButtonVisibility() -> n
+    211:215:void eraseEmptyTrailingPages() -> u
+    218:236:void saveChanges(boolean) -> c
+    239:244:void appendPageToBook() -> v
+    248:260:boolean keyPressed(int,int,int) -> a
+    266:284:boolean charTyped(char,int) -> a
+    290:342:boolean bookKeyPressed(int,int,int) -> c
+    346:347:void keyUp() -> w
+    350:351:void keyDown() -> x
+    354:357:void changeLine(int) -> a
+    360:363:void keyHome() -> y
+    366:370:void keyEnd() -> z
+    373:390:boolean titleKeyPressed(int,int,int) -> d
+    394:397:java.lang.String getCurrentPageText() -> A
+    401:406:void setCurrentPageText(java.lang.String) -> b
+    410:456:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    459:467:void renderCursor(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i,boolean) -> a
+    470:470:int strWidth(java.lang.String) -> d
+    474:499:void renderHighlight(net.minecraft.client.renderer.Rect2i[]) -> a
+    502:502:net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i convertScreenToLocal(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> a
+    506:506:net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i convertLocalToScreen(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> b
+    511:536:boolean mouseClicked(double,double,int) -> a
+    540:545:void selectWord(int) -> b
+    549:559:boolean mouseDragged(double,double,int,double,double) -> a
+    563:567:net.minecraft.client.gui.screens.inventory.BookEditScreen$DisplayCache getDisplayCache() -> B
+    571:572:void clearDisplayCache() -> C
+    575:577:void clearDisplayCacheAfterPageChange() -> D
+    580:641:net.minecraft.client.gui.screens.inventory.BookEditScreen$DisplayCache rebuildDisplayCache() -> E
+    645:649:int findLineFromPos(int[],int) -> b
+    654:660:net.minecraft.client.renderer.Rect2i createPartialLineSelection(java.lang.String,net.minecraft.client.StringSplitter,int,int,int,int) -> a
+    664:673:net.minecraft.client.renderer.Rect2i createSelection(net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i,net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> a
+    593:601:void lambda$rebuildDisplayCache$10(org.apache.commons.lang3.mutable.MutableInt,java.lang.String,org.apache.commons.lang3.mutable.MutableBoolean,it.unimi.dsi.fastutil.ints.IntList,java.util.List,net.minecraft.network.chat.Style,int,int) -> a
+    168:168:void lambda$init$9(net.minecraft.client.gui.components.Button) -> a
+    167:167:void lambda$init$8(net.minecraft.client.gui.components.Button) -> b
+    158:162:void lambda$init$7(net.minecraft.client.gui.components.Button) -> c
+    152:156:void lambda$init$6(net.minecraft.client.gui.components.Button) -> d
+    147:149:void lambda$init$5(net.minecraft.client.gui.components.Button) -> e
+    143:145:void lambda$init$4(net.minecraft.client.gui.components.Button) -> f
+    80:80:boolean lambda$new$3(java.lang.String) -> e
+    77:77:void lambda$new$2(java.lang.String) -> f
+    76:76:java.lang.String lambda$new$1() -> F
+    72:72:boolean lambda$new$0(java.lang.String) -> g
+    49:49:int access$1000(int[],int) -> a
+net.minecraft.client.gui.screens.inventory.BookEditScreen$DisplayCache -> drs$a:
+    net.minecraft.client.gui.screens.inventory.BookEditScreen$DisplayCache EMPTY -> a
+    java.lang.String fullText -> b
+    net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i cursor -> c
+    boolean cursorAtEnd -> d
+    int[] lineStarts -> e
+    net.minecraft.client.gui.screens.inventory.BookEditScreen$LineInfo[] lines -> f
+    net.minecraft.client.renderer.Rect2i[] selection -> g
+    713:720:void <init>(java.lang.String,net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i,boolean,int[],net.minecraft.client.gui.screens.inventory.BookEditScreen$LineInfo[],net.minecraft.client.renderer.Rect2i[]) -> <init>
+    723:731:int getIndexAtPosition(net.minecraft.client.gui.Font,net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i) -> a
+    735:745:int changeLine(int,int) -> a
+    749:750:int findLineStart(int) -> a
+    754:755:int findLineEnd(int) -> b
+    702:702:net.minecraft.client.gui.screens.inventory.BookEditScreen$DisplayCache access$000() -> a
+    702:702:net.minecraft.client.gui.screens.inventory.BookEditScreen$LineInfo[] access$100(net.minecraft.client.gui.screens.inventory.BookEditScreen$DisplayCache) -> a
+    702:702:net.minecraft.client.renderer.Rect2i[] access$500(net.minecraft.client.gui.screens.inventory.BookEditScreen$DisplayCache) -> b
+    702:702:net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i access$600(net.minecraft.client.gui.screens.inventory.BookEditScreen$DisplayCache) -> c
+    702:702:boolean access$700(net.minecraft.client.gui.screens.inventory.BookEditScreen$DisplayCache) -> d
+    703:703:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.BookEditScreen$LineInfo -> drs$b:
+    net.minecraft.network.chat.Style style -> a
+    java.lang.String contents -> b
+    net.minecraft.network.chat.Component asComponent -> c
+    int x -> d
+    int y -> e
+    693:699:void <init>(net.minecraft.network.chat.Style,java.lang.String,int,int) -> <init>
+    686:686:net.minecraft.network.chat.Component access$200(net.minecraft.client.gui.screens.inventory.BookEditScreen$LineInfo) -> a
+    686:686:int access$300(net.minecraft.client.gui.screens.inventory.BookEditScreen$LineInfo) -> b
+    686:686:int access$400(net.minecraft.client.gui.screens.inventory.BookEditScreen$LineInfo) -> c
+    686:686:java.lang.String access$800(net.minecraft.client.gui.screens.inventory.BookEditScreen$LineInfo) -> d
+    686:686:net.minecraft.network.chat.Style access$900(net.minecraft.client.gui.screens.inventory.BookEditScreen$LineInfo) -> e
+net.minecraft.client.gui.screens.inventory.BookEditScreen$Pos2i -> drs$c:
+    int x -> a
+    int y -> b
+    680:683:void <init>(int,int) -> <init>
+net.minecraft.client.gui.screens.inventory.BookViewScreen -> drt:
     net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess EMPTY_ACCESS -> a
     net.minecraft.resources.ResourceLocation BOOK_LOCATION -> b
     net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess bookAccess -> c
-    int currentPage -> d
-    java.util.List cachedPageComponents -> e
-    int cachedPage -> f
-    net.minecraft.client.gui.screens.inventory.PageButton forwardButton -> g
-    net.minecraft.client.gui.screens.inventory.PageButton backButton -> h
-    boolean playTurnSound -> i
-    148:149:void <init>(net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess) -> <init>
-    152:153:void <init>() -> <init>
-    139:159:void <init>(net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess,boolean) -> <init>
-    162:166:void setBookAccess(net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess) -> a
-    169:176:boolean setPage(int) -> a
-    180:180:boolean forcePage(int) -> b
-    185:187:void init() -> init
-    190:191:void createMenuControls() -> b
-    194:201:void createPageControlButtons() -> c
-    204:204:int getNumPages() -> a
-    208:212:void pageBack() -> d
-    215:219:void pageForward() -> e
-    222:224:void updateButtonVisibility() -> f
-    228:240:boolean keyPressed(int,int,int) -> keyPressed
-    246:277:void render(int,int,float) -> render
-    280:280:int strWidth(java.lang.String) -> a
-    285:292:boolean mouseClicked(double,double,int) -> mouseClicked
-    297:317:boolean handleComponentClicked(net.minecraft.network.chat.Component) -> handleComponentClicked
-    322:354:net.minecraft.network.chat.Component getClickedComponentAt(double,double) -> c
-    358:363:java.util.List convertPages(net.minecraft.nbt.CompoundTag) -> a
-    198:198:void lambda$createPageControlButtons$2(net.minecraft.client.gui.components.Button) -> a
-    197:197:void lambda$createPageControlButtons$1(net.minecraft.client.gui.components.Button) -> b
-    190:190:void lambda$createMenuControls$0(net.minecraft.client.gui.components.Button) -> c
-    59:129:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.BookViewScreen$1 -> dhb$1:
-    59:59:void <init>() -> <init>
-    62:62:int getPageCount() -> a
-    67:67:net.minecraft.network.chat.Component getPageRaw(int) -> a
-net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess -> dhb$a:
+    int currentPage -> p
+    java.util.List cachedPageComponents -> q
+    int cachedPage -> r
+    net.minecraft.client.gui.screens.inventory.PageButton forwardButton -> s
+    net.minecraft.client.gui.screens.inventory.PageButton backButton -> t
+    boolean playTurnSound -> u
+    150:151:void <init>(net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess) -> <init>
+    154:155:void <init>() -> <init>
+    141:161:void <init>(net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess,boolean) -> <init>
+    164:168:void setBookAccess(net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess) -> a
+    171:178:boolean setPage(int) -> a
+    182:182:boolean forcePage(int) -> b
+    187:189:void init() -> b
+    192:193:void createMenuControls() -> k
+    196:203:void createPageControlButtons() -> l
+    206:206:int getNumPages() -> i
+    210:214:void pageBack() -> m
+    217:221:void pageForward() -> n
+    224:226:void updateButtonVisibility() -> u
+    230:242:boolean keyPressed(int,int,int) -> a
+    248:279:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    282:282:int strWidth(java.lang.String) -> a
+    287:294:boolean mouseClicked(double,double,int) -> a
+    299:319:boolean handleComponentClicked(net.minecraft.network.chat.Style) -> a
+    324:346:net.minecraft.network.chat.Style getClickedComponentStyleAt(double,double) -> a
+    350:355:java.util.List convertPages(net.minecraft.nbt.CompoundTag) -> a
+    200:200:void lambda$createPageControlButtons$2(net.minecraft.client.gui.components.Button) -> a
+    199:199:void lambda$createPageControlButtons$1(net.minecraft.client.gui.components.Button) -> b
+    192:192:void lambda$createMenuControls$0(net.minecraft.client.gui.components.Button) -> c
+    61:131:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.BookViewScreen$1 -> drt$1:
+    61:61:void <init>() -> <init>
+    64:64:int getPageCount() -> a
+    69:69:net.minecraft.network.chat.FormattedText getPageRaw(int) -> a
+net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess -> drt$a:
     int getPageCount() -> a
-    net.minecraft.network.chat.Component getPageRaw(int) -> a
-    42:45:net.minecraft.network.chat.Component getPage(int) -> b
-    49:55:net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess fromItem(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.client.gui.screens.inventory.BookViewScreen$WritableBookAccess -> dhb$b:
+    net.minecraft.network.chat.FormattedText getPageRaw(int) -> a
+    44:47:net.minecraft.network.chat.FormattedText getPage(int) -> b
+    51:57:net.minecraft.client.gui.screens.inventory.BookViewScreen$BookAccess fromItem(net.minecraft.world.item.ItemStack) -> a
+net.minecraft.client.gui.screens.inventory.BookViewScreen$WritableBookAccess -> drt$b:
     java.util.List pages -> a
-    109:111:void <init>(net.minecraft.world.item.ItemStack) -> <init>
-    114:115:java.util.List readPages(net.minecraft.world.item.ItemStack) -> b
-    120:120:int getPageCount() -> a
-    125:125:net.minecraft.network.chat.Component getPageRaw(int) -> a
-net.minecraft.client.gui.screens.inventory.BookViewScreen$WrittenBookAccess -> dhb$c:
+    111:113:void <init>(net.minecraft.world.item.ItemStack) -> <init>
+    116:117:java.util.List readPages(net.minecraft.world.item.ItemStack) -> b
+    122:122:int getPageCount() -> a
+    127:127:net.minecraft.network.chat.FormattedText getPageRaw(int) -> a
+net.minecraft.client.gui.screens.inventory.BookViewScreen$WrittenBookAccess -> drt$c:
     java.util.List pages -> a
-    74:76:void <init>(net.minecraft.world.item.ItemStack) -> <init>
-    79:84:java.util.List readPages(net.minecraft.world.item.ItemStack) -> b
-    89:89:int getPageCount() -> a
-    94:102:net.minecraft.network.chat.Component getPageRaw(int) -> a
-net.minecraft.client.gui.screens.inventory.BrewingStandScreen -> dhc:
-    net.minecraft.resources.ResourceLocation BREWING_STAND_LOCATION -> k
-    int[] BUBBLELENGTHS -> l
-    18:19:void <init>(net.minecraft.world.inventory.BrewingStandMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    23:26:void render(int,int,float) -> render
-    30:32:void renderLabels(int,int) -> b
-    36:60:void renderBg(float,int,int) -> a
-    14:15:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.CartographyTableScreen -> dhd:
-    net.minecraft.resources.ResourceLocation BG_LOCATION -> k
-    24:25:void <init>(net.minecraft.world.inventory.CartographyTableMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    29:31:void render(int,int,float) -> render
-    35:37:void renderLabels(int,int) -> b
-    41:78:void renderBg(float,int,int) -> a
-    81:114:void renderResultingMap(net.minecraft.world.level.saveddata.maps.MapItemSavedData,boolean,boolean,boolean,boolean) -> a
-    117:128:void renderMap(net.minecraft.world.level.saveddata.maps.MapItemSavedData,int,int,float) -> a
+    76:78:void <init>(net.minecraft.world.item.ItemStack) -> <init>
+    81:86:java.util.List readPages(net.minecraft.world.item.ItemStack) -> b
+    91:91:int getPageCount() -> a
+    96:104:net.minecraft.network.chat.FormattedText getPageRaw(int) -> a
+net.minecraft.client.gui.screens.inventory.BrewingStandScreen -> dru:
+    net.minecraft.resources.ResourceLocation BREWING_STAND_LOCATION -> A
+    int[] BUBBLELENGTHS -> B
+    19:20:void <init>(net.minecraft.world.inventory.BrewingStandMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    24:26:void init() -> b
+    30:33:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    37:61:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    15:16:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.CartographyTableScreen -> drv:
+    net.minecraft.resources.ResourceLocation BG_LOCATION -> A
+    24:26:void <init>(net.minecraft.world.inventory.CartographyTableMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    30:32:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    36:73:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    76:109:void renderResultingMap(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.level.saveddata.maps.MapItemSavedData,boolean,boolean,boolean,boolean) -> a
+    112:123:void renderMap(net.minecraft.world.level.saveddata.maps.MapItemSavedData,int,int,float) -> a
     21:21:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen -> dhe:
-    net.minecraft.world.level.block.entity.CommandBlockEntity autoCommandBlock -> g
-    net.minecraft.client.gui.components.Button modeButton -> h
-    net.minecraft.client.gui.components.Button conditionalButton -> i
-    net.minecraft.client.gui.components.Button autoexecButton -> j
-    net.minecraft.world.level.block.entity.CommandBlockEntity$Mode mode -> k
-    boolean conditional -> l
-    boolean autoexec -> m
+net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen -> drw:
+    net.minecraft.world.level.block.entity.CommandBlockEntity autoCommandBlock -> s
+    net.minecraft.client.gui.components.Button modeButton -> t
+    net.minecraft.client.gui.components.Button conditionalButton -> u
+    net.minecraft.client.gui.components.Button autoexecButton -> v
+    net.minecraft.world.level.block.entity.CommandBlockEntity$Mode mode -> w
+    boolean conditional -> x
+    boolean autoexec -> y
     16:22:void <init>(net.minecraft.world.level.block.entity.CommandBlockEntity) -> <init>
-    26:26:net.minecraft.world.level.BaseCommandBlock getCommandBlock() -> a
-    31:31:int getPreviousY() -> b
-    36:55:void init() -> init
-    58:75:void updateGui() -> e
-    79:91:void resize(net.minecraft.client.Minecraft,int,int) -> resize
+    26:26:net.minecraft.world.level.BaseCommandBlock getCommandBlock() -> i
+    31:31:int getPreviousY() -> k
+    36:55:void init() -> b
+    58:75:void updateGui() -> n
+    79:91:void resize(net.minecraft.client.Minecraft,int,int) -> a
     95:96:void populateAndSendPacket(net.minecraft.world.level.BaseCommandBlock) -> a
-    99:110:void updateMode() -> f
-    113:124:void nextMode() -> g
-    127:132:void updateConditional() -> h
-    135:140:void updateAutoexec() -> i
+    99:110:void updateMode() -> u
+    113:124:void nextMode() -> v
+    127:132:void updateConditional() -> w
+    135:140:void updateAutoexec() -> x
     46:48:void lambda$init$2(net.minecraft.client.gui.components.Button) -> a
     42:44:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
     38:40:void lambda$init$0(net.minecraft.client.gui.components.Button) -> c
-net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen$1 -> dhe$1:
+net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen$1 -> drw$1:
     int[] $SwitchMap$net$minecraft$world$level$block$entity$CommandBlockEntity$Mode -> a
     99:99:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.ContainerScreen -> dhf:
-    net.minecraft.resources.ResourceLocation CONTAINER_BACKGROUND -> k
-    int containerRows -> l
-    15:23:void <init>(net.minecraft.world.inventory.ChestMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    27:30:void render(int,int,float) -> render
-    34:36:void renderLabels(int,int) -> b
-    40:46:void renderBg(float,int,int) -> a
-    10:10:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.CraftingScreen -> dhg:
-    net.minecraft.resources.ResourceLocation CRAFTING_TABLE_LOCATION -> k
-    net.minecraft.resources.ResourceLocation RECIPE_BUTTON_LOCATION -> l
-    net.minecraft.client.gui.screens.recipebook.RecipeBookComponent recipeBookComponent -> m
-    boolean widthTooNarrow -> n
-    18:24:void <init>(net.minecraft.world.inventory.CraftingMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    28:44:void init() -> init
-    48:51:void tick() -> tick
-    55:69:void render(int,int,float) -> render
-    73:75:void renderLabels(int,int) -> b
-    79:84:void renderBg(float,int,int) -> a
-    88:88:boolean isHovering(int,int,int,int,double,double) -> a
-    93:101:boolean mouseClicked(double,double,int) -> mouseClicked
-    106:107:boolean hasClickedOutside(double,double,int,int,int) -> a
-    112:115:void slotClicked(net.minecraft.world.inventory.Slot,int,int,net.minecraft.world.inventory.ClickType) -> a
-    119:120:void recipesUpdated() -> ae_
-    124:126:void removed() -> removed
-    130:130:net.minecraft.client.gui.screens.recipebook.RecipeBookComponent getRecipeBookComponent() -> c
-    37:43:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-    15:16:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.CreativeInventoryListener -> dhh:
+net.minecraft.client.gui.screens.inventory.ContainerScreen -> drx:
+    net.minecraft.resources.ResourceLocation CONTAINER_BACKGROUND -> A
+    int containerRows -> B
+    16:25:void <init>(net.minecraft.world.inventory.ChestMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    29:32:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    36:42:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.CraftingScreen -> dry:
+    net.minecraft.resources.ResourceLocation CRAFTING_TABLE_LOCATION -> A
+    net.minecraft.resources.ResourceLocation RECIPE_BUTTON_LOCATION -> B
+    net.minecraft.client.gui.screens.recipebook.RecipeBookComponent recipeBookComponent -> C
+    boolean widthTooNarrow -> D
+    19:25:void <init>(net.minecraft.world.inventory.CraftingMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    29:47:void init() -> b
+    51:54:void tick() -> d
+    58:71:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    75:80:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    84:84:boolean isHovering(int,int,int,int,double,double) -> a
+    89:98:boolean mouseClicked(double,double,int) -> a
+    103:104:boolean hasClickedOutside(double,double,int,int,int) -> a
+    109:112:void slotClicked(net.minecraft.world.inventory.Slot,int,int,net.minecraft.world.inventory.ClickType) -> a
+    116:117:void recipesUpdated() -> ay_
+    121:123:void removed() -> e
+    127:127:net.minecraft.client.gui.screens.recipebook.RecipeBookComponent getRecipeBookComponent() -> l
+    38:44:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+    16:17:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.CreativeInventoryListener -> drz:
     net.minecraft.client.Minecraft minecraft -> a
     12:14:void <init>(net.minecraft.client.Minecraft) -> <init>
     18:18:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.core.NonNullList) -> a
     22:23:void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
     27:27:void setContainerData(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> a
-net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen -> dhi:
-    net.minecraft.resources.ResourceLocation CREATIVE_TABS_LOCATION -> l
-    net.minecraft.world.SimpleContainer CONTAINER -> m
-    int selectedTab -> n
-    float scrollOffs -> o
-    boolean scrolling -> p
-    net.minecraft.client.gui.components.EditBox searchBox -> q
-    java.util.List originalSlots -> r
-    net.minecraft.world.inventory.Slot destroyItemSlot -> s
-    net.minecraft.client.gui.screens.inventory.CreativeInventoryListener listener -> t
-    boolean ignoreTextInput -> u
-    boolean hasClickedOutside -> v
-    java.util.Map visibleTags -> w
-    76:156:void <init>(net.minecraft.world.entity.player.Player) -> <init>
-    160:165:void tick() -> tick
-    169:306:void slotClicked(net.minecraft.world.inventory.Slot,int,int,net.minecraft.world.inventory.ClickType) -> a
-    309:309:boolean isCreativeSlot(net.minecraft.world.inventory.Slot) -> a
-    314:319:void checkEffectRendering() -> b
-    323:345:void init() -> init
-    349:356:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    360:367:void removed() -> removed
-    371:384:boolean charTyped(char,int) -> charTyped
-    389:420:boolean keyPressed(int,int,int) -> keyPressed
-    425:426:boolean keyReleased(int,int,int) -> a
-    430:452:void refreshSearchResults() -> e
-    455:468:void updateVisibleTags(java.lang.String) -> a
-    472:478:void renderLabels(int,int) -> b
-    482:498:boolean mouseClicked(double,double,int) -> mouseClicked
-    503:517:boolean mouseReleased(double,double,int) -> mouseReleased
-    521:521:boolean canScroll() -> f
-    525:624:void selectTab(net.minecraft.world.item.CreativeModeTab) -> b
-    628:635:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    640:642:boolean hasClickedOutside(double,double,int,int,int) -> a
-    646:653:boolean insideScrollbar(double,double) -> c
-    659:669:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    674:689:void render(int,int,float) -> render
-    693:740:void renderTooltip(net.minecraft.world.item.ItemStack,int,int) -> renderTooltip
-    744:774:void renderBg(float,int,int) -> a
-    777:793:boolean checkTabClicked(net.minecraft.world.item.CreativeModeTab,double,double) -> a
-    797:818:boolean checkTabHovering(net.minecraft.world.item.CreativeModeTab,int,int) -> a
-    822:862:void renderTabButton(net.minecraft.world.item.CreativeModeTab) -> a
-    865:865:int getSelectedTab() -> c
-    964:985:void handleHotbarLoadOrSave(net.minecraft.client.Minecraft,int,boolean,boolean) -> a
-    719:722:void lambda$renderTooltip$3(net.minecraft.world.item.Item,java.util.List,net.minecraft.resources.ResourceLocation,net.minecraft.tags.Tag) -> a
-    467:467:void lambda$updateVisibleTags$2(net.minecraft.tags.TagCollection,net.minecraft.resources.ResourceLocation) -> a
-    463:463:boolean lambda$updateVisibleTags$1(java.lang.String,java.lang.String,net.minecraft.resources.ResourceLocation) -> a
-    459:459:boolean lambda$updateVisibleTags$0(java.lang.String,net.minecraft.resources.ResourceLocation) -> a
-    51:51:net.minecraft.world.SimpleContainer access$000() -> d
-    52:64:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen$CustomCreativeSlot -> dhi$a:
-    951:952:void <init>(net.minecraft.world.Container,int,int,int) -> <init>
-    956:959:boolean mayPickup(net.minecraft.world.entity.player.Player) -> a
-net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen$ItemPickerMenu -> dhi$b:
+net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen -> dsa:
+    net.minecraft.resources.ResourceLocation CREATIVE_TABS_LOCATION -> B
+    net.minecraft.world.SimpleContainer CONTAINER -> C
+    int selectedTab -> D
+    float scrollOffs -> E
+    boolean scrolling -> F
+    net.minecraft.client.gui.components.EditBox searchBox -> G
+    java.util.List originalSlots -> H
+    net.minecraft.world.inventory.Slot destroyItemSlot -> I
+    net.minecraft.client.gui.screens.inventory.CreativeInventoryListener listener -> J
+    boolean ignoreTextInput -> K
+    boolean hasClickedOutside -> L
+    java.util.Map visibleTags -> M
+    77:157:void <init>(net.minecraft.world.entity.player.Player) -> <init>
+    161:166:void tick() -> d
+    170:307:void slotClicked(net.minecraft.world.inventory.Slot,int,int,net.minecraft.world.inventory.ClickType) -> a
+    310:310:boolean isCreativeSlot(net.minecraft.world.inventory.Slot) -> a
+    315:320:void checkEffectRendering() -> k
+    324:346:void init() -> b
+    350:357:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    361:368:void removed() -> e
+    372:385:boolean charTyped(char,int) -> a
+    390:422:boolean keyPressed(int,int,int) -> a
+    427:428:boolean keyReleased(int,int,int) -> b
+    432:454:void refreshSearchResults() -> n
+    457:470:void updateVisibleTags(java.lang.String) -> a
+    474:480:void renderLabels(com.mojang.blaze3d.vertex.PoseStack,int,int) -> b
+    484:500:boolean mouseClicked(double,double,int) -> a
+    505:519:boolean mouseReleased(double,double,int) -> c
+    523:523:boolean canScroll() -> u
+    527:626:void selectTab(net.minecraft.world.item.CreativeModeTab) -> a
+    630:637:boolean mouseScrolled(double,double,double) -> a
+    642:644:boolean hasClickedOutside(double,double,int,int,int) -> a
+    648:655:boolean insideScrollbar(double,double) -> a
+    661:671:boolean mouseDragged(double,double,int,double,double) -> a
+    676:691:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    695:731:void renderTooltip(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.item.ItemStack,int,int) -> a
+    735:765:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    768:784:boolean checkTabClicked(net.minecraft.world.item.CreativeModeTab,double,double) -> a
+    788:809:boolean checkTabHovering(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.item.CreativeModeTab,int,int) -> a
+    813:851:void renderTabButton(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.item.CreativeModeTab) -> a
+    854:854:int getSelectedTab() -> l
+    953:974:void handleHotbarLoadOrSave(net.minecraft.client.Minecraft,int,boolean,boolean) -> a
+    718:721:void lambda$renderTooltip$3(net.minecraft.world.item.Item,java.util.List,net.minecraft.resources.ResourceLocation,net.minecraft.tags.Tag) -> a
+    469:469:void lambda$updateVisibleTags$2(net.minecraft.tags.TagCollection,net.minecraft.resources.ResourceLocation) -> a
+    465:465:boolean lambda$updateVisibleTags$1(java.lang.String,java.lang.String,net.minecraft.resources.ResourceLocation) -> a
+    461:461:boolean lambda$updateVisibleTags$0(java.lang.String,net.minecraft.resources.ResourceLocation) -> a
+    52:52:net.minecraft.world.SimpleContainer access$000() -> m
+    53:65:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen$CustomCreativeSlot -> dsa$a:
+    940:941:void <init>(net.minecraft.world.Container,int,int,int) -> <init>
+    945:948:boolean mayPickup(net.minecraft.world.entity.player.Player) -> a
+net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen$ItemPickerMenu -> dsa$b:
     net.minecraft.core.NonNullList items -> c
-    79:96:void <init>(net.minecraft.world.entity.player.Player) -> <init>
-    100:100:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    104:120:void scrollTo(float) -> a
-    123:123:boolean canScroll() -> e
-    128:136:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
-    141:141:boolean canTakeItemForPickAll(net.minecraft.world.item.ItemStack,net.minecraft.world.inventory.Slot) -> a
-    146:146:boolean canDragTo(net.minecraft.world.inventory.Slot) -> b
-net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen$SlotWrapper -> dhi$c:
+    80:97:void <init>(net.minecraft.world.entity.player.Player) -> <init>
+    101:101:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    105:121:void scrollTo(float) -> a
+    124:124:boolean canScroll() -> e
+    129:137:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
+    142:142:boolean canTakeItemForPickAll(net.minecraft.world.item.ItemStack,net.minecraft.world.inventory.Slot) -> a
+    147:147:boolean canDragTo(net.minecraft.world.inventory.Slot) -> b
+net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen$SlotWrapper -> dsa$c:
     net.minecraft.world.inventory.Slot target -> a
-    873:875:void <init>(net.minecraft.world.inventory.Slot,int,int,int) -> <init>
-    879:880:void swap(net.minecraft.world.inventory.Slot) -> a
-    884:884:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
-    889:889:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-    894:894:net.minecraft.world.item.ItemStack getItem() -> e
-    899:899:boolean hasItem() -> f
-    904:905:void set(net.minecraft.world.item.ItemStack) -> d
-    909:910:void setChanged() -> d
-    914:914:int getMaxStackSize() -> a
-    919:919:int getMaxStackSize(net.minecraft.world.item.ItemStack) -> b
-    925:925:com.mojang.datafixers.util.Pair getNoItemIcon() -> c
-    930:930:net.minecraft.world.item.ItemStack remove(int) -> a
-    935:935:boolean isAt(net.minecraft.world.Container,int) -> a
-    940:940:boolean isActive() -> b
-    945:945:boolean mayPickup(net.minecraft.world.entity.player.Player) -> a
-    869:869:net.minecraft.world.inventory.Slot access$100(net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen$SlotWrapper) -> a
-net.minecraft.client.gui.screens.inventory.DispenserScreen -> dhj:
-    net.minecraft.resources.ResourceLocation CONTAINER_LOCATION -> k
-    13:14:void <init>(net.minecraft.world.inventory.DispenserMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    18:21:void render(int,int,float) -> render
-    25:28:void renderLabels(int,int) -> b
-    32:37:void renderBg(float,int,int) -> a
-    10:10:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.EffectRenderingInventoryScreen -> dhk:
-    boolean doRenderEffects -> k
-    21:22:void <init>(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    26:28:void init() -> init
-    31:38:void checkEffectRendering() -> b
-    42:46:void render(int,int,float) -> render
-    49:69:void renderEffects() -> c
-    72:79:void renderBackgrounds(int,int,java.lang.Iterable) -> a
-    82:91:void renderIcons(int,int,java.lang.Iterable) -> b
-    94:108:void renderLabels(int,int,java.lang.Iterable) -> c
-net.minecraft.client.gui.screens.inventory.EnchantmentNames -> dhl:
-    net.minecraft.client.gui.screens.inventory.EnchantmentNames INSTANCE -> a
-    java.util.Random random -> b
-    java.lang.String[] words -> c
-    12:38:void <init>() -> <init>
-    41:41:net.minecraft.client.gui.screens.inventory.EnchantmentNames getInstance() -> a
-    45:54:java.lang.String getRandomName(net.minecraft.client.gui.Font,int) -> a
-    58:59:void initSeed(long) -> a
-    10:10:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.EnchantmentScreen -> dhm:
-    net.minecraft.resources.ResourceLocation ENCHANTING_TABLE_LOCATION -> r
-    net.minecraft.resources.ResourceLocation ENCHANTING_BOOK_LOCATION -> s
-    net.minecraft.client.model.BookModel BOOK_MODEL -> t
-    java.util.Random random -> u
-    int time -> k
-    float flip -> l
-    float oFlip -> m
-    float flipT -> n
-    float flipA -> o
-    float open -> p
-    float oOpen -> q
-    net.minecraft.world.item.ItemStack last -> v
-    36:50:void <init>(net.minecraft.world.inventory.EnchantmentMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    54:56:void renderLabels(int,int) -> b
-    60:62:void tick() -> tick
-    66:78:boolean mouseClicked(double,double,int) -> mouseClicked
-    83:201:void renderBg(float,int,int) -> a
-    205:253:void render(int,int,float) -> render
-    256:289:void tickBook() -> b
-    32:34:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.FurnaceScreen -> dhn:
-    net.minecraft.resources.ResourceLocation TEXTURE -> l
+    862:864:void <init>(net.minecraft.world.inventory.Slot,int,int,int) -> <init>
+    868:869:void swap(net.minecraft.world.inventory.Slot) -> a
+    873:873:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+    878:878:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
+    883:883:net.minecraft.world.item.ItemStack getItem() -> e
+    888:888:boolean hasItem() -> f
+    893:894:void set(net.minecraft.world.item.ItemStack) -> d
+    898:899:void setChanged() -> d
+    903:903:int getMaxStackSize() -> a
+    908:908:int getMaxStackSize(net.minecraft.world.item.ItemStack) -> b
+    914:914:com.mojang.datafixers.util.Pair getNoItemIcon() -> c
+    919:919:net.minecraft.world.item.ItemStack remove(int) -> a
+    924:924:boolean isAt(net.minecraft.world.Container,int) -> a
+    929:929:boolean isActive() -> b
+    934:934:boolean mayPickup(net.minecraft.world.entity.player.Player) -> a
+    858:858:net.minecraft.world.inventory.Slot access$100(net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen$SlotWrapper) -> a
+net.minecraft.client.gui.screens.inventory.DispenserScreen -> dsb:
+    net.minecraft.resources.ResourceLocation CONTAINER_LOCATION -> A
+    14:15:void <init>(net.minecraft.world.inventory.DispenserMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    19:21:void init() -> b
+    25:28:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    32:37:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.EffectRenderingInventoryScreen -> dsc:
+    boolean doRenderEffects -> A
+    22:23:void <init>(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    27:29:void init() -> b
+    32:39:void checkEffectRendering() -> k
+    43:47:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    50:70:void renderEffects(com.mojang.blaze3d.vertex.PoseStack) -> b
+    73:80:void renderBackgrounds(com.mojang.blaze3d.vertex.PoseStack,int,int,java.lang.Iterable) -> a
+    83:92:void renderIcons(com.mojang.blaze3d.vertex.PoseStack,int,int,java.lang.Iterable) -> b
+    95:109:void renderLabels(com.mojang.blaze3d.vertex.PoseStack,int,int,java.lang.Iterable) -> c
+net.minecraft.client.gui.screens.inventory.EnchantmentNames -> dsd:
+    net.minecraft.resources.ResourceLocation ALT_FONT -> a
+    net.minecraft.network.chat.Style ROOT_STYLE -> b
+    net.minecraft.client.gui.screens.inventory.EnchantmentNames INSTANCE -> c
+    java.util.Random random -> d
+    java.lang.String[] words -> e
+    18:44:void <init>() -> <init>
+    47:47:net.minecraft.client.gui.screens.inventory.EnchantmentNames getInstance() -> a
+    51:60:net.minecraft.network.chat.FormattedText getRandomName(net.minecraft.client.gui.Font,int) -> a
+    64:65:void initSeed(long) -> a
+    13:16:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.EnchantmentScreen -> dse:
+    net.minecraft.resources.ResourceLocation ENCHANTING_TABLE_LOCATION -> H
+    net.minecraft.resources.ResourceLocation ENCHANTING_BOOK_LOCATION -> I
+    net.minecraft.client.model.BookModel BOOK_MODEL -> J
+    java.util.Random random -> K
+    int time -> A
+    float flip -> B
+    float oFlip -> C
+    float flipT -> D
+    float flipA -> E
+    float open -> F
+    float oOpen -> G
+    net.minecraft.world.item.ItemStack last -> L
+    37:51:void <init>(net.minecraft.world.inventory.EnchantmentMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    55:57:void tick() -> d
+    61:73:boolean mouseClicked(double,double,int) -> a
+    78:193:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    197:245:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    248:281:void tickBook() -> k
+    33:35:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.FurnaceScreen -> dsf:
+    net.minecraft.resources.ResourceLocation TEXTURE -> B
     13:14:void <init>(net.minecraft.world.inventory.FurnaceMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
     10:10:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.GrindstoneScreen -> dho:
-    net.minecraft.resources.ResourceLocation GRINDSTONE_LOCATION -> k
+net.minecraft.client.gui.screens.inventory.GrindstoneScreen -> dsg:
+    net.minecraft.resources.ResourceLocation GRINDSTONE_LOCATION -> A
     14:15:void <init>(net.minecraft.world.inventory.GrindstoneMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    19:21:void renderLabels(int,int) -> b
-    25:30:void render(int,int,float) -> render
-    34:43:void renderBg(float,int,int) -> a
+    19:24:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    28:37:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.HopperScreen -> dhp:
-    net.minecraft.resources.ResourceLocation HOPPER_LOCATION -> k
-    13:17:void <init>(net.minecraft.world.inventory.HopperMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    21:24:void render(int,int,float) -> render
-    28:30:void renderLabels(int,int) -> b
-    34:39:void renderBg(float,int,int) -> a
-    10:10:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.HorseInventoryScreen -> dhq:
-    net.minecraft.resources.ResourceLocation HORSE_INVENTORY_LOCATION -> k
-    net.minecraft.world.entity.animal.horse.AbstractHorse horse -> l
-    float xMouse -> m
-    float yMouse -> n
-    19:22:void <init>(net.minecraft.world.inventory.HorseInventoryMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.animal.horse.AbstractHorse) -> <init>
-    26:28:void renderLabels(int,int) -> b
-    32:58:void renderBg(float,int,int) -> a
-    62:68:void render(int,int,float) -> render
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.InventoryScreen -> dhr:
-    net.minecraft.resources.ResourceLocation RECIPE_BUTTON_LOCATION -> l
-    float xMouse -> m
-    float yMouse -> n
-    net.minecraft.client.gui.screens.recipebook.RecipeBookComponent recipeBookComponent -> o
-    boolean recipeBookComponentInitialized -> p
-    boolean widthTooNarrow -> q
-    boolean buttonClicked -> r
-    28:36:void <init>(net.minecraft.world.entity.player.Player) -> <init>
-    40:46:void tick() -> tick
-    50:73:void init() -> init
-    77:78:void renderLabels(int,int) -> b
-    82:101:void render(int,int,float) -> render
-    105:112:void renderBg(float,int,int) -> a
+net.minecraft.client.gui.screens.inventory.HopperScreen -> dsh:
+    net.minecraft.resources.ResourceLocation HOPPER_LOCATION -> A
+    14:18:void <init>(net.minecraft.world.inventory.HopperMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    22:25:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    29:34:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.HorseInventoryScreen -> dsi:
+    net.minecraft.resources.ResourceLocation HORSE_INVENTORY_LOCATION -> A
+    net.minecraft.world.entity.animal.horse.AbstractHorse horse -> B
+    float xMouse -> C
+    float yMouse -> D
+    20:23:void <init>(net.minecraft.world.inventory.HorseInventoryMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.animal.horse.AbstractHorse) -> <init>
+    27:53:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    57:63:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.InventoryScreen -> dsj:
+    net.minecraft.resources.ResourceLocation RECIPE_BUTTON_LOCATION -> B
+    float xMouse -> C
+    float yMouse -> D
+    net.minecraft.client.gui.screens.recipebook.RecipeBookComponent recipeBookComponent -> E
+    boolean recipeBookComponentInitialized -> F
+    boolean widthTooNarrow -> G
+    boolean buttonClicked -> H
+    28:37:void <init>(net.minecraft.world.entity.player.Player) -> <init>
+    41:47:void tick() -> d
+    51:74:void init() -> b
+    78:79:void renderLabels(com.mojang.blaze3d.vertex.PoseStack,int,int) -> b
+    83:101:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    105:112:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
     115:159:void renderEntityInInventory(int,int,int,float,float,net.minecraft.world.entity.LivingEntity) -> a
     163:163:boolean isHovering(int,int,int,int,double,double) -> a
-    168:176:boolean mouseClicked(double,double,int) -> mouseClicked
-    181:186:boolean mouseReleased(double,double,int) -> mouseReleased
-    191:192:boolean hasClickedOutside(double,double,int,int,int) -> a
-    197:200:void slotClicked(net.minecraft.world.inventory.Slot,int,int,net.minecraft.world.inventory.ClickType) -> a
-    204:205:void recipesUpdated() -> ae_
-    209:213:void removed() -> removed
-    217:217:net.minecraft.client.gui.screens.recipebook.RecipeBookComponent getRecipeBookComponent() -> c
-    64:72:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+    168:177:boolean mouseClicked(double,double,int) -> a
+    182:187:boolean mouseReleased(double,double,int) -> c
+    192:193:boolean hasClickedOutside(double,double,int,int,int) -> a
+    198:201:void slotClicked(net.minecraft.world.inventory.Slot,int,int,net.minecraft.world.inventory.ClickType) -> a
+    205:206:void recipesUpdated() -> ay_
+    210:214:void removed() -> e
+    218:218:net.minecraft.client.gui.screens.recipebook.RecipeBookComponent getRecipeBookComponent() -> l
+    149:149:void lambda$renderEntityInInventory$1(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource$BufferSource) -> a
+    65:73:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
     23:23:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen -> dhs:
+net.minecraft.client.gui.screens.inventory.ItemCombinerScreen -> dsk:
+    net.minecraft.resources.ResourceLocation menuResource -> A
+    18:20:void <init>(net.minecraft.world.inventory.ItemCombinerMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component,net.minecraft.resources.ResourceLocation) -> <init>
+    23:23:void subInit() -> k
+    27:30:void init() -> b
+    34:37:void removed() -> e
+    41:48:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    51:51:void renderFg(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    55:66:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    70:71:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.core.NonNullList) -> a
+    75:75:void setContainerData(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> a
+    79:79:void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen -> dsl:
     net.minecraft.world.level.block.entity.JigsawBlockEntity jigsawEntity -> a
-    net.minecraft.client.gui.components.EditBox attachementTypeEdit -> b
-    net.minecraft.client.gui.components.EditBox targetPoolEdit -> c
-    net.minecraft.client.gui.components.EditBox finalStateEdit -> d
-    net.minecraft.client.gui.components.Button doneButton -> e
-    23:25:void <init>(net.minecraft.world.level.block.entity.JigsawBlockEntity) -> <init>
-    29:32:void tick() -> tick
-    35:37:void onDone() -> b
-    40:41:void onCancel() -> c
-    44:45:void sendToServer() -> d
-    49:50:void onClose() -> onClose
-    54:77:void init() -> init
-    80:81:void updateValidity() -> a
-    85:92:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    96:97:void removed() -> removed
-    101:110:boolean keyPressed(int,int,int) -> keyPressed
-    115:127:void render(int,int,float) -> render
-    67:67:void lambda$init$3(java.lang.String) -> a
-    61:61:void lambda$init$2(java.lang.String) -> b
-    56:56:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    55:55:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
-net.minecraft.client.gui.screens.inventory.LecternScreen -> dht:
+    net.minecraft.client.gui.components.EditBox nameEdit -> b
+    net.minecraft.client.gui.components.EditBox targetEdit -> c
+    net.minecraft.client.gui.components.EditBox poolEdit -> p
+    net.minecraft.client.gui.components.EditBox finalStateEdit -> q
+    int levels -> r
+    boolean keepJigsaws -> s
+    net.minecraft.client.gui.components.Button jointButton -> t
+    net.minecraft.client.gui.components.Button doneButton -> u
+    net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType joint -> v
+    34:44:void <init>(net.minecraft.world.level.block.entity.JigsawBlockEntity) -> <init>
+    48:52:void tick() -> d
+    55:57:void onDone() -> i
+    60:61:void onCancel() -> k
+    64:72:void sendToServer() -> l
+    75:80:void sendGenerate() -> m
+    84:85:void onClose() -> au_
+    89:159:void init() -> b
+    162:165:void updateValidity() -> n
+    169:185:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    188:188:net.minecraft.network.chat.Component getJointText() -> u
+    193:194:void removed() -> e
+    198:207:boolean keyPressed(int,int,int) -> a
+    212:231:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    155:155:void lambda$init$7(net.minecraft.client.gui.components.Button) -> a
+    154:154:void lambda$init$6(net.minecraft.client.gui.components.Button) -> b
+    152:152:void lambda$init$5(net.minecraft.client.gui.components.Button) -> c
+    143:145:void lambda$init$4(net.minecraft.client.gui.components.Button) -> d
+    117:121:void lambda$init$3(net.minecraft.client.gui.components.Button) -> e
+    106:106:void lambda$init$2(java.lang.String) -> a
+    100:100:void lambda$init$1(java.lang.String) -> b
+    94:94:void lambda$init$0(java.lang.String) -> d
+    23:23:int access$000(net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen) -> a
+    23:23:int access$002(net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen,int) -> a
+    23:23:boolean access$100(net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen) -> b
+net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen$1 -> dsl$1:
+    net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen this$0 -> a
+    126:129:void <init>(net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen,int,int,int,int,net.minecraft.network.chat.Component,double) -> <init>
+    133:134:void updateMessage() -> b
+    138:139:void applyValue() -> a
+net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen$2 -> dsl$2:
+    net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen this$0 -> a
+    145:145:void <init>(net.minecraft.client.gui.screens.inventory.JigsawBlockEditScreen,int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    148:148:net.minecraft.network.chat.Component getMessage() -> i
+net.minecraft.client.gui.screens.inventory.LecternScreen -> dsm:
     net.minecraft.world.inventory.LecternMenu menu -> c
-    net.minecraft.world.inventory.ContainerListener listener -> d
-    17:38:void <init>(net.minecraft.world.inventory.LecternMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    42:42:net.minecraft.world.inventory.LecternMenu getMenu() -> f
-    47:49:void init() -> init
-    53:55:void onClose() -> onClose
-    59:61:void removed() -> removed
-    65:71:void createMenuControls() -> b
-    75:76:void pageBack() -> d
-    80:81:void pageForward() -> e
-    85:89:boolean forcePage(int) -> b
-    93:94:void sendButtonClick(int) -> c
-    98:98:boolean isPauseScreen() -> isPauseScreen
-    102:104:void bookChanged() -> g
-    107:108:void pageChanged() -> h
-    14:14:net.minecraft.world.inventory.AbstractContainerMenu getMenu() -> a
-    67:67:void lambda$createMenuControls$1(net.minecraft.client.gui.components.Button) -> a
-    66:66:void lambda$createMenuControls$0(net.minecraft.client.gui.components.Button) -> b
-    14:14:void access$000(net.minecraft.client.gui.screens.inventory.LecternScreen) -> a
-    14:14:void access$100(net.minecraft.client.gui.screens.inventory.LecternScreen) -> b
-net.minecraft.client.gui.screens.inventory.LecternScreen$1 -> dht$1:
+    net.minecraft.world.inventory.ContainerListener listener -> p
+    18:39:void <init>(net.minecraft.world.inventory.LecternMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    43:43:net.minecraft.world.inventory.LecternMenu getMenu() -> u
+    48:50:void init() -> b
+    54:56:void onClose() -> au_
+    60:62:void removed() -> e
+    66:72:void createMenuControls() -> k
+    76:77:void pageBack() -> m
+    81:82:void pageForward() -> n
+    86:90:boolean forcePage(int) -> b
+    94:95:void sendButtonClick(int) -> c
+    99:99:boolean isPauseScreen() -> ax_
+    103:105:void bookChanged() -> v
+    108:109:void pageChanged() -> w
+    15:15:net.minecraft.world.inventory.AbstractContainerMenu getMenu() -> i
+    68:68:void lambda$createMenuControls$1(net.minecraft.client.gui.components.Button) -> a
+    67:67:void lambda$createMenuControls$0(net.minecraft.client.gui.components.Button) -> b
+    15:15:void access$000(net.minecraft.client.gui.screens.inventory.LecternScreen) -> a
+    15:15:void access$100(net.minecraft.client.gui.screens.inventory.LecternScreen) -> b
+net.minecraft.client.gui.screens.inventory.LecternScreen$1 -> dsm$1:
     net.minecraft.client.gui.screens.inventory.LecternScreen this$0 -> a
-    17:17:void <init>(net.minecraft.client.gui.screens.inventory.LecternScreen) -> <init>
-    20:21:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.core.NonNullList) -> a
-    25:26:void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
-    30:33:void setContainerData(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> a
-net.minecraft.client.gui.screens.inventory.LoomScreen -> dhu:
-    net.minecraft.resources.ResourceLocation BG_LOCATION -> k
-    int TOTAL_PATTERN_ROWS -> l
-    net.minecraft.client.model.geom.ModelPart flag -> m
-    java.util.List resultBannerPatterns -> n
-    net.minecraft.world.item.ItemStack bannerStack -> o
-    net.minecraft.world.item.ItemStack dyeStack -> p
-    net.minecraft.world.item.ItemStack patternStack -> q
-    boolean displayPatterns -> r
-    boolean displaySpecialPattern -> s
-    boolean hasMaxPatterns -> t
-    float scrollOffs -> u
-    boolean scrolling -> v
-    int startIndex -> w
-    53:68:void <init>(net.minecraft.world.inventory.LoomMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    72:74:void render(int,int,float) -> render
-    78:80:void renderLabels(int,int) -> b
-    84:158:void renderBg(float,int,int) -> a
-    161:187:void renderPattern(int,int,int) -> b
-    191:215:boolean mouseClicked(double,double,int) -> mouseClicked
-    220:236:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    241:247:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    252:252:boolean hasClickedOutside(double,double,int,int,int) -> a
-    256:281:void containerChanged() -> b
+    18:18:void <init>(net.minecraft.client.gui.screens.inventory.LecternScreen) -> <init>
+    21:22:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.core.NonNullList) -> a
+    26:27:void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
+    31:34:void setContainerData(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> a
+net.minecraft.client.gui.screens.inventory.LoomScreen -> dsn:
+    net.minecraft.resources.ResourceLocation BG_LOCATION -> A
+    int TOTAL_PATTERN_ROWS -> B
+    net.minecraft.client.model.geom.ModelPart flag -> C
+    java.util.List resultBannerPatterns -> D
+    net.minecraft.world.item.ItemStack bannerStack -> E
+    net.minecraft.world.item.ItemStack dyeStack -> F
+    net.minecraft.world.item.ItemStack patternStack -> G
+    boolean displayPatterns -> H
+    boolean displaySpecialPattern -> I
+    boolean hasMaxPatterns -> J
+    float scrollOffs -> K
+    boolean scrolling -> L
+    int startIndex -> M
+    53:69:void <init>(net.minecraft.world.inventory.LoomMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    73:75:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    79:153:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    156:182:void renderPattern(int,int,int) -> c
+    186:210:boolean mouseClicked(double,double,int) -> a
+    215:231:boolean mouseDragged(double,double,int,double,double) -> a
+    236:242:boolean mouseScrolled(double,double,double) -> a
+    247:247:boolean hasClickedOutside(double,double,int,int,int) -> a
+    251:276:void containerChanged() -> k
     36:41:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.MenuAccess -> dhv:
-    net.minecraft.world.inventory.AbstractContainerMenu getMenu() -> a
-net.minecraft.client.gui.screens.inventory.MerchantScreen -> dhw:
-    net.minecraft.resources.ResourceLocation VILLAGER_LOCATION -> k
-    int shopItem -> l
-    net.minecraft.client.gui.screens.inventory.MerchantScreen$TradeOfferButton[] tradeOfferButtons -> m
-    int scrollOff -> n
-    boolean isDragging -> o
-    43:50:void <init>(net.minecraft.world.inventory.MerchantMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    53:56:void postButtonClick() -> b
-    60:76:void init() -> init
-    80:104:void renderLabels(int,int) -> b
-    108:129:void renderBg(float,int,int) -> a
-    132:157:void renderProgressBar(int,int,net.minecraft.world.item.trading.MerchantOffer) -> a
-    160:174:void renderScroller(int,int,net.minecraft.world.item.trading.MerchantOffers) -> a
-    178:252:void render(int,int,float) -> render
-    255:262:void renderButtonArrows(net.minecraft.world.item.trading.MerchantOffer,int,int) -> a
-    265:276:void renderAndDecorateCostA(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,int,int) -> a
-    279:279:boolean canScroll(int) -> a
-    284:290:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    295:309:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    314:323:boolean mouseClicked(double,double,int) -> mouseClicked
-    68:72:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-    17:17:int access$000(net.minecraft.client.gui.screens.inventory.MerchantScreen) -> a
-    17:17:void access$100(net.minecraft.client.gui.screens.inventory.MerchantScreen,net.minecraft.world.item.ItemStack,int,int) -> a
-    17:17:void access$200(net.minecraft.client.gui.screens.inventory.MerchantScreen,net.minecraft.world.item.ItemStack,int,int) -> b
-    17:17:void access$300(net.minecraft.client.gui.screens.inventory.MerchantScreen,net.minecraft.world.item.ItemStack,int,int) -> c
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.MerchantScreen$TradeOfferButton -> dhw$a:
+net.minecraft.client.gui.screens.inventory.MenuAccess -> dso:
+    net.minecraft.world.inventory.AbstractContainerMenu getMenu() -> i
+net.minecraft.client.gui.screens.inventory.MerchantScreen -> dsp:
+    net.minecraft.resources.ResourceLocation VILLAGER_LOCATION -> A
+    int shopItem -> B
+    net.minecraft.client.gui.screens.inventory.MerchantScreen$TradeOfferButton[] tradeOfferButtons -> C
+    int scrollOff -> D
+    boolean isDragging -> E
+    46:54:void <init>(net.minecraft.world.inventory.MerchantMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    57:60:void postButtonClick() -> k
+    64:80:void init() -> b
+    84:103:void renderLabels(com.mojang.blaze3d.vertex.PoseStack,int,int) -> b
+    107:128:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    131:156:void renderProgressBar(com.mojang.blaze3d.vertex.PoseStack,int,int,net.minecraft.world.item.trading.MerchantOffer) -> a
+    159:173:void renderScroller(com.mojang.blaze3d.vertex.PoseStack,int,int,net.minecraft.world.item.trading.MerchantOffers) -> a
+    177:251:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    254:261:void renderButtonArrows(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.item.trading.MerchantOffer,int,int) -> a
+    264:275:void renderAndDecorateCostA(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,int,int) -> a
+    278:278:boolean canScroll(int) -> a
+    283:289:boolean mouseScrolled(double,double,double) -> a
+    294:308:boolean mouseDragged(double,double,int,double,double) -> a
+    313:322:boolean mouseClicked(double,double,int) -> a
+    72:76:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
+    20:20:int access$000(net.minecraft.client.gui.screens.inventory.MerchantScreen) -> a
+    20:20:void access$100(net.minecraft.client.gui.screens.inventory.MerchantScreen,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.item.ItemStack,int,int) -> a
+    20:20:void access$200(net.minecraft.client.gui.screens.inventory.MerchantScreen,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.item.ItemStack,int,int) -> b
+    20:20:void access$300(net.minecraft.client.gui.screens.inventory.MerchantScreen,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.item.ItemStack,int,int) -> c
+    21:21:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.MerchantScreen$TradeOfferButton -> dsp$a:
     int index -> a
     net.minecraft.client.gui.screens.inventory.MerchantScreen this$0 -> b
-    329:333:void <init>(net.minecraft.client.gui.screens.inventory.MerchantScreen,int,int,int,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    336:336:int getIndex() -> a
-    341:355:void renderToolTip(int,int) -> renderToolTip
-net.minecraft.client.gui.screens.inventory.MinecartCommandBlockEditScreen -> dhx:
-    net.minecraft.world.level.BaseCommandBlock commandBlock -> g
+    328:332:void <init>(net.minecraft.client.gui.screens.inventory.MerchantScreen,int,int,int,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    335:335:int getIndex() -> a
+    340:354:void renderToolTip(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+net.minecraft.client.gui.screens.inventory.MinecartCommandBlockEditScreen -> dsq:
+    net.minecraft.world.level.BaseCommandBlock commandBlock -> s
     10:12:void <init>(net.minecraft.world.level.BaseCommandBlock) -> <init>
-    16:16:net.minecraft.world.level.BaseCommandBlock getCommandBlock() -> a
-    21:21:int getPreviousY() -> b
-    26:32:void init() -> init
+    16:16:net.minecraft.world.level.BaseCommandBlock getCommandBlock() -> i
+    21:21:int getPreviousY() -> k
+    26:32:void init() -> b
     36:40:void populateAndSendPacket(net.minecraft.world.level.BaseCommandBlock) -> a
-net.minecraft.client.gui.screens.inventory.PageButton -> dhy:
+net.minecraft.client.gui.screens.inventory.PageButton -> dsr:
     boolean isForward -> a
     boolean playTurnSound -> b
-    15:18:void <init>(int,int,boolean,net.minecraft.client.gui.components.Button$OnPress,boolean) -> <init>
-    22:35:void renderButton(int,int,float) -> renderButton
-    39:42:void playDownSound(net.minecraft.client.sounds.SoundManager) -> playDownSound
-net.minecraft.client.gui.screens.inventory.ShulkerBoxScreen -> dhz:
-    net.minecraft.resources.ResourceLocation CONTAINER_TEXTURE -> k
-    13:16:void <init>(net.minecraft.world.inventory.ShulkerBoxMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    20:23:void render(int,int,float) -> render
-    27:29:void renderLabels(int,int) -> b
-    33:38:void renderBg(float,int,int) -> a
-    10:10:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.SignEditScreen -> dia:
+    17:20:void <init>(int,int,boolean,net.minecraft.client.gui.components.Button$OnPress,boolean) -> <init>
+    24:37:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    41:44:void playDownSound(net.minecraft.client.sounds.SoundManager) -> a
+net.minecraft.client.gui.screens.inventory.ShulkerBoxScreen -> dss:
+    net.minecraft.resources.ResourceLocation CONTAINER_TEXTURE -> A
+    14:17:void <init>(net.minecraft.world.inventory.ShulkerBoxMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    21:24:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    28:33:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.SignEditScreen -> dst:
     net.minecraft.client.renderer.blockentity.SignRenderer$SignModel signModel -> a
     net.minecraft.world.level.block.entity.SignBlockEntity sign -> b
     int frame -> c
-    int line -> d
-    net.minecraft.client.gui.font.TextFieldHelper signField -> e
-    37:47:void <init>(net.minecraft.world.level.block.entity.SignBlockEntity) -> <init>
-    51:61:void init() -> init
-    65:71:void removed() -> removed
-    75:80:void tick() -> tick
-    83:85:void onDone() -> a
-    89:90:boolean charTyped(char,int) -> charTyped
-    95:96:void onClose() -> onClose
-    100:114:boolean keyPressed(int,int,int) -> keyPressed
-    119:245:void render(int,int,float) -> render
-    162:163:java.lang.String lambda$render$3(net.minecraft.network.chat.Component) -> a
-    58:58:void lambda$init$2(java.lang.String) -> a
-    57:57:java.lang.String lambda$init$1() -> b
-    52:52:void lambda$init$0(net.minecraft.client.gui.components.Button) -> a
-net.minecraft.client.gui.screens.inventory.SmokerScreen -> dib:
-    net.minecraft.resources.ResourceLocation TEXTURE -> l
+    int line -> p
+    net.minecraft.client.gui.font.TextFieldHelper signField -> q
+    java.lang.String[] messages -> r
+    36:48:void <init>(net.minecraft.world.level.block.entity.SignBlockEntity) -> <init>
+    52:66:void init() -> b
+    70:76:void removed() -> e
+    80:85:void tick() -> d
+    88:90:void onDone() -> i
+    94:95:boolean charTyped(char,int) -> a
+    100:101:void onClose() -> au_
+    105:119:boolean keyPressed(int,int,int) -> a
+    124:242:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    64:64:boolean lambda$init$4(java.lang.String) -> a
+    59:61:void lambda$init$3(java.lang.String) -> b
+    57:57:java.lang.String lambda$init$2() -> k
+    53:53:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    43:43:void lambda$new$0(java.lang.String[]) -> a
+net.minecraft.client.gui.screens.inventory.SmithingScreen -> dsu:
+    net.minecraft.resources.ResourceLocation SMITHING_LOCATION -> A
+    14:17:void <init>(net.minecraft.world.inventory.SmithingMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    21:23:void renderLabels(com.mojang.blaze3d.vertex.PoseStack,int,int) -> b
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.SmokerScreen -> dsv:
+    net.minecraft.resources.ResourceLocation TEXTURE -> B
     13:14:void <init>(net.minecraft.world.inventory.SmokerMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
     10:10:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.StonecutterScreen -> dic:
-    net.minecraft.resources.ResourceLocation BG_LOCATION -> k
-    float scrollOffs -> l
-    boolean scrolling -> m
-    int startIndex -> n
-    boolean displayRecipes -> o
-    36:38:void <init>(net.minecraft.world.inventory.StonecutterMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
-    42:44:void render(int,int,float) -> render
-    48:50:void renderLabels(int,int) -> b
-    54:72:void renderBg(float,int,int) -> a
-    75:90:void renderButtons(int,int,int,int,int) -> a
-    94:103:void renderRecipes(int,int,int) -> b
-    107:131:boolean mouseClicked(double,double,int) -> mouseClicked
-    136:147:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    152:158:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    162:162:boolean isScrollBarActive() -> c
-    166:166:int getOffscreenRows() -> b
-    170:175:void containerChanged() -> d
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen -> did:
+net.minecraft.client.gui.screens.inventory.StonecutterScreen -> dsw:
+    net.minecraft.resources.ResourceLocation BG_LOCATION -> A
+    float scrollOffs -> B
+    boolean scrolling -> C
+    int startIndex -> D
+    boolean displayRecipes -> E
+    37:40:void <init>(net.minecraft.world.inventory.StonecutterMenu,net.minecraft.world.entity.player.Inventory,net.minecraft.network.chat.Component) -> <init>
+    44:46:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    50:68:void renderBg(com.mojang.blaze3d.vertex.PoseStack,float,int,int) -> a
+    72:90:void renderTooltip(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    93:108:void renderButtons(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int) -> b
+    112:121:void renderRecipes(int,int,int) -> c
+    125:149:boolean mouseClicked(double,double,int) -> a
+    154:165:boolean mouseDragged(double,double,int,double,double) -> a
+    170:176:boolean mouseScrolled(double,double,double) -> a
+    180:180:boolean isScrollBarActive() -> l
+    184:184:int getOffscreenRows() -> k
+    188:193:void containerChanged() -> m
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen -> dsx:
     net.minecraft.world.level.block.entity.StructureBlockEntity structure -> a
     net.minecraft.world.level.block.Mirror initialMirror -> b
     net.minecraft.world.level.block.Rotation initialRotation -> c
-    net.minecraft.world.level.block.state.properties.StructureMode initialMode -> d
-    boolean initialEntityIgnoring -> e
-    boolean initialShowAir -> f
-    boolean initialShowBoundingBox -> g
-    net.minecraft.client.gui.components.EditBox nameEdit -> h
-    net.minecraft.client.gui.components.EditBox posXEdit -> i
-    net.minecraft.client.gui.components.EditBox posYEdit -> j
-    net.minecraft.client.gui.components.EditBox posZEdit -> k
-    net.minecraft.client.gui.components.EditBox sizeXEdit -> l
-    net.minecraft.client.gui.components.EditBox sizeYEdit -> m
-    net.minecraft.client.gui.components.EditBox sizeZEdit -> n
-    net.minecraft.client.gui.components.EditBox integrityEdit -> o
-    net.minecraft.client.gui.components.EditBox seedEdit -> p
-    net.minecraft.client.gui.components.EditBox dataEdit -> q
-    net.minecraft.client.gui.components.Button doneButton -> r
-    net.minecraft.client.gui.components.Button cancelButton -> s
-    net.minecraft.client.gui.components.Button saveButton -> t
-    net.minecraft.client.gui.components.Button loadButton -> u
-    net.minecraft.client.gui.components.Button rot0Button -> v
-    net.minecraft.client.gui.components.Button rot90Button -> w
-    net.minecraft.client.gui.components.Button rot180Button -> x
-    net.minecraft.client.gui.components.Button rot270Button -> y
-    net.minecraft.client.gui.components.Button modeButton -> z
-    net.minecraft.client.gui.components.Button detectButton -> A
-    net.minecraft.client.gui.components.Button entitiesButton -> B
-    net.minecraft.client.gui.components.Button mirrorButton -> C
-    net.minecraft.client.gui.components.Button toggleAirButton -> D
-    net.minecraft.client.gui.components.Button toggleBoundingBox -> E
-    java.text.DecimalFormat decimalFormat -> F
-    24:62:void <init>(net.minecraft.world.level.block.entity.StructureBlockEntity) -> <init>
-    66:76:void tick() -> tick
-    79:82:void onDone() -> a
-    85:92:void onCancel() -> b
-    96:236:void init() -> init
-    240:263:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    267:268:void removed() -> removed
-    271:277:void updateEntitiesButton() -> c
-    280:286:void updateToggleAirButton() -> d
-    289:295:void updateToggleBoundingBox() -> e
-    298:310:void updateMirrorButton() -> f
-    313:332:void updateDirectionButtons() -> g
-    335:397:void updateMode() -> h
-    400:405:boolean sendToServer(net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType) -> a
-    410:412:long parseSeed(java.lang.String) -> a
-    418:420:float parseIntegrity(java.lang.String) -> b
-    426:428:int parseCoordinate(java.lang.String) -> c
-    434:435:void onClose() -> onClose
-    439:448:boolean keyPressed(int,int,int) -> keyPressed
-    453:508:void render(int,int,float) -> render
-    512:512:boolean isPauseScreen() -> isPauseScreen
-    162:164:void lambda$init$13(net.minecraft.client.gui.components.Button) -> a
-    158:160:void lambda$init$12(net.minecraft.client.gui.components.Button) -> b
-    154:156:void lambda$init$11(net.minecraft.client.gui.components.Button) -> c
-    150:152:void lambda$init$10(net.minecraft.client.gui.components.Button) -> d
-    145:147:void lambda$init$9(net.minecraft.client.gui.components.Button) -> e
-    141:143:void lambda$init$8(net.minecraft.client.gui.components.Button) -> f
-    127:139:void lambda$init$7(net.minecraft.client.gui.components.Button) -> g
-    123:125:void lambda$init$6(net.minecraft.client.gui.components.Button) -> h
-    117:121:void lambda$init$5(net.minecraft.client.gui.components.Button) -> i
-    113:115:void lambda$init$4(net.minecraft.client.gui.components.Button) -> j
-    107:111:void lambda$init$3(net.minecraft.client.gui.components.Button) -> k
-    101:105:void lambda$init$2(net.minecraft.client.gui.components.Button) -> l
-    98:98:void lambda$init$1(net.minecraft.client.gui.components.Button) -> m
-    97:97:void lambda$init$0(net.minecraft.client.gui.components.Button) -> n
-    22:22:boolean access$000(net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen,java.lang.String,char,int) -> a
-net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen$1 -> did$1:
+    net.minecraft.world.level.block.state.properties.StructureMode initialMode -> p
+    boolean initialEntityIgnoring -> q
+    boolean initialShowAir -> r
+    boolean initialShowBoundingBox -> s
+    net.minecraft.client.gui.components.EditBox nameEdit -> t
+    net.minecraft.client.gui.components.EditBox posXEdit -> u
+    net.minecraft.client.gui.components.EditBox posYEdit -> v
+    net.minecraft.client.gui.components.EditBox posZEdit -> w
+    net.minecraft.client.gui.components.EditBox sizeXEdit -> x
+    net.minecraft.client.gui.components.EditBox sizeYEdit -> y
+    net.minecraft.client.gui.components.EditBox sizeZEdit -> z
+    net.minecraft.client.gui.components.EditBox integrityEdit -> A
+    net.minecraft.client.gui.components.EditBox seedEdit -> B
+    net.minecraft.client.gui.components.EditBox dataEdit -> C
+    net.minecraft.client.gui.components.Button doneButton -> D
+    net.minecraft.client.gui.components.Button cancelButton -> E
+    net.minecraft.client.gui.components.Button saveButton -> F
+    net.minecraft.client.gui.components.Button loadButton -> G
+    net.minecraft.client.gui.components.Button rot0Button -> H
+    net.minecraft.client.gui.components.Button rot90Button -> I
+    net.minecraft.client.gui.components.Button rot180Button -> J
+    net.minecraft.client.gui.components.Button rot270Button -> K
+    net.minecraft.client.gui.components.Button modeButton -> L
+    net.minecraft.client.gui.components.Button detectButton -> M
+    net.minecraft.client.gui.components.Button entitiesButton -> N
+    net.minecraft.client.gui.components.Button mirrorButton -> O
+    net.minecraft.client.gui.components.Button toggleAirButton -> P
+    net.minecraft.client.gui.components.Button toggleBoundingBox -> Q
+    java.text.DecimalFormat decimalFormat -> R
+    27:65:void <init>(net.minecraft.world.level.block.entity.StructureBlockEntity) -> <init>
+    69:79:void tick() -> d
+    82:85:void onDone() -> i
+    88:95:void onCancel() -> k
+    99:239:void init() -> b
+    243:266:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    270:271:void removed() -> e
+    274:275:void updateEntitiesButton() -> l
+    278:279:void updateToggleAirButton() -> m
+    282:283:void updateToggleBoundingBox() -> n
+    286:298:void updateMirrorButton() -> u
+    301:320:void updateDirectionButtons() -> v
+    323:385:void updateMode() -> w
+    388:393:boolean sendToServer(net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType) -> a
+    398:400:long parseSeed(java.lang.String) -> a
+    406:408:float parseIntegrity(java.lang.String) -> b
+    414:416:int parseCoordinate(java.lang.String) -> d
+    422:423:void onClose() -> au_
+    427:436:boolean keyPressed(int,int,int) -> a
+    441:496:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    500:500:boolean isPauseScreen() -> ax_
+    165:167:void lambda$init$13(net.minecraft.client.gui.components.Button) -> a
+    161:163:void lambda$init$12(net.minecraft.client.gui.components.Button) -> b
+    157:159:void lambda$init$11(net.minecraft.client.gui.components.Button) -> c
+    153:155:void lambda$init$10(net.minecraft.client.gui.components.Button) -> d
+    148:150:void lambda$init$9(net.minecraft.client.gui.components.Button) -> e
+    144:146:void lambda$init$8(net.minecraft.client.gui.components.Button) -> f
+    130:142:void lambda$init$7(net.minecraft.client.gui.components.Button) -> g
+    126:128:void lambda$init$6(net.minecraft.client.gui.components.Button) -> h
+    120:124:void lambda$init$5(net.minecraft.client.gui.components.Button) -> i
+    116:118:void lambda$init$4(net.minecraft.client.gui.components.Button) -> j
+    110:114:void lambda$init$3(net.minecraft.client.gui.components.Button) -> k
+    104:108:void lambda$init$2(net.minecraft.client.gui.components.Button) -> l
+    101:101:void lambda$init$1(net.minecraft.client.gui.components.Button) -> m
+    100:100:void lambda$init$0(net.minecraft.client.gui.components.Button) -> n
+    25:25:boolean access$000(net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen,java.lang.String,char,int) -> a
+net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen$1 -> dsx$1:
     net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen this$0 -> a
-    166:166:void <init>(net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen,net.minecraft.client.gui.Font,int,int,int,int,java.lang.String) -> <init>
-    170:173:boolean charTyped(char,int) -> charTyped
-net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen$2 -> did$2:
+    169:169:void <init>(net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen,net.minecraft.client.gui.Font,int,int,int,int,net.minecraft.network.chat.Component) -> <init>
+    173:176:boolean charTyped(char,int) -> a
+net.minecraft.client.gui.screens.inventory.StructureBlockEditScreen$2 -> dsx$2:
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> b
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$StructureMode -> c
-    299:358:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.inventory.package-info -> die:
-net.minecraft.client.gui.screens.mco.package-info -> dif:
-net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen -> dig:
+    287:346:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.inventory.package-info -> dsy:
+net.minecraft.client.gui.screens.mco.package-info -> dsz:
+net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen -> dta:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.client.multiplayer.ServerStatusPinger pinger -> c
-    net.minecraft.client.gui.screens.Screen lastScreen -> d
+    net.minecraft.client.gui.screens.Screen lastScreen -> p
     net.minecraft.client.gui.screens.multiplayer.ServerSelectionList serverSelectionList -> a
-    net.minecraft.client.multiplayer.ServerList servers -> e
-    net.minecraft.client.gui.components.Button editButton -> f
-    net.minecraft.client.gui.components.Button selectButton -> g
-    net.minecraft.client.gui.components.Button deleteButton -> h
-    java.lang.String toolTip -> i
-    net.minecraft.client.multiplayer.ServerData editingServer -> j
-    net.minecraft.client.server.LanServerDetection$LanServerList lanServerList -> k
-    net.minecraft.client.server.LanServerDetection$LanServerDetector lanServerDetector -> l
-    boolean initedOnce -> m
+    net.minecraft.client.multiplayer.ServerList servers -> q
+    net.minecraft.client.gui.components.Button editButton -> r
+    net.minecraft.client.gui.components.Button selectButton -> s
+    net.minecraft.client.gui.components.Button deleteButton -> t
+    java.util.List toolTip -> u
+    net.minecraft.client.multiplayer.ServerData editingServer -> v
+    net.minecraft.client.server.LanServerDetection$LanServerList lanServerList -> w
+    net.minecraft.client.server.LanServerDetection$LanServerDetector lanServerDetector -> x
+    boolean initedOnce -> y
     28:44:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
-    48:111:void init() -> init
-    115:125:void tick() -> tick
-    129:135:void removed() -> removed
-    138:139:void refreshServerList() -> e
-    142:150:void deleteCallback(boolean) -> a
-    153:163:void editServerCallback(boolean) -> b
-    166:173:void addServerCallback(boolean) -> c
-    176:181:void directJoinCallback(boolean) -> d
-    185:202:boolean keyPressed(int,int,int) -> keyPressed
-    207:219:void render(int,int,float) -> render
-    222:230:void joinSelectedServer() -> a
+    48:111:void init() -> b
+    115:125:void tick() -> d
+    129:135:void removed() -> e
+    138:139:void refreshServerList() -> n
+    142:150:void deleteCallback(boolean) -> c
+    153:163:void editServerCallback(boolean) -> d
+    166:173:void addServerCallback(boolean) -> e
+    176:181:void directJoinCallback(boolean) -> f
+    185:202:boolean keyPressed(int,int,int) -> a
+    207:219:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    222:230:void joinSelectedServer() -> i
     233:234:void join(net.minecraft.client.multiplayer.ServerData) -> a
     237:240:void setSelected(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$Entry) -> a
-    243:255:void onSelectedChange() -> b
-    258:258:net.minecraft.client.multiplayer.ServerStatusPinger getPinger() -> c
-    262:263:void setToolTip(java.lang.String) -> a
-    266:266:net.minecraft.client.multiplayer.ServerList getServers() -> d
+    243:255:void onSelectedChange() -> k
+    258:258:net.minecraft.client.multiplayer.ServerStatusPinger getPinger() -> l
+    262:263:void setToolTip(java.util.List) -> b
+    266:266:net.minecraft.client.multiplayer.ServerList getServers() -> m
     108:108:void lambda$init$6(net.minecraft.client.gui.components.Button) -> a
     107:107:void lambda$init$5(net.minecraft.client.gui.components.Button) -> b
     94:106:void lambda$init$4(net.minecraft.client.gui.components.Button) -> c
@@ -10392,65 +10820,66 @@ net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen -> dig:
     74:76:void lambda$init$1(net.minecraft.client.gui.components.Button) -> f
     72:72:void lambda$init$0(net.minecraft.client.gui.components.Button) -> g
     26:26:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.multiplayer.SafetyScreen -> dih:
+net.minecraft.client.gui.screens.multiplayer.SafetyScreen -> dtb:
     net.minecraft.client.gui.screens.Screen previous -> a
-    net.minecraft.network.chat.Component title -> b
-    net.minecraft.network.chat.Component content -> c
-    net.minecraft.network.chat.Component check -> d
-    net.minecraft.network.chat.Component proceed -> e
-    net.minecraft.network.chat.Component back -> f
-    net.minecraft.client.gui.components.Checkbox stopShowing -> g
-    java.util.List lines -> h
-    16:28:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
-    32:51:void init() -> init
-    55:55:java.lang.String getNarrationMessage() -> getNarrationMessage
-    60:68:void render(int,int,float) -> render
-    46:46:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    39:44:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
-net.minecraft.client.gui.screens.multiplayer.ServerSelectionList -> dii:
+    net.minecraft.network.chat.Component TITLE -> b
+    net.minecraft.network.chat.Component CONTENT -> c
+    net.minecraft.network.chat.Component CHECK -> p
+    net.minecraft.network.chat.Component NARRATION -> q
+    net.minecraft.client.gui.components.Checkbox stopShowing -> r
+    java.util.List lines -> s
+    25:30:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
+    34:53:void init() -> b
+    57:57:java.lang.String getNarrationMessage() -> as_
+    62:70:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    48:48:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    41:46:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+    19:22:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.multiplayer.ServerSelectionList -> dtc:
     org.apache.logging.log4j.Logger LOGGER -> a
-    java.util.concurrent.ThreadPoolExecutor THREAD_POOL -> b
-    net.minecraft.resources.ResourceLocation ICON_MISSING -> c
-    net.minecraft.resources.ResourceLocation ICON_OVERLAY_LOCATION -> d
-    net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen screen -> e
-    java.util.List onlineServers -> f
-    net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$Entry lanHeader -> g
-    java.util.List networkServers -> h
-    42:49:void <init>(net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen,net.minecraft.client.Minecraft,int,int,int,int,int) -> <init>
-    52:56:void refreshEntries() -> e
-    60:65:void setSelected(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$Entry) -> a
-    69:70:boolean keyPressed(int,int,int) -> keyPressed
-    75:89:void moveSelection(int) -> moveSelection
-    92:99:void updateOnlineServers(net.minecraft.client.multiplayer.ServerList) -> a
-    102:109:void updateNetworkServers(java.util.List) -> a
-    113:113:int getScrollbarPosition() -> getScrollbarPosition
-    118:118:int getRowWidth() -> getRowWidth
-    123:123:boolean isFocused() -> isFocused
-    35:35:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> setSelected
-    35:35:java.util.concurrent.ThreadPoolExecutor access$100() -> a
-    35:35:net.minecraft.resources.ResourceLocation access$200() -> b
-    35:35:net.minecraft.resources.ResourceLocation access$300() -> c
-    35:35:org.apache.logging.log4j.Logger access$400() -> d
-    35:35:void access$500(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList,net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
-    35:35:int access$600(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList) -> a
-    35:35:int access$700(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList,int) -> a
-    36:39:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$Entry -> dii$a:
-    127:127:void <init>() -> <init>
-net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$LANHeader -> dii$b:
+    java.util.concurrent.ThreadPoolExecutor THREAD_POOL -> o
+    net.minecraft.resources.ResourceLocation ICON_MISSING -> p
+    net.minecraft.resources.ResourceLocation ICON_OVERLAY_LOCATION -> q
+    net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen screen -> r
+    java.util.List onlineServers -> s
+    net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$Entry lanHeader -> t
+    java.util.List networkServers -> u
+    48:55:void <init>(net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen,net.minecraft.client.Minecraft,int,int,int,int,int) -> <init>
+    58:62:void refreshEntries() -> u
+    66:73:void setSelected(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$Entry) -> a
+    77:78:boolean keyPressed(int,int,int) -> a
+    83:85:void moveSelection(net.minecraft.client.gui.components.AbstractSelectionList$SelectionDirection) -> a
+    88:95:void updateOnlineServers(net.minecraft.client.multiplayer.ServerList) -> a
+    98:105:void updateNetworkServers(java.util.List) -> a
+    109:109:int getScrollbarPosition() -> e
+    114:114:int getRowWidth() -> d
+    119:119:boolean isFocused() -> b
+    41:41:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+    83:83:boolean lambda$moveSelection$0(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$Entry) -> b
+    41:41:java.util.concurrent.ThreadPoolExecutor access$100() -> f
+    41:41:net.minecraft.resources.ResourceLocation access$200() -> g
+    41:41:net.minecraft.resources.ResourceLocation access$300() -> s
+    41:41:org.apache.logging.log4j.Logger access$400() -> t
+    41:41:void access$500(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList,net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+    41:41:int access$600(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList) -> a
+    41:41:int access$700(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList,int) -> a
+    42:45:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$Entry -> dtc$a:
+    123:123:void <init>() -> <init>
+net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$LANHeader -> dtc$b:
     net.minecraft.client.Minecraft minecraft -> a
-    132:134:void <init>() -> <init>
-    138:155:void render(int,int,int,int,int,int,int,boolean,float) -> render
-net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$NetworkServerEntry -> dii$c:
+    128:130:void <init>() -> <init>
+    134:151:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$NetworkServerEntry -> dtc$c:
     net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen screen -> c
     net.minecraft.client.Minecraft minecraft -> a
     net.minecraft.client.server.LanServer serverData -> b
     long lastClickTime -> d
-    166:170:void <init>(net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen,net.minecraft.client.server.LanServer) -> <init>
-    174:182:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    186:191:boolean mouseClicked(double,double,int) -> mouseClicked
-    195:195:net.minecraft.client.server.LanServer getServerData() -> a
-net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$OnlineServerEntry -> dii$d:
+    162:166:void <init>(net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen,net.minecraft.client.server.LanServer) -> <init>
+    170:178:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    182:187:boolean mouseClicked(double,double,int) -> a
+    191:191:net.minecraft.client.server.LanServer getServerData() -> a
+net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$OnlineServerEntry -> dtc$d:
     net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen screen -> b
     net.minecraft.client.Minecraft minecraft -> c
     net.minecraft.client.multiplayer.ServerData serverData -> d
@@ -10459,179 +10888,308 @@ net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$OnlineServerEnt
     net.minecraft.client.renderer.texture.DynamicTexture icon -> g
     long lastClickTime -> h
     net.minecraft.client.gui.screens.multiplayer.ServerSelectionList this$0 -> a
-    217:223:void <init>(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList,net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen,net.minecraft.client.multiplayer.ServerData) -> <init>
-    227:353:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    356:360:void drawIcon(int,int,net.minecraft.resources.ResourceLocation) -> a
-    363:363:boolean canJoin() -> b
-    367:391:void loadServerIcon() -> c
-    395:408:boolean keyPressed(int,int,int) -> keyPressed
-    412:418:void swap(int,int) -> a
-    422:454:boolean mouseClicked(double,double,int) -> mouseClicked
-    458:458:net.minecraft.client.multiplayer.ServerData getServerData() -> a
-    235:243:void lambda$render$0() -> d
-    199:199:net.minecraft.client.multiplayer.ServerData access$000(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$OnlineServerEntry) -> a
-net.minecraft.client.gui.screens.multiplayer.package-info -> dij:
-net.minecraft.client.gui.screens.package-info -> dik:
-net.minecraft.client.gui.screens.recipebook.AbstractFurnaceRecipeBookComponent -> dil:
-    java.util.Iterator iterator -> i
-    java.util.Set fuels -> j
-    net.minecraft.world.inventory.Slot fuelSlot -> k
-    net.minecraft.world.item.Item fuel -> l
-    float time -> m
-    21:21:void <init>() -> <init>
-    30:32:boolean updateFiltering() -> a
+    213:219:void <init>(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList,net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen,net.minecraft.client.multiplayer.ServerData) -> <init>
+    223:355:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    358:359:void updateServerList() -> a
+    362:366:void drawIcon(com.mojang.blaze3d.vertex.PoseStack,int,int,net.minecraft.resources.ResourceLocation) -> a
+    369:369:boolean canJoin() -> c
+    373:396:boolean uploadServerIcon(java.lang.String) -> a
+    401:414:boolean keyPressed(int,int,int) -> a
+    418:424:void swap(int,int) -> a
+    428:460:boolean mouseClicked(double,double,int) -> a
+    464:464:net.minecraft.client.multiplayer.ServerData getServerData() -> b
+    231:239:void lambda$render$1() -> d
+    231:231:void lambda$null$0() -> e
+    195:195:net.minecraft.client.multiplayer.ServerData access$000(net.minecraft.client.gui.screens.multiplayer.ServerSelectionList$OnlineServerEntry) -> a
+net.minecraft.client.gui.screens.multiplayer.package-info -> dtd:
+net.minecraft.client.gui.screens.package-info -> dte:
+net.minecraft.client.gui.screens.packs.PackSelectionModel -> dtf:
+    net.minecraft.server.packs.repository.PackRepository repository -> a
+    java.util.List selected -> b
+    java.util.List unselected -> c
+    java.util.function.BiConsumer iconBinder -> d
+    java.lang.Runnable onListChanged -> e
+    java.util.function.Consumer output -> f
+    29:39:void <init>(java.lang.Runnable,java.util.function.BiConsumer,net.minecraft.server.packs.repository.PackRepository,java.util.function.Consumer) -> <init>
+    42:42:java.util.stream.Stream getUnselected() -> a
+    46:46:java.util.stream.Stream getSelected() -> b
+    50:52:void commit() -> c
+    55:60:void findNewPacks() -> d
+    46:46:net.minecraft.client.gui.screens.packs.PackSelectionModel$Entry lambda$getSelected$1(net.minecraft.server.packs.repository.Pack) -> a
+    42:42:net.minecraft.client.gui.screens.packs.PackSelectionModel$Entry lambda$getUnselected$0(net.minecraft.server.packs.repository.Pack) -> b
+    20:20:java.util.function.BiConsumer access$000(net.minecraft.client.gui.screens.packs.PackSelectionModel) -> a
+    20:20:java.lang.Runnable access$100(net.minecraft.client.gui.screens.packs.PackSelectionModel) -> b
+    20:20:java.util.List access$200(net.minecraft.client.gui.screens.packs.PackSelectionModel) -> c
+    20:20:java.util.List access$300(net.minecraft.client.gui.screens.packs.PackSelectionModel) -> d
+net.minecraft.client.gui.screens.packs.PackSelectionModel$Entry -> dtf$a:
+    void bindIcon(net.minecraft.client.renderer.texture.TextureManager) -> a
+    net.minecraft.server.packs.repository.PackCompatibility getCompatibility() -> a
+    net.minecraft.network.chat.Component getTitle() -> b
+    net.minecraft.network.chat.Component getDescription() -> c
+    net.minecraft.server.packs.repository.PackSource getPackSource() -> d
+    74:74:net.minecraft.network.chat.FormattedText getExtendedDescription() -> e
+    boolean isFixedPosition() -> f
+    boolean isRequired() -> g
+    void select() -> h
+    void unselect() -> i
+    void moveUp() -> j
+    void moveDown() -> k
+    boolean isSelected() -> l
+    92:92:boolean canSelect() -> m
+    96:96:boolean canUnselect() -> n
+    boolean canMoveUp() -> o
+    boolean canMoveDown() -> p
+net.minecraft.client.gui.screens.packs.PackSelectionModel$EntryBase -> dtf$b:
+    net.minecraft.server.packs.repository.Pack pack -> b
+    net.minecraft.client.gui.screens.packs.PackSelectionModel this$0 -> a
+    107:109:void <init>(net.minecraft.client.gui.screens.packs.PackSelectionModel,net.minecraft.server.packs.repository.Pack) -> <init>
+    java.util.List getSelfList() -> q
+    java.util.List getOtherList() -> r
+    117:118:void bindIcon(net.minecraft.client.renderer.texture.TextureManager) -> a
+    122:122:net.minecraft.server.packs.repository.PackCompatibility getCompatibility() -> a
+    127:127:net.minecraft.network.chat.Component getTitle() -> b
+    132:132:net.minecraft.network.chat.Component getDescription() -> c
+    137:137:net.minecraft.server.packs.repository.PackSource getPackSource() -> d
+    142:142:boolean isFixedPosition() -> f
+    147:147:boolean isRequired() -> g
+    151:154:void toggleSelection() -> s
+    157:162:void move(int) -> a
+    166:168:boolean canMoveUp() -> o
+    173:174:void moveUp() -> j
+    178:180:boolean canMoveDown() -> p
+    185:186:void moveDown() -> k
+net.minecraft.client.gui.screens.packs.PackSelectionModel$SelectedPackEntry -> dtf$c:
+    net.minecraft.client.gui.screens.packs.PackSelectionModel this$0 -> b
+    190:192:void <init>(net.minecraft.client.gui.screens.packs.PackSelectionModel,net.minecraft.server.packs.repository.Pack) -> <init>
+    196:196:java.util.List getSelfList() -> q
+    201:201:java.util.List getOtherList() -> r
+    206:206:boolean isSelected() -> l
+    212:212:void select() -> h
+    216:217:void unselect() -> i
+net.minecraft.client.gui.screens.packs.PackSelectionModel$UnselectedPackEntry -> dtf$d:
+    net.minecraft.client.gui.screens.packs.PackSelectionModel this$0 -> b
+    221:223:void <init>(net.minecraft.client.gui.screens.packs.PackSelectionModel,net.minecraft.server.packs.repository.Pack) -> <init>
+    227:227:java.util.List getSelfList() -> q
+    232:232:java.util.List getOtherList() -> r
+    237:237:boolean isSelected() -> l
+    242:243:void select() -> h
+    247:247:void unselect() -> i
+net.minecraft.client.gui.screens.packs.PackSelectionScreen -> dtg:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.network.chat.Component DRAG_AND_DROP -> b
+    net.minecraft.network.chat.Component DIRECTORY_BUTTON_TOOLTIP -> c
+    net.minecraft.client.gui.screens.packs.PackSelectionModel model -> p
+    net.minecraft.client.gui.screens.Screen lastScreen -> q
+    boolean shouldCommit -> r
+    net.minecraft.client.gui.screens.packs.TransferableSelectionList availablePackList -> s
+    net.minecraft.client.gui.screens.packs.TransferableSelectionList selectedPackList -> t
+    java.io.File packDir -> u
+    net.minecraft.client.gui.components.Button doneButton -> v
+    44:48:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.network.chat.TranslatableComponent,java.util.function.Function,java.io.File) -> <init>
+    52:56:void removed() -> e
+    60:62:void onClose() -> au_
+    66:81:void init() -> b
+    84:87:void populateLists() -> i
+    90:92:void updateList(net.minecraft.client.gui.screens.packs.TransferableSelectionList,java.util.stream.Stream) -> a
+    95:98:void reload() -> k
+    102:110:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    113:132:void copyPacks(net.minecraft.client.Minecraft,java.util.List,java.nio.file.Path) -> a
+    136:146:void onFilesDrop(java.util.List) -> a
+    138:143:void lambda$onFilesDrop$6(java.util.List,boolean) -> a
+    115:128:void lambda$copyPacks$5(java.nio.file.Path,org.apache.commons.lang3.mutable.MutableBoolean,java.nio.file.Path) -> a
+    118:123:void lambda$null$4(java.nio.file.Path,java.nio.file.Path,org.apache.commons.lang3.mutable.MutableBoolean,java.nio.file.Path) -> a
+    91:91:void lambda$updateList$3(net.minecraft.client.gui.screens.packs.TransferableSelectionList,net.minecraft.client.gui.screens.packs.PackSelectionModel$Entry) -> a
+    69:69:void lambda$init$2(net.minecraft.client.gui.components.Button,com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    68:68:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    66:66:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+    29:32:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.packs.TransferableSelectionList -> dth:
+    net.minecraft.resources.ResourceLocation ICON_OVERLAY_LOCATION -> a
+    net.minecraft.network.chat.Component INCOMPATIBLE_TITLE -> o
+    net.minecraft.network.chat.Component INCOMPATIBLE_CONFIRM_TITLE -> p
+    net.minecraft.network.chat.Component title -> q
+    28:33:void <init>(net.minecraft.client.Minecraft,int,int,net.minecraft.network.chat.Component) -> <init>
+    37:39:void renderHeader(com.mojang.blaze3d.vertex.PoseStack,int,int,com.mojang.blaze3d.vertex.Tesselator) -> a
+    43:43:int getRowWidth() -> d
+    48:48:int getScrollbarPosition() -> e
+    20:20:net.minecraft.resources.ResourceLocation access$000() -> f
+    20:20:net.minecraft.network.chat.Component access$100() -> g
+    20:20:int access$200(net.minecraft.client.gui.screens.packs.TransferableSelectionList) -> a
+    20:20:int access$300(net.minecraft.client.gui.screens.packs.TransferableSelectionList,int) -> a
+    20:20:net.minecraft.network.chat.Component access$400() -> s
+    21:23:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.packs.TransferableSelectionList$PackEntry -> dth$a:
+    net.minecraft.client.gui.screens.packs.TransferableSelectionList parent -> c
+    net.minecraft.client.Minecraft minecraft -> a
+    net.minecraft.client.gui.screens.Screen screen -> b
+    net.minecraft.client.gui.screens.packs.PackSelectionModel$Entry pack -> d
+    67:72:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.packs.TransferableSelectionList,net.minecraft.client.gui.screens.Screen,net.minecraft.client.gui.screens.packs.PackSelectionModel$Entry) -> <init>
+    76:144:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    147:147:boolean showHoverOverlay() -> a
+    152:187:boolean mouseClicked(double,double,int) -> a
+    163:167:void lambda$mouseClicked$0(boolean) -> a
+net.minecraft.client.gui.screens.packs.package-info -> dti:
+net.minecraft.client.gui.screens.recipebook.AbstractFurnaceRecipeBookComponent -> dtj:
+    java.util.Iterator iterator -> l
+    java.util.Set fuels -> m
+    net.minecraft.world.inventory.Slot fuelSlot -> n
+    net.minecraft.world.item.Item fuel -> o
+    float time -> p
+    23:23:void <init>() -> <init>
+    32:34:boolean updateFiltering() -> a
     boolean getFilteringCraftable() -> b
     void setFilteringCraftable(boolean) -> a
-    41:41:boolean isVisible() -> c
+    43:43:boolean isVisible() -> c
     boolean isGuiOpen() -> d
-    48:53:void setVisible(boolean) -> b
-    void setGuiOpen(boolean) -> c
-    59:60:void initFilterButtonTextures() -> e
-    64:64:java.lang.String getFilterButtonTooltip() -> f
-    java.lang.String getRecipeFilterName() -> g
-    71:76:void slotClicked(net.minecraft.world.inventory.Slot) -> a
-    80:105:void setupGhostRecipe(net.minecraft.world.item.crafting.Recipe,java.util.List) -> a
+    50:55:void setVisible(boolean) -> c
+    void setGuiOpen(boolean) -> d
+    61:62:void initFilterButtonTextures() -> e
+    66:66:net.minecraft.network.chat.Component getFilterButtonTooltip() -> f
+    net.minecraft.network.chat.Component getRecipeFilterName() -> g
+    73:78:void slotClicked(net.minecraft.world.inventory.Slot) -> a
+    82:107:void setupGhostRecipe(net.minecraft.world.item.crafting.Recipe,java.util.List) -> a
     java.util.Set getFuelItems() -> h
-    111:132:void renderGhostRecipe(int,int,boolean,float) -> a
-    135:148:net.minecraft.world.item.Item getFuel() -> n
-net.minecraft.client.gui.screens.recipebook.BlastingRecipeBookComponent -> dim:
-    8:8:void <init>() -> <init>
-    11:11:boolean getFilteringCraftable() -> b
-    16:17:void setFilteringCraftable(boolean) -> a
-    21:21:boolean isGuiOpen() -> d
-    26:27:void setGuiOpen(boolean) -> c
-    31:31:java.lang.String getRecipeFilterName() -> g
-    36:36:java.util.Set getFuelItems() -> h
-net.minecraft.client.gui.screens.recipebook.GhostRecipe -> din:
+    113:134:void renderGhostRecipe(com.mojang.blaze3d.vertex.PoseStack,int,int,boolean,float) -> a
+    137:150:net.minecraft.world.item.Item getFuel() -> n
+net.minecraft.client.gui.screens.recipebook.BlastingRecipeBookComponent -> dtk:
+    10:10:void <init>() -> <init>
+    13:13:boolean getFilteringCraftable() -> b
+    18:19:void setFilteringCraftable(boolean) -> a
+    23:23:boolean isGuiOpen() -> d
+    28:29:void setGuiOpen(boolean) -> d
+    33:33:net.minecraft.network.chat.Component getRecipeFilterName() -> g
+    38:38:java.util.Set getFuelItems() -> h
+net.minecraft.client.gui.screens.recipebook.GhostRecipe -> dtl:
     net.minecraft.world.item.crafting.Recipe recipe -> a
     java.util.List ingredients -> b
     float time -> c
-    18:20:void <init>() -> <init>
-    24:27:void clear() -> a
-    30:31:void addIngredient(net.minecraft.world.item.crafting.Ingredient,int,int) -> a
-    34:34:net.minecraft.client.gui.screens.recipebook.GhostRecipe$GhostIngredient get(int) -> a
-    38:38:int size() -> b
-    43:43:net.minecraft.world.item.crafting.Recipe getRecipe() -> c
-    47:48:void setRecipe(net.minecraft.world.item.crafting.Recipe) -> a
-    51:81:void render(net.minecraft.client.Minecraft,int,int,boolean,float) -> a
-    18:18:float access$000(net.minecraft.client.gui.screens.recipebook.GhostRecipe) -> a
-net.minecraft.client.gui.screens.recipebook.GhostRecipe$GhostIngredient -> din$a:
+    19:21:void <init>() -> <init>
+    25:28:void clear() -> a
+    31:32:void addIngredient(net.minecraft.world.item.crafting.Ingredient,int,int) -> a
+    35:35:net.minecraft.client.gui.screens.recipebook.GhostRecipe$GhostIngredient get(int) -> a
+    39:39:int size() -> b
+    44:44:net.minecraft.world.item.crafting.Recipe getRecipe() -> c
+    48:49:void setRecipe(net.minecraft.world.item.crafting.Recipe) -> a
+    52:82:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.Minecraft,int,int,boolean,float) -> a
+    19:19:float access$000(net.minecraft.client.gui.screens.recipebook.GhostRecipe) -> a
+net.minecraft.client.gui.screens.recipebook.GhostRecipe$GhostIngredient -> dtl$a:
     net.minecraft.world.item.crafting.Ingredient ingredient -> b
     int x -> c
     int y -> d
     net.minecraft.client.gui.screens.recipebook.GhostRecipe this$0 -> a
-    88:92:void <init>(net.minecraft.client.gui.screens.recipebook.GhostRecipe,net.minecraft.world.item.crafting.Ingredient,int,int) -> <init>
-    95:95:int getX() -> a
-    99:99:int getY() -> b
-    103:104:net.minecraft.world.item.ItemStack getItem() -> c
-net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent -> dio:
+    89:93:void <init>(net.minecraft.client.gui.screens.recipebook.GhostRecipe,net.minecraft.world.item.crafting.Ingredient,int,int) -> <init>
+    96:96:int getX() -> a
+    100:100:int getY() -> b
+    104:105:net.minecraft.world.item.ItemStack getItem() -> c
+net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent -> dtm:
     net.minecraft.resources.ResourceLocation RECIPE_BOOK_LOCATION -> a
     java.util.List recipeButtons -> b
     boolean isVisible -> c
     int x -> d
     int y -> e
-    net.minecraft.client.Minecraft minecraft -> f
-    net.minecraft.client.gui.screens.recipebook.RecipeCollection collection -> g
-    net.minecraft.world.item.crafting.Recipe lastRecipeClicked -> h
-    float time -> i
-    boolean isFurnaceMenu -> j
-    23:28:void <init>() -> <init>
-    43:101:void init(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.recipebook.RecipeCollection,int,int,int,int,float) -> a
-    105:105:boolean changeFocus(boolean) -> changeFocus
-    109:109:net.minecraft.client.gui.screens.recipebook.RecipeCollection getRecipeCollection() -> a
-    113:113:net.minecraft.world.item.crafting.Recipe getLastRecipeClicked() -> b
-    118:129:boolean mouseClicked(double,double,int) -> mouseClicked
-    134:134:boolean isMouseOver(double,double) -> isMouseOver
-    139:168:void render(int,int,float) -> render
-    171:200:void nineInchSprite(int,int,int,int,int,int) -> a
-    203:204:void setVisible(boolean) -> a
-    207:207:boolean isVisible() -> c
-    23:23:net.minecraft.resources.ResourceLocation access$100() -> d
-    23:23:net.minecraft.client.Minecraft access$200(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent) -> a
-    23:23:boolean access$300(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent) -> b
-    23:23:float access$400(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent) -> c
-    24:24:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlayRecipeButton -> dio$a:
+    net.minecraft.client.Minecraft minecraft -> i
+    net.minecraft.client.gui.screens.recipebook.RecipeCollection collection -> j
+    net.minecraft.world.item.crafting.Recipe lastRecipeClicked -> k
+    float time -> l
+    boolean isFurnaceMenu -> m
+    25:30:void <init>() -> <init>
+    45:103:void init(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.recipebook.RecipeCollection,int,int,int,int,float) -> a
+    107:107:boolean changeFocus(boolean) -> c_
+    111:111:net.minecraft.client.gui.screens.recipebook.RecipeCollection getRecipeCollection() -> a
+    115:115:net.minecraft.world.item.crafting.Recipe getLastRecipeClicked() -> b
+    120:131:boolean mouseClicked(double,double,int) -> a
+    136:136:boolean isMouseOver(double,double) -> b
+    141:170:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    173:202:void nineInchSprite(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int) -> c
+    205:206:void setVisible(boolean) -> a
+    209:209:boolean isVisible() -> c
+    25:25:net.minecraft.resources.ResourceLocation access$100() -> d
+    25:25:net.minecraft.client.Minecraft access$200(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent) -> a
+    25:25:boolean access$300(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent) -> b
+    25:25:float access$400(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent) -> c
+    26:26:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlayRecipeButton -> dtm$a:
     net.minecraft.world.item.crafting.Recipe recipe -> c
     boolean isCraftable -> d
     java.util.List ingredientPos -> a
     net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent this$0 -> b
-    225:235:void <init>(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent,int,int,net.minecraft.world.item.crafting.Recipe,boolean) -> <init>
-    238:239:void calculateIngredientsPositions(net.minecraft.world.item.crafting.Recipe) -> a
-    243:247:void addItemToSlot(java.util.Iterator,int,int,int,int) -> a
-    251:275:void renderButton(int,int,float) -> renderButton
-    222:222:net.minecraft.world.item.crafting.Recipe access$000(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlayRecipeButton) -> a
-net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlayRecipeButton$Pos -> dio$a$a:
+    227:237:void <init>(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent,int,int,net.minecraft.world.item.crafting.Recipe,boolean) -> <init>
+    240:241:void calculateIngredientsPositions(net.minecraft.world.item.crafting.Recipe) -> a
+    245:249:void addItemToSlot(java.util.Iterator,int,int,int,int) -> a
+    253:277:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    224:224:net.minecraft.world.item.crafting.Recipe access$000(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlayRecipeButton) -> a
+net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlayRecipeButton$Pos -> dtm$a$a:
     net.minecraft.world.item.ItemStack[] ingredients -> a
     int x -> b
     int y -> c
     net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlayRecipeButton this$1 -> d
-    282:286:void <init>(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlayRecipeButton,int,int,net.minecraft.world.item.ItemStack[]) -> <init>
-net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlaySmeltingRecipeButton -> dio$b:
+    284:288:void <init>(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlayRecipeButton,int,int,net.minecraft.world.item.ItemStack[]) -> <init>
+net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent$OverlaySmeltingRecipeButton -> dtm$b:
     net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent this$0 -> c
-    211:213:void <init>(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent,int,int,net.minecraft.world.item.crafting.Recipe,boolean) -> <init>
-    217:219:void calculateIngredientsPositions(net.minecraft.world.item.crafting.Recipe) -> a
-net.minecraft.client.gui.screens.recipebook.RecipeBookComponent -> dip:
+    213:215:void <init>(net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent,int,int,net.minecraft.world.item.crafting.Recipe,boolean) -> <init>
+    219:221:void calculateIngredientsPositions(net.minecraft.world.item.crafting.Recipe) -> a
+net.minecraft.client.gui.screens.recipebook.RecipeBookComponent -> dtn:
     net.minecraft.resources.ResourceLocation RECIPE_BOOK_LOCATION -> a
-    int xOffset -> i
-    int width -> j
-    int height -> k
+    net.minecraft.network.chat.Component SEARCH_HINT -> l
+    int xOffset -> m
+    int width -> n
+    int height -> o
     net.minecraft.client.gui.screens.recipebook.GhostRecipe ghostRecipe -> b
-    java.util.List tabButtons -> l
-    net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton selectedTab -> m
+    java.util.List tabButtons -> p
+    net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton selectedTab -> q
     net.minecraft.client.gui.components.StateSwitchingButton filterButton -> c
     net.minecraft.world.inventory.RecipeBookMenu menu -> d
     net.minecraft.client.Minecraft minecraft -> e
-    net.minecraft.client.gui.components.EditBox searchBox -> n
-    java.lang.String lastSearch -> o
-    net.minecraft.client.ClientRecipeBook book -> f
-    net.minecraft.client.gui.screens.recipebook.RecipeBookPage recipeBookPage -> g
-    net.minecraft.world.entity.player.StackedContents stackedContents -> h
-    int timesInventoryChanged -> p
-    boolean ignoreTextInput -> q
-    36:61:void <init>() -> <init>
-    67:81:void init(int,int,net.minecraft.client.Minecraft,boolean,net.minecraft.world.inventory.RecipeBookMenu) -> a
-    84:122:void initVisuals(boolean) -> d
-    126:126:boolean changeFocus(boolean) -> changeFocus
-    130:131:void initFilterButtonTextures() -> e
-    134:137:void removed() -> i
-    141:147:int updateScreenPosition(boolean,int,int) -> a
-    151:152:void toggleVisibility() -> j
-    155:155:boolean isVisible() -> c
-    159:164:void setVisible(boolean) -> b
-    167:174:void slotClicked(net.minecraft.world.inventory.Slot) -> a
-    177:204:void updateCollections(boolean) -> a
-    208:226:void updateTabs() -> b
-    229:237:void tick() -> k
-    240:245:void updateStackedContents() -> d
-    249:272:void render(int,int,float) -> render
-    275:290:void renderTooltip(int,int,int,int) -> a
-    293:293:java.lang.String getFilterButtonTooltip() -> f
-    297:313:void renderGhostRecipeTooltip(int,int,int,int) -> b
-    316:317:void renderGhostRecipe(int,int,boolean,float) -> a
-    321:376:boolean mouseClicked(double,double,int) -> mouseClicked
-    380:383:boolean updateFiltering() -> a
-    387:394:boolean hasClickedOutside(double,double,int,int,int,int,int) -> a
-    399:425:boolean keyPressed(int,int,int) -> keyPressed
-    430:431:boolean keyReleased(int,int,int) -> a
-    436:448:boolean charTyped(char,int) -> charTyped
-    453:453:boolean isMouseOver(double,double) -> isMouseOver
-    457:464:void checkSearchStringUpdate() -> g
-    467:479:void pirateSpeechForThePeople(java.lang.String) -> a
-    482:482:boolean isOffsetNextToMainGUI() -> h
-    486:492:void recipesUpdated() -> l
-    496:499:void recipesShown(java.util.List) -> a
-    502:507:void setupGhostRecipe(net.minecraft.world.item.crafting.Recipe,java.util.List) -> a
-    511:516:void addItemToSlot(java.util.Iterator,int,int,int,int) -> a
-    519:522:void sendUpdateSettings() -> m
-    200:200:boolean lambda$updateCollections$5(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> a
-    195:195:boolean lambda$updateCollections$4(it.unimi.dsi.fastutil.objects.ObjectSet,net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> a
-    188:188:boolean lambda$updateCollections$3(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> b
-    185:185:boolean lambda$updateCollections$2(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> c
-    180:180:void lambda$updateCollections$1(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> d
-    113:113:boolean lambda$initVisuals$0(net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton) -> a
-    37:37:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.recipebook.RecipeBookPage -> diq:
+    net.minecraft.client.gui.components.EditBox searchBox -> r
+    java.lang.String lastSearch -> s
+    net.minecraft.client.ClientRecipeBook book -> i
+    net.minecraft.client.gui.screens.recipebook.RecipeBookPage recipeBookPage -> j
+    net.minecraft.world.entity.player.StackedContents stackedContents -> k
+    int timesInventoryChanged -> t
+    boolean ignoreTextInput -> u
+    39:65:void <init>() -> <init>
+    71:85:void init(int,int,net.minecraft.client.Minecraft,boolean,net.minecraft.world.inventory.RecipeBookMenu) -> a
+    88:126:void initVisuals(boolean) -> e
+    130:130:boolean changeFocus(boolean) -> c_
+    134:135:void initFilterButtonTextures() -> e
+    138:141:void removed() -> i
+    145:151:int updateScreenPosition(boolean,int,int) -> a
+    155:156:void toggleVisibility() -> j
+    159:159:boolean isVisible() -> c
+    163:168:void setVisible(boolean) -> c
+    171:178:void slotClicked(net.minecraft.world.inventory.Slot) -> a
+    181:208:void updateCollections(boolean) -> a
+    212:230:void updateTabs() -> b
+    233:241:void tick() -> k
+    244:249:void updateStackedContents() -> d
+    253:280:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    283:298:void renderTooltip(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> c
+    301:301:net.minecraft.network.chat.Component getFilterButtonTooltip() -> f
+    305:321:void renderGhostRecipeTooltip(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> d
+    324:325:void renderGhostRecipe(com.mojang.blaze3d.vertex.PoseStack,int,int,boolean,float) -> a
+    329:384:boolean mouseClicked(double,double,int) -> a
+    388:391:boolean updateFiltering() -> a
+    395:402:boolean hasClickedOutside(double,double,int,int,int,int,int) -> a
+    407:433:boolean keyPressed(int,int,int) -> a
+    438:439:boolean keyReleased(int,int,int) -> b
+    444:456:boolean charTyped(char,int) -> a
+    461:461:boolean isMouseOver(double,double) -> b
+    465:472:void checkSearchStringUpdate() -> g
+    475:486:void pirateSpeechForThePeople(java.lang.String) -> a
+    489:489:boolean isOffsetNextToMainGUI() -> h
+    493:499:void recipesUpdated() -> l
+    503:506:void recipesShown(java.util.List) -> a
+    509:514:void setupGhostRecipe(net.minecraft.world.item.crafting.Recipe,java.util.List) -> a
+    518:523:void addItemToSlot(java.util.Iterator,int,int,int,int) -> a
+    526:529:void sendUpdateSettings() -> m
+    204:204:boolean lambda$updateCollections$5(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> a
+    199:199:boolean lambda$updateCollections$4(it.unimi.dsi.fastutil.objects.ObjectSet,net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> a
+    192:192:boolean lambda$updateCollections$3(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> b
+    189:189:boolean lambda$updateCollections$2(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> c
+    184:184:void lambda$updateCollections$1(net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> d
+    117:117:boolean lambda$initVisuals$0(net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton) -> a
+    40:41:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.recipebook.RecipeBookPage -> dto:
     java.util.List buttons -> a
     net.minecraft.client.gui.screens.recipebook.RecipeButton hoveredButton -> b
     net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent overlay -> c
@@ -10645,51 +11203,51 @@ net.minecraft.client.gui.screens.recipebook.RecipeBookPage -> diq:
     net.minecraft.stats.RecipeBook recipeBook -> k
     net.minecraft.world.item.crafting.Recipe lastClickedRecipe -> l
     net.minecraft.client.gui.screens.recipebook.RecipeCollection lastClickedRecipeCollection -> m
-    16:40:void <init>() -> <init>
-    43:57:void init(net.minecraft.client.Minecraft,int,int) -> a
-    60:62:void addListener(net.minecraft.client.gui.screens.recipebook.RecipeBookComponent) -> a
-    65:73:void updateCollections(java.util.List,boolean) -> a
-    76:92:void updateButtonsForPage() -> f
-    95:97:void updateArrowButtons() -> g
-    100:118:void render(int,int,int,int,float) -> a
-    121:124:void renderTooltip(int,int) -> a
-    128:128:net.minecraft.world.item.crafting.Recipe getLastClickedRecipe() -> a
-    133:133:net.minecraft.client.gui.screens.recipebook.RecipeCollection getLastClickedRecipeCollection() -> b
-    137:138:void setInvisible() -> c
-    141:179:boolean mouseClicked(double,double,int,int,int,int,int) -> a
-    183:186:void recipesShown(java.util.List) -> a
-    189:189:net.minecraft.client.Minecraft getMinecraft() -> d
-    193:193:net.minecraft.stats.RecipeBook getRecipeBook() -> e
-net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton -> dir:
-    net.minecraft.client.RecipeBookCategories category -> g
-    float animationTime -> h
-    23:27:void <init>(net.minecraft.client.RecipeBookCategories) -> <init>
-    30:44:void startAnimation(net.minecraft.client.Minecraft) -> a
-    48:84:void renderButton(int,int,float) -> renderButton
-    87:97:void renderIcon(net.minecraft.client.renderer.entity.ItemRenderer) -> a
-    100:100:net.minecraft.client.RecipeBookCategories getCategory() -> b
-    104:116:boolean updateVisibility(net.minecraft.client.ClientRecipeBook) -> a
-net.minecraft.client.gui.screens.recipebook.RecipeButton -> dis:
+    17:41:void <init>() -> <init>
+    44:58:void init(net.minecraft.client.Minecraft,int,int) -> a
+    61:63:void addListener(net.minecraft.client.gui.screens.recipebook.RecipeBookComponent) -> a
+    66:74:void updateCollections(java.util.List,boolean) -> a
+    77:93:void updateButtonsForPage() -> f
+    96:98:void updateArrowButtons() -> g
+    101:119:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,float) -> a
+    122:125:void renderTooltip(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    129:129:net.minecraft.world.item.crafting.Recipe getLastClickedRecipe() -> a
+    134:134:net.minecraft.client.gui.screens.recipebook.RecipeCollection getLastClickedRecipeCollection() -> b
+    138:139:void setInvisible() -> c
+    142:180:boolean mouseClicked(double,double,int,int,int,int,int) -> a
+    184:187:void recipesShown(java.util.List) -> a
+    190:190:net.minecraft.client.Minecraft getMinecraft() -> d
+    194:194:net.minecraft.stats.RecipeBook getRecipeBook() -> e
+net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton -> dtp:
+    net.minecraft.client.RecipeBookCategories category -> t
+    float animationTime -> u
+    24:28:void <init>(net.minecraft.client.RecipeBookCategories) -> <init>
+    31:45:void startAnimation(net.minecraft.client.Minecraft) -> a
+    49:85:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    88:98:void renderIcon(net.minecraft.client.renderer.entity.ItemRenderer) -> a
+    101:101:net.minecraft.client.RecipeBookCategories getCategory() -> b
+    105:117:boolean updateVisibility(net.minecraft.client.ClientRecipeBook) -> a
+net.minecraft.client.gui.screens.recipebook.RecipeButton -> dtq:
     net.minecraft.resources.ResourceLocation RECIPE_BOOK_LOCATION -> a
     net.minecraft.world.inventory.RecipeBookMenu menu -> b
     net.minecraft.stats.RecipeBook book -> c
     net.minecraft.client.gui.screens.recipebook.RecipeCollection collection -> d
     float time -> e
-    float animationTime -> f
-    int currentIndex -> g
-    33:34:void <init>() -> <init>
-    37:49:void init(net.minecraft.client.gui.screens.recipebook.RecipeCollection,net.minecraft.client.gui.screens.recipebook.RecipeBookPage) -> a
-    52:52:net.minecraft.client.gui.screens.recipebook.RecipeCollection getCollection() -> a
-    56:58:void setPosition(int,int) -> a
-    62:106:void renderButton(int,int,float) -> renderButton
-    109:113:java.util.List getOrderedRecipes() -> d
-    117:117:boolean isOnlyOption() -> b
-    121:122:net.minecraft.world.item.crafting.Recipe getRecipe() -> c
-    126:133:java.util.List getTooltipText(net.minecraft.client.gui.screens.Screen) -> a
-    138:138:int getWidth() -> getWidth
-    143:143:boolean isValidClickButton(int) -> isValidClickButton
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.recipebook.RecipeCollection -> dit:
+    float animationTime -> s
+    int currentIndex -> t
+    37:38:void <init>() -> <init>
+    41:53:void init(net.minecraft.client.gui.screens.recipebook.RecipeCollection,net.minecraft.client.gui.screens.recipebook.RecipeBookPage) -> a
+    56:56:net.minecraft.client.gui.screens.recipebook.RecipeCollection getCollection() -> a
+    60:62:void setPosition(int,int) -> a
+    66:110:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    113:117:java.util.List getOrderedRecipes() -> k
+    121:121:boolean isOnlyOption() -> b
+    125:126:net.minecraft.world.item.crafting.Recipe getRecipe() -> d
+    130:137:java.util.List getTooltipText(net.minecraft.client.gui.screens.Screen) -> a
+    142:142:int getWidth() -> h
+    147:147:boolean isValidClickButton(int) -> a
+    23:23:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.recipebook.RecipeCollection -> dtr:
     java.util.List recipes -> a
     java.util.Set craftable -> b
     java.util.Set fitsDimensions -> c
@@ -10707,185 +11265,134 @@ net.minecraft.client.gui.screens.recipebook.RecipeCollection -> dit:
     81:89:java.util.List getDisplayRecipes(boolean) -> b
     93:100:void add(net.minecraft.world.item.crafting.Recipe) -> b
     103:103:boolean hasSingleResultItem() -> e
-net.minecraft.client.gui.screens.recipebook.RecipeShownListener -> diu:
+net.minecraft.client.gui.screens.recipebook.RecipeShownListener -> dts:
     void recipesShown(java.util.List) -> a
-net.minecraft.client.gui.screens.recipebook.RecipeUpdateListener -> div:
-    void recipesUpdated() -> ae_
-    net.minecraft.client.gui.screens.recipebook.RecipeBookComponent getRecipeBookComponent() -> c
-net.minecraft.client.gui.screens.recipebook.SmeltingRecipeBookComponent -> diw:
-    8:8:void <init>() -> <init>
-    11:11:boolean getFilteringCraftable() -> b
-    16:17:void setFilteringCraftable(boolean) -> a
-    21:21:boolean isGuiOpen() -> d
-    26:27:void setGuiOpen(boolean) -> c
-    31:31:java.lang.String getRecipeFilterName() -> g
-    36:36:java.util.Set getFuelItems() -> h
-net.minecraft.client.gui.screens.recipebook.SmokingRecipeBookComponent -> dix:
-    8:8:void <init>() -> <init>
-    11:11:boolean getFilteringCraftable() -> b
-    16:17:void setFilteringCraftable(boolean) -> a
-    21:21:boolean isGuiOpen() -> d
-    26:27:void setGuiOpen(boolean) -> c
-    31:31:java.lang.String getRecipeFilterName() -> g
-    36:36:java.util.Set getFuelItems() -> h
-net.minecraft.client.gui.screens.recipebook.package-info -> diy:
-net.minecraft.client.gui.screens.resourcepacks.ResourcePackSelectScreen -> diz:
-    net.minecraft.client.gui.screens.resourcepacks.lists.AvailableResourcePackList availableResourcePackList -> c
-    net.minecraft.client.gui.screens.resourcepacks.lists.SelectedResourcePackList selectedResourcePackList -> d
-    boolean changed -> e
-    28:29:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.Options) -> <init>
-    33:97:void init() -> init
-    100:103:void select(net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList$ResourcePackEntry) -> a
-    106:109:void deselect(net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList$ResourcePackEntry) -> b
-    112:112:boolean isSelected(net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList$ResourcePackEntry) -> c
-    117:126:void render(int,int,float) -> render
-    129:130:void setChanged() -> a
-    74:76:void lambda$init$2(net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList$ResourcePackEntry) -> d
-    35:60:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    33:33:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
-net.minecraft.client.gui.screens.resourcepacks.entries.package-info -> dja:
-net.minecraft.client.gui.screens.resourcepacks.lists.AvailableResourcePackList -> djb:
-    8:9:void <init>(net.minecraft.client.Minecraft,int,int) -> <init>
-net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList -> djc:
-    net.minecraft.resources.ResourceLocation ICON_OVERLAY_LOCATION -> b
-    net.minecraft.network.chat.Component INCOMPATIBLE_TITLE -> c
-    net.minecraft.network.chat.Component INCOMPATIBLE_CONFIRM_TITLE -> d
-    net.minecraft.client.Minecraft minecraft -> a
-    net.minecraft.network.chat.Component title -> e
-    28:35:void <init>(net.minecraft.client.Minecraft,int,int,net.minecraft.network.chat.Component) -> <init>
-    39:41:void renderHeader(int,int,com.mojang.blaze3d.vertex.Tesselator) -> renderHeader
-    45:45:int getRowWidth() -> getRowWidth
-    50:50:int getScrollbarPosition() -> getScrollbarPosition
-    54:56:void addResourcePackEntry(net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList$ResourcePackEntry) -> a
-    19:19:net.minecraft.resources.ResourceLocation access$100() -> a
-    19:19:net.minecraft.network.chat.Component access$200() -> b
-    19:19:int access$300(net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList) -> a
-    19:19:int access$400(net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList,int) -> a
-    19:19:net.minecraft.network.chat.Component access$500() -> c
-    20:22:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList$ResourcePackEntry -> djc$a:
-    net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList parent -> c
-    net.minecraft.client.Minecraft minecraft -> a
-    net.minecraft.client.gui.screens.resourcepacks.ResourcePackSelectScreen screen -> b
-    net.minecraft.client.resources.UnopenedResourcePack resourcePack -> d
-    74:79:void <init>(net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList,net.minecraft.client.gui.screens.resourcepacks.ResourcePackSelectScreen,net.minecraft.client.resources.UnopenedResourcePack) -> <init>
-    82:84:void addToList(net.minecraft.client.gui.screens.resourcepacks.lists.SelectedResourcePackList) -> a
-    87:88:void updateParentList(net.minecraft.client.gui.screens.resourcepacks.lists.SelectedResourcePackList) -> b
-    91:92:void bindToIcon() -> a
-    95:95:net.minecraft.server.packs.repository.PackCompatibility getCompatibility() -> b
-    99:99:java.lang.String getDescription() -> c
-    103:103:java.lang.String getName() -> d
-    107:107:net.minecraft.client.resources.UnopenedResourcePack getResourcePack() -> e
-    112:177:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    180:180:boolean showHoverOverlay() -> f
-    184:184:boolean canMoveRight() -> g
-    188:188:boolean canMoveLeft() -> h
-    192:194:boolean canMoveUp() -> i
-    198:200:boolean canMoveDown() -> j
-    205:254:boolean mouseClicked(double,double,int) -> mouseClicked
-    258:258:net.minecraft.client.gui.screens.resourcepacks.ResourcePackSelectScreen getScreen() -> k
-    219:223:void lambda$mouseClicked$0(boolean) -> a
-    58:58:net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList access$002(net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList$ResourcePackEntry,net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList) -> a
-net.minecraft.client.gui.screens.resourcepacks.lists.SelectedResourcePackList -> djd:
-    8:9:void <init>(net.minecraft.client.Minecraft,int,int) -> <init>
-net.minecraft.client.gui.screens.resourcepacks.lists.package-info -> dje:
-net.minecraft.client.gui.screens.resourcepacks.package-info -> djf:
-net.minecraft.client.gui.screens.stream.package-info -> djg:
-net.minecraft.client.gui.screens.worldselection.CreateWorldScreen -> djh:
-    net.minecraft.client.gui.screens.Screen lastScreen -> b
-    net.minecraft.client.gui.components.EditBox nameEdit -> c
-    net.minecraft.client.gui.components.EditBox seedEdit -> d
-    java.lang.String resultFolder -> e
-    net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode gameMode -> f
-    net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode oldGameMode -> g
-    boolean features -> h
-    boolean commands -> i
-    boolean commandsChanged -> j
-    boolean bonusItems -> k
-    boolean hardCore -> l
-    boolean done -> m
-    boolean displayOptions -> n
-    net.minecraft.client.gui.components.Button createButton -> o
-    net.minecraft.client.gui.components.Button modeButton -> p
-    net.minecraft.client.gui.components.Button moreOptionsButton -> q
-    net.minecraft.client.gui.components.Button featuresButton -> r
-    net.minecraft.client.gui.components.Button bonusItemsButton -> s
-    net.minecraft.client.gui.components.Button typeButton -> t
-    net.minecraft.client.gui.components.Button commandsButton -> u
-    net.minecraft.client.gui.components.Button customizeTypeButton -> v
-    java.lang.String gameModeHelp1 -> w
-    java.lang.String gameModeHelp2 -> x
-    java.lang.String initSeed -> y
-    java.lang.String initName -> z
-    int levelTypeIndex -> A
-    net.minecraft.nbt.CompoundTag levelTypeOptions -> a
-    46:79:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
-    83:85:void tick() -> tick
-    89:238:void init() -> init
-    241:243:void updateGameModeHelp() -> a
-    246:262:void updateResultFolder() -> b
-    266:267:void removed() -> removed
-    271:302:void onCreate() -> c
-    305:312:boolean isValidLevelType() -> d
-    316:317:void toggleDisplayOptions() -> e
-    320:334:void setGameMode(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode) -> a
-    337:372:void setDisplayOptions(boolean) -> a
-    376:385:boolean keyPressed(int,int,int) -> keyPressed
-    390:395:void onClose() -> onClose
-    399:426:void render(int,int,float) -> render
-    429:444:void copyFromWorld(net.minecraft.world.level.storage.LevelData) -> a
-    230:230:void lambda$init$10(net.minecraft.client.gui.components.Button) -> a
-    228:228:void lambda$init$9(net.minecraft.client.gui.components.Button) -> b
-    226:226:void lambda$init$8(net.minecraft.client.gui.components.Button) -> c
-    215:217:void lambda$init$7(net.minecraft.client.gui.components.Button) -> d
-    198:201:void lambda$init$6(net.minecraft.client.gui.components.Button) -> e
-    187:194:void lambda$init$5(net.minecraft.client.gui.components.Button) -> f
-    155:168:void lambda$init$4(net.minecraft.client.gui.components.Button) -> g
-    139:141:void lambda$init$3(net.minecraft.client.gui.components.Button) -> h
-    135:135:void lambda$init$2(java.lang.String) -> a
-    107:119:void lambda$init$1(net.minecraft.client.gui.components.Button) -> i
-    100:103:void lambda$init$0(java.lang.String) -> b
-    25:25:java.lang.String access$000(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> a
-    25:25:net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode access$100(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> b
-    25:25:java.lang.String access$300(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> c
-    25:25:java.lang.String access$400(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> d
-    25:25:boolean access$500(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> e
-    25:25:int access$600(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> f
-    25:25:boolean access$700(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> g
-    25:25:boolean access$800(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> h
-    25:25:boolean access$900(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> i
-net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$1 -> djh$1:
+net.minecraft.client.gui.screens.recipebook.RecipeUpdateListener -> dtt:
+    void recipesUpdated() -> ay_
+    net.minecraft.client.gui.screens.recipebook.RecipeBookComponent getRecipeBookComponent() -> l
+net.minecraft.client.gui.screens.recipebook.SmeltingRecipeBookComponent -> dtu:
+    10:10:void <init>() -> <init>
+    13:13:boolean getFilteringCraftable() -> b
+    18:19:void setFilteringCraftable(boolean) -> a
+    23:23:boolean isGuiOpen() -> d
+    28:29:void setGuiOpen(boolean) -> d
+    33:33:net.minecraft.network.chat.Component getRecipeFilterName() -> g
+    38:38:java.util.Set getFuelItems() -> h
+net.minecraft.client.gui.screens.recipebook.SmokingRecipeBookComponent -> dtv:
+    10:10:void <init>() -> <init>
+    13:13:boolean getFilteringCraftable() -> b
+    18:19:void setFilteringCraftable(boolean) -> a
+    23:23:boolean isGuiOpen() -> d
+    28:29:void setGuiOpen(boolean) -> d
+    33:33:net.minecraft.network.chat.Component getRecipeFilterName() -> g
+    38:38:java.util.Set getFuelItems() -> h
+net.minecraft.client.gui.screens.recipebook.package-info -> dtw:
+net.minecraft.client.gui.screens.stream.package-info -> dtx:
+net.minecraft.client.gui.screens.worldselection.CreateWorldScreen -> dty:
+    org.apache.logging.log4j.Logger LOGGER -> p
+    net.minecraft.client.gui.screens.Screen lastScreen -> q
+    net.minecraft.client.gui.components.EditBox nameEdit -> r
+    java.lang.String resultFolder -> s
+    net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode gameMode -> t
+    net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode oldGameMode -> u
+    net.minecraft.world.Difficulty selectedDifficulty -> v
+    net.minecraft.world.Difficulty effectiveDifficulty -> w
+    boolean commands -> x
+    boolean commandsChanged -> y
+    boolean hardCore -> a
+    net.minecraft.world.level.DataPackConfig dataPacks -> b
+    java.nio.file.Path tempDataPackDir -> z
+    boolean displayOptions -> A
+    net.minecraft.client.gui.components.Button createButton -> B
+    net.minecraft.client.gui.components.Button modeButton -> C
+    net.minecraft.client.gui.components.Button difficultyButton -> D
+    net.minecraft.client.gui.components.Button moreOptionsButton -> E
+    net.minecraft.client.gui.components.Button gameRulesButton -> F
+    net.minecraft.client.gui.components.Button dataPacksButton -> G
+    net.minecraft.client.gui.components.Button commandsButton -> H
+    net.minecraft.network.chat.Component gameModeHelp1 -> I
+    net.minecraft.network.chat.Component gameModeHelp2 -> J
+    java.lang.String initName -> K
+    net.minecraft.world.level.GameRules gameRules -> L
+    net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent worldGenSettingsComponent -> c
+    104:121:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.world.level.LevelSettings,net.minecraft.world.level.levelgen.WorldGenSettings,java.nio.file.Path,net.minecraft.core.RegistryAccess$RegistryHolder) -> <init>
+    124:125:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
+    76:133:void <init>(net.minecraft.client.gui.screens.Screen,net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent) -> <init>
+    137:139:void tick() -> d
+    143:239:void init() -> b
+    242:244:void updateGameModeHelp() -> l
+    247:263:void updateResultFolder() -> m
+    267:268:void removed() -> e
+    271:288:void onCreate() -> n
+    291:292:void toggleDisplayOptions() -> u
+    295:313:void setGameMode(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode) -> a
+    316:317:void updateDisplayOptions() -> i
+    320:352:void setDisplayOptions(boolean) -> c
+    356:365:boolean keyPressed(int,int,int) -> a
+    370:376:void onClose() -> au_
+    380:400:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    404:404:net.minecraft.client.gui.components.events.GuiEventListener addWidget(net.minecraft.client.gui.components.events.GuiEventListener) -> d
+    409:409:net.minecraft.client.gui.components.AbstractWidget addButton(net.minecraft.client.gui.components.AbstractWidget) -> a
+    416:426:java.nio.file.Path getTempDataPackDir() -> k
+    430:443:void openDataPackSelectionScreen() -> v
+    446:482:void tryApplyNewDataPacks(net.minecraft.server.packs.repository.PackRepository) -> a
+    485:499:void removeTempDataPackDir() -> w
+    509:514:void copyBetweenDirs(java.nio.file.Path,java.nio.file.Path,java.nio.file.Path) -> a
+    517:532:boolean copyTempDataPackDirToNewWorld() -> x
+    537:558:java.nio.file.Path createTempDataPackDirFromExistingWorld(java.nio.file.Path,net.minecraft.client.Minecraft) -> a
+    541:552:void lambda$createTempDataPackDirFromExistingWorld$21(org.apache.commons.lang3.mutable.MutableObject,java.nio.file.Path,java.nio.file.Path) -> a
+    539:539:boolean lambda$createTempDataPackDirFromExistingWorld$20(java.nio.file.Path,java.nio.file.Path) -> a
+    522:522:void lambda$copyTempDataPackDirToNewWorld$19(java.nio.file.Path,java.nio.file.Path) -> b
+    522:522:boolean lambda$copyTempDataPackDirToNewWorld$18(java.nio.file.Path) -> a
+    489:493:void lambda$removeTempDataPackDir$17(java.nio.file.Path) -> b
+    459:480:java.lang.Object lambda$tryApplyNewDataPacks$16(net.minecraft.world.level.DataPackConfig,net.minecraft.server.ServerResources,java.lang.Throwable) -> a
+    476:478:void lambda$null$15(net.minecraft.world.level.DataPackConfig) -> a
+    461:461:void lambda$null$14() -> y
+    462:468:void lambda$null$13(boolean) -> d
+    457:457:void lambda$tryApplyNewDataPacks$12() -> z
+    447:447:boolean lambda$tryApplyNewDataPacks$11(java.util.List,java.lang.String) -> a
+    229:231:void lambda$init$10(net.minecraft.client.gui.components.Button) -> a
+    226:226:void lambda$init$9(net.minecraft.client.gui.components.Button) -> b
+    223:223:void lambda$init$8(net.minecraft.client.gui.components.Button) -> c
+    216:216:void lambda$init$7(net.minecraft.client.gui.components.Button) -> d
+    217:219:void lambda$null$6(java.util.Optional) -> a
+    218:218:void lambda$null$5(net.minecraft.world.level.GameRules) -> a
+    215:215:void lambda$init$4(net.minecraft.client.gui.components.Button) -> e
+    200:203:void lambda$init$3(net.minecraft.client.gui.components.Button) -> f
+    189:192:void lambda$init$2(net.minecraft.client.gui.components.Button) -> g
+    163:175:void lambda$init$1(net.minecraft.client.gui.components.Button) -> h
+    154:157:void lambda$init$0(java.lang.String) -> a
+    53:53:java.lang.String access$000(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> a
+    53:53:net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode access$100(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> b
+    53:53:net.minecraft.network.chat.Component access$300(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> c
+    53:53:net.minecraft.network.chat.Component access$400(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> d
+    53:53:net.minecraft.world.Difficulty access$500(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> e
+    53:53:boolean access$600(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> f
+    54:54:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$1 -> dty$1:
     net.minecraft.client.gui.screens.worldselection.CreateWorldScreen this$0 -> a
-    92:92:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.client.gui.Font,int,int,int,int,java.lang.String) -> <init>
-    95:95:java.lang.String getNarrationMessage() -> getNarrationMessage
-net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$2 -> djh$2:
+    146:146:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.client.gui.Font,int,int,int,int,net.minecraft.network.chat.Component) -> <init>
+    149:149:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$2 -> dty$2:
     net.minecraft.client.gui.screens.worldselection.CreateWorldScreen this$0 -> a
-    119:119:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,int,int,int,int,java.lang.String,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    123:123:java.lang.String getMessage() -> getMessage
-    128:128:java.lang.String getNarrationMessage() -> getNarrationMessage
-net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$3 -> djh$3:
+    175:175:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    179:179:net.minecraft.network.chat.Component getMessage() -> i
+    184:184:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$3 -> dty$3:
     net.minecraft.client.gui.screens.worldselection.CreateWorldScreen this$0 -> a
-    141:141:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,int,int,int,int,java.lang.String,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    144:144:java.lang.String getMessage() -> getMessage
-    149:149:java.lang.String getNarrationMessage() -> getNarrationMessage
-net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$4 -> djh$4:
+    192:192:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    195:195:net.minecraft.network.chat.Component getMessage() -> i
+net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$4 -> dty$4:
     net.minecraft.client.gui.screens.worldselection.CreateWorldScreen this$0 -> a
-    168:168:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,int,int,int,int,java.lang.String,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    171:171:java.lang.String getMessage() -> getMessage
-    176:180:java.lang.String getNarrationMessage() -> getNarrationMessage
-net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$5 -> djh$5:
-    net.minecraft.client.gui.screens.worldselection.CreateWorldScreen this$0 -> a
-    201:201:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,int,int,int,int,java.lang.String,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    204:204:java.lang.String getMessage() -> getMessage
-    209:209:java.lang.String getNarrationMessage() -> getNarrationMessage
-net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$6 -> djh$6:
-    net.minecraft.client.gui.screens.worldselection.CreateWorldScreen this$0 -> a
-    217:217:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,int,int,int,int,java.lang.String,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    220:220:java.lang.String getMessage() -> getMessage
-net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$7 -> djh$7:
+    203:203:void <init>(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    206:206:net.minecraft.network.chat.Component getMessage() -> i
+    211:211:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$5 -> dty$5:
     int[] $SwitchMap$net$minecraft$client$gui$screens$worldselection$CreateWorldScreen$SelectedGameMode -> a
-    107:107:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode -> djh$a:
+    163:163:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$OperationFailedException -> dty$a:
+    503:504:void <init>(java.lang.Throwable) -> <init>
+net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode -> dty$b:
     net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode SURVIVAL -> a
     net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode HARDCORE -> b
     net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode CREATIVE -> c
@@ -10893,99 +11400,312 @@ net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMo
     java.lang.String name -> e
     net.minecraft.world.level.GameType gameType -> f
     net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode[] $VALUES -> g
-    26:26:net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode[] values() -> values
-    26:26:net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode valueOf(java.lang.String) -> valueOf
-    36:39:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.GameType) -> <init>
-    26:26:java.lang.String access$200(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode) -> a
-    26:26:net.minecraft.world.level.GameType access$1000(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode) -> b
-    26:30:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.worldselection.EditWorldScreen -> dji:
-    net.minecraft.client.gui.components.Button renameButton -> a
-    it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> b
-    net.minecraft.client.gui.components.EditBox nameEdit -> c
-    java.lang.String levelId -> d
-    32:35:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,java.lang.String) -> <init>
-    39:40:void tick() -> tick
-    44:92:void init() -> init
-    96:99:void resize(net.minecraft.client.Minecraft,int,int) -> resize
-    103:104:void removed() -> removed
-    107:110:void onRename() -> a
-    113:134:void makeBackupAndShowToast(net.minecraft.world.level.storage.LevelStorageSource,java.lang.String) -> a
-    138:146:void render(int,int,float) -> render
-    88:88:void lambda$init$8(java.lang.String) -> a
-    78:78:void lambda$init$7(net.minecraft.client.gui.components.Button) -> a
-    77:77:void lambda$init$6(net.minecraft.client.gui.components.Button) -> b
-    70:76:void lambda$init$5(net.minecraft.client.gui.components.Button) -> c
-    71:75:void lambda$null$4(boolean,boolean) -> a
-    60:68:void lambda$init$3(net.minecraft.client.gui.components.Button) -> d
-    55:58:void lambda$init$2(net.minecraft.client.gui.components.Button) -> e
-    51:53:void lambda$init$1(net.minecraft.client.gui.components.Button) -> f
-    46:49:void lambda$init$0(net.minecraft.client.gui.components.Button) -> g
-net.minecraft.client.gui.screens.worldselection.OptimizeWorldScreen -> djj:
-    it.unimi.dsi.fastutil.objects.Object2IntMap DIMENSION_COLORS -> a
-    it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> b
-    net.minecraft.util.worldupdate.WorldUpgrader upgrader -> c
-    28:31:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,java.lang.String,net.minecraft.world.level.storage.LevelStorageSource,boolean) -> <init>
-    35:41:void init() -> init
-    45:48:void tick() -> tick
-    52:53:void removed() -> removed
-    57:88:void render(int,int,float) -> render
-    38:40:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
-    18:22:void lambda$static$0(it.unimi.dsi.fastutil.objects.Object2IntOpenCustomHashMap) -> a
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.worldselection.SelectWorldScreen -> djk:
-    net.minecraft.client.gui.screens.Screen lastScreen -> a
-    java.lang.String toolTip -> c
-    net.minecraft.client.gui.components.Button deleteButton -> d
-    net.minecraft.client.gui.components.Button selectButton -> e
-    net.minecraft.client.gui.components.Button renameButton -> f
-    net.minecraft.client.gui.components.Button copyButton -> g
-    net.minecraft.client.gui.components.EditBox searchBox -> b
-    net.minecraft.client.gui.screens.worldselection.WorldSelectionList list -> h
-    24:26:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
-    30:30:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    35:36:void tick() -> tick
-    40:62:void init() -> init
-    66:70:boolean keyPressed(int,int,int) -> keyPressed
-    75:76:void onClose() -> onClose
-    80:80:boolean charTyped(char,int) -> charTyped
-    85:97:void render(int,int,float) -> render
-    100:101:void setToolTip(java.lang.String) -> a
-    104:108:void updateButtonStatus(boolean) -> a
-    113:116:void removed() -> removed
-    57:57:void lambda$init$8(net.minecraft.client.gui.components.Button) -> a
-    56:56:void lambda$init$7(net.minecraft.client.gui.components.Button) -> b
-    55:55:void lambda$init$6(net.minecraft.client.gui.components.Button) -> c
-    54:54:void lambda$init$5(net.minecraft.client.gui.components.Button) -> d
-    52:52:void lambda$init$4(net.minecraft.client.gui.components.Button) -> e
-    51:51:void lambda$init$3(net.minecraft.client.gui.components.Button) -> f
-    46:46:java.lang.String lambda$init$2() -> a
-    44:44:void lambda$init$1(java.lang.String) -> b
-    44:44:java.lang.String lambda$null$0(java.lang.String) -> c
-net.minecraft.client.gui.screens.worldselection.WorldSelectionList -> djl:
+    57:57:net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode[] values() -> values
+    57:57:net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode valueOf(java.lang.String) -> valueOf
+    67:70:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.GameType) -> <init>
+    57:57:java.lang.String access$200(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode) -> a
+    57:57:net.minecraft.world.level.GameType access$700(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$SelectedGameMode) -> b
+    57:61:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen -> dtz:
+    java.util.function.Consumer exitCallback -> a
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleList rules -> b
+    java.util.Set invalidEntries -> c
+    net.minecraft.client.gui.components.Button doneButton -> p
+    java.util.List tooltip -> q
+    net.minecraft.world.level.GameRules gameRules -> r
+    34:44:void <init>(net.minecraft.world.level.GameRules,java.util.function.Consumer) -> <init>
+    48:59:void init() -> b
+    63:64:void removed() -> e
+    68:69:void onClose() -> au_
+    73:82:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    85:86:void setTooltip(java.util.List) -> b
+    89:90:void updateDoneButton() -> i
+    93:95:void markInvalid(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleEntry) -> a
+    98:100:void clearInvalid(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleEntry) -> b
+    57:57:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    54:54:void lambda$init$0(net.minecraft.client.gui.components.Button) -> b
+    31:31:net.minecraft.client.Minecraft access$000(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen) -> a
+    31:31:net.minecraft.client.Minecraft access$100(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen) -> b
+    31:31:net.minecraft.client.Minecraft access$200(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen) -> c
+    31:31:net.minecraft.client.Minecraft access$300(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen) -> d
+    31:31:net.minecraft.client.Minecraft access$400(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen) -> e
+    31:31:net.minecraft.client.Minecraft access$600(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen) -> f
+    31:31:void access$700(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleEntry) -> a
+    31:31:void access$800(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleEntry) -> b
+    31:31:net.minecraft.client.Minecraft access$900(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen) -> g
+    31:31:net.minecraft.client.gui.Font access$1000(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen) -> h
+    31:31:void access$1200(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,java.util.List) -> a
+net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$BooleanRuleEntry -> dtz$a:
+    net.minecraft.client.gui.components.Button checkbox -> e
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen this$0 -> a
+    162:175:void <init>(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,net.minecraft.network.chat.Component,java.util.List,java.lang.String,net.minecraft.world.level.GameRules$BooleanValue) -> <init>
+    178:178:net.minecraft.network.chat.MutableComponent createFullMessage(net.minecraft.network.chat.Component,boolean) -> a
+    183:187:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    165:168:void lambda$new$0(net.minecraft.world.level.GameRules$BooleanValue,net.minecraft.client.gui.components.Button) -> a
+    159:159:net.minecraft.network.chat.MutableComponent access$500(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$BooleanRuleEntry,net.minecraft.network.chat.Component,boolean) -> a
+net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$BooleanRuleEntry$1 -> dtz$a$1:
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen val$this$0 -> a
+    net.minecraft.network.chat.Component val$name -> b
+    net.minecraft.world.level.GameRules$BooleanValue val$value -> c
+    java.lang.String val$narration -> d
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$BooleanRuleEntry this$1 -> e
+    168:168:void <init>(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$BooleanRuleEntry,int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress,net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,net.minecraft.network.chat.Component,net.minecraft.world.level.GameRules$BooleanValue,java.lang.String) -> <init>
+    171:171:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$CategoryRuleEntry -> dtz$b:
+    net.minecraft.network.chat.Component label -> b
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen this$0 -> a
+    114:117:void <init>(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,net.minecraft.network.chat.Component) -> <init>
+    121:122:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    126:126:java.util.List children() -> av_
+net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$EntryFactory -> dtz$c:
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleEntry create(net.minecraft.network.chat.Component,java.util.List,java.lang.String,net.minecraft.world.level.GameRules$Value) -> create
+net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$GameRuleEntry -> dtz$d:
+    java.util.List label -> a
+    java.util.List children -> b
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen this$0 -> c
+    137:142:void <init>(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,java.util.List,net.minecraft.network.chat.Component) -> <init>
+    146:146:java.util.List children() -> av_
+    150:156:void renderLabel(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$IntegerRuleEntry -> dtz$e:
+    net.minecraft.client.gui.components.EditBox input -> e
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen this$0 -> a
+    193:208:void <init>(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,net.minecraft.network.chat.Component,java.util.List,java.lang.String,net.minecraft.world.level.GameRules$IntegerValue) -> <init>
+    212:216:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    199:206:void lambda$new$0(net.minecraft.world.level.GameRules$IntegerValue,java.lang.String) -> a
+net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleEntry -> dtz$f:
+    java.util.List tooltip -> a
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen this$0 -> d
+    106:108:void <init>(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,java.util.List) -> <init>
+    102:102:java.util.List access$1100(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleEntry) -> a
+net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleList -> dtz$g:
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen this$0 -> a
+    221:267:void <init>(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,net.minecraft.world.level.GameRules) -> <init>
+    271:278:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    264:266:void lambda$new$1(java.util.Map$Entry) -> a
+    265:265:void lambda$null$0(java.util.Map$Entry) -> b
+net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleList$1 -> dtz$g$1:
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen val$this$0 -> a
+    net.minecraft.world.level.GameRules val$gameRules -> b
+    java.util.Map val$entries -> c
+    net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleList this$1 -> d
+    226:226:void <init>(net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleList,net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen,net.minecraft.world.level.GameRules,java.util.Map) -> <init>
+    229:230:void visitBoolean(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> b
+    234:235:void visitInteger(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> c
+    238:260:void addEntry(net.minecraft.world.level.GameRules$Key,net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$EntryFactory) -> a
+    259:259:java.util.Map lambda$addEntry$2(net.minecraft.world.level.GameRules$Category) -> a
+    234:234:net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleEntry lambda$visitInteger$1(net.minecraft.network.chat.Component,java.util.List,java.lang.String,net.minecraft.world.level.GameRules$IntegerValue) -> a
+    229:229:net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleEntry lambda$visitBoolean$0(net.minecraft.network.chat.Component,java.util.List,java.lang.String,net.minecraft.world.level.GameRules$BooleanValue) -> a
+net.minecraft.client.gui.screens.worldselection.EditWorldScreen -> dua:
     org.apache.logging.log4j.Logger LOGGER -> a
-    java.text.DateFormat DATE_FORMAT -> b
-    net.minecraft.resources.ResourceLocation ICON_MISSING -> c
-    net.minecraft.resources.ResourceLocation ICON_OVERLAY_LOCATION -> d
-    net.minecraft.client.gui.screens.worldselection.SelectWorldScreen screen -> e
-    java.util.List cachedList -> f
-    60:67:void <init>(net.minecraft.client.gui.screens.worldselection.SelectWorldScreen,net.minecraft.client.Minecraft,int,int,int,int,int,java.util.function.Supplier,net.minecraft.client.gui.screens.worldselection.WorldSelectionList) -> <init>
-    70:89:void refreshList(java.util.function.Supplier,boolean) -> a
-    93:93:int getScrollbarPosition() -> getScrollbarPosition
-    98:98:int getRowWidth() -> getRowWidth
-    103:103:boolean isFocused() -> isFocused
-    108:120:void setSelected(net.minecraft.client.gui.screens.worldselection.WorldSelectionList$WorldListEntry) -> a
-    124:126:void moveSelection(int) -> moveSelection
-    129:129:java.util.Optional getSelectedOpt() -> a
-    133:133:net.minecraft.client.gui.screens.worldselection.SelectWorldScreen getScreen() -> b
-    48:48:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> setSelected
-    48:48:java.text.DateFormat access$100() -> c
-    48:48:net.minecraft.resources.ResourceLocation access$200() -> d
-    48:48:net.minecraft.resources.ResourceLocation access$300() -> e
-    48:48:int access$400(net.minecraft.client.gui.screens.worldselection.WorldSelectionList) -> a
-    48:48:org.apache.logging.log4j.Logger access$500() -> f
-    49:52:void <clinit>() -> <clinit>
-net.minecraft.client.gui.screens.worldselection.WorldSelectionList$WorldListEntry -> djl$a:
+    com.google.gson.Gson WORLD_GEN_SETTINGS_GSON -> b
+    net.minecraft.client.gui.components.Button renameButton -> c
+    it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> p
+    net.minecraft.client.gui.components.EditBox nameEdit -> q
+    net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess levelAccess -> r
+    57:60:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess) -> <init>
+    64:65:void tick() -> d
+    69:142:void init() -> b
+    146:149:void resize(net.minecraft.client.Minecraft,int,int) -> a
+    153:154:void onClose() -> au_
+    158:159:void removed() -> e
+    163:170:void onRename() -> i
+    173:184:void makeBackupAndShowToast(net.minecraft.world.level.storage.LevelStorageSource,java.lang.String) -> a
+    187:204:boolean makeBackupAndShowToast(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess) -> a
+    209:217:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    138:138:void lambda$init$11(java.lang.String) -> a
+    129:129:void lambda$init$10(net.minecraft.client.gui.components.Button) -> a
+    128:128:void lambda$init$9(net.minecraft.client.gui.components.Button) -> b
+    104:127:void lambda$init$8(net.minecraft.client.gui.components.Button) -> c
+    125:125:void lambda$null$7(com.mojang.serialization.DataResult$PartialResult) -> a
+    111:117:com.mojang.serialization.DataResult lambda$null$6(com.google.gson.JsonElement) -> a
+    93:93:void lambda$init$5(net.minecraft.client.gui.components.Button) -> d
+    94:99:void lambda$null$4(boolean,boolean) -> a
+    83:91:void lambda$init$3(net.minecraft.client.gui.components.Button) -> e
+    78:81:void lambda$init$2(net.minecraft.client.gui.components.Button) -> f
+    75:75:void lambda$init$1(net.minecraft.client.gui.components.Button) -> g
+    71:73:void lambda$init$0(net.minecraft.client.gui.components.Button) -> h
+    47:48:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.worldselection.OptimizeWorldScreen -> dub:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    it.unimi.dsi.fastutil.objects.Object2IntMap DIMENSION_COLORS -> b
+    it.unimi.dsi.fastutil.booleans.BooleanConsumer callback -> c
+    net.minecraft.util.worldupdate.WorldUpgrader upgrader -> p
+    44:53:net.minecraft.client.gui.screens.worldselection.OptimizeWorldScreen create(net.minecraft.client.Minecraft,it.unimi.dsi.fastutil.booleans.BooleanConsumer,com.mojang.datafixers.DataFixer,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,boolean) -> a
+    58:61:void <init>(it.unimi.dsi.fastutil.booleans.BooleanConsumer,com.mojang.datafixers.DataFixer,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.world.level.LevelSettings,boolean,com.google.common.collect.ImmutableSet) -> <init>
+    65:71:void init() -> b
+    75:78:void tick() -> d
+    82:83:void onClose() -> au_
+    87:88:void removed() -> e
+    92:123:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    68:70:void lambda$init$1(net.minecraft.client.gui.components.Button) -> a
+    33:37:void lambda$static$0(it.unimi.dsi.fastutil.objects.Object2IntOpenCustomHashMap) -> a
+    30:32:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.worldselection.SelectWorldScreen -> duc:
+    net.minecraft.client.gui.screens.Screen lastScreen -> a
+    java.util.List toolTip -> c
+    net.minecraft.client.gui.components.Button deleteButton -> p
+    net.minecraft.client.gui.components.Button selectButton -> q
+    net.minecraft.client.gui.components.Button renameButton -> r
+    net.minecraft.client.gui.components.Button copyButton -> s
+    net.minecraft.client.gui.components.EditBox searchBox -> b
+    net.minecraft.client.gui.screens.worldselection.WorldSelectionList list -> t
+    26:28:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
+    32:32:boolean mouseScrolled(double,double,double) -> a
+    37:38:void tick() -> d
+    42:64:void init() -> b
+    68:72:boolean keyPressed(int,int,int) -> a
+    77:78:void onClose() -> au_
+    82:82:boolean charTyped(char,int) -> a
+    87:99:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    102:103:void setToolTip(java.util.List) -> b
+    106:110:void updateButtonStatus(boolean) -> c
+    115:118:void removed() -> e
+    59:59:void lambda$init$8(net.minecraft.client.gui.components.Button) -> a
+    58:58:void lambda$init$7(net.minecraft.client.gui.components.Button) -> b
+    57:57:void lambda$init$6(net.minecraft.client.gui.components.Button) -> c
+    56:56:void lambda$init$5(net.minecraft.client.gui.components.Button) -> d
+    54:54:void lambda$init$4(net.minecraft.client.gui.components.Button) -> e
+    53:53:void lambda$init$3(net.minecraft.client.gui.components.Button) -> f
+    48:48:java.lang.String lambda$init$2() -> i
+    46:46:void lambda$init$1(java.lang.String) -> a
+    46:46:java.lang.String lambda$null$0(java.lang.String) -> b
+net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent -> dud:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    net.minecraft.network.chat.Component CUSTOM_WORLD_DESCRIPTION -> c
+    net.minecraft.network.chat.Component AMPLIFIED_HELP_TEXT -> d
+    net.minecraft.client.gui.Font font -> e
+    int width -> f
+    net.minecraft.client.gui.components.EditBox seedEdit -> g
+    net.minecraft.client.gui.components.Button featuresButton -> h
+    net.minecraft.client.gui.components.Button bonusItemsButton -> a
+    net.minecraft.client.gui.components.Button typeButton -> i
+    net.minecraft.client.gui.components.Button customizeTypeButton -> j
+    net.minecraft.client.gui.components.Button importSettingsButton -> k
+    net.minecraft.core.RegistryAccess$RegistryHolder registryHolder -> l
+    net.minecraft.world.level.levelgen.WorldGenSettings settings -> m
+    java.util.Optional preset -> n
+    java.lang.String initSeed -> o
+    75:80:void <init>() -> <init>
+    82:87:void <init>(net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.levelgen.WorldGenSettings) -> <init>
+    90:244:void init(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.client.Minecraft,net.minecraft.client.gui.Font) -> a
+    247:253:void importSettings(net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.levelgen.WorldGenSettings) -> a
+    257:258:void tick() -> d
+    262:270:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    273:274:void updateSettings(net.minecraft.world.level.levelgen.WorldGenSettings) -> a
+    278:282:java.util.OptionalLong parseLong(java.lang.String) -> a
+    286:299:net.minecraft.world.level.levelgen.WorldGenSettings makeSettings(boolean) -> a
+    303:303:boolean isDebug() -> a
+    307:322:void setDisplayOptions(boolean) -> b
+    325:325:net.minecraft.core.RegistryAccess$RegistryHolder registryHolder() -> b
+    174:242:void lambda$init$7(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.client.Minecraft,net.minecraft.client.gui.components.Button) -> a
+    219:241:void lambda$null$6(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.core.RegistryAccess$RegistryHolder,com.mojang.serialization.Lifecycle,net.minecraft.world.level.levelgen.WorldGenSettings) -> a
+    220:224:void lambda$null$5(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.levelgen.WorldGenSettings,boolean) -> a
+    163:165:void lambda$init$4(net.minecraft.client.gui.components.Button) -> a
+    155:159:void lambda$init$3(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.client.gui.components.Button) -> a
+    118:137:void lambda$init$2(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.client.gui.components.Button) -> a
+    101:103:void lambda$init$1(net.minecraft.client.gui.components.Button) -> b
+    95:95:void lambda$init$0(java.lang.String) -> b
+    54:54:net.minecraft.world.level.levelgen.WorldGenSettings access$000(net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent) -> a
+    54:54:net.minecraft.network.chat.Component access$100() -> c
+    54:54:java.util.Optional access$200(net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent) -> b
+    54:54:net.minecraft.network.chat.Component access$300() -> e
+    55:58:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent$1 -> dud$1:
+    net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent this$0 -> a
+    103:103:void <init>(net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent,int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    106:106:net.minecraft.network.chat.Component getMessage() -> i
+    111:111:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent$2 -> dud$2:
+    net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent this$0 -> a
+    137:137:void <init>(net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent,int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress) -> <init>
+    140:140:net.minecraft.network.chat.Component getMessage() -> i
+    145:148:net.minecraft.network.chat.MutableComponent createNarrationMessage() -> c
+net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent$3 -> dud$3:
+    net.minecraft.client.gui.screens.worldselection.CreateWorldScreen val$parent -> a
+    net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent this$0 -> b
+    165:165:void <init>(net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent,int,int,int,int,net.minecraft.network.chat.Component,net.minecraft.client.gui.components.Button$OnPress,net.minecraft.client.gui.screens.worldselection.CreateWorldScreen) -> <init>
+    168:168:net.minecraft.network.chat.Component getMessage() -> i
+net.minecraft.client.gui.screens.worldselection.WorldPreset -> due:
+    net.minecraft.client.gui.screens.worldselection.WorldPreset NORMAL -> a
+    net.minecraft.client.gui.screens.worldselection.WorldPreset FLAT -> e
+    net.minecraft.client.gui.screens.worldselection.WorldPreset LARGE_BIOMES -> f
+    net.minecraft.client.gui.screens.worldselection.WorldPreset AMPLIFIED -> b
+    net.minecraft.client.gui.screens.worldselection.WorldPreset SINGLE_BIOME_SURFACE -> g
+    net.minecraft.client.gui.screens.worldselection.WorldPreset SINGLE_BIOME_CAVES -> h
+    net.minecraft.client.gui.screens.worldselection.WorldPreset SINGLE_BIOME_FLOATING_ISLANDS -> i
+    net.minecraft.client.gui.screens.worldselection.WorldPreset DEBUG -> j
+    java.util.List PRESETS -> c
+    java.util.Map EDITORS -> d
+    net.minecraft.network.chat.Component description -> k
+    123:125:void <init>(java.lang.String) -> <init>
+    128:137:net.minecraft.world.level.levelgen.WorldGenSettings fromBuffetSettings(net.minecraft.world.level.levelgen.WorldGenSettings,net.minecraft.client.gui.screens.worldselection.WorldPreset,net.minecraft.world.level.biome.Biome) -> a
+    141:141:net.minecraft.world.level.biome.Biome parseBuffetSettings(net.minecraft.world.level.levelgen.WorldGenSettings) -> b
+    145:151:java.util.Optional of(net.minecraft.world.level.levelgen.WorldGenSettings) -> a
+    156:156:net.minecraft.network.chat.Component description() -> a
+    160:160:net.minecraft.world.level.levelgen.WorldGenSettings create(net.minecraft.core.RegistryAccess$RegistryHolder,long,boolean,boolean) -> a
+    net.minecraft.world.level.chunk.ChunkGenerator generator(long) -> a
+    114:117:net.minecraft.client.gui.screens.Screen lambda$static$7(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.world.level.levelgen.WorldGenSettings) -> a
+    116:116:void lambda$null$6(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.world.level.levelgen.WorldGenSettings,net.minecraft.world.level.biome.Biome) -> a
+    109:112:net.minecraft.client.gui.screens.Screen lambda$static$5(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.world.level.levelgen.WorldGenSettings) -> b
+    111:111:void lambda$null$4(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.world.level.levelgen.WorldGenSettings,net.minecraft.world.level.biome.Biome) -> b
+    104:107:net.minecraft.client.gui.screens.Screen lambda$static$3(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.world.level.levelgen.WorldGenSettings) -> c
+    106:106:void lambda$null$2(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.world.level.levelgen.WorldGenSettings,net.minecraft.world.level.biome.Biome) -> c
+    97:101:net.minecraft.client.gui.screens.Screen lambda$static$1(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.world.level.levelgen.WorldGenSettings) -> d
+    100:100:void lambda$null$0(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.world.level.levelgen.WorldGenSettings,net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> a
+    29:29:void <init>(java.lang.String,net.minecraft.client.gui.screens.worldselection.WorldPreset$1) -> <init>
+    30:114:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.worldselection.WorldPreset$1 -> due$1:
+    30:30:void <init>(java.lang.String) -> <init>
+    33:33:net.minecraft.world.level.chunk.ChunkGenerator generator(long) -> a
+net.minecraft.client.gui.screens.worldselection.WorldPreset$2 -> due$2:
+    36:36:void <init>(java.lang.String) -> <init>
+    39:39:net.minecraft.world.level.chunk.ChunkGenerator generator(long) -> a
+net.minecraft.client.gui.screens.worldselection.WorldPreset$3 -> due$3:
+    42:42:void <init>(java.lang.String) -> <init>
+    45:45:net.minecraft.world.level.chunk.ChunkGenerator generator(long) -> a
+net.minecraft.client.gui.screens.worldselection.WorldPreset$4 -> due$4:
+    48:48:void <init>(java.lang.String) -> <init>
+    51:51:net.minecraft.world.level.chunk.ChunkGenerator generator(long) -> a
+net.minecraft.client.gui.screens.worldselection.WorldPreset$5 -> due$5:
+    54:54:void <init>(java.lang.String) -> <init>
+    57:57:net.minecraft.world.level.chunk.ChunkGenerator generator(long) -> a
+net.minecraft.client.gui.screens.worldselection.WorldPreset$6 -> due$6:
+    60:60:void <init>(java.lang.String) -> <init>
+    63:63:net.minecraft.world.level.levelgen.WorldGenSettings create(net.minecraft.core.RegistryAccess$RegistryHolder,long,boolean,boolean) -> a
+    68:68:net.minecraft.world.level.chunk.ChunkGenerator generator(long) -> a
+net.minecraft.client.gui.screens.worldselection.WorldPreset$7 -> due$7:
+    71:71:void <init>(java.lang.String) -> <init>
+    74:74:net.minecraft.world.level.chunk.ChunkGenerator generator(long) -> a
+net.minecraft.client.gui.screens.worldselection.WorldPreset$8 -> due$8:
+    77:77:void <init>(java.lang.String) -> <init>
+    80:80:net.minecraft.world.level.chunk.ChunkGenerator generator(long) -> a
+net.minecraft.client.gui.screens.worldselection.WorldPreset$PresetEditor -> due$a:
+    net.minecraft.client.gui.screens.Screen createEditScreen(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,net.minecraft.world.level.levelgen.WorldGenSettings) -> createEditScreen
+net.minecraft.client.gui.screens.worldselection.WorldSelectionList -> duf:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    java.text.DateFormat DATE_FORMAT -> o
+    net.minecraft.resources.ResourceLocation ICON_MISSING -> p
+    net.minecraft.resources.ResourceLocation ICON_OVERLAY_LOCATION -> q
+    net.minecraft.client.gui.screens.worldselection.SelectWorldScreen screen -> r
+    java.util.List cachedList -> s
+    71:78:void <init>(net.minecraft.client.gui.screens.worldselection.SelectWorldScreen,net.minecraft.client.Minecraft,int,int,int,int,int,java.util.function.Supplier,net.minecraft.client.gui.screens.worldselection.WorldSelectionList) -> <init>
+    81:105:void refreshList(java.util.function.Supplier,boolean) -> a
+    109:109:int getScrollbarPosition() -> e
+    114:114:int getRowWidth() -> d
+    119:119:boolean isFocused() -> b
+    124:137:void setSelected(net.minecraft.client.gui.screens.worldselection.WorldSelectionList$WorldListEntry) -> a
+    141:142:void moveSelection(net.minecraft.client.gui.components.AbstractSelectionList$SelectionDirection) -> a
+    145:145:java.util.Optional getSelectedOpt() -> f
+    149:149:net.minecraft.client.gui.screens.worldselection.SelectWorldScreen getScreen() -> g
+    59:59:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> a
+    141:141:boolean lambda$moveSelection$0(net.minecraft.client.gui.screens.worldselection.WorldSelectionList$WorldListEntry) -> b
+    59:59:java.text.DateFormat access$100() -> s
+    59:59:net.minecraft.resources.ResourceLocation access$200() -> t
+    59:59:net.minecraft.resources.ResourceLocation access$300() -> u
+    59:59:int access$400(net.minecraft.client.gui.screens.worldselection.WorldSelectionList) -> a
+    59:59:org.apache.logging.log4j.Logger access$500() -> v
+    60:63:void <clinit>() -> <clinit>
+net.minecraft.client.gui.screens.worldselection.WorldSelectionList$WorldListEntry -> duf$a:
     net.minecraft.client.Minecraft minecraft -> b
     net.minecraft.client.gui.screens.worldselection.SelectWorldScreen screen -> c
     net.minecraft.world.level.storage.LevelSummary summary -> d
@@ -10994,52 +11714,53 @@ net.minecraft.client.gui.screens.worldselection.WorldSelectionList$WorldListEntr
     net.minecraft.client.renderer.texture.DynamicTexture icon -> g
     long lastClickTime -> h
     net.minecraft.client.gui.screens.worldselection.WorldSelectionList this$0 -> a
-    155:167:void <init>(net.minecraft.client.gui.screens.worldselection.WorldSelectionList,net.minecraft.client.gui.screens.worldselection.WorldSelectionList,net.minecraft.world.level.storage.LevelSummary,net.minecraft.world.level.storage.LevelStorageSource) -> <init>
-    171:244:void render(int,int,int,int,int,int,int,boolean,float) -> render
-    248:262:boolean mouseClicked(double,double,int) -> mouseClicked
-    266:313:void joinWorld() -> a
-    316:331:void deleteWorld() -> b
-    334:343:void editWorld() -> c
-    347:374:void recreateWorld() -> d
-    377:381:void loadWorld() -> e
-    385:402:net.minecraft.client.renderer.texture.DynamicTexture loadServerIcon() -> f
-    408:411:void close() -> close
-    369:369:void lambda$recreateWorld$8() -> g
-    356:356:void lambda$recreateWorld$7(net.minecraft.client.gui.screens.worldselection.CreateWorldScreen,boolean) -> a
-    336:340:void lambda$editWorld$6(boolean) -> a
-    337:337:java.lang.String lambda$null$5() -> h
-    318:325:void lambda$deleteWorld$4(boolean) -> b
-    322:322:java.lang.String lambda$null$3() -> i
-    290:304:void lambda$joinWorld$2(boolean) -> c
-    296:296:void lambda$null$1() -> j
-    277:282:void lambda$joinWorld$0(boolean,boolean) -> a
-    136:136:net.minecraft.world.level.storage.LevelSummary access$000(net.minecraft.client.gui.screens.worldselection.WorldSelectionList$WorldListEntry) -> a
-net.minecraft.client.gui.screens.worldselection.package-info -> djm:
-net.minecraft.client.gui.spectator.PlayerMenuItem -> djn:
+    171:183:void <init>(net.minecraft.client.gui.screens.worldselection.WorldSelectionList,net.minecraft.client.gui.screens.worldselection.WorldSelectionList,net.minecraft.world.level.storage.LevelSummary,net.minecraft.world.level.storage.LevelStorageSource) -> <init>
+    187:245:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    249:266:boolean mouseClicked(double,double,int) -> a
+    270:321:void joinWorld() -> a
+    324:345:void deleteWorld() -> b
+    348:370:void editWorld() -> c
+    373:402:void recreateWorld() -> d
+    405:410:void loadWorld() -> e
+    413:414:void queueLoadScreen() -> f
+    418:435:net.minecraft.client.renderer.texture.DynamicTexture loadServerIcon() -> g
+    441:444:void close() -> close
+    397:397:void lambda$recreateWorld$9() -> h
+    385:385:void lambda$recreateWorld$8(net.minecraft.world.level.LevelSettings,net.minecraft.world.level.levelgen.WorldGenSettings,java.nio.file.Path,net.minecraft.core.RegistryAccess$RegistryHolder,boolean) -> a
+    368:368:java.lang.String lambda$editWorld$7() -> i
+    354:362:void lambda$editWorld$6(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,java.lang.String,boolean) -> a
+    359:359:java.lang.String lambda$null$5() -> j
+    326:339:void lambda$deleteWorld$4(boolean) -> a
+    336:336:java.lang.String lambda$null$3() -> k
+    298:312:void lambda$joinWorld$2(boolean) -> c
+    304:304:void lambda$null$1() -> l
+    280:290:void lambda$joinWorld$0(boolean,boolean) -> a
+    152:152:net.minecraft.world.level.storage.LevelSummary access$000(net.minecraft.client.gui.screens.worldselection.WorldSelectionList$WorldListEntry) -> a
+net.minecraft.client.gui.screens.worldselection.package-info -> dug:
+net.minecraft.client.gui.spectator.PlayerMenuItem -> duh:
     com.mojang.authlib.GameProfile profile -> a
     net.minecraft.resources.ResourceLocation location -> b
-    22:32:void <init>(com.mojang.authlib.GameProfile) -> <init>
-    36:37:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-    41:41:net.minecraft.network.chat.Component getName() -> af_
-    46:50:void renderIcon(float,int) -> a
-    54:54:boolean isEnabled() -> ag_
-net.minecraft.client.gui.spectator.RootSpectatorMenuCategory -> djo:
+    23:33:void <init>(com.mojang.authlib.GameProfile) -> <init>
+    37:38:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
+    42:42:net.minecraft.network.chat.Component getName() -> az_
+    47:51:void renderIcon(com.mojang.blaze3d.vertex.PoseStack,float,int) -> a
+    55:55:boolean isEnabled() -> aA_
+net.minecraft.client.gui.spectator.RootSpectatorMenuCategory -> dui:
     java.util.List items -> a
     12:17:void <init>() -> <init>
     21:21:java.util.List getItems() -> a
     26:26:net.minecraft.network.chat.Component getPrompt() -> b
-net.minecraft.client.gui.spectator.SpectatorMenu -> djp:
+net.minecraft.client.gui.spectator.SpectatorMenu -> duj:
     net.minecraft.client.gui.spectator.SpectatorMenuItem CLOSE_ITEM -> b
     net.minecraft.client.gui.spectator.SpectatorMenuItem SCROLL_LEFT -> c
     net.minecraft.client.gui.spectator.SpectatorMenuItem SCROLL_RIGHT_ENABLED -> d
     net.minecraft.client.gui.spectator.SpectatorMenuItem SCROLL_RIGHT_DISABLED -> e
     net.minecraft.client.gui.spectator.SpectatorMenuItem EMPTY_SLOT -> a
     net.minecraft.client.gui.spectator.SpectatorMenuListener listener -> f
-    java.util.List previousCategories -> g
-    net.minecraft.client.gui.spectator.SpectatorMenuCategory category -> h
-    int selectedSlot -> i
-    int page -> j
-    44:52:void <init>(net.minecraft.client.gui.spectator.SpectatorMenuListener) -> <init>
+    net.minecraft.client.gui.spectator.SpectatorMenuCategory category -> g
+    int selectedSlot -> h
+    int page -> i
+    46:52:void <init>(net.minecraft.client.gui.spectator.SpectatorMenuListener) -> <init>
     55:74:net.minecraft.client.gui.spectator.SpectatorMenuItem getItem(int) -> a
     78:84:java.util.List getItems() -> a
     88:88:net.minecraft.client.gui.spectator.SpectatorMenuItem getSelectedItem() -> b
@@ -11047,44 +11768,43 @@ net.minecraft.client.gui.spectator.SpectatorMenu -> djp:
     96:105:void selectSlot(int) -> b
     108:109:void exit() -> d
     112:112:int getSelectedSlot() -> e
-    116:121:void selectCategory(net.minecraft.client.gui.spectator.SpectatorMenuCategory) -> a
-    124:124:net.minecraft.client.gui.spectator.categories.SpectatorPage getCurrentPage() -> f
-    128:130:java.util.List getAllPages() -> g
-    15:15:int access$100(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-    15:15:int access$102(net.minecraft.client.gui.spectator.SpectatorMenu,int) -> a
-    16:23:void <clinit>() -> <clinit>
-net.minecraft.client.gui.spectator.SpectatorMenu$1 -> djp$1:
-    23:23:void <init>() -> <init>
-    26:26:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-    30:30:net.minecraft.network.chat.Component getName() -> af_
-    35:35:void renderIcon(float,int) -> a
-    39:39:boolean isEnabled() -> ag_
-net.minecraft.client.gui.spectator.SpectatorMenu$CloseSpectatorItem -> djp$a:
-    133:133:void <init>() -> <init>
-    136:137:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-    141:141:net.minecraft.network.chat.Component getName() -> af_
-    146:148:void renderIcon(float,int) -> a
-    152:152:boolean isEnabled() -> ag_
-    133:133:void <init>(net.minecraft.client.gui.spectator.SpectatorMenu$1) -> <init>
-net.minecraft.client.gui.spectator.SpectatorMenu$ScrollMenuItem -> djp$b:
+    116:119:void selectCategory(net.minecraft.client.gui.spectator.SpectatorMenuCategory) -> a
+    122:122:net.minecraft.client.gui.spectator.categories.SpectatorPage getCurrentPage() -> f
+    16:16:int access$100(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
+    16:16:int access$102(net.minecraft.client.gui.spectator.SpectatorMenu,int) -> a
+    17:24:void <clinit>() -> <clinit>
+net.minecraft.client.gui.spectator.SpectatorMenu$1 -> duj$1:
+    24:24:void <init>() -> <init>
+    27:27:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
+    31:31:net.minecraft.network.chat.Component getName() -> az_
+    36:36:void renderIcon(com.mojang.blaze3d.vertex.PoseStack,float,int) -> a
+    40:40:boolean isEnabled() -> aA_
+net.minecraft.client.gui.spectator.SpectatorMenu$CloseSpectatorItem -> duj$a:
+    125:125:void <init>() -> <init>
+    128:129:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
+    133:133:net.minecraft.network.chat.Component getName() -> az_
+    138:140:void renderIcon(com.mojang.blaze3d.vertex.PoseStack,float,int) -> a
+    144:144:boolean isEnabled() -> aA_
+    125:125:void <init>(net.minecraft.client.gui.spectator.SpectatorMenu$1) -> <init>
+net.minecraft.client.gui.spectator.SpectatorMenu$ScrollMenuItem -> duj$b:
     int direction -> a
     boolean enabled -> b
-    160:163:void <init>(int,boolean) -> <init>
-    167:168:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-    172:175:net.minecraft.network.chat.Component getName() -> af_
-    181:188:void renderIcon(float,int) -> a
-    192:192:boolean isEnabled() -> ag_
-net.minecraft.client.gui.spectator.SpectatorMenuCategory -> djq:
+    152:155:void <init>(int,boolean) -> <init>
+    159:160:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
+    164:167:net.minecraft.network.chat.Component getName() -> az_
+    173:180:void renderIcon(com.mojang.blaze3d.vertex.PoseStack,float,int) -> a
+    184:184:boolean isEnabled() -> aA_
+net.minecraft.client.gui.spectator.SpectatorMenuCategory -> duk:
     java.util.List getItems() -> a
     net.minecraft.network.chat.Component getPrompt() -> b
-net.minecraft.client.gui.spectator.SpectatorMenuItem -> djr:
+net.minecraft.client.gui.spectator.SpectatorMenuItem -> dul:
     void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-    net.minecraft.network.chat.Component getName() -> af_
-    void renderIcon(float,int) -> a
-    boolean isEnabled() -> ag_
-net.minecraft.client.gui.spectator.SpectatorMenuListener -> djs:
+    net.minecraft.network.chat.Component getName() -> az_
+    void renderIcon(com.mojang.blaze3d.vertex.PoseStack,float,int) -> a
+    boolean isEnabled() -> aA_
+net.minecraft.client.gui.spectator.SpectatorMenuListener -> dum:
     void onSpectatorMenuClosed(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-net.minecraft.client.gui.spectator.categories.SpectatorPage -> djt:
+net.minecraft.client.gui.spectator.categories.SpectatorPage -> dun:
     net.minecraft.client.gui.spectator.SpectatorMenuCategory category -> a
     java.util.List items -> b
     int selection -> c
@@ -11092,158 +11812,167 @@ net.minecraft.client.gui.spectator.categories.SpectatorPage -> djt:
     24:24:net.minecraft.client.gui.spectator.SpectatorMenuCategory getCategory() -> a
     28:32:net.minecraft.client.gui.spectator.SpectatorMenuItem getItem(int) -> a
     36:36:int getSelectedSlot() -> b
-net.minecraft.client.gui.spectator.categories.TeleportToPlayerMenuCategory -> dju:
+net.minecraft.client.gui.spectator.categories.TeleportToPlayerMenuCategory -> duo:
     com.google.common.collect.Ordering PROFILE_ORDER -> a
     java.util.List items -> b
-    31:32:void <init>() -> <init>
-    28:40:void <init>(java.util.Collection) -> <init>
-    44:44:java.util.List getItems() -> a
-    49:49:net.minecraft.network.chat.Component getPrompt() -> b
-    54:55:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-    59:59:net.minecraft.network.chat.Component getName() -> af_
-    64:66:void renderIcon(float,int) -> a
-    70:70:boolean isEnabled() -> ag_
-    22:25:int lambda$static$0(net.minecraft.client.multiplayer.PlayerInfo,net.minecraft.client.multiplayer.PlayerInfo) -> a
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.client.gui.spectator.categories.TeleportToTeamMenuCategory -> djv:
+    32:33:void <init>() -> <init>
+    29:41:void <init>(java.util.Collection) -> <init>
+    45:45:java.util.List getItems() -> a
+    50:50:net.minecraft.network.chat.Component getPrompt() -> b
+    55:56:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
+    60:60:net.minecraft.network.chat.Component getName() -> az_
+    65:67:void renderIcon(com.mojang.blaze3d.vertex.PoseStack,float,int) -> a
+    71:71:boolean isEnabled() -> aA_
+    23:26:int lambda$static$0(net.minecraft.client.multiplayer.PlayerInfo,net.minecraft.client.multiplayer.PlayerInfo) -> a
+    23:23:void <clinit>() -> <clinit>
+net.minecraft.client.gui.spectator.categories.TeleportToTeamMenuCategory -> dup:
     java.util.List items -> a
-    24:31:void <init>() -> <init>
-    35:35:java.util.List getItems() -> a
-    40:40:net.minecraft.network.chat.Component getPrompt() -> b
-    45:46:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-    50:50:net.minecraft.network.chat.Component getName() -> af_
-    55:57:void renderIcon(float,int) -> a
-    61:66:boolean isEnabled() -> ag_
-net.minecraft.client.gui.spectator.categories.TeleportToTeamMenuCategory$TeamSelectionItem -> djv$a:
+    25:32:void <init>() -> <init>
+    36:36:java.util.List getItems() -> a
+    41:41:net.minecraft.network.chat.Component getPrompt() -> b
+    46:47:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
+    51:51:net.minecraft.network.chat.Component getName() -> az_
+    56:58:void renderIcon(com.mojang.blaze3d.vertex.PoseStack,float,int) -> a
+    62:67:boolean isEnabled() -> aA_
+net.minecraft.client.gui.spectator.categories.TeleportToTeamMenuCategory$TeamSelectionItem -> dup$a:
     net.minecraft.world.scores.PlayerTeam team -> b
     net.minecraft.resources.ResourceLocation location -> c
     java.util.List players -> d
     net.minecraft.client.gui.spectator.categories.TeleportToTeamMenuCategory this$0 -> a
-    74:94:void <init>(net.minecraft.client.gui.spectator.categories.TeleportToTeamMenuCategory,net.minecraft.world.scores.PlayerTeam) -> <init>
-    98:99:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
-    103:103:net.minecraft.network.chat.Component getName() -> af_
-    108:121:void renderIcon(float,int) -> a
-    125:125:boolean isEnabled() -> ag_
-net.minecraft.client.gui.spectator.categories.package-info -> djw:
-net.minecraft.client.gui.spectator.package-info -> djx:
-net.minecraft.client.main.GameConfig -> djy:
+    75:95:void <init>(net.minecraft.client.gui.spectator.categories.TeleportToTeamMenuCategory,net.minecraft.world.scores.PlayerTeam) -> <init>
+    99:100:void selectItem(net.minecraft.client.gui.spectator.SpectatorMenu) -> a
+    104:104:net.minecraft.network.chat.Component getName() -> az_
+    109:122:void renderIcon(com.mojang.blaze3d.vertex.PoseStack,float,int) -> a
+    126:126:boolean isEnabled() -> aA_
+net.minecraft.client.gui.spectator.categories.package-info -> duq:
+net.minecraft.client.gui.spectator.package-info -> dur:
+net.minecraft.client.main.GameConfig -> dus:
     net.minecraft.client.main.GameConfig$UserData user -> a
     com.mojang.blaze3d.platform.DisplayData display -> b
     net.minecraft.client.main.GameConfig$FolderData location -> c
     net.minecraft.client.main.GameConfig$GameData game -> d
     net.minecraft.client.main.GameConfig$ServerData server -> e
     20:26:void <init>(net.minecraft.client.main.GameConfig$UserData,com.mojang.blaze3d.platform.DisplayData,net.minecraft.client.main.GameConfig$FolderData,net.minecraft.client.main.GameConfig$GameData,net.minecraft.client.main.GameConfig$ServerData) -> <init>
-net.minecraft.client.main.GameConfig$FolderData -> djy$a:
+net.minecraft.client.main.GameConfig$FolderData -> dus$a:
     java.io.File gameDirectory -> a
     java.io.File resourcePackDirectory -> b
     java.io.File assetDirectory -> c
     java.lang.String assetIndex -> d
-    61:66:void <init>(java.io.File,java.io.File,java.io.File,java.lang.String) -> <init>
-    69:69:net.minecraft.client.resources.AssetIndex getAssetIndex() -> a
-net.minecraft.client.main.GameConfig$GameData -> djy$b:
+    65:70:void <init>(java.io.File,java.io.File,java.io.File,java.lang.String) -> <init>
+    73:73:net.minecraft.client.resources.AssetIndex getAssetIndex() -> a
+net.minecraft.client.main.GameConfig$GameData -> dus$b:
     boolean demo -> a
     java.lang.String launchVersion -> b
     java.lang.String versionType -> c
-    33:37:void <init>(boolean,java.lang.String,java.lang.String) -> <init>
-net.minecraft.client.main.GameConfig$ServerData -> djy$c:
+    boolean disableMultiplayer -> d
+    boolean disableChat -> e
+    35:41:void <init>(boolean,java.lang.String,java.lang.String,boolean,boolean) -> <init>
+net.minecraft.client.main.GameConfig$ServerData -> dus$c:
     java.lang.String hostname -> a
     int port -> b
-    78:81:void <init>(java.lang.String,int) -> <init>
-net.minecraft.client.main.GameConfig$UserData -> djy$d:
+    82:85:void <init>(java.lang.String,int) -> <init>
+net.minecraft.client.main.GameConfig$UserData -> dus$d:
     net.minecraft.client.User user -> a
     com.mojang.authlib.properties.PropertyMap userProperties -> b
     com.mojang.authlib.properties.PropertyMap profileProperties -> c
     java.net.Proxy proxy -> d
-    46:51:void <init>(net.minecraft.client.User,com.mojang.authlib.properties.PropertyMap,com.mojang.authlib.properties.PropertyMap,java.net.Proxy) -> <init>
+    50:55:void <init>(net.minecraft.client.User,com.mojang.authlib.properties.PropertyMap,com.mojang.authlib.properties.PropertyMap,java.net.Proxy) -> <init>
 net.minecraft.client.main.Main -> net.minecraft.client.main.Main:
     org.apache.logging.log4j.Logger LOGGER -> a
-    35:35:void <init>() -> <init>
-    45:220:void main(java.lang.String[]) -> main
-    223:223:java.util.OptionalInt ofNullable(java.lang.Integer) -> a
-    229:238:java.lang.Object parseArgument(joptsimple.OptionSet,joptsimple.OptionSpec) -> a
-    243:243:boolean stringHasValue(java.lang.String) -> a
-    35:35:org.apache.logging.log4j.Logger access$000() -> a
-    36:41:void <clinit>() -> <clinit>
+    36:36:void <init>() -> <init>
+    46:231:void main(java.lang.String[]) -> main
+    234:234:java.util.OptionalInt ofNullable(java.lang.Integer) -> a
+    240:249:java.lang.Object parseArgument(joptsimple.OptionSet,joptsimple.OptionSpec) -> a
+    254:254:boolean stringHasValue(java.lang.String) -> a
+    36:36:org.apache.logging.log4j.Logger access$000() -> a
+    37:42:void <clinit>() -> <clinit>
 net.minecraft.client.main.Main$1 -> net.minecraft.client.main.Main$1:
     java.lang.String val$proxyUser -> a
     java.lang.String val$proxyPass -> b
-    96:96:void <init>(java.lang.String,java.lang.String) -> <init>
-    99:99:java.net.PasswordAuthentication getPasswordAuthentication() -> getPasswordAuthentication
+    100:100:void <init>(java.lang.String,java.lang.String) -> <init>
+    103:103:java.net.PasswordAuthentication getPasswordAuthentication() -> getPasswordAuthentication
 net.minecraft.client.main.Main$2 -> net.minecraft.client.main.Main$2:
-    140:140:void <init>(java.lang.String) -> <init>
-    143:152:void run() -> run
+    151:151:void <init>(java.lang.String) -> <init>
+    154:163:void run() -> run
 net.minecraft.client.main.Main$3 -> net.minecraft.client.main.Main$3:
     net.minecraft.client.Minecraft val$minecraft -> a
-    181:181:void <init>(java.lang.String,net.minecraft.client.Minecraft) -> <init>
-    185:190:void run() -> run
-net.minecraft.client.main.SilentInitException -> djz:
+    192:192:void <init>(java.lang.String,net.minecraft.client.Minecraft) -> <init>
+    196:201:void run() -> run
+net.minecraft.client.main.SilentInitException -> dut:
     8:9:void <init>(java.lang.String) -> <init>
     12:13:void <init>(java.lang.String,java.lang.Throwable) -> <init>
-net.minecraft.client.main.package-info -> dka:
-net.minecraft.client.map.Map -> dkb:
+net.minecraft.client.main.package-info -> duu:
+net.minecraft.client.map.Map -> duv:
     org.apache.logging.log4j.Logger LOGGER -> e
     java.awt.image.BufferedImage image -> f
-    int[] pixels -> g
-    int w -> h
-    int h -> i
-    int scale -> j
+    int w -> g
+    int h -> h
+    double scale -> i
+    double newScale -> j
     int xMouse -> k
     int yMouse -> l
     int xCam -> a
     int yCam -> b
-    boolean redraw -> m
-    net.minecraft.world.level.newbiome.layer.Layer layer -> n
-    long lastUpdate -> o
-    java.lang.String hovered -> p
-    java.lang.String teleportCommand -> q
+    long seed -> m
+    java.util.List updates -> n
+    java.lang.String hovered -> o
+    java.lang.String teleportCommand -> p
     java.util.Map COLOR -> c
     java.util.Map ODD_COLOR -> d
-    71:72:void setColor(net.minecraft.world.level.biome.Biome,int) -> a
-    75:77:void setColor(net.minecraft.world.level.biome.Biome,int,int) -> a
-    152:219:void <init>(int,int,int) -> <init>
-    223:229:void setSize(int,int) -> setSize
-    232:264:void buildMapImage(int,int,int,int) -> a
-    267:273:int getColor(net.minecraft.world.level.biome.Biome) -> a
-    277:283:int getOddColor(net.minecraft.world.level.biome.Biome) -> b
-    288:302:void paint(java.awt.Graphics) -> paint
-    305:322:void main(java.lang.String[]) -> a
-    326:326:void lostOwnership(java.awt.datatransfer.Clipboard,java.awt.datatransfer.Transferable) -> lostOwnership
-    330:356:void actionPerformed(java.awt.event.ActionEvent) -> actionPerformed
-    44:44:java.lang.String access$000(net.minecraft.client.map.Map) -> a
-    44:44:int access$102(net.minecraft.client.map.Map,int) -> a
-    44:44:int access$200(net.minecraft.client.map.Map) -> b
-    44:44:int access$302(net.minecraft.client.map.Map,int) -> b
-    44:44:int access$100(net.minecraft.client.map.Map) -> c
-    44:44:int access$300(net.minecraft.client.map.Map) -> d
-    44:44:boolean access$402(net.minecraft.client.map.Map,boolean) -> a
-    44:44:net.minecraft.world.level.newbiome.layer.Layer access$500(net.minecraft.client.map.Map) -> e
-    44:44:int access$600(net.minecraft.client.map.Map) -> f
-    44:44:int access$700(net.minecraft.client.map.Map) -> g
-    44:44:java.lang.String access$802(net.minecraft.client.map.Map,java.lang.String) -> a
-    44:44:java.lang.String access$002(net.minecraft.client.map.Map,java.lang.String) -> b
-    46:150:void <clinit>() -> <clinit>
-net.minecraft.client.map.Map$1 -> dkb$1:
+    java.util.HashMap distCount -> q
+    java.lang.String lastDistData -> r
+    81:82:void setColor(net.minecraft.world.level.biome.Biome,int) -> a
+    85:87:void setColor(net.minecraft.world.level.biome.Biome,int,int) -> a
+    70:234:void <init>(int,int,double) -> <init>
+    237:237:double getNewScale() -> a
+    242:248:void setSize(int,int) -> setSize
+    251:302:void invalidateAndUpdate() -> b
+    305:313:net.minecraft.world.level.biome.BiomeSource makeBiomeSource(long) -> a
+    317:323:int getColor(net.minecraft.world.level.biome.Biome) -> a
+    327:333:int getOddColor(net.minecraft.world.level.biome.Biome) -> b
+    338:373:void paint(java.awt.Graphics) -> paint
+    376:394:void main(java.lang.String[]) -> a
+    398:398:void lostOwnership(java.awt.datatransfer.Clipboard,java.awt.datatransfer.Transferable) -> lostOwnership
+    402:420:void actionPerformed(java.awt.event.ActionEvent) -> actionPerformed
+    282:299:com.mojang.datafixers.util.Pair lambda$invalidateAndUpdate$3(int,int,net.minecraft.world.level.biome.BiomeSource,int,int,int[]) -> a
+    298:298:void lambda$null$2(int[],int[],int,int) -> a
+    266:269:void lambda$invalidateAndUpdate$1(java.util.concurrent.CompletableFuture) -> a
+    207:207:void lambda$new$0(java.awt.event.MouseWheelEvent) -> a
+    53:53:java.lang.String access$000(net.minecraft.client.map.Map) -> a
+    53:53:java.lang.String access$102(net.minecraft.client.map.Map,java.lang.String) -> a
+    53:53:java.lang.String access$100(net.minecraft.client.map.Map) -> b
+    53:53:long access$202(net.minecraft.client.map.Map,long) -> a
+    53:53:void access$300(net.minecraft.client.map.Map) -> c
+    53:53:double access$402(net.minecraft.client.map.Map,double) -> a
+    53:53:double access$502(net.minecraft.client.map.Map,double) -> b
+    53:53:int access$602(net.minecraft.client.map.Map,int) -> a
+    53:53:double access$400(net.minecraft.client.map.Map) -> d
+    53:53:int access$702(net.minecraft.client.map.Map,int) -> b
+    53:53:int access$600(net.minecraft.client.map.Map) -> e
+    53:53:int access$700(net.minecraft.client.map.Map) -> f
+    55:165:void <clinit>() -> <clinit>
+net.minecraft.client.map.Map$1 -> duv$1:
     net.minecraft.client.map.Map this$0 -> a
-    161:161:void <init>(net.minecraft.client.map.Map) -> <init>
-    164:171:void mouseClicked(java.awt.event.MouseEvent) -> mouseClicked
-    175:177:void mousePressed(java.awt.event.MouseEvent) -> mousePressed
-net.minecraft.client.map.Map$2 -> dkb$2:
+    177:177:void <init>(net.minecraft.client.map.Map) -> <init>
+    180:198:void mouseClicked(java.awt.event.MouseEvent) -> mouseClicked
+    202:204:void mousePressed(java.awt.event.MouseEvent) -> mousePressed
+net.minecraft.client.map.Map$2 -> duv$2:
     net.minecraft.client.map.Map this$0 -> a
-    179:179:void <init>(net.minecraft.client.map.Map) -> <init>
-    182:188:void mouseDragged(java.awt.event.MouseEvent) -> mouseDragged
-    192:209:void mouseMoved(java.awt.event.MouseEvent) -> mouseMoved
-net.minecraft.client.map.Map$3 -> dkb$3:
+    209:209:void <init>(net.minecraft.client.map.Map) -> <init>
+    212:218:void mouseDragged(java.awt.event.MouseEvent) -> mouseDragged
+    222:224:void mouseMoved(java.awt.event.MouseEvent) -> mouseMoved
+net.minecraft.client.map.Map$3 -> duv$3:
     net.minecraft.client.map.Map this$0 -> a
-    211:211:void <init>(net.minecraft.client.map.Map) -> <init>
-    214:215:void componentResized(java.awt.event.ComponentEvent) -> componentResized
-net.minecraft.client.map.package-info -> dkc:
-net.minecraft.client.model.AbstractZombieModel -> dkd:
-    8:9:void <init>(float,float,int,int) -> <init>
-    13:34:void setupAnim(net.minecraft.world.entity.monster.Monster,float,float,float,float,float) -> a
+    226:226:void <init>(net.minecraft.client.map.Map) -> <init>
+    229:230:void componentResized(java.awt.event.ComponentEvent) -> componentResized
+net.minecraft.client.map.package-info -> duw:
+net.minecraft.client.model.AbstractZombieModel -> dux:
+    7:8:void <init>(float,float,int,int) -> <init>
+    12:14:void setupAnim(net.minecraft.world.entity.monster.Monster,float,float,float,float,float) -> a
     boolean isAggressive(net.minecraft.world.entity.monster.Monster) -> a
-    6:6:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
-    6:6:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.AgeableListModel -> dke:
+    5:5:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
+    5:5:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
+net.minecraft.client.model.AgeableListModel -> duy:
     boolean scaleHead -> a
     float yHeadOffset -> b
     float zHeadOffset -> f
@@ -11261,15 +11990,22 @@ net.minecraft.client.model.AgeableListModel -> dke:
     62:62:void lambda$renderToBuffer$2(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> b
     59:59:void lambda$renderToBuffer$1(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> c
     52:52:void lambda$renderToBuffer$0(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> d
-net.minecraft.client.model.ArmedModel -> dkf:
+net.minecraft.client.model.AnimationUtils -> duz:
+    13:13:void <init>() -> <init>
+    18:25:void animateCrossbowHold(net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,boolean) -> a
+    31:44:void animateCrossbowCharge(net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.world.entity.LivingEntity,boolean) -> a
+    47:69:void swingWeaponDown(net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.world.entity.Mob,float,float) -> a
+    72:76:void bobArms(net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,float) -> a
+    82:97:void animateZombieArms(net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,boolean,float,float) -> a
+net.minecraft.client.model.ArmedModel -> dva:
     void translateToHand(net.minecraft.world.entity.HumanoidArm,com.mojang.blaze3d.vertex.PoseStack) -> a
-net.minecraft.client.model.ArmorStandArmorModel -> dkg:
+net.minecraft.client.model.ArmorStandArmorModel -> dvb:
     8:9:void <init>(float) -> <init>
     12:13:void <init>(float,int,int) -> <init>
     17:45:void setupAnim(net.minecraft.world.entity.decoration.ArmorStand,float,float,float,float,float) -> a
     6:6:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
     6:6:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.ArmorStandModel -> dkh:
+net.minecraft.client.model.ArmorStandModel -> dvc:
     net.minecraft.client.model.geom.ModelPart bodyStick1 -> a
     net.minecraft.client.model.geom.ModelPart bodyStick2 -> b
     net.minecraft.client.model.geom.ModelPart shoulderStick -> t
@@ -11284,7 +12020,7 @@ net.minecraft.client.model.ArmorStandModel -> dkh:
     11:11:void prepareMobModel(net.minecraft.world.entity.LivingEntity,float,float,float) -> a
     11:11:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     11:11:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.BatModel -> dki:
+net.minecraft.client.model.BatModel -> dvd:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart body -> b
     net.minecraft.client.model.geom.ModelPart rightWing -> f
@@ -11295,7 +12031,7 @@ net.minecraft.client.model.BatModel -> dki:
     57:57:java.lang.Iterable parts() -> a
     62:96:void setupAnim(net.minecraft.world.entity.ambient.Bat,float,float,float,float,float) -> a
     8:8:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.BeeModel -> dkj:
+net.minecraft.client.model.BeeModel -> dve:
     net.minecraft.client.model.geom.ModelPart bone -> a
     net.minecraft.client.model.geom.ModelPart body -> b
     net.minecraft.client.model.geom.ModelPart rightWing -> f
@@ -11314,14 +12050,14 @@ net.minecraft.client.model.BeeModel -> dkj:
     166:166:java.lang.Iterable bodyParts() -> b
     9:9:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     9:9:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.BlazeModel -> dkk:
+net.minecraft.client.model.BlazeModel -> dvf:
     net.minecraft.client.model.geom.ModelPart[] upperBodyParts -> a
     net.minecraft.client.model.geom.ModelPart head -> b
     com.google.common.collect.ImmutableList parts -> f
     16:32:void <init>() -> <init>
     36:36:java.lang.Iterable parts() -> a
     41:67:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.BoatModel -> dkl:
+net.minecraft.client.model.BoatModel -> dvg:
     net.minecraft.client.model.geom.ModelPart[] paddles -> a
     net.minecraft.client.model.geom.ModelPart waterPatch -> b
     com.google.common.collect.ImmutableList parts -> f
@@ -11333,7 +12069,7 @@ net.minecraft.client.model.BoatModel -> dkl:
     101:110:void animatePaddle(net.minecraft.world.entity.vehicle.Boat,int,float) -> a
     10:10:java.lang.Iterable parts() -> a
     10:10:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.BookModel -> dkm:
+net.minecraft.client.model.BookModel -> dvh:
     net.minecraft.client.model.geom.ModelPart leftLid -> a
     net.minecraft.client.model.geom.ModelPart rightLid -> b
     net.minecraft.client.model.geom.ModelPart leftPages -> c
@@ -11347,7 +12083,7 @@ net.minecraft.client.model.BookModel -> dkm:
     49:50:void render(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> b
     53:67:void setupAnim(float,float,float,float) -> a
     49:49:void lambda$render$0(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> a
-net.minecraft.client.model.CatModel -> dkn:
+net.minecraft.client.model.CatModel -> dvi:
     float lieDownAmount -> m
     float lieDownAmountTail -> n
     float relaxStateOneAmount -> o
@@ -11356,7 +12092,7 @@ net.minecraft.client.model.CatModel -> dkn:
     74:96:void setupAnim(net.minecraft.world.entity.animal.Cat,float,float,float,float,float) -> a
     6:6:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     6:6:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.ChestedHorseModel -> dko:
+net.minecraft.client.model.ChestedHorseModel -> dvj:
     net.minecraft.client.model.geom.ModelPart boxL -> f
     net.minecraft.client.model.geom.ModelPart boxR -> g
     12:25:void <init>(float) -> <init>
@@ -11364,7 +12100,7 @@ net.minecraft.client.model.ChestedHorseModel -> dko:
     47:55:void setupAnim(net.minecraft.world.entity.animal.horse.AbstractChestedHorse,float,float,float,float,float) -> a
     7:7:void setupAnim(net.minecraft.world.entity.animal.horse.AbstractHorse,float,float,float,float,float) -> a
     7:7:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.ChickenModel -> dkp:
+net.minecraft.client.model.ChickenModel -> dvk:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart body -> b
     net.minecraft.client.model.geom.ModelPart leg0 -> f
@@ -11377,7 +12113,7 @@ net.minecraft.client.model.ChickenModel -> dkp:
     55:55:java.lang.Iterable headParts() -> a
     60:60:java.lang.Iterable bodyParts() -> b
     65:80:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.CodModel -> dkq:
+net.minecraft.client.model.CodModel -> dvl:
     net.minecraft.client.model.geom.ModelPart body -> a
     net.minecraft.client.model.geom.ModelPart topFin -> b
     net.minecraft.client.model.geom.ModelPart head -> f
@@ -11388,24 +12124,24 @@ net.minecraft.client.model.CodModel -> dkq:
     17:52:void <init>() -> <init>
     56:56:java.lang.Iterable parts() -> a
     61:66:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.ColorableAgeableListModel -> dkr:
+net.minecraft.client.model.ColorableAgeableListModel -> dvm:
     float r -> a
     float g -> b
     float b -> f
     7:10:void <init>() -> <init>
     13:16:void setColor(float,float,float) -> a
     20:21:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
-net.minecraft.client.model.ColorableListModel -> dks:
+net.minecraft.client.model.ColorableListModel -> dvn:
     float r -> a
     float g -> b
     float b -> f
     7:10:void <init>() -> <init>
     13:16:void setColor(float,float,float) -> a
     20:21:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
-net.minecraft.client.model.CowModel -> dkt:
+net.minecraft.client.model.CowModel -> dvo:
     8:30:void <init>() -> <init>
     33:33:net.minecraft.client.model.geom.ModelPart getHead() -> c
-net.minecraft.client.model.CreeperModel -> dku:
+net.minecraft.client.model.CreeperModel -> dvp:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart hair -> b
     net.minecraft.client.model.geom.ModelPart body -> f
@@ -11417,14 +12153,14 @@ net.minecraft.client.model.CreeperModel -> dku:
     21:52:void <init>(float) -> <init>
     56:56:java.lang.Iterable parts() -> a
     61:68:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.DolphinModel -> dkv:
+net.minecraft.client.model.DolphinModel -> dvq:
     net.minecraft.client.model.geom.ModelPart body -> a
     net.minecraft.client.model.geom.ModelPart tail -> b
     net.minecraft.client.model.geom.ModelPart tailFin -> f
     14:59:void <init>() -> <init>
     63:63:java.lang.Iterable parts() -> a
     68:76:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.DrownedModel -> dkw:
+net.minecraft.client.model.DrownedModel -> dvr:
     13:22:void <init>(float,float,int,int) -> <init>
     25:26:void <init>(float,boolean) -> <init>
     30:43:void prepareMobModel(net.minecraft.world.entity.monster.Zombie,float,float,float) -> a
@@ -11434,7 +12170,7 @@ net.minecraft.client.model.DrownedModel -> dkw:
     11:11:void prepareMobModel(net.minecraft.world.entity.LivingEntity,float,float,float) -> a
     11:11:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     11:11:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.ElytraModel -> dkx:
+net.minecraft.client.model.ElytraModel -> dvs:
     net.minecraft.client.model.geom.ModelPart rightWing -> a
     net.minecraft.client.model.geom.ModelPart leftWing -> b
     14:20:void <init>() -> <init>
@@ -11442,13 +12178,13 @@ net.minecraft.client.model.ElytraModel -> dkx:
     29:29:java.lang.Iterable bodyParts() -> b
     34:79:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
     10:10:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.EndermanModel -> dky:
+net.minecraft.client.model.EndermanModel -> dvt:
     boolean carrying -> a
     boolean creepy -> b
     11:40:void <init>(float) -> <init>
     44:120:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
     6:6:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.EndermiteModel -> dkz:
+net.minecraft.client.model.EndermiteModel -> dvu:
     int[][] BODY_SIZES -> a
     int[][] BODY_TEXS -> b
     int BODY_COUNT -> f
@@ -11457,7 +12193,7 @@ net.minecraft.client.model.EndermiteModel -> dkz:
     43:43:java.lang.Iterable parts() -> a
     48:52:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     10:24:void <clinit>() -> <clinit>
-net.minecraft.client.model.EntityModel -> dla:
+net.minecraft.client.model.EntityModel -> dvv:
     float attackTime -> c
     boolean riding -> d
     boolean young -> e
@@ -11466,14 +12202,14 @@ net.minecraft.client.model.EntityModel -> dla:
     void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     25:25:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     29:32:void copyPropertiesTo(net.minecraft.client.model.EntityModel) -> a
-net.minecraft.client.model.EvokerFangsModel -> dlb:
+net.minecraft.client.model.EvokerFangsModel -> dvw:
     net.minecraft.client.model.geom.ModelPart base -> a
     net.minecraft.client.model.geom.ModelPart upperJaw -> b
     net.minecraft.client.model.geom.ModelPart lowerJaw -> f
     13:25:void <init>() -> <init>
     29:42:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     46:46:java.lang.Iterable parts() -> a
-net.minecraft.client.model.FoxModel -> dlc:
+net.minecraft.client.model.FoxModel -> dvx:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart earL -> b
     net.minecraft.client.model.geom.ModelPart earR -> f
@@ -11492,18 +12228,18 @@ net.minecraft.client.model.FoxModel -> dlc:
     157:188:void setupAnim(net.minecraft.world.entity.animal.Fox,float,float,float,float,float) -> a
     8:8:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     8:8:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.GhastModel -> dld:
+net.minecraft.client.model.GhastModel -> dvy:
     net.minecraft.client.model.geom.ModelPart[] tentacles -> a
     com.google.common.collect.ImmutableList parts -> b
     11:39:void <init>() -> <init>
     43:46:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     50:50:java.lang.Iterable parts() -> a
-net.minecraft.client.model.GiantZombieModel -> dle:
+net.minecraft.client.model.GiantZombieModel -> dvz:
     7:8:void <init>() -> <init>
     11:12:void <init>(float,boolean) -> <init>
     16:16:boolean isAggressive(net.minecraft.world.entity.monster.Giant) -> a
     5:5:boolean isAggressive(net.minecraft.world.entity.monster.Monster) -> a
-net.minecraft.client.model.GuardianModel -> dlf:
+net.minecraft.client.model.GuardianModel -> dwa:
     float[] SPIKE_X_ROT -> a
     float[] SPIKE_Y_ROT -> b
     float[] SPIKE_Z_ROT -> f
@@ -11520,9 +12256,24 @@ net.minecraft.client.model.GuardianModel -> dlf:
     116:124:void setupSpikes(float,float) -> a
     11:11:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     12:17:void <clinit>() -> <clinit>
-net.minecraft.client.model.HeadedModel -> dlg:
+net.minecraft.client.model.HeadedModel -> dwb:
     net.minecraft.client.model.geom.ModelPart getHead() -> c
-net.minecraft.client.model.HorseModel -> dlh:
+net.minecraft.client.model.HoglinModel -> dwc:
+    net.minecraft.client.model.geom.ModelPart head -> a
+    net.minecraft.client.model.geom.ModelPart rightEar -> b
+    net.minecraft.client.model.geom.ModelPart leftEar -> f
+    net.minecraft.client.model.geom.ModelPart body -> g
+    net.minecraft.client.model.geom.ModelPart frontRightLeg -> h
+    net.minecraft.client.model.geom.ModelPart frontLeftLeg -> i
+    net.minecraft.client.model.geom.ModelPart backRightLeg -> j
+    net.minecraft.client.model.geom.ModelPart backLeftLeg -> k
+    net.minecraft.client.model.geom.ModelPart mane -> l
+    24:79:void <init>() -> <init>
+    83:83:java.lang.Iterable headParts() -> a
+    88:88:java.lang.Iterable bodyParts() -> b
+    93:118:void setupAnim(net.minecraft.world.entity.Mob,float,float,float,float,float) -> a
+    9:9:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
+net.minecraft.client.model.HorseModel -> dwd:
     net.minecraft.client.model.geom.ModelPart body -> a
     net.minecraft.client.model.geom.ModelPart headParts -> b
     net.minecraft.client.model.geom.ModelPart leg1 -> f
@@ -11544,12 +12295,12 @@ net.minecraft.client.model.HorseModel -> dlh:
     172:272:void prepareMobModel(net.minecraft.world.entity.animal.horse.AbstractHorse,float,float,float) -> a
     8:8:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     8:8:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.HumanoidHeadModel -> dli:
+net.minecraft.client.model.HumanoidHeadModel -> dwe:
     net.minecraft.client.model.geom.ModelPart hat -> b
     11:16:void <init>() -> <init>
     20:24:void setupAnim(float,float,float) -> a
     28:30:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
-net.minecraft.client.model.HumanoidModel -> dlj:
+net.minecraft.client.model.HumanoidModel -> dwf:
     net.minecraft.client.model.geom.ModelPart head -> f
     net.minecraft.client.model.geom.ModelPart hat -> g
     net.minecraft.client.model.geom.ModelPart body -> h
@@ -11561,28 +12312,30 @@ net.minecraft.client.model.HumanoidModel -> dlj:
     net.minecraft.client.model.HumanoidModel$ArmPose rightArmPose -> n
     boolean crouching -> o
     float swimAmount -> p
-    float itemUseTicks -> a
-    45:46:void <init>(float) -> <init>
-    49:50:void <init>(float,float,int,int) -> <init>
-    38:86:void <init>(java.util.function.Function,float,float,int,int) -> <init>
-    90:90:java.lang.Iterable headParts() -> a
-    95:95:java.lang.Iterable bodyParts() -> b
-    100:103:void prepareMobModel(net.minecraft.world.entity.LivingEntity,float,float,float) -> a
-    107:355:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
-    358:365:float rotlerpRad(float,float,float) -> a
-    369:369:float quadraticArmUpdate(float) -> a
-    373:378:void copyPropertiesTo(net.minecraft.client.model.HumanoidModel) -> a
-    381:388:void setAllVisible(boolean) -> b_
-    392:393:void translateToHand(net.minecraft.world.entity.HumanoidArm,com.mojang.blaze3d.vertex.PoseStack) -> a
-    396:399:net.minecraft.client.model.geom.ModelPart getArm(net.minecraft.world.entity.HumanoidArm) -> a
-    405:405:net.minecraft.client.model.geom.ModelPart getHead() -> c
-    409:410:net.minecraft.world.entity.HumanoidArm getAttackArm(net.minecraft.world.entity.LivingEntity) -> a
-    16:16:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
-    16:16:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.HumanoidModel$1 -> dlj$1:
+    54:55:void <init>(float) -> <init>
+    58:59:void <init>(float,float,int,int) -> <init>
+    48:95:void <init>(java.util.function.Function,float,float,int,int) -> <init>
+    99:99:java.lang.Iterable headParts() -> a
+    104:104:java.lang.Iterable bodyParts() -> b
+    109:111:void prepareMobModel(net.minecraft.world.entity.LivingEntity,float,float,float) -> a
+    115:263:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
+    266:295:void poseRightArm(net.minecraft.world.entity.LivingEntity) -> b
+    298:327:void poseLeftArm(net.minecraft.world.entity.LivingEntity) -> c
+    330:359:void setupAttackAnimation(net.minecraft.world.entity.LivingEntity,float) -> a
+    362:369:float rotlerpRad(float,float,float) -> a
+    373:373:float quadraticArmUpdate(float) -> a
+    377:390:void copyPropertiesTo(net.minecraft.client.model.HumanoidModel) -> a
+    393:400:void setAllVisible(boolean) -> d_
+    404:405:void translateToHand(net.minecraft.world.entity.HumanoidArm,com.mojang.blaze3d.vertex.PoseStack) -> a
+    408:411:net.minecraft.client.model.geom.ModelPart getArm(net.minecraft.world.entity.HumanoidArm) -> a
+    417:417:net.minecraft.client.model.geom.ModelPart getHead() -> c
+    421:422:net.minecraft.world.entity.HumanoidArm getAttackArm(net.minecraft.world.entity.LivingEntity) -> a
+    15:15:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
+    15:15:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
+net.minecraft.client.model.HumanoidModel$1 -> dwf$1:
     int[] $SwitchMap$net$minecraft$client$model$HumanoidModel$ArmPose -> a
-    168:168:void <clinit>() -> <clinit>
-net.minecraft.client.model.HumanoidModel$ArmPose -> dlj$a:
+    266:266:void <clinit>() -> <clinit>
+net.minecraft.client.model.HumanoidModel$ArmPose -> dwf$a:
     net.minecraft.client.model.HumanoidModel$ArmPose EMPTY -> a
     net.minecraft.client.model.HumanoidModel$ArmPose ITEM -> b
     net.minecraft.client.model.HumanoidModel$ArmPose BLOCK -> c
@@ -11590,12 +12343,14 @@ net.minecraft.client.model.HumanoidModel$ArmPose -> dlj$a:
     net.minecraft.client.model.HumanoidModel$ArmPose THROW_SPEAR -> e
     net.minecraft.client.model.HumanoidModel$ArmPose CROSSBOW_CHARGE -> f
     net.minecraft.client.model.HumanoidModel$ArmPose CROSSBOW_HOLD -> g
-    net.minecraft.client.model.HumanoidModel$ArmPose[] $VALUES -> h
-    20:20:net.minecraft.client.model.HumanoidModel$ArmPose[] values() -> values
-    20:20:net.minecraft.client.model.HumanoidModel$ArmPose valueOf(java.lang.String) -> valueOf
-    20:20:void <init>(java.lang.String,int) -> <init>
-    20:27:void <clinit>() -> <clinit>
-net.minecraft.client.model.IllagerModel -> dlk:
+    boolean twoHanded -> h
+    net.minecraft.client.model.HumanoidModel$ArmPose[] $VALUES -> i
+    19:19:net.minecraft.client.model.HumanoidModel$ArmPose[] values() -> values
+    19:19:net.minecraft.client.model.HumanoidModel$ArmPose valueOf(java.lang.String) -> valueOf
+    31:33:void <init>(java.lang.String,int,boolean) -> <init>
+    36:36:boolean isTwoHanded() -> a
+    19:26:void <clinit>() -> <clinit>
+net.minecraft.client.model.IllagerModel -> dwg:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart hat -> b
     net.minecraft.client.model.geom.ModelPart body -> f
@@ -11604,18 +12359,15 @@ net.minecraft.client.model.IllagerModel -> dlk:
     net.minecraft.client.model.geom.ModelPart rightLeg -> i
     net.minecraft.client.model.geom.ModelPart rightArm -> j
     net.minecraft.client.model.geom.ModelPart leftArm -> k
-    float itemUseTicks -> l
-    24:69:void <init>(float,float,int,int) -> <init>
-    73:73:java.lang.Iterable parts() -> a
-    78:196:void setupAnim(net.minecraft.world.entity.monster.AbstractIllager,float,float,float,float,float) -> a
-    200:202:void prepareMobModel(net.minecraft.world.entity.monster.AbstractIllager,float,float,float) -> a
-    205:208:net.minecraft.client.model.geom.ModelPart getArm(net.minecraft.world.entity.HumanoidArm) -> a
-    213:213:net.minecraft.client.model.geom.ModelPart getHat() -> b
-    218:218:net.minecraft.client.model.geom.ModelPart getHead() -> c
-    223:224:void translateToHand(net.minecraft.world.entity.HumanoidArm,com.mojang.blaze3d.vertex.PoseStack) -> a
-    12:12:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
-    12:12:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.IronGolemModel -> dll:
+    21:66:void <init>(float,float,int,int) -> <init>
+    70:70:java.lang.Iterable parts() -> a
+    75:160:void setupAnim(net.minecraft.world.entity.monster.AbstractIllager,float,float,float,float,float) -> a
+    163:166:net.minecraft.client.model.geom.ModelPart getArm(net.minecraft.world.entity.HumanoidArm) -> a
+    171:171:net.minecraft.client.model.geom.ModelPart getHat() -> b
+    176:176:net.minecraft.client.model.geom.ModelPart getHead() -> c
+    181:182:void translateToHand(net.minecraft.world.entity.HumanoidArm,com.mojang.blaze3d.vertex.PoseStack) -> a
+    11:11:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
+net.minecraft.client.model.IronGolemModel -> dwh:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart body -> b
     net.minecraft.client.model.geom.ModelPart arm0 -> f
@@ -11626,11 +12378,10 @@ net.minecraft.client.model.IronGolemModel -> dll:
     50:50:java.lang.Iterable parts() -> a
     55:62:void setupAnim(net.minecraft.world.entity.animal.IronGolem,float,float,float,float,float) -> a
     66:80:void prepareMobModel(net.minecraft.world.entity.animal.IronGolem,float,float,float) -> a
-    83:83:float triangleWave(float,float) -> a
-    87:87:net.minecraft.client.model.geom.ModelPart getFlowerHoldingArm() -> b
+    83:83:net.minecraft.client.model.geom.ModelPart getFlowerHoldingArm() -> b
     8:8:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     8:8:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.LavaSlimeModel -> dlm:
+net.minecraft.client.model.LavaSlimeModel -> dwi:
     net.minecraft.client.model.geom.ModelPart[] bodyCubes -> a
     net.minecraft.client.model.geom.ModelPart insideCube -> b
     com.google.common.collect.ImmutableList parts -> f
@@ -11641,17 +12392,18 @@ net.minecraft.client.model.LavaSlimeModel -> dlm:
     10:10:java.lang.Iterable parts() -> a
     10:10:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     10:10:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.LeashKnotModel -> dln:
+net.minecraft.client.model.LeashKnotModel -> dwj:
     net.minecraft.client.model.geom.ModelPart knot -> a
     11:17:void <init>() -> <init>
     21:21:java.lang.Iterable parts() -> a
     26:28:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.ListModel -> dlo:
-    8:8:void <init>() -> <init>
-    11:12:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
+net.minecraft.client.model.ListModel -> dwk:
+    14:15:void <init>() -> <init>
+    18:19:void <init>(java.util.function.Function) -> <init>
+    23:24:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
     java.lang.Iterable parts() -> a
-    11:11:void lambda$renderToBuffer$0(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> a
-net.minecraft.client.model.LlamaModel -> dlp:
+    23:23:void lambda$renderToBuffer$0(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> a
+net.minecraft.client.model.LlamaModel -> dwl:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart body -> b
     net.minecraft.client.model.geom.ModelPart leg0 -> f
@@ -11666,18 +12418,18 @@ net.minecraft.client.model.LlamaModel -> dlp:
     10:10:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     114:114:void lambda$renderToBuffer$1(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> a
     111:111:void lambda$renderToBuffer$0(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> b
-net.minecraft.client.model.LlamaSpitModel -> dlq:
+net.minecraft.client.model.LlamaSpitModel -> dwm:
     net.minecraft.client.model.geom.ModelPart main -> a
     11:12:void <init>() -> <init>
     14:26:void <init>(float) -> <init>
     30:30:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     34:34:java.lang.Iterable parts() -> a
-net.minecraft.client.model.MinecartModel -> dlr:
+net.minecraft.client.model.MinecartModel -> dwn:
     net.minecraft.client.model.geom.ModelPart[] cubes -> a
     10:48:void <init>() -> <init>
     52:53:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     57:57:java.lang.Iterable parts() -> a
-net.minecraft.client.model.Model -> dls:
+net.minecraft.client.model.Model -> dwo:
     java.util.function.Function renderType -> q
     int texWidth -> r
     int texHeight -> s
@@ -11686,10 +12438,10 @@ net.minecraft.client.model.Model -> dls:
     26:26:net.minecraft.client.renderer.RenderType renderType(net.minecraft.resources.ResourceLocation) -> a
     void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
     12:12:void accept(java.lang.Object) -> accept
-net.minecraft.client.model.ModelUtils -> dlt:
+net.minecraft.client.model.ModelUtils -> dwp:
     5:5:void <init>() -> <init>
     7:14:float rotlerpRad(float,float,float) -> a
-net.minecraft.client.model.OcelotModel -> dlu:
+net.minecraft.client.model.OcelotModel -> dwq:
     net.minecraft.client.model.geom.ModelPart backLegL -> a
     net.minecraft.client.model.geom.ModelPart backLegR -> b
     net.minecraft.client.model.geom.ModelPart frontLegL -> f
@@ -11704,7 +12456,7 @@ net.minecraft.client.model.OcelotModel -> dlu:
     89:89:java.lang.Iterable bodyParts() -> b
     94:118:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     122:158:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
-net.minecraft.client.model.PandaModel -> dlv:
+net.minecraft.client.model.PandaModel -> dwr:
     float sitAmount -> j
     float lieOnBackAmount -> k
     float rollAmount -> l
@@ -11713,7 +12465,7 @@ net.minecraft.client.model.PandaModel -> dlv:
     63:138:void setupAnim(net.minecraft.world.entity.animal.Panda,float,float,float,float,float) -> a
     7:7:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     7:7:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
-net.minecraft.client.model.ParrotModel -> dlw:
+net.minecraft.client.model.ParrotModel -> dws:
     net.minecraft.client.model.geom.ModelPart body -> a
     net.minecraft.client.model.geom.ModelPart tail -> b
     net.minecraft.client.model.geom.ModelPart wingLeft -> f
@@ -11736,10 +12488,10 @@ net.minecraft.client.model.ParrotModel -> dlw:
     10:10:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     10:10:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     94:94:void lambda$renderOnShoulder$0(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,net.minecraft.client.model.geom.ModelPart) -> a
-net.minecraft.client.model.ParrotModel$1 -> dlw$1:
+net.minecraft.client.model.ParrotModel$1 -> dws$1:
     int[] $SwitchMap$net$minecraft$client$model$ParrotModel$State -> a
     110:110:void <clinit>() -> <clinit>
-net.minecraft.client.model.ParrotModel$State -> dlw$a:
+net.minecraft.client.model.ParrotModel$State -> dws$a:
     net.minecraft.client.model.ParrotModel$State FLYING -> a
     net.minecraft.client.model.ParrotModel$State STANDING -> b
     net.minecraft.client.model.ParrotModel$State SITTING -> c
@@ -11750,7 +12502,7 @@ net.minecraft.client.model.ParrotModel$State -> dlw$a:
     23:23:net.minecraft.client.model.ParrotModel$State valueOf(java.lang.String) -> valueOf
     23:23:void <init>(java.lang.String,int) -> <init>
     23:28:void <clinit>() -> <clinit>
-net.minecraft.client.model.PhantomModel -> dlx:
+net.minecraft.client.model.PhantomModel -> dwt:
     net.minecraft.client.model.geom.ModelPart body -> a
     net.minecraft.client.model.geom.ModelPart leftWingBase -> b
     net.minecraft.client.model.geom.ModelPart leftWingTip -> f
@@ -11761,35 +12513,49 @@ net.minecraft.client.model.PhantomModel -> dlx:
     18:66:void <init>() -> <init>
     70:70:java.lang.Iterable parts() -> a
     75:84:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.PigModel -> dly:
+net.minecraft.client.model.PigModel -> dwu:
     7:8:void <init>() -> <init>
     11:13:void <init>(float) -> <init>
-net.minecraft.client.model.PlayerModel -> dlz:
-    java.util.List cubes -> w
-    net.minecraft.client.model.geom.ModelPart leftSleeve -> a
-    net.minecraft.client.model.geom.ModelPart rightSleeve -> b
-    net.minecraft.client.model.geom.ModelPart leftPants -> t
-    net.minecraft.client.model.geom.ModelPart rightPants -> u
-    net.minecraft.client.model.geom.ModelPart jacket -> v
-    net.minecraft.client.model.geom.ModelPart cloak -> x
+net.minecraft.client.model.PiglinModel -> dwv:
+    net.minecraft.client.model.geom.ModelPart earRight -> a
+    net.minecraft.client.model.geom.ModelPart earLeft -> b
+    net.minecraft.client.model.geom.ModelPart bodyDefault -> y
+    net.minecraft.client.model.geom.ModelPart headDefault -> z
+    net.minecraft.client.model.geom.ModelPart leftArmDefault -> A
+    net.minecraft.client.model.geom.ModelPart rightArmDefault -> B
+    19:49:void <init>(float,int,int) -> <init>
+    53:110:void setupAnim(net.minecraft.world.entity.Mob,float,float,float,float,float) -> a
+    114:119:void setupAttackAnimation(net.minecraft.world.entity.Mob,float) -> a
+    122:127:void holdWeaponHigh(net.minecraft.world.entity.Mob) -> a
+    9:9:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
+    9:9:void setupAttackAnimation(net.minecraft.world.entity.LivingEntity,float) -> a
+    9:9:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
+net.minecraft.client.model.PlayerModel -> dww:
+    java.util.List cubes -> a
+    net.minecraft.client.model.geom.ModelPart leftSleeve -> t
+    net.minecraft.client.model.geom.ModelPart rightSleeve -> u
+    net.minecraft.client.model.geom.ModelPart leftPants -> v
+    net.minecraft.client.model.geom.ModelPart rightPants -> w
+    net.minecraft.client.model.geom.ModelPart jacket -> x
+    net.minecraft.client.model.geom.ModelPart cloak -> b
     net.minecraft.client.model.geom.ModelPart ear -> y
     boolean slim -> z
-    17:85:void <init>(float,boolean) -> <init>
-    89:89:java.lang.Iterable bodyParts() -> b
-    93:97:void renderEars(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int) -> a
-    100:101:void renderCloak(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int) -> b
-    105:118:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
-    122:130:void setAllVisible(boolean) -> b_
-    134:143:void translateToHand(net.minecraft.world.entity.HumanoidArm,com.mojang.blaze3d.vertex.PoseStack) -> a
-    146:146:net.minecraft.client.model.geom.ModelPart getRandomModelPart(java.util.Random) -> a
-    151:155:void accept(net.minecraft.client.model.geom.ModelPart) -> b
-    16:16:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-    16:16:void accept(java.lang.Object) -> accept
-net.minecraft.client.model.PolarBearModel -> dma:
+    18:86:void <init>(float,boolean) -> <init>
+    90:90:java.lang.Iterable bodyParts() -> b
+    94:98:void renderEars(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int) -> a
+    101:102:void renderCloak(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int) -> b
+    106:131:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
+    135:143:void setAllVisible(boolean) -> d_
+    147:156:void translateToHand(net.minecraft.world.entity.HumanoidArm,com.mojang.blaze3d.vertex.PoseStack) -> a
+    159:159:net.minecraft.client.model.geom.ModelPart getRandomModelPart(java.util.Random) -> a
+    164:168:void accept(net.minecraft.client.model.geom.ModelPart) -> b
+    17:17:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
+    17:17:void accept(java.lang.Object) -> accept
+net.minecraft.client.model.PolarBearModel -> dwx:
     9:55:void <init>() -> <init>
     59:85:void setupAnim(net.minecraft.world.entity.animal.PolarBear,float,float,float,float,float) -> a
     7:7:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.PufferfishBigModel -> dmb:
+net.minecraft.client.model.PufferfishBigModel -> dwy:
     net.minecraft.client.model.geom.ModelPart cube -> a
     net.minecraft.client.model.geom.ModelPart blueFin0 -> b
     net.minecraft.client.model.geom.ModelPart blueFin1 -> f
@@ -11806,7 +12572,7 @@ net.minecraft.client.model.PufferfishBigModel -> dmb:
     23:88:void <init>() -> <init>
     92:92:java.lang.Iterable parts() -> a
     97:99:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.PufferfishMidModel -> dmc:
+net.minecraft.client.model.PufferfishMidModel -> dwz:
     net.minecraft.client.model.geom.ModelPart cube -> a
     net.minecraft.client.model.geom.ModelPart finBlue0 -> b
     net.minecraft.client.model.geom.ModelPart finBlue1 -> f
@@ -11821,7 +12587,7 @@ net.minecraft.client.model.PufferfishMidModel -> dmc:
     21:78:void <init>() -> <init>
     82:82:java.lang.Iterable parts() -> a
     87:89:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.PufferfishSmallModel -> dmd:
+net.minecraft.client.model.PufferfishSmallModel -> dxa:
     net.minecraft.client.model.geom.ModelPart cube -> a
     net.minecraft.client.model.geom.ModelPart eye0 -> b
     net.minecraft.client.model.geom.ModelPart eye1 -> f
@@ -11831,7 +12597,7 @@ net.minecraft.client.model.PufferfishSmallModel -> dmd:
     16:45:void <init>() -> <init>
     49:49:java.lang.Iterable parts() -> a
     54:56:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.QuadrupedModel -> dme:
+net.minecraft.client.model.QuadrupedModel -> dxb:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart body -> b
     net.minecraft.client.model.geom.ModelPart leg0 -> f
@@ -11842,7 +12608,7 @@ net.minecraft.client.model.QuadrupedModel -> dme:
     45:45:java.lang.Iterable headParts() -> a
     50:50:java.lang.Iterable bodyParts() -> b
     55:63:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.RabbitModel -> dmf:
+net.minecraft.client.model.RabbitModel -> dxc:
     net.minecraft.client.model.geom.ModelPart rearFootLeft -> a
     net.minecraft.client.model.geom.ModelPart rearFootRight -> b
     net.minecraft.client.model.geom.ModelPart haunchLeft -> f
@@ -11866,7 +12632,7 @@ net.minecraft.client.model.RabbitModel -> dmf:
     131:131:void lambda$renderToBuffer$2(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> a
     124:124:void lambda$renderToBuffer$1(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> b
     119:119:void lambda$renderToBuffer$0(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float,net.minecraft.client.model.geom.ModelPart) -> c
-net.minecraft.client.model.RavagerModel -> dmg:
+net.minecraft.client.model.RavagerModel -> dxd:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart mouth -> b
     net.minecraft.client.model.geom.ModelPart body -> f
@@ -11879,10 +12645,9 @@ net.minecraft.client.model.RavagerModel -> dmg:
     77:77:java.lang.Iterable parts() -> a
     82:91:void setupAnim(net.minecraft.world.entity.monster.Ravager,float,float,float,float,float) -> a
     95:137:void prepareMobModel(net.minecraft.world.entity.monster.Ravager,float,float,float) -> a
-    140:140:float triangleWave(float,float) -> a
     9:9:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     9:9:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.SalmonModel -> dmh:
+net.minecraft.client.model.SalmonModel -> dxe:
     net.minecraft.client.model.geom.ModelPart bodyFront -> a
     net.minecraft.client.model.geom.ModelPart bodyBack -> b
     net.minecraft.client.model.geom.ModelPart head -> f
@@ -11891,44 +12656,44 @@ net.minecraft.client.model.SalmonModel -> dmh:
     15:57:void <init>() -> <init>
     61:61:java.lang.Iterable parts() -> a
     66:73:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.SheepFurModel -> dmi:
+net.minecraft.client.model.SheepFurModel -> dxf:
     float headXRot -> j
     10:36:void <init>() -> <init>
     40:44:void prepareMobModel(net.minecraft.world.entity.animal.Sheep,float,float,float) -> a
     48:51:void setupAnim(net.minecraft.world.entity.animal.Sheep,float,float,float,float,float) -> a
     6:6:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     6:6:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
-net.minecraft.client.model.SheepModel -> dmj:
+net.minecraft.client.model.SheepModel -> dxg:
     float headXRot -> j
     10:19:void <init>() -> <init>
     23:27:void prepareMobModel(net.minecraft.world.entity.animal.Sheep,float,float,float) -> a
     31:34:void setupAnim(net.minecraft.world.entity.animal.Sheep,float,float,float,float,float) -> a
     6:6:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     6:6:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
-net.minecraft.client.model.ShieldModel -> dmk:
+net.minecraft.client.model.ShieldModel -> dxh:
     net.minecraft.client.model.geom.ModelPart plate -> a
     net.minecraft.client.model.geom.ModelPart handle -> b
     16:25:void <init>() -> <init>
     28:28:net.minecraft.client.model.geom.ModelPart plate() -> a
     32:32:net.minecraft.client.model.geom.ModelPart handle() -> b
     37:39:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
-net.minecraft.client.model.ShulkerBulletModel -> dml:
+net.minecraft.client.model.ShulkerBulletModel -> dxi:
     net.minecraft.client.model.geom.ModelPart main -> a
     11:20:void <init>() -> <init>
     24:24:java.lang.Iterable parts() -> a
     29:31:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.ShulkerModel -> dmm:
+net.minecraft.client.model.ShulkerModel -> dxj:
     net.minecraft.client.model.geom.ModelPart base -> a
     net.minecraft.client.model.geom.ModelPart lid -> b
     net.minecraft.client.model.geom.ModelPart head -> f
-    13:26:void <init>() -> <init>
-    30:48:void setupAnim(net.minecraft.world.entity.monster.Shulker,float,float,float,float,float) -> a
-    52:52:java.lang.Iterable parts() -> a
-    56:56:net.minecraft.client.model.geom.ModelPart getBase() -> b
-    60:60:net.minecraft.client.model.geom.ModelPart getLid() -> c
-    64:64:net.minecraft.client.model.geom.ModelPart getHead() -> d
-    8:8:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.SilverfishModel -> dmn:
+    15:29:void <init>() -> <init>
+    33:51:void setupAnim(net.minecraft.world.entity.monster.Shulker,float,float,float,float,float) -> a
+    55:55:java.lang.Iterable parts() -> a
+    59:59:net.minecraft.client.model.geom.ModelPart getBase() -> b
+    63:63:net.minecraft.client.model.geom.ModelPart getLid() -> c
+    67:67:net.minecraft.client.model.geom.ModelPart getHead() -> d
+    9:9:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
+net.minecraft.client.model.SilverfishModel -> dxk:
     net.minecraft.client.model.geom.ModelPart[] bodyParts -> a
     net.minecraft.client.model.geom.ModelPart[] bodyLayers -> b
     com.google.common.collect.ImmutableList parts -> f
@@ -11940,23 +12705,23 @@ net.minecraft.client.model.SilverfishModel -> dmn:
     77:87:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     10:10:java.lang.Iterable parts() -> a
     19:28:void <clinit>() -> <clinit>
-net.minecraft.client.model.SkeletonModel -> dmo:
+net.minecraft.client.model.SkeletonModel -> dxl:
     15:16:void <init>() -> <init>
     19:40:void <init>(float,boolean) -> <init>
     44:57:void prepareMobModel(net.minecraft.world.entity.Mob,float,float,float) -> a
-    61:81:void setupAnim(net.minecraft.world.entity.Mob,float,float,float,float,float) -> a
-    85:90:void translateToHand(net.minecraft.world.entity.HumanoidArm,com.mojang.blaze3d.vertex.PoseStack) -> a
+    61:78:void setupAnim(net.minecraft.world.entity.Mob,float,float,float,float,float) -> a
+    82:87:void translateToHand(net.minecraft.world.entity.HumanoidArm,com.mojang.blaze3d.vertex.PoseStack) -> a
     13:13:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
     13:13:void prepareMobModel(net.minecraft.world.entity.LivingEntity,float,float,float) -> a
     13:13:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     13:13:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.SkullModel -> dmp:
+net.minecraft.client.model.SkullModel -> dxm:
     net.minecraft.client.model.geom.ModelPart head -> a
     13:14:void <init>() -> <init>
     17:23:void <init>(int,int,int,int) -> <init>
     26:28:void setupAnim(float,float,float) -> a
     32:33:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
-net.minecraft.client.model.SlimeModel -> dmq:
+net.minecraft.client.model.SlimeModel -> dxn:
     net.minecraft.client.model.geom.ModelPart cube -> a
     net.minecraft.client.model.geom.ModelPart eye0 -> b
     net.minecraft.client.model.geom.ModelPart eye1 -> f
@@ -11964,7 +12729,7 @@ net.minecraft.client.model.SlimeModel -> dmq:
     13:27:void <init>(int) -> <init>
     31:31:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     35:35:java.lang.Iterable parts() -> a
-net.minecraft.client.model.SnowGolemModel -> dmr:
+net.minecraft.client.model.SnowGolemModel -> dxo:
     net.minecraft.client.model.geom.ModelPart piece1 -> a
     net.minecraft.client.model.geom.ModelPart piece2 -> b
     net.minecraft.client.model.geom.ModelPart head -> f
@@ -11974,7 +12739,7 @@ net.minecraft.client.model.SnowGolemModel -> dmr:
     42:59:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     63:63:java.lang.Iterable parts() -> a
     67:67:net.minecraft.client.model.geom.ModelPart getHead() -> b
-net.minecraft.client.model.SpiderModel -> dms:
+net.minecraft.client.model.SpiderModel -> dxp:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart body0 -> b
     net.minecraft.client.model.geom.ModelPart body1 -> f
@@ -11989,20 +12754,35 @@ net.minecraft.client.model.SpiderModel -> dms:
     21:69:void <init>() -> <init>
     73:73:java.lang.Iterable parts() -> a
     78:132:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.SquidModel -> dmt:
+net.minecraft.client.model.SquidModel -> dxq:
     net.minecraft.client.model.geom.ModelPart body -> a
     net.minecraft.client.model.geom.ModelPart[] tentacles -> b
     com.google.common.collect.ImmutableList parts -> f
     11:40:void <init>() -> <init>
     44:48:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     52:52:java.lang.Iterable parts() -> a
-net.minecraft.client.model.TridentModel -> dmu:
+net.minecraft.client.model.StriderModel -> dxr:
+    net.minecraft.client.model.geom.ModelPart rightLeg -> a
+    net.minecraft.client.model.geom.ModelPart leftLeg -> b
+    net.minecraft.client.model.geom.ModelPart body -> f
+    net.minecraft.client.model.geom.ModelPart bristle0 -> g
+    net.minecraft.client.model.geom.ModelPart bristle1 -> h
+    net.minecraft.client.model.geom.ModelPart bristle2 -> i
+    net.minecraft.client.model.geom.ModelPart bristle3 -> j
+    net.minecraft.client.model.geom.ModelPart bristle4 -> k
+    net.minecraft.client.model.geom.ModelPart bristle5 -> l
+    19:71:void <init>() -> <init>
+    75:128:void setupAnim(net.minecraft.world.entity.monster.Strider,float,float,float,float,float) -> a
+    131:134:void setRotationAngle(net.minecraft.client.model.geom.ModelPart,float,float,float) -> a
+    138:138:java.lang.Iterable parts() -> a
+    8:8:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
+net.minecraft.client.model.TridentModel -> dxs:
     net.minecraft.resources.ResourceLocation TEXTURE -> a
     net.minecraft.client.model.geom.ModelPart pole -> b
     15:35:void <init>() -> <init>
     39:40:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
     10:10:void <clinit>() -> <clinit>
-net.minecraft.client.model.TropicalFishModelA -> dmv:
+net.minecraft.client.model.TropicalFishModelA -> dxt:
     net.minecraft.client.model.geom.ModelPart body -> a
     net.minecraft.client.model.geom.ModelPart tail -> b
     net.minecraft.client.model.geom.ModelPart leftFin -> f
@@ -12011,7 +12791,7 @@ net.minecraft.client.model.TropicalFishModelA -> dmv:
     15:42:void <init>(float) -> <init>
     46:46:java.lang.Iterable parts() -> a
     51:56:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.TropicalFishModelB -> dmw:
+net.minecraft.client.model.TropicalFishModelB -> dxu:
     net.minecraft.client.model.geom.ModelPart body -> a
     net.minecraft.client.model.geom.ModelPart tail -> b
     net.minecraft.client.model.geom.ModelPart leftFin -> f
@@ -12021,14 +12801,14 @@ net.minecraft.client.model.TropicalFishModelB -> dmw:
     16:47:void <init>(float) -> <init>
     51:51:java.lang.Iterable parts() -> a
     56:61:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.TurtleModel -> dmx:
+net.minecraft.client.model.TurtleModel -> dxv:
     net.minecraft.client.model.geom.ModelPart eggBelly -> j
     15:49:void <init>(float) -> <init>
     53:53:java.lang.Iterable bodyParts() -> b
     58:89:void setupAnim(net.minecraft.world.entity.animal.Turtle,float,float,float,float,float) -> a
     93:102:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
     11:11:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.VexModel -> dmy:
+net.minecraft.client.model.VexModel -> dxw:
     net.minecraft.client.model.geom.ModelPart leftWing -> a
     net.minecraft.client.model.geom.ModelPart rightWing -> b
     15:30:void <init>() -> <init>
@@ -12036,9 +12816,9 @@ net.minecraft.client.model.VexModel -> dmy:
     39:61:void setupAnim(net.minecraft.world.entity.monster.Vex,float,float,float,float,float) -> a
     10:10:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
     10:10:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.VillagerHeadModel -> dmz:
+net.minecraft.client.model.VillagerHeadModel -> dxx:
     void hatVisible(boolean) -> a
-net.minecraft.client.model.VillagerModel -> dna:
+net.minecraft.client.model.VillagerModel -> dxy:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart hat -> b
     net.minecraft.client.model.geom.ModelPart hatRim -> f
@@ -12054,14 +12834,14 @@ net.minecraft.client.model.VillagerModel -> dna:
     79:102:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     106:106:net.minecraft.client.model.geom.ModelPart getHead() -> c
     111:114:void hatVisible(boolean) -> a
-net.minecraft.client.model.WitchModel -> dnb:
+net.minecraft.client.model.WitchModel -> dxz:
     boolean holdingItem -> m
     net.minecraft.client.model.geom.ModelPart mole -> n
     12:48:void <init>(float) -> <init>
     52:65:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
     68:68:net.minecraft.client.model.geom.ModelPart getNose() -> b
     72:73:void setHoldingItem(boolean) -> b
-net.minecraft.client.model.WitherBossModel -> dnc:
+net.minecraft.client.model.WitherBossModel -> dya:
     net.minecraft.client.model.geom.ModelPart[] upperBodyParts -> a
     net.minecraft.client.model.geom.ModelPart[] heads -> b
     com.google.common.collect.ImmutableList parts -> f
@@ -12072,7 +12852,7 @@ net.minecraft.client.model.WitherBossModel -> dnc:
     10:10:java.lang.Iterable parts() -> a
     10:10:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     10:10:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.WolfModel -> dnd:
+net.minecraft.client.model.WolfModel -> dyb:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart realHead -> b
     net.minecraft.client.model.geom.ModelPart body -> f
@@ -12090,26 +12870,26 @@ net.minecraft.client.model.WolfModel -> dnd:
     134:138:void setupAnim(net.minecraft.world.entity.animal.Wolf,float,float,float,float,float) -> a
     8:8:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
     8:8:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.ZombieModel -> dne:
+net.minecraft.client.model.ZombieModel -> dyc:
     7:8:void <init>(float,boolean) -> <init>
     11:12:void <init>(float,float,int,int) -> <init>
     16:16:boolean isAggressive(net.minecraft.world.entity.monster.Zombie) -> a
     5:5:boolean isAggressive(net.minecraft.world.entity.monster.Monster) -> a
-net.minecraft.client.model.ZombieVillagerModel -> dnf:
+net.minecraft.client.model.ZombieVillagerModel -> dyd:
     net.minecraft.client.model.geom.ModelPart hatRim -> a
     11:63:void <init>(float,boolean) -> <init>
-    67:87:void setupAnim(net.minecraft.world.entity.monster.Zombie,float,float,float,float,float) -> a
-    91:94:void hatVisible(boolean) -> a
+    67:70:void setupAnim(net.minecraft.world.entity.monster.Zombie,float,float,float,float,float) -> a
+    74:77:void hatVisible(boolean) -> a
     7:7:void setupAnim(net.minecraft.world.entity.LivingEntity,float,float,float,float,float) -> a
     7:7:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.model.dragon.DragonHeadModel -> dng:
+net.minecraft.client.model.dragon.DragonHeadModel -> dye:
     net.minecraft.client.model.geom.ModelPart head -> b
     net.minecraft.client.model.geom.ModelPart jaw -> c
     13:32:void <init>(float) -> <init>
     36:40:void setupAnim(float,float,float) -> a
     44:50:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
-net.minecraft.client.model.dragon.package-info -> dnh:
-net.minecraft.client.model.geom.ModelPart -> dni:
+net.minecraft.client.model.dragon.package-info -> dyf:
+net.minecraft.client.model.geom.ModelPart -> dyg:
     float xTexSize -> i
     float yTexSize -> j
     int xTexOffs -> k
@@ -12127,24 +12907,26 @@ net.minecraft.client.model.geom.ModelPart -> dni:
     17:39:void <init>(net.minecraft.client.model.Model) -> <init>
     42:44:void <init>(net.minecraft.client.model.Model,int,int) -> <init>
     17:49:void <init>(int,int,int,int) -> <init>
-    52:58:void copyFrom(net.minecraft.client.model.geom.ModelPart) -> a
-    61:62:void addChild(net.minecraft.client.model.geom.ModelPart) -> b
-    65:67:net.minecraft.client.model.geom.ModelPart texOffs(int,int) -> a
-    72:74:net.minecraft.client.model.geom.ModelPart addBox(java.lang.String,float,float,float,int,int,int,float,int,int) -> a
-    78:79:net.minecraft.client.model.geom.ModelPart addBox(float,float,float,float,float,float) -> a
-    83:84:net.minecraft.client.model.geom.ModelPart addBox(float,float,float,float,float,float,boolean) -> a
-    88:89:void addBox(float,float,float,float,float,float,float) -> a
-    92:93:void addBox(float,float,float,float,float,float,float,float,float) -> a
-    96:97:void addBox(float,float,float,float,float,float,float,boolean) -> a
-    100:101:void addBox(int,int,float,float,float,float,float,float,float,float,float,boolean,boolean) -> a
-    104:107:void setPos(float,float,float) -> a
-    110:111:void render(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int) -> a
-    114:131:void render(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
-    134:144:void translateAndRotate(com.mojang.blaze3d.vertex.PoseStack) -> a
-    147:170:void compile(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
-    173:175:net.minecraft.client.model.geom.ModelPart setTexSize(int,int) -> b
-    179:179:net.minecraft.client.model.geom.ModelPart$Cube getRandomCube(java.util.Random) -> a
-net.minecraft.client.model.geom.ModelPart$Cube -> dni$a:
+    17:52:void <init>() -> <init>
+    55:57:net.minecraft.client.model.geom.ModelPart createShallowCopy() -> a
+    61:67:void copyFrom(net.minecraft.client.model.geom.ModelPart) -> a
+    70:71:void addChild(net.minecraft.client.model.geom.ModelPart) -> b
+    74:76:net.minecraft.client.model.geom.ModelPart texOffs(int,int) -> a
+    81:83:net.minecraft.client.model.geom.ModelPart addBox(java.lang.String,float,float,float,int,int,int,float,int,int) -> a
+    87:88:net.minecraft.client.model.geom.ModelPart addBox(float,float,float,float,float,float) -> a
+    92:93:net.minecraft.client.model.geom.ModelPart addBox(float,float,float,float,float,float,boolean) -> a
+    97:98:void addBox(float,float,float,float,float,float,float) -> a
+    101:102:void addBox(float,float,float,float,float,float,float,float,float) -> a
+    105:106:void addBox(float,float,float,float,float,float,float,boolean) -> a
+    109:110:void addBox(int,int,float,float,float,float,float,float,float,float,float,boolean,boolean) -> a
+    113:116:void setPos(float,float,float) -> a
+    119:120:void render(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int) -> a
+    123:140:void render(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
+    143:153:void translateAndRotate(com.mojang.blaze3d.vertex.PoseStack) -> a
+    156:179:void compile(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
+    182:184:net.minecraft.client.model.geom.ModelPart setTexSize(int,int) -> b
+    188:188:net.minecraft.client.model.geom.ModelPart$Cube getRandomCube(java.util.Random) -> a
+net.minecraft.client.model.geom.ModelPart$Cube -> dyg$a:
     net.minecraft.client.model.geom.ModelPart$Polygon[] polygons -> g
     float minX -> a
     float minY -> b
@@ -12152,22 +12934,22 @@ net.minecraft.client.model.geom.ModelPart$Cube -> dni$a:
     float maxX -> d
     float maxY -> e
     float maxZ -> f
-    191:245:void <init>(int,int,float,float,float,float,float,float,float,float,float,boolean,float,float) -> <init>
-    182:182:net.minecraft.client.model.geom.ModelPart$Polygon[] access$000(net.minecraft.client.model.geom.ModelPart$Cube) -> a
-net.minecraft.client.model.geom.ModelPart$Polygon -> dni$b:
+    200:254:void <init>(int,int,float,float,float,float,float,float,float,float,float,boolean,float,float) -> <init>
+    191:191:net.minecraft.client.model.geom.ModelPart$Polygon[] access$000(net.minecraft.client.model.geom.ModelPart$Cube) -> a
+net.minecraft.client.model.geom.ModelPart$Polygon -> dyg$b:
     net.minecraft.client.model.geom.ModelPart$Vertex[] vertices -> a
     com.mojang.math.Vector3f normal -> b
-    252:275:void <init>(net.minecraft.client.model.geom.ModelPart$Vertex[],float,float,float,float,float,float,boolean,net.minecraft.core.Direction) -> <init>
-net.minecraft.client.model.geom.ModelPart$Vertex -> dni$c:
+    261:284:void <init>(net.minecraft.client.model.geom.ModelPart$Vertex[],float,float,float,float,float,float,boolean,net.minecraft.core.Direction) -> <init>
+net.minecraft.client.model.geom.ModelPart$Vertex -> dyg$c:
     com.mojang.math.Vector3f pos -> a
     float u -> b
     float v -> c
-    285:286:void <init>(float,float,float,float,float) -> <init>
-    289:289:net.minecraft.client.model.geom.ModelPart$Vertex remap(float,float) -> a
-    292:296:void <init>(com.mojang.math.Vector3f,float,float) -> <init>
-net.minecraft.client.model.geom.package-info -> dnj:
-net.minecraft.client.model.package-info -> dnk:
-net.minecraft.client.multiplayer.ClientAdvancements -> dnl:
+    294:295:void <init>(float,float,float,float,float) -> <init>
+    298:298:net.minecraft.client.model.geom.ModelPart$Vertex remap(float,float) -> a
+    301:305:void <init>(com.mojang.math.Vector3f,float,float) -> <init>
+net.minecraft.client.model.geom.package-info -> dyh:
+net.minecraft.client.model.package-info -> dyi:
+net.minecraft.client.multiplayer.ClientAdvancements -> dyj:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.client.Minecraft minecraft -> b
     net.minecraft.advancements.AdvancementList advancements -> c
@@ -12181,22 +12963,22 @@ net.minecraft.client.multiplayer.ClientAdvancements -> dnl:
     68:78:void setSelectedTab(net.minecraft.advancements.Advancement,boolean) -> a
     81:89:void setListener(net.minecraft.client.multiplayer.ClientAdvancements$Listener) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.client.multiplayer.ClientAdvancements$Listener -> dnl$a:
+net.minecraft.client.multiplayer.ClientAdvancements$Listener -> dyj$a:
     void onUpdateAdvancementProgress(net.minecraft.advancements.Advancement,net.minecraft.advancements.AdvancementProgress) -> a
     void onSelectedTabChanged(net.minecraft.advancements.Advancement) -> e
-net.minecraft.client.multiplayer.ClientChunkCache -> dnm:
+net.minecraft.client.multiplayer.ClientChunkCache -> dyk:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.level.chunk.LevelChunk emptyChunk -> b
     net.minecraft.world.level.lighting.LevelLightEngine lightEngine -> c
     net.minecraft.client.multiplayer.ClientChunkCache$Storage storage -> d
     net.minecraft.client.multiplayer.ClientLevel level -> e
     39:44:void <init>(net.minecraft.client.multiplayer.ClientLevel,int) -> <init>
-    48:48:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> k
+    48:48:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> l
     52:56:boolean isValidChunk(net.minecraft.world.level.chunk.LevelChunk,int,int) -> a
     60:68:void drop(int,int) -> d
     73:83:net.minecraft.world.level.chunk.LevelChunk getChunk(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> b
-    88:88:net.minecraft.world.level.BlockGetter getLevel() -> l
-    93:124:net.minecraft.world.level.chunk.LevelChunk replaceWithPacketData(int,int,net.minecraft.world.level.chunk.ChunkBiomeContainer,net.minecraft.network.FriendlyByteBuf,net.minecraft.nbt.CompoundTag,int) -> a
+    88:88:net.minecraft.world.level.BlockGetter getLevel() -> m
+    93:124:net.minecraft.world.level.chunk.LevelChunk replaceWithPacketData(int,int,net.minecraft.world.level.chunk.ChunkBiomeContainer,net.minecraft.network.FriendlyByteBuf,net.minecraft.nbt.CompoundTag,int,boolean) -> a
     129:129:void tick(java.util.function.BooleanSupplier) -> a
     132:134:void updateViewCenter(int,int) -> e
     137:155:void updateViewRadius(int) -> a
@@ -12212,8 +12994,8 @@ net.minecraft.client.multiplayer.ClientChunkCache -> dnm:
     31:31:net.minecraft.client.multiplayer.ClientChunkCache$Storage access$900(net.minecraft.client.multiplayer.ClientChunkCache) -> b
     31:31:org.apache.logging.log4j.Logger access$1000() -> a
     32:32:void <clinit>() -> <clinit>
-net.minecraft.client.multiplayer.ClientChunkCache$1 -> dnm$1:
-net.minecraft.client.multiplayer.ClientChunkCache$Storage -> dnm$a:
+net.minecraft.client.multiplayer.ClientChunkCache$1 -> dyk$1:
+net.minecraft.client.multiplayer.ClientChunkCache$Storage -> dyk$a:
     java.util.concurrent.atomic.AtomicReferenceArray chunks -> b
     int chunkRadius -> c
     int viewRange -> d
@@ -12238,7 +13020,7 @@ net.minecraft.client.multiplayer.ClientChunkCache$Storage -> dnm$a:
     192:192:int access$400(net.minecraft.client.multiplayer.ClientChunkCache$Storage) -> c
     192:192:int access$500(net.minecraft.client.multiplayer.ClientChunkCache$Storage) -> d
     192:192:int access$700(net.minecraft.client.multiplayer.ClientChunkCache$Storage) -> e
-net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl -> dnn:
+net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl -> dyl:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.client.Minecraft minecraft -> b
     net.minecraft.client.gui.screens.Screen parent -> c
@@ -12258,262 +13040,314 @@ net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl -> dnn:
     63:75:void lambda$handleHello$1(java.lang.String,net.minecraft.network.protocol.login.ServerboundKeyPacket,javax.crypto.SecretKey) -> a
     74:74:void lambda$null$0(javax.crypto.SecretKey,io.netty.util.concurrent.Future) -> a
     37:37:void <clinit>() -> <clinit>
-net.minecraft.client.multiplayer.ClientLevel -> dno:
-    java.util.List globalEntities -> a
-    it.unimi.dsi.fastutil.ints.Int2ObjectMap entitiesById -> b
-    net.minecraft.client.multiplayer.ClientPacketListener connection -> c
-    net.minecraft.client.renderer.LevelRenderer levelRenderer -> u
-    net.minecraft.client.Minecraft minecraft -> v
-    java.util.List players -> w
-    int delayUntilNextMoodSound -> x
-    net.minecraft.world.scores.Scoreboard scoreboard -> y
-    java.util.Map mapData -> z
-    int skyFlashTime -> A
-    it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap tintCaches -> B
-    77:105:void <init>(net.minecraft.client.multiplayer.ClientPacketListener,net.minecraft.world.level.LevelSettings,net.minecraft.world.level.dimension.DimensionType,int,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.client.renderer.LevelRenderer) -> <init>
-    108:117:void tick(java.util.function.BooleanSupplier) -> a
-    120:120:java.lang.Iterable entitiesForRendering() -> b
-    124:166:void tickEntities() -> g
-    169:191:void tickNonPassenger(net.minecraft.world.entity.Entity) -> a
-    194:218:void tickPassenger(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
-    221:238:void updateChunkPos(net.minecraft.world.entity.Entity) -> b
-    241:243:void unload(net.minecraft.world.level.chunk.LevelChunk) -> a
-    246:247:void onChunkLoaded(int,int) -> e
-    250:251:void clearTintCaches() -> h
-    255:255:boolean hasChunk(int,int) -> b
-    259:280:void playMoodSounds() -> r
-    283:283:int getEntityCount() -> j
-    287:288:void addLightning(net.minecraft.world.entity.global.LightningBolt) -> a
-    291:293:void addPlayer(int,net.minecraft.client.player.AbstractClientPlayer) -> a
-    296:297:void putNonPlayerEntity(int,net.minecraft.world.entity.Entity) -> a
-    300:303:void addEntity(int,net.minecraft.world.entity.Entity) -> b
-    306:311:void removeEntity(int) -> d
-    314:319:void onEntityRemoved(net.minecraft.world.entity.Entity) -> d
-    322:330:void reAddEntitiesToChunk(net.minecraft.world.level.chunk.LevelChunk) -> b
-    335:335:net.minecraft.world.entity.Entity getEntity(int) -> a
-    339:340:void setKnownState(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    344:345:void disconnect() -> Q
-    348:367:void animateTick(int,int,int) -> c
-    370:394:void doAnimateTick(int,int,int,int,java.util.Random,boolean,net.minecraft.core.BlockPos$MutableBlockPos) -> a
-    397:421:void trySpawnDripParticles(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.particles.ParticleOptions,boolean) -> a
-    424:430:void spawnParticle(net.minecraft.core.BlockPos,net.minecraft.core.particles.ParticleOptions,net.minecraft.world.phys.shapes.VoxelShape,double) -> a
-    433:434:void spawnFluidParticle(double,double,double,double,double,net.minecraft.core.particles.ParticleOptions) -> a
-    437:446:void removeAllPendingEntityRemovals() -> k
-    450:455:net.minecraft.CrashReportCategory fillReportDetails(net.minecraft.CrashReport) -> a
-    460:463:void playSound(net.minecraft.world.entity.player.Player,double,double,double,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
-    467:470:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
-    473:474:void playLocalSound(net.minecraft.core.BlockPos,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,boolean) -> a
-    478:488:void playLocalSound(double,double,double,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,boolean) -> a
-    492:493:void createFireworks(double,double,double,double,double,double,net.minecraft.nbt.CompoundTag) -> a
-    497:498:void sendPacketToServer(net.minecraft.network.protocol.Packet) -> a
-    502:502:net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> s
-    506:507:void setScoreboard(net.minecraft.world.scores.Scoreboard) -> a
-    511:518:void setDayTime(long) -> b
-    522:522:net.minecraft.world.level.TickList getBlockTicks() -> G
-    527:527:net.minecraft.world.level.TickList getLiquidTicks() -> F
-    532:532:net.minecraft.client.multiplayer.ClientChunkCache getChunkSource() -> l
-    538:538:net.minecraft.world.level.saveddata.maps.MapItemSavedData getMapData(java.lang.String) -> a
-    543:544:void setMapData(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
-    548:548:int getFreeMapId() -> y
-    553:553:net.minecraft.world.scores.Scoreboard getScoreboard() -> D
-    558:558:net.minecraft.tags.TagManager getTagManager() -> t
-    563:563:void checkSession() -> v
-    567:568:void sendBlockUpdated(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int) -> a
-    572:573:void setBlocksDirty(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> b
-    576:577:void setSectionDirtyWithNeighbors(int,int,int) -> d
-    581:582:void destroyBlockProgress(int,net.minecraft.core.BlockPos,int) -> a
-    586:587:void globalLevelEvent(int,net.minecraft.core.BlockPos,int) -> b
-    592:604:void levelEvent(net.minecraft.world.entity.player.Player,int,net.minecraft.core.BlockPos,int) -> a
-    608:609:void addParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
-    613:614:void addParticle(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> a
-    618:619:void addAlwaysVisibleParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> b
-    623:624:void addAlwaysVisibleParticle(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> b
-    628:628:java.util.List players() -> A
-    633:633:net.minecraft.world.level.biome.Biome getUncachedNoiseBiome(int,int,int) -> a
-    637:647:float getSkyDarken(float) -> g
-    651:696:net.minecraft.world.phys.Vec3 getSkyColor(net.minecraft.core.BlockPos,float) -> a
-    700:733:net.minecraft.world.phys.Vec3 getCloudColor(float) -> h
-    737:738:net.minecraft.world.phys.Vec3 getFogColor(float) -> i
-    742:747:float getStarBrightness(float) -> j
-    751:754:double getHorizonHeight() -> m
-    758:758:int getSkyFlashTime() -> n
-    763:764:void setSkyFlashTime(int) -> c
-    768:769:int getBlockTint(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> a
-    773:794:int calculateBlockTint(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> b
+net.minecraft.client.multiplayer.ClientLevel -> dym:
+    it.unimi.dsi.fastutil.ints.Int2ObjectMap entitiesById -> a
+    net.minecraft.client.multiplayer.ClientPacketListener connection -> b
+    net.minecraft.client.renderer.LevelRenderer levelRenderer -> c
+    net.minecraft.client.multiplayer.ClientLevel$ClientLevelData clientLevelData -> d
+    net.minecraft.client.renderer.DimensionSpecialEffects effects -> x
+    net.minecraft.client.Minecraft minecraft -> y
+    java.util.List players -> z
+    net.minecraft.world.scores.Scoreboard scoreboard -> A
+    java.util.Map mapData -> B
+    int skyFlashTime -> C
+    it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap tintCaches -> D
+    net.minecraft.client.multiplayer.ClientChunkCache chunkSource -> E
+    77:108:void <init>(net.minecraft.client.multiplayer.ClientPacketListener,net.minecraft.client.multiplayer.ClientLevel$ClientLevelData,net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey,net.minecraft.world.level.dimension.DimensionType,int,java.util.function.Supplier,net.minecraft.client.renderer.LevelRenderer,boolean,long) -> <init>
+    111:111:net.minecraft.client.renderer.DimensionSpecialEffects effects() -> a
+    115:123:void tick(java.util.function.BooleanSupplier) -> a
+    126:130:void tickTime() -> x
+    133:134:void setGameTime(long) -> a
+    137:144:void setDayTime(long) -> b
+    147:147:java.lang.Iterable entitiesForRendering() -> b
+    151:178:void tickEntities() -> g
+    181:204:void tickNonPassenger(net.minecraft.world.entity.Entity) -> a
+    207:231:void tickPassenger(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
+    234:257:void updateChunkPos(net.minecraft.world.entity.Entity) -> b
+    260:262:void unload(net.minecraft.world.level.chunk.LevelChunk) -> a
+    265:266:void onChunkLoaded(int,int) -> e
+    269:270:void clearTintCaches() -> h
+    274:274:boolean hasChunk(int,int) -> b
+    278:278:int getEntityCount() -> i
+    282:284:void addPlayer(int,net.minecraft.client.player.AbstractClientPlayer) -> a
+    287:288:void putNonPlayerEntity(int,net.minecraft.world.entity.Entity) -> a
+    291:294:void addEntity(int,net.minecraft.world.entity.Entity) -> b
+    297:302:void removeEntity(int) -> d
+    305:310:void onEntityRemoved(net.minecraft.world.entity.Entity) -> d
+    313:321:void reAddEntitiesToChunk(net.minecraft.world.level.chunk.LevelChunk) -> b
+    326:326:net.minecraft.world.entity.Entity getEntity(int) -> a
+    330:331:void setKnownState(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    335:336:void disconnect() -> P
+    339:358:void animateTick(int,int,int) -> c
+    361:393:void doAnimateTick(int,int,int,int,java.util.Random,boolean,net.minecraft.core.BlockPos$MutableBlockPos) -> a
+    396:420:void trySpawnDripParticles(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.particles.ParticleOptions,boolean) -> a
+    423:429:void spawnParticle(net.minecraft.core.BlockPos,net.minecraft.core.particles.ParticleOptions,net.minecraft.world.phys.shapes.VoxelShape,double) -> a
+    432:433:void spawnFluidParticle(double,double,double,double,double,net.minecraft.core.particles.ParticleOptions) -> a
+    436:445:void removeAllPendingEntityRemovals() -> j
+    449:454:net.minecraft.CrashReportCategory fillReportDetails(net.minecraft.CrashReport) -> a
+    459:462:void playSound(net.minecraft.world.entity.player.Player,double,double,double,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
+    466:469:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
+    472:473:void playLocalSound(net.minecraft.core.BlockPos,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,boolean) -> a
+    477:487:void playLocalSound(double,double,double,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,boolean) -> a
+    491:492:void createFireworks(double,double,double,double,double,double,net.minecraft.nbt.CompoundTag) -> a
+    496:497:void sendPacketToServer(net.minecraft.network.protocol.Packet) -> a
+    501:501:net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> o
+    505:506:void setScoreboard(net.minecraft.world.scores.Scoreboard) -> a
+    510:510:net.minecraft.world.level.TickList getBlockTicks() -> G
+    515:515:net.minecraft.world.level.TickList getLiquidTicks() -> F
+    520:520:net.minecraft.client.multiplayer.ClientChunkCache getChunkSource() -> k
+    526:526:net.minecraft.world.level.saveddata.maps.MapItemSavedData getMapData(java.lang.String) -> a
+    531:532:void setMapData(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
+    536:536:int getFreeMapId() -> t
+    541:541:net.minecraft.world.scores.Scoreboard getScoreboard() -> D
+    546:546:net.minecraft.tags.TagManager getTagManager() -> p
+    551:551:net.minecraft.core.RegistryAccess registryAccess() -> r
+    556:557:void sendBlockUpdated(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int) -> a
+    561:562:void setBlocksDirty(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> b
+    565:566:void setSectionDirtyWithNeighbors(int,int,int) -> d
+    570:571:void destroyBlockProgress(int,net.minecraft.core.BlockPos,int) -> a
+    575:576:void globalLevelEvent(int,net.minecraft.core.BlockPos,int) -> b
+    581:593:void levelEvent(net.minecraft.world.entity.player.Player,int,net.minecraft.core.BlockPos,int) -> a
+    597:598:void addParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
+    602:603:void addParticle(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> a
+    607:608:void addAlwaysVisibleParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> b
+    612:613:void addAlwaysVisibleParticle(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> b
+    617:617:java.util.List players() -> w
+    622:622:net.minecraft.world.level.biome.Biome getUncachedNoiseBiome(int,int,int) -> a
+    626:636:float getSkyDarken(float) -> g
+    640:685:net.minecraft.world.phys.Vec3 getSkyColor(net.minecraft.core.BlockPos,float) -> a
+    689:722:net.minecraft.world.phys.Vec3 getCloudColor(float) -> h
+    726:731:float getStarBrightness(float) -> i
+    735:735:int getSkyFlashTime() -> s
+    740:741:void setSkyFlashTime(int) -> c
+    745:763:float getShade(net.minecraft.core.Direction,boolean) -> a
+    769:770:int getBlockTint(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> a
+    774:795:int calculateBlockTint(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> b
+    799:803:net.minecraft.core.BlockPos getSharedSpawnPos() -> u
+    807:808:void setDefaultSpawnPos(net.minecraft.core.BlockPos) -> a
+    812:812:java.lang.String toString() -> toString
+    817:817:net.minecraft.client.multiplayer.ClientLevel$ClientLevelData getLevelData() -> v
+    75:75:net.minecraft.world.level.storage.LevelData getLevelData() -> u_
     75:75:net.minecraft.world.level.chunk.ChunkSource getChunkSource() -> E
-    769:769:int lambda$getBlockTint$8(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> c
-    453:453:java.lang.String lambda$fillReportDetails$7() -> w
-    452:452:java.lang.String lambda$fillReportDetails$6() -> x
-    250:250:void lambda$clearTintCaches$5(net.minecraft.world.level.ColorResolver,net.minecraft.client.color.block.BlockTintCache) -> a
-    246:246:void lambda$onChunkLoaded$4(int,int,net.minecraft.world.level.ColorResolver,net.minecraft.client.color.block.BlockTintCache) -> a
-    179:179:java.lang.String lambda$tickNonPassenger$3(net.minecraft.world.entity.Entity) -> e
-    131:133:void lambda$tickEntities$2(net.minecraft.world.entity.Entity) -> f
-    97:97:net.minecraft.world.level.chunk.ChunkSource lambda$new$1(int,net.minecraft.world.level.Level,net.minecraft.world.level.dimension.Dimension) -> a
+    770:770:int lambda$getBlockTint$7(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> c
+    452:452:java.lang.String lambda$fillReportDetails$6() -> y
+    451:451:java.lang.String lambda$fillReportDetails$5() -> z
+    388:391:void lambda$doAnimateTick$4(net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.world.level.biome.AmbientParticleSettings) -> a
+    269:269:void lambda$clearTintCaches$3(net.minecraft.world.level.ColorResolver,net.minecraft.client.color.block.BlockTintCache) -> a
+    265:265:void lambda$onChunkLoaded$2(int,int,net.minecraft.world.level.ColorResolver,net.minecraft.client.color.block.BlockTintCache) -> a
+    192:192:java.lang.String lambda$tickNonPassenger$1(net.minecraft.world.entity.Entity) -> e
     91:94:void lambda$new$0(it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap) -> a
-net.minecraft.client.multiplayer.ClientPacketListener -> dnp:
+net.minecraft.client.multiplayer.ClientLevel$1 -> dym$1:
+    int[] $SwitchMap$net$minecraft$core$Direction -> a
+    751:751:void <clinit>() -> <clinit>
+net.minecraft.client.multiplayer.ClientLevel$ClientLevelData -> dym$a:
+    boolean hardcore -> a
+    net.minecraft.world.level.GameRules gameRules -> b
+    boolean isFlat -> c
+    int xSpawn -> d
+    int ySpawn -> e
+    int zSpawn -> f
+    long gameTime -> g
+    long dayTime -> h
+    boolean raining -> i
+    net.minecraft.world.Difficulty difficulty -> j
+    boolean difficultyLocked -> k
+    836:841:void <init>(net.minecraft.world.Difficulty,boolean,boolean) -> <init>
+    845:845:int getXSpawn() -> a
+    850:850:int getYSpawn() -> b
+    855:855:int getZSpawn() -> c
+    860:860:long getGameTime() -> d
+    865:865:long getDayTime() -> e
+    870:871:void setXSpawn(int) -> b
+    875:876:void setYSpawn(int) -> c
+    880:881:void setZSpawn(int) -> d
+    884:885:void setGameTime(long) -> a
+    888:889:void setDayTime(long) -> b
+    893:896:void setSpawn(net.minecraft.core.BlockPos) -> a
+    900:900:boolean isThundering() -> h
+    905:905:boolean isRaining() -> j
+    910:911:void setRaining(boolean) -> b
+    915:915:boolean isHardcore() -> m
+    920:920:net.minecraft.world.level.GameRules getGameRules() -> p
+    925:925:net.minecraft.world.Difficulty getDifficulty() -> r
+    930:930:boolean isDifficultyLocked() -> s
+    935:936:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
+    939:940:void setDifficulty(net.minecraft.world.Difficulty) -> a
+    943:944:void setDifficultyLocked(boolean) -> a
+    947:950:double getHorizonHeight() -> f
+    954:957:double getClearColorScale() -> g
+net.minecraft.client.multiplayer.ClientPacketListener -> dyn:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.network.Connection connection -> b
     com.mojang.authlib.GameProfile localGameProfile -> c
     net.minecraft.client.gui.screens.Screen callbackScreen -> d
     net.minecraft.client.Minecraft minecraft -> e
     net.minecraft.client.multiplayer.ClientLevel level -> f
-    boolean started -> g
-    java.util.Map playerInfoMap -> h
-    net.minecraft.client.multiplayer.ClientAdvancements advancements -> i
-    net.minecraft.client.multiplayer.ClientSuggestionProvider suggestionsProvider -> j
-    net.minecraft.tags.TagManager tags -> k
-    net.minecraft.client.DebugQueryHandler debugQueryHandler -> l
-    int serverChunkRadius -> m
-    java.util.Random random -> n
-    com.mojang.brigadier.CommandDispatcher commands -> o
-    net.minecraft.world.item.crafting.RecipeManager recipeManager -> p
-    java.util.UUID id -> q
-    314:333:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.Screen,net.minecraft.network.Connection,com.mojang.authlib.GameProfile) -> <init>
-    336:336:net.minecraft.client.multiplayer.ClientSuggestionProvider getSuggestionsProvider() -> b
-    340:341:void cleanup() -> c
-    344:344:net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> d
-    349:383:void handleLogin(net.minecraft.network.protocol.game.ClientboundLoginPacket) -> a
-    387:495:void handleAddEntity(net.minecraft.network.protocol.game.ClientboundAddEntityPacket) -> a
-    499:510:void handleAddExperienceOrb(net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket) -> a
-    514:526:void handleAddGlobalEntity(net.minecraft.network.protocol.game.ClientboundAddGlobalEntityPacket) -> a
-    530:535:void handleAddPainting(net.minecraft.network.protocol.game.ClientboundAddPaintingPacket) -> a
-    539:545:void handleSetEntityMotion(net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket) -> a
-    549:554:void handleSetEntityData(net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket) -> a
-    558:573:void handleAddPlayer(net.minecraft.network.protocol.game.ClientboundAddPlayerPacket) -> a
-    577:597:void handleTeleportEntity(net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket) -> a
-    601:605:void handleSetCarriedItem(net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket) -> a
-    609:630:void handleMoveEntity(net.minecraft.network.protocol.game.ClientboundMoveEntityPacket) -> a
-    634:641:void handleRotateMob(net.minecraft.network.protocol.game.ClientboundRotateHeadPacket) -> a
-    645:661:void handleRemoveEntity(net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket) -> a
-    665:741:void handleMovePlayer(net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket) -> a
-    745:750:void handleChunkBlocksUpdate(net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket) -> a
-    754:776:void handleLevelChunk(net.minecraft.network.protocol.game.ClientboundLevelChunkPacket) -> a
-    780:792:void handleForgetLevelChunk(net.minecraft.network.protocol.game.ClientboundForgetLevelChunkPacket) -> a
-    796:798:void handleBlockUpdate(net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket) -> a
-    802:803:void handleDisconnect(net.minecraft.network.protocol.game.ClientboundDisconnectPacket) -> a
-    807:817:void onDisconnect(net.minecraft.network.chat.Component) -> a
-    820:821:void send(net.minecraft.network.protocol.Packet) -> a
-    825:844:void handleTakeItemEntity(net.minecraft.network.protocol.game.ClientboundTakeItemEntityPacket) -> a
-    848:850:void handleChat(net.minecraft.network.protocol.game.ClientboundChatPacket) -> a
-    854:875:void handleAnimate(net.minecraft.network.protocol.game.ClientboundAnimatePacket) -> a
-    879:920:void handleAddMob(net.minecraft.network.protocol.game.ClientboundAddMobPacket) -> a
-    924:927:void handleSetTime(net.minecraft.network.protocol.game.ClientboundSetTimePacket) -> a
-    931:934:void handleSetSpawn(net.minecraft.network.protocol.game.ClientboundSetSpawnPositionPacket) -> a
-    938:957:void handleSetEntityPassengersPacket(net.minecraft.network.protocol.game.ClientboundSetPassengersPacket) -> a
-    961:966:void handleEntityLinkPacket(net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket) -> a
-    969:975:net.minecraft.world.item.ItemStack findTotem(net.minecraft.world.entity.player.Player) -> a
-    980:997:void handleEntityEvent(net.minecraft.network.protocol.game.ClientboundEntityEventPacket) -> a
-    1001:1005:void handleSetHealth(net.minecraft.network.protocol.game.ClientboundSetHealthPacket) -> a
-    1009:1011:void handleSetExperience(net.minecraft.network.protocol.game.ClientboundSetExperiencePacket) -> a
-    1015:1056:void handleRespawn(net.minecraft.network.protocol.game.ClientboundRespawnPacket) -> a
-    1060:1069:void handleExplosion(net.minecraft.network.protocol.game.ClientboundExplodePacket) -> a
-    1073:1083:void handleHorseScreenOpen(net.minecraft.network.protocol.game.ClientboundHorseScreenOpenPacket) -> a
-    1087:1089:void handleOpenScreen(net.minecraft.network.protocol.game.ClientboundOpenScreenPacket) -> a
-    1093:1128:void handleContainerSetSlot(net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket) -> a
-    1132:1145:void handleContainerAck(net.minecraft.network.protocol.game.ClientboundContainerAckPacket) -> a
-    1149:1156:void handleContainerContent(net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket) -> a
-    1160:1169:void handleOpenSignEditor(net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket) -> a
-    1173:1199:void handleBlockEntityData(net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket) -> a
-    1203:1208:void handleContainerSetData(net.minecraft.network.protocol.game.ClientboundContainerSetDataPacket) -> a
-    1212:1217:void handleSetEquippedItem(net.minecraft.network.protocol.game.ClientboundSetEquippedItemPacket) -> a
-    1221:1223:void handleContainerClose(net.minecraft.network.protocol.game.ClientboundContainerClosePacket) -> a
-    1227:1229:void handleBlockEvent(net.minecraft.network.protocol.game.ClientboundBlockEventPacket) -> a
-    1233:1235:void handleBlockDestruction(net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket) -> a
-    1239:1291:void handleGameEvent(net.minecraft.network.protocol.game.ClientboundGameEventPacket) -> a
-    1295:1315:void handleMapItemData(net.minecraft.network.protocol.game.ClientboundMapItemDataPacket) -> a
-    1319:1325:void handleLevelEvent(net.minecraft.network.protocol.game.ClientboundLevelEventPacket) -> a
-    1329:1331:void handleUpdateAdvancementsPacket(net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket) -> a
-    1335:1343:void handleSelectAdvancementsTab(net.minecraft.network.protocol.game.ClientboundSelectAdvancementsTabPacket) -> a
-    1347:1349:void handleCommands(net.minecraft.network.protocol.game.ClientboundCommandsPacket) -> a
-    1353:1355:void handleStopSoundEvent(net.minecraft.network.protocol.game.ClientboundStopSoundPacket) -> a
-    1359:1361:void handleCommandSuggestions(net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket) -> a
-    1365:1374:void handleUpdateRecipes(net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket) -> a
-    1378:1383:void handleLookAt(net.minecraft.network.protocol.game.ClientboundPlayerLookAtPacket) -> a
-    1387:1392:void handleTagQueryPacket(net.minecraft.network.protocol.game.ClientboundTagQueryPacket) -> a
-    1396:1408:void handleAwardStats(net.minecraft.network.protocol.game.ClientboundAwardStatsPacket) -> a
-    1412:1451:void handleAddOrRemoveRecipes(net.minecraft.network.protocol.game.ClientboundRecipePacket) -> a
-    1455:1469:void handleUpdateMobEffect(net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket) -> a
-    1473:1485:void handleUpdateTags(net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket) -> a
-    1489:1501:void handlePlayerCombat(net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket) -> a
-    1505:1508:void handleChangeDifficulty(net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket) -> a
-    1512:1517:void handleSetCamera(net.minecraft.network.protocol.game.ClientboundSetCameraPacket) -> a
-    1521:1523:void handleSetBorder(net.minecraft.network.protocol.game.ClientboundSetBorderPacket) -> a
-    1527:1550:void handleSetTitles(net.minecraft.network.protocol.game.ClientboundSetTitlesPacket) -> a
-    1554:1556:void handleTabListCustomisation(net.minecraft.network.protocol.game.ClientboundTabListPacket) -> a
-    1560:1565:void handleRemoveMobEffect(net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket) -> a
-    1569:1602:void handlePlayerInfo(net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket) -> a
-    1606:1607:void handleKeepAlive(net.minecraft.network.protocol.game.ClientboundKeepAlivePacket) -> a
-    1611:1619:void handlePlayerAbilities(net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket) -> a
-    1623:1625:void handleSoundEvent(net.minecraft.network.protocol.game.ClientboundSoundPacket) -> a
-    1629:1635:void handleSoundEntityEvent(net.minecraft.network.protocol.game.ClientboundSoundEntityPacket) -> a
-    1639:1651:void handleCustomSoundEvent(net.minecraft.network.protocol.game.ClientboundCustomSoundPacket) -> a
-    1655:1709:void handleResourcePack(net.minecraft.network.protocol.game.ClientboundResourcePackPacket) -> a
-    1713:1732:boolean validateResourcePackUrl(java.lang.String) -> b
-    1736:1740:void downloadCallback(java.util.concurrent.CompletableFuture) -> a
-    1743:1744:void send(net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action) -> a
-    1748:1750:void handleBossUpdate(net.minecraft.network.protocol.game.ClientboundBossEventPacket) -> a
-    1754:1760:void handleItemCooldown(net.minecraft.network.protocol.game.ClientboundCooldownPacket) -> a
-    1764:1770:void handleMoveVehicle(net.minecraft.network.protocol.game.ClientboundMoveVehiclePacket) -> a
-    1774:1779:void handleOpenBook(net.minecraft.network.protocol.game.ClientboundOpenBookPacket) -> a
-    1783:2023:void handleCustomPayload(net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket) -> a
-    2027:2044:void handleAddObjective(net.minecraft.network.protocol.game.ClientboundSetObjectivePacket) -> a
-    2048:2064:void handleSetScore(net.minecraft.network.protocol.game.ClientboundSetScorePacket) -> a
-    2068:2074:void handleSetDisplayObjective(net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket) -> a
-    2078:2119:void handleSetPlayerTeamPacket(net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket) -> a
-    2123:2149:void handleParticleEvent(net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket) -> a
-    2153:2177:void handleUpdateAttributes(net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket) -> a
-    2181:2194:void handlePlaceRecipe(net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket) -> a
-    2198:2214:void handleLightUpdatePacked(net.minecraft.network.protocol.game.ClientboundLightUpdatePacket) -> a
-    2218:2227:void handleMerchantOffers(net.minecraft.network.protocol.game.ClientboundMerchantOffersPacket) -> a
-    2231:2234:void handleSetChunkCacheRadius(net.minecraft.network.protocol.game.ClientboundSetChunkCacheRadiusPacket) -> a
-    2238:2240:void handleSetChunkCacheCenter(net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket) -> a
-    2244:2246:void handleBlockBreakAck(net.minecraft.network.protocol.game.ClientboundBlockBreakAckPacket) -> a
-    2249:2258:void readSectionList(int,int,net.minecraft.world.level.lighting.LevelLightEngine,net.minecraft.world.level.LightLayer,int,int,java.util.Iterator) -> a
-    2262:2262:net.minecraft.network.Connection getConnection() -> a
-    2266:2266:java.util.Collection getOnlinePlayers() -> e
-    2271:2271:net.minecraft.client.multiplayer.PlayerInfo getPlayerInfo(java.util.UUID) -> a
-    2276:2282:net.minecraft.client.multiplayer.PlayerInfo getPlayerInfo(java.lang.String) -> a
-    2286:2286:com.mojang.authlib.GameProfile getLocalGameProfile() -> f
-    2290:2290:net.minecraft.client.multiplayer.ClientAdvancements getAdvancements() -> g
-    2294:2294:com.mojang.brigadier.CommandDispatcher getCommands() -> h
-    2298:2298:net.minecraft.client.multiplayer.ClientLevel getLevel() -> i
-    2302:2302:net.minecraft.tags.TagManager getTags() -> j
-    2306:2306:net.minecraft.client.DebugQueryHandler getDebugQueryHandler() -> k
-    2310:2310:java.util.UUID getId() -> l
-    2189:2193:void lambda$handlePlaceRecipe$7(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.world.item.crafting.Recipe) -> a
-    1737:1738:java.lang.Void lambda$downloadCallback$6(java.lang.Throwable) -> a
-    1736:1736:void lambda$downloadCallback$5() -> m
-    1684:1684:void lambda$handleResourcePack$4(java.lang.String,java.lang.String) -> a
-    1685:1705:void lambda$null$3(java.lang.String,java.lang.String,boolean) -> a
-    1446:1446:void lambda$handleAddOrRemoveRecipes$2(net.minecraft.client.ClientRecipeBook,net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> a
-    1438:1441:void lambda$handleAddOrRemoveRecipes$1(net.minecraft.client.ClientRecipeBook,net.minecraft.world.item.crafting.Recipe) -> a
-    1262:1262:void lambda$handleGameEvent$0() -> n
-    304:304:void <clinit>() -> <clinit>
-net.minecraft.client.multiplayer.ClientPacketListener$1 -> dnp$1:
+    net.minecraft.client.multiplayer.ClientLevel$ClientLevelData levelData -> g
+    boolean started -> h
+    java.util.Map playerInfoMap -> i
+    net.minecraft.client.multiplayer.ClientAdvancements advancements -> j
+    net.minecraft.client.multiplayer.ClientSuggestionProvider suggestionsProvider -> k
+    net.minecraft.tags.TagManager tags -> l
+    net.minecraft.client.DebugQueryHandler debugQueryHandler -> m
+    int serverChunkRadius -> n
+    java.util.Random random -> o
+    com.mojang.brigadier.CommandDispatcher commands -> p
+    net.minecraft.world.item.crafting.RecipeManager recipeManager -> q
+    java.util.UUID id -> r
+    java.util.Set levels -> s
+    net.minecraft.core.RegistryAccess registryAccess -> t
+    322:344:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.Screen,net.minecraft.network.Connection,com.mojang.authlib.GameProfile) -> <init>
+    347:347:net.minecraft.client.multiplayer.ClientSuggestionProvider getSuggestionsProvider() -> b
+    351:352:void cleanup() -> c
+    355:355:net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> d
+    360:416:void handleLogin(net.minecraft.network.protocol.game.ClientboundLoginPacket) -> a
+    420:532:void handleAddEntity(net.minecraft.network.protocol.game.ClientboundAddEntityPacket) -> a
+    536:547:void handleAddExperienceOrb(net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket) -> a
+    551:556:void handleAddPainting(net.minecraft.network.protocol.game.ClientboundAddPaintingPacket) -> a
+    560:566:void handleSetEntityMotion(net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket) -> a
+    570:575:void handleSetEntityData(net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket) -> a
+    579:594:void handleAddPlayer(net.minecraft.network.protocol.game.ClientboundAddPlayerPacket) -> a
+    598:618:void handleTeleportEntity(net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket) -> a
+    622:626:void handleSetCarriedItem(net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket) -> a
+    630:651:void handleMoveEntity(net.minecraft.network.protocol.game.ClientboundMoveEntityPacket) -> a
+    655:662:void handleRotateMob(net.minecraft.network.protocol.game.ClientboundRotateHeadPacket) -> a
+    666:682:void handleRemoveEntity(net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket) -> a
+    686:766:void handleMovePlayer(net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket) -> a
+    770:775:void handleChunkBlocksUpdate(net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket) -> a
+    779:815:void handleLevelChunk(net.minecraft.network.protocol.game.ClientboundLevelChunkPacket) -> a
+    819:831:void handleForgetLevelChunk(net.minecraft.network.protocol.game.ClientboundForgetLevelChunkPacket) -> a
+    835:837:void handleBlockUpdate(net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket) -> a
+    841:842:void handleDisconnect(net.minecraft.network.protocol.game.ClientboundDisconnectPacket) -> a
+    846:856:void onDisconnect(net.minecraft.network.chat.Component) -> a
+    859:860:void send(net.minecraft.network.protocol.Packet) -> a
+    864:890:void handleTakeItemEntity(net.minecraft.network.protocol.game.ClientboundTakeItemEntityPacket) -> a
+    894:896:void handleChat(net.minecraft.network.protocol.game.ClientboundChatPacket) -> a
+    900:921:void handleAnimate(net.minecraft.network.protocol.game.ClientboundAnimatePacket) -> a
+    925:966:void handleAddMob(net.minecraft.network.protocol.game.ClientboundAddMobPacket) -> a
+    970:973:void handleSetTime(net.minecraft.network.protocol.game.ClientboundSetTimePacket) -> a
+    977:979:void handleSetSpawn(net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket) -> a
+    983:1002:void handleSetEntityPassengersPacket(net.minecraft.network.protocol.game.ClientboundSetPassengersPacket) -> a
+    1006:1011:void handleEntityLinkPacket(net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket) -> a
+    1014:1020:net.minecraft.world.item.ItemStack findTotem(net.minecraft.world.entity.player.Player) -> a
+    1025:1042:void handleEntityEvent(net.minecraft.network.protocol.game.ClientboundEntityEventPacket) -> a
+    1046:1050:void handleSetHealth(net.minecraft.network.protocol.game.ClientboundSetHealthPacket) -> a
+    1054:1056:void handleSetExperience(net.minecraft.network.protocol.game.ClientboundSetExperiencePacket) -> a
+    1060:1111:void handleRespawn(net.minecraft.network.protocol.game.ClientboundRespawnPacket) -> a
+    1115:1124:void handleExplosion(net.minecraft.network.protocol.game.ClientboundExplodePacket) -> a
+    1128:1138:void handleHorseScreenOpen(net.minecraft.network.protocol.game.ClientboundHorseScreenOpenPacket) -> a
+    1142:1144:void handleOpenScreen(net.minecraft.network.protocol.game.ClientboundOpenScreenPacket) -> a
+    1148:1183:void handleContainerSetSlot(net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket) -> a
+    1187:1200:void handleContainerAck(net.minecraft.network.protocol.game.ClientboundContainerAckPacket) -> a
+    1204:1211:void handleContainerContent(net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket) -> a
+    1215:1224:void handleOpenSignEditor(net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket) -> a
+    1228:1253:void handleBlockEntityData(net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket) -> a
+    1257:1262:void handleContainerSetData(net.minecraft.network.protocol.game.ClientboundContainerSetDataPacket) -> a
+    1266:1271:void handleSetEquipment(net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket) -> a
+    1275:1277:void handleContainerClose(net.minecraft.network.protocol.game.ClientboundContainerClosePacket) -> a
+    1281:1283:void handleBlockEvent(net.minecraft.network.protocol.game.ClientboundBlockEventPacket) -> a
+    1287:1289:void handleBlockDestruction(net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket) -> a
+    1293:1345:void handleGameEvent(net.minecraft.network.protocol.game.ClientboundGameEventPacket) -> a
+    1349:1369:void handleMapItemData(net.minecraft.network.protocol.game.ClientboundMapItemDataPacket) -> a
+    1373:1379:void handleLevelEvent(net.minecraft.network.protocol.game.ClientboundLevelEventPacket) -> a
+    1383:1385:void handleUpdateAdvancementsPacket(net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket) -> a
+    1389:1397:void handleSelectAdvancementsTab(net.minecraft.network.protocol.game.ClientboundSelectAdvancementsTabPacket) -> a
+    1401:1403:void handleCommands(net.minecraft.network.protocol.game.ClientboundCommandsPacket) -> a
+    1407:1409:void handleStopSoundEvent(net.minecraft.network.protocol.game.ClientboundStopSoundPacket) -> a
+    1413:1415:void handleCommandSuggestions(net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket) -> a
+    1419:1428:void handleUpdateRecipes(net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket) -> a
+    1432:1437:void handleLookAt(net.minecraft.network.protocol.game.ClientboundPlayerLookAtPacket) -> a
+    1441:1446:void handleTagQueryPacket(net.minecraft.network.protocol.game.ClientboundTagQueryPacket) -> a
+    1450:1462:void handleAwardStats(net.minecraft.network.protocol.game.ClientboundAwardStatsPacket) -> a
+    1466:1505:void handleAddOrRemoveRecipes(net.minecraft.network.protocol.game.ClientboundRecipePacket) -> a
+    1509:1523:void handleUpdateMobEffect(net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket) -> a
+    1527:1536:void handleUpdateTags(net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket) -> a
+    1540:1552:void handlePlayerCombat(net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket) -> a
+    1556:1559:void handleChangeDifficulty(net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket) -> a
+    1563:1568:void handleSetCamera(net.minecraft.network.protocol.game.ClientboundSetCameraPacket) -> a
+    1572:1574:void handleSetBorder(net.minecraft.network.protocol.game.ClientboundSetBorderPacket) -> a
+    1578:1601:void handleSetTitles(net.minecraft.network.protocol.game.ClientboundSetTitlesPacket) -> a
+    1605:1607:void handleTabListCustomisation(net.minecraft.network.protocol.game.ClientboundTabListPacket) -> a
+    1611:1616:void handleRemoveMobEffect(net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket) -> a
+    1620:1653:void handlePlayerInfo(net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket) -> a
+    1657:1658:void handleKeepAlive(net.minecraft.network.protocol.game.ClientboundKeepAlivePacket) -> a
+    1662:1670:void handlePlayerAbilities(net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket) -> a
+    1674:1676:void handleSoundEvent(net.minecraft.network.protocol.game.ClientboundSoundPacket) -> a
+    1680:1686:void handleSoundEntityEvent(net.minecraft.network.protocol.game.ClientboundSoundEntityPacket) -> a
+    1690:1702:void handleCustomSoundEvent(net.minecraft.network.protocol.game.ClientboundCustomSoundPacket) -> a
+    1706:1760:void handleResourcePack(net.minecraft.network.protocol.game.ClientboundResourcePackPacket) -> a
+    1764:1783:boolean validateResourcePackUrl(java.lang.String) -> b
+    1787:1791:void downloadCallback(java.util.concurrent.CompletableFuture) -> a
+    1794:1795:void send(net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action) -> a
+    1799:1801:void handleBossUpdate(net.minecraft.network.protocol.game.ClientboundBossEventPacket) -> a
+    1805:1811:void handleItemCooldown(net.minecraft.network.protocol.game.ClientboundCooldownPacket) -> a
+    1815:1821:void handleMoveVehicle(net.minecraft.network.protocol.game.ClientboundMoveVehiclePacket) -> a
+    1825:1830:void handleOpenBook(net.minecraft.network.protocol.game.ClientboundOpenBookPacket) -> a
+    1834:2081:void handleCustomPayload(net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket) -> a
+    2085:2102:void handleAddObjective(net.minecraft.network.protocol.game.ClientboundSetObjectivePacket) -> a
+    2106:2122:void handleSetScore(net.minecraft.network.protocol.game.ClientboundSetScorePacket) -> a
+    2126:2132:void handleSetDisplayObjective(net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket) -> a
+    2136:2177:void handleSetPlayerTeamPacket(net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket) -> a
+    2181:2207:void handleParticleEvent(net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket) -> a
+    2211:2235:void handleUpdateAttributes(net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket) -> a
+    2239:2252:void handlePlaceRecipe(net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket) -> a
+    2256:2272:void handleLightUpdatePacked(net.minecraft.network.protocol.game.ClientboundLightUpdatePacket) -> a
+    2276:2285:void handleMerchantOffers(net.minecraft.network.protocol.game.ClientboundMerchantOffersPacket) -> a
+    2289:2292:void handleSetChunkCacheRadius(net.minecraft.network.protocol.game.ClientboundSetChunkCacheRadiusPacket) -> a
+    2296:2298:void handleSetChunkCacheCenter(net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket) -> a
+    2302:2304:void handleBlockBreakAck(net.minecraft.network.protocol.game.ClientboundBlockBreakAckPacket) -> a
+    2307:2316:void readSectionList(int,int,net.minecraft.world.level.lighting.LevelLightEngine,net.minecraft.world.level.LightLayer,int,int,java.util.Iterator,boolean) -> a
+    2320:2320:net.minecraft.network.Connection getConnection() -> a
+    2324:2324:java.util.Collection getOnlinePlayers() -> e
+    2329:2329:net.minecraft.client.multiplayer.PlayerInfo getPlayerInfo(java.util.UUID) -> a
+    2334:2340:net.minecraft.client.multiplayer.PlayerInfo getPlayerInfo(java.lang.String) -> a
+    2344:2344:com.mojang.authlib.GameProfile getLocalGameProfile() -> f
+    2348:2348:net.minecraft.client.multiplayer.ClientAdvancements getAdvancements() -> g
+    2352:2352:com.mojang.brigadier.CommandDispatcher getCommands() -> h
+    2356:2356:net.minecraft.client.multiplayer.ClientLevel getLevel() -> i
+    2360:2360:net.minecraft.tags.TagManager getTags() -> j
+    2364:2364:net.minecraft.client.DebugQueryHandler getDebugQueryHandler() -> k
+    2368:2368:java.util.UUID getId() -> l
+    2372:2372:java.util.Set levels() -> m
+    2376:2376:net.minecraft.core.RegistryAccess registryAccess() -> n
+    2247:2251:void lambda$handlePlaceRecipe$9(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.world.item.crafting.Recipe) -> a
+    1788:1789:java.lang.Void lambda$downloadCallback$8(java.lang.Throwable) -> a
+    1787:1787:void lambda$downloadCallback$7() -> o
+    1735:1735:void lambda$handleResourcePack$6(java.lang.String,java.lang.String) -> a
+    1736:1756:void lambda$null$5(java.lang.String,java.lang.String,boolean) -> a
+    1500:1500:void lambda$handleAddOrRemoveRecipes$4(net.minecraft.client.ClientRecipeBook,net.minecraft.client.gui.screens.recipebook.RecipeCollection) -> a
+    1492:1495:void lambda$handleAddOrRemoveRecipes$3(net.minecraft.client.ClientRecipeBook,net.minecraft.world.item.crafting.Recipe) -> a
+    1313:1313:void lambda$handleGameEvent$2() -> p
+    1269:1269:void lambda$handleSetEquipment$1(net.minecraft.world.entity.Entity,com.mojang.datafixers.util.Pair) -> a
+    813:813:void lambda$handleLevelChunk$0(net.minecraft.world.level.chunk.LevelChunk,net.minecraft.core.BlockPos) -> a
+    311:311:void <clinit>() -> <clinit>
+net.minecraft.client.multiplayer.ClientPacketListener$1 -> dyn$1:
     int[] $SwitchMap$net$minecraft$network$protocol$game$ClientboundRecipePacket$State -> a
     int[] $SwitchMap$net$minecraft$network$protocol$game$ClientboundSetTitlesPacket$Type -> b
     int[] $SwitchMap$net$minecraft$network$protocol$game$ClientboundPlayerInfoPacket$Action -> c
     int[] $SwitchMap$net$minecraft$server$ServerScoreboard$Method -> d
-    1421:2052:void <clinit>() -> <clinit>
-net.minecraft.client.multiplayer.ClientSuggestionProvider -> dnq:
+    1475:2110:void <clinit>() -> <clinit>
+net.minecraft.client.multiplayer.ClientSuggestionProvider -> dyo:
     net.minecraft.client.multiplayer.ClientPacketListener connection -> a
     net.minecraft.client.Minecraft minecraft -> b
     int pendingSuggestionsId -> c
     java.util.concurrent.CompletableFuture pendingSuggestionsFuture -> d
-    29:35:void <init>(net.minecraft.client.multiplayer.ClientPacketListener,net.minecraft.client.Minecraft) -> <init>
-    39:45:java.util.Collection getOnlinePlayerNames() -> l
-    50:53:java.util.Collection getSelectedEntities() -> p
-    58:58:java.util.Collection getAllTeams() -> m
-    63:63:java.util.Collection getAvailableSoundEvents() -> n
-    68:68:java.util.stream.Stream getRecipeNames() -> o
-    73:74:boolean hasPermission(int) -> c
-    79:85:java.util.concurrent.CompletableFuture customSuggestion(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    89:89:java.lang.String prettyPrint(double) -> a
-    93:93:java.lang.String prettyPrint(int) -> a
-    98:104:java.util.Collection getRelevantCoordinates() -> q
-    109:115:java.util.Collection getAbsoluteCoordinates() -> r
-    119:124:void completeCustomSuggestions(int,com.mojang.brigadier.suggestion.Suggestions) -> a
-net.minecraft.client.multiplayer.MultiPlayerGameMode -> dnr:
+    33:39:void <init>(net.minecraft.client.multiplayer.ClientPacketListener,net.minecraft.client.Minecraft) -> <init>
+    43:49:java.util.Collection getOnlinePlayerNames() -> l
+    54:57:java.util.Collection getSelectedEntities() -> r
+    62:62:java.util.Collection getAllTeams() -> m
+    67:67:java.util.Collection getAvailableSoundEvents() -> n
+    72:72:java.util.stream.Stream getRecipeNames() -> o
+    77:78:boolean hasPermission(int) -> c
+    83:89:java.util.concurrent.CompletableFuture customSuggestion(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    93:93:java.lang.String prettyPrint(double) -> a
+    97:97:java.lang.String prettyPrint(int) -> a
+    102:108:java.util.Collection getRelevantCoordinates() -> s
+    113:119:java.util.Collection getAbsoluteCoordinates() -> t
+    124:124:java.util.Set levels() -> p
+    129:129:net.minecraft.core.RegistryAccess registryAccess() -> q
+    133:138:void completeCustomSuggestions(int,com.mojang.brigadier.suggestion.Suggestions) -> a
+net.minecraft.client.multiplayer.MultiPlayerGameMode -> dyp:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.client.Minecraft minecraft -> b
     net.minecraft.client.multiplayer.ClientPacketListener connection -> c
@@ -12524,46 +13358,49 @@ net.minecraft.client.multiplayer.MultiPlayerGameMode -> dnr:
     int destroyDelay -> h
     boolean isDestroying -> i
     net.minecraft.world.level.GameType localPlayerMode -> j
-    it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap unAckedActions -> k
-    int carriedIndex -> l
-    57:70:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.multiplayer.ClientPacketListener) -> <init>
-    73:76:void creativeDestroyBlock(net.minecraft.client.Minecraft,net.minecraft.client.multiplayer.MultiPlayerGameMode,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    79:80:void adjustPlayer(net.minecraft.world.entity.player.Player) -> a
-    83:85:void setLocalMode(net.minecraft.world.level.GameType) -> a
-    88:88:boolean canHurtPlayer() -> a
-    92:124:boolean destroyBlock(net.minecraft.core.BlockPos) -> a
-    128:174:boolean startDestroyBlock(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    178:190:void stopDestroyBlock() -> b
-    193:248:boolean continueDestroyBlock(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    252:255:float getPickRange() -> c
-    259:266:void tick() -> d
-    271:276:boolean sameDestroyTarget(net.minecraft.core.BlockPos) -> b
-    280:285:void ensureHasSentCarriedItem() -> m
-    288:332:net.minecraft.world.InteractionResult useItemOn(net.minecraft.client.player.LocalPlayer,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    336:355:net.minecraft.world.InteractionResult useItem(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.world.InteractionHand) -> a
-    359:359:net.minecraft.client.player.LocalPlayer createPlayer(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.stats.StatsCounter,net.minecraft.client.ClientRecipeBook) -> a
-    363:369:void attack(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity) -> a
-    372:377:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.world.InteractionHand) -> a
-    381:387:net.minecraft.world.InteractionResult interactAt(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.world.phys.EntityHitResult,net.minecraft.world.InteractionHand) -> a
-    391:396:net.minecraft.world.item.ItemStack handleInventoryMouseClick(int,int,int,net.minecraft.world.inventory.ClickType,net.minecraft.world.entity.player.Player) -> a
-    400:401:void handlePlaceRecipe(int,net.minecraft.world.item.crafting.Recipe,boolean) -> a
-    404:405:void handleInventoryButtonClick(int,int) -> a
-    408:411:void handleCreativeModeItemAdd(net.minecraft.world.item.ItemStack,int) -> a
-    414:417:void handleCreativeModeItemDrop(net.minecraft.world.item.ItemStack) -> a
-    420:423:void releaseUsingItem(net.minecraft.world.entity.player.Player) -> b
-    426:426:boolean hasExperience() -> e
-    430:430:boolean hasMissTime() -> f
-    434:434:boolean hasInfiniteItems() -> g
-    438:438:boolean hasFarPickRange() -> h
-    448:448:boolean isServerControlledInventory() -> i
-    452:452:boolean isAlwaysFlying() -> j
-    456:456:net.minecraft.world.level.GameType getPlayerMode() -> k
-    460:460:boolean isDestroying() -> l
-    464:465:void handlePickItem(int) -> a
-    468:471:void sendBlockAction(net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    477:493:void handleBlockBreakAck(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action,boolean) -> a
+    net.minecraft.world.level.GameType previousLocalPlayerMode -> k
+    it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap unAckedActions -> l
+    int carriedIndex -> m
+    57:71:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.multiplayer.ClientPacketListener) -> <init>
+    74:75:void adjustPlayer(net.minecraft.world.entity.player.Player) -> a
+    78:79:void setPreviousLocalMode(net.minecraft.world.level.GameType) -> a
+    82:87:void setLocalMode(net.minecraft.world.level.GameType) -> b
+    90:90:boolean canHurtPlayer() -> a
+    94:126:boolean destroyBlock(net.minecraft.core.BlockPos) -> a
+    130:176:boolean startDestroyBlock(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    180:192:void stopDestroyBlock() -> b
+    195:250:boolean continueDestroyBlock(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    254:257:float getPickRange() -> c
+    261:268:void tick() -> d
+    273:278:boolean sameDestroyTarget(net.minecraft.core.BlockPos) -> b
+    282:287:void ensureHasSentCarriedItem() -> n
+    290:334:net.minecraft.world.InteractionResult useItemOn(net.minecraft.client.player.LocalPlayer,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    338:357:net.minecraft.world.InteractionResult useItem(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.world.InteractionHand) -> a
+    361:361:net.minecraft.client.player.LocalPlayer createPlayer(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.stats.StatsCounter,net.minecraft.client.ClientRecipeBook) -> a
+    365:365:net.minecraft.client.player.LocalPlayer createPlayer(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.stats.StatsCounter,net.minecraft.client.ClientRecipeBook,boolean,boolean) -> a
+    369:375:void attack(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity) -> a
+    378:383:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.world.InteractionHand) -> a
+    387:393:net.minecraft.world.InteractionResult interactAt(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.world.phys.EntityHitResult,net.minecraft.world.InteractionHand) -> a
+    397:402:net.minecraft.world.item.ItemStack handleInventoryMouseClick(int,int,int,net.minecraft.world.inventory.ClickType,net.minecraft.world.entity.player.Player) -> a
+    406:407:void handlePlaceRecipe(int,net.minecraft.world.item.crafting.Recipe,boolean) -> a
+    410:411:void handleInventoryButtonClick(int,int) -> a
+    414:417:void handleCreativeModeItemAdd(net.minecraft.world.item.ItemStack,int) -> a
+    420:423:void handleCreativeModeItemDrop(net.minecraft.world.item.ItemStack) -> a
+    426:429:void releaseUsingItem(net.minecraft.world.entity.player.Player) -> b
+    432:432:boolean hasExperience() -> e
+    436:436:boolean hasMissTime() -> f
+    440:440:boolean hasInfiniteItems() -> g
+    444:444:boolean hasFarPickRange() -> h
+    454:454:boolean isServerControlledInventory() -> i
+    458:458:boolean isAlwaysFlying() -> j
+    462:462:net.minecraft.world.level.GameType getPreviousPlayerMode() -> k
+    466:466:net.minecraft.world.level.GameType getPlayerMode() -> l
+    470:470:boolean isDestroying() -> m
+    474:475:void handlePickItem(int) -> a
+    478:481:void sendBlockAction(net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    487:506:void handleBlockBreakAck(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action,boolean) -> a
     52:52:void <clinit>() -> <clinit>
-net.minecraft.client.multiplayer.PlayerInfo -> dns:
+net.minecraft.client.multiplayer.PlayerInfo -> dyq:
     com.mojang.authlib.GameProfile profile -> a
     java.util.Map textureLocations -> b
     net.minecraft.world.level.GameType gameMode -> c
@@ -12603,578 +13440,611 @@ net.minecraft.client.multiplayer.PlayerInfo -> dns:
     165:165:long getRenderVisibilityId() -> q
     169:170:void setRenderVisibilityId(long) -> c
     109:117:void lambda$registerTextures$0(com.mojang.authlib.minecraft.MinecraftProfileTexture$Type,net.minecraft.resources.ResourceLocation,com.mojang.authlib.minecraft.MinecraftProfileTexture) -> a
-net.minecraft.client.multiplayer.ServerAddress -> dnt:
+net.minecraft.client.multiplayer.ServerAddress -> dyr:
     java.lang.String host -> a
     int port -> b
-    15:18:void <init>(java.lang.String,int) -> <init>
-    22:24:java.lang.String getHost() -> a
-    29:29:int getPort() -> b
-    33:70:net.minecraft.client.multiplayer.ServerAddress parseString(java.lang.String) -> a
-    75:88:java.lang.String[] lookupSrv(java.lang.String) -> b
-    94:98:int parseInt(java.lang.String,int) -> a
-net.minecraft.client.multiplayer.ServerData -> dnu:
+    17:20:void <init>(java.lang.String,int) -> <init>
+    24:26:java.lang.String getHost() -> a
+    31:31:int getPort() -> b
+    35:72:net.minecraft.client.multiplayer.ServerAddress parseString(java.lang.String) -> a
+    77:94:com.mojang.datafixers.util.Pair lookupSrv(java.lang.String) -> b
+    99:103:int parseInt(java.lang.String,int) -> a
+net.minecraft.client.multiplayer.ServerData -> dys:
     java.lang.String name -> a
     java.lang.String ip -> b
-    java.lang.String status -> c
-    java.lang.String motd -> d
+    net.minecraft.network.chat.Component status -> c
+    net.minecraft.network.chat.Component motd -> d
     long ping -> e
     int protocol -> f
-    java.lang.String version -> g
+    net.minecraft.network.chat.Component version -> g
     boolean pinged -> h
-    java.lang.String playerList -> i
+    java.util.List playerList -> i
     net.minecraft.client.multiplayer.ServerData$ServerPackStatus packStatus -> j
     java.lang.String iconB64 -> k
     boolean lan -> l
-    17:29:void <init>(java.lang.String,java.lang.String,boolean) -> <init>
-    32:46:net.minecraft.nbt.CompoundTag write() -> a
-    50:50:net.minecraft.client.multiplayer.ServerData$ServerPackStatus getResourcePackStatus() -> b
-    54:55:void setResourcePackStatus(net.minecraft.client.multiplayer.ServerData$ServerPackStatus) -> a
-    58:74:net.minecraft.client.multiplayer.ServerData read(net.minecraft.nbt.CompoundTag) -> a
-    79:79:java.lang.String getIconB64() -> c
-    83:84:void setIconB64(java.lang.String) -> a
-    87:87:boolean isLan() -> d
-    91:96:void copyFrom(net.minecraft.client.multiplayer.ServerData) -> a
-net.minecraft.client.multiplayer.ServerData$ServerPackStatus -> dnu$a:
+    20:33:void <init>(java.lang.String,java.lang.String,boolean) -> <init>
+    36:50:net.minecraft.nbt.CompoundTag write() -> a
+    54:54:net.minecraft.client.multiplayer.ServerData$ServerPackStatus getResourcePackStatus() -> b
+    58:59:void setResourcePackStatus(net.minecraft.client.multiplayer.ServerData$ServerPackStatus) -> a
+    62:78:net.minecraft.client.multiplayer.ServerData read(net.minecraft.nbt.CompoundTag) -> a
+    83:83:java.lang.String getIconB64() -> c
+    87:88:void setIconB64(java.lang.String) -> a
+    91:91:boolean isLan() -> d
+    95:100:void copyFrom(net.minecraft.client.multiplayer.ServerData) -> a
+net.minecraft.client.multiplayer.ServerData$ServerPackStatus -> dys$a:
     net.minecraft.client.multiplayer.ServerData$ServerPackStatus ENABLED -> a
     net.minecraft.client.multiplayer.ServerData$ServerPackStatus DISABLED -> b
     net.minecraft.client.multiplayer.ServerData$ServerPackStatus PROMPT -> c
     net.minecraft.network.chat.Component name -> d
     net.minecraft.client.multiplayer.ServerData$ServerPackStatus[] $VALUES -> e
-    98:98:net.minecraft.client.multiplayer.ServerData$ServerPackStatus[] values() -> values
-    98:98:net.minecraft.client.multiplayer.ServerData$ServerPackStatus valueOf(java.lang.String) -> valueOf
-    106:108:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    111:111:net.minecraft.network.chat.Component getName() -> a
-    98:101:void <clinit>() -> <clinit>
-net.minecraft.client.multiplayer.ServerList -> dnv:
+    102:102:net.minecraft.client.multiplayer.ServerData$ServerPackStatus[] values() -> values
+    102:102:net.minecraft.client.multiplayer.ServerData$ServerPackStatus valueOf(java.lang.String) -> valueOf
+    110:112:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    115:115:net.minecraft.network.chat.Component getName() -> a
+    102:105:void <clinit>() -> <clinit>
+net.minecraft.client.multiplayer.ServerList -> dyt:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.client.Minecraft minecraft -> b
     java.util.List serverList -> c
-    19:24:void <init>(net.minecraft.client.Minecraft) -> <init>
-    28:42:void load() -> a
-    46:57:void save() -> b
-    60:60:net.minecraft.client.multiplayer.ServerData get(int) -> a
-    64:65:void remove(net.minecraft.client.multiplayer.ServerData) -> a
-    68:69:void add(net.minecraft.client.multiplayer.ServerData) -> b
-    72:72:int size() -> c
-    76:80:void swap(int,int) -> a
-    83:84:void replace(int,net.minecraft.client.multiplayer.ServerData) -> a
-    87:100:void saveSingleServer(net.minecraft.client.multiplayer.ServerData) -> c
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.client.multiplayer.ServerStatusPinger -> dnw:
+    20:25:void <init>(net.minecraft.client.Minecraft) -> <init>
+    29:43:void load() -> a
+    47:64:void save() -> b
+    67:67:net.minecraft.client.multiplayer.ServerData get(int) -> a
+    71:72:void remove(net.minecraft.client.multiplayer.ServerData) -> a
+    75:76:void add(net.minecraft.client.multiplayer.ServerData) -> b
+    79:79:int size() -> c
+    83:87:void swap(int,int) -> a
+    90:91:void replace(int,net.minecraft.client.multiplayer.ServerData) -> a
+    94:107:void saveSingleServer(net.minecraft.client.multiplayer.ServerData) -> c
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.client.multiplayer.ServerStatusPinger -> dyu:
     com.google.common.base.Splitter SPLITTER -> a
     org.apache.logging.log4j.Logger LOGGER -> b
     java.util.List connections -> c
-    45:49:void <init>() -> <init>
-    52:160:void pingServer(net.minecraft.client.multiplayer.ServerData) -> a
-    163:242:void pingLegacyServer(net.minecraft.client.multiplayer.ServerData) -> b
-    245:258:void tick() -> a
-    261:272:void removeAll() -> b
-    45:45:org.apache.logging.log4j.Logger access$000() -> c
-    45:45:void access$100(net.minecraft.client.multiplayer.ServerStatusPinger,net.minecraft.client.multiplayer.ServerData) -> a
-    45:45:com.google.common.base.Splitter access$200() -> d
-    46:47:void <clinit>() -> <clinit>
-net.minecraft.client.multiplayer.ServerStatusPinger$1 -> dnw$1:
-    boolean success -> d
-    boolean receivedPing -> e
-    long pingStart -> f
+    46:50:void <init>() -> <init>
+    53:158:void pingServer(net.minecraft.client.multiplayer.ServerData,java.lang.Runnable) -> a
+    161:240:void pingLegacyServer(net.minecraft.client.multiplayer.ServerData) -> a
+    243:243:net.minecraft.network.chat.Component formatPlayerCount(int,int) -> b
+    247:260:void tick() -> a
+    263:274:void removeAll() -> b
+    46:46:net.minecraft.network.chat.Component access$000(int,int) -> a
+    46:46:org.apache.logging.log4j.Logger access$100() -> c
+    46:46:void access$200(net.minecraft.client.multiplayer.ServerStatusPinger,net.minecraft.client.multiplayer.ServerData) -> a
+    46:46:com.google.common.base.Splitter access$300() -> d
+    47:48:void <clinit>() -> <clinit>
+net.minecraft.client.multiplayer.ServerStatusPinger$1 -> dyu$1:
+    boolean success -> e
+    boolean receivedPing -> f
+    long pingStart -> g
     net.minecraft.network.Connection val$connection -> a
     net.minecraft.client.multiplayer.ServerData val$data -> b
-    net.minecraft.client.multiplayer.ServerStatusPinger this$0 -> c
-    61:61:void <init>(net.minecraft.client.multiplayer.ServerStatusPinger,net.minecraft.network.Connection,net.minecraft.client.multiplayer.ServerData) -> <init>
-    68:126:void handleStatusResponse(net.minecraft.network.protocol.status.ClientboundStatusResponsePacket) -> a
-    130:135:void handlePongResponse(net.minecraft.network.protocol.status.ClientboundPongResponsePacket) -> a
-    139:146:void onDisconnect(net.minecraft.network.chat.Component) -> a
-    150:150:net.minecraft.network.Connection getConnection() -> a
-net.minecraft.client.multiplayer.ServerStatusPinger$2 -> dnw$2:
+    java.lang.Runnable val$onPersistentDataChange -> c
+    net.minecraft.client.multiplayer.ServerStatusPinger this$0 -> d
+    62:62:void <init>(net.minecraft.client.multiplayer.ServerStatusPinger,net.minecraft.network.Connection,net.minecraft.client.multiplayer.ServerData,java.lang.Runnable) -> <init>
+    69:124:void handleStatusResponse(net.minecraft.network.protocol.status.ClientboundStatusResponsePacket) -> a
+    128:133:void handlePongResponse(net.minecraft.network.protocol.status.ClientboundPongResponsePacket) -> a
+    137:144:void onDisconnect(net.minecraft.network.chat.Component) -> a
+    148:148:net.minecraft.network.Connection getConnection() -> a
+net.minecraft.client.multiplayer.ServerStatusPinger$2 -> dyu$2:
     net.minecraft.client.multiplayer.ServerAddress val$address -> a
     net.minecraft.client.multiplayer.ServerData val$data -> b
     net.minecraft.client.multiplayer.ServerStatusPinger this$0 -> c
-    168:168:void <init>(net.minecraft.client.multiplayer.ServerStatusPinger,net.minecraft.client.multiplayer.ServerAddress,net.minecraft.client.multiplayer.ServerData) -> <init>
-    172:238:void initChannel(io.netty.channel.Channel) -> initChannel
-net.minecraft.client.multiplayer.ServerStatusPinger$2$1 -> dnw$2$1:
+    166:166:void <init>(net.minecraft.client.multiplayer.ServerStatusPinger,net.minecraft.client.multiplayer.ServerAddress,net.minecraft.client.multiplayer.ServerData) -> <init>
+    170:236:void initChannel(io.netty.channel.Channel) -> initChannel
+net.minecraft.client.multiplayer.ServerStatusPinger$2$1 -> dyu$2$1:
     net.minecraft.client.multiplayer.ServerStatusPinger$2 this$1 -> a
-    177:177:void <init>(net.minecraft.client.multiplayer.ServerStatusPinger$2) -> <init>
-    180:205:void channelActive(io.netty.channel.ChannelHandlerContext) -> channelActive
-    209:230:void channelRead0(io.netty.channel.ChannelHandlerContext,io.netty.buffer.ByteBuf) -> a
-    234:235:void exceptionCaught(io.netty.channel.ChannelHandlerContext,java.lang.Throwable) -> exceptionCaught
-    177:177:void channelRead0(io.netty.channel.ChannelHandlerContext,java.lang.Object) -> channelRead0
-net.minecraft.client.multiplayer.package-info -> dnx:
-net.minecraft.client.package-info -> dny:
-net.minecraft.client.particle.AttackSweepParticle -> dnz:
+    175:175:void <init>(net.minecraft.client.multiplayer.ServerStatusPinger$2) -> <init>
+    178:203:void channelActive(io.netty.channel.ChannelHandlerContext) -> channelActive
+    207:228:void channelRead0(io.netty.channel.ChannelHandlerContext,io.netty.buffer.ByteBuf) -> a
+    232:233:void exceptionCaught(io.netty.channel.ChannelHandlerContext,java.lang.Throwable) -> exceptionCaught
+    175:175:void channelRead0(io.netty.channel.ChannelHandlerContext,java.lang.Object) -> channelRead0
+net.minecraft.client.multiplayer.package-info -> dyv:
+net.minecraft.client.package-info -> dyw:
+net.minecraft.client.particle.AshParticle -> dyx:
+    8:9:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,float,net.minecraft.client.particle.SpriteSet) -> <init>
+net.minecraft.client.particle.AshParticle$Provider -> dyx$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    10:19:void <init>(net.minecraft.world.level.Level,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    14:16:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    20:20:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    11:11:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.AttackSweepParticle -> dyy:
+    net.minecraft.client.particle.SpriteSet sprites -> a
+    10:19:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     23:23:int getLightColor(float) -> a
     28:38:void tick() -> a
     42:42:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.AttackSweepParticle$1) -> <init>
-net.minecraft.client.particle.AttackSweepParticle$1 -> dnz$1:
-net.minecraft.client.particle.AttackSweepParticle$Provider -> dnz$a:
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.AttackSweepParticle$1) -> <init>
+net.minecraft.client.particle.AttackSweepParticle$1 -> dyy$1:
+net.minecraft.client.particle.AttackSweepParticle$Provider -> dyy$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     48:50:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    54:54:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    45:45:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.BarrierParticle -> doa:
-    11:16:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.ItemLike) -> <init>
+    54:54:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    45:45:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.BarrierParticle -> dyz:
+    11:16:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.ItemLike) -> <init>
     20:20:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     25:25:float getQuadSize(float) -> b
-    9:9:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.ItemLike,net.minecraft.client.particle.BarrierParticle$1) -> <init>
-net.minecraft.client.particle.BarrierParticle$1 -> doa$1:
-net.minecraft.client.particle.BarrierParticle$Provider -> doa$a:
+    9:9:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.ItemLike,net.minecraft.client.particle.BarrierParticle$1) -> <init>
+net.minecraft.client.particle.BarrierParticle$1 -> dyz$1:
+net.minecraft.client.particle.BarrierParticle$Provider -> dyz$a:
     28:28:void <init>() -> <init>
-    31:31:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    28:28:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.BreakingItemParticle -> dob:
+    31:31:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    28:28:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.BaseAshSmokeParticle -> dza:
+    net.minecraft.client.particle.SpriteSet sprites -> a
+    double fallSpeed -> b
+    11:32:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,float,float,float,double,double,double,float,net.minecraft.client.particle.SpriteSet,float,int,double,boolean) -> <init>
+    36:36:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
+    41:41:float getQuadSize(float) -> b
+    46:71:void tick() -> a
+net.minecraft.client.particle.BreakingItemParticle -> dzb:
     float uo -> a
-    float vo -> C
-    16:23:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.world.item.ItemStack) -> <init>
+    float vo -> b
+    16:23:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.world.item.ItemStack) -> <init>
     27:27:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    31:38:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.item.ItemStack) -> <init>
+    31:38:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.item.ItemStack) -> <init>
     42:42:float getU0() -> c
     47:47:float getU1() -> d
     52:52:float getV0() -> e
     57:57:float getV1() -> f
-    11:11:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.world.item.ItemStack,net.minecraft.client.particle.BreakingItemParticle$1) -> <init>
-net.minecraft.client.particle.BreakingItemParticle$1 -> dob$1:
-net.minecraft.client.particle.BreakingItemParticle$Provider -> dob$a:
+    11:11:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.world.item.ItemStack,net.minecraft.client.particle.BreakingItemParticle$1) -> <init>
+net.minecraft.client.particle.BreakingItemParticle$1 -> dzb$1:
+net.minecraft.client.particle.BreakingItemParticle$Provider -> dzb$a:
     60:60:void <init>() -> <init>
-    63:63:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ItemParticleOption,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    60:60:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.BreakingItemParticle$SlimeProvider -> dob$b:
+    63:63:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ItemParticleOption,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    60:60:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.BreakingItemParticle$SlimeProvider -> dzb$b:
     67:67:void <init>() -> <init>
-    70:70:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    67:67:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.BreakingItemParticle$SnowballProvider -> dob$c:
+    70:70:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    67:67:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.BreakingItemParticle$SnowballProvider -> dzb$c:
     74:74:void <init>() -> <init>
-    77:77:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    74:74:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.BubbleColumnUpParticle -> doc:
-    10:20:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    77:77:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    74:74:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.BubbleColumnUpParticle -> dzc:
+    10:20:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
     24:42:void tick() -> a
     46:46:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    8:8:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.BubbleColumnUpParticle$1) -> <init>
-net.minecraft.client.particle.BubbleColumnUpParticle$1 -> doc$1:
-net.minecraft.client.particle.BubbleColumnUpParticle$Provider -> doc$a:
+    8:8:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.BubbleColumnUpParticle$1) -> <init>
+net.minecraft.client.particle.BubbleColumnUpParticle$1 -> dzc$1:
+net.minecraft.client.particle.BubbleColumnUpParticle$Provider -> dzc$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     52:54:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    58:60:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    49:49:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.BubbleParticle -> dod:
-    10:20:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    58:60:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    49:49:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.BubbleParticle -> dzd:
+    10:20:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
     24:42:void tick() -> a
     46:46:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    8:8:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.BubbleParticle$1) -> <init>
-net.minecraft.client.particle.BubbleParticle$1 -> dod$1:
-net.minecraft.client.particle.BubbleParticle$Provider -> dod$a:
+    8:8:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.BubbleParticle$1) -> <init>
+net.minecraft.client.particle.BubbleParticle$1 -> dzd$1:
+net.minecraft.client.particle.BubbleParticle$Provider -> dzd$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     52:54:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    58:60:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    49:49:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.BubblePopParticle -> doe:
+    58:60:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    49:49:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.BubblePopParticle -> dze:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    10:18:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    10:18:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     22:35:void tick() -> a
     39:39:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.BubblePopParticle$1) -> <init>
-net.minecraft.client.particle.BubblePopParticle$1 -> doe$1:
-net.minecraft.client.particle.BubblePopParticle$Provider -> doe$a:
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.BubblePopParticle$1) -> <init>
+net.minecraft.client.particle.BubblePopParticle$1 -> dze$1:
+net.minecraft.client.particle.BubblePopParticle$Provider -> dze$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     45:47:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    51:51:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    42:42:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.CampfireSmokeParticle -> dof:
-    8:20:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,boolean) -> <init>
+    51:51:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    42:42:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.CampfireSmokeParticle -> dzf:
+    8:20:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,boolean) -> <init>
     24:42:void tick() -> a
     46:46:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,boolean,net.minecraft.client.particle.CampfireSmokeParticle$1) -> <init>
-net.minecraft.client.particle.CampfireSmokeParticle$1 -> dof$1:
-net.minecraft.client.particle.CampfireSmokeParticle$CosyProvider -> dof$a:
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,boolean,net.minecraft.client.particle.CampfireSmokeParticle$1) -> <init>
+net.minecraft.client.particle.CampfireSmokeParticle$1 -> dzf$1:
+net.minecraft.client.particle.CampfireSmokeParticle$CosyProvider -> dzf$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     52:54:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    58:61:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    49:49:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.CampfireSmokeParticle$SignalProvider -> dof$b:
+    58:61:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    49:49:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.CampfireSmokeParticle$SignalProvider -> dzf$b:
     net.minecraft.client.particle.SpriteSet sprites -> a
     68:70:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    74:77:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    65:65:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.CritParticle -> dog:
-    9:27:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    74:77:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    65:65:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.CritParticle -> dzg:
+    9:27:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
     31:31:float getQuadSize(float) -> b
     36:58:void tick() -> a
     62:62:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    7:7:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.CritParticle$1) -> <init>
-net.minecraft.client.particle.CritParticle$1 -> dog$1:
-net.minecraft.client.particle.CritParticle$DamageIndicatorProvider -> dog$a:
+    7:7:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.CritParticle$1) -> <init>
+net.minecraft.client.particle.CritParticle$1 -> dzg$1:
+net.minecraft.client.particle.CritParticle$DamageIndicatorProvider -> dzg$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     100:102:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    106:109:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    97:97:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.CritParticle$MagicProvider -> dog$b:
+    106:109:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    97:97:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.CritParticle$MagicProvider -> dzg$b:
     net.minecraft.client.particle.SpriteSet sprite -> a
     83:85:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    89:93:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    80:80:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.CritParticle$Provider -> dog$c:
+    89:93:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    80:80:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.CritParticle$Provider -> dzg$c:
     net.minecraft.client.particle.SpriteSet sprite -> a
     68:70:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    74:76:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    65:65:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DragonBreathParticle -> doh:
+    74:76:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    65:65:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DragonBreathParticle -> dzh:
     boolean hasHitGround -> a
-    net.minecraft.client.particle.SpriteSet sprites -> C
-    24:41:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    net.minecraft.client.particle.SpriteSet sprites -> b
+    24:41:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     45:78:void tick() -> a
     82:82:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     87:87:float getQuadSize(float) -> b
-    8:8:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.DragonBreathParticle$1) -> <init>
-net.minecraft.client.particle.DragonBreathParticle$1 -> doh$1:
-net.minecraft.client.particle.DragonBreathParticle$Provider -> doh$a:
+    8:8:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.DragonBreathParticle$1) -> <init>
+net.minecraft.client.particle.DragonBreathParticle$1 -> dzh$1:
+net.minecraft.client.particle.DragonBreathParticle$Provider -> dzh$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     93:95:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    99:99:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    90:90:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DripParticle -> doi:
-    net.minecraft.world.level.material.Fluid type -> a
-    113:117:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid) -> <init>
+    99:99:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    90:90:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle -> dzi:
+    net.minecraft.world.level.material.Fluid type -> b
+    boolean isGlowing -> a
+    113:117:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid) -> <init>
     121:121:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     126:130:int getLightColor(float) -> a
     135:162:void tick() -> a
     165:168:void preMoveUpdate() -> g
     171:171:void postMoveUpdate() -> h
-    15:15:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.client.particle.DripParticle$1) -> <init>
-net.minecraft.client.particle.DripParticle$1 -> doi$1:
-net.minecraft.client.particle.DripParticle$CoolingDripHangParticle -> doi$a:
-    44:45:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions) -> <init>
-    49:53:void preMoveUpdate() -> g
-    42:42:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions,net.minecraft.client.particle.DripParticle$1) -> <init>
-net.minecraft.client.particle.DripParticle$DripHangParticle -> doi$b:
-    net.minecraft.core.particles.ParticleOptions fallingParticle -> a
-    20:24:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions) -> <init>
-    28:32:void preMoveUpdate() -> g
-    36:39:void postMoveUpdate() -> h
-    16:16:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions,net.minecraft.client.particle.DripParticle$1) -> <init>
-net.minecraft.client.particle.DripParticle$DripLandParticle -> doi$c:
-    105:107:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid) -> <init>
-    103:103:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.client.particle.DripParticle$1) -> <init>
-net.minecraft.client.particle.DripParticle$FallAndLandParticle -> doi$d:
-    net.minecraft.core.particles.ParticleOptions landParticle -> a
-    60:62:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions) -> <init>
-    66:70:void postMoveUpdate() -> h
-    56:56:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions,net.minecraft.client.particle.DripParticle$1) -> <init>
-net.minecraft.client.particle.DripParticle$FallingParticle -> doi$e:
-    91:93:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid) -> <init>
-    97:100:void postMoveUpdate() -> h
-    89:89:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.client.particle.DripParticle$1) -> <init>
-net.minecraft.client.particle.DripParticle$HoneyFallAndLandParticle -> doi$f:
-    76:77:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions) -> <init>
-    81:86:void postMoveUpdate() -> h
-    73:73:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions,net.minecraft.client.particle.DripParticle$1) -> <init>
-net.minecraft.client.particle.DripParticle$HoneyFallProvider -> doi$g:
+    14:14:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.client.particle.DripParticle$1) -> <init>
+net.minecraft.client.particle.DripParticle$1 -> dzi$1:
+net.minecraft.client.particle.DripParticle$CoolingDripHangParticle -> dzi$a:
+    43:44:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions) -> <init>
+    48:52:void preMoveUpdate() -> g
+    41:41:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions,net.minecraft.client.particle.DripParticle$1) -> <init>
+net.minecraft.client.particle.DripParticle$DripHangParticle -> dzi$b:
+    net.minecraft.core.particles.ParticleOptions fallingParticle -> b
+    19:23:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions) -> <init>
+    27:31:void preMoveUpdate() -> g
+    35:38:void postMoveUpdate() -> h
+    15:15:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions,net.minecraft.client.particle.DripParticle$1) -> <init>
+net.minecraft.client.particle.DripParticle$DripLandParticle -> dzi$c:
+    104:106:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid) -> <init>
+    102:102:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.client.particle.DripParticle$1) -> <init>
+net.minecraft.client.particle.DripParticle$FallAndLandParticle -> dzi$d:
+    net.minecraft.core.particles.ParticleOptions landParticle -> b
+    59:61:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions) -> <init>
+    65:69:void postMoveUpdate() -> h
+    55:55:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions,net.minecraft.client.particle.DripParticle$1) -> <init>
+net.minecraft.client.particle.DripParticle$FallingParticle -> dzi$e:
+    90:92:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid) -> <init>
+    96:99:void postMoveUpdate() -> h
+    88:88:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.client.particle.DripParticle$1) -> <init>
+net.minecraft.client.particle.DripParticle$HoneyFallAndLandParticle -> dzi$f:
+    75:76:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions) -> <init>
+    80:85:void postMoveUpdate() -> h
+    72:72:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.world.level.material.Fluid,net.minecraft.core.particles.ParticleOptions,net.minecraft.client.particle.DripParticle$1) -> <init>
+net.minecraft.client.particle.DripParticle$HoneyFallProvider -> dzi$g:
     net.minecraft.client.particle.SpriteSet sprite -> a
     273:275:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    279:283:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    270:270:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DripParticle$HoneyHangProvider -> doi$h:
+    279:283:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    270:270:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$HoneyHangProvider -> dzi$h:
     net.minecraft.client.particle.SpriteSet sprite -> a
     255:257:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    261:266:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    252:252:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DripParticle$HoneyLandProvider -> doi$i:
+    261:266:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    252:252:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$HoneyLandProvider -> dzi$i:
     net.minecraft.client.particle.SpriteSet sprite -> a
     290:292:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    296:300:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    287:287:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DripParticle$LavaFallProvider -> doi$j:
+    296:300:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    287:287:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$LavaFallProvider -> dzi$j:
     net.minecraft.client.particle.SpriteSet sprite -> a
     223:225:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    229:232:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    220:220:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DripParticle$LavaHangProvider -> doi$k:
+    229:232:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    220:220:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$LavaHangProvider -> dzi$k:
     net.minecraft.client.particle.SpriteSet sprite -> a
     208:210:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    214:216:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    205:205:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DripParticle$LavaLandProvider -> doi$l:
+    214:216:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    205:205:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$LavaLandProvider -> dzi$l:
     net.minecraft.client.particle.SpriteSet sprite -> a
     239:241:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    245:248:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    236:236:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DripParticle$NectarFallProvider -> doi$m:
+    245:248:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    236:236:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$NectarFallProvider -> dzi$m:
     net.minecraft.client.particle.SpriteSet sprite -> a
     307:309:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    313:318:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    304:304:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DripParticle$WaterFallProvider -> doi$n:
+    313:318:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    304:304:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$ObsidianTearFallProvider -> dzi$n:
+    net.minecraft.client.particle.SpriteSet sprite -> a
+    344:346:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    350:355:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    341:341:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$ObsidianTearHangProvider -> dzi$o:
+    net.minecraft.client.particle.SpriteSet sprite -> a
+    325:327:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    331:337:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    322:322:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$ObsidianTearLandProvider -> dzi$p:
+    net.minecraft.client.particle.SpriteSet sprite -> a
+    362:364:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    368:373:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    359:359:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$WaterFallProvider -> dzi$q:
     net.minecraft.client.particle.SpriteSet sprite -> a
     192:194:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    198:201:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    189:189:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DripParticle$WaterHangProvider -> doi$o:
+    198:201:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    189:189:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DripParticle$WaterHangProvider -> dzi$r:
     net.minecraft.client.particle.SpriteSet sprite -> a
     176:178:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    182:185:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    173:173:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.DustParticle -> doj:
+    182:185:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    173:173:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.DustParticle -> dzj:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    11:26:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.core.particles.DustParticleOptions,net.minecraft.client.particle.SpriteSet) -> <init>
+    11:26:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.core.particles.DustParticleOptions,net.minecraft.client.particle.SpriteSet) -> <init>
     30:30:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     35:35:float getQuadSize(float) -> b
     40:64:void tick() -> a
-    7:7:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.core.particles.DustParticleOptions,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.DustParticle$1) -> <init>
-net.minecraft.client.particle.DustParticle$1 -> doj$1:
-net.minecraft.client.particle.DustParticle$Provider -> doj$a:
+    7:7:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.core.particles.DustParticleOptions,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.DustParticle$1) -> <init>
+net.minecraft.client.particle.DustParticle$1 -> dzj$1:
+net.minecraft.client.particle.DustParticle$Provider -> dzj$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     69:71:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    75:75:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.DustParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    66:66:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.EnchantmentTableParticle -> dok:
+    75:75:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.DustParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    66:66:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.EnchantmentTableParticle -> dzk:
     double xStart -> a
-    double yStart -> C
+    double yStart -> b
     double zStart -> D
-    12:37:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    12:37:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
     41:41:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     46:48:void move(double,double,double) -> a
     52:64:int getLightColor(float) -> a
     69:87:void tick() -> a
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.EnchantmentTableParticle$1) -> <init>
-net.minecraft.client.particle.EnchantmentTableParticle$1 -> dok$1:
-net.minecraft.client.particle.EnchantmentTableParticle$NautilusProvider -> dok$a:
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.EnchantmentTableParticle$1) -> <init>
+net.minecraft.client.particle.EnchantmentTableParticle$1 -> dzk$1:
+net.minecraft.client.particle.EnchantmentTableParticle$NautilusProvider -> dzk$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     107:109:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    113:115:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    104:104:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.EnchantmentTableParticle$Provider -> dok$b:
+    113:115:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    104:104:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.EnchantmentTableParticle$Provider -> dzk$b:
     net.minecraft.client.particle.SpriteSet sprite -> a
     92:94:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    98:100:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    89:89:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.EndRodParticle -> dol:
-    8:20:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    98:100:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    89:89:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.EndRodParticle -> dzl:
+    8:20:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     24:26:void move(double,double,double) -> a
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.EndRodParticle$1) -> <init>
-net.minecraft.client.particle.EndRodParticle$1 -> dol$1:
-net.minecraft.client.particle.EndRodParticle$Provider -> dol$a:
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.EndRodParticle$1) -> <init>
+net.minecraft.client.particle.EndRodParticle$1 -> dzl$1:
+net.minecraft.client.particle.EndRodParticle$Provider -> dzl$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     31:33:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    37:37:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    28:28:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.ExplodeParticle -> dom:
+    37:37:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    28:28:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.ExplodeParticle -> dzm:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    10:24:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    10:24:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     28:28:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     33:54:void tick() -> a
-net.minecraft.client.particle.ExplodeParticle$Provider -> dom$a:
+net.minecraft.client.particle.ExplodeParticle$Provider -> dzm$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     59:61:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    65:65:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    56:56:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.FallingDustParticle -> don:
+    65:65:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    56:56:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.FallingDustParticle -> dzn:
     float rotSpeed -> a
-    net.minecraft.client.particle.SpriteSet sprites -> C
-    19:36:void <init>(net.minecraft.world.level.Level,double,double,double,float,float,float,net.minecraft.client.particle.SpriteSet) -> <init>
+    net.minecraft.client.particle.SpriteSet sprites -> b
+    19:36:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,float,float,float,net.minecraft.client.particle.SpriteSet) -> <init>
     40:40:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     45:45:float getQuadSize(float) -> b
     50:70:void tick() -> a
-    14:14:void <init>(net.minecraft.world.level.Level,double,double,double,float,float,float,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.FallingDustParticle$1) -> <init>
-net.minecraft.client.particle.FallingDustParticle$1 -> don$1:
-net.minecraft.client.particle.FallingDustParticle$Provider -> don$a:
+    14:14:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,float,float,float,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.FallingDustParticle$1) -> <init>
+net.minecraft.client.particle.FallingDustParticle$1 -> dzn$1:
+net.minecraft.client.particle.FallingDustParticle$Provider -> dzn$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     75:77:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    82:95:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.BlockParticleOption,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    72:72:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.FireworkParticles -> doo:
-    21:21:void <init>() -> <init>
-net.minecraft.client.particle.FireworkParticles$1 -> doo$1:
+    82:96:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.BlockParticleOption,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    72:72:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.FireworkParticles -> dzo:
+    22:22:void <init>() -> <init>
+net.minecraft.client.particle.FireworkParticles$1 -> dzo$1:
     int[] $SwitchMap$net$minecraft$world$item$FireworkRocketItem$Shape -> a
-    97:97:void <clinit>() -> <clinit>
-net.minecraft.client.particle.FireworkParticles$FlashProvider -> doo$a:
+    98:98:void <clinit>() -> <clinit>
+net.minecraft.client.particle.FireworkParticles$FlashProvider -> dzo$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
-    346:348:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    352:354:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    343:343:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.FireworkParticles$OverlayParticle -> doo$b:
-    322:324:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    328:328:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    333:335:void render(com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.Camera,float) -> a
-    339:339:float getQuadSize(float) -> b
-    320:320:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.client.particle.FireworkParticles$1) -> <init>
-net.minecraft.client.particle.FireworkParticles$SparkParticle -> doo$c:
-    boolean trail -> C
+    347:349:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    353:355:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    344:344:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.FireworkParticles$OverlayParticle -> dzo$b:
+    323:325:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
+    329:329:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
+    334:336:void render(com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.Camera,float) -> a
+    340:340:float getQuadSize(float) -> b
+    321:321:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.client.particle.FireworkParticles$1) -> <init>
+net.minecraft.client.particle.FireworkParticles$SparkParticle -> dzo$c:
+    boolean trail -> b
     boolean flicker -> D
     net.minecraft.client.particle.ParticleEngine engine -> E
     float fadeR -> F
     float fadeG -> G
     float fadeB -> H
     boolean hasFade -> I
-    272:282:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.ParticleEngine,net.minecraft.client.particle.SpriteSet) -> <init>
-    285:286:void setTrail(boolean) -> a
-    289:290:void setFlicker(boolean) -> b
-    294:297:void render(com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.Camera,float) -> a
-    301:317:void tick() -> a
-    261:261:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.ParticleEngine,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.FireworkParticles$1) -> <init>
-net.minecraft.client.particle.FireworkParticles$SparkProvider -> doo$d:
+    273:283:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.ParticleEngine,net.minecraft.client.particle.SpriteSet) -> <init>
+    286:287:void setTrail(boolean) -> a
+    290:291:void setFlicker(boolean) -> b
+    295:298:void render(com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.Camera,float) -> a
+    302:318:void tick() -> a
+    262:262:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.ParticleEngine,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.FireworkParticles$1) -> <init>
+net.minecraft.client.particle.FireworkParticles$SparkProvider -> dzo$d:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    361:363:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    367:369:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    358:358:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.FireworkParticles$Starter -> doo$e:
+    362:364:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    368:370:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    359:359:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.FireworkParticles$Starter -> dzo$e:
     int life -> a
-    net.minecraft.client.particle.ParticleEngine engine -> A
+    net.minecraft.client.particle.ParticleEngine engine -> b
     net.minecraft.nbt.ListTag explosions -> B
     boolean twinkleDelay -> C
-    29:54:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.ParticleEngine,net.minecraft.nbt.CompoundTag) -> <init>
-    58:168:void tick() -> a
-    171:172:boolean isFarAwayFromCamera() -> c
-    177:187:void createParticle(double,double,double,double,double,double,int[],int[],boolean,boolean) -> a
-    190:210:void createParticleBall(double,int,int[],int[],boolean,boolean) -> a
-    213:245:void createParticleShape(double,double[][],int[],int[],boolean,boolean,boolean) -> a
-    248:258:void createParticleBurst(int[],int[],boolean,boolean) -> a
-net.minecraft.client.particle.FlameParticle -> dop:
-    9:18:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
-    22:22:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    27:29:void move(double,double,double) -> a
-    33:34:float getQuadSize(float) -> b
-    39:49:int getLightColor(float) -> a
-    54:72:void tick() -> a
-    7:7:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.FlameParticle$1) -> <init>
-net.minecraft.client.particle.FlameParticle$1 -> dop$1:
-net.minecraft.client.particle.FlameParticle$Provider -> dop$a:
+    30:55:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.ParticleEngine,net.minecraft.nbt.CompoundTag) -> <init>
+    59:169:void tick() -> a
+    172:173:boolean isFarAwayFromCamera() -> c
+    178:188:void createParticle(double,double,double,double,double,double,int[],int[],boolean,boolean) -> a
+    191:211:void createParticleBall(double,int,int[],int[],boolean,boolean) -> a
+    214:246:void createParticleShape(double,double[][],int[],int[],boolean,boolean,boolean) -> a
+    249:259:void createParticleBurst(int[],int[],boolean,boolean) -> a
+net.minecraft.client.particle.FlameParticle -> dzp:
+    9:10:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
+    14:14:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
+    19:21:void move(double,double,double) -> a
+    25:26:float getQuadSize(float) -> b
+    31:41:int getLightColor(float) -> a
+    7:7:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.FlameParticle$1) -> <init>
+net.minecraft.client.particle.FlameParticle$1 -> dzp$1:
+net.minecraft.client.particle.FlameParticle$Provider -> dzp$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
-    77:79:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    83:85:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    74:74:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.HeartParticle -> doq:
-    9:18:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    47:49:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    53:55:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    44:44:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.HeartParticle -> dzq:
+    9:18:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
     22:22:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     27:27:float getQuadSize(float) -> b
     32:54:void tick() -> a
-    7:7:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.client.particle.HeartParticle$1) -> <init>
-net.minecraft.client.particle.HeartParticle$1 -> doq$1:
-net.minecraft.client.particle.HeartParticle$AngryVillagerProvider -> doq$a:
+    7:7:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.client.particle.HeartParticle$1) -> <init>
+net.minecraft.client.particle.HeartParticle$1 -> dzq$1:
+net.minecraft.client.particle.HeartParticle$AngryVillagerProvider -> dzq$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     74:76:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    80:83:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    71:71:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.HeartParticle$Provider -> doq$b:
+    80:83:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    71:71:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.HeartParticle$Provider -> dzq$b:
     net.minecraft.client.particle.SpriteSet sprite -> a
     59:61:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    65:67:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    56:56:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.HugeExplosionParticle -> dor:
+    65:67:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    56:56:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.HugeExplosionParticle -> dzr:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    10:19:void <init>(net.minecraft.world.level.Level,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    10:19:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     23:23:int getLightColor(float) -> a
     28:38:void tick() -> a
     42:42:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.HugeExplosionParticle$1) -> <init>
-net.minecraft.client.particle.HugeExplosionParticle$1 -> dor$1:
-net.minecraft.client.particle.HugeExplosionParticle$Provider -> dor$a:
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.HugeExplosionParticle$1) -> <init>
+net.minecraft.client.particle.HugeExplosionParticle$1 -> dzr$1:
+net.minecraft.client.particle.HugeExplosionParticle$Provider -> dzr$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     48:50:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    54:54:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    45:45:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.HugeExplosionSeedParticle -> dos:
+    54:54:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    45:45:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.HugeExplosionSeedParticle -> dzs:
     int life -> a
-    int lifeTime -> A
-    12:14:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    int lifeTime -> b
+    12:14:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
     18:28:void tick() -> a
-    7:7:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.client.particle.HugeExplosionSeedParticle$1) -> <init>
-net.minecraft.client.particle.HugeExplosionSeedParticle$1 -> dos$1:
-net.minecraft.client.particle.HugeExplosionSeedParticle$Provider -> dos$a:
+    7:7:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.client.particle.HugeExplosionSeedParticle$1) -> <init>
+net.minecraft.client.particle.HugeExplosionSeedParticle$1 -> dzs$1:
+net.minecraft.client.particle.HugeExplosionSeedParticle$Provider -> dzs$a:
     30:30:void <init>() -> <init>
-    33:33:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    30:30:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.ItemPickupParticle -> dot:
+    33:33:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    30:30:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.ItemPickupParticle -> dzt:
     net.minecraft.client.renderer.RenderBuffers renderBuffers -> a
-    net.minecraft.world.entity.Entity itemEntity -> A
+    net.minecraft.world.entity.Entity itemEntity -> b
     net.minecraft.world.entity.Entity target -> B
     int life -> C
     net.minecraft.client.renderer.entity.EntityRenderDispatcher entityRenderDispatcher -> D
-    24:25:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.RenderBuffers,net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> <init>
-    28:33:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.RenderBuffers,net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3) -> <init>
-    37:37:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    42:57:void render(com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.Camera,float) -> a
-    61:65:void tick() -> a
-net.minecraft.client.particle.LargeSmokeParticle -> dou:
-    8:9:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
-net.minecraft.client.particle.LargeSmokeParticle$Provider -> dou$a:
+    25:26:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.RenderBuffers,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> <init>
+    29:34:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.RenderBuffers,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3) -> <init>
+    37:41:net.minecraft.world.entity.Entity getSafeCopy(net.minecraft.world.entity.Entity) -> a
+    46:46:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
+    51:66:void render(com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.Camera,float) -> a
+    70:74:void tick() -> a
+net.minecraft.client.particle.LargeSmokeParticle -> dzu:
+    8:9:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+net.minecraft.client.particle.LargeSmokeParticle$Provider -> dzu$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     14:16:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    20:20:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    11:11:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.LavaParticle -> dov:
-    9:18:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    20:20:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    11:11:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.LavaParticle -> dzv:
+    9:18:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
     22:22:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     27:31:int getLightColor(float) -> a
     36:37:float getQuadSize(float) -> b
     42:66:void tick() -> a
-    7:7:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.client.particle.LavaParticle$1) -> <init>
-net.minecraft.client.particle.LavaParticle$1 -> dov$1:
-net.minecraft.client.particle.LavaParticle$Provider -> dov$a:
+    7:7:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.client.particle.LavaParticle$1) -> <init>
+net.minecraft.client.particle.LavaParticle$1 -> dzv$1:
+net.minecraft.client.particle.LavaParticle$Provider -> dzv$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     71:73:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    77:79:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    68:68:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.MobAppearanceParticle -> dow:
+    77:79:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    68:68:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.MobAppearanceParticle -> dzw:
     net.minecraft.client.model.Model model -> a
-    net.minecraft.client.renderer.RenderType renderType -> A
-    20:27:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    net.minecraft.client.renderer.RenderType renderType -> b
+    20:27:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
     31:31:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     36:52:void render(com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.Camera,float) -> a
-    19:19:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.client.particle.MobAppearanceParticle$1) -> <init>
-net.minecraft.client.particle.MobAppearanceParticle$1 -> dow$1:
-net.minecraft.client.particle.MobAppearanceParticle$Provider -> dow$a:
+    19:19:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.client.particle.MobAppearanceParticle$1) -> <init>
+net.minecraft.client.particle.MobAppearanceParticle$1 -> dzw$1:
+net.minecraft.client.particle.MobAppearanceParticle$Provider -> dzw$a:
     54:54:void <init>() -> <init>
-    57:57:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    54:54:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.NoRenderParticle -> dox:
-    9:10:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    13:14:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    57:57:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    54:54:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.NoRenderParticle -> dzx:
+    9:10:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
+    13:14:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
     18:18:void render(com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.Camera,float) -> a
     22:22:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-net.minecraft.client.particle.NoteParticle -> doy:
-    9:21:void <init>(net.minecraft.world.level.Level,double,double,double,double) -> <init>
+net.minecraft.client.particle.NoteParticle -> dzy:
+    9:21:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double) -> <init>
     25:25:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     30:30:float getQuadSize(float) -> b
     35:57:void tick() -> a
-    7:7:void <init>(net.minecraft.world.level.Level,double,double,double,double,net.minecraft.client.particle.NoteParticle$1) -> <init>
-net.minecraft.client.particle.NoteParticle$1 -> doy$1:
-net.minecraft.client.particle.NoteParticle$Provider -> doy$a:
+    7:7:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,net.minecraft.client.particle.NoteParticle$1) -> <init>
+net.minecraft.client.particle.NoteParticle$1 -> dzy$1:
+net.minecraft.client.particle.NoteParticle$Provider -> dzy$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     62:64:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    68:70:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    59:59:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.Particle -> doz:
+    68:70:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    59:59:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.Particle -> dzz:
     net.minecraft.world.phys.AABB INITIAL_AABB -> a
-    net.minecraft.world.level.Level level -> b
-    double xo -> c
-    double yo -> d
-    double zo -> e
-    double x -> f
-    double y -> g
-    double z -> h
-    double xd -> i
-    double yd -> j
-    double zd -> k
-    net.minecraft.world.phys.AABB bb -> A
-    boolean onGround -> l
-    boolean hasPhysics -> m
+    net.minecraft.client.multiplayer.ClientLevel level -> c
+    double xo -> d
+    double yo -> e
+    double zo -> f
+    double x -> g
+    double y -> h
+    double z -> i
+    double xd -> j
+    double yd -> k
+    double zd -> l
+    net.minecraft.world.phys.AABB bb -> b
+    boolean onGround -> m
+    boolean hasPhysics -> n
     boolean stoppedByCollision -> B
-    boolean removed -> n
-    float bbWidth -> o
-    float bbHeight -> p
-    java.util.Random random -> q
-    int age -> r
-    int lifetime -> s
-    float gravity -> t
-    float rCol -> u
-    float gCol -> v
-    float bCol -> w
-    float alpha -> x
-    float roll -> y
-    float oRoll -> z
-    31:64:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    67:78:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    boolean removed -> o
+    float bbWidth -> p
+    float bbHeight -> q
+    java.util.Random random -> r
+    int age -> s
+    int lifetime -> t
+    float gravity -> u
+    float rCol -> v
+    float gCol -> w
+    float bCol -> x
+    float alpha -> y
+    float roll -> z
+    float oRoll -> A
+    31:64:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
+    67:78:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
     81:84:net.minecraft.client.particle.Particle setPower(float) -> c
     88:89:net.minecraft.client.particle.Particle scale(float) -> d
     93:96:void setColor(float,float,float) -> a
@@ -13195,15 +14065,15 @@ net.minecraft.client.particle.Particle -> doz:
     220:220:net.minecraft.world.phys.AABB getBoundingBox() -> m
     224:225:void setBoundingBox(net.minecraft.world.phys.AABB) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.client.particle.ParticleDescription -> dpa:
+net.minecraft.client.particle.ParticleDescription -> eaa:
     java.util.List textures -> a
     17:19:void <init>(java.util.List) -> <init>
     23:23:java.util.List getTextures() -> a
     27:39:net.minecraft.client.particle.ParticleDescription fromJson(com.google.gson.JsonObject) -> a
     32:32:java.lang.String lambda$fromJson$0(com.google.gson.JsonElement) -> a
-net.minecraft.client.particle.ParticleEngine -> dpb:
+net.minecraft.client.particle.ParticleEngine -> eab:
     java.util.List RENDER_ORDER -> b
-    net.minecraft.world.level.Level level -> a
+    net.minecraft.client.multiplayer.ClientLevel level -> a
     java.util.Map particles -> c
     java.util.Queue trackingEmitters -> d
     net.minecraft.client.renderer.texture.TextureManager textureManager -> e
@@ -13212,51 +14082,51 @@ net.minecraft.client.particle.ParticleEngine -> dpb:
     java.util.Queue particlesToAdd -> h
     java.util.Map spriteSets -> i
     net.minecraft.client.renderer.texture.TextureAtlas textureAtlas -> j
-    76:112:void <init>(net.minecraft.world.level.Level,net.minecraft.client.renderer.texture.TextureManager) -> <init>
-    115:177:void registerProviders() -> d
-    180:181:void register(net.minecraft.core.particles.ParticleType,net.minecraft.client.particle.ParticleProvider) -> a
-    184:187:void register(net.minecraft.core.particles.ParticleType,net.minecraft.client.particle.ParticleEngine$SpriteParticleRegistration) -> a
-    191:207:java.util.concurrent.CompletableFuture reload(net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.ProfilerFiller,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
-    226:227:void close() -> a
-    230:250:void loadParticleDescription(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation,java.util.Map) -> a
-    253:254:void createTrackingEmitter(net.minecraft.world.entity.Entity,net.minecraft.core.particles.ParticleOptions) -> a
-    257:258:void createTrackingEmitter(net.minecraft.world.entity.Entity,net.minecraft.core.particles.ParticleOptions,int) -> a
-    262:267:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
-    273:277:net.minecraft.client.particle.Particle makeParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> b
-    281:282:void add(net.minecraft.client.particle.Particle) -> a
-    285:308:void tick() -> b
-    311:321:void tickParticleList(java.util.Collection) -> a
-    325:334:void tickParticle(net.minecraft.client.particle.Particle) -> b
-    337:376:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource$BufferSource,net.minecraft.client.renderer.LightTexture,net.minecraft.client.Camera,float) -> a
-    379:382:void setLevel(net.minecraft.world.level.Level) -> a
-    385:419:void destroy(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    422:459:void crack(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    462:462:java.lang.String countParticles() -> c
-    395:418:void lambda$destroy$9(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,double,double,double,double,double,double) -> a
-    305:305:java.util.Queue lambda$tick$8(net.minecraft.client.particle.ParticleRenderType) -> a
-    286:289:void lambda$tick$7(net.minecraft.client.particle.ParticleRenderType,java.util.Queue) -> a
-    245:245:net.minecraft.resources.ResourceLocation lambda$loadParticleDescription$6(net.minecraft.resources.ResourceLocation) -> a
-    208:222:void lambda$reload$5(net.minecraft.util.profiling.ProfilerFiller,java.util.Map,net.minecraft.client.renderer.texture.TextureAtlas$Preparations) -> a
-    215:219:void lambda$null$4(net.minecraft.client.renderer.texture.TextureAtlasSprite,net.minecraft.resources.ResourceLocation,java.util.List) -> a
-    199:204:net.minecraft.client.renderer.texture.TextureAtlas$Preparations lambda$reload$3(net.minecraft.util.profiling.ProfilerFiller,net.minecraft.server.packs.resources.ResourceManager,java.util.Map,java.lang.Void) -> a
-    195:195:java.util.concurrent.CompletableFuture[] lambda$reload$2(int) -> a
-    194:194:java.util.concurrent.CompletableFuture lambda$reload$1(net.minecraft.server.packs.resources.ResourceManager,java.util.Map,java.util.concurrent.Executor,net.minecraft.resources.ResourceLocation) -> a
-    194:194:void lambda$null$0(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation,java.util.Map) -> b
-    67:67:void <clinit>() -> <clinit>
-net.minecraft.client.particle.ParticleEngine$1 -> dpb$1:
-net.minecraft.client.particle.ParticleEngine$MutableSpriteSet -> dpb$a:
+    77:113:void <init>(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.client.renderer.texture.TextureManager) -> <init>
+    116:188:void registerProviders() -> e
+    191:192:void register(net.minecraft.core.particles.ParticleType,net.minecraft.client.particle.ParticleProvider) -> a
+    195:198:void register(net.minecraft.core.particles.ParticleType,net.minecraft.client.particle.ParticleEngine$SpriteParticleRegistration) -> a
+    202:218:java.util.concurrent.CompletableFuture reload(net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.ProfilerFiller,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
+    237:238:void close() -> a
+    241:261:void loadParticleDescription(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation,java.util.Map) -> a
+    264:265:void createTrackingEmitter(net.minecraft.world.entity.Entity,net.minecraft.core.particles.ParticleOptions) -> a
+    268:269:void createTrackingEmitter(net.minecraft.world.entity.Entity,net.minecraft.core.particles.ParticleOptions,int) -> a
+    273:278:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
+    284:288:net.minecraft.client.particle.Particle makeParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> b
+    292:293:void add(net.minecraft.client.particle.Particle) -> a
+    296:319:void tick() -> b
+    322:332:void tickParticleList(java.util.Collection) -> a
+    336:345:void tickParticle(net.minecraft.client.particle.Particle) -> b
+    348:388:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource$BufferSource,net.minecraft.client.renderer.LightTexture,net.minecraft.client.Camera,float) -> a
+    391:394:void setLevel(net.minecraft.client.multiplayer.ClientLevel) -> a
+    397:431:void destroy(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    434:471:void crack(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    474:474:java.lang.String countParticles() -> d
+    407:430:void lambda$destroy$9(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,double,double,double,double,double,double) -> a
+    316:316:java.util.Queue lambda$tick$8(net.minecraft.client.particle.ParticleRenderType) -> a
+    297:300:void lambda$tick$7(net.minecraft.client.particle.ParticleRenderType,java.util.Queue) -> a
+    256:256:net.minecraft.resources.ResourceLocation lambda$loadParticleDescription$6(net.minecraft.resources.ResourceLocation) -> a
+    219:233:void lambda$reload$5(net.minecraft.util.profiling.ProfilerFiller,java.util.Map,net.minecraft.client.renderer.texture.TextureAtlas$Preparations) -> a
+    226:230:void lambda$null$4(net.minecraft.client.renderer.texture.TextureAtlasSprite,net.minecraft.resources.ResourceLocation,java.util.List) -> a
+    210:215:net.minecraft.client.renderer.texture.TextureAtlas$Preparations lambda$reload$3(net.minecraft.util.profiling.ProfilerFiller,net.minecraft.server.packs.resources.ResourceManager,java.util.Map,java.lang.Void) -> a
+    206:206:java.util.concurrent.CompletableFuture[] lambda$reload$2(int) -> a
+    205:205:java.util.concurrent.CompletableFuture lambda$reload$1(net.minecraft.server.packs.resources.ResourceManager,java.util.Map,java.util.concurrent.Executor,net.minecraft.resources.ResourceLocation) -> a
+    205:205:void lambda$null$0(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation,java.util.Map) -> b
+    68:68:void <clinit>() -> <clinit>
+net.minecraft.client.particle.ParticleEngine$1 -> eab$1:
+net.minecraft.client.particle.ParticleEngine$MutableSpriteSet -> eab$a:
     java.util.List sprites -> b
     net.minecraft.client.particle.ParticleEngine this$0 -> a
-    86:86:void <init>(net.minecraft.client.particle.ParticleEngine) -> <init>
-    91:91:net.minecraft.client.renderer.texture.TextureAtlasSprite get(int,int) -> a
-    96:96:net.minecraft.client.renderer.texture.TextureAtlasSprite get(java.util.Random) -> a
-    100:101:void rebind(java.util.List) -> a
-    86:86:void <init>(net.minecraft.client.particle.ParticleEngine,net.minecraft.client.particle.ParticleEngine$1) -> <init>
-net.minecraft.client.particle.ParticleEngine$SpriteParticleRegistration -> dpb$b:
+    87:87:void <init>(net.minecraft.client.particle.ParticleEngine) -> <init>
+    92:92:net.minecraft.client.renderer.texture.TextureAtlasSprite get(int,int) -> a
+    97:97:net.minecraft.client.renderer.texture.TextureAtlasSprite get(java.util.Random) -> a
+    101:102:void rebind(java.util.List) -> a
+    87:87:void <init>(net.minecraft.client.particle.ParticleEngine,net.minecraft.client.particle.ParticleEngine$1) -> <init>
+net.minecraft.client.particle.ParticleEngine$SpriteParticleRegistration -> eab$b:
     net.minecraft.client.particle.ParticleProvider create(net.minecraft.client.particle.SpriteSet) -> create
-net.minecraft.client.particle.ParticleProvider -> dpc:
-    net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.ParticleRenderType -> dpd:
+net.minecraft.client.particle.ParticleProvider -> eac:
+    net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.ParticleRenderType -> ead:
     net.minecraft.client.particle.ParticleRenderType TERRAIN_SHEET -> a
     net.minecraft.client.particle.ParticleRenderType PARTICLE_SHEET_OPAQUE -> b
     net.minecraft.client.particle.ParticleRenderType PARTICLE_SHEET_TRANSLUCENT -> c
@@ -13266,90 +14136,102 @@ net.minecraft.client.particle.ParticleRenderType -> dpd:
     void begin(com.mojang.blaze3d.vertex.BufferBuilder,net.minecraft.client.renderer.texture.TextureManager) -> a
     void end(com.mojang.blaze3d.vertex.Tesselator) -> a
     13:114:void <clinit>() -> <clinit>
-net.minecraft.client.particle.ParticleRenderType$1 -> dpd$1:
+net.minecraft.client.particle.ParticleRenderType$1 -> ead$1:
     13:13:void <init>() -> <init>
     16:21:void begin(com.mojang.blaze3d.vertex.BufferBuilder,net.minecraft.client.renderer.texture.TextureManager) -> a
     25:26:void end(com.mojang.blaze3d.vertex.Tesselator) -> a
     30:30:java.lang.String toString() -> toString
-net.minecraft.client.particle.ParticleRenderType$2 -> dpd$2:
+net.minecraft.client.particle.ParticleRenderType$2 -> ead$2:
     34:34:void <init>() -> <init>
     37:41:void begin(com.mojang.blaze3d.vertex.BufferBuilder,net.minecraft.client.renderer.texture.TextureManager) -> a
     45:46:void end(com.mojang.blaze3d.vertex.Tesselator) -> a
     50:50:java.lang.String toString() -> toString
-net.minecraft.client.particle.ParticleRenderType$3 -> dpd$3:
+net.minecraft.client.particle.ParticleRenderType$3 -> ead$3:
     54:54:void <init>() -> <init>
     57:63:void begin(com.mojang.blaze3d.vertex.BufferBuilder,net.minecraft.client.renderer.texture.TextureManager) -> a
     67:68:void end(com.mojang.blaze3d.vertex.Tesselator) -> a
     72:72:java.lang.String toString() -> toString
-net.minecraft.client.particle.ParticleRenderType$4 -> dpd$4:
+net.minecraft.client.particle.ParticleRenderType$4 -> ead$4:
     76:76:void <init>() -> <init>
     79:83:void begin(com.mojang.blaze3d.vertex.BufferBuilder,net.minecraft.client.renderer.texture.TextureManager) -> a
     87:88:void end(com.mojang.blaze3d.vertex.Tesselator) -> a
     92:92:java.lang.String toString() -> toString
-net.minecraft.client.particle.ParticleRenderType$5 -> dpd$5:
+net.minecraft.client.particle.ParticleRenderType$5 -> ead$5:
     96:96:void <init>() -> <init>
     99:102:void begin(com.mojang.blaze3d.vertex.BufferBuilder,net.minecraft.client.renderer.texture.TextureManager) -> a
     106:106:void end(com.mojang.blaze3d.vertex.Tesselator) -> a
     110:110:java.lang.String toString() -> toString
-net.minecraft.client.particle.ParticleRenderType$6 -> dpd$6:
+net.minecraft.client.particle.ParticleRenderType$6 -> ead$6:
     114:114:void <init>() -> <init>
     117:117:void begin(com.mojang.blaze3d.vertex.BufferBuilder,net.minecraft.client.renderer.texture.TextureManager) -> a
     121:121:void end(com.mojang.blaze3d.vertex.Tesselator) -> a
     125:125:java.lang.String toString() -> toString
-net.minecraft.client.particle.PlayerCloudParticle -> dpe:
+net.minecraft.client.particle.PlayerCloudParticle -> eae:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    12:34:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    12:34:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     38:38:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     43:43:float getQuadSize(float) -> b
     48:77:void tick() -> a
-    8:8:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.PlayerCloudParticle$1) -> <init>
-net.minecraft.client.particle.PlayerCloudParticle$1 -> dpe$1:
-net.minecraft.client.particle.PlayerCloudParticle$Provider -> dpe$a:
+    8:8:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.PlayerCloudParticle$1) -> <init>
+net.minecraft.client.particle.PlayerCloudParticle$1 -> eae$1:
+net.minecraft.client.particle.PlayerCloudParticle$Provider -> eae$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     82:84:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    88:88:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    79:79:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.PlayerCloudParticle$SneezeProvider -> dpe$b:
+    88:88:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    79:79:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.PlayerCloudParticle$SneezeProvider -> eae$b:
     net.minecraft.client.particle.SpriteSet sprites -> a
     95:97:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    101:104:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    92:92:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.PortalParticle -> dpf:
+    101:104:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    92:92:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.PortalParticle -> eaf:
     double xStart -> a
-    double yStart -> C
+    double yStart -> b
     double zStart -> D
-    12:32:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    12:32:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
     36:36:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     41:43:void move(double,double,double) -> a
     47:51:float getQuadSize(float) -> b
     56:68:int getLightColor(float) -> a
     73:90:void tick() -> a
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.PortalParticle$1) -> <init>
-net.minecraft.client.particle.PortalParticle$1 -> dpf$1:
-net.minecraft.client.particle.PortalParticle$Provider -> dpf$a:
+net.minecraft.client.particle.PortalParticle$Provider -> eaf$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     95:97:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    101:103:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    92:92:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SimpleAnimatedParticle -> dpg:
+    101:103:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    92:92:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.ReversePortalParticle -> eag:
+    8:12:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
+    16:17:float getQuadSize(float) -> b
+    22:36:void tick() -> a
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.ReversePortalParticle$1) -> <init>
+net.minecraft.client.particle.ReversePortalParticle$1 -> eag$1:
+net.minecraft.client.particle.ReversePortalParticle$ReversePortalProvider -> eag$a:
+    net.minecraft.client.particle.SpriteSet sprite -> a
+    41:43:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    47:49:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    38:38:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.RisingParticle -> eah:
+    7:16:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
+    20:38:void tick() -> a
+net.minecraft.client.particle.SimpleAnimatedParticle -> eai:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    float baseGravity -> C
+    float baseGravity -> b
     float baseAirFriction -> D
     float fadeR -> E
     float fadeG -> F
     float fadeB -> G
     boolean hasFade -> H
-    9:20:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.client.particle.SpriteSet,float) -> <init>
+    9:20:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.client.particle.SpriteSet,float) -> <init>
     23:28:void setColor(int) -> b
     31:35:void setFadeColor(int) -> c
     39:39:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     44:75:void tick() -> a
     79:79:int getLightColor(float) -> a
     83:84:void setBaseAirFriction(float) -> f
-net.minecraft.client.particle.SingleQuadParticle -> dph:
-    float quadSize -> A
-    15:17:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    20:22:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+net.minecraft.client.particle.SingleQuadParticle -> eaj:
+    float quadSize -> B
+    15:17:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
+    20:22:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
     26:73:void render(com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.Camera,float) -> a
     76:76:float getQuadSize(float) -> b
     81:82:net.minecraft.client.particle.Particle scale(float) -> d
@@ -13357,144 +14239,164 @@ net.minecraft.client.particle.SingleQuadParticle -> dph:
     float getU1() -> d
     float getV0() -> e
     float getV1() -> f
-net.minecraft.client.particle.SmokeParticle -> dpi:
+net.minecraft.client.particle.SmokeParticle -> eak:
+    8:9:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,float,net.minecraft.client.particle.SpriteSet) -> <init>
+net.minecraft.client.particle.SmokeParticle$Provider -> eak$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    11:30:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,float,net.minecraft.client.particle.SpriteSet) -> <init>
-    34:34:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    39:39:float getQuadSize(float) -> b
-    44:69:void tick() -> a
-net.minecraft.client.particle.SmokeParticle$Provider -> dpi$a:
+    14:16:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    20:20:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    11:11:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SoulParticle -> eal:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    74:76:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    80:80:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    71:71:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SpellParticle -> dpj:
+    10:16:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    20:20:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
+    25:30:void tick() -> a
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.SoulParticle$1) -> <init>
+net.minecraft.client.particle.SoulParticle$1 -> eal$1:
+net.minecraft.client.particle.SoulParticle$Provider -> eal$a:
+    net.minecraft.client.particle.SpriteSet sprite -> a
+    35:37:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    41:44:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    32:32:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SpellParticle -> eam:
     java.util.Random RANDOM -> a
-    net.minecraft.client.particle.SpriteSet sprites -> C
-    14:28:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    net.minecraft.client.particle.SpriteSet sprites -> b
+    14:28:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     32:32:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     37:62:void tick() -> a
-    8:8:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.SpellParticle$1) -> <init>
+    8:8:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.SpellParticle$1) -> <init>
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.particle.SpellParticle$1 -> dpj$1:
-net.minecraft.client.particle.SpellParticle$AmbientMobProvider -> dpj$a:
+net.minecraft.client.particle.SpellParticle$1 -> eam$1:
+net.minecraft.client.particle.SpellParticle$AmbientMobProvider -> eam$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     95:97:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    101:104:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    92:92:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SpellParticle$InstantProvider -> dpj$b:
+    101:104:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    92:92:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SpellParticle$InstantProvider -> eam$b:
     net.minecraft.client.particle.SpriteSet sprite -> a
     127:129:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    133:133:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    124:124:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SpellParticle$MobProvider -> dpj$c:
+    133:133:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    124:124:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SpellParticle$MobProvider -> eam$c:
     net.minecraft.client.particle.SpriteSet sprite -> a
     80:82:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    86:88:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    77:77:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SpellParticle$Provider -> dpj$d:
+    86:88:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    77:77:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SpellParticle$Provider -> eam$d:
     net.minecraft.client.particle.SpriteSet sprite -> a
     67:69:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    73:73:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    64:64:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SpellParticle$WitchProvider -> dpj$e:
+    73:73:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    64:64:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SpellParticle$WitchProvider -> eam$e:
     net.minecraft.client.particle.SpriteSet sprite -> a
     111:113:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    117:120:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    108:108:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SpitParticle -> dpk:
-    8:10:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    117:120:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    108:108:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SpitParticle -> ean:
+    8:10:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     14:16:void tick() -> a
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.SpitParticle$1) -> <init>
-net.minecraft.client.particle.SpitParticle$1 -> dpk$1:
-net.minecraft.client.particle.SpitParticle$Provider -> dpk$a:
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.SpitParticle$1) -> <init>
+net.minecraft.client.particle.SpitParticle$1 -> ean$1:
+net.minecraft.client.particle.SpitParticle$Provider -> ean$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     21:23:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    27:27:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    18:18:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SplashParticle -> dpl:
-    8:15:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SplashParticle$1) -> <init>
-net.minecraft.client.particle.SplashParticle$1 -> dpl$1:
-net.minecraft.client.particle.SplashParticle$Provider -> dpl$a:
+    27:27:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    18:18:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SplashParticle -> eao:
+    8:15:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SplashParticle$1) -> <init>
+net.minecraft.client.particle.SplashParticle$1 -> eao$1:
+net.minecraft.client.particle.SplashParticle$Provider -> eao$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     20:22:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    26:28:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    17:17:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SpriteSet -> dpm:
+    26:28:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    17:17:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SpriteSet -> eap:
     net.minecraft.client.renderer.texture.TextureAtlasSprite get(int,int) -> a
     net.minecraft.client.renderer.texture.TextureAtlasSprite get(java.util.Random) -> a
-net.minecraft.client.particle.SquidInkParticle -> dpn:
-    9:26:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+net.minecraft.client.particle.SquidInkParticle -> eaq:
+    9:26:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     30:59:void tick() -> a
-    7:7:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.SquidInkParticle$1) -> <init>
-net.minecraft.client.particle.SquidInkParticle$1 -> dpn$1:
-net.minecraft.client.particle.SquidInkParticle$Provider -> dpn$a:
+    7:7:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.SquidInkParticle$1) -> <init>
+net.minecraft.client.particle.SquidInkParticle$1 -> eaq$1:
+net.minecraft.client.particle.SquidInkParticle$Provider -> eaq$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     64:66:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    70:70:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    61:61:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SuspendedParticle -> dpo:
-    10:19:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    23:23:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    28:42:void tick() -> a
-    8:8:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.client.particle.SuspendedParticle$1) -> <init>
-net.minecraft.client.particle.SuspendedParticle$1 -> dpo$1:
-net.minecraft.client.particle.SuspendedParticle$Provider -> dpo$a:
+    70:70:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    61:61:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SuspendedParticle -> ear:
+    10:20:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
+    23:30:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
+    34:34:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
+    39:49:void tick() -> a
+    8:8:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.client.particle.SuspendedParticle$1) -> <init>
+    8:8:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SuspendedParticle$1) -> <init>
+net.minecraft.client.particle.SuspendedParticle$1 -> ear$1:
+net.minecraft.client.particle.SuspendedParticle$CrimsonSporeProvider -> ear$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
-    47:49:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    53:55:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    44:44:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SuspendedTownParticle -> dpp:
-    8:23:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    69:71:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    75:82:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    66:66:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SuspendedParticle$UnderwaterProvider -> ear$b:
+    net.minecraft.client.particle.SpriteSet sprite -> a
+    54:56:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    60:62:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    51:51:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SuspendedParticle$WarpedSporeProvider -> ear$c:
+    net.minecraft.client.particle.SpriteSet sprite -> a
+    89:91:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    95:100:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    86:86:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SuspendedTownParticle -> eas:
+    8:23:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
     27:27:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     32:34:void move(double,double,double) -> a
     38:51:void tick() -> a
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SuspendedTownParticle$1) -> <init>
-net.minecraft.client.particle.SuspendedTownParticle$1 -> dpp$1:
-net.minecraft.client.particle.SuspendedTownParticle$ComposterFillProvider -> dpp$a:
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SuspendedTownParticle$1) -> <init>
+net.minecraft.client.particle.SuspendedTownParticle$1 -> eas$1:
+net.minecraft.client.particle.SuspendedTownParticle$ComposterFillProvider -> eas$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     87:89:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    93:97:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    84:84:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SuspendedTownParticle$DolphinSpeedProvider -> dpp$b:
+    93:97:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    84:84:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SuspendedTownParticle$DolphinSpeedProvider -> eas$b:
     net.minecraft.client.particle.SpriteSet sprite -> a
     104:106:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    110:115:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    101:101:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SuspendedTownParticle$HappyVillagerProvider -> dpp$c:
+    110:115:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    101:101:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SuspendedTownParticle$HappyVillagerProvider -> eas$c:
     net.minecraft.client.particle.SpriteSet sprite -> a
     71:73:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    77:80:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    68:68:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.SuspendedTownParticle$Provider -> dpp$d:
+    77:80:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    68:68:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.SuspendedTownParticle$Provider -> eas$d:
     net.minecraft.client.particle.SpriteSet sprite -> a
     56:58:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    62:64:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    53:53:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.TerrainParticle -> dpq:
+    62:64:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    53:53:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.TerrainParticle -> eat:
     net.minecraft.world.level.block.state.BlockState blockState -> a
-    net.minecraft.core.BlockPos pos -> C
+    net.minecraft.core.BlockPos pos -> b
     float uo -> D
     float vo -> E
-    23:34:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.world.level.block.state.BlockState) -> <init>
-    38:38:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
-    43:48:net.minecraft.client.particle.TerrainParticle init(net.minecraft.core.BlockPos) -> a
-    53:59:net.minecraft.client.particle.TerrainParticle init() -> g
-    63:67:void multiplyColor(net.minecraft.core.BlockPos) -> b
-    71:71:float getU0() -> c
-    76:76:float getU1() -> d
-    81:81:float getV0() -> e
-    86:86:float getV1() -> f
-    91:96:int getLightColor(float) -> a
-net.minecraft.client.particle.TerrainParticle$Provider -> dpq$a:
-    99:99:void <init>() -> <init>
-    102:106:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.BlockParticleOption,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    99:99:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.TextureSheetParticle -> dpr:
-    net.minecraft.client.renderer.texture.TextureAtlasSprite sprite -> B
-    8:9:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    12:13:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    22:33:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.world.level.block.state.BlockState) -> <init>
+    37:37:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
+    42:47:net.minecraft.client.particle.TerrainParticle init(net.minecraft.core.BlockPos) -> a
+    52:57:net.minecraft.client.particle.TerrainParticle init() -> g
+    61:65:void multiplyColor(net.minecraft.core.BlockPos) -> b
+    69:69:float getU0() -> c
+    74:74:float getU1() -> d
+    79:79:float getV0() -> e
+    84:84:float getV1() -> f
+    89:94:int getLightColor(float) -> a
+net.minecraft.client.particle.TerrainParticle$Provider -> eat$a:
+    97:97:void <init>() -> <init>
+    100:104:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.BlockParticleOption,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    97:97:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.TextureSheetParticle -> eau:
+    net.minecraft.client.renderer.texture.TextureAtlasSprite sprite -> C
+    8:9:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
+    12:13:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> <init>
     18:19:void setSprite(net.minecraft.client.renderer.texture.TextureAtlasSprite) -> a
     23:23:float getU0() -> c
     28:28:float getU1() -> d
@@ -13502,80 +14404,87 @@ net.minecraft.client.particle.TextureSheetParticle -> dpr:
     38:38:float getV1() -> f
     42:43:void pickSprite(net.minecraft.client.particle.SpriteSet) -> a
     46:47:void setSpriteFromAge(net.minecraft.client.particle.SpriteSet) -> b
-net.minecraft.client.particle.TotemParticle -> dps:
-    8:26:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.TotemParticle$1) -> <init>
-net.minecraft.client.particle.TotemParticle$1 -> dps$1:
-net.minecraft.client.particle.TotemParticle$Provider -> dps$a:
+net.minecraft.client.particle.TotemParticle -> eav:
+    8:26:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.TotemParticle$1) -> <init>
+net.minecraft.client.particle.TotemParticle$1 -> eav$1:
+net.minecraft.client.particle.TotemParticle$Provider -> eav$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     31:33:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    37:37:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    28:28:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.TrackingEmitter -> dpt:
+    37:37:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    28:28:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.TrackingEmitter -> eaw:
     net.minecraft.world.entity.Entity entity -> a
-    int life -> A
+    int life -> b
     int lifeTime -> B
     net.minecraft.core.particles.ParticleOptions particleType -> C
-    15:16:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,net.minecraft.core.particles.ParticleOptions) -> <init>
-    19:20:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,net.minecraft.core.particles.ParticleOptions,int) -> <init>
-    23:28:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,net.minecraft.core.particles.ParticleOptions,int,net.minecraft.world.phys.Vec3) -> <init>
+    15:16:void <init>(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.Entity,net.minecraft.core.particles.ParticleOptions) -> <init>
+    19:20:void <init>(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.Entity,net.minecraft.core.particles.ParticleOptions,int) -> <init>
+    23:28:void <init>(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.Entity,net.minecraft.core.particles.ParticleOptions,int,net.minecraft.world.phys.Vec3) -> <init>
     32:48:void tick() -> a
-net.minecraft.client.particle.WakeParticle -> dpu:
+net.minecraft.client.particle.WakeParticle -> eax:
     net.minecraft.client.particle.SpriteSet sprites -> a
-    10:24:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
+    10:24:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet) -> <init>
     28:28:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     33:53:void tick() -> a
-    6:6:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.WakeParticle$1) -> <init>
-net.minecraft.client.particle.WakeParticle$1 -> dpu$1:
-net.minecraft.client.particle.WakeParticle$Provider -> dpu$a:
+    6:6:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,net.minecraft.client.particle.SpriteSet,net.minecraft.client.particle.WakeParticle$1) -> <init>
+net.minecraft.client.particle.WakeParticle$1 -> eax$1:
+net.minecraft.client.particle.WakeParticle$Provider -> eax$a:
     net.minecraft.client.particle.SpriteSet sprites -> a
     58:60:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    64:64:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    55:55:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.WaterCurrentDownParticle -> dpv:
+    64:64:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    55:55:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.WaterCurrentDownParticle -> eay:
     float angle -> a
-    13:26:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    13:26:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
     30:30:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     35:56:void tick() -> a
-    9:9:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.client.particle.WaterCurrentDownParticle$1) -> <init>
-net.minecraft.client.particle.WaterCurrentDownParticle$1 -> dpv$1:
-net.minecraft.client.particle.WaterCurrentDownParticle$Provider -> dpv$a:
+    9:9:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,net.minecraft.client.particle.WaterCurrentDownParticle$1) -> <init>
+net.minecraft.client.particle.WaterCurrentDownParticle$1 -> eay$1:
+net.minecraft.client.particle.WaterCurrentDownParticle$Provider -> eay$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     61:63:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    67:69:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    58:58:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.WaterDropParticle -> dpw:
-    10:19:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    67:69:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    58:58:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.WaterDropParticle -> eaz:
+    10:19:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double) -> <init>
     23:23:net.minecraft.client.particle.ParticleRenderType getRenderType() -> b
     28:60:void tick() -> a
-net.minecraft.client.particle.WaterDropParticle$Provider -> dpw$a:
+net.minecraft.client.particle.WaterDropParticle$Provider -> eaz$a:
     net.minecraft.client.particle.SpriteSet sprite -> a
     65:67:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
-    71:73:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-    62:62:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.world.level.Level,double,double,double,double,double,double) -> a
-net.minecraft.client.particle.package-info -> dpx:
-net.minecraft.client.player.AbstractClientPlayer -> dpy:
+    71:73:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    62:62:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.WhiteAshParticle -> eba:
+    12:16:void <init>(net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double,float,net.minecraft.client.particle.SpriteSet) -> <init>
+net.minecraft.client.particle.WhiteAshParticle$Provider -> eba$a:
+    net.minecraft.client.particle.SpriteSet sprites -> a
+    21:23:void <init>(net.minecraft.client.particle.SpriteSet) -> <init>
+    27:31:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.SimpleParticleType,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+    18:18:net.minecraft.client.particle.Particle createParticle(net.minecraft.core.particles.ParticleOptions,net.minecraft.client.multiplayer.ClientLevel,double,double,double,double,double,double) -> a
+net.minecraft.client.particle.package-info -> ebb:
+net.minecraft.client.player.AbstractClientPlayer -> ebc:
     net.minecraft.client.multiplayer.PlayerInfo playerInfo -> e
     float elytraRotX -> a
     float elytraRotY -> b
     float elytraRotZ -> c
     net.minecraft.client.multiplayer.ClientLevel clientLevel -> d
-    45:47:void <init>(net.minecraft.client.multiplayer.ClientLevel,com.mojang.authlib.GameProfile) -> <init>
-    51:52:boolean isSpectator() -> t
-    57:58:boolean isCreative() -> u
-    62:62:boolean isCapeLoaded() -> c
-    67:70:net.minecraft.client.multiplayer.PlayerInfo getPlayerInfo() -> i
-    74:75:boolean isSkinLoaded() -> l
-    79:80:net.minecraft.resources.ResourceLocation getSkinTextureLocation() -> m
-    85:86:net.minecraft.resources.ResourceLocation getCloakTextureLocation() -> n
-    90:90:boolean isElytraLoaded() -> o
-    95:96:net.minecraft.resources.ResourceLocation getElytraTextureLocation() -> p
-    100:108:net.minecraft.client.renderer.texture.HttpTexture registerSkinTexture(net.minecraft.resources.ResourceLocation,java.lang.String) -> a
-    112:112:net.minecraft.resources.ResourceLocation getSkinLocation(java.lang.String) -> d
-    116:116:net.minecraft.resources.ResourceLocation getSkullPath(java.lang.String) -> e
-    120:121:java.lang.String getModelName() -> s
-    125:150:float getFieldOfViewModifier() -> v
-net.minecraft.client.player.Input -> dpz:
+    44:46:void <init>(net.minecraft.client.multiplayer.ClientLevel,com.mojang.authlib.GameProfile) -> <init>
+    50:51:boolean isSpectator() -> a_
+    56:57:boolean isCreative() -> b_
+    61:61:boolean isCapeLoaded() -> c
+    66:69:net.minecraft.client.multiplayer.PlayerInfo getPlayerInfo() -> f
+    73:74:boolean isSkinLoaded() -> n
+    78:79:net.minecraft.resources.ResourceLocation getSkinTextureLocation() -> o
+    84:85:net.minecraft.resources.ResourceLocation getCloakTextureLocation() -> p
+    89:89:boolean isElytraLoaded() -> q
+    94:95:net.minecraft.resources.ResourceLocation getElytraTextureLocation() -> r
+    99:107:net.minecraft.client.renderer.texture.HttpTexture registerSkinTexture(net.minecraft.resources.ResourceLocation,java.lang.String) -> a
+    111:111:net.minecraft.resources.ResourceLocation getSkinLocation(java.lang.String) -> d
+    115:115:net.minecraft.resources.ResourceLocation getSkullPath(java.lang.String) -> e
+    119:120:java.lang.String getModelName() -> u
+    124:148:float getFieldOfViewModifier() -> v
+net.minecraft.client.player.Input -> ebd:
     float leftImpulse -> a
     float forwardImpulse -> b
     boolean up -> c
@@ -13588,22 +14497,23 @@ net.minecraft.client.player.Input -> dpz:
     18:18:void tick(boolean) -> a
     21:21:net.minecraft.world.phys.Vec2 getMoveVector() -> a
     25:25:boolean hasForwardImpulse() -> b
-net.minecraft.client.player.KeyboardInput -> dqa:
+net.minecraft.client.player.KeyboardInput -> ebe:
     net.minecraft.client.Options options -> i
     9:11:void <init>(net.minecraft.client.Options) -> <init>
     15:31:void tick(boolean) -> a
-net.minecraft.client.player.LocalPlayer -> dqb:
+net.minecraft.client.player.LocalPlayer -> ebf:
     net.minecraft.client.multiplayer.ClientPacketListener connection -> e
-    net.minecraft.stats.StatsCounter stats -> bZ
-    net.minecraft.client.ClientRecipeBook recipeBook -> ca
-    java.util.List ambientSoundHandlers -> cb
-    int permissionLevel -> cc
-    double xLast -> cd
-    double yLast1 -> ce
-    double zLast -> cf
-    float yRotLast -> cg
-    float xRotLast -> ch
-    boolean lastOnGround -> ci
+    net.minecraft.stats.StatsCounter stats -> bY
+    net.minecraft.client.ClientRecipeBook recipeBook -> bZ
+    java.util.List ambientSoundHandlers -> ca
+    int permissionLevel -> cb
+    double xLast -> cc
+    double yLast1 -> cd
+    double zLast -> ce
+    float yRotLast -> cf
+    float xRotLast -> cg
+    boolean lastOnGround -> ch
+    boolean crouching -> ci
     boolean wasShiftKeyDown -> cj
     boolean wasSprinting -> ck
     int positionReminder -> cl
@@ -13611,16 +14521,16 @@ net.minecraft.client.player.LocalPlayer -> dqb:
     java.lang.String serverBrand -> cn
     net.minecraft.client.player.Input input -> f
     net.minecraft.client.Minecraft minecraft -> g
-    int sprintTriggerTime -> bR
-    int sprintTime -> bS
-    float yBob -> bT
-    float xBob -> bU
-    float yBobO -> bV
-    float xBobO -> bW
+    int sprintTriggerTime -> bQ
+    int sprintTime -> bR
+    float yBob -> bS
+    float xBob -> bT
+    float yBobO -> bU
+    float xBobO -> bV
     int jumpRidingTicks -> co
     float jumpRidingScale -> cp
-    float portalTime -> bX
-    float oPortalTime -> bY
+    float portalTime -> bW
+    float oPortalTime -> bX
     boolean startedUsingItem -> cq
     net.minecraft.world.InteractionHand usingItemHand -> cr
     boolean handsBusy -> cs
@@ -13629,94 +14539,98 @@ net.minecraft.client.player.LocalPlayer -> dqb:
     boolean wasFallFlying -> cv
     int waterVisionTime -> cw
     boolean showDeathScreen -> cx
-    93:145:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.client.multiplayer.ClientPacketListener,net.minecraft.stats.StatsCounter,net.minecraft.client.ClientRecipeBook) -> <init>
-    149:149:boolean isGlowing() -> bt
-    154:154:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    160:160:void heal(float) -> b
-    164:177:boolean startRiding(net.minecraft.world.entity.Entity,boolean) -> a
-    182:184:void stopRiding() -> j
-    188:188:float getViewXRot(float) -> g
-    193:196:float getViewYRot(float) -> h
-    201:220:void tick() -> h
-    223:280:void sendPosition() -> eE
-    284:286:boolean drop(boolean) -> n
-    290:291:void chat(java.lang.String) -> f
-    295:297:void swing(net.minecraft.world.InteractionHand) -> a
-    301:302:void respawn() -> eb
-    306:310:void actuallyHurt(net.minecraft.world.damagesource.DamageSource,float) -> d
-    314:316:void closeContainer() -> v_
-    320:323:void clientSideCloseContainer() -> w
-    326:345:void hurtTo(float) -> t
-    349:350:void onUpdateAbilities() -> r
-    354:354:boolean isLocalPlayer() -> ec
-    358:359:void sendRidingJump() -> x
-    362:363:void sendOpenInventory() -> z
-    366:367:void setServerBrand(java.lang.String) -> g
-    370:370:java.lang.String getServerBrand() -> A
-    374:374:net.minecraft.stats.StatsCounter getStats() -> B
-    378:378:net.minecraft.client.ClientRecipeBook getRecipeBook() -> D
-    382:386:void removeRecipeHighlight(net.minecraft.world.item.crafting.Recipe) -> a
-    390:390:int getPermissionLevel() -> y
-    394:395:void setPermissionLevel(int) -> a
-    399:404:void displayClientMessage(net.minecraft.network.chat.Component,boolean) -> a
-    408:452:void checkInBlock(double,double,double) -> k
-    455:463:boolean blocked(net.minecraft.core.BlockPos) -> g
-    468:470:void setSprinting(boolean) -> f
-    473:476:void setExperienceValues(float,int,int) -> a
-    480:481:void sendMessage(net.minecraft.network.chat.Component) -> a
-    485:490:void handleEntityEvent(byte) -> a
-    493:494:void setShowDeathScreen(boolean) -> a
-    497:497:boolean shouldShowDeathScreen() -> F
-    502:503:void playSound(net.minecraft.sounds.SoundEvent,float,float) -> a
-    507:508:void playNotifySound(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
-    512:512:boolean isEffectiveAi() -> dx
-    517:526:void startUsingItem(net.minecraft.world.InteractionHand) -> c
-    530:530:boolean isUsingItem() -> dB
-    535:537:void stopUsingItem() -> dH
-    541:541:net.minecraft.world.InteractionHand getUsedItemHand() -> dC
-    546:563:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    566:567:boolean isRidingJumpable() -> G
-    571:571:float getJumpRidingScale() -> H
-    576:577:void openTextEdit(net.minecraft.world.level.block.entity.SignBlockEntity) -> a
-    581:582:void openMinecartCommandBlock(net.minecraft.world.level.BaseCommandBlock) -> a
-    586:587:void openCommandBlock(net.minecraft.world.level.block.entity.CommandBlockEntity) -> a
-    591:592:void openStructureBlock(net.minecraft.world.level.block.entity.StructureBlockEntity) -> a
-    596:597:void openJigsawBlock(net.minecraft.world.level.block.entity.JigsawBlockEntity) -> a
-    601:606:void openItemGui(net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
-    610:611:void crit(net.minecraft.world.entity.Entity) -> a
-    615:616:void magicCrit(net.minecraft.world.entity.Entity) -> b
-    620:620:boolean isShiftKeyDown() -> bj
-    625:629:boolean isCrouching() -> bo
-    633:633:boolean isMovingSlowly() -> I
-    638:649:void serverAiStep() -> du
-    652:652:boolean isControlledCamera() -> J
-    657:810:void aiStep() -> k
-    813:846:void handleNetherPortalClient() -> eF
-    850:859:void rideTick() -> aQ
-    862:862:boolean isHandsBusy() -> K
-    868:873:net.minecraft.world.effect.MobEffectInstance removeEffectNoUpdate(net.minecraft.world.effect.MobEffect) -> c
-    878:882:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
-    885:885:boolean isAutoJumpEnabled() -> eC
-    889:1085:void updateAutoJump(float,float) -> g
-    1088:1094:boolean canAutoJump() -> eG
-    1098:1099:boolean isMoving() -> eH
-    1105:1106:boolean hasEnoughImpulseToStartSprinting() -> eI
-    1110:1120:float getWaterVision() -> eD
-    1125:1125:boolean isUnderWater() -> aA
-    1130:1146:boolean updateIsUnderwater() -> dW
-    1025:1025:java.util.stream.Stream lambda$updateAutoJump$0(net.minecraft.world.phys.shapes.VoxelShape) -> a
-net.minecraft.client.player.LocalPlayer$1 -> dqb$1:
+    93:148:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.client.multiplayer.ClientPacketListener,net.minecraft.stats.StatsCounter,net.minecraft.client.ClientRecipeBook,boolean,boolean) -> <init>
+    152:152:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    158:158:void heal(float) -> b
+    162:175:boolean startRiding(net.minecraft.world.entity.Entity,boolean) -> a
+    180:182:void removeVehicle() -> bb
+    186:186:float getViewXRot(float) -> g
+    191:194:float getViewYRot(float) -> h
+    199:218:void tick() -> j
+    221:226:float getCurrentMood() -> w
+    230:287:void sendPosition() -> eW
+    291:293:boolean drop(boolean) -> a
+    297:298:void chat(java.lang.String) -> f
+    302:304:void swing(net.minecraft.world.InteractionHand) -> a
+    308:309:void respawn() -> ex
+    313:317:void actuallyHurt(net.minecraft.world.damagesource.DamageSource,float) -> e
+    321:323:void closeContainer() -> m
+    327:330:void clientSideCloseContainer() -> x
+    333:352:void hurtTo(float) -> s
+    356:357:void onUpdateAbilities() -> t
+    361:361:boolean isLocalPlayer() -> ey
+    366:366:boolean isSuppressingSlidingDownLadder() -> ed
+    371:371:boolean canSpawnSprintParticle() -> aK
+    376:376:boolean canSpawnSoulSpeedParticle() -> cM
+    380:381:void sendRidingJump() -> z
+    384:385:void sendOpenInventory() -> A
+    388:389:void setServerBrand(java.lang.String) -> g
+    392:392:java.lang.String getServerBrand() -> B
+    396:396:net.minecraft.stats.StatsCounter getStats() -> D
+    400:400:net.minecraft.client.ClientRecipeBook getRecipeBook() -> F
+    404:408:void removeRecipeHighlight(net.minecraft.world.item.crafting.Recipe) -> a
+    412:412:int getPermissionLevel() -> y
+    416:417:void setPermissionLevel(int) -> a
+    421:426:void displayClientMessage(net.minecraft.network.chat.Component,boolean) -> a
+    430:474:void checkInBlock(double,double,double) -> k
+    477:485:boolean blocked(net.minecraft.core.BlockPos) -> g
+    490:492:void setSprinting(boolean) -> g
+    495:498:void setExperienceValues(float,int,int) -> a
+    502:503:void sendMessage(net.minecraft.network.chat.Component,java.util.UUID) -> a
+    507:512:void handleEntityEvent(byte) -> a
+    515:516:void setShowDeathScreen(boolean) -> b
+    519:519:boolean shouldShowDeathScreen() -> G
+    524:525:void playSound(net.minecraft.sounds.SoundEvent,float,float) -> a
+    529:530:void playNotifySound(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
+    534:534:boolean isEffectiveAi() -> dR
+    539:548:void startUsingItem(net.minecraft.world.InteractionHand) -> c
+    552:552:boolean isUsingItem() -> dV
+    557:559:void stopUsingItem() -> eb
+    563:563:net.minecraft.world.InteractionHand getUsedItemHand() -> dW
+    568:585:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    588:589:boolean isRidingJumpable() -> H
+    593:593:float getJumpRidingScale() -> I
+    598:599:void openTextEdit(net.minecraft.world.level.block.entity.SignBlockEntity) -> a
+    603:604:void openMinecartCommandBlock(net.minecraft.world.level.BaseCommandBlock) -> a
+    608:609:void openCommandBlock(net.minecraft.world.level.block.entity.CommandBlockEntity) -> a
+    613:614:void openStructureBlock(net.minecraft.world.level.block.entity.StructureBlockEntity) -> a
+    618:619:void openJigsawBlock(net.minecraft.world.level.block.entity.JigsawBlockEntity) -> a
+    623:628:void openItemGui(net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
+    632:633:void crit(net.minecraft.world.entity.Entity) -> a
+    637:638:void magicCrit(net.minecraft.world.entity.Entity) -> b
+    642:642:boolean isShiftKeyDown() -> bq
+    647:647:boolean isCrouching() -> bv
+    651:651:boolean isMovingSlowly() -> J
+    656:667:void serverAiStep() -> dO
+    670:670:boolean isControlledCamera() -> K
+    675:833:void aiStep() -> k
+    836:869:void handleNetherPortalClient() -> eX
+    873:882:void rideTick() -> aW
+    885:885:boolean isHandsBusy() -> L
+    891:896:net.minecraft.world.effect.MobEffectInstance removeEffectNoUpdate(net.minecraft.world.effect.MobEffect) -> c
+    901:905:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
+    908:908:boolean isAutoJumpEnabled() -> M
+    912:1108:void updateAutoJump(float,float) -> g
+    1111:1117:boolean canAutoJump() -> eY
+    1121:1122:boolean isMoving() -> eZ
+    1128:1129:boolean hasEnoughImpulseToStartSprinting() -> fa
+    1133:1143:float getWaterVision() -> N
+    1148:1148:boolean isUnderWater() -> aE
+    1153:1169:boolean updateIsUnderwater() -> es
+    1048:1048:java.util.stream.Stream lambda$updateAutoJump$1(net.minecraft.world.phys.shapes.VoxelShape) -> a
+    1048:1048:boolean lambda$updateAutoJump$0(net.minecraft.world.entity.Entity) -> c
+net.minecraft.client.player.LocalPlayer$1 -> ebf$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    436:436:void <clinit>() -> <clinit>
-net.minecraft.client.player.RemotePlayer -> dqc:
-    12:16:void <init>(net.minecraft.client.multiplayer.ClientLevel,com.mojang.authlib.GameProfile) -> <init>
-    20:25:boolean shouldRenderAtSqrDistance(double) -> a
-    30:30:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    35:46:void tick() -> h
-    50:88:void aiStep() -> k
-    95:95:void updatePlayerPose() -> dX
-    99:100:void sendMessage(net.minecraft.network.chat.Component) -> a
-net.minecraft.client.player.inventory.Hotbar -> dqd:
+    458:458:void <clinit>() -> <clinit>
+net.minecraft.client.player.RemotePlayer -> ebg:
+    14:18:void <init>(net.minecraft.client.multiplayer.ClientLevel,com.mojang.authlib.GameProfile) -> <init>
+    22:27:boolean shouldRenderAtSqrDistance(double) -> a
+    32:32:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    37:39:void tick() -> j
+    43:81:void aiStep() -> k
+    88:88:void updatePlayerPose() -> et
+    92:96:void sendMessage(net.minecraft.network.chat.Component,java.util.UUID) -> a
+net.minecraft.client.player.inventory.Hotbar -> ebh:
     net.minecraft.core.NonNullList items -> a
     12:13:void <init>() -> <init>
     17:17:java.util.List delegate() -> delegate
@@ -13725,9 +14639,9 @@ net.minecraft.client.player.inventory.Hotbar -> dqd:
     37:42:boolean isEmpty() -> isEmpty
     12:12:java.util.Collection delegate() -> delegate
     12:12:java.lang.Object delegate() -> delegate
-net.minecraft.client.player.inventory.package-info -> dqe:
-net.minecraft.client.player.package-info -> dqf:
-net.minecraft.client.renderer.BiomeColors -> dqg:
+net.minecraft.client.player.inventory.package-info -> ebi:
+net.minecraft.client.player.package-info -> ebj:
+net.minecraft.client.renderer.BiomeColors -> ebk:
     net.minecraft.world.level.ColorResolver GRASS_COLOR_RESOLVER -> a
     net.minecraft.world.level.ColorResolver FOLIAGE_COLOR_RESOLVER -> b
     net.minecraft.world.level.ColorResolver WATER_COLOR_RESOLVER -> c
@@ -13739,7 +14653,7 @@ net.minecraft.client.renderer.BiomeColors -> dqg:
     11:11:int lambda$static$1(net.minecraft.world.level.biome.Biome,double,double) -> a
     10:10:int lambda$static$0(net.minecraft.world.level.biome.Biome,double,double) -> b
     9:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer -> dqh:
+net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer -> ebl:
     net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity[] SHULKER_BOXES -> b
     net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity DEFAULT_SHULKER_BOX -> c
     net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer instance -> a
@@ -13751,11 +14665,11 @@ net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer -> dqh:
     net.minecraft.world.level.block.entity.ConduitBlockEntity conduit -> i
     net.minecraft.client.model.ShieldModel shieldModel -> j
     net.minecraft.client.model.TridentModel tridentModel -> k
-    46:60:void <init>() -> <init>
-    63:141:void renderByItem(net.minecraft.world.item.ItemStack,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-    47:47:net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity[] lambda$static$0(int) -> a
-    47:50:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.ChunkBufferBuilderPack -> dqi:
+    47:61:void <init>() -> <init>
+    64:141:void renderByItem(net.minecraft.world.item.ItemStack,net.minecraft.client.renderer.block.model.ItemTransforms$TransformType,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
+    48:48:net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity[] lambda$static$0(int) -> a
+    48:51:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.ChunkBufferBuilderPack -> ebm:
     java.util.Map builders -> a
     8:9:void <init>() -> <init>
     12:12:com.mojang.blaze3d.vertex.BufferBuilder builder(net.minecraft.client.renderer.RenderType) -> a
@@ -13763,12 +14677,54 @@ net.minecraft.client.renderer.ChunkBufferBuilderPack -> dqi:
     20:21:void discardAll() -> b
     9:9:com.mojang.blaze3d.vertex.BufferBuilder lambda$new$1(net.minecraft.client.renderer.RenderType) -> b
     9:9:net.minecraft.client.renderer.RenderType lambda$new$0(net.minecraft.client.renderer.RenderType) -> c
-net.minecraft.client.renderer.CubeMap -> dqj:
+net.minecraft.client.renderer.CubeMap -> ebn:
     net.minecraft.resources.ResourceLocation[] images -> a
     19:25:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     28:115:void render(net.minecraft.client.Minecraft,float,float,float) -> a
     118:122:java.util.concurrent.CompletableFuture preload(net.minecraft.client.renderer.texture.TextureManager,java.util.concurrent.Executor) -> a
-net.minecraft.client.renderer.EffectInstance -> dqk:
+net.minecraft.client.renderer.DimensionSpecialEffects -> ebo:
+    it.unimi.dsi.fastutil.objects.Object2ObjectMap EFFECTS -> a
+    float[] sunriseCol -> b
+    float cloudLevel -> c
+    boolean hasGround -> d
+    net.minecraft.client.renderer.DimensionSpecialEffects$SkyType skyType -> e
+    boolean forceBrightLightmap -> f
+    boolean constantAmbientLight -> g
+    31:44:void <init>(float,boolean,net.minecraft.client.renderer.DimensionSpecialEffects$SkyType,boolean,boolean) -> <init>
+    47:47:net.minecraft.client.renderer.DimensionSpecialEffects forType(java.util.Optional) -> a
+    52:66:float[] getSunriseColor(float,float) -> a
+    70:70:float getCloudHeight() -> a
+    74:74:boolean hasGround() -> b
+    net.minecraft.world.phys.Vec3 getBrightnessDependentFogColor(net.minecraft.world.phys.Vec3,float) -> a
+    boolean isFoggyAt(int,int) -> a
+    82:82:net.minecraft.client.renderer.DimensionSpecialEffects$SkyType skyType() -> c
+    86:86:boolean forceBrightLightmap() -> d
+    90:90:boolean constantAmbientLight() -> e
+    17:23:void lambda$static$0(it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap) -> a
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.DimensionSpecialEffects$EndEffects -> ebo$a:
+    130:131:void <init>() -> <init>
+    135:135:net.minecraft.world.phys.Vec3 getBrightnessDependentFogColor(net.minecraft.world.phys.Vec3,float) -> a
+    141:141:boolean isFoggyAt(int,int) -> a
+    147:147:float[] getSunriseColor(float,float) -> a
+net.minecraft.client.renderer.DimensionSpecialEffects$NetherEffects -> ebo$b:
+    95:96:void <init>() -> <init>
+    100:100:net.minecraft.world.phys.Vec3 getBrightnessDependentFogColor(net.minecraft.world.phys.Vec3,float) -> a
+    105:105:boolean isFoggyAt(int,int) -> a
+net.minecraft.client.renderer.DimensionSpecialEffects$OverworldEffects -> ebo$c:
+    111:112:void <init>() -> <init>
+    116:116:net.minecraft.world.phys.Vec3 getBrightnessDependentFogColor(net.minecraft.world.phys.Vec3,float) -> a
+    124:124:boolean isFoggyAt(int,int) -> a
+net.minecraft.client.renderer.DimensionSpecialEffects$SkyType -> ebo$d:
+    net.minecraft.client.renderer.DimensionSpecialEffects$SkyType NONE -> a
+    net.minecraft.client.renderer.DimensionSpecialEffects$SkyType NORMAL -> b
+    net.minecraft.client.renderer.DimensionSpecialEffects$SkyType END -> c
+    net.minecraft.client.renderer.DimensionSpecialEffects$SkyType[] $VALUES -> d
+    25:25:net.minecraft.client.renderer.DimensionSpecialEffects$SkyType[] values() -> values
+    25:25:net.minecraft.client.renderer.DimensionSpecialEffects$SkyType valueOf(java.lang.String) -> valueOf
+    25:25:void <init>(java.lang.String,int) -> <init>
+    25:28:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.EffectInstance -> ebp:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.mojang.blaze3d.shaders.AbstractUniform DUMMY_UNIFORM -> b
     net.minecraft.client.renderer.EffectInstance lastAppliedEffect -> c
@@ -13781,32 +14737,31 @@ net.minecraft.client.renderer.EffectInstance -> dqk:
     java.util.Map uniformMap -> j
     int programId -> k
     java.lang.String name -> l
-    boolean cull -> m
-    boolean dirty -> n
-    com.mojang.blaze3d.shaders.BlendMode blend -> o
-    java.util.List attributes -> p
-    java.util.List attributeNames -> q
-    com.mojang.blaze3d.shaders.Program vertexProgram -> r
-    com.mojang.blaze3d.shaders.Program fragmentProgram -> s
-    44:160:void <init>(net.minecraft.server.packs.resources.ResourceManager,java.lang.String) -> <init>
-    163:175:com.mojang.blaze3d.shaders.Program getOrCreate(net.minecraft.server.packs.resources.ResourceManager,com.mojang.blaze3d.shaders.Program$Type,java.lang.String) -> a
-    179:236:com.mojang.blaze3d.shaders.BlendMode parseBlendNode(com.google.gson.JsonObject) -> a
-    242:246:void close() -> close
-    250:264:void clear() -> e
-    268:321:void apply() -> f
-    325:326:void markDirty() -> b
-    330:331:com.mojang.blaze3d.shaders.Uniform getUniform(java.lang.String) -> a
-    335:337:com.mojang.blaze3d.shaders.AbstractUniform safeGetUniform(java.lang.String) -> b
-    341:367:void updateLocations() -> h
-    370:380:void parseSamplerNode(com.google.gson.JsonElement) -> a
-    383:389:void setSampler(java.lang.String,java.lang.Object) -> a
-    392:437:void parseUniformNode(com.google.gson.JsonElement) -> b
-    441:441:com.mojang.blaze3d.shaders.Program getVertexProgram() -> c
-    446:446:com.mojang.blaze3d.shaders.Program getFragmentProgram() -> d
-    450:450:java.lang.String getName() -> g
-    455:455:int getId() -> a
-    36:41:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.FaceInfo -> dql:
+    boolean dirty -> m
+    com.mojang.blaze3d.shaders.BlendMode blend -> n
+    java.util.List attributes -> o
+    java.util.List attributeNames -> p
+    com.mojang.blaze3d.shaders.Program vertexProgram -> q
+    com.mojang.blaze3d.shaders.Program fragmentProgram -> r
+    46:159:void <init>(net.minecraft.server.packs.resources.ResourceManager,java.lang.String) -> <init>
+    162:174:com.mojang.blaze3d.shaders.Program getOrCreate(net.minecraft.server.packs.resources.ResourceManager,com.mojang.blaze3d.shaders.Program$Type,java.lang.String) -> a
+    178:235:com.mojang.blaze3d.shaders.BlendMode parseBlendNode(com.google.gson.JsonObject) -> a
+    241:245:void close() -> close
+    249:264:void clear() -> e
+    268:315:void apply() -> f
+    319:320:void markDirty() -> b
+    324:325:com.mojang.blaze3d.shaders.Uniform getUniform(java.lang.String) -> a
+    329:331:com.mojang.blaze3d.shaders.AbstractUniform safeGetUniform(java.lang.String) -> b
+    335:365:void updateLocations() -> h
+    368:378:void parseSamplerNode(com.google.gson.JsonElement) -> a
+    381:387:void setSampler(java.lang.String,java.lang.Object) -> a
+    390:435:void parseUniformNode(com.google.gson.JsonElement) -> b
+    439:439:com.mojang.blaze3d.shaders.Program getVertexProgram() -> c
+    444:444:com.mojang.blaze3d.shaders.Program getFragmentProgram() -> d
+    448:448:java.lang.String getName() -> g
+    453:453:int getId() -> a
+    38:43:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.FaceInfo -> ebq:
     net.minecraft.client.renderer.FaceInfo DOWN -> a
     net.minecraft.client.renderer.FaceInfo UP -> b
     net.minecraft.client.renderer.FaceInfo NORTH -> c
@@ -13823,8 +14778,8 @@ net.minecraft.client.renderer.FaceInfo -> dql:
     63:63:net.minecraft.client.renderer.FaceInfo$VertexInfo getVertexInfo(int) -> a
     44:50:void lambda$static$0(net.minecraft.client.renderer.FaceInfo[]) -> a
     6:43:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.FaceInfo$1 -> dql$1:
-net.minecraft.client.renderer.FaceInfo$Constants -> dql$a:
+net.minecraft.client.renderer.FaceInfo$1 -> ebq$1:
+net.minecraft.client.renderer.FaceInfo$Constants -> ebq$a:
     int MAX_Z -> a
     int MAX_Y -> b
     int MAX_X -> c
@@ -13833,34 +14788,35 @@ net.minecraft.client.renderer.FaceInfo$Constants -> dql$a:
     int MIN_X -> f
     34:34:void <init>() -> <init>
     35:40:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.FaceInfo$VertexInfo -> dql$b:
+net.minecraft.client.renderer.FaceInfo$VertexInfo -> ebq$b:
     int xFace -> a
     int yFace -> b
     int zFace -> c
     71:75:void <init>(int,int,int) -> <init>
     66:66:void <init>(int,int,int,net.minecraft.client.renderer.FaceInfo$1) -> <init>
-net.minecraft.client.renderer.FogRenderer -> dqm:
+net.minecraft.client.renderer.FogRenderer -> ebr:
     float fogRed -> a
     float fogGreen -> b
     float fogBlue -> c
     int targetBiomeFog -> d
     int previousBiomeFog -> e
     long biomeChangedTime -> f
-    24:24:void <init>() -> <init>
-    40:176:void setupColor(net.minecraft.client.Camera,float,net.minecraft.client.multiplayer.ClientLevel,int,float) -> a
-    179:181:void setupNoFog() -> a
-    184:242:void setupFog(net.minecraft.client.Camera,net.minecraft.client.renderer.FogRenderer$FogMode,float,boolean) -> a
-    245:246:void levelFogColor() -> b
-    35:37:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.FogRenderer$FogMode -> dqm$a:
+    26:26:void <init>() -> <init>
+    42:183:void setupColor(net.minecraft.client.Camera,float,net.minecraft.client.multiplayer.ClientLevel,int,float) -> a
+    186:188:void setupNoFog() -> a
+    191:253:void setupFog(net.minecraft.client.Camera,net.minecraft.client.renderer.FogRenderer$FogMode,float,boolean) -> a
+    256:257:void levelFogColor() -> b
+    92:92:net.minecraft.world.phys.Vec3 lambda$setupColor$0(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.level.biome.BiomeManager,float,int,int,int) -> a
+    37:39:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.FogRenderer$FogMode -> ebr$a:
     net.minecraft.client.renderer.FogRenderer$FogMode FOG_SKY -> a
     net.minecraft.client.renderer.FogRenderer$FogMode FOG_TERRAIN -> b
     net.minecraft.client.renderer.FogRenderer$FogMode[] $VALUES -> c
-    25:25:net.minecraft.client.renderer.FogRenderer$FogMode[] values() -> values
-    25:25:net.minecraft.client.renderer.FogRenderer$FogMode valueOf(java.lang.String) -> valueOf
-    25:25:void <init>(java.lang.String,int) -> <init>
-    25:26:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.GameRenderer -> dqn:
+    27:27:net.minecraft.client.renderer.FogRenderer$FogMode[] values() -> values
+    27:27:net.minecraft.client.renderer.FogRenderer$FogMode valueOf(java.lang.String) -> valueOf
+    27:27:void <init>(java.lang.String,int) -> <init>
+    27:28:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.GameRenderer -> ebs:
     org.apache.logging.log4j.Logger LOGGER -> c
     net.minecraft.client.Minecraft minecraft -> d
     net.minecraft.server.packs.resources.ResourceManager resourceManager -> e
@@ -13894,65 +14850,103 @@ net.minecraft.client.renderer.GameRenderer -> dqn:
     int effectIndex -> E
     boolean effectActive -> F
     net.minecraft.client.Camera mainCamera -> G
-    68:154:void <init>(net.minecraft.client.Minecraft,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.client.renderer.RenderBuffers) -> <init>
-    158:162:void close() -> close
-    165:166:void setRenderHand(boolean) -> a
-    169:170:void setRenderBlockOutline(boolean) -> b
-    173:174:void setPanoramicMode(boolean) -> c
-    177:182:void shutdownEffect() -> a
-    185:186:void togglePostEffect() -> b
-    189:201:void checkEntityPostEffect(net.minecraft.world.entity.Entity) -> a
-    204:219:void cycleEffect() -> c
-    222:239:void loadEffect(net.minecraft.resources.ResourceLocation) -> a
-    243:252:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
-    255:284:void tick() -> d
-    288:288:net.minecraft.client.renderer.PostChain currentEffect() -> e
-    292:297:void resize(int,int) -> a
-    300:363:void pick(float) -> a
-    366:382:void tickFov() -> n
-    385:405:double getFov(net.minecraft.client.Camera,float,boolean) -> b
-    409:432:void bobHurt(com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    435:446:void bobView(com.mojang.blaze3d.vertex.PoseStack,float) -> b
-    450:457:void renderZoomed(float,float,float) -> a
-    460:491:void renderItemInHand(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.Camera,float) -> a
-    494:498:void resetProjectionMatrix(com.mojang.math.Matrix4f) -> a
-    501:510:com.mojang.math.Matrix4f getProjectionMatrix(net.minecraft.client.Camera,float,boolean) -> a
-    514:518:float getNightVisionScale(net.minecraft.world.entity.LivingEntity,float) -> a
-    523:616:void render(float,long,boolean) -> a
-    619:644:void takeAutoScreenshot() -> o
-    647:668:boolean shouldRenderBlockOutline() -> p
-    672:747:void renderLevel(float,long,com.mojang.blaze3d.vertex.PoseStack) -> a
-    750:753:void resetData() -> f
-    756:756:net.minecraft.client.gui.MapRenderer getMapRenderer() -> g
-    760:764:void displayItemActivation(net.minecraft.world.item.ItemStack) -> a
-    767:802:void renderItemActivationAnimation(int,int,float) -> a
-    805:805:net.minecraft.client.Minecraft getMinecraft() -> h
-    809:809:float getDarkenWorldAmount(float) -> b
-    813:813:float getRenderDistance() -> j
-    817:817:net.minecraft.client.Camera getMainCamera() -> k
-    821:821:net.minecraft.client.renderer.LightTexture lightTexture() -> l
-    825:825:net.minecraft.client.renderer.texture.OverlayTexture overlayTexture() -> m
-    622:642:void lambda$takeAutoScreenshot$5(com.mojang.blaze3d.platform.NativeImage) -> a
-    611:611:java.lang.String lambda$render$4() -> q
-    610:610:java.lang.String lambda$render$3(int,int) -> b
-    609:609:java.lang.String lambda$render$2() -> r
-    598:598:java.lang.String lambda$render$1() -> s
-    345:345:boolean lambda$pick$0(net.minecraft.world.entity.Entity) -> b
-    61:140:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.ItemBlockRenderTypes -> dqo:
+    67:153:void <init>(net.minecraft.client.Minecraft,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.client.renderer.RenderBuffers) -> <init>
+    157:161:void close() -> close
+    164:165:void setRenderHand(boolean) -> a
+    168:169:void setRenderBlockOutline(boolean) -> b
+    172:173:void setPanoramicMode(boolean) -> c
+    176:181:void shutdownEffect() -> a
+    184:185:void togglePostEffect() -> b
+    188:200:void checkEntityPostEffect(net.minecraft.world.entity.Entity) -> a
+    203:218:void cycleEffect() -> d
+    221:238:void loadEffect(net.minecraft.resources.ResourceLocation) -> a
+    242:251:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
+    254:283:void tick() -> e
+    287:287:net.minecraft.client.renderer.PostChain currentEffect() -> f
+    291:296:void resize(int,int) -> a
+    299:362:void pick(float) -> a
+    365:381:void tickFov() -> n
+    384:404:double getFov(net.minecraft.client.Camera,float,boolean) -> b
+    408:431:void bobHurt(com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    434:445:void bobView(com.mojang.blaze3d.vertex.PoseStack,float) -> b
+    448:455:void renderZoomed(float,float,float) -> a
+    458:489:void renderItemInHand(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.Camera,float) -> a
+    492:496:void resetProjectionMatrix(com.mojang.math.Matrix4f) -> a
+    499:508:com.mojang.math.Matrix4f getProjectionMatrix(net.minecraft.client.Camera,float,boolean) -> a
+    512:516:float getNightVisionScale(net.minecraft.world.entity.LivingEntity,float) -> a
+    521:615:void render(float,long,boolean) -> a
+    618:643:void takeAutoScreenshot() -> o
+    646:667:boolean shouldRenderBlockOutline() -> p
+    671:746:void renderLevel(float,long,com.mojang.blaze3d.vertex.PoseStack) -> a
+    749:752:void resetData() -> g
+    755:755:net.minecraft.client.gui.MapRenderer getMapRenderer() -> h
+    759:763:void displayItemActivation(net.minecraft.world.item.ItemStack) -> a
+    766:801:void renderItemActivationAnimation(int,int,float) -> a
+    804:804:net.minecraft.client.Minecraft getMinecraft() -> i
+    808:808:float getDarkenWorldAmount(float) -> b
+    812:812:float getRenderDistance() -> j
+    816:816:net.minecraft.client.Camera getMainCamera() -> k
+    820:820:net.minecraft.client.renderer.LightTexture lightTexture() -> l
+    824:824:net.minecraft.client.renderer.texture.OverlayTexture overlayTexture() -> m
+    621:641:void lambda$takeAutoScreenshot$5(com.mojang.blaze3d.platform.NativeImage) -> a
+    610:610:java.lang.String lambda$render$4() -> q
+    609:609:java.lang.String lambda$render$3(int,int) -> b
+    608:608:java.lang.String lambda$render$2() -> r
+    597:597:java.lang.String lambda$render$1() -> s
+    344:344:boolean lambda$pick$0(net.minecraft.world.entity.Entity) -> b
+    60:139:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.GpuWarnlistManager -> ebt:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.resources.ResourceLocation GPU_WARNLIST_LOCATION -> b
+    com.google.common.collect.ImmutableMap warnings -> c
+    boolean showWarning -> d
+    boolean warningDismissed -> e
+    boolean skipFabulous -> f
+    27:31:void <init>() -> <init>
+    37:37:boolean hasWarnings() -> a
+    41:41:boolean willShowWarning() -> b
+    45:46:void showWarning() -> d
+    49:50:void dismissWarning() -> e
+    53:55:void dismissWarningAndSkipFabulous() -> f
+    58:58:boolean isShowingWarning() -> g
+    62:62:boolean isSkippingFabulous() -> h
+    66:69:void resetWarnings() -> i
+    73:73:java.lang.String getRendererWarnings() -> j
+    78:78:java.lang.String getVersionWarnings() -> k
+    83:83:java.lang.String getVendorWarnings() -> l
+    88:106:net.minecraft.client.renderer.GpuWarnlistManager$Preparations prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    111:112:void apply(net.minecraft.client.renderer.GpuWarnlistManager$Preparations,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    115:116:void compilePatterns(com.google.gson.JsonArray,java.util.List) -> a
+    120:132:com.google.gson.JsonObject parseJson(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> c
+    27:27:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    27:27:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
+    115:115:void lambda$compilePatterns$0(java.util.List,com.google.gson.JsonElement) -> a
+    28:29:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.GpuWarnlistManager$1 -> ebt$1:
+net.minecraft.client.renderer.GpuWarnlistManager$Preparations -> ebt$a:
+    java.util.List rendererPatterns -> a
+    java.util.List versionPatterns -> b
+    java.util.List vendorPatterns -> c
+    140:144:void <init>(java.util.List,java.util.List,java.util.List) -> <init>
+    147:154:java.lang.String matchAny(java.util.List,java.lang.String) -> a
+    158:175:com.google.common.collect.ImmutableMap apply() -> a
+    135:135:void <init>(java.util.List,java.util.List,java.util.List,net.minecraft.client.renderer.GpuWarnlistManager$1) -> <init>
+    135:135:com.google.common.collect.ImmutableMap access$100(net.minecraft.client.renderer.GpuWarnlistManager$Preparations) -> a
+net.minecraft.client.renderer.ItemBlockRenderTypes -> ebu:
     java.util.Map TYPE_BY_BLOCK -> a
     java.util.Map TYPE_BY_FLUID -> b
     boolean renderCutout -> c
-    18:18:void <init>() -> <init>
-    252:260:net.minecraft.client.renderer.RenderType getChunkRenderType(net.minecraft.world.level.block.state.BlockState) -> a
-    264:268:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.level.block.state.BlockState) -> b
-    272:277:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.item.ItemStack) -> a
-    281:285:net.minecraft.client.renderer.RenderType getRenderLayer(net.minecraft.world.level.material.FluidState) -> a
-    289:290:void setFancy(boolean) -> a
-    244:247:void lambda$static$1(java.util.HashMap) -> a
-    20:241:void lambda$static$0(java.util.HashMap) -> b
-    19:243:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.ItemInHandRenderer -> dqp:
+    19:19:void <init>() -> <init>
+    278:286:net.minecraft.client.renderer.RenderType getChunkRenderType(net.minecraft.world.level.block.state.BlockState) -> a
+    290:301:net.minecraft.client.renderer.RenderType getMovingBlockRenderType(net.minecraft.world.level.block.state.BlockState) -> b
+    305:312:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    316:321:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.item.ItemStack,boolean) -> a
+    325:329:net.minecraft.client.renderer.RenderType getRenderLayer(net.minecraft.world.level.material.FluidState) -> a
+    333:334:void setFancy(boolean) -> a
+    270:273:void lambda$static$1(java.util.HashMap) -> a
+    21:267:void lambda$static$0(java.util.HashMap) -> b
+    20:269:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.ItemInHandRenderer -> ebv:
     net.minecraft.client.renderer.RenderType MAP_BACKGROUND -> a
     net.minecraft.client.renderer.RenderType MAP_BACKGROUND_CHECKERBOARD -> b
     net.minecraft.client.Minecraft minecraft -> c
@@ -13977,13 +14971,13 @@ net.minecraft.client.renderer.ItemInHandRenderer -> dqp:
     344:346:void applyItemArmTransform(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.world.entity.HumanoidArm,float) -> b
     349:405:void renderHandsWithItems(float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource$BufferSource,net.minecraft.client.player.LocalPlayer,int) -> a
     408:555:void renderArmWithItem(net.minecraft.client.player.AbstractClientPlayer,float,float,net.minecraft.world.InteractionHand,float,net.minecraft.world.item.ItemStack,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    559:582:void tick() -> a
-    585:590:void itemUsed(net.minecraft.world.InteractionHand) -> a
+    559:589:void tick() -> a
+    592:597:void itemUsed(net.minecraft.world.InteractionHand) -> a
     32:33:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.ItemInHandRenderer$1 -> dqp$1:
+net.minecraft.client.renderer.ItemInHandRenderer$1 -> ebv$1:
     int[] $SwitchMap$net$minecraft$world$item$UseAnim -> a
     471:471:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.ItemModelShaper -> dqq:
+net.minecraft.client.renderer.ItemModelShaper -> ebw:
     it.unimi.dsi.fastutil.ints.Int2ObjectMap shapes -> a
     it.unimi.dsi.fastutil.ints.Int2ObjectMap shapesCache -> b
     net.minecraft.client.resources.model.ModelManager modelManager -> c
@@ -13996,7 +14990,7 @@ net.minecraft.client.renderer.ItemModelShaper -> dqq:
     54:55:void register(net.minecraft.world.item.Item,net.minecraft.client.resources.model.ModelResourceLocation) -> a
     58:58:net.minecraft.client.resources.model.ModelManager getModelManager() -> a
     62:66:void rebuildCache() -> b
-net.minecraft.client.renderer.LevelRenderer -> dqr:
+net.minecraft.client.renderer.LevelRenderer -> ebx:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.resources.ResourceLocation MOON_LOCATION -> c
     net.minecraft.resources.ResourceLocation SUN_LOCATION -> d
@@ -14028,141 +15022,155 @@ net.minecraft.client.renderer.LevelRenderer -> dqr:
     java.util.Map playingRecords -> C
     com.mojang.blaze3d.pipeline.RenderTarget entityTarget -> D
     net.minecraft.client.renderer.PostChain entityEffect -> E
-    double lastCameraX -> F
-    double lastCameraY -> G
-    double lastCameraZ -> H
-    int lastCameraChunkX -> I
-    int lastCameraChunkY -> J
-    int lastCameraChunkZ -> K
-    double prevCamX -> L
-    double prevCamY -> M
-    double prevCamZ -> N
-    double prevCamRotX -> O
-    double prevCamRotY -> P
-    int prevCloudX -> Q
-    int prevCloudY -> R
-    int prevCloudZ -> S
-    net.minecraft.world.phys.Vec3 prevCloudColor -> T
-    net.minecraft.client.CloudStatus prevCloudsType -> U
-    net.minecraft.client.renderer.chunk.ChunkRenderDispatcher chunkRenderDispatcher -> V
-    com.mojang.blaze3d.vertex.VertexFormat format -> W
-    int lastViewDistance -> X
-    int renderedEntities -> Y
-    int culledEntities -> Z
-    boolean captureFrustum -> aa
-    net.minecraft.client.renderer.culling.Frustum capturedFrustum -> ab
-    com.mojang.math.Vector4f[] frustumPoints -> ac
-    com.mojang.math.Vector3d frustumPos -> ad
-    double xTransparentOld -> ae
-    double yTransparentOld -> af
-    double zTransparentOld -> ag
-    boolean needsUpdate -> ah
-    int frameId -> ai
-    int rainSoundTime -> aj
-    float[] rainSizeX -> ak
-    float[] rainSizeZ -> al
-    157:256:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.renderer.RenderBuffers) -> <init>
-    259:396:void renderSnowAndRain(net.minecraft.client.renderer.LightTexture,float,double,double,double) -> a
-    399:476:void tickRain(net.minecraft.client.Camera) -> a
-    481:484:void close() -> close
-    488:494:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
-    497:514:void initOutline() -> a
-    517:523:void doEntityOutline() -> b
-    526:526:boolean shouldShowEntityOutlines() -> c
-    530:541:void createDarkSky() -> q
-    544:555:void createLightSky() -> r
-    558:575:void drawSkyHemisphere(com.mojang.blaze3d.vertex.BufferBuilder,float,boolean) -> a
-    578:589:void createStars() -> s
-    592:643:void drawStars(com.mojang.blaze3d.vertex.BufferBuilder) -> a
-    646:670:void setLevel(net.minecraft.client.multiplayer.ClientLevel) -> a
-    673:709:void allChanged() -> d
-    712:714:void resetChunksToCompile() -> e
-    717:722:void resize(int,int) -> a
-    725:733:java.lang.String getChunkStatistics() -> f
-    738:744:int countRenderedChunks() -> g
-    748:748:java.lang.String getEntityStatistics() -> h
-    752:930:void setupRender(net.minecraft.client.Camera,net.minecraft.client.renderer.culling.Frustum,boolean,int,boolean) -> a
-    933:940:boolean isAdjacentChunk(net.minecraft.core.BlockPos,net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk) -> a
-    944:958:java.util.Set getVisibleDirections(net.minecraft.core.BlockPos) -> a
-    963:977:net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk getRelativeFrom(net.minecraft.core.BlockPos,net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk,net.minecraft.core.Direction) -> a
-    981:1007:void captureFrustum(com.mojang.math.Matrix4f,com.mojang.math.Matrix4f,double,double,double,net.minecraft.client.renderer.culling.Frustum) -> a
-    1010:1020:com.mojang.math.Vector3f getViewVector(net.minecraft.world.entity.Entity,double) -> a
-    1025:1031:boolean canSee(net.minecraft.core.Direction,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    1035:1037:boolean canSee(net.minecraft.core.Direction,com.mojang.math.Vector3f) -> a
-    1041:1339:void renderLevel(com.mojang.blaze3d.vertex.PoseStack,float,long,boolean,net.minecraft.client.Camera,net.minecraft.client.renderer.GameRenderer,net.minecraft.client.renderer.LightTexture,com.mojang.math.Matrix4f) -> a
-    1342:1345:void checkPoseStack(com.mojang.blaze3d.vertex.PoseStack) -> a
-    1348:1354:void renderEntity(net.minecraft.world.entity.Entity,double,double,double,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource) -> a
-    1357:1430:void renderChunkLayer(net.minecraft.client.renderer.RenderType,com.mojang.blaze3d.vertex.PoseStack,double,double,double) -> a
-    1433:1630:void renderDebug(net.minecraft.client.Camera) -> b
-    1633:1634:void addFrustumVertex(com.mojang.blaze3d.vertex.VertexConsumer,int) -> a
-    1637:1642:void addFrustumQuad(com.mojang.blaze3d.vertex.VertexConsumer,int,int,int,int,int,int,int) -> a
-    1645:1646:void captureFrustum() -> j
-    1649:1650:void killFrustum() -> k
-    1653:1670:void tick() -> l
-    1673:1679:void removeProgress(net.minecraft.server.level.BlockDestructionProgress) -> a
-    1682:1723:void renderEndSky(com.mojang.blaze3d.vertex.PoseStack) -> b
-    1726:1869:void renderSky(com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    1872:1963:void renderClouds(com.mojang.blaze3d.vertex.PoseStack,float,double,double,double) -> a
-    1966:2065:void buildClouds(com.mojang.blaze3d.vertex.BufferBuilder,double,double,double,net.minecraft.world.phys.Vec3) -> a
-    2068:2097:void compileChunksUntil(long) -> a
-    2100:2204:void renderWorldBounds(net.minecraft.client.Camera) -> c
-    2207:2208:void vertex(com.mojang.blaze3d.vertex.BufferBuilder,double,double,double,double,int,double,float,float) -> a
-    2217:2219:void renderHitOutline(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.entity.Entity,double,double,double,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    2222:2233:void renderVoxelShape(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.phys.shapes.VoxelShape,double,double,double,float,float,float,float) -> a
-    2236:2241:void renderShape(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.phys.shapes.VoxelShape,double,double,double,float,float,float,float) -> b
-    2244:2245:void renderLineBox(com.mojang.blaze3d.vertex.VertexConsumer,double,double,double,double,double,double,float,float,float,float) -> a
-    2248:2249:void renderLineBox(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.phys.AABB,float,float,float,float) -> a
-    2252:2253:void renderLineBox(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,double,double,double,double,double,double,float,float,float,float) -> a
-    2257:2301:void renderLineBox(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,double,double,double,double,double,double,float,float,float,float,float,float,float) -> a
-    2304:2342:void addChainedFilledBoxVertices(com.mojang.blaze3d.vertex.BufferBuilder,double,double,double,double,double,double,float,float,float,float) -> a
-    2345:2346:void blockChanged(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int) -> a
-    2349:2356:void setBlockDirty(net.minecraft.core.BlockPos,boolean) -> a
-    2359:2366:void setBlocksDirty(int,int,int,int,int,int) -> a
-    2369:2372:void setBlockDirty(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
-    2375:2382:void setSectionDirtyWithNeighbors(int,int,int) -> a
-    2385:2386:void setSectionDirty(int,int,int) -> b
-    2389:2390:void setSectionDirty(int,int,int,boolean) -> a
-    2393:2412:void playStreamingMusic(net.minecraft.sounds.SoundEvent,net.minecraft.core.BlockPos) -> a
-    2415:2419:void notifyNearbyEntities(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
-    2422:2423:void addParticle(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> a
-    2427:2438:void addParticle(net.minecraft.core.particles.ParticleOptions,boolean,boolean,double,double,double,double,double,double) -> a
-    2441:2442:void addParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
-    2446:2446:net.minecraft.client.particle.Particle addParticleInternal(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> b
-    2451:2471:net.minecraft.client.particle.Particle addParticleInternal(net.minecraft.core.particles.ParticleOptions,boolean,boolean,double,double,double,double,double,double) -> b
-    2475:2491:net.minecraft.client.ParticleStatus calculateParticleLevel(boolean) -> a
-    2495:2495:void clear() -> m
-    2498:2530:void globalLevelEvent(int,net.minecraft.core.BlockPos,int) -> a
-    2533:2815:void levelEvent(net.minecraft.world.entity.player.Player,int,net.minecraft.core.BlockPos,int) -> a
-    2818:2838:void destroyBlockProgress(int,net.minecraft.core.BlockPos,int) -> b
-    2841:2841:boolean hasRenderedAllChunks() -> n
-    2866:2868:void needsUpdate() -> o
-    2871:2875:void updateGlobalBlockEntities(java.util.Collection,java.util.Collection) -> a
-    2878:2878:int getLightColor(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos) -> a
-    2882:2892:int getLightColor(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    2896:2896:com.mojang.blaze3d.pipeline.RenderTarget entityTarget() -> p
-    2836:2836:java.util.SortedSet lambda$destroyBlockProgress$5(long) -> b
-    2434:2434:java.lang.String lambda$addParticle$4(double,double,double) -> a
-    2238:2240:void lambda$renderShape$3(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,double,double,double,float,float,float,float,double,double,double,double,double,double) -> a
-    1381:1381:java.lang.String lambda$renderChunkLayer$2(net.minecraft.client.renderer.RenderType) -> a
-    1198:1202:com.mojang.blaze3d.vertex.VertexConsumer lambda$renderLevel$1(net.minecraft.client.renderer.MultiBufferSource$BufferSource,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.renderer.RenderType) -> a
-    830:830:double lambda$setupRender$0(net.minecraft.core.BlockPos,net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo) -> a
-    128:147:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.LevelRenderer$1 -> dqr$1:
-net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo -> dqr$a:
+    com.mojang.blaze3d.pipeline.RenderTarget translucentTarget -> F
+    com.mojang.blaze3d.pipeline.RenderTarget itemEntityTarget -> G
+    com.mojang.blaze3d.pipeline.RenderTarget particlesTarget -> H
+    com.mojang.blaze3d.pipeline.RenderTarget weatherTarget -> I
+    com.mojang.blaze3d.pipeline.RenderTarget cloudsTarget -> J
+    net.minecraft.client.renderer.PostChain transparencyChain -> K
+    double lastCameraX -> L
+    double lastCameraY -> M
+    double lastCameraZ -> N
+    int lastCameraChunkX -> O
+    int lastCameraChunkY -> P
+    int lastCameraChunkZ -> Q
+    double prevCamX -> R
+    double prevCamY -> S
+    double prevCamZ -> T
+    double prevCamRotX -> U
+    double prevCamRotY -> V
+    int prevCloudX -> W
+    int prevCloudY -> X
+    int prevCloudZ -> Y
+    net.minecraft.world.phys.Vec3 prevCloudColor -> Z
+    net.minecraft.client.CloudStatus prevCloudsType -> aa
+    net.minecraft.client.renderer.chunk.ChunkRenderDispatcher chunkRenderDispatcher -> ab
+    com.mojang.blaze3d.vertex.VertexFormat format -> ac
+    int lastViewDistance -> ad
+    int renderedEntities -> ae
+    int culledEntities -> af
+    boolean captureFrustum -> ag
+    net.minecraft.client.renderer.culling.Frustum capturedFrustum -> ah
+    com.mojang.math.Vector4f[] frustumPoints -> ai
+    com.mojang.math.Vector3d frustumPos -> aj
+    double xTransparentOld -> ak
+    double yTransparentOld -> al
+    double zTransparentOld -> am
+    boolean needsUpdate -> an
+    int frameId -> ao
+    int rainSoundTime -> ap
+    float[] rainSizeX -> aq
+    float[] rainSizeZ -> ar
+    157:271:void <init>(net.minecraft.client.Minecraft,net.minecraft.client.renderer.RenderBuffers) -> <init>
+    274:416:void renderSnowAndRain(net.minecraft.client.renderer.LightTexture,float,double,double,double) -> a
+    419:471:void tickRain(net.minecraft.client.Camera) -> a
+    476:483:void close() -> close
+    487:496:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
+    499:516:void initOutline() -> a
+    519:545:void initTransparency() -> v
+    548:564:void deinitTransparency() -> w
+    567:573:void doEntityOutline() -> b
+    576:576:boolean shouldShowEntityOutlines() -> d
+    580:591:void createDarkSky() -> x
+    594:605:void createLightSky() -> y
+    608:625:void drawSkyHemisphere(com.mojang.blaze3d.vertex.BufferBuilder,float,boolean) -> a
+    628:639:void createStars() -> z
+    642:693:void drawStars(com.mojang.blaze3d.vertex.BufferBuilder) -> a
+    696:720:void setLevel(net.minecraft.client.multiplayer.ClientLevel) -> a
+    723:765:void allChanged() -> e
+    768:770:void resetChunksToCompile() -> f
+    773:781:void resize(int,int) -> a
+    784:792:java.lang.String getChunkStatistics() -> g
+    797:803:int countRenderedChunks() -> h
+    807:807:java.lang.String getEntityStatistics() -> i
+    811:966:void setupRender(net.minecraft.client.Camera,net.minecraft.client.renderer.culling.Frustum,boolean,int,boolean) -> a
+    969:976:boolean isAdjacentChunk(net.minecraft.core.BlockPos,net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk) -> a
+    981:995:net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk getRelativeFrom(net.minecraft.core.BlockPos,net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk,net.minecraft.core.Direction) -> a
+    999:1025:void captureFrustum(com.mojang.math.Matrix4f,com.mojang.math.Matrix4f,double,double,double,net.minecraft.client.renderer.culling.Frustum) -> a
+    1028:1038:com.mojang.math.Vector3f getViewVector(net.minecraft.world.entity.Entity,double) -> a
+    1043:1049:boolean canSee(net.minecraft.core.Direction,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    1053:1055:boolean canSee(net.minecraft.core.Direction,com.mojang.math.Vector3f) -> a
+    1059:1421:void renderLevel(com.mojang.blaze3d.vertex.PoseStack,float,long,boolean,net.minecraft.client.Camera,net.minecraft.client.renderer.GameRenderer,net.minecraft.client.renderer.LightTexture,com.mojang.math.Matrix4f) -> a
+    1424:1427:void checkPoseStack(com.mojang.blaze3d.vertex.PoseStack) -> a
+    1430:1436:void renderEntity(net.minecraft.world.entity.Entity,double,double,double,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource) -> a
+    1439:1512:void renderChunkLayer(net.minecraft.client.renderer.RenderType,com.mojang.blaze3d.vertex.PoseStack,double,double,double) -> a
+    1515:1712:void renderDebug(net.minecraft.client.Camera) -> b
+    1715:1716:void addFrustumVertex(com.mojang.blaze3d.vertex.VertexConsumer,int) -> a
+    1719:1724:void addFrustumQuad(com.mojang.blaze3d.vertex.VertexConsumer,int,int,int,int,int,int,int) -> a
+    1727:1728:void captureFrustum() -> j
+    1731:1732:void killFrustum() -> k
+    1735:1752:void tick() -> l
+    1755:1761:void removeProgress(net.minecraft.server.level.BlockDestructionProgress) -> a
+    1764:1805:void renderEndSky(com.mojang.blaze3d.vertex.PoseStack) -> b
+    1808:1951:void renderSky(com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    1954:2047:void renderClouds(com.mojang.blaze3d.vertex.PoseStack,float,double,double,double) -> a
+    2050:2149:void buildClouds(com.mojang.blaze3d.vertex.BufferBuilder,double,double,double,net.minecraft.world.phys.Vec3) -> a
+    2152:2181:void compileChunksUntil(long) -> a
+    2184:2288:void renderWorldBounds(net.minecraft.client.Camera) -> c
+    2291:2292:void vertex(com.mojang.blaze3d.vertex.BufferBuilder,double,double,double,double,int,double,float,float) -> a
+    2301:2303:void renderHitOutline(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.entity.Entity,double,double,double,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    2306:2317:void renderVoxelShape(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.phys.shapes.VoxelShape,double,double,double,float,float,float,float) -> a
+    2320:2325:void renderShape(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.phys.shapes.VoxelShape,double,double,double,float,float,float,float) -> b
+    2328:2329:void renderLineBox(com.mojang.blaze3d.vertex.VertexConsumer,double,double,double,double,double,double,float,float,float,float) -> a
+    2332:2333:void renderLineBox(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.phys.AABB,float,float,float,float) -> a
+    2336:2337:void renderLineBox(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,double,double,double,double,double,double,float,float,float,float) -> a
+    2341:2385:void renderLineBox(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,double,double,double,double,double,double,float,float,float,float,float,float,float) -> a
+    2388:2426:void addChainedFilledBoxVertices(com.mojang.blaze3d.vertex.BufferBuilder,double,double,double,double,double,double,float,float,float,float) -> a
+    2429:2430:void blockChanged(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int) -> a
+    2433:2440:void setBlockDirty(net.minecraft.core.BlockPos,boolean) -> a
+    2443:2450:void setBlocksDirty(int,int,int,int,int,int) -> a
+    2453:2456:void setBlockDirty(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
+    2459:2466:void setSectionDirtyWithNeighbors(int,int,int) -> a
+    2469:2470:void setSectionDirty(int,int,int) -> b
+    2473:2474:void setSectionDirty(int,int,int,boolean) -> a
+    2477:2496:void playStreamingMusic(net.minecraft.sounds.SoundEvent,net.minecraft.core.BlockPos) -> a
+    2499:2503:void notifyNearbyEntities(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
+    2506:2507:void addParticle(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> a
+    2511:2522:void addParticle(net.minecraft.core.particles.ParticleOptions,boolean,boolean,double,double,double,double,double,double) -> a
+    2525:2526:void addParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
+    2530:2530:net.minecraft.client.particle.Particle addParticleInternal(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> b
+    2535:2555:net.minecraft.client.particle.Particle addParticleInternal(net.minecraft.core.particles.ParticleOptions,boolean,boolean,double,double,double,double,double,double) -> b
+    2559:2575:net.minecraft.client.ParticleStatus calculateParticleLevel(boolean) -> a
+    2579:2579:void clear() -> m
+    2582:2614:void globalLevelEvent(int,net.minecraft.core.BlockPos,int) -> a
+    2617:2900:void levelEvent(net.minecraft.world.entity.player.Player,int,net.minecraft.core.BlockPos,int) -> a
+    2903:2923:void destroyBlockProgress(int,net.minecraft.core.BlockPos,int) -> b
+    2926:2926:boolean hasRenderedAllChunks() -> n
+    2951:2953:void needsUpdate() -> o
+    2956:2960:void updateGlobalBlockEntities(java.util.Collection,java.util.Collection) -> a
+    2963:2963:int getLightColor(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos) -> a
+    2967:2977:int getLightColor(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    2982:2982:com.mojang.blaze3d.pipeline.RenderTarget entityTarget() -> p
+    2987:2987:com.mojang.blaze3d.pipeline.RenderTarget getTranslucentTarget() -> q
+    2992:2992:com.mojang.blaze3d.pipeline.RenderTarget getItemEntityTarget() -> r
+    2997:2997:com.mojang.blaze3d.pipeline.RenderTarget getParticlesTarget() -> s
+    3002:3002:com.mojang.blaze3d.pipeline.RenderTarget getWeatherTarget() -> t
+    3007:3007:com.mojang.blaze3d.pipeline.RenderTarget getCloudsTarget() -> u
+    2921:2921:java.util.SortedSet lambda$destroyBlockProgress$5(long) -> b
+    2518:2518:java.lang.String lambda$addParticle$4(double,double,double) -> a
+    2322:2324:void lambda$renderShape$3(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,double,double,double,float,float,float,float,double,double,double,double,double,double) -> a
+    1463:1463:java.lang.String lambda$renderChunkLayer$2(net.minecraft.client.renderer.RenderType) -> a
+    1231:1235:com.mojang.blaze3d.vertex.VertexConsumer lambda$renderLevel$1(net.minecraft.client.renderer.MultiBufferSource$BufferSource,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.renderer.RenderType) -> a
+    889:889:double lambda$setupRender$0(net.minecraft.core.BlockPos,net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo) -> a
+    126:147:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.LevelRenderer$1 -> ebx$1:
+net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo -> ebx$a:
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk chunk -> b
     net.minecraft.core.Direction sourceDirection -> c
     byte directions -> d
     int step -> e
     net.minecraft.client.renderer.LevelRenderer this$0 -> a
-    2850:2854:void <init>(net.minecraft.client.renderer.LevelRenderer,net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk,net.minecraft.core.Direction,int) -> <init>
-    2857:2858:void setDirections(byte,net.minecraft.core.Direction) -> a
-    2861:2861:boolean hasDirection(net.minecraft.core.Direction) -> a
-    2844:2844:net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk access$000(net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo) -> a
-    2844:2844:void <init>(net.minecraft.client.renderer.LevelRenderer,net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk,net.minecraft.core.Direction,int,net.minecraft.client.renderer.LevelRenderer$1) -> <init>
-    2844:2844:net.minecraft.core.Direction access$200(net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo) -> b
-    2844:2844:int access$300(net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo) -> c
-    2844:2844:byte access$400(net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo) -> d
-net.minecraft.client.renderer.LightTexture -> dqs:
+    2935:2939:void <init>(net.minecraft.client.renderer.LevelRenderer,net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk,net.minecraft.core.Direction,int) -> <init>
+    2942:2943:void setDirections(byte,net.minecraft.core.Direction) -> a
+    2946:2946:boolean hasDirection(net.minecraft.core.Direction) -> a
+    2929:2929:net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk access$000(net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo) -> a
+    2929:2929:void <init>(net.minecraft.client.renderer.LevelRenderer,net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk,net.minecraft.core.Direction,int,net.minecraft.client.renderer.LevelRenderer$1) -> <init>
+    2929:2929:net.minecraft.core.Direction access$200(net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo) -> b
+    2929:2929:int access$300(net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo) -> c
+    2929:2929:byte access$400(net.minecraft.client.renderer.LevelRenderer$RenderChunkInfo) -> d
+net.minecraft.client.renderer.LevelRenderer$TranparencyShaderException -> ebx$b:
+    3012:3013:void <init>(java.lang.String,java.lang.Throwable) -> <init>
+net.minecraft.client.renderer.LightTexture -> eby:
     net.minecraft.client.renderer.texture.DynamicTexture lightTexture -> a
     com.mojang.blaze3d.platform.NativeImage lightPixels -> b
     net.minecraft.resources.ResourceLocation lightTextureLocation -> c
@@ -14170,22 +15178,22 @@ net.minecraft.client.renderer.LightTexture -> dqs:
     float blockLightRedFlicker -> e
     net.minecraft.client.renderer.GameRenderer renderer -> f
     net.minecraft.client.Minecraft minecraft -> g
-    30:43:void <init>(net.minecraft.client.renderer.GameRenderer,net.minecraft.client.Minecraft) -> <init>
-    47:48:void close() -> close
-    51:54:void tick() -> a
-    57:60:void turnOffLightLayer() -> b
-    63:79:void turnOnLightLayer() -> c
-    82:187:void updateLightTexture(float) -> a
-    190:191:float notGamma(float) -> b
-    196:196:float getBrightness(net.minecraft.world.level.Level,int) -> a
-    200:200:int pack(int,int) -> a
-    204:204:int block(int) -> a
-    208:208:int sky(int) -> b
-net.minecraft.client.renderer.MultiBufferSource -> dqt:
+    29:42:void <init>(net.minecraft.client.renderer.GameRenderer,net.minecraft.client.Minecraft) -> <init>
+    46:47:void close() -> close
+    50:53:void tick() -> a
+    56:59:void turnOffLightLayer() -> b
+    62:78:void turnOnLightLayer() -> c
+    81:186:void updateLightTexture(float) -> a
+    189:190:float notGamma(float) -> b
+    195:195:float getBrightness(net.minecraft.world.level.Level,int) -> a
+    199:199:int pack(int,int) -> a
+    203:203:int block(int) -> a
+    207:207:int sky(int) -> b
+net.minecraft.client.renderer.MultiBufferSource -> ebz:
     15:15:net.minecraft.client.renderer.MultiBufferSource$BufferSource immediate(com.mojang.blaze3d.vertex.BufferBuilder) -> a
     19:19:net.minecraft.client.renderer.MultiBufferSource$BufferSource immediateWithBuffers(java.util.Map,com.mojang.blaze3d.vertex.BufferBuilder) -> a
     com.mojang.blaze3d.vertex.VertexConsumer getBuffer(net.minecraft.client.renderer.RenderType) -> getBuffer
-net.minecraft.client.renderer.MultiBufferSource$BufferSource -> dqt$a:
+net.minecraft.client.renderer.MultiBufferSource$BufferSource -> ebz$a:
     com.mojang.blaze3d.vertex.BufferBuilder builder -> a
     java.util.Map fixedBuffers -> b
     java.util.Optional lastState -> c
@@ -14196,7 +15204,7 @@ net.minecraft.client.renderer.MultiBufferSource$BufferSource -> dqt$a:
     62:71:void endBatch() -> a
     74:90:void endBatch(net.minecraft.client.renderer.RenderType) -> a
     63:67:void lambda$endBatch$0(net.minecraft.client.renderer.RenderType) -> c
-net.minecraft.client.renderer.OutlineBufferSource -> dqu:
+net.minecraft.client.renderer.OutlineBufferSource -> eca:
     net.minecraft.client.renderer.MultiBufferSource$BufferSource bufferSource -> a
     net.minecraft.client.renderer.MultiBufferSource$BufferSource outlineBufferSource -> b
     int teamR -> c
@@ -14207,8 +15215,8 @@ net.minecraft.client.renderer.OutlineBufferSource -> dqu:
     25:36:com.mojang.blaze3d.vertex.VertexConsumer getBuffer(net.minecraft.client.renderer.RenderType) -> getBuffer
     40:44:void setColor(int,int,int,int) -> a
     47:48:void endOutlineBatch() -> a
-net.minecraft.client.renderer.OutlineBufferSource$1 -> dqu$1:
-net.minecraft.client.renderer.OutlineBufferSource$EntityOutlineGenerator -> dqu$a:
+net.minecraft.client.renderer.OutlineBufferSource$1 -> eca$1:
+net.minecraft.client.renderer.OutlineBufferSource$EntityOutlineGenerator -> eca$a:
     com.mojang.blaze3d.vertex.VertexConsumer delegate -> g
     double x -> h
     double y -> i
@@ -14223,17 +15231,17 @@ net.minecraft.client.renderer.OutlineBufferSource$EntityOutlineGenerator -> dqu$
     89:91:com.mojang.blaze3d.vertex.VertexConsumer uv(float,float) -> a
     96:96:com.mojang.blaze3d.vertex.VertexConsumer overlayCoords(int,int) -> a
     101:101:com.mojang.blaze3d.vertex.VertexConsumer uv2(int,int) -> b
-    106:106:com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> a
+    106:106:com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> b
     111:112:void vertex(float,float,float,float,float,float,float,float,float,int,int,float,float,float) -> a
-    116:117:void endVertex() -> a
+    116:117:void endVertex() -> d
     51:51:void <init>(com.mojang.blaze3d.vertex.VertexConsumer,int,int,int,int,net.minecraft.client.renderer.OutlineBufferSource$1) -> <init>
-net.minecraft.client.renderer.PanoramaRenderer -> dqv:
+net.minecraft.client.renderer.PanoramaRenderer -> ecb:
     net.minecraft.client.Minecraft minecraft -> a
     net.minecraft.client.renderer.CubeMap cubeMap -> b
     float time -> c
     11:14:void <init>(net.minecraft.client.renderer.CubeMap) -> <init>
     17:20:void render(float,float) -> a
-net.minecraft.client.renderer.PostChain -> dqw:
+net.minecraft.client.renderer.PostChain -> ecc:
     com.mojang.blaze3d.pipeline.RenderTarget screenTarget -> a
     net.minecraft.server.packs.resources.ResourceManager resourceManager -> b
     java.lang.String name -> c
@@ -14248,18 +15256,18 @@ net.minecraft.client.renderer.PostChain -> dqw:
     38:59:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.server.packs.resources.ResourceManager,com.mojang.blaze3d.pipeline.RenderTarget,net.minecraft.resources.ResourceLocation) -> <init>
     62:105:void load(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.resources.ResourceLocation) -> a
     108:123:void parseTargetNode(com.google.gson.JsonElement) -> a
-    126:204:void parsePassNode(net.minecraft.client.renderer.texture.TextureManager,com.google.gson.JsonElement) -> a
-    207:247:void parseUniformNode(com.google.gson.JsonElement) -> b
-    250:250:com.mojang.blaze3d.pipeline.RenderTarget getTempTarget(java.lang.String) -> a
-    254:261:void addTempTarget(java.lang.String,int,int) -> a
-    265:272:void close() -> close
-    275:277:net.minecraft.client.renderer.PostPass addPass(java.lang.String,com.mojang.blaze3d.pipeline.RenderTarget,com.mojang.blaze3d.pipeline.RenderTarget) -> a
-    281:282:void updateOrthoMatrix() -> b
-    285:294:void resize(int,int) -> a
-    297:310:void process(float) -> a
-    313:313:java.lang.String getName() -> a
-    317:323:com.mojang.blaze3d.pipeline.RenderTarget getRenderTarget(java.lang.String) -> b
-net.minecraft.client.renderer.PostPass -> dqx:
+    126:221:void parsePassNode(net.minecraft.client.renderer.texture.TextureManager,com.google.gson.JsonElement) -> a
+    224:264:void parseUniformNode(com.google.gson.JsonElement) -> b
+    267:267:com.mojang.blaze3d.pipeline.RenderTarget getTempTarget(java.lang.String) -> a
+    271:278:void addTempTarget(java.lang.String,int,int) -> a
+    282:289:void close() -> close
+    292:294:net.minecraft.client.renderer.PostPass addPass(java.lang.String,com.mojang.blaze3d.pipeline.RenderTarget,com.mojang.blaze3d.pipeline.RenderTarget) -> a
+    298:299:void updateOrthoMatrix() -> b
+    302:311:void resize(int,int) -> a
+    314:327:void process(float) -> a
+    330:330:java.lang.String getName() -> a
+    334:340:com.mojang.blaze3d.pipeline.RenderTarget getRenderTarget(java.lang.String) -> b
+net.minecraft.client.renderer.PostPass -> ecd:
     net.minecraft.client.renderer.EffectInstance effect -> c
     com.mojang.blaze3d.pipeline.RenderTarget inTarget -> a
     com.mojang.blaze3d.pipeline.RenderTarget outTarget -> b
@@ -14275,7 +15283,7 @@ net.minecraft.client.renderer.PostPass -> dqx:
     51:52:void setOrthoMatrix(com.mojang.math.Matrix4f) -> a
     55:103:void process(float) -> a
     106:106:net.minecraft.client.renderer.EffectInstance getEffect() -> b
-net.minecraft.client.renderer.Rect2i -> dqy:
+net.minecraft.client.renderer.Rect2i -> ece:
     int xPos -> a
     int yPos -> b
     int width -> c
@@ -14292,298 +15300,346 @@ net.minecraft.client.renderer.Rect2i -> dqy:
     64:65:void setHeight(int) -> d
     68:70:void setPosition(int,int) -> a
     73:73:boolean contains(int,int) -> b
-net.minecraft.client.renderer.RenderBuffers -> dqz:
+net.minecraft.client.renderer.RenderBuffers -> ecf:
     net.minecraft.client.renderer.ChunkBufferBuilderPack fixedBufferPack -> a
     java.util.SortedMap fixedBuffers -> b
     net.minecraft.client.renderer.MultiBufferSource$BufferSource bufferSource -> c
     net.minecraft.client.renderer.MultiBufferSource$BufferSource crumblingBufferSource -> d
     net.minecraft.client.renderer.OutlineBufferSource outlineBufferSource -> e
-    10:40:void <init>() -> <init>
-    34:35:void put(it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap,net.minecraft.client.renderer.RenderType) -> a
-    43:43:net.minecraft.client.renderer.ChunkBufferBuilderPack fixedBufferPack() -> a
-    47:47:net.minecraft.client.renderer.MultiBufferSource$BufferSource bufferSource() -> b
-    51:51:net.minecraft.client.renderer.MultiBufferSource$BufferSource crumblingBufferSource() -> c
-    55:55:net.minecraft.client.renderer.OutlineBufferSource outlineBufferSource() -> d
-    14:31:void lambda$new$1(it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap) -> a
-    30:30:void lambda$null$0(it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap,net.minecraft.client.renderer.RenderType) -> b
-net.minecraft.client.renderer.RenderStateShard -> dra:
+    10:44:void <init>() -> <init>
+    38:39:void put(it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap,net.minecraft.client.renderer.RenderType) -> a
+    47:47:net.minecraft.client.renderer.ChunkBufferBuilderPack fixedBufferPack() -> a
+    51:51:net.minecraft.client.renderer.MultiBufferSource$BufferSource bufferSource() -> b
+    55:55:net.minecraft.client.renderer.MultiBufferSource$BufferSource crumblingBufferSource() -> c
+    59:59:net.minecraft.client.renderer.OutlineBufferSource outlineBufferSource() -> d
+    14:35:void lambda$new$1(it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap) -> a
+    34:34:void lambda$null$0(it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap,net.minecraft.client.renderer.RenderType) -> b
+net.minecraft.client.renderer.RenderStateShard -> ecg:
     java.lang.String name -> a
-    java.lang.Runnable setupState -> Q
-    java.lang.Runnable clearState -> R
+    java.lang.Runnable setupState -> W
+    java.lang.Runnable clearState -> X
     net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard NO_TRANSPARENCY -> b
     net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard ADDITIVE_TRANSPARENCY -> c
     net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard LIGHTNING_TRANSPARENCY -> d
     net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard GLINT_TRANSPARENCY -> e
-    net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard CRUMBLING_TRANSPARENCY -> f
-    net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard TRANSLUCENT_TRANSPARENCY -> g
-    net.minecraft.client.renderer.RenderStateShard$AlphaStateShard NO_ALPHA -> h
-    net.minecraft.client.renderer.RenderStateShard$AlphaStateShard DEFAULT_ALPHA -> i
-    net.minecraft.client.renderer.RenderStateShard$AlphaStateShard MIDWAY_ALPHA -> j
-    net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard FLAT_SHADE -> k
-    net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard SMOOTH_SHADE -> l
-    net.minecraft.client.renderer.RenderStateShard$TextureStateShard BLOCK_SHEET_MIPPED -> m
-    net.minecraft.client.renderer.RenderStateShard$TextureStateShard BLOCK_SHEET -> n
-    net.minecraft.client.renderer.RenderStateShard$TextureStateShard NO_TEXTURE -> o
-    net.minecraft.client.renderer.RenderStateShard$TexturingStateShard DEFAULT_TEXTURING -> p
-    net.minecraft.client.renderer.RenderStateShard$TexturingStateShard OUTLINE_TEXTURING -> q
-    net.minecraft.client.renderer.RenderStateShard$TexturingStateShard GLINT_TEXTURING -> r
-    net.minecraft.client.renderer.RenderStateShard$TexturingStateShard ENTITY_GLINT_TEXTURING -> s
-    net.minecraft.client.renderer.RenderStateShard$LightmapStateShard LIGHTMAP -> t
-    net.minecraft.client.renderer.RenderStateShard$LightmapStateShard NO_LIGHTMAP -> u
-    net.minecraft.client.renderer.RenderStateShard$OverlayStateShard OVERLAY -> v
-    net.minecraft.client.renderer.RenderStateShard$OverlayStateShard NO_OVERLAY -> w
-    net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard DIFFUSE_LIGHTING -> x
-    net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard NO_DIFFUSE_LIGHTING -> y
-    net.minecraft.client.renderer.RenderStateShard$CullStateShard CULL -> z
-    net.minecraft.client.renderer.RenderStateShard$CullStateShard NO_CULL -> A
-    net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard NO_DEPTH_TEST -> B
-    net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard EQUAL_DEPTH_TEST -> C
-    net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard LEQUAL_DEPTH_TEST -> D
-    net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard COLOR_DEPTH_WRITE -> E
-    net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard COLOR_WRITE -> F
-    net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard DEPTH_WRITE -> G
-    net.minecraft.client.renderer.RenderStateShard$LayeringStateShard NO_LAYERING -> H
-    net.minecraft.client.renderer.RenderStateShard$LayeringStateShard POLYGON_OFFSET_LAYERING -> I
-    net.minecraft.client.renderer.RenderStateShard$LayeringStateShard PROJECTION_LAYERING -> J
-    net.minecraft.client.renderer.RenderStateShard$FogStateShard NO_FOG -> K
-    net.minecraft.client.renderer.RenderStateShard$FogStateShard FOG -> L
-    net.minecraft.client.renderer.RenderStateShard$FogStateShard BLACK_FOG -> M
-    net.minecraft.client.renderer.RenderStateShard$OutputStateShard MAIN_TARGET -> N
-    net.minecraft.client.renderer.RenderStateShard$OutputStateShard OUTLINE_TARGET -> O
-    net.minecraft.client.renderer.RenderStateShard$LineStateShard DEFAULT_LINE -> P
-    23:27:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
-    30:31:void setupRenderState() -> a
-    34:35:void clearRenderState() -> b
-    39:46:boolean equals(java.lang.Object) -> equals
-    51:51:int hashCode() -> hashCode
-    341:356:void setupGlintTexturing(float) -> a
-    622:623:void lambda$static$35() -> c
-    620:621:void lambda$static$34() -> d
-    617:617:void lambda$static$33() -> e
-    616:616:void lambda$static$32() -> f
-    605:607:void lambda$static$31() -> g
-    602:604:void lambda$static$30() -> h
-    598:599:void lambda$static$29() -> i
-    595:597:void lambda$static$28() -> j
-    592:592:void lambda$static$27() -> k
-    591:591:void lambda$static$26() -> l
-    579:582:void lambda$static$25() -> m
-    574:578:void lambda$static$24() -> n
-    569:571:void lambda$static$23() -> o
-    566:568:void lambda$static$22() -> p
-    563:563:void lambda$static$21() -> q
-    562:562:void lambda$static$20() -> r
-    369:372:void lambda$static$19() -> s
-    367:368:void lambda$static$18() -> t
-    361:364:void lambda$static$17() -> u
-    359:360:void lambda$static$16() -> v
-    287:288:void lambda$static$15() -> w
-    285:286:void lambda$static$14() -> x
-    242:242:void lambda$static$13() -> y
-    241:241:void lambda$static$12() -> z
-    101:102:void lambda$static$11() -> A
-    98:100:void lambda$static$10() -> B
-    93:95:void lambda$static$9() -> C
-    90:92:void lambda$static$8() -> D
-    85:87:void lambda$static$7() -> E
-    82:84:void lambda$static$6() -> F
-    77:79:void lambda$static$5() -> G
-    74:76:void lambda$static$4() -> H
-    69:71:void lambda$static$3() -> I
-    66:68:void lambda$static$2() -> J
-    63:63:void lambda$static$1() -> K
-    61:62:void lambda$static$0() -> L
-    60:665:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.RenderStateShard$AlphaStateShard -> dra$a:
-    float cutoff -> Q
-    108:120:void <init>(float) -> <init>
-    124:133:boolean equals(java.lang.Object) -> equals
-    138:138:int hashCode() -> hashCode
-    116:118:void lambda$new$1() -> c
-    109:115:void lambda$new$0(float) -> a
-net.minecraft.client.renderer.RenderStateShard$BooleanStateShard -> dra$b:
-    boolean enabled -> Q
-    378:380:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable,boolean) -> <init>
-    384:391:boolean equals(java.lang.Object) -> equals
-    396:396:int hashCode() -> hashCode
-net.minecraft.client.renderer.RenderStateShard$CullStateShard -> dra$c:
-    453:462:void <init>(boolean) -> <init>
-    458:461:void lambda$new$1(boolean) -> a
-    454:457:void lambda$new$0(boolean) -> b
-net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard -> dra$d:
-    int function -> Q
-    472:484:void <init>(int) -> <init>
-    488:495:boolean equals(java.lang.Object) -> equals
-    500:500:int hashCode() -> hashCode
-    478:482:void lambda$new$1(int) -> a
-    473:477:void lambda$new$0(int) -> b
-net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard -> dra$e:
-    436:445:void <init>(boolean) -> <init>
-    441:444:void lambda$new$1(boolean) -> a
-    437:440:void lambda$new$0(boolean) -> b
-net.minecraft.client.renderer.RenderStateShard$FogStateShard -> dra$f:
-    586:587:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
-net.minecraft.client.renderer.RenderStateShard$LayeringStateShard -> dra$g:
-    557:558:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
-net.minecraft.client.renderer.RenderStateShard$LightmapStateShard -> dra$h:
-    402:411:void <init>(boolean) -> <init>
-    407:410:void lambda$new$1(boolean) -> a
-    403:406:void lambda$new$0(boolean) -> b
-net.minecraft.client.renderer.RenderStateShard$LineStateShard -> dra$i:
-    java.util.OptionalDouble width -> Q
-    629:643:void <init>(java.util.OptionalDouble) -> <init>
-    647:656:boolean equals(java.lang.Object) -> equals
-    661:661:int hashCode() -> hashCode
-    638:641:void lambda$new$1(java.util.OptionalDouble) -> a
-    630:637:void lambda$new$0(java.util.OptionalDouble) -> b
-net.minecraft.client.renderer.RenderStateShard$OffsetTexturingStateShard -> dra$j:
-    float uOffset -> Q
-    float vOffset -> R
-    249:263:void <init>(float,float) -> <init>
-    267:275:boolean equals(java.lang.Object) -> equals
-    280:280:int hashCode() -> hashCode
-    256:259:void lambda$new$1() -> c
-    250:255:void lambda$new$0(float,float) -> a
-net.minecraft.client.renderer.RenderStateShard$OutputStateShard -> dra$k:
-    611:612:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
-net.minecraft.client.renderer.RenderStateShard$OverlayStateShard -> dra$l:
-    419:428:void <init>(boolean) -> <init>
-    424:427:void lambda$new$1(boolean) -> a
-    420:423:void lambda$new$0(boolean) -> b
-net.minecraft.client.renderer.RenderStateShard$PortalTexturingStateShard -> dra$m:
-    int iteration -> Q
-    294:320:void <init>(int) -> <init>
-    324:331:boolean equals(java.lang.Object) -> equals
-    336:336:int hashCode() -> hashCode
-    313:318:void lambda$new$1() -> c
-    295:312:void lambda$new$0(int) -> a
-net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard -> dra$n:
-    boolean smooth -> Q
-    150:156:void <init>(boolean) -> <init>
-    160:167:boolean equals(java.lang.Object) -> equals
-    172:172:int hashCode() -> hashCode
-    153:154:void lambda$new$1() -> c
-    151:152:void lambda$new$0(boolean) -> a
-net.minecraft.client.renderer.RenderStateShard$TextureStateShard -> dra$o:
-    java.util.Optional texture -> Q
-    boolean blur -> R
-    boolean mipmap -> S
-    185:195:void <init>(net.minecraft.resources.ResourceLocation,boolean,boolean) -> <init>
-    198:206:void <init>() -> <init>
-    210:217:boolean equals(java.lang.Object) -> equals
-    222:222:int hashCode() -> hashCode
-    226:226:java.util.Optional texture() -> c
-    201:202:void lambda$new$3() -> d
-    199:200:void lambda$new$2() -> e
-    191:191:void lambda$new$1() -> f
-    186:190:void lambda$new$0(net.minecraft.resources.ResourceLocation,boolean,boolean) -> a
-net.minecraft.client.renderer.RenderStateShard$TexturingStateShard -> dra$p:
-    236:237:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
-net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard -> dra$q:
-    56:57:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
-net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard -> dra$r:
-    boolean writeColor -> Q
-    boolean writeDepth -> R
-    513:530:void <init>(boolean,boolean) -> <init>
-    534:541:boolean equals(java.lang.Object) -> equals
-    547:547:int hashCode() -> hashCode
-    521:527:void lambda$new$1(boolean,boolean) -> a
-    514:520:void lambda$new$0(boolean,boolean) -> b
-net.minecraft.client.renderer.RenderType -> drb:
-    net.minecraft.client.renderer.RenderType SOLID -> R
-    net.minecraft.client.renderer.RenderType CUTOUT_MIPPED -> S
-    net.minecraft.client.renderer.RenderType CUTOUT -> T
-    net.minecraft.client.renderer.RenderType TRANSLUCENT -> U
-    net.minecraft.client.renderer.RenderType TRANSLUCENT_NO_CRUMBLING -> V
-    net.minecraft.client.renderer.RenderType LEASH -> W
-    net.minecraft.client.renderer.RenderType WATER_MASK -> X
-    net.minecraft.client.renderer.RenderType GLINT -> Y
-    net.minecraft.client.renderer.RenderType ENTITY_GLINT -> Z
-    net.minecraft.client.renderer.RenderType LIGHTNING -> aa
-    net.minecraft.client.renderer.RenderType$CompositeRenderType LINES -> Q
-    com.mojang.blaze3d.vertex.VertexFormat format -> ab
-    int mode -> ac
-    int bufferSize -> ad
-    boolean affectsCrumbling -> ae
-    boolean sortOnUpload -> af
-    java.util.Optional asOptional -> ag
-    44:44:net.minecraft.client.renderer.RenderType solid() -> c
-    55:55:net.minecraft.client.renderer.RenderType cutoutMipped() -> d
-    66:66:net.minecraft.client.renderer.RenderType cutout() -> e
-    70:75:net.minecraft.client.renderer.RenderType$CompositeState translucentState() -> v
-    81:81:net.minecraft.client.renderer.RenderType translucent() -> f
-    87:87:net.minecraft.client.renderer.RenderType translucentNoCrumbling() -> g
-    91:99:net.minecraft.client.renderer.RenderType entitySolid(net.minecraft.resources.ResourceLocation) -> a
-    103:112:net.minecraft.client.renderer.RenderType entityCutout(net.minecraft.resources.ResourceLocation) -> b
-    116:126:net.minecraft.client.renderer.RenderType entityCutoutNoCull(net.minecraft.resources.ResourceLocation,boolean) -> a
-    130:130:net.minecraft.client.renderer.RenderType entityCutoutNoCull(net.minecraft.resources.ResourceLocation) -> c
-    134:143:net.minecraft.client.renderer.RenderType entityTranslucentCull(net.minecraft.resources.ResourceLocation) -> d
-    147:157:net.minecraft.client.renderer.RenderType entityTranslucent(net.minecraft.resources.ResourceLocation,boolean) -> b
-    161:161:net.minecraft.client.renderer.RenderType entityTranslucent(net.minecraft.resources.ResourceLocation) -> e
-    165:174:net.minecraft.client.renderer.RenderType entitySmoothCutout(net.minecraft.resources.ResourceLocation) -> f
-    178:185:net.minecraft.client.renderer.RenderType beaconBeam(net.minecraft.resources.ResourceLocation,boolean) -> c
-    189:199:net.minecraft.client.renderer.RenderType entityDecal(net.minecraft.resources.ResourceLocation) -> g
-    203:214:net.minecraft.client.renderer.RenderType entityNoOutline(net.minecraft.resources.ResourceLocation) -> h
-    218:224:net.minecraft.client.renderer.RenderType entityAlpha(net.minecraft.resources.ResourceLocation,float) -> a
-    228:234:net.minecraft.client.renderer.RenderType eyes(net.minecraft.resources.ResourceLocation) -> i
-    238:248:net.minecraft.client.renderer.RenderType energySwirl(net.minecraft.resources.ResourceLocation,float,float) -> a
-    258:258:net.minecraft.client.renderer.RenderType leash() -> h
-    267:267:net.minecraft.client.renderer.RenderType waterMask() -> i
-    271:279:net.minecraft.client.renderer.RenderType outline(net.minecraft.resources.ResourceLocation) -> j
-    292:292:net.minecraft.client.renderer.RenderType glint() -> j
-    305:305:net.minecraft.client.renderer.RenderType entityGlint() -> k
-    309:316:net.minecraft.client.renderer.RenderType crumbling(net.minecraft.resources.ResourceLocation) -> k
-    320:325:net.minecraft.client.renderer.RenderType text(net.minecraft.resources.ResourceLocation) -> l
-    329:336:net.minecraft.client.renderer.RenderType textSeeThrough(net.minecraft.resources.ResourceLocation) -> m
-    346:346:net.minecraft.client.renderer.RenderType lightning() -> l
-    353:366:net.minecraft.client.renderer.RenderType endPortal(int) -> a
-    377:377:net.minecraft.client.renderer.RenderType lines() -> m
-    388:395:void <init>(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,boolean,boolean,java.lang.Runnable,java.lang.Runnable) -> <init>
-    398:398:net.minecraft.client.renderer.RenderType$CompositeRenderType create(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,net.minecraft.client.renderer.RenderType$CompositeState) -> a
-    402:402:net.minecraft.client.renderer.RenderType$CompositeRenderType create(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,boolean,boolean,net.minecraft.client.renderer.RenderType$CompositeState) -> a
-    406:416:void end(com.mojang.blaze3d.vertex.BufferBuilder,int,int,int) -> a
-    420:420:java.lang.String toString() -> toString
-    424:424:java.util.List chunkBufferLayers() -> n
-    428:428:int bufferSize() -> o
-    432:432:com.mojang.blaze3d.vertex.VertexFormat format() -> p
-    436:436:int mode() -> q
-    440:440:java.util.Optional outline() -> r
-    444:444:boolean isOutline() -> s
-    448:448:boolean affectsCrumbling() -> t
-    452:452:java.util.Optional asOptional() -> u
-    37:374:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.RenderType$1 -> drb$1:
-net.minecraft.client.renderer.RenderType$CompositeRenderType -> drb$a:
-    it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet INSTANCES -> R
-    net.minecraft.client.renderer.RenderType$CompositeState state -> S
-    int hashCode -> T
-    java.util.Optional outline -> U
-    boolean isOutline -> V
-    647:652:void <init>(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,boolean,boolean,net.minecraft.client.renderer.RenderType$CompositeState) -> <init>
-    655:655:net.minecraft.client.renderer.RenderType$CompositeRenderType memoize(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,boolean,boolean,net.minecraft.client.renderer.RenderType$CompositeState) -> c
-    660:660:java.util.Optional outline() -> r
-    665:665:boolean isOutline() -> s
-    669:669:net.minecraft.client.renderer.RenderType$CompositeState state() -> v
-    674:674:boolean equals(java.lang.Object) -> equals
-    679:679:int hashCode() -> hashCode
-    647:647:void lambda$new$1(net.minecraft.client.renderer.RenderType$CompositeState) -> a
-    647:647:void lambda$new$0(net.minecraft.client.renderer.RenderType$CompositeState) -> b
-    638:638:net.minecraft.client.renderer.RenderType$CompositeRenderType access$000(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,boolean,boolean,net.minecraft.client.renderer.RenderType$CompositeState) -> b
-    638:638:int access$500(net.minecraft.client.renderer.RenderType$CompositeRenderType) -> a
-    638:638:net.minecraft.client.renderer.RenderType$CompositeState access$600(net.minecraft.client.renderer.RenderType$CompositeRenderType) -> b
-    639:639:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.RenderType$CompositeRenderType$EqualsStrategy -> drb$a$a:
+    net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard GLINT_DIRECT_TRANSPARENCY -> f
+    net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard CRUMBLING_TRANSPARENCY -> g
+    net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard TRANSLUCENT_TRANSPARENCY -> h
+    net.minecraft.client.renderer.RenderStateShard$AlphaStateShard NO_ALPHA -> i
+    net.minecraft.client.renderer.RenderStateShard$AlphaStateShard DEFAULT_ALPHA -> j
+    net.minecraft.client.renderer.RenderStateShard$AlphaStateShard MIDWAY_ALPHA -> k
+    net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard FLAT_SHADE -> l
+    net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard SMOOTH_SHADE -> m
+    net.minecraft.client.renderer.RenderStateShard$TextureStateShard BLOCK_SHEET_MIPPED -> n
+    net.minecraft.client.renderer.RenderStateShard$TextureStateShard BLOCK_SHEET -> o
+    net.minecraft.client.renderer.RenderStateShard$TextureStateShard NO_TEXTURE -> p
+    net.minecraft.client.renderer.RenderStateShard$TexturingStateShard DEFAULT_TEXTURING -> q
+    net.minecraft.client.renderer.RenderStateShard$TexturingStateShard OUTLINE_TEXTURING -> r
+    net.minecraft.client.renderer.RenderStateShard$TexturingStateShard GLINT_TEXTURING -> s
+    net.minecraft.client.renderer.RenderStateShard$TexturingStateShard ENTITY_GLINT_TEXTURING -> t
+    net.minecraft.client.renderer.RenderStateShard$LightmapStateShard LIGHTMAP -> u
+    net.minecraft.client.renderer.RenderStateShard$LightmapStateShard NO_LIGHTMAP -> v
+    net.minecraft.client.renderer.RenderStateShard$OverlayStateShard OVERLAY -> w
+    net.minecraft.client.renderer.RenderStateShard$OverlayStateShard NO_OVERLAY -> x
+    net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard DIFFUSE_LIGHTING -> y
+    net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard NO_DIFFUSE_LIGHTING -> z
+    net.minecraft.client.renderer.RenderStateShard$CullStateShard CULL -> A
+    net.minecraft.client.renderer.RenderStateShard$CullStateShard NO_CULL -> B
+    net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard NO_DEPTH_TEST -> C
+    net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard EQUAL_DEPTH_TEST -> D
+    net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard LEQUAL_DEPTH_TEST -> E
+    net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard COLOR_DEPTH_WRITE -> F
+    net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard COLOR_WRITE -> G
+    net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard DEPTH_WRITE -> H
+    net.minecraft.client.renderer.RenderStateShard$LayeringStateShard NO_LAYERING -> I
+    net.minecraft.client.renderer.RenderStateShard$LayeringStateShard POLYGON_OFFSET_LAYERING -> J
+    net.minecraft.client.renderer.RenderStateShard$LayeringStateShard VIEW_OFFSET_Z_LAYERING -> K
+    net.minecraft.client.renderer.RenderStateShard$FogStateShard NO_FOG -> L
+    net.minecraft.client.renderer.RenderStateShard$FogStateShard FOG -> M
+    net.minecraft.client.renderer.RenderStateShard$FogStateShard BLACK_FOG -> N
+    net.minecraft.client.renderer.RenderStateShard$OutputStateShard MAIN_TARGET -> O
+    net.minecraft.client.renderer.RenderStateShard$OutputStateShard OUTLINE_TARGET -> P
+    net.minecraft.client.renderer.RenderStateShard$OutputStateShard TRANSLUCENT_TARGET -> Q
+    net.minecraft.client.renderer.RenderStateShard$OutputStateShard PARTICLES_TARGET -> R
+    net.minecraft.client.renderer.RenderStateShard$OutputStateShard WEATHER_TARGET -> S
+    net.minecraft.client.renderer.RenderStateShard$OutputStateShard CLOUDS_TARGET -> T
+    net.minecraft.client.renderer.RenderStateShard$OutputStateShard ITEM_ENTITY_TARGET -> U
+    net.minecraft.client.renderer.RenderStateShard$LineStateShard DEFAULT_LINE -> V
+    25:29:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
+    32:33:void setupRenderState() -> a
+    36:37:void clearRenderState() -> b
+    41:48:boolean equals(java.lang.Object) -> equals
+    53:53:int hashCode() -> hashCode
+    58:58:java.lang.String toString() -> toString
+    372:387:void setupGlintTexturing(float) -> a
+    712:715:void lambda$static$46() -> c
+    708:711:void lambda$static$45() -> d
+    702:705:void lambda$static$44() -> e
+    698:701:void lambda$static$43() -> f
+    692:695:void lambda$static$42() -> g
+    688:691:void lambda$static$41() -> h
+    682:685:void lambda$static$40() -> i
+    678:681:void lambda$static$39() -> j
+    672:675:void lambda$static$38() -> k
+    668:671:void lambda$static$37() -> l
+    664:665:void lambda$static$36() -> m
+    662:663:void lambda$static$35() -> n
+    659:659:void lambda$static$34() -> o
+    658:658:void lambda$static$33() -> p
+    647:649:void lambda$static$32() -> q
+    644:646:void lambda$static$31() -> r
+    640:641:void lambda$static$30() -> s
+    637:639:void lambda$static$29() -> t
+    634:634:void lambda$static$28() -> u
+    633:633:void lambda$static$27() -> v
+    622:624:void lambda$static$26() -> w
+    617:619:void lambda$static$25() -> x
+    614:616:void lambda$static$24() -> y
+    611:611:void lambda$static$23() -> z
+    610:610:void lambda$static$22() -> A
+    400:403:void lambda$static$21() -> B
+    398:399:void lambda$static$20() -> C
+    392:395:void lambda$static$19() -> D
+    390:391:void lambda$static$18() -> E
+    318:319:void lambda$static$17() -> F
+    316:317:void lambda$static$16() -> G
+    273:273:void lambda$static$15() -> H
+    272:272:void lambda$static$14() -> I
+    116:118:void lambda$static$13() -> J
+    113:115:void lambda$static$12() -> K
+    108:110:void lambda$static$11() -> L
+    105:107:void lambda$static$10() -> M
+    100:102:void lambda$static$9() -> N
+    97:99:void lambda$static$8() -> O
+    92:94:void lambda$static$7() -> P
+    89:91:void lambda$static$6() -> Q
+    84:86:void lambda$static$5() -> R
+    81:83:void lambda$static$4() -> S
+    76:78:void lambda$static$3() -> T
+    73:75:void lambda$static$2() -> U
+    70:70:void lambda$static$1() -> V
+    68:69:void lambda$static$0() -> W
+    67:762:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.RenderStateShard$AlphaStateShard -> ecg$a:
+    float cutoff -> W
+    124:136:void <init>(float) -> <init>
+    140:149:boolean equals(java.lang.Object) -> equals
+    154:154:int hashCode() -> hashCode
+    159:159:java.lang.String toString() -> toString
+    132:134:void lambda$new$1() -> c
+    125:131:void lambda$new$0(float) -> a
+net.minecraft.client.renderer.RenderStateShard$BooleanStateShard -> ecg$b:
+    boolean enabled -> W
+    409:411:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable,boolean) -> <init>
+    415:422:boolean equals(java.lang.Object) -> equals
+    427:427:int hashCode() -> hashCode
+    432:432:java.lang.String toString() -> toString
+net.minecraft.client.renderer.RenderStateShard$CullStateShard -> ecg$c:
+    489:498:void <init>(boolean) -> <init>
+    494:497:void lambda$new$1(boolean) -> a
+    490:493:void lambda$new$0(boolean) -> b
+net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard -> ecg$d:
+    java.lang.String functionName -> W
+    int function -> X
+    509:522:void <init>(java.lang.String,int) -> <init>
+    526:533:boolean equals(java.lang.Object) -> equals
+    538:538:int hashCode() -> hashCode
+    543:543:java.lang.String toString() -> toString
+    515:519:void lambda$new$1(int) -> a
+    510:514:void lambda$new$0(int) -> b
+net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard -> ecg$e:
+    472:481:void <init>(boolean) -> <init>
+    477:480:void lambda$new$1(boolean) -> a
+    473:476:void lambda$new$0(boolean) -> b
+net.minecraft.client.renderer.RenderStateShard$FogStateShard -> ecg$f:
+    628:629:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
+net.minecraft.client.renderer.RenderStateShard$LayeringStateShard -> ecg$g:
+    605:606:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
+net.minecraft.client.renderer.RenderStateShard$LightmapStateShard -> ecg$h:
+    438:447:void <init>(boolean) -> <init>
+    443:446:void lambda$new$1(boolean) -> a
+    439:442:void lambda$new$0(boolean) -> b
+net.minecraft.client.renderer.RenderStateShard$LineStateShard -> ecg$i:
+    java.util.OptionalDouble width -> W
+    721:735:void <init>(java.util.OptionalDouble) -> <init>
+    739:748:boolean equals(java.lang.Object) -> equals
+    753:753:int hashCode() -> hashCode
+    758:758:java.lang.String toString() -> toString
+    730:733:void lambda$new$1(java.util.OptionalDouble) -> a
+    722:729:void lambda$new$0(java.util.OptionalDouble) -> b
+net.minecraft.client.renderer.RenderStateShard$OffsetTexturingStateShard -> ecg$j:
+    float uOffset -> W
+    float vOffset -> X
+    280:294:void <init>(float,float) -> <init>
+    298:306:boolean equals(java.lang.Object) -> equals
+    311:311:int hashCode() -> hashCode
+    287:290:void lambda$new$1() -> c
+    281:286:void lambda$new$0(float,float) -> a
+net.minecraft.client.renderer.RenderStateShard$OutputStateShard -> ecg$k:
+    653:654:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
+net.minecraft.client.renderer.RenderStateShard$OverlayStateShard -> ecg$l:
+    455:464:void <init>(boolean) -> <init>
+    460:463:void lambda$new$1(boolean) -> a
+    456:459:void lambda$new$0(boolean) -> b
+net.minecraft.client.renderer.RenderStateShard$PortalTexturingStateShard -> ecg$m:
+    int iteration -> W
+    325:351:void <init>(int) -> <init>
+    355:362:boolean equals(java.lang.Object) -> equals
+    367:367:int hashCode() -> hashCode
+    344:349:void lambda$new$1() -> c
+    326:343:void lambda$new$0(int) -> a
+net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard -> ecg$n:
+    boolean smooth -> W
+    171:177:void <init>(boolean) -> <init>
+    181:188:boolean equals(java.lang.Object) -> equals
+    193:193:int hashCode() -> hashCode
+    198:198:java.lang.String toString() -> toString
+    174:175:void lambda$new$1() -> c
+    172:173:void lambda$new$0(boolean) -> a
+net.minecraft.client.renderer.RenderStateShard$TextureStateShard -> ecg$o:
+    java.util.Optional texture -> W
+    boolean blur -> X
+    boolean mipmap -> Y
+    211:221:void <init>(net.minecraft.resources.ResourceLocation,boolean,boolean) -> <init>
+    224:232:void <init>() -> <init>
+    236:243:boolean equals(java.lang.Object) -> equals
+    248:248:int hashCode() -> hashCode
+    253:253:java.lang.String toString() -> toString
+    257:257:java.util.Optional texture() -> c
+    227:228:void lambda$new$3() -> d
+    225:226:void lambda$new$2() -> e
+    217:217:void lambda$new$1() -> f
+    212:216:void lambda$new$0(net.minecraft.resources.ResourceLocation,boolean,boolean) -> a
+net.minecraft.client.renderer.RenderStateShard$TexturingStateShard -> ecg$p:
+    267:268:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
+net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard -> ecg$q:
+    63:64:void <init>(java.lang.String,java.lang.Runnable,java.lang.Runnable) -> <init>
+net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard -> ecg$r:
+    boolean writeColor -> W
+    boolean writeDepth -> X
+    556:573:void <init>(boolean,boolean) -> <init>
+    577:584:boolean equals(java.lang.Object) -> equals
+    590:590:int hashCode() -> hashCode
+    595:595:java.lang.String toString() -> toString
+    564:570:void lambda$new$1(boolean,boolean) -> a
+    557:563:void lambda$new$0(boolean,boolean) -> b
+net.minecraft.client.renderer.RenderType -> ech:
+    net.minecraft.client.renderer.RenderType SOLID -> X
+    net.minecraft.client.renderer.RenderType CUTOUT_MIPPED -> Y
+    net.minecraft.client.renderer.RenderType CUTOUT -> Z
+    net.minecraft.client.renderer.RenderType TRANSLUCENT -> aa
+    net.minecraft.client.renderer.RenderType TRANSLUCENT_MOVING_BLOCK -> ab
+    net.minecraft.client.renderer.RenderType TRANSLUCENT_NO_CRUMBLING -> ac
+    net.minecraft.client.renderer.RenderType LEASH -> ad
+    net.minecraft.client.renderer.RenderType WATER_MASK -> ae
+    net.minecraft.client.renderer.RenderType ARMOR_GLINT -> af
+    net.minecraft.client.renderer.RenderType ARMOR_ENTITY_GLINT -> ag
+    net.minecraft.client.renderer.RenderType GLINT -> ah
+    net.minecraft.client.renderer.RenderType GLINT_DIRECT -> ai
+    net.minecraft.client.renderer.RenderType ENTITY_GLINT -> aj
+    net.minecraft.client.renderer.RenderType ENTITY_GLINT_DIRECT -> ak
+    net.minecraft.client.renderer.RenderType LIGHTNING -> al
+    net.minecraft.client.renderer.RenderType TRIPWIRE -> am
+    net.minecraft.client.renderer.RenderType$CompositeRenderType LINES -> W
+    com.mojang.blaze3d.vertex.VertexFormat format -> an
+    int mode -> ao
+    int bufferSize -> ap
+    boolean affectsCrumbling -> aq
+    boolean sortOnUpload -> ar
+    java.util.Optional asOptional -> as
+    56:56:net.minecraft.client.renderer.RenderType solid() -> c
+    67:67:net.minecraft.client.renderer.RenderType cutoutMipped() -> d
+    78:78:net.minecraft.client.renderer.RenderType cutout() -> e
+    82:88:net.minecraft.client.renderer.RenderType$CompositeState translucentState() -> B
+    94:94:net.minecraft.client.renderer.RenderType translucent() -> f
+    98:104:net.minecraft.client.renderer.RenderType$CompositeState translucentMovingBlockState() -> C
+    110:110:net.minecraft.client.renderer.RenderType translucentMovingBlock() -> g
+    116:116:net.minecraft.client.renderer.RenderType translucentNoCrumbling() -> h
+    120:131:net.minecraft.client.renderer.RenderType armorCutoutNoCull(net.minecraft.resources.ResourceLocation) -> a
+    135:143:net.minecraft.client.renderer.RenderType entitySolid(net.minecraft.resources.ResourceLocation) -> b
+    147:156:net.minecraft.client.renderer.RenderType entityCutout(net.minecraft.resources.ResourceLocation) -> c
+    160:170:net.minecraft.client.renderer.RenderType entityCutoutNoCull(net.minecraft.resources.ResourceLocation,boolean) -> a
+    174:174:net.minecraft.client.renderer.RenderType entityCutoutNoCull(net.minecraft.resources.ResourceLocation) -> d
+    178:189:net.minecraft.client.renderer.RenderType entityCutoutNoCullZOffset(net.minecraft.resources.ResourceLocation,boolean) -> b
+    193:193:net.minecraft.client.renderer.RenderType entityCutoutNoCullZOffset(net.minecraft.resources.ResourceLocation) -> e
+    197:208:net.minecraft.client.renderer.RenderType itemEntityTranslucentCull(net.minecraft.resources.ResourceLocation) -> f
+    212:221:net.minecraft.client.renderer.RenderType entityTranslucentCull(net.minecraft.resources.ResourceLocation) -> g
+    225:235:net.minecraft.client.renderer.RenderType entityTranslucent(net.minecraft.resources.ResourceLocation,boolean) -> c
+    239:239:net.minecraft.client.renderer.RenderType entityTranslucent(net.minecraft.resources.ResourceLocation) -> h
+    243:252:net.minecraft.client.renderer.RenderType entitySmoothCutout(net.minecraft.resources.ResourceLocation) -> i
+    256:263:net.minecraft.client.renderer.RenderType beaconBeam(net.minecraft.resources.ResourceLocation,boolean) -> d
+    267:277:net.minecraft.client.renderer.RenderType entityDecal(net.minecraft.resources.ResourceLocation) -> j
+    281:292:net.minecraft.client.renderer.RenderType entityNoOutline(net.minecraft.resources.ResourceLocation) -> k
+    296:309:net.minecraft.client.renderer.RenderType entityShadow(net.minecraft.resources.ResourceLocation) -> l
+    313:319:net.minecraft.client.renderer.RenderType dragonExplosionAlpha(net.minecraft.resources.ResourceLocation,float) -> a
+    323:329:net.minecraft.client.renderer.RenderType eyes(net.minecraft.resources.ResourceLocation) -> m
+    333:343:net.minecraft.client.renderer.RenderType energySwirl(net.minecraft.resources.ResourceLocation,float,float) -> a
+    353:353:net.minecraft.client.renderer.RenderType leash() -> i
+    362:362:net.minecraft.client.renderer.RenderType waterMask() -> j
+    366:366:net.minecraft.client.renderer.RenderType outline(net.minecraft.resources.ResourceLocation) -> n
+    370:378:net.minecraft.client.renderer.RenderType outline(net.minecraft.resources.ResourceLocation,net.minecraft.client.renderer.RenderStateShard$CullStateShard) -> a
+    392:392:net.minecraft.client.renderer.RenderType armorGlint() -> k
+    406:406:net.minecraft.client.renderer.RenderType armorEntityGlint() -> l
+    420:420:net.minecraft.client.renderer.RenderType glint() -> m
+    433:433:net.minecraft.client.renderer.RenderType glintDirect() -> n
+    447:447:net.minecraft.client.renderer.RenderType entityGlint() -> o
+    460:460:net.minecraft.client.renderer.RenderType entityGlintDirect() -> p
+    464:471:net.minecraft.client.renderer.RenderType crumbling(net.minecraft.resources.ResourceLocation) -> o
+    475:480:net.minecraft.client.renderer.RenderType text(net.minecraft.resources.ResourceLocation) -> p
+    484:491:net.minecraft.client.renderer.RenderType textSeeThrough(net.minecraft.resources.ResourceLocation) -> q
+    502:502:net.minecraft.client.renderer.RenderType lightning() -> q
+    506:512:net.minecraft.client.renderer.RenderType$CompositeState tripwireState() -> D
+    518:518:net.minecraft.client.renderer.RenderType tripwire() -> r
+    525:538:net.minecraft.client.renderer.RenderType endPortal(int) -> a
+    550:550:net.minecraft.client.renderer.RenderType lines() -> s
+    561:568:void <init>(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,boolean,boolean,java.lang.Runnable,java.lang.Runnable) -> <init>
+    571:571:net.minecraft.client.renderer.RenderType$CompositeRenderType create(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,net.minecraft.client.renderer.RenderType$CompositeState) -> a
+    575:575:net.minecraft.client.renderer.RenderType$CompositeRenderType create(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,boolean,boolean,net.minecraft.client.renderer.RenderType$CompositeState) -> a
+    579:589:void end(com.mojang.blaze3d.vertex.BufferBuilder,int,int,int) -> a
+    593:593:java.lang.String toString() -> toString
+    597:597:java.util.List chunkBufferLayers() -> t
+    601:601:int bufferSize() -> u
+    605:605:com.mojang.blaze3d.vertex.VertexFormat format() -> v
+    609:609:int mode() -> w
+    613:613:java.util.Optional outline() -> x
+    617:617:boolean isOutline() -> y
+    621:621:boolean affectsCrumbling() -> z
+    625:625:java.util.Optional asOptional() -> A
+    49:547:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.RenderType$1 -> ech$1:
+net.minecraft.client.renderer.RenderType$CompositeRenderType -> ech$a:
+    it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet INSTANCES -> X
+    net.minecraft.client.renderer.RenderType$CompositeState state -> Y
+    int hashCode -> Z
+    java.util.Optional outline -> aa
+    boolean isOutline -> ab
+    825:830:void <init>(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,boolean,boolean,net.minecraft.client.renderer.RenderType$CompositeState) -> <init>
+    833:833:net.minecraft.client.renderer.RenderType$CompositeRenderType memoize(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,boolean,boolean,net.minecraft.client.renderer.RenderType$CompositeState) -> c
+    838:838:java.util.Optional outline() -> x
+    843:843:boolean isOutline() -> y
+    847:847:net.minecraft.client.renderer.RenderType$CompositeState state() -> B
+    852:852:boolean equals(java.lang.Object) -> equals
+    857:857:int hashCode() -> hashCode
+    862:862:java.lang.String toString() -> toString
+    827:827:net.minecraft.client.renderer.RenderType lambda$new$2(net.minecraft.client.renderer.RenderType$CompositeState,net.minecraft.resources.ResourceLocation) -> a
+    825:825:void lambda$new$1(net.minecraft.client.renderer.RenderType$CompositeState) -> a
+    825:825:void lambda$new$0(net.minecraft.client.renderer.RenderType$CompositeState) -> b
+    816:816:net.minecraft.client.renderer.RenderType$CompositeRenderType access$000(java.lang.String,com.mojang.blaze3d.vertex.VertexFormat,int,int,boolean,boolean,net.minecraft.client.renderer.RenderType$CompositeState) -> b
+    816:816:int access$500(net.minecraft.client.renderer.RenderType$CompositeRenderType) -> a
+    816:816:net.minecraft.client.renderer.RenderType$CompositeState access$600(net.minecraft.client.renderer.RenderType$CompositeRenderType) -> b
+    817:817:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.RenderType$CompositeRenderType$EqualsStrategy -> ech$a$a:
     net.minecraft.client.renderer.RenderType$CompositeRenderType$EqualsStrategy INSTANCE -> a
     net.minecraft.client.renderer.RenderType$CompositeRenderType$EqualsStrategy[] $VALUES -> b
-    682:682:net.minecraft.client.renderer.RenderType$CompositeRenderType$EqualsStrategy[] values() -> values
-    682:682:net.minecraft.client.renderer.RenderType$CompositeRenderType$EqualsStrategy valueOf(java.lang.String) -> valueOf
-    682:682:void <init>(java.lang.String,int) -> <init>
-    687:690:int hashCode(net.minecraft.client.renderer.RenderType$CompositeRenderType) -> a
-    695:702:boolean equals(net.minecraft.client.renderer.RenderType$CompositeRenderType,net.minecraft.client.renderer.RenderType$CompositeRenderType) -> a
-    682:682:boolean equals(java.lang.Object,java.lang.Object) -> equals
-    682:682:int hashCode(java.lang.Object) -> hashCode
-    682:683:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.RenderType$CompositeState -> drb$b:
+    865:865:net.minecraft.client.renderer.RenderType$CompositeRenderType$EqualsStrategy[] values() -> values
+    865:865:net.minecraft.client.renderer.RenderType$CompositeRenderType$EqualsStrategy valueOf(java.lang.String) -> valueOf
+    865:865:void <init>(java.lang.String,int) -> <init>
+    870:873:int hashCode(net.minecraft.client.renderer.RenderType$CompositeRenderType) -> a
+    878:885:boolean equals(net.minecraft.client.renderer.RenderType$CompositeRenderType,net.minecraft.client.renderer.RenderType$CompositeRenderType) -> a
+    865:865:boolean equals(java.lang.Object,java.lang.Object) -> equals
+    865:865:int hashCode(java.lang.Object) -> hashCode
+    865:866:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.RenderType$CompositeState -> ech$b:
     net.minecraft.client.renderer.RenderStateShard$TextureStateShard textureState -> a
     net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard transparencyState -> b
     net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard diffuseLightingState -> c
@@ -14601,15 +15657,17 @@ net.minecraft.client.renderer.RenderType$CompositeState -> drb$b:
     net.minecraft.client.renderer.RenderStateShard$LineStateShard lineState -> o
     net.minecraft.client.renderer.RenderType$OutlineProperty outlineProperty -> p
     com.google.common.collect.ImmutableList states -> q
-    475:510:void <init>(net.minecraft.client.renderer.RenderStateShard$TextureStateShard,net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard,net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard,net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard,net.minecraft.client.renderer.RenderStateShard$AlphaStateShard,net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard,net.minecraft.client.renderer.RenderStateShard$CullStateShard,net.minecraft.client.renderer.RenderStateShard$LightmapStateShard,net.minecraft.client.renderer.RenderStateShard$OverlayStateShard,net.minecraft.client.renderer.RenderStateShard$FogStateShard,net.minecraft.client.renderer.RenderStateShard$LayeringStateShard,net.minecraft.client.renderer.RenderStateShard$OutputStateShard,net.minecraft.client.renderer.RenderStateShard$TexturingStateShard,net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard,net.minecraft.client.renderer.RenderStateShard$LineStateShard,net.minecraft.client.renderer.RenderType$OutlineProperty) -> <init>
-    514:521:boolean equals(java.lang.Object) -> equals
-    526:526:int hashCode() -> hashCode
-    530:530:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder builder() -> a
-    455:455:void <init>(net.minecraft.client.renderer.RenderStateShard$TextureStateShard,net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard,net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard,net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard,net.minecraft.client.renderer.RenderStateShard$AlphaStateShard,net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard,net.minecraft.client.renderer.RenderStateShard$CullStateShard,net.minecraft.client.renderer.RenderStateShard$LightmapStateShard,net.minecraft.client.renderer.RenderStateShard$OverlayStateShard,net.minecraft.client.renderer.RenderStateShard$FogStateShard,net.minecraft.client.renderer.RenderStateShard$LayeringStateShard,net.minecraft.client.renderer.RenderStateShard$OutputStateShard,net.minecraft.client.renderer.RenderStateShard$TexturingStateShard,net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard,net.minecraft.client.renderer.RenderStateShard$LineStateShard,net.minecraft.client.renderer.RenderType$OutlineProperty,net.minecraft.client.renderer.RenderType$1) -> <init>
-    455:455:net.minecraft.client.renderer.RenderType$OutlineProperty access$300(net.minecraft.client.renderer.RenderType$CompositeState) -> a
-    455:455:net.minecraft.client.renderer.RenderStateShard$TextureStateShard access$400(net.minecraft.client.renderer.RenderType$CompositeState) -> b
-    455:455:com.google.common.collect.ImmutableList access$700(net.minecraft.client.renderer.RenderType$CompositeState) -> c
-net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder -> drb$b$a:
+    648:683:void <init>(net.minecraft.client.renderer.RenderStateShard$TextureStateShard,net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard,net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard,net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard,net.minecraft.client.renderer.RenderStateShard$AlphaStateShard,net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard,net.minecraft.client.renderer.RenderStateShard$CullStateShard,net.minecraft.client.renderer.RenderStateShard$LightmapStateShard,net.minecraft.client.renderer.RenderStateShard$OverlayStateShard,net.minecraft.client.renderer.RenderStateShard$FogStateShard,net.minecraft.client.renderer.RenderStateShard$LayeringStateShard,net.minecraft.client.renderer.RenderStateShard$OutputStateShard,net.minecraft.client.renderer.RenderStateShard$TexturingStateShard,net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard,net.minecraft.client.renderer.RenderStateShard$LineStateShard,net.minecraft.client.renderer.RenderType$OutlineProperty) -> <init>
+    687:694:boolean equals(java.lang.Object) -> equals
+    699:699:int hashCode() -> hashCode
+    704:704:java.lang.String toString() -> toString
+    708:708:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder builder() -> a
+    628:628:void <init>(net.minecraft.client.renderer.RenderStateShard$TextureStateShard,net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard,net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard,net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard,net.minecraft.client.renderer.RenderStateShard$AlphaStateShard,net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard,net.minecraft.client.renderer.RenderStateShard$CullStateShard,net.minecraft.client.renderer.RenderStateShard$LightmapStateShard,net.minecraft.client.renderer.RenderStateShard$OverlayStateShard,net.minecraft.client.renderer.RenderStateShard$FogStateShard,net.minecraft.client.renderer.RenderStateShard$LayeringStateShard,net.minecraft.client.renderer.RenderStateShard$OutputStateShard,net.minecraft.client.renderer.RenderStateShard$TexturingStateShard,net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard,net.minecraft.client.renderer.RenderStateShard$LineStateShard,net.minecraft.client.renderer.RenderType$OutlineProperty,net.minecraft.client.renderer.RenderType$1) -> <init>
+    628:628:net.minecraft.client.renderer.RenderType$OutlineProperty access$300(net.minecraft.client.renderer.RenderType$CompositeState) -> a
+    628:628:net.minecraft.client.renderer.RenderStateShard$TextureStateShard access$400(net.minecraft.client.renderer.RenderType$CompositeState) -> b
+    628:628:net.minecraft.client.renderer.RenderStateShard$CullStateShard access$700(net.minecraft.client.renderer.RenderType$CompositeState) -> c
+    628:628:com.google.common.collect.ImmutableList access$800(net.minecraft.client.renderer.RenderType$CompositeState) -> d
+net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder -> ech$b$a:
     net.minecraft.client.renderer.RenderStateShard$TextureStateShard textureState -> a
     net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard transparencyState -> b
     net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard diffuseLightingState -> c
@@ -14625,50 +15683,52 @@ net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder ->
     net.minecraft.client.renderer.RenderStateShard$TexturingStateShard texturingState -> m
     net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard writeMaskState -> n
     net.minecraft.client.renderer.RenderStateShard$LineStateShard lineState -> o
-    534:551:void <init>() -> <init>
-    554:555:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setTextureState(net.minecraft.client.renderer.RenderStateShard$TextureStateShard) -> a
-    559:560:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setTransparencyState(net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard) -> a
-    564:565:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setDiffuseLightingState(net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard) -> a
-    569:570:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setShadeModelState(net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard) -> a
-    574:575:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setAlphaState(net.minecraft.client.renderer.RenderStateShard$AlphaStateShard) -> a
-    579:580:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setDepthTestState(net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard) -> a
-    584:585:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setCullState(net.minecraft.client.renderer.RenderStateShard$CullStateShard) -> a
-    589:590:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setLightmapState(net.minecraft.client.renderer.RenderStateShard$LightmapStateShard) -> a
-    594:595:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setOverlayState(net.minecraft.client.renderer.RenderStateShard$OverlayStateShard) -> a
-    599:600:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setFogState(net.minecraft.client.renderer.RenderStateShard$FogStateShard) -> a
-    604:605:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setLayeringState(net.minecraft.client.renderer.RenderStateShard$LayeringStateShard) -> a
-    609:610:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setOutputState(net.minecraft.client.renderer.RenderStateShard$OutputStateShard) -> a
-    614:615:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setTexturingState(net.minecraft.client.renderer.RenderStateShard$TexturingStateShard) -> a
-    619:620:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setWriteMaskState(net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard) -> a
-    624:625:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setLineState(net.minecraft.client.renderer.RenderStateShard$LineStateShard) -> a
-    629:629:net.minecraft.client.renderer.RenderType$CompositeState createCompositeState(boolean) -> a
-    633:633:net.minecraft.client.renderer.RenderType$CompositeState createCompositeState(net.minecraft.client.renderer.RenderType$OutlineProperty) -> a
-    533:533:void <init>(net.minecraft.client.renderer.RenderType$1) -> <init>
-net.minecraft.client.renderer.RenderType$OutlineProperty -> drb$c:
+    712:729:void <init>() -> <init>
+    732:733:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setTextureState(net.minecraft.client.renderer.RenderStateShard$TextureStateShard) -> a
+    737:738:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setTransparencyState(net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard) -> a
+    742:743:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setDiffuseLightingState(net.minecraft.client.renderer.RenderStateShard$DiffuseLightingStateShard) -> a
+    747:748:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setShadeModelState(net.minecraft.client.renderer.RenderStateShard$ShadeModelStateShard) -> a
+    752:753:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setAlphaState(net.minecraft.client.renderer.RenderStateShard$AlphaStateShard) -> a
+    757:758:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setDepthTestState(net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard) -> a
+    762:763:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setCullState(net.minecraft.client.renderer.RenderStateShard$CullStateShard) -> a
+    767:768:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setLightmapState(net.minecraft.client.renderer.RenderStateShard$LightmapStateShard) -> a
+    772:773:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setOverlayState(net.minecraft.client.renderer.RenderStateShard$OverlayStateShard) -> a
+    777:778:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setFogState(net.minecraft.client.renderer.RenderStateShard$FogStateShard) -> a
+    782:783:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setLayeringState(net.minecraft.client.renderer.RenderStateShard$LayeringStateShard) -> a
+    787:788:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setOutputState(net.minecraft.client.renderer.RenderStateShard$OutputStateShard) -> a
+    792:793:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setTexturingState(net.minecraft.client.renderer.RenderStateShard$TexturingStateShard) -> a
+    797:798:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setWriteMaskState(net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard) -> a
+    802:803:net.minecraft.client.renderer.RenderType$CompositeState$CompositeStateBuilder setLineState(net.minecraft.client.renderer.RenderStateShard$LineStateShard) -> a
+    807:807:net.minecraft.client.renderer.RenderType$CompositeState createCompositeState(boolean) -> a
+    811:811:net.minecraft.client.renderer.RenderType$CompositeState createCompositeState(net.minecraft.client.renderer.RenderType$OutlineProperty) -> a
+    711:711:void <init>(net.minecraft.client.renderer.RenderType$1) -> <init>
+net.minecraft.client.renderer.RenderType$OutlineProperty -> ech$c:
     net.minecraft.client.renderer.RenderType$OutlineProperty NONE -> a
     net.minecraft.client.renderer.RenderType$OutlineProperty IS_OUTLINE -> b
     net.minecraft.client.renderer.RenderType$OutlineProperty AFFECTS_OUTLINE -> c
-    net.minecraft.client.renderer.RenderType$OutlineProperty[] $VALUES -> d
+    java.lang.String name -> d
+    net.minecraft.client.renderer.RenderType$OutlineProperty[] $VALUES -> e
     22:22:net.minecraft.client.renderer.RenderType$OutlineProperty[] values() -> values
     22:22:net.minecraft.client.renderer.RenderType$OutlineProperty valueOf(java.lang.String) -> valueOf
-    22:22:void <init>(java.lang.String,int) -> <init>
+    30:32:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    36:36:java.lang.String toString() -> toString
     22:25:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.RunningTrimmedMean -> drc:
+net.minecraft.client.renderer.RunningTrimmedMean -> eci:
     long[] values -> a
     int count -> b
     int cursor -> c
     8:10:void <init>(int) -> <init>
     13:38:long registerValueAndGetMean(long) -> a
-net.minecraft.client.renderer.ScreenEffectRenderer -> drd:
+net.minecraft.client.renderer.ScreenEffectRenderer -> ecj:
     net.minecraft.resources.ResourceLocation UNDERWATER_LOCATION -> a
     25:25:void <init>() -> <init>
     29:50:void renderScreenEffect(net.minecraft.client.Minecraft,com.mojang.blaze3d.vertex.PoseStack) -> a
     54:66:net.minecraft.world.level.block.state.BlockState getViewBlockingState(net.minecraft.world.entity.player.Player) -> a
     70:96:void renderTex(net.minecraft.client.Minecraft,net.minecraft.client.renderer.texture.TextureAtlasSprite,com.mojang.blaze3d.vertex.PoseStack) -> a
-    99:129:void renderWater(net.minecraft.client.Minecraft,com.mojang.blaze3d.vertex.PoseStack) -> b
-    132:183:void renderFire(net.minecraft.client.Minecraft,com.mojang.blaze3d.vertex.PoseStack) -> c
+    99:130:void renderWater(net.minecraft.client.Minecraft,com.mojang.blaze3d.vertex.PoseStack) -> b
+    133:185:void renderFire(net.minecraft.client.Minecraft,com.mojang.blaze3d.vertex.PoseStack) -> c
     26:26:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.Sheets -> dre:
+net.minecraft.client.renderer.Sheets -> eck:
     net.minecraft.resources.ResourceLocation SHULKER_SHEET -> a
     net.minecraft.resources.ResourceLocation BED_SHEET -> b
     net.minecraft.resources.ResourceLocation BANNER_SHEET -> c
@@ -14683,7 +15743,7 @@ net.minecraft.client.renderer.Sheets -> dre:
     net.minecraft.client.renderer.RenderType CHEST_SHEET_TYPE -> z
     net.minecraft.client.renderer.RenderType SOLID_BLOCK_SHEET -> A
     net.minecraft.client.renderer.RenderType CUTOUT_BLOCK_SHEET -> B
-    net.minecraft.client.renderer.RenderType TRANSLUCENT_BLOCK_SHEET -> C
+    net.minecraft.client.renderer.RenderType TRANSLUCENT_ITEM_CULL_BLOCK_SHEET -> C
     net.minecraft.client.renderer.RenderType TRANSLUCENT_CULL_BLOCK_SHEET -> D
     net.minecraft.client.resources.model.Material DEFAULT_SHULKER_TEXTURE_LOCATION -> g
     java.util.List SHULKER_TEXTURE_LOCATION -> h
@@ -14708,7 +15768,7 @@ net.minecraft.client.renderer.Sheets -> dre:
     101:101:net.minecraft.client.renderer.RenderType chestSheet() -> f
     105:105:net.minecraft.client.renderer.RenderType solidBlockSheet() -> g
     109:109:net.minecraft.client.renderer.RenderType cutoutBlockSheet() -> h
-    113:113:net.minecraft.client.renderer.RenderType translucentBlockSheet() -> i
+    113:113:net.minecraft.client.renderer.RenderType translucentItemSheet() -> i
     117:117:net.minecraft.client.renderer.RenderType translucentCullBlockSheet() -> j
     121:145:void getAllMaterials(java.util.function.Consumer) -> a
     148:148:net.minecraft.client.resources.model.Material signTexture(net.minecraft.world.level.block.state.properties.WoodType) -> a
@@ -14719,10 +15779,10 @@ net.minecraft.client.renderer.Sheets -> dre:
     66:66:net.minecraft.client.resources.model.Material lambda$static$1(net.minecraft.world.item.DyeColor) -> a
     62:62:net.minecraft.client.resources.model.Material lambda$static$0(java.lang.String) -> b
     25:78:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.Sheets$1 -> dre$1:
+net.minecraft.client.renderer.Sheets$1 -> eck$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$ChestType -> a
     167:167:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.SpriteCoordinateExpander -> drf:
+net.minecraft.client.renderer.SpriteCoordinateExpander -> ecl:
     com.mojang.blaze3d.vertex.VertexConsumer delegate -> a
     net.minecraft.client.renderer.texture.TextureAtlasSprite sprite -> b
     10:13:void <init>(com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.renderer.texture.TextureAtlasSprite) -> <init>
@@ -14731,12 +15791,12 @@ net.minecraft.client.renderer.SpriteCoordinateExpander -> drf:
     27:27:com.mojang.blaze3d.vertex.VertexConsumer uv(float,float) -> a
     32:32:com.mojang.blaze3d.vertex.VertexConsumer overlayCoords(int,int) -> a
     37:37:com.mojang.blaze3d.vertex.VertexConsumer uv2(int,int) -> b
-    42:42:com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> a
-    47:48:void endVertex() -> a
+    42:42:com.mojang.blaze3d.vertex.VertexConsumer normal(float,float,float) -> b
+    47:48:void endVertex() -> d
     52:53:void defaultColor(int,int,int,int) -> b
     57:58:void unsetDefaultColor() -> k
     62:63:void vertex(float,float,float,float,float,float,float,float,float,int,int,float,float,float) -> a
-net.minecraft.client.renderer.ViewArea -> drg:
+net.minecraft.client.renderer.ViewArea -> ecm:
     net.minecraft.client.renderer.LevelRenderer levelRenderer -> a
     net.minecraft.world.level.Level level -> b
     int chunkGridSizeY -> c
@@ -14751,14 +15811,14 @@ net.minecraft.client.renderer.ViewArea -> drg:
     59:83:void repositionCamera(double,double) -> a
     86:92:void setDirty(int,int,int,boolean) -> a
     96:107:net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk getRenderChunkAt(net.minecraft.core.BlockPos) -> a
-net.minecraft.client.renderer.VirtualScreen -> drh:
+net.minecraft.client.renderer.VirtualScreen -> ecn:
     net.minecraft.client.Minecraft minecraft -> a
     com.mojang.blaze3d.platform.ScreenManager screenManager -> b
     15:18:void <init>(net.minecraft.client.Minecraft) -> <init>
     21:21:com.mojang.blaze3d.platform.Window newWindow(com.mojang.blaze3d.platform.DisplayData,java.lang.String,java.lang.String) -> a
     26:27:void close() -> close
-net.minecraft.client.renderer.banner.package-info -> dri:
-net.minecraft.client.renderer.block.BlockModelShaper -> drj:
+net.minecraft.client.renderer.banner.package-info -> eco:
+net.minecraft.client.renderer.block.BlockModelShaper -> ecp:
     java.util.Map modelByStateCache -> a
     net.minecraft.client.resources.model.ModelManager modelManager -> b
     17:22:void <init>(net.minecraft.client.resources.model.ModelManager) -> <init>
@@ -14771,37 +15831,40 @@ net.minecraft.client.renderer.block.BlockModelShaper -> drj:
     60:72:java.lang.String statePropertiesToString(java.util.Map) -> a
     77:77:java.lang.String getValue(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
     46:46:void lambda$rebuildCache$0(net.minecraft.world.level.block.state.BlockState) -> d
-net.minecraft.client.renderer.block.BlockRenderDispatcher -> drk:
+net.minecraft.client.renderer.block.BlockRenderDispatcher -> ecq:
     net.minecraft.client.renderer.block.BlockModelShaper blockModelShaper -> a
     net.minecraft.client.renderer.block.ModelBlockRenderer modelRenderer -> b
     net.minecraft.client.renderer.block.LiquidBlockRenderer liquidBlockRenderer -> c
     java.util.Random random -> d
     net.minecraft.client.color.block.BlockColors blockColors -> e
-    30:38:void <init>(net.minecraft.client.renderer.block.BlockModelShaper,net.minecraft.client.color.block.BlockColors) -> <init>
-    41:41:net.minecraft.client.renderer.block.BlockModelShaper getBlockModelShaper() -> a
-    45:52:void renderBreakingTexture(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.BlockAndTintGetter,com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer) -> a
-    56:67:boolean renderBatched(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.BlockAndTintGetter,com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,boolean,java.util.Random) -> a
-    73:80:boolean renderLiquid(net.minecraft.core.BlockPos,net.minecraft.world.level.BlockAndTintGetter,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.level.material.FluidState) -> a
-    85:85:net.minecraft.client.renderer.block.ModelBlockRenderer getModelRenderer() -> b
-    89:89:net.minecraft.client.resources.model.BakedModel getBlockModel(net.minecraft.world.level.block.state.BlockState) -> a
-    94:114:void renderSingleBlock(net.minecraft.world.level.block.state.BlockState,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-    118:119:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
-net.minecraft.client.renderer.block.BlockRenderDispatcher$1 -> drk$1:
+    31:39:void <init>(net.minecraft.client.renderer.block.BlockModelShaper,net.minecraft.client.color.block.BlockColors) -> <init>
+    42:42:net.minecraft.client.renderer.block.BlockModelShaper getBlockModelShaper() -> a
+    46:53:void renderBreakingTexture(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.BlockAndTintGetter,com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer) -> a
+    57:68:boolean renderBatched(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.BlockAndTintGetter,com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,boolean,java.util.Random) -> a
+    74:81:boolean renderLiquid(net.minecraft.core.BlockPos,net.minecraft.world.level.BlockAndTintGetter,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.level.material.FluidState) -> a
+    86:86:net.minecraft.client.renderer.block.ModelBlockRenderer getModelRenderer() -> b
+    90:90:net.minecraft.client.resources.model.BakedModel getBlockModel(net.minecraft.world.level.block.state.BlockState) -> a
+    95:115:void renderSingleBlock(net.minecraft.world.level.block.state.BlockState,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
+    119:120:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
+net.minecraft.client.renderer.block.BlockRenderDispatcher$1 -> ecq$1:
     int[] $SwitchMap$net$minecraft$world$level$block$RenderShape -> a
-    99:99:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.LiquidBlockRenderer -> drl:
+    100:100:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.block.LiquidBlockRenderer -> ecr:
     net.minecraft.client.renderer.texture.TextureAtlasSprite[] lavaIcons -> a
     net.minecraft.client.renderer.texture.TextureAtlasSprite[] waterIcons -> b
     net.minecraft.client.renderer.texture.TextureAtlasSprite waterOverlay -> c
-    26:30:void <init>() -> <init>
-    34:39:void setupSprites() -> a
-    42:45:boolean isNeighborSameFluid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction,net.minecraft.world.level.material.FluidState) -> a
-    49:56:boolean isFaceOccluded(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction,float) -> a
-    60:285:boolean tesselate(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.level.material.FluidState) -> a
-    289:290:void vertex(com.mojang.blaze3d.vertex.VertexConsumer,double,double,double,float,float,float,float,float,int) -> a
-    293:301:int getLightColor(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos) -> a
-    305:326:float getWaterHeight(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.Fluid) -> a
-net.minecraft.client.renderer.block.ModelBlockRenderer -> drm:
+    27:31:void <init>() -> <init>
+    35:40:void setupSprites() -> a
+    43:46:boolean isNeighborSameFluid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction,net.minecraft.world.level.material.FluidState) -> a
+    50:55:boolean isFaceOccludedByState(net.minecraft.world.level.BlockGetter,net.minecraft.core.Direction,float,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    59:61:boolean isFaceOccludedByNeighbor(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction,float) -> a
+    67:67:boolean isFaceOccludedBySelf(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
+    71:71:boolean shouldRenderFace(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
+    75:302:boolean tesselate(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.level.material.FluidState) -> a
+    306:307:void vertex(com.mojang.blaze3d.vertex.VertexConsumer,double,double,double,float,float,float,float,float,int) -> a
+    310:318:int getLightColor(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos) -> a
+    322:343:float getWaterHeight(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.Fluid) -> a
+net.minecraft.client.renderer.block.ModelBlockRenderer -> ecs:
     net.minecraft.client.color.block.BlockColors blockColors -> a
     java.lang.ThreadLocal CACHE -> b
     37:39:void <init>(net.minecraft.client.color.block.BlockColors) -> <init>
@@ -14811,18 +15874,18 @@ net.minecraft.client.renderer.block.ModelBlockRenderer -> drm:
     123:133:void renderModelFaceAO(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,java.util.List,float[],java.util.BitSet,net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientOcclusionFace,int) -> a
     140:152:void putQuadData(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.blaze3d.vertex.PoseStack$Pose,net.minecraft.client.renderer.block.model.BakedQuad,float,float,float,float,int,int,int,int,int) -> a
     155:217:void calculateShape(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,int[],net.minecraft.core.Direction,float[],java.util.BitSet) -> a
-    220:234:void renderModelFaceFlat(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,int,int,boolean,com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,java.util.List,java.util.BitSet) -> a
-    237:245:void renderModel(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.level.block.state.BlockState,net.minecraft.client.resources.model.BakedModel,float,float,float,int,int) -> a
-    248:263:void renderQuadList(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,java.util.List,int,int) -> a
-    376:377:void enableCaching() -> a
-    380:381:void clearCache() -> b
-    373:373:net.minecraft.client.renderer.block.ModelBlockRenderer$Cache lambda$static$0() -> d
+    220:235:void renderModelFaceFlat(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,int,int,boolean,com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,java.util.List,java.util.BitSet) -> a
+    238:246:void renderModel(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.level.block.state.BlockState,net.minecraft.client.resources.model.BakedModel,float,float,float,int,int) -> a
+    249:264:void renderQuadList(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,java.util.List,int,int) -> a
+    377:378:void enableCaching() -> a
+    381:382:void clearCache() -> b
+    374:374:net.minecraft.client.renderer.block.ModelBlockRenderer$Cache lambda$static$0() -> d
     31:31:java.lang.ThreadLocal access$200() -> c
-    373:373:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.ModelBlockRenderer$1 -> drm$1:
+    374:374:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.block.ModelBlockRenderer$1 -> ecs$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     191:191:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo -> drm$a:
+net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo -> ecs$a:
     net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo DOWN -> a
     net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo UP -> b
     net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo NORTH -> c
@@ -14837,29 +15900,29 @@ net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo -> drm$a:
     net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] vert3Weights -> l
     net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo[] BY_FACING -> m
     net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo[] $VALUES -> n
-    585:585:net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo[] values() -> values
-    585:585:net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo valueOf(java.lang.String) -> valueOf
-    639:646:void <init>(java.lang.String,int,net.minecraft.core.Direction[],float,boolean,net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[],net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[],net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[],net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[]) -> <init>
-    649:649:net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo fromFacing(net.minecraft.core.Direction) -> a
-    631:637:void lambda$static$0(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo[]) -> a
-    585:585:net.minecraft.core.Direction[] access$300(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> a
-    585:585:boolean access$400(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> b
-    585:585:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] access$900(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> c
-    585:585:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] access$1100(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> d
-    585:585:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] access$1200(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> e
-    585:585:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] access$1300(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> f
-    585:630:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientOcclusionFace -> drm$b:
+    591:591:net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo[] values() -> values
+    591:591:net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo valueOf(java.lang.String) -> valueOf
+    645:652:void <init>(java.lang.String,int,net.minecraft.core.Direction[],float,boolean,net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[],net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[],net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[],net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[]) -> <init>
+    655:655:net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo fromFacing(net.minecraft.core.Direction) -> a
+    637:643:void lambda$static$0(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo[]) -> a
+    591:591:net.minecraft.core.Direction[] access$300(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> a
+    591:591:boolean access$400(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> b
+    591:591:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] access$900(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> c
+    591:591:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] access$1100(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> d
+    591:591:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] access$1200(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> e
+    591:591:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] access$1300(net.minecraft.client.renderer.block.ModelBlockRenderer$AdjacencyInfo) -> f
+    591:636:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientOcclusionFace -> ecs$b:
     float[] brightness -> b
     int[] lightmap -> c
     net.minecraft.client.renderer.block.ModelBlockRenderer this$0 -> a
-    384:388:void <init>(net.minecraft.client.renderer.block.ModelBlockRenderer) -> <init>
-    391:542:void calculate(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.core.Direction,float[],java.util.BitSet) -> a
-    545:554:int blend(int,int,int,int) -> a
-    558:560:int blend(int,int,int,int,float,float,float,float) -> a
-    383:383:float[] access$000(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientOcclusionFace) -> a
-    383:383:int[] access$100(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientOcclusionFace) -> b
-net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap -> drm$c:
+    385:389:void <init>(net.minecraft.client.renderer.block.ModelBlockRenderer) -> <init>
+    392:548:void calculate(net.minecraft.world.level.BlockAndTintGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.core.Direction,float[],java.util.BitSet,boolean) -> a
+    551:560:int blend(int,int,int,int) -> a
+    564:566:int blend(int,int,int,int,float,float,float,float) -> a
+    384:384:float[] access$000(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientOcclusionFace) -> a
+    384:384:int[] access$100(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientOcclusionFace) -> b
+net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap -> ecs$c:
     net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap DOWN -> a
     net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap UP -> b
     net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap NORTH -> c
@@ -14872,37 +15935,37 @@ net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap -> drm
     int vert3 -> j
     net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap[] BY_FACING -> k
     net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap[] $VALUES -> l
-    265:265:net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap[] values() -> values
-    265:265:net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap valueOf(java.lang.String) -> valueOf
-    287:292:void <init>(java.lang.String,int,int,int,int,int) -> <init>
-    295:295:net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap fromFacing(net.minecraft.core.Direction) -> a
-    279:285:void lambda$static$0(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap[]) -> a
-    265:265:int access$500(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap) -> a
-    265:265:int access$600(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap) -> b
-    265:265:int access$700(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap) -> c
-    265:265:int access$800(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap) -> d
-    265:278:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.ModelBlockRenderer$Cache -> drm$d:
+    266:266:net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap[] values() -> values
+    266:266:net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap valueOf(java.lang.String) -> valueOf
+    288:293:void <init>(java.lang.String,int,int,int,int,int) -> <init>
+    296:296:net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap fromFacing(net.minecraft.core.Direction) -> a
+    280:286:void lambda$static$0(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap[]) -> a
+    266:266:int access$500(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap) -> a
+    266:266:int access$600(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap) -> b
+    266:266:int access$700(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap) -> c
+    266:266:int access$800(net.minecraft.client.renderer.block.ModelBlockRenderer$AmbientVertexRemap) -> d
+    266:279:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.block.ModelBlockRenderer$Cache -> ecs$d:
     boolean enabled -> a
     it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap colorCache -> b
     it.unimi.dsi.fastutil.longs.Long2FloatLinkedOpenHashMap brightnessCache -> c
-    301:314:void <init>() -> <init>
-    325:326:void enable() -> a
-    329:332:void disable() -> b
-    335:350:int getLightColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos) -> a
-    354:369:float getShadeBrightness(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos) -> b
-    315:321:it.unimi.dsi.fastutil.longs.Long2FloatLinkedOpenHashMap lambda$new$1() -> c
-    305:311:it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap lambda$new$0() -> d
-    301:301:void <init>(net.minecraft.client.renderer.block.ModelBlockRenderer$1) -> <init>
-net.minecraft.client.renderer.block.ModelBlockRenderer$Cache$1 -> drm$d$1:
+    302:315:void <init>() -> <init>
+    326:327:void enable() -> a
+    330:333:void disable() -> b
+    336:351:int getLightColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos) -> a
+    355:370:float getShadeBrightness(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockAndTintGetter,net.minecraft.core.BlockPos) -> b
+    316:322:it.unimi.dsi.fastutil.longs.Long2FloatLinkedOpenHashMap lambda$new$1() -> c
+    306:312:it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap lambda$new$0() -> d
+    302:302:void <init>(net.minecraft.client.renderer.block.ModelBlockRenderer$1) -> <init>
+net.minecraft.client.renderer.block.ModelBlockRenderer$Cache$1 -> ecs$d$1:
     net.minecraft.client.renderer.block.ModelBlockRenderer$Cache this$0 -> a
-    305:305:void <init>(net.minecraft.client.renderer.block.ModelBlockRenderer$Cache,int,float) -> <init>
-    308:308:void rehash(int) -> rehash
-net.minecraft.client.renderer.block.ModelBlockRenderer$Cache$2 -> drm$d$2:
+    306:306:void <init>(net.minecraft.client.renderer.block.ModelBlockRenderer$Cache,int,float) -> <init>
+    309:309:void rehash(int) -> rehash
+net.minecraft.client.renderer.block.ModelBlockRenderer$Cache$2 -> ecs$d$2:
     net.minecraft.client.renderer.block.ModelBlockRenderer$Cache this$0 -> a
-    315:315:void <init>(net.minecraft.client.renderer.block.ModelBlockRenderer$Cache,int,float) -> <init>
-    318:318:void rehash(int) -> rehash
-net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo -> drm$e:
+    316:316:void <init>(net.minecraft.client.renderer.block.ModelBlockRenderer$Cache,int,float) -> <init>
+    319:319:void rehash(int) -> rehash
+net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo -> ecs$e:
     net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo DOWN -> a
     net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo UP -> b
     net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo NORTH -> c
@@ -14917,23 +15980,25 @@ net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo -> drm$e:
     net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo FLIP_EAST -> l
     int shape -> m
     net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] $VALUES -> n
-    564:564:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] values() -> values
-    564:564:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo valueOf(java.lang.String) -> valueOf
-    580:582:void <init>(java.lang.String,int,net.minecraft.core.Direction,boolean) -> <init>
-    564:564:int access$1000(net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo) -> a
-    564:576:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.BakedQuad -> drn:
+    570:570:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo[] values() -> values
+    570:570:net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo valueOf(java.lang.String) -> valueOf
+    586:588:void <init>(java.lang.String,int,net.minecraft.core.Direction,boolean) -> <init>
+    570:570:int access$1000(net.minecraft.client.renderer.block.ModelBlockRenderer$SizeInfo) -> a
+    570:582:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.block.model.BakedQuad -> ect:
     int[] vertices -> a
     int tintIndex -> b
     net.minecraft.core.Direction direction -> c
     net.minecraft.client.renderer.texture.TextureAtlasSprite sprite -> d
-    12:17:void <init>(int[],int,net.minecraft.core.Direction,net.minecraft.client.renderer.texture.TextureAtlasSprite) -> <init>
-    20:20:net.minecraft.client.renderer.texture.TextureAtlasSprite getSprite() -> a
-    24:24:int[] getVertices() -> b
-    28:28:boolean isTinted() -> c
-    32:32:int getTintIndex() -> d
-    36:36:net.minecraft.core.Direction getDirection() -> e
-net.minecraft.client.renderer.block.model.BlockElement -> dro:
+    boolean shade -> e
+    13:19:void <init>(int[],int,net.minecraft.core.Direction,net.minecraft.client.renderer.texture.TextureAtlasSprite,boolean) -> <init>
+    22:22:net.minecraft.client.renderer.texture.TextureAtlasSprite getSprite() -> a
+    26:26:int[] getVertices() -> b
+    30:30:boolean isTinted() -> c
+    34:34:int getTintIndex() -> d
+    38:38:net.minecraft.core.Direction getDirection() -> e
+    42:42:boolean isShade() -> f
+net.minecraft.client.renderer.block.model.BlockElement -> ecu:
     com.mojang.math.Vector3f from -> a
     com.mojang.math.Vector3f to -> b
     java.util.Map faces -> c
@@ -14942,10 +16007,10 @@ net.minecraft.client.renderer.block.model.BlockElement -> dro:
     32:40:void <init>(com.mojang.math.Vector3f,com.mojang.math.Vector3f,java.util.Map,net.minecraft.client.renderer.block.model.BlockElementRotation,boolean) -> <init>
     43:47:void fillUvs() -> a
     50:63:float[] uvsByFace(net.minecraft.core.Direction) -> a
-net.minecraft.client.renderer.block.model.BlockElement$1 -> dro$1:
+net.minecraft.client.renderer.block.model.BlockElement$1 -> ecu$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     50:50:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.BlockElement$Deserializer -> dro$a:
+net.minecraft.client.renderer.block.model.BlockElement$Deserializer -> ecu$a:
     67:67:void <init>() -> <init>
     72:82:net.minecraft.client.renderer.block.model.BlockElement deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     87:98:net.minecraft.client.renderer.block.model.BlockElementRotation getRotation(com.google.gson.JsonObject) -> a
@@ -14958,26 +16023,26 @@ net.minecraft.client.renderer.block.model.BlockElement$Deserializer -> dro$a:
     157:163:com.mojang.math.Vector3f getFrom(com.google.gson.JsonObject) -> e
     167:176:com.mojang.math.Vector3f getVector3f(com.google.gson.JsonObject,java.lang.String) -> a
     67:67:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.renderer.block.model.BlockElementFace -> drp:
+net.minecraft.client.renderer.block.model.BlockElementFace -> ecv:
     net.minecraft.core.Direction cullForDirection -> a
     int tintIndex -> b
     java.lang.String texture -> c
     net.minecraft.client.renderer.block.model.BlockFaceUV uv -> d
     22:27:void <init>(net.minecraft.core.Direction,int,java.lang.String,net.minecraft.client.renderer.block.model.BlockFaceUV) -> <init>
-net.minecraft.client.renderer.block.model.BlockElementFace$Deserializer -> drp$a:
+net.minecraft.client.renderer.block.model.BlockElementFace$Deserializer -> ecv$a:
     29:29:void <init>() -> <init>
     34:41:net.minecraft.client.renderer.block.model.BlockElementFace deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     45:45:int getTintIndex(com.google.gson.JsonObject) -> a
     49:49:java.lang.String getTexture(com.google.gson.JsonObject) -> b
     54:55:net.minecraft.core.Direction getCullFacing(com.google.gson.JsonObject) -> c
     29:29:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.renderer.block.model.BlockElementRotation -> drq:
+net.minecraft.client.renderer.block.model.BlockElementRotation -> ecw:
     com.mojang.math.Vector3f origin -> a
     net.minecraft.core.Direction$Axis axis -> b
     float angle -> c
     boolean rescale -> d
     12:17:void <init>(com.mojang.math.Vector3f,net.minecraft.core.Direction$Axis,float,boolean) -> <init>
-net.minecraft.client.renderer.block.model.BlockFaceUV -> drr:
+net.minecraft.client.renderer.block.model.BlockFaceUV -> ecx:
     float[] uvs -> a
     int rotation -> b
     18:21:void <init>(float[],int) -> <init>
@@ -14986,13 +16051,13 @@ net.minecraft.client.renderer.block.model.BlockFaceUV -> drr:
     42:42:int getShiftedIndex(int) -> d
     46:46:int getReverseIndex(int) -> c
     50:53:void setMissingUv(float[]) -> a
-net.minecraft.client.renderer.block.model.BlockFaceUV$Deserializer -> drr$a:
+net.minecraft.client.renderer.block.model.BlockFaceUV$Deserializer -> ecx$a:
     55:55:void <init>() -> <init>
     60:65:net.minecraft.client.renderer.block.model.BlockFaceUV deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     69:75:int getRotation(com.google.gson.JsonObject) -> a
     80:94:float[] getUVs(com.google.gson.JsonObject) -> b
     55:55:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.renderer.block.model.BlockModel -> drs:
+net.minecraft.client.renderer.block.model.BlockModel -> ecy:
     org.apache.logging.log4j.Logger LOGGER -> f
     net.minecraft.client.renderer.block.model.FaceBakery FACE_BAKERY -> g
     com.google.gson.Gson GSON -> a
@@ -15031,7 +16096,7 @@ net.minecraft.client.renderer.block.model.BlockModel -> drs:
     199:204:void lambda$getMaterials$0(java.util.function.Function,java.util.Set,java.util.Set,net.minecraft.client.renderer.block.model.ItemOverride) -> a
     47:47:boolean access$000(java.lang.String) -> d
     48:61:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.BlockModel$Deserializer -> drs$a:
+net.minecraft.client.renderer.block.model.BlockModel$Deserializer -> ecy$a:
     312:312:void <init>() -> <init>
     318:340:net.minecraft.client.renderer.block.model.BlockModel deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     344:351:java.util.List getOverrides(com.google.gson.JsonDeserializationContext,com.google.gson.JsonObject) -> a
@@ -15041,7 +16106,7 @@ net.minecraft.client.renderer.block.model.BlockModel$Deserializer -> drs$a:
     386:386:boolean getAmbientOcclusion(com.google.gson.JsonObject) -> a
     390:397:java.util.List getElements(com.google.gson.JsonDeserializationContext,com.google.gson.JsonObject) -> b
     312:312:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.renderer.block.model.BlockModel$GuiLight -> drs$b:
+net.minecraft.client.renderer.block.model.BlockModel$GuiLight -> ecy$b:
     net.minecraft.client.renderer.block.model.BlockModel$GuiLight FRONT -> a
     net.minecraft.client.renderer.block.model.BlockModel$GuiLight SIDE -> b
     java.lang.String name -> c
@@ -15052,9 +16117,9 @@ net.minecraft.client.renderer.block.model.BlockModel$GuiLight -> drs$b:
     423:428:net.minecraft.client.renderer.block.model.BlockModel$GuiLight getByName(java.lang.String) -> a
     432:432:boolean lightLikeBlock() -> a
     412:414:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.BlockModel$LoopException -> drs$c:
+net.minecraft.client.renderer.block.model.BlockModel$LoopException -> ecy$c:
     403:404:void <init>(java.lang.String) -> <init>
-net.minecraft.client.renderer.block.model.BlockModelDefinition -> drt:
+net.minecraft.client.renderer.block.model.BlockModelDefinition -> ecz:
     java.util.Map variants -> a
     net.minecraft.client.renderer.block.model.multipart.MultiPart multiPart -> b
     55:55:net.minecraft.client.renderer.block.model.BlockModelDefinition fromStream(net.minecraft.client.renderer.block.model.BlockModelDefinition$Context,java.io.Reader) -> a
@@ -15068,45 +16133,42 @@ net.minecraft.client.renderer.block.model.BlockModelDefinition -> drt:
     116:122:java.util.Set getMultiVariants() -> b
     126:126:boolean isMultiPart() -> c
     130:130:net.minecraft.client.renderer.block.model.multipart.MultiPart getMultiPart() -> d
-net.minecraft.client.renderer.block.model.BlockModelDefinition$Context -> drt$a:
+net.minecraft.client.renderer.block.model.BlockModelDefinition$Context -> ecz$a:
     com.google.gson.Gson gson -> a
     net.minecraft.world.level.block.state.StateDefinition definition -> b
     32:40:void <init>() -> <init>
     43:43:net.minecraft.world.level.block.state.StateDefinition getDefinition() -> a
     47:48:void setDefinition(net.minecraft.world.level.block.state.StateDefinition) -> a
-net.minecraft.client.renderer.block.model.BlockModelDefinition$Deserializer -> drt$b:
+net.minecraft.client.renderer.block.model.BlockModelDefinition$Deserializer -> ecz$b:
     133:133:void <init>() -> <init>
     136:145:net.minecraft.client.renderer.block.model.BlockModelDefinition deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     149:158:java.util.Map getVariants(com.google.gson.JsonDeserializationContext,com.google.gson.JsonObject) -> a
     163:168:net.minecraft.client.renderer.block.model.multipart.MultiPart getMultiPart(com.google.gson.JsonDeserializationContext,com.google.gson.JsonObject) -> b
     133:133:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.renderer.block.model.BlockModelDefinition$MissingVariantException -> drt$c:
+net.minecraft.client.renderer.block.model.BlockModelDefinition$MissingVariantException -> ecz$c:
     net.minecraft.client.renderer.block.model.BlockModelDefinition this$0 -> a
     172:172:void <init>(net.minecraft.client.renderer.block.model.BlockModelDefinition) -> <init>
-net.minecraft.client.renderer.block.model.FaceBakery -> dru:
+net.minecraft.client.renderer.block.model.FaceBakery -> eda:
     float RESCALE_22_5 -> a
     float RESCALE_45 -> b
     21:21:void <init>() -> <init>
     31:58:net.minecraft.client.renderer.block.model.BakedQuad bakeQuad(com.mojang.math.Vector3f,com.mojang.math.Vector3f,net.minecraft.client.renderer.block.model.BlockElementFace,net.minecraft.client.renderer.texture.TextureAtlasSprite,net.minecraft.core.Direction,net.minecraft.client.resources.model.ModelState,net.minecraft.client.renderer.block.model.BlockElementRotation,boolean,net.minecraft.resources.ResourceLocation) -> a
     62:106:net.minecraft.client.renderer.block.model.BlockFaceUV recomputeUVs(net.minecraft.client.renderer.block.model.BlockFaceUV,net.minecraft.core.Direction,com.mojang.math.Transformation,net.minecraft.resources.ResourceLocation) -> a
     110:114:int[] makeVertices(net.minecraft.client.renderer.block.model.BlockFaceUV,net.minecraft.client.renderer.texture.TextureAtlasSprite,net.minecraft.core.Direction,float[],com.mojang.math.Transformation,net.minecraft.client.renderer.block.model.BlockElementRotation,boolean) -> a
-    118:121:int getShadeValue(net.minecraft.core.Direction) -> a
-    125:137:float getShade(net.minecraft.core.Direction) -> b
-    141:148:float[] setupShape(com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> a
-    152:161:void bakeVertex(int[],int,net.minecraft.core.Direction,net.minecraft.client.renderer.block.model.BlockFaceUV,float[],net.minecraft.client.renderer.texture.TextureAtlasSprite,com.mojang.math.Transformation,net.minecraft.client.renderer.block.model.BlockElementRotation,boolean) -> a
-    164:171:void fillVertex(int[],int,com.mojang.math.Vector3f,int,net.minecraft.client.renderer.texture.TextureAtlasSprite,net.minecraft.client.renderer.block.model.BlockFaceUV) -> a
-    174:212:void applyElementRotation(com.mojang.math.Vector3f,net.minecraft.client.renderer.block.model.BlockElementRotation) -> a
-    215:220:void applyModelRotation(com.mojang.math.Vector3f,com.mojang.math.Transformation) -> a
-    223:227:void rotateVertexBy(com.mojang.math.Vector3f,com.mojang.math.Vector3f,com.mojang.math.Matrix4f,com.mojang.math.Vector3f) -> a
-    230:257:net.minecraft.core.Direction calculateFacing(int[]) -> a
-    261:320:void recalculateWinding(int[],net.minecraft.core.Direction) -> a
+    118:125:float[] setupShape(com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> a
+    129:136:void bakeVertex(int[],int,net.minecraft.core.Direction,net.minecraft.client.renderer.block.model.BlockFaceUV,float[],net.minecraft.client.renderer.texture.TextureAtlasSprite,com.mojang.math.Transformation,net.minecraft.client.renderer.block.model.BlockElementRotation,boolean) -> a
+    139:146:void fillVertex(int[],int,com.mojang.math.Vector3f,net.minecraft.client.renderer.texture.TextureAtlasSprite,net.minecraft.client.renderer.block.model.BlockFaceUV) -> a
+    149:187:void applyElementRotation(com.mojang.math.Vector3f,net.minecraft.client.renderer.block.model.BlockElementRotation) -> a
+    190:195:void applyModelRotation(com.mojang.math.Vector3f,com.mojang.math.Transformation) -> a
+    198:202:void rotateVertexBy(com.mojang.math.Vector3f,com.mojang.math.Vector3f,com.mojang.math.Matrix4f,com.mojang.math.Vector3f) -> a
+    205:232:net.minecraft.core.Direction calculateFacing(int[]) -> a
+    236:295:void recalculateWinding(int[],net.minecraft.core.Direction) -> a
     62:62:java.lang.String lambda$recomputeUVs$0(net.minecraft.resources.ResourceLocation) -> a
     24:25:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.FaceBakery$1 -> dru$1:
-    int[] $SwitchMap$net$minecraft$core$Direction -> a
-    int[] $SwitchMap$net$minecraft$core$Direction$Axis -> b
-    125:181:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.ItemModelGenerator -> drv:
+net.minecraft.client.renderer.block.model.FaceBakery$1 -> eda$1:
+    int[] $SwitchMap$net$minecraft$core$Direction$Axis -> a
+    156:156:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.block.model.ItemModelGenerator -> edb:
     java.util.List LAYERS -> a
     16:16:void <init>() -> <init>
     23:43:net.minecraft.client.renderer.block.model.BlockModel generateBlockModel(java.util.function.Function,net.minecraft.client.renderer.block.model.BlockModel) -> a
@@ -15117,10 +16179,10 @@ net.minecraft.client.renderer.block.model.ItemModelGenerator -> drv:
     177:198:void createOrExpandSpan(java.util.List,net.minecraft.client.renderer.block.model.ItemModelGenerator$SpanFacing,int,int) -> a
     201:204:boolean isTransparent(net.minecraft.client.renderer.texture.TextureAtlasSprite,int,int,int,int,int) -> a
     17:17:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.ItemModelGenerator$1 -> drv$1:
+net.minecraft.client.renderer.block.model.ItemModelGenerator$1 -> edb$1:
     int[] $SwitchMap$net$minecraft$client$renderer$block$model$ItemModelGenerator$SpanFacing -> a
     81:81:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.ItemModelGenerator$Span -> drv$a:
+net.minecraft.client.renderer.block.model.ItemModelGenerator$Span -> edb$a:
     net.minecraft.client.renderer.block.model.ItemModelGenerator$SpanFacing facing -> a
     int min -> b
     int max -> c
@@ -15131,7 +16193,7 @@ net.minecraft.client.renderer.block.model.ItemModelGenerator$Span -> drv$a:
     268:268:int getMin() -> b
     272:272:int getMax() -> c
     276:276:int getAnchor() -> d
-net.minecraft.client.renderer.block.model.ItemModelGenerator$SpanFacing -> drv$b:
+net.minecraft.client.renderer.block.model.ItemModelGenerator$SpanFacing -> edb$b:
     net.minecraft.client.renderer.block.model.ItemModelGenerator$SpanFacing UP -> a
     net.minecraft.client.renderer.block.model.ItemModelGenerator$SpanFacing DOWN -> b
     net.minecraft.client.renderer.block.model.ItemModelGenerator$SpanFacing LEFT -> c
@@ -15149,27 +16211,27 @@ net.minecraft.client.renderer.block.model.ItemModelGenerator$SpanFacing -> drv$b
     237:237:boolean isHorizontal() -> d
     207:207:boolean access$000(net.minecraft.client.renderer.block.model.ItemModelGenerator$SpanFacing) -> a
     207:212:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.ItemOverride -> drw:
+net.minecraft.client.renderer.block.model.ItemOverride -> edc:
     net.minecraft.resources.ResourceLocation model -> a
     java.util.Map predicates -> b
-    25:28:void <init>(net.minecraft.resources.ResourceLocation,java.util.Map) -> <init>
-    31:31:net.minecraft.resources.ResourceLocation getModel() -> a
-    35:43:boolean test(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.client.renderer.block.model.ItemOverride$Deserializer -> drw$a:
-    46:46:void <init>() -> <init>
-    49:54:net.minecraft.client.renderer.block.model.ItemOverride deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    58:68:java.util.Map getPredicates(com.google.gson.JsonObject) -> a
-    46:46:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.renderer.block.model.ItemOverrides -> drx:
+    26:29:void <init>(net.minecraft.resources.ResourceLocation,java.util.Map) -> <init>
+    32:32:net.minecraft.resources.ResourceLocation getModel() -> a
+    36:44:boolean test(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.client.renderer.block.model.ItemOverride$Deserializer -> edc$a:
+    47:47:void <init>() -> <init>
+    50:55:net.minecraft.client.renderer.block.model.ItemOverride deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
+    59:69:java.util.Map getPredicates(com.google.gson.JsonObject) -> a
+    47:47:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
+net.minecraft.client.renderer.block.model.ItemOverrides -> edd:
     net.minecraft.client.renderer.block.model.ItemOverrides EMPTY -> a
     java.util.List overrides -> b
     java.util.List overrideModels -> c
     23:28:void <init>() -> <init>
     23:43:void <init>(net.minecraft.client.resources.model.ModelBakery,net.minecraft.client.renderer.block.model.BlockModel,java.util.function.Function,java.util.List) -> <init>
-    47:60:net.minecraft.client.resources.model.BakedModel resolve(net.minecraft.client.resources.model.BakedModel,net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
+    47:60:net.minecraft.client.resources.model.BakedModel resolve(net.minecraft.client.resources.model.BakedModel,net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> a
     32:36:net.minecraft.client.resources.model.BakedModel lambda$new$0(java.util.function.Function,net.minecraft.client.renderer.block.model.BlockModel,net.minecraft.client.resources.model.ModelBakery,net.minecraft.client.renderer.block.model.ItemOverride) -> a
     21:21:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.ItemTransform -> dry:
+net.minecraft.client.renderer.block.model.ItemTransform -> ede:
     net.minecraft.client.renderer.block.model.ItemTransform NO_TRANSFORM -> a
     com.mojang.math.Vector3f rotation -> b
     com.mojang.math.Vector3f translation -> c
@@ -15179,7 +16241,7 @@ net.minecraft.client.renderer.block.model.ItemTransform -> dry:
     51:61:boolean equals(java.lang.Object) -> equals
     66:69:int hashCode() -> hashCode
     18:18:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.ItemTransform$Deserializer -> dry$a:
+net.minecraft.client.renderer.block.model.ItemTransform$Deserializer -> ede$a:
     com.mojang.math.Vector3f DEFAULT_ROTATION -> a
     com.mojang.math.Vector3f DEFAULT_TRANSLATION -> b
     com.mojang.math.Vector3f DEFAULT_SCALE -> c
@@ -15188,7 +16250,7 @@ net.minecraft.client.renderer.block.model.ItemTransform$Deserializer -> dry$a:
     96:108:com.mojang.math.Vector3f getVector3f(com.google.gson.JsonObject,java.lang.String,com.mojang.math.Vector3f) -> a
     72:72:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
     73:75:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.ItemTransforms -> drz:
+net.minecraft.client.renderer.block.model.ItemTransforms -> edf:
     net.minecraft.client.renderer.block.model.ItemTransforms NO_TRANSFORMS -> a
     net.minecraft.client.renderer.block.model.ItemTransform thirdPersonLeftHand -> b
     net.minecraft.client.renderer.block.model.ItemTransform thirdPersonRightHand -> c
@@ -15204,15 +16266,15 @@ net.minecraft.client.renderer.block.model.ItemTransforms -> drz:
     50:68:net.minecraft.client.renderer.block.model.ItemTransform getTransform(net.minecraft.client.renderer.block.model.ItemTransforms$TransformType) -> a
     73:73:boolean hasTransform(net.minecraft.client.renderer.block.model.ItemTransforms$TransformType) -> b
     12:12:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.ItemTransforms$1 -> drz$1:
+net.minecraft.client.renderer.block.model.ItemTransforms$1 -> edf$1:
     int[] $SwitchMap$net$minecraft$client$renderer$block$model$ItemTransforms$TransformType -> a
     50:50:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.ItemTransforms$Deserializer -> drz$a:
-    88:88:void <init>() -> <init>
-    91:108:net.minecraft.client.renderer.block.model.ItemTransforms deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    112:115:net.minecraft.client.renderer.block.model.ItemTransform getTransform(com.google.gson.JsonDeserializationContext,com.google.gson.JsonObject,java.lang.String) -> a
-    88:88:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.renderer.block.model.ItemTransforms$TransformType -> drz$b:
+net.minecraft.client.renderer.block.model.ItemTransforms$Deserializer -> edf$a:
+    93:93:void <init>() -> <init>
+    96:113:net.minecraft.client.renderer.block.model.ItemTransforms deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
+    117:120:net.minecraft.client.renderer.block.model.ItemTransform getTransform(com.google.gson.JsonDeserializationContext,com.google.gson.JsonObject,java.lang.String) -> a
+    93:93:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
+net.minecraft.client.renderer.block.model.ItemTransforms$TransformType -> edf$b:
     net.minecraft.client.renderer.block.model.ItemTransforms$TransformType NONE -> a
     net.minecraft.client.renderer.block.model.ItemTransforms$TransformType THIRD_PERSON_LEFT_HAND -> b
     net.minecraft.client.renderer.block.model.ItemTransforms$TransformType THIRD_PERSON_RIGHT_HAND -> c
@@ -15226,8 +16288,9 @@ net.minecraft.client.renderer.block.model.ItemTransforms$TransformType -> drz$b:
     76:76:net.minecraft.client.renderer.block.model.ItemTransforms$TransformType[] values() -> values
     76:76:net.minecraft.client.renderer.block.model.ItemTransforms$TransformType valueOf(java.lang.String) -> valueOf
     76:76:void <init>(java.lang.String,int) -> <init>
+    89:89:boolean firstPerson() -> a
     76:85:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.MultiVariant -> dsa:
+net.minecraft.client.renderer.block.model.MultiVariant -> edg:
     java.util.List variants -> a
     30:32:void <init>(java.util.List) -> <init>
     35:35:java.util.List getVariants() -> a
@@ -15237,11 +16300,11 @@ net.minecraft.client.renderer.block.model.MultiVariant -> dsa:
     65:65:java.util.Collection getMaterials(java.util.function.Function,java.util.Set) -> a
     71:82:net.minecraft.client.resources.model.BakedModel bake(net.minecraft.client.resources.model.ModelBakery,java.util.function.Function,net.minecraft.client.resources.model.ModelState,net.minecraft.resources.ResourceLocation) -> a
     65:65:java.util.stream.Stream lambda$getMaterials$0(java.util.function.Function,java.util.Set,net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.client.renderer.block.model.MultiVariant$Deserializer -> dsa$a:
+net.minecraft.client.renderer.block.model.MultiVariant$Deserializer -> edg$a:
     85:85:void <init>() -> <init>
     88:101:net.minecraft.client.renderer.block.model.MultiVariant deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     85:85:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.renderer.block.model.Variant -> dsb:
+net.minecraft.client.renderer.block.model.Variant -> edh:
     net.minecraft.resources.ResourceLocation modelLocation -> a
     com.mojang.math.Transformation rotation -> b
     boolean uvLock -> c
@@ -15254,7 +16317,7 @@ net.minecraft.client.renderer.block.model.Variant -> dsb:
     51:51:java.lang.String toString() -> toString
     61:68:boolean equals(java.lang.Object) -> equals
     73:77:int hashCode() -> hashCode
-net.minecraft.client.renderer.block.model.Variant$Deserializer -> dsb$a:
+net.minecraft.client.renderer.block.model.Variant$Deserializer -> edh$a:
     80:80:void <init>() -> <init>
     92:99:net.minecraft.client.renderer.block.model.Variant deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     103:103:boolean getUvLock(com.google.gson.JsonObject) -> d
@@ -15262,14 +16325,14 @@ net.minecraft.client.renderer.block.model.Variant$Deserializer -> dsb$a:
     118:118:net.minecraft.resources.ResourceLocation getModel(com.google.gson.JsonObject) -> b
     122:127:int getWeight(com.google.gson.JsonObject) -> c
     80:80:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.renderer.block.model.multipart.AndCondition -> dsc:
+net.minecraft.client.renderer.block.model.multipart.AndCondition -> edi:
     java.lang.Iterable conditions -> c
     17:19:void <init>(java.lang.Iterable) -> <init>
     23:25:java.util.function.Predicate getPredicate(net.minecraft.world.level.block.state.StateDefinition) -> getPredicate
     25:25:boolean lambda$getPredicate$2(java.util.List,net.minecraft.world.level.block.state.BlockState) -> a
     25:25:boolean lambda$null$1(net.minecraft.world.level.block.state.BlockState,java.util.function.Predicate) -> a
     23:23:java.util.function.Predicate lambda$getPredicate$0(net.minecraft.world.level.block.state.StateDefinition,net.minecraft.client.renderer.block.model.multipart.Condition) -> a
-net.minecraft.client.renderer.block.model.multipart.Condition -> dsd:
+net.minecraft.client.renderer.block.model.multipart.Condition -> edj:
     net.minecraft.client.renderer.block.model.multipart.Condition TRUE -> a
     net.minecraft.client.renderer.block.model.multipart.Condition FALSE -> b
     java.util.function.Predicate getPredicate(net.minecraft.world.level.block.state.StateDefinition) -> getPredicate
@@ -15278,7 +16341,7 @@ net.minecraft.client.renderer.block.model.multipart.Condition -> dsd:
     11:11:java.util.function.Predicate lambda$static$1(net.minecraft.world.level.block.state.StateDefinition) -> b
     11:11:boolean lambda$null$0(net.minecraft.world.level.block.state.BlockState) -> b
     11:12:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.multipart.KeyValueCondition -> dse:
+net.minecraft.client.renderer.block.model.multipart.KeyValueCondition -> edk:
     com.google.common.base.Splitter PIPE_SPLITTER -> c
     java.lang.String key -> d
     java.lang.String value -> e
@@ -15291,7 +16354,7 @@ net.minecraft.client.renderer.block.model.multipart.KeyValueCondition -> dse:
     49:49:boolean lambda$null$1(net.minecraft.world.level.block.state.BlockState,java.util.function.Predicate) -> a
     48:48:java.util.function.Predicate lambda$getPredicate$0(net.minecraft.world.level.block.state.StateDefinition,net.minecraft.world.level.block.state.properties.Property,java.lang.String) -> b
     16:16:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.block.model.multipart.MultiPart -> dsf:
+net.minecraft.client.renderer.block.model.multipart.MultiPart -> edl:
     net.minecraft.world.level.block.state.StateDefinition definition -> a
     java.util.List selectors -> b
     38:41:void <init>(net.minecraft.world.level.block.state.StateDefinition,java.util.List) -> <init>
@@ -15304,20 +16367,20 @@ net.minecraft.client.renderer.block.model.multipart.MultiPart -> dsf:
     87:96:net.minecraft.client.resources.model.BakedModel bake(net.minecraft.client.resources.model.ModelBakery,java.util.function.Function,net.minecraft.client.resources.model.ModelState,net.minecraft.resources.ResourceLocation) -> a
     81:81:java.util.stream.Stream lambda$getMaterials$1(java.util.function.Function,java.util.Set,net.minecraft.client.renderer.block.model.multipart.Selector) -> a
     76:76:java.util.stream.Stream lambda$getDependencies$0(net.minecraft.client.renderer.block.model.multipart.Selector) -> a
-net.minecraft.client.renderer.block.model.multipart.MultiPart$Deserializer -> dsf$a:
+net.minecraft.client.renderer.block.model.multipart.MultiPart$Deserializer -> edl$a:
     net.minecraft.client.renderer.block.model.BlockModelDefinition$Context context -> a
     102:104:void <init>(net.minecraft.client.renderer.block.model.BlockModelDefinition$Context) -> <init>
     108:108:net.minecraft.client.renderer.block.model.multipart.MultiPart deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     112:118:java.util.List getSelectors(com.google.gson.JsonDeserializationContext,com.google.gson.JsonArray) -> a
     99:99:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.renderer.block.model.multipart.OrCondition -> dsg:
+net.minecraft.client.renderer.block.model.multipart.OrCondition -> edm:
     java.lang.Iterable conditions -> c
     17:19:void <init>(java.lang.Iterable) -> <init>
     23:25:java.util.function.Predicate getPredicate(net.minecraft.world.level.block.state.StateDefinition) -> getPredicate
     25:25:boolean lambda$getPredicate$2(java.util.List,net.minecraft.world.level.block.state.BlockState) -> a
     25:25:boolean lambda$null$1(net.minecraft.world.level.block.state.BlockState,java.util.function.Predicate) -> a
     23:23:java.util.function.Predicate lambda$getPredicate$0(net.minecraft.world.level.block.state.StateDefinition,net.minecraft.client.renderer.block.model.multipart.Condition) -> a
-net.minecraft.client.renderer.block.model.multipart.Selector -> dsh:
+net.minecraft.client.renderer.block.model.multipart.Selector -> edn:
     net.minecraft.client.renderer.block.model.multipart.Condition condition -> a
     net.minecraft.client.renderer.block.model.MultiVariant variant -> b
     27:36:void <init>(net.minecraft.client.renderer.block.model.multipart.Condition,net.minecraft.client.renderer.block.model.MultiVariant) -> <init>
@@ -15325,7 +16388,7 @@ net.minecraft.client.renderer.block.model.multipart.Selector -> dsh:
     43:43:java.util.function.Predicate getPredicate(net.minecraft.world.level.block.state.StateDefinition) -> a
     48:48:boolean equals(java.lang.Object) -> equals
     53:53:int hashCode() -> hashCode
-net.minecraft.client.renderer.block.model.multipart.Selector$Deserializer -> dsh$a:
+net.minecraft.client.renderer.block.model.multipart.Selector$Deserializer -> edn$a:
     56:56:void <init>() -> <init>
     59:61:net.minecraft.client.renderer.block.model.multipart.Selector deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     65:69:net.minecraft.client.renderer.block.model.multipart.Condition getSelector(com.google.gson.JsonObject) -> b
@@ -15334,20 +16397,21 @@ net.minecraft.client.renderer.block.model.multipart.Selector$Deserializer -> dsh
     56:56:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
     88:88:net.minecraft.client.renderer.block.model.multipart.Condition lambda$getCondition$1(com.google.gson.JsonElement) -> a
     83:83:net.minecraft.client.renderer.block.model.multipart.Condition lambda$getCondition$0(com.google.gson.JsonElement) -> b
-net.minecraft.client.renderer.block.model.multipart.package-info -> dsi:
-net.minecraft.client.renderer.block.model.package-info -> dsj:
-net.minecraft.client.renderer.block.package-info -> dsk:
-net.minecraft.client.renderer.block.statemap.package-info -> dsl:
-net.minecraft.client.renderer.blockentity.BannerRenderer -> dsm:
+net.minecraft.client.renderer.block.model.multipart.package-info -> edo:
+net.minecraft.client.renderer.block.model.package-info -> edp:
+net.minecraft.client.renderer.block.package-info -> edq:
+net.minecraft.client.renderer.block.statemap.package-info -> edr:
+net.minecraft.client.renderer.blockentity.BannerRenderer -> eds:
     net.minecraft.client.model.geom.ModelPart flag -> a
     net.minecraft.client.model.geom.ModelPart pole -> c
     net.minecraft.client.model.geom.ModelPart bar -> d
     35:43:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     46:48:net.minecraft.client.model.geom.ModelPart makeFlag() -> a
     53:105:void render(net.minecraft.world.level.block.entity.BannerBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-    108:116:void renderPatterns(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.resources.model.Material,boolean,java.util.List) -> a
+    108:109:void renderPatterns(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.resources.model.Material,boolean,java.util.List) -> a
+    112:120:void renderPatterns(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.resources.model.Material,boolean,java.util.List,boolean) -> a
     24:24:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-net.minecraft.client.renderer.blockentity.BeaconRenderer -> dsn:
+net.minecraft.client.renderer.blockentity.BeaconRenderer -> edt:
     net.minecraft.resources.ResourceLocation BEAM_LOCATION -> a
     23:24:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     28:37:void render(net.minecraft.world.level.block.entity.BeaconBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
@@ -15360,7 +16424,7 @@ net.minecraft.client.renderer.blockentity.BeaconRenderer -> dsn:
     18:18:boolean shouldRenderOffScreen(net.minecraft.world.level.block.entity.BlockEntity) -> a
     18:18:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.blockentity.BedRenderer -> dso:
+net.minecraft.client.renderer.blockentity.BedRenderer -> edu:
     net.minecraft.client.model.geom.ModelPart headPiece -> a
     net.minecraft.client.model.geom.ModelPart footPiece -> c
     net.minecraft.client.model.geom.ModelPart[] legs -> d
@@ -15369,14 +16433,14 @@ net.minecraft.client.renderer.blockentity.BedRenderer -> dso:
     71:97:void renderPiece(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,boolean,net.minecraft.core.Direction,net.minecraft.client.resources.model.Material,int,int,boolean) -> a
     22:22:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     61:61:boolean lambda$render$0(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-net.minecraft.client.renderer.blockentity.BellRenderer -> dsp:
+net.minecraft.client.renderer.blockentity.BellRenderer -> edv:
     net.minecraft.client.resources.model.Material BELL_RESOURCE_LOCATION -> a
     net.minecraft.client.model.geom.ModelPart bellBody -> c
     20:30:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     34:57:void render(net.minecraft.world.level.block.entity.BellBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     15:15:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher -> dsq:
+net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher -> edw:
     java.util.Map renderers -> f
     net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher instance -> a
     com.mojang.blaze3d.vertex.BufferBuilder singleRenderBuffer -> g
@@ -15385,26 +16449,26 @@ net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher -> dsq:
     net.minecraft.world.level.Level level -> c
     net.minecraft.client.Camera camera -> d
     net.minecraft.world.phys.HitResult cameraHitResult -> e
-    27:59:void <init>() -> <init>
-    62:63:void register(net.minecraft.world.level.block.entity.BlockEntityType,net.minecraft.client.renderer.blockentity.BlockEntityRenderer) -> a
-    68:68:net.minecraft.client.renderer.blockentity.BlockEntityRenderer getRenderer(net.minecraft.world.level.block.entity.BlockEntity) -> a
-    72:79:void prepare(net.minecraft.world.level.Level,net.minecraft.client.renderer.texture.TextureManager,net.minecraft.client.gui.Font,net.minecraft.client.Camera,net.minecraft.world.phys.HitResult) -> a
-    82:96:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource) -> a
-    100:107:void setupAndRender(net.minecraft.client.renderer.blockentity.BlockEntityRenderer,net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource) -> a
-    111:114:void renderItem(net.minecraft.world.level.block.entity.BlockEntity,com.mojang.blaze3d.vertex.PoseStack) -> a
-    117:122:boolean renderItem(net.minecraft.world.level.block.entity.BlockEntity,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-    127:136:void tryRender(net.minecraft.world.level.block.entity.BlockEntity,java.lang.Runnable) -> a
-    139:143:void setLevel(net.minecraft.world.level.Level) -> a
-    146:146:net.minecraft.client.gui.Font getFont() -> a
-    121:121:void lambda$renderItem$1(net.minecraft.client.renderer.blockentity.BlockEntityRenderer,net.minecraft.world.level.block.entity.BlockEntity,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-    95:95:void lambda$render$0(net.minecraft.client.renderer.blockentity.BlockEntityRenderer,net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource) -> b
-    29:29:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.blockentity.BlockEntityRenderer -> dsr:
+    28:60:void <init>() -> <init>
+    63:64:void register(net.minecraft.world.level.block.entity.BlockEntityType,net.minecraft.client.renderer.blockentity.BlockEntityRenderer) -> a
+    69:69:net.minecraft.client.renderer.blockentity.BlockEntityRenderer getRenderer(net.minecraft.world.level.block.entity.BlockEntity) -> a
+    73:80:void prepare(net.minecraft.world.level.Level,net.minecraft.client.renderer.texture.TextureManager,net.minecraft.client.gui.Font,net.minecraft.client.Camera,net.minecraft.world.phys.HitResult) -> a
+    83:97:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource) -> a
+    101:108:void setupAndRender(net.minecraft.client.renderer.blockentity.BlockEntityRenderer,net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource) -> a
+    112:115:void renderItem(net.minecraft.world.level.block.entity.BlockEntity,com.mojang.blaze3d.vertex.PoseStack) -> a
+    118:123:boolean renderItem(net.minecraft.world.level.block.entity.BlockEntity,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
+    128:137:void tryRender(net.minecraft.world.level.block.entity.BlockEntity,java.lang.Runnable) -> a
+    140:144:void setLevel(net.minecraft.world.level.Level) -> a
+    147:147:net.minecraft.client.gui.Font getFont() -> a
+    122:122:void lambda$renderItem$1(net.minecraft.client.renderer.blockentity.BlockEntityRenderer,net.minecraft.world.level.block.entity.BlockEntity,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
+    96:96:void lambda$render$0(net.minecraft.client.renderer.blockentity.BlockEntityRenderer,net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource) -> b
+    30:30:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.blockentity.BlockEntityRenderer -> edx:
     net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher renderer -> b
     10:12:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     17:17:boolean shouldRenderOffScreen(net.minecraft.world.level.block.entity.BlockEntity) -> a
-net.minecraft.client.renderer.blockentity.BrightnessCombiner -> dss:
+net.minecraft.client.renderer.blockentity.BrightnessCombiner -> edy:
     9:9:void <init>() -> <init>
     12:12:it.unimi.dsi.fastutil.ints.Int2IntFunction acceptDouble(net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.level.block.entity.BlockEntity) -> a
     28:28:it.unimi.dsi.fastutil.ints.Int2IntFunction acceptSingle(net.minecraft.world.level.block.entity.BlockEntity) -> a
@@ -15415,11 +16479,11 @@ net.minecraft.client.renderer.blockentity.BrightnessCombiner -> dss:
     33:33:int lambda$acceptNone$2(int) -> a
     28:28:int lambda$acceptSingle$1(int) -> b
     13:22:int lambda$acceptDouble$0(net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.level.block.entity.BlockEntity,int) -> a
-net.minecraft.client.renderer.blockentity.CampfireRenderer -> dst:
+net.minecraft.client.renderer.blockentity.CampfireRenderer -> edz:
     18:19:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     23:44:void render(net.minecraft.world.level.block.entity.CampfireBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     14:14:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-net.minecraft.client.renderer.blockentity.ChestRenderer -> dsu:
+net.minecraft.client.renderer.blockentity.ChestRenderer -> eea:
     net.minecraft.client.model.geom.ModelPart lid -> a
     net.minecraft.client.model.geom.ModelPart bottom -> c
     net.minecraft.client.model.geom.ModelPart lock -> d
@@ -15433,7 +16497,7 @@ net.minecraft.client.renderer.blockentity.ChestRenderer -> dsu:
     43:84:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     88:134:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     137:143:void render(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,float,int,int) -> a
-net.minecraft.client.renderer.blockentity.ConduitRenderer -> dsv:
+net.minecraft.client.renderer.blockentity.ConduitRenderer -> eeb:
     net.minecraft.client.resources.model.Material SHELL_TEXTURE -> a
     net.minecraft.client.resources.model.Material ACTIVE_SHELL_TEXTURE -> c
     net.minecraft.client.resources.model.Material WIND_TEXTURE -> d
@@ -15448,71 +16512,68 @@ net.minecraft.client.renderer.blockentity.ConduitRenderer -> dsv:
     47:109:void render(net.minecraft.world.level.block.entity.ConduitBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     17:17:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     18:23:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.blockentity.EnchantTableRenderer -> dsw:
+net.minecraft.client.renderer.blockentity.EnchantTableRenderer -> eec:
     net.minecraft.client.resources.model.Material BOOK_LOCATION -> a
     net.minecraft.client.model.BookModel bookModel -> c
     18:22:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     26:57:void render(net.minecraft.world.level.block.entity.EnchantmentTableBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     15:15:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.blockentity.LecternRenderer -> dsx:
+net.minecraft.client.renderer.blockentity.LecternRenderer -> eed:
     net.minecraft.client.model.BookModel bookModel -> a
     15:19:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     23:43:void render(net.minecraft.world.level.block.entity.LecternBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     13:13:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-net.minecraft.client.renderer.blockentity.PistonHeadRenderer -> dsy:
+net.minecraft.client.renderer.blockentity.PistonHeadRenderer -> eee:
     net.minecraft.client.renderer.block.BlockRenderDispatcher blockRenderer -> a
     23:27:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     31:66:void render(net.minecraft.world.level.block.piston.PistonMovingBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     69:73:void renderBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.level.Level,boolean,int) -> a
     22:22:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-net.minecraft.client.renderer.blockentity.ShulkerBoxRenderer -> dsz:
+net.minecraft.client.renderer.blockentity.ShulkerBoxRenderer -> eef:
     net.minecraft.client.model.ShulkerModel model -> a
     21:23:void <init>(net.minecraft.client.model.ShulkerModel,net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     28:63:void render(net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     17:17:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-net.minecraft.client.renderer.blockentity.SignRenderer -> dta:
+net.minecraft.client.renderer.blockentity.SignRenderer -> eeg:
     net.minecraft.client.renderer.blockentity.SignRenderer$SignModel signModel -> a
-    29:33:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
-    37:91:void render(net.minecraft.world.level.block.entity.SignBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-    95:100:net.minecraft.client.resources.model.Material getMaterial(net.minecraft.world.level.block.Block) -> a
+    30:34:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
+    38:92:void render(net.minecraft.world.level.block.entity.SignBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
+    96:101:net.minecraft.client.resources.model.Material getMaterial(net.minecraft.world.level.block.Block) -> a
     26:26:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-    79:80:java.lang.String lambda$render$0(net.minecraft.client.gui.Font,net.minecraft.network.chat.Component) -> a
-net.minecraft.client.renderer.blockentity.SignRenderer$SignModel -> dta$a:
+    81:82:net.minecraft.network.chat.FormattedText lambda$render$0(net.minecraft.client.gui.Font,net.minecraft.network.chat.FormattedText) -> a
+net.minecraft.client.renderer.blockentity.SignRenderer$SignModel -> eeg$a:
     net.minecraft.client.model.geom.ModelPart sign -> a
     net.minecraft.client.model.geom.ModelPart stick -> b
-    108:114:void <init>() -> <init>
-    118:120:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
-net.minecraft.client.renderer.blockentity.SkullBlockRenderer -> dtb:
+    109:115:void <init>() -> <init>
+    119:121:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
+net.minecraft.client.renderer.blockentity.SkullBlockRenderer -> eeh:
     java.util.Map MODEL_BY_TYPE -> a
     java.util.Map SKIN_BY_TYPE -> c
     53:54:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     58:66:void render(net.minecraft.world.level.block.entity.SkullBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-    69:100:void renderSkull(net.minecraft.core.Direction,float,net.minecraft.world.level.block.SkullBlock$Type,com.mojang.authlib.GameProfile,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    103:114:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.level.block.SkullBlock$Type,com.mojang.authlib.GameProfile) -> a
+    69:91:void renderSkull(net.minecraft.core.Direction,float,net.minecraft.world.level.block.SkullBlock$Type,com.mojang.authlib.GameProfile,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    94:105:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.level.block.SkullBlock$Type,com.mojang.authlib.GameProfile) -> a
     29:29:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     44:50:void lambda$static$1(java.util.HashMap) -> a
     31:41:void lambda$static$0(java.util.HashMap) -> b
     30:43:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.blockentity.SkullBlockRenderer$1 -> dtb$1:
-    int[] $SwitchMap$net$minecraft$core$Direction -> a
-    76:76:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.blockentity.SpawnerRenderer -> dtc:
+net.minecraft.client.renderer.blockentity.SpawnerRenderer -> eei:
     14:15:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     19:38:void render(net.minecraft.world.level.block.entity.SpawnerBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     12:12:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-net.minecraft.client.renderer.blockentity.StructureBlockRenderer -> dtd:
+net.minecraft.client.renderer.blockentity.StructureBlockRenderer -> eej:
     18:19:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     23:106:void render(net.minecraft.world.level.block.entity.StructureBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     109:136:void renderInvisibleBlocks(net.minecraft.world.level.block.entity.StructureBlockEntity,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.core.BlockPos,boolean,com.mojang.blaze3d.vertex.PoseStack) -> a
     140:140:boolean shouldRenderOffScreen(net.minecraft.world.level.block.entity.StructureBlockEntity) -> a
     16:16:boolean shouldRenderOffScreen(net.minecraft.world.level.block.entity.BlockEntity) -> a
     16:16:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
-net.minecraft.client.renderer.blockentity.StructureBlockRenderer$1 -> dtd$1:
+net.minecraft.client.renderer.blockentity.StructureBlockRenderer$1 -> eej$1:
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> b
     50:65:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.blockentity.TheEndGatewayRenderer -> dte:
+net.minecraft.client.renderer.blockentity.TheEndGatewayRenderer -> eek:
     net.minecraft.resources.ResourceLocation BEAM_LOCATION -> d
     15:16:void <init>(net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher) -> <init>
     20:31:void render(net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
@@ -15521,7 +16582,7 @@ net.minecraft.client.renderer.blockentity.TheEndGatewayRenderer -> dte:
     11:11:void render(net.minecraft.world.level.block.entity.TheEndPortalBlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     11:11:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     12:12:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.blockentity.TheEndPortalRenderer -> dtf:
+net.minecraft.client.renderer.blockentity.TheEndPortalRenderer -> eel:
     net.minecraft.resources.ResourceLocation END_SKY_LOCATION -> a
     net.minecraft.resources.ResourceLocation END_PORTAL_LOCATION -> c
     java.util.Random RANDOM -> d
@@ -15535,8 +16596,8 @@ net.minecraft.client.renderer.blockentity.TheEndPortalRenderer -> dtf:
     18:18:void render(net.minecraft.world.level.block.entity.BlockEntity,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int) -> a
     23:23:net.minecraft.client.renderer.RenderType lambda$static$0(int) -> a
     19:23:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.blockentity.package-info -> dtg:
-net.minecraft.client.renderer.chunk.ChunkRenderDispatcher -> dth:
+net.minecraft.client.renderer.blockentity.package-info -> eem:
+net.minecraft.client.renderer.chunk.ChunkRenderDispatcher -> een:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.PriorityQueue toBatch -> b
     java.util.Queue freeBuffers -> c
@@ -15576,7 +16637,7 @@ net.minecraft.client.renderer.chunk.ChunkRenderDispatcher -> dth:
     56:56:net.minecraft.client.renderer.LevelRenderer access$200(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher) -> b
     56:56:net.minecraft.client.renderer.ChunkBufferBuilderPack access$300(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher) -> c
     57:57:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult -> dth$a:
+net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult -> een$a:
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult SUCCESSFUL -> a
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult CANCELLED -> b
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult[] $VALUES -> c
@@ -15584,7 +16645,7 @@ net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult -> dth
     634:634:net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult valueOf(java.lang.String) -> valueOf
     634:634:void <init>(java.lang.String,int) -> <init>
     634:636:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk -> dth$b:
+net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk -> een$b:
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk UNCOMPILED -> a
     java.util.Set hasBlocks -> b
     java.util.Set hasLayer -> c
@@ -15605,10 +16666,10 @@ net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk -> dth$b
     639:639:java.util.List access$1100(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk) -> c
     639:639:com.mojang.blaze3d.vertex.BufferBuilder$State access$900(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk) -> d
     640:640:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk$1 -> dth$b$1:
+net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk$1 -> een$b$1:
     640:640:void <init>() -> <init>
     644:644:boolean facesCanSeeEachother(net.minecraft.core.Direction,net.minecraft.core.Direction) -> a
-net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk -> dth$c:
+net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk -> een$c:
     java.util.concurrent.atomic.AtomicReference compiled -> a
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$RebuildTask lastRebuildTask -> d
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$ResortTransparencyTask lastResortTransparencyTask -> e
@@ -15650,7 +16711,7 @@ net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk -> dth$c:
     225:225:void access$400(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk,java.util.Set) -> a
     225:225:net.minecraft.core.BlockPos$MutableBlockPos access$500(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk) -> a
     225:225:void access$600(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk,com.mojang.blaze3d.vertex.BufferBuilder) -> a
-net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$ChunkCompileTask -> dth$c$a:
+net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$ChunkCompileTask -> een$c$a:
     double distAtCreation -> a
     java.util.concurrent.atomic.AtomicBoolean isCancelled -> b
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk this$1 -> c
@@ -15659,7 +16720,7 @@ net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$ChunkCompi
     void cancel() -> a
     629:629:int compareTo(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$ChunkCompileTask) -> a
     615:615:int compareTo(java.lang.Object) -> compareTo
-net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$RebuildTask -> dth$c$b:
+net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$RebuildTask -> een$c$b:
     net.minecraft.client.renderer.chunk.RenderChunkRegion region -> d
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk this$1 -> e
     406:409:void <init>(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk,double,net.minecraft.client.renderer.chunk.RenderChunkRegion) -> <init>
@@ -15669,7 +16730,7 @@ net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$RebuildTas
     548:552:void cancel() -> a
     446:454:net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult lambda$doTask$1(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk,java.util.List,java.lang.Throwable) -> a
     443:443:void lambda$doTask$0(java.util.List,net.minecraft.client.renderer.ChunkBufferBuilderPack,net.minecraft.client.renderer.RenderType) -> a
-net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$ResortTransparencyTask -> dth$c$c:
+net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$ResortTransparencyTask -> een$c$c:
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk compiledChunk -> e
     net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk this$1 -> d
     558:561:void <init>(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk,double,net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$CompiledChunk) -> <init>
@@ -15677,7 +16738,7 @@ net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$ResortTran
     611:612:void cancel() -> a
     602:605:net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult lambda$doTask$1(net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult,java.lang.Throwable) -> a
     599:599:net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$ChunkTaskResult lambda$doTask$0(java.lang.Void) -> a
-net.minecraft.client.renderer.chunk.RenderChunkRegion -> dti:
+net.minecraft.client.renderer.chunk.RenderChunkRegion -> eeo:
     int centerX -> a
     int centerZ -> b
     net.minecraft.core.BlockPos start -> c
@@ -15688,17 +16749,19 @@ net.minecraft.client.renderer.chunk.RenderChunkRegion -> dti:
     net.minecraft.world.level.block.state.BlockState[] blockStates -> h
     net.minecraft.world.level.material.FluidState[] fluidStates -> i
     net.minecraft.world.level.Level level -> j
-    30:60:net.minecraft.client.renderer.chunk.RenderChunkRegion createIfNotEmpty(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,int) -> a
-    63:85:void <init>(net.minecraft.world.level.Level,int,int,net.minecraft.world.level.chunk.LevelChunk[][],net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> <init>
-    88:88:int index(net.minecraft.core.BlockPos) -> a
-    92:95:int index(int,int,int) -> a
-    100:100:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
-    105:105:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
-    110:110:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
-    116:116:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
-    121:124:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.LevelChunk$EntityCreationType) -> a
-    129:129:int getBlockTint(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> a
-net.minecraft.client.renderer.chunk.VisGraph -> dtj:
+    31:51:net.minecraft.client.renderer.chunk.RenderChunkRegion createIfNotEmpty(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,int) -> a
+    55:63:boolean isAllEmpty(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,int,int,net.minecraft.world.level.chunk.LevelChunk[][]) -> a
+    66:88:void <init>(net.minecraft.world.level.Level,int,int,net.minecraft.world.level.chunk.LevelChunk[][],net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> <init>
+    91:91:int index(net.minecraft.core.BlockPos) -> a
+    95:98:int index(int,int,int) -> a
+    103:103:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
+    108:108:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
+    113:113:float getShade(net.minecraft.core.Direction,boolean) -> a
+    118:118:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
+    124:124:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
+    129:132:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.LevelChunk$EntityCreationType) -> a
+    137:137:int getBlockTint(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> a
+net.minecraft.client.renderer.chunk.VisGraph -> eep:
     int DX -> a
     int DZ -> b
     int DY -> c
@@ -15717,10 +16780,10 @@ net.minecraft.client.renderer.chunk.VisGraph -> dtj:
     128:166:int getNeighborIndexAtFace(int,net.minecraft.core.Direction) -> a
     30:43:void lambda$static$0(int[]) -> a
     21:29:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.chunk.VisGraph$1 -> dtj$1:
+net.minecraft.client.renderer.chunk.VisGraph$1 -> eep$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     128:128:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.chunk.VisibilitySet -> dtk:
+net.minecraft.client.renderer.chunk.VisibilitySet -> eeq:
     int FACINGS -> a
     java.util.BitSet data -> b
     8:11:void <init>() -> <init>
@@ -15730,8 +16793,8 @@ net.minecraft.client.renderer.chunk.VisibilitySet -> dtk:
     31:31:boolean visibilityBetween(net.minecraft.core.Direction,net.minecraft.core.Direction) -> a
     36:56:java.lang.String toString() -> toString
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.chunk.package-info -> dtl:
-net.minecraft.client.renderer.culling.Frustum -> dtm:
+net.minecraft.client.renderer.chunk.package-info -> eer:
+net.minecraft.client.renderer.culling.Frustum -> ees:
     com.mojang.math.Vector4f[] frustumData -> a
     double camX -> b
     double camY -> c
@@ -15743,8 +16806,8 @@ net.minecraft.client.renderer.culling.Frustum -> dtm:
     47:47:boolean isVisible(net.minecraft.world.phys.AABB) -> a
     51:57:boolean cubeInFrustum(double,double,double,double,double,double) -> a
     64:95:boolean cubeInFrustum(float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.culling.package-info -> dtn:
-net.minecraft.client.renderer.debug.BeeDebugRenderer -> dto:
+net.minecraft.client.renderer.culling.package-info -> eet:
+net.minecraft.client.renderer.debug.BeeDebugRenderer -> eeu:
     net.minecraft.client.Minecraft minecraft -> a
     java.util.Map hives -> b
     java.util.Map beeInfosPerEntity -> c
@@ -15758,40 +16821,42 @@ net.minecraft.client.renderer.debug.BeeDebugRenderer -> dto:
     121:122:void clearRemovedBees() -> b
     125:127:void clearRemovedHives() -> c
     130:164:void doRender() -> d
-    170:176:java.util.Map createHiveBlacklistMap() -> e
-    180:205:void renderFlowerInfos() -> f
-    208:213:java.lang.String getBeeUuidsAsString(java.util.Collection) -> a
-    218:224:void addBeeToSetInMap(java.util.Map,net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo,net.minecraft.core.BlockPos) -> a
-    227:229:void highlightHive(net.minecraft.core.BlockPos) -> a
-    232:236:void renderGhostHive(net.minecraft.core.BlockPos,java.util.List) -> a
-    239:242:void renderTransparentFilledBox(net.minecraft.core.BlockPos,float,float,float,float,float) -> a
-    247:266:void renderHiveInfo(net.minecraft.client.renderer.debug.BeeDebugRenderer$HiveInfo,java.util.Collection) -> a
-    269:272:void renderPath(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> b
-    275:316:void renderBeeInfo(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> c
-    319:321:void renderTextOverHive(java.lang.String,net.minecraft.client.renderer.debug.BeeDebugRenderer$HiveInfo,int,int) -> a
-    324:332:void renderTextOverPos(java.lang.String,net.minecraft.core.BlockPos,int,int) -> a
-    335:348:void renderTextOverMob(net.minecraft.core.Position,int,java.lang.String,int,float) -> a
-    351:351:net.minecraft.client.Camera getCamera() -> g
-    355:358:java.util.Set getHiveMemberNames(net.minecraft.client.renderer.debug.BeeDebugRenderer$HiveInfo) -> b
-    363:365:java.lang.String getPosDescription(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo,net.minecraft.core.BlockPos) -> a
-    369:369:boolean isBeeSelected(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> d
-    373:376:boolean isPlayerCloseEnoughToMob(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> e
-    380:384:java.util.Collection getHiveMembers(net.minecraft.core.BlockPos) -> b
-    393:405:java.util.Map getGhostHives() -> h
-    409:410:void updateLastLookedAtUuid() -> i
-    409:409:void lambda$updateLastLookedAtUuid$11(net.minecraft.world.entity.Entity) -> a
-    382:382:boolean lambda$getHiveMembers$10(net.minecraft.core.BlockPos,net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> a
-    194:204:void lambda$renderFlowerInfos$9(java.util.Map$Entry) -> a
-    185:191:void lambda$renderFlowerInfos$8(java.util.Map,net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> a
-    173:173:void lambda$createHiveBlacklistMap$7(java.util.Map,net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> b
-    174:174:void lambda$null$6(java.util.Map,net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo,net.minecraft.core.BlockPos) -> b
+    170:175:java.util.Map createHiveBlacklistMap() -> e
+    179:197:void renderFlowerInfos() -> f
+    200:205:java.lang.String getBeeUuidsAsString(java.util.Collection) -> a
+    210:212:void highlightHive(net.minecraft.core.BlockPos) -> a
+    215:219:void renderGhostHive(net.minecraft.core.BlockPos,java.util.List) -> a
+    222:225:void renderTransparentFilledBox(net.minecraft.core.BlockPos,float,float,float,float,float) -> a
+    230:249:void renderHiveInfo(net.minecraft.client.renderer.debug.BeeDebugRenderer$HiveInfo,java.util.Collection) -> a
+    252:255:void renderPath(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> b
+    258:299:void renderBeeInfo(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> c
+    302:304:void renderTextOverHive(java.lang.String,net.minecraft.client.renderer.debug.BeeDebugRenderer$HiveInfo,int,int) -> a
+    307:315:void renderTextOverPos(java.lang.String,net.minecraft.core.BlockPos,int,int) -> a
+    318:331:void renderTextOverMob(net.minecraft.core.Position,int,java.lang.String,int,float) -> a
+    334:334:net.minecraft.client.Camera getCamera() -> g
+    338:341:java.util.Set getHiveMemberNames(net.minecraft.client.renderer.debug.BeeDebugRenderer$HiveInfo) -> b
+    346:348:java.lang.String getPosDescription(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo,net.minecraft.core.BlockPos) -> a
+    352:352:boolean isBeeSelected(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> d
+    356:359:boolean isPlayerCloseEnoughToMob(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> e
+    363:367:java.util.Collection getHiveMembers(net.minecraft.core.BlockPos) -> b
+    376:383:java.util.Map getGhostHives() -> h
+    387:388:void updateLastLookedAtUuid() -> i
+    387:387:void lambda$updateLastLookedAtUuid$14(net.minecraft.world.entity.Entity) -> a
+    380:380:java.util.List lambda$getGhostHives$13(net.minecraft.core.BlockPos) -> c
+    365:365:boolean lambda$getHiveMembers$12(net.minecraft.core.BlockPos,net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> a
+    186:196:void lambda$renderFlowerInfos$11(java.util.Map$Entry) -> a
+    183:183:void lambda$renderFlowerInfos$10(java.util.Map,net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> a
+    183:183:java.util.Set lambda$null$9(net.minecraft.core.BlockPos) -> d
+    173:173:void lambda$createHiveBlacklistMap$8(java.util.Map,net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> b
+    173:173:void lambda$null$7(java.util.Map,net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo,net.minecraft.core.BlockPos) -> a
+    173:173:java.util.Set lambda$null$6(net.minecraft.core.BlockPos) -> e
     159:162:void lambda$doRender$5(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,java.util.List) -> a
     152:156:void lambda$doRender$4(net.minecraft.core.BlockPos,java.util.Map,net.minecraft.client.renderer.debug.BeeDebugRenderer$HiveInfo) -> a
     133:136:void lambda$doRender$3(net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> f
     126:126:boolean lambda$clearRemovedHives$2(long,java.util.Map$Entry) -> a
     121:121:boolean lambda$clearRemovedBees$1(java.util.Map$Entry) -> b
     96:96:boolean lambda$removeBeeInfo$0(int,net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo) -> a
-net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo -> dto$a:
+net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo -> eeu$a:
     java.util.UUID uuid -> a
     int id -> b
     net.minecraft.core.Position pos -> c
@@ -15801,56 +16866,128 @@ net.minecraft.client.renderer.debug.BeeDebugRenderer$BeeInfo -> dto$a:
     int travelTicks -> g
     java.util.List goals -> h
     java.util.Set blacklistedHives -> i
-    448:459:void <init>(java.util.UUID,int,net.minecraft.core.Position,net.minecraft.world.level.pathfinder.Path,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,int) -> <init>
-    462:462:boolean hasHive(net.minecraft.core.BlockPos) -> a
-    466:466:java.util.UUID getUuid() -> a
-    470:470:java.lang.String getName() -> b
-    474:474:java.lang.String toString() -> toString
-    478:478:boolean hasFlower() -> c
-net.minecraft.client.renderer.debug.BeeDebugRenderer$HiveInfo -> dto$b:
+    426:437:void <init>(java.util.UUID,int,net.minecraft.core.Position,net.minecraft.world.level.pathfinder.Path,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,int) -> <init>
+    440:440:boolean hasHive(net.minecraft.core.BlockPos) -> a
+    444:444:java.util.UUID getUuid() -> a
+    448:448:java.lang.String getName() -> b
+    453:453:java.lang.String toString() -> toString
+    457:457:boolean hasFlower() -> c
+net.minecraft.client.renderer.debug.BeeDebugRenderer$HiveInfo -> eeu$b:
     net.minecraft.core.BlockPos pos -> a
     java.lang.String hiveType -> b
     int occupantCount -> c
     int honeyLevel -> d
     boolean sedated -> e
     long lastSeen -> f
-    420:427:void <init>(net.minecraft.core.BlockPos,java.lang.String,int,int,boolean,long) -> <init>
-net.minecraft.client.renderer.debug.CaveDebugRenderer -> dtp:
+    398:405:void <init>(net.minecraft.core.BlockPos,java.lang.String,int,int,boolean,long) -> <init>
+net.minecraft.client.renderer.debug.BrainDebugRenderer -> eev:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.client.Minecraft minecraft -> b
+    java.util.Map pois -> c
+    java.util.Map brainDumpsPerEntity -> d
+    java.util.UUID lastLookedAtUuid -> e
+    83:91:void <init>(net.minecraft.client.Minecraft) -> <init>
+    95:98:void clear() -> a
+    101:102:void addPoi(net.minecraft.client.renderer.debug.BrainDebugRenderer$PoiInfo) -> a
+    105:106:void removePoi(net.minecraft.core.BlockPos) -> a
+    109:115:void setFreeTicketCount(net.minecraft.core.BlockPos,int) -> a
+    118:119:void addOrUpdateBrainDump(net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump) -> a
+    122:123:void removeBrainDump(int) -> a
+    127:143:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
+    146:150:void clearRemovedEntities() -> b
+    153:180:void doRender(double,double,double) -> a
+    183:187:void highlightPoi(net.minecraft.core.BlockPos) -> b
+    190:196:void renderGhostPoi(net.minecraft.core.BlockPos,java.util.List) -> a
+    201:223:void renderPoiInfo(net.minecraft.client.renderer.debug.BrainDebugRenderer$PoiInfo) -> b
+    226:229:void renderPath(net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump,double,double,double) -> a
+    232:299:void renderBrainInfo(net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump,double,double,double) -> b
+    302:304:void renderTextOverPoi(java.lang.String,net.minecraft.client.renderer.debug.BrainDebugRenderer$PoiInfo,int,int) -> a
+    307:315:void renderTextOverPos(java.lang.String,net.minecraft.core.BlockPos,int,int) -> a
+    318:331:void renderTextOverMob(net.minecraft.core.Position,int,java.lang.String,int,float) -> a
+    334:337:java.util.Set getTicketHolderNames(net.minecraft.client.renderer.debug.BrainDebugRenderer$PoiInfo) -> c
+    342:345:java.util.Set getPotentialTicketHolderNames(net.minecraft.client.renderer.debug.BrainDebugRenderer$PoiInfo) -> d
+    350:350:boolean isMobSelected(net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump) -> b
+    354:357:boolean isPlayerCloseEnoughToMob(net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump) -> c
+    361:365:java.util.Collection getTicketHolders(net.minecraft.core.BlockPos) -> c
+    370:374:java.util.Collection getPotentialTicketHolders(net.minecraft.core.BlockPos) -> d
+    383:392:java.util.Map getGhostPois() -> c
+    396:397:void updateLastLookedAtUuid() -> d
+    396:396:void lambda$updateLastLookedAtUuid$8(net.minecraft.world.entity.Entity) -> a
+    388:388:java.util.List lambda$getGhostPois$7(net.minecraft.core.BlockPos) -> e
+    372:372:boolean lambda$getPotentialTicketHolders$6(net.minecraft.core.BlockPos,net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump) -> a
+    363:363:boolean lambda$getTicketHolders$5(net.minecraft.core.BlockPos,net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump) -> b
+    175:178:void lambda$doRender$4(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,java.util.List) -> a
+    169:172:void lambda$doRender$3(net.minecraft.core.BlockPos,net.minecraft.client.renderer.debug.BrainDebugRenderer$PoiInfo) -> a
+    156:159:void lambda$doRender$2(double,double,double,net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump) -> a
+    147:148:boolean lambda$clearRemovedEntities$1(java.util.Map$Entry) -> a
+    122:122:boolean lambda$removeBrainDump$0(int,net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump) -> a
+    40:40:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump -> eev$a:
+    java.util.UUID uuid -> a
+    int id -> b
+    java.lang.String name -> c
+    java.lang.String profession -> d
+    int xp -> e
+    float health -> f
+    float maxHealth -> g
+    net.minecraft.core.Position pos -> h
+    java.lang.String inventory -> i
+    net.minecraft.world.level.pathfinder.Path path -> j
+    boolean wantsGolem -> k
+    java.util.List activities -> l
+    java.util.List behaviors -> m
+    java.util.List memories -> n
+    java.util.List gossips -> o
+    java.util.Set pois -> p
+    java.util.Set potentialPois -> q
+    426:445:void <init>(java.util.UUID,int,java.lang.String,java.lang.String,int,float,float,net.minecraft.core.Position,java.lang.String,net.minecraft.world.level.pathfinder.Path,boolean) -> <init>
+    448:448:boolean hasPoi(net.minecraft.core.BlockPos) -> a
+    452:452:boolean hasPotentialPoi(net.minecraft.core.BlockPos) -> b
+    456:456:java.util.UUID getUuid() -> a
+    414:414:boolean access$000(net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump,net.minecraft.core.BlockPos) -> a
+    414:414:boolean access$100(net.minecraft.client.renderer.debug.BrainDebugRenderer$BrainDump,net.minecraft.core.BlockPos) -> b
+net.minecraft.client.renderer.debug.BrainDebugRenderer$PoiInfo -> eev$b:
+    net.minecraft.core.BlockPos pos -> a
+    java.lang.String type -> b
+    int freeTicketCount -> c
+    404:408:void <init>(net.minecraft.core.BlockPos,java.lang.String,int) -> <init>
+net.minecraft.client.renderer.debug.CaveDebugRenderer -> eew:
     java.util.Map tunnelsList -> a
     java.util.Map thicknessMap -> b
     java.util.List startPoses -> c
     18:23:void <init>() -> <init>
     26:32:void addTunnel(net.minecraft.core.BlockPos,java.util.List,java.util.List) -> a
     36:86:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-net.minecraft.client.renderer.debug.ChunkBorderRenderer -> dtq:
+net.minecraft.client.renderer.debug.ChunkBorderRenderer -> eex:
     net.minecraft.client.Minecraft minecraft -> a
     16:18:void <init>(net.minecraft.client.Minecraft) -> <init>
     22:122:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-net.minecraft.client.renderer.debug.ChunkDebugRenderer -> dtr:
+net.minecraft.client.renderer.debug.ChunkDebugRenderer -> eey:
     net.minecraft.client.Minecraft minecraft -> a
     double lastUpdateTime -> b
     int radius -> c
     net.minecraft.client.renderer.debug.ChunkDebugRenderer$ChunkData data -> d
-    24:31:void <init>(net.minecraft.client.Minecraft) -> <init>
-    35:75:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-    22:22:net.minecraft.client.Minecraft access$300(net.minecraft.client.renderer.debug.ChunkDebugRenderer) -> a
-net.minecraft.client.renderer.debug.ChunkDebugRenderer$1 -> dtr$1:
-net.minecraft.client.renderer.debug.ChunkDebugRenderer$ChunkData -> dtr$a:
+    25:32:void <init>(net.minecraft.client.Minecraft) -> <init>
+    36:76:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
+    23:23:net.minecraft.client.Minecraft access$300(net.minecraft.client.renderer.debug.ChunkDebugRenderer) -> a
+net.minecraft.client.renderer.debug.ChunkDebugRenderer$1 -> eey$1:
+net.minecraft.client.renderer.debug.ChunkDebugRenderer$ChunkData -> eey$a:
     java.util.Map clientData -> b
     java.util.concurrent.CompletableFuture serverData -> c
     net.minecraft.client.renderer.debug.ChunkDebugRenderer this$0 -> a
-    81:122:void <init>(net.minecraft.client.renderer.debug.ChunkDebugRenderer,net.minecraft.client.server.IntegratedServer,double,double) -> <init>
-    112:120:java.util.Map lambda$new$0(net.minecraft.server.level.ServerLevel,int,int) -> a
-    77:77:void <init>(net.minecraft.client.renderer.debug.ChunkDebugRenderer,net.minecraft.client.server.IntegratedServer,double,double,net.minecraft.client.renderer.debug.ChunkDebugRenderer$1) -> <init>
-    77:77:java.util.concurrent.CompletableFuture access$100(net.minecraft.client.renderer.debug.ChunkDebugRenderer$ChunkData) -> a
-    77:77:java.util.Map access$200(net.minecraft.client.renderer.debug.ChunkDebugRenderer$ChunkData) -> b
-net.minecraft.client.renderer.debug.CollisionBoxRenderer -> dts:
+    82:121:void <init>(net.minecraft.client.renderer.debug.ChunkDebugRenderer,net.minecraft.client.server.IntegratedServer,double,double) -> <init>
+    107:119:java.util.Map lambda$new$0(net.minecraft.client.server.IntegratedServer,net.minecraft.resources.ResourceKey,int,int) -> a
+    78:78:void <init>(net.minecraft.client.renderer.debug.ChunkDebugRenderer,net.minecraft.client.server.IntegratedServer,double,double,net.minecraft.client.renderer.debug.ChunkDebugRenderer$1) -> <init>
+    78:78:java.util.concurrent.CompletableFuture access$100(net.minecraft.client.renderer.debug.ChunkDebugRenderer$ChunkData) -> a
+    78:78:java.util.Map access$200(net.minecraft.client.renderer.debug.ChunkDebugRenderer$ChunkData) -> b
+net.minecraft.client.renderer.debug.CollisionBoxRenderer -> eez:
     net.minecraft.client.Minecraft minecraft -> a
     double lastUpdateTime -> b
     java.util.List shapes -> c
     19:24:void <init>(net.minecraft.client.Minecraft) -> <init>
     28:39:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-net.minecraft.client.renderer.debug.DebugRenderer -> dtt:
+    32:32:boolean lambda$render$0(net.minecraft.world.entity.Entity) -> a
+net.minecraft.client.renderer.debug.DebugRenderer -> efa:
     net.minecraft.client.renderer.debug.PathfindingRenderer pathfindingRenderer -> a
     net.minecraft.client.renderer.debug.DebugRenderer$SimpleDebugRenderer waterDebugRenderer -> b
     net.minecraft.client.renderer.debug.DebugRenderer$SimpleDebugRenderer chunkBorderRenderer -> c
@@ -15863,30 +17000,31 @@ net.minecraft.client.renderer.debug.DebugRenderer -> dtt:
     net.minecraft.client.renderer.debug.DebugRenderer$SimpleDebugRenderer worldGenAttemptRenderer -> j
     net.minecraft.client.renderer.debug.DebugRenderer$SimpleDebugRenderer solidFaceRenderer -> k
     net.minecraft.client.renderer.debug.DebugRenderer$SimpleDebugRenderer chunkRenderer -> l
-    net.minecraft.client.renderer.debug.VillageDebugRenderer villageDebugRenderer -> m
-    net.minecraft.client.renderer.debug.BeeDebugRenderer beeDebugRenderer -> n
-    net.minecraft.client.renderer.debug.RaidDebugRenderer raidDebugRenderer -> o
-    net.minecraft.client.renderer.debug.GoalSelectorDebugRenderer goalSelectorRenderer -> p
-    net.minecraft.client.renderer.debug.GameTestDebugRenderer gameTestDebugRenderer -> q
-    boolean renderChunkborder -> r
-    50:68:void <init>(net.minecraft.client.Minecraft) -> <init>
-    71:88:void clear() -> a
-    91:92:boolean switchRenderChunkborder() -> b
-    100:161:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource$BufferSource,double,double,double) -> a
-    164:188:java.util.Optional getTargetedEntity(net.minecraft.world.entity.Entity,int) -> a
-    195:203:void renderFilledBox(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,float,float,float,float) -> a
-    209:217:void renderFilledBox(net.minecraft.core.BlockPos,float,float,float,float,float) -> a
-    220:221:void renderFilledBox(net.minecraft.world.phys.AABB,float,float,float,float) -> a
-    224:229:void renderFilledBox(double,double,double,double,double,double,float,float,float,float) -> a
-    232:233:void renderFloatingText(java.lang.String,int,int,int,int) -> a
-    236:237:void renderFloatingText(java.lang.String,double,double,double,int) -> a
-    240:241:void renderFloatingText(java.lang.String,double,double,double,int,float) -> a
-    250:291:void renderFloatingText(java.lang.String,double,double,double,int,float,boolean,float,boolean) -> a
-    177:177:boolean lambda$getTargetedEntity$0(net.minecraft.world.entity.Entity) -> a
-net.minecraft.client.renderer.debug.DebugRenderer$SimpleDebugRenderer -> dtt$a:
+    net.minecraft.client.renderer.debug.BrainDebugRenderer brainDebugRenderer -> m
+    net.minecraft.client.renderer.debug.VillageSectionsDebugRenderer villageSectionsDebugRenderer -> n
+    net.minecraft.client.renderer.debug.BeeDebugRenderer beeDebugRenderer -> o
+    net.minecraft.client.renderer.debug.RaidDebugRenderer raidDebugRenderer -> p
+    net.minecraft.client.renderer.debug.GoalSelectorDebugRenderer goalSelectorRenderer -> q
+    net.minecraft.client.renderer.debug.GameTestDebugRenderer gameTestDebugRenderer -> r
+    boolean renderChunkborder -> s
+    51:70:void <init>(net.minecraft.client.Minecraft) -> <init>
+    73:91:void clear() -> a
+    94:95:boolean switchRenderChunkborder() -> b
+    103:168:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource$BufferSource,double,double,double) -> a
+    171:195:java.util.Optional getTargetedEntity(net.minecraft.world.entity.Entity,int) -> a
+    202:210:void renderFilledBox(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,float,float,float,float) -> a
+    216:224:void renderFilledBox(net.minecraft.core.BlockPos,float,float,float,float,float) -> a
+    227:228:void renderFilledBox(net.minecraft.world.phys.AABB,float,float,float,float) -> a
+    231:236:void renderFilledBox(double,double,double,double,double,double,float,float,float,float) -> a
+    239:240:void renderFloatingText(java.lang.String,int,int,int,int) -> a
+    243:244:void renderFloatingText(java.lang.String,double,double,double,int) -> a
+    247:248:void renderFloatingText(java.lang.String,double,double,double,int,float) -> a
+    257:298:void renderFloatingText(java.lang.String,double,double,double,int,float,boolean,float,boolean) -> a
+    184:184:boolean lambda$getTargetedEntity$0(net.minecraft.world.entity.Entity) -> a
+net.minecraft.client.renderer.debug.DebugRenderer$SimpleDebugRenderer -> efa$a:
     void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-    297:297:void clear() -> a
-net.minecraft.client.renderer.debug.GameTestDebugRenderer -> dtu:
+    304:304:void clear() -> a
+net.minecraft.client.renderer.debug.GameTestDebugRenderer -> efb:
     java.util.Map markers -> a
     16:18:void <init>() -> <init>
     49:50:void addMarker(net.minecraft.core.BlockPos,int,java.lang.String,int) -> a
@@ -15894,7 +17032,7 @@ net.minecraft.client.renderer.debug.GameTestDebugRenderer -> dtu:
     59:62:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
     65:82:void renderMarker(net.minecraft.core.BlockPos,net.minecraft.client.renderer.debug.GameTestDebugRenderer$Marker) -> a
     60:60:boolean lambda$render$0(long,java.util.Map$Entry) -> a
-net.minecraft.client.renderer.debug.GameTestDebugRenderer$Marker -> dtu$a:
+net.minecraft.client.renderer.debug.GameTestDebugRenderer$Marker -> efb$a:
     int color -> a
     java.lang.String text -> b
     long removeAtTime -> c
@@ -15903,7 +17041,7 @@ net.minecraft.client.renderer.debug.GameTestDebugRenderer$Marker -> dtu$a:
     36:36:float getG() -> b
     40:40:float getB() -> c
     44:44:float getA() -> d
-net.minecraft.client.renderer.debug.GoalSelectorDebugRenderer -> dtv:
+net.minecraft.client.renderer.debug.GoalSelectorDebugRenderer -> efc:
     net.minecraft.client.Minecraft minecraft -> a
     java.util.Map goalSelectors -> b
     36:37:void clear() -> a
@@ -15912,38 +17050,43 @@ net.minecraft.client.renderer.debug.GoalSelectorDebugRenderer -> dtv:
     32:49:void <init>(net.minecraft.client.Minecraft) -> <init>
     53:80:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
     64:75:void lambda$render$0(net.minecraft.core.BlockPos,java.lang.Integer,java.util.List) -> a
-net.minecraft.client.renderer.debug.GoalSelectorDebugRenderer$DebugGoal -> dtv$a:
+net.minecraft.client.renderer.debug.GoalSelectorDebugRenderer$DebugGoal -> efc$a:
     net.minecraft.core.BlockPos pos -> a
     int priority -> b
     java.lang.String name -> c
     boolean isRunning -> d
     23:28:void <init>(net.minecraft.core.BlockPos,int,java.lang.String,boolean) -> <init>
-net.minecraft.client.renderer.debug.HeightMapRenderer -> dtw:
+net.minecraft.client.renderer.debug.HeightMapRenderer -> efd:
     net.minecraft.client.Minecraft minecraft -> a
-    20:22:void <init>(net.minecraft.client.Minecraft) -> <init>
-    26:54:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-net.minecraft.client.renderer.debug.LightDebugRenderer -> dtx:
+    27:29:void <init>(net.minecraft.client.Minecraft) -> <init>
+    33:70:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
+    73:87:com.mojang.math.Vector3f getColor(net.minecraft.world.level.levelgen.Heightmap$Types) -> a
+net.minecraft.client.renderer.debug.HeightMapRenderer$1 -> efd$1:
+    int[] $SwitchMap$net$minecraft$world$level$levelgen$Heightmap$Types -> a
+    73:73:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.debug.LightDebugRenderer -> efe:
     net.minecraft.client.Minecraft minecraft -> a
     19:21:void <init>(net.minecraft.client.Minecraft) -> <init>
     25:60:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-net.minecraft.client.renderer.debug.NeighborsUpdateRenderer -> dty:
+net.minecraft.client.renderer.debug.NeighborsUpdateRenderer -> eff:
     net.minecraft.client.Minecraft minecraft -> a
     java.util.Map lastUpdate -> b
     21:25:void <init>(net.minecraft.client.Minecraft) -> <init>
-    28:40:void addUpdate(long,net.minecraft.core.BlockPos) -> a
-    44:81:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-net.minecraft.client.renderer.debug.PathfindingRenderer -> dtz:
+    28:32:void addUpdate(long,net.minecraft.core.BlockPos) -> a
+    36:73:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
+    28:28:java.util.Map lambda$addUpdate$0(java.lang.Long) -> a
+net.minecraft.client.renderer.debug.PathfindingRenderer -> efg:
     java.util.Map pathMap -> a
     java.util.Map pathMaxDist -> b
     java.util.Map creationMap -> c
-    22:36:void <init>() -> <init>
-    39:42:void addPath(int,net.minecraft.world.level.pathfinder.Path,float) -> a
-    46:63:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-    66:79:void renderPath(net.minecraft.world.level.pathfinder.Path,float,boolean,boolean,double,double,double) -> a
-    82:157:void doRenderPath(net.minecraft.world.level.pathfinder.Path,float,boolean,boolean,double,double,double) -> b
-    160:180:void renderPathLine(net.minecraft.world.level.pathfinder.Path,double,double,double) -> a
-    183:183:float distanceToCamera(net.minecraft.core.BlockPos,double,double,double) -> a
-net.minecraft.client.renderer.debug.RaidDebugRenderer -> dua:
+    22:38:void <init>() -> <init>
+    41:44:void addPath(int,net.minecraft.world.level.pathfinder.Path,float) -> a
+    48:65:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
+    68:81:void renderPath(net.minecraft.world.level.pathfinder.Path,float,boolean,boolean,double,double,double) -> a
+    84:159:void doRenderPath(net.minecraft.world.level.pathfinder.Path,float,boolean,boolean,double,double,double) -> b
+    162:182:void renderPathLine(net.minecraft.world.level.pathfinder.Path,double,double,double) -> a
+    185:185:float distanceToCamera(net.minecraft.core.BlockPos,double,double,double) -> a
+net.minecraft.client.renderer.debug.RaidDebugRenderer -> efh:
     net.minecraft.client.Minecraft minecraft -> a
     java.util.Collection raidCenters -> b
     21:25:void <init>(net.minecraft.client.Minecraft) -> <init>
@@ -15952,11 +17095,11 @@ net.minecraft.client.renderer.debug.RaidDebugRenderer -> dua:
     43:46:void highlightRaidCenter(net.minecraft.core.BlockPos) -> a
     49:54:void renderTextOverBlock(java.lang.String,net.minecraft.core.BlockPos,int) -> a
     57:57:net.minecraft.client.Camera getCamera() -> b
-net.minecraft.client.renderer.debug.SolidFaceRenderer -> dub:
+net.minecraft.client.renderer.debug.SolidFaceRenderer -> efi:
     net.minecraft.client.Minecraft minecraft -> a
     22:24:void <init>(net.minecraft.client.Minecraft) -> <init>
     28:130:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-net.minecraft.client.renderer.debug.StructureRenderer -> duc:
+net.minecraft.client.renderer.debug.StructureRenderer -> efj:
     net.minecraft.client.Minecraft minecraft -> a
     java.util.Map postMainBoxes -> b
     java.util.Map postPiecesBoxes -> c
@@ -15965,76 +17108,21 @@ net.minecraft.client.renderer.debug.StructureRenderer -> duc:
     34:65:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
     68:84:void addBoundingBox(net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.List,java.util.List,net.minecraft.world.level.dimension.DimensionType) -> a
     88:91:void clear() -> a
-net.minecraft.client.renderer.debug.VillageDebugRenderer -> dud:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.client.Minecraft minecraft -> b
-    java.util.Map pois -> c
-    java.util.Set villageSections -> d
-    java.util.Map brainDumpsPerEntity -> e
-    java.util.UUID lastLookedAtUuid -> f
-    83:91:void <init>(net.minecraft.client.Minecraft) -> <init>
-    95:99:void clear() -> a
-    102:103:void addPoi(net.minecraft.client.renderer.debug.VillageDebugRenderer$PoiInfo) -> a
-    106:107:void removePoi(net.minecraft.core.BlockPos) -> a
-    110:116:void setFreeTicketCount(net.minecraft.core.BlockPos,int) -> a
-    119:120:void setVillageSection(net.minecraft.core.SectionPos) -> a
-    123:124:void setNotVillageSection(net.minecraft.core.SectionPos) -> b
-    127:128:void addOrUpdateBrainDump(net.minecraft.client.renderer.debug.VillageDebugRenderer$BrainDump) -> a
-    131:132:void removeBrainDump(int) -> a
-    136:150:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-    153:188:void doRender(double,double,double) -> a
-    191:197:void highlightVillageSection(net.minecraft.core.SectionPos) -> c
-    200:204:void highlightPoi(net.minecraft.core.BlockPos) -> b
-    207:213:void renderGhostPoi(net.minecraft.core.BlockPos,java.util.List) -> a
-    218:230:void renderPoiInfo(net.minecraft.client.renderer.debug.VillageDebugRenderer$PoiInfo) -> b
-    233:236:void renderPath(net.minecraft.client.renderer.debug.VillageDebugRenderer$BrainDump,double,double,double) -> a
-    239:300:void renderVillagerInfo(net.minecraft.client.renderer.debug.VillageDebugRenderer$BrainDump,double,double,double) -> b
-    303:305:void renderTextOverPoi(java.lang.String,net.minecraft.client.renderer.debug.VillageDebugRenderer$PoiInfo,int,int) -> a
-    308:316:void renderTextOverPos(java.lang.String,net.minecraft.core.BlockPos,int,int) -> a
-    319:332:void renderTextOverMob(net.minecraft.core.Position,int,java.lang.String,int,float) -> a
-    335:338:java.util.Set getTicketHolderNames(net.minecraft.client.renderer.debug.VillageDebugRenderer$PoiInfo) -> c
-    343:343:boolean isVillagerSelected(net.minecraft.client.renderer.debug.VillageDebugRenderer$BrainDump) -> b
-    347:350:boolean isPlayerCloseEnoughToMob(net.minecraft.client.renderer.debug.VillageDebugRenderer$BrainDump) -> c
-    354:358:java.util.Collection getTicketHolders(net.minecraft.core.BlockPos) -> c
-    367:381:java.util.Map getGhostPois() -> b
-    385:386:void updateLastLookedAtUuid() -> c
-    385:385:void lambda$updateLastLookedAtUuid$6(net.minecraft.world.entity.Entity) -> a
-    356:356:boolean lambda$getTicketHolders$5(net.minecraft.core.BlockPos,net.minecraft.client.renderer.debug.VillageDebugRenderer$BrainDump) -> a
-    183:186:void lambda$doRender$4(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,java.util.List) -> a
-    177:180:void lambda$doRender$3(net.minecraft.core.BlockPos,net.minecraft.client.renderer.debug.VillageDebugRenderer$PoiInfo) -> a
-    164:167:void lambda$doRender$2(double,double,double,net.minecraft.client.renderer.debug.VillageDebugRenderer$BrainDump) -> a
-    157:160:void lambda$doRender$1(net.minecraft.core.BlockPos,net.minecraft.core.SectionPos) -> a
-    131:131:boolean lambda$removeBrainDump$0(int,net.minecraft.client.renderer.debug.VillageDebugRenderer$BrainDump) -> a
-    39:39:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.debug.VillageDebugRenderer$BrainDump -> dud$a:
-    java.util.UUID uuid -> a
-    int id -> b
-    java.lang.String name -> c
-    java.lang.String profession -> d
-    int xp -> e
-    net.minecraft.core.Position pos -> f
-    java.lang.String inventory -> g
-    net.minecraft.world.level.pathfinder.Path path -> h
-    boolean wantsGolem -> i
-    java.util.List activities -> j
-    java.util.List behaviors -> k
-    java.util.List memories -> l
-    java.util.List gossips -> m
-    java.util.Set pois -> n
-    413:429:void <init>(java.util.UUID,int,java.lang.String,java.lang.String,int,net.minecraft.core.Position,java.lang.String,net.minecraft.world.level.pathfinder.Path,boolean) -> <init>
-    432:432:boolean hasPoi(net.minecraft.core.BlockPos) -> a
-    436:436:java.util.UUID getUuid() -> a
-    403:403:boolean access$000(net.minecraft.client.renderer.debug.VillageDebugRenderer$BrainDump,net.minecraft.core.BlockPos) -> a
-net.minecraft.client.renderer.debug.VillageDebugRenderer$PoiInfo -> dud$b:
-    net.minecraft.core.BlockPos pos -> a
-    java.lang.String type -> b
-    int freeTicketCount -> c
-    393:397:void <init>(net.minecraft.core.BlockPos,java.lang.String,int) -> <init>
-net.minecraft.client.renderer.debug.WaterDebugRenderer -> due:
+net.minecraft.client.renderer.debug.VillageSectionsDebugRenderer -> efk:
+    java.util.Set villageSections -> a
+    18:21:void <init>() -> <init>
+    25:26:void clear() -> a
+    29:30:void setVillageSection(net.minecraft.core.SectionPos) -> a
+    33:34:void setNotVillageSection(net.minecraft.core.SectionPos) -> b
+    38:48:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
+    51:58:void doRender(double,double,double) -> a
+    61:67:void highlightVillageSection(net.minecraft.core.SectionPos) -> c
+    54:57:void lambda$doRender$0(net.minecraft.core.BlockPos,net.minecraft.core.SectionPos) -> a
+net.minecraft.client.renderer.debug.WaterDebugRenderer -> efl:
     net.minecraft.client.Minecraft minecraft -> a
     16:18:void <init>(net.minecraft.client.Minecraft) -> <init>
     22:61:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-net.minecraft.client.renderer.debug.WorldGenAttemptRenderer -> duf:
+net.minecraft.client.renderer.debug.WorldGenAttemptRenderer -> efm:
     java.util.List toRender -> a
     java.util.List scales -> b
     java.util.List alphas -> c
@@ -16044,44 +17132,44 @@ net.minecraft.client.renderer.debug.WorldGenAttemptRenderer -> duf:
     16:22:void <init>() -> <init>
     25:31:void addPos(net.minecraft.core.BlockPos,float,float,float,float,float) -> a
     35:69:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,double,double,double) -> a
-net.minecraft.client.renderer.debug.package-info -> dug:
-net.minecraft.client.renderer.entity.AbstractHorseRenderer -> duh:
+net.minecraft.client.renderer.debug.package-info -> efn:
+net.minecraft.client.renderer.entity.AbstractHorseRenderer -> efo:
     float scale -> a
     11:13:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.model.HorseModel,float) -> <init>
     17:19:void scale(net.minecraft.world.entity.animal.horse.AbstractHorse,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     7:7:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-net.minecraft.client.renderer.entity.AbstractZombieRenderer -> dui:
+net.minecraft.client.renderer.entity.AbstractZombieRenderer -> efp:
     net.minecraft.resources.ResourceLocation ZOMBIE_LOCATION -> a
-    13:16:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.model.ZombieModel,net.minecraft.client.model.ZombieModel,net.minecraft.client.model.ZombieModel) -> <init>
-    20:20:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Zombie) -> a
-    25:29:void setupRotations(net.minecraft.world.entity.monster.Zombie,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
-    9:9:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
-    9:9:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
-    9:9:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    10:10:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.AreaEffectCloudRenderer -> duj:
+    12:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.model.ZombieModel,net.minecraft.client.model.ZombieModel,net.minecraft.client.model.ZombieModel) -> <init>
+    19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Zombie) -> a
+    24:24:boolean isShaking(net.minecraft.world.entity.monster.Zombie) -> b
+    8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
+    8:8:boolean isShaking(net.minecraft.world.entity.LivingEntity) -> a
+    8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.AreaEffectCloudRenderer -> efq:
     9:10:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     14:14:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.AreaEffectCloud) -> a
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-net.minecraft.client.renderer.entity.ArmorStandRenderer -> duk:
+net.minecraft.client.renderer.entity.ArmorStandRenderer -> efr:
     net.minecraft.resources.ResourceLocation DEFAULT_SKIN_LOCATION -> a
     22:27:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     31:31:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.decoration.ArmorStand) -> a
     36:42:void setupRotations(net.minecraft.world.entity.decoration.ArmorStand,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     46:52:boolean shouldShowName(net.minecraft.world.entity.decoration.ArmorStand) -> b
-    58:69:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.entity.decoration.ArmorStand,boolean,boolean) -> a
-    18:18:boolean shouldShowName(net.minecraft.world.entity.LivingEntity) -> a
+    58:69:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.entity.decoration.ArmorStand,boolean,boolean,boolean) -> a
+    18:18:boolean shouldShowName(net.minecraft.world.entity.LivingEntity) -> b
     18:18:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
-    18:18:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.entity.LivingEntity,boolean,boolean) -> a
+    18:18:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.entity.LivingEntity,boolean,boolean,boolean) -> a
     18:18:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     18:18:boolean shouldShowName(net.minecraft.world.entity.Entity) -> b
     19:19:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ArrowRenderer -> dul:
+net.minecraft.client.renderer.entity.ArrowRenderer -> efs:
     16:17:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     21:75:void render(net.minecraft.world.entity.projectile.AbstractArrow,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     78:79:void vertex(com.mojang.math.Matrix4f,com.mojang.math.Matrix3f,com.mojang.blaze3d.vertex.VertexConsumer,int,int,int,float,float,int,int,int,int) -> a
     14:14:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-net.minecraft.client.renderer.entity.BatRenderer -> dum:
+net.minecraft.client.renderer.entity.BatRenderer -> eft:
     net.minecraft.resources.ResourceLocation BAT_LOCATION -> a
     13:14:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     18:18:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.ambient.Bat) -> a
@@ -16091,7 +17179,7 @@ net.minecraft.client.renderer.entity.BatRenderer -> dum:
     9:9:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     9:9:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     10:10:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.BeeRenderer -> dun:
+net.minecraft.client.renderer.entity.BeeRenderer -> efu:
     net.minecraft.resources.ResourceLocation ANGRY_BEE_TEXTURE -> a
     net.minecraft.resources.ResourceLocation ANGRY_NECTAR_BEE_TEXTURE -> g
     net.minecraft.resources.ResourceLocation BEE_TEXTURE -> h
@@ -16100,24 +17188,24 @@ net.minecraft.client.renderer.entity.BeeRenderer -> dun:
     19:27:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Bee) -> a
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     8:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.BlazeRenderer -> duo:
+net.minecraft.client.renderer.entity.BlazeRenderer -> efv:
     net.minecraft.resources.ResourceLocation BLAZE_LOCATION -> a
-    12:13:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    17:17:int getBlockLightLevel(net.minecraft.world.entity.monster.Blaze,float) -> a
-    22:22:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Blaze) -> a
-    8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    8:8:int getBlockLightLevel(net.minecraft.world.entity.Entity,float) -> a
-    9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.BoatRenderer -> dup:
+    13:14:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    18:18:int getBlockLightLevel(net.minecraft.world.entity.monster.Blaze,net.minecraft.core.BlockPos) -> a
+    23:23:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Blaze) -> a
+    9:9:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    9:9:int getBlockLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> a
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.BoatRenderer -> efw:
     net.minecraft.resources.ResourceLocation[] BOAT_TEXTURE_LOCATIONS -> e
     net.minecraft.client.model.BoatModel model -> a
     24:29:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    33:66:void render(net.minecraft.world.entity.vehicle.Boat,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    70:70:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.vehicle.Boat) -> a
+    33:68:void render(net.minecraft.world.entity.vehicle.Boat,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    72:72:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.vehicle.Boat) -> a
     15:15:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     15:15:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.CatRenderer -> duq:
+net.minecraft.client.renderer.entity.CatRenderer -> efx:
     18:21:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     25:25:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Cat) -> a
     30:32:void scale(net.minecraft.world.entity.animal.Cat,com.mojang.blaze3d.vertex.PoseStack,float) -> a
@@ -16125,7 +17213,7 @@ net.minecraft.client.renderer.entity.CatRenderer -> duq:
     16:16:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     16:16:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-net.minecraft.client.renderer.entity.CaveSpiderRenderer -> dur:
+net.minecraft.client.renderer.entity.CaveSpiderRenderer -> efy:
     net.minecraft.resources.ResourceLocation CAVE_SPIDER_LOCATION -> a
     12:14:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     18:19:void scale(net.minecraft.world.entity.monster.CaveSpider,com.mojang.blaze3d.vertex.PoseStack,float) -> a
@@ -16134,13 +17222,13 @@ net.minecraft.client.renderer.entity.CaveSpiderRenderer -> dur:
     7:7:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ChestedHorseRenderer -> dus:
+net.minecraft.client.renderer.entity.ChestedHorseRenderer -> efz:
     java.util.Map MAP -> a
     19:20:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,float) -> <init>
     24:24:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.horse.AbstractChestedHorse) -> a
     12:12:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ChickenRenderer -> dut:
+net.minecraft.client.renderer.entity.ChickenRenderer -> ega:
     net.minecraft.resources.ResourceLocation CHICKEN_LOCATION -> a
     12:13:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     17:17:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Chicken) -> a
@@ -16148,7 +17236,7 @@ net.minecraft.client.renderer.entity.ChickenRenderer -> dut:
     8:8:float getBob(net.minecraft.world.entity.LivingEntity,float) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.CodRenderer -> duu:
+net.minecraft.client.renderer.entity.CodRenderer -> egb:
     net.minecraft.resources.ResourceLocation COD_LOCATION -> a
     14:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Cod) -> a
@@ -16156,13 +17244,13 @@ net.minecraft.client.renderer.entity.CodRenderer -> duu:
     10:10:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.CowRenderer -> duv:
+net.minecraft.client.renderer.entity.CowRenderer -> egc:
     net.minecraft.resources.ResourceLocation COW_LOCATION -> a
     11:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Cow) -> a
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.CreeperRenderer -> duw:
+net.minecraft.client.renderer.entity.CreeperRenderer -> egd:
     net.minecraft.resources.ResourceLocation CREEPER_LOCATION -> a
     14:17:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     21:30:void scale(net.minecraft.world.entity.monster.Creeper,com.mojang.blaze3d.vertex.PoseStack,float) -> a
@@ -16172,33 +17260,32 @@ net.minecraft.client.renderer.entity.CreeperRenderer -> duw:
     10:10:float getWhiteOverlayProgress(net.minecraft.world.entity.LivingEntity,float) -> b
     10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.DolphinRenderer -> dux:
+net.minecraft.client.renderer.entity.DolphinRenderer -> ege:
     net.minecraft.resources.ResourceLocation DOLPHIN_LOCATION -> a
     12:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Dolphin) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.DragonFireballRenderer -> duy:
+net.minecraft.client.renderer.entity.DragonFireballRenderer -> egf:
     net.minecraft.resources.ResourceLocation TEXTURE_LOCATION -> a
     net.minecraft.client.renderer.RenderType RENDER_TYPE -> e
-    20:21:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    25:25:int getBlockLightLevel(net.minecraft.world.entity.projectile.DragonFireball,float) -> a
-    30:50:void render(net.minecraft.world.entity.projectile.DragonFireball,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    53:54:void vertex(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,com.mojang.math.Matrix3f,int,float,int,int,int) -> a
-    58:58:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.projectile.DragonFireball) -> a
-    15:15:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    15:15:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    15:15:int getBlockLightLevel(net.minecraft.world.entity.Entity,float) -> a
-    16:17:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.DrownedRenderer -> duz:
+    21:22:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    26:26:int getBlockLightLevel(net.minecraft.world.entity.projectile.DragonFireball,net.minecraft.core.BlockPos) -> a
+    31:51:void render(net.minecraft.world.entity.projectile.DragonFireball,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    54:55:void vertex(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,com.mojang.math.Matrix3f,int,float,int,int,int) -> a
+    59:59:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.projectile.DragonFireball) -> a
+    16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    16:16:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    16:16:int getBlockLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> a
+    17:18:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.DrownedRenderer -> egg:
     net.minecraft.resources.ResourceLocation DROWNED_LOCATION -> a
     16:19:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     23:23:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Zombie) -> a
     28:34:void setupRotations(net.minecraft.world.entity.monster.Drowned,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
-    12:12:void setupRotations(net.minecraft.world.entity.monster.Zombie,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     12:12:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ElderGuardianRenderer -> dva:
+net.minecraft.client.renderer.entity.ElderGuardianRenderer -> egh:
     net.minecraft.resources.ResourceLocation GUARDIAN_ELDER_LOCATION -> a
     12:13:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     17:18:void scale(net.minecraft.world.entity.monster.Guardian,com.mojang.blaze3d.vertex.PoseStack,float) -> a
@@ -16206,7 +17293,7 @@ net.minecraft.client.renderer.entity.ElderGuardianRenderer -> dva:
     8:8:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.EndCrystalRenderer -> dvb:
+net.minecraft.client.renderer.entity.EndCrystalRenderer -> egi:
     net.minecraft.resources.ResourceLocation END_CRYSTAL_LOCATION -> a
     net.minecraft.client.renderer.RenderType RENDER_TYPE -> e
     float SIN_45 -> f
@@ -16222,7 +17309,7 @@ net.minecraft.client.renderer.entity.EndCrystalRenderer -> dvb:
     17:17:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     17:17:boolean shouldRender(net.minecraft.world.entity.Entity,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
     18:20:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.EnderDragonRenderer -> dvc:
+net.minecraft.client.renderer.entity.EnderDragonRenderer -> egj:
     net.minecraft.resources.ResourceLocation CRYSTAL_BEAM_LOCATION -> a
     net.minecraft.resources.ResourceLocation DRAGON_EXPLODING_LOCATION -> e
     net.minecraft.resources.ResourceLocation DRAGON_LOCATION -> f
@@ -16234,17 +17321,17 @@ net.minecraft.client.renderer.entity.EnderDragonRenderer -> dvc:
     float HALF_SQRT_3 -> l
     net.minecraft.client.renderer.entity.EnderDragonRenderer$DragonModel model -> m
     33:38:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    42:134:void render(net.minecraft.world.entity.boss.enderdragon.EnderDragon,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    137:139:void vertex01(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,int) -> a
-    142:143:void vertex2(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,float,float) -> a
-    146:147:void vertex3(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,float,float) -> b
-    150:151:void vertex4(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,float,float) -> c
-    154:222:void renderCrystalBeams(float,float,float,float,int,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    226:226:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> a
+    42:131:void render(net.minecraft.world.entity.boss.enderdragon.EnderDragon,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    134:136:void vertex01(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,int) -> a
+    139:140:void vertex2(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,float,float) -> a
+    143:144:void vertex3(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,float,float) -> b
+    147:148:void vertex4(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,float,float) -> c
+    151:219:void renderCrystalBeams(float,float,float,float,int,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    223:223:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> a
     20:20:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     20:20:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     21:31:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.EnderDragonRenderer$DragonModel -> dvc$a:
+net.minecraft.client.renderer.entity.EnderDragonRenderer$DragonModel -> egj$a:
     net.minecraft.client.model.geom.ModelPart head -> a
     net.minecraft.client.model.geom.ModelPart neck -> b
     net.minecraft.client.model.geom.ModelPart jaw -> f
@@ -16267,14 +17354,14 @@ net.minecraft.client.renderer.entity.EnderDragonRenderer$DragonModel -> dvc$a:
     net.minecraft.client.model.geom.ModelPart rightRearFoot -> z
     net.minecraft.world.entity.boss.enderdragon.EnderDragon entity -> A
     float a -> B
-    262:362:void <init>() -> <init>
-    366:368:void prepareMobModel(net.minecraft.world.entity.boss.enderdragon.EnderDragon,float,float,float) -> a
-    372:372:void setupAnim(net.minecraft.world.entity.boss.enderdragon.EnderDragon,float,float,float,float,float) -> a
-    376:466:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
-    469:480:void renderSide(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart) -> a
-    229:229:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
-    229:229:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.EndermanRenderer -> dvd:
+    259:359:void <init>() -> <init>
+    363:365:void prepareMobModel(net.minecraft.world.entity.boss.enderdragon.EnderDragon,float,float,float) -> a
+    369:369:void setupAnim(net.minecraft.world.entity.boss.enderdragon.EnderDragon,float,float,float,float,float) -> a
+    373:463:void renderToBuffer(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,float,float,float) -> a
+    466:477:void renderSide(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,int,int,float,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart) -> a
+    226:226:void prepareMobModel(net.minecraft.world.entity.Entity,float,float,float) -> a
+    226:226:void setupAnim(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
+net.minecraft.client.renderer.entity.EndermanRenderer -> egk:
     net.minecraft.resources.ResourceLocation ENDERMAN_LOCATION -> a
     java.util.Random random -> g
     18:25:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
@@ -16285,17 +17372,17 @@ net.minecraft.client.renderer.entity.EndermanRenderer -> dvd:
     15:15:void render(net.minecraft.world.entity.LivingEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     15:15:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     15:15:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    15:15:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.Entity,float) -> b
+    15:15:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.Entity,float) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.EndermiteRenderer -> dve:
+net.minecraft.client.renderer.entity.EndermiteRenderer -> egl:
     net.minecraft.resources.ResourceLocation ENDERMITE_LOCATION -> a
     11:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     16:16:float getFlipDegrees(net.minecraft.world.entity.monster.Endermite) -> a
     21:21:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Endermite) -> b
-    7:7:float getFlipDegrees(net.minecraft.world.entity.LivingEntity) -> b
+    7:7:float getFlipDegrees(net.minecraft.world.entity.LivingEntity) -> c
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.EntityRenderDispatcher -> dvf:
+net.minecraft.client.renderer.entity.EntityRenderDispatcher -> egm:
     net.minecraft.client.renderer.RenderType SHADOW_RENDER_TYPE -> e
     java.util.Map renderers -> f
     java.util.Map playerRenderers -> g
@@ -16311,45 +17398,46 @@ net.minecraft.client.renderer.entity.EntityRenderDispatcher -> dvf:
     boolean renderHitBoxes -> m
     70:70:int getPackedLightCoords(net.minecraft.world.entity.Entity,float) -> a
     74:75:void register(net.minecraft.world.entity.EntityType,net.minecraft.client.renderer.entity.EntityRenderer) -> a
-    78:180:void registerRenderers(net.minecraft.client.renderer.entity.ItemRenderer,net.minecraft.server.packs.resources.ReloadableResourceManager) -> a
-    53:202:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.client.renderer.entity.ItemRenderer,net.minecraft.server.packs.resources.ReloadableResourceManager,net.minecraft.client.gui.Font,net.minecraft.client.Options) -> <init>
-    206:214:net.minecraft.client.renderer.entity.EntityRenderer getRenderer(net.minecraft.world.entity.Entity) -> a
-    218:222:void prepare(net.minecraft.world.level.Level,net.minecraft.client.Camera,net.minecraft.world.entity.Entity) -> a
-    225:226:void overrideCameraOrientation(com.mojang.math.Quaternion) -> a
-    229:230:void setRenderShadow(boolean) -> a
-    233:234:void setRenderHitBoxes(boolean) -> b
-    237:237:boolean shouldRenderHitBoxes() -> a
-    241:242:boolean shouldRender(net.minecraft.world.entity.Entity,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
-    246:289:void render(net.minecraft.world.entity.Entity,double,double,double,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    292:332:void renderHitbox(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.entity.Entity,float) -> a
-    335:337:void renderBox(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.entity.Entity,float,float,float) -> a
-    340:385:void renderFlame(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.entity.Entity) -> a
-    388:389:void fireVertex(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,float,float) -> a
-    392:418:void renderShadow(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.entity.Entity,float,float,net.minecraft.world.level.LevelReader,float) -> a
-    421:467:void renderBlockShadow(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,double,double,double,float,float) -> a
-    470:471:void shadowVertex(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,float,float,float) -> a
-    474:478:void setLevel(net.minecraft.world.level.Level) -> a
-    481:481:double distanceToSqr(net.minecraft.world.entity.Entity) -> b
-    485:485:double distanceToSqr(double,double,double) -> a
-    489:489:com.mojang.math.Quaternion cameraOrientation() -> b
-    493:493:net.minecraft.client.gui.Font getFont() -> c
+    78:184:void registerRenderers(net.minecraft.client.renderer.entity.ItemRenderer,net.minecraft.server.packs.resources.ReloadableResourceManager) -> a
+    53:206:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.client.renderer.entity.ItemRenderer,net.minecraft.server.packs.resources.ReloadableResourceManager,net.minecraft.client.gui.Font,net.minecraft.client.Options) -> <init>
+    210:218:net.minecraft.client.renderer.entity.EntityRenderer getRenderer(net.minecraft.world.entity.Entity) -> a
+    222:226:void prepare(net.minecraft.world.level.Level,net.minecraft.client.Camera,net.minecraft.world.entity.Entity) -> a
+    229:230:void overrideCameraOrientation(com.mojang.math.Quaternion) -> a
+    233:234:void setRenderShadow(boolean) -> a
+    237:238:void setRenderHitBoxes(boolean) -> b
+    241:241:boolean shouldRenderHitBoxes() -> a
+    245:246:boolean shouldRender(net.minecraft.world.entity.Entity,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
+    250:293:void render(net.minecraft.world.entity.Entity,double,double,double,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    296:336:void renderHitbox(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.entity.Entity,float) -> a
+    339:341:void renderBox(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.entity.Entity,float,float,float) -> a
+    344:389:void renderFlame(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.entity.Entity) -> a
+    392:393:void fireVertex(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,float,float) -> a
+    396:422:void renderShadow(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.entity.Entity,float,float,net.minecraft.world.level.LevelReader,float) -> a
+    425:471:void renderBlockShadow(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,double,double,double,float,float) -> a
+    474:475:void shadowVertex(com.mojang.blaze3d.vertex.PoseStack$Pose,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,float,float,float) -> a
+    478:482:void setLevel(net.minecraft.world.level.Level) -> a
+    485:485:double distanceToSqr(net.minecraft.world.entity.Entity) -> b
+    489:489:double distanceToSqr(double,double,double) -> a
+    493:493:com.mojang.math.Quaternion cameraOrientation() -> b
+    497:497:net.minecraft.client.gui.Font getFont() -> c
     51:51:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.EntityRenderer -> dvg:
+net.minecraft.client.renderer.entity.EntityRenderer -> egn:
     net.minecraft.client.renderer.entity.EntityRenderDispatcher entityRenderDispatcher -> b
     float shadowRadius -> c
     float shadowStrength -> d
-    24:28:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    31:31:int getPackedLightCoords(net.minecraft.world.entity.Entity,float) -> c
-    35:38:int getBlockLightLevel(net.minecraft.world.entity.Entity,float) -> a
-    42:52:boolean shouldRender(net.minecraft.world.entity.Entity,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
-    56:56:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.Entity,float) -> b
-    60:65:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    68:68:boolean shouldShowName(net.minecraft.world.entity.Entity) -> b
+    25:29:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    32:33:int getPackedLightCoords(net.minecraft.world.entity.Entity,float) -> b
+    37:37:int getSkyLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> b
+    41:44:int getBlockLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> a
+    48:58:boolean shouldRender(net.minecraft.world.entity.Entity,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
+    62:62:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.Entity,float) -> a
+    66:71:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    74:74:boolean shouldShowName(net.minecraft.world.entity.Entity) -> b
     net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    74:74:net.minecraft.client.gui.Font getFont() -> a
-    78:112:void renderNameTag(net.minecraft.world.entity.Entity,java.lang.String,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    115:115:net.minecraft.client.renderer.entity.EntityRenderDispatcher getDispatcher() -> b
-net.minecraft.client.renderer.entity.EvokerFangsRenderer -> dvh:
+    80:80:net.minecraft.client.gui.Font getFont() -> a
+    84:118:void renderNameTag(net.minecraft.world.entity.Entity,net.minecraft.network.chat.Component,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    121:121:net.minecraft.client.renderer.entity.EntityRenderDispatcher getDispatcher() -> b
+net.minecraft.client.renderer.entity.EvokerFangsRenderer -> ego:
     net.minecraft.resources.ResourceLocation TEXTURE_LOCATION -> a
     net.minecraft.client.model.EvokerFangsModel model -> e
     15:19:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
@@ -16358,56 +17446,56 @@ net.minecraft.client.renderer.entity.EvokerFangsRenderer -> dvh:
     12:12:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     12:12:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.EvokerRenderer -> dvi:
+net.minecraft.client.renderer.entity.EvokerRenderer -> egp:
     net.minecraft.resources.ResourceLocation EVOKER_ILLAGER -> a
     14:24:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     28:28:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.SpellcasterIllager) -> a
     10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.EvokerRenderer$1 -> dvi$1:
+net.minecraft.client.renderer.entity.EvokerRenderer$1 -> egp$1:
     net.minecraft.client.renderer.entity.EvokerRenderer this$0 -> a
     16:16:void <init>(net.minecraft.client.renderer.entity.EvokerRenderer,net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     19:22:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.monster.SpellcasterIllager,float,float,float,float,float,float) -> a
     16:16:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     16:16:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.ExperienceOrbRenderer -> dvj:
+net.minecraft.client.renderer.entity.ExperienceOrbRenderer -> egq:
     net.minecraft.resources.ResourceLocation EXPERIENCE_ORB_LOCATION -> a
     net.minecraft.client.renderer.RenderType RENDER_TYPE -> e
-    21:24:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    28:28:int getBlockLightLevel(net.minecraft.world.entity.ExperienceOrb,float) -> a
-    33:72:void render(net.minecraft.world.entity.ExperienceOrb,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    75:76:void vertex(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,com.mojang.math.Matrix3f,float,float,int,int,int,float,float,int) -> a
-    80:80:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.ExperienceOrb) -> a
-    16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    16:16:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    16:16:int getBlockLightLevel(net.minecraft.world.entity.Entity,float) -> a
-    17:18:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.FallingBlockRenderer -> dvk:
+    22:25:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    29:29:int getBlockLightLevel(net.minecraft.world.entity.ExperienceOrb,net.minecraft.core.BlockPos) -> a
+    34:73:void render(net.minecraft.world.entity.ExperienceOrb,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    76:77:void vertex(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,com.mojang.math.Matrix3f,float,float,int,int,int,float,float,int) -> a
+    81:81:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.ExperienceOrb) -> a
+    17:17:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    17:17:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    17:17:int getBlockLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> a
+    18:19:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.FallingBlockRenderer -> egr:
     21:23:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     27:50:void render(net.minecraft.world.entity.item.FallingBlockEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     54:54:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.item.FallingBlockEntity) -> a
     19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     19:19:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-net.minecraft.client.renderer.entity.FireworkEntityRenderer -> dvl:
+net.minecraft.client.renderer.entity.FireworkEntityRenderer -> egs:
     net.minecraft.client.renderer.entity.ItemRenderer itemRenderer -> a
     17:19:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.entity.ItemRenderer) -> <init>
     23:39:void render(net.minecraft.world.entity.projectile.FireworkRocketEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     43:43:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.projectile.FireworkRocketEntity) -> a
     13:13:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     13:13:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-net.minecraft.client.renderer.entity.FishingHookRenderer -> dvm:
+net.minecraft.client.renderer.entity.FishingHookRenderer -> egt:
     net.minecraft.resources.ResourceLocation TEXTURE_LOCATION -> a
     net.minecraft.client.renderer.RenderType RENDER_TYPE -> e
     26:27:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    31:122:void render(net.minecraft.world.entity.fishing.FishingHook,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    31:122:void render(net.minecraft.world.entity.projectile.FishingHook,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     125:125:float fraction(int,int) -> a
     129:130:void vertex(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,com.mojang.math.Matrix3f,int,float,int,int,int) -> a
     133:134:void stringVertex(float,float,float,com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,float) -> a
-    138:138:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.fishing.FishingHook) -> a
+    138:138:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.projectile.FishingHook) -> a
     21:21:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     21:21:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     22:23:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.FoxRenderer -> dvn:
+net.minecraft.client.renderer.entity.FoxRenderer -> egu:
     net.minecraft.resources.ResourceLocation RED_FOX_TEXTURE -> a
     net.minecraft.resources.ResourceLocation RED_FOX_SLEEP_TEXTURE -> g
     net.minecraft.resources.ResourceLocation SNOW_FOX_TEXTURE -> h
@@ -16418,7 +17506,7 @@ net.minecraft.client.renderer.entity.FoxRenderer -> dvn:
     11:11:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     11:11:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     12:15:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.GhastRenderer -> dvo:
+net.minecraft.client.renderer.entity.GhastRenderer -> egv:
     net.minecraft.resources.ResourceLocation GHAST_LOCATION -> a
     net.minecraft.resources.ResourceLocation GHAST_SHOOTING_LOCATION -> g
     13:14:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
@@ -16427,7 +17515,7 @@ net.minecraft.client.renderer.entity.GhastRenderer -> dvo:
     8:8:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:10:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.GiantMobRenderer -> dvp:
+net.minecraft.client.renderer.entity.GiantMobRenderer -> egw:
     net.minecraft.resources.ResourceLocation ZOMBIE_LOCATION -> a
     float scale -> g
     17:23:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,float) -> <init>
@@ -16436,7 +17524,7 @@ net.minecraft.client.renderer.entity.GiantMobRenderer -> dvp:
     11:11:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     11:11:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     12:12:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.GuardianRenderer -> dvq:
+net.minecraft.client.renderer.entity.GuardianRenderer -> egx:
     net.minecraft.resources.ResourceLocation GUARDIAN_LOCATION -> a
     net.minecraft.resources.ResourceLocation GUARDIAN_BEAM_LOCATION -> g
     net.minecraft.client.renderer.RenderType BEAM_RENDER_TYPE -> h
@@ -16454,19 +17542,29 @@ net.minecraft.client.renderer.entity.GuardianRenderer -> dvq:
     21:21:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     21:21:boolean shouldRender(net.minecraft.world.entity.Entity,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
     22:25:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.HorseRenderer -> dvr:
-    java.util.Map LAYERED_LOCATION_CACHE -> a
-    17:20:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    24:33:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.horse.Horse) -> a
-    13:13:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    14:14:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.HumanoidMobRenderer -> dvs:
+net.minecraft.client.renderer.entity.HoglinRenderer -> egy:
+    net.minecraft.resources.ResourceLocation HOGLIN_LOCATION -> a
+    11:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.hoglin.Hoglin) -> a
+    21:21:boolean isShaking(net.minecraft.world.entity.monster.hoglin.Hoglin) -> b
+    7:7:boolean isShaking(net.minecraft.world.entity.LivingEntity) -> a
+    7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.HorseRenderer -> egz:
+    java.util.Map LOCATION_BY_VARIANT -> a
+    26:30:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    34:34:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.horse.Horse) -> a
+    14:14:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    16:23:void lambda$static$0(java.util.EnumMap) -> a
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.HumanoidMobRenderer -> eha:
     net.minecraft.resources.ResourceLocation DEFAULT_LOCATION -> a
-    14:19:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.model.HumanoidModel,float) -> <init>
-    23:23:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
+    14:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.model.HumanoidModel,float) -> <init>
+    18:23:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.model.HumanoidModel,float,float,float,float) -> <init>
+    27:27:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
     10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.HuskRenderer -> dvt:
+net.minecraft.client.renderer.entity.HuskRenderer -> ehb:
     net.minecraft.resources.ResourceLocation HUSK_LOCATION -> a
     11:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     16:19:void scale(net.minecraft.world.entity.monster.Zombie,com.mojang.blaze3d.vertex.PoseStack,float) -> a
@@ -16475,29 +17573,29 @@ net.minecraft.client.renderer.entity.HuskRenderer -> dvt:
     7:7:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.IllagerRenderer -> dvu:
+net.minecraft.client.renderer.entity.IllagerRenderer -> ehc:
     10:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.model.IllagerModel,float) -> <init>
     16:18:void scale(net.minecraft.world.entity.monster.AbstractIllager,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     8:8:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-net.minecraft.client.renderer.entity.IllusionerRenderer -> dvv:
+net.minecraft.client.renderer.entity.IllusionerRenderer -> ehd:
     net.minecraft.resources.ResourceLocation ILLUSIONER -> a
     16:27:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     31:31:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Illusioner) -> a
     36:48:void render(net.minecraft.world.entity.monster.Illusioner,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     52:52:boolean isBodyVisible(net.minecraft.world.entity.monster.Illusioner) -> b
     12:12:void render(net.minecraft.world.entity.Mob,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    12:12:boolean isBodyVisible(net.minecraft.world.entity.LivingEntity) -> c
+    12:12:boolean isBodyVisible(net.minecraft.world.entity.LivingEntity) -> d
     12:12:void render(net.minecraft.world.entity.LivingEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     12:12:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     12:12:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.IllusionerRenderer$1 -> dvv$1:
+net.minecraft.client.renderer.entity.IllusionerRenderer$1 -> ehd$1:
     net.minecraft.client.renderer.entity.IllusionerRenderer this$0 -> a
     18:18:void <init>(net.minecraft.client.renderer.entity.IllusionerRenderer,net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:24:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.monster.Illusioner,float,float,float,float,float,float) -> a
     18:18:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     18:18:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.IronGolemRenderer -> dvw:
+net.minecraft.client.renderer.entity.IronGolemRenderer -> ehe:
     net.minecraft.resources.ResourceLocation GOLEM_LOCATION -> a
     15:18:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     22:22:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.IronGolem) -> a
@@ -16505,7 +17603,7 @@ net.minecraft.client.renderer.entity.IronGolemRenderer -> dvw:
     11:11:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     11:11:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     12:12:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ItemEntityRenderer -> dvx:
+net.minecraft.client.renderer.entity.ItemEntityRenderer -> ehf:
     net.minecraft.client.renderer.entity.ItemRenderer itemRenderer -> a
     java.util.Random random -> e
     29:37:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.entity.ItemRenderer) -> <init>
@@ -16514,54 +17612,59 @@ net.minecraft.client.renderer.entity.ItemEntityRenderer -> dvx:
     116:116:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.item.ItemEntity) -> a
     18:18:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     18:18:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-net.minecraft.client.renderer.entity.ItemFrameRenderer -> dvy:
+net.minecraft.client.renderer.entity.ItemFrameRenderer -> ehg:
     net.minecraft.client.resources.model.ModelResourceLocation FRAME_LOCATION -> a
     net.minecraft.client.resources.model.ModelResourceLocation MAP_FRAME_LOCATION -> e
     net.minecraft.client.Minecraft minecraft -> f
     net.minecraft.client.renderer.entity.ItemRenderer itemRenderer -> g
-    27:33:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.entity.ItemRenderer) -> <init>
-    37:88:void render(net.minecraft.world.entity.decoration.ItemFrame,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    92:92:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.decoration.ItemFrame,float) -> a
-    97:97:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.decoration.ItemFrame) -> a
-    102:109:boolean shouldShowName(net.minecraft.world.entity.decoration.ItemFrame) -> b
-    114:115:void renderNameTag(net.minecraft.world.entity.decoration.ItemFrame,java.lang.String,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    23:23:void renderNameTag(net.minecraft.world.entity.Entity,java.lang.String,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    23:23:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    23:23:boolean shouldShowName(net.minecraft.world.entity.Entity) -> b
-    23:23:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    23:23:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.Entity,float) -> b
-    24:25:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ItemRenderer -> dvz:
+    28:34:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.entity.ItemRenderer) -> <init>
+    38:96:void render(net.minecraft.world.entity.decoration.ItemFrame,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    100:100:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.decoration.ItemFrame,float) -> a
+    105:105:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.decoration.ItemFrame) -> a
+    110:117:boolean shouldShowName(net.minecraft.world.entity.decoration.ItemFrame) -> b
+    122:123:void renderNameTag(net.minecraft.world.entity.decoration.ItemFrame,net.minecraft.network.chat.Component,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    24:24:void renderNameTag(net.minecraft.world.entity.Entity,net.minecraft.network.chat.Component,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    24:24:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    24:24:boolean shouldShowName(net.minecraft.world.entity.Entity) -> b
+    24:24:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    24:24:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.Entity,float) -> a
+    25:26:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.ItemRenderer -> ehh:
     net.minecraft.resources.ResourceLocation ENCHANT_GLINT_LOCATION -> a
     java.util.Set IGNORED -> c
     float blitOffset -> b
     net.minecraft.client.renderer.ItemModelShaper itemModelShaper -> d
     net.minecraft.client.renderer.texture.TextureManager textureManager -> e
     net.minecraft.client.color.item.ItemColors itemColors -> f
-    68:78:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.client.resources.model.ModelManager,net.minecraft.client.color.item.ItemColors) -> <init>
-    81:81:net.minecraft.client.renderer.ItemModelShaper getItemModelShaper() -> a
-    86:94:void renderModelLists(net.minecraft.client.resources.model.BakedModel,net.minecraft.world.item.ItemStack,int,int,com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer) -> a
-    97:126:void render(net.minecraft.world.item.ItemStack,net.minecraft.client.renderer.block.model.ItemTransforms$TransformType,boolean,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int,net.minecraft.client.resources.model.BakedModel) -> a
-    129:135:com.mojang.blaze3d.vertex.VertexConsumer getFoilBuffer(net.minecraft.client.renderer.MultiBufferSource,net.minecraft.client.renderer.RenderType,boolean,boolean) -> a
-    139:154:void renderQuadList(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,java.util.List,net.minecraft.world.item.ItemStack,int,int) -> a
-    159:168:net.minecraft.client.resources.model.BakedModel getModel(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-    172:173:net.minecraft.client.resources.model.BakedModel resolveOverrides(net.minecraft.client.resources.model.BakedModel,net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-    177:178:void renderStatic(net.minecraft.world.item.ItemStack,net.minecraft.client.renderer.block.model.ItemTransforms$TransformType,int,int,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource) -> a
-    181:188:void renderStatic(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.client.renderer.block.model.ItemTransforms$TransformType,boolean,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.level.Level,int,int) -> a
-    191:192:void renderGuiItem(net.minecraft.world.item.ItemStack,int,int) -> a
-    195:234:void renderGuiItem(net.minecraft.world.item.ItemStack,int,int,net.minecraft.client.resources.model.BakedModel) -> a
-    237:238:void renderAndDecorateItem(net.minecraft.world.item.ItemStack,int,int) -> b
-    241:261:void renderAndDecorateItem(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,int,int) -> a
-    264:265:void renderGuiItemDecorations(net.minecraft.client.gui.Font,net.minecraft.world.item.ItemStack,int,int) -> a
-    268:327:void renderGuiItemDecorations(net.minecraft.client.gui.Font,net.minecraft.world.item.ItemStack,int,int,java.lang.String) -> a
-    330:336:void fillRect(com.mojang.blaze3d.vertex.BufferBuilder,int,int,int,int,int,int,int,int) -> a
-    340:341:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
-    255:255:java.lang.String lambda$renderAndDecorateItem$3(net.minecraft.world.item.ItemStack) -> a
-    254:254:java.lang.String lambda$renderAndDecorateItem$2(net.minecraft.world.item.ItemStack) -> b
-    253:253:java.lang.String lambda$renderAndDecorateItem$1(net.minecraft.world.item.ItemStack) -> c
-    252:252:java.lang.String lambda$renderAndDecorateItem$0(net.minecraft.world.item.ItemStack) -> d
-    55:57:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.LeashKnotRenderer -> dwa:
+    79:89:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.client.resources.model.ModelManager,net.minecraft.client.color.item.ItemColors) -> <init>
+    92:92:net.minecraft.client.renderer.ItemModelShaper getItemModelShaper() -> a
+    97:105:void renderModelLists(net.minecraft.client.resources.model.BakedModel,net.minecraft.world.item.ItemStack,int,int,com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer) -> a
+    108:164:void render(net.minecraft.world.item.ItemStack,net.minecraft.client.renderer.block.model.ItemTransforms$TransformType,boolean,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,int,net.minecraft.client.resources.model.BakedModel) -> a
+    167:173:com.mojang.blaze3d.vertex.VertexConsumer getArmorFoilBuffer(net.minecraft.client.renderer.MultiBufferSource,net.minecraft.client.renderer.RenderType,boolean,boolean) -> a
+    177:179:com.mojang.blaze3d.vertex.VertexConsumer getCompassFoilBuffer(net.minecraft.client.renderer.MultiBufferSource,net.minecraft.client.renderer.RenderType,com.mojang.blaze3d.vertex.PoseStack$Pose) -> a
+    184:186:com.mojang.blaze3d.vertex.VertexConsumer getCompassFoilBufferDirect(net.minecraft.client.renderer.MultiBufferSource,net.minecraft.client.renderer.RenderType,com.mojang.blaze3d.vertex.PoseStack$Pose) -> b
+    191:197:com.mojang.blaze3d.vertex.VertexConsumer getFoilBuffer(net.minecraft.client.renderer.MultiBufferSource,net.minecraft.client.renderer.RenderType,boolean,boolean) -> b
+    201:207:com.mojang.blaze3d.vertex.VertexConsumer getFoilBufferDirect(net.minecraft.client.renderer.MultiBufferSource,net.minecraft.client.renderer.RenderType,boolean,boolean) -> c
+    211:226:void renderQuadList(com.mojang.blaze3d.vertex.PoseStack,com.mojang.blaze3d.vertex.VertexConsumer,java.util.List,net.minecraft.world.item.ItemStack,int,int) -> a
+    231:242:net.minecraft.client.resources.model.BakedModel getModel(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
+    246:247:void renderStatic(net.minecraft.world.item.ItemStack,net.minecraft.client.renderer.block.model.ItemTransforms$TransformType,int,int,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource) -> a
+    250:257:void renderStatic(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.client.renderer.block.model.ItemTransforms$TransformType,boolean,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.level.Level,int,int) -> a
+    260:261:void renderGuiItem(net.minecraft.world.item.ItemStack,int,int) -> a
+    264:303:void renderGuiItem(net.minecraft.world.item.ItemStack,int,int,net.minecraft.client.resources.model.BakedModel) -> a
+    306:307:void renderAndDecorateItem(net.minecraft.world.item.ItemStack,int,int) -> b
+    310:311:void renderAndDecorateFakeItem(net.minecraft.world.item.ItemStack,int,int) -> c
+    314:315:void renderAndDecorateItem(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,int,int) -> a
+    318:338:void tryRenderGuiItem(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,int,int) -> b
+    341:342:void renderGuiItemDecorations(net.minecraft.client.gui.Font,net.minecraft.world.item.ItemStack,int,int) -> a
+    345:404:void renderGuiItemDecorations(net.minecraft.client.gui.Font,net.minecraft.world.item.ItemStack,int,int,java.lang.String) -> a
+    407:413:void fillRect(com.mojang.blaze3d.vertex.BufferBuilder,int,int,int,int,int,int,int,int) -> a
+    417:418:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
+    332:332:java.lang.String lambda$tryRenderGuiItem$3(net.minecraft.world.item.ItemStack) -> a
+    331:331:java.lang.String lambda$tryRenderGuiItem$2(net.minecraft.world.item.ItemStack) -> b
+    330:330:java.lang.String lambda$tryRenderGuiItem$1(net.minecraft.world.item.ItemStack) -> c
+    329:329:java.lang.String lambda$tryRenderGuiItem$0(net.minecraft.world.item.ItemStack) -> d
+    59:61:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.LeashKnotRenderer -> ehi:
     net.minecraft.resources.ResourceLocation KNOT_LOCATION -> a
     net.minecraft.client.model.LeashKnotModel model -> e
     14:18:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
@@ -16570,14 +17673,14 @@ net.minecraft.client.renderer.entity.LeashKnotRenderer -> dwa:
     11:11:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     12:12:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.LightningBoltRenderer -> dwb:
+net.minecraft.client.renderer.entity.LightningBoltRenderer -> ehj:
     16:17:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    21:83:void render(net.minecraft.world.entity.global.LightningBolt,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    21:83:void render(net.minecraft.world.entity.LightningBolt,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     86:125:void quad(com.mojang.math.Matrix4f,com.mojang.blaze3d.vertex.VertexConsumer,float,float,int,float,float,float,float,float,float,float,boolean,boolean,boolean,boolean) -> a
-    129:129:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.global.LightningBolt) -> a
+    129:129:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.LightningBolt) -> a
     14:14:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     14:14:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-net.minecraft.client.renderer.entity.LivingEntityRenderer -> dwc:
+net.minecraft.client.renderer.entity.LivingEntityRenderer -> ehk:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.client.model.EntityModel model -> e
     java.util.List layers -> f
@@ -16585,31 +17688,32 @@ net.minecraft.client.renderer.entity.LivingEntityRenderer -> dwc:
     44:44:boolean addLayer(net.minecraft.client.renderer.entity.layers.RenderLayer) -> a
     49:49:net.minecraft.client.model.EntityModel getModel() -> c
     54:145:void render(net.minecraft.world.entity.LivingEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    149:159:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.entity.LivingEntity,boolean,boolean) -> a
+    149:159:net.minecraft.client.renderer.RenderType getRenderType(net.minecraft.world.entity.LivingEntity,boolean,boolean,boolean) -> a
     163:163:int getOverlayCoords(net.minecraft.world.entity.LivingEntity,float) -> c
-    167:167:boolean isBodyVisible(net.minecraft.world.entity.LivingEntity) -> c
+    167:167:boolean isBodyVisible(net.minecraft.world.entity.LivingEntity) -> d
     171:181:float sleepDirectionToRotation(net.minecraft.core.Direction) -> a
-    186:217:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
-    220:220:float getAttackAnim(net.minecraft.world.entity.LivingEntity,float) -> d
-    224:224:float getBob(net.minecraft.world.entity.LivingEntity,float) -> a
-    228:228:float getFlipDegrees(net.minecraft.world.entity.LivingEntity) -> b
-    232:232:float getWhiteOverlayProgress(net.minecraft.world.entity.LivingEntity,float) -> b
-    236:236:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    240:267:boolean shouldShowName(net.minecraft.world.entity.LivingEntity) -> a
+    186:186:boolean isShaking(net.minecraft.world.entity.LivingEntity) -> a
+    190:225:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
+    228:228:float getAttackAnim(net.minecraft.world.entity.LivingEntity,float) -> d
+    232:232:float getBob(net.minecraft.world.entity.LivingEntity,float) -> a
+    236:236:float getFlipDegrees(net.minecraft.world.entity.LivingEntity) -> c
+    240:240:float getWhiteOverlayProgress(net.minecraft.world.entity.LivingEntity,float) -> b
+    244:244:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    248:275:boolean shouldShowName(net.minecraft.world.entity.LivingEntity) -> b
     29:29:boolean shouldShowName(net.minecraft.world.entity.Entity) -> b
     29:29:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     30:30:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.LivingEntityRenderer$1 -> dwc$1:
+net.minecraft.client.renderer.entity.LivingEntityRenderer$1 -> ehk$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     int[] $SwitchMap$net$minecraft$world$scores$Team$Visibility -> b
-    171:254:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.LlamaRenderer -> dwd:
+    171:262:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.LlamaRenderer -> ehl:
     net.minecraft.resources.ResourceLocation[] LLAMA_LOCATIONS -> a
     17:20:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     24:24:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.horse.Llama) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.LlamaSpitRenderer -> dwe:
+net.minecraft.client.renderer.entity.LlamaSpitRenderer -> ehm:
     net.minecraft.resources.ResourceLocation LLAMA_SPIT_LOCATION -> a
     net.minecraft.client.model.LlamaSpitModel model -> e
     16:20:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
@@ -16618,17 +17722,17 @@ net.minecraft.client.renderer.entity.LlamaSpitRenderer -> dwe:
     13:13:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     13:13:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.MagmaCubeRenderer -> dwf:
+net.minecraft.client.renderer.entity.MagmaCubeRenderer -> ehn:
     net.minecraft.resources.ResourceLocation MAGMACUBE_LOCATION -> a
-    14:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    19:19:int getBlockLightLevel(net.minecraft.world.entity.monster.MagmaCube,float) -> a
-    24:24:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.MagmaCube) -> a
-    29:33:void scale(net.minecraft.world.entity.monster.MagmaCube,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    10:10:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    10:10:int getBlockLightLevel(net.minecraft.world.entity.Entity,float) -> a
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.MinecartRenderer -> dwg:
+    15:16:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    20:20:int getBlockLightLevel(net.minecraft.world.entity.monster.MagmaCube,net.minecraft.core.BlockPos) -> a
+    25:25:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.MagmaCube) -> a
+    30:34:void scale(net.minecraft.world.entity.monster.MagmaCube,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    11:11:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    11:11:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    11:11:int getBlockLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> a
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.MinecartRenderer -> eho:
     net.minecraft.resources.ResourceLocation MINECART_LOCATION -> e
     net.minecraft.client.model.EntityModel model -> a
     21:26:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
@@ -16638,33 +17742,33 @@ net.minecraft.client.renderer.entity.MinecartRenderer -> dwg:
     18:18:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     18:18:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.MobRenderer -> dwh:
-    20:21:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.model.EntityModel,float) -> <init>
-    25:25:boolean shouldShowName(net.minecraft.world.entity.Mob) -> b
-    30:38:boolean shouldRender(net.minecraft.world.entity.Mob,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
-    43:51:void render(net.minecraft.world.entity.Mob,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    54:105:void renderLeash(net.minecraft.world.entity.Mob,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.entity.Entity) -> a
-    108:119:void renderSide(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,float,float,float,int,int,int,int,float,float,float,float) -> a
-    122:143:void addVertexPair(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,int,float,float,float,float,float,int,int,boolean,float,float) -> a
-    18:18:boolean shouldShowName(net.minecraft.world.entity.LivingEntity) -> a
-    18:18:void render(net.minecraft.world.entity.LivingEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    18:18:boolean shouldShowName(net.minecraft.world.entity.Entity) -> b
-    18:18:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    18:18:boolean shouldRender(net.minecraft.world.entity.Entity,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
-net.minecraft.client.renderer.entity.MushroomCowRenderer -> dwi:
+net.minecraft.client.renderer.entity.MobRenderer -> ehp:
+    21:22:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.model.EntityModel,float) -> <init>
+    26:26:boolean shouldShowName(net.minecraft.world.entity.Mob) -> b
+    31:39:boolean shouldRender(net.minecraft.world.entity.Mob,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
+    44:52:void render(net.minecraft.world.entity.Mob,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    55:111:void renderLeash(net.minecraft.world.entity.Mob,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.entity.Entity) -> a
+    114:125:void renderSide(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,float,float,float,int,int,int,int,float,float,float,float) -> a
+    128:149:void addVertexPair(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,int,float,float,float,float,float,int,int,boolean,float,float) -> a
+    19:19:boolean shouldShowName(net.minecraft.world.entity.LivingEntity) -> b
+    19:19:void render(net.minecraft.world.entity.LivingEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    19:19:boolean shouldShowName(net.minecraft.world.entity.Entity) -> b
+    19:19:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    19:19:boolean shouldRender(net.minecraft.world.entity.Entity,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
+net.minecraft.client.renderer.entity.MushroomCowRenderer -> ehq:
     java.util.Map TEXTURES -> a
     19:22:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     26:26:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.MushroomCow) -> a
     12:12:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     14:16:void lambda$static$0(java.util.HashMap) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.OcelotRenderer -> dwj:
+net.minecraft.client.renderer.entity.OcelotRenderer -> ehr:
     net.minecraft.resources.ResourceLocation CAT_OCELOT_LOCATION -> a
     11:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Ocelot) -> a
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.PaintingRenderer -> dwk:
+net.minecraft.client.renderer.entity.PaintingRenderer -> ehs:
     25:26:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     30:45:void render(net.minecraft.world.entity.decoration.Painting,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     49:49:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.decoration.Painting) -> a
@@ -16672,7 +17776,7 @@ net.minecraft.client.renderer.entity.PaintingRenderer -> dwk:
     152:153:void vertex(com.mojang.math.Matrix4f,com.mojang.math.Matrix3f,com.mojang.blaze3d.vertex.VertexConsumer,float,float,float,float,float,int,int,int,int) -> a
     23:23:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     23:23:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-net.minecraft.client.renderer.entity.PandaRenderer -> dwl:
+net.minecraft.client.renderer.entity.PandaRenderer -> eht:
     java.util.Map TEXTURES -> a
     27:30:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     34:34:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Panda) -> a
@@ -16682,7 +17786,7 @@ net.minecraft.client.renderer.entity.PandaRenderer -> dwl:
     15:15:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     17:24:void lambda$static$0(java.util.EnumMap) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ParrotRenderer -> dwm:
+net.minecraft.client.renderer.entity.ParrotRenderer -> ehu:
     net.minecraft.resources.ResourceLocation[] PARROT_LOCATIONS -> a
     18:19:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     23:23:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Parrot) -> a
@@ -16690,7 +17794,7 @@ net.minecraft.client.renderer.entity.ParrotRenderer -> dwm:
     8:8:float getBob(net.minecraft.world.entity.LivingEntity,float) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.PhantomRenderer -> dwn:
+net.minecraft.client.renderer.entity.PhantomRenderer -> ehv:
     net.minecraft.resources.ResourceLocation PHANTOM_LOCATION -> a
     14:17:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     21:21:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Phantom) -> a
@@ -16700,26 +17804,29 @@ net.minecraft.client.renderer.entity.PhantomRenderer -> dwn:
     10:10:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.PigRenderer -> dwo:
+net.minecraft.client.renderer.entity.PigRenderer -> ehw:
     net.minecraft.resources.ResourceLocation PIG_LOCATION -> a
     12:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Pig) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.PigZombieRenderer -> dwp:
-    net.minecraft.resources.ResourceLocation ZOMBIE_PIGMAN_LOCATION -> a
-    12:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.PigZombie) -> a
-    8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
-    8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.PillagerRenderer -> dwq:
+net.minecraft.client.renderer.entity.PiglinRenderer -> ehx:
+    net.minecraft.resources.ResourceLocation PIGLIN_LOCATION -> a
+    net.minecraft.resources.ResourceLocation ZOMBIFIED_PIGLIN_LOCATION -> g
+    18:21:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,boolean) -> <init>
+    24:28:net.minecraft.client.model.PiglinModel createModel(boolean) -> a
+    33:33:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
+    38:38:boolean isShaking(net.minecraft.world.entity.Mob) -> c
+    10:10:boolean isShaking(net.minecraft.world.entity.LivingEntity) -> a
+    10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    11:12:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.PillagerRenderer -> ehy:
     net.minecraft.resources.ResourceLocation PILLAGER -> a
     12:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Pillager) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.PolarBearRenderer -> dwr:
+net.minecraft.client.renderer.entity.PolarBearRenderer -> ehz:
     net.minecraft.resources.ResourceLocation BEAR_LOCATION -> a
     12:13:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     17:17:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.PolarBear) -> a
@@ -16727,7 +17834,7 @@ net.minecraft.client.renderer.entity.PolarBearRenderer -> dwr:
     8:8:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.PufferfishRenderer -> dws:
+net.minecraft.client.renderer.entity.PufferfishRenderer -> eia:
     net.minecraft.resources.ResourceLocation PUFFER_LOCATION -> a
     int puffStateO -> g
     net.minecraft.client.model.PufferfishSmallModel small -> h
@@ -16743,7 +17850,7 @@ net.minecraft.client.renderer.entity.PufferfishRenderer -> dws:
     13:13:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     13:13:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.RabbitRenderer -> dwt:
+net.minecraft.client.renderer.entity.RabbitRenderer -> eib:
     net.minecraft.resources.ResourceLocation RABBIT_BROWN_LOCATION -> a
     net.minecraft.resources.ResourceLocation RABBIT_WHITE_LOCATION -> g
     net.minecraft.resources.ResourceLocation RABBIT_BLACK_LOCATION -> h
@@ -16756,16 +17863,16 @@ net.minecraft.client.renderer.entity.RabbitRenderer -> dwt:
     24:44:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Rabbit) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:16:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.RavagerRenderer -> dwu:
+net.minecraft.client.renderer.entity.RavagerRenderer -> eic:
     net.minecraft.resources.ResourceLocation TEXTURE_LOCATION -> a
     11:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Ravager) -> a
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.RenderLayerParent -> dwv:
+net.minecraft.client.renderer.entity.RenderLayerParent -> eid:
     net.minecraft.client.model.EntityModel getModel() -> c
     net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-net.minecraft.client.renderer.entity.SalmonRenderer -> dww:
+net.minecraft.client.renderer.entity.SalmonRenderer -> eie:
     net.minecraft.resources.ResourceLocation SALMON_LOCATION -> a
     14:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Salmon) -> a
@@ -16773,25 +17880,25 @@ net.minecraft.client.renderer.entity.SalmonRenderer -> dww:
     10:10:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.SheepRenderer -> dwx:
+net.minecraft.client.renderer.entity.SheepRenderer -> eif:
     net.minecraft.resources.ResourceLocation SHEEP_LOCATION -> a
     12:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Sheep) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ShulkerBulletRenderer -> dwy:
+net.minecraft.client.renderer.entity.ShulkerBulletRenderer -> eig:
     net.minecraft.resources.ResourceLocation TEXTURE_LOCATION -> a
     net.minecraft.client.renderer.RenderType RENDER_TYPE -> e
     net.minecraft.client.model.ShulkerBulletModel model -> f
-    19:23:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    27:27:int getBlockLightLevel(net.minecraft.world.entity.projectile.ShulkerBullet,float) -> a
-    32:58:void render(net.minecraft.world.entity.projectile.ShulkerBullet,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    62:62:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.projectile.ShulkerBullet) -> a
-    15:15:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    15:15:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    15:15:int getBlockLightLevel(net.minecraft.world.entity.Entity,float) -> a
-    16:17:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ShulkerRenderer -> dwz:
+    20:24:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    28:28:int getBlockLightLevel(net.minecraft.world.entity.projectile.ShulkerBullet,net.minecraft.core.BlockPos) -> a
+    33:59:void render(net.minecraft.world.entity.projectile.ShulkerBullet,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    63:63:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.projectile.ShulkerBullet) -> a
+    16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    16:16:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    16:16:int getBlockLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> a
+    17:18:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.ShulkerRenderer -> eih:
     net.minecraft.resources.ResourceLocation DEFAULT_TEXTURE_LOCATION -> a
     net.minecraft.resources.ResourceLocation[] TEXTURE_LOCATION -> g
     19:22:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
@@ -16799,32 +17906,30 @@ net.minecraft.client.renderer.entity.ShulkerRenderer -> dwz:
     45:57:boolean shouldRender(net.minecraft.world.entity.monster.Shulker,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
     62:65:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Shulker) -> a
     70:75:void setupRotations(net.minecraft.world.entity.monster.Shulker,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
-    80:82:void scale(net.minecraft.world.entity.monster.Shulker,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     14:14:boolean shouldRender(net.minecraft.world.entity.Mob,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
-    14:14:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     14:14:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     14:14:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    14:14:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.Entity,float) -> b
+    14:14:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.Entity,float) -> a
     14:14:boolean shouldRender(net.minecraft.world.entity.Entity,net.minecraft.client.renderer.culling.Frustum,double,double,double) -> a
     16:16:net.minecraft.resources.ResourceLocation[] lambda$static$1(int) -> a
     16:16:net.minecraft.resources.ResourceLocation lambda$static$0(net.minecraft.client.resources.model.Material) -> a
     15:16:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.SilverfishRenderer -> dxa:
+net.minecraft.client.renderer.entity.SilverfishRenderer -> eii:
     net.minecraft.resources.ResourceLocation SILVERFISH_LOCATION -> a
     11:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     16:16:float getFlipDegrees(net.minecraft.world.entity.monster.Silverfish) -> a
     21:21:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Silverfish) -> b
-    7:7:float getFlipDegrees(net.minecraft.world.entity.LivingEntity) -> b
+    7:7:float getFlipDegrees(net.minecraft.world.entity.LivingEntity) -> c
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.SkeletonRenderer -> dxb:
+net.minecraft.client.renderer.entity.SkeletonRenderer -> eij:
     net.minecraft.resources.ResourceLocation SKELETON_LOCATION -> a
-    13:17:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    21:21:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.AbstractSkeleton) -> a
-    9:9:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
-    9:9:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    10:10:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.SlimeRenderer -> dxc:
+    12:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.AbstractSkeleton) -> a
+    8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
+    8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.SlimeRenderer -> eik:
     net.minecraft.resources.ResourceLocation SLIME_LOCATION -> a
     15:18:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     22:24:void render(net.minecraft.world.entity.monster.Slime,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
@@ -16836,27 +17941,27 @@ net.minecraft.client.renderer.entity.SlimeRenderer -> dxc:
     11:11:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     12:12:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.SnowGolemRenderer -> dxd:
+net.minecraft.client.renderer.entity.SnowGolemRenderer -> eil:
     net.minecraft.resources.ResourceLocation SNOW_GOLEM_LOCATION -> a
     12:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.SnowGolem) -> a
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.SpectralArrowRenderer -> dxe:
+net.minecraft.client.renderer.entity.SpectralArrowRenderer -> eim:
     net.minecraft.resources.ResourceLocation SPECTRAL_ARROW_LOCATION -> a
     10:11:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     15:15:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.projectile.SpectralArrow) -> a
     6:6:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     7:7:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.SpiderRenderer -> dxf:
+net.minecraft.client.renderer.entity.SpiderRenderer -> ein:
     net.minecraft.resources.ResourceLocation SPIDER_LOCATION -> a
     12:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     19:19:float getFlipDegrees(net.minecraft.world.entity.monster.Spider) -> b
     24:24:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Spider) -> a
-    8:8:float getFlipDegrees(net.minecraft.world.entity.LivingEntity) -> b
+    8:8:float getFlipDegrees(net.minecraft.world.entity.LivingEntity) -> c
     8:8:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.SquidRenderer -> dxg:
+net.minecraft.client.renderer.entity.SquidRenderer -> eio:
     net.minecraft.resources.ResourceLocation SQUID_LOCATION -> a
     14:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     19:19:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Squid) -> a
@@ -16866,23 +17971,34 @@ net.minecraft.client.renderer.entity.SquidRenderer -> dxg:
     10:10:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
     10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.StrayRenderer -> dxh:
+net.minecraft.client.renderer.entity.StrayRenderer -> eip:
     net.minecraft.resources.ResourceLocation STRAY_SKELETON_LOCATION -> a
     11:14:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     18:18:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.AbstractSkeleton) -> a
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ThrownItemRenderer -> dxi:
+net.minecraft.client.renderer.entity.StriderRenderer -> eiq:
+    net.minecraft.resources.ResourceLocation STRIDER_LOCATION -> a
+    net.minecraft.resources.ResourceLocation COLD_LOCATION -> g
+    14:17:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    21:21:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Strider) -> a
+    27:35:void scale(net.minecraft.world.entity.monster.Strider,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    39:39:boolean isShaking(net.minecraft.world.entity.monster.Strider) -> b
+    9:9:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    9:9:boolean isShaking(net.minecraft.world.entity.LivingEntity) -> a
+    9:9:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    10:11:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.ThrownItemRenderer -> eir:
     net.minecraft.client.renderer.entity.ItemRenderer itemRenderer -> a
     float scale -> e
     boolean fullBright -> f
-    20:24:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.entity.ItemRenderer,float,boolean) -> <init>
-    27:28:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.entity.ItemRenderer) -> <init>
-    32:32:int getBlockLightLevel(net.minecraft.world.entity.Entity,float) -> a
-    37:49:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    53:53:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-net.minecraft.client.renderer.entity.ThrownTridentRenderer -> dxj:
+    23:27:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.entity.ItemRenderer,float,boolean) -> <init>
+    30:31:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.client.renderer.entity.ItemRenderer) -> <init>
+    35:35:int getBlockLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> a
+    40:56:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    60:60:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+net.minecraft.client.renderer.entity.ThrownTridentRenderer -> eis:
     net.minecraft.resources.ResourceLocation TRIDENT_LOCATION -> a
     net.minecraft.client.model.TridentModel model -> e
     16:20:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
@@ -16891,25 +18007,25 @@ net.minecraft.client.renderer.entity.ThrownTridentRenderer -> dxj:
     13:13:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     13:13:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.TippableArrowRenderer -> dxk:
+net.minecraft.client.renderer.entity.TippableArrowRenderer -> eit:
     net.minecraft.resources.ResourceLocation NORMAL_ARROW_LOCATION -> a
     net.minecraft.resources.ResourceLocation TIPPED_ARROW_LOCATION -> e
     11:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.projectile.Arrow) -> a
     6:6:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     7:8:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.TntMinecartRenderer -> dxl:
+net.minecraft.client.renderer.entity.TntMinecartRenderer -> eiu:
     13:14:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     18:32:void renderMinecartContents(net.minecraft.world.entity.vehicle.MinecartTNT,float,net.minecraft.world.level.block.state.BlockState,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     37:44:void renderWhiteSolidBlock(net.minecraft.world.level.block.state.BlockState,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,boolean) -> a
     11:11:void renderMinecartContents(net.minecraft.world.entity.vehicle.AbstractMinecart,float,net.minecraft.world.level.block.state.BlockState,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-net.minecraft.client.renderer.entity.TntRenderer -> dxm:
+net.minecraft.client.renderer.entity.TntRenderer -> eiv:
     14:16:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     20:40:void render(net.minecraft.world.entity.item.PrimedTnt,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     44:44:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.item.PrimedTnt) -> a
     12:12:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     12:12:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-net.minecraft.client.renderer.entity.TropicalFishRenderer -> dxn:
+net.minecraft.client.renderer.entity.TropicalFishRenderer -> eiw:
     net.minecraft.client.model.TropicalFishModelA modelA -> a
     net.minecraft.client.model.TropicalFishModelB modelB -> g
     16:23:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
@@ -16921,7 +18037,7 @@ net.minecraft.client.renderer.entity.TropicalFishRenderer -> dxn:
     15:15:void render(net.minecraft.world.entity.LivingEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     15:15:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     15:15:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-net.minecraft.client.renderer.entity.TurtleRenderer -> dxo:
+net.minecraft.client.renderer.entity.TurtleRenderer -> eix:
     net.minecraft.resources.ResourceLocation TURTLE_LOCATION -> a
     13:14:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     19:23:void render(net.minecraft.world.entity.animal.Turtle,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
@@ -16931,25 +18047,25 @@ net.minecraft.client.renderer.entity.TurtleRenderer -> dxo:
     9:9:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     9:9:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     10:10:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.UndeadHorseRenderer -> dxp:
+net.minecraft.client.renderer.entity.UndeadHorseRenderer -> eiy:
     java.util.Map MAP -> a
     19:20:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     24:24:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.horse.AbstractHorse) -> a
     12:12:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.VexRenderer -> dxq:
+net.minecraft.client.renderer.entity.VexRenderer -> eiz:
     net.minecraft.resources.ResourceLocation VEX_LOCATION -> a
     net.minecraft.resources.ResourceLocation VEX_CHARGING_LOCATION -> g
-    14:15:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    19:19:int getBlockLightLevel(net.minecraft.world.entity.monster.Vex,float) -> a
-    24:27:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Vex) -> a
-    32:33:void scale(net.minecraft.world.entity.monster.Vex,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    9:9:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
-    9:9:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    9:9:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    9:9:int getBlockLightLevel(net.minecraft.world.entity.Entity,float) -> a
-    10:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.VillagerRenderer -> dxr:
+    15:16:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    20:20:int getBlockLightLevel(net.minecraft.world.entity.monster.Vex,net.minecraft.core.BlockPos) -> a
+    25:28:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Vex) -> a
+    33:34:void scale(net.minecraft.world.entity.monster.Vex,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
+    10:10:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    10:10:int getBlockLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> a
+    11:12:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.VillagerRenderer -> eja:
     net.minecraft.resources.ResourceLocation VILLAGER_BASE_SKIN -> a
     16:21:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.server.packs.resources.ReloadableResourceManager) -> <init>
     25:25:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.npc.Villager) -> a
@@ -16957,19 +18073,19 @@ net.minecraft.client.renderer.entity.VillagerRenderer -> dxr:
     12:12:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     12:12:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.VindicatorRenderer -> dxs:
+net.minecraft.client.renderer.entity.VindicatorRenderer -> ejb:
     net.minecraft.resources.ResourceLocation VINDICATOR -> a
     14:24:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     28:28:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Vindicator) -> a
     10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.VindicatorRenderer$1 -> dxs$1:
+net.minecraft.client.renderer.entity.VindicatorRenderer$1 -> ejb$1:
     net.minecraft.client.renderer.entity.VindicatorRenderer this$0 -> a
     16:16:void <init>(net.minecraft.client.renderer.entity.VindicatorRenderer,net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     19:22:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.monster.Vindicator,float,float,float,float,float,float) -> a
     16:16:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     16:16:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.WanderingTraderRenderer -> dxt:
+net.minecraft.client.renderer.entity.WanderingTraderRenderer -> ejc:
     net.minecraft.resources.ResourceLocation VILLAGER_BASE_SKIN -> a
     14:18:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     22:22:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.npc.WanderingTrader) -> a
@@ -16977,7 +18093,7 @@ net.minecraft.client.renderer.entity.WanderingTraderRenderer -> dxt:
     10:10:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.WitchRenderer -> dxu:
+net.minecraft.client.renderer.entity.WitchRenderer -> ejd:
     net.minecraft.resources.ResourceLocation WITCH_LOCATION -> a
     14:17:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     21:24:void render(net.minecraft.world.entity.monster.Witch,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
@@ -16989,18 +18105,18 @@ net.minecraft.client.renderer.entity.WitchRenderer -> dxu:
     10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     10:10:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.WitherBossRenderer -> dxv:
+net.minecraft.client.renderer.entity.WitherBossRenderer -> eje:
     net.minecraft.resources.ResourceLocation WITHER_INVULNERABLE_LOCATION -> a
     net.minecraft.resources.ResourceLocation WITHER_LOCATION -> g
-    16:19:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    23:23:int getBlockLightLevel(net.minecraft.world.entity.boss.wither.WitherBoss,float) -> a
-    28:32:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.boss.wither.WitherBoss) -> a
-    37:45:void scale(net.minecraft.world.entity.boss.wither.WitherBoss,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    11:11:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    11:11:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    11:11:int getBlockLightLevel(net.minecraft.world.entity.Entity,float) -> a
-    12:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.WitherSkeletonRenderer -> dxw:
+    17:20:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    24:24:int getBlockLightLevel(net.minecraft.world.entity.boss.wither.WitherBoss,net.minecraft.core.BlockPos) -> a
+    29:33:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.boss.wither.WitherBoss) -> a
+    38:46:void scale(net.minecraft.world.entity.boss.wither.WitherBoss,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    12:12:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    12:12:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    12:12:int getBlockLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> a
+    13:14:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.WitherSkeletonRenderer -> ejf:
     net.minecraft.resources.ResourceLocation WITHER_SKELETON_LOCATION -> a
     11:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
     16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.AbstractSkeleton) -> a
@@ -17009,87 +18125,78 @@ net.minecraft.client.renderer.entity.WitherSkeletonRenderer -> dxw:
     7:7:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
     7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.WitherSkullRenderer -> dxx:
+net.minecraft.client.renderer.entity.WitherSkullRenderer -> ejg:
     net.minecraft.resources.ResourceLocation WITHER_INVULNERABLE_LOCATION -> a
     net.minecraft.resources.ResourceLocation WITHER_LOCATION -> e
     net.minecraft.client.model.SkullModel model -> f
-    17:21:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    25:25:int getBlockLightLevel(net.minecraft.world.entity.projectile.WitherSkull,float) -> a
-    30:44:void render(net.minecraft.world.entity.projectile.WitherSkull,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    48:48:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.projectile.WitherSkull) -> a
-    13:13:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    13:13:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    13:13:int getBlockLightLevel(net.minecraft.world.entity.Entity,float) -> a
-    14:15:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.WolfRenderer -> dxy:
+    18:22:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    26:26:int getBlockLightLevel(net.minecraft.world.entity.projectile.WitherSkull,net.minecraft.core.BlockPos) -> a
+    31:45:void render(net.minecraft.world.entity.projectile.WitherSkull,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    49:49:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.projectile.WitherSkull) -> a
+    14:14:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    14:14:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    14:14:int getBlockLightLevel(net.minecraft.world.entity.Entity,net.minecraft.core.BlockPos) -> a
+    15:16:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.WolfRenderer -> ejh:
     net.minecraft.resources.ResourceLocation WOLF_LOCATION -> a
     net.minecraft.resources.ResourceLocation WOLF_TAME_LOCATION -> g
     net.minecraft.resources.ResourceLocation WOLF_ANGRY_LOCATION -> h
-    16:19:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    23:23:float getBob(net.minecraft.world.entity.animal.Wolf,float) -> a
-    29:39:void render(net.minecraft.world.entity.animal.Wolf,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    43:49:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Wolf) -> a
-    10:10:void render(net.minecraft.world.entity.Mob,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    10:10:float getBob(net.minecraft.world.entity.LivingEntity,float) -> a
-    10:10:void render(net.minecraft.world.entity.LivingEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    10:10:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    11:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.ZombieRenderer -> dxz:
-    8:9:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-net.minecraft.client.renderer.entity.ZombieVillagerRenderer -> dya:
-    net.minecraft.resources.ResourceLocation ZOMBIE_VILLAGER_LOCATION -> a
-    15:19:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.server.packs.resources.ReloadableResourceManager) -> <init>
-    23:23:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.ZombieVillager) -> a
-    28:32:void setupRotations(net.minecraft.world.entity.monster.ZombieVillager,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
-    11:11:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
-    11:11:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
+    17:20:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    24:24:float getBob(net.minecraft.world.entity.animal.Wolf,float) -> a
+    30:40:void render(net.minecraft.world.entity.animal.Wolf,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    44:50:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.animal.Wolf) -> a
+    11:11:void render(net.minecraft.world.entity.Mob,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    11:11:float getBob(net.minecraft.world.entity.LivingEntity,float) -> a
+    11:11:void render(net.minecraft.world.entity.LivingEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     11:11:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.AbstractArmorLayer -> dyb:
-    net.minecraft.client.model.HumanoidModel innerModel -> a
-    net.minecraft.client.model.HumanoidModel outerModel -> b
-    java.util.Map ARMOR_LOCATION_CACHE -> c
-    27:30:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent,net.minecraft.client.model.HumanoidModel,net.minecraft.client.model.HumanoidModel) -> <init>
-    34:38:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
-    41:76:void renderArmorPiece(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float,net.minecraft.world.entity.EquipmentSlot,int) -> a
-    79:81:void renderModel(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.item.ArmorItem,boolean,net.minecraft.client.model.HumanoidModel,boolean,float,float,float,java.lang.String) -> a
-    84:84:net.minecraft.client.model.HumanoidModel getArmorModel(net.minecraft.world.entity.EquipmentSlot) -> a
-    88:88:boolean usesInnerModel(net.minecraft.world.entity.EquipmentSlot) -> b
-    94:95:net.minecraft.resources.ResourceLocation getArmorLocation(net.minecraft.world.item.ArmorItem,boolean,java.lang.String) -> a
-    void setPartVisibility(net.minecraft.client.model.HumanoidModel,net.minecraft.world.entity.EquipmentSlot) -> a
-    void hideAllArmor(net.minecraft.client.model.HumanoidModel) -> a
-    22:22:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-    91:91:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.ArrowLayer -> dyc:
+    11:11:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    12:14:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.ZoglinRenderer -> eji:
+    net.minecraft.resources.ResourceLocation ZOGLIN_LOCATION -> a
+    11:12:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    16:16:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.Zoglin) -> a
+    7:7:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.ZombieRenderer -> ejj:
+    8:9:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+net.minecraft.client.renderer.entity.ZombieVillagerRenderer -> ejk:
+    net.minecraft.resources.ResourceLocation ZOMBIE_VILLAGER_LOCATION -> a
+    14:18:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,net.minecraft.server.packs.resources.ReloadableResourceManager) -> <init>
+    22:22:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.monster.ZombieVillager) -> a
+    27:27:boolean isShaking(net.minecraft.world.entity.monster.ZombieVillager) -> b
+    10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Mob) -> a
+    10:10:boolean isShaking(net.minecraft.world.entity.LivingEntity) -> a
+    10:10:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.layers.ArrowLayer -> ejl:
     net.minecraft.client.renderer.entity.EntityRenderDispatcher dispatcher -> a
     net.minecraft.world.entity.projectile.Arrow arrow -> b
     18:20:void <init>(net.minecraft.client.renderer.entity.LivingEntityRenderer) -> <init>
     24:24:int numStuck(net.minecraft.world.entity.LivingEntity) -> a
     29:36:void renderStuckItem(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.BeeStingerLayer -> dyd:
+net.minecraft.client.renderer.entity.layers.BeeStingerLayer -> ejm:
     net.minecraft.resources.ResourceLocation BEE_STINGER_LOCATION -> a
     22:23:void <init>(net.minecraft.client.renderer.entity.LivingEntityRenderer) -> <init>
     27:27:int numStuck(net.minecraft.world.entity.LivingEntity) -> a
     32:64:void renderStuckItem(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float) -> a
     67:68:void vertex(com.mojang.blaze3d.vertex.VertexConsumer,com.mojang.math.Matrix4f,com.mojang.math.Matrix3f,float,int,float,float,int) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.CapeLayer -> dye:
+net.minecraft.client.renderer.entity.layers.CapeLayer -> ejn:
     20:21:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     25:68:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.client.player.AbstractClientPlayer,float,float,float,float,float,float) -> a
     18:18:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.CarriedBlockLayer -> dyf:
+net.minecraft.client.renderer.entity.layers.CarriedBlockLayer -> ejo:
     15:16:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     20:37:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.monster.EnderMan,float,float,float,float,float,float) -> a
     13:13:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.CatCollarLayer -> dyg:
+net.minecraft.client.renderer.entity.layers.CatCollarLayer -> ejp:
     net.minecraft.resources.ResourceLocation CAT_COLLAR_LOCATION -> a
     net.minecraft.client.model.CatModel catModel -> b
     13:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:27:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.Cat,float,float,float,float,float,float) -> a
     10:10:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.CreeperPowerLayer -> dyh:
+net.minecraft.client.renderer.entity.layers.CreeperPowerLayer -> ejq:
     net.minecraft.resources.ResourceLocation POWER_LOCATION -> a
     net.minecraft.client.model.CreeperModel model -> b
     12:16:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
@@ -17097,83 +18204,104 @@ net.minecraft.client.renderer.entity.layers.CreeperPowerLayer -> dyh:
     25:25:net.minecraft.resources.ResourceLocation getTextureLocation() -> a
     30:30:net.minecraft.client.model.EntityModel model() -> b
     10:10:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.CrossedArmsItemLayer -> dyi:
+net.minecraft.client.renderer.entity.layers.CrossedArmsItemLayer -> ejr:
     16:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:29:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     14:14:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.CustomHeadLayer -> dyj:
-    30:31:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
-    35:91:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
+net.minecraft.client.renderer.entity.layers.CustomHeadLayer -> ejs:
+    float scaleX -> a
+    float scaleY -> b
+    float scaleZ -> c
+    34:35:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
+    38:42:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent,float,float,float) -> <init>
+    46:103:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     28:28:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.Deadmau5EarsLayer -> dyk:
+net.minecraft.client.renderer.entity.layers.Deadmau5EarsLayer -> ejt:
     16:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:44:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.client.player.AbstractClientPlayer,float,float,float,float,float,float) -> a
     14:14:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.DolphinCarryingItemLayer -> dyl:
+net.minecraft.client.renderer.entity.layers.DolphinCarryingItemLayer -> eju:
     16:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:38:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.Dolphin,float,float,float,float,float,float) -> a
     14:14:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.DrownedOuterLayer -> dym:
+net.minecraft.client.renderer.entity.layers.DrownedOuterLayer -> ejv:
     net.minecraft.resources.ResourceLocation DROWNED_OUTER_LAYER_LOCATION -> a
     net.minecraft.client.model.DrownedModel model -> b
     13:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
-    21:22:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.monster.Zombie,float,float,float,float,float,float) -> a
+    21:22:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.monster.Drowned,float,float,float,float,float,float) -> a
     10:10:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.ElytraLayer -> dyn:
+net.minecraft.client.renderer.entity.layers.ElytraLayer -> ejw:
     net.minecraft.resources.ResourceLocation WINGS_LOCATION -> a
     net.minecraft.client.model.ElytraModel elytraModel -> b
     22:26:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     30:60:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     19:19:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.EnderEyesLayer -> dyo:
+net.minecraft.client.renderer.entity.layers.EnderEyesLayer -> ejx:
     net.minecraft.client.renderer.RenderType ENDERMAN_EYES -> a
     13:14:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     18:18:net.minecraft.client.renderer.RenderType renderType() -> a
     10:10:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.EnergySwirlLayer -> dyp:
+net.minecraft.client.renderer.entity.layers.EnergySwirlLayer -> ejy:
     16:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:35:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     float xOffset(float) -> a
     net.minecraft.resources.ResourceLocation getTextureLocation() -> a
     net.minecraft.client.model.EntityModel model() -> b
-net.minecraft.client.renderer.entity.layers.EyesLayer -> dyq:
+net.minecraft.client.renderer.entity.layers.EyesLayer -> ejz:
     15:16:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     20:22:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     net.minecraft.client.renderer.RenderType renderType() -> a
-net.minecraft.client.renderer.entity.layers.FoxHeldItemLayer -> dyr:
+net.minecraft.client.renderer.entity.layers.FoxHeldItemLayer -> eka:
     16:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:67:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.Fox,float,float,float,float,float,float) -> a
     14:14:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.HorseArmorLayer -> dys:
+net.minecraft.client.renderer.entity.layers.HorseArmorLayer -> ekb:
     net.minecraft.client.model.HorseModel model -> a
     16:20:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     24:50:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.horse.Horse,float,float,float,float,float,float) -> a
     15:15:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer -> dyt:
-    10:11:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent,net.minecraft.client.model.HumanoidModel,net.minecraft.client.model.HumanoidModel) -> <init>
-    15:42:void setPartVisibility(net.minecraft.client.model.HumanoidModel,net.minecraft.world.entity.EquipmentSlot) -> a
-    46:47:void hideAllArmor(net.minecraft.client.model.HumanoidModel) -> a
-net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer$1 -> dyt$1:
+net.minecraft.client.renderer.entity.layers.HorseMarkingLayer -> ekc:
+    java.util.Map LOCATION_BY_MARKINGS -> a
+    28:29:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
+    33:41:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.horse.Horse,float,float,float,float,float,float) -> a
+    18:18:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
+    20:25:void lambda$static$0(java.util.EnumMap) -> a
+    19:19:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer -> ekd:
+    java.util.Map ARMOR_LOCATION_CACHE -> a
+    net.minecraft.client.model.HumanoidModel innerModel -> b
+    net.minecraft.client.model.HumanoidModel outerModel -> c
+    28:31:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent,net.minecraft.client.model.HumanoidModel,net.minecraft.client.model.HumanoidModel) -> <init>
+    35:39:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
+    42:72:void renderArmorPiece(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.EquipmentSlot,int,net.minecraft.client.model.HumanoidModel) -> a
+    75:102:void setPartVisibility(net.minecraft.client.model.HumanoidModel,net.minecraft.world.entity.EquipmentSlot) -> a
+    105:107:void renderModel(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.item.ArmorItem,boolean,net.minecraft.client.model.HumanoidModel,boolean,float,float,float,java.lang.String) -> a
+    110:110:net.minecraft.client.model.HumanoidModel getArmorModel(net.minecraft.world.entity.EquipmentSlot) -> a
+    114:114:boolean usesInnerModel(net.minecraft.world.entity.EquipmentSlot) -> b
+    118:119:net.minecraft.resources.ResourceLocation getArmorLocation(net.minecraft.world.item.ArmorItem,boolean,java.lang.String) -> a
+    22:22:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
+    23:23:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer$1 -> ekd$1:
     int[] $SwitchMap$net$minecraft$world$entity$EquipmentSlot -> a
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.IronGolemCrackinessLayer -> dyu:
+    78:78:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.entity.layers.IronGolemCrackinessLayer -> eke:
     java.util.Map resourceLocations -> a
     21:22:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     26:35:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.IronGolem,float,float,float,float,float,float) -> a
     13:13:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.IronGolemFlowerLayer -> dyv:
+net.minecraft.client.renderer.entity.layers.IronGolemFlowerLayer -> ekf:
     16:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:40:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.IronGolem,float,float,float,float,float,float) -> a
     14:14:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.ItemInHandLayer -> dyw:
+net.minecraft.client.renderer.entity.layers.ItemInHandLayer -> ekg:
     17:18:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     22:43:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     46:64:void renderArmWithItem(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.client.renderer.block.model.ItemTransforms$TransformType,net.minecraft.world.entity.HumanoidArm,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
     15:15:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.LlamaDecorLayer -> dyx:
+net.minecraft.client.renderer.entity.layers.LlamaDecorLayer -> ekh:
     net.minecraft.resources.ResourceLocation[] TEXTURE_LOCATION -> a
     net.minecraft.resources.ResourceLocation TRADER_LLAMA -> b
     net.minecraft.client.model.LlamaModel model -> c
@@ -17181,15 +18309,15 @@ net.minecraft.client.renderer.entity.layers.LlamaDecorLayer -> dyx:
     44:58:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.horse.Llama,float,float,float,float,float,float) -> a
     14:14:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     15:34:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.MushroomCowMushroomLayer -> dyy:
+net.minecraft.client.renderer.entity.layers.MushroomCowMushroomLayer -> eki:
     16:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:56:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.MushroomCow,float,float,float,float,float,float) -> a
     14:14:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.PandaHoldsItemLayer -> dyz:
+net.minecraft.client.renderer.entity.layers.PandaHoldsItemLayer -> ekj:
     16:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:36:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.Panda,float,float,float,float,float,float) -> a
     14:14:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.ParrotOnShoulderLayer -> dza:
+net.minecraft.client.renderer.entity.layers.ParrotOnShoulderLayer -> ekk:
     net.minecraft.client.model.ParrotModel model -> a
     16:20:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     24:26:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.player.Player,float,float,float,float,float,float) -> a
@@ -17197,78 +18325,76 @@ net.minecraft.client.renderer.entity.layers.ParrotOnShoulderLayer -> dza:
     15:15:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     31:42:void lambda$render$1(com.mojang.blaze3d.vertex.PoseStack,boolean,net.minecraft.world.entity.player.Player,net.minecraft.client.renderer.MultiBufferSource,net.minecraft.nbt.CompoundTag,int,float,float,float,float,net.minecraft.world.entity.EntityType) -> a
     30:30:boolean lambda$render$0(net.minecraft.world.entity.EntityType) -> a
-net.minecraft.client.renderer.entity.layers.PhantomEyesLayer -> dzb:
+net.minecraft.client.renderer.entity.layers.PhantomEyesLayer -> ekl:
     net.minecraft.client.renderer.RenderType PHANTOM_EYES -> a
     13:14:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     18:18:net.minecraft.client.renderer.RenderType renderType() -> a
     10:10:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.PigSaddleLayer -> dzc:
-    net.minecraft.resources.ResourceLocation SADDLE_LOCATION -> a
-    net.minecraft.client.model.PigModel model -> b
-    16:20:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
-    24:33:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.Pig,float,float,float,float,float,float) -> a
-    13:13:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-    14:14:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.RenderLayer -> dzd:
+net.minecraft.client.renderer.entity.layers.RenderLayer -> ekm:
     net.minecraft.client.renderer.entity.RenderLayerParent renderer -> a
     17:19:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     22:28:void coloredCutoutModelCopyLayerRender(net.minecraft.client.model.EntityModel,net.minecraft.client.model.EntityModel,net.minecraft.resources.ResourceLocation,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float,float,float,float) -> a
     31:33:void renderColoredCutoutModel(net.minecraft.client.model.EntityModel,net.minecraft.resources.ResourceLocation,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float) -> a
-    36:36:net.minecraft.client.model.EntityModel getParentModel() -> c
+    36:36:net.minecraft.client.model.EntityModel getParentModel() -> aB_
     40:40:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
     void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.SheepFurLayer -> dze:
+net.minecraft.client.renderer.entity.layers.SaddleLayer -> ekn:
+    net.minecraft.resources.ResourceLocation textureLocation -> a
+    net.minecraft.client.model.EntityModel model -> b
+    20:23:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent,net.minecraft.client.model.EntityModel,net.minecraft.resources.ResourceLocation) -> <init>
+    27:36:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
+net.minecraft.client.renderer.entity.layers.SheepFurLayer -> eko:
     net.minecraft.resources.ResourceLocation SHEEP_FUR_LOCATION -> a
     net.minecraft.client.model.SheepFurModel model -> b
     15:19:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     23:52:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.Sheep,float,float,float,float,float,float) -> a
     12:12:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.ShulkerHeadLayer -> dzf:
-    20:21:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
-    25:51:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.monster.Shulker,float,float,float,float,float,float) -> a
-    18:18:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.SlimeOuterLayer -> dzg:
+net.minecraft.client.renderer.entity.layers.ShulkerHeadLayer -> ekp:
+    18:19:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
+    23:42:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.monster.Shulker,float,float,float,float,float,float) -> a
+    16:16:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
+net.minecraft.client.renderer.entity.layers.SlimeOuterLayer -> ekq:
     net.minecraft.client.model.EntityModel model -> a
     14:18:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     22:31:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     13:13:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.SnowGolemHeadLayer -> dzh:
+net.minecraft.client.renderer.entity.layers.SnowGolemHeadLayer -> ekr:
     17:18:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     22:37:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.SnowGolem,float,float,float,float,float,float) -> a
     15:15:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.SpiderEyesLayer -> dzi:
+net.minecraft.client.renderer.entity.layers.SpiderEyesLayer -> eks:
     net.minecraft.client.renderer.RenderType SPIDER_EYES -> a
     13:14:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     18:18:net.minecraft.client.renderer.RenderType renderType() -> a
     10:10:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.SpinAttackEffectLayer -> dzj:
+net.minecraft.client.renderer.entity.layers.SpinAttackEffectLayer -> ekt:
     net.minecraft.resources.ResourceLocation TEXTURE -> a
     net.minecraft.client.model.geom.ModelPart box -> b
     21:25:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     29:44:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     15:15:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.StrayClothingLayer -> dzk:
+net.minecraft.client.renderer.entity.layers.StrayClothingLayer -> eku:
     net.minecraft.resources.ResourceLocation STRAY_CLOTHES_LOCATION -> a
     net.minecraft.client.model.SkeletonModel layerModel -> b
     15:19:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     23:24:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Mob,float,float,float,float,float,float) -> a
     12:12:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.StuckInBodyLayer -> dzl:
+net.minecraft.client.renderer.entity.layers.StuckInBodyLayer -> ekv:
     17:18:void <init>(net.minecraft.client.renderer.entity.LivingEntityRenderer) -> <init>
     int numStuck(net.minecraft.world.entity.LivingEntity) -> a
     void renderStuckItem(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float) -> a
     25:52:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     14:14:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.TropicalFishPatternLayer -> dzm:
+net.minecraft.client.renderer.entity.layers.TropicalFishPatternLayer -> ekw:
     net.minecraft.client.model.TropicalFishModelA modelA -> a
     net.minecraft.client.model.TropicalFishModelB modelB -> b
     12:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     21:24:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.TropicalFish,float,float,float,float,float,float) -> a
     11:11:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.VillagerProfessionLayer -> dzn:
+net.minecraft.client.renderer.entity.layers.VillagerProfessionLayer -> ekx:
     it.unimi.dsi.fastutil.ints.Int2ObjectMap LEVEL_LOCATIONS -> a
     it.unimi.dsi.fastutil.objects.Object2ObjectMap typeHatCache -> b
     it.unimi.dsi.fastutil.objects.Object2ObjectMap professionHatCache -> c
@@ -17283,11 +18409,11 @@ net.minecraft.client.renderer.entity.layers.VillagerProfessionLayer -> dzn:
     91:98:net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat lambda$getHatData$1(java.lang.String,net.minecraft.core.DefaultedRegistry,java.lang.Object,java.lang.Object) -> a
     32:37:void lambda$static$0(it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap) -> a
     31:31:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.WitchItemLayer -> dzo:
+net.minecraft.client.renderer.entity.layers.WitchItemLayer -> eky:
     14:15:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     19:34:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.LivingEntity,float,float,float,float,float,float) -> a
     12:12:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
-net.minecraft.client.renderer.entity.layers.WitherArmorLayer -> dzp:
+net.minecraft.client.renderer.entity.layers.WitherArmorLayer -> ekz:
     net.minecraft.resources.ResourceLocation WITHER_ARMOR_LOCATION -> a
     net.minecraft.client.model.WitherBossModel model -> b
     13:17:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
@@ -17295,38 +18421,96 @@ net.minecraft.client.renderer.entity.layers.WitherArmorLayer -> dzp:
     26:26:net.minecraft.resources.ResourceLocation getTextureLocation() -> a
     31:31:net.minecraft.client.model.EntityModel model() -> b
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.WolfCollarLayer -> dzq:
+net.minecraft.client.renderer.entity.layers.WolfCollarLayer -> ela:
     net.minecraft.resources.ResourceLocation WOLF_COLLAR_LOCATION -> a
     14:15:void <init>(net.minecraft.client.renderer.entity.RenderLayerParent) -> <init>
     20:27:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.animal.Wolf,float,float,float,float,float,float) -> a
     10:10:void render(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.world.entity.Entity,float,float,float,float,float,float) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.entity.layers.package-info -> dzr:
-net.minecraft.client.renderer.entity.package-info -> dzs:
-net.minecraft.client.renderer.entity.player.PlayerRenderer -> dzt:
-    42:43:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
-    46:58:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,boolean) -> <init>
-    62:64:void render(net.minecraft.client.player.AbstractClientPlayer,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    68:72:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.client.player.AbstractClientPlayer,float) -> a
-    76:107:void setModelProperties(net.minecraft.client.player.AbstractClientPlayer) -> b
-    110:141:net.minecraft.client.model.HumanoidModel$ArmPose getArmPose(net.minecraft.client.player.AbstractClientPlayer,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
-    146:146:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.client.player.AbstractClientPlayer) -> a
-    151:153:void scale(net.minecraft.client.player.AbstractClientPlayer,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    157:174:void renderNameTag(net.minecraft.client.player.AbstractClientPlayer,java.lang.String,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    177:178:void renderRightHand(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.client.player.AbstractClientPlayer) -> a
-    181:182:void renderLeftHand(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.client.player.AbstractClientPlayer) -> b
-    185:196:void renderHand(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.client.player.AbstractClientPlayer,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart) -> a
-    200:238:void setupRotations(net.minecraft.client.player.AbstractClientPlayer,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
-    40:40:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
-    40:40:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
-    40:40:void render(net.minecraft.world.entity.LivingEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    40:40:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
-    40:40:void renderNameTag(net.minecraft.world.entity.Entity,java.lang.String,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    40:40:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
-    40:40:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.Entity,float) -> b
-net.minecraft.client.renderer.entity.player.package-info -> dzu:
-net.minecraft.client.renderer.package-info -> dzv:
-net.minecraft.client.renderer.texture.AbstractTexture -> dzw:
+net.minecraft.client.renderer.entity.layers.package-info -> elb:
+net.minecraft.client.renderer.entity.package-info -> elc:
+net.minecraft.client.renderer.entity.player.PlayerRenderer -> eld:
+    44:45:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher) -> <init>
+    48:60:void <init>(net.minecraft.client.renderer.entity.EntityRenderDispatcher,boolean) -> <init>
+    64:66:void render(net.minecraft.client.player.AbstractClientPlayer,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    70:74:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.client.player.AbstractClientPlayer,float) -> a
+    78:111:void setModelProperties(net.minecraft.client.player.AbstractClientPlayer) -> b
+    115:137:net.minecraft.client.model.HumanoidModel$ArmPose getArmPose(net.minecraft.client.player.AbstractClientPlayer,net.minecraft.world.InteractionHand) -> a
+    142:142:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.client.player.AbstractClientPlayer) -> a
+    147:149:void scale(net.minecraft.client.player.AbstractClientPlayer,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    153:168:void renderNameTag(net.minecraft.client.player.AbstractClientPlayer,net.minecraft.network.chat.Component,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    171:172:void renderRightHand(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.client.player.AbstractClientPlayer) -> a
+    175:176:void renderLeftHand(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.client.player.AbstractClientPlayer) -> b
+    179:190:void renderHand(com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int,net.minecraft.client.player.AbstractClientPlayer,net.minecraft.client.model.geom.ModelPart,net.minecraft.client.model.geom.ModelPart) -> a
+    194:232:void setupRotations(net.minecraft.client.player.AbstractClientPlayer,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
+    42:42:void scale(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float) -> a
+    42:42:void setupRotations(net.minecraft.world.entity.LivingEntity,com.mojang.blaze3d.vertex.PoseStack,float,float,float) -> a
+    42:42:void render(net.minecraft.world.entity.LivingEntity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    42:42:net.minecraft.resources.ResourceLocation getTextureLocation(net.minecraft.world.entity.Entity) -> a
+    42:42:void renderNameTag(net.minecraft.world.entity.Entity,net.minecraft.network.chat.Component,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    42:42:void render(net.minecraft.world.entity.Entity,float,float,com.mojang.blaze3d.vertex.PoseStack,net.minecraft.client.renderer.MultiBufferSource,int) -> a
+    42:42:net.minecraft.world.phys.Vec3 getRenderOffset(net.minecraft.world.entity.Entity,float) -> a
+net.minecraft.client.renderer.entity.player.package-info -> ele:
+net.minecraft.client.renderer.item.ItemProperties -> elf:
+    java.util.Map GENERIC_PROPERTIES -> a
+    net.minecraft.resources.ResourceLocation DAMAGED -> b
+    net.minecraft.resources.ResourceLocation DAMAGE -> c
+    net.minecraft.client.renderer.item.ItemPropertyFunction PROPERTY_DAMAGED -> d
+    net.minecraft.client.renderer.item.ItemPropertyFunction PROPERTY_DAMAGE -> e
+    java.util.Map PROPERTIES -> f
+    34:34:void <init>() -> <init>
+    46:47:net.minecraft.client.renderer.item.ItemPropertyFunction registerGeneric(net.minecraft.resources.ResourceLocation,net.minecraft.client.renderer.item.ItemPropertyFunction) -> a
+    53:54:void register(net.minecraft.world.item.Item,net.minecraft.resources.ResourceLocation,net.minecraft.client.renderer.item.ItemPropertyFunction) -> a
+    266:285:net.minecraft.client.renderer.item.ItemPropertyFunction getProperty(net.minecraft.world.item.Item,net.minecraft.resources.ResourceLocation) -> a
+    260:260:float lambda$static$15(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> a
+    256:256:float lambda$static$14(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> b
+    243:252:float lambda$static$13(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> c
+    239:239:float lambda$static$12(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> d
+    235:235:float lambda$static$11(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> e
+    231:231:float lambda$static$10(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> f
+    227:227:float lambda$static$9(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> g
+    215:223:float lambda$static$8(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> h
+    81:81:float lambda$static$7(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> i
+    70:77:float lambda$static$6(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> j
+    66:66:float lambda$static$5(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> k
+    62:62:float lambda$static$4(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> l
+    58:58:float lambda$static$3(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> m
+    53:53:java.util.Map lambda$register$2(net.minecraft.world.item.Item) -> a
+    43:43:float lambda$static$1(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> n
+    42:42:float lambda$static$0(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> o
+    35:262:void <clinit>() -> <clinit>
+net.minecraft.client.renderer.item.ItemProperties$1 -> elf$1:
+    double rotation -> a
+    double rota -> b
+    long lastUpdateTick -> c
+    84:84:void <init>() -> <init>
+    91:114:float call(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> call
+    118:129:double wobble(net.minecraft.world.level.Level,double) -> a
+net.minecraft.client.renderer.item.ItemProperties$2 -> elf$2:
+    net.minecraft.client.renderer.item.ItemProperties$CompassWobble wobble -> a
+    net.minecraft.client.renderer.item.ItemProperties$CompassWobble wobbleRandom -> b
+    133:135:void <init>() -> <init>
+    139:182:float call(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> call
+    187:187:net.minecraft.core.BlockPos getSpawnPosition(net.minecraft.client.multiplayer.ClientLevel) -> a
+    192:200:net.minecraft.core.BlockPos getLodestonePosition(net.minecraft.world.level.Level,net.minecraft.nbt.CompoundTag) -> a
+    204:206:double getFrameRotation(net.minecraft.world.entity.decoration.ItemFrame) -> a
+    210:210:double getAngleTo(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> a
+net.minecraft.client.renderer.item.ItemProperties$CompassWobble -> elf$a:
+    double rotation -> a
+    double deltaRotation -> b
+    long lastUpdateTick -> c
+    288:288:void <init>() -> <init>
+    294:294:boolean shouldUpdate(long) -> a
+    298:305:void update(long,double) -> a
+    288:288:void <init>(net.minecraft.client.renderer.item.ItemProperties$1) -> <init>
+    288:288:boolean access$100(net.minecraft.client.renderer.item.ItemProperties$CompassWobble,long) -> a
+    288:288:void access$200(net.minecraft.client.renderer.item.ItemProperties$CompassWobble,long,double) -> a
+    288:288:double access$300(net.minecraft.client.renderer.item.ItemProperties$CompassWobble) -> a
+net.minecraft.client.renderer.item.ItemPropertyFunction -> elg:
+    float call(net.minecraft.world.item.ItemStack,net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.entity.LivingEntity) -> call
+net.minecraft.client.renderer.item.package-info -> elh:
+net.minecraft.client.renderer.package-info -> eli:
+net.minecraft.client.renderer.texture.AbstractTexture -> elj:
     int id -> a
     boolean blur -> b
     boolean mipmap -> c
@@ -17339,13 +18523,13 @@ net.minecraft.client.renderer.texture.AbstractTexture -> dzw:
     75:76:void reset(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation,java.util.concurrent.Executor) -> a
     67:68:void lambda$bind$1() -> a
     49:53:void lambda$releaseId$0() -> e
-net.minecraft.client.renderer.texture.AtlasSet -> dzx:
+net.minecraft.client.renderer.texture.AtlasSet -> elk:
     java.util.Map atlases -> a
     14:16:void <init>(java.util.Collection) -> <init>
     19:19:net.minecraft.client.renderer.texture.TextureAtlas getAtlas(net.minecraft.resources.ResourceLocation) -> a
     23:23:net.minecraft.client.renderer.texture.TextureAtlasSprite getSprite(net.minecraft.client.resources.model.Material) -> a
     28:30:void close() -> close
-net.minecraft.client.renderer.texture.DynamicTexture -> dzy:
+net.minecraft.client.renderer.texture.DynamicTexture -> ell:
     com.mojang.blaze3d.platform.NativeImage pixels -> d
     14:25:void <init>(com.mojang.blaze3d.platform.NativeImage) -> <init>
     27:31:void <init>(int,int,boolean) -> <init>
@@ -17355,7 +18539,7 @@ net.minecraft.client.renderer.texture.DynamicTexture -> dzy:
     49:51:void setPixels(com.mojang.blaze3d.platform.NativeImage) -> a
     55:58:void close() -> close
     18:20:void lambda$new$0() -> f
-net.minecraft.client.renderer.texture.HttpTexture -> dzz:
+net.minecraft.client.renderer.texture.HttpTexture -> elm:
     org.apache.logging.log4j.Logger LOGGER -> e
     java.io.File file -> f
     java.lang.String urlString -> g
@@ -17377,15 +18561,7 @@ net.minecraft.client.renderer.texture.HttpTexture -> dzz:
     52:61:void lambda$loadCallback$1(com.mojang.blaze3d.platform.NativeImage) -> d
     56:57:void lambda$null$0(com.mojang.blaze3d.platform.NativeImage) -> e
     24:24:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.texture.LayeredTexture -> eaa:
-    org.apache.logging.log4j.Logger LOGGER -> e
-    java.util.List layerPaths -> d
-    21:27:void <init>(java.lang.String[]) -> <init>
-    32:67:void load(net.minecraft.server.packs.resources.ResourceManager) -> a
-    70:72:void doLoad(com.mojang.blaze3d.platform.NativeImage) -> a
-    59:60:void lambda$load$0(com.mojang.blaze3d.platform.NativeImage) -> b
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.texture.MipmapGenerator -> eab:
+net.minecraft.client.renderer.texture.MipmapGenerator -> eln:
     float[] POW22 -> a
     8:10:void <init>() -> <init>
     20:59:com.mojang.blaze3d.platform.NativeImage[] generateMipLevels(com.mojang.blaze3d.platform.NativeImage,int) -> a
@@ -17394,7 +18570,7 @@ net.minecraft.client.renderer.texture.MipmapGenerator -> eab:
     129:129:float getPow22(int) -> a
     14:17:void lambda$static$0(float[]) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.texture.MissingTextureAtlasSprite -> eac:
+net.minecraft.client.renderer.texture.MissingTextureAtlasSprite -> elo:
     net.minecraft.resources.ResourceLocation MISSING_TEXTURE_LOCATION -> b
     net.minecraft.client.renderer.texture.DynamicTexture missingTexture -> c
     net.minecraft.util.LazyLoadedValue MISSING_IMAGE_DATA -> d
@@ -17407,7 +18583,7 @@ net.minecraft.client.renderer.texture.MissingTextureAtlasSprite -> eac:
     64:68:net.minecraft.client.renderer.texture.DynamicTexture getTexture() -> c
     22:35:com.mojang.blaze3d.platform.NativeImage lambda$static$0() -> s
     17:38:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.texture.OverlayTexture -> ead:
+net.minecraft.client.renderer.texture.OverlayTexture -> elp:
     int NO_OVERLAY -> a
     net.minecraft.client.renderer.texture.DynamicTexture texture -> b
     20:48:void <init>() -> <init>
@@ -17419,7 +18595,7 @@ net.minecraft.client.renderer.texture.OverlayTexture -> ead:
     72:72:int pack(float,boolean) -> a
     76:77:void teardownOverlayColor() -> b
     16:16:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.texture.PreloadedTexture -> eae:
+net.minecraft.client.renderer.texture.PreloadedTexture -> elq:
     java.util.concurrent.CompletableFuture future -> e
     17:19:void <init>(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation,java.util.concurrent.Executor) -> <init>
     23:28:net.minecraft.client.renderer.texture.SimpleTexture$TextureImage getTextureImage(net.minecraft.server.packs.resources.ResourceManager) -> b
@@ -17432,7 +18608,7 @@ net.minecraft.client.renderer.texture.PreloadedTexture -> eae:
     37:37:net.minecraft.client.renderer.texture.SimpleTexture$TextureImage lambda$reset$2(net.minecraft.server.packs.resources.ResourceManager) -> c
     32:32:java.lang.Void lambda$getFuture$1(net.minecraft.client.renderer.texture.SimpleTexture$TextureImage) -> a
     18:18:net.minecraft.client.renderer.texture.SimpleTexture$TextureImage lambda$new$0(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.client.renderer.texture.SimpleTexture -> eaf:
+net.minecraft.client.renderer.texture.SimpleTexture -> elr:
     org.apache.logging.log4j.Logger LOGGER -> e
     net.minecraft.resources.ResourceLocation location -> d
     22:24:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
@@ -17442,7 +18618,7 @@ net.minecraft.client.renderer.texture.SimpleTexture -> eaf:
     44:45:void lambda$load$0(com.mojang.blaze3d.platform.NativeImage,boolean,boolean) -> b
     17:17:org.apache.logging.log4j.Logger access$000() -> e
     18:18:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.texture.SimpleTexture$TextureImage -> eaf$a:
+net.minecraft.client.renderer.texture.SimpleTexture$TextureImage -> elr$a:
     net.minecraft.client.resources.metadata.texture.TextureMetadataSection metadata -> a
     com.mojang.blaze3d.platform.NativeImage image -> b
     java.io.IOException exception -> c
@@ -17453,7 +18629,7 @@ net.minecraft.client.renderer.texture.SimpleTexture$TextureImage -> eaf$a:
     101:104:com.mojang.blaze3d.platform.NativeImage getImage() -> b
     109:112:void close() -> close
     115:118:void throwIfError() -> c
-net.minecraft.client.renderer.texture.Stitcher -> eag:
+net.minecraft.client.renderer.texture.Stitcher -> els:
     java.util.Comparator HOLDER_COMPARATOR -> a
     int mipLevel -> b
     java.util.Set texturesToBeStitched -> c
@@ -17478,13 +18654,13 @@ net.minecraft.client.renderer.texture.Stitcher -> eag:
     14:14:java.lang.Integer lambda$static$0(net.minecraft.client.renderer.texture.Stitcher$Holder) -> f
     13:13:int access$000(int,int) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.texture.Stitcher$Holder -> eag$a:
+net.minecraft.client.renderer.texture.Stitcher$Holder -> els$a:
     net.minecraft.client.renderer.texture.TextureAtlasSprite$Info spriteInfo -> a
     int width -> b
     int height -> c
     145:149:void <init>(net.minecraft.client.renderer.texture.TextureAtlasSprite$Info,int) -> <init>
     153:153:java.lang.String toString() -> toString
-net.minecraft.client.renderer.texture.Stitcher$Region -> eag$b:
+net.minecraft.client.renderer.texture.Stitcher$Region -> els$b:
     int originX -> a
     int originY -> b
     int width -> c
@@ -17498,13 +18674,13 @@ net.minecraft.client.renderer.texture.Stitcher$Region -> eag$b:
     190:275:boolean add(net.minecraft.client.renderer.texture.Stitcher$Holder) -> a
     279:286:void walk(java.util.function.Consumer) -> a
     290:290:java.lang.String toString() -> toString
-net.minecraft.client.renderer.texture.Stitcher$SpriteLoader -> eag$c:
+net.minecraft.client.renderer.texture.Stitcher$SpriteLoader -> els$c:
     void load(net.minecraft.client.renderer.texture.TextureAtlasSprite$Info,int,int,int,int) -> load
-net.minecraft.client.renderer.texture.StitcherException -> eah:
+net.minecraft.client.renderer.texture.StitcherException -> elt:
     java.util.Collection allSprites -> a
     9:17:void <init>(net.minecraft.client.renderer.texture.TextureAtlasSprite$Info,java.util.Collection) -> <init>
     20:20:java.util.Collection getAllSprites() -> a
-net.minecraft.client.renderer.texture.TextureAtlas -> eai:
+net.minecraft.client.renderer.texture.TextureAtlas -> elu:
     org.apache.logging.log4j.Logger LOGGER -> f
     net.minecraft.resources.ResourceLocation LOCATION_BLOCKS -> d
     net.minecraft.resources.ResourceLocation LOCATION_PARTICLES -> e
@@ -17535,14 +18711,14 @@ net.minecraft.client.renderer.texture.TextureAtlas -> eai:
     154:154:java.lang.String lambda$prepareToStitch$1(net.minecraft.client.renderer.texture.TextureAtlasSprite$Info) -> a
     107:110:void lambda$prepareToStitch$0(net.minecraft.resources.ResourceLocation) -> c
     38:48:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.texture.TextureAtlas$Preparations -> eai$a:
+net.minecraft.client.renderer.texture.TextureAtlas$Preparations -> elu$a:
     java.util.Set sprites -> a
     int width -> b
     int height -> c
     int mipLevel -> d
     java.util.List regions -> e
     305:311:void <init>(java.util.Set,int,int,int,java.util.List) -> <init>
-net.minecraft.client.renderer.texture.TextureAtlasSprite -> eaj:
+net.minecraft.client.renderer.texture.TextureAtlasSprite -> elv:
     net.minecraft.client.renderer.texture.TextureAtlas atlas -> b
     net.minecraft.client.renderer.texture.TextureAtlasSprite$Info info -> c
     net.minecraft.client.resources.metadata.animation.AnimationMetadataSection metadata -> d
@@ -17598,8 +18774,8 @@ net.minecraft.client.renderer.texture.TextureAtlasSprite -> eaj:
     22:22:void access$1000(net.minecraft.client.renderer.texture.TextureAtlasSprite,int,int,com.mojang.blaze3d.platform.NativeImage[]) -> a
     22:22:int[] access$1100(net.minecraft.client.renderer.texture.TextureAtlasSprite) -> e
     22:22:int[] access$1200(net.minecraft.client.renderer.texture.TextureAtlasSprite) -> f
-net.minecraft.client.renderer.texture.TextureAtlasSprite$1 -> eaj$1:
-net.minecraft.client.renderer.texture.TextureAtlasSprite$Info -> eaj$a:
+net.minecraft.client.renderer.texture.TextureAtlasSprite$1 -> elv$1:
+net.minecraft.client.renderer.texture.TextureAtlasSprite$Info -> elv$a:
     net.minecraft.resources.ResourceLocation name -> a
     int width -> b
     int height -> c
@@ -17612,7 +18788,7 @@ net.minecraft.client.renderer.texture.TextureAtlasSprite$Info -> eaj$a:
     308:308:int access$100(net.minecraft.client.renderer.texture.TextureAtlasSprite$Info) -> b
     308:308:int access$200(net.minecraft.client.renderer.texture.TextureAtlasSprite$Info) -> c
     308:308:net.minecraft.resources.ResourceLocation access$300(net.minecraft.client.renderer.texture.TextureAtlasSprite$Info) -> d
-net.minecraft.client.renderer.texture.TextureAtlasSprite$InterpolationData -> eaj$b:
+net.minecraft.client.renderer.texture.TextureAtlasSprite$InterpolationData -> elv$b:
     com.mojang.blaze3d.platform.NativeImage[] activeFrame -> b
     net.minecraft.client.renderer.texture.TextureAtlasSprite this$0 -> a
     341:351:void <init>(net.minecraft.client.renderer.texture.TextureAtlasSprite,net.minecraft.client.renderer.texture.TextureAtlasSprite$Info,int) -> <init>
@@ -17622,7 +18798,7 @@ net.minecraft.client.renderer.texture.TextureAtlasSprite$InterpolationData -> ea
     398:403:void close() -> close
     338:338:void <init>(net.minecraft.client.renderer.texture.TextureAtlasSprite,net.minecraft.client.renderer.texture.TextureAtlasSprite$Info,int,net.minecraft.client.renderer.texture.TextureAtlasSprite$1) -> <init>
     338:338:void access$500(net.minecraft.client.renderer.texture.TextureAtlasSprite$InterpolationData) -> a
-net.minecraft.client.renderer.texture.TextureManager -> eak:
+net.minecraft.client.renderer.texture.TextureManager -> elw:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.resources.ResourceLocation INTENTIONAL_MISSING_TEXTURE -> a
     java.util.Map byPath -> c
@@ -17649,10 +18825,10 @@ net.minecraft.client.renderer.texture.TextureManager -> eak:
     98:98:java.lang.String lambda$loadTexture$1(net.minecraft.client.renderer.texture.AbstractTexture) -> a
     48:49:void lambda$bind$0(net.minecraft.resources.ResourceLocation) -> e
     30:32:void <clinit>() -> <clinit>
-net.minecraft.client.renderer.texture.Tickable -> eal:
+net.minecraft.client.renderer.texture.Tickable -> elx:
     void tick() -> e
-net.minecraft.client.renderer.texture.package-info -> eam:
-net.minecraft.client.resources.AssetIndex -> ean:
+net.minecraft.client.renderer.texture.package-info -> ely:
+net.minecraft.client.resources.AssetIndex -> elz:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Map rootFiles -> b
     java.util.Map namespacedFiles -> c
@@ -17663,44 +18839,51 @@ net.minecraft.client.resources.AssetIndex -> ean:
     79:87:java.util.Collection getFiles(java.lang.String,java.lang.String,int,java.util.function.Predicate) -> a
     81:85:boolean lambda$getFiles$0(java.lang.String,java.lang.String,java.util.function.Predicate,net.minecraft.resources.ResourceLocation) -> a
     26:26:void <clinit>() -> <clinit>
-net.minecraft.client.resources.ClientPackSource -> eao:
+net.minecraft.client.resources.ClientPackSource -> ema:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.regex.Pattern SHA1 -> b
-    net.minecraft.server.packs.VanillaPack vanillaPack -> c
+    net.minecraft.server.packs.VanillaPackResources vanillaPack -> c
     java.io.File serverPackDir -> d
     java.util.concurrent.locks.ReentrantLock downloadLock -> e
     net.minecraft.client.resources.AssetIndex assetIndex -> f
     java.util.concurrent.CompletableFuture currentDownload -> g
-    net.minecraft.client.resources.UnopenedResourcePack serverPack -> h
-    51:62:void <init>(java.io.File,net.minecraft.client.resources.AssetIndex) -> <init>
-    67:87:void loadPacks(java.util.Map,net.minecraft.server.packs.repository.UnopenedPack$UnopenedPackConstructor) -> a
-    90:90:net.minecraft.server.packs.VanillaPack getVanillaPack() -> a
-    94:101:java.util.Map getDownloadHeaders() -> b
-    105:142:java.util.concurrent.CompletableFuture downloadAndSelectResourcePack(java.lang.String,java.lang.String) -> a
-    147:151:void deleteQuietly(java.io.File) -> b
-    154:169:void clearServerPack() -> c
-    174:191:boolean checkHash(java.lang.String,java.io.File) -> a
-    196:208:void clearOldDownloads() -> d
-    211:231:java.util.concurrent.CompletableFuture setServerPack(java.io.File) -> a
-    230:230:net.minecraft.server.packs.Pack lambda$setServerPack$5(java.io.File) -> c
-    134:138:void lambda$downloadAndSelectResourcePack$4(java.io.File,java.lang.Void,java.lang.Throwable) -> a
-    129:132:java.util.concurrent.CompletionStage lambda$downloadAndSelectResourcePack$3(java.lang.String,java.io.File,java.lang.Object) -> a
-    123:123:void lambda$downloadAndSelectResourcePack$2(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.ProgressScreen) -> a
-    77:77:net.minecraft.server.packs.Pack lambda$loadPacks$1(java.io.File) -> d
-    67:67:net.minecraft.server.packs.Pack lambda$loadPacks$0() -> e
-    40:41:void <clinit>() -> <clinit>
-net.minecraft.client.resources.ClientPackSource$1 -> eao$1:
-    net.minecraft.client.resources.ClientPackSource this$0 -> c
-    77:77:void <init>(net.minecraft.client.resources.ClientPackSource,java.io.File) -> <init>
-    80:80:java.lang.String getName() -> a
-net.minecraft.client.resources.DefaultClientResourcePack -> eap:
+    net.minecraft.client.resources.ResourcePack serverPack -> h
+    56:67:void <init>(java.io.File,net.minecraft.client.resources.AssetIndex) -> <init>
+    72:84:void loadPacks(java.util.function.Consumer,net.minecraft.server.packs.repository.Pack$PackConstructor) -> a
+    87:87:net.minecraft.server.packs.VanillaPackResources getVanillaPack() -> a
+    91:98:java.util.Map getDownloadHeaders() -> b
+    102:139:java.util.concurrent.CompletableFuture downloadAndSelectResourcePack(java.lang.String,java.lang.String) -> a
+    144:148:void deleteQuietly(java.io.File) -> a
+    151:166:void clearServerPack() -> c
+    171:188:boolean checkHash(java.lang.String,java.io.File) -> a
+    193:205:void clearOldDownloads() -> d
+    210:219:java.util.concurrent.CompletableFuture setServerPack(java.io.File,net.minecraft.server.packs.repository.PackSource) -> a
+    224:235:net.minecraft.server.packs.repository.Pack createProgrammerArtPack(net.minecraft.server.packs.repository.Pack$PackConstructor) -> a
+    240:240:net.minecraft.server.packs.repository.Pack createProgrammerArtPack(net.minecraft.server.packs.repository.Pack$PackConstructor,java.util.function.Supplier) -> a
+    244:244:net.minecraft.server.packs.FolderPackResources createProgrammerArtDirPack(java.io.File) -> b
+    253:253:net.minecraft.server.packs.PackResources createProgrammerArtZipPack(java.io.File) -> c
+    232:232:net.minecraft.server.packs.PackResources lambda$createProgrammerArtPack$6(java.io.File) -> d
+    227:227:net.minecraft.server.packs.PackResources lambda$createProgrammerArtPack$5(java.io.File) -> e
+    218:218:net.minecraft.server.packs.PackResources lambda$setServerPack$4(java.io.File) -> f
+    131:135:void lambda$downloadAndSelectResourcePack$3(java.io.File,java.lang.Void,java.lang.Throwable) -> a
+    126:129:java.util.concurrent.CompletionStage lambda$downloadAndSelectResourcePack$2(java.lang.String,java.io.File,java.lang.Object) -> a
+    120:120:void lambda$downloadAndSelectResourcePack$1(net.minecraft.client.Minecraft,net.minecraft.client.gui.screens.ProgressScreen) -> a
+    72:72:net.minecraft.server.packs.PackResources lambda$loadPacks$0() -> e
+    44:45:void <clinit>() -> <clinit>
+net.minecraft.client.resources.ClientPackSource$1 -> ema$1:
+    244:244:void <init>(java.io.File) -> <init>
+    247:247:java.lang.String getName() -> a
+net.minecraft.client.resources.ClientPackSource$2 -> ema$2:
+    253:253:void <init>(java.io.File) -> <init>
+    256:256:java.lang.String getName() -> a
+net.minecraft.client.resources.DefaultClientPackResources -> emb:
     net.minecraft.client.resources.AssetIndex assetIndex -> d
     19:21:void <init>(net.minecraft.client.resources.AssetIndex) -> <init>
     26:35:java.io.InputStream getResourceAsStream(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> c
     40:46:boolean hasResource(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> b
     52:59:java.io.InputStream getResourceAsStream(java.lang.String) -> a
     64:66:java.util.Collection getResources(net.minecraft.server.packs.PackType,java.lang.String,java.lang.String,int,java.util.function.Predicate) -> a
-net.minecraft.client.resources.DefaultPlayerSkin -> eaq:
+net.minecraft.client.resources.DefaultPlayerSkin -> emc:
     net.minecraft.resources.ResourceLocation STEVE_SKIN_LOCATION -> a
     net.minecraft.resources.ResourceLocation ALEX_SKIN_LOCATION -> b
     7:7:void <init>() -> <init>
@@ -17709,7 +18892,7 @@ net.minecraft.client.resources.DefaultPlayerSkin -> eaq:
     26:29:java.lang.String getSkinModelName(java.util.UUID) -> b
     33:33:boolean isAlexDefault(java.util.UUID) -> c
     8:9:void <clinit>() -> <clinit>
-net.minecraft.client.resources.DirectAssetIndex -> ear:
+net.minecraft.client.resources.DirectAssetIndex -> emd:
     java.io.File assetsDirectory -> b
     20:22:void <init>(java.io.File) -> <init>
     26:26:java.io.File getFile(net.minecraft.resources.ResourceLocation) -> a
@@ -17719,7 +18902,7 @@ net.minecraft.client.resources.DirectAssetIndex -> ear:
     41:41:boolean lambda$getFiles$2(java.util.function.Predicate,java.nio.file.Path) -> a
     40:40:boolean lambda$getFiles$1(java.nio.file.Path) -> a
     39:39:boolean lambda$getFiles$0(java.nio.file.Path) -> b
-net.minecraft.client.resources.FoliageColorReloadListener -> eas:
+net.minecraft.client.resources.FoliageColorReloadListener -> eme:
     net.minecraft.resources.ResourceLocation LOCATION -> a
     11:11:void <init>() -> <init>
     17:19:int[] prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
@@ -17727,7 +18910,7 @@ net.minecraft.client.resources.FoliageColorReloadListener -> eas:
     11:11:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
     11:11:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
     12:12:void <clinit>() -> <clinit>
-net.minecraft.client.resources.GrassColorReloadListener -> eat:
+net.minecraft.client.resources.GrassColorReloadListener -> emf:
     net.minecraft.resources.ResourceLocation LOCATION -> a
     11:11:void <init>() -> <init>
     17:19:int[] prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
@@ -17735,31 +18918,32 @@ net.minecraft.client.resources.GrassColorReloadListener -> eat:
     11:11:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
     11:11:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
     12:12:void <clinit>() -> <clinit>
-net.minecraft.client.resources.LegacyResourcePackAdapter -> eau:
-    net.minecraft.server.packs.Pack source -> b
+net.minecraft.client.resources.LegacyPackResourcesAdapter -> emg:
+    net.minecraft.server.packs.PackResources source -> b
     java.util.Map patches -> c
     java.util.Map V3 -> a
-    25:25:net.minecraft.resources.ResourceLocation toMetaLocation(net.minecraft.resources.ResourceLocation) -> a
-    28:39:void <init>(net.minecraft.server.packs.Pack,java.util.Map) -> <init>
-    42:42:net.minecraft.resources.ResourceLocation map(net.minecraft.resources.ResourceLocation) -> b
-    47:47:java.io.InputStream getRootResource(java.lang.String) -> b
-    52:52:java.io.InputStream getResource(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> a
-    57:57:java.util.Collection getResources(net.minecraft.server.packs.PackType,java.lang.String,java.lang.String,int,java.util.function.Predicate) -> a
-    62:62:boolean hasResource(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> b
-    67:67:java.util.Set getNamespaces(net.minecraft.server.packs.PackType) -> a
-    73:73:java.lang.Object getMetadataSection(net.minecraft.server.packs.metadata.MetadataSectionSerializer) -> a
-    78:78:java.lang.String getName() -> a
-    83:84:void close() -> close
-    87:943:com.google.common.collect.ImmutableMap lambda$static$0() -> b
-    86:86:void <clinit>() -> <clinit>
-net.minecraft.client.resources.LegacyStuffWrapper -> eav:
+    26:26:net.minecraft.resources.ResourceLocation toMetaLocation(net.minecraft.resources.ResourceLocation) -> a
+    29:32:void <init>(net.minecraft.server.packs.PackResources,java.util.Map) -> <init>
+    35:35:net.minecraft.resources.ResourceLocation map(net.minecraft.resources.ResourceLocation) -> b
+    40:40:java.io.InputStream getRootResource(java.lang.String) -> b
+    45:45:java.io.InputStream getResource(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> a
+    50:50:java.util.Collection getResources(net.minecraft.server.packs.PackType,java.lang.String,java.lang.String,int,java.util.function.Predicate) -> a
+    55:55:boolean hasResource(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> b
+    60:60:java.util.Set getNamespaces(net.minecraft.server.packs.PackType) -> a
+    66:66:java.lang.Object getMetadataSection(net.minecraft.server.packs.metadata.MetadataSectionSerializer) -> a
+    71:71:java.lang.String getName() -> a
+    76:77:void close() -> close
+    80:944:com.google.common.collect.ImmutableMap lambda$static$1() -> b
+    83:87:void lambda$null$0(com.google.common.collect.ImmutableMap$Builder,java.lang.String,java.lang.String) -> a
+    79:79:void <clinit>() -> <clinit>
+net.minecraft.client.resources.LegacyStuffWrapper -> emh:
     10:10:void <init>() -> <init>
     13:18:int[] getPixels(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.client.resources.MobEffectTextureManager -> eaw:
+net.minecraft.client.resources.MobEffectTextureManager -> emi:
     13:14:void <init>(net.minecraft.client.renderer.texture.TextureManager) -> <init>
     18:18:java.util.stream.Stream getResourcesToLoad() -> a
     22:22:net.minecraft.client.renderer.texture.TextureAtlasSprite get(net.minecraft.world.effect.MobEffect) -> a
-net.minecraft.client.resources.PackAdapterV4 -> eax:
+net.minecraft.client.resources.PackResourcesAdapterV4 -> emj:
     java.util.Map CHESTS -> d
     java.util.List PATTERNS -> e
     java.util.Set SHIELDS -> f
@@ -17767,34 +18951,43 @@ net.minecraft.client.resources.PackAdapterV4 -> eax:
     net.minecraft.resources.ResourceLocation SHIELD_BASE -> a
     net.minecraft.resources.ResourceLocation BANNER_BASE -> b
     net.minecraft.resources.ResourceLocation OLD_IRON_GOLEM_LOCATION -> c
-    net.minecraft.server.packs.Pack pack -> h
-    96:98:void <init>(net.minecraft.server.packs.Pack) -> <init>
-    102:102:java.io.InputStream getRootResource(java.lang.String) -> b
-    107:143:boolean hasResource(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> b
-    148:198:java.io.InputStream getResource(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> a
-    203:231:java.io.InputStream fixPattern(java.io.InputStream,java.io.InputStream,int,int,int,int,int) -> a
-    235:243:java.io.InputStream fixConduitEyeTexture(java.io.InputStream) -> a
-    247:277:java.io.InputStream fixLeftChest(java.io.InputStream) -> b
-    281:311:java.io.InputStream fixRightChest(java.io.InputStream) -> c
-    315:347:java.io.InputStream fixSingleChest(java.io.InputStream) -> d
-    352:352:java.util.Collection getResources(net.minecraft.server.packs.PackType,java.lang.String,java.lang.String,int,java.util.function.Predicate) -> a
-    357:357:java.util.Set getNamespaces(net.minecraft.server.packs.PackType) -> a
-    363:363:java.lang.Object getMetadataSection(net.minecraft.server.packs.metadata.MetadataSectionSerializer) -> a
-    368:368:java.lang.String getName() -> a
-    373:374:void close() -> close
-    377:396:void copyRect(com.mojang.blaze3d.platform.NativeImage,com.mojang.blaze3d.platform.NativeImage,int,int,int,int,int,int,int,boolean,boolean) -> a
-    82:82:java.lang.String lambda$static$2(java.lang.String) -> a
-    81:81:java.lang.String lambda$static$1(java.lang.String) -> c
-    27:37:void lambda$static$0(java.util.HashMap) -> a
-    26:91:void <clinit>() -> <clinit>
-net.minecraft.client.resources.PaintingTextureManager -> eay:
+    net.minecraft.server.packs.PackResources pack -> h
+    97:99:void <init>(net.minecraft.server.packs.PackResources) -> <init>
+    103:103:java.io.InputStream getRootResource(java.lang.String) -> b
+    108:144:boolean hasResource(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> b
+    149:199:java.io.InputStream getResource(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> a
+    204:232:java.io.InputStream fixPattern(java.io.InputStream,java.io.InputStream,int,int,int,int,int) -> a
+    236:244:java.io.InputStream fixConduitEyeTexture(java.io.InputStream) -> a
+    248:278:java.io.InputStream fixLeftChest(java.io.InputStream) -> b
+    282:312:java.io.InputStream fixRightChest(java.io.InputStream) -> c
+    316:348:java.io.InputStream fixSingleChest(java.io.InputStream) -> d
+    353:353:java.util.Collection getResources(net.minecraft.server.packs.PackType,java.lang.String,java.lang.String,int,java.util.function.Predicate) -> a
+    358:358:java.util.Set getNamespaces(net.minecraft.server.packs.PackType) -> a
+    364:364:java.lang.Object getMetadataSection(net.minecraft.server.packs.metadata.MetadataSectionSerializer) -> a
+    369:369:java.lang.String getName() -> a
+    374:375:void close() -> close
+    378:397:void copyRect(com.mojang.blaze3d.platform.NativeImage,com.mojang.blaze3d.platform.NativeImage,int,int,int,int,int,int,int,boolean,boolean) -> a
+    83:83:java.lang.String lambda$static$2(java.lang.String) -> a
+    82:82:java.lang.String lambda$static$1(java.lang.String) -> c
+    28:38:void lambda$static$0(java.util.HashMap) -> a
+    27:92:void <clinit>() -> <clinit>
+net.minecraft.client.resources.PaintingTextureManager -> emk:
     net.minecraft.resources.ResourceLocation BACK_SPRITE_LOCATION -> a
     15:16:void <init>(net.minecraft.client.renderer.texture.TextureManager) -> <init>
     20:20:java.util.stream.Stream getResourcesToLoad() -> a
     24:24:net.minecraft.client.renderer.texture.TextureAtlasSprite get(net.minecraft.world.entity.decoration.Motive) -> a
     28:28:net.minecraft.client.renderer.texture.TextureAtlasSprite getBackSprite() -> b
     12:12:void <clinit>() -> <clinit>
-net.minecraft.client.resources.SkinManager -> eaz:
+net.minecraft.client.resources.ResourcePack -> eml:
+    com.mojang.blaze3d.platform.NativeImage icon -> a
+    net.minecraft.resources.ResourceLocation iconLocation -> b
+    26:28:void <init>(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.server.packs.PackResources,net.minecraft.server.packs.metadata.pack.PackMetadataSection,net.minecraft.server.packs.repository.Pack$Position,net.minecraft.server.packs.repository.PackSource) -> <init>
+    31:33:void <init>(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.server.packs.repository.PackCompatibility,net.minecraft.server.packs.repository.Pack$Position,boolean,net.minecraft.server.packs.repository.PackSource,com.mojang.blaze3d.platform.NativeImage) -> <init>
+    37:41:com.mojang.blaze3d.platform.NativeImage readIcon(net.minecraft.server.packs.PackResources) -> a
+    46:46:com.mojang.blaze3d.platform.NativeImage getIcon() -> j
+    50:58:void bindIcon(net.minecraft.client.renderer.texture.TextureManager) -> a
+    62:67:void close() -> close
+net.minecraft.client.resources.SkinManager -> emm:
     net.minecraft.client.renderer.texture.TextureManager textureManager -> a
     java.io.File skinsDirectory -> b
     com.mojang.authlib.minecraft.MinecraftSessionService sessionService -> c
@@ -17809,14 +19002,14 @@ net.minecraft.client.resources.SkinManager -> eaz:
     102:103:void lambda$null$2(java.util.Map,net.minecraft.client.resources.SkinManager$SkinTextureCallback) -> b
     104:107:void lambda$null$1(java.util.Map,net.minecraft.client.resources.SkinManager$SkinTextureCallback,com.mojang.authlib.minecraft.MinecraftProfileTexture$Type) -> a
     69:72:void lambda$registerTexture$0(net.minecraft.client.resources.SkinManager$SkinTextureCallback,com.mojang.authlib.minecraft.MinecraftProfileTexture$Type,net.minecraft.resources.ResourceLocation,com.mojang.authlib.minecraft.MinecraftProfileTexture) -> a
-net.minecraft.client.resources.SkinManager$1 -> eaz$1:
+net.minecraft.client.resources.SkinManager$1 -> emm$1:
     net.minecraft.client.resources.SkinManager this$0 -> a
     40:40:void <init>(net.minecraft.client.resources.SkinManager) -> <init>
     44:46:java.util.Map load(com.mojang.authlib.GameProfile) -> a
     40:40:java.lang.Object load(java.lang.Object) -> load
-net.minecraft.client.resources.SkinManager$SkinTextureCallback -> eaz$a:
+net.minecraft.client.resources.SkinManager$SkinTextureCallback -> emm$a:
     void onSkinTextureAvailable(com.mojang.authlib.minecraft.MinecraftProfileTexture$Type,net.minecraft.resources.ResourceLocation,com.mojang.authlib.minecraft.MinecraftProfileTexture) -> onSkinTextureAvailable
-net.minecraft.client.resources.SplashManager -> eba:
+net.minecraft.client.resources.SplashManager -> emn:
     net.minecraft.resources.ResourceLocation SPLASHES_LOCATION -> a
     java.util.Random RANDOM -> b
     java.util.List splashes -> c
@@ -17829,7 +19022,7 @@ net.minecraft.client.resources.SplashManager -> eba:
     25:25:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
     42:42:boolean lambda$prepare$0(java.lang.String) -> a
     26:27:void <clinit>() -> <clinit>
-net.minecraft.client.resources.TextureAtlasHolder -> ebb:
+net.minecraft.client.resources.TextureAtlasHolder -> emo:
     net.minecraft.client.renderer.texture.TextureAtlas textureAtlas -> a
     java.lang.String prefix -> b
     17:21:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.resources.ResourceLocation,java.lang.String) -> <init>
@@ -17841,21 +19034,29 @@ net.minecraft.client.resources.TextureAtlasHolder -> ebb:
     54:55:void close() -> close
     13:13:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
     13:13:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
-net.minecraft.client.resources.UnopenedResourcePack -> ebc:
-    com.mojang.blaze3d.platform.NativeImage icon -> a
-    net.minecraft.resources.ResourceLocation iconLocation -> b
-    25:33:void <init>(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.server.packs.Pack,net.minecraft.server.packs.metadata.pack.PackMetadataSection,net.minecraft.server.packs.repository.UnopenedPack$Position) -> <init>
-    36:38:void <init>(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.server.packs.repository.PackCompatibility,net.minecraft.server.packs.repository.UnopenedPack$Position,boolean,com.mojang.blaze3d.platform.NativeImage) -> <init>
-    42:42:com.mojang.blaze3d.platform.NativeImage getIcon() -> i
-    46:54:void bindIcon(net.minecraft.client.renderer.texture.TextureManager) -> a
-    58:63:void close() -> close
-net.minecraft.client.resources.language.I18n -> ebd:
-    net.minecraft.client.resources.language.Locale locale -> a
-    6:7:void <init>() -> <init>
-    11:12:void setLocale(net.minecraft.client.resources.language.Locale) -> a
-    15:15:java.lang.String get(java.lang.String,java.lang.Object[]) -> a
-    19:19:boolean exists(java.lang.String) -> a
-net.minecraft.client.resources.language.Language -> ebe:
+net.minecraft.client.resources.language.ClientLanguage -> emp:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    java.util.regex.Pattern FORMAT_PATTERN -> b
+    java.util.Map storage -> c
+    boolean requiresReordering -> d
+    32:35:void <init>(java.util.Map,boolean) -> <init>
+    38:55:net.minecraft.client.resources.language.ClientLanguage loadFrom(net.minecraft.server.packs.resources.ResourceManager,java.util.List) -> a
+    59:66:void appendFrom(java.util.List,java.util.Map) -> a
+    70:70:java.lang.String getOrDefault(java.lang.String) -> a
+    75:75:boolean has(java.lang.String) -> b
+    80:80:boolean requiresReordering() -> b
+    85:93:java.lang.String reorder(java.lang.String,boolean) -> a
+    101:113:java.lang.String wrapFormatCodes(java.lang.String) -> c
+    118:124:java.lang.String reorder(java.lang.String) -> d
+    24:25:void <clinit>() -> <clinit>
+net.minecraft.client.resources.language.I18n -> emq:
+    net.minecraft.locale.Language language -> a
+    10:11:void <init>() -> <init>
+    15:16:void setLanguage(net.minecraft.locale.Language) -> a
+    19:23:java.lang.String get(java.lang.String,java.lang.Object[]) -> a
+    28:28:boolean exists(java.lang.String) -> a
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.client.resources.language.LanguageInfo -> emr:
     java.lang.String code -> a
     java.lang.String region -> b
     java.lang.String name -> c
@@ -17868,37 +19069,26 @@ net.minecraft.client.resources.language.Language -> ebe:
     37:37:java.lang.String toString() -> toString
     43:50:boolean equals(java.lang.Object) -> equals
     55:55:int hashCode() -> hashCode
-    60:60:int compareTo(net.minecraft.client.resources.language.Language) -> a
+    60:60:int compareTo(net.minecraft.client.resources.language.LanguageInfo) -> a
     3:3:int compareTo(java.lang.Object) -> compareTo
-net.minecraft.client.resources.language.LanguageManager -> ebf:
-    org.apache.logging.log4j.Logger LOGGER -> b
-    net.minecraft.client.resources.language.Locale LOCALE -> a
-    java.lang.String currentCode -> c
-    java.util.Map languages -> d
-    25:31:void <init>(java.lang.String) -> <init>
-    34:51:void reload(java.util.List) -> a
-    55:64:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
-    67:67:boolean isBidirectional() -> a
-    71:72:void setSelected(net.minecraft.client.resources.language.Language) -> a
-    75:76:net.minecraft.client.resources.language.Language getSelected() -> b
-    80:80:java.util.SortedSet getLanguages() -> c
-    84:84:net.minecraft.client.resources.language.Language getLanguage(java.lang.String) -> a
-    19:21:void <clinit>() -> <clinit>
-net.minecraft.client.resources.language.Locale -> ebg:
-    com.google.gson.Gson GSON -> b
-    org.apache.logging.log4j.Logger LOGGER -> c
-    java.util.regex.Pattern UNSUPPORTED_FORMAT_PATTERN -> d
-    java.util.Map storage -> a
-    24:28:void <init>() -> <init>
-    31:46:void loadFrom(net.minecraft.server.packs.resources.ResourceManager,java.util.List) -> a
-    49:57:void appendFrom(java.util.List) -> a
-    60:66:void appendFrom(java.io.InputStream) -> a
-    69:70:java.lang.String getOrDefault(java.lang.String) -> b
-    74:78:java.lang.String get(java.lang.String,java.lang.Object[]) -> a
-    83:83:boolean has(java.lang.String) -> a
-    25:27:void <clinit>() -> <clinit>
-net.minecraft.client.resources.language.package-info -> ebh:
-net.minecraft.client.resources.metadata.animation.AnimationFrame -> ebi:
+net.minecraft.client.resources.language.LanguageManager -> ems:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.client.resources.language.LanguageInfo DEFAULT_LANGUAGE -> b
+    java.util.Map languages -> c
+    java.lang.String currentCode -> d
+    net.minecraft.client.resources.language.LanguageInfo currentLanguage -> e
+    25:32:void <init>(java.lang.String) -> <init>
+    35:51:java.util.Map extractLanguages(java.util.stream.Stream) -> a
+    56:70:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
+    73:73:boolean isBidirectional() -> a
+    77:79:void setSelected(net.minecraft.client.resources.language.LanguageInfo) -> a
+    82:82:net.minecraft.client.resources.language.LanguageInfo getSelected() -> b
+    86:86:java.util.SortedSet getLanguages() -> d
+    90:90:net.minecraft.client.resources.language.LanguageInfo getLanguage(java.lang.String) -> a
+    39:49:void lambda$extractLanguages$0(java.util.Map,net.minecraft.server.packs.PackResources) -> a
+    21:23:void <clinit>() -> <clinit>
+net.minecraft.client.resources.language.package-info -> emt:
+net.minecraft.client.resources.metadata.animation.AnimationFrame -> emu:
     int index -> a
     int time -> b
     10:11:void <init>(int) -> <init>
@@ -17906,7 +19096,7 @@ net.minecraft.client.resources.metadata.animation.AnimationFrame -> ebi:
     19:19:boolean isTimeUnknown() -> a
     23:23:int getTime() -> b
     27:27:int getIndex() -> c
-net.minecraft.client.resources.metadata.animation.AnimationMetadataSection -> ebj:
+net.minecraft.client.resources.metadata.animation.AnimationMetadataSection -> emv:
     net.minecraft.client.resources.metadata.animation.AnimationMetadataSectionSerializer SERIALIZER -> a
     net.minecraft.client.resources.metadata.animation.AnimationMetadataSection EMPTY -> b
     java.util.List frames -> c
@@ -17929,22 +19119,22 @@ net.minecraft.client.resources.metadata.animation.AnimationMetadataSection -> eb
     114:114:int getFrameIndex(int) -> e
     118:123:java.util.Set getUniqueFrameIndices() -> d
     11:17:void <clinit>() -> <clinit>
-net.minecraft.client.resources.metadata.animation.AnimationMetadataSection$1 -> ebj$1:
+net.minecraft.client.resources.metadata.animation.AnimationMetadataSection$1 -> emv$1:
     17:17:void <init>(java.util.List,int,int,int,boolean) -> <init>
     20:20:com.mojang.datafixers.util.Pair getFrameSize(int,int) -> a
-net.minecraft.client.resources.metadata.animation.AnimationMetadataSectionSerializer -> ebk:
+net.minecraft.client.resources.metadata.animation.AnimationMetadataSectionSerializer -> emw:
     14:14:void <init>() -> <init>
     17:52:net.minecraft.client.resources.metadata.animation.AnimationMetadataSection fromJson(com.google.gson.JsonObject) -> b
     56:69:net.minecraft.client.resources.metadata.animation.AnimationFrame getFrame(int,com.google.gson.JsonElement) -> a
     75:75:java.lang.String getMetadataSectionName() -> a
     14:14:java.lang.Object fromJson(com.google.gson.JsonObject) -> a
-net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection -> ebl:
+net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection -> emx:
     net.minecraft.client.resources.metadata.animation.VillagerMetadataSectionSerializer SERIALIZER -> a
     net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat hat -> b
     34:36:void <init>(net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat) -> <init>
     39:39:net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat getHat() -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat -> ebl$a:
+net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat -> emx$a:
     net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat NONE -> a
     net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat PARTIAL -> b
     net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat FULL -> c
@@ -17958,26 +19148,26 @@ net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat ->
     28:28:net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat getByName(java.lang.String) -> a
     15:15:net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat lambda$static$0(net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection$Hat) -> a
     12:15:void <clinit>() -> <clinit>
-net.minecraft.client.resources.metadata.animation.VillagerMetadataSectionSerializer -> ebm:
+net.minecraft.client.resources.metadata.animation.VillagerMetadataSectionSerializer -> emy:
     7:7:void <init>() -> <init>
     10:10:net.minecraft.client.resources.metadata.animation.VillagerMetaDataSection fromJson(com.google.gson.JsonObject) -> b
     15:15:java.lang.String getMetadataSectionName() -> a
     7:7:java.lang.Object fromJson(com.google.gson.JsonObject) -> a
-net.minecraft.client.resources.metadata.animation.package-info -> ebn:
-net.minecraft.client.resources.metadata.language.LanguageMetadataSection -> ebo:
+net.minecraft.client.resources.metadata.animation.package-info -> emz:
+net.minecraft.client.resources.metadata.language.LanguageMetadataSection -> ena:
     net.minecraft.client.resources.metadata.language.LanguageMetadataSectionSerializer SERIALIZER -> a
     java.util.Collection languages -> b
     13:15:void <init>(java.util.Collection) -> <init>
     18:18:java.util.Collection getLanguages() -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.client.resources.metadata.language.LanguageMetadataSectionSerializer -> ebp:
+net.minecraft.client.resources.metadata.language.LanguageMetadataSectionSerializer -> enb:
     15:15:void <init>() -> <init>
     20:45:net.minecraft.client.resources.metadata.language.LanguageMetadataSection fromJson(com.google.gson.JsonObject) -> b
     50:50:java.lang.String getMetadataSectionName() -> a
     15:15:java.lang.Object fromJson(com.google.gson.JsonObject) -> a
-net.minecraft.client.resources.metadata.language.package-info -> ebq:
-net.minecraft.client.resources.metadata.package-info -> ebr:
-net.minecraft.client.resources.metadata.texture.TextureMetadataSection -> ebs:
+net.minecraft.client.resources.metadata.language.package-info -> enc:
+net.minecraft.client.resources.metadata.package-info -> end:
+net.minecraft.client.resources.metadata.texture.TextureMetadataSection -> ene:
     net.minecraft.client.resources.metadata.texture.TextureMetadataSectionSerializer SERIALIZER -> a
     boolean blur -> b
     boolean clamp -> c
@@ -17985,13 +19175,13 @@ net.minecraft.client.resources.metadata.texture.TextureMetadataSection -> ebs:
     18:18:boolean isBlur() -> a
     22:22:boolean isClamp() -> b
     4:4:void <clinit>() -> <clinit>
-net.minecraft.client.resources.metadata.texture.TextureMetadataSectionSerializer -> ebt:
+net.minecraft.client.resources.metadata.texture.TextureMetadataSectionSerializer -> enf:
     7:7:void <init>() -> <init>
     10:13:net.minecraft.client.resources.metadata.texture.TextureMetadataSection fromJson(com.google.gson.JsonObject) -> b
     18:18:java.lang.String getMetadataSectionName() -> a
     7:7:java.lang.Object fromJson(com.google.gson.JsonObject) -> a
-net.minecraft.client.resources.metadata.texture.package-info -> ebu:
-net.minecraft.client.resources.model.BakedModel -> ebv:
+net.minecraft.client.resources.metadata.texture.package-info -> eng:
+net.minecraft.client.resources.model.BakedModel -> enh:
     java.util.List getQuads(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,java.util.Random) -> a
     boolean useAmbientOcclusion() -> a
     boolean isGui3d() -> b
@@ -18000,7 +19190,7 @@ net.minecraft.client.resources.model.BakedModel -> ebv:
     net.minecraft.client.renderer.texture.TextureAtlasSprite getParticleIcon() -> e
     net.minecraft.client.renderer.block.model.ItemTransforms getTransforms() -> f
     net.minecraft.client.renderer.block.model.ItemOverrides getOverrides() -> g
-net.minecraft.client.resources.model.BlockModelRotation -> ebw:
+net.minecraft.client.resources.model.BlockModelRotation -> eni:
     net.minecraft.client.resources.model.BlockModelRotation X0_Y0 -> a
     net.minecraft.client.resources.model.BlockModelRotation X0_Y90 -> b
     net.minecraft.client.resources.model.BlockModelRotation X0_Y180 -> c
@@ -18018,21 +19208,21 @@ net.minecraft.client.resources.model.BlockModelRotation -> ebw:
     net.minecraft.client.resources.model.BlockModelRotation X270_Y180 -> o
     net.minecraft.client.resources.model.BlockModelRotation X270_Y270 -> p
     java.util.Map BY_INDEX -> q
-    int index -> r
-    com.mojang.math.Quaternion rotation -> s
-    int xSteps -> t
-    int ySteps -> u
-    net.minecraft.client.resources.model.BlockModelRotation[] $VALUES -> v
-    12:12:net.minecraft.client.resources.model.BlockModelRotation[] values() -> values
-    12:12:net.minecraft.client.resources.model.BlockModelRotation valueOf(java.lang.String) -> valueOf
-    37:37:int getIndex(int,int) -> b
-    45:54:void <init>(java.lang.String,int,int,int) -> <init>
-    58:58:com.mojang.math.Transformation getRotation() -> b
-    62:62:net.minecraft.client.resources.model.BlockModelRotation by(int,int) -> a
-    34:34:net.minecraft.client.resources.model.BlockModelRotation lambda$static$1(net.minecraft.client.resources.model.BlockModelRotation) -> a
-    34:34:java.lang.Integer lambda$static$0(net.minecraft.client.resources.model.BlockModelRotation) -> b
-    12:34:void <clinit>() -> <clinit>
-net.minecraft.client.resources.model.BuiltInModel -> ebx:
+    com.mojang.math.Transformation transformation -> r
+    com.mojang.math.OctahedralGroup actualRotation -> s
+    int index -> t
+    net.minecraft.client.resources.model.BlockModelRotation[] $VALUES -> u
+    13:13:net.minecraft.client.resources.model.BlockModelRotation[] values() -> values
+    13:13:net.minecraft.client.resources.model.BlockModelRotation valueOf(java.lang.String) -> valueOf
+    40:40:int getIndex(int,int) -> b
+    45:63:void <init>(java.lang.String,int,int,int) -> <init>
+    67:67:com.mojang.math.Transformation getRotation() -> b
+    71:71:net.minecraft.client.resources.model.BlockModelRotation by(int,int) -> a
+    75:75:com.mojang.math.OctahedralGroup actualRotation() -> a
+    35:35:net.minecraft.client.resources.model.BlockModelRotation lambda$static$1(net.minecraft.client.resources.model.BlockModelRotation) -> a
+    35:35:java.lang.Integer lambda$static$0(net.minecraft.client.resources.model.BlockModelRotation) -> b
+    13:35:void <clinit>() -> <clinit>
+net.minecraft.client.resources.model.BuiltInModel -> enj:
     net.minecraft.client.renderer.block.model.ItemTransforms itemTransforms -> a
     net.minecraft.client.renderer.block.model.ItemOverrides overrides -> b
     net.minecraft.client.renderer.texture.TextureAtlasSprite particleTexture -> c
@@ -18046,20 +19236,21 @@ net.minecraft.client.resources.model.BuiltInModel -> ebx:
     55:55:net.minecraft.client.renderer.texture.TextureAtlasSprite getParticleIcon() -> e
     60:60:net.minecraft.client.renderer.block.model.ItemTransforms getTransforms() -> f
     65:65:net.minecraft.client.renderer.block.model.ItemOverrides getOverrides() -> g
-net.minecraft.client.resources.model.Material -> eby:
+net.minecraft.client.resources.model.Material -> enk:
     net.minecraft.resources.ResourceLocation atlasLocation -> a
     net.minecraft.resources.ResourceLocation texture -> b
     net.minecraft.client.renderer.RenderType renderType -> c
-    20:23:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> <init>
-    26:26:net.minecraft.resources.ResourceLocation atlasLocation() -> a
-    30:30:net.minecraft.resources.ResourceLocation texture() -> b
-    34:34:net.minecraft.client.renderer.texture.TextureAtlasSprite sprite() -> c
-    38:41:net.minecraft.client.renderer.RenderType renderType(java.util.function.Function) -> a
-    45:45:com.mojang.blaze3d.vertex.VertexConsumer buffer(net.minecraft.client.renderer.MultiBufferSource,java.util.function.Function) -> a
-    50:57:boolean equals(java.lang.Object) -> equals
-    62:62:int hashCode() -> hashCode
-    67:67:java.lang.String toString() -> toString
-net.minecraft.client.resources.model.ModelBakery -> ebz:
+    21:24:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> <init>
+    27:27:net.minecraft.resources.ResourceLocation atlasLocation() -> a
+    31:31:net.minecraft.resources.ResourceLocation texture() -> b
+    35:35:net.minecraft.client.renderer.texture.TextureAtlasSprite sprite() -> c
+    39:42:net.minecraft.client.renderer.RenderType renderType(java.util.function.Function) -> a
+    46:46:com.mojang.blaze3d.vertex.VertexConsumer buffer(net.minecraft.client.renderer.MultiBufferSource,java.util.function.Function) -> a
+    50:50:com.mojang.blaze3d.vertex.VertexConsumer buffer(net.minecraft.client.renderer.MultiBufferSource,java.util.function.Function,boolean) -> a
+    55:62:boolean equals(java.lang.Object) -> equals
+    67:67:int hashCode() -> hashCode
+    72:72:java.lang.String toString() -> toString
+net.minecraft.client.resources.model.ModelBakery -> enl:
     net.minecraft.client.resources.model.Material FIRE_0 -> a
     net.minecraft.client.resources.model.Material FIRE_1 -> b
     net.minecraft.client.resources.model.Material LAVA_FLOW -> c
@@ -18138,9 +19329,9 @@ net.minecraft.client.resources.model.ModelBakery -> ebz:
     83:83:net.minecraft.resources.ResourceLocation lambda$static$1(net.minecraft.resources.ResourceLocation) -> f
     80:80:net.minecraft.resources.ResourceLocation lambda$static$0(int) -> a
     69:162:void <clinit>() -> <clinit>
-net.minecraft.client.resources.model.ModelBakery$BlockStateDefinitionException -> ebz$a:
+net.minecraft.client.resources.model.ModelBakery$BlockStateDefinitionException -> enl$a:
     535:536:void <init>(java.lang.String) -> <init>
-net.minecraft.client.resources.model.ModelBakery$ModelGroupKey -> ebz$b:
+net.minecraft.client.resources.model.ModelBakery$ModelGroupKey -> enl$b:
     java.util.List models -> a
     java.util.List coloringValues -> b
     543:546:void <init>(java.util.List,java.util.List) -> <init>
@@ -18150,7 +19341,7 @@ net.minecraft.client.resources.model.ModelBakery$ModelGroupKey -> ebz$b:
     575:576:net.minecraft.client.resources.model.ModelBakery$ModelGroupKey create(net.minecraft.world.level.block.state.BlockState,net.minecraft.client.resources.model.UnbakedModel,java.util.Collection) -> a
     580:580:java.util.List getColoringValues(net.minecraft.world.level.block.state.BlockState,java.util.Collection) -> a
     567:567:boolean lambda$create$0(net.minecraft.world.level.block.state.StateDefinition,net.minecraft.world.level.block.state.BlockState,net.minecraft.client.renderer.block.model.multipart.Selector) -> a
-net.minecraft.client.resources.model.ModelManager -> eca:
+net.minecraft.client.resources.model.ModelManager -> enm:
     java.util.Map bakedRegistry -> a
     net.minecraft.client.renderer.texture.AtlasSet atlases -> b
     net.minecraft.client.renderer.block.BlockModelShaper blockModelShaper -> c
@@ -18159,34 +19350,34 @@ net.minecraft.client.resources.model.ModelManager -> eca:
     int maxMipmapLevels -> f
     net.minecraft.client.resources.model.BakedModel missingModel -> g
     it.unimi.dsi.fastutil.objects.Object2IntMap modelGroups -> h
-    28:33:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.client.color.block.BlockColors,int) -> <init>
-    36:36:net.minecraft.client.resources.model.BakedModel getModel(net.minecraft.client.resources.model.ModelResourceLocation) -> a
-    40:40:net.minecraft.client.resources.model.BakedModel getMissingModel() -> a
-    44:44:net.minecraft.client.renderer.block.BlockModelShaper getBlockModelShaper() -> b
-    49:52:net.minecraft.client.resources.model.ModelBakery prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    57:75:void apply(net.minecraft.client.resources.model.ModelBakery,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    78:91:boolean requiresRender(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
-    95:95:net.minecraft.client.renderer.texture.TextureAtlas getAtlas(net.minecraft.resources.ResourceLocation) -> a
-    100:101:void close() -> close
-    104:106:void updateMaxMipLevel(int) -> a
-    18:18:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    18:18:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
-net.minecraft.client.resources.model.ModelResourceLocation -> ecb:
-    java.lang.String variant -> c
+    30:35:void <init>(net.minecraft.client.renderer.texture.TextureManager,net.minecraft.client.color.block.BlockColors,int) -> <init>
+    38:38:net.minecraft.client.resources.model.BakedModel getModel(net.minecraft.client.resources.model.ModelResourceLocation) -> a
+    42:42:net.minecraft.client.resources.model.BakedModel getMissingModel() -> a
+    46:46:net.minecraft.client.renderer.block.BlockModelShaper getBlockModelShaper() -> b
+    51:54:net.minecraft.client.resources.model.ModelBakery prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    59:77:void apply(net.minecraft.client.resources.model.ModelBakery,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    80:93:boolean requiresRender(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
+    97:97:net.minecraft.client.renderer.texture.TextureAtlas getAtlas(net.minecraft.resources.ResourceLocation) -> a
+    102:105:void close() -> close
+    108:110:void updateMaxMipLevel(int) -> a
+    19:19:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    19:19:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
+net.minecraft.client.resources.model.ModelResourceLocation -> enn:
+    java.lang.String variant -> d
     15:18:void <init>(java.lang.String[]) -> <init>
     21:22:void <init>(java.lang.String,java.lang.String,java.lang.String) -> <init>
     25:26:void <init>(java.lang.String) -> <init>
     29:30:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String) -> <init>
     33:34:void <init>(java.lang.String,java.lang.String) -> <init>
     37:50:java.lang.String[] decompose(java.lang.String) -> c
-    54:54:java.lang.String getVariant() -> c
+    54:54:java.lang.String getVariant() -> d
     59:69:boolean equals(java.lang.Object) -> equals
     74:74:int hashCode() -> hashCode
     79:79:java.lang.String toString() -> toString
-net.minecraft.client.resources.model.ModelState -> ecc:
+net.minecraft.client.resources.model.ModelState -> eno:
     7:7:com.mojang.math.Transformation getRotation() -> b
     11:11:boolean isUvLocked() -> c
-net.minecraft.client.resources.model.MultiPartBakedModel -> ecd:
+net.minecraft.client.resources.model.MultiPartBakedModel -> enp:
     java.util.List selectors -> g
     boolean hasAmbientOcclusion -> a
     boolean isGui3d -> b
@@ -18204,12 +19395,12 @@ net.minecraft.client.resources.model.MultiPartBakedModel -> ecd:
     95:95:net.minecraft.client.renderer.texture.TextureAtlasSprite getParticleIcon() -> e
     100:100:net.minecraft.client.renderer.block.model.ItemTransforms getTransforms() -> f
     105:105:net.minecraft.client.renderer.block.model.ItemOverrides getOverrides() -> g
-net.minecraft.client.resources.model.MultiPartBakedModel$Builder -> ecd$a:
+net.minecraft.client.resources.model.MultiPartBakedModel$Builder -> enp$a:
     java.util.List selectors -> a
     108:109:void <init>() -> <init>
     112:113:void add(java.util.function.Predicate,net.minecraft.client.resources.model.BakedModel) -> a
     116:116:net.minecraft.client.resources.model.BakedModel build() -> a
-net.minecraft.client.resources.model.SimpleBakedModel -> ece:
+net.minecraft.client.resources.model.SimpleBakedModel -> enq:
     java.util.List unculledFaces -> a
     java.util.Map culledFaces -> b
     boolean hasAmbientOcclusion -> c
@@ -18227,7 +19418,7 @@ net.minecraft.client.resources.model.SimpleBakedModel -> ece:
     66:66:net.minecraft.client.renderer.texture.TextureAtlasSprite getParticleIcon() -> e
     71:71:net.minecraft.client.renderer.block.model.ItemTransforms getTransforms() -> f
     76:76:net.minecraft.client.renderer.block.model.ItemOverrides getOverrides() -> g
-net.minecraft.client.resources.model.SimpleBakedModel$Builder -> ece$a:
+net.minecraft.client.resources.model.SimpleBakedModel$Builder -> enq$a:
     java.util.List unculledFaces -> a
     java.util.Map culledFaces -> b
     net.minecraft.client.renderer.block.model.ItemOverrides overrides -> c
@@ -18243,11 +19434,11 @@ net.minecraft.client.resources.model.SimpleBakedModel$Builder -> ece$a:
     119:121:net.minecraft.client.resources.model.SimpleBakedModel$Builder particle(net.minecraft.client.renderer.texture.TextureAtlasSprite) -> a
     125:125:net.minecraft.client.resources.model.SimpleBakedModel$Builder item() -> a
     129:132:net.minecraft.client.resources.model.BakedModel build() -> b
-net.minecraft.client.resources.model.UnbakedModel -> ecf:
+net.minecraft.client.resources.model.UnbakedModel -> enr:
     java.util.Collection getDependencies() -> f
     java.util.Collection getMaterials(java.util.function.Function,java.util.Set) -> a
     net.minecraft.client.resources.model.BakedModel bake(net.minecraft.client.resources.model.ModelBakery,java.util.function.Function,net.minecraft.client.resources.model.ModelState,net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.client.resources.model.WeightedBakedModel -> ecg:
+net.minecraft.client.resources.model.WeightedBakedModel -> ens:
     int totalWeight -> a
     java.util.List list -> b
     net.minecraft.client.resources.model.BakedModel wrapped -> c
@@ -18260,113 +19451,147 @@ net.minecraft.client.resources.model.WeightedBakedModel -> ecg:
     54:54:net.minecraft.client.renderer.texture.TextureAtlasSprite getParticleIcon() -> e
     59:59:net.minecraft.client.renderer.block.model.ItemTransforms getTransforms() -> f
     64:64:net.minecraft.client.renderer.block.model.ItemOverrides getOverrides() -> g
-net.minecraft.client.resources.model.WeightedBakedModel$Builder -> ecg$a:
+net.minecraft.client.resources.model.WeightedBakedModel$Builder -> ens$a:
     java.util.List list -> a
     67:68:void <init>() -> <init>
     71:74:net.minecraft.client.resources.model.WeightedBakedModel$Builder add(net.minecraft.client.resources.model.BakedModel,int) -> a
     79:85:net.minecraft.client.resources.model.BakedModel build() -> a
-net.minecraft.client.resources.model.WeightedBakedModel$WeightedModel -> ecg$b:
+net.minecraft.client.resources.model.WeightedBakedModel$WeightedModel -> ens$b:
     net.minecraft.client.resources.model.BakedModel model -> b
     93:95:void <init>(net.minecraft.client.resources.model.BakedModel,int) -> <init>
-net.minecraft.client.resources.model.package-info -> ech:
-net.minecraft.client.resources.package-info -> eci:
-net.minecraft.client.resources.sounds.AbstractSoundInstance -> ecj:
+net.minecraft.client.resources.model.package-info -> ent:
+net.minecraft.client.resources.package-info -> enu:
+net.minecraft.client.resources.sounds.AbstractSoundInstance -> env:
     net.minecraft.client.resources.sounds.Sound sound -> a
-    net.minecraft.client.sounds.WeighedSoundEvents soundEvent -> n
     net.minecraft.sounds.SoundSource source -> b
     net.minecraft.resources.ResourceLocation location -> c
     float volume -> d
     float pitch -> e
-    float x -> f
-    float y -> g
-    float z -> h
+    double x -> f
+    double y -> g
+    double z -> h
     boolean looping -> i
     int delay -> j
     net.minecraft.client.resources.sounds.SoundInstance$Attenuation attenuation -> k
     boolean priority -> l
     boolean relative -> m
-    29:30:void <init>(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource) -> <init>
-    17:35:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.sounds.SoundSource) -> <init>
-    39:39:net.minecraft.resources.ResourceLocation getLocation() -> a
-    44:51:net.minecraft.client.sounds.WeighedSoundEvents resolve(net.minecraft.client.sounds.SoundManager) -> a
-    56:56:net.minecraft.client.resources.sounds.Sound getSound() -> b
-    61:61:net.minecraft.sounds.SoundSource getSource() -> c
-    66:66:boolean isLooping() -> d
-    71:71:int getDelay() -> e
-    76:76:float getVolume() -> f
-    81:81:float getPitch() -> g
-    86:86:float getX() -> h
-    91:91:float getY() -> i
-    96:96:float getZ() -> j
-    101:101:net.minecraft.client.resources.sounds.SoundInstance$Attenuation getAttenuation() -> k
-    106:106:boolean hasPriority() -> l
-    111:111:boolean isRelative() -> m
-net.minecraft.client.resources.sounds.AbstractTickableSoundInstance -> eck:
+    25:26:void <init>(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource) -> <init>
+    13:31:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.sounds.SoundSource) -> <init>
+    35:35:net.minecraft.resources.ResourceLocation getLocation() -> a
+    40:47:net.minecraft.client.sounds.WeighedSoundEvents resolve(net.minecraft.client.sounds.SoundManager) -> a
+    52:52:net.minecraft.client.resources.sounds.Sound getSound() -> b
+    57:57:net.minecraft.sounds.SoundSource getSource() -> c
+    62:62:boolean isLooping() -> d
+    67:67:int getDelay() -> e
+    72:72:float getVolume() -> f
+    77:77:float getPitch() -> g
+    82:82:double getX() -> h
+    87:87:double getY() -> i
+    92:92:double getZ() -> j
+    97:97:net.minecraft.client.resources.sounds.SoundInstance$Attenuation getAttenuation() -> k
+    102:102:boolean hasPriority() -> l
+    107:107:boolean isRelative() -> m
+    112:112:java.lang.String toString() -> toString
+net.minecraft.client.resources.sounds.AbstractTickableSoundInstance -> enw:
     boolean stopped -> n
     10:11:void <init>(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource) -> <init>
     15:15:boolean isStopped() -> n
-net.minecraft.client.resources.sounds.AmbientSoundHandler -> ecl:
+    19:22:void stop() -> o
+net.minecraft.client.resources.sounds.AmbientSoundHandler -> enx:
     void tick() -> a
-net.minecraft.client.resources.sounds.BeeAggressiveSoundInstance -> ecm:
+net.minecraft.client.resources.sounds.BeeAggressiveSoundInstance -> eny:
     10:12:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
-    16:16:net.minecraft.client.resources.sounds.AbstractTickableSoundInstance getAlternativeSoundInstance() -> o
-    21:21:boolean shouldSwitchSounds() -> p
-net.minecraft.client.resources.sounds.BeeFlyingSoundInstance -> ecn:
+    16:16:net.minecraft.client.resources.sounds.AbstractTickableSoundInstance getAlternativeSoundInstance() -> p
+    21:21:boolean shouldSwitchSounds() -> q
+net.minecraft.client.resources.sounds.BeeFlyingSoundInstance -> enz:
     10:11:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
-    15:15:net.minecraft.client.resources.sounds.AbstractTickableSoundInstance getAlternativeSoundInstance() -> o
-    20:20:boolean shouldSwitchSounds() -> p
-net.minecraft.client.resources.sounds.BeeSoundInstance -> eco:
-    net.minecraft.world.entity.animal.Bee bee -> o
-    boolean hasSwitched -> p
+    15:15:net.minecraft.client.resources.sounds.AbstractTickableSoundInstance getAlternativeSoundInstance() -> p
+    20:20:boolean shouldSwitchSounds() -> q
+net.minecraft.client.resources.sounds.BeeSoundInstance -> eoa:
+    net.minecraft.world.entity.animal.Bee bee -> n
+    boolean hasSwitched -> o
     19:27:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource) -> <init>
-    31:56:void tick() -> q
-    59:62:float getMinPitch() -> s
-    67:70:float getMaxPitch() -> t
-    76:76:boolean canStartSilent() -> r
-    net.minecraft.client.resources.sounds.AbstractTickableSoundInstance getAlternativeSoundInstance() -> o
-    boolean shouldSwitchSounds() -> p
-net.minecraft.client.resources.sounds.BubbleColumnAmbientSoundHandler -> ecp:
+    31:56:void tick() -> r
+    59:62:float getMinPitch() -> u
+    67:70:float getMaxPitch() -> v
+    76:76:boolean canStartSilent() -> s
+    81:81:boolean canPlaySound() -> t
+    net.minecraft.client.resources.sounds.AbstractTickableSoundInstance getAlternativeSoundInstance() -> p
+    boolean shouldSwitchSounds() -> q
+net.minecraft.client.resources.sounds.BiomeAmbientSoundsHandler -> eob:
+    net.minecraft.client.player.LocalPlayer player -> a
+    net.minecraft.client.sounds.SoundManager soundManager -> b
+    net.minecraft.world.level.biome.BiomeManager biomeManager -> c
+    java.util.Random random -> d
+    it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap loopSounds -> e
+    java.util.Optional moodSettings -> f
+    java.util.Optional additionsSettings -> g
+    float moodiness -> h
+    net.minecraft.world.level.biome.Biome previousBiome -> i
+    30:43:void <init>(net.minecraft.client.player.LocalPlayer,net.minecraft.client.sounds.SoundManager,net.minecraft.world.level.biome.BiomeManager) -> <init>
+    46:46:float getMoodiness() -> b
+    51:120:void tick() -> a
+    79:119:void lambda$tick$3(net.minecraft.world.level.biome.AmbientMoodSettings) -> a
+    73:76:void lambda$tick$2(net.minecraft.world.level.biome.AmbientAdditionsSettings) -> a
+    62:62:void lambda$tick$1(net.minecraft.world.level.biome.Biome,net.minecraft.sounds.SoundEvent) -> a
+    63:68:net.minecraft.client.resources.sounds.BiomeAmbientSoundsHandler$LoopSoundInstance lambda$null$0(net.minecraft.sounds.SoundEvent,net.minecraft.world.level.biome.Biome,net.minecraft.client.resources.sounds.BiomeAmbientSoundsHandler$LoopSoundInstance) -> a
+net.minecraft.client.resources.sounds.BiomeAmbientSoundsHandler$LoopSoundInstance -> eob$a:
+    int fadeDirection -> n
+    int fade -> o
+    127:133:void <init>(net.minecraft.sounds.SoundEvent) -> <init>
+    137:143:void tick() -> r
+    146:148:void fadeOut() -> p
+    151:153:void fadeIn() -> q
+net.minecraft.client.resources.sounds.BubbleColumnAmbientSoundHandler -> eoc:
     net.minecraft.client.player.LocalPlayer player -> a
     boolean wasInBubbleColumn -> b
     boolean firstTick -> c
     13:17:void <init>(net.minecraft.client.player.LocalPlayer) -> <init>
     21:39:void tick() -> a
-net.minecraft.client.resources.sounds.ElytraOnPlayerSoundInstance -> ecq:
-    net.minecraft.client.player.LocalPlayer player -> o
-    int time -> p
+    22:22:boolean lambda$tick$0(net.minecraft.world.level.block.state.BlockState) -> a
+net.minecraft.client.resources.sounds.ElytraOnPlayerSoundInstance -> eod:
+    net.minecraft.client.player.LocalPlayer player -> n
+    int time -> o
     17:23:void <init>(net.minecraft.client.player.LocalPlayer) -> <init>
-    27:57:void tick() -> q
-net.minecraft.client.resources.sounds.EntityBoundSoundInstance -> ecr:
-    net.minecraft.world.entity.Entity entity -> o
+    27:57:void tick() -> r
+net.minecraft.client.resources.sounds.EntityBoundSoundInstance -> eoe:
+    net.minecraft.world.entity.Entity entity -> n
     11:12:void <init>(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,net.minecraft.world.entity.Entity) -> <init>
     15:23:void <init>(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,net.minecraft.world.entity.Entity) -> <init>
-    27:35:void tick() -> q
-net.minecraft.client.resources.sounds.GuardianAttackSoundInstance -> ecs:
-    net.minecraft.world.entity.monster.Guardian guardian -> o
+    27:27:boolean canPlaySound() -> t
+    32:40:void tick() -> r
+net.minecraft.client.resources.sounds.GuardianAttackSoundInstance -> eof:
+    net.minecraft.world.entity.monster.Guardian guardian -> n
     16:23:void <init>(net.minecraft.world.entity.monster.Guardian) -> <init>
-    27:39:void tick() -> q
-net.minecraft.client.resources.sounds.MinecartSoundInstance -> ect:
-    net.minecraft.world.entity.vehicle.AbstractMinecart minecart -> o
-    float pitch -> p
+    27:27:boolean canPlaySound() -> t
+    32:44:void tick() -> r
+net.minecraft.client.resources.sounds.MinecartSoundInstance -> eog:
+    net.minecraft.world.entity.vehicle.AbstractMinecart minecart -> n
+    float pitch -> o
     17:28:void <init>(net.minecraft.world.entity.vehicle.AbstractMinecart) -> <init>
-    32:32:boolean canStartSilent() -> r
-    37:55:void tick() -> q
-net.minecraft.client.resources.sounds.RidingMinecartSoundInstance -> ecu:
-    net.minecraft.world.entity.player.Player player -> o
-    net.minecraft.world.entity.vehicle.AbstractMinecart minecart -> p
+    32:32:boolean canPlaySound() -> t
+    37:37:boolean canStartSilent() -> s
+    42:60:void tick() -> r
+net.minecraft.client.resources.sounds.RidingMinecartSoundInstance -> eoh:
+    net.minecraft.world.entity.player.Player player -> n
+    net.minecraft.world.entity.vehicle.AbstractMinecart minecart -> o
     18:27:void <init>(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.vehicle.AbstractMinecart) -> <init>
-    31:31:boolean canStartSilent() -> r
-    36:47:void tick() -> q
-net.minecraft.client.resources.sounds.SimpleSoundInstance -> ecv:
+    31:31:boolean canPlaySound() -> t
+    36:36:boolean canStartSilent() -> s
+    41:52:void tick() -> r
+net.minecraft.client.resources.sounds.SimpleSoundInstance -> eoi:
     10:11:void <init>(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,net.minecraft.core.BlockPos) -> <init>
     14:14:net.minecraft.client.resources.sounds.SimpleSoundInstance forUI(net.minecraft.sounds.SoundEvent,float) -> a
     18:18:net.minecraft.client.resources.sounds.SimpleSoundInstance forUI(net.minecraft.sounds.SoundEvent,float,float) -> a
     22:22:net.minecraft.client.resources.sounds.SimpleSoundInstance forMusic(net.minecraft.sounds.SoundEvent) -> a
-    26:26:net.minecraft.client.resources.sounds.SimpleSoundInstance forRecord(net.minecraft.sounds.SoundEvent,float,float,float) -> a
-    30:31:void <init>(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,float,float,float) -> <init>
-    34:35:void <init>(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,boolean,int,net.minecraft.client.resources.sounds.SoundInstance$Attenuation,float,float,float) -> <init>
-    38:48:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.sounds.SoundSource,float,float,boolean,int,net.minecraft.client.resources.sounds.SoundInstance$Attenuation,float,float,float,boolean) -> <init>
-net.minecraft.client.resources.sounds.Sound -> ecw:
+    26:26:net.minecraft.client.resources.sounds.SimpleSoundInstance forRecord(net.minecraft.sounds.SoundEvent,double,double,double) -> a
+    30:30:net.minecraft.client.resources.sounds.SimpleSoundInstance forLocalAmbience(net.minecraft.sounds.SoundEvent,float,float) -> b
+    34:34:net.minecraft.client.resources.sounds.SimpleSoundInstance forAmbientAddition(net.minecraft.sounds.SoundEvent) -> b
+    38:38:net.minecraft.client.resources.sounds.SimpleSoundInstance forAmbientMood(net.minecraft.sounds.SoundEvent,double,double,double) -> b
+    42:43:void <init>(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,double,double,double) -> <init>
+    46:47:void <init>(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,boolean,int,net.minecraft.client.resources.sounds.SoundInstance$Attenuation,double,double,double) -> <init>
+    50:60:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.sounds.SoundSource,float,float,boolean,int,net.minecraft.client.resources.sounds.SoundInstance$Attenuation,double,double,double,boolean) -> <init>
+net.minecraft.client.resources.sounds.Sound -> eoj:
     net.minecraft.resources.ResourceLocation location -> a
     float volume -> b
     float pitch -> c
@@ -18387,8 +19612,9 @@ net.minecraft.client.resources.sounds.Sound -> ecw:
     66:66:boolean shouldStream() -> h
     70:70:boolean shouldPreload() -> i
     74:74:int getAttenuationDistance() -> j
+    99:99:java.lang.String toString() -> toString
     7:7:java.lang.Object getSound() -> k
-net.minecraft.client.resources.sounds.Sound$Type -> ecw$a:
+net.minecraft.client.resources.sounds.Sound$Type -> eoj$a:
     net.minecraft.client.resources.sounds.Sound$Type FILE -> a
     net.minecraft.client.resources.sounds.Sound$Type SOUND_EVENT -> b
     java.lang.String name -> c
@@ -18398,7 +19624,7 @@ net.minecraft.client.resources.sounds.Sound$Type -> ecw$a:
     83:85:void <init>(java.lang.String,int,java.lang.String) -> <init>
     88:93:net.minecraft.client.resources.sounds.Sound$Type getByName(java.lang.String) -> a
     77:79:void <clinit>() -> <clinit>
-net.minecraft.client.resources.sounds.SoundEventRegistration -> ecx:
+net.minecraft.client.resources.sounds.SoundEventRegistration -> eok:
     java.util.List sounds -> a
     boolean replace -> b
     java.lang.String subtitle -> c
@@ -18406,14 +19632,14 @@ net.minecraft.client.resources.sounds.SoundEventRegistration -> ecx:
     18:18:java.util.List getSounds() -> a
     22:22:boolean isReplace() -> b
     27:27:java.lang.String getSubtitle() -> c
-net.minecraft.client.resources.sounds.SoundEventRegistrationSerializer -> ecy:
+net.minecraft.client.resources.sounds.SoundEventRegistrationSerializer -> eol:
     16:16:void <init>() -> <init>
     19:25:net.minecraft.client.resources.sounds.SoundEventRegistration deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     29:45:java.util.List getSounds(com.google.gson.JsonObject) -> a
     49:68:net.minecraft.client.resources.sounds.Sound getSound(com.google.gson.JsonObject) -> b
     72:77:net.minecraft.client.resources.sounds.Sound$Type getType(com.google.gson.JsonObject,net.minecraft.client.resources.sounds.Sound$Type) -> a
     16:16:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.client.resources.sounds.SoundInstance -> ecz:
+net.minecraft.client.resources.sounds.SoundInstance -> eom:
     net.minecraft.resources.ResourceLocation getLocation() -> a
     net.minecraft.client.sounds.WeighedSoundEvents resolve(net.minecraft.client.sounds.SoundManager) -> a
     net.minecraft.client.resources.sounds.Sound getSound() -> b
@@ -18424,12 +19650,13 @@ net.minecraft.client.resources.sounds.SoundInstance -> ecz:
     int getDelay() -> e
     float getVolume() -> f
     float getPitch() -> g
-    float getX() -> h
-    float getY() -> i
-    float getZ() -> j
+    double getX() -> h
+    double getY() -> i
+    double getZ() -> j
     net.minecraft.client.resources.sounds.SoundInstance$Attenuation getAttenuation() -> k
-    49:49:boolean canStartSilent() -> r
-net.minecraft.client.resources.sounds.SoundInstance$Attenuation -> ecz$a:
+    49:49:boolean canStartSilent() -> s
+    53:53:boolean canPlaySound() -> t
+net.minecraft.client.resources.sounds.SoundInstance$Attenuation -> eom$a:
     net.minecraft.client.resources.sounds.SoundInstance$Attenuation NONE -> a
     net.minecraft.client.resources.sounds.SoundInstance$Attenuation LINEAR -> b
     net.minecraft.client.resources.sounds.SoundInstance$Attenuation[] $VALUES -> c
@@ -18437,32 +19664,32 @@ net.minecraft.client.resources.sounds.SoundInstance$Attenuation -> ecz$a:
     11:11:net.minecraft.client.resources.sounds.SoundInstance$Attenuation valueOf(java.lang.String) -> valueOf
     11:11:void <init>(java.lang.String,int) -> <init>
     11:13:void <clinit>() -> <clinit>
-net.minecraft.client.resources.sounds.TickableSoundInstance -> eda:
+net.minecraft.client.resources.sounds.TickableSoundInstance -> eon:
     boolean isStopped() -> n
-    void tick() -> q
-net.minecraft.client.resources.sounds.UnderwaterAmbientSoundHandler -> edb:
+    void tick() -> r
+net.minecraft.client.resources.sounds.UnderwaterAmbientSoundHandler -> eoo:
     net.minecraft.client.player.LocalPlayer player -> a
     net.minecraft.client.sounds.SoundManager soundManager -> b
-    int tick_delay -> c
+    int tickDelay -> c
     15:20:void <init>(net.minecraft.client.player.LocalPlayer,net.minecraft.client.sounds.SoundManager) -> <init>
     24:39:void tick() -> a
-net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances -> edc:
+net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances -> eop:
     9:9:void <init>() -> <init>
-net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances$SubSound -> edc$a:
-    net.minecraft.client.player.LocalPlayer player -> o
+net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances$SubSound -> eop$a:
+    net.minecraft.client.player.LocalPlayer player -> n
     14:22:void <init>(net.minecraft.client.player.LocalPlayer,net.minecraft.sounds.SoundEvent) -> <init>
-    26:29:void tick() -> q
-net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances$UnderwaterAmbientSoundInstance -> edc$b:
-    net.minecraft.client.player.LocalPlayer player -> o
-    int fade -> p
+    26:29:void tick() -> r
+net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances$UnderwaterAmbientSoundInstance -> eop$b:
+    net.minecraft.client.player.LocalPlayer player -> n
+    int fade -> o
     39:47:void <init>(net.minecraft.client.player.LocalPlayer) -> <init>
-    51:64:void tick() -> q
-net.minecraft.client.resources.sounds.package-info -> edd:
-net.minecraft.client.searchtree.MutableSearchTree -> ede:
+    51:64:void tick() -> r
+net.minecraft.client.resources.sounds.package-info -> eoq:
+net.minecraft.client.searchtree.MutableSearchTree -> eor:
     void add(java.lang.Object) -> a
     void clear() -> a
     void refresh() -> b
-net.minecraft.client.searchtree.ReloadableIdSearchTree -> edf:
+net.minecraft.client.searchtree.ReloadableIdSearchTree -> eos:
     net.minecraft.client.searchtree.SuffixArray namespaceTree -> a
     net.minecraft.client.searchtree.SuffixArray pathTree -> b
     java.util.function.Function idGetter -> c
@@ -18476,13 +19703,13 @@ net.minecraft.client.searchtree.ReloadableIdSearchTree -> edf:
     65:65:int comparePosition(java.lang.Object,java.lang.Object) -> a
     70:79:java.util.List search(java.lang.String) -> a
     59:61:void lambda$index$0(java.lang.Object,net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.client.searchtree.ReloadableIdSearchTree$IntersectionIterator -> edf$a:
+net.minecraft.client.searchtree.ReloadableIdSearchTree$IntersectionIterator -> eos$a:
     com.google.common.collect.PeekingIterator firstIterator -> a
     com.google.common.collect.PeekingIterator secondIterator -> b
     java.util.Comparator orderT -> c
     87:92:void <init>(java.util.Iterator,java.util.Iterator,java.util.Comparator) -> <init>
     97:112:java.lang.Object computeNext() -> computeNext
-net.minecraft.client.searchtree.ReloadableSearchTree -> edg:
+net.minecraft.client.searchtree.ReloadableSearchTree -> eot:
     net.minecraft.client.searchtree.SuffixArray tree -> c
     java.util.function.Function filler -> d
     17:24:void <init>(java.util.function.Function,java.util.function.Function) -> <init>
@@ -18490,13 +19717,13 @@ net.minecraft.client.searchtree.ReloadableSearchTree -> edg:
     35:37:void index(java.lang.Object) -> b
     41:51:java.util.List search(java.lang.String) -> a
     36:36:void lambda$index$0(java.lang.Object,java.lang.String) -> a
-net.minecraft.client.searchtree.ReloadableSearchTree$MergingUniqueIterator -> edg$a:
+net.minecraft.client.searchtree.ReloadableSearchTree$MergingUniqueIterator -> eot$a:
     com.google.common.collect.PeekingIterator firstIterator -> a
     com.google.common.collect.PeekingIterator secondIterator -> b
     java.util.Comparator orderT -> c
     59:64:void <init>(java.util.Iterator,java.util.Iterator,java.util.Comparator) -> <init>
     68:86:java.lang.Object computeNext() -> computeNext
-net.minecraft.client.searchtree.SearchRegistry -> edh:
+net.minecraft.client.searchtree.SearchRegistry -> eou:
     net.minecraft.client.searchtree.SearchRegistry$Key CREATIVE_NAMES -> a
     net.minecraft.client.searchtree.SearchRegistry$Key CREATIVE_TAGS -> b
     net.minecraft.client.searchtree.SearchRegistry$Key RECIPE_COLLECTIONS -> c
@@ -18506,11 +19733,11 @@ net.minecraft.client.searchtree.SearchRegistry -> edh:
     28:29:void register(net.minecraft.client.searchtree.SearchRegistry$Key,net.minecraft.client.searchtree.MutableSearchTree) -> a
     33:33:net.minecraft.client.searchtree.MutableSearchTree getTree(net.minecraft.client.searchtree.SearchRegistry$Key) -> a
     14:16:void <clinit>() -> <clinit>
-net.minecraft.client.searchtree.SearchRegistry$Key -> edh$a:
+net.minecraft.client.searchtree.SearchRegistry$Key -> eou$a:
     12:12:void <init>() -> <init>
-net.minecraft.client.searchtree.SearchTree -> edi:
+net.minecraft.client.searchtree.SearchTree -> eov:
     java.util.List search(java.lang.String) -> a
-net.minecraft.client.searchtree.SuffixArray -> edj:
+net.minecraft.client.searchtree.SuffixArray -> eow:
     boolean DEBUG_COMPARISONS -> b
     boolean DEBUG_ARRAY -> c
     org.apache.logging.log4j.Logger LOGGER -> d
@@ -18529,7 +19756,7 @@ net.minecraft.client.searchtree.SuffixArray -> edj:
     182:237:java.util.List search(java.lang.String) -> a
     76:89:void lambda$generate$0(int[],int[],int[],int,int) -> a
     20:23:void <clinit>() -> <clinit>
-net.minecraft.client.searchtree.SuffixArray$1 -> edj$1:
+net.minecraft.client.searchtree.SuffixArray$1 -> eow$1:
     int[] val$lefts -> a
     int[] val$rights -> b
     net.minecraft.client.searchtree.SuffixArray this$0 -> c
@@ -18537,56 +19764,52 @@ net.minecraft.client.searchtree.SuffixArray$1 -> edj$1:
     63:66:int compare(int,int) -> compare
     71:71:int compare(java.lang.Integer,java.lang.Integer) -> compare
     60:60:int compare(java.lang.Object,java.lang.Object) -> compare
-net.minecraft.client.searchtree.package-info -> edk:
-net.minecraft.client.server.IntegratedPlayerList -> edl:
+net.minecraft.client.searchtree.package-info -> eox:
+net.minecraft.client.server.IntegratedPlayerList -> eoy:
     net.minecraft.nbt.CompoundTag playerData -> a
-    16:19:void <init>(net.minecraft.client.server.IntegratedServer) -> <init>
-    23:28:void save(net.minecraft.server.level.ServerPlayer) -> b
-    32:36:net.minecraft.network.chat.Component canPlayerLogin(java.net.SocketAddress,com.mojang.authlib.GameProfile) -> a
-    41:41:net.minecraft.client.server.IntegratedServer getServer() -> b
-    46:46:net.minecraft.nbt.CompoundTag getSingleplayerData() -> r
-    12:12:net.minecraft.server.MinecraftServer getServer() -> c
-net.minecraft.client.server.IntegratedServer -> edm:
+    18:21:void <init>(net.minecraft.client.server.IntegratedServer,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.storage.PlayerDataStorage) -> <init>
+    25:30:void save(net.minecraft.server.level.ServerPlayer) -> b
+    34:38:net.minecraft.network.chat.Component canPlayerLogin(java.net.SocketAddress,com.mojang.authlib.GameProfile) -> a
+    43:43:net.minecraft.client.server.IntegratedServer getServer() -> b
+    48:48:net.minecraft.nbt.CompoundTag getSingleplayerData() -> q
+    14:14:net.minecraft.server.MinecraftServer getServer() -> c
+net.minecraft.client.server.IntegratedServer -> eoz:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.client.Minecraft minecraft -> h
-    net.minecraft.world.level.LevelSettings settings -> i
-    boolean paused -> j
-    int publishedPort -> k
-    net.minecraft.client.server.LanServerPinger lanPinger -> l
-    java.util.UUID uuid -> m
-    48:64:void <init>(net.minecraft.client.Minecraft,java.lang.String,java.lang.String,net.minecraft.world.level.LevelSettings,com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService,com.mojang.authlib.minecraft.MinecraftSessionService,com.mojang.authlib.GameProfileRepository,net.minecraft.server.players.GameProfileCache,net.minecraft.server.level.progress.ChunkProgressListenerFactory) -> <init>
-    68:91:void loadLevel(java.lang.String,java.lang.String,long,net.minecraft.world.level.LevelType,com.google.gson.JsonElement) -> a
-    95:109:boolean initServer() -> d
-    114:138:void tickServer(java.util.function.BooleanSupplier) -> a
-    142:142:boolean canGenerateStructures() -> f
-    147:147:net.minecraft.world.level.GameType getDefaultGameType() -> g
-    152:152:net.minecraft.world.Difficulty getDefaultDifficulty() -> h
-    157:157:boolean isHardcore() -> i
-    162:162:boolean shouldRconBroadcast() -> l
-    167:167:boolean shouldInformAdmins() -> I_
-    172:172:java.io.File getServerDirectory() -> z
-    177:177:boolean isDedicatedServer() -> m
-    182:182:boolean isEpollEnabled() -> n
-    187:188:void onServerCrash(net.minecraft.CrashReport) -> a
-    192:197:net.minecraft.CrashReport fillReport(net.minecraft.CrashReport) -> b
-    202:216:java.util.Optional getModdedStatus() -> q
-    221:224:void populateSnooper(net.minecraft.world.Snooper) -> a
-    228:228:boolean isSnooperEnabled() -> W
-    234:252:boolean publishServer(net.minecraft.world.level.GameType,boolean,int) -> a
-    257:263:void stopServer() -> s
-    267:283:void halt(boolean) -> a
-    287:287:boolean isPublished() -> p
-    292:292:int getPort() -> M
-    297:299:void setDefaultGameMode(net.minecraft.world.level.GameType) -> a
-    303:303:boolean isCommandBlockEnabled() -> o
-    308:308:int getOperatorUserPermissionLevel() -> j
-    313:313:int getFunctionCompilationLevel() -> k
-    317:318:void setUUID(java.util.UUID) -> b
-    322:322:boolean isSingleplayerOwner(com.mojang.authlib.GameProfile) -> a
-    268:275:void lambda$halt$1() -> c
-    195:195:java.lang.String lambda$fillReport$0() -> r
-    43:43:void <clinit>() -> <clinit>
-net.minecraft.client.server.LanServer -> edn:
+    net.minecraft.client.Minecraft minecraft -> j
+    boolean paused -> k
+    int publishedPort -> l
+    net.minecraft.client.server.LanServerPinger lanPinger -> m
+    java.util.UUID uuid -> n
+    44:57:void <init>(java.lang.Thread,net.minecraft.client.Minecraft,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.server.packs.repository.PackRepository,net.minecraft.server.ServerResources,net.minecraft.world.level.storage.WorldData,com.mojang.authlib.minecraft.MinecraftSessionService,com.mojang.authlib.GameProfileRepository,net.minecraft.server.players.GameProfileCache,net.minecraft.server.level.progress.ChunkProgressListenerFactory) -> <init>
+    61:72:boolean initServer() -> d
+    77:101:void tickServer(java.util.function.BooleanSupplier) -> a
+    105:105:boolean shouldRconBroadcast() -> i
+    110:110:boolean shouldInformAdmins() -> S_
+    115:115:java.io.File getServerDirectory() -> A
+    120:120:boolean isDedicatedServer() -> j
+    125:125:boolean isEpollEnabled() -> k
+    130:131:void onServerCrash(net.minecraft.CrashReport) -> a
+    135:140:net.minecraft.CrashReport fillReport(net.minecraft.CrashReport) -> b
+    145:159:java.util.Optional getModdedStatus() -> n
+    164:167:void populateSnooper(net.minecraft.world.Snooper) -> a
+    171:171:boolean isSnooperEnabled() -> S
+    177:195:boolean publishServer(net.minecraft.world.level.GameType,boolean,int) -> a
+    200:206:void stopServer() -> s
+    210:226:void halt(boolean) -> a
+    230:230:boolean isPublished() -> m
+    235:235:int getPort() -> L
+    240:242:void setDefaultGameType(net.minecraft.world.level.GameType) -> a
+    246:246:boolean isCommandBlockEnabled() -> l
+    251:251:int getOperatorUserPermissionLevel() -> g
+    256:256:int getFunctionCompilationLevel() -> h
+    260:261:void setUUID(java.util.UUID) -> a
+    265:265:boolean isSingleplayerOwner(com.mojang.authlib.GameProfile) -> a
+    270:270:int getScaledTrackingDistance(int) -> b
+    275:275:boolean forceSynchronousWrites() -> aT
+    211:218:void lambda$halt$1() -> c
+    138:138:java.lang.String lambda$fillReport$0() -> o
+    40:40:void <clinit>() -> <clinit>
+net.minecraft.client.server.LanServer -> epa:
     java.lang.String motd -> a
     java.lang.String address -> b
     long pingTime -> c
@@ -18595,20 +19818,20 @@ net.minecraft.client.server.LanServer -> edn:
     21:21:java.lang.String getAddress() -> b
     25:26:void updatePingTime() -> c
     29:29:boolean isUpToDate() -> d
-net.minecraft.client.server.LanServerDetection -> edo:
+net.minecraft.client.server.LanServerDetection -> epb:
     java.util.concurrent.atomic.AtomicInteger UNIQUE_THREAD_ID -> a
     org.apache.logging.log4j.Logger LOGGER -> b
     18:18:void <init>() -> <init>
     18:18:java.util.concurrent.atomic.AtomicInteger access$000() -> a
     18:18:org.apache.logging.log4j.Logger access$100() -> b
     19:20:void <clinit>() -> <clinit>
-net.minecraft.client.server.LanServerDetection$LanServerDetector -> edo$a:
+net.minecraft.client.server.LanServerDetection$LanServerDetector -> epb$a:
     net.minecraft.client.server.LanServerDetection$LanServerList serverList -> a
     java.net.InetAddress pingGroup -> b
     java.net.MulticastSocket socket -> c
     70:79:void <init>(net.minecraft.client.server.LanServerDetection$LanServerList) -> <init>
     84:107:void run() -> run
-net.minecraft.client.server.LanServerDetection$LanServerList -> edo$b:
+net.minecraft.client.server.LanServerDetection$LanServerList -> epb$b:
     java.util.List servers -> a
     boolean isDirty -> b
     22:23:void <init>() -> <init>
@@ -18616,7 +19839,7 @@ net.minecraft.client.server.LanServerDetection$LanServerList -> edo$b:
     31:32:void markClean() -> b
     35:35:java.util.List getServers() -> c
     39:60:void addServer(java.lang.String,java.net.InetAddress) -> a
-net.minecraft.client.server.LanServerPinger -> edp:
+net.minecraft.client.server.LanServerPinger -> epc:
     java.util.concurrent.atomic.AtomicInteger UNIQUE_THREAD_ID -> a
     org.apache.logging.log4j.Logger LOGGER -> b
     java.lang.String motd -> c
@@ -18630,83 +19853,76 @@ net.minecraft.client.server.LanServerPinger -> edp:
     73:81:java.lang.String parseMotd(java.lang.String) -> a
     85:104:java.lang.String parseAddress(java.lang.String) -> b
     15:16:void <clinit>() -> <clinit>
-net.minecraft.client.server.package-info -> edq:
-net.minecraft.client.skins.package-info -> edr:
-net.minecraft.client.sounds.AudioStream -> eds:
+net.minecraft.client.server.package-info -> epd:
+net.minecraft.client.skins.package-info -> epe:
+net.minecraft.client.sounds.AudioStream -> epf:
     javax.sound.sampled.AudioFormat getFormat() -> a
-    java.nio.ByteBuffer readAll() -> b
     java.nio.ByteBuffer read(int) -> a
-net.minecraft.client.sounds.ChannelAccess -> edt:
+net.minecraft.client.sounds.ChannelAccess -> epg:
     java.util.Set channels -> a
     com.mojang.blaze3d.audio.Library library -> b
     java.util.concurrent.Executor executor -> c
-    40:49:void <init>(com.mojang.blaze3d.audio.Library,java.util.concurrent.Executor) -> <init>
-    52:60:net.minecraft.client.sounds.ChannelAccess$ChannelHandle createHandle(com.mojang.blaze3d.audio.Library$Pool) -> a
-    64:65:void executeOnChannels(java.util.function.Consumer) -> a
-    68:79:void scheduleTick() -> a
-    83:85:void clear() -> b
-    69:78:void lambda$scheduleTick$3() -> c
-    64:64:void lambda$executeOnChannels$2(java.util.function.Consumer) -> b
-    64:64:com.mojang.blaze3d.audio.Channel lambda$null$1(net.minecraft.client.sounds.ChannelAccess$ChannelHandle) -> a
-    54:59:void lambda$createHandle$0(com.mojang.blaze3d.audio.Library$Pool,net.minecraft.client.sounds.ChannelAccess$ChannelHandle) -> a
-    14:14:java.util.concurrent.Executor access$000(net.minecraft.client.sounds.ChannelAccess) -> a
-    14:14:com.mojang.blaze3d.audio.Library access$100(net.minecraft.client.sounds.ChannelAccess) -> b
-net.minecraft.client.sounds.ChannelAccess$ChannelHandle -> edt$a:
+    47:56:void <init>(com.mojang.blaze3d.audio.Library,java.util.concurrent.Executor) -> <init>
+    59:70:java.util.concurrent.CompletableFuture createHandle(com.mojang.blaze3d.audio.Library$Pool) -> a
+    74:75:void executeOnChannels(java.util.function.Consumer) -> a
+    78:89:void scheduleTick() -> a
+    93:95:void clear() -> b
+    79:88:void lambda$scheduleTick$3() -> c
+    74:74:void lambda$executeOnChannels$2(java.util.function.Consumer) -> b
+    74:74:com.mojang.blaze3d.audio.Channel lambda$null$1(net.minecraft.client.sounds.ChannelAccess$ChannelHandle) -> a
+    61:69:void lambda$createHandle$0(com.mojang.blaze3d.audio.Library$Pool,java.util.concurrent.CompletableFuture) -> a
+    16:16:java.util.concurrent.Executor access$000(net.minecraft.client.sounds.ChannelAccess) -> a
+    16:16:com.mojang.blaze3d.audio.Library access$100(net.minecraft.client.sounds.ChannelAccess) -> b
+net.minecraft.client.sounds.ChannelAccess$ChannelHandle -> epg$a:
     com.mojang.blaze3d.audio.Channel channel -> b
     boolean stopped -> c
     net.minecraft.client.sounds.ChannelAccess this$0 -> a
-    15:15:void <init>(net.minecraft.client.sounds.ChannelAccess) -> <init>
-    20:20:boolean isStopped() -> a
-    24:31:void execute(java.util.function.Consumer) -> a
-    34:37:void release() -> b
-    26:29:void lambda$execute$0(java.util.function.Consumer) -> b
-    15:15:com.mojang.blaze3d.audio.Channel access$200(net.minecraft.client.sounds.ChannelAccess$ChannelHandle) -> a
-    15:15:com.mojang.blaze3d.audio.Channel access$202(net.minecraft.client.sounds.ChannelAccess$ChannelHandle,com.mojang.blaze3d.audio.Channel) -> a
-net.minecraft.client.sounds.MusicManager -> edu:
+    23:23:boolean isStopped() -> a
+    26:28:void <init>(net.minecraft.client.sounds.ChannelAccess,com.mojang.blaze3d.audio.Channel) -> <init>
+    31:38:void execute(java.util.function.Consumer) -> a
+    41:44:void release() -> b
+    33:36:void lambda$execute$0(java.util.function.Consumer) -> b
+    17:17:com.mojang.blaze3d.audio.Channel access$200(net.minecraft.client.sounds.ChannelAccess$ChannelHandle) -> a
+net.minecraft.client.sounds.LoopingAudioStream -> eph:
+    net.minecraft.client.sounds.LoopingAudioStream$AudioStreamProvider provider -> a
+    net.minecraft.client.sounds.AudioStream stream -> b
+    java.io.BufferedInputStream bufferedInputStream -> c
+    27:32:void <init>(net.minecraft.client.sounds.LoopingAudioStream$AudioStreamProvider,java.io.InputStream) -> <init>
+    36:36:javax.sound.sampled.AudioFormat getFormat() -> a
+    41:49:java.nio.ByteBuffer read(int) -> a
+    54:56:void close() -> close
+net.minecraft.client.sounds.LoopingAudioStream$1 -> eph$1:
+net.minecraft.client.sounds.LoopingAudioStream$AudioStreamProvider -> eph$a:
+    net.minecraft.client.sounds.AudioStream create(java.io.InputStream) -> create
+net.minecraft.client.sounds.LoopingAudioStream$NoCloseBuffer -> eph$b:
+    18:19:void <init>(java.io.InputStream) -> <init>
+    24:24:void close() -> close
+    16:16:void <init>(java.io.InputStream,net.minecraft.client.sounds.LoopingAudioStream$1) -> <init>
+net.minecraft.client.sounds.MusicManager -> epi:
     java.util.Random random -> a
     net.minecraft.client.Minecraft minecraft -> b
     net.minecraft.client.resources.sounds.SoundInstance currentMusic -> c
     int nextSongDelay -> d
-    14:21:void <init>(net.minecraft.client.Minecraft) -> <init>
-    24:43:void tick() -> a
-    46:49:void startPlaying(net.minecraft.client.sounds.MusicManager$Music) -> a
-    52:57:void stopPlaying() -> b
-    60:64:boolean isPlayingMusic(net.minecraft.client.sounds.MusicManager$Music) -> b
-net.minecraft.client.sounds.MusicManager$Music -> edu$a:
-    net.minecraft.client.sounds.MusicManager$Music MENU -> a
-    net.minecraft.client.sounds.MusicManager$Music GAME -> b
-    net.minecraft.client.sounds.MusicManager$Music CREATIVE -> c
-    net.minecraft.client.sounds.MusicManager$Music CREDITS -> d
-    net.minecraft.client.sounds.MusicManager$Music NETHER -> e
-    net.minecraft.client.sounds.MusicManager$Music END_BOSS -> f
-    net.minecraft.client.sounds.MusicManager$Music END -> g
-    net.minecraft.client.sounds.MusicManager$Music UNDER_WATER -> h
-    net.minecraft.sounds.SoundEvent event -> i
-    int minDelay -> j
-    int maxDelay -> k
-    net.minecraft.client.sounds.MusicManager$Music[] $VALUES -> l
-    67:67:net.minecraft.client.sounds.MusicManager$Music[] values() -> values
-    67:67:net.minecraft.client.sounds.MusicManager$Music valueOf(java.lang.String) -> valueOf
-    81:85:void <init>(java.lang.String,int,net.minecraft.sounds.SoundEvent,int,int) -> <init>
-    88:88:net.minecraft.sounds.SoundEvent getEvent() -> a
-    92:92:int getMinDelay() -> b
-    96:96:int getMaxDelay() -> c
-    67:75:void <clinit>() -> <clinit>
-net.minecraft.client.sounds.SoundBufferLibrary -> edv:
+    16:24:void <init>(net.minecraft.client.Minecraft) -> <init>
+    27:46:void tick() -> a
+    49:54:void startPlaying(net.minecraft.sounds.Music) -> a
+    57:62:void stopPlaying() -> b
+    65:69:boolean isPlayingMusic(net.minecraft.sounds.Music) -> b
+net.minecraft.client.sounds.SoundBufferLibrary -> epj:
     net.minecraft.server.packs.resources.ResourceManager resourceManager -> a
     java.util.Map cache -> b
     23:27:void <init>(net.minecraft.server.packs.resources.ResourceManager) -> <init>
     30:30:java.util.concurrent.CompletableFuture getCompleteBuffer(net.minecraft.resources.ResourceLocation) -> a
-    44:52:java.util.concurrent.CompletableFuture getStream(net.minecraft.resources.ResourceLocation) -> b
+    44:52:java.util.concurrent.CompletableFuture getStream(net.minecraft.resources.ResourceLocation,boolean) -> a
     56:58:void clear() -> a
     61:61:java.util.concurrent.CompletableFuture preload(java.util.Collection) -> a
     61:61:java.util.concurrent.CompletableFuture[] lambda$preload$5(int) -> a
     61:61:java.util.concurrent.CompletableFuture lambda$preload$4(net.minecraft.client.resources.sounds.Sound) -> a
     56:56:void lambda$clear$3(java.util.concurrent.CompletableFuture) -> a
-    46:50:net.minecraft.client.sounds.AudioStream lambda$getStream$2(net.minecraft.resources.ResourceLocation) -> c
-    30:40:java.util.concurrent.CompletableFuture lambda$getCompleteBuffer$1(net.minecraft.resources.ResourceLocation) -> d
-    31:38:com.mojang.blaze3d.audio.SoundBuffer lambda$null$0(net.minecraft.resources.ResourceLocation) -> e
-net.minecraft.client.sounds.SoundEngine -> edw:
+    46:50:net.minecraft.client.sounds.AudioStream lambda$getStream$2(net.minecraft.resources.ResourceLocation,boolean) -> b
+    30:40:java.util.concurrent.CompletableFuture lambda$getCompleteBuffer$1(net.minecraft.resources.ResourceLocation) -> b
+    31:38:com.mojang.blaze3d.audio.SoundBuffer lambda$null$0(net.minecraft.resources.ResourceLocation) -> c
+net.minecraft.client.sounds.SoundEngine -> epk:
     org.apache.logging.log4j.Marker MARKER -> a
     org.apache.logging.log4j.Logger LOGGER -> b
     java.util.Set ONLY_WARN_ONCE -> c
@@ -18727,138 +19943,137 @@ net.minecraft.client.sounds.SoundEngine -> edw:
     java.util.List listeners -> r
     java.util.List queuedTickableSounds -> s
     java.util.List preloadQueue -> t
-    52:77:void <init>(net.minecraft.client.sounds.SoundManager,net.minecraft.client.Options,net.minecraft.server.packs.resources.ResourceManager) -> <init>
-    80:90:void reload() -> a
-    93:107:void loadLibrary() -> g
-    110:114:float getVolume(net.minecraft.sounds.SoundSource) -> a
-    118:138:void updateCategoryVolume(net.minecraft.sounds.SoundSource,float) -> a
-    141:147:void destroy() -> b
-    150:156:void stop(net.minecraft.client.resources.sounds.SoundInstance) -> a
-    159:170:void stopAll() -> c
-    173:174:void addEventListener(net.minecraft.client.sounds.SoundEventListener) -> a
-    177:178:void removeEventListener(net.minecraft.client.sounds.SoundEventListener) -> b
-    181:185:void tick(boolean) -> a
-    188:269:void tickNonPaused() -> h
-    272:280:boolean isActive(net.minecraft.client.resources.sounds.SoundInstance) -> b
-    284:377:void play(net.minecraft.client.resources.sounds.SoundInstance) -> c
-    380:381:void queueTickingSound(net.minecraft.client.resources.sounds.TickableSoundInstance) -> a
-    384:385:void requestPreload(net.minecraft.client.resources.sounds.Sound) -> a
-    388:388:float calculatePitch(net.minecraft.client.resources.sounds.SoundInstance) -> d
-    392:392:float calculateVolume(net.minecraft.client.resources.sounds.SoundInstance) -> e
-    396:399:void pause() -> d
-    402:405:void resume() -> e
-    408:409:void playDelayed(net.minecraft.client.resources.sounds.SoundInstance,int) -> a
-    412:424:void updateSource(net.minecraft.client.Camera) -> a
-    427:444:void stop(net.minecraft.resources.ResourceLocation,net.minecraft.sounds.SoundSource) -> a
-    447:447:java.lang.String getDebugString() -> f
-    421:423:void lambda$updateSource$11(net.minecraft.world.phys.Vec3,com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> a
-    403:403:void lambda$resume$10(java.util.stream.Stream) -> a
-    397:397:void lambda$pause$9(java.util.stream.Stream) -> b
-    368:368:void lambda$play$8(net.minecraft.client.sounds.ChannelAccess$ChannelHandle,net.minecraft.client.sounds.AudioStream) -> a
-    369:371:void lambda$null$7(net.minecraft.client.sounds.AudioStream,com.mojang.blaze3d.audio.Channel) -> a
-    361:361:void lambda$play$6(net.minecraft.client.sounds.ChannelAccess$ChannelHandle,com.mojang.blaze3d.audio.SoundBuffer) -> a
-    362:364:void lambda$null$5(com.mojang.blaze3d.audio.SoundBuffer,com.mojang.blaze3d.audio.Channel) -> a
-    346:356:void lambda$play$4(float,float,net.minecraft.client.resources.sounds.SoundInstance$Attenuation,float,boolean,net.minecraft.world.phys.Vec3,boolean,com.mojang.blaze3d.audio.Channel) -> a
-    206:209:void lambda$tickNonPaused$3(float,float,net.minecraft.world.phys.Vec3,com.mojang.blaze3d.audio.Channel) -> a
-    161:161:void lambda$stopAll$2(net.minecraft.client.sounds.ChannelAccess$ChannelHandle) -> a
-    128:137:void lambda$updateCategoryVolume$1(net.minecraft.client.resources.sounds.SoundInstance,net.minecraft.client.sounds.ChannelAccess$ChannelHandle) -> a
-    131:136:void lambda$null$0(float,com.mojang.blaze3d.audio.Channel) -> a
-    37:44:void <clinit>() -> <clinit>
-net.minecraft.client.sounds.SoundEngineExecutor -> edx:
+    53:78:void <init>(net.minecraft.client.sounds.SoundManager,net.minecraft.client.Options,net.minecraft.server.packs.resources.ResourceManager) -> <init>
+    81:91:void reload() -> a
+    94:108:void loadLibrary() -> g
+    111:115:float getVolume(net.minecraft.sounds.SoundSource) -> a
+    119:139:void updateCategoryVolume(net.minecraft.sounds.SoundSource,float) -> a
+    142:148:void destroy() -> b
+    151:157:void stop(net.minecraft.client.resources.sounds.SoundInstance) -> a
+    160:171:void stopAll() -> c
+    174:175:void addEventListener(net.minecraft.client.sounds.SoundEventListener) -> a
+    178:179:void removeEventListener(net.minecraft.client.sounds.SoundEventListener) -> b
+    182:186:void tick(boolean) -> a
+    189:272:void tickNonPaused() -> h
+    275:275:boolean requiresManualLooping(net.minecraft.client.resources.sounds.SoundInstance) -> d
+    279:279:boolean shouldLoopManually(net.minecraft.client.resources.sounds.SoundInstance) -> e
+    283:283:boolean shouldLoopAutomatically(net.minecraft.client.resources.sounds.SoundInstance) -> f
+    287:295:boolean isActive(net.minecraft.client.resources.sounds.SoundInstance) -> b
+    299:410:void play(net.minecraft.client.resources.sounds.SoundInstance) -> c
+    413:414:void queueTickingSound(net.minecraft.client.resources.sounds.TickableSoundInstance) -> a
+    417:418:void requestPreload(net.minecraft.client.resources.sounds.Sound) -> a
+    421:421:float calculatePitch(net.minecraft.client.resources.sounds.SoundInstance) -> g
+    425:425:float calculateVolume(net.minecraft.client.resources.sounds.SoundInstance) -> h
+    429:432:void pause() -> d
+    435:438:void resume() -> e
+    441:442:void playDelayed(net.minecraft.client.resources.sounds.SoundInstance,int) -> a
+    445:457:void updateSource(net.minecraft.client.Camera) -> a
+    460:477:void stop(net.minecraft.resources.ResourceLocation,net.minecraft.sounds.SoundSource) -> a
+    480:480:java.lang.String getDebugString() -> f
+    454:456:void lambda$updateSource$11(net.minecraft.world.phys.Vec3,com.mojang.math.Vector3f,com.mojang.math.Vector3f) -> a
+    436:436:void lambda$resume$10(java.util.stream.Stream) -> a
+    430:430:void lambda$pause$9(java.util.stream.Stream) -> b
+    401:401:void lambda$play$8(net.minecraft.client.sounds.ChannelAccess$ChannelHandle,net.minecraft.client.sounds.AudioStream) -> a
+    402:404:void lambda$null$7(net.minecraft.client.sounds.AudioStream,com.mojang.blaze3d.audio.Channel) -> a
+    394:394:void lambda$play$6(net.minecraft.client.sounds.ChannelAccess$ChannelHandle,com.mojang.blaze3d.audio.SoundBuffer) -> a
+    395:397:void lambda$null$5(com.mojang.blaze3d.audio.SoundBuffer,com.mojang.blaze3d.audio.Channel) -> a
+    378:389:void lambda$play$4(float,float,net.minecraft.client.resources.sounds.SoundInstance$Attenuation,float,boolean,boolean,net.minecraft.world.phys.Vec3,boolean,com.mojang.blaze3d.audio.Channel) -> a
+    210:213:void lambda$tickNonPaused$3(float,float,net.minecraft.world.phys.Vec3,com.mojang.blaze3d.audio.Channel) -> a
+    162:162:void lambda$stopAll$2(net.minecraft.client.sounds.ChannelAccess$ChannelHandle) -> a
+    129:138:void lambda$updateCategoryVolume$1(net.minecraft.client.resources.sounds.SoundInstance,net.minecraft.client.sounds.ChannelAccess$ChannelHandle) -> a
+    132:137:void lambda$null$0(float,com.mojang.blaze3d.audio.Channel) -> a
+    38:45:void <clinit>() -> <clinit>
+net.minecraft.client.sounds.SoundEngineExecutor -> epl:
     java.lang.Thread thread -> a
     boolean shutdown -> b
     13:15:void <init>() -> <init>
     18:22:java.lang.Thread createThread() -> b
     27:27:java.lang.Runnable wrapRunnable(java.lang.Runnable) -> e
     32:32:boolean shouldRun(java.lang.Runnable) -> d
-    37:37:java.lang.Thread getRunningThread() -> az
+    37:37:java.lang.Thread getRunningThread() -> au
     41:44:void run() -> c
-    49:50:void waitForTasks() -> bl
+    49:50:void waitForTasks() -> bk
     53:63:void flush() -> a
     42:42:boolean lambda$run$0() -> d
-net.minecraft.client.sounds.SoundEventListener -> edy:
+net.minecraft.client.sounds.SoundEventListener -> epm:
     void onPlaySound(net.minecraft.client.resources.sounds.SoundInstance,net.minecraft.client.sounds.WeighedSoundEvents) -> a
-net.minecraft.client.sounds.SoundManager -> edz:
+net.minecraft.client.sounds.SoundManager -> epn:
     net.minecraft.client.resources.sounds.Sound EMPTY_SOUND -> a
     org.apache.logging.log4j.Logger LOGGER -> b
     com.google.gson.Gson GSON -> c
-    java.lang.reflect.ParameterizedType SOUND_EVENT_REGISTRATION_TYPE -> d
+    com.google.gson.reflect.TypeToken SOUND_EVENT_REGISTRATION_TYPE -> d
     java.util.Map registry -> e
     net.minecraft.client.sounds.SoundEngine soundEngine -> f
-    67:72:void <init>(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.client.Options) -> <init>
-    76:104:net.minecraft.client.sounds.SoundManager$Preparations prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    109:135:void apply(net.minecraft.client.sounds.SoundManager$Preparations,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    140:143:java.util.Map getEventFromJson(java.io.InputStream) -> a
-    230:235:boolean validateSoundResource(net.minecraft.client.resources.sounds.Sound,net.minecraft.resources.ResourceLocation,net.minecraft.server.packs.resources.ResourceManager) -> b
-    240:240:net.minecraft.client.sounds.WeighedSoundEvents getSoundEvent(net.minecraft.resources.ResourceLocation) -> a
-    244:244:java.util.Collection getAvailableSounds() -> a
-    248:249:void queueTickingSound(net.minecraft.client.resources.sounds.TickableSoundInstance) -> a
-    252:253:void play(net.minecraft.client.resources.sounds.SoundInstance) -> a
-    256:257:void playDelayed(net.minecraft.client.resources.sounds.SoundInstance,int) -> a
-    260:261:void updateSource(net.minecraft.client.Camera) -> a
-    264:265:void pause() -> b
-    268:269:void stop() -> c
-    272:273:void destroy() -> d
-    276:277:void tick(boolean) -> a
-    280:281:void resume() -> e
-    284:289:void updateSourceVolume(net.minecraft.sounds.SoundSource,float) -> a
-    292:293:void stop(net.minecraft.client.resources.sounds.SoundInstance) -> b
-    296:296:boolean isActive(net.minecraft.client.resources.sounds.SoundInstance) -> c
-    300:301:void addListener(net.minecraft.client.sounds.SoundEventListener) -> a
-    304:305:void removeListener(net.minecraft.client.sounds.SoundEventListener) -> b
-    308:309:void stop(net.minecraft.resources.ResourceLocation,net.minecraft.sounds.SoundSource) -> a
-    312:312:java.lang.String getDebugString() -> f
-    40:40:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    40:40:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
-    40:40:org.apache.logging.log4j.Logger access$100() -> g
-    40:40:boolean access$200(net.minecraft.client.resources.sounds.Sound,net.minecraft.resources.ResourceLocation,net.minecraft.server.packs.resources.ResourceManager) -> a
-    41:48:void <clinit>() -> <clinit>
-net.minecraft.client.sounds.SoundManager$1 -> edz$1:
+    49:54:void <init>(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.client.Options) -> <init>
+    58:86:net.minecraft.client.sounds.SoundManager$Preparations prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    91:117:void apply(net.minecraft.client.sounds.SoundManager$Preparations,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    203:208:boolean validateSoundResource(net.minecraft.client.resources.sounds.Sound,net.minecraft.resources.ResourceLocation,net.minecraft.server.packs.resources.ResourceManager) -> b
+    213:213:net.minecraft.client.sounds.WeighedSoundEvents getSoundEvent(net.minecraft.resources.ResourceLocation) -> a
+    217:217:java.util.Collection getAvailableSounds() -> a
+    221:222:void queueTickingSound(net.minecraft.client.resources.sounds.TickableSoundInstance) -> a
+    225:226:void play(net.minecraft.client.resources.sounds.SoundInstance) -> a
+    229:230:void playDelayed(net.minecraft.client.resources.sounds.SoundInstance,int) -> a
+    233:234:void updateSource(net.minecraft.client.Camera) -> a
+    237:238:void pause() -> b
+    241:242:void stop() -> d
+    245:246:void destroy() -> e
+    249:250:void tick(boolean) -> a
+    253:254:void resume() -> f
+    257:262:void updateSourceVolume(net.minecraft.sounds.SoundSource,float) -> a
+    265:266:void stop(net.minecraft.client.resources.sounds.SoundInstance) -> b
+    269:269:boolean isActive(net.minecraft.client.resources.sounds.SoundInstance) -> c
+    273:274:void addListener(net.minecraft.client.sounds.SoundEventListener) -> a
+    277:278:void removeListener(net.minecraft.client.sounds.SoundEventListener) -> b
+    281:282:void stop(net.minecraft.resources.ResourceLocation,net.minecraft.sounds.SoundSource) -> a
+    285:285:java.lang.String getDebugString() -> g
+    39:39:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    39:39:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
+    39:39:org.apache.logging.log4j.Logger access$100() -> h
+    39:39:boolean access$200(net.minecraft.client.resources.sounds.Sound,net.minecraft.resources.ResourceLocation,net.minecraft.server.packs.resources.ResourceManager) -> a
+    40:48:void <clinit>() -> <clinit>
+net.minecraft.client.sounds.SoundManager$1 -> epn$1:
     48:48:void <init>() -> <init>
-    51:51:java.lang.reflect.Type[] getActualTypeArguments() -> getActualTypeArguments
-    59:59:java.lang.reflect.Type getRawType() -> getRawType
-    64:64:java.lang.reflect.Type getOwnerType() -> getOwnerType
-net.minecraft.client.sounds.SoundManager$2 -> edz$2:
+net.minecraft.client.sounds.SoundManager$2 -> epn$2:
     int[] $SwitchMap$net$minecraft$client$resources$sounds$Sound$Type -> a
-    164:164:void <clinit>() -> <clinit>
-net.minecraft.client.sounds.SoundManager$Preparations -> edz$a:
+    137:137:void <clinit>() -> <clinit>
+net.minecraft.client.sounds.SoundManager$Preparations -> epn$a:
     java.util.Map registry -> a
-    146:147:void <init>() -> <init>
-    150:217:void handleRegistration(net.minecraft.resources.ResourceLocation,net.minecraft.client.resources.sounds.SoundEventRegistration,net.minecraft.server.packs.resources.ResourceManager) -> a
-    220:226:void apply(java.util.Map,net.minecraft.client.sounds.SoundEngine) -> a
-    146:146:void access$000(net.minecraft.client.sounds.SoundManager$Preparations,net.minecraft.resources.ResourceLocation,net.minecraft.client.resources.sounds.SoundEventRegistration,net.minecraft.server.packs.resources.ResourceManager) -> a
-    146:146:java.util.Map access$300(net.minecraft.client.sounds.SoundManager$Preparations) -> a
-net.minecraft.client.sounds.SoundManager$Preparations$1 -> edz$a$1:
+    119:120:void <init>() -> <init>
+    123:190:void handleRegistration(net.minecraft.resources.ResourceLocation,net.minecraft.client.resources.sounds.SoundEventRegistration,net.minecraft.server.packs.resources.ResourceManager) -> a
+    193:199:void apply(java.util.Map,net.minecraft.client.sounds.SoundEngine) -> a
+    119:119:void access$000(net.minecraft.client.sounds.SoundManager$Preparations,net.minecraft.resources.ResourceLocation,net.minecraft.client.resources.sounds.SoundEventRegistration,net.minecraft.server.packs.resources.ResourceManager) -> a
+    119:119:java.util.Map access$300(net.minecraft.client.sounds.SoundManager$Preparations) -> a
+net.minecraft.client.sounds.SoundManager$Preparations$1 -> epn$a$1:
     net.minecraft.resources.ResourceLocation val$soundLocation -> a
     net.minecraft.client.resources.sounds.Sound val$sound -> b
     net.minecraft.client.sounds.SoundManager$Preparations this$0 -> c
-    173:173:void <init>(net.minecraft.client.sounds.SoundManager$Preparations,net.minecraft.resources.ResourceLocation,net.minecraft.client.resources.sounds.Sound) -> <init>
-    176:177:int getWeight() -> e
-    182:197:net.minecraft.client.resources.sounds.Sound getSound() -> a
-    203:208:void preloadIfRequired(net.minecraft.client.sounds.SoundEngine) -> a
-    173:173:java.lang.Object getSound() -> k
-net.minecraft.client.sounds.WeighedSoundEvents -> eea:
+    146:146:void <init>(net.minecraft.client.sounds.SoundManager$Preparations,net.minecraft.resources.ResourceLocation,net.minecraft.client.resources.sounds.Sound) -> <init>
+    149:150:int getWeight() -> e
+    155:170:net.minecraft.client.resources.sounds.Sound getSound() -> a
+    176:181:void preloadIfRequired(net.minecraft.client.sounds.SoundEngine) -> a
+    146:146:java.lang.Object getSound() -> k
+net.minecraft.client.sounds.WeighedSoundEvents -> epo:
     java.util.List list -> a
     java.util.Random random -> b
     net.minecraft.resources.ResourceLocation location -> c
     net.minecraft.network.chat.Component subtitle -> d
-    17:36:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String) -> <init>
-    40:44:int getWeight() -> e
-    49:64:net.minecraft.client.resources.sounds.Sound getSound() -> a
-    68:69:void addSound(net.minecraft.client.sounds.Weighted) -> a
-    72:72:net.minecraft.resources.ResourceLocation getResourceLocation() -> b
-    77:77:net.minecraft.network.chat.Component getSubtitle() -> c
-    82:85:void preloadIfRequired(net.minecraft.client.sounds.SoundEngine) -> a
-    16:16:java.lang.Object getSound() -> k
-net.minecraft.client.sounds.Weighted -> eeb:
+    18:38:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String) -> <init>
+    42:46:int getWeight() -> e
+    51:66:net.minecraft.client.resources.sounds.Sound getSound() -> a
+    70:71:void addSound(net.minecraft.client.sounds.Weighted) -> a
+    74:74:net.minecraft.resources.ResourceLocation getResourceLocation() -> b
+    79:79:net.minecraft.network.chat.Component getSubtitle() -> c
+    84:87:void preloadIfRequired(net.minecraft.client.sounds.SoundEngine) -> a
+    17:17:java.lang.Object getSound() -> k
+net.minecraft.client.sounds.Weighted -> epp:
     int getWeight() -> e
     java.lang.Object getSound() -> k
     void preloadIfRequired(net.minecraft.client.sounds.SoundEngine) -> a
-net.minecraft.client.sounds.package-info -> eec:
-net.minecraft.client.tutorial.CompletedTutorialStepInstance -> eed:
+net.minecraft.client.sounds.package-info -> epq:
+net.minecraft.client.tutorial.CompletedTutorialStepInstance -> epr:
     net.minecraft.client.tutorial.Tutorial tutorial -> a
     6:8:void <init>(net.minecraft.client.tutorial.Tutorial) -> <init>
-net.minecraft.client.tutorial.CraftPlanksTutorialStep -> eee:
+net.minecraft.client.tutorial.CraftPlanksTutorialStep -> eps:
     net.minecraft.network.chat.Component CRAFT_TITLE -> a
     net.minecraft.network.chat.Component CRAFT_DESCRIPTION -> b
     net.minecraft.client.tutorial.Tutorial tutorial -> c
@@ -18870,21 +20085,21 @@ net.minecraft.client.tutorial.CraftPlanksTutorialStep -> eee:
     70:74:void onGetItem(net.minecraft.world.item.ItemStack) -> a
     77:82:boolean hasCraftedPlanksPreviously(net.minecraft.client.player.LocalPlayer,net.minecraft.tags.Tag) -> a
     18:19:void <clinit>() -> <clinit>
-net.minecraft.client.tutorial.FindTreeTutorialStepInstance -> eef:
+net.minecraft.client.tutorial.FindTreeTutorialStepInstance -> ept:
     java.util.Set TREE_BLOCKS -> a
     net.minecraft.network.chat.Component TITLE -> b
     net.minecraft.network.chat.Component DESCRIPTION -> c
     net.minecraft.client.tutorial.Tutorial tutorial -> d
     net.minecraft.client.gui.components.toasts.TutorialToast toast -> e
     int timeWaiting -> f
-    51:53:void <init>(net.minecraft.client.tutorial.Tutorial) -> <init>
-    57:86:void tick() -> a
-    90:94:void clear() -> b
-    98:104:void onLookAt(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.phys.HitResult) -> a
-    108:114:void onGetItem(net.minecraft.world.item.ItemStack) -> a
-    117:122:boolean hasPunchedTreesPreviously(net.minecraft.client.player.LocalPlayer) -> a
-    23:45:void <clinit>() -> <clinit>
-net.minecraft.client.tutorial.MovementTutorialStepInstance -> eeg:
+    57:59:void <init>(net.minecraft.client.tutorial.Tutorial) -> <init>
+    63:92:void tick() -> a
+    96:100:void clear() -> b
+    104:110:void onLookAt(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.world.phys.HitResult) -> a
+    114:120:void onGetItem(net.minecraft.world.item.ItemStack) -> a
+    123:128:boolean hasPunchedTreesPreviously(net.minecraft.client.player.LocalPlayer) -> a
+    23:51:void <clinit>() -> <clinit>
+net.minecraft.client.tutorial.MovementTutorialStepInstance -> epu:
     net.minecraft.network.chat.Component MOVE_TITLE -> a
     net.minecraft.network.chat.Component MOVE_DESCRIPTION -> b
     net.minecraft.network.chat.Component LOOK_TITLE -> c
@@ -18905,7 +20120,7 @@ net.minecraft.client.tutorial.MovementTutorialStepInstance -> eeg:
     111:114:void onInput(net.minecraft.client.player.Input) -> a
     118:121:void onMouse(double,double) -> a
     19:23:void <clinit>() -> <clinit>
-net.minecraft.client.tutorial.OpenInventoryTutorialStep -> eeh:
+net.minecraft.client.tutorial.OpenInventoryTutorialStep -> epv:
     net.minecraft.network.chat.Component TITLE -> a
     net.minecraft.network.chat.Component DESCRIPTION -> b
     net.minecraft.client.tutorial.Tutorial tutorial -> c
@@ -18916,7 +20131,7 @@ net.minecraft.client.tutorial.OpenInventoryTutorialStep -> eeh:
     42:46:void clear() -> b
     50:51:void onOpenInventory() -> c
     12:13:void <clinit>() -> <clinit>
-net.minecraft.client.tutorial.PunchTreeTutorialStepInstance -> eei:
+net.minecraft.client.tutorial.PunchTreeTutorialStepInstance -> epw:
     net.minecraft.network.chat.Component TITLE -> a
     net.minecraft.network.chat.Component DESCRIPTION -> b
     net.minecraft.client.tutorial.Tutorial tutorial -> c
@@ -18929,7 +20144,7 @@ net.minecraft.client.tutorial.PunchTreeTutorialStepInstance -> eei:
     72:85:void onDestroyBlock(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,float) -> a
     89:93:void onGetItem(net.minecraft.world.item.ItemStack) -> a
     19:20:void <clinit>() -> <clinit>
-net.minecraft.client.tutorial.Tutorial -> eej:
+net.minecraft.client.tutorial.Tutorial -> epx:
     net.minecraft.client.Minecraft minecraft -> a
     net.minecraft.client.tutorial.TutorialStepInstance instance -> b
     22:24:void <init>(net.minecraft.client.Minecraft) -> <init>
@@ -18946,7 +20161,7 @@ net.minecraft.client.tutorial.Tutorial -> eej:
     99:99:net.minecraft.client.Minecraft getMinecraft() -> e
     103:106:net.minecraft.world.level.GameType getGameMode() -> f
     110:110:net.minecraft.network.chat.Component key(java.lang.String) -> a
-net.minecraft.client.tutorial.TutorialStepInstance -> eek:
+net.minecraft.client.tutorial.TutorialStepInstance -> epy:
     12:12:void clear() -> b
     15:15:void tick() -> a
     18:18:void onInput(net.minecraft.client.player.Input) -> a
@@ -18955,7 +20170,7 @@ net.minecraft.client.tutorial.TutorialStepInstance -> eek:
     27:27:void onDestroyBlock(net.minecraft.client.multiplayer.ClientLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,float) -> a
     30:30:void onOpenInventory() -> c
     33:33:void onGetItem(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.client.tutorial.TutorialSteps -> eel:
+net.minecraft.client.tutorial.TutorialSteps -> epz:
     net.minecraft.client.tutorial.TutorialSteps MOVEMENT -> a
     net.minecraft.client.tutorial.TutorialSteps FIND_TREE -> b
     net.minecraft.client.tutorial.TutorialSteps PUNCH_TREE -> c
@@ -18972,8 +20187,8 @@ net.minecraft.client.tutorial.TutorialSteps -> eel:
     27:27:java.lang.String getName() -> a
     31:36:net.minecraft.client.tutorial.TutorialSteps getByName(java.lang.String) -> a
     5:11:void <clinit>() -> <clinit>
-net.minecraft.client.tutorial.package-info -> eem:
-net.minecraft.commands.BrigadierExceptions -> cm:
+net.minecraft.client.tutorial.package-info -> eqa:
+net.minecraft.commands.BrigadierExceptions -> cv:
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType DOUBLE_TOO_SMALL -> a
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType DOUBLE_TOO_BIG -> b
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType FLOAT_TOO_SMALL -> c
@@ -19047,56 +20262,56 @@ net.minecraft.commands.BrigadierExceptions -> cm:
     11:11:com.mojang.brigadier.Message lambda$static$1(java.lang.Object,java.lang.Object) -> g
     10:10:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object) -> h
     10:42:void <clinit>() -> <clinit>
-net.minecraft.commands.CommandFunction -> cn:
+net.minecraft.commands.CommandFunction -> cw:
     net.minecraft.commands.CommandFunction$Entry[] entries -> a
     net.minecraft.resources.ResourceLocation id -> b
-    19:22:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.commands.CommandFunction$Entry[]) -> <init>
-    25:25:net.minecraft.resources.ResourceLocation getId() -> a
-    29:29:net.minecraft.commands.CommandFunction$Entry[] getEntries() -> b
-    33:65:net.minecraft.commands.CommandFunction fromLines(net.minecraft.resources.ResourceLocation,net.minecraft.server.ServerFunctionManager,java.util.List) -> a
-    15:15:net.minecraft.resources.ResourceLocation access$000(net.minecraft.commands.CommandFunction) -> a
-net.minecraft.commands.CommandFunction$CacheableFunction -> cn$a:
+    20:23:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.commands.CommandFunction$Entry[]) -> <init>
+    26:26:net.minecraft.resources.ResourceLocation getId() -> a
+    30:30:net.minecraft.commands.CommandFunction$Entry[] getEntries() -> b
+    34:66:net.minecraft.commands.CommandFunction fromLines(net.minecraft.resources.ResourceLocation,com.mojang.brigadier.CommandDispatcher,net.minecraft.commands.CommandSourceStack,java.util.List) -> a
+    16:16:net.minecraft.resources.ResourceLocation access$000(net.minecraft.commands.CommandFunction) -> a
+net.minecraft.commands.CommandFunction$CacheableFunction -> cw$a:
     net.minecraft.commands.CommandFunction$CacheableFunction NONE -> a
     net.minecraft.resources.ResourceLocation id -> b
     boolean resolved -> c
     java.util.Optional function -> d
-    121:125:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    121:131:void <init>(net.minecraft.commands.CommandFunction) -> <init>
-    134:140:java.util.Optional get(net.minecraft.server.ServerFunctionManager) -> a
-    145:145:net.minecraft.resources.ResourceLocation getId() -> a
-    145:145:net.minecraft.resources.ResourceLocation lambda$getId$0(net.minecraft.commands.CommandFunction) -> a
-    116:116:void <clinit>() -> <clinit>
-net.minecraft.commands.CommandFunction$CommandEntry -> cn$b:
+    122:126:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
+    122:132:void <init>(net.minecraft.commands.CommandFunction) -> <init>
+    135:141:java.util.Optional get(net.minecraft.server.ServerFunctionManager) -> a
+    146:146:net.minecraft.resources.ResourceLocation getId() -> a
+    146:146:net.minecraft.resources.ResourceLocation lambda$getId$0(net.minecraft.commands.CommandFunction) -> a
+    117:117:void <clinit>() -> <clinit>
+net.minecraft.commands.CommandFunction$CommandEntry -> cw$b:
     com.mojang.brigadier.ParseResults parse -> a
-    75:77:void <init>(com.mojang.brigadier.ParseResults) -> <init>
-    81:82:void execute(net.minecraft.server.ServerFunctionManager,net.minecraft.commands.CommandSourceStack,java.util.ArrayDeque,int) -> a
-    86:86:java.lang.String toString() -> toString
-net.minecraft.commands.CommandFunction$Entry -> cn$c:
+    76:78:void <init>(com.mojang.brigadier.ParseResults) -> <init>
+    82:83:void execute(net.minecraft.server.ServerFunctionManager,net.minecraft.commands.CommandSourceStack,java.util.ArrayDeque,int) -> a
+    87:87:java.lang.String toString() -> toString
+net.minecraft.commands.CommandFunction$Entry -> cw$c:
     void execute(net.minecraft.server.ServerFunctionManager,net.minecraft.commands.CommandSourceStack,java.util.ArrayDeque,int) -> a
-net.minecraft.commands.CommandFunction$FunctionEntry -> cn$d:
+net.minecraft.commands.CommandFunction$FunctionEntry -> cw$d:
     net.minecraft.commands.CommandFunction$CacheableFunction function -> a
-    93:95:void <init>(net.minecraft.commands.CommandFunction) -> <init>
-    99:107:void execute(net.minecraft.server.ServerFunctionManager,net.minecraft.commands.CommandSourceStack,java.util.ArrayDeque,int) -> a
-    111:111:java.lang.String toString() -> toString
-    100:106:void lambda$execute$0(int,java.util.ArrayDeque,net.minecraft.server.ServerFunctionManager,net.minecraft.commands.CommandSourceStack,net.minecraft.commands.CommandFunction) -> a
-net.minecraft.commands.CommandRuntimeException -> co:
+    94:96:void <init>(net.minecraft.commands.CommandFunction) -> <init>
+    100:108:void execute(net.minecraft.server.ServerFunctionManager,net.minecraft.commands.CommandSourceStack,java.util.ArrayDeque,int) -> a
+    112:112:java.lang.String toString() -> toString
+    101:107:void lambda$execute$0(int,java.util.ArrayDeque,net.minecraft.server.ServerFunctionManager,net.minecraft.commands.CommandSourceStack,net.minecraft.commands.CommandFunction) -> a
+net.minecraft.commands.CommandRuntimeException -> cx:
     net.minecraft.network.chat.Component message -> a
     10:12:void <init>(net.minecraft.network.chat.Component) -> <init>
     15:15:net.minecraft.network.chat.Component getComponent() -> a
-net.minecraft.commands.CommandSource -> cp:
+net.minecraft.commands.CommandSource -> cy:
     net.minecraft.commands.CommandSource NULL -> a_
-    void sendMessage(net.minecraft.network.chat.Component) -> a
+    void sendMessage(net.minecraft.network.chat.Component,java.util.UUID) -> a
     boolean acceptsSuccess() -> a
     boolean acceptsFailure() -> b
-    boolean shouldInformAdmins() -> I_
-    6:6:void <clinit>() -> <clinit>
-net.minecraft.commands.CommandSource$1 -> cp$1:
-    6:6:void <init>() -> <init>
-    9:9:void sendMessage(net.minecraft.network.chat.Component) -> a
-    13:13:boolean acceptsSuccess() -> a
-    18:18:boolean acceptsFailure() -> b
-    23:23:boolean shouldInformAdmins() -> I_
-net.minecraft.commands.CommandSourceStack -> cq:
+    boolean shouldInformAdmins() -> S_
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.commands.CommandSource$1 -> cy$1:
+    8:8:void <init>() -> <init>
+    11:11:void sendMessage(net.minecraft.network.chat.Component,java.util.UUID) -> a
+    15:15:boolean acceptsSuccess() -> a
+    20:20:boolean acceptsFailure() -> b
+    25:25:boolean shouldInformAdmins() -> S_
+net.minecraft.commands.CommandSourceStack -> cz:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_PLAYER -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_ENTITY -> b
     net.minecraft.commands.CommandSource source -> c
@@ -19111,103 +20326,121 @@ net.minecraft.commands.CommandSourceStack -> cq:
     com.mojang.brigadier.ResultConsumer consumer -> l
     net.minecraft.commands.arguments.EntityAnchorArgument$Anchor anchor -> m
     net.minecraft.world.phys.Vec2 rotation -> n
-    51:52:void <init>(net.minecraft.commands.CommandSource,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec2,net.minecraft.server.level.ServerLevel,int,java.lang.String,net.minecraft.network.chat.Component,net.minecraft.server.MinecraftServer,net.minecraft.world.entity.Entity) -> <init>
-    54:67:void <init>(net.minecraft.commands.CommandSource,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec2,net.minecraft.server.level.ServerLevel,int,java.lang.String,net.minecraft.network.chat.Component,net.minecraft.server.MinecraftServer,net.minecraft.world.entity.Entity,boolean,com.mojang.brigadier.ResultConsumer,net.minecraft.commands.arguments.EntityAnchorArgument$Anchor) -> <init>
-    70:73:net.minecraft.commands.CommandSourceStack withEntity(net.minecraft.world.entity.Entity) -> a
-    77:80:net.minecraft.commands.CommandSourceStack withPosition(net.minecraft.world.phys.Vec3) -> a
-    84:87:net.minecraft.commands.CommandSourceStack withRotation(net.minecraft.world.phys.Vec2) -> a
-    91:94:net.minecraft.commands.CommandSourceStack withCallback(com.mojang.brigadier.ResultConsumer) -> a
-    98:99:net.minecraft.commands.CommandSourceStack withCallback(com.mojang.brigadier.ResultConsumer,java.util.function.BinaryOperator) -> a
-    103:106:net.minecraft.commands.CommandSourceStack withSuppressedOutput() -> a
-    110:113:net.minecraft.commands.CommandSourceStack withPermission(int) -> a
-    117:120:net.minecraft.commands.CommandSourceStack withMaximumPermission(int) -> b
-    124:127:net.minecraft.commands.CommandSourceStack withAnchor(net.minecraft.commands.arguments.EntityAnchorArgument$Anchor) -> a
-    131:134:net.minecraft.commands.CommandSourceStack withLevel(net.minecraft.server.level.ServerLevel) -> a
-    138:138:net.minecraft.commands.CommandSourceStack facing(net.minecraft.world.entity.Entity,net.minecraft.commands.arguments.EntityAnchorArgument$Anchor) -> a
-    142:150:net.minecraft.commands.CommandSourceStack facing(net.minecraft.world.phys.Vec3) -> b
-    154:154:net.minecraft.network.chat.Component getDisplayName() -> b
-    158:158:java.lang.String getTextName() -> c
-    163:163:boolean hasPermission(int) -> c
-    167:167:net.minecraft.world.phys.Vec3 getPosition() -> d
-    171:171:net.minecraft.server.level.ServerLevel getLevel() -> e
-    176:176:net.minecraft.world.entity.Entity getEntity() -> f
-    180:183:net.minecraft.world.entity.Entity getEntityOrException() -> g
-    187:190:net.minecraft.server.level.ServerPlayer getPlayerOrException() -> h
-    194:194:net.minecraft.world.phys.Vec2 getRotation() -> i
-    198:198:net.minecraft.server.MinecraftServer getServer() -> j
-    202:202:net.minecraft.commands.arguments.EntityAnchorArgument$Anchor getAnchor() -> k
-    206:212:void sendSuccess(net.minecraft.network.chat.Component,boolean) -> a
-    215:228:void broadcastToAdmins(net.minecraft.network.chat.Component) -> b
-    231:234:void sendFailure(net.minecraft.network.chat.Component) -> a
-    237:240:void onCommandComplete(com.mojang.brigadier.context.CommandContext,boolean,int) -> a
-    244:244:java.util.Collection getOnlinePlayerNames() -> l
-    249:249:java.util.Collection getAllTeams() -> m
-    254:254:java.util.Collection getAvailableSoundEvents() -> n
-    259:259:java.util.stream.Stream getRecipeNames() -> o
-    264:264:java.util.concurrent.CompletableFuture customSuggestion(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    51:51:void lambda$new$0(com.mojang.brigadier.context.CommandContext,boolean,int) -> b
-    33:34:void <clinit>() -> <clinit>
-net.minecraft.commands.Commands -> cr:
+    56:57:void <init>(net.minecraft.commands.CommandSource,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec2,net.minecraft.server.level.ServerLevel,int,java.lang.String,net.minecraft.network.chat.Component,net.minecraft.server.MinecraftServer,net.minecraft.world.entity.Entity) -> <init>
+    59:72:void <init>(net.minecraft.commands.CommandSource,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec2,net.minecraft.server.level.ServerLevel,int,java.lang.String,net.minecraft.network.chat.Component,net.minecraft.server.MinecraftServer,net.minecraft.world.entity.Entity,boolean,com.mojang.brigadier.ResultConsumer,net.minecraft.commands.arguments.EntityAnchorArgument$Anchor) -> <init>
+    75:78:net.minecraft.commands.CommandSourceStack withEntity(net.minecraft.world.entity.Entity) -> a
+    82:85:net.minecraft.commands.CommandSourceStack withPosition(net.minecraft.world.phys.Vec3) -> a
+    89:92:net.minecraft.commands.CommandSourceStack withRotation(net.minecraft.world.phys.Vec2) -> a
+    96:99:net.minecraft.commands.CommandSourceStack withCallback(com.mojang.brigadier.ResultConsumer) -> a
+    103:104:net.minecraft.commands.CommandSourceStack withCallback(com.mojang.brigadier.ResultConsumer,java.util.function.BinaryOperator) -> a
+    108:111:net.minecraft.commands.CommandSourceStack withSuppressedOutput() -> a
+    115:118:net.minecraft.commands.CommandSourceStack withPermission(int) -> a
+    122:125:net.minecraft.commands.CommandSourceStack withMaximumPermission(int) -> b
+    129:132:net.minecraft.commands.CommandSourceStack withAnchor(net.minecraft.commands.arguments.EntityAnchorArgument$Anchor) -> a
+    136:139:net.minecraft.commands.CommandSourceStack withLevel(net.minecraft.server.level.ServerLevel) -> a
+    143:143:net.minecraft.commands.CommandSourceStack facing(net.minecraft.world.entity.Entity,net.minecraft.commands.arguments.EntityAnchorArgument$Anchor) -> a
+    147:155:net.minecraft.commands.CommandSourceStack facing(net.minecraft.world.phys.Vec3) -> b
+    159:159:net.minecraft.network.chat.Component getDisplayName() -> b
+    163:163:java.lang.String getTextName() -> c
+    168:168:boolean hasPermission(int) -> c
+    172:172:net.minecraft.world.phys.Vec3 getPosition() -> d
+    176:176:net.minecraft.server.level.ServerLevel getLevel() -> e
+    181:181:net.minecraft.world.entity.Entity getEntity() -> f
+    185:188:net.minecraft.world.entity.Entity getEntityOrException() -> g
+    192:195:net.minecraft.server.level.ServerPlayer getPlayerOrException() -> h
+    199:199:net.minecraft.world.phys.Vec2 getRotation() -> i
+    203:203:net.minecraft.server.MinecraftServer getServer() -> j
+    207:207:net.minecraft.commands.arguments.EntityAnchorArgument$Anchor getAnchor() -> k
+    211:217:void sendSuccess(net.minecraft.network.chat.Component,boolean) -> a
+    220:233:void broadcastToAdmins(net.minecraft.network.chat.Component) -> b
+    236:239:void sendFailure(net.minecraft.network.chat.Component) -> a
+    242:245:void onCommandComplete(com.mojang.brigadier.context.CommandContext,boolean,int) -> a
+    249:249:java.util.Collection getOnlinePlayerNames() -> l
+    254:254:java.util.Collection getAllTeams() -> m
+    259:259:java.util.Collection getAvailableSoundEvents() -> n
+    264:264:java.util.stream.Stream getRecipeNames() -> o
+    269:269:java.util.concurrent.CompletableFuture customSuggestion(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    274:274:java.util.Set levels() -> p
+    279:279:net.minecraft.core.RegistryAccess registryAccess() -> q
+    56:56:void lambda$new$0(com.mojang.brigadier.context.CommandContext,boolean,int) -> b
+    38:39:void <clinit>() -> <clinit>
+net.minecraft.commands.Commands -> da:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.mojang.brigadier.CommandDispatcher dispatcher -> b
-    128:218:void <init>(boolean) -> <init>
-    222:226:void serializeTreeToFile(java.io.File) -> a
-    229:281:int performCommand(net.minecraft.commands.CommandSourceStack,java.lang.String) -> a
-    285:290:void sendCommands(net.minecraft.server.level.ServerPlayer) -> a
-    293:321:void fillUsableCommands(com.mojang.brigadier.tree.CommandNode,com.mojang.brigadier.tree.CommandNode,net.minecraft.commands.CommandSourceStack,java.util.Map) -> a
-    324:324:com.mojang.brigadier.builder.LiteralArgumentBuilder literal(java.lang.String) -> a
-    328:328:com.mojang.brigadier.builder.RequiredArgumentBuilder argument(java.lang.String,com.mojang.brigadier.arguments.ArgumentType) -> a
-    332:332:java.util.function.Predicate createValidator(net.minecraft.commands.Commands$ParseFunction) -> a
-    343:343:com.mojang.brigadier.CommandDispatcher getDispatcher() -> a
-    348:355:com.mojang.brigadier.exceptions.CommandSyntaxException getParseException(com.mojang.brigadier.ParseResults) -> a
-    334:337:boolean lambda$createValidator$6(net.minecraft.commands.Commands$ParseFunction,java.lang.String) -> a
-    300:300:int lambda$fillUsableCommands$5(com.mojang.brigadier.context.CommandContext) -> a
-    296:296:boolean lambda$fillUsableCommands$4(net.minecraft.commands.SharedSuggestionProvider) -> a
-    272:272:void lambda$performCommand$3(net.minecraft.network.chat.Component,net.minecraft.network.chat.Style) -> a
-    244:244:void lambda$performCommand$2(java.lang.String,net.minecraft.network.chat.Style) -> a
-    216:217:void lambda$new$1(com.mojang.brigadier.context.CommandContext,boolean,int) -> a
-    212:213:void lambda$new$0(com.mojang.brigadier.tree.CommandNode,com.mojang.brigadier.tree.CommandNode,com.mojang.brigadier.tree.CommandNode,java.util.Collection) -> a
-    115:115:void <clinit>() -> <clinit>
-net.minecraft.commands.Commands$ParseFunction -> cr$a:
+    132:243:void <init>(net.minecraft.commands.Commands$CommandSelection) -> <init>
+    247:251:void serializeTreeToFile(java.io.File) -> a
+    254:306:int performCommand(net.minecraft.commands.CommandSourceStack,java.lang.String) -> a
+    310:315:void sendCommands(net.minecraft.server.level.ServerPlayer) -> a
+    318:346:void fillUsableCommands(com.mojang.brigadier.tree.CommandNode,com.mojang.brigadier.tree.CommandNode,net.minecraft.commands.CommandSourceStack,java.util.Map) -> a
+    349:349:com.mojang.brigadier.builder.LiteralArgumentBuilder literal(java.lang.String) -> a
+    353:353:com.mojang.brigadier.builder.RequiredArgumentBuilder argument(java.lang.String,com.mojang.brigadier.arguments.ArgumentType) -> a
+    357:357:java.util.function.Predicate createValidator(net.minecraft.commands.Commands$ParseFunction) -> a
+    368:368:com.mojang.brigadier.CommandDispatcher getDispatcher() -> a
+    373:380:com.mojang.brigadier.exceptions.CommandSyntaxException getParseException(com.mojang.brigadier.ParseResults) -> a
+    359:362:boolean lambda$createValidator$6(net.minecraft.commands.Commands$ParseFunction,java.lang.String) -> a
+    325:325:int lambda$fillUsableCommands$5(com.mojang.brigadier.context.CommandContext) -> a
+    321:321:boolean lambda$fillUsableCommands$4(net.minecraft.commands.SharedSuggestionProvider) -> a
+    297:297:net.minecraft.network.chat.Style lambda$performCommand$3(net.minecraft.network.chat.MutableComponent,net.minecraft.network.chat.Style) -> a
+    269:269:net.minecraft.network.chat.Style lambda$performCommand$2(java.lang.String,net.minecraft.network.chat.Style) -> a
+    241:242:void lambda$new$1(com.mojang.brigadier.context.CommandContext,boolean,int) -> a
+    237:238:void lambda$new$0(com.mojang.brigadier.tree.CommandNode,com.mojang.brigadier.tree.CommandNode,com.mojang.brigadier.tree.CommandNode,java.util.Collection) -> a
+    119:119:void <clinit>() -> <clinit>
+net.minecraft.commands.Commands$CommandSelection -> da$a:
+    net.minecraft.commands.Commands$CommandSelection ALL -> a
+    net.minecraft.commands.Commands$CommandSelection DEDICATED -> b
+    net.minecraft.commands.Commands$CommandSelection INTEGRATED -> c
+    boolean includeIntegrated -> d
+    boolean includeDedicated -> e
+    net.minecraft.commands.Commands$CommandSelection[] $VALUES -> f
+    134:134:net.minecraft.commands.Commands$CommandSelection[] values() -> values
+    134:134:net.minecraft.commands.Commands$CommandSelection valueOf(java.lang.String) -> valueOf
+    143:146:void <init>(java.lang.String,int,boolean,boolean) -> <init>
+    134:134:boolean access$000(net.minecraft.commands.Commands$CommandSelection) -> a
+    134:134:boolean access$100(net.minecraft.commands.Commands$CommandSelection) -> b
+    134:137:void <clinit>() -> <clinit>
+net.minecraft.commands.Commands$ParseFunction -> da$b:
     void parse(com.mojang.brigadier.StringReader) -> parse
-net.minecraft.commands.SharedSuggestionProvider -> cs:
+net.minecraft.commands.SharedSuggestionProvider -> db:
     java.util.Collection getOnlinePlayerNames() -> l
-    43:43:java.util.Collection getSelectedEntities() -> p
+    47:47:java.util.Collection getSelectedEntities() -> r
     java.util.Collection getAllTeams() -> m
     java.util.Collection getAvailableSoundEvents() -> n
     java.util.stream.Stream getRecipeNames() -> o
     java.util.concurrent.CompletableFuture customSuggestion(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    55:55:java.util.Collection getRelevantCoordinates() -> q
-    59:59:java.util.Collection getAbsoluteCoordinates() -> r
+    59:59:java.util.Collection getRelevantCoordinates() -> s
+    63:63:java.util.Collection getAbsoluteCoordinates() -> t
+    java.util.Set levels() -> p
+    net.minecraft.core.RegistryAccess registryAccess() -> q
     boolean hasPermission(int) -> c
-    65:79:void filterResources(java.lang.Iterable,java.lang.String,java.util.function.Function,java.util.function.Consumer) -> a
-    82:91:void filterResources(java.lang.Iterable,java.lang.String,java.lang.String,java.util.function.Function,java.util.function.Consumer) -> a
-    94:96:java.util.concurrent.CompletableFuture suggestResource(java.lang.Iterable,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.lang.String) -> a
-    100:102:java.util.concurrent.CompletableFuture suggestResource(java.lang.Iterable,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    106:108:java.util.concurrent.CompletableFuture suggestResource(java.lang.Iterable,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Function,java.util.function.Function) -> a
-    112:112:java.util.concurrent.CompletableFuture suggestResource(java.util.stream.Stream,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    116:116:java.util.concurrent.CompletableFuture suggestResource(java.util.stream.Stream,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Function,java.util.function.Function) -> a
-    120:151:java.util.concurrent.CompletableFuture suggestCoordinates(java.lang.String,java.util.Collection,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Predicate) -> a
-    155:176:java.util.concurrent.CompletableFuture suggest2DCoordinates(java.lang.String,java.util.Collection,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Predicate) -> b
-    180:186:java.util.concurrent.CompletableFuture suggest(java.lang.Iterable,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> b
-    190:192:java.util.concurrent.CompletableFuture suggest(java.util.stream.Stream,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> b
-    196:202:java.util.concurrent.CompletableFuture suggest(java.lang.String[],com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    206:213:java.util.concurrent.CompletableFuture suggest(java.lang.Iterable,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Function,java.util.function.Function) -> b
-    191:191:boolean lambda$suggest$5(java.lang.String,java.lang.String) -> a
-    107:107:void lambda$suggestResource$4(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Function,java.util.function.Function,java.lang.Object) -> a
-    101:101:void lambda$suggestResource$3(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.resources.ResourceLocation) -> a
-    101:101:net.minecraft.resources.ResourceLocation lambda$suggestResource$2(net.minecraft.resources.ResourceLocation) -> a
-    95:95:void lambda$suggestResource$1(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.lang.String,net.minecraft.resources.ResourceLocation) -> a
-    95:95:net.minecraft.resources.ResourceLocation lambda$suggestResource$0(net.minecraft.resources.ResourceLocation) -> b
-net.minecraft.commands.SharedSuggestionProvider$TextCoordinates -> cs$a:
+    73:87:void filterResources(java.lang.Iterable,java.lang.String,java.util.function.Function,java.util.function.Consumer) -> a
+    90:99:void filterResources(java.lang.Iterable,java.lang.String,java.lang.String,java.util.function.Function,java.util.function.Consumer) -> a
+    102:104:java.util.concurrent.CompletableFuture suggestResource(java.lang.Iterable,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.lang.String) -> a
+    108:110:java.util.concurrent.CompletableFuture suggestResource(java.lang.Iterable,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    114:116:java.util.concurrent.CompletableFuture suggestResource(java.lang.Iterable,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Function,java.util.function.Function) -> a
+    120:120:java.util.concurrent.CompletableFuture suggestResource(java.util.stream.Stream,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    124:124:java.util.concurrent.CompletableFuture suggestResource(java.util.stream.Stream,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Function,java.util.function.Function) -> a
+    128:159:java.util.concurrent.CompletableFuture suggestCoordinates(java.lang.String,java.util.Collection,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Predicate) -> a
+    163:184:java.util.concurrent.CompletableFuture suggest2DCoordinates(java.lang.String,java.util.Collection,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Predicate) -> b
+    188:194:java.util.concurrent.CompletableFuture suggest(java.lang.Iterable,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> b
+    198:200:java.util.concurrent.CompletableFuture suggest(java.util.stream.Stream,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> b
+    204:210:java.util.concurrent.CompletableFuture suggest(java.lang.String[],com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    214:221:java.util.concurrent.CompletableFuture suggest(java.lang.Iterable,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Function,java.util.function.Function) -> b
+    225:235:boolean matchesSubStr(java.lang.String,java.lang.String) -> a
+    199:199:boolean lambda$suggest$5(java.lang.String,java.lang.String) -> b
+    115:115:void lambda$suggestResource$4(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Function,java.util.function.Function,java.lang.Object) -> a
+    109:109:void lambda$suggestResource$3(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.resources.ResourceLocation) -> a
+    109:109:net.minecraft.resources.ResourceLocation lambda$suggestResource$2(net.minecraft.resources.ResourceLocation) -> a
+    103:103:void lambda$suggestResource$1(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.lang.String,net.minecraft.resources.ResourceLocation) -> a
+    103:103:net.minecraft.resources.ResourceLocation lambda$suggestResource$0(net.minecraft.resources.ResourceLocation) -> b
+net.minecraft.commands.SharedSuggestionProvider$TextCoordinates -> db$a:
     net.minecraft.commands.SharedSuggestionProvider$TextCoordinates DEFAULT_LOCAL -> a
     net.minecraft.commands.SharedSuggestionProvider$TextCoordinates DEFAULT_GLOBAL -> b
     java.lang.String x -> c
     java.lang.String y -> d
     java.lang.String z -> e
-    33:37:void <init>(java.lang.String,java.lang.String,java.lang.String) -> <init>
-    23:25:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.ColorArgument -> ct:
+    37:41:void <init>(java.lang.String,java.lang.String,java.lang.String) -> <init>
+    27:29:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.ColorArgument -> dc:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INVALID_VALUE -> a
     23:24:void <init>() -> <init>
@@ -19219,7 +20452,7 @@ net.minecraft.commands.arguments.ColorArgument -> ct:
     19:19:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     21:21:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     20:21:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.ComponentArgument -> cu:
+net.minecraft.commands.arguments.ComponentArgument -> dd:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INVALID_JSON -> a
     20:21:void <init>() -> <init>
@@ -19230,7 +20463,7 @@ net.minecraft.commands.arguments.ComponentArgument -> cu:
     16:16:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     18:18:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     17:18:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.CompoundTagArgument -> cv:
+net.minecraft.commands.arguments.CompoundTagArgument -> de:
     java.util.Collection EXAMPLES -> a
     16:17:void <init>() -> <init>
     20:20:net.minecraft.commands.arguments.CompoundTagArgument compoundTag() -> a
@@ -19239,21 +20472,20 @@ net.minecraft.commands.arguments.CompoundTagArgument -> cv:
     34:34:java.util.Collection getExamples() -> getExamples
     13:13:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     14:14:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.DimensionTypeArgument -> cw:
-    java.util.Collection EXAMPLES -> b
-    com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INVALID_VALUE -> a
-    23:23:void <init>() -> <init>
-    30:31:net.minecraft.world.level.dimension.DimensionType parse(com.mojang.brigadier.StringReader) -> a
-    36:36:java.util.concurrent.CompletableFuture listSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> listSuggestions
-    41:41:java.util.Collection getExamples() -> getExamples
-    45:45:net.minecraft.commands.arguments.DimensionTypeArgument dimension() -> a
-    49:49:net.minecraft.world.level.dimension.DimensionType getDimension(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    23:23:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
-    31:31:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$parse$2(net.minecraft.resources.ResourceLocation) -> a
-    26:26:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> a
-    24:24:java.lang.String lambda$static$0(net.minecraft.world.level.dimension.DimensionType) -> a
-    24:26:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.EntityAnchorArgument -> cx:
+net.minecraft.commands.arguments.DimensionArgument -> df:
+    java.util.Collection EXAMPLES -> a
+    com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INVALID_VALUE -> b
+    24:24:void <init>() -> <init>
+    31:31:net.minecraft.resources.ResourceLocation parse(com.mojang.brigadier.StringReader) -> a
+    36:39:java.util.concurrent.CompletableFuture listSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> listSuggestions
+    44:44:java.util.Collection getExamples() -> getExamples
+    48:48:net.minecraft.commands.arguments.DimensionArgument dimension() -> a
+    52:58:net.minecraft.server.level.ServerLevel getDimension(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    24:24:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
+    27:27:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> a
+    25:25:java.lang.String lambda$static$0(net.minecraft.resources.ResourceKey) -> a
+    25:27:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.EntityAnchorArgument -> dg:
     java.util.Collection EXAMPLES -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INVALID -> b
     25:25:void <init>() -> <init>
@@ -19265,7 +20497,7 @@ net.minecraft.commands.arguments.EntityAnchorArgument -> cx:
     25:25:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     27:27:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     26:27:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.EntityAnchorArgument$Anchor -> cx$a:
+net.minecraft.commands.arguments.EntityAnchorArgument$Anchor -> dg$a:
     net.minecraft.commands.arguments.EntityAnchorArgument$Anchor FEET -> a
     net.minecraft.commands.arguments.EntityAnchorArgument$Anchor EYES -> b
     java.util.Map BY_NAME -> c
@@ -19283,7 +20515,7 @@ net.minecraft.commands.arguments.EntityAnchorArgument$Anchor -> cx$a:
     60:60:net.minecraft.world.phys.Vec3 lambda$static$0(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> b
     59:59:java.util.Map access$000() -> a
     59:64:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.EntityArgument -> cy:
+net.minecraft.commands.arguments.EntityArgument -> dh:
     java.util.Collection EXAMPLES -> g
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_SINGLE_ENTITY -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_SINGLE_PLAYER -> b
@@ -19312,7 +20544,7 @@ net.minecraft.commands.arguments.EntityArgument -> cy:
     28:28:boolean access$000(net.minecraft.commands.arguments.EntityArgument) -> a
     28:28:boolean access$100(net.minecraft.commands.arguments.EntityArgument) -> b
     29:35:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.EntityArgument$Serializer -> cy$a:
+net.minecraft.commands.arguments.EntityArgument$Serializer -> dh$a:
     144:144:void <init>() -> <init>
     147:155:void serializeToNetwork(net.minecraft.commands.arguments.EntityArgument,net.minecraft.network.FriendlyByteBuf) -> a
     159:160:net.minecraft.commands.arguments.EntityArgument deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> a
@@ -19320,7 +20552,7 @@ net.minecraft.commands.arguments.EntityArgument$Serializer -> cy$a:
     144:144:void serializeToJson(com.mojang.brigadier.arguments.ArgumentType,com.google.gson.JsonObject) -> a
     144:144:com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
     144:144:void serializeToNetwork(com.mojang.brigadier.arguments.ArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
-net.minecraft.commands.arguments.EntitySummonArgument -> cz:
+net.minecraft.commands.arguments.EntitySummonArgument -> di:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_ENTITY -> a
     21:22:void <init>() -> <init>
@@ -19333,7 +20565,7 @@ net.minecraft.commands.arguments.EntitySummonArgument -> cz:
     33:33:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$verifyCanSummon$1(net.minecraft.resources.ResourceLocation) -> b
     19:19:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     18:19:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.GameProfileArgument -> da:
+net.minecraft.commands.arguments.GameProfileArgument -> dj:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_UNKNOWN_PLAYER -> a
     25:25:void <init>() -> <init>
@@ -19346,13 +20578,13 @@ net.minecraft.commands.arguments.GameProfileArgument -> da:
     98:98:void lambda$listSuggestions$1(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
     54:58:java.util.Collection lambda$parse$0(java.lang.String,net.minecraft.commands.CommandSourceStack) -> a
     26:27:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.GameProfileArgument$Result -> da$a:
+net.minecraft.commands.arguments.GameProfileArgument$Result -> dj$a:
     java.util.Collection getNames(net.minecraft.commands.CommandSourceStack) -> getNames
-net.minecraft.commands.arguments.GameProfileArgument$SelectorResult -> da$b:
+net.minecraft.commands.arguments.GameProfileArgument$SelectorResult -> dj$b:
     net.minecraft.commands.arguments.selector.EntitySelector selector -> a
     70:72:void <init>(net.minecraft.commands.arguments.selector.EntitySelector) -> <init>
     76:84:java.util.Collection getNames(net.minecraft.commands.CommandSourceStack) -> getNames
-net.minecraft.commands.arguments.ItemEnchantmentArgument -> db:
+net.minecraft.commands.arguments.ItemEnchantmentArgument -> dk:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_ENCHANTMENT -> a
     21:21:void <init>() -> <init>
@@ -19365,33 +20597,33 @@ net.minecraft.commands.arguments.ItemEnchantmentArgument -> db:
     37:37:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$parse$1(net.minecraft.resources.ResourceLocation) -> a
     24:24:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     22:24:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.MessageArgument -> dc:
+net.minecraft.commands.arguments.MessageArgument -> dl:
     java.util.Collection EXAMPLES -> a
-    20:20:void <init>() -> <init>
-    24:24:net.minecraft.commands.arguments.MessageArgument message() -> a
-    28:28:net.minecraft.network.chat.Component getMessage(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    33:33:net.minecraft.commands.arguments.MessageArgument$Message parse(com.mojang.brigadier.StringReader) -> a
-    38:38:java.util.Collection getExamples() -> getExamples
-    20:20:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
-    21:21:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.MessageArgument$Message -> dc$a:
+    21:21:void <init>() -> <init>
+    25:25:net.minecraft.commands.arguments.MessageArgument message() -> a
+    29:29:net.minecraft.network.chat.Component getMessage(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    34:34:net.minecraft.commands.arguments.MessageArgument$Message parse(com.mojang.brigadier.StringReader) -> a
+    39:39:java.util.Collection getExamples() -> getExamples
+    21:21:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
+    22:22:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.MessageArgument$Message -> dl$a:
     java.lang.String text -> a
     net.minecraft.commands.arguments.MessageArgument$Part[] parts -> b
-    45:48:void <init>(java.lang.String,net.minecraft.commands.arguments.MessageArgument$Part[]) -> <init>
-    51:51:java.lang.String getText() -> a
-    55:55:net.minecraft.commands.arguments.MessageArgument$Part[] getParts() -> b
-    59:81:net.minecraft.network.chat.Component toComponent(net.minecraft.commands.CommandSourceStack,boolean) -> a
-    85:115:net.minecraft.commands.arguments.MessageArgument$Message parseText(com.mojang.brigadier.StringReader,boolean) -> a
-net.minecraft.commands.arguments.MessageArgument$Part -> dc$b:
+    46:49:void <init>(java.lang.String,net.minecraft.commands.arguments.MessageArgument$Part[]) -> <init>
+    52:52:java.lang.String getText() -> a
+    56:56:net.minecraft.commands.arguments.MessageArgument$Part[] getParts() -> b
+    60:82:net.minecraft.network.chat.Component toComponent(net.minecraft.commands.CommandSourceStack,boolean) -> a
+    86:116:net.minecraft.commands.arguments.MessageArgument$Message parseText(com.mojang.brigadier.StringReader,boolean) -> a
+net.minecraft.commands.arguments.MessageArgument$Part -> dl$b:
     int start -> a
     int end -> b
     net.minecraft.commands.arguments.selector.EntitySelector selector -> c
-    124:128:void <init>(int,int,net.minecraft.commands.arguments.selector.EntitySelector) -> <init>
-    131:131:int getStart() -> a
-    135:135:int getEnd() -> b
-    139:139:net.minecraft.commands.arguments.selector.EntitySelector getSelector() -> c
-    144:144:net.minecraft.network.chat.Component toComponent(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.commands.arguments.MobEffectArgument -> dd:
+    125:129:void <init>(int,int,net.minecraft.commands.arguments.selector.EntitySelector) -> <init>
+    132:132:int getStart() -> a
+    136:136:int getEnd() -> b
+    140:140:net.minecraft.commands.arguments.selector.EntitySelector getSelector() -> c
+    145:145:net.minecraft.network.chat.Component toComponent(net.minecraft.commands.CommandSourceStack) -> a
+net.minecraft.commands.arguments.MobEffectArgument -> dm:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_EFFECT -> a
     21:21:void <init>() -> <init>
@@ -19404,7 +20636,7 @@ net.minecraft.commands.arguments.MobEffectArgument -> dd:
     37:37:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$parse$1(net.minecraft.resources.ResourceLocation) -> a
     24:24:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     22:24:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.NbtPathArgument -> de:
+net.minecraft.commands.arguments.NbtPathArgument -> dn:
     java.util.Collection EXAMPLES -> c
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID_NODE -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_NOTHING_FOUND -> b
@@ -19423,7 +20655,7 @@ net.minecraft.commands.arguments.NbtPathArgument -> de:
     34:34:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     31:31:java.util.function.Predicate access$000(net.minecraft.nbt.CompoundTag) -> a
     32:34:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.NbtPathArgument$AllElementsNode -> de$a:
+net.minecraft.commands.arguments.NbtPathArgument$AllElementsNode -> dn$a:
     net.minecraft.commands.arguments.NbtPathArgument$AllElementsNode INSTANCE -> a
     482:483:void <init>() -> <init>
     489:492:void getTag(net.minecraft.nbt.Tag,java.util.List) -> a
@@ -19432,7 +20664,7 @@ net.minecraft.commands.arguments.NbtPathArgument$AllElementsNode -> de$a:
     516:539:int setTag(net.minecraft.nbt.Tag,java.util.function.Supplier) -> a
     544:553:int removeTag(net.minecraft.nbt.Tag) -> a
     485:485:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.NbtPathArgument$CompoundChildNode -> de$b:
+net.minecraft.commands.arguments.NbtPathArgument$CompoundChildNode -> dn$b:
     java.lang.String name -> a
     265:267:void <init>(java.lang.String) -> <init>
     271:277:void getTag(net.minecraft.nbt.Tag,java.util.List) -> a
@@ -19440,7 +20672,7 @@ net.minecraft.commands.arguments.NbtPathArgument$CompoundChildNode -> de$b:
     297:297:net.minecraft.nbt.Tag createPreferredParentTag() -> a
     302:311:int setTag(net.minecraft.nbt.Tag,java.util.function.Supplier) -> a
     316:324:int removeTag(net.minecraft.nbt.Tag) -> a
-net.minecraft.commands.arguments.NbtPathArgument$IndexedElementNode -> de$c:
+net.minecraft.commands.arguments.NbtPathArgument$IndexedElementNode -> dn$c:
     int index -> a
     331:333:void <init>(int) -> <init>
     337:347:void getTag(net.minecraft.nbt.Tag,java.util.List) -> a
@@ -19448,9 +20680,9 @@ net.minecraft.commands.arguments.NbtPathArgument$IndexedElementNode -> de$c:
     356:356:net.minecraft.nbt.Tag createPreferredParentTag() -> a
     361:375:int setTag(net.minecraft.nbt.Tag,java.util.function.Supplier) -> a
     380:391:int removeTag(net.minecraft.nbt.Tag) -> a
-net.minecraft.commands.arguments.NbtPathArgument$ListElementFunction -> de$d:
+net.minecraft.commands.arguments.NbtPathArgument$ListElementFunction -> dn$d:
     boolean apply(net.minecraft.nbt.ListTag,int,net.minecraft.nbt.Tag) -> a
-net.minecraft.commands.arguments.NbtPathArgument$MatchElementNode -> de$e:
+net.minecraft.commands.arguments.NbtPathArgument$MatchElementNode -> dn$e:
     net.minecraft.nbt.CompoundTag pattern -> a
     java.util.function.Predicate predicate -> b
     403:406:void <init>(net.minecraft.nbt.CompoundTag) -> <init>
@@ -19460,7 +20692,7 @@ net.minecraft.commands.arguments.NbtPathArgument$MatchElementNode -> de$e:
     441:461:int setTag(net.minecraft.nbt.Tag,java.util.function.Supplier) -> a
     466:477:int removeTag(net.minecraft.nbt.Tag) -> a
     422:424:void lambda$getOrCreateTag$0(java.util.List,org.apache.commons.lang3.mutable.MutableBoolean,net.minecraft.nbt.Tag) -> a
-net.minecraft.commands.arguments.NbtPathArgument$MatchObjectNode -> de$f:
+net.minecraft.commands.arguments.NbtPathArgument$MatchObjectNode -> dn$f:
     java.lang.String name -> a
     net.minecraft.nbt.CompoundTag pattern -> b
     java.util.function.Predicate predicate -> c
@@ -19470,7 +20702,7 @@ net.minecraft.commands.arguments.NbtPathArgument$MatchObjectNode -> de$f:
     595:595:net.minecraft.nbt.Tag createPreferredParentTag() -> a
     600:612:int setTag(net.minecraft.nbt.Tag,java.util.function.Supplier) -> a
     617:626:int removeTag(net.minecraft.nbt.Tag) -> a
-net.minecraft.commands.arguments.NbtPathArgument$MatchRootObjectNode -> de$g:
+net.minecraft.commands.arguments.NbtPathArgument$MatchRootObjectNode -> dn$g:
     java.util.function.Predicate predicate -> a
     633:635:void <init>(net.minecraft.nbt.CompoundTag) -> <init>
     639:642:void getTag(net.minecraft.nbt.Tag,java.util.List) -> a
@@ -19478,7 +20710,7 @@ net.minecraft.commands.arguments.NbtPathArgument$MatchRootObjectNode -> de$g:
     651:651:net.minecraft.nbt.Tag createPreferredParentTag() -> a
     656:656:int setTag(net.minecraft.nbt.Tag,java.util.function.Supplier) -> a
     661:661:int removeTag(net.minecraft.nbt.Tag) -> a
-net.minecraft.commands.arguments.NbtPathArgument$NbtPath -> de$h:
+net.minecraft.commands.arguments.NbtPathArgument$NbtPath -> dn$h:
     java.lang.String original -> a
     it.unimi.dsi.fastutil.objects.Object2IntMap nodeToOriginalPosition -> b
     net.minecraft.commands.arguments.NbtPathArgument$Node[] nodes -> c
@@ -19495,7 +20727,7 @@ net.minecraft.commands.arguments.NbtPathArgument$NbtPath -> de$h:
     224:224:java.lang.String toString() -> toString
     203:203:java.lang.Integer lambda$set$1(net.minecraft.commands.arguments.NbtPathArgument$Node,java.util.function.Supplier,net.minecraft.nbt.Tag) -> a
     192:192:java.lang.Integer lambda$apply$0(java.lang.Integer,java.lang.Integer) -> a
-net.minecraft.commands.arguments.NbtPathArgument$Node -> de$i:
+net.minecraft.commands.arguments.NbtPathArgument$Node -> dn$i:
     void getTag(net.minecraft.nbt.Tag,java.util.List) -> a
     void getOrCreateTag(net.minecraft.nbt.Tag,java.util.function.Supplier,java.util.List) -> a
     net.minecraft.nbt.Tag createPreferredParentTag() -> a
@@ -19505,7 +20737,7 @@ net.minecraft.commands.arguments.NbtPathArgument$Node -> de$i:
     248:248:java.util.List getOrCreate(java.util.List,java.util.function.Supplier) -> a
     252:258:java.util.List collect(java.util.List,java.util.function.BiConsumer) -> a
     248:248:void lambda$getOrCreate$0(java.util.function.Supplier,net.minecraft.nbt.Tag,java.util.List) -> a
-net.minecraft.commands.arguments.NbtTagArgument -> df:
+net.minecraft.commands.arguments.NbtTagArgument -> dp:
     java.util.Collection EXAMPLES -> a
     16:17:void <init>() -> <init>
     20:20:net.minecraft.commands.arguments.NbtTagArgument nbtTag() -> a
@@ -19514,7 +20746,7 @@ net.minecraft.commands.arguments.NbtTagArgument -> df:
     34:34:java.util.Collection getExamples() -> getExamples
     13:13:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     14:14:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.ObjectiveArgument -> dg:
+net.minecraft.commands.arguments.ObjectiveArgument -> dq:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_OBJECTIVE_NOT_FOUND -> c
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_OBJECTIVE_READ_ONLY -> d
@@ -19531,7 +20763,7 @@ net.minecraft.commands.arguments.ObjectiveArgument -> dg:
     23:23:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> b
     22:22:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> c
     21:24:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.ObjectiveCriteriaArgument -> dh:
+net.minecraft.commands.arguments.ObjectiveCriteriaArgument -> dr:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INVALID_VALUE -> a
     28:29:void <init>() -> <init>
@@ -19545,7 +20777,7 @@ net.minecraft.commands.arguments.ObjectiveCriteriaArgument -> dh:
     47:48:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$parse$1(com.mojang.brigadier.StringReader,int,java.lang.String) -> a
     26:26:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     25:26:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.OperationArgument -> di:
+net.minecraft.commands.arguments.OperationArgument -> ds:
     java.util.Collection EXAMPLES -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID_OPERATION -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_DIVIDE_BY_ZERO -> c
@@ -19566,12 +20798,12 @@ net.minecraft.commands.arguments.OperationArgument -> di:
     71:71:int lambda$getSimpleOperation$1(int,int) -> f
     59:62:void lambda$getOperation$0(net.minecraft.world.scores.Score,net.minecraft.world.scores.Score) -> a
     21:23:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.OperationArgument$Operation -> di$a:
+net.minecraft.commands.arguments.OperationArgument$Operation -> ds$a:
     void apply(net.minecraft.world.scores.Score,net.minecraft.world.scores.Score) -> apply
-net.minecraft.commands.arguments.OperationArgument$SimpleOperation -> di$b:
+net.minecraft.commands.arguments.OperationArgument$SimpleOperation -> ds$b:
     int apply(int,int) -> apply
     111:112:void apply(net.minecraft.world.scores.Score,net.minecraft.world.scores.Score) -> apply
-net.minecraft.commands.arguments.ParticleArgument -> dj:
+net.minecraft.commands.arguments.ParticleArgument -> dt:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_PARTICLE -> a
     22:22:void <init>() -> <init>
@@ -19586,10 +20818,10 @@ net.minecraft.commands.arguments.ParticleArgument -> dj:
     46:46:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$readParticle$1(net.minecraft.resources.ResourceLocation) -> a
     24:24:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     23:24:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.RangeArgument -> dk:
+net.minecraft.commands.arguments.RangeArgument -> du:
     68:68:net.minecraft.commands.arguments.RangeArgument$Ints intRange() -> a
     72:72:net.minecraft.commands.arguments.RangeArgument$Floats doubleRange() -> b
-net.minecraft.commands.arguments.RangeArgument$Floats -> dk$a:
+net.minecraft.commands.arguments.RangeArgument$Floats -> du$a:
     java.util.Collection EXAMPLES -> a
     42:42:void <init>() -> <init>
     46:46:net.minecraft.advancements.critereon.MinMaxBounds$Floats getRange(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
@@ -19597,11 +20829,11 @@ net.minecraft.commands.arguments.RangeArgument$Floats -> dk$a:
     56:56:java.util.Collection getExamples() -> getExamples
     42:42:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     43:43:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.RangeArgument$Floats$Serializer -> dk$a$a:
+net.minecraft.commands.arguments.RangeArgument$Floats$Serializer -> du$a$a:
     59:59:void <init>() -> <init>
     62:62:net.minecraft.commands.arguments.RangeArgument$Floats deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> a
     59:59:com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
-net.minecraft.commands.arguments.RangeArgument$Ints -> dk$b:
+net.minecraft.commands.arguments.RangeArgument$Ints -> du$b:
     java.util.Collection EXAMPLES -> a
     17:17:void <init>() -> <init>
     21:21:net.minecraft.advancements.critereon.MinMaxBounds$Ints getRange(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
@@ -19609,36 +20841,40 @@ net.minecraft.commands.arguments.RangeArgument$Ints -> dk$b:
     31:31:java.util.Collection getExamples() -> getExamples
     17:17:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     18:18:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.RangeArgument$Ints$Serializer -> dk$b$a:
+net.minecraft.commands.arguments.RangeArgument$Ints$Serializer -> du$b$a:
     34:34:void <init>() -> <init>
     37:37:net.minecraft.commands.arguments.RangeArgument$Ints deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> a
     34:34:com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
-net.minecraft.commands.arguments.RangeArgument$Serializer -> dk$c:
+net.minecraft.commands.arguments.RangeArgument$Serializer -> du$c:
     75:75:void <init>() -> <init>
     78:78:void serializeToNetwork(net.minecraft.commands.arguments.RangeArgument,net.minecraft.network.FriendlyByteBuf) -> a
     82:82:void serializeToJson(net.minecraft.commands.arguments.RangeArgument,com.google.gson.JsonObject) -> a
     75:75:void serializeToJson(com.mojang.brigadier.arguments.ArgumentType,com.google.gson.JsonObject) -> a
     75:75:void serializeToNetwork(com.mojang.brigadier.arguments.ArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
-net.minecraft.commands.arguments.ResourceLocationArgument -> dl:
+net.minecraft.commands.arguments.ResourceLocationArgument -> dv:
     java.util.Collection EXAMPLES -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_ADVANCEMENT -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_RECIPE -> c
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_PREDICATE -> d
-    26:27:void <init>() -> <init>
-    30:30:net.minecraft.commands.arguments.ResourceLocationArgument id() -> a
-    34:39:net.minecraft.advancements.Advancement getAdvancement(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    43:46:net.minecraft.world.item.crafting.Recipe getRecipe(com.mojang.brigadier.context.CommandContext,java.lang.String) -> b
-    50:57:net.minecraft.world.level.storage.loot.predicates.LootItemCondition getPredicate(com.mojang.brigadier.context.CommandContext,java.lang.String) -> c
-    61:61:net.minecraft.resources.ResourceLocation getId(com.mojang.brigadier.context.CommandContext,java.lang.String) -> d
-    66:66:net.minecraft.resources.ResourceLocation parse(com.mojang.brigadier.StringReader) -> a
-    71:71:java.util.Collection getExamples() -> getExamples
-    20:20:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
-    46:46:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$getRecipe$3(net.minecraft.resources.ResourceLocation) -> a
-    24:24:com.mojang.brigadier.Message lambda$static$2(java.lang.Object) -> a
-    23:23:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> b
-    22:22:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> c
-    21:24:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.ScoreHolderArgument -> dm:
+    com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_ATTRIBUTE -> e
+    29:30:void <init>() -> <init>
+    33:33:net.minecraft.commands.arguments.ResourceLocationArgument id() -> a
+    37:42:net.minecraft.advancements.Advancement getAdvancement(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    46:49:net.minecraft.world.item.crafting.Recipe getRecipe(com.mojang.brigadier.context.CommandContext,java.lang.String) -> b
+    53:60:net.minecraft.world.level.storage.loot.predicates.LootItemCondition getPredicate(com.mojang.brigadier.context.CommandContext,java.lang.String) -> c
+    64:65:net.minecraft.world.entity.ai.attributes.Attribute getAttribute(com.mojang.brigadier.context.CommandContext,java.lang.String) -> d
+    69:69:net.minecraft.resources.ResourceLocation getId(com.mojang.brigadier.context.CommandContext,java.lang.String) -> e
+    74:74:net.minecraft.resources.ResourceLocation parse(com.mojang.brigadier.StringReader) -> a
+    79:79:java.util.Collection getExamples() -> getExamples
+    22:22:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
+    65:65:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$getAttribute$5(net.minecraft.resources.ResourceLocation) -> a
+    49:49:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$getRecipe$4(net.minecraft.resources.ResourceLocation) -> b
+    27:27:com.mojang.brigadier.Message lambda$static$3(java.lang.Object) -> a
+    26:26:com.mojang.brigadier.Message lambda$static$2(java.lang.Object) -> b
+    25:25:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> c
+    24:24:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> d
+    23:27:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.ScoreHolderArgument -> dw:
     com.mojang.brigadier.suggestion.SuggestionProvider SUGGEST_SCORE_HOLDERS -> a
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NO_RESULTS -> c
@@ -19659,13 +20895,13 @@ net.minecraft.commands.arguments.ScoreHolderArgument -> dm:
     35:35:void lambda$null$0(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> b
     26:26:boolean access$000(net.minecraft.commands.arguments.ScoreHolderArgument) -> a
     27:39:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.ScoreHolderArgument$Result -> dm$a:
+net.minecraft.commands.arguments.ScoreHolderArgument$Result -> dw$a:
     java.util.Collection getNames(net.minecraft.commands.CommandSourceStack,java.util.function.Supplier) -> getNames
-net.minecraft.commands.arguments.ScoreHolderArgument$SelectorResult -> dm$b:
+net.minecraft.commands.arguments.ScoreHolderArgument$SelectorResult -> dw$b:
     net.minecraft.commands.arguments.selector.EntitySelector selector -> a
     118:120:void <init>(net.minecraft.commands.arguments.selector.EntitySelector) -> <init>
     124:132:java.util.Collection getNames(net.minecraft.commands.CommandSourceStack,java.util.function.Supplier) -> getNames
-net.minecraft.commands.arguments.ScoreHolderArgument$Serializer -> dm$c:
+net.minecraft.commands.arguments.ScoreHolderArgument$Serializer -> dw$c:
     136:136:void <init>() -> <init>
     139:144:void serializeToNetwork(net.minecraft.commands.arguments.ScoreHolderArgument,net.minecraft.network.FriendlyByteBuf) -> a
     148:150:net.minecraft.commands.arguments.ScoreHolderArgument deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> a
@@ -19673,7 +20909,7 @@ net.minecraft.commands.arguments.ScoreHolderArgument$Serializer -> dm$c:
     136:136:void serializeToJson(com.mojang.brigadier.arguments.ArgumentType,com.google.gson.JsonObject) -> a
     136:136:com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
     136:136:void serializeToNetwork(com.mojang.brigadier.arguments.ArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
-net.minecraft.commands.arguments.ScoreboardSlotArgument -> dn:
+net.minecraft.commands.arguments.ScoreboardSlotArgument -> dx:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INVALID_VALUE -> a
     23:24:void <init>() -> <init>
@@ -19685,7 +20921,7 @@ net.minecraft.commands.arguments.ScoreboardSlotArgument -> dn:
     19:19:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     21:21:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     20:21:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.SlotArgument -> dp:
+net.minecraft.commands.arguments.SlotArgument -> dy:
     java.util.Collection EXAMPLES -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_SLOT -> b
     java.util.Map SLOTS -> c
@@ -19699,7 +20935,7 @@ net.minecraft.commands.arguments.SlotArgument -> dp:
     30:58:void lambda$static$1(java.util.HashMap) -> a
     28:28:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     27:29:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.TeamArgument -> dq:
+net.minecraft.commands.arguments.TeamArgument -> dz:
     java.util.Collection EXAMPLES -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_TEAM_NOT_FOUND -> b
     24:25:void <init>() -> <init>
@@ -19711,7 +20947,7 @@ net.minecraft.commands.arguments.TeamArgument -> dq:
     20:20:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     22:22:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     21:22:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.TimeArgument -> dr:
+net.minecraft.commands.arguments.TimeArgument -> ea:
     java.util.Collection EXAMPLES -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID_UNIT -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INVALID_TICK_COUNT -> c
@@ -19724,61 +20960,72 @@ net.minecraft.commands.arguments.TimeArgument -> dr:
     22:22:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     25:25:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     23:34:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.blocks.BlockInput -> ds:
+net.minecraft.commands.arguments.UuidArgument -> eb:
+    com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID_UUID -> a
+    java.util.Collection EXAMPLES -> b
+    java.util.regex.Pattern ALLOWED_CHARACTERS -> c
+    17:17:void <init>() -> <init>
+    25:25:java.util.UUID getUuid(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    29:29:net.minecraft.commands.arguments.UuidArgument uuid() -> a
+    34:47:java.util.UUID parse(com.mojang.brigadier.StringReader) -> a
+    52:52:java.util.Collection getExamples() -> getExamples
+    17:17:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
+    18:22:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.blocks.BlockInput -> ec:
     net.minecraft.world.level.block.state.BlockState state -> a
     java.util.Set properties -> b
     net.minecraft.nbt.CompoundTag tag -> c
-    22:26:void <init>(net.minecraft.world.level.block.state.BlockState,java.util.Set,net.minecraft.nbt.CompoundTag) -> <init>
-    29:29:net.minecraft.world.level.block.state.BlockState getState() -> a
-    34:34:net.minecraft.nbt.CompoundTag getTag() -> b
-    38:38:java.util.Set getDefinedProperties() -> c
-    43:60:boolean test(net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
-    64:64:boolean test(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-    68:83:boolean place(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,int) -> a
-    16:16:boolean test(java.lang.Object) -> test
-net.minecraft.commands.arguments.blocks.BlockPredicateArgument -> dt:
+    23:27:void <init>(net.minecraft.world.level.block.state.BlockState,java.util.Set,net.minecraft.nbt.CompoundTag) -> <init>
+    30:30:net.minecraft.world.level.block.state.BlockState getState() -> a
+    35:35:net.minecraft.nbt.CompoundTag getTag() -> b
+    39:39:java.util.Set getDefinedProperties() -> c
+    44:61:boolean test(net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
+    65:65:boolean test(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    69:88:boolean place(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,int) -> a
+    17:17:boolean test(java.lang.Object) -> test
+net.minecraft.commands.arguments.blocks.BlockPredicateArgument -> ed:
     java.util.Collection EXAMPLES -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_TAG -> b
-    31:31:void <init>() -> <init>
-    36:36:net.minecraft.commands.arguments.blocks.BlockPredicateArgument blockPredicate() -> a
-    41:48:net.minecraft.commands.arguments.blocks.BlockPredicateArgument$Result parse(com.mojang.brigadier.StringReader) -> a
-    59:59:java.util.function.Predicate getBlockPredicate(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    64:71:java.util.concurrent.CompletableFuture listSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> listSuggestions
-    76:76:java.util.Collection getExamples() -> getExamples
-    31:31:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
-    49:53:java.util.function.Predicate lambda$parse$2(net.minecraft.resources.ResourceLocation,net.minecraft.commands.arguments.blocks.BlockStateParser,net.minecraft.tags.TagManager) -> a
-    45:45:java.util.function.Predicate lambda$parse$1(net.minecraft.commands.arguments.blocks.BlockPredicateArgument$BlockPredicate,net.minecraft.tags.TagManager) -> a
-    33:33:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
-    32:33:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.blocks.BlockPredicateArgument$1 -> dt$1:
-net.minecraft.commands.arguments.blocks.BlockPredicateArgument$BlockPredicate -> dt$a:
+    32:32:void <init>() -> <init>
+    37:37:net.minecraft.commands.arguments.blocks.BlockPredicateArgument blockPredicate() -> a
+    42:49:net.minecraft.commands.arguments.blocks.BlockPredicateArgument$Result parse(com.mojang.brigadier.StringReader) -> a
+    60:60:java.util.function.Predicate getBlockPredicate(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    65:72:java.util.concurrent.CompletableFuture listSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> listSuggestions
+    77:77:java.util.Collection getExamples() -> getExamples
+    32:32:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
+    50:54:java.util.function.Predicate lambda$parse$2(net.minecraft.resources.ResourceLocation,net.minecraft.commands.arguments.blocks.BlockStateParser,net.minecraft.tags.TagManager) -> a
+    46:46:java.util.function.Predicate lambda$parse$1(net.minecraft.commands.arguments.blocks.BlockPredicateArgument$BlockPredicate,net.minecraft.tags.TagManager) -> a
+    34:34:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
+    33:34:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.blocks.BlockPredicateArgument$1 -> ed$1:
+net.minecraft.commands.arguments.blocks.BlockPredicateArgument$BlockPredicate -> ed$a:
     net.minecraft.world.level.block.state.BlockState state -> a
     java.util.Set properties -> b
     net.minecraft.nbt.CompoundTag nbt -> c
-    89:93:void <init>(net.minecraft.world.level.block.state.BlockState,java.util.Set,net.minecraft.nbt.CompoundTag) -> <init>
-    97:114:boolean test(net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
-    83:83:boolean test(java.lang.Object) -> test
-net.minecraft.commands.arguments.blocks.BlockPredicateArgument$Result -> dt$b:
+    90:94:void <init>(net.minecraft.world.level.block.state.BlockState,java.util.Set,net.minecraft.nbt.CompoundTag) -> <init>
+    98:115:boolean test(net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
+    84:84:boolean test(java.lang.Object) -> test
+net.minecraft.commands.arguments.blocks.BlockPredicateArgument$Result -> ed$b:
     java.util.function.Predicate create(net.minecraft.tags.TagManager) -> create
-net.minecraft.commands.arguments.blocks.BlockPredicateArgument$TagPredicate -> dt$c:
+net.minecraft.commands.arguments.blocks.BlockPredicateArgument$TagPredicate -> ed$c:
     net.minecraft.tags.Tag tag -> a
     net.minecraft.nbt.CompoundTag nbt -> b
     java.util.Map vagueProperties -> c
-    124:128:void <init>(net.minecraft.tags.Tag,java.util.Map,net.minecraft.nbt.CompoundTag) -> <init>
-    132:157:boolean test(net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
-    118:118:boolean test(java.lang.Object) -> test
-    118:118:void <init>(net.minecraft.tags.Tag,java.util.Map,net.minecraft.nbt.CompoundTag,net.minecraft.commands.arguments.blocks.BlockPredicateArgument$1) -> <init>
-net.minecraft.commands.arguments.blocks.BlockStateArgument -> du:
+    125:129:void <init>(net.minecraft.tags.Tag,java.util.Map,net.minecraft.nbt.CompoundTag) -> <init>
+    133:158:boolean test(net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
+    119:119:boolean test(java.lang.Object) -> test
+    119:119:void <init>(net.minecraft.tags.Tag,java.util.Map,net.minecraft.nbt.CompoundTag,net.minecraft.commands.arguments.blocks.BlockPredicateArgument$1) -> <init>
+net.minecraft.commands.arguments.blocks.BlockStateArgument -> ee:
     java.util.Collection EXAMPLES -> a
-    15:15:void <init>() -> <init>
-    19:19:net.minecraft.commands.arguments.blocks.BlockStateArgument block() -> a
-    24:25:net.minecraft.commands.arguments.blocks.BlockInput parse(com.mojang.brigadier.StringReader) -> a
-    29:29:net.minecraft.commands.arguments.blocks.BlockInput getBlock(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    34:41:java.util.concurrent.CompletableFuture listSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> listSuggestions
-    46:46:java.util.Collection getExamples() -> getExamples
-    15:15:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.blocks.BlockStateParser -> dv:
+    16:16:void <init>() -> <init>
+    20:20:net.minecraft.commands.arguments.blocks.BlockStateArgument block() -> a
+    25:26:net.minecraft.commands.arguments.blocks.BlockInput parse(com.mojang.brigadier.StringReader) -> a
+    30:30:net.minecraft.commands.arguments.blocks.BlockInput getBlock(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    35:42:java.util.concurrent.CompletableFuture listSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> listSuggestions
+    47:47:java.util.Collection getExamples() -> getExamples
+    16:16:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.blocks.BlockStateParser -> ef:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NO_TAGS_ALLOWED -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_BLOCK -> b
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType ERROR_UNKNOWN_PROPERTY -> c
@@ -19786,7 +21033,7 @@ net.minecraft.commands.arguments.blocks.BlockStateParser -> dv:
     com.mojang.brigadier.exceptions.Dynamic3CommandExceptionType ERROR_INVALID_VALUE -> e
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType ERROR_EXPECTED_VALUE -> f
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_EXPECTED_END_OF_PROPERTIES -> g
-    java.util.function.Function SUGGEST_NOTHING -> h
+    java.util.function.BiFunction SUGGEST_NOTHING -> h
     com.mojang.brigadier.StringReader reader -> i
     boolean forTesting -> j
     java.util.Map properties -> k
@@ -19797,27 +21044,27 @@ net.minecraft.commands.arguments.blocks.BlockStateParser -> dv:
     net.minecraft.nbt.CompoundTag nbt -> p
     net.minecraft.resources.ResourceLocation tag -> q
     int tagCursor -> r
-    java.util.function.Function suggestions -> s
+    java.util.function.BiFunction suggestions -> s
     52:66:void <init>(com.mojang.brigadier.StringReader,boolean) -> <init>
     69:69:java.util.Map getProperties() -> a
     74:74:net.minecraft.world.level.block.state.BlockState getState() -> b
     79:79:net.minecraft.nbt.CompoundTag getNbt() -> c
     84:84:net.minecraft.resources.ResourceLocation getTag() -> d
     88:108:net.minecraft.commands.arguments.blocks.BlockStateParser parse(boolean) -> a
-    112:116:java.util.concurrent.CompletableFuture suggestPropertyNameOrEnd(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> b
-    120:123:java.util.concurrent.CompletableFuture suggestVaguePropertyNameOrEnd(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> c
-    127:133:java.util.concurrent.CompletableFuture suggestPropertyName(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> d
-    137:150:java.util.concurrent.CompletableFuture suggestVaguePropertyName(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> e
-    154:157:java.util.concurrent.CompletableFuture suggestOpenNbt(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> f
-    161:177:boolean hasBlockEntity() -> k
-    181:184:java.util.concurrent.CompletableFuture suggestEquals(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> g
-    188:194:java.util.concurrent.CompletableFuture suggestNextPropertyOrEnd(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> h
+    112:116:java.util.concurrent.CompletableFuture suggestPropertyNameOrEnd(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> b
+    120:123:java.util.concurrent.CompletableFuture suggestVaguePropertyNameOrEnd(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> c
+    127:133:java.util.concurrent.CompletableFuture suggestPropertyName(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> d
+    137:150:java.util.concurrent.CompletableFuture suggestVaguePropertyName(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> e
+    154:157:java.util.concurrent.CompletableFuture suggestOpenNbt(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> f
+    161:177:boolean hasBlockEntity(net.minecraft.tags.TagCollection) -> a
+    181:184:java.util.concurrent.CompletableFuture suggestEquals(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> g
+    188:194:java.util.concurrent.CompletableFuture suggestNextPropertyOrEnd(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> h
     198:205:com.mojang.brigadier.suggestion.SuggestionsBuilder addSuggestions(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.world.level.block.state.properties.Property) -> a
-    209:233:java.util.concurrent.CompletableFuture suggestVaguePropertyValue(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.lang.String) -> a
-    237:261:java.util.concurrent.CompletableFuture suggestOpenVaguePropertiesOrNbt(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> i
-    265:273:java.util.concurrent.CompletableFuture suggestOpenPropertiesOrNbt(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> j
-    277:277:java.util.concurrent.CompletableFuture suggestTag(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> k
-    281:285:java.util.concurrent.CompletableFuture suggestBlockIdOrTag(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> l
+    209:233:java.util.concurrent.CompletableFuture suggestVaguePropertyValue(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection,java.lang.String) -> a
+    237:261:java.util.concurrent.CompletableFuture suggestOpenVaguePropertiesOrNbt(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> i
+    265:273:java.util.concurrent.CompletableFuture suggestOpenPropertiesOrNbt(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> j
+    277:277:java.util.concurrent.CompletableFuture suggestTag(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> k
+    281:285:java.util.concurrent.CompletableFuture suggestBlockIdOrTag(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> l
     289:299:void readBlock() -> e
     302:310:void readTag() -> f
     313:362:void readProperties() -> g
@@ -19826,19 +21073,20 @@ net.minecraft.commands.arguments.blocks.BlockStateParser -> dv:
     421:429:void setValue(net.minecraft.world.level.block.state.properties.Property,java.lang.String,int) -> a
     432:446:java.lang.String serialize(net.minecraft.world.level.block.state.BlockState) -> a
     451:454:void appendProperty(java.lang.StringBuilder,net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
-    457:457:java.util.concurrent.CompletableFuture fillSuggestions(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    457:457:java.util.concurrent.CompletableFuture fillSuggestions(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> a
     461:461:java.util.Map getVagueProperties() -> j
-    387:387:java.util.concurrent.CompletableFuture lambda$readVagueProperties$7(java.lang.String,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    339:339:java.util.concurrent.CompletableFuture lambda$readProperties$6(net.minecraft.world.level.block.state.properties.Property,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    293:294:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$readBlock$5(int) -> a
+    387:387:java.util.concurrent.CompletableFuture lambda$readVagueProperties$8(java.lang.String,com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> a
+    339:339:java.util.concurrent.CompletableFuture lambda$readProperties$7(net.minecraft.world.level.block.state.properties.Property,com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> a
+    293:294:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$readBlock$6(int) -> a
+    48:48:java.util.concurrent.CompletableFuture lambda$static$5(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> m
     38:38:com.mojang.brigadier.Message lambda$static$4(java.lang.Object,java.lang.Object) -> a
     37:37:com.mojang.brigadier.Message lambda$static$3(java.lang.Object,java.lang.Object,java.lang.Object) -> a
     36:36:com.mojang.brigadier.Message lambda$static$2(java.lang.Object,java.lang.Object) -> b
     35:35:com.mojang.brigadier.Message lambda$static$1(java.lang.Object,java.lang.Object) -> c
     34:34:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     33:48:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.blocks.package-info -> dw:
-net.minecraft.commands.arguments.coordinates.BlockPosArgument -> dx:
+net.minecraft.commands.arguments.blocks.package-info -> eg:
+net.minecraft.commands.arguments.coordinates.BlockPosArgument -> eh:
     java.util.Collection EXAMPLES -> c
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_LOADED -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_OUT_OF_WORLD -> b
@@ -19851,7 +21099,7 @@ net.minecraft.commands.arguments.coordinates.BlockPosArgument -> dx:
     76:76:java.util.Collection getExamples() -> getExamples
     21:21:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     22:25:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.coordinates.ColumnPosArgument -> dy:
+net.minecraft.commands.arguments.coordinates.ColumnPosArgument -> ei:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_COMPLETE -> a
     22:22:void <init>() -> <init>
@@ -19862,14 +21110,14 @@ net.minecraft.commands.arguments.coordinates.ColumnPosArgument -> dy:
     72:72:java.util.Collection getExamples() -> getExamples
     22:22:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     23:24:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.coordinates.Coordinates -> dz:
+net.minecraft.commands.arguments.coordinates.Coordinates -> ej:
     net.minecraft.world.phys.Vec3 getPosition(net.minecraft.commands.CommandSourceStack) -> a
     net.minecraft.world.phys.Vec2 getRotation(net.minecraft.commands.CommandSourceStack) -> b
     14:14:net.minecraft.core.BlockPos getBlockPos(net.minecraft.commands.CommandSourceStack) -> c
     boolean isXRelative() -> a
     boolean isYRelative() -> b
     boolean isZRelative() -> c
-net.minecraft.commands.arguments.coordinates.LocalCoordinates -> ea:
+net.minecraft.commands.arguments.coordinates.LocalCoordinates -> ek:
     double left -> a
     double up -> b
     double forwards -> c
@@ -19883,7 +21131,7 @@ net.minecraft.commands.arguments.coordinates.LocalCoordinates -> ea:
     83:93:double readDouble(com.mojang.brigadier.StringReader,int) -> a
     98:107:boolean equals(java.lang.Object) -> equals
     112:112:int hashCode() -> hashCode
-net.minecraft.commands.arguments.coordinates.RotationArgument -> eb:
+net.minecraft.commands.arguments.coordinates.RotationArgument -> el:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_COMPLETE -> a
     14:14:void <init>() -> <init>
@@ -19893,7 +21141,7 @@ net.minecraft.commands.arguments.coordinates.RotationArgument -> eb:
     44:44:java.util.Collection getExamples() -> getExamples
     14:14:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     15:16:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.coordinates.SwizzleArgument -> ec:
+net.minecraft.commands.arguments.coordinates.SwizzleArgument -> em:
     java.util.Collection EXAMPLES -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID -> b
     16:16:void <init>() -> <init>
@@ -19903,7 +21151,7 @@ net.minecraft.commands.arguments.coordinates.SwizzleArgument -> ec:
     62:62:java.util.Collection getExamples() -> getExamples
     16:16:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     17:18:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.coordinates.Vec2Argument -> ed:
+net.minecraft.commands.arguments.coordinates.Vec2Argument -> en:
     java.util.Collection EXAMPLES -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_COMPLETE -> a
     boolean centerCorrect -> c
@@ -19916,7 +21164,7 @@ net.minecraft.commands.arguments.coordinates.Vec2Argument -> ed:
     83:83:java.util.Collection getExamples() -> getExamples
     22:22:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     23:24:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.coordinates.Vec3Argument -> ee:
+net.minecraft.commands.arguments.coordinates.Vec3Argument -> eo:
     java.util.Collection EXAMPLES -> c
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_COMPLETE -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_MIXED_TYPE -> b
@@ -19931,7 +21179,7 @@ net.minecraft.commands.arguments.coordinates.Vec3Argument -> ee:
     79:79:java.util.Collection getExamples() -> getExamples
     21:21:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     22:25:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.coordinates.WorldCoordinate -> ef:
+net.minecraft.commands.arguments.coordinates.WorldCoordinate -> ep:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_EXPECTED_DOUBLE -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_EXPECTED_INT -> b
     boolean relative -> c
@@ -19945,7 +21193,7 @@ net.minecraft.commands.arguments.coordinates.WorldCoordinate -> ef:
     106:109:int hashCode() -> hashCode
     113:113:boolean isRelative() -> a
     11:12:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.coordinates.WorldCoordinates -> eg:
+net.minecraft.commands.arguments.coordinates.WorldCoordinates -> eq:
     net.minecraft.commands.arguments.coordinates.WorldCoordinate x -> a
     net.minecraft.commands.arguments.coordinates.WorldCoordinate y -> b
     net.minecraft.commands.arguments.coordinates.WorldCoordinate z -> c
@@ -19962,52 +21210,52 @@ net.minecraft.commands.arguments.coordinates.WorldCoordinates -> eg:
     108:108:net.minecraft.commands.arguments.coordinates.WorldCoordinates absolute(net.minecraft.world.phys.Vec2) -> a
     112:112:net.minecraft.commands.arguments.coordinates.WorldCoordinates current() -> d
     117:120:int hashCode() -> hashCode
-net.minecraft.commands.arguments.coordinates.package-info -> eh:
-net.minecraft.commands.arguments.item.FunctionArgument -> ei:
+net.minecraft.commands.arguments.coordinates.package-info -> er:
+net.minecraft.commands.arguments.item.FunctionArgument -> es:
     java.util.Collection EXAMPLES -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_TAG -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_FUNCTION -> c
-    19:19:void <init>() -> <init>
-    25:25:net.minecraft.commands.arguments.item.FunctionArgument functions() -> a
-    30:48:net.minecraft.commands.arguments.item.FunctionArgument$Result parse(com.mojang.brigadier.StringReader) -> a
-    62:63:net.minecraft.commands.CommandFunction getFunction(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation) -> c
-    67:71:net.minecraft.tags.Tag getFunctionTag(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation) -> d
-    75:75:java.util.Collection getFunctions(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    79:79:com.mojang.datafixers.util.Either getFunctionOrTag(com.mojang.brigadier.context.CommandContext,java.lang.String) -> b
-    84:84:java.util.Collection getExamples() -> getExamples
-    19:19:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
-    63:63:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$getFunction$2(net.minecraft.resources.ResourceLocation) -> a
-    22:22:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> a
-    21:21:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> b
-    19:19:net.minecraft.tags.Tag access$000(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation) -> a
-    19:19:net.minecraft.commands.CommandFunction access$100(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation) -> b
-    20:22:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.item.FunctionArgument$1 -> ei$1:
+    20:20:void <init>() -> <init>
+    26:26:net.minecraft.commands.arguments.item.FunctionArgument functions() -> a
+    31:49:net.minecraft.commands.arguments.item.FunctionArgument$Result parse(com.mojang.brigadier.StringReader) -> a
+    63:64:net.minecraft.commands.CommandFunction getFunction(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation) -> c
+    68:72:net.minecraft.tags.Tag getFunctionTag(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation) -> d
+    76:76:java.util.Collection getFunctions(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    80:80:com.mojang.datafixers.util.Pair getFunctionOrTag(com.mojang.brigadier.context.CommandContext,java.lang.String) -> b
+    85:85:java.util.Collection getExamples() -> getExamples
+    20:20:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
+    64:64:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$getFunction$2(net.minecraft.resources.ResourceLocation) -> a
+    23:23:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> a
+    22:22:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> b
+    20:20:net.minecraft.tags.Tag access$000(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation) -> a
+    20:20:net.minecraft.commands.CommandFunction access$100(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation) -> b
+    21:23:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.item.FunctionArgument$1 -> es$1:
     net.minecraft.resources.ResourceLocation val$id -> a
     net.minecraft.commands.arguments.item.FunctionArgument this$0 -> b
-    33:33:void <init>(net.minecraft.commands.arguments.item.FunctionArgument,net.minecraft.resources.ResourceLocation) -> <init>
-    36:37:java.util.Collection create(com.mojang.brigadier.context.CommandContext) -> a
-    42:42:com.mojang.datafixers.util.Either unwrap(com.mojang.brigadier.context.CommandContext) -> b
-net.minecraft.commands.arguments.item.FunctionArgument$2 -> ei$2:
+    34:34:void <init>(net.minecraft.commands.arguments.item.FunctionArgument,net.minecraft.resources.ResourceLocation) -> <init>
+    37:38:java.util.Collection create(com.mojang.brigadier.context.CommandContext) -> a
+    43:43:com.mojang.datafixers.util.Pair unwrap(com.mojang.brigadier.context.CommandContext) -> b
+net.minecraft.commands.arguments.item.FunctionArgument$2 -> es$2:
     net.minecraft.resources.ResourceLocation val$id -> a
     net.minecraft.commands.arguments.item.FunctionArgument this$0 -> b
-    48:48:void <init>(net.minecraft.commands.arguments.item.FunctionArgument,net.minecraft.resources.ResourceLocation) -> <init>
-    51:51:java.util.Collection create(com.mojang.brigadier.context.CommandContext) -> a
-    56:56:com.mojang.datafixers.util.Either unwrap(com.mojang.brigadier.context.CommandContext) -> b
-net.minecraft.commands.arguments.item.FunctionArgument$Result -> ei$a:
+    49:49:void <init>(net.minecraft.commands.arguments.item.FunctionArgument,net.minecraft.resources.ResourceLocation) -> <init>
+    52:52:java.util.Collection create(com.mojang.brigadier.context.CommandContext) -> a
+    57:57:com.mojang.datafixers.util.Pair unwrap(com.mojang.brigadier.context.CommandContext) -> b
+net.minecraft.commands.arguments.item.FunctionArgument$Result -> es$a:
     java.util.Collection create(com.mojang.brigadier.context.CommandContext) -> a
-    com.mojang.datafixers.util.Either unwrap(com.mojang.brigadier.context.CommandContext) -> b
-net.minecraft.commands.arguments.item.ItemArgument -> ej:
+    com.mojang.datafixers.util.Pair unwrap(com.mojang.brigadier.context.CommandContext) -> b
+net.minecraft.commands.arguments.item.ItemArgument -> et:
     java.util.Collection EXAMPLES -> a
-    14:14:void <init>() -> <init>
-    18:18:net.minecraft.commands.arguments.item.ItemArgument item() -> a
-    23:25:net.minecraft.commands.arguments.item.ItemInput parse(com.mojang.brigadier.StringReader) -> a
-    29:29:net.minecraft.commands.arguments.item.ItemInput getItem(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    34:41:java.util.concurrent.CompletableFuture listSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> listSuggestions
-    46:46:java.util.Collection getExamples() -> getExamples
-    14:14:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
-    15:15:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.item.ItemInput -> ek:
+    15:15:void <init>() -> <init>
+    19:19:net.minecraft.commands.arguments.item.ItemArgument item() -> a
+    24:26:net.minecraft.commands.arguments.item.ItemInput parse(com.mojang.brigadier.StringReader) -> a
+    30:30:net.minecraft.commands.arguments.item.ItemInput getItem(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    35:42:java.util.concurrent.CompletableFuture listSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> listSuggestions
+    47:47:java.util.Collection getExamples() -> getExamples
+    15:15:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.item.ItemInput -> eu:
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType ERROR_STACK_TOO_BIG -> a
     net.minecraft.world.item.Item item -> b
     net.minecraft.nbt.CompoundTag tag -> c
@@ -20020,10 +21268,10 @@ net.minecraft.commands.arguments.item.ItemInput -> ek:
     15:15:boolean test(java.lang.Object) -> test
     16:16:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.item.ItemParser -> el:
+net.minecraft.commands.arguments.item.ItemParser -> ev:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NO_TAGS_ALLOWED -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_ITEM -> b
-    java.util.function.Function SUGGEST_NOTHING -> c
+    java.util.function.BiFunction SUGGEST_NOTHING -> c
     com.mojang.brigadier.StringReader reader -> d
     boolean forTesting -> e
     java.util.Map properties -> f
@@ -20031,7 +21279,7 @@ net.minecraft.commands.arguments.item.ItemParser -> el:
     net.minecraft.nbt.CompoundTag nbt -> h
     net.minecraft.resources.ResourceLocation tag -> i
     int tagCursor -> j
-    java.util.function.Function suggestions -> k
+    java.util.function.BiFunction suggestions -> k
     36:47:void <init>(com.mojang.brigadier.StringReader,boolean) -> <init>
     50:50:java.util.Map getProperties() -> a
     54:54:net.minecraft.world.item.Item getItem() -> b
@@ -20041,44 +21289,45 @@ net.minecraft.commands.arguments.item.ItemParser -> el:
     76:84:void readTag() -> f
     87:88:void readNbt() -> g
     91:102:net.minecraft.commands.arguments.item.ItemParser parse() -> h
-    106:109:java.util.concurrent.CompletableFuture suggestOpenNbt(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> b
-    113:113:java.util.concurrent.CompletableFuture suggestTag(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> c
-    117:120:java.util.concurrent.CompletableFuture suggestItemIdOrTag(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> d
-    124:124:java.util.concurrent.CompletableFuture fillSuggestions(com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    70:71:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$readItem$1(int,net.minecraft.resources.ResourceLocation) -> a
+    106:109:java.util.concurrent.CompletableFuture suggestOpenNbt(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> b
+    113:113:java.util.concurrent.CompletableFuture suggestTag(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> c
+    117:120:java.util.concurrent.CompletableFuture suggestItemIdOrTag(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> d
+    124:124:java.util.concurrent.CompletableFuture fillSuggestions(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> a
+    70:71:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$readItem$2(int,net.minecraft.resources.ResourceLocation) -> a
+    32:32:java.util.concurrent.CompletableFuture lambda$static$1(com.mojang.brigadier.suggestion.SuggestionsBuilder,net.minecraft.tags.TagCollection) -> e
     27:27:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     26:32:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.item.ItemPredicateArgument -> em:
+net.minecraft.commands.arguments.item.ItemPredicateArgument -> ew:
     java.util.Collection EXAMPLES -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_TAG -> b
-    25:25:void <init>() -> <init>
-    30:30:net.minecraft.commands.arguments.item.ItemPredicateArgument itemPredicate() -> a
-    35:42:net.minecraft.commands.arguments.item.ItemPredicateArgument$Result parse(com.mojang.brigadier.StringReader) -> a
-    53:53:java.util.function.Predicate getItemPredicate(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    58:65:java.util.concurrent.CompletableFuture listSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> listSuggestions
-    70:70:java.util.Collection getExamples() -> getExamples
-    25:25:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
-    43:47:java.util.function.Predicate lambda$parse$2(net.minecraft.resources.ResourceLocation,net.minecraft.commands.arguments.item.ItemParser,com.mojang.brigadier.context.CommandContext) -> a
-    39:39:java.util.function.Predicate lambda$parse$1(net.minecraft.commands.arguments.item.ItemPredicateArgument$ItemPredicate,com.mojang.brigadier.context.CommandContext) -> a
-    27:27:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
-    26:27:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.item.ItemPredicateArgument$ItemPredicate -> em$a:
+    26:26:void <init>() -> <init>
+    31:31:net.minecraft.commands.arguments.item.ItemPredicateArgument itemPredicate() -> a
+    36:43:net.minecraft.commands.arguments.item.ItemPredicateArgument$Result parse(com.mojang.brigadier.StringReader) -> a
+    54:54:java.util.function.Predicate getItemPredicate(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    59:66:java.util.concurrent.CompletableFuture listSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> listSuggestions
+    71:71:java.util.Collection getExamples() -> getExamples
+    26:26:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
+    44:48:java.util.function.Predicate lambda$parse$2(net.minecraft.resources.ResourceLocation,net.minecraft.commands.arguments.item.ItemParser,com.mojang.brigadier.context.CommandContext) -> a
+    40:40:java.util.function.Predicate lambda$parse$1(net.minecraft.commands.arguments.item.ItemPredicateArgument$ItemPredicate,com.mojang.brigadier.context.CommandContext) -> a
+    28:28:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
+    27:28:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.item.ItemPredicateArgument$ItemPredicate -> ew$a:
     net.minecraft.world.item.Item item -> a
     net.minecraft.nbt.CompoundTag nbt -> b
-    82:85:void <init>(net.minecraft.world.item.Item,net.minecraft.nbt.CompoundTag) -> <init>
-    89:89:boolean test(net.minecraft.world.item.ItemStack) -> a
-    77:77:boolean test(java.lang.Object) -> test
-net.minecraft.commands.arguments.item.ItemPredicateArgument$Result -> em$b:
+    83:86:void <init>(net.minecraft.world.item.Item,net.minecraft.nbt.CompoundTag) -> <init>
+    90:90:boolean test(net.minecraft.world.item.ItemStack) -> a
+    78:78:boolean test(java.lang.Object) -> test
+net.minecraft.commands.arguments.item.ItemPredicateArgument$Result -> ew$b:
     java.util.function.Predicate create(com.mojang.brigadier.context.CommandContext) -> create
-net.minecraft.commands.arguments.item.ItemPredicateArgument$TagPredicate -> em$c:
+net.minecraft.commands.arguments.item.ItemPredicateArgument$TagPredicate -> ew$c:
     net.minecraft.tags.Tag tag -> a
     net.minecraft.nbt.CompoundTag nbt -> b
-    98:101:void <init>(net.minecraft.tags.Tag,net.minecraft.nbt.CompoundTag) -> <init>
-    105:105:boolean test(net.minecraft.world.item.ItemStack) -> a
-    93:93:boolean test(java.lang.Object) -> test
-net.minecraft.commands.arguments.item.package-info -> en:
-net.minecraft.commands.arguments.package-info -> eo:
-net.minecraft.commands.arguments.selector.EntitySelector -> ep:
+    99:102:void <init>(net.minecraft.tags.Tag,net.minecraft.nbt.CompoundTag) -> <init>
+    106:106:boolean test(net.minecraft.world.item.ItemStack) -> a
+    94:94:boolean test(java.lang.Object) -> test
+net.minecraft.commands.arguments.item.package-info -> ex:
+net.minecraft.commands.arguments.package-info -> ey:
+net.minecraft.commands.arguments.selector.EntitySelector -> ez:
     int maxResults -> a
     boolean includesEntities -> b
     boolean worldLimited -> c
@@ -20106,10 +21355,10 @@ net.minecraft.commands.arguments.selector.EntitySelector -> ep:
     167:211:java.util.List findPlayers(net.minecraft.commands.CommandSourceStack) -> d
     215:224:java.util.function.Predicate getPredicate(net.minecraft.world.phys.Vec3) -> a
     228:232:java.util.List sortAndLimit(net.minecraft.world.phys.Vec3,java.util.List) -> a
-    236:236:net.minecraft.network.chat.Component joinNames(java.util.List) -> a
+    236:236:net.minecraft.network.chat.MutableComponent joinNames(java.util.List) -> a
     222:222:boolean lambda$getPredicate$1(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> a
     218:218:boolean lambda$getPredicate$0(net.minecraft.world.phys.AABB,net.minecraft.world.entity.Entity) -> a
-net.minecraft.commands.arguments.selector.EntitySelectorParser -> eq:
+net.minecraft.commands.arguments.selector.EntitySelectorParser -> fa:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID_NAME_OR_UUID -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_SELECTOR_TYPE -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_SELECTORS_NOT_ALLOWED -> c
@@ -20205,33 +21454,32 @@ net.minecraft.commands.arguments.selector.EntitySelectorParser -> eq:
     482:484:java.util.concurrent.CompletableFuture suggestOptionsNextOrClose(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Consumer) -> h
     488:489:java.util.concurrent.CompletableFuture suggestEquals(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Consumer) -> i
     493:493:boolean isCurrentEntity() -> u
-    497:498:void setCurrentEntity(boolean) -> b
-    501:502:void setSuggestions(java.util.function.BiFunction) -> a
-    505:505:java.util.concurrent.CompletableFuture fillSuggestions(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Consumer) -> a
-    509:509:boolean hasNameEquals() -> v
-    513:514:void setHasNameEquals(boolean) -> c
-    517:517:boolean hasNameNotEquals() -> w
-    521:522:void setHasNameNotEquals(boolean) -> d
-    525:525:boolean isLimited() -> x
-    529:530:void setLimited(boolean) -> e
-    533:533:boolean isSorted() -> y
-    537:538:void setSorted(boolean) -> f
-    541:541:boolean hasGamemodeEquals() -> z
-    545:546:void setHasGamemodeEquals(boolean) -> g
-    549:549:boolean hasGamemodeNotEquals() -> A
-    553:554:void setHasGamemodeNotEquals(boolean) -> h
-    557:557:boolean hasTeamEquals() -> B
-    561:562:void setHasTeamEquals(boolean) -> i
-    565:565:boolean hasTeamNotEquals() -> C
-    569:570:void setHasTeamNotEquals(boolean) -> j
-    573:574:void limitToType(net.minecraft.world.entity.EntityType) -> a
-    577:578:void setTypeLimitedInversely() -> D
-    581:581:boolean isTypeLimited() -> E
-    585:585:boolean isTypeLimitedInversely() -> F
-    589:589:boolean hasScores() -> G
-    593:594:void setHasScores(boolean) -> k
-    597:597:boolean hasAdvancements() -> H
-    601:602:void setHasAdvancements(boolean) -> l
+    497:498:void setSuggestions(java.util.function.BiFunction) -> a
+    501:501:java.util.concurrent.CompletableFuture fillSuggestions(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Consumer) -> a
+    505:505:boolean hasNameEquals() -> v
+    509:510:void setHasNameEquals(boolean) -> b
+    513:513:boolean hasNameNotEquals() -> w
+    517:518:void setHasNameNotEquals(boolean) -> c
+    521:521:boolean isLimited() -> x
+    525:526:void setLimited(boolean) -> d
+    529:529:boolean isSorted() -> y
+    533:534:void setSorted(boolean) -> e
+    537:537:boolean hasGamemodeEquals() -> z
+    541:542:void setHasGamemodeEquals(boolean) -> f
+    545:545:boolean hasGamemodeNotEquals() -> A
+    549:550:void setHasGamemodeNotEquals(boolean) -> g
+    553:553:boolean hasTeamEquals() -> B
+    557:558:void setHasTeamEquals(boolean) -> h
+    561:561:boolean hasTeamNotEquals() -> C
+    565:566:void setHasTeamNotEquals(boolean) -> i
+    569:570:void limitToType(net.minecraft.world.entity.EntityType) -> a
+    573:574:void setTypeLimitedInversely() -> D
+    577:577:boolean isTypeLimited() -> E
+    581:581:boolean isTypeLimitedInversely() -> F
+    585:585:boolean hasScores() -> G
+    589:590:void setHasScores(boolean) -> j
+    593:593:boolean hasAdvancements() -> H
+    597:598:void setHasAdvancements(boolean) -> k
     170:174:boolean lambda$createRotationPredicate$15(java.util.function.ToDoubleFunction,double,double,net.minecraft.world.entity.Entity) -> a
     158:161:boolean lambda$finalizePredicates$14(net.minecraft.world.entity.Entity) -> a
     154:154:double lambda$finalizePredicates$13(net.minecraft.world.entity.Entity) -> b
@@ -20249,7 +21497,7 @@ net.minecraft.commands.arguments.selector.EntitySelectorParser -> eq:
     54:54:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> a
     50:50:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> b
     49:61:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.selector.options.EntitySelectorOptions -> er:
+net.minecraft.commands.arguments.selector.options.EntitySelectorOptions -> fb:
     java.util.Map OPTIONS -> i
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_OPTION -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INAPPLICABLE_OPTION -> b
@@ -20259,151 +21507,153 @@ net.minecraft.commands.arguments.selector.options.EntitySelectorOptions -> er:
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_SORT_UNKNOWN -> f
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_GAME_MODE_INVALID -> g
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_ENTITY_TYPE_INVALID -> h
-    54:54:void <init>() -> <init>
-    67:68:void register(java.lang.String,net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier,java.util.function.Predicate,net.minecraft.network.chat.Component) -> a
-    71:484:void bootStrap() -> a
-    487:496:net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier get(net.minecraft.commands.arguments.selector.EntitySelectorParser,java.lang.String,int) -> a
-    501:507:void suggestNames(net.minecraft.commands.arguments.selector.EntitySelectorParser,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    483:483:boolean lambda$bootStrap$63(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> a
-    465:483:void lambda$bootStrap$62(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> b
-    468:480:boolean lambda$null$61(net.minecraft.resources.ResourceLocation,boolean,net.minecraft.world.entity.Entity) -> a
-    462:462:boolean lambda$bootStrap$60(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> c
-    385:462:void lambda$bootStrap$59(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> d
-    444:456:boolean lambda$null$58(java.util.Map,net.minecraft.world.entity.Entity) -> a
-    432:432:boolean lambda$null$57(boolean,net.minecraft.advancements.AdvancementProgress) -> a
-    422:428:boolean lambda$null$56(java.util.Map,net.minecraft.advancements.AdvancementProgress) -> a
-    410:410:boolean lambda$null$55(boolean,net.minecraft.advancements.CriterionProgress) -> a
-    382:382:boolean lambda$bootStrap$54(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> e
-    339:382:void lambda$bootStrap$53(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> f
-    361:377:boolean lambda$null$52(java.util.Map,net.minecraft.world.entity.Entity) -> b
-    336:336:boolean lambda$bootStrap$51(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> g
-    323:336:void lambda$bootStrap$50(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> h
-    327:334:boolean lambda$null$49(net.minecraft.nbt.CompoundTag,boolean,net.minecraft.world.entity.Entity) -> a
-    320:320:boolean lambda$bootStrap$48(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> i
-    310:320:void lambda$bootStrap$47(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> j
-    314:317:boolean lambda$null$46(java.lang.String,boolean,net.minecraft.world.entity.Entity) -> a
-    307:307:boolean lambda$bootStrap$45(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> k
-    264:307:void lambda$bootStrap$44(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> l
-    302:302:boolean lambda$null$43(net.minecraft.world.entity.EntityType,boolean,net.minecraft.world.entity.Entity) -> a
-    296:297:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$null$42(net.minecraft.commands.arguments.selector.EntitySelectorParser,int,net.minecraft.resources.ResourceLocation) -> a
-    292:292:boolean lambda$null$41(net.minecraft.tags.Tag,boolean,net.minecraft.world.entity.Entity) -> a
-    265:271:java.util.concurrent.CompletableFuture lambda$null$40(net.minecraft.commands.arguments.selector.EntitySelectorParser,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Consumer) -> a
-    261:261:boolean lambda$bootStrap$39(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> m
-    245:261:void lambda$bootStrap$38(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> n
-    249:254:boolean lambda$null$37(java.lang.String,boolean,net.minecraft.world.entity.Entity) -> b
-    242:242:boolean lambda$bootStrap$36(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> o
-    189:242:void lambda$bootStrap$35(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> p
-    231:235:boolean lambda$null$34(boolean,net.minecraft.world.level.GameType,net.minecraft.world.entity.Entity) -> a
-    190:214:java.util.concurrent.CompletableFuture lambda$null$33(net.minecraft.commands.arguments.selector.EntitySelectorParser,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Consumer) -> b
-    186:186:boolean lambda$bootStrap$32(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> q
-    163:186:void lambda$bootStrap$31(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> r
-    166:166:java.util.concurrent.CompletableFuture lambda$null$30(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Consumer) -> a
-    160:160:boolean lambda$bootStrap$29(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> s
-    152:160:void lambda$bootStrap$28(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> t
-    149:149:boolean lambda$bootStrap$27(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> u
-    148:149:void lambda$bootStrap$26(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> v
-    145:145:boolean lambda$bootStrap$25(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> w
-    144:145:void lambda$bootStrap$24(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> x
-    141:141:boolean lambda$bootStrap$23(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> y
-    139:141:void lambda$bootStrap$22(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> z
-    136:136:boolean lambda$bootStrap$21(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> A
-    134:136:void lambda$bootStrap$20(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> B
-    131:131:boolean lambda$bootStrap$19(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> C
-    129:131:void lambda$bootStrap$18(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> D
-    126:126:boolean lambda$bootStrap$17(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> E
-    124:126:void lambda$bootStrap$16(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> F
-    121:121:boolean lambda$bootStrap$15(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> G
-    119:121:void lambda$bootStrap$14(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> H
-    116:116:boolean lambda$bootStrap$13(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> I
-    114:116:void lambda$bootStrap$12(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> J
-    111:111:boolean lambda$bootStrap$11(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> K
-    103:111:void lambda$bootStrap$10(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> L
-    100:100:boolean lambda$bootStrap$9(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> M
-    92:100:void lambda$bootStrap$8(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> N
-    89:89:boolean lambda$bootStrap$7(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> O
-    76:89:void lambda$bootStrap$6(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> P
-    88:88:boolean lambda$null$5(java.lang.String,boolean,net.minecraft.world.entity.Entity) -> c
-    64:64:com.mojang.brigadier.Message lambda$static$4(java.lang.Object) -> a
-    63:63:com.mojang.brigadier.Message lambda$static$3(java.lang.Object) -> b
-    62:62:com.mojang.brigadier.Message lambda$static$2(java.lang.Object) -> c
-    58:58:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> d
-    57:57:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> e
-    55:64:void <clinit>() -> <clinit>
-net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$1 -> er$1:
-net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier -> er$a:
+    52:52:void <init>() -> <init>
+    65:66:void register(java.lang.String,net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier,java.util.function.Predicate,net.minecraft.network.chat.Component) -> a
+    69:477:void bootStrap() -> a
+    480:489:net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier get(net.minecraft.commands.arguments.selector.EntitySelectorParser,java.lang.String,int) -> a
+    494:500:void suggestNames(net.minecraft.commands.arguments.selector.EntitySelectorParser,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    476:476:boolean lambda$bootStrap$63(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> a
+    458:476:void lambda$bootStrap$62(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> b
+    461:473:boolean lambda$null$61(net.minecraft.resources.ResourceLocation,boolean,net.minecraft.world.entity.Entity) -> a
+    455:455:boolean lambda$bootStrap$60(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> c
+    378:455:void lambda$bootStrap$59(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> d
+    437:449:boolean lambda$null$58(java.util.Map,net.minecraft.world.entity.Entity) -> a
+    425:425:boolean lambda$null$57(boolean,net.minecraft.advancements.AdvancementProgress) -> a
+    415:421:boolean lambda$null$56(java.util.Map,net.minecraft.advancements.AdvancementProgress) -> a
+    403:403:boolean lambda$null$55(boolean,net.minecraft.advancements.CriterionProgress) -> a
+    375:375:boolean lambda$bootStrap$54(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> e
+    332:375:void lambda$bootStrap$53(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> f
+    354:370:boolean lambda$null$52(java.util.Map,net.minecraft.world.entity.Entity) -> b
+    329:329:boolean lambda$bootStrap$51(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> g
+    316:329:void lambda$bootStrap$50(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> h
+    320:327:boolean lambda$null$49(net.minecraft.nbt.CompoundTag,boolean,net.minecraft.world.entity.Entity) -> a
+    313:313:boolean lambda$bootStrap$48(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> i
+    303:313:void lambda$bootStrap$47(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> j
+    307:310:boolean lambda$null$46(java.lang.String,boolean,net.minecraft.world.entity.Entity) -> a
+    300:300:boolean lambda$bootStrap$45(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> k
+    262:300:void lambda$bootStrap$44(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> l
+    295:295:boolean lambda$null$43(net.minecraft.world.entity.EntityType,boolean,net.minecraft.world.entity.Entity) -> a
+    289:290:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$null$42(net.minecraft.commands.arguments.selector.EntitySelectorParser,int,net.minecraft.resources.ResourceLocation) -> a
+    285:285:boolean lambda$null$41(net.minecraft.resources.ResourceLocation,boolean,net.minecraft.world.entity.Entity) -> b
+    263:269:java.util.concurrent.CompletableFuture lambda$null$40(net.minecraft.commands.arguments.selector.EntitySelectorParser,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Consumer) -> a
+    259:259:boolean lambda$bootStrap$39(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> m
+    243:259:void lambda$bootStrap$38(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> n
+    247:252:boolean lambda$null$37(java.lang.String,boolean,net.minecraft.world.entity.Entity) -> b
+    240:240:boolean lambda$bootStrap$36(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> o
+    187:240:void lambda$bootStrap$35(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> p
+    229:233:boolean lambda$null$34(boolean,net.minecraft.world.level.GameType,net.minecraft.world.entity.Entity) -> a
+    188:212:java.util.concurrent.CompletableFuture lambda$null$33(net.minecraft.commands.arguments.selector.EntitySelectorParser,com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Consumer) -> b
+    184:184:boolean lambda$bootStrap$32(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> q
+    161:184:void lambda$bootStrap$31(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> r
+    164:164:java.util.concurrent.CompletableFuture lambda$null$30(com.mojang.brigadier.suggestion.SuggestionsBuilder,java.util.function.Consumer) -> a
+    158:158:boolean lambda$bootStrap$29(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> s
+    150:158:void lambda$bootStrap$28(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> t
+    147:147:boolean lambda$bootStrap$27(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> u
+    146:147:void lambda$bootStrap$26(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> v
+    143:143:boolean lambda$bootStrap$25(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> w
+    142:143:void lambda$bootStrap$24(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> x
+    139:139:boolean lambda$bootStrap$23(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> y
+    137:139:void lambda$bootStrap$22(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> z
+    134:134:boolean lambda$bootStrap$21(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> A
+    132:134:void lambda$bootStrap$20(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> B
+    129:129:boolean lambda$bootStrap$19(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> C
+    127:129:void lambda$bootStrap$18(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> D
+    124:124:boolean lambda$bootStrap$17(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> E
+    122:124:void lambda$bootStrap$16(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> F
+    119:119:boolean lambda$bootStrap$15(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> G
+    117:119:void lambda$bootStrap$14(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> H
+    114:114:boolean lambda$bootStrap$13(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> I
+    112:114:void lambda$bootStrap$12(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> J
+    109:109:boolean lambda$bootStrap$11(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> K
+    101:109:void lambda$bootStrap$10(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> L
+    98:98:boolean lambda$bootStrap$9(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> M
+    90:98:void lambda$bootStrap$8(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> N
+    87:87:boolean lambda$bootStrap$7(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> O
+    74:87:void lambda$bootStrap$6(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> P
+    86:86:boolean lambda$null$5(java.lang.String,boolean,net.minecraft.world.entity.Entity) -> c
+    62:62:com.mojang.brigadier.Message lambda$static$4(java.lang.Object) -> a
+    61:61:com.mojang.brigadier.Message lambda$static$3(java.lang.Object) -> b
+    60:60:com.mojang.brigadier.Message lambda$static$2(java.lang.Object) -> c
+    56:56:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> d
+    55:55:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> e
+    53:62:void <clinit>() -> <clinit>
+net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$1 -> fb$1:
+net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier -> fb$a:
     void handle(net.minecraft.commands.arguments.selector.EntitySelectorParser) -> handle
-net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Option -> er$b:
+net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Option -> fb$b:
     net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier modifier -> a
     java.util.function.Predicate predicate -> b
     net.minecraft.network.chat.Component description -> c
-    518:522:void <init>(net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier,java.util.function.Predicate,net.minecraft.network.chat.Component) -> <init>
-    513:513:void <init>(net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier,java.util.function.Predicate,net.minecraft.network.chat.Component,net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$1) -> <init>
-net.minecraft.commands.arguments.selector.options.package-info -> es:
-net.minecraft.commands.arguments.selector.package-info -> et:
-net.minecraft.commands.exceptions.package-info -> eu:
-net.minecraft.commands.package-info -> ev:
-net.minecraft.commands.synchronization.ArgumentSerializer -> ew:
+    511:515:void <init>(net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier,java.util.function.Predicate,net.minecraft.network.chat.Component) -> <init>
+    506:506:void <init>(net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$Modifier,java.util.function.Predicate,net.minecraft.network.chat.Component,net.minecraft.commands.arguments.selector.options.EntitySelectorOptions$1) -> <init>
+net.minecraft.commands.arguments.selector.options.package-info -> fc:
+net.minecraft.commands.arguments.selector.package-info -> fd:
+net.minecraft.commands.exceptions.package-info -> fe:
+net.minecraft.commands.package-info -> ff:
+net.minecraft.commands.synchronization.ArgumentSerializer -> fg:
     void serializeToNetwork(com.mojang.brigadier.arguments.ArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
     com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
     void serializeToJson(com.mojang.brigadier.arguments.ArgumentType,com.google.gson.JsonObject) -> a
-net.minecraft.commands.synchronization.ArgumentTypes -> ex:
+net.minecraft.commands.synchronization.ArgumentTypes -> fh:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Map BY_CLASS -> b
     java.util.Map BY_NAME -> c
-    60:60:void <init>() -> <init>
-    67:78:void register(java.lang.String,java.lang.Class,net.minecraft.commands.synchronization.ArgumentSerializer) -> a
-    81:123:void bootStrap() -> a
-    127:127:net.minecraft.commands.synchronization.ArgumentTypes$Entry get(net.minecraft.resources.ResourceLocation) -> a
-    132:132:net.minecraft.commands.synchronization.ArgumentTypes$Entry get(com.mojang.brigadier.arguments.ArgumentType) -> a
-    137:146:void serialize(net.minecraft.network.FriendlyByteBuf,com.mojang.brigadier.arguments.ArgumentType) -> a
-    150:158:com.mojang.brigadier.arguments.ArgumentType deserialize(net.minecraft.network.FriendlyByteBuf) -> a
-    163:177:void serializeToJson(com.google.gson.JsonObject,com.mojang.brigadier.arguments.ArgumentType) -> a
-    180:217:com.google.gson.JsonObject serializeNodeToJson(com.mojang.brigadier.CommandDispatcher,com.mojang.brigadier.tree.CommandNode) -> a
-    61:64:void <clinit>() -> <clinit>
-net.minecraft.commands.synchronization.ArgumentTypes$1 -> ex$1:
-net.minecraft.commands.synchronization.ArgumentTypes$Entry -> ex$a:
+    61:61:void <init>() -> <init>
+    68:79:void register(java.lang.String,java.lang.Class,net.minecraft.commands.synchronization.ArgumentSerializer) -> a
+    82:125:void bootStrap() -> a
+    129:129:net.minecraft.commands.synchronization.ArgumentTypes$Entry get(net.minecraft.resources.ResourceLocation) -> a
+    134:134:net.minecraft.commands.synchronization.ArgumentTypes$Entry get(com.mojang.brigadier.arguments.ArgumentType) -> a
+    139:148:void serialize(net.minecraft.network.FriendlyByteBuf,com.mojang.brigadier.arguments.ArgumentType) -> a
+    152:160:com.mojang.brigadier.arguments.ArgumentType deserialize(net.minecraft.network.FriendlyByteBuf) -> a
+    165:179:void serializeToJson(com.google.gson.JsonObject,com.mojang.brigadier.arguments.ArgumentType) -> a
+    182:219:com.google.gson.JsonObject serializeNodeToJson(com.mojang.brigadier.CommandDispatcher,com.mojang.brigadier.tree.CommandNode) -> a
+    62:65:void <clinit>() -> <clinit>
+net.minecraft.commands.synchronization.ArgumentTypes$1 -> fh$1:
+net.minecraft.commands.synchronization.ArgumentTypes$Entry -> fh$a:
     java.lang.Class clazz -> a
     net.minecraft.commands.synchronization.ArgumentSerializer serializer -> b
     net.minecraft.resources.ResourceLocation name -> c
-    225:229:void <init>(java.lang.Class,net.minecraft.commands.synchronization.ArgumentSerializer,net.minecraft.resources.ResourceLocation) -> <init>
-    220:220:void <init>(java.lang.Class,net.minecraft.commands.synchronization.ArgumentSerializer,net.minecraft.resources.ResourceLocation,net.minecraft.commands.synchronization.ArgumentTypes$1) -> <init>
-net.minecraft.commands.synchronization.EmptyArgumentSerializer -> ey:
+    227:231:void <init>(java.lang.Class,net.minecraft.commands.synchronization.ArgumentSerializer,net.minecraft.resources.ResourceLocation) -> <init>
+    222:222:void <init>(java.lang.Class,net.minecraft.commands.synchronization.ArgumentSerializer,net.minecraft.resources.ResourceLocation,net.minecraft.commands.synchronization.ArgumentTypes$1) -> <init>
+net.minecraft.commands.synchronization.EmptyArgumentSerializer -> fi:
     java.util.function.Supplier constructor -> a
     12:14:void <init>(java.util.function.Supplier) -> <init>
     18:18:void serializeToNetwork(com.mojang.brigadier.arguments.ArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
     22:22:com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
     27:27:void serializeToJson(com.mojang.brigadier.arguments.ArgumentType,com.google.gson.JsonObject) -> a
-net.minecraft.commands.synchronization.SuggestionProviders -> ez:
-    java.util.Map PROVIDERS_BY_NAME -> e
-    net.minecraft.resources.ResourceLocation DEFAULT_NAME -> f
+net.minecraft.commands.synchronization.SuggestionProviders -> fj:
+    java.util.Map PROVIDERS_BY_NAME -> f
+    net.minecraft.resources.ResourceLocation DEFAULT_NAME -> g
     com.mojang.brigadier.suggestion.SuggestionProvider ASK_SERVER -> a
     com.mojang.brigadier.suggestion.SuggestionProvider ALL_RECIPES -> b
     com.mojang.brigadier.suggestion.SuggestionProvider AVAILABLE_SOUNDS -> c
-    com.mojang.brigadier.suggestion.SuggestionProvider SUMMONABLE_ENTITIES -> d
+    com.mojang.brigadier.suggestion.SuggestionProvider AVAILABLE_BIOMES -> d
+    com.mojang.brigadier.suggestion.SuggestionProvider SUMMONABLE_ENTITIES -> e
     20:20:void <init>() -> <init>
-    31:35:com.mojang.brigadier.suggestion.SuggestionProvider register(net.minecraft.resources.ResourceLocation,com.mojang.brigadier.suggestion.SuggestionProvider) -> a
-    39:39:com.mojang.brigadier.suggestion.SuggestionProvider getProvider(net.minecraft.resources.ResourceLocation) -> a
-    43:46:net.minecraft.resources.ResourceLocation getName(com.mojang.brigadier.suggestion.SuggestionProvider) -> a
-    51:54:com.mojang.brigadier.suggestion.SuggestionProvider safelySwap(com.mojang.brigadier.suggestion.SuggestionProvider) -> b
-    27:27:java.util.concurrent.CompletableFuture lambda$static$4(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    27:27:com.mojang.brigadier.Message lambda$null$3(net.minecraft.world.entity.EntityType) -> a
-    26:26:java.util.concurrent.CompletableFuture lambda$static$2(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> b
-    25:25:java.util.concurrent.CompletableFuture lambda$static$1(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> c
-    24:24:java.util.concurrent.CompletableFuture lambda$static$0(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> d
-    21:27:void <clinit>() -> <clinit>
-net.minecraft.commands.synchronization.SuggestionProviders$Wrapper -> ez$a:
+    32:36:com.mojang.brigadier.suggestion.SuggestionProvider register(net.minecraft.resources.ResourceLocation,com.mojang.brigadier.suggestion.SuggestionProvider) -> a
+    40:40:com.mojang.brigadier.suggestion.SuggestionProvider getProvider(net.minecraft.resources.ResourceLocation) -> a
+    44:47:net.minecraft.resources.ResourceLocation getName(com.mojang.brigadier.suggestion.SuggestionProvider) -> a
+    52:55:com.mojang.brigadier.suggestion.SuggestionProvider safelySwap(com.mojang.brigadier.suggestion.SuggestionProvider) -> b
+    28:28:java.util.concurrent.CompletableFuture lambda$static$5(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    28:28:com.mojang.brigadier.Message lambda$null$4(net.minecraft.world.entity.EntityType) -> a
+    27:27:java.util.concurrent.CompletableFuture lambda$static$3(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> b
+    26:26:java.util.concurrent.CompletableFuture lambda$static$2(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> c
+    25:25:java.util.concurrent.CompletableFuture lambda$static$1(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> d
+    24:24:java.util.concurrent.CompletableFuture lambda$static$0(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> e
+    21:28:void <clinit>() -> <clinit>
+net.minecraft.commands.synchronization.SuggestionProviders$Wrapper -> fj$a:
     com.mojang.brigadier.suggestion.SuggestionProvider delegate -> a
     net.minecraft.resources.ResourceLocation name -> b
-    62:65:void <init>(net.minecraft.resources.ResourceLocation,com.mojang.brigadier.suggestion.SuggestionProvider) -> <init>
-    69:69:java.util.concurrent.CompletableFuture getSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> getSuggestions
-    58:58:net.minecraft.resources.ResourceLocation access$000(net.minecraft.commands.synchronization.SuggestionProviders$Wrapper) -> a
-net.minecraft.commands.synchronization.brigadier.BrigadierArgumentSerializers -> fa:
+    63:66:void <init>(net.minecraft.resources.ResourceLocation,com.mojang.brigadier.suggestion.SuggestionProvider) -> <init>
+    70:70:java.util.concurrent.CompletableFuture getSuggestions(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> getSuggestions
+    59:59:net.minecraft.resources.ResourceLocation access$000(net.minecraft.commands.synchronization.SuggestionProviders$Wrapper) -> a
+net.minecraft.commands.synchronization.brigadier.BrigadierArgumentSerializers -> fk:
     13:13:void <init>() -> <init>
     18:24:void bootstrap() -> a
     27:34:byte createNumberFlags(boolean,boolean) -> a
     38:38:boolean numberHasMin(byte) -> a
     42:42:boolean numberHasMax(byte) -> b
-net.minecraft.commands.synchronization.brigadier.DoubleArgumentSerializer -> fb:
+net.minecraft.commands.synchronization.brigadier.DoubleArgumentSerializer -> fl:
     12:12:void <init>() -> <init>
     15:24:void serializeToNetwork(com.mojang.brigadier.arguments.DoubleArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
     28:31:com.mojang.brigadier.arguments.DoubleArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> a
@@ -20411,7 +21661,7 @@ net.minecraft.commands.synchronization.brigadier.DoubleArgumentSerializer -> fb:
     12:12:void serializeToJson(com.mojang.brigadier.arguments.ArgumentType,com.google.gson.JsonObject) -> a
     12:12:com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
     12:12:void serializeToNetwork(com.mojang.brigadier.arguments.ArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
-net.minecraft.commands.synchronization.brigadier.FloatArgumentSerializer -> fc:
+net.minecraft.commands.synchronization.brigadier.FloatArgumentSerializer -> fm:
     12:12:void <init>() -> <init>
     15:24:void serializeToNetwork(com.mojang.brigadier.arguments.FloatArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
     28:31:com.mojang.brigadier.arguments.FloatArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> a
@@ -20419,7 +21669,7 @@ net.minecraft.commands.synchronization.brigadier.FloatArgumentSerializer -> fc:
     12:12:void serializeToJson(com.mojang.brigadier.arguments.ArgumentType,com.google.gson.JsonObject) -> a
     12:12:com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
     12:12:void serializeToNetwork(com.mojang.brigadier.arguments.ArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
-net.minecraft.commands.synchronization.brigadier.IntegerArgumentSerializer -> fd:
+net.minecraft.commands.synchronization.brigadier.IntegerArgumentSerializer -> fn:
     12:12:void <init>() -> <init>
     15:24:void serializeToNetwork(com.mojang.brigadier.arguments.IntegerArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
     28:31:com.mojang.brigadier.arguments.IntegerArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> a
@@ -20427,7 +21677,7 @@ net.minecraft.commands.synchronization.brigadier.IntegerArgumentSerializer -> fd
     12:12:void serializeToJson(com.mojang.brigadier.arguments.ArgumentType,com.google.gson.JsonObject) -> a
     12:12:com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
     12:12:void serializeToNetwork(com.mojang.brigadier.arguments.ArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
-net.minecraft.commands.synchronization.brigadier.LongArgumentSerializer -> fe:
+net.minecraft.commands.synchronization.brigadier.LongArgumentSerializer -> fo:
     12:12:void <init>() -> <init>
     15:24:void serializeToNetwork(com.mojang.brigadier.arguments.LongArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
     28:31:com.mojang.brigadier.arguments.LongArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> a
@@ -20435,7 +21685,7 @@ net.minecraft.commands.synchronization.brigadier.LongArgumentSerializer -> fe:
     12:12:void serializeToJson(com.mojang.brigadier.arguments.ArgumentType,com.google.gson.JsonObject) -> a
     12:12:com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
     12:12:void serializeToNetwork(com.mojang.brigadier.arguments.ArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
-net.minecraft.commands.synchronization.brigadier.StringArgumentSerializer -> ff:
+net.minecraft.commands.synchronization.brigadier.StringArgumentSerializer -> fp:
     8:8:void <init>() -> <init>
     11:12:void serializeToNetwork(com.mojang.brigadier.arguments.StringArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
     16:24:com.mojang.brigadier.arguments.StringArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> a
@@ -20443,12 +21693,12 @@ net.minecraft.commands.synchronization.brigadier.StringArgumentSerializer -> ff:
     8:8:void serializeToJson(com.mojang.brigadier.arguments.ArgumentType,com.google.gson.JsonObject) -> a
     8:8:com.mojang.brigadier.arguments.ArgumentType deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
     8:8:void serializeToNetwork(com.mojang.brigadier.arguments.ArgumentType,net.minecraft.network.FriendlyByteBuf) -> a
-net.minecraft.commands.synchronization.brigadier.StringArgumentSerializer$1 -> ff$1:
+net.minecraft.commands.synchronization.brigadier.StringArgumentSerializer$1 -> fp$1:
     int[] $SwitchMap$com$mojang$brigadier$arguments$StringArgumentType$StringType -> a
     17:17:void <clinit>() -> <clinit>
-net.minecraft.commands.synchronization.brigadier.package-info -> fg:
-net.minecraft.commands.synchronization.package-info -> fh:
-net.minecraft.core.AxisCycle -> fi:
+net.minecraft.commands.synchronization.brigadier.package-info -> fq:
+net.minecraft.commands.synchronization.package-info -> fr:
+net.minecraft.core.AxisCycle -> fs:
     net.minecraft.core.AxisCycle NONE -> a
     net.minecraft.core.AxisCycle FORWARD -> b
     net.minecraft.core.AxisCycle BACKWARD -> c
@@ -20465,25 +21715,25 @@ net.minecraft.core.AxisCycle -> fi:
     88:88:net.minecraft.core.AxisCycle between(net.minecraft.core.Direction$Axis,net.minecraft.core.Direction$Axis) -> a
     3:3:void <init>(java.lang.String,int,net.minecraft.core.AxisCycle$1) -> <init>
     3:73:void <clinit>() -> <clinit>
-net.minecraft.core.AxisCycle$1 -> fi$1:
+net.minecraft.core.AxisCycle$1 -> fs$1:
     4:4:void <init>(java.lang.String,int) -> <init>
     7:7:int cycle(int,int,int,net.minecraft.core.Direction$Axis) -> a
     12:12:double cycle(double,double,double,net.minecraft.core.Direction$Axis) -> a
     17:17:net.minecraft.core.Direction$Axis cycle(net.minecraft.core.Direction$Axis) -> a
     22:22:net.minecraft.core.AxisCycle inverse() -> a
-net.minecraft.core.AxisCycle$2 -> fi$2:
+net.minecraft.core.AxisCycle$2 -> fs$2:
     28:28:void <init>(java.lang.String,int) -> <init>
     31:31:int cycle(int,int,int,net.minecraft.core.Direction$Axis) -> a
     36:36:double cycle(double,double,double,net.minecraft.core.Direction$Axis) -> a
     41:41:net.minecraft.core.Direction$Axis cycle(net.minecraft.core.Direction$Axis) -> a
     46:46:net.minecraft.core.AxisCycle inverse() -> a
-net.minecraft.core.AxisCycle$3 -> fi$3:
+net.minecraft.core.AxisCycle$3 -> fs$3:
     49:49:void <init>(java.lang.String,int) -> <init>
     52:52:int cycle(int,int,int,net.minecraft.core.Direction$Axis) -> a
     57:57:double cycle(double,double,double,net.minecraft.core.Direction$Axis) -> a
     62:62:net.minecraft.core.Direction$Axis cycle(net.minecraft.core.Direction$Axis) -> a
     67:67:net.minecraft.core.AxisCycle inverse() -> a
-net.minecraft.core.BlockMath -> fj:
+net.minecraft.core.BlockMath -> ft:
     org.apache.logging.log4j.Logger LOGGER -> c
     java.util.EnumMap vanillaUvTransformLocalToGlobal -> a
     java.util.EnumMap vanillaUvTransformGlobalToLocal -> b
@@ -20494,196 +21744,192 @@ net.minecraft.core.BlockMath -> fj:
     27:30:void lambda$static$1(java.util.EnumMap) -> a
     19:25:void lambda$static$0(java.util.EnumMap) -> b
     16:26:void <clinit>() -> <clinit>
-net.minecraft.core.BlockPos -> fk:
-    org.apache.logging.log4j.Logger LOGGER -> b
-    net.minecraft.core.BlockPos ZERO -> a
-    int PACKED_X_LENGTH -> c
-    int PACKED_Z_LENGTH -> d
-    int PACKED_Y_LENGTH -> f
-    long PACKED_X_MASK -> g
-    long PACKED_Y_MASK -> h
-    long PACKED_Z_MASK -> i
-    int Z_OFFSET -> j
-    int X_OFFSET -> k
-    45:46:void <init>(int,int,int) -> <init>
-    49:50:void <init>(double,double,double) -> <init>
-    53:54:void <init>(net.minecraft.world.entity.Entity) -> <init>
-    57:58:void <init>(net.minecraft.world.phys.Vec3) -> <init>
-    61:62:void <init>(net.minecraft.core.Position) -> <init>
-    65:66:void <init>(net.minecraft.core.Vec3i) -> <init>
-    69:76:net.minecraft.core.BlockPos deserialize(com.mojang.datafixers.Dynamic) -> a
-    81:81:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    85:85:long offset(long,net.minecraft.core.Direction) -> a
-    89:89:long offset(long,int,int,int) -> a
-    93:94:boolean isOutsideBuildHeight(long) -> a
-    98:98:int getX(long) -> b
-    102:102:int getY(long) -> c
-    106:106:int getZ(long) -> d
-    110:110:net.minecraft.core.BlockPos of(long) -> e
-    114:118:long asLong(int,int,int) -> a
-    126:126:long getFlatIndex(long) -> f
-    130:130:long asLong() -> a
-    135:138:net.minecraft.core.BlockPos offset(double,double,double) -> a
-    143:146:net.minecraft.core.BlockPos offset(int,int,int) -> b
-    151:151:net.minecraft.core.BlockPos offset(net.minecraft.core.Vec3i) -> a
-    156:156:net.minecraft.core.BlockPos subtract(net.minecraft.core.Vec3i) -> b
-    161:166:net.minecraft.core.BlockPos multiply(int) -> a
-    171:171:net.minecraft.core.BlockPos above() -> b
-    176:176:net.minecraft.core.BlockPos above(int) -> b
-    181:181:net.minecraft.core.BlockPos below() -> c
-    186:186:net.minecraft.core.BlockPos below(int) -> c
-    191:191:net.minecraft.core.BlockPos north() -> d
-    196:196:net.minecraft.core.BlockPos north(int) -> d
-    201:201:net.minecraft.core.BlockPos south() -> e
-    206:206:net.minecraft.core.BlockPos south(int) -> e
-    211:211:net.minecraft.core.BlockPos west() -> f
-    216:216:net.minecraft.core.BlockPos west(int) -> f
-    221:221:net.minecraft.core.BlockPos east() -> g
-    226:226:net.minecraft.core.BlockPos east(int) -> g
-    231:231:net.minecraft.core.BlockPos relative(net.minecraft.core.Direction) -> a
-    236:239:net.minecraft.core.BlockPos relative(net.minecraft.core.Direction,int) -> a
-    244:250:net.minecraft.core.BlockPos relative(net.minecraft.core.Direction$Axis,int) -> a
-    254:263:net.minecraft.core.BlockPos rotate(net.minecraft.world.level.block.Rotation) -> a
-    269:269:net.minecraft.core.BlockPos cross(net.minecraft.core.Vec3i) -> c
-    273:273:net.minecraft.core.BlockPos immutable() -> h
-    415:421:java.lang.Iterable betweenClosed(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    426:432:java.util.stream.Stream betweenClosedStream(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> b
-    437:443:java.util.stream.Stream betweenClosedStream(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    448:448:java.util.stream.Stream betweenClosedStream(int,int,int,int,int,int) -> a
-    465:465:java.lang.Iterable betweenClosed(int,int,int,int,int,int) -> b
-    26:26:net.minecraft.core.Vec3i cross(net.minecraft.core.Vec3i) -> d
-    26:26:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction$Axis,int) -> b
-    26:26:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction,int) -> b
-    26:26:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction) -> b
-    26:26:net.minecraft.core.Vec3i east(int) -> h
-    26:26:net.minecraft.core.Vec3i east() -> i
-    26:26:net.minecraft.core.Vec3i west(int) -> i
-    26:26:net.minecraft.core.Vec3i west() -> j
-    26:26:net.minecraft.core.Vec3i south(int) -> j
-    26:26:net.minecraft.core.Vec3i south() -> k
-    26:26:net.minecraft.core.Vec3i north(int) -> k
-    26:26:net.minecraft.core.Vec3i north() -> l
-    26:26:net.minecraft.core.Vec3i below(int) -> l
-    26:26:net.minecraft.core.Vec3i below() -> m
-    26:26:net.minecraft.core.Vec3i above(int) -> m
-    26:26:net.minecraft.core.Vec3i above() -> n
-    26:26:net.minecraft.core.Vec3i multiply(int) -> n
-    26:26:net.minecraft.core.Vec3i subtract(net.minecraft.core.Vec3i) -> e
-    26:26:net.minecraft.core.Vec3i offset(net.minecraft.core.Vec3i) -> f
-    26:26:net.minecraft.core.Vec3i offset(int,int,int) -> c
-    26:26:net.minecraft.core.Vec3i offset(double,double,double) -> b
-    465:465:java.util.Iterator lambda$betweenClosed$3(int,int,int,int,int,int) -> c
-    73:73:void lambda$deserialize$2(int[],int) -> a
-    72:72:void lambda$deserialize$1(int[],int) -> b
-    71:71:void lambda$deserialize$0(int[],int) -> c
-    28:42:void <clinit>() -> <clinit>
-net.minecraft.core.BlockPos$1 -> fk$1:
-    net.minecraft.core.Cursor3D cursor -> a
-    net.minecraft.core.BlockPos$MutableBlockPos nextPos -> b
-    int val$minX -> c
-    int val$minY -> d
-    int val$minZ -> e
-    int val$maxX -> f
-    int val$maxY -> g
-    int val$maxZ -> h
-    448:450:void <init>(long,int,int,int,int,int,int,int) -> <init>
-    454:458:boolean tryAdvance(java.util.function.Consumer) -> tryAdvance
-net.minecraft.core.BlockPos$2 -> fk$2:
-    net.minecraft.core.Cursor3D cursor -> a
-    net.minecraft.core.BlockPos$MutableBlockPos nextPos -> b
-    int val$minX -> c
-    int val$minY -> d
-    int val$minZ -> e
-    int val$maxX -> f
-    int val$maxY -> g
-    int val$maxZ -> h
-    465:467:void <init>(int,int,int,int,int,int) -> <init>
-    471:471:net.minecraft.core.BlockPos computeNext() -> a
-    465:465:java.lang.Object computeNext() -> computeNext
-net.minecraft.core.BlockPos$3 -> fk$3:
+net.minecraft.core.BlockPos -> fu:
+    com.mojang.serialization.Codec CODEC -> a
+    org.apache.logging.log4j.Logger LOGGER -> e
+    net.minecraft.core.BlockPos ZERO -> b
+    int PACKED_X_LENGTH -> f
+    int PACKED_Z_LENGTH -> g
+    int PACKED_Y_LENGTH -> h
+    long PACKED_X_MASK -> i
+    long PACKED_Y_MASK -> j
+    long PACKED_Z_MASK -> k
+    int Z_OFFSET -> l
+    int X_OFFSET -> m
+    47:48:void <init>(int,int,int) -> <init>
+    51:52:void <init>(double,double,double) -> <init>
+    55:56:void <init>(net.minecraft.world.phys.Vec3) -> <init>
+    59:60:void <init>(net.minecraft.core.Position) -> <init>
+    63:64:void <init>(net.minecraft.core.Vec3i) -> <init>
+    67:67:long offset(long,net.minecraft.core.Direction) -> a
+    71:71:long offset(long,int,int,int) -> a
+    75:76:boolean isOutsideBuildHeight(long) -> a
+    80:80:int getX(long) -> b
+    84:84:int getY(long) -> c
+    88:88:int getZ(long) -> d
+    92:92:net.minecraft.core.BlockPos of(long) -> e
+    96:96:long asLong() -> a
+    100:104:long asLong(int,int,int) -> a
+    112:112:long getFlatIndex(long) -> f
+    117:120:net.minecraft.core.BlockPos offset(double,double,double) -> a
+    125:128:net.minecraft.core.BlockPos offset(int,int,int) -> b
+    133:133:net.minecraft.core.BlockPos offset(net.minecraft.core.Vec3i) -> a
+    138:138:net.minecraft.core.BlockPos subtract(net.minecraft.core.Vec3i) -> b
+    143:148:net.minecraft.core.BlockPos multiply(int) -> a
+    153:153:net.minecraft.core.BlockPos above() -> b
+    158:158:net.minecraft.core.BlockPos above(int) -> b
+    163:163:net.minecraft.core.BlockPos below() -> c
+    168:168:net.minecraft.core.BlockPos below(int) -> c
+    173:173:net.minecraft.core.BlockPos north() -> d
+    178:178:net.minecraft.core.BlockPos north(int) -> d
+    183:183:net.minecraft.core.BlockPos south() -> e
+    188:188:net.minecraft.core.BlockPos south(int) -> e
+    193:193:net.minecraft.core.BlockPos west() -> f
+    198:198:net.minecraft.core.BlockPos west(int) -> f
+    203:203:net.minecraft.core.BlockPos east() -> g
+    208:208:net.minecraft.core.BlockPos east(int) -> g
+    213:213:net.minecraft.core.BlockPos relative(net.minecraft.core.Direction) -> a
+    218:221:net.minecraft.core.BlockPos relative(net.minecraft.core.Direction,int) -> a
+    226:232:net.minecraft.core.BlockPos relative(net.minecraft.core.Direction$Axis,int) -> a
+    236:245:net.minecraft.core.BlockPos rotate(net.minecraft.world.level.block.Rotation) -> a
+    251:251:net.minecraft.core.BlockPos cross(net.minecraft.core.Vec3i) -> c
+    255:255:net.minecraft.core.BlockPos immutable() -> h
+    259:259:net.minecraft.core.BlockPos$MutableBlockPos mutable() -> i
+    396:400:java.lang.Iterable randomBetweenClosed(java.util.Random,int,int,int,int,int,int,int) -> a
+    422:427:java.lang.Iterable withinManhattan(net.minecraft.core.BlockPos,int,int,int) -> a
+    478:478:java.util.Optional findClosestMatch(net.minecraft.core.BlockPos,int,int,java.util.function.Predicate) -> a
+    482:482:java.util.stream.Stream withinManhattanStream(net.minecraft.core.BlockPos,int,int,int) -> b
+    486:492:java.lang.Iterable betweenClosed(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    497:497:java.util.stream.Stream betweenClosedStream(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> b
+    501:507:java.util.stream.Stream betweenClosedStream(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    512:512:java.util.stream.Stream betweenClosedStream(net.minecraft.world.phys.AABB) -> a
+    516:516:java.util.stream.Stream betweenClosedStream(int,int,int,int,int,int) -> a
+    521:526:java.lang.Iterable betweenClosed(int,int,int,int,int,int) -> b
+    23:23:net.minecraft.core.Vec3i cross(net.minecraft.core.Vec3i) -> d
+    23:23:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction$Axis,int) -> b
+    23:23:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction,int) -> b
+    23:23:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction) -> b
+    23:23:net.minecraft.core.Vec3i east(int) -> h
+    23:23:net.minecraft.core.Vec3i east() -> j
+    23:23:net.minecraft.core.Vec3i west(int) -> i
+    23:23:net.minecraft.core.Vec3i west() -> k
+    23:23:net.minecraft.core.Vec3i south(int) -> j
+    23:23:net.minecraft.core.Vec3i south() -> l
+    23:23:net.minecraft.core.Vec3i north(int) -> k
+    23:23:net.minecraft.core.Vec3i north() -> m
+    23:23:net.minecraft.core.Vec3i below(int) -> l
+    23:23:net.minecraft.core.Vec3i below() -> n
+    23:23:net.minecraft.core.Vec3i above(int) -> m
+    23:23:net.minecraft.core.Vec3i above() -> o
+    23:23:net.minecraft.core.Vec3i multiply(int) -> n
+    23:23:net.minecraft.core.Vec3i subtract(net.minecraft.core.Vec3i) -> e
+    23:23:net.minecraft.core.Vec3i offset(net.minecraft.core.Vec3i) -> f
+    23:23:net.minecraft.core.Vec3i offset(int,int,int) -> c
+    23:23:net.minecraft.core.Vec3i offset(double,double,double) -> b
+    526:526:java.util.Iterator lambda$betweenClosed$5(int,int,int,int,int,int) -> c
+    427:427:java.util.Iterator lambda$withinManhattan$4(int,int,int,int,int,int,int) -> a
+    400:400:java.util.Iterator lambda$randomBetweenClosed$3(int,int,java.util.Random,int,int,int,int,int) -> a
+    27:27:java.util.stream.IntStream lambda$static$2(net.minecraft.core.BlockPos) -> a
+    26:26:com.mojang.serialization.DataResult lambda$static$1(java.util.stream.IntStream) -> a
+    26:26:net.minecraft.core.BlockPos lambda$null$0(int[]) -> a
+    25:44:void <clinit>() -> <clinit>
+net.minecraft.core.BlockPos$1 -> fu$1:
+    net.minecraft.core.BlockPos$MutableBlockPos nextPos -> a
+    int counter -> b
+    int val$limit -> c
+    int val$minX -> d
+    java.util.Random val$random -> e
+    int val$width -> f
+    int val$minY -> g
+    int val$height -> h
+    int val$minZ -> i
+    int val$depth -> j
+    400:402:void <init>(int,int,java.util.Random,int,int,int,int,int) -> <init>
+    406:416:net.minecraft.core.BlockPos computeNext() -> a
+    400:400:java.lang.Object computeNext() -> computeNext
+net.minecraft.core.BlockPos$2 -> fu$2:
+    net.minecraft.core.BlockPos$MutableBlockPos cursor -> h
+    int currentDepth -> i
+    int maxX -> j
+    int maxY -> k
+    int x -> l
+    int y -> m
+    boolean zMirror -> n
+    int val$originZ -> a
+    int val$maxDepth -> b
+    int val$reachX -> c
+    int val$reachY -> d
+    int val$reachZ -> e
+    int val$originX -> f
+    int val$originY -> g
+    427:428:void <init>(int,int,int,int,int,int,int) -> <init>
+    441:472:net.minecraft.core.BlockPos computeNext() -> a
+    427:427:java.lang.Object computeNext() -> computeNext
+net.minecraft.core.BlockPos$3 -> fu$3:
+    net.minecraft.core.BlockPos$MutableBlockPos cursor -> g
+    int index -> h
+    int val$end -> a
+    int val$width -> b
+    int val$height -> c
+    int val$minX -> d
+    int val$minY -> e
+    int val$minZ -> f
+    526:527:void <init>(int,int,int,int,int,int) -> <init>
+    532:542:net.minecraft.core.BlockPos computeNext() -> a
+    526:526:java.lang.Object computeNext() -> computeNext
+net.minecraft.core.BlockPos$4 -> fu$4:
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
-    254:254:void <clinit>() -> <clinit>
-net.minecraft.core.BlockPos$MutableBlockPos -> fk$a:
-    int x -> b
-    int y -> c
-    int z -> d
-    282:283:void <init>() -> <init>
-    286:287:void <init>(net.minecraft.core.BlockPos) -> <init>
-    290:294:void <init>(int,int,int) -> <init>
-    297:298:void <init>(double,double,double) -> <init>
-    301:302:void <init>(net.minecraft.world.entity.Entity) -> <init>
-    306:306:net.minecraft.core.BlockPos offset(double,double,double) -> a
-    311:311:net.minecraft.core.BlockPos offset(int,int,int) -> b
-    316:316:net.minecraft.core.BlockPos multiply(int) -> a
-    321:321:net.minecraft.core.BlockPos relative(net.minecraft.core.Direction,int) -> a
-    326:326:net.minecraft.core.BlockPos relative(net.minecraft.core.Direction$Axis,int) -> a
-    331:331:net.minecraft.core.BlockPos rotate(net.minecraft.world.level.block.Rotation) -> a
-    336:336:int getX() -> o
-    341:341:int getY() -> p
-    346:346:int getZ() -> q
-    350:353:net.minecraft.core.BlockPos$MutableBlockPos set(int,int,int) -> d
-    357:357:net.minecraft.core.BlockPos$MutableBlockPos set(net.minecraft.world.entity.Entity) -> a
-    361:361:net.minecraft.core.BlockPos$MutableBlockPos set(double,double,double) -> c
-    365:365:net.minecraft.core.BlockPos$MutableBlockPos set(net.minecraft.core.Vec3i) -> g
-    369:369:net.minecraft.core.BlockPos$MutableBlockPos set(long) -> g
-    373:376:net.minecraft.core.BlockPos$MutableBlockPos set(net.minecraft.core.AxisCycle,int,int,int) -> a
-    381:381:net.minecraft.core.BlockPos$MutableBlockPos move(net.minecraft.core.Direction) -> c
-    385:385:net.minecraft.core.BlockPos$MutableBlockPos move(net.minecraft.core.Direction,int) -> c
-    389:389:net.minecraft.core.BlockPos$MutableBlockPos move(int,int,int) -> e
-    393:393:net.minecraft.core.BlockPos$MutableBlockPos move(net.minecraft.core.Vec3i) -> h
-    397:398:void setX(int) -> o
-    401:402:void setY(int) -> p
-    405:406:void setZ(int) -> q
-    410:410:net.minecraft.core.BlockPos immutable() -> h
-    276:276:net.minecraft.core.Vec3i cross(net.minecraft.core.Vec3i) -> d
-    276:276:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction$Axis,int) -> b
-    276:276:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction,int) -> b
-    276:276:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction) -> b
-    276:276:net.minecraft.core.Vec3i east(int) -> h
-    276:276:net.minecraft.core.Vec3i east() -> i
-    276:276:net.minecraft.core.Vec3i west(int) -> i
-    276:276:net.minecraft.core.Vec3i west() -> j
-    276:276:net.minecraft.core.Vec3i south(int) -> j
-    276:276:net.minecraft.core.Vec3i south() -> k
-    276:276:net.minecraft.core.Vec3i north(int) -> k
-    276:276:net.minecraft.core.Vec3i north() -> l
-    276:276:net.minecraft.core.Vec3i below(int) -> l
-    276:276:net.minecraft.core.Vec3i below() -> m
-    276:276:net.minecraft.core.Vec3i above(int) -> m
-    276:276:net.minecraft.core.Vec3i above() -> n
-    276:276:net.minecraft.core.Vec3i multiply(int) -> n
-    276:276:net.minecraft.core.Vec3i subtract(net.minecraft.core.Vec3i) -> e
-    276:276:net.minecraft.core.Vec3i offset(net.minecraft.core.Vec3i) -> f
-    276:276:net.minecraft.core.Vec3i offset(int,int,int) -> c
-    276:276:net.minecraft.core.Vec3i offset(double,double,double) -> b
-net.minecraft.core.BlockPos$PooledMutableBlockPos -> fk$b:
-    boolean free -> f
-    java.util.List POOL -> g
-    483:484:void <init>(int,int,int) -> <init>
-    487:487:net.minecraft.core.BlockPos$PooledMutableBlockPos acquire() -> r
-    491:491:net.minecraft.core.BlockPos$PooledMutableBlockPos acquire(net.minecraft.world.entity.Entity) -> b
-    495:495:net.minecraft.core.BlockPos$PooledMutableBlockPos acquire(double,double,double) -> d
-    499:499:net.minecraft.core.BlockPos$PooledMutableBlockPos acquire(net.minecraft.core.Vec3i) -> i
-    503:513:net.minecraft.core.BlockPos$PooledMutableBlockPos acquire(int,int,int) -> f
-    518:518:net.minecraft.core.BlockPos$PooledMutableBlockPos set(int,int,int) -> g
-    523:523:net.minecraft.core.BlockPos$PooledMutableBlockPos set(net.minecraft.world.entity.Entity) -> c
-    528:528:net.minecraft.core.BlockPos$PooledMutableBlockPos set(double,double,double) -> e
-    533:533:net.minecraft.core.BlockPos$PooledMutableBlockPos set(net.minecraft.core.Vec3i) -> j
-    538:538:net.minecraft.core.BlockPos$PooledMutableBlockPos move(net.minecraft.core.Direction) -> d
-    543:543:net.minecraft.core.BlockPos$PooledMutableBlockPos move(net.minecraft.core.Direction,int) -> d
-    548:548:net.minecraft.core.BlockPos$PooledMutableBlockPos move(int,int,int) -> h
-    553:553:net.minecraft.core.BlockPos$PooledMutableBlockPos move(net.minecraft.core.Vec3i) -> k
-    558:564:void close() -> close
-    476:476:net.minecraft.core.BlockPos$MutableBlockPos move(net.minecraft.core.Vec3i) -> h
-    476:476:net.minecraft.core.BlockPos$MutableBlockPos move(int,int,int) -> e
-    476:476:net.minecraft.core.BlockPos$MutableBlockPos move(net.minecraft.core.Direction,int) -> c
-    476:476:net.minecraft.core.BlockPos$MutableBlockPos move(net.minecraft.core.Direction) -> c
-    476:476:net.minecraft.core.BlockPos$MutableBlockPos set(net.minecraft.core.Vec3i) -> g
-    476:476:net.minecraft.core.BlockPos$MutableBlockPos set(double,double,double) -> c
-    476:476:net.minecraft.core.BlockPos$MutableBlockPos set(net.minecraft.world.entity.Entity) -> a
-    476:476:net.minecraft.core.BlockPos$MutableBlockPos set(int,int,int) -> d
-    480:480:void <clinit>() -> <clinit>
-net.minecraft.core.BlockSource -> fl:
+    int[] $SwitchMap$net$minecraft$core$Direction$Axis -> b
+    236:361:void <clinit>() -> <clinit>
+net.minecraft.core.BlockPos$MutableBlockPos -> fu$a:
+    264:265:void <init>() -> <init>
+    268:269:void <init>(int,int,int) -> <init>
+    272:273:void <init>(double,double,double) -> <init>
+    277:277:net.minecraft.core.BlockPos offset(double,double,double) -> a
+    282:282:net.minecraft.core.BlockPos offset(int,int,int) -> b
+    287:287:net.minecraft.core.BlockPos multiply(int) -> a
+    292:292:net.minecraft.core.BlockPos relative(net.minecraft.core.Direction,int) -> a
+    297:297:net.minecraft.core.BlockPos relative(net.minecraft.core.Direction$Axis,int) -> a
+    302:302:net.minecraft.core.BlockPos rotate(net.minecraft.world.level.block.Rotation) -> a
+    306:309:net.minecraft.core.BlockPos$MutableBlockPos set(int,int,int) -> d
+    313:313:net.minecraft.core.BlockPos$MutableBlockPos set(double,double,double) -> c
+    317:317:net.minecraft.core.BlockPos$MutableBlockPos set(net.minecraft.core.Vec3i) -> g
+    321:321:net.minecraft.core.BlockPos$MutableBlockPos set(long) -> g
+    325:328:net.minecraft.core.BlockPos$MutableBlockPos set(net.minecraft.core.AxisCycle,int,int,int) -> a
+    333:333:net.minecraft.core.BlockPos$MutableBlockPos setWithOffset(net.minecraft.core.Vec3i,net.minecraft.core.Direction) -> a
+    337:337:net.minecraft.core.BlockPos$MutableBlockPos setWithOffset(net.minecraft.core.Vec3i,int,int,int) -> a
+    341:341:net.minecraft.core.BlockPos$MutableBlockPos setWithOffset(net.minecraft.core.Vec3i,net.minecraft.core.Vec3i) -> a
+    345:345:net.minecraft.core.BlockPos$MutableBlockPos move(net.minecraft.core.Direction) -> c
+    349:349:net.minecraft.core.BlockPos$MutableBlockPos move(net.minecraft.core.Direction,int) -> c
+    353:353:net.minecraft.core.BlockPos$MutableBlockPos move(int,int,int) -> e
+    357:357:net.minecraft.core.BlockPos$MutableBlockPos move(net.minecraft.core.Vec3i) -> h
+    361:369:net.minecraft.core.BlockPos$MutableBlockPos clamp(net.minecraft.core.Direction$Axis,int,int) -> a
+    375:376:void setX(int) -> o
+    380:381:void setY(int) -> p
+    385:386:void setZ(int) -> q
+    390:390:net.minecraft.core.BlockPos immutable() -> h
+    262:262:net.minecraft.core.Vec3i cross(net.minecraft.core.Vec3i) -> d
+    262:262:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction$Axis,int) -> b
+    262:262:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction,int) -> b
+    262:262:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction) -> b
+    262:262:net.minecraft.core.Vec3i east(int) -> h
+    262:262:net.minecraft.core.Vec3i east() -> j
+    262:262:net.minecraft.core.Vec3i west(int) -> i
+    262:262:net.minecraft.core.Vec3i west() -> k
+    262:262:net.minecraft.core.Vec3i south(int) -> j
+    262:262:net.minecraft.core.Vec3i south() -> l
+    262:262:net.minecraft.core.Vec3i north(int) -> k
+    262:262:net.minecraft.core.Vec3i north() -> m
+    262:262:net.minecraft.core.Vec3i below(int) -> l
+    262:262:net.minecraft.core.Vec3i below() -> n
+    262:262:net.minecraft.core.Vec3i above(int) -> m
+    262:262:net.minecraft.core.Vec3i above() -> o
+    262:262:net.minecraft.core.Vec3i multiply(int) -> n
+    262:262:net.minecraft.core.Vec3i subtract(net.minecraft.core.Vec3i) -> e
+    262:262:net.minecraft.core.Vec3i offset(net.minecraft.core.Vec3i) -> f
+    262:262:net.minecraft.core.Vec3i offset(int,int,int) -> c
+    262:262:net.minecraft.core.Vec3i offset(double,double,double) -> b
+net.minecraft.core.BlockSource -> fv:
     double x() -> a
     double y() -> b
     double z() -> c
@@ -20691,7 +21937,7 @@ net.minecraft.core.BlockSource -> fl:
     net.minecraft.world.level.block.state.BlockState getBlockState() -> e
     net.minecraft.world.level.material.Material getMaterial() -> f
     net.minecraft.world.level.block.entity.BlockEntity getEntity() -> g
-net.minecraft.core.BlockSourceImpl -> fm:
+net.minecraft.core.BlockSourceImpl -> fw:
     net.minecraft.world.level.Level level -> a
     net.minecraft.core.BlockPos pos -> b
     13:16:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> <init>
@@ -20703,35 +21949,36 @@ net.minecraft.core.BlockSourceImpl -> fm:
     45:45:net.minecraft.world.level.block.state.BlockState getBlockState() -> e
     50:50:net.minecraft.world.level.material.Material getMaterial() -> f
     57:57:net.minecraft.world.level.block.entity.BlockEntity getEntity() -> g
-net.minecraft.core.Cursor3D -> fn:
-    int minX -> a
-    int minY -> b
-    int minZ -> c
-    int maxX -> d
-    int maxY -> e
-    int maxZ -> f
-    int x -> g
-    int y -> h
-    int z -> i
-    boolean started -> j
-    20:27:void <init>(int,int,int,int,int,int) -> <init>
-    30:53:boolean advance() -> a
-    59:59:int nextX() -> b
-    63:63:int nextY() -> c
-    67:67:int nextZ() -> d
-    71:82:int getNextType() -> e
-net.minecraft.core.DefaultedRegistry -> fo:
-    net.minecraft.resources.ResourceLocation defaultKey -> V
-    java.lang.Object defaultValue -> W
-    14:16:void <init>(java.lang.String) -> <init>
-    20:24:java.lang.Object registerMapping(int,net.minecraft.resources.ResourceLocation,java.lang.Object) -> a
-    29:30:int getId(java.lang.Object) -> a
-    36:37:net.minecraft.resources.ResourceLocation getKey(java.lang.Object) -> b
-    43:44:java.lang.Object get(net.minecraft.resources.ResourceLocation) -> a
-    50:51:java.lang.Object byId(int) -> a
-    57:58:java.lang.Object getRandom(java.util.Random) -> a
-    62:62:net.minecraft.resources.ResourceLocation getDefaultKey() -> a
-net.minecraft.core.Direction -> fp:
+net.minecraft.core.Cursor3D -> fx:
+    int originX -> a
+    int originY -> b
+    int originZ -> c
+    int width -> d
+    int height -> e
+    int depth -> f
+    int end -> g
+    int index -> h
+    int x -> i
+    int y -> j
+    int z -> k
+    22:31:void <init>(int,int,int,int,int,int) -> <init>
+    34:44:boolean advance() -> a
+    48:48:int nextX() -> b
+    52:52:int nextY() -> c
+    56:56:int nextZ() -> d
+    60:70:int getNextType() -> e
+net.minecraft.core.DefaultedRegistry -> fy:
+    net.minecraft.resources.ResourceLocation defaultKey -> bb
+    java.lang.Object defaultValue -> bc
+    17:19:void <init>(java.lang.String,net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle) -> <init>
+    23:27:java.lang.Object registerMapping(int,net.minecraft.resources.ResourceKey,java.lang.Object) -> a
+    32:33:int getId(java.lang.Object) -> a
+    39:40:net.minecraft.resources.ResourceLocation getKey(java.lang.Object) -> b
+    46:47:java.lang.Object get(net.minecraft.resources.ResourceLocation) -> a
+    53:54:java.lang.Object byId(int) -> a
+    60:61:java.lang.Object getRandom(java.util.Random) -> a
+    65:65:net.minecraft.resources.ResourceLocation getDefaultKey() -> a
+net.minecraft.core.Direction -> fz:
     net.minecraft.core.Direction DOWN -> a
     net.minecraft.core.Direction UP -> b
     net.minecraft.core.Direction NORTH -> c
@@ -20751,129 +21998,133 @@ net.minecraft.core.Direction -> fp:
     net.minecraft.core.Direction[] BY_2D_DATA -> q
     it.unimi.dsi.fastutil.longs.Long2ObjectMap BY_NORMAL -> r
     net.minecraft.core.Direction[] $VALUES -> s
-    24:24:net.minecraft.core.Direction[] values() -> values
-    24:24:net.minecraft.core.Direction valueOf(java.lang.String) -> valueOf
-    48:56:void <init>(java.lang.String,int,int,int,int,java.lang.String,net.minecraft.core.Direction$AxisDirection,net.minecraft.core.Direction$Axis,net.minecraft.core.Vec3i) -> <init>
-    59:96:net.minecraft.core.Direction[] orderedByNearest(net.minecraft.world.entity.Entity) -> a
-    102:102:net.minecraft.core.Direction[] makeDirectionArray(net.minecraft.core.Direction,net.minecraft.core.Direction,net.minecraft.core.Direction) -> a
-    106:109:net.minecraft.core.Direction rotate(com.mojang.math.Matrix4f,net.minecraft.core.Direction) -> a
-    113:131:com.mojang.math.Quaternion getRotation() -> a
-    136:136:int get3DDataValue() -> b
-    140:140:int get2DDataValue() -> c
-    144:144:net.minecraft.core.Direction$AxisDirection getAxisDirection() -> d
-    148:148:net.minecraft.core.Direction getOpposite() -> e
-    152:172:net.minecraft.core.Direction getClockWise(net.minecraft.core.Direction$Axis) -> a
-    177:197:net.minecraft.core.Direction getCounterClockWise(net.minecraft.core.Direction$Axis) -> b
-    202:212:net.minecraft.core.Direction getClockWise() -> f
-    217:227:net.minecraft.core.Direction getClockWiseX() -> q
-    232:242:net.minecraft.core.Direction getCounterClockWiseX() -> r
-    247:257:net.minecraft.core.Direction getClockWiseZ() -> s
-    262:272:net.minecraft.core.Direction getCounterClockWiseZ() -> t
-    277:287:net.minecraft.core.Direction getCounterClockWise() -> g
-    292:292:int getStepX() -> h
-    296:296:int getStepY() -> i
-    300:300:int getStepZ() -> j
-    304:304:com.mojang.math.Vector3f step() -> k
-    308:308:java.lang.String getName() -> l
-    312:312:net.minecraft.core.Direction$Axis getAxis() -> m
-    317:320:net.minecraft.core.Direction byName(java.lang.String) -> a
-    324:324:net.minecraft.core.Direction from3DDataValue(int) -> a
-    328:328:net.minecraft.core.Direction from2DDataValue(int) -> b
-    333:333:net.minecraft.core.Direction fromNormal(net.minecraft.core.BlockPos) -> a
-    338:338:net.minecraft.core.Direction fromNormal(int,int,int) -> a
-    342:342:net.minecraft.core.Direction fromYRot(double) -> a
-    346:353:net.minecraft.core.Direction fromAxisAndDirection(net.minecraft.core.Direction$Axis,net.minecraft.core.Direction$AxisDirection) -> a
-    358:358:float toYRot() -> n
-    362:362:net.minecraft.core.Direction getRandomFace(java.util.Random) -> a
-    366:366:net.minecraft.core.Direction getNearest(double,double,double) -> a
-    370:380:net.minecraft.core.Direction getNearest(float,float,float) -> a
-    385:385:java.lang.String toString() -> toString
-    390:390:java.lang.String getSerializedName() -> o
-    394:399:net.minecraft.core.Direction get(net.minecraft.core.Direction$AxisDirection,net.minecraft.core.Direction$Axis) -> a
-    526:526:net.minecraft.core.Vec3i getNormal() -> p
-    46:46:net.minecraft.core.Direction lambda$static$8(net.minecraft.core.Direction,net.minecraft.core.Direction) -> a
-    46:46:net.minecraft.core.Direction lambda$static$7(net.minecraft.core.Direction) -> a
-    46:46:java.lang.Long lambda$static$6(net.minecraft.core.Direction) -> b
-    45:45:net.minecraft.core.Direction[] lambda$static$5(int) -> c
-    45:45:int lambda$static$4(net.minecraft.core.Direction) -> c
-    45:45:boolean lambda$static$3(net.minecraft.core.Direction) -> d
-    44:44:net.minecraft.core.Direction[] lambda$static$2(int) -> d
-    44:44:int lambda$static$1(net.minecraft.core.Direction) -> e
-    43:43:net.minecraft.core.Direction lambda$static$0(net.minecraft.core.Direction) -> f
-    24:46:void <clinit>() -> <clinit>
-net.minecraft.core.Direction$1 -> fp$1:
+    27:27:net.minecraft.core.Direction[] values() -> values
+    27:27:net.minecraft.core.Direction valueOf(java.lang.String) -> valueOf
+    51:59:void <init>(java.lang.String,int,int,int,int,java.lang.String,net.minecraft.core.Direction$AxisDirection,net.minecraft.core.Direction$Axis,net.minecraft.core.Vec3i) -> <init>
+    62:99:net.minecraft.core.Direction[] orderedByNearest(net.minecraft.world.entity.Entity) -> a
+    105:105:net.minecraft.core.Direction[] makeDirectionArray(net.minecraft.core.Direction,net.minecraft.core.Direction,net.minecraft.core.Direction) -> a
+    109:112:net.minecraft.core.Direction rotate(com.mojang.math.Matrix4f,net.minecraft.core.Direction) -> a
+    116:134:com.mojang.math.Quaternion getRotation() -> b
+    139:139:int get3DDataValue() -> c
+    143:143:int get2DDataValue() -> d
+    147:147:net.minecraft.core.Direction$AxisDirection getAxisDirection() -> e
+    151:151:net.minecraft.core.Direction getOpposite() -> f
+    155:175:net.minecraft.core.Direction getClockWise(net.minecraft.core.Direction$Axis) -> a
+    180:200:net.minecraft.core.Direction getCounterClockWise(net.minecraft.core.Direction$Axis) -> b
+    205:215:net.minecraft.core.Direction getClockWise() -> g
+    220:230:net.minecraft.core.Direction getClockWiseX() -> q
+    235:245:net.minecraft.core.Direction getCounterClockWiseX() -> r
+    250:260:net.minecraft.core.Direction getClockWiseZ() -> s
+    265:275:net.minecraft.core.Direction getCounterClockWiseZ() -> t
+    280:290:net.minecraft.core.Direction getCounterClockWise() -> h
+    295:295:int getStepX() -> i
+    299:299:int getStepY() -> j
+    303:303:int getStepZ() -> k
+    307:307:com.mojang.math.Vector3f step() -> l
+    311:311:java.lang.String getName() -> m
+    315:315:net.minecraft.core.Direction$Axis getAxis() -> n
+    320:323:net.minecraft.core.Direction byName(java.lang.String) -> a
+    327:327:net.minecraft.core.Direction from3DDataValue(int) -> a
+    331:331:net.minecraft.core.Direction from2DDataValue(int) -> b
+    336:336:net.minecraft.core.Direction fromNormal(net.minecraft.core.BlockPos) -> a
+    341:341:net.minecraft.core.Direction fromNormal(int,int,int) -> a
+    345:345:net.minecraft.core.Direction fromYRot(double) -> a
+    349:356:net.minecraft.core.Direction fromAxisAndDirection(net.minecraft.core.Direction$Axis,net.minecraft.core.Direction$AxisDirection) -> a
+    361:361:float toYRot() -> o
+    365:365:net.minecraft.core.Direction getRandom(java.util.Random) -> a
+    369:369:net.minecraft.core.Direction getNearest(double,double,double) -> a
+    373:383:net.minecraft.core.Direction getNearest(float,float,float) -> a
+    388:388:java.lang.String toString() -> toString
+    393:393:java.lang.String getSerializedName() -> a
+    397:402:net.minecraft.core.Direction get(net.minecraft.core.Direction$AxisDirection,net.minecraft.core.Direction$Axis) -> a
+    537:537:net.minecraft.core.Vec3i getNormal() -> p
+    49:49:net.minecraft.core.Direction lambda$static$8(net.minecraft.core.Direction,net.minecraft.core.Direction) -> a
+    49:49:net.minecraft.core.Direction lambda$static$7(net.minecraft.core.Direction) -> a
+    49:49:java.lang.Long lambda$static$6(net.minecraft.core.Direction) -> b
+    48:48:net.minecraft.core.Direction[] lambda$static$5(int) -> c
+    48:48:int lambda$static$4(net.minecraft.core.Direction) -> c
+    48:48:boolean lambda$static$3(net.minecraft.core.Direction) -> d
+    47:47:net.minecraft.core.Direction[] lambda$static$2(int) -> d
+    47:47:int lambda$static$1(net.minecraft.core.Direction) -> e
+    46:46:net.minecraft.core.Direction lambda$static$0(net.minecraft.core.Direction) -> f
+    27:49:void <clinit>() -> <clinit>
+net.minecraft.core.Direction$1 -> fz$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     int[] $SwitchMap$net$minecraft$core$Direction$Axis -> b
-    115:152:void <clinit>() -> <clinit>
-net.minecraft.core.Direction$Axis -> fp$a:
+    118:155:void <clinit>() -> <clinit>
+net.minecraft.core.Direction$Axis -> fz$a:
     net.minecraft.core.Direction$Axis X -> a
     net.minecraft.core.Direction$Axis Y -> b
     net.minecraft.core.Direction$Axis Z -> c
-    java.util.Map BY_NAME -> d
-    java.lang.String name -> e
-    net.minecraft.core.Direction$Axis[] $VALUES -> f
-    402:402:net.minecraft.core.Direction$Axis[] values() -> values
-    402:402:net.minecraft.core.Direction$Axis valueOf(java.lang.String) -> valueOf
-    442:444:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    448:448:net.minecraft.core.Direction$Axis byName(java.lang.String) -> a
-    452:452:java.lang.String getName() -> a
-    456:456:boolean isVertical() -> b
-    460:460:boolean isHorizontal() -> c
-    465:465:java.lang.String toString() -> toString
-    469:469:net.minecraft.core.Direction$Axis getRandomAxis(java.util.Random) -> a
-    474:474:boolean test(net.minecraft.core.Direction) -> a
-    478:485:net.minecraft.core.Direction$Plane getPlane() -> d
-    490:490:java.lang.String getSerializedName() -> o
+    net.minecraft.core.Direction$Axis[] VALUES -> e
+    com.mojang.serialization.Codec CODEC -> d
+    java.util.Map BY_NAME -> f
+    java.lang.String name -> g
+    net.minecraft.core.Direction$Axis[] $VALUES -> h
+    405:405:net.minecraft.core.Direction$Axis[] values() -> values
+    405:405:net.minecraft.core.Direction$Axis valueOf(java.lang.String) -> valueOf
+    449:451:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    455:455:net.minecraft.core.Direction$Axis byName(java.lang.String) -> a
+    459:459:java.lang.String getName() -> b
+    463:463:boolean isVertical() -> c
+    467:467:boolean isHorizontal() -> d
+    472:472:java.lang.String toString() -> toString
+    476:476:net.minecraft.core.Direction$Axis getRandom(java.util.Random) -> a
+    481:481:boolean test(net.minecraft.core.Direction) -> a
+    485:492:net.minecraft.core.Direction$Plane getPlane() -> e
+    497:497:java.lang.String getSerializedName() -> a
     int choose(int,int,int) -> a
     double choose(double,double,double) -> a
-    402:402:boolean test(java.lang.Object) -> test
-    438:438:net.minecraft.core.Direction$Axis lambda$static$0(net.minecraft.core.Direction$Axis) -> a
-    402:402:void <init>(java.lang.String,int,java.lang.String,net.minecraft.core.Direction$1) -> <init>
-    402:438:void <clinit>() -> <clinit>
-net.minecraft.core.Direction$Axis$1 -> fp$a$1:
-    403:403:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    406:406:int choose(int,int,int) -> a
-    411:411:double choose(double,double,double) -> a
-    403:403:boolean test(java.lang.Object) -> test
-net.minecraft.core.Direction$Axis$2 -> fp$a$2:
-    414:414:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    417:417:int choose(int,int,int) -> a
-    422:422:double choose(double,double,double) -> a
-    414:414:boolean test(java.lang.Object) -> test
-net.minecraft.core.Direction$Axis$3 -> fp$a$3:
-    425:425:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    428:428:int choose(int,int,int) -> a
-    433:433:double choose(double,double,double) -> a
-    425:425:boolean test(java.lang.Object) -> test
-net.minecraft.core.Direction$AxisDirection -> fp$b:
+    405:405:boolean test(java.lang.Object) -> test
+    445:445:net.minecraft.core.Direction$Axis lambda$static$0(net.minecraft.core.Direction$Axis) -> a
+    405:405:void <init>(java.lang.String,int,java.lang.String,net.minecraft.core.Direction$1) -> <init>
+    405:445:void <clinit>() -> <clinit>
+net.minecraft.core.Direction$Axis$1 -> fz$a$1:
+    406:406:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    409:409:int choose(int,int,int) -> a
+    414:414:double choose(double,double,double) -> a
+    406:406:boolean test(java.lang.Object) -> test
+net.minecraft.core.Direction$Axis$2 -> fz$a$2:
+    417:417:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    420:420:int choose(int,int,int) -> a
+    425:425:double choose(double,double,double) -> a
+    417:417:boolean test(java.lang.Object) -> test
+net.minecraft.core.Direction$Axis$3 -> fz$a$3:
+    428:428:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    431:431:int choose(int,int,int) -> a
+    436:436:double choose(double,double,double) -> a
+    428:428:boolean test(java.lang.Object) -> test
+net.minecraft.core.Direction$AxisDirection -> fz$b:
     net.minecraft.core.Direction$AxisDirection POSITIVE -> a
     net.minecraft.core.Direction$AxisDirection NEGATIVE -> b
     int step -> c
     java.lang.String name -> d
     net.minecraft.core.Direction$AxisDirection[] $VALUES -> e
-    498:498:net.minecraft.core.Direction$AxisDirection[] values() -> values
-    498:498:net.minecraft.core.Direction$AxisDirection valueOf(java.lang.String) -> valueOf
-    506:509:void <init>(java.lang.String,int,int,java.lang.String) -> <init>
-    512:512:int getStep() -> a
-    516:516:java.lang.String getName() -> b
-    521:521:java.lang.String toString() -> toString
-    498:500:void <clinit>() -> <clinit>
-net.minecraft.core.Direction$Plane -> fp$c:
+    505:505:net.minecraft.core.Direction$AxisDirection[] values() -> values
+    505:505:net.minecraft.core.Direction$AxisDirection valueOf(java.lang.String) -> valueOf
+    513:516:void <init>(java.lang.String,int,int,java.lang.String) -> <init>
+    519:519:int getStep() -> a
+    523:523:java.lang.String getName() -> b
+    528:528:java.lang.String toString() -> toString
+    532:532:net.minecraft.core.Direction$AxisDirection opposite() -> c
+    505:507:void <clinit>() -> <clinit>
+net.minecraft.core.Direction$Plane -> fz$c:
     net.minecraft.core.Direction$Plane HORIZONTAL -> a
     net.minecraft.core.Direction$Plane VERTICAL -> b
     net.minecraft.core.Direction[] faces -> c
     net.minecraft.core.Direction$Axis[] axis -> d
     net.minecraft.core.Direction$Plane[] $VALUES -> e
-    529:529:net.minecraft.core.Direction$Plane[] values() -> values
-    529:529:net.minecraft.core.Direction$Plane valueOf(java.lang.String) -> valueOf
-    537:540:void <init>(java.lang.String,int,net.minecraft.core.Direction[],net.minecraft.core.Direction$Axis[]) -> <init>
-    543:543:net.minecraft.core.Direction getRandomDirection(java.util.Random) -> a
-    547:547:net.minecraft.core.Direction$Axis getRandomAxis(java.util.Random) -> b
-    552:552:boolean test(net.minecraft.core.Direction) -> a
-    557:557:java.util.Iterator iterator() -> iterator
-    529:529:boolean test(java.lang.Object) -> test
-    529:531:void <clinit>() -> <clinit>
-net.minecraft.core.Direction8 -> fq:
+    540:540:net.minecraft.core.Direction$Plane[] values() -> values
+    540:540:net.minecraft.core.Direction$Plane valueOf(java.lang.String) -> valueOf
+    548:551:void <init>(java.lang.String,int,net.minecraft.core.Direction[],net.minecraft.core.Direction$Axis[]) -> <init>
+    554:554:net.minecraft.core.Direction getRandomDirection(java.util.Random) -> a
+    558:558:net.minecraft.core.Direction$Axis getRandomAxis(java.util.Random) -> b
+    563:563:boolean test(net.minecraft.core.Direction) -> a
+    568:568:java.util.Iterator iterator() -> iterator
+    572:572:java.util.stream.Stream stream() -> a
+    540:540:boolean test(java.lang.Object) -> test
+    540:542:void <clinit>() -> <clinit>
+net.minecraft.core.Direction8 -> ga:
     net.minecraft.core.Direction8 NORTH -> a
     net.minecraft.core.Direction8 NORTH_EAST -> b
     net.minecraft.core.Direction8 EAST -> c
@@ -20898,25 +22149,50 @@ net.minecraft.core.Direction8 -> fq:
     34:56:int getSideMask(boolean,boolean,boolean,boolean) -> a
     60:60:java.util.Set getDirections() -> a
     8:25:void <clinit>() -> <clinit>
-net.minecraft.core.GlobalPos -> fr:
-    net.minecraft.world.level.dimension.DimensionType dimension -> a
-    net.minecraft.core.BlockPos pos -> b
-    15:18:void <init>(net.minecraft.world.level.dimension.DimensionType,net.minecraft.core.BlockPos) -> <init>
-    21:21:net.minecraft.core.GlobalPos of(net.minecraft.world.level.dimension.DimensionType,net.minecraft.core.BlockPos) -> a
-    25:31:net.minecraft.core.GlobalPos of(com.mojang.datafixers.Dynamic) -> a
-    35:35:net.minecraft.world.level.dimension.DimensionType dimension() -> a
-    39:39:net.minecraft.core.BlockPos pos() -> b
-    44:51:boolean equals(java.lang.Object) -> equals
-    56:56:int hashCode() -> hashCode
-    61:63:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    69:69:java.lang.String toString() -> toString
-    31:31:java.lang.IllegalArgumentException lambda$of$2() -> c
-    27:29:java.util.Optional lambda$of$1(com.mojang.datafixers.Dynamic,net.minecraft.world.level.dimension.DimensionType) -> a
-    29:29:net.minecraft.core.GlobalPos lambda$null$0(net.minecraft.world.level.dimension.DimensionType,net.minecraft.core.BlockPos) -> b
-net.minecraft.core.IdMap -> fs:
+net.minecraft.core.FrontAndTop -> gb:
+    net.minecraft.core.FrontAndTop DOWN_EAST -> a
+    net.minecraft.core.FrontAndTop DOWN_NORTH -> b
+    net.minecraft.core.FrontAndTop DOWN_SOUTH -> c
+    net.minecraft.core.FrontAndTop DOWN_WEST -> d
+    net.minecraft.core.FrontAndTop UP_EAST -> e
+    net.minecraft.core.FrontAndTop UP_NORTH -> f
+    net.minecraft.core.FrontAndTop UP_SOUTH -> g
+    net.minecraft.core.FrontAndTop UP_WEST -> h
+    net.minecraft.core.FrontAndTop WEST_UP -> i
+    net.minecraft.core.FrontAndTop EAST_UP -> j
+    net.minecraft.core.FrontAndTop NORTH_UP -> k
+    net.minecraft.core.FrontAndTop SOUTH_UP -> l
+    it.unimi.dsi.fastutil.ints.Int2ObjectMap LOOKUP_TOP_FRONT -> m
+    java.lang.String name -> n
+    net.minecraft.core.Direction top -> o
+    net.minecraft.core.Direction front -> p
+    net.minecraft.core.FrontAndTop[] $VALUES -> q
+    7:7:net.minecraft.core.FrontAndTop[] values() -> values
+    7:7:net.minecraft.core.FrontAndTop valueOf(java.lang.String) -> valueOf
+    37:37:int lookupKey(net.minecraft.core.Direction,net.minecraft.core.Direction) -> b
+    40:44:void <init>(java.lang.String,int,java.lang.String,net.minecraft.core.Direction,net.minecraft.core.Direction) -> <init>
+    48:48:java.lang.String getSerializedName() -> a
+    52:53:net.minecraft.core.FrontAndTop fromFrontAndTop(net.minecraft.core.Direction,net.minecraft.core.Direction) -> a
+    57:57:net.minecraft.core.Direction front() -> b
+    61:61:net.minecraft.core.Direction top() -> c
+    7:30:void <clinit>() -> <clinit>
+net.minecraft.core.GlobalPos -> gc:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.resources.ResourceKey dimension -> b
+    net.minecraft.core.BlockPos pos -> c
+    19:22:void <init>(net.minecraft.resources.ResourceKey,net.minecraft.core.BlockPos) -> <init>
+    25:25:net.minecraft.core.GlobalPos of(net.minecraft.resources.ResourceKey,net.minecraft.core.BlockPos) -> a
+    29:29:net.minecraft.resources.ResourceKey dimension() -> a
+    33:33:net.minecraft.core.BlockPos pos() -> b
+    38:45:boolean equals(java.lang.Object) -> equals
+    50:50:int hashCode() -> hashCode
+    55:55:java.lang.String toString() -> toString
+    11:14:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.core.IdMap -> gd:
     int getId(java.lang.Object) -> a
     java.lang.Object byId(int) -> a
-net.minecraft.core.IdMapper -> ft:
+net.minecraft.core.IdMapper -> ge:
     int nextId -> a
     java.util.IdentityHashMap tToId -> b
     java.util.List idToT -> c
@@ -20929,36 +22205,48 @@ net.minecraft.core.IdMapper -> ft:
     65:65:java.util.Iterator iterator() -> iterator
     69:69:boolean contains(int) -> b
     73:73:int size() -> a
-net.minecraft.core.LocatableSource -> fu:
-net.minecraft.core.Location -> fv:
+net.minecraft.core.LocatableSource -> gf:
+net.minecraft.core.Location -> gg:
     net.minecraft.world.level.Level getLevel() -> h
-net.minecraft.core.MapFiller -> fw:
-    9:9:void <init>() -> <init>
-    11:11:java.util.Map hashMapFrom(java.lang.Iterable,java.lang.Iterable) -> a
-    15:15:java.util.Map linkedHashMapFrom(java.lang.Iterable,java.lang.Iterable) -> b
-    19:28:java.util.Map from(java.lang.Iterable,java.lang.Iterable,java.util.Map) -> a
-net.minecraft.core.MappedRegistry -> fx:
+net.minecraft.core.MappedRegistry -> gh:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap map -> b
     com.google.common.collect.BiMap storage -> c
+    com.google.common.collect.BiMap keyStorage -> bb
+    java.util.Set persistent -> bc
     java.lang.Object[] randomCache -> d
-    int nextId -> V
-    19:23:void <init>() -> <init>
-    31:45:java.lang.Object registerMapping(int,net.minecraft.resources.ResourceLocation,java.lang.Object) -> a
-    50:50:java.lang.Object register(net.minecraft.resources.ResourceLocation,java.lang.Object) -> a
-    56:56:net.minecraft.resources.ResourceLocation getKey(java.lang.Object) -> b
-    61:61:int getId(java.lang.Object) -> a
-    67:67:java.lang.Object byId(int) -> a
-    72:72:java.util.Iterator iterator() -> iterator
-    78:78:java.lang.Object get(net.minecraft.resources.ResourceLocation) -> a
-    83:83:java.util.Optional getOptional(net.minecraft.resources.ResourceLocation) -> b
-    88:88:java.util.Set keySet() -> b
-    93:93:boolean isEmpty() -> c
-    100:107:java.lang.Object getRandom(java.util.Random) -> a
-    112:112:boolean containsKey(net.minecraft.resources.ResourceLocation) -> c
-    117:117:boolean containsId(int) -> b
-    20:20:void <clinit>() -> <clinit>
-net.minecraft.core.NonNullList -> fy:
+    int nextId -> bd
+    34:45:void <init>(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle) -> <init>
+    49:64:java.lang.Object registerMapping(int,net.minecraft.resources.ResourceKey,java.lang.Object) -> a
+    69:69:java.lang.Object register(net.minecraft.resources.ResourceKey,java.lang.Object) -> a
+    75:75:net.minecraft.resources.ResourceLocation getKey(java.lang.Object) -> b
+    80:80:java.util.Optional getResourceKey(java.lang.Object) -> c
+    85:85:int getId(java.lang.Object) -> a
+    91:91:java.lang.Object get(net.minecraft.resources.ResourceKey) -> a
+    97:97:java.lang.Object byId(int) -> a
+    102:102:java.util.Iterator iterator() -> iterator
+    108:108:java.lang.Object get(net.minecraft.resources.ResourceLocation) -> a
+    113:113:java.util.Optional getOptional(net.minecraft.resources.ResourceLocation) -> b
+    118:118:java.util.Set keySet() -> b
+    123:123:java.util.Set entrySet() -> c
+    128:128:boolean isEmpty() -> d
+    135:142:java.lang.Object getRandom(java.util.Random) -> a
+    147:147:boolean containsKey(net.minecraft.resources.ResourceLocation) -> c
+    152:152:boolean containsKey(net.minecraft.resources.ResourceKey) -> b
+    157:157:boolean containsId(int) -> b
+    162:162:boolean persistent(net.minecraft.resources.ResourceKey) -> c
+    167:168:void setPersistent(net.minecraft.resources.ResourceKey) -> d
+    171:171:com.mojang.serialization.Codec networkCodec(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle,com.mojang.serialization.MapCodec) -> a
+    187:187:com.mojang.serialization.Codec dataPackCodec(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle,com.mojang.serialization.MapCodec) -> b
+    191:194:com.mojang.serialization.Codec directCodec(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle,com.mojang.serialization.MapCodec) -> c
+    202:204:java.util.Map lambda$directCodec$5(net.minecraft.core.MappedRegistry) -> a
+    203:203:boolean lambda$null$4(net.minecraft.core.MappedRegistry,java.util.Map$Entry) -> a
+    195:200:net.minecraft.core.MappedRegistry lambda$directCodec$3(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle,java.util.Map) -> a
+    197:199:void lambda$null$2(net.minecraft.core.MappedRegistry,net.minecraft.resources.ResourceKey,java.lang.Object) -> a
+    178:182:java.util.List lambda$networkCodec$1(net.minecraft.core.MappedRegistry) -> b
+    172:176:net.minecraft.core.MappedRegistry lambda$networkCodec$0(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle,java.util.List) -> a
+    32:32:void <clinit>() -> <clinit>
+net.minecraft.core.NonNullList -> gi:
     java.util.List list -> a
     java.lang.Object defaultValue -> b
     14:14:net.minecraft.core.NonNullList create() -> a
@@ -20972,11 +22260,11 @@ net.minecraft.core.NonNullList -> fy:
     65:65:java.lang.Object remove(int) -> remove
     70:70:int size() -> size
     75:82:void clear() -> clear
-net.minecraft.core.Position -> fz:
+net.minecraft.core.Position -> gj:
     double x() -> a
     double y() -> b
     double z() -> c
-net.minecraft.core.PositionImpl -> ga:
+net.minecraft.core.PositionImpl -> gk:
     double x -> a
     double y -> b
     double z -> c
@@ -20984,112 +22272,209 @@ net.minecraft.core.PositionImpl -> ga:
     16:16:double x() -> a
     21:21:double y() -> b
     26:26:double z() -> c
-net.minecraft.core.Registry -> gb:
+net.minecraft.core.Registry -> gl:
     org.apache.logging.log4j.Logger LOGGER -> e
     java.util.Map LOADERS -> a
-    net.minecraft.core.WritableRegistry REGISTRY -> f
-    net.minecraft.core.Registry SOUND_EVENT -> g
-    net.minecraft.core.DefaultedRegistry FLUID -> h
-    net.minecraft.core.Registry MOB_EFFECT -> i
-    net.minecraft.core.DefaultedRegistry BLOCK -> j
-    net.minecraft.core.Registry ENCHANTMENT -> k
-    net.minecraft.core.DefaultedRegistry ENTITY_TYPE -> l
-    net.minecraft.core.DefaultedRegistry ITEM -> m
-    net.minecraft.core.DefaultedRegistry POTION -> n
-    net.minecraft.core.Registry CARVER -> o
-    net.minecraft.core.Registry SURFACE_BUILDER -> p
-    net.minecraft.core.Registry FEATURE -> q
-    net.minecraft.core.Registry DECORATOR -> r
-    net.minecraft.core.Registry BIOME -> s
-    net.minecraft.core.Registry BLOCKSTATE_PROVIDER_TYPES -> t
-    net.minecraft.core.Registry BLOCK_PLACER_TYPES -> u
-    net.minecraft.core.Registry FOLIAGE_PLACER_TYPES -> v
-    net.minecraft.core.Registry TREE_DECORATOR_TYPES -> w
-    net.minecraft.core.Registry PARTICLE_TYPE -> x
-    net.minecraft.core.Registry BIOME_SOURCE_TYPE -> y
-    net.minecraft.core.Registry BLOCK_ENTITY_TYPE -> z
-    net.minecraft.core.Registry CHUNK_GENERATOR_TYPE -> A
-    net.minecraft.core.Registry DIMENSION_TYPE -> B
-    net.minecraft.core.DefaultedRegistry MOTIVE -> C
-    net.minecraft.core.Registry CUSTOM_STAT -> D
-    net.minecraft.core.DefaultedRegistry CHUNK_STATUS -> E
-    net.minecraft.core.Registry STRUCTURE_FEATURE -> F
-    net.minecraft.core.Registry STRUCTURE_PIECE -> G
-    net.minecraft.core.Registry RULE_TEST -> H
-    net.minecraft.core.Registry STRUCTURE_PROCESSOR -> I
-    net.minecraft.core.Registry STRUCTURE_POOL_ELEMENT -> J
-    net.minecraft.core.Registry MENU -> K
-    net.minecraft.core.Registry RECIPE_TYPE -> L
-    net.minecraft.core.Registry RECIPE_SERIALIZER -> M
-    net.minecraft.core.Registry STAT_TYPE -> N
-    net.minecraft.core.DefaultedRegistry VILLAGER_TYPE -> O
-    net.minecraft.core.DefaultedRegistry VILLAGER_PROFESSION -> P
-    net.minecraft.core.DefaultedRegistry POINT_OF_INTEREST_TYPE -> Q
-    net.minecraft.core.DefaultedRegistry MEMORY_MODULE_TYPE -> R
-    net.minecraft.core.DefaultedRegistry SENSOR_TYPE -> S
-    net.minecraft.core.Registry SCHEDULE -> T
-    net.minecraft.core.Registry ACTIVITY -> U
-    71:71:void <init>() -> <init>
-    146:146:net.minecraft.core.Registry registerSimple(java.lang.String,java.util.function.Supplier) -> a
-    150:150:net.minecraft.core.DefaultedRegistry registerDefaulted(java.lang.String,java.lang.String,java.util.function.Supplier) -> a
-    154:157:net.minecraft.core.WritableRegistry internalRegister(java.lang.String,net.minecraft.core.WritableRegistry,java.util.function.Supplier) -> a
+    net.minecraft.resources.ResourceLocation ROOT_REGISTRY_NAME -> f
+    net.minecraft.core.WritableRegistry WRITABLE_REGISTRY -> g
+    net.minecraft.core.Registry REGISTRY -> h
+    net.minecraft.resources.ResourceKey SOUND_EVENT_REGISTRY -> i
+    net.minecraft.resources.ResourceKey FLUID_REGISTRY -> j
+    net.minecraft.resources.ResourceKey MOB_EFFECT_REGISTRY -> k
+    net.minecraft.resources.ResourceKey BLOCK_REGISTRY -> l
+    net.minecraft.resources.ResourceKey ENCHANTMENT_REGISTRY -> m
+    net.minecraft.resources.ResourceKey ENTITY_TYPE_REGISTRY -> n
+    net.minecraft.resources.ResourceKey ITEM_REGISTRY -> o
+    net.minecraft.resources.ResourceKey POTION_REGISTRY -> p
+    net.minecraft.resources.ResourceKey CARVER_REGISTRY -> q
+    net.minecraft.resources.ResourceKey SURFACE_BUILDER_REGISTRY -> r
+    net.minecraft.resources.ResourceKey FEATURE_REGISTRY -> s
+    net.minecraft.resources.ResourceKey DECORATOR_REGISTRY -> t
+    net.minecraft.resources.ResourceKey BIOME_REGISTRY -> u
+    net.minecraft.resources.ResourceKey BLOCK_STATE_PROVIDER_TYPE_REGISTRY -> v
+    net.minecraft.resources.ResourceKey BLOCK_PLACER_TYPE_REGISTRY -> w
+    net.minecraft.resources.ResourceKey FOLIAGE_PLACER_TYPE_REGISTRY -> x
+    net.minecraft.resources.ResourceKey TRUNK_PLACER_TYPE_REGISTRY -> y
+    net.minecraft.resources.ResourceKey TREE_DECORATOR_TYPE_REGISTRY -> z
+    net.minecraft.resources.ResourceKey FEATURE_SIZE_TYPE_REGISTRY -> A
+    net.minecraft.resources.ResourceKey PARTICLE_TYPE_REGISTRY -> B
+    net.minecraft.resources.ResourceKey BIOME_SOURCE_REGISTRY -> C
+    net.minecraft.resources.ResourceKey CHUNK_GENERATOR_REGISTRY -> D
+    net.minecraft.resources.ResourceKey BLOCK_ENTITY_TYPE_REGISTRY -> E
+    net.minecraft.resources.ResourceKey MOTIVE_REGISTRY -> F
+    net.minecraft.resources.ResourceKey CUSTOM_STAT_REGISTRY -> G
+    net.minecraft.resources.ResourceKey CHUNK_STATUS_REGISTRY -> H
+    net.minecraft.resources.ResourceKey STRUCTURE_FEATURE_REGISTRY -> I
+    net.minecraft.resources.ResourceKey STRUCTURE_PIECE_REGISTRY -> J
+    net.minecraft.resources.ResourceKey RULE_TEST_REGISTRY -> K
+    net.minecraft.resources.ResourceKey POS_RULE_TEST_REGISTRY -> L
+    net.minecraft.resources.ResourceKey STRUCTURE_PROCESSOR_REGISTRY -> M
+    net.minecraft.resources.ResourceKey STRUCTURE_POOL_ELEMENT_REGISTRY -> N
+    net.minecraft.resources.ResourceKey MENU_REGISTRY -> O
+    net.minecraft.resources.ResourceKey RECIPE_TYPE_REGISTRY -> P
+    net.minecraft.resources.ResourceKey RECIPE_SERIALIZER_REGISTRY -> Q
+    net.minecraft.resources.ResourceKey ATTRIBUTE_REGISTRY -> R
+    net.minecraft.resources.ResourceKey STAT_TYPE_REGISTRY -> S
+    net.minecraft.resources.ResourceKey VILLAGER_TYPE_REGISTRY -> T
+    net.minecraft.resources.ResourceKey VILLAGER_PROFESSION_REGISTRY -> U
+    net.minecraft.resources.ResourceKey POINT_OF_INTEREST_TYPE_REGISTRY -> V
+    net.minecraft.resources.ResourceKey MEMORY_MODULE_TYPE_REGISTRY -> W
+    net.minecraft.resources.ResourceKey SENSOR_TYPE_REGISTRY -> X
+    net.minecraft.resources.ResourceKey SCHEDULE_REGISTRY -> Y
+    net.minecraft.resources.ResourceKey ACTIVITY_REGISTRY -> Z
+    net.minecraft.resources.ResourceKey LOOT_ENTRY_REGISTRY -> aa
+    net.minecraft.resources.ResourceKey LOOT_FUNCTION_REGISTRY -> ab
+    net.minecraft.resources.ResourceKey LOOT_ITEM_REGISTRY -> ac
+    net.minecraft.resources.ResourceKey DIMENSION_TYPE_REGISTRY -> ad
+    net.minecraft.resources.ResourceKey DIMENSION_REGISTRY -> ae
+    net.minecraft.resources.ResourceKey LEVEL_STEM_REGISTRY -> af
+    net.minecraft.core.Registry SOUND_EVENT -> ag
+    net.minecraft.core.DefaultedRegistry FLUID -> ah
+    net.minecraft.core.Registry MOB_EFFECT -> ai
+    net.minecraft.core.DefaultedRegistry BLOCK -> aj
+    net.minecraft.core.Registry ENCHANTMENT -> ak
+    net.minecraft.core.DefaultedRegistry ENTITY_TYPE -> al
+    net.minecraft.core.DefaultedRegistry ITEM -> am
+    net.minecraft.core.DefaultedRegistry POTION -> an
+    net.minecraft.core.Registry CARVER -> ao
+    net.minecraft.core.Registry SURFACE_BUILDER -> ap
+    net.minecraft.core.Registry FEATURE -> aq
+    net.minecraft.core.Registry DECORATOR -> ar
+    net.minecraft.core.Registry BIOME -> as
+    net.minecraft.core.Registry BLOCKSTATE_PROVIDER_TYPES -> at
+    net.minecraft.core.Registry BLOCK_PLACER_TYPES -> au
+    net.minecraft.core.Registry FOLIAGE_PLACER_TYPES -> av
+    net.minecraft.core.Registry TRUNK_PLACER_TYPES -> aw
+    net.minecraft.core.Registry TREE_DECORATOR_TYPES -> ax
+    net.minecraft.core.Registry FEATURE_SIZE_TYPES -> ay
+    net.minecraft.core.Registry PARTICLE_TYPE -> az
+    net.minecraft.core.Registry BIOME_SOURCE -> aA
+    net.minecraft.core.Registry CHUNK_GENERATOR -> aB
+    net.minecraft.core.Registry BLOCK_ENTITY_TYPE -> aC
+    net.minecraft.core.DefaultedRegistry MOTIVE -> aD
+    net.minecraft.core.Registry CUSTOM_STAT -> aE
+    net.minecraft.core.DefaultedRegistry CHUNK_STATUS -> aF
+    net.minecraft.core.Registry STRUCTURE_FEATURE -> aG
+    net.minecraft.core.Registry STRUCTURE_PIECE -> aH
+    net.minecraft.core.Registry RULE_TEST -> aI
+    net.minecraft.core.Registry POS_RULE_TEST -> aJ
+    net.minecraft.core.Registry STRUCTURE_PROCESSOR -> aK
+    net.minecraft.core.Registry STRUCTURE_POOL_ELEMENT -> aL
+    net.minecraft.core.Registry MENU -> aM
+    net.minecraft.core.Registry RECIPE_TYPE -> aN
+    net.minecraft.core.Registry RECIPE_SERIALIZER -> aO
+    net.minecraft.core.Registry ATTRIBUTE -> aP
+    net.minecraft.core.Registry STAT_TYPE -> aQ
+    net.minecraft.core.DefaultedRegistry VILLAGER_TYPE -> aR
+    net.minecraft.core.DefaultedRegistry VILLAGER_PROFESSION -> aS
+    net.minecraft.core.DefaultedRegistry POINT_OF_INTEREST_TYPE -> aT
+    net.minecraft.core.DefaultedRegistry MEMORY_MODULE_TYPE -> aU
+    net.minecraft.core.DefaultedRegistry SENSOR_TYPE -> aV
+    net.minecraft.core.Registry SCHEDULE -> aW
+    net.minecraft.core.Registry ACTIVITY -> aX
+    net.minecraft.core.Registry LOOT_POOL_ENTRY_TYPE -> aY
+    net.minecraft.core.Registry LOOT_FUNCTION_TYPE -> aZ
+    net.minecraft.core.Registry LOOT_CONDITION_TYPE -> ba
+    net.minecraft.resources.ResourceKey key -> b
+    com.mojang.serialization.Lifecycle lifecycle -> c
+    163:163:net.minecraft.resources.ResourceKey createRegistryKey(java.lang.String) -> a
+    229:242:void checkRegistry(net.minecraft.core.WritableRegistry) -> a
+    245:245:net.minecraft.core.Registry registerSimple(net.minecraft.resources.ResourceKey,java.util.function.Supplier) -> a
+    249:249:net.minecraft.core.DefaultedRegistry registerDefaulted(net.minecraft.resources.ResourceKey,java.lang.String,java.util.function.Supplier) -> a
+    253:253:net.minecraft.core.Registry registerSimple(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle,java.util.function.Supplier) -> a
+    257:257:net.minecraft.core.DefaultedRegistry registerDefaulted(net.minecraft.resources.ResourceKey,java.lang.String,com.mojang.serialization.Lifecycle,java.util.function.Supplier) -> a
+    262:266:net.minecraft.core.WritableRegistry internalRegister(net.minecraft.resources.ResourceKey,net.minecraft.core.WritableRegistry,java.util.function.Supplier) -> a
+    272:275:void <init>(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle) -> <init>
+    279:279:java.lang.String toString() -> toString
+    284:294:com.mojang.serialization.DataResult decode(com.mojang.serialization.DynamicOps,java.lang.Object) -> decode
+    304:311:com.mojang.serialization.DataResult encode(java.lang.Object,com.mojang.serialization.DynamicOps,java.lang.Object) -> encode
+    316:316:java.util.stream.Stream keys(com.mojang.serialization.DynamicOps) -> keys
     net.minecraft.resources.ResourceLocation getKey(java.lang.Object) -> b
+    java.util.Optional getResourceKey(java.lang.Object) -> c
     int getId(java.lang.Object) -> a
+    java.lang.Object get(net.minecraft.resources.ResourceKey) -> a
     java.lang.Object get(net.minecraft.resources.ResourceLocation) -> a
     java.util.Optional getOptional(net.minecraft.resources.ResourceLocation) -> b
     java.util.Set keySet() -> b
+    java.util.Set entrySet() -> c
     java.lang.Object getRandom(java.util.Random) -> a
-    178:178:java.util.stream.Stream stream() -> d
+    343:343:java.util.stream.Stream stream() -> e
     boolean containsKey(net.minecraft.resources.ResourceLocation) -> c
+    boolean containsKey(net.minecraft.resources.ResourceKey) -> b
+    boolean persistent(net.minecraft.resources.ResourceKey) -> c
     boolean containsId(int) -> b
-    186:186:java.lang.Object register(net.minecraft.core.Registry,java.lang.String,java.lang.Object) -> a
-    191:191:java.lang.Object register(net.minecraft.core.Registry,net.minecraft.resources.ResourceLocation,java.lang.Object) -> a
-    196:196:java.lang.Object registerMapping(net.minecraft.core.Registry,int,java.lang.String,java.lang.Object) -> a
-    131:142:void lambda$static$42(net.minecraft.core.WritableRegistry) -> a
-    125:128:void lambda$static$41(java.util.Map$Entry) -> a
-    121:121:net.minecraft.world.entity.schedule.Activity lambda$static$40() -> a
-    120:120:net.minecraft.world.entity.schedule.Schedule lambda$static$39() -> c
-    118:118:net.minecraft.world.entity.ai.sensing.SensorType lambda$static$38() -> e
-    117:117:net.minecraft.world.entity.ai.memory.MemoryModuleType lambda$static$37() -> f
-    116:116:net.minecraft.world.entity.ai.village.poi.PoiType lambda$static$36() -> g
-    115:115:net.minecraft.world.entity.npc.VillagerProfession lambda$static$35() -> h
-    114:114:net.minecraft.world.entity.npc.VillagerType lambda$static$34() -> i
-    112:112:net.minecraft.stats.StatType lambda$static$33() -> j
-    110:110:net.minecraft.world.item.crafting.RecipeSerializer lambda$static$32() -> k
-    109:109:net.minecraft.world.item.crafting.RecipeType lambda$static$31() -> l
-    108:108:net.minecraft.world.inventory.MenuType lambda$static$30() -> m
-    107:107:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType lambda$static$29() -> n
-    106:106:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType lambda$static$28() -> o
-    105:105:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType lambda$static$27() -> p
-    104:104:net.minecraft.world.level.levelgen.feature.StructurePieceType lambda$static$26() -> q
-    103:103:net.minecraft.world.level.levelgen.feature.StructureFeature lambda$static$25() -> r
-    102:102:net.minecraft.world.level.chunk.ChunkStatus lambda$static$24() -> s
-    101:101:net.minecraft.resources.ResourceLocation lambda$static$23() -> t
-    100:100:net.minecraft.world.entity.decoration.Motive lambda$static$22() -> u
-    99:99:net.minecraft.world.level.dimension.DimensionType lambda$static$21() -> v
-    98:98:net.minecraft.world.level.chunk.ChunkGeneratorType lambda$static$20() -> w
-    97:97:net.minecraft.world.level.block.entity.BlockEntityType lambda$static$19() -> x
-    96:96:net.minecraft.world.level.biome.BiomeSourceType lambda$static$18() -> y
-    95:95:net.minecraft.core.particles.ParticleType lambda$static$17() -> z
-    94:94:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType lambda$static$16() -> A
-    93:93:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType lambda$static$15() -> B
-    92:92:net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType lambda$static$14() -> C
-    91:91:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType lambda$static$13() -> D
-    90:90:net.minecraft.world.level.biome.Biome lambda$static$12() -> E
-    89:89:net.minecraft.world.level.levelgen.placement.FeatureDecorator lambda$static$11() -> F
-    88:88:net.minecraft.world.level.levelgen.feature.Feature lambda$static$10() -> G
-    87:87:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder lambda$static$9() -> H
-    86:86:net.minecraft.world.level.levelgen.carver.WorldCarver lambda$static$8() -> I
-    85:85:net.minecraft.world.item.alchemy.Potion lambda$static$7() -> J
-    84:84:net.minecraft.world.item.Item lambda$static$6() -> K
-    83:83:net.minecraft.world.entity.EntityType lambda$static$5() -> L
-    82:82:net.minecraft.world.item.enchantment.Enchantment lambda$static$4() -> M
-    81:81:net.minecraft.world.level.block.Block lambda$static$3() -> N
-    80:80:net.minecraft.world.effect.MobEffect lambda$static$2() -> O
-    79:79:net.minecraft.world.level.material.Fluid lambda$static$1() -> P
-    78:78:net.minecraft.sounds.SoundEvent lambda$static$0() -> Q
-    72:143:void <clinit>() -> <clinit>
-net.minecraft.core.Rotations -> gc:
+    355:355:java.lang.Object register(net.minecraft.core.Registry,java.lang.String,java.lang.Object) -> a
+    359:359:java.lang.Object register(net.minecraft.core.Registry,net.minecraft.resources.ResourceLocation,java.lang.Object) -> a
+    363:363:java.lang.Object registerMapping(net.minecraft.core.Registry,int,java.lang.String,java.lang.Object) -> a
+    316:316:java.lang.Object lambda$keys$52(com.mojang.serialization.DynamicOps,net.minecraft.resources.ResourceLocation) -> a
+    295:298:com.mojang.serialization.DataResult lambda$decode$51(com.mojang.datafixers.util.Pair) -> a
+    292:292:com.mojang.datafixers.util.Pair lambda$decode$50(com.mojang.serialization.DynamicOps,java.lang.Object) -> a
+    286:291:com.mojang.serialization.DataResult lambda$decode$49(java.lang.Number) -> a
+    230:241:void lambda$checkRegistry$48(net.minecraft.core.WritableRegistry,net.minecraft.core.WritableRegistry) -> a
+    220:223:void lambda$static$47(net.minecraft.resources.ResourceLocation,java.util.function.Supplier) -> a
+    216:216:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType lambda$static$46() -> a
+    215:215:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType lambda$static$45() -> d
+    214:214:net.minecraft.world.level.storage.loot.entries.LootPoolEntryType lambda$static$44() -> f
+    212:212:net.minecraft.world.entity.schedule.Activity lambda$static$43() -> g
+    211:211:net.minecraft.world.entity.schedule.Schedule lambda$static$42() -> h
+    209:209:net.minecraft.world.entity.ai.sensing.SensorType lambda$static$41() -> i
+    208:208:net.minecraft.world.entity.ai.memory.MemoryModuleType lambda$static$40() -> j
+    207:207:net.minecraft.world.entity.ai.village.poi.PoiType lambda$static$39() -> k
+    206:206:net.minecraft.world.entity.npc.VillagerProfession lambda$static$38() -> l
+    205:205:net.minecraft.world.entity.npc.VillagerType lambda$static$37() -> m
+    203:203:net.minecraft.stats.StatType lambda$static$36() -> n
+    201:201:net.minecraft.world.entity.ai.attributes.Attribute lambda$static$35() -> o
+    200:200:net.minecraft.world.item.crafting.RecipeSerializer lambda$static$34() -> p
+    199:199:net.minecraft.world.item.crafting.RecipeType lambda$static$33() -> q
+    198:198:net.minecraft.world.inventory.MenuType lambda$static$32() -> r
+    197:197:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType lambda$static$31() -> s
+    196:196:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType lambda$static$30() -> t
+    195:195:net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType lambda$static$29() -> u
+    194:194:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType lambda$static$28() -> v
+    193:193:net.minecraft.world.level.levelgen.feature.StructurePieceType lambda$static$27() -> w
+    192:192:net.minecraft.world.level.levelgen.feature.StructureFeature lambda$static$26() -> x
+    191:191:net.minecraft.world.level.chunk.ChunkStatus lambda$static$25() -> y
+    190:190:net.minecraft.resources.ResourceLocation lambda$static$24() -> z
+    189:189:net.minecraft.world.entity.decoration.Motive lambda$static$23() -> A
+    188:188:net.minecraft.world.level.block.entity.BlockEntityType lambda$static$22() -> B
+    187:187:com.mojang.serialization.Codec lambda$static$21() -> C
+    186:186:com.mojang.serialization.Codec lambda$static$20() -> D
+    185:185:net.minecraft.core.particles.ParticleType lambda$static$19() -> E
+    184:184:net.minecraft.world.level.levelgen.feature.featuresize.FeatureSizeType lambda$static$18() -> F
+    183:183:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType lambda$static$17() -> G
+    182:182:net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType lambda$static$16() -> H
+    181:181:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType lambda$static$15() -> I
+    180:180:net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType lambda$static$14() -> J
+    179:179:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType lambda$static$13() -> K
+    178:178:net.minecraft.world.level.biome.Biome lambda$static$12() -> L
+    177:177:net.minecraft.world.level.levelgen.placement.FeatureDecorator lambda$static$11() -> M
+    176:176:net.minecraft.world.level.levelgen.feature.Feature lambda$static$10() -> N
+    175:175:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder lambda$static$9() -> O
+    174:174:net.minecraft.world.level.levelgen.carver.WorldCarver lambda$static$8() -> P
+    173:173:net.minecraft.world.item.alchemy.Potion lambda$static$7() -> Q
+    172:172:net.minecraft.world.item.Item lambda$static$6() -> R
+    171:171:net.minecraft.world.entity.EntityType lambda$static$5() -> S
+    170:170:net.minecraft.world.item.enchantment.Enchantment lambda$static$4() -> T
+    169:169:net.minecraft.world.level.block.Block lambda$static$3() -> U
+    168:168:net.minecraft.world.effect.MobEffect lambda$static$2() -> V
+    167:167:net.minecraft.world.level.material.Fluid lambda$static$1() -> W
+    166:166:net.minecraft.sounds.SoundEvent lambda$static$0() -> X
+    90:226:void <clinit>() -> <clinit>
+net.minecraft.core.RegistryAccess -> gm:
+    java.util.Optional registry(net.minecraft.resources.ResourceKey) -> a
+    net.minecraft.core.Registry dimensionTypes() -> a
+    52:52:net.minecraft.core.RegistryAccess$RegistryHolder builtin() -> b
+net.minecraft.core.RegistryAccess$RegistryHolder -> gm$a:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.core.MappedRegistry dimensionTypes -> b
+    25:26:void <init>() -> <init>
+    28:30:void <init>(net.minecraft.core.MappedRegistry) -> <init>
+    33:34:void registerDimension(net.minecraft.resources.ResourceKey,net.minecraft.world.level.dimension.DimensionType) -> a
+    39:42:java.util.Optional registry(net.minecraft.resources.ResourceKey) -> a
+    47:47:net.minecraft.core.Registry dimensionTypes() -> a
+    18:18:net.minecraft.core.MappedRegistry lambda$static$0(net.minecraft.core.RegistryAccess$RegistryHolder) -> a
+    17:20:void <clinit>() -> <clinit>
+net.minecraft.core.Rotations -> gn:
     float x -> a
     float y -> b
     float z -> c
@@ -21103,7 +22488,7 @@ net.minecraft.core.Rotations -> gc:
     52:52:float getWrappedX() -> e
     56:56:float getWrappedY() -> f
     60:60:float getWrappedZ() -> g
-net.minecraft.core.SectionPos -> gd:
+net.minecraft.core.SectionPos -> go:
     41:42:void <init>(int,int,int) -> <init>
     45:45:net.minecraft.core.SectionPos of(int,int,int) -> a
     49:49:net.minecraft.core.SectionPos of(net.minecraft.core.BlockPos) -> a
@@ -21127,22 +22512,22 @@ net.minecraft.core.SectionPos -> gd:
     132:132:int minBlockZ() -> f
     136:136:int maxBlockX() -> g
     140:140:int maxBlockY() -> h
-    144:144:int maxBlockZ() -> r
+    144:144:int maxBlockZ() -> i
     148:151:long blockToSection(long) -> e
     157:157:long getZeroNode(long) -> f
-    161:161:net.minecraft.core.BlockPos origin() -> s
-    165:166:net.minecraft.core.BlockPos center() -> t
-    170:170:net.minecraft.world.level.ChunkPos chunk() -> u
+    161:161:net.minecraft.core.BlockPos origin() -> p
+    165:166:net.minecraft.core.BlockPos center() -> q
+    170:170:net.minecraft.world.level.ChunkPos chunk() -> r
     174:178:long asLong(int,int,int) -> b
-    182:182:long asLong() -> v
+    182:182:long asLong() -> s
     187:190:net.minecraft.core.SectionPos offset(int,int,int) -> d
-    194:194:java.util.stream.Stream blocksInside() -> w
+    194:194:java.util.stream.Stream blocksInside() -> t
     198:201:java.util.stream.Stream cube(net.minecraft.core.SectionPos,int) -> a
     205:207:java.util.stream.Stream aroundChunk(net.minecraft.world.level.ChunkPos,int) -> b
     211:211:java.util.stream.Stream betweenClosedStream(int,int,int,int,int,int) -> a
     23:23:net.minecraft.core.Vec3i offset(int,int,int) -> c
     23:23:void <init>(int,int,int,net.minecraft.core.SectionPos$1) -> <init>
-net.minecraft.core.SectionPos$1 -> gd$1:
+net.minecraft.core.SectionPos$1 -> go$1:
     net.minecraft.core.Cursor3D cursor -> a
     int val$minX -> b
     int val$minY -> c
@@ -21152,270 +22537,303 @@ net.minecraft.core.SectionPos$1 -> gd$1:
     int val$maxZ -> g
     211:212:void <init>(long,int,int,int,int,int,int,int) -> <init>
     216:220:boolean tryAdvance(java.util.function.Consumer) -> tryAdvance
-net.minecraft.core.SerializableLong -> ge:
-    long value -> a
-    10:12:void <init>(long) -> <init>
-    15:15:long value() -> a
-    20:20:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    24:24:net.minecraft.core.SerializableLong of(com.mojang.datafixers.Dynamic) -> a
-    28:28:net.minecraft.core.SerializableLong of(long) -> a
-    33:40:boolean equals(java.lang.Object) -> equals
-    45:45:int hashCode() -> hashCode
-    50:50:java.lang.String toString() -> toString
-net.minecraft.core.Source -> gf:
-net.minecraft.core.Vec3i -> gg:
-    net.minecraft.core.Vec3i ZERO -> e
+net.minecraft.core.SerializableUUID -> gp:
+    com.mojang.serialization.Codec CODEC -> a
+    16:17:void <init>() -> <init>
+    20:20:java.util.UUID uuidFromIntArray(int[]) -> a
+    27:29:int[] uuidToIntArray(java.util.UUID) -> a
+    33:33:int[] leastMostToIntArray(long,long) -> a
+    42:46:java.util.UUID readUUID(com.mojang.serialization.Dynamic) -> a
+    13:13:java.util.stream.IntStream lambda$static$1(java.util.UUID) -> b
+    12:12:com.mojang.serialization.DataResult lambda$static$0(java.util.stream.IntStream) -> a
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.core.Source -> gq:
+net.minecraft.core.Vec3i -> gr:
+    com.mojang.serialization.Codec CODEC -> c
+    net.minecraft.core.Vec3i ZERO -> d
     int x -> a
     int y -> b
-    int z -> c
-    29:33:void <init>(int,int,int) -> <init>
-    36:37:void <init>(double,double,double) -> <init>
-    41:60:boolean equals(java.lang.Object) -> equals
-    65:65:int hashCode() -> hashCode
-    70:76:int compareTo(net.minecraft.core.Vec3i) -> l
-    80:80:int getX() -> o
-    84:84:int getY() -> p
-    88:88:int getZ() -> q
-    92:95:net.minecraft.core.Vec3i offset(double,double,double) -> b
-    99:102:net.minecraft.core.Vec3i offset(int,int,int) -> c
-    106:106:net.minecraft.core.Vec3i offset(net.minecraft.core.Vec3i) -> f
-    110:110:net.minecraft.core.Vec3i subtract(net.minecraft.core.Vec3i) -> e
-    114:119:net.minecraft.core.Vec3i multiply(int) -> n
-    123:123:net.minecraft.core.Vec3i above() -> n
-    127:127:net.minecraft.core.Vec3i above(int) -> m
-    131:131:net.minecraft.core.Vec3i below() -> m
-    135:135:net.minecraft.core.Vec3i below(int) -> l
-    139:139:net.minecraft.core.Vec3i north() -> l
-    143:143:net.minecraft.core.Vec3i north(int) -> k
-    147:147:net.minecraft.core.Vec3i south() -> k
-    151:151:net.minecraft.core.Vec3i south(int) -> j
-    155:155:net.minecraft.core.Vec3i west() -> j
-    159:159:net.minecraft.core.Vec3i west(int) -> i
-    163:163:net.minecraft.core.Vec3i east() -> i
-    167:167:net.minecraft.core.Vec3i east(int) -> h
-    171:171:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction) -> b
-    175:178:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction,int) -> b
-    182:188:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction$Axis,int) -> b
-    192:192:net.minecraft.core.Vec3i cross(net.minecraft.core.Vec3i) -> d
-    196:196:boolean closerThan(net.minecraft.core.Vec3i,double) -> a
-    200:200:boolean closerThan(net.minecraft.core.Position,double) -> a
-    204:204:double distSqr(net.minecraft.core.Vec3i) -> m
-    208:208:double distSqr(net.minecraft.core.Position,boolean) -> a
-    212:216:double distSqr(double,double,double,boolean) -> a
-    220:223:int distManhattan(net.minecraft.core.Vec3i) -> n
-    228:232:java.lang.String toString() -> toString
-    236:236:java.lang.String toShortString() -> x
-    240:243:java.lang.Iterable between(net.minecraft.core.Vec3i,net.minecraft.core.Vec3i) -> a
-    9:9:int compareTo(java.lang.Object) -> compareTo
-    243:243:java.util.Iterator lambda$between$0(net.minecraft.core.Vec3i,net.minecraft.core.Vec3i) -> b
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.core.Vec3i$1 -> gg$1:
-    net.minecraft.core.Vec3i lastPos -> c
-    net.minecraft.core.Vec3i val$minCorner -> a
-    net.minecraft.core.Vec3i val$maxCorner -> b
-    243:243:void <init>(net.minecraft.core.Vec3i,net.minecraft.core.Vec3i) -> <init>
-    248:271:net.minecraft.core.Vec3i computeNext() -> a
-    243:243:java.lang.Object computeNext() -> computeNext
-net.minecraft.core.WritableRegistry -> gh:
-    5:5:void <init>() -> <init>
-    java.lang.Object registerMapping(int,net.minecraft.resources.ResourceLocation,java.lang.Object) -> a
-    java.lang.Object register(net.minecraft.resources.ResourceLocation,java.lang.Object) -> a
-    boolean isEmpty() -> c
-net.minecraft.core.dispenser.AbstractProjectileDispenseBehavior -> gi:
+    int z -> e
+    24:28:void <init>(int,int,int) -> <init>
+    31:32:void <init>(double,double,double) -> <init>
+    36:55:boolean equals(java.lang.Object) -> equals
+    60:60:int hashCode() -> hashCode
+    65:71:int compareTo(net.minecraft.core.Vec3i) -> i
+    75:75:int getX() -> u
+    79:79:int getY() -> v
+    83:83:int getZ() -> w
+    87:88:void setX(int) -> o
+    91:92:void setY(int) -> p
+    95:96:void setZ(int) -> q
+    99:102:net.minecraft.core.Vec3i offset(double,double,double) -> b
+    106:109:net.minecraft.core.Vec3i offset(int,int,int) -> c
+    113:113:net.minecraft.core.Vec3i offset(net.minecraft.core.Vec3i) -> f
+    117:117:net.minecraft.core.Vec3i subtract(net.minecraft.core.Vec3i) -> e
+    121:126:net.minecraft.core.Vec3i multiply(int) -> n
+    130:130:net.minecraft.core.Vec3i above() -> o
+    134:134:net.minecraft.core.Vec3i above(int) -> m
+    138:138:net.minecraft.core.Vec3i below() -> n
+    142:142:net.minecraft.core.Vec3i below(int) -> l
+    146:146:net.minecraft.core.Vec3i north() -> m
+    150:150:net.minecraft.core.Vec3i north(int) -> k
+    154:154:net.minecraft.core.Vec3i south() -> l
+    158:158:net.minecraft.core.Vec3i south(int) -> j
+    162:162:net.minecraft.core.Vec3i west() -> k
+    166:166:net.minecraft.core.Vec3i west(int) -> i
+    170:170:net.minecraft.core.Vec3i east() -> j
+    174:174:net.minecraft.core.Vec3i east(int) -> h
+    178:178:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction) -> b
+    182:185:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction,int) -> b
+    189:195:net.minecraft.core.Vec3i relative(net.minecraft.core.Direction$Axis,int) -> b
+    199:199:net.minecraft.core.Vec3i cross(net.minecraft.core.Vec3i) -> d
+    203:203:boolean closerThan(net.minecraft.core.Vec3i,double) -> a
+    207:207:boolean closerThan(net.minecraft.core.Position,double) -> a
+    211:211:double distSqr(net.minecraft.core.Vec3i) -> j
+    215:215:double distSqr(net.minecraft.core.Position,boolean) -> a
+    219:223:double distSqr(double,double,double,boolean) -> a
+    227:230:int distManhattan(net.minecraft.core.Vec3i) -> k
+    235:239:java.lang.String toString() -> toString
+    243:243:java.lang.String toShortString() -> x
+    11:11:int compareTo(java.lang.Object) -> compareTo
+    15:15:java.util.stream.IntStream lambda$static$2(net.minecraft.core.Vec3i) -> a
+    14:14:com.mojang.serialization.DataResult lambda$static$1(java.util.stream.IntStream) -> a
+    14:14:net.minecraft.core.Vec3i lambda$null$0(int[]) -> a
+    13:18:void <clinit>() -> <clinit>
+net.minecraft.core.WritableRegistry -> gs:
+    8:9:void <init>(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle) -> <init>
+    java.lang.Object registerMapping(int,net.minecraft.resources.ResourceKey,java.lang.Object) -> a
+    java.lang.Object register(net.minecraft.resources.ResourceKey,java.lang.Object) -> a
+    void setPersistent(net.minecraft.resources.ResourceKey) -> d
+    boolean isEmpty() -> d
+net.minecraft.core.dispenser.AbstractProjectileDispenseBehavior -> gt:
     13:13:void <init>() -> <init>
     16:26:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
     31:32:void playSound(net.minecraft.core.BlockSource) -> a
     net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
     37:37:float getUncertainty() -> a
     41:41:float getPower() -> b
-net.minecraft.core.dispenser.BoatDispenseItemBehavior -> gj:
+net.minecraft.core.dispenser.BoatDispenseItemBehavior -> gu:
     net.minecraft.core.dispenser.DefaultDispenseItemBehavior defaultDispenseItemBehavior -> b
     net.minecraft.world.entity.vehicle.Boat$Type type -> c
     14:19:void <init>(net.minecraft.world.entity.vehicle.Boat$Type) -> <init>
     23:48:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
     53:54:void playSound(net.minecraft.core.BlockSource) -> a
-net.minecraft.core.dispenser.DefaultDispenseItemBehavior -> gk:
+net.minecraft.core.dispenser.DefaultDispenseItemBehavior -> gv:
     12:12:void <init>() -> <init>
     15:20:net.minecraft.world.item.ItemStack dispense(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> dispense
     24:31:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
     35:57:void spawnItem(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,int,net.minecraft.core.Direction,net.minecraft.core.Position) -> a
     60:61:void playSound(net.minecraft.core.BlockSource) -> a
     64:65:void playAnimation(net.minecraft.core.BlockSource,net.minecraft.core.Direction) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior -> gl:
+net.minecraft.core.dispenser.DispenseItemBehavior -> gw:
     net.minecraft.core.dispenser.DispenseItemBehavior NOOP -> a
     net.minecraft.world.item.ItemStack dispense(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> dispense
-    79:531:void bootStrap() -> c
-    69:69:net.minecraft.world.item.ItemStack lambda$static$0(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-    69:69:void <clinit>() -> <clinit>
-net.minecraft.core.dispenser.DispenseItemBehavior$1 -> gl$1:
-    79:79:void <init>() -> <init>
-    82:85:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$10 -> gl$2:
-    196:196:void <init>() -> <init>
-    199:207:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$11 -> gl$3:
-    211:211:void <init>() -> <init>
-    214:229:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-    234:235:void playSound(net.minecraft.core.BlockSource) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$12 -> gl$4:
-    238:238:void <init>() -> <init>
-    241:258:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-    263:264:void playSound(net.minecraft.core.BlockSource) -> a
-    255:255:void lambda$execute$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.SmallFireball) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$13 -> gl$5:
+    87:594:void bootStrap() -> c
+    597:602:void setEntityPokingOutOfBlock(net.minecraft.core.BlockSource,net.minecraft.world.entity.Entity,net.minecraft.core.Direction) -> a
+    77:77:net.minecraft.world.item.ItemStack lambda$static$0(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+    77:77:void <clinit>() -> <clinit>
+net.minecraft.core.dispenser.DispenseItemBehavior$1 -> gw$1:
+    87:87:void <init>() -> <init>
+    90:93:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$10 -> gw$2:
+    204:204:void <init>() -> <init>
+    207:215:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$11 -> gw$3:
+    219:219:void <init>() -> <init>
+    222:238:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+    224:228:boolean lambda$execute$0(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$12 -> gw$4:
+    242:242:void <init>() -> <init>
+    245:256:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+    246:246:boolean lambda$execute$0(net.minecraft.world.entity.animal.horse.AbstractHorse) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$13 -> gw$5:
+    282:282:void <init>() -> <init>
+    285:296:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+    286:286:boolean lambda$execute$0(net.minecraft.world.entity.animal.horse.AbstractChestedHorse) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$14 -> gw$6:
+    300:300:void <init>() -> <init>
+    303:311:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+    316:317:void playSound(net.minecraft.core.BlockSource) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$15 -> gw$7:
+    320:320:void <init>() -> <init>
+    323:340:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+    345:346:void playSound(net.minecraft.core.BlockSource) -> a
+    337:337:void lambda$execute$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.SmallFireball) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$16 -> gw$8:
     net.minecraft.core.dispenser.DefaultDispenseItemBehavior defaultDispenseItemBehavior -> b
-    274:275:void <init>() -> <init>
-    279:288:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$14 -> gl$6:
+    356:357:void <init>() -> <init>
+    361:370:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$17 -> gw$9:
     net.minecraft.core.dispenser.DefaultDispenseItemBehavior defaultDispenseItemBehavior -> b
-    298:299:void <init>() -> <init>
-    303:328:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$15 -> gl$7:
-    332:332:void <init>() -> <init>
-    335:356:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$16 -> gl$8:
-    360:360:void <init>() -> <init>
-    363:375:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$17 -> gl$9:
-    379:379:void <init>() -> <init>
-    382:390:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$18 -> gl$10:
-    394:394:void <init>() -> <init>
-    397:398:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$19 -> gl$11:
-    406:406:void <init>() -> <init>
-    409:424:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$2 -> gl$12:
-    88:88:void <init>() -> <init>
-    91:95:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$20 -> gl$13:
-    428:428:void <init>() -> <init>
-    431:444:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$21 -> gl$14:
-    net.minecraft.core.dispenser.DefaultDispenseItemBehavior defaultDispenseItemBehavior -> c
-    453:454:void <init>() -> <init>
-    457:463:net.minecraft.world.item.ItemStack takeLiquid(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    468:484:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$22 -> gl$15:
-    489:489:void <init>() -> <init>
-    492:528:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$3 -> gl$16:
-    98:98:void <init>() -> <init>
-    101:104:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$4 -> gl$17:
-    107:107:void <init>() -> <init>
-    110:110:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
-    110:110:void lambda$getProjectile$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.ThrownEgg) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$5 -> gl$18:
-    113:113:void <init>() -> <init>
-    116:116:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
-    116:116:void lambda$getProjectile$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.Snowball) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$6 -> gl$19:
-    119:119:void <init>() -> <init>
-    122:122:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
-    127:127:float getUncertainty() -> a
-    132:132:float getPower() -> b
-    122:122:void lambda$getProjectile$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.ThrownExperienceBottle) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$7 -> gl$20:
-    136:136:void <init>() -> <init>
-    139:154:net.minecraft.world.item.ItemStack dispense(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> dispense
-net.minecraft.core.dispenser.DispenseItemBehavior$7$1 -> gl$20$1:
+    380:381:void <init>() -> <init>
+    385:410:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$18 -> gw$10:
+    414:414:void <init>() -> <init>
+    417:438:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$19 -> gw$11:
+    442:442:void <init>() -> <init>
+    445:457:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$2 -> gw$12:
+    96:96:void <init>() -> <init>
+    99:103:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$20 -> gw$13:
+    461:461:void <init>() -> <init>
+    464:472:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$21 -> gw$14:
+    476:476:void <init>() -> <init>
+    479:480:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$22 -> gw$15:
+    488:488:void <init>() -> <init>
+    491:506:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$23 -> gw$16:
+    510:510:void <init>() -> <init>
+    513:526:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$24 -> gw$17:
+    net.minecraft.core.dispenser.DefaultDispenseItemBehavior defaultDispenseItemBehavior -> b
+    535:536:void <init>() -> <init>
+    539:545:net.minecraft.world.item.ItemStack takeLiquid(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    550:565:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+    557:557:boolean lambda$execute$0(net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$25 -> gw$18:
+    570:570:void <init>() -> <init>
+    573:588:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$3 -> gw$19:
+    106:106:void <init>() -> <init>
+    109:112:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$4 -> gw$20:
+    115:115:void <init>() -> <init>
+    118:118:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
+    118:118:void lambda$getProjectile$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.ThrownEgg) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$5 -> gw$21:
+    121:121:void <init>() -> <init>
+    124:124:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
+    124:124:void lambda$getProjectile$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.Snowball) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$6 -> gw$22:
+    127:127:void <init>() -> <init>
+    130:130:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
+    135:135:float getUncertainty() -> a
+    140:140:float getPower() -> b
+    130:130:void lambda$getProjectile$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.ThrownExperienceBottle) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$7 -> gw$23:
+    144:144:void <init>() -> <init>
+    147:162:net.minecraft.world.item.ItemStack dispense(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> dispense
+net.minecraft.core.dispenser.DispenseItemBehavior$7$1 -> gw$23$1:
     net.minecraft.core.dispenser.DispenseItemBehavior$7 this$0 -> b
-    139:139:void <init>(net.minecraft.core.dispenser.DispenseItemBehavior$7) -> <init>
-    142:142:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
-    147:147:float getUncertainty() -> a
-    152:152:float getPower() -> b
-    142:142:void lambda$getProjectile$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.ThrownPotion) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$8 -> gl$21:
-    158:158:void <init>() -> <init>
-    161:176:net.minecraft.world.item.ItemStack dispense(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> dispense
-net.minecraft.core.dispenser.DispenseItemBehavior$8$1 -> gl$21$1:
+    147:147:void <init>(net.minecraft.core.dispenser.DispenseItemBehavior$7) -> <init>
+    150:150:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
+    155:155:float getUncertainty() -> a
+    160:160:float getPower() -> b
+    150:150:void lambda$getProjectile$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.ThrownPotion) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$8 -> gw$24:
+    166:166:void <init>() -> <init>
+    169:184:net.minecraft.world.item.ItemStack dispense(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> dispense
+net.minecraft.core.dispenser.DispenseItemBehavior$8$1 -> gw$24$1:
     net.minecraft.core.dispenser.DispenseItemBehavior$8 this$0 -> b
-    161:161:void <init>(net.minecraft.core.dispenser.DispenseItemBehavior$8) -> <init>
-    164:164:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
-    169:169:float getUncertainty() -> a
-    174:174:float getPower() -> b
-    164:164:void lambda$getProjectile$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.ThrownPotion) -> a
-net.minecraft.core.dispenser.DispenseItemBehavior$9 -> gl$22:
-    180:180:void <init>() -> <init>
-    183:188:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.OptionalDispenseItemBehavior -> gm:
+    169:169:void <init>(net.minecraft.core.dispenser.DispenseItemBehavior$8) -> <init>
+    172:172:net.minecraft.world.entity.projectile.Projectile getProjectile(net.minecraft.world.level.Level,net.minecraft.core.Position,net.minecraft.world.item.ItemStack) -> a
+    177:177:float getUncertainty() -> a
+    182:182:float getPower() -> b
+    172:172:void lambda$getProjectile$0(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.ThrownPotion) -> a
+net.minecraft.core.dispenser.DispenseItemBehavior$9 -> gw$25:
+    188:188:void <init>() -> <init>
+    191:196:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.OptionalDispenseItemBehavior -> gx:
     boolean success -> b
     6:7:void <init>() -> <init>
-    11:12:void playSound(net.minecraft.core.BlockSource) -> a
-net.minecraft.core.dispenser.ShulkerBoxDispenseBehavior -> gn:
-    13:13:void <init>() -> <init>
-    16:26:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.core.dispenser.package-info -> go:
-net.minecraft.core.package-info -> gp:
-net.minecraft.core.particles.BlockParticleOption -> gq:
+    10:10:boolean isSuccess() -> a
+    14:15:void setSuccess(boolean) -> a
+    19:20:void playSound(net.minecraft.core.BlockSource) -> a
+net.minecraft.core.dispenser.ShearsDispenseItemBehavior -> gy:
+    22:22:void <init>() -> <init>
+    25:34:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+    38:50:boolean tryShearBeehive(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    54:65:boolean tryShearLivingEntity(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> b
+net.minecraft.core.dispenser.ShulkerBoxDispenseBehavior -> gz:
+    12:12:void <init>() -> <init>
+    15:25:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.core.dispenser.package-info -> ha:
+net.minecraft.core.package-info -> hb:
+net.minecraft.core.particles.BlockParticleOption -> hc:
     net.minecraft.core.particles.ParticleOptions$Deserializer DESERIALIZER -> a
     net.minecraft.core.particles.ParticleType type -> b
     net.minecraft.world.level.block.state.BlockState state -> c
-    28:31:void <init>(net.minecraft.core.particles.ParticleType,net.minecraft.world.level.block.state.BlockState) -> <init>
-    35:36:void writeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
-    40:40:java.lang.String writeToString() -> a
-    45:45:net.minecraft.core.particles.ParticleType getType() -> b
-    49:49:net.minecraft.world.level.block.state.BlockState getState() -> c
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.core.particles.BlockParticleOption$1 -> gq$1:
-    12:12:void <init>() -> <init>
-    15:16:net.minecraft.core.particles.BlockParticleOption fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> a
-    21:21:net.minecraft.core.particles.BlockParticleOption fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> a
-    12:12:net.minecraft.core.particles.ParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> b
-    12:12:net.minecraft.core.particles.ParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> b
-net.minecraft.core.particles.DustParticleOptions -> gr:
+    14:14:com.mojang.serialization.Codec codec(net.minecraft.core.particles.ParticleType) -> a
+    33:36:void <init>(net.minecraft.core.particles.ParticleType,net.minecraft.world.level.block.state.BlockState) -> <init>
+    40:41:void writeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
+    45:45:java.lang.String writeToString() -> a
+    50:50:net.minecraft.core.particles.ParticleType getType() -> b
+    54:54:net.minecraft.world.level.block.state.BlockState getState() -> c
+    14:14:net.minecraft.world.level.block.state.BlockState lambda$codec$1(net.minecraft.core.particles.BlockParticleOption) -> a
+    14:14:net.minecraft.core.particles.BlockParticleOption lambda$codec$0(net.minecraft.core.particles.ParticleType,net.minecraft.world.level.block.state.BlockState) -> a
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.core.particles.BlockParticleOption$1 -> hc$1:
+    17:17:void <init>() -> <init>
+    20:21:net.minecraft.core.particles.BlockParticleOption fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> a
+    26:26:net.minecraft.core.particles.BlockParticleOption fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> a
+    17:17:net.minecraft.core.particles.ParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> b
+    17:17:net.minecraft.core.particles.ParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> b
+net.minecraft.core.particles.DustParticleOptions -> hd:
     net.minecraft.core.particles.DustParticleOptions REDSTONE -> a
-    net.minecraft.core.particles.ParticleOptions$Deserializer DESERIALIZER -> b
-    float r -> c
-    float g -> d
-    float b -> e
-    float scale -> f
-    39:45:void <init>(float,float,float,float) -> <init>
-    49:53:void writeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
-    57:57:java.lang.String writeToString() -> a
-    62:62:net.minecraft.core.particles.ParticleType getType() -> b
-    66:66:float getR() -> c
-    70:70:float getG() -> d
-    74:74:float getB() -> e
-    78:78:float getScale() -> f
-    12:13:void <clinit>() -> <clinit>
-net.minecraft.core.particles.DustParticleOptions$1 -> gr$1:
-    13:13:void <init>() -> <init>
-    17:25:net.minecraft.core.particles.DustParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> a
-    30:30:net.minecraft.core.particles.DustParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> a
-    13:13:net.minecraft.core.particles.ParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> b
-    13:13:net.minecraft.core.particles.ParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> b
-net.minecraft.core.particles.ItemParticleOption -> gs:
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.core.particles.ParticleOptions$Deserializer DESERIALIZER -> c
+    float r -> d
+    float g -> e
+    float b -> f
+    float scale -> g
+    49:55:void <init>(float,float,float,float) -> <init>
+    59:63:void writeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
+    67:67:java.lang.String writeToString() -> a
+    72:72:net.minecraft.core.particles.ParticleType getType() -> b
+    76:76:float getR() -> c
+    80:80:float getG() -> d
+    84:84:float getB() -> e
+    88:88:float getScale() -> f
+    16:21:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    20:20:java.lang.Float lambda$null$3(net.minecraft.core.particles.DustParticleOptions) -> a
+    19:19:java.lang.Float lambda$null$2(net.minecraft.core.particles.DustParticleOptions) -> b
+    18:18:java.lang.Float lambda$null$1(net.minecraft.core.particles.DustParticleOptions) -> c
+    17:17:java.lang.Float lambda$null$0(net.minecraft.core.particles.DustParticleOptions) -> d
+    14:23:void <clinit>() -> <clinit>
+net.minecraft.core.particles.DustParticleOptions$1 -> hd$1:
+    23:23:void <init>() -> <init>
+    27:35:net.minecraft.core.particles.DustParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> a
+    40:40:net.minecraft.core.particles.DustParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> a
+    23:23:net.minecraft.core.particles.ParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> b
+    23:23:net.minecraft.core.particles.ParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> b
+net.minecraft.core.particles.ItemParticleOption -> he:
     net.minecraft.core.particles.ParticleOptions$Deserializer DESERIALIZER -> a
     net.minecraft.core.particles.ParticleType type -> b
     net.minecraft.world.item.ItemStack itemStack -> c
-    30:33:void <init>(net.minecraft.core.particles.ParticleType,net.minecraft.world.item.ItemStack) -> <init>
-    37:38:void writeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
-    42:42:java.lang.String writeToString() -> a
-    47:47:net.minecraft.core.particles.ParticleType getType() -> b
-    51:51:net.minecraft.world.item.ItemStack getItem() -> c
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.core.particles.ItemParticleOption$1 -> gs$1:
-    12:12:void <init>() -> <init>
-    15:18:net.minecraft.core.particles.ItemParticleOption fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> a
-    23:23:net.minecraft.core.particles.ItemParticleOption fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> a
-    12:12:net.minecraft.core.particles.ParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> b
-    12:12:net.minecraft.core.particles.ParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> b
-net.minecraft.core.particles.ParticleOptions -> gt:
+    14:14:com.mojang.serialization.Codec codec(net.minecraft.core.particles.ParticleType) -> a
+    35:38:void <init>(net.minecraft.core.particles.ParticleType,net.minecraft.world.item.ItemStack) -> <init>
+    42:43:void writeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
+    47:47:java.lang.String writeToString() -> a
+    52:52:net.minecraft.core.particles.ParticleType getType() -> b
+    56:56:net.minecraft.world.item.ItemStack getItem() -> c
+    14:14:net.minecraft.world.item.ItemStack lambda$codec$1(net.minecraft.core.particles.ItemParticleOption) -> a
+    14:14:net.minecraft.core.particles.ItemParticleOption lambda$codec$0(net.minecraft.core.particles.ParticleType,net.minecraft.world.item.ItemStack) -> a
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.core.particles.ItemParticleOption$1 -> he$1:
+    17:17:void <init>() -> <init>
+    20:23:net.minecraft.core.particles.ItemParticleOption fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> a
+    28:28:net.minecraft.core.particles.ItemParticleOption fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> a
+    17:17:net.minecraft.core.particles.ParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> b
+    17:17:net.minecraft.core.particles.ParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> b
+net.minecraft.core.particles.ParticleOptions -> hf:
     net.minecraft.core.particles.ParticleType getType() -> b
     void writeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
     java.lang.String writeToString() -> a
-net.minecraft.core.particles.ParticleOptions$Deserializer -> gt$a:
+net.minecraft.core.particles.ParticleOptions$Deserializer -> hf$a:
     net.minecraft.core.particles.ParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> b
     net.minecraft.core.particles.ParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> b
-net.minecraft.core.particles.ParticleType -> gu:
+net.minecraft.core.particles.ParticleType -> hg:
     boolean overrideLimiter -> a
     net.minecraft.core.particles.ParticleOptions$Deserializer deserializer -> b
-    7:10:void <init>(boolean,net.minecraft.core.particles.ParticleOptions$Deserializer) -> <init>
-    13:13:boolean getOverrideLimiter() -> c
-    17:17:net.minecraft.core.particles.ParticleOptions$Deserializer getDeserializer() -> d
-net.minecraft.core.particles.ParticleTypes -> gv:
+    9:12:void <init>(boolean,net.minecraft.core.particles.ParticleOptions$Deserializer) -> <init>
+    15:15:boolean getOverrideLimiter() -> c
+    19:19:net.minecraft.core.particles.ParticleOptions$Deserializer getDeserializer() -> d
+    com.mojang.serialization.Codec codec() -> e
+net.minecraft.core.particles.ParticleTypes -> hh:
     net.minecraft.core.particles.SimpleParticleType AMBIENT_ENTITY_EFFECT -> a
     net.minecraft.core.particles.SimpleParticleType ANGRY_VILLAGER -> b
     net.minecraft.core.particles.SimpleParticleType BARRIER -> c
@@ -21443,60 +22861,79 @@ net.minecraft.core.particles.ParticleTypes -> gv:
     net.minecraft.core.particles.SimpleParticleType FIREWORK -> y
     net.minecraft.core.particles.SimpleParticleType FISHING -> z
     net.minecraft.core.particles.SimpleParticleType FLAME -> A
-    net.minecraft.core.particles.SimpleParticleType FLASH -> B
-    net.minecraft.core.particles.SimpleParticleType HAPPY_VILLAGER -> C
-    net.minecraft.core.particles.SimpleParticleType COMPOSTER -> D
-    net.minecraft.core.particles.SimpleParticleType HEART -> E
-    net.minecraft.core.particles.SimpleParticleType INSTANT_EFFECT -> F
-    net.minecraft.core.particles.ParticleType ITEM -> G
-    net.minecraft.core.particles.SimpleParticleType ITEM_SLIME -> H
-    net.minecraft.core.particles.SimpleParticleType ITEM_SNOWBALL -> I
-    net.minecraft.core.particles.SimpleParticleType LARGE_SMOKE -> J
-    net.minecraft.core.particles.SimpleParticleType LAVA -> K
-    net.minecraft.core.particles.SimpleParticleType MYCELIUM -> L
-    net.minecraft.core.particles.SimpleParticleType NOTE -> M
-    net.minecraft.core.particles.SimpleParticleType POOF -> N
-    net.minecraft.core.particles.SimpleParticleType PORTAL -> O
-    net.minecraft.core.particles.SimpleParticleType RAIN -> P
-    net.minecraft.core.particles.SimpleParticleType SMOKE -> Q
-    net.minecraft.core.particles.SimpleParticleType SNEEZE -> R
-    net.minecraft.core.particles.SimpleParticleType SPIT -> S
-    net.minecraft.core.particles.SimpleParticleType SQUID_INK -> T
-    net.minecraft.core.particles.SimpleParticleType SWEEP_ATTACK -> U
-    net.minecraft.core.particles.SimpleParticleType TOTEM_OF_UNDYING -> V
-    net.minecraft.core.particles.SimpleParticleType UNDERWATER -> W
-    net.minecraft.core.particles.SimpleParticleType SPLASH -> X
-    net.minecraft.core.particles.SimpleParticleType WITCH -> Y
-    net.minecraft.core.particles.SimpleParticleType BUBBLE_POP -> Z
-    net.minecraft.core.particles.SimpleParticleType CURRENT_DOWN -> aa
-    net.minecraft.core.particles.SimpleParticleType BUBBLE_COLUMN_UP -> ab
-    net.minecraft.core.particles.SimpleParticleType NAUTILUS -> ac
-    net.minecraft.core.particles.SimpleParticleType DOLPHIN -> ad
-    net.minecraft.core.particles.SimpleParticleType CAMPFIRE_COSY_SMOKE -> ae
-    net.minecraft.core.particles.SimpleParticleType CAMPFIRE_SIGNAL_SMOKE -> af
-    net.minecraft.core.particles.SimpleParticleType DRIPPING_HONEY -> ag
-    net.minecraft.core.particles.SimpleParticleType FALLING_HONEY -> ah
-    net.minecraft.core.particles.SimpleParticleType LANDING_HONEY -> ai
-    net.minecraft.core.particles.SimpleParticleType FALLING_NECTAR -> aj
-    5:5:void <init>() -> <init>
-    74:74:net.minecraft.core.particles.SimpleParticleType register(java.lang.String,boolean) -> a
-    78:78:net.minecraft.core.particles.ParticleType register(java.lang.String,net.minecraft.core.particles.ParticleOptions$Deserializer) -> a
-    6:71:void <clinit>() -> <clinit>
-net.minecraft.core.particles.SimpleParticleType -> gw:
+    net.minecraft.core.particles.SimpleParticleType SOUL_FIRE_FLAME -> B
+    net.minecraft.core.particles.SimpleParticleType SOUL -> C
+    net.minecraft.core.particles.SimpleParticleType FLASH -> D
+    net.minecraft.core.particles.SimpleParticleType HAPPY_VILLAGER -> E
+    net.minecraft.core.particles.SimpleParticleType COMPOSTER -> F
+    net.minecraft.core.particles.SimpleParticleType HEART -> G
+    net.minecraft.core.particles.SimpleParticleType INSTANT_EFFECT -> H
+    net.minecraft.core.particles.ParticleType ITEM -> I
+    net.minecraft.core.particles.SimpleParticleType ITEM_SLIME -> J
+    net.minecraft.core.particles.SimpleParticleType ITEM_SNOWBALL -> K
+    net.minecraft.core.particles.SimpleParticleType LARGE_SMOKE -> L
+    net.minecraft.core.particles.SimpleParticleType LAVA -> M
+    net.minecraft.core.particles.SimpleParticleType MYCELIUM -> N
+    net.minecraft.core.particles.SimpleParticleType NOTE -> O
+    net.minecraft.core.particles.SimpleParticleType POOF -> P
+    net.minecraft.core.particles.SimpleParticleType PORTAL -> Q
+    net.minecraft.core.particles.SimpleParticleType RAIN -> R
+    net.minecraft.core.particles.SimpleParticleType SMOKE -> S
+    net.minecraft.core.particles.SimpleParticleType SNEEZE -> T
+    net.minecraft.core.particles.SimpleParticleType SPIT -> U
+    net.minecraft.core.particles.SimpleParticleType SQUID_INK -> V
+    net.minecraft.core.particles.SimpleParticleType SWEEP_ATTACK -> W
+    net.minecraft.core.particles.SimpleParticleType TOTEM_OF_UNDYING -> X
+    net.minecraft.core.particles.SimpleParticleType UNDERWATER -> Y
+    net.minecraft.core.particles.SimpleParticleType SPLASH -> Z
+    net.minecraft.core.particles.SimpleParticleType WITCH -> aa
+    net.minecraft.core.particles.SimpleParticleType BUBBLE_POP -> ab
+    net.minecraft.core.particles.SimpleParticleType CURRENT_DOWN -> ac
+    net.minecraft.core.particles.SimpleParticleType BUBBLE_COLUMN_UP -> ad
+    net.minecraft.core.particles.SimpleParticleType NAUTILUS -> ae
+    net.minecraft.core.particles.SimpleParticleType DOLPHIN -> af
+    net.minecraft.core.particles.SimpleParticleType CAMPFIRE_COSY_SMOKE -> ag
+    net.minecraft.core.particles.SimpleParticleType CAMPFIRE_SIGNAL_SMOKE -> ah
+    net.minecraft.core.particles.SimpleParticleType DRIPPING_HONEY -> ai
+    net.minecraft.core.particles.SimpleParticleType FALLING_HONEY -> aj
+    net.minecraft.core.particles.SimpleParticleType LANDING_HONEY -> ak
+    net.minecraft.core.particles.SimpleParticleType FALLING_NECTAR -> al
+    net.minecraft.core.particles.SimpleParticleType ASH -> am
+    net.minecraft.core.particles.SimpleParticleType CRIMSON_SPORE -> an
+    net.minecraft.core.particles.SimpleParticleType WARPED_SPORE -> ao
+    net.minecraft.core.particles.SimpleParticleType DRIPPING_OBSIDIAN_TEAR -> ap
+    net.minecraft.core.particles.SimpleParticleType FALLING_OBSIDIAN_TEAR -> aq
+    net.minecraft.core.particles.SimpleParticleType LANDING_OBSIDIAN_TEAR -> ar
+    net.minecraft.core.particles.SimpleParticleType REVERSE_PORTAL -> as
+    net.minecraft.core.particles.SimpleParticleType WHITE_ASH -> at
+    com.mojang.serialization.Codec CODEC -> au
+    8:8:void <init>() -> <init>
+    90:90:net.minecraft.core.particles.SimpleParticleType register(java.lang.String,boolean) -> a
+    94:94:net.minecraft.core.particles.ParticleType register(java.lang.String,net.minecraft.core.particles.ParticleOptions$Deserializer,java.util.function.Function) -> a
+    23:23:com.mojang.serialization.Codec lambda$static$0(net.minecraft.core.particles.ParticleType) -> a
+    9:102:void <clinit>() -> <clinit>
+net.minecraft.core.particles.ParticleTypes$1 -> hh$1:
+    java.util.function.Function val$codec -> a
+    94:94:void <init>(boolean,net.minecraft.core.particles.ParticleOptions$Deserializer,java.util.function.Function) -> <init>
+    97:97:com.mojang.serialization.Codec codec() -> e
+net.minecraft.core.particles.SimpleParticleType -> hi:
     net.minecraft.core.particles.ParticleOptions$Deserializer DESERIALIZER -> a
-    22:23:void <init>(boolean) -> <init>
-    27:27:net.minecraft.core.particles.ParticleType getType() -> b
-    32:32:void writeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
-    36:36:java.lang.String writeToString() -> a
-    9:9:void <clinit>() -> <clinit>
-net.minecraft.core.particles.SimpleParticleType$1 -> gw$1:
-    9:9:void <init>() -> <init>
-    12:12:net.minecraft.core.particles.SimpleParticleType fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> a
-    17:17:net.minecraft.core.particles.SimpleParticleType fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> a
-    9:9:net.minecraft.core.particles.ParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> b
-    9:9:net.minecraft.core.particles.ParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> b
-net.minecraft.core.particles.package-info -> gx:
-net.minecraft.data.DataGenerator -> gy:
+    com.mojang.serialization.Codec codec -> b
+    22:26:void <init>(boolean) -> <init>
+    30:30:net.minecraft.core.particles.SimpleParticleType getType() -> f
+    35:35:com.mojang.serialization.Codec codec() -> e
+    40:40:void writeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
+    44:44:java.lang.String writeToString() -> a
+    9:9:net.minecraft.core.particles.ParticleType getType() -> b
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.core.particles.SimpleParticleType$1 -> hi$1:
+    10:10:void <init>() -> <init>
+    13:13:net.minecraft.core.particles.SimpleParticleType fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> a
+    18:18:net.minecraft.core.particles.SimpleParticleType fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> a
+    10:10:net.minecraft.core.particles.ParticleOptions fromNetwork(net.minecraft.core.particles.ParticleType,net.minecraft.network.FriendlyByteBuf) -> b
+    10:10:net.minecraft.core.particles.ParticleOptions fromCommand(net.minecraft.core.particles.ParticleType,com.mojang.brigadier.StringReader) -> b
+net.minecraft.core.particles.package-info -> hj:
+net.minecraft.data.DataGenerator -> hk:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Collection inputFolders -> b
     java.nio.file.Path outputFolder -> c
@@ -21507,13 +22944,13 @@ net.minecraft.data.DataGenerator -> gy:
     40:56:void run() -> c
     59:60:void addProvider(net.minecraft.data.DataProvider) -> a
     16:24:void <clinit>() -> <clinit>
-net.minecraft.data.DataProvider -> gz:
+net.minecraft.data.DataProvider -> hl:
     com.google.common.hash.HashFunction SHA1 -> a
     void run(net.minecraft.data.HashCache) -> a
     java.lang.String getName() -> a
     22:32:void save(com.google.gson.Gson,net.minecraft.data.HashCache,com.google.gson.JsonElement,java.nio.file.Path) -> a
     15:15:void <clinit>() -> <clinit>
-net.minecraft.data.HashCache -> ha:
+net.minecraft.data.HashCache -> hm:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.nio.file.Path path -> b
     java.nio.file.Path cachePath -> c
@@ -21536,11 +22973,11 @@ net.minecraft.data.HashCache -> ha:
     40:40:void lambda$new$0(java.nio.file.Path) -> f
     22:22:void <clinit>() -> <clinit>
 net.minecraft.data.Main -> net.minecraft.data.Main:
-    27:27:void <init>() -> <init>
-    30:56:void main(java.lang.String[]) -> main
-    59:82:net.minecraft.data.DataGenerator createStandardGenerator(java.nio.file.Path,java.util.Collection,boolean,boolean,boolean,boolean,boolean) -> a
-    54:54:java.nio.file.Path lambda$main$0(java.lang.String) -> a
-net.minecraft.data.advancements.AdvancementProvider -> hb:
+    28:28:void <init>() -> <init>
+    31:57:void main(java.lang.String[]) -> main
+    60:88:net.minecraft.data.DataGenerator createStandardGenerator(java.nio.file.Path,java.util.Collection,boolean,boolean,boolean,boolean,boolean) -> a
+    55:55:java.nio.file.Path lambda$main$0(java.lang.String) -> a
+net.minecraft.data.advancements.AdvancementProvider -> hn:
     org.apache.logging.log4j.Logger LOGGER -> b
     com.google.gson.Gson GSON -> c
     net.minecraft.data.DataGenerator generator -> d
@@ -21551,68 +22988,71 @@ net.minecraft.data.advancements.AdvancementProvider -> hb:
     66:66:java.lang.String getName() -> a
     43:53:void lambda$run$0(java.util.Set,java.nio.file.Path,net.minecraft.data.HashCache,net.minecraft.advancements.Advancement) -> a
     22:23:void <clinit>() -> <clinit>
-net.minecraft.data.advancements.AdventureAdvancements -> hc:
+net.minecraft.data.advancements.AdventureAdvancements -> ho:
     net.minecraft.world.level.biome.Biome[] EXPLORABLE_BIOMES -> a
     net.minecraft.world.entity.EntityType[] MOBS_TO_KILL -> b
-    43:43:void <init>() -> <init>
-    120:238:void accept(java.util.function.Consumer) -> a
-    241:244:net.minecraft.advancements.Advancement$Builder addMobsToKill(net.minecraft.advancements.Advancement$Builder) -> a
-    248:251:net.minecraft.advancements.Advancement$Builder addBiomes(net.minecraft.advancements.Advancement$Builder) -> b
-    43:43:void accept(java.lang.Object) -> accept
-    44:90:void <clinit>() -> <clinit>
-net.minecraft.data.advancements.HusbandryAdvancements -> hd:
+    46:46:void <init>() -> <init>
+    131:256:void accept(java.util.function.Consumer) -> a
+    259:262:net.minecraft.advancements.Advancement$Builder addMobsToKill(net.minecraft.advancements.Advancement$Builder) -> a
+    266:269:net.minecraft.advancements.Advancement$Builder addBiomes(net.minecraft.advancements.Advancement$Builder,net.minecraft.world.level.biome.Biome[]) -> a
+    46:46:void accept(java.lang.Object) -> accept
+    47:93:void <clinit>() -> <clinit>
+net.minecraft.data.advancements.HusbandryAdvancements -> hp:
     net.minecraft.world.entity.EntityType[] BREEDABLE_ANIMALS -> a
     net.minecraft.world.item.Item[] FISH -> b
     net.minecraft.world.item.Item[] FISH_BUCKETS -> c
     net.minecraft.world.item.Item[] EDIBLE_ITEMS -> d
     42:42:void <init>() -> <init>
-    119:196:void accept(java.util.function.Consumer) -> a
-    199:202:net.minecraft.advancements.Advancement$Builder addFood(net.minecraft.advancements.Advancement$Builder) -> a
-    206:209:net.minecraft.advancements.Advancement$Builder addBreedable(net.minecraft.advancements.Advancement$Builder) -> b
-    213:216:net.minecraft.advancements.Advancement$Builder addFishBuckets(net.minecraft.advancements.Advancement$Builder) -> c
-    220:223:net.minecraft.advancements.Advancement$Builder addFish(net.minecraft.advancements.Advancement$Builder) -> d
-    227:229:net.minecraft.advancements.Advancement$Builder addCatVariants(net.minecraft.advancements.Advancement$Builder) -> e
+    123:200:void accept(java.util.function.Consumer) -> a
+    203:206:net.minecraft.advancements.Advancement$Builder addFood(net.minecraft.advancements.Advancement$Builder) -> a
+    210:214:net.minecraft.advancements.Advancement$Builder addBreedable(net.minecraft.advancements.Advancement$Builder) -> b
+    218:221:net.minecraft.advancements.Advancement$Builder addFishBuckets(net.minecraft.advancements.Advancement$Builder) -> c
+    225:228:net.minecraft.advancements.Advancement$Builder addFish(net.minecraft.advancements.Advancement$Builder) -> d
+    232:234:net.minecraft.advancements.Advancement$Builder addCatVariants(net.minecraft.advancements.Advancement$Builder) -> e
     42:42:void accept(java.lang.Object) -> accept
-    227:227:void lambda$addCatVariants$0(net.minecraft.advancements.Advancement$Builder,java.lang.Integer,net.minecraft.resources.ResourceLocation) -> a
-    43:75:void <clinit>() -> <clinit>
-net.minecraft.data.advancements.NetherAdvancements -> he:
-    35:35:void <init>() -> <init>
-    38:119:void accept(java.util.function.Consumer) -> a
-    35:35:void accept(java.lang.Object) -> accept
-net.minecraft.data.advancements.StoryAdvancements -> hf:
-    26:26:void <init>() -> <init>
-    29:131:void accept(java.util.function.Consumer) -> a
-    26:26:void accept(java.lang.Object) -> accept
-net.minecraft.data.advancements.TheEndAdvancements -> hg:
+    232:232:void lambda$addCatVariants$0(net.minecraft.advancements.Advancement$Builder,java.lang.Integer,net.minecraft.resources.ResourceLocation) -> a
+    43:79:void <clinit>() -> <clinit>
+net.minecraft.data.advancements.NetherAdvancements -> hq:
+    net.minecraft.world.level.biome.Biome[] EXPLORABLE_BIOMES -> a
+    net.minecraft.advancements.critereon.EntityPredicate$Composite DISTRACT_PIGLIN_PLAYER_ARMOR_PREDICATE -> b
+    55:55:void <init>() -> <init>
+    73:232:void accept(java.util.function.Consumer) -> a
+    55:55:void accept(java.lang.Object) -> accept
+    56:68:void <clinit>() -> <clinit>
+net.minecraft.data.advancements.StoryAdvancements -> hr:
     29:29:void <init>() -> <init>
-    32:85:void accept(java.util.function.Consumer) -> a
+    32:134:void accept(java.util.function.Consumer) -> a
     29:29:void accept(java.lang.Object) -> accept
-net.minecraft.data.advancements.package-info -> hh:
-net.minecraft.data.info.BlockListReport -> hi:
+net.minecraft.data.advancements.TheEndAdvancements -> hs:
+    30:30:void <init>() -> <init>
+    33:86:void accept(java.util.function.Consumer) -> a
+    30:30:void accept(java.lang.Object) -> accept
+net.minecraft.data.advancements.package-info -> ht:
+net.minecraft.data.info.BlockListReport -> hu:
     com.google.gson.Gson GSON -> b
     net.minecraft.data.DataGenerator generator -> c
     25:27:void <init>(net.minecraft.data.DataGenerator) -> <init>
     31:74:void run(net.minecraft.data.HashCache) -> a
     78:78:java.lang.String getName() -> a
     22:22:void <clinit>() -> <clinit>
-net.minecraft.data.info.CommandsReport -> hj:
+net.minecraft.data.info.CommandsReport -> hv:
     com.google.gson.Gson GSON -> b
     net.minecraft.data.DataGenerator generator -> c
-    32:34:void <init>(net.minecraft.data.DataGenerator) -> <init>
-    38:49:void run(net.minecraft.data.HashCache) -> a
-    53:53:java.lang.String getName() -> a
-    29:29:void <clinit>() -> <clinit>
-net.minecraft.data.info.RegistryDumpReport -> hk:
+    20:22:void <init>(net.minecraft.data.DataGenerator) -> <init>
+    26:29:void run(net.minecraft.data.HashCache) -> a
+    33:33:java.lang.String getName() -> a
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.data.info.RegistryDumpReport -> hw:
     com.google.gson.Gson GSON -> b
     net.minecraft.data.DataGenerator generator -> c
-    22:24:void <init>(net.minecraft.data.DataGenerator) -> <init>
-    28:34:void run(net.minecraft.data.HashCache) -> a
-    37:58:com.google.gson.JsonElement dumpRegistry(net.minecraft.core.WritableRegistry) -> a
+    21:23:void <init>(net.minecraft.data.DataGenerator) -> <init>
+    27:33:void run(net.minecraft.data.HashCache) -> a
+    37:58:com.google.gson.JsonElement dumpRegistry(net.minecraft.core.Registry) -> a
     63:63:java.lang.String getName() -> a
-    30:30:void lambda$run$0(com.google.gson.JsonObject,net.minecraft.resources.ResourceLocation) -> a
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.data.info.package-info -> hl:
-net.minecraft.data.loot.BlockLoot -> hm:
+    29:29:void lambda$run$0(com.google.gson.JsonObject,net.minecraft.resources.ResourceLocation) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.data.info.package-info -> hx:
+net.minecraft.data.loot.BlockLoot -> hy:
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder HAS_SILK_TOUCH -> a
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder HAS_NO_SILK_TOUCH -> b
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder HAS_SHEARS -> c
@@ -21622,138 +23062,141 @@ net.minecraft.data.loot.BlockLoot -> hm:
     float[] NORMAL_LEAVES_SAPLING_CHANCES -> g
     float[] JUNGLE_LEAVES_SAPLING_CHANGES -> h
     java.util.Map map -> i
-    92:137:void <init>() -> <init>
-    140:144:java.lang.Object applyExplosionDecay(net.minecraft.world.level.ItemLike,net.minecraft.world.level.storage.loot.functions.FunctionUserBuilder) -> a
-    148:152:java.lang.Object applyExplosionCondition(net.minecraft.world.level.ItemLike,net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder) -> a
-    156:159:net.minecraft.world.level.storage.loot.LootTable$Builder createSingleItemTable(net.minecraft.world.level.ItemLike) -> a
-    164:169:net.minecraft.world.level.storage.loot.LootTable$Builder createSelfDropDispatchTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> a
-    175:175:net.minecraft.world.level.storage.loot.LootTable$Builder createSilkTouchDispatchTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> a
-    179:179:net.minecraft.world.level.storage.loot.LootTable$Builder createShearsDispatchTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> b
-    183:183:net.minecraft.world.level.storage.loot.LootTable$Builder createSilkTouchOrShearsDispatchTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> c
-    187:187:net.minecraft.world.level.storage.loot.LootTable$Builder createSingleItemTableWithSilkTouch(net.minecraft.world.level.block.Block,net.minecraft.world.level.ItemLike) -> b
-    191:194:net.minecraft.world.level.storage.loot.LootTable$Builder createSingleItemTable(net.minecraft.world.level.ItemLike,net.minecraft.world.level.storage.loot.RandomIntGenerator) -> a
-    199:199:net.minecraft.world.level.storage.loot.LootTable$Builder createSingleItemTableWithSilkTouch(net.minecraft.world.level.block.Block,net.minecraft.world.level.ItemLike,net.minecraft.world.level.storage.loot.RandomIntGenerator) -> a
-    203:207:net.minecraft.world.level.storage.loot.LootTable$Builder createSilkTouchOnlyTable(net.minecraft.world.level.ItemLike) -> b
-    212:219:net.minecraft.world.level.storage.loot.LootTable$Builder createPotFlowerItemTable(net.minecraft.world.level.ItemLike) -> c
-    224:229:net.minecraft.world.level.storage.loot.LootTable$Builder createSlabItemTable(net.minecraft.world.level.block.Block) -> d
-    236:240:net.minecraft.world.level.storage.loot.LootTable$Builder createSinglePropConditionTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
-    246:250:net.minecraft.world.level.storage.loot.LootTable$Builder createNameableBlockEntityTable(net.minecraft.world.level.block.Block) -> e
-    255:265:net.minecraft.world.level.storage.loot.LootTable$Builder createShulkerBoxDrop(net.minecraft.world.level.block.Block) -> f
-    271:277:net.minecraft.world.level.storage.loot.LootTable$Builder createBannerDrop(net.minecraft.world.level.block.Block) -> g
-    284:292:net.minecraft.world.level.storage.loot.LootTable$Builder createBeeNestDrop(net.minecraft.world.level.block.Block) -> h
-    298:307:net.minecraft.world.level.storage.loot.LootTable$Builder createBeeHiveDrop(net.minecraft.world.level.block.Block) -> i
-    313:315:net.minecraft.world.level.storage.loot.LootTable$Builder createOreDrop(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item) -> a
-    321:323:net.minecraft.world.level.storage.loot.LootTable$Builder createMushroomBlockDrop(net.minecraft.world.level.block.Block,net.minecraft.world.level.ItemLike) -> c
-    329:331:net.minecraft.world.level.storage.loot.LootTable$Builder createGrassDrops(net.minecraft.world.level.block.Block) -> j
-    337:348:net.minecraft.world.level.storage.loot.LootTable$Builder createStemDrops(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item) -> b
-    354:358:net.minecraft.world.level.storage.loot.LootTable$Builder createAttachedStemDrops(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item) -> c
-    364:368:net.minecraft.world.level.storage.loot.LootTable$Builder createShearsOnlyDrop(net.minecraft.world.level.ItemLike) -> d
-    373:381:net.minecraft.world.level.storage.loot.LootTable$Builder createLeavesDrops(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,float[]) -> a
-    387:393:net.minecraft.world.level.storage.loot.LootTable$Builder createOakLeavesDrops(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,float[]) -> b
-    399:408:net.minecraft.world.level.storage.loot.LootTable$Builder createCropDrops(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item,net.minecraft.world.item.Item,net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
-    414:414:net.minecraft.world.level.storage.loot.LootTable$Builder noDrop() -> a
-    420:1300:void accept(java.util.function.BiConsumer) -> a
-    1303:1304:void dropPottedContents(net.minecraft.world.level.block.Block) -> a
-    1307:1308:void otherWhenSilkTouch(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> a
-    1311:1312:void dropOther(net.minecraft.world.level.block.Block,net.minecraft.world.level.ItemLike) -> a
-    1315:1316:void dropWhenSilkTouch(net.minecraft.world.level.block.Block) -> b
-    1319:1320:void dropSelf(net.minecraft.world.level.block.Block) -> c
-    1323:1324:void add(net.minecraft.world.level.block.Block,java.util.function.Function) -> a
-    1327:1328:void add(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.LootTable$Builder) -> a
-    92:92:void accept(java.lang.Object) -> accept
-    1303:1303:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$dropPottedContents$74(net.minecraft.world.level.block.Block) -> k
-    1200:1201:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$73(net.minecraft.world.level.block.Block) -> l
-    1193:1196:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$72(net.minecraft.world.level.block.Block) -> m
-    1164:1187:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$71(net.minecraft.world.level.block.Block) -> n
-    1151:1159:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$70(net.minecraft.world.level.block.Block) -> o
-    1143:1147:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$69(net.minecraft.world.level.block.Block) -> p
-    1136:1139:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$68(net.minecraft.world.level.block.Block) -> q
-    1128:1132:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$67(net.minecraft.world.level.block.Block) -> r
-    1120:1124:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$66(net.minecraft.world.level.block.Block) -> s
-    1110:1113:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$65(net.minecraft.world.level.block.Block) -> t
-    1107:1107:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$64(net.minecraft.world.level.block.Block) -> u
-    1106:1106:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$63(net.minecraft.world.level.block.Block) -> v
-    1105:1105:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$62(net.minecraft.world.level.block.Block) -> w
-    1104:1104:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$61(net.minecraft.world.level.block.Block) -> x
-    1091:1094:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$60(net.minecraft.world.level.block.Block) -> y
-    1084:1085:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$59(net.minecraft.world.level.block.Block) -> z
-    1080:1081:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$58(net.minecraft.world.level.block.Block) -> A
-    1072:1075:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$57(net.minecraft.world.level.block.Block) -> B
-    1070:1070:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$56(net.minecraft.world.level.block.Block) -> C
-    1069:1069:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$55(net.minecraft.world.level.block.Block) -> D
-    1068:1068:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$54(net.minecraft.world.level.block.Block) -> E
-    1067:1067:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$53(net.minecraft.world.level.block.Block) -> F
-    1064:1064:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$52(net.minecraft.world.level.block.Block) -> G
-    1063:1063:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$51(net.minecraft.world.level.block.Block) -> H
-    1045:1058:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$50(net.minecraft.world.level.block.Block) -> I
-    1009:1009:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$49(net.minecraft.world.level.block.Block) -> J
-    1008:1008:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$48(net.minecraft.world.level.block.Block) -> K
-    1006:1006:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$47(net.minecraft.world.level.block.Block) -> L
-    1005:1005:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$46(net.minecraft.world.level.block.Block) -> M
-    1004:1004:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$45(net.minecraft.world.level.block.Block) -> N
-    1003:1003:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$44(net.minecraft.world.level.block.Block) -> O
-    988:993:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$43(net.minecraft.world.level.block.Block) -> P
-    918:923:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$42(net.minecraft.world.level.block.Block) -> Q
-    908:914:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$41(net.minecraft.world.level.block.Block) -> R
-    898:903:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$40(net.minecraft.world.level.block.Block) -> S
-    887:887:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$39(net.minecraft.world.level.block.Block) -> T
-    886:886:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$38(net.minecraft.world.level.block.Block) -> U
-    885:885:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$37(net.minecraft.world.level.block.Block) -> V
-    884:884:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$36(net.minecraft.world.level.block.Block) -> W
-    881:881:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$35(net.minecraft.world.level.block.Block) -> X
-    880:880:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$34(net.minecraft.world.level.block.Block) -> Y
-    879:879:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$33(net.minecraft.world.level.block.Block) -> Z
-    878:878:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$32(net.minecraft.world.level.block.Block) -> aa
-    877:877:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$31(net.minecraft.world.level.block.Block) -> ab
-    876:876:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$30(net.minecraft.world.level.block.Block) -> ac
-    875:875:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$29(net.minecraft.world.level.block.Block) -> ad
-    874:874:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$28(net.minecraft.world.level.block.Block) -> ae
-    873:873:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$27(net.minecraft.world.level.block.Block) -> af
-    872:872:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$26(net.minecraft.world.level.block.Block) -> ag
-    871:871:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$25(net.minecraft.world.level.block.Block) -> ah
-    870:870:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$24(net.minecraft.world.level.block.Block) -> ai
-    869:869:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$23(net.minecraft.world.level.block.Block) -> aj
-    868:868:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$22(net.minecraft.world.level.block.Block) -> ak
-    867:867:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$21(net.minecraft.world.level.block.Block) -> al
-    866:866:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$20(net.minecraft.world.level.block.Block) -> am
-    863:863:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$19(net.minecraft.world.level.block.Block) -> an
-    862:862:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$18(net.minecraft.world.level.block.Block) -> ao
-    861:861:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$17(net.minecraft.world.level.block.Block) -> ap
-    860:860:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$16(net.minecraft.world.level.block.Block) -> aq
-    859:859:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$15(net.minecraft.world.level.block.Block) -> ar
-    858:858:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$14(net.minecraft.world.level.block.Block) -> as
-    857:857:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$13(net.minecraft.world.level.block.Block) -> at
-    788:788:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$12(net.minecraft.world.level.block.Block) -> au
-    787:787:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$11(net.minecraft.world.level.block.Block) -> av
-    786:786:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$10(net.minecraft.world.level.block.Block) -> aw
-    785:785:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$9(net.minecraft.world.level.block.Block) -> ax
-    782:782:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$8(net.minecraft.world.level.block.Block) -> ay
-    781:781:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$7(net.minecraft.world.level.block.Block) -> az
-    780:780:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$6(net.minecraft.world.level.block.Block) -> aA
-    779:779:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$5(net.minecraft.world.level.block.Block) -> aB
-    778:778:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$4(net.minecraft.world.level.block.Block) -> aC
-    777:777:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$3(net.minecraft.world.level.block.Block) -> aD
-    776:776:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$2(net.minecraft.world.level.block.Block) -> aE
-    775:775:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$1(net.minecraft.world.level.block.Block) -> aF
-    774:774:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$0(net.minecraft.world.level.block.Block) -> aG
-    93:135:void <clinit>() -> <clinit>
-net.minecraft.data.loot.ChestLoot -> hn:
-    26:26:void <init>() -> <init>
-    29:750:void accept(java.util.function.BiConsumer) -> a
-    26:26:void accept(java.lang.Object) -> accept
-net.minecraft.data.loot.EntityLoot -> ho:
+    95:140:void <init>() -> <init>
+    143:147:java.lang.Object applyExplosionDecay(net.minecraft.world.level.ItemLike,net.minecraft.world.level.storage.loot.functions.FunctionUserBuilder) -> a
+    151:155:java.lang.Object applyExplosionCondition(net.minecraft.world.level.ItemLike,net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder) -> a
+    159:162:net.minecraft.world.level.storage.loot.LootTable$Builder createSingleItemTable(net.minecraft.world.level.ItemLike) -> a
+    167:172:net.minecraft.world.level.storage.loot.LootTable$Builder createSelfDropDispatchTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> a
+    178:178:net.minecraft.world.level.storage.loot.LootTable$Builder createSilkTouchDispatchTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> a
+    182:182:net.minecraft.world.level.storage.loot.LootTable$Builder createShearsDispatchTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> b
+    186:186:net.minecraft.world.level.storage.loot.LootTable$Builder createSilkTouchOrShearsDispatchTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> c
+    190:190:net.minecraft.world.level.storage.loot.LootTable$Builder createSingleItemTableWithSilkTouch(net.minecraft.world.level.block.Block,net.minecraft.world.level.ItemLike) -> b
+    194:197:net.minecraft.world.level.storage.loot.LootTable$Builder createSingleItemTable(net.minecraft.world.level.ItemLike,net.minecraft.world.level.storage.loot.RandomIntGenerator) -> a
+    202:202:net.minecraft.world.level.storage.loot.LootTable$Builder createSingleItemTableWithSilkTouch(net.minecraft.world.level.block.Block,net.minecraft.world.level.ItemLike,net.minecraft.world.level.storage.loot.RandomIntGenerator) -> a
+    206:210:net.minecraft.world.level.storage.loot.LootTable$Builder createSilkTouchOnlyTable(net.minecraft.world.level.ItemLike) -> b
+    215:222:net.minecraft.world.level.storage.loot.LootTable$Builder createPotFlowerItemTable(net.minecraft.world.level.ItemLike) -> c
+    227:232:net.minecraft.world.level.storage.loot.LootTable$Builder createSlabItemTable(net.minecraft.world.level.block.Block) -> e
+    239:243:net.minecraft.world.level.storage.loot.LootTable$Builder createSinglePropConditionTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
+    249:253:net.minecraft.world.level.storage.loot.LootTable$Builder createNameableBlockEntityTable(net.minecraft.world.level.block.Block) -> f
+    258:268:net.minecraft.world.level.storage.loot.LootTable$Builder createShulkerBoxDrop(net.minecraft.world.level.block.Block) -> g
+    274:280:net.minecraft.world.level.storage.loot.LootTable$Builder createBannerDrop(net.minecraft.world.level.block.Block) -> h
+    287:295:net.minecraft.world.level.storage.loot.LootTable$Builder createBeeNestDrop(net.minecraft.world.level.block.Block) -> i
+    301:310:net.minecraft.world.level.storage.loot.LootTable$Builder createBeeHiveDrop(net.minecraft.world.level.block.Block) -> j
+    316:318:net.minecraft.world.level.storage.loot.LootTable$Builder createOreDrop(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item) -> a
+    324:326:net.minecraft.world.level.storage.loot.LootTable$Builder createMushroomBlockDrop(net.minecraft.world.level.block.Block,net.minecraft.world.level.ItemLike) -> c
+    332:334:net.minecraft.world.level.storage.loot.LootTable$Builder createGrassDrops(net.minecraft.world.level.block.Block) -> k
+    340:351:net.minecraft.world.level.storage.loot.LootTable$Builder createStemDrops(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item) -> b
+    357:361:net.minecraft.world.level.storage.loot.LootTable$Builder createAttachedStemDrops(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item) -> c
+    367:371:net.minecraft.world.level.storage.loot.LootTable$Builder createShearsOnlyDrop(net.minecraft.world.level.ItemLike) -> d
+    376:384:net.minecraft.world.level.storage.loot.LootTable$Builder createLeavesDrops(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,float[]) -> a
+    390:396:net.minecraft.world.level.storage.loot.LootTable$Builder createOakLeavesDrops(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,float[]) -> b
+    402:411:net.minecraft.world.level.storage.loot.LootTable$Builder createCropDrops(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item,net.minecraft.world.item.Item,net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
+    417:419:net.minecraft.world.level.storage.loot.LootTable$Builder createDoublePlantShearsDrop(net.minecraft.world.level.block.Block) -> l
+    423:442:net.minecraft.world.level.storage.loot.LootTable$Builder createDoublePlantWithSeedDrops(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> b
+    447:447:net.minecraft.world.level.storage.loot.LootTable$Builder noDrop() -> a
+    453:1420:void accept(java.util.function.BiConsumer) -> a
+    1423:1427:void addNetherVinesDropTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> c
+    1430:1430:net.minecraft.world.level.storage.loot.LootTable$Builder createDoorTable(net.minecraft.world.level.block.Block) -> a
+    1434:1435:void dropPottedContents(net.minecraft.world.level.block.Block) -> b
+    1438:1439:void otherWhenSilkTouch(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> a
+    1442:1443:void dropOther(net.minecraft.world.level.block.Block,net.minecraft.world.level.ItemLike) -> a
+    1446:1447:void dropWhenSilkTouch(net.minecraft.world.level.block.Block) -> c
+    1450:1451:void dropSelf(net.minecraft.world.level.block.Block) -> d
+    1454:1455:void add(net.minecraft.world.level.block.Block,java.util.function.Function) -> a
+    1458:1459:void add(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.LootTable$Builder) -> a
+    95:95:void accept(java.lang.Object) -> accept
+    1434:1434:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$dropPottedContents$73(net.minecraft.world.level.block.Block) -> m
+    1314:1315:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$72(net.minecraft.world.level.block.Block) -> n
+    1307:1310:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$71(net.minecraft.world.level.block.Block) -> o
+    1303:1304:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$70(net.minecraft.world.level.block.Block) -> p
+    1296:1299:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$69(net.minecraft.world.level.block.Block) -> q
+    1267:1290:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$68(net.minecraft.world.level.block.Block) -> r
+    1254:1262:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$67(net.minecraft.world.level.block.Block) -> s
+    1246:1250:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$66(net.minecraft.world.level.block.Block) -> t
+    1239:1242:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$65(net.minecraft.world.level.block.Block) -> u
+    1231:1235:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$64(net.minecraft.world.level.block.Block) -> v
+    1223:1227:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$63(net.minecraft.world.level.block.Block) -> w
+    1213:1216:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$62(net.minecraft.world.level.block.Block) -> x
+    1210:1210:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$61(net.minecraft.world.level.block.Block) -> y
+    1209:1209:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$60(net.minecraft.world.level.block.Block) -> z
+    1208:1208:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$59(net.minecraft.world.level.block.Block) -> A
+    1207:1207:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$58(net.minecraft.world.level.block.Block) -> B
+    1204:1204:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$57(net.minecraft.world.level.block.Block) -> C
+    1203:1203:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$56(net.minecraft.world.level.block.Block) -> D
+    1195:1196:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$55(net.minecraft.world.level.block.Block) -> E
+    1191:1192:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$54(net.minecraft.world.level.block.Block) -> F
+    1183:1186:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$53(net.minecraft.world.level.block.Block) -> G
+    1176:1179:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$52(net.minecraft.world.level.block.Block) -> H
+    1174:1174:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$51(net.minecraft.world.level.block.Block) -> I
+    1173:1173:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$50(net.minecraft.world.level.block.Block) -> J
+    1172:1172:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$49(net.minecraft.world.level.block.Block) -> K
+    1171:1171:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$48(net.minecraft.world.level.block.Block) -> L
+    1168:1168:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$47(net.minecraft.world.level.block.Block) -> M
+    1167:1167:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$46(net.minecraft.world.level.block.Block) -> N
+    1149:1162:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$45(net.minecraft.world.level.block.Block) -> O
+    1113:1113:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$44(net.minecraft.world.level.block.Block) -> P
+    1112:1112:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$43(net.minecraft.world.level.block.Block) -> Q
+    1110:1110:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$42(net.minecraft.world.level.block.Block) -> R
+    1109:1109:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$41(net.minecraft.world.level.block.Block) -> S
+    1108:1108:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$40(net.minecraft.world.level.block.Block) -> T
+    1107:1107:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$39(net.minecraft.world.level.block.Block) -> U
+    1092:1097:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$38(net.minecraft.world.level.block.Block) -> V
+    1021:1026:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$37(net.minecraft.world.level.block.Block) -> W
+    1011:1017:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$36(net.minecraft.world.level.block.Block) -> X
+    1001:1006:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$35(net.minecraft.world.level.block.Block) -> Y
+    990:990:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$34(net.minecraft.world.level.block.Block) -> Z
+    989:989:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$33(net.minecraft.world.level.block.Block) -> aa
+    988:988:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$32(net.minecraft.world.level.block.Block) -> ab
+    987:987:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$31(net.minecraft.world.level.block.Block) -> ac
+    984:984:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$30(net.minecraft.world.level.block.Block) -> ad
+    983:983:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$29(net.minecraft.world.level.block.Block) -> ae
+    982:982:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$28(net.minecraft.world.level.block.Block) -> af
+    981:981:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$27(net.minecraft.world.level.block.Block) -> ag
+    980:980:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$26(net.minecraft.world.level.block.Block) -> ah
+    979:979:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$25(net.minecraft.world.level.block.Block) -> ai
+    978:978:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$24(net.minecraft.world.level.block.Block) -> aj
+    977:977:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$23(net.minecraft.world.level.block.Block) -> ak
+    976:976:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$22(net.minecraft.world.level.block.Block) -> al
+    975:975:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$21(net.minecraft.world.level.block.Block) -> am
+    974:974:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$20(net.minecraft.world.level.block.Block) -> an
+    973:973:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$19(net.minecraft.world.level.block.Block) -> ao
+    972:972:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$18(net.minecraft.world.level.block.Block) -> ap
+    971:971:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$17(net.minecraft.world.level.block.Block) -> aq
+    970:970:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$16(net.minecraft.world.level.block.Block) -> ar
+    969:969:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$15(net.minecraft.world.level.block.Block) -> as
+    880:880:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$14(net.minecraft.world.level.block.Block) -> at
+    879:879:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$13(net.minecraft.world.level.block.Block) -> au
+    878:878:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$12(net.minecraft.world.level.block.Block) -> av
+    877:877:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$11(net.minecraft.world.level.block.Block) -> aw
+    874:874:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$10(net.minecraft.world.level.block.Block) -> ax
+    873:873:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$9(net.minecraft.world.level.block.Block) -> ay
+    872:872:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$8(net.minecraft.world.level.block.Block) -> az
+    871:871:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$7(net.minecraft.world.level.block.Block) -> aA
+    870:870:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$6(net.minecraft.world.level.block.Block) -> aB
+    869:869:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$5(net.minecraft.world.level.block.Block) -> aC
+    868:868:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$4(net.minecraft.world.level.block.Block) -> aD
+    867:867:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$3(net.minecraft.world.level.block.Block) -> aE
+    866:866:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$2(net.minecraft.world.level.block.Block) -> aF
+    865:865:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$1(net.minecraft.world.level.block.Block) -> aG
+    864:864:net.minecraft.world.level.storage.loot.LootTable$Builder lambda$accept$0(net.minecraft.world.level.block.Block) -> aH
+    96:138:void <clinit>() -> <clinit>
+net.minecraft.data.loot.ChestLoot -> hz:
+    30:30:void <init>() -> <init>
+    33:925:void accept(java.util.function.BiConsumer) -> a
+    30:30:void accept(java.lang.Object) -> accept
+net.minecraft.data.loot.EntityLoot -> ia:
     net.minecraft.advancements.critereon.EntityPredicate$Builder ENTITY_ON_FIRE -> a
     java.util.Set SPECIAL_LOOT_TABLE_TYPES -> b
     java.util.Map map -> c
     48:66:void <init>() -> <init>
     55:62:net.minecraft.world.level.storage.loot.LootTable$Builder createSheepTable(net.minecraft.world.level.ItemLike) -> a
-    70:728:void accept(java.util.function.BiConsumer) -> a
-    731:732:void add(net.minecraft.world.entity.EntityType,net.minecraft.world.level.storage.loot.LootTable$Builder) -> a
-    735:736:void add(net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable$Builder) -> a
+    70:761:void accept(java.util.function.BiConsumer) -> a
+    764:765:void add(net.minecraft.world.entity.EntityType,net.minecraft.world.level.storage.loot.LootTable$Builder) -> a
+    768:769:void add(net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable$Builder) -> a
     48:48:void accept(java.lang.Object) -> accept
     558:558:void lambda$accept$0(net.minecraft.nbt.CompoundTag) -> a
     49:50:void <clinit>() -> <clinit>
-net.minecraft.data.loot.FishingLoot -> hp:
+net.minecraft.data.loot.FishingLoot -> ib:
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder IN_JUNGLE -> a
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder IN_JUNGLE_HILLS -> b
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder IN_JUNGLE_EDGE -> c
@@ -21761,12 +23204,12 @@ net.minecraft.data.loot.FishingLoot -> hp:
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder IN_MODIFIED_JUNGLE -> e
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder IN_MODIFIED_JUNGLE_EDGE -> f
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder IN_BAMBOO_JUNGLE_HILLS -> g
-    29:29:void <init>() -> <init>
-    40:101:void accept(java.util.function.BiConsumer) -> a
-    29:29:void accept(java.lang.Object) -> accept
-    67:67:void lambda$accept$0(net.minecraft.nbt.CompoundTag) -> a
-    30:36:void <clinit>() -> <clinit>
-net.minecraft.data.loot.GiftLoot -> hq:
+    33:33:void <init>() -> <init>
+    44:106:void accept(java.util.function.BiConsumer) -> a
+    33:33:void accept(java.lang.Object) -> accept
+    73:73:void lambda$accept$0(net.minecraft.nbt.CompoundTag) -> a
+    34:40:void <clinit>() -> <clinit>
+net.minecraft.data.loot.GiftLoot -> ic:
     21:21:void <init>() -> <init>
     24:174:void accept(java.util.function.BiConsumer) -> a
     21:21:void accept(java.lang.Object) -> accept
@@ -21783,50 +23226,903 @@ net.minecraft.data.loot.GiftLoot -> hq:
     99:99:void lambda$accept$2(net.minecraft.nbt.CompoundTag) -> k
     98:98:void lambda$accept$1(net.minecraft.nbt.CompoundTag) -> l
     97:97:void lambda$accept$0(net.minecraft.nbt.CompoundTag) -> m
-net.minecraft.data.loot.LootTableProvider -> hr:
+net.minecraft.data.loot.LootTableProvider -> id:
     org.apache.logging.log4j.Logger LOGGER -> b
     com.google.gson.Gson GSON -> c
     net.minecraft.data.DataGenerator generator -> d
     java.util.List subProviders -> e
-    37:47:void <init>(net.minecraft.data.DataGenerator) -> <init>
-    51:87:void run(net.minecraft.data.HashCache) -> a
-    90:90:java.nio.file.Path createPath(java.nio.file.Path,net.minecraft.resources.ResourceLocation) -> a
-    95:95:java.lang.String getName() -> a
-    80:86:void lambda$run$5(java.nio.file.Path,net.minecraft.data.HashCache,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable) -> a
-    75:75:void lambda$run$4(java.lang.String,java.lang.String) -> a
-    71:71:void lambda$run$3(net.minecraft.world.level.storage.loot.ValidationContext,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable) -> a
-    63:63:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$run$2(net.minecraft.resources.ResourceLocation) -> a
-    56:56:void lambda$run$1(java.util.Map,com.mojang.datafixers.util.Pair) -> a
-    57:60:void lambda$null$0(java.util.Map,com.mojang.datafixers.util.Pair,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable$Builder) -> a
+    37:48:void <init>(net.minecraft.data.DataGenerator) -> <init>
+    52:88:void run(net.minecraft.data.HashCache) -> a
+    91:91:java.nio.file.Path createPath(java.nio.file.Path,net.minecraft.resources.ResourceLocation) -> a
+    96:96:java.lang.String getName() -> a
+    81:87:void lambda$run$5(java.nio.file.Path,net.minecraft.data.HashCache,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable) -> a
+    76:76:void lambda$run$4(java.lang.String,java.lang.String) -> a
+    72:72:void lambda$run$3(net.minecraft.world.level.storage.loot.ValidationContext,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable) -> a
+    64:64:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$run$2(net.minecraft.resources.ResourceLocation) -> a
+    57:57:void lambda$run$1(java.util.Map,com.mojang.datafixers.util.Pair) -> a
+    58:61:void lambda$null$0(java.util.Map,com.mojang.datafixers.util.Pair,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable$Builder) -> a
     33:34:void <clinit>() -> <clinit>
-net.minecraft.data.loot.package-info -> hs:
-net.minecraft.data.package-info -> ht:
-net.minecraft.data.recipes.FinishedRecipe -> hu:
+net.minecraft.data.loot.PiglinBarterLoot -> ie:
+    23:23:void <init>() -> <init>
+    26:59:void accept(java.util.function.BiConsumer) -> a
+    23:23:void accept(java.lang.Object) -> accept
+    39:39:void lambda$accept$1(net.minecraft.nbt.CompoundTag) -> a
+    38:38:void lambda$accept$0(net.minecraft.nbt.CompoundTag) -> b
+net.minecraft.data.loot.package-info -> ig:
+net.minecraft.data.models.BlockModelGenerators -> ih:
+    java.util.function.Consumer blockStateOutput -> a
+    java.util.function.BiConsumer modelOutput -> b
+    java.util.function.Consumer skippedAutoModelsOutput -> c
+    81:85:void <init>(java.util.function.Consumer,java.util.function.BiConsumer,java.util.function.Consumer) -> <init>
+    88:89:void skipAutoItemBlock(net.minecraft.world.level.block.Block) -> a
+    92:93:void delegateItemModel(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation) -> c
+    96:97:void delegateItemModel(net.minecraft.world.item.Item,net.minecraft.resources.ResourceLocation) -> a
+    100:101:void createSimpleFlatItemModel(net.minecraft.world.item.Item) -> a
+    104:108:void createSimpleFlatItemModel(net.minecraft.world.level.block.Block) -> b
+    111:113:void createSimpleFlatItemModel(net.minecraft.world.level.block.Block,java.lang.String) -> a
+    116:120:net.minecraft.data.models.blockstates.PropertyDispatch createHorizontalFacingDispatch() -> b
+    124:128:net.minecraft.data.models.blockstates.PropertyDispatch createHorizontalFacingDispatchAlt() -> c
+    132:136:net.minecraft.data.models.blockstates.PropertyDispatch createTorchHorizontalDispatch() -> d
+    140:146:net.minecraft.data.models.blockstates.PropertyDispatch createFacingDispatch() -> e
+    150:150:net.minecraft.data.models.blockstates.MultiVariantGenerator createRotatedVariant(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation) -> d
+    154:157:net.minecraft.data.models.blockstates.Variant[] createRotatedVariants(net.minecraft.resources.ResourceLocation) -> a
+    161:165:net.minecraft.data.models.blockstates.MultiVariantGenerator createRotatedVariant(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> e
+    170:172:net.minecraft.data.models.blockstates.PropertyDispatch createBooleanModelDispatch(net.minecraft.world.level.block.state.properties.BooleanProperty,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> a
+    176:179:void createRotatedMirroredVariantBlock(net.minecraft.world.level.block.Block) -> c
+    182:184:void createRotatedVariantBlock(net.minecraft.world.level.block.Block) -> d
+    187:208:net.minecraft.data.models.blockstates.BlockStateGenerator createButton(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> f
+    213:232:net.minecraft.data.models.blockstates.PropertyDispatch$C4 configureDoorHalf(net.minecraft.data.models.blockstates.PropertyDispatch$C4,net.minecraft.world.level.block.state.properties.DoubleBlockHalf,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> a
+    236:239:net.minecraft.data.models.blockstates.BlockStateGenerator createDoor(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> b
+    246:251:net.minecraft.data.models.blockstates.BlockStateGenerator createFence(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> g
+    255:266:net.minecraft.data.models.blockstates.BlockStateGenerator createWall(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> d
+    271:278:net.minecraft.data.models.blockstates.BlockStateGenerator createFenceGate(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> c
+    283:325:net.minecraft.data.models.blockstates.BlockStateGenerator createStairs(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> e
+    331:349:net.minecraft.data.models.blockstates.BlockStateGenerator createOrientableTrapdoor(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> f
+    354:372:net.minecraft.data.models.blockstates.BlockStateGenerator createTrapdoor(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> g
+    377:377:net.minecraft.data.models.blockstates.MultiVariantGenerator createSimpleBlock(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation) -> e
+    381:384:net.minecraft.data.models.blockstates.PropertyDispatch createRotatedPillar() -> f
+    388:388:net.minecraft.data.models.blockstates.BlockStateGenerator createAxisAlignedPillarBlock(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation) -> f
+    392:394:void createAxisAlignedPillarBlock(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TexturedModel$Provider) -> a
+    397:399:void createHorizontallyRotatedBlock(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TexturedModel$Provider) -> b
+    402:407:net.minecraft.data.models.blockstates.BlockStateGenerator createRotatedPillarWithHorizontalVariant(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> h
+    412:415:void createRotatedPillarWithHorizontalVariant(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TexturedModel$Provider,net.minecraft.data.models.model.TexturedModel$Provider) -> a
+    418:418:net.minecraft.resources.ResourceLocation createSuffixedVariant(net.minecraft.world.level.block.Block,java.lang.String,net.minecraft.data.models.model.ModelTemplate,java.util.function.Function) -> a
+    422:423:net.minecraft.data.models.blockstates.BlockStateGenerator createPressurePlate(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> i
+    427:432:net.minecraft.data.models.blockstates.BlockStateGenerator createSlab(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> h
+    437:438:void createTrivialCube(net.minecraft.world.level.block.Block) -> e
+    441:442:void createTrivialBlock(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TexturedModel$Provider) -> c
+    445:447:void createTrivialBlock(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TextureMapping,net.minecraft.data.models.model.ModelTemplate) -> a
+    548:548:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider family(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TexturedModel) -> a
+    552:553:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider family(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TexturedModel$Provider) -> d
+    557:557:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider family(net.minecraft.world.level.block.Block) -> f
+    561:561:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider family(net.minecraft.data.models.model.TextureMapping) -> a
+    565:573:void createDoor(net.minecraft.world.level.block.Block) -> g
+    576:583:void createOrientableTrapdoor(net.minecraft.world.level.block.Block) -> h
+    586:593:void createTrapdoor(net.minecraft.world.level.block.Block) -> i
+    626:626:net.minecraft.data.models.BlockModelGenerators$WoodProvider woodProvider(net.minecraft.world.level.block.Block) -> j
+    630:631:void createNonTemplateModelBlock(net.minecraft.world.level.block.Block) -> k
+    634:635:void createNonTemplateModelBlock(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> a
+    650:652:void createCrossBlockWithDefaultItem(net.minecraft.world.level.block.Block,net.minecraft.data.models.BlockModelGenerators$TintState) -> a
+    655:657:void createCrossBlockWithDefaultItem(net.minecraft.world.level.block.Block,net.minecraft.data.models.BlockModelGenerators$TintState,net.minecraft.data.models.model.TextureMapping) -> a
+    660:662:void createCrossBlock(net.minecraft.world.level.block.Block,net.minecraft.data.models.BlockModelGenerators$TintState) -> b
+    665:667:void createCrossBlock(net.minecraft.world.level.block.Block,net.minecraft.data.models.BlockModelGenerators$TintState,net.minecraft.data.models.model.TextureMapping) -> b
+    670:675:void createPlant(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.data.models.BlockModelGenerators$TintState) -> a
+    678:687:void createCoralFans(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> b
+    690:711:void createStems(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> c
+    714:722:void createCoral(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> a
+    725:729:void createDoublePlant(net.minecraft.world.level.block.Block,net.minecraft.data.models.BlockModelGenerators$TintState) -> c
+    732:736:void createSunflower() -> g
+    739:742:void createTallSeagrass() -> h
+    745:752:void createDoubleBlock(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> j
+    755:781:void createPassiveRail(net.minecraft.world.level.block.Block) -> l
+    784:815:void createActiveRail(net.minecraft.world.level.block.Block) -> m
+    847:847:net.minecraft.data.models.BlockModelGenerators$BlockEntityModelGenerator blockEntityModels(net.minecraft.resources.ResourceLocation,net.minecraft.world.level.block.Block) -> a
+    851:851:net.minecraft.data.models.BlockModelGenerators$BlockEntityModelGenerator blockEntityModels(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> d
+    855:857:void createAirLikeBlock(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item) -> a
+    860:862:void createAirLikeBlock(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation) -> g
+    865:870:void createWoolBlocks(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> e
+    873:877:void createColoredBlockWithRandomRotations(net.minecraft.data.models.model.TexturedModel$Provider,net.minecraft.world.level.block.Block[]) -> a
+    880:887:void createColoredBlockWithStateRotations(net.minecraft.data.models.model.TexturedModel$Provider,net.minecraft.world.level.block.Block[]) -> b
+    890:915:void createGlassBlocks(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> f
+    918:927:void createCommandBlock(net.minecraft.world.level.block.Block) -> n
+    930:932:void createAnvil(net.minecraft.world.level.block.Block) -> o
+    935:938:java.util.List createBambooModels(int) -> a
+    942:954:void createBamboo() -> i
+    957:963:net.minecraft.data.models.blockstates.PropertyDispatch createColumnWithFacing() -> j
+    967:977:void createBarrel() -> k
+    980:983:net.minecraft.data.models.blockstates.PropertyDispatch createEmptyOrFullDispatch(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> a
+    990:1001:void createBeeNest(net.minecraft.world.level.block.Block,java.util.function.Function) -> a
+    1004:1018:void createCropBlock(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.state.properties.Property,int[]) -> a
+    1021:1052:void createBell() -> l
+    1055:1075:void createGrindstone() -> m
+    1078:1088:void createFurnace(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TexturedModel$Provider) -> e
+    1091:1103:void createCampfires(net.minecraft.world.level.block.Block[]) -> a
+    1106:1109:void createBookshelf() -> n
+    1112:1174:void createRedstoneWire() -> o
+    1177:1189:void createComparator() -> p
+    1192:1202:void createSmoothStoneSlab() -> q
+    1205:1217:void createBrewingStand() -> r
+    1220:1241:void createMushroomBlock(net.minecraft.world.level.block.Block) -> p
+    1244:1258:void createCakeBlock() -> s
+    1261:1271:void createCartographyTable() -> t
+    1274:1284:void createSmithingTable() -> u
+    1287:1289:void createCraftingTableLike(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,java.util.function.BiFunction) -> a
+    1292:1298:void createPumpkins() -> v
+    1301:1303:void createPumpkinVariant(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TextureMapping) -> a
+    1306:1317:void createCauldron() -> w
+    1320:1325:void createChiseledSandsone(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> g
+    1328:1336:void createChorusFlower() -> x
+    1339:1365:void createDispenserBlock(net.minecraft.world.level.block.Block) -> q
+    1368:1382:void createEndPortalFrame() -> y
+    1385:1442:void createChorusPlant() -> z
+    1445:1457:void createComposter() -> A
+    1460:1466:void createNyliumBlock(net.minecraft.world.level.block.Block) -> r
+    1469:1481:void createDaylightDetector() -> B
+    1484:1488:void createEndRod() -> C
+    1491:1501:void createFarmland() -> D
+    1504:1507:java.util.List createFloorFireModels(net.minecraft.world.level.block.Block) -> s
+    1511:1517:java.util.List createSideFireModels(net.minecraft.world.level.block.Block) -> t
+    1521:1527:java.util.List createTopFireModels(net.minecraft.world.level.block.Block) -> u
+    1531:1531:java.util.List wrapModels(java.util.List,java.util.function.UnaryOperator) -> a
+    1535:1572:void createFire() -> E
+    1575:1586:void createSoulFire() -> F
+    1589:1597:void createLantern(net.minecraft.world.level.block.Block) -> v
+    1600:1610:void createFrostedIce() -> G
+    1613:1629:void createGrassBlocks() -> H
+    1632:1641:void createGrassLikeBlock(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.data.models.blockstates.Variant) -> a
+    1644:1655:void createCocoa() -> I
+    1658:1659:void createGrassPath() -> J
+    1662:1670:void createWeightedPressurePlate(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> h
+    1673:1689:void createHopper() -> K
+    1692:1695:void copyModel(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> i
+    1698:1754:void createIronBars() -> L
+    1757:1761:void createNonTemplateHorizontalBlock(net.minecraft.world.level.block.Block) -> w
+    1764:1791:void createLever() -> M
+    1794:1796:void createLilyPad() -> N
+    1799:1807:void createNetherPortalBlock() -> O
+    1810:1835:void createNetherrack() -> P
+    1838:1846:void createObserver() -> Q
+    1849:1869:void createPistons() -> R
+    1872:1878:void createPistonVariant(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.data.models.model.TextureMapping) -> a
+    1881:1901:void createPistonHeads() -> S
+    1904:1911:void createScaffolding() -> T
+    1914:1921:void createRedstoneLamp() -> U
+    1924:1934:void createNormalTorch(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> j
+    1937:1958:void createRedstoneTorch() -> V
+    1961:1980:void createRepeater() -> W
+    1983:2001:void createSeaPickle() -> X
+    2004:2017:void createSnowBlocks() -> Y
+    2020:2024:void createStonecutter() -> Z
+    2027:2038:void createStructureBlock() -> aa
+    2041:2051:void createSweetBerryBush() -> ab
+    2054:2112:void createTripwire() -> ac
+    2115:2124:void createTripwireHook() -> ad
+    2127:2137:net.minecraft.resources.ResourceLocation createTurtleEggModel(int,java.lang.String,net.minecraft.data.models.model.TextureMapping) -> a
+    2142:2150:net.minecraft.resources.ResourceLocation createTurtleEggModel(java.lang.Integer,java.lang.Integer) -> a
+    2155:2163:void createTurtleEgg() -> ae
+    2166:2214:void createVine() -> af
+    2217:2218:void createMagmaBlock() -> ag
+    2221:2223:void createShulkerBox(net.minecraft.world.level.block.Block) -> x
+    2226:2228:void createGrowingPlant(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.data.models.BlockModelGenerators$TintState) -> b
+    2231:2232:void createBedItem(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> k
+    2235:2239:void createInfestedStone() -> ah
+    2242:2246:void createNetherRoots(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> l
+    2249:2269:void createRespawnAnchor() -> ai
+    2272:2299:net.minecraft.data.models.blockstates.Variant applyRotation(net.minecraft.core.FrontAndTop,net.minecraft.data.models.blockstates.Variant) -> a
+    2304:2328:void createJigsaw() -> aj
+    2331:3118:void run() -> a
+    3117:3117:void lambda$run$36(net.minecraft.world.item.SpawnEggItem) -> a
+    3002:3002:void lambda$run$35(net.minecraft.data.models.model.TextureMapping) -> b
+    2990:2990:void lambda$run$34(net.minecraft.data.models.model.TextureMapping) -> c
+    2934:2937:net.minecraft.resources.ResourceLocation lambda$run$33(net.minecraft.data.models.model.TextureMapping) -> d
+    2411:2411:void lambda$run$32(net.minecraft.data.models.model.TextureMapping) -> e
+    2325:2325:net.minecraft.data.models.blockstates.Variant lambda$createJigsaw$31(net.minecraft.core.FrontAndTop) -> a
+    2265:2265:net.minecraft.data.models.blockstates.Variant lambda$createRespawnAnchor$30(net.minecraft.resources.ResourceLocation[],java.lang.Integer) -> a
+    2160:2160:java.util.List lambda$createTurtleEgg$29(java.lang.Integer,java.lang.Integer) -> b
+    2120:2120:net.minecraft.data.models.blockstates.Variant lambda$createTripwireHook$28(java.lang.Boolean,java.lang.Boolean) -> a
+    2047:2047:net.minecraft.data.models.blockstates.Variant lambda$createSweetBerryBush$27(java.lang.Integer) -> a
+    2034:2034:net.minecraft.data.models.blockstates.Variant lambda$createStructureBlock$26(net.minecraft.world.level.block.state.properties.StructureMode) -> a
+    2011:2011:net.minecraft.data.models.blockstates.Variant lambda$createSnowBlocks$25(net.minecraft.resources.ResourceLocation,java.lang.Integer) -> a
+    1967:1975:net.minecraft.data.models.blockstates.Variant lambda$createRepeater$24(java.lang.Integer,java.lang.Boolean,java.lang.Boolean) -> a
+    1627:1627:void lambda$createGrassBlocks$23(net.minecraft.resources.ResourceLocation,net.minecraft.data.models.model.TextureMapping) -> a
+    1624:1624:void lambda$createGrassBlocks$22(net.minecraft.resources.ResourceLocation,net.minecraft.data.models.model.TextureMapping) -> b
+    1584:1584:net.minecraft.data.models.blockstates.Variant lambda$createSoulFire$21(net.minecraft.data.models.blockstates.Variant) -> a
+    1583:1583:net.minecraft.data.models.blockstates.Variant lambda$createSoulFire$20(net.minecraft.data.models.blockstates.Variant) -> b
+    1582:1582:net.minecraft.data.models.blockstates.Variant lambda$createSoulFire$19(net.minecraft.data.models.blockstates.Variant) -> c
+    1581:1581:net.minecraft.data.models.blockstates.Variant lambda$createSoulFire$18(net.minecraft.data.models.blockstates.Variant) -> d
+    1580:1580:net.minecraft.data.models.blockstates.Variant lambda$createSoulFire$17(net.minecraft.data.models.blockstates.Variant) -> e
+    1569:1569:net.minecraft.data.models.blockstates.Variant lambda$createFire$16(net.minecraft.data.models.blockstates.Variant) -> f
+    1565:1565:net.minecraft.data.models.blockstates.Variant lambda$createFire$15(net.minecraft.data.models.blockstates.Variant) -> g
+    1561:1561:net.minecraft.data.models.blockstates.Variant lambda$createFire$14(net.minecraft.data.models.blockstates.Variant) -> h
+    1557:1557:net.minecraft.data.models.blockstates.Variant lambda$createFire$13(net.minecraft.data.models.blockstates.Variant) -> i
+    1553:1553:net.minecraft.data.models.blockstates.Variant lambda$createFire$12(net.minecraft.data.models.blockstates.Variant) -> j
+    1549:1549:net.minecraft.data.models.blockstates.Variant lambda$createFire$11(net.minecraft.data.models.blockstates.Variant) -> k
+    1531:1531:net.minecraft.data.models.blockstates.Variant lambda$wrapModels$10(net.minecraft.resources.ResourceLocation) -> b
+    1330:1330:net.minecraft.data.models.model.TextureMapping lambda$createChorusFlower$9(net.minecraft.data.models.model.TextureMapping,net.minecraft.resources.ResourceLocation) -> a
+    1081:1081:void lambda$createFurnace$8(net.minecraft.resources.ResourceLocation,net.minecraft.data.models.model.TextureMapping) -> c
+    1011:1013:net.minecraft.data.models.blockstates.Variant lambda$createCropBlock$7(int[],it.unimi.dsi.fastutil.ints.Int2ObjectMap,net.minecraft.world.level.block.Block,java.lang.Integer) -> a
+    1012:1012:net.minecraft.resources.ResourceLocation lambda$null$6(net.minecraft.world.level.block.Block,int,int) -> a
+    984:985:net.minecraft.data.models.blockstates.Variant lambda$createEmptyOrFullDispatch$5(java.lang.Comparable,net.minecraft.data.models.blockstates.Variant,net.minecraft.data.models.blockstates.Variant,java.lang.Comparable) -> a
+    974:974:void lambda$createBarrel$4(net.minecraft.resources.ResourceLocation,net.minecraft.data.models.model.TextureMapping) -> d
+    937:937:net.minecraft.data.models.blockstates.Variant lambda$createBambooModels$3(java.lang.String,int) -> a
+    921:921:net.minecraft.data.models.model.TextureMapping lambda$createCommandBlock$2(net.minecraft.data.models.model.TextureMapping,net.minecraft.resources.ResourceLocation) -> b
+    795:809:net.minecraft.data.models.blockstates.Variant lambda$createActiveRail$1(net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,java.lang.Boolean,net.minecraft.world.level.block.state.properties.RailShape) -> a
+    708:708:net.minecraft.data.models.blockstates.Variant lambda$createStems$0(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TextureMapping,java.lang.Integer) -> a
+    75:75:java.util.function.BiConsumer access$000(net.minecraft.data.models.BlockModelGenerators) -> a
+    75:75:net.minecraft.data.models.blockstates.MultiVariantGenerator access$100(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation) -> a
+    75:75:java.util.function.Consumer access$200(net.minecraft.data.models.BlockModelGenerators) -> b
+    75:75:net.minecraft.data.models.blockstates.BlockStateGenerator access$300(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> a
+    75:75:void access$400(net.minecraft.data.models.BlockModelGenerators,net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation) -> a
+    75:75:net.minecraft.data.models.blockstates.BlockStateGenerator access$500(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> a
+    75:75:net.minecraft.data.models.blockstates.BlockStateGenerator access$600(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> b
+    75:75:net.minecraft.data.models.blockstates.BlockStateGenerator access$700(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> a
+    75:75:net.minecraft.data.models.blockstates.BlockStateGenerator access$800(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> c
+    75:75:void access$900(net.minecraft.data.models.BlockModelGenerators,net.minecraft.world.item.Item) -> a
+    75:75:void access$1000(net.minecraft.data.models.BlockModelGenerators,net.minecraft.world.level.block.Block) -> a
+    75:75:net.minecraft.data.models.blockstates.BlockStateGenerator access$1100(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> b
+    75:75:net.minecraft.data.models.blockstates.BlockStateGenerator access$1200(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> c
+    75:75:net.minecraft.data.models.blockstates.BlockStateGenerator access$1300(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation) -> b
+    75:75:net.minecraft.data.models.blockstates.BlockStateGenerator access$1400(net.minecraft.world.level.block.Block,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> d
+net.minecraft.data.models.BlockModelGenerators$1 -> ih$1:
+    int[] $SwitchMap$net$minecraft$core$FrontAndTop -> a
+    int[] $SwitchMap$net$minecraft$world$level$block$state$properties$RailShape -> b
+    795:2272:void <clinit>() -> <clinit>
+net.minecraft.data.models.BlockModelGenerators$BlockEntityModelGenerator -> ih$a:
+    net.minecraft.resources.ResourceLocation baseModel -> b
+    net.minecraft.data.models.BlockModelGenerators this$0 -> a
+    820:822:void <init>(net.minecraft.data.models.BlockModelGenerators,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.block.Block) -> <init>
+    825:828:net.minecraft.data.models.BlockModelGenerators$BlockEntityModelGenerator create(net.minecraft.world.level.block.Block[]) -> a
+    832:835:net.minecraft.data.models.BlockModelGenerators$BlockEntityModelGenerator createWithoutBlockItem(net.minecraft.world.level.block.Block[]) -> b
+    839:842:net.minecraft.data.models.BlockModelGenerators$BlockEntityModelGenerator createWithCustomBlockItemModel(net.minecraft.data.models.model.ModelTemplate,net.minecraft.world.level.block.Block[]) -> a
+net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider -> ih$b:
+    net.minecraft.data.models.model.TextureMapping mapping -> b
+    net.minecraft.resources.ResourceLocation fullBlock -> c
+    net.minecraft.data.models.BlockModelGenerators this$0 -> a
+    455:457:void <init>(net.minecraft.data.models.BlockModelGenerators,net.minecraft.data.models.model.TextureMapping) -> <init>
+    460:462:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider fullBlock(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.ModelTemplate) -> a
+    466:467:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider fullBlock(java.util.function.Function) -> a
+    471:477:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider button(net.minecraft.world.level.block.Block) -> a
+    481:488:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider wall(net.minecraft.world.level.block.Block) -> b
+    492:498:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider fence(net.minecraft.world.level.block.Block) -> c
+    502:507:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider fenceGate(net.minecraft.world.level.block.Block) -> d
+    511:514:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider pressurePlate(net.minecraft.world.level.block.Block) -> e
+    518:523:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider sign(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> a
+    527:533:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider slab(net.minecraft.world.level.block.Block) -> f
+    537:542:net.minecraft.data.models.BlockModelGenerators$BlockFamilyProvider stairs(net.minecraft.world.level.block.Block) -> g
+net.minecraft.data.models.BlockModelGenerators$TintState -> ih$c:
+    net.minecraft.data.models.BlockModelGenerators$TintState TINTED -> a
+    net.minecraft.data.models.BlockModelGenerators$TintState NOT_TINTED -> b
+    net.minecraft.data.models.BlockModelGenerators$TintState[] $VALUES -> c
+    637:637:net.minecraft.data.models.BlockModelGenerators$TintState[] values() -> values
+    637:637:net.minecraft.data.models.BlockModelGenerators$TintState valueOf(java.lang.String) -> valueOf
+    637:637:void <init>(java.lang.String,int) -> <init>
+    641:641:net.minecraft.data.models.model.ModelTemplate getCross() -> a
+    645:645:net.minecraft.data.models.model.ModelTemplate getCrossPot() -> b
+    637:638:void <clinit>() -> <clinit>
+net.minecraft.data.models.BlockModelGenerators$WoodProvider -> ih$d:
+    net.minecraft.data.models.model.TextureMapping logMapping -> b
+    net.minecraft.data.models.BlockModelGenerators this$0 -> a
+    599:601:void <init>(net.minecraft.data.models.BlockModelGenerators,net.minecraft.data.models.model.TextureMapping) -> <init>
+    604:607:net.minecraft.data.models.BlockModelGenerators$WoodProvider wood(net.minecraft.world.level.block.Block) -> a
+    611:613:net.minecraft.data.models.BlockModelGenerators$WoodProvider log(net.minecraft.world.level.block.Block) -> b
+    617:620:net.minecraft.data.models.BlockModelGenerators$WoodProvider logWithHorizontal(net.minecraft.world.level.block.Block) -> c
+net.minecraft.data.models.ItemModelGenerators -> ii:
+    java.util.function.BiConsumer output -> a
+    19:21:void <init>(java.util.function.BiConsumer) -> <init>
+    24:25:void generateFlatItem(net.minecraft.world.item.Item,net.minecraft.data.models.model.ModelTemplate) -> a
+    28:29:void generateFlatItem(net.minecraft.world.item.Item,java.lang.String,net.minecraft.data.models.model.ModelTemplate) -> a
+    33:34:void generateFlatItem(net.minecraft.world.item.Item,net.minecraft.world.item.Item,net.minecraft.data.models.model.ModelTemplate) -> a
+    37:272:void run() -> a
+net.minecraft.data.models.ModelProvider -> ij:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    com.google.gson.Gson GSON -> c
+    net.minecraft.data.DataGenerator generator -> d
+    37:39:void <init>(net.minecraft.data.DataGenerator) -> <init>
+    43:89:void run(net.minecraft.data.HashCache) -> a
+    92:100:void saveCollection(net.minecraft.data.HashCache,java.nio.file.Path,java.util.Map,java.util.function.BiFunction) -> a
+    103:104:java.nio.file.Path createBlockStatePath(java.nio.file.Path,net.minecraft.world.level.block.Block) -> a
+    108:108:java.nio.file.Path createModelPath(java.nio.file.Path,net.minecraft.resources.ResourceLocation) -> a
+    113:113:java.lang.String getName() -> a
+    93:99:void lambda$saveCollection$4(java.util.function.BiFunction,java.nio.file.Path,net.minecraft.data.HashCache,java.lang.Object,java.util.function.Supplier) -> a
+    75:85:void lambda$run$3(java.util.Set,java.util.Map,net.minecraft.world.level.block.Block) -> a
+    69:69:boolean lambda$run$2(java.util.Map,net.minecraft.world.level.block.Block) -> a
+    58:62:void lambda$run$1(java.util.Map,net.minecraft.resources.ResourceLocation,java.util.function.Supplier) -> a
+    47:52:void lambda$run$0(java.util.Map,net.minecraft.data.models.blockstates.BlockStateGenerator) -> a
+    32:33:void <clinit>() -> <clinit>
+net.minecraft.data.models.blockstates.BlockStateGenerator -> ik:
+    net.minecraft.world.level.block.Block getBlock() -> a
+net.minecraft.data.models.blockstates.Condition -> il:
+    void validate(net.minecraft.world.level.block.state.StateDefinition) -> a
+    115:115:net.minecraft.data.models.blockstates.Condition$TerminalCondition condition() -> a
+    119:119:net.minecraft.data.models.blockstates.Condition and(net.minecraft.data.models.blockstates.Condition[]) -> a
+    123:123:net.minecraft.data.models.blockstates.Condition or(net.minecraft.data.models.blockstates.Condition[]) -> b
+net.minecraft.data.models.blockstates.Condition$1 -> il$1:
+net.minecraft.data.models.blockstates.Condition$CompositeCondition -> il$a:
+    net.minecraft.data.models.blockstates.Condition$Operation operation -> a
+    java.util.List subconditions -> b
+    36:39:void <init>(net.minecraft.data.models.blockstates.Condition$Operation,java.util.List) -> <init>
+    43:44:void validate(net.minecraft.world.level.block.state.StateDefinition) -> a
+    48:53:com.google.gson.JsonElement get() -> b
+    32:32:java.lang.Object get() -> get
+    43:43:void lambda$validate$0(net.minecraft.world.level.block.state.StateDefinition,net.minecraft.data.models.blockstates.Condition) -> a
+    32:32:void <init>(net.minecraft.data.models.blockstates.Condition$Operation,java.util.List,net.minecraft.data.models.blockstates.Condition$1) -> <init>
+net.minecraft.data.models.blockstates.Condition$Operation -> il$b:
+    net.minecraft.data.models.blockstates.Condition$Operation AND -> a
+    net.minecraft.data.models.blockstates.Condition$Operation OR -> b
+    java.lang.String id -> c
+    net.minecraft.data.models.blockstates.Condition$Operation[] $VALUES -> d
+    20:20:net.minecraft.data.models.blockstates.Condition$Operation[] values() -> values
+    20:20:net.minecraft.data.models.blockstates.Condition$Operation valueOf(java.lang.String) -> valueOf
+    27:29:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    20:20:java.lang.String access$000(net.minecraft.data.models.blockstates.Condition$Operation) -> a
+    20:22:void <clinit>() -> <clinit>
+net.minecraft.data.models.blockstates.Condition$TerminalCondition -> il$c:
+    java.util.Map terms -> a
+    57:58:void <init>() -> <init>
+    61:61:java.lang.String joinValues(net.minecraft.world.level.block.state.properties.Property,java.util.stream.Stream) -> a
+    65:65:java.lang.String getTerm(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable,java.lang.Comparable[]) -> c
+    69:73:void putValue(net.minecraft.world.level.block.state.properties.Property,java.lang.String) -> a
+    76:77:net.minecraft.data.models.blockstates.Condition$TerminalCondition term(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
+    82:83:net.minecraft.data.models.blockstates.Condition$TerminalCondition term(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable,java.lang.Comparable[]) -> a
+    87:88:net.minecraft.data.models.blockstates.Condition$TerminalCondition negatedTerm(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> b
+    94:95:net.minecraft.data.models.blockstates.Condition$TerminalCondition negatedTerm(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable,java.lang.Comparable[]) -> b
+    100:102:com.google.gson.JsonElement get() -> b
+    107:111:void validate(net.minecraft.world.level.block.state.StateDefinition) -> a
+    57:57:java.lang.Object get() -> get
+    107:107:boolean lambda$validate$1(net.minecraft.world.level.block.state.StateDefinition,net.minecraft.world.level.block.state.properties.Property) -> a
+    101:101:void lambda$get$0(com.google.gson.JsonObject,net.minecraft.world.level.block.state.properties.Property,java.lang.String) -> a
+net.minecraft.data.models.blockstates.MultiPartGenerator -> im:
+    net.minecraft.world.level.block.Block block -> a
+    java.util.List parts -> b
+    17:21:void <init>(net.minecraft.world.level.block.Block) -> <init>
+    25:25:net.minecraft.world.level.block.Block getBlock() -> a
+    29:29:net.minecraft.data.models.blockstates.MultiPartGenerator multiPart(net.minecraft.world.level.block.Block) -> a
+    33:34:net.minecraft.data.models.blockstates.MultiPartGenerator with(java.util.List) -> a
+    38:38:net.minecraft.data.models.blockstates.MultiPartGenerator with(net.minecraft.data.models.blockstates.Variant) -> a
+    42:43:net.minecraft.data.models.blockstates.MultiPartGenerator with(net.minecraft.data.models.blockstates.Condition,java.util.List) -> a
+    47:47:net.minecraft.data.models.blockstates.MultiPartGenerator with(net.minecraft.data.models.blockstates.Condition,net.minecraft.data.models.blockstates.Variant[]) -> a
+    51:51:net.minecraft.data.models.blockstates.MultiPartGenerator with(net.minecraft.data.models.blockstates.Condition,net.minecraft.data.models.blockstates.Variant) -> a
+    56:64:com.google.gson.JsonElement get() -> b
+    15:15:java.lang.Object get() -> get
+    57:57:void lambda$get$0(net.minecraft.world.level.block.state.StateDefinition,net.minecraft.data.models.blockstates.MultiPartGenerator$Entry) -> a
+net.minecraft.data.models.blockstates.MultiPartGenerator$1 -> im$1:
+net.minecraft.data.models.blockstates.MultiPartGenerator$ConditionalEntry -> im$a:
+    net.minecraft.data.models.blockstates.Condition condition -> a
+    93:95:void <init>(net.minecraft.data.models.blockstates.Condition,java.util.List) -> <init>
+    99:100:void validate(net.minecraft.world.level.block.state.StateDefinition) -> a
+    104:105:void decorate(com.google.gson.JsonObject) -> a
+    89:89:void <init>(net.minecraft.data.models.blockstates.Condition,java.util.List,net.minecraft.data.models.blockstates.MultiPartGenerator$1) -> <init>
+net.minecraft.data.models.blockstates.MultiPartGenerator$Entry -> im$b:
+    java.util.List variants -> a
+    70:72:void <init>(java.util.List) -> <init>
+    75:75:void validate(net.minecraft.world.level.block.state.StateDefinition) -> a
+    78:78:void decorate(com.google.gson.JsonObject) -> a
+    82:85:com.google.gson.JsonElement get() -> a
+    67:67:java.lang.Object get() -> get
+    67:67:void <init>(java.util.List,net.minecraft.data.models.blockstates.MultiPartGenerator$1) -> <init>
+net.minecraft.data.models.blockstates.MultiVariantGenerator -> in:
+    net.minecraft.world.level.block.Block block -> a
+    java.util.List baseVariants -> b
+    java.util.Set seenProperties -> c
+    java.util.List declaredPropertySets -> d
+    22:28:void <init>(net.minecraft.world.level.block.Block,java.util.List) -> <init>
+    31:41:net.minecraft.data.models.blockstates.MultiVariantGenerator with(net.minecraft.data.models.blockstates.PropertyDispatch) -> a
+    46:64:com.google.gson.JsonElement get() -> b
+    68:71:java.util.List mergeVariants(java.util.List,java.util.List) -> a
+    76:76:net.minecraft.world.level.block.Block getBlock() -> a
+    80:80:net.minecraft.data.models.blockstates.MultiVariantGenerator multiVariant(net.minecraft.world.level.block.Block) -> a
+    84:84:net.minecraft.data.models.blockstates.MultiVariantGenerator multiVariant(net.minecraft.world.level.block.Block,net.minecraft.data.models.blockstates.Variant) -> a
+    88:88:net.minecraft.data.models.blockstates.MultiVariantGenerator multiVariant(net.minecraft.world.level.block.Block,net.minecraft.data.models.blockstates.Variant[]) -> a
+    19:19:java.lang.Object get() -> get
+    70:70:void lambda$mergeVariants$6(java.util.List,com.google.common.collect.ImmutableList$Builder,net.minecraft.data.models.blockstates.Variant) -> a
+    70:70:void lambda$null$5(com.google.common.collect.ImmutableList$Builder,net.minecraft.data.models.blockstates.Variant,net.minecraft.data.models.blockstates.Variant) -> a
+    63:63:void lambda$get$4(java.util.Map,com.google.gson.JsonObject) -> a
+    59:59:void lambda$get$3(java.util.Map,com.mojang.datafixers.util.Pair) -> a
+    50:50:java.util.stream.Stream lambda$get$2(java.util.Map,com.mojang.datafixers.util.Pair) -> b
+    51:53:com.mojang.datafixers.util.Pair lambda$null$1(com.mojang.datafixers.util.Pair,java.util.Map$Entry) -> a
+    32:39:void lambda$with$0(net.minecraft.world.level.block.state.properties.Property) -> a
+net.minecraft.data.models.blockstates.PropertyDispatch -> io:
+    java.util.Map values -> a
+    16:17:void <init>() -> <init>
+    20:24:void putValue(net.minecraft.data.models.blockstates.Selector,java.util.List) -> a
+    27:28:java.util.Map getEntries() -> a
+    32:41:void verifyComplete() -> c
+    java.util.List getDefinedProperties() -> b
+    46:46:net.minecraft.data.models.blockstates.PropertyDispatch$C1 property(net.minecraft.world.level.block.state.properties.Property) -> a
+    50:50:net.minecraft.data.models.blockstates.PropertyDispatch$C2 properties(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property) -> a
+    54:54:net.minecraft.data.models.blockstates.PropertyDispatch$C3 properties(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property) -> a
+    58:58:net.minecraft.data.models.blockstates.PropertyDispatch$C4 properties(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property) -> a
+    62:62:net.minecraft.data.models.blockstates.PropertyDispatch$C5 properties(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property) -> a
+    37:37:boolean lambda$verifyComplete$1(net.minecraft.data.models.blockstates.Selector) -> a
+    35:35:java.util.stream.Stream lambda$verifyComplete$0(net.minecraft.world.level.block.state.properties.Property,net.minecraft.data.models.blockstates.Selector) -> a
+net.minecraft.data.models.blockstates.PropertyDispatch$1 -> io$1:
+net.minecraft.data.models.blockstates.PropertyDispatch$C1 -> io$a:
+    net.minecraft.world.level.block.state.properties.Property property1 -> a
+    68:70:void <init>(net.minecraft.world.level.block.state.properties.Property) -> <init>
+    74:74:java.util.List getDefinedProperties() -> b
+    78:82:net.minecraft.data.models.blockstates.PropertyDispatch$C1 select(java.lang.Comparable,java.util.List) -> a
+    86:86:net.minecraft.data.models.blockstates.PropertyDispatch$C1 select(java.lang.Comparable,net.minecraft.data.models.blockstates.Variant) -> a
+    90:93:net.minecraft.data.models.blockstates.PropertyDispatch generate(java.util.function.Function) -> a
+    97:100:net.minecraft.data.models.blockstates.PropertyDispatch generateList(java.util.function.Function) -> b
+    98:98:void lambda$generateList$1(java.util.function.Function,java.lang.Comparable) -> a
+    91:91:void lambda$generate$0(java.util.function.Function,java.lang.Comparable) -> b
+    65:65:void <init>(net.minecraft.world.level.block.state.properties.Property,net.minecraft.data.models.blockstates.PropertyDispatch$1) -> <init>
+net.minecraft.data.models.blockstates.PropertyDispatch$C2 -> io$b:
+    net.minecraft.world.level.block.state.properties.Property property1 -> a
+    net.minecraft.world.level.block.state.properties.Property property2 -> b
+    108:111:void <init>(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property) -> <init>
+    115:115:java.util.List getDefinedProperties() -> b
+    119:124:net.minecraft.data.models.blockstates.PropertyDispatch$C2 select(java.lang.Comparable,java.lang.Comparable,java.util.List) -> a
+    128:128:net.minecraft.data.models.blockstates.PropertyDispatch$C2 select(java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.Variant) -> a
+    132:137:net.minecraft.data.models.blockstates.PropertyDispatch generate(java.util.function.BiFunction) -> a
+    141:146:net.minecraft.data.models.blockstates.PropertyDispatch generateList(java.util.function.BiFunction) -> b
+    142:142:void lambda$generateList$3(java.util.function.BiFunction,java.lang.Comparable) -> a
+    143:143:void lambda$null$2(java.lang.Comparable,java.util.function.BiFunction,java.lang.Comparable) -> a
+    133:133:void lambda$generate$1(java.util.function.BiFunction,java.lang.Comparable) -> b
+    134:134:void lambda$null$0(java.lang.Comparable,java.util.function.BiFunction,java.lang.Comparable) -> b
+    104:104:void <init>(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.data.models.blockstates.PropertyDispatch$1) -> <init>
+net.minecraft.data.models.blockstates.PropertyDispatch$C3 -> io$c:
+    net.minecraft.world.level.block.state.properties.Property property1 -> a
+    net.minecraft.world.level.block.state.properties.Property property2 -> b
+    net.minecraft.world.level.block.state.properties.Property property3 -> c
+    155:159:void <init>(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property) -> <init>
+    163:163:java.util.List getDefinedProperties() -> b
+    167:173:net.minecraft.data.models.blockstates.PropertyDispatch$C3 select(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.util.List) -> a
+    177:177:net.minecraft.data.models.blockstates.PropertyDispatch$C3 select(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.Variant) -> a
+    181:188:net.minecraft.data.models.blockstates.PropertyDispatch generate(net.minecraft.data.models.blockstates.PropertyDispatch$TriFunction) -> a
+    192:199:net.minecraft.data.models.blockstates.PropertyDispatch generateList(net.minecraft.data.models.blockstates.PropertyDispatch$TriFunction) -> b
+    193:193:void lambda$generateList$5(net.minecraft.data.models.blockstates.PropertyDispatch$TriFunction,java.lang.Comparable) -> a
+    194:194:void lambda$null$4(java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$TriFunction,java.lang.Comparable) -> a
+    195:195:void lambda$null$3(java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$TriFunction,java.lang.Comparable) -> a
+    182:182:void lambda$generate$2(net.minecraft.data.models.blockstates.PropertyDispatch$TriFunction,java.lang.Comparable) -> b
+    183:183:void lambda$null$1(java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$TriFunction,java.lang.Comparable) -> b
+    184:184:void lambda$null$0(java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$TriFunction,java.lang.Comparable) -> b
+    150:150:void <init>(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.data.models.blockstates.PropertyDispatch$1) -> <init>
+net.minecraft.data.models.blockstates.PropertyDispatch$C4 -> io$d:
+    net.minecraft.world.level.block.state.properties.Property property1 -> a
+    net.minecraft.world.level.block.state.properties.Property property2 -> b
+    net.minecraft.world.level.block.state.properties.Property property3 -> c
+    net.minecraft.world.level.block.state.properties.Property property4 -> d
+    209:214:void <init>(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property) -> <init>
+    218:218:java.util.List getDefinedProperties() -> b
+    222:229:net.minecraft.data.models.blockstates.PropertyDispatch$C4 select(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.util.List) -> a
+    233:233:net.minecraft.data.models.blockstates.PropertyDispatch$C4 select(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.Variant) -> a
+    237:246:net.minecraft.data.models.blockstates.PropertyDispatch generate(net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction) -> a
+    250:259:net.minecraft.data.models.blockstates.PropertyDispatch generateList(net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction) -> b
+    251:251:void lambda$generateList$7(net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction,java.lang.Comparable) -> a
+    252:252:void lambda$null$6(java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction,java.lang.Comparable) -> a
+    253:253:void lambda$null$5(java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction,java.lang.Comparable) -> a
+    254:254:void lambda$null$4(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction,java.lang.Comparable) -> a
+    238:238:void lambda$generate$3(net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction,java.lang.Comparable) -> b
+    239:239:void lambda$null$2(java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction,java.lang.Comparable) -> b
+    240:240:void lambda$null$1(java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction,java.lang.Comparable) -> b
+    241:241:void lambda$null$0(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction,java.lang.Comparable) -> b
+    203:203:void <init>(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.data.models.blockstates.PropertyDispatch$1) -> <init>
+net.minecraft.data.models.blockstates.PropertyDispatch$C5 -> io$e:
+    net.minecraft.world.level.block.state.properties.Property property1 -> a
+    net.minecraft.world.level.block.state.properties.Property property2 -> b
+    net.minecraft.world.level.block.state.properties.Property property3 -> c
+    net.minecraft.world.level.block.state.properties.Property property4 -> d
+    net.minecraft.world.level.block.state.properties.Property property5 -> e
+    270:276:void <init>(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property) -> <init>
+    280:280:java.util.List getDefinedProperties() -> b
+    284:292:net.minecraft.data.models.blockstates.PropertyDispatch$C5 select(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.util.List) -> a
+    296:296:net.minecraft.data.models.blockstates.PropertyDispatch$C5 select(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.Variant) -> a
+    300:311:net.minecraft.data.models.blockstates.PropertyDispatch generate(net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction) -> a
+    315:326:net.minecraft.data.models.blockstates.PropertyDispatch generateList(net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction) -> b
+    316:316:void lambda$generateList$9(net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction,java.lang.Comparable) -> a
+    317:317:void lambda$null$8(java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction,java.lang.Comparable) -> a
+    318:318:void lambda$null$7(java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction,java.lang.Comparable) -> a
+    319:319:void lambda$null$6(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction,java.lang.Comparable) -> a
+    320:320:void lambda$null$5(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction,java.lang.Comparable) -> a
+    301:301:void lambda$generate$4(net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction,java.lang.Comparable) -> b
+    302:302:void lambda$null$3(java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction,java.lang.Comparable) -> b
+    303:303:void lambda$null$2(java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction,java.lang.Comparable) -> b
+    304:304:void lambda$null$1(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction,java.lang.Comparable) -> b
+    305:305:void lambda$null$0(java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,java.lang.Comparable,net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction,java.lang.Comparable) -> b
+    263:263:void <init>(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.properties.Property,net.minecraft.data.models.blockstates.PropertyDispatch$1) -> <init>
+net.minecraft.data.models.blockstates.PropertyDispatch$PentaFunction -> io$f:
+    java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object) -> a
+net.minecraft.data.models.blockstates.PropertyDispatch$QuadFunction -> io$g:
+    java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object) -> a
+net.minecraft.data.models.blockstates.PropertyDispatch$TriFunction -> io$h:
+    java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object) -> apply
+net.minecraft.data.models.blockstates.Selector -> ip:
+    net.minecraft.data.models.blockstates.Selector EMPTY -> a
+    java.util.Comparator COMPARE_BY_NAME -> b
+    java.util.List values -> c
+    17:17:net.minecraft.data.models.blockstates.Selector extend(net.minecraft.world.level.block.state.properties.Property$Value) -> a
+    21:21:net.minecraft.data.models.blockstates.Selector extend(net.minecraft.data.models.blockstates.Selector) -> a
+    24:26:void <init>(java.util.List) -> <init>
+    29:29:net.minecraft.data.models.blockstates.Selector empty() -> a
+    33:33:net.minecraft.data.models.blockstates.Selector of(net.minecraft.world.level.block.state.properties.Property$Value[]) -> a
+    38:38:boolean equals(java.lang.Object) -> equals
+    43:43:int hashCode() -> hashCode
+    47:47:java.lang.String getKey() -> b
+    52:52:java.lang.String toString() -> toString
+    12:12:java.lang.String lambda$static$0(net.minecraft.world.level.block.state.properties.Property$Value) -> b
+    11:12:void <clinit>() -> <clinit>
+net.minecraft.data.models.blockstates.Variant -> iq:
+    java.util.Map values -> a
+    12:14:void <init>() -> <init>
+    17:21:net.minecraft.data.models.blockstates.Variant with(net.minecraft.data.models.blockstates.VariantProperty,java.lang.Object) -> a
+    25:25:net.minecraft.data.models.blockstates.Variant variant() -> a
+    29:32:net.minecraft.data.models.blockstates.Variant merge(net.minecraft.data.models.blockstates.Variant,net.minecraft.data.models.blockstates.Variant) -> a
+    37:39:com.google.gson.JsonElement get() -> b
+    43:49:com.google.gson.JsonElement convertList(java.util.List) -> a
+    12:12:java.lang.Object get() -> get
+    48:48:void lambda$convertList$1(com.google.gson.JsonArray,net.minecraft.data.models.blockstates.Variant) -> a
+    38:38:void lambda$get$0(com.google.gson.JsonObject,net.minecraft.data.models.blockstates.VariantProperty$Value) -> a
+net.minecraft.data.models.blockstates.VariantProperties -> ir:
+    net.minecraft.data.models.blockstates.VariantProperty X_ROT -> a
+    net.minecraft.data.models.blockstates.VariantProperty Y_ROT -> b
+    net.minecraft.data.models.blockstates.VariantProperty MODEL -> c
+    net.minecraft.data.models.blockstates.VariantProperty UV_LOCK -> d
+    net.minecraft.data.models.blockstates.VariantProperty WEIGHT -> e
+    6:6:void <init>() -> <init>
+    22:22:com.google.gson.JsonElement lambda$static$2(net.minecraft.resources.ResourceLocation) -> a
+    21:21:com.google.gson.JsonElement lambda$static$1(net.minecraft.data.models.blockstates.VariantProperties$Rotation) -> a
+    20:20:com.google.gson.JsonElement lambda$static$0(net.minecraft.data.models.blockstates.VariantProperties$Rotation) -> b
+    20:24:void <clinit>() -> <clinit>
+net.minecraft.data.models.blockstates.VariantProperties$Rotation -> ir$a:
+    net.minecraft.data.models.blockstates.VariantProperties$Rotation R0 -> a
+    net.minecraft.data.models.blockstates.VariantProperties$Rotation R90 -> b
+    net.minecraft.data.models.blockstates.VariantProperties$Rotation R180 -> c
+    net.minecraft.data.models.blockstates.VariantProperties$Rotation R270 -> d
+    int value -> e
+    net.minecraft.data.models.blockstates.VariantProperties$Rotation[] $VALUES -> f
+    7:7:net.minecraft.data.models.blockstates.VariantProperties$Rotation[] values() -> values
+    7:7:net.minecraft.data.models.blockstates.VariantProperties$Rotation valueOf(java.lang.String) -> valueOf
+    15:17:void <init>(java.lang.String,int,int) -> <init>
+    7:7:int access$000(net.minecraft.data.models.blockstates.VariantProperties$Rotation) -> a
+    7:11:void <clinit>() -> <clinit>
+net.minecraft.data.models.blockstates.VariantProperty -> is:
+    java.lang.String key -> a
+    java.util.function.Function serializer -> b
+    12:15:void <init>(java.lang.String,java.util.function.Function) -> <init>
+    18:18:net.minecraft.data.models.blockstates.VariantProperty$Value withValue(java.lang.Object) -> a
+    23:23:java.lang.String toString() -> toString
+    8:8:java.lang.String access$000(net.minecraft.data.models.blockstates.VariantProperty) -> a
+    8:8:java.util.function.Function access$100(net.minecraft.data.models.blockstates.VariantProperty) -> b
+net.minecraft.data.models.blockstates.VariantProperty$Value -> is$a:
+    java.lang.Object value -> b
+    net.minecraft.data.models.blockstates.VariantProperty this$0 -> a
+    29:31:void <init>(net.minecraft.data.models.blockstates.VariantProperty,java.lang.Object) -> <init>
+    34:34:net.minecraft.data.models.blockstates.VariantProperty getKey() -> a
+    38:39:void addToVariant(com.google.gson.JsonObject) -> a
+    43:43:java.lang.String toString() -> toString
+net.minecraft.data.models.blockstates.package-info -> it:
+net.minecraft.data.models.model.DelegatedModel -> iu:
+    net.minecraft.resources.ResourceLocation parent -> a
+    12:14:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
+    18:20:com.google.gson.JsonElement get() -> a
+    9:9:java.lang.Object get() -> get
+net.minecraft.data.models.model.ModelLocationUtils -> iv:
+    8:8:void <init>() -> <init>
+    12:12:net.minecraft.resources.ResourceLocation decorateBlockModelLocation(java.lang.String) -> a
+    16:16:net.minecraft.resources.ResourceLocation decorateItemModelLocation(java.lang.String) -> b
+    20:21:net.minecraft.resources.ResourceLocation getModelLocation(net.minecraft.world.level.block.Block,java.lang.String) -> a
+    25:26:net.minecraft.resources.ResourceLocation getModelLocation(net.minecraft.world.level.block.Block) -> a
+    30:31:net.minecraft.resources.ResourceLocation getModelLocation(net.minecraft.world.item.Item) -> a
+    35:36:net.minecraft.resources.ResourceLocation getModelLocation(net.minecraft.world.item.Item,java.lang.String) -> a
+net.minecraft.data.models.model.ModelTemplate -> iw:
+    java.util.Optional model -> a
+    java.util.Set requiredSlots -> b
+    java.util.Optional suffix -> c
+    26:30:void <init>(java.util.Optional,java.util.Optional,net.minecraft.data.models.model.TextureSlot[]) -> <init>
+    33:33:net.minecraft.resources.ResourceLocation create(net.minecraft.world.level.block.Block,net.minecraft.data.models.model.TextureMapping,java.util.function.BiConsumer) -> a
+    37:37:net.minecraft.resources.ResourceLocation createWithSuffix(net.minecraft.world.level.block.Block,java.lang.String,net.minecraft.data.models.model.TextureMapping,java.util.function.BiConsumer) -> a
+    41:41:net.minecraft.resources.ResourceLocation createWithOverride(net.minecraft.world.level.block.Block,java.lang.String,net.minecraft.data.models.model.TextureMapping,java.util.function.BiConsumer) -> b
+    45:58:net.minecraft.resources.ResourceLocation create(net.minecraft.resources.ResourceLocation,net.minecraft.data.models.model.TextureMapping,java.util.function.BiConsumer) -> a
+    62:62:java.util.Map createMap(net.minecraft.data.models.model.TextureMapping) -> a
+    48:55:com.google.gson.JsonElement lambda$create$2(java.util.Map) -> a
+    52:52:void lambda$null$1(com.google.gson.JsonObject,net.minecraft.data.models.model.TextureSlot,net.minecraft.resources.ResourceLocation) -> a
+    49:49:void lambda$null$0(com.google.gson.JsonObject,net.minecraft.resources.ResourceLocation) -> a
+net.minecraft.data.models.model.ModelTemplates -> ix:
+    net.minecraft.data.models.model.ModelTemplate CUBE -> a
+    net.minecraft.data.models.model.ModelTemplate CUBE_DIRECTIONAL -> b
+    net.minecraft.data.models.model.ModelTemplate CUBE_ALL -> c
+    net.minecraft.data.models.model.ModelTemplate CUBE_MIRRORED_ALL -> d
+    net.minecraft.data.models.model.ModelTemplate CUBE_COLUMN -> e
+    net.minecraft.data.models.model.ModelTemplate CUBE_COLUMN_HORIZONTAL -> f
+    net.minecraft.data.models.model.ModelTemplate CUBE_TOP -> g
+    net.minecraft.data.models.model.ModelTemplate CUBE_BOTTOM_TOP -> h
+    net.minecraft.data.models.model.ModelTemplate CUBE_ORIENTABLE -> i
+    net.minecraft.data.models.model.ModelTemplate CUBE_ORIENTABLE_TOP_BOTTOM -> j
+    net.minecraft.data.models.model.ModelTemplate CUBE_ORIENTABLE_VERTICAL -> k
+    net.minecraft.data.models.model.ModelTemplate BUTTON -> l
+    net.minecraft.data.models.model.ModelTemplate BUTTON_PRESSED -> m
+    net.minecraft.data.models.model.ModelTemplate BUTTON_INVENTORY -> n
+    net.minecraft.data.models.model.ModelTemplate DOOR_BOTTOM -> o
+    net.minecraft.data.models.model.ModelTemplate DOOR_BOTTOM_HINGE -> p
+    net.minecraft.data.models.model.ModelTemplate DOOR_TOP -> q
+    net.minecraft.data.models.model.ModelTemplate DOOR_TOP_HINGE -> r
+    net.minecraft.data.models.model.ModelTemplate FENCE_POST -> s
+    net.minecraft.data.models.model.ModelTemplate FENCE_SIDE -> t
+    net.minecraft.data.models.model.ModelTemplate FENCE_INVENTORY -> u
+    net.minecraft.data.models.model.ModelTemplate WALL_POST -> v
+    net.minecraft.data.models.model.ModelTemplate WALL_LOW_SIDE -> w
+    net.minecraft.data.models.model.ModelTemplate WALL_TALL_SIDE -> x
+    net.minecraft.data.models.model.ModelTemplate WALL_INVENTORY -> y
+    net.minecraft.data.models.model.ModelTemplate FENCE_GATE_CLOSED -> z
+    net.minecraft.data.models.model.ModelTemplate FENCE_GATE_OPEN -> A
+    net.minecraft.data.models.model.ModelTemplate FENCE_GATE_WALL_CLOSED -> B
+    net.minecraft.data.models.model.ModelTemplate FENCE_GATE_WALL_OPEN -> C
+    net.minecraft.data.models.model.ModelTemplate PRESSURE_PLATE_UP -> D
+    net.minecraft.data.models.model.ModelTemplate PRESSURE_PLATE_DOWN -> E
+    net.minecraft.data.models.model.ModelTemplate PARTICLE_ONLY -> F
+    net.minecraft.data.models.model.ModelTemplate SLAB_BOTTOM -> G
+    net.minecraft.data.models.model.ModelTemplate SLAB_TOP -> H
+    net.minecraft.data.models.model.ModelTemplate LEAVES -> I
+    net.minecraft.data.models.model.ModelTemplate STAIRS_STRAIGHT -> J
+    net.minecraft.data.models.model.ModelTemplate STAIRS_INNER -> K
+    net.minecraft.data.models.model.ModelTemplate STAIRS_OUTER -> L
+    net.minecraft.data.models.model.ModelTemplate TRAPDOOR_TOP -> M
+    net.minecraft.data.models.model.ModelTemplate TRAPDOOR_BOTTOM -> N
+    net.minecraft.data.models.model.ModelTemplate TRAPDOOR_OPEN -> O
+    net.minecraft.data.models.model.ModelTemplate ORIENTABLE_TRAPDOOR_TOP -> P
+    net.minecraft.data.models.model.ModelTemplate ORIENTABLE_TRAPDOOR_BOTTOM -> Q
+    net.minecraft.data.models.model.ModelTemplate ORIENTABLE_TRAPDOOR_OPEN -> R
+    net.minecraft.data.models.model.ModelTemplate CROSS -> S
+    net.minecraft.data.models.model.ModelTemplate TINTED_CROSS -> T
+    net.minecraft.data.models.model.ModelTemplate FLOWER_POT_CROSS -> U
+    net.minecraft.data.models.model.ModelTemplate TINTED_FLOWER_POT_CROSS -> V
+    net.minecraft.data.models.model.ModelTemplate RAIL_FLAT -> W
+    net.minecraft.data.models.model.ModelTemplate RAIL_CURVED -> X
+    net.minecraft.data.models.model.ModelTemplate RAIL_RAISED_NE -> Y
+    net.minecraft.data.models.model.ModelTemplate RAIL_RAISED_SW -> Z
+    net.minecraft.data.models.model.ModelTemplate CARPET -> aa
+    net.minecraft.data.models.model.ModelTemplate CORAL_FAN -> ab
+    net.minecraft.data.models.model.ModelTemplate CORAL_WALL_FAN -> ac
+    net.minecraft.data.models.model.ModelTemplate GLAZED_TERRACOTTA -> ad
+    net.minecraft.data.models.model.ModelTemplate CHORUS_FLOWER -> ae
+    net.minecraft.data.models.model.ModelTemplate DAYLIGHT_DETECTOR -> af
+    net.minecraft.data.models.model.ModelTemplate STAINED_GLASS_PANE_NOSIDE -> ag
+    net.minecraft.data.models.model.ModelTemplate STAINED_GLASS_PANE_NOSIDE_ALT -> ah
+    net.minecraft.data.models.model.ModelTemplate STAINED_GLASS_PANE_POST -> ai
+    net.minecraft.data.models.model.ModelTemplate STAINED_GLASS_PANE_SIDE -> aj
+    net.minecraft.data.models.model.ModelTemplate STAINED_GLASS_PANE_SIDE_ALT -> ak
+    net.minecraft.data.models.model.ModelTemplate COMMAND_BLOCK -> al
+    net.minecraft.data.models.model.ModelTemplate ANVIL -> am
+    net.minecraft.data.models.model.ModelTemplate[] STEMS -> an
+    net.minecraft.data.models.model.ModelTemplate ATTACHED_STEM -> ao
+    net.minecraft.data.models.model.ModelTemplate CROP -> ap
+    net.minecraft.data.models.model.ModelTemplate FARMLAND -> aq
+    net.minecraft.data.models.model.ModelTemplate FIRE_FLOOR -> ar
+    net.minecraft.data.models.model.ModelTemplate FIRE_SIDE -> as
+    net.minecraft.data.models.model.ModelTemplate FIRE_SIDE_ALT -> at
+    net.minecraft.data.models.model.ModelTemplate FIRE_UP -> au
+    net.minecraft.data.models.model.ModelTemplate FIRE_UP_ALT -> av
+    net.minecraft.data.models.model.ModelTemplate CAMPFIRE -> aw
+    net.minecraft.data.models.model.ModelTemplate LANTERN -> ax
+    net.minecraft.data.models.model.ModelTemplate HANGING_LANTERN -> ay
+    net.minecraft.data.models.model.ModelTemplate TORCH -> az
+    net.minecraft.data.models.model.ModelTemplate WALL_TORCH -> aA
+    net.minecraft.data.models.model.ModelTemplate PISTON -> aB
+    net.minecraft.data.models.model.ModelTemplate PISTON_HEAD -> aC
+    net.minecraft.data.models.model.ModelTemplate PISTON_HEAD_SHORT -> aD
+    net.minecraft.data.models.model.ModelTemplate SEAGRASS -> aE
+    net.minecraft.data.models.model.ModelTemplate TURTLE_EGG -> aF
+    net.minecraft.data.models.model.ModelTemplate TWO_TURTLE_EGGS -> aG
+    net.minecraft.data.models.model.ModelTemplate THREE_TURTLE_EGGS -> aH
+    net.minecraft.data.models.model.ModelTemplate FOUR_TURTLE_EGGS -> aI
+    net.minecraft.data.models.model.ModelTemplate SINGLE_FACE -> aJ
+    net.minecraft.data.models.model.ModelTemplate FLAT_ITEM -> aK
+    net.minecraft.data.models.model.ModelTemplate FLAT_HANDHELD_ITEM -> aL
+    net.minecraft.data.models.model.ModelTemplate FLAT_HANDHELD_ROD_ITEM -> aM
+    net.minecraft.data.models.model.ModelTemplate SHULKER_BOX_INVENTORY -> aN
+    net.minecraft.data.models.model.ModelTemplate BED_INVENTORY -> aO
+    net.minecraft.data.models.model.ModelTemplate BANNER_INVENTORY -> aP
+    net.minecraft.data.models.model.ModelTemplate SKULL_INVENTORY -> aQ
+    8:8:void <init>() -> <init>
+    130:130:net.minecraft.data.models.model.ModelTemplate create(net.minecraft.data.models.model.TextureSlot[]) -> a
+    134:134:net.minecraft.data.models.model.ModelTemplate create(java.lang.String,net.minecraft.data.models.model.TextureSlot[]) -> a
+    138:138:net.minecraft.data.models.model.ModelTemplate createItem(java.lang.String,net.minecraft.data.models.model.TextureSlot[]) -> b
+    142:142:net.minecraft.data.models.model.ModelTemplate create(java.lang.String,java.lang.String,net.minecraft.data.models.model.TextureSlot[]) -> a
+    92:92:net.minecraft.data.models.model.ModelTemplate[] lambda$static$1(int) -> a
+    92:92:net.minecraft.data.models.model.ModelTemplate lambda$static$0(int) -> b
+    9:127:void <clinit>() -> <clinit>
+net.minecraft.data.models.model.TextureMapping -> iy:
+    java.util.Map slots -> a
+    java.util.Set forcedSlots -> b
+    15:19:void <init>() -> <init>
+    22:23:net.minecraft.data.models.model.TextureMapping put(net.minecraft.data.models.model.TextureSlot,net.minecraft.resources.ResourceLocation) -> a
+    27:29:net.minecraft.data.models.model.TextureMapping putForced(net.minecraft.data.models.model.TextureSlot,net.minecraft.resources.ResourceLocation) -> b
+    33:33:java.util.stream.Stream getForced() -> a
+    37:38:net.minecraft.data.models.model.TextureMapping copySlot(net.minecraft.data.models.model.TextureSlot,net.minecraft.data.models.model.TextureSlot) -> a
+    42:44:net.minecraft.data.models.model.TextureMapping copyForced(net.minecraft.data.models.model.TextureSlot,net.minecraft.data.models.model.TextureSlot) -> b
+    48:56:net.minecraft.resources.ResourceLocation get(net.minecraft.data.models.model.TextureSlot) -> a
+    60:64:net.minecraft.data.models.model.TextureMapping copyAndUpdate(net.minecraft.data.models.model.TextureSlot,net.minecraft.resources.ResourceLocation) -> c
+    68:69:net.minecraft.data.models.model.TextureMapping cube(net.minecraft.world.level.block.Block) -> a
+    73:74:net.minecraft.data.models.model.TextureMapping defaultTexture(net.minecraft.world.level.block.Block) -> b
+    78:78:net.minecraft.data.models.model.TextureMapping defaultTexture(net.minecraft.resources.ResourceLocation) -> a
+    82:82:net.minecraft.data.models.model.TextureMapping cube(net.minecraft.resources.ResourceLocation) -> b
+    86:86:net.minecraft.data.models.model.TextureMapping cross(net.minecraft.world.level.block.Block) -> c
+    90:90:net.minecraft.data.models.model.TextureMapping cross(net.minecraft.resources.ResourceLocation) -> c
+    94:94:net.minecraft.data.models.model.TextureMapping plant(net.minecraft.world.level.block.Block) -> d
+    98:98:net.minecraft.data.models.model.TextureMapping plant(net.minecraft.resources.ResourceLocation) -> d
+    102:102:net.minecraft.data.models.model.TextureMapping rail(net.minecraft.world.level.block.Block) -> e
+    106:106:net.minecraft.data.models.model.TextureMapping rail(net.minecraft.resources.ResourceLocation) -> e
+    110:110:net.minecraft.data.models.model.TextureMapping wool(net.minecraft.world.level.block.Block) -> f
+    114:114:net.minecraft.data.models.model.TextureMapping wool(net.minecraft.resources.ResourceLocation) -> f
+    118:118:net.minecraft.data.models.model.TextureMapping stem(net.minecraft.world.level.block.Block) -> g
+    122:124:net.minecraft.data.models.model.TextureMapping attachedStem(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> a
+    129:129:net.minecraft.data.models.model.TextureMapping pattern(net.minecraft.world.level.block.Block) -> h
+    133:133:net.minecraft.data.models.model.TextureMapping fan(net.minecraft.world.level.block.Block) -> i
+    137:137:net.minecraft.data.models.model.TextureMapping crop(net.minecraft.resources.ResourceLocation) -> g
+    141:141:net.minecraft.data.models.model.TextureMapping pane(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> b
+    145:145:net.minecraft.data.models.model.TextureMapping singleSlot(net.minecraft.data.models.model.TextureSlot,net.minecraft.resources.ResourceLocation) -> d
+    149:151:net.minecraft.data.models.model.TextureMapping column(net.minecraft.world.level.block.Block) -> j
+    155:157:net.minecraft.data.models.model.TextureMapping cubeTop(net.minecraft.world.level.block.Block) -> k
+    162:162:net.minecraft.data.models.model.TextureMapping logColumn(net.minecraft.world.level.block.Block) -> l
+    166:166:net.minecraft.data.models.model.TextureMapping column(net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> a
+    170:173:net.minecraft.data.models.model.TextureMapping cubeBottomTop(net.minecraft.world.level.block.Block) -> m
+    177:182:net.minecraft.data.models.model.TextureMapping cubeBottomTopWithWall(net.minecraft.world.level.block.Block) -> n
+    186:190:net.minecraft.data.models.model.TextureMapping columnWithWall(net.minecraft.world.level.block.Block) -> o
+    194:194:net.minecraft.data.models.model.TextureMapping door(net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> b
+    198:198:net.minecraft.data.models.model.TextureMapping door(net.minecraft.world.level.block.Block) -> p
+    202:202:net.minecraft.data.models.model.TextureMapping particle(net.minecraft.world.level.block.Block) -> q
+    206:206:net.minecraft.data.models.model.TextureMapping particle(net.minecraft.resources.ResourceLocation) -> h
+    210:210:net.minecraft.data.models.model.TextureMapping fire0(net.minecraft.world.level.block.Block) -> r
+    214:214:net.minecraft.data.models.model.TextureMapping fire1(net.minecraft.world.level.block.Block) -> s
+    218:218:net.minecraft.data.models.model.TextureMapping lantern(net.minecraft.world.level.block.Block) -> t
+    222:222:net.minecraft.data.models.model.TextureMapping torch(net.minecraft.world.level.block.Block) -> u
+    226:226:net.minecraft.data.models.model.TextureMapping torch(net.minecraft.resources.ResourceLocation) -> i
+    230:230:net.minecraft.data.models.model.TextureMapping particleFromItem(net.minecraft.world.item.Item) -> a
+    234:237:net.minecraft.data.models.model.TextureMapping commandBlock(net.minecraft.world.level.block.Block) -> v
+    241:245:net.minecraft.data.models.model.TextureMapping orientableCube(net.minecraft.world.level.block.Block) -> w
+    249:252:net.minecraft.data.models.model.TextureMapping orientableCubeOnlyTop(net.minecraft.world.level.block.Block) -> x
+    256:259:net.minecraft.data.models.model.TextureMapping orientableCubeSameEnds(net.minecraft.world.level.block.Block) -> y
+    263:263:net.minecraft.data.models.model.TextureMapping top(net.minecraft.world.level.block.Block) -> z
+    267:274:net.minecraft.data.models.model.TextureMapping craftingTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> c
+    279:286:net.minecraft.data.models.model.TextureMapping fletchingTable(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> d
+    290:292:net.minecraft.data.models.model.TextureMapping campfire(net.minecraft.world.level.block.Block) -> A
+    297:297:net.minecraft.data.models.model.TextureMapping layer0(net.minecraft.world.item.Item) -> b
+    301:301:net.minecraft.data.models.model.TextureMapping layer0(net.minecraft.world.level.block.Block) -> B
+    305:305:net.minecraft.data.models.model.TextureMapping layer0(net.minecraft.resources.ResourceLocation) -> j
+    309:310:net.minecraft.resources.ResourceLocation getBlockTexture(net.minecraft.world.level.block.Block) -> C
+    314:315:net.minecraft.resources.ResourceLocation getBlockTexture(net.minecraft.world.level.block.Block,java.lang.String) -> a
+    319:320:net.minecraft.resources.ResourceLocation getItemTexture(net.minecraft.world.item.Item) -> c
+    324:325:net.minecraft.resources.ResourceLocation getItemTexture(net.minecraft.world.item.Item,java.lang.String) -> a
+net.minecraft.data.models.model.TextureSlot -> iz:
+    net.minecraft.data.models.model.TextureSlot ALL -> a
+    net.minecraft.data.models.model.TextureSlot TEXTURE -> b
+    net.minecraft.data.models.model.TextureSlot PARTICLE -> c
+    net.minecraft.data.models.model.TextureSlot END -> d
+    net.minecraft.data.models.model.TextureSlot BOTTOM -> e
+    net.minecraft.data.models.model.TextureSlot TOP -> f
+    net.minecraft.data.models.model.TextureSlot FRONT -> g
+    net.minecraft.data.models.model.TextureSlot BACK -> h
+    net.minecraft.data.models.model.TextureSlot SIDE -> i
+    net.minecraft.data.models.model.TextureSlot NORTH -> j
+    net.minecraft.data.models.model.TextureSlot SOUTH -> k
+    net.minecraft.data.models.model.TextureSlot EAST -> l
+    net.minecraft.data.models.model.TextureSlot WEST -> m
+    net.minecraft.data.models.model.TextureSlot UP -> n
+    net.minecraft.data.models.model.TextureSlot DOWN -> o
+    net.minecraft.data.models.model.TextureSlot CROSS -> p
+    net.minecraft.data.models.model.TextureSlot PLANT -> q
+    net.minecraft.data.models.model.TextureSlot WALL -> r
+    net.minecraft.data.models.model.TextureSlot RAIL -> s
+    net.minecraft.data.models.model.TextureSlot WOOL -> t
+    net.minecraft.data.models.model.TextureSlot PATTERN -> u
+    net.minecraft.data.models.model.TextureSlot PANE -> v
+    net.minecraft.data.models.model.TextureSlot EDGE -> w
+    net.minecraft.data.models.model.TextureSlot FAN -> x
+    net.minecraft.data.models.model.TextureSlot STEM -> y
+    net.minecraft.data.models.model.TextureSlot UPPER_STEM -> z
+    net.minecraft.data.models.model.TextureSlot CROP -> A
+    net.minecraft.data.models.model.TextureSlot DIRT -> B
+    net.minecraft.data.models.model.TextureSlot FIRE -> C
+    net.minecraft.data.models.model.TextureSlot LANTERN -> D
+    net.minecraft.data.models.model.TextureSlot PLATFORM -> E
+    net.minecraft.data.models.model.TextureSlot UNSTICKY -> F
+    net.minecraft.data.models.model.TextureSlot TORCH -> G
+    net.minecraft.data.models.model.TextureSlot LAYER0 -> H
+    net.minecraft.data.models.model.TextureSlot LIT_LOG -> I
+    java.lang.String id -> J
+    net.minecraft.data.models.model.TextureSlot parent -> K
+    48:48:net.minecraft.data.models.model.TextureSlot create(java.lang.String) -> a
+    52:52:net.minecraft.data.models.model.TextureSlot create(java.lang.String,net.minecraft.data.models.model.TextureSlot) -> a
+    55:58:void <init>(java.lang.String,net.minecraft.data.models.model.TextureSlot) -> <init>
+    61:61:java.lang.String getId() -> a
+    66:66:net.minecraft.data.models.model.TextureSlot getParent() -> b
+    71:71:java.lang.String toString() -> toString
+    6:40:void <clinit>() -> <clinit>
+net.minecraft.data.models.model.TexturedModel -> ja:
+    net.minecraft.data.models.model.TexturedModel$Provider CUBE -> a
+    net.minecraft.data.models.model.TexturedModel$Provider CUBE_MIRRORED -> b
+    net.minecraft.data.models.model.TexturedModel$Provider COLUMN -> c
+    net.minecraft.data.models.model.TexturedModel$Provider COLUMN_HORIZONTAL -> d
+    net.minecraft.data.models.model.TexturedModel$Provider CUBE_TOP_BOTTOM -> e
+    net.minecraft.data.models.model.TexturedModel$Provider CUBE_TOP -> f
+    net.minecraft.data.models.model.TexturedModel$Provider ORIENTABLE_ONLY_TOP -> g
+    net.minecraft.data.models.model.TexturedModel$Provider ORIENTABLE -> h
+    net.minecraft.data.models.model.TexturedModel$Provider CARPET -> i
+    net.minecraft.data.models.model.TexturedModel$Provider GLAZED_TERRACOTTA -> j
+    net.minecraft.data.models.model.TexturedModel$Provider CORAL_FAN -> k
+    net.minecraft.data.models.model.TexturedModel$Provider PARTICLE_ONLY -> l
+    net.minecraft.data.models.model.TexturedModel$Provider ANVIL -> m
+    net.minecraft.data.models.model.TexturedModel$Provider LEAVES -> n
+    net.minecraft.data.models.model.TexturedModel$Provider LANTERN -> o
+    net.minecraft.data.models.model.TexturedModel$Provider HANGING_LANTERN -> p
+    net.minecraft.data.models.model.TexturedModel$Provider SEAGRASS -> q
+    net.minecraft.data.models.model.TexturedModel$Provider COLUMN_ALT -> r
+    net.minecraft.data.models.model.TexturedModel$Provider COLUMN_HORIZONTAL_ALT -> s
+    net.minecraft.data.models.model.TexturedModel$Provider TOP_BOTTOM_WITH_WALL -> t
+    net.minecraft.data.models.model.TexturedModel$Provider COLUMN_WITH_WALL -> u
+    net.minecraft.data.models.model.TextureMapping mapping -> v
+    net.minecraft.data.models.model.ModelTemplate template -> w
+    48:51:void <init>(net.minecraft.data.models.model.TextureMapping,net.minecraft.data.models.model.ModelTemplate) -> <init>
+    54:54:net.minecraft.data.models.model.ModelTemplate getTemplate() -> a
+    58:58:net.minecraft.data.models.model.TextureMapping getMapping() -> b
+    62:63:net.minecraft.data.models.model.TexturedModel updateTextures(java.util.function.Consumer) -> a
+    67:67:net.minecraft.resources.ResourceLocation create(net.minecraft.world.level.block.Block,java.util.function.BiConsumer) -> a
+    71:71:net.minecraft.resources.ResourceLocation createWithSuffix(net.minecraft.world.level.block.Block,java.lang.String,java.util.function.BiConsumer) -> a
+    75:75:net.minecraft.data.models.model.TexturedModel$Provider createDefault(java.util.function.Function,net.minecraft.data.models.model.ModelTemplate) -> a
+    79:79:net.minecraft.data.models.model.TexturedModel createAllSame(net.minecraft.resources.ResourceLocation) -> a
+    75:75:net.minecraft.data.models.model.TexturedModel lambda$createDefault$0(java.util.function.Function,net.minecraft.data.models.model.ModelTemplate,net.minecraft.world.level.block.Block) -> a
+    13:43:void <clinit>() -> <clinit>
+net.minecraft.data.models.model.TexturedModel$Provider -> ja$a:
+    net.minecraft.data.models.model.TexturedModel get(net.minecraft.world.level.block.Block) -> get
+    87:87:net.minecraft.resources.ResourceLocation create(net.minecraft.world.level.block.Block,java.util.function.BiConsumer) -> a
+    91:91:net.minecraft.resources.ResourceLocation createWithSuffix(net.minecraft.world.level.block.Block,java.lang.String,java.util.function.BiConsumer) -> a
+    95:95:net.minecraft.data.models.model.TexturedModel$Provider updateTexture(java.util.function.Consumer) -> a
+    95:95:net.minecraft.data.models.model.TexturedModel lambda$updateTexture$0(java.util.function.Consumer,net.minecraft.world.level.block.Block) -> a
+net.minecraft.data.models.model.package-info -> jb:
+net.minecraft.data.models.package-info -> jc:
+net.minecraft.data.package-info -> jd:
+net.minecraft.data.recipes.FinishedRecipe -> je:
     void serializeRecipeData(com.google.gson.JsonObject) -> a
     14:17:com.google.gson.JsonObject serializeRecipe() -> a
     net.minecraft.resources.ResourceLocation getId() -> b
     net.minecraft.world.item.crafting.RecipeSerializer getType() -> c
     com.google.gson.JsonObject serializeAdvancement() -> d
     net.minecraft.resources.ResourceLocation getAdvancementId() -> e
-net.minecraft.data.recipes.RecipeProvider -> hv:
+net.minecraft.data.recipes.RecipeProvider -> jf:
     org.apache.logging.log4j.Logger LOGGER -> b
     com.google.gson.Gson GSON -> c
     net.minecraft.data.DataGenerator generator -> d
-    55:57:void <init>(net.minecraft.data.DataGenerator) -> <init>
-    61:75:void run(net.minecraft.data.HashCache) -> a
-    79:92:void saveRecipe(net.minecraft.data.HashCache,com.google.gson.JsonObject,java.nio.file.Path) -> a
-    96:109:void saveAdvancement(net.minecraft.data.HashCache,com.google.gson.JsonObject,java.nio.file.Path) -> b
-    112:5515:void buildShapelessRecipes(java.util.function.Consumer) -> a
-    5518:5553:void cookRecipes(java.util.function.Consumer,java.lang.String,net.minecraft.world.item.crafting.SimpleCookingSerializer,int) -> a
-    5557:5557:net.minecraft.advancements.critereon.EnterBlockTrigger$TriggerInstance insideOf(net.minecraft.world.level.block.Block) -> a
-    5561:5561:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance has(net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.world.level.ItemLike) -> a
-    5565:5565:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance has(net.minecraft.world.level.ItemLike) -> a
-    5569:5569:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance has(net.minecraft.tags.Tag) -> a
-    5573:5573:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance inventoryTrigger(net.minecraft.advancements.critereon.ItemPredicate[]) -> a
-    5578:5578:java.lang.String getName() -> a
-    64:72:void lambda$run$0(java.util.Set,net.minecraft.data.HashCache,java.nio.file.Path,net.minecraft.data.recipes.FinishedRecipe) -> a
-    50:51:void <clinit>() -> <clinit>
-net.minecraft.data.recipes.ShapedRecipeBuilder -> hw:
+    58:60:void <init>(net.minecraft.data.DataGenerator) -> <init>
+    64:78:void run(net.minecraft.data.HashCache) -> a
+    82:95:void saveRecipe(net.minecraft.data.HashCache,com.google.gson.JsonObject,java.nio.file.Path) -> a
+    99:112:void saveAdvancement(net.minecraft.data.HashCache,com.google.gson.JsonObject,java.nio.file.Path) -> b
+    115:4010:void buildShapelessRecipes(java.util.function.Consumer) -> a
+    4013:4016:void netheriteSmithing(java.util.function.Consumer,net.minecraft.world.item.Item,net.minecraft.world.item.Item) -> a
+    4020:4025:void planksFromLog(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.tags.Tag) -> a
+    4028:4033:void planksFromLogs(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.tags.Tag) -> b
+    4036:4043:void woodFromLogs(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> a
+    4046:4053:void woodenBoat(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> b
+    4056:4061:void woodenButton(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> c
+    4064:4072:void woodenDoor(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> d
+    4075:4083:void woodenFence(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> e
+    4086:4094:void woodenFenceGate(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> f
+    4097:4103:void woodenPressurePlate(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> g
+    4106:4112:void woodenSlab(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> h
+    4115:4123:void woodenStairs(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> i
+    4126:4133:void woodenTrapdoor(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> j
+    4136:4146:void woodenSign(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> k
+    4149:4155:void coloredWoolFromWhiteWoolAndDye(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> l
+    4158:4165:void carpetFromWool(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> m
+    4168:4180:void coloredCarpetFromWhiteCarpetAndDye(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> n
+    4183:4192:void bedFromPlanksAndWool(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> o
+    4195:4202:void bedFromWhiteBedAndDye(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> p
+    4205:4215:void banner(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> q
+    4218:4227:void stainedGlassFromGlassAndDye(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> r
+    4230:4237:void stainedGlassPaneFromStainedGlass(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> s
+    4240:4252:void stainedGlassPaneFromGlassPaneAndDye(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> t
+    4255:4264:void coloredTerracottaFromTerracottaAndDye(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> u
+    4267:4275:void concretePowder(java.util.function.Consumer,net.minecraft.world.level.ItemLike,net.minecraft.world.level.ItemLike) -> v
+    4278:4313:void cookRecipes(java.util.function.Consumer,java.lang.String,net.minecraft.world.item.crafting.SimpleCookingSerializer,int) -> a
+    4317:4317:net.minecraft.advancements.critereon.EnterBlockTrigger$TriggerInstance insideOf(net.minecraft.world.level.block.Block) -> a
+    4321:4321:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance has(net.minecraft.advancements.critereon.MinMaxBounds$Ints,net.minecraft.world.level.ItemLike) -> a
+    4325:4325:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance has(net.minecraft.world.level.ItemLike) -> a
+    4329:4329:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance has(net.minecraft.tags.Tag) -> a
+    4333:4333:net.minecraft.advancements.critereon.InventoryChangeTrigger$TriggerInstance inventoryTrigger(net.minecraft.advancements.critereon.ItemPredicate[]) -> a
+    4338:4338:java.lang.String getName() -> a
+    67:75:void lambda$run$0(java.util.Set,net.minecraft.data.HashCache,java.nio.file.Path,net.minecraft.data.recipes.FinishedRecipe) -> a
+    53:54:void <clinit>() -> <clinit>
+net.minecraft.data.recipes.ShapedRecipeBuilder -> jg:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.item.Item result -> b
     int count -> c
@@ -21841,14 +24137,14 @@ net.minecraft.data.recipes.ShapedRecipeBuilder -> hw:
     57:57:net.minecraft.data.recipes.ShapedRecipeBuilder define(java.lang.Character,net.minecraft.world.level.ItemLike) -> a
     61:68:net.minecraft.data.recipes.ShapedRecipeBuilder define(java.lang.Character,net.minecraft.world.item.crafting.Ingredient) -> a
     72:76:net.minecraft.data.recipes.ShapedRecipeBuilder pattern(java.lang.String) -> a
-    80:81:net.minecraft.data.recipes.ShapedRecipeBuilder unlocks(java.lang.String,net.minecraft.advancements.CriterionTriggerInstance) -> a
+    80:81:net.minecraft.data.recipes.ShapedRecipeBuilder unlockedBy(java.lang.String,net.minecraft.advancements.CriterionTriggerInstance) -> a
     85:86:net.minecraft.data.recipes.ShapedRecipeBuilder group(java.lang.String) -> b
     90:91:void save(java.util.function.Consumer) -> a
     94:99:void save(java.util.function.Consumer,java.lang.String) -> a
     102:109:void save(java.util.function.Consumer,net.minecraft.resources.ResourceLocation) -> a
     112:140:void ensureValid(net.minecraft.resources.ResourceLocation) -> a
     30:30:void <clinit>() -> <clinit>
-net.minecraft.data.recipes.ShapedRecipeBuilder$Result -> hw$a:
+net.minecraft.data.recipes.ShapedRecipeBuilder$Result -> jg$a:
     net.minecraft.resources.ResourceLocation id -> b
     net.minecraft.world.item.Item result -> c
     int count -> d
@@ -21864,7 +24160,7 @@ net.minecraft.data.recipes.ShapedRecipeBuilder$Result -> hw$a:
     196:196:net.minecraft.resources.ResourceLocation getId() -> b
     202:202:com.google.gson.JsonObject serializeAdvancement() -> d
     208:208:net.minecraft.resources.ResourceLocation getAdvancementId() -> e
-net.minecraft.data.recipes.ShapelessRecipeBuilder -> hx:
+net.minecraft.data.recipes.ShapelessRecipeBuilder -> jh:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.item.Item result -> b
     int count -> c
@@ -21879,14 +24175,14 @@ net.minecraft.data.recipes.ShapelessRecipeBuilder -> hx:
     56:59:net.minecraft.data.recipes.ShapelessRecipeBuilder requires(net.minecraft.world.level.ItemLike,int) -> b
     63:63:net.minecraft.data.recipes.ShapelessRecipeBuilder requires(net.minecraft.world.item.crafting.Ingredient) -> a
     67:70:net.minecraft.data.recipes.ShapelessRecipeBuilder requires(net.minecraft.world.item.crafting.Ingredient,int) -> a
-    74:75:net.minecraft.data.recipes.ShapelessRecipeBuilder unlocks(java.lang.String,net.minecraft.advancements.CriterionTriggerInstance) -> a
+    74:75:net.minecraft.data.recipes.ShapelessRecipeBuilder unlockedBy(java.lang.String,net.minecraft.advancements.CriterionTriggerInstance) -> a
     79:80:net.minecraft.data.recipes.ShapelessRecipeBuilder group(java.lang.String) -> a
     84:85:void save(java.util.function.Consumer) -> a
     88:93:void save(java.util.function.Consumer,java.lang.String) -> a
     96:103:void save(java.util.function.Consumer,net.minecraft.resources.ResourceLocation) -> a
     106:109:void ensureValid(net.minecraft.resources.ResourceLocation) -> a
     26:26:void <clinit>() -> <clinit>
-net.minecraft.data.recipes.ShapelessRecipeBuilder$Result -> hx$a:
+net.minecraft.data.recipes.ShapelessRecipeBuilder$Result -> jh$a:
     net.minecraft.resources.ResourceLocation id -> a
     net.minecraft.world.item.Item result -> b
     int count -> c
@@ -21900,7 +24196,7 @@ net.minecraft.data.recipes.ShapelessRecipeBuilder$Result -> hx$a:
     157:157:net.minecraft.resources.ResourceLocation getId() -> b
     163:163:com.google.gson.JsonObject serializeAdvancement() -> d
     169:169:net.minecraft.resources.ResourceLocation getAdvancementId() -> e
-net.minecraft.data.recipes.SimpleCookingRecipeBuilder -> hy:
+net.minecraft.data.recipes.SimpleCookingRecipeBuilder -> ji:
     net.minecraft.world.item.Item result -> a
     net.minecraft.world.item.crafting.Ingredient ingredient -> b
     float experience -> c
@@ -21914,13 +24210,13 @@ net.minecraft.data.recipes.SimpleCookingRecipeBuilder -> hy:
     47:47:net.minecraft.data.recipes.SimpleCookingRecipeBuilder blasting(net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.level.ItemLike,float,int) -> b
     51:51:net.minecraft.data.recipes.SimpleCookingRecipeBuilder smelting(net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.level.ItemLike,float,int) -> c
     55:55:net.minecraft.data.recipes.SimpleCookingRecipeBuilder smoking(net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.level.ItemLike,float,int) -> d
-    59:60:net.minecraft.data.recipes.SimpleCookingRecipeBuilder unlocks(java.lang.String,net.minecraft.advancements.CriterionTriggerInstance) -> a
+    59:60:net.minecraft.data.recipes.SimpleCookingRecipeBuilder unlockedBy(java.lang.String,net.minecraft.advancements.CriterionTriggerInstance) -> a
     64:65:net.minecraft.data.recipes.SimpleCookingRecipeBuilder group(java.lang.String) -> a
     69:70:void save(java.util.function.Consumer) -> a
     73:80:void save(java.util.function.Consumer,java.lang.String) -> a
     83:91:void save(java.util.function.Consumer,net.minecraft.resources.ResourceLocation) -> a
     94:97:void ensureValid(net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.data.recipes.SimpleCookingRecipeBuilder$Result -> hy$a:
+net.minecraft.data.recipes.SimpleCookingRecipeBuilder$Result -> ji$a:
     net.minecraft.resources.ResourceLocation id -> a
     java.lang.String group -> b
     net.minecraft.world.item.crafting.Ingredient ingredient -> c
@@ -21936,7 +24232,7 @@ net.minecraft.data.recipes.SimpleCookingRecipeBuilder$Result -> hy$a:
     141:141:net.minecraft.resources.ResourceLocation getId() -> b
     147:147:com.google.gson.JsonObject serializeAdvancement() -> d
     153:153:net.minecraft.resources.ResourceLocation getAdvancementId() -> e
-net.minecraft.data.recipes.SingleItemRecipeBuilder -> hz:
+net.minecraft.data.recipes.SingleItemRecipeBuilder -> jj:
     net.minecraft.world.item.Item result -> a
     net.minecraft.world.item.crafting.Ingredient ingredient -> b
     int count -> c
@@ -21951,7 +24247,7 @@ net.minecraft.data.recipes.SingleItemRecipeBuilder -> hz:
     53:58:void save(java.util.function.Consumer,java.lang.String) -> a
     61:69:void save(java.util.function.Consumer,net.minecraft.resources.ResourceLocation) -> a
     72:75:void ensureValid(net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.data.recipes.SingleItemRecipeBuilder$Result -> hz$a:
+net.minecraft.data.recipes.SingleItemRecipeBuilder$Result -> jj$a:
     net.minecraft.resources.ResourceLocation id -> a
     java.lang.String group -> b
     net.minecraft.world.item.crafting.Ingredient ingredient -> c
@@ -21966,13 +24262,13 @@ net.minecraft.data.recipes.SingleItemRecipeBuilder$Result -> hz$a:
     116:116:net.minecraft.world.item.crafting.RecipeSerializer getType() -> c
     122:122:com.google.gson.JsonObject serializeAdvancement() -> d
     128:128:net.minecraft.resources.ResourceLocation getAdvancementId() -> e
-net.minecraft.data.recipes.SpecialRecipeBuilder -> ia:
+net.minecraft.data.recipes.SpecialRecipeBuilder -> jk:
     net.minecraft.world.item.crafting.SimpleRecipeSerializer serializer -> a
     14:16:void <init>(net.minecraft.world.item.crafting.SimpleRecipeSerializer) -> <init>
     19:19:net.minecraft.data.recipes.SpecialRecipeBuilder special(net.minecraft.world.item.crafting.SimpleRecipeSerializer) -> a
     23:49:void save(java.util.function.Consumer,java.lang.String) -> a
     11:11:net.minecraft.world.item.crafting.SimpleRecipeSerializer access$000(net.minecraft.data.recipes.SpecialRecipeBuilder) -> a
-net.minecraft.data.recipes.SpecialRecipeBuilder$1 -> ia$1:
+net.minecraft.data.recipes.SpecialRecipeBuilder$1 -> jk$1:
     java.lang.String val$id -> a
     net.minecraft.data.recipes.SpecialRecipeBuilder this$0 -> b
     23:23:void <init>(net.minecraft.data.recipes.SpecialRecipeBuilder,java.lang.String) -> <init>
@@ -21981,8 +24277,34 @@ net.minecraft.data.recipes.SpecialRecipeBuilder$1 -> ia$1:
     35:35:net.minecraft.resources.ResourceLocation getId() -> b
     41:41:com.google.gson.JsonObject serializeAdvancement() -> d
     46:46:net.minecraft.resources.ResourceLocation getAdvancementId() -> e
-net.minecraft.data.recipes.package-info -> ib:
-net.minecraft.data.structures.NbtToSnbt -> ic:
+net.minecraft.data.recipes.UpgradeRecipeBuilder -> jl:
+    net.minecraft.world.item.crafting.Ingredient base -> a
+    net.minecraft.world.item.crafting.Ingredient addition -> b
+    net.minecraft.world.item.Item result -> c
+    net.minecraft.advancements.Advancement$Builder advancement -> d
+    net.minecraft.world.item.crafting.RecipeSerializer type -> e
+    22:30:void <init>(net.minecraft.world.item.crafting.RecipeSerializer,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.Item) -> <init>
+    33:33:net.minecraft.data.recipes.UpgradeRecipeBuilder smithing(net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.Item) -> a
+    37:38:net.minecraft.data.recipes.UpgradeRecipeBuilder unlocks(java.lang.String,net.minecraft.advancements.CriterionTriggerInstance) -> a
+    42:43:void save(java.util.function.Consumer,java.lang.String) -> a
+    46:54:void save(java.util.function.Consumer,net.minecraft.resources.ResourceLocation) -> a
+    57:60:void ensureValid(net.minecraft.resources.ResourceLocation) -> a
+net.minecraft.data.recipes.UpgradeRecipeBuilder$Result -> jl$a:
+    net.minecraft.resources.ResourceLocation id -> a
+    net.minecraft.world.item.crafting.Ingredient base -> b
+    net.minecraft.world.item.crafting.Ingredient addition -> c
+    net.minecraft.world.item.Item result -> d
+    net.minecraft.advancements.Advancement$Builder advancement -> e
+    net.minecraft.resources.ResourceLocation advancementId -> f
+    net.minecraft.world.item.crafting.RecipeSerializer type -> g
+    71:79:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.world.item.crafting.RecipeSerializer,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.Item,net.minecraft.advancements.Advancement$Builder,net.minecraft.resources.ResourceLocation) -> <init>
+    83:88:void serializeRecipeData(com.google.gson.JsonObject) -> a
+    92:92:net.minecraft.resources.ResourceLocation getId() -> b
+    97:97:net.minecraft.world.item.crafting.RecipeSerializer getType() -> c
+    103:103:com.google.gson.JsonObject serializeAdvancement() -> d
+    109:109:net.minecraft.resources.ResourceLocation getAdvancementId() -> e
+net.minecraft.data.recipes.package-info -> jm:
+net.minecraft.data.structures.NbtToSnbt -> jn:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.data.DataGenerator generator -> c
     23:25:void <init>(net.minecraft.data.DataGenerator) -> <init>
@@ -21993,96 +24315,107 @@ net.minecraft.data.structures.NbtToSnbt -> ic:
     32:32:void lambda$run$1(java.nio.file.Path,java.nio.file.Path,java.nio.file.Path) -> a
     32:32:boolean lambda$run$0(java.nio.file.Path) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.data.structures.SnbtToNbt -> id:
-    org.apache.logging.log4j.Logger LOGGER -> b
-    net.minecraft.data.DataGenerator generator -> c
-    java.util.List filters -> d
-    32:36:void <init>(net.minecraft.data.DataGenerator) -> <init>
-    39:40:net.minecraft.data.structures.SnbtToNbt addFilter(net.minecraft.data.structures.SnbtToNbt$Filter) -> a
-    44:48:net.minecraft.nbt.CompoundTag applyFilters(java.lang.String,net.minecraft.nbt.CompoundTag) -> a
-    65:76:void run(net.minecraft.data.HashCache) -> a
-    80:80:java.lang.String getName() -> a
-    84:85:java.lang.String getName(java.nio.file.Path,java.nio.file.Path) -> a
-    90:102:net.minecraft.data.structures.SnbtToNbt$TaskResult readStructure(java.nio.file.Path,java.lang.String) -> a
-    106:118:void storeStructureIfChanged(net.minecraft.data.HashCache,net.minecraft.data.structures.SnbtToNbt$TaskResult,java.nio.file.Path) -> a
-    75:75:void lambda$run$3(net.minecraft.data.HashCache,java.nio.file.Path,net.minecraft.data.structures.SnbtToNbt$TaskResult) -> a
-    71:72:void lambda$run$2(java.util.List,java.nio.file.Path,java.nio.file.Path) -> a
-    71:71:net.minecraft.data.structures.SnbtToNbt$TaskResult lambda$null$1(java.nio.file.Path,java.nio.file.Path) -> b
-    70:70:boolean lambda$run$0(java.nio.file.Path) -> a
-    28:28:void <clinit>() -> <clinit>
-net.minecraft.data.structures.SnbtToNbt$Filter -> id$a:
+net.minecraft.data.structures.SnbtToNbt -> jo:
+    java.nio.file.Path dumpSnbtTo -> b
+    org.apache.logging.log4j.Logger LOGGER -> c
+    net.minecraft.data.DataGenerator generator -> d
+    java.util.List filters -> e
+    38:42:void <init>(net.minecraft.data.DataGenerator) -> <init>
+    45:46:net.minecraft.data.structures.SnbtToNbt addFilter(net.minecraft.data.structures.SnbtToNbt$Filter) -> a
+    50:54:net.minecraft.nbt.CompoundTag applyFilters(java.lang.String,net.minecraft.nbt.CompoundTag) -> a
+    74:85:void run(net.minecraft.data.HashCache) -> a
+    89:89:java.lang.String getName() -> a
+    93:94:java.lang.String getName(java.nio.file.Path,java.nio.file.Path) -> a
+    99:118:net.minecraft.data.structures.SnbtToNbt$TaskResult readStructure(java.nio.file.Path,java.lang.String) -> a
+    122:143:void storeStructureIfChanged(net.minecraft.data.HashCache,net.minecraft.data.structures.SnbtToNbt$TaskResult,java.nio.file.Path) -> a
+    84:84:void lambda$run$3(net.minecraft.data.HashCache,java.nio.file.Path,net.minecraft.data.structures.SnbtToNbt$TaskResult) -> a
+    80:81:void lambda$run$2(java.util.List,java.nio.file.Path,java.nio.file.Path) -> a
+    80:80:net.minecraft.data.structures.SnbtToNbt$TaskResult lambda$null$1(java.nio.file.Path,java.nio.file.Path) -> b
+    79:79:boolean lambda$run$0(java.nio.file.Path) -> a
+    32:34:void <clinit>() -> <clinit>
+net.minecraft.data.structures.SnbtToNbt$Filter -> jo$a:
     net.minecraft.nbt.CompoundTag apply(java.lang.String,net.minecraft.nbt.CompoundTag) -> a
-net.minecraft.data.structures.SnbtToNbt$TaskResult -> id$b:
+net.minecraft.data.structures.SnbtToNbt$TaskResult -> jo$b:
     java.lang.String name -> a
     byte[] payload -> b
-    java.lang.String hash -> c
-    56:60:void <init>(java.lang.String,byte[],java.lang.String) -> <init>
-    51:51:java.lang.String access$000(net.minecraft.data.structures.SnbtToNbt$TaskResult) -> a
-    51:51:java.lang.String access$100(net.minecraft.data.structures.SnbtToNbt$TaskResult) -> b
-    51:51:byte[] access$200(net.minecraft.data.structures.SnbtToNbt$TaskResult) -> c
-net.minecraft.data.structures.StructureUpdater -> ie:
-    11:11:void <init>() -> <init>
-    14:17:net.minecraft.nbt.CompoundTag apply(java.lang.String,net.minecraft.nbt.CompoundTag) -> a
-    21:24:net.minecraft.nbt.CompoundTag patchVersion(net.minecraft.nbt.CompoundTag) -> a
-    28:30:net.minecraft.nbt.CompoundTag updateStructure(net.minecraft.nbt.CompoundTag) -> b
-net.minecraft.data.structures.package-info -> ig:
-net.minecraft.data.tags.BlockTagsProvider -> ih:
-    15:16:void <init>(net.minecraft.data.DataGenerator) -> <init>
-    20:76:void addTags() -> b
-    80:80:java.nio.file.Path getPath(net.minecraft.resources.ResourceLocation) -> a
-    85:85:java.lang.String getName() -> a
-    90:91:void useTags(net.minecraft.tags.TagCollection) -> a
-net.minecraft.data.tags.EntityTypeTagsProvider -> ii:
+    java.lang.String snbtPayload -> c
+    java.lang.String hash -> d
+    64:69:void <init>(java.lang.String,byte[],java.lang.String,java.lang.String) -> <init>
+    57:57:java.lang.String access$000(net.minecraft.data.structures.SnbtToNbt$TaskResult) -> a
+    57:57:java.lang.String access$100(net.minecraft.data.structures.SnbtToNbt$TaskResult) -> b
+    57:57:java.lang.String access$200(net.minecraft.data.structures.SnbtToNbt$TaskResult) -> c
+    57:57:byte[] access$300(net.minecraft.data.structures.SnbtToNbt$TaskResult) -> d
+net.minecraft.data.structures.StructureUpdater -> jp:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    13:13:void <init>() -> <init>
+    18:21:net.minecraft.nbt.CompoundTag apply(java.lang.String,net.minecraft.nbt.CompoundTag) -> a
+    25:28:net.minecraft.nbt.CompoundTag patchVersion(net.minecraft.nbt.CompoundTag) -> a
+    32:40:net.minecraft.nbt.CompoundTag updateStructure(java.lang.String,net.minecraft.nbt.CompoundTag) -> b
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.data.structures.package-info -> jq:
+net.minecraft.data.tags.BlockTagsProvider -> jr:
     14:15:void <init>(net.minecraft.data.DataGenerator) -> <init>
-    19:23:void addTags() -> b
+    19:102:void addTags() -> b
+    106:106:java.nio.file.Path getPath(net.minecraft.resources.ResourceLocation) -> a
+    111:111:java.lang.String getName() -> a
+net.minecraft.data.tags.EntityTypeTagsProvider -> js:
+    13:14:void <init>(net.minecraft.data.DataGenerator) -> <init>
+    18:23:void addTags() -> b
     27:27:java.nio.file.Path getPath(net.minecraft.resources.ResourceLocation) -> a
     32:32:java.lang.String getName() -> a
-    37:38:void useTags(net.minecraft.tags.TagCollection) -> a
-net.minecraft.data.tags.FluidTagsProvider -> ij:
-    15:16:void <init>(net.minecraft.data.DataGenerator) -> <init>
-    20:22:void addTags() -> b
-    26:26:java.nio.file.Path getPath(net.minecraft.resources.ResourceLocation) -> a
-    31:31:java.lang.String getName() -> a
-    36:37:void useTags(net.minecraft.tags.TagCollection) -> a
-net.minecraft.data.tags.ItemTagsProvider -> ik:
-    org.apache.logging.log4j.Logger LOGGER -> e
-    24:25:void <init>(net.minecraft.data.DataGenerator) -> <init>
-    29:72:void addTags() -> b
-    75:80:void copy(net.minecraft.tags.Tag,net.minecraft.tags.Tag) -> a
-    83:97:net.minecraft.tags.Tag$Entry copy(net.minecraft.tags.Tag$Entry) -> a
-    103:103:java.nio.file.Path getPath(net.minecraft.resources.ResourceLocation) -> a
-    108:108:java.lang.String getName() -> a
-    113:114:void useTags(net.minecraft.tags.TagCollection) -> a
-    21:21:void <clinit>() -> <clinit>
-net.minecraft.data.tags.TagsProvider -> il:
-    org.apache.logging.log4j.Logger LOGGER -> e
-    com.google.gson.Gson GSON -> f
+net.minecraft.data.tags.FluidTagsProvider -> jt:
+    14:15:void <init>(net.minecraft.data.DataGenerator) -> <init>
+    19:21:void addTags() -> b
+    25:25:java.nio.file.Path getPath(net.minecraft.resources.ResourceLocation) -> a
+    30:30:java.lang.String getName() -> a
+net.minecraft.data.tags.ItemTagsProvider -> ju:
+    java.util.function.Function blockTags -> d
+    20:22:void <init>(net.minecraft.data.DataGenerator,net.minecraft.data.tags.BlockTagsProvider) -> <init>
+    26:86:void addTags() -> b
+    89:92:void copy(net.minecraft.tags.Tag$Named,net.minecraft.tags.Tag$Named) -> a
+    96:96:java.nio.file.Path getPath(net.minecraft.resources.ResourceLocation) -> a
+    101:101:java.lang.String getName() -> a
+net.minecraft.data.tags.TagsProvider -> jv:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    com.google.gson.Gson GSON -> e
     net.minecraft.data.DataGenerator generator -> b
     net.minecraft.core.Registry registry -> c
-    java.util.Map builders -> d
-    33:38:void <init>(net.minecraft.data.DataGenerator,net.minecraft.core.Registry) -> <init>
+    java.util.Map builders -> f
+    35:40:void <init>(net.minecraft.data.DataGenerator,net.minecraft.core.Registry) -> <init>
     void addTags() -> b
-    44:72:void run(net.minecraft.data.HashCache) -> a
-    void useTags(net.minecraft.tags.TagCollection) -> a
+    46:75:void run(net.minecraft.data.HashCache) -> a
     java.nio.file.Path getPath(net.minecraft.resources.ResourceLocation) -> a
-    79:79:net.minecraft.tags.Tag$Builder tag(net.minecraft.tags.Tag) -> a
-    79:79:net.minecraft.tags.Tag$Builder lambda$tag$3(net.minecraft.tags.Tag) -> b
-    52:68:void lambda$run$2(net.minecraft.data.HashCache,net.minecraft.resources.ResourceLocation,net.minecraft.tags.Tag) -> a
-    48:48:net.minecraft.resources.ResourceLocation lambda$run$1(java.util.Map$Entry) -> a
-    47:47:java.util.Optional lambda$run$0(net.minecraft.resources.ResourceLocation) -> b
-    27:28:void <clinit>() -> <clinit>
-net.minecraft.data.tags.package-info -> im:
-net.minecraft.gametest.framework.BeforeBatch -> in:
+    80:81:net.minecraft.data.tags.TagsProvider$TagAppender tag(net.minecraft.tags.Tag$Named) -> a
+    85:85:net.minecraft.tags.Tag$Builder getOrCreateRawBuilder(net.minecraft.tags.Tag$Named) -> b
+    85:85:net.minecraft.tags.Tag$Builder lambda$getOrCreateRawBuilder$3(net.minecraft.resources.ResourceLocation) -> b
+    53:74:void lambda$run$2(java.util.function.Function,java.util.function.Function,net.minecraft.data.HashCache,net.minecraft.resources.ResourceLocation,net.minecraft.tags.Tag$Builder) -> a
+    51:51:java.lang.Object lambda$run$1(net.minecraft.resources.ResourceLocation) -> c
+    50:50:net.minecraft.tags.Tag lambda$run$0(net.minecraft.tags.Tag,net.minecraft.resources.ResourceLocation) -> a
+    29:30:void <clinit>() -> <clinit>
+net.minecraft.data.tags.TagsProvider$1 -> jv$1:
+net.minecraft.data.tags.TagsProvider$TagAppender -> jv$a:
+    net.minecraft.tags.Tag$Builder builder -> a
+    net.minecraft.core.Registry registry -> b
+    java.lang.String source -> c
+    93:97:void <init>(net.minecraft.tags.Tag$Builder,net.minecraft.core.Registry,java.lang.String) -> <init>
+    100:101:net.minecraft.data.tags.TagsProvider$TagAppender add(java.lang.Object) -> a
+    105:106:net.minecraft.data.tags.TagsProvider$TagAppender addTag(net.minecraft.tags.Tag$Named) -> a
+    111:112:net.minecraft.data.tags.TagsProvider$TagAppender add(java.lang.Object[]) -> a
+    111:111:void lambda$add$0(net.minecraft.resources.ResourceLocation) -> a
+    88:88:void <init>(net.minecraft.tags.Tag$Builder,net.minecraft.core.Registry,java.lang.String,net.minecraft.data.tags.TagsProvider$1) -> <init>
+net.minecraft.data.tags.package-info -> jw:
+net.minecraft.gametest.framework.BeforeBatch -> jx:
     java.lang.String batch() -> a
-net.minecraft.gametest.framework.GameTest -> io:
+net.minecraft.gametest.framework.GameTest -> jy:
     int timeoutTicks() -> a
     java.lang.String batch() -> b
-    boolean required() -> c
-    java.lang.String template() -> d
-    long setupTicks() -> e
-net.minecraft.gametest.framework.GameTestAssertException -> ip:
+    int rotationSteps() -> c
+    boolean required() -> d
+    java.lang.String template() -> e
+    long setupTicks() -> f
+net.minecraft.gametest.framework.GameTestAssertException -> jz:
     5:6:void <init>(java.lang.String) -> <init>
-net.minecraft.gametest.framework.GameTestAssertPosException -> iq:
+net.minecraft.gametest.framework.GameTestAssertPosException -> ka:
     net.minecraft.core.BlockPos absolutePos -> a
     net.minecraft.core.BlockPos relativePos -> b
     long tick -> c
@@ -22091,7 +24424,7 @@ net.minecraft.gametest.framework.GameTestAssertPosException -> iq:
     27:27:java.lang.String getMessageToShowAtBlock() -> a
     32:32:net.minecraft.core.BlockPos getRelativePos() -> b
     37:37:net.minecraft.core.BlockPos getAbsolutePos() -> c
-net.minecraft.gametest.framework.GameTestBatch -> ir:
+net.minecraft.gametest.framework.GameTestBatch -> kb:
     java.lang.String name -> a
     java.util.Collection testFunctions -> b
     java.util.function.Consumer beforeBatchFunction -> c
@@ -22099,127 +24432,144 @@ net.minecraft.gametest.framework.GameTestBatch -> ir:
     29:29:java.lang.String getName() -> a
     33:33:java.util.Collection getTestFunctions() -> b
     37:40:void runBeforeBatchFunction(net.minecraft.server.level.ServerLevel) -> a
-net.minecraft.gametest.framework.GameTestBatchRunner -> is:
+net.minecraft.gametest.framework.GameTestBatchRunner -> kc:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.core.BlockPos startPos -> b
+    net.minecraft.core.BlockPos firstTestNorthWestCorner -> b
     net.minecraft.server.level.ServerLevel level -> c
     net.minecraft.gametest.framework.GameTestTicker testTicker -> d
-    java.util.List allTestInfos -> e
-    java.util.List batches -> f
-    net.minecraft.gametest.framework.MultipleTestTracker currentBatchTracker -> g
-    int currentBatchIndex -> h
-    net.minecraft.core.BlockPos$MutableBlockPos nextTestPos -> i
-    int maxDepthOnThisRow -> j
-    21:45:void <init>(java.util.Collection,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.GameTestTicker) -> <init>
-    51:51:java.util.List getTestInfos() -> a
-    55:56:void start() -> b
-    59:95:void runBatch(int) -> a
-    98:101:void testCompleted(net.minecraft.gametest.framework.GameTestInfo) -> a
-    104:123:void createStructuresForBatch(java.util.Collection) -> a
-    77:94:void lambda$runBatch$1(net.minecraft.gametest.framework.GameTestInfo) -> b
-    36:44:void lambda$new$0(net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.GameTestBatch) -> a
-    15:15:void access$000(net.minecraft.gametest.framework.GameTestBatchRunner,net.minecraft.gametest.framework.GameTestInfo) -> a
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.gametest.framework.GameTestBatchRunner$1 -> is$1:
+    int testsPerRow -> e
+    java.util.List allTestInfos -> f
+    java.util.Map northWestCorners -> g
+    java.util.List batches -> h
+    net.minecraft.gametest.framework.MultipleTestTracker currentBatchTracker -> i
+    int currentBatchIndex -> j
+    net.minecraft.core.BlockPos$MutableBlockPos nextTestNorthWestCorner -> k
+    25:50:void <init>(java.util.Collection,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.GameTestTicker,int) -> <init>
+    56:56:java.util.List getTestInfos() -> a
+    60:61:void start() -> b
+    64:101:void runBatch(int) -> a
+    104:107:void testCompleted(net.minecraft.gametest.framework.GameTestInfo) -> a
+    110:130:void createStructuresForBatch(java.util.Collection) -> a
+    82:100:void lambda$runBatch$1(net.minecraft.gametest.framework.GameTestInfo) -> b
+    41:49:void lambda$new$0(net.minecraft.world.level.block.Rotation,net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.GameTestBatch) -> a
+    18:18:void access$000(net.minecraft.gametest.framework.GameTestBatchRunner,net.minecraft.gametest.framework.GameTestInfo) -> a
+    19:19:void <clinit>() -> <clinit>
+net.minecraft.gametest.framework.GameTestBatchRunner$1 -> kc$1:
     net.minecraft.gametest.framework.GameTestBatchRunner this$0 -> a
-    78:78:void <init>(net.minecraft.gametest.framework.GameTestBatchRunner) -> <init>
-    81:81:void testStructureLoaded(net.minecraft.gametest.framework.GameTestInfo) -> a
-    85:86:void testPassed(net.minecraft.gametest.framework.GameTestInfo) -> b
-    90:91:void testFailed(net.minecraft.gametest.framework.GameTestInfo) -> c
-net.minecraft.gametest.framework.GameTestEvent -> it:
+    83:83:void <init>(net.minecraft.gametest.framework.GameTestBatchRunner) -> <init>
+    86:86:void testStructureLoaded(net.minecraft.gametest.framework.GameTestInfo) -> a
+    90:91:void testPassed(net.minecraft.gametest.framework.GameTestInfo) -> b
+    95:96:void testFailed(net.minecraft.gametest.framework.GameTestInfo) -> c
+net.minecraft.gametest.framework.GameTestEvent -> kd:
     java.lang.Long expectedDelay -> a
     java.lang.Runnable assertion -> b
     10:13:void <init>(java.lang.Long,java.lang.Runnable) -> <init>
     16:16:net.minecraft.gametest.framework.GameTestEvent create(java.lang.Runnable) -> a
     20:20:net.minecraft.gametest.framework.GameTestEvent create(long,java.lang.Runnable) -> a
-net.minecraft.gametest.framework.GameTestGenerator -> iu:
-net.minecraft.gametest.framework.GameTestHelper -> iv:
+net.minecraft.gametest.framework.GameTestGenerator -> ke:
+net.minecraft.gametest.framework.GameTestHelper -> kf:
     net.minecraft.gametest.framework.GameTestInfo testInfo -> a
     boolean finalCheckAdded -> b
-    36:38:void <init>(net.minecraft.gametest.framework.GameTestInfo) -> <init>
-    43:43:net.minecraft.server.level.ServerLevel getLevel() -> a
-    47:47:net.minecraft.core.BlockPos getTestPos() -> b
-    51:51:net.minecraft.core.BlockPos getStructureSize() -> c
-    57:60:void killAllEntities() -> d
-    63:67:net.minecraft.world.entity.Entity spawn(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> a
-    71:71:net.minecraft.world.entity.Entity spawn(net.minecraft.world.entity.EntityType,int,int,int) -> a
-    75:76:void pressButton(int,int,int) -> a
-    79:86:void pressButton(net.minecraft.core.BlockPos) -> a
-    89:90:void pullLever(int,int,int) -> b
-    93:100:void pullLever(net.minecraft.core.BlockPos) -> b
-    103:105:void pulseRedstone(net.minecraft.core.BlockPos,long) -> a
-    108:109:void setBlock(int,int,int,net.minecraft.world.level.block.Block) -> a
-    112:113:void setBlock(int,int,int,net.minecraft.world.level.block.state.BlockState) -> a
-    116:117:void setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
-    120:121:void setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    124:125:void setNight() -> e
-    128:129:void setDayTime(int) -> a
-    134:135:void assertBlockPresent(net.minecraft.world.level.block.Block,int,int,int) -> a
-    138:139:void assertBlockPresent(net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos) -> a
-    142:143:void assertBlockNotPresent(net.minecraft.world.level.block.Block,int,int,int) -> b
-    146:147:void assertBlockNotPresent(net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos) -> b
-    150:151:void succeedWhenBlockPresent(net.minecraft.world.level.block.Block,int,int,int) -> c
-    154:157:void succeedWhenBlockPresent(net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos) -> c
-    160:161:void assertBlock(net.minecraft.core.BlockPos,java.util.function.Predicate,java.lang.String) -> a
-    164:165:void assertBlock(net.minecraft.core.BlockPos,java.util.function.Predicate,java.util.function.Supplier) -> a
-    168:169:void assertBlockProperty(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
-    172:173:void assertBlockProperty(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.properties.Property,java.util.function.Predicate,java.lang.String) -> a
-    176:180:void assertBlockState(net.minecraft.core.BlockPos,java.util.function.Predicate,java.util.function.Supplier) -> b
-    185:189:void assertEntityPresent(net.minecraft.world.entity.EntityType) -> a
-    192:193:void assertEntityPresent(net.minecraft.world.entity.EntityType,int,int,int) -> b
-    196:201:void assertEntityPresent(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> b
-    204:209:void assertEntityPresent(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos,double) -> a
-    212:220:void assertItemEntityPresent(net.minecraft.world.item.Item,net.minecraft.core.BlockPos,double) -> a
-    224:228:void assertEntityNotPresent(net.minecraft.world.entity.EntityType) -> b
-    231:232:void assertEntityNotPresent(net.minecraft.world.entity.EntityType,int,int,int) -> c
-    235:240:void assertEntityNotPresent(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> c
-    243:250:void assertEntityTouching(net.minecraft.world.entity.EntityType,double,double,double) -> a
-    253:260:void assertEntityNotTouching(net.minecraft.world.entity.EntityType,double,double,double) -> b
-    263:275:void assertEntityData(net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType,java.util.function.Function,java.lang.Object) -> a
-    278:283:void assertContainerEmpty(net.minecraft.core.BlockPos) -> c
-    286:291:void assertContainerContains(net.minecraft.core.BlockPos,net.minecraft.world.item.Item) -> a
-    294:295:void assertAtTickTimeContainerContains(long,net.minecraft.core.BlockPos,net.minecraft.world.item.Item) -> a
-    298:299:void assertAtTickTimeContainerEmpty(long,net.minecraft.core.BlockPos) -> a
-    302:303:void succeedWhenEntityData(net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType,java.util.function.Function,java.lang.Object) -> b
-    306:307:void succeedWhenEntityPresent(net.minecraft.world.entity.EntityType,int,int,int) -> d
-    310:313:void succeedWhenEntityPresent(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> d
-    316:317:void succeedWhenEntityNotPresent(net.minecraft.world.entity.EntityType,int,int,int) -> e
-    320:323:void succeedWhenEntityNotPresent(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> e
-    328:329:void succeed() -> f
-    332:336:void ensureSingleFinalCheck() -> h
-    339:343:void succeedIf(java.lang.Runnable) -> a
-    346:350:void succeedWhen(java.lang.Runnable) -> b
-    353:357:void succeedOnTickWhen(int,java.lang.Runnable) -> a
-    360:361:void runAtTickTime(long,java.lang.Runnable) -> a
-    364:365:void runAfterDelay(long,java.lang.Runnable) -> b
-    368:371:void failIf(java.lang.Runnable) -> c
-    374:374:net.minecraft.gametest.framework.GameTestSequence startSequence() -> g
-    380:380:net.minecraft.core.BlockPos absolutePos(net.minecraft.core.BlockPos) -> d
-    384:385:net.minecraft.world.phys.Vec3 absoluteVec(net.minecraft.world.phys.Vec3) -> a
-    389:389:net.minecraft.world.phys.AABB getBounds() -> i
-    393:393:net.minecraft.world.level.block.Block getBlockType(net.minecraft.core.BlockPos) -> e
-    370:370:java.lang.Exception lambda$failIf$18() -> j
-    321:322:void lambda$succeedWhenEntityNotPresent$17(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> f
-    311:312:void lambda$succeedWhenEntityPresent$16(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> g
-    302:302:void lambda$succeedWhenEntityData$15(net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType,java.util.function.Function,java.lang.Object) -> c
-    298:298:void lambda$assertAtTickTimeContainerEmpty$14(net.minecraft.core.BlockPos) -> f
-    294:294:void lambda$assertAtTickTimeContainerContains$13(net.minecraft.core.BlockPos,net.minecraft.world.item.Item) -> b
-    255:255:boolean lambda$assertEntityNotTouching$12(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> a
-    245:245:boolean lambda$assertEntityTouching$11(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> b
-    172:172:java.lang.String lambda$assertBlockProperty$10(java.lang.String) -> a
-    172:172:boolean lambda$assertBlockProperty$9(java.util.function.Predicate,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.BlockState) -> a
-    168:168:java.lang.String lambda$assertBlockProperty$8(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
-    168:168:boolean lambda$assertBlockProperty$7(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable,net.minecraft.world.level.block.state.BlockState) -> a
-    164:164:boolean lambda$assertBlock$6(java.util.function.Predicate,net.minecraft.world.level.block.state.BlockState) -> a
-    160:160:java.lang.String lambda$assertBlock$5(java.lang.String) -> b
-    155:156:void lambda$succeedWhenBlockPresent$4(net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos) -> d
-    146:146:boolean lambda$assertBlockNotPresent$3(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> a
-    138:138:boolean lambda$assertBlockPresent$2(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> b
-    104:104:void lambda$pulseRedstone$1(net.minecraft.core.BlockPos) -> g
-    58:58:boolean lambda$killAllEntities$0(net.minecraft.world.entity.Entity) -> a
-net.minecraft.gametest.framework.GameTestInfo -> iw:
+    49:51:void <init>(net.minecraft.gametest.framework.GameTestInfo) -> <init>
+    56:56:net.minecraft.server.level.ServerLevel getLevel() -> a
+    62:65:void killAllEntities() -> b
+    68:73:net.minecraft.world.entity.item.ItemEntity spawnItem(net.minecraft.world.item.Item,float,float,float) -> a
+    77:77:net.minecraft.world.entity.Entity spawn(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> a
+    81:89:net.minecraft.world.entity.Entity spawn(net.minecraft.world.entity.EntityType,net.minecraft.world.phys.Vec3) -> a
+    93:93:net.minecraft.world.entity.Entity spawn(net.minecraft.world.entity.EntityType,int,int,int) -> a
+    97:97:net.minecraft.world.entity.Entity spawn(net.minecraft.world.entity.EntityType,float,float,float) -> a
+    101:103:net.minecraft.world.entity.Mob spawnWithNoFreeWill(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> b
+    107:107:net.minecraft.world.entity.Mob spawnWithNoFreeWill(net.minecraft.world.entity.EntityType,int,int,int) -> b
+    111:113:net.minecraft.world.entity.Mob spawnWithNoFreeWill(net.minecraft.world.entity.EntityType,net.minecraft.world.phys.Vec3) -> b
+    117:117:net.minecraft.world.entity.Mob spawnWithNoFreeWill(net.minecraft.world.entity.EntityType,float,float,float) -> b
+    121:121:net.minecraft.gametest.framework.GameTestSequence walkTo(net.minecraft.world.entity.Mob,net.minecraft.core.BlockPos,float) -> a
+    129:130:void pressButton(int,int,int) -> a
+    133:140:void pressButton(net.minecraft.core.BlockPos) -> a
+    143:146:void useBlock(net.minecraft.core.BlockPos) -> b
+    149:151:net.minecraft.world.entity.LivingEntity makeAboutToDrown(net.minecraft.world.entity.LivingEntity) -> a
+    155:155:net.minecraft.world.entity.player.Player makeMockPlayer() -> f
+    169:170:void pullLever(int,int,int) -> b
+    173:180:void pullLever(net.minecraft.core.BlockPos) -> c
+    183:185:void pulseRedstone(net.minecraft.core.BlockPos,long) -> a
+    188:189:void setBlock(int,int,int,net.minecraft.world.level.block.Block) -> a
+    192:193:void setBlock(int,int,int,net.minecraft.world.level.block.state.BlockState) -> a
+    196:197:void setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
+    200:201:void setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    204:205:void setNight() -> c
+    208:209:void setDayTime(int) -> a
+    214:215:void assertBlockPresent(net.minecraft.world.level.block.Block,int,int,int) -> a
+    218:219:void assertBlockPresent(net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos) -> a
+    222:223:void assertBlockNotPresent(net.minecraft.world.level.block.Block,int,int,int) -> b
+    226:227:void assertBlockNotPresent(net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos) -> b
+    230:231:void succeedWhenBlockPresent(net.minecraft.world.level.block.Block,int,int,int) -> c
+    234:237:void succeedWhenBlockPresent(net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos) -> c
+    240:241:void assertBlock(net.minecraft.core.BlockPos,java.util.function.Predicate,java.lang.String) -> a
+    244:245:void assertBlock(net.minecraft.core.BlockPos,java.util.function.Predicate,java.util.function.Supplier) -> a
+    248:249:void assertBlockProperty(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
+    252:253:void assertBlockProperty(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.properties.Property,java.util.function.Predicate,java.lang.String) -> a
+    256:260:void assertBlockState(net.minecraft.core.BlockPos,java.util.function.Predicate,java.util.function.Supplier) -> b
+    265:269:void assertEntityPresent(net.minecraft.world.entity.EntityType) -> a
+    272:273:void assertEntityPresent(net.minecraft.world.entity.EntityType,int,int,int) -> c
+    276:281:void assertEntityPresent(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> c
+    284:289:void assertEntityPresent(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos,double) -> a
+    292:300:void assertItemEntityPresent(net.minecraft.world.item.Item,net.minecraft.core.BlockPos,double) -> a
+    304:308:void assertEntityNotPresent(net.minecraft.world.entity.EntityType) -> b
+    311:312:void assertEntityNotPresent(net.minecraft.world.entity.EntityType,int,int,int) -> d
+    315:320:void assertEntityNotPresent(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> d
+    323:330:void assertEntityTouching(net.minecraft.world.entity.EntityType,double,double,double) -> a
+    333:340:void assertEntityNotTouching(net.minecraft.world.entity.EntityType,double,double,double) -> b
+    343:364:void assertEntityData(net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType,java.util.function.Function,java.lang.Object) -> a
+    367:372:void assertContainerEmpty(net.minecraft.core.BlockPos) -> d
+    375:380:void assertContainerContains(net.minecraft.core.BlockPos,net.minecraft.world.item.Item) -> a
+    383:384:void assertAtTickTimeContainerContains(long,net.minecraft.core.BlockPos,net.minecraft.world.item.Item) -> a
+    387:388:void assertAtTickTimeContainerEmpty(long,net.minecraft.core.BlockPos) -> a
+    391:392:void succeedWhenEntityData(net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType,java.util.function.Function,java.lang.Object) -> b
+    395:396:void succeedWhenEntityPresent(net.minecraft.world.entity.EntityType,int,int,int) -> e
+    399:402:void succeedWhenEntityPresent(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> e
+    405:406:void succeedWhenEntityNotPresent(net.minecraft.world.entity.EntityType,int,int,int) -> f
+    409:412:void succeedWhenEntityNotPresent(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> f
+    417:418:void succeed() -> d
+    421:425:void ensureSingleFinalCheck() -> g
+    428:432:void succeedIf(java.lang.Runnable) -> a
+    435:439:void succeedWhen(java.lang.Runnable) -> b
+    442:446:void succeedOnTickWhen(int,java.lang.Runnable) -> a
+    449:450:void runAtTickTime(long,java.lang.Runnable) -> a
+    453:454:void runAfterDelay(long,java.lang.Runnable) -> b
+    457:460:void failIf(java.lang.Runnable) -> c
+    463:463:net.minecraft.gametest.framework.GameTestSequence startSequence() -> e
+    467:469:net.minecraft.core.BlockPos absolutePos(net.minecraft.core.BlockPos) -> e
+    473:476:net.minecraft.core.BlockPos relativePos(net.minecraft.core.BlockPos) -> f
+    480:481:net.minecraft.world.phys.Vec3 absoluteVec(net.minecraft.world.phys.Vec3) -> a
+    487:487:net.minecraft.world.phys.AABB getBounds() -> h
+    491:491:net.minecraft.world.level.block.Block getBlockType(net.minecraft.core.BlockPos) -> g
+    459:459:java.lang.Exception lambda$failIf$19() -> i
+    410:411:void lambda$succeedWhenEntityNotPresent$18(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> g
+    400:401:void lambda$succeedWhenEntityPresent$17(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos) -> h
+    391:391:void lambda$succeedWhenEntityData$16(net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType,java.util.function.Function,java.lang.Object) -> c
+    387:387:void lambda$assertAtTickTimeContainerEmpty$15(net.minecraft.core.BlockPos) -> h
+    383:383:void lambda$assertAtTickTimeContainerContains$14(net.minecraft.core.BlockPos,net.minecraft.world.item.Item) -> b
+    335:335:boolean lambda$assertEntityNotTouching$13(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> a
+    325:325:boolean lambda$assertEntityTouching$12(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> b
+    252:252:java.lang.String lambda$assertBlockProperty$11(java.lang.String) -> a
+    252:252:boolean lambda$assertBlockProperty$10(java.util.function.Predicate,net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.BlockState) -> a
+    248:248:java.lang.String lambda$assertBlockProperty$9(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
+    248:248:boolean lambda$assertBlockProperty$8(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable,net.minecraft.world.level.block.state.BlockState) -> a
+    244:244:boolean lambda$assertBlock$7(java.util.function.Predicate,net.minecraft.world.level.block.state.BlockState) -> a
+    240:240:java.lang.String lambda$assertBlock$6(java.lang.String) -> b
+    235:236:void lambda$succeedWhenBlockPresent$5(net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos) -> d
+    226:226:boolean lambda$assertBlockNotPresent$4(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> a
+    218:218:boolean lambda$assertBlockPresent$3(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> b
+    184:184:void lambda$pulseRedstone$2(net.minecraft.core.BlockPos) -> i
+    122:124:void lambda$walkTo$1(net.minecraft.world.entity.Mob,net.minecraft.core.BlockPos,float) -> b
+    63:63:boolean lambda$killAllEntities$0(net.minecraft.world.entity.Entity) -> a
+net.minecraft.gametest.framework.GameTestHelper$1 -> kf$1:
+    net.minecraft.gametest.framework.GameTestHelper this$0 -> b
+    155:155:void <init>(net.minecraft.gametest.framework.GameTestHelper,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,com.mojang.authlib.GameProfile) -> <init>
+    158:158:boolean isSpectator() -> a_
+    163:163:boolean isCreative() -> b_
+net.minecraft.gametest.framework.GameTestInfo -> kg:
     net.minecraft.gametest.framework.TestFunction testFunction -> a
-    net.minecraft.core.BlockPos testPos -> b
+    net.minecraft.core.BlockPos structureBlockPos -> b
     net.minecraft.server.level.ServerLevel level -> c
     java.util.Collection listeners -> d
     int timeoutTicks -> e
@@ -22230,104 +24580,110 @@ net.minecraft.gametest.framework.GameTestInfo -> iw:
     boolean started -> j
     com.google.common.base.Stopwatch timer -> k
     boolean done -> l
-    java.lang.Throwable error -> m
-    26:46:void <init>(net.minecraft.gametest.framework.TestFunction,net.minecraft.server.level.ServerLevel) -> <init>
-    49:51:void <init>(net.minecraft.gametest.framework.TestFunction,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> <init>
-    54:55:void assignPosition(net.minecraft.core.BlockPos) -> a
-    58:60:void startExecution() -> a
-    66:102:void tick() -> b
-    105:114:void startTest() -> t
-    117:118:void setRunAtTickTime(long,java.lang.Runnable) -> a
-    121:121:java.lang.String getTestName() -> c
-    125:125:net.minecraft.core.BlockPos getTestPos() -> d
-    130:135:net.minecraft.core.BlockPos getStructureSize() -> e
-    140:144:net.minecraft.world.phys.AABB getStructureBounds() -> f
-    149:149:net.minecraft.world.level.block.entity.StructureBlockEntity getStructureBlockEntity() -> u
-    153:153:net.minecraft.server.level.ServerLevel getLevel() -> g
-    157:157:boolean hasSucceeded() -> h
-    161:161:boolean hasFailed() -> i
-    165:165:boolean hasStarted() -> j
-    169:169:boolean isDone() -> k
-    173:173:long getRunTime() -> l
-    177:181:void finish() -> v
-    185:189:void succeed() -> m
-    192:195:void fail(java.lang.Throwable) -> a
-    202:202:java.lang.Throwable getError() -> n
-    207:207:java.lang.String toString() -> toString
-    211:212:void addListener(net.minecraft.gametest.framework.GameTestListener) -> a
-    215:220:void spawnStructure(int) -> a
-    223:223:long getTick() -> o
-    227:229:net.minecraft.gametest.framework.GameTestSequence createSequence() -> p
-    233:233:boolean isRequired() -> q
-    237:237:boolean isOptional() -> r
-    241:241:java.lang.String getStructureName() -> s
-    219:219:void lambda$spawnStructure$4(net.minecraft.gametest.framework.GameTestListener) -> b
-    194:194:void lambda$fail$3(net.minecraft.gametest.framework.GameTestListener) -> c
-    187:187:void lambda$succeed$2(net.minecraft.gametest.framework.GameTestListener) -> d
-    100:100:void lambda$tick$1(net.minecraft.gametest.framework.GameTestSequence) -> a
-    93:93:void lambda$tick$0(net.minecraft.gametest.framework.GameTestSequence) -> b
-net.minecraft.gametest.framework.GameTestListener -> ix:
+    net.minecraft.world.level.block.Rotation rotation -> m
+    java.lang.Throwable error -> n
+    30:52:void <init>(net.minecraft.gametest.framework.TestFunction,net.minecraft.world.level.block.Rotation,net.minecraft.server.level.ServerLevel) -> <init>
+    55:56:void setStructureBlockPos(net.minecraft.core.BlockPos) -> a
+    59:61:void startExecution() -> a
+    67:103:void tick() -> b
+    106:115:void startTest() -> v
+    118:119:void setRunAtTickTime(long,java.lang.Runnable) -> a
+    122:122:java.lang.String getTestName() -> c
+    126:126:net.minecraft.core.BlockPos getStructureBlockPos() -> d
+    131:136:net.minecraft.core.BlockPos getStructureSize() -> e
+    141:145:net.minecraft.world.phys.AABB getStructureBounds() -> f
+    150:150:net.minecraft.world.level.block.entity.StructureBlockEntity getStructureBlockEntity() -> w
+    154:154:net.minecraft.server.level.ServerLevel getLevel() -> g
+    158:158:boolean hasSucceeded() -> h
+    162:162:boolean hasFailed() -> i
+    166:166:boolean hasStarted() -> j
+    170:170:boolean isDone() -> k
+    174:174:long getRunTime() -> l
+    178:182:void finish() -> x
+    186:190:void succeed() -> m
+    193:196:void fail(java.lang.Throwable) -> a
+    203:203:java.lang.Throwable getError() -> n
+    208:208:java.lang.String toString() -> toString
+    212:213:void addListener(net.minecraft.gametest.framework.GameTestListener) -> a
+    216:223:void spawnStructure(net.minecraft.core.BlockPos,int) -> a
+    226:226:long getTick() -> o
+    230:232:net.minecraft.gametest.framework.GameTestSequence createSequence() -> p
+    236:236:boolean isRequired() -> q
+    240:240:boolean isOptional() -> r
+    244:244:java.lang.String getStructureName() -> s
+    248:248:net.minecraft.world.level.block.Rotation getRotation() -> t
+    252:252:net.minecraft.gametest.framework.TestFunction getTestFunction() -> u
+    222:222:void lambda$spawnStructure$4(net.minecraft.gametest.framework.GameTestListener) -> b
+    195:195:void lambda$fail$3(net.minecraft.gametest.framework.GameTestListener) -> c
+    188:188:void lambda$succeed$2(net.minecraft.gametest.framework.GameTestListener) -> d
+    101:101:void lambda$tick$1(net.minecraft.gametest.framework.GameTestSequence) -> a
+    94:94:void lambda$tick$0(net.minecraft.gametest.framework.GameTestSequence) -> b
+net.minecraft.gametest.framework.GameTestListener -> kh:
     void testStructureLoaded(net.minecraft.gametest.framework.GameTestInfo) -> a
     void testPassed(net.minecraft.gametest.framework.GameTestInfo) -> b
     void testFailed(net.minecraft.gametest.framework.GameTestInfo) -> c
-net.minecraft.gametest.framework.GameTestRegistry -> iy:
+net.minecraft.gametest.framework.GameTestRegistry -> ki:
     java.util.Collection testFunctions -> a
     java.util.Set testClassNames -> b
     java.util.Map beforeBatchFunctions -> c
-    22:22:void <init>() -> <init>
-    28:29:void register(java.lang.Class) -> a
-    32:54:void register(java.lang.reflect.Method) -> a
-    57:59:java.util.Collection getTestFunctionsForClassName(java.lang.String) -> a
-    63:63:java.util.Collection getAllTestFunctions() -> a
-    67:67:java.util.Collection getAllTestClassNames() -> b
-    71:71:boolean isTestClass(java.lang.String) -> b
-    76:76:java.util.function.Consumer getBeforeBatchFunction(java.lang.String) -> c
-    80:82:java.util.Optional findTestFunction(java.lang.String) -> d
-    87:91:net.minecraft.gametest.framework.TestFunction getTestFunction(java.lang.String) -> e
-    96:99:java.util.Collection useTestGeneratorMethod(java.lang.reflect.Method) -> b
-    104:111:net.minecraft.gametest.framework.TestFunction turnMethodIntoTestFunction(java.lang.reflect.Method) -> c
-    115:115:java.util.function.Consumer turnMethodIntoConsumer(java.lang.reflect.Method) -> d
-    135:135:boolean isTestFunctionPartOfClass(net.minecraft.gametest.framework.TestFunction,java.lang.String) -> a
-    117:128:void lambda$turnMethodIntoConsumer$2(java.lang.reflect.Method,java.lang.Object) -> a
-    81:81:boolean lambda$findTestFunction$1(java.lang.String,net.minecraft.gametest.framework.TestFunction) -> a
-    58:58:boolean lambda$getTestFunctionsForClassName$0(java.lang.String,net.minecraft.gametest.framework.TestFunction) -> b
-    23:25:void <clinit>() -> <clinit>
-net.minecraft.gametest.framework.GameTestRunner -> iz:
+    java.util.Collection lastFailedTests -> d
+    23:23:void <init>() -> <init>
+    30:31:void register(java.lang.Class) -> a
+    34:56:void register(java.lang.reflect.Method) -> a
+    59:61:java.util.Collection getTestFunctionsForClassName(java.lang.String) -> a
+    65:65:java.util.Collection getAllTestFunctions() -> a
+    69:69:java.util.Collection getAllTestClassNames() -> b
+    73:73:boolean isTestClass(java.lang.String) -> b
+    78:78:java.util.function.Consumer getBeforeBatchFunction(java.lang.String) -> c
+    82:84:java.util.Optional findTestFunction(java.lang.String) -> d
+    89:93:net.minecraft.gametest.framework.TestFunction getTestFunction(java.lang.String) -> e
+    98:101:java.util.Collection useTestGeneratorMethod(java.lang.reflect.Method) -> b
+    106:114:net.minecraft.gametest.framework.TestFunction turnMethodIntoTestFunction(java.lang.reflect.Method) -> c
+    118:118:java.util.function.Consumer turnMethodIntoConsumer(java.lang.reflect.Method) -> d
+    138:138:boolean isTestFunctionPartOfClass(net.minecraft.gametest.framework.TestFunction,java.lang.String) -> a
+    142:142:java.util.Collection getLastFailedTests() -> c
+    146:147:void rememberFailedTest(net.minecraft.gametest.framework.TestFunction) -> a
+    150:151:void forgetFailedTests() -> d
+    120:131:void lambda$turnMethodIntoConsumer$2(java.lang.reflect.Method,java.lang.Object) -> a
+    83:83:boolean lambda$findTestFunction$1(java.lang.String,net.minecraft.gametest.framework.TestFunction) -> a
+    60:60:boolean lambda$getTestFunctionsForClassName$0(java.lang.String,net.minecraft.gametest.framework.TestFunction) -> b
+    24:27:void <clinit>() -> <clinit>
+net.minecraft.gametest.framework.GameTestRunner -> kj:
     net.minecraft.gametest.framework.TestReporter TEST_REPORTER -> a
-    36:36:void <init>() -> <init>
-    49:72:void runTest(net.minecraft.gametest.framework.GameTestInfo,net.minecraft.gametest.framework.GameTestTicker) -> a
-    80:82:java.util.Collection runTestBatches(java.util.Collection,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.GameTestTicker) -> a
-    89:89:java.util.Collection runTests(java.util.Collection,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.GameTestTicker) -> b
-    93:109:java.util.Collection groupTestsIntoBatches(java.util.Collection) -> a
-    113:124:void visualizeFailedTest(net.minecraft.gametest.framework.GameTestInfo) -> c
-    127:130:void visualizePassedTest(net.minecraft.gametest.framework.GameTestInfo) -> d
-    133:147:void spawnBeacon(net.minecraft.gametest.framework.GameTestInfo,net.minecraft.world.level.block.Block) -> b
-    150:161:void spawnLectern(net.minecraft.gametest.framework.GameTestInfo,java.lang.String) -> b
-    164:179:net.minecraft.world.item.ItemStack createBook(java.lang.String,boolean,java.lang.String) -> a
-    183:184:void say(net.minecraft.server.level.ServerLevel,net.minecraft.ChatFormatting,java.lang.String) -> a
-    187:188:void clearMarkers(net.minecraft.server.level.ServerLevel) -> a
-    191:192:void showRedBox(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.lang.String) -> a
-    195:206:void clearAllTests(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.gametest.framework.GameTestTicker,int) -> a
-    201:205:void lambda$clearAllTests$8(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-    199:199:boolean lambda$clearAllTests$7(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> b
-    183:183:void lambda$say$6(java.lang.String,net.minecraft.ChatFormatting,net.minecraft.server.level.ServerPlayer) -> a
-    183:183:boolean lambda$say$5(net.minecraft.server.level.ServerPlayer) -> a
-    169:169:void lambda$createBook$4(java.lang.StringBuffer,java.lang.String) -> a
-    104:108:java.util.stream.Stream lambda$groupTestsIntoBatches$3(java.util.Map,java.lang.String) -> a
-    108:108:net.minecraft.gametest.framework.GameTestBatch lambda$null$2(java.lang.String,java.util.concurrent.atomic.AtomicInteger,java.util.Collection,java.util.function.Consumer,java.util.List) -> a
-    97:100:void lambda$groupTestsIntoBatches$1(java.util.Map,net.minecraft.gametest.framework.TestFunction) -> a
-    98:98:java.util.Collection lambda$null$0(java.lang.String) -> a
-    36:36:void access$000(net.minecraft.gametest.framework.GameTestInfo,net.minecraft.world.level.block.Block) -> a
-    36:36:void access$100(net.minecraft.gametest.framework.GameTestInfo) -> a
-    36:36:void access$200(net.minecraft.gametest.framework.GameTestInfo,java.lang.String) -> a
-    36:36:void access$300(net.minecraft.gametest.framework.GameTestInfo) -> b
-    37:37:void <clinit>() -> <clinit>
-net.minecraft.gametest.framework.GameTestRunner$1 -> iz$1:
-    52:52:void <init>() -> <init>
-    55:56:void testStructureLoaded(net.minecraft.gametest.framework.GameTestInfo) -> a
-    60:62:void testPassed(net.minecraft.gametest.framework.GameTestInfo) -> b
-    66:69:void testFailed(net.minecraft.gametest.framework.GameTestInfo) -> c
-net.minecraft.gametest.framework.GameTestSequence -> ja:
+    39:39:void <init>() -> <init>
+    52:75:void runTest(net.minecraft.gametest.framework.GameTestInfo,net.minecraft.core.BlockPos,net.minecraft.gametest.framework.GameTestTicker) -> a
+    83:85:java.util.Collection runTestBatches(java.util.Collection,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.GameTestTicker,int) -> a
+    92:92:java.util.Collection runTests(java.util.Collection,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.GameTestTicker,int) -> b
+    96:112:java.util.Collection groupTestsIntoBatches(java.util.Collection) -> a
+    116:127:void visualizeFailedTest(net.minecraft.gametest.framework.GameTestInfo) -> c
+    130:133:void visualizePassedTest(net.minecraft.gametest.framework.GameTestInfo) -> d
+    136:151:void spawnBeacon(net.minecraft.gametest.framework.GameTestInfo,net.minecraft.world.level.block.Block) -> b
+    154:166:void spawnLectern(net.minecraft.gametest.framework.GameTestInfo,java.lang.String) -> b
+    169:184:net.minecraft.world.item.ItemStack createBook(java.lang.String,boolean,java.lang.String) -> a
+    188:189:void say(net.minecraft.server.level.ServerLevel,net.minecraft.ChatFormatting,java.lang.String) -> a
+    192:193:void clearMarkers(net.minecraft.server.level.ServerLevel) -> a
+    196:197:void showRedBox(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.lang.String) -> a
+    200:211:void clearAllTests(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.gametest.framework.GameTestTicker,int) -> a
+    206:210:void lambda$clearAllTests$8(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    204:204:boolean lambda$clearAllTests$7(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> b
+    188:188:void lambda$say$6(java.lang.String,net.minecraft.ChatFormatting,net.minecraft.server.level.ServerPlayer) -> a
+    188:188:boolean lambda$say$5(net.minecraft.server.level.ServerPlayer) -> a
+    174:174:void lambda$createBook$4(java.lang.StringBuffer,java.lang.String) -> a
+    107:111:java.util.stream.Stream lambda$groupTestsIntoBatches$3(java.util.Map,java.lang.String) -> a
+    111:111:net.minecraft.gametest.framework.GameTestBatch lambda$null$2(java.lang.String,org.apache.commons.lang3.mutable.MutableInt,java.util.Collection,java.util.function.Consumer,java.util.List) -> a
+    100:103:void lambda$groupTestsIntoBatches$1(java.util.Map,net.minecraft.gametest.framework.TestFunction) -> a
+    101:101:java.util.Collection lambda$null$0(java.lang.String) -> a
+    39:39:void access$000(net.minecraft.gametest.framework.GameTestInfo,net.minecraft.world.level.block.Block) -> a
+    39:39:void access$100(net.minecraft.gametest.framework.GameTestInfo) -> a
+    39:39:void access$200(net.minecraft.gametest.framework.GameTestInfo,java.lang.String) -> a
+    39:39:void access$300(net.minecraft.gametest.framework.GameTestInfo) -> b
+    40:40:void <clinit>() -> <clinit>
+net.minecraft.gametest.framework.GameTestRunner$1 -> kj$1:
+    55:55:void <init>() -> <init>
+    58:59:void testStructureLoaded(net.minecraft.gametest.framework.GameTestInfo) -> a
+    63:65:void testPassed(net.minecraft.gametest.framework.GameTestInfo) -> b
+    69:72:void testFailed(net.minecraft.gametest.framework.GameTestInfo) -> c
+net.minecraft.gametest.framework.GameTestSequence -> kk:
     net.minecraft.gametest.framework.GameTestInfo parent -> a
     java.util.List events -> b
     long lastTick -> c
@@ -22350,46 +24706,47 @@ net.minecraft.gametest.framework.GameTestSequence -> ja:
     58:58:void lambda$thenExecute$1(java.lang.Runnable) -> d
     54:54:void lambda$thenIdle$0() -> c
     9:9:net.minecraft.gametest.framework.GameTestInfo access$000(net.minecraft.gametest.framework.GameTestSequence) -> a
-net.minecraft.gametest.framework.GameTestSequence$Condition -> ja$a:
+net.minecraft.gametest.framework.GameTestSequence$Condition -> kk$a:
     long triggerTime -> b
     net.minecraft.gametest.framework.GameTestSequence this$0 -> a
     10:13:void <init>(net.minecraft.gametest.framework.GameTestSequence) -> <init>
     16:20:void trigger(long) -> a
     23:31:void assertTriggeredThisTick() -> a
-net.minecraft.gametest.framework.GameTestServer -> jb:
-    org.apache.logging.log4j.Logger LOGGER -> h
-    java.util.List testBatches -> i
-    net.minecraft.core.BlockPos spawnPos -> j
-    net.minecraft.gametest.framework.MultipleTestTracker testTracker -> k
-    51:57:void <init>(java.io.File,java.lang.String,java.util.Collection,net.minecraft.core.BlockPos) -> <init>
-    61:73:boolean initServer() -> d
-    78:107:void tickServer(java.util.function.BooleanSupplier) -> a
-    111:113:void onServerExit() -> e
-    117:118:void onServerCrash(net.minecraft.CrashReport) -> a
-    121:124:void startTests(net.minecraft.server.level.ServerLevel) -> b
-    127:127:boolean haveTestsStarted() -> aZ
-    132:132:boolean canGenerateStructures() -> f
-    137:137:net.minecraft.world.level.GameType getDefaultGameType() -> g
-    142:142:net.minecraft.world.Difficulty getDefaultDifficulty() -> h
-    147:147:boolean isHardcore() -> i
-    152:152:int getOperatorUserPermissionLevel() -> j
-    157:157:int getFunctionCompilationLevel() -> k
-    162:162:boolean shouldRconBroadcast() -> l
-    167:167:boolean isDedicatedServer() -> m
-    172:172:boolean isEpollEnabled() -> n
-    177:177:boolean isCommandBlockEnabled() -> o
-    182:182:boolean isPublished() -> p
-    187:187:boolean publishServer(net.minecraft.world.level.GameType,boolean,int) -> a
-    192:192:boolean shouldInformAdmins() -> I_
-    197:197:boolean isSingleplayerOwner(com.mojang.authlib.GameProfile) -> a
-    202:202:java.util.Optional getModdedStatus() -> q
-    103:103:void lambda$tickServer$1(net.minecraft.gametest.framework.GameTestInfo) -> a
-    97:97:void lambda$tickServer$0(net.minecraft.gametest.framework.GameTestInfo) -> b
-    37:37:void <clinit>() -> <clinit>
-net.minecraft.gametest.framework.GameTestServer$1 -> jb$1:
+net.minecraft.gametest.framework.GameTestServer -> kl:
+    org.apache.logging.log4j.Logger LOGGER -> j
+    java.util.List testBatches -> k
+    net.minecraft.core.BlockPos spawnPos -> l
+    net.minecraft.world.level.GameRules TEST_GAME_RULES -> m
+    net.minecraft.world.level.LevelSettings TEST_SETTINGS -> n
+    net.minecraft.world.level.levelgen.WorldGenSettings TEST_WORLD_GEN_SETTINGS -> o
+    net.minecraft.gametest.framework.MultipleTestTracker testTracker -> p
+    70:76:void <init>(java.lang.Thread,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.server.packs.repository.PackRepository,net.minecraft.server.ServerResources,java.util.Collection,net.minecraft.core.BlockPos) -> <init>
+    80:87:boolean initServer() -> d
+    92:123:void tickServer(java.util.function.BooleanSupplier) -> a
+    127:129:void onServerExit() -> e
+    133:134:void onServerCrash(net.minecraft.CrashReport) -> a
+    137:140:void startTests(net.minecraft.server.level.ServerLevel) -> b
+    143:143:boolean haveTestsStarted() -> aY
+    148:148:boolean isHardcore() -> f
+    153:153:int getOperatorUserPermissionLevel() -> g
+    158:158:int getFunctionCompilationLevel() -> h
+    163:163:boolean shouldRconBroadcast() -> i
+    168:168:boolean isDedicatedServer() -> j
+    173:173:boolean isEpollEnabled() -> k
+    178:178:boolean isCommandBlockEnabled() -> l
+    183:183:boolean isPublished() -> m
+    188:188:boolean publishServer(net.minecraft.world.level.GameType,boolean,int) -> a
+    193:193:boolean shouldInformAdmins() -> S_
+    198:198:boolean isSingleplayerOwner(com.mojang.authlib.GameProfile) -> a
+    203:203:java.util.Optional getModdedStatus() -> n
+    119:119:void lambda$tickServer$2(net.minecraft.gametest.framework.GameTestInfo) -> a
+    113:113:void lambda$tickServer$1(net.minecraft.gametest.framework.GameTestInfo) -> b
+    55:57:void lambda$static$0(net.minecraft.world.level.GameRules) -> a
+    48:60:void <clinit>() -> <clinit>
+net.minecraft.gametest.framework.GameTestServer$1 -> kl$1:
     net.minecraft.gametest.framework.GameTestServer this$0 -> a
-    64:64:void <init>(net.minecraft.gametest.framework.GameTestServer,net.minecraft.server.MinecraftServer,int) -> <init>
-net.minecraft.gametest.framework.GameTestTicker -> jc:
+    81:81:void <init>(net.minecraft.gametest.framework.GameTestServer,net.minecraft.server.MinecraftServer,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.storage.PlayerDataStorage,int) -> <init>
+net.minecraft.gametest.framework.GameTestTicker -> km:
     net.minecraft.gametest.framework.GameTestTicker singleton -> a
     java.util.Collection testInfos -> b
     7:9:void <init>() -> <init>
@@ -22397,65 +24754,90 @@ net.minecraft.gametest.framework.GameTestTicker -> jc:
     16:17:void clear() -> a
     20:22:void tick() -> b
     8:8:void <clinit>() -> <clinit>
-net.minecraft.gametest.framework.GameTestTimeoutException -> jd:
+net.minecraft.gametest.framework.GameTestTimeoutException -> kn:
     5:6:void <init>(java.lang.String) -> <init>
-net.minecraft.gametest.framework.LogTestReporter -> je:
+net.minecraft.gametest.framework.JUnitLikeTestReporter -> ko:
+    org.w3c.dom.Document document -> a
+    org.w3c.dom.Element testSuite -> b
+    com.google.common.base.Stopwatch stopwatch -> c
+    java.io.File destination -> d
+    25:36:void <init>(java.io.File) -> <init>
+    39:44:org.w3c.dom.Element createTestCase(net.minecraft.gametest.framework.GameTestInfo,java.lang.String) -> a
+    49:63:void onTestFailed(net.minecraft.gametest.framework.GameTestInfo) -> a
+    67:69:void onTestSuccess(net.minecraft.gametest.framework.GameTestInfo) -> b
+    73:81:void finish() -> a
+    84:89:void save(java.io.File) -> a
+net.minecraft.gametest.framework.LogTestReporter -> kp:
     org.apache.logging.log4j.Logger LOGGER -> a
     7:7:void <init>() -> <init>
     12:19:void onTestFailed(net.minecraft.gametest.framework.GameTestInfo) -> a
     23:23:void onTestSuccess(net.minecraft.gametest.framework.GameTestInfo) -> b
     8:8:void <clinit>() -> <clinit>
-net.minecraft.gametest.framework.MultipleTestTracker -> jf:
+net.minecraft.gametest.framework.MultipleTestTracker -> kq:
     java.util.Collection tests -> a
-    net.minecraft.gametest.framework.GameTestListener listener -> b
-    19:25:void <init>() -> <init>
-    19:29:void <init>(java.util.Collection) -> <init>
-    32:36:void add(net.minecraft.gametest.framework.GameTestInfo) -> a
-    39:41:void setListener(net.minecraft.gametest.framework.GameTestListener) -> a
-    44:44:int getFailedRequiredCount() -> a
-    48:48:int getFailedOptionalCount() -> b
-    52:52:int getDoneCount() -> c
-    56:56:boolean hasFailedRequired() -> d
-    60:60:boolean hasFailedOptional() -> e
-    64:64:java.util.Collection getFailedRequired() -> f
-    68:68:java.util.Collection getFailedOptional() -> g
-    72:72:int getTotalCount() -> h
-    76:76:boolean isDone() -> i
-    80:94:java.lang.String getProgressBar() -> j
-    99:99:java.lang.String toString() -> toString
-    83:92:void lambda$getProgressBar$1(java.lang.StringBuffer,net.minecraft.gametest.framework.GameTestInfo) -> a
-    40:40:void lambda$setListener$0(net.minecraft.gametest.framework.GameTestListener,net.minecraft.gametest.framework.GameTestInfo) -> a
-net.minecraft.gametest.framework.StructureUtils -> jg:
+    java.util.Collection listeners -> b
+    20:26:void <init>() -> <init>
+    20:30:void <init>(java.util.Collection) -> <init>
+    33:35:void addTestToTrack(net.minecraft.gametest.framework.GameTestInfo) -> a
+    38:40:void addListener(net.minecraft.gametest.framework.GameTestListener) -> a
+    43:58:void addFailureListener(java.util.function.Consumer) -> a
+    61:61:int getFailedRequiredCount() -> a
+    65:65:int getFailedOptionalCount() -> b
+    69:69:int getDoneCount() -> c
+    73:73:boolean hasFailedRequired() -> d
+    77:77:boolean hasFailedOptional() -> e
+    81:81:java.util.Collection getFailedRequired() -> f
+    85:85:java.util.Collection getFailedOptional() -> g
+    89:89:int getTotalCount() -> h
+    93:93:boolean isDone() -> i
+    97:111:java.lang.String getProgressBar() -> j
+    116:116:java.lang.String toString() -> toString
+    100:109:void lambda$getProgressBar$1(java.lang.StringBuffer,net.minecraft.gametest.framework.GameTestInfo) -> a
+    39:39:void lambda$addListener$0(net.minecraft.gametest.framework.GameTestListener,net.minecraft.gametest.framework.GameTestInfo) -> a
+net.minecraft.gametest.framework.MultipleTestTracker$1 -> kq$1:
+    java.util.function.Consumer val$listener -> a
+    net.minecraft.gametest.framework.MultipleTestTracker this$0 -> b
+    43:43:void <init>(net.minecraft.gametest.framework.MultipleTestTracker,java.util.function.Consumer) -> <init>
+    47:47:void testStructureLoaded(net.minecraft.gametest.framework.GameTestInfo) -> a
+    51:51:void testPassed(net.minecraft.gametest.framework.GameTestInfo) -> b
+    55:56:void testFailed(net.minecraft.gametest.framework.GameTestInfo) -> c
+net.minecraft.gametest.framework.StructureUtils -> kr:
     java.lang.String testStructuresDir -> a
-    44:44:void <init>() -> <init>
-    53:54:net.minecraft.world.phys.AABB getStructureBounds(net.minecraft.world.level.block.entity.StructureBlockEntity) -> a
-    58:63:void addCommandBlockAndButtonToStartTest(net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> a
-    66:77:void createNewEmptyStructureBlock(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,int,net.minecraft.server.level.ServerLevel) -> a
-    80:86:net.minecraft.world.level.block.entity.StructureBlockEntity spawnStructure(java.lang.String,net.minecraft.core.BlockPos,int,net.minecraft.server.level.ServerLevel,boolean) -> a
-    90:100:void forceLoadChunks(net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> b
-    103:109:void clearSpaceForStructure(net.minecraft.world.level.levelgen.structure.BoundingBox,int,net.minecraft.server.level.ServerLevel) -> a
-    112:114:net.minecraft.world.level.levelgen.structure.BoundingBox createStructureBoundingBox(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,int) -> a
-    118:120:java.util.Optional findStructureBlockContainingPos(net.minecraft.core.BlockPos,int,net.minecraft.server.level.ServerLevel) -> a
-    125:129:net.minecraft.core.BlockPos findNearestStructureBlock(net.minecraft.core.BlockPos,int,net.minecraft.server.level.ServerLevel) -> b
-    133:148:java.util.Collection findStructureBlocks(net.minecraft.core.BlockPos,int,net.minecraft.server.level.ServerLevel) -> c
-    152:168:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate getStructureTemplate(java.lang.String,net.minecraft.server.level.ServerLevel) -> a
-    172:188:net.minecraft.world.level.block.entity.StructureBlockEntity createStructureBlock(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel,boolean) -> a
-    196:202:net.minecraft.nbt.CompoundTag tryLoadStructure(java.nio.file.Path) -> a
-    208:228:void clearBlock(int,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> a
-    231:233:boolean doesStructureContain(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> a
-    125:125:int lambda$findNearestStructureBlock$3(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    119:119:boolean lambda$findStructureBlockContainingPos$2(net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-    107:107:boolean lambda$clearSpaceForStructure$1(net.minecraft.world.entity.Entity) -> a
-    103:103:void lambda$clearSpaceForStructure$0(int,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-    46:46:void <clinit>() -> <clinit>
-net.minecraft.gametest.framework.TeamcityTestReporter -> jh:
+    45:45:void <init>() -> <init>
+    53:58:net.minecraft.world.level.block.Rotation getRotationForRotationSteps(int) -> a
+    63:68:int getRotationStepsForRotation(net.minecraft.world.level.block.Rotation) -> a
+    73:77:net.minecraft.world.phys.AABB getStructureBounds(net.minecraft.world.level.block.entity.StructureBlockEntity) -> a
+    81:85:net.minecraft.world.level.levelgen.structure.BoundingBox getStructureBoundingBox(net.minecraft.world.level.block.entity.StructureBlockEntity) -> b
+    89:97:void addCommandBlockAndButtonToStartTest(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.server.level.ServerLevel) -> a
+    100:111:void createNewEmptyStructureBlock(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.server.level.ServerLevel) -> a
+    114:136:net.minecraft.world.level.block.entity.StructureBlockEntity spawnStructure(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,int,net.minecraft.server.level.ServerLevel,boolean) -> a
+    140:150:void forceLoadChunks(net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> a
+    154:169:void clearSpaceForStructure(net.minecraft.world.level.levelgen.structure.BoundingBox,int,net.minecraft.server.level.ServerLevel) -> a
+    172:182:net.minecraft.world.level.levelgen.structure.BoundingBox getStructureBoundingBox(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> a
+    186:188:java.util.Optional findStructureBlockContainingPos(net.minecraft.core.BlockPos,int,net.minecraft.server.level.ServerLevel) -> a
+    193:197:net.minecraft.core.BlockPos findNearestStructureBlock(net.minecraft.core.BlockPos,int,net.minecraft.server.level.ServerLevel) -> b
+    201:216:java.util.Collection findStructureBlocks(net.minecraft.core.BlockPos,int,net.minecraft.server.level.ServerLevel) -> c
+    220:236:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate getStructureTemplate(java.lang.String,net.minecraft.server.level.ServerLevel) -> a
+    240:257:net.minecraft.world.level.block.entity.StructureBlockEntity createStructureBlock(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.server.level.ServerLevel,boolean) -> a
+    265:271:net.minecraft.nbt.CompoundTag tryLoadStructure(java.nio.file.Path) -> a
+    276:297:void clearBlock(int,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> a
+    300:302:boolean doesStructureContain(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> a
+    193:193:int lambda$findNearestStructureBlock$3(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    187:187:boolean lambda$findStructureBlockContainingPos$2(net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    167:167:boolean lambda$clearSpaceForStructure$1(net.minecraft.world.entity.Entity) -> a
+    163:163:void lambda$clearSpaceForStructure$0(int,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    47:47:void <clinit>() -> <clinit>
+net.minecraft.gametest.framework.StructureUtils$1 -> kr$1:
+    int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
+    63:63:void <clinit>() -> <clinit>
+net.minecraft.gametest.framework.TeamcityTestReporter -> ks:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.google.common.escape.Escaper ESCAPER -> b
     9:9:void <init>() -> <init>
     23:34:void onTestFailed(net.minecraft.gametest.framework.GameTestInfo) -> a
     38:42:void onTestSuccess(net.minecraft.gametest.framework.GameTestInfo) -> b
     10:19:void <clinit>() -> <clinit>
-net.minecraft.gametest.framework.TestClassNameArgument -> ji:
+net.minecraft.gametest.framework.TestClassNameArgument -> kt:
     java.util.Collection EXAMPLES -> a
     19:19:void <init>() -> <init>
     24:29:java.lang.String parse(com.mojang.brigadier.StringReader) -> a
@@ -22465,51 +24847,64 @@ net.minecraft.gametest.framework.TestClassNameArgument -> ji:
     49:49:java.util.Collection getExamples() -> getExamples
     19:19:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     20:20:void <clinit>() -> <clinit>
-net.minecraft.gametest.framework.TestCommand -> jj:
-    52:52:void <init>() -> <init>
-    65:148:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    151:172:int createNewStructure(net.minecraft.commands.CommandSourceStack,java.lang.String,int,int,int) -> a
-    176:208:int showPos(net.minecraft.commands.CommandSourceStack,java.lang.String) -> a
-    212:224:int runNearbyTest(net.minecraft.commands.CommandSourceStack) -> a
-    228:244:int runAllNearbyTests(net.minecraft.commands.CommandSourceStack) -> b
-    248:258:void runTest(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.gametest.framework.MultipleTestTracker) -> a
-    261:272:void showTestSummaryIfAllDone(net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.MultipleTestTracker) -> b
-    275:279:int clearAllTests(net.minecraft.commands.CommandSourceStack,int) -> a
-    283:290:int runTest(net.minecraft.commands.CommandSourceStack,net.minecraft.gametest.framework.TestFunction) -> a
-    294:298:void runTestPreparation(net.minecraft.gametest.framework.TestFunction,net.minecraft.server.level.ServerLevel) -> a
-    301:303:int runAllTests(net.minecraft.commands.CommandSourceStack) -> c
-    307:310:int runAllTestsInClass(net.minecraft.commands.CommandSourceStack,java.lang.String) -> b
-    314:322:void runTests(net.minecraft.commands.CommandSourceStack,java.util.Collection) -> a
-    325:326:void say(net.minecraft.commands.CommandSourceStack,java.lang.String) -> c
-    329:348:int exportTestStructure(net.minecraft.commands.CommandSourceStack,java.lang.String) -> d
-    352:368:int importTestStructure(net.minecraft.commands.CommandSourceStack,java.lang.String) -> e
-    373:376:void say(net.minecraft.server.level.ServerLevel,java.lang.String,net.minecraft.ChatFormatting) -> a
-    374:375:void lambda$say$16(net.minecraft.ChatFormatting,java.lang.String,net.minecraft.server.level.ServerPlayer) -> a
-    373:373:boolean lambda$say$15(net.minecraft.server.level.ServerPlayer) -> a
-    242:242:void lambda$runAllNearbyTests$14(net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.MultipleTestTracker,net.minecraft.core.BlockPos) -> a
-    144:144:int lambda$register$13(com.mojang.brigadier.context.CommandContext) -> a
-    141:141:int lambda$register$12(com.mojang.brigadier.context.CommandContext) -> b
-    128:132:int lambda$register$11(com.mojang.brigadier.context.CommandContext) -> c
-    119:123:int lambda$register$10(com.mojang.brigadier.context.CommandContext) -> d
-    116:116:int lambda$register$9(com.mojang.brigadier.context.CommandContext) -> e
-    109:109:int lambda$register$8(com.mojang.brigadier.context.CommandContext) -> f
-    106:106:int lambda$register$7(com.mojang.brigadier.context.CommandContext) -> g
-    101:101:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> h
-    94:94:int lambda$register$5(com.mojang.brigadier.context.CommandContext) -> i
-    87:87:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> j
-    84:84:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> k
-    79:79:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> l
-    73:73:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> m
-    69:69:int lambda$register$0(com.mojang.brigadier.context.CommandContext) -> n
-    52:52:void access$000(net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.MultipleTestTracker) -> a
-net.minecraft.gametest.framework.TestCommand$TestSummaryDisplayer -> jj$a:
+net.minecraft.gametest.framework.TestCommand -> ku:
+    58:58:void <init>() -> <init>
+    71:188:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    191:212:int createNewStructure(net.minecraft.commands.CommandSourceStack,java.lang.String,int,int,int) -> a
+    216:248:int showPos(net.minecraft.commands.CommandSourceStack,java.lang.String) -> a
+    252:264:int runNearbyTest(net.minecraft.commands.CommandSourceStack) -> a
+    268:284:int runAllNearbyTests(net.minecraft.commands.CommandSourceStack) -> b
+    288:300:void runTest(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.gametest.framework.MultipleTestTracker) -> a
+    303:314:void showTestSummaryIfAllDone(net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.MultipleTestTracker) -> b
+    317:321:int clearAllTests(net.minecraft.commands.CommandSourceStack,int) -> a
+    325:334:int runTest(net.minecraft.commands.CommandSourceStack,net.minecraft.gametest.framework.TestFunction,int) -> a
+    338:342:void runTestPreparation(net.minecraft.gametest.framework.TestFunction,net.minecraft.server.level.ServerLevel) -> a
+    345:350:int runAllTests(net.minecraft.commands.CommandSourceStack,int,int) -> a
+    354:359:int runAllTestsInClass(net.minecraft.commands.CommandSourceStack,java.lang.String,int,int) -> a
+    364:376:int runLastFailedTests(net.minecraft.commands.CommandSourceStack,boolean,int,int) -> a
+    380:388:void runTests(net.minecraft.commands.CommandSourceStack,java.util.Collection,int,int) -> a
+    391:392:void say(net.minecraft.commands.CommandSourceStack,java.lang.String) -> b
+    395:404:int exportNearestTestStructure(net.minecraft.commands.CommandSourceStack) -> c
+    408:427:int exportTestStructure(net.minecraft.commands.CommandSourceStack,java.lang.String) -> c
+    431:447:int importTestStructure(net.minecraft.commands.CommandSourceStack,java.lang.String) -> d
+    452:455:void say(net.minecraft.server.level.ServerLevel,java.lang.String,net.minecraft.ChatFormatting) -> a
+    453:454:void lambda$say$27(net.minecraft.ChatFormatting,java.lang.String,net.minecraft.server.level.ServerPlayer) -> a
+    452:452:boolean lambda$say$26(net.minecraft.server.level.ServerPlayer) -> a
+    387:387:void lambda$runTests$25(net.minecraft.gametest.framework.GameTestInfo) -> a
+    282:282:void lambda$runAllNearbyTests$24(net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.MultipleTestTracker,net.minecraft.core.BlockPos) -> a
+    184:184:int lambda$register$23(com.mojang.brigadier.context.CommandContext) -> a
+    181:181:int lambda$register$22(com.mojang.brigadier.context.CommandContext) -> b
+    168:172:int lambda$register$21(com.mojang.brigadier.context.CommandContext) -> c
+    159:163:int lambda$register$20(com.mojang.brigadier.context.CommandContext) -> d
+    156:156:int lambda$register$19(com.mojang.brigadier.context.CommandContext) -> e
+    149:149:int lambda$register$18(com.mojang.brigadier.context.CommandContext) -> f
+    146:146:int lambda$register$17(com.mojang.brigadier.context.CommandContext) -> g
+    141:141:int lambda$register$16(com.mojang.brigadier.context.CommandContext) -> h
+    135:135:int lambda$register$15(com.mojang.brigadier.context.CommandContext) -> i
+    130:130:int lambda$register$14(com.mojang.brigadier.context.CommandContext) -> j
+    121:121:int lambda$register$13(com.mojang.brigadier.context.CommandContext) -> k
+    119:119:int lambda$register$12(com.mojang.brigadier.context.CommandContext) -> l
+    113:113:int lambda$register$11(com.mojang.brigadier.context.CommandContext) -> m
+    111:111:int lambda$register$10(com.mojang.brigadier.context.CommandContext) -> n
+    109:109:int lambda$register$9(com.mojang.brigadier.context.CommandContext) -> o
+    106:106:int lambda$register$8(com.mojang.brigadier.context.CommandContext) -> p
+    100:100:int lambda$register$7(com.mojang.brigadier.context.CommandContext) -> q
+    98:98:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> r
+    89:89:int lambda$register$5(com.mojang.brigadier.context.CommandContext) -> s
+    87:87:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> t
+    85:85:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> u
+    83:83:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> v
+    79:79:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> w
+    75:75:int lambda$register$0(com.mojang.brigadier.context.CommandContext) -> x
+    58:58:void access$000(net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.MultipleTestTracker) -> a
+net.minecraft.gametest.framework.TestCommand$TestSummaryDisplayer -> ku$a:
     net.minecraft.server.level.ServerLevel level -> a
     net.minecraft.gametest.framework.MultipleTestTracker tracker -> b
-    382:385:void <init>(net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.MultipleTestTracker) -> <init>
-    389:389:void testStructureLoaded(net.minecraft.gametest.framework.GameTestInfo) -> a
-    393:394:void testPassed(net.minecraft.gametest.framework.GameTestInfo) -> b
-    398:399:void testFailed(net.minecraft.gametest.framework.GameTestInfo) -> c
-net.minecraft.gametest.framework.TestFunction -> jk:
+    461:464:void <init>(net.minecraft.server.level.ServerLevel,net.minecraft.gametest.framework.MultipleTestTracker) -> <init>
+    468:468:void testStructureLoaded(net.minecraft.gametest.framework.GameTestInfo) -> a
+    472:473:void testPassed(net.minecraft.gametest.framework.GameTestInfo) -> b
+    477:478:void testFailed(net.minecraft.gametest.framework.GameTestInfo) -> c
+net.minecraft.gametest.framework.TestFunction -> kv:
     java.lang.String batchName -> a
     java.lang.String testName -> b
     java.lang.String structureName -> c
@@ -22517,16 +24912,19 @@ net.minecraft.gametest.framework.TestFunction -> jk:
     java.util.function.Consumer function -> e
     int maxTicks -> f
     long setupTicks -> g
-    21:29:void <init>(java.lang.String,java.lang.String,java.lang.String,int,long,boolean,java.util.function.Consumer) -> <init>
-    32:33:void run(net.minecraft.gametest.framework.GameTestHelper) -> a
-    36:36:java.lang.String getTestName() -> a
-    40:40:java.lang.String getStructureName() -> b
-    45:45:java.lang.String toString() -> toString
-    49:49:int getMaxTicks() -> c
-    53:53:boolean isRequired() -> d
-    57:57:java.lang.String getBatchName() -> e
-    61:61:long getSetupTicks() -> f
-net.minecraft.gametest.framework.TestFunctionArgument -> jl:
+    net.minecraft.world.level.block.Rotation rotation -> h
+    22:23:void <init>(java.lang.String,java.lang.String,java.lang.String,int,long,boolean,java.util.function.Consumer) -> <init>
+    28:37:void <init>(java.lang.String,java.lang.String,java.lang.String,net.minecraft.world.level.block.Rotation,int,long,boolean,java.util.function.Consumer) -> <init>
+    40:41:void run(net.minecraft.gametest.framework.GameTestHelper) -> a
+    44:44:java.lang.String getTestName() -> a
+    48:48:java.lang.String getStructureName() -> b
+    53:53:java.lang.String toString() -> toString
+    57:57:int getMaxTicks() -> c
+    61:61:boolean isRequired() -> d
+    65:65:java.lang.String getBatchName() -> e
+    69:69:long getSetupTicks() -> f
+    73:73:net.minecraft.world.level.block.Rotation getRotation() -> g
+net.minecraft.gametest.framework.TestFunctionArgument -> kw:
     java.util.Collection EXAMPLES -> a
     21:21:void <init>() -> <init>
     26:32:net.minecraft.gametest.framework.TestFunction parse(com.mojang.brigadier.StringReader) -> a
@@ -22536,64 +24934,73 @@ net.minecraft.gametest.framework.TestFunctionArgument -> jl:
     53:53:java.util.Collection getExamples() -> getExamples
     21:21:java.lang.Object parse(com.mojang.brigadier.StringReader) -> parse
     22:22:void <clinit>() -> <clinit>
-net.minecraft.gametest.framework.TestReporter -> jm:
+net.minecraft.gametest.framework.TestReporter -> kx:
     void onTestFailed(net.minecraft.gametest.framework.GameTestInfo) -> a
     void onTestSuccess(net.minecraft.gametest.framework.GameTestInfo) -> b
-net.minecraft.gametest.framework.package-info -> jn:
-net.minecraft.locale.Language -> jo:
+    8:8:void finish() -> a
+net.minecraft.gametest.framework.package-info -> ky:
+net.minecraft.locale.Language -> kz:
     org.apache.logging.log4j.Logger LOGGER -> a
-    java.util.regex.Pattern UNSUPPORTED_FORMAT_PATTERN -> b
-    net.minecraft.locale.Language SINGLETON -> c
-    java.util.Map storage -> d
-    long lastUpdateTime -> e
-    27:42:void <init>() -> <init>
-    45:45:net.minecraft.locale.Language getInstance() -> a
-    49:52:void forceData(java.util.Map) -> a
-    55:55:java.lang.String getElement(java.lang.String) -> a
-    59:60:java.lang.String getProperty(java.lang.String) -> c
-    64:64:boolean exists(java.lang.String) -> b
-    68:68:long getLastUpdateTime() -> b
-    21:25:void <clinit>() -> <clinit>
-net.minecraft.locale.package-info -> jp:
-net.minecraft.nbt.ByteArrayTag -> jq:
+    com.google.gson.Gson GSON -> b
+    java.util.regex.Pattern UNSUPPORTED_FORMAT_PATTERN -> c
+    net.minecraft.locale.Language instance -> d
+    20:20:void <init>() -> <init>
+    29:38:net.minecraft.locale.Language loadDefault() -> c
+    62:67:void loadFromJson(java.io.InputStream,java.util.function.BiConsumer) -> a
+    70:70:net.minecraft.locale.Language getInstance() -> a
+    74:75:void inject(net.minecraft.locale.Language) -> a
+    java.lang.String getOrDefault(java.lang.String) -> a
+    boolean has(java.lang.String) -> b
+    boolean requiresReordering() -> b
+    java.lang.String reorder(java.lang.String,boolean) -> a
+    21:26:void <clinit>() -> <clinit>
+net.minecraft.locale.Language$1 -> kz$1:
+    java.util.Map val$storage -> a
+    38:38:void <init>(java.util.Map) -> <init>
+    41:41:java.lang.String getOrDefault(java.lang.String) -> a
+    46:46:boolean has(java.lang.String) -> b
+    51:51:boolean requiresReordering() -> b
+    56:56:java.lang.String reorder(java.lang.String,boolean) -> a
+net.minecraft.locale.package-info -> la:
+net.minecraft.nbt.ByteArrayTag -> lb:
     net.minecraft.nbt.TagType TYPE -> a
     byte[] data -> b
-    46:48:void <init>(byte[]) -> <init>
-    51:52:void <init>(java.util.List) -> <init>
-    55:61:byte[] toArray(java.util.List) -> a
-    66:68:void write(java.io.DataOutput) -> a
-    72:72:byte getId() -> a
-    77:77:net.minecraft.nbt.TagType getType() -> b
-    82:89:java.lang.String toString() -> toString
-    94:96:net.minecraft.nbt.Tag copy() -> c
-    101:105:boolean equals(java.lang.Object) -> equals
-    110:110:int hashCode() -> hashCode
-    115:130:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
-    134:134:byte[] getAsByteArray() -> d
-    139:139:int size() -> size
-    144:144:net.minecraft.nbt.ByteTag get(int) -> a
-    149:151:net.minecraft.nbt.ByteTag set(int,net.minecraft.nbt.ByteTag) -> a
-    156:157:void add(int,net.minecraft.nbt.ByteTag) -> b
-    161:165:boolean setTag(int,net.minecraft.nbt.Tag) -> a
-    170:174:boolean addTag(int,net.minecraft.nbt.Tag) -> b
-    179:181:net.minecraft.nbt.ByteTag remove(int) -> b
-    186:186:int getElementType() -> a_
-    191:192:void clear() -> clear
-    13:13:net.minecraft.nbt.Tag remove(int) -> c
-    13:13:void add(int,net.minecraft.nbt.Tag) -> c
-    13:13:net.minecraft.nbt.Tag set(int,net.minecraft.nbt.Tag) -> d
-    13:13:java.lang.Object remove(int) -> remove
-    13:13:void add(int,java.lang.Object) -> add
-    13:13:java.lang.Object set(int,java.lang.Object) -> set
-    13:13:java.lang.Object get(int) -> get
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.nbt.ByteArrayTag$1 -> jq$1:
-    22:22:void <init>() -> <init>
-    25:30:net.minecraft.nbt.ByteArrayTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
-    35:35:java.lang.String getName() -> a
-    40:40:java.lang.String getPrettyName() -> b
-    22:22:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.ByteTag -> jr:
+    47:49:void <init>(byte[]) -> <init>
+    52:53:void <init>(java.util.List) -> <init>
+    56:62:byte[] toArray(java.util.List) -> a
+    67:69:void write(java.io.DataOutput) -> a
+    73:73:byte getId() -> a
+    78:78:net.minecraft.nbt.TagType getType() -> b
+    83:90:java.lang.String toString() -> toString
+    95:97:net.minecraft.nbt.Tag copy() -> c
+    102:106:boolean equals(java.lang.Object) -> equals
+    111:111:int hashCode() -> hashCode
+    116:131:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
+    135:135:byte[] getAsByteArray() -> d
+    140:140:int size() -> size
+    145:145:net.minecraft.nbt.ByteTag get(int) -> a
+    150:152:net.minecraft.nbt.ByteTag set(int,net.minecraft.nbt.ByteTag) -> a
+    157:158:void add(int,net.minecraft.nbt.ByteTag) -> b
+    162:166:boolean setTag(int,net.minecraft.nbt.Tag) -> a
+    171:175:boolean addTag(int,net.minecraft.nbt.Tag) -> b
+    180:182:net.minecraft.nbt.ByteTag remove(int) -> b
+    187:187:byte getElementType() -> d_
+    192:193:void clear() -> clear
+    14:14:net.minecraft.nbt.Tag remove(int) -> c
+    14:14:void add(int,net.minecraft.nbt.Tag) -> c
+    14:14:net.minecraft.nbt.Tag set(int,net.minecraft.nbt.Tag) -> d
+    14:14:java.lang.Object remove(int) -> remove
+    14:14:void add(int,java.lang.Object) -> add
+    14:14:java.lang.Object set(int,java.lang.Object) -> set
+    14:14:java.lang.Object get(int) -> get
+    23:23:void <clinit>() -> <clinit>
+net.minecraft.nbt.ByteArrayTag$1 -> lb$1:
+    23:23:void <init>() -> <init>
+    26:31:net.minecraft.nbt.ByteArrayTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
+    36:36:java.lang.String getName() -> a
+    41:41:java.lang.String getPrettyName() -> b
+    23:23:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
+net.minecraft.nbt.ByteTag -> lc:
     net.minecraft.nbt.TagType TYPE -> a
     net.minecraft.nbt.ByteTag ZERO -> b
     net.minecraft.nbt.ByteTag ONE -> c
@@ -22619,107 +25026,109 @@ net.minecraft.nbt.ByteTag -> jr:
     10:10:net.minecraft.nbt.Tag copy() -> c
     10:10:void <init>(byte,net.minecraft.nbt.ByteTag$1) -> <init>
     27:51:void <clinit>() -> <clinit>
-net.minecraft.nbt.ByteTag$1 -> jr$1:
+net.minecraft.nbt.ByteTag$1 -> lc$1:
     27:27:void <init>() -> <init>
     30:31:net.minecraft.nbt.ByteTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
     36:36:java.lang.String getName() -> a
     41:41:java.lang.String getPrettyName() -> b
     46:46:boolean isValue() -> c
     27:27:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.ByteTag$Cache -> jr$a:
+net.minecraft.nbt.ByteTag$Cache -> lc$a:
     net.minecraft.nbt.ByteTag[] cache -> a
     18:18:void <init>() -> <init>
     18:18:net.minecraft.nbt.ByteTag[] access$100() -> a
     19:24:void <clinit>() -> <clinit>
-net.minecraft.nbt.CollectionTag -> js:
+net.minecraft.nbt.CollectionTag -> ld:
     5:5:void <init>() -> <init>
     net.minecraft.nbt.Tag set(int,net.minecraft.nbt.Tag) -> d
     void add(int,net.minecraft.nbt.Tag) -> c
     net.minecraft.nbt.Tag remove(int) -> c
     boolean setTag(int,net.minecraft.nbt.Tag) -> a
     boolean addTag(int,net.minecraft.nbt.Tag) -> b
-    int getElementType() -> a_
+    byte getElementType() -> d_
     5:5:java.lang.Object remove(int) -> remove
     5:5:void add(int,java.lang.Object) -> add
     5:5:java.lang.Object set(int,java.lang.Object) -> set
-net.minecraft.nbt.CompoundTag -> jt:
-    org.apache.logging.log4j.Logger LOGGER -> b
-    java.util.regex.Pattern SIMPLE_VALUE -> c
-    net.minecraft.nbt.TagType TYPE -> a
-    java.util.Map tags -> h
-    89:91:void <init>(java.util.Map) -> <init>
-    94:95:void <init>() -> <init>
-    99:104:void write(java.io.DataOutput) -> a
-    107:107:java.util.Set getAllKeys() -> d
-    112:112:byte getId() -> a
-    117:117:net.minecraft.nbt.TagType getType() -> b
-    121:121:int size() -> e
-    126:126:net.minecraft.nbt.Tag put(java.lang.String,net.minecraft.nbt.Tag) -> a
-    130:131:void putByte(java.lang.String,byte) -> a
-    134:135:void putShort(java.lang.String,short) -> a
-    138:139:void putInt(java.lang.String,int) -> b
-    142:143:void putLong(java.lang.String,long) -> a
-    146:148:void putUUID(java.lang.String,java.util.UUID) -> a
-    151:151:java.util.UUID getUUID(java.lang.String) -> a
-    155:155:boolean hasUUID(java.lang.String) -> b
-    159:161:void removeUUID(java.lang.String) -> c
-    164:165:void putFloat(java.lang.String,float) -> a
-    168:169:void putDouble(java.lang.String,double) -> a
-    172:173:void putString(java.lang.String,java.lang.String) -> a
-    176:177:void putByteArray(java.lang.String,byte[]) -> a
-    180:181:void putByteArray(java.lang.String,java.util.List) -> a
-    184:185:void putIntArray(java.lang.String,int[]) -> a
-    188:189:void putIntArray(java.lang.String,java.util.List) -> b
-    192:193:void putLongArray(java.lang.String,long[]) -> a
-    196:197:void putLongArray(java.lang.String,java.util.List) -> c
-    200:201:void putBoolean(java.lang.String,boolean) -> a
-    205:205:net.minecraft.nbt.Tag get(java.lang.String) -> d
-    209:213:byte getTagType(java.lang.String) -> e
-    217:217:boolean contains(java.lang.String) -> f
-    221:229:boolean contains(java.lang.String,int) -> c
-    234:239:byte getByte(java.lang.String) -> g
-    244:249:short getShort(java.lang.String) -> h
-    254:259:int getInt(java.lang.String) -> i
-    264:269:long getLong(java.lang.String) -> j
-    274:279:float getFloat(java.lang.String) -> k
-    284:289:double getDouble(java.lang.String) -> l
-    294:299:java.lang.String getString(java.lang.String) -> m
-    304:310:byte[] getByteArray(java.lang.String) -> n
-    315:321:int[] getIntArray(java.lang.String) -> o
-    326:332:long[] getLongArray(java.lang.String) -> p
-    337:343:net.minecraft.nbt.CompoundTag getCompound(java.lang.String) -> q
-    348:358:net.minecraft.nbt.ListTag getList(java.lang.String,int) -> d
-    362:362:boolean getBoolean(java.lang.String) -> r
-    366:367:void remove(java.lang.String) -> s
-    371:382:void stripEmptyChildren() -> b_
-    386:401:java.lang.String toString() -> toString
-    406:406:boolean isEmpty() -> isEmpty
-    410:417:net.minecraft.CrashReport createReport(java.lang.String,net.minecraft.nbt.TagType,java.lang.ClassCastException) -> a
-    422:423:net.minecraft.nbt.CompoundTag copy() -> g
-    428:432:boolean equals(java.lang.Object) -> equals
-    437:437:int hashCode() -> hashCode
-    441:449:void writeNamedTag(java.lang.String,net.minecraft.nbt.Tag,java.io.DataOutput) -> a
-    452:452:byte readNamedTagType(java.io.DataInput,net.minecraft.nbt.NbtAccounter) -> c
-    456:456:java.lang.String readNamedTagName(java.io.DataInput,net.minecraft.nbt.NbtAccounter) -> d
-    461:467:net.minecraft.nbt.Tag readNamedTagData(net.minecraft.nbt.TagType,java.lang.String,java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-    485:500:net.minecraft.nbt.CompoundTag merge(net.minecraft.nbt.CompoundTag) -> a
-    504:508:java.lang.String handleEscape(java.lang.String) -> t
-    512:519:net.minecraft.network.chat.Component handleEscapePretty(java.lang.String) -> u
-    524:558:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
-    28:28:net.minecraft.nbt.Tag copy() -> c
-    413:413:java.lang.String lambda$createReport$0(java.lang.String) -> v
-    28:28:byte access$000(java.io.DataInput,net.minecraft.nbt.NbtAccounter) -> a
-    28:28:java.lang.String access$100(java.io.DataInput,net.minecraft.nbt.NbtAccounter) -> b
-    28:28:net.minecraft.nbt.Tag access$200(net.minecraft.nbt.TagType,java.lang.String,java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
-    28:28:void <init>(java.util.Map,net.minecraft.nbt.CompoundTag$1) -> <init>
-    29:54:void <clinit>() -> <clinit>
-net.minecraft.nbt.CompoundTag$1 -> jt$1:
-    54:54:void <init>() -> <init>
-    57:73:net.minecraft.nbt.CompoundTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
-    78:78:java.lang.String getName() -> a
-    83:83:java.lang.String getPrettyName() -> b
-    54:54:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.DoubleTag -> ju:
+net.minecraft.nbt.CompoundTag -> le:
+    com.mojang.serialization.Codec CODEC -> a
+    org.apache.logging.log4j.Logger LOGGER -> c
+    java.util.regex.Pattern SIMPLE_VALUE -> h
+    net.minecraft.nbt.TagType TYPE -> b
+    java.util.Map tags -> i
+    104:106:void <init>(java.util.Map) -> <init>
+    109:110:void <init>() -> <init>
+    114:119:void write(java.io.DataOutput) -> a
+    122:122:java.util.Set getAllKeys() -> d
+    127:127:byte getId() -> a
+    132:132:net.minecraft.nbt.TagType getType() -> b
+    136:136:int size() -> e
+    141:141:net.minecraft.nbt.Tag put(java.lang.String,net.minecraft.nbt.Tag) -> a
+    145:146:void putByte(java.lang.String,byte) -> a
+    149:150:void putShort(java.lang.String,short) -> a
+    153:154:void putInt(java.lang.String,int) -> b
+    157:158:void putLong(java.lang.String,long) -> a
+    161:162:void putUUID(java.lang.String,java.util.UUID) -> a
+    165:165:java.util.UUID getUUID(java.lang.String) -> a
+    169:170:boolean hasUUID(java.lang.String) -> b
+    174:175:void putFloat(java.lang.String,float) -> a
+    178:179:void putDouble(java.lang.String,double) -> a
+    182:183:void putString(java.lang.String,java.lang.String) -> a
+    186:187:void putByteArray(java.lang.String,byte[]) -> a
+    190:191:void putByteArray(java.lang.String,java.util.List) -> a
+    194:195:void putIntArray(java.lang.String,int[]) -> a
+    198:199:void putIntArray(java.lang.String,java.util.List) -> b
+    202:203:void putLongArray(java.lang.String,long[]) -> a
+    206:207:void putLongArray(java.lang.String,java.util.List) -> c
+    210:211:void putBoolean(java.lang.String,boolean) -> a
+    215:215:net.minecraft.nbt.Tag get(java.lang.String) -> c
+    219:223:byte getTagType(java.lang.String) -> d
+    227:227:boolean contains(java.lang.String) -> e
+    231:239:boolean contains(java.lang.String,int) -> c
+    244:249:byte getByte(java.lang.String) -> f
+    254:259:short getShort(java.lang.String) -> g
+    264:269:int getInt(java.lang.String) -> h
+    274:279:long getLong(java.lang.String) -> i
+    284:289:float getFloat(java.lang.String) -> j
+    294:299:double getDouble(java.lang.String) -> k
+    304:309:java.lang.String getString(java.lang.String) -> l
+    314:320:byte[] getByteArray(java.lang.String) -> m
+    325:331:int[] getIntArray(java.lang.String) -> n
+    336:342:long[] getLongArray(java.lang.String) -> o
+    347:353:net.minecraft.nbt.CompoundTag getCompound(java.lang.String) -> p
+    358:368:net.minecraft.nbt.ListTag getList(java.lang.String,int) -> d
+    372:372:boolean getBoolean(java.lang.String) -> q
+    376:377:void remove(java.lang.String) -> r
+    381:392:void stripEmptyChildren() -> e_
+    396:411:java.lang.String toString() -> toString
+    416:416:boolean isEmpty() -> isEmpty
+    420:427:net.minecraft.CrashReport createReport(java.lang.String,net.minecraft.nbt.TagType,java.lang.ClassCastException) -> a
+    432:433:net.minecraft.nbt.CompoundTag copy() -> g
+    438:442:boolean equals(java.lang.Object) -> equals
+    447:447:int hashCode() -> hashCode
+    451:459:void writeNamedTag(java.lang.String,net.minecraft.nbt.Tag,java.io.DataOutput) -> a
+    462:462:byte readNamedTagType(java.io.DataInput,net.minecraft.nbt.NbtAccounter) -> c
+    466:466:java.lang.String readNamedTagName(java.io.DataInput,net.minecraft.nbt.NbtAccounter) -> d
+    471:477:net.minecraft.nbt.Tag readNamedTagData(net.minecraft.nbt.TagType,java.lang.String,java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
+    495:510:net.minecraft.nbt.CompoundTag merge(net.minecraft.nbt.CompoundTag) -> a
+    514:518:java.lang.String handleEscape(java.lang.String) -> s
+    522:529:net.minecraft.network.chat.Component handleEscapePretty(java.lang.String) -> t
+    534:568:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
+    572:572:java.util.Map entries() -> h
+    32:32:net.minecraft.nbt.Tag copy() -> c
+    423:423:java.lang.String lambda$createReport$2(java.lang.String) -> u
+    41:41:com.mojang.serialization.Dynamic lambda$static$1(net.minecraft.nbt.CompoundTag) -> b
+    35:39:com.mojang.serialization.DataResult lambda$static$0(com.mojang.serialization.Dynamic) -> a
+    32:32:byte access$000(java.io.DataInput,net.minecraft.nbt.NbtAccounter) -> a
+    32:32:java.lang.String access$100(java.io.DataInput,net.minecraft.nbt.NbtAccounter) -> b
+    32:32:net.minecraft.nbt.Tag access$200(net.minecraft.nbt.TagType,java.lang.String,java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
+    33:69:void <clinit>() -> <clinit>
+net.minecraft.nbt.CompoundTag$1 -> le$1:
+    69:69:void <init>() -> <init>
+    72:88:net.minecraft.nbt.CompoundTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
+    93:93:java.lang.String getName() -> a
+    98:98:java.lang.String getPrettyName() -> b
+    69:69:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
+net.minecraft.nbt.DoubleTag -> lf:
     net.minecraft.nbt.DoubleTag ZERO -> a
     net.minecraft.nbt.TagType TYPE -> b
     double data -> c
@@ -22742,14 +25151,14 @@ net.minecraft.nbt.DoubleTag -> ju:
     135:135:java.lang.Number getAsNumber() -> k
     11:11:net.minecraft.nbt.Tag copy() -> c
     19:21:void <clinit>() -> <clinit>
-net.minecraft.nbt.DoubleTag$1 -> ju$1:
+net.minecraft.nbt.DoubleTag$1 -> lf$1:
     21:21:void <init>() -> <init>
     24:25:net.minecraft.nbt.DoubleTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
     30:30:java.lang.String getName() -> a
     35:35:java.lang.String getPrettyName() -> b
     40:40:boolean isValue() -> c
     21:21:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.EndTag -> jv:
+net.minecraft.nbt.EndTag -> lg:
     net.minecraft.nbt.TagType TYPE -> a
     net.minecraft.nbt.EndTag INSTANCE -> b
     40:41:void <init>() -> <init>
@@ -22761,14 +25170,14 @@ net.minecraft.nbt.EndTag -> jv:
     69:69:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
     10:10:net.minecraft.nbt.Tag copy() -> c
     15:38:void <clinit>() -> <clinit>
-net.minecraft.nbt.EndTag$1 -> jv$1:
+net.minecraft.nbt.EndTag$1 -> lg$1:
     15:15:void <init>() -> <init>
     18:19:net.minecraft.nbt.EndTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
     24:24:java.lang.String getName() -> a
     29:29:java.lang.String getPrettyName() -> b
     34:34:boolean isValue() -> c
     15:15:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.FloatTag -> jw:
+net.minecraft.nbt.FloatTag -> lh:
     net.minecraft.nbt.FloatTag ZERO -> a
     net.minecraft.nbt.TagType TYPE -> b
     float data -> c
@@ -22791,53 +25200,53 @@ net.minecraft.nbt.FloatTag -> jw:
     134:134:java.lang.Number getAsNumber() -> k
     11:11:net.minecraft.nbt.Tag copy() -> c
     19:21:void <clinit>() -> <clinit>
-net.minecraft.nbt.FloatTag$1 -> jw$1:
+net.minecraft.nbt.FloatTag$1 -> lh$1:
     21:21:void <init>() -> <init>
     24:25:net.minecraft.nbt.FloatTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
     30:30:java.lang.String getName() -> a
     35:35:java.lang.String getPrettyName() -> b
     40:40:boolean isValue() -> c
     21:21:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.IntArrayTag -> jx:
+net.minecraft.nbt.IntArrayTag -> li:
     net.minecraft.nbt.TagType TYPE -> a
     int[] data -> b
-    49:51:void <init>(int[]) -> <init>
-    54:55:void <init>(java.util.List) -> <init>
-    58:64:int[] toArray(java.util.List) -> a
-    69:73:void write(java.io.DataOutput) -> a
-    77:77:byte getId() -> a
-    82:82:net.minecraft.nbt.TagType getType() -> b
-    87:94:java.lang.String toString() -> toString
-    99:101:net.minecraft.nbt.IntArrayTag copy() -> d
-    106:110:boolean equals(java.lang.Object) -> equals
-    115:115:int hashCode() -> hashCode
-    119:119:int[] getAsIntArray() -> g
-    124:136:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
-    141:141:int size() -> size
-    146:146:net.minecraft.nbt.IntTag get(int) -> a
-    151:153:net.minecraft.nbt.IntTag set(int,net.minecraft.nbt.IntTag) -> a
-    158:159:void add(int,net.minecraft.nbt.IntTag) -> b
-    163:167:boolean setTag(int,net.minecraft.nbt.Tag) -> a
-    172:176:boolean addTag(int,net.minecraft.nbt.Tag) -> b
-    181:183:net.minecraft.nbt.IntTag remove(int) -> b
-    188:188:int getElementType() -> a_
-    193:194:void clear() -> clear
-    13:13:net.minecraft.nbt.Tag remove(int) -> c
-    13:13:void add(int,net.minecraft.nbt.Tag) -> c
-    13:13:net.minecraft.nbt.Tag set(int,net.minecraft.nbt.Tag) -> d
-    13:13:net.minecraft.nbt.Tag copy() -> c
-    13:13:java.lang.Object remove(int) -> remove
-    13:13:void add(int,java.lang.Object) -> add
-    13:13:java.lang.Object set(int,java.lang.Object) -> set
-    13:13:java.lang.Object get(int) -> get
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.nbt.IntArrayTag$1 -> jx$1:
-    22:22:void <init>() -> <init>
-    25:33:net.minecraft.nbt.IntArrayTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
-    38:38:java.lang.String getName() -> a
-    43:43:java.lang.String getPrettyName() -> b
-    22:22:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.IntTag -> jy:
+    50:52:void <init>(int[]) -> <init>
+    55:56:void <init>(java.util.List) -> <init>
+    59:65:int[] toArray(java.util.List) -> a
+    70:74:void write(java.io.DataOutput) -> a
+    78:78:byte getId() -> a
+    83:83:net.minecraft.nbt.TagType getType() -> b
+    88:95:java.lang.String toString() -> toString
+    100:102:net.minecraft.nbt.IntArrayTag copy() -> d
+    107:111:boolean equals(java.lang.Object) -> equals
+    116:116:int hashCode() -> hashCode
+    120:120:int[] getAsIntArray() -> g
+    125:137:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
+    142:142:int size() -> size
+    147:147:net.minecraft.nbt.IntTag get(int) -> a
+    152:154:net.minecraft.nbt.IntTag set(int,net.minecraft.nbt.IntTag) -> a
+    159:160:void add(int,net.minecraft.nbt.IntTag) -> b
+    164:168:boolean setTag(int,net.minecraft.nbt.Tag) -> a
+    173:177:boolean addTag(int,net.minecraft.nbt.Tag) -> b
+    182:184:net.minecraft.nbt.IntTag remove(int) -> b
+    189:189:byte getElementType() -> d_
+    194:195:void clear() -> clear
+    14:14:net.minecraft.nbt.Tag remove(int) -> c
+    14:14:void add(int,net.minecraft.nbt.Tag) -> c
+    14:14:net.minecraft.nbt.Tag set(int,net.minecraft.nbt.Tag) -> d
+    14:14:net.minecraft.nbt.Tag copy() -> c
+    14:14:java.lang.Object remove(int) -> remove
+    14:14:void add(int,java.lang.Object) -> add
+    14:14:java.lang.Object set(int,java.lang.Object) -> set
+    14:14:java.lang.Object get(int) -> get
+    23:23:void <clinit>() -> <clinit>
+net.minecraft.nbt.IntArrayTag$1 -> li$1:
+    23:23:void <init>() -> <init>
+    26:34:net.minecraft.nbt.IntArrayTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
+    39:39:java.lang.String getName() -> a
+    44:44:java.lang.String getPrettyName() -> b
+    23:23:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
+net.minecraft.nbt.IntTag -> lj:
     net.minecraft.nbt.TagType TYPE -> a
     int data -> b
     54:56:void <init>(int) -> <init>
@@ -22860,108 +25269,108 @@ net.minecraft.nbt.IntTag -> jy:
     10:10:net.minecraft.nbt.Tag copy() -> c
     10:10:void <init>(int,net.minecraft.nbt.IntTag$1) -> <init>
     29:29:void <clinit>() -> <clinit>
-net.minecraft.nbt.IntTag$1 -> jy$1:
+net.minecraft.nbt.IntTag$1 -> lj$1:
     29:29:void <init>() -> <init>
     32:33:net.minecraft.nbt.IntTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
     38:38:java.lang.String getName() -> a
     43:43:java.lang.String getPrettyName() -> b
     48:48:boolean isValue() -> c
     29:29:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.IntTag$Cache -> jy$a:
+net.minecraft.nbt.IntTag$Cache -> lj$a:
     net.minecraft.nbt.IntTag[] cache -> a
     18:18:void <init>() -> <init>
     21:26:void <clinit>() -> <clinit>
-net.minecraft.nbt.ListTag -> jz:
+net.minecraft.nbt.ListTag -> lk:
     net.minecraft.nbt.TagType TYPE -> a
     it.unimi.dsi.fastutil.bytes.ByteSet INLINE_ELEMENT_TYPES -> b
     java.util.List list -> c
     byte type -> h
-    70:73:void <init>(java.util.List,byte) -> <init>
-    76:77:void <init>() -> <init>
-    81:92:void write(java.io.DataOutput) -> a
-    96:96:byte getId() -> a
-    101:101:net.minecraft.nbt.TagType getType() -> b
-    106:113:java.lang.String toString() -> toString
-    117:120:void updateTypeAfterRemove() -> g
-    124:126:net.minecraft.nbt.Tag remove(int) -> c
-    131:133:void stripEmptyChildren() -> b_
-    137:137:boolean isEmpty() -> isEmpty
-    141:147:net.minecraft.nbt.CompoundTag getCompound(int) -> a
-    151:157:net.minecraft.nbt.ListTag getList(int) -> b
-    161:167:short getShort(int) -> d
-    171:177:int getInt(int) -> e
-    181:187:int[] getIntArray(int) -> f
-    191:197:long[] getLongArray(int) -> g
-    201:207:double getDouble(int) -> h
-    211:217:float getFloat(int) -> i
-    221:228:java.lang.String getString(int) -> j
-    233:233:int size() -> size
-    238:238:net.minecraft.nbt.Tag get(int) -> k
-    243:247:net.minecraft.nbt.Tag set(int,net.minecraft.nbt.Tag) -> d
-    252:255:void add(int,net.minecraft.nbt.Tag) -> c
-    259:263:boolean setTag(int,net.minecraft.nbt.Tag) -> a
-    268:272:boolean addTag(int,net.minecraft.nbt.Tag) -> b
-    276:283:boolean updateType(net.minecraft.nbt.Tag) -> a
-    288:290:net.minecraft.nbt.ListTag copy() -> d
-    295:299:boolean equals(java.lang.Object) -> equals
-    304:304:int hashCode() -> hashCode
-    309:344:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
-    349:349:int getElementType() -> a_
-    354:356:void clear() -> clear
-    18:18:net.minecraft.nbt.Tag copy() -> c
-    18:18:java.lang.Object remove(int) -> remove
-    18:18:void add(int,java.lang.Object) -> add
-    18:18:java.lang.Object set(int,java.lang.Object) -> set
-    18:18:java.lang.Object get(int) -> get
-    18:18:void <init>(java.util.List,byte,net.minecraft.nbt.ListTag$1) -> <init>
-    31:65:void <clinit>() -> <clinit>
-net.minecraft.nbt.ListTag$1 -> jz$1:
-    31:31:void <init>() -> <init>
-    34:50:net.minecraft.nbt.ListTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
-    55:55:java.lang.String getName() -> a
-    60:60:java.lang.String getPrettyName() -> b
-    31:31:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.LongArrayTag -> ka:
+    71:74:void <init>(java.util.List,byte) -> <init>
+    77:78:void <init>() -> <init>
+    82:93:void write(java.io.DataOutput) -> a
+    97:97:byte getId() -> a
+    102:102:net.minecraft.nbt.TagType getType() -> b
+    107:114:java.lang.String toString() -> toString
+    118:121:void updateTypeAfterRemove() -> g
+    125:127:net.minecraft.nbt.Tag remove(int) -> c
+    132:134:void stripEmptyChildren() -> e_
+    138:138:boolean isEmpty() -> isEmpty
+    142:148:net.minecraft.nbt.CompoundTag getCompound(int) -> a
+    152:158:net.minecraft.nbt.ListTag getList(int) -> b
+    162:168:short getShort(int) -> d
+    172:178:int getInt(int) -> e
+    182:188:int[] getIntArray(int) -> f
+    192:198:long[] getLongArray(int) -> g
+    202:208:double getDouble(int) -> h
+    212:218:float getFloat(int) -> i
+    222:229:java.lang.String getString(int) -> j
+    234:234:int size() -> size
+    239:239:net.minecraft.nbt.Tag get(int) -> k
+    244:248:net.minecraft.nbt.Tag set(int,net.minecraft.nbt.Tag) -> d
+    253:256:void add(int,net.minecraft.nbt.Tag) -> c
+    260:264:boolean setTag(int,net.minecraft.nbt.Tag) -> a
+    269:273:boolean addTag(int,net.minecraft.nbt.Tag) -> b
+    277:284:boolean updateType(net.minecraft.nbt.Tag) -> a
+    289:291:net.minecraft.nbt.ListTag copy() -> d
+    296:300:boolean equals(java.lang.Object) -> equals
+    305:305:int hashCode() -> hashCode
+    310:345:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
+    350:350:byte getElementType() -> d_
+    355:357:void clear() -> clear
+    19:19:net.minecraft.nbt.Tag copy() -> c
+    19:19:java.lang.Object remove(int) -> remove
+    19:19:void add(int,java.lang.Object) -> add
+    19:19:java.lang.Object set(int,java.lang.Object) -> set
+    19:19:java.lang.Object get(int) -> get
+    19:19:void <init>(java.util.List,byte,net.minecraft.nbt.ListTag$1) -> <init>
+    32:66:void <clinit>() -> <clinit>
+net.minecraft.nbt.ListTag$1 -> lk$1:
+    32:32:void <init>() -> <init>
+    35:51:net.minecraft.nbt.ListTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
+    56:56:java.lang.String getName() -> a
+    61:61:java.lang.String getPrettyName() -> b
+    32:32:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
+net.minecraft.nbt.LongArrayTag -> ll:
     net.minecraft.nbt.TagType TYPE -> a
     long[] data -> b
-    50:52:void <init>(long[]) -> <init>
-    54:56:void <init>(it.unimi.dsi.fastutil.longs.LongSet) -> <init>
-    59:60:void <init>(java.util.List) -> <init>
-    63:69:long[] toArray(java.util.List) -> a
-    74:78:void write(java.io.DataOutput) -> a
-    82:82:byte getId() -> a
-    87:87:net.minecraft.nbt.TagType getType() -> b
-    92:99:java.lang.String toString() -> toString
-    104:106:net.minecraft.nbt.LongArrayTag copy() -> d
-    111:115:boolean equals(java.lang.Object) -> equals
-    120:120:int hashCode() -> hashCode
-    125:138:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
-    142:142:long[] getAsLongArray() -> g
-    147:147:int size() -> size
-    152:152:net.minecraft.nbt.LongTag get(int) -> a
-    157:159:net.minecraft.nbt.LongTag set(int,net.minecraft.nbt.LongTag) -> a
-    164:165:void add(int,net.minecraft.nbt.LongTag) -> b
-    169:173:boolean setTag(int,net.minecraft.nbt.Tag) -> a
-    178:182:boolean addTag(int,net.minecraft.nbt.Tag) -> b
-    187:189:net.minecraft.nbt.LongTag remove(int) -> b
-    194:194:int getElementType() -> a_
-    199:200:void clear() -> clear
-    14:14:net.minecraft.nbt.Tag remove(int) -> c
-    14:14:void add(int,net.minecraft.nbt.Tag) -> c
-    14:14:net.minecraft.nbt.Tag set(int,net.minecraft.nbt.Tag) -> d
-    14:14:net.minecraft.nbt.Tag copy() -> c
-    14:14:java.lang.Object remove(int) -> remove
-    14:14:void add(int,java.lang.Object) -> add
-    14:14:java.lang.Object set(int,java.lang.Object) -> set
-    14:14:java.lang.Object get(int) -> get
-    23:23:void <clinit>() -> <clinit>
-net.minecraft.nbt.LongArrayTag$1 -> ka$1:
-    23:23:void <init>() -> <init>
-    26:34:net.minecraft.nbt.LongArrayTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
-    39:39:java.lang.String getName() -> a
-    44:44:java.lang.String getPrettyName() -> b
-    23:23:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.LongTag -> kb:
+    51:53:void <init>(long[]) -> <init>
+    55:57:void <init>(it.unimi.dsi.fastutil.longs.LongSet) -> <init>
+    60:61:void <init>(java.util.List) -> <init>
+    64:70:long[] toArray(java.util.List) -> a
+    75:79:void write(java.io.DataOutput) -> a
+    83:83:byte getId() -> a
+    88:88:net.minecraft.nbt.TagType getType() -> b
+    93:100:java.lang.String toString() -> toString
+    105:107:net.minecraft.nbt.LongArrayTag copy() -> d
+    112:116:boolean equals(java.lang.Object) -> equals
+    121:121:int hashCode() -> hashCode
+    126:139:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
+    143:143:long[] getAsLongArray() -> g
+    148:148:int size() -> size
+    153:153:net.minecraft.nbt.LongTag get(int) -> a
+    158:160:net.minecraft.nbt.LongTag set(int,net.minecraft.nbt.LongTag) -> a
+    165:166:void add(int,net.minecraft.nbt.LongTag) -> b
+    170:174:boolean setTag(int,net.minecraft.nbt.Tag) -> a
+    179:183:boolean addTag(int,net.minecraft.nbt.Tag) -> b
+    188:190:net.minecraft.nbt.LongTag remove(int) -> b
+    195:195:byte getElementType() -> d_
+    200:201:void clear() -> clear
+    15:15:net.minecraft.nbt.Tag remove(int) -> c
+    15:15:void add(int,net.minecraft.nbt.Tag) -> c
+    15:15:net.minecraft.nbt.Tag set(int,net.minecraft.nbt.Tag) -> d
+    15:15:net.minecraft.nbt.Tag copy() -> c
+    15:15:java.lang.Object remove(int) -> remove
+    15:15:void add(int,java.lang.Object) -> add
+    15:15:java.lang.Object set(int,java.lang.Object) -> set
+    15:15:java.lang.Object get(int) -> get
+    24:24:void <clinit>() -> <clinit>
+net.minecraft.nbt.LongArrayTag$1 -> ll$1:
+    24:24:void <init>() -> <init>
+    27:35:net.minecraft.nbt.LongArrayTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
+    40:40:java.lang.String getName() -> a
+    45:45:java.lang.String getPrettyName() -> b
+    24:24:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
+net.minecraft.nbt.LongTag -> lm:
     net.minecraft.nbt.TagType TYPE -> a
     long data -> b
     54:56:void <init>(long) -> <init>
@@ -22984,132 +25393,169 @@ net.minecraft.nbt.LongTag -> kb:
     10:10:net.minecraft.nbt.Tag copy() -> c
     10:10:void <init>(long,net.minecraft.nbt.LongTag$1) -> <init>
     29:29:void <clinit>() -> <clinit>
-net.minecraft.nbt.LongTag$1 -> kb$1:
+net.minecraft.nbt.LongTag$1 -> lm$1:
     29:29:void <init>() -> <init>
     32:33:net.minecraft.nbt.LongTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
     38:38:java.lang.String getName() -> a
     43:43:java.lang.String getPrettyName() -> b
     48:48:boolean isValue() -> c
     29:29:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.LongTag$Cache -> kb$a:
+net.minecraft.nbt.LongTag$Cache -> lm$a:
     net.minecraft.nbt.LongTag[] cache -> a
     18:18:void <init>() -> <init>
     21:26:void <clinit>() -> <clinit>
-net.minecraft.nbt.NbtAccounter -> kc:
+net.minecraft.nbt.NbtAccounter -> ln:
     net.minecraft.nbt.NbtAccounter UNLIMITED -> a
     long quota -> b
     long usage -> c
     14:16:void <init>(long) -> <init>
     19:23:void accountBits(long) -> a
     4:4:void <clinit>() -> <clinit>
-net.minecraft.nbt.NbtAccounter$1 -> kc$1:
+net.minecraft.nbt.NbtAccounter$1 -> ln$1:
     4:4:void <init>(long) -> <init>
     8:8:void accountBits(long) -> a
-net.minecraft.nbt.NbtIo -> kd:
+net.minecraft.nbt.NbtIo -> lo:
     23:23:void <init>() -> <init>
     25:27:net.minecraft.nbt.CompoundTag readCompressed(java.io.InputStream) -> a
     31:34:void writeCompressed(net.minecraft.nbt.CompoundTag,java.io.OutputStream) -> a
-    37:49:void safeWrite(net.minecraft.nbt.CompoundTag,java.io.File) -> a
-    52:58:void write(net.minecraft.nbt.CompoundTag,java.io.File) -> b
-    62:70:net.minecraft.nbt.CompoundTag read(java.io.File) -> a
-    74:74:net.minecraft.nbt.CompoundTag read(java.io.DataInputStream) -> a
-    78:82:net.minecraft.nbt.CompoundTag read(java.io.DataInput,net.minecraft.nbt.NbtAccounter) -> a
-    86:87:void write(net.minecraft.nbt.CompoundTag,java.io.DataOutput) -> a
-    90:99:void writeUnnamedTag(net.minecraft.nbt.Tag,java.io.DataOutput) -> a
-    102:116:net.minecraft.nbt.Tag readUnnamedTag(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
-net.minecraft.nbt.NbtOps -> ke:
+    37:43:void write(net.minecraft.nbt.CompoundTag,java.io.File) -> a
+    47:55:net.minecraft.nbt.CompoundTag read(java.io.File) -> a
+    59:59:net.minecraft.nbt.CompoundTag read(java.io.DataInputStream) -> a
+    63:67:net.minecraft.nbt.CompoundTag read(java.io.DataInput,net.minecraft.nbt.NbtAccounter) -> a
+    71:72:void write(net.minecraft.nbt.CompoundTag,java.io.DataOutput) -> a
+    75:84:void writeUnnamedTag(net.minecraft.nbt.Tag,java.io.DataOutput) -> a
+    87:101:net.minecraft.nbt.Tag readUnnamedTag(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
+net.minecraft.nbt.NbtOps -> lp:
     net.minecraft.nbt.NbtOps INSTANCE -> a
-    26:27:void <init>() -> <init>
-    31:31:net.minecraft.nbt.Tag empty() -> a
-    36:64:com.mojang.datafixers.types.Type getType(net.minecraft.nbt.Tag) -> a
-    70:73:java.util.Optional getNumberValue(net.minecraft.nbt.Tag) -> b
-    78:78:net.minecraft.nbt.Tag createNumeric(java.lang.Number) -> a
-    83:83:net.minecraft.nbt.Tag createByte(byte) -> a
-    88:88:net.minecraft.nbt.Tag createShort(short) -> a
-    93:93:net.minecraft.nbt.Tag createInt(int) -> a
-    98:98:net.minecraft.nbt.Tag createLong(long) -> a
-    103:103:net.minecraft.nbt.Tag createFloat(float) -> a
-    108:108:net.minecraft.nbt.Tag createDouble(double) -> a
-    113:113:net.minecraft.nbt.Tag createBoolean(boolean) -> a
-    118:121:java.util.Optional getStringValue(net.minecraft.nbt.Tag) -> c
-    126:126:net.minecraft.nbt.Tag createString(java.lang.String) -> a
-    131:159:net.minecraft.nbt.Tag mergeInto(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag) -> a
-    165:175:net.minecraft.nbt.Tag mergeInto(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag,net.minecraft.nbt.Tag) -> a
-    180:200:net.minecraft.nbt.Tag merge(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag) -> b
-    205:209:java.util.Optional getMapValues(net.minecraft.nbt.Tag) -> d
-    214:218:net.minecraft.nbt.Tag createMap(java.util.Map) -> a
-    223:226:java.util.Optional getStream(net.minecraft.nbt.Tag) -> e
-    231:234:java.util.Optional getByteBuffer(net.minecraft.nbt.Tag) -> f
-    239:239:net.minecraft.nbt.Tag createByteList(java.nio.ByteBuffer) -> a
-    244:247:java.util.Optional getIntStream(net.minecraft.nbt.Tag) -> g
-    252:252:net.minecraft.nbt.Tag createIntList(java.util.stream.IntStream) -> a
-    257:260:java.util.Optional getLongStream(net.minecraft.nbt.Tag) -> h
-    265:265:net.minecraft.nbt.Tag createLongList(java.util.stream.LongStream) -> a
-    270:295:net.minecraft.nbt.Tag createList(java.util.stream.Stream) -> a
-    300:306:net.minecraft.nbt.Tag remove(net.minecraft.nbt.Tag,java.lang.String) -> a
-    311:311:java.lang.String toString() -> toString
-    23:23:java.lang.Object remove(java.lang.Object,java.lang.String) -> remove
-    23:23:java.lang.Object createLongList(java.util.stream.LongStream) -> createLongList
-    23:23:java.util.Optional getLongStream(java.lang.Object) -> getLongStream
-    23:23:java.lang.Object createIntList(java.util.stream.IntStream) -> createIntList
-    23:23:java.util.Optional getIntStream(java.lang.Object) -> getIntStream
-    23:23:java.lang.Object createByteList(java.nio.ByteBuffer) -> createByteList
-    23:23:java.util.Optional getByteBuffer(java.lang.Object) -> getByteBuffer
-    23:23:java.lang.Object createList(java.util.stream.Stream) -> createList
-    23:23:java.util.Optional getStream(java.lang.Object) -> getStream
-    23:23:java.lang.Object createMap(java.util.Map) -> createMap
-    23:23:java.util.Optional getMapValues(java.lang.Object) -> getMapValues
-    23:23:java.lang.Object merge(java.lang.Object,java.lang.Object) -> merge
-    23:23:java.lang.Object mergeInto(java.lang.Object,java.lang.Object,java.lang.Object) -> mergeInto
-    23:23:java.lang.Object mergeInto(java.lang.Object,java.lang.Object) -> mergeInto
-    23:23:java.lang.Object createString(java.lang.String) -> createString
-    23:23:java.util.Optional getStringValue(java.lang.Object) -> getStringValue
-    23:23:java.lang.Object createBoolean(boolean) -> createBoolean
-    23:23:java.lang.Object createDouble(double) -> createDouble
-    23:23:java.lang.Object createFloat(float) -> createFloat
-    23:23:java.lang.Object createLong(long) -> createLong
-    23:23:java.lang.Object createInt(int) -> createInt
-    23:23:java.lang.Object createShort(short) -> createShort
-    23:23:java.lang.Object createByte(byte) -> createByte
-    23:23:java.lang.Object createNumeric(java.lang.Number) -> createNumeric
-    23:23:java.util.Optional getNumberValue(java.lang.Object) -> getNumberValue
-    23:23:com.mojang.datafixers.types.Type getType(java.lang.Object) -> getType
-    23:23:java.lang.Object empty() -> empty
-    303:303:void lambda$remove$9(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag,java.lang.String) -> a
-    303:303:boolean lambda$remove$8(java.lang.String,java.lang.String) -> a
-    284:284:java.lang.Long lambda$createList$7(net.minecraft.nbt.Tag) -> i
-    280:280:java.lang.Integer lambda$createList$6(net.minecraft.nbt.Tag) -> j
-    276:276:java.lang.Byte lambda$createList$5(net.minecraft.nbt.Tag) -> k
-    224:224:net.minecraft.nbt.Tag lambda$getStream$4(net.minecraft.nbt.Tag) -> l
-    207:207:com.mojang.datafixers.util.Pair lambda$getMapValues$3(net.minecraft.nbt.CompoundTag,java.lang.String) -> a
-    191:191:void lambda$merge$2(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag,java.lang.String) -> b
-    190:190:void lambda$merge$1(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag,java.lang.String) -> c
-    170:170:void lambda$mergeInto$0(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag,java.lang.String) -> d
-    24:24:void <clinit>() -> <clinit>
-net.minecraft.nbt.NbtUtils -> kf:
+    29:30:void <init>() -> <init>
+    34:34:net.minecraft.nbt.Tag empty() -> a
+    39:67:java.lang.Object convertTo(com.mojang.serialization.DynamicOps,net.minecraft.nbt.Tag) -> a
+    73:76:com.mojang.serialization.DataResult getNumberValue(net.minecraft.nbt.Tag) -> a
+    81:81:net.minecraft.nbt.Tag createNumeric(java.lang.Number) -> a
+    86:86:net.minecraft.nbt.Tag createByte(byte) -> a
+    91:91:net.minecraft.nbt.Tag createShort(short) -> a
+    96:96:net.minecraft.nbt.Tag createInt(int) -> a
+    101:101:net.minecraft.nbt.Tag createLong(long) -> a
+    106:106:net.minecraft.nbt.Tag createFloat(float) -> a
+    111:111:net.minecraft.nbt.Tag createDouble(double) -> a
+    116:116:net.minecraft.nbt.Tag createBoolean(boolean) -> a
+    121:124:com.mojang.serialization.DataResult getStringValue(net.minecraft.nbt.Tag) -> b
+    129:129:net.minecraft.nbt.Tag createString(java.lang.String) -> a
+    133:142:net.minecraft.nbt.CollectionTag createGenericList(byte,byte) -> a
+    146:146:boolean typesMatch(byte,byte,byte) -> a
+    153:159:void fillOne(net.minecraft.nbt.CollectionTag,net.minecraft.nbt.Tag,net.minecraft.nbt.Tag) -> a
+    164:170:void fillMany(net.minecraft.nbt.CollectionTag,net.minecraft.nbt.Tag,java.util.List) -> a
+    174:183:com.mojang.serialization.DataResult mergeToList(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag) -> a
+    188:197:com.mojang.serialization.DataResult mergeToList(net.minecraft.nbt.Tag,java.util.List) -> a
+    202:215:com.mojang.serialization.DataResult mergeToMap(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag,net.minecraft.nbt.Tag) -> a
+    220:246:com.mojang.serialization.DataResult mergeToMap(net.minecraft.nbt.Tag,com.mojang.serialization.MapLike) -> a
+    251:255:com.mojang.serialization.DataResult getMapValues(net.minecraft.nbt.Tag) -> c
+    260:264:com.mojang.serialization.DataResult getMapEntries(net.minecraft.nbt.Tag) -> d
+    269:273:com.mojang.serialization.DataResult getMap(net.minecraft.nbt.Tag) -> e
+    300:304:net.minecraft.nbt.Tag createMap(java.util.stream.Stream) -> a
+    309:312:com.mojang.serialization.DataResult getStream(net.minecraft.nbt.Tag) -> f
+    317:321:com.mojang.serialization.DataResult getList(net.minecraft.nbt.Tag) -> g
+    326:329:com.mojang.serialization.DataResult getByteBuffer(net.minecraft.nbt.Tag) -> h
+    334:334:net.minecraft.nbt.Tag createByteList(java.nio.ByteBuffer) -> a
+    339:342:com.mojang.serialization.DataResult getIntStream(net.minecraft.nbt.Tag) -> i
+    347:347:net.minecraft.nbt.Tag createIntList(java.util.stream.IntStream) -> a
+    352:355:com.mojang.serialization.DataResult getLongStream(net.minecraft.nbt.Tag) -> j
+    360:360:net.minecraft.nbt.Tag createLongList(java.util.stream.LongStream) -> a
+    365:390:net.minecraft.nbt.Tag createList(java.util.stream.Stream) -> b
+    395:401:net.minecraft.nbt.Tag remove(net.minecraft.nbt.Tag,java.lang.String) -> a
+    406:406:java.lang.String toString() -> toString
+    411:411:com.mojang.serialization.RecordBuilder mapBuilder() -> mapBuilder
+    26:26:java.lang.Object remove(java.lang.Object,java.lang.String) -> remove
+    26:26:java.lang.Object createLongList(java.util.stream.LongStream) -> createLongList
+    26:26:com.mojang.serialization.DataResult getLongStream(java.lang.Object) -> getLongStream
+    26:26:java.lang.Object createIntList(java.util.stream.IntStream) -> createIntList
+    26:26:com.mojang.serialization.DataResult getIntStream(java.lang.Object) -> getIntStream
+    26:26:java.lang.Object createByteList(java.nio.ByteBuffer) -> createByteList
+    26:26:com.mojang.serialization.DataResult getByteBuffer(java.lang.Object) -> getByteBuffer
+    26:26:java.lang.Object createList(java.util.stream.Stream) -> createList
+    26:26:com.mojang.serialization.DataResult getList(java.lang.Object) -> getList
+    26:26:com.mojang.serialization.DataResult getStream(java.lang.Object) -> getStream
+    26:26:com.mojang.serialization.DataResult getMap(java.lang.Object) -> getMap
+    26:26:java.lang.Object createMap(java.util.stream.Stream) -> createMap
+    26:26:com.mojang.serialization.DataResult getMapEntries(java.lang.Object) -> getMapEntries
+    26:26:com.mojang.serialization.DataResult getMapValues(java.lang.Object) -> getMapValues
+    26:26:com.mojang.serialization.DataResult mergeToMap(java.lang.Object,com.mojang.serialization.MapLike) -> mergeToMap
+    26:26:com.mojang.serialization.DataResult mergeToMap(java.lang.Object,java.lang.Object,java.lang.Object) -> mergeToMap
+    26:26:com.mojang.serialization.DataResult mergeToList(java.lang.Object,java.util.List) -> mergeToList
+    26:26:com.mojang.serialization.DataResult mergeToList(java.lang.Object,java.lang.Object) -> mergeToList
+    26:26:java.lang.Object createString(java.lang.String) -> createString
+    26:26:com.mojang.serialization.DataResult getStringValue(java.lang.Object) -> getStringValue
+    26:26:java.lang.Object createBoolean(boolean) -> createBoolean
+    26:26:java.lang.Object createDouble(double) -> createDouble
+    26:26:java.lang.Object createFloat(float) -> createFloat
+    26:26:java.lang.Object createLong(long) -> createLong
+    26:26:java.lang.Object createInt(int) -> createInt
+    26:26:java.lang.Object createShort(short) -> createShort
+    26:26:java.lang.Object createByte(byte) -> createByte
+    26:26:java.lang.Object createNumeric(java.lang.Number) -> createNumeric
+    26:26:com.mojang.serialization.DataResult getNumberValue(java.lang.Object) -> getNumberValue
+    26:26:java.lang.Object convertTo(com.mojang.serialization.DynamicOps,java.lang.Object) -> convertTo
+    26:26:java.lang.Object empty() -> empty
+    398:398:void lambda$remove$15(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag,java.lang.String) -> a
+    398:398:boolean lambda$remove$14(java.lang.String,java.lang.String) -> a
+    379:379:java.lang.Long lambda$createList$13(net.minecraft.nbt.Tag) -> k
+    375:375:java.lang.Integer lambda$createList$12(net.minecraft.nbt.Tag) -> l
+    371:371:java.lang.Byte lambda$createList$11(net.minecraft.nbt.Tag) -> m
+    310:310:net.minecraft.nbt.Tag lambda$getStream$10(net.minecraft.nbt.Tag) -> n
+    302:302:void lambda$createMap$9(net.minecraft.nbt.CompoundTag,com.mojang.datafixers.util.Pair) -> a
+    264:264:void lambda$getMapEntries$8(net.minecraft.nbt.CompoundTag,java.util.function.BiConsumer) -> a
+    264:264:void lambda$null$7(java.util.function.BiConsumer,net.minecraft.nbt.CompoundTag,java.lang.String) -> a
+    255:255:com.mojang.datafixers.util.Pair lambda$getMapValues$6(net.minecraft.nbt.CompoundTag,java.lang.String) -> a
+    233:240:void lambda$mergeToMap$5(java.util.List,net.minecraft.nbt.CompoundTag,com.mojang.datafixers.util.Pair) -> a
+    227:227:void lambda$mergeToMap$4(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag,java.lang.String) -> b
+    212:212:void lambda$mergeToMap$3(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag,java.lang.String) -> c
+    169:169:void lambda$fillMany$2(net.minecraft.nbt.CollectionTag,net.minecraft.nbt.Tag) -> a
+    166:166:void lambda$fillMany$1(net.minecraft.nbt.CollectionTag,net.minecraft.nbt.Tag) -> b
+    155:155:void lambda$fillOne$0(net.minecraft.nbt.CollectionTag,net.minecraft.nbt.Tag) -> c
+    27:27:void <clinit>() -> <clinit>
+net.minecraft.nbt.NbtOps$1 -> lp$1:
+    net.minecraft.nbt.CompoundTag val$tag -> a
+    net.minecraft.nbt.NbtOps this$0 -> b
+    273:273:void <init>(net.minecraft.nbt.NbtOps,net.minecraft.nbt.CompoundTag) -> <init>
+    277:277:net.minecraft.nbt.Tag get(net.minecraft.nbt.Tag) -> a
+    283:283:net.minecraft.nbt.Tag get(java.lang.String) -> a
+    288:288:java.util.stream.Stream entries() -> entries
+    293:293:java.lang.String toString() -> toString
+    273:273:java.lang.Object get(java.lang.String) -> get
+    273:273:java.lang.Object get(java.lang.Object) -> get
+    288:288:com.mojang.datafixers.util.Pair lambda$entries$0(net.minecraft.nbt.CompoundTag,java.lang.String) -> a
+net.minecraft.nbt.NbtOps$NbtRecordBuilder -> lp$a:
+    net.minecraft.nbt.NbtOps this$0 -> a
+    415:417:void <init>(net.minecraft.nbt.NbtOps) -> <init>
+    421:421:net.minecraft.nbt.CompoundTag initBuilder() -> a
+    426:427:net.minecraft.nbt.CompoundTag append(java.lang.String,net.minecraft.nbt.Tag,net.minecraft.nbt.CompoundTag) -> a
+    432:442:com.mojang.serialization.DataResult build(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> a
+    414:414:java.lang.Object append(java.lang.String,java.lang.Object,java.lang.Object) -> append
+    414:414:com.mojang.serialization.DataResult build(java.lang.Object,java.lang.Object) -> build
+    414:414:java.lang.Object initBuilder() -> initBuilder
+net.minecraft.nbt.NbtUtils -> lq:
     org.apache.logging.log4j.Logger LOGGER -> a
     38:39:void <init>() -> <init>
-    43:83:com.mojang.authlib.GameProfile readGameProfile(net.minecraft.nbt.CompoundTag) -> a
-    87:110:net.minecraft.nbt.CompoundTag writeGameProfile(net.minecraft.nbt.CompoundTag,com.mojang.authlib.GameProfile) -> a
-    115:164:boolean compareNbt(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag,boolean) -> a
-    169:172:net.minecraft.nbt.CompoundTag createUUIDTag(java.util.UUID) -> a
-    176:176:java.util.UUID loadUUIDTag(net.minecraft.nbt.CompoundTag) -> b
-    180:180:net.minecraft.core.BlockPos readBlockPos(net.minecraft.nbt.CompoundTag) -> c
-    184:188:net.minecraft.nbt.CompoundTag writeBlockPos(net.minecraft.core.BlockPos) -> a
-    192:210:net.minecraft.world.level.block.state.BlockState readBlockState(net.minecraft.nbt.CompoundTag) -> d
-    214:232:net.minecraft.world.level.material.FluidState readFluidState(net.minecraft.nbt.CompoundTag) -> e
-    237:243:net.minecraft.world.level.block.state.StateHolder setValueHelper(net.minecraft.world.level.block.state.StateHolder,net.minecraft.world.level.block.state.properties.Property,java.lang.String,net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag) -> a
-    247:261:net.minecraft.nbt.CompoundTag writeBlockState(net.minecraft.world.level.block.state.BlockState) -> a
-    265:279:net.minecraft.nbt.CompoundTag writeFluidState(net.minecraft.world.level.material.FluidState) -> a
-    285:285:java.lang.String getName(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
-    289:289:java.lang.String prettyPrint(net.minecraft.nbt.Tag) -> a
-    293:293:java.lang.String prettyPrint(net.minecraft.nbt.Tag,boolean) -> a
-    297:476:java.lang.StringBuilder prettyPrint(java.lang.StringBuilder,net.minecraft.nbt.Tag,int,boolean) -> a
-    480:486:java.lang.StringBuilder indent(int,java.lang.StringBuilder) -> a
-    490:490:net.minecraft.nbt.CompoundTag update(com.mojang.datafixers.DataFixer,net.minecraft.util.datafix.DataFixTypes,net.minecraft.nbt.CompoundTag,int) -> a
-    494:494:net.minecraft.nbt.CompoundTag update(com.mojang.datafixers.DataFixer,net.minecraft.util.datafix.DataFixTypes,net.minecraft.nbt.CompoundTag,int,int) -> a
+    43:77:com.mojang.authlib.GameProfile readGameProfile(net.minecraft.nbt.CompoundTag) -> a
+    81:104:net.minecraft.nbt.CompoundTag writeGameProfile(net.minecraft.nbt.CompoundTag,com.mojang.authlib.GameProfile) -> a
+    109:158:boolean compareNbt(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag,boolean) -> a
+    163:163:net.minecraft.nbt.IntArrayTag createUUID(java.util.UUID) -> a
+    167:174:java.util.UUID loadUUID(net.minecraft.nbt.Tag) -> a
+    178:178:net.minecraft.core.BlockPos readBlockPos(net.minecraft.nbt.CompoundTag) -> b
+    182:186:net.minecraft.nbt.CompoundTag writeBlockPos(net.minecraft.core.BlockPos) -> a
+    190:208:net.minecraft.world.level.block.state.BlockState readBlockState(net.minecraft.nbt.CompoundTag) -> c
+    213:219:net.minecraft.world.level.block.state.StateHolder setValueHelper(net.minecraft.world.level.block.state.StateHolder,net.minecraft.world.level.block.state.properties.Property,java.lang.String,net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag) -> a
+    223:237:net.minecraft.nbt.CompoundTag writeBlockState(net.minecraft.world.level.block.state.BlockState) -> a
+    241:255:net.minecraft.nbt.CompoundTag writeFluidState(net.minecraft.world.level.material.FluidState) -> a
+    261:261:java.lang.String getName(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
+    265:265:java.lang.String prettyPrint(net.minecraft.nbt.Tag) -> b
+    269:269:java.lang.String prettyPrint(net.minecraft.nbt.Tag,boolean) -> a
+    273:448:java.lang.StringBuilder prettyPrint(java.lang.StringBuilder,net.minecraft.nbt.Tag,int,boolean) -> a
+    452:458:java.lang.StringBuilder indent(int,java.lang.StringBuilder) -> a
+    462:462:net.minecraft.nbt.CompoundTag update(com.mojang.datafixers.DataFixer,net.minecraft.util.datafix.DataFixTypes,net.minecraft.nbt.CompoundTag,int) -> a
+    466:466:net.minecraft.nbt.CompoundTag update(com.mojang.datafixers.DataFixer,net.minecraft.util.datafix.DataFixTypes,net.minecraft.nbt.CompoundTag,int,int) -> a
     35:35:void <clinit>() -> <clinit>
-net.minecraft.nbt.NumericTag -> kg:
+net.minecraft.nbt.NumericTag -> lr:
     4:5:void <init>() -> <init>
     long getAsLong() -> e
     int getAsInt() -> f
@@ -23118,7 +25564,7 @@ net.minecraft.nbt.NumericTag -> kg:
     double getAsDouble() -> i
     float getAsFloat() -> j
     java.lang.Number getAsNumber() -> k
-net.minecraft.nbt.ShortTag -> kh:
+net.minecraft.nbt.ShortTag -> ls:
     net.minecraft.nbt.TagType TYPE -> a
     short data -> b
     54:56:void <init>(short) -> <init>
@@ -23141,18 +25587,18 @@ net.minecraft.nbt.ShortTag -> kh:
     10:10:net.minecraft.nbt.Tag copy() -> c
     10:10:void <init>(short,net.minecraft.nbt.ShortTag$1) -> <init>
     29:29:void <clinit>() -> <clinit>
-net.minecraft.nbt.ShortTag$1 -> kh$1:
+net.minecraft.nbt.ShortTag$1 -> ls$1:
     29:29:void <init>() -> <init>
     32:33:net.minecraft.nbt.ShortTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
     38:38:java.lang.String getName() -> a
     43:43:java.lang.String getPrettyName() -> b
     48:48:boolean isValue() -> c
     29:29:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.ShortTag$Cache -> kh$a:
+net.minecraft.nbt.ShortTag$Cache -> ls$a:
     net.minecraft.nbt.ShortTag[] cache -> a
     18:18:void <init>() -> <init>
     21:26:void <clinit>() -> <clinit>
-net.minecraft.nbt.StringTag -> ki:
+net.minecraft.nbt.StringTag -> lt:
     net.minecraft.nbt.TagType TYPE -> a
     net.minecraft.nbt.StringTag EMPTY -> b
     java.lang.String data -> c
@@ -23166,19 +25612,19 @@ net.minecraft.nbt.StringTag -> ki:
     89:89:boolean isEmpty() -> isEmpty
     94:98:boolean equals(java.lang.Object) -> equals
     103:103:int hashCode() -> hashCode
-    108:108:java.lang.String getAsString() -> c_
+    108:108:java.lang.String getAsString() -> f_
     113:116:net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
     120:142:java.lang.String quoteAndEscape(java.lang.String) -> b
     11:11:net.minecraft.nbt.Tag copy() -> c
     19:46:void <clinit>() -> <clinit>
-net.minecraft.nbt.StringTag$1 -> ki$1:
+net.minecraft.nbt.StringTag$1 -> lt$1:
     19:19:void <init>() -> <init>
     22:27:net.minecraft.nbt.StringTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
     32:32:java.lang.String getName() -> a
     37:37:java.lang.String getPrettyName() -> b
     42:42:boolean isValue() -> c
     19:19:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.Tag -> kj:
+net.minecraft.nbt.Tag -> lu:
     net.minecraft.ChatFormatting SYNTAX_HIGHLIGHTING_KEY -> d
     net.minecraft.ChatFormatting SYNTAX_HIGHLIGHTING_STRING -> e
     net.minecraft.ChatFormatting SYNTAX_HIGHLIGHTING_NUMBER -> f
@@ -23188,13 +25634,13 @@ net.minecraft.nbt.Tag -> kj:
     byte getId() -> a
     net.minecraft.nbt.TagType getType() -> b
     net.minecraft.nbt.Tag copy() -> c
-    56:56:void stripEmptyChildren() -> b_
+    56:56:void stripEmptyChildren() -> e_
     59:59:boolean isEmpty() -> isEmpty
-    63:63:java.lang.String getAsString() -> c_
+    63:63:java.lang.String getAsString() -> f_
     67:67:net.minecraft.network.chat.Component getPrettyDisplay() -> l
     net.minecraft.network.chat.Component getPrettyDisplay(java.lang.String,int) -> a
     37:40:void <clinit>() -> <clinit>
-net.minecraft.nbt.TagParser -> kk:
+net.minecraft.nbt.TagParser -> lv:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_TRAILING_DATA -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_EXPECTED_KEY -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_EXPECTED_VALUE -> c
@@ -23227,26 +25673,26 @@ net.minecraft.nbt.TagParser -> kk:
     20:20:com.mojang.brigadier.Message lambda$static$1(java.lang.Object,java.lang.Object) -> a
     19:19:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object) -> b
     16:36:void <clinit>() -> <clinit>
-net.minecraft.nbt.TagType -> kl:
+net.minecraft.nbt.TagType -> lw:
     net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
     10:10:boolean isValue() -> c
     java.lang.String getName() -> a
     java.lang.String getPrettyName() -> b
     18:18:net.minecraft.nbt.TagType createInvalid(int) -> a
-net.minecraft.nbt.TagType$1 -> kl$1:
+net.minecraft.nbt.TagType$1 -> lw$1:
     int val$id -> a
     18:18:void <init>(int) -> <init>
     21:21:net.minecraft.nbt.EndTag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> a
     26:26:java.lang.String getName() -> a
     31:31:java.lang.String getPrettyName() -> b
     18:18:net.minecraft.nbt.Tag load(java.io.DataInput,int,net.minecraft.nbt.NbtAccounter) -> b
-net.minecraft.nbt.TagTypes -> km:
+net.minecraft.nbt.TagTypes -> lx:
     net.minecraft.nbt.TagType[] TYPES -> a
     3:3:void <init>() -> <init>
     21:25:net.minecraft.nbt.TagType getType(int) -> a
     4:4:void <clinit>() -> <clinit>
-net.minecraft.nbt.package-info -> kn:
-net.minecraft.network.CipherBase -> ko:
+net.minecraft.nbt.package-info -> ly:
+net.minecraft.network.CipherBase -> lz:
     javax.crypto.Cipher cipher -> a
     byte[] heapIn -> b
     byte[] heapOut -> c
@@ -23254,24 +25700,24 @@ net.minecraft.network.CipherBase -> ko:
     19:24:byte[] bufToByte(io.netty.buffer.ByteBuf) -> a
     28:34:io.netty.buffer.ByteBuf decipher(io.netty.channel.ChannelHandlerContext,io.netty.buffer.ByteBuf) -> a
     38:46:void encipher(io.netty.buffer.ByteBuf,io.netty.buffer.ByteBuf) -> a
-net.minecraft.network.CipherDecoder -> kp:
+net.minecraft.network.CipherDecoder -> ma:
     net.minecraft.network.CipherBase cipher -> a
     13:15:void <init>(javax.crypto.Cipher) -> <init>
     19:20:void decode(io.netty.channel.ChannelHandlerContext,io.netty.buffer.ByteBuf,java.util.List) -> a
     10:10:void decode(io.netty.channel.ChannelHandlerContext,java.lang.Object,java.util.List) -> decode
-net.minecraft.network.CipherEncoder -> kq:
+net.minecraft.network.CipherEncoder -> mb:
     net.minecraft.network.CipherBase cipher -> a
     12:14:void <init>(javax.crypto.Cipher) -> <init>
     18:19:void encode(io.netty.channel.ChannelHandlerContext,io.netty.buffer.ByteBuf,io.netty.buffer.ByteBuf) -> a
     9:9:void encode(io.netty.channel.ChannelHandlerContext,java.lang.Object,io.netty.buffer.ByteBuf) -> encode
-net.minecraft.network.CompressionDecoder -> kr:
+net.minecraft.network.CompressionDecoder -> mc:
     java.util.zip.Inflater inflater -> a
     int threshold -> b
     18:21:void <init>(int) -> <init>
     25:49:void decode(io.netty.channel.ChannelHandlerContext,io.netty.buffer.ByteBuf,java.util.List) -> decode
     52:52:int getThreshold() -> a
     56:57:void setThreshold(int) -> a
-net.minecraft.network.CompressionEncoder -> ks:
+net.minecraft.network.CompressionEncoder -> md:
     byte[] encodeBuf -> a
     java.util.zip.Deflater deflater -> b
     int threshold -> c
@@ -23280,7 +25726,7 @@ net.minecraft.network.CompressionEncoder -> ks:
     44:44:int getThreshold() -> a
     48:49:void setThreshold(int) -> a
     9:9:void encode(io.netty.channel.ChannelHandlerContext,java.lang.Object,io.netty.buffer.ByteBuf) -> encode
-net.minecraft.network.Connection -> kt:
+net.minecraft.network.Connection -> me:
     org.apache.logging.log4j.Logger LOGGER -> g
     org.apache.logging.log4j.Marker ROOT_MARKER -> a
     org.apache.logging.log4j.Marker PACKET_MARKER -> b
@@ -23309,52 +25755,52 @@ net.minecraft.network.Connection -> kt:
     115:142:void exceptionCaught(io.netty.channel.ChannelHandlerContext,java.lang.Throwable) -> exceptionCaught
     146:153:void channelRead0(io.netty.channel.ChannelHandlerContext,net.minecraft.network.protocol.Packet) -> a
     157:158:void genericsFtw(net.minecraft.network.protocol.Packet,net.minecraft.network.PacketListener) -> a
-    161:164:void setListener(net.minecraft.network.PacketListener) -> a
-    167:168:void send(net.minecraft.network.protocol.Packet) -> a
-    171:177:void send(net.minecraft.network.protocol.Packet,io.netty.util.concurrent.GenericFutureListener) -> a
-    180:210:void sendPacket(net.minecraft.network.protocol.Packet,io.netty.util.concurrent.GenericFutureListener) -> b
-    213:224:void flushQueue() -> o
-    227:247:void tick() -> a
-    250:250:java.net.SocketAddress getRemoteAddress() -> b
-    254:259:void disconnect(net.minecraft.network.chat.Component) -> a
-    262:262:boolean isMemoryConnection() -> c
-    266:266:net.minecraft.network.protocol.PacketFlow getReceiving() -> d
-    270:270:net.minecraft.network.protocol.PacketFlow getSending() -> e
-    274:311:net.minecraft.network.Connection connectToServer(java.net.InetAddress,int,boolean) -> a
-    315:324:net.minecraft.network.Connection connectToLocalServer(java.net.SocketAddress) -> a
-    328:331:void setEncryptionKey(javax.crypto.SecretKey) -> a
-    334:334:boolean isEncrypted() -> f
-    338:338:boolean isConnected() -> g
-    342:342:boolean isConnecting() -> h
-    346:346:net.minecraft.network.PacketListener getPacketListener() -> i
-    351:351:net.minecraft.network.chat.Component getDisconnectedReason() -> j
-    355:356:void setReadOnly() -> k
-    359:380:void setupCompression(int) -> a
-    383:397:void handleDisconnection() -> l
-    400:400:float getAverageReceivedPackets() -> m
-    404:404:float getAverageSentPackets() -> n
+    161:163:void setListener(net.minecraft.network.PacketListener) -> a
+    166:167:void send(net.minecraft.network.protocol.Packet) -> a
+    170:176:void send(net.minecraft.network.protocol.Packet,io.netty.util.concurrent.GenericFutureListener) -> a
+    179:209:void sendPacket(net.minecraft.network.protocol.Packet,io.netty.util.concurrent.GenericFutureListener) -> b
+    212:223:void flushQueue() -> o
+    226:246:void tick() -> a
+    249:249:java.net.SocketAddress getRemoteAddress() -> b
+    253:258:void disconnect(net.minecraft.network.chat.Component) -> a
+    261:261:boolean isMemoryConnection() -> c
+    265:265:net.minecraft.network.protocol.PacketFlow getReceiving() -> d
+    269:269:net.minecraft.network.protocol.PacketFlow getSending() -> e
+    273:310:net.minecraft.network.Connection connectToServer(java.net.InetAddress,int,boolean) -> a
+    314:323:net.minecraft.network.Connection connectToLocalServer(java.net.SocketAddress) -> a
+    327:330:void setEncryptionKey(javax.crypto.SecretKey) -> a
+    333:333:boolean isEncrypted() -> f
+    337:337:boolean isConnected() -> g
+    341:341:boolean isConnecting() -> h
+    345:345:net.minecraft.network.PacketListener getPacketListener() -> i
+    350:350:net.minecraft.network.chat.Component getDisconnectedReason() -> j
+    354:355:void setReadOnly() -> k
+    358:379:void setupCompression(int) -> a
+    382:396:void handleDisconnection() -> l
+    399:399:float getAverageReceivedPackets() -> m
+    403:403:float getAverageSentPackets() -> n
     53:53:void channelRead0(io.netty.channel.ChannelHandlerContext,java.lang.Object) -> channelRead0
-    200:208:void lambda$sendPacket$4(net.minecraft.network.ConnectionProtocol,net.minecraft.network.ConnectionProtocol,net.minecraft.network.protocol.Packet,io.netty.util.concurrent.GenericFutureListener) -> a
+    199:207:void lambda$sendPacket$4(net.minecraft.network.ConnectionProtocol,net.minecraft.network.ConnectionProtocol,net.minecraft.network.protocol.Packet,io.netty.util.concurrent.GenericFutureListener) -> a
     135:135:void lambda$exceptionCaught$3(net.minecraft.network.chat.Component,io.netty.util.concurrent.Future) -> a
     68:68:io.netty.channel.DefaultEventLoopGroup lambda$static$2() -> p
     65:65:io.netty.channel.epoll.EpollEventLoopGroup lambda$static$1() -> q
     62:62:io.netty.channel.nio.NioEventLoopGroup lambda$static$0() -> r
     56:67:void <clinit>() -> <clinit>
-net.minecraft.network.Connection$1 -> kt$1:
+net.minecraft.network.Connection$1 -> me$1:
     net.minecraft.network.Connection val$connection -> a
-    286:286:void <init>(net.minecraft.network.Connection) -> <init>
-    290:308:void initChannel(io.netty.channel.Channel) -> initChannel
-net.minecraft.network.Connection$2 -> kt$2:
+    285:285:void <init>(net.minecraft.network.Connection) -> <init>
+    289:307:void initChannel(io.netty.channel.Channel) -> initChannel
+net.minecraft.network.Connection$2 -> me$2:
     net.minecraft.network.Connection val$connection -> a
-    317:317:void <init>(net.minecraft.network.Connection) -> <init>
-    320:321:void initChannel(io.netty.channel.Channel) -> initChannel
-net.minecraft.network.Connection$PacketHolder -> kt$a:
+    316:316:void <init>(net.minecraft.network.Connection) -> <init>
+    319:320:void initChannel(io.netty.channel.Channel) -> initChannel
+net.minecraft.network.Connection$PacketHolder -> me$a:
     net.minecraft.network.protocol.Packet packet -> a
     io.netty.util.concurrent.GenericFutureListener listener -> b
-    412:415:void <init>(net.minecraft.network.protocol.Packet,io.netty.util.concurrent.GenericFutureListener) -> <init>
-    407:407:net.minecraft.network.protocol.Packet access$000(net.minecraft.network.Connection$PacketHolder) -> a
-    407:407:io.netty.util.concurrent.GenericFutureListener access$100(net.minecraft.network.Connection$PacketHolder) -> b
-net.minecraft.network.ConnectionProtocol -> ku:
+    411:414:void <init>(net.minecraft.network.protocol.Packet,io.netty.util.concurrent.GenericFutureListener) -> <init>
+    406:406:net.minecraft.network.protocol.Packet access$000(net.minecraft.network.Connection$PacketHolder) -> a
+    406:406:io.netty.util.concurrent.GenericFutureListener access$100(net.minecraft.network.Connection$PacketHolder) -> b
+net.minecraft.network.ConnectionProtocol -> mf:
     net.minecraft.network.ConnectionProtocol HANDSHAKING -> a
     net.minecraft.network.ConnectionProtocol PLAY -> b
     net.minecraft.network.ConnectionProtocol STATUS -> c
@@ -23376,8 +25822,8 @@ net.minecraft.network.ConnectionProtocol -> ku:
     443:443:void lambda$static$1(net.minecraft.network.ConnectionProtocol,net.minecraft.network.protocol.PacketFlow,net.minecraft.network.ConnectionProtocol$PacketSet) -> a
     444:448:void lambda$null$0(net.minecraft.network.ConnectionProtocol,java.lang.Class) -> a
     171:450:void <clinit>() -> <clinit>
-net.minecraft.network.ConnectionProtocol$1 -> ku$1:
-net.minecraft.network.ConnectionProtocol$PacketSet -> ku$a:
+net.minecraft.network.ConnectionProtocol$1 -> mf$1:
+net.minecraft.network.ConnectionProtocol$PacketSet -> mf$a:
     it.unimi.dsi.fastutil.objects.Object2IntMap classToId -> a
     java.util.List idToConstructor -> b
     359:361:void <init>() -> <init>
@@ -23387,256 +25833,258 @@ net.minecraft.network.ConnectionProtocol$PacketSet -> ku$a:
     390:390:java.lang.Iterable getAllPackets() -> a
     360:360:void lambda$new$0(it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap) -> a
     359:359:void <init>(net.minecraft.network.ConnectionProtocol$1) -> <init>
-net.minecraft.network.ConnectionProtocol$ProtocolBuilder -> ku$b:
+net.minecraft.network.ConnectionProtocol$ProtocolBuilder -> mf$b:
     java.util.Map flows -> a
     398:399:void <init>() -> <init>
     402:403:net.minecraft.network.ConnectionProtocol$ProtocolBuilder addFlow(net.minecraft.network.protocol.PacketFlow,net.minecraft.network.ConnectionProtocol$PacketSet) -> a
     398:398:void <init>(net.minecraft.network.ConnectionProtocol$1) -> <init>
     398:398:java.util.Map access$200(net.minecraft.network.ConnectionProtocol$ProtocolBuilder) -> a
-net.minecraft.network.FriendlyByteBuf -> kv:
+net.minecraft.network.FriendlyByteBuf -> mg:
     io.netty.buffer.ByteBuf source -> a
-    52:54:void <init>(io.netty.buffer.ByteBuf) -> <init>
-    57:62:int getVarIntSize(int) -> a
-    66:71:int getVarLongSize(long) -> a
-    75:77:void writeCollection(java.util.Collection,java.util.function.BiConsumer) -> a
-    80:83:net.minecraft.network.FriendlyByteBuf writeByteArray(byte[]) -> a
-    87:87:byte[] readByteArray() -> a
-    91:98:byte[] readByteArray(int) -> b
-    102:108:net.minecraft.network.FriendlyByteBuf writeVarIntArray(int[]) -> a
-    112:112:int[] readVarIntArray() -> b
-    116:126:int[] readVarIntArray(int) -> c
-    130:136:net.minecraft.network.FriendlyByteBuf writeLongArray(long[]) -> a
-    140:140:long[] readLongArray() -> c
-    144:144:long[] readLongArray(long[]) -> b
-    148:160:long[] readLongArray(long[],int) -> a
-    165:168:byte[] accessByteBufWithCorrectSize() -> d
-    176:176:net.minecraft.core.BlockPos readBlockPos() -> e
-    180:181:net.minecraft.network.FriendlyByteBuf writeBlockPos(net.minecraft.core.BlockPos) -> a
-    185:185:net.minecraft.world.level.ChunkPos readChunkPos() -> f
-    189:190:net.minecraft.network.FriendlyByteBuf writeChunkPos(net.minecraft.world.level.ChunkPos) -> a
-    194:194:net.minecraft.core.SectionPos readSectionPos() -> g
-    198:199:net.minecraft.network.FriendlyByteBuf writeSectionPos(net.minecraft.core.SectionPos) -> a
-    203:203:net.minecraft.network.chat.Component readComponent() -> h
-    207:207:net.minecraft.network.FriendlyByteBuf writeComponent(net.minecraft.network.chat.Component) -> a
-    211:211:java.lang.Enum readEnum(java.lang.Class) -> a
-    215:215:net.minecraft.network.FriendlyByteBuf writeEnum(java.lang.Enum) -> a
-    219:236:int readVarInt() -> i
-    240:257:long readVarLong() -> j
-    261:264:net.minecraft.network.FriendlyByteBuf writeUUID(java.util.UUID) -> a
-    268:268:java.util.UUID readUUID() -> k
-    273:279:net.minecraft.network.FriendlyByteBuf writeVarInt(int) -> d
-    285:291:net.minecraft.network.FriendlyByteBuf writeVarLong(long) -> b
-    296:306:net.minecraft.network.FriendlyByteBuf writeNbt(net.minecraft.nbt.CompoundTag) -> a
-    311:321:net.minecraft.nbt.CompoundTag readNbt() -> l
-    327:342:net.minecraft.network.FriendlyByteBuf writeItem(net.minecraft.world.item.ItemStack) -> a
-    346:356:net.minecraft.world.item.ItemStack readItem() -> m
-    360:360:java.lang.String readUtf() -> n
-    364:378:java.lang.String readUtf(int) -> e
-    382:382:net.minecraft.network.FriendlyByteBuf writeUtf(java.lang.String) -> a
-    386:392:net.minecraft.network.FriendlyByteBuf writeUtf(java.lang.String,int) -> a
-    396:396:net.minecraft.resources.ResourceLocation readResourceLocation() -> o
-    400:401:net.minecraft.network.FriendlyByteBuf writeResourceLocation(net.minecraft.resources.ResourceLocation) -> a
-    405:405:java.util.Date readDate() -> p
-    409:410:net.minecraft.network.FriendlyByteBuf writeDate(java.util.Date) -> a
-    414:421:net.minecraft.world.phys.BlockHitResult readBlockHitResult() -> q
-    425:433:void writeBlockHitResult(net.minecraft.world.phys.BlockHitResult) -> a
-    437:437:int capacity() -> capacity
-    442:442:io.netty.buffer.ByteBuf capacity(int) -> capacity
-    447:447:int maxCapacity() -> maxCapacity
-    452:452:io.netty.buffer.ByteBufAllocator alloc() -> alloc
-    457:457:java.nio.ByteOrder order() -> order
-    462:462:io.netty.buffer.ByteBuf order(java.nio.ByteOrder) -> order
-    467:467:io.netty.buffer.ByteBuf unwrap() -> unwrap
-    472:472:boolean isDirect() -> isDirect
-    477:477:boolean isReadOnly() -> isReadOnly
-    482:482:io.netty.buffer.ByteBuf asReadOnly() -> asReadOnly
-    487:487:int readerIndex() -> readerIndex
-    492:492:io.netty.buffer.ByteBuf readerIndex(int) -> readerIndex
-    497:497:int writerIndex() -> writerIndex
-    502:502:io.netty.buffer.ByteBuf writerIndex(int) -> writerIndex
-    507:507:io.netty.buffer.ByteBuf setIndex(int,int) -> setIndex
-    512:512:int readableBytes() -> readableBytes
-    517:517:int writableBytes() -> writableBytes
-    522:522:int maxWritableBytes() -> maxWritableBytes
-    527:527:boolean isReadable() -> isReadable
-    532:532:boolean isReadable(int) -> isReadable
-    537:537:boolean isWritable() -> isWritable
-    542:542:boolean isWritable(int) -> isWritable
-    547:547:io.netty.buffer.ByteBuf clear() -> clear
-    552:552:io.netty.buffer.ByteBuf markReaderIndex() -> markReaderIndex
-    557:557:io.netty.buffer.ByteBuf resetReaderIndex() -> resetReaderIndex
-    562:562:io.netty.buffer.ByteBuf markWriterIndex() -> markWriterIndex
-    567:567:io.netty.buffer.ByteBuf resetWriterIndex() -> resetWriterIndex
-    572:572:io.netty.buffer.ByteBuf discardReadBytes() -> discardReadBytes
-    577:577:io.netty.buffer.ByteBuf discardSomeReadBytes() -> discardSomeReadBytes
-    582:582:io.netty.buffer.ByteBuf ensureWritable(int) -> ensureWritable
-    587:587:int ensureWritable(int,boolean) -> ensureWritable
-    592:592:boolean getBoolean(int) -> getBoolean
-    597:597:byte getByte(int) -> getByte
-    602:602:short getUnsignedByte(int) -> getUnsignedByte
-    607:607:short getShort(int) -> getShort
-    612:612:short getShortLE(int) -> getShortLE
-    617:617:int getUnsignedShort(int) -> getUnsignedShort
-    622:622:int getUnsignedShortLE(int) -> getUnsignedShortLE
-    627:627:int getMedium(int) -> getMedium
-    632:632:int getMediumLE(int) -> getMediumLE
-    637:637:int getUnsignedMedium(int) -> getUnsignedMedium
-    642:642:int getUnsignedMediumLE(int) -> getUnsignedMediumLE
-    647:647:int getInt(int) -> getInt
-    652:652:int getIntLE(int) -> getIntLE
-    657:657:long getUnsignedInt(int) -> getUnsignedInt
-    662:662:long getUnsignedIntLE(int) -> getUnsignedIntLE
-    667:667:long getLong(int) -> getLong
-    672:672:long getLongLE(int) -> getLongLE
-    677:677:char getChar(int) -> getChar
-    682:682:float getFloat(int) -> getFloat
-    687:687:double getDouble(int) -> getDouble
-    692:692:io.netty.buffer.ByteBuf getBytes(int,io.netty.buffer.ByteBuf) -> getBytes
-    697:697:io.netty.buffer.ByteBuf getBytes(int,io.netty.buffer.ByteBuf,int) -> getBytes
-    702:702:io.netty.buffer.ByteBuf getBytes(int,io.netty.buffer.ByteBuf,int,int) -> getBytes
-    707:707:io.netty.buffer.ByteBuf getBytes(int,byte[]) -> getBytes
-    712:712:io.netty.buffer.ByteBuf getBytes(int,byte[],int,int) -> getBytes
-    717:717:io.netty.buffer.ByteBuf getBytes(int,java.nio.ByteBuffer) -> getBytes
-    722:722:io.netty.buffer.ByteBuf getBytes(int,java.io.OutputStream,int) -> getBytes
-    727:727:int getBytes(int,java.nio.channels.GatheringByteChannel,int) -> getBytes
-    732:732:int getBytes(int,java.nio.channels.FileChannel,long,int) -> getBytes
-    737:737:java.lang.CharSequence getCharSequence(int,int,java.nio.charset.Charset) -> getCharSequence
-    742:742:io.netty.buffer.ByteBuf setBoolean(int,boolean) -> setBoolean
-    747:747:io.netty.buffer.ByteBuf setByte(int,int) -> setByte
-    752:752:io.netty.buffer.ByteBuf setShort(int,int) -> setShort
-    757:757:io.netty.buffer.ByteBuf setShortLE(int,int) -> setShortLE
-    762:762:io.netty.buffer.ByteBuf setMedium(int,int) -> setMedium
-    767:767:io.netty.buffer.ByteBuf setMediumLE(int,int) -> setMediumLE
-    772:772:io.netty.buffer.ByteBuf setInt(int,int) -> setInt
-    777:777:io.netty.buffer.ByteBuf setIntLE(int,int) -> setIntLE
-    782:782:io.netty.buffer.ByteBuf setLong(int,long) -> setLong
-    787:787:io.netty.buffer.ByteBuf setLongLE(int,long) -> setLongLE
-    792:792:io.netty.buffer.ByteBuf setChar(int,int) -> setChar
-    797:797:io.netty.buffer.ByteBuf setFloat(int,float) -> setFloat
-    802:802:io.netty.buffer.ByteBuf setDouble(int,double) -> setDouble
-    807:807:io.netty.buffer.ByteBuf setBytes(int,io.netty.buffer.ByteBuf) -> setBytes
-    812:812:io.netty.buffer.ByteBuf setBytes(int,io.netty.buffer.ByteBuf,int) -> setBytes
-    817:817:io.netty.buffer.ByteBuf setBytes(int,io.netty.buffer.ByteBuf,int,int) -> setBytes
-    822:822:io.netty.buffer.ByteBuf setBytes(int,byte[]) -> setBytes
-    827:827:io.netty.buffer.ByteBuf setBytes(int,byte[],int,int) -> setBytes
-    832:832:io.netty.buffer.ByteBuf setBytes(int,java.nio.ByteBuffer) -> setBytes
-    837:837:int setBytes(int,java.io.InputStream,int) -> setBytes
-    842:842:int setBytes(int,java.nio.channels.ScatteringByteChannel,int) -> setBytes
-    847:847:int setBytes(int,java.nio.channels.FileChannel,long,int) -> setBytes
-    852:852:io.netty.buffer.ByteBuf setZero(int,int) -> setZero
-    857:857:int setCharSequence(int,java.lang.CharSequence,java.nio.charset.Charset) -> setCharSequence
-    862:862:boolean readBoolean() -> readBoolean
-    867:867:byte readByte() -> readByte
-    872:872:short readUnsignedByte() -> readUnsignedByte
-    877:877:short readShort() -> readShort
-    882:882:short readShortLE() -> readShortLE
-    887:887:int readUnsignedShort() -> readUnsignedShort
-    892:892:int readUnsignedShortLE() -> readUnsignedShortLE
-    897:897:int readMedium() -> readMedium
-    902:902:int readMediumLE() -> readMediumLE
-    907:907:int readUnsignedMedium() -> readUnsignedMedium
-    912:912:int readUnsignedMediumLE() -> readUnsignedMediumLE
-    917:917:int readInt() -> readInt
-    922:922:int readIntLE() -> readIntLE
-    927:927:long readUnsignedInt() -> readUnsignedInt
-    932:932:long readUnsignedIntLE() -> readUnsignedIntLE
-    937:937:long readLong() -> readLong
-    942:942:long readLongLE() -> readLongLE
-    947:947:char readChar() -> readChar
-    952:952:float readFloat() -> readFloat
-    957:957:double readDouble() -> readDouble
-    962:962:io.netty.buffer.ByteBuf readBytes(int) -> readBytes
-    967:967:io.netty.buffer.ByteBuf readSlice(int) -> readSlice
-    972:972:io.netty.buffer.ByteBuf readRetainedSlice(int) -> readRetainedSlice
-    977:977:io.netty.buffer.ByteBuf readBytes(io.netty.buffer.ByteBuf) -> readBytes
-    982:982:io.netty.buffer.ByteBuf readBytes(io.netty.buffer.ByteBuf,int) -> readBytes
-    987:987:io.netty.buffer.ByteBuf readBytes(io.netty.buffer.ByteBuf,int,int) -> readBytes
-    992:992:io.netty.buffer.ByteBuf readBytes(byte[]) -> readBytes
-    997:997:io.netty.buffer.ByteBuf readBytes(byte[],int,int) -> readBytes
-    1002:1002:io.netty.buffer.ByteBuf readBytes(java.nio.ByteBuffer) -> readBytes
-    1007:1007:io.netty.buffer.ByteBuf readBytes(java.io.OutputStream,int) -> readBytes
-    1012:1012:int readBytes(java.nio.channels.GatheringByteChannel,int) -> readBytes
-    1017:1017:java.lang.CharSequence readCharSequence(int,java.nio.charset.Charset) -> readCharSequence
-    1022:1022:int readBytes(java.nio.channels.FileChannel,long,int) -> readBytes
-    1027:1027:io.netty.buffer.ByteBuf skipBytes(int) -> skipBytes
-    1032:1032:io.netty.buffer.ByteBuf writeBoolean(boolean) -> writeBoolean
-    1037:1037:io.netty.buffer.ByteBuf writeByte(int) -> writeByte
-    1042:1042:io.netty.buffer.ByteBuf writeShort(int) -> writeShort
-    1047:1047:io.netty.buffer.ByteBuf writeShortLE(int) -> writeShortLE
-    1052:1052:io.netty.buffer.ByteBuf writeMedium(int) -> writeMedium
-    1057:1057:io.netty.buffer.ByteBuf writeMediumLE(int) -> writeMediumLE
-    1062:1062:io.netty.buffer.ByteBuf writeInt(int) -> writeInt
-    1067:1067:io.netty.buffer.ByteBuf writeIntLE(int) -> writeIntLE
-    1072:1072:io.netty.buffer.ByteBuf writeLong(long) -> writeLong
-    1077:1077:io.netty.buffer.ByteBuf writeLongLE(long) -> writeLongLE
-    1082:1082:io.netty.buffer.ByteBuf writeChar(int) -> writeChar
-    1087:1087:io.netty.buffer.ByteBuf writeFloat(float) -> writeFloat
-    1092:1092:io.netty.buffer.ByteBuf writeDouble(double) -> writeDouble
-    1097:1097:io.netty.buffer.ByteBuf writeBytes(io.netty.buffer.ByteBuf) -> writeBytes
-    1102:1102:io.netty.buffer.ByteBuf writeBytes(io.netty.buffer.ByteBuf,int) -> writeBytes
-    1107:1107:io.netty.buffer.ByteBuf writeBytes(io.netty.buffer.ByteBuf,int,int) -> writeBytes
-    1112:1112:io.netty.buffer.ByteBuf writeBytes(byte[]) -> writeBytes
-    1117:1117:io.netty.buffer.ByteBuf writeBytes(byte[],int,int) -> writeBytes
-    1122:1122:io.netty.buffer.ByteBuf writeBytes(java.nio.ByteBuffer) -> writeBytes
-    1127:1127:int writeBytes(java.io.InputStream,int) -> writeBytes
-    1132:1132:int writeBytes(java.nio.channels.ScatteringByteChannel,int) -> writeBytes
-    1137:1137:int writeBytes(java.nio.channels.FileChannel,long,int) -> writeBytes
-    1142:1142:io.netty.buffer.ByteBuf writeZero(int) -> writeZero
-    1147:1147:int writeCharSequence(java.lang.CharSequence,java.nio.charset.Charset) -> writeCharSequence
-    1152:1152:int indexOf(int,int,byte) -> indexOf
-    1157:1157:int bytesBefore(byte) -> bytesBefore
-    1162:1162:int bytesBefore(int,byte) -> bytesBefore
-    1167:1167:int bytesBefore(int,int,byte) -> bytesBefore
-    1172:1172:int forEachByte(io.netty.util.ByteProcessor) -> forEachByte
-    1177:1177:int forEachByte(int,int,io.netty.util.ByteProcessor) -> forEachByte
-    1182:1182:int forEachByteDesc(io.netty.util.ByteProcessor) -> forEachByteDesc
-    1187:1187:int forEachByteDesc(int,int,io.netty.util.ByteProcessor) -> forEachByteDesc
-    1192:1192:io.netty.buffer.ByteBuf copy() -> copy
-    1197:1197:io.netty.buffer.ByteBuf copy(int,int) -> copy
-    1202:1202:io.netty.buffer.ByteBuf slice() -> slice
-    1207:1207:io.netty.buffer.ByteBuf retainedSlice() -> retainedSlice
-    1212:1212:io.netty.buffer.ByteBuf slice(int,int) -> slice
-    1217:1217:io.netty.buffer.ByteBuf retainedSlice(int,int) -> retainedSlice
-    1222:1222:io.netty.buffer.ByteBuf duplicate() -> duplicate
-    1227:1227:io.netty.buffer.ByteBuf retainedDuplicate() -> retainedDuplicate
-    1232:1232:int nioBufferCount() -> nioBufferCount
-    1237:1237:java.nio.ByteBuffer nioBuffer() -> nioBuffer
-    1242:1242:java.nio.ByteBuffer nioBuffer(int,int) -> nioBuffer
-    1247:1247:java.nio.ByteBuffer internalNioBuffer(int,int) -> internalNioBuffer
-    1252:1252:java.nio.ByteBuffer[] nioBuffers() -> nioBuffers
-    1257:1257:java.nio.ByteBuffer[] nioBuffers(int,int) -> nioBuffers
-    1262:1262:boolean hasArray() -> hasArray
-    1267:1267:byte[] array() -> array
-    1272:1272:int arrayOffset() -> arrayOffset
-    1277:1277:boolean hasMemoryAddress() -> hasMemoryAddress
-    1282:1282:long memoryAddress() -> memoryAddress
-    1287:1287:java.lang.String toString(java.nio.charset.Charset) -> toString
-    1292:1292:java.lang.String toString(int,int,java.nio.charset.Charset) -> toString
-    1297:1297:int hashCode() -> hashCode
-    1302:1302:boolean equals(java.lang.Object) -> equals
-    1307:1307:int compareTo(io.netty.buffer.ByteBuf) -> compareTo
-    1312:1312:java.lang.String toString() -> toString
-    1317:1317:io.netty.buffer.ByteBuf retain(int) -> retain
-    1322:1322:io.netty.buffer.ByteBuf retain() -> retain
-    1327:1327:io.netty.buffer.ByteBuf touch() -> touch
-    1332:1332:io.netty.buffer.ByteBuf touch(java.lang.Object) -> touch
-    1337:1337:int refCnt() -> refCnt
-    1342:1342:boolean release() -> release
-    1347:1347:boolean release(int) -> release
-    41:41:io.netty.util.ReferenceCounted touch(java.lang.Object) -> touch
-    41:41:io.netty.util.ReferenceCounted touch() -> touch
-    41:41:io.netty.util.ReferenceCounted retain(int) -> retain
-    41:41:io.netty.util.ReferenceCounted retain() -> retain
-    41:41:int compareTo(java.lang.Object) -> compareTo
-    76:76:void lambda$writeCollection$0(java.util.function.BiConsumer,java.lang.Object) -> a
-net.minecraft.network.PacketDecoder -> kw:
+    56:58:void <init>(io.netty.buffer.ByteBuf) -> <init>
+    61:66:int getVarIntSize(int) -> a
+    70:75:int getVarLongSize(long) -> a
+    80:86:java.lang.Object readWithCodec(com.mojang.serialization.Codec) -> a
+    91:96:void writeWithCodec(com.mojang.serialization.Codec,java.lang.Object) -> a
+    99:101:void writeCollection(java.util.Collection,java.util.function.BiConsumer) -> a
+    104:107:net.minecraft.network.FriendlyByteBuf writeByteArray(byte[]) -> a
+    111:111:byte[] readByteArray() -> a
+    115:122:byte[] readByteArray(int) -> b
+    126:132:net.minecraft.network.FriendlyByteBuf writeVarIntArray(int[]) -> a
+    136:136:int[] readVarIntArray() -> b
+    140:150:int[] readVarIntArray(int) -> c
+    154:160:net.minecraft.network.FriendlyByteBuf writeLongArray(long[]) -> a
+    164:164:long[] readLongArray() -> c
+    168:168:long[] readLongArray(long[]) -> b
+    172:184:long[] readLongArray(long[],int) -> a
+    189:192:byte[] accessByteBufWithCorrectSize() -> d
+    200:200:net.minecraft.core.BlockPos readBlockPos() -> e
+    204:205:net.minecraft.network.FriendlyByteBuf writeBlockPos(net.minecraft.core.BlockPos) -> a
+    209:209:net.minecraft.world.level.ChunkPos readChunkPos() -> f
+    213:214:net.minecraft.network.FriendlyByteBuf writeChunkPos(net.minecraft.world.level.ChunkPos) -> a
+    218:218:net.minecraft.core.SectionPos readSectionPos() -> g
+    222:223:net.minecraft.network.FriendlyByteBuf writeSectionPos(net.minecraft.core.SectionPos) -> a
+    227:227:net.minecraft.network.chat.Component readComponent() -> h
+    231:231:net.minecraft.network.FriendlyByteBuf writeComponent(net.minecraft.network.chat.Component) -> a
+    235:235:java.lang.Enum readEnum(java.lang.Class) -> a
+    239:239:net.minecraft.network.FriendlyByteBuf writeEnum(java.lang.Enum) -> a
+    243:260:int readVarInt() -> i
+    264:281:long readVarLong() -> j
+    285:288:net.minecraft.network.FriendlyByteBuf writeUUID(java.util.UUID) -> a
+    292:292:java.util.UUID readUUID() -> k
+    297:303:net.minecraft.network.FriendlyByteBuf writeVarInt(int) -> d
+    309:315:net.minecraft.network.FriendlyByteBuf writeVarLong(long) -> b
+    320:330:net.minecraft.network.FriendlyByteBuf writeNbt(net.minecraft.nbt.CompoundTag) -> a
+    335:345:net.minecraft.nbt.CompoundTag readNbt() -> l
+    351:366:net.minecraft.network.FriendlyByteBuf writeItem(net.minecraft.world.item.ItemStack) -> a
+    370:380:net.minecraft.world.item.ItemStack readItem() -> m
+    384:384:java.lang.String readUtf() -> n
+    388:402:java.lang.String readUtf(int) -> e
+    406:406:net.minecraft.network.FriendlyByteBuf writeUtf(java.lang.String) -> a
+    410:416:net.minecraft.network.FriendlyByteBuf writeUtf(java.lang.String,int) -> a
+    420:420:net.minecraft.resources.ResourceLocation readResourceLocation() -> o
+    424:425:net.minecraft.network.FriendlyByteBuf writeResourceLocation(net.minecraft.resources.ResourceLocation) -> a
+    429:429:java.util.Date readDate() -> p
+    433:434:net.minecraft.network.FriendlyByteBuf writeDate(java.util.Date) -> a
+    438:448:net.minecraft.world.phys.BlockHitResult readBlockHitResult() -> q
+    456:464:void writeBlockHitResult(net.minecraft.world.phys.BlockHitResult) -> a
+    468:468:int capacity() -> capacity
+    473:473:io.netty.buffer.ByteBuf capacity(int) -> capacity
+    478:478:int maxCapacity() -> maxCapacity
+    483:483:io.netty.buffer.ByteBufAllocator alloc() -> alloc
+    488:488:java.nio.ByteOrder order() -> order
+    493:493:io.netty.buffer.ByteBuf order(java.nio.ByteOrder) -> order
+    498:498:io.netty.buffer.ByteBuf unwrap() -> unwrap
+    503:503:boolean isDirect() -> isDirect
+    508:508:boolean isReadOnly() -> isReadOnly
+    513:513:io.netty.buffer.ByteBuf asReadOnly() -> asReadOnly
+    518:518:int readerIndex() -> readerIndex
+    523:523:io.netty.buffer.ByteBuf readerIndex(int) -> readerIndex
+    528:528:int writerIndex() -> writerIndex
+    533:533:io.netty.buffer.ByteBuf writerIndex(int) -> writerIndex
+    538:538:io.netty.buffer.ByteBuf setIndex(int,int) -> setIndex
+    543:543:int readableBytes() -> readableBytes
+    548:548:int writableBytes() -> writableBytes
+    553:553:int maxWritableBytes() -> maxWritableBytes
+    558:558:boolean isReadable() -> isReadable
+    563:563:boolean isReadable(int) -> isReadable
+    568:568:boolean isWritable() -> isWritable
+    573:573:boolean isWritable(int) -> isWritable
+    578:578:io.netty.buffer.ByteBuf clear() -> clear
+    583:583:io.netty.buffer.ByteBuf markReaderIndex() -> markReaderIndex
+    588:588:io.netty.buffer.ByteBuf resetReaderIndex() -> resetReaderIndex
+    593:593:io.netty.buffer.ByteBuf markWriterIndex() -> markWriterIndex
+    598:598:io.netty.buffer.ByteBuf resetWriterIndex() -> resetWriterIndex
+    603:603:io.netty.buffer.ByteBuf discardReadBytes() -> discardReadBytes
+    608:608:io.netty.buffer.ByteBuf discardSomeReadBytes() -> discardSomeReadBytes
+    613:613:io.netty.buffer.ByteBuf ensureWritable(int) -> ensureWritable
+    618:618:int ensureWritable(int,boolean) -> ensureWritable
+    623:623:boolean getBoolean(int) -> getBoolean
+    628:628:byte getByte(int) -> getByte
+    633:633:short getUnsignedByte(int) -> getUnsignedByte
+    638:638:short getShort(int) -> getShort
+    643:643:short getShortLE(int) -> getShortLE
+    648:648:int getUnsignedShort(int) -> getUnsignedShort
+    653:653:int getUnsignedShortLE(int) -> getUnsignedShortLE
+    658:658:int getMedium(int) -> getMedium
+    663:663:int getMediumLE(int) -> getMediumLE
+    668:668:int getUnsignedMedium(int) -> getUnsignedMedium
+    673:673:int getUnsignedMediumLE(int) -> getUnsignedMediumLE
+    678:678:int getInt(int) -> getInt
+    683:683:int getIntLE(int) -> getIntLE
+    688:688:long getUnsignedInt(int) -> getUnsignedInt
+    693:693:long getUnsignedIntLE(int) -> getUnsignedIntLE
+    698:698:long getLong(int) -> getLong
+    703:703:long getLongLE(int) -> getLongLE
+    708:708:char getChar(int) -> getChar
+    713:713:float getFloat(int) -> getFloat
+    718:718:double getDouble(int) -> getDouble
+    723:723:io.netty.buffer.ByteBuf getBytes(int,io.netty.buffer.ByteBuf) -> getBytes
+    728:728:io.netty.buffer.ByteBuf getBytes(int,io.netty.buffer.ByteBuf,int) -> getBytes
+    733:733:io.netty.buffer.ByteBuf getBytes(int,io.netty.buffer.ByteBuf,int,int) -> getBytes
+    738:738:io.netty.buffer.ByteBuf getBytes(int,byte[]) -> getBytes
+    743:743:io.netty.buffer.ByteBuf getBytes(int,byte[],int,int) -> getBytes
+    748:748:io.netty.buffer.ByteBuf getBytes(int,java.nio.ByteBuffer) -> getBytes
+    753:753:io.netty.buffer.ByteBuf getBytes(int,java.io.OutputStream,int) -> getBytes
+    758:758:int getBytes(int,java.nio.channels.GatheringByteChannel,int) -> getBytes
+    763:763:int getBytes(int,java.nio.channels.FileChannel,long,int) -> getBytes
+    768:768:java.lang.CharSequence getCharSequence(int,int,java.nio.charset.Charset) -> getCharSequence
+    773:773:io.netty.buffer.ByteBuf setBoolean(int,boolean) -> setBoolean
+    778:778:io.netty.buffer.ByteBuf setByte(int,int) -> setByte
+    783:783:io.netty.buffer.ByteBuf setShort(int,int) -> setShort
+    788:788:io.netty.buffer.ByteBuf setShortLE(int,int) -> setShortLE
+    793:793:io.netty.buffer.ByteBuf setMedium(int,int) -> setMedium
+    798:798:io.netty.buffer.ByteBuf setMediumLE(int,int) -> setMediumLE
+    803:803:io.netty.buffer.ByteBuf setInt(int,int) -> setInt
+    808:808:io.netty.buffer.ByteBuf setIntLE(int,int) -> setIntLE
+    813:813:io.netty.buffer.ByteBuf setLong(int,long) -> setLong
+    818:818:io.netty.buffer.ByteBuf setLongLE(int,long) -> setLongLE
+    823:823:io.netty.buffer.ByteBuf setChar(int,int) -> setChar
+    828:828:io.netty.buffer.ByteBuf setFloat(int,float) -> setFloat
+    833:833:io.netty.buffer.ByteBuf setDouble(int,double) -> setDouble
+    838:838:io.netty.buffer.ByteBuf setBytes(int,io.netty.buffer.ByteBuf) -> setBytes
+    843:843:io.netty.buffer.ByteBuf setBytes(int,io.netty.buffer.ByteBuf,int) -> setBytes
+    848:848:io.netty.buffer.ByteBuf setBytes(int,io.netty.buffer.ByteBuf,int,int) -> setBytes
+    853:853:io.netty.buffer.ByteBuf setBytes(int,byte[]) -> setBytes
+    858:858:io.netty.buffer.ByteBuf setBytes(int,byte[],int,int) -> setBytes
+    863:863:io.netty.buffer.ByteBuf setBytes(int,java.nio.ByteBuffer) -> setBytes
+    868:868:int setBytes(int,java.io.InputStream,int) -> setBytes
+    873:873:int setBytes(int,java.nio.channels.ScatteringByteChannel,int) -> setBytes
+    878:878:int setBytes(int,java.nio.channels.FileChannel,long,int) -> setBytes
+    883:883:io.netty.buffer.ByteBuf setZero(int,int) -> setZero
+    888:888:int setCharSequence(int,java.lang.CharSequence,java.nio.charset.Charset) -> setCharSequence
+    893:893:boolean readBoolean() -> readBoolean
+    898:898:byte readByte() -> readByte
+    903:903:short readUnsignedByte() -> readUnsignedByte
+    908:908:short readShort() -> readShort
+    913:913:short readShortLE() -> readShortLE
+    918:918:int readUnsignedShort() -> readUnsignedShort
+    923:923:int readUnsignedShortLE() -> readUnsignedShortLE
+    928:928:int readMedium() -> readMedium
+    933:933:int readMediumLE() -> readMediumLE
+    938:938:int readUnsignedMedium() -> readUnsignedMedium
+    943:943:int readUnsignedMediumLE() -> readUnsignedMediumLE
+    948:948:int readInt() -> readInt
+    953:953:int readIntLE() -> readIntLE
+    958:958:long readUnsignedInt() -> readUnsignedInt
+    963:963:long readUnsignedIntLE() -> readUnsignedIntLE
+    968:968:long readLong() -> readLong
+    973:973:long readLongLE() -> readLongLE
+    978:978:char readChar() -> readChar
+    983:983:float readFloat() -> readFloat
+    988:988:double readDouble() -> readDouble
+    993:993:io.netty.buffer.ByteBuf readBytes(int) -> readBytes
+    998:998:io.netty.buffer.ByteBuf readSlice(int) -> readSlice
+    1003:1003:io.netty.buffer.ByteBuf readRetainedSlice(int) -> readRetainedSlice
+    1008:1008:io.netty.buffer.ByteBuf readBytes(io.netty.buffer.ByteBuf) -> readBytes
+    1013:1013:io.netty.buffer.ByteBuf readBytes(io.netty.buffer.ByteBuf,int) -> readBytes
+    1018:1018:io.netty.buffer.ByteBuf readBytes(io.netty.buffer.ByteBuf,int,int) -> readBytes
+    1023:1023:io.netty.buffer.ByteBuf readBytes(byte[]) -> readBytes
+    1028:1028:io.netty.buffer.ByteBuf readBytes(byte[],int,int) -> readBytes
+    1033:1033:io.netty.buffer.ByteBuf readBytes(java.nio.ByteBuffer) -> readBytes
+    1038:1038:io.netty.buffer.ByteBuf readBytes(java.io.OutputStream,int) -> readBytes
+    1043:1043:int readBytes(java.nio.channels.GatheringByteChannel,int) -> readBytes
+    1048:1048:java.lang.CharSequence readCharSequence(int,java.nio.charset.Charset) -> readCharSequence
+    1053:1053:int readBytes(java.nio.channels.FileChannel,long,int) -> readBytes
+    1058:1058:io.netty.buffer.ByteBuf skipBytes(int) -> skipBytes
+    1063:1063:io.netty.buffer.ByteBuf writeBoolean(boolean) -> writeBoolean
+    1068:1068:io.netty.buffer.ByteBuf writeByte(int) -> writeByte
+    1073:1073:io.netty.buffer.ByteBuf writeShort(int) -> writeShort
+    1078:1078:io.netty.buffer.ByteBuf writeShortLE(int) -> writeShortLE
+    1083:1083:io.netty.buffer.ByteBuf writeMedium(int) -> writeMedium
+    1088:1088:io.netty.buffer.ByteBuf writeMediumLE(int) -> writeMediumLE
+    1093:1093:io.netty.buffer.ByteBuf writeInt(int) -> writeInt
+    1098:1098:io.netty.buffer.ByteBuf writeIntLE(int) -> writeIntLE
+    1103:1103:io.netty.buffer.ByteBuf writeLong(long) -> writeLong
+    1108:1108:io.netty.buffer.ByteBuf writeLongLE(long) -> writeLongLE
+    1113:1113:io.netty.buffer.ByteBuf writeChar(int) -> writeChar
+    1118:1118:io.netty.buffer.ByteBuf writeFloat(float) -> writeFloat
+    1123:1123:io.netty.buffer.ByteBuf writeDouble(double) -> writeDouble
+    1128:1128:io.netty.buffer.ByteBuf writeBytes(io.netty.buffer.ByteBuf) -> writeBytes
+    1133:1133:io.netty.buffer.ByteBuf writeBytes(io.netty.buffer.ByteBuf,int) -> writeBytes
+    1138:1138:io.netty.buffer.ByteBuf writeBytes(io.netty.buffer.ByteBuf,int,int) -> writeBytes
+    1143:1143:io.netty.buffer.ByteBuf writeBytes(byte[]) -> writeBytes
+    1148:1148:io.netty.buffer.ByteBuf writeBytes(byte[],int,int) -> writeBytes
+    1153:1153:io.netty.buffer.ByteBuf writeBytes(java.nio.ByteBuffer) -> writeBytes
+    1158:1158:int writeBytes(java.io.InputStream,int) -> writeBytes
+    1163:1163:int writeBytes(java.nio.channels.ScatteringByteChannel,int) -> writeBytes
+    1168:1168:int writeBytes(java.nio.channels.FileChannel,long,int) -> writeBytes
+    1173:1173:io.netty.buffer.ByteBuf writeZero(int) -> writeZero
+    1178:1178:int writeCharSequence(java.lang.CharSequence,java.nio.charset.Charset) -> writeCharSequence
+    1183:1183:int indexOf(int,int,byte) -> indexOf
+    1188:1188:int bytesBefore(byte) -> bytesBefore
+    1193:1193:int bytesBefore(int,byte) -> bytesBefore
+    1198:1198:int bytesBefore(int,int,byte) -> bytesBefore
+    1203:1203:int forEachByte(io.netty.util.ByteProcessor) -> forEachByte
+    1208:1208:int forEachByte(int,int,io.netty.util.ByteProcessor) -> forEachByte
+    1213:1213:int forEachByteDesc(io.netty.util.ByteProcessor) -> forEachByteDesc
+    1218:1218:int forEachByteDesc(int,int,io.netty.util.ByteProcessor) -> forEachByteDesc
+    1223:1223:io.netty.buffer.ByteBuf copy() -> copy
+    1228:1228:io.netty.buffer.ByteBuf copy(int,int) -> copy
+    1233:1233:io.netty.buffer.ByteBuf slice() -> slice
+    1238:1238:io.netty.buffer.ByteBuf retainedSlice() -> retainedSlice
+    1243:1243:io.netty.buffer.ByteBuf slice(int,int) -> slice
+    1248:1248:io.netty.buffer.ByteBuf retainedSlice(int,int) -> retainedSlice
+    1253:1253:io.netty.buffer.ByteBuf duplicate() -> duplicate
+    1258:1258:io.netty.buffer.ByteBuf retainedDuplicate() -> retainedDuplicate
+    1263:1263:int nioBufferCount() -> nioBufferCount
+    1268:1268:java.nio.ByteBuffer nioBuffer() -> nioBuffer
+    1273:1273:java.nio.ByteBuffer nioBuffer(int,int) -> nioBuffer
+    1278:1278:java.nio.ByteBuffer internalNioBuffer(int,int) -> internalNioBuffer
+    1283:1283:java.nio.ByteBuffer[] nioBuffers() -> nioBuffers
+    1288:1288:java.nio.ByteBuffer[] nioBuffers(int,int) -> nioBuffers
+    1293:1293:boolean hasArray() -> hasArray
+    1298:1298:byte[] array() -> array
+    1303:1303:int arrayOffset() -> arrayOffset
+    1308:1308:boolean hasMemoryAddress() -> hasMemoryAddress
+    1313:1313:long memoryAddress() -> memoryAddress
+    1318:1318:java.lang.String toString(java.nio.charset.Charset) -> toString
+    1323:1323:java.lang.String toString(int,int,java.nio.charset.Charset) -> toString
+    1328:1328:int hashCode() -> hashCode
+    1333:1333:boolean equals(java.lang.Object) -> equals
+    1338:1338:int compareTo(io.netty.buffer.ByteBuf) -> compareTo
+    1343:1343:java.lang.String toString() -> toString
+    1348:1348:io.netty.buffer.ByteBuf retain(int) -> retain
+    1353:1353:io.netty.buffer.ByteBuf retain() -> retain
+    1358:1358:io.netty.buffer.ByteBuf touch() -> touch
+    1363:1363:io.netty.buffer.ByteBuf touch(java.lang.Object) -> touch
+    1368:1368:int refCnt() -> refCnt
+    1373:1373:boolean release() -> release
+    1378:1378:boolean release(int) -> release
+    45:45:io.netty.util.ReferenceCounted touch(java.lang.Object) -> touch
+    45:45:io.netty.util.ReferenceCounted touch() -> touch
+    45:45:io.netty.util.ReferenceCounted retain(int) -> retain
+    45:45:io.netty.util.ReferenceCounted retain() -> retain
+    45:45:int compareTo(java.lang.Object) -> compareTo
+    100:100:void lambda$writeCollection$0(java.util.function.BiConsumer,java.lang.Object) -> a
+net.minecraft.network.PacketDecoder -> mh:
     org.apache.logging.log4j.Logger LOGGER -> a
     org.apache.logging.log4j.Marker MARKER -> b
     net.minecraft.network.protocol.PacketFlow flow -> c
     22:24:void <init>(net.minecraft.network.protocol.PacketFlow) -> <init>
     28:50:void decode(io.netty.channel.ChannelHandlerContext,io.netty.buffer.ByteBuf,java.util.List) -> decode
     17:18:void <clinit>() -> <clinit>
-net.minecraft.network.PacketEncoder -> kx:
+net.minecraft.network.PacketEncoder -> mi:
     org.apache.logging.log4j.Logger LOGGER -> a
     org.apache.logging.log4j.Marker MARKER -> b
     net.minecraft.network.protocol.PacketFlow flow -> c
@@ -23644,31 +26092,34 @@ net.minecraft.network.PacketEncoder -> kx:
     27:55:void encode(io.netty.channel.ChannelHandlerContext,net.minecraft.network.protocol.Packet,io.netty.buffer.ByteBuf) -> a
     15:15:void encode(io.netty.channel.ChannelHandlerContext,java.lang.Object,io.netty.buffer.ByteBuf) -> encode
     16:17:void <clinit>() -> <clinit>
-net.minecraft.network.PacketListener -> ky:
+net.minecraft.network.PacketListener -> mj:
     void onDisconnect(net.minecraft.network.chat.Component) -> a
     net.minecraft.network.Connection getConnection() -> a
-net.minecraft.network.SkipPacketException -> kz:
+net.minecraft.network.SkipPacketException -> mk:
     7:8:void <init>(java.lang.Throwable) -> <init>
-net.minecraft.network.Varint21FrameDecoder -> la:
+net.minecraft.network.Varint21FrameDecoder -> ml:
     11:11:void <init>() -> <init>
     14:42:void decode(io.netty.channel.ChannelHandlerContext,io.netty.buffer.ByteBuf,java.util.List) -> decode
-net.minecraft.network.Varint21LengthFieldPrepender -> lb:
+net.minecraft.network.Varint21LengthFieldPrepender -> mm:
     9:9:void <init>() -> <init>
     14:27:void encode(io.netty.channel.ChannelHandlerContext,io.netty.buffer.ByteBuf,io.netty.buffer.ByteBuf) -> a
     8:8:void encode(io.netty.channel.ChannelHandlerContext,java.lang.Object,io.netty.buffer.ByteBuf) -> encode
-net.minecraft.network.chat.BaseComponent -> lc:
+net.minecraft.network.chat.BaseComponent -> mn:
     java.util.List siblings -> a
-    net.minecraft.network.chat.Style style -> b
-    10:11:void <init>() -> <init>
-    16:18:net.minecraft.network.chat.Component append(net.minecraft.network.chat.Component) -> a
-    23:23:java.util.List getSiblings() -> a
-    28:34:net.minecraft.network.chat.Component setStyle(net.minecraft.network.chat.Style) -> a
-    39:45:net.minecraft.network.chat.Style getStyle() -> b
-    50:50:java.util.stream.Stream stream() -> c
-    55:64:boolean equals(java.lang.Object) -> equals
-    69:69:int hashCode() -> hashCode
-    74:74:java.lang.String toString() -> toString
-net.minecraft.network.chat.ChatType -> ld:
+    net.minecraft.network.chat.Style style -> d
+    8:11:void <init>() -> <init>
+    15:16:net.minecraft.network.chat.MutableComponent append(net.minecraft.network.chat.Component) -> a
+    21:21:java.lang.String getContents() -> a
+    26:26:java.util.List getSiblings() -> b
+    31:32:net.minecraft.network.chat.MutableComponent setStyle(net.minecraft.network.chat.Style) -> a
+    37:37:net.minecraft.network.chat.Style getStyle() -> c
+    net.minecraft.network.chat.BaseComponent plainCopy() -> d
+    45:48:net.minecraft.network.chat.MutableComponent copy() -> e
+    53:62:boolean equals(java.lang.Object) -> equals
+    67:67:int hashCode() -> hashCode
+    72:72:java.lang.String toString() -> toString
+    8:8:net.minecraft.network.chat.MutableComponent plainCopy() -> f
+net.minecraft.network.chat.ChatType -> mo:
     net.minecraft.network.chat.ChatType CHAT -> a
     net.minecraft.network.chat.ChatType SYSTEM -> b
     net.minecraft.network.chat.ChatType GAME_INFO -> c
@@ -23682,7 +26133,7 @@ net.minecraft.network.chat.ChatType -> ld:
     22:27:net.minecraft.network.chat.ChatType getForIndex(byte) -> a
     31:31:boolean shouldInterrupt() -> b
     3:6:void <clinit>() -> <clinit>
-net.minecraft.network.chat.ClickEvent -> le:
+net.minecraft.network.chat.ClickEvent -> mp:
     net.minecraft.network.chat.ClickEvent$Action action -> a
     java.lang.String value -> b
     11:14:void <init>(net.minecraft.network.chat.ClickEvent$Action,java.lang.String) -> <init>
@@ -23691,7 +26142,7 @@ net.minecraft.network.chat.ClickEvent -> le:
     26:42:boolean equals(java.lang.Object) -> equals
     47:47:java.lang.String toString() -> toString
     55:57:int hashCode() -> hashCode
-net.minecraft.network.chat.ClickEvent$Action -> le$a:
+net.minecraft.network.chat.ClickEvent$Action -> mp$a:
     net.minecraft.network.chat.ClickEvent$Action OPEN_URL -> a
     net.minecraft.network.chat.ClickEvent$Action OPEN_FILE -> b
     net.minecraft.network.chat.ClickEvent$Action RUN_COMMAND -> c
@@ -23710,318 +26161,426 @@ net.minecraft.network.chat.ClickEvent$Action -> le$a:
     88:88:net.minecraft.network.chat.ClickEvent$Action getByName(java.lang.String) -> a
     69:69:net.minecraft.network.chat.ClickEvent$Action lambda$static$0(net.minecraft.network.chat.ClickEvent$Action) -> a
     60:69:void <clinit>() -> <clinit>
-net.minecraft.network.chat.Component -> lf:
-    net.minecraft.network.chat.Component setStyle(net.minecraft.network.chat.Style) -> a
-    net.minecraft.network.chat.Style getStyle() -> b
-    39:39:net.minecraft.network.chat.Component append(java.lang.String) -> a
-    net.minecraft.network.chat.Component append(net.minecraft.network.chat.Component) -> a
-    java.lang.String getContents() -> d
-    48:54:java.lang.String getString() -> getString
-    58:70:java.lang.String getString(int) -> a
-    74:98:java.lang.String getColoredString() -> e
-    java.util.List getSiblings() -> a
-    java.util.stream.Stream stream() -> c
-    106:106:java.util.stream.Stream flatStream() -> f
-    111:111:java.util.Iterator iterator() -> iterator
-    net.minecraft.network.chat.Component copy() -> g
-    117:125:net.minecraft.network.chat.Component deepCopy() -> h
-    129:130:net.minecraft.network.chat.Component withStyle(java.util.function.Consumer) -> a
-    134:137:net.minecraft.network.chat.Component withStyle(net.minecraft.ChatFormatting[]) -> a
-    141:166:net.minecraft.network.chat.Component withStyle(net.minecraft.ChatFormatting) -> a
-    170:172:net.minecraft.network.chat.Component flattenStyle(net.minecraft.network.chat.Component) -> b
-    51:51:void lambda$getString$0(java.lang.StringBuilder,net.minecraft.network.chat.Component) -> a
-net.minecraft.network.chat.Component$1 -> lf$1:
-    int[] $SwitchMap$net$minecraft$ChatFormatting -> a
-    146:146:void <clinit>() -> <clinit>
-net.minecraft.network.chat.Component$Serializer -> lf$a:
+net.minecraft.network.chat.CommonComponents -> mq:
+    net.minecraft.network.chat.Component OPTION_ON -> a
+    net.minecraft.network.chat.Component OPTION_OFF -> b
+    net.minecraft.network.chat.Component GUI_DONE -> c
+    net.minecraft.network.chat.Component GUI_CANCEL -> d
+    net.minecraft.network.chat.Component GUI_YES -> e
+    net.minecraft.network.chat.Component GUI_NO -> f
+    net.minecraft.network.chat.Component GUI_PROCEED -> g
+    net.minecraft.network.chat.Component GUI_BACK -> h
+    3:3:void <init>() -> <init>
+    15:15:net.minecraft.network.chat.Component optionStatus(boolean) -> a
+    4:12:void <clinit>() -> <clinit>
+net.minecraft.network.chat.Component -> mr:
+    net.minecraft.network.chat.Style getStyle() -> c
+    java.lang.String getContents() -> a
+    38:38:java.lang.String getString() -> getString
+    42:51:java.lang.String getString(int) -> a
+    java.util.List getSiblings() -> b
+    net.minecraft.network.chat.MutableComponent plainCopy() -> f
+    net.minecraft.network.chat.MutableComponent copy() -> e
+    74:88:java.util.Optional visit(net.minecraft.network.chat.FormattedText$StyledContentConsumer,net.minecraft.network.chat.Style) -> a
+    93:105:java.util.Optional visit(net.minecraft.network.chat.FormattedText$ContentConsumer) -> a
+    109:109:java.util.Optional visitSelf(net.minecraft.network.chat.FormattedText$StyledContentConsumer,net.minecraft.network.chat.Style) -> b
+    113:113:java.util.Optional visitSelf(net.minecraft.network.chat.FormattedText$ContentConsumer) -> b
+    117:124:java.util.List toFlatList(net.minecraft.network.chat.Style) -> b
+    382:382:net.minecraft.network.chat.Component nullToEmpty(java.lang.String) -> a
+    119:122:java.util.Optional lambda$toFlatList$1(java.util.List,net.minecraft.network.chat.Style,java.lang.String) -> a
+    44:49:java.util.Optional lambda$getString$0(int,java.lang.StringBuilder,java.lang.String) -> a
+net.minecraft.network.chat.Component$Serializer -> mr$a:
     com.google.gson.Gson GSON -> a
     java.lang.reflect.Field JSON_READER_POS -> b
     java.lang.reflect.Field JSON_READER_LINESTART -> c
-    175:175:void <init>() -> <init>
-    209:301:net.minecraft.network.chat.Component deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    306:314:void serializeStyle(net.minecraft.network.chat.Style,com.google.gson.JsonObject,com.google.gson.JsonSerializationContext) -> a
-    318:386:com.google.gson.JsonElement serialize(net.minecraft.network.chat.Component,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
-    390:390:java.lang.String toJson(net.minecraft.network.chat.Component) -> a
-    394:394:com.google.gson.JsonElement toJsonTree(net.minecraft.network.chat.Component) -> b
-    399:399:net.minecraft.network.chat.Component fromJson(java.lang.String) -> a
-    404:404:net.minecraft.network.chat.Component fromJson(com.google.gson.JsonElement) -> a
-    409:409:net.minecraft.network.chat.Component fromJsonLenient(java.lang.String) -> b
-    414:420:net.minecraft.network.chat.Component fromJson(com.mojang.brigadier.StringReader) -> a
-    426:428:int getPos(com.google.gson.stream.JsonReader) -> a
-    175:175:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
-    175:175:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-    198:203:java.lang.reflect.Field lambda$static$2() -> a
-    187:192:java.lang.reflect.Field lambda$static$1() -> b
-    177:182:com.google.gson.Gson lambda$static$0() -> c
-    176:196:void <clinit>() -> <clinit>
-net.minecraft.network.chat.ComponentUtils -> lg:
+    127:127:void <init>() -> <init>
+    161:250:net.minecraft.network.chat.MutableComponent deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
+    255:263:void serializeStyle(net.minecraft.network.chat.Style,com.google.gson.JsonObject,com.google.gson.JsonSerializationContext) -> a
+    267:334:com.google.gson.JsonElement serialize(net.minecraft.network.chat.Component,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
+    338:338:java.lang.String toJson(net.minecraft.network.chat.Component) -> a
+    342:342:com.google.gson.JsonElement toJsonTree(net.minecraft.network.chat.Component) -> b
+    347:347:net.minecraft.network.chat.MutableComponent fromJson(java.lang.String) -> a
+    352:352:net.minecraft.network.chat.MutableComponent fromJson(com.google.gson.JsonElement) -> a
+    357:357:net.minecraft.network.chat.MutableComponent fromJsonLenient(java.lang.String) -> b
+    362:368:net.minecraft.network.chat.MutableComponent fromJson(com.mojang.brigadier.StringReader) -> a
+    374:376:int getPos(com.google.gson.stream.JsonReader) -> a
+    127:127:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
+    127:127:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
+    150:155:java.lang.reflect.Field lambda$static$2() -> a
+    139:144:java.lang.reflect.Field lambda$static$1() -> b
+    129:134:com.google.gson.Gson lambda$static$0() -> c
+    128:148:void <clinit>() -> <clinit>
+net.minecraft.network.chat.ComponentUtils -> ms:
     16:16:void <init>() -> <init>
-    18:26:net.minecraft.network.chat.Component mergeStyles(net.minecraft.network.chat.Component,net.minecraft.network.chat.Style) -> a
-    30:43:net.minecraft.network.chat.Component updateForEntity(net.minecraft.commands.CommandSourceStack,net.minecraft.network.chat.Component,net.minecraft.world.entity.Entity,int) -> a
-    47:52:net.minecraft.network.chat.Component getDisplayName(com.mojang.authlib.GameProfile) -> a
-    57:57:net.minecraft.network.chat.Component formatList(java.util.Collection) -> a
-    61:69:net.minecraft.network.chat.Component formatAndSortList(java.util.Collection,java.util.function.Function) -> a
-    73:89:net.minecraft.network.chat.Component formatList(java.util.Collection,java.util.function.Function) -> b
-    93:93:net.minecraft.network.chat.Component wrapInSquareBrackets(net.minecraft.network.chat.Component) -> a
-    97:100:net.minecraft.network.chat.Component fromMessage(com.mojang.brigadier.Message) -> a
-    57:57:net.minecraft.network.chat.Component lambda$formatList$0(java.lang.String) -> a
-net.minecraft.network.chat.ContextAwareComponent -> lh:
-    net.minecraft.network.chat.Component resolve(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int) -> a
-net.minecraft.network.chat.HoverEvent -> li:
-    net.minecraft.network.chat.HoverEvent$Action action -> a
-    net.minecraft.network.chat.Component value -> b
-    11:14:void <init>(net.minecraft.network.chat.HoverEvent$Action,net.minecraft.network.chat.Component) -> <init>
-    17:17:net.minecraft.network.chat.HoverEvent$Action getAction() -> a
-    21:21:net.minecraft.network.chat.Component getValue() -> b
-    26:42:boolean equals(java.lang.Object) -> equals
-    47:47:java.lang.String toString() -> toString
-    55:57:int hashCode() -> hashCode
-net.minecraft.network.chat.HoverEvent$Action -> li$a:
+    18:31:net.minecraft.network.chat.MutableComponent mergeStyles(net.minecraft.network.chat.MutableComponent,net.minecraft.network.chat.Style) -> a
+    35:47:net.minecraft.network.chat.MutableComponent updateForEntity(net.minecraft.commands.CommandSourceStack,net.minecraft.network.chat.Component,net.minecraft.world.entity.Entity,int) -> a
+    51:60:net.minecraft.network.chat.Style resolveStyle(net.minecraft.commands.CommandSourceStack,net.minecraft.network.chat.Style,net.minecraft.world.entity.Entity,int) -> a
+    64:69:net.minecraft.network.chat.Component getDisplayName(com.mojang.authlib.GameProfile) -> a
+    74:74:net.minecraft.network.chat.Component formatList(java.util.Collection) -> a
+    78:86:net.minecraft.network.chat.Component formatAndSortList(java.util.Collection,java.util.function.Function) -> a
+    90:106:net.minecraft.network.chat.MutableComponent formatList(java.util.Collection,java.util.function.Function) -> b
+    110:110:net.minecraft.network.chat.MutableComponent wrapInSquareBrackets(net.minecraft.network.chat.Component) -> a
+    114:117:net.minecraft.network.chat.Component fromMessage(com.mojang.brigadier.Message) -> a
+    74:74:net.minecraft.network.chat.Component lambda$formatList$0(java.lang.String) -> a
+net.minecraft.network.chat.ContextAwareComponent -> mt:
+    net.minecraft.network.chat.MutableComponent resolve(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int) -> a
+net.minecraft.network.chat.FormattedText -> mu:
+    java.util.Optional STOP_ITERATION -> b
+    net.minecraft.network.chat.FormattedText EMPTY -> c
+    java.util.Optional visit(net.minecraft.network.chat.FormattedText$ContentConsumer) -> a
+    java.util.Optional visit(net.minecraft.network.chat.FormattedText$StyledContentConsumer,net.minecraft.network.chat.Style) -> a
+    29:29:net.minecraft.network.chat.FormattedText of(java.lang.String) -> b
+    43:43:net.minecraft.network.chat.FormattedText of(java.lang.String,net.minecraft.network.chat.Style) -> a
+    57:57:net.minecraft.network.chat.FormattedText composite(net.minecraft.network.chat.FormattedText[]) -> a
+    61:61:net.minecraft.network.chat.FormattedText composite(java.util.List) -> a
+    89:96:java.lang.String getString() -> getString
+    92:93:java.util.Optional lambda$getString$0(java.lang.StringBuilder,java.lang.String) -> a
+    10:12:void <clinit>() -> <clinit>
+net.minecraft.network.chat.FormattedText$1 -> mu$1:
+    12:12:void <init>() -> <init>
+    15:15:java.util.Optional visit(net.minecraft.network.chat.FormattedText$ContentConsumer) -> a
+    20:20:java.util.Optional visit(net.minecraft.network.chat.FormattedText$StyledContentConsumer,net.minecraft.network.chat.Style) -> a
+net.minecraft.network.chat.FormattedText$2 -> mu$2:
+    java.lang.String val$text -> a
+    29:29:void <init>(java.lang.String) -> <init>
+    32:32:java.util.Optional visit(net.minecraft.network.chat.FormattedText$ContentConsumer) -> a
+    37:37:java.util.Optional visit(net.minecraft.network.chat.FormattedText$StyledContentConsumer,net.minecraft.network.chat.Style) -> a
+net.minecraft.network.chat.FormattedText$3 -> mu$3:
+    java.lang.String val$text -> a
+    net.minecraft.network.chat.Style val$style -> d
+    43:43:void <init>(java.lang.String,net.minecraft.network.chat.Style) -> <init>
+    46:46:java.util.Optional visit(net.minecraft.network.chat.FormattedText$ContentConsumer) -> a
+    51:51:java.util.Optional visit(net.minecraft.network.chat.FormattedText$StyledContentConsumer,net.minecraft.network.chat.Style) -> a
+net.minecraft.network.chat.FormattedText$4 -> mu$4:
+    java.util.List val$parts -> a
+    61:61:void <init>(java.util.List) -> <init>
+    64:71:java.util.Optional visit(net.minecraft.network.chat.FormattedText$ContentConsumer) -> a
+    76:83:java.util.Optional visit(net.minecraft.network.chat.FormattedText$StyledContentConsumer,net.minecraft.network.chat.Style) -> a
+net.minecraft.network.chat.FormattedText$ContentConsumer -> mu$a:
+    java.util.Optional accept(java.lang.String) -> accept
+net.minecraft.network.chat.FormattedText$StyledContentConsumer -> mu$b:
+    java.util.Optional accept(net.minecraft.network.chat.Style,java.lang.String) -> accept
+net.minecraft.network.chat.HoverEvent -> mv:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.network.chat.HoverEvent$Action action -> b
+    java.lang.Object value -> c
+    34:37:void <init>(net.minecraft.network.chat.HoverEvent$Action,java.lang.Object) -> <init>
+    40:40:net.minecraft.network.chat.HoverEvent$Action getAction() -> a
+    45:48:java.lang.Object getValue(net.minecraft.network.chat.HoverEvent$Action) -> a
+    53:62:boolean equals(java.lang.Object) -> equals
+    67:67:java.lang.String toString() -> toString
+    75:77:int hashCode() -> hashCode
+    82:102:net.minecraft.network.chat.HoverEvent deserialize(com.google.gson.JsonObject) -> a
+    106:109:com.google.gson.JsonObject serialize() -> b
+    28:28:org.apache.logging.log4j.Logger access$100() -> c
+    29:29:void <clinit>() -> <clinit>
+net.minecraft.network.chat.HoverEvent$Action -> mv$a:
     net.minecraft.network.chat.HoverEvent$Action SHOW_TEXT -> a
     net.minecraft.network.chat.HoverEvent$Action SHOW_ITEM -> b
     net.minecraft.network.chat.HoverEvent$Action SHOW_ENTITY -> c
     java.util.Map LOOKUP -> d
-    boolean allowFromServer -> e
-    java.lang.String name -> f
-    net.minecraft.network.chat.HoverEvent$Action[] $VALUES -> g
-    60:60:net.minecraft.network.chat.HoverEvent$Action[] values() -> values
-    60:60:net.minecraft.network.chat.HoverEvent$Action valueOf(java.lang.String) -> valueOf
-    71:74:void <init>(java.lang.String,int,java.lang.String,boolean) -> <init>
-    77:77:boolean isAllowedFromServer() -> a
-    81:81:java.lang.String getName() -> b
-    85:85:net.minecraft.network.chat.HoverEvent$Action getByName(java.lang.String) -> a
-    66:66:net.minecraft.network.chat.HoverEvent$Action lambda$static$0(net.minecraft.network.chat.HoverEvent$Action) -> a
-    60:66:void <clinit>() -> <clinit>
-net.minecraft.network.chat.KeybindComponent -> lj:
-    java.util.function.Function keyResolver -> b
-    java.lang.String name -> c
-    java.util.function.Supplier nameResolver -> d
-    12:14:void <init>(java.lang.String) -> <init>
-    18:21:java.lang.String getContents() -> d
-    26:26:net.minecraft.network.chat.KeybindComponent copy() -> i
-    31:40:boolean equals(java.lang.Object) -> equals
-    45:48:java.lang.String toString() -> toString
-    53:53:java.lang.String getName() -> j
-    6:6:net.minecraft.network.chat.Component copy() -> g
-    7:7:java.util.function.Supplier lambda$static$1(java.lang.String) -> b
-    7:7:java.lang.String lambda$null$0(java.lang.String) -> c
-    7:7:void <clinit>() -> <clinit>
-net.minecraft.network.chat.NbtComponent -> lk:
-    org.apache.logging.log4j.Logger LOGGER -> e
-    boolean interpreting -> b
-    java.lang.String nbtPathPattern -> c
-    net.minecraft.commands.arguments.NbtPathArgument$NbtPath compiledNbtPath -> d
-    252:254:net.minecraft.commands.arguments.NbtPathArgument$NbtPath compileNbtPath(java.lang.String) -> b
+    java.lang.String name -> e
+    boolean allowFromServer -> f
+    java.util.function.Function argDeserializer -> g
+    java.util.function.Function argSerializer -> h
+    java.util.function.Function legacyArgDeserializer -> i
+    309:315:void <init>(java.lang.String,boolean,java.util.function.Function,java.util.function.Function,java.util.function.Function) -> <init>
+    318:318:boolean isAllowedFromServer() -> a
+    322:322:java.lang.String getName() -> b
+    327:327:net.minecraft.network.chat.HoverEvent$Action getByName(java.lang.String) -> a
+    332:332:java.lang.Object cast(java.lang.Object) -> b
+    337:341:net.minecraft.network.chat.HoverEvent deserialize(com.google.gson.JsonElement) -> a
+    346:350:net.minecraft.network.chat.HoverEvent deserializeFromLegacy(net.minecraft.network.chat.Component) -> a
+    354:354:com.google.gson.JsonElement serializeArg(java.lang.Object) -> a
+    359:359:java.lang.String toString() -> toString
+    301:301:net.minecraft.network.chat.HoverEvent$Action lambda$static$3(net.minecraft.network.chat.HoverEvent$Action) -> a
+    293:293:net.minecraft.network.chat.HoverEvent$ItemStackInfo lambda$static$2(net.minecraft.network.chat.Component) -> b
+    292:292:com.google.gson.JsonElement lambda$static$1(java.lang.Object) -> c
+    291:291:net.minecraft.network.chat.HoverEvent$ItemStackInfo lambda$static$0(com.google.gson.JsonElement) -> b
+    284:284:java.lang.Object access$000(net.minecraft.network.chat.HoverEvent$Action,java.lang.Object) -> a
+    285:301:void <clinit>() -> <clinit>
+net.minecraft.network.chat.HoverEvent$EntityTooltipInfo -> mv$b:
+    net.minecraft.world.entity.EntityType type -> a
+    java.util.UUID id -> b
+    net.minecraft.network.chat.Component name -> c
+    java.util.List linesCache -> d
+    121:125:void <init>(net.minecraft.world.entity.EntityType,java.util.UUID,net.minecraft.network.chat.Component) -> <init>
+    129:136:net.minecraft.network.chat.HoverEvent$EntityTooltipInfo create(com.google.gson.JsonElement) -> a
+    142:148:net.minecraft.network.chat.HoverEvent$EntityTooltipInfo create(net.minecraft.network.chat.Component) -> a
+    153:159:com.google.gson.JsonElement serialize() -> a
+    163:171:java.util.List getTooltipLines() -> b
+    176:180:boolean equals(java.lang.Object) -> equals
+    185:188:int hashCode() -> hashCode
+net.minecraft.network.chat.HoverEvent$ItemStackInfo -> mv$c:
+    net.minecraft.world.item.Item item -> a
+    int count -> b
+    net.minecraft.nbt.CompoundTag tag -> c
+    net.minecraft.world.item.ItemStack itemStack -> d
+    202:206:void <init>(net.minecraft.world.item.Item,int,net.minecraft.nbt.CompoundTag) -> <init>
+    209:210:void <init>(net.minecraft.world.item.ItemStack) -> <init>
+    214:218:boolean equals(java.lang.Object) -> equals
+    223:226:int hashCode() -> hashCode
+    230:236:net.minecraft.world.item.ItemStack getItemStack() -> a
+    240:257:net.minecraft.network.chat.HoverEvent$ItemStackInfo create(com.google.gson.JsonElement) -> b
+    263:267:net.minecraft.network.chat.HoverEvent$ItemStackInfo create(net.minecraft.network.chat.Component) -> b
+    272:280:com.google.gson.JsonElement serialize() -> b
+    193:193:net.minecraft.network.chat.HoverEvent$ItemStackInfo access$200(net.minecraft.network.chat.Component) -> a
+    193:193:com.google.gson.JsonElement access$300(net.minecraft.network.chat.HoverEvent$ItemStackInfo) -> a
+    193:193:net.minecraft.network.chat.HoverEvent$ItemStackInfo access$400(com.google.gson.JsonElement) -> a
+net.minecraft.network.chat.KeybindComponent -> mw:
+    java.util.function.Function keyResolver -> d
+    java.lang.String name -> e
+    java.util.function.Supplier nameResolver -> f
+    13:15:void <init>(java.lang.String) -> <init>
+    18:19:void setKeyResolver(java.util.function.Function) -> a
+    22:26:net.minecraft.network.chat.Component getNestedComponent() -> i
+    31:31:java.util.Optional visitSelf(net.minecraft.network.chat.FormattedText$ContentConsumer) -> b
+    36:36:java.util.Optional visitSelf(net.minecraft.network.chat.FormattedText$StyledContentConsumer,net.minecraft.network.chat.Style) -> b
+    41:41:net.minecraft.network.chat.KeybindComponent plainCopy() -> g
+    46:55:boolean equals(java.lang.Object) -> equals
+    60:63:java.lang.String toString() -> toString
+    68:68:java.lang.String getName() -> h
+    7:7:net.minecraft.network.chat.BaseComponent plainCopy() -> d
+    7:7:net.minecraft.network.chat.MutableComponent plainCopy() -> f
+    8:8:java.util.function.Supplier lambda$static$1(java.lang.String) -> d
+    8:8:net.minecraft.network.chat.Component lambda$null$0(java.lang.String) -> e
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.network.chat.MutableComponent -> mx:
+    net.minecraft.network.chat.MutableComponent setStyle(net.minecraft.network.chat.Style) -> a
+    12:12:net.minecraft.network.chat.MutableComponent append(java.lang.String) -> c
+    net.minecraft.network.chat.MutableComponent append(net.minecraft.network.chat.Component) -> a
+    18:19:net.minecraft.network.chat.MutableComponent withStyle(java.util.function.UnaryOperator) -> a
+    23:24:net.minecraft.network.chat.MutableComponent withStyle(net.minecraft.network.chat.Style) -> c
+    28:29:net.minecraft.network.chat.MutableComponent withStyle(net.minecraft.ChatFormatting[]) -> a
+    33:34:net.minecraft.network.chat.MutableComponent withStyle(net.minecraft.ChatFormatting) -> a
+net.minecraft.network.chat.NbtComponent -> my:
+    org.apache.logging.log4j.Logger LOGGER -> g
+    boolean interpreting -> d
+    java.lang.String nbtPathPattern -> e
+    net.minecraft.commands.arguments.NbtPathArgument$NbtPath compiledNbtPath -> f
+    252:254:net.minecraft.commands.arguments.NbtPathArgument$NbtPath compileNbtPath(java.lang.String) -> d
     259:260:void <init>(java.lang.String,boolean) -> <init>
     262:266:void <init>(java.lang.String,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,boolean) -> <init>
     java.util.stream.Stream getData(net.minecraft.commands.CommandSourceStack) -> a
-    272:272:java.lang.String getContents() -> d
-    276:276:java.lang.String getNbtPath() -> i
-    280:280:boolean isInterpreting() -> j
-    285:311:net.minecraft.network.chat.Component resolve(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int) -> a
-    308:308:net.minecraft.network.chat.Component lambda$resolve$2(net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> a
-    301:305:java.util.stream.Stream lambda$resolve$1(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int,java.lang.String) -> a
-    291:293:java.util.stream.Stream lambda$resolve$0(net.minecraft.nbt.CompoundTag) -> a
+    271:271:java.lang.String getNbtPath() -> g
+    275:275:boolean isInterpreting() -> h
+    280:306:net.minecraft.network.chat.MutableComponent resolve(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int) -> a
+    303:303:net.minecraft.network.chat.MutableComponent lambda$resolve$2(net.minecraft.network.chat.MutableComponent,net.minecraft.network.chat.MutableComponent) -> a
+    296:300:java.util.stream.Stream lambda$resolve$1(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int,java.lang.String) -> a
+    286:288:java.util.stream.Stream lambda$resolve$0(net.minecraft.nbt.CompoundTag) -> a
     29:29:void <clinit>() -> <clinit>
-net.minecraft.network.chat.NbtComponent$BlockNbtComponent -> lk$a:
-    java.lang.String posPattern -> e
-    net.minecraft.commands.arguments.coordinates.Coordinates compiledPos -> f
+net.minecraft.network.chat.NbtComponent$BlockNbtComponent -> my$a:
+    java.lang.String posPattern -> g
+    net.minecraft.commands.arguments.coordinates.Coordinates compiledPos -> h
     113:116:void <init>(java.lang.String,boolean,java.lang.String) -> <init>
-    121:123:net.minecraft.commands.arguments.coordinates.Coordinates compilePos(java.lang.String) -> b
+    121:123:net.minecraft.commands.arguments.coordinates.Coordinates compilePos(java.lang.String) -> d
     128:131:void <init>(java.lang.String,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,boolean,java.lang.String,net.minecraft.commands.arguments.coordinates.Coordinates) -> <init>
-    135:135:java.lang.String getPos() -> k
-    140:140:net.minecraft.network.chat.Component copy() -> g
+    135:135:java.lang.String getPos() -> i
+    140:140:net.minecraft.network.chat.NbtComponent$BlockNbtComponent plainCopy() -> j
     145:157:java.util.stream.Stream getData(net.minecraft.commands.CommandSourceStack) -> a
     162:173:boolean equals(java.lang.Object) -> equals
     178:182:java.lang.String toString() -> toString
-net.minecraft.network.chat.NbtComponent$EntityNbtComponent -> lk$b:
-    java.lang.String selectorPattern -> e
-    net.minecraft.commands.arguments.selector.EntitySelector compiledSelector -> f
+    106:106:net.minecraft.network.chat.BaseComponent plainCopy() -> d
+    106:106:net.minecraft.network.chat.MutableComponent plainCopy() -> f
+net.minecraft.network.chat.NbtComponent$EntityNbtComponent -> my$b:
+    java.lang.String selectorPattern -> g
+    net.minecraft.commands.arguments.selector.EntitySelector compiledSelector -> h
     39:42:void <init>(java.lang.String,boolean,java.lang.String) -> <init>
-    47:50:net.minecraft.commands.arguments.selector.EntitySelector compileSelector(java.lang.String) -> b
+    47:50:net.minecraft.commands.arguments.selector.EntitySelector compileSelector(java.lang.String) -> d
     55:58:void <init>(java.lang.String,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,boolean,java.lang.String,net.minecraft.commands.arguments.selector.EntitySelector) -> <init>
-    61:61:java.lang.String getSelector() -> k
-    66:66:net.minecraft.network.chat.Component copy() -> g
+    61:61:java.lang.String getSelector() -> i
+    66:66:net.minecraft.network.chat.NbtComponent$EntityNbtComponent plainCopy() -> j
     71:76:java.util.stream.Stream getData(net.minecraft.commands.CommandSourceStack) -> a
     81:92:boolean equals(java.lang.Object) -> equals
     97:101:java.lang.String toString() -> toString
-net.minecraft.network.chat.NbtComponent$StorageNbtComponent -> lk$c:
-    net.minecraft.resources.ResourceLocation id -> e
+    32:32:net.minecraft.network.chat.BaseComponent plainCopy() -> d
+    32:32:net.minecraft.network.chat.MutableComponent plainCopy() -> f
+net.minecraft.network.chat.NbtComponent$StorageNbtComponent -> my$c:
+    net.minecraft.resources.ResourceLocation id -> g
     191:193:void <init>(java.lang.String,boolean,net.minecraft.resources.ResourceLocation) -> <init>
     196:198:void <init>(java.lang.String,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,boolean,net.minecraft.resources.ResourceLocation) -> <init>
-    201:201:net.minecraft.resources.ResourceLocation getId() -> k
-    206:206:net.minecraft.network.chat.Component copy() -> g
+    201:201:net.minecraft.resources.ResourceLocation getId() -> i
+    206:206:net.minecraft.network.chat.NbtComponent$StorageNbtComponent plainCopy() -> j
     211:212:java.util.stream.Stream getData(net.minecraft.commands.CommandSourceStack) -> a
     217:228:boolean equals(java.lang.Object) -> equals
     233:237:java.lang.String toString() -> toString
-net.minecraft.network.chat.ScoreComponent -> ll:
-    java.lang.String name -> b
-    net.minecraft.commands.arguments.selector.EntitySelector selector -> c
-    java.lang.String objective -> d
-    java.lang.String value -> e
-    26:39:void <init>(java.lang.String,java.lang.String) -> <init>
-    42:42:java.lang.String getName() -> i
-    47:55:java.lang.String getEntityName(net.minecraft.commands.CommandSourceStack) -> a
-    61:61:net.minecraft.commands.arguments.selector.EntitySelector getSelector() -> j
-    65:65:java.lang.String getObjective() -> k
-    69:70:void setValue(java.lang.String) -> b
-    74:74:java.lang.String getContents() -> d
-    78:89:void resolve(net.minecraft.commands.CommandSourceStack) -> b
-    93:95:net.minecraft.network.chat.ScoreComponent copy() -> l
-    100:121:net.minecraft.network.chat.Component resolve(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int) -> a
-    126:135:boolean equals(java.lang.Object) -> equals
-    140:144:java.lang.String toString() -> toString
-    19:19:net.minecraft.network.chat.Component copy() -> g
-net.minecraft.network.chat.SelectorComponent -> lm:
-    org.apache.logging.log4j.Logger LOGGER -> b
-    java.lang.String pattern -> c
-    net.minecraft.commands.arguments.selector.EntitySelector selector -> d
+    187:187:net.minecraft.network.chat.BaseComponent plainCopy() -> d
+    187:187:net.minecraft.network.chat.MutableComponent plainCopy() -> f
+net.minecraft.network.chat.ScoreComponent -> mz:
+    java.lang.String name -> d
+    net.minecraft.commands.arguments.selector.EntitySelector selector -> e
+    java.lang.String objective -> f
+    29:32:net.minecraft.commands.arguments.selector.EntitySelector parseSelector(java.lang.String) -> d
+    36:37:void <init>(java.lang.String,java.lang.String) -> <init>
+    39:43:void <init>(java.lang.String,net.minecraft.commands.arguments.selector.EntitySelector,java.lang.String) -> <init>
+    46:46:java.lang.String getName() -> g
+    51:51:net.minecraft.commands.arguments.selector.EntitySelector getSelector() -> h
+    55:55:java.lang.String getObjective() -> i
+    59:68:java.lang.String findTargetName(net.minecraft.commands.CommandSourceStack) -> a
+    72:81:java.lang.String getScore(java.lang.String,net.minecraft.commands.CommandSourceStack) -> a
+    86:86:net.minecraft.network.chat.ScoreComponent plainCopy() -> j
+    91:97:net.minecraft.network.chat.MutableComponent resolve(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int) -> a
+    102:111:boolean equals(java.lang.Object) -> equals
+    116:120:java.lang.String toString() -> toString
+    18:18:net.minecraft.network.chat.BaseComponent plainCopy() -> d
+    18:18:net.minecraft.network.chat.MutableComponent plainCopy() -> f
+net.minecraft.network.chat.SelectorComponent -> na:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    java.lang.String pattern -> e
+    net.minecraft.commands.arguments.selector.EntitySelector selector -> f
     21:32:void <init>(java.lang.String) -> <init>
-    35:35:java.lang.String getPattern() -> i
-    40:40:net.minecraft.commands.arguments.selector.EntitySelector getSelector() -> j
-    45:48:net.minecraft.network.chat.Component resolve(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int) -> a
-    54:54:java.lang.String getContents() -> d
-    59:59:net.minecraft.network.chat.SelectorComponent copy() -> k
+    35:35:java.lang.String getPattern() -> g
+    40:40:net.minecraft.commands.arguments.selector.EntitySelector getSelector() -> h
+    45:48:net.minecraft.network.chat.MutableComponent resolve(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int) -> a
+    54:54:java.lang.String getContents() -> a
+    59:59:net.minecraft.network.chat.SelectorComponent plainCopy() -> i
     64:73:boolean equals(java.lang.Object) -> equals
     78:81:java.lang.String toString() -> toString
-    14:14:net.minecraft.network.chat.Component copy() -> g
+    14:14:net.minecraft.network.chat.BaseComponent plainCopy() -> d
+    14:14:net.minecraft.network.chat.MutableComponent plainCopy() -> f
     15:15:void <clinit>() -> <clinit>
-net.minecraft.network.chat.Style -> ln:
-    net.minecraft.network.chat.Style parent -> a
-    net.minecraft.ChatFormatting color -> b
-    java.lang.Boolean bold -> c
-    java.lang.Boolean italic -> d
-    java.lang.Boolean underlined -> e
-    java.lang.Boolean strikethrough -> f
-    java.lang.Boolean obfuscated -> g
-    net.minecraft.network.chat.ClickEvent clickEvent -> h
-    net.minecraft.network.chat.HoverEvent hoverEvent -> i
-    java.lang.String insertion -> j
-    net.minecraft.network.chat.Style ROOT -> k
-    18:18:void <init>() -> <init>
-    33:33:net.minecraft.ChatFormatting getColor() -> a
-    37:37:boolean isBold() -> b
-    41:41:boolean isItalic() -> c
-    45:45:boolean isStrikethrough() -> d
-    49:49:boolean isUnderlined() -> e
-    53:53:boolean isObfuscated() -> f
-    57:57:boolean isEmpty() -> g
-    62:62:net.minecraft.network.chat.ClickEvent getClickEvent() -> h
-    67:67:net.minecraft.network.chat.HoverEvent getHoverEvent() -> i
-    72:72:java.lang.String getInsertion() -> j
-    76:77:net.minecraft.network.chat.Style setColor(net.minecraft.ChatFormatting) -> a
-    81:82:net.minecraft.network.chat.Style setBold(java.lang.Boolean) -> a
-    86:87:net.minecraft.network.chat.Style setItalic(java.lang.Boolean) -> b
-    91:92:net.minecraft.network.chat.Style setStrikethrough(java.lang.Boolean) -> c
-    96:97:net.minecraft.network.chat.Style setUnderlined(java.lang.Boolean) -> d
-    101:102:net.minecraft.network.chat.Style setObfuscated(java.lang.Boolean) -> e
-    106:107:net.minecraft.network.chat.Style setClickEvent(net.minecraft.network.chat.ClickEvent) -> a
-    111:112:net.minecraft.network.chat.Style setHoverEvent(net.minecraft.network.chat.HoverEvent) -> a
-    116:117:net.minecraft.network.chat.Style setInsertion(java.lang.String) -> a
-    121:122:net.minecraft.network.chat.Style inheritFrom(net.minecraft.network.chat.Style) -> a
-    126:156:java.lang.String getLegacyFormatCodes() -> k
-    160:160:net.minecraft.network.chat.Style getParent() -> o
-    165:174:java.lang.String toStringResolved() -> l
-    180:189:java.lang.String toString() -> toString
-    195:212:boolean equals(java.lang.Object) -> equals
-    217:217:int hashCode() -> hashCode
-    337:348:net.minecraft.network.chat.Style copy() -> m
-    352:364:net.minecraft.network.chat.Style flatCopy() -> n
-    18:18:java.lang.Boolean access$002(net.minecraft.network.chat.Style,java.lang.Boolean) -> a
-    18:18:java.lang.Boolean access$102(net.minecraft.network.chat.Style,java.lang.Boolean) -> b
-    18:18:java.lang.Boolean access$202(net.minecraft.network.chat.Style,java.lang.Boolean) -> c
-    18:18:java.lang.Boolean access$302(net.minecraft.network.chat.Style,java.lang.Boolean) -> d
-    18:18:java.lang.Boolean access$402(net.minecraft.network.chat.Style,java.lang.Boolean) -> e
-    18:18:net.minecraft.ChatFormatting access$502(net.minecraft.network.chat.Style,net.minecraft.ChatFormatting) -> a
-    18:18:java.lang.String access$602(net.minecraft.network.chat.Style,java.lang.String) -> a
-    18:18:net.minecraft.network.chat.ClickEvent access$702(net.minecraft.network.chat.Style,net.minecraft.network.chat.ClickEvent) -> a
-    18:18:net.minecraft.network.chat.HoverEvent access$802(net.minecraft.network.chat.Style,net.minecraft.network.chat.HoverEvent) -> a
-    18:18:java.lang.Boolean access$000(net.minecraft.network.chat.Style) -> b
-    18:18:java.lang.Boolean access$100(net.minecraft.network.chat.Style) -> c
-    18:18:java.lang.Boolean access$200(net.minecraft.network.chat.Style) -> d
-    18:18:java.lang.Boolean access$300(net.minecraft.network.chat.Style) -> e
-    18:18:java.lang.Boolean access$400(net.minecraft.network.chat.Style) -> f
-    18:18:net.minecraft.ChatFormatting access$500(net.minecraft.network.chat.Style) -> g
-    18:18:java.lang.String access$600(net.minecraft.network.chat.Style) -> h
-    18:18:net.minecraft.network.chat.ClickEvent access$700(net.minecraft.network.chat.Style) -> i
-    18:18:net.minecraft.network.chat.HoverEvent access$800(net.minecraft.network.chat.Style) -> j
-    220:220:void <clinit>() -> <clinit>
-net.minecraft.network.chat.Style$1 -> ln$1:
-    220:220:void <init>() -> <init>
-    224:224:net.minecraft.ChatFormatting getColor() -> a
-    229:229:boolean isBold() -> b
-    234:234:boolean isItalic() -> c
-    239:239:boolean isStrikethrough() -> d
-    244:244:boolean isUnderlined() -> e
-    249:249:boolean isObfuscated() -> f
-    255:255:net.minecraft.network.chat.ClickEvent getClickEvent() -> h
-    261:261:net.minecraft.network.chat.HoverEvent getHoverEvent() -> i
-    267:267:java.lang.String getInsertion() -> j
-    272:272:net.minecraft.network.chat.Style setColor(net.minecraft.ChatFormatting) -> a
-    277:277:net.minecraft.network.chat.Style setBold(java.lang.Boolean) -> a
-    282:282:net.minecraft.network.chat.Style setItalic(java.lang.Boolean) -> b
-    287:287:net.minecraft.network.chat.Style setStrikethrough(java.lang.Boolean) -> c
-    292:292:net.minecraft.network.chat.Style setUnderlined(java.lang.Boolean) -> d
-    297:297:net.minecraft.network.chat.Style setObfuscated(java.lang.Boolean) -> e
-    302:302:net.minecraft.network.chat.Style setClickEvent(net.minecraft.network.chat.ClickEvent) -> a
-    307:307:net.minecraft.network.chat.Style setHoverEvent(net.minecraft.network.chat.HoverEvent) -> a
-    312:312:net.minecraft.network.chat.Style inheritFrom(net.minecraft.network.chat.Style) -> a
-    317:317:java.lang.String toString() -> toString
-    322:322:net.minecraft.network.chat.Style copy() -> m
-    327:327:net.minecraft.network.chat.Style flatCopy() -> n
-    332:332:java.lang.String getLegacyFormatCodes() -> k
-net.minecraft.network.chat.Style$Serializer -> ln$a:
-    367:367:void <init>() -> <init>
-    371:426:net.minecraft.network.chat.Style deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    432:473:com.google.gson.JsonElement serialize(net.minecraft.network.chat.Style,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
-    367:367:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
-    367:367:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.network.chat.TextComponent -> lo:
-    java.lang.String text -> b
-    6:8:void <init>(java.lang.String) -> <init>
-    11:11:java.lang.String getText() -> i
-    16:16:java.lang.String getContents() -> d
-    21:21:net.minecraft.network.chat.TextComponent copy() -> j
-    26:35:boolean equals(java.lang.Object) -> equals
-    40:43:java.lang.String toString() -> toString
-    3:3:net.minecraft.network.chat.Component copy() -> g
-net.minecraft.network.chat.TranslatableComponent -> lp:
-    net.minecraft.locale.Language DEFAULT_LANGUAGE -> d
-    net.minecraft.locale.Language LANGUAGE -> e
-    java.lang.String key -> f
-    java.lang.Object[] args -> g
-    java.lang.Object decomposeLock -> h
-    long decomposedLanguageTime -> i
-    java.util.List decomposedParts -> b
-    java.util.regex.Pattern FORMAT_PATTERN -> c
-    27:48:void <init>(java.lang.String,java.lang.Object[]) -> <init>
-    52:68:void decompose() -> i
-    71:118:void decomposeTemplate(java.lang.String) -> b
-    121:135:net.minecraft.network.chat.Component getComponent(int) -> b
-    140:154:net.minecraft.network.chat.Component setStyle(net.minecraft.network.chat.Style) -> a
-    159:161:java.util.stream.Stream stream() -> c
-    166:174:java.lang.String getContents() -> d
-    179:189:net.minecraft.network.chat.TranslatableComponent copy() -> j
-    194:204:net.minecraft.network.chat.Component resolve(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int) -> a
-    209:218:boolean equals(java.lang.Object) -> equals
-    223:226:int hashCode() -> hashCode
-    231:235:java.lang.String toString() -> toString
-    240:240:java.lang.String getKey() -> k
-    244:244:java.lang.Object[] getArgs() -> l
-    19:19:net.minecraft.network.chat.Component copy() -> g
-    20:32:void <clinit>() -> <clinit>
-net.minecraft.network.chat.TranslatableFormatException -> lq:
+net.minecraft.network.chat.Style -> nb:
+    net.minecraft.resources.ResourceLocation DEFAULT_FONT -> a
+    net.minecraft.network.chat.Style EMPTY -> b
+    net.minecraft.network.chat.TextColor color -> c
+    java.lang.Boolean bold -> d
+    java.lang.Boolean italic -> e
+    java.lang.Boolean underlined -> f
+    java.lang.Boolean strikethrough -> g
+    java.lang.Boolean obfuscated -> h
+    net.minecraft.network.chat.ClickEvent clickEvent -> i
+    net.minecraft.network.chat.HoverEvent hoverEvent -> j
+    java.lang.String insertion -> k
+    net.minecraft.resources.ResourceLocation font -> l
+    46:57:void <init>(net.minecraft.network.chat.TextColor,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,net.minecraft.network.chat.ClickEvent,net.minecraft.network.chat.HoverEvent,java.lang.String,net.minecraft.resources.ResourceLocation) -> <init>
+    61:61:net.minecraft.network.chat.TextColor getColor() -> a
+    65:65:boolean isBold() -> b
+    69:69:boolean isItalic() -> c
+    73:73:boolean isStrikethrough() -> d
+    77:77:boolean isUnderlined() -> e
+    81:81:boolean isObfuscated() -> f
+    85:85:boolean isEmpty() -> g
+    90:90:net.minecraft.network.chat.ClickEvent getClickEvent() -> h
+    95:95:net.minecraft.network.chat.HoverEvent getHoverEvent() -> i
+    100:100:java.lang.String getInsertion() -> j
+    104:104:net.minecraft.resources.ResourceLocation getFont() -> k
+    108:108:net.minecraft.network.chat.Style withColor(net.minecraft.network.chat.TextColor) -> a
+    112:112:net.minecraft.network.chat.Style withColor(net.minecraft.ChatFormatting) -> a
+    116:116:net.minecraft.network.chat.Style withColor(int) -> a
+    120:120:net.minecraft.network.chat.Style withBold(java.lang.Boolean) -> a
+    124:124:net.minecraft.network.chat.Style withItalic(java.lang.Boolean) -> b
+    128:128:net.minecraft.network.chat.Style withUnderlined(java.lang.Boolean) -> c
+    132:132:net.minecraft.network.chat.Style withStrikethrough(java.lang.Boolean) -> d
+    136:136:net.minecraft.network.chat.Style withObfuscated(java.lang.Boolean) -> e
+    140:140:net.minecraft.network.chat.Style withClickEvent(net.minecraft.network.chat.ClickEvent) -> a
+    144:144:net.minecraft.network.chat.Style withHoverEvent(net.minecraft.network.chat.HoverEvent) -> a
+    148:148:net.minecraft.network.chat.Style withInsertion(java.lang.String) -> a
+    152:152:net.minecraft.network.chat.Style withFont(net.minecraft.resources.ResourceLocation) -> a
+    156:185:net.minecraft.network.chat.Style applyFormat(net.minecraft.ChatFormatting) -> b
+    189:224:net.minecraft.network.chat.Style applyLegacyFormat(net.minecraft.ChatFormatting) -> c
+    228:259:net.minecraft.network.chat.Style applyFormats(net.minecraft.ChatFormatting[]) -> a
+    263:271:net.minecraft.network.chat.Style applyTo(net.minecraft.network.chat.Style) -> a
+    287:297:java.lang.String toString() -> toString
+    303:322:boolean equals(java.lang.Object) -> equals
+    327:327:int hashCode() -> hashCode
+    20:20:void <init>(net.minecraft.network.chat.TextColor,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,net.minecraft.network.chat.ClickEvent,net.minecraft.network.chat.HoverEvent,java.lang.String,net.minecraft.resources.ResourceLocation,net.minecraft.network.chat.Style$1) -> <init>
+    20:20:java.lang.Boolean access$100(net.minecraft.network.chat.Style) -> b
+    20:20:java.lang.Boolean access$200(net.minecraft.network.chat.Style) -> c
+    20:20:java.lang.Boolean access$300(net.minecraft.network.chat.Style) -> d
+    20:20:java.lang.Boolean access$400(net.minecraft.network.chat.Style) -> e
+    20:20:java.lang.Boolean access$500(net.minecraft.network.chat.Style) -> f
+    20:20:net.minecraft.network.chat.TextColor access$600(net.minecraft.network.chat.Style) -> g
+    20:20:java.lang.String access$700(net.minecraft.network.chat.Style) -> h
+    20:20:net.minecraft.network.chat.ClickEvent access$800(net.minecraft.network.chat.Style) -> i
+    20:20:net.minecraft.network.chat.HoverEvent access$900(net.minecraft.network.chat.Style) -> j
+    20:20:net.minecraft.resources.ResourceLocation access$1000(net.minecraft.network.chat.Style) -> k
+    21:23:void <clinit>() -> <clinit>
+net.minecraft.network.chat.Style$1 -> nb$1:
+    int[] $SwitchMap$net$minecraft$ChatFormatting -> a
+    163:163:void <clinit>() -> <clinit>
+net.minecraft.network.chat.Style$Serializer -> nb$a:
+    330:330:void <init>() -> <init>
+    334:354:net.minecraft.network.chat.Style deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
+    359:367:net.minecraft.resources.ResourceLocation getFont(com.google.gson.JsonObject) -> a
+    372:379:net.minecraft.network.chat.HoverEvent getHoverEvent(com.google.gson.JsonObject) -> b
+    384:395:net.minecraft.network.chat.ClickEvent getClickEvent(com.google.gson.JsonObject) -> c
+    400:400:java.lang.String getInsertion(com.google.gson.JsonObject) -> d
+    405:409:net.minecraft.network.chat.TextColor getTextColor(com.google.gson.JsonObject) -> e
+    414:418:java.lang.Boolean getOptionalFlag(com.google.gson.JsonObject,java.lang.String) -> a
+    424:467:com.google.gson.JsonElement serialize(net.minecraft.network.chat.Style,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
+    330:330:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
+    330:330:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
+net.minecraft.network.chat.TextColor -> nc:
+    java.util.Map LEGACY_FORMAT_TO_COLOR -> a
+    java.util.Map NAMED_COLORS -> b
+    int value -> c
+    java.lang.String name -> d
+    23:26:void <init>(int,java.lang.String) -> <init>
+    28:31:void <init>(int) -> <init>
+    34:34:int getValue() -> a
+    38:42:java.lang.String serialize() -> b
+    46:46:java.lang.String formatValue() -> c
+    51:58:boolean equals(java.lang.Object) -> equals
+    63:63:int hashCode() -> hashCode
+    68:68:java.lang.String toString() -> toString
+    73:73:net.minecraft.network.chat.TextColor fromLegacyFormat(net.minecraft.ChatFormatting) -> a
+    77:77:net.minecraft.network.chat.TextColor fromRgb(int) -> a
+    82:90:net.minecraft.network.chat.TextColor parseColor(java.lang.String) -> a
+    16:16:java.lang.String lambda$static$1(net.minecraft.network.chat.TextColor) -> a
+    15:15:net.minecraft.network.chat.TextColor lambda$static$0(net.minecraft.ChatFormatting) -> b
+    15:16:void <clinit>() -> <clinit>
+net.minecraft.network.chat.TextComponent -> nd:
+    net.minecraft.network.chat.Component EMPTY -> d
+    java.lang.String text -> e
+    net.minecraft.locale.Language decomposedWith -> f
+    java.lang.String reorderedText -> g
+    16:19:void <init>(java.lang.String) -> <init>
+    22:22:java.lang.String getText() -> g
+    27:35:java.lang.String getContents() -> a
+    40:40:net.minecraft.network.chat.TextComponent plainCopy() -> h
+    45:54:boolean equals(java.lang.Object) -> equals
+    59:62:java.lang.String toString() -> toString
+    7:7:net.minecraft.network.chat.BaseComponent plainCopy() -> d
+    7:7:net.minecraft.network.chat.MutableComponent plainCopy() -> f
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.network.chat.TranslatableComponent -> ne:
+    java.lang.Object[] NO_ARGS -> d
+    net.minecraft.network.chat.FormattedText TEXT_PERCENT -> e
+    net.minecraft.network.chat.FormattedText TEXT_NULL -> f
+    java.lang.String key -> g
+    java.lang.Object[] args -> h
+    net.minecraft.locale.Language decomposedWith -> i
+    java.util.List decomposedParts -> j
+    java.util.regex.Pattern FORMAT_PATTERN -> k
+    27:34:void <init>(java.lang.String) -> <init>
+    27:39:void <init>(java.lang.String,java.lang.Object[]) -> <init>
+    42:56:void decompose() -> j
+    59:106:void decomposeTemplate(java.lang.String,net.minecraft.locale.Language) -> a
+    109:118:net.minecraft.network.chat.FormattedText getArgument(int,net.minecraft.locale.Language) -> a
+    124:124:net.minecraft.network.chat.TranslatableComponent plainCopy() -> g
+    129:138:java.util.Optional visitSelf(net.minecraft.network.chat.FormattedText$StyledContentConsumer,net.minecraft.network.chat.Style) -> b
+    143:152:java.util.Optional visitSelf(net.minecraft.network.chat.FormattedText$ContentConsumer) -> b
+    157:167:net.minecraft.network.chat.MutableComponent resolve(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,int) -> a
+    172:181:boolean equals(java.lang.Object) -> equals
+    186:189:int hashCode() -> hashCode
+    194:198:java.lang.String toString() -> toString
+    203:203:java.lang.String getKey() -> h
+    207:207:java.lang.Object[] getArgs() -> i
+    16:16:net.minecraft.network.chat.BaseComponent plainCopy() -> d
+    16:16:net.minecraft.network.chat.MutableComponent plainCopy() -> f
+    17:29:void <clinit>() -> <clinit>
+net.minecraft.network.chat.TranslatableFormatException -> nf:
     5:6:void <init>(net.minecraft.network.chat.TranslatableComponent,java.lang.String) -> <init>
     9:10:void <init>(net.minecraft.network.chat.TranslatableComponent,int) -> <init>
     13:14:void <init>(net.minecraft.network.chat.TranslatableComponent,java.lang.Throwable) -> <init>
-net.minecraft.network.chat.package-info -> lr:
-net.minecraft.network.package-info -> ls:
-net.minecraft.network.protocol.Packet -> lt:
+net.minecraft.network.chat.package-info -> ng:
+net.minecraft.network.package-info -> nh:
+net.minecraft.network.protocol.Packet -> ni:
     void read(net.minecraft.network.FriendlyByteBuf) -> a
     void write(net.minecraft.network.FriendlyByteBuf) -> b
     void handle(net.minecraft.network.PacketListener) -> a
     16:16:boolean isSkippable() -> a
-net.minecraft.network.protocol.PacketFlow -> lu:
+net.minecraft.network.protocol.PacketFlow -> nj:
     net.minecraft.network.protocol.PacketFlow SERVERBOUND -> a
     net.minecraft.network.protocol.PacketFlow CLIENTBOUND -> b
     net.minecraft.network.protocol.PacketFlow[] $VALUES -> c
@@ -24030,17 +26589,16 @@ net.minecraft.network.protocol.PacketFlow -> lu:
     3:3:void <init>(java.lang.String,int) -> <init>
     9:9:net.minecraft.network.protocol.PacketFlow getOpposite() -> a
     3:5:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.PacketUtils -> lv:
+net.minecraft.network.protocol.PacketUtils -> nk:
     org.apache.logging.log4j.Logger LOGGER -> a
     10:10:void <init>() -> <init>
     14:15:void ensureRunningOnSameThread(net.minecraft.network.protocol.Packet,net.minecraft.network.PacketListener,net.minecraft.server.level.ServerLevel) -> a
     18:28:void ensureRunningOnSameThread(net.minecraft.network.protocol.Packet,net.minecraft.network.PacketListener,net.minecraft.util.thread.BlockableEventLoop) -> a
     20:25:void lambda$ensureRunningOnSameThread$0(net.minecraft.network.PacketListener,net.minecraft.network.protocol.Packet) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientGamePacketListener -> lw:
+net.minecraft.network.protocol.game.ClientGamePacketListener -> nl:
     void handleAddEntity(net.minecraft.network.protocol.game.ClientboundAddEntityPacket) -> a
     void handleAddExperienceOrb(net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket) -> a
-    void handleAddGlobalEntity(net.minecraft.network.protocol.game.ClientboundAddGlobalEntityPacket) -> a
     void handleAddMob(net.minecraft.network.protocol.game.ClientboundAddMobPacket) -> a
     void handleAddObjective(net.minecraft.network.protocol.game.ClientboundSetObjectivePacket) -> a
     void handleAddPainting(net.minecraft.network.protocol.game.ClientboundAddPaintingPacket) -> a
@@ -24087,12 +26645,12 @@ net.minecraft.network.protocol.game.ClientGamePacketListener -> lw:
     void handleSetDisplayObjective(net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket) -> a
     void handleSetEntityData(net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket) -> a
     void handleSetEntityMotion(net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket) -> a
-    void handleSetEquippedItem(net.minecraft.network.protocol.game.ClientboundSetEquippedItemPacket) -> a
+    void handleSetEquipment(net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket) -> a
     void handleSetExperience(net.minecraft.network.protocol.game.ClientboundSetExperiencePacket) -> a
     void handleSetHealth(net.minecraft.network.protocol.game.ClientboundSetHealthPacket) -> a
     void handleSetPlayerTeamPacket(net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket) -> a
     void handleSetScore(net.minecraft.network.protocol.game.ClientboundSetScorePacket) -> a
-    void handleSetSpawn(net.minecraft.network.protocol.game.ClientboundSetSpawnPositionPacket) -> a
+    void handleSetSpawn(net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket) -> a
     void handleSetTime(net.minecraft.network.protocol.game.ClientboundSetTimePacket) -> a
     void handleSoundEvent(net.minecraft.network.protocol.game.ClientboundSoundPacket) -> a
     void handleSoundEntityEvent(net.minecraft.network.protocol.game.ClientboundSoundEntityPacket) -> a
@@ -24128,7 +26686,7 @@ net.minecraft.network.protocol.game.ClientGamePacketListener -> lw:
     void handleSetChunkCacheRadius(net.minecraft.network.protocol.game.ClientboundSetChunkCacheRadiusPacket) -> a
     void handleSetChunkCacheCenter(net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket) -> a
     void handleBlockBreakAck(net.minecraft.network.protocol.game.ClientboundBlockBreakAckPacket) -> a
-net.minecraft.network.protocol.game.ClientboundAddEntityPacket -> lx:
+net.minecraft.network.protocol.game.ClientboundAddEntityPacket -> nm:
     int id -> a
     java.util.UUID uuid -> b
     double x -> c
@@ -24162,7 +26720,7 @@ net.minecraft.network.protocol.game.ClientboundAddEntityPacket -> lx:
     142:142:net.minecraft.world.entity.EntityType getType() -> l
     146:146:int getData() -> m
     15:15:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket -> ly:
+net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket -> nn:
     int id -> a
     double x -> b
     double y -> c
@@ -24179,24 +26737,7 @@ net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket -> ly:
     64:64:double getZ() -> e
     68:68:int getValue() -> f
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundAddGlobalEntityPacket -> lz:
-    int id -> a
-    double x -> b
-    double y -> c
-    double z -> d
-    int type -> e
-    20:21:void <init>() -> <init>
-    23:31:void <init>(net.minecraft.world.entity.Entity) -> <init>
-    35:40:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    44:49:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    53:54:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
-    57:57:int getId() -> b
-    61:61:double getX() -> c
-    65:65:double getY() -> d
-    69:69:double getZ() -> e
-    73:73:int getType() -> f
-    11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundAddMobPacket -> ma:
+net.minecraft.network.protocol.game.ClientboundAddMobPacket -> no:
     int id -> a
     java.util.UUID uuid -> b
     int type -> c
@@ -24227,7 +26768,7 @@ net.minecraft.network.protocol.game.ClientboundAddMobPacket -> ma:
     134:134:byte getxRot() -> l
     138:138:byte getyHeadRot() -> m
     14:14:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundAddPaintingPacket -> mb:
+net.minecraft.network.protocol.game.ClientboundAddPaintingPacket -> np:
     int id -> a
     java.util.UUID uuid -> b
     net.minecraft.core.BlockPos pos -> c
@@ -24244,7 +26785,7 @@ net.minecraft.network.protocol.game.ClientboundAddPaintingPacket -> mb:
     69:69:net.minecraft.core.Direction getDirection() -> e
     73:73:net.minecraft.world.entity.decoration.Motive getMotive() -> f
     15:15:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundAddPlayerPacket -> mc:
+net.minecraft.network.protocol.game.ClientboundAddPlayerPacket -> nq:
     int entityId -> a
     java.util.UUID playerId -> b
     double x -> c
@@ -24265,7 +26806,7 @@ net.minecraft.network.protocol.game.ClientboundAddPlayerPacket -> mc:
     81:81:byte getyRot() -> g
     85:85:byte getxRot() -> h
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundAnimatePacket -> md:
+net.minecraft.network.protocol.game.ClientboundAnimatePacket -> nr:
     int id -> a
     int action -> b
     21:22:void <init>() -> <init>
@@ -24276,7 +26817,7 @@ net.minecraft.network.protocol.game.ClientboundAnimatePacket -> md:
     47:47:int getId() -> b
     51:51:int getAction() -> c
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundAwardStatsPacket -> me:
+net.minecraft.network.protocol.game.ClientboundAwardStatsPacket -> ns:
     it.unimi.dsi.fastutil.objects.Object2IntMap stats -> a
     17:18:void <init>() -> <init>
     20:22:void <init>(it.unimi.dsi.fastutil.objects.Object2IntMap) -> <init>
@@ -24287,7 +26828,7 @@ net.minecraft.network.protocol.game.ClientboundAwardStatsPacket -> me:
     60:60:int getId(net.minecraft.stats.Stat) -> a
     64:64:java.util.Map getStats() -> b
     14:14:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundBlockBreakAckPacket -> mf:
+net.minecraft.network.protocol.game.ClientboundBlockBreakAckPacket -> nt:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.core.BlockPos pos -> c
     net.minecraft.world.level.block.state.BlockState state -> d
@@ -24304,7 +26845,7 @@ net.minecraft.network.protocol.game.ClientboundBlockBreakAckPacket -> mf:
     70:70:net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action action() -> e
     14:14:void handle(net.minecraft.network.PacketListener) -> a
     15:15:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket -> mg:
+net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket -> nu:
     int id -> a
     net.minecraft.core.BlockPos pos -> b
     int progress -> c
@@ -24317,7 +26858,7 @@ net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket -> mg:
     47:47:net.minecraft.core.BlockPos getPos() -> c
     51:51:int getProgress() -> d
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket -> mh:
+net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket -> nv:
     net.minecraft.core.BlockPos pos -> a
     int type -> b
     net.minecraft.nbt.CompoundTag tag -> c
@@ -24330,7 +26871,7 @@ net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket -> mh:
     63:63:int getType() -> c
     67:67:net.minecraft.nbt.CompoundTag getTag() -> d
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundBlockEventPacket -> mi:
+net.minecraft.network.protocol.game.ClientboundBlockEventPacket -> nw:
     net.minecraft.core.BlockPos pos -> a
     int b0 -> b
     int b1 -> c
@@ -24345,7 +26886,7 @@ net.minecraft.network.protocol.game.ClientboundBlockEventPacket -> mi:
     58:58:int getB1() -> d
     62:62:net.minecraft.world.level.block.Block getBlock() -> e
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket -> mj:
+net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket -> nx:
     net.minecraft.core.BlockPos pos -> a
     net.minecraft.world.level.block.state.BlockState blockState -> b
     17:18:void <init>() -> <init>
@@ -24356,7 +26897,7 @@ net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket -> mj:
     43:43:net.minecraft.world.level.block.state.BlockState getBlockState() -> b
     47:47:net.minecraft.core.BlockPos getPos() -> c
     13:13:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundBossEventPacket -> mk:
+net.minecraft.network.protocol.game.ClientboundBossEventPacket -> ny:
     java.util.UUID id -> a
     net.minecraft.network.protocol.game.ClientboundBossEventPacket$Operation operation -> b
     net.minecraft.network.chat.Component name -> c
@@ -24383,10 +26924,10 @@ net.minecraft.network.protocol.game.ClientboundBossEventPacket -> mk:
     157:157:boolean shouldPlayMusic() -> i
     161:161:boolean shouldCreateWorldFog() -> j
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundBossEventPacket$1 -> mk$1:
+net.minecraft.network.protocol.game.ClientboundBossEventPacket$1 -> ny$1:
     int[] $SwitchMap$net$minecraft$network$protocol$game$ClientboundBossEventPacket$Operation -> a
     46:46:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundBossEventPacket$Operation -> mk$a:
+net.minecraft.network.protocol.game.ClientboundBossEventPacket$Operation -> ny$a:
     net.minecraft.network.protocol.game.ClientboundBossEventPacket$Operation ADD -> a
     net.minecraft.network.protocol.game.ClientboundBossEventPacket$Operation REMOVE -> b
     net.minecraft.network.protocol.game.ClientboundBossEventPacket$Operation UPDATE_PCT -> c
@@ -24398,7 +26939,7 @@ net.minecraft.network.protocol.game.ClientboundBossEventPacket$Operation -> mk$a
     164:164:net.minecraft.network.protocol.game.ClientboundBossEventPacket$Operation valueOf(java.lang.String) -> valueOf
     164:164:void <init>(java.lang.String,int) -> <init>
     164:170:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket -> ml:
+net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket -> nz:
     net.minecraft.world.Difficulty difficulty -> a
     boolean locked -> b
     13:14:void <init>() -> <init>
@@ -24409,21 +26950,22 @@ net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket -> ml:
     39:39:boolean isLocked() -> b
     43:43:net.minecraft.world.Difficulty getDifficulty() -> c
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundChatPacket -> mm:
+net.minecraft.network.protocol.game.ClientboundChatPacket -> oa:
     net.minecraft.network.chat.Component message -> a
     net.minecraft.network.chat.ChatType type -> b
-    14:15:void <init>() -> <init>
-    18:19:void <init>(net.minecraft.network.chat.Component) -> <init>
-    21:24:void <init>(net.minecraft.network.chat.Component,net.minecraft.network.chat.ChatType) -> <init>
-    28:30:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    34:36:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    40:41:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
-    44:44:net.minecraft.network.chat.Component getMessage() -> b
-    48:48:boolean isSystem() -> c
-    52:52:net.minecraft.network.chat.ChatType getType() -> d
-    57:57:boolean isSkippable() -> a
-    10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket -> mn:
+    java.util.UUID sender -> c
+    16:17:void <init>() -> <init>
+    19:23:void <init>(net.minecraft.network.chat.Component,net.minecraft.network.chat.ChatType,java.util.UUID) -> <init>
+    27:30:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    34:37:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    41:42:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
+    45:45:net.minecraft.network.chat.Component getMessage() -> b
+    49:49:boolean isSystem() -> c
+    53:53:net.minecraft.network.chat.ChatType getType() -> d
+    57:57:java.util.UUID getSender() -> e
+    62:62:boolean isSkippable() -> a
+    11:11:void handle(net.minecraft.network.PacketListener) -> a
+net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket -> ob:
     net.minecraft.world.level.ChunkPos chunkPos -> a
     net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket$BlockUpdate[] updates -> b
     17:18:void <init>() -> <init>
@@ -24434,7 +26976,7 @@ net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket -> mn:
     56:56:net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket$BlockUpdate[] getUpdates() -> b
     13:13:void handle(net.minecraft.network.PacketListener) -> a
     13:13:net.minecraft.world.level.ChunkPos access$000(net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket) -> a
-net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket$BlockUpdate -> mn$a:
+net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket$BlockUpdate -> ob$a:
     short offset -> b
     net.minecraft.world.level.block.state.BlockState block -> c
     net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket this$0 -> a
@@ -24443,7 +26985,7 @@ net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket$BlockUpda
     74:74:net.minecraft.core.BlockPos getPos() -> a
     78:78:short getOffset() -> b
     82:82:net.minecraft.world.level.block.state.BlockState getBlock() -> c
-net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket -> mo:
+net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket -> oc:
     int id -> a
     com.mojang.brigadier.suggestion.Suggestions suggestions -> b
     19:20:void <init>() -> <init>
@@ -24454,7 +26996,7 @@ net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket -> mo:
     68:68:int getId() -> b
     72:72:com.mojang.brigadier.suggestion.Suggestions getSuggestions() -> c
     15:15:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundCommandsPacket -> mp:
+net.minecraft.network.protocol.game.ClientboundCommandsPacket -> od:
     com.mojang.brigadier.tree.RootCommandNode root -> a
     39:40:void <init>() -> <init>
     42:44:void <init>(com.mojang.brigadier.tree.RootCommandNode) -> <init>
@@ -24466,8 +27008,8 @@ net.minecraft.network.protocol.game.ClientboundCommandsPacket -> mp:
     181:182:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     185:185:com.mojang.brigadier.tree.RootCommandNode getRoot() -> b
     27:27:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundCommandsPacket$1 -> mp$1:
-net.minecraft.network.protocol.game.ClientboundCommandsPacket$Entry -> mp$a:
+net.minecraft.network.protocol.game.ClientboundCommandsPacket$1 -> od$1:
+net.minecraft.network.protocol.game.ClientboundCommandsPacket$Entry -> od$a:
     com.mojang.brigadier.builder.ArgumentBuilder builder -> a
     byte flags -> b
     int redirect -> c
@@ -24478,7 +27020,7 @@ net.minecraft.network.protocol.game.ClientboundCommandsPacket$Entry -> mp$a:
     216:216:int lambda$build$0(com.mojang.brigadier.context.CommandContext) -> a
     188:188:com.mojang.brigadier.tree.CommandNode access$000(net.minecraft.network.protocol.game.ClientboundCommandsPacket$Entry) -> a
     188:188:void <init>(com.mojang.brigadier.builder.ArgumentBuilder,byte,int,int[],net.minecraft.network.protocol.game.ClientboundCommandsPacket$1) -> <init>
-net.minecraft.network.protocol.game.ClientboundContainerAckPacket -> mq:
+net.minecraft.network.protocol.game.ClientboundContainerAckPacket -> oe:
     int containerId -> a
     short uid -> b
     boolean accepted -> c
@@ -24491,7 +27033,7 @@ net.minecraft.network.protocol.game.ClientboundContainerAckPacket -> mq:
     47:47:short getUid() -> c
     51:51:boolean isAccepted() -> d
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundContainerClosePacket -> mr:
+net.minecraft.network.protocol.game.ClientboundContainerClosePacket -> of:
     int containerId -> a
     12:13:void <init>() -> <init>
     15:17:void <init>(int) -> <init>
@@ -24500,7 +27042,7 @@ net.minecraft.network.protocol.game.ClientboundContainerClosePacket -> mr:
     31:32:void write(net.minecraft.network.FriendlyByteBuf) -> b
     35:35:int getContainerId() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket -> ms:
+net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket -> og:
     int containerId -> a
     java.util.List items -> b
     16:17:void <init>() -> <init>
@@ -24511,7 +27053,7 @@ net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket -> ms:
     52:52:int getContainerId() -> b
     56:56:java.util.List getItems() -> c
     12:12:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundContainerSetDataPacket -> mt:
+net.minecraft.network.protocol.game.ClientboundContainerSetDataPacket -> oh:
     int containerId -> a
     int id -> b
     int value -> c
@@ -24524,7 +27066,7 @@ net.minecraft.network.protocol.game.ClientboundContainerSetDataPacket -> mt:
     48:48:int getId() -> c
     52:52:int getValue() -> d
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket -> mu:
+net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket -> oi:
     int containerId -> a
     int slot -> b
     net.minecraft.world.item.ItemStack itemStack -> c
@@ -24537,7 +27079,7 @@ net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket -> mu:
     51:51:int getSlot() -> c
     55:55:net.minecraft.world.item.ItemStack getItem() -> d
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundCooldownPacket -> mv:
+net.minecraft.network.protocol.game.ClientboundCooldownPacket -> oj:
     net.minecraft.world.item.Item item -> a
     int duration -> b
     13:14:void <init>() -> <init>
@@ -24548,7 +27090,7 @@ net.minecraft.network.protocol.game.ClientboundCooldownPacket -> mv:
     39:39:net.minecraft.world.item.Item getItem() -> b
     43:43:int getDuration() -> c
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket -> mw:
+net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket -> ok:
     net.minecraft.resources.ResourceLocation BRAND -> a
     net.minecraft.resources.ResourceLocation DEBUG_PATHFINDING_PACKET -> b
     net.minecraft.resources.ResourceLocation DEBUG_NEIGHBORSUPDATE_PACKET -> c
@@ -24577,7 +27119,7 @@ net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket -> mw:
     73:73:net.minecraft.network.FriendlyByteBuf getData() -> c
     10:10:void handle(net.minecraft.network.PacketListener) -> a
     14:30:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundCustomSoundPacket -> mx:
+net.minecraft.network.protocol.game.ClientboundCustomSoundPacket -> ol:
     net.minecraft.resources.ResourceLocation name -> a
     net.minecraft.sounds.SoundSource source -> b
     int x -> c
@@ -24598,7 +27140,7 @@ net.minecraft.network.protocol.game.ClientboundCustomSoundPacket -> mx:
     82:82:float getPitch() -> h
     87:88:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundDisconnectPacket -> my:
+net.minecraft.network.protocol.game.ClientboundDisconnectPacket -> om:
     net.minecraft.network.chat.Component reason -> a
     12:13:void <init>() -> <init>
     15:17:void <init>(net.minecraft.network.chat.Component) -> <init>
@@ -24607,7 +27149,7 @@ net.minecraft.network.protocol.game.ClientboundDisconnectPacket -> my:
     31:32:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     35:35:net.minecraft.network.chat.Component getReason() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundEntityEventPacket -> mz:
+net.minecraft.network.protocol.game.ClientboundEntityEventPacket -> on:
     int entityId -> a
     byte eventId -> b
     15:16:void <init>() -> <init>
@@ -24618,7 +27160,7 @@ net.minecraft.network.protocol.game.ClientboundEntityEventPacket -> mz:
     41:41:net.minecraft.world.entity.Entity getEntity(net.minecraft.world.level.Level) -> a
     45:45:byte getEventId() -> b
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundExplodePacket -> na:
+net.minecraft.network.protocol.game.ClientboundExplodePacket -> oo:
     double x -> a
     double y -> b
     double z -> c
@@ -24641,7 +27183,7 @@ net.minecraft.network.protocol.game.ClientboundExplodePacket -> na:
     121:121:float getPower() -> h
     125:125:java.util.List getToBlow() -> i
     14:14:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundForgetLevelChunkPacket -> nb:
+net.minecraft.network.protocol.game.ClientboundForgetLevelChunkPacket -> op:
     int x -> a
     int z -> b
     12:13:void <init>() -> <init>
@@ -24652,20 +27194,38 @@ net.minecraft.network.protocol.game.ClientboundForgetLevelChunkPacket -> nb:
     38:38:int getX() -> b
     42:42:int getZ() -> c
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundGameEventPacket -> nc:
-    java.lang.String[] EVENT_LANGUAGE_ID -> a
-    int event -> b
-    float param -> c
-    36:37:void <init>() -> <init>
-    39:42:void <init>(int,float) -> <init>
-    46:48:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    52:54:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    58:59:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
-    62:62:int getEvent() -> b
-    66:66:float getParam() -> c
-    9:9:void handle(net.minecraft.network.PacketListener) -> a
-    29:29:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundHorseScreenOpenPacket -> nd:
+net.minecraft.network.protocol.game.ClientboundGameEventPacket -> oq:
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type NO_RESPAWN_BLOCK_AVAILABLE -> a
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type START_RAINING -> b
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type STOP_RAINING -> c
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type CHANGE_GAME_MODE -> d
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type WIN_GAME -> e
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type DEMO_EVENT -> f
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type ARROW_HIT_PLAYER -> g
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type RAIN_LEVEL_CHANGE -> h
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type THUNDER_LEVEL_CHANGE -> i
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type PUFFER_FISH_STING -> j
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type GUARDIAN_ELDER_EFFECT -> k
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type IMMEDIATE_RESPAWN -> l
+    net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type event -> m
+    float param -> n
+    45:46:void <init>() -> <init>
+    48:51:void <init>(net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type,float) -> <init>
+    55:57:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    61:63:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    67:68:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
+    71:71:net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type getEvent() -> b
+    75:75:float getParam() -> c
+    11:11:void handle(net.minecraft.network.PacketListener) -> a
+    23:34:void <clinit>() -> <clinit>
+net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type -> oq$a:
+    it.unimi.dsi.fastutil.ints.Int2ObjectMap TYPES -> a
+    int id -> b
+    17:20:void <init>(int) -> <init>
+    12:12:it.unimi.dsi.fastutil.ints.Int2ObjectMap access$000() -> a
+    12:12:int access$100(net.minecraft.network.protocol.game.ClientboundGameEventPacket$Type) -> a
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.network.protocol.game.ClientboundHorseScreenOpenPacket -> or:
     int containerId -> a
     int size -> b
     int entityId -> c
@@ -24678,7 +27238,7 @@ net.minecraft.network.protocol.game.ClientboundHorseScreenOpenPacket -> nd:
     46:46:int getSize() -> c
     50:50:int getEntityId() -> d
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundKeepAlivePacket -> ne:
+net.minecraft.network.protocol.game.ClientboundKeepAlivePacket -> os:
     long id -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(long) -> <init>
@@ -24687,7 +27247,7 @@ net.minecraft.network.protocol.game.ClientboundKeepAlivePacket -> ne:
     30:31:void write(net.minecraft.network.FriendlyByteBuf) -> b
     34:34:long getId() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundLevelChunkPacket -> nf:
+net.minecraft.network.protocol.game.ClientboundLevelChunkPacket -> ot:
     int x -> a
     int z -> b
     int availableSections -> c
@@ -24696,24 +27256,26 @@ net.minecraft.network.protocol.game.ClientboundLevelChunkPacket -> nf:
     byte[] buffer -> f
     java.util.List blockEntitiesTags -> g
     boolean fullChunk -> h
-    37:38:void <init>() -> <init>
-    40:74:void <init>(net.minecraft.world.level.chunk.LevelChunk,int) -> <init>
-    78:100:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    104:119:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    123:124:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
-    127:127:net.minecraft.network.FriendlyByteBuf getReadBuffer() -> b
-    131:133:io.netty.buffer.ByteBuf getWriteBuffer() -> j
-    137:152:int extractChunkData(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.level.chunk.LevelChunk,int) -> a
-    156:169:int calculateChunkSize(net.minecraft.world.level.chunk.LevelChunk,int) -> a
-    173:173:int getX() -> c
-    177:177:int getZ() -> d
-    181:181:int getAvailableSections() -> e
-    185:185:boolean isFullChunk() -> f
-    189:189:net.minecraft.nbt.CompoundTag getHeightmaps() -> g
-    193:193:java.util.List getBlockEntitiesTags() -> h
-    198:198:net.minecraft.world.level.chunk.ChunkBiomeContainer getBiomes() -> i
+    boolean forgetOldData -> i
+    38:39:void <init>() -> <init>
+    41:76:void <init>(net.minecraft.world.level.chunk.LevelChunk,int,boolean) -> <init>
+    80:103:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    107:123:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    127:128:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
+    131:131:net.minecraft.network.FriendlyByteBuf getReadBuffer() -> b
+    135:137:io.netty.buffer.ByteBuf getWriteBuffer() -> k
+    141:156:int extractChunkData(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.level.chunk.LevelChunk,int) -> a
+    160:173:int calculateChunkSize(net.minecraft.world.level.chunk.LevelChunk,int) -> a
+    177:177:int getX() -> c
+    181:181:int getZ() -> d
+    185:185:int getAvailableSections() -> e
+    189:189:boolean isFullChunk() -> f
+    193:193:boolean forgetOldData() -> g
+    197:197:net.minecraft.nbt.CompoundTag getHeightmaps() -> h
+    201:201:java.util.List getBlockEntitiesTags() -> i
+    206:206:net.minecraft.world.level.chunk.ChunkBiomeContainer getBiomes() -> j
     23:23:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundLevelEventPacket -> ng:
+net.minecraft.network.protocol.game.ClientboundLevelEventPacket -> ou:
     int type -> a
     net.minecraft.core.BlockPos pos -> b
     int data -> c
@@ -24728,7 +27290,7 @@ net.minecraft.network.protocol.game.ClientboundLevelEventPacket -> ng:
     56:56:int getData() -> d
     60:60:net.minecraft.core.BlockPos getPos() -> e
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket -> nh:
+net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket -> ov:
     double x -> a
     double y -> b
     double z -> c
@@ -24756,7 +27318,7 @@ net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket -> nh:
     115:115:net.minecraft.core.particles.ParticleOptions getParticle() -> k
     120:121:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     13:13:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundLightUpdatePacket -> ni:
+net.minecraft.network.protocol.game.ClientboundLightUpdatePacket -> ow:
     int x -> a
     int z -> b
     int skyYMask -> c
@@ -24765,49 +27327,61 @@ net.minecraft.network.protocol.game.ClientboundLightUpdatePacket -> ni:
     int emptyBlockYMask -> f
     java.util.List skyUpdates -> g
     java.util.List blockUpdates -> h
-    26:27:void <init>() -> <init>
-    29:54:void <init>(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.lighting.LevelLightEngine) -> <init>
-    56:87:void <init>(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.lighting.LevelLightEngine,int,int) -> <init>
-    91:109:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    113:125:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    129:130:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
-    133:133:int getX() -> b
-    137:137:int getZ() -> c
-    141:141:int getSkyYMask() -> d
-    145:145:int getEmptySkyYMask() -> e
-    149:149:java.util.List getSkyUpdates() -> f
-    153:153:int getBlockYMask() -> g
-    157:157:int getEmptyBlockYMask() -> h
-    161:161:java.util.List getBlockUpdates() -> i
+    boolean trustEdges -> i
+    27:28:void <init>() -> <init>
+    30:56:void <init>(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.lighting.LevelLightEngine,boolean) -> <init>
+    58:90:void <init>(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.lighting.LevelLightEngine,int,int,boolean) -> <init>
+    94:113:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    117:130:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    134:135:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
+    138:138:int getX() -> b
+    142:142:int getZ() -> c
+    146:146:int getSkyYMask() -> d
+    150:150:int getEmptySkyYMask() -> e
+    154:154:java.util.List getSkyUpdates() -> f
+    158:158:int getBlockYMask() -> g
+    162:162:int getEmptyBlockYMask() -> h
+    166:166:java.util.List getBlockUpdates() -> i
+    170:170:boolean getTrustEdges() -> j
     16:16:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundLoginPacket -> nj:
+net.minecraft.network.protocol.game.ClientboundLoginPacket -> ox:
     int playerId -> a
     long seed -> b
     boolean hardcore -> c
     net.minecraft.world.level.GameType gameType -> d
-    net.minecraft.world.level.dimension.DimensionType dimension -> e
-    int maxPlayers -> f
-    net.minecraft.world.level.LevelType levelType -> g
-    int chunkRadius -> h
-    boolean reducedDebugInfo -> i
-    boolean showDeathScreen -> j
-    27:28:void <init>() -> <init>
-    30:41:void <init>(int,net.minecraft.world.level.GameType,long,boolean,net.minecraft.world.level.dimension.DimensionType,int,net.minecraft.world.level.LevelType,int,boolean,boolean) -> <init>
-    45:62:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    66:79:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    83:84:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
-    87:87:int getPlayerId() -> b
-    91:91:long getSeed() -> c
-    95:95:boolean isHardcore() -> d
-    99:99:net.minecraft.world.level.GameType getGameType() -> e
-    103:103:net.minecraft.world.level.dimension.DimensionType getDimension() -> f
-    107:107:int getMaxPlayers() -> g
-    111:111:net.minecraft.world.level.LevelType getLevelType() -> h
-    115:115:int getChunkRadius() -> i
-    119:119:boolean isReducedDebugInfo() -> j
-    122:122:boolean shouldShowDeathScreen() -> k
-    13:13:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundMapItemDataPacket -> nk:
+    net.minecraft.world.level.GameType previousGameType -> e
+    java.util.Set levels -> f
+    net.minecraft.core.RegistryAccess$RegistryHolder registryHolder -> g
+    net.minecraft.resources.ResourceKey dimensionType -> h
+    net.minecraft.resources.ResourceKey dimension -> i
+    int maxPlayers -> j
+    int chunkRadius -> k
+    boolean reducedDebugInfo -> l
+    boolean showDeathScreen -> m
+    boolean isDebug -> n
+    boolean isFlat -> o
+    37:38:void <init>() -> <init>
+    40:56:void <init>(int,net.minecraft.world.level.GameType,net.minecraft.world.level.GameType,long,boolean,java.util.Set,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey,int,int,boolean,boolean,boolean,boolean) -> <init>
+    60:84:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    88:111:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    115:116:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
+    119:119:int getPlayerId() -> b
+    123:123:long getSeed() -> c
+    127:127:boolean isHardcore() -> d
+    131:131:net.minecraft.world.level.GameType getGameType() -> e
+    135:135:net.minecraft.world.level.GameType getPreviousGameType() -> f
+    139:139:java.util.Set levels() -> g
+    143:143:net.minecraft.core.RegistryAccess registryAccess() -> h
+    147:147:net.minecraft.resources.ResourceKey getDimensionType() -> i
+    151:151:net.minecraft.resources.ResourceKey getDimension() -> j
+    155:155:int getMaxPlayers() -> k
+    159:159:int getChunkRadius() -> l
+    163:163:boolean isReducedDebugInfo() -> m
+    166:166:boolean shouldShowDeathScreen() -> n
+    169:169:boolean isDebug() -> o
+    173:173:boolean isFlat() -> p
+    18:18:void handle(net.minecraft.network.PacketListener) -> a
+net.minecraft.network.protocol.game.ClientboundMapItemDataPacket -> oy:
     int mapId -> a
     byte scale -> b
     boolean trackingPosition -> c
@@ -24827,7 +27401,7 @@ net.minecraft.network.protocol.game.ClientboundMapItemDataPacket -> nk:
     104:117:void applyToMap(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
     120:120:byte getScale() -> c
     12:12:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundMerchantOffersPacket -> nl:
+net.minecraft.network.protocol.game.ClientboundMerchantOffersPacket -> oz:
     int containerId -> a
     net.minecraft.world.item.trading.MerchantOffers offers -> b
     int villagerLevel -> c
@@ -24846,7 +27420,7 @@ net.minecraft.network.protocol.game.ClientboundMerchantOffersPacket -> nl:
     72:72:boolean showProgress() -> f
     76:76:boolean canRestock() -> g
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundMoveEntityPacket -> nm:
+net.minecraft.network.protocol.game.ClientboundMoveEntityPacket -> pa:
     int entityId -> a
     short xa -> b
     short ya -> c
@@ -24874,25 +27448,25 @@ net.minecraft.network.protocol.game.ClientboundMoveEntityPacket -> nm:
     197:197:boolean hasPosition() -> h
     201:201:boolean isOnGround() -> i
     12:12:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$Pos -> nm$a:
+net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$Pos -> pa$a:
     78:80:void <init>() -> <init>
     83:90:void <init>(int,short,short,short,boolean) -> <init>
     94:99:void read(net.minecraft.network.FriendlyByteBuf) -> a
     103:108:void write(net.minecraft.network.FriendlyByteBuf) -> b
     77:77:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$PosRot -> nm$b:
+net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$PosRot -> pa$b:
     36:39:void <init>() -> <init>
     42:52:void <init>(int,short,short,short,byte,byte,boolean) -> <init>
     56:63:void read(net.minecraft.network.FriendlyByteBuf) -> a
     67:74:void write(net.minecraft.network.FriendlyByteBuf) -> b
     35:35:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$Rot -> nm$c:
+net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$Rot -> pa$c:
     112:114:void <init>() -> <init>
     117:122:void <init>(int,byte,byte,boolean) -> <init>
     126:130:void read(net.minecraft.network.FriendlyByteBuf) -> a
     134:138:void write(net.minecraft.network.FriendlyByteBuf) -> b
     111:111:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundMoveVehiclePacket -> nn:
+net.minecraft.network.protocol.game.ClientboundMoveVehiclePacket -> pb:
     double x -> a
     double y -> b
     double z -> c
@@ -24909,7 +27483,7 @@ net.minecraft.network.protocol.game.ClientboundMoveVehiclePacket -> nn:
     63:63:float getYRot() -> e
     67:67:float getXRot() -> f
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundOpenBookPacket -> no:
+net.minecraft.network.protocol.game.ClientboundOpenBookPacket -> pc:
     net.minecraft.world.InteractionHand hand -> a
     12:13:void <init>() -> <init>
     15:17:void <init>(net.minecraft.world.InteractionHand) -> <init>
@@ -24918,7 +27492,7 @@ net.minecraft.network.protocol.game.ClientboundOpenBookPacket -> no:
     31:32:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     35:35:net.minecraft.world.InteractionHand getHand() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundOpenScreenPacket -> np:
+net.minecraft.network.protocol.game.ClientboundOpenScreenPacket -> pd:
     int containerId -> a
     int type -> b
     net.minecraft.network.chat.Component title -> c
@@ -24931,7 +27505,7 @@ net.minecraft.network.protocol.game.ClientboundOpenScreenPacket -> np:
     51:51:net.minecraft.world.inventory.MenuType getType() -> c
     55:55:net.minecraft.network.chat.Component getTitle() -> d
     12:12:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket -> nq:
+net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket -> pe:
     net.minecraft.core.BlockPos pos -> a
     12:13:void <init>() -> <init>
     15:17:void <init>(net.minecraft.core.BlockPos) -> <init>
@@ -24940,7 +27514,7 @@ net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket -> nq:
     31:32:void write(net.minecraft.network.FriendlyByteBuf) -> b
     35:35:net.minecraft.core.BlockPos getPos() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket -> nr:
+net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket -> pf:
     int containerId -> a
     net.minecraft.resources.ResourceLocation recipe -> b
     14:15:void <init>() -> <init>
@@ -24951,7 +27525,7 @@ net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket -> nr:
     38:40:void write(net.minecraft.network.FriendlyByteBuf) -> b
     44:45:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket -> ns:
+net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket -> pg:
     boolean invulnerable -> a
     boolean isFlying -> b
     boolean canFly -> c
@@ -24964,19 +27538,13 @@ net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket -> ns:
     49:67:void write(net.minecraft.network.FriendlyByteBuf) -> b
     71:72:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     75:75:boolean isInvulnerable() -> b
-    79:80:void setInvulnerable(boolean) -> a
-    83:83:boolean isFlying() -> c
-    87:88:void setFlying(boolean) -> b
-    91:91:boolean canFly() -> d
-    95:96:void setCanFly(boolean) -> c
-    99:99:boolean canInstabuild() -> e
-    103:104:void setInstabuild(boolean) -> d
-    107:107:float getFlyingSpeed() -> f
-    111:112:void setFlyingSpeed(float) -> a
-    115:115:float getWalkingSpeed() -> g
-    119:120:void setWalkingSpeed(float) -> b
+    79:79:boolean isFlying() -> c
+    83:83:boolean canFly() -> d
+    87:87:boolean canInstabuild() -> e
+    91:91:float getFlyingSpeed() -> f
+    95:95:float getWalkingSpeed() -> g
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket -> nt:
+net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket -> ph:
     net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket$Event event -> a
     int playerId -> b
     int killerId -> c
@@ -24990,10 +27558,10 @@ net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket -> nt:
     81:82:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     86:86:boolean isSkippable() -> a
     12:12:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket$1 -> nt$1:
+net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket$1 -> ph$1:
     int[] $SwitchMap$net$minecraft$network$protocol$game$ClientboundPlayerCombatPacket$Event -> a
     38:38:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket$Event -> nt$a:
+net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket$Event -> ph$a:
     net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket$Event ENTER_COMBAT -> a
     net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket$Event END_COMBAT -> b
     net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket$Event ENTITY_DIED -> c
@@ -25002,7 +27570,7 @@ net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket$Event -> nt$a:
     13:13:net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket$Event valueOf(java.lang.String) -> valueOf
     13:13:void <init>(java.lang.String,int) -> <init>
     13:16:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket -> nu:
+net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket -> pi:
     net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action action -> a
     java.util.List entries -> b
     20:23:void <init>() -> <init>
@@ -25015,10 +27583,10 @@ net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket -> nu:
     160:160:net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action getAction() -> c
     174:177:java.lang.String toString() -> toString
     18:18:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$1 -> nu$1:
+net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$1 -> pi$1:
     int[] $SwitchMap$net$minecraft$network$protocol$game$ClientboundPlayerInfoPacket$Action -> a
     52:52:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action -> nu$a:
+net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action -> pi$a:
     net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action ADD_PLAYER -> a
     net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action UPDATE_GAME_MODE -> b
     net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action UPDATE_LATENCY -> c
@@ -25029,7 +27597,7 @@ net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action -> nu$a:
     163:163:net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action valueOf(java.lang.String) -> valueOf
     163:163:void <init>(java.lang.String,int) -> <init>
     163:168:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$PlayerUpdate -> nu$b:
+net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$PlayerUpdate -> pi$b:
     int latency -> b
     net.minecraft.world.level.GameType gameMode -> c
     com.mojang.authlib.GameProfile profile -> d
@@ -25041,7 +27609,7 @@ net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$PlayerUpdate ->
     202:202:net.minecraft.world.level.GameType getGameMode() -> c
     207:207:net.minecraft.network.chat.Component getDisplayName() -> d
     212:217:java.lang.String toString() -> toString
-net.minecraft.network.protocol.game.ClientboundPlayerLookAtPacket -> nv:
+net.minecraft.network.protocol.game.ClientboundPlayerLookAtPacket -> pj:
     double x -> a
     double y -> b
     double z -> c
@@ -25058,7 +27626,7 @@ net.minecraft.network.protocol.game.ClientboundPlayerLookAtPacket -> nv:
     75:75:net.minecraft.commands.arguments.EntityAnchorArgument$Anchor getFromAnchor() -> b
     80:87:net.minecraft.world.phys.Vec3 getPosition(net.minecraft.world.level.Level) -> a
     13:13:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket -> nw:
+net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket -> pk:
     double x -> a
     double y -> b
     double z -> c
@@ -25079,7 +27647,7 @@ net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket -> nw:
     80:80:int getId() -> g
     84:84:java.util.Set getRelativeArguments() -> h
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket$RelativeArgument -> nw$a:
+net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket$RelativeArgument -> pk$a:
     net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket$RelativeArgument X -> a
     net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket$RelativeArgument Y -> b
     net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket$RelativeArgument Z -> c
@@ -25095,7 +27663,7 @@ net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket$RelativeArgu
     110:118:java.util.Set unpack(int) -> a
     122:128:int pack(java.util.Set) -> a
     87:92:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundRecipePacket -> nx:
+net.minecraft.network.protocol.game.ClientboundRecipePacket -> pl:
     net.minecraft.network.protocol.game.ClientboundRecipePacket$State state -> a
     java.util.List recipes -> b
     java.util.List toHighlight -> c
@@ -25116,7 +27684,7 @@ net.minecraft.network.protocol.game.ClientboundRecipePacket -> nx:
     111:111:boolean isFurnaceFilteringCraftable() -> g
     115:115:net.minecraft.network.protocol.game.ClientboundRecipePacket$State getState() -> h
     13:13:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundRecipePacket$State -> nx$a:
+net.minecraft.network.protocol.game.ClientboundRecipePacket$State -> pl$a:
     net.minecraft.network.protocol.game.ClientboundRecipePacket$State INIT -> a
     net.minecraft.network.protocol.game.ClientboundRecipePacket$State ADD -> b
     net.minecraft.network.protocol.game.ClientboundRecipePacket$State REMOVE -> c
@@ -25125,7 +27693,7 @@ net.minecraft.network.protocol.game.ClientboundRecipePacket$State -> nx$a:
     14:14:net.minecraft.network.protocol.game.ClientboundRecipePacket$State valueOf(java.lang.String) -> valueOf
     14:14:void <init>(java.lang.String,int) -> <init>
     14:15:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket -> ny:
+net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket -> pm:
     int[] entityIds -> a
     14:15:void <init>() -> <init>
     17:19:void <init>(int[]) -> <init>
@@ -25134,7 +27702,7 @@ net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket -> ny:
     41:42:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     45:45:int[] getEntityIds() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket -> nz:
+net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket -> pn:
     int entityId -> a
     net.minecraft.world.effect.MobEffect effect -> b
     16:17:void <init>() -> <init>
@@ -25145,7 +27713,7 @@ net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket -> nz:
     43:43:net.minecraft.world.entity.Entity getEntity(net.minecraft.world.level.Level) -> a
     48:48:net.minecraft.world.effect.MobEffect getEffect() -> b
     12:12:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundResourcePackPacket -> oa:
+net.minecraft.network.protocol.game.ClientboundResourcePackPacket -> po:
     java.lang.String url -> a
     java.lang.String hash -> b
     15:16:void <init>() -> <init>
@@ -25156,22 +27724,30 @@ net.minecraft.network.protocol.game.ClientboundResourcePackPacket -> oa:
     45:45:java.lang.String getUrl() -> b
     49:49:java.lang.String getHash() -> c
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundRespawnPacket -> ob:
-    net.minecraft.world.level.dimension.DimensionType dimension -> a
-    long seed -> b
-    net.minecraft.world.level.GameType playerGameType -> c
-    net.minecraft.world.level.LevelType levelType -> d
-    18:19:void <init>() -> <init>
-    21:26:void <init>(net.minecraft.world.level.dimension.DimensionType,long,net.minecraft.world.level.LevelType,net.minecraft.world.level.GameType) -> <init>
-    30:31:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
-    35:42:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    46:50:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    53:53:net.minecraft.world.level.dimension.DimensionType getDimension() -> b
-    57:57:long getSeed() -> c
-    61:61:net.minecraft.world.level.GameType getPlayerGameType() -> d
-    65:65:net.minecraft.world.level.LevelType getLevelType() -> e
-    12:12:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundRotateHeadPacket -> oc:
+net.minecraft.network.protocol.game.ClientboundRespawnPacket -> pp:
+    net.minecraft.resources.ResourceKey dimensionType -> a
+    net.minecraft.resources.ResourceKey dimension -> b
+    long seed -> c
+    net.minecraft.world.level.GameType playerGameType -> d
+    net.minecraft.world.level.GameType previousPlayerGameType -> e
+    boolean isDebug -> f
+    boolean isFlat -> g
+    boolean keepAllPlayerData -> h
+    24:25:void <init>() -> <init>
+    27:36:void <init>(net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey,long,net.minecraft.world.level.GameType,net.minecraft.world.level.GameType,boolean,boolean,boolean) -> <init>
+    40:41:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
+    45:53:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    57:65:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    68:68:net.minecraft.resources.ResourceKey getDimensionType() -> b
+    72:72:net.minecraft.resources.ResourceKey getDimension() -> c
+    76:76:long getSeed() -> d
+    80:80:net.minecraft.world.level.GameType getPlayerGameType() -> e
+    84:84:net.minecraft.world.level.GameType getPreviousPlayerGameType() -> f
+    88:88:boolean isDebug() -> g
+    92:92:boolean isFlat() -> h
+    96:96:boolean shouldKeepAllPlayerData() -> i
+    14:14:void handle(net.minecraft.network.PacketListener) -> a
+net.minecraft.network.protocol.game.ClientboundRotateHeadPacket -> pq:
     int entityId -> a
     byte yHeadRot -> b
     15:16:void <init>() -> <init>
@@ -25182,7 +27758,7 @@ net.minecraft.network.protocol.game.ClientboundRotateHeadPacket -> oc:
     41:41:net.minecraft.world.entity.Entity getEntity(net.minecraft.world.level.Level) -> a
     45:45:byte getYHeadRot() -> b
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSelectAdvancementsTabPacket -> od:
+net.minecraft.network.protocol.game.ClientboundSelectAdvancementsTabPacket -> pr:
     net.minecraft.resources.ResourceLocation tab -> a
     14:15:void <init>() -> <init>
     17:19:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
@@ -25191,7 +27767,7 @@ net.minecraft.network.protocol.game.ClientboundSelectAdvancementsTabPacket -> od
     35:39:void write(net.minecraft.network.FriendlyByteBuf) -> b
     43:43:net.minecraft.resources.ResourceLocation getTab() -> b
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetBorderPacket -> oe:
+net.minecraft.network.protocol.game.ClientboundSetBorderPacket -> ps:
     net.minecraft.network.protocol.game.ClientboundSetBorderPacket$Type type -> a
     int newAbsoluteMaxSize -> b
     double newCenterX -> c
@@ -25208,10 +27784,10 @@ net.minecraft.network.protocol.game.ClientboundSetBorderPacket -> oe:
     109:110:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     113:143:void applyChanges(net.minecraft.world.level.border.WorldBorder) -> a
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetBorderPacket$1 -> oe$1:
+net.minecraft.network.protocol.game.ClientboundSetBorderPacket$1 -> ps$1:
     int[] $SwitchMap$net$minecraft$network$protocol$game$ClientboundSetBorderPacket$Type -> a
     39:39:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundSetBorderPacket$Type -> oe$a:
+net.minecraft.network.protocol.game.ClientboundSetBorderPacket$Type -> ps$a:
     net.minecraft.network.protocol.game.ClientboundSetBorderPacket$Type SET_SIZE -> a
     net.minecraft.network.protocol.game.ClientboundSetBorderPacket$Type LERP_SIZE -> b
     net.minecraft.network.protocol.game.ClientboundSetBorderPacket$Type SET_CENTER -> c
@@ -25223,7 +27799,7 @@ net.minecraft.network.protocol.game.ClientboundSetBorderPacket$Type -> oe$a:
     145:145:net.minecraft.network.protocol.game.ClientboundSetBorderPacket$Type valueOf(java.lang.String) -> valueOf
     145:145:void <init>(java.lang.String,int) -> <init>
     145:151:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundSetCameraPacket -> of:
+net.minecraft.network.protocol.game.ClientboundSetCameraPacket -> pt:
     int cameraId -> a
     14:15:void <init>() -> <init>
     17:19:void <init>(net.minecraft.world.entity.Entity) -> <init>
@@ -25232,7 +27808,7 @@ net.minecraft.network.protocol.game.ClientboundSetCameraPacket -> of:
     33:34:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     38:38:net.minecraft.world.entity.Entity getEntity(net.minecraft.world.level.Level) -> a
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket -> og:
+net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket -> pu:
     int slot -> a
     12:13:void <init>() -> <init>
     15:17:void <init>(int) -> <init>
@@ -25241,7 +27817,7 @@ net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket -> og:
     31:32:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     35:35:int getSlot() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket -> oh:
+net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket -> pv:
     int x -> a
     int z -> b
     12:13:void <init>() -> <init>
@@ -25252,7 +27828,7 @@ net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket -> oh:
     38:38:int getX() -> b
     42:42:int getZ() -> c
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetChunkCacheRadiusPacket -> oi:
+net.minecraft.network.protocol.game.ClientboundSetChunkCacheRadiusPacket -> pw:
     int radius -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(int) -> <init>
@@ -25261,7 +27837,16 @@ net.minecraft.network.protocol.game.ClientboundSetChunkCacheRadiusPacket -> oi:
     30:31:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     34:34:int getRadius() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket -> oj:
+net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket -> px:
+    net.minecraft.core.BlockPos pos -> a
+    12:13:void <init>() -> <init>
+    15:17:void <init>(net.minecraft.core.BlockPos) -> <init>
+    21:22:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    26:27:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    31:32:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
+    35:35:net.minecraft.core.BlockPos getPos() -> b
+    9:9:void handle(net.minecraft.network.PacketListener) -> a
+net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket -> py:
     int slot -> a
     java.lang.String objectiveName -> b
     15:16:void <init>() -> <init>
@@ -25272,7 +27857,7 @@ net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket -> oj:
     46:46:int getSlot() -> b
     51:51:java.lang.String getObjectiveName() -> c
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket -> ok:
+net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket -> pz:
     int id -> a
     java.util.List packedItems -> b
     15:16:void <init>() -> <init>
@@ -25283,7 +27868,7 @@ net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket -> ok:
     46:46:java.util.List getUnpackedData() -> b
     50:50:int getId() -> c
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket -> ol:
+net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket -> qa:
     int sourceId -> a
     int destId -> b
     14:15:void <init>() -> <init>
@@ -25294,7 +27879,7 @@ net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket -> ol:
     40:40:int getSourceId() -> b
     44:44:int getDestId() -> c
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket -> om:
+net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket -> qb:
     int id -> a
     int xa -> b
     int ya -> c
@@ -25310,20 +27895,18 @@ net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket -> om:
     65:65:int getYa() -> d
     69:69:int getZa() -> e
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetEquippedItemPacket -> on:
+net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket -> qc:
     int entity -> a
-    net.minecraft.world.entity.EquipmentSlot slot -> b
-    net.minecraft.world.item.ItemStack itemStack -> c
-    13:16:void <init>() -> <init>
-    13:22:void <init>(int,net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> <init>
-    26:29:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    33:36:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    40:41:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
-    44:44:net.minecraft.world.item.ItemStack getItem() -> b
-    48:48:int getEntity() -> c
-    52:52:net.minecraft.world.entity.EquipmentSlot getSlot() -> d
-    10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetExperiencePacket -> oo:
+    java.util.List slots -> b
+    18:20:void <init>() -> <init>
+    22:25:void <init>(int,java.util.List) -> <init>
+    29:41:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    45:56:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    60:61:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
+    64:64:int getEntity() -> b
+    68:68:java.util.List getSlots() -> c
+    13:13:void handle(net.minecraft.network.PacketListener) -> a
+net.minecraft.network.protocol.game.ClientboundSetExperiencePacket -> qd:
     float experienceProgress -> a
     int totalExperience -> b
     int experienceLevel -> c
@@ -25336,7 +27919,7 @@ net.minecraft.network.protocol.game.ClientboundSetExperiencePacket -> oo:
     46:46:int getTotalExperience() -> c
     50:50:int getExperienceLevel() -> d
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetHealthPacket -> op:
+net.minecraft.network.protocol.game.ClientboundSetHealthPacket -> qe:
     float health -> a
     int food -> b
     float saturation -> c
@@ -25349,7 +27932,7 @@ net.minecraft.network.protocol.game.ClientboundSetHealthPacket -> op:
     46:46:int getFood() -> c
     50:50:float getSaturation() -> d
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetObjectivePacket -> oq:
+net.minecraft.network.protocol.game.ClientboundSetObjectivePacket -> qf:
     java.lang.String objectiveName -> a
     net.minecraft.network.chat.Component displayName -> b
     net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType renderType -> c
@@ -25364,7 +27947,7 @@ net.minecraft.network.protocol.game.ClientboundSetObjectivePacket -> oq:
     67:67:int getMethod() -> d
     71:71:net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType getRenderType() -> e
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetPassengersPacket -> or:
+net.minecraft.network.protocol.game.ClientboundSetPassengersPacket -> qg:
     int vehicle -> a
     int[] passengers -> b
     14:15:void <init>() -> <init>
@@ -25375,7 +27958,7 @@ net.minecraft.network.protocol.game.ClientboundSetPassengersPacket -> or:
     45:45:int[] getPassengers() -> b
     49:49:int getVehicle() -> c
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket -> os:
+net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket -> qh:
     java.lang.String name -> a
     net.minecraft.network.chat.Component displayName -> b
     net.minecraft.network.chat.Component playerPrefix -> c
@@ -25403,7 +27986,7 @@ net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket -> os:
     158:158:net.minecraft.network.chat.Component getPlayerPrefix() -> j
     162:162:net.minecraft.network.chat.Component getPlayerSuffix() -> k
     16:16:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetScorePacket -> ot:
+net.minecraft.network.protocol.game.ClientboundSetScorePacket -> qi:
     java.lang.String owner -> a
     java.lang.String objectiveName -> b
     int score -> c
@@ -25418,16 +28001,7 @@ net.minecraft.network.protocol.game.ClientboundSetScorePacket -> ot:
     71:71:int getScore() -> d
     75:75:net.minecraft.server.ServerScoreboard$Method getMethod() -> e
     13:13:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetSpawnPositionPacket -> ou:
-    net.minecraft.core.BlockPos pos -> a
-    12:13:void <init>() -> <init>
-    15:17:void <init>(net.minecraft.core.BlockPos) -> <init>
-    21:22:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    26:27:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    31:32:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
-    35:35:net.minecraft.core.BlockPos getPos() -> b
-    9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetTimePacket -> ov:
+net.minecraft.network.protocol.game.ClientboundSetTimePacket -> qj:
     long gameTime -> a
     long dayTime -> b
     12:13:void <init>() -> <init>
@@ -25438,7 +28012,7 @@ net.minecraft.network.protocol.game.ClientboundSetTimePacket -> ov:
     45:45:long getGameTime() -> b
     49:49:long getDayTime() -> c
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetTitlesPacket -> ow:
+net.minecraft.network.protocol.game.ClientboundSetTitlesPacket -> qk:
     net.minecraft.network.protocol.game.ClientboundSetTitlesPacket$Type type -> a
     net.minecraft.network.chat.Component text -> b
     int fadeInTime -> c
@@ -25457,7 +28031,7 @@ net.minecraft.network.protocol.game.ClientboundSetTitlesPacket -> ow:
     80:80:int getStayTime() -> e
     84:84:int getFadeOutTime() -> f
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSetTitlesPacket$Type -> ow$a:
+net.minecraft.network.protocol.game.ClientboundSetTitlesPacket$Type -> qk$a:
     net.minecraft.network.protocol.game.ClientboundSetTitlesPacket$Type TITLE -> a
     net.minecraft.network.protocol.game.ClientboundSetTitlesPacket$Type SUBTITLE -> b
     net.minecraft.network.protocol.game.ClientboundSetTitlesPacket$Type ACTIONBAR -> c
@@ -25469,7 +28043,7 @@ net.minecraft.network.protocol.game.ClientboundSetTitlesPacket$Type -> ow$a:
     87:87:net.minecraft.network.protocol.game.ClientboundSetTitlesPacket$Type valueOf(java.lang.String) -> valueOf
     87:87:void <init>(java.lang.String,int) -> <init>
     87:93:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ClientboundSoundEntityPacket -> ox:
+net.minecraft.network.protocol.game.ClientboundSoundEntityPacket -> ql:
     net.minecraft.sounds.SoundEvent sound -> a
     net.minecraft.sounds.SoundSource source -> b
     int id -> c
@@ -25486,7 +28060,7 @@ net.minecraft.network.protocol.game.ClientboundSoundEntityPacket -> ox:
     67:67:float getPitch() -> f
     72:73:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     13:13:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundSoundPacket -> oy:
+net.minecraft.network.protocol.game.ClientboundSoundPacket -> qm:
     net.minecraft.sounds.SoundEvent sound -> a
     net.minecraft.sounds.SoundSource source -> b
     int x -> c
@@ -25507,7 +28081,7 @@ net.minecraft.network.protocol.game.ClientboundSoundPacket -> oy:
     84:84:float getPitch() -> h
     89:90:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     12:12:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundStopSoundPacket -> oz:
+net.minecraft.network.protocol.game.ClientboundStopSoundPacket -> qn:
     net.minecraft.resources.ResourceLocation name -> a
     net.minecraft.sounds.SoundSource source -> b
     18:19:void <init>() -> <init>
@@ -25518,7 +28092,7 @@ net.minecraft.network.protocol.game.ClientboundStopSoundPacket -> oz:
     65:65:net.minecraft.sounds.SoundSource getSource() -> c
     70:71:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundTabListPacket -> pa:
+net.minecraft.network.protocol.game.ClientboundTabListPacket -> qo:
     net.minecraft.network.chat.Component header -> a
     net.minecraft.network.chat.Component footer -> b
     13:14:void <init>() -> <init>
@@ -25529,7 +28103,7 @@ net.minecraft.network.protocol.game.ClientboundTabListPacket -> pa:
     39:39:net.minecraft.network.chat.Component getHeader() -> b
     43:43:net.minecraft.network.chat.Component getFooter() -> c
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundTagQueryPacket -> pb:
+net.minecraft.network.protocol.game.ClientboundTagQueryPacket -> qp:
     int transactionId -> a
     net.minecraft.nbt.CompoundTag tag -> b
     16:17:void <init>() -> <init>
@@ -25541,7 +28115,7 @@ net.minecraft.network.protocol.game.ClientboundTagQueryPacket -> pb:
     47:47:net.minecraft.nbt.CompoundTag getTag() -> c
     52:52:boolean isSkippable() -> a
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundTakeItemEntityPacket -> pc:
+net.minecraft.network.protocol.game.ClientboundTakeItemEntityPacket -> qq:
     int itemId -> a
     int playerId -> b
     int amount -> c
@@ -25554,7 +28128,7 @@ net.minecraft.network.protocol.game.ClientboundTakeItemEntityPacket -> pc:
     46:46:int getPlayerId() -> c
     50:50:int getAmount() -> d
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket -> pd:
+net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket -> qr:
     int id -> a
     double x -> b
     double y -> c
@@ -25575,7 +28149,7 @@ net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket -> pd:
     79:79:byte getxRot() -> g
     83:83:boolean isOnGround() -> h
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket -> pe:
+net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket -> qs:
     boolean reset -> a
     java.util.Map added -> b
     java.util.Set removed -> c
@@ -25590,27 +28164,27 @@ net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket -> pe:
     100:100:java.util.Map getProgress() -> d
     104:104:boolean shouldReset() -> e
     16:16:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket -> pf:
+net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket -> qt:
     int entityId -> a
     java.util.List attributes -> b
-    17:20:void <init>() -> <init>
-    17:28:void <init>(int,java.util.Collection) -> <init>
-    32:48:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    52:66:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    70:71:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
-    74:74:int getEntityId() -> b
-    78:78:java.util.List getValues() -> c
-    15:15:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket$AttributeSnapshot -> pf$a:
-    java.lang.String name -> b
+    19:22:void <init>() -> <init>
+    19:30:void <init>(int,java.util.Collection) -> <init>
+    34:51:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    55:69:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    73:74:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
+    77:77:int getEntityId() -> b
+    81:81:java.util.List getValues() -> c
+    17:17:void handle(net.minecraft.network.PacketListener) -> a
+net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket$AttributeSnapshot -> qt$a:
+    net.minecraft.world.entity.ai.attributes.Attribute attribute -> b
     double base -> c
     java.util.Collection modifiers -> d
     net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket this$0 -> a
-    86:90:void <init>(net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket,java.lang.String,double,java.util.Collection) -> <init>
-    93:93:java.lang.String getName() -> a
-    97:97:double getBase() -> b
-    101:101:java.util.Collection getModifiers() -> c
-net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket -> pg:
+    89:93:void <init>(net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket,net.minecraft.world.entity.ai.attributes.Attribute,double,java.util.Collection) -> <init>
+    96:96:net.minecraft.world.entity.ai.attributes.Attribute getAttribute() -> a
+    100:100:double getBase() -> b
+    104:104:java.util.Collection getModifiers() -> c
+net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket -> qu:
     int entityId -> a
     byte effectId -> b
     byte effectAmplifier -> c
@@ -25630,7 +28204,7 @@ net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket -> pg:
     97:97:boolean isEffectAmbient() -> h
     101:101:boolean effectShowsIcon() -> i
     13:13:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket -> ph:
+net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket -> qv:
     java.util.List recipes -> a
     18:19:void <init>() -> <init>
     21:23:void <init>(java.util.Collection) -> <init>
@@ -25642,7 +28216,7 @@ net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket -> ph:
     62:65:void toNetwork(net.minecraft.world.item.crafting.Recipe,net.minecraft.network.FriendlyByteBuf) -> a
     15:15:void handle(net.minecraft.network.PacketListener) -> a
     56:56:java.lang.IllegalArgumentException lambda$fromNetwork$0(net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket -> pi:
+net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket -> qw:
     net.minecraft.tags.TagManager tags -> a
     12:13:void <init>() -> <init>
     15:17:void <init>(net.minecraft.tags.TagManager) -> <init>
@@ -25651,46 +28225,47 @@ net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket -> pi:
     31:32:void handle(net.minecraft.network.protocol.game.ClientGamePacketListener) -> a
     35:35:net.minecraft.tags.TagManager getTags() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.DebugMobNameGenerator -> pj:
+net.minecraft.network.protocol.game.DebugEntityNameGenerator -> qx:
     java.lang.String[] NAMES_FIRST_PART -> a
     java.lang.String[] NAMES_SECOND_PART -> b
-    11:11:void <init>() -> <init>
-    28:29:java.lang.String getMobName(java.util.UUID) -> a
-    33:33:java.lang.String getRandomString(java.util.Random,java.lang.String[]) -> a
-    38:38:java.util.Random getRandom(java.util.UUID) -> b
-    12:17:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.DebugPackets -> pk:
+    16:16:void <init>() -> <init>
+    31:38:java.lang.String getEntityName(net.minecraft.world.entity.Entity) -> a
+    47:48:java.lang.String getEntityName(java.util.UUID) -> a
+    52:52:java.lang.String getRandomString(java.util.Random,java.lang.String[]) -> a
+    57:57:java.util.Random getRandom(java.util.UUID) -> b
+    17:24:void <clinit>() -> <clinit>
+net.minecraft.network.protocol.game.DebugPackets -> qy:
     org.apache.logging.log4j.Logger LOGGER -> a
-    65:65:void <init>() -> <init>
-    69:76:void sendGameTestAddMarker(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.lang.String,int,int) -> a
-    79:82:void sendGameTestClearPacket(net.minecraft.server.level.ServerLevel) -> a
-    86:86:void sendPoiPacketsForChunk(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.ChunkPos) -> a
-    96:96:void sendPoiAddedPacket(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-    122:122:void sendPoiRemovedPacket(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> b
-    141:141:void sendPoiTicketCountPacket(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> c
-    154:154:void sendVillageSectionsPacket(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> d
-    200:200:void sendPathFindingPacket(net.minecraft.world.level.Level,net.minecraft.world.entity.Mob,net.minecraft.world.level.pathfinder.Path,float) -> a
-    214:214:void sendNeighborsUpdatePacket(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    247:247:void sendStructurePacket(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
-    268:268:void sendGoalSelector(net.minecraft.world.level.Level,net.minecraft.world.entity.Mob,net.minecraft.world.entity.ai.goal.GoalSelector) -> a
-    272:272:void sendRaids(net.minecraft.server.level.ServerLevel,java.util.Collection) -> a
-    283:283:void sendEntityBrain(net.minecraft.world.entity.LivingEntity) -> a
-    313:313:void sendBeeInfo(net.minecraft.world.entity.animal.Bee) -> a
-    375:375:void sendHiveInfo(net.minecraft.world.level.block.entity.BeehiveBlockEntity) -> a
-    406:476:void writeBrain(net.minecraft.world.entity.LivingEntity,net.minecraft.network.FriendlyByteBuf) -> a
-    482:498:java.util.List getMemoryDescriptions(long,net.minecraft.world.entity.ai.Brain) -> a
-    509:533:java.lang.String getShortDescription(java.lang.Object) -> a
-    538:542:void sendPacketToAllPlayers(net.minecraft.server.level.ServerLevel,net.minecraft.network.FriendlyByteBuf,net.minecraft.resources.ResourceLocation) -> a
-    466:470:void lambda$writeBrain$7(java.util.List,java.util.UUID,it.unimi.dsi.fastutil.objects.Object2IntMap) -> a
-    468:469:void lambda$null$6(java.util.List,java.lang.String,net.minecraft.world.entity.ai.gossip.GossipType,java.lang.Integer) -> a
-    449:451:void lambda$writeBrain$5(net.minecraft.network.FriendlyByteBuf,java.lang.String) -> a
-    437:437:void lambda$writeBrain$4(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.entity.schedule.Activity) -> a
-    277:277:void lambda$sendRaids$3(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.entity.raid.Raid) -> a
-    258:261:void lambda$sendGoalSelector$2(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.entity.ai.goal.WrappedGoal) -> a
-    91:91:void lambda$sendPoiPacketsForChunk$1(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
-    90:90:boolean lambda$sendPoiPacketsForChunk$0(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-    66:66:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ServerGamePacketListener -> pl:
+    68:68:void <init>() -> <init>
+    72:79:void sendGameTestAddMarker(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.lang.String,int,int) -> a
+    82:85:void sendGameTestClearPacket(net.minecraft.server.level.ServerLevel) -> a
+    89:89:void sendPoiPacketsForChunk(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.ChunkPos) -> a
+    98:101:void sendPoiAddedPacket(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    124:127:void sendPoiRemovedPacket(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> b
+    143:146:void sendPoiTicketCountPacket(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> c
+    157:157:void sendVillageSectionsPacket(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> d
+    203:203:void sendPathFindingPacket(net.minecraft.world.level.Level,net.minecraft.world.entity.Mob,net.minecraft.world.level.pathfinder.Path,float) -> a
+    217:217:void sendNeighborsUpdatePacket(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    250:250:void sendStructurePacket(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    271:271:void sendGoalSelector(net.minecraft.world.level.Level,net.minecraft.world.entity.Mob,net.minecraft.world.entity.ai.goal.GoalSelector) -> a
+    275:275:void sendRaids(net.minecraft.server.level.ServerLevel,java.util.Collection) -> a
+    286:286:void sendEntityBrain(net.minecraft.world.entity.LivingEntity) -> a
+    318:318:void sendBeeInfo(net.minecraft.world.entity.animal.Bee) -> a
+    380:380:void sendHiveInfo(net.minecraft.world.level.block.entity.BeehiveBlockEntity) -> a
+    411:496:void writeBrain(net.minecraft.world.entity.LivingEntity,net.minecraft.network.FriendlyByteBuf) -> a
+    502:525:java.util.List getMemoryDescriptions(net.minecraft.world.entity.LivingEntity,long) -> a
+    533:561:java.lang.String getShortDescription(net.minecraft.server.level.ServerLevel,java.lang.Object) -> a
+    566:570:void sendPacketToAllPlayers(net.minecraft.server.level.ServerLevel,net.minecraft.network.FriendlyByteBuf,net.minecraft.resources.ResourceLocation) -> a
+    486:490:void lambda$writeBrain$7(java.util.List,java.util.UUID,it.unimi.dsi.fastutil.objects.Object2IntMap) -> a
+    488:489:void lambda$null$6(java.util.List,java.lang.String,net.minecraft.world.entity.ai.gossip.GossipType,java.lang.Integer) -> a
+    453:455:void lambda$writeBrain$5(net.minecraft.network.FriendlyByteBuf,java.lang.String) -> a
+    442:442:void lambda$writeBrain$4(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.entity.schedule.Activity) -> a
+    280:280:void lambda$sendRaids$3(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.entity.raid.Raid) -> a
+    261:264:void lambda$sendGoalSelector$2(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.entity.ai.goal.WrappedGoal) -> a
+    94:94:void lambda$sendPoiPacketsForChunk$1(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
+    93:93:boolean lambda$sendPoiPacketsForChunk$0(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    69:69:void <clinit>() -> <clinit>
+net.minecraft.network.protocol.game.ServerGamePacketListener -> qz:
     void handleAnimate(net.minecraft.network.protocol.game.ServerboundSwingPacket) -> a
     void handleChat(net.minecraft.network.protocol.game.ServerboundChatPacket) -> a
     void handleClientCommand(net.minecraft.network.protocol.game.ServerboundClientCommandPacket) -> a
@@ -25732,9 +28307,10 @@ net.minecraft.network.protocol.game.ServerGamePacketListener -> pl:
     void handleEntityTagQuery(net.minecraft.network.protocol.game.ServerboundEntityTagQuery) -> a
     void handleBlockEntityTagQuery(net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery) -> a
     void handleSetJigsawBlock(net.minecraft.network.protocol.game.ServerboundSetJigsawBlockPacket) -> a
+    void handleJigsawGenerate(net.minecraft.network.protocol.game.ServerboundJigsawGeneratePacket) -> a
     void handleChangeDifficulty(net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket) -> a
     void handleLockDifficulty(net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket) -> a
-net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket -> pm:
+net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket -> ra:
     int id -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(int) -> <init>
@@ -25743,7 +28319,7 @@ net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket -> pm:
     30:31:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     34:34:int getId() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery -> pn:
+net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery -> rb:
     int transactionId -> a
     net.minecraft.core.BlockPos pos -> b
     14:15:void <init>() -> <init>
@@ -25754,7 +28330,7 @@ net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery -> pn:
     40:40:int getTransactionId() -> b
     44:44:net.minecraft.core.BlockPos getPos() -> c
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket -> po:
+net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket -> rc:
     net.minecraft.world.Difficulty difficulty -> a
     12:13:void <init>() -> <init>
     15:17:void <init>(net.minecraft.world.Difficulty) -> <init>
@@ -25763,7 +28339,7 @@ net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket -> po:
     31:32:void write(net.minecraft.network.FriendlyByteBuf) -> b
     35:35:net.minecraft.world.Difficulty getDifficulty() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundChatPacket -> pp:
+net.minecraft.network.protocol.game.ServerboundChatPacket -> rd:
     java.lang.String message -> a
     13:14:void <init>() -> <init>
     16:22:void <init>(java.lang.String) -> <init>
@@ -25772,7 +28348,7 @@ net.minecraft.network.protocol.game.ServerboundChatPacket -> pp:
     36:37:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     40:40:java.lang.String getMessage() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundClientCommandPacket -> pq:
+net.minecraft.network.protocol.game.ServerboundClientCommandPacket -> re:
     net.minecraft.network.protocol.game.ServerboundClientCommandPacket$Action action -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(net.minecraft.network.protocol.game.ServerboundClientCommandPacket$Action) -> <init>
@@ -25781,7 +28357,7 @@ net.minecraft.network.protocol.game.ServerboundClientCommandPacket -> pq:
     30:31:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     34:34:net.minecraft.network.protocol.game.ServerboundClientCommandPacket$Action getAction() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundClientCommandPacket$Action -> pq$a:
+net.minecraft.network.protocol.game.ServerboundClientCommandPacket$Action -> re$a:
     net.minecraft.network.protocol.game.ServerboundClientCommandPacket$Action PERFORM_RESPAWN -> a
     net.minecraft.network.protocol.game.ServerboundClientCommandPacket$Action REQUEST_STATS -> b
     net.minecraft.network.protocol.game.ServerboundClientCommandPacket$Action[] $VALUES -> c
@@ -25789,7 +28365,7 @@ net.minecraft.network.protocol.game.ServerboundClientCommandPacket$Action -> pq$
     37:37:net.minecraft.network.protocol.game.ServerboundClientCommandPacket$Action valueOf(java.lang.String) -> valueOf
     37:37:void <init>(java.lang.String,int) -> <init>
     37:39:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ServerboundClientInformationPacket -> pr:
+net.minecraft.network.protocol.game.ServerboundClientInformationPacket -> rf:
     java.lang.String language -> a
     int viewDistance -> b
     net.minecraft.world.entity.player.ChatVisiblity chatVisibility -> c
@@ -25808,7 +28384,7 @@ net.minecraft.network.protocol.game.ServerboundClientInformationPacket -> pr:
     76:76:int getModelCustomisation() -> f
     80:80:net.minecraft.world.entity.HumanoidArm getMainHand() -> g
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket -> ps:
+net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket -> rg:
     int id -> a
     java.lang.String command -> b
     13:14:void <init>() -> <init>
@@ -25819,7 +28395,7 @@ net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket -> ps:
     39:39:int getId() -> b
     43:43:java.lang.String getCommand() -> c
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundContainerAckPacket -> pt:
+net.minecraft.network.protocol.game.ServerboundContainerAckPacket -> rh:
     int containerId -> a
     short uid -> b
     boolean accepted -> c
@@ -25832,7 +28408,7 @@ net.minecraft.network.protocol.game.ServerboundContainerAckPacket -> pt:
     46:46:short getUid() -> c
     50:50:boolean isAccepted() -> d
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundContainerButtonClickPacket -> pu:
+net.minecraft.network.protocol.game.ServerboundContainerButtonClickPacket -> ri:
     int containerId -> a
     int buttonId -> b
     12:13:void <init>() -> <init>
@@ -25843,7 +28419,7 @@ net.minecraft.network.protocol.game.ServerboundContainerButtonClickPacket -> pu:
     38:38:int getContainerId() -> b
     42:42:int getButtonId() -> c
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundContainerClickPacket -> pv:
+net.minecraft.network.protocol.game.ServerboundContainerClickPacket -> rj:
     int containerId -> a
     int slotNum -> b
     int buttonNum -> c
@@ -25862,7 +28438,7 @@ net.minecraft.network.protocol.game.ServerboundContainerClickPacket -> pv:
     74:74:net.minecraft.world.item.ItemStack getItem() -> f
     78:78:net.minecraft.world.inventory.ClickType getClickType() -> g
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundContainerClosePacket -> pw:
+net.minecraft.network.protocol.game.ServerboundContainerClosePacket -> rk:
     int containerId -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(int) -> <init>
@@ -25871,7 +28447,7 @@ net.minecraft.network.protocol.game.ServerboundContainerClosePacket -> pw:
     30:31:void write(net.minecraft.network.FriendlyByteBuf) -> b
     34:34:int getContainerId() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket -> px:
+net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket -> rl:
     net.minecraft.resources.ResourceLocation BRAND -> a
     net.minecraft.resources.ResourceLocation identifier -> b
     net.minecraft.network.FriendlyByteBuf data -> c
@@ -25884,7 +28460,7 @@ net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket -> px:
     55:55:net.minecraft.network.FriendlyByteBuf getData() -> c
     9:9:void handle(net.minecraft.network.PacketListener) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ServerboundEditBookPacket -> py:
+net.minecraft.network.protocol.game.ServerboundEditBookPacket -> rm:
     net.minecraft.world.item.ItemStack book -> a
     boolean signing -> b
     net.minecraft.world.InteractionHand hand -> c
@@ -25897,7 +28473,7 @@ net.minecraft.network.protocol.game.ServerboundEditBookPacket -> py:
     48:48:boolean isSigning() -> c
     52:52:net.minecraft.world.InteractionHand getHand() -> d
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundEntityTagQuery -> pz:
+net.minecraft.network.protocol.game.ServerboundEntityTagQuery -> rn:
     int transactionId -> a
     int entityId -> b
     13:14:void <init>() -> <init>
@@ -25908,33 +28484,48 @@ net.minecraft.network.protocol.game.ServerboundEntityTagQuery -> pz:
     39:39:int getTransactionId() -> b
     43:43:int getEntityId() -> c
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundInteractPacket -> qa:
+net.minecraft.network.protocol.game.ServerboundInteractPacket -> ro:
     int entityId -> a
     net.minecraft.network.protocol.game.ServerboundInteractPacket$Action action -> b
     net.minecraft.world.phys.Vec3 location -> c
     net.minecraft.world.InteractionHand hand -> d
-    19:20:void <init>() -> <init>
-    22:25:void <init>(net.minecraft.world.entity.Entity) -> <init>
-    27:31:void <init>(net.minecraft.world.entity.Entity,net.minecraft.world.InteractionHand) -> <init>
-    33:38:void <init>(net.minecraft.world.entity.Entity,net.minecraft.world.InteractionHand,net.minecraft.world.phys.Vec3) -> <init>
-    42:50:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    54:64:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    68:69:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
-    73:73:net.minecraft.world.entity.Entity getTarget(net.minecraft.world.level.Level) -> a
-    77:77:net.minecraft.network.protocol.game.ServerboundInteractPacket$Action getAction() -> b
-    81:81:net.minecraft.world.InteractionHand getHand() -> c
-    85:85:net.minecraft.world.phys.Vec3 getLocation() -> d
+    boolean usingSecondaryAction -> e
+    20:21:void <init>() -> <init>
+    23:27:void <init>(net.minecraft.world.entity.Entity,boolean) -> <init>
+    29:34:void <init>(net.minecraft.world.entity.Entity,net.minecraft.world.InteractionHand,boolean) -> <init>
+    36:42:void <init>(net.minecraft.world.entity.Entity,net.minecraft.world.InteractionHand,net.minecraft.world.phys.Vec3,boolean) -> <init>
+    46:55:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    59:70:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    74:75:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
+    79:79:net.minecraft.world.entity.Entity getTarget(net.minecraft.world.level.Level) -> a
+    83:83:net.minecraft.network.protocol.game.ServerboundInteractPacket$Action getAction() -> b
+    87:87:net.minecraft.world.InteractionHand getHand() -> c
+    91:91:net.minecraft.world.phys.Vec3 getLocation() -> d
+    95:95:boolean isUsingSecondaryAction() -> e
     13:13:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundInteractPacket$Action -> qa$a:
+net.minecraft.network.protocol.game.ServerboundInteractPacket$Action -> ro$a:
     net.minecraft.network.protocol.game.ServerboundInteractPacket$Action INTERACT -> a
     net.minecraft.network.protocol.game.ServerboundInteractPacket$Action ATTACK -> b
     net.minecraft.network.protocol.game.ServerboundInteractPacket$Action INTERACT_AT -> c
     net.minecraft.network.protocol.game.ServerboundInteractPacket$Action[] $VALUES -> d
-    88:88:net.minecraft.network.protocol.game.ServerboundInteractPacket$Action[] values() -> values
-    88:88:net.minecraft.network.protocol.game.ServerboundInteractPacket$Action valueOf(java.lang.String) -> valueOf
-    88:88:void <init>(java.lang.String,int) -> <init>
-    88:91:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ServerboundKeepAlivePacket -> qb:
+    98:98:net.minecraft.network.protocol.game.ServerboundInteractPacket$Action[] values() -> values
+    98:98:net.minecraft.network.protocol.game.ServerboundInteractPacket$Action valueOf(java.lang.String) -> valueOf
+    98:98:void <init>(java.lang.String,int) -> <init>
+    98:101:void <clinit>() -> <clinit>
+net.minecraft.network.protocol.game.ServerboundJigsawGeneratePacket -> rp:
+    net.minecraft.core.BlockPos pos -> a
+    int levels -> b
+    boolean keepJigsaws -> c
+    14:15:void <init>() -> <init>
+    17:21:void <init>(net.minecraft.core.BlockPos,int,boolean) -> <init>
+    25:28:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    32:35:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    39:40:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
+    43:43:net.minecraft.core.BlockPos getPos() -> b
+    47:47:int levels() -> c
+    51:51:boolean keepJigsaws() -> d
+    9:9:void handle(net.minecraft.network.PacketListener) -> a
+net.minecraft.network.protocol.game.ServerboundKeepAlivePacket -> rq:
     long id -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(long) -> <init>
@@ -25943,7 +28534,7 @@ net.minecraft.network.protocol.game.ServerboundKeepAlivePacket -> qb:
     30:31:void write(net.minecraft.network.FriendlyByteBuf) -> b
     34:34:long getId() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket -> qc:
+net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket -> rr:
     boolean locked -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(boolean) -> <init>
@@ -25952,7 +28543,7 @@ net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket -> qc:
     30:31:void write(net.minecraft.network.FriendlyByteBuf) -> b
     34:34:boolean isLocked() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundMovePlayerPacket -> qd:
+net.minecraft.network.protocol.game.ServerboundMovePlayerPacket -> rs:
     double x -> a
     double y -> b
     double z -> c
@@ -25976,25 +28567,25 @@ net.minecraft.network.protocol.game.ServerboundMovePlayerPacket -> qd:
     164:164:boolean hasRotation() -> d
     168:169:void setHasPosition(boolean) -> a
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos -> qd$a:
+net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos -> rs$a:
     57:59:void <init>() -> <init>
     61:67:void <init>(double,double,double,boolean) -> <init>
     71:75:void read(net.minecraft.network.FriendlyByteBuf) -> a
     79:83:void write(net.minecraft.network.FriendlyByteBuf) -> b
     56:56:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot -> qd$b:
+net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot -> rs$b:
     19:22:void <init>() -> <init>
     24:33:void <init>(double,double,double,float,float,boolean) -> <init>
     37:43:void read(net.minecraft.network.FriendlyByteBuf) -> a
     47:53:void write(net.minecraft.network.FriendlyByteBuf) -> b
     18:18:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot -> qd$c:
+net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot -> rs$c:
     87:89:void <init>() -> <init>
     91:96:void <init>(float,float,boolean) -> <init>
     100:103:void read(net.minecraft.network.FriendlyByteBuf) -> a
     107:110:void write(net.minecraft.network.FriendlyByteBuf) -> b
     86:86:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket -> qe:
+net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket -> rt:
     double x -> a
     double y -> b
     double z -> c
@@ -26011,7 +28602,7 @@ net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket -> qe:
     63:63:float getYRot() -> e
     67:67:float getXRot() -> f
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundPaddleBoatPacket -> qf:
+net.minecraft.network.protocol.game.ServerboundPaddleBoatPacket -> ru:
     boolean left -> a
     boolean right -> b
     12:13:void <init>() -> <init>
@@ -26022,7 +28613,7 @@ net.minecraft.network.protocol.game.ServerboundPaddleBoatPacket -> qf:
     38:38:boolean getLeft() -> b
     42:42:boolean getRight() -> c
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundPickItemPacket -> qg:
+net.minecraft.network.protocol.game.ServerboundPickItemPacket -> rv:
     int slot -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(int) -> <init>
@@ -26031,7 +28622,7 @@ net.minecraft.network.protocol.game.ServerboundPickItemPacket -> qg:
     30:31:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     34:34:int getSlot() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket -> qh:
+net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket -> rw:
     int containerId -> a
     net.minecraft.resources.ResourceLocation recipe -> b
     boolean shiftDown -> c
@@ -26044,32 +28635,16 @@ net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket -> qh:
     48:48:net.minecraft.resources.ResourceLocation getRecipe() -> c
     52:52:boolean isShiftDown() -> d
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundPlayerAbilitiesPacket -> qi:
-    boolean invulnerable -> a
-    boolean isFlying -> b
-    boolean canFly -> c
-    boolean instabuild -> d
-    float flyingSpeed -> e
-    float walkingSpeed -> f
-    22:23:void <init>() -> <init>
-    25:32:void <init>(net.minecraft.world.entity.player.Abilities) -> <init>
-    36:44:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    48:66:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    70:71:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
-    74:74:boolean isInvulnerable() -> b
-    78:79:void setInvulnerable(boolean) -> a
-    82:82:boolean isFlying() -> c
-    86:87:void setFlying(boolean) -> b
-    90:90:boolean canFly() -> d
-    94:95:void setCanFly(boolean) -> c
-    98:98:boolean canInstabuild() -> e
-    102:103:void setInstabuild(boolean) -> d
-    106:106:float getFlyingSpeed() -> f
-    110:111:void setFlyingSpeed(float) -> a
-    114:114:float getWalkingSpeed() -> g
-    118:119:void setWalkingSpeed(float) -> b
+net.minecraft.network.protocol.game.ServerboundPlayerAbilitiesPacket -> rx:
+    boolean isFlying -> a
+    14:15:void <init>() -> <init>
+    17:19:void <init>(net.minecraft.world.entity.player.Abilities) -> <init>
+    23:25:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    29:34:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    38:39:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
+    42:42:boolean isFlying() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundPlayerActionPacket -> qj:
+net.minecraft.network.protocol.game.ServerboundPlayerActionPacket -> ry:
     net.minecraft.core.BlockPos pos -> a
     net.minecraft.core.Direction direction -> b
     net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action action -> c
@@ -26082,20 +28657,20 @@ net.minecraft.network.protocol.game.ServerboundPlayerActionPacket -> qj:
     48:48:net.minecraft.core.Direction getDirection() -> c
     52:52:net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action getAction() -> d
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action -> qj$a:
+net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action -> ry$a:
     net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action START_DESTROY_BLOCK -> a
     net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action ABORT_DESTROY_BLOCK -> b
     net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action STOP_DESTROY_BLOCK -> c
     net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action DROP_ALL_ITEMS -> d
     net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action DROP_ITEM -> e
     net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action RELEASE_USE_ITEM -> f
-    net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action SWAP_HELD_ITEMS -> g
+    net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action SWAP_ITEM_WITH_OFFHAND -> g
     net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action[] $VALUES -> h
     55:55:net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action[] values() -> values
     55:55:net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action valueOf(java.lang.String) -> valueOf
     55:55:void <init>(java.lang.String,int) -> <init>
     55:62:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket -> qk:
+net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket -> rz:
     int id -> a
     net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket$Action action -> b
     int data -> c
@@ -26109,7 +28684,7 @@ net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket -> qk:
     51:51:net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket$Action getAction() -> c
     55:55:int getData() -> d
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket$Action -> qk$a:
+net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket$Action -> rz$a:
     net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket$Action PRESS_SHIFT_KEY -> a
     net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket$Action RELEASE_SHIFT_KEY -> b
     net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket$Action STOP_SLEEPING -> c
@@ -26124,7 +28699,7 @@ net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket$Action -> qk$
     58:58:net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket$Action valueOf(java.lang.String) -> valueOf
     58:58:void <init>(java.lang.String,int) -> <init>
     58:67:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ServerboundPlayerInputPacket -> ql:
+net.minecraft.network.protocol.game.ServerboundPlayerInputPacket -> sa:
     float xxa -> a
     float zza -> b
     boolean isJumping -> c
@@ -26139,7 +28714,7 @@ net.minecraft.network.protocol.game.ServerboundPlayerInputPacket -> ql:
     66:66:boolean isJumping() -> d
     70:70:boolean isShiftKeyDown() -> e
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket -> qm:
+net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket -> sb:
     net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket$Purpose purpose -> a
     net.minecraft.resources.ResourceLocation recipe -> b
     boolean guiOpen -> c
@@ -26167,7 +28742,7 @@ net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket -> qm:
     120:120:boolean isSmokerGuiOpen() -> j
     124:124:boolean isSmokerFilteringCraftable() -> k
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket$Purpose -> qm$a:
+net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket$Purpose -> sb$a:
     net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket$Purpose SHOWN -> a
     net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket$Purpose SETTINGS -> b
     net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket$Purpose[] $VALUES -> c
@@ -26175,7 +28750,7 @@ net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket$Purpose ->
     11:11:net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket$Purpose valueOf(java.lang.String) -> valueOf
     11:11:void <init>(java.lang.String,int) -> <init>
     11:12:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ServerboundRenameItemPacket -> qn:
+net.minecraft.network.protocol.game.ServerboundRenameItemPacket -> sc:
     java.lang.String name -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(java.lang.String) -> <init>
@@ -26184,7 +28759,7 @@ net.minecraft.network.protocol.game.ServerboundRenameItemPacket -> qn:
     30:31:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     34:34:java.lang.String getName() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundResourcePackPacket -> qo:
+net.minecraft.network.protocol.game.ServerboundResourcePackPacket -> sd:
     net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action action -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action) -> <init>
@@ -26193,7 +28768,7 @@ net.minecraft.network.protocol.game.ServerboundResourcePackPacket -> qo:
     30:31:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     34:34:net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action getAction() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action -> qo$a:
+net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action -> sd$a:
     net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action SUCCESSFULLY_LOADED -> a
     net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action DECLINED -> b
     net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action FAILED_DOWNLOAD -> c
@@ -26203,7 +28778,7 @@ net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action -> qo$a
     37:37:net.minecraft.network.protocol.game.ServerboundResourcePackPacket$Action valueOf(java.lang.String) -> valueOf
     37:37:void <init>(java.lang.String,int) -> <init>
     37:41:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket -> qp:
+net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket -> se:
     net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket$Action action -> a
     net.minecraft.resources.ResourceLocation tab -> b
     15:16:void <init>() -> <init>
@@ -26216,7 +28791,7 @@ net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket -> qp:
     53:53:net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket$Action getAction() -> c
     57:57:net.minecraft.resources.ResourceLocation getTab() -> d
     11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket$Action -> qp$a:
+net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket$Action -> se$a:
     net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket$Action OPENED_TAB -> a
     net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket$Action CLOSED_SCREEN -> b
     net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket$Action[] $VALUES -> c
@@ -26224,7 +28799,7 @@ net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket$Action ->
     60:60:net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket$Action valueOf(java.lang.String) -> valueOf
     60:60:void <init>(java.lang.String,int) -> <init>
     60:62:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.game.ServerboundSelectTradePacket -> qq:
+net.minecraft.network.protocol.game.ServerboundSelectTradePacket -> sf:
     int item -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(int) -> <init>
@@ -26233,7 +28808,7 @@ net.minecraft.network.protocol.game.ServerboundSelectTradePacket -> qq:
     30:31:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     34:34:int getItem() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundSetBeaconPacket -> qr:
+net.minecraft.network.protocol.game.ServerboundSetBeaconPacket -> sg:
     int primary -> a
     int secondary -> b
     12:13:void <init>() -> <init>
@@ -26244,7 +28819,7 @@ net.minecraft.network.protocol.game.ServerboundSetBeaconPacket -> qr:
     38:38:int getPrimary() -> b
     42:42:int getSecondary() -> c
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundSetCarriedItemPacket -> qs:
+net.minecraft.network.protocol.game.ServerboundSetCarriedItemPacket -> sh:
     int slot -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(int) -> <init>
@@ -26253,7 +28828,7 @@ net.minecraft.network.protocol.game.ServerboundSetCarriedItemPacket -> qs:
     30:31:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     34:34:int getSlot() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundSetCommandBlockPacket -> qt:
+net.minecraft.network.protocol.game.ServerboundSetCommandBlockPacket -> si:
     net.minecraft.core.BlockPos pos -> a
     java.lang.String command -> b
     boolean trackOutput -> c
@@ -26272,7 +28847,7 @@ net.minecraft.network.protocol.game.ServerboundSetCommandBlockPacket -> qt:
     85:85:boolean isAutomatic() -> f
     89:89:net.minecraft.world.level.block.entity.CommandBlockEntity$Mode getMode() -> g
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundSetCommandMinecartPacket -> qu:
+net.minecraft.network.protocol.game.ServerboundSetCommandMinecartPacket -> sj:
     int entity -> a
     java.lang.String command -> b
     boolean trackOutput -> c
@@ -26285,7 +28860,7 @@ net.minecraft.network.protocol.game.ServerboundSetCommandMinecartPacket -> qu:
     57:57:java.lang.String getCommand() -> b
     61:61:boolean isTrackOutput() -> c
     13:13:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket -> qv:
+net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket -> sk:
     int slotNum -> a
     net.minecraft.world.item.ItemStack itemStack -> b
     11:14:void <init>() -> <init>
@@ -26296,22 +28871,26 @@ net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket -> qv:
     39:39:int getSlotNum() -> b
     43:43:net.minecraft.world.item.ItemStack getItem() -> c
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundSetJigsawBlockPacket -> qw:
+net.minecraft.network.protocol.game.ServerboundSetJigsawBlockPacket -> sl:
     net.minecraft.core.BlockPos pos -> a
-    net.minecraft.resources.ResourceLocation attachementType -> b
-    net.minecraft.resources.ResourceLocation targetPool -> c
-    java.lang.String finalState -> d
-    16:17:void <init>() -> <init>
-    19:24:void <init>(net.minecraft.core.BlockPos,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,java.lang.String) -> <init>
-    28:32:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    36:40:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    44:45:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
-    48:48:net.minecraft.core.BlockPos getPos() -> b
-    52:52:net.minecraft.resources.ResourceLocation getTargetPool() -> c
-    56:56:net.minecraft.resources.ResourceLocation getAttachementType() -> d
-    60:60:java.lang.String getFinalState() -> e
-    10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundSetStructureBlockPacket -> qx:
+    net.minecraft.resources.ResourceLocation name -> b
+    net.minecraft.resources.ResourceLocation target -> c
+    net.minecraft.resources.ResourceLocation pool -> d
+    java.lang.String finalState -> e
+    net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType joint -> f
+    19:20:void <init>() -> <init>
+    22:29:void <init>(net.minecraft.core.BlockPos,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,java.lang.String,net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType) -> <init>
+    33:39:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    43:49:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    53:54:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
+    57:57:net.minecraft.core.BlockPos getPos() -> b
+    61:61:net.minecraft.resources.ResourceLocation getName() -> c
+    65:65:net.minecraft.resources.ResourceLocation getTarget() -> d
+    69:69:net.minecraft.resources.ResourceLocation getPool() -> e
+    73:73:java.lang.String getFinalState() -> f
+    77:77:net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType getJoint() -> g
+    11:11:void handle(net.minecraft.network.PacketListener) -> a
+net.minecraft.network.protocol.game.ServerboundSetStructureBlockPacket -> sm:
     net.minecraft.core.BlockPos pos -> a
     net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType updateType -> b
     net.minecraft.world.level.block.state.properties.StructureMode mode -> c
@@ -26346,18 +28925,18 @@ net.minecraft.network.protocol.game.ServerboundSetStructureBlockPacket -> qx:
     158:158:float getIntegrity() -> n
     162:162:long getSeed() -> o
     14:14:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundSignUpdatePacket -> qy:
+net.minecraft.network.protocol.game.ServerboundSignUpdatePacket -> sn:
     net.minecraft.core.BlockPos pos -> a
     java.lang.String[] lines -> b
-    15:16:void <init>() -> <init>
-    18:23:void <init>(net.minecraft.core.BlockPos,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> <init>
-    27:32:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    36:40:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    44:45:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
-    48:48:net.minecraft.core.BlockPos getPos() -> b
-    52:52:java.lang.String[] getLines() -> c
-    10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundSwingPacket -> qz:
+    14:15:void <init>() -> <init>
+    17:20:void <init>(net.minecraft.core.BlockPos,java.lang.String,java.lang.String,java.lang.String,java.lang.String) -> <init>
+    24:29:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    33:37:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    41:42:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
+    45:45:net.minecraft.core.BlockPos getPos() -> b
+    49:49:java.lang.String[] getLines() -> c
+    9:9:void handle(net.minecraft.network.PacketListener) -> a
+net.minecraft.network.protocol.game.ServerboundSwingPacket -> so:
     net.minecraft.world.InteractionHand hand -> a
     12:13:void <init>() -> <init>
     15:17:void <init>(net.minecraft.world.InteractionHand) -> <init>
@@ -26366,7 +28945,7 @@ net.minecraft.network.protocol.game.ServerboundSwingPacket -> qz:
     31:32:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     35:35:net.minecraft.world.InteractionHand getHand() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket -> ra:
+net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket -> sp:
     java.util.UUID uuid -> a
     15:16:void <init>() -> <init>
     18:20:void <init>(java.util.UUID) -> <init>
@@ -26375,7 +28954,7 @@ net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket -> ra:
     34:35:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     39:39:net.minecraft.world.entity.Entity getEntity(net.minecraft.server.level.ServerLevel) -> a
     12:12:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundUseItemOnPacket -> rb:
+net.minecraft.network.protocol.game.ServerboundUseItemOnPacket -> sq:
     net.minecraft.world.phys.BlockHitResult blockHit -> a
     net.minecraft.world.InteractionHand hand -> b
     14:15:void <init>() -> <init>
@@ -26386,7 +28965,7 @@ net.minecraft.network.protocol.game.ServerboundUseItemOnPacket -> rb:
     40:40:net.minecraft.world.InteractionHand getHand() -> b
     44:44:net.minecraft.world.phys.BlockHitResult getHitResult() -> c
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.ServerboundUseItemPacket -> rc:
+net.minecraft.network.protocol.game.ServerboundUseItemPacket -> sr:
     net.minecraft.world.InteractionHand hand -> a
     12:13:void <init>() -> <init>
     15:17:void <init>(net.minecraft.world.InteractionHand) -> <init>
@@ -26395,8 +28974,8 @@ net.minecraft.network.protocol.game.ServerboundUseItemPacket -> rc:
     31:32:void handle(net.minecraft.network.protocol.game.ServerGamePacketListener) -> a
     35:35:net.minecraft.world.InteractionHand getHand() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.game.package-info -> rd:
-net.minecraft.network.protocol.handshake.ClientIntentionPacket -> re:
+net.minecraft.network.protocol.game.package-info -> ss:
+net.minecraft.network.protocol.handshake.ClientIntentionPacket -> st:
     int protocolVersion -> a
     java.lang.String hostName -> b
     int port -> c
@@ -26411,16 +28990,16 @@ net.minecraft.network.protocol.handshake.ClientIntentionPacket -> re:
     60:60:java.lang.String getHostName() -> d
     64:64:int getPort() -> e
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.handshake.ServerHandshakePacketListener -> rf:
+net.minecraft.network.protocol.handshake.ServerHandshakePacketListener -> su:
     void handleIntention(net.minecraft.network.protocol.handshake.ClientIntentionPacket) -> a
-net.minecraft.network.protocol.handshake.package-info -> rg:
-net.minecraft.network.protocol.login.ClientLoginPacketListener -> rh:
+net.minecraft.network.protocol.handshake.package-info -> sv:
+net.minecraft.network.protocol.login.ClientLoginPacketListener -> sw:
     void handleHello(net.minecraft.network.protocol.login.ClientboundHelloPacket) -> a
     void handleGameProfile(net.minecraft.network.protocol.login.ClientboundGameProfilePacket) -> a
     void handleDisconnect(net.minecraft.network.protocol.login.ClientboundLoginDisconnectPacket) -> a
     void handleCompression(net.minecraft.network.protocol.login.ClientboundLoginCompressionPacket) -> a
     void handleCustomQuery(net.minecraft.network.protocol.login.ClientboundCustomQueryPacket) -> a
-net.minecraft.network.protocol.login.ClientboundCustomQueryPacket -> ri:
+net.minecraft.network.protocol.login.ClientboundCustomQueryPacket -> sx:
     int transactionId -> a
     net.minecraft.resources.ResourceLocation identifier -> b
     net.minecraft.network.FriendlyByteBuf data -> c
@@ -26433,16 +29012,16 @@ net.minecraft.network.protocol.login.ClientboundCustomQueryPacket -> ri:
     53:53:net.minecraft.resources.ResourceLocation getIdentifier() -> c
     57:57:net.minecraft.network.FriendlyByteBuf getData() -> d
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.login.ClientboundGameProfilePacket -> rj:
+net.minecraft.network.protocol.login.ClientboundGameProfilePacket -> sy:
     com.mojang.authlib.GameProfile gameProfile -> a
-    14:15:void <init>() -> <init>
-    17:19:void <init>(com.mojang.authlib.GameProfile) -> <init>
-    23:27:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    31:34:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    38:39:void handle(net.minecraft.network.protocol.login.ClientLoginPacketListener) -> a
-    42:42:com.mojang.authlib.GameProfile getGameProfile() -> b
-    11:11:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.login.ClientboundHelloPacket -> rk:
+    15:16:void <init>() -> <init>
+    18:20:void <init>(com.mojang.authlib.GameProfile) -> <init>
+    24:31:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    35:39:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    43:44:void handle(net.minecraft.network.protocol.login.ClientLoginPacketListener) -> a
+    47:47:com.mojang.authlib.GameProfile getGameProfile() -> b
+    12:12:void handle(net.minecraft.network.PacketListener) -> a
+net.minecraft.network.protocol.login.ClientboundHelloPacket -> sz:
     java.lang.String serverId -> a
     java.security.PublicKey publicKey -> b
     byte[] nonce -> c
@@ -26455,7 +29034,7 @@ net.minecraft.network.protocol.login.ClientboundHelloPacket -> rk:
     48:48:java.security.PublicKey getPublicKey() -> c
     52:52:byte[] getNonce() -> d
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.login.ClientboundLoginCompressionPacket -> rl:
+net.minecraft.network.protocol.login.ClientboundLoginCompressionPacket -> ta:
     int compressionThreshold -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(int) -> <init>
@@ -26464,7 +29043,7 @@ net.minecraft.network.protocol.login.ClientboundLoginCompressionPacket -> rl:
     30:31:void handle(net.minecraft.network.protocol.login.ClientLoginPacketListener) -> a
     34:34:int getCompressionThreshold() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.login.ClientboundLoginDisconnectPacket -> rm:
+net.minecraft.network.protocol.login.ClientboundLoginDisconnectPacket -> tb:
     net.minecraft.network.chat.Component reason -> a
     12:13:void <init>() -> <init>
     15:17:void <init>(net.minecraft.network.chat.Component) -> <init>
@@ -26473,11 +29052,11 @@ net.minecraft.network.protocol.login.ClientboundLoginDisconnectPacket -> rm:
     31:32:void handle(net.minecraft.network.protocol.login.ClientLoginPacketListener) -> a
     35:35:net.minecraft.network.chat.Component getReason() -> b
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.login.ServerLoginPacketListener -> rn:
+net.minecraft.network.protocol.login.ServerLoginPacketListener -> tc:
     void handleHello(net.minecraft.network.protocol.login.ServerboundHelloPacket) -> a
     void handleKey(net.minecraft.network.protocol.login.ServerboundKeyPacket) -> a
     void handleCustomQueryPacket(net.minecraft.network.protocol.login.ServerboundCustomQueryPacket) -> a
-net.minecraft.network.protocol.login.ServerboundCustomQueryPacket -> ro:
+net.minecraft.network.protocol.login.ServerboundCustomQueryPacket -> td:
     int transactionId -> a
     net.minecraft.network.FriendlyByteBuf data -> b
     15:16:void <init>() -> <init>
@@ -26488,7 +29067,7 @@ net.minecraft.network.protocol.login.ServerboundCustomQueryPacket -> ro:
     54:54:int getTransactionId() -> b
     58:58:net.minecraft.network.FriendlyByteBuf getData() -> c
     9:9:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.login.ServerboundHelloPacket -> rp:
+net.minecraft.network.protocol.login.ServerboundHelloPacket -> te:
     com.mojang.authlib.GameProfile gameProfile -> a
     13:14:void <init>() -> <init>
     16:18:void <init>(com.mojang.authlib.GameProfile) -> <init>
@@ -26497,7 +29076,7 @@ net.minecraft.network.protocol.login.ServerboundHelloPacket -> rp:
     32:33:void handle(net.minecraft.network.protocol.login.ServerLoginPacketListener) -> a
     36:36:com.mojang.authlib.GameProfile getGameProfile() -> b
     10:10:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.login.ServerboundKeyPacket -> rq:
+net.minecraft.network.protocol.login.ServerboundKeyPacket -> tf:
     byte[] keybytes -> a
     byte[] nonce -> b
     13:17:void <init>() -> <init>
@@ -26508,12 +29087,12 @@ net.minecraft.network.protocol.login.ServerboundKeyPacket -> rq:
     42:42:javax.crypto.SecretKey getSecretKey(java.security.PrivateKey) -> a
     46:49:byte[] getNonce(java.security.PrivateKey) -> b
     12:12:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.login.package-info -> rr:
-net.minecraft.network.protocol.package-info -> rs:
-net.minecraft.network.protocol.status.ClientStatusPacketListener -> rt:
+net.minecraft.network.protocol.login.package-info -> tg:
+net.minecraft.network.protocol.package-info -> th:
+net.minecraft.network.protocol.status.ClientStatusPacketListener -> ti:
     void handleStatusResponse(net.minecraft.network.protocol.status.ClientboundStatusResponsePacket) -> a
     void handlePongResponse(net.minecraft.network.protocol.status.ClientboundPongResponsePacket) -> a
-net.minecraft.network.protocol.status.ClientboundPongResponsePacket -> ru:
+net.minecraft.network.protocol.status.ClientboundPongResponsePacket -> tj:
     long time -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(long) -> <init>
@@ -26522,7 +29101,7 @@ net.minecraft.network.protocol.status.ClientboundPongResponsePacket -> ru:
     30:31:void handle(net.minecraft.network.protocol.status.ClientStatusPacketListener) -> a
     34:34:long getTime() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.status.ClientboundStatusResponsePacket -> rv:
+net.minecraft.network.protocol.status.ClientboundStatusResponsePacket -> tk:
     com.google.gson.Gson GSON -> a
     net.minecraft.network.protocol.status.ServerStatus status -> b
     26:27:void <init>() -> <init>
@@ -26533,7 +29112,7 @@ net.minecraft.network.protocol.status.ClientboundStatusResponsePacket -> rv:
     49:49:net.minecraft.network.protocol.status.ServerStatus getStatus() -> b
     14:14:void handle(net.minecraft.network.PacketListener) -> a
     15:22:void <clinit>() -> <clinit>
-net.minecraft.network.protocol.status.ServerStatus -> rw:
+net.minecraft.network.protocol.status.ServerStatus -> tl:
     net.minecraft.network.chat.Component description -> a
     net.minecraft.network.protocol.status.ServerStatus$Players players -> b
     net.minecraft.network.protocol.status.ServerStatus$Version version -> c
@@ -26547,7 +29126,7 @@ net.minecraft.network.protocol.status.ServerStatus -> rw:
     48:49:void setVersion(net.minecraft.network.protocol.status.ServerStatus$Version) -> a
     52:53:void setFavicon(java.lang.String) -> a
     56:56:java.lang.String getFavicon() -> d
-net.minecraft.network.protocol.status.ServerStatus$Players -> rw$a:
+net.minecraft.network.protocol.status.ServerStatus$Players -> tl$a:
     int maxPlayers -> a
     int numPlayers -> b
     com.mojang.authlib.GameProfile[] sample -> c
@@ -26556,34 +29135,34 @@ net.minecraft.network.protocol.status.ServerStatus$Players -> rw$a:
     74:74:int getNumPlayers() -> b
     78:78:com.mojang.authlib.GameProfile[] getSample() -> c
     82:83:void setSample(com.mojang.authlib.GameProfile[]) -> a
-net.minecraft.network.protocol.status.ServerStatus$Players$Serializer -> rw$a$a:
+net.minecraft.network.protocol.status.ServerStatus$Players$Serializer -> tl$a$a:
     85:85:void <init>() -> <init>
     88:104:net.minecraft.network.protocol.status.ServerStatus$Players deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     109:128:com.google.gson.JsonElement serialize(net.minecraft.network.protocol.status.ServerStatus$Players,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
     85:85:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
     85:85:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.network.protocol.status.ServerStatus$Serializer -> rw$b:
+net.minecraft.network.protocol.status.ServerStatus$Serializer -> tl$b:
     167:167:void <init>() -> <init>
     170:189:net.minecraft.network.protocol.status.ServerStatus deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     194:212:com.google.gson.JsonElement serialize(net.minecraft.network.protocol.status.ServerStatus,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
     167:167:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
     167:167:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.network.protocol.status.ServerStatus$Version -> rw$c:
+net.minecraft.network.protocol.status.ServerStatus$Version -> tl$c:
     java.lang.String name -> a
     int protocol -> b
     137:140:void <init>(java.lang.String,int) -> <init>
     143:143:java.lang.String getName() -> a
     147:147:int getProtocol() -> b
-net.minecraft.network.protocol.status.ServerStatus$Version$Serializer -> rw$c$a:
+net.minecraft.network.protocol.status.ServerStatus$Version$Serializer -> tl$c$a:
     150:150:void <init>() -> <init>
     153:154:net.minecraft.network.protocol.status.ServerStatus$Version deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     159:162:com.google.gson.JsonElement serialize(net.minecraft.network.protocol.status.ServerStatus$Version,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
     150:150:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
     150:150:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.network.protocol.status.ServerStatusPacketListener -> rx:
+net.minecraft.network.protocol.status.ServerStatusPacketListener -> tm:
     void handlePingRequest(net.minecraft.network.protocol.status.ServerboundPingRequestPacket) -> a
     void handleStatusRequest(net.minecraft.network.protocol.status.ServerboundStatusRequestPacket) -> a
-net.minecraft.network.protocol.status.ServerboundPingRequestPacket -> ry:
+net.minecraft.network.protocol.status.ServerboundPingRequestPacket -> tn:
     long time -> a
     11:12:void <init>() -> <init>
     14:16:void <init>(long) -> <init>
@@ -26592,14 +29171,14 @@ net.minecraft.network.protocol.status.ServerboundPingRequestPacket -> ry:
     30:31:void handle(net.minecraft.network.protocol.status.ServerStatusPacketListener) -> a
     34:34:long getTime() -> b
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.status.ServerboundStatusRequestPacket -> rz:
+net.minecraft.network.protocol.status.ServerboundStatusRequestPacket -> to:
     9:10:void <init>() -> <init>
     14:14:void read(net.minecraft.network.FriendlyByteBuf) -> a
     18:18:void write(net.minecraft.network.FriendlyByteBuf) -> b
     22:23:void handle(net.minecraft.network.protocol.status.ServerStatusPacketListener) -> a
     8:8:void handle(net.minecraft.network.PacketListener) -> a
-net.minecraft.network.protocol.status.package-info -> sa:
-net.minecraft.network.syncher.EntityDataAccessor -> sb:
+net.minecraft.network.protocol.status.package-info -> tp:
+net.minecraft.network.syncher.EntityDataAccessor -> tq:
     int id -> a
     net.minecraft.network.syncher.EntityDataSerializer serializer -> b
     7:10:void <init>(int,net.minecraft.network.syncher.EntityDataSerializer) -> <init>
@@ -26608,12 +29187,12 @@ net.minecraft.network.syncher.EntityDataAccessor -> sb:
     22:31:boolean equals(java.lang.Object) -> equals
     36:36:int hashCode() -> hashCode
     41:41:java.lang.String toString() -> toString
-net.minecraft.network.syncher.EntityDataSerializer -> sc:
+net.minecraft.network.syncher.EntityDataSerializer -> tr:
     void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
     java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     11:11:net.minecraft.network.syncher.EntityDataAccessor createAccessor(int) -> a
     java.lang.Object copy(java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers -> sd:
+net.minecraft.network.syncher.EntityDataSerializers -> ts:
     net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap SERIALIZERS -> t
     net.minecraft.network.syncher.EntityDataSerializer BYTE -> a
     net.minecraft.network.syncher.EntityDataSerializer INT -> b
@@ -26639,7 +29218,7 @@ net.minecraft.network.syncher.EntityDataSerializers -> sd:
     422:422:int getSerializedId(net.minecraft.network.syncher.EntityDataSerializer) -> b
     425:426:void <init>() -> <init>
     25:410:void <clinit>() -> <clinit>
-net.minecraft.network.syncher.EntityDataSerializers$1 -> sd$1:
+net.minecraft.network.syncher.EntityDataSerializers$1 -> ts$1:
     27:27:void <init>() -> <init>
     30:31:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Byte) -> a
     35:35:java.lang.Byte read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26647,7 +29226,7 @@ net.minecraft.network.syncher.EntityDataSerializers$1 -> sd$1:
     27:27:java.lang.Object copy(java.lang.Object) -> a
     27:27:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     27:27:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$10 -> sd$2:
+net.minecraft.network.syncher.EntityDataSerializers$10 -> ts$2:
     194:194:void <init>() -> <init>
     197:199:void write(net.minecraft.network.FriendlyByteBuf,net.minecraft.core.particles.ParticleOptions) -> a
     203:203:net.minecraft.core.particles.ParticleOptions read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26656,7 +29235,7 @@ net.minecraft.network.syncher.EntityDataSerializers$10 -> sd$2:
     194:194:java.lang.Object copy(java.lang.Object) -> a
     194:194:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     194:194:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$11 -> sd$3:
+net.minecraft.network.syncher.EntityDataSerializers$11 -> ts$3:
     216:216:void <init>() -> <init>
     219:222:void write(net.minecraft.network.FriendlyByteBuf,net.minecraft.core.Rotations) -> a
     226:226:net.minecraft.core.Rotations read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26664,7 +29243,7 @@ net.minecraft.network.syncher.EntityDataSerializers$11 -> sd$3:
     216:216:java.lang.Object copy(java.lang.Object) -> a
     216:216:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     216:216:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$12 -> sd$4:
+net.minecraft.network.syncher.EntityDataSerializers$12 -> ts$4:
     235:235:void <init>() -> <init>
     238:239:void write(net.minecraft.network.FriendlyByteBuf,net.minecraft.core.BlockPos) -> a
     243:243:net.minecraft.core.BlockPos read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26672,7 +29251,7 @@ net.minecraft.network.syncher.EntityDataSerializers$12 -> sd$4:
     235:235:java.lang.Object copy(java.lang.Object) -> a
     235:235:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     235:235:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$13 -> sd$5:
+net.minecraft.network.syncher.EntityDataSerializers$13 -> ts$5:
     252:252:void <init>() -> <init>
     255:259:void write(net.minecraft.network.FriendlyByteBuf,java.util.Optional) -> a
     263:266:java.util.Optional read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26680,7 +29259,7 @@ net.minecraft.network.syncher.EntityDataSerializers$13 -> sd$5:
     252:252:java.lang.Object copy(java.lang.Object) -> a
     252:252:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     252:252:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$14 -> sd$6:
+net.minecraft.network.syncher.EntityDataSerializers$14 -> ts$6:
     275:275:void <init>() -> <init>
     278:279:void write(net.minecraft.network.FriendlyByteBuf,net.minecraft.core.Direction) -> a
     283:283:net.minecraft.core.Direction read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26688,7 +29267,7 @@ net.minecraft.network.syncher.EntityDataSerializers$14 -> sd$6:
     275:275:java.lang.Object copy(java.lang.Object) -> a
     275:275:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     275:275:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$15 -> sd$7:
+net.minecraft.network.syncher.EntityDataSerializers$15 -> ts$7:
     292:292:void <init>() -> <init>
     295:299:void write(net.minecraft.network.FriendlyByteBuf,java.util.Optional) -> a
     303:306:java.util.Optional read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26696,7 +29275,7 @@ net.minecraft.network.syncher.EntityDataSerializers$15 -> sd$7:
     292:292:java.lang.Object copy(java.lang.Object) -> a
     292:292:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     292:292:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$16 -> sd$8:
+net.minecraft.network.syncher.EntityDataSerializers$16 -> ts$8:
     315:315:void <init>() -> <init>
     318:319:void write(net.minecraft.network.FriendlyByteBuf,net.minecraft.nbt.CompoundTag) -> a
     323:323:net.minecraft.nbt.CompoundTag read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26704,7 +29283,7 @@ net.minecraft.network.syncher.EntityDataSerializers$16 -> sd$8:
     315:315:java.lang.Object copy(java.lang.Object) -> a
     315:315:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     315:315:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$17 -> sd$9:
+net.minecraft.network.syncher.EntityDataSerializers$17 -> ts$9:
     332:332:void <init>() -> <init>
     335:338:void write(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.entity.npc.VillagerData) -> a
     342:345:net.minecraft.world.entity.npc.VillagerData read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26712,7 +29291,7 @@ net.minecraft.network.syncher.EntityDataSerializers$17 -> sd$9:
     332:332:java.lang.Object copy(java.lang.Object) -> a
     332:332:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     332:332:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$18 -> sd$10:
+net.minecraft.network.syncher.EntityDataSerializers$18 -> ts$10:
     355:355:void <init>() -> <init>
     358:359:void write(net.minecraft.network.FriendlyByteBuf,java.util.OptionalInt) -> a
     363:364:java.util.OptionalInt read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26720,7 +29299,7 @@ net.minecraft.network.syncher.EntityDataSerializers$18 -> sd$10:
     355:355:java.lang.Object copy(java.lang.Object) -> a
     355:355:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     355:355:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$19 -> sd$11:
+net.minecraft.network.syncher.EntityDataSerializers$19 -> ts$11:
     373:373:void <init>() -> <init>
     376:377:void write(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.entity.Pose) -> a
     381:381:net.minecraft.world.entity.Pose read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26728,7 +29307,7 @@ net.minecraft.network.syncher.EntityDataSerializers$19 -> sd$11:
     373:373:java.lang.Object copy(java.lang.Object) -> a
     373:373:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     373:373:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$2 -> sd$12:
+net.minecraft.network.syncher.EntityDataSerializers$2 -> ts$12:
     44:44:void <init>() -> <init>
     47:48:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Integer) -> a
     52:52:java.lang.Integer read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26736,7 +29315,7 @@ net.minecraft.network.syncher.EntityDataSerializers$2 -> sd$12:
     44:44:java.lang.Object copy(java.lang.Object) -> a
     44:44:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     44:44:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$3 -> sd$13:
+net.minecraft.network.syncher.EntityDataSerializers$3 -> ts$13:
     61:61:void <init>() -> <init>
     64:65:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Float) -> a
     69:69:java.lang.Float read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26744,7 +29323,7 @@ net.minecraft.network.syncher.EntityDataSerializers$3 -> sd$13:
     61:61:java.lang.Object copy(java.lang.Object) -> a
     61:61:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     61:61:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$4 -> sd$14:
+net.minecraft.network.syncher.EntityDataSerializers$4 -> ts$14:
     78:78:void <init>() -> <init>
     81:82:void write(net.minecraft.network.FriendlyByteBuf,java.lang.String) -> a
     86:86:java.lang.String read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26752,7 +29331,7 @@ net.minecraft.network.syncher.EntityDataSerializers$4 -> sd$14:
     78:78:java.lang.Object copy(java.lang.Object) -> a
     78:78:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     78:78:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$5 -> sd$15:
+net.minecraft.network.syncher.EntityDataSerializers$5 -> ts$15:
     95:95:void <init>() -> <init>
     98:99:void write(net.minecraft.network.FriendlyByteBuf,net.minecraft.network.chat.Component) -> a
     103:103:net.minecraft.network.chat.Component read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26760,7 +29339,7 @@ net.minecraft.network.syncher.EntityDataSerializers$5 -> sd$15:
     95:95:java.lang.Object copy(java.lang.Object) -> a
     95:95:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     95:95:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$6 -> sd$16:
+net.minecraft.network.syncher.EntityDataSerializers$6 -> ts$16:
     112:112:void <init>() -> <init>
     115:121:void write(net.minecraft.network.FriendlyByteBuf,java.util.Optional) -> a
     125:125:java.util.Optional read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26768,7 +29347,7 @@ net.minecraft.network.syncher.EntityDataSerializers$6 -> sd$16:
     112:112:java.lang.Object copy(java.lang.Object) -> a
     112:112:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     112:112:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$7 -> sd$17:
+net.minecraft.network.syncher.EntityDataSerializers$7 -> ts$17:
     134:134:void <init>() -> <init>
     137:138:void write(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.item.ItemStack) -> a
     142:142:net.minecraft.world.item.ItemStack read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26776,7 +29355,7 @@ net.minecraft.network.syncher.EntityDataSerializers$7 -> sd$17:
     134:134:java.lang.Object copy(java.lang.Object) -> a
     134:134:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     134:134:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$8 -> sd$18:
+net.minecraft.network.syncher.EntityDataSerializers$8 -> ts$18:
     151:151:void <init>() -> <init>
     154:159:void write(net.minecraft.network.FriendlyByteBuf,java.util.Optional) -> a
     163:167:java.util.Optional read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26784,7 +29363,7 @@ net.minecraft.network.syncher.EntityDataSerializers$8 -> sd$18:
     151:151:java.lang.Object copy(java.lang.Object) -> a
     151:151:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     151:151:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.EntityDataSerializers$9 -> sd$19:
+net.minecraft.network.syncher.EntityDataSerializers$9 -> ts$19:
     177:177:void <init>() -> <init>
     180:181:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Boolean) -> a
     185:185:java.lang.Boolean read(net.minecraft.network.FriendlyByteBuf) -> b
@@ -26792,7 +29371,7 @@ net.minecraft.network.syncher.EntityDataSerializers$9 -> sd$19:
     177:177:java.lang.Object copy(java.lang.Object) -> a
     177:177:java.lang.Object read(net.minecraft.network.FriendlyByteBuf) -> a
     177:177:void write(net.minecraft.network.FriendlyByteBuf,java.lang.Object) -> a
-net.minecraft.network.syncher.SynchedEntityData -> se:
+net.minecraft.network.syncher.SynchedEntityData -> tt:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Map ENTITY_ID_POOL -> b
     net.minecraft.world.entity.Entity entity -> c
@@ -26819,7 +29398,7 @@ net.minecraft.network.syncher.SynchedEntityData -> se:
     247:247:boolean isEmpty() -> d
     251:258:void clearDirty() -> e
     25:26:void <clinit>() -> <clinit>
-net.minecraft.network.syncher.SynchedEntityData$DataItem -> se$a:
+net.minecraft.network.syncher.SynchedEntityData$DataItem -> tt$a:
     net.minecraft.network.syncher.EntityDataAccessor accessor -> a
     java.lang.Object value -> b
     boolean dirty -> c
@@ -26832,671 +29411,115 @@ net.minecraft.network.syncher.SynchedEntityData$DataItem -> se$a:
     292:292:net.minecraft.network.syncher.SynchedEntityData$DataItem copy() -> d
     260:260:net.minecraft.network.syncher.EntityDataAccessor access$000(net.minecraft.network.syncher.SynchedEntityData$DataItem) -> a
     260:260:java.lang.Object access$100(net.minecraft.network.syncher.SynchedEntityData$DataItem) -> b
-net.minecraft.network.syncher.package-info -> sf:
+net.minecraft.network.syncher.package-info -> tu:
 net.minecraft.obfuscate.DontObfuscateOrShrink -> net.minecraft.obfuscate.DontObfuscateOrShrink:
 net.minecraft.obfuscate.KeepAfterObfuscation -> net.minecraft.obfuscate.KeepAfterObfuscation:
-net.minecraft.obfuscate.package-info -> sg:
-net.minecraft.package-info -> sh:
-net.minecraft.realms.AbstractRealmsButton -> net.minecraft.realms.AbstractRealmsButton:
-    7:7:void <init>() -> <init>
-    net.minecraft.client.gui.components.AbstractWidget getProxy() -> getProxy
-    11:11:boolean active() -> active
-    15:16:void active(boolean) -> active
-    19:19:boolean isVisible() -> isVisible
-    23:24:void setVisible(boolean) -> setVisible
-    27:28:void render(int,int,float) -> render
-    31:32:void blit(int,int,int,int,int,int) -> blit
-    35:35:void tick() -> tick
-net.minecraft.realms.DisconnectedRealmsScreen -> net.minecraft.realms.DisconnectedRealmsScreen:
-    java.lang.String title -> title
-    net.minecraft.network.chat.Component reason -> reason
-    java.util.List lines -> lines
-    net.minecraft.realms.RealmsScreen parent -> parent
-    int textHeight -> textHeight
-    17:21:void <init>(net.minecraft.realms.RealmsScreen,java.lang.String,net.minecraft.network.chat.Component) -> <init>
-    25:38:void init() -> init
-    42:46:boolean keyPressed(int,int,int) -> keyPressed
-    51:65:void render(int,int,float) -> render
-    10:10:net.minecraft.realms.RealmsScreen access$000(net.minecraft.realms.DisconnectedRealmsScreen) -> access$000
-net.minecraft.realms.DisconnectedRealmsScreen$1 -> net.minecraft.realms.DisconnectedRealmsScreen$1:
-    net.minecraft.realms.DisconnectedRealmsScreen this$0 -> a
-    32:32:void <init>(net.minecraft.realms.DisconnectedRealmsScreen,int,int,int,java.lang.String) -> <init>
-    35:36:void onPress() -> onPress
-net.minecraft.realms.RealmListEntry -> net.minecraft.realms.RealmListEntry:
-    7:7:void <init>() -> <init>
-    void render(int,int,int,int,int,int,int,boolean,float) -> render
-    13:13:boolean mouseClicked(double,double,int) -> mouseClicked
-net.minecraft.realms.Realms -> net.minecraft.realms.Realms:
-    net.minecraft.realms.RepeatedNarrator REPEATED_NARRATOR -> REPEATED_NARRATOR
-    33:33:void <init>() -> <init>
-    35:35:boolean isTouchScreen() -> isTouchScreen
-    39:39:java.net.Proxy getProxy() -> getProxy
-    43:47:java.lang.String sessionId() -> sessionId
-    51:55:java.lang.String userName() -> userName
-    59:59:long currentTimeMillis() -> currentTimeMillis
-    63:63:java.lang.String getSessionId() -> getSessionId
-    67:67:java.lang.String getUUID() -> getUUID
-    71:71:java.lang.String getName() -> getName
-    75:75:java.lang.String uuidToName(java.lang.String) -> uuidToName
-    79:79:java.util.concurrent.CompletableFuture execute(java.util.function.Supplier) -> execute
-    83:84:void execute(java.lang.Runnable) -> execute
-    87:91:void setScreen(net.minecraft.realms.RealmsScreen) -> setScreen
-    94:95:void setScreenDirect(net.minecraft.realms.RealmsScreen) -> setScreenDirect
-    98:98:java.lang.String getGameDirectoryPath() -> getGameDirectoryPath
-    102:102:int survivalId() -> survivalId
-    106:106:int creativeId() -> creativeId
-    110:110:int adventureId() -> adventureId
-    114:114:int spectatorId() -> spectatorId
-    118:119:void setConnectedToRealms(boolean) -> setConnectedToRealms
-    122:122:java.util.concurrent.CompletableFuture downloadResourcePack(java.lang.String,java.lang.String) -> downloadResourcePack
-    126:127:void clearResourcePack() -> clearResourcePack
-    130:130:boolean getRealmsNotificationsEnabled() -> getRealmsNotificationsEnabled
-    134:134:boolean inTitleScreen() -> inTitleScreen
-    138:148:void deletePlayerTag(java.io.File) -> deletePlayerTag
-    151:152:void openUri(java.lang.String) -> openUri
-    155:156:void setClipboard(java.lang.String) -> setClipboard
-    160:160:java.lang.String getMinecraftVersionString() -> getMinecraftVersionString
-    164:164:net.minecraft.resources.ResourceLocation resourceLocation(java.lang.String) -> resourceLocation
-    168:168:java.lang.String getLocalizedString(java.lang.String,java.lang.Object[]) -> getLocalizedString
-    172:174:void bind(java.lang.String) -> bind
-    177:180:void narrateNow(java.lang.String) -> narrateNow
-    183:183:java.lang.String fixNarrationNewlines(java.lang.String) -> fixNarrationNewlines
-    192:193:void narrateNow(java.lang.String[]) -> narrateNow
-    196:197:void narrateNow(java.lang.Iterable) -> narrateNow
-    200:200:java.lang.String joinNarrations(java.lang.Iterable) -> joinNarrations
-    206:207:void narrateRepeatedly(java.lang.String) -> narrateRepeatedly
-    88:89:java.lang.Object lambda$setScreen$0(net.minecraft.realms.RealmsScreen) -> lambda$setScreen$0
-    203:203:void <clinit>() -> <clinit>
-net.minecraft.realms.RealmsAbstractButtonProxy -> net.minecraft.realms.RealmsAbstractButtonProxy:
-    net.minecraft.realms.AbstractRealmsButton getButton() -> getButton
-    boolean active() -> active
-    void active(boolean) -> active
-    boolean isVisible() -> isVisible
-    void setVisible(boolean) -> setVisible
-net.minecraft.realms.RealmsAnvilLevelStorageSource -> net.minecraft.realms.RealmsAnvilLevelStorageSource:
-    net.minecraft.world.level.storage.LevelStorageSource levelStorageSource -> levelStorageSource
-    16:18:void <init>(net.minecraft.world.level.storage.LevelStorageSource) -> <init>
-    21:21:java.lang.String getName() -> getName
-    25:25:boolean levelExists(java.lang.String) -> levelExists
-    29:29:boolean convertLevel(java.lang.String,net.minecraft.util.ProgressListener) -> convertLevel
-    33:33:boolean requiresConversion(java.lang.String) -> requiresConversion
-    37:37:boolean isNewLevelIdAcceptable(java.lang.String) -> isNewLevelIdAcceptable
-    41:41:boolean deleteLevel(java.lang.String) -> deleteLevel
-    45:46:void renameLevel(java.lang.String,java.lang.String) -> renameLevel
-    49:53:java.util.List getLevelList() -> getLevelList
-net.minecraft.realms.RealmsBridge -> net.minecraft.realms.RealmsBridge:
-    net.minecraft.client.gui.screens.Screen previousScreen -> previousScreen
-    15:15:void <init>() -> <init>
-    19:22:void switchToRealms(net.minecraft.client.gui.screens.Screen) -> switchToRealms
-    26:27:net.minecraft.realms.RealmsScreenProxy getNotificationScreen(net.minecraft.client.gui.screens.Screen) -> getNotificationScreen
-    32:33:void init() -> init
-net.minecraft.realms.RealmsButton -> net.minecraft.realms.RealmsButton:
-    net.minecraft.resources.ResourceLocation WIDGETS_LOCATION -> WIDGETS_LOCATION
-    int id -> id
-    net.minecraft.realms.RealmsButtonProxy proxy -> proxy
-    15:16:void <init>(int,int,int,java.lang.String) -> <init>
-    18:21:void <init>(int,int,int,int,int,java.lang.String) -> <init>
-    25:25:net.minecraft.realms.RealmsButtonProxy getProxy() -> getProxy
-    29:29:int id() -> id
-    33:34:void setMessage(java.lang.String) -> setMessage
-    37:37:int getWidth() -> getWidth
-    41:41:int getHeight() -> getHeight
-    45:45:int y() -> y
-    49:49:int x() -> x
-    53:53:void renderBg(int,int) -> renderBg
-    56:56:int getYImage(boolean) -> getYImage
-    void onPress() -> onPress
-    62:62:void onRelease(double,double) -> onRelease
-    65:66:void renderButton(int,int,float) -> renderButton
-    69:70:void drawCenteredString(java.lang.String,int,int,int) -> drawCenteredString
-    7:7:net.minecraft.client.gui.components.AbstractWidget getProxy() -> getProxy
-    20:20:void lambda$new$0(net.minecraft.client.gui.components.Button) -> lambda$new$0
-    9:9:void <clinit>() -> <clinit>
-net.minecraft.realms.RealmsButtonProxy -> net.minecraft.realms.RealmsButtonProxy:
-    net.minecraft.realms.RealmsButton button -> button
-    12:14:void <init>(net.minecraft.realms.RealmsButton,int,int,java.lang.String,int,int,net.minecraft.client.gui.components.Button$OnPress) -> <init>
-    18:18:boolean active() -> active
-    23:24:void active(boolean) -> active
-    28:28:boolean isVisible() -> isVisible
-    33:34:void setVisible(boolean) -> setVisible
-    38:39:void setMessage(java.lang.String) -> setMessage
-    43:43:int getWidth() -> getWidth
-    47:47:int y() -> y
-    52:53:void onClick(double,double) -> onClick
-    57:58:void onRelease(double,double) -> onRelease
-    62:63:void renderBg(net.minecraft.client.Minecraft,int,int) -> renderBg
-    67:68:void renderButton(int,int,float) -> renderButton
-    71:72:void superRenderButton(int,int,float) -> superRenderButton
-    76:76:net.minecraft.realms.RealmsButton getButton() -> getButton
-    81:81:int getYImage(boolean) -> getYImage
-    85:85:int getSuperYImage(boolean) -> getSuperYImage
-    89:89:int getHeight() -> getHeight
-    94:94:boolean isHovered() -> isHovered
-    7:7:net.minecraft.realms.AbstractRealmsButton getButton() -> getButton
-net.minecraft.realms.RealmsClickableScrolledSelectionList -> net.minecraft.realms.RealmsClickableScrolledSelectionList:
-    net.minecraft.realms.RealmsClickableScrolledSelectionListProxy proxy -> proxy
-    10:12:void <init>(int,int,int,int,int) -> <init>
-    15:16:void render(int,int,float) -> render
-    19:19:int width() -> width
-    23:23:void renderItem(int,int,int,int,net.minecraft.realms.Tezzelator,int,int) -> renderItem
-    26:27:void renderItem(int,int,int,int,int,int) -> renderItem
-    30:30:int getItemCount() -> getItemCount
-    34:34:boolean selectItem(int,int,double,double) -> selectItem
-    38:38:boolean isSelectedItem(int) -> isSelectedItem
-    42:42:void renderBackground() -> renderBackground
-    45:45:int getMaxPosition() -> getMaxPosition
-    49:49:int getScrollbarPosition() -> getScrollbarPosition
-    54:54:net.minecraft.client.gui.components.events.GuiEventListener getProxy() -> getProxy
-    58:59:void scroll(int) -> scroll
-    62:62:int getScroll() -> getScroll
-    66:66:void renderList(int,int,int,int) -> renderList
-    69:69:void itemClicked(int,int,double,double,int) -> itemClicked
-    72:72:void renderSelected(int,int,int,net.minecraft.realms.Tezzelator) -> renderSelected
-    75:76:void setLeftPos(int) -> setLeftPos
-    79:79:int y0() -> y0
-    83:83:int y1() -> y1
-    87:87:int headerHeight() -> headerHeight
-    91:91:double yo() -> yo
-    95:95:int itemHeight() -> itemHeight
-    99:99:boolean isVisible() -> isVisible
-net.minecraft.realms.RealmsClickableScrolledSelectionListProxy -> net.minecraft.realms.RealmsClickableScrolledSelectionListProxy:
-    net.minecraft.realms.RealmsClickableScrolledSelectionList realmsClickableScrolledSelectionList -> realmsClickableScrolledSelectionList
-    12:14:void <init>(net.minecraft.realms.RealmsClickableScrolledSelectionList,int,int,int,int,int) -> <init>
-    18:18:int getItemCount() -> getItemCount
-    23:23:boolean selectItem(int,int,double,double) -> selectItem
-    28:28:boolean isSelectedItem(int) -> isSelectedItem
-    33:34:void renderBackground() -> renderBackground
-    38:39:void renderItem(int,int,int,int,int,int,float) -> renderItem
-    42:42:int getWidth() -> getWidth
-    47:47:int getMaxPosition() -> getMaxPosition
-    52:52:int getScrollbarPosition() -> getScrollbarPosition
-    56:57:void itemClicked(int,int,int,int,int) -> itemClicked
-    61:64:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    69:72:boolean mouseClicked(double,double,int) -> mouseClicked
-    77:77:boolean mouseReleased(double,double,int) -> mouseReleased
-    82:85:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    89:90:void renderSelected(int,int,int,net.minecraft.realms.Tezzelator) -> renderSelected
-    94:110:void renderList(int,int,int,int,float) -> renderList
-    113:113:int y0() -> y0
-    117:117:int y1() -> y1
-    121:121:int headerHeight() -> headerHeight
-    125:125:double yo() -> yo
-    129:129:int itemHeight() -> itemHeight
-net.minecraft.realms.RealmsConfirmResultListener -> net.minecraft.realms.RealmsConfirmResultListener:
-    void confirmResult(boolean,int) -> confirmResult
-net.minecraft.realms.RealmsConnect -> net.minecraft.realms.RealmsConnect:
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    net.minecraft.realms.RealmsScreen onlineScreen -> onlineScreen
-    boolean aborted -> aborted
-    net.minecraft.network.Connection connection -> connection
-    25:27:void <init>(net.minecraft.realms.RealmsScreen) -> <init>
-    30:91:void connect(java.lang.String,int) -> connect
-    94:102:void abort() -> abort
-    105:112:void tick() -> tick
-    18:18:boolean access$000(net.minecraft.realms.RealmsConnect) -> access$000
-    18:18:net.minecraft.network.Connection access$102(net.minecraft.realms.RealmsConnect,net.minecraft.network.Connection) -> access$102
-    18:18:net.minecraft.network.Connection access$100(net.minecraft.realms.RealmsConnect) -> access$100
-    18:18:net.minecraft.realms.RealmsScreen access$200(net.minecraft.realms.RealmsConnect) -> access$200
-    18:18:org.apache.logging.log4j.Logger access$300() -> access$300
+net.minecraft.obfuscate.package-info -> tv:
+net.minecraft.package-info -> tw:
+net.minecraft.realms.DisconnectedRealmsScreen -> eqb:
+    java.lang.String title -> a
+    net.minecraft.network.chat.Component reason -> b
+    java.util.List lines -> c
+    net.minecraft.client.gui.screens.Screen parent -> p
+    int textHeight -> q
+    24:28:void <init>(net.minecraft.client.gui.screens.Screen,java.lang.String,net.minecraft.network.chat.Component) -> <init>
+    32:43:void init() -> b
+    47:51:boolean keyPressed(int,int,int) -> a
+    56:70:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> a
+    41:41:void lambda$init$0(net.minecraft.client.Minecraft,net.minecraft.client.gui.components.Button) -> a
+net.minecraft.realms.NarrationHelper -> eqc:
+    net.minecraft.realms.RepeatedNarrator REPEATED_NARRATOR -> a
+    11:11:void <init>() -> <init>
+    15:18:void now(java.lang.String) -> a
+    21:21:java.lang.String fixNarrationNewlines(java.lang.String) -> c
+    30:31:void now(java.lang.String[]) -> a
+    34:35:void now(java.lang.Iterable) -> a
+    38:38:java.lang.String join(java.lang.Iterable) -> b
+    42:43:void repeatedly(java.lang.String) -> b
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.realms.RealmsBridge -> eqd:
+    net.minecraft.client.gui.screens.Screen previousScreen -> a
+    14:14:void <init>() -> <init>
+    18:21:void switchToRealms(net.minecraft.client.gui.screens.Screen) -> a
+    25:26:net.minecraft.realms.RealmsScreen getNotificationScreen(net.minecraft.client.gui.screens.Screen) -> b
+    31:32:void init() -> b
+net.minecraft.realms.RealmsConnect -> eqe:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.client.gui.screens.Screen onlineScreen -> b
+    boolean aborted -> c
+    net.minecraft.network.Connection connection -> d
+    25:27:void <init>(net.minecraft.client.gui.screens.Screen) -> <init>
+    30:94:void connect(java.lang.String,int) -> a
+    97:105:void abort() -> a
+    108:115:void tick() -> b
+    18:18:boolean access$000(net.minecraft.realms.RealmsConnect) -> a
+    18:18:net.minecraft.network.Connection access$102(net.minecraft.realms.RealmsConnect,net.minecraft.network.Connection) -> a
+    18:18:net.minecraft.network.Connection access$100(net.minecraft.realms.RealmsConnect) -> b
+    18:18:net.minecraft.client.gui.screens.Screen access$200(net.minecraft.realms.RealmsConnect) -> c
+    18:18:org.apache.logging.log4j.Logger access$300() -> c
     19:19:void <clinit>() -> <clinit>
-net.minecraft.realms.RealmsConnect$1 -> net.minecraft.realms.RealmsConnect$1:
+net.minecraft.realms.RealmsConnect$1 -> eqe$1:
     java.lang.String val$hostname -> a
     int val$port -> b
-    net.minecraft.realms.RealmsConnect this$0 -> c
-    33:33:void <init>(net.minecraft.realms.RealmsConnect,java.lang.String,java.lang.String,int) -> <init>
-    36:89:void run() -> run
-    50:50:void lambda$run$0(net.minecraft.network.chat.Component) -> a
-net.minecraft.realms.RealmsDefaultVertexFormat -> net.minecraft.realms.RealmsDefaultVertexFormat:
-    net.minecraft.realms.RealmsVertexFormat POSITION_COLOR -> POSITION_COLOR
-    net.minecraft.realms.RealmsVertexFormat POSITION_TEX_COLOR -> POSITION_TEX_COLOR
-    7:7:void <init>() -> <init>
-    8:9:void <clinit>() -> <clinit>
-net.minecraft.realms.RealmsEditBox -> net.minecraft.realms.RealmsEditBox:
-    net.minecraft.client.gui.components.EditBox editBox -> editBox
-    12:14:void <init>(int,int,int,int,int,java.lang.String) -> <init>
-    17:17:java.lang.String getValue() -> getValue
-    21:22:void tick() -> tick
-    25:26:void setValue(java.lang.String) -> setValue
-    30:30:boolean charTyped(char,int) -> charTyped
-    35:35:net.minecraft.client.gui.components.events.GuiEventListener getProxy() -> getProxy
-    40:40:boolean keyPressed(int,int,int) -> keyPressed
-    44:44:boolean isFocused() -> isFocused
-    49:49:boolean mouseClicked(double,double,int) -> mouseClicked
-    54:54:boolean mouseReleased(double,double,int) -> mouseReleased
-    59:59:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    64:64:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    68:69:void render(int,int,float) -> render
-    72:73:void setMaxLength(int) -> setMaxLength
-    76:77:void setIsEditable(boolean) -> setIsEditable
-net.minecraft.realms.RealmsGuiEventListener -> net.minecraft.realms.RealmsGuiEventListener:
-    8:9:void <init>() -> <init>
-    12:12:boolean mouseClicked(double,double,int) -> mouseClicked
-    16:16:boolean mouseReleased(double,double,int) -> mouseReleased
-    20:20:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    24:24:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    28:28:boolean keyPressed(int,int,int) -> keyPressed
-    32:32:boolean keyReleased(int,int,int) -> keyReleased
-    36:36:boolean charTyped(char,int) -> charTyped
-    net.minecraft.client.gui.components.events.GuiEventListener getProxy() -> getProxy
-net.minecraft.realms.RealmsLabel -> net.minecraft.realms.RealmsLabel:
-    net.minecraft.realms.RealmsLabelProxy proxy -> proxy
-    java.lang.String text -> text
-    int x -> x
-    int y -> y
-    int color -> color
-    14:20:void <init>(java.lang.String,int,int,int) -> <init>
-    23:24:void render(net.minecraft.realms.RealmsScreen) -> render
-    28:28:net.minecraft.client.gui.components.events.GuiEventListener getProxy() -> getProxy
-    32:32:java.lang.String getText() -> getText
-net.minecraft.realms.RealmsLabelProxy -> net.minecraft.realms.RealmsLabelProxy:
-    net.minecraft.realms.RealmsLabel label -> label
-    10:12:void <init>(net.minecraft.realms.RealmsLabel) -> <init>
-    15:15:net.minecraft.realms.RealmsLabel getLabel() -> getLabel
-net.minecraft.realms.RealmsLevelSummary -> net.minecraft.realms.RealmsLevelSummary:
-    net.minecraft.world.level.storage.LevelSummary levelSummary -> levelSummary
-    10:12:void <init>(net.minecraft.world.level.storage.LevelSummary) -> <init>
-    15:15:int getGameMode() -> getGameMode
-    19:19:java.lang.String getLevelId() -> getLevelId
-    23:23:boolean hasCheats() -> hasCheats
-    27:27:boolean isHardcore() -> isHardcore
-    31:31:boolean isRequiresConversion() -> isRequiresConversion
-    35:35:java.lang.String getLevelName() -> getLevelName
-    39:39:long getLastPlayed() -> getLastPlayed
-    43:43:int compareTo(net.minecraft.world.level.storage.LevelSummary) -> compareTo
-    47:47:long getSizeOnDisk() -> getSizeOnDisk
-    52:58:int compareTo(net.minecraft.realms.RealmsLevelSummary) -> compareTo
-    6:6:int compareTo(java.lang.Object) -> compareTo
-net.minecraft.realms.RealmsMth -> net.minecraft.realms.RealmsMth:
-    10:10:void <init>() -> <init>
-    12:12:float sin(float) -> sin
-    16:16:double nextDouble(java.util.Random,double,double) -> nextDouble
-    20:20:int ceil(float) -> ceil
-    24:24:int floor(double) -> floor
-    28:28:int intFloorDiv(int,int) -> intFloorDiv
-    32:32:float abs(float) -> abs
-    36:36:int clamp(int,int,int) -> clamp
-    40:40:double clampedLerp(double,double,double) -> clampedLerp
-    44:44:int ceil(double) -> ceil
-    48:48:boolean isEmpty(java.lang.String) -> isEmpty
-    52:52:long lfloor(double) -> lfloor
-    56:56:float sqrt(double) -> sqrt
-    60:60:double clamp(double,double,double) -> clamp
-    64:64:int getInt(java.lang.String,int) -> getInt
-    68:68:double getDouble(java.lang.String,double) -> getDouble
-    72:72:int log2(int) -> log2
-    76:76:int absFloor(double) -> absFloor
-    80:80:int smallestEncompassingPowerOfTwo(int) -> smallestEncompassingPowerOfTwo
-    84:84:float sqrt(float) -> sqrt
-    88:88:float cos(float) -> cos
-    92:92:int getInt(java.lang.String,int,int) -> getInt
-    96:96:int fastFloor(double) -> fastFloor
-    100:100:double absMax(double,double) -> absMax
-    104:104:float nextFloat(java.util.Random,float,float) -> nextFloat
-    108:108:double wrapDegrees(double) -> wrapDegrees
-    112:112:float wrapDegrees(float) -> wrapDegrees
-    116:116:float clamp(float,float,float) -> clamp
-    120:120:double getDouble(java.lang.String,double,double) -> getDouble
-    124:124:int roundUp(int,int) -> roundUp
-    128:128:double average(long[]) -> average
-    132:132:int floor(float) -> floor
-    136:136:int abs(int) -> abs
-    140:140:int nextInt(java.util.Random,int,int) -> nextInt
-net.minecraft.realms.RealmsObjectSelectionList -> net.minecraft.realms.RealmsObjectSelectionList:
-    net.minecraft.realms.RealmsObjectSelectionListProxy proxy -> proxy
-    14:16:void <init>(int,int,int,int,int) -> <init>
-    19:20:void render(int,int,float) -> render
-    23:24:void addEntry(net.minecraft.realms.RealmListEntry) -> addEntry
-    27:28:void remove(int) -> remove
-    31:32:void clear() -> clear
-    35:35:boolean removeEntry(net.minecraft.realms.RealmListEntry) -> removeEntry
-    39:39:int width() -> width
-    43:43:void renderItem(int,int,int,int,net.minecraft.realms.Tezzelator,int,int) -> renderItem
-    46:47:void setLeftPos(int) -> setLeftPos
-    50:51:void renderItem(int,int,int,int,int,int) -> renderItem
-    54:55:void setSelected(int) -> setSelected
-    58:58:void itemClicked(int,int,double,double,int) -> itemClicked
-    61:61:int getItemCount() -> getItemCount
-    65:65:void renderBackground() -> renderBackground
-    68:68:int getMaxPosition() -> getMaxPosition
-    72:72:int getScrollbarPosition() -> getScrollbarPosition
-    76:76:int y0() -> y0
-    80:80:int y1() -> y1
-    84:84:int headerHeight() -> headerHeight
-    88:88:int itemHeight() -> itemHeight
-    92:93:void scroll(int) -> scroll
-    96:96:int getScroll() -> getScroll
-    101:101:net.minecraft.client.gui.components.events.GuiEventListener getProxy() -> getProxy
-    105:105:int getRowWidth() -> getRowWidth
-    boolean isFocused() -> isFocused
-    111:112:void selectItem(int) -> selectItem
-    116:116:net.minecraft.realms.RealmListEntry getSelected() -> getSelected
-    120:120:java.util.List children() -> children
-    124:125:void replaceEntries(java.util.Collection) -> replaceEntries
-    128:128:int getRowTop(int) -> getRowTop
-    132:132:int getRowLeft() -> getRowLeft
-net.minecraft.realms.RealmsObjectSelectionListProxy -> net.minecraft.realms.RealmsObjectSelectionListProxy:
-    net.minecraft.realms.RealmsObjectSelectionList realmsObjectSelectionList -> realmsObjectSelectionList
-    16:18:void <init>(net.minecraft.realms.RealmsObjectSelectionList,int,int,int,int,int) -> <init>
-    22:22:int getItemCount() -> getItemCount
-    26:27:void clear() -> clear
-    31:31:boolean isFocused() -> isFocused
-    35:41:void setSelectedItem(int) -> setSelectedItem
-    45:47:void setSelected(net.minecraft.client.gui.components.ObjectSelectionList$Entry) -> setSelected
-    51:52:void renderBackground() -> renderBackground
-    55:55:int getWidth() -> getWidth
-    60:60:int getMaxPosition() -> getMaxPosition
-    65:65:int getScrollbarPosition() -> getScrollbarPosition
-    70:73:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    78:78:int getRowWidth() -> getRowWidth
-    83:86:boolean mouseClicked(double,double,int) -> mouseClicked
-    91:91:boolean mouseReleased(double,double,int) -> mouseReleased
-    96:99:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    104:104:int addEntry(net.minecraft.client.gui.components.ObjectSelectionList$Entry) -> addEntry
-    108:108:net.minecraft.client.gui.components.ObjectSelectionList$Entry remove(int) -> remove
-    112:112:boolean removeEntry(net.minecraft.client.gui.components.ObjectSelectionList$Entry) -> removeEntry
-    117:118:void setScrollAmount(double) -> setScrollAmount
-    121:121:int y0() -> y0
-    125:125:int y1() -> y1
-    129:129:int headerHeight() -> headerHeight
-    133:133:int itemHeight() -> itemHeight
-    138:141:boolean keyPressed(int,int,int) -> keyPressed
-    146:147:void replaceEntries(java.util.Collection) -> replaceEntries
-    151:151:int getRowTop(int) -> getRowTop
-    156:156:int getRowLeft() -> getRowLeft
-    11:11:boolean removeEntry(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> removeEntry
-    11:11:net.minecraft.client.gui.components.AbstractSelectionList$Entry remove(int) -> remove
-    11:11:int addEntry(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> addEntry
-    11:11:void setSelected(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> setSelected
-    12:12:boolean access$001(net.minecraft.realms.RealmsObjectSelectionListProxy,double,double,int) -> access$001
-net.minecraft.realms.RealmsScreen -> net.minecraft.realms.RealmsScreen:
-    int SKIN_HEAD_U -> SKIN_HEAD_U
-    int SKIN_HEAD_V -> SKIN_HEAD_V
-    int SKIN_HEAD_WIDTH -> SKIN_HEAD_WIDTH
-    int SKIN_HEAD_HEIGHT -> SKIN_HEAD_HEIGHT
-    int SKIN_HAT_U -> SKIN_HAT_U
-    int SKIN_HAT_V -> SKIN_HAT_V
-    int SKIN_HAT_WIDTH -> SKIN_HAT_WIDTH
-    int SKIN_HAT_HEIGHT -> SKIN_HAT_HEIGHT
-    int SKIN_TEX_WIDTH -> SKIN_TEX_WIDTH
-    int SKIN_TEX_HEIGHT -> SKIN_TEX_HEIGHT
-    net.minecraft.client.Minecraft minecraft -> minecraft
-    int width -> width
-    int height -> height
-    net.minecraft.realms.RealmsScreenProxy proxy -> proxy
-    31:33:void <init>() -> <init>
-    37:37:net.minecraft.realms.RealmsScreenProxy getProxy() -> getProxy
-    45:45:void init() -> init
-    48:49:void init(net.minecraft.client.Minecraft,int,int) -> init
-    52:53:void drawCenteredString(java.lang.String,int,int,int) -> drawCenteredString
-    56:56:int draw(java.lang.String,int,int,int,boolean) -> draw
-    60:61:void drawString(java.lang.String,int,int,int) -> drawString
-    64:65:void drawString(java.lang.String,int,int,int,boolean) -> drawString
-    68:69:void blit(int,int,int,int,int,int) -> blit
-    72:73:void blit(int,int,float,float,int,int,int,int,int,int) -> blit
-    76:77:void blit(int,int,float,float,int,int,int,int) -> blit
-    80:81:void fillGradient(int,int,int,int,int,int) -> fillGradient
-    84:85:void renderBackground() -> renderBackground
-    88:88:boolean isPauseScreen() -> isPauseScreen
-    92:93:void renderBackground(int) -> renderBackground
-    96:99:void render(int,int,float) -> render
-    102:103:void renderTooltip(net.minecraft.world.item.ItemStack,int,int) -> renderTooltip
-    106:107:void renderTooltip(java.lang.String,int,int) -> renderTooltip
-    110:111:void renderTooltip(java.util.List,int,int) -> renderTooltip
-    114:115:void bind(java.lang.String) -> bind
-    118:119:void tick() -> tick
-    122:125:void tickButtons() -> tickButtons
-    128:128:int width() -> width
-    132:132:int height() -> height
-    140:140:int fontLineHeight() -> fontLineHeight
-    144:144:int fontWidth(java.lang.String) -> fontWidth
-    148:149:void fontDrawShadow(java.lang.String,int,int,int) -> fontDrawShadow
-    152:152:java.util.List fontSplit(java.lang.String,int) -> fontSplit
-    160:161:void childrenClear() -> childrenClear
-    164:165:void addWidget(net.minecraft.realms.RealmsGuiEventListener) -> addWidget
-    168:169:void removeWidget(net.minecraft.realms.RealmsGuiEventListener) -> removeWidget
-    172:172:boolean hasWidget(net.minecraft.realms.RealmsGuiEventListener) -> hasWidget
-    180:181:void buttonsAdd(net.minecraft.realms.AbstractRealmsButton) -> buttonsAdd
-    184:184:java.util.List buttons() -> buttons
-    188:189:void buttonsClear() -> buttonsClear
-    192:193:void focusOn(net.minecraft.realms.RealmsGuiEventListener) -> focusOn
-    200:200:net.minecraft.realms.RealmsEditBox newEditBox(int,int,int,int,int) -> newEditBox
-    204:204:net.minecraft.realms.RealmsEditBox newEditBox(int,int,int,int,int,java.lang.String) -> newEditBox
-    213:213:void confirmResult(boolean,int) -> confirmResult
-    220:220:java.lang.String getLocalizedString(java.lang.String) -> getLocalizedString
-    224:224:java.lang.String getLocalizedString(java.lang.String,java.lang.Object[]) -> getLocalizedString
-    228:228:java.util.List getLocalizedStringWithLineWidth(java.lang.String,int) -> getLocalizedStringWithLineWidth
-    236:236:net.minecraft.realms.RealmsAnvilLevelStorageSource getLevelStorageSource() -> getLevelStorageSource
-    240:240:void removed() -> removed
-    243:244:void removeButton(net.minecraft.realms.RealmsButton) -> removeButton
-    247:248:void setKeyboardHandlerSendRepeatsToGui(boolean) -> setKeyboardHandlerSendRepeatsToGui
-    251:251:boolean isKeyDown(int) -> isKeyDown
-    255:256:void narrateLabels() -> narrateLabels
-    259:259:boolean isFocused(net.minecraft.realms.RealmsGuiEventListener) -> isFocused
-    12:12:net.minecraft.client.gui.components.events.GuiEventListener getProxy() -> getProxy
-net.minecraft.realms.RealmsScreenProxy -> net.minecraft.realms.RealmsScreenProxy:
-    net.minecraft.realms.RealmsScreen screen -> screen
-    org.apache.logging.log4j.Logger LOGGER -> LOGGER
-    27:31:void <init>(net.minecraft.realms.RealmsScreen) -> <init>
-    34:34:net.minecraft.realms.RealmsScreen getScreen() -> getScreen
-    39:41:void init(net.minecraft.client.Minecraft,int,int) -> init
-    49:51:void init() -> init
-    54:55:void drawCenteredString(java.lang.String,int,int,int) -> drawCenteredString
-    58:63:void drawString(java.lang.String,int,int,int,boolean) -> drawString
-    67:69:void blit(int,int,int,int,int,int) -> blit
-    72:73:void blit(int,int,float,float,int,int,int,int,int,int) -> blit
-    76:77:void blit(int,int,float,float,int,int,int,int) -> blit
-    81:82:void fillGradient(int,int,int,int,int,int) -> fillGradient
-    86:87:void renderBackground() -> renderBackground
-    91:91:boolean isPauseScreen() -> isPauseScreen
-    96:97:void renderBackground(int) -> renderBackground
-    101:102:void render(int,int,float) -> render
-    106:107:void renderTooltip(net.minecraft.world.item.ItemStack,int,int) -> renderTooltip
-    111:112:void renderTooltip(java.lang.String,int,int) -> renderTooltip
-    116:117:void renderTooltip(java.util.List,int,int) -> renderTooltip
-    121:123:void tick() -> tick
-    126:126:int width() -> width
-    130:130:int height() -> height
-    138:138:int fontLineHeight() -> fontLineHeight
-    142:142:int fontWidth(java.lang.String) -> fontWidth
-    146:147:void fontDrawShadow(java.lang.String,int,int,int) -> fontDrawShadow
-    150:150:java.util.List fontSplit(java.lang.String,int) -> fontSplit
-    158:159:void childrenClear() -> childrenClear
-    162:165:void addWidget(net.minecraft.realms.RealmsGuiEventListener) -> addWidget
-    168:173:void narrateLabels() -> narrateLabels
-    176:179:void removeWidget(net.minecraft.realms.RealmsGuiEventListener) -> removeWidget
-    182:182:boolean hasWidget(net.minecraft.realms.RealmsGuiEventListener) -> hasWidget
-    190:191:void buttonsAdd(net.minecraft.realms.AbstractRealmsButton) -> buttonsAdd
-    194:198:java.util.List buttons() -> buttons
-    205:210:void buttonsClear() -> buttonsClear
-    213:215:void removeButton(net.minecraft.realms.RealmsButton) -> removeButton
-    223:226:boolean mouseClicked(double,double,int) -> mouseClicked
-    231:231:boolean mouseReleased(double,double,int) -> mouseReleased
-    236:239:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-    244:247:boolean keyPressed(int,int,int) -> keyPressed
-    252:255:boolean charTyped(char,int) -> charTyped
-    260:262:void removed() -> removed
-    269:272:int draw(java.lang.String,int,int,int,boolean) -> draw
-    277:277:net.minecraft.client.gui.Font getFont() -> getFont
-    170:170:java.lang.String lambda$narrateLabels$1(net.minecraft.client.gui.components.events.GuiEventListener) -> lambda$narrateLabels$1
-    169:169:boolean lambda$narrateLabels$0(net.minecraft.client.gui.components.events.GuiEventListener) -> lambda$narrateLabels$0
-    24:24:void <clinit>() -> <clinit>
-net.minecraft.realms.RealmsScrolledSelectionList -> net.minecraft.realms.RealmsScrolledSelectionList:
-    net.minecraft.realms.RealmsScrolledSelectionListProxy proxy -> proxy
-    10:12:void <init>(int,int,int,int,int) -> <init>
-    15:16:void render(int,int,float) -> render
-    19:19:int width() -> width
-    23:23:void renderItem(int,int,int,int,net.minecraft.realms.Tezzelator,int,int) -> renderItem
-    26:27:void renderItem(int,int,int,int,int,int) -> renderItem
-    30:30:int getItemCount() -> getItemCount
-    34:34:boolean selectItem(int,int,double,double) -> selectItem
-    38:38:boolean isSelectedItem(int) -> isSelectedItem
-    42:42:void renderBackground() -> renderBackground
-    45:45:int getMaxPosition() -> getMaxPosition
-    49:49:int getScrollbarPosition() -> getScrollbarPosition
-    53:54:void scroll(int) -> scroll
-    57:57:int getScroll() -> getScroll
-    61:61:void renderList(int,int,int,int) -> renderList
-    65:65:net.minecraft.client.gui.components.events.GuiEventListener getProxy() -> getProxy
-net.minecraft.realms.RealmsScrolledSelectionListProxy -> net.minecraft.realms.RealmsScrolledSelectionListProxy:
-    net.minecraft.realms.RealmsScrolledSelectionList realmsScrolledSelectionList -> realmsScrolledSelectionList
-    12:14:void <init>(net.minecraft.realms.RealmsScrolledSelectionList,int,int,int,int,int) -> <init>
-    18:18:int getItemCount() -> getItemCount
-    23:23:boolean selectItem(int,int,double,double) -> selectItem
-    28:28:boolean isSelectedItem(int) -> isSelectedItem
-    33:34:void renderBackground() -> renderBackground
-    38:39:void renderItem(int,int,int,int,int,int,float) -> renderItem
-    42:42:int getWidth() -> getWidth
-    47:47:int getMaxPosition() -> getMaxPosition
-    52:52:int getScrollbarPosition() -> getScrollbarPosition
-    57:60:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    65:68:boolean mouseClicked(double,double,int) -> mouseClicked
-    73:73:boolean mouseReleased(double,double,int) -> mouseReleased
-    78:78:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-net.minecraft.realms.RealmsServerAddress -> net.minecraft.realms.RealmsServerAddress:
-    java.lang.String host -> host
-    int port -> port
-    11:14:void <init>(java.lang.String,int) -> <init>
-    17:17:java.lang.String getHost() -> getHost
-    21:21:int getPort() -> getPort
-    25:26:net.minecraft.realms.RealmsServerAddress parseString(java.lang.String) -> parseString
-net.minecraft.realms.RealmsSharedConstants -> net.minecraft.realms.RealmsSharedConstants:
-    int TICKS_PER_SECOND -> TICKS_PER_SECOND
-    char[] ILLEGAL_FILE_CHARACTERS -> ILLEGAL_FILE_CHARACTERS
-    7:7:void <init>() -> <init>
-    9:9:void <clinit>() -> <clinit>
-net.minecraft.realms.RealmsSimpleScrolledSelectionList -> net.minecraft.realms.RealmsSimpleScrolledSelectionList:
-    net.minecraft.realms.RealmsSimpleScrolledSelectionListProxy proxy -> proxy
-    10:12:void <init>(int,int,int,int,int) -> <init>
-    15:16:void render(int,int,float) -> render
-    19:19:int width() -> width
-    23:23:void renderItem(int,int,int,int,net.minecraft.realms.Tezzelator,int,int) -> renderItem
-    26:27:void renderItem(int,int,int,int,int,int) -> renderItem
-    30:30:int getItemCount() -> getItemCount
-    34:34:boolean selectItem(int,int,double,double) -> selectItem
-    38:38:boolean isSelectedItem(int) -> isSelectedItem
-    42:42:void renderBackground() -> renderBackground
-    45:45:int getMaxPosition() -> getMaxPosition
-    49:49:int getScrollbarPosition() -> getScrollbarPosition
-    54:54:net.minecraft.client.gui.components.events.GuiEventListener getProxy() -> getProxy
-    58:59:void scroll(int) -> scroll
-    62:62:int getScroll() -> getScroll
-    66:66:void renderList(int,int,int,int) -> renderList
-net.minecraft.realms.RealmsSimpleScrolledSelectionListProxy -> net.minecraft.realms.RealmsSimpleScrolledSelectionListProxy:
-    net.minecraft.realms.RealmsSimpleScrolledSelectionList realmsSimpleScrolledSelectionList -> realmsSimpleScrolledSelectionList
-    19:21:void <init>(net.minecraft.realms.RealmsSimpleScrolledSelectionList,int,int,int,int,int) -> <init>
-    25:25:int getItemCount() -> getItemCount
-    30:30:boolean selectItem(int,int,double,double) -> selectItem
-    35:35:boolean isSelectedItem(int) -> isSelectedItem
-    40:41:void renderBackground() -> renderBackground
-    45:46:void renderItem(int,int,int,int,int,int,float) -> renderItem
-    49:49:int getWidth() -> getWidth
-    54:54:int getMaxPosition() -> getMaxPosition
-    59:59:int getScrollbarPosition() -> getScrollbarPosition
-    64:138:void render(int,int,float) -> render
-    142:145:boolean mouseScrolled(double,double,double) -> mouseScrolled
-    150:153:boolean mouseClicked(double,double,int) -> mouseClicked
-    158:158:boolean mouseReleased(double,double,int) -> mouseReleased
-    163:163:boolean mouseDragged(double,double,int,double,double) -> mouseDragged
-net.minecraft.realms.RealmsSliderButton -> net.minecraft.realms.RealmsSliderButton:
-    net.minecraft.resources.ResourceLocation WIDGETS_LOCATION -> WIDGETS_LOCATION
-    int id -> id
-    net.minecraft.realms.RealmsSliderButtonProxy proxy -> proxy
-    double minValue -> minValue
-    double maxValue -> maxValue
-    15:22:void <init>(int,int,int,int,int,double,double) -> <init>
-    25:25:java.lang.String getMessage() -> getMessage
-    29:29:double toPct(double) -> toPct
-    33:33:double toValue(double) -> toValue
-    37:37:double clamp(double) -> clamp
-    41:41:int getYImage(boolean) -> getYImage
-    45:45:void onClick(double,double) -> onClick
-    48:48:void onRelease(double,double) -> onRelease
-    52:52:net.minecraft.realms.RealmsSliderButtonProxy getProxy() -> getProxy
-    56:56:double getValue() -> getValue
-    60:61:void setValue(double) -> setValue
-    64:64:int id() -> id
-    68:69:void setMessage(java.lang.String) -> setMessage
-    72:72:int getWidth() -> getWidth
-    76:76:int getHeight() -> getHeight
-    80:80:int y() -> y
-    void applyValue() -> applyValue
-    86:87:void updateMessage() -> updateMessage
-    7:7:net.minecraft.client.gui.components.AbstractWidget getProxy() -> getProxy
-    9:9:void <clinit>() -> <clinit>
-net.minecraft.realms.RealmsSliderButtonProxy -> net.minecraft.realms.RealmsSliderButtonProxy:
-    net.minecraft.realms.RealmsSliderButton button -> button
-    12:14:void <init>(net.minecraft.realms.RealmsSliderButton,int,int,int,int,double) -> <init>
-    18:18:boolean active() -> active
-    23:24:void active(boolean) -> active
-    28:28:boolean isVisible() -> isVisible
-    33:34:void setVisible(boolean) -> setVisible
-    38:39:void setMessage(java.lang.String) -> setMessage
-    43:43:int getWidth() -> getWidth
-    47:47:int y() -> y
-    52:53:void onClick(double,double) -> onClick
-    57:58:void onRelease(double,double) -> onRelease
-    62:63:void updateMessage() -> updateMessage
-    67:68:void applyValue() -> applyValue
-    71:71:double getValue() -> getValue
-    75:76:void setValue(double) -> setValue
-    80:81:void renderBg(net.minecraft.client.Minecraft,int,int) -> renderBg
-    85:85:net.minecraft.realms.RealmsSliderButton getButton() -> getButton
-    90:90:int getYImage(boolean) -> getYImage
-    94:94:int getSuperYImage(boolean) -> getSuperYImage
-    98:98:int getHeight() -> getHeight
-    7:7:net.minecraft.realms.AbstractRealmsButton getButton() -> getButton
-net.minecraft.realms.RealmsVertexFormat -> net.minecraft.realms.RealmsVertexFormat:
-    com.mojang.blaze3d.vertex.VertexFormat v -> v
-    14:16:void <init>(com.mojang.blaze3d.vertex.VertexFormat) -> <init>
-    19:19:com.mojang.blaze3d.vertex.VertexFormat getVertexFormat() -> getVertexFormat
-    23:29:java.util.List getElements() -> getElements
-    34:34:boolean equals(java.lang.Object) -> equals
-    39:39:int hashCode() -> hashCode
-    44:44:java.lang.String toString() -> toString
-net.minecraft.realms.RealmsVertexFormatElement -> net.minecraft.realms.RealmsVertexFormatElement:
-    com.mojang.blaze3d.vertex.VertexFormatElement v -> v
-    10:12:void <init>(com.mojang.blaze3d.vertex.VertexFormatElement) -> <init>
-    15:15:com.mojang.blaze3d.vertex.VertexFormatElement getVertexFormatElement() -> getVertexFormatElement
-    19:19:boolean isPosition() -> isPosition
-    23:23:int getIndex() -> getIndex
-    27:27:int getByteSize() -> getByteSize
-    31:31:int getCount() -> getCount
-    36:36:int hashCode() -> hashCode
-    41:41:boolean equals(java.lang.Object) -> equals
-    46:46:java.lang.String toString() -> toString
-net.minecraft.realms.RepeatedNarrator -> net.minecraft.realms.RepeatedNarrator:
-    java.time.Duration repeatDelay -> repeatDelay
-    float permitsPerSecond -> permitsPerSecond
-    java.util.concurrent.atomic.AtomicReference params -> params
-    30:35:void <init>(java.time.Duration) -> <init>
-    38:48:void narrate(java.lang.String) -> narrate
-    39:42:net.minecraft.realms.RepeatedNarrator$Params lambda$narrate$0(java.lang.String,net.minecraft.realms.RepeatedNarrator$Params) -> lambda$narrate$0
-net.minecraft.realms.RepeatedNarrator$Params -> net.minecraft.realms.RepeatedNarrator$a:
+    net.minecraft.client.Minecraft val$minecraft -> c
+    net.minecraft.realms.RealmsConnect this$0 -> d
+    34:34:void <init>(net.minecraft.realms.RealmsConnect,java.lang.String,java.lang.String,int,net.minecraft.client.Minecraft) -> <init>
+    37:92:void run() -> run
+    90:90:void lambda$run$2(net.minecraft.client.Minecraft,net.minecraft.realms.DisconnectedRealmsScreen) -> a
+    73:73:void lambda$run$1(net.minecraft.client.Minecraft,net.minecraft.realms.DisconnectedRealmsScreen) -> b
+    51:51:void lambda$run$0(net.minecraft.network.chat.Component) -> a
+net.minecraft.realms.RealmsLabel -> eqf:
+    net.minecraft.network.chat.Component text -> a
+    int x -> b
+    int y -> c
+    int color -> d
+    15:20:void <init>(net.minecraft.network.chat.Component,int,int,int) -> <init>
+    24:25:void render(net.minecraft.client.gui.screens.Screen,com.mojang.blaze3d.vertex.PoseStack) -> a
+    28:28:java.lang.String getText() -> a
+net.minecraft.realms.RealmsObjectSelectionList -> eqg:
+    10:11:void <init>(int,int,int,int,int) -> <init>
+    14:19:void setSelectedItem(int) -> j
+    22:23:void selectItem(int) -> a
+    26:26:void itemClicked(int,int,double,double,int) -> a
+    31:31:int getMaxPosition() -> c
+    37:37:int getScrollbarPosition() -> e
+    42:42:int getRowWidth() -> d
+    48:49:void replaceEntries(java.util.Collection) -> a
+    53:53:int getItemCount() -> l
+    58:58:int getRowTop(int) -> h
+    63:63:int getRowLeft() -> q
+    68:68:int addEntry(net.minecraft.client.gui.components.ObjectSelectionList$Entry) -> a
+    72:73:void clear() -> a
+    8:8:int addEntry(net.minecraft.client.gui.components.AbstractSelectionList$Entry) -> b
+net.minecraft.realms.RealmsScreen -> eqh:
+    51:52:void <init>() -> <init>
+    55:55:int row(int) -> k
+    60:65:void tick() -> d
+    68:74:void narrateLabels() -> u
+net.minecraft.realms.RealmsServerAddress -> eqi:
+    java.lang.String host -> a
+    int port -> b
+    9:12:void <init>(java.lang.String,int) -> <init>
+    15:15:java.lang.String getHost() -> a
+    19:19:int getPort() -> b
+    23:24:net.minecraft.realms.RealmsServerAddress parseString(java.lang.String) -> a
+net.minecraft.realms.RepeatedNarrator -> eqj:
+    float permitsPerSecond -> a
+    java.util.concurrent.atomic.AtomicReference params -> b
+    14:18:void <init>(java.time.Duration) -> <init>
+    21:30:void narrate(java.lang.String) -> a
+    22:25:net.minecraft.realms.RepeatedNarrator$Params lambda$narrate$0(java.lang.String,net.minecraft.realms.RepeatedNarrator$Params) -> a
+net.minecraft.realms.RepeatedNarrator$Params -> eqj$a:
     java.lang.String narration -> a
     com.google.common.util.concurrent.RateLimiter rateLimiter -> b
-    22:25:void <init>(java.lang.String,com.google.common.util.concurrent.RateLimiter) -> <init>
-net.minecraft.realms.Tezzelator -> net.minecraft.realms.Tezzelator:
-    com.mojang.blaze3d.vertex.Tesselator t -> t
-    net.minecraft.realms.Tezzelator instance -> instance
-    7:7:void <init>() -> <init>
-    13:14:void end() -> end
-    17:18:net.minecraft.realms.Tezzelator vertex(double,double,double) -> vertex
-    22:23:void begin(int,net.minecraft.realms.RealmsVertexFormat) -> begin
-    26:27:void endVertex() -> endVertex
-    30:31:net.minecraft.realms.Tezzelator color(int,int,int,int) -> color
-    35:36:net.minecraft.realms.Tezzelator tex(float,float) -> tex
-    8:10:void <clinit>() -> <clinit>
-net.minecraft.realms.package-info -> een:
-net.minecraft.realms.pluginapi.LoadedRealmsPlugin -> net.minecraft.realms.pluginapi.LoadedRealmsPlugin:
-    net.minecraft.realms.RealmsScreen getMainScreen(net.minecraft.realms.RealmsScreen) -> getMainScreen
-    net.minecraft.realms.RealmsScreen getNotificationsScreen(net.minecraft.realms.RealmsScreen) -> getNotificationsScreen
-net.minecraft.realms.pluginapi.RealmsPlugin -> net.minecraft.realms.pluginapi.RealmsPlugin:
-    com.mojang.datafixers.util.Either tryLoad(java.lang.String) -> tryLoad
-net.minecraft.realms.pluginapi.package-info -> eeo:
-net.minecraft.recipebook.PlaceRecipe -> si:
+    36:39:void <init>(java.lang.String,com.google.common.util.concurrent.RateLimiter) -> <init>
+    32:32:com.google.common.util.concurrent.RateLimiter access$000(net.minecraft.realms.RepeatedNarrator$Params) -> a
+    32:32:java.lang.String access$100(net.minecraft.realms.RepeatedNarrator$Params) -> b
+net.minecraft.realms.package-info -> eqk:
+net.minecraft.recipebook.PlaceRecipe -> tx:
     11:59:void placeRecipe(int,int,int,net.minecraft.world.item.crafting.Recipe,java.util.Iterator,int) -> a
     void addItemToSlot(java.util.Iterator,int,int,int,int) -> a
-net.minecraft.recipebook.ServerPlaceRecipe -> sj:
+net.minecraft.recipebook.ServerPlaceRecipe -> ty:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.entity.player.StackedContents stackedContents -> b
     net.minecraft.world.entity.player.Inventory inventory -> c
@@ -27512,61 +29535,182 @@ net.minecraft.recipebook.ServerPlaceRecipe -> sj:
     195:234:boolean testClearGrid() -> b
     238:244:int getAmountOfFreeSlotsInInventory() -> c
     25:25:void <clinit>() -> <clinit>
-net.minecraft.recipebook.ServerPlaceSmeltingRecipe -> sk:
+net.minecraft.recipebook.ServerPlaceSmeltingRecipe -> tz:
     boolean recipeMatchesPlaced -> e
     19:20:void <init>(net.minecraft.world.inventory.RecipeBookMenu) -> <init>
     24:49:void handleRecipeClicked(net.minecraft.world.item.crafting.Recipe,boolean) -> a
     53:55:void clearGrid() -> a
     58:73:void placeRecipe(int,it.unimi.dsi.fastutil.ints.IntList) -> a
-net.minecraft.recipebook.package-info -> sl:
-net.minecraft.resources.ResourceLocation -> sm:
-    com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID -> c
-    java.lang.String namespace -> a
-    java.lang.String path -> b
-    31:40:void <init>(java.lang.String[]) -> <init>
-    43:44:void <init>(java.lang.String) -> <init>
-    47:48:void <init>(java.lang.String,java.lang.String) -> <init>
-    51:51:net.minecraft.resources.ResourceLocation of(java.lang.String,char) -> a
-    57:59:net.minecraft.resources.ResourceLocation tryParse(java.lang.String) -> a
-    64:73:java.lang.String[] decompose(java.lang.String,char) -> b
-    77:77:java.lang.String getPath() -> a
-    81:81:java.lang.String getNamespace() -> b
-    86:86:java.lang.String toString() -> toString
-    91:101:boolean equals(java.lang.Object) -> equals
-    106:106:int hashCode() -> hashCode
-    112:116:int compareTo(net.minecraft.resources.ResourceLocation) -> a
-    132:141:net.minecraft.resources.ResourceLocation read(com.mojang.brigadier.StringReader) -> a
-    146:146:boolean isAllowedInResourceLocation(char) -> a
-    154:154:boolean isValidPath(java.lang.String) -> c
-    158:158:boolean isValidNamespace(java.lang.String) -> d
-    162:163:boolean isValidResourceLocation(java.lang.String) -> b
-    21:21:int compareTo(java.lang.Object) -> compareTo
-    158:158:boolean lambda$isValidNamespace$1(int) -> a
-    154:154:boolean lambda$isValidPath$0(int) -> b
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.resources.ResourceLocation$Serializer -> sm$a:
-    119:119:void <init>() -> <init>
-    122:122:net.minecraft.resources.ResourceLocation deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    127:127:com.google.gson.JsonElement serialize(net.minecraft.resources.ResourceLocation,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
-    119:119:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
-    119:119:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.resources.package-info -> sn:
-net.minecraft.server.Bootstrap -> so:
+net.minecraft.recipebook.package-info -> ua:
+net.minecraft.resources.DelegatingOps -> ub:
+    com.mojang.serialization.DynamicOps delegate -> a
+    21:23:void <init>(com.mojang.serialization.DynamicOps) -> <init>
+    27:27:java.lang.Object empty() -> empty
+    32:32:java.lang.Object convertTo(com.mojang.serialization.DynamicOps,java.lang.Object) -> convertTo
+    37:37:com.mojang.serialization.DataResult getNumberValue(java.lang.Object) -> getNumberValue
+    42:42:java.lang.Object createNumeric(java.lang.Number) -> createNumeric
+    47:47:java.lang.Object createByte(byte) -> createByte
+    52:52:java.lang.Object createShort(short) -> createShort
+    57:57:java.lang.Object createInt(int) -> createInt
+    62:62:java.lang.Object createLong(long) -> createLong
+    67:67:java.lang.Object createFloat(float) -> createFloat
+    72:72:java.lang.Object createDouble(double) -> createDouble
+    77:77:com.mojang.serialization.DataResult getBooleanValue(java.lang.Object) -> getBooleanValue
+    82:82:java.lang.Object createBoolean(boolean) -> createBoolean
+    87:87:com.mojang.serialization.DataResult getStringValue(java.lang.Object) -> getStringValue
+    92:92:java.lang.Object createString(java.lang.String) -> createString
+    97:97:com.mojang.serialization.DataResult mergeToList(java.lang.Object,java.lang.Object) -> mergeToList
+    102:102:com.mojang.serialization.DataResult mergeToList(java.lang.Object,java.util.List) -> mergeToList
+    107:107:com.mojang.serialization.DataResult mergeToMap(java.lang.Object,java.lang.Object,java.lang.Object) -> mergeToMap
+    112:112:com.mojang.serialization.DataResult mergeToMap(java.lang.Object,com.mojang.serialization.MapLike) -> mergeToMap
+    117:117:com.mojang.serialization.DataResult getMapValues(java.lang.Object) -> getMapValues
+    122:122:com.mojang.serialization.DataResult getMapEntries(java.lang.Object) -> getMapEntries
+    127:127:java.lang.Object createMap(java.util.stream.Stream) -> createMap
+    132:132:com.mojang.serialization.DataResult getMap(java.lang.Object) -> getMap
+    137:137:com.mojang.serialization.DataResult getStream(java.lang.Object) -> getStream
+    142:142:com.mojang.serialization.DataResult getList(java.lang.Object) -> getList
+    147:147:java.lang.Object createList(java.util.stream.Stream) -> createList
+    152:152:com.mojang.serialization.DataResult getByteBuffer(java.lang.Object) -> getByteBuffer
+    157:157:java.lang.Object createByteList(java.nio.ByteBuffer) -> createByteList
+    162:162:com.mojang.serialization.DataResult getIntStream(java.lang.Object) -> getIntStream
+    167:167:java.lang.Object createIntList(java.util.stream.IntStream) -> createIntList
+    172:172:com.mojang.serialization.DataResult getLongStream(java.lang.Object) -> getLongStream
+    177:177:java.lang.Object createLongList(java.util.stream.LongStream) -> createLongList
+    182:182:java.lang.Object remove(java.lang.Object,java.lang.String) -> remove
+    187:187:boolean compressMaps() -> compressMaps
+    192:192:com.mojang.serialization.ListBuilder listBuilder() -> listBuilder
+    197:197:com.mojang.serialization.RecordBuilder mapBuilder() -> mapBuilder
+net.minecraft.resources.RegistryDataPackCodec -> uc:
+    com.mojang.serialization.Codec directCodec -> a
+    net.minecraft.resources.ResourceKey registryKey -> b
+    com.mojang.serialization.MapCodec elementCodec -> c
+    18:18:net.minecraft.resources.RegistryDataPackCodec create(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle,com.mojang.serialization.MapCodec) -> a
+    21:25:void <init>(net.minecraft.resources.ResourceKey,com.mojang.serialization.Lifecycle,com.mojang.serialization.MapCodec) -> <init>
+    29:29:com.mojang.serialization.DataResult encode(net.minecraft.core.MappedRegistry,com.mojang.serialization.DynamicOps,java.lang.Object) -> a
+    34:38:com.mojang.serialization.DataResult decode(com.mojang.serialization.DynamicOps,java.lang.Object) -> decode
+    43:43:java.lang.String toString() -> toString
+    12:12:com.mojang.serialization.DataResult encode(java.lang.Object,com.mojang.serialization.DynamicOps,java.lang.Object) -> encode
+    36:36:com.mojang.serialization.DataResult lambda$decode$1(com.mojang.serialization.DynamicOps,com.mojang.datafixers.util.Pair) -> a
+    36:36:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.util.Pair,net.minecraft.core.MappedRegistry) -> a
+net.minecraft.resources.RegistryFileCodec -> ud:
+    net.minecraft.resources.ResourceKey registryKey -> a
+    com.mojang.serialization.MapCodec elementCodec -> b
+    17:17:net.minecraft.resources.RegistryFileCodec create(net.minecraft.resources.ResourceKey,com.mojang.serialization.MapCodec) -> a
+    20:23:void <init>(net.minecraft.resources.ResourceKey,com.mojang.serialization.MapCodec) -> <init>
+    27:30:com.mojang.serialization.DataResult encode(java.util.function.Supplier,com.mojang.serialization.DynamicOps,java.lang.Object) -> a
+    35:38:com.mojang.serialization.DataResult decode(com.mojang.serialization.DynamicOps,java.lang.Object) -> decode
+    43:43:java.lang.String toString() -> toString
+    12:12:com.mojang.serialization.DataResult encode(java.lang.Object,com.mojang.serialization.DynamicOps,java.lang.Object) -> encode
+    38:38:com.mojang.datafixers.util.Pair lambda$decode$2(com.mojang.datafixers.util.Pair) -> a
+    38:38:java.util.function.Supplier lambda$null$1(java.lang.Object) -> a
+    38:38:java.lang.Object lambda$null$0(java.lang.Object) -> b
+net.minecraft.resources.RegistryReadOps -> ue:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    net.minecraft.server.packs.resources.ResourceManager resourceManager -> c
+    net.minecraft.core.RegistryAccess registryHolder -> d
+    java.util.Map readCache -> e
+    44:44:net.minecraft.resources.RegistryReadOps create(com.mojang.serialization.DynamicOps,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.core.RegistryAccess) -> a
+    41:55:void <init>(com.mojang.serialization.DynamicOps,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.core.RegistryAccess) -> <init>
+    58:76:com.mojang.serialization.DataResult decodeElement(java.lang.Object,net.minecraft.resources.ResourceKey,com.mojang.serialization.MapCodec) -> a
+    80:110:com.mojang.serialization.DataResult decodeElements(net.minecraft.core.MappedRegistry,net.minecraft.resources.ResourceKey,com.mojang.serialization.MapCodec) -> a
+    114:150:com.mojang.serialization.DataResult readAndRegisterElement(net.minecraft.resources.ResourceKey,net.minecraft.core.WritableRegistry,com.mojang.serialization.MapCodec,net.minecraft.resources.ResourceLocation) -> a
+    156:165:com.mojang.serialization.DataResult readElementFromFile(net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey,com.mojang.serialization.MapCodec) -> a
+    171:171:net.minecraft.resources.RegistryReadOps$ReadCache readCache(net.minecraft.resources.ResourceKey) -> a
+    171:171:net.minecraft.resources.RegistryReadOps$ReadCache lambda$readCache$11(net.minecraft.resources.ResourceKey) -> b
+    147:147:java.util.function.Supplier lambda$readAndRegisterElement$10(java.lang.Object) -> a
+    147:147:java.lang.Object lambda$null$9(java.lang.Object) -> b
+    144:144:void lambda$readAndRegisterElement$8(net.minecraft.core.WritableRegistry,net.minecraft.resources.ResourceKey,java.lang.Object) -> a
+    132:136:java.lang.Object lambda$readAndRegisterElement$7(net.minecraft.core.WritableRegistry,net.minecraft.resources.ResourceKey) -> a
+    119:119:java.lang.Object lambda$readAndRegisterElement$6(java.lang.Object) -> c
+    107:107:com.mojang.serialization.DataResult lambda$decodeElements$5(net.minecraft.resources.ResourceKey,com.mojang.serialization.MapCodec,net.minecraft.resources.ResourceLocation,net.minecraft.core.MappedRegistry) -> a
+    107:107:net.minecraft.core.MappedRegistry lambda$null$4(net.minecraft.core.MappedRegistry,java.util.function.Supplier) -> a
+    81:81:boolean lambda$decodeElements$3(java.lang.String) -> a
+    76:76:com.mojang.datafixers.util.Pair lambda$decodeElement$2(com.mojang.datafixers.util.Pair,java.util.function.Supplier) -> a
+    67:67:com.mojang.datafixers.util.Pair lambda$decodeElement$1(net.minecraft.core.WritableRegistry,com.mojang.datafixers.util.Pair) -> a
+    68:70:java.util.function.Supplier lambda$null$0(net.minecraft.core.WritableRegistry,com.mojang.datafixers.util.Pair) -> b
+    36:36:void <clinit>() -> <clinit>
+net.minecraft.resources.RegistryReadOps$1 -> ue$1:
+net.minecraft.resources.RegistryReadOps$ReadCache -> ue$a:
+    java.util.Map values -> a
+    47:48:void <init>() -> <init>
+    47:47:java.util.Map access$000(net.minecraft.resources.RegistryReadOps$ReadCache) -> a
+    47:47:void <init>(net.minecraft.resources.RegistryReadOps$1) -> <init>
+net.minecraft.resources.RegistryWriteOps -> uf:
+    net.minecraft.core.RegistryAccess registryHolder -> b
+    18:18:net.minecraft.resources.RegistryWriteOps create(com.mojang.serialization.DynamicOps,net.minecraft.core.RegistryAccess) -> a
+    22:24:void <init>(com.mojang.serialization.DynamicOps,net.minecraft.core.RegistryAccess) -> <init>
+    27:40:com.mojang.serialization.DataResult encode(java.lang.Object,java.lang.Object,net.minecraft.resources.ResourceKey,com.mojang.serialization.MapCodec) -> a
+net.minecraft.resources.ResourceKey -> ug:
+    java.util.Map VALUES -> a
+    net.minecraft.resources.ResourceLocation registryName -> b
+    net.minecraft.resources.ResourceLocation location -> c
+    22:22:net.minecraft.resources.ResourceKey create(net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceLocation) -> a
+    29:29:net.minecraft.resources.ResourceKey createRegistryKey(net.minecraft.resources.ResourceLocation) -> a
+    34:35:net.minecraft.resources.ResourceKey create(net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> a
+    38:41:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation) -> <init>
+    45:45:java.lang.String toString() -> toString
+    49:49:net.minecraft.resources.ResourceLocation location() -> a
+    53:53:java.util.function.Function elementKey(net.minecraft.resources.ResourceKey) -> a
+    53:53:net.minecraft.resources.ResourceKey lambda$elementKey$1(net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceLocation) -> b
+    35:35:net.minecraft.resources.ResourceKey lambda$create$0(net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,java.lang.String) -> a
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.resources.ResourceLocation -> uh:
+    com.mojang.serialization.Codec CODEC -> a
+    com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID -> d
+    java.lang.String namespace -> b
+    java.lang.String path -> c
+    34:43:void <init>(java.lang.String[]) -> <init>
+    46:47:void <init>(java.lang.String) -> <init>
+    50:51:void <init>(java.lang.String,java.lang.String) -> <init>
+    54:54:net.minecraft.resources.ResourceLocation of(java.lang.String,char) -> a
+    60:62:net.minecraft.resources.ResourceLocation tryParse(java.lang.String) -> a
+    67:76:java.lang.String[] decompose(java.lang.String,char) -> b
+    81:83:com.mojang.serialization.DataResult read(java.lang.String) -> c
+    88:88:java.lang.String getPath() -> a
+    92:92:java.lang.String getNamespace() -> b
+    97:97:java.lang.String toString() -> toString
+    102:112:boolean equals(java.lang.Object) -> equals
+    117:117:int hashCode() -> hashCode
+    123:127:int compareTo(net.minecraft.resources.ResourceLocation) -> a
+    131:131:java.lang.String toDebugFileName() -> c
+    147:156:net.minecraft.resources.ResourceLocation read(com.mojang.brigadier.StringReader) -> a
+    161:161:boolean isAllowedInResourceLocation(char) -> a
+    169:174:boolean isValidPath(java.lang.String) -> d
+    178:183:boolean isValidNamespace(java.lang.String) -> e
+    187:187:boolean validPathChar(char) -> b
+    191:191:boolean validNamespaceChar(char) -> c
+    195:196:boolean isValidResourceLocation(java.lang.String) -> b
+    23:23:int compareTo(java.lang.Object) -> compareTo
+    24:25:void <clinit>() -> <clinit>
+net.minecraft.resources.ResourceLocation$Serializer -> uh$a:
+    134:134:void <init>() -> <init>
+    137:137:net.minecraft.resources.ResourceLocation deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
+    142:142:com.google.gson.JsonElement serialize(net.minecraft.resources.ResourceLocation,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
+    134:134:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
+    134:134:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
+net.minecraft.resources.package-info -> ui:
+net.minecraft.server.Bootstrap -> uj:
     java.io.PrintStream STDOUT -> a
     boolean isBootstrapped -> b
     org.apache.logging.log4j.Logger LOGGER -> c
-    26:26:void <init>() -> <init>
-    33:58:void bootStrap() -> a
-    61:68:void checkTranslations(net.minecraft.core.Registry,java.util.function.Function,java.util.Set) -> a
-    71:79:java.util.Set getMissingTranslations() -> b
-    83:90:void validate() -> c
-    93:100:void wrapStreams() -> d
-    103:104:void realStdoutPrintln(java.lang.String) -> a
-    88:88:void lambda$validate$2(java.lang.String) -> b
-    78:78:java.lang.String lambda$getMissingTranslations$1(net.minecraft.resources.ResourceLocation) -> a
-    63:67:void lambda$checkTranslations$0(java.util.function.Function,net.minecraft.locale.Language,java.util.Set,java.lang.Object) -> a
-    27:30:void <clinit>() -> <clinit>
-net.minecraft.server.ChainedJsonException -> sp:
+    29:29:void <init>() -> <init>
+    36:61:void bootStrap() -> a
+    64:71:void checkTranslations(java.lang.Iterable,java.util.function.Function,java.util.Set) -> a
+    74:83:void checkGameruleTranslations(java.util.Set) -> a
+    86:97:java.util.Set getMissingTranslations() -> b
+    101:110:void validate() -> c
+    113:120:void wrapStreams() -> d
+    123:124:void realStdoutPrintln(java.lang.String) -> a
+    106:106:void lambda$validate$2(java.lang.String) -> b
+    94:94:java.lang.String lambda$getMissingTranslations$1(net.minecraft.resources.ResourceLocation) -> a
+    66:70:void lambda$checkTranslations$0(java.util.function.Function,net.minecraft.locale.Language,java.util.Set,java.lang.Object) -> a
+    30:33:void <clinit>() -> <clinit>
+net.minecraft.server.Bootstrap$1 -> uj$1:
+    net.minecraft.locale.Language val$language -> a
+    java.util.Set val$missing -> b
+    75:75:void <init>(net.minecraft.locale.Language,java.util.Set) -> <init>
+    78:81:void visit(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> a
+net.minecraft.server.ChainedJsonException -> uk:
     java.util.List entries -> a
     java.lang.String message -> b
     12:18:void <init>(java.lang.String) -> <init>
@@ -27575,8 +29719,8 @@ net.minecraft.server.ChainedJsonException -> sp:
     31:33:void setFilenameAndFlush(java.lang.String) -> b
     37:37:java.lang.String getMessage() -> getMessage
     41:48:net.minecraft.server.ChainedJsonException forException(java.lang.Exception) -> a
-net.minecraft.server.ChainedJsonException$1 -> sp$1:
-net.minecraft.server.ChainedJsonException$Entry -> sp$a:
+net.minecraft.server.ChainedJsonException$1 -> uk$1:
+net.minecraft.server.ChainedJsonException$Entry -> uk$a:
     java.lang.String filename -> a
     java.util.List jsonKeys -> b
     55:58:void <init>() -> <init>
@@ -27587,17 +29731,17 @@ net.minecraft.server.ChainedJsonException$Entry -> sp$a:
     52:52:void <init>(net.minecraft.server.ChainedJsonException$1) -> <init>
     52:52:void access$100(net.minecraft.server.ChainedJsonException$Entry,java.lang.String) -> a
     52:52:java.lang.String access$202(net.minecraft.server.ChainedJsonException$Entry,java.lang.String) -> b
-net.minecraft.server.ConsoleInput -> sq:
+net.minecraft.server.ConsoleInput -> ul:
     java.lang.String msg -> a
     net.minecraft.commands.CommandSourceStack source -> b
     9:12:void <init>(java.lang.String,net.minecraft.commands.CommandSourceStack) -> <init>
-net.minecraft.server.ConsoleInputSource -> sr:
+net.minecraft.server.ConsoleInputSource -> um:
     void info(java.lang.String) -> a
     void warn(java.lang.String) -> b
-net.minecraft.server.DebugLoggedPrintStream -> ss:
+net.minecraft.server.DebugLoggedPrintStream -> un:
     7:8:void <init>(java.lang.String,java.io.OutputStream) -> <init>
     12:15:void logLine(java.lang.String) -> a
-net.minecraft.server.Eula -> st:
+net.minecraft.server.Eula -> uo:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.nio.file.Path file -> b
     boolean agreed -> c
@@ -27606,7 +29750,7 @@ net.minecraft.server.Eula -> st:
     37:37:boolean hasAgreedToEULA() -> a
     41:51:void saveDefaults() -> c
     14:14:void <clinit>() -> <clinit>
-net.minecraft.server.LoggedPrintStream -> su:
+net.minecraft.server.LoggedPrintStream -> up:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.lang.String name -> b
     16:18:void <init>(java.lang.String,java.io.OutputStream) -> <init>
@@ -27614,408 +29758,431 @@ net.minecraft.server.LoggedPrintStream -> su:
     27:28:void println(java.lang.Object) -> println
     31:32:void logLine(java.lang.String) -> a
     11:11:void <clinit>() -> <clinit>
+net.minecraft.server.Main -> net.minecraft.server.Main:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    58:58:void <init>() -> <init>
+    63:206:void main(java.lang.String[]) -> main
+    209:234:void forceUpgrade(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,com.mojang.datafixers.DataFixer,boolean,java.util.function.BooleanSupplier,com.google.common.collect.ImmutableSet) -> a
+    181:192:net.minecraft.server.dedicated.DedicatedServer lambda$main$1(net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.server.packs.repository.PackRepository,net.minecraft.server.ServerResources,net.minecraft.world.level.storage.WorldData,net.minecraft.server.dedicated.DedicatedServerSettings,com.mojang.authlib.minecraft.MinecraftSessionService,com.mojang.authlib.GameProfileRepository,net.minecraft.server.players.GameProfileCache,joptsimple.OptionSet,joptsimple.OptionSpec,joptsimple.OptionSpec,joptsimple.OptionSpec,joptsimple.OptionSpec,joptsimple.OptionSpec,joptsimple.OptionSpec,java.lang.Thread) -> a
+    174:174:boolean lambda$main$0() -> a
+    59:59:void <clinit>() -> <clinit>
+net.minecraft.server.Main$1 -> net.minecraft.server.Main$1:
+    net.minecraft.server.dedicated.DedicatedServer val$dedicatedServer -> a
+    195:195:void <init>(java.lang.String,net.minecraft.server.dedicated.DedicatedServer) -> <init>
+    198:199:void run() -> run
 net.minecraft.server.MinecraftServer -> net.minecraft.server.MinecraftServer:
-    org.apache.logging.log4j.Logger LOGGER -> h
+    org.apache.logging.log4j.Logger LOGGER -> j
     java.io.File USERID_CACHE_FILE -> b
-    java.util.concurrent.CompletableFuture DATA_RELOAD_INITIAL_TASK -> i
     net.minecraft.world.level.LevelSettings DEMO_SETTINGS -> c
-    net.minecraft.world.level.storage.LevelStorageSource storageSource -> j
+    net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess storageSource -> d
+    net.minecraft.world.level.storage.PlayerDataStorage playerDataStorage -> e
     net.minecraft.world.Snooper snooper -> k
-    java.io.File universe -> l
-    java.util.List tickables -> m
-    net.minecraft.util.profiling.GameProfiler profiler -> n
+    java.util.List tickables -> l
+    net.minecraft.util.profiling.ContinuousProfiler continousProfiler -> m
+    net.minecraft.util.profiling.ProfilerFiller profiler -> n
     net.minecraft.server.network.ServerConnectionListener connection -> o
-    net.minecraft.server.level.progress.ChunkProgressListenerFactory progressListenerFactory -> d
-    net.minecraft.network.protocol.status.ServerStatus status -> p
-    java.util.Random random -> q
-    com.mojang.datafixers.DataFixer fixerUpper -> r
-    java.lang.String localIp -> s
-    int port -> t
-    java.util.Map levels -> u
-    net.minecraft.server.players.PlayerList playerList -> v
-    boolean running -> w
-    boolean stopped -> x
-    int tickCount -> y
-    java.net.Proxy proxy -> e
-    boolean onlineMode -> z
-    boolean preventProxyConnections -> A
-    boolean animals -> B
-    boolean npcs -> C
-    boolean pvp -> D
-    boolean allowFlight -> E
-    java.lang.String motd -> F
-    int maxBuildHeight -> G
-    int playerIdleTimeout -> H
-    long[] tickTimes -> f
-    java.security.KeyPair keyPair -> I
-    java.lang.String singleplayerName -> J
-    java.lang.String levelIdName -> K
-    java.lang.String levelName -> L
-    boolean isDemo -> M
-    boolean levelHasStartingBonusChest -> N
-    java.lang.String resourcePack -> O
-    java.lang.String resourcePackHash -> P
-    boolean isReady -> Q
-    long lastOverloadWarning -> R
-    net.minecraft.network.chat.Component startupState -> S
-    boolean delayProfilerStart -> T
-    boolean forceGameType -> U
-    com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService authenticationService -> V
-    com.mojang.authlib.minecraft.MinecraftSessionService sessionService -> W
-    com.mojang.authlib.GameProfileRepository profileRepository -> X
-    net.minecraft.server.players.GameProfileCache profileCache -> Y
-    long lastServerStatus -> Z
-    java.lang.Thread serverThread -> g
-    long nextTickTime -> aa
-    long delayedTasksMaxNextTickTime -> ab
-    boolean mayHaveDelayedTasks -> ac
-    boolean hasWorldScreenshot -> ad
-    net.minecraft.server.packs.resources.ReloadableResourceManager resources -> ae
-    net.minecraft.server.packs.repository.PackRepository packRepository -> af
-    net.minecraft.server.packs.repository.FolderRepositorySource folderPackSource -> ag
-    net.minecraft.commands.Commands commands -> ah
-    net.minecraft.world.item.crafting.RecipeManager recipes -> ai
-    net.minecraft.tags.TagManager tags -> aj
-    net.minecraft.server.ServerScoreboard scoreboard -> ak
-    net.minecraft.world.level.storage.CommandStorage commandStorage -> al
-    net.minecraft.server.bossevents.CustomBossEvents customBossEvents -> am
-    net.minecraft.world.level.storage.loot.PredicateManager predicateManager -> an
-    net.minecraft.world.level.storage.loot.LootTables lootTables -> ao
-    net.minecraft.server.ServerAdvancementManager advancements -> ap
-    net.minecraft.server.ServerFunctionManager functions -> aq
-    net.minecraft.util.FrameTimer frameTimer -> ar
-    boolean enforceWhitelist -> as
-    boolean forceUpgrade -> at
-    boolean eraseCache -> au
-    float averageTickTime -> av
-    java.util.concurrent.Executor executor -> aw
-    java.lang.String serverId -> ax
-    166:272:void <init>(java.io.File,java.net.Proxy,com.mojang.datafixers.DataFixer,net.minecraft.commands.Commands,com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService,com.mojang.authlib.minecraft.MinecraftSessionService,com.mojang.authlib.GameProfileRepository,net.minecraft.server.players.GameProfileCache,net.minecraft.server.level.progress.ChunkProgressListenerFactory,java.lang.String) -> <init>
-    275:278:void readScoreboard(net.minecraft.world.level.storage.DimensionDataStorage) -> a
+    net.minecraft.server.level.progress.ChunkProgressListenerFactory progressListenerFactory -> p
+    net.minecraft.network.protocol.status.ServerStatus status -> q
+    java.util.Random random -> r
+    com.mojang.datafixers.DataFixer fixerUpper -> s
+    java.lang.String localIp -> t
+    int port -> u
+    net.minecraft.core.RegistryAccess$RegistryHolder registryHolder -> f
+    java.util.Map levels -> v
+    net.minecraft.server.players.PlayerList playerList -> w
+    boolean running -> x
+    boolean stopped -> y
+    int tickCount -> z
+    java.net.Proxy proxy -> g
+    boolean onlineMode -> A
+    boolean preventProxyConnections -> B
+    boolean pvp -> C
+    boolean allowFlight -> D
+    java.lang.String motd -> E
+    int maxBuildHeight -> F
+    int playerIdleTimeout -> G
+    long[] tickTimes -> h
+    java.security.KeyPair keyPair -> H
+    java.lang.String singleplayerName -> I
+    boolean isDemo -> J
+    java.lang.String resourcePack -> K
+    java.lang.String resourcePackHash -> L
+    boolean isReady -> M
+    long lastOverloadWarning -> N
+    boolean delayProfilerStart -> O
+    boolean forceGameType -> P
+    com.mojang.authlib.minecraft.MinecraftSessionService sessionService -> Q
+    com.mojang.authlib.GameProfileRepository profileRepository -> R
+    net.minecraft.server.players.GameProfileCache profileCache -> S
+    long lastServerStatus -> T
+    java.lang.Thread serverThread -> U
+    long nextTickTime -> V
+    long delayedTasksMaxNextTickTime -> W
+    boolean mayHaveDelayedTasks -> X
+    boolean hasWorldScreenshot -> Y
+    net.minecraft.server.packs.repository.PackRepository packRepository -> Z
+    net.minecraft.server.ServerScoreboard scoreboard -> aa
+    net.minecraft.world.level.storage.CommandStorage commandStorage -> ab
+    net.minecraft.server.bossevents.CustomBossEvents customBossEvents -> ac
+    net.minecraft.server.ServerFunctionManager functionManager -> ad
+    net.minecraft.util.FrameTimer frameTimer -> ae
+    boolean enforceWhitelist -> af
+    float averageTickTime -> ag
+    java.util.concurrent.Executor executor -> ah
+    java.lang.String serverId -> ai
+    net.minecraft.server.ServerResources resources -> aj
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager structureManager -> ak
+    net.minecraft.world.level.storage.WorldData worldData -> i
+    254:262:net.minecraft.server.MinecraftServer spin(java.util.function.Function) -> a
+    182:284:void <init>(java.lang.Thread,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.world.level.storage.WorldData,net.minecraft.server.packs.repository.PackRepository,java.net.Proxy,com.mojang.datafixers.DataFixer,net.minecraft.server.ServerResources,com.mojang.authlib.minecraft.MinecraftSessionService,com.mojang.authlib.GameProfileRepository,net.minecraft.server.players.GameProfileCache,net.minecraft.server.level.progress.ChunkProgressListenerFactory) -> <init>
+    287:290:void readScoreboard(net.minecraft.world.level.storage.DimensionDataStorage) -> a
     boolean initServer() -> d
-    283:345:void ensureLevelConversion(java.lang.String) -> a
-    348:349:void setServerStartupState(net.minecraft.network.chat.Component) -> b
-    353:353:net.minecraft.network.chat.Component getStartupState() -> g_
-    357:391:void loadLevel(java.lang.String,java.lang.String,long,net.minecraft.world.level.LevelType,com.google.gson.JsonElement) -> a
-    394:437:void createLevels(net.minecraft.world.level.storage.LevelStorage,net.minecraft.world.level.storage.LevelData,net.minecraft.world.level.LevelSettings,net.minecraft.server.level.progress.ChunkProgressListener) -> a
-    440:451:void setupDebugLevel(net.minecraft.world.level.storage.LevelData) -> a
-    454:472:void loadDataPacks(java.io.File,net.minecraft.world.level.storage.LevelData) -> a
-    475:518:void prepareLevels(net.minecraft.server.level.progress.ChunkProgressListener) -> a
-    521:529:void detectBundledResources(java.lang.String,net.minecraft.world.level.storage.LevelStorage) -> a
-    boolean canGenerateStructures() -> f
-    net.minecraft.world.level.GameType getDefaultGameType() -> g
-    net.minecraft.world.Difficulty getDefaultDifficulty() -> h
-    boolean isHardcore() -> i
-    int getOperatorUserPermissionLevel() -> j
-    int getFunctionCompilationLevel() -> k
-    boolean shouldRconBroadcast() -> l
-    546:563:boolean saveAllChunks(boolean,boolean,boolean) -> a
-    568:569:void close() -> close
-    572:600:void stopServer() -> s
-    603:603:java.lang.String getLocalIp() -> t
-    607:608:void setLocalIp(java.lang.String) -> b
-    611:611:boolean isRunning() -> h_
-    615:623:void halt(boolean) -> a
-    628:696:void run() -> run
-    699:699:boolean haveTime() -> aZ
-    703:705:void waitUntilNextTick() -> v
-    709:709:net.minecraft.server.TickTask wrapRunnable(java.lang.Runnable) -> a
-    714:714:boolean shouldRun(net.minecraft.server.TickTask) -> a
-    719:721:boolean pollTask() -> w
-    725:737:boolean pollTaskInternal() -> ba
-    742:744:void doRunTask(net.minecraft.server.TickTask) -> b
-    747:767:void updateStatusIcon(net.minecraft.network.protocol.status.ServerStatus) -> a
-    770:771:boolean hasWorldScreenshot() -> x
-    775:775:java.io.File getWorldScreenshotFile() -> y
-    779:779:java.io.File getServerDirectory() -> z
-    783:783:void onServerCrash(net.minecraft.CrashReport) -> a
-    786:786:void onServerExit() -> e
-    789:835:void tickServer(java.util.function.BooleanSupplier) -> a
-    838:878:void tickChildren(java.util.function.BooleanSupplier) -> b
-    881:881:boolean isNetherEnabled() -> A
-    885:886:void addTickable(java.lang.Runnable) -> b
-    890:970:void main(java.lang.String[]) -> main
-    973:974:void setId(java.lang.String) -> c
-    977:978:void forceUpgrade(boolean) -> b
-    981:982:void eraseCache(boolean) -> c
-    985:986:void forkAndRun() -> B
-    989:989:boolean isShutdown() -> C
-    993:993:java.io.File getFile(java.lang.String) -> d
-    997:998:void info(java.lang.String) -> e
-    1001:1002:void warn(java.lang.String) -> f
-    1005:1005:net.minecraft.server.level.ServerLevel getLevel(net.minecraft.world.level.dimension.DimensionType) -> a
-    1009:1009:java.lang.Iterable getAllLevels() -> D
-    1013:1013:java.lang.String getServerVersion() -> E
-    1017:1017:int getPlayerCount() -> F
-    1021:1021:int getMaxPlayers() -> G
-    1025:1025:java.lang.String[] getPlayerNames() -> H
-    1029:1029:com.mojang.authlib.GameProfile[] getPlayerGameProfiles() -> I
-    1033:1033:boolean isDebugging() -> J
-    1037:1038:void error(java.lang.String) -> g
-    1041:1044:void debug(java.lang.String) -> h
-    1048:1048:java.lang.String getServerModName() -> getServerModName
-    1052:1074:net.minecraft.CrashReport fillReport(net.minecraft.CrashReport) -> b
-    java.util.Optional getModdedStatus() -> q
-    1080:1080:boolean isInitialized() -> K
-    1085:1086:void sendMessage(net.minecraft.network.chat.Component) -> a
-    1089:1089:java.security.KeyPair getKeyPair() -> L
-    1093:1093:int getPort() -> M
-    1097:1098:void setPort(int) -> a
-    1101:1101:java.lang.String getSingleplayerName() -> N
-    1105:1106:void setSingleplayerName(java.lang.String) -> i
-    1109:1109:boolean isSingleplayer() -> O
-    1113:1113:java.lang.String getLevelIdName() -> P
-    1117:1118:void setLevelName(java.lang.String) -> j
-    1121:1121:java.lang.String getLevelName() -> Q
-    1125:1126:void setKeyPair(java.security.KeyPair) -> a
-    1129:1148:void setDifficulty(net.minecraft.world.Difficulty,boolean) -> a
-    1151:1157:void setDifficultyLocked(boolean) -> d
-    1160:1162:void sendDifficultyUpdate(net.minecraft.server.level.ServerPlayer) -> a
-    1165:1165:boolean getSpawnMonsters() -> R
-    1169:1169:boolean isDemo() -> S
-    1173:1174:void setDemo(boolean) -> e
-    1177:1178:void setBonusChest(boolean) -> f
-    1181:1181:net.minecraft.world.level.storage.LevelStorageSource getStorageSource() -> T
-    1185:1185:java.lang.String getResourcePack() -> U
-    1189:1189:java.lang.String getResourcePackHash() -> V
-    1193:1195:void setResourcePack(java.lang.String,java.lang.String) -> a
-    1199:1231:void populateSnooper(net.minecraft.world.Snooper) -> a
-    1235:1239:void populateSnooperInitial(net.minecraft.world.Snooper) -> b
-    1243:1243:boolean isSnooperEnabled() -> W
-    boolean isDedicatedServer() -> m
-    1249:1249:boolean usesAuthentication() -> X
-    1253:1254:void setUsesAuthentication(boolean) -> g
-    1257:1257:boolean getPreventProxyConnections() -> Y
-    1261:1262:void setPreventProxyConnections(boolean) -> h
-    1265:1265:boolean isAnimals() -> Z
-    1269:1270:void setAnimals(boolean) -> i
-    1273:1273:boolean isNpcsEnabled() -> aa
-    boolean isEpollEnabled() -> n
-    1279:1280:void setNpcsEnabled(boolean) -> j
-    1283:1283:boolean isPvpAllowed() -> ab
-    1287:1288:void setPvpAllowed(boolean) -> k
-    1291:1291:boolean isFlightAllowed() -> ac
-    1295:1296:void setFlightAllowed(boolean) -> l
-    boolean isCommandBlockEnabled() -> o
-    1301:1301:java.lang.String getMotd() -> ad
-    1305:1306:void setMotd(java.lang.String) -> k
-    1309:1309:int getMaxBuildHeight() -> ae
-    1313:1314:void setMaxBuildHeight(int) -> b
-    1317:1317:boolean isStopped() -> af
-    1321:1321:net.minecraft.server.players.PlayerList getPlayerList() -> ag
-    1325:1326:void setPlayerList(net.minecraft.server.players.PlayerList) -> a
-    boolean isPublished() -> p
-    1331:1334:void setDefaultGameMode(net.minecraft.world.level.GameType) -> a
-    1338:1338:net.minecraft.server.network.ServerConnectionListener getConnection() -> ah
-    1342:1342:boolean isReady() -> ai
-    1346:1346:boolean hasGui() -> aj
+    295:325:void convertFromRegionFormatIfNeeded(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess) -> a
+    328:338:void loadLevel() -> l_
+    341:341:void forceDifficulty() -> p
+    344:415:void createLevels(net.minecraft.server.level.progress.ChunkProgressListener) -> a
+    418:478:void setInitialSpawn(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.storage.ServerLevelData,boolean,boolean,boolean) -> a
+    481:490:void setupDebugLevel(net.minecraft.world.level.storage.WorldData) -> a
+    493:535:void prepareLevels(net.minecraft.server.level.progress.ChunkProgressListener) -> b
+    538:547:void detectBundledResources() -> q
+    550:550:net.minecraft.world.level.GameType getDefaultGameType() -> r
+    554:554:boolean isHardcore() -> f
+    int getOperatorUserPermissionLevel() -> g
+    int getFunctionCompilationLevel() -> h
+    boolean shouldRconBroadcast() -> i
+    564:577:boolean saveAllChunks(boolean,boolean,boolean) -> a
+    582:583:void close() -> close
+    586:620:void stopServer() -> s
+    623:623:java.lang.String getLocalIp() -> t
+    627:628:void setLocalIp(java.lang.String) -> a_
+    631:631:boolean isRunning() -> u
+    635:643:void halt(boolean) -> a
+    647:716:void runServer() -> v
+    719:719:boolean haveTime() -> aY
+    723:725:void waitUntilNextTick() -> w
+    729:729:net.minecraft.server.TickTask wrapRunnable(java.lang.Runnable) -> a
+    734:734:boolean shouldRun(net.minecraft.server.TickTask) -> a
+    739:741:boolean pollTask() -> x
+    745:757:boolean pollTaskInternal() -> aZ
+    762:764:void doRunTask(net.minecraft.server.TickTask) -> b
+    767:787:void updateStatusIcon(net.minecraft.network.protocol.status.ServerStatus) -> a
+    790:791:boolean hasWorldScreenshot() -> y
+    795:795:java.io.File getWorldScreenshotFile() -> z
+    799:799:java.io.File getServerDirectory() -> A
+    803:803:void onServerCrash(net.minecraft.CrashReport) -> a
+    806:806:void onServerExit() -> e
+    809:855:void tickServer(java.util.function.BooleanSupplier) -> a
+    858:896:void tickChildren(java.util.function.BooleanSupplier) -> b
+    899:899:boolean isNetherEnabled() -> B
+    903:904:void addTickable(java.lang.Runnable) -> b
+    907:908:void setId(java.lang.String) -> b
+    911:911:boolean isShutdown() -> C
+    915:915:java.io.File getFile(java.lang.String) -> c
+    919:919:net.minecraft.server.level.ServerLevel overworld() -> D
+    924:924:net.minecraft.server.level.ServerLevel getLevel(net.minecraft.resources.ResourceKey) -> a
+    928:928:java.util.Set levelKeys() -> E
+    932:932:java.lang.Iterable getAllLevels() -> F
+    936:936:java.lang.String getServerVersion() -> G
+    940:940:int getPlayerCount() -> H
+    944:944:int getMaxPlayers() -> I
+    948:948:java.lang.String[] getPlayerNames() -> J
+    953:953:java.lang.String getServerModName() -> getServerModName
+    957:979:net.minecraft.CrashReport fillReport(net.minecraft.CrashReport) -> b
+    java.util.Optional getModdedStatus() -> n
+    986:987:void sendMessage(net.minecraft.network.chat.Component,java.util.UUID) -> a
+    990:990:java.security.KeyPair getKeyPair() -> K
+    994:994:int getPort() -> L
+    998:999:void setPort(int) -> a
+    1002:1002:java.lang.String getSingleplayerName() -> M
+    1006:1007:void setSingleplayerName(java.lang.String) -> d
+    1010:1010:boolean isSingleplayer() -> N
+    1014:1015:void setKeyPair(java.security.KeyPair) -> a
+    1018:1026:void setDifficulty(net.minecraft.world.Difficulty,boolean) -> a
+    1029:1029:int getScaledTrackingDistance(int) -> b
+    1033:1036:void updateMobSpawningFlags() -> ba
+    1039:1041:void setDifficultyLocked(boolean) -> b
+    1044:1046:void sendDifficultyUpdate(net.minecraft.server.level.ServerPlayer) -> a
+    1049:1049:boolean isSpawningMonsters() -> O
+    1053:1053:boolean isDemo() -> P
+    1057:1058:void setDemo(boolean) -> c
+    1061:1061:java.lang.String getResourcePack() -> Q
+    1065:1065:java.lang.String getResourcePackHash() -> R
+    1069:1071:void setResourcePack(java.lang.String,java.lang.String) -> a
+    1075:1106:void populateSnooper(net.minecraft.world.Snooper) -> a
+    1110:1114:void populateSnooperInitial(net.minecraft.world.Snooper) -> b
+    1118:1118:boolean isSnooperEnabled() -> S
+    boolean isDedicatedServer() -> j
+    1124:1124:boolean usesAuthentication() -> T
+    1128:1129:void setUsesAuthentication(boolean) -> d
+    1132:1132:boolean getPreventProxyConnections() -> U
+    1136:1137:void setPreventProxyConnections(boolean) -> e
+    1140:1140:boolean isSpawningAnimals() -> V
+    1144:1144:boolean areNpcsEnabled() -> W
+    boolean isEpollEnabled() -> k
+    1150:1150:boolean isPvpAllowed() -> X
+    1154:1155:void setPvpAllowed(boolean) -> f
+    1158:1158:boolean isFlightAllowed() -> Y
+    1162:1163:void setFlightAllowed(boolean) -> g
+    boolean isCommandBlockEnabled() -> l
+    1168:1168:java.lang.String getMotd() -> Z
+    1172:1173:void setMotd(java.lang.String) -> e
+    1176:1176:int getMaxBuildHeight() -> aa
+    1180:1181:void setMaxBuildHeight(int) -> c
+    1184:1184:boolean isStopped() -> ab
+    1188:1188:net.minecraft.server.players.PlayerList getPlayerList() -> ac
+    1192:1193:void setPlayerList(net.minecraft.server.players.PlayerList) -> a
+    boolean isPublished() -> m
+    1198:1199:void setDefaultGameType(net.minecraft.world.level.GameType) -> a
+    1203:1203:net.minecraft.server.network.ServerConnectionListener getConnection() -> ad
+    1207:1207:boolean isReady() -> ae
+    1211:1211:boolean hasGui() -> af
     boolean publishServer(net.minecraft.world.level.GameType,boolean,int) -> a
-    1352:1352:int getTickCount() -> ak
-    1356:1357:void delayStartProfiler() -> al
-    1360:1360:net.minecraft.world.Snooper getSnooper() -> am
-    1364:1364:net.minecraft.world.level.BlockGetter getCommandSenderWorld() -> an
-    1368:1368:int getSpawnProtectionRadius() -> ao
-    1372:1372:boolean isUnderSpawnProtection(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    1376:1377:void setForceGameType(boolean) -> m
-    1380:1380:boolean getForceGameType() -> ap
-    1384:1384:java.net.Proxy getProxy() -> aq
-    1388:1388:int getPlayerIdleTimeout() -> ar
-    1392:1393:void setPlayerIdleTimeout(int) -> c
-    1396:1396:com.mojang.authlib.minecraft.MinecraftSessionService getSessionService() -> as
-    1400:1400:com.mojang.authlib.GameProfileRepository getProfileRepository() -> at
-    1404:1404:net.minecraft.server.players.GameProfileCache getProfileCache() -> au
-    1408:1408:net.minecraft.network.protocol.status.ServerStatus getStatus() -> av
-    1412:1413:void invalidateStatus() -> aw
-    1417:1425:net.minecraft.world.entity.Entity getEntityByUUID(java.util.UUID) -> a
-    1429:1429:int getAbsoluteMaxWorldSize() -> ax
-    1434:1434:boolean scheduleExecutables() -> ay
-    1439:1439:java.lang.Thread getRunningThread() -> az
-    1443:1443:int getCompressionThreshold() -> aA
-    1447:1447:long getNextTickTime() -> aB
-    1451:1451:com.mojang.datafixers.DataFixer getFixerUpper() -> aC
-    1455:1458:int getSpawnRadius(net.minecraft.server.level.ServerLevel) -> a
-    1462:1462:net.minecraft.server.ServerAdvancementManager getAdvancements() -> aD
-    1466:1466:net.minecraft.server.ServerFunctionManager getFunctions() -> aE
-    1470:1483:void reloadResources() -> aF
-    1486:1513:void updateSelectedPacks(net.minecraft.world.level.storage.LevelData) -> b
-    1516:1532:void kickUnlistedPlayers(net.minecraft.commands.CommandSourceStack) -> a
-    1535:1535:net.minecraft.server.packs.resources.ReloadableResourceManager getResources() -> aG
-    1539:1539:net.minecraft.server.packs.repository.PackRepository getPackRepository() -> aH
-    1543:1543:net.minecraft.server.packs.repository.FolderRepositorySource getFolderPackSource() -> aI
-    1547:1547:net.minecraft.commands.Commands getCommands() -> aJ
-    1551:1551:net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> aK
-    1556:1556:boolean acceptsSuccess() -> a
-    1561:1561:boolean acceptsFailure() -> b
-    boolean shouldInformAdmins() -> I_
-    1568:1568:net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> aL
-    1572:1572:net.minecraft.tags.TagManager getTags() -> aM
-    1576:1576:net.minecraft.server.ServerScoreboard getScoreboard() -> aN
-    1580:1584:net.minecraft.world.level.storage.CommandStorage getCommandStorage() -> aO
-    1588:1588:net.minecraft.world.level.storage.loot.LootTables getLootTables() -> aP
-    1592:1592:net.minecraft.world.level.storage.loot.PredicateManager getPredicateManager() -> aQ
-    1596:1596:net.minecraft.world.level.GameRules getGameRules() -> aR
-    1600:1600:net.minecraft.server.bossevents.CustomBossEvents getCustomBossEvents() -> aS
-    1604:1604:boolean isEnforceWhitelist() -> aT
-    1608:1609:void setEnforceWhitelist(boolean) -> n
-    1612:1612:float getAverageTickTime() -> aU
-    1616:1629:int getProfilePermissions(com.mojang.authlib.GameProfile) -> b
-    1633:1633:net.minecraft.util.FrameTimer getFrameTimer() -> aV
-    1637:1637:net.minecraft.util.profiling.GameProfiler getProfiler() -> aW
-    1641:1641:java.util.concurrent.Executor getBackgroundTaskExecutor() -> aX
+    1217:1217:int getTickCount() -> ag
+    1221:1221:net.minecraft.world.Snooper getSnooper() -> ah
+    1225:1225:int getSpawnProtectionRadius() -> ai
+    1229:1229:boolean isUnderSpawnProtection(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    1233:1234:void setForceGameType(boolean) -> h
+    1237:1237:boolean getForceGameType() -> aj
+    1241:1241:boolean repliesToStatus() -> ak
+    1245:1245:java.net.Proxy getProxy() -> al
+    1249:1249:int getPlayerIdleTimeout() -> am
+    1253:1254:void setPlayerIdleTimeout(int) -> d
+    1257:1257:com.mojang.authlib.minecraft.MinecraftSessionService getSessionService() -> an
+    1261:1261:com.mojang.authlib.GameProfileRepository getProfileRepository() -> ao
+    1265:1265:net.minecraft.server.players.GameProfileCache getProfileCache() -> ap
+    1269:1269:net.minecraft.network.protocol.status.ServerStatus getStatus() -> aq
+    1273:1274:void invalidateStatus() -> ar
+    1277:1277:int getAbsoluteMaxWorldSize() -> as
+    1282:1282:boolean scheduleExecutables() -> at
+    1287:1287:java.lang.Thread getRunningThread() -> au
+    1291:1291:int getCompressionThreshold() -> av
+    1295:1295:long getNextTickTime() -> aw
+    1299:1299:com.mojang.datafixers.DataFixer getFixerUpper() -> ax
+    1303:1306:int getSpawnRadius(net.minecraft.server.level.ServerLevel) -> a
+    1310:1310:net.minecraft.server.ServerAdvancementManager getAdvancements() -> ay
+    1314:1314:net.minecraft.server.ServerFunctionManager getFunctions() -> az
+    1318:1341:java.util.concurrent.CompletableFuture reloadResources(java.util.Collection) -> a
+    1345:1377:net.minecraft.world.level.DataPackConfig configurePackRepository(net.minecraft.server.packs.repository.PackRepository,net.minecraft.world.level.DataPackConfig,boolean) -> a
+    1381:1384:net.minecraft.world.level.DataPackConfig getSelectedPacks(net.minecraft.server.packs.repository.PackRepository) -> a
+    1388:1401:void kickUnlistedPlayers(net.minecraft.commands.CommandSourceStack) -> a
+    1404:1404:net.minecraft.server.packs.repository.PackRepository getPackRepository() -> aA
+    1408:1408:net.minecraft.commands.Commands getCommands() -> aB
+    1412:1413:net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> aC
+    1418:1418:boolean acceptsSuccess() -> a
+    1423:1423:boolean acceptsFailure() -> b
+    boolean shouldInformAdmins() -> S_
+    1430:1430:net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> aD
+    1434:1434:net.minecraft.tags.TagManager getTags() -> aE
+    1438:1438:net.minecraft.server.ServerScoreboard getScoreboard() -> aF
+    1442:1446:net.minecraft.world.level.storage.CommandStorage getCommandStorage() -> aG
+    1450:1450:net.minecraft.world.level.storage.loot.LootTables getLootTables() -> aH
+    1454:1454:net.minecraft.world.level.storage.loot.PredicateManager getPredicateManager() -> aI
+    1458:1458:net.minecraft.world.level.GameRules getGameRules() -> aJ
+    1462:1462:net.minecraft.server.bossevents.CustomBossEvents getCustomBossEvents() -> aK
+    1466:1466:boolean isEnforceWhitelist() -> aL
+    1470:1471:void setEnforceWhitelist(boolean) -> i
+    1474:1474:float getAverageTickTime() -> aM
+    1478:1491:int getProfilePermissions(com.mojang.authlib.GameProfile) -> b
+    1495:1495:net.minecraft.util.FrameTimer getFrameTimer() -> aN
+    1499:1499:net.minecraft.util.profiling.ProfilerFiller getProfiler() -> aO
+    1503:1503:java.util.concurrent.Executor getBackgroundTaskExecutor() -> aP
     boolean isSingleplayerOwner(com.mojang.authlib.GameProfile) -> a
-    1647:1660:void saveDebugReport(java.nio.file.Path) -> a
-    1663:1669:void dumpMiscStats(java.nio.file.Path) -> b
-    1672:1677:void dumpCrashCategory(java.nio.file.Path) -> c
-    1680:1693:void dumpGameRules(java.nio.file.Path) -> d
-    1696:1704:void dumpClasspath(java.nio.file.Path) -> e
-    1707:1717:void dumpThreads(java.nio.file.Path) -> f
-    1723:1724:void refreshRegistries() -> bb
-    138:138:void doRunTask(java.lang.Runnable) -> c
-    138:138:boolean shouldRun(java.lang.Runnable) -> d
-    138:138:java.lang.Runnable wrapRunnable(java.lang.Runnable) -> e
-    1509:1512:void lambda$updateSelectedPacks$10(net.minecraft.world.level.storage.LevelData,net.minecraft.server.packs.repository.UnopenedPack) -> a
-    1507:1507:void lambda$updateSelectedPacks$9(net.minecraft.world.level.storage.LevelData,net.minecraft.server.packs.repository.UnopenedPack) -> b
-    1496:1496:void lambda$updateSelectedPacks$8(java.util.List,net.minecraft.server.packs.repository.UnopenedPack) -> a
-    1491:1491:net.minecraft.server.packs.repository.UnopenedPack lambda$updateSelectedPacks$7(net.minecraft.server.packs.repository.UnopenedPack) -> a
-    1071:1071:java.lang.String lambda$fillReport$6() -> bc
-    1057:1067:java.lang.String lambda$fillReport$5() -> bd
-    1053:1053:java.lang.String lambda$fillReport$4() -> be
-    844:844:java.lang.String lambda$tickChildren$3(net.minecraft.server.level.ServerLevel) -> b
-    704:704:boolean lambda$waitUntilNextTick$2() -> bf
-    222:222:void lambda$new$1(java.lang.Thread) -> a
-    222:222:void lambda$null$0(java.lang.Thread,java.lang.Throwable) -> a
-    138:138:org.apache.logging.log4j.Logger access$000() -> aY
-    139:162:void <clinit>() -> <clinit>
+    1509:1522:void saveDebugReport(java.nio.file.Path) -> a
+    1525:1531:void dumpMiscStats(java.nio.file.Path) -> b
+    1534:1539:void dumpCrashCategory(java.nio.file.Path) -> c
+    1542:1555:void dumpGameRules(java.nio.file.Path) -> d
+    1558:1566:void dumpClasspath(java.nio.file.Path) -> e
+    1569:1579:void dumpThreads(java.nio.file.Path) -> f
+    1582:1587:void startProfilerTick(net.minecraft.util.profiling.SingleTickProfiler) -> a
+    1590:1594:void endProfilerTick(net.minecraft.util.profiling.SingleTickProfiler) -> b
+    1597:1597:boolean isProfiling() -> aQ
+    1601:1602:void startProfiling() -> aR
+    1605:1607:net.minecraft.util.profiling.ProfileResults finishProfiling() -> aS
+    1611:1611:java.nio.file.Path getWorldPath(net.minecraft.world.level.storage.LevelResource) -> a
+    1615:1615:boolean forceSynchronousWrites() -> aT
+    1619:1619:net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager getStructureManager() -> aU
+    1623:1623:net.minecraft.world.level.storage.WorldData getWorldData() -> aV
+    1627:1627:net.minecraft.core.RegistryAccess registryAccess() -> aW
+    154:154:void doRunTask(java.lang.Runnable) -> c
+    154:154:boolean shouldRun(java.lang.Runnable) -> d
+    154:154:java.lang.Runnable wrapRunnable(java.lang.Runnable) -> e
+    1383:1383:boolean lambda$getSelectedPacks$12(java.util.Collection,java.lang.String) -> a
+    1326:1336:void lambda$reloadResources$11(java.util.Collection,net.minecraft.server.ServerResources) -> a
+    1322:1322:java.util.concurrent.CompletionStage lambda$reloadResources$10(com.google.common.collect.ImmutableList) -> a
+    1319:1319:com.google.common.collect.ImmutableList lambda$reloadResources$9(java.util.Collection) -> b
+    976:976:java.lang.String lambda$fillReport$8() -> bb
+    962:972:java.lang.String lambda$fillReport$7() -> bc
+    958:958:java.lang.String lambda$fillReport$6() -> bd
+    863:863:java.lang.String lambda$tickChildren$5(net.minecraft.server.level.ServerLevel) -> b
+    724:724:boolean lambda$waitUntilNextTick$4() -> be
+    408:408:java.lang.IllegalStateException lambda$createLevels$3(net.minecraft.world.level.dimension.DimensionType) -> a
+    367:367:java.lang.IllegalStateException lambda$createLevels$2(net.minecraft.world.level.dimension.DimensionType) -> b
+    257:257:void lambda$spin$1(java.lang.Thread,java.lang.Throwable) -> a
+    256:256:void lambda$spin$0(java.util.concurrent.atomic.AtomicReference) -> a
+    154:154:org.apache.logging.log4j.Logger access$000() -> aX
+    155:177:void <clinit>() -> <clinit>
 net.minecraft.server.MinecraftServer$1 -> net.minecraft.server.MinecraftServer$1:
-    long timeStamp -> b
-    net.minecraft.server.MinecraftServer this$0 -> a
-    286:287:void <init>(net.minecraft.server.MinecraftServer) -> <init>
-    291:291:void progressStartNoAbort(net.minecraft.network.chat.Component) -> a
-    295:295:void progressStart(net.minecraft.network.chat.Component) -> b
-    299:303:void progressStagePercentage(int) -> a
-    307:307:void stop() -> a
-    311:311:void progressStage(net.minecraft.network.chat.Component) -> c
+    long timeStamp -> a
+    297:298:void <init>() -> <init>
+    302:302:void progressStartNoAbort(net.minecraft.network.chat.Component) -> a
+    306:306:void progressStart(net.minecraft.network.chat.Component) -> b
+    310:314:void progressStagePercentage(int) -> a
+    318:318:void stop() -> a
+    322:322:void progressStage(net.minecraft.network.chat.Component) -> c
 net.minecraft.server.MinecraftServer$2 -> net.minecraft.server.MinecraftServer$2:
-    net.minecraft.server.dedicated.DedicatedServer val$server -> a
-    959:959:void <init>(java.lang.String,net.minecraft.server.dedicated.DedicatedServer) -> <init>
-    962:963:void run() -> run
-net.minecraft.server.MinecraftServer$3 -> net.minecraft.server.MinecraftServer$3:
     java.util.List val$entries -> a
     net.minecraft.world.level.GameRules val$gameRules -> b
     net.minecraft.server.MinecraftServer this$0 -> c
-    1683:1683:void <init>(net.minecraft.server.MinecraftServer,java.util.List,net.minecraft.world.level.GameRules) -> <init>
-    1686:1687:void visit(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> a
-net.minecraft.server.PlayerAdvancements -> sv:
+    1545:1545:void <init>(net.minecraft.server.MinecraftServer,java.util.List,net.minecraft.world.level.GameRules) -> <init>
+    1548:1549:void visit(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> a
+net.minecraft.server.PlayerAdvancements -> uq:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.google.gson.Gson GSON -> b
     com.google.gson.reflect.TypeToken TYPE_TOKEN -> c
-    net.minecraft.server.MinecraftServer server -> d
-    java.io.File file -> e
-    java.util.Map advancements -> f
-    java.util.Set visible -> g
-    java.util.Set visibilityChanged -> h
-    java.util.Set progressChanged -> i
-    net.minecraft.server.level.ServerPlayer player -> j
-    net.minecraft.advancements.Advancement lastSelectedTab -> k
-    boolean isFirstPacket -> l
-    63:77:void <init>(net.minecraft.server.MinecraftServer,java.io.File,net.minecraft.server.level.ServerPlayer) -> <init>
-    80:81:void setPlayer(net.minecraft.server.level.ServerPlayer) -> a
-    84:87:void stopListening() -> a
-    90:98:void reload() -> b
-    101:104:void registerListeners() -> d
-    107:117:void ensureAllVisible() -> e
-    120:126:void checkForAutomaticTriggers() -> f
-    129:166:void load() -> g
-    169:187:void save() -> c
-    190:212:boolean award(net.minecraft.advancements.Advancement,java.lang.String) -> a
-    216:229:boolean revoke(net.minecraft.advancements.Advancement,java.lang.String) -> b
-    233:250:void registerListeners(net.minecraft.advancements.Advancement) -> c
-    253:267:void unregisterListeners(net.minecraft.advancements.Advancement) -> d
-    270:293:void flushDirty(net.minecraft.server.level.ServerPlayer) -> b
-    296:305:void setSelectedTab(net.minecraft.advancements.Advancement) -> a
-    308:313:net.minecraft.advancements.AdvancementProgress getOrStartProgress(net.minecraft.advancements.Advancement) -> b
-    317:319:void startProgress(net.minecraft.advancements.Advancement,net.minecraft.advancements.AdvancementProgress) -> a
-    322:344:void ensureVisibility(net.minecraft.advancements.Advancement) -> e
-    347:368:boolean shouldBeVisible(net.minecraft.advancements.Advancement) -> f
-    372:382:boolean hasCompletedChildrenOrSelf(net.minecraft.advancements.Advancement) -> g
-    52:59:void <clinit>() -> <clinit>
-net.minecraft.server.PlayerAdvancements$1 -> sv$1:
-    59:59:void <init>() -> <init>
-net.minecraft.server.RunningOnDifferentThreadException -> sw:
+    com.mojang.datafixers.DataFixer dataFixer -> d
+    net.minecraft.server.players.PlayerList playerList -> e
+    java.io.File file -> f
+    java.util.Map advancements -> g
+    java.util.Set visible -> h
+    java.util.Set visibilityChanged -> i
+    java.util.Set progressChanged -> j
+    net.minecraft.server.level.ServerPlayer player -> k
+    net.minecraft.advancements.Advancement lastSelectedTab -> l
+    boolean isFirstPacket -> m
+    68:83:void <init>(com.mojang.datafixers.DataFixer,net.minecraft.server.players.PlayerList,net.minecraft.server.ServerAdvancementManager,java.io.File,net.minecraft.server.level.ServerPlayer) -> <init>
+    86:87:void setPlayer(net.minecraft.server.level.ServerPlayer) -> a
+    90:93:void stopListening() -> a
+    96:104:void reload(net.minecraft.server.ServerAdvancementManager) -> a
+    107:110:void registerListeners(net.minecraft.server.ServerAdvancementManager) -> b
+    113:123:void ensureAllVisible() -> c
+    126:132:void checkForAutomaticTriggers(net.minecraft.server.ServerAdvancementManager) -> c
+    135:172:void load(net.minecraft.server.ServerAdvancementManager) -> d
+    175:193:void save() -> b
+    196:218:boolean award(net.minecraft.advancements.Advancement,java.lang.String) -> a
+    222:235:boolean revoke(net.minecraft.advancements.Advancement,java.lang.String) -> b
+    239:256:void registerListeners(net.minecraft.advancements.Advancement) -> c
+    259:273:void unregisterListeners(net.minecraft.advancements.Advancement) -> d
+    276:299:void flushDirty(net.minecraft.server.level.ServerPlayer) -> b
+    302:311:void setSelectedTab(net.minecraft.advancements.Advancement) -> a
+    314:319:net.minecraft.advancements.AdvancementProgress getOrStartProgress(net.minecraft.advancements.Advancement) -> b
+    323:325:void startProgress(net.minecraft.advancements.Advancement,net.minecraft.advancements.AdvancementProgress) -> a
+    328:350:void ensureVisibility(net.minecraft.advancements.Advancement) -> e
+    353:374:boolean shouldBeVisible(net.minecraft.advancements.Advancement) -> f
+    378:388:boolean hasCompletedChildrenOrSelf(net.minecraft.advancements.Advancement) -> g
+    56:63:void <clinit>() -> <clinit>
+net.minecraft.server.PlayerAdvancements$1 -> uq$1:
+    63:63:void <init>() -> <init>
+net.minecraft.server.RunningOnDifferentThreadException -> ur:
     net.minecraft.server.RunningOnDifferentThreadException RUNNING_ON_DIFFERENT_THREAD -> a
     6:8:void <init>() -> <init>
     12:13:java.lang.Throwable fillInStackTrace() -> fillInStackTrace
     4:4:void <clinit>() -> <clinit>
-net.minecraft.server.ServerAdvancementManager -> sx:
+net.minecraft.server.ServerAdvancementManager -> us:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.google.gson.Gson GSON -> b
     net.minecraft.advancements.AdvancementList advancements -> c
-    41:45:void <init>() -> <init>
-    49:70:void apply(java.util.Map,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    74:74:net.minecraft.advancements.Advancement getAdvancement(net.minecraft.resources.ResourceLocation) -> a
-    78:78:java.util.Collection getAllAdvancements() -> a
-    28:28:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    53:58:void lambda$apply$1(java.util.Map,net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
-    32:33:net.minecraft.advancements.Advancement$Builder lambda$static$0(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    29:39:void <clinit>() -> <clinit>
-net.minecraft.server.ServerFunctionManager -> sy:
-    org.apache.logging.log4j.Logger LOGGER -> c
-    net.minecraft.resources.ResourceLocation TICK_FUNCTION_TAG -> d
-    net.minecraft.resources.ResourceLocation LOAD_FUNCTION_TAG -> e
-    int PATH_PREFIX_LENGTH -> a
-    int PATH_SUFFIX_LENGTH -> b
-    net.minecraft.server.MinecraftServer server -> f
-    java.util.Map functions -> g
-    boolean isInFunction -> h
-    java.util.ArrayDeque commandQueue -> i
-    java.util.List nestedCalls -> j
-    net.minecraft.tags.TagCollection tags -> k
-    java.util.List ticking -> l
-    boolean postReload -> m
-    45:55:void <init>(net.minecraft.server.MinecraftServer) -> <init>
-    58:58:java.util.Optional get(net.minecraft.resources.ResourceLocation) -> a
-    62:62:net.minecraft.server.MinecraftServer getServer() -> a
-    66:66:int getCommandLimit() -> b
-    70:70:java.util.Map getFunctions() -> c
-    74:74:com.mojang.brigadier.CommandDispatcher getDispatcher() -> d
-    78:93:void tick() -> e
-    96:139:int execute(net.minecraft.commands.CommandFunction,net.minecraft.commands.CommandSourceStack) -> a
-    144:169:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
-    173:180:net.minecraft.commands.CommandFunction addFunction(net.minecraft.commands.CommandFunction,java.lang.Throwable,net.minecraft.resources.ResourceLocation) -> a
-    185:188:java.util.List readLinesAsync(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation) -> a
-    193:193:net.minecraft.commands.CommandSourceStack getGameLoopSender() -> f
-    197:197:net.minecraft.commands.CommandSourceStack getCompilationContext() -> g
-    201:201:net.minecraft.tags.TagCollection getTags() -> h
-    156:156:net.minecraft.commands.CommandFunction lambda$onResourceManagerReload$3(net.minecraft.resources.ResourceLocation,net.minecraft.commands.CommandFunction,java.lang.Throwable) -> a
-    155:155:net.minecraft.commands.CommandFunction lambda$onResourceManagerReload$2(net.minecraft.resources.ResourceLocation,java.util.List) -> a
-    154:154:java.util.List lambda$onResourceManagerReload$1(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation) -> b
-    147:147:boolean lambda$onResourceManagerReload$0(java.lang.String) -> a
-    36:42:void <clinit>() -> <clinit>
-net.minecraft.server.ServerFunctionManager$QueuedCommand -> sy$a:
+    net.minecraft.world.level.storage.loot.PredicateManager predicateManager -> d
+    30:36:void <init>(net.minecraft.world.level.storage.loot.PredicateManager) -> <init>
+    40:62:void apply(java.util.Map,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    66:66:net.minecraft.advancements.Advancement getAdvancement(net.minecraft.resources.ResourceLocation) -> a
+    70:70:java.util.Collection getAllAdvancements() -> a
+    26:26:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    44:50:void lambda$apply$0(java.util.Map,net.minecraft.resources.ResourceLocation,com.google.gson.JsonElement) -> a
+    27:28:void <clinit>() -> <clinit>
+net.minecraft.server.ServerFunctionLibrary -> ut:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    int PATH_PREFIX_LENGTH -> b
+    int PATH_SUFFIX_LENGTH -> c
+    java.util.Map functions -> d
+    net.minecraft.tags.TagCollection tags -> e
+    int functionCompilationLevel -> f
+    com.mojang.brigadier.CommandDispatcher dispatcher -> g
+    47:47:java.util.Optional getFunction(net.minecraft.resources.ResourceLocation) -> a
+    51:51:java.util.Map getFunctions() -> a
+    55:55:net.minecraft.tags.TagCollection getTags() -> b
+    59:59:net.minecraft.tags.Tag getTag(net.minecraft.resources.ResourceLocation) -> b
+    40:65:void <init>(int,com.mojang.brigadier.CommandDispatcher) -> <init>
+    69:95:java.util.concurrent.CompletableFuture reload(net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.ProfilerFiller,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
+    115:118:java.util.List readLines(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation) -> a
+    96:111:void lambda$reload$7(com.mojang.datafixers.util.Pair) -> a
+    99:106:void lambda$null$6(com.google.common.collect.ImmutableMap$Builder,net.minecraft.resources.ResourceLocation,java.util.concurrent.CompletableFuture) -> a
+    100:105:java.lang.Object lambda$null$5(net.minecraft.resources.ResourceLocation,com.google.common.collect.ImmutableMap$Builder,net.minecraft.commands.CommandFunction,java.lang.Throwable) -> a
+    74:90:java.util.concurrent.CompletionStage lambda$reload$4(net.minecraft.server.packs.resources.ResourceManager,java.util.concurrent.Executor,java.util.Collection) -> a
+    90:90:java.util.Map lambda$null$3(java.util.Map,java.lang.Void,java.lang.Throwable) -> a
+    83:84:net.minecraft.commands.CommandFunction lambda$null$2(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,net.minecraft.commands.CommandSourceStack) -> a
+    72:72:java.util.Collection lambda$reload$1(net.minecraft.server.packs.resources.ResourceManager) -> a
+    72:72:boolean lambda$null$0(java.lang.String) -> a
+    34:38:void <clinit>() -> <clinit>
+net.minecraft.server.ServerFunctionManager -> uu:
+    net.minecraft.resources.ResourceLocation TICK_FUNCTION_TAG -> a
+    net.minecraft.resources.ResourceLocation LOAD_FUNCTION_TAG -> b
+    net.minecraft.server.MinecraftServer server -> c
+    boolean isInFunction -> d
+    java.util.ArrayDeque commandQueue -> e
+    java.util.List nestedCalls -> f
+    java.util.List ticking -> g
+    boolean postReload -> h
+    net.minecraft.server.ServerFunctionLibrary library -> i
+    24:36:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.server.ServerFunctionLibrary) -> <init>
+    39:39:net.minecraft.server.MinecraftServer getServer() -> a
+    43:43:int getCommandLimit() -> b
+    47:47:com.mojang.brigadier.CommandDispatcher getDispatcher() -> c
+    51:58:void tick() -> d
+    61:66:void executeTagFunctions(java.util.Collection,net.minecraft.resources.ResourceLocation) -> a
+    69:112:int execute(net.minecraft.commands.CommandFunction,net.minecraft.commands.CommandSourceStack) -> a
+    116:118:void replaceLibrary(net.minecraft.server.ServerFunctionLibrary) -> a
+    121:124:void postReload(net.minecraft.server.ServerFunctionLibrary) -> b
+    127:127:net.minecraft.commands.CommandSourceStack getGameLoopSender() -> e
+    131:131:java.util.Optional get(net.minecraft.resources.ResourceLocation) -> a
+    135:135:net.minecraft.tags.Tag getTag(net.minecraft.resources.ResourceLocation) -> b
+    139:139:java.lang.Iterable getFunctionNames() -> f
+    143:143:java.lang.Iterable getTagNames() -> g
+    18:19:void <clinit>() -> <clinit>
+net.minecraft.server.ServerFunctionManager$QueuedCommand -> uu$a:
     net.minecraft.server.ServerFunctionManager manager -> a
     net.minecraft.commands.CommandSourceStack sender -> b
     net.minecraft.commands.CommandFunction$Entry entry -> c
-    209:213:void <init>(net.minecraft.server.ServerFunctionManager,net.minecraft.commands.CommandSourceStack,net.minecraft.commands.CommandFunction$Entry) -> <init>
-    217:220:void execute(java.util.ArrayDeque,int) -> a
-    224:224:java.lang.String toString() -> toString
-net.minecraft.server.ServerInterface -> sz:
-    net.minecraft.server.dedicated.DedicatedServerProperties getProperties() -> d_
-    java.lang.String getServerIp() -> e_
-    int getServerPort() -> r
-    java.lang.String getServerName() -> f_
-    java.lang.String getServerVersion() -> E
-    int getPlayerCount() -> F
-    int getMaxPlayers() -> G
-    java.lang.String[] getPlayerNames() -> H
-    java.lang.String getLevelIdName() -> P
-    java.lang.String getPluginNames() -> u
-    java.lang.String runCommand(java.lang.String) -> a_
-    boolean isDebugging() -> J
-    void info(java.lang.String) -> e
-    void warn(java.lang.String) -> f
-    void error(java.lang.String) -> g
-    void debug(java.lang.String) -> h
-net.minecraft.server.ServerScoreboard -> ta:
+    151:155:void <init>(net.minecraft.server.ServerFunctionManager,net.minecraft.commands.CommandSourceStack,net.minecraft.commands.CommandFunction$Entry) -> <init>
+    159:162:void execute(java.util.ArrayDeque,int) -> a
+    166:166:java.lang.String toString() -> toString
+net.minecraft.server.ServerInterface -> uv:
+    net.minecraft.server.dedicated.DedicatedServerProperties getProperties() -> g_
+    java.lang.String getServerIp() -> h_
+    int getServerPort() -> o
+    java.lang.String getServerName() -> i_
+    java.lang.String getServerVersion() -> G
+    int getPlayerCount() -> H
+    int getMaxPlayers() -> I
+    java.lang.String[] getPlayerNames() -> J
+    java.lang.String getLevelIdName() -> k_
+    java.lang.String getPluginNames() -> j_
+    java.lang.String runCommand(java.lang.String) -> a
+net.minecraft.server.ServerResources -> uw:
+    java.util.concurrent.CompletableFuture DATA_RELOAD_INITIAL_TASK -> a
+    net.minecraft.server.packs.resources.ReloadableResourceManager resources -> b
+    net.minecraft.commands.Commands commands -> c
+    net.minecraft.world.item.crafting.RecipeManager recipes -> d
+    net.minecraft.tags.TagManager tags -> e
+    net.minecraft.world.level.storage.loot.PredicateManager predicateManager -> f
+    net.minecraft.world.level.storage.loot.LootTables lootTables -> g
+    net.minecraft.server.ServerAdvancementManager advancements -> h
+    net.minecraft.server.ServerFunctionLibrary functionLibrary -> i
+    22:42:void <init>(net.minecraft.commands.Commands$CommandSelection,int) -> <init>
+    45:45:net.minecraft.server.ServerFunctionLibrary getFunctionLibrary() -> a
+    49:49:net.minecraft.world.level.storage.loot.PredicateManager getPredicateManager() -> b
+    53:53:net.minecraft.world.level.storage.loot.LootTables getLootTables() -> c
+    57:57:net.minecraft.tags.TagManager getTags() -> d
+    61:61:net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> e
+    65:65:net.minecraft.commands.Commands getCommands() -> f
+    69:69:net.minecraft.server.ServerAdvancementManager getAdvancements() -> g
+    73:73:net.minecraft.server.packs.resources.ResourceManager getResourceManager() -> h
+    77:83:java.util.concurrent.CompletableFuture loadResources(java.util.List,net.minecraft.commands.Commands$CommandSelection,int,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
+    87:88:void updateGlobals() -> i
+    92:93:void close() -> close
+    83:83:net.minecraft.server.ServerResources lambda$loadResources$1(net.minecraft.server.ServerResources,net.minecraft.util.Unit) -> a
+    80:83:void lambda$loadResources$0(net.minecraft.server.ServerResources,net.minecraft.util.Unit,java.lang.Throwable) -> a
+    20:20:void <clinit>() -> <clinit>
+net.minecraft.server.ServerScoreboard -> ux:
     net.minecraft.server.MinecraftServer server -> a
     java.util.Set trackedObjectives -> b
     java.lang.Runnable[] dirtyListeners -> c
@@ -28040,7 +30207,7 @@ net.minecraft.server.ServerScoreboard -> ta:
     203:212:java.util.List getStopTrackingPackets(net.minecraft.world.scores.Objective) -> f
     216:225:void stopTrackingObjective(net.minecraft.world.scores.Objective) -> g
     228:236:int getObjectiveDisplaySlotCount(net.minecraft.world.scores.Objective) -> h
-net.minecraft.server.ServerScoreboard$Method -> ta$a:
+net.minecraft.server.ServerScoreboard$Method -> ux$a:
     net.minecraft.server.ServerScoreboard$Method CHANGE -> a
     net.minecraft.server.ServerScoreboard$Method REMOVE -> b
     net.minecraft.server.ServerScoreboard$Method[] $VALUES -> c
@@ -28048,13 +30215,13 @@ net.minecraft.server.ServerScoreboard$Method -> ta$a:
     239:239:net.minecraft.server.ServerScoreboard$Method valueOf(java.lang.String) -> valueOf
     239:239:void <init>(java.lang.String,int) -> <init>
     239:241:void <clinit>() -> <clinit>
-net.minecraft.server.TickTask -> tb:
+net.minecraft.server.TickTask -> uy:
     int tick -> a
     java.lang.Runnable runnable -> b
     7:10:void <init>(int,java.lang.Runnable) -> <init>
     13:13:int getTick() -> a
     18:19:void run() -> run
-net.minecraft.server.bossevents.CustomBossEvent -> tc:
+net.minecraft.server.bossevents.CustomBossEvent -> uz:
     net.minecraft.resources.ResourceLocation id -> h
     java.util.Set players -> i
     int value -> j
@@ -28075,22 +30242,21 @@ net.minecraft.server.bossevents.CustomBossEvent -> tc:
     155:170:net.minecraft.server.bossevents.CustomBossEvent load(net.minecraft.nbt.CompoundTag,net.minecraft.resources.ResourceLocation) -> a
     174:177:void onPlayerConnect(net.minecraft.server.level.ServerPlayer) -> c
     180:181:void onPlayerDisconnect(net.minecraft.server.level.ServerPlayer) -> d
-    78:81:void lambda$getDisplayName$0(net.minecraft.network.chat.Style) -> a
-net.minecraft.server.bossevents.CustomBossEvents -> td:
-    net.minecraft.server.MinecraftServer server -> a
-    java.util.Map events -> b
-    16:20:void <init>(net.minecraft.server.MinecraftServer) -> <init>
-    24:24:net.minecraft.server.bossevents.CustomBossEvent get(net.minecraft.resources.ResourceLocation) -> a
-    28:30:net.minecraft.server.bossevents.CustomBossEvent create(net.minecraft.resources.ResourceLocation,net.minecraft.network.chat.Component) -> a
-    34:35:void remove(net.minecraft.server.bossevents.CustomBossEvent) -> a
-    38:38:java.util.Collection getIds() -> a
-    42:42:java.util.Collection getEvents() -> b
-    46:52:net.minecraft.nbt.CompoundTag save() -> c
-    56:60:void load(net.minecraft.nbt.CompoundTag) -> a
-    63:66:void onPlayerConnect(net.minecraft.server.level.ServerPlayer) -> a
-    69:72:void onPlayerDisconnect(net.minecraft.server.level.ServerPlayer) -> b
-net.minecraft.server.bossevents.package-info -> te:
-net.minecraft.server.commands.AdvancementCommands -> tf:
+    78:81:net.minecraft.network.chat.Style lambda$getDisplayName$0(net.minecraft.network.chat.Style) -> a
+net.minecraft.server.bossevents.CustomBossEvents -> va:
+    java.util.Map events -> a
+    14:17:void <init>() -> <init>
+    21:21:net.minecraft.server.bossevents.CustomBossEvent get(net.minecraft.resources.ResourceLocation) -> a
+    25:27:net.minecraft.server.bossevents.CustomBossEvent create(net.minecraft.resources.ResourceLocation,net.minecraft.network.chat.Component) -> a
+    31:32:void remove(net.minecraft.server.bossevents.CustomBossEvent) -> a
+    35:35:java.util.Collection getIds() -> a
+    39:39:java.util.Collection getEvents() -> b
+    43:49:net.minecraft.nbt.CompoundTag save() -> c
+    53:57:void load(net.minecraft.nbt.CompoundTag) -> a
+    60:63:void onPlayerConnect(net.minecraft.server.level.ServerPlayer) -> a
+    66:69:void onPlayerDisconnect(net.minecraft.server.level.ServerPlayer) -> b
+net.minecraft.server.bossevents.package-info -> vb:
+net.minecraft.server.commands.AdvancementCommands -> vc:
     com.mojang.brigadier.suggestion.SuggestionProvider SUGGEST_ADVANCEMENTS -> a
     27:27:void <init>() -> <init>
     34:132:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -28115,8 +30281,8 @@ net.minecraft.server.commands.AdvancementCommands -> tf:
     36:36:boolean lambda$register$1(net.minecraft.commands.CommandSourceStack) -> a
     29:30:java.util.concurrent.CompletableFuture lambda$static$0(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> c
     28:28:void <clinit>() -> <clinit>
-net.minecraft.server.commands.AdvancementCommands$1 -> tf$1:
-net.minecraft.server.commands.AdvancementCommands$Action -> tf$a:
+net.minecraft.server.commands.AdvancementCommands$1 -> vc$1:
+net.minecraft.server.commands.AdvancementCommands$Action -> vc$a:
     net.minecraft.server.commands.AdvancementCommands$Action GRANT -> a
     net.minecraft.server.commands.AdvancementCommands$Action REVOKE -> b
     java.lang.String key -> c
@@ -28130,15 +30296,15 @@ net.minecraft.server.commands.AdvancementCommands$Action -> tf$a:
     286:286:java.lang.String getKey() -> a
     226:226:void <init>(java.lang.String,int,java.lang.String,net.minecraft.server.commands.AdvancementCommands$1) -> <init>
     226:245:void <clinit>() -> <clinit>
-net.minecraft.server.commands.AdvancementCommands$Action$1 -> tf$a$1:
+net.minecraft.server.commands.AdvancementCommands$Action$1 -> vc$a$1:
     227:227:void <init>(java.lang.String,int,java.lang.String) -> <init>
     230:237:boolean perform(net.minecraft.server.level.ServerPlayer,net.minecraft.advancements.Advancement) -> a
     242:242:boolean performCriterion(net.minecraft.server.level.ServerPlayer,net.minecraft.advancements.Advancement,java.lang.String) -> a
-net.minecraft.server.commands.AdvancementCommands$Action$2 -> tf$a$2:
+net.minecraft.server.commands.AdvancementCommands$Action$2 -> vc$a$2:
     245:245:void <init>(java.lang.String,int,java.lang.String) -> <init>
     248:255:boolean perform(net.minecraft.server.level.ServerPlayer,net.minecraft.advancements.Advancement) -> a
     260:260:boolean performCriterion(net.minecraft.server.level.ServerPlayer,net.minecraft.advancements.Advancement,java.lang.String) -> a
-net.minecraft.server.commands.AdvancementCommands$Mode -> tf$b:
+net.minecraft.server.commands.AdvancementCommands$Mode -> vc$b:
     net.minecraft.server.commands.AdvancementCommands$Mode ONLY -> a
     net.minecraft.server.commands.AdvancementCommands$Mode THROUGH -> b
     net.minecraft.server.commands.AdvancementCommands$Mode FROM -> c
@@ -28153,7 +30319,42 @@ net.minecraft.server.commands.AdvancementCommands$Mode -> tf$b:
     290:290:boolean access$000(net.minecraft.server.commands.AdvancementCommands$Mode) -> a
     290:290:boolean access$100(net.minecraft.server.commands.AdvancementCommands$Mode) -> b
     290:295:void <clinit>() -> <clinit>
-net.minecraft.server.commands.BanIpCommands -> tg:
+net.minecraft.server.commands.AttributeCommand -> vd:
+    com.mojang.brigadier.suggestion.SuggestionProvider AVAILABLE_ATTRIBUTES -> a
+    com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_NOT_LIVING_ENTITY -> b
+    com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType ERROR_NO_SUCH_ATTRIBUTE -> c
+    com.mojang.brigadier.exceptions.Dynamic3CommandExceptionType ERROR_NO_SUCH_MODIFIER -> d
+    com.mojang.brigadier.exceptions.Dynamic3CommandExceptionType ERROR_MODIFIER_ALREADY_PRESENT -> e
+    37:37:void <init>() -> <init>
+    46:130:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    133:137:net.minecraft.world.entity.ai.attributes.AttributeInstance getAttributeInstance(net.minecraft.world.entity.Entity,net.minecraft.world.entity.ai.attributes.Attribute) -> a
+    141:144:net.minecraft.world.entity.LivingEntity getLivingEntity(net.minecraft.world.entity.Entity) -> a
+    148:152:net.minecraft.world.entity.LivingEntity getEntityWithAttribute(net.minecraft.world.entity.Entity,net.minecraft.world.entity.ai.attributes.Attribute) -> b
+    156:159:int getAttributeValue(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,net.minecraft.world.entity.ai.attributes.Attribute,double) -> a
+    163:166:int getAttributeBase(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,net.minecraft.world.entity.ai.attributes.Attribute,double) -> b
+    170:180:int getAttributeModifier(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,net.minecraft.world.entity.ai.attributes.Attribute,java.util.UUID,double) -> a
+    184:186:int setAttributeBase(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,net.minecraft.world.entity.ai.attributes.Attribute,double) -> c
+    190:197:int addModifier(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,net.minecraft.world.entity.ai.attributes.Attribute,java.util.UUID,java.lang.String,double,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> a
+    201:206:int removeModifier(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,net.minecraft.world.entity.ai.attributes.Attribute,java.util.UUID) -> a
+    121:121:int lambda$register$16(com.mojang.brigadier.context.CommandContext) -> a
+    118:118:int lambda$register$15(com.mojang.brigadier.context.CommandContext) -> b
+    109:109:int lambda$register$14(com.mojang.brigadier.context.CommandContext) -> c
+    100:100:int lambda$register$13(com.mojang.brigadier.context.CommandContext) -> d
+    96:96:int lambda$register$12(com.mojang.brigadier.context.CommandContext) -> e
+    92:92:int lambda$register$11(com.mojang.brigadier.context.CommandContext) -> f
+    76:76:int lambda$register$10(com.mojang.brigadier.context.CommandContext) -> g
+    73:73:int lambda$register$9(com.mojang.brigadier.context.CommandContext) -> h
+    68:68:int lambda$register$8(com.mojang.brigadier.context.CommandContext) -> i
+    59:59:int lambda$register$7(com.mojang.brigadier.context.CommandContext) -> j
+    56:56:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> k
+    48:48:boolean lambda$register$5(net.minecraft.commands.CommandSourceStack) -> a
+    43:43:com.mojang.brigadier.Message lambda$static$4(java.lang.Object,java.lang.Object,java.lang.Object) -> a
+    42:42:com.mojang.brigadier.Message lambda$static$3(java.lang.Object,java.lang.Object,java.lang.Object) -> b
+    41:41:com.mojang.brigadier.Message lambda$static$2(java.lang.Object,java.lang.Object) -> a
+    40:40:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> a
+    38:38:java.util.concurrent.CompletableFuture lambda$static$0(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    38:43:void <clinit>() -> <clinit>
+net.minecraft.server.commands.BanIpCommands -> ve:
     java.util.regex.Pattern IP_ADDRESS_PATTERN -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID_IP -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ALREADY_BANNED -> c
@@ -28165,7 +30366,7 @@ net.minecraft.server.commands.BanIpCommands -> tg:
     38:38:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> b
     35:35:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     28:30:void <clinit>() -> <clinit>
-net.minecraft.server.commands.BanListCommands -> th:
+net.minecraft.server.commands.BanListCommands -> vf:
     16:16:void <init>() -> <init>
     18:34:void register(com.mojang.brigadier.CommandDispatcher) -> a
     37:45:int showList(net.minecraft.commands.CommandSourceStack,java.util.Collection) -> a
@@ -28173,7 +30374,7 @@ net.minecraft.server.commands.BanListCommands -> th:
     27:27:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> b
     22:23:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> c
     20:20:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.BanPlayerCommands -> ti:
+net.minecraft.server.commands.BanPlayerCommands -> vg:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ALREADY_BANNED -> a
     26:26:void <init>() -> <init>
     30:42:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -28182,7 +30383,7 @@ net.minecraft.server.commands.BanPlayerCommands -> ti:
     35:35:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> b
     32:32:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     27:27:void <clinit>() -> <clinit>
-net.minecraft.server.commands.BossBarCommands -> tj:
+net.minecraft.server.commands.BossBarCommands -> vh:
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_ALREADY_EXISTS -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_DOESNT_EXIST -> c
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NO_PLAYER_CHANGE -> d
@@ -28241,12 +30442,12 @@ net.minecraft.server.commands.BossBarCommands -> tj:
     40:40:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> a
     39:39:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> b
     39:49:void <clinit>() -> <clinit>
-net.minecraft.server.commands.ClearInventoryCommands -> tk:
+net.minecraft.server.commands.ClearInventoryCommands -> vi:
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_SINGLE -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_MULTIPLE -> b
     25:25:void <init>() -> <init>
     30:47:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    50:81:int clearInventory(net.minecraft.commands.CommandSourceStack,java.util.Collection,java.util.function.Predicate,int) -> a
+    50:84:int clearInventory(net.minecraft.commands.CommandSourceStack,java.util.Collection,java.util.function.Predicate,int) -> a
     42:42:int lambda$register$8(com.mojang.brigadier.context.CommandContext) -> a
     39:39:int lambda$register$7(com.mojang.brigadier.context.CommandContext) -> b
     36:36:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> c
@@ -28257,7 +30458,7 @@ net.minecraft.server.commands.ClearInventoryCommands -> tk:
     27:27:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> a
     26:26:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> b
     26:27:void <clinit>() -> <clinit>
-net.minecraft.server.commands.CloneCommands -> tl:
+net.minecraft.server.commands.CloneCommands -> vj:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_OVERLAP -> b
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType ERROR_AREA_TOO_LARGE -> c
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_FAILED -> d
@@ -28287,12 +30488,12 @@ net.minecraft.server.commands.CloneCommands -> tl:
     41:41:boolean lambda$static$1(net.minecraft.world.level.block.state.pattern.BlockInWorld) -> f
     39:39:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object) -> a
     38:41:void <clinit>() -> <clinit>
-net.minecraft.server.commands.CloneCommands$CloneBlockInfo -> tl$a:
+net.minecraft.server.commands.CloneCommands$CloneBlockInfo -> vj$a:
     net.minecraft.core.BlockPos pos -> a
     net.minecraft.world.level.block.state.BlockState state -> b
     net.minecraft.nbt.CompoundTag tag -> c
     239:243:void <init>(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> <init>
-net.minecraft.server.commands.CloneCommands$Mode -> tl$b:
+net.minecraft.server.commands.CloneCommands$Mode -> vj$b:
     net.minecraft.server.commands.CloneCommands$Mode FORCE -> a
     net.minecraft.server.commands.CloneCommands$Mode MOVE -> b
     net.minecraft.server.commands.CloneCommands$Mode NORMAL -> c
@@ -28303,48 +30504,48 @@ net.minecraft.server.commands.CloneCommands$Mode -> tl$b:
     224:226:void <init>(java.lang.String,int,boolean) -> <init>
     229:229:boolean canOverlap() -> a
     216:219:void <clinit>() -> <clinit>
-net.minecraft.server.commands.DataPackCommand -> tm:
+net.minecraft.server.commands.DataPackCommand -> vk:
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_UNKNOWN_PACK -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_PACK_ALREADY_ENABLED -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_PACK_ALREADY_DISABLED -> c
     com.mojang.brigadier.suggestion.SuggestionProvider SELECTED_PACKS -> d
-    com.mojang.brigadier.suggestion.SuggestionProvider AVAILABLE_PACKS -> e
+    com.mojang.brigadier.suggestion.SuggestionProvider UNSELECTED_PACKS -> e
     27:27:void <init>() -> <init>
-    36:92:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    95:109:int enablePack(net.minecraft.commands.CommandSourceStack,net.minecraft.server.packs.repository.UnopenedPack,net.minecraft.server.commands.DataPackCommand$Inserter) -> a
-    113:127:int disablePack(net.minecraft.commands.CommandSourceStack,net.minecraft.server.packs.repository.UnopenedPack) -> a
-    131:131:int listPacks(net.minecraft.commands.CommandSourceStack) -> a
-    135:143:int listAvailablePacks(net.minecraft.commands.CommandSourceStack) -> b
-    147:155:int listEnabledPacks(net.minecraft.commands.CommandSourceStack) -> c
-    159:172:net.minecraft.server.packs.repository.UnopenedPack getPack(com.mojang.brigadier.context.CommandContext,java.lang.String,boolean) -> a
-    152:152:net.minecraft.network.chat.Component lambda$listEnabledPacks$23(net.minecraft.server.packs.repository.UnopenedPack) -> a
-    140:140:net.minecraft.network.chat.Component lambda$listAvailablePacks$22(net.minecraft.server.packs.repository.UnopenedPack) -> b
-    121:121:void lambda$disablePack$21(net.minecraft.world.level.storage.LevelData,net.minecraft.server.packs.repository.UnopenedPack) -> a
-    103:103:void lambda$enablePack$20(net.minecraft.world.level.storage.LevelData,net.minecraft.server.packs.repository.UnopenedPack) -> b
-    88:88:int lambda$register$19(com.mojang.brigadier.context.CommandContext) -> a
-    84:84:int lambda$register$18(com.mojang.brigadier.context.CommandContext) -> b
-    81:81:int lambda$register$17(com.mojang.brigadier.context.CommandContext) -> c
-    76:76:int lambda$register$16(com.mojang.brigadier.context.CommandContext) -> d
-    67:67:int lambda$register$15(com.mojang.brigadier.context.CommandContext) -> e
-    67:67:void lambda$null$14(java.util.List,net.minecraft.server.packs.repository.UnopenedPack) -> a
-    63:63:int lambda$register$13(com.mojang.brigadier.context.CommandContext) -> f
-    58:58:int lambda$register$12(com.mojang.brigadier.context.CommandContext) -> g
-    58:58:void lambda$null$11(com.mojang.brigadier.context.CommandContext,java.util.List,net.minecraft.server.packs.repository.UnopenedPack) -> a
-    50:50:int lambda$register$10(com.mojang.brigadier.context.CommandContext) -> h
-    50:50:void lambda$null$9(com.mojang.brigadier.context.CommandContext,java.util.List,net.minecraft.server.packs.repository.UnopenedPack) -> b
-    44:44:int lambda$register$8(com.mojang.brigadier.context.CommandContext) -> i
-    44:44:void lambda$null$7(java.util.List,net.minecraft.server.packs.repository.UnopenedPack) -> b
-    44:44:net.minecraft.server.packs.repository.UnopenedPack lambda$null$6(net.minecraft.server.packs.repository.UnopenedPack) -> c
-    38:38:boolean lambda$register$5(net.minecraft.commands.CommandSourceStack) -> d
-    33:33:java.util.concurrent.CompletableFuture lambda$static$4(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    40:96:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    99:106:int enablePack(net.minecraft.commands.CommandSourceStack,net.minecraft.server.packs.repository.Pack,net.minecraft.server.commands.DataPackCommand$Inserter) -> a
+    110:117:int disablePack(net.minecraft.commands.CommandSourceStack,net.minecraft.server.packs.repository.Pack) -> a
+    121:121:int listPacks(net.minecraft.commands.CommandSourceStack) -> a
+    125:137:int listAvailablePacks(net.minecraft.commands.CommandSourceStack) -> b
+    141:151:int listEnabledPacks(net.minecraft.commands.CommandSourceStack) -> c
+    155:168:net.minecraft.server.packs.repository.Pack getPack(com.mojang.brigadier.context.CommandContext,java.lang.String,boolean) -> a
+    148:148:net.minecraft.network.chat.Component lambda$listEnabledPacks$23(net.minecraft.server.packs.repository.Pack) -> a
+    134:134:net.minecraft.network.chat.Component lambda$listAvailablePacks$22(net.minecraft.server.packs.repository.Pack) -> b
+    130:130:boolean lambda$listAvailablePacks$21(java.util.Collection,net.minecraft.server.packs.repository.Pack) -> a
+    92:92:int lambda$register$20(com.mojang.brigadier.context.CommandContext) -> a
+    88:88:int lambda$register$19(com.mojang.brigadier.context.CommandContext) -> b
+    85:85:int lambda$register$18(com.mojang.brigadier.context.CommandContext) -> c
+    80:80:int lambda$register$17(com.mojang.brigadier.context.CommandContext) -> d
+    71:71:int lambda$register$16(com.mojang.brigadier.context.CommandContext) -> e
+    71:71:void lambda$null$15(java.util.List,net.minecraft.server.packs.repository.Pack) -> a
+    67:67:int lambda$register$14(com.mojang.brigadier.context.CommandContext) -> f
+    62:62:int lambda$register$13(com.mojang.brigadier.context.CommandContext) -> g
+    62:62:void lambda$null$12(com.mojang.brigadier.context.CommandContext,java.util.List,net.minecraft.server.packs.repository.Pack) -> a
+    54:54:int lambda$register$11(com.mojang.brigadier.context.CommandContext) -> h
+    54:54:void lambda$null$10(com.mojang.brigadier.context.CommandContext,java.util.List,net.minecraft.server.packs.repository.Pack) -> b
+    48:48:int lambda$register$9(com.mojang.brigadier.context.CommandContext) -> i
+    48:48:void lambda$null$8(java.util.List,net.minecraft.server.packs.repository.Pack) -> b
+    48:48:net.minecraft.server.packs.repository.Pack lambda$null$7(net.minecraft.server.packs.repository.Pack) -> c
+    42:42:boolean lambda$register$6(net.minecraft.commands.CommandSourceStack) -> d
+    34:36:java.util.concurrent.CompletableFuture lambda$static$5(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    36:36:boolean lambda$null$4(java.util.Collection,java.lang.String) -> a
     32:32:java.util.concurrent.CompletableFuture lambda$static$3(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> b
     30:30:com.mojang.brigadier.Message lambda$static$2(java.lang.Object) -> a
     29:29:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> b
     28:28:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> c
     28:33:void <clinit>() -> <clinit>
-net.minecraft.server.commands.DataPackCommand$Inserter -> tm$a:
-    void apply(java.util.List,net.minecraft.server.packs.repository.UnopenedPack) -> apply
-net.minecraft.server.commands.DeOpCommands -> tn:
+net.minecraft.server.commands.DataPackCommand$Inserter -> vk$a:
+    void apply(java.util.List,net.minecraft.server.packs.repository.Pack) -> apply
+net.minecraft.server.commands.DeOpCommands -> vl:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_OP -> a
     20:20:void <init>() -> <init>
     24:33:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -28353,23 +30554,29 @@ net.minecraft.server.commands.DeOpCommands -> tn:
     29:29:java.util.concurrent.CompletableFuture lambda$register$1(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
     26:26:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     21:21:void <clinit>() -> <clinit>
-net.minecraft.server.commands.DebugCommand -> to:
+net.minecraft.server.commands.DebugCommand -> vm:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_RUNNING -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ALREADY_RUNNING -> c
     java.nio.file.spi.FileSystemProvider ZIP_FS_PROVIDER -> d
-    31:31:void <init>() -> <init>
-    40:47:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    50:57:int start(net.minecraft.commands.CommandSourceStack) -> a
-    61:75:int stop(net.minecraft.commands.CommandSourceStack) -> b
-    79:101:int report(net.minecraft.commands.CommandSourceStack) -> c
-    45:45:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> a
-    44:44:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> b
-    43:43:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> c
-    42:42:boolean lambda$register$1(net.minecraft.commands.CommandSourceStack) -> d
-    37:37:boolean lambda$static$0(java.nio.file.spi.FileSystemProvider) -> a
-    32:37:void <clinit>() -> <clinit>
-net.minecraft.server.commands.DebugPathCommand -> tp:
+    30:30:void <init>() -> <init>
+    39:46:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    49:55:int start(net.minecraft.commands.CommandSourceStack) -> a
+    59:72:int stop(net.minecraft.commands.CommandSourceStack) -> b
+    76:98:int report(net.minecraft.commands.CommandSourceStack) -> c
+    44:44:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> a
+    43:43:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> b
+    42:42:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> c
+    41:41:boolean lambda$register$1(net.minecraft.commands.CommandSourceStack) -> d
+    36:36:boolean lambda$static$0(java.nio.file.spi.FileSystemProvider) -> a
+    31:36:void <clinit>() -> <clinit>
+net.minecraft.server.commands.DebugMobSpawningCommand -> vn:
+    16:16:void <init>() -> <init>
+    18:30:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    33:34:int spawnMobs(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.MobCategory,net.minecraft.core.BlockPos) -> a
+    25:25:int lambda$register$1(net.minecraft.world.entity.MobCategory,com.mojang.brigadier.context.CommandContext) -> a
+    18:18:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
+net.minecraft.server.commands.DebugPathCommand -> vo:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_MOB -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NO_PATH -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_COMPLETE -> c
@@ -28379,23 +30586,23 @@ net.minecraft.server.commands.DebugPathCommand -> tp:
     33:33:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
     30:30:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     23:25:void <clinit>() -> <clinit>
-net.minecraft.server.commands.DefaultGameModeCommands -> tq:
+net.minecraft.server.commands.DefaultGameModeCommands -> vp:
     14:14:void <init>() -> <init>
     16:25:void register(com.mojang.brigadier.CommandDispatcher) -> a
     28:43:int setMode(net.minecraft.commands.CommandSourceStack,net.minecraft.world.level.GameType) -> a
     20:20:int lambda$register$1(net.minecraft.world.level.GameType,com.mojang.brigadier.context.CommandContext) -> a
     16:16:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.DifficultyCommand -> tr:
+net.minecraft.server.commands.DifficultyCommand -> vq:
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_ALREADY_DIFFICULT -> a
-    16:16:void <init>() -> <init>
-    20:35:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    38:46:int setDifficulty(net.minecraft.commands.CommandSourceStack,net.minecraft.world.Difficulty) -> a
-    30:32:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> a
-    28:28:boolean lambda$register$2(net.minecraft.commands.CommandSourceStack) -> a
-    23:23:int lambda$register$1(net.minecraft.world.Difficulty,com.mojang.brigadier.context.CommandContext) -> a
-    17:17:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.server.commands.EffectCommands -> ts:
+    15:15:void <init>() -> <init>
+    19:34:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    37:45:int setDifficulty(net.minecraft.commands.CommandSourceStack,net.minecraft.world.Difficulty) -> a
+    29:31:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> a
+    27:27:boolean lambda$register$2(net.minecraft.commands.CommandSourceStack) -> a
+    22:22:int lambda$register$1(net.minecraft.world.Difficulty,com.mojang.brigadier.context.CommandContext) -> a
+    16:16:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.server.commands.EffectCommands -> vr:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_GIVE_FAILED -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_CLEAR_EVERYTHING_FAILED -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_CLEAR_SPECIFIC_FAILED -> c
@@ -28413,11 +30620,11 @@ net.minecraft.server.commands.EffectCommands -> ts:
     41:41:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> g
     38:38:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     31:33:void <clinit>() -> <clinit>
-net.minecraft.server.commands.EmoteCommands -> tt:
-    12:12:void <init>() -> <init>
-    14:23:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    18:19:int lambda$register$0(com.mojang.brigadier.context.CommandContext) -> a
-net.minecraft.server.commands.EnchantCommand -> tu:
+net.minecraft.server.commands.EmoteCommands -> vs:
+    15:15:void <init>() -> <init>
+    17:32:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    21:28:int lambda$register$0(com.mojang.brigadier.context.CommandContext) -> a
+net.minecraft.server.commands.EnchantCommand -> vt:
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_NOT_LIVING_ENTITY -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_NO_ITEM -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INCOMPATIBLE -> c
@@ -28434,7 +30641,7 @@ net.minecraft.server.commands.EnchantCommand -> tu:
     30:30:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> b
     29:29:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> c
     29:33:void <clinit>() -> <clinit>
-net.minecraft.server.commands.ExecuteCommand -> tv:
+net.minecraft.server.commands.ExecuteCommand -> vu:
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType ERROR_AREA_TOO_LARGE -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_CONDITIONAL_FAILED -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_CONDITIONAL_FAILED_COUNT -> c
@@ -28522,11 +30729,11 @@ net.minecraft.server.commands.ExecuteCommand -> tv:
     100:100:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> a
     97:97:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object) -> a
     97:107:void <clinit>() -> <clinit>
-net.minecraft.server.commands.ExecuteCommand$CommandNumericPredicate -> tv$a:
+net.minecraft.server.commands.ExecuteCommand$CommandNumericPredicate -> vu$a:
     int test(com.mojang.brigadier.context.CommandContext) -> test
-net.minecraft.server.commands.ExecuteCommand$CommandPredicate -> tv$b:
+net.minecraft.server.commands.ExecuteCommand$CommandPredicate -> vu$b:
     boolean test(com.mojang.brigadier.context.CommandContext) -> test
-net.minecraft.server.commands.ExperienceCommand -> tw:
+net.minecraft.server.commands.ExperienceCommand -> vv:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_SET_POINTS_INVALID -> a
     29:29:void <init>() -> <init>
     33:93:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -28544,7 +30751,7 @@ net.minecraft.server.commands.ExperienceCommand -> tw:
     42:42:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> h
     35:35:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> b
     30:30:void <clinit>() -> <clinit>
-net.minecraft.server.commands.ExperienceCommand$Type -> tw$a:
+net.minecraft.server.commands.ExperienceCommand$Type -> vv$a:
     net.minecraft.server.commands.ExperienceCommand$Type POINTS -> a
     net.minecraft.server.commands.ExperienceCommand$Type LEVELS -> b
     java.util.function.BiConsumer add -> c
@@ -28561,7 +30768,7 @@ net.minecraft.server.commands.ExperienceCommand$Type -> tw$a:
     139:143:boolean lambda$static$0(net.minecraft.server.level.ServerPlayer,java.lang.Integer) -> b
     137:137:java.util.function.ToIntFunction access$000(net.minecraft.server.commands.ExperienceCommand$Type) -> a
     137:145:void <clinit>() -> <clinit>
-net.minecraft.server.commands.FillCommand -> tx:
+net.minecraft.server.commands.FillCommand -> vw:
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType ERROR_AREA_TOO_LARGE -> a
     net.minecraft.commands.arguments.blocks.BlockInput HOLLOW_CORE -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_FAILED -> c
@@ -28580,7 +30787,7 @@ net.minecraft.server.commands.FillCommand -> tx:
     38:38:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object) -> a
     36:36:net.minecraft.commands.arguments.blocks.BlockInput access$000() -> a
     38:40:void <clinit>() -> <clinit>
-net.minecraft.server.commands.FillCommand$Mode -> tx$a:
+net.minecraft.server.commands.FillCommand$Mode -> vw$a:
     net.minecraft.server.commands.FillCommand$Mode REPLACE -> a
     net.minecraft.server.commands.FillCommand$Mode OUTLINE -> b
     net.minecraft.server.commands.FillCommand$Mode HOLLOW -> c
@@ -28595,30 +30802,30 @@ net.minecraft.server.commands.FillCommand$Mode -> tx$a:
     130:133:net.minecraft.commands.arguments.blocks.BlockInput lambda$static$1(net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos,net.minecraft.commands.arguments.blocks.BlockInput,net.minecraft.server.level.ServerLevel) -> c
     128:128:net.minecraft.commands.arguments.blocks.BlockInput lambda$static$0(net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos,net.minecraft.commands.arguments.blocks.BlockInput,net.minecraft.server.level.ServerLevel) -> d
     127:143:void <clinit>() -> <clinit>
-net.minecraft.server.commands.ForceLoadCommand -> ty:
+net.minecraft.server.commands.ForceLoadCommand -> vx:
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType ERROR_TOO_MANY_CHUNKS -> a
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType ERROR_NOT_TICKING -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ALL_ADDED -> c
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NONE_REMOVED -> d
-    24:24:void <init>() -> <init>
-    33:67:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    70:78:int queryForceLoad(net.minecraft.commands.CommandSourceStack,net.minecraft.server.level.ColumnPos) -> a
-    83:98:int listForceLoad(net.minecraft.commands.CommandSourceStack) -> a
-    102:107:int removeAll(net.minecraft.commands.CommandSourceStack) -> b
-    111:162:int changeForceLoad(net.minecraft.commands.CommandSourceStack,net.minecraft.server.level.ColumnPos,net.minecraft.server.level.ColumnPos,boolean) -> a
-    105:105:void lambda$removeAll$10(net.minecraft.server.level.ServerLevel,long) -> a
-    63:63:int lambda$register$9(com.mojang.brigadier.context.CommandContext) -> a
-    60:60:int lambda$register$8(com.mojang.brigadier.context.CommandContext) -> b
-    55:55:int lambda$register$7(com.mojang.brigadier.context.CommandContext) -> c
-    52:52:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> d
-    49:49:int lambda$register$5(com.mojang.brigadier.context.CommandContext) -> e
-    43:43:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> f
-    40:40:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> g
-    35:35:boolean lambda$register$2(net.minecraft.commands.CommandSourceStack) -> c
-    28:28:com.mojang.brigadier.Message lambda$static$1(java.lang.Object,java.lang.Object) -> a
-    27:27:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object) -> b
-    27:30:void <clinit>() -> <clinit>
-net.minecraft.server.commands.FunctionCommand -> tz:
+    25:25:void <init>() -> <init>
+    34:68:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    71:80:int queryForceLoad(net.minecraft.commands.CommandSourceStack,net.minecraft.server.level.ColumnPos) -> a
+    85:101:int listForceLoad(net.minecraft.commands.CommandSourceStack) -> a
+    105:110:int removeAll(net.minecraft.commands.CommandSourceStack) -> b
+    114:165:int changeForceLoad(net.minecraft.commands.CommandSourceStack,net.minecraft.server.level.ColumnPos,net.minecraft.server.level.ColumnPos,boolean) -> a
+    108:108:void lambda$removeAll$10(net.minecraft.server.level.ServerLevel,long) -> a
+    64:64:int lambda$register$9(com.mojang.brigadier.context.CommandContext) -> a
+    61:61:int lambda$register$8(com.mojang.brigadier.context.CommandContext) -> b
+    56:56:int lambda$register$7(com.mojang.brigadier.context.CommandContext) -> c
+    53:53:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> d
+    50:50:int lambda$register$5(com.mojang.brigadier.context.CommandContext) -> e
+    44:44:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> f
+    41:41:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> g
+    36:36:boolean lambda$register$2(net.minecraft.commands.CommandSourceStack) -> c
+    29:29:com.mojang.brigadier.Message lambda$static$1(java.lang.Object,java.lang.Object) -> a
+    28:28:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object) -> b
+    28:31:void <clinit>() -> <clinit>
+net.minecraft.server.commands.FunctionCommand -> vy:
     com.mojang.brigadier.suggestion.SuggestionProvider SUGGEST_FUNCTION -> a
     19:19:void <init>() -> <init>
     27:36:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -28627,15 +30834,15 @@ net.minecraft.server.commands.FunctionCommand -> tz:
     29:29:boolean lambda$register$1(net.minecraft.commands.CommandSourceStack) -> a
     21:23:java.util.concurrent.CompletableFuture lambda$static$0(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.server.commands.GameModeCommand -> ua:
-    22:22:void <init>() -> <init>
-    24:40:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    43:53:void logGamemodeChange(net.minecraft.commands.CommandSourceStack,net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.GameType) -> a
-    56:64:int setMode(com.mojang.brigadier.context.CommandContext,java.util.Collection,net.minecraft.world.level.GameType) -> a
-    33:33:int lambda$register$2(net.minecraft.world.level.GameType,com.mojang.brigadier.context.CommandContext) -> a
-    30:30:int lambda$register$1(net.minecraft.world.level.GameType,com.mojang.brigadier.context.CommandContext) -> b
-    24:24:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.GameRuleCommand -> ub:
+net.minecraft.server.commands.GameModeCommand -> vz:
+    23:23:void <init>() -> <init>
+    27:43:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    46:56:void logGamemodeChange(net.minecraft.commands.CommandSourceStack,net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.GameType) -> a
+    59:67:int setMode(com.mojang.brigadier.context.CommandContext,java.util.Collection,net.minecraft.world.level.GameType) -> a
+    36:36:int lambda$register$2(net.minecraft.world.level.GameType,com.mojang.brigadier.context.CommandContext) -> a
+    33:33:int lambda$register$1(net.minecraft.world.level.GameType,com.mojang.brigadier.context.CommandContext) -> b
+    27:27:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
+net.minecraft.server.commands.GameRuleCommand -> wa:
     13:13:void <init>() -> <init>
     15:32:void register(com.mojang.brigadier.CommandDispatcher) -> a
     35:39:int setRule(com.mojang.brigadier.context.CommandContext,net.minecraft.world.level.GameRules$Key) -> b
@@ -28643,41 +30850,41 @@ net.minecraft.server.commands.GameRuleCommand -> ub:
     15:15:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     13:13:int access$000(com.mojang.brigadier.context.CommandContext,net.minecraft.world.level.GameRules$Key) -> a
     13:13:int access$100(net.minecraft.commands.CommandSourceStack,net.minecraft.world.level.GameRules$Key) -> a
-net.minecraft.server.commands.GameRuleCommand$1 -> ub$1:
+net.minecraft.server.commands.GameRuleCommand$1 -> wa$1:
     com.mojang.brigadier.builder.LiteralArgumentBuilder val$base -> a
     17:17:void <init>(com.mojang.brigadier.builder.LiteralArgumentBuilder) -> <init>
     20:28:void visit(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> a
     25:25:int lambda$visit$1(net.minecraft.world.level.GameRules$Key,com.mojang.brigadier.context.CommandContext) -> a
     22:22:int lambda$visit$0(net.minecraft.world.level.GameRules$Key,com.mojang.brigadier.context.CommandContext) -> b
-net.minecraft.server.commands.GiveCommand -> uc:
+net.minecraft.server.commands.GiveCommand -> wb:
     26:26:void <init>() -> <init>
     28:43:void register(com.mojang.brigadier.CommandDispatcher) -> a
     46:80:int giveItem(net.minecraft.commands.CommandSourceStack,net.minecraft.commands.arguments.item.ItemInput,java.util.Collection,int) -> a
     38:38:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> a
     35:35:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> b
     30:30:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.HelpCommand -> ud:
+net.minecraft.server.commands.HelpCommand -> wc:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_FAILED -> a
     19:19:void <init>() -> <init>
     23:47:void register(com.mojang.brigadier.CommandDispatcher) -> a
     35:43:int lambda$register$1(com.mojang.brigadier.CommandDispatcher,com.mojang.brigadier.context.CommandContext) -> a
     26:30:int lambda$register$0(com.mojang.brigadier.CommandDispatcher,com.mojang.brigadier.context.CommandContext) -> b
     20:20:void <clinit>() -> <clinit>
-net.minecraft.server.commands.KickCommand -> ue:
+net.minecraft.server.commands.KickCommand -> wd:
     19:19:void <init>() -> <init>
     21:33:void register(com.mojang.brigadier.CommandDispatcher) -> a
     36:41:int kickPlayers(net.minecraft.commands.CommandSourceStack,java.util.Collection,net.minecraft.network.chat.Component) -> a
     29:29:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> a
     26:26:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> b
     23:23:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.KillCommand -> uf:
+net.minecraft.server.commands.KillCommand -> we:
     17:17:void <init>() -> <init>
     19:28:void register(com.mojang.brigadier.CommandDispatcher) -> a
     31:41:int kill(net.minecraft.commands.CommandSourceStack,java.util.Collection) -> a
     25:25:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> a
     22:22:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> b
     21:21:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.ListPlayersCommand -> ug:
+net.minecraft.server.commands.ListPlayersCommand -> wf:
     17:17:void <init>() -> <init>
     19:27:void register(com.mojang.brigadier.CommandDispatcher) -> a
     30:30:int listPlayers(net.minecraft.commands.CommandSourceStack) -> a
@@ -28685,31 +30892,30 @@ net.minecraft.server.commands.ListPlayersCommand -> ug:
     38:42:int format(net.minecraft.commands.CommandSourceStack,java.util.function.Function) -> a
     24:24:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
     21:21:int lambda$register$0(com.mojang.brigadier.context.CommandContext) -> b
-net.minecraft.server.commands.LocateCommand -> uh:
-    com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_FAILED -> a
+net.minecraft.server.commands.LocateBiomeCommand -> wg:
+    com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INVALID_BIOME -> a
+    com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_BIOME_NOT_FOUND -> b
     20:20:void <init>() -> <init>
-    24:43:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    46:60:int locate(net.minecraft.commands.CommandSourceStack,java.lang.String) -> a
-    64:66:float dist(int,int,int,int) -> a
-    53:56:void lambda$locate$16(net.minecraft.core.BlockPos,net.minecraft.network.chat.Style) -> a
-    41:41:int lambda$register$15(com.mojang.brigadier.context.CommandContext) -> a
-    40:40:int lambda$register$14(com.mojang.brigadier.context.CommandContext) -> b
-    39:39:int lambda$register$13(com.mojang.brigadier.context.CommandContext) -> c
-    38:38:int lambda$register$12(com.mojang.brigadier.context.CommandContext) -> d
-    37:37:int lambda$register$11(com.mojang.brigadier.context.CommandContext) -> e
-    36:36:int lambda$register$10(com.mojang.brigadier.context.CommandContext) -> f
-    35:35:int lambda$register$9(com.mojang.brigadier.context.CommandContext) -> g
-    34:34:int lambda$register$8(com.mojang.brigadier.context.CommandContext) -> h
-    33:33:int lambda$register$7(com.mojang.brigadier.context.CommandContext) -> i
-    32:32:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> j
-    31:31:int lambda$register$5(com.mojang.brigadier.context.CommandContext) -> k
-    30:30:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> l
-    29:29:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> m
-    28:28:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> n
-    27:27:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> o
-    26:26:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-    21:21:void <clinit>() -> <clinit>
-net.minecraft.server.commands.LootCommand -> ui:
+    28:36:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    39:47:int locateBiome(net.minecraft.commands.CommandSourceStack,net.minecraft.resources.ResourceLocation) -> a
+    39:39:com.mojang.brigadier.exceptions.CommandSyntaxException lambda$locateBiome$4(net.minecraft.resources.ResourceLocation) -> a
+    34:34:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> a
+    30:30:boolean lambda$register$2(net.minecraft.commands.CommandSourceStack) -> a
+    22:22:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> a
+    21:21:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> b
+    21:22:void <clinit>() -> <clinit>
+net.minecraft.server.commands.LocateCommand -> wh:
+    com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_FAILED -> a
+    23:23:void <init>() -> <init>
+    27:35:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    38:44:int locate(net.minecraft.commands.CommandSourceStack,net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    48:56:int showLocateResult(net.minecraft.commands.CommandSourceStack,java.lang.String,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,java.lang.String) -> a
+    60:62:float dist(int,int,int,int) -> a
+    49:52:net.minecraft.network.chat.Style lambda$showLocateResult$2(net.minecraft.core.BlockPos,net.minecraft.network.chat.Style) -> a
+    31:31:int lambda$register$1(java.util.Map$Entry,com.mojang.brigadier.context.CommandContext) -> a
+    28:28:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
+    24:24:void <clinit>() -> <clinit>
+net.minecraft.server.commands.LootCommand -> wi:
     com.mojang.brigadier.suggestion.SuggestionProvider SUGGEST_LOOT_TABLE -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_NO_HELD_ITEMS -> b
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_NO_LOOT_TABLE -> c
@@ -28731,9 +30937,9 @@ net.minecraft.server.commands.LootCommand -> ui:
     372:385:int dropBlockLoot(com.mojang.brigadier.context.CommandContext,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack,net.minecraft.server.commands.LootCommand$DropConsumer) -> a
     389:409:int dropKillLoot(com.mojang.brigadier.context.CommandContext,net.minecraft.world.entity.Entity,net.minecraft.server.commands.LootCommand$DropConsumer) -> a
     413:419:int dropChestLoot(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation,net.minecraft.server.commands.LootCommand$DropConsumer) -> a
-    423:430:int dropFishingLoot(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack,net.minecraft.server.commands.LootCommand$DropConsumer) -> a
-    434:437:int drop(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.server.commands.LootCommand$DropConsumer) -> a
-    437:437:void lambda$drop$25(net.minecraft.commands.CommandSourceStack,java.util.List) -> b
+    423:431:int dropFishingLoot(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack,net.minecraft.server.commands.LootCommand$DropConsumer) -> a
+    435:438:int drop(com.mojang.brigadier.context.CommandContext,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.server.commands.LootCommand$DropConsumer) -> a
+    438:438:void lambda$drop$25(net.minecraft.commands.CommandSourceStack,java.util.List) -> b
     409:409:void lambda$dropKillLoot$24(net.minecraft.commands.CommandSourceStack,net.minecraft.resources.ResourceLocation,java.util.List) -> a
     385:385:void lambda$dropBlockLoot$23(net.minecraft.commands.CommandSourceStack,net.minecraft.world.level.block.state.BlockState,java.util.List) -> a
     335:338:void lambda$dropInWorld$22(net.minecraft.server.level.ServerLevel,net.minecraft.world.phys.Vec3,net.minecraft.world.item.ItemStack) -> a
@@ -28760,18 +30966,18 @@ net.minecraft.server.commands.LootCommand -> ui:
     66:66:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> b
     62:63:java.util.concurrent.CompletableFuture lambda$static$0(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
     61:67:void <clinit>() -> <clinit>
-net.minecraft.server.commands.LootCommand$Callback -> ui$a:
+net.minecraft.server.commands.LootCommand$Callback -> wi$a:
     void accept(java.util.List) -> accept
-net.minecraft.server.commands.LootCommand$DropConsumer -> ui$b:
+net.minecraft.server.commands.LootCommand$DropConsumer -> wi$b:
     int accept(com.mojang.brigadier.context.CommandContext,java.util.List,net.minecraft.server.commands.LootCommand$Callback) -> accept
-net.minecraft.server.commands.LootCommand$TailProvider -> ui$c:
+net.minecraft.server.commands.LootCommand$TailProvider -> wi$c:
     com.mojang.brigadier.builder.ArgumentBuilder construct(com.mojang.brigadier.builder.ArgumentBuilder,net.minecraft.server.commands.LootCommand$DropConsumer) -> construct
-net.minecraft.server.commands.MsgCommand -> uj:
-    20:20:void <init>() -> <init>
-    22:34:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    37:42:int sendMessage(net.minecraft.commands.CommandSourceStack,java.util.Collection,net.minecraft.network.chat.Component) -> a
-    28:28:int lambda$register$0(com.mojang.brigadier.context.CommandContext) -> a
-net.minecraft.server.commands.OpCommand -> uk:
+net.minecraft.server.commands.MsgCommand -> wj:
+    22:22:void <init>() -> <init>
+    24:36:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    39:46:int sendMessage(net.minecraft.commands.CommandSourceStack,java.util.Collection,net.minecraft.network.chat.Component) -> a
+    30:30:int lambda$register$0(com.mojang.brigadier.context.CommandContext) -> a
+net.minecraft.server.commands.OpCommand -> wk:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ALREADY_OP -> a
     20:20:void <init>() -> <init>
     24:36:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -28782,7 +30988,7 @@ net.minecraft.server.commands.OpCommand -> uk:
     31:31:boolean lambda$null$1(net.minecraft.server.players.PlayerList,net.minecraft.server.level.ServerPlayer) -> a
     26:26:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     21:21:void <clinit>() -> <clinit>
-net.minecraft.server.commands.PardonCommand -> ul:
+net.minecraft.server.commands.PardonCommand -> wl:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_BANNED -> a
     21:21:void <init>() -> <init>
     25:34:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -28791,7 +30997,7 @@ net.minecraft.server.commands.PardonCommand -> ul:
     30:30:java.util.concurrent.CompletableFuture lambda$register$1(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
     27:27:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     22:22:void <clinit>() -> <clinit>
-net.minecraft.server.commands.PardonIpCommand -> um:
+net.minecraft.server.commands.PardonIpCommand -> wm:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_BANNED -> b
     19:19:void <init>() -> <init>
@@ -28801,7 +31007,7 @@ net.minecraft.server.commands.PardonIpCommand -> um:
     29:29:java.util.concurrent.CompletableFuture lambda$register$1(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
     26:26:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     20:21:void <clinit>() -> <clinit>
-net.minecraft.server.commands.ParticleCommand -> un:
+net.minecraft.server.commands.ParticleCommand -> wn:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_FAILED -> a
     29:29:void <init>() -> <init>
     33:71:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -28815,7 +31021,7 @@ net.minecraft.server.commands.ParticleCommand -> un:
     38:38:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> g
     35:35:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     30:30:void <clinit>() -> <clinit>
-net.minecraft.server.commands.PlaySoundCommand -> uo:
+net.minecraft.server.commands.PlaySoundCommand -> wo:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_TOO_FAR -> a
     31:31:void <init>() -> <init>
     35:46:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -28828,7 +31034,7 @@ net.minecraft.server.commands.PlaySoundCommand -> uo:
     52:52:int lambda$source$1(net.minecraft.sounds.SoundSource,com.mojang.brigadier.context.CommandContext) -> e
     43:43:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     32:32:void <clinit>() -> <clinit>
-net.minecraft.server.commands.PublishCommand -> up:
+net.minecraft.server.commands.PublishCommand -> wp:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_FAILED -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_ALREADY_PUBLISHED -> b
     17:17:void <init>() -> <init>
@@ -28839,7 +31045,7 @@ net.minecraft.server.commands.PublishCommand -> up:
     24:24:boolean lambda$register$1(net.minecraft.commands.CommandSourceStack) -> a
     19:19:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     18:19:void <clinit>() -> <clinit>
-net.minecraft.server.commands.RaidCommand -> uq:
+net.minecraft.server.commands.RaidCommand -> wq:
     32:32:void <init>() -> <init>
     34:58:void register(com.mojang.brigadier.CommandDispatcher) -> a
     61:69:int glow(net.minecraft.commands.CommandSourceStack) -> a
@@ -28858,7 +31064,7 @@ net.minecraft.server.commands.RaidCommand -> uq:
     43:43:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> f
     40:40:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> g
     36:36:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> e
-net.minecraft.server.commands.RecipeCommand -> ur:
+net.minecraft.server.commands.RecipeCommand -> wr:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_GIVE_FAILED -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_TAKE_FAILED -> b
     23:23:void <init>() -> <init>
@@ -28871,12 +31077,17 @@ net.minecraft.server.commands.RecipeCommand -> ur:
     38:38:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> d
     30:30:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     24:25:void <clinit>() -> <clinit>
-net.minecraft.server.commands.ReloadCommand -> us:
-    10:10:void <init>() -> <init>
-    12:20:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    15:17:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
-    13:13:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.ReplaceItemCommand -> ut:
+net.minecraft.server.commands.ReloadCommand -> ws:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    18:18:void <init>() -> <init>
+    22:27:void reloadPacks(java.util.Collection,net.minecraft.commands.CommandSourceStack) -> a
+    30:39:java.util.Collection discoverNewPacks(net.minecraft.server.packs.repository.PackRepository,net.minecraft.world.level.storage.WorldData,java.util.Collection) -> a
+    43:57:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    46:54:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> a
+    44:44:boolean lambda$register$1(net.minecraft.commands.CommandSourceStack) -> a
+    23:25:java.lang.Void lambda$reloadPacks$0(net.minecraft.commands.CommandSourceStack,java.lang.Throwable) -> a
+    19:19:void <clinit>() -> <clinit>
+net.minecraft.server.commands.ReplaceItemCommand -> wt:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_A_CONTAINER -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_INAPPLICABLE_SLOT -> b
     com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType ERROR_ENTITY_SLOT -> c
@@ -28892,7 +31103,7 @@ net.minecraft.server.commands.ReplaceItemCommand -> ut:
     38:38:com.mojang.brigadier.Message lambda$static$1(java.lang.Object,java.lang.Object) -> a
     37:37:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     36:38:void <clinit>() -> <clinit>
-net.minecraft.server.commands.SaveAllCommand -> uu:
+net.minecraft.server.commands.SaveAllCommand -> wu:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_FAILED -> a
     13:13:void <init>() -> <init>
     17:26:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -28901,44 +31112,44 @@ net.minecraft.server.commands.SaveAllCommand -> uu:
     20:20:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> b
     19:19:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.server.commands.SaveOffCommand -> uv:
+net.minecraft.server.commands.SaveOffCommand -> wv:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ALREADY_OFF -> a
     12:12:void <init>() -> <init>
     16:35:void register(com.mojang.brigadier.CommandDispatcher) -> a
     20:32:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
     18:18:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.server.commands.SaveOnCommand -> uw:
+net.minecraft.server.commands.SaveOnCommand -> ww:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ALREADY_ON -> a
     12:12:void <init>() -> <init>
     16:35:void register(com.mojang.brigadier.CommandDispatcher) -> a
     20:32:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
     18:18:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.server.commands.SayCommand -> ux:
-    14:14:void <init>() -> <init>
-    16:28:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    22:24:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
-    18:18:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.ScheduleCommand -> uy:
+net.minecraft.server.commands.SayCommand -> wx:
+    17:17:void <init>() -> <init>
+    19:37:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    25:33:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
+    21:21:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
+net.minecraft.server.commands.ScheduleCommand -> wy:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_SAME_TICK -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_CANT_REMOVE -> b
     com.mojang.brigadier.suggestion.SuggestionProvider SUGGEST_SCHEDULE -> c
-    30:30:void <init>() -> <init>
-    37:68:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    71:98:int schedule(net.minecraft.commands.CommandSourceStack,com.mojang.datafixers.util.Either,int,boolean) -> a
+    31:31:void <init>() -> <init>
+    38:69:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    72:98:int schedule(net.minecraft.commands.CommandSourceStack,com.mojang.datafixers.util.Pair,int,boolean) -> a
     102:107:int remove(net.minecraft.commands.CommandSourceStack,java.lang.String) -> a
-    89:96:void lambda$schedule$8(boolean,net.minecraft.world.level.timers.TimerQueue,long,net.minecraft.commands.CommandSourceStack,int,net.minecraft.tags.Tag) -> a
-    80:87:void lambda$schedule$7(boolean,net.minecraft.world.level.timers.TimerQueue,long,net.minecraft.commands.CommandSourceStack,int,net.minecraft.commands.CommandFunction) -> a
-    64:64:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> a
-    54:54:int lambda$register$5(com.mojang.brigadier.context.CommandContext) -> b
-    50:50:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> c
-    47:47:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> d
-    39:39:boolean lambda$register$2(net.minecraft.commands.CommandSourceStack) -> a
-    34:34:java.util.concurrent.CompletableFuture lambda$static$1(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
-    32:32:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
-    31:34:void <clinit>() -> <clinit>
-net.minecraft.server.commands.ScoreboardCommand -> uz:
+    90:96:void lambda$schedule$8(net.minecraft.resources.ResourceLocation,boolean,net.minecraft.world.level.timers.TimerQueue,long,net.minecraft.commands.CommandSourceStack,int,net.minecraft.tags.Tag) -> a
+    82:88:void lambda$schedule$7(net.minecraft.resources.ResourceLocation,boolean,net.minecraft.world.level.timers.TimerQueue,long,net.minecraft.commands.CommandSourceStack,int,net.minecraft.commands.CommandFunction) -> a
+    65:65:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> a
+    55:55:int lambda$register$5(com.mojang.brigadier.context.CommandContext) -> b
+    51:51:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> c
+    48:48:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> d
+    40:40:boolean lambda$register$2(net.minecraft.commands.CommandSourceStack) -> a
+    35:35:java.util.concurrent.CompletableFuture lambda$static$1(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
+    33:33:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
+    32:35:void <clinit>() -> <clinit>
+net.minecraft.server.commands.ScoreboardCommand -> wz:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_OBJECTIVE_ALREADY_EXISTS -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_DISPLAY_SLOT_ALREADY_EMPTY -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_DISPLAY_SLOT_ALREADY_SET -> c
@@ -28988,13 +31199,13 @@ net.minecraft.server.commands.ScoreboardCommand -> uz:
     64:64:boolean lambda$register$1(net.minecraft.commands.CommandSourceStack) -> c
     59:59:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object) -> a
     54:59:void <clinit>() -> <clinit>
-net.minecraft.server.commands.SeedCommand -> va:
+net.minecraft.server.commands.SeedCommand -> xa:
     16:16:void <init>() -> <init>
-    18:33:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    18:33:void register(com.mojang.brigadier.CommandDispatcher,boolean) -> a
     22:30:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> a
-    23:27:void lambda$null$1(long,net.minecraft.network.chat.Style) -> a
-    20:20:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.SetBlockCommand -> vb:
+    23:27:net.minecraft.network.chat.Style lambda$null$1(long,net.minecraft.network.chat.Style) -> a
+    20:20:boolean lambda$register$0(boolean,net.minecraft.commands.CommandSourceStack) -> a
+net.minecraft.server.commands.SetBlockCommand -> xb:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_FAILED -> a
     28:28:void <init>() -> <init>
     32:55:void register(com.mojang.brigadier.CommandDispatcher) -> a
@@ -29006,9 +31217,9 @@ net.minecraft.server.commands.SetBlockCommand -> vb:
     39:39:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> d
     34:34:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     29:29:void <clinit>() -> <clinit>
-net.minecraft.server.commands.SetBlockCommand$Filter -> vb$a:
+net.minecraft.server.commands.SetBlockCommand$Filter -> xb$a:
     net.minecraft.commands.arguments.blocks.BlockInput filter(net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos,net.minecraft.commands.arguments.blocks.BlockInput,net.minecraft.server.level.ServerLevel) -> filter
-net.minecraft.server.commands.SetBlockCommand$Mode -> vb$b:
+net.minecraft.server.commands.SetBlockCommand$Mode -> xb$b:
     net.minecraft.server.commands.SetBlockCommand$Mode REPLACE -> a
     net.minecraft.server.commands.SetBlockCommand$Mode DESTROY -> b
     net.minecraft.server.commands.SetBlockCommand$Mode[] $VALUES -> c
@@ -29016,28 +31227,28 @@ net.minecraft.server.commands.SetBlockCommand$Mode -> vb$b:
     81:81:net.minecraft.server.commands.SetBlockCommand$Mode valueOf(java.lang.String) -> valueOf
     81:81:void <init>(java.lang.String,int) -> <init>
     81:83:void <clinit>() -> <clinit>
-net.minecraft.server.commands.SetPlayerIdleTimeoutCommand -> vc:
+net.minecraft.server.commands.SetPlayerIdleTimeoutCommand -> xc:
     13:13:void <init>() -> <init>
     15:23:void register(com.mojang.brigadier.CommandDispatcher) -> a
     26:28:int setIdleTimeout(net.minecraft.commands.CommandSourceStack,int) -> a
     20:20:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
     17:17:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.SetSpawnCommand -> vd:
-    20:20:void <init>() -> <init>
-    22:35:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    38:48:int setSpawn(net.minecraft.commands.CommandSourceStack,java.util.Collection,net.minecraft.core.BlockPos) -> a
-    31:31:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> a
-    28:28:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> b
-    25:25:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> c
-    24:24:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.SetWorldSpawnCommand -> ve:
-    15:15:void <init>() -> <init>
-    17:26:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    29:32:int setSpawn(net.minecraft.commands.CommandSourceStack,net.minecraft.core.BlockPos) -> a
-    23:23:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> a
-    20:20:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> b
-    19:19:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.SpectateCommand -> vf:
+net.minecraft.server.commands.SetSpawnCommand -> xd:
+    22:22:void <init>() -> <init>
+    24:37:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    40:52:int setSpawn(net.minecraft.commands.CommandSourceStack,java.util.Collection,net.minecraft.core.BlockPos) -> a
+    33:33:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> a
+    30:30:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> b
+    27:27:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> c
+    26:26:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
+net.minecraft.server.commands.SetWorldSpawnCommand -> xe:
+    14:14:void <init>() -> <init>
+    16:25:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    28:30:int setSpawn(net.minecraft.commands.CommandSourceStack,net.minecraft.core.BlockPos) -> a
+    22:22:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> a
+    19:19:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> b
+    18:18:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
+net.minecraft.server.commands.SpectateCommand -> xf:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_SELF -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_NOT_SPECTATOR -> b
     23:23:void <init>() -> <init>
@@ -29049,45 +31260,46 @@ net.minecraft.server.commands.SpectateCommand -> vf:
     30:30:boolean lambda$register$1(net.minecraft.commands.CommandSourceStack) -> a
     25:25:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     24:25:void <clinit>() -> <clinit>
-net.minecraft.server.commands.SpreadPlayersCommand -> vg:
+net.minecraft.server.commands.SpreadPlayersCommand -> xg:
     com.mojang.brigadier.exceptions.Dynamic4CommandExceptionType ERROR_FAILED_TO_SPREAD_TEAMS -> a
     com.mojang.brigadier.exceptions.Dynamic4CommandExceptionType ERROR_FAILED_TO_SPREAD_ENTITIES -> b
-    40:40:void <init>() -> <init>
-    46:66:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    69:80:int spreadPlayers(net.minecraft.commands.CommandSourceStack,net.minecraft.world.phys.Vec2,float,float,boolean,java.util.Collection) -> a
-    84:94:int getNumberOfTeams(java.util.Collection) -> a
-    98:169:void spreadPositions(net.minecraft.world.phys.Vec2,double,net.minecraft.server.level.ServerLevel,java.util.Random,double,double,double,double,net.minecraft.server.commands.SpreadPlayersCommand$Position[],boolean) -> a
-    172:209:double setPlayerPositions(java.util.Collection,net.minecraft.server.level.ServerLevel,net.minecraft.server.commands.SpreadPlayersCommand$Position[],boolean) -> a
-    213:221:net.minecraft.server.commands.SpreadPlayersCommand$Position[] createInitialPositions(java.util.Random,int,double,double,double,double) -> a
-    59:59:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> a
-    48:48:boolean lambda$register$2(net.minecraft.commands.CommandSourceStack) -> a
-    43:43:com.mojang.brigadier.Message lambda$static$1(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object) -> a
-    42:42:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object) -> b
-    42:43:void <clinit>() -> <clinit>
-net.minecraft.server.commands.SpreadPlayersCommand$Position -> vg$a:
+    43:43:void <init>() -> <init>
+    49:82:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    85:96:int spreadPlayers(net.minecraft.commands.CommandSourceStack,net.minecraft.world.phys.Vec2,float,float,int,boolean,java.util.Collection) -> a
+    100:110:int getNumberOfTeams(java.util.Collection) -> a
+    114:185:void spreadPositions(net.minecraft.world.phys.Vec2,double,net.minecraft.server.level.ServerLevel,java.util.Random,double,double,double,double,int,net.minecraft.server.commands.SpreadPlayersCommand$Position[],boolean) -> a
+    188:225:double setPlayerPositions(java.util.Collection,net.minecraft.server.level.ServerLevel,net.minecraft.server.commands.SpreadPlayersCommand$Position[],int,boolean) -> a
+    229:237:net.minecraft.server.commands.SpreadPlayersCommand$Position[] createInitialPositions(java.util.Random,int,double,double,double,double) -> a
+    73:73:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> a
+    62:62:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> b
+    51:51:boolean lambda$register$2(net.minecraft.commands.CommandSourceStack) -> a
+    46:46:com.mojang.brigadier.Message lambda$static$1(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object) -> a
+    45:45:com.mojang.brigadier.Message lambda$static$0(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object) -> b
+    45:46:void <clinit>() -> <clinit>
+net.minecraft.server.commands.SpreadPlayersCommand$Position -> xg$a:
     double x -> a
     double z -> b
-    228:229:void <init>() -> <init>
-    231:234:void <init>(double,double) -> <init>
-    237:239:void set(double,double) -> a
-    242:245:double dist(net.minecraft.server.commands.SpreadPlayersCommand$Position) -> a
-    249:252:void normalize() -> a
-    255:255:float getLength() -> b
-    259:261:void moveAway(net.minecraft.server.commands.SpreadPlayersCommand$Position) -> b
-    264:282:boolean clamp(double,double,double,double) -> a
-    286:295:int getSpawnY(net.minecraft.world.level.BlockGetter) -> a
-    299:310:boolean isSafe(net.minecraft.world.level.BlockGetter) -> b
-    314:316:void randomize(java.util.Random,double,double,double,double) -> a
-    224:224:double access$000(net.minecraft.server.commands.SpreadPlayersCommand$Position) -> c
-    224:224:double access$002(net.minecraft.server.commands.SpreadPlayersCommand$Position,double) -> a
-    224:224:double access$100(net.minecraft.server.commands.SpreadPlayersCommand$Position) -> d
-    224:224:double access$102(net.minecraft.server.commands.SpreadPlayersCommand$Position,double) -> b
-net.minecraft.server.commands.StopCommand -> vh:
+    244:245:void <init>() -> <init>
+    247:250:void <init>(double,double) -> <init>
+    253:255:void set(double,double) -> a
+    258:261:double dist(net.minecraft.server.commands.SpreadPlayersCommand$Position) -> a
+    265:268:void normalize() -> a
+    271:271:float getLength() -> b
+    275:277:void moveAway(net.minecraft.server.commands.SpreadPlayersCommand$Position) -> b
+    280:298:boolean clamp(double,double,double,double) -> a
+    302:317:int getSpawnY(net.minecraft.world.level.BlockGetter,int) -> a
+    321:324:boolean isSafe(net.minecraft.world.level.BlockGetter,int) -> b
+    328:330:void randomize(java.util.Random,double,double,double,double) -> a
+    240:240:double access$000(net.minecraft.server.commands.SpreadPlayersCommand$Position) -> c
+    240:240:double access$002(net.minecraft.server.commands.SpreadPlayersCommand$Position,double) -> a
+    240:240:double access$100(net.minecraft.server.commands.SpreadPlayersCommand$Position) -> d
+    240:240:double access$102(net.minecraft.server.commands.SpreadPlayersCommand$Position,double) -> b
+net.minecraft.server.commands.StopCommand -> xh:
     10:10:void <init>() -> <init>
     12:21:void register(com.mojang.brigadier.CommandDispatcher) -> a
     16:18:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
     14:14:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.StopSoundCommand -> vi:
+net.minecraft.server.commands.StopSoundCommand -> xi:
     25:25:void <init>() -> <init>
     27:57:void register(com.mojang.brigadier.CommandDispatcher) -> a
     60:79:int stopSound(net.minecraft.commands.CommandSourceStack,java.util.Collection,net.minecraft.sounds.SoundSource,net.minecraft.resources.ResourceLocation) -> a
@@ -29096,18 +31308,19 @@ net.minecraft.server.commands.StopSoundCommand -> vi:
     41:41:int lambda$register$2(net.minecraft.sounds.SoundSource,com.mojang.brigadier.context.CommandContext) -> b
     34:34:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
     28:28:int lambda$register$0(com.mojang.brigadier.context.CommandContext) -> b
-net.minecraft.server.commands.SummonCommand -> vj:
+net.minecraft.server.commands.SummonCommand -> xj:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_FAILED -> a
+    com.mojang.brigadier.exceptions.SimpleCommandExceptionType INVALID_POSITION -> b
     30:30:void <init>() -> <init>
-    34:51:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    54:82:int spawnEntity(net.minecraft.commands.CommandSourceStack,net.minecraft.resources.ResourceLocation,net.minecraft.world.phys.Vec3,net.minecraft.nbt.CompoundTag,boolean) -> a
-    67:71:net.minecraft.world.entity.Entity lambda$spawnEntity$4(net.minecraft.world.phys.Vec3,net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Entity) -> a
-    46:46:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> a
-    43:43:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> b
-    40:40:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> c
-    36:36:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-    31:31:void <clinit>() -> <clinit>
-net.minecraft.server.commands.TagCommand -> vk:
+    35:52:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    55:80:int spawnEntity(net.minecraft.commands.CommandSourceStack,net.minecraft.resources.ResourceLocation,net.minecraft.world.phys.Vec3,net.minecraft.nbt.CompoundTag,boolean) -> a
+    65:69:net.minecraft.world.entity.Entity lambda$spawnEntity$4(net.minecraft.world.phys.Vec3,net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Entity) -> a
+    47:47:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> a
+    44:44:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> b
+    41:41:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> c
+    37:37:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
+    31:32:void <clinit>() -> <clinit>
+net.minecraft.server.commands.TagCommand -> xk:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ADD_FAILED -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_REMOVE_FAILED -> b
     24:24:void <init>() -> <init>
@@ -29122,7 +31335,7 @@ net.minecraft.server.commands.TagCommand -> vk:
     38:38:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> c
     31:31:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
     25:26:void <clinit>() -> <clinit>
-net.minecraft.server.commands.TeamCommand -> vl:
+net.minecraft.server.commands.TeamCommand -> xl:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_TEAM_ALREADY_EXISTS -> a
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_TEAM_NAME_TOO_LONG -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_TEAM_ALREADY_EMPTY -> c
@@ -29184,43 +31397,45 @@ net.minecraft.server.commands.TeamCommand -> vl:
     55:55:boolean lambda$register$1(net.minecraft.commands.CommandSourceStack) -> b
     40:40:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> a
     39:50:void <clinit>() -> <clinit>
-net.minecraft.server.commands.TeamMsgCommand -> vm:
-    com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_ON_TEAM -> a
-    25:25:void <init>() -> <init>
-    29:37:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    40:62:int sendMessage(net.minecraft.commands.CommandSourceStack,net.minecraft.network.chat.Component) -> a
-    45:47:void lambda$sendMessage$1(net.minecraft.network.chat.Style) -> a
-    33:33:int lambda$register$0(com.mojang.brigadier.context.CommandContext) -> a
-    26:26:void <clinit>() -> <clinit>
-net.minecraft.server.commands.TeleportCommand -> vn:
-    45:45:void <init>() -> <init>
-    47:97:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    100:110:int teleportToEntity(net.minecraft.commands.CommandSourceStack,java.util.Collection,net.minecraft.world.entity.Entity) -> a
-    114:153:int teleportToPos(net.minecraft.commands.CommandSourceStack,java.util.Collection,net.minecraft.server.level.ServerLevel,net.minecraft.commands.arguments.coordinates.Coordinates,net.minecraft.commands.arguments.coordinates.Coordinates,net.minecraft.server.commands.TeleportCommand$LookAt) -> a
-    157:207:void performTeleport(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,net.minecraft.server.level.ServerLevel,double,double,double,java.util.Set,float,float,net.minecraft.server.commands.TeleportCommand$LookAt) -> a
-    94:94:boolean lambda$register$9(net.minecraft.commands.CommandSourceStack) -> a
-    89:89:int lambda$register$8(com.mojang.brigadier.context.CommandContext) -> a
-    85:85:int lambda$register$7(com.mojang.brigadier.context.CommandContext) -> b
-    80:80:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> c
-    74:74:int lambda$register$5(com.mojang.brigadier.context.CommandContext) -> d
-    68:68:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> e
-    65:65:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> f
-    57:57:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> g
-    54:54:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> h
-    49:49:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> b
-net.minecraft.server.commands.TeleportCommand$LookAt -> vn$a:
+net.minecraft.server.commands.TeamMsgCommand -> xm:
+    net.minecraft.network.chat.Style SUGGEST_STYLE -> a
+    com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_ON_TEAM -> b
+    24:24:void <init>() -> <init>
+    32:40:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    43:60:int sendMessage(net.minecraft.commands.CommandSourceStack,net.minecraft.network.chat.Component) -> a
+    36:36:int lambda$register$0(com.mojang.brigadier.context.CommandContext) -> a
+    25:29:void <clinit>() -> <clinit>
+net.minecraft.server.commands.TeleportCommand -> xn:
+    com.mojang.brigadier.exceptions.SimpleCommandExceptionType INVALID_POSITION -> a
+    48:48:void <init>() -> <init>
+    52:102:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    105:115:int teleportToEntity(net.minecraft.commands.CommandSourceStack,java.util.Collection,net.minecraft.world.entity.Entity) -> a
+    119:158:int teleportToPos(net.minecraft.commands.CommandSourceStack,java.util.Collection,net.minecraft.server.level.ServerLevel,net.minecraft.commands.arguments.coordinates.Coordinates,net.minecraft.commands.arguments.coordinates.Coordinates,net.minecraft.server.commands.TeleportCommand$LookAt) -> a
+    162:220:void performTeleport(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,net.minecraft.server.level.ServerLevel,double,double,double,java.util.Set,float,float,net.minecraft.server.commands.TeleportCommand$LookAt) -> a
+    99:99:boolean lambda$register$9(net.minecraft.commands.CommandSourceStack) -> a
+    94:94:int lambda$register$8(com.mojang.brigadier.context.CommandContext) -> a
+    90:90:int lambda$register$7(com.mojang.brigadier.context.CommandContext) -> b
+    85:85:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> c
+    79:79:int lambda$register$5(com.mojang.brigadier.context.CommandContext) -> d
+    73:73:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> e
+    70:70:int lambda$register$3(com.mojang.brigadier.context.CommandContext) -> f
+    62:62:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> g
+    59:59:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> h
+    54:54:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> b
+    49:49:void <clinit>() -> <clinit>
+net.minecraft.server.commands.TeleportCommand$LookAt -> xn$a:
     net.minecraft.world.phys.Vec3 position -> a
     net.minecraft.world.entity.Entity entity -> b
     net.minecraft.commands.arguments.EntityAnchorArgument$Anchor anchor -> c
-    214:218:void <init>(net.minecraft.world.entity.Entity,net.minecraft.commands.arguments.EntityAnchorArgument$Anchor) -> <init>
-    220:224:void <init>(net.minecraft.world.phys.Vec3) -> <init>
-    227:236:void perform(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity) -> a
-net.minecraft.server.commands.TellRawCommand -> vo:
-    16:16:void <init>() -> <init>
-    18:36:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    26:31:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
-    20:20:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.TimeCommand -> vp:
+    227:231:void <init>(net.minecraft.world.entity.Entity,net.minecraft.commands.arguments.EntityAnchorArgument$Anchor) -> <init>
+    233:237:void <init>(net.minecraft.world.phys.Vec3) -> <init>
+    240:249:void perform(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity) -> a
+net.minecraft.server.commands.TellRawCommand -> xo:
+    17:17:void <init>() -> <init>
+    19:37:void register(com.mojang.brigadier.CommandDispatcher) -> a
+    27:32:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> a
+    21:21:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
+net.minecraft.server.commands.TimeCommand -> xp:
     15:15:void <init>() -> <init>
     17:62:void register(com.mojang.brigadier.CommandDispatcher) -> a
     65:65:int getDayTime(net.minecraft.server.level.ServerLevel) -> a
@@ -29237,7 +31452,7 @@ net.minecraft.server.commands.TimeCommand -> vp:
     27:27:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> h
     24:24:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> i
     19:19:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.TitleCommand -> vq:
+net.minecraft.server.commands.TitleCommand -> xq:
     25:25:void <init>() -> <init>
     27:76:void register(com.mojang.brigadier.CommandDispatcher) -> a
     79:90:int clearTitle(net.minecraft.commands.CommandSourceStack,java.util.Collection) -> a
@@ -29251,7 +31466,7 @@ net.minecraft.server.commands.TitleCommand -> vq:
     38:38:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> e
     34:34:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> f
     29:29:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.TriggerCommand -> vr:
+net.minecraft.server.commands.TriggerCommand -> xr:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_PRIMED -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_INVALID_OBJECTIVE -> b
     29:29:void <init>() -> <init>
@@ -29266,12 +31481,12 @@ net.minecraft.server.commands.TriggerCommand -> vr:
     39:39:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> c
     38:38:java.util.concurrent.CompletableFuture lambda$register$0(com.mojang.brigadier.context.CommandContext,com.mojang.brigadier.suggestion.SuggestionsBuilder) -> a
     30:31:void <clinit>() -> <clinit>
-net.minecraft.server.commands.WeatherCommand -> vs:
+net.minecraft.server.commands.WeatherCommand -> xs:
     14:14:void <init>() -> <init>
     18:46:void register(com.mojang.brigadier.CommandDispatcher) -> a
-    49:55:int setClear(net.minecraft.commands.CommandSourceStack,int) -> a
-    59:65:int setRain(net.minecraft.commands.CommandSourceStack,int) -> b
-    69:75:int setThunder(net.minecraft.commands.CommandSourceStack,int) -> c
+    49:51:int setClear(net.minecraft.commands.CommandSourceStack,int) -> a
+    55:57:int setRain(net.minecraft.commands.CommandSourceStack,int) -> b
+    61:63:int setThunder(net.minecraft.commands.CommandSourceStack,int) -> c
     42:42:int lambda$register$6(com.mojang.brigadier.context.CommandContext) -> a
     39:39:int lambda$register$5(com.mojang.brigadier.context.CommandContext) -> b
     34:34:int lambda$register$4(com.mojang.brigadier.context.CommandContext) -> c
@@ -29279,7 +31494,7 @@ net.minecraft.server.commands.WeatherCommand -> vs:
     26:26:int lambda$register$2(com.mojang.brigadier.context.CommandContext) -> e
     23:23:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> f
     20:20:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> a
-net.minecraft.server.commands.WhitelistCommand -> vt:
+net.minecraft.server.commands.WhitelistCommand -> xt:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ALREADY_ENABLED -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ALREADY_DISABLED -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_ALREADY_WHITELISTED -> c
@@ -29304,7 +31519,7 @@ net.minecraft.server.commands.WhitelistCommand -> vt:
     35:35:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> f
     32:32:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> e
     24:27:void <clinit>() -> <clinit>
-net.minecraft.server.commands.WorldBorderCommand -> vu:
+net.minecraft.server.commands.WorldBorderCommand -> xu:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_SAME_CENTER -> a
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_SAME_SIZE -> b
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_TOO_SMALL -> c
@@ -29334,7 +31549,7 @@ net.minecraft.server.commands.WorldBorderCommand -> vu:
     42:42:int lambda$register$1(com.mojang.brigadier.context.CommandContext) -> j
     37:37:boolean lambda$register$0(net.minecraft.commands.CommandSourceStack) -> b
     25:32:void <clinit>() -> <clinit>
-net.minecraft.server.commands.data.BlockDataAccessor -> vv:
+net.minecraft.server.commands.data.BlockDataAccessor -> xv:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NOT_A_BLOCK_ENTITY -> b
     java.util.function.Function PROVIDER -> a
     net.minecraft.world.level.block.entity.BlockEntity entity -> c
@@ -29348,18 +31563,18 @@ net.minecraft.server.commands.data.BlockDataAccessor -> vv:
     29:29:net.minecraft.server.commands.data.DataCommands$DataProvider lambda$static$0(java.lang.String) -> a
     26:26:com.mojang.brigadier.exceptions.SimpleCommandExceptionType access$000() -> c
     27:29:void <clinit>() -> <clinit>
-net.minecraft.server.commands.data.BlockDataAccessor$1 -> vv$1:
+net.minecraft.server.commands.data.BlockDataAccessor$1 -> xv$1:
     java.lang.String val$argPrefix -> a
     29:29:void <init>(java.lang.String) -> <init>
     32:37:net.minecraft.server.commands.data.DataAccessor access(com.mojang.brigadier.context.CommandContext) -> a
     42:42:com.mojang.brigadier.builder.ArgumentBuilder wrap(com.mojang.brigadier.builder.ArgumentBuilder,java.util.function.Function) -> a
-net.minecraft.server.commands.data.DataAccessor -> vw:
+net.minecraft.server.commands.data.DataAccessor -> xw:
     void setData(net.minecraft.nbt.CompoundTag) -> a
     net.minecraft.nbt.CompoundTag getData() -> a
     net.minecraft.network.chat.Component getModifiedSuccess() -> b
     net.minecraft.network.chat.Component getPrintSuccess(net.minecraft.nbt.Tag) -> a
     net.minecraft.network.chat.Component getPrintSuccess(net.minecraft.commands.arguments.NbtPathArgument$NbtPath,double,int) -> a
-net.minecraft.server.commands.data.DataCommands -> vx:
+net.minecraft.server.commands.data.DataCommands -> xx:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_MERGE_UNCHANGED -> d
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_GET_NOT_NUMBER -> e
     com.mojang.brigadier.exceptions.DynamicCommandExceptionType ERROR_GET_NON_EXISTENT -> f
@@ -29411,14 +31626,14 @@ net.minecraft.server.commands.data.DataCommands -> vx:
     47:47:com.mojang.brigadier.Message lambda$static$1(java.lang.Object) -> d
     46:46:com.mojang.brigadier.Message lambda$static$0(java.lang.Object) -> e
     45:56:void <clinit>() -> <clinit>
-net.minecraft.server.commands.data.DataCommands$DataManipulator -> vx$a:
+net.minecraft.server.commands.data.DataCommands$DataManipulator -> xx$a:
     int modify(com.mojang.brigadier.context.CommandContext,net.minecraft.nbt.CompoundTag,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,java.util.List) -> modify
-net.minecraft.server.commands.data.DataCommands$DataManipulatorDecorator -> vx$b:
+net.minecraft.server.commands.data.DataCommands$DataManipulatorDecorator -> xx$b:
     com.mojang.brigadier.builder.ArgumentBuilder create(net.minecraft.server.commands.data.DataCommands$DataManipulator) -> create
-net.minecraft.server.commands.data.DataCommands$DataProvider -> vx$c:
+net.minecraft.server.commands.data.DataCommands$DataProvider -> xx$c:
     net.minecraft.server.commands.data.DataAccessor access(com.mojang.brigadier.context.CommandContext) -> a
     com.mojang.brigadier.builder.ArgumentBuilder wrap(com.mojang.brigadier.builder.ArgumentBuilder,java.util.function.Function) -> a
-net.minecraft.server.commands.data.EntityDataAccessor -> vy:
+net.minecraft.server.commands.data.EntityDataAccessor -> xy:
     com.mojang.brigadier.exceptions.SimpleCommandExceptionType ERROR_NO_PLAYERS -> b
     java.util.function.Function PROVIDER -> a
     net.minecraft.world.entity.Entity entity -> c
@@ -29430,12 +31645,12 @@ net.minecraft.server.commands.data.EntityDataAccessor -> vy:
     74:74:net.minecraft.network.chat.Component getPrintSuccess(net.minecraft.commands.arguments.NbtPathArgument$NbtPath,double,int) -> a
     29:29:net.minecraft.server.commands.data.DataCommands$DataProvider lambda$static$0(java.lang.String) -> a
     27:29:void <clinit>() -> <clinit>
-net.minecraft.server.commands.data.EntityDataAccessor$1 -> vy$1:
+net.minecraft.server.commands.data.EntityDataAccessor$1 -> xy$1:
     java.lang.String val$arg -> a
     29:29:void <init>(java.lang.String) -> <init>
     32:32:net.minecraft.server.commands.data.DataAccessor access(com.mojang.brigadier.context.CommandContext) -> a
     37:37:com.mojang.brigadier.builder.ArgumentBuilder wrap(com.mojang.brigadier.builder.ArgumentBuilder,java.util.function.Function) -> a
-net.minecraft.server.commands.data.StorageDataAccessor -> vz:
+net.minecraft.server.commands.data.StorageDataAccessor -> xz:
     com.mojang.brigadier.suggestion.SuggestionProvider SUGGEST_STORAGE -> b
     java.util.function.Function PROVIDER -> a
     net.minecraft.world.level.storage.CommandStorage storage -> c
@@ -29453,109 +31668,107 @@ net.minecraft.server.commands.data.StorageDataAccessor -> vz:
     24:24:void <init>(net.minecraft.world.level.storage.CommandStorage,net.minecraft.resources.ResourceLocation,net.minecraft.server.commands.data.StorageDataAccessor$1) -> <init>
     24:24:com.mojang.brigadier.suggestion.SuggestionProvider access$200() -> c
     25:28:void <clinit>() -> <clinit>
-net.minecraft.server.commands.data.StorageDataAccessor$1 -> vz$1:
+net.minecraft.server.commands.data.StorageDataAccessor$1 -> xz$1:
     java.lang.String val$arg -> a
     28:28:void <init>(java.lang.String) -> <init>
     31:31:net.minecraft.server.commands.data.DataAccessor access(com.mojang.brigadier.context.CommandContext) -> a
     36:36:com.mojang.brigadier.builder.ArgumentBuilder wrap(com.mojang.brigadier.builder.ArgumentBuilder,java.util.function.Function) -> a
-net.minecraft.server.commands.data.package-info -> wa:
-net.minecraft.server.commands.package-info -> wb:
-net.minecraft.server.dedicated.DedicatedPlayerList -> wc:
+net.minecraft.server.commands.data.package-info -> ya:
+net.minecraft.server.commands.package-info -> yb:
+net.minecraft.server.dedicated.DedicatedPlayerList -> yc:
     org.apache.logging.log4j.Logger LOGGER -> a
-    14:35:void <init>(net.minecraft.server.dedicated.DedicatedServer) -> <init>
-    39:41:void setUsingWhiteList(boolean) -> a
-    45:47:void op(com.mojang.authlib.GameProfile) -> a
-    51:53:void deop(com.mojang.authlib.GameProfile) -> b
-    57:59:void blackList(com.mojang.authlib.GameProfile) -> c
-    63:65:void whiteList(com.mojang.authlib.GameProfile) -> d
-    69:70:void reloadWhiteList() -> a
-    74:78:void saveIpBanList() -> w
-    82:86:void saveUserBanList() -> x
-    90:94:void loadIpBanList() -> y
-    98:102:void loadUserBanList() -> z
-    106:110:void loadOps() -> A
-    114:118:void saveOps() -> B
-    122:126:void loadWhiteList() -> C
-    130:134:void saveWhiteList() -> D
-    138:138:boolean isWhiteListed(com.mojang.authlib.GameProfile) -> e
-    143:143:net.minecraft.server.dedicated.DedicatedServer getServer() -> b
-    148:148:boolean canBypassPlayerLimit(com.mojang.authlib.GameProfile) -> f
-    10:10:net.minecraft.server.MinecraftServer getServer() -> c
-    11:11:void <clinit>() -> <clinit>
-net.minecraft.server.dedicated.DedicatedServer -> wd:
-    org.apache.logging.log4j.Logger LOGGER -> h
-    java.util.regex.Pattern SHA1 -> i
-    java.util.List consoleInput -> j
-    net.minecraft.server.rcon.thread.QueryThreadGs4 queryThreadGs4 -> k
-    net.minecraft.server.rcon.RconConsoleSource rconConsoleSource -> l
-    net.minecraft.server.rcon.thread.RconThread rconThread -> m
-    net.minecraft.server.dedicated.DedicatedServerSettings settings -> n
-    net.minecraft.world.level.GameType gameType -> o
-    net.minecraft.server.gui.MinecraftServerGui gui -> p
-    70:100:void <init>(java.io.File,net.minecraft.server.dedicated.DedicatedServerSettings,com.mojang.datafixers.DataFixer,com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService,com.mojang.authlib.minecraft.MinecraftSessionService,com.mojang.authlib.GameProfileRepository,net.minecraft.server.players.GameProfileCache,net.minecraft.server.level.progress.ChunkProgressListenerFactory,java.lang.String) -> <init>
-    104:251:boolean initServer() -> d
-    255:276:java.lang.String getPackHash() -> aZ
-    281:283:void setDefaultGameMode(net.minecraft.world.level.GameType) -> a
-    287:287:net.minecraft.server.dedicated.DedicatedServerProperties getProperties() -> d_
-    292:292:boolean canGenerateStructures() -> f
-    297:297:net.minecraft.world.level.GameType getDefaultGameType() -> g
-    302:302:net.minecraft.world.Difficulty getDefaultDifficulty() -> h
-    307:307:boolean isHardcore() -> i
-    312:317:net.minecraft.CrashReport fillReport(net.minecraft.CrashReport) -> b
-    322:327:java.util.Optional getModdedStatus() -> q
-    332:343:void onServerExit() -> e
-    347:349:void tickChildren(java.util.function.BooleanSupplier) -> b
-    353:353:boolean isNetherEnabled() -> A
-    358:358:boolean getSpawnMonsters() -> R
-    363:366:void populateSnooper(net.minecraft.world.Snooper) -> a
-    370:370:boolean isSnooperEnabled() -> W
-    374:375:void handleConsoleInput(java.lang.String,net.minecraft.commands.CommandSourceStack) -> a
-    378:382:void handleConsoleInputs() -> ba
-    386:386:boolean isDedicatedServer() -> m
-    391:391:boolean isEpollEnabled() -> n
-    396:396:net.minecraft.server.dedicated.DedicatedPlayerList getPlayerList() -> bb
-    401:401:boolean isPublished() -> p
-    406:406:java.lang.String getServerIp() -> e_
-    411:411:int getServerPort() -> r
-    416:416:java.lang.String getServerName() -> f_
-    420:423:void showGui() -> bc
-    427:427:boolean hasGui() -> aj
-    432:432:boolean publishServer(net.minecraft.world.level.GameType,boolean,int) -> a
-    437:437:boolean isCommandBlockEnabled() -> o
-    442:442:int getSpawnProtectionRadius() -> ao
-    447:467:boolean isUnderSpawnProtection(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    472:472:int getOperatorUserPermissionLevel() -> j
-    477:477:int getFunctionCompilationLevel() -> k
-    482:484:void setPlayerIdleTimeout(int) -> c
-    488:488:boolean shouldRconBroadcast() -> l
-    493:493:boolean shouldInformAdmins() -> I_
-    498:498:int getAbsoluteMaxWorldSize() -> ax
-    503:503:int getCompressionThreshold() -> aA
-    509:564:boolean convertOldUsers() -> bd
-    569:573:void waitForRetry() -> bn
-    576:576:long getMaxTickLength() -> be
-    581:581:java.lang.String getPluginNames() -> u
-    586:588:java.lang.String runCommand(java.lang.String) -> a_
-    592:593:void storeUsingWhiteList(boolean) -> o
-    597:599:void stopServer() -> s
-    603:603:boolean isSingleplayerOwner(com.mojang.authlib.GameProfile) -> a
-    64:64:net.minecraft.server.players.PlayerList getPlayerList() -> ag
-    592:592:net.minecraft.server.dedicated.DedicatedServerProperties lambda$storeUsingWhiteList$4(boolean,net.minecraft.server.dedicated.DedicatedServerProperties) -> a
-    587:587:void lambda$runCommand$3(java.lang.String) -> l
-    483:483:net.minecraft.server.dedicated.DedicatedServerProperties lambda$setPlayerIdleTimeout$2(int,net.minecraft.server.dedicated.DedicatedServerProperties) -> a
-    315:315:java.lang.String lambda$fillReport$1() -> bo
-    314:314:java.lang.String lambda$fillReport$0() -> bp
-    64:64:org.apache.logging.log4j.Logger access$000() -> bf
-    65:68:void <clinit>() -> <clinit>
-net.minecraft.server.dedicated.DedicatedServer$1 -> wd$1:
+    16:32:void <init>(net.minecraft.server.dedicated.DedicatedServer,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.storage.PlayerDataStorage) -> <init>
+    36:38:void setUsingWhiteList(boolean) -> a
+    42:44:void op(com.mojang.authlib.GameProfile) -> a
+    48:50:void deop(com.mojang.authlib.GameProfile) -> b
+    54:56:void blackList(com.mojang.authlib.GameProfile) -> c
+    60:62:void whiteList(com.mojang.authlib.GameProfile) -> d
+    66:67:void reloadWhiteList() -> a
+    71:75:void saveIpBanList() -> v
+    79:83:void saveUserBanList() -> w
+    87:91:void loadIpBanList() -> x
+    95:99:void loadUserBanList() -> y
+    103:107:void loadOps() -> z
+    111:115:void saveOps() -> A
+    119:123:void loadWhiteList() -> B
+    127:131:void saveWhiteList() -> C
+    135:135:boolean isWhiteListed(com.mojang.authlib.GameProfile) -> e
+    140:140:net.minecraft.server.dedicated.DedicatedServer getServer() -> b
+    145:145:boolean canBypassPlayerLimit(com.mojang.authlib.GameProfile) -> f
+    12:12:net.minecraft.server.MinecraftServer getServer() -> c
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.server.dedicated.DedicatedServer -> yd:
+    org.apache.logging.log4j.Logger LOGGER -> j
+    java.util.regex.Pattern SHA1 -> k
+    java.util.List consoleInput -> l
+    net.minecraft.server.rcon.thread.QueryThreadGs4 queryThreadGs4 -> m
+    net.minecraft.server.rcon.RconConsoleSource rconConsoleSource -> n
+    net.minecraft.server.rcon.thread.RconThread rconThread -> o
+    net.minecraft.server.dedicated.DedicatedServerSettings settings -> p
+    net.minecraft.server.gui.MinecraftServerGui gui -> q
+    68:80:void <init>(java.lang.Thread,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.server.packs.repository.PackRepository,net.minecraft.server.ServerResources,net.minecraft.world.level.storage.WorldData,net.minecraft.server.dedicated.DedicatedServerSettings,com.mojang.datafixers.DataFixer,com.mojang.authlib.minecraft.MinecraftSessionService,com.mojang.authlib.GameProfileRepository,net.minecraft.server.players.GameProfileCache,net.minecraft.server.level.progress.ChunkProgressListenerFactory) -> <init>
+    84:211:boolean initServer() -> d
+    216:216:boolean isSpawningAnimals() -> V
+    221:221:boolean isSpawningMonsters() -> O
+    226:226:boolean areNpcsEnabled() -> W
+    230:251:java.lang.String getPackHash() -> aY
+    256:256:net.minecraft.server.dedicated.DedicatedServerProperties getProperties() -> g_
+    261:262:void forceDifficulty() -> p
+    266:266:boolean isHardcore() -> f
+    271:276:net.minecraft.CrashReport fillReport(net.minecraft.CrashReport) -> b
+    281:286:java.util.Optional getModdedStatus() -> n
+    291:302:void onServerExit() -> e
+    306:308:void tickChildren(java.util.function.BooleanSupplier) -> b
+    312:312:boolean isNetherEnabled() -> B
+    317:320:void populateSnooper(net.minecraft.world.Snooper) -> a
+    324:324:boolean isSnooperEnabled() -> S
+    328:329:void handleConsoleInput(java.lang.String,net.minecraft.commands.CommandSourceStack) -> a
+    332:336:void handleConsoleInputs() -> aZ
+    340:340:boolean isDedicatedServer() -> j
+    345:345:boolean isEpollEnabled() -> k
+    350:350:net.minecraft.server.dedicated.DedicatedPlayerList getPlayerList() -> ba
+    355:355:boolean isPublished() -> m
+    360:360:java.lang.String getServerIp() -> h_
+    365:365:int getServerPort() -> o
+    370:370:java.lang.String getServerName() -> i_
+    374:377:void showGui() -> bb
+    381:381:boolean hasGui() -> af
+    386:386:boolean publishServer(net.minecraft.world.level.GameType,boolean,int) -> a
+    391:391:boolean isCommandBlockEnabled() -> l
+    396:396:int getSpawnProtectionRadius() -> ai
+    401:421:boolean isUnderSpawnProtection(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    426:426:boolean repliesToStatus() -> ak
+    431:431:int getOperatorUserPermissionLevel() -> g
+    436:436:int getFunctionCompilationLevel() -> h
+    441:443:void setPlayerIdleTimeout(int) -> d
+    447:447:boolean shouldRconBroadcast() -> i
+    452:452:boolean shouldInformAdmins() -> S_
+    457:457:int getAbsoluteMaxWorldSize() -> as
+    462:462:int getCompressionThreshold() -> av
+    468:523:boolean convertOldUsers() -> bc
+    528:532:void waitForRetry() -> bm
+    535:535:long getMaxTickLength() -> bd
+    540:540:java.lang.String getPluginNames() -> j_
+    545:547:java.lang.String runCommand(java.lang.String) -> a
+    551:552:void storeUsingWhiteList(boolean) -> j
+    556:558:void stopServer() -> s
+    562:562:boolean isSingleplayerOwner(com.mojang.authlib.GameProfile) -> a
+    567:567:int getScaledTrackingDistance(int) -> b
+    572:572:java.lang.String getLevelIdName() -> k_
+    577:577:boolean forceSynchronousWrites() -> aT
+    62:62:net.minecraft.server.players.PlayerList getPlayerList() -> ac
+    551:551:net.minecraft.server.dedicated.DedicatedServerProperties lambda$storeUsingWhiteList$4(boolean,net.minecraft.server.dedicated.DedicatedServerProperties) -> a
+    546:546:void lambda$runCommand$3(java.lang.String) -> f
+    442:442:net.minecraft.server.dedicated.DedicatedServerProperties lambda$setPlayerIdleTimeout$2(int,net.minecraft.server.dedicated.DedicatedServerProperties) -> a
+    274:274:java.lang.String lambda$fillReport$1() -> bn
+    273:273:java.lang.String lambda$fillReport$0() -> bo
+    62:62:org.apache.logging.log4j.Logger access$000() -> be
+    63:66:void <clinit>() -> <clinit>
+net.minecraft.server.dedicated.DedicatedServer$1 -> yd$1:
     net.minecraft.server.dedicated.DedicatedServer this$0 -> a
-    83:88:void <init>(net.minecraft.server.dedicated.DedicatedServer,java.lang.String) -> <init>
-    94:96:void run() -> run
-net.minecraft.server.dedicated.DedicatedServer$2 -> wd$2:
-    net.minecraft.server.dedicated.DedicatedServer this$0 -> a
-    104:104:void <init>(net.minecraft.server.dedicated.DedicatedServer,java.lang.String) -> <init>
-    107:116:void run() -> run
-net.minecraft.server.dedicated.DedicatedServerProperties -> we:
+    84:84:void <init>(net.minecraft.server.dedicated.DedicatedServer,java.lang.String) -> <init>
+    87:96:void run() -> run
+net.minecraft.server.dedicated.DedicatedServerProperties -> ye:
     boolean onlineMode -> a
     boolean preventProxyConnections -> b
     java.lang.String serverIp -> c
@@ -29567,55 +31780,57 @@ net.minecraft.server.dedicated.DedicatedServerProperties -> we:
     java.lang.String motd -> i
     boolean forceGameMode -> j
     boolean enforceWhitelist -> k
-    boolean generateStructures -> l
-    net.minecraft.world.Difficulty difficulty -> m
-    net.minecraft.world.level.GameType gamemode -> n
-    java.lang.String levelName -> o
-    java.lang.String levelSeed -> p
-    net.minecraft.world.level.LevelType levelType -> q
-    java.lang.String generatorSettings -> r
-    int serverPort -> s
-    int maxBuildHeight -> t
-    java.lang.Boolean announcePlayerAchievements -> u
-    boolean enableQuery -> v
-    int queryPort -> w
-    boolean enableRcon -> x
-    int rconPort -> y
-    java.lang.String rconPassword -> z
-    java.lang.String resourcePackHash -> A
-    java.lang.String resourcePackSha1 -> B
-    boolean hardcore -> C
-    boolean allowNether -> D
-    boolean spawnMonsters -> E
-    boolean snooperEnabled -> F
-    boolean useNativeTransport -> G
-    boolean enableCommandBlock -> H
-    int spawnProtection -> I
-    int opPermissionLevel -> J
-    int functionPermissionLevel -> K
-    long maxTickTime -> L
-    int viewDistance -> M
-    int maxPlayers -> N
-    int networkCompressionThreshold -> O
-    boolean broadcastRconToOps -> P
-    boolean broadcastConsoleToOps -> Q
-    int maxWorldSize -> R
+    net.minecraft.world.Difficulty difficulty -> l
+    net.minecraft.world.level.GameType gamemode -> m
+    java.lang.String levelName -> n
+    int serverPort -> o
+    int maxBuildHeight -> p
+    java.lang.Boolean announcePlayerAchievements -> q
+    boolean enableQuery -> r
+    int queryPort -> s
+    boolean enableRcon -> t
+    int rconPort -> u
+    java.lang.String rconPassword -> v
+    java.lang.String resourcePackHash -> w
+    java.lang.String resourcePackSha1 -> x
+    boolean hardcore -> y
+    boolean allowNether -> z
+    boolean spawnMonsters -> A
+    boolean snooperEnabled -> B
+    boolean useNativeTransport -> C
+    boolean enableCommandBlock -> D
+    int spawnProtection -> E
+    int opPermissionLevel -> F
+    int functionPermissionLevel -> G
+    long maxTickTime -> H
+    int viewDistance -> I
+    int maxPlayers -> J
+    int networkCompressionThreshold -> K
+    boolean broadcastRconToOps -> L
+    boolean broadcastConsoleToOps -> M
+    int maxWorldSize -> N
+    boolean syncChunkWrites -> O
+    boolean enableJmxMonitoring -> P
+    boolean enableStatus -> Q
+    int entityBroadcastRangePercentage -> R
     net.minecraft.server.dedicated.Settings$MutableValue playerIdleTimeout -> S
     net.minecraft.server.dedicated.Settings$MutableValue whiteList -> T
-    16:67:void <init>(java.util.Properties) -> <init>
-    70:70:net.minecraft.server.dedicated.DedicatedServerProperties fromFile(java.nio.file.Path) -> a
-    75:75:net.minecraft.server.dedicated.DedicatedServerProperties reload(java.util.Properties) -> a
+    net.minecraft.world.level.levelgen.WorldGenSettings worldGenSettings -> U
+    16:70:void <init>(java.util.Properties) -> <init>
+    73:73:net.minecraft.server.dedicated.DedicatedServerProperties fromFile(java.nio.file.Path) -> a
+    78:78:net.minecraft.server.dedicated.DedicatedServerProperties reload(java.util.Properties) -> a
     15:15:net.minecraft.server.dedicated.Settings reload(java.util.Properties) -> b
-    60:60:java.lang.Integer lambda$new$1(java.lang.Integer) -> a
-    35:35:java.lang.Integer lambda$new$0(java.lang.Integer) -> b
-net.minecraft.server.dedicated.DedicatedServerSettings -> wf:
+    60:60:java.lang.Integer lambda$new$2(java.lang.Integer) -> a
+    56:56:java.lang.Integer lambda$new$1(java.lang.Integer) -> b
+    31:31:java.lang.Integer lambda$new$0(java.lang.Integer) -> c
+net.minecraft.server.dedicated.DedicatedServerSettings -> yf:
     java.nio.file.Path source -> a
     net.minecraft.server.dedicated.DedicatedServerProperties properties -> b
     10:13:void <init>(java.nio.file.Path) -> <init>
     16:16:net.minecraft.server.dedicated.DedicatedServerProperties getProperties() -> a
     20:21:void forceSave() -> b
     24:25:net.minecraft.server.dedicated.DedicatedServerSettings update(java.util.function.UnaryOperator) -> a
-net.minecraft.server.dedicated.ServerWatchdog -> wg:
+net.minecraft.server.dedicated.ServerWatchdog -> yg:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.server.dedicated.DedicatedServer server -> b
     long maxTickTime -> c
@@ -29623,11 +31838,11 @@ net.minecraft.server.dedicated.ServerWatchdog -> wg:
     35:79:void run() -> run
     83:95:void exit() -> a
     21:21:void <clinit>() -> <clinit>
-net.minecraft.server.dedicated.ServerWatchdog$1 -> wg$1:
+net.minecraft.server.dedicated.ServerWatchdog$1 -> yg$1:
     net.minecraft.server.dedicated.ServerWatchdog this$0 -> a
     84:84:void <init>(net.minecraft.server.dedicated.ServerWatchdog) -> <init>
     87:88:void run() -> run
-net.minecraft.server.dedicated.Settings -> wh:
+net.minecraft.server.dedicated.Settings -> yh:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Properties properties -> b
     48:50:void <init>(java.util.Properties) -> <init>
@@ -29657,8 +31872,8 @@ net.minecraft.server.dedicated.Settings -> wh:
     83:85:java.lang.Object lambda$dispatchNumberOrString$1(java.util.function.IntFunction,java.util.function.Function,java.lang.String) -> a
     73:75:java.lang.Number lambda$wrapNumberDeserializer$0(java.util.function.Function,java.lang.String) -> a
     44:44:void <clinit>() -> <clinit>
-net.minecraft.server.dedicated.Settings$1 -> wh$1:
-net.minecraft.server.dedicated.Settings$MutableValue -> wh$a:
+net.minecraft.server.dedicated.Settings$1 -> yh$1:
+net.minecraft.server.dedicated.Settings$MutableValue -> yh$a:
     java.lang.String key -> b
     java.lang.Object value -> c
     java.util.function.Function serializer -> d
@@ -29667,8 +31882,8 @@ net.minecraft.server.dedicated.Settings$MutableValue -> wh$a:
     34:34:java.lang.Object get() -> get
     38:40:net.minecraft.server.dedicated.Settings update(java.lang.Object) -> a
     21:21:void <init>(net.minecraft.server.dedicated.Settings,java.lang.String,java.lang.Object,java.util.function.Function,net.minecraft.server.dedicated.Settings$1) -> <init>
-net.minecraft.server.dedicated.package-info -> wi:
-net.minecraft.server.gui.MinecraftServerGui -> wj:
+net.minecraft.server.dedicated.package-info -> yi:
+net.minecraft.server.gui.MinecraftServerGui -> yj:
     java.awt.Font MONOSPACED -> a
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.server.dedicated.DedicatedServer server -> c
@@ -29691,22 +31906,22 @@ net.minecraft.server.gui.MinecraftServerGui -> wj:
     35:35:java.util.concurrent.atomic.AtomicBoolean access$000(net.minecraft.server.gui.MinecraftServerGui) -> a
     35:35:void access$100(net.minecraft.server.gui.MinecraftServerGui) -> b
     36:37:void <clinit>() -> <clinit>
-net.minecraft.server.gui.MinecraftServerGui$1 -> wj$1:
+net.minecraft.server.gui.MinecraftServerGui$1 -> yj$1:
     net.minecraft.server.gui.MinecraftServerGui val$gui -> a
     javax.swing.JFrame val$frame -> b
     net.minecraft.server.dedicated.DedicatedServer val$server -> c
     59:59:void <init>(net.minecraft.server.gui.MinecraftServerGui,javax.swing.JFrame,net.minecraft.server.dedicated.DedicatedServer) -> <init>
     62:67:void windowClosing(java.awt.event.WindowEvent) -> windowClosing
-net.minecraft.server.gui.MinecraftServerGui$2 -> wj$2:
+net.minecraft.server.gui.MinecraftServerGui$2 -> yj$2:
     net.minecraft.server.gui.MinecraftServerGui this$0 -> a
     125:125:void <init>(net.minecraft.server.gui.MinecraftServerGui) -> <init>
     128:128:void focusGained(java.awt.event.FocusEvent) -> focusGained
-net.minecraft.server.gui.PlayerListComponent -> wk:
+net.minecraft.server.gui.PlayerListComponent -> yk:
     net.minecraft.server.MinecraftServer server -> a
     int tickCount -> b
     12:15:void <init>(net.minecraft.server.MinecraftServer) -> <init>
     18:25:void tick() -> a
-net.minecraft.server.gui.StatsComponent -> wl:
+net.minecraft.server.gui.StatsComponent -> yl:
     java.text.DecimalFormat DECIMAL_FORMAT -> a
     int[] values -> b
     int vp -> c
@@ -29721,8 +31936,8 @@ net.minecraft.server.gui.StatsComponent -> wl:
     29:29:void lambda$new$1(java.awt.event.ActionEvent) -> a
     16:16:void lambda$static$0(java.text.DecimalFormat) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.server.gui.package-info -> wm:
-net.minecraft.server.level.BlockDestructionProgress -> wn:
+net.minecraft.server.gui.package-info -> ym:
+net.minecraft.server.level.BlockDestructionProgress -> yn:
     int id -> a
     net.minecraft.core.BlockPos pos -> b
     int progress -> c
@@ -29738,7 +31953,7 @@ net.minecraft.server.level.BlockDestructionProgress -> wn:
     57:57:int hashCode() -> hashCode
     62:65:int compareTo(net.minecraft.server.level.BlockDestructionProgress) -> a
     5:5:int compareTo(java.lang.Object) -> compareTo
-net.minecraft.server.level.ChunkHolder -> wo:
+net.minecraft.server.level.ChunkHolder -> yo:
     com.mojang.datafixers.util.Either UNLOADED_CHUNK -> a
     java.util.concurrent.CompletableFuture UNLOADED_CHUNK_FUTURE -> b
     com.mojang.datafixers.util.Either UNLOADED_LEVEL_CHUNK -> c
@@ -29757,75 +31972,74 @@ net.minecraft.server.level.ChunkHolder -> wo:
     short[] changedBlocks -> p
     int changes -> q
     int changedSectionFilter -> r
-    int sectionsToForceSendLightFor -> s
-    int blockChangedLightSectionFilter -> t
-    int skyChangedLightSectionFilter -> u
-    net.minecraft.world.level.lighting.LevelLightEngine lightEngine -> v
-    net.minecraft.server.level.ChunkHolder$LevelChangeListener onLevelChange -> w
-    net.minecraft.server.level.ChunkHolder$PlayerProvider playerProvider -> x
-    boolean wasAccessibleSinceLastSave -> y
-    47:81:void <init>(net.minecraft.world.level.ChunkPos,int,net.minecraft.world.level.lighting.LevelLightEngine,net.minecraft.server.level.ChunkHolder$LevelChangeListener,net.minecraft.server.level.ChunkHolder$PlayerProvider) -> <init>
-    84:85:java.util.concurrent.CompletableFuture getFutureIfPresentUnchecked(net.minecraft.world.level.chunk.ChunkStatus) -> a
-    89:92:java.util.concurrent.CompletableFuture getFutureIfPresent(net.minecraft.world.level.chunk.ChunkStatus) -> b
-    99:99:java.util.concurrent.CompletableFuture getTickingChunkFuture() -> a
-    106:106:java.util.concurrent.CompletableFuture getEntityTickingChunkFuture() -> b
-    113:113:java.util.concurrent.CompletableFuture getFullChunkFuture() -> c
-    121:126:net.minecraft.world.level.chunk.LevelChunk getTickingChunk() -> d
-    134:141:net.minecraft.world.level.chunk.ChunkStatus getLastAvailableStatus() -> e
-    150:161:net.minecraft.world.level.chunk.ChunkAccess getLastAvailable() -> f
-    165:165:java.util.concurrent.CompletableFuture getChunkToSave() -> g
-    171:189:void blockChanged(int,int,int) -> a
-    192:203:void sectionLightChanged(net.minecraft.world.level.LightLayer,int) -> a
-    206:258:void broadcastChanges(net.minecraft.world.level.chunk.LevelChunk) -> a
-    261:268:void broadcastBlockEntity(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    271:272:void broadcast(net.minecraft.network.protocol.Packet,boolean) -> a
-    278:292:java.util.concurrent.CompletableFuture getOrScheduleFuture(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ChunkMap) -> a
-    296:297:void updateChunkToSave(java.util.concurrent.CompletableFuture) -> a
-    300:300:net.minecraft.server.level.ChunkHolder$FullChunkStatus getFullStatus() -> h
-    304:304:net.minecraft.world.level.ChunkPos getPos() -> i
-    308:308:int getTicketLevel() -> j
-    312:312:int getQueueLevel() -> k
-    316:317:void setQueueLevel(int) -> d
-    320:321:void setTicketLevel(int) -> a
-    324:394:void updateFutures(net.minecraft.server.level.ChunkMap) -> a
-    397:400:net.minecraft.world.level.chunk.ChunkStatus getStatus(int) -> b
-    404:404:net.minecraft.server.level.ChunkHolder$FullChunkStatus getFullChunkStatus(int) -> c
-    408:408:boolean wasAccessibleSinceLastSave() -> l
-    412:413:void refreshAccessibility() -> m
-    416:428:void replaceProtoChunk(net.minecraft.world.level.chunk.ImposterProtoChunk) -> a
-    362:362:com.mojang.datafixers.util.Either lambda$updateFutures$4(net.minecraft.server.level.ChunkMap,com.mojang.datafixers.util.Either) -> a
-    296:296:net.minecraft.world.level.chunk.ChunkAccess lambda$updateChunkToSave$3(net.minecraft.world.level.chunk.ChunkAccess,com.mojang.datafixers.util.Either) -> a
-    296:296:net.minecraft.world.level.chunk.ChunkAccess lambda$null$2(net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure) -> a
-    296:296:net.minecraft.world.level.chunk.ChunkAccess lambda$null$1(net.minecraft.world.level.chunk.ChunkAccess) -> a
-    271:271:void lambda$broadcast$0(net.minecraft.network.protocol.Packet,net.minecraft.server.level.ServerPlayer) -> a
+    int blockChangedLightSectionFilter -> s
+    int skyChangedLightSectionFilter -> t
+    net.minecraft.world.level.lighting.LevelLightEngine lightEngine -> u
+    net.minecraft.server.level.ChunkHolder$LevelChangeListener onLevelChange -> v
+    net.minecraft.server.level.ChunkHolder$PlayerProvider playerProvider -> w
+    boolean wasAccessibleSinceLastSave -> x
+    47:80:void <init>(net.minecraft.world.level.ChunkPos,int,net.minecraft.world.level.lighting.LevelLightEngine,net.minecraft.server.level.ChunkHolder$LevelChangeListener,net.minecraft.server.level.ChunkHolder$PlayerProvider) -> <init>
+    83:84:java.util.concurrent.CompletableFuture getFutureIfPresentUnchecked(net.minecraft.world.level.chunk.ChunkStatus) -> a
+    88:91:java.util.concurrent.CompletableFuture getFutureIfPresent(net.minecraft.world.level.chunk.ChunkStatus) -> b
+    98:98:java.util.concurrent.CompletableFuture getTickingChunkFuture() -> a
+    105:105:java.util.concurrent.CompletableFuture getEntityTickingChunkFuture() -> b
+    112:112:java.util.concurrent.CompletableFuture getFullChunkFuture() -> c
+    120:125:net.minecraft.world.level.chunk.LevelChunk getTickingChunk() -> d
+    133:140:net.minecraft.world.level.chunk.ChunkStatus getLastAvailableStatus() -> e
+    149:160:net.minecraft.world.level.chunk.ChunkAccess getLastAvailable() -> f
+    164:164:java.util.concurrent.CompletableFuture getChunkToSave() -> g
+    170:188:void blockChanged(int,int,int) -> a
+    191:202:void sectionLightChanged(net.minecraft.world.level.LightLayer,int) -> a
+    205:245:void broadcastChanges(net.minecraft.world.level.chunk.LevelChunk) -> a
+    248:255:void broadcastBlockEntity(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    258:259:void broadcast(net.minecraft.network.protocol.Packet,boolean) -> a
+    265:279:java.util.concurrent.CompletableFuture getOrScheduleFuture(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ChunkMap) -> a
+    283:284:void updateChunkToSave(java.util.concurrent.CompletableFuture) -> a
+    287:287:net.minecraft.server.level.ChunkHolder$FullChunkStatus getFullStatus() -> h
+    291:291:net.minecraft.world.level.ChunkPos getPos() -> i
+    295:295:int getTicketLevel() -> j
+    299:299:int getQueueLevel() -> k
+    303:304:void setQueueLevel(int) -> d
+    307:308:void setTicketLevel(int) -> a
+    311:381:void updateFutures(net.minecraft.server.level.ChunkMap) -> a
+    384:387:net.minecraft.world.level.chunk.ChunkStatus getStatus(int) -> b
+    391:391:net.minecraft.server.level.ChunkHolder$FullChunkStatus getFullChunkStatus(int) -> c
+    395:395:boolean wasAccessibleSinceLastSave() -> l
+    399:400:void refreshAccessibility() -> m
+    403:415:void replaceProtoChunk(net.minecraft.world.level.chunk.ImposterProtoChunk) -> a
+    349:349:com.mojang.datafixers.util.Either lambda$updateFutures$4(net.minecraft.server.level.ChunkMap,com.mojang.datafixers.util.Either) -> a
+    283:283:net.minecraft.world.level.chunk.ChunkAccess lambda$updateChunkToSave$3(net.minecraft.world.level.chunk.ChunkAccess,com.mojang.datafixers.util.Either) -> a
+    283:283:net.minecraft.world.level.chunk.ChunkAccess lambda$null$2(net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure) -> a
+    283:283:net.minecraft.world.level.chunk.ChunkAccess lambda$null$1(net.minecraft.world.level.chunk.ChunkAccess) -> a
+    258:258:void lambda$broadcast$0(net.minecraft.network.protocol.Packet,net.minecraft.server.level.ServerPlayer) -> a
     33:33:net.minecraft.world.level.ChunkPos access$000(net.minecraft.server.level.ChunkHolder) -> a
     34:41:void <clinit>() -> <clinit>
-net.minecraft.server.level.ChunkHolder$1 -> wo$1:
+net.minecraft.server.level.ChunkHolder$1 -> yo$1:
     net.minecraft.server.level.ChunkHolder this$0 -> a
-    334:334:void <init>(net.minecraft.server.level.ChunkHolder) -> <init>
-    337:337:java.lang.String toString() -> toString
-net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure -> wo$a:
+    321:321:void <init>(net.minecraft.server.level.ChunkHolder) -> <init>
+    324:324:java.lang.String toString() -> toString
+net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure -> yo$a:
     net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure UNLOADED -> b
-    443:443:void <clinit>() -> <clinit>
-net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure$1 -> wo$a$1:
-    443:443:void <init>() -> <init>
-    446:446:java.lang.String toString() -> toString
-net.minecraft.server.level.ChunkHolder$FullChunkStatus -> wo$b:
+    430:430:void <clinit>() -> <clinit>
+net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure$1 -> yo$a$1:
+    430:430:void <init>() -> <init>
+    433:433:java.lang.String toString() -> toString
+net.minecraft.server.level.ChunkHolder$FullChunkStatus -> yo$b:
     net.minecraft.server.level.ChunkHolder$FullChunkStatus INACCESSIBLE -> a
     net.minecraft.server.level.ChunkHolder$FullChunkStatus BORDER -> b
     net.minecraft.server.level.ChunkHolder$FullChunkStatus TICKING -> c
     net.minecraft.server.level.ChunkHolder$FullChunkStatus ENTITY_TICKING -> d
     net.minecraft.server.level.ChunkHolder$FullChunkStatus[] $VALUES -> e
-    430:430:net.minecraft.server.level.ChunkHolder$FullChunkStatus[] values() -> values
-    430:430:net.minecraft.server.level.ChunkHolder$FullChunkStatus valueOf(java.lang.String) -> valueOf
-    430:430:void <init>(java.lang.String,int) -> <init>
-    438:438:boolean isOrAfter(net.minecraft.server.level.ChunkHolder$FullChunkStatus) -> a
-    430:434:void <clinit>() -> <clinit>
-net.minecraft.server.level.ChunkHolder$LevelChangeListener -> wo$c:
+    417:417:net.minecraft.server.level.ChunkHolder$FullChunkStatus[] values() -> values
+    417:417:net.minecraft.server.level.ChunkHolder$FullChunkStatus valueOf(java.lang.String) -> valueOf
+    417:417:void <init>(java.lang.String,int) -> <init>
+    425:425:boolean isOrAfter(net.minecraft.server.level.ChunkHolder$FullChunkStatus) -> a
+    417:421:void <clinit>() -> <clinit>
+net.minecraft.server.level.ChunkHolder$LevelChangeListener -> yo$c:
     void onLevelChange(net.minecraft.world.level.ChunkPos,java.util.function.IntSupplier,int,java.util.function.IntConsumer) -> a
-net.minecraft.server.level.ChunkHolder$PlayerProvider -> wo$d:
+net.minecraft.server.level.ChunkHolder$PlayerProvider -> yo$d:
     java.util.stream.Stream getPlayers(net.minecraft.world.level.ChunkPos,boolean) -> a
-net.minecraft.server.level.ChunkMap -> wp:
+net.minecraft.server.level.ChunkMap -> yp:
     org.apache.logging.log4j.Logger LOGGER -> c
     int MAX_CHUNK_DISTANCE -> a
     it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap updatingChunkMap -> d
@@ -29850,155 +32064,160 @@ net.minecraft.server.level.ChunkMap -> wp:
     java.io.File storageFolder -> w
     net.minecraft.server.level.PlayerMap playerMap -> x
     it.unimi.dsi.fastutil.ints.Int2ObjectMap entityMap -> y
-    java.util.Queue unloadQueue -> z
-    int viewDistance -> A
-    105:169:void <init>(net.minecraft.server.level.ServerLevel,java.io.File,com.mojang.datafixers.DataFixer,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,java.util.concurrent.Executor,net.minecraft.util.thread.BlockableEventLoop,net.minecraft.world.level.chunk.LightChunkGetter,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.server.level.progress.ChunkProgressListener,java.util.function.Supplier,int) -> <init>
-    172:178:double euclideanDistanceSquared(net.minecraft.world.level.ChunkPos,net.minecraft.world.entity.Entity) -> a
-    184:192:int checkerboardDistance(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ServerPlayer,boolean) -> b
-    196:196:int checkerboardDistance(net.minecraft.world.level.ChunkPos,net.minecraft.world.entity.Entity) -> b
-    200:203:int checkerboardDistance(net.minecraft.world.level.ChunkPos,int,int) -> a
-    207:207:net.minecraft.server.level.ThreadedLevelLightEngine getLightEngine() -> a
-    212:212:net.minecraft.server.level.ChunkHolder getUpdatingChunkIfPresent(long) -> a
-    217:217:net.minecraft.server.level.ChunkHolder getVisibleChunkIfPresent(long) -> b
-    221:221:java.util.function.IntSupplier getChunkQueueLevel(long) -> c
-    231:246:java.lang.String getChunkDebugData(net.minecraft.world.level.ChunkPos) -> a
-    250:274:java.util.concurrent.CompletableFuture getChunkRangeFuture(net.minecraft.world.level.ChunkPos,int,java.util.function.IntFunction) -> a
-    296:296:java.util.concurrent.CompletableFuture getEntityTickingRangeFuture(net.minecraft.world.level.ChunkPos) -> b
-    301:330:net.minecraft.server.level.ChunkHolder updateChunkScheduling(long,int,net.minecraft.server.level.ChunkHolder,int) -> a
-    336:341:void close() -> close
-    345:385:void saveAllChunks(boolean) -> a
-    388:396:void tick(java.util.function.BooleanSupplier) -> a
-    399:418:void processUnloads(java.util.function.BooleanSupplier) -> b
-    421:450:void scheduleUnload(long,net.minecraft.server.level.ChunkHolder) -> a
-    453:459:boolean promoteChunkMap() -> b
-    467:474:java.util.concurrent.CompletableFuture schedule(net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus) -> a
-    506:506:java.util.concurrent.CompletableFuture scheduleChunkLoad(net.minecraft.world.level.ChunkPos) -> f
-    539:543:java.util.concurrent.CompletableFuture scheduleChunkGeneration(net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus) -> b
-    571:572:void releaseLightTicket(net.minecraft.world.level.ChunkPos) -> c
-    576:581:net.minecraft.world.level.chunk.ChunkStatus getDependencyStatus(net.minecraft.world.level.chunk.ChunkStatus,int) -> a
-    585:586:java.util.concurrent.CompletableFuture protoChunkToFullChunk(net.minecraft.server.level.ChunkHolder) -> c
-    636:653:java.util.concurrent.CompletableFuture postProcess(net.minecraft.server.level.ChunkHolder) -> a
-    657:658:java.util.concurrent.CompletableFuture unpackTicks(net.minecraft.server.level.ChunkHolder) -> b
-    667:667:int getTickingGenerated() -> c
-    671:711:boolean save(net.minecraft.world.level.chunk.ChunkAccess) -> a
-    715:731:void setViewDistance(int) -> a
-    736:752:void updateChunkTracking(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.ChunkPos,net.minecraft.network.protocol.Packet[],boolean,boolean) -> a
-    755:755:int size() -> d
-    759:759:net.minecraft.server.level.ChunkMap$DistanceManager getDistanceManager() -> e
-    763:763:java.lang.Iterable getChunks() -> f
-    767:804:void dumpChunks(java.io.Writer) -> a
-    808:817:java.lang.String printFuture(java.util.concurrent.CompletableFuture) -> a
-    823:828:net.minecraft.nbt.CompoundTag readChunk(net.minecraft.world.level.ChunkPos) -> g
-    832:838:boolean noPlayersCloseForSpawning(net.minecraft.world.level.ChunkPos) -> d
-    842:842:boolean skipPlayer(net.minecraft.server.level.ServerPlayer) -> b
-    846:870:void updatePlayerStatus(net.minecraft.server.level.ServerPlayer,boolean) -> a
-    873:876:net.minecraft.core.SectionPos updatePlayerPos(net.minecraft.server.level.ServerPlayer) -> c
-    880:959:void move(net.minecraft.server.level.ServerPlayer) -> a
-    963:963:java.util.stream.Stream getPlayers(net.minecraft.world.level.ChunkPos,boolean) -> a
-    974:1000:void addEntity(net.minecraft.world.entity.Entity) -> a
-    1003:1014:void removeEntity(net.minecraft.world.entity.Entity) -> b
-    1019:1042:void tick() -> g
-    1045:1049:void broadcast(net.minecraft.world.entity.Entity,net.minecraft.network.protocol.Packet) -> a
-    1052:1056:void broadcastAndSend(net.minecraft.world.entity.Entity,net.minecraft.network.protocol.Packet) -> b
-    1059:1099:void playerLoadedChunk(net.minecraft.server.level.ServerPlayer,net.minecraft.network.protocol.Packet[],net.minecraft.world.level.chunk.LevelChunk) -> a
-    1102:1102:net.minecraft.world.entity.ai.village.poi.PoiManager getPoiManager() -> h
-    1106:1106:java.util.concurrent.CompletableFuture packTicks(net.minecraft.world.level.chunk.LevelChunk) -> a
-    1106:1106:void lambda$packTicks$47(net.minecraft.world.level.chunk.LevelChunk) -> b
-    964:968:boolean lambda$getPlayers$46(net.minecraft.world.level.ChunkPos,boolean,net.minecraft.server.level.ServerPlayer) -> a
-    838:838:boolean lambda$noPlayersCloseForSpawning$45(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ServerPlayer) -> a
-    810:810:java.lang.String lambda$printFuture$44(net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure) -> a
-    810:810:java.lang.String lambda$printFuture$43(net.minecraft.world.level.chunk.LevelChunk) -> c
-    801:801:java.lang.Integer lambda$dumpChunks$42(net.minecraft.world.level.chunk.LevelChunk) -> d
-    800:800:java.lang.Integer lambda$dumpChunks$41(net.minecraft.world.level.chunk.LevelChunk) -> e
-    787:787:java.util.Optional lambda$dumpChunks$40(net.minecraft.world.level.chunk.ChunkAccess) -> b
-    724:728:void lambda$setViewDistance$39(net.minecraft.world.level.ChunkPos,int,net.minecraft.network.protocol.Packet[],net.minecraft.server.level.ServerPlayer) -> a
-    663:663:void lambda$unpackTicks$38(net.minecraft.server.level.ChunkHolder,java.lang.Runnable) -> a
-    658:658:com.mojang.datafixers.util.Either lambda$unpackTicks$37(com.mojang.datafixers.util.Either) -> a
-    659:661:net.minecraft.world.level.chunk.LevelChunk lambda$null$36(net.minecraft.world.level.chunk.ChunkAccess) -> c
-    652:652:void lambda$postProcess$35(net.minecraft.server.level.ChunkHolder,java.lang.Runnable) -> b
-    645:645:void lambda$postProcess$34(net.minecraft.world.level.ChunkPos,com.mojang.datafixers.util.Either) -> a
-    646:651:com.mojang.datafixers.util.Either lambda$null$33(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.LevelChunk) -> a
-    649:649:void lambda$null$32(net.minecraft.network.protocol.Packet[],net.minecraft.world.level.chunk.LevelChunk,net.minecraft.server.level.ServerPlayer) -> a
-    643:643:void lambda$postProcess$31(net.minecraft.server.level.ChunkHolder,java.lang.Runnable) -> c
-    639:639:com.mojang.datafixers.util.Either lambda$postProcess$30(com.mojang.datafixers.util.Either) -> b
-    640:642:com.mojang.datafixers.util.Either lambda$null$29(java.util.List) -> a
-    637:637:net.minecraft.world.level.chunk.ChunkStatus lambda$postProcess$28(int) -> b
-    632:632:void lambda$protoChunkToFullChunk$27(net.minecraft.server.level.ChunkHolder,java.lang.Runnable) -> d
-    587:592:com.mojang.datafixers.util.Either lambda$protoChunkToFullChunk$26(net.minecraft.server.level.ChunkHolder,com.mojang.datafixers.util.Either) -> a
-    593:630:net.minecraft.world.level.chunk.ChunkAccess lambda$null$25(net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    602:602:net.minecraft.server.level.ChunkHolder$FullChunkStatus lambda$null$24(net.minecraft.server.level.ChunkHolder) -> d
-    571:571:java.lang.String lambda$releaseLightTicket$23(net.minecraft.world.level.ChunkPos) -> h
-    571:571:void lambda$releaseLightTicket$22(net.minecraft.world.level.ChunkPos) -> i
-    567:567:void lambda$scheduleChunkGeneration$21(net.minecraft.server.level.ChunkHolder,java.lang.Runnable) -> e
-    543:543:java.util.concurrent.CompletionStage lambda$scheduleChunkGeneration$20(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus,com.mojang.datafixers.util.Either) -> a
-    564:565:java.util.concurrent.CompletableFuture lambda$null$19(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure) -> a
-    549:560:java.util.concurrent.CompletableFuture lambda$null$18(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus,java.util.List) -> a
-    549:549:java.util.concurrent.CompletableFuture lambda$null$17(net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkAccess) -> b
-    542:542:java.lang.String lambda$scheduleChunkGeneration$16(net.minecraft.world.level.chunk.ChunkStatus) -> a
-    541:541:net.minecraft.world.level.chunk.ChunkStatus lambda$scheduleChunkGeneration$15(net.minecraft.world.level.chunk.ChunkStatus,int) -> b
-    510:534:com.mojang.datafixers.util.Either lambda$scheduleChunkLoad$14(net.minecraft.world.level.ChunkPos) -> j
-    475:501:java.util.concurrent.CompletionStage lambda$schedule$13(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder,com.mojang.datafixers.util.Either) -> a
-    494:494:java.util.concurrent.CompletableFuture lambda$null$12(net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkAccess) -> c
-    446:449:void lambda$scheduleUnload$11(net.minecraft.server.level.ChunkHolder,java.lang.Void,java.lang.Throwable) -> a
-    423:445:void lambda$scheduleUnload$10(net.minecraft.server.level.ChunkHolder,java.util.concurrent.CompletableFuture,long,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    378:383:void lambda$saveAllChunks$9(net.minecraft.server.level.ChunkHolder) -> e
-    369:369:boolean lambda$saveAllChunks$8() -> j
-    366:366:void lambda$saveAllChunks$7(org.apache.commons.lang3.mutable.MutableBoolean,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    364:364:boolean lambda$saveAllChunks$6(net.minecraft.world.level.chunk.ChunkAccess) -> d
-    359:362:net.minecraft.world.level.chunk.ChunkAccess lambda$saveAllChunks$5(net.minecraft.server.level.ChunkHolder) -> f
-    296:296:com.mojang.datafixers.util.Either lambda$getEntityTickingRangeFuture$4(com.mojang.datafixers.util.Either) -> c
-    296:296:net.minecraft.world.level.chunk.LevelChunk lambda$null$3(java.util.List) -> b
-    296:296:net.minecraft.world.level.chunk.ChunkStatus lambda$getEntityTickingRangeFuture$2(int) -> c
-    275:291:com.mojang.datafixers.util.Either lambda$getChunkRangeFuture$1(int,int,int,java.util.List) -> a
-    222:226:int lambda$getChunkQueueLevel$0(long) -> d
-    91:91:it.unimi.dsi.fastutil.longs.LongSet access$300(net.minecraft.server.level.ChunkMap) -> a
-    91:91:net.minecraft.server.level.ChunkHolder access$400(net.minecraft.server.level.ChunkMap,long,int,net.minecraft.server.level.ChunkHolder,int) -> a
-    91:91:net.minecraft.server.level.ServerLevel access$500(net.minecraft.server.level.ChunkMap) -> b
-    91:91:int access$600(net.minecraft.server.level.ChunkMap) -> c
-    91:91:int access$700(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ServerPlayer,boolean) -> a
-    92:98:void <clinit>() -> <clinit>
-net.minecraft.server.level.ChunkMap$1 -> wp$1:
+    it.unimi.dsi.fastutil.longs.Long2ByteMap chunkTypeCache -> z
+    java.util.Queue unloadQueue -> A
+    int viewDistance -> B
+    111:177:void <init>(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,com.mojang.datafixers.DataFixer,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,java.util.concurrent.Executor,net.minecraft.util.thread.BlockableEventLoop,net.minecraft.world.level.chunk.LightChunkGetter,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.server.level.progress.ChunkProgressListener,java.util.function.Supplier,int,boolean) -> <init>
+    180:186:double euclideanDistanceSquared(net.minecraft.world.level.ChunkPos,net.minecraft.world.entity.Entity) -> a
+    192:200:int checkerboardDistance(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ServerPlayer,boolean) -> b
+    204:204:int checkerboardDistance(net.minecraft.world.level.ChunkPos,net.minecraft.world.entity.Entity) -> b
+    208:211:int checkerboardDistance(net.minecraft.world.level.ChunkPos,int,int) -> a
+    215:215:net.minecraft.server.level.ThreadedLevelLightEngine getLightEngine() -> a
+    220:220:net.minecraft.server.level.ChunkHolder getUpdatingChunkIfPresent(long) -> a
+    225:225:net.minecraft.server.level.ChunkHolder getVisibleChunkIfPresent(long) -> b
+    229:229:java.util.function.IntSupplier getChunkQueueLevel(long) -> c
+    239:254:java.lang.String getChunkDebugData(net.minecraft.world.level.ChunkPos) -> a
+    258:282:java.util.concurrent.CompletableFuture getChunkRangeFuture(net.minecraft.world.level.ChunkPos,int,java.util.function.IntFunction) -> a
+    304:304:java.util.concurrent.CompletableFuture getEntityTickingRangeFuture(net.minecraft.world.level.ChunkPos) -> b
+    309:338:net.minecraft.server.level.ChunkHolder updateChunkScheduling(long,int,net.minecraft.server.level.ChunkHolder,int) -> a
+    344:349:void close() -> close
+    353:393:void saveAllChunks(boolean) -> a
+    396:404:void tick(java.util.function.BooleanSupplier) -> a
+    407:426:void processUnloads(java.util.function.BooleanSupplier) -> b
+    429:458:void scheduleUnload(long,net.minecraft.server.level.ChunkHolder) -> a
+    461:467:boolean promoteChunkMap() -> b
+    475:482:java.util.concurrent.CompletableFuture schedule(net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus) -> a
+    514:514:java.util.concurrent.CompletableFuture scheduleChunkLoad(net.minecraft.world.level.ChunkPos) -> f
+    550:551:void markPositionReplaceable(net.minecraft.world.level.ChunkPos) -> g
+    554:554:byte markPosition(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.ChunkStatus$ChunkType) -> a
+    558:562:java.util.concurrent.CompletableFuture scheduleChunkGeneration(net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus) -> b
+    590:591:void releaseLightTicket(net.minecraft.world.level.ChunkPos) -> c
+    595:600:net.minecraft.world.level.chunk.ChunkStatus getDependencyStatus(net.minecraft.world.level.chunk.ChunkStatus,int) -> a
+    604:605:java.util.concurrent.CompletableFuture protoChunkToFullChunk(net.minecraft.server.level.ChunkHolder) -> c
+    655:672:java.util.concurrent.CompletableFuture postProcess(net.minecraft.server.level.ChunkHolder) -> a
+    676:677:java.util.concurrent.CompletableFuture unpackTicks(net.minecraft.server.level.ChunkHolder) -> b
+    686:686:int getTickingGenerated() -> c
+    690:723:boolean save(net.minecraft.world.level.chunk.ChunkAccess) -> a
+    727:746:boolean isExistingChunkFull(net.minecraft.world.level.ChunkPos) -> h
+    750:766:void setViewDistance(int) -> a
+    771:787:void updateChunkTracking(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.ChunkPos,net.minecraft.network.protocol.Packet[],boolean,boolean) -> a
+    790:790:int size() -> d
+    794:794:net.minecraft.server.level.ChunkMap$DistanceManager getDistanceManager() -> e
+    798:798:java.lang.Iterable getChunks() -> f
+    802:839:void dumpChunks(java.io.Writer) -> a
+    843:852:java.lang.String printFuture(java.util.concurrent.CompletableFuture) -> a
+    858:863:net.minecraft.nbt.CompoundTag readChunk(net.minecraft.world.level.ChunkPos) -> i
+    867:873:boolean noPlayersCloseForSpawning(net.minecraft.world.level.ChunkPos) -> d
+    877:877:boolean skipPlayer(net.minecraft.server.level.ServerPlayer) -> b
+    881:905:void updatePlayerStatus(net.minecraft.server.level.ServerPlayer,boolean) -> a
+    908:911:net.minecraft.core.SectionPos updatePlayerPos(net.minecraft.server.level.ServerPlayer) -> c
+    915:994:void move(net.minecraft.server.level.ServerPlayer) -> a
+    998:998:java.util.stream.Stream getPlayers(net.minecraft.world.level.ChunkPos,boolean) -> a
+    1009:1031:void addEntity(net.minecraft.world.entity.Entity) -> a
+    1034:1045:void removeEntity(net.minecraft.world.entity.Entity) -> b
+    1050:1073:void tick() -> g
+    1076:1080:void broadcast(net.minecraft.world.entity.Entity,net.minecraft.network.protocol.Packet) -> a
+    1083:1087:void broadcastAndSend(net.minecraft.world.entity.Entity,net.minecraft.network.protocol.Packet) -> b
+    1090:1130:void playerLoadedChunk(net.minecraft.server.level.ServerPlayer,net.minecraft.network.protocol.Packet[],net.minecraft.world.level.chunk.LevelChunk) -> a
+    1133:1133:net.minecraft.world.entity.ai.village.poi.PoiManager getPoiManager() -> h
+    1137:1137:java.util.concurrent.CompletableFuture packTicks(net.minecraft.world.level.chunk.LevelChunk) -> a
+    1137:1137:void lambda$packTicks$47(net.minecraft.world.level.chunk.LevelChunk) -> b
+    999:1003:boolean lambda$getPlayers$46(net.minecraft.world.level.ChunkPos,boolean,net.minecraft.server.level.ServerPlayer) -> a
+    873:873:boolean lambda$noPlayersCloseForSpawning$45(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ServerPlayer) -> a
+    845:845:java.lang.String lambda$printFuture$44(net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure) -> a
+    845:845:java.lang.String lambda$printFuture$43(net.minecraft.world.level.chunk.LevelChunk) -> c
+    836:836:java.lang.Integer lambda$dumpChunks$42(net.minecraft.world.level.chunk.LevelChunk) -> d
+    835:835:java.lang.Integer lambda$dumpChunks$41(net.minecraft.world.level.chunk.LevelChunk) -> e
+    822:822:java.util.Optional lambda$dumpChunks$40(net.minecraft.world.level.chunk.ChunkAccess) -> b
+    759:763:void lambda$setViewDistance$39(net.minecraft.world.level.ChunkPos,int,net.minecraft.network.protocol.Packet[],net.minecraft.server.level.ServerPlayer) -> a
+    682:682:void lambda$unpackTicks$38(net.minecraft.server.level.ChunkHolder,java.lang.Runnable) -> a
+    677:677:com.mojang.datafixers.util.Either lambda$unpackTicks$37(com.mojang.datafixers.util.Either) -> a
+    678:680:net.minecraft.world.level.chunk.LevelChunk lambda$null$36(net.minecraft.world.level.chunk.ChunkAccess) -> c
+    671:671:void lambda$postProcess$35(net.minecraft.server.level.ChunkHolder,java.lang.Runnable) -> b
+    664:664:void lambda$postProcess$34(net.minecraft.world.level.ChunkPos,com.mojang.datafixers.util.Either) -> a
+    665:670:com.mojang.datafixers.util.Either lambda$null$33(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.LevelChunk) -> a
+    668:668:void lambda$null$32(net.minecraft.network.protocol.Packet[],net.minecraft.world.level.chunk.LevelChunk,net.minecraft.server.level.ServerPlayer) -> a
+    662:662:void lambda$postProcess$31(net.minecraft.server.level.ChunkHolder,java.lang.Runnable) -> c
+    658:658:com.mojang.datafixers.util.Either lambda$postProcess$30(com.mojang.datafixers.util.Either) -> b
+    659:661:com.mojang.datafixers.util.Either lambda$null$29(java.util.List) -> a
+    656:656:net.minecraft.world.level.chunk.ChunkStatus lambda$postProcess$28(int) -> b
+    651:651:void lambda$protoChunkToFullChunk$27(net.minecraft.server.level.ChunkHolder,java.lang.Runnable) -> d
+    606:611:com.mojang.datafixers.util.Either lambda$protoChunkToFullChunk$26(net.minecraft.server.level.ChunkHolder,com.mojang.datafixers.util.Either) -> a
+    612:649:net.minecraft.world.level.chunk.ChunkAccess lambda$null$25(net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    621:621:net.minecraft.server.level.ChunkHolder$FullChunkStatus lambda$null$24(net.minecraft.server.level.ChunkHolder) -> d
+    590:590:java.lang.String lambda$releaseLightTicket$23(net.minecraft.world.level.ChunkPos) -> j
+    590:590:void lambda$releaseLightTicket$22(net.minecraft.world.level.ChunkPos) -> k
+    586:586:void lambda$scheduleChunkGeneration$21(net.minecraft.server.level.ChunkHolder,java.lang.Runnable) -> e
+    562:562:java.util.concurrent.CompletionStage lambda$scheduleChunkGeneration$20(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus,com.mojang.datafixers.util.Either) -> a
+    583:584:java.util.concurrent.CompletableFuture lambda$null$19(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure) -> a
+    568:579:java.util.concurrent.CompletableFuture lambda$null$18(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus,java.util.List) -> a
+    568:568:java.util.concurrent.CompletableFuture lambda$null$17(net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkAccess) -> b
+    561:561:java.lang.String lambda$scheduleChunkGeneration$16(net.minecraft.world.level.chunk.ChunkStatus) -> a
+    560:560:net.minecraft.world.level.chunk.ChunkStatus lambda$scheduleChunkGeneration$15(net.minecraft.world.level.chunk.ChunkStatus,int) -> b
+    518:545:com.mojang.datafixers.util.Either lambda$scheduleChunkLoad$14(net.minecraft.world.level.ChunkPos) -> l
+    483:509:java.util.concurrent.CompletionStage lambda$schedule$13(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder,com.mojang.datafixers.util.Either) -> a
+    502:502:java.util.concurrent.CompletableFuture lambda$null$12(net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkAccess) -> c
+    454:457:void lambda$scheduleUnload$11(net.minecraft.server.level.ChunkHolder,java.lang.Void,java.lang.Throwable) -> a
+    431:453:void lambda$scheduleUnload$10(net.minecraft.server.level.ChunkHolder,java.util.concurrent.CompletableFuture,long,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    386:391:void lambda$saveAllChunks$9(net.minecraft.server.level.ChunkHolder) -> e
+    377:377:boolean lambda$saveAllChunks$8() -> j
+    374:374:void lambda$saveAllChunks$7(org.apache.commons.lang3.mutable.MutableBoolean,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    372:372:boolean lambda$saveAllChunks$6(net.minecraft.world.level.chunk.ChunkAccess) -> d
+    367:370:net.minecraft.world.level.chunk.ChunkAccess lambda$saveAllChunks$5(net.minecraft.server.level.ChunkHolder) -> f
+    304:304:com.mojang.datafixers.util.Either lambda$getEntityTickingRangeFuture$4(com.mojang.datafixers.util.Either) -> c
+    304:304:net.minecraft.world.level.chunk.LevelChunk lambda$null$3(java.util.List) -> b
+    304:304:net.minecraft.world.level.chunk.ChunkStatus lambda$getEntityTickingRangeFuture$2(int) -> c
+    283:299:com.mojang.datafixers.util.Either lambda$getChunkRangeFuture$1(int,int,int,java.util.List) -> a
+    230:234:int lambda$getChunkQueueLevel$0(long) -> d
+    93:93:it.unimi.dsi.fastutil.longs.LongSet access$300(net.minecraft.server.level.ChunkMap) -> a
+    93:93:net.minecraft.server.level.ChunkHolder access$400(net.minecraft.server.level.ChunkMap,long,int,net.minecraft.server.level.ChunkHolder,int) -> a
+    93:93:net.minecraft.server.level.ServerLevel access$500(net.minecraft.server.level.ChunkMap) -> b
+    93:93:int access$600(net.minecraft.server.level.ChunkMap) -> c
+    93:93:int access$700(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ServerPlayer,boolean) -> a
+    98:104:void <clinit>() -> <clinit>
+net.minecraft.server.level.ChunkMap$1 -> yp$1:
     net.minecraft.world.level.ChunkPos val$k -> a
     net.minecraft.server.level.ChunkMap this$0 -> c
-    261:261:void <init>(net.minecraft.server.level.ChunkMap,net.minecraft.world.level.ChunkPos) -> <init>
-    264:264:java.lang.String toString() -> toString
-net.minecraft.server.level.ChunkMap$2 -> wp$2:
+    269:269:void <init>(net.minecraft.server.level.ChunkMap,net.minecraft.world.level.ChunkPos) -> <init>
+    272:272:java.lang.String toString() -> toString
+net.minecraft.server.level.ChunkMap$2 -> yp$2:
     int val$startX -> a
     int val$finalI -> c
     int val$range -> d
     int val$startZ -> e
     com.mojang.datafixers.util.Either val$either -> f
     net.minecraft.server.level.ChunkMap this$0 -> g
-    281:281:void <init>(net.minecraft.server.level.ChunkMap,int,int,int,int,com.mojang.datafixers.util.Either) -> <init>
-    284:284:java.lang.String toString() -> toString
-net.minecraft.server.level.ChunkMap$DistanceManager -> wp$a:
+    289:289:void <init>(net.minecraft.server.level.ChunkMap,int,int,int,int,com.mojang.datafixers.util.Either) -> <init>
+    292:292:java.lang.String toString() -> toString
+net.minecraft.server.level.ChunkMap$DistanceManager -> yp$a:
     net.minecraft.server.level.ChunkMap this$0 -> a
-    1110:1112:void <init>(net.minecraft.server.level.ChunkMap,java.util.concurrent.Executor,java.util.concurrent.Executor) -> <init>
-    1116:1116:boolean isChunkToRemove(long) -> a
-    1122:1122:net.minecraft.server.level.ChunkHolder getChunk(long) -> b
-    1128:1128:net.minecraft.server.level.ChunkHolder updateChunkScheduling(long,int,net.minecraft.server.level.ChunkHolder,int) -> a
-net.minecraft.server.level.ChunkMap$TrackedEntity -> wp$b:
+    1141:1143:void <init>(net.minecraft.server.level.ChunkMap,java.util.concurrent.Executor,java.util.concurrent.Executor) -> <init>
+    1147:1147:boolean isChunkToRemove(long) -> a
+    1153:1153:net.minecraft.server.level.ChunkHolder getChunk(long) -> b
+    1159:1159:net.minecraft.server.level.ChunkHolder updateChunkScheduling(long,int,net.minecraft.server.level.ChunkHolder,int) -> a
+net.minecraft.server.level.ChunkMap$TrackedEntity -> yp$b:
     net.minecraft.server.level.ServerEntity serverEntity -> b
     net.minecraft.world.entity.Entity entity -> c
     int range -> d
     net.minecraft.core.SectionPos lastSectionPos -> e
     java.util.Set seenBy -> f
     net.minecraft.server.level.ChunkMap this$0 -> a
-    1140:1147:void <init>(net.minecraft.server.level.ChunkMap,net.minecraft.world.entity.Entity,int,int,boolean) -> <init>
-    1151:1155:boolean equals(java.lang.Object) -> equals
-    1160:1160:int hashCode() -> hashCode
-    1164:1167:void broadcast(net.minecraft.network.protocol.Packet) -> a
-    1170:1174:void broadcastAndSend(net.minecraft.network.protocol.Packet) -> b
-    1177:1180:void broadcastRemoved() -> a
-    1183:1186:void removePlayer(net.minecraft.server.level.ServerPlayer) -> a
-    1189:1214:void updatePlayer(net.minecraft.server.level.ServerPlayer) -> b
-    1217:1225:int getEffectiveRange() -> b
-    1229:1232:void updatePlayers(java.util.List) -> a
-    1132:1132:net.minecraft.world.entity.Entity access$000(net.minecraft.server.level.ChunkMap$TrackedEntity) -> a
-    1132:1132:net.minecraft.core.SectionPos access$100(net.minecraft.server.level.ChunkMap$TrackedEntity) -> b
-    1132:1132:net.minecraft.core.SectionPos access$102(net.minecraft.server.level.ChunkMap$TrackedEntity,net.minecraft.core.SectionPos) -> a
-    1132:1132:net.minecraft.server.level.ServerEntity access$200(net.minecraft.server.level.ChunkMap$TrackedEntity) -> c
-net.minecraft.server.level.ChunkTaskPriorityQueue -> wq:
+    1171:1178:void <init>(net.minecraft.server.level.ChunkMap,net.minecraft.world.entity.Entity,int,int,boolean) -> <init>
+    1182:1186:boolean equals(java.lang.Object) -> equals
+    1191:1191:int hashCode() -> hashCode
+    1195:1198:void broadcast(net.minecraft.network.protocol.Packet) -> a
+    1201:1205:void broadcastAndSend(net.minecraft.network.protocol.Packet) -> b
+    1208:1211:void broadcastRemoved() -> a
+    1214:1217:void removePlayer(net.minecraft.server.level.ServerPlayer) -> a
+    1220:1245:void updatePlayer(net.minecraft.server.level.ServerPlayer) -> b
+    1248:1248:int scaledRange(int) -> a
+    1252:1260:int getEffectiveRange() -> b
+    1264:1267:void updatePlayers(java.util.List) -> a
+    1163:1163:net.minecraft.world.entity.Entity access$000(net.minecraft.server.level.ChunkMap$TrackedEntity) -> a
+    1163:1163:net.minecraft.core.SectionPos access$100(net.minecraft.server.level.ChunkMap$TrackedEntity) -> b
+    1163:1163:net.minecraft.core.SectionPos access$102(net.minecraft.server.level.ChunkMap$TrackedEntity,net.minecraft.core.SectionPos) -> a
+    1163:1163:net.minecraft.server.level.ServerEntity access$200(net.minecraft.server.level.ChunkMap$TrackedEntity) -> c
+net.minecraft.server.level.ChunkTaskPriorityQueue -> yq:
     int PRIORITY_LEVEL_COUNT -> a
     java.util.List taskQueue -> b
     int firstQueue -> c
@@ -30021,7 +32240,7 @@ net.minecraft.server.level.ChunkTaskPriorityQueue -> wq:
     45:45:java.util.List lambda$resortChunkTasks$1(long) -> e
     20:20:it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap lambda$new$0(int) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.server.level.ChunkTaskPriorityQueueSorter -> wr:
+net.minecraft.server.level.ChunkTaskPriorityQueueSorter -> yr:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Map queues -> b
     java.util.Set sleeping -> c
@@ -30061,8 +32280,8 @@ net.minecraft.server.level.ChunkTaskPriorityQueueSorter -> wr:
     58:60:void lambda$null$1(java.lang.Runnable,net.minecraft.util.thread.ProcessorHandle) -> b
     35:35:net.minecraft.server.level.ChunkTaskPriorityQueue lambda$new$0(int,net.minecraft.util.thread.ProcessorHandle) -> a
     29:29:void <clinit>() -> <clinit>
-net.minecraft.server.level.ChunkTaskPriorityQueueSorter$1 -> wr$1:
-net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Message -> wr$a:
+net.minecraft.server.level.ChunkTaskPriorityQueueSorter$1 -> yr$1:
+net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Message -> yr$a:
     java.util.function.Function task -> a
     long pos -> b
     java.util.function.IntSupplier level -> c
@@ -30071,7 +32290,7 @@ net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Message -> wr$a:
     40:40:java.util.function.Function access$500(net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Message) -> a
     40:40:long access$600(net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Message) -> b
     40:40:java.util.function.IntSupplier access$700(net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Message) -> c
-net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Release -> wr$b:
+net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Release -> yr$b:
     java.lang.Runnable task -> a
     long pos -> b
     boolean clearQueue -> c
@@ -30080,7 +32299,7 @@ net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Release -> wr$b:
     71:71:long access$200(net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Release) -> a
     71:71:java.lang.Runnable access$300(net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Release) -> b
     71:71:boolean access$400(net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Release) -> c
-net.minecraft.server.level.ChunkTracker -> ws:
+net.minecraft.server.level.ChunkTracker -> ys:
     8:9:void <init>(int,int,int) -> <init>
     13:13:boolean isSource(long) -> a
     18:30:void checkNeighborsAfterUpdate(long,int,boolean) -> a
@@ -30088,7 +32307,7 @@ net.minecraft.server.level.ChunkTracker -> ws:
     60:63:int computeLevelFromNeighbor(long,long,int) -> b
     int getLevelFromSource(long) -> b
     69:70:void update(long,int,boolean) -> b
-net.minecraft.server.level.ColumnPos -> wt:
+net.minecraft.server.level.ColumnPos -> yt:
     int x -> a
     int z -> b
     16:19:void <init>(int,int) -> <init>
@@ -30099,21 +32318,18 @@ net.minecraft.server.level.ColumnPos -> wt:
     40:40:java.lang.String toString() -> toString
     45:47:int hashCode() -> hashCode
     52:61:boolean equals(java.lang.Object) -> equals
-net.minecraft.server.level.DemoMode -> wu:
+net.minecraft.server.level.DemoMode -> yu:
     boolean displayedIntro -> c
     boolean demoHasEnded -> d
     int demoEndedReminder -> e
     int gameModeTicks -> f
     26:27:void <init>(net.minecraft.server.level.ServerLevel) -> <init>
     31:68:void tick() -> a
-    71:75:void outputDemoReminder() -> e
+    71:75:void outputDemoReminder() -> f
     79:84:void handleBlockBreakAction(net.minecraft.core.BlockPos,net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action,net.minecraft.core.Direction,int) -> a
-    88:92:net.minecraft.world.InteractionResult useItem(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
-    97:101:net.minecraft.world.InteractionResult useItemOn(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-net.minecraft.server.level.DerivedServerLevel -> wv:
-    15:17:void <init>(net.minecraft.server.level.ServerLevel,net.minecraft.server.MinecraftServer,java.util.concurrent.Executor,net.minecraft.world.level.storage.LevelStorage,net.minecraft.world.level.dimension.DimensionType,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.server.level.progress.ChunkProgressListener) -> <init>
-    21:21:void tickTime() -> a
-net.minecraft.server.level.DistanceManager -> ww:
+    88:92:net.minecraft.world.InteractionResult useItem(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
+    97:101:net.minecraft.world.InteractionResult useItemOn(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+net.minecraft.server.level.DistanceManager -> yv:
     org.apache.logging.log4j.Logger LOGGER -> a
     int PLAYER_TICKET_LEVEL -> b
     it.unimi.dsi.fastutil.longs.Long2ObjectMap playersPerChunk -> c
@@ -30128,101 +32344,101 @@ net.minecraft.server.level.DistanceManager -> ww:
     it.unimi.dsi.fastutil.longs.LongSet ticketsToRelease -> l
     java.util.concurrent.Executor mainThreadExecutor -> m
     long ticketTickCounter -> n
-    48:75:void <init>(java.util.concurrent.Executor,java.util.concurrent.Executor) -> <init>
-    78:89:void purgeStaleTickets() -> a
-    92:92:int getTicketLevelAt(net.minecraft.util.SortedArraySet) -> a
+    49:76:void <init>(java.util.concurrent.Executor,java.util.concurrent.Executor) -> <init>
+    79:90:void purgeStaleTickets() -> a
+    93:93:int getTicketLevelAt(net.minecraft.util.SortedArraySet) -> a
     boolean isChunkToRemove(long) -> a
     net.minecraft.server.level.ChunkHolder getChunk(long) -> b
     net.minecraft.server.level.ChunkHolder updateChunkScheduling(long,int,net.minecraft.server.level.ChunkHolder,int) -> a
-    104:132:boolean runAllUpdates(net.minecraft.server.level.ChunkMap) -> a
-    136:147:void addTicket(long,net.minecraft.server.level.Ticket) -> a
-    150:158:void removeTicket(long,net.minecraft.server.level.Ticket) -> b
-    161:162:void addTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> a
-    165:167:void removeTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> b
-    170:171:void addRegionTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> c
-    174:176:void removeRegionTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> d
-    179:179:net.minecraft.util.SortedArraySet getTickets(long) -> e
-    183:189:void updateChunkForced(net.minecraft.world.level.ChunkPos,boolean) -> a
-    192:196:void addPlayer(net.minecraft.core.SectionPos,net.minecraft.server.level.ServerPlayer) -> a
-    199:207:void removePlayer(net.minecraft.core.SectionPos,net.minecraft.server.level.ServerPlayer) -> b
-    210:217:java.lang.String getTicketDebugString(long) -> c
-    221:222:void updatePlayerTickets(int) -> a
-    225:226:int getNaturalSpawnChunkCount() -> b
-    230:231:boolean hasPlayersNearby(long) -> d
-    235:235:java.lang.String getDebugStatus() -> c
-    240:255:void dumpTickets(java.lang.String) -> a
-    193:193:it.unimi.dsi.fastutil.objects.ObjectSet lambda$addPlayer$7(long) -> f
-    179:179:net.minecraft.util.SortedArraySet lambda$getTickets$6(long) -> g
-    127:127:void lambda$runAllUpdates$5(long,com.mojang.datafixers.util.Either) -> a
-    127:127:void lambda$null$4(long) -> h
-    127:127:void lambda$null$3() -> f
-    121:121:boolean lambda$runAllUpdates$2(net.minecraft.server.level.Ticket) -> a
-    113:113:void lambda$runAllUpdates$1(net.minecraft.server.level.ChunkMap,net.minecraft.server.level.ChunkHolder) -> a
-    82:82:boolean lambda$purgeStaleTickets$0(net.minecraft.server.level.Ticket) -> b
-    39:39:it.unimi.dsi.fastutil.longs.Long2ObjectMap access$000(net.minecraft.server.level.DistanceManager) -> a
-    39:39:org.apache.logging.log4j.Logger access$100() -> d
-    39:39:int access$200() -> e
-    39:39:net.minecraft.util.thread.ProcessorHandle access$300(net.minecraft.server.level.DistanceManager) -> b
-    39:39:net.minecraft.util.thread.ProcessorHandle access$400(net.minecraft.server.level.DistanceManager) -> c
-    39:39:net.minecraft.server.level.ChunkTaskPriorityQueueSorter access$500(net.minecraft.server.level.DistanceManager) -> d
-    39:39:java.util.concurrent.Executor access$600(net.minecraft.server.level.DistanceManager) -> e
-    39:39:void access$700(net.minecraft.server.level.DistanceManager,long,net.minecraft.server.level.Ticket) -> a
-    39:39:void access$800(net.minecraft.server.level.DistanceManager,long,net.minecraft.server.level.Ticket) -> b
-    39:39:it.unimi.dsi.fastutil.longs.LongSet access$900(net.minecraft.server.level.DistanceManager) -> f
-    39:39:it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap access$1000(net.minecraft.server.level.DistanceManager) -> g
-    39:39:java.util.Set access$1100(net.minecraft.server.level.DistanceManager) -> h
-    40:44:void <clinit>() -> <clinit>
-net.minecraft.server.level.DistanceManager$ChunkTicketTracker -> ww$a:
+    105:133:boolean runAllUpdates(net.minecraft.server.level.ChunkMap) -> a
+    137:148:void addTicket(long,net.minecraft.server.level.Ticket) -> a
+    151:159:void removeTicket(long,net.minecraft.server.level.Ticket) -> b
+    162:163:void addTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> a
+    166:168:void removeTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> b
+    171:172:void addRegionTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> c
+    175:177:void removeRegionTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> d
+    180:180:net.minecraft.util.SortedArraySet getTickets(long) -> e
+    184:190:void updateChunkForced(net.minecraft.world.level.ChunkPos,boolean) -> a
+    193:197:void addPlayer(net.minecraft.core.SectionPos,net.minecraft.server.level.ServerPlayer) -> a
+    200:208:void removePlayer(net.minecraft.core.SectionPos,net.minecraft.server.level.ServerPlayer) -> b
+    211:218:java.lang.String getTicketDebugString(long) -> c
+    222:223:void updatePlayerTickets(int) -> a
+    226:227:int getNaturalSpawnChunkCount() -> b
+    231:232:boolean hasPlayersNearby(long) -> d
+    236:236:java.lang.String getDebugStatus() -> c
+    241:256:void dumpTickets(java.lang.String) -> a
+    194:194:it.unimi.dsi.fastutil.objects.ObjectSet lambda$addPlayer$7(long) -> f
+    180:180:net.minecraft.util.SortedArraySet lambda$getTickets$6(long) -> g
+    128:128:void lambda$runAllUpdates$5(long,com.mojang.datafixers.util.Either) -> a
+    128:128:void lambda$null$4(long) -> h
+    128:128:void lambda$null$3() -> f
+    122:122:boolean lambda$runAllUpdates$2(net.minecraft.server.level.Ticket) -> a
+    114:114:void lambda$runAllUpdates$1(net.minecraft.server.level.ChunkMap,net.minecraft.server.level.ChunkHolder) -> a
+    83:83:boolean lambda$purgeStaleTickets$0(net.minecraft.server.level.Ticket) -> b
+    40:40:it.unimi.dsi.fastutil.longs.Long2ObjectMap access$000(net.minecraft.server.level.DistanceManager) -> a
+    40:40:org.apache.logging.log4j.Logger access$100() -> d
+    40:40:int access$200() -> e
+    40:40:net.minecraft.util.thread.ProcessorHandle access$300(net.minecraft.server.level.DistanceManager) -> b
+    40:40:net.minecraft.util.thread.ProcessorHandle access$400(net.minecraft.server.level.DistanceManager) -> c
+    40:40:net.minecraft.server.level.ChunkTaskPriorityQueueSorter access$500(net.minecraft.server.level.DistanceManager) -> d
+    40:40:java.util.concurrent.Executor access$600(net.minecraft.server.level.DistanceManager) -> e
+    40:40:void access$700(net.minecraft.server.level.DistanceManager,long,net.minecraft.server.level.Ticket) -> a
+    40:40:void access$800(net.minecraft.server.level.DistanceManager,long,net.minecraft.server.level.Ticket) -> b
+    40:40:it.unimi.dsi.fastutil.longs.LongSet access$900(net.minecraft.server.level.DistanceManager) -> f
+    40:40:it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap access$1000(net.minecraft.server.level.DistanceManager) -> g
+    40:40:java.util.Set access$1100(net.minecraft.server.level.DistanceManager) -> h
+    41:45:void <clinit>() -> <clinit>
+net.minecraft.server.level.DistanceManager$ChunkTicketTracker -> yv$a:
     net.minecraft.server.level.DistanceManager this$0 -> a
-    391:393:void <init>(net.minecraft.server.level.DistanceManager) -> <init>
-    397:404:int getLevelFromSource(long) -> b
-    409:415:int getLevel(long) -> c
-    420:429:void setLevel(long,int) -> a
-    432:432:int runDistnaceUpdates(int) -> a
-net.minecraft.server.level.DistanceManager$FixedPlayerDistanceChunkTracker -> ww$b:
+    392:394:void <init>(net.minecraft.server.level.DistanceManager) -> <init>
+    398:405:int getLevelFromSource(long) -> b
+    410:416:int getLevel(long) -> c
+    421:430:void setLevel(long,int) -> a
+    433:433:int runDistnaceUpdates(int) -> a
+net.minecraft.server.level.DistanceManager$FixedPlayerDistanceChunkTracker -> yv$b:
     it.unimi.dsi.fastutil.longs.Long2ByteMap chunks -> a
     int maxDistance -> b
     net.minecraft.server.level.DistanceManager this$0 -> c
-    258:265:void <init>(net.minecraft.server.level.DistanceManager,int) -> <init>
-    269:269:int getLevel(long) -> c
-    275:281:void setLevel(long,int) -> a
-    284:284:void onLevelChange(long,int,int) -> a
-    288:288:int getLevelFromSource(long) -> b
-    292:293:boolean havePlayer(long) -> d
-    297:298:void runAllUpdates() -> a
-    302:315:void dumpChunks(java.lang.String) -> a
-net.minecraft.server.level.DistanceManager$PlayerTicketTracker -> ww$c:
+    259:266:void <init>(net.minecraft.server.level.DistanceManager,int) -> <init>
+    270:270:int getLevel(long) -> c
+    276:282:void setLevel(long,int) -> a
+    285:285:void onLevelChange(long,int,int) -> a
+    289:289:int getLevelFromSource(long) -> b
+    293:294:boolean havePlayer(long) -> d
+    298:299:void runAllUpdates() -> a
+    303:316:void dumpChunks(java.lang.String) -> a
+net.minecraft.server.level.DistanceManager$PlayerTicketTracker -> yv$c:
     int viewDistance -> e
     it.unimi.dsi.fastutil.longs.Long2IntMap queueLevels -> f
     it.unimi.dsi.fastutil.longs.LongSet toUpdate -> g
     net.minecraft.server.level.DistanceManager this$0 -> d
-    320:327:void <init>(net.minecraft.server.level.DistanceManager,int) -> <init>
-    331:332:void onLevelChange(long,int,int) -> a
-    335:341:void updateViewDistance(int) -> a
-    344:359:void onLevelChange(long,int,boolean,boolean) -> a
-    363:383:void runAllUpdates() -> a
-    386:386:boolean haveTicketFor(int) -> c
-    372:377:void lambda$runAllUpdates$7(long,int) -> b
-    371:371:int lambda$runAllUpdates$6(long) -> d
-    356:356:void lambda$onLevelChange$5(long,net.minecraft.server.level.Ticket) -> a
-    356:356:void lambda$null$4(long,net.minecraft.server.level.Ticket) -> b
-    354:354:int lambda$onLevelChange$3(int) -> d
-    347:347:void lambda$onLevelChange$2(long,net.minecraft.server.level.Ticket) -> c
-    348:354:void lambda$null$1(long,net.minecraft.server.level.Ticket) -> d
-    352:352:void lambda$null$0() -> d
-net.minecraft.server.level.FeatureSimulator -> wx:
+    321:328:void <init>(net.minecraft.server.level.DistanceManager,int) -> <init>
+    332:333:void onLevelChange(long,int,int) -> a
+    336:342:void updateViewDistance(int) -> a
+    345:360:void onLevelChange(long,int,boolean,boolean) -> a
+    364:384:void runAllUpdates() -> a
+    387:387:boolean haveTicketFor(int) -> c
+    373:378:void lambda$runAllUpdates$7(long,int) -> b
+    372:372:int lambda$runAllUpdates$6(long) -> d
+    357:357:void lambda$onLevelChange$5(long,net.minecraft.server.level.Ticket) -> a
+    357:357:void lambda$null$4(long,net.minecraft.server.level.Ticket) -> b
+    355:355:int lambda$onLevelChange$3(int) -> d
+    348:348:void lambda$onLevelChange$2(long,net.minecraft.server.level.Ticket) -> c
+    349:355:void lambda$null$1(long,net.minecraft.server.level.Ticket) -> d
+    353:353:void lambda$null$0() -> d
+net.minecraft.server.level.FeatureSimulator -> yw:
     net.minecraft.core.BlockPos$MutableBlockPos minPos -> a
     net.minecraft.core.BlockPos$MutableBlockPos maxPos -> b
     14:16:void <init>() -> <init>
     20:20:boolean isStateAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> a
     25:25:boolean isFluidAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> b
-    30:32:boolean setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
+    30:32:boolean setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int,int) -> a
     37:37:boolean removeBlock(net.minecraft.core.BlockPos,boolean) -> a
-    42:42:boolean destroyBlock(net.minecraft.core.BlockPos,boolean,net.minecraft.world.entity.Entity) -> a
+    42:42:boolean destroyBlock(net.minecraft.core.BlockPos,boolean,net.minecraft.world.entity.Entity,int) -> a
     46:46:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox() -> a
     51:51:java.lang.String toString() -> toString
     56:59:net.minecraft.core.BlockPos getHeightmapPos(net.minecraft.world.level.levelgen.Heightmap$Types,net.minecraft.core.BlockPos) -> a
-net.minecraft.server.level.PlayerMap -> wy:
+net.minecraft.server.level.PlayerMap -> yx:
     it.unimi.dsi.fastutil.objects.Object2BooleanMap players -> a
     9:10:void <init>() -> <init>
     13:13:java.util.stream.Stream getPlayers(long) -> a
@@ -30233,7 +32449,11 @@ net.minecraft.server.level.PlayerMap -> wy:
     33:33:boolean ignoredOrUnknown(net.minecraft.server.level.ServerPlayer) -> c
     37:37:boolean ignored(net.minecraft.server.level.ServerPlayer) -> d
     41:41:void updatePlayer(long,long,net.minecraft.server.level.ServerPlayer) -> a
-net.minecraft.server.level.SectionTracker -> wz:
+net.minecraft.server.level.PlayerRespawnLogic -> yy:
+    13:13:void <init>() -> <init>
+    16:55:net.minecraft.core.BlockPos getOverworldRespawnPos(net.minecraft.server.level.ServerLevel,int,int,boolean) -> a
+    60:69:net.minecraft.core.BlockPos getSpawnPosInChunk(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.ChunkPos,boolean) -> a
+net.minecraft.server.level.SectionTracker -> yz:
     9:10:void <init>(int,int,int) -> <init>
     14:14:boolean isSource(long) -> a
     19:30:void checkNeighborsAfterUpdate(long,int,boolean) -> a
@@ -30241,7 +32461,7 @@ net.minecraft.server.level.SectionTracker -> wz:
     59:62:int computeLevelFromNeighbor(long,long,int) -> b
     int getLevelFromSource(long) -> b
     68:69:void update(long,int,boolean) -> b
-net.minecraft.server.level.ServerBossEvent -> xa:
+net.minecraft.server.level.ServerBossEvent -> za:
     java.util.Set players -> h
     java.util.Set unmodifiablePlayers -> i
     boolean visible -> j
@@ -30260,93 +32480,94 @@ net.minecraft.server.level.ServerBossEvent -> xa:
     113:113:boolean isVisible() -> g
     117:124:void setVisible(boolean) -> d
     127:127:java.util.Collection getPlayers() -> h
-net.minecraft.server.level.ServerChunkCache -> xb:
-    int MAGIC_NUMBER -> b
-    java.util.List CHUNK_STATUSES -> c
-    net.minecraft.server.level.DistanceManager distanceManager -> d
-    net.minecraft.world.level.chunk.ChunkGenerator generator -> e
-    net.minecraft.server.level.ServerLevel level -> f
-    java.lang.Thread mainThread -> g
-    net.minecraft.server.level.ThreadedLevelLightEngine lightEngine -> h
-    net.minecraft.server.level.ServerChunkCache$MainThreadExecutor mainThreadProcessor -> i
+net.minecraft.server.level.ServerChunkCache -> zb:
+    java.util.List CHUNK_STATUSES -> b
+    net.minecraft.server.level.DistanceManager distanceManager -> c
+    net.minecraft.world.level.chunk.ChunkGenerator generator -> d
+    net.minecraft.server.level.ServerLevel level -> e
+    java.lang.Thread mainThread -> f
+    net.minecraft.server.level.ThreadedLevelLightEngine lightEngine -> g
+    net.minecraft.server.level.ServerChunkCache$MainThreadExecutor mainThreadProcessor -> h
     net.minecraft.server.level.ChunkMap chunkMap -> a
-    net.minecraft.world.level.storage.DimensionDataStorage dataStorage -> j
-    long lastInhabitedUpdate -> k
-    boolean spawnEnemies -> l
-    boolean spawnFriendlies -> m
-    long[] lastChunkPos -> n
-    net.minecraft.world.level.chunk.ChunkStatus[] lastChunkStatus -> o
-    net.minecraft.world.level.chunk.ChunkAccess[] lastChunk -> p
-    67:91:void <init>(net.minecraft.server.level.ServerLevel,java.io.File,com.mojang.datafixers.DataFixer,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,java.util.concurrent.Executor,net.minecraft.world.level.chunk.ChunkGenerator,int,net.minecraft.server.level.progress.ChunkProgressListener,java.util.function.Supplier) -> <init>
-    95:95:net.minecraft.server.level.ThreadedLevelLightEngine getLightEngine() -> a
-    100:100:net.minecraft.server.level.ChunkHolder getVisibleChunkIfPresent(long) -> a
-    104:104:int getTickingGenerated() -> b
-    108:116:void storeInCache(long,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.chunk.ChunkStatus) -> a
-    121:149:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> a
-    155:184:net.minecraft.world.level.chunk.LevelChunk getChunkNow(int,int) -> a
-    188:191:void clearCache() -> m
-    194:202:java.util.concurrent.CompletableFuture getChunkFuture(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> b
-    209:234:java.util.concurrent.CompletableFuture getChunkFutureMainThread(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> c
-    238:238:boolean chunkAbsent(net.minecraft.server.level.ChunkHolder,int) -> a
-    243:246:boolean hasChunk(int,int) -> b
-    252:269:net.minecraft.world.level.BlockGetter getChunkForLighting(int,int) -> c
-    274:274:net.minecraft.world.level.Level getLevel() -> c
-    278:278:boolean pollTask() -> d
-    282:288:boolean runDistanceManagerUpdates() -> n
-    293:294:boolean isEntityTickingChunk(net.minecraft.world.entity.Entity) -> a
-    299:299:boolean isEntityTickingChunk(net.minecraft.world.level.ChunkPos) -> a
-    304:305:boolean isTickingChunk(net.minecraft.core.BlockPos) -> a
-    309:310:boolean isInAccessibleChunk(net.minecraft.world.entity.Entity) -> b
-    314:319:boolean checkChunkFuture(long,java.util.function.Function) -> a
-    323:325:void save(boolean) -> a
-    329:332:void close() -> close
-    336:345:void tick(java.util.function.BooleanSupplier) -> a
-    348:423:void tickChunks() -> o
-    427:427:java.lang.String gatherStats() -> e
-    432:432:int getPendingTasksCount() -> f
-    436:436:net.minecraft.world.level.chunk.ChunkGenerator getGenerator() -> g
-    441:441:int getLoadedChunksCount() -> h
-    445:451:void blockChanged(net.minecraft.core.BlockPos) -> b
-    455:461:void onLightUpdate(net.minecraft.world.level.LightLayer,net.minecraft.core.SectionPos) -> a
-    464:465:void addRegionTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> a
-    468:469:void removeRegionTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> b
-    473:474:void updateChunkForced(net.minecraft.world.level.ChunkPos,boolean) -> a
-    479:480:void move(net.minecraft.server.level.ServerPlayer) -> a
-    485:486:void removeEntity(net.minecraft.world.entity.Entity) -> c
-    489:490:void addEntity(net.minecraft.world.entity.Entity) -> d
-    493:494:void broadcastAndSend(net.minecraft.world.entity.Entity,net.minecraft.network.protocol.Packet) -> a
-    497:498:void broadcast(net.minecraft.world.entity.Entity,net.minecraft.network.protocol.Packet) -> b
-    501:502:void setViewDistance(int) -> a
-    506:508:void setSpawnSettings(boolean,boolean) -> a
-    511:511:java.lang.String getChunkDebugData(net.minecraft.world.level.ChunkPos) -> b
-    515:515:net.minecraft.world.level.storage.DimensionDataStorage getDataStorage() -> i
-    519:519:net.minecraft.world.entity.ai.village.poi.PoiManager getPoiManager() -> j
-    47:47:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> k
-    47:47:net.minecraft.world.level.BlockGetter getLevel() -> l
-    456:460:void lambda$onLightUpdate$6(net.minecraft.core.SectionPos,net.minecraft.world.level.LightLayer) -> a
-    372:411:void lambda$tickChunks$5(long,boolean,net.minecraft.world.entity.MobCategory[],boolean,int,it.unimi.dsi.fastutil.objects.Object2IntMap,net.minecraft.core.BlockPos,int,net.minecraft.server.level.ChunkHolder) -> a
-    200:200:java.util.concurrent.CompletionStage lambda$getChunkFuture$4(java.util.concurrent.CompletableFuture) -> a
-    200:200:java.util.concurrent.CompletableFuture lambda$getChunkFuture$3(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> d
-    142:145:net.minecraft.world.level.chunk.ChunkAccess lambda$getChunk$2(boolean,net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure) -> a
-    141:141:net.minecraft.world.level.chunk.ChunkAccess lambda$getChunk$1(net.minecraft.world.level.chunk.ChunkAccess) -> a
-    122:122:net.minecraft.world.level.chunk.ChunkAccess lambda$getChunk$0(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> e
-    47:47:java.lang.Thread access$100(net.minecraft.server.level.ServerChunkCache) -> a
-    47:47:net.minecraft.server.level.ServerLevel access$200(net.minecraft.server.level.ServerChunkCache) -> b
-    47:47:boolean access$300(net.minecraft.server.level.ServerChunkCache) -> c
-    47:47:net.minecraft.server.level.ThreadedLevelLightEngine access$400(net.minecraft.server.level.ServerChunkCache) -> d
-    50:52:void <clinit>() -> <clinit>
-net.minecraft.server.level.ServerChunkCache$1 -> xb$1:
-net.minecraft.server.level.ServerChunkCache$MainThreadExecutor -> xb$a:
+    net.minecraft.world.level.storage.DimensionDataStorage dataStorage -> i
+    long lastInhabitedUpdate -> j
+    boolean spawnEnemies -> k
+    boolean spawnFriendlies -> l
+    long[] lastChunkPos -> m
+    net.minecraft.world.level.chunk.ChunkStatus[] lastChunkStatus -> n
+    net.minecraft.world.level.chunk.ChunkAccess[] lastChunk -> o
+    net.minecraft.world.level.NaturalSpawner$SpawnState lastSpawnState -> p
+    65:93:void <init>(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,com.mojang.datafixers.DataFixer,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,java.util.concurrent.Executor,net.minecraft.world.level.chunk.ChunkGenerator,int,boolean,net.minecraft.server.level.progress.ChunkProgressListener,java.util.function.Supplier) -> <init>
+    97:97:net.minecraft.server.level.ThreadedLevelLightEngine getLightEngine() -> a
+    102:102:net.minecraft.server.level.ChunkHolder getVisibleChunkIfPresent(long) -> a
+    106:106:int getTickingGenerated() -> b
+    110:118:void storeInCache(long,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.chunk.ChunkStatus) -> a
+    123:151:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> a
+    157:186:net.minecraft.world.level.chunk.LevelChunk getChunkNow(int,int) -> a
+    190:193:void clearCache() -> n
+    196:204:java.util.concurrent.CompletableFuture getChunkFuture(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> b
+    211:236:java.util.concurrent.CompletableFuture getChunkFutureMainThread(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> c
+    240:240:boolean chunkAbsent(net.minecraft.server.level.ChunkHolder,int) -> a
+    245:248:boolean hasChunk(int,int) -> b
+    254:271:net.minecraft.world.level.BlockGetter getChunkForLighting(int,int) -> c
+    276:276:net.minecraft.world.level.Level getLevel() -> c
+    280:280:boolean pollTask() -> d
+    284:290:boolean runDistanceManagerUpdates() -> o
+    295:296:boolean isEntityTickingChunk(net.minecraft.world.entity.Entity) -> a
+    301:301:boolean isEntityTickingChunk(net.minecraft.world.level.ChunkPos) -> a
+    306:307:boolean isTickingChunk(net.minecraft.core.BlockPos) -> a
+    311:316:boolean checkChunkFuture(long,java.util.function.Function) -> a
+    320:322:void save(boolean) -> a
+    326:329:void close() -> close
+    333:342:void tick(java.util.function.BooleanSupplier) -> a
+    345:403:void tickChunks() -> p
+    406:411:void getFullChunk(long,java.util.function.Consumer) -> a
+    415:415:java.lang.String gatherStats() -> e
+    420:420:int getPendingTasksCount() -> f
+    424:424:net.minecraft.world.level.chunk.ChunkGenerator getGenerator() -> g
+    429:429:int getLoadedChunksCount() -> h
+    433:439:void blockChanged(net.minecraft.core.BlockPos) -> b
+    443:449:void onLightUpdate(net.minecraft.world.level.LightLayer,net.minecraft.core.SectionPos) -> a
+    452:453:void addRegionTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> a
+    456:457:void removeRegionTicket(net.minecraft.server.level.TicketType,net.minecraft.world.level.ChunkPos,int,java.lang.Object) -> b
+    461:462:void updateChunkForced(net.minecraft.world.level.ChunkPos,boolean) -> a
+    467:468:void move(net.minecraft.server.level.ServerPlayer) -> a
+    473:474:void removeEntity(net.minecraft.world.entity.Entity) -> b
+    477:478:void addEntity(net.minecraft.world.entity.Entity) -> c
+    481:482:void broadcastAndSend(net.minecraft.world.entity.Entity,net.minecraft.network.protocol.Packet) -> a
+    485:486:void broadcast(net.minecraft.world.entity.Entity,net.minecraft.network.protocol.Packet) -> b
+    489:490:void setViewDistance(int) -> a
+    494:496:void setSpawnSettings(boolean,boolean) -> a
+    499:499:java.lang.String getChunkDebugData(net.minecraft.world.level.ChunkPos) -> b
+    503:503:net.minecraft.world.level.storage.DimensionDataStorage getDataStorage() -> i
+    507:507:net.minecraft.world.entity.ai.village.poi.PoiManager getPoiManager() -> j
+    513:513:net.minecraft.world.level.NaturalSpawner$SpawnState getLastSpawnState() -> k
+    48:48:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> l
+    48:48:net.minecraft.world.level.BlockGetter getLevel() -> m
+    444:448:void lambda$onLightUpdate$6(net.minecraft.core.SectionPos,net.minecraft.world.level.LightLayer) -> a
+    369:391:void lambda$tickChunks$5(long,boolean,net.minecraft.world.level.NaturalSpawner$SpawnState,boolean,int,net.minecraft.server.level.ChunkHolder) -> a
+    202:202:java.util.concurrent.CompletionStage lambda$getChunkFuture$4(java.util.concurrent.CompletableFuture) -> a
+    202:202:java.util.concurrent.CompletableFuture lambda$getChunkFuture$3(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> d
+    144:147:net.minecraft.world.level.chunk.ChunkAccess lambda$getChunk$2(boolean,net.minecraft.server.level.ChunkHolder$ChunkLoadingFailure) -> a
+    143:143:net.minecraft.world.level.chunk.ChunkAccess lambda$getChunk$1(net.minecraft.world.level.chunk.ChunkAccess) -> a
+    124:124:net.minecraft.world.level.chunk.ChunkAccess lambda$getChunk$0(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> e
+    48:48:java.lang.Thread access$100(net.minecraft.server.level.ServerChunkCache) -> a
+    48:48:net.minecraft.server.level.ServerLevel access$200(net.minecraft.server.level.ServerChunkCache) -> b
+    48:48:boolean access$300(net.minecraft.server.level.ServerChunkCache) -> c
+    48:48:net.minecraft.server.level.ThreadedLevelLightEngine access$400(net.minecraft.server.level.ServerChunkCache) -> d
+    50:50:void <clinit>() -> <clinit>
+net.minecraft.server.level.ServerChunkCache$1 -> zb$1:
+net.minecraft.server.level.ServerChunkCache$MainThreadExecutor -> zb$a:
     net.minecraft.server.level.ServerChunkCache this$0 -> a
-    523:525:void <init>(net.minecraft.server.level.ServerChunkCache,net.minecraft.world.level.Level) -> <init>
-    529:529:java.lang.Runnable wrapRunnable(java.lang.Runnable) -> e
-    534:534:boolean shouldRun(java.lang.Runnable) -> d
-    540:540:boolean scheduleExecutables() -> ay
-    545:545:java.lang.Thread getRunningThread() -> az
-    550:552:void doRunTask(java.lang.Runnable) -> c
-    556:560:boolean pollTask() -> w
-    522:522:void <init>(net.minecraft.server.level.ServerChunkCache,net.minecraft.world.level.Level,net.minecraft.server.level.ServerChunkCache$1) -> <init>
-net.minecraft.server.level.ServerEntity -> xc:
+    517:519:void <init>(net.minecraft.server.level.ServerChunkCache,net.minecraft.world.level.Level) -> <init>
+    523:523:java.lang.Runnable wrapRunnable(java.lang.Runnable) -> e
+    528:528:boolean shouldRun(java.lang.Runnable) -> d
+    534:534:boolean scheduleExecutables() -> at
+    539:539:java.lang.Thread getRunningThread() -> au
+    544:546:void doRunTask(java.lang.Runnable) -> c
+    550:554:boolean pollTask() -> x
+    516:516:void <init>(net.minecraft.server.level.ServerChunkCache,net.minecraft.world.level.Level,net.minecraft.server.level.ServerChunkCache$1) -> <init>
+net.minecraft.server.level.ServerEntity -> zc:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.server.level.ServerLevel level -> b
     net.minecraft.world.entity.Entity entity -> c
@@ -30365,337 +32586,366 @@ net.minecraft.server.level.ServerEntity -> xc:
     java.util.List lastPassengers -> p
     boolean wasRiding -> q
     boolean wasOnGround -> r
-    60:81:void <init>(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Entity,int,boolean,java.util.function.Consumer) -> <init>
-    84:205:void sendChanges() -> a
-    208:210:void removePairing(net.minecraft.server.level.ServerPlayer) -> a
-    213:217:void addPairing(net.minecraft.server.level.ServerPlayer) -> b
-    220:282:void sendPairingData(java.util.function.Consumer) -> a
-    285:300:void sendDirtyEntityData() -> c
-    303:306:void updateSentPos() -> d
-    309:309:net.minecraft.world.phys.Vec3 sentPos() -> b
-    313:317:void broadcastAndSend(net.minecraft.network.protocol.Packet) -> a
-    42:42:void <clinit>() -> <clinit>
-net.minecraft.server.level.ServerLevel -> xd:
-    org.apache.logging.log4j.Logger LOGGER -> u
-    java.util.List globalEntities -> v
-    it.unimi.dsi.fastutil.ints.Int2ObjectMap entitiesById -> w
-    java.util.Map entitiesByUuid -> x
-    java.util.Queue toAddAfterTick -> y
-    java.util.List players -> z
-    boolean tickingEntities -> a
-    net.minecraft.server.MinecraftServer server -> A
-    net.minecraft.world.level.storage.LevelStorage levelStorage -> B
-    boolean noSave -> b
-    boolean allPlayersSleeping -> C
-    int emptyTime -> D
-    net.minecraft.world.level.PortalForcer portalForcer -> E
-    net.minecraft.world.level.ServerTickList blockTicks -> F
-    net.minecraft.world.level.ServerTickList liquidTicks -> G
-    java.util.Set navigations -> H
-    net.minecraft.world.entity.raid.Raids raids -> c
-    it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet blockEvents -> I
-    boolean handlingTick -> J
-    net.minecraft.world.entity.npc.WanderingTraderSpawner wanderingTraderSpawner -> K
-    143:192:void <init>(net.minecraft.server.MinecraftServer,java.util.concurrent.Executor,net.minecraft.world.level.storage.LevelStorage,net.minecraft.world.level.storage.LevelData,net.minecraft.world.level.dimension.DimensionType,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.server.level.progress.ChunkProgressListener) -> <init>
-    196:196:net.minecraft.world.level.biome.Biome getUncachedNoiseBiome(int,int,int) -> a
-    200:421:void tick(java.util.function.BooleanSupplier) -> a
-    425:428:void wakeUpAllPlayers() -> ab
-    431:497:void tickChunk(net.minecraft.world.level.chunk.LevelChunk,int) -> a
-    500:513:net.minecraft.core.BlockPos findLightingTargetAround(net.minecraft.core.BlockPos) -> a
-    517:517:boolean isHandlingTick() -> b
-    521:537:void updateSleepingPlayerList() -> i_
-    541:541:net.minecraft.server.ServerScoreboard getScoreboard() -> j_
-    545:549:void stopWeather() -> ac
-    553:568:void validateSpawn() -> k_
-    571:572:void resetEmptyTime() -> l_
-    575:579:void tickLiquid(net.minecraft.world.level.TickNextTickData) -> a
-    582:586:void tickBlock(net.minecraft.world.level.TickNextTickData) -> b
-    589:613:void tickNonPassenger(net.minecraft.world.entity.Entity) -> a
-    616:644:void tickPassenger(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
-    647:664:void updateChunkPos(net.minecraft.world.entity.Entity) -> b
-    668:668:boolean mayInteract(net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos) -> a
-    672:728:void setInitialSpawn(net.minecraft.world.level.LevelSettings) -> a
-    733:735:void generateBonusItemsNearSpawn() -> g
-    739:739:net.minecraft.core.BlockPos getDimensionSpecificSpawn() -> h
-    743:757:void save(net.minecraft.util.ProgressListener,boolean,boolean) -> a
-    760:763:void saveLevelData() -> m_
-    766:773:java.util.List getEntities(net.minecraft.world.entity.EntityType,java.util.function.Predicate) -> a
-    777:783:java.util.List getDragons() -> j
-    787:793:java.util.List getPlayers(java.util.function.Predicate) -> a
-    798:802:net.minecraft.server.level.ServerPlayer getRandomPlayer() -> k
-    806:823:it.unimi.dsi.fastutil.objects.Object2IntMap getMobCategoryCounts() -> l
-    831:831:boolean addFreshEntity(net.minecraft.world.entity.Entity) -> c
-    838:838:boolean addWithUUID(net.minecraft.world.entity.Entity) -> d
-    846:851:void addFromAnotherDimension(net.minecraft.world.entity.Entity) -> e
-    854:856:void addDuringCommandTeleport(net.minecraft.server.level.ServerPlayer) -> a
-    859:861:void addDuringPortalTeleport(net.minecraft.server.level.ServerPlayer) -> b
-    864:865:void addNewPlayer(net.minecraft.server.level.ServerPlayer) -> c
-    868:869:void addRespawnedPlayer(net.minecraft.server.level.ServerPlayer) -> d
-    872:886:void addPlayer(net.minecraft.server.level.ServerPlayer) -> f
-    889:902:boolean addEntity(net.minecraft.world.entity.Entity) -> k
-    909:913:boolean loadFromChunk(net.minecraft.world.entity.Entity) -> f
-    917:922:boolean isUUIDUsed(net.minecraft.world.entity.Entity) -> l
-    926:939:void unload(net.minecraft.world.level.chunk.LevelChunk) -> a
-    942:957:void onEntityRemoved(net.minecraft.world.entity.Entity) -> g
-    960:975:void add(net.minecraft.world.entity.Entity) -> m
-    978:984:void despawn(net.minecraft.world.entity.Entity) -> h
-    987:991:void removeFromChunk(net.minecraft.world.entity.Entity) -> n
-    994:997:void removePlayerImmediately(net.minecraft.server.level.ServerPlayer) -> e
-    1000:1002:void addGlobalEntity(net.minecraft.world.entity.global.LightningBolt) -> a
-    1006:1018:void destroyBlockProgress(int,net.minecraft.core.BlockPos,int) -> a
-    1022:1023:void playSound(net.minecraft.world.entity.player.Player,double,double,double,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
-    1027:1028:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
-    1032:1033:void globalLevelEvent(int,net.minecraft.core.BlockPos,int) -> b
-    1037:1038:void levelEvent(net.minecraft.world.entity.player.Player,int,net.minecraft.core.BlockPos,int) -> a
-    1042:1056:void sendBlockUpdated(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int) -> a
-    1060:1061:void broadcastEntityEvent(net.minecraft.world.entity.Entity,byte) -> a
-    1065:1065:net.minecraft.server.level.ServerChunkCache getChunkSource() -> m
-    1072:1089:net.minecraft.world.level.Explosion explode(net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction) -> a
-    1094:1095:void blockEvent(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,int,int) -> a
-    1098:1104:void runBlockEvents() -> ad
-    1107:1111:boolean doBlockEvent(net.minecraft.world.level.BlockEventData) -> a
-    1116:1116:net.minecraft.world.level.ServerTickList getBlockTicks() -> n
-    1121:1121:net.minecraft.world.level.ServerTickList getLiquidTicks() -> n_
-    1127:1127:net.minecraft.server.MinecraftServer getServer() -> p
-    1131:1131:net.minecraft.world.level.PortalForcer getPortalForcer() -> o_
-    1135:1135:net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager getStructureManager() -> r
-    1139:1150:int sendParticles(net.minecraft.core.particles.ParticleOptions,double,double,double,int,double,double,double,double) -> a
-    1154:1156:boolean sendParticles(net.minecraft.server.level.ServerPlayer,net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,int,double,double,double,double) -> a
-    1160:1171:boolean sendParticles(net.minecraft.server.level.ServerPlayer,boolean,double,double,double,net.minecraft.network.protocol.Packet) -> a
-    1177:1177:net.minecraft.world.entity.Entity getEntity(int) -> a
-    1182:1182:net.minecraft.world.entity.Entity getEntity(java.util.UUID) -> a
-    1187:1187:net.minecraft.core.BlockPos findNearestMapFeature(java.lang.String,net.minecraft.core.BlockPos,int,boolean) -> a
-    1192:1192:net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> s
-    1197:1197:net.minecraft.tags.TagManager getTagManager() -> t
-    1202:1204:void setGameTime(long) -> a
-    1208:1208:boolean noSave() -> u
-    1213:1214:void checkSession() -> v
-    1217:1217:net.minecraft.world.level.storage.LevelStorage getLevelStorage() -> w
-    1221:1221:net.minecraft.world.level.storage.DimensionDataStorage getDataStorage() -> x
-    1227:1227:net.minecraft.world.level.saveddata.maps.MapItemSavedData getMapData(java.lang.String) -> a
-    1232:1233:void setMapData(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
-    1237:1237:int getFreeMapId() -> y
-    1242:1246:void setSpawnPos(net.minecraft.core.BlockPos) -> a_
-    1249:1250:it.unimi.dsi.fastutil.longs.LongSet getForcedChunks() -> z
-    1254:1271:boolean setChunkForced(int,int,boolean) -> a
-    1276:1276:java.util.List players() -> A
-    1281:1298:void onBlockStateChange(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
-    1301:1301:net.minecraft.world.entity.ai.village.poi.PoiManager getPoiManager() -> B
-    1305:1305:boolean isVillage(net.minecraft.core.BlockPos) -> b_
-    1309:1309:boolean isVillage(net.minecraft.core.SectionPos) -> a
-    1313:1316:boolean closeToVillage(net.minecraft.core.BlockPos,int) -> a
-    1320:1320:int sectionsToVillage(net.minecraft.core.SectionPos) -> b
-    1324:1324:net.minecraft.world.entity.raid.Raids getRaids() -> C
-    1332:1332:net.minecraft.world.entity.raid.Raid getRaidAt(net.minecraft.core.BlockPos) -> c_
-    1336:1336:boolean isRaided(net.minecraft.core.BlockPos) -> e
-    1340:1341:void onReputationEvent(net.minecraft.world.entity.ai.village.ReputationEventType,net.minecraft.world.entity.Entity,net.minecraft.world.entity.ReputationEventHandler) -> a
-    1344:1384:void saveDebugReport(java.nio.file.Path) -> a
-    1387:1412:void dumpEntities(java.io.Writer,java.lang.Iterable) -> a
-    1415:1431:void dumpBlockEntities(java.io.Writer) -> a
-    1435:1436:void clearBlockEvents(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    139:139:net.minecraft.world.scores.Scoreboard getScoreboard() -> D
-    139:139:net.minecraft.world.level.chunk.ChunkSource getChunkSource() -> E
-    139:139:net.minecraft.world.level.TickList getLiquidTicks() -> F
-    139:139:net.minecraft.world.level.TickList getBlockTicks() -> G
-    1435:1435:boolean lambda$clearBlockEvents$16(net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.BlockEventData) -> a
-    1294:1294:void lambda$onBlockStateChange$15(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-    1295:1297:void lambda$null$14(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> b
-    1289:1289:void lambda$onBlockStateChange$13(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> c
-    1290:1292:void lambda$null$12(net.minecraft.core.BlockPos) -> B
-    1227:1227:net.minecraft.world.level.saveddata.maps.MapItemSavedData lambda$getMapData$11(java.lang.String) -> c
-    631:631:java.lang.String lambda$tickPassenger$10(net.minecraft.world.entity.Entity) -> o
-    600:600:java.lang.String lambda$tickNonPassenger$9(net.minecraft.world.entity.Entity) -> p
-    503:503:boolean lambda$findLightingTargetAround$8(net.minecraft.world.entity.LivingEntity) -> a
-    426:427:void lambda$wakeUpAllPlayers$7(net.minecraft.server.level.ServerPlayer) -> g
-    358:360:void lambda$tick$6(net.minecraft.world.entity.Entity) -> q
-    304:304:boolean lambda$tick$5(net.minecraft.server.level.ServerPlayer) -> h
-    184:184:net.minecraft.world.entity.raid.Raids lambda$new$4() -> ae
-    173:173:net.minecraft.world.level.chunk.ChunkSource lambda$new$3(net.minecraft.world.level.storage.LevelStorage,java.util.concurrent.Executor,net.minecraft.server.MinecraftServer,net.minecraft.server.level.progress.ChunkProgressListener,net.minecraft.world.level.Level,net.minecraft.world.level.dimension.Dimension) -> a
-    173:173:net.minecraft.world.level.storage.DimensionDataStorage lambda$null$2(net.minecraft.server.MinecraftServer) -> a
-    159:159:boolean lambda$new$1(net.minecraft.world.level.material.Fluid) -> a
-    158:158:boolean lambda$new$0(net.minecraft.world.level.block.Block) -> a
-    140:140:void <clinit>() -> <clinit>
-net.minecraft.server.level.ServerPlayer -> xe:
-    org.apache.logging.log4j.Logger LOGGER -> bR
-    java.lang.String language -> bS
+    61:82:void <init>(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Entity,int,boolean,java.util.function.Consumer) -> <init>
+    85:206:void sendChanges() -> a
+    209:211:void removePairing(net.minecraft.server.level.ServerPlayer) -> a
+    214:218:void addPairing(net.minecraft.server.level.ServerPlayer) -> b
+    221:286:void sendPairingData(java.util.function.Consumer) -> a
+    289:303:void sendDirtyEntityData() -> c
+    306:309:void updateSentPos() -> d
+    312:312:net.minecraft.world.phys.Vec3 sentPos() -> b
+    316:320:void broadcastAndSend(net.minecraft.network.protocol.Packet) -> a
+    43:43:void <clinit>() -> <clinit>
+net.minecraft.server.level.ServerLevel -> zd:
+    net.minecraft.core.BlockPos END_SPAWN_POINT -> a
+    org.apache.logging.log4j.Logger LOGGER -> x
+    it.unimi.dsi.fastutil.ints.Int2ObjectMap entitiesById -> y
+    java.util.Map entitiesByUuid -> z
+    java.util.Queue toAddAfterTick -> A
+    java.util.List players -> B
+    net.minecraft.server.level.ServerChunkCache chunkSource -> C
+    boolean tickingEntities -> b
+    net.minecraft.server.MinecraftServer server -> D
+    net.minecraft.world.level.storage.ServerLevelData serverLevelData -> E
+    boolean noSave -> c
+    boolean allPlayersSleeping -> F
+    int emptyTime -> G
+    net.minecraft.world.level.PortalForcer portalForcer -> H
+    net.minecraft.world.level.ServerTickList blockTicks -> I
+    net.minecraft.world.level.ServerTickList liquidTicks -> J
+    java.util.Set navigations -> K
+    net.minecraft.world.entity.raid.Raids raids -> d
+    it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet blockEvents -> L
+    boolean handlingTick -> M
+    java.util.List customSpawners -> N
+    net.minecraft.world.level.dimension.end.EndDragonFight dragonFight -> O
+    net.minecraft.world.level.StructureFeatureManager structureFeatureManager -> P
+    boolean tickTime -> Q
+    147:207:void <init>(net.minecraft.server.MinecraftServer,java.util.concurrent.Executor,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.world.level.storage.ServerLevelData,net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey,net.minecraft.world.level.dimension.DimensionType,net.minecraft.server.level.progress.ChunkProgressListener,net.minecraft.world.level.chunk.ChunkGenerator,boolean,long,java.util.List,boolean) -> <init>
+    210:215:void setWeatherParameters(int,int,boolean,boolean) -> a
+    219:219:net.minecraft.world.level.biome.Biome getUncachedNoiseBiome(int,int,int) -> a
+    223:223:net.minecraft.world.level.StructureFeatureManager structureFeatureManager() -> a
+    227:427:void tick(java.util.function.BooleanSupplier) -> a
+    430:439:void tickTime() -> b
+    442:443:void setDayTime(long) -> a
+    446:449:void tickCustomSpawners(boolean,boolean) -> a
+    453:456:void wakeUpAllPlayers() -> ae
+    459:528:void tickChunk(net.minecraft.world.level.chunk.LevelChunk,int) -> a
+    531:544:net.minecraft.core.BlockPos findLightingTargetAround(net.minecraft.core.BlockPos) -> a
+    548:548:boolean isHandlingTick() -> m_
+    552:568:void updateSleepingPlayerList() -> n_
+    572:572:net.minecraft.server.ServerScoreboard getScoreboard() -> o_
+    576:580:void stopWeather() -> af
+    583:584:void resetEmptyTime() -> p_
+    587:591:void tickLiquid(net.minecraft.world.level.TickNextTickData) -> a
+    594:598:void tickBlock(net.minecraft.world.level.TickNextTickData) -> b
+    601:626:void tickNonPassenger(net.minecraft.world.entity.Entity) -> a
+    629:657:void tickPassenger(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
+    660:683:void updateChunkPos(net.minecraft.world.entity.Entity) -> b
+    687:687:boolean mayInteract(net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos) -> a
+    691:705:void save(net.minecraft.util.ProgressListener,boolean,boolean) -> a
+    708:712:void saveLevelData() -> ag
+    715:722:java.util.List getEntities(net.minecraft.world.entity.EntityType,java.util.function.Predicate) -> a
+    726:732:java.util.List getDragons() -> g
+    736:742:java.util.List getPlayers(java.util.function.Predicate) -> a
+    747:751:net.minecraft.server.level.ServerPlayer getRandomPlayer() -> h
+    759:759:boolean addFreshEntity(net.minecraft.world.entity.Entity) -> c
+    766:766:boolean addWithUUID(net.minecraft.world.entity.Entity) -> d
+    774:779:void addFromAnotherDimension(net.minecraft.world.entity.Entity) -> e
+    782:784:void addDuringCommandTeleport(net.minecraft.server.level.ServerPlayer) -> a
+    787:789:void addDuringPortalTeleport(net.minecraft.server.level.ServerPlayer) -> b
+    792:793:void addNewPlayer(net.minecraft.server.level.ServerPlayer) -> c
+    796:797:void addRespawnedPlayer(net.minecraft.server.level.ServerPlayer) -> d
+    800:814:void addPlayer(net.minecraft.server.level.ServerPlayer) -> f
+    817:830:boolean addEntity(net.minecraft.world.entity.Entity) -> k
+    837:841:boolean loadFromChunk(net.minecraft.world.entity.Entity) -> f
+    845:850:boolean isUUIDUsed(net.minecraft.world.entity.Entity) -> l
+    854:867:void unload(net.minecraft.world.level.chunk.LevelChunk) -> a
+    870:885:void onEntityRemoved(net.minecraft.world.entity.Entity) -> g
+    888:903:void add(net.minecraft.world.entity.Entity) -> m
+    906:912:void despawn(net.minecraft.world.entity.Entity) -> h
+    915:919:void removeFromChunk(net.minecraft.world.entity.Entity) -> n
+    922:925:void removePlayerImmediately(net.minecraft.server.level.ServerPlayer) -> e
+    929:941:void destroyBlockProgress(int,net.minecraft.core.BlockPos,int) -> a
+    945:946:void playSound(net.minecraft.world.entity.player.Player,double,double,double,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
+    950:951:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
+    955:956:void globalLevelEvent(int,net.minecraft.core.BlockPos,int) -> b
+    960:961:void levelEvent(net.minecraft.world.entity.player.Player,int,net.minecraft.core.BlockPos,int) -> a
+    965:979:void sendBlockUpdated(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int) -> a
+    983:984:void broadcastEntityEvent(net.minecraft.world.entity.Entity,byte) -> a
+    988:988:net.minecraft.server.level.ServerChunkCache getChunkSource() -> i
+    995:1009:net.minecraft.world.level.Explosion explode(net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource,net.minecraft.world.level.ExplosionDamageCalculator,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction) -> a
+    1014:1015:void blockEvent(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,int,int) -> a
+    1018:1024:void runBlockEvents() -> ah
+    1027:1031:boolean doBlockEvent(net.minecraft.world.level.BlockEventData) -> a
+    1036:1036:net.minecraft.world.level.ServerTickList getBlockTicks() -> j
+    1041:1041:net.minecraft.world.level.ServerTickList getLiquidTicks() -> k
+    1047:1047:net.minecraft.server.MinecraftServer getServer() -> l
+    1051:1051:net.minecraft.world.level.PortalForcer getPortalForcer() -> q_
+    1055:1055:net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager getStructureManager() -> r_
+    1059:1070:int sendParticles(net.minecraft.core.particles.ParticleOptions,double,double,double,int,double,double,double,double) -> a
+    1074:1076:boolean sendParticles(net.minecraft.server.level.ServerPlayer,net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,int,double,double,double,double) -> a
+    1080:1091:boolean sendParticles(net.minecraft.server.level.ServerPlayer,boolean,double,double,double,net.minecraft.network.protocol.Packet) -> a
+    1097:1097:net.minecraft.world.entity.Entity getEntity(int) -> a
+    1102:1102:net.minecraft.world.entity.Entity getEntity(java.util.UUID) -> a
+    1107:1110:net.minecraft.core.BlockPos findNearestMapFeature(net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.core.BlockPos,int,boolean) -> a
+    1115:1115:net.minecraft.core.BlockPos findNearestBiome(net.minecraft.world.level.biome.Biome,net.minecraft.core.BlockPos,int,int) -> a
+    1120:1120:net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> o
+    1125:1125:net.minecraft.tags.TagManager getTagManager() -> p
+    1130:1130:boolean noSave() -> q
+    1135:1135:net.minecraft.core.RegistryAccess registryAccess() -> r
+    1139:1139:net.minecraft.world.level.storage.DimensionDataStorage getDataStorage() -> s
+    1145:1145:net.minecraft.world.level.saveddata.maps.MapItemSavedData getMapData(java.lang.String) -> a
+    1150:1151:void setMapData(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
+    1155:1155:int getFreeMapId() -> t
+    1159:1164:void setDefaultSpawnPos(net.minecraft.core.BlockPos) -> a_
+    1167:1171:net.minecraft.core.BlockPos getSharedSpawnPos() -> u
+    1175:1176:it.unimi.dsi.fastutil.longs.LongSet getForcedChunks() -> v
+    1180:1197:boolean setChunkForced(int,int,boolean) -> a
+    1202:1202:java.util.List players() -> w
+    1207:1224:void onBlockStateChange(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
+    1227:1227:net.minecraft.world.entity.ai.village.poi.PoiManager getPoiManager() -> x
+    1231:1231:boolean isVillage(net.minecraft.core.BlockPos) -> b_
+    1235:1235:boolean isVillage(net.minecraft.core.SectionPos) -> a
+    1239:1242:boolean isCloseToVillage(net.minecraft.core.BlockPos,int) -> a
+    1246:1246:int sectionsToVillage(net.minecraft.core.SectionPos) -> b
+    1250:1250:net.minecraft.world.entity.raid.Raids getRaids() -> y
+    1258:1258:net.minecraft.world.entity.raid.Raid getRaidAt(net.minecraft.core.BlockPos) -> c_
+    1262:1262:boolean isRaided(net.minecraft.core.BlockPos) -> e
+    1266:1267:void onReputationEvent(net.minecraft.world.entity.ai.village.ReputationEventType,net.minecraft.world.entity.Entity,net.minecraft.world.entity.ReputationEventHandler) -> a
+    1270:1308:void saveDebugReport(java.nio.file.Path) -> a
+    1311:1336:void dumpEntities(java.io.Writer,java.lang.Iterable) -> a
+    1339:1355:void dumpBlockEntities(java.io.Writer) -> a
+    1359:1360:void clearBlockEvents(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    1364:1367:void blockUpdated(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
+    1371:1371:float getShade(net.minecraft.core.Direction,boolean) -> a
+    1375:1375:java.lang.Iterable getAllEntities() -> z
+    1380:1380:java.lang.String toString() -> toString
+    1384:1384:boolean isFlat() -> A
+    1389:1389:long getSeed() -> B
+    1394:1394:net.minecraft.world.level.dimension.end.EndDragonFight dragonFight() -> C
+    1398:1406:void makeObsidianPlatform(net.minecraft.server.level.ServerLevel) -> a
+    140:140:net.minecraft.world.scores.Scoreboard getScoreboard() -> D
+    140:140:net.minecraft.world.level.chunk.ChunkSource getChunkSource() -> E
+    140:140:net.minecraft.world.level.TickList getLiquidTicks() -> F
+    140:140:net.minecraft.world.level.TickList getBlockTicks() -> G
+    1405:1405:void lambda$makeObsidianPlatform$16(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    1403:1403:void lambda$makeObsidianPlatform$15(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> b
+    1359:1359:boolean lambda$clearBlockEvents$14(net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.BlockEventData) -> a
+    1220:1220:void lambda$onBlockStateChange$13(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    1221:1223:void lambda$null$12(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> b
+    1215:1215:void lambda$onBlockStateChange$11(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> c
+    1216:1218:void lambda$null$10(net.minecraft.core.BlockPos) -> D
+    1145:1145:net.minecraft.world.level.saveddata.maps.MapItemSavedData lambda$getMapData$9(java.lang.String) -> b
+    644:644:java.lang.String lambda$tickPassenger$8(net.minecraft.world.entity.Entity) -> o
+    613:613:java.lang.String lambda$tickNonPassenger$7(net.minecraft.world.entity.Entity) -> p
+    534:534:boolean lambda$findLightingTargetAround$6(net.minecraft.world.entity.LivingEntity) -> a
+    454:455:void lambda$wakeUpAllPlayers$5(net.minecraft.server.level.ServerPlayer) -> g
+    327:327:boolean lambda$tick$4(net.minecraft.server.level.ServerPlayer) -> h
+    194:194:net.minecraft.world.entity.raid.Raids lambda$new$3() -> ai
+    185:185:net.minecraft.world.level.storage.DimensionDataStorage lambda$new$2(net.minecraft.server.MinecraftServer) -> a
+    162:162:boolean lambda$new$1(net.minecraft.world.level.material.Fluid) -> a
+    161:161:boolean lambda$new$0(net.minecraft.world.level.block.Block) -> a
+    141:143:void <clinit>() -> <clinit>
+net.minecraft.server.level.ServerPlayer -> ze:
+    org.apache.logging.log4j.Logger LOGGER -> bQ
     net.minecraft.server.network.ServerGamePacketListenerImpl connection -> b
     net.minecraft.server.MinecraftServer server -> c
     net.minecraft.server.level.ServerPlayerGameMode gameMode -> d
-    java.util.List entitiesToRemove -> bT
-    net.minecraft.server.PlayerAdvancements advancements -> bU
-    net.minecraft.stats.ServerStatsCounter stats -> bV
-    float lastRecordedHealthAndAbsorption -> bW
-    int lastRecordedFoodLevel -> bX
-    int lastRecordedAirLevel -> bY
-    int lastRecordedArmor -> bZ
-    int lastRecordedLevel -> ca
-    int lastRecordedExperience -> cb
-    float lastSentHealth -> cc
-    int lastSentFood -> cd
-    boolean lastFoodSaturationZero -> ce
-    int lastSentExp -> cf
-    int spawnInvulnerableTime -> cg
-    net.minecraft.world.entity.player.ChatVisiblity chatVisibility -> ch
-    boolean canChatColor -> ci
-    long lastActionTime -> cj
-    net.minecraft.world.entity.Entity camera -> ck
-    boolean isChangingDimension -> cl
-    boolean seenCredits -> cm
-    net.minecraft.stats.ServerRecipeBook recipeBook -> cn
-    net.minecraft.world.phys.Vec3 levitationStartPos -> co
-    int levitationStartTime -> cp
-    boolean disconnected -> cq
-    net.minecraft.world.phys.Vec3 enteredNetherPosition -> cr
-    net.minecraft.core.SectionPos lastSectionPos -> cs
-    int containerCounter -> ct
+    java.util.List entitiesToRemove -> bR
+    net.minecraft.server.PlayerAdvancements advancements -> bS
+    net.minecraft.stats.ServerStatsCounter stats -> bT
+    float lastRecordedHealthAndAbsorption -> bU
+    int lastRecordedFoodLevel -> bV
+    int lastRecordedAirLevel -> bW
+    int lastRecordedArmor -> bX
+    int lastRecordedLevel -> bY
+    int lastRecordedExperience -> bZ
+    float lastSentHealth -> ca
+    int lastSentFood -> cb
+    boolean lastFoodSaturationZero -> cc
+    int lastSentExp -> cd
+    int spawnInvulnerableTime -> ce
+    net.minecraft.world.entity.player.ChatVisiblity chatVisibility -> cf
+    boolean canChatColor -> cg
+    long lastActionTime -> ch
+    net.minecraft.world.entity.Entity camera -> ci
+    boolean isChangingDimension -> cj
+    boolean seenCredits -> ck
+    net.minecraft.stats.ServerRecipeBook recipeBook -> cl
+    net.minecraft.world.phys.Vec3 levitationStartPos -> cm
+    int levitationStartTime -> cn
+    boolean disconnected -> co
+    net.minecraft.world.phys.Vec3 enteredNetherPosition -> cp
+    net.minecraft.core.SectionPos lastSectionPos -> cq
+    net.minecraft.resources.ResourceKey respawnDimension -> cr
+    net.minecraft.core.BlockPos respawnPosition -> cs
+    boolean respawnForced -> ct
+    int containerCounter -> cu
     boolean ignoreSlotUpdateHack -> e
     int latency -> f
     boolean wonGame -> g
-    127:171:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.server.level.ServerLevel,com.mojang.authlib.GameProfile,net.minecraft.server.level.ServerPlayerGameMode) -> <init>
-    174:212:void fudgeSpawnLocation(net.minecraft.server.level.ServerLevel) -> a
-    216:216:int getCoprime(int) -> u
-    221:245:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    249:275:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    278:282:void setExperiencePoints(int) -> a
-    285:287:void setExperienceLevels(int) -> b
-    291:293:void giveExperienceLevels(int) -> c
-    297:299:void onEnchantmentPerformed(net.minecraft.world.item.ItemStack,int) -> a
-    302:303:void initMenu() -> u_
-    307:310:void onEnterCombat() -> e
-    314:317:void onLeaveCombat() -> f
-    321:322:void onInsideBlock(net.minecraft.world.level.block.state.BlockState) -> a
-    326:326:net.minecraft.world.item.ItemCooldowns createItemCooldowns() -> g
-    331:381:void tick() -> h
-    385:452:void doTick() -> i
-    455:456:void updateScoreForCriteria(net.minecraft.world.scores.criteria.ObjectiveCriteria,int) -> a
-    460:510:void die(net.minecraft.world.damagesource.DamageSource) -> a
-    514:536:void awardKillScore(net.minecraft.world.entity.Entity,int,net.minecraft.world.damagesource.DamageSource) -> a
-    539:546:void handleTeamKill(java.lang.String,java.lang.String,net.minecraft.world.scores.criteria.ObjectiveCriteria[]) -> a
-    550:573:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    578:581:boolean canHarmPlayer(net.minecraft.world.entity.player.Player) -> a
-    585:585:boolean isPvpAllowed() -> eC
-    591:712:net.minecraft.world.entity.Entity changeDimension(net.minecraft.world.level.dimension.DimensionType) -> a
-    716:726:void triggerDimensionChangeTriggers(net.minecraft.server.level.ServerLevel) -> b
-    730:738:boolean broadcastToPlayer(net.minecraft.server.level.ServerPlayer) -> a
-    742:748:void broadcast(net.minecraft.world.level.block.entity.BlockEntity) -> a
-    752:754:void take(net.minecraft.world.entity.Entity,int) -> a
-    758:758:com.mojang.datafixers.util.Either startSleepInBed(net.minecraft.core.BlockPos) -> a
-    766:773:void stopSleepInBed(boolean,boolean) -> a
-    777:788:boolean startRiding(net.minecraft.world.entity.Entity,boolean) -> a
-    793:800:void stopRiding() -> j
-    804:804:boolean isInvulnerableTo(net.minecraft.world.damagesource.DamageSource) -> b
-    810:810:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    814:817:void onChangedBlock(net.minecraft.core.BlockPos) -> b
-    820:826:void doCheckFallDamage(double,boolean) -> a
-    830:832:void openTextEdit(net.minecraft.world.level.block.entity.SignBlockEntity) -> a
-    840:841:void nextContainerCounter() -> eD
-    845:865:java.util.OptionalInt openMenu(net.minecraft.world.MenuProvider) -> a
-    870:871:void sendMerchantOffers(int,net.minecraft.world.item.trading.MerchantOffers,int,int,boolean,boolean) -> a
-    875:882:void openHorseInventory(net.minecraft.world.entity.animal.horse.AbstractHorse,net.minecraft.world.Container) -> a
-    886:897:void openItemGui(net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
-    901:903:void openCommandBlock(net.minecraft.world.level.block.entity.CommandBlockEntity) -> a
-    907:924:void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
-    927:928:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu) -> a
-    932:934:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.core.NonNullList) -> a
-    938:939:void setContainerData(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> a
-    943:945:void closeContainer() -> v_
-    948:956:void broadcastCarriedItem() -> l
-    959:961:void doCloseContainer() -> m
-    964:974:void setPlayerInput(float,float,boolean,boolean) -> a
-    978:980:void awardStat(net.minecraft.stats.Stat,int) -> a
-    984:986:void resetStat(net.minecraft.stats.Stat) -> a
-    990:990:int awardRecipes(java.util.Collection) -> a
-    995:1001:void awardRecipesByKey(net.minecraft.resources.ResourceLocation[]) -> a
-    1005:1005:int resetRecipes(java.util.Collection) -> b
-    1010:1012:void giveExperiencePoints(int) -> d
-    1015:1020:void disconnect() -> n
-    1023:1023:boolean hasDisconnected() -> o
-    1027:1028:void resetSentInfo() -> p
-    1032:1033:void displayClientMessage(net.minecraft.network.chat.Component,boolean) -> a
-    1037:1041:void completeUsingItem() -> q
-    1045:1047:void lookAt(net.minecraft.commands.arguments.EntityAnchorArgument$Anchor,net.minecraft.world.phys.Vec3) -> a
-    1050:1053:void lookAt(net.minecraft.commands.arguments.EntityAnchorArgument$Anchor,net.minecraft.world.entity.Entity,net.minecraft.commands.arguments.EntityAnchorArgument$Anchor) -> a
-    1056:1092:void restoreFrom(net.minecraft.server.level.ServerPlayer,boolean) -> a
-    1096:1105:void onEffectAdded(net.minecraft.world.effect.MobEffectInstance) -> a
-    1109:1113:void onEffectUpdated(net.minecraft.world.effect.MobEffectInstance,boolean) -> a
-    1117:1125:void onEffectRemoved(net.minecraft.world.effect.MobEffectInstance) -> b
-    1129:1130:void teleportTo(double,double,double) -> a
-    1134:1136:void forceMove(double,double,double) -> b
-    1140:1141:void crit(net.minecraft.world.entity.Entity) -> a
-    1145:1146:void magicCrit(net.minecraft.world.entity.Entity) -> b
-    1150:1155:void onUpdateAbilities() -> r
-    1158:1158:net.minecraft.server.level.ServerLevel getLevel() -> s
-    1163:1175:void setGameMode(net.minecraft.world.level.GameType) -> a
-    1179:1179:boolean isSpectator() -> t
-    1184:1184:boolean isCreative() -> u
-    1189:1190:void sendMessage(net.minecraft.network.chat.Component) -> a
-    1193:1202:void sendMessage(net.minecraft.network.chat.Component,net.minecraft.network.chat.ChatType) -> a
-    1205:1208:java.lang.String getIpAddress() -> v
-    1212:1219:void updateOptions(net.minecraft.network.protocol.game.ServerboundClientInformationPacket) -> a
-    1222:1222:boolean canChatInColor() -> w
-    1226:1226:net.minecraft.world.entity.player.ChatVisiblity getChatVisibility() -> x
-    1230:1231:void sendTexturePack(java.lang.String,java.lang.String) -> a
-    1235:1235:int getPermissionLevel() -> y
-    1239:1240:void resetLastActionTime() -> z
-    1243:1243:net.minecraft.stats.ServerStatsCounter getStats() -> A
-    1247:1247:net.minecraft.stats.ServerRecipeBook getRecipeBook() -> B
-    1251:1256:void sendRemoveEntity(net.minecraft.world.entity.Entity) -> c
-    1259:1260:void cancelRemoveEntity(net.minecraft.world.entity.Entity) -> d
-    1264:1270:void updateInvisibilityStatus() -> C
-    1273:1273:net.minecraft.world.entity.Entity getCamera() -> D
-    1277:1284:void setCamera(net.minecraft.world.entity.Entity) -> e
-    1288:1291:void processDimensionDelay() -> E
-    1295:1300:void attack(net.minecraft.world.entity.Entity) -> f
-    1303:1303:long getLastActionTime() -> F
-    1308:1308:net.minecraft.network.chat.Component getTabListDisplayName() -> G
-    1313:1315:void swing(net.minecraft.world.InteractionHand) -> a
-    1318:1318:boolean isChangingDimension() -> H
-    1322:1323:void hasChangedDimension() -> I
-    1326:1326:net.minecraft.server.PlayerAdvancements getAdvancements() -> J
-    1330:1359:void teleportTo(net.minecraft.server.level.ServerLevel,double,double,double,float,float) -> a
-    1365:1367:void trackChunk(net.minecraft.world.level.ChunkPos,net.minecraft.network.protocol.Packet,net.minecraft.network.protocol.Packet) -> a
-    1371:1374:void untrackChunk(net.minecraft.world.level.ChunkPos) -> a
-    1377:1377:net.minecraft.core.SectionPos getLastSectionPos() -> K
-    1381:1382:void setLastSectionPos(net.minecraft.core.SectionPos) -> a
-    1386:1387:void playNotifySound(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
-    1391:1391:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    1396:1410:net.minecraft.world.entity.item.ItemEntity drop(net.minecraft.world.item.ItemStack,boolean,boolean) -> a
-    1194:1200:void lambda$sendMessage$5(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component,io.netty.util.concurrent.Future) -> a
-    979:979:void lambda$awardStat$4(int,net.minecraft.world.scores.Score) -> a
-    759:761:void lambda$startSleepInBed$3(net.minecraft.util.Unit) -> a
-    466:473:void lambda$die$2(net.minecraft.network.chat.Component,io.netty.util.concurrent.Future) -> a
-    470:470:void lambda$null$1(net.minecraft.network.chat.Component,net.minecraft.network.chat.Style) -> a
-    455:455:void lambda$updateScoreForCriteria$0(int,net.minecraft.world.scores.Score) -> b
-    126:126:void <clinit>() -> <clinit>
-net.minecraft.server.level.ServerPlayerGameMode -> xf:
+    141:186:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.server.level.ServerLevel,com.mojang.authlib.GameProfile,net.minecraft.server.level.ServerPlayerGameMode) -> <init>
+    189:228:void fudgeSpawnLocation(net.minecraft.server.level.ServerLevel) -> b
+    232:232:int getCoprime(int) -> u
+    237:269:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    273:310:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    313:317:void setExperiencePoints(int) -> a
+    320:322:void setExperienceLevels(int) -> b
+    326:328:void giveExperienceLevels(int) -> c
+    332:334:void onEnchantmentPerformed(net.minecraft.world.item.ItemStack,int) -> a
+    337:338:void initMenu() -> f
+    342:345:void onEnterCombat() -> g
+    349:352:void onLeaveCombat() -> h
+    356:357:void onInsideBlock(net.minecraft.world.level.block.state.BlockState) -> a
+    361:361:net.minecraft.world.item.ItemCooldowns createItemCooldowns() -> i
+    366:416:void tick() -> j
+    420:487:void doTick() -> w_
+    490:491:void updateScoreForCriteria(net.minecraft.world.scores.criteria.ObjectiveCriteria,int) -> a
+    495:548:void die(net.minecraft.world.damagesource.DamageSource) -> a
+    551:555:void tellNeutralMobsThatIDied() -> eW
+    559:581:void awardKillScore(net.minecraft.world.entity.Entity,int,net.minecraft.world.damagesource.DamageSource) -> a
+    584:591:void handleTeamKill(java.lang.String,java.lang.String,net.minecraft.world.scores.criteria.ObjectiveCriteria[]) -> a
+    595:618:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    623:626:boolean canHarmPlayer(net.minecraft.world.entity.player.Player) -> a
+    630:630:boolean isPvpAllowed() -> eX
+    636:747:net.minecraft.world.entity.Entity changeDimension(net.minecraft.server.level.ServerLevel) -> a
+    751:761:void triggerDimensionChangeTriggers(net.minecraft.server.level.ServerLevel) -> c
+    765:773:boolean broadcastToPlayer(net.minecraft.server.level.ServerPlayer) -> a
+    777:783:void broadcast(net.minecraft.world.level.block.entity.BlockEntity) -> a
+    787:789:void take(net.minecraft.world.entity.Entity,int) -> a
+    793:832:com.mojang.datafixers.util.Either startSleepInBed(net.minecraft.core.BlockPos) -> a
+    837:839:void startSleeping(net.minecraft.core.BlockPos) -> b
+    842:842:boolean bedInRange(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    846:847:boolean isReachableBedBlock(net.minecraft.core.BlockPos) -> g
+    851:852:boolean bedBlocked(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    857:864:void stopSleepInBed(boolean,boolean) -> a
+    868:879:boolean startRiding(net.minecraft.world.entity.Entity,boolean) -> a
+    884:891:void stopRiding() -> l
+    895:895:boolean isInvulnerableTo(net.minecraft.world.damagesource.DamageSource) -> b
+    901:901:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    905:908:void onChangedBlock(net.minecraft.core.BlockPos) -> c
+    911:916:void doCheckFallDamage(double,boolean) -> a
+    920:922:void openTextEdit(net.minecraft.world.level.block.entity.SignBlockEntity) -> a
+    930:931:void nextContainerCounter() -> eY
+    935:955:java.util.OptionalInt openMenu(net.minecraft.world.MenuProvider) -> a
+    960:961:void sendMerchantOffers(int,net.minecraft.world.item.trading.MerchantOffers,int,int,boolean,boolean) -> a
+    965:972:void openHorseInventory(net.minecraft.world.entity.animal.horse.AbstractHorse,net.minecraft.world.Container) -> a
+    976:987:void openItemGui(net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
+    991:993:void openCommandBlock(net.minecraft.world.level.block.entity.CommandBlockEntity) -> a
+    997:1014:void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
+    1017:1018:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu) -> a
+    1022:1024:void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.core.NonNullList) -> a
+    1028:1029:void setContainerData(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> a
+    1033:1035:void closeContainer() -> m
+    1038:1046:void broadcastCarriedItem() -> n
+    1049:1051:void doCloseContainer() -> o
+    1054:1064:void setPlayerInput(float,float,boolean,boolean) -> a
+    1068:1070:void awardStat(net.minecraft.stats.Stat,int) -> a
+    1074:1076:void resetStat(net.minecraft.stats.Stat) -> a
+    1080:1080:int awardRecipes(java.util.Collection) -> a
+    1085:1091:void awardRecipesByKey(net.minecraft.resources.ResourceLocation[]) -> a
+    1095:1095:int resetRecipes(java.util.Collection) -> b
+    1100:1102:void giveExperiencePoints(int) -> d
+    1105:1110:void disconnect() -> p
+    1113:1113:boolean hasDisconnected() -> q
+    1117:1118:void resetSentInfo() -> r
+    1122:1123:void displayClientMessage(net.minecraft.network.chat.Component,boolean) -> a
+    1127:1131:void completeUsingItem() -> s
+    1135:1137:void lookAt(net.minecraft.commands.arguments.EntityAnchorArgument$Anchor,net.minecraft.world.phys.Vec3) -> a
+    1140:1143:void lookAt(net.minecraft.commands.arguments.EntityAnchorArgument$Anchor,net.minecraft.world.entity.Entity,net.minecraft.commands.arguments.EntityAnchorArgument$Anchor) -> a
+    1146:1182:void restoreFrom(net.minecraft.server.level.ServerPlayer,boolean) -> a
+    1186:1195:void onEffectAdded(net.minecraft.world.effect.MobEffectInstance) -> a
+    1199:1203:void onEffectUpdated(net.minecraft.world.effect.MobEffectInstance,boolean) -> a
+    1207:1215:void onEffectRemoved(net.minecraft.world.effect.MobEffectInstance) -> b
+    1219:1220:void teleportTo(double,double,double) -> a
+    1224:1226:void moveTo(double,double,double) -> b
+    1230:1231:void crit(net.minecraft.world.entity.Entity) -> a
+    1235:1236:void magicCrit(net.minecraft.world.entity.Entity) -> b
+    1240:1245:void onUpdateAbilities() -> t
+    1248:1248:net.minecraft.server.level.ServerLevel getLevel() -> u
+    1253:1265:void setGameMode(net.minecraft.world.level.GameType) -> a
+    1269:1269:boolean isSpectator() -> a_
+    1274:1274:boolean isCreative() -> b_
+    1279:1280:void sendMessage(net.minecraft.network.chat.Component,java.util.UUID) -> a
+    1283:1292:void sendMessage(net.minecraft.network.chat.Component,net.minecraft.network.chat.ChatType,java.util.UUID) -> a
+    1295:1298:java.lang.String getIpAddress() -> v
+    1303:1308:void updateOptions(net.minecraft.network.protocol.game.ServerboundClientInformationPacket) -> a
+    1311:1311:boolean canChatInColor() -> w
+    1315:1315:net.minecraft.world.entity.player.ChatVisiblity getChatVisibility() -> x
+    1319:1320:void sendTexturePack(java.lang.String,java.lang.String) -> a
+    1324:1324:int getPermissionLevel() -> y
+    1328:1329:void resetLastActionTime() -> z
+    1332:1332:net.minecraft.stats.ServerStatsCounter getStats() -> A
+    1336:1336:net.minecraft.stats.ServerRecipeBook getRecipeBook() -> B
+    1340:1345:void sendRemoveEntity(net.minecraft.world.entity.Entity) -> c
+    1348:1349:void cancelRemoveEntity(net.minecraft.world.entity.Entity) -> d
+    1353:1359:void updateInvisibilityStatus() -> C
+    1362:1362:net.minecraft.world.entity.Entity getCamera() -> D
+    1366:1373:void setCamera(net.minecraft.world.entity.Entity) -> e
+    1377:1380:void processDimensionDelay() -> E
+    1384:1389:void attack(net.minecraft.world.entity.Entity) -> f
+    1392:1392:long getLastActionTime() -> F
+    1397:1397:net.minecraft.network.chat.Component getTabListDisplayName() -> G
+    1402:1404:void swing(net.minecraft.world.InteractionHand) -> a
+    1407:1407:boolean isChangingDimension() -> H
+    1411:1412:void hasChangedDimension() -> I
+    1415:1415:net.minecraft.server.PlayerAdvancements getAdvancements() -> J
+    1419:1447:void teleportTo(net.minecraft.server.level.ServerLevel,double,double,double,float,float) -> a
+    1451:1451:net.minecraft.core.BlockPos getRespawnPosition() -> K
+    1455:1455:net.minecraft.resources.ResourceKey getRespawnDimension() -> L
+    1459:1459:boolean isRespawnForced() -> M
+    1463:1476:void setRespawnPosition(net.minecraft.resources.ResourceKey,net.minecraft.core.BlockPos,boolean,boolean) -> a
+    1482:1484:void trackChunk(net.minecraft.world.level.ChunkPos,net.minecraft.network.protocol.Packet,net.minecraft.network.protocol.Packet) -> a
+    1488:1491:void untrackChunk(net.minecraft.world.level.ChunkPos) -> a
+    1494:1494:net.minecraft.core.SectionPos getLastSectionPos() -> N
+    1498:1499:void setLastSectionPos(net.minecraft.core.SectionPos) -> a
+    1503:1504:void playNotifySound(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
+    1508:1508:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    1513:1527:net.minecraft.world.entity.item.ItemEntity drop(net.minecraft.world.item.ItemStack,boolean,boolean) -> a
+    1284:1290:void lambda$sendMessage$9(net.minecraft.network.chat.ChatType,net.minecraft.network.chat.Component,java.util.UUID,io.netty.util.concurrent.Future) -> a
+    1069:1069:void lambda$awardStat$8(int,net.minecraft.world.scores.Score) -> a
+    828:830:void lambda$startSleepInBed$7(net.minecraft.util.Unit) -> a
+    821:821:boolean lambda$startSleepInBed$6(net.minecraft.world.entity.monster.Monster) -> a
+    554:554:void lambda$tellNeutralMobsThatIDied$5(net.minecraft.world.entity.Mob) -> a
+    553:553:boolean lambda$tellNeutralMobsThatIDied$4(net.minecraft.world.entity.Mob) -> b
+    501:508:void lambda$die$3(net.minecraft.network.chat.Component,io.netty.util.concurrent.Future) -> a
+    505:505:net.minecraft.network.chat.Style lambda$null$2(net.minecraft.network.chat.Component,net.minecraft.network.chat.Style) -> a
+    490:490:void lambda$updateScoreForCriteria$1(int,net.minecraft.world.scores.Score) -> b
+    308:308:void lambda$addAdditionalSaveData$0(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> a
+    135:135:void <clinit>() -> <clinit>
+net.minecraft.server.level.ServerPlayerGameMode -> zf:
     org.apache.logging.log4j.Logger LOGGER -> c
     net.minecraft.server.level.ServerLevel level -> a
     net.minecraft.server.level.ServerPlayer player -> b
     net.minecraft.world.level.GameType gameModeForPlayer -> d
-    boolean isDestroyingBlock -> e
-    int destroyProgressStart -> f
-    net.minecraft.core.BlockPos destroyPos -> g
-    int gameTicks -> h
-    boolean hasDelayedDestroy -> i
-    net.minecraft.core.BlockPos delayedDestroyPos -> j
-    int delayedTickStart -> k
-    int lastSentState -> l
-    36:50:void <init>(net.minecraft.server.level.ServerLevel) -> <init>
-    53:60:void setGameModeForPlayer(net.minecraft.world.level.GameType) -> a
-    63:63:net.minecraft.world.level.GameType getGameModeForPlayer() -> b
-    67:67:boolean isSurvival() -> c
-    71:71:boolean isCreative() -> d
-    75:79:void updateGameMode(net.minecraft.world.level.GameType) -> b
-    82:107:void tick() -> a
-    110:118:float incrementDestroyProgress(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,int) -> a
-    123:214:void handleBlockBreakAction(net.minecraft.core.BlockPos,net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action,net.minecraft.core.Direction,int) -> a
-    217:222:void destroyAndAck(net.minecraft.core.BlockPos,net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action,java.lang.String) -> a
-    225:265:boolean destroyBlock(net.minecraft.core.BlockPos) -> a
-    269:302:net.minecraft.world.InteractionResult useItem(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
-    306:341:net.minecraft.world.InteractionResult useItemOn(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    345:346:void setLevel(net.minecraft.server.level.ServerLevel) -> a
+    net.minecraft.world.level.GameType previousGameModeForPlayer -> e
+    boolean isDestroyingBlock -> f
+    int destroyProgressStart -> g
+    net.minecraft.core.BlockPos destroyPos -> h
+    int gameTicks -> i
+    boolean hasDelayedDestroy -> j
+    net.minecraft.core.BlockPos delayedDestroyPos -> k
+    int delayedTickStart -> l
+    int lastSentState -> m
+    36:51:void <init>(net.minecraft.server.level.ServerLevel) -> <init>
+    54:55:void setGameModeForPlayer(net.minecraft.world.level.GameType) -> a
+    58:66:void setGameModeForPlayer(net.minecraft.world.level.GameType,net.minecraft.world.level.GameType) -> a
+    69:69:net.minecraft.world.level.GameType getGameModeForPlayer() -> b
+    73:73:net.minecraft.world.level.GameType getPreviousGameModeForPlayer() -> c
+    77:77:boolean isSurvival() -> d
+    81:81:boolean isCreative() -> e
+    85:89:void updateGameMode(net.minecraft.world.level.GameType) -> b
+    92:117:void tick() -> a
+    120:128:float incrementDestroyProgress(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,int) -> a
+    133:219:void handleBlockBreakAction(net.minecraft.core.BlockPos,net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action,net.minecraft.core.Direction,int) -> a
+    222:227:void destroyAndAck(net.minecraft.core.BlockPos,net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action,java.lang.String) -> a
+    230:270:boolean destroyBlock(net.minecraft.core.BlockPos) -> a
+    274:307:net.minecraft.world.InteractionResult useItem(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
+    311:353:net.minecraft.world.InteractionResult useItemOn(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    357:358:void setLevel(net.minecraft.server.level.ServerLevel) -> a
     31:31:void <clinit>() -> <clinit>
-net.minecraft.server.level.ThreadedLevelLightEngine -> xg:
+net.minecraft.server.level.ThreadedLevelLightEngine -> zg:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.util.thread.ProcessorMailbox taskMailbox -> b
     it.unimi.dsi.fastutil.objects.ObjectList lightTasks -> c
@@ -30711,12 +32961,12 @@ net.minecraft.server.level.ThreadedLevelLightEngine -> xg:
     67:81:void updateChunkStatus(net.minecraft.world.level.ChunkPos) -> a
     86:87:void updateSectionStatus(net.minecraft.core.SectionPos,boolean) -> a
     91:92:void enableLightSources(net.minecraft.world.level.ChunkPos,boolean) -> a
-    97:98:void queueSectionData(net.minecraft.world.level.LightLayer,net.minecraft.core.SectionPos,net.minecraft.world.level.chunk.DataLayer) -> a
+    97:98:void queueSectionData(net.minecraft.world.level.LightLayer,net.minecraft.core.SectionPos,net.minecraft.world.level.chunk.DataLayer,boolean) -> a
     101:102:void addTask(int,int,net.minecraft.server.level.ThreadedLevelLightEngine$TaskType,java.lang.Runnable) -> a
     105:111:void addTask(int,int,java.util.function.IntSupplier,net.minecraft.server.level.ThreadedLevelLightEngine$TaskType,java.lang.Runnable) -> a
     115:116:void retainData(net.minecraft.world.level.ChunkPos,boolean) -> b
     119:142:java.util.concurrent.CompletableFuture lightChunk(net.minecraft.world.level.chunk.ChunkAccess,boolean) -> a
-    153:159:void tryScheduleUpdate() -> B_
+    153:159:void tryScheduleUpdate() -> A_
     162:187:void runUpdate() -> b
     190:191:void setTaskPerBatch(int) -> a
     155:157:void lambda$tryScheduleUpdate$22() -> c
@@ -30730,7 +32980,7 @@ net.minecraft.server.level.ThreadedLevelLightEngine -> xg:
     115:115:int lambda$retainData$14() -> d
     106:110:void lambda$addTask$13(net.minecraft.server.level.ThreadedLevelLightEngine$TaskType,java.lang.Runnable) -> a
     97:97:java.lang.String lambda$queueSectionData$12(net.minecraft.core.SectionPos) -> a
-    97:97:void lambda$queueSectionData$11(net.minecraft.world.level.LightLayer,net.minecraft.core.SectionPos,net.minecraft.world.level.chunk.DataLayer) -> b
+    97:97:void lambda$queueSectionData$11(net.minecraft.world.level.LightLayer,net.minecraft.core.SectionPos,net.minecraft.world.level.chunk.DataLayer,boolean) -> b
     97:97:int lambda$queueSectionData$10() -> e
     91:91:java.lang.String lambda$enableLightSources$9(net.minecraft.world.level.ChunkPos,boolean) -> e
     91:91:void lambda$enableLightSources$8(net.minecraft.world.level.ChunkPos,boolean) -> f
@@ -30743,7 +32993,7 @@ net.minecraft.server.level.ThreadedLevelLightEngine -> xg:
     62:62:java.lang.String lambda$checkBlock$1(net.minecraft.core.BlockPos) -> b
     62:62:void lambda$checkBlock$0(net.minecraft.core.BlockPos) -> c
     30:30:void <clinit>() -> <clinit>
-net.minecraft.server.level.ThreadedLevelLightEngine$TaskType -> xg$a:
+net.minecraft.server.level.ThreadedLevelLightEngine$TaskType -> zg$a:
     net.minecraft.server.level.ThreadedLevelLightEngine$TaskType PRE_UPDATE -> a
     net.minecraft.server.level.ThreadedLevelLightEngine$TaskType POST_UPDATE -> b
     net.minecraft.server.level.ThreadedLevelLightEngine$TaskType[] $VALUES -> c
@@ -30751,7 +33001,7 @@ net.minecraft.server.level.ThreadedLevelLightEngine$TaskType -> xg$a:
     193:193:net.minecraft.server.level.ThreadedLevelLightEngine$TaskType valueOf(java.lang.String) -> valueOf
     193:193:void <init>(java.lang.String,int) -> <init>
     193:194:void <clinit>() -> <clinit>
-net.minecraft.server.level.Ticket -> xh:
+net.minecraft.server.level.Ticket -> zh:
     net.minecraft.server.level.TicketType type -> a
     int ticketLevel -> b
     java.lang.Object key -> c
@@ -30766,7 +33016,7 @@ net.minecraft.server.level.Ticket -> xh:
     65:66:void setCreatedTick(long) -> a
     70:71:boolean timedOut(long) -> b
     5:5:int compareTo(java.lang.Object) -> compareTo
-net.minecraft.server.level.TicketType -> xi:
+net.minecraft.server.level.TicketType -> zi:
     java.lang.String name -> i
     java.util.Comparator comparator -> j
     long timeout -> k
@@ -30787,7 +33037,7 @@ net.minecraft.server.level.TicketType -> xi:
     16:16:int lambda$static$1(net.minecraft.util.Unit,net.minecraft.util.Unit) -> a
     15:15:int lambda$static$0(net.minecraft.util.Unit,net.minecraft.util.Unit) -> b
     15:22:void <clinit>() -> <clinit>
-net.minecraft.server.level.WorldGenRegion -> xj:
+net.minecraft.server.level.WorldGenRegion -> zj:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.List cache -> b
     int x -> c
@@ -30795,80 +33045,76 @@ net.minecraft.server.level.WorldGenRegion -> xj:
     int size -> e
     net.minecraft.server.level.ServerLevel level -> f
     long seed -> g
-    int seaLevel -> h
-    net.minecraft.world.level.storage.LevelData levelData -> i
-    java.util.Random random -> j
-    net.minecraft.world.level.dimension.Dimension dimension -> k
-    net.minecraft.world.level.levelgen.ChunkGeneratorSettings settings -> l
-    net.minecraft.world.level.TickList blockTicks -> m
-    net.minecraft.world.level.TickList liquidTicks -> n
-    net.minecraft.world.level.biome.BiomeManager biomeManager -> o
-    60:83:void <init>(net.minecraft.server.level.ServerLevel,java.util.List) -> <init>
+    net.minecraft.world.level.storage.LevelData levelData -> h
+    java.util.Random random -> i
+    net.minecraft.world.level.dimension.DimensionType dimensionType -> j
+    net.minecraft.world.level.TickList blockTicks -> k
+    net.minecraft.world.level.TickList liquidTicks -> l
+    net.minecraft.world.level.biome.BiomeManager biomeManager -> m
+    net.minecraft.world.level.ChunkPos firstPos -> n
+    net.minecraft.world.level.ChunkPos lastPos -> o
+    58:83:void <init>(net.minecraft.server.level.ServerLevel,java.util.List) -> <init>
     86:86:int getCenterX() -> a
     90:90:int getCenterZ() -> b
     95:95:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int) -> a
-    102:126:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> a
-    132:135:boolean hasChunk(int,int) -> b
-    140:140:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
-    145:145:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
-    151:151:net.minecraft.world.entity.player.Player getNearestPlayer(double,double,double,double,java.util.function.Predicate) -> a
-    156:156:int getSkyDarken() -> c
-    161:161:net.minecraft.world.level.biome.BiomeManager getBiomeManager() -> d
-    166:166:net.minecraft.world.level.biome.Biome getUncachedNoiseBiome(int,int,int) -> a
-    171:171:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
-    176:185:boolean destroyBlock(net.minecraft.core.BlockPos,boolean,net.minecraft.world.entity.Entity) -> a
-    192:221:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
-    226:255:boolean setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
-    259:260:void markPosForPostprocessing(net.minecraft.core.BlockPos) -> e
-    267:271:boolean addFreshEntity(net.minecraft.world.entity.Entity) -> c
-    276:276:boolean removeBlock(net.minecraft.core.BlockPos,boolean) -> a
-    281:281:net.minecraft.world.level.border.WorldBorder getWorldBorder() -> f
-    286:286:boolean isClientSide() -> p_
-    292:292:net.minecraft.server.level.ServerLevel getLevel() -> h
-    297:297:net.minecraft.world.level.storage.LevelData getLevelData() -> i
-    302:306:net.minecraft.world.DifficultyInstance getCurrentDifficultyAt(net.minecraft.core.BlockPos) -> d
-    312:312:net.minecraft.server.MinecraftServer getServer() -> p
-    317:317:net.minecraft.world.level.chunk.ChunkSource getChunkSource() -> E
-    322:322:long getSeed() -> r_
-    327:327:net.minecraft.world.level.TickList getBlockTicks() -> G
-    332:332:net.minecraft.world.level.TickList getLiquidTicks() -> F
-    337:337:int getSeaLevel() -> q_
-    341:341:net.minecraft.world.level.levelgen.ChunkGeneratorSettings getSettings() -> l
-    346:346:java.util.Random getRandom() -> t_
-    352:352:void blockUpdated(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
-    356:356:int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
-    361:361:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
-    365:365:void addParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
-    369:369:void levelEvent(net.minecraft.world.entity.player.Player,int,net.minecraft.core.BlockPos,int) -> a
-    373:373:net.minecraft.core.BlockPos getSharedSpawnPos() -> s_
-    378:378:net.minecraft.world.level.dimension.Dimension getDimension() -> o
-    383:383:boolean isStateAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> a
-    388:388:boolean isFluidAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> b
-    393:393:java.util.List getEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
-    398:398:java.util.List getEntities(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
-    403:403:java.util.List players() -> A
-    46:46:net.minecraft.world.level.Level getLevel() -> q
-    61:61:net.minecraft.world.level.TickList lambda$new$1(net.minecraft.core.BlockPos) -> i
-    60:60:net.minecraft.world.level.TickList lambda$new$0(net.minecraft.core.BlockPos) -> j
+    102:122:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> a
+    128:128:boolean hasChunk(int,int) -> b
+    133:133:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
+    138:138:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
+    144:144:net.minecraft.world.entity.player.Player getNearestPlayer(double,double,double,double,java.util.function.Predicate) -> a
+    149:149:int getSkyDarken() -> c
+    154:154:net.minecraft.world.level.biome.BiomeManager getBiomeManager() -> d
+    159:159:net.minecraft.world.level.biome.Biome getUncachedNoiseBiome(int,int,int) -> a
+    164:164:float getShade(net.minecraft.core.Direction,boolean) -> a
+    169:169:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
+    174:183:boolean destroyBlock(net.minecraft.core.BlockPos,boolean,net.minecraft.world.entity.Entity,int) -> a
+    190:220:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
+    225:254:boolean setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int,int) -> a
+    258:259:void markPosForPostprocessing(net.minecraft.core.BlockPos) -> e
+    266:270:boolean addFreshEntity(net.minecraft.world.entity.Entity) -> c
+    275:275:boolean removeBlock(net.minecraft.core.BlockPos,boolean) -> a
+    280:280:net.minecraft.world.level.border.WorldBorder getWorldBorder() -> f
+    285:285:boolean isClientSide() -> s_
+    291:291:net.minecraft.server.level.ServerLevel getLevel() -> h
+    296:296:net.minecraft.world.level.storage.LevelData getLevelData() -> u_
+    301:305:net.minecraft.world.DifficultyInstance getCurrentDifficultyAt(net.minecraft.core.BlockPos) -> d
+    311:311:net.minecraft.server.MinecraftServer getServer() -> l
+    316:316:net.minecraft.world.level.chunk.ChunkSource getChunkSource() -> E
+    321:321:long getSeed() -> B
+    326:326:net.minecraft.world.level.TickList getBlockTicks() -> G
+    331:331:net.minecraft.world.level.TickList getLiquidTicks() -> F
+    336:336:int getSeaLevel() -> t_
+    341:341:java.util.Random getRandom() -> v_
+    346:346:int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
+    351:351:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
+    355:355:void addParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
+    359:359:void levelEvent(net.minecraft.world.entity.player.Player,int,net.minecraft.core.BlockPos,int) -> a
+    363:363:net.minecraft.world.level.dimension.DimensionType dimensionType() -> m
+    368:368:boolean isStateAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> a
+    373:373:boolean isFluidAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> b
+    378:378:java.util.List getEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
+    383:383:java.util.List getEntities(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
+    388:388:java.util.List players() -> w
+    46:46:net.minecraft.world.level.Level getLevel() -> n
+    59:59:net.minecraft.world.level.TickList lambda$new$1(net.minecraft.core.BlockPos) -> i
+    58:58:net.minecraft.world.level.TickList lambda$new$0(net.minecraft.core.BlockPos) -> j
     47:47:void <clinit>() -> <clinit>
-net.minecraft.server.level.WorldGenTickList -> xk:
+net.minecraft.server.level.WorldGenTickList -> zk:
     java.util.function.Function index -> a
-    14:16:void <init>(java.util.function.Function) -> <init>
-    20:20:boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
-    25:26:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
-    30:30:boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
-    35:36:void addAll(java.util.stream.Stream) -> a
-    40:40:int size() -> a
-    35:35:void lambda$addAll$0(net.minecraft.world.level.TickNextTickData) -> a
-net.minecraft.server.level.package-info -> xl:
-net.minecraft.server.level.progress.ChunkProgressListener -> xm:
+    12:14:void <init>(java.util.function.Function) -> <init>
+    18:18:boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
+    23:24:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
+    28:28:boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
+    33:33:int size() -> a
+net.minecraft.server.level.package-info -> zl:
+net.minecraft.server.level.progress.ChunkProgressListener -> zm:
     void updateSpawnPos(net.minecraft.world.level.ChunkPos) -> a
     void onStatusChange(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.ChunkStatus) -> a
     void start() -> a
     void stop() -> b
-net.minecraft.server.level.progress.ChunkProgressListenerFactory -> xn:
+net.minecraft.server.level.progress.ChunkProgressListenerFactory -> zn:
     net.minecraft.server.level.progress.ChunkProgressListener create(int) -> create
-net.minecraft.server.level.progress.LoggerChunkProgressListener -> xo:
+net.minecraft.server.level.progress.LoggerChunkProgressListener -> zo:
     org.apache.logging.log4j.Logger LOGGER -> a
     int maxCount -> b
     int count -> c
@@ -30881,7 +33127,7 @@ net.minecraft.server.level.progress.LoggerChunkProgressListener -> xo:
     55:57:void stop() -> b
     60:60:int getProgress() -> c
     15:15:void <clinit>() -> <clinit>
-net.minecraft.server.level.progress.ProcessorChunkProgressListener -> xp:
+net.minecraft.server.level.progress.ProcessorChunkProgressListener -> zp:
     net.minecraft.server.level.progress.ChunkProgressListener delegate -> a
     net.minecraft.util.thread.ProcessorMailbox mailbox -> b
     14:17:void <init>(net.minecraft.server.level.progress.ChunkProgressListener,java.util.concurrent.Executor) -> <init>
@@ -30891,7 +33137,7 @@ net.minecraft.server.level.progress.ProcessorChunkProgressListener -> xp:
     36:37:void stop() -> b
     26:26:void lambda$onStatusChange$1(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.ChunkStatus) -> b
     21:21:void lambda$updateSpawnPos$0(net.minecraft.world.level.ChunkPos) -> b
-net.minecraft.server.level.progress.StoringChunkProgressListener -> xq:
+net.minecraft.server.level.progress.StoringChunkProgressListener -> zq:
     net.minecraft.server.level.progress.LoggerChunkProgressListener delegate -> a
     it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap statuses -> b
     net.minecraft.world.level.ChunkPos spawnPos -> c
@@ -30908,8 +33154,8 @@ net.minecraft.server.level.progress.StoringChunkProgressListener -> xq:
     66:66:int getDiameter() -> d
     70:70:int getProgress() -> e
     75:75:net.minecraft.world.level.chunk.ChunkStatus getStatus(int,int) -> a
-net.minecraft.server.level.progress.package-info -> xr:
-net.minecraft.server.network.LegacyQueryHandler -> xs:
+net.minecraft.server.level.progress.package-info -> zr:
+net.minecraft.server.network.LegacyQueryHandler -> zs:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.server.network.ServerConnectionListener serverConnectionListener -> b
     21:23:void <init>(net.minecraft.server.network.ServerConnectionListener) -> <init>
@@ -30917,14 +33163,14 @@ net.minecraft.server.network.LegacyQueryHandler -> xs:
     100:101:void sendFlushAndClose(io.netty.channel.ChannelHandlerContext,io.netty.buffer.ByteBuf) -> a
     104:113:io.netty.buffer.ByteBuf createReply(java.lang.String) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.server.network.MemoryServerHandshakePacketListenerImpl -> xt:
+net.minecraft.server.network.MemoryServerHandshakePacketListenerImpl -> zt:
     net.minecraft.server.MinecraftServer server -> a
     net.minecraft.network.Connection connection -> b
     13:16:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.network.Connection) -> <init>
     20:22:void handleIntention(net.minecraft.network.protocol.handshake.ClientIntentionPacket) -> a
     27:27:void onDisconnect(net.minecraft.network.chat.Component) -> a
     31:31:net.minecraft.network.Connection getConnection() -> a
-net.minecraft.server.network.ServerConnectionListener -> xu:
+net.minecraft.server.network.ServerConnectionListener -> zu:
     org.apache.logging.log4j.Logger LOGGER -> d
     net.minecraft.util.LazyLoadedValue SERVER_EVENT_GROUP -> a
     net.minecraft.util.LazyLoadedValue SERVER_EPOLL_EVENT_GROUP -> b
@@ -30932,35 +33178,35 @@ net.minecraft.server.network.ServerConnectionListener -> xu:
     boolean running -> c
     java.util.List channels -> f
     java.util.List connections -> g
-    63:69:void <init>(net.minecraft.server.MinecraftServer) -> <init>
-    72:116:void startTcpServerListener(java.net.InetAddress,int) -> a
-    121:144:java.net.SocketAddress startMemoryChannel() -> a
-    148:157:void stop() -> b
-    160:193:void tick() -> c
-    196:196:net.minecraft.server.MinecraftServer getServer() -> d
-    183:183:void lambda$tick$2(net.minecraft.network.Connection,net.minecraft.network.chat.Component,io.netty.util.concurrent.Future) -> a
-    58:58:io.netty.channel.epoll.EpollEventLoopGroup lambda$static$1() -> e
-    55:55:io.netty.channel.nio.NioEventLoopGroup lambda$static$0() -> f
-    52:52:java.util.List access$000(net.minecraft.server.network.ServerConnectionListener) -> a
-    52:52:net.minecraft.server.MinecraftServer access$100(net.minecraft.server.network.ServerConnectionListener) -> b
-    53:57:void <clinit>() -> <clinit>
-net.minecraft.server.network.ServerConnectionListener$1 -> xu$1:
+    62:68:void <init>(net.minecraft.server.MinecraftServer) -> <init>
+    71:115:void startTcpServerListener(java.net.InetAddress,int) -> a
+    120:143:java.net.SocketAddress startMemoryChannel() -> a
+    147:156:void stop() -> b
+    159:187:void tick() -> c
+    190:190:net.minecraft.server.MinecraftServer getServer() -> d
+    177:177:void lambda$tick$2(net.minecraft.network.Connection,net.minecraft.network.chat.Component,io.netty.util.concurrent.Future) -> a
+    57:57:io.netty.channel.epoll.EpollEventLoopGroup lambda$static$1() -> e
+    54:54:io.netty.channel.nio.NioEventLoopGroup lambda$static$0() -> f
+    51:51:java.util.List access$000(net.minecraft.server.network.ServerConnectionListener) -> a
+    51:51:net.minecraft.server.MinecraftServer access$100(net.minecraft.server.network.ServerConnectionListener) -> b
+    52:56:void <clinit>() -> <clinit>
+net.minecraft.server.network.ServerConnectionListener$1 -> zu$1:
     net.minecraft.server.network.ServerConnectionListener this$0 -> a
-    87:87:void <init>(net.minecraft.server.network.ServerConnectionListener) -> <init>
-    91:109:void initChannel(io.netty.channel.Channel) -> initChannel
-net.minecraft.server.network.ServerConnectionListener$2 -> xu$2:
+    86:86:void <init>(net.minecraft.server.network.ServerConnectionListener) -> <init>
+    90:108:void initChannel(io.netty.channel.Channel) -> initChannel
+net.minecraft.server.network.ServerConnectionListener$2 -> zu$2:
     net.minecraft.server.network.ServerConnectionListener this$0 -> a
-    124:124:void <init>(net.minecraft.server.network.ServerConnectionListener) -> <init>
-    127:134:void initChannel(io.netty.channel.Channel) -> initChannel
-net.minecraft.server.network.ServerConnectionListener$LatencySimulator -> xu$a:
+    123:123:void <init>(net.minecraft.server.network.ServerConnectionListener) -> <init>
+    126:133:void initChannel(io.netty.channel.Channel) -> initChannel
+net.minecraft.server.network.ServerConnectionListener$LatencySimulator -> zu$a:
     io.netty.util.Timer TIMER -> a
     int delay -> b
-    204:206:void <init>(int) -> <init>
-    210:211:void channelRead(io.netty.channel.ChannelHandlerContext,java.lang.Object) -> channelRead
-    214:215:void delayDownstream(io.netty.channel.ChannelHandlerContext,java.lang.Object) -> a
-    214:214:void lambda$delayDownstream$0(io.netty.channel.ChannelHandlerContext,java.lang.Object,io.netty.util.Timeout) -> a
-    200:200:void <clinit>() -> <clinit>
-net.minecraft.server.network.ServerGamePacketListenerImpl -> xv:
+    198:200:void <init>(int) -> <init>
+    204:205:void channelRead(io.netty.channel.ChannelHandlerContext,java.lang.Object) -> channelRead
+    208:209:void delayDownstream(io.netty.channel.ChannelHandlerContext,java.lang.Object) -> a
+    208:208:void lambda$delayDownstream$0(io.netty.channel.ChannelHandlerContext,java.lang.Object,io.netty.util.Timeout) -> a
+    194:194:void <clinit>() -> <clinit>
+net.minecraft.server.network.ServerGamePacketListenerImpl -> zv:
     org.apache.logging.log4j.Logger LOGGER -> c
     net.minecraft.network.Connection connection -> a
     net.minecraft.server.MinecraftServer server -> d
@@ -30994,88 +33240,95 @@ net.minecraft.server.network.ServerGamePacketListenerImpl -> xv:
     int aboveGroundVehicleTickCount -> E
     int receivedMovePacketCount -> F
     int knownMovePacketCount -> G
-    161:191:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.network.Connection,net.minecraft.server.level.ServerPlayer) -> <init>
-    194:262:void tick() -> b
-    265:271:void resetPosition() -> c
-    275:275:net.minecraft.network.Connection getConnection() -> a
-    279:279:boolean isSingleplayerOwner() -> d
-    283:286:void disconnect(net.minecraft.network.chat.Component) -> b
-    290:292:void handlePlayerInput(net.minecraft.network.protocol.game.ServerboundPlayerInputPacket) -> a
-    295:301:boolean containsInvalidValues(net.minecraft.network.protocol.game.ServerboundMovePlayerPacket) -> b
-    305:305:boolean containsInvalidValues(net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket) -> b
-    310:383:void handleMoveVehicle(net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket) -> a
-    387:400:void handleAcceptTeleportPacket(net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket) -> a
-    404:417:void handleRecipeBookUpdatePacket(net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket) -> a
-    421:429:void handleSeenAdvancements(net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket) -> a
-    433:440:void handleCustomCommandSuggestions(net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket) -> a
-    444:502:void handleSetCommandBlock(net.minecraft.network.protocol.game.ServerboundSetCommandBlockPacket) -> a
-    506:526:void handleSetCommandMinecart(net.minecraft.network.protocol.game.ServerboundSetCommandMinecartPacket) -> a
-    530:535:void handlePickItem(net.minecraft.network.protocol.game.ServerboundPickItemPacket) -> a
-    539:547:void handleRenameItem(net.minecraft.network.protocol.game.ServerboundRenameItemPacket) -> a
-    551:555:void handleSetBeaconPacket(net.minecraft.network.protocol.game.ServerboundSetBeaconPacket) -> a
-    559:612:void handleSetStructureBlock(net.minecraft.network.protocol.game.ServerboundSetStructureBlockPacket) -> a
-    616:631:void handleSetJigsawBlock(net.minecraft.network.protocol.game.ServerboundSetJigsawBlockPacket) -> a
-    635:643:void handleSelectTrade(net.minecraft.network.protocol.game.ServerboundSelectTradePacket) -> a
-    647:682:void handleEditBook(net.minecraft.network.protocol.game.ServerboundEditBookPacket) -> a
-    686:697:void handleEntityTagQuery(net.minecraft.network.protocol.game.ServerboundEntityTagQuery) -> a
-    701:710:void handleBlockEntityTagQuery(net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery) -> a
-    714:854:void handleMovePlayer(net.minecraft.network.protocol.game.ServerboundMovePlayerPacket) -> a
-    857:857:boolean isPlayerCollidingWithAnything(net.minecraft.world.level.LevelReader) -> a
-    861:862:void teleport(double,double,double,float,float) -> a
-    865:878:void teleport(double,double,double,float,float,java.util.Set) -> a
-    882:915:void handlePlayerAction(net.minecraft.network.protocol.game.ServerboundPlayerActionPacket) -> a
-    921:951:void handleUseItemOn(net.minecraft.network.protocol.game.ServerboundUseItemOnPacket) -> a
-    955:967:void handleUseItem(net.minecraft.network.protocol.game.ServerboundUseItemPacket) -> a
-    971:982:void handleTeleportToEntityPacket(net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket) -> a
-    986:986:void handleResourcePackResponse(net.minecraft.network.protocol.game.ServerboundResourcePackPacket) -> a
-    990:995:void handlePaddleBoat(net.minecraft.network.protocol.game.ServerboundPaddleBoatPacket) -> a
-    999:1009:void onDisconnect(net.minecraft.network.chat.Component) -> a
-    1012:1013:void send(net.minecraft.network.protocol.Packet) -> a
-    1016:1038:void send(net.minecraft.network.protocol.Packet,io.netty.util.concurrent.GenericFutureListener) -> a
-    1042:1049:void handleSetCarriedItem(net.minecraft.network.protocol.game.ServerboundSetCarriedItemPacket) -> a
-    1053:1080:void handleChat(net.minecraft.network.protocol.game.ServerboundChatPacket) -> a
-    1083:1084:void handleCommand(java.lang.String) -> c
-    1088:1091:void handleAnimate(net.minecraft.network.protocol.game.ServerboundSwingPacket) -> a
-    1095:1146:void handlePlayerCommand(net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket) -> a
-    1150:1151:void info(java.lang.String) -> a
-    1155:1156:void warn(java.lang.String) -> b
-    1160:1193:void handleInteract(net.minecraft.network.protocol.game.ServerboundInteractPacket) -> a
-    1197:1221:void handleClientCommand(net.minecraft.network.protocol.game.ServerboundClientCommandPacket) -> a
-    1225:1227:void handleContainerClose(net.minecraft.network.protocol.game.ServerboundContainerClosePacket) -> a
-    1231:1265:void handleContainerClick(net.minecraft.network.protocol.game.ServerboundContainerClickPacket) -> a
-    1269:1277:void handlePlaceRecipe(net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket) -> a
-    1281:1287:void handleContainerButtonClick(net.minecraft.network.protocol.game.ServerboundContainerButtonClickPacket) -> a
-    1291:1330:void handleSetCreativeModeSlot(net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket) -> a
-    1334:1339:void handleContainerAck(net.minecraft.network.protocol.game.ServerboundContainerAckPacket) -> a
-    1343:1369:void handleSignUpdate(net.minecraft.network.protocol.game.ServerboundSignUpdatePacket) -> a
-    1373:1382:void handleKeepAlive(net.minecraft.network.protocol.game.ServerboundKeepAlivePacket) -> a
-    1386:1388:void handlePlayerAbilities(net.minecraft.network.protocol.game.ServerboundPlayerAbilitiesPacket) -> a
-    1392:1394:void handleClientInformation(net.minecraft.network.protocol.game.ServerboundClientInformationPacket) -> a
-    1398:1398:void handleCustomPayload(net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket) -> a
-    1402:1409:void handleChangeDifficulty(net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket) -> a
-    1413:1420:void handleLockDifficulty(net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket) -> a
-    1276:1276:void lambda$handlePlaceRecipe$3(net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket,net.minecraft.world.item.crafting.Recipe) -> a
-    1034:1034:java.lang.String lambda$send$2(net.minecraft.network.protocol.Packet) -> b
-    439:439:void lambda$handleCustomCommandSuggestions$1(net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket,com.mojang.brigadier.suggestion.Suggestions) -> a
-    283:283:void lambda$disconnect$0(net.minecraft.network.chat.Component,io.netty.util.concurrent.Future) -> a
-    147:147:void <clinit>() -> <clinit>
-net.minecraft.server.network.ServerGamePacketListenerImpl$1 -> xv$1:
+    169:199:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.network.Connection,net.minecraft.server.level.ServerPlayer) -> <init>
+    202:270:void tick() -> b
+    273:279:void resetPosition() -> c
+    283:283:net.minecraft.network.Connection getConnection() -> a
+    287:287:boolean isSingleplayerOwner() -> d
+    291:294:void disconnect(net.minecraft.network.chat.Component) -> b
+    298:300:void handlePlayerInput(net.minecraft.network.protocol.game.ServerboundPlayerInputPacket) -> a
+    303:309:boolean containsInvalidValues(net.minecraft.network.protocol.game.ServerboundMovePlayerPacket) -> b
+    313:313:boolean containsInvalidValues(net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket) -> b
+    318:391:void handleMoveVehicle(net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket) -> a
+    394:394:boolean noBlocksAround(net.minecraft.world.entity.Entity) -> a
+    399:412:void handleAcceptTeleportPacket(net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket) -> a
+    416:429:void handleRecipeBookUpdatePacket(net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket) -> a
+    433:441:void handleSeenAdvancements(net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket) -> a
+    445:452:void handleCustomCommandSuggestions(net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket) -> a
+    456:514:void handleSetCommandBlock(net.minecraft.network.protocol.game.ServerboundSetCommandBlockPacket) -> a
+    518:538:void handleSetCommandMinecart(net.minecraft.network.protocol.game.ServerboundSetCommandMinecartPacket) -> a
+    542:547:void handlePickItem(net.minecraft.network.protocol.game.ServerboundPickItemPacket) -> a
+    551:559:void handleRenameItem(net.minecraft.network.protocol.game.ServerboundRenameItemPacket) -> a
+    563:567:void handleSetBeaconPacket(net.minecraft.network.protocol.game.ServerboundSetBeaconPacket) -> a
+    571:624:void handleSetStructureBlock(net.minecraft.network.protocol.game.ServerboundSetStructureBlockPacket) -> a
+    628:645:void handleSetJigsawBlock(net.minecraft.network.protocol.game.ServerboundSetJigsawBlockPacket) -> a
+    649:659:void handleJigsawGenerate(net.minecraft.network.protocol.game.ServerboundJigsawGeneratePacket) -> a
+    663:671:void handleSelectTrade(net.minecraft.network.protocol.game.ServerboundSelectTradePacket) -> a
+    675:710:void handleEditBook(net.minecraft.network.protocol.game.ServerboundEditBookPacket) -> a
+    714:725:void handleEntityTagQuery(net.minecraft.network.protocol.game.ServerboundEntityTagQuery) -> a
+    729:738:void handleBlockEntityTagQuery(net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery) -> a
+    742:883:void handleMovePlayer(net.minecraft.network.protocol.game.ServerboundMovePlayerPacket) -> a
+    886:888:boolean isPlayerCollidingWithAnythingNew(net.minecraft.world.level.LevelReader,net.minecraft.world.phys.AABB) -> a
+    892:893:void teleport(double,double,double,float,float) -> a
+    896:909:void teleport(double,double,double,float,float,java.util.Set) -> a
+    913:947:void handlePlayerAction(net.minecraft.network.protocol.game.ServerboundPlayerActionPacket) -> a
+    952:957:boolean wasBlockPlacementAttempt(net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.ItemStack) -> a
+    962:997:void handleUseItemOn(net.minecraft.network.protocol.game.ServerboundUseItemOnPacket) -> a
+    1001:1016:void handleUseItem(net.minecraft.network.protocol.game.ServerboundUseItemPacket) -> a
+    1020:1031:void handleTeleportToEntityPacket(net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket) -> a
+    1035:1035:void handleResourcePackResponse(net.minecraft.network.protocol.game.ServerboundResourcePackPacket) -> a
+    1039:1044:void handlePaddleBoat(net.minecraft.network.protocol.game.ServerboundPaddleBoatPacket) -> a
+    1048:1058:void onDisconnect(net.minecraft.network.chat.Component) -> a
+    1061:1062:void send(net.minecraft.network.protocol.Packet) -> a
+    1065:1087:void send(net.minecraft.network.protocol.Packet,io.netty.util.concurrent.GenericFutureListener) -> a
+    1091:1101:void handleSetCarriedItem(net.minecraft.network.protocol.game.ServerboundSetCarriedItemPacket) -> a
+    1105:1131:void handleChat(net.minecraft.network.protocol.game.ServerboundChatPacket) -> a
+    1134:1135:void handleCommand(java.lang.String) -> c
+    1139:1142:void handleAnimate(net.minecraft.network.protocol.game.ServerboundSwingPacket) -> a
+    1146:1197:void handlePlayerCommand(net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket) -> a
+    1201:1202:void info(java.lang.String) -> a
+    1206:1207:void warn(java.lang.String) -> b
+    1211:1246:void handleInteract(net.minecraft.network.protocol.game.ServerboundInteractPacket) -> a
+    1250:1274:void handleClientCommand(net.minecraft.network.protocol.game.ServerboundClientCommandPacket) -> a
+    1278:1280:void handleContainerClose(net.minecraft.network.protocol.game.ServerboundContainerClosePacket) -> a
+    1284:1318:void handleContainerClick(net.minecraft.network.protocol.game.ServerboundContainerClickPacket) -> a
+    1322:1330:void handlePlaceRecipe(net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket) -> a
+    1334:1340:void handleContainerButtonClick(net.minecraft.network.protocol.game.ServerboundContainerButtonClickPacket) -> a
+    1344:1383:void handleSetCreativeModeSlot(net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket) -> a
+    1387:1392:void handleContainerAck(net.minecraft.network.protocol.game.ServerboundContainerAckPacket) -> a
+    1396:1422:void handleSignUpdate(net.minecraft.network.protocol.game.ServerboundSignUpdatePacket) -> a
+    1426:1435:void handleKeepAlive(net.minecraft.network.protocol.game.ServerboundKeepAlivePacket) -> a
+    1439:1441:void handlePlayerAbilities(net.minecraft.network.protocol.game.ServerboundPlayerAbilitiesPacket) -> a
+    1445:1447:void handleClientInformation(net.minecraft.network.protocol.game.ServerboundClientInformationPacket) -> a
+    1451:1451:void handleCustomPayload(net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket) -> a
+    1455:1462:void handleChangeDifficulty(net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket) -> a
+    1466:1473:void handleLockDifficulty(net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket) -> a
+    1329:1329:void lambda$handlePlaceRecipe$5(net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket,net.minecraft.world.item.crafting.Recipe) -> a
+    1083:1083:java.lang.String lambda$send$4(net.minecraft.network.protocol.Packet) -> b
+    888:888:boolean lambda$isPlayerCollidingWithAnythingNew$3(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    886:886:boolean lambda$isPlayerCollidingWithAnythingNew$2(net.minecraft.world.entity.Entity) -> b
+    451:451:void lambda$handleCustomCommandSuggestions$1(net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket,com.mojang.brigadier.suggestion.Suggestions) -> a
+    291:291:void lambda$disconnect$0(net.minecraft.network.chat.Component,io.netty.util.concurrent.Future) -> a
+    155:155:void <clinit>() -> <clinit>
+net.minecraft.server.network.ServerGamePacketListenerImpl$1 -> zv$1:
     int[] $SwitchMap$net$minecraft$world$level$block$entity$CommandBlockEntity$Mode -> a
     int[] $SwitchMap$net$minecraft$network$protocol$game$ServerboundPlayerActionPacket$Action -> b
     int[] $SwitchMap$net$minecraft$network$protocol$game$ServerboundPlayerCommandPacket$Action -> c
     int[] $SwitchMap$net$minecraft$network$protocol$game$ServerboundClientCommandPacket$Action -> d
-    470:1200:void <clinit>() -> <clinit>
-net.minecraft.server.network.ServerHandshakePacketListenerImpl -> xw:
-    net.minecraft.server.MinecraftServer server -> a
-    net.minecraft.network.Connection connection -> b
-    17:20:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.network.Connection) -> <init>
-    24:47:void handleIntention(net.minecraft.network.protocol.handshake.ClientIntentionPacket) -> a
-    52:52:void onDisconnect(net.minecraft.network.chat.Component) -> a
-    56:56:net.minecraft.network.Connection getConnection() -> a
-net.minecraft.server.network.ServerHandshakePacketListenerImpl$1 -> xw$1:
+    482:1253:void <clinit>() -> <clinit>
+net.minecraft.server.network.ServerHandshakePacketListenerImpl -> zw:
+    net.minecraft.network.chat.Component IGNORE_STATUS_REASON -> a
+    net.minecraft.server.MinecraftServer server -> b
+    net.minecraft.network.Connection connection -> c
+    20:23:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.network.Connection) -> <init>
+    27:54:void handleIntention(net.minecraft.network.protocol.handshake.ClientIntentionPacket) -> a
+    59:59:void onDisconnect(net.minecraft.network.chat.Component) -> a
+    63:63:net.minecraft.network.Connection getConnection() -> a
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.server.network.ServerHandshakePacketListenerImpl$1 -> zw$1:
     int[] $SwitchMap$net$minecraft$network$ConnectionProtocol -> a
-    24:24:void <clinit>() -> <clinit>
-net.minecraft.server.network.ServerLoginPacketListenerImpl -> xx:
+    27:27:void <clinit>() -> <clinit>
+net.minecraft.server.network.ServerLoginPacketListenerImpl -> zx:
     java.util.concurrent.atomic.AtomicInteger UNIQUE_THREAD_ID -> b
     org.apache.logging.log4j.Logger LOGGER -> c
     java.util.Random RANDOM -> d
@@ -31107,12 +33360,12 @@ net.minecraft.server.network.ServerLoginPacketListenerImpl -> xx:
     39:39:org.apache.logging.log4j.Logger access$300() -> e
     39:39:net.minecraft.server.network.ServerLoginPacketListenerImpl$State access$402(net.minecraft.server.network.ServerLoginPacketListenerImpl,net.minecraft.server.network.ServerLoginPacketListenerImpl$State) -> a
     40:43:void <clinit>() -> <clinit>
-net.minecraft.server.network.ServerLoginPacketListenerImpl$1 -> xx$1:
+net.minecraft.server.network.ServerLoginPacketListenerImpl$1 -> zx$1:
     net.minecraft.server.network.ServerLoginPacketListenerImpl this$0 -> a
     155:155:void <init>(net.minecraft.server.network.ServerLoginPacketListenerImpl,java.lang.String) -> <init>
     158:185:void run() -> run
     189:190:java.net.InetAddress getAddress() -> a
-net.minecraft.server.network.ServerLoginPacketListenerImpl$State -> xx$a:
+net.minecraft.server.network.ServerLoginPacketListenerImpl$State -> zx$a:
     net.minecraft.server.network.ServerLoginPacketListenerImpl$State HELLO -> a
     net.minecraft.server.network.ServerLoginPacketListenerImpl$State KEY -> b
     net.minecraft.server.network.ServerLoginPacketListenerImpl$State AUTHENTICATING -> c
@@ -31125,7 +33378,7 @@ net.minecraft.server.network.ServerLoginPacketListenerImpl$State -> xx$a:
     207:207:net.minecraft.server.network.ServerLoginPacketListenerImpl$State valueOf(java.lang.String) -> valueOf
     207:207:void <init>(java.lang.String,int) -> <init>
     207:208:void <clinit>() -> <clinit>
-net.minecraft.server.network.ServerStatusPacketListenerImpl -> xy:
+net.minecraft.server.network.ServerStatusPacketListenerImpl -> zy:
     net.minecraft.network.chat.Component DISCONNECT_REASON -> a
     net.minecraft.server.MinecraftServer server -> b
     net.minecraft.network.Connection connection -> c
@@ -31136,9 +33389,9 @@ net.minecraft.server.network.ServerStatusPacketListenerImpl -> xy:
     37:43:void handleStatusRequest(net.minecraft.network.protocol.status.ServerboundStatusRequestPacket) -> a
     47:49:void handlePingRequest(net.minecraft.network.protocol.status.ServerboundPingRequestPacket) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.server.network.package-info -> xz:
-net.minecraft.server.package-info -> ya:
-net.minecraft.server.packs.AbstractResourcePack -> yb:
+net.minecraft.server.network.package-info -> zz:
+net.minecraft.server.package-info -> aaa:
+net.minecraft.server.packs.AbstractPackResources -> aab:
     org.apache.logging.log4j.Logger LOGGER -> b
     java.io.File file -> a
     24:26:void <init>(java.io.File) -> <init>
@@ -31154,7 +33407,7 @@ net.minecraft.server.packs.AbstractResourcePack -> yb:
     73:87:java.lang.Object getMetadataFromStream(net.minecraft.server.packs.metadata.MetadataSectionSerializer,java.io.InputStream) -> a
     93:93:java.lang.String getName() -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.server.packs.FileResourcePack -> yc:
+net.minecraft.server.packs.FilePackResources -> aac:
     com.google.common.base.Splitter SPLITTER -> b
     java.util.zip.ZipFile zipFile -> c
     27:28:void <init>(java.io.File) -> <init>
@@ -31166,7 +33419,7 @@ net.minecraft.server.packs.FileResourcePack -> yc:
     101:105:void close() -> close
     111:138:java.util.Collection getResources(net.minecraft.server.packs.PackType,java.lang.String,java.lang.String,int,java.util.function.Predicate) -> a
     23:23:void <clinit>() -> <clinit>
-net.minecraft.server.packs.FolderResourcePack -> yd:
+net.minecraft.server.packs.FolderPackResources -> aad:
     org.apache.logging.log4j.Logger LOGGER -> b
     boolean ON_WINDOWS -> c
     com.google.common.base.CharMatcher BACKSLASH_MATCHER -> d
@@ -31180,7 +33433,7 @@ net.minecraft.server.packs.FolderResourcePack -> yd:
     99:102:java.util.Collection getResources(net.minecraft.server.packs.PackType,java.lang.String,java.lang.String,int,java.util.function.Predicate) -> a
     106:124:void listResources(java.io.File,int,java.lang.String,java.util.List,java.lang.String,java.util.function.Predicate) -> a
     26:29:void <clinit>() -> <clinit>
-net.minecraft.server.packs.Pack -> ye:
+net.minecraft.server.packs.PackResources -> aae:
     java.io.InputStream getRootResource(java.lang.String) -> b
     java.io.InputStream getResource(net.minecraft.server.packs.PackType,net.minecraft.resources.ResourceLocation) -> a
     java.util.Collection getResources(net.minecraft.server.packs.PackType,java.lang.String,java.lang.String,int,java.util.function.Predicate) -> a
@@ -31188,7 +33441,8 @@ net.minecraft.server.packs.Pack -> ye:
     java.util.Set getNamespaces(net.minecraft.server.packs.PackType) -> a
     java.lang.Object getMetadataSection(net.minecraft.server.packs.metadata.MetadataSectionSerializer) -> a
     java.lang.String getName() -> a
-net.minecraft.server.packs.PackType -> yf:
+    void close() -> close
+net.minecraft.server.packs.PackType -> aaf:
     net.minecraft.server.packs.PackType CLIENT_RESOURCES -> a
     net.minecraft.server.packs.PackType SERVER_DATA -> b
     java.lang.String directory -> c
@@ -31198,9 +33452,9 @@ net.minecraft.server.packs.PackType -> yf:
     10:12:void <init>(java.lang.String,int,java.lang.String) -> <init>
     15:15:java.lang.String getDirectory() -> a
     3:5:void <clinit>() -> <clinit>
-net.minecraft.server.packs.ResourcePackFileNotFoundException -> yg:
+net.minecraft.server.packs.ResourcePackFileNotFoundException -> aag:
     8:9:void <init>(java.io.File,java.lang.String) -> <init>
-net.minecraft.server.packs.VanillaPack -> yh:
+net.minecraft.server.packs.VanillaPackResources -> aah:
     java.nio.file.Path generatedDir -> a
     org.apache.logging.log4j.Logger LOGGER -> d
     java.lang.Class clientObject -> b
@@ -31224,10 +33478,10 @@ net.minecraft.server.packs.VanillaPack -> yh:
     150:150:boolean lambda$getResources$1(java.util.function.Predicate,java.nio.file.Path) -> a
     42:61:void lambda$static$0(java.util.HashMap) -> a
     38:41:void <clinit>() -> <clinit>
-net.minecraft.server.packs.metadata.MetadataSectionSerializer -> yi:
+net.minecraft.server.packs.metadata.MetadataSectionSerializer -> aai:
     java.lang.String getMetadataSectionName() -> a
     java.lang.Object fromJson(com.google.gson.JsonObject) -> a
-net.minecraft.server.packs.metadata.pack.PackMetadataSection -> yj:
+net.minecraft.server.packs.metadata.pack.PackMetadataSection -> aaj:
     net.minecraft.server.packs.metadata.pack.PackMetadataSectionSerializer SERIALIZER -> a
     net.minecraft.network.chat.Component description -> b
     int packFormat -> c
@@ -31235,25 +33489,68 @@ net.minecraft.server.packs.metadata.pack.PackMetadataSection -> yj:
     17:17:net.minecraft.network.chat.Component getDescription() -> a
     21:21:int getPackFormat() -> b
     6:6:void <clinit>() -> <clinit>
-net.minecraft.server.packs.metadata.pack.PackMetadataSectionSerializer -> yk:
+net.minecraft.server.packs.metadata.pack.PackMetadataSectionSerializer -> aak:
     9:9:void <init>() -> <init>
     12:17:net.minecraft.server.packs.metadata.pack.PackMetadataSection fromJson(com.google.gson.JsonObject) -> b
     22:22:java.lang.String getMetadataSectionName() -> a
     9:9:java.lang.Object fromJson(com.google.gson.JsonObject) -> a
-net.minecraft.server.packs.metadata.pack.package-info -> yl:
-net.minecraft.server.packs.metadata.package-info -> ym:
-net.minecraft.server.packs.package-info -> yn:
-net.minecraft.server.packs.repository.FolderRepositorySource -> yo:
+net.minecraft.server.packs.metadata.pack.package-info -> aal:
+net.minecraft.server.packs.metadata.package-info -> aam:
+net.minecraft.server.packs.package-info -> aan:
+net.minecraft.server.packs.repository.FolderRepositorySource -> aao:
     java.io.FileFilter RESOURCEPACK_FILTER -> a
     java.io.File folder -> b
-    22:24:void <init>(java.io.File) -> <init>
-    28:43:void loadPacks(java.util.Map,net.minecraft.server.packs.repository.UnopenedPack$UnopenedPackConstructor) -> a
-    46:49:java.util.function.Supplier createSupplier(java.io.File) -> a
-    49:49:net.minecraft.server.packs.Pack lambda$createSupplier$2(java.io.File) -> b
-    47:47:net.minecraft.server.packs.Pack lambda$createSupplier$1(java.io.File) -> c
+    net.minecraft.server.packs.repository.PackSource packSource -> c
+    23:26:void <init>(java.io.File,net.minecraft.server.packs.repository.PackSource) -> <init>
+    30:45:void loadPacks(java.util.function.Consumer,net.minecraft.server.packs.repository.Pack$PackConstructor) -> a
+    48:51:java.util.function.Supplier createSupplier(java.io.File) -> a
+    51:51:net.minecraft.server.packs.PackResources lambda$createSupplier$2(java.io.File) -> b
+    49:49:net.minecraft.server.packs.PackResources lambda$createSupplier$1(java.io.File) -> c
     14:17:boolean lambda$static$0(java.io.File) -> d
     13:13:void <clinit>() -> <clinit>
-net.minecraft.server.packs.repository.PackCompatibility -> yp:
+net.minecraft.server.packs.repository.Pack -> aap:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.server.packs.metadata.pack.PackMetadataSection BROKEN_ASSETS_FALLBACK -> b
+    java.lang.String id -> c
+    java.util.function.Supplier supplier -> d
+    net.minecraft.network.chat.Component title -> e
+    net.minecraft.network.chat.Component description -> f
+    net.minecraft.server.packs.repository.PackCompatibility compatibility -> g
+    net.minecraft.server.packs.repository.Pack$Position defaultPosition -> h
+    boolean required -> i
+    boolean fixedPosition -> j
+    net.minecraft.server.packs.repository.PackSource packSource -> k
+    39:54:net.minecraft.server.packs.repository.Pack create(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.server.packs.repository.Pack$PackConstructor,net.minecraft.server.packs.repository.Pack$Position,net.minecraft.server.packs.repository.PackSource) -> a
+    57:67:void <init>(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.server.packs.repository.PackCompatibility,net.minecraft.server.packs.repository.Pack$Position,boolean,net.minecraft.server.packs.repository.PackSource) -> <init>
+    70:71:void <init>(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.server.packs.PackResources,net.minecraft.server.packs.metadata.pack.PackMetadataSection,net.minecraft.server.packs.repository.Pack$Position,net.minecraft.server.packs.repository.PackSource) -> <init>
+    74:74:net.minecraft.network.chat.Component getTitle() -> a
+    78:78:net.minecraft.network.chat.Component getDescription() -> b
+    82:82:net.minecraft.network.chat.Component getChatLink(boolean) -> a
+    90:90:net.minecraft.server.packs.repository.PackCompatibility getCompatibility() -> c
+    94:94:net.minecraft.server.packs.PackResources open() -> d
+    98:98:java.lang.String getId() -> e
+    102:102:boolean isRequired() -> f
+    106:106:boolean isFixedPosition() -> g
+    110:110:net.minecraft.server.packs.repository.Pack$Position getDefaultPosition() -> h
+    114:114:net.minecraft.server.packs.repository.PackSource getPackSource() -> i
+    125:134:boolean equals(java.lang.Object) -> equals
+    139:139:int hashCode() -> hashCode
+    144:144:void close() -> close
+    82:85:net.minecraft.network.chat.Style lambda$getChatLink$0(boolean,net.minecraft.network.chat.Style) -> a
+    24:25:void <clinit>() -> <clinit>
+net.minecraft.server.packs.repository.Pack$PackConstructor -> aap$a:
+    net.minecraft.server.packs.repository.Pack create(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.server.packs.PackResources,net.minecraft.server.packs.metadata.pack.PackMetadataSection,net.minecraft.server.packs.repository.Pack$Position,net.minecraft.server.packs.repository.PackSource) -> create
+net.minecraft.server.packs.repository.Pack$Position -> aap$b:
+    net.minecraft.server.packs.repository.Pack$Position TOP -> a
+    net.minecraft.server.packs.repository.Pack$Position BOTTOM -> b
+    net.minecraft.server.packs.repository.Pack$Position[] $VALUES -> c
+    146:146:net.minecraft.server.packs.repository.Pack$Position[] values() -> values
+    146:146:net.minecraft.server.packs.repository.Pack$Position valueOf(java.lang.String) -> valueOf
+    146:146:void <init>(java.lang.String,int) -> <init>
+    153:177:int insert(java.util.List,java.lang.Object,java.util.function.Function,boolean) -> a
+    182:182:net.minecraft.server.packs.repository.Pack$Position opposite() -> a
+    146:148:void <clinit>() -> <clinit>
+net.minecraft.server.packs.repository.PackCompatibility -> aaq:
     net.minecraft.server.packs.repository.PackCompatibility TOO_OLD -> a
     net.minecraft.server.packs.repository.PackCompatibility TOO_NEW -> b
     net.minecraft.server.packs.repository.PackCompatibility COMPATIBLE -> c
@@ -31268,100 +33565,77 @@ net.minecraft.server.packs.repository.PackCompatibility -> yp:
     36:36:net.minecraft.network.chat.Component getDescription() -> b
     40:40:net.minecraft.network.chat.Component getConfirmation() -> c
     7:10:void <clinit>() -> <clinit>
-net.minecraft.server.packs.repository.PackRepository -> yq:
+net.minecraft.server.packs.repository.PackRepository -> aar:
     java.util.Set sources -> a
     java.util.Map available -> b
     java.util.List selected -> c
-    net.minecraft.server.packs.repository.UnopenedPack$UnopenedPackConstructor constructor -> d
-    18:25:void <init>(net.minecraft.server.packs.repository.UnopenedPack$UnopenedPackConstructor) -> <init>
-    28:42:void reload() -> a
-    45:48:void sortAvailable() -> e
-    51:58:void setSelected(java.util.Collection) -> a
-    61:61:java.util.Collection getAvailable() -> b
-    65:67:java.util.Collection getUnselected() -> c
-    71:71:java.util.Collection getSelected() -> d
-    76:76:net.minecraft.server.packs.repository.UnopenedPack getPack(java.lang.String) -> a
-    80:81:void addSource(net.minecraft.server.packs.repository.RepositorySource) -> a
-    85:86:void close() -> close
-    47:47:void lambda$sortAvailable$0(java.util.Map$Entry) -> a
-net.minecraft.server.packs.repository.RepositorySource -> yr:
-    void loadPacks(java.util.Map,net.minecraft.server.packs.repository.UnopenedPack$UnopenedPackConstructor) -> a
-net.minecraft.server.packs.repository.ServerPacksSource -> ys:
-    net.minecraft.server.packs.VanillaPack vanillaPack -> a
+    net.minecraft.server.packs.repository.Pack$PackConstructor constructor -> d
+    21:28:void <init>(net.minecraft.server.packs.repository.Pack$PackConstructor,net.minecraft.server.packs.repository.RepositorySource[]) -> <init>
+    31:35:void reload() -> a
+    38:42:java.util.Map discoverAvailable() -> g
+    46:47:void setSelected(java.util.Collection) -> a
+    50:58:java.util.List rebuildSelected(java.util.Collection) -> b
+    62:62:java.util.stream.Stream getAvailablePacks(java.util.Collection) -> c
+    66:66:java.util.Collection getAvailableIds() -> b
+    70:70:java.util.Collection getAvailablePacks() -> c
+    74:74:java.util.Collection getSelectedIds() -> d
+    78:78:java.util.Collection getSelectedPacks() -> e
+    83:83:net.minecraft.server.packs.repository.Pack getPack(java.lang.String) -> a
+    88:89:void close() -> close
+    92:92:boolean isAvailable(java.lang.String) -> b
+    96:96:java.util.List openAllSelected() -> f
+    40:40:void lambda$discoverAvailable$0(java.util.Map,net.minecraft.server.packs.repository.Pack) -> a
+net.minecraft.server.packs.repository.PackSource -> aas:
+    net.minecraft.server.packs.repository.PackSource DEFAULT -> a
+    net.minecraft.server.packs.repository.PackSource BUILT_IN -> b
+    net.minecraft.server.packs.repository.PackSource WORLD -> c
+    net.minecraft.server.packs.repository.PackSource SERVER -> d
+    net.minecraft.network.chat.Component decorate(net.minecraft.network.chat.Component) -> decorate
+    18:18:net.minecraft.server.packs.repository.PackSource passThrough() -> a
+    22:23:net.minecraft.server.packs.repository.PackSource decorating(java.lang.String) -> a
+    23:23:net.minecraft.network.chat.Component lambda$decorating$1(net.minecraft.network.chat.Component,net.minecraft.network.chat.Component) -> a
+    18:18:net.minecraft.network.chat.Component lambda$passThrough$0(net.minecraft.network.chat.Component) -> a
+    8:13:void <clinit>() -> <clinit>
+net.minecraft.server.packs.repository.RepositorySource -> aat:
+    void loadPacks(java.util.function.Consumer,net.minecraft.server.packs.repository.Pack$PackConstructor) -> a
+net.minecraft.server.packs.repository.ServerPacksSource -> aau:
+    net.minecraft.server.packs.VanillaPackResources vanillaPack -> a
     8:11:void <init>() -> <init>
-    15:19:void loadPacks(java.util.Map,net.minecraft.server.packs.repository.UnopenedPack$UnopenedPackConstructor) -> a
-    15:15:net.minecraft.server.packs.Pack lambda$loadPacks$0() -> a
-net.minecraft.server.packs.repository.UnopenedPack -> yt:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.server.packs.metadata.pack.PackMetadataSection BROKEN_ASSETS_FALLBACK -> b
-    java.lang.String id -> c
-    java.util.function.Supplier supplier -> d
-    net.minecraft.network.chat.Component title -> e
-    net.minecraft.network.chat.Component description -> f
-    net.minecraft.server.packs.repository.PackCompatibility compatibility -> g
-    net.minecraft.server.packs.repository.UnopenedPack$Position defaultPosition -> h
-    boolean required -> i
-    boolean fixedPosition -> j
-    37:52:net.minecraft.server.packs.repository.UnopenedPack create(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.server.packs.repository.UnopenedPack$UnopenedPackConstructor,net.minecraft.server.packs.repository.UnopenedPack$Position) -> a
-    55:64:void <init>(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.network.chat.Component,net.minecraft.network.chat.Component,net.minecraft.server.packs.repository.PackCompatibility,net.minecraft.server.packs.repository.UnopenedPack$Position,boolean) -> <init>
-    67:68:void <init>(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.server.packs.Pack,net.minecraft.server.packs.metadata.pack.PackMetadataSection,net.minecraft.server.packs.repository.UnopenedPack$Position) -> <init>
-    71:71:net.minecraft.network.chat.Component getTitle() -> a
-    75:75:net.minecraft.network.chat.Component getDescription() -> b
-    79:79:net.minecraft.network.chat.Component getChatLink(boolean) -> a
-    87:87:net.minecraft.server.packs.repository.PackCompatibility getCompatibility() -> c
-    91:91:net.minecraft.server.packs.Pack open() -> d
-    95:95:java.lang.String getId() -> e
-    99:99:boolean isRequired() -> f
-    103:103:boolean isFixedPosition() -> g
-    107:107:net.minecraft.server.packs.repository.UnopenedPack$Position getDefaultPosition() -> h
-    118:127:boolean equals(java.lang.Object) -> equals
-    132:132:int hashCode() -> hashCode
-    137:137:void close() -> close
-    79:82:void lambda$getChatLink$0(boolean,net.minecraft.network.chat.Style) -> a
-    23:24:void <clinit>() -> <clinit>
-net.minecraft.server.packs.repository.UnopenedPack$Position -> yt$a:
-    net.minecraft.server.packs.repository.UnopenedPack$Position TOP -> a
-    net.minecraft.server.packs.repository.UnopenedPack$Position BOTTOM -> b
-    net.minecraft.server.packs.repository.UnopenedPack$Position[] $VALUES -> c
-    139:139:net.minecraft.server.packs.repository.UnopenedPack$Position[] values() -> values
-    139:139:net.minecraft.server.packs.repository.UnopenedPack$Position valueOf(java.lang.String) -> valueOf
-    139:139:void <init>(java.lang.String,int) -> <init>
-    146:170:int insert(java.util.List,java.lang.Object,java.util.function.Function,boolean) -> a
-    175:175:net.minecraft.server.packs.repository.UnopenedPack$Position opposite() -> a
-    139:141:void <clinit>() -> <clinit>
-net.minecraft.server.packs.repository.UnopenedPack$UnopenedPackConstructor -> yt$b:
-    net.minecraft.server.packs.repository.UnopenedPack create(java.lang.String,boolean,java.util.function.Supplier,net.minecraft.server.packs.Pack,net.minecraft.server.packs.metadata.pack.PackMetadataSection,net.minecraft.server.packs.repository.UnopenedPack$Position) -> create
-net.minecraft.server.packs.repository.package-info -> yu:
-net.minecraft.server.packs.resources.FallbackResourceManager -> yv:
+    15:19:void loadPacks(java.util.function.Consumer,net.minecraft.server.packs.repository.Pack$PackConstructor) -> a
+    15:15:net.minecraft.server.packs.PackResources lambda$loadPacks$0() -> a
+net.minecraft.server.packs.repository.package-info -> aav:
+net.minecraft.server.packs.resources.FallbackResourceManager -> aaw:
     org.apache.logging.log4j.Logger LOGGER -> b
     java.util.List fallbacks -> a
     net.minecraft.server.packs.PackType type -> c
     java.lang.String namespace -> d
-    26:33:void <init>(net.minecraft.server.packs.PackType,java.lang.String) -> <init>
-    37:38:void add(net.minecraft.server.packs.Pack) -> a
-    42:42:java.util.Set getNamespaces() -> a
-    47:67:net.minecraft.server.packs.resources.Resource getResource(net.minecraft.resources.ResourceLocation) -> a
-    72:84:boolean hasResource(net.minecraft.resources.ResourceLocation) -> b
-    88:89:java.io.InputStream getWrappedResource(net.minecraft.resources.ResourceLocation,net.minecraft.server.packs.Pack) -> a
-    93:96:void validateLocation(net.minecraft.resources.ResourceLocation) -> e
-    99:99:boolean isValidLocation(net.minecraft.resources.ResourceLocation) -> f
-    132:148:java.util.List getResources(net.minecraft.resources.ResourceLocation) -> c
-    153:161:java.util.Collection listResources(java.lang.String,java.util.function.Predicate) -> a
-    165:165:net.minecraft.resources.ResourceLocation getMetadataLocation(net.minecraft.resources.ResourceLocation) -> d
-    23:23:org.apache.logging.log4j.Logger access$000() -> b
-    24:24:void <clinit>() -> <clinit>
-net.minecraft.server.packs.resources.FallbackResourceManager$LeakedResourceWarningInputStream -> yv$a:
+    28:35:void <init>(net.minecraft.server.packs.PackType,java.lang.String) -> <init>
+    38:39:void add(net.minecraft.server.packs.PackResources) -> a
+    43:43:java.util.Set getNamespaces() -> a
+    48:68:net.minecraft.server.packs.resources.Resource getResource(net.minecraft.resources.ResourceLocation) -> a
+    73:85:boolean hasResource(net.minecraft.resources.ResourceLocation) -> b
+    89:90:java.io.InputStream getWrappedResource(net.minecraft.resources.ResourceLocation,net.minecraft.server.packs.PackResources) -> a
+    94:97:void validateLocation(net.minecraft.resources.ResourceLocation) -> e
+    100:100:boolean isValidLocation(net.minecraft.resources.ResourceLocation) -> f
+    133:149:java.util.List getResources(net.minecraft.resources.ResourceLocation) -> c
+    154:158:java.util.Collection listResources(net.minecraft.resources.ResourceLocation,java.util.function.Predicate) -> a
+    163:171:java.util.Collection listResources(java.lang.String,java.util.function.Predicate) -> a
+    176:176:java.util.stream.Stream listPacks() -> b
+    180:180:net.minecraft.resources.ResourceLocation getMetadataLocation(net.minecraft.resources.ResourceLocation) -> d
+    25:25:org.apache.logging.log4j.Logger access$000() -> c
+    26:26:void <clinit>() -> <clinit>
+net.minecraft.server.packs.resources.FallbackResourceManager$LeakedResourceWarningInputStream -> aaw$a:
     java.lang.String message -> a
     boolean closed -> b
-    108:112:void <init>(java.io.InputStream,net.minecraft.resources.ResourceLocation,java.lang.String) -> <init>
-    116:118:void close() -> close
-    122:127:void finalize() -> finalize
-net.minecraft.server.packs.resources.PreparableReloadListener -> yw:
+    109:113:void <init>(java.io.InputStream,net.minecraft.resources.ResourceLocation,java.lang.String) -> <init>
+    117:119:void close() -> close
+    123:128:void finalize() -> finalize
+net.minecraft.server.packs.resources.PreparableReloadListener -> aax:
     java.util.concurrent.CompletableFuture reload(net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.ProfilerFiller,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
-    16:16:java.lang.String getName() -> i
-net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier -> yw$a:
+    16:16:java.lang.String getName() -> c
+net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier -> aax$a:
     java.util.concurrent.CompletableFuture wait(java.lang.Object) -> a
-net.minecraft.server.packs.resources.ProfiledReloadInstance -> yx:
+net.minecraft.server.packs.resources.ProfiledReloadInstance -> aay:
     org.apache.logging.log4j.Logger LOGGER -> d
     com.google.common.base.Stopwatch total -> e
     20:48:void <init>(net.minecraft.server.packs.resources.ResourceManager,java.util.List,java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.concurrent.CompletableFuture) -> <init>
@@ -31375,8 +33649,8 @@ net.minecraft.server.packs.resources.ProfiledReloadInstance -> yx:
     27:27:int lambda$null$1() -> f
     26:26:int lambda$null$0() -> g
     19:19:void <clinit>() -> <clinit>
-net.minecraft.server.packs.resources.ProfiledReloadInstance$1 -> yx$1:
-net.minecraft.server.packs.resources.ProfiledReloadInstance$State -> yx$a:
+net.minecraft.server.packs.resources.ProfiledReloadInstance$1 -> aay$1:
+net.minecraft.server.packs.resources.ProfiledReloadInstance$State -> aay$a:
     java.lang.String name -> a
     net.minecraft.util.profiling.ProfileResults preparationResult -> b
     net.minecraft.util.profiling.ProfileResults reloadResult -> c
@@ -31389,35 +33663,51 @@ net.minecraft.server.packs.resources.ProfiledReloadInstance$State -> yx$a:
     81:81:java.util.concurrent.atomic.AtomicLong access$300(net.minecraft.server.packs.resources.ProfiledReloadInstance$State) -> d
     81:81:java.lang.String access$400(net.minecraft.server.packs.resources.ProfiledReloadInstance$State) -> e
     81:81:void <init>(java.lang.String,net.minecraft.util.profiling.ProfileResults,net.minecraft.util.profiling.ProfileResults,java.util.concurrent.atomic.AtomicLong,java.util.concurrent.atomic.AtomicLong,net.minecraft.server.packs.resources.ProfiledReloadInstance$1) -> <init>
-net.minecraft.server.packs.resources.ReloadInstance -> yy:
+net.minecraft.server.packs.resources.ReloadInstance -> aaz:
     java.util.concurrent.CompletableFuture done() -> a
     float getActualProgress() -> b
     boolean isApplying() -> c
     boolean isDone() -> d
     void checkExceptions() -> e
-net.minecraft.server.packs.resources.ReloadableResourceManager -> yz:
-    java.util.concurrent.CompletableFuture reload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.List,java.util.concurrent.CompletableFuture) -> a
+net.minecraft.server.packs.resources.ReloadableResourceManager -> aba:
+    12:12:java.util.concurrent.CompletableFuture reload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.List,java.util.concurrent.CompletableFuture) -> a
     net.minecraft.server.packs.resources.ReloadInstance createQueuedReload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.concurrent.CompletableFuture) -> a
     net.minecraft.server.packs.resources.ReloadInstance createFullReload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.concurrent.CompletableFuture,java.util.List) -> a
     void registerReloadListener(net.minecraft.server.packs.resources.PreparableReloadListener) -> a
-net.minecraft.server.packs.resources.Resource -> za:
+    void close() -> close
+net.minecraft.server.packs.resources.Resource -> abb:
     net.minecraft.resources.ResourceLocation getLocation() -> a
     java.io.InputStream getInputStream() -> b
     boolean hasMetadata() -> c
     java.lang.Object getMetadata(net.minecraft.server.packs.metadata.MetadataSectionSerializer) -> a
     java.lang.String getSourceName() -> d
-net.minecraft.server.packs.resources.ResourceManager -> zb:
+net.minecraft.server.packs.resources.ResourceManager -> abc:
     java.util.Set getNamespaces() -> a
     net.minecraft.server.packs.resources.Resource getResource(net.minecraft.resources.ResourceLocation) -> a
     boolean hasResource(net.minecraft.resources.ResourceLocation) -> b
     java.util.List getResources(net.minecraft.resources.ResourceLocation) -> c
+    java.util.Collection listResources(net.minecraft.resources.ResourceLocation,java.util.function.Predicate) -> a
     java.util.Collection listResources(java.lang.String,java.util.function.Predicate) -> a
-    void add(net.minecraft.server.packs.Pack) -> a
-net.minecraft.server.packs.resources.ResourceManagerReloadListener -> zc:
+    java.util.stream.Stream listPacks() -> b
+net.minecraft.server.packs.resources.ResourceManager$Empty -> abc$a:
+    net.minecraft.server.packs.resources.ResourceManager$Empty INSTANCE -> a
+    net.minecraft.server.packs.resources.ResourceManager$Empty[] $VALUES -> b
+    41:41:net.minecraft.server.packs.resources.ResourceManager$Empty[] values() -> values
+    41:41:net.minecraft.server.packs.resources.ResourceManager$Empty valueOf(java.lang.String) -> valueOf
+    41:41:void <init>(java.lang.String,int) -> <init>
+    46:46:java.util.Set getNamespaces() -> a
+    51:51:net.minecraft.server.packs.resources.Resource getResource(net.minecraft.resources.ResourceLocation) -> a
+    56:56:boolean hasResource(net.minecraft.resources.ResourceLocation) -> b
+    61:61:java.util.List getResources(net.minecraft.resources.ResourceLocation) -> c
+    66:66:java.util.Collection listResources(net.minecraft.resources.ResourceLocation,java.util.function.Predicate) -> a
+    71:71:java.util.Collection listResources(java.lang.String,java.util.function.Predicate) -> a
+    76:76:java.util.stream.Stream listPacks() -> b
+    41:42:void <clinit>() -> <clinit>
+net.minecraft.server.packs.resources.ResourceManagerReloadListener -> abd:
     12:12:java.util.concurrent.CompletableFuture reload(net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.ProfilerFiller,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
     void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
-    12:12:void lambda$reload$0(net.minecraft.server.packs.resources.ResourceManager) -> b
-net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener -> zd:
+    13:18:void lambda$reload$0(net.minecraft.util.profiling.ProfilerFiller,net.minecraft.server.packs.resources.ResourceManager) -> a
+net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener -> abe:
     org.apache.logging.log4j.Logger LOGGER -> a
     int PATH_SUFFIX_LENGTH -> b
     com.google.gson.Gson gson -> c
@@ -31427,14 +33717,14 @@ net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener -> zd:
     21:21:java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
     40:40:boolean lambda$prepare$0(java.lang.String) -> a
     22:24:void <clinit>() -> <clinit>
-net.minecraft.server.packs.resources.SimplePreparableReloadListener -> ze:
+net.minecraft.server.packs.resources.SimplePreparableReloadListener -> abf:
     8:8:void <init>() -> <init>
     11:13:java.util.concurrent.CompletableFuture reload(net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.ProfilerFiller,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
     java.lang.Object prepare(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> b
     void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
     13:13:void lambda$reload$1(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller,java.lang.Object) -> a
     11:11:java.lang.Object lambda$reload$0(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-net.minecraft.server.packs.resources.SimpleReloadInstance -> zf:
+net.minecraft.server.packs.resources.SimpleReloadInstance -> abg:
     net.minecraft.server.packs.resources.ResourceManager resourceManager -> a
     java.util.concurrent.CompletableFuture allPreparations -> b
     java.util.concurrent.CompletableFuture allDone -> c
@@ -31458,7 +33748,7 @@ net.minecraft.server.packs.resources.SimpleReloadInstance -> zf:
     64:66:void lambda$null$1(java.lang.Runnable) -> b
     33:33:java.util.concurrent.CompletableFuture lambda$of$0(java.util.concurrent.Executor,net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.server.packs.resources.PreparableReloadListener,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
     15:15:java.util.Set access$000(net.minecraft.server.packs.resources.SimpleReloadInstance) -> a
-net.minecraft.server.packs.resources.SimpleReloadInstance$1 -> zf$1:
+net.minecraft.server.packs.resources.SimpleReloadInstance$1 -> abg$1:
     java.util.concurrent.Executor val$mainThreadExecutor -> a
     net.minecraft.server.packs.resources.PreparableReloadListener val$listener -> b
     java.util.concurrent.CompletableFuture val$previousTask -> c
@@ -31467,64 +33757,64 @@ net.minecraft.server.packs.resources.SimpleReloadInstance$1 -> zf$1:
     50:56:java.util.concurrent.CompletableFuture wait(java.lang.Object) -> a
     56:56:java.lang.Object lambda$wait$1(java.lang.Object,net.minecraft.util.Unit,java.lang.Object) -> a
     51:55:void lambda$wait$0(net.minecraft.server.packs.resources.PreparableReloadListener) -> a
-net.minecraft.server.packs.resources.SimpleReloadInstance$StateFactory -> zf$a:
+net.minecraft.server.packs.resources.SimpleReloadInstance$StateFactory -> abg$a:
     java.util.concurrent.CompletableFuture create(net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.server.packs.resources.PreparableReloadListener,java.util.concurrent.Executor,java.util.concurrent.Executor) -> create
-net.minecraft.server.packs.resources.SimpleReloadableResourceManager -> zg:
+net.minecraft.server.packs.resources.SimpleReloadableResourceManager -> abh:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Map namespacedPacks -> b
     java.util.List listeners -> c
     java.util.List recentlyRegistered -> d
     java.util.Set namespaces -> e
-    net.minecraft.server.packs.PackType type -> f
-    java.lang.Thread mainThread -> g
-    29:39:void <init>(net.minecraft.server.packs.PackType,java.lang.Thread) -> <init>
-    43:52:void add(net.minecraft.server.packs.Pack) -> a
+    java.util.List packs -> f
+    net.minecraft.server.packs.PackType type -> g
+    30:39:void <init>(net.minecraft.server.packs.PackType) -> <init>
+    42:52:void add(net.minecraft.server.packs.PackResources) -> a
     56:56:java.util.Set getNamespaces() -> a
-    64:70:net.minecraft.server.packs.resources.Resource getResource(net.minecraft.resources.ResourceLocation) -> a
-    75:81:boolean hasResource(net.minecraft.resources.ResourceLocation) -> b
-    86:92:java.util.List getResources(net.minecraft.resources.ResourceLocation) -> c
-    97:105:java.util.Collection listResources(java.lang.String,java.util.function.Predicate) -> a
-    109:111:void clear() -> b
-    115:116:java.util.concurrent.CompletableFuture reload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.List,java.util.concurrent.CompletableFuture) -> a
-    121:123:void registerReloadListener(net.minecraft.server.packs.resources.PreparableReloadListener) -> a
-    127:133:net.minecraft.server.packs.resources.ReloadInstance createReload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.List,java.util.concurrent.CompletableFuture) -> b
-    138:138:net.minecraft.server.packs.resources.ReloadInstance createQueuedReload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.concurrent.CompletableFuture) -> a
-    143:156:net.minecraft.server.packs.resources.ReloadInstance createFullReload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.concurrent.CompletableFuture,java.util.List) -> a
-    27:27:void <clinit>() -> <clinit>
-net.minecraft.server.packs.resources.SimpleReloadableResourceManager$FailingReloadInstance -> zg$a:
+    61:67:net.minecraft.server.packs.resources.Resource getResource(net.minecraft.resources.ResourceLocation) -> a
+    72:78:boolean hasResource(net.minecraft.resources.ResourceLocation) -> b
+    83:89:java.util.List getResources(net.minecraft.resources.ResourceLocation) -> c
+    94:100:java.util.Collection listResources(net.minecraft.resources.ResourceLocation,java.util.function.Predicate) -> a
+    105:113:java.util.Collection listResources(java.lang.String,java.util.function.Predicate) -> a
+    117:121:void clear() -> c
+    125:126:void close() -> close
+    130:132:void registerReloadListener(net.minecraft.server.packs.resources.PreparableReloadListener) -> a
+    136:142:net.minecraft.server.packs.resources.ReloadInstance createReload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.List,java.util.concurrent.CompletableFuture) -> b
+    147:147:net.minecraft.server.packs.resources.ReloadInstance createQueuedReload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.concurrent.CompletableFuture) -> a
+    152:165:net.minecraft.server.packs.resources.ReloadInstance createFullReload(java.util.concurrent.Executor,java.util.concurrent.Executor,java.util.concurrent.CompletableFuture,java.util.List) -> a
+    170:170:java.util.stream.Stream listPacks() -> b
+    154:154:java.lang.Object lambda$createFullReload$0(java.util.List) -> a
+    28:28:void <clinit>() -> <clinit>
+net.minecraft.server.packs.resources.SimpleReloadableResourceManager$FailingReloadInstance -> abh$a:
     net.minecraft.server.packs.resources.SimpleReloadableResourceManager$ResourcePackLoadingFailure exception -> a
     java.util.concurrent.CompletableFuture failedFuture -> b
-    176:180:void <init>(net.minecraft.server.packs.resources.SimpleReloadableResourceManager$ResourcePackLoadingFailure) -> <init>
-    184:184:java.util.concurrent.CompletableFuture done() -> a
-    189:189:float getActualProgress() -> b
-    194:194:boolean isApplying() -> c
-    199:199:boolean isDone() -> d
-    204:204:void checkExceptions() -> e
-net.minecraft.server.packs.resources.SimpleReloadableResourceManager$ResourcePackLoadingFailure -> zg$b:
-    net.minecraft.server.packs.Pack pack -> a
-    163:165:void <init>(net.minecraft.server.packs.Pack,java.lang.Throwable) -> <init>
-    168:168:net.minecraft.server.packs.Pack getPack() -> a
-net.minecraft.server.packs.resources.SimpleResource -> zh:
-    org.apache.logging.log4j.Logger LOGGER -> b
-    java.util.concurrent.Executor IO_EXECUTOR -> a
-    java.lang.String sourceName -> c
-    net.minecraft.resources.ResourceLocation location -> d
-    java.io.InputStream resourceStream -> e
-    java.io.InputStream metadataStream -> f
-    boolean triedMetadata -> g
-    com.google.gson.JsonObject metadata -> h
-    33:38:void <init>(java.lang.String,net.minecraft.resources.ResourceLocation,java.io.InputStream,java.io.InputStream) -> <init>
-    42:42:net.minecraft.resources.ResourceLocation getLocation() -> a
-    47:47:java.io.InputStream getInputStream() -> b
-    52:52:boolean hasMetadata() -> c
-    58:81:java.lang.Object getMetadata(net.minecraft.server.packs.metadata.MetadataSectionSerializer) -> a
-    86:86:java.lang.String getSourceName() -> d
-    91:107:boolean equals(java.lang.Object) -> equals
-    112:114:int hashCode() -> hashCode
-    119:123:void close() -> close
-    23:24:void <clinit>() -> <clinit>
-net.minecraft.server.packs.resources.package-info -> zi:
-net.minecraft.server.players.BanListEntry -> zj:
+    190:194:void <init>(net.minecraft.server.packs.resources.SimpleReloadableResourceManager$ResourcePackLoadingFailure) -> <init>
+    198:198:java.util.concurrent.CompletableFuture done() -> a
+    203:203:float getActualProgress() -> b
+    208:208:boolean isApplying() -> c
+    213:213:boolean isDone() -> d
+    218:218:void checkExceptions() -> e
+net.minecraft.server.packs.resources.SimpleReloadableResourceManager$ResourcePackLoadingFailure -> abh$b:
+    net.minecraft.server.packs.PackResources pack -> a
+    177:179:void <init>(net.minecraft.server.packs.PackResources,java.lang.Throwable) -> <init>
+    182:182:net.minecraft.server.packs.PackResources getPack() -> a
+net.minecraft.server.packs.resources.SimpleResource -> abi:
+    java.lang.String sourceName -> a
+    net.minecraft.resources.ResourceLocation location -> b
+    java.io.InputStream resourceStream -> c
+    java.io.InputStream metadataStream -> d
+    boolean triedMetadata -> e
+    com.google.gson.JsonObject metadata -> f
+    24:29:void <init>(java.lang.String,net.minecraft.resources.ResourceLocation,java.io.InputStream,java.io.InputStream) -> <init>
+    33:33:net.minecraft.resources.ResourceLocation getLocation() -> a
+    38:38:java.io.InputStream getInputStream() -> b
+    43:43:boolean hasMetadata() -> c
+    49:72:java.lang.Object getMetadata(net.minecraft.server.packs.metadata.MetadataSectionSerializer) -> a
+    77:77:java.lang.String getSourceName() -> d
+    82:98:boolean equals(java.lang.Object) -> equals
+    103:105:int hashCode() -> hashCode
+    110:114:void close() -> close
+net.minecraft.server.packs.resources.package-info -> abj:
+net.minecraft.server.players.BanListEntry -> abk:
     java.text.SimpleDateFormat DATE_FORMAT -> a
     java.util.Date created -> b
     java.lang.String source -> c
@@ -31540,7 +33830,7 @@ net.minecraft.server.players.BanListEntry -> zj:
     68:71:boolean hasExpired() -> f
     76:80:void serialize(com.google.gson.JsonObject) -> a
     12:12:void <clinit>() -> <clinit>
-net.minecraft.server.players.GameProfileCache -> zk:
+net.minecraft.server.players.GameProfileCache -> abl:
     java.text.SimpleDateFormat DATE_FORMAT -> a
     boolean usesAuthentication -> c
     java.util.Map profilesByName -> d
@@ -31549,7 +33839,7 @@ net.minecraft.server.players.GameProfileCache -> zk:
     com.mojang.authlib.GameProfileRepository profileRepository -> g
     com.google.gson.Gson gson -> b
     java.io.File file -> h
-    java.lang.reflect.ParameterizedType GAMEPROFILE_ENTRY_TYPE -> i
+    com.google.gson.reflect.TypeToken GAMEPROFILE_ENTRY_TYPE -> i
     48:64:void <init>(com.mojang.authlib.GameProfileRepository,java.io.File) -> <init>
     67:86:com.mojang.authlib.GameProfile lookupGameProfile(com.mojang.authlib.GameProfileRepository,java.lang.String) -> a
     90:91:void setUsesAuthentication(boolean) -> a
@@ -31564,17 +33854,14 @@ net.minecraft.server.players.GameProfileCache -> zk:
     198:210:void save() -> c
     213:222:java.util.List getTopMRUProfiles(int) -> a
     46:289:void <clinit>() -> <clinit>
-net.minecraft.server.players.GameProfileCache$1 -> zk$1:
+net.minecraft.server.players.GameProfileCache$1 -> abl$1:
     com.mojang.authlib.GameProfile[] val$result -> a
     68:68:void <init>(com.mojang.authlib.GameProfile[]) -> <init>
     71:72:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
     76:77:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
-net.minecraft.server.players.GameProfileCache$2 -> zk$2:
+net.minecraft.server.players.GameProfileCache$2 -> abl$2:
     289:289:void <init>() -> <init>
-    292:292:java.lang.reflect.Type[] getActualTypeArguments() -> getActualTypeArguments
-    297:297:java.lang.reflect.Type getRawType() -> getRawType
-    302:302:java.lang.reflect.Type getOwnerType() -> getOwnerType
-net.minecraft.server.players.GameProfileCache$GameProfileInfo -> zk$a:
+net.minecraft.server.players.GameProfileCache$GameProfileInfo -> abl$a:
     com.mojang.authlib.GameProfile profile -> b
     java.util.Date expirationDate -> c
     net.minecraft.server.players.GameProfileCache this$0 -> a
@@ -31583,7 +33870,7 @@ net.minecraft.server.players.GameProfileCache$GameProfileInfo -> zk$a:
     285:285:java.util.Date getExpirationDate() -> b
     271:271:void <init>(net.minecraft.server.players.GameProfileCache,com.mojang.authlib.GameProfile,java.util.Date,net.minecraft.server.players.GameProfileCache$1) -> <init>
     271:271:java.util.Date access$200(net.minecraft.server.players.GameProfileCache$GameProfileInfo) -> a
-net.minecraft.server.players.GameProfileCache$Serializer -> zk$b:
+net.minecraft.server.players.GameProfileCache$Serializer -> abl$b:
     net.minecraft.server.players.GameProfileCache this$0 -> a
     225:225:void <init>(net.minecraft.server.players.GameProfileCache) -> <init>
     228:233:com.google.gson.JsonElement serialize(net.minecraft.server.players.GameProfileCache$GameProfileInfo,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
@@ -31591,90 +33878,90 @@ net.minecraft.server.players.GameProfileCache$Serializer -> zk$b:
     225:225:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
     225:225:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
     225:225:void <init>(net.minecraft.server.players.GameProfileCache,net.minecraft.server.players.GameProfileCache$1) -> <init>
-net.minecraft.server.players.IpBanList -> zl:
+net.minecraft.server.players.IpBanList -> abm:
     10:11:void <init>(java.io.File) -> <init>
     15:15:net.minecraft.server.players.StoredUserEntry createEntry(com.google.gson.JsonObject) -> a
     19:20:boolean isBanned(java.net.SocketAddress) -> a
     24:24:boolean isBanned(java.lang.String) -> a
     28:29:net.minecraft.server.players.IpBanListEntry get(java.net.SocketAddress) -> b
     33:40:java.lang.String getIpFromAddress(java.net.SocketAddress) -> c
-net.minecraft.server.players.IpBanListEntry -> zm:
+net.minecraft.server.players.IpBanListEntry -> abn:
     12:13:void <init>(java.lang.String) -> <init>
     16:17:void <init>(java.lang.String,java.util.Date,java.lang.String,java.util.Date,java.lang.String) -> <init>
     21:21:net.minecraft.network.chat.Component getDisplayName() -> e
     25:26:void <init>(com.google.gson.JsonObject) -> <init>
     29:29:java.lang.String createIpInfo(com.google.gson.JsonObject) -> b
     34:39:void serialize(com.google.gson.JsonObject) -> a
-net.minecraft.server.players.OldUsersConverter -> zn:
+net.minecraft.server.players.OldUsersConverter -> abo:
     org.apache.logging.log4j.Logger LOGGER -> e
     java.io.File OLD_IPBANLIST -> a
     java.io.File OLD_USERBANLIST -> b
     java.io.File OLD_OPLIST -> c
     java.io.File OLD_WHITELIST -> d
-    29:29:void <init>() -> <init>
-    37:46:java.util.List readOldListFormat(java.io.File,java.util.Map) -> a
-    50:60:void lookupPlayers(net.minecraft.server.MinecraftServer,java.util.Collection,com.mojang.authlib.ProfileLookupCallback) -> a
-    63:113:boolean convertUserBanlist(net.minecraft.server.MinecraftServer) -> a
-    117:146:boolean convertIpBanlist(net.minecraft.server.MinecraftServer) -> b
-    150:188:boolean convertOpsList(net.minecraft.server.MinecraftServer) -> c
-    192:230:boolean convertWhiteList(net.minecraft.server.MinecraftServer) -> d
-    234:263:java.lang.String convertMobOwnerIfNecessary(net.minecraft.server.MinecraftServer,java.lang.String) -> a
-    277:349:boolean convertPlayers(net.minecraft.server.dedicated.DedicatedServer) -> a
-    353:364:void ensureDirectoryExists(java.io.File) -> b
-    367:369:boolean serverReadyAfterUserconversion(net.minecraft.server.MinecraftServer) -> e
-    373:407:boolean areOldUserlistsRemoved() -> b
-    411:420:boolean areOldPlayersConverted(net.minecraft.server.MinecraftServer) -> f
-    424:426:java.io.File getWorldPlayersDirectory(net.minecraft.server.MinecraftServer) -> g
-    430:432:void renameOldFile(java.io.File) -> c
-    437:441:java.util.Date parseDate(java.lang.String,java.util.Date) -> b
-    50:50:java.lang.String[] lambda$lookupPlayers$1(int) -> a
-    50:50:boolean lambda$lookupPlayers$0(java.lang.String) -> a
-    29:29:org.apache.logging.log4j.Logger access$000() -> a
-    29:29:java.util.Date access$200(java.lang.String,java.util.Date) -> a
-    29:29:void access$400(java.io.File) -> a
-    30:34:void <clinit>() -> <clinit>
-net.minecraft.server.players.OldUsersConverter$1 -> zn$1:
+    30:30:void <init>() -> <init>
+    38:47:java.util.List readOldListFormat(java.io.File,java.util.Map) -> a
+    51:61:void lookupPlayers(net.minecraft.server.MinecraftServer,java.util.Collection,com.mojang.authlib.ProfileLookupCallback) -> a
+    64:114:boolean convertUserBanlist(net.minecraft.server.MinecraftServer) -> a
+    118:147:boolean convertIpBanlist(net.minecraft.server.MinecraftServer) -> b
+    151:189:boolean convertOpsList(net.minecraft.server.MinecraftServer) -> c
+    193:231:boolean convertWhiteList(net.minecraft.server.MinecraftServer) -> d
+    236:269:java.util.UUID convertMobOwnerIfNecessary(net.minecraft.server.MinecraftServer,java.lang.String) -> a
+    283:355:boolean convertPlayers(net.minecraft.server.dedicated.DedicatedServer) -> a
+    359:370:void ensureDirectoryExists(java.io.File) -> b
+    373:375:boolean serverReadyAfterUserconversion(net.minecraft.server.MinecraftServer) -> e
+    379:413:boolean areOldUserlistsRemoved() -> b
+    417:426:boolean areOldPlayersConverted(net.minecraft.server.MinecraftServer) -> f
+    430:430:java.io.File getWorldPlayersDirectory(net.minecraft.server.MinecraftServer) -> g
+    434:436:void renameOldFile(java.io.File) -> c
+    441:445:java.util.Date parseDate(java.lang.String,java.util.Date) -> b
+    51:51:java.lang.String[] lambda$lookupPlayers$1(int) -> a
+    51:51:boolean lambda$lookupPlayers$0(java.lang.String) -> a
+    30:30:org.apache.logging.log4j.Logger access$000() -> a
+    30:30:java.util.Date access$200(java.lang.String,java.util.Date) -> a
+    30:30:void access$400(java.io.File) -> a
+    31:35:void <clinit>() -> <clinit>
+net.minecraft.server.players.OldUsersConverter$1 -> abo$1:
     net.minecraft.server.MinecraftServer val$server -> a
     java.util.Map val$userMap -> b
     net.minecraft.server.players.UserBanList val$bans -> c
-    76:76:void <init>(net.minecraft.server.MinecraftServer,java.util.Map,net.minecraft.server.players.UserBanList) -> <init>
-    79:91:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
-    95:99:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
-net.minecraft.server.players.OldUsersConverter$2 -> zn$2:
+    77:77:void <init>(net.minecraft.server.MinecraftServer,java.util.Map,net.minecraft.server.players.UserBanList) -> <init>
+    80:92:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
+    96:100:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
+net.minecraft.server.players.OldUsersConverter$2 -> abo$2:
     net.minecraft.server.MinecraftServer val$server -> a
     net.minecraft.server.players.ServerOpList val$opsList -> b
-    161:161:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.server.players.ServerOpList) -> <init>
-    164:166:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
-    170:174:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
-net.minecraft.server.players.OldUsersConverter$3 -> zn$3:
+    162:162:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.server.players.ServerOpList) -> <init>
+    165:167:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
+    171:175:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
+net.minecraft.server.players.OldUsersConverter$3 -> abo$3:
     net.minecraft.server.MinecraftServer val$server -> a
     net.minecraft.server.players.UserWhiteList val$whitelist -> b
-    203:203:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.server.players.UserWhiteList) -> <init>
-    206:208:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
-    212:216:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
-net.minecraft.server.players.OldUsersConverter$4 -> zn$4:
+    204:204:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.server.players.UserWhiteList) -> <init>
+    207:209:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
+    213:217:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
+net.minecraft.server.players.OldUsersConverter$4 -> abo$4:
     net.minecraft.server.MinecraftServer val$server -> a
     java.util.List val$profiles -> b
-    246:246:void <init>(net.minecraft.server.MinecraftServer,java.util.List) -> <init>
-    249:251:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
-    255:256:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
-net.minecraft.server.players.OldUsersConverter$5 -> zn$5:
+    252:252:void <init>(net.minecraft.server.MinecraftServer,java.util.List) -> <init>
+    255:257:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
+    261:262:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
+net.minecraft.server.players.OldUsersConverter$5 -> abo$5:
     net.minecraft.server.dedicated.DedicatedServer val$server -> a
     java.io.File val$worldNewPlayerDirectory -> b
     java.io.File val$unknownPlayerDirectory -> c
     java.io.File val$worldPlayerDirectory -> d
     java.lang.String[] val$names -> e
-    298:298:void <init>(net.minecraft.server.dedicated.DedicatedServer,java.io.File,java.io.File,java.io.File,java.lang.String[]) -> <init>
-    301:307:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
-    311:318:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
-    321:327:void movePlayerFile(java.io.File,java.lang.String,java.lang.String) -> a
-    330:340:java.lang.String getFileNameForProfile(com.mojang.authlib.GameProfile) -> a
-net.minecraft.server.players.OldUsersConverter$ConversionError -> zn$a:
-    268:269:void <init>(java.lang.String,java.lang.Throwable) -> <init>
-    272:273:void <init>(java.lang.String) -> <init>
-    266:266:void <init>(java.lang.String,net.minecraft.server.players.OldUsersConverter$1) -> <init>
-    266:266:void <init>(java.lang.String,java.lang.Throwable,net.minecraft.server.players.OldUsersConverter$1) -> <init>
-net.minecraft.server.players.PlayerList -> zo:
+    304:304:void <init>(net.minecraft.server.dedicated.DedicatedServer,java.io.File,java.io.File,java.io.File,java.lang.String[]) -> <init>
+    307:313:void onProfileLookupSucceeded(com.mojang.authlib.GameProfile) -> onProfileLookupSucceeded
+    317:324:void onProfileLookupFailed(com.mojang.authlib.GameProfile,java.lang.Exception) -> onProfileLookupFailed
+    327:333:void movePlayerFile(java.io.File,java.lang.String,java.lang.String) -> a
+    336:346:java.lang.String getFileNameForProfile(com.mojang.authlib.GameProfile) -> a
+net.minecraft.server.players.OldUsersConverter$ConversionError -> abo$a:
+    274:275:void <init>(java.lang.String,java.lang.Throwable) -> <init>
+    278:279:void <init>(java.lang.String) -> <init>
+    272:272:void <init>(java.lang.String,net.minecraft.server.players.OldUsersConverter$1) -> <init>
+    272:272:void <init>(java.lang.String,java.lang.Throwable,net.minecraft.server.players.OldUsersConverter$1) -> <init>
+net.minecraft.server.players.PlayerList -> abp:
     java.io.File USERBANLIST_FILE -> b
     java.io.File IPBANLIST_FILE -> c
     java.io.File OPLIST_FILE -> d
@@ -31690,86 +33977,84 @@ net.minecraft.server.players.PlayerList -> zo:
     net.minecraft.server.players.UserWhiteList whitelist -> n
     java.util.Map stats -> o
     java.util.Map advancements -> p
-    net.minecraft.world.level.storage.PlayerIO playerIo -> q
+    net.minecraft.world.level.storage.PlayerDataStorage playerIo -> q
     boolean doWhiteList -> r
+    net.minecraft.core.RegistryAccess$RegistryHolder registryHolder -> s
     int maxPlayers -> f
-    int viewDistance -> s
-    net.minecraft.world.level.GameType overrideGameMode -> t
-    boolean allowCheatsForAllPlayers -> u
-    int sendAllPlayerInfoIn -> v
-    92:113:void <init>(net.minecraft.server.MinecraftServer,int) -> <init>
-    116:230:void placeNewPlayer(net.minecraft.network.Connection,net.minecraft.server.level.ServerPlayer) -> a
-    233:252:void updateEntireScoreboard(net.minecraft.server.ServerScoreboard,net.minecraft.server.level.ServerPlayer) -> a
-    255:290:void setLevel(net.minecraft.server.level.ServerLevel) -> a
-    294:304:net.minecraft.nbt.CompoundTag load(net.minecraft.server.level.ServerPlayer) -> a
-    308:317:void save(net.minecraft.server.level.ServerPlayer) -> b
-    325:354:void remove(net.minecraft.server.level.ServerPlayer) -> c
-    358:388:net.minecraft.network.chat.Component canPlayerLogin(java.net.SocketAddress,com.mojang.authlib.GameProfile) -> a
-    392:416:net.minecraft.server.level.ServerPlayer getPlayerForLogin(com.mojang.authlib.GameProfile) -> g
-    420:479:net.minecraft.server.level.ServerPlayer respawn(net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.dimension.DimensionType,boolean) -> a
-    483:486:void sendPlayerPermissionLevel(net.minecraft.server.level.ServerPlayer) -> d
-    491:495:void tick() -> d
-    498:501:void broadcastAll(net.minecraft.network.protocol.Packet) -> a
-    504:510:void broadcastAll(net.minecraft.network.protocol.Packet,net.minecraft.world.level.dimension.DimensionType) -> a
-    513:525:void broadcastToTeam(net.minecraft.world.entity.player.Player,net.minecraft.network.chat.Component) -> a
-    528:539:void broadcastToAllExceptTeam(net.minecraft.world.entity.player.Player,net.minecraft.network.chat.Component) -> b
-    542:553:java.lang.String getPlayerNames(boolean) -> b
-    557:561:java.lang.String[] getPlayerNamesArray() -> e
-    565:569:com.mojang.authlib.GameProfile[] getPlayerGameProfiles() -> f
-    573:573:net.minecraft.server.players.UserBanList getBans() -> g
-    577:577:net.minecraft.server.players.IpBanList getIpBans() -> h
-    581:586:void op(com.mojang.authlib.GameProfile) -> a
-    589:594:void deop(com.mojang.authlib.GameProfile) -> b
-    597:609:void sendPlayerPermissionLevel(net.minecraft.server.level.ServerPlayer,int) -> a
-    612:612:boolean isWhiteListed(com.mojang.authlib.GameProfile) -> e
-    616:616:boolean isOp(com.mojang.authlib.GameProfile) -> h
-    621:626:net.minecraft.server.level.ServerPlayer getPlayerByName(java.lang.String) -> a
-    630:645:void broadcast(net.minecraft.world.entity.player.Player,double,double,double,double,net.minecraft.world.level.dimension.DimensionType,net.minecraft.network.protocol.Packet) -> a
-    648:651:void saveAll() -> i
-    654:655:void whiteList(com.mojang.authlib.GameProfile) -> d
-    658:659:void blackList(com.mojang.authlib.GameProfile) -> c
-    662:662:net.minecraft.server.players.UserWhiteList getWhiteList() -> j
-    666:666:java.lang.String[] getWhiteListNames() -> k
-    670:670:net.minecraft.server.players.ServerOpList getOps() -> l
-    674:674:java.lang.String[] getOpNames() -> m
-    678:678:void reloadWhiteList() -> a
-    681:693:void sendLevelInfo(net.minecraft.server.level.ServerPlayer,net.minecraft.server.level.ServerLevel) -> a
-    696:699:void sendAllPlayerInfo(net.minecraft.server.level.ServerPlayer) -> e
-    702:702:int getPlayerCount() -> n
-    706:706:int getMaxPlayers() -> o
-    710:710:boolean isUsingWhitelist() -> p
-    714:715:void setUsingWhiteList(boolean) -> a
-    718:726:java.util.List getPlayersWithAddress(java.lang.String) -> b
-    730:730:int getViewDistance() -> q
-    734:734:net.minecraft.server.MinecraftServer getServer() -> c
-    738:738:net.minecraft.nbt.CompoundTag getSingleplayerData() -> r
-    742:743:void setOverrideGameMode(net.minecraft.world.level.GameType) -> a
-    748:754:void updatePlayerGameMode(net.minecraft.server.level.ServerPlayer,net.minecraft.server.level.ServerPlayer,net.minecraft.world.level.LevelAccessor) -> a
-    757:758:void setAllowCheatsForAllPlayers(boolean) -> c
-    761:764:void removeAll() -> s
-    767:770:void broadcastMessage(net.minecraft.network.chat.Component,boolean) -> a
-    773:774:void broadcastMessage(net.minecraft.network.chat.Component) -> a
-    777:796:net.minecraft.stats.ServerStatsCounter getPlayerStats(net.minecraft.world.entity.player.Player) -> a
-    800:812:net.minecraft.server.PlayerAdvancements getPlayerAdvancements(net.minecraft.server.level.ServerPlayer) -> f
-    816:824:void setViewDistance(int) -> a
-    827:827:java.util.List getPlayers() -> t
-    832:832:net.minecraft.server.level.ServerPlayer getPlayer(java.util.UUID) -> a
-    836:836:boolean canBypassPlayerLimit(com.mojang.authlib.GameProfile) -> f
-    840:849:void reloadResources() -> u
-    852:852:boolean isAllowCheatsForAllPlayers() -> v
-    202:205:net.minecraft.world.entity.Entity lambda$placeNewPlayer$0(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Entity) -> a
-    83:89:void <clinit>() -> <clinit>
-net.minecraft.server.players.PlayerList$1 -> zo$1:
+    int viewDistance -> t
+    net.minecraft.world.level.GameType overrideGameMode -> u
+    boolean allowCheatsForAllPlayers -> v
+    int sendAllPlayerInfoIn -> w
+    103:125:void <init>(net.minecraft.server.MinecraftServer,net.minecraft.core.RegistryAccess$RegistryHolder,net.minecraft.world.level.storage.PlayerDataStorage,int) -> <init>
+    128:270:void placeNewPlayer(net.minecraft.network.Connection,net.minecraft.server.level.ServerPlayer) -> a
+    273:292:void updateEntireScoreboard(net.minecraft.server.ServerScoreboard,net.minecraft.server.level.ServerPlayer) -> a
+    295:329:void setLevel(net.minecraft.server.level.ServerLevel) -> a
+    333:343:net.minecraft.nbt.CompoundTag load(net.minecraft.server.level.ServerPlayer) -> a
+    347:356:void save(net.minecraft.server.level.ServerPlayer) -> b
+    364:395:void remove(net.minecraft.server.level.ServerPlayer) -> c
+    399:429:net.minecraft.network.chat.Component canPlayerLogin(java.net.SocketAddress,com.mojang.authlib.GameProfile) -> a
+    433:458:net.minecraft.server.level.ServerPlayer getPlayerForLogin(com.mojang.authlib.GameProfile) -> g
+    462:532:net.minecraft.server.level.ServerPlayer respawn(net.minecraft.server.level.ServerPlayer,boolean) -> a
+    536:539:void sendPlayerPermissionLevel(net.minecraft.server.level.ServerPlayer) -> d
+    544:548:void tick() -> d
+    551:554:void broadcastAll(net.minecraft.network.protocol.Packet) -> a
+    557:563:void broadcastAll(net.minecraft.network.protocol.Packet,net.minecraft.resources.ResourceKey) -> a
+    566:578:void broadcastToTeam(net.minecraft.world.entity.player.Player,net.minecraft.network.chat.Component) -> a
+    581:592:void broadcastToAllExceptTeam(net.minecraft.world.entity.player.Player,net.minecraft.network.chat.Component) -> b
+    595:599:java.lang.String[] getPlayerNamesArray() -> e
+    603:603:net.minecraft.server.players.UserBanList getBans() -> f
+    607:607:net.minecraft.server.players.IpBanList getIpBans() -> g
+    611:616:void op(com.mojang.authlib.GameProfile) -> a
+    619:624:void deop(com.mojang.authlib.GameProfile) -> b
+    627:639:void sendPlayerPermissionLevel(net.minecraft.server.level.ServerPlayer,int) -> a
+    642:642:boolean isWhiteListed(com.mojang.authlib.GameProfile) -> e
+    646:646:boolean isOp(com.mojang.authlib.GameProfile) -> h
+    651:656:net.minecraft.server.level.ServerPlayer getPlayerByName(java.lang.String) -> a
+    660:675:void broadcast(net.minecraft.world.entity.player.Player,double,double,double,double,net.minecraft.resources.ResourceKey,net.minecraft.network.protocol.Packet) -> a
+    678:681:void saveAll() -> h
+    684:685:void whiteList(com.mojang.authlib.GameProfile) -> d
+    688:689:void blackList(com.mojang.authlib.GameProfile) -> c
+    692:692:net.minecraft.server.players.UserWhiteList getWhiteList() -> i
+    696:696:java.lang.String[] getWhiteListNames() -> j
+    700:700:net.minecraft.server.players.ServerOpList getOps() -> k
+    704:704:java.lang.String[] getOpNames() -> l
+    708:708:void reloadWhiteList() -> a
+    712:722:void sendLevelInfo(net.minecraft.server.level.ServerPlayer,net.minecraft.server.level.ServerLevel) -> a
+    725:728:void sendAllPlayerInfo(net.minecraft.server.level.ServerPlayer) -> e
+    731:731:int getPlayerCount() -> m
+    735:735:int getMaxPlayers() -> n
+    739:739:boolean isUsingWhitelist() -> o
+    743:744:void setUsingWhiteList(boolean) -> a
+    747:755:java.util.List getPlayersWithAddress(java.lang.String) -> b
+    759:759:int getViewDistance() -> p
+    763:763:net.minecraft.server.MinecraftServer getServer() -> c
+    767:767:net.minecraft.nbt.CompoundTag getSingleplayerData() -> q
+    771:772:void setOverrideGameMode(net.minecraft.world.level.GameType) -> a
+    776:782:void updatePlayerGameMode(net.minecraft.server.level.ServerPlayer,net.minecraft.server.level.ServerPlayer,net.minecraft.server.level.ServerLevel) -> a
+    785:786:void setAllowCheatsForAllPlayers(boolean) -> b
+    789:792:void removeAll() -> r
+    795:797:void broadcastMessage(net.minecraft.network.chat.Component,net.minecraft.network.chat.ChatType,java.util.UUID) -> a
+    800:819:net.minecraft.stats.ServerStatsCounter getPlayerStats(net.minecraft.world.entity.player.Player) -> a
+    823:834:net.minecraft.server.PlayerAdvancements getPlayerAdvancements(net.minecraft.server.level.ServerPlayer) -> f
+    838:846:void setViewDistance(int) -> a
+    849:849:java.util.List getPlayers() -> s
+    854:854:net.minecraft.server.level.ServerPlayer getPlayer(java.util.UUID) -> a
+    858:858:boolean canBypassPlayerLimit(com.mojang.authlib.GameProfile) -> f
+    862:871:void reloadResources() -> t
+    874:874:boolean isAllowCheatsForAllPlayers() -> u
+    237:240:net.minecraft.world.entity.Entity lambda$placeNewPlayer$0(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Entity) -> a
+    94:100:void <clinit>() -> <clinit>
+net.minecraft.server.players.PlayerList$1 -> abp$1:
     net.minecraft.server.players.PlayerList this$0 -> a
-    256:256:void <init>(net.minecraft.server.players.PlayerList) -> <init>
-    259:260:void onBorderSizeSet(net.minecraft.world.level.border.WorldBorder,double) -> a
-    264:265:void onBorderSizeLerping(net.minecraft.world.level.border.WorldBorder,double,double,long) -> a
-    269:270:void onBorderCenterSet(net.minecraft.world.level.border.WorldBorder,double,double) -> a
-    274:275:void onBorderSetWarningTime(net.minecraft.world.level.border.WorldBorder,int) -> a
-    279:280:void onBorderSetWarningBlocks(net.minecraft.world.level.border.WorldBorder,int) -> b
-    284:284:void onBorderSetDamagePerBlock(net.minecraft.world.level.border.WorldBorder,double) -> b
-    288:288:void onBorderSetDamageSafeZOne(net.minecraft.world.level.border.WorldBorder,double) -> c
-net.minecraft.server.players.ServerOpList -> zp:
+    295:295:void <init>(net.minecraft.server.players.PlayerList) -> <init>
+    298:299:void onBorderSizeSet(net.minecraft.world.level.border.WorldBorder,double) -> a
+    303:304:void onBorderSizeLerping(net.minecraft.world.level.border.WorldBorder,double,double,long) -> a
+    308:309:void onBorderCenterSet(net.minecraft.world.level.border.WorldBorder,double,double) -> a
+    313:314:void onBorderSetWarningTime(net.minecraft.world.level.border.WorldBorder,int) -> a
+    318:319:void onBorderSetWarningBlocks(net.minecraft.world.level.border.WorldBorder,int) -> b
+    323:323:void onBorderSetDamagePerBlock(net.minecraft.world.level.border.WorldBorder,double) -> b
+    327:327:void onBorderSetDamageSafeZOne(net.minecraft.world.level.border.WorldBorder,double) -> c
+net.minecraft.server.players.ServerOpList -> abq:
     11:12:void <init>(java.io.File) -> <init>
     16:16:net.minecraft.server.players.StoredUserEntry createEntry(com.google.gson.JsonObject) -> a
     21:26:java.lang.String[] getUserList() -> a
@@ -31778,61 +34063,44 @@ net.minecraft.server.players.ServerOpList -> zp:
     51:51:java.lang.String getKeyForUser(com.mojang.authlib.GameProfile) -> c
     55:60:com.mojang.authlib.GameProfile find(java.lang.String) -> a
     9:9:java.lang.String getKeyForUser(java.lang.Object) -> a
-net.minecraft.server.players.ServerOpListEntry -> zq:
+net.minecraft.server.players.ServerOpListEntry -> abr:
     int level -> a
     boolean bypassesPlayerLimit -> b
     14:17:void <init>(com.mojang.authlib.GameProfile,int,boolean) -> <init>
     20:23:void <init>(com.google.gson.JsonObject) -> <init>
     26:26:int getLevel() -> a
     30:30:boolean getBypassesPlayerLimit() -> b
-    35:43:void serialize(com.google.gson.JsonObject) -> a
-    46:56:com.mojang.authlib.GameProfile createGameProfile(com.google.gson.JsonObject) -> b
-net.minecraft.server.players.StoredUserEntry -> zr:
+    35:42:void serialize(com.google.gson.JsonObject) -> a
+    45:55:com.mojang.authlib.GameProfile createGameProfile(com.google.gson.JsonObject) -> b
+net.minecraft.server.players.StoredUserEntry -> abs:
     java.lang.Object user -> a
     11:13:void <init>(java.lang.Object) -> <init>
-    15:17:void <init>(java.lang.Object,com.google.gson.JsonObject) -> <init>
-    21:21:java.lang.Object getUser() -> g
-    25:25:boolean hasExpired() -> f
-    29:29:void serialize(com.google.gson.JsonObject) -> a
-net.minecraft.server.players.StoredUserList -> zs:
+    17:17:java.lang.Object getUser() -> g
+    21:21:boolean hasExpired() -> f
+    void serialize(com.google.gson.JsonObject) -> a
+net.minecraft.server.players.StoredUserList -> abt:
     org.apache.logging.log4j.Logger LOGGER -> a
-    com.google.gson.Gson gson -> b
+    com.google.gson.Gson GSON -> b
     java.io.File file -> c
     java.util.Map map -> d
-    boolean enabled -> e
-    java.lang.reflect.ParameterizedType USERLIST_ENTRY_TYPE -> f
-    38:46:void <init>(java.io.File) -> <init>
-    49:49:boolean isEnabled() -> b
-    53:54:void setEnabled(boolean) -> a
-    57:57:java.io.File getFile() -> c
-    61:67:void add(net.minecraft.server.players.StoredUserEntry) -> a
-    71:72:net.minecraft.server.players.StoredUserEntry get(java.lang.Object) -> b
-    76:82:void remove(java.lang.Object) -> c
-    85:86:void remove(net.minecraft.server.players.StoredUserEntry) -> b
-    89:89:java.lang.String[] getUserList() -> a
-    93:93:boolean isEmpty() -> d
-    97:97:java.lang.String getKeyForUser(java.lang.Object) -> a
-    101:101:boolean contains(java.lang.Object) -> d
-    105:114:void removeExpired() -> h
-    117:117:net.minecraft.server.players.StoredUserEntry createEntry(com.google.gson.JsonObject) -> a
-    121:121:java.util.Collection getEntries() -> e
-    125:134:void save() -> f
-    139:158:void load() -> g
-    34:178:void <clinit>() -> <clinit>
-net.minecraft.server.players.StoredUserList$1 -> zs$1:
-    178:178:void <init>() -> <init>
-    181:181:java.lang.reflect.Type[] getActualTypeArguments() -> getActualTypeArguments
-    188:188:java.lang.reflect.Type getRawType() -> getRawType
-    193:193:java.lang.reflect.Type getOwnerType() -> getOwnerType
-net.minecraft.server.players.StoredUserList$Serializer -> zs$a:
-    net.minecraft.server.players.StoredUserList this$0 -> a
-    160:160:void <init>(net.minecraft.server.players.StoredUserList) -> <init>
-    163:165:com.google.gson.JsonElement serialize(net.minecraft.server.players.StoredUserEntry,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
-    170:174:net.minecraft.server.players.StoredUserEntry deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    160:160:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
-    160:160:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-    160:160:void <init>(net.minecraft.server.players.StoredUserList,net.minecraft.server.players.StoredUserList$1) -> <init>
-net.minecraft.server.players.UserBanList -> zt:
+    31:35:void <init>(java.io.File) -> <init>
+    38:38:java.io.File getFile() -> b
+    42:48:void add(net.minecraft.server.players.StoredUserEntry) -> a
+    52:53:net.minecraft.server.players.StoredUserEntry get(java.lang.Object) -> b
+    57:63:void remove(java.lang.Object) -> c
+    66:67:void remove(net.minecraft.server.players.StoredUserEntry) -> b
+    70:70:java.lang.String[] getUserList() -> a
+    74:74:boolean isEmpty() -> c
+    78:78:java.lang.String getKeyForUser(java.lang.Object) -> a
+    82:82:boolean contains(java.lang.Object) -> d
+    86:95:void removeExpired() -> g
+    net.minecraft.server.players.StoredUserEntry createEntry(com.google.gson.JsonObject) -> a
+    100:100:java.util.Collection getEntries() -> d
+    104:109:void save() -> e
+    114:129:void load() -> f
+    105:105:com.google.gson.JsonObject lambda$save$0(net.minecraft.server.players.StoredUserEntry) -> c
+    27:28:void <clinit>() -> <clinit>
+net.minecraft.server.players.UserBanList -> abu:
     10:11:void <init>(java.io.File) -> <init>
     15:15:net.minecraft.server.players.StoredUserEntry createEntry(com.google.gson.JsonObject) -> a
     19:19:boolean isBanned(com.mojang.authlib.GameProfile) -> a
@@ -31840,14 +34108,14 @@ net.minecraft.server.players.UserBanList -> zt:
     34:34:java.lang.String getKeyForUser(com.mojang.authlib.GameProfile) -> b
     38:43:com.mojang.authlib.GameProfile find(java.lang.String) -> a
     8:8:java.lang.String getKeyForUser(java.lang.Object) -> a
-net.minecraft.server.players.UserBanListEntry -> zu:
+net.minecraft.server.players.UserBanListEntry -> abv:
     15:16:void <init>(com.mojang.authlib.GameProfile) -> <init>
     19:20:void <init>(com.mojang.authlib.GameProfile,java.util.Date,java.lang.String,java.util.Date,java.lang.String) -> <init>
     23:24:void <init>(com.google.gson.JsonObject) -> <init>
     28:34:void serialize(com.google.gson.JsonObject) -> a
     38:39:net.minecraft.network.chat.Component getDisplayName() -> e
     43:53:com.mojang.authlib.GameProfile createGameProfile(com.google.gson.JsonObject) -> b
-net.minecraft.server.players.UserWhiteList -> zv:
+net.minecraft.server.players.UserWhiteList -> abw:
     10:11:void <init>(java.io.File) -> <init>
     15:15:net.minecraft.server.players.StoredUserEntry createEntry(com.google.gson.JsonObject) -> a
     19:19:boolean isWhiteListed(com.mojang.authlib.GameProfile) -> a
@@ -31855,13 +34123,13 @@ net.minecraft.server.players.UserWhiteList -> zv:
     34:34:java.lang.String getKeyForUser(com.mojang.authlib.GameProfile) -> b
     38:43:com.mojang.authlib.GameProfile find(java.lang.String) -> a
     8:8:java.lang.String getKeyForUser(java.lang.Object) -> a
-net.minecraft.server.players.UserWhiteListEntry -> zw:
+net.minecraft.server.players.UserWhiteListEntry -> abx:
     10:11:void <init>(com.mojang.authlib.GameProfile) -> <init>
     14:15:void <init>(com.google.gson.JsonObject) -> <init>
-    19:25:void serialize(com.google.gson.JsonObject) -> a
-    28:38:com.mojang.authlib.GameProfile createGameProfile(com.google.gson.JsonObject) -> b
-net.minecraft.server.players.package-info -> zx:
-net.minecraft.server.rcon.NetworkDataOutputStream -> zy:
+    19:24:void serialize(com.google.gson.JsonObject) -> a
+    27:37:com.mojang.authlib.GameProfile createGameProfile(com.google.gson.JsonObject) -> b
+net.minecraft.server.players.package-info -> aby:
+net.minecraft.server.rcon.NetworkDataOutputStream -> abz:
     java.io.ByteArrayOutputStream outputStream -> a
     java.io.DataOutputStream dataOutputStream -> b
     11:14:void <init>(int) -> <init>
@@ -31873,7 +34141,7 @@ net.minecraft.server.rcon.NetworkDataOutputStream -> zy:
     39:40:void writeFloat(float) -> a
     43:43:byte[] toByteArray() -> a
     47:48:void reset() -> b
-net.minecraft.server.rcon.PktUtils -> zz:
+net.minecraft.server.rcon.PktUtils -> aca:
     char[] HEX_CHAR -> a
     5:5:void <init>() -> <init>
     12:18:java.lang.String stringFromByteArray(byte[],int,int) -> a
@@ -31882,935 +34150,1131 @@ net.minecraft.server.rcon.PktUtils -> zz:
     35:40:int intFromNetworkByteArray(byte[],int,int) -> c
     44:44:java.lang.String toHexString(byte) -> a
     7:7:void <clinit>() -> <clinit>
-net.minecraft.server.rcon.RconConsoleSource -> aaa:
-    java.lang.StringBuffer buffer -> b
-    net.minecraft.server.MinecraftServer server -> c
-    15:20:void <init>(net.minecraft.server.MinecraftServer) -> <init>
-    23:24:void prepareForCommand() -> d
-    27:27:java.lang.String getCommandResponse() -> e
-    31:32:net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> f
-    37:38:void sendMessage(net.minecraft.network.chat.Component) -> a
-    42:42:boolean acceptsSuccess() -> a
-    47:47:boolean acceptsFailure() -> b
-    52:52:boolean shouldInformAdmins() -> I_
-net.minecraft.server.rcon.package-info -> aab:
-net.minecraft.server.rcon.thread.GenericThread -> aac:
-    org.apache.logging.log4j.Logger LOGGER -> h
-    java.util.concurrent.atomic.AtomicInteger UNIQUE_THREAD_ID -> i
+net.minecraft.server.rcon.RconConsoleSource -> acb:
+    net.minecraft.network.chat.TextComponent RCON_COMPONENT -> b
+    java.lang.StringBuffer buffer -> c
+    net.minecraft.server.MinecraftServer server -> d
+    19:24:void <init>(net.minecraft.server.MinecraftServer) -> <init>
+    27:28:void prepareForCommand() -> d
+    31:31:java.lang.String getCommandResponse() -> e
+    35:36:net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> f
+    41:42:void sendMessage(net.minecraft.network.chat.Component,java.util.UUID) -> a
+    46:46:boolean acceptsSuccess() -> a
+    51:51:boolean acceptsFailure() -> b
+    56:56:boolean shouldInformAdmins() -> S_
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.server.rcon.package-info -> acc:
+net.minecraft.server.rcon.thread.GenericThread -> acd:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    java.util.concurrent.atomic.AtomicInteger UNIQUE_THREAD_ID -> e
     boolean running -> a
-    net.minecraft.server.ServerInterface serverInterface -> b
-    java.lang.String name -> c
-    java.lang.Thread thread -> d
-    int maxStopWait -> e
-    java.util.List datagramSockets -> f
-    java.util.List serverSockets -> g
-    22:32:void <init>(net.minecraft.server.ServerInterface,java.lang.String) -> <init>
+    java.lang.String name -> b
+    java.lang.Thread thread -> c
+    17:19:void <init>(java.lang.String) -> <init>
     void run() -> run
-    38:42:void start() -> a
-    45:77:void stop() -> b
-    80:80:boolean isRunning() -> c
-    84:85:void debug(java.lang.String) -> a
-    88:89:void info(java.lang.String) -> b
-    92:93:void warn(java.lang.String) -> c
-    96:97:void error(java.lang.String) -> d
-    100:100:int currentPlayerCount() -> d
-    104:106:void registerSocket(java.net.DatagramSocket) -> a
-    109:111:void registerSocket(java.net.ServerSocket) -> a
-    114:114:boolean closeSocket(java.net.DatagramSocket) -> b
-    118:133:boolean closeSocket(java.net.DatagramSocket,boolean) -> a
-    137:137:boolean closeSocket(java.net.ServerSocket) -> b
-    141:160:boolean closeSocket(java.net.ServerSocket,boolean) -> a
-    164:165:void closeSockets() -> e
-    168:186:void closeSockets(boolean) -> a
-    16:17:void <clinit>() -> <clinit>
-net.minecraft.server.rcon.thread.QueryThreadGs4 -> aad:
-    long lastChallengeCheck -> h
-    int port -> i
-    int serverPort -> j
-    int maxPlayers -> k
-    java.lang.String serverName -> l
-    java.lang.String worldName -> m
-    java.net.DatagramSocket socket -> n
-    byte[] buffer -> o
-    java.net.DatagramPacket request -> p
-    java.util.Map idents -> q
-    java.lang.String hostIp -> r
-    java.lang.String serverIp -> s
-    java.util.Map validChallenges -> t
-    long lastChallengeClean -> u
-    net.minecraft.server.rcon.NetworkDataOutputStream rulesResponse -> v
-    long lastRulesResponse -> w
-    38:84:void <init>(net.minecraft.server.ServerInterface) -> <init>
-    87:88:void sendTo(byte[],java.net.DatagramPacket) -> a
-    91:139:boolean processPacket(java.net.DatagramPacket) -> a
-    143:200:byte[] buildRuleResponse(java.net.DatagramPacket) -> b
-    204:204:byte[] getIdentBytes(java.net.SocketAddress) -> a
-    208:221:java.lang.Boolean validChallenge(java.net.DatagramPacket) -> c
-    225:229:void sendChallenge(java.net.DatagramPacket) -> d
-    232:249:void pruneChallenges() -> f
-    253:280:void run() -> run
-    284:296:void start() -> a
-    299:311:void recoverSocketError(java.lang.Exception) -> a
-    315:327:boolean initSocket() -> g
-net.minecraft.server.rcon.thread.QueryThreadGs4$RequestChallenge -> aad$a:
-    long time -> b
-    int challenge -> c
-    byte[] identBytes -> d
-    byte[] challengeBytes -> e
-    java.lang.String ident -> f
-    net.minecraft.server.rcon.thread.QueryThreadGs4 this$0 -> a
-    337:348:void <init>(net.minecraft.server.rcon.thread.QueryThreadGs4,java.net.DatagramPacket) -> <init>
-    351:351:java.lang.Boolean before(long) -> a
-    355:355:int getChallenge() -> a
-    359:359:byte[] getChallengeBytes() -> b
-    363:363:byte[] getIdentBytes() -> c
-    368:368:java.lang.String getIdent() -> d
-net.minecraft.server.rcon.thread.RconClient -> aae:
-    org.apache.logging.log4j.Logger LOGGER -> h
-    boolean authed -> i
-    java.net.Socket client -> j
-    byte[] buf -> k
-    java.lang.String rconPassword -> l
-    24:39:void <init>(net.minecraft.server.ServerInterface,java.lang.String,java.net.Socket) -> <init>
-    44:99:void run() -> run
-    104:114:void send(int,int,java.lang.String) -> a
-    117:118:void sendAuthFailure() -> f
-    121:132:void sendCmdResponse(int,java.lang.String) -> a
-    136:138:void stop() -> b
-    141:151:void closeSocket() -> g
+    25:30:void start() -> a
+    33:59:void stop() -> b
+    62:62:boolean isRunning() -> c
+    10:11:void <clinit>() -> <clinit>
+net.minecraft.server.rcon.thread.QueryThreadGs4 -> ace:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    long lastChallengeCheck -> e
+    int port -> f
+    int serverPort -> g
+    int maxPlayers -> h
+    java.lang.String serverName -> i
+    java.lang.String worldName -> j
+    java.net.DatagramSocket socket -> k
+    byte[] buffer -> l
+    java.lang.String hostIp -> m
+    java.lang.String serverIp -> n
+    java.util.Map validChallenges -> o
+    net.minecraft.server.rcon.NetworkDataOutputStream rulesResponse -> p
+    long lastRulesResponse -> q
+    net.minecraft.server.ServerInterface serverInterface -> r
+    39:80:void <init>(net.minecraft.server.ServerInterface) -> <init>
+    83:84:void sendTo(byte[],java.net.DatagramPacket) -> a
+    87:135:boolean processPacket(java.net.DatagramPacket) -> a
+    139:196:byte[] buildRuleResponse(java.net.DatagramPacket) -> b
+    200:200:byte[] getIdentBytes(java.net.SocketAddress) -> a
+    204:211:java.lang.Boolean validChallenge(java.net.DatagramPacket) -> c
+    215:219:void sendChallenge(java.net.DatagramPacket) -> d
+    222:233:void pruneChallenges() -> d
+    237:265:void run() -> run
+    269:281:void start() -> a
+    284:296:void recoverSocketError(java.lang.Exception) -> a
+    300:306:boolean initSocket() -> e
+    232:232:boolean lambda$pruneChallenges$0(long,net.minecraft.server.rcon.thread.QueryThreadGs4$RequestChallenge) -> a
+    25:25:void <clinit>() -> <clinit>
+net.minecraft.server.rcon.thread.QueryThreadGs4$RequestChallenge -> ace$a:
+    long time -> a
+    int challenge -> b
+    byte[] identBytes -> c
+    byte[] challengeBytes -> d
+    java.lang.String ident -> e
+    316:327:void <init>(java.net.DatagramPacket) -> <init>
+    330:330:java.lang.Boolean before(long) -> a
+    334:334:int getChallenge() -> a
+    338:338:byte[] getChallengeBytes() -> b
+    342:342:byte[] getIdentBytes() -> c
+    347:347:java.lang.String getIdent() -> d
+net.minecraft.server.rcon.thread.RconClient -> acf:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    boolean authed -> e
+    java.net.Socket client -> f
+    byte[] buf -> g
+    java.lang.String rconPassword -> h
+    net.minecraft.server.ServerInterface serverInterface -> i
+    24:40:void <init>(net.minecraft.server.ServerInterface,java.lang.String,java.net.Socket) -> <init>
+    45:102:void run() -> run
+    107:117:void send(int,int,java.lang.String) -> a
+    120:121:void sendAuthFailure() -> d
+    124:135:void sendCmdResponse(int,java.lang.String) -> a
+    139:142:void stop() -> b
+    145:155:void closeSocket() -> e
     16:16:void <clinit>() -> <clinit>
-net.minecraft.server.rcon.thread.RconThread -> aaf:
-    int port -> h
-    java.lang.String serverIp -> i
-    java.net.ServerSocket socket -> j
-    java.lang.String rconPassword -> k
-    java.util.Map clients -> l
-    24:35:void <init>(net.minecraft.server.ServerInterface) -> <init>
-    38:39:void initClients() -> f
-    42:49:void clearClients() -> g
-    53:78:void run() -> run
-    82:103:void start() -> a
-    107:118:void stop() -> b
-net.minecraft.server.rcon.thread.package-info -> aag:
-net.minecraft.sounds.SoundEvent -> aah:
-    net.minecraft.resources.ResourceLocation location -> a
-    8:10:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    13:13:net.minecraft.resources.ResourceLocation getLocation() -> a
-net.minecraft.sounds.SoundEvents -> aai:
+net.minecraft.server.rcon.thread.RconThread -> acg:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    int port -> e
+    java.lang.String serverIp -> f
+    java.net.ServerSocket socket -> g
+    java.lang.String rconPassword -> h
+    java.util.List clients -> i
+    net.minecraft.server.ServerInterface serverInterface -> j
+    23:36:void <init>(net.minecraft.server.ServerInterface) -> <init>
+    39:40:void clearClients() -> d
+    44:68:void run() -> run
+    72:93:void start() -> a
+    97:107:void stop() -> b
+    110:117:void closeSocket(java.net.ServerSocket) -> a
+    39:39:boolean lambda$clearClients$0(net.minecraft.server.rcon.thread.RconClient) -> a
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.server.rcon.thread.package-info -> ach:
+net.minecraft.sounds.Music -> aci:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.sounds.SoundEvent event -> b
+    int minDelay -> c
+    int maxDelay -> d
+    boolean replaceCurrentMusic -> e
+    19:24:void <init>(net.minecraft.sounds.SoundEvent,int,int,boolean) -> <init>
+    27:27:net.minecraft.sounds.SoundEvent getEvent() -> a
+    31:31:int getMinDelay() -> b
+    35:35:int getMaxDelay() -> c
+    39:39:boolean replaceCurrentMusic() -> d
+    7:12:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    11:11:java.lang.Boolean lambda$null$3(net.minecraft.sounds.Music) -> a
+    10:10:java.lang.Integer lambda$null$2(net.minecraft.sounds.Music) -> b
+    9:9:java.lang.Integer lambda$null$1(net.minecraft.sounds.Music) -> c
+    8:8:net.minecraft.sounds.SoundEvent lambda$null$0(net.minecraft.sounds.Music) -> d
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.sounds.Musics -> acj:
+    net.minecraft.sounds.Music MENU -> a
+    net.minecraft.sounds.Music CREATIVE -> b
+    net.minecraft.sounds.Music CREDITS -> c
+    net.minecraft.sounds.Music END_BOSS -> d
+    net.minecraft.sounds.Music END -> e
+    net.minecraft.sounds.Music UNDER_WATER -> f
+    net.minecraft.sounds.Music GAME -> g
+    5:5:void <init>() -> <init>
+    22:22:net.minecraft.sounds.Music createGameMusic(net.minecraft.sounds.SoundEvent) -> a
+    12:19:void <clinit>() -> <clinit>
+net.minecraft.sounds.SoundEvent -> ack:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.resources.ResourceLocation location -> b
+    11:13:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
+    16:16:net.minecraft.resources.ResourceLocation getLocation() -> a
+    7:7:net.minecraft.resources.ResourceLocation lambda$static$0(net.minecraft.sounds.SoundEvent) -> a
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.sounds.SoundEvents -> acl:
     net.minecraft.sounds.SoundEvent AMBIENT_CAVE -> a
-    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_ENTER -> b
-    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_EXIT -> c
-    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_LOOP -> d
-    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS -> e
-    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS_RARE -> f
-    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS_ULTRA_RARE -> g
-    net.minecraft.sounds.SoundEvent ANVIL_BREAK -> h
-    net.minecraft.sounds.SoundEvent ANVIL_DESTROY -> i
-    net.minecraft.sounds.SoundEvent ANVIL_FALL -> j
-    net.minecraft.sounds.SoundEvent ANVIL_HIT -> k
-    net.minecraft.sounds.SoundEvent ANVIL_LAND -> l
-    net.minecraft.sounds.SoundEvent ANVIL_PLACE -> m
-    net.minecraft.sounds.SoundEvent ANVIL_STEP -> n
-    net.minecraft.sounds.SoundEvent ANVIL_USE -> o
-    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_CHAIN -> p
-    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_DIAMOND -> q
-    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_ELYTRA -> r
-    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_GENERIC -> s
-    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_GOLD -> t
-    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_IRON -> u
-    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_LEATHER -> v
-    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_TURTLE -> w
-    net.minecraft.sounds.SoundEvent ARMOR_STAND_BREAK -> x
-    net.minecraft.sounds.SoundEvent ARMOR_STAND_FALL -> y
-    net.minecraft.sounds.SoundEvent ARMOR_STAND_HIT -> z
-    net.minecraft.sounds.SoundEvent ARMOR_STAND_PLACE -> A
-    net.minecraft.sounds.SoundEvent ARROW_HIT -> B
-    net.minecraft.sounds.SoundEvent ARROW_HIT_PLAYER -> C
-    net.minecraft.sounds.SoundEvent ARROW_SHOOT -> D
-    net.minecraft.sounds.SoundEvent AXE_STRIP -> E
-    net.minecraft.sounds.SoundEvent BAMBOO_BREAK -> F
-    net.minecraft.sounds.SoundEvent BAMBOO_FALL -> G
-    net.minecraft.sounds.SoundEvent BAMBOO_HIT -> H
-    net.minecraft.sounds.SoundEvent BAMBOO_PLACE -> I
-    net.minecraft.sounds.SoundEvent BAMBOO_STEP -> J
-    net.minecraft.sounds.SoundEvent BAMBOO_SAPLING_BREAK -> K
-    net.minecraft.sounds.SoundEvent BAMBOO_SAPLING_HIT -> L
-    net.minecraft.sounds.SoundEvent BAMBOO_SAPLING_PLACE -> M
-    net.minecraft.sounds.SoundEvent BARREL_CLOSE -> N
-    net.minecraft.sounds.SoundEvent BARREL_OPEN -> O
-    net.minecraft.sounds.SoundEvent BAT_AMBIENT -> P
-    net.minecraft.sounds.SoundEvent BAT_DEATH -> Q
-    net.minecraft.sounds.SoundEvent BAT_HURT -> R
-    net.minecraft.sounds.SoundEvent BAT_LOOP -> S
-    net.minecraft.sounds.SoundEvent BAT_TAKEOFF -> T
-    net.minecraft.sounds.SoundEvent BEACON_ACTIVATE -> U
-    net.minecraft.sounds.SoundEvent BEACON_AMBIENT -> V
-    net.minecraft.sounds.SoundEvent BEACON_DEACTIVATE -> W
-    net.minecraft.sounds.SoundEvent BEACON_POWER_SELECT -> X
-    net.minecraft.sounds.SoundEvent BEE_DEATH -> Y
-    net.minecraft.sounds.SoundEvent BEE_HURT -> Z
-    net.minecraft.sounds.SoundEvent BEE_LOOP_AGGRESSIVE -> aa
-    net.minecraft.sounds.SoundEvent BEE_LOOP -> ab
-    net.minecraft.sounds.SoundEvent BEE_STING -> ac
-    net.minecraft.sounds.SoundEvent BEE_POLLINATE -> ad
-    net.minecraft.sounds.SoundEvent BEEHIVE_DRIP -> ae
-    net.minecraft.sounds.SoundEvent BEEHIVE_ENTER -> af
-    net.minecraft.sounds.SoundEvent BEEHIVE_EXIT -> ag
-    net.minecraft.sounds.SoundEvent BEEHIVE_SHEAR -> ah
-    net.minecraft.sounds.SoundEvent BEEHIVE_WORK -> ai
-    net.minecraft.sounds.SoundEvent BELL_BLOCK -> aj
-    net.minecraft.sounds.SoundEvent BELL_RESONATE -> ak
-    net.minecraft.sounds.SoundEvent BLAZE_AMBIENT -> al
-    net.minecraft.sounds.SoundEvent BLAZE_BURN -> am
-    net.minecraft.sounds.SoundEvent BLAZE_DEATH -> an
-    net.minecraft.sounds.SoundEvent BLAZE_HURT -> ao
-    net.minecraft.sounds.SoundEvent BLAZE_SHOOT -> ap
-    net.minecraft.sounds.SoundEvent BOAT_PADDLE_LAND -> aq
-    net.minecraft.sounds.SoundEvent BOAT_PADDLE_WATER -> ar
-    net.minecraft.sounds.SoundEvent BOOK_PAGE_TURN -> as
-    net.minecraft.sounds.SoundEvent BOOK_PUT -> at
-    net.minecraft.sounds.SoundEvent FISHING_BOBBER_RETRIEVE -> au
-    net.minecraft.sounds.SoundEvent FISHING_BOBBER_SPLASH -> av
-    net.minecraft.sounds.SoundEvent FISHING_BOBBER_THROW -> aw
-    net.minecraft.sounds.SoundEvent BLASTFURNACE_FIRE_CRACKLE -> ax
-    net.minecraft.sounds.SoundEvent BOTTLE_EMPTY -> ay
-    net.minecraft.sounds.SoundEvent BOTTLE_FILL -> az
-    net.minecraft.sounds.SoundEvent BOTTLE_FILL_DRAGONBREATH -> aA
-    net.minecraft.sounds.SoundEvent BREWING_STAND_BREW -> aB
-    net.minecraft.sounds.SoundEvent BUBBLE_COLUMN_BUBBLE_POP -> aC
-    net.minecraft.sounds.SoundEvent BUBBLE_COLUMN_UPWARDS_AMBIENT -> aD
-    net.minecraft.sounds.SoundEvent BUBBLE_COLUMN_UPWARDS_INSIDE -> aE
-    net.minecraft.sounds.SoundEvent BUBBLE_COLUMN_WHIRLPOOL_AMBIENT -> aF
-    net.minecraft.sounds.SoundEvent BUBBLE_COLUMN_WHIRLPOOL_INSIDE -> aG
-    net.minecraft.sounds.SoundEvent BUCKET_EMPTY -> aH
-    net.minecraft.sounds.SoundEvent BUCKET_EMPTY_FISH -> aI
-    net.minecraft.sounds.SoundEvent BUCKET_EMPTY_LAVA -> aJ
-    net.minecraft.sounds.SoundEvent BUCKET_FILL -> aK
-    net.minecraft.sounds.SoundEvent BUCKET_FILL_FISH -> aL
-    net.minecraft.sounds.SoundEvent BUCKET_FILL_LAVA -> aM
-    net.minecraft.sounds.SoundEvent CAMPFIRE_CRACKLE -> aN
-    net.minecraft.sounds.SoundEvent CAT_AMBIENT -> aO
-    net.minecraft.sounds.SoundEvent CAT_STRAY_AMBIENT -> aP
-    net.minecraft.sounds.SoundEvent CAT_DEATH -> aQ
-    net.minecraft.sounds.SoundEvent CAT_EAT -> aR
-    net.minecraft.sounds.SoundEvent CAT_HISS -> aS
-    net.minecraft.sounds.SoundEvent CAT_BEG_FOR_FOOD -> aT
-    net.minecraft.sounds.SoundEvent CAT_HURT -> aU
-    net.minecraft.sounds.SoundEvent CAT_PURR -> aV
-    net.minecraft.sounds.SoundEvent CAT_PURREOW -> aW
-    net.minecraft.sounds.SoundEvent CHEST_CLOSE -> aX
-    net.minecraft.sounds.SoundEvent CHEST_LOCKED -> aY
-    net.minecraft.sounds.SoundEvent CHEST_OPEN -> aZ
-    net.minecraft.sounds.SoundEvent CHICKEN_AMBIENT -> ba
-    net.minecraft.sounds.SoundEvent CHICKEN_DEATH -> bb
-    net.minecraft.sounds.SoundEvent CHICKEN_EGG -> bc
-    net.minecraft.sounds.SoundEvent CHICKEN_HURT -> bd
-    net.minecraft.sounds.SoundEvent CHICKEN_STEP -> be
-    net.minecraft.sounds.SoundEvent CHORUS_FLOWER_DEATH -> bf
-    net.minecraft.sounds.SoundEvent CHORUS_FLOWER_GROW -> bg
-    net.minecraft.sounds.SoundEvent CHORUS_FRUIT_TELEPORT -> bh
-    net.minecraft.sounds.SoundEvent WOOL_BREAK -> bi
-    net.minecraft.sounds.SoundEvent WOOL_FALL -> bj
-    net.minecraft.sounds.SoundEvent WOOL_HIT -> bk
-    net.minecraft.sounds.SoundEvent WOOL_PLACE -> bl
-    net.minecraft.sounds.SoundEvent WOOL_STEP -> bm
-    net.minecraft.sounds.SoundEvent COD_AMBIENT -> bn
-    net.minecraft.sounds.SoundEvent COD_DEATH -> bo
-    net.minecraft.sounds.SoundEvent COD_FLOP -> bp
-    net.minecraft.sounds.SoundEvent COD_HURT -> bq
-    net.minecraft.sounds.SoundEvent COMPARATOR_CLICK -> br
-    net.minecraft.sounds.SoundEvent COMPOSTER_EMPTY -> bs
-    net.minecraft.sounds.SoundEvent COMPOSTER_FILL -> bt
-    net.minecraft.sounds.SoundEvent COMPOSTER_FILL_SUCCESS -> bu
-    net.minecraft.sounds.SoundEvent COMPOSTER_READY -> bv
-    net.minecraft.sounds.SoundEvent CONDUIT_ACTIVATE -> bw
-    net.minecraft.sounds.SoundEvent CONDUIT_AMBIENT -> bx
-    net.minecraft.sounds.SoundEvent CONDUIT_AMBIENT_SHORT -> by
-    net.minecraft.sounds.SoundEvent CONDUIT_ATTACK_TARGET -> bz
-    net.minecraft.sounds.SoundEvent CONDUIT_DEACTIVATE -> bA
-    net.minecraft.sounds.SoundEvent COW_AMBIENT -> bB
-    net.minecraft.sounds.SoundEvent COW_DEATH -> bC
-    net.minecraft.sounds.SoundEvent COW_HURT -> bD
-    net.minecraft.sounds.SoundEvent COW_MILK -> bE
-    net.minecraft.sounds.SoundEvent COW_STEP -> bF
-    net.minecraft.sounds.SoundEvent CREEPER_DEATH -> bG
-    net.minecraft.sounds.SoundEvent CREEPER_HURT -> bH
-    net.minecraft.sounds.SoundEvent CREEPER_PRIMED -> bI
-    net.minecraft.sounds.SoundEvent CROP_BREAK -> bJ
-    net.minecraft.sounds.SoundEvent CROP_PLANTED -> bK
-    net.minecraft.sounds.SoundEvent CROSSBOW_HIT -> bL
-    net.minecraft.sounds.SoundEvent CROSSBOW_LOADING_END -> bM
-    net.minecraft.sounds.SoundEvent CROSSBOW_LOADING_MIDDLE -> bN
-    net.minecraft.sounds.SoundEvent CROSSBOW_LOADING_START -> bO
-    net.minecraft.sounds.SoundEvent CROSSBOW_QUICK_CHARGE_1 -> bP
-    net.minecraft.sounds.SoundEvent CROSSBOW_QUICK_CHARGE_2 -> bQ
-    net.minecraft.sounds.SoundEvent CROSSBOW_QUICK_CHARGE_3 -> bR
-    net.minecraft.sounds.SoundEvent CROSSBOW_SHOOT -> bS
-    net.minecraft.sounds.SoundEvent DISPENSER_DISPENSE -> bT
-    net.minecraft.sounds.SoundEvent DISPENSER_FAIL -> bU
-    net.minecraft.sounds.SoundEvent DISPENSER_LAUNCH -> bV
-    net.minecraft.sounds.SoundEvent DOLPHIN_AMBIENT -> bW
-    net.minecraft.sounds.SoundEvent DOLPHIN_AMBIENT_WATER -> bX
-    net.minecraft.sounds.SoundEvent DOLPHIN_ATTACK -> bY
-    net.minecraft.sounds.SoundEvent DOLPHIN_DEATH -> bZ
-    net.minecraft.sounds.SoundEvent DOLPHIN_EAT -> ca
-    net.minecraft.sounds.SoundEvent DOLPHIN_HURT -> cb
-    net.minecraft.sounds.SoundEvent DOLPHIN_JUMP -> cc
-    net.minecraft.sounds.SoundEvent DOLPHIN_PLAY -> cd
-    net.minecraft.sounds.SoundEvent DOLPHIN_SPLASH -> ce
-    net.minecraft.sounds.SoundEvent DOLPHIN_SWIM -> cf
-    net.minecraft.sounds.SoundEvent DONKEY_AMBIENT -> cg
-    net.minecraft.sounds.SoundEvent DONKEY_ANGRY -> ch
-    net.minecraft.sounds.SoundEvent DONKEY_CHEST -> ci
-    net.minecraft.sounds.SoundEvent DONKEY_DEATH -> cj
-    net.minecraft.sounds.SoundEvent DONKEY_HURT -> ck
-    net.minecraft.sounds.SoundEvent DROWNED_AMBIENT -> cl
-    net.minecraft.sounds.SoundEvent DROWNED_AMBIENT_WATER -> cm
-    net.minecraft.sounds.SoundEvent DROWNED_DEATH -> cn
-    net.minecraft.sounds.SoundEvent DROWNED_DEATH_WATER -> co
-    net.minecraft.sounds.SoundEvent DROWNED_HURT -> cp
-    net.minecraft.sounds.SoundEvent DROWNED_HURT_WATER -> cq
-    net.minecraft.sounds.SoundEvent DROWNED_SHOOT -> cr
-    net.minecraft.sounds.SoundEvent DROWNED_STEP -> cs
-    net.minecraft.sounds.SoundEvent DROWNED_SWIM -> ct
-    net.minecraft.sounds.SoundEvent EGG_THROW -> cu
-    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_AMBIENT -> cv
-    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_AMBIENT_LAND -> cw
-    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_CURSE -> cx
-    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_DEATH -> cy
-    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_DEATH_LAND -> cz
-    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_FLOP -> cA
-    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_HURT -> cB
-    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_HURT_LAND -> cC
-    net.minecraft.sounds.SoundEvent ELYTRA_FLYING -> cD
-    net.minecraft.sounds.SoundEvent ENCHANTMENT_TABLE_USE -> cE
-    net.minecraft.sounds.SoundEvent ENDER_CHEST_CLOSE -> cF
-    net.minecraft.sounds.SoundEvent ENDER_CHEST_OPEN -> cG
-    net.minecraft.sounds.SoundEvent ENDER_DRAGON_AMBIENT -> cH
-    net.minecraft.sounds.SoundEvent ENDER_DRAGON_DEATH -> cI
-    net.minecraft.sounds.SoundEvent DRAGON_FIREBALL_EXPLODE -> cJ
-    net.minecraft.sounds.SoundEvent ENDER_DRAGON_FLAP -> cK
-    net.minecraft.sounds.SoundEvent ENDER_DRAGON_GROWL -> cL
-    net.minecraft.sounds.SoundEvent ENDER_DRAGON_HURT -> cM
-    net.minecraft.sounds.SoundEvent ENDER_DRAGON_SHOOT -> cN
-    net.minecraft.sounds.SoundEvent ENDER_EYE_DEATH -> cO
-    net.minecraft.sounds.SoundEvent ENDER_EYE_LAUNCH -> cP
-    net.minecraft.sounds.SoundEvent ENDERMAN_AMBIENT -> cQ
-    net.minecraft.sounds.SoundEvent ENDERMAN_DEATH -> cR
-    net.minecraft.sounds.SoundEvent ENDERMAN_HURT -> cS
-    net.minecraft.sounds.SoundEvent ENDERMAN_SCREAM -> cT
-    net.minecraft.sounds.SoundEvent ENDERMAN_STARE -> cU
-    net.minecraft.sounds.SoundEvent ENDERMAN_TELEPORT -> cV
-    net.minecraft.sounds.SoundEvent ENDERMITE_AMBIENT -> cW
-    net.minecraft.sounds.SoundEvent ENDERMITE_DEATH -> cX
-    net.minecraft.sounds.SoundEvent ENDERMITE_HURT -> cY
-    net.minecraft.sounds.SoundEvent ENDERMITE_STEP -> cZ
-    net.minecraft.sounds.SoundEvent ENDER_PEARL_THROW -> da
-    net.minecraft.sounds.SoundEvent END_GATEWAY_SPAWN -> db
-    net.minecraft.sounds.SoundEvent END_PORTAL_FRAME_FILL -> dc
-    net.minecraft.sounds.SoundEvent END_PORTAL_SPAWN -> dd
-    net.minecraft.sounds.SoundEvent EVOKER_AMBIENT -> de
-    net.minecraft.sounds.SoundEvent EVOKER_CAST_SPELL -> df
-    net.minecraft.sounds.SoundEvent EVOKER_CELEBRATE -> dg
-    net.minecraft.sounds.SoundEvent EVOKER_DEATH -> dh
-    net.minecraft.sounds.SoundEvent EVOKER_FANGS_ATTACK -> di
-    net.minecraft.sounds.SoundEvent EVOKER_HURT -> dj
-    net.minecraft.sounds.SoundEvent EVOKER_PREPARE_ATTACK -> dk
-    net.minecraft.sounds.SoundEvent EVOKER_PREPARE_SUMMON -> dl
-    net.minecraft.sounds.SoundEvent EVOKER_PREPARE_WOLOLO -> dm
-    net.minecraft.sounds.SoundEvent EXPERIENCE_BOTTLE_THROW -> dn
-    net.minecraft.sounds.SoundEvent EXPERIENCE_ORB_PICKUP -> do
-    net.minecraft.sounds.SoundEvent FENCE_GATE_CLOSE -> dp
-    net.minecraft.sounds.SoundEvent FENCE_GATE_OPEN -> dq
-    net.minecraft.sounds.SoundEvent FIRECHARGE_USE -> dr
-    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_BLAST -> ds
-    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_BLAST_FAR -> dt
-    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_LARGE_BLAST -> du
-    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_LARGE_BLAST_FAR -> dv
-    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_LAUNCH -> dw
-    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_SHOOT -> dx
-    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_TWINKLE -> dy
-    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_TWINKLE_FAR -> dz
-    net.minecraft.sounds.SoundEvent FIRE_AMBIENT -> dA
-    net.minecraft.sounds.SoundEvent FIRE_EXTINGUISH -> dB
-    net.minecraft.sounds.SoundEvent FISH_SWIM -> dC
-    net.minecraft.sounds.SoundEvent FLINTANDSTEEL_USE -> dD
-    net.minecraft.sounds.SoundEvent FOX_AGGRO -> dE
-    net.minecraft.sounds.SoundEvent FOX_AMBIENT -> dF
-    net.minecraft.sounds.SoundEvent FOX_BITE -> dG
-    net.minecraft.sounds.SoundEvent FOX_DEATH -> dH
-    net.minecraft.sounds.SoundEvent FOX_EAT -> dI
-    net.minecraft.sounds.SoundEvent FOX_HURT -> dJ
-    net.minecraft.sounds.SoundEvent FOX_SCREECH -> dK
-    net.minecraft.sounds.SoundEvent FOX_SLEEP -> dL
-    net.minecraft.sounds.SoundEvent FOX_SNIFF -> dM
-    net.minecraft.sounds.SoundEvent FOX_SPIT -> dN
-    net.minecraft.sounds.SoundEvent FURNACE_FIRE_CRACKLE -> dO
-    net.minecraft.sounds.SoundEvent GENERIC_BIG_FALL -> dP
-    net.minecraft.sounds.SoundEvent GENERIC_BURN -> dQ
-    net.minecraft.sounds.SoundEvent GENERIC_DEATH -> dR
-    net.minecraft.sounds.SoundEvent GENERIC_DRINK -> dS
-    net.minecraft.sounds.SoundEvent GENERIC_EAT -> dT
-    net.minecraft.sounds.SoundEvent GENERIC_EXPLODE -> dU
-    net.minecraft.sounds.SoundEvent GENERIC_EXTINGUISH_FIRE -> dV
-    net.minecraft.sounds.SoundEvent GENERIC_HURT -> dW
-    net.minecraft.sounds.SoundEvent GENERIC_SMALL_FALL -> dX
-    net.minecraft.sounds.SoundEvent GENERIC_SPLASH -> dY
-    net.minecraft.sounds.SoundEvent GENERIC_SWIM -> dZ
-    net.minecraft.sounds.SoundEvent GHAST_AMBIENT -> ea
-    net.minecraft.sounds.SoundEvent GHAST_DEATH -> eb
-    net.minecraft.sounds.SoundEvent GHAST_HURT -> ec
-    net.minecraft.sounds.SoundEvent GHAST_SCREAM -> ed
-    net.minecraft.sounds.SoundEvent GHAST_SHOOT -> ee
-    net.minecraft.sounds.SoundEvent GHAST_WARN -> ef
-    net.minecraft.sounds.SoundEvent GLASS_BREAK -> eg
-    net.minecraft.sounds.SoundEvent GLASS_FALL -> eh
-    net.minecraft.sounds.SoundEvent GLASS_HIT -> ei
-    net.minecraft.sounds.SoundEvent GLASS_PLACE -> ej
-    net.minecraft.sounds.SoundEvent GLASS_STEP -> ek
-    net.minecraft.sounds.SoundEvent GRASS_BREAK -> el
-    net.minecraft.sounds.SoundEvent GRASS_FALL -> em
-    net.minecraft.sounds.SoundEvent GRASS_HIT -> en
-    net.minecraft.sounds.SoundEvent GRASS_PLACE -> eo
-    net.minecraft.sounds.SoundEvent GRASS_STEP -> ep
-    net.minecraft.sounds.SoundEvent WET_GRASS_BREAK -> eq
-    net.minecraft.sounds.SoundEvent WET_GRASS_FALL -> er
-    net.minecraft.sounds.SoundEvent WET_GRASS_HIT -> es
-    net.minecraft.sounds.SoundEvent WET_GRASS_PLACE -> et
-    net.minecraft.sounds.SoundEvent WET_GRASS_STEP -> eu
-    net.minecraft.sounds.SoundEvent CORAL_BLOCK_BREAK -> ev
-    net.minecraft.sounds.SoundEvent CORAL_BLOCK_FALL -> ew
-    net.minecraft.sounds.SoundEvent CORAL_BLOCK_HIT -> ex
-    net.minecraft.sounds.SoundEvent CORAL_BLOCK_PLACE -> ey
-    net.minecraft.sounds.SoundEvent CORAL_BLOCK_STEP -> ez
-    net.minecraft.sounds.SoundEvent GRAVEL_BREAK -> eA
-    net.minecraft.sounds.SoundEvent GRAVEL_FALL -> eB
-    net.minecraft.sounds.SoundEvent GRAVEL_HIT -> eC
-    net.minecraft.sounds.SoundEvent GRAVEL_PLACE -> eD
-    net.minecraft.sounds.SoundEvent GRAVEL_STEP -> eE
-    net.minecraft.sounds.SoundEvent GRINDSTONE_USE -> eF
-    net.minecraft.sounds.SoundEvent GUARDIAN_AMBIENT -> eG
-    net.minecraft.sounds.SoundEvent GUARDIAN_AMBIENT_LAND -> eH
-    net.minecraft.sounds.SoundEvent GUARDIAN_ATTACK -> eI
-    net.minecraft.sounds.SoundEvent GUARDIAN_DEATH -> eJ
-    net.minecraft.sounds.SoundEvent GUARDIAN_DEATH_LAND -> eK
-    net.minecraft.sounds.SoundEvent GUARDIAN_FLOP -> eL
-    net.minecraft.sounds.SoundEvent GUARDIAN_HURT -> eM
-    net.minecraft.sounds.SoundEvent GUARDIAN_HURT_LAND -> eN
-    net.minecraft.sounds.SoundEvent HOE_TILL -> eO
-    net.minecraft.sounds.SoundEvent HONEY_BLOCK_BREAK -> eP
-    net.minecraft.sounds.SoundEvent HONEY_BLOCK_FALL -> eQ
-    net.minecraft.sounds.SoundEvent HONEY_BLOCK_HIT -> eR
-    net.minecraft.sounds.SoundEvent HONEY_BLOCK_PLACE -> eS
-    net.minecraft.sounds.SoundEvent HONEY_BLOCK_SLIDE -> eT
-    net.minecraft.sounds.SoundEvent HONEY_BLOCK_STEP -> eU
-    net.minecraft.sounds.SoundEvent HONEY_DRINK -> eV
-    net.minecraft.sounds.SoundEvent HORSE_AMBIENT -> eW
-    net.minecraft.sounds.SoundEvent HORSE_ANGRY -> eX
-    net.minecraft.sounds.SoundEvent HORSE_ARMOR -> eY
-    net.minecraft.sounds.SoundEvent HORSE_BREATHE -> eZ
-    net.minecraft.sounds.SoundEvent HORSE_DEATH -> fa
-    net.minecraft.sounds.SoundEvent HORSE_EAT -> fb
-    net.minecraft.sounds.SoundEvent HORSE_GALLOP -> fc
-    net.minecraft.sounds.SoundEvent HORSE_HURT -> fd
-    net.minecraft.sounds.SoundEvent HORSE_JUMP -> fe
-    net.minecraft.sounds.SoundEvent HORSE_LAND -> ff
-    net.minecraft.sounds.SoundEvent HORSE_SADDLE -> fg
-    net.minecraft.sounds.SoundEvent HORSE_STEP -> fh
-    net.minecraft.sounds.SoundEvent HORSE_STEP_WOOD -> fi
-    net.minecraft.sounds.SoundEvent HOSTILE_BIG_FALL -> fj
-    net.minecraft.sounds.SoundEvent HOSTILE_DEATH -> fk
-    net.minecraft.sounds.SoundEvent HOSTILE_HURT -> fl
-    net.minecraft.sounds.SoundEvent HOSTILE_SMALL_FALL -> fm
-    net.minecraft.sounds.SoundEvent HOSTILE_SPLASH -> fn
-    net.minecraft.sounds.SoundEvent HOSTILE_SWIM -> fo
-    net.minecraft.sounds.SoundEvent HUSK_AMBIENT -> fp
-    net.minecraft.sounds.SoundEvent HUSK_CONVERTED_TO_ZOMBIE -> fq
-    net.minecraft.sounds.SoundEvent HUSK_DEATH -> fr
-    net.minecraft.sounds.SoundEvent HUSK_HURT -> fs
-    net.minecraft.sounds.SoundEvent HUSK_STEP -> ft
-    net.minecraft.sounds.SoundEvent RAVAGER_AMBIENT -> fu
-    net.minecraft.sounds.SoundEvent RAVAGER_ATTACK -> fv
-    net.minecraft.sounds.SoundEvent RAVAGER_CELEBRATE -> fw
-    net.minecraft.sounds.SoundEvent RAVAGER_DEATH -> fx
-    net.minecraft.sounds.SoundEvent RAVAGER_HURT -> fy
-    net.minecraft.sounds.SoundEvent RAVAGER_STEP -> fz
-    net.minecraft.sounds.SoundEvent RAVAGER_STUNNED -> fA
-    net.minecraft.sounds.SoundEvent RAVAGER_ROAR -> fB
-    net.minecraft.sounds.SoundEvent ILLUSIONER_AMBIENT -> fC
-    net.minecraft.sounds.SoundEvent ILLUSIONER_CAST_SPELL -> fD
-    net.minecraft.sounds.SoundEvent ILLUSIONER_DEATH -> fE
-    net.minecraft.sounds.SoundEvent ILLUSIONER_HURT -> fF
-    net.minecraft.sounds.SoundEvent ILLUSIONER_MIRROR_MOVE -> fG
-    net.minecraft.sounds.SoundEvent ILLUSIONER_PREPARE_BLINDNESS -> fH
-    net.minecraft.sounds.SoundEvent ILLUSIONER_PREPARE_MIRROR -> fI
-    net.minecraft.sounds.SoundEvent IRON_DOOR_CLOSE -> fJ
-    net.minecraft.sounds.SoundEvent IRON_DOOR_OPEN -> fK
-    net.minecraft.sounds.SoundEvent IRON_GOLEM_ATTACK -> fL
-    net.minecraft.sounds.SoundEvent IRON_GOLEM_DAMAGE -> fM
-    net.minecraft.sounds.SoundEvent IRON_GOLEM_DEATH -> fN
-    net.minecraft.sounds.SoundEvent IRON_GOLEM_HURT -> fO
-    net.minecraft.sounds.SoundEvent IRON_GOLEM_REPAIR -> fP
-    net.minecraft.sounds.SoundEvent IRON_GOLEM_STEP -> fQ
-    net.minecraft.sounds.SoundEvent IRON_TRAPDOOR_CLOSE -> fR
-    net.minecraft.sounds.SoundEvent IRON_TRAPDOOR_OPEN -> fS
-    net.minecraft.sounds.SoundEvent ITEM_FRAME_ADD_ITEM -> fT
-    net.minecraft.sounds.SoundEvent ITEM_FRAME_BREAK -> fU
-    net.minecraft.sounds.SoundEvent ITEM_FRAME_PLACE -> fV
-    net.minecraft.sounds.SoundEvent ITEM_FRAME_REMOVE_ITEM -> fW
-    net.minecraft.sounds.SoundEvent ITEM_FRAME_ROTATE_ITEM -> fX
-    net.minecraft.sounds.SoundEvent ITEM_BREAK -> fY
-    net.minecraft.sounds.SoundEvent ITEM_PICKUP -> fZ
-    net.minecraft.sounds.SoundEvent LADDER_BREAK -> ga
-    net.minecraft.sounds.SoundEvent LADDER_FALL -> gb
-    net.minecraft.sounds.SoundEvent LADDER_HIT -> gc
-    net.minecraft.sounds.SoundEvent LADDER_PLACE -> gd
-    net.minecraft.sounds.SoundEvent LADDER_STEP -> ge
-    net.minecraft.sounds.SoundEvent LANTERN_BREAK -> gf
-    net.minecraft.sounds.SoundEvent LANTERN_FALL -> gg
-    net.minecraft.sounds.SoundEvent LANTERN_HIT -> gh
-    net.minecraft.sounds.SoundEvent LANTERN_PLACE -> gi
-    net.minecraft.sounds.SoundEvent LANTERN_STEP -> gj
-    net.minecraft.sounds.SoundEvent LAVA_AMBIENT -> gk
-    net.minecraft.sounds.SoundEvent LAVA_EXTINGUISH -> gl
-    net.minecraft.sounds.SoundEvent LAVA_POP -> gm
-    net.minecraft.sounds.SoundEvent LEASH_KNOT_BREAK -> gn
-    net.minecraft.sounds.SoundEvent LEASH_KNOT_PLACE -> go
-    net.minecraft.sounds.SoundEvent LEVER_CLICK -> gp
-    net.minecraft.sounds.SoundEvent LIGHTNING_BOLT_IMPACT -> gq
-    net.minecraft.sounds.SoundEvent LIGHTNING_BOLT_THUNDER -> gr
-    net.minecraft.sounds.SoundEvent LINGERING_POTION_THROW -> gs
-    net.minecraft.sounds.SoundEvent LLAMA_AMBIENT -> gt
-    net.minecraft.sounds.SoundEvent LLAMA_ANGRY -> gu
-    net.minecraft.sounds.SoundEvent LLAMA_CHEST -> gv
-    net.minecraft.sounds.SoundEvent LLAMA_DEATH -> gw
-    net.minecraft.sounds.SoundEvent LLAMA_EAT -> gx
-    net.minecraft.sounds.SoundEvent LLAMA_HURT -> gy
-    net.minecraft.sounds.SoundEvent LLAMA_SPIT -> gz
-    net.minecraft.sounds.SoundEvent LLAMA_STEP -> gA
-    net.minecraft.sounds.SoundEvent LLAMA_SWAG -> gB
-    net.minecraft.sounds.SoundEvent MAGMA_CUBE_DEATH -> gC
-    net.minecraft.sounds.SoundEvent MAGMA_CUBE_HURT -> gD
-    net.minecraft.sounds.SoundEvent MAGMA_CUBE_JUMP -> gE
-    net.minecraft.sounds.SoundEvent MAGMA_CUBE_SQUISH -> gF
-    net.minecraft.sounds.SoundEvent METAL_BREAK -> gG
-    net.minecraft.sounds.SoundEvent METAL_FALL -> gH
-    net.minecraft.sounds.SoundEvent METAL_HIT -> gI
-    net.minecraft.sounds.SoundEvent METAL_PLACE -> gJ
-    net.minecraft.sounds.SoundEvent METAL_PRESSURE_PLATE_CLICK_OFF -> gK
-    net.minecraft.sounds.SoundEvent METAL_PRESSURE_PLATE_CLICK_ON -> gL
-    net.minecraft.sounds.SoundEvent METAL_STEP -> gM
-    net.minecraft.sounds.SoundEvent MINECART_INSIDE -> gN
-    net.minecraft.sounds.SoundEvent MINECART_RIDING -> gO
-    net.minecraft.sounds.SoundEvent MOOSHROOM_CONVERT -> gP
-    net.minecraft.sounds.SoundEvent MOOSHROOM_EAT -> gQ
-    net.minecraft.sounds.SoundEvent MOOSHROOM_MILK -> gR
-    net.minecraft.sounds.SoundEvent MOOSHROOM_MILK_SUSPICIOUSLY -> gS
-    net.minecraft.sounds.SoundEvent MOOSHROOM_SHEAR -> gT
-    net.minecraft.sounds.SoundEvent MULE_AMBIENT -> gU
-    net.minecraft.sounds.SoundEvent MULE_CHEST -> gV
-    net.minecraft.sounds.SoundEvent MULE_DEATH -> gW
-    net.minecraft.sounds.SoundEvent MULE_HURT -> gX
-    net.minecraft.sounds.SoundEvent MUSIC_CREATIVE -> gY
-    net.minecraft.sounds.SoundEvent MUSIC_CREDITS -> gZ
-    net.minecraft.sounds.SoundEvent MUSIC_DRAGON -> ha
-    net.minecraft.sounds.SoundEvent MUSIC_END -> hb
-    net.minecraft.sounds.SoundEvent MUSIC_GAME -> hc
-    net.minecraft.sounds.SoundEvent MUSIC_MENU -> hd
-    net.minecraft.sounds.SoundEvent MUSIC_NETHER -> he
-    net.minecraft.sounds.SoundEvent MUSIC_UNDER_WATER -> hf
-    net.minecraft.sounds.SoundEvent NETHER_WART_BREAK -> hg
-    net.minecraft.sounds.SoundEvent NETHER_WART_PLANTED -> hh
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_BASEDRUM -> hi
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_BASS -> hj
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_BELL -> hk
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_CHIME -> hl
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_FLUTE -> hm
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_GUITAR -> hn
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_HARP -> ho
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_HAT -> hp
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_PLING -> hq
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_SNARE -> hr
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_XYLOPHONE -> hs
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_IRON_XYLOPHONE -> ht
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_COW_BELL -> hu
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_DIDGERIDOO -> hv
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_BIT -> hw
-    net.minecraft.sounds.SoundEvent NOTE_BLOCK_BANJO -> hx
-    net.minecraft.sounds.SoundEvent OCELOT_HURT -> hy
-    net.minecraft.sounds.SoundEvent OCELOT_AMBIENT -> hz
-    net.minecraft.sounds.SoundEvent OCELOT_DEATH -> hA
-    net.minecraft.sounds.SoundEvent PAINTING_BREAK -> hB
-    net.minecraft.sounds.SoundEvent PAINTING_PLACE -> hC
-    net.minecraft.sounds.SoundEvent PANDA_PRE_SNEEZE -> hD
-    net.minecraft.sounds.SoundEvent PANDA_SNEEZE -> hE
-    net.minecraft.sounds.SoundEvent PANDA_AMBIENT -> hF
-    net.minecraft.sounds.SoundEvent PANDA_DEATH -> hG
-    net.minecraft.sounds.SoundEvent PANDA_EAT -> hH
-    net.minecraft.sounds.SoundEvent PANDA_STEP -> hI
-    net.minecraft.sounds.SoundEvent PANDA_CANT_BREED -> hJ
-    net.minecraft.sounds.SoundEvent PANDA_AGGRESSIVE_AMBIENT -> hK
-    net.minecraft.sounds.SoundEvent PANDA_WORRIED_AMBIENT -> hL
-    net.minecraft.sounds.SoundEvent PANDA_HURT -> hM
-    net.minecraft.sounds.SoundEvent PANDA_BITE -> hN
-    net.minecraft.sounds.SoundEvent PARROT_AMBIENT -> hO
-    net.minecraft.sounds.SoundEvent PARROT_DEATH -> hP
-    net.minecraft.sounds.SoundEvent PARROT_EAT -> hQ
-    net.minecraft.sounds.SoundEvent PARROT_FLY -> hR
-    net.minecraft.sounds.SoundEvent PARROT_HURT -> hS
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_BLAZE -> hT
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_CREEPER -> hU
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_DROWNED -> hV
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ELDER_GUARDIAN -> hW
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ENDER_DRAGON -> hX
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ENDERMITE -> hY
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_EVOKER -> hZ
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_GHAST -> ia
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_GUARDIAN -> ib
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_HUSK -> ic
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ILLUSIONER -> id
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_MAGMA_CUBE -> ie
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_PHANTOM -> if
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_PILLAGER -> ig
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_RAVAGER -> ih
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_SHULKER -> ii
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_SILVERFISH -> ij
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_SKELETON -> ik
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_SLIME -> il
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_SPIDER -> im
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_STRAY -> in
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_VEX -> io
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_VINDICATOR -> ip
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_WITCH -> iq
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_WITHER -> ir
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_WITHER_SKELETON -> is
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ZOMBIE -> it
-    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ZOMBIE_VILLAGER -> iu
-    net.minecraft.sounds.SoundEvent PARROT_STEP -> iv
-    net.minecraft.sounds.SoundEvent PHANTOM_AMBIENT -> iw
-    net.minecraft.sounds.SoundEvent PHANTOM_BITE -> ix
-    net.minecraft.sounds.SoundEvent PHANTOM_DEATH -> iy
-    net.minecraft.sounds.SoundEvent PHANTOM_FLAP -> iz
-    net.minecraft.sounds.SoundEvent PHANTOM_HURT -> iA
-    net.minecraft.sounds.SoundEvent PHANTOM_SWOOP -> iB
-    net.minecraft.sounds.SoundEvent PIG_AMBIENT -> iC
-    net.minecraft.sounds.SoundEvent PIG_DEATH -> iD
-    net.minecraft.sounds.SoundEvent PIG_HURT -> iE
-    net.minecraft.sounds.SoundEvent PIG_SADDLE -> iF
-    net.minecraft.sounds.SoundEvent PIG_STEP -> iG
-    net.minecraft.sounds.SoundEvent PILLAGER_AMBIENT -> iH
-    net.minecraft.sounds.SoundEvent PILLAGER_CELEBRATE -> iI
-    net.minecraft.sounds.SoundEvent PILLAGER_DEATH -> iJ
-    net.minecraft.sounds.SoundEvent PILLAGER_HURT -> iK
-    net.minecraft.sounds.SoundEvent PISTON_CONTRACT -> iL
-    net.minecraft.sounds.SoundEvent PISTON_EXTEND -> iM
-    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_CRIT -> iN
-    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_KNOCKBACK -> iO
-    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_NODAMAGE -> iP
-    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_STRONG -> iQ
-    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_SWEEP -> iR
-    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_WEAK -> iS
-    net.minecraft.sounds.SoundEvent PLAYER_BIG_FALL -> iT
-    net.minecraft.sounds.SoundEvent PLAYER_BREATH -> iU
-    net.minecraft.sounds.SoundEvent PLAYER_BURP -> iV
-    net.minecraft.sounds.SoundEvent PLAYER_DEATH -> iW
-    net.minecraft.sounds.SoundEvent PLAYER_HURT -> iX
-    net.minecraft.sounds.SoundEvent PLAYER_HURT_DROWN -> iY
-    net.minecraft.sounds.SoundEvent PLAYER_HURT_ON_FIRE -> iZ
-    net.minecraft.sounds.SoundEvent PLAYER_HURT_SWEET_BERRY_BUSH -> ja
-    net.minecraft.sounds.SoundEvent PLAYER_LEVELUP -> jb
-    net.minecraft.sounds.SoundEvent PLAYER_SMALL_FALL -> jc
-    net.minecraft.sounds.SoundEvent PLAYER_SPLASH -> jd
-    net.minecraft.sounds.SoundEvent PLAYER_SPLASH_HIGH_SPEED -> je
-    net.minecraft.sounds.SoundEvent PLAYER_SWIM -> jf
-    net.minecraft.sounds.SoundEvent POLAR_BEAR_AMBIENT -> jg
-    net.minecraft.sounds.SoundEvent POLAR_BEAR_AMBIENT_BABY -> jh
-    net.minecraft.sounds.SoundEvent POLAR_BEAR_DEATH -> ji
-    net.minecraft.sounds.SoundEvent POLAR_BEAR_HURT -> jj
-    net.minecraft.sounds.SoundEvent POLAR_BEAR_STEP -> jk
-    net.minecraft.sounds.SoundEvent POLAR_BEAR_WARNING -> jl
-    net.minecraft.sounds.SoundEvent PORTAL_AMBIENT -> jm
-    net.minecraft.sounds.SoundEvent PORTAL_TRAVEL -> jn
-    net.minecraft.sounds.SoundEvent PORTAL_TRIGGER -> jo
-    net.minecraft.sounds.SoundEvent PUFFER_FISH_AMBIENT -> jp
-    net.minecraft.sounds.SoundEvent PUFFER_FISH_BLOW_OUT -> jq
-    net.minecraft.sounds.SoundEvent PUFFER_FISH_BLOW_UP -> jr
-    net.minecraft.sounds.SoundEvent PUFFER_FISH_DEATH -> js
-    net.minecraft.sounds.SoundEvent PUFFER_FISH_FLOP -> jt
-    net.minecraft.sounds.SoundEvent PUFFER_FISH_HURT -> ju
-    net.minecraft.sounds.SoundEvent PUFFER_FISH_STING -> jv
-    net.minecraft.sounds.SoundEvent PUMPKIN_CARVE -> jw
-    net.minecraft.sounds.SoundEvent RABBIT_AMBIENT -> jx
-    net.minecraft.sounds.SoundEvent RABBIT_ATTACK -> jy
-    net.minecraft.sounds.SoundEvent RABBIT_DEATH -> jz
-    net.minecraft.sounds.SoundEvent RABBIT_HURT -> jA
-    net.minecraft.sounds.SoundEvent RABBIT_JUMP -> jB
-    net.minecraft.sounds.SoundEvent RAID_HORN -> jC
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_11 -> jD
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_13 -> jE
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_BLOCKS -> jF
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_CAT -> jG
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_CHIRP -> jH
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_FAR -> jI
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_MALL -> jJ
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_MELLOHI -> jK
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_STAL -> jL
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_STRAD -> jM
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_WAIT -> jN
-    net.minecraft.sounds.SoundEvent MUSIC_DISC_WARD -> jO
-    net.minecraft.sounds.SoundEvent REDSTONE_TORCH_BURNOUT -> jP
-    net.minecraft.sounds.SoundEvent SALMON_AMBIENT -> jQ
-    net.minecraft.sounds.SoundEvent SALMON_DEATH -> jR
-    net.minecraft.sounds.SoundEvent SALMON_FLOP -> jS
-    net.minecraft.sounds.SoundEvent SALMON_HURT -> jT
-    net.minecraft.sounds.SoundEvent SAND_BREAK -> jU
-    net.minecraft.sounds.SoundEvent SAND_FALL -> jV
-    net.minecraft.sounds.SoundEvent SAND_HIT -> jW
-    net.minecraft.sounds.SoundEvent SAND_PLACE -> jX
-    net.minecraft.sounds.SoundEvent SAND_STEP -> jY
-    net.minecraft.sounds.SoundEvent SCAFFOLDING_BREAK -> jZ
-    net.minecraft.sounds.SoundEvent SCAFFOLDING_FALL -> ka
-    net.minecraft.sounds.SoundEvent SCAFFOLDING_HIT -> kb
-    net.minecraft.sounds.SoundEvent SCAFFOLDING_PLACE -> kc
-    net.minecraft.sounds.SoundEvent SCAFFOLDING_STEP -> kd
-    net.minecraft.sounds.SoundEvent SHEEP_AMBIENT -> ke
-    net.minecraft.sounds.SoundEvent SHEEP_DEATH -> kf
-    net.minecraft.sounds.SoundEvent SHEEP_HURT -> kg
-    net.minecraft.sounds.SoundEvent SHEEP_SHEAR -> kh
-    net.minecraft.sounds.SoundEvent SHEEP_STEP -> ki
-    net.minecraft.sounds.SoundEvent SHIELD_BLOCK -> kj
-    net.minecraft.sounds.SoundEvent SHIELD_BREAK -> kk
-    net.minecraft.sounds.SoundEvent SHOVEL_FLATTEN -> kl
-    net.minecraft.sounds.SoundEvent SHULKER_AMBIENT -> km
-    net.minecraft.sounds.SoundEvent SHULKER_BOX_CLOSE -> kn
-    net.minecraft.sounds.SoundEvent SHULKER_BOX_OPEN -> ko
-    net.minecraft.sounds.SoundEvent SHULKER_BULLET_HIT -> kp
-    net.minecraft.sounds.SoundEvent SHULKER_BULLET_HURT -> kq
-    net.minecraft.sounds.SoundEvent SHULKER_CLOSE -> kr
-    net.minecraft.sounds.SoundEvent SHULKER_DEATH -> ks
-    net.minecraft.sounds.SoundEvent SHULKER_HURT -> kt
-    net.minecraft.sounds.SoundEvent SHULKER_HURT_CLOSED -> ku
-    net.minecraft.sounds.SoundEvent SHULKER_OPEN -> kv
-    net.minecraft.sounds.SoundEvent SHULKER_SHOOT -> kw
-    net.minecraft.sounds.SoundEvent SHULKER_TELEPORT -> kx
-    net.minecraft.sounds.SoundEvent SILVERFISH_AMBIENT -> ky
-    net.minecraft.sounds.SoundEvent SILVERFISH_DEATH -> kz
-    net.minecraft.sounds.SoundEvent SILVERFISH_HURT -> kA
-    net.minecraft.sounds.SoundEvent SILVERFISH_STEP -> kB
-    net.minecraft.sounds.SoundEvent SKELETON_AMBIENT -> kC
-    net.minecraft.sounds.SoundEvent SKELETON_DEATH -> kD
-    net.minecraft.sounds.SoundEvent SKELETON_HORSE_AMBIENT -> kE
-    net.minecraft.sounds.SoundEvent SKELETON_HORSE_DEATH -> kF
-    net.minecraft.sounds.SoundEvent SKELETON_HORSE_HURT -> kG
-    net.minecraft.sounds.SoundEvent SKELETON_HORSE_SWIM -> kH
-    net.minecraft.sounds.SoundEvent SKELETON_HORSE_AMBIENT_WATER -> kI
-    net.minecraft.sounds.SoundEvent SKELETON_HORSE_GALLOP_WATER -> kJ
-    net.minecraft.sounds.SoundEvent SKELETON_HORSE_JUMP_WATER -> kK
-    net.minecraft.sounds.SoundEvent SKELETON_HORSE_STEP_WATER -> kL
-    net.minecraft.sounds.SoundEvent SKELETON_HURT -> kM
-    net.minecraft.sounds.SoundEvent SKELETON_SHOOT -> kN
-    net.minecraft.sounds.SoundEvent SKELETON_STEP -> kO
-    net.minecraft.sounds.SoundEvent SLIME_ATTACK -> kP
-    net.minecraft.sounds.SoundEvent SLIME_DEATH -> kQ
-    net.minecraft.sounds.SoundEvent SLIME_HURT -> kR
-    net.minecraft.sounds.SoundEvent SLIME_JUMP -> kS
-    net.minecraft.sounds.SoundEvent SLIME_SQUISH -> kT
-    net.minecraft.sounds.SoundEvent SLIME_BLOCK_BREAK -> kU
-    net.minecraft.sounds.SoundEvent SLIME_BLOCK_FALL -> kV
-    net.minecraft.sounds.SoundEvent SLIME_BLOCK_HIT -> kW
-    net.minecraft.sounds.SoundEvent SLIME_BLOCK_PLACE -> kX
-    net.minecraft.sounds.SoundEvent SLIME_BLOCK_STEP -> kY
-    net.minecraft.sounds.SoundEvent MAGMA_CUBE_DEATH_SMALL -> kZ
-    net.minecraft.sounds.SoundEvent MAGMA_CUBE_HURT_SMALL -> la
-    net.minecraft.sounds.SoundEvent MAGMA_CUBE_SQUISH_SMALL -> lb
-    net.minecraft.sounds.SoundEvent SLIME_DEATH_SMALL -> lc
-    net.minecraft.sounds.SoundEvent SLIME_HURT_SMALL -> ld
-    net.minecraft.sounds.SoundEvent SLIME_JUMP_SMALL -> le
-    net.minecraft.sounds.SoundEvent SLIME_SQUISH_SMALL -> lf
-    net.minecraft.sounds.SoundEvent SMOKER_SMOKE -> lg
-    net.minecraft.sounds.SoundEvent SNOWBALL_THROW -> lh
-    net.minecraft.sounds.SoundEvent SNOW_BREAK -> li
-    net.minecraft.sounds.SoundEvent SNOW_FALL -> lj
-    net.minecraft.sounds.SoundEvent SNOW_GOLEM_AMBIENT -> lk
-    net.minecraft.sounds.SoundEvent SNOW_GOLEM_DEATH -> ll
-    net.minecraft.sounds.SoundEvent SNOW_GOLEM_HURT -> lm
-    net.minecraft.sounds.SoundEvent SNOW_GOLEM_SHOOT -> ln
-    net.minecraft.sounds.SoundEvent SNOW_HIT -> lo
-    net.minecraft.sounds.SoundEvent SNOW_PLACE -> lp
-    net.minecraft.sounds.SoundEvent SNOW_STEP -> lq
-    net.minecraft.sounds.SoundEvent SPIDER_AMBIENT -> lr
-    net.minecraft.sounds.SoundEvent SPIDER_DEATH -> ls
-    net.minecraft.sounds.SoundEvent SPIDER_HURT -> lt
-    net.minecraft.sounds.SoundEvent SPIDER_STEP -> lu
-    net.minecraft.sounds.SoundEvent SPLASH_POTION_BREAK -> lv
-    net.minecraft.sounds.SoundEvent SPLASH_POTION_THROW -> lw
-    net.minecraft.sounds.SoundEvent SQUID_AMBIENT -> lx
-    net.minecraft.sounds.SoundEvent SQUID_DEATH -> ly
-    net.minecraft.sounds.SoundEvent SQUID_HURT -> lz
-    net.minecraft.sounds.SoundEvent SQUID_SQUIRT -> lA
-    net.minecraft.sounds.SoundEvent STONE_BREAK -> lB
-    net.minecraft.sounds.SoundEvent STONE_BUTTON_CLICK_OFF -> lC
-    net.minecraft.sounds.SoundEvent STONE_BUTTON_CLICK_ON -> lD
-    net.minecraft.sounds.SoundEvent STONE_FALL -> lE
-    net.minecraft.sounds.SoundEvent STONE_HIT -> lF
-    net.minecraft.sounds.SoundEvent STONE_PLACE -> lG
-    net.minecraft.sounds.SoundEvent STONE_PRESSURE_PLATE_CLICK_OFF -> lH
-    net.minecraft.sounds.SoundEvent STONE_PRESSURE_PLATE_CLICK_ON -> lI
-    net.minecraft.sounds.SoundEvent STONE_STEP -> lJ
-    net.minecraft.sounds.SoundEvent STRAY_AMBIENT -> lK
-    net.minecraft.sounds.SoundEvent STRAY_DEATH -> lL
-    net.minecraft.sounds.SoundEvent STRAY_HURT -> lM
-    net.minecraft.sounds.SoundEvent STRAY_STEP -> lN
-    net.minecraft.sounds.SoundEvent SWEET_BERRY_BUSH_BREAK -> lO
-    net.minecraft.sounds.SoundEvent SWEET_BERRY_BUSH_PLACE -> lP
-    net.minecraft.sounds.SoundEvent SWEET_BERRY_BUSH_PICK_BERRIES -> lQ
-    net.minecraft.sounds.SoundEvent THORNS_HIT -> lR
-    net.minecraft.sounds.SoundEvent TNT_PRIMED -> lS
-    net.minecraft.sounds.SoundEvent TOTEM_USE -> lT
-    net.minecraft.sounds.SoundEvent TRIDENT_HIT -> lU
-    net.minecraft.sounds.SoundEvent TRIDENT_HIT_GROUND -> lV
-    net.minecraft.sounds.SoundEvent TRIDENT_RETURN -> lW
-    net.minecraft.sounds.SoundEvent TRIDENT_RIPTIDE_1 -> lX
-    net.minecraft.sounds.SoundEvent TRIDENT_RIPTIDE_2 -> lY
-    net.minecraft.sounds.SoundEvent TRIDENT_RIPTIDE_3 -> lZ
-    net.minecraft.sounds.SoundEvent TRIDENT_THROW -> ma
-    net.minecraft.sounds.SoundEvent TRIDENT_THUNDER -> mb
-    net.minecraft.sounds.SoundEvent TRIPWIRE_ATTACH -> mc
-    net.minecraft.sounds.SoundEvent TRIPWIRE_CLICK_OFF -> md
-    net.minecraft.sounds.SoundEvent TRIPWIRE_CLICK_ON -> me
-    net.minecraft.sounds.SoundEvent TRIPWIRE_DETACH -> mf
-    net.minecraft.sounds.SoundEvent TROPICAL_FISH_AMBIENT -> mg
-    net.minecraft.sounds.SoundEvent TROPICAL_FISH_DEATH -> mh
-    net.minecraft.sounds.SoundEvent TROPICAL_FISH_FLOP -> mi
-    net.minecraft.sounds.SoundEvent TROPICAL_FISH_HURT -> mj
-    net.minecraft.sounds.SoundEvent TURTLE_AMBIENT_LAND -> mk
-    net.minecraft.sounds.SoundEvent TURTLE_DEATH -> ml
-    net.minecraft.sounds.SoundEvent TURTLE_DEATH_BABY -> mm
-    net.minecraft.sounds.SoundEvent TURTLE_EGG_BREAK -> mn
-    net.minecraft.sounds.SoundEvent TURTLE_EGG_CRACK -> mo
-    net.minecraft.sounds.SoundEvent TURTLE_EGG_HATCH -> mp
-    net.minecraft.sounds.SoundEvent TURTLE_HURT -> mq
-    net.minecraft.sounds.SoundEvent TURTLE_HURT_BABY -> mr
-    net.minecraft.sounds.SoundEvent TURTLE_LAY_EGG -> ms
-    net.minecraft.sounds.SoundEvent TURTLE_SHAMBLE -> mt
-    net.minecraft.sounds.SoundEvent TURTLE_SHAMBLE_BABY -> mu
-    net.minecraft.sounds.SoundEvent TURTLE_SWIM -> mv
-    net.minecraft.sounds.SoundEvent UI_BUTTON_CLICK -> mw
-    net.minecraft.sounds.SoundEvent UI_LOOM_SELECT_PATTERN -> mx
-    net.minecraft.sounds.SoundEvent UI_LOOM_TAKE_RESULT -> my
-    net.minecraft.sounds.SoundEvent UI_CARTOGRAPHY_TABLE_TAKE_RESULT -> mz
-    net.minecraft.sounds.SoundEvent UI_STONECUTTER_TAKE_RESULT -> mA
-    net.minecraft.sounds.SoundEvent UI_STONECUTTER_SELECT_RECIPE -> mB
-    net.minecraft.sounds.SoundEvent UI_TOAST_CHALLENGE_COMPLETE -> mC
-    net.minecraft.sounds.SoundEvent UI_TOAST_IN -> mD
-    net.minecraft.sounds.SoundEvent UI_TOAST_OUT -> mE
-    net.minecraft.sounds.SoundEvent VEX_AMBIENT -> mF
-    net.minecraft.sounds.SoundEvent VEX_CHARGE -> mG
-    net.minecraft.sounds.SoundEvent VEX_DEATH -> mH
-    net.minecraft.sounds.SoundEvent VEX_HURT -> mI
-    net.minecraft.sounds.SoundEvent VILLAGER_AMBIENT -> mJ
-    net.minecraft.sounds.SoundEvent VILLAGER_CELEBRATE -> mK
-    net.minecraft.sounds.SoundEvent VILLAGER_DEATH -> mL
-    net.minecraft.sounds.SoundEvent VILLAGER_HURT -> mM
-    net.minecraft.sounds.SoundEvent VILLAGER_NO -> mN
-    net.minecraft.sounds.SoundEvent VILLAGER_TRADE -> mO
-    net.minecraft.sounds.SoundEvent VILLAGER_YES -> mP
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_ARMORER -> mQ
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_BUTCHER -> mR
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_CARTOGRAPHER -> mS
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_CLERIC -> mT
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_FARMER -> mU
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_FISHERMAN -> mV
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_FLETCHER -> mW
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_LEATHERWORKER -> mX
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_LIBRARIAN -> mY
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_MASON -> mZ
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_SHEPHERD -> na
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_TOOLSMITH -> nb
-    net.minecraft.sounds.SoundEvent VILLAGER_WORK_WEAPONSMITH -> nc
-    net.minecraft.sounds.SoundEvent VINDICATOR_AMBIENT -> nd
-    net.minecraft.sounds.SoundEvent VINDICATOR_CELEBRATE -> ne
-    net.minecraft.sounds.SoundEvent VINDICATOR_DEATH -> nf
-    net.minecraft.sounds.SoundEvent VINDICATOR_HURT -> ng
-    net.minecraft.sounds.SoundEvent LILY_PAD_PLACE -> nh
-    net.minecraft.sounds.SoundEvent WANDERING_TRADER_AMBIENT -> ni
-    net.minecraft.sounds.SoundEvent WANDERING_TRADER_DEATH -> nj
-    net.minecraft.sounds.SoundEvent WANDERING_TRADER_DISAPPEARED -> nk
-    net.minecraft.sounds.SoundEvent WANDERING_TRADER_DRINK_MILK -> nl
-    net.minecraft.sounds.SoundEvent WANDERING_TRADER_DRINK_POTION -> nm
-    net.minecraft.sounds.SoundEvent WANDERING_TRADER_HURT -> nn
-    net.minecraft.sounds.SoundEvent WANDERING_TRADER_NO -> no
-    net.minecraft.sounds.SoundEvent WANDERING_TRADER_REAPPEARED -> np
-    net.minecraft.sounds.SoundEvent WANDERING_TRADER_TRADE -> nq
-    net.minecraft.sounds.SoundEvent WANDERING_TRADER_YES -> nr
-    net.minecraft.sounds.SoundEvent WATER_AMBIENT -> ns
-    net.minecraft.sounds.SoundEvent WEATHER_RAIN -> nt
-    net.minecraft.sounds.SoundEvent WEATHER_RAIN_ABOVE -> nu
-    net.minecraft.sounds.SoundEvent WITCH_AMBIENT -> nv
-    net.minecraft.sounds.SoundEvent WITCH_CELEBRATE -> nw
-    net.minecraft.sounds.SoundEvent WITCH_DEATH -> nx
-    net.minecraft.sounds.SoundEvent WITCH_DRINK -> ny
-    net.minecraft.sounds.SoundEvent WITCH_HURT -> nz
-    net.minecraft.sounds.SoundEvent WITCH_THROW -> nA
-    net.minecraft.sounds.SoundEvent WITHER_AMBIENT -> nB
-    net.minecraft.sounds.SoundEvent WITHER_BREAK_BLOCK -> nC
-    net.minecraft.sounds.SoundEvent WITHER_DEATH -> nD
-    net.minecraft.sounds.SoundEvent WITHER_HURT -> nE
-    net.minecraft.sounds.SoundEvent WITHER_SHOOT -> nF
-    net.minecraft.sounds.SoundEvent WITHER_SKELETON_AMBIENT -> nG
-    net.minecraft.sounds.SoundEvent WITHER_SKELETON_DEATH -> nH
-    net.minecraft.sounds.SoundEvent WITHER_SKELETON_HURT -> nI
-    net.minecraft.sounds.SoundEvent WITHER_SKELETON_STEP -> nJ
-    net.minecraft.sounds.SoundEvent WITHER_SPAWN -> nK
-    net.minecraft.sounds.SoundEvent WOLF_AMBIENT -> nL
-    net.minecraft.sounds.SoundEvent WOLF_DEATH -> nM
-    net.minecraft.sounds.SoundEvent WOLF_GROWL -> nN
-    net.minecraft.sounds.SoundEvent WOLF_HOWL -> nO
-    net.minecraft.sounds.SoundEvent WOLF_HURT -> nP
-    net.minecraft.sounds.SoundEvent WOLF_PANT -> nQ
-    net.minecraft.sounds.SoundEvent WOLF_SHAKE -> nR
-    net.minecraft.sounds.SoundEvent WOLF_STEP -> nS
-    net.minecraft.sounds.SoundEvent WOLF_WHINE -> nT
-    net.minecraft.sounds.SoundEvent WOODEN_DOOR_CLOSE -> nU
-    net.minecraft.sounds.SoundEvent WOODEN_DOOR_OPEN -> nV
-    net.minecraft.sounds.SoundEvent WOODEN_TRAPDOOR_CLOSE -> nW
-    net.minecraft.sounds.SoundEvent WOODEN_TRAPDOOR_OPEN -> nX
-    net.minecraft.sounds.SoundEvent WOOD_BREAK -> nY
-    net.minecraft.sounds.SoundEvent WOODEN_BUTTON_CLICK_OFF -> nZ
-    net.minecraft.sounds.SoundEvent WOODEN_BUTTON_CLICK_ON -> oa
-    net.minecraft.sounds.SoundEvent WOOD_FALL -> ob
-    net.minecraft.sounds.SoundEvent WOOD_HIT -> oc
-    net.minecraft.sounds.SoundEvent WOOD_PLACE -> od
-    net.minecraft.sounds.SoundEvent WOODEN_PRESSURE_PLATE_CLICK_OFF -> oe
-    net.minecraft.sounds.SoundEvent WOODEN_PRESSURE_PLATE_CLICK_ON -> of
-    net.minecraft.sounds.SoundEvent WOOD_STEP -> og
-    net.minecraft.sounds.SoundEvent ZOMBIE_AMBIENT -> oh
-    net.minecraft.sounds.SoundEvent ZOMBIE_ATTACK_WOODEN_DOOR -> oi
-    net.minecraft.sounds.SoundEvent ZOMBIE_ATTACK_IRON_DOOR -> oj
-    net.minecraft.sounds.SoundEvent ZOMBIE_BREAK_WOODEN_DOOR -> ok
-    net.minecraft.sounds.SoundEvent ZOMBIE_CONVERTED_TO_DROWNED -> ol
-    net.minecraft.sounds.SoundEvent ZOMBIE_DEATH -> om
-    net.minecraft.sounds.SoundEvent ZOMBIE_DESTROY_EGG -> on
-    net.minecraft.sounds.SoundEvent ZOMBIE_HORSE_AMBIENT -> oo
-    net.minecraft.sounds.SoundEvent ZOMBIE_HORSE_DEATH -> op
-    net.minecraft.sounds.SoundEvent ZOMBIE_HORSE_HURT -> oq
-    net.minecraft.sounds.SoundEvent ZOMBIE_HURT -> or
-    net.minecraft.sounds.SoundEvent ZOMBIE_INFECT -> os
-    net.minecraft.sounds.SoundEvent ZOMBIE_PIGMAN_AMBIENT -> ot
-    net.minecraft.sounds.SoundEvent ZOMBIE_PIGMAN_ANGRY -> ou
-    net.minecraft.sounds.SoundEvent ZOMBIE_PIGMAN_DEATH -> ov
-    net.minecraft.sounds.SoundEvent ZOMBIE_PIGMAN_HURT -> ow
-    net.minecraft.sounds.SoundEvent ZOMBIE_STEP -> ox
-    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_AMBIENT -> oy
-    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_CONVERTED -> oz
-    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_CURE -> oA
-    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_DEATH -> oB
-    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_HURT -> oC
-    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_STEP -> oD
+    net.minecraft.sounds.SoundEvent AMBIENT_BASALT_DELTAS_ADDITIONS -> b
+    net.minecraft.sounds.SoundEvent AMBIENT_BASALT_DELTAS_LOOP -> c
+    net.minecraft.sounds.SoundEvent AMBIENT_BASALT_DELTAS_MOOD -> d
+    net.minecraft.sounds.SoundEvent AMBIENT_CRIMSON_FOREST_ADDITIONS -> e
+    net.minecraft.sounds.SoundEvent AMBIENT_CRIMSON_FOREST_LOOP -> f
+    net.minecraft.sounds.SoundEvent AMBIENT_CRIMSON_FOREST_MOOD -> g
+    net.minecraft.sounds.SoundEvent AMBIENT_NETHER_WASTES_ADDITIONS -> h
+    net.minecraft.sounds.SoundEvent AMBIENT_NETHER_WASTES_LOOP -> i
+    net.minecraft.sounds.SoundEvent AMBIENT_NETHER_WASTES_MOOD -> j
+    net.minecraft.sounds.SoundEvent AMBIENT_SOUL_SAND_VALLEY_ADDITIONS -> k
+    net.minecraft.sounds.SoundEvent AMBIENT_SOUL_SAND_VALLEY_LOOP -> l
+    net.minecraft.sounds.SoundEvent AMBIENT_SOUL_SAND_VALLEY_MOOD -> m
+    net.minecraft.sounds.SoundEvent AMBIENT_WARPED_FOREST_ADDITIONS -> n
+    net.minecraft.sounds.SoundEvent AMBIENT_WARPED_FOREST_LOOP -> o
+    net.minecraft.sounds.SoundEvent AMBIENT_WARPED_FOREST_MOOD -> p
+    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_ENTER -> q
+    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_EXIT -> r
+    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_LOOP -> s
+    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS -> t
+    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS_RARE -> u
+    net.minecraft.sounds.SoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS_ULTRA_RARE -> v
+    net.minecraft.sounds.SoundEvent ANCIENT_DEBRIS_BREAK -> w
+    net.minecraft.sounds.SoundEvent ANCIENT_DEBRIS_STEP -> x
+    net.minecraft.sounds.SoundEvent ANCIENT_DEBRIS_PLACE -> y
+    net.minecraft.sounds.SoundEvent ANCIENT_DEBRIS_HIT -> z
+    net.minecraft.sounds.SoundEvent ANCIENT_DEBRIS_FALL -> A
+    net.minecraft.sounds.SoundEvent ANVIL_BREAK -> B
+    net.minecraft.sounds.SoundEvent ANVIL_DESTROY -> C
+    net.minecraft.sounds.SoundEvent ANVIL_FALL -> D
+    net.minecraft.sounds.SoundEvent ANVIL_HIT -> E
+    net.minecraft.sounds.SoundEvent ANVIL_LAND -> F
+    net.minecraft.sounds.SoundEvent ANVIL_PLACE -> G
+    net.minecraft.sounds.SoundEvent ANVIL_STEP -> H
+    net.minecraft.sounds.SoundEvent ANVIL_USE -> I
+    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_CHAIN -> J
+    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_DIAMOND -> K
+    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_ELYTRA -> L
+    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_GENERIC -> M
+    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_GOLD -> N
+    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_IRON -> O
+    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_LEATHER -> P
+    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_NETHERITE -> Q
+    net.minecraft.sounds.SoundEvent ARMOR_EQUIP_TURTLE -> R
+    net.minecraft.sounds.SoundEvent ARMOR_STAND_BREAK -> S
+    net.minecraft.sounds.SoundEvent ARMOR_STAND_FALL -> T
+    net.minecraft.sounds.SoundEvent ARMOR_STAND_HIT -> U
+    net.minecraft.sounds.SoundEvent ARMOR_STAND_PLACE -> V
+    net.minecraft.sounds.SoundEvent ARROW_HIT -> W
+    net.minecraft.sounds.SoundEvent ARROW_HIT_PLAYER -> X
+    net.minecraft.sounds.SoundEvent ARROW_SHOOT -> Y
+    net.minecraft.sounds.SoundEvent AXE_STRIP -> Z
+    net.minecraft.sounds.SoundEvent BAMBOO_BREAK -> aa
+    net.minecraft.sounds.SoundEvent BAMBOO_FALL -> ab
+    net.minecraft.sounds.SoundEvent BAMBOO_HIT -> ac
+    net.minecraft.sounds.SoundEvent BAMBOO_PLACE -> ad
+    net.minecraft.sounds.SoundEvent BAMBOO_STEP -> ae
+    net.minecraft.sounds.SoundEvent BAMBOO_SAPLING_BREAK -> af
+    net.minecraft.sounds.SoundEvent BAMBOO_SAPLING_HIT -> ag
+    net.minecraft.sounds.SoundEvent BAMBOO_SAPLING_PLACE -> ah
+    net.minecraft.sounds.SoundEvent BARREL_CLOSE -> ai
+    net.minecraft.sounds.SoundEvent BARREL_OPEN -> aj
+    net.minecraft.sounds.SoundEvent BASALT_BREAK -> ak
+    net.minecraft.sounds.SoundEvent BASALT_STEP -> al
+    net.minecraft.sounds.SoundEvent BASALT_PLACE -> am
+    net.minecraft.sounds.SoundEvent BASALT_HIT -> an
+    net.minecraft.sounds.SoundEvent BASALT_FALL -> ao
+    net.minecraft.sounds.SoundEvent BAT_AMBIENT -> ap
+    net.minecraft.sounds.SoundEvent BAT_DEATH -> aq
+    net.minecraft.sounds.SoundEvent BAT_HURT -> ar
+    net.minecraft.sounds.SoundEvent BAT_LOOP -> as
+    net.minecraft.sounds.SoundEvent BAT_TAKEOFF -> at
+    net.minecraft.sounds.SoundEvent BEACON_ACTIVATE -> au
+    net.minecraft.sounds.SoundEvent BEACON_AMBIENT -> av
+    net.minecraft.sounds.SoundEvent BEACON_DEACTIVATE -> aw
+    net.minecraft.sounds.SoundEvent BEACON_POWER_SELECT -> ax
+    net.minecraft.sounds.SoundEvent BEE_DEATH -> ay
+    net.minecraft.sounds.SoundEvent BEE_HURT -> az
+    net.minecraft.sounds.SoundEvent BEE_LOOP_AGGRESSIVE -> aA
+    net.minecraft.sounds.SoundEvent BEE_LOOP -> aB
+    net.minecraft.sounds.SoundEvent BEE_STING -> aC
+    net.minecraft.sounds.SoundEvent BEE_POLLINATE -> aD
+    net.minecraft.sounds.SoundEvent BEEHIVE_DRIP -> aE
+    net.minecraft.sounds.SoundEvent BEEHIVE_ENTER -> aF
+    net.minecraft.sounds.SoundEvent BEEHIVE_EXIT -> aG
+    net.minecraft.sounds.SoundEvent BEEHIVE_SHEAR -> aH
+    net.minecraft.sounds.SoundEvent BEEHIVE_WORK -> aI
+    net.minecraft.sounds.SoundEvent BELL_BLOCK -> aJ
+    net.minecraft.sounds.SoundEvent BELL_RESONATE -> aK
+    net.minecraft.sounds.SoundEvent BLAZE_AMBIENT -> aL
+    net.minecraft.sounds.SoundEvent BLAZE_BURN -> aM
+    net.minecraft.sounds.SoundEvent BLAZE_DEATH -> aN
+    net.minecraft.sounds.SoundEvent BLAZE_HURT -> aO
+    net.minecraft.sounds.SoundEvent BLAZE_SHOOT -> aP
+    net.minecraft.sounds.SoundEvent BOAT_PADDLE_LAND -> aQ
+    net.minecraft.sounds.SoundEvent BOAT_PADDLE_WATER -> aR
+    net.minecraft.sounds.SoundEvent BONE_BLOCK_BREAK -> aS
+    net.minecraft.sounds.SoundEvent BONE_BLOCK_FALL -> aT
+    net.minecraft.sounds.SoundEvent BONE_BLOCK_HIT -> aU
+    net.minecraft.sounds.SoundEvent BONE_BLOCK_PLACE -> aV
+    net.minecraft.sounds.SoundEvent BONE_BLOCK_STEP -> aW
+    net.minecraft.sounds.SoundEvent BOOK_PAGE_TURN -> aX
+    net.minecraft.sounds.SoundEvent BOOK_PUT -> aY
+    net.minecraft.sounds.SoundEvent BLASTFURNACE_FIRE_CRACKLE -> aZ
+    net.minecraft.sounds.SoundEvent BOTTLE_EMPTY -> ba
+    net.minecraft.sounds.SoundEvent BOTTLE_FILL -> bb
+    net.minecraft.sounds.SoundEvent BOTTLE_FILL_DRAGONBREATH -> bc
+    net.minecraft.sounds.SoundEvent BREWING_STAND_BREW -> bd
+    net.minecraft.sounds.SoundEvent BUBBLE_COLUMN_BUBBLE_POP -> be
+    net.minecraft.sounds.SoundEvent BUBBLE_COLUMN_UPWARDS_AMBIENT -> bf
+    net.minecraft.sounds.SoundEvent BUBBLE_COLUMN_UPWARDS_INSIDE -> bg
+    net.minecraft.sounds.SoundEvent BUBBLE_COLUMN_WHIRLPOOL_AMBIENT -> bh
+    net.minecraft.sounds.SoundEvent BUBBLE_COLUMN_WHIRLPOOL_INSIDE -> bi
+    net.minecraft.sounds.SoundEvent BUCKET_EMPTY -> bj
+    net.minecraft.sounds.SoundEvent BUCKET_EMPTY_FISH -> bk
+    net.minecraft.sounds.SoundEvent BUCKET_EMPTY_LAVA -> bl
+    net.minecraft.sounds.SoundEvent BUCKET_FILL -> bm
+    net.minecraft.sounds.SoundEvent BUCKET_FILL_FISH -> bn
+    net.minecraft.sounds.SoundEvent BUCKET_FILL_LAVA -> bo
+    net.minecraft.sounds.SoundEvent CAMPFIRE_CRACKLE -> bp
+    net.minecraft.sounds.SoundEvent CAT_AMBIENT -> bq
+    net.minecraft.sounds.SoundEvent CAT_STRAY_AMBIENT -> br
+    net.minecraft.sounds.SoundEvent CAT_DEATH -> bs
+    net.minecraft.sounds.SoundEvent CAT_EAT -> bt
+    net.minecraft.sounds.SoundEvent CAT_HISS -> bu
+    net.minecraft.sounds.SoundEvent CAT_BEG_FOR_FOOD -> bv
+    net.minecraft.sounds.SoundEvent CAT_HURT -> bw
+    net.minecraft.sounds.SoundEvent CAT_PURR -> bx
+    net.minecraft.sounds.SoundEvent CAT_PURREOW -> by
+    net.minecraft.sounds.SoundEvent CHAIN_BREAK -> bz
+    net.minecraft.sounds.SoundEvent CHAIN_FALL -> bA
+    net.minecraft.sounds.SoundEvent CHAIN_HIT -> bB
+    net.minecraft.sounds.SoundEvent CHAIN_PLACE -> bC
+    net.minecraft.sounds.SoundEvent CHAIN_STEP -> bD
+    net.minecraft.sounds.SoundEvent CHEST_CLOSE -> bE
+    net.minecraft.sounds.SoundEvent CHEST_LOCKED -> bF
+    net.minecraft.sounds.SoundEvent CHEST_OPEN -> bG
+    net.minecraft.sounds.SoundEvent CHICKEN_AMBIENT -> bH
+    net.minecraft.sounds.SoundEvent CHICKEN_DEATH -> bI
+    net.minecraft.sounds.SoundEvent CHICKEN_EGG -> bJ
+    net.minecraft.sounds.SoundEvent CHICKEN_HURT -> bK
+    net.minecraft.sounds.SoundEvent CHICKEN_STEP -> bL
+    net.minecraft.sounds.SoundEvent CHORUS_FLOWER_DEATH -> bM
+    net.minecraft.sounds.SoundEvent CHORUS_FLOWER_GROW -> bN
+    net.minecraft.sounds.SoundEvent CHORUS_FRUIT_TELEPORT -> bO
+    net.minecraft.sounds.SoundEvent COD_AMBIENT -> bP
+    net.minecraft.sounds.SoundEvent COD_DEATH -> bQ
+    net.minecraft.sounds.SoundEvent COD_FLOP -> bR
+    net.minecraft.sounds.SoundEvent COD_HURT -> bS
+    net.minecraft.sounds.SoundEvent COMPARATOR_CLICK -> bT
+    net.minecraft.sounds.SoundEvent COMPOSTER_EMPTY -> bU
+    net.minecraft.sounds.SoundEvent COMPOSTER_FILL -> bV
+    net.minecraft.sounds.SoundEvent COMPOSTER_FILL_SUCCESS -> bW
+    net.minecraft.sounds.SoundEvent COMPOSTER_READY -> bX
+    net.minecraft.sounds.SoundEvent CONDUIT_ACTIVATE -> bY
+    net.minecraft.sounds.SoundEvent CONDUIT_AMBIENT -> bZ
+    net.minecraft.sounds.SoundEvent CONDUIT_AMBIENT_SHORT -> ca
+    net.minecraft.sounds.SoundEvent CONDUIT_ATTACK_TARGET -> cb
+    net.minecraft.sounds.SoundEvent CONDUIT_DEACTIVATE -> cc
+    net.minecraft.sounds.SoundEvent CORAL_BLOCK_BREAK -> cd
+    net.minecraft.sounds.SoundEvent CORAL_BLOCK_FALL -> ce
+    net.minecraft.sounds.SoundEvent CORAL_BLOCK_HIT -> cf
+    net.minecraft.sounds.SoundEvent CORAL_BLOCK_PLACE -> cg
+    net.minecraft.sounds.SoundEvent CORAL_BLOCK_STEP -> ch
+    net.minecraft.sounds.SoundEvent COW_AMBIENT -> ci
+    net.minecraft.sounds.SoundEvent COW_DEATH -> cj
+    net.minecraft.sounds.SoundEvent COW_HURT -> ck
+    net.minecraft.sounds.SoundEvent COW_MILK -> cl
+    net.minecraft.sounds.SoundEvent COW_STEP -> cm
+    net.minecraft.sounds.SoundEvent CREEPER_DEATH -> cn
+    net.minecraft.sounds.SoundEvent CREEPER_HURT -> co
+    net.minecraft.sounds.SoundEvent CREEPER_PRIMED -> cp
+    net.minecraft.sounds.SoundEvent CROP_BREAK -> cq
+    net.minecraft.sounds.SoundEvent CROP_PLANTED -> cr
+    net.minecraft.sounds.SoundEvent CROSSBOW_HIT -> cs
+    net.minecraft.sounds.SoundEvent CROSSBOW_LOADING_END -> ct
+    net.minecraft.sounds.SoundEvent CROSSBOW_LOADING_MIDDLE -> cu
+    net.minecraft.sounds.SoundEvent CROSSBOW_LOADING_START -> cv
+    net.minecraft.sounds.SoundEvent CROSSBOW_QUICK_CHARGE_1 -> cw
+    net.minecraft.sounds.SoundEvent CROSSBOW_QUICK_CHARGE_2 -> cx
+    net.minecraft.sounds.SoundEvent CROSSBOW_QUICK_CHARGE_3 -> cy
+    net.minecraft.sounds.SoundEvent CROSSBOW_SHOOT -> cz
+    net.minecraft.sounds.SoundEvent DISPENSER_DISPENSE -> cA
+    net.minecraft.sounds.SoundEvent DISPENSER_FAIL -> cB
+    net.minecraft.sounds.SoundEvent DISPENSER_LAUNCH -> cC
+    net.minecraft.sounds.SoundEvent DOLPHIN_AMBIENT -> cD
+    net.minecraft.sounds.SoundEvent DOLPHIN_AMBIENT_WATER -> cE
+    net.minecraft.sounds.SoundEvent DOLPHIN_ATTACK -> cF
+    net.minecraft.sounds.SoundEvent DOLPHIN_DEATH -> cG
+    net.minecraft.sounds.SoundEvent DOLPHIN_EAT -> cH
+    net.minecraft.sounds.SoundEvent DOLPHIN_HURT -> cI
+    net.minecraft.sounds.SoundEvent DOLPHIN_JUMP -> cJ
+    net.minecraft.sounds.SoundEvent DOLPHIN_PLAY -> cK
+    net.minecraft.sounds.SoundEvent DOLPHIN_SPLASH -> cL
+    net.minecraft.sounds.SoundEvent DOLPHIN_SWIM -> cM
+    net.minecraft.sounds.SoundEvent DONKEY_AMBIENT -> cN
+    net.minecraft.sounds.SoundEvent DONKEY_ANGRY -> cO
+    net.minecraft.sounds.SoundEvent DONKEY_CHEST -> cP
+    net.minecraft.sounds.SoundEvent DONKEY_DEATH -> cQ
+    net.minecraft.sounds.SoundEvent DONKEY_EAT -> cR
+    net.minecraft.sounds.SoundEvent DONKEY_HURT -> cS
+    net.minecraft.sounds.SoundEvent DROWNED_AMBIENT -> cT
+    net.minecraft.sounds.SoundEvent DROWNED_AMBIENT_WATER -> cU
+    net.minecraft.sounds.SoundEvent DROWNED_DEATH -> cV
+    net.minecraft.sounds.SoundEvent DROWNED_DEATH_WATER -> cW
+    net.minecraft.sounds.SoundEvent DROWNED_HURT -> cX
+    net.minecraft.sounds.SoundEvent DROWNED_HURT_WATER -> cY
+    net.minecraft.sounds.SoundEvent DROWNED_SHOOT -> cZ
+    net.minecraft.sounds.SoundEvent DROWNED_STEP -> da
+    net.minecraft.sounds.SoundEvent DROWNED_SWIM -> db
+    net.minecraft.sounds.SoundEvent EGG_THROW -> dc
+    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_AMBIENT -> dd
+    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_AMBIENT_LAND -> de
+    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_CURSE -> df
+    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_DEATH -> dg
+    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_DEATH_LAND -> dh
+    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_FLOP -> di
+    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_HURT -> dj
+    net.minecraft.sounds.SoundEvent ELDER_GUARDIAN_HURT_LAND -> dk
+    net.minecraft.sounds.SoundEvent ELYTRA_FLYING -> dl
+    net.minecraft.sounds.SoundEvent ENCHANTMENT_TABLE_USE -> dm
+    net.minecraft.sounds.SoundEvent ENDER_CHEST_CLOSE -> dn
+    net.minecraft.sounds.SoundEvent ENDER_CHEST_OPEN -> do
+    net.minecraft.sounds.SoundEvent ENDER_DRAGON_AMBIENT -> dp
+    net.minecraft.sounds.SoundEvent ENDER_DRAGON_DEATH -> dq
+    net.minecraft.sounds.SoundEvent DRAGON_FIREBALL_EXPLODE -> dr
+    net.minecraft.sounds.SoundEvent ENDER_DRAGON_FLAP -> ds
+    net.minecraft.sounds.SoundEvent ENDER_DRAGON_GROWL -> dt
+    net.minecraft.sounds.SoundEvent ENDER_DRAGON_HURT -> du
+    net.minecraft.sounds.SoundEvent ENDER_DRAGON_SHOOT -> dv
+    net.minecraft.sounds.SoundEvent ENDER_EYE_DEATH -> dw
+    net.minecraft.sounds.SoundEvent ENDER_EYE_LAUNCH -> dx
+    net.minecraft.sounds.SoundEvent ENDERMAN_AMBIENT -> dy
+    net.minecraft.sounds.SoundEvent ENDERMAN_DEATH -> dz
+    net.minecraft.sounds.SoundEvent ENDERMAN_HURT -> dA
+    net.minecraft.sounds.SoundEvent ENDERMAN_SCREAM -> dB
+    net.minecraft.sounds.SoundEvent ENDERMAN_STARE -> dC
+    net.minecraft.sounds.SoundEvent ENDERMAN_TELEPORT -> dD
+    net.minecraft.sounds.SoundEvent ENDERMITE_AMBIENT -> dE
+    net.minecraft.sounds.SoundEvent ENDERMITE_DEATH -> dF
+    net.minecraft.sounds.SoundEvent ENDERMITE_HURT -> dG
+    net.minecraft.sounds.SoundEvent ENDERMITE_STEP -> dH
+    net.minecraft.sounds.SoundEvent ENDER_PEARL_THROW -> dI
+    net.minecraft.sounds.SoundEvent END_GATEWAY_SPAWN -> dJ
+    net.minecraft.sounds.SoundEvent END_PORTAL_FRAME_FILL -> dK
+    net.minecraft.sounds.SoundEvent END_PORTAL_SPAWN -> dL
+    net.minecraft.sounds.SoundEvent EVOKER_AMBIENT -> dM
+    net.minecraft.sounds.SoundEvent EVOKER_CAST_SPELL -> dN
+    net.minecraft.sounds.SoundEvent EVOKER_CELEBRATE -> dO
+    net.minecraft.sounds.SoundEvent EVOKER_DEATH -> dP
+    net.minecraft.sounds.SoundEvent EVOKER_FANGS_ATTACK -> dQ
+    net.minecraft.sounds.SoundEvent EVOKER_HURT -> dR
+    net.minecraft.sounds.SoundEvent EVOKER_PREPARE_ATTACK -> dS
+    net.minecraft.sounds.SoundEvent EVOKER_PREPARE_SUMMON -> dT
+    net.minecraft.sounds.SoundEvent EVOKER_PREPARE_WOLOLO -> dU
+    net.minecraft.sounds.SoundEvent EXPERIENCE_BOTTLE_THROW -> dV
+    net.minecraft.sounds.SoundEvent EXPERIENCE_ORB_PICKUP -> dW
+    net.minecraft.sounds.SoundEvent FENCE_GATE_CLOSE -> dX
+    net.minecraft.sounds.SoundEvent FENCE_GATE_OPEN -> dY
+    net.minecraft.sounds.SoundEvent FIRECHARGE_USE -> dZ
+    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_BLAST -> ea
+    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_BLAST_FAR -> eb
+    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_LARGE_BLAST -> ec
+    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_LARGE_BLAST_FAR -> ed
+    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_LAUNCH -> ee
+    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_SHOOT -> ef
+    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_TWINKLE -> eg
+    net.minecraft.sounds.SoundEvent FIREWORK_ROCKET_TWINKLE_FAR -> eh
+    net.minecraft.sounds.SoundEvent FIRE_AMBIENT -> ei
+    net.minecraft.sounds.SoundEvent FIRE_EXTINGUISH -> ej
+    net.minecraft.sounds.SoundEvent FISH_SWIM -> ek
+    net.minecraft.sounds.SoundEvent FISHING_BOBBER_RETRIEVE -> el
+    net.minecraft.sounds.SoundEvent FISHING_BOBBER_SPLASH -> em
+    net.minecraft.sounds.SoundEvent FISHING_BOBBER_THROW -> en
+    net.minecraft.sounds.SoundEvent FLINTANDSTEEL_USE -> eo
+    net.minecraft.sounds.SoundEvent FOX_AGGRO -> ep
+    net.minecraft.sounds.SoundEvent FOX_AMBIENT -> eq
+    net.minecraft.sounds.SoundEvent FOX_BITE -> er
+    net.minecraft.sounds.SoundEvent FOX_DEATH -> es
+    net.minecraft.sounds.SoundEvent FOX_EAT -> et
+    net.minecraft.sounds.SoundEvent FOX_HURT -> eu
+    net.minecraft.sounds.SoundEvent FOX_SCREECH -> ev
+    net.minecraft.sounds.SoundEvent FOX_SLEEP -> ew
+    net.minecraft.sounds.SoundEvent FOX_SNIFF -> ex
+    net.minecraft.sounds.SoundEvent FOX_SPIT -> ey
+    net.minecraft.sounds.SoundEvent FOX_TELEPORT -> ez
+    net.minecraft.sounds.SoundEvent ROOTS_BREAK -> eA
+    net.minecraft.sounds.SoundEvent ROOTS_STEP -> eB
+    net.minecraft.sounds.SoundEvent ROOTS_PLACE -> eC
+    net.minecraft.sounds.SoundEvent ROOTS_HIT -> eD
+    net.minecraft.sounds.SoundEvent ROOTS_FALL -> eE
+    net.minecraft.sounds.SoundEvent FURNACE_FIRE_CRACKLE -> eF
+    net.minecraft.sounds.SoundEvent GENERIC_BIG_FALL -> eG
+    net.minecraft.sounds.SoundEvent GENERIC_BURN -> eH
+    net.minecraft.sounds.SoundEvent GENERIC_DEATH -> eI
+    net.minecraft.sounds.SoundEvent GENERIC_DRINK -> eJ
+    net.minecraft.sounds.SoundEvent GENERIC_EAT -> eK
+    net.minecraft.sounds.SoundEvent GENERIC_EXPLODE -> eL
+    net.minecraft.sounds.SoundEvent GENERIC_EXTINGUISH_FIRE -> eM
+    net.minecraft.sounds.SoundEvent GENERIC_HURT -> eN
+    net.minecraft.sounds.SoundEvent GENERIC_SMALL_FALL -> eO
+    net.minecraft.sounds.SoundEvent GENERIC_SPLASH -> eP
+    net.minecraft.sounds.SoundEvent GENERIC_SWIM -> eQ
+    net.minecraft.sounds.SoundEvent GHAST_AMBIENT -> eR
+    net.minecraft.sounds.SoundEvent GHAST_DEATH -> eS
+    net.minecraft.sounds.SoundEvent GHAST_HURT -> eT
+    net.minecraft.sounds.SoundEvent GHAST_SCREAM -> eU
+    net.minecraft.sounds.SoundEvent GHAST_SHOOT -> eV
+    net.minecraft.sounds.SoundEvent GHAST_WARN -> eW
+    net.minecraft.sounds.SoundEvent GILDED_BLACKSTONE_BREAK -> eX
+    net.minecraft.sounds.SoundEvent GILDED_BLACKSTONE_FALL -> eY
+    net.minecraft.sounds.SoundEvent GILDED_BLACKSTONE_HIT -> eZ
+    net.minecraft.sounds.SoundEvent GILDED_BLACKSTONE_PLACE -> fa
+    net.minecraft.sounds.SoundEvent GILDED_BLACKSTONE_STEP -> fb
+    net.minecraft.sounds.SoundEvent GLASS_BREAK -> fc
+    net.minecraft.sounds.SoundEvent GLASS_FALL -> fd
+    net.minecraft.sounds.SoundEvent GLASS_HIT -> fe
+    net.minecraft.sounds.SoundEvent GLASS_PLACE -> ff
+    net.minecraft.sounds.SoundEvent GLASS_STEP -> fg
+    net.minecraft.sounds.SoundEvent GRASS_BREAK -> fh
+    net.minecraft.sounds.SoundEvent GRASS_FALL -> fi
+    net.minecraft.sounds.SoundEvent GRASS_HIT -> fj
+    net.minecraft.sounds.SoundEvent GRASS_PLACE -> fk
+    net.minecraft.sounds.SoundEvent GRASS_STEP -> fl
+    net.minecraft.sounds.SoundEvent GRAVEL_BREAK -> fm
+    net.minecraft.sounds.SoundEvent GRAVEL_FALL -> fn
+    net.minecraft.sounds.SoundEvent GRAVEL_HIT -> fo
+    net.minecraft.sounds.SoundEvent GRAVEL_PLACE -> fp
+    net.minecraft.sounds.SoundEvent GRAVEL_STEP -> fq
+    net.minecraft.sounds.SoundEvent GRINDSTONE_USE -> fr
+    net.minecraft.sounds.SoundEvent GUARDIAN_AMBIENT -> fs
+    net.minecraft.sounds.SoundEvent GUARDIAN_AMBIENT_LAND -> ft
+    net.minecraft.sounds.SoundEvent GUARDIAN_ATTACK -> fu
+    net.minecraft.sounds.SoundEvent GUARDIAN_DEATH -> fv
+    net.minecraft.sounds.SoundEvent GUARDIAN_DEATH_LAND -> fw
+    net.minecraft.sounds.SoundEvent GUARDIAN_FLOP -> fx
+    net.minecraft.sounds.SoundEvent GUARDIAN_HURT -> fy
+    net.minecraft.sounds.SoundEvent GUARDIAN_HURT_LAND -> fz
+    net.minecraft.sounds.SoundEvent HOE_TILL -> fA
+    net.minecraft.sounds.SoundEvent HOGLIN_AMBIENT -> fB
+    net.minecraft.sounds.SoundEvent HOGLIN_ANGRY -> fC
+    net.minecraft.sounds.SoundEvent HOGLIN_ATTACK -> fD
+    net.minecraft.sounds.SoundEvent HOGLIN_CONVERTED_TO_ZOMBIFIED -> fE
+    net.minecraft.sounds.SoundEvent HOGLIN_DEATH -> fF
+    net.minecraft.sounds.SoundEvent HOGLIN_HURT -> fG
+    net.minecraft.sounds.SoundEvent HOGLIN_RETREAT -> fH
+    net.minecraft.sounds.SoundEvent HOGLIN_STEP -> fI
+    net.minecraft.sounds.SoundEvent HONEY_BLOCK_BREAK -> fJ
+    net.minecraft.sounds.SoundEvent HONEY_BLOCK_FALL -> fK
+    net.minecraft.sounds.SoundEvent HONEY_BLOCK_HIT -> fL
+    net.minecraft.sounds.SoundEvent HONEY_BLOCK_PLACE -> fM
+    net.minecraft.sounds.SoundEvent HONEY_BLOCK_SLIDE -> fN
+    net.minecraft.sounds.SoundEvent HONEY_BLOCK_STEP -> fO
+    net.minecraft.sounds.SoundEvent HONEY_DRINK -> fP
+    net.minecraft.sounds.SoundEvent HORSE_AMBIENT -> fQ
+    net.minecraft.sounds.SoundEvent HORSE_ANGRY -> fR
+    net.minecraft.sounds.SoundEvent HORSE_ARMOR -> fS
+    net.minecraft.sounds.SoundEvent HORSE_BREATHE -> fT
+    net.minecraft.sounds.SoundEvent HORSE_DEATH -> fU
+    net.minecraft.sounds.SoundEvent HORSE_EAT -> fV
+    net.minecraft.sounds.SoundEvent HORSE_GALLOP -> fW
+    net.minecraft.sounds.SoundEvent HORSE_HURT -> fX
+    net.minecraft.sounds.SoundEvent HORSE_JUMP -> fY
+    net.minecraft.sounds.SoundEvent HORSE_LAND -> fZ
+    net.minecraft.sounds.SoundEvent HORSE_SADDLE -> ga
+    net.minecraft.sounds.SoundEvent HORSE_STEP -> gb
+    net.minecraft.sounds.SoundEvent HORSE_STEP_WOOD -> gc
+    net.minecraft.sounds.SoundEvent HOSTILE_BIG_FALL -> gd
+    net.minecraft.sounds.SoundEvent HOSTILE_DEATH -> ge
+    net.minecraft.sounds.SoundEvent HOSTILE_HURT -> gf
+    net.minecraft.sounds.SoundEvent HOSTILE_SMALL_FALL -> gg
+    net.minecraft.sounds.SoundEvent HOSTILE_SPLASH -> gh
+    net.minecraft.sounds.SoundEvent HOSTILE_SWIM -> gi
+    net.minecraft.sounds.SoundEvent HUSK_AMBIENT -> gj
+    net.minecraft.sounds.SoundEvent HUSK_CONVERTED_TO_ZOMBIE -> gk
+    net.minecraft.sounds.SoundEvent HUSK_DEATH -> gl
+    net.minecraft.sounds.SoundEvent HUSK_HURT -> gm
+    net.minecraft.sounds.SoundEvent HUSK_STEP -> gn
+    net.minecraft.sounds.SoundEvent ILLUSIONER_AMBIENT -> go
+    net.minecraft.sounds.SoundEvent ILLUSIONER_CAST_SPELL -> gp
+    net.minecraft.sounds.SoundEvent ILLUSIONER_DEATH -> gq
+    net.minecraft.sounds.SoundEvent ILLUSIONER_HURT -> gr
+    net.minecraft.sounds.SoundEvent ILLUSIONER_MIRROR_MOVE -> gs
+    net.minecraft.sounds.SoundEvent ILLUSIONER_PREPARE_BLINDNESS -> gt
+    net.minecraft.sounds.SoundEvent ILLUSIONER_PREPARE_MIRROR -> gu
+    net.minecraft.sounds.SoundEvent IRON_DOOR_CLOSE -> gv
+    net.minecraft.sounds.SoundEvent IRON_DOOR_OPEN -> gw
+    net.minecraft.sounds.SoundEvent IRON_GOLEM_ATTACK -> gx
+    net.minecraft.sounds.SoundEvent IRON_GOLEM_DAMAGE -> gy
+    net.minecraft.sounds.SoundEvent IRON_GOLEM_DEATH -> gz
+    net.minecraft.sounds.SoundEvent IRON_GOLEM_HURT -> gA
+    net.minecraft.sounds.SoundEvent IRON_GOLEM_REPAIR -> gB
+    net.minecraft.sounds.SoundEvent IRON_GOLEM_STEP -> gC
+    net.minecraft.sounds.SoundEvent IRON_TRAPDOOR_CLOSE -> gD
+    net.minecraft.sounds.SoundEvent IRON_TRAPDOOR_OPEN -> gE
+    net.minecraft.sounds.SoundEvent ITEM_FRAME_ADD_ITEM -> gF
+    net.minecraft.sounds.SoundEvent ITEM_FRAME_BREAK -> gG
+    net.minecraft.sounds.SoundEvent ITEM_FRAME_PLACE -> gH
+    net.minecraft.sounds.SoundEvent ITEM_FRAME_REMOVE_ITEM -> gI
+    net.minecraft.sounds.SoundEvent ITEM_FRAME_ROTATE_ITEM -> gJ
+    net.minecraft.sounds.SoundEvent ITEM_BREAK -> gK
+    net.minecraft.sounds.SoundEvent ITEM_PICKUP -> gL
+    net.minecraft.sounds.SoundEvent LADDER_BREAK -> gM
+    net.minecraft.sounds.SoundEvent LADDER_FALL -> gN
+    net.minecraft.sounds.SoundEvent LADDER_HIT -> gO
+    net.minecraft.sounds.SoundEvent LADDER_PLACE -> gP
+    net.minecraft.sounds.SoundEvent LADDER_STEP -> gQ
+    net.minecraft.sounds.SoundEvent LANTERN_BREAK -> gR
+    net.minecraft.sounds.SoundEvent LANTERN_FALL -> gS
+    net.minecraft.sounds.SoundEvent LANTERN_HIT -> gT
+    net.minecraft.sounds.SoundEvent LANTERN_PLACE -> gU
+    net.minecraft.sounds.SoundEvent LANTERN_STEP -> gV
+    net.minecraft.sounds.SoundEvent LAVA_AMBIENT -> gW
+    net.minecraft.sounds.SoundEvent LAVA_EXTINGUISH -> gX
+    net.minecraft.sounds.SoundEvent LAVA_POP -> gY
+    net.minecraft.sounds.SoundEvent LEASH_KNOT_BREAK -> gZ
+    net.minecraft.sounds.SoundEvent LEASH_KNOT_PLACE -> ha
+    net.minecraft.sounds.SoundEvent LEVER_CLICK -> hb
+    net.minecraft.sounds.SoundEvent LIGHTNING_BOLT_IMPACT -> hc
+    net.minecraft.sounds.SoundEvent LIGHTNING_BOLT_THUNDER -> hd
+    net.minecraft.sounds.SoundEvent LINGERING_POTION_THROW -> he
+    net.minecraft.sounds.SoundEvent LLAMA_AMBIENT -> hf
+    net.minecraft.sounds.SoundEvent LLAMA_ANGRY -> hg
+    net.minecraft.sounds.SoundEvent LLAMA_CHEST -> hh
+    net.minecraft.sounds.SoundEvent LLAMA_DEATH -> hi
+    net.minecraft.sounds.SoundEvent LLAMA_EAT -> hj
+    net.minecraft.sounds.SoundEvent LLAMA_HURT -> hk
+    net.minecraft.sounds.SoundEvent LLAMA_SPIT -> hl
+    net.minecraft.sounds.SoundEvent LLAMA_STEP -> hm
+    net.minecraft.sounds.SoundEvent LLAMA_SWAG -> hn
+    net.minecraft.sounds.SoundEvent MAGMA_CUBE_DEATH_SMALL -> ho
+    net.minecraft.sounds.SoundEvent LODESTONE_BREAK -> hp
+    net.minecraft.sounds.SoundEvent LODESTONE_STEP -> hq
+    net.minecraft.sounds.SoundEvent LODESTONE_PLACE -> hr
+    net.minecraft.sounds.SoundEvent LODESTONE_HIT -> hs
+    net.minecraft.sounds.SoundEvent LODESTONE_FALL -> ht
+    net.minecraft.sounds.SoundEvent LODESTONE_COMPASS_LOCK -> hu
+    net.minecraft.sounds.SoundEvent MAGMA_CUBE_DEATH -> hv
+    net.minecraft.sounds.SoundEvent MAGMA_CUBE_HURT -> hw
+    net.minecraft.sounds.SoundEvent MAGMA_CUBE_HURT_SMALL -> hx
+    net.minecraft.sounds.SoundEvent MAGMA_CUBE_JUMP -> hy
+    net.minecraft.sounds.SoundEvent MAGMA_CUBE_SQUISH -> hz
+    net.minecraft.sounds.SoundEvent MAGMA_CUBE_SQUISH_SMALL -> hA
+    net.minecraft.sounds.SoundEvent METAL_BREAK -> hB
+    net.minecraft.sounds.SoundEvent METAL_FALL -> hC
+    net.minecraft.sounds.SoundEvent METAL_HIT -> hD
+    net.minecraft.sounds.SoundEvent METAL_PLACE -> hE
+    net.minecraft.sounds.SoundEvent METAL_PRESSURE_PLATE_CLICK_OFF -> hF
+    net.minecraft.sounds.SoundEvent METAL_PRESSURE_PLATE_CLICK_ON -> hG
+    net.minecraft.sounds.SoundEvent METAL_STEP -> hH
+    net.minecraft.sounds.SoundEvent MINECART_INSIDE -> hI
+    net.minecraft.sounds.SoundEvent MINECART_RIDING -> hJ
+    net.minecraft.sounds.SoundEvent MOOSHROOM_CONVERT -> hK
+    net.minecraft.sounds.SoundEvent MOOSHROOM_EAT -> hL
+    net.minecraft.sounds.SoundEvent MOOSHROOM_MILK -> hM
+    net.minecraft.sounds.SoundEvent MOOSHROOM_MILK_SUSPICIOUSLY -> hN
+    net.minecraft.sounds.SoundEvent MOOSHROOM_SHEAR -> hO
+    net.minecraft.sounds.SoundEvent MULE_AMBIENT -> hP
+    net.minecraft.sounds.SoundEvent MULE_ANGRY -> hQ
+    net.minecraft.sounds.SoundEvent MULE_CHEST -> hR
+    net.minecraft.sounds.SoundEvent MULE_DEATH -> hS
+    net.minecraft.sounds.SoundEvent MULE_EAT -> hT
+    net.minecraft.sounds.SoundEvent MULE_HURT -> hU
+    net.minecraft.sounds.SoundEvent MUSIC_CREATIVE -> hV
+    net.minecraft.sounds.SoundEvent MUSIC_CREDITS -> hW
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_11 -> hX
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_13 -> hY
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_BLOCKS -> hZ
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_CAT -> ia
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_CHIRP -> ib
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_FAR -> ic
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_MALL -> id
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_MELLOHI -> ie
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_PIGSTEP -> if
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_STAL -> ig
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_STRAD -> ih
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_WAIT -> ii
+    net.minecraft.sounds.SoundEvent MUSIC_DISC_WARD -> ij
+    net.minecraft.sounds.SoundEvent MUSIC_DRAGON -> ik
+    net.minecraft.sounds.SoundEvent MUSIC_END -> il
+    net.minecraft.sounds.SoundEvent MUSIC_GAME -> im
+    net.minecraft.sounds.SoundEvent MUSIC_MENU -> in
+    net.minecraft.sounds.SoundEvent MUSIC_BIOME_BASALT_DELTAS -> io
+    net.minecraft.sounds.SoundEvent MUSIC_BIOME_NETHER_WASTES -> ip
+    net.minecraft.sounds.SoundEvent MUSIC_BIOME_SOUL_SAND_VALLEY -> iq
+    net.minecraft.sounds.SoundEvent MUSIC_BIOME_CRIMSON_FOREST -> ir
+    net.minecraft.sounds.SoundEvent MUSIC_BIOME_WARPED_FOREST -> is
+    net.minecraft.sounds.SoundEvent MUSIC_UNDER_WATER -> it
+    net.minecraft.sounds.SoundEvent NETHER_BRICKS_BREAK -> iu
+    net.minecraft.sounds.SoundEvent NETHER_BRICKS_STEP -> iv
+    net.minecraft.sounds.SoundEvent NETHER_BRICKS_PLACE -> iw
+    net.minecraft.sounds.SoundEvent NETHER_BRICKS_HIT -> ix
+    net.minecraft.sounds.SoundEvent NETHER_BRICKS_FALL -> iy
+    net.minecraft.sounds.SoundEvent NETHER_WART_BREAK -> iz
+    net.minecraft.sounds.SoundEvent NETHER_WART_PLANTED -> iA
+    net.minecraft.sounds.SoundEvent STEM_BREAK -> iB
+    net.minecraft.sounds.SoundEvent STEM_STEP -> iC
+    net.minecraft.sounds.SoundEvent STEM_PLACE -> iD
+    net.minecraft.sounds.SoundEvent STEM_HIT -> iE
+    net.minecraft.sounds.SoundEvent STEM_FALL -> iF
+    net.minecraft.sounds.SoundEvent NYLIUM_BREAK -> iG
+    net.minecraft.sounds.SoundEvent NYLIUM_STEP -> iH
+    net.minecraft.sounds.SoundEvent NYLIUM_PLACE -> iI
+    net.minecraft.sounds.SoundEvent NYLIUM_HIT -> iJ
+    net.minecraft.sounds.SoundEvent NYLIUM_FALL -> iK
+    net.minecraft.sounds.SoundEvent NETHER_SPROUTS_BREAK -> iL
+    net.minecraft.sounds.SoundEvent NETHER_SPROUTS_STEP -> iM
+    net.minecraft.sounds.SoundEvent NETHER_SPROUTS_PLACE -> iN
+    net.minecraft.sounds.SoundEvent NETHER_SPROUTS_HIT -> iO
+    net.minecraft.sounds.SoundEvent NETHER_SPROUTS_FALL -> iP
+    net.minecraft.sounds.SoundEvent FUNGUS_BREAK -> iQ
+    net.minecraft.sounds.SoundEvent FUNGUS_STEP -> iR
+    net.minecraft.sounds.SoundEvent FUNGUS_PLACE -> iS
+    net.minecraft.sounds.SoundEvent FUNGUS_HIT -> iT
+    net.minecraft.sounds.SoundEvent FUNGUS_FALL -> iU
+    net.minecraft.sounds.SoundEvent WEEPING_VINES_BREAK -> iV
+    net.minecraft.sounds.SoundEvent WEEPING_VINES_STEP -> iW
+    net.minecraft.sounds.SoundEvent WEEPING_VINES_PLACE -> iX
+    net.minecraft.sounds.SoundEvent WEEPING_VINES_HIT -> iY
+    net.minecraft.sounds.SoundEvent WEEPING_VINES_FALL -> iZ
+    net.minecraft.sounds.SoundEvent WART_BLOCK_BREAK -> ja
+    net.minecraft.sounds.SoundEvent WART_BLOCK_STEP -> jb
+    net.minecraft.sounds.SoundEvent WART_BLOCK_PLACE -> jc
+    net.minecraft.sounds.SoundEvent WART_BLOCK_HIT -> jd
+    net.minecraft.sounds.SoundEvent WART_BLOCK_FALL -> je
+    net.minecraft.sounds.SoundEvent NETHERITE_BLOCK_BREAK -> jf
+    net.minecraft.sounds.SoundEvent NETHERITE_BLOCK_STEP -> jg
+    net.minecraft.sounds.SoundEvent NETHERITE_BLOCK_PLACE -> jh
+    net.minecraft.sounds.SoundEvent NETHERITE_BLOCK_HIT -> ji
+    net.minecraft.sounds.SoundEvent NETHERITE_BLOCK_FALL -> jj
+    net.minecraft.sounds.SoundEvent NETHERRACK_BREAK -> jk
+    net.minecraft.sounds.SoundEvent NETHERRACK_STEP -> jl
+    net.minecraft.sounds.SoundEvent NETHERRACK_PLACE -> jm
+    net.minecraft.sounds.SoundEvent NETHERRACK_HIT -> jn
+    net.minecraft.sounds.SoundEvent NETHERRACK_FALL -> jo
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_BASEDRUM -> jp
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_BASS -> jq
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_BELL -> jr
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_CHIME -> js
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_FLUTE -> jt
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_GUITAR -> ju
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_HARP -> jv
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_HAT -> jw
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_PLING -> jx
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_SNARE -> jy
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_XYLOPHONE -> jz
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_IRON_XYLOPHONE -> jA
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_COW_BELL -> jB
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_DIDGERIDOO -> jC
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_BIT -> jD
+    net.minecraft.sounds.SoundEvent NOTE_BLOCK_BANJO -> jE
+    net.minecraft.sounds.SoundEvent OCELOT_HURT -> jF
+    net.minecraft.sounds.SoundEvent OCELOT_AMBIENT -> jG
+    net.minecraft.sounds.SoundEvent OCELOT_DEATH -> jH
+    net.minecraft.sounds.SoundEvent PAINTING_BREAK -> jI
+    net.minecraft.sounds.SoundEvent PAINTING_PLACE -> jJ
+    net.minecraft.sounds.SoundEvent PANDA_PRE_SNEEZE -> jK
+    net.minecraft.sounds.SoundEvent PANDA_SNEEZE -> jL
+    net.minecraft.sounds.SoundEvent PANDA_AMBIENT -> jM
+    net.minecraft.sounds.SoundEvent PANDA_DEATH -> jN
+    net.minecraft.sounds.SoundEvent PANDA_EAT -> jO
+    net.minecraft.sounds.SoundEvent PANDA_STEP -> jP
+    net.minecraft.sounds.SoundEvent PANDA_CANT_BREED -> jQ
+    net.minecraft.sounds.SoundEvent PANDA_AGGRESSIVE_AMBIENT -> jR
+    net.minecraft.sounds.SoundEvent PANDA_WORRIED_AMBIENT -> jS
+    net.minecraft.sounds.SoundEvent PANDA_HURT -> jT
+    net.minecraft.sounds.SoundEvent PANDA_BITE -> jU
+    net.minecraft.sounds.SoundEvent PARROT_AMBIENT -> jV
+    net.minecraft.sounds.SoundEvent PARROT_DEATH -> jW
+    net.minecraft.sounds.SoundEvent PARROT_EAT -> jX
+    net.minecraft.sounds.SoundEvent PARROT_FLY -> jY
+    net.minecraft.sounds.SoundEvent PARROT_HURT -> jZ
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_BLAZE -> ka
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_CREEPER -> kb
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_DROWNED -> kc
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ELDER_GUARDIAN -> kd
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ENDER_DRAGON -> ke
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ENDERMITE -> kf
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_EVOKER -> kg
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_GHAST -> kh
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_GUARDIAN -> ki
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_HOGLIN -> kj
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_HUSK -> kk
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ILLUSIONER -> kl
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_MAGMA_CUBE -> km
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_PHANTOM -> kn
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_PIGLIN -> ko
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_PILLAGER -> kp
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_RAVAGER -> kq
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_SHULKER -> kr
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_SILVERFISH -> ks
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_SKELETON -> kt
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_SLIME -> ku
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_SPIDER -> kv
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_STRAY -> kw
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_VEX -> kx
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_VINDICATOR -> ky
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_WITCH -> kz
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_WITHER -> kA
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_WITHER_SKELETON -> kB
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ZOGLIN -> kC
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ZOMBIE -> kD
+    net.minecraft.sounds.SoundEvent PARROT_IMITATE_ZOMBIE_VILLAGER -> kE
+    net.minecraft.sounds.SoundEvent PARROT_STEP -> kF
+    net.minecraft.sounds.SoundEvent PHANTOM_AMBIENT -> kG
+    net.minecraft.sounds.SoundEvent PHANTOM_BITE -> kH
+    net.minecraft.sounds.SoundEvent PHANTOM_DEATH -> kI
+    net.minecraft.sounds.SoundEvent PHANTOM_FLAP -> kJ
+    net.minecraft.sounds.SoundEvent PHANTOM_HURT -> kK
+    net.minecraft.sounds.SoundEvent PHANTOM_SWOOP -> kL
+    net.minecraft.sounds.SoundEvent PIG_AMBIENT -> kM
+    net.minecraft.sounds.SoundEvent PIG_DEATH -> kN
+    net.minecraft.sounds.SoundEvent PIG_HURT -> kO
+    net.minecraft.sounds.SoundEvent PIG_SADDLE -> kP
+    net.minecraft.sounds.SoundEvent PIG_STEP -> kQ
+    net.minecraft.sounds.SoundEvent PIGLIN_ADMIRING_ITEM -> kR
+    net.minecraft.sounds.SoundEvent PIGLIN_AMBIENT -> kS
+    net.minecraft.sounds.SoundEvent PIGLIN_ANGRY -> kT
+    net.minecraft.sounds.SoundEvent PIGLIN_CELEBRATE -> kU
+    net.minecraft.sounds.SoundEvent PIGLIN_DEATH -> kV
+    net.minecraft.sounds.SoundEvent PIGLIN_JEALOUS -> kW
+    net.minecraft.sounds.SoundEvent PIGLIN_HURT -> kX
+    net.minecraft.sounds.SoundEvent PIGLIN_RETREAT -> kY
+    net.minecraft.sounds.SoundEvent PIGLIN_STEP -> kZ
+    net.minecraft.sounds.SoundEvent PIGLIN_CONVERTED_TO_ZOMBIFIED -> la
+    net.minecraft.sounds.SoundEvent PILLAGER_AMBIENT -> lb
+    net.minecraft.sounds.SoundEvent PILLAGER_CELEBRATE -> lc
+    net.minecraft.sounds.SoundEvent PILLAGER_DEATH -> ld
+    net.minecraft.sounds.SoundEvent PILLAGER_HURT -> le
+    net.minecraft.sounds.SoundEvent PISTON_CONTRACT -> lf
+    net.minecraft.sounds.SoundEvent PISTON_EXTEND -> lg
+    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_CRIT -> lh
+    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_KNOCKBACK -> li
+    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_NODAMAGE -> lj
+    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_STRONG -> lk
+    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_SWEEP -> ll
+    net.minecraft.sounds.SoundEvent PLAYER_ATTACK_WEAK -> lm
+    net.minecraft.sounds.SoundEvent PLAYER_BIG_FALL -> ln
+    net.minecraft.sounds.SoundEvent PLAYER_BREATH -> lo
+    net.minecraft.sounds.SoundEvent PLAYER_BURP -> lp
+    net.minecraft.sounds.SoundEvent PLAYER_DEATH -> lq
+    net.minecraft.sounds.SoundEvent PLAYER_HURT -> lr
+    net.minecraft.sounds.SoundEvent PLAYER_HURT_DROWN -> ls
+    net.minecraft.sounds.SoundEvent PLAYER_HURT_ON_FIRE -> lt
+    net.minecraft.sounds.SoundEvent PLAYER_HURT_SWEET_BERRY_BUSH -> lu
+    net.minecraft.sounds.SoundEvent PLAYER_LEVELUP -> lv
+    net.minecraft.sounds.SoundEvent PLAYER_SMALL_FALL -> lw
+    net.minecraft.sounds.SoundEvent PLAYER_SPLASH -> lx
+    net.minecraft.sounds.SoundEvent PLAYER_SPLASH_HIGH_SPEED -> ly
+    net.minecraft.sounds.SoundEvent PLAYER_SWIM -> lz
+    net.minecraft.sounds.SoundEvent POLAR_BEAR_AMBIENT -> lA
+    net.minecraft.sounds.SoundEvent POLAR_BEAR_AMBIENT_BABY -> lB
+    net.minecraft.sounds.SoundEvent POLAR_BEAR_DEATH -> lC
+    net.minecraft.sounds.SoundEvent POLAR_BEAR_HURT -> lD
+    net.minecraft.sounds.SoundEvent POLAR_BEAR_STEP -> lE
+    net.minecraft.sounds.SoundEvent POLAR_BEAR_WARNING -> lF
+    net.minecraft.sounds.SoundEvent PORTAL_AMBIENT -> lG
+    net.minecraft.sounds.SoundEvent PORTAL_TRAVEL -> lH
+    net.minecraft.sounds.SoundEvent PORTAL_TRIGGER -> lI
+    net.minecraft.sounds.SoundEvent PUFFER_FISH_AMBIENT -> lJ
+    net.minecraft.sounds.SoundEvent PUFFER_FISH_BLOW_OUT -> lK
+    net.minecraft.sounds.SoundEvent PUFFER_FISH_BLOW_UP -> lL
+    net.minecraft.sounds.SoundEvent PUFFER_FISH_DEATH -> lM
+    net.minecraft.sounds.SoundEvent PUFFER_FISH_FLOP -> lN
+    net.minecraft.sounds.SoundEvent PUFFER_FISH_HURT -> lO
+    net.minecraft.sounds.SoundEvent PUFFER_FISH_STING -> lP
+    net.minecraft.sounds.SoundEvent PUMPKIN_CARVE -> lQ
+    net.minecraft.sounds.SoundEvent RABBIT_AMBIENT -> lR
+    net.minecraft.sounds.SoundEvent RABBIT_ATTACK -> lS
+    net.minecraft.sounds.SoundEvent RABBIT_DEATH -> lT
+    net.minecraft.sounds.SoundEvent RABBIT_HURT -> lU
+    net.minecraft.sounds.SoundEvent RABBIT_JUMP -> lV
+    net.minecraft.sounds.SoundEvent RAID_HORN -> lW
+    net.minecraft.sounds.SoundEvent RAVAGER_AMBIENT -> lX
+    net.minecraft.sounds.SoundEvent RAVAGER_ATTACK -> lY
+    net.minecraft.sounds.SoundEvent RAVAGER_CELEBRATE -> lZ
+    net.minecraft.sounds.SoundEvent RAVAGER_DEATH -> ma
+    net.minecraft.sounds.SoundEvent RAVAGER_HURT -> mb
+    net.minecraft.sounds.SoundEvent RAVAGER_STEP -> mc
+    net.minecraft.sounds.SoundEvent RAVAGER_STUNNED -> md
+    net.minecraft.sounds.SoundEvent RAVAGER_ROAR -> me
+    net.minecraft.sounds.SoundEvent NETHER_GOLD_ORE_BREAK -> mf
+    net.minecraft.sounds.SoundEvent NETHER_GOLD_ORE_FALL -> mg
+    net.minecraft.sounds.SoundEvent NETHER_GOLD_ORE_HIT -> mh
+    net.minecraft.sounds.SoundEvent NETHER_GOLD_ORE_PLACE -> mi
+    net.minecraft.sounds.SoundEvent NETHER_GOLD_ORE_STEP -> mj
+    net.minecraft.sounds.SoundEvent NETHER_ORE_BREAK -> mk
+    net.minecraft.sounds.SoundEvent NETHER_ORE_FALL -> ml
+    net.minecraft.sounds.SoundEvent NETHER_ORE_HIT -> mm
+    net.minecraft.sounds.SoundEvent NETHER_ORE_PLACE -> mn
+    net.minecraft.sounds.SoundEvent NETHER_ORE_STEP -> mo
+    net.minecraft.sounds.SoundEvent REDSTONE_TORCH_BURNOUT -> mp
+    net.minecraft.sounds.SoundEvent RESPAWN_ANCHOR_AMBIENT -> mq
+    net.minecraft.sounds.SoundEvent RESPAWN_ANCHOR_CHARGE -> mr
+    net.minecraft.sounds.SoundEvent RESPAWN_ANCHOR_DEPLETE -> ms
+    net.minecraft.sounds.SoundEvent RESPAWN_ANCHOR_SET_SPAWN -> mt
+    net.minecraft.sounds.SoundEvent SALMON_AMBIENT -> mu
+    net.minecraft.sounds.SoundEvent SALMON_DEATH -> mv
+    net.minecraft.sounds.SoundEvent SALMON_FLOP -> mw
+    net.minecraft.sounds.SoundEvent SALMON_HURT -> mx
+    net.minecraft.sounds.SoundEvent SAND_BREAK -> my
+    net.minecraft.sounds.SoundEvent SAND_FALL -> mz
+    net.minecraft.sounds.SoundEvent SAND_HIT -> mA
+    net.minecraft.sounds.SoundEvent SAND_PLACE -> mB
+    net.minecraft.sounds.SoundEvent SAND_STEP -> mC
+    net.minecraft.sounds.SoundEvent SCAFFOLDING_BREAK -> mD
+    net.minecraft.sounds.SoundEvent SCAFFOLDING_FALL -> mE
+    net.minecraft.sounds.SoundEvent SCAFFOLDING_HIT -> mF
+    net.minecraft.sounds.SoundEvent SCAFFOLDING_PLACE -> mG
+    net.minecraft.sounds.SoundEvent SCAFFOLDING_STEP -> mH
+    net.minecraft.sounds.SoundEvent SHEEP_AMBIENT -> mI
+    net.minecraft.sounds.SoundEvent SHEEP_DEATH -> mJ
+    net.minecraft.sounds.SoundEvent SHEEP_HURT -> mK
+    net.minecraft.sounds.SoundEvent SHEEP_SHEAR -> mL
+    net.minecraft.sounds.SoundEvent SHEEP_STEP -> mM
+    net.minecraft.sounds.SoundEvent SHIELD_BLOCK -> mN
+    net.minecraft.sounds.SoundEvent SHIELD_BREAK -> mO
+    net.minecraft.sounds.SoundEvent SHROOMLIGHT_BREAK -> mP
+    net.minecraft.sounds.SoundEvent SHROOMLIGHT_STEP -> mQ
+    net.minecraft.sounds.SoundEvent SHROOMLIGHT_PLACE -> mR
+    net.minecraft.sounds.SoundEvent SHROOMLIGHT_HIT -> mS
+    net.minecraft.sounds.SoundEvent SHROOMLIGHT_FALL -> mT
+    net.minecraft.sounds.SoundEvent SHOVEL_FLATTEN -> mU
+    net.minecraft.sounds.SoundEvent SHULKER_AMBIENT -> mV
+    net.minecraft.sounds.SoundEvent SHULKER_BOX_CLOSE -> mW
+    net.minecraft.sounds.SoundEvent SHULKER_BOX_OPEN -> mX
+    net.minecraft.sounds.SoundEvent SHULKER_BULLET_HIT -> mY
+    net.minecraft.sounds.SoundEvent SHULKER_BULLET_HURT -> mZ
+    net.minecraft.sounds.SoundEvent SHULKER_CLOSE -> na
+    net.minecraft.sounds.SoundEvent SHULKER_DEATH -> nb
+    net.minecraft.sounds.SoundEvent SHULKER_HURT -> nc
+    net.minecraft.sounds.SoundEvent SHULKER_HURT_CLOSED -> nd
+    net.minecraft.sounds.SoundEvent SHULKER_OPEN -> ne
+    net.minecraft.sounds.SoundEvent SHULKER_SHOOT -> nf
+    net.minecraft.sounds.SoundEvent SHULKER_TELEPORT -> ng
+    net.minecraft.sounds.SoundEvent SILVERFISH_AMBIENT -> nh
+    net.minecraft.sounds.SoundEvent SILVERFISH_DEATH -> ni
+    net.minecraft.sounds.SoundEvent SILVERFISH_HURT -> nj
+    net.minecraft.sounds.SoundEvent SILVERFISH_STEP -> nk
+    net.minecraft.sounds.SoundEvent SKELETON_AMBIENT -> nl
+    net.minecraft.sounds.SoundEvent SKELETON_DEATH -> nm
+    net.minecraft.sounds.SoundEvent SKELETON_HORSE_AMBIENT -> nn
+    net.minecraft.sounds.SoundEvent SKELETON_HORSE_DEATH -> no
+    net.minecraft.sounds.SoundEvent SKELETON_HORSE_HURT -> np
+    net.minecraft.sounds.SoundEvent SKELETON_HORSE_SWIM -> nq
+    net.minecraft.sounds.SoundEvent SKELETON_HORSE_AMBIENT_WATER -> nr
+    net.minecraft.sounds.SoundEvent SKELETON_HORSE_GALLOP_WATER -> ns
+    net.minecraft.sounds.SoundEvent SKELETON_HORSE_JUMP_WATER -> nt
+    net.minecraft.sounds.SoundEvent SKELETON_HORSE_STEP_WATER -> nu
+    net.minecraft.sounds.SoundEvent SKELETON_HURT -> nv
+    net.minecraft.sounds.SoundEvent SKELETON_SHOOT -> nw
+    net.minecraft.sounds.SoundEvent SKELETON_STEP -> nx
+    net.minecraft.sounds.SoundEvent SLIME_ATTACK -> ny
+    net.minecraft.sounds.SoundEvent SLIME_DEATH -> nz
+    net.minecraft.sounds.SoundEvent SLIME_HURT -> nA
+    net.minecraft.sounds.SoundEvent SLIME_JUMP -> nB
+    net.minecraft.sounds.SoundEvent SLIME_SQUISH -> nC
+    net.minecraft.sounds.SoundEvent SLIME_BLOCK_BREAK -> nD
+    net.minecraft.sounds.SoundEvent SLIME_BLOCK_FALL -> nE
+    net.minecraft.sounds.SoundEvent SLIME_BLOCK_HIT -> nF
+    net.minecraft.sounds.SoundEvent SLIME_BLOCK_PLACE -> nG
+    net.minecraft.sounds.SoundEvent SLIME_BLOCK_STEP -> nH
+    net.minecraft.sounds.SoundEvent SOUL_SAND_BREAK -> nI
+    net.minecraft.sounds.SoundEvent SOUL_SAND_STEP -> nJ
+    net.minecraft.sounds.SoundEvent SOUL_SAND_PLACE -> nK
+    net.minecraft.sounds.SoundEvent SOUL_SAND_HIT -> nL
+    net.minecraft.sounds.SoundEvent SOUL_SAND_FALL -> nM
+    net.minecraft.sounds.SoundEvent SOUL_SOIL_BREAK -> nN
+    net.minecraft.sounds.SoundEvent SOUL_SOIL_STEP -> nO
+    net.minecraft.sounds.SoundEvent SOUL_SOIL_PLACE -> nP
+    net.minecraft.sounds.SoundEvent SOUL_SOIL_HIT -> nQ
+    net.minecraft.sounds.SoundEvent SOUL_SOIL_FALL -> nR
+    net.minecraft.sounds.SoundEvent SOUL_ESCAPE -> nS
+    net.minecraft.sounds.SoundEvent STRIDER_AMBIENT -> nT
+    net.minecraft.sounds.SoundEvent STRIDER_HAPPY -> nU
+    net.minecraft.sounds.SoundEvent STRIDER_RETREAT -> nV
+    net.minecraft.sounds.SoundEvent STRIDER_DEATH -> nW
+    net.minecraft.sounds.SoundEvent STRIDER_HURT -> nX
+    net.minecraft.sounds.SoundEvent STRIDER_STEP -> nY
+    net.minecraft.sounds.SoundEvent STRIDER_STEP_LAVA -> nZ
+    net.minecraft.sounds.SoundEvent STRIDER_EAT -> oa
+    net.minecraft.sounds.SoundEvent STRIDER_SADDLE -> ob
+    net.minecraft.sounds.SoundEvent SLIME_DEATH_SMALL -> oc
+    net.minecraft.sounds.SoundEvent SLIME_HURT_SMALL -> od
+    net.minecraft.sounds.SoundEvent SLIME_JUMP_SMALL -> oe
+    net.minecraft.sounds.SoundEvent SLIME_SQUISH_SMALL -> of
+    net.minecraft.sounds.SoundEvent SMITHING_TABLE_USE -> og
+    net.minecraft.sounds.SoundEvent SMOKER_SMOKE -> oh
+    net.minecraft.sounds.SoundEvent SNOWBALL_THROW -> oi
+    net.minecraft.sounds.SoundEvent SNOW_BREAK -> oj
+    net.minecraft.sounds.SoundEvent SNOW_FALL -> ok
+    net.minecraft.sounds.SoundEvent SNOW_GOLEM_AMBIENT -> ol
+    net.minecraft.sounds.SoundEvent SNOW_GOLEM_DEATH -> om
+    net.minecraft.sounds.SoundEvent SNOW_GOLEM_HURT -> on
+    net.minecraft.sounds.SoundEvent SNOW_GOLEM_SHOOT -> oo
+    net.minecraft.sounds.SoundEvent SNOW_GOLEM_SHEAR -> op
+    net.minecraft.sounds.SoundEvent SNOW_HIT -> oq
+    net.minecraft.sounds.SoundEvent SNOW_PLACE -> or
+    net.minecraft.sounds.SoundEvent SNOW_STEP -> os
+    net.minecraft.sounds.SoundEvent SPIDER_AMBIENT -> ot
+    net.minecraft.sounds.SoundEvent SPIDER_DEATH -> ou
+    net.minecraft.sounds.SoundEvent SPIDER_HURT -> ov
+    net.minecraft.sounds.SoundEvent SPIDER_STEP -> ow
+    net.minecraft.sounds.SoundEvent SPLASH_POTION_BREAK -> ox
+    net.minecraft.sounds.SoundEvent SPLASH_POTION_THROW -> oy
+    net.minecraft.sounds.SoundEvent SQUID_AMBIENT -> oz
+    net.minecraft.sounds.SoundEvent SQUID_DEATH -> oA
+    net.minecraft.sounds.SoundEvent SQUID_HURT -> oB
+    net.minecraft.sounds.SoundEvent SQUID_SQUIRT -> oC
+    net.minecraft.sounds.SoundEvent STONE_BREAK -> oD
+    net.minecraft.sounds.SoundEvent STONE_BUTTON_CLICK_OFF -> oE
+    net.minecraft.sounds.SoundEvent STONE_BUTTON_CLICK_ON -> oF
+    net.minecraft.sounds.SoundEvent STONE_FALL -> oG
+    net.minecraft.sounds.SoundEvent STONE_HIT -> oH
+    net.minecraft.sounds.SoundEvent STONE_PLACE -> oI
+    net.minecraft.sounds.SoundEvent STONE_PRESSURE_PLATE_CLICK_OFF -> oJ
+    net.minecraft.sounds.SoundEvent STONE_PRESSURE_PLATE_CLICK_ON -> oK
+    net.minecraft.sounds.SoundEvent STONE_STEP -> oL
+    net.minecraft.sounds.SoundEvent STRAY_AMBIENT -> oM
+    net.minecraft.sounds.SoundEvent STRAY_DEATH -> oN
+    net.minecraft.sounds.SoundEvent STRAY_HURT -> oO
+    net.minecraft.sounds.SoundEvent STRAY_STEP -> oP
+    net.minecraft.sounds.SoundEvent SWEET_BERRY_BUSH_BREAK -> oQ
+    net.minecraft.sounds.SoundEvent SWEET_BERRY_BUSH_PLACE -> oR
+    net.minecraft.sounds.SoundEvent SWEET_BERRY_BUSH_PICK_BERRIES -> oS
+    net.minecraft.sounds.SoundEvent THORNS_HIT -> oT
+    net.minecraft.sounds.SoundEvent TNT_PRIMED -> oU
+    net.minecraft.sounds.SoundEvent TOTEM_USE -> oV
+    net.minecraft.sounds.SoundEvent TRIDENT_HIT -> oW
+    net.minecraft.sounds.SoundEvent TRIDENT_HIT_GROUND -> oX
+    net.minecraft.sounds.SoundEvent TRIDENT_RETURN -> oY
+    net.minecraft.sounds.SoundEvent TRIDENT_RIPTIDE_1 -> oZ
+    net.minecraft.sounds.SoundEvent TRIDENT_RIPTIDE_2 -> pa
+    net.minecraft.sounds.SoundEvent TRIDENT_RIPTIDE_3 -> pb
+    net.minecraft.sounds.SoundEvent TRIDENT_THROW -> pc
+    net.minecraft.sounds.SoundEvent TRIDENT_THUNDER -> pd
+    net.minecraft.sounds.SoundEvent TRIPWIRE_ATTACH -> pe
+    net.minecraft.sounds.SoundEvent TRIPWIRE_CLICK_OFF -> pf
+    net.minecraft.sounds.SoundEvent TRIPWIRE_CLICK_ON -> pg
+    net.minecraft.sounds.SoundEvent TRIPWIRE_DETACH -> ph
+    net.minecraft.sounds.SoundEvent TROPICAL_FISH_AMBIENT -> pi
+    net.minecraft.sounds.SoundEvent TROPICAL_FISH_DEATH -> pj
+    net.minecraft.sounds.SoundEvent TROPICAL_FISH_FLOP -> pk
+    net.minecraft.sounds.SoundEvent TROPICAL_FISH_HURT -> pl
+    net.minecraft.sounds.SoundEvent TURTLE_AMBIENT_LAND -> pm
+    net.minecraft.sounds.SoundEvent TURTLE_DEATH -> pn
+    net.minecraft.sounds.SoundEvent TURTLE_DEATH_BABY -> po
+    net.minecraft.sounds.SoundEvent TURTLE_EGG_BREAK -> pp
+    net.minecraft.sounds.SoundEvent TURTLE_EGG_CRACK -> pq
+    net.minecraft.sounds.SoundEvent TURTLE_EGG_HATCH -> pr
+    net.minecraft.sounds.SoundEvent TURTLE_HURT -> ps
+    net.minecraft.sounds.SoundEvent TURTLE_HURT_BABY -> pt
+    net.minecraft.sounds.SoundEvent TURTLE_LAY_EGG -> pu
+    net.minecraft.sounds.SoundEvent TURTLE_SHAMBLE -> pv
+    net.minecraft.sounds.SoundEvent TURTLE_SHAMBLE_BABY -> pw
+    net.minecraft.sounds.SoundEvent TURTLE_SWIM -> px
+    net.minecraft.sounds.SoundEvent UI_BUTTON_CLICK -> py
+    net.minecraft.sounds.SoundEvent UI_LOOM_SELECT_PATTERN -> pz
+    net.minecraft.sounds.SoundEvent UI_LOOM_TAKE_RESULT -> pA
+    net.minecraft.sounds.SoundEvent UI_CARTOGRAPHY_TABLE_TAKE_RESULT -> pB
+    net.minecraft.sounds.SoundEvent UI_STONECUTTER_TAKE_RESULT -> pC
+    net.minecraft.sounds.SoundEvent UI_STONECUTTER_SELECT_RECIPE -> pD
+    net.minecraft.sounds.SoundEvent UI_TOAST_CHALLENGE_COMPLETE -> pE
+    net.minecraft.sounds.SoundEvent UI_TOAST_IN -> pF
+    net.minecraft.sounds.SoundEvent UI_TOAST_OUT -> pG
+    net.minecraft.sounds.SoundEvent VEX_AMBIENT -> pH
+    net.minecraft.sounds.SoundEvent VEX_CHARGE -> pI
+    net.minecraft.sounds.SoundEvent VEX_DEATH -> pJ
+    net.minecraft.sounds.SoundEvent VEX_HURT -> pK
+    net.minecraft.sounds.SoundEvent VILLAGER_AMBIENT -> pL
+    net.minecraft.sounds.SoundEvent VILLAGER_CELEBRATE -> pM
+    net.minecraft.sounds.SoundEvent VILLAGER_DEATH -> pN
+    net.minecraft.sounds.SoundEvent VILLAGER_HURT -> pO
+    net.minecraft.sounds.SoundEvent VILLAGER_NO -> pP
+    net.minecraft.sounds.SoundEvent VILLAGER_TRADE -> pQ
+    net.minecraft.sounds.SoundEvent VILLAGER_YES -> pR
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_ARMORER -> pS
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_BUTCHER -> pT
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_CARTOGRAPHER -> pU
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_CLERIC -> pV
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_FARMER -> pW
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_FISHERMAN -> pX
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_FLETCHER -> pY
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_LEATHERWORKER -> pZ
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_LIBRARIAN -> qa
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_MASON -> qb
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_SHEPHERD -> qc
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_TOOLSMITH -> qd
+    net.minecraft.sounds.SoundEvent VILLAGER_WORK_WEAPONSMITH -> qe
+    net.minecraft.sounds.SoundEvent VINDICATOR_AMBIENT -> qf
+    net.minecraft.sounds.SoundEvent VINDICATOR_CELEBRATE -> qg
+    net.minecraft.sounds.SoundEvent VINDICATOR_DEATH -> qh
+    net.minecraft.sounds.SoundEvent VINDICATOR_HURT -> qi
+    net.minecraft.sounds.SoundEvent VINE_STEP -> qj
+    net.minecraft.sounds.SoundEvent LILY_PAD_PLACE -> qk
+    net.minecraft.sounds.SoundEvent WANDERING_TRADER_AMBIENT -> ql
+    net.minecraft.sounds.SoundEvent WANDERING_TRADER_DEATH -> qm
+    net.minecraft.sounds.SoundEvent WANDERING_TRADER_DISAPPEARED -> qn
+    net.minecraft.sounds.SoundEvent WANDERING_TRADER_DRINK_MILK -> qo
+    net.minecraft.sounds.SoundEvent WANDERING_TRADER_DRINK_POTION -> qp
+    net.minecraft.sounds.SoundEvent WANDERING_TRADER_HURT -> qq
+    net.minecraft.sounds.SoundEvent WANDERING_TRADER_NO -> qr
+    net.minecraft.sounds.SoundEvent WANDERING_TRADER_REAPPEARED -> qs
+    net.minecraft.sounds.SoundEvent WANDERING_TRADER_TRADE -> qt
+    net.minecraft.sounds.SoundEvent WANDERING_TRADER_YES -> qu
+    net.minecraft.sounds.SoundEvent WATER_AMBIENT -> qv
+    net.minecraft.sounds.SoundEvent WEATHER_RAIN -> qw
+    net.minecraft.sounds.SoundEvent WEATHER_RAIN_ABOVE -> qx
+    net.minecraft.sounds.SoundEvent WET_GRASS_BREAK -> qy
+    net.minecraft.sounds.SoundEvent WET_GRASS_FALL -> qz
+    net.minecraft.sounds.SoundEvent WET_GRASS_HIT -> qA
+    net.minecraft.sounds.SoundEvent WET_GRASS_PLACE -> qB
+    net.minecraft.sounds.SoundEvent WET_GRASS_STEP -> qC
+    net.minecraft.sounds.SoundEvent WITCH_AMBIENT -> qD
+    net.minecraft.sounds.SoundEvent WITCH_CELEBRATE -> qE
+    net.minecraft.sounds.SoundEvent WITCH_DEATH -> qF
+    net.minecraft.sounds.SoundEvent WITCH_DRINK -> qG
+    net.minecraft.sounds.SoundEvent WITCH_HURT -> qH
+    net.minecraft.sounds.SoundEvent WITCH_THROW -> qI
+    net.minecraft.sounds.SoundEvent WITHER_AMBIENT -> qJ
+    net.minecraft.sounds.SoundEvent WITHER_BREAK_BLOCK -> qK
+    net.minecraft.sounds.SoundEvent WITHER_DEATH -> qL
+    net.minecraft.sounds.SoundEvent WITHER_HURT -> qM
+    net.minecraft.sounds.SoundEvent WITHER_SHOOT -> qN
+    net.minecraft.sounds.SoundEvent WITHER_SKELETON_AMBIENT -> qO
+    net.minecraft.sounds.SoundEvent WITHER_SKELETON_DEATH -> qP
+    net.minecraft.sounds.SoundEvent WITHER_SKELETON_HURT -> qQ
+    net.minecraft.sounds.SoundEvent WITHER_SKELETON_STEP -> qR
+    net.minecraft.sounds.SoundEvent WITHER_SPAWN -> qS
+    net.minecraft.sounds.SoundEvent WOLF_AMBIENT -> qT
+    net.minecraft.sounds.SoundEvent WOLF_DEATH -> qU
+    net.minecraft.sounds.SoundEvent WOLF_GROWL -> qV
+    net.minecraft.sounds.SoundEvent WOLF_HOWL -> qW
+    net.minecraft.sounds.SoundEvent WOLF_HURT -> qX
+    net.minecraft.sounds.SoundEvent WOLF_PANT -> qY
+    net.minecraft.sounds.SoundEvent WOLF_SHAKE -> qZ
+    net.minecraft.sounds.SoundEvent WOLF_STEP -> ra
+    net.minecraft.sounds.SoundEvent WOLF_WHINE -> rb
+    net.minecraft.sounds.SoundEvent WOODEN_DOOR_CLOSE -> rc
+    net.minecraft.sounds.SoundEvent WOODEN_DOOR_OPEN -> rd
+    net.minecraft.sounds.SoundEvent WOODEN_TRAPDOOR_CLOSE -> re
+    net.minecraft.sounds.SoundEvent WOODEN_TRAPDOOR_OPEN -> rf
+    net.minecraft.sounds.SoundEvent WOOD_BREAK -> rg
+    net.minecraft.sounds.SoundEvent WOODEN_BUTTON_CLICK_OFF -> rh
+    net.minecraft.sounds.SoundEvent WOODEN_BUTTON_CLICK_ON -> ri
+    net.minecraft.sounds.SoundEvent WOOD_FALL -> rj
+    net.minecraft.sounds.SoundEvent WOOD_HIT -> rk
+    net.minecraft.sounds.SoundEvent WOOD_PLACE -> rl
+    net.minecraft.sounds.SoundEvent WOODEN_PRESSURE_PLATE_CLICK_OFF -> rm
+    net.minecraft.sounds.SoundEvent WOODEN_PRESSURE_PLATE_CLICK_ON -> rn
+    net.minecraft.sounds.SoundEvent WOOD_STEP -> ro
+    net.minecraft.sounds.SoundEvent WOOL_BREAK -> rp
+    net.minecraft.sounds.SoundEvent WOOL_FALL -> rq
+    net.minecraft.sounds.SoundEvent WOOL_HIT -> rr
+    net.minecraft.sounds.SoundEvent WOOL_PLACE -> rs
+    net.minecraft.sounds.SoundEvent WOOL_STEP -> rt
+    net.minecraft.sounds.SoundEvent ZOGLIN_AMBIENT -> ru
+    net.minecraft.sounds.SoundEvent ZOGLIN_ANGRY -> rv
+    net.minecraft.sounds.SoundEvent ZOGLIN_ATTACK -> rw
+    net.minecraft.sounds.SoundEvent ZOGLIN_DEATH -> rx
+    net.minecraft.sounds.SoundEvent ZOGLIN_HURT -> ry
+    net.minecraft.sounds.SoundEvent ZOGLIN_STEP -> rz
+    net.minecraft.sounds.SoundEvent ZOMBIE_AMBIENT -> rA
+    net.minecraft.sounds.SoundEvent ZOMBIE_ATTACK_WOODEN_DOOR -> rB
+    net.minecraft.sounds.SoundEvent ZOMBIE_ATTACK_IRON_DOOR -> rC
+    net.minecraft.sounds.SoundEvent ZOMBIE_BREAK_WOODEN_DOOR -> rD
+    net.minecraft.sounds.SoundEvent ZOMBIE_CONVERTED_TO_DROWNED -> rE
+    net.minecraft.sounds.SoundEvent ZOMBIE_DEATH -> rF
+    net.minecraft.sounds.SoundEvent ZOMBIE_DESTROY_EGG -> rG
+    net.minecraft.sounds.SoundEvent ZOMBIE_HORSE_AMBIENT -> rH
+    net.minecraft.sounds.SoundEvent ZOMBIE_HORSE_DEATH -> rI
+    net.minecraft.sounds.SoundEvent ZOMBIE_HORSE_HURT -> rJ
+    net.minecraft.sounds.SoundEvent ZOMBIE_HURT -> rK
+    net.minecraft.sounds.SoundEvent ZOMBIE_INFECT -> rL
+    net.minecraft.sounds.SoundEvent ZOMBIFIED_PIGLIN_AMBIENT -> rM
+    net.minecraft.sounds.SoundEvent ZOMBIFIED_PIGLIN_ANGRY -> rN
+    net.minecraft.sounds.SoundEvent ZOMBIFIED_PIGLIN_DEATH -> rO
+    net.minecraft.sounds.SoundEvent ZOMBIFIED_PIGLIN_HURT -> rP
+    net.minecraft.sounds.SoundEvent ZOMBIE_STEP -> rQ
+    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_AMBIENT -> rR
+    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_CONVERTED -> rS
+    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_CURE -> rT
+    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_DEATH -> rU
+    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_HURT -> rV
+    net.minecraft.sounds.SoundEvent ZOMBIE_VILLAGER_STEP -> rW
     6:6:void <init>() -> <init>
-    819:819:net.minecraft.sounds.SoundEvent register(java.lang.String) -> a
-    7:816:void <clinit>() -> <clinit>
-net.minecraft.sounds.SoundSource -> aaj:
+    994:994:net.minecraft.sounds.SoundEvent register(java.lang.String) -> a
+    7:991:void <clinit>() -> <clinit>
+net.minecraft.sounds.SoundSource -> acm:
     net.minecraft.sounds.SoundSource MASTER -> a
     net.minecraft.sounds.SoundSource MUSIC -> b
     net.minecraft.sounds.SoundSource RECORDS -> c
@@ -32831,8 +35295,8 @@ net.minecraft.sounds.SoundSource -> aaj:
     35:35:net.minecraft.sounds.SoundSource byName(java.lang.String) -> a
     39:39:java.util.Set getNames() -> b
     9:22:void <clinit>() -> <clinit>
-net.minecraft.sounds.package-info -> aak:
-net.minecraft.stats.RecipeBook -> aal:
+net.minecraft.sounds.package-info -> acn:
+net.minecraft.stats.RecipeBook -> aco:
     java.util.Set known -> a
     java.util.Set highlight -> b
     boolean guiOpen -> c
@@ -32844,47 +35308,46 @@ net.minecraft.stats.RecipeBook -> aal:
     boolean smokerGuiOpen -> i
     boolean smokerFilteringCraftable -> j
     14:16:void <init>() -> <init>
-    32:37:void copyOverData(net.minecraft.stats.RecipeBook) -> a
-    40:43:void add(net.minecraft.world.item.crafting.Recipe) -> a
-    46:47:void add(net.minecraft.resources.ResourceLocation) -> a
-    50:53:boolean contains(net.minecraft.world.item.crafting.Recipe) -> b
-    57:57:boolean contains(net.minecraft.resources.ResourceLocation) -> b
-    61:62:void remove(net.minecraft.world.item.crafting.Recipe) -> c
-    65:67:void remove(net.minecraft.resources.ResourceLocation) -> c
-    70:70:boolean willHighlight(net.minecraft.world.item.crafting.Recipe) -> d
-    74:75:void removeHighlight(net.minecraft.world.item.crafting.Recipe) -> e
-    78:79:void addHighlight(net.minecraft.world.item.crafting.Recipe) -> f
-    82:83:void addHighlight(net.minecraft.resources.ResourceLocation) -> d
-    86:86:boolean isGuiOpen() -> a
-    90:91:void setGuiOpen(boolean) -> a
-    94:101:boolean isFilteringCraftable(net.minecraft.world.inventory.RecipeBookMenu) -> a
-    106:106:boolean isFilteringCraftable() -> b
-    110:111:void setFilteringCraftable(boolean) -> b
-    114:114:boolean isFurnaceGuiOpen() -> c
-    118:119:void setFurnaceGuiOpen(boolean) -> c
-    122:122:boolean isFurnaceFilteringCraftable() -> d
-    126:127:void setFurnaceFilteringCraftable(boolean) -> d
-    130:130:boolean isBlastingFurnaceGuiOpen() -> e
-    134:135:void setBlastingFurnaceGuiOpen(boolean) -> e
-    138:138:boolean isBlastingFurnaceFilteringCraftable() -> f
-    142:143:void setBlastingFurnaceFilteringCraftable(boolean) -> f
-    146:146:boolean isSmokerGuiOpen() -> g
-    150:151:void setSmokerGuiOpen(boolean) -> g
-    154:154:boolean isSmokerFilteringCraftable() -> h
-    158:159:void setSmokerFilteringCraftable(boolean) -> h
-net.minecraft.stats.ServerRecipeBook -> aam:
+    32:49:void copyOverData(net.minecraft.stats.RecipeBook) -> a
+    52:55:void add(net.minecraft.world.item.crafting.Recipe) -> a
+    58:59:void add(net.minecraft.resources.ResourceLocation) -> a
+    62:65:boolean contains(net.minecraft.world.item.crafting.Recipe) -> b
+    69:69:boolean contains(net.minecraft.resources.ResourceLocation) -> b
+    73:74:void remove(net.minecraft.world.item.crafting.Recipe) -> c
+    77:79:void remove(net.minecraft.resources.ResourceLocation) -> c
+    82:82:boolean willHighlight(net.minecraft.world.item.crafting.Recipe) -> d
+    86:87:void removeHighlight(net.minecraft.world.item.crafting.Recipe) -> e
+    90:91:void addHighlight(net.minecraft.world.item.crafting.Recipe) -> f
+    94:95:void addHighlight(net.minecraft.resources.ResourceLocation) -> d
+    98:98:boolean isGuiOpen() -> a
+    102:103:void setGuiOpen(boolean) -> a
+    106:113:boolean isFilteringCraftable(net.minecraft.world.inventory.RecipeBookMenu) -> a
+    118:118:boolean isFilteringCraftable() -> b
+    122:123:void setFilteringCraftable(boolean) -> b
+    126:126:boolean isFurnaceGuiOpen() -> c
+    130:131:void setFurnaceGuiOpen(boolean) -> c
+    134:134:boolean isFurnaceFilteringCraftable() -> d
+    138:139:void setFurnaceFilteringCraftable(boolean) -> d
+    142:142:boolean isBlastingFurnaceGuiOpen() -> e
+    146:147:void setBlastingFurnaceGuiOpen(boolean) -> e
+    150:150:boolean isBlastingFurnaceFilteringCraftable() -> f
+    154:155:void setBlastingFurnaceFilteringCraftable(boolean) -> f
+    158:158:boolean isSmokerGuiOpen() -> g
+    162:163:void setSmokerGuiOpen(boolean) -> g
+    166:166:boolean isSmokerFilteringCraftable() -> h
+    170:171:void setSmokerFilteringCraftable(boolean) -> h
+net.minecraft.stats.ServerRecipeBook -> acp:
     org.apache.logging.log4j.Logger LOGGER -> k
-    net.minecraft.world.item.crafting.RecipeManager manager -> l
-    30:32:void <init>(net.minecraft.world.item.crafting.RecipeManager) -> <init>
-    35:50:int addRecipes(java.util.Collection,net.minecraft.server.level.ServerPlayer) -> a
-    54:67:int removeRecipes(java.util.Collection,net.minecraft.server.level.ServerPlayer) -> b
-    71:72:void sendRecipes(net.minecraft.network.protocol.game.ClientboundRecipePacket$State,net.minecraft.server.level.ServerPlayer,java.util.List) -> a
-    75:93:net.minecraft.nbt.CompoundTag toNbt() -> i
-    97:107:void fromNbt(net.minecraft.nbt.CompoundTag) -> a
-    110:124:void loadRecipes(net.minecraft.nbt.ListTag,java.util.function.Consumer) -> a
-    127:128:void sendInitialRecipeBook(net.minecraft.server.level.ServerPlayer) -> a
+    28:29:void <init>() -> <init>
+    32:47:int addRecipes(java.util.Collection,net.minecraft.server.level.ServerPlayer) -> a
+    51:64:int removeRecipes(java.util.Collection,net.minecraft.server.level.ServerPlayer) -> b
+    68:69:void sendRecipes(net.minecraft.network.protocol.game.ClientboundRecipePacket$State,net.minecraft.server.level.ServerPlayer,java.util.List) -> a
+    72:94:net.minecraft.nbt.CompoundTag toNbt() -> i
+    98:112:void fromNbt(net.minecraft.nbt.CompoundTag,net.minecraft.world.item.crafting.RecipeManager) -> a
+    115:129:void loadRecipes(net.minecraft.nbt.ListTag,java.util.function.Consumer,net.minecraft.world.item.crafting.RecipeManager) -> a
+    132:133:void sendInitialRecipeBook(net.minecraft.server.level.ServerPlayer) -> a
     26:26:void <clinit>() -> <clinit>
-net.minecraft.stats.ServerStatsCounter -> aan:
+net.minecraft.stats.ServerStatsCounter -> acq:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.server.MinecraftServer server -> c
     java.io.File file -> d
@@ -32907,7 +35370,7 @@ net.minecraft.stats.ServerStatsCounter -> aan:
     108:108:void lambda$null$1(java.lang.String) -> b
     107:107:void lambda$null$0(net.minecraft.nbt.CompoundTag,java.lang.String,net.minecraft.stats.Stat) -> a
     38:38:void <clinit>() -> <clinit>
-net.minecraft.stats.Stat -> aao:
+net.minecraft.stats.Stat -> acr:
     net.minecraft.stats.StatFormatter formatter -> o
     java.lang.Object value -> p
     net.minecraft.stats.StatType type -> q
@@ -32920,7 +35383,7 @@ net.minecraft.stats.Stat -> aao:
     46:46:boolean equals(java.lang.Object) -> equals
     51:51:int hashCode() -> hashCode
     56:57:java.lang.String toString() -> toString
-net.minecraft.stats.StatFormatter -> aap:
+net.minecraft.stats.StatFormatter -> acs:
     java.text.DecimalFormat DECIMAL_FORMAT -> a
     net.minecraft.stats.StatFormatter DEFAULT -> b
     net.minecraft.stats.StatFormatter DIVIDE_BY_TEN -> c
@@ -32932,7 +35395,7 @@ net.minecraft.stats.StatFormatter -> aap:
     14:14:java.lang.String lambda$static$1(int) -> c
     11:11:void lambda$static$0(java.text.DecimalFormat) -> a
     11:26:void <clinit>() -> <clinit>
-net.minecraft.stats.StatType -> aaq:
+net.minecraft.stats.StatType -> act:
     net.minecraft.core.Registry registry -> a
     java.util.Map map -> b
     11:15:void <init>(net.minecraft.core.Registry) -> <init>
@@ -32944,7 +35407,7 @@ net.minecraft.stats.StatType -> aaq:
     40:40:net.minecraft.stats.Stat get(java.lang.Object) -> b
     44:44:java.lang.String getTranslationKey() -> c
     23:23:net.minecraft.stats.Stat lambda$get$0(net.minecraft.stats.StatFormatter,java.lang.Object) -> a
-net.minecraft.stats.Stats -> aar:
+net.minecraft.stats.Stats -> acu:
     net.minecraft.stats.StatType BLOCK_MINED -> a
     net.minecraft.stats.StatType ITEM_CRAFTED -> b
     net.minecraft.stats.StatType ITEM_USED -> c
@@ -32973,377 +35436,478 @@ net.minecraft.stats.Stats -> aar:
     net.minecraft.resources.ResourceLocation HORSE_ONE_CM -> z
     net.minecraft.resources.ResourceLocation AVIATE_ONE_CM -> A
     net.minecraft.resources.ResourceLocation SWIM_ONE_CM -> B
-    net.minecraft.resources.ResourceLocation JUMP -> C
-    net.minecraft.resources.ResourceLocation DROP -> D
-    net.minecraft.resources.ResourceLocation DAMAGE_DEALT -> E
-    net.minecraft.resources.ResourceLocation DAMAGE_DEALT_ABSORBED -> F
-    net.minecraft.resources.ResourceLocation DAMAGE_DEALT_RESISTED -> G
-    net.minecraft.resources.ResourceLocation DAMAGE_TAKEN -> H
-    net.minecraft.resources.ResourceLocation DAMAGE_BLOCKED_BY_SHIELD -> I
-    net.minecraft.resources.ResourceLocation DAMAGE_ABSORBED -> J
-    net.minecraft.resources.ResourceLocation DAMAGE_RESISTED -> K
-    net.minecraft.resources.ResourceLocation DEATHS -> L
-    net.minecraft.resources.ResourceLocation MOB_KILLS -> M
-    net.minecraft.resources.ResourceLocation ANIMALS_BRED -> N
-    net.minecraft.resources.ResourceLocation PLAYER_KILLS -> O
-    net.minecraft.resources.ResourceLocation FISH_CAUGHT -> P
-    net.minecraft.resources.ResourceLocation TALKED_TO_VILLAGER -> Q
-    net.minecraft.resources.ResourceLocation TRADED_WITH_VILLAGER -> R
-    net.minecraft.resources.ResourceLocation EAT_CAKE_SLICE -> S
-    net.minecraft.resources.ResourceLocation FILL_CAULDRON -> T
-    net.minecraft.resources.ResourceLocation USE_CAULDRON -> U
-    net.minecraft.resources.ResourceLocation CLEAN_ARMOR -> V
-    net.minecraft.resources.ResourceLocation CLEAN_BANNER -> W
-    net.minecraft.resources.ResourceLocation CLEAN_SHULKER_BOX -> X
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_BREWINGSTAND -> Y
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_BEACON -> Z
-    net.minecraft.resources.ResourceLocation INSPECT_DROPPER -> aa
-    net.minecraft.resources.ResourceLocation INSPECT_HOPPER -> ab
-    net.minecraft.resources.ResourceLocation INSPECT_DISPENSER -> ac
-    net.minecraft.resources.ResourceLocation PLAY_NOTEBLOCK -> ad
-    net.minecraft.resources.ResourceLocation TUNE_NOTEBLOCK -> ae
-    net.minecraft.resources.ResourceLocation POT_FLOWER -> af
-    net.minecraft.resources.ResourceLocation TRIGGER_TRAPPED_CHEST -> ag
-    net.minecraft.resources.ResourceLocation OPEN_ENDERCHEST -> ah
-    net.minecraft.resources.ResourceLocation ENCHANT_ITEM -> ai
-    net.minecraft.resources.ResourceLocation PLAY_RECORD -> aj
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_FURNACE -> ak
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_CRAFTING_TABLE -> al
-    net.minecraft.resources.ResourceLocation OPEN_CHEST -> am
-    net.minecraft.resources.ResourceLocation SLEEP_IN_BED -> an
-    net.minecraft.resources.ResourceLocation OPEN_SHULKER_BOX -> ao
-    net.minecraft.resources.ResourceLocation OPEN_BARREL -> ap
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_BLAST_FURNACE -> aq
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_SMOKER -> ar
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_LECTERN -> as
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_CAMPFIRE -> at
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_CARTOGRAPHY_TABLE -> au
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_LOOM -> av
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_STONECUTTER -> aw
-    net.minecraft.resources.ResourceLocation BELL_RING -> ax
-    net.minecraft.resources.ResourceLocation RAID_TRIGGER -> ay
-    net.minecraft.resources.ResourceLocation RAID_WIN -> az
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_ANVIL -> aA
-    net.minecraft.resources.ResourceLocation INTERACT_WITH_GRINDSTONE -> aB
+    net.minecraft.resources.ResourceLocation STRIDER_ONE_CM -> C
+    net.minecraft.resources.ResourceLocation JUMP -> D
+    net.minecraft.resources.ResourceLocation DROP -> E
+    net.minecraft.resources.ResourceLocation DAMAGE_DEALT -> F
+    net.minecraft.resources.ResourceLocation DAMAGE_DEALT_ABSORBED -> G
+    net.minecraft.resources.ResourceLocation DAMAGE_DEALT_RESISTED -> H
+    net.minecraft.resources.ResourceLocation DAMAGE_TAKEN -> I
+    net.minecraft.resources.ResourceLocation DAMAGE_BLOCKED_BY_SHIELD -> J
+    net.minecraft.resources.ResourceLocation DAMAGE_ABSORBED -> K
+    net.minecraft.resources.ResourceLocation DAMAGE_RESISTED -> L
+    net.minecraft.resources.ResourceLocation DEATHS -> M
+    net.minecraft.resources.ResourceLocation MOB_KILLS -> N
+    net.minecraft.resources.ResourceLocation ANIMALS_BRED -> O
+    net.minecraft.resources.ResourceLocation PLAYER_KILLS -> P
+    net.minecraft.resources.ResourceLocation FISH_CAUGHT -> Q
+    net.minecraft.resources.ResourceLocation TALKED_TO_VILLAGER -> R
+    net.minecraft.resources.ResourceLocation TRADED_WITH_VILLAGER -> S
+    net.minecraft.resources.ResourceLocation EAT_CAKE_SLICE -> T
+    net.minecraft.resources.ResourceLocation FILL_CAULDRON -> U
+    net.minecraft.resources.ResourceLocation USE_CAULDRON -> V
+    net.minecraft.resources.ResourceLocation CLEAN_ARMOR -> W
+    net.minecraft.resources.ResourceLocation CLEAN_BANNER -> X
+    net.minecraft.resources.ResourceLocation CLEAN_SHULKER_BOX -> Y
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_BREWINGSTAND -> Z
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_BEACON -> aa
+    net.minecraft.resources.ResourceLocation INSPECT_DROPPER -> ab
+    net.minecraft.resources.ResourceLocation INSPECT_HOPPER -> ac
+    net.minecraft.resources.ResourceLocation INSPECT_DISPENSER -> ad
+    net.minecraft.resources.ResourceLocation PLAY_NOTEBLOCK -> ae
+    net.minecraft.resources.ResourceLocation TUNE_NOTEBLOCK -> af
+    net.minecraft.resources.ResourceLocation POT_FLOWER -> ag
+    net.minecraft.resources.ResourceLocation TRIGGER_TRAPPED_CHEST -> ah
+    net.minecraft.resources.ResourceLocation OPEN_ENDERCHEST -> ai
+    net.minecraft.resources.ResourceLocation ENCHANT_ITEM -> aj
+    net.minecraft.resources.ResourceLocation PLAY_RECORD -> ak
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_FURNACE -> al
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_CRAFTING_TABLE -> am
+    net.minecraft.resources.ResourceLocation OPEN_CHEST -> an
+    net.minecraft.resources.ResourceLocation SLEEP_IN_BED -> ao
+    net.minecraft.resources.ResourceLocation OPEN_SHULKER_BOX -> ap
+    net.minecraft.resources.ResourceLocation OPEN_BARREL -> aq
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_BLAST_FURNACE -> ar
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_SMOKER -> as
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_LECTERN -> at
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_CAMPFIRE -> au
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_CARTOGRAPHY_TABLE -> av
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_LOOM -> aw
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_STONECUTTER -> ax
+    net.minecraft.resources.ResourceLocation BELL_RING -> ay
+    net.minecraft.resources.ResourceLocation RAID_TRIGGER -> az
+    net.minecraft.resources.ResourceLocation RAID_WIN -> aA
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_ANVIL -> aB
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_GRINDSTONE -> aC
+    net.minecraft.resources.ResourceLocation TARGET_HIT -> aD
+    net.minecraft.resources.ResourceLocation INTERACT_WITH_SMITHING_TABLE -> aE
     9:9:void <init>() -> <init>
-    102:105:net.minecraft.resources.ResourceLocation makeCustomStat(java.lang.String,net.minecraft.stats.StatFormatter) -> a
-    110:110:net.minecraft.stats.StatType makeRegistryStatType(java.lang.String,net.minecraft.core.Registry) -> a
-    11:99:void <clinit>() -> <clinit>
-net.minecraft.stats.StatsCounter -> aas:
+    105:108:net.minecraft.resources.ResourceLocation makeCustomStat(java.lang.String,net.minecraft.stats.StatFormatter) -> a
+    113:113:net.minecraft.stats.StatType makeRegistryStatType(java.lang.String,net.minecraft.core.Registry) -> a
+    11:102:void <clinit>() -> <clinit>
+net.minecraft.stats.StatsCounter -> acv:
     it.unimi.dsi.fastutil.objects.Object2IntMap stats -> a
     9:13:void <init>() -> <init>
-    16:17:void increment(net.minecraft.world.entity.player.Player,net.minecraft.stats.Stat,int) -> b
-    20:21:void setValue(net.minecraft.world.entity.player.Player,net.minecraft.stats.Stat,int) -> a
-    24:24:int getValue(net.minecraft.stats.StatType,java.lang.Object) -> a
-    28:28:int getValue(net.minecraft.stats.Stat) -> a
-net.minecraft.stats.package-info -> aat:
-net.minecraft.tags.BlockTags -> aau:
-    net.minecraft.tags.TagCollection source -> ae
-    int resetCount -> af
-    net.minecraft.tags.Tag WOOL -> a
-    net.minecraft.tags.Tag PLANKS -> b
-    net.minecraft.tags.Tag STONE_BRICKS -> c
-    net.minecraft.tags.Tag WOODEN_BUTTONS -> d
-    net.minecraft.tags.Tag BUTTONS -> e
-    net.minecraft.tags.Tag CARPETS -> f
-    net.minecraft.tags.Tag WOODEN_DOORS -> g
-    net.minecraft.tags.Tag WOODEN_STAIRS -> h
-    net.minecraft.tags.Tag WOODEN_SLABS -> i
-    net.minecraft.tags.Tag WOODEN_FENCES -> j
-    net.minecraft.tags.Tag WOODEN_PRESSURE_PLATES -> k
-    net.minecraft.tags.Tag WOODEN_TRAPDOORS -> l
-    net.minecraft.tags.Tag DOORS -> m
-    net.minecraft.tags.Tag SAPLINGS -> n
-    net.minecraft.tags.Tag LOGS -> o
-    net.minecraft.tags.Tag DARK_OAK_LOGS -> p
-    net.minecraft.tags.Tag OAK_LOGS -> q
-    net.minecraft.tags.Tag BIRCH_LOGS -> r
-    net.minecraft.tags.Tag ACACIA_LOGS -> s
-    net.minecraft.tags.Tag JUNGLE_LOGS -> t
-    net.minecraft.tags.Tag SPRUCE_LOGS -> u
-    net.minecraft.tags.Tag BANNERS -> v
-    net.minecraft.tags.Tag SAND -> w
-    net.minecraft.tags.Tag STAIRS -> x
-    net.minecraft.tags.Tag SLABS -> y
-    net.minecraft.tags.Tag WALLS -> z
-    net.minecraft.tags.Tag ANVIL -> A
-    net.minecraft.tags.Tag RAILS -> B
-    net.minecraft.tags.Tag LEAVES -> C
-    net.minecraft.tags.Tag TRAPDOORS -> D
-    net.minecraft.tags.Tag SMALL_FLOWERS -> E
-    net.minecraft.tags.Tag BEDS -> F
-    net.minecraft.tags.Tag FENCES -> G
-    net.minecraft.tags.Tag TALL_FLOWERS -> H
-    net.minecraft.tags.Tag FLOWERS -> I
-    net.minecraft.tags.Tag SHULKER_BOXES -> J
-    net.minecraft.tags.Tag FLOWER_POTS -> K
-    net.minecraft.tags.Tag ENDERMAN_HOLDABLE -> L
-    net.minecraft.tags.Tag ICE -> M
-    net.minecraft.tags.Tag VALID_SPAWN -> N
-    net.minecraft.tags.Tag IMPERMEABLE -> O
-    net.minecraft.tags.Tag UNDERWATER_BONEMEALS -> P
-    net.minecraft.tags.Tag CORAL_BLOCKS -> Q
-    net.minecraft.tags.Tag WALL_CORALS -> R
-    net.minecraft.tags.Tag CORAL_PLANTS -> S
-    net.minecraft.tags.Tag CORALS -> T
-    net.minecraft.tags.Tag BAMBOO_PLANTABLE_ON -> U
-    net.minecraft.tags.Tag STANDING_SIGNS -> V
-    net.minecraft.tags.Tag WALL_SIGNS -> W
-    net.minecraft.tags.Tag SIGNS -> X
-    net.minecraft.tags.Tag DRAGON_IMMUNE -> Y
-    net.minecraft.tags.Tag WITHER_IMMUNE -> Z
-    net.minecraft.tags.Tag BEEHIVES -> aa
-    net.minecraft.tags.Tag CROPS -> ab
-    net.minecraft.tags.Tag BEE_GROWABLES -> ac
-    net.minecraft.tags.Tag PORTALS -> ad
-    13:14:void <init>() -> <init>
-    77:79:void reset(net.minecraft.tags.TagCollection) -> a
-    82:82:net.minecraft.tags.TagCollection getAllTags() -> a
-    86:86:net.minecraft.tags.Tag bind(java.lang.String) -> a
-    10:10:java.util.Optional lambda$static$0(net.minecraft.resources.ResourceLocation) -> a
-    9:9:int access$000() -> b
-    9:9:net.minecraft.tags.TagCollection access$100() -> c
-    10:74:void <clinit>() -> <clinit>
-net.minecraft.tags.BlockTags$Wrapper -> aau$a:
-    int check -> a
-    net.minecraft.tags.Tag actual -> b
-    90:95:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    99:103:boolean contains(net.minecraft.world.level.block.Block) -> a
-    108:112:java.util.Collection getValues() -> a
-    117:121:java.util.Collection getSource() -> b
-    89:89:boolean contains(java.lang.Object) -> a
-net.minecraft.tags.EntityTypeTags -> aav:
-    net.minecraft.tags.TagCollection source -> e
-    int resetCount -> f
-    net.minecraft.tags.Tag SKELETONS -> a
-    net.minecraft.tags.Tag RAIDERS -> b
-    net.minecraft.tags.Tag BEEHIVE_INHABITORS -> c
-    net.minecraft.tags.Tag ARROWS -> d
-    13:14:void <init>() -> <init>
-    22:24:void reset(net.minecraft.tags.TagCollection) -> a
-    27:27:net.minecraft.tags.TagCollection getAllTags() -> a
-    31:31:net.minecraft.tags.Tag bind(java.lang.String) -> a
-    10:10:java.util.Optional lambda$static$0(net.minecraft.resources.ResourceLocation) -> a
-    9:9:int access$000() -> b
-    9:9:net.minecraft.tags.TagCollection access$100() -> c
-    10:19:void <clinit>() -> <clinit>
-net.minecraft.tags.EntityTypeTags$Wrapper -> aav$a:
-    int check -> a
-    net.minecraft.tags.Tag actual -> b
-    35:40:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    44:48:boolean contains(net.minecraft.world.entity.EntityType) -> a
-    53:57:java.util.Collection getValues() -> a
-    62:66:java.util.Collection getSource() -> b
-    34:34:boolean contains(java.lang.Object) -> a
-net.minecraft.tags.FluidTags -> aaw:
-    net.minecraft.tags.TagCollection source -> c
-    int resetCount -> d
-    net.minecraft.tags.Tag WATER -> a
-    net.minecraft.tags.Tag LAVA -> b
-    13:14:void <init>() -> <init>
-    20:22:void reset(net.minecraft.tags.TagCollection) -> a
-    25:25:net.minecraft.tags.TagCollection getAllTags() -> a
-    29:29:net.minecraft.tags.Tag bind(java.lang.String) -> a
-    10:10:java.util.Optional lambda$static$0(net.minecraft.resources.ResourceLocation) -> a
-    9:9:int access$000() -> b
-    9:9:net.minecraft.tags.TagCollection access$100() -> c
-    10:17:void <clinit>() -> <clinit>
-net.minecraft.tags.FluidTags$Wrapper -> aaw$a:
-    int check -> a
-    net.minecraft.tags.Tag actual -> b
-    33:38:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    42:46:boolean contains(net.minecraft.world.level.material.Fluid) -> a
-    51:55:java.util.Collection getValues() -> a
-    60:64:java.util.Collection getSource() -> b
-    32:32:boolean contains(java.lang.Object) -> a
-net.minecraft.tags.ItemTags -> aax:
-    net.minecraft.tags.TagCollection source -> Q
-    int resetCount -> R
-    net.minecraft.tags.Tag WOOL -> a
-    net.minecraft.tags.Tag PLANKS -> b
-    net.minecraft.tags.Tag STONE_BRICKS -> c
-    net.minecraft.tags.Tag WOODEN_BUTTONS -> d
-    net.minecraft.tags.Tag BUTTONS -> e
-    net.minecraft.tags.Tag CARPETS -> f
-    net.minecraft.tags.Tag WOODEN_DOORS -> g
-    net.minecraft.tags.Tag WOODEN_STAIRS -> h
-    net.minecraft.tags.Tag WOODEN_SLABS -> i
-    net.minecraft.tags.Tag WOODEN_FENCES -> j
-    net.minecraft.tags.Tag WOODEN_PRESSURE_PLATES -> k
-    net.minecraft.tags.Tag WOODEN_TRAPDOORS -> l
-    net.minecraft.tags.Tag DOORS -> m
-    net.minecraft.tags.Tag SAPLINGS -> n
-    net.minecraft.tags.Tag LOGS -> o
-    net.minecraft.tags.Tag DARK_OAK_LOGS -> p
-    net.minecraft.tags.Tag OAK_LOGS -> q
-    net.minecraft.tags.Tag BIRCH_LOGS -> r
-    net.minecraft.tags.Tag ACACIA_LOGS -> s
-    net.minecraft.tags.Tag JUNGLE_LOGS -> t
-    net.minecraft.tags.Tag SPRUCE_LOGS -> u
-    net.minecraft.tags.Tag BANNERS -> v
-    net.minecraft.tags.Tag SAND -> w
-    net.minecraft.tags.Tag STAIRS -> x
-    net.minecraft.tags.Tag SLABS -> y
-    net.minecraft.tags.Tag WALLS -> z
-    net.minecraft.tags.Tag ANVIL -> A
-    net.minecraft.tags.Tag RAILS -> B
-    net.minecraft.tags.Tag LEAVES -> C
-    net.minecraft.tags.Tag TRAPDOORS -> D
-    net.minecraft.tags.Tag SMALL_FLOWERS -> E
-    net.minecraft.tags.Tag BEDS -> F
-    net.minecraft.tags.Tag FENCES -> G
-    net.minecraft.tags.Tag TALL_FLOWERS -> H
-    net.minecraft.tags.Tag FLOWERS -> I
-    net.minecraft.tags.Tag BOATS -> J
-    net.minecraft.tags.Tag FISHES -> K
-    net.minecraft.tags.Tag SIGNS -> L
-    net.minecraft.tags.Tag MUSIC_DISCS -> M
-    net.minecraft.tags.Tag COALS -> N
-    net.minecraft.tags.Tag ARROWS -> O
-    net.minecraft.tags.Tag LECTERN_BOOKS -> P
-    13:14:void <init>() -> <init>
-    64:66:void reset(net.minecraft.tags.TagCollection) -> a
-    69:69:net.minecraft.tags.TagCollection getAllTags() -> a
-    73:73:net.minecraft.tags.Tag bind(java.lang.String) -> a
-    10:10:java.util.Optional lambda$static$0(net.minecraft.resources.ResourceLocation) -> a
-    9:9:int access$000() -> b
-    9:9:net.minecraft.tags.TagCollection access$100() -> c
-    10:61:void <clinit>() -> <clinit>
-net.minecraft.tags.ItemTags$Wrapper -> aax$a:
-    int check -> a
-    net.minecraft.tags.Tag actual -> b
-    77:82:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    86:90:boolean contains(net.minecraft.world.item.Item) -> a
-    95:99:java.util.Collection getValues() -> a
-    104:108:java.util.Collection getSource() -> b
-    76:76:boolean contains(java.lang.Object) -> a
-net.minecraft.tags.SynchronizableTagCollection -> aay:
-    net.minecraft.core.Registry registry -> a
-    14:16:void <init>(net.minecraft.core.Registry,java.lang.String,java.lang.String) -> <init>
-    19:28:void serializeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
-    31:44:void loadFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
-net.minecraft.tags.Tag -> aaz:
-    net.minecraft.resources.ResourceLocation id -> a
-    java.util.Set values -> b
-    java.util.Collection source -> c
-    27:31:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    33:41:void <init>(net.minecraft.resources.ResourceLocation,java.util.Collection,boolean) -> <init>
-    44:54:com.google.gson.JsonObject serializeToJson(java.util.function.Function) -> a
-    58:58:boolean contains(java.lang.Object) -> a
-    62:62:java.util.Collection getValues() -> a
-    66:66:java.util.Collection getSource() -> b
-    70:71:java.lang.Object getRandomElement(java.util.Random) -> a
-    75:75:net.minecraft.resources.ResourceLocation getId() -> c
-net.minecraft.tags.Tag$Builder -> aaz$a:
-    java.util.Set values -> a
-    boolean ordered -> b
-    78:79:void <init>() -> <init>
-    83:83:net.minecraft.tags.Tag$Builder tag() -> a
-    87:88:net.minecraft.tags.Tag$Builder add(net.minecraft.tags.Tag$Entry) -> a
-    92:93:net.minecraft.tags.Tag$Builder add(java.lang.Object) -> a
-    98:99:net.minecraft.tags.Tag$Builder add(java.lang.Object[]) -> a
-    103:104:net.minecraft.tags.Tag$Builder add(java.util.Collection) -> a
-    108:109:net.minecraft.tags.Tag$Builder addTag(net.minecraft.resources.ResourceLocation) -> a
-    113:114:net.minecraft.tags.Tag$Builder addTag(net.minecraft.tags.Tag) -> a
-    118:119:net.minecraft.tags.Tag$Builder keepOrder(boolean) -> a
-    123:128:boolean canBuild(java.util.function.Function) -> a
-    132:132:net.minecraft.tags.Tag build(net.minecraft.resources.ResourceLocation) -> b
-    136:155:net.minecraft.tags.Tag$Builder addFromJson(java.util.function.Function,com.google.gson.JsonObject) -> a
-    146:146:com.google.gson.JsonParseException lambda$addFromJson$0(net.minecraft.resources.ResourceLocation) -> c
-net.minecraft.tags.Tag$Entry -> aaz$b:
-    161:161:boolean canBuild(java.util.function.Function) -> a
-    void build(java.util.Collection) -> a
-    void serializeTo(com.google.gson.JsonArray,java.util.function.Function) -> a
-net.minecraft.tags.Tag$TagEntry -> aaz$c:
-    net.minecraft.resources.ResourceLocation id -> a
+    16:18:void increment(net.minecraft.world.entity.player.Player,net.minecraft.stats.Stat,int) -> b
+    21:22:void setValue(net.minecraft.world.entity.player.Player,net.minecraft.stats.Stat,int) -> a
+    25:25:int getValue(net.minecraft.stats.StatType,java.lang.Object) -> a
+    29:29:int getValue(net.minecraft.stats.Stat) -> a
+net.minecraft.stats.package-info -> acw:
+net.minecraft.tags.BlockTags -> acx:
+    net.minecraft.tags.StaticTagHelper HELPER -> aF
+    net.minecraft.tags.Tag$Named WOOL -> a
+    net.minecraft.tags.Tag$Named PLANKS -> b
+    net.minecraft.tags.Tag$Named STONE_BRICKS -> c
+    net.minecraft.tags.Tag$Named WOODEN_BUTTONS -> d
+    net.minecraft.tags.Tag$Named BUTTONS -> e
+    net.minecraft.tags.Tag$Named CARPETS -> f
+    net.minecraft.tags.Tag$Named WOODEN_DOORS -> g
+    net.minecraft.tags.Tag$Named WOODEN_STAIRS -> h
+    net.minecraft.tags.Tag$Named WOODEN_SLABS -> i
+    net.minecraft.tags.Tag$Named WOODEN_FENCES -> j
+    net.minecraft.tags.Tag$Named PRESSURE_PLATES -> k
+    net.minecraft.tags.Tag$Named WOODEN_PRESSURE_PLATES -> l
+    net.minecraft.tags.Tag$Named STONE_PRESSURE_PLATES -> m
+    net.minecraft.tags.Tag$Named WOODEN_TRAPDOORS -> n
+    net.minecraft.tags.Tag$Named DOORS -> o
+    net.minecraft.tags.Tag$Named SAPLINGS -> p
+    net.minecraft.tags.Tag$Named LOGS_THAT_BURN -> q
+    net.minecraft.tags.Tag$Named LOGS -> r
+    net.minecraft.tags.Tag$Named DARK_OAK_LOGS -> s
+    net.minecraft.tags.Tag$Named OAK_LOGS -> t
+    net.minecraft.tags.Tag$Named BIRCH_LOGS -> u
+    net.minecraft.tags.Tag$Named ACACIA_LOGS -> v
+    net.minecraft.tags.Tag$Named JUNGLE_LOGS -> w
+    net.minecraft.tags.Tag$Named SPRUCE_LOGS -> x
+    net.minecraft.tags.Tag$Named CRIMSON_STEMS -> y
+    net.minecraft.tags.Tag$Named WARPED_STEMS -> z
+    net.minecraft.tags.Tag$Named BANNERS -> A
+    net.minecraft.tags.Tag$Named SAND -> B
+    net.minecraft.tags.Tag$Named STAIRS -> C
+    net.minecraft.tags.Tag$Named SLABS -> D
+    net.minecraft.tags.Tag$Named WALLS -> E
+    net.minecraft.tags.Tag$Named ANVIL -> F
+    net.minecraft.tags.Tag$Named RAILS -> G
+    net.minecraft.tags.Tag$Named LEAVES -> H
+    net.minecraft.tags.Tag$Named TRAPDOORS -> I
+    net.minecraft.tags.Tag$Named SMALL_FLOWERS -> J
+    net.minecraft.tags.Tag$Named BEDS -> K
+    net.minecraft.tags.Tag$Named FENCES -> L
+    net.minecraft.tags.Tag$Named TALL_FLOWERS -> M
+    net.minecraft.tags.Tag$Named FLOWERS -> N
+    net.minecraft.tags.Tag$Named PIGLIN_REPELLENTS -> O
+    net.minecraft.tags.Tag$Named GOLD_ORES -> P
+    net.minecraft.tags.Tag$Named NON_FLAMMABLE_WOOD -> Q
+    net.minecraft.tags.Tag$Named FLOWER_POTS -> R
+    net.minecraft.tags.Tag$Named ENDERMAN_HOLDABLE -> S
+    net.minecraft.tags.Tag$Named ICE -> T
+    net.minecraft.tags.Tag$Named VALID_SPAWN -> U
+    net.minecraft.tags.Tag$Named IMPERMEABLE -> V
+    net.minecraft.tags.Tag$Named UNDERWATER_BONEMEALS -> W
+    net.minecraft.tags.Tag$Named CORAL_BLOCKS -> X
+    net.minecraft.tags.Tag$Named WALL_CORALS -> Y
+    net.minecraft.tags.Tag$Named CORAL_PLANTS -> Z
+    net.minecraft.tags.Tag$Named CORALS -> aa
+    net.minecraft.tags.Tag$Named BAMBOO_PLANTABLE_ON -> ab
+    net.minecraft.tags.Tag$Named STANDING_SIGNS -> ac
+    net.minecraft.tags.Tag$Named WALL_SIGNS -> ad
+    net.minecraft.tags.Tag$Named SIGNS -> ae
+    net.minecraft.tags.Tag$Named DRAGON_IMMUNE -> af
+    net.minecraft.tags.Tag$Named WITHER_IMMUNE -> ag
+    net.minecraft.tags.Tag$Named WITHER_SUMMON_BASE_BLOCKS -> ah
+    net.minecraft.tags.Tag$Named BEEHIVES -> ai
+    net.minecraft.tags.Tag$Named CROPS -> aj
+    net.minecraft.tags.Tag$Named BEE_GROWABLES -> ak
+    net.minecraft.tags.Tag$Named PORTALS -> al
+    net.minecraft.tags.Tag$Named FIRE -> am
+    net.minecraft.tags.Tag$Named NYLIUM -> an
+    net.minecraft.tags.Tag$Named WART_BLOCKS -> ao
+    net.minecraft.tags.Tag$Named BEACON_BASE_BLOCKS -> ap
+    net.minecraft.tags.Tag$Named SOUL_SPEED_BLOCKS -> aq
+    net.minecraft.tags.Tag$Named WALL_POST_OVERRIDE -> ar
+    net.minecraft.tags.Tag$Named CLIMBABLE -> as
+    net.minecraft.tags.Tag$Named SHULKER_BOXES -> at
+    net.minecraft.tags.Tag$Named HOGLIN_REPELLENTS -> au
+    net.minecraft.tags.Tag$Named SOUL_FIRE_BASE_BLOCKS -> av
+    net.minecraft.tags.Tag$Named STRIDER_WARM_BLOCKS -> aw
+    net.minecraft.tags.Tag$Named CAMPFIRES -> ax
+    net.minecraft.tags.Tag$Named GUARDED_BY_PIGLINS -> ay
+    net.minecraft.tags.Tag$Named PREVENT_MOB_SPAWNING_INSIDE -> az
+    net.minecraft.tags.Tag$Named FENCE_GATES -> aA
+    net.minecraft.tags.Tag$Named UNSTABLE_BOTTOM_CENTER -> aB
+    net.minecraft.tags.Tag$Named INFINIBURN_OVERWORLD -> aC
+    net.minecraft.tags.Tag$Named INFINIBURN_NETHER -> aD
+    net.minecraft.tags.Tag$Named INFINIBURN_END -> aE
+    8:8:void <init>() -> <init>
+    101:101:net.minecraft.tags.Tag$Named bind(java.lang.String) -> a
+    105:106:void reset(net.minecraft.tags.TagCollection) -> a
+    109:110:void resetToEmpty() -> a
+    113:113:net.minecraft.tags.TagCollection getAllTags() -> b
+    117:117:java.util.Set getMissingTags(net.minecraft.tags.TagCollection) -> b
+    9:98:void <clinit>() -> <clinit>
+net.minecraft.tags.EntityTypeTags -> acy:
+    net.minecraft.tags.StaticTagHelper HELPER -> f
+    net.minecraft.tags.Tag$Named SKELETONS -> a
+    net.minecraft.tags.Tag$Named RAIDERS -> b
+    net.minecraft.tags.Tag$Named BEEHIVE_INHABITORS -> c
+    net.minecraft.tags.Tag$Named ARROWS -> d
+    net.minecraft.tags.Tag$Named IMPACT_PROJECTILES -> e
+    11:12:void <init>() -> <init>
+    21:21:net.minecraft.tags.Tag$Named bind(java.lang.String) -> a
+    25:26:void reset(net.minecraft.tags.TagCollection) -> a
+    29:30:void resetToEmpty() -> a
+    33:33:net.minecraft.tags.TagCollection getAllTags() -> b
+    37:37:java.util.Set getMissingTags(net.minecraft.tags.TagCollection) -> b
+    9:18:void <clinit>() -> <clinit>
+net.minecraft.tags.FluidTags -> acz:
+    net.minecraft.tags.StaticTagHelper HELPER -> c
+    net.minecraft.tags.Tag$Named WATER -> a
+    net.minecraft.tags.Tag$Named LAVA -> b
+    12:13:void <init>() -> <init>
+    19:19:net.minecraft.tags.Tag$Named bind(java.lang.String) -> a
+    23:24:void reset(net.minecraft.tags.TagCollection) -> a
+    27:28:void resetToEmpty() -> a
+    31:31:net.minecraft.tags.TagCollection getAllTags() -> b
+    35:35:java.util.List getWrappers() -> c
+    39:39:java.util.Set getMissingTags(net.minecraft.tags.TagCollection) -> b
+    10:16:void <clinit>() -> <clinit>
+net.minecraft.tags.ItemTags -> ada:
+    net.minecraft.tags.StaticTagHelper HELPER -> ac
+    net.minecraft.tags.Tag$Named WOOL -> a
+    net.minecraft.tags.Tag$Named PLANKS -> b
+    net.minecraft.tags.Tag$Named STONE_BRICKS -> c
+    net.minecraft.tags.Tag$Named WOODEN_BUTTONS -> d
+    net.minecraft.tags.Tag$Named BUTTONS -> e
+    net.minecraft.tags.Tag$Named CARPETS -> f
+    net.minecraft.tags.Tag$Named WOODEN_DOORS -> g
+    net.minecraft.tags.Tag$Named WOODEN_STAIRS -> h
+    net.minecraft.tags.Tag$Named WOODEN_SLABS -> i
+    net.minecraft.tags.Tag$Named WOODEN_FENCES -> j
+    net.minecraft.tags.Tag$Named WOODEN_PRESSURE_PLATES -> k
+    net.minecraft.tags.Tag$Named WOODEN_TRAPDOORS -> l
+    net.minecraft.tags.Tag$Named DOORS -> m
+    net.minecraft.tags.Tag$Named SAPLINGS -> n
+    net.minecraft.tags.Tag$Named LOGS_THAT_BURN -> o
+    net.minecraft.tags.Tag$Named LOGS -> p
+    net.minecraft.tags.Tag$Named DARK_OAK_LOGS -> q
+    net.minecraft.tags.Tag$Named OAK_LOGS -> r
+    net.minecraft.tags.Tag$Named BIRCH_LOGS -> s
+    net.minecraft.tags.Tag$Named ACACIA_LOGS -> t
+    net.minecraft.tags.Tag$Named JUNGLE_LOGS -> u
+    net.minecraft.tags.Tag$Named SPRUCE_LOGS -> v
+    net.minecraft.tags.Tag$Named CRIMSON_STEMS -> w
+    net.minecraft.tags.Tag$Named WARPED_STEMS -> x
+    net.minecraft.tags.Tag$Named BANNERS -> y
+    net.minecraft.tags.Tag$Named SAND -> z
+    net.minecraft.tags.Tag$Named STAIRS -> A
+    net.minecraft.tags.Tag$Named SLABS -> B
+    net.minecraft.tags.Tag$Named WALLS -> C
+    net.minecraft.tags.Tag$Named ANVIL -> D
+    net.minecraft.tags.Tag$Named RAILS -> E
+    net.minecraft.tags.Tag$Named LEAVES -> F
+    net.minecraft.tags.Tag$Named TRAPDOORS -> G
+    net.minecraft.tags.Tag$Named SMALL_FLOWERS -> H
+    net.minecraft.tags.Tag$Named BEDS -> I
+    net.minecraft.tags.Tag$Named FENCES -> J
+    net.minecraft.tags.Tag$Named TALL_FLOWERS -> K
+    net.minecraft.tags.Tag$Named FLOWERS -> L
+    net.minecraft.tags.Tag$Named PIGLIN_REPELLENTS -> M
+    net.minecraft.tags.Tag$Named PIGLIN_LOVED -> N
+    net.minecraft.tags.Tag$Named GOLD_ORES -> O
+    net.minecraft.tags.Tag$Named NON_FLAMMABLE_WOOD -> P
+    net.minecraft.tags.Tag$Named SOUL_FIRE_BASE_BLOCKS -> Q
+    net.minecraft.tags.Tag$Named BOATS -> R
+    net.minecraft.tags.Tag$Named FISHES -> S
+    net.minecraft.tags.Tag$Named SIGNS -> T
+    net.minecraft.tags.Tag$Named MUSIC_DISCS -> U
+    net.minecraft.tags.Tag$Named CREEPER_DROP_MUSIC_DISCS -> V
+    net.minecraft.tags.Tag$Named COALS -> W
+    net.minecraft.tags.Tag$Named ARROWS -> X
+    net.minecraft.tags.Tag$Named LECTERN_BOOKS -> Y
+    net.minecraft.tags.Tag$Named BEACON_PAYMENT_ITEMS -> Z
+    net.minecraft.tags.Tag$Named STONE_TOOL_MATERIALS -> aa
+    net.minecraft.tags.Tag$Named FURNACE_MATERIALS -> ab
+    11:12:void <init>() -> <init>
+    74:74:net.minecraft.tags.Tag$Named bind(java.lang.String) -> a
+    78:79:void reset(net.minecraft.tags.TagCollection) -> a
+    82:83:void resetToEmpty() -> a
+    86:86:net.minecraft.tags.TagCollection getAllTags() -> b
+    90:90:java.util.Set getMissingTags(net.minecraft.tags.TagCollection) -> b
+    9:71:void <clinit>() -> <clinit>
+net.minecraft.tags.SerializationTags -> adb:
+    net.minecraft.tags.SerializationTags instance -> a
+    net.minecraft.tags.TagCollection blocks -> b
+    net.minecraft.tags.TagCollection items -> c
+    net.minecraft.tags.TagCollection fluids -> d
+    net.minecraft.tags.TagCollection entityTypes -> e
+    22:27:void <init>(net.minecraft.tags.TagCollection,net.minecraft.tags.TagCollection,net.minecraft.tags.TagCollection,net.minecraft.tags.TagCollection) -> <init>
+    31:31:net.minecraft.tags.TagCollection getBlocks() -> a
+    35:35:net.minecraft.tags.TagCollection getItems() -> b
+    39:39:net.minecraft.tags.TagCollection getFluids() -> c
+    43:43:net.minecraft.tags.TagCollection getEntityTypes() -> d
+    47:47:net.minecraft.tags.SerializationTags getInstance() -> e
+    51:52:void bind(net.minecraft.tags.TagCollection,net.minecraft.tags.TagCollection,net.minecraft.tags.TagCollection,net.minecraft.tags.TagCollection) -> a
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.tags.SetTag -> adc:
+    com.google.common.collect.ImmutableList valuesList -> b
+    java.util.Set values -> c
+    java.lang.Class closestCommonSuperType -> a
+    21:25:void <init>(java.util.Set,java.lang.Class) -> <init>
+    28:28:net.minecraft.tags.SetTag empty() -> a
+    32:32:net.minecraft.tags.SetTag create(java.util.Set) -> a
+    38:38:boolean contains(java.lang.Object) -> a
+    43:43:java.util.List getValues() -> b
+    54:66:java.lang.Class findCommonSuperClass(java.util.Set) -> c
+    70:73:java.lang.Class findClosestAncestor(java.lang.Class,java.lang.Class) -> a
+net.minecraft.tags.StaticTagHelper -> add:
+    net.minecraft.tags.TagCollection empty -> a
+    net.minecraft.tags.TagCollection source -> b
+    java.util.List wrappers -> c
+    15:18:void <init>() -> <init>
+    21:23:net.minecraft.tags.Tag$Named bind(java.lang.String) -> a
+    27:30:void resetToEmpty() -> a
+    33:35:void reset(net.minecraft.tags.TagCollection) -> a
+    38:38:net.minecraft.tags.TagCollection getAllTags() -> b
+    42:42:java.util.List getWrappers() -> c
+    46:48:java.util.Set getMissingTags(net.minecraft.tags.TagCollection) -> b
+    34:34:void lambda$reset$3(net.minecraft.tags.TagCollection,net.minecraft.tags.StaticTagHelper$Wrapper) -> a
+    29:29:void lambda$resetToEmpty$2(net.minecraft.tags.Tag,net.minecraft.tags.StaticTagHelper$Wrapper) -> a
+    29:29:net.minecraft.tags.Tag lambda$null$1(net.minecraft.tags.Tag,net.minecraft.resources.ResourceLocation) -> a
+    16:16:java.util.Optional lambda$new$0(net.minecraft.resources.ResourceLocation) -> a
+net.minecraft.tags.StaticTagHelper$1 -> add$1:
+net.minecraft.tags.StaticTagHelper$Wrapper -> add$a:
     net.minecraft.tags.Tag tag -> b
-    204:206:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    208:211:void <init>(net.minecraft.tags.Tag) -> <init>
-    215:219:boolean canBuild(java.util.function.Function) -> a
-    224:228:void build(java.util.Collection) -> a
-    231:236:net.minecraft.resources.ResourceLocation getId() -> a
-    242:243:void serializeTo(com.google.gson.JsonArray,java.util.function.Function) -> a
-net.minecraft.tags.Tag$ValuesEntry -> aaz$d:
-    java.util.Collection values -> a
-    172:174:void <init>(java.util.Collection) -> <init>
-    178:179:void build(java.util.Collection) -> a
-    183:190:void serializeTo(com.google.gson.JsonArray,java.util.function.Function) -> a
-    193:193:java.util.Collection getValues() -> a
-net.minecraft.tags.TagCollection -> aba:
+    net.minecraft.resources.ResourceLocation name -> a
+    56:58:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
+    62:62:net.minecraft.resources.ResourceLocation getName() -> a
+    66:69:net.minecraft.tags.Tag resolve() -> c
+    73:74:void rebind(java.util.function.Function) -> a
+    78:78:boolean contains(java.lang.Object) -> a
+    83:83:java.util.List getValues() -> b
+    51:51:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.tags.StaticTagHelper$1) -> <init>
+net.minecraft.tags.SynchronizableTagCollection -> ade:
+    net.minecraft.core.Registry registry -> a
+    15:17:void <init>(net.minecraft.core.Registry,java.lang.String,java.lang.String) -> <init>
+    20:29:void serializeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
+    32:45:void loadFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
+net.minecraft.tags.Tag -> adf:
+    24:24:com.mojang.serialization.Codec codec(java.util.function.Supplier) -> a
+    boolean contains(java.lang.Object) -> a
+    java.util.List getValues() -> b
+    35:36:java.lang.Object getRandomElement(java.util.Random) -> a
+    208:208:net.minecraft.tags.Tag fromSet(java.util.Set) -> b
+    26:26:com.mojang.serialization.DataResult lambda$codec$3(java.util.function.Supplier,net.minecraft.tags.Tag) -> a
+    26:26:com.mojang.serialization.DataResult lambda$null$2(net.minecraft.tags.Tag) -> a
+    25:25:com.mojang.serialization.DataResult lambda$codec$1(java.util.function.Supplier,net.minecraft.resources.ResourceLocation) -> a
+    25:25:com.mojang.serialization.DataResult lambda$null$0(net.minecraft.resources.ResourceLocation) -> a
+net.minecraft.tags.Tag$1 -> adf$1:
+net.minecraft.tags.Tag$Builder -> adf$a:
+    java.util.List entries -> a
+    62:63:void <init>() -> <init>
+    66:66:net.minecraft.tags.Tag$Builder tag() -> a
+    70:71:net.minecraft.tags.Tag$Builder add(net.minecraft.tags.Tag$BuilderEntry) -> a
+    75:75:net.minecraft.tags.Tag$Builder add(net.minecraft.tags.Tag$Entry,java.lang.String) -> a
+    79:79:net.minecraft.tags.Tag$Builder addElement(net.minecraft.resources.ResourceLocation,java.lang.String) -> a
+    83:83:net.minecraft.tags.Tag$Builder addTag(net.minecraft.resources.ResourceLocation,java.lang.String) -> b
+    87:93:java.util.Optional build(java.util.function.Function,java.util.function.Function) -> a
+    97:97:java.util.stream.Stream getEntries() -> b
+    101:101:java.util.stream.Stream getUnresolvedEntries(java.util.function.Function,java.util.function.Function) -> b
+    105:123:net.minecraft.tags.Tag$Builder addFromJson(com.google.gson.JsonObject,java.lang.String) -> a
+    127:137:com.google.gson.JsonObject serializeToJson() -> c
+    122:122:void lambda$addFromJson$2(java.lang.String,net.minecraft.tags.Tag$Entry) -> a
+    101:101:boolean lambda$getUnresolvedEntries$1(java.util.function.Function,java.util.function.Function,net.minecraft.tags.Tag$BuilderEntry) -> a
+    101:101:void lambda$null$0(java.lang.Object) -> a
+net.minecraft.tags.Tag$BuilderEntry -> adf$b:
+    net.minecraft.tags.Tag$Entry entry -> a
+    java.lang.String source -> b
+    43:46:void <init>(net.minecraft.tags.Tag$Entry,java.lang.String) -> <init>
+    49:49:net.minecraft.tags.Tag$Entry getEntry() -> a
+    53:53:java.lang.String getSource() -> b
+    58:58:java.lang.String toString() -> toString
+    39:39:void <init>(net.minecraft.tags.Tag$Entry,java.lang.String,net.minecraft.tags.Tag$1) -> <init>
+net.minecraft.tags.Tag$ElementEntry -> adf$c:
+    net.minecraft.resources.ResourceLocation id -> a
+    150:152:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
+    156:161:boolean build(java.util.function.Function,java.util.function.Function,java.util.function.Consumer) -> a
+    166:167:void serializeTo(com.google.gson.JsonArray) -> a
+    171:171:java.lang.String toString() -> toString
+net.minecraft.tags.Tag$Entry -> adf$d:
+    boolean build(java.util.function.Function,java.util.function.Function,java.util.function.Consumer) -> a
+    void serializeTo(com.google.gson.JsonArray) -> a
+net.minecraft.tags.Tag$Named -> adf$e:
+    net.minecraft.resources.ResourceLocation getName() -> a
+net.minecraft.tags.Tag$TagEntry -> adf$f:
+    net.minecraft.resources.ResourceLocation id -> a
+    178:180:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
+    184:189:boolean build(java.util.function.Function,java.util.function.Function,java.util.function.Consumer) -> a
+    194:195:void serializeTo(com.google.gson.JsonArray) -> a
+    199:199:java.lang.String toString() -> toString
+net.minecraft.tags.TagCollection -> adg:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.google.gson.Gson GSON -> b
     int PATH_SUFFIX_LENGTH -> c
-    java.util.Map tags -> d
-    java.util.function.Function idToValue -> e
-    java.lang.String directory -> f
-    boolean ordered -> g
+    net.minecraft.tags.Tag empty -> d
+    com.google.common.collect.BiMap tags -> e
+    java.util.function.Function idToValue -> f
+    java.lang.String directory -> g
     java.lang.String name -> h
-    39:50:void <init>(java.util.function.Function,java.lang.String,boolean,java.lang.String) -> <init>
-    54:54:net.minecraft.tags.Tag getTag(net.minecraft.resources.ResourceLocation) -> a
-    58:62:net.minecraft.tags.Tag getTagOrEmpty(net.minecraft.resources.ResourceLocation) -> b
-    66:66:boolean hasTag(net.minecraft.resources.ResourceLocation) -> c
-    70:70:java.util.Collection getAvailableTags() -> a
-    74:80:java.util.Collection getMatchingTags(java.lang.Object) -> a
-    84:84:java.util.concurrent.CompletableFuture prepare(net.minecraft.server.packs.resources.ResourceManager,java.util.concurrent.Executor) -> a
-    116:140:void load(java.util.Map) -> a
-    143:144:void replace(java.util.Map) -> b
-    147:147:java.util.Map getAllTags() -> b
-    136:136:void lambda$load$5(java.util.Map,net.minecraft.resources.ResourceLocation,net.minecraft.tags.Tag$Builder) -> a
-    131:131:void lambda$load$4(net.minecraft.resources.ResourceLocation,net.minecraft.tags.Tag$Builder) -> a
-    85:111:java.util.Map lambda$prepare$3(net.minecraft.server.packs.resources.ResourceManager) -> a
-    98:98:net.minecraft.tags.Tag$Builder lambda$null$2(net.minecraft.resources.ResourceLocation) -> d
-    98:98:void lambda$null$1(net.minecraft.tags.Tag$Builder) -> a
-    87:87:boolean lambda$null$0(java.lang.String) -> a
-    34:37:void <clinit>() -> <clinit>
-net.minecraft.tags.TagManager -> abb:
+    42:53:void <init>(java.util.function.Function,java.lang.String,java.lang.String) -> <init>
+    57:57:net.minecraft.tags.Tag getTag(net.minecraft.resources.ResourceLocation) -> a
+    61:61:net.minecraft.tags.Tag getTagOrEmpty(net.minecraft.resources.ResourceLocation) -> b
+    66:66:net.minecraft.resources.ResourceLocation getId(net.minecraft.tags.Tag$Named) -> a
+    71:74:net.minecraft.resources.ResourceLocation getId(net.minecraft.tags.Tag) -> a
+    78:82:net.minecraft.resources.ResourceLocation getIdOrThrow(net.minecraft.tags.Tag) -> b
+    86:86:boolean hasTag(net.minecraft.resources.ResourceLocation) -> c
+    90:90:java.util.Collection getAvailableTags() -> a
+    94:100:java.util.Collection getMatchingTags(java.lang.Object) -> a
+    104:104:java.util.concurrent.CompletableFuture prepare(net.minecraft.server.packs.resources.ResourceManager,java.util.concurrent.Executor) -> a
+    136:160:void load(java.util.Map) -> a
+    163:164:void replace(java.util.Map) -> b
+    167:167:java.util.Map getAllTags() -> b
+    156:156:void lambda$load$4(java.util.function.Function,java.util.function.Function,net.minecraft.resources.ResourceLocation,net.minecraft.tags.Tag$Builder) -> a
+    138:138:java.lang.Object lambda$load$3(net.minecraft.resources.ResourceLocation) -> d
+    105:131:java.util.Map lambda$prepare$2(net.minecraft.server.packs.resources.ResourceManager) -> a
+    118:118:net.minecraft.tags.Tag$Builder lambda$null$1(net.minecraft.resources.ResourceLocation) -> e
+    107:107:boolean lambda$null$0(java.lang.String) -> a
+    37:40:void <clinit>() -> <clinit>
+net.minecraft.tags.TagManager -> adh:
     net.minecraft.tags.SynchronizableTagCollection blocks -> a
     net.minecraft.tags.SynchronizableTagCollection items -> b
     net.minecraft.tags.SynchronizableTagCollection fluids -> c
     net.minecraft.tags.SynchronizableTagCollection entityTypes -> d
-    19:23:void <init>() -> <init>
-    26:26:net.minecraft.tags.SynchronizableTagCollection getBlocks() -> a
-    30:30:net.minecraft.tags.SynchronizableTagCollection getItems() -> b
-    34:34:net.minecraft.tags.SynchronizableTagCollection getFluids() -> c
-    38:38:net.minecraft.tags.SynchronizableTagCollection getEntityTypes() -> d
-    42:46:void serializeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
-    49:54:net.minecraft.tags.TagManager deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
-    59:67:java.util.concurrent.CompletableFuture reload(net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.ProfilerFiller,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
-    68:76:void lambda$reload$1(net.minecraft.tags.TagManager$Preparations) -> a
-    65:65:net.minecraft.tags.TagManager$Preparations lambda$reload$0(com.mojang.datafixers.util.Pair,com.mojang.datafixers.util.Pair) -> a
-net.minecraft.tags.TagManager$Preparations -> abb$a:
-    java.util.Map blocks -> a
-    java.util.Map items -> b
-    java.util.Map fluids -> c
-    java.util.Map entityTypes -> d
-    86:91:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map) -> <init>
-net.minecraft.tags.package-info -> abc:
-net.minecraft.util.BitStorage -> abd:
-    long[] data -> a
-    int bits -> b
-    long mask -> c
-    int size -> d
-    18:19:void <init>(int,int) -> <init>
-    21:33:void <init>(int,int,long[]) -> <init>
-    36:56:int getAndSet(int,int) -> a
-    60:74:void set(int,int) -> b
-    77:88:int get(int) -> a
-    93:93:long[] getRaw() -> a
-    97:97:int getSize() -> b
-    101:101:int getBits() -> c
-    105:132:void getAll(java.util.function.IntConsumer) -> a
-net.minecraft.util.ClassInstanceMultiMap -> abe:
+    22:26:void <init>() -> <init>
+    29:29:net.minecraft.tags.SynchronizableTagCollection getBlocks() -> a
+    33:33:net.minecraft.tags.SynchronizableTagCollection getItems() -> b
+    37:37:net.minecraft.tags.SynchronizableTagCollection getFluids() -> d
+    41:41:net.minecraft.tags.SynchronizableTagCollection getEntityTypes() -> e
+    45:49:void serializeToNetwork(net.minecraft.network.FriendlyByteBuf) -> a
+    52:57:net.minecraft.tags.TagManager deserializeFromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
+    62:68:java.util.concurrent.CompletableFuture reload(net.minecraft.server.packs.resources.PreparableReloadListener$PreparationBarrier,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.ProfilerFiller,java.util.concurrent.Executor,java.util.concurrent.Executor) -> a
+    87:92:void bindToGlobal() -> f
+    69:83:void lambda$reload$1(java.util.concurrent.CompletableFuture,java.util.concurrent.CompletableFuture,java.util.concurrent.CompletableFuture,java.util.concurrent.CompletableFuture,java.lang.Void) -> a
+    81:81:java.lang.String lambda$null$0(java.util.Map$Entry) -> a
+net.minecraft.tags.package-info -> adi:
+net.minecraft.util.BitStorage -> adj:
+    int[] MAGIC -> a
+    long[] data -> b
+    int bits -> c
+    long mask -> d
+    int size -> e
+    int valuesPerLong -> f
+    int divideMul -> g
+    int divideAdd -> h
+    int divideShift -> i
+    92:93:void <init>(int,int) -> <init>
+    95:117:void <init>(int,int,long[]) -> <init>
+    120:122:int cellIndex(int) -> b
+    126:136:int getAndSet(int,int) -> a
+    140:148:void set(int,int) -> b
+    151:157:int get(int) -> a
+    161:161:long[] getRaw() -> a
+    165:165:int getSize() -> b
+    169:169:int getBits() -> c
+    173:183:void getAll(java.util.function.IntConsumer) -> a
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.util.ClassInstanceMultiMap -> adk:
     java.util.Map byClass -> a
     java.lang.Class baseClass -> b
     java.util.List allInstances -> c
-    16:23:void <init>(java.lang.Class) -> <init>
-    27:33:boolean add(java.lang.Object) -> add
-    38:45:boolean remove(java.lang.Object) -> remove
-    50:50:boolean contains(java.lang.Object) -> contains
-    55:59:java.util.Collection find(java.lang.Class) -> a
-    64:67:java.util.Iterator iterator() -> iterator
-    72:72:int size() -> size
-    58:58:java.util.List lambda$find$0(java.lang.Class) -> b
-net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap -> abf:
+    17:25:void <init>(java.lang.Class) -> <init>
+    29:35:boolean add(java.lang.Object) -> add
+    40:47:boolean remove(java.lang.Object) -> remove
+    52:52:boolean contains(java.lang.Object) -> contains
+    57:61:java.util.Collection find(java.lang.Class) -> a
+    66:69:java.util.Iterator iterator() -> iterator
+    73:73:java.util.List getAllInstances() -> a
+    78:78:int size() -> size
+    60:60:java.util.List lambda$find$0(java.lang.Class) -> b
+net.minecraft.util.Codecs -> adl:
+    20:20:void <init>() -> <init>
+    22:22:java.util.function.Function checkRange(int,int) -> b
+    31:32:com.mojang.serialization.Codec intRange(int,int) -> a
+    36:36:java.util.function.Function checkRange(double,double) -> b
+    45:46:com.mojang.serialization.Codec doubleRange(double,double) -> a
+    50:51:com.mojang.serialization.MapCodec withName(net.minecraft.resources.ResourceKey,com.mojang.serialization.MapCodec) -> a
+    63:63:com.mojang.serialization.MapCodec mapResult(com.mojang.serialization.MapCodec,net.minecraft.util.Codecs$ResultFunction) -> a
+    87:87:com.mojang.serialization.MapCodec withDefault(com.mojang.serialization.MapCodec,java.util.function.Consumer,java.util.function.Supplier) -> a
+    106:106:com.mojang.serialization.MapCodec setPartial(com.mojang.serialization.MapCodec,java.util.function.Supplier) -> a
+    37:40:com.mojang.serialization.DataResult lambda$checkRange$1(double,double,java.lang.Double) -> a
+    23:26:com.mojang.serialization.DataResult lambda$checkRange$0(int,int,java.lang.Integer) -> a
+net.minecraft.util.Codecs$1 -> adl$1:
+    com.mojang.serialization.MapCodec val$codec -> a
+    net.minecraft.util.Codecs$ResultFunction val$function -> b
+    63:63:void <init>(com.mojang.serialization.MapCodec,net.minecraft.util.Codecs$ResultFunction) -> <init>
+    66:66:java.util.stream.Stream keys(com.mojang.serialization.DynamicOps) -> keys
+    71:71:com.mojang.serialization.RecordBuilder encode(java.lang.Object,com.mojang.serialization.DynamicOps,com.mojang.serialization.RecordBuilder) -> encode
+    76:76:com.mojang.serialization.DataResult decode(com.mojang.serialization.DynamicOps,com.mojang.serialization.MapLike) -> decode
+    81:81:java.lang.String toString() -> toString
+net.minecraft.util.Codecs$2 -> adl$2:
+    java.util.function.Consumer val$onError -> a
+    java.util.function.Supplier val$value -> b
+    87:87:void <init>(java.util.function.Consumer,java.util.function.Supplier) -> <init>
+    90:90:com.mojang.serialization.DataResult apply(com.mojang.serialization.DynamicOps,com.mojang.serialization.MapLike,com.mojang.serialization.DataResult) -> a
+    95:95:com.mojang.serialization.RecordBuilder coApply(com.mojang.serialization.DynamicOps,java.lang.Object,com.mojang.serialization.RecordBuilder) -> a
+    100:100:java.lang.String toString() -> toString
+net.minecraft.util.Codecs$3 -> adl$3:
+    java.util.function.Supplier val$value -> a
+    106:106:void <init>(java.util.function.Supplier) -> <init>
+    109:109:com.mojang.serialization.DataResult apply(com.mojang.serialization.DynamicOps,com.mojang.serialization.MapLike,com.mojang.serialization.DataResult) -> a
+    114:114:com.mojang.serialization.RecordBuilder coApply(com.mojang.serialization.DynamicOps,java.lang.Object,com.mojang.serialization.RecordBuilder) -> a
+    120:120:java.lang.String toString() -> toString
+net.minecraft.util.Codecs$ResultFunction -> adl$a:
+    com.mojang.serialization.DataResult apply(com.mojang.serialization.DynamicOps,com.mojang.serialization.MapLike,com.mojang.serialization.DataResult) -> a
+    com.mojang.serialization.RecordBuilder coApply(com.mojang.serialization.DynamicOps,java.lang.Object,com.mojang.serialization.RecordBuilder) -> a
+net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap -> adm:
     java.lang.Object EMPTY_SLOT -> a
     java.lang.Object[] keys -> b
     int[] values -> c
@@ -33367,7 +35931,7 @@ net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap -> abf:
     174:178:void clear() -> a
     181:181:int size() -> b
     13:13:void <clinit>() -> <clinit>
-net.minecraft.util.Crypt -> abg:
+net.minecraft.util.Crypt -> adn:
     org.apache.logging.log4j.Logger LOGGER -> a
     29:29:void <init>() -> <init>
     41:45:javax.crypto.SecretKey generateSecretKey() -> a
@@ -33382,7 +35946,7 @@ net.minecraft.util.Crypt -> abg:
     129:140:javax.crypto.Cipher setupCipher(int,java.lang.String,java.security.Key) -> a
     145:149:javax.crypto.Cipher getCipher(int,java.security.Key) -> a
     30:30:void <clinit>() -> <clinit>
-net.minecraft.util.CsvOutput -> abh:
+net.minecraft.util.CsvOutput -> ado:
     java.io.Writer output -> a
     int columnCount -> b
     19:23:void <init>(java.io.Writer,java.util.List) -> <init>
@@ -33391,18 +35955,48 @@ net.minecraft.util.CsvOutput -> abh:
     38:39:void writeLine(java.util.stream.Stream) -> a
     42:42:java.lang.String getStringValue(java.lang.Object) -> a
     13:13:void <init>(java.io.Writer,java.util.List,net.minecraft.util.CsvOutput$1) -> <init>
-net.minecraft.util.CsvOutput$1 -> abh$1:
-net.minecraft.util.CsvOutput$Builder -> abh$a:
+net.minecraft.util.CsvOutput$1 -> ado$1:
+net.minecraft.util.CsvOutput$Builder -> ado$a:
     java.util.List headers -> a
     45:46:void <init>() -> <init>
     49:50:net.minecraft.util.CsvOutput$Builder addColumn(java.lang.String) -> a
     54:54:net.minecraft.util.CsvOutput build(java.io.Writer) -> a
-net.minecraft.util.Deserializer -> abi:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    java.lang.Object deserialize(com.mojang.datafixers.Dynamic) -> deserialize
-    15:23:java.lang.Object deserialize(com.mojang.datafixers.Dynamic,net.minecraft.core.Registry,java.lang.String,java.lang.Object) -> a
-    10:10:void <clinit>() -> <clinit>
-net.minecraft.util.FrameTimer -> abj:
+net.minecraft.util.CubicSampler -> net.minecraft.util.CubicSampler:
+    double[] GAUSSIAN_SAMPLE_KERNEL -> a
+    13:13:void <init>() -> <init>
+    17:48:net.minecraft.world.phys.Vec3 gaussianSampleVec3(net.minecraft.world.phys.Vec3,net.minecraft.util.CubicSampler$Vec3Fetcher) -> a
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.util.CubicSampler$Vec3Fetcher -> net.minecraft.util.CubicSampler$Vec3Fetcher:
+    net.minecraft.world.phys.Vec3 fetch(int,int,int) -> fetch
+net.minecraft.util.DirectoryLock -> adp:
+    java.nio.channels.FileChannel lockFile -> a
+    java.nio.channels.FileLock lock -> b
+    java.nio.ByteBuffer DUMMY -> c
+    31:53:net.minecraft.util.DirectoryLock create(java.nio.file.Path) -> a
+    57:60:void <init>(java.nio.channels.FileChannel,java.nio.channels.FileLock) -> <init>
+    65:73:void close() -> close
+    76:76:boolean isValid() -> a
+    80:88:boolean isLocked(java.nio.file.Path) -> b
+    24:28:void <clinit>() -> <clinit>
+net.minecraft.util.DirectoryLock$LockException -> adp$a:
+    94:95:void <init>(java.nio.file.Path,java.lang.String) -> <init>
+    98:98:net.minecraft.util.DirectoryLock$LockException alreadyLocked(java.nio.file.Path) -> a
+net.minecraft.util.ExceptionCollector -> adq:
+    java.lang.Throwable result -> a
+    5:5:void <init>() -> <init>
+    10:15:void add(java.lang.Throwable) -> a
+    18:21:void throwIfPresent() -> a
+net.minecraft.util.FastColor -> adr:
+    3:3:void <init>() -> <init>
+net.minecraft.util.FastColor$ARGB32 -> adr$a:
+    4:4:void <init>() -> <init>
+    6:6:int alpha(int) -> a
+    10:10:int red(int) -> b
+    14:14:int green(int) -> c
+    18:18:int blue(int) -> d
+    22:22:int color(int,int,int,int) -> a
+    26:30:int multiply(int,int) -> a
+net.minecraft.util.FrameTimer -> ads:
     long[] loggedTimes -> a
     int logStart -> b
     int logLength -> c
@@ -33416,80 +36010,85 @@ net.minecraft.util.FrameTimer -> abj:
     56:56:int getLogEnd() -> b
     60:60:int wrapIndex(int) -> b
     64:64:long[] getLog() -> c
-net.minecraft.util.GsonHelper -> abk:
+net.minecraft.util.GsonHelper -> adt:
     com.google.gson.Gson GSON -> a
-    27:27:void <init>() -> <init>
-    31:34:boolean isStringValue(com.google.gson.JsonObject,java.lang.String) -> a
-    38:41:boolean isStringValue(com.google.gson.JsonElement) -> a
-    45:48:boolean isNumberValue(com.google.gson.JsonObject,java.lang.String) -> b
-    52:55:boolean isNumberValue(com.google.gson.JsonElement) -> b
-    59:62:boolean isBooleanValue(com.google.gson.JsonObject,java.lang.String) -> c
-    66:69:boolean isBooleanValue(com.google.gson.JsonElement) -> c
-    73:76:boolean isArrayNode(com.google.gson.JsonObject,java.lang.String) -> d
-    80:83:boolean isObjectNode(com.google.gson.JsonObject,java.lang.String) -> e
-    87:90:boolean isValidPrimitive(com.google.gson.JsonObject,java.lang.String) -> f
-    94:97:boolean isValidNode(com.google.gson.JsonObject,java.lang.String) -> g
-    101:104:java.lang.String convertToString(com.google.gson.JsonElement,java.lang.String) -> a
-    109:112:java.lang.String getAsString(com.google.gson.JsonObject,java.lang.String) -> h
-    117:120:java.lang.String getAsString(com.google.gson.JsonObject,java.lang.String,java.lang.String) -> a
-    125:130:net.minecraft.world.item.Item convertToItem(com.google.gson.JsonElement,java.lang.String) -> b
-    135:138:net.minecraft.world.item.Item getAsItem(com.google.gson.JsonObject,java.lang.String) -> i
-    143:146:net.minecraft.world.item.Item getAsItem(com.google.gson.JsonObject,java.lang.String,net.minecraft.world.item.Item) -> a
-    151:154:boolean convertToBoolean(com.google.gson.JsonElement,java.lang.String) -> c
-    159:162:boolean getAsBoolean(com.google.gson.JsonObject,java.lang.String) -> j
-    167:170:boolean getAsBoolean(com.google.gson.JsonObject,java.lang.String,boolean) -> a
-    175:178:double convertToDouble(com.google.gson.JsonElement,java.lang.String) -> d
-    183:186:double getAsDouble(com.google.gson.JsonObject,java.lang.String) -> k
-    191:194:double getAsDouble(com.google.gson.JsonObject,java.lang.String,double) -> a
-    199:202:float convertToFloat(com.google.gson.JsonElement,java.lang.String) -> e
-    207:210:float getAsFloat(com.google.gson.JsonObject,java.lang.String) -> l
-    215:218:float getAsFloat(com.google.gson.JsonObject,java.lang.String,float) -> a
-    223:226:long convertToLong(com.google.gson.JsonElement,java.lang.String) -> f
-    231:234:long getAsLong(com.google.gson.JsonObject,java.lang.String) -> m
-    239:242:long getAsLong(com.google.gson.JsonObject,java.lang.String,long) -> a
-    247:250:int convertToInt(com.google.gson.JsonElement,java.lang.String) -> g
-    255:258:int getAsInt(com.google.gson.JsonObject,java.lang.String) -> n
-    263:266:int getAsInt(com.google.gson.JsonObject,java.lang.String,int) -> a
-    271:274:byte convertToByte(com.google.gson.JsonElement,java.lang.String) -> h
-    279:282:byte getAsByte(com.google.gson.JsonObject,java.lang.String) -> o
-    287:290:byte getAsByte(com.google.gson.JsonObject,java.lang.String,byte) -> a
-    295:298:char convertToCharacter(com.google.gson.JsonElement,java.lang.String) -> i
-    303:306:char getAsCharacter(com.google.gson.JsonObject,java.lang.String) -> p
-    311:314:char getAsCharacter(com.google.gson.JsonObject,java.lang.String,char) -> a
-    319:322:java.math.BigDecimal convertToBigDecimal(com.google.gson.JsonElement,java.lang.String) -> j
-    327:330:java.math.BigDecimal getAsBigDecimal(com.google.gson.JsonObject,java.lang.String) -> q
-    335:338:java.math.BigDecimal getAsBigDecimal(com.google.gson.JsonObject,java.lang.String,java.math.BigDecimal) -> a
-    343:346:java.math.BigInteger convertToBigInteger(com.google.gson.JsonElement,java.lang.String) -> k
-    351:354:java.math.BigInteger getAsBigInteger(com.google.gson.JsonObject,java.lang.String) -> r
-    359:362:java.math.BigInteger getAsBigInteger(com.google.gson.JsonObject,java.lang.String,java.math.BigInteger) -> a
-    367:370:short convertToShort(com.google.gson.JsonElement,java.lang.String) -> l
-    375:378:short getAsShort(com.google.gson.JsonObject,java.lang.String) -> s
-    383:386:short getAsShort(com.google.gson.JsonObject,java.lang.String,short) -> a
-    391:394:com.google.gson.JsonObject convertToJsonObject(com.google.gson.JsonElement,java.lang.String) -> m
-    399:402:com.google.gson.JsonObject getAsJsonObject(com.google.gson.JsonObject,java.lang.String) -> t
-    407:410:com.google.gson.JsonObject getAsJsonObject(com.google.gson.JsonObject,java.lang.String,com.google.gson.JsonObject) -> a
-    415:418:com.google.gson.JsonArray convertToJsonArray(com.google.gson.JsonElement,java.lang.String) -> n
-    423:426:com.google.gson.JsonArray getAsJsonArray(com.google.gson.JsonObject,java.lang.String) -> u
-    432:435:com.google.gson.JsonArray getAsJsonArray(com.google.gson.JsonObject,java.lang.String,com.google.gson.JsonArray) -> a
-    440:443:java.lang.Object convertToObject(com.google.gson.JsonElement,java.lang.String,com.google.gson.JsonDeserializationContext,java.lang.Class) -> a
-    448:451:java.lang.Object getAsObject(com.google.gson.JsonObject,java.lang.String,com.google.gson.JsonDeserializationContext,java.lang.Class) -> a
-    456:459:java.lang.Object getAsObject(com.google.gson.JsonObject,java.lang.String,java.lang.Object,com.google.gson.JsonDeserializationContext,java.lang.Class) -> a
-    464:486:java.lang.String getType(com.google.gson.JsonElement) -> d
-    492:496:java.lang.Object fromJson(com.google.gson.Gson,java.io.Reader,java.lang.Class,boolean) -> a
-    504:508:java.lang.Object fromJson(com.google.gson.Gson,java.io.Reader,java.lang.reflect.Type,boolean) -> a
-    514:514:java.lang.Object fromJson(com.google.gson.Gson,java.lang.String,java.lang.reflect.Type,boolean) -> a
-    519:519:java.lang.Object fromJson(com.google.gson.Gson,java.lang.String,java.lang.Class,boolean) -> a
-    524:524:java.lang.Object fromJson(com.google.gson.Gson,java.io.Reader,java.lang.reflect.Type) -> a
-    529:529:java.lang.Object fromJson(com.google.gson.Gson,java.lang.String,java.lang.reflect.Type) -> a
-    534:534:java.lang.Object fromJson(com.google.gson.Gson,java.io.Reader,java.lang.Class) -> a
-    539:539:java.lang.Object fromJson(com.google.gson.Gson,java.lang.String,java.lang.Class) -> a
-    543:543:com.google.gson.JsonObject parse(java.lang.String,boolean) -> a
-    547:547:com.google.gson.JsonObject parse(java.io.Reader,boolean) -> a
-    551:551:com.google.gson.JsonObject parse(java.lang.String) -> a
-    555:555:com.google.gson.JsonObject parse(java.io.Reader) -> a
-    128:128:com.google.gson.JsonSyntaxException lambda$convertToItem$0(java.lang.String,java.lang.String) -> a
-    28:28:void <clinit>() -> <clinit>
-net.minecraft.util.HttpUtil -> abl:
+    26:26:void <init>() -> <init>
+    30:33:boolean isStringValue(com.google.gson.JsonObject,java.lang.String) -> a
+    37:40:boolean isStringValue(com.google.gson.JsonElement) -> a
+    44:47:boolean isNumberValue(com.google.gson.JsonObject,java.lang.String) -> b
+    51:54:boolean isNumberValue(com.google.gson.JsonElement) -> b
+    58:61:boolean isBooleanValue(com.google.gson.JsonObject,java.lang.String) -> c
+    65:68:boolean isBooleanValue(com.google.gson.JsonElement) -> c
+    72:75:boolean isArrayNode(com.google.gson.JsonObject,java.lang.String) -> d
+    79:82:boolean isObjectNode(com.google.gson.JsonObject,java.lang.String) -> e
+    86:89:boolean isValidPrimitive(com.google.gson.JsonObject,java.lang.String) -> f
+    93:96:boolean isValidNode(com.google.gson.JsonObject,java.lang.String) -> g
+    100:103:java.lang.String convertToString(com.google.gson.JsonElement,java.lang.String) -> a
+    108:111:java.lang.String getAsString(com.google.gson.JsonObject,java.lang.String) -> h
+    116:119:java.lang.String getAsString(com.google.gson.JsonObject,java.lang.String,java.lang.String) -> a
+    124:129:net.minecraft.world.item.Item convertToItem(com.google.gson.JsonElement,java.lang.String) -> b
+    134:137:net.minecraft.world.item.Item getAsItem(com.google.gson.JsonObject,java.lang.String) -> i
+    142:145:net.minecraft.world.item.Item getAsItem(com.google.gson.JsonObject,java.lang.String,net.minecraft.world.item.Item) -> a
+    150:153:boolean convertToBoolean(com.google.gson.JsonElement,java.lang.String) -> c
+    158:161:boolean getAsBoolean(com.google.gson.JsonObject,java.lang.String) -> j
+    166:169:boolean getAsBoolean(com.google.gson.JsonObject,java.lang.String,boolean) -> a
+    174:177:double convertToDouble(com.google.gson.JsonElement,java.lang.String) -> d
+    182:185:double getAsDouble(com.google.gson.JsonObject,java.lang.String) -> k
+    190:193:double getAsDouble(com.google.gson.JsonObject,java.lang.String,double) -> a
+    198:201:float convertToFloat(com.google.gson.JsonElement,java.lang.String) -> e
+    206:209:float getAsFloat(com.google.gson.JsonObject,java.lang.String) -> l
+    214:217:float getAsFloat(com.google.gson.JsonObject,java.lang.String,float) -> a
+    222:225:long convertToLong(com.google.gson.JsonElement,java.lang.String) -> f
+    230:233:long getAsLong(com.google.gson.JsonObject,java.lang.String) -> m
+    238:241:long getAsLong(com.google.gson.JsonObject,java.lang.String,long) -> a
+    246:249:int convertToInt(com.google.gson.JsonElement,java.lang.String) -> g
+    254:257:int getAsInt(com.google.gson.JsonObject,java.lang.String) -> n
+    262:265:int getAsInt(com.google.gson.JsonObject,java.lang.String,int) -> a
+    270:273:byte convertToByte(com.google.gson.JsonElement,java.lang.String) -> h
+    278:281:byte getAsByte(com.google.gson.JsonObject,java.lang.String) -> o
+    286:289:byte getAsByte(com.google.gson.JsonObject,java.lang.String,byte) -> a
+    294:297:char convertToCharacter(com.google.gson.JsonElement,java.lang.String) -> i
+    302:305:char getAsCharacter(com.google.gson.JsonObject,java.lang.String) -> p
+    310:313:char getAsCharacter(com.google.gson.JsonObject,java.lang.String,char) -> a
+    318:321:java.math.BigDecimal convertToBigDecimal(com.google.gson.JsonElement,java.lang.String) -> j
+    326:329:java.math.BigDecimal getAsBigDecimal(com.google.gson.JsonObject,java.lang.String) -> q
+    334:337:java.math.BigDecimal getAsBigDecimal(com.google.gson.JsonObject,java.lang.String,java.math.BigDecimal) -> a
+    342:345:java.math.BigInteger convertToBigInteger(com.google.gson.JsonElement,java.lang.String) -> k
+    350:353:java.math.BigInteger getAsBigInteger(com.google.gson.JsonObject,java.lang.String) -> r
+    358:361:java.math.BigInteger getAsBigInteger(com.google.gson.JsonObject,java.lang.String,java.math.BigInteger) -> a
+    366:369:short convertToShort(com.google.gson.JsonElement,java.lang.String) -> l
+    374:377:short getAsShort(com.google.gson.JsonObject,java.lang.String) -> s
+    382:385:short getAsShort(com.google.gson.JsonObject,java.lang.String,short) -> a
+    390:393:com.google.gson.JsonObject convertToJsonObject(com.google.gson.JsonElement,java.lang.String) -> m
+    398:401:com.google.gson.JsonObject getAsJsonObject(com.google.gson.JsonObject,java.lang.String) -> t
+    406:409:com.google.gson.JsonObject getAsJsonObject(com.google.gson.JsonObject,java.lang.String,com.google.gson.JsonObject) -> a
+    414:417:com.google.gson.JsonArray convertToJsonArray(com.google.gson.JsonElement,java.lang.String) -> n
+    422:425:com.google.gson.JsonArray getAsJsonArray(com.google.gson.JsonObject,java.lang.String) -> u
+    431:434:com.google.gson.JsonArray getAsJsonArray(com.google.gson.JsonObject,java.lang.String,com.google.gson.JsonArray) -> a
+    439:442:java.lang.Object convertToObject(com.google.gson.JsonElement,java.lang.String,com.google.gson.JsonDeserializationContext,java.lang.Class) -> a
+    447:450:java.lang.Object getAsObject(com.google.gson.JsonObject,java.lang.String,com.google.gson.JsonDeserializationContext,java.lang.Class) -> a
+    455:458:java.lang.Object getAsObject(com.google.gson.JsonObject,java.lang.String,java.lang.Object,com.google.gson.JsonDeserializationContext,java.lang.Class) -> a
+    463:485:java.lang.String getType(com.google.gson.JsonElement) -> d
+    491:495:java.lang.Object fromJson(com.google.gson.Gson,java.io.Reader,java.lang.Class,boolean) -> a
+    502:506:java.lang.Object fromJson(com.google.gson.Gson,java.io.Reader,com.google.gson.reflect.TypeToken,boolean) -> a
+    512:512:java.lang.Object fromJson(com.google.gson.Gson,java.lang.String,com.google.gson.reflect.TypeToken,boolean) -> a
+    517:517:java.lang.Object fromJson(com.google.gson.Gson,java.lang.String,java.lang.Class,boolean) -> a
+    522:522:java.lang.Object fromJson(com.google.gson.Gson,java.io.Reader,com.google.gson.reflect.TypeToken) -> a
+    527:527:java.lang.Object fromJson(com.google.gson.Gson,java.lang.String,com.google.gson.reflect.TypeToken) -> a
+    532:532:java.lang.Object fromJson(com.google.gson.Gson,java.io.Reader,java.lang.Class) -> a
+    537:537:java.lang.Object fromJson(com.google.gson.Gson,java.lang.String,java.lang.Class) -> a
+    541:541:com.google.gson.JsonObject parse(java.lang.String,boolean) -> a
+    545:545:com.google.gson.JsonObject parse(java.io.Reader,boolean) -> a
+    549:549:com.google.gson.JsonObject parse(java.lang.String) -> a
+    553:553:com.google.gson.JsonObject parse(java.io.Reader) -> a
+    127:127:com.google.gson.JsonSyntaxException lambda$convertToItem$0(java.lang.String,java.lang.String) -> a
+    27:27:void <clinit>() -> <clinit>
+net.minecraft.util.HeapDumper -> adu:
+    com.sun.management.HotSpotDiagnosticMXBean hotspotMBean -> a
+    10:10:void <init>() -> <init>
+    16:24:com.sun.management.HotSpotDiagnosticMXBean getHotspotMBean() -> a
+    29:33:void dumpHeap(java.lang.String,boolean) -> a
+net.minecraft.util.HttpUtil -> adv:
     org.apache.logging.log4j.Logger LOGGER -> b
     com.google.common.util.concurrent.ListeningExecutorService DOWNLOAD_EXECUTOR -> a
     38:39:void <init>() -> <init>
@@ -33500,7 +36099,7 @@ net.minecraft.util.HttpUtil -> abl:
     225:228:int getAvailablePort() -> a
     116:220:java.lang.Object lambda$downloadTo$0(net.minecraft.util.ProgressListener,java.lang.String,java.net.Proxy,java.util.Map,java.io.File,int) -> a
     35:36:void <clinit>() -> <clinit>
-net.minecraft.util.InsensitiveStringMap -> abm:
+net.minecraft.util.InsensitiveStringMap -> adw:
     java.util.Map map -> a
     10:11:void <init>() -> <init>
     15:15:int size() -> size
@@ -33516,12 +36115,21 @@ net.minecraft.util.InsensitiveStringMap -> abm:
     67:67:java.util.Collection values() -> values
     72:72:java.util.Set entrySet() -> entrySet
     10:10:java.lang.Object put(java.lang.Object,java.lang.Object) -> put
-net.minecraft.util.LazyLoadedValue -> abn:
+net.minecraft.util.IntRange -> adx:
+    int minInclusive -> a
+    int maxInclusive -> b
+    21:27:void <init>(int,int) -> <init>
+    30:30:net.minecraft.util.IntRange of(int,int) -> a
+    34:37:int randomValue(java.util.Random) -> a
+    41:41:int getMinInclusive() -> a
+    45:45:int getMaxInclusive() -> b
+    50:50:java.lang.String toString() -> toString
+net.minecraft.util.LazyLoadedValue -> ady:
     java.util.function.Supplier factory -> a
     java.lang.Object value -> b
     9:11:void <init>(java.util.function.Supplier) -> <init>
     14:20:java.lang.Object get() -> a
-net.minecraft.util.LimitedCapacityList -> abo:
+net.minecraft.util.LimitedCapacityList -> adz:
     java.lang.Object[] items -> a
     java.lang.Class clazz -> b
     java.util.concurrent.locks.ReadWriteLock locks -> c
@@ -33532,21 +36140,21 @@ net.minecraft.util.LimitedCapacityList -> abo:
     34:37:int getSize() -> a
     41:44:int getMaxSize() -> b
     49:61:java.lang.Object[] getItems() -> c
-net.minecraft.util.LinearCongruentialGenerator -> abp:
+net.minecraft.util.LinearCongruentialGenerator -> aea:
     3:3:void <init>() -> <init>
     8:10:long next(long,long) -> a
-net.minecraft.util.LowerCaseEnumTypeAdapterFactory -> abq:
+net.minecraft.util.LowerCaseEnumTypeAdapterFactory -> aeb:
     20:20:void <init>() -> <init>
     24:34:com.google.gson.TypeAdapter create(com.google.gson.Gson,com.google.gson.reflect.TypeToken) -> create
     58:61:java.lang.String toLowercase(java.lang.Object) -> a
     20:20:java.lang.String access$000(net.minecraft.util.LowerCaseEnumTypeAdapterFactory,java.lang.Object) -> a
-net.minecraft.util.LowerCaseEnumTypeAdapterFactory$1 -> abq$1:
+net.minecraft.util.LowerCaseEnumTypeAdapterFactory$1 -> aeb$1:
     java.util.Map val$lowercaseToConstant -> a
     net.minecraft.util.LowerCaseEnumTypeAdapterFactory this$0 -> b
     34:34:void <init>(net.minecraft.util.LowerCaseEnumTypeAdapterFactory,java.util.Map) -> <init>
     37:42:void write(com.google.gson.stream.JsonWriter,java.lang.Object) -> write
     47:51:java.lang.Object read(com.google.gson.stream.JsonReader) -> read
-net.minecraft.util.Mth -> abr:
+net.minecraft.util.Mth -> aec:
     float SQRT_OF_TWO -> a
     float[] SIN -> b
     java.util.Random RANDOM -> c
@@ -33598,9 +36206,9 @@ net.minecraft.util.Mth -> abr:
     320:322:double getDouble(java.lang.String,double) -> a
     327:327:double getDouble(java.lang.String,double,double) -> a
     332:338:int smallestEncompassingPowerOfTwo(int) -> c
-    343:343:boolean isPowerOfTwo(int) -> g
-    352:353:int ceillog2(int) -> d
-    357:357:int log2(int) -> e
+    343:343:boolean isPowerOfTwo(int) -> d
+    352:353:int ceillog2(int) -> e
+    357:357:int log2(int) -> f
     362:377:int roundUp(int,int) -> c
     382:382:int color(float,float,float) -> e
     386:389:int color(int,int,int) -> b
@@ -33613,14 +36221,14 @@ net.minecraft.util.Mth -> abr:
     441:443:long getSeed(int,int,int) -> c
     447:449:java.util.UUID createInsecureUUID(java.util.Random) -> a
     453:453:java.util.UUID createInsecureUUID() -> a
-    457:457:double pct(double,double,double) -> c
+    457:457:double inverseLerp(double,double,double) -> c
     462:499:boolean rayIntersectsAABB(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB) -> a
     503:565:double atan2(double,double) -> d
     569:574:float fastInvSqrt(float) -> i
     578:583:double fastInvSqrt(double) -> i
     587:592:float fastInvCubeRoot(float) -> j
     613:662:int hsvToRgb(float,float,float) -> f
-    667:672:int murmurHash3Mixer(int) -> f
+    667:672:int murmurHash3Mixer(int) -> g
     676:681:long murmurHash3Mixer(long) -> a
     686:698:double[] cumulativeSum(double[]) -> a
     702:708:int getRandomForDistributionIntegral(java.util.Random,double[]) -> a
@@ -33638,36 +36246,37 @@ net.minecraft.util.Mth -> abr:
     831:831:float diffuseLight(float,float,float) -> i
     837:844:float rotlerp(float,float,float) -> j
     849:855:float rotWrap(double) -> l
+    867:867:float triangleWave(float,float) -> e
+    871:871:float square(float) -> k
+    875:875:double square(double) -> m
     37:40:void lambda$static$0(float[]) -> a
     32:610:void <clinit>() -> <clinit>
-net.minecraft.util.ProgressListener -> abs:
+net.minecraft.util.ProgressListener -> aed:
     void progressStartNoAbort(net.minecraft.network.chat.Component) -> a
     void progressStart(net.minecraft.network.chat.Component) -> b
     void progressStage(net.minecraft.network.chat.Component) -> c
     void progressStagePercentage(int) -> a
     void stop() -> a
-net.minecraft.util.RewindableStream -> abt:
+net.minecraft.util.RewindableStream -> aee:
     java.util.List cache -> a
     java.util.Spliterator source -> b
     16:21:void <init>(java.util.stream.Stream) -> <init>
     25:25:java.util.stream.Stream getStream() -> a
     15:15:java.util.List access$000(net.minecraft.util.RewindableStream) -> a
     15:15:java.util.Spliterator access$100(net.minecraft.util.RewindableStream) -> b
-net.minecraft.util.RewindableStream$1 -> abt$1:
+net.minecraft.util.RewindableStream$1 -> aee$1:
     int index -> b
     net.minecraft.util.RewindableStream this$0 -> a
     25:25:void <init>(net.minecraft.util.RewindableStream,long,int) -> <init>
     30:36:boolean tryAdvance(java.util.function.Consumer) -> tryAdvance
-net.minecraft.util.Serializable -> abu:
-    java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.util.SmoothDouble -> abv:
+net.minecraft.util.SmoothDouble -> aef:
     double targetValue -> a
     double remainingValue -> b
     double lastAmount -> c
     3:3:void <init>() -> <init>
     9:24:double getNewDeltaValue(double,double) -> a
     28:31:void reset() -> a
-net.minecraft.util.SortedArraySet -> abw:
+net.minecraft.util.SortedArraySet -> aeg:
     java.util.Comparator comparator -> a
     java.lang.Object[] contents -> b
     int size -> c
@@ -33699,8 +36308,8 @@ net.minecraft.util.SortedArraySet -> abw:
     18:18:int access$000(net.minecraft.util.SortedArraySet) -> a
     18:18:java.lang.Object[] access$100(net.minecraft.util.SortedArraySet) -> b
     18:18:void access$200(net.minecraft.util.SortedArraySet,int) -> a
-net.minecraft.util.SortedArraySet$1 -> abw$1:
-net.minecraft.util.SortedArraySet$ArrayIterator -> abw$a:
+net.minecraft.util.SortedArraySet$1 -> aeg$1:
+net.minecraft.util.SortedArraySet$ArrayIterator -> aeg$a:
     int index -> b
     int last -> c
     net.minecraft.util.SortedArraySet this$0 -> a
@@ -33709,9 +36318,32 @@ net.minecraft.util.SortedArraySet$ArrayIterator -> abw$a:
     173:177:java.lang.Object next() -> next
     182:188:void remove() -> remove
     162:162:void <init>(net.minecraft.util.SortedArraySet,net.minecraft.util.SortedArraySet$1) -> <init>
-net.minecraft.util.StringRepresentable -> abx:
-    java.lang.String getSerializedName() -> o
-net.minecraft.util.StringUtil -> aby:
+net.minecraft.util.StringRepresentable -> aeh:
+    java.lang.String getSerializedName() -> a
+    22:23:com.mojang.serialization.Codec fromEnum(java.util.function.Supplier,java.util.function.Function) -> a
+    27:27:com.mojang.serialization.Codec fromStringResolver(java.util.function.ToIntFunction,java.util.function.IntFunction,java.util.function.Function) -> a
+    58:58:com.mojang.serialization.Keyable keys(net.minecraft.util.StringRepresentable[]) -> a
+    23:23:java.lang.Enum lambda$fromEnum$0(java.lang.Enum[],int) -> a
+net.minecraft.util.StringRepresentable$1 -> aeh$1:
+    java.util.function.ToIntFunction val$idResolver -> a
+    java.util.function.IntFunction val$byId -> b
+    java.util.function.Function val$resolver -> c
+    27:27:void <init>(java.util.function.ToIntFunction,java.util.function.IntFunction,java.util.function.Function) -> <init>
+    30:33:com.mojang.serialization.DataResult encode(net.minecraft.util.StringRepresentable,com.mojang.serialization.DynamicOps,java.lang.Object) -> a
+    38:47:com.mojang.serialization.DataResult decode(com.mojang.serialization.DynamicOps,java.lang.Object) -> decode
+    52:52:java.lang.String toString() -> toString
+    27:27:com.mojang.serialization.DataResult encode(java.lang.Object,com.mojang.serialization.DynamicOps,java.lang.Object) -> encode
+    47:47:com.mojang.datafixers.util.Pair lambda$decode$5(com.mojang.serialization.DynamicOps,net.minecraft.util.StringRepresentable) -> a
+    44:46:com.mojang.serialization.DataResult lambda$decode$4(java.util.function.Function,java.lang.String) -> a
+    46:46:com.mojang.serialization.DataResult lambda$null$3(java.lang.String) -> a
+    42:42:com.mojang.datafixers.util.Pair lambda$decode$2(com.mojang.serialization.DynamicOps,net.minecraft.util.StringRepresentable) -> b
+    39:41:com.mojang.serialization.DataResult lambda$decode$1(java.util.function.IntFunction,java.lang.Number) -> a
+    41:41:com.mojang.serialization.DataResult lambda$null$0(java.lang.Number) -> a
+net.minecraft.util.StringRepresentable$2 -> aeh$2:
+    net.minecraft.util.StringRepresentable[] val$values -> a
+    58:58:void <init>(net.minecraft.util.StringRepresentable[]) -> <init>
+    61:64:java.util.stream.Stream keys(com.mojang.serialization.DynamicOps) -> keys
+net.minecraft.util.StringUtil -> aei:
     java.util.regex.Pattern STRIP_COLOR_PATTERN -> a
     9:9:void <init>() -> <init>
     13:20:java.lang.String formatTickDuration(int) -> a
@@ -33719,7 +36351,10 @@ net.minecraft.util.StringUtil -> aby:
     28:28:boolean isNullOrEmpty(java.lang.String) -> b
     37:44:java.lang.String truncateStringIfNecessary(java.lang.String,int,boolean) -> a
     10:10:void <clinit>() -> <clinit>
-net.minecraft.util.Tuple -> abz:
+net.minecraft.util.TimeUtil -> aej:
+    5:5:void <init>() -> <init>
+    7:7:net.minecraft.util.IntRange rangeOfSeconds(int,int) -> a
+net.minecraft.util.Tuple -> aek:
     java.lang.Object a -> a
     java.lang.Object b -> b
     7:10:void <init>(java.lang.Object,java.lang.Object) -> <init>
@@ -33727,24 +36362,24 @@ net.minecraft.util.Tuple -> abz:
     17:18:void setA(java.lang.Object) -> a
     21:21:java.lang.Object getB() -> b
     25:26:void setB(java.lang.Object) -> b
-net.minecraft.util.Unit -> aca:
+net.minecraft.util.Unit -> ael:
     net.minecraft.util.Unit INSTANCE -> a
     net.minecraft.util.Unit[] $VALUES -> b
     3:3:net.minecraft.util.Unit[] values() -> values
     3:3:net.minecraft.util.Unit valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:4:void <clinit>() -> <clinit>
-net.minecraft.util.VisibleForDebug -> acb:
-net.minecraft.util.WeighedRandom -> acc:
+net.minecraft.util.VisibleForDebug -> aem:
+net.minecraft.util.WeighedRandom -> aen:
     8:8:void <init>() -> <init>
     10:15:int getTotalWeight(java.util.List) -> a
     19:24:net.minecraft.util.WeighedRandom$WeighedRandomItem getRandomItem(java.util.Random,java.util.List,int) -> a
     28:35:net.minecraft.util.WeighedRandom$WeighedRandomItem getWeightedItem(java.util.List,int) -> a
     39:39:net.minecraft.util.WeighedRandom$WeighedRandomItem getRandomItem(java.util.Random,java.util.List) -> a
-net.minecraft.util.WeighedRandom$WeighedRandomItem -> acc$a:
+net.minecraft.util.WeighedRandom$WeighedRandomItem -> aen$a:
     int weight -> a
     45:47:void <init>(int) -> <init>
-net.minecraft.util.datafix.DataFixTypes -> acd:
+net.minecraft.util.datafix.DataFixTypes -> aeo:
     net.minecraft.util.datafix.DataFixTypes LEVEL -> a
     net.minecraft.util.datafix.DataFixTypes PLAYER -> b
     net.minecraft.util.datafix.DataFixTypes CHUNK -> c
@@ -33755,234 +36390,288 @@ net.minecraft.util.datafix.DataFixTypes -> acd:
     net.minecraft.util.datafix.DataFixTypes SAVED_DATA -> h
     net.minecraft.util.datafix.DataFixTypes ADVANCEMENTS -> i
     net.minecraft.util.datafix.DataFixTypes POI_CHUNK -> j
-    com.mojang.datafixers.DSL$TypeReference type -> k
-    net.minecraft.util.datafix.DataFixTypes[] $VALUES -> l
+    net.minecraft.util.datafix.DataFixTypes WORLD_GEN_SETTINGS -> k
+    com.mojang.datafixers.DSL$TypeReference type -> l
+    net.minecraft.util.datafix.DataFixTypes[] $VALUES -> m
     6:6:net.minecraft.util.datafix.DataFixTypes[] values() -> values
     6:6:net.minecraft.util.datafix.DataFixTypes valueOf(java.lang.String) -> valueOf
-    21:23:void <init>(java.lang.String,int,com.mojang.datafixers.DSL$TypeReference) -> <init>
-    26:26:com.mojang.datafixers.DSL$TypeReference getType() -> a
-    6:16:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.DataFixers -> ace:
+    22:24:void <init>(java.lang.String,int,com.mojang.datafixers.DSL$TypeReference) -> <init>
+    27:27:com.mojang.datafixers.DSL$TypeReference getType() -> a
+    6:17:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.DataFixers -> aep:
     java.util.function.BiFunction SAME -> a
     java.util.function.BiFunction SAME_NAMESPACED -> b
     com.mojang.datafixers.DataFixer DATA_FIXER -> c
-    162:162:void <init>() -> <init>
-    169:171:com.mojang.datafixers.DataFixer createFixerUpper() -> b
-    175:175:com.mojang.datafixers.DataFixer getDataFixer() -> a
-    183:605:void addFixers(com.mojang.datafixers.DataFixerBuilder) -> a
-    597:597:java.lang.String lambda$addFixers$27(java.lang.String) -> a
-    593:593:java.lang.String lambda$addFixers$26(java.lang.String) -> b
-    586:586:java.lang.String lambda$addFixers$25(java.lang.String) -> c
-    585:585:java.lang.String lambda$addFixers$24(java.lang.String) -> d
-    555:555:java.lang.String lambda$addFixers$23(java.lang.String) -> e
-    514:517:java.lang.String lambda$addFixers$22(java.lang.String) -> f
-    507:511:java.lang.String lambda$addFixers$21(java.lang.String) -> g
-    500:500:java.lang.String lambda$addFixers$20(java.lang.String) -> h
-    493:493:java.lang.String lambda$addFixers$19(java.lang.String) -> i
-    482:482:java.lang.String lambda$addFixers$18(java.lang.String) -> j
-    481:481:java.lang.String lambda$addFixers$17(java.lang.String) -> k
-    449:453:java.lang.String lambda$addFixers$16(java.lang.String) -> l
-    446:446:java.lang.String lambda$addFixers$15(java.lang.String) -> m
-    428:428:java.lang.String lambda$addFixers$14(java.lang.String) -> n
-    422:425:java.lang.String lambda$addFixers$13(java.lang.String) -> o
-    414:417:java.lang.String lambda$addFixers$12(java.lang.String) -> p
-    408:411:java.lang.String lambda$addFixers$11(java.lang.String) -> q
-    404:404:java.lang.String lambda$addFixers$10(java.lang.String) -> r
-    393:396:java.lang.String lambda$addFixers$9(java.lang.String) -> s
-    389:392:java.lang.String lambda$addFixers$8(java.lang.String) -> t
-    386:386:java.lang.String lambda$addFixers$7(java.lang.String) -> u
-    379:379:java.lang.String lambda$addFixers$6(java.lang.String) -> v
-    378:378:java.lang.String lambda$addFixers$5(java.lang.String) -> w
-    371:374:java.lang.String lambda$addFixers$4(java.lang.String) -> x
-    367:367:java.lang.String lambda$addFixers$3(java.lang.String) -> y
-    366:366:java.lang.String lambda$addFixers$2(java.lang.String) -> z
-    289:289:java.lang.String lambda$addFixers$1(java.lang.String) -> A
-    239:239:java.lang.String lambda$addFixers$0(java.lang.String) -> B
-    163:166:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.DataFixers$1 -> ace$1:
-    430:430:void <init>(com.mojang.datafixers.schemas.Schema,boolean,java.lang.String,com.mojang.datafixers.DSL$TypeReference,java.lang.String) -> <init>
-    433:433:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.DataFixers$2 -> ace$2:
-    436:436:void <init>(com.mojang.datafixers.schemas.Schema,boolean,java.lang.String,com.mojang.datafixers.DSL$TypeReference,java.lang.String) -> <init>
-    439:439:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.OminousBannerBlockEntityRenameFix -> acf:
-    14:15:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    19:19:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-    23:29:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.OminousBannerRenameFix -> acg:
-    22:23:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    26:37:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
-    42:46:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    47:56:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.AddNewChoices -> ach:
+    197:197:void <init>() -> <init>
+    204:206:com.mojang.datafixers.DataFixer createFixerUpper() -> b
+    210:210:com.mojang.datafixers.DataFixer getDataFixer() -> a
+    218:724:void addFixers(com.mojang.datafixers.DataFixerBuilder) -> a
+    727:727:java.util.function.UnaryOperator createRenamer(java.util.Map) -> a
+    731:731:java.util.function.UnaryOperator createRenamer(java.lang.String,java.lang.String) -> a
+    731:731:java.lang.String lambda$createRenamer$4(java.lang.String,java.lang.String,java.lang.String) -> a
+    727:727:java.lang.String lambda$createRenamer$3(java.util.Map,java.lang.String) -> a
+    400:400:java.lang.String lambda$addFixers$2(java.lang.String) -> a
+    399:399:java.lang.String lambda$addFixers$1(java.lang.String) -> b
+    274:274:java.lang.String lambda$addFixers$0(java.lang.String) -> c
+    198:201:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.DataFixers$1 -> aep$1:
+    458:458:void <init>(com.mojang.datafixers.schemas.Schema,boolean,java.lang.String,com.mojang.datafixers.DSL$TypeReference,java.lang.String) -> <init>
+    461:461:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.DataFixers$2 -> aep$2:
+    464:464:void <init>(com.mojang.datafixers.schemas.Schema,boolean,java.lang.String,com.mojang.datafixers.DSL$TypeReference,java.lang.String) -> <init>
+    467:467:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.PackedBitStorage -> aeq:
+    long[] data -> a
+    int bits -> b
+    long mask -> c
+    int size -> d
+    26:27:void <init>(int,int) -> <init>
+    29:41:void <init>(int,int,long[]) -> <init>
+    44:58:void set(int,int) -> a
+    61:72:int get(int) -> a
+    77:77:long[] getRaw() -> a
+    81:81:int getBits() -> b
+net.minecraft.util.datafix.fixes.AbstractUUIDFix -> aer:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    com.mojang.datafixers.DSL$TypeReference typeReference -> b
+    24:26:void <init>(com.mojang.datafixers.schemas.Schema,com.mojang.datafixers.DSL$TypeReference) -> <init>
+    29:31:com.mojang.datafixers.Typed updateNamedChoice(com.mojang.datafixers.Typed,java.lang.String,java.util.function.Function) -> a
+    35:35:java.util.Optional replaceUUIDString(com.mojang.serialization.Dynamic,java.lang.String,java.lang.String) -> a
+    41:41:java.util.Optional replaceUUIDMLTag(com.mojang.serialization.Dynamic,java.lang.String,java.lang.String) -> b
+    47:49:java.util.Optional replaceUUIDLeastMost(com.mojang.serialization.Dynamic,java.lang.String,java.lang.String) -> c
+    55:55:java.util.Optional createUUIDFromString(com.mojang.serialization.Dynamic,java.lang.String) -> a
+    70:70:java.util.Optional createUUIDFromML(com.mojang.serialization.Dynamic) -> a
+    74:79:java.util.Optional createUUIDFromLongs(com.mojang.serialization.Dynamic,java.lang.String,java.lang.String) -> d
+    83:83:java.util.Optional createUUIDTag(com.mojang.serialization.Dynamic,long,long) -> a
+    56:65:java.util.Optional lambda$createUUIDFromString$4(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    50:50:com.mojang.serialization.Dynamic lambda$replaceUUIDLeastMost$3(com.mojang.serialization.Dynamic,java.lang.String,java.lang.String,java.lang.String,com.mojang.serialization.Dynamic) -> a
+    42:42:com.mojang.serialization.Dynamic lambda$replaceUUIDMLTag$2(com.mojang.serialization.Dynamic,java.lang.String,java.lang.String,com.mojang.serialization.Dynamic) -> a
+    36:36:com.mojang.serialization.Dynamic lambda$replaceUUIDString$1(com.mojang.serialization.Dynamic,java.lang.String,java.lang.String,com.mojang.serialization.Dynamic) -> b
+    31:31:com.mojang.datafixers.Typed lambda$updateNamedChoice$0(java.util.function.Function,com.mojang.datafixers.Typed) -> a
+    20:20:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.AddNewChoices -> aes:
     java.lang.String name -> a
     com.mojang.datafixers.DSL$TypeReference type -> b
     14:17:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String,com.mojang.datafixers.DSL$TypeReference) -> <init>
     21:23:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     28:32:com.mojang.datafixers.TypeRewriteRule cap(java.lang.String,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType) -> a
-    32:32:java.util.function.Function lambda$cap$1(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.DynamicOps) -> a
+    32:32:java.util.function.Function lambda$cap$1(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.serialization.DynamicOps) -> a
     33:36:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.util.Pair) -> a
-net.minecraft.util.datafix.fixes.AdvancementsFix -> aci:
+net.minecraft.util.datafix.fixes.AdvancementsFix -> aet:
     java.util.Map RENAMES -> a
     68:69:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     68:68:java.lang.String lambda$new$0(java.lang.String) -> a
     9:65:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.AdvancementsRenameFix -> acj:
+net.minecraft.util.datafix.fixes.AdvancementsRenameFix -> aeu:
     java.lang.String name -> a
     java.util.function.Function renamer -> b
     15:18:void <init>(com.mojang.datafixers.schemas.Schema,boolean,java.lang.String,java.util.function.Function) -> <init>
     22:22:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     22:22:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.Typed) -> a
-    23:23:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic) -> a
-    24:25:com.mojang.datafixers.util.Pair lambda$null$1(com.mojang.datafixers.Dynamic,com.mojang.datafixers.util.Pair) -> a
-    25:25:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic,java.lang.String,com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.BedBlockEntityInjecter -> ack:
+    23:23:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> a
+    24:25:com.mojang.datafixers.util.Pair lambda$null$1(com.mojang.serialization.Dynamic,com.mojang.datafixers.util.Pair) -> a
+    25:25:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic,java.lang.String,com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.AttributesRename -> aev:
+    java.util.Map RENAMES -> a
+    46:47:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    51:58:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    63:63:com.mojang.serialization.Dynamic fixName(com.mojang.serialization.Dynamic) -> a
+    67:67:com.mojang.datafixers.Typed fixItemStackTag(com.mojang.datafixers.Typed) -> a
+    75:75:com.mojang.datafixers.Typed fixEntity(com.mojang.datafixers.Typed) -> b
+    76:76:com.mojang.serialization.Dynamic lambda$fixEntity$9(com.mojang.serialization.Dynamic) -> b
+    77:77:com.mojang.serialization.Dynamic lambda$null$8(com.mojang.serialization.Dynamic) -> c
+    77:77:java.util.stream.Stream lambda$null$7(java.util.stream.Stream) -> a
+    77:77:com.mojang.serialization.Dynamic lambda$null$6(com.mojang.serialization.Dynamic) -> d
+    68:68:com.mojang.serialization.Dynamic lambda$fixItemStackTag$5(com.mojang.serialization.Dynamic) -> e
+    69:69:com.mojang.serialization.Dynamic lambda$null$4(com.mojang.serialization.Dynamic) -> f
+    69:69:java.util.stream.Stream lambda$null$3(java.util.stream.Stream) -> b
+    69:69:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> g
+    63:63:java.lang.String lambda$fixName$1(java.lang.String) -> a
+    55:55:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    17:43:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.BedBlockEntityInjecter -> aew:
     26:27:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     31:39:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     43:52:com.mojang.datafixers.TypeRewriteRule cap(com.mojang.datafixers.types.Type,com.mojang.datafixers.types.templates.List$ListType) -> a
     53:86:com.mojang.datafixers.Typed lambda$cap$4(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
     78:78:java.lang.IllegalStateException lambda$null$3() -> a
-    64:64:java.lang.Integer lambda$null$2(com.mojang.datafixers.Dynamic) -> a
-    51:51:java.util.function.Function lambda$cap$1(com.mojang.datafixers.types.DynamicOps) -> a
+    64:64:java.lang.Integer lambda$null$2(com.mojang.serialization.Dynamic) -> a
+    51:51:java.util.function.Function lambda$cap$1(com.mojang.serialization.DynamicOps) -> a
     51:51:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.util.Pair) -> a
-net.minecraft.util.datafix.fixes.BedItemColorFix -> acl:
-    16:17:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    21:23:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    24:31:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.BeehivePoiRenameFix -> acm:
+net.minecraft.util.datafix.fixes.BedItemColorFix -> aex:
+    18:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    23:25:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    26:33:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.BeehivePoiRenameFix -> aey:
     7:8:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
     12:12:java.lang.String rename(java.lang.String) -> a
-net.minecraft.util.datafix.fixes.BiomeFix -> acn:
+net.minecraft.util.datafix.fixes.BiomeFix -> aez:
     java.util.Map BIOMES -> a
-    75:76:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    80:84:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    84:84:java.util.function.Function lambda$makeRule$2(com.mojang.datafixers.types.DynamicOps) -> a
-    84:84:com.mojang.datafixers.util.Pair lambda$null$1(com.mojang.datafixers.util.Pair) -> a
-    85:85:java.lang.String lambda$null$0(java.lang.String) -> a
-    17:72:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.BlockEntityBannerColorFix -> aco:
+    67:68:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    9:64:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.BitStorageAlignFix -> afa:
+    28:29:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    33:45:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    53:53:com.mojang.datafixers.Typed updateHeightmaps(com.mojang.datafixers.Typed) -> a
+    65:65:com.mojang.datafixers.Typed updateSections(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    81:83:com.mojang.serialization.Dynamic updateBitStorage(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic,int,int) -> a
+    87:140:long[] addPadding(int,int,long[]) -> a
+    66:66:com.mojang.datafixers.Typed lambda$updateSections$10(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    68:72:com.mojang.datafixers.Typed lambda$null$9(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    73:73:com.mojang.serialization.Dynamic lambda$null$8(int,com.mojang.serialization.Dynamic) -> a
+    73:73:com.mojang.serialization.Dynamic lambda$null$7(com.mojang.serialization.Dynamic,int,com.mojang.serialization.Dynamic) -> a
+    68:68:java.lang.Integer lambda$null$6(java.util.List) -> a
+    54:54:com.mojang.serialization.Dynamic lambda$updateHeightmaps$5(com.mojang.serialization.Dynamic) -> a
+    55:55:com.mojang.serialization.Dynamic lambda$null$4(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    56:56:com.mojang.datafixers.util.Pair lambda$null$3(com.mojang.serialization.Dynamic,com.mojang.datafixers.util.Pair) -> a
+    57:57:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> b
+    46:46:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    47:47:com.mojang.datafixers.Typed lambda$null$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> b
+net.minecraft.util.datafix.fixes.BlockEntityBannerColorFix -> afb:
     11:12:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    15:23:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    15:23:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     28:28:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-    17:20:com.mojang.datafixers.Dynamic lambda$fixTag$4(com.mojang.datafixers.Dynamic) -> b
+    17:20:com.mojang.serialization.Dynamic lambda$fixTag$4(com.mojang.serialization.Dynamic) -> b
     18:18:java.util.stream.Stream lambda$null$3(java.util.stream.Stream) -> a
-    19:19:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic) -> c
-    19:19:com.mojang.datafixers.Dynamic lambda$null$1(com.mojang.datafixers.Dynamic) -> d
-    15:15:com.mojang.datafixers.Dynamic lambda$fixTag$0(com.mojang.datafixers.Dynamic) -> e
-net.minecraft.util.datafix.fixes.BlockEntityBlockStateFix -> acp:
+    19:19:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> c
+    19:19:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic) -> d
+    15:15:com.mojang.serialization.Dynamic lambda$fixTag$0(com.mojang.serialization.Dynamic) -> e
+net.minecraft.util.datafix.fixes.BlockEntityBlockStateFix -> afc:
     12:13:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     17:30:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
     30:30:java.lang.IllegalStateException lambda$fix$1() -> a
     29:29:java.lang.IllegalStateException lambda$fix$0() -> b
-net.minecraft.util.datafix.fixes.BlockEntityCustomNameToComponentFix -> acq:
-    14:15:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    19:20:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    20:20:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    21:25:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Typed,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.BlockEntityIdFix -> acr:
+net.minecraft.util.datafix.fixes.BlockEntityCustomNameToComponentFix -> afd:
+    16:17:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    21:22:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    22:22:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    23:27:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.datafixers.Typed,com.mojang.datafixers.OpticFinder,com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.BlockEntityIdFix -> afe:
     java.util.Map ID_MAP -> a
     16:17:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     47:55:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    55:55:java.util.function.Function lambda$makeRule$3(com.mojang.datafixers.types.DynamicOps) -> a
+    55:55:java.util.function.Function lambda$makeRule$3(com.mojang.serialization.DynamicOps) -> a
     56:56:com.mojang.datafixers.util.Pair lambda$null$2(com.mojang.datafixers.util.Pair) -> a
     56:56:java.lang.String lambda$null$1(java.lang.String) -> a
     20:43:void lambda$static$0(java.util.HashMap) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.BlockEntityJukeboxFix -> acs:
+net.minecraft.util.datafix.fixes.BlockEntityJukeboxFix -> aff:
     12:13:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     17:33:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
     30:30:java.lang.IllegalStateException lambda$fix$0() -> a
-net.minecraft.util.datafix.fixes.BlockEntityKeepPacked -> act:
+net.minecraft.util.datafix.fixes.BlockEntityKeepPacked -> afg:
     10:11:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    14:14:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    14:14:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     19:19:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.BlockEntityShulkerBoxColorFix -> acu:
+net.minecraft.util.datafix.fixes.BlockEntityShulkerBoxColorFix -> afh:
     9:10:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     14:14:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-    14:14:com.mojang.datafixers.Dynamic lambda$fix$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.BlockEntitySignTextStrictJsonFix -> acv:
+    14:14:com.mojang.serialization.Dynamic lambda$fix$0(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.BlockEntitySignTextStrictJsonFix -> afi:
     com.google.gson.Gson GSON -> a
-    23:24:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    56:94:com.mojang.datafixers.Dynamic updateLine(com.mojang.datafixers.Dynamic,java.lang.String) -> a
-    99:99:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-    100:105:com.mojang.datafixers.Dynamic lambda$fix$0(com.mojang.datafixers.Dynamic) -> a
-    26:53:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.BlockEntitySignTextStrictJsonFix$1 -> acv$1:
-    27:27:void <init>() -> <init>
-    30:49:net.minecraft.network.chat.Component deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    27:27:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.util.datafix.fixes.BlockNameFlatteningFix -> acw:
-    16:17:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    21:30:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    30:30:java.util.function.Function lambda$makeRule$3(com.mojang.datafixers.types.DynamicOps) -> a
-    30:30:com.mojang.datafixers.util.Pair lambda$null$2(com.mojang.datafixers.util.Pair) -> a
-    30:30:java.lang.String lambda$null$1(com.mojang.datafixers.util.Either) -> a
-    32:32:java.lang.String lambda$null$0(java.lang.String) -> a
-net.minecraft.util.datafix.fixes.BlockRenameFix -> acx:
+    24:25:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    57:95:com.mojang.serialization.Dynamic updateLine(com.mojang.serialization.Dynamic,java.lang.String) -> a
+    100:100:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+    101:106:com.mojang.serialization.Dynamic lambda$fix$0(com.mojang.serialization.Dynamic) -> a
+    27:54:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.BlockEntitySignTextStrictJsonFix$1 -> afi$1:
+    28:28:void <init>() -> <init>
+    31:50:net.minecraft.network.chat.MutableComponent deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
+    28:28:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
+net.minecraft.util.datafix.fixes.BlockEntityUUIDFix -> afj:
+    9:10:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    14:14:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    22:26:com.mojang.serialization.Dynamic updateSkull(com.mojang.serialization.Dynamic) -> b
+    30:30:com.mojang.serialization.Dynamic updateConduit(com.mojang.serialization.Dynamic) -> c
+    25:25:com.mojang.serialization.Dynamic lambda$updateSkull$2(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    23:23:com.mojang.serialization.Dynamic lambda$updateSkull$1(com.mojang.serialization.Dynamic) -> d
+    15:17:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.BlockNameFlatteningFix -> afk:
+    18:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    23:32:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    32:32:java.util.function.Function lambda$makeRule$3(com.mojang.serialization.DynamicOps) -> a
+    32:32:com.mojang.datafixers.util.Pair lambda$null$2(com.mojang.datafixers.util.Pair) -> a
+    32:32:java.lang.String lambda$null$1(com.mojang.datafixers.util.Either) -> a
+    34:34:java.lang.String lambda$null$0(java.lang.String) -> a
+net.minecraft.util.datafix.fixes.BlockRenameFix -> afl:
     java.lang.String name -> a
-    18:20:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String) -> <init>
-    24:40:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    20:22:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String) -> <init>
+    26:42:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     java.lang.String fixBlock(java.lang.String) -> a
-    46:46:com.mojang.datafixers.DataFix create(com.mojang.datafixers.schemas.Schema,java.lang.String,java.util.function.Function) -> a
-    32:32:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.Typed) -> a
-    33:37:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic) -> a
-    30:30:java.util.function.Function lambda$makeRule$1(com.mojang.datafixers.types.DynamicOps) -> a
-    30:30:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.util.Pair) -> a
-net.minecraft.util.datafix.fixes.BlockRenameFix$1 -> acx$1:
+    48:48:com.mojang.datafixers.DataFix create(com.mojang.datafixers.schemas.Schema,java.lang.String,java.util.function.Function) -> a
+    34:34:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.Typed) -> a
+    35:39:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> a
+    32:32:java.util.function.Function lambda$makeRule$1(com.mojang.serialization.DynamicOps) -> a
+    32:32:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.util.Pair) -> a
+net.minecraft.util.datafix.fixes.BlockRenameFix$1 -> afl$1:
     java.util.function.Function val$fixBlock -> a
-    46:46:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String,java.util.function.Function) -> <init>
-    49:49:java.lang.String fixBlock(java.lang.String) -> a
-net.minecraft.util.datafix.fixes.BlockStateData -> acy:
+    48:48:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String,java.util.function.Function) -> <init>
+    51:51:java.lang.String fixBlock(java.lang.String) -> a
+net.minecraft.util.datafix.fixes.BlockRenameFixWithJigsaw -> afm:
+    java.lang.String name -> a
+    16:18:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String) -> <init>
+    22:45:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    49:49:com.mojang.datafixers.DataFix create(com.mojang.datafixers.schemas.Schema,java.lang.String,java.util.function.Function) -> b
+    28:28:com.mojang.datafixers.Typed lambda$makeRule$4(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.DSL$TypeReference,com.mojang.datafixers.Typed) -> a
+    28:28:com.mojang.datafixers.Typed lambda$null$3(com.mojang.datafixers.Typed) -> a
+    28:28:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> a
+    28:42:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    29:41:java.lang.String lambda$null$0(java.lang.String) -> b
+net.minecraft.util.datafix.fixes.BlockRenameFixWithJigsaw$1 -> afm$1:
+    java.util.function.Function val$fixBlock -> a
+    49:49:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String,java.util.function.Function) -> <init>
+    52:52:java.lang.String fixBlock(java.lang.String) -> a
+net.minecraft.util.datafix.fixes.BlockStateData -> afn:
     org.apache.logging.log4j.Logger LOGGER -> a
-    com.mojang.datafixers.Dynamic[] MAP -> b
-    com.mojang.datafixers.Dynamic[] BLOCK_DEFAULTS -> c
+    com.mojang.serialization.Dynamic[] MAP -> b
+    com.mojang.serialization.Dynamic[] BLOCK_DEFAULTS -> c
     it.unimi.dsi.fastutil.objects.Object2IntMap ID_BY_OLD -> d
     it.unimi.dsi.fastutil.objects.Object2IntMap ID_BY_OLD_NAME -> e
     12:12:void <init>() -> <init>
     21:33:void register(int,java.lang.String,java.lang.String[]) -> a
     36:41:void finalizeMaps() -> a
-    44:49:com.mojang.datafixers.Dynamic upgradeBlockStateTag(com.mojang.datafixers.Dynamic) -> a
+    44:49:com.mojang.serialization.Dynamic upgradeBlockStateTag(com.mojang.serialization.Dynamic) -> a
     53:58:java.lang.String upgradeBlock(java.lang.String) -> a
     62:66:java.lang.String upgradeBlock(int) -> a
-    72:75:com.mojang.datafixers.Dynamic parse(java.lang.String) -> b
-    80:84:com.mojang.datafixers.Dynamic getTag(int) -> b
+    72:75:com.mojang.serialization.Dynamic parse(java.lang.String) -> b
+    80:84:com.mojang.serialization.Dynamic getTag(int) -> b
     17:17:void lambda$static$1(it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap) -> a
     16:16:void lambda$static$0(it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap) -> b
     13:1785:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.BlockStateStructureTemplateFix -> acz:
+net.minecraft.util.datafix.fixes.BlockStateStructureTemplateFix -> afo:
     10:11:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     15:15:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     15:15:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.CatTypeFix -> ada:
+net.minecraft.util.datafix.fixes.CatTypeFix -> afp:
     10:11:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    14:17:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    14:17:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     22:22:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.ChunkBiomeFix -> adb:
+net.minecraft.util.datafix.fixes.ChunkBiomeFix -> afq:
     16:17:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     21:24:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     24:24:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     24:24:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.Typed) -> a
-    25:44:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.ChunkLightRemoveFix -> adc:
+    25:44:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.ChunkLightRemoveFix -> afr:
     12:13:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     17:22:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     22:22:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     22:22:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.Typed) -> a
-    23:23:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix -> add:
+    23:23:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix -> afs:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.BitSet VIRTUAL -> b
     java.util.BitSet FIX -> c
-    com.mojang.datafixers.Dynamic PUMPKIN -> d
-    com.mojang.datafixers.Dynamic SNOWY_PODZOL -> e
-    com.mojang.datafixers.Dynamic SNOWY_GRASS -> f
-    com.mojang.datafixers.Dynamic SNOWY_MYCELIUM -> g
-    com.mojang.datafixers.Dynamic UPPER_SUNFLOWER -> h
-    com.mojang.datafixers.Dynamic UPPER_LILAC -> i
-    com.mojang.datafixers.Dynamic UPPER_TALL_GRASS -> j
-    com.mojang.datafixers.Dynamic UPPER_LARGE_FERN -> k
-    com.mojang.datafixers.Dynamic UPPER_ROSE_BUSH -> l
-    com.mojang.datafixers.Dynamic UPPER_PEONY -> m
+    com.mojang.serialization.Dynamic PUMPKIN -> d
+    com.mojang.serialization.Dynamic SNOWY_PODZOL -> e
+    com.mojang.serialization.Dynamic SNOWY_GRASS -> f
+    com.mojang.serialization.Dynamic SNOWY_MYCELIUM -> g
+    com.mojang.serialization.Dynamic UPPER_SUNFLOWER -> h
+    com.mojang.serialization.Dynamic UPPER_LILAC -> i
+    com.mojang.serialization.Dynamic UPPER_TALL_GRASS -> j
+    com.mojang.serialization.Dynamic UPPER_LARGE_FERN -> k
+    com.mojang.serialization.Dynamic UPPER_ROSE_BUSH -> l
+    com.mojang.serialization.Dynamic UPPER_PEONY -> m
     java.util.Map FLOWER_POT_MAP -> n
     java.util.Map SKULL_MAP -> o
     java.util.Map DOOR_MAP -> p
@@ -33990,57 +36679,57 @@ net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix -> add:
     it.unimi.dsi.fastutil.ints.Int2ObjectMap DYE_COLOR_MAP -> r
     java.util.Map BED_BLOCK_MAP -> s
     java.util.Map BANNER_BLOCK_MAP -> t
-    com.mojang.datafixers.Dynamic AIR -> u
-    41:42:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    94:101:void mapSkull(java.util.Map,int,java.lang.String,java.lang.String) -> a
-    114:178:void mapDoor(java.util.Map,java.lang.String,int) -> a
-    215:227:void addBeds(java.util.Map,int,java.lang.String) -> a
-    239:246:void addBanners(java.util.Map,int,java.lang.String) -> b
-    336:336:java.lang.String getName(com.mojang.datafixers.Dynamic) -> a
-    340:340:java.lang.String getProperty(com.mojang.datafixers.Dynamic,java.lang.String) -> a
-    344:348:int idFor(net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap,com.mojang.datafixers.Dynamic) -> a
-    352:356:com.mojang.datafixers.Dynamic fix(com.mojang.datafixers.Dynamic) -> b
-    361:363:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    834:856:int getSideMask(boolean,boolean,boolean,boolean) -> a
-    230:236:void lambda$static$6(java.util.HashMap) -> a
-    207:212:void lambda$static$5(java.util.HashMap) -> b
-    188:204:void lambda$static$4(it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap) -> a
-    181:185:void lambda$static$3(java.util.HashMap) -> c
-    104:111:void lambda$static$2(java.util.HashMap) -> d
-    85:91:void lambda$static$1(java.util.HashMap) -> e
-    60:82:void lambda$static$0(java.util.HashMap) -> f
-    30:30:com.mojang.datafixers.Dynamic access$000() -> a
-    30:30:java.util.BitSet access$100() -> b
-    30:30:java.util.BitSet access$200() -> c
-    30:30:com.mojang.datafixers.Dynamic access$400() -> d
-    30:30:com.mojang.datafixers.Dynamic access$500() -> e
-    30:30:com.mojang.datafixers.Dynamic access$600() -> f
-    30:30:java.util.Map access$700() -> g
-    30:30:java.util.Map access$800() -> h
-    30:30:java.util.Map access$900() -> i
-    30:30:com.mojang.datafixers.Dynamic access$1000() -> j
-    30:30:java.util.Map access$1100() -> k
-    30:30:java.util.Map access$1200() -> l
-    30:30:java.util.Map access$1300() -> m
-    30:30:com.mojang.datafixers.Dynamic access$1400() -> n
-    30:30:com.mojang.datafixers.Dynamic access$1500() -> o
-    30:30:com.mojang.datafixers.Dynamic access$1600() -> p
-    30:30:com.mojang.datafixers.Dynamic access$1700() -> q
-    30:30:com.mojang.datafixers.Dynamic access$1800() -> r
-    30:30:com.mojang.datafixers.Dynamic access$1900() -> s
-    30:30:org.apache.logging.log4j.Logger access$2100() -> t
-    44:332:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$1 -> add$1:
+    com.mojang.serialization.Dynamic AIR -> u
+    43:44:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    96:103:void mapSkull(java.util.Map,int,java.lang.String,java.lang.String) -> a
+    116:180:void mapDoor(java.util.Map,java.lang.String,int) -> a
+    217:229:void addBeds(java.util.Map,int,java.lang.String) -> a
+    241:248:void addBanners(java.util.Map,int,java.lang.String) -> b
+    338:338:java.lang.String getName(com.mojang.serialization.Dynamic) -> a
+    342:342:java.lang.String getProperty(com.mojang.serialization.Dynamic,java.lang.String) -> a
+    346:350:int idFor(net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap,com.mojang.serialization.Dynamic) -> a
+    354:358:com.mojang.serialization.Dynamic fix(com.mojang.serialization.Dynamic) -> b
+    363:365:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    836:858:int getSideMask(boolean,boolean,boolean,boolean) -> a
+    232:238:void lambda$static$6(java.util.HashMap) -> a
+    209:214:void lambda$static$5(java.util.HashMap) -> b
+    190:206:void lambda$static$4(it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap) -> a
+    183:187:void lambda$static$3(java.util.HashMap) -> c
+    106:113:void lambda$static$2(java.util.HashMap) -> d
+    87:93:void lambda$static$1(java.util.HashMap) -> e
+    62:84:void lambda$static$0(java.util.HashMap) -> f
+    32:32:com.mojang.serialization.Dynamic access$000() -> a
+    32:32:java.util.BitSet access$100() -> b
+    32:32:java.util.BitSet access$200() -> c
+    32:32:com.mojang.serialization.Dynamic access$400() -> d
+    32:32:com.mojang.serialization.Dynamic access$500() -> e
+    32:32:com.mojang.serialization.Dynamic access$600() -> f
+    32:32:java.util.Map access$700() -> g
+    32:32:java.util.Map access$800() -> h
+    32:32:java.util.Map access$900() -> i
+    32:32:com.mojang.serialization.Dynamic access$1000() -> j
+    32:32:java.util.Map access$1100() -> k
+    32:32:java.util.Map access$1200() -> l
+    32:32:java.util.Map access$1300() -> m
+    32:32:com.mojang.serialization.Dynamic access$1400() -> n
+    32:32:com.mojang.serialization.Dynamic access$1500() -> o
+    32:32:com.mojang.serialization.Dynamic access$1600() -> p
+    32:32:com.mojang.serialization.Dynamic access$1700() -> q
+    32:32:com.mojang.serialization.Dynamic access$1800() -> r
+    32:32:com.mojang.serialization.Dynamic access$1900() -> s
+    32:32:org.apache.logging.log4j.Logger access$2100() -> t
+    46:334:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$1 -> afs$1:
     int[] $SwitchMap$net$minecraft$util$datafix$fixes$ChunkPalettedStorageFix$Direction$Axis -> a
-    724:724:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$DataLayer -> add$a:
+    726:726:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$DataLayer -> afs$a:
     byte[] data -> a
-    802:804:void <init>() -> <init>
-    806:812:void <init>(byte[]) -> <init>
-    815:820:int get(int,int,int) -> a
-    825:825:boolean isFirst(int) -> a
-    829:829:int getPosition(int) -> b
-net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction -> add$b:
+    804:806:void <init>() -> <init>
+    808:814:void <init>(byte[]) -> <init>
+    817:822:int get(int,int,int) -> a
+    827:827:boolean isFirst(int) -> a
+    831:831:int getPosition(int) -> b
+net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction -> afs$b:
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction DOWN -> a
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction UP -> b
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction NORTH -> c
@@ -34050,113 +36739,116 @@ net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction -> add$b:
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis axis -> g
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection axisDirection -> h
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction[] $VALUES -> i
-    859:859:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction[] values() -> values
-    859:859:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction valueOf(java.lang.String) -> valueOf
-    871:874:void <init>(java.lang.String,int,net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection,net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis) -> <init>
-    877:877:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection getAxisDirection() -> a
-    881:881:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis getAxis() -> b
-    859:865:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis -> add$b$a:
+    861:861:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction[] values() -> values
+    861:861:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction valueOf(java.lang.String) -> valueOf
+    873:876:void <init>(java.lang.String,int,net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection,net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis) -> <init>
+    879:879:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection getAxisDirection() -> a
+    883:883:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis getAxis() -> b
+    861:867:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis -> afs$b$a:
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis X -> a
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis Y -> b
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis Z -> c
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis[] $VALUES -> d
-    884:884:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis[] values() -> values
-    884:884:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis valueOf(java.lang.String) -> valueOf
-    884:884:void <init>(java.lang.String,int) -> <init>
-    884:887:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection -> add$b$b:
+    886:886:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis[] values() -> values
+    886:886:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$Axis valueOf(java.lang.String) -> valueOf
+    886:886:void <init>(java.lang.String,int) -> <init>
+    886:889:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection -> afs$b$b:
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection POSITIVE -> a
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection NEGATIVE -> b
     int step -> c
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection[] $VALUES -> d
-    890:890:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection[] values() -> values
-    890:890:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection valueOf(java.lang.String) -> valueOf
-    897:899:void <init>(java.lang.String,int,int) -> <init>
-    902:902:int getStep() -> a
-    890:892:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Section -> add$c:
+    892:892:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection[] values() -> values
+    892:892:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction$AxisDirection valueOf(java.lang.String) -> valueOf
+    899:901:void <init>(java.lang.String,int,int) -> <init>
+    904:904:int getStep() -> a
+    892:894:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Section -> afs$c:
     net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap palette -> b
-    com.mojang.datafixers.Dynamic listTag -> c
-    com.mojang.datafixers.Dynamic section -> d
+    java.util.List listTag -> c
+    com.mojang.serialization.Dynamic section -> d
     boolean hasData -> e
     it.unimi.dsi.fastutil.ints.Int2ObjectMap toFix -> f
     it.unimi.dsi.fastutil.ints.IntList update -> g
     int y -> a
     java.util.Set seen -> h
     int[] buffer -> i
-    367:384:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    387:392:com.mojang.datafixers.Dynamic getBlock(int) -> a
-    396:400:void setBlock(int,com.mojang.datafixers.Dynamic) -> a
-    403:437:int upgrade(int) -> b
-    441:447:void addFix(int,int) -> a
-    450:468:com.mojang.datafixers.Dynamic write() -> a
-    408:408:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$DataLayer lambda$upgrade$1(java.nio.ByteBuffer) -> a
-    407:407:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$DataLayer lambda$upgrade$0(java.nio.ByteBuffer) -> b
-    366:366:it.unimi.dsi.fastutil.ints.Int2ObjectMap access$300(net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Section) -> a
-    366:366:it.unimi.dsi.fastutil.ints.IntList access$2000(net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Section) -> b
-net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$UpgradeChunk -> add$d:
+    369:386:void <init>(com.mojang.serialization.Dynamic) -> <init>
+    389:394:com.mojang.serialization.Dynamic getBlock(int) -> a
+    398:402:void setBlock(int,com.mojang.serialization.Dynamic) -> a
+    405:439:int upgrade(int) -> b
+    443:449:void addFix(int,int) -> a
+    452:470:com.mojang.serialization.Dynamic write() -> a
+    410:410:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$DataLayer lambda$upgrade$1(java.nio.ByteBuffer) -> a
+    409:409:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$DataLayer lambda$upgrade$0(java.nio.ByteBuffer) -> b
+    368:368:it.unimi.dsi.fastutil.ints.Int2ObjectMap access$300(net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Section) -> a
+    368:368:it.unimi.dsi.fastutil.ints.IntList access$2000(net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Section) -> b
+net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$UpgradeChunk -> afs$d:
     int sides -> a
     net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Section[] sections -> b
-    com.mojang.datafixers.Dynamic level -> c
+    com.mojang.serialization.Dynamic level -> c
     int x -> d
     int z -> e
     it.unimi.dsi.fastutil.ints.Int2ObjectMap blockEntities -> f
-    475:711:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    715:715:com.mojang.datafixers.Dynamic getBlockEntity(int) -> b
-    720:720:com.mojang.datafixers.Dynamic removeBlockEntity(int) -> c
-    724:735:int relative(int,net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction) -> a
-    739:750:void setBlock(int,com.mojang.datafixers.Dynamic) -> a
-    754:755:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Section getSection(int) -> d
-    759:769:com.mojang.datafixers.Dynamic getBlock(int) -> a
-    773:792:com.mojang.datafixers.Dynamic write() -> a
-    502:502:void lambda$new$3(java.util.stream.Stream) -> a
-    503:508:void lambda$null$2(com.mojang.datafixers.Dynamic) -> a
-    488:488:void lambda$new$1(java.util.stream.Stream) -> b
-    489:497:void lambda$null$0(com.mojang.datafixers.Dynamic) -> b
-net.minecraft.util.datafix.fixes.ChunkStatusFix -> ade:
+    477:713:void <init>(com.mojang.serialization.Dynamic) -> <init>
+    717:717:com.mojang.serialization.Dynamic getBlockEntity(int) -> b
+    722:722:com.mojang.serialization.Dynamic removeBlockEntity(int) -> c
+    726:737:int relative(int,net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Direction) -> a
+    741:752:void setBlock(int,com.mojang.serialization.Dynamic) -> a
+    756:757:net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix$Section getSection(int) -> d
+    761:771:com.mojang.serialization.Dynamic getBlock(int) -> a
+    775:794:com.mojang.serialization.Dynamic write() -> a
+    504:504:void lambda$new$3(java.util.stream.Stream) -> a
+    505:510:void lambda$null$2(com.mojang.serialization.Dynamic) -> a
+    490:490:void lambda$new$1(java.util.stream.Stream) -> b
+    491:499:void lambda$null$0(com.mojang.serialization.Dynamic) -> b
+net.minecraft.util.datafix.fixes.ChunkStatusFix -> aft:
     15:16:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     20:25:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     25:25:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     26:31:com.mojang.datafixers.Typed lambda$null$0(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.ChunkStatusFix2 -> adf:
+net.minecraft.util.datafix.fixes.ChunkStatusFix2 -> afu:
     java.util.Map RENAMES_AND_DOWNGRADES -> a
     30:31:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     35:40:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     40:40:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     41:48:com.mojang.datafixers.Typed lambda$null$0(com.mojang.datafixers.Typed) -> a
     16:27:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ChunkStructuresTemplateRenameFix -> adg:
+net.minecraft.util.datafix.fixes.ChunkStructuresTemplateRenameFix -> afv:
     com.google.common.collect.ImmutableMap RENAMES -> a
     105:106:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     110:112:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    116:124:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic,com.mojang.datafixers.Dynamic) -> a
+    116:124:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
     112:112:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     112:112:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.Typed,com.mojang.datafixers.Typed) -> a
-    112:112:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Typed,com.mojang.datafixers.Dynamic) -> a
+    112:112:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.datafixers.Typed,com.mojang.serialization.Dynamic) -> a
     14:102:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ChunkToProtochunkFix -> adh:
-    24:25:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    29:82:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    87:87:short packOffsetCoordinates(int,int,int) -> a
-    39:39:com.mojang.datafixers.Typed lambda$makeRule$4(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    40:80:com.mojang.datafixers.Typed lambda$null$3(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
-    80:80:java.lang.IllegalStateException lambda$null$2() -> a
-    67:72:void lambda$null$1(java.util.List,com.mojang.datafixers.Dynamic,com.mojang.datafixers.Dynamic) -> a
-    63:63:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic,int) -> a
-net.minecraft.util.datafix.fixes.ColorlessShulkerEntityFix -> adi:
+net.minecraft.util.datafix.fixes.ChunkToProtochunkFix -> afw:
+    26:27:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    31:84:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    89:89:short packOffsetCoordinates(int,int,int) -> a
+    41:41:com.mojang.datafixers.Typed lambda$makeRule$7(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    42:82:com.mojang.datafixers.Typed lambda$null$6(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
+    82:82:java.lang.IllegalStateException lambda$null$5() -> a
+    76:76:com.mojang.serialization.Dynamic lambda$null$4(com.mojang.serialization.Dynamic,it.unimi.dsi.fastutil.shorts.ShortList) -> a
+    69:74:void lambda$null$3(java.util.List,com.mojang.serialization.Dynamic) -> a
+    65:65:it.unimi.dsi.fastutil.shorts.ShortArrayList lambda$null$2(int) -> a
+    42:42:java.util.Optional lambda$null$1(com.mojang.serialization.Dynamic) -> a
+    42:42:java.util.Optional lambda$null$0(com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.ColorlessShulkerEntityFix -> afx:
     9:10:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     14:14:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-    15:18:com.mojang.datafixers.Dynamic lambda$fix$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.DyeItemRenameFix -> adj:
+    15:18:com.mojang.serialization.Dynamic lambda$fix$0(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.DyeItemRenameFix -> afy:
     java.util.Map RENAMED_IDS -> a
     7:7:void <init>() -> <init>
     8:12:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityArmorStandSilentFix -> adk:
+net.minecraft.util.datafix.fixes.EntityArmorStandSilentFix -> afz:
     10:11:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    14:17:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    14:17:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     22:22:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.EntityBlockStateFix -> adl:
+net.minecraft.util.datafix.fixes.EntityBlockStateFix -> aga:
     java.util.Map MAP -> a
     34:35:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     295:296:int getBlockId(java.lang.String) -> a
@@ -34164,11 +36856,11 @@ net.minecraft.util.datafix.fixes.EntityBlockStateFix -> adl:
     339:355:com.mojang.datafixers.Typed updateFallingBlock(com.mojang.datafixers.Typed) -> a
     359:369:com.mojang.datafixers.Typed updateBlockToBlockState(com.mojang.datafixers.Typed,java.lang.String,java.lang.String,java.lang.String) -> a
     373:375:com.mojang.datafixers.Typed updateEntity(com.mojang.datafixers.Typed,java.lang.String,java.util.function.Function) -> a
-    365:368:com.mojang.datafixers.util.Pair lambda$updateBlockToBlockState$12(com.mojang.datafixers.Dynamic,java.lang.String,com.mojang.datafixers.util.Pair) -> a
+    365:368:com.mojang.datafixers.util.Pair lambda$updateBlockToBlockState$12(com.mojang.serialization.Dynamic,java.lang.String,com.mojang.datafixers.util.Pair) -> a
     365:365:java.lang.Integer lambda$null$11(java.lang.Integer) -> a
-    345:354:com.mojang.datafixers.util.Either lambda$updateFallingBlock$10(com.mojang.datafixers.Dynamic,com.mojang.datafixers.util.Either) -> a
-    349:350:java.lang.Integer lambda$null$9(com.mojang.datafixers.Dynamic,com.mojang.datafixers.util.Unit) -> a
-    350:350:java.lang.Integer lambda$null$8(com.mojang.datafixers.Dynamic) -> a
+    345:354:com.mojang.datafixers.util.Either lambda$updateFallingBlock$10(com.mojang.serialization.Dynamic,com.mojang.datafixers.util.Either) -> a
+    349:350:java.lang.Integer lambda$null$9(com.mojang.serialization.Dynamic,com.mojang.datafixers.util.Unit) -> a
+    350:350:java.lang.Integer lambda$null$8(com.mojang.serialization.Dynamic) -> a
     347:347:java.lang.Integer lambda$null$7(com.mojang.datafixers.util.Pair) -> a
     347:347:java.lang.Integer lambda$null$6(java.lang.Integer) -> b
     315:334:com.mojang.datafixers.Typed lambda$makeRule$5(java.util.function.Function,java.util.function.Function,java.util.function.Function,com.mojang.datafixers.Typed) -> a
@@ -34178,194 +36870,277 @@ net.minecraft.util.datafix.fixes.EntityBlockStateFix -> adl:
     304:304:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.Typed) -> d
     38:292:void lambda$static$0(java.util.HashMap) -> a
     37:37:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityCatSplitFix -> adm:
+net.minecraft.util.datafix.fixes.EntityCatSplitFix -> agb:
     11:12:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    16:31:com.mojang.datafixers.util.Pair getNewNameAndTag(java.lang.String,com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.EntityCodSalmonFix -> adn:
+    16:31:com.mojang.datafixers.util.Pair getNewNameAndTag(java.lang.String,com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.EntityCodSalmonFix -> agc:
     java.util.Map RENAMED_IDS -> a
     java.util.Map RENAMED_EGG_IDS -> b
     20:21:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     25:25:java.lang.String rename(java.lang.String) -> a
     9:17:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityCustomNameToComponentFix -> ado:
-    17:18:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    22:23:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    33:37:com.mojang.datafixers.Dynamic fixTagCustomName(com.mojang.datafixers.Dynamic) -> a
-    23:23:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    24:28:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Typed,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.EntityElderGuardianSplitFix -> adp:
+net.minecraft.util.datafix.fixes.EntityCustomNameToComponentFix -> agd:
+    19:20:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    24:25:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    35:39:com.mojang.serialization.Dynamic fixTagCustomName(com.mojang.serialization.Dynamic) -> a
+    25:25:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    26:30:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.datafixers.Typed,com.mojang.datafixers.OpticFinder,com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.EntityElderGuardianSplitFix -> age:
     11:12:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    16:16:com.mojang.datafixers.util.Pair getNewNameAndTag(java.lang.String,com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.EntityEquipmentToArmorAndHandFix -> adq:
+    16:16:com.mojang.datafixers.util.Pair getNewNameAndTag(java.lang.String,com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.EntityEquipmentToArmorAndHandFix -> agf:
     32:33:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     37:37:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     42:56:com.mojang.datafixers.TypeRewriteRule cap(com.mojang.datafixers.types.Type) -> a
     57:107:com.mojang.datafixers.Typed lambda$cap$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
-    85:85:com.mojang.datafixers.Dynamic lambda$null$1(com.mojang.datafixers.Dynamic) -> a
+    85:85:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic) -> a
     66:66:java.lang.IllegalStateException lambda$null$0() -> a
-net.minecraft.util.datafix.fixes.EntityHealthFix -> adr:
+net.minecraft.util.datafix.fixes.EntityHealthFix -> agg:
     java.util.Set ENTITIES -> a
     15:16:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    58:68:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    58:68:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     73:73:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     73:73:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.Typed) -> a
     18:18:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityHorseSaddleFix -> ads:
-    15:16:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    22:41:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.EntityHorseSplitFix -> adt:
+net.minecraft.util.datafix.fixes.EntityHorseSaddleFix -> agh:
+    17:18:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    24:43:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.EntityHorseSplitFix -> agi:
     14:15:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     19:46:com.mojang.datafixers.util.Pair fix(java.lang.String,com.mojang.datafixers.Typed) -> a
     44:44:java.lang.IllegalStateException lambda$fix$0() -> a
-net.minecraft.util.datafix.fixes.EntityIdFix -> adu:
+net.minecraft.util.datafix.fixes.EntityIdFix -> agj:
     java.util.Map ID_MAP -> a
     15:16:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     98:106:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    106:106:java.util.function.Function lambda$makeRule$3(com.mojang.datafixers.types.DynamicOps) -> a
+    106:106:java.util.function.Function lambda$makeRule$3(com.mojang.serialization.DynamicOps) -> a
     107:107:com.mojang.datafixers.util.Pair lambda$null$2(com.mojang.datafixers.util.Pair) -> a
     107:107:java.lang.String lambda$null$1(java.lang.String) -> a
     19:94:void lambda$static$0(java.util.HashMap) -> a
     18:18:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityItemFrameDirectionFix -> adv:
+net.minecraft.util.datafix.fixes.EntityItemFrameDirectionFix -> agk:
     10:11:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    14:14:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    14:14:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     19:19:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
     23:32:byte direction2dTo3d(byte) -> a
-net.minecraft.util.datafix.fixes.EntityMinecartIdentifiersFix -> adw:
+net.minecraft.util.datafix.fixes.EntityMinecartIdentifiersFix -> agl:
     java.util.List MINECART_BY_ID -> a
     18:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     30:33:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    33:33:java.util.function.Function lambda$makeRule$2(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.DynamicOps) -> a
-    34:47:com.mojang.datafixers.util.Pair lambda$null$1(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.DynamicOps,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.util.Pair) -> a
-    45:45:java.lang.IllegalStateException lambda$null$0() -> a
+    33:33:java.util.function.Function lambda$makeRule$3(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.serialization.DynamicOps) -> a
+    34:47:com.mojang.datafixers.util.Pair lambda$null$2(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.serialization.DynamicOps,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.util.Pair) -> a
+    45:45:java.lang.IllegalStateException lambda$null$1() -> a
+    45:45:com.mojang.serialization.DataResult lambda$null$0(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,java.lang.String,com.mojang.serialization.Dynamic) -> a
     21:21:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityPaintingItemFrameDirectionFix -> adx:
+net.minecraft.util.datafix.fixes.EntityPaintingItemFrameDirectionFix -> agm:
     int[][] DIRECTIONS -> a
     20:21:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    24:46:com.mojang.datafixers.Dynamic doFix(com.mojang.datafixers.Dynamic,boolean,boolean) -> a
+    24:46:com.mojang.serialization.Dynamic doFix(com.mojang.serialization.Dynamic,boolean,boolean) -> a
     51:66:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     63:63:com.mojang.datafixers.Typed lambda$makeRule$5(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
     63:63:com.mojang.datafixers.Typed lambda$null$4(com.mojang.datafixers.Typed) -> a
-    63:63:com.mojang.datafixers.Dynamic lambda$null$3(com.mojang.datafixers.Dynamic) -> a
+    63:63:com.mojang.serialization.Dynamic lambda$null$3(com.mojang.serialization.Dynamic) -> a
     60:60:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> b
     60:60:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.Typed) -> b
-    60:60:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> b
+    60:60:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> b
     12:12:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityPaintingMotiveFix -> ady:
+net.minecraft.util.datafix.fixes.EntityPaintingMotiveFix -> agn:
     java.util.Map MAP -> a
     17:18:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    27:32:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    27:32:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     37:37:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
     21:24:void lambda$static$0(java.util.HashMap) -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityPufferfishRenameFix -> adz:
+net.minecraft.util.datafix.fixes.EntityProjectileOwnerFix -> ago:
+    19:20:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    24:25:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    29:48:com.mojang.datafixers.Typed updateProjectiles(com.mojang.datafixers.Typed) -> a
+    52:55:com.mojang.serialization.Dynamic updateOwnerArrow(com.mojang.serialization.Dynamic) -> a
+    59:63:com.mojang.serialization.Dynamic updateOwnerLlamaSpit(com.mojang.serialization.Dynamic) -> b
+    67:68:com.mojang.serialization.Dynamic updateItemPotion(com.mojang.serialization.Dynamic) -> c
+    72:77:com.mojang.serialization.Dynamic updateOwnerThrowable(com.mojang.serialization.Dynamic) -> d
+    81:85:com.mojang.serialization.Dynamic setUUID(com.mojang.serialization.Dynamic,long,long) -> a
+    89:89:int[] createUUIDArray(long,long) -> a
+    98:100:com.mojang.datafixers.Typed updateEntity(com.mojang.datafixers.Typed,java.lang.String,java.util.function.Function) -> a
+    100:100:com.mojang.datafixers.Typed lambda$updateEntity$0(java.util.function.Function,com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.EntityPufferfishRenameFix -> agp:
     java.util.Map RENAMED_IDS -> a
     15:16:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     20:20:java.lang.String rename(java.lang.String) -> a
     10:12:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityRavagerRenameFix -> aea:
+net.minecraft.util.datafix.fixes.EntityRavagerRenameFix -> agq:
     java.util.Map RENAMED_IDS -> a
     15:16:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     20:20:java.lang.String rename(java.lang.String) -> a
     10:12:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityRedundantChanceTagsFix -> aeb:
-    15:16:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    20:20:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    20:20:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.Typed) -> a
-    21:29:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic) -> a
-    26:26:com.mojang.datafixers.Dynamic lambda$null$1(com.mojang.datafixers.Dynamic) -> b
-    22:22:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> c
-net.minecraft.util.datafix.fixes.EntityRenameFix -> aec:
+net.minecraft.util.datafix.fixes.EntityRedundantChanceTagsFix -> agr:
+    com.mojang.serialization.Codec FLOAT_LIST_CODEC -> a
+    16:17:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    22:22:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    35:35:boolean isZeroList(com.mojang.serialization.OptionalDynamic,int) -> a
+    35:35:java.lang.Boolean lambda$isZeroList$3(int,java.util.List) -> a
+    35:35:boolean lambda$null$2(java.lang.Float) -> a
+    22:22:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.Typed) -> a
+    23:30:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> a
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.EntityRenameFix -> ags:
     java.lang.String name -> a
     16:18:void <init>(java.lang.String,com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     23:26:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    43:43:com.mojang.datafixers.Typed getEntity(java.lang.Object,com.mojang.datafixers.types.DynamicOps,com.mojang.datafixers.types.Type) -> a
+    43:43:com.mojang.datafixers.Typed getEntity(java.lang.Object,com.mojang.serialization.DynamicOps,com.mojang.datafixers.types.Type) -> a
     com.mojang.datafixers.util.Pair fix(java.lang.String,com.mojang.datafixers.Typed) -> a
-    26:26:java.util.function.Function lambda$makeRule$1(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.DynamicOps) -> a
-    27:37:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.DynamicOps,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.util.Pair) -> a
-net.minecraft.util.datafix.fixes.EntityRidingToPassengersFix -> aed:
+    26:26:java.util.function.Function lambda$makeRule$1(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.serialization.DynamicOps) -> a
+    27:37:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.serialization.DynamicOps,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.util.Pair) -> a
+net.minecraft.util.datafix.fixes.EntityRidingToPassengersFix -> agt:
     22:23:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     27:34:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     38:90:com.mojang.datafixers.TypeRewriteRule cap(com.mojang.datafixers.schemas.Schema,com.mojang.datafixers.schemas.Schema,com.mojang.datafixers.types.Type,com.mojang.datafixers.types.Type,com.mojang.datafixers.types.Type) -> a
-    67:67:java.util.function.Function lambda$cap$6(com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.DynamicOps) -> a
-    68:87:com.mojang.datafixers.util.Pair lambda$null$5(com.mojang.datafixers.types.Type,com.mojang.datafixers.types.DynamicOps,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.util.Pair) -> a
+    67:67:java.util.function.Function lambda$cap$6(com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.serialization.DynamicOps) -> a
+    68:87:com.mojang.datafixers.util.Pair lambda$null$5(com.mojang.datafixers.types.Type,com.mojang.serialization.DynamicOps,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.util.Pair) -> a
     87:87:java.lang.IllegalStateException lambda$null$4() -> a
     84:84:java.lang.IllegalStateException lambda$null$3() -> b
-    73:75:com.mojang.datafixers.util.Either lambda$null$2(com.mojang.datafixers.types.Type,com.mojang.datafixers.types.DynamicOps,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.util.Pair) -> a
+    73:75:com.mojang.datafixers.util.Either lambda$null$2(com.mojang.datafixers.types.Type,com.mojang.serialization.DynamicOps,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.util.Pair) -> a
     74:74:java.lang.IllegalStateException lambda$null$1() -> c
     73:73:java.lang.IllegalStateException lambda$null$0() -> d
-net.minecraft.util.datafix.fixes.EntityShulkerColorFix -> aee:
+net.minecraft.util.datafix.fixes.EntityShulkerColorFix -> agu:
     10:11:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    14:17:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    14:17:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     22:22:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.EntitySkeletonSplitFix -> aef:
+net.minecraft.util.datafix.fixes.EntityShulkerRotationFix -> agv:
+    12:13:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    16:21:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
+    26:26:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+    16:16:java.lang.Double lambda$fixTag$0(com.mojang.serialization.Dynamic) -> b
+net.minecraft.util.datafix.fixes.EntitySkeletonSplitFix -> agw:
     11:12:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    16:24:com.mojang.datafixers.util.Pair getNewNameAndTag(java.lang.String,com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.EntityStringUuidFix -> aeg:
+    16:24:com.mojang.datafixers.util.Pair getNewNameAndTag(java.lang.String,com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.EntityStringUuidFix -> agx:
     13:14:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     18:18:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     18:18:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.Typed) -> a
-    19:27:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.EntityTheRenameningFix -> aeh:
+    19:27:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.EntityTheRenameningFix -> agy:
     java.util.Map RENAMED_IDS -> a
     java.util.Map RENAMED_BLOCKS -> b
     java.util.Map RENAMED_ITEMS -> c
     52:53:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     58:61:java.lang.String rename(java.lang.String) -> a
     9:47:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.EntityTippedArrowFix -> aei:
+net.minecraft.util.datafix.fixes.EntityTippedArrowFix -> agz:
     9:10:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     14:14:java.lang.String rename(java.lang.String) -> a
-net.minecraft.util.datafix.fixes.EntityWolfColorFix -> aej:
+net.minecraft.util.datafix.fixes.EntityUUIDFix -> aha:
+    java.util.Set ABSTRACT_HORSES -> c
+    java.util.Set TAMEABLE_ANIMALS -> d
+    java.util.Set ANIMALS -> e
+    java.util.Set MOBS -> f
+    java.util.Set LIVING_ENTITIES -> g
+    java.util.Set PROJECTILES -> h
+    108:109:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    113:113:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    147:147:com.mojang.serialization.Dynamic updatePiglin(com.mojang.serialization.Dynamic) -> d
+    158:158:com.mojang.serialization.Dynamic updateEvokerFangs(com.mojang.serialization.Dynamic) -> e
+    162:162:com.mojang.serialization.Dynamic updateZombieVillager(com.mojang.serialization.Dynamic) -> f
+    166:166:com.mojang.serialization.Dynamic updateAreaEffectCloud(com.mojang.serialization.Dynamic) -> g
+    170:171:com.mojang.serialization.Dynamic updateShulkerBullet(com.mojang.serialization.Dynamic) -> h
+    175:176:com.mojang.serialization.Dynamic updateItem(com.mojang.serialization.Dynamic) -> i
+    180:188:com.mojang.serialization.Dynamic updateFox(com.mojang.serialization.Dynamic) -> j
+    194:194:com.mojang.serialization.Dynamic updateHurtBy(com.mojang.serialization.Dynamic) -> k
+    198:199:com.mojang.serialization.Dynamic updateAnimalOwner(com.mojang.serialization.Dynamic) -> l
+    203:204:com.mojang.serialization.Dynamic updateAnimal(com.mojang.serialization.Dynamic) -> m
+    208:208:com.mojang.serialization.Dynamic updateMob(com.mojang.serialization.Dynamic) -> n
+    214:214:com.mojang.serialization.Dynamic updateLivingEntity(com.mojang.serialization.Dynamic) -> b
+    226:226:com.mojang.serialization.Dynamic updateProjectile(com.mojang.serialization.Dynamic) -> o
+    232:232:com.mojang.serialization.Dynamic updateEntityUUID(com.mojang.serialization.Dynamic) -> c
+    227:227:com.mojang.serialization.Dynamic lambda$updateProjectile$14(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    215:215:com.mojang.serialization.Dynamic lambda$updateLivingEntity$13(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> b
+    216:216:com.mojang.serialization.Dynamic lambda$null$12(com.mojang.serialization.Dynamic) -> p
+    217:217:com.mojang.serialization.Dynamic lambda$null$11(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> c
+    218:218:com.mojang.serialization.Dynamic lambda$null$10(com.mojang.serialization.Dynamic) -> q
+    209:209:com.mojang.serialization.Dynamic lambda$updateMob$9(com.mojang.serialization.Dynamic) -> r
+    189:189:com.mojang.serialization.Dynamic lambda$updateFox$8(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> d
+    181:181:com.mojang.serialization.Dynamic lambda$updateFox$7(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> e
+    182:182:com.mojang.serialization.Dynamic lambda$null$6(com.mojang.serialization.Dynamic) -> s
+    183:184:com.mojang.serialization.Dynamic lambda$null$5(com.mojang.serialization.Dynamic) -> t
+    147:147:com.mojang.serialization.Dynamic lambda$updatePiglin$4(com.mojang.serialization.Dynamic) -> u
+    148:148:com.mojang.serialization.Dynamic lambda$null$3(com.mojang.serialization.Dynamic) -> v
+    149:149:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> w
+    150:151:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic) -> x
+    114:142:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.Typed) -> a
+    14:104:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.EntityWolfColorFix -> ahb:
     10:11:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    14:14:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    14:14:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     19:19:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-    14:14:com.mojang.datafixers.Dynamic lambda$fixTag$0(com.mojang.datafixers.Dynamic) -> b
-net.minecraft.util.datafix.fixes.EntityZombieSplitFix -> aek:
+    14:14:com.mojang.serialization.Dynamic lambda$fixTag$0(com.mojang.serialization.Dynamic) -> b
+net.minecraft.util.datafix.fixes.EntityZombieSplitFix -> ahc:
     11:12:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    16:38:com.mojang.datafixers.util.Pair getNewNameAndTag(java.lang.String,com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.EntityZombieVillagerTypeFix -> ael:
+    16:38:com.mojang.datafixers.util.Pair getNewNameAndTag(java.lang.String,com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.EntityZombieVillagerTypeFix -> ahd:
     java.util.Random RANDOM -> a
     14:15:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    20:32:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    20:32:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     36:39:int getVillagerProfession(int) -> a
     44:44:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
     17:17:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ForcePoiRebuild -> aem:
+net.minecraft.util.datafix.fixes.EntityZombifiedPiglinRenameFix -> ahe:
+    java.util.Map RENAMED_IDS -> a
+    15:16:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    20:20:java.lang.String rename(java.lang.String) -> a
+    10:12:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.ForcePoiRebuild -> ahf:
     18:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     23:28:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    32:32:com.mojang.datafixers.Dynamic cap(com.mojang.datafixers.Dynamic) -> a
-    33:33:com.mojang.datafixers.Dynamic lambda$cap$4(com.mojang.datafixers.Dynamic) -> b
+    32:32:com.mojang.serialization.Dynamic cap(com.mojang.serialization.Dynamic) -> a
+    33:33:com.mojang.serialization.Dynamic lambda$cap$4(com.mojang.serialization.Dynamic) -> b
     33:33:com.mojang.datafixers.util.Pair lambda$null$3(com.mojang.datafixers.util.Pair) -> a
-    33:33:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic) -> c
-    28:28:java.util.function.Function lambda$makeRule$1(com.mojang.datafixers.types.DynamicOps) -> a
+    33:33:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> c
+    28:28:java.util.function.Function lambda$makeRule$1(com.mojang.serialization.DynamicOps) -> a
     28:28:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.util.Pair) -> b
-net.minecraft.util.datafix.fixes.HeightmapRenamingFix -> aen:
+net.minecraft.util.datafix.fixes.FurnaceRecipeFix -> ahg:
+    29:30:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    34:34:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    38:53:com.mojang.datafixers.TypeRewriteRule cap(com.mojang.datafixers.types.Type) -> a
+    62:84:com.mojang.datafixers.Typed updateFurnaceContents(com.mojang.datafixers.types.Type,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
+    76:78:void lambda$updateFurnaceContents$5(com.mojang.datafixers.types.Type,java.util.List,int,com.mojang.serialization.Dynamic) -> a
+    77:77:void lambda$null$4(java.util.List,int,com.mojang.datafixers.util.Pair) -> a
+    54:57:com.mojang.datafixers.Typed lambda$cap$3(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.types.Type,com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
+    57:57:com.mojang.datafixers.Typed lambda$null$2(com.mojang.datafixers.types.Type,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> b
+    56:56:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.types.Type,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> c
+    55:55:com.mojang.datafixers.Typed lambda$null$0(com.mojang.datafixers.types.Type,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> d
+net.minecraft.util.datafix.fixes.GossipUUIDFix -> ahh:
+    10:11:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String) -> <init>
+    15:15:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+    16:16:com.mojang.serialization.Dynamic lambda$fix$3(com.mojang.serialization.Dynamic) -> a
+    17:21:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> b
+    20:20:java.util.stream.Stream lambda$null$1(java.util.stream.Stream) -> a
+    20:20:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> c
+net.minecraft.util.datafix.fixes.HeightmapRenamingFix -> ahi:
     15:16:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     20:22:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    28:61:com.mojang.datafixers.Dynamic fix(com.mojang.datafixers.Dynamic) -> a
+    28:61:com.mojang.serialization.Dynamic fix(com.mojang.serialization.Dynamic) -> a
     22:22:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     23:23:com.mojang.datafixers.Typed lambda$null$0(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.IglooMetadataRemovalFix -> aeo:
+net.minecraft.util.datafix.fixes.IglooMetadataRemovalFix -> ahj:
     11:12:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     16:19:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    23:28:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
-    33:33:com.mojang.datafixers.Dynamic removeIglooPieces(com.mojang.datafixers.Dynamic) -> b
-    37:37:boolean isIglooPiece(com.mojang.datafixers.Dynamic) -> c
+    23:28:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
+    33:33:com.mojang.serialization.Dynamic removeIglooPieces(com.mojang.serialization.Dynamic) -> b
+    37:37:boolean isIglooPiece(com.mojang.serialization.Dynamic) -> c
     33:33:java.util.stream.Stream lambda$removeIglooPieces$2(java.util.stream.Stream) -> a
-    33:33:boolean lambda$null$1(com.mojang.datafixers.Dynamic) -> d
+    33:33:boolean lambda$null$1(com.mojang.serialization.Dynamic) -> d
     23:23:java.lang.Boolean lambda$fixTag$0(java.util.stream.Stream) -> b
-net.minecraft.util.datafix.fixes.ItemBannerColorFix -> aep:
-    19:20:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    24:30:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    31:66:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.ItemCustomNameToComponentFix -> aeq:
+net.minecraft.util.datafix.fixes.ItemBannerColorFix -> ahk:
+    22:23:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    27:33:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    34:70:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.ItemCustomNameToComponentFix -> ahl:
     18:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    22:37:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    22:37:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     42:45:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     45:45:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     45:45:com.mojang.datafixers.Typed lambda$null$0(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.ItemIdFix -> aer:
+net.minecraft.util.datafix.fixes.ItemIdFix -> ahm:
     it.unimi.dsi.fastutil.ints.Int2ObjectMap ITEM_NAMES -> a
     22:23:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     345:345:java.lang.String getItem(int) -> a
@@ -34376,103 +37151,128 @@ net.minecraft.util.datafix.fixes.ItemIdFix -> aer:
     356:356:com.mojang.datafixers.util.Pair lambda$null$1(java.lang.Integer) -> a
     26:342:void lambda$static$0(it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap) -> a
     25:25:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ItemLoreFix -> aes:
+net.minecraft.util.datafix.fixes.ItemLoreFix -> ahn:
     18:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     23:26:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     40:40:java.util.stream.Stream fixLoreList(java.util.stream.Stream) -> a
     46:46:java.lang.String fixLoreEntry(java.lang.String) -> a
-    41:41:com.mojang.datafixers.Dynamic lambda$fixLoreList$5(com.mojang.datafixers.Dynamic) -> a
+    41:41:com.mojang.serialization.Dynamic lambda$fixLoreList$5(com.mojang.serialization.Dynamic) -> a
     27:27:com.mojang.datafixers.Typed lambda$makeRule$4(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     28:28:com.mojang.datafixers.Typed lambda$null$3(com.mojang.datafixers.Typed) -> a
-    29:29:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic) -> b
-    30:30:com.mojang.datafixers.Dynamic lambda$null$1(com.mojang.datafixers.Dynamic) -> c
-    31:31:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> d
-net.minecraft.util.datafix.fixes.ItemPotionFix -> aet:
+    29:29:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> b
+    30:30:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic) -> c
+    31:31:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> d
+net.minecraft.util.datafix.fixes.ItemPotionFix -> aho:
     java.lang.String[] POTIONS -> a
     23:24:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     162:166:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     167:193:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     28:156:void lambda$static$0(java.lang.String[]) -> a
     27:27:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ItemRenameFix -> aeu:
+net.minecraft.util.datafix.fixes.ItemRenameFix -> ahp:
     java.lang.String name -> a
     19:21:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String) -> <init>
     25:29:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     java.lang.String fixItem(java.lang.String) -> a
     35:35:com.mojang.datafixers.DataFix create(com.mojang.datafixers.schemas.Schema,java.lang.String,java.util.function.Function) -> a
-    29:29:java.util.function.Function lambda$makeRule$1(com.mojang.datafixers.types.DynamicOps) -> a
+    29:29:java.util.function.Function lambda$makeRule$1(com.mojang.serialization.DynamicOps) -> a
     29:29:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.util.Pair) -> a
-net.minecraft.util.datafix.fixes.ItemRenameFix$1 -> aeu$1:
+net.minecraft.util.datafix.fixes.ItemRenameFix$1 -> ahp$1:
     java.util.function.Function val$fixItem -> a
     35:35:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String,java.util.function.Function) -> <init>
     38:38:java.lang.String fixItem(java.lang.String) -> a
-net.minecraft.util.datafix.fixes.ItemShulkerBoxColorFix -> aev:
+net.minecraft.util.datafix.fixes.ItemShulkerBoxColorFix -> ahq:
     java.lang.String[] NAMES_BY_COLOR -> a
-    18:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    42:48:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    49:64:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    21:21:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ItemSpawnEggFix -> aew:
+    20:21:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    44:50:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    51:66:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    23:23:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.ItemSpawnEggFix -> ahr:
     java.lang.String[] ID_TO_ENTITY -> a
-    19:20:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    105:114:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    115:144:com.mojang.datafixers.Typed lambda$makeRule$5(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    134:134:java.lang.IllegalStateException lambda$null$4() -> a
-    123:123:java.util.Optional lambda$null$3(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    122:122:java.util.Optional lambda$null$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> b
-    121:121:java.util.Optional lambda$null$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> c
-    24:101:void lambda$static$0(java.lang.String[]) -> a
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ItemStackEnchantmentNamesFix -> aex:
+    21:22:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    107:118:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    119:153:com.mojang.datafixers.Typed lambda$makeRule$6(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
+    141:141:java.lang.IllegalStateException lambda$null$5() -> a
+    139:139:com.mojang.serialization.DataResult lambda$null$4(com.mojang.datafixers.types.Type,com.mojang.serialization.Dynamic,java.lang.String,com.mojang.serialization.Dynamic) -> a
+    127:127:java.util.Optional lambda$null$3(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    126:126:java.util.Optional lambda$null$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> b
+    125:125:java.util.Optional lambda$null$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> c
+    26:103:void lambda$static$0(java.lang.String[]) -> a
+    24:24:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.ItemStackEnchantmentNamesFix -> ahs:
     it.unimi.dsi.fastutil.ints.Int2ObjectMap MAP -> a
     61:62:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     66:68:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    72:80:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
-    80:83:com.mojang.datafixers.Dynamic lambda$fixTag$7(com.mojang.datafixers.Dynamic) -> b
+    72:80:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
+    80:83:com.mojang.serialization.Dynamic lambda$fixTag$7(com.mojang.serialization.Dynamic) -> b
     81:81:java.util.stream.Stream lambda$null$6(java.util.stream.Stream) -> a
-    82:82:com.mojang.datafixers.Dynamic lambda$null$5(com.mojang.datafixers.Dynamic) -> c
+    82:82:com.mojang.serialization.Dynamic lambda$null$5(com.mojang.serialization.Dynamic) -> c
     72:72:java.util.stream.Stream lambda$fixTag$4(java.util.stream.Stream) -> b
-    73:73:com.mojang.datafixers.Dynamic lambda$null$3(com.mojang.datafixers.Dynamic) -> d
+    73:73:com.mojang.serialization.Dynamic lambda$null$3(com.mojang.serialization.Dynamic) -> d
     68:68:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     68:68:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.Typed) -> a
     18:58:void lambda$static$0(it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap) -> a
     17:17:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ItemStackMapIdFix -> aey:
-    18:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    23:28:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    29:37:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.ItemStackSpawnEggFix -> aez:
-    java.util.Map MAP -> a
+net.minecraft.util.datafix.fixes.ItemStackMapIdFix -> aht:
     20:21:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    73:80:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    81:91:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    24:69:void lambda$static$0(java.util.HashMap) -> a
-    23:23:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ItemStackTheFlatteningFix -> afa:
+    25:30:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    31:39:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.ItemStackSpawnEggFix -> ahu:
+    java.util.Map MAP -> a
+    22:23:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    75:82:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    83:93:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    26:71:void lambda$static$0(java.util.HashMap) -> a
+    25:25:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.ItemStackTheFlatteningFix -> ahv:
     java.util.Map MAP -> a
     java.util.Set IDS -> b
     java.util.Set DAMAGE_IDS -> c
-    24:25:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    410:415:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    444:448:java.lang.String updateItem(java.lang.String,int) -> a
-    416:438:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    351:351:java.lang.String lambda$static$1(java.lang.String) -> a
-    28:349:void lambda$static$0(java.util.HashMap) -> a
-    27:353:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ItemWaterPotionFix -> afb:
-    17:18:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    22:27:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    28:44:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.ItemWrittenBookPagesStrictJsonFix -> afc:
+    26:27:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    412:417:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    446:450:java.lang.String updateItem(java.lang.String,int) -> a
+    418:440:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    353:353:java.lang.String lambda$static$1(java.lang.String) -> a
+    30:351:void lambda$static$0(java.util.HashMap) -> a
+    29:355:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.ItemStackUUIDFix -> ahw:
+    15:16:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    20:22:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    38:38:com.mojang.serialization.Dynamic updateAttributeModifiers(com.mojang.serialization.Dynamic) -> b
+    46:46:com.mojang.serialization.Dynamic updateSkullOwner(com.mojang.serialization.Dynamic) -> c
+    47:47:com.mojang.serialization.Dynamic lambda$updateSkullOwner$6(com.mojang.serialization.Dynamic) -> d
+    39:39:com.mojang.serialization.Dynamic lambda$updateAttributeModifiers$5(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    40:40:com.mojang.serialization.Dynamic lambda$null$4(com.mojang.serialization.Dynamic) -> e
+    23:24:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    25:25:com.mojang.datafixers.Typed lambda$null$2(com.mojang.datafixers.Typed,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    26:30:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.datafixers.Typed,com.mojang.datafixers.OpticFinder,com.mojang.serialization.Dynamic) -> a
+    27:27:java.lang.Boolean lambda$null$0(com.mojang.datafixers.util.Pair) -> a
+net.minecraft.util.datafix.fixes.ItemWaterPotionFix -> ahx:
     19:20:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    23:23:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
+    24:29:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    30:46:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.ItemWrittenBookPagesStrictJsonFix -> ahy:
+    19:20:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    23:23:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
     72:75:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     76:76:com.mojang.datafixers.Typed lambda$makeRule$4(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     77:77:com.mojang.datafixers.Typed lambda$null$3(com.mojang.datafixers.Typed) -> a
-    23:66:com.mojang.datafixers.Dynamic lambda$fixTag$2(com.mojang.datafixers.Dynamic,com.mojang.datafixers.Dynamic) -> a
+    23:66:com.mojang.serialization.Dynamic lambda$fixTag$2(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
     24:24:java.util.stream.Stream lambda$null$1(java.util.stream.Stream) -> a
-    25:65:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> b
-net.minecraft.util.datafix.fixes.LeavesFix -> afd:
+    25:65:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> b
+net.minecraft.util.datafix.fixes.JigsawPropertiesFix -> ahz:
+    10:11:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    14:21:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
+    26:26:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.JigsawRotationFix -> aia:
+    java.util.Map renames -> a
+    24:25:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    28:37:com.mojang.serialization.Dynamic fix(com.mojang.serialization.Dynamic) -> a
+    42:42:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    42:42:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.Typed) -> a
+    31:34:com.mojang.serialization.Dynamic lambda$fix$0(com.mojang.serialization.Dynamic) -> b
+    14:21:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.LeavesFix -> aib:
     int[][] DIRECTIONS -> a
     it.unimi.dsi.fastutil.objects.Object2IntMap LEAVES -> b
     java.util.Set LOGS -> c
@@ -34485,7 +37285,7 @@ net.minecraft.util.datafix.fixes.LeavesFix -> afd:
     362:384:int getSideMask(boolean,boolean,boolean,boolean) -> a
     105:105:com.mojang.datafixers.Typed lambda$makeRule$7(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     106:185:com.mojang.datafixers.Typed lambda$null$6(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    180:181:com.mojang.datafixers.Dynamic lambda$null$5(int[],com.mojang.datafixers.Dynamic) -> a
+    180:181:com.mojang.serialization.Dynamic lambda$null$5(int[],com.mojang.serialization.Dynamic) -> a
     109:175:com.mojang.datafixers.Typed lambda$null$4(com.mojang.datafixers.OpticFinder,int[],com.mojang.datafixers.Typed) -> a
     175:175:com.mojang.datafixers.Typed lambda$null$3(it.unimi.dsi.fastutil.ints.Int2ObjectMap,com.mojang.datafixers.Typed) -> a
     109:109:net.minecraft.util.datafix.fixes.LeavesFix$LeavesSection lambda$null$2(net.minecraft.util.datafix.fixes.LeavesFix$LeavesSection) -> a
@@ -34494,51 +37294,52 @@ net.minecraft.util.datafix.fixes.LeavesFix -> afd:
     35:35:it.unimi.dsi.fastutil.objects.Object2IntMap access$000() -> a
     35:35:java.util.Set access$100() -> b
     45:67:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.LeavesFix$LeavesSection -> afd$a:
+net.minecraft.util.datafix.fixes.LeavesFix$LeavesSection -> aib$a:
     it.unimi.dsi.fastutil.ints.IntSet leaveIds -> e
     it.unimi.dsi.fastutil.ints.IntSet logIds -> f
     it.unimi.dsi.fastutil.ints.Int2IntMap stateToIdMap -> g
     268:269:void <init>(com.mojang.datafixers.Typed,com.mojang.datafixers.schemas.Schema) -> <init>
     273:291:boolean skippable() -> a
-    295:302:com.mojang.datafixers.Dynamic makeLeafTag(com.mojang.datafixers.Dynamic,java.lang.String,boolean,int) -> a
+    295:302:com.mojang.serialization.Dynamic makeLeafTag(com.mojang.serialization.Dynamic,java.lang.String,boolean,int) -> a
     306:306:boolean isLog(int) -> a
     310:310:boolean isLeaf(int) -> b
     314:317:int getDistance(int) -> d
     321:342:void setDistance(int,int,int) -> a
     254:254:int access$200(net.minecraft.util.datafix.fixes.LeavesFix$LeavesSection,int) -> a
     254:254:void access$300(net.minecraft.util.datafix.fixes.LeavesFix$LeavesSection,int,int,int) -> a
-net.minecraft.util.datafix.fixes.LeavesFix$Section -> afd$b:
+net.minecraft.util.datafix.fixes.LeavesFix$Section -> aib$b:
     com.mojang.datafixers.types.Type blockStateType -> e
     com.mojang.datafixers.OpticFinder paletteFinder -> a
     java.util.List palette -> b
     int index -> c
-    net.minecraft.util.BitStorage storage -> d
+    net.minecraft.util.datafix.PackedBitStorage storage -> d
     193:214:void <init>(com.mojang.datafixers.Typed,com.mojang.datafixers.schemas.Schema) -> <init>
-    217:224:void readStorage(com.mojang.datafixers.Dynamic) -> a
+    217:224:void readStorage(com.mojang.serialization.Dynamic) -> a
     227:232:com.mojang.datafixers.Typed write(com.mojang.datafixers.Typed) -> a
     236:236:boolean isSkippable() -> b
     240:240:int getBlock(int) -> c
     244:244:int getStateId(java.lang.String,boolean,int) -> a
     248:248:int getIndex() -> c
     boolean skippable() -> a
-    232:232:com.mojang.datafixers.util.Pair lambda$write$2(com.mojang.datafixers.Dynamic) -> b
-    231:231:com.mojang.datafixers.Dynamic lambda$write$1(com.mojang.datafixers.Dynamic) -> c
+    232:232:com.mojang.datafixers.util.Pair lambda$write$2(com.mojang.serialization.Dynamic) -> b
+    231:231:com.mojang.serialization.Dynamic lambda$write$1(com.mojang.serialization.Dynamic) -> c
     208:208:java.util.List lambda$new$0(java.util.List) -> a
-net.minecraft.util.datafix.fixes.LevelDataGeneratorOptionsFix -> afe:
+net.minecraft.util.datafix.fixes.LevelDataGeneratorOptionsFix -> aic:
     java.util.Map MAP -> a
     110:111:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     115:116:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    134:198:com.mojang.datafixers.Dynamic convert(java.lang.String,com.mojang.datafixers.types.DynamicOps) -> a
-    204:218:com.mojang.datafixers.util.Pair getLayerInfoFromString(java.lang.String) -> a
-    222:233:java.util.List getLayersInfoFromString(java.lang.String) -> b
-    187:191:com.mojang.datafixers.util.Pair lambda$convert$5(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> a
-    190:190:com.mojang.datafixers.util.Pair lambda$null$4(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> b
-    181:183:java.lang.Object lambda$convert$3(com.mojang.datafixers.types.DynamicOps,com.mojang.datafixers.util.Pair) -> a
-    117:129:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
-    129:129:java.lang.IllegalStateException lambda$null$1() -> a
+    135:199:com.mojang.serialization.Dynamic convert(java.lang.String,com.mojang.serialization.DynamicOps) -> a
+    205:219:com.mojang.datafixers.util.Pair getLayerInfoFromString(java.lang.String) -> a
+    223:234:java.util.List getLayersInfoFromString(java.lang.String) -> b
+    188:192:com.mojang.datafixers.util.Pair lambda$convert$6(com.mojang.serialization.DynamicOps,java.util.Map$Entry) -> a
+    191:191:com.mojang.datafixers.util.Pair lambda$null$5(com.mojang.serialization.DynamicOps,java.util.Map$Entry) -> b
+    182:184:java.lang.Object lambda$convert$4(com.mojang.serialization.DynamicOps,com.mojang.datafixers.util.Pair) -> a
+    117:130:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
+    130:130:java.lang.IllegalStateException lambda$null$2() -> a
+    118:129:com.mojang.serialization.DataResult lambda$null$1(com.mojang.datafixers.types.Type,com.mojang.serialization.Dynamic) -> a
     30:106:void lambda$static$0(java.util.HashMap) -> a
     29:29:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.LevelFlatGeneratorInfoFix -> aff:
+net.minecraft.util.datafix.fixes.LevelFlatGeneratorInfoFix -> aid:
     com.google.common.base.Splitter SPLITTER -> a
     com.google.common.base.Splitter LAYER_SPLITTER -> b
     com.google.common.base.Splitter OLD_AMOUNT_SPLITTER -> c
@@ -34546,24 +37347,61 @@ net.minecraft.util.datafix.fixes.LevelFlatGeneratorInfoFix -> aff:
     com.google.common.base.Splitter BLOCK_SPLITTER -> e
     20:21:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     35:35:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    39:42:com.mojang.datafixers.Dynamic fix(com.mojang.datafixers.Dynamic) -> a
+    39:42:com.mojang.serialization.Dynamic fix(com.mojang.serialization.Dynamic) -> a
     47:99:java.lang.String fixString(java.lang.String) -> a
     75:92:java.lang.String lambda$fixString$2(com.google.common.base.Splitter,int,java.lang.String) -> a
-    40:40:com.mojang.datafixers.Dynamic lambda$fix$1(com.mojang.datafixers.Dynamic) -> b
+    40:40:com.mojang.serialization.Dynamic lambda$fix$1(com.mojang.serialization.Dynamic) -> b
     35:35:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.Typed) -> a
     27:31:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.MapIdFix -> afg:
-    15:16:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    20:22:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    23:29:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    29:29:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.MobSpawnerEntityIdentifiersFix -> afh:
-    18:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    22:50:com.mojang.datafixers.Dynamic fix(com.mojang.datafixers.Dynamic) -> a
-    55:56:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    57:64:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
-    38:46:com.mojang.datafixers.Dynamic lambda$fix$0(com.mojang.datafixers.Dynamic) -> b
-net.minecraft.util.datafix.fixes.NamedEntityFix -> afi:
+net.minecraft.util.datafix.fixes.LevelUUIDFix -> aie:
+    12:13:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    17:17:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    28:28:com.mojang.serialization.Dynamic updateWanderingTrader(com.mojang.serialization.Dynamic) -> b
+    32:32:com.mojang.serialization.Dynamic updateDragonFight(com.mojang.serialization.Dynamic) -> c
+    42:42:com.mojang.serialization.Dynamic updateCustomBossEvents(com.mojang.serialization.Dynamic) -> d
+    43:43:com.mojang.serialization.Dynamic lambda$updateCustomBossEvents$12(com.mojang.serialization.Dynamic) -> e
+    43:43:com.mojang.datafixers.util.Pair lambda$null$11(com.mojang.datafixers.util.Pair) -> a
+    44:44:com.mojang.serialization.Dynamic lambda$null$10(com.mojang.serialization.Dynamic) -> f
+    45:45:com.mojang.serialization.Dynamic lambda$null$9(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    46:46:com.mojang.serialization.Dynamic lambda$null$8(com.mojang.serialization.Dynamic) -> g
+    47:48:com.mojang.serialization.Dynamic lambda$null$7(com.mojang.serialization.Dynamic) -> h
+    33:33:com.mojang.serialization.Dynamic lambda$updateDragonFight$6(com.mojang.serialization.Dynamic) -> i
+    33:33:com.mojang.datafixers.util.Pair lambda$null$5(com.mojang.datafixers.util.Pair) -> b
+    34:34:com.mojang.serialization.Dynamic lambda$null$4(com.mojang.serialization.Dynamic) -> j
+    35:35:com.mojang.serialization.Dynamic lambda$null$3(com.mojang.serialization.Dynamic) -> k
+    18:18:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.Typed) -> a
+    18:18:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.Typed) -> b
+    19:22:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> l
+net.minecraft.util.datafix.fixes.MapIdFix -> aif:
+    16:17:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    21:23:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    24:30:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    30:30:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.MemoryExpiryDataFix -> aig:
+    31:32:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String) -> <init>
+    36:36:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+    40:40:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
+    44:44:com.mojang.serialization.Dynamic updateBrain(com.mojang.serialization.Dynamic) -> b
+    48:48:com.mojang.serialization.Dynamic updateMemories(com.mojang.serialization.Dynamic) -> c
+    52:52:com.mojang.datafixers.util.Pair updateMemoryEntry(com.mojang.datafixers.util.Pair) -> a
+    56:57:com.mojang.serialization.Dynamic wrapMemoryValue(com.mojang.serialization.Dynamic) -> d
+net.minecraft.util.datafix.fixes.MissingDimensionFix -> aih:
+    36:37:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    40:40:com.mojang.datafixers.types.Type fields(java.lang.String,com.mojang.datafixers.types.Type) -> a
+    44:44:com.mojang.datafixers.types.Type optionalFields(java.lang.String,com.mojang.datafixers.types.Type) -> b
+    48:51:com.mojang.datafixers.types.Type optionalFields(java.lang.String,com.mojang.datafixers.types.Type,java.lang.String,com.mojang.datafixers.types.Type) -> a
+    56:92:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    107:108:com.mojang.serialization.Dynamic recreateSettings(com.mojang.serialization.Dynamic) -> a
+    92:92:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.FieldFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.templates.CompoundList$CompoundListType,com.mojang.datafixers.Typed) -> a
+    92:92:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed,com.mojang.datafixers.types.templates.CompoundList$CompoundListType,com.mojang.datafixers.Typed) -> a
+    93:102:com.mojang.datafixers.Typed lambda$null$0(com.mojang.datafixers.Typed,com.mojang.datafixers.types.templates.CompoundList$CompoundListType,com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.MobSpawnerEntityIdentifiersFix -> aii:
+    19:20:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    23:51:com.mojang.serialization.Dynamic fix(com.mojang.serialization.Dynamic) -> a
+    56:57:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    58:65:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
+    39:47:com.mojang.serialization.Dynamic lambda$fix$0(com.mojang.serialization.Dynamic) -> b
+net.minecraft.util.datafix.fixes.NamedEntityFix -> aij:
     java.lang.String name -> a
     java.lang.String entityName -> b
     com.mojang.datafixers.DSL$TypeReference type -> c
@@ -34571,106 +37409,142 @@ net.minecraft.util.datafix.fixes.NamedEntityFix -> afi:
     24:26:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
     27:27:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.NewVillageFix -> afj:
+net.minecraft.util.datafix.fixes.NewVillageFix -> aik:
     22:23:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     27:30:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     34:57:com.mojang.datafixers.TypeRewriteRule cap(com.mojang.datafixers.types.templates.CompoundList$CompoundListType) -> a
     57:57:com.mojang.datafixers.Typed lambda$cap$13(com.mojang.datafixers.Typed) -> a
-    58:58:com.mojang.datafixers.Dynamic lambda$null$12(com.mojang.datafixers.Dynamic) -> a
-    59:59:com.mojang.datafixers.Dynamic lambda$null$11(com.mojang.datafixers.Dynamic) -> b
+    58:58:com.mojang.serialization.Dynamic lambda$null$12(com.mojang.serialization.Dynamic) -> a
+    59:59:com.mojang.serialization.Dynamic lambda$null$11(com.mojang.serialization.Dynamic) -> b
     42:42:com.mojang.datafixers.Typed lambda$cap$10(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     43:43:com.mojang.datafixers.Typed lambda$null$9(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     44:48:com.mojang.datafixers.Typed lambda$null$8(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    49:49:com.mojang.datafixers.Dynamic lambda$null$7(com.mojang.datafixers.Dynamic) -> c
-    50:51:com.mojang.datafixers.Dynamic lambda$null$6(com.mojang.datafixers.Dynamic) -> d
-    51:51:com.mojang.datafixers.Dynamic lambda$null$5(com.mojang.datafixers.Dynamic,com.mojang.datafixers.Dynamic) -> a
+    49:49:com.mojang.serialization.Dynamic lambda$null$7(com.mojang.serialization.Dynamic) -> c
+    50:51:com.mojang.serialization.Dynamic lambda$null$6(com.mojang.serialization.Dynamic) -> d
+    51:51:com.mojang.serialization.Dynamic lambda$null$5(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
     45:45:com.mojang.datafixers.Typed lambda$null$4(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     46:46:java.util.List lambda$null$3(java.util.List) -> a
     46:46:com.mojang.datafixers.util.Pair lambda$null$2(com.mojang.datafixers.util.Pair) -> a
     46:46:java.lang.String lambda$null$1(java.lang.String) -> a
     46:46:boolean lambda$null$0(com.mojang.datafixers.util.Pair) -> b
-net.minecraft.util.datafix.fixes.ObjectiveDisplayNameFix -> afk:
+net.minecraft.util.datafix.fixes.ObjectiveDisplayNameFix -> ail:
     20:21:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     25:31:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    31:31:java.util.function.Function lambda$makeRule$4(com.mojang.datafixers.types.DynamicOps) -> a
+    31:31:java.util.function.Function lambda$makeRule$4(com.mojang.serialization.DynamicOps) -> a
     32:32:com.mojang.datafixers.util.Pair lambda$null$3(com.mojang.datafixers.util.Pair) -> a
-    33:33:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic) -> a
-    34:34:com.mojang.datafixers.Dynamic lambda$null$1(com.mojang.datafixers.Dynamic,com.mojang.datafixers.Dynamic) -> a
+    33:33:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> a
+    34:34:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
     34:34:java.lang.String lambda$null$0(java.lang.String) -> a
-net.minecraft.util.datafix.fixes.ObjectiveRenderTypeFix -> afl:
+net.minecraft.util.datafix.fixes.ObjectiveRenderTypeFix -> aim:
     19:20:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     23:23:net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType getRenderType(java.lang.String) -> a
     28:34:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    34:34:java.util.function.Function lambda$makeRule$2(com.mojang.datafixers.types.DynamicOps) -> a
+    34:34:java.util.function.Function lambda$makeRule$2(com.mojang.serialization.DynamicOps) -> a
     35:35:com.mojang.datafixers.util.Pair lambda$null$1(com.mojang.datafixers.util.Pair) -> a
-    36:43:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.OptionsAddTextBackgroundFix -> afm:
+    36:43:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.OminousBannerBlockEntityRenameFix -> ain:
+    12:13:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    17:17:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+    21:27:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.OminousBannerRenameFix -> aio:
+    23:24:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    27:38:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
+    43:47:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    48:57:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.OptionsAddTextBackgroundFix -> aip:
     11:12:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     16:16:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     23:26:double calculateBackground(java.lang.String) -> a
     16:16:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.Typed) -> a
-    17:17:com.mojang.datafixers.Dynamic lambda$null$1(com.mojang.datafixers.Dynamic) -> a
-    17:17:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic,java.lang.String) -> a
-net.minecraft.util.datafix.fixes.OptionsForceVBOFix -> afn:
+    17:17:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic) -> a
+    17:17:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic,java.lang.String) -> a
+net.minecraft.util.datafix.fixes.OptionsForceVBOFix -> aiq:
     10:11:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     15:15:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     15:15:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.Typed) -> a
-    16:16:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.OptionsKeyLwjgl3Fix -> afo:
+    16:16:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.OptionsKeyLwjgl3Fix -> air:
     it.unimi.dsi.fastutil.ints.Int2ObjectMap MAP -> a
     17:18:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     159:159:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     159:159:com.mojang.datafixers.Typed lambda$makeRule$4(com.mojang.datafixers.Typed) -> a
-    160:183:com.mojang.datafixers.Dynamic lambda$null$3(com.mojang.datafixers.Dynamic) -> a
-    160:183:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic,java.util.Map) -> a
+    160:183:com.mojang.serialization.Dynamic lambda$null$3(com.mojang.serialization.Dynamic) -> a
+    160:183:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic,java.util.Map) -> a
     161:182:com.mojang.datafixers.util.Pair lambda$null$1(java.util.Map$Entry) -> a
     22:155:void lambda$static$0(it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap) -> a
     21:21:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.OptionsKeyTranslationFix -> afp:
+net.minecraft.util.datafix.fixes.OptionsKeyTranslationFix -> ais:
     14:15:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     19:19:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     19:19:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.Typed) -> a
-    20:28:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic) -> a
-    20:28:com.mojang.datafixers.Dynamic lambda$null$1(com.mojang.datafixers.Dynamic,java.util.Map) -> a
-    21:27:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.Dynamic,java.util.Map$Entry) -> a
-net.minecraft.util.datafix.fixes.OptionsLowerCaseLanguageFix -> afq:
+    20:28:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> a
+    20:28:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic,java.util.Map) -> a
+    21:27:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.serialization.Dynamic,java.util.Map$Entry) -> a
+net.minecraft.util.datafix.fixes.OptionsLowerCaseLanguageFix -> ait:
     13:14:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     18:18:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     18:18:com.mojang.datafixers.Typed lambda$makeRule$1(com.mojang.datafixers.Typed) -> a
-    19:23:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.PoiTypeRename -> afr:
+    19:23:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.OptionsRenameFieldFix -> aiu:
+    java.lang.String fixName -> a
+    java.lang.String fieldFrom -> b
+    java.lang.String fieldTo -> c
+    15:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean,java.lang.String,java.lang.String,java.lang.String) -> <init>
+    23:23:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    23:23:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.Typed) -> a
+    24:24:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic) -> a
+    24:24:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.PlayerUUIDFix -> aiv:
+    12:13:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    17:17:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    18:21:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.Typed) -> a
+    21:21:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> b
+    19:19:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.Typed) -> b
+    20:20:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> c
+net.minecraft.util.datafix.fixes.PoiTypeRename -> aiw:
     19:20:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     24:29:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    33:33:com.mojang.datafixers.Dynamic cap(com.mojang.datafixers.Dynamic) -> a
-    39:39:java.util.Optional renameRecords(com.mojang.datafixers.Dynamic) -> b
+    33:33:com.mojang.serialization.Dynamic cap(com.mojang.serialization.Dynamic) -> a
+    39:42:java.util.Optional renameRecords(com.mojang.serialization.Dynamic) -> b
     java.lang.String rename(java.lang.String) -> a
-    40:40:com.mojang.datafixers.Dynamic lambda$renameRecords$8(com.mojang.datafixers.Dynamic,java.util.stream.Stream) -> a
-    41:41:com.mojang.datafixers.Dynamic lambda$null$7(com.mojang.datafixers.Dynamic) -> c
-    41:41:com.mojang.datafixers.Dynamic lambda$null$6(com.mojang.datafixers.Dynamic) -> d
-    34:34:com.mojang.datafixers.Dynamic lambda$cap$5(com.mojang.datafixers.Dynamic) -> e
+    40:40:com.mojang.serialization.Dynamic lambda$renameRecords$8(com.mojang.serialization.Dynamic,java.util.stream.Stream) -> a
+    41:41:com.mojang.serialization.Dynamic lambda$null$7(com.mojang.serialization.Dynamic) -> c
+    41:41:com.mojang.serialization.Dynamic lambda$null$6(com.mojang.serialization.Dynamic) -> d
+    34:34:com.mojang.serialization.Dynamic lambda$cap$5(com.mojang.serialization.Dynamic) -> e
     34:34:com.mojang.datafixers.util.Pair lambda$null$4(com.mojang.datafixers.util.Pair) -> a
-    34:34:com.mojang.datafixers.Dynamic lambda$null$3(com.mojang.datafixers.Dynamic) -> f
-    34:34:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic) -> g
-    29:29:java.util.function.Function lambda$makeRule$1(com.mojang.datafixers.types.DynamicOps) -> a
+    34:34:com.mojang.serialization.Dynamic lambda$null$3(com.mojang.serialization.Dynamic) -> f
+    34:34:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> g
+    29:29:java.util.function.Function lambda$makeRule$1(com.mojang.serialization.DynamicOps) -> a
     29:29:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.util.Pair) -> b
-net.minecraft.util.datafix.fixes.RecipesFix -> afs:
+net.minecraft.util.datafix.fixes.RecipesFix -> aix:
     java.util.Map RECIPES -> a
     67:68:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     67:67:java.lang.String lambda$new$0(java.lang.String) -> a
     9:64:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.RecipesRenameFix -> aft:
+net.minecraft.util.datafix.fixes.RecipesRenameFix -> aiy:
     java.lang.String name -> a
     java.util.function.Function renamer -> b
     20:23:void <init>(com.mojang.datafixers.schemas.Schema,boolean,java.lang.String,java.util.function.Function) -> <init>
     27:31:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    31:31:java.util.function.Function lambda$makeRule$1(com.mojang.datafixers.types.DynamicOps) -> a
+    31:31:java.util.function.Function lambda$makeRule$1(com.mojang.serialization.DynamicOps) -> a
     31:31:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.util.Pair) -> a
-net.minecraft.util.datafix.fixes.RecipesRenameningFix -> afu:
+net.minecraft.util.datafix.fixes.RecipesRenameningFix -> aiz:
     java.util.Map RECIPES -> a
     19:20:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     19:19:java.lang.String lambda$new$0(java.lang.String) -> a
     9:16:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.References -> afv:
+net.minecraft.util.datafix.fixes.RedstoneWireConnectionsFix -> aja:
+    11:12:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    16:17:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    21:26:com.mojang.serialization.Dynamic updateRedstoneConnections(com.mojang.serialization.Dynamic) -> a
+    48:48:boolean isConnected(java.lang.String) -> a
+    27:43:com.mojang.serialization.Dynamic lambda$updateRedstoneConnections$5(com.mojang.serialization.Dynamic) -> b
+    43:43:com.mojang.serialization.Dynamic lambda$null$4(java.lang.String,com.mojang.serialization.Dynamic) -> a
+    42:42:com.mojang.serialization.Dynamic lambda$null$3(java.lang.String,com.mojang.serialization.Dynamic) -> b
+    41:41:com.mojang.serialization.Dynamic lambda$null$2(java.lang.String,com.mojang.serialization.Dynamic) -> c
+    40:40:com.mojang.serialization.Dynamic lambda$null$1(java.lang.String,com.mojang.serialization.Dynamic) -> d
+    17:17:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.References -> ajb:
     com.mojang.datafixers.DSL$TypeReference LEVEL -> a
     com.mojang.datafixers.DSL$TypeReference PLAYER -> b
     com.mojang.datafixers.DSL$TypeReference CHUNK -> c
@@ -34695,71 +37569,92 @@ net.minecraft.util.datafix.fixes.References -> afv:
     com.mojang.datafixers.DSL$TypeReference TEAM -> v
     com.mojang.datafixers.DSL$TypeReference RECIPE -> w
     com.mojang.datafixers.DSL$TypeReference BIOME -> x
+    com.mojang.datafixers.DSL$TypeReference WORLD_GEN_SETTINGS -> y
     5:5:void <init>() -> <init>
-    51:51:java.lang.String lambda$static$23() -> a
-    48:48:java.lang.String lambda$static$22() -> b
-    45:45:java.lang.String lambda$static$21() -> c
-    42:42:java.lang.String lambda$static$20() -> d
-    39:39:java.lang.String lambda$static$19() -> e
-    36:36:java.lang.String lambda$static$18() -> f
-    33:33:java.lang.String lambda$static$17() -> g
-    32:32:java.lang.String lambda$static$16() -> h
-    29:29:java.lang.String lambda$static$15() -> i
-    27:27:java.lang.String lambda$static$14() -> j
-    24:24:java.lang.String lambda$static$13() -> k
-    21:21:java.lang.String lambda$static$12() -> l
-    20:20:java.lang.String lambda$static$11() -> m
-    19:19:java.lang.String lambda$static$10() -> n
-    16:16:java.lang.String lambda$static$9() -> o
-    15:15:java.lang.String lambda$static$8() -> p
-    14:14:java.lang.String lambda$static$7() -> q
-    13:13:java.lang.String lambda$static$6() -> r
-    12:12:java.lang.String lambda$static$5() -> s
-    11:11:java.lang.String lambda$static$4() -> t
-    10:10:java.lang.String lambda$static$3() -> u
-    9:9:java.lang.String lambda$static$2() -> v
-    8:8:java.lang.String lambda$static$1() -> w
-    7:7:java.lang.String lambda$static$0() -> x
-    7:51:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.RenamedCoralFansFix -> afw:
+    54:54:java.lang.String lambda$static$24() -> a
+    51:51:java.lang.String lambda$static$23() -> b
+    48:48:java.lang.String lambda$static$22() -> c
+    45:45:java.lang.String lambda$static$21() -> d
+    42:42:java.lang.String lambda$static$20() -> e
+    39:39:java.lang.String lambda$static$19() -> f
+    36:36:java.lang.String lambda$static$18() -> g
+    33:33:java.lang.String lambda$static$17() -> h
+    32:32:java.lang.String lambda$static$16() -> i
+    29:29:java.lang.String lambda$static$15() -> j
+    27:27:java.lang.String lambda$static$14() -> k
+    24:24:java.lang.String lambda$static$13() -> l
+    21:21:java.lang.String lambda$static$12() -> m
+    20:20:java.lang.String lambda$static$11() -> n
+    19:19:java.lang.String lambda$static$10() -> o
+    16:16:java.lang.String lambda$static$9() -> p
+    15:15:java.lang.String lambda$static$8() -> q
+    14:14:java.lang.String lambda$static$7() -> r
+    13:13:java.lang.String lambda$static$6() -> s
+    12:12:java.lang.String lambda$static$5() -> t
+    11:11:java.lang.String lambda$static$4() -> u
+    10:10:java.lang.String lambda$static$3() -> v
+    9:9:java.lang.String lambda$static$2() -> w
+    8:8:java.lang.String lambda$static$1() -> x
+    7:7:java.lang.String lambda$static$0() -> y
+    7:54:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.RenameBiomesFix -> ajc:
+    java.lang.String name -> a
+    java.util.Map biomes -> b
+    20:23:void <init>(com.mojang.datafixers.schemas.Schema,boolean,java.lang.String,java.util.Map) -> <init>
+    27:31:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    31:31:java.util.function.Function lambda$makeRule$2(com.mojang.serialization.DynamicOps) -> a
+    31:31:com.mojang.datafixers.util.Pair lambda$null$1(com.mojang.datafixers.util.Pair) -> a
+    32:32:java.lang.String lambda$null$0(java.lang.String) -> a
+net.minecraft.util.datafix.fixes.RenamedCoralFansFix -> ajd:
     java.util.Map RENAMED_IDS -> a
     7:7:void <init>() -> <init>
     8:14:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.RenamedCoralFix -> afx:
+net.minecraft.util.datafix.fixes.RenamedCoralFix -> aje:
     java.util.Map RENAMED_IDS -> a
     7:7:void <init>() -> <init>
     8:29:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.ReorganizePoi -> afy:
+net.minecraft.util.datafix.fixes.ReorganizePoi -> ajf:
     21:22:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     26:31:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    35:47:com.mojang.datafixers.Dynamic cap(com.mojang.datafixers.Dynamic) -> a
-    31:31:java.util.function.Function lambda$makeRule$1(com.mojang.datafixers.types.DynamicOps) -> a
+    35:47:com.mojang.serialization.Dynamic cap(com.mojang.serialization.Dynamic) -> a
+    31:31:java.util.function.Function lambda$makeRule$1(com.mojang.serialization.DynamicOps) -> a
     31:31:com.mojang.datafixers.util.Pair lambda$null$0(com.mojang.datafixers.util.Pair) -> a
-net.minecraft.util.datafix.fixes.SavedDataVillageCropFix -> afz:
+net.minecraft.util.datafix.fixes.SavedDataUUIDFix -> ajg:
+    10:11:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    15:15:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    16:16:com.mojang.datafixers.Typed lambda$makeRule$7(com.mojang.datafixers.Typed) -> a
+    17:17:com.mojang.datafixers.Typed lambda$null$6(com.mojang.datafixers.Typed) -> b
+    18:18:com.mojang.serialization.Dynamic lambda$null$5(com.mojang.serialization.Dynamic) -> b
+    19:19:com.mojang.serialization.Dynamic lambda$null$4(com.mojang.serialization.Dynamic) -> c
+    20:20:com.mojang.serialization.Dynamic lambda$null$3(com.mojang.serialization.Dynamic) -> d
+    21:21:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> e
+    22:22:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic) -> f
+    23:24:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> g
+net.minecraft.util.datafix.fixes.SavedDataVillageCropFix -> ajh:
     12:13:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     17:17:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    21:21:com.mojang.datafixers.Dynamic fixTag(com.mojang.datafixers.Dynamic) -> a
-    25:25:com.mojang.datafixers.Dynamic updateChildren(com.mojang.datafixers.Dynamic) -> b
+    21:21:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
+    25:25:com.mojang.serialization.Dynamic updateChildren(com.mojang.serialization.Dynamic) -> b
     29:29:java.util.stream.Stream updateChildren(java.util.stream.Stream) -> a
-    43:44:com.mojang.datafixers.Dynamic updateSingleField(com.mojang.datafixers.Dynamic) -> c
-    48:51:com.mojang.datafixers.Dynamic updateDoubleField(com.mojang.datafixers.Dynamic) -> d
-    55:58:com.mojang.datafixers.Dynamic updateCrop(com.mojang.datafixers.Dynamic,java.lang.String) -> a
-    31:37:com.mojang.datafixers.Dynamic lambda$updateChildren$0(com.mojang.datafixers.Dynamic) -> e
-net.minecraft.util.datafix.fixes.SimpleEntityRenameFix -> aga:
+    43:44:com.mojang.serialization.Dynamic updateSingleField(com.mojang.serialization.Dynamic) -> c
+    48:51:com.mojang.serialization.Dynamic updateDoubleField(com.mojang.serialization.Dynamic) -> d
+    55:58:com.mojang.serialization.Dynamic updateCrop(com.mojang.serialization.Dynamic,java.lang.String) -> a
+    31:37:com.mojang.serialization.Dynamic lambda$updateChildren$0(com.mojang.serialization.Dynamic) -> e
+net.minecraft.util.datafix.fixes.SimpleEntityRenameFix -> aji:
     11:12:void <init>(java.lang.String,com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     16:17:com.mojang.datafixers.util.Pair fix(java.lang.String,com.mojang.datafixers.Typed) -> a
-    com.mojang.datafixers.util.Pair getNewNameAndTag(java.lang.String,com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.SimplestEntityRenameFix -> agb:
+    com.mojang.datafixers.util.Pair getNewNameAndTag(java.lang.String,com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.SimplestEntityRenameFix -> ajj:
     java.lang.String name -> a
-    17:19:void <init>(java.lang.String,com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    24:45:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    19:21:void <init>(java.lang.String,com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    26:47:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     java.lang.String rename(java.lang.String) -> a
-    45:45:java.util.function.Function lambda$makeRule$4(com.mojang.datafixers.types.DynamicOps) -> a
-    45:45:com.mojang.datafixers.util.Pair lambda$null$3(com.mojang.datafixers.util.Pair) -> a
-    33:33:java.util.function.Function lambda$makeRule$2(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.DynamicOps) -> a
-    33:33:com.mojang.datafixers.util.Pair lambda$null$1(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.util.Pair) -> a
-    34:43:java.lang.String lambda$null$0(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,java.lang.String) -> a
-net.minecraft.util.datafix.fixes.StatsCounterFix -> agc:
+    47:47:java.util.function.Function lambda$makeRule$4(com.mojang.serialization.DynamicOps) -> a
+    47:47:com.mojang.datafixers.util.Pair lambda$null$3(com.mojang.datafixers.util.Pair) -> a
+    35:35:java.util.function.Function lambda$makeRule$2(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.serialization.DynamicOps) -> a
+    35:35:com.mojang.datafixers.util.Pair lambda$null$1(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.util.Pair) -> a
+    36:45:java.lang.String lambda$null$0(com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,com.mojang.datafixers.types.templates.TaggedChoice$TaggedChoiceType,java.lang.String) -> a
+net.minecraft.util.datafix.fixes.StatsCounterFix -> ajk:
     java.util.Set SKIP -> a
     java.util.Map CUSTOM_MAP -> b
     java.util.Map ITEM_KEYS -> c
@@ -34771,31 +37666,35 @@ net.minecraft.util.datafix.fixes.StatsCounterFix -> agc:
     205:205:java.lang.String upgradeBlock(java.lang.String) -> b
     152:195:com.mojang.datafixers.Typed lambda$makeRule$2(com.mojang.datafixers.types.Type,com.mojang.datafixers.Typed) -> a
     195:195:java.lang.IllegalStateException lambda$null$1() -> a
-    190:190:com.mojang.datafixers.Dynamic lambda$null$0(com.mojang.datafixers.Dynamic,com.mojang.datafixers.Dynamic) -> a
+    190:190:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
     24:144:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.StructureReferenceCountFix -> agd:
+net.minecraft.util.datafix.fixes.StriderGravityFix -> ajl:
+    10:11:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    14:17:com.mojang.serialization.Dynamic fixTag(com.mojang.serialization.Dynamic) -> a
+    22:22:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+net.minecraft.util.datafix.fixes.StructureReferenceCountFix -> ajm:
     12:13:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     17:18:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    24:24:com.mojang.datafixers.Dynamic setCountToAtLeastOne(com.mojang.datafixers.Dynamic) -> a
-    24:24:com.mojang.datafixers.Dynamic lambda$setCountToAtLeastOne$2(com.mojang.datafixers.Dynamic) -> b
+    24:24:com.mojang.serialization.Dynamic setCountToAtLeastOne(com.mojang.serialization.Dynamic) -> a
+    24:24:com.mojang.serialization.Dynamic lambda$setCountToAtLeastOne$2(com.mojang.serialization.Dynamic) -> b
     24:24:boolean lambda$null$1(java.lang.Integer) -> a
     19:19:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.Typed) -> a
-net.minecraft.util.datafix.fixes.SwimStatsRenameFix -> age:
-    12:13:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    17:22:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    22:22:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    23:23:com.mojang.datafixers.Typed lambda$null$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    23:23:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    24:32:java.lang.String lambda$null$0(java.lang.String) -> a
-net.minecraft.util.datafix.fixes.TeamDisplayNameFix -> agf:
+net.minecraft.util.datafix.fixes.SwimStatsRenameFix -> ajn:
+    13:14:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    18:23:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    23:23:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    24:24:com.mojang.datafixers.Typed lambda$null$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    24:24:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    25:33:java.lang.String lambda$null$0(java.lang.String) -> a
+net.minecraft.util.datafix.fixes.TeamDisplayNameFix -> ajo:
     20:21:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     25:31:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-    31:31:java.util.function.Function lambda$makeRule$4(com.mojang.datafixers.types.DynamicOps) -> a
+    31:31:java.util.function.Function lambda$makeRule$4(com.mojang.serialization.DynamicOps) -> a
     32:32:com.mojang.datafixers.util.Pair lambda$null$3(com.mojang.datafixers.util.Pair) -> a
-    33:33:com.mojang.datafixers.Dynamic lambda$null$2(com.mojang.datafixers.Dynamic) -> a
-    34:34:com.mojang.datafixers.Dynamic lambda$null$1(com.mojang.datafixers.Dynamic,com.mojang.datafixers.Dynamic) -> a
+    33:33:com.mojang.serialization.Dynamic lambda$null$2(com.mojang.serialization.Dynamic) -> a
+    34:34:com.mojang.serialization.Dynamic lambda$null$1(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
     34:34:java.lang.String lambda$null$0(java.lang.String) -> a
-net.minecraft.util.datafix.fixes.TrappedChestBlockEntityFix -> agg:
+net.minecraft.util.datafix.fixes.TrappedChestBlockEntityFix -> ajp:
     org.apache.logging.log4j.Logger LOGGER -> a
     33:34:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     38:61:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
@@ -34806,56 +37705,125 @@ net.minecraft.util.datafix.fixes.TrappedChestBlockEntityFix -> agg:
     99:99:com.mojang.datafixers.util.Pair lambda$null$1(com.mojang.datafixers.util.Pair) -> a
     100:104:java.lang.String lambda$null$0(java.lang.String) -> a
     27:27:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.TrappedChestBlockEntityFix$TrappedChestSection -> agg$a:
+net.minecraft.util.datafix.fixes.TrappedChestBlockEntityFix$TrappedChestSection -> ajp$a:
     it.unimi.dsi.fastutil.ints.IntSet chestIds -> e
     117:118:void <init>(com.mojang.datafixers.Typed,com.mojang.datafixers.schemas.Schema) -> <init>
     122:132:boolean skippable() -> a
     136:136:boolean isTrappedChest(int) -> a
-net.minecraft.util.datafix.fixes.VillagerDataFix -> agh:
+net.minecraft.util.datafix.fixes.VillagerDataFix -> ajq:
     12:13:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String) -> <init>
     17:27:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
     34:69:java.lang.String upgradeData(int,int) -> a
-net.minecraft.util.datafix.fixes.VillagerRebuildLevelAndXpFix -> agi:
+net.minecraft.util.datafix.fixes.VillagerFollowRangeFix -> ajr:
+    17:18:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    22:22:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+    26:26:com.mojang.serialization.Dynamic fixValue(com.mojang.serialization.Dynamic) -> a
+    27:27:com.mojang.serialization.Dynamic lambda$fixValue$1(com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    28:32:com.mojang.serialization.Dynamic lambda$null$0(com.mojang.serialization.Dynamic) -> b
+net.minecraft.util.datafix.fixes.VillagerRebuildLevelAndXpFix -> ajs:
     int[] LEVEL_XP_THRESHOLDS -> a
     21:21:int getMinXpPerLevel(int) -> a
     25:26:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     30:39:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
     72:72:com.mojang.datafixers.Typed addLevel(com.mojang.datafixers.Typed,int) -> a
     79:80:com.mojang.datafixers.Typed addXpFromLevel(com.mojang.datafixers.Typed,int) -> b
-    81:81:com.mojang.datafixers.Dynamic lambda$addXpFromLevel$6(int,com.mojang.datafixers.Dynamic) -> a
-    73:73:com.mojang.datafixers.Dynamic lambda$addLevel$5(int,com.mojang.datafixers.Dynamic) -> b
-    74:74:com.mojang.datafixers.Dynamic lambda$null$4(int,com.mojang.datafixers.Dynamic) -> c
+    81:81:com.mojang.serialization.Dynamic lambda$addXpFromLevel$6(int,com.mojang.serialization.Dynamic) -> a
+    73:73:com.mojang.serialization.Dynamic lambda$addLevel$5(int,com.mojang.serialization.Dynamic) -> b
+    74:74:com.mojang.serialization.Dynamic lambda$null$4(int,com.mojang.serialization.Dynamic) -> c
     40:40:com.mojang.datafixers.Typed lambda$makeRule$3(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.types.Type,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     41:66:com.mojang.datafixers.Typed lambda$null$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     52:52:java.lang.Integer lambda$null$1(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
     51:51:java.util.Optional lambda$null$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> b
     18:18:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.fixes.VillagerTradeFix -> agj:
-    16:17:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
-    21:37:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-    46:46:com.mojang.datafixers.Typed updateItemStack(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    47:47:com.mojang.datafixers.util.Pair lambda$updateItemStack$5(com.mojang.datafixers.util.Pair) -> a
-    48:48:java.lang.String lambda$null$4(java.lang.String) -> a
-    37:37:com.mojang.datafixers.Typed lambda$fix$3(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,java.util.function.Function,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    37:37:com.mojang.datafixers.Typed lambda$null$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,java.util.function.Function,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    38:41:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.OpticFinder,java.util.function.Function,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
-    35:35:com.mojang.datafixers.Typed lambda$fix$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> b
-net.minecraft.util.datafix.fixes.WriteAndReadFix -> agk:
+net.minecraft.util.datafix.fixes.VillagerTradeFix -> ajt:
+    18:19:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    23:39:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
+    48:48:com.mojang.datafixers.Typed updateItemStack(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    49:49:com.mojang.datafixers.util.Pair lambda$updateItemStack$5(com.mojang.datafixers.util.Pair) -> a
+    50:50:java.lang.String lambda$null$4(java.lang.String) -> a
+    39:39:com.mojang.datafixers.Typed lambda$fix$3(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,java.util.function.Function,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    39:39:com.mojang.datafixers.Typed lambda$null$2(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,java.util.function.Function,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    40:43:com.mojang.datafixers.Typed lambda$null$1(com.mojang.datafixers.OpticFinder,java.util.function.Function,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> a
+    37:37:com.mojang.datafixers.Typed lambda$fix$0(com.mojang.datafixers.OpticFinder,com.mojang.datafixers.Typed) -> b
+net.minecraft.util.datafix.fixes.WallPropertyFix -> aju:
+    java.util.Set WALL_BLOCKS -> a
+    33:34:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
+    38:38:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    42:42:java.lang.String mapProperty(java.lang.String) -> a
+    46:46:com.mojang.serialization.Dynamic fixWallProperty(com.mojang.serialization.Dynamic,java.lang.String) -> a
+    50:55:com.mojang.serialization.Dynamic upgradeBlockStateTag(com.mojang.serialization.Dynamic) -> a
+    56:59:com.mojang.serialization.Dynamic lambda$upgradeBlockStateTag$2(com.mojang.serialization.Dynamic) -> b
+    46:46:com.mojang.serialization.Dynamic lambda$fixWallProperty$1(com.mojang.serialization.Dynamic) -> c
+    38:38:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.Typed) -> a
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.WorldGenSettingsFix -> ajv:
+    com.google.common.collect.ImmutableMap DEFAULTS -> a
+    28:29:void <init>(com.mojang.datafixers.schemas.Schema) -> <init>
+    33:33:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
+    37:41:com.mojang.serialization.Dynamic noise(long,com.mojang.serialization.DynamicLike,com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    46:55:com.mojang.serialization.Dynamic vanillaBiomeSource(com.mojang.serialization.Dynamic,long,boolean,boolean) -> a
+    103:211:com.mojang.serialization.Dynamic fix(com.mojang.serialization.Dynamic) -> a
+    215:215:com.mojang.serialization.Dynamic defaultOverworld(com.mojang.serialization.Dynamic,long) -> a
+    219:238:java.lang.Object vanillaLevels(com.mojang.serialization.Dynamic,long,com.mojang.serialization.Dynamic,boolean) -> a
+    244:330:java.util.Map fixFlatStructures(com.mojang.serialization.DynamicOps,com.mojang.serialization.OptionalDynamic) -> a
+    334:334:int getInt(java.lang.String,int) -> a
+    338:338:int getInt(java.lang.String,int,int) -> a
+    342:345:void setSpacing(java.util.Map,java.lang.String,java.lang.String,int) -> a
+    321:321:com.mojang.serialization.Dynamic lambda$fixFlatStructures$12(com.mojang.serialization.DynamicOps,java.util.Map$Entry) -> a
+    320:320:com.mojang.serialization.Dynamic lambda$fixFlatStructures$11(com.mojang.serialization.OptionalDynamic,java.util.Map$Entry) -> a
+    255:255:void lambda$fixFlatStructures$10(org.apache.commons.lang3.mutable.MutableBoolean,org.apache.commons.lang3.mutable.MutableInt,org.apache.commons.lang3.mutable.MutableInt,org.apache.commons.lang3.mutable.MutableInt,java.util.Map,java.util.Map) -> a
+    255:255:void lambda$null$9(org.apache.commons.lang3.mutable.MutableBoolean,org.apache.commons.lang3.mutable.MutableInt,org.apache.commons.lang3.mutable.MutableInt,org.apache.commons.lang3.mutable.MutableInt,java.util.Map,com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    255:255:void lambda$null$8(com.mojang.serialization.Dynamic,org.apache.commons.lang3.mutable.MutableBoolean,org.apache.commons.lang3.mutable.MutableInt,org.apache.commons.lang3.mutable.MutableInt,org.apache.commons.lang3.mutable.MutableInt,java.util.Map,java.util.Map) -> a
+    256:316:void lambda$null$7(com.mojang.serialization.Dynamic,org.apache.commons.lang3.mutable.MutableBoolean,org.apache.commons.lang3.mutable.MutableInt,org.apache.commons.lang3.mutable.MutableInt,org.apache.commons.lang3.mutable.MutableInt,java.util.Map,com.mojang.serialization.Dynamic,com.mojang.serialization.Dynamic) -> a
+    209:209:void lambda$fix$6(com.google.common.collect.ImmutableMap$Builder,com.mojang.serialization.DynamicOps,java.lang.String) -> a
+    181:181:java.util.Optional lambda$fix$5(com.mojang.serialization.Dynamic) -> b
+    170:171:com.mojang.serialization.Dynamic lambda$fix$4(com.mojang.serialization.Dynamic) -> c
+    131:142:com.mojang.serialization.Dynamic lambda$fix$3(com.mojang.serialization.Dynamic) -> d
+    110:113:java.util.Optional lambda$fix$2(java.util.Optional,com.mojang.serialization.Dynamic) -> a
+    107:107:java.lang.String lambda$fix$1(java.lang.String) -> a
+    33:33:com.mojang.datafixers.Typed lambda$makeRule$0(com.mojang.datafixers.Typed) -> a
+    68:78:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.WorldGenSettingsFix$StructureFeatureConfiguration -> ajv$a:
+    com.mojang.serialization.Codec CODEC -> a
+    int spacing -> b
+    int separation -> c
+    int salt -> d
+    91:95:void <init>(int,int,int) -> <init>
+    98:98:com.mojang.serialization.Dynamic serialize(com.mojang.serialization.DynamicOps) -> a
+    81:85:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    84:84:java.lang.Integer lambda$null$2(net.minecraft.util.datafix.fixes.WorldGenSettingsFix$StructureFeatureConfiguration) -> d
+    83:83:java.lang.Integer lambda$null$1(net.minecraft.util.datafix.fixes.WorldGenSettingsFix$StructureFeatureConfiguration) -> e
+    82:82:java.lang.Integer lambda$null$0(net.minecraft.util.datafix.fixes.WorldGenSettingsFix$StructureFeatureConfiguration) -> f
+    80:80:int access$000(net.minecraft.util.datafix.fixes.WorldGenSettingsFix$StructureFeatureConfiguration) -> a
+    80:80:int access$100(net.minecraft.util.datafix.fixes.WorldGenSettingsFix$StructureFeatureConfiguration) -> b
+    80:80:int access$200(net.minecraft.util.datafix.fixes.WorldGenSettingsFix$StructureFeatureConfiguration) -> c
+    81:81:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.fixes.WriteAndReadFix -> ajw:
     java.lang.String name -> a
     com.mojang.datafixers.DSL$TypeReference type -> b
     13:16:void <init>(com.mojang.datafixers.schemas.Schema,java.lang.String,com.mojang.datafixers.DSL$TypeReference) -> <init>
     20:20:com.mojang.datafixers.TypeRewriteRule makeRule() -> makeRule
-net.minecraft.util.datafix.fixes.ZombieVillagerRebuildXpFix -> agl:
+net.minecraft.util.datafix.fixes.ZombieVillagerRebuildXpFix -> ajx:
     11:12:void <init>(com.mojang.datafixers.schemas.Schema,boolean) -> <init>
     16:16:com.mojang.datafixers.Typed fix(com.mojang.datafixers.Typed) -> a
-    17:22:com.mojang.datafixers.Dynamic lambda$fix$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.util.datafix.fixes.package-info -> agm:
-net.minecraft.util.datafix.package-info -> agn:
-net.minecraft.util.datafix.schemas.NamespacedSchema -> ago:
-    10:11:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
-    14:18:java.lang.String ensureNamespaced(java.lang.String) -> a
-    23:23:com.mojang.datafixers.types.Type getChoiceType(com.mojang.datafixers.DSL$TypeReference,java.lang.String) -> getChoiceType
-net.minecraft.util.datafix.schemas.V100 -> agp:
+    17:22:com.mojang.serialization.Dynamic lambda$fix$0(com.mojang.serialization.Dynamic) -> a
+net.minecraft.util.datafix.fixes.package-info -> ajy:
+net.minecraft.util.datafix.package-info -> ajz:
+net.minecraft.util.datafix.schemas.NamespacedSchema -> aka:
+    com.mojang.serialization.codecs.PrimitiveCodec NAMESPACED_STRING_CODEC -> a
+    com.mojang.datafixers.types.Type NAMESPACED_STRING -> b
+    14:15:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    18:22:java.lang.String ensureNamespaced(java.lang.String) -> a
+    47:47:com.mojang.datafixers.types.Type namespacedString() -> a
+    52:52:com.mojang.datafixers.types.Type getChoiceType(com.mojang.datafixers.DSL$TypeReference,java.lang.String) -> getChoiceType
+    25:44:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.schemas.NamespacedSchema$1 -> aka$1:
+    25:25:void <init>() -> <init>
+    28:30:com.mojang.serialization.DataResult read(com.mojang.serialization.DynamicOps,java.lang.Object) -> read
+    35:35:java.lang.Object write(com.mojang.serialization.DynamicOps,java.lang.String) -> a
+    40:40:java.lang.String toString() -> toString
+    25:25:java.lang.Object write(com.mojang.serialization.DynamicOps,java.lang.Object) -> write
+net.minecraft.util.datafix.schemas.V100 -> akb:
     21:22:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     25:27:com.mojang.datafixers.types.templates.TypeTemplate equipment(com.mojang.datafixers.schemas.Schema) -> a
     32:33:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
@@ -34866,51 +37834,51 @@ net.minecraft.util.datafix.schemas.V100 -> agp:
     73:77:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$2(com.mojang.datafixers.schemas.Schema,java.lang.String) -> b
     49:51:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$1(com.mojang.datafixers.schemas.Schema,java.lang.String) -> c
     32:32:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> c
-net.minecraft.util.datafix.schemas.V102 -> agq:
+net.minecraft.util.datafix.schemas.V102 -> akc:
     21:22:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     26:37:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
     28:34:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V1022 -> agr:
+net.minecraft.util.datafix.schemas.V1022 -> akd:
     22:23:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     27:47:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
     46:46:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$2(com.mojang.datafixers.schemas.Schema) -> a
     30:41:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$1(com.mojang.datafixers.schemas.Schema) -> b
     29:29:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0() -> a
-net.minecraft.util.datafix.schemas.V106 -> ags:
+net.minecraft.util.datafix.schemas.V106 -> ake:
     17:18:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     22:30:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
     24:28:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V107 -> agt:
+net.minecraft.util.datafix.schemas.V107 -> akf:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     16:20:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
-net.minecraft.util.datafix.schemas.V1125 -> agu:
-    20:21:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
-    25:29:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
-    34:51:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
-    50:50:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$2() -> a
-    49:49:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$1() -> b
-    35:46:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V135 -> agv:
+net.minecraft.util.datafix.schemas.V1125 -> akg:
+    19:20:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    24:28:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
+    33:50:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
+    49:49:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$2() -> b
+    48:48:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$1() -> c
+    34:45:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0(com.mojang.datafixers.schemas.Schema) -> a
+net.minecraft.util.datafix.schemas.V135 -> akh:
     18:19:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     23:36:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
     32:34:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$1(com.mojang.datafixers.schemas.Schema) -> a
     25:30:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0(com.mojang.datafixers.schemas.Schema) -> b
-net.minecraft.util.datafix.schemas.V143 -> agw:
+net.minecraft.util.datafix.schemas.V143 -> aki:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     16:20:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
-net.minecraft.util.datafix.schemas.V1451 -> agx:
+net.minecraft.util.datafix.schemas.V1451 -> akj:
     15:16:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     20:26:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
     22:23:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V1451_1 -> agy:
+net.minecraft.util.datafix.schemas.V1451_1 -> akk:
     20:21:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     25:37:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
     27:33:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V1451_2 -> agz:
+net.minecraft.util.datafix.schemas.V1451_2 -> akl:
     14:15:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     19:25:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
     21:22:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$0(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
-net.minecraft.util.datafix.schemas.V1451_3 -> aha:
+net.minecraft.util.datafix.schemas.V1451_3 -> akm:
     18:19:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     23:76:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     72:73:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$11(com.mojang.datafixers.schemas.Schema) -> a
@@ -34925,39 +37893,39 @@ net.minecraft.util.datafix.schemas.V1451_3 -> aha:
     40:42:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$2(com.mojang.datafixers.schemas.Schema) -> j
     37:38:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$1(com.mojang.datafixers.schemas.Schema) -> k
     29:30:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$0(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
-net.minecraft.util.datafix.schemas.V1451_4 -> ahb:
-    15:16:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
-    20:23:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
-    22:22:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0() -> a
-net.minecraft.util.datafix.schemas.V1451_5 -> ahc:
+net.minecraft.util.datafix.schemas.V1451_4 -> akn:
+    14:15:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    19:22:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
+    21:21:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0() -> b
+net.minecraft.util.datafix.schemas.V1451_5 -> ako:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     16:21:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
-net.minecraft.util.datafix.schemas.V1451_6 -> ahd:
-    21:22:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
-    26:45:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
-    30:41:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$1(com.mojang.datafixers.schemas.Schema,java.util.function.Supplier) -> a
-    28:28:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V1451_7 -> ahe:
+net.minecraft.util.datafix.schemas.V1451_6 -> akp:
+    20:21:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    25:44:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
+    29:40:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$1(com.mojang.datafixers.schemas.Schema,java.util.function.Supplier) -> a
+    27:27:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0(com.mojang.datafixers.schemas.Schema) -> a
+net.minecraft.util.datafix.schemas.V1451_7 -> akq:
     16:17:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     21:31:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
     23:28:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V1460 -> ahf:
+net.minecraft.util.datafix.schemas.V1460 -> akr:
     50:51:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     54:55:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     58:61:void registerInventory(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> b
     65:222:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     227:258:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
-    263:374:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
-    372:372:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$45() -> a
-    371:371:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$44() -> b
+    263:375:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
+    372:372:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$45() -> b
+    371:371:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$44() -> c
     357:368:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$43(com.mojang.datafixers.schemas.Schema) -> a
     351:355:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$42(com.mojang.datafixers.schemas.Schema) -> b
     341:346:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$41(com.mojang.datafixers.schemas.Schema) -> c
     334:338:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$40(com.mojang.datafixers.schemas.Schema) -> d
     319:330:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$39(com.mojang.datafixers.schemas.Schema,java.util.function.Supplier) -> a
     317:317:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$38(com.mojang.datafixers.schemas.Schema) -> e
-    315:315:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$37() -> c
-    314:314:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$36() -> d
+    315:315:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$37() -> d
+    314:314:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$36() -> e
     309:312:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$35(com.mojang.datafixers.schemas.Schema) -> f
     307:307:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$34(com.mojang.datafixers.schemas.Schema) -> g
     298:304:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$33(com.mojang.datafixers.schemas.Schema) -> h
@@ -34966,7 +37934,7 @@ net.minecraft.util.datafix.schemas.V1460 -> ahf:
     292:292:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$30(java.util.Map) -> b
     282:288:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$29(com.mojang.datafixers.schemas.Schema) -> j
     265:278:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$28(com.mojang.datafixers.schemas.Schema) -> k
-    264:264:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$27() -> e
+    264:264:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$27() -> f
     240:241:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$26(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
     239:239:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$25(com.mojang.datafixers.schemas.Schema,java.lang.String) -> b
     233:234:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$24(com.mojang.datafixers.schemas.Schema,java.lang.String) -> c
@@ -34994,104 +37962,143 @@ net.minecraft.util.datafix.schemas.V1460 -> ahf:
     69:70:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$2(com.mojang.datafixers.schemas.Schema,java.lang.String) -> y
     58:59:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerInventory$1(com.mojang.datafixers.schemas.Schema) -> l
     54:54:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> m
-net.minecraft.util.datafix.schemas.V1466 -> ahg:
+net.minecraft.util.datafix.schemas.V1466 -> aks:
     24:25:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     29:53:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
     57:61:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
     44:51:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$1(com.mojang.datafixers.schemas.Schema) -> a
     31:40:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$0(com.mojang.datafixers.schemas.Schema) -> b
-net.minecraft.util.datafix.schemas.V1470 -> ahh:
+net.minecraft.util.datafix.schemas.V1470 -> akt:
     14:15:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     18:19:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     23:39:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     35:36:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$1(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
     18:18:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V1481 -> ahi:
+net.minecraft.util.datafix.schemas.V1481 -> aku:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     16:20:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
-net.minecraft.util.datafix.schemas.V1483 -> ahj:
+net.minecraft.util.datafix.schemas.V1483 -> akv:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     16:20:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
-net.minecraft.util.datafix.schemas.V1486 -> ahk:
+net.minecraft.util.datafix.schemas.V1486 -> akw:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     16:21:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
-net.minecraft.util.datafix.schemas.V1510 -> ahl:
+net.minecraft.util.datafix.schemas.V1510 -> akx:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     16:31:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
-net.minecraft.util.datafix.schemas.V1800 -> ahm:
+net.minecraft.util.datafix.schemas.V1800 -> aky:
     15:16:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     19:20:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     24:32:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     27:29:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$1(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
     19:19:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V1801 -> ahn:
+net.minecraft.util.datafix.schemas.V1801 -> akz:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     20:22:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V1904 -> aho:
+net.minecraft.util.datafix.schemas.V1904 -> ala:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     20:24:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V1906 -> ahp:
+net.minecraft.util.datafix.schemas.V1906 -> alb:
     15:16:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     20:32:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
     36:39:void registerInventory(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     36:37:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerInventory$1(com.mojang.datafixers.schemas.Schema) -> a
     26:27:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$0(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
-net.minecraft.util.datafix.schemas.V1909 -> ahq:
+net.minecraft.util.datafix.schemas.V1909 -> alc:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     16:20:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
-net.minecraft.util.datafix.schemas.V1920 -> ahr:
+net.minecraft.util.datafix.schemas.V1920 -> ald:
     15:16:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     19:22:void registerInventory(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     26:30:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
     19:20:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerInventory$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V1928 -> ahs:
+net.minecraft.util.datafix.schemas.V1928 -> ale:
     15:16:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     19:21:com.mojang.datafixers.types.templates.TypeTemplate equipment(com.mojang.datafixers.schemas.Schema) -> a
     26:27:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     31:36:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     26:26:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> b
-net.minecraft.util.datafix.schemas.V1929 -> aht:
+net.minecraft.util.datafix.schemas.V1929 -> alf:
     15:16:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     20:42:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     35:39:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$1(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
     21:32:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$0(com.mojang.datafixers.schemas.Schema,java.lang.String) -> b
-net.minecraft.util.datafix.schemas.V1931 -> ahu:
+net.minecraft.util.datafix.schemas.V1931 -> alg:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     20:22:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V2100 -> ahv:
+net.minecraft.util.datafix.schemas.V2100 -> alh:
     16:17:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     20:21:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     25:28:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     33:43:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
     35:38:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$1(com.mojang.datafixers.schemas.Schema) -> a
     20:20:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> b
-net.minecraft.util.datafix.schemas.V501 -> ahw:
+net.minecraft.util.datafix.schemas.V2501 -> ali:
+    19:20:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    23:27:void registerFurnace(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
+    31:35:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
+    23:25:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerFurnace$0(com.mojang.datafixers.schemas.Schema) -> a
+net.minecraft.util.datafix.schemas.V2502 -> alj:
+    11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
+    20:22:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
+    15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
+net.minecraft.util.datafix.schemas.V2505 -> alk:
+    11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
+    20:22:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
+    15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
+net.minecraft.util.datafix.schemas.V2509 -> all:
+    11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
+    20:23:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
+    15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
+net.minecraft.util.datafix.schemas.V2519 -> alm:
+    11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
+    20:22:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
+    15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
+net.minecraft.util.datafix.schemas.V2522 -> aln:
+    11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
+    20:22:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
+    15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
+net.minecraft.util.datafix.schemas.V2551 -> alo:
+    25:26:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    30:56:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
+    32:32:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$5(com.mojang.datafixers.schemas.Schema) -> a
+    42:52:com.mojang.datafixers.types.templates.TypeTemplate lambda$null$4(com.mojang.datafixers.schemas.Schema) -> b
+    46:46:com.mojang.datafixers.types.templates.TypeTemplate lambda$null$3(com.mojang.datafixers.schemas.Schema) -> c
+    45:45:com.mojang.datafixers.types.templates.TypeTemplate lambda$null$2(com.mojang.datafixers.schemas.Schema) -> d
+    44:44:com.mojang.datafixers.types.templates.TypeTemplate lambda$null$1(com.mojang.datafixers.schemas.Schema) -> e
+    34:38:com.mojang.datafixers.types.templates.TypeTemplate lambda$null$0(com.mojang.datafixers.schemas.Schema) -> f
+net.minecraft.util.datafix.schemas.V501 -> alp:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     20:24:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V700 -> ahx:
+net.minecraft.util.datafix.schemas.V700 -> alq:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     20:24:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V701 -> ahy:
+net.minecraft.util.datafix.schemas.V701 -> alr:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     20:25:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V702 -> ahz:
+net.minecraft.util.datafix.schemas.V702 -> als:
     11:12:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     15:16:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     20:25:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     15:15:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V703 -> aia:
+net.minecraft.util.datafix.schemas.V703 -> alt:
     15:16:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     20:47:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
     42:44:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$4(com.mojang.datafixers.schemas.Schema) -> a
@@ -35099,170 +38106,213 @@ net.minecraft.util.datafix.schemas.V703 -> aia:
     33:36:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$2(com.mojang.datafixers.schemas.Schema) -> c
     28:31:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$1(com.mojang.datafixers.schemas.Schema) -> d
     23:26:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$0(com.mojang.datafixers.schemas.Schema) -> e
-net.minecraft.util.datafix.schemas.V704 -> aib:
+net.minecraft.util.datafix.schemas.V704 -> alu:
     java.util.Map ITEM_TO_BLOCKENTITY -> a
     com.mojang.datafixers.types.templates.Hook$HookFunction ADD_NAMES -> b
-    34:35:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
-    38:41:void registerInventory(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
-    45:48:com.mojang.datafixers.types.Type getChoiceType(com.mojang.datafixers.DSL$TypeReference,java.lang.String) -> getChoiceType
-    53:83:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
-    88:101:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
-    105:185:void lambda$static$6(java.util.HashMap) -> a
-    92:98:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$5(com.mojang.datafixers.schemas.Schema) -> a
-    90:90:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$4(java.util.Map) -> a
-    75:76:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$3(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
-    64:64:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$2(com.mojang.datafixers.schemas.Schema,java.lang.String) -> b
-    58:59:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$1(com.mojang.datafixers.schemas.Schema,java.lang.String) -> c
-    38:39:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerInventory$0(com.mojang.datafixers.schemas.Schema) -> b
-    103:187:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.schemas.V704$1 -> aib$1:
-    187:187:void <init>() -> <init>
-    190:190:java.lang.Object apply(com.mojang.datafixers.types.DynamicOps,java.lang.Object) -> apply
-net.minecraft.util.datafix.schemas.V705 -> aic:
-    com.mojang.datafixers.types.templates.Hook$HookFunction ADD_NAMES -> a
-    28:29:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
-    32:33:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
-    36:39:void registerThrowableProjectile(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> b
-    43:203:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
-    208:219:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
-    210:216:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$25(com.mojang.datafixers.schemas.Schema) -> a
-    209:209:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$24(java.util.Map) -> a
-    193:197:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$23(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
-    182:184:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$22(com.mojang.datafixers.schemas.Schema,java.lang.String) -> b
-    160:171:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$21(com.mojang.datafixers.schemas.Schema,java.lang.String) -> c
-    157:158:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$20(com.mojang.datafixers.schemas.Schema,java.lang.String) -> d
-    150:151:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$19(com.mojang.datafixers.schemas.Schema,java.lang.String) -> e
-    146:148:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$18(com.mojang.datafixers.schemas.Schema,java.lang.String) -> f
-    138:140:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$17(com.mojang.datafixers.schemas.Schema,java.lang.String) -> g
-    128:130:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$16(com.mojang.datafixers.schemas.Schema,java.lang.String) -> h
-    118:121:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$15(com.mojang.datafixers.schemas.Schema,java.lang.String) -> i
-    114:115:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$14(com.mojang.datafixers.schemas.Schema,java.lang.String) -> j
-    109:110:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$13(com.mojang.datafixers.schemas.Schema,java.lang.String) -> k
-    106:107:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$12(com.mojang.datafixers.schemas.Schema,java.lang.String) -> l
-    99:103:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$11(com.mojang.datafixers.schemas.Schema,java.lang.String) -> m
-    95:97:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$10(com.mojang.datafixers.schemas.Schema,java.lang.String) -> n
-    89:90:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$9(com.mojang.datafixers.schemas.Schema,java.lang.String) -> o
-    86:87:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$8(com.mojang.datafixers.schemas.Schema,java.lang.String) -> p
-    81:83:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$7(com.mojang.datafixers.schemas.Schema,java.lang.String) -> q
-    74:76:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$6(com.mojang.datafixers.schemas.Schema,java.lang.String) -> r
-    64:67:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$5(com.mojang.datafixers.schemas.Schema,java.lang.String) -> s
-    59:60:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$4(com.mojang.datafixers.schemas.Schema,java.lang.String) -> t
-    54:56:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$3(com.mojang.datafixers.schemas.Schema,java.lang.String) -> u
-    47:48:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$2(com.mojang.datafixers.schemas.Schema,java.lang.String) -> v
-    36:37:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerThrowableProjectile$1(com.mojang.datafixers.schemas.Schema) -> b
-    32:32:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> c
-    221:221:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.schemas.V705$1 -> aic$1:
-    221:221:void <init>() -> <init>
-    224:224:java.lang.Object apply(com.mojang.datafixers.types.DynamicOps,java.lang.Object) -> apply
-net.minecraft.util.datafix.schemas.V808 -> aid:
+    35:36:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    39:42:void registerInventory(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
+    46:49:com.mojang.datafixers.types.Type getChoiceType(com.mojang.datafixers.DSL$TypeReference,java.lang.String) -> getChoiceType
+    54:84:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
+    89:102:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
+    106:186:void lambda$static$6(java.util.HashMap) -> a
+    93:99:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$5(com.mojang.datafixers.schemas.Schema) -> a
+    91:91:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$4(java.util.Map) -> a
+    76:77:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$3(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
+    65:65:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$2(com.mojang.datafixers.schemas.Schema,java.lang.String) -> b
+    59:60:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$1(com.mojang.datafixers.schemas.Schema,java.lang.String) -> c
+    39:40:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerInventory$0(com.mojang.datafixers.schemas.Schema) -> b
+    104:188:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.schemas.V704$1 -> alu$1:
+    188:188:void <init>() -> <init>
+    191:191:java.lang.Object apply(com.mojang.serialization.DynamicOps,java.lang.Object) -> apply
+net.minecraft.util.datafix.schemas.V705 -> alv:
+    com.mojang.datafixers.types.templates.Hook$HookFunction ADD_NAMES -> b
+    27:28:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    31:32:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
+    35:38:void registerThrowableProjectile(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> b
+    42:202:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
+    207:218:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
+    209:215:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$25(com.mojang.datafixers.schemas.Schema) -> a
+    208:208:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$24(java.util.Map) -> a
+    192:196:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$23(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
+    181:183:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$22(com.mojang.datafixers.schemas.Schema,java.lang.String) -> b
+    159:170:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$21(com.mojang.datafixers.schemas.Schema,java.lang.String) -> c
+    156:157:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$20(com.mojang.datafixers.schemas.Schema,java.lang.String) -> d
+    149:150:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$19(com.mojang.datafixers.schemas.Schema,java.lang.String) -> e
+    145:147:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$18(com.mojang.datafixers.schemas.Schema,java.lang.String) -> f
+    137:139:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$17(com.mojang.datafixers.schemas.Schema,java.lang.String) -> g
+    127:129:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$16(com.mojang.datafixers.schemas.Schema,java.lang.String) -> h
+    117:120:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$15(com.mojang.datafixers.schemas.Schema,java.lang.String) -> i
+    113:114:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$14(com.mojang.datafixers.schemas.Schema,java.lang.String) -> j
+    108:109:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$13(com.mojang.datafixers.schemas.Schema,java.lang.String) -> k
+    105:106:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$12(com.mojang.datafixers.schemas.Schema,java.lang.String) -> l
+    98:102:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$11(com.mojang.datafixers.schemas.Schema,java.lang.String) -> m
+    94:96:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$10(com.mojang.datafixers.schemas.Schema,java.lang.String) -> n
+    88:89:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$9(com.mojang.datafixers.schemas.Schema,java.lang.String) -> o
+    85:86:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$8(com.mojang.datafixers.schemas.Schema,java.lang.String) -> p
+    80:82:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$7(com.mojang.datafixers.schemas.Schema,java.lang.String) -> q
+    73:75:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$6(com.mojang.datafixers.schemas.Schema,java.lang.String) -> r
+    63:66:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$5(com.mojang.datafixers.schemas.Schema,java.lang.String) -> s
+    58:59:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$4(com.mojang.datafixers.schemas.Schema,java.lang.String) -> t
+    53:55:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$3(com.mojang.datafixers.schemas.Schema,java.lang.String) -> u
+    46:47:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$2(com.mojang.datafixers.schemas.Schema,java.lang.String) -> v
+    35:36:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerThrowableProjectile$1(com.mojang.datafixers.schemas.Schema) -> b
+    31:31:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> c
+    220:220:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.schemas.V705$1 -> alv$1:
+    220:220:void <init>() -> <init>
+    223:223:java.lang.Object apply(com.mojang.serialization.DynamicOps,java.lang.Object) -> apply
+net.minecraft.util.datafix.schemas.V808 -> alw:
     15:16:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
     19:22:void registerInventory(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
     26:30:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
     19:20:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerInventory$0(com.mojang.datafixers.schemas.Schema) -> a
-net.minecraft.util.datafix.schemas.V99 -> aie:
+net.minecraft.util.datafix.schemas.V99 -> alx:
     org.apache.logging.log4j.Logger LOGGER -> b
     java.util.Map ITEM_TO_BLOCKENTITY -> c
     com.mojang.datafixers.types.templates.Hook$HookFunction ADD_NAMES -> a
-    52:53:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
-    56:57:com.mojang.datafixers.types.templates.TypeTemplate equipment(com.mojang.datafixers.schemas.Schema) -> a
-    62:63:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
-    66:70:void registerThrowableProjectile(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> b
-    73:76:void registerMinecart(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> c
-    79:82:void registerInventory(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> d
-    86:214:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
-    219:251:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
-    256:301:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
-    353:369:java.lang.Object addNames(com.mojang.datafixers.Dynamic,java.util.Map,java.lang.String) -> a
-    353:363:com.mojang.datafixers.Dynamic lambda$addNames$35(com.mojang.datafixers.Dynamic,java.util.Map,java.lang.String,com.mojang.datafixers.Dynamic) -> a
-    364:368:com.mojang.datafixers.Dynamic lambda$null$34(com.mojang.datafixers.Dynamic,java.lang.String,com.mojang.datafixers.Dynamic) -> a
-    354:362:com.mojang.datafixers.Dynamic lambda$null$33(com.mojang.datafixers.Dynamic,java.util.Map,com.mojang.datafixers.Dynamic) -> a
-    305:343:void lambda$static$32(java.util.HashMap) -> a
-    288:292:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$31(com.mojang.datafixers.schemas.Schema) -> b
-    286:286:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$30() -> b
-    285:285:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$29() -> c
-    275:281:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$28(com.mojang.datafixers.schemas.Schema) -> c
-    274:274:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$27(java.util.Map) -> a
-    273:273:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$26() -> d
-    269:271:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$25(com.mojang.datafixers.schemas.Schema) -> d
-    268:268:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$24(java.util.Map) -> b
-    261:265:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$23(com.mojang.datafixers.schemas.Schema) -> e
-    257:259:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$22(com.mojang.datafixers.schemas.Schema) -> f
-    242:243:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$21(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
-    230:230:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$20(com.mojang.datafixers.schemas.Schema,java.lang.String) -> b
-    224:225:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$19(com.mojang.datafixers.schemas.Schema,java.lang.String) -> c
-    193:204:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$18(com.mojang.datafixers.schemas.Schema,java.lang.String) -> d
-    186:190:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$17(com.mojang.datafixers.schemas.Schema,java.lang.String) -> e
-    162:164:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$16(com.mojang.datafixers.schemas.Schema,java.lang.String) -> f
-    144:146:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$15(com.mojang.datafixers.schemas.Schema,java.lang.String) -> g
-    140:142:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$14(com.mojang.datafixers.schemas.Schema) -> g
-    134:136:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$13(com.mojang.datafixers.schemas.Schema,java.lang.String) -> h
-    129:131:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$12(com.mojang.datafixers.schemas.Schema) -> h
-    123:124:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$11(com.mojang.datafixers.schemas.Schema,java.lang.String) -> i
-    119:121:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$10(com.mojang.datafixers.schemas.Schema,java.lang.String) -> j
-    114:115:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$9(com.mojang.datafixers.schemas.Schema,java.lang.String) -> k
-    109:111:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$8(com.mojang.datafixers.schemas.Schema,java.lang.String) -> l
-    101:102:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$7(com.mojang.datafixers.schemas.Schema,java.lang.String) -> m
-    98:99:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$6(com.mojang.datafixers.schemas.Schema,java.lang.String) -> n
-    95:96:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$5(com.mojang.datafixers.schemas.Schema,java.lang.String) -> o
-    88:89:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$4(com.mojang.datafixers.schemas.Schema,java.lang.String) -> p
-    79:80:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerInventory$3(com.mojang.datafixers.schemas.Schema) -> i
-    73:74:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMinecart$2(com.mojang.datafixers.schemas.Schema) -> j
-    66:68:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerThrowableProjectile$1(com.mojang.datafixers.schemas.Schema) -> k
-    62:62:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> l
-    48:48:java.util.Map access$000() -> a
-    49:345:void <clinit>() -> <clinit>
-net.minecraft.util.datafix.schemas.V99$1 -> aie$1:
-    345:345:void <init>() -> <init>
-    348:348:java.lang.Object apply(com.mojang.datafixers.types.DynamicOps,java.lang.Object) -> apply
-net.minecraft.util.datafix.schemas.package-info -> aif:
-net.minecraft.util.package-info -> aig:
-net.minecraft.util.profiling.ActiveProfiler -> aih:
+    54:55:void <init>(int,com.mojang.datafixers.schemas.Schema) -> <init>
+    58:59:com.mojang.datafixers.types.templates.TypeTemplate equipment(com.mojang.datafixers.schemas.Schema) -> a
+    64:65:void registerMob(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> a
+    68:72:void registerThrowableProjectile(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> b
+    75:78:void registerMinecart(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> c
+    81:84:void registerInventory(com.mojang.datafixers.schemas.Schema,java.util.Map,java.lang.String) -> d
+    88:216:java.util.Map registerEntities(com.mojang.datafixers.schemas.Schema) -> registerEntities
+    221:253:java.util.Map registerBlockEntities(com.mojang.datafixers.schemas.Schema) -> registerBlockEntities
+    258:304:void registerTypes(com.mojang.datafixers.schemas.Schema,java.util.Map,java.util.Map) -> registerTypes
+    356:372:java.lang.Object addNames(com.mojang.serialization.Dynamic,java.util.Map,java.lang.String) -> a
+    356:366:com.mojang.serialization.Dynamic lambda$addNames$35(com.mojang.serialization.Dynamic,java.util.Map,java.lang.String,com.mojang.serialization.Dynamic) -> a
+    367:371:com.mojang.serialization.Dynamic lambda$null$34(com.mojang.serialization.Dynamic,java.lang.String,com.mojang.serialization.Dynamic) -> a
+    357:365:com.mojang.serialization.Dynamic lambda$null$33(com.mojang.serialization.Dynamic,java.util.Map,com.mojang.serialization.Dynamic) -> a
+    308:346:void lambda$static$32(java.util.HashMap) -> a
+    290:294:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$31(com.mojang.datafixers.schemas.Schema) -> b
+    288:288:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$30() -> b
+    287:287:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$29() -> c
+    277:283:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$28(com.mojang.datafixers.schemas.Schema) -> c
+    276:276:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$27(java.util.Map) -> a
+    275:275:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$26() -> d
+    271:273:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$25(com.mojang.datafixers.schemas.Schema) -> d
+    270:270:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$24(java.util.Map) -> b
+    263:267:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$23(com.mojang.datafixers.schemas.Schema) -> e
+    259:261:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerTypes$22(com.mojang.datafixers.schemas.Schema) -> f
+    244:245:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$21(com.mojang.datafixers.schemas.Schema,java.lang.String) -> a
+    232:232:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$20(com.mojang.datafixers.schemas.Schema,java.lang.String) -> b
+    226:227:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerBlockEntities$19(com.mojang.datafixers.schemas.Schema,java.lang.String) -> c
+    195:206:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$18(com.mojang.datafixers.schemas.Schema,java.lang.String) -> d
+    188:192:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$17(com.mojang.datafixers.schemas.Schema,java.lang.String) -> e
+    164:166:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$16(com.mojang.datafixers.schemas.Schema,java.lang.String) -> f
+    146:148:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$15(com.mojang.datafixers.schemas.Schema,java.lang.String) -> g
+    142:144:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$14(com.mojang.datafixers.schemas.Schema) -> g
+    136:138:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$13(com.mojang.datafixers.schemas.Schema,java.lang.String) -> h
+    131:133:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$12(com.mojang.datafixers.schemas.Schema) -> h
+    125:126:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$11(com.mojang.datafixers.schemas.Schema,java.lang.String) -> i
+    121:123:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$10(com.mojang.datafixers.schemas.Schema,java.lang.String) -> j
+    116:117:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$9(com.mojang.datafixers.schemas.Schema,java.lang.String) -> k
+    111:113:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$8(com.mojang.datafixers.schemas.Schema,java.lang.String) -> l
+    103:104:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$7(com.mojang.datafixers.schemas.Schema,java.lang.String) -> m
+    100:101:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$6(com.mojang.datafixers.schemas.Schema,java.lang.String) -> n
+    97:98:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$5(com.mojang.datafixers.schemas.Schema,java.lang.String) -> o
+    90:91:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerEntities$4(com.mojang.datafixers.schemas.Schema,java.lang.String) -> p
+    81:82:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerInventory$3(com.mojang.datafixers.schemas.Schema) -> i
+    75:76:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMinecart$2(com.mojang.datafixers.schemas.Schema) -> j
+    68:70:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerThrowableProjectile$1(com.mojang.datafixers.schemas.Schema) -> k
+    64:64:com.mojang.datafixers.types.templates.TypeTemplate lambda$registerMob$0(com.mojang.datafixers.schemas.Schema) -> l
+    50:50:java.util.Map access$000() -> a
+    51:348:void <clinit>() -> <clinit>
+net.minecraft.util.datafix.schemas.V99$1 -> alx$1:
+    348:348:void <init>() -> <init>
+    351:351:java.lang.Object apply(com.mojang.serialization.DynamicOps,java.lang.Object) -> apply
+net.minecraft.util.datafix.schemas.package-info -> aly:
+net.minecraft.util.monitoring.jmx.MinecraftServerStatistics -> alz:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.server.MinecraftServer server -> b
+    javax.management.MBeanInfo mBeanInfo -> c
+    java.util.Map attributeDescriptionByName -> d
+    34:47:void <init>(net.minecraft.server.MinecraftServer) -> <init>
+    51:58:void registerJmxMonitoring(net.minecraft.server.MinecraftServer) -> a
+    61:61:float getAverageTickTime() -> a
+    65:65:long[] getTickTimes() -> b
+    71:74:java.lang.Object getAttribute(java.lang.String) -> getAttribute
+    80:80:void setAttribute(javax.management.Attribute) -> setAttribute
+    84:89:javax.management.AttributeList getAttributes(java.lang.String[]) -> getAttributes
+    95:95:javax.management.AttributeList setAttributes(javax.management.AttributeList) -> setAttributes
+    102:102:java.lang.Object invoke(java.lang.String,java.lang.Object[],java.lang.String[]) -> invoke
+    107:107:javax.management.MBeanInfo getMBeanInfo() -> getMBeanInfo
+    87:87:javax.management.Attribute lambda$getAttributes$3(net.minecraft.util.monitoring.jmx.MinecraftServerStatistics$AttributeDescription) -> a
+    44:44:javax.management.MBeanAttributeInfo[] lambda$new$2(int) -> a
+    43:43:javax.management.MBeanAttributeInfo lambda$new$1(java.lang.Object) -> a
+    37:37:java.lang.String lambda$new$0(net.minecraft.util.monitoring.jmx.MinecraftServerStatistics$AttributeDescription) -> b
+    30:30:void <clinit>() -> <clinit>
+net.minecraft.util.monitoring.jmx.MinecraftServerStatistics$1 -> alz$1:
+net.minecraft.util.monitoring.jmx.MinecraftServerStatistics$AttributeDescription -> alz$a:
+    java.lang.String name -> a
+    java.util.function.Supplier getter -> b
+    java.lang.String description -> c
+    java.lang.Class type -> d
+    116:121:void <init>(java.lang.String,java.util.function.Supplier,java.lang.String,java.lang.Class) -> <init>
+    124:124:javax.management.MBeanAttributeInfo asMBeanAttributeInfo() -> a
+    110:110:void <init>(java.lang.String,java.util.function.Supplier,java.lang.String,java.lang.Class,net.minecraft.util.monitoring.jmx.MinecraftServerStatistics$1) -> <init>
+    110:110:java.util.function.Supplier access$100(net.minecraft.util.monitoring.jmx.MinecraftServerStatistics$AttributeDescription) -> a
+    110:110:java.lang.String access$200(net.minecraft.util.monitoring.jmx.MinecraftServerStatistics$AttributeDescription) -> b
+    110:110:javax.management.MBeanAttributeInfo access$300(net.minecraft.util.monitoring.jmx.MinecraftServerStatistics$AttributeDescription) -> c
+net.minecraft.util.package-info -> ama:
+net.minecraft.util.profiling.ActiveProfiler -> amb:
     long WARNING_TIME_NANOS -> a
     org.apache.logging.log4j.Logger LOGGER -> b
     java.util.List paths -> c
     it.unimi.dsi.fastutil.longs.LongList startTimes -> d
     java.util.Map entries -> e
     java.util.function.IntSupplier getTickTime -> f
-    long startTimeNano -> g
-    int startTimeTicks -> h
-    java.lang.String path -> i
-    boolean started -> j
-    net.minecraft.util.profiling.ActiveProfiler$PathEntry currentEntry -> k
-    boolean warn -> l
-    25:44:void <init>(long,java.util.function.IntSupplier,boolean) -> <init>
-    48:57:void startTick() -> a
-    61:72:void endTick() -> b
-    76:88:void push(java.lang.String) -> a
-    92:93:void push(java.util.function.Supplier) -> a
-    97:120:void pop() -> c
-    124:126:void popPush(java.lang.String) -> b
-    130:132:void popPush(java.util.function.Supplier) -> b
-    135:139:net.minecraft.util.profiling.ActiveProfiler$PathEntry getCurrentEntry() -> e
-    144:145:void incrementCounter(java.lang.String) -> c
-    149:150:void incrementCounter(java.util.function.Supplier) -> c
-    155:155:net.minecraft.util.profiling.ProfileResults getResults() -> d
-    136:136:net.minecraft.util.profiling.ActiveProfiler$PathEntry lambda$getCurrentEntry$3(java.lang.String) -> d
-    115:115:java.lang.Object lambda$pop$2(long) -> a
-    115:115:java.lang.Object lambda$pop$1() -> f
-    70:70:java.lang.Object lambda$endTick$0() -> g
-    22:23:void <clinit>() -> <clinit>
-net.minecraft.util.profiling.ActiveProfiler$1 -> aih$1:
-net.minecraft.util.profiling.ActiveProfiler$PathEntry -> aih$a:
+    java.util.function.LongSupplier getRealTime -> g
+    long startTimeNano -> h
+    int startTimeTicks -> i
+    java.lang.String path -> j
+    boolean started -> k
+    net.minecraft.util.profiling.ActiveProfiler$PathEntry currentEntry -> l
+    boolean warn -> m
+    26:47:void <init>(java.util.function.LongSupplier,java.util.function.IntSupplier,boolean) -> <init>
+    51:60:void startTick() -> a
+    64:75:void endTick() -> b
+    79:91:void push(java.lang.String) -> a
+    95:96:void push(java.util.function.Supplier) -> a
+    100:123:void pop() -> c
+    127:129:void popPush(java.lang.String) -> b
+    133:135:void popPush(java.util.function.Supplier) -> b
+    138:142:net.minecraft.util.profiling.ActiveProfiler$PathEntry getCurrentEntry() -> e
+    147:148:void incrementCounter(java.lang.String) -> c
+    152:153:void incrementCounter(java.util.function.Supplier) -> c
+    158:158:net.minecraft.util.profiling.ProfileResults getResults() -> d
+    139:139:net.minecraft.util.profiling.ActiveProfiler$PathEntry lambda$getCurrentEntry$3(java.lang.String) -> d
+    118:118:java.lang.Object lambda$pop$2(long) -> a
+    118:118:java.lang.Object lambda$pop$1() -> f
+    73:73:java.lang.Object lambda$endTick$0() -> g
+    23:24:void <clinit>() -> <clinit>
+net.minecraft.util.profiling.ActiveProfiler$1 -> amb$1:
+net.minecraft.util.profiling.ActiveProfiler$PathEntry -> amb$a:
     long duration -> a
     long count -> b
     it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap counters -> c
-    158:161:void <init>() -> <init>
-    165:165:long getDuration() -> a
-    170:170:long getCount() -> b
-    175:175:it.unimi.dsi.fastutil.objects.Object2LongMap getCounters() -> c
-    158:158:long access$000(net.minecraft.util.profiling.ActiveProfiler$PathEntry) -> a
-    158:158:long access$002(net.minecraft.util.profiling.ActiveProfiler$PathEntry,long) -> a
-    158:158:long access$100(net.minecraft.util.profiling.ActiveProfiler$PathEntry) -> b
-    158:158:long access$102(net.minecraft.util.profiling.ActiveProfiler$PathEntry,long) -> b
-    158:158:it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap access$200(net.minecraft.util.profiling.ActiveProfiler$PathEntry) -> c
-    158:158:void <init>(net.minecraft.util.profiling.ActiveProfiler$1) -> <init>
-net.minecraft.util.profiling.EmptyProfileResults -> aii:
+    161:164:void <init>() -> <init>
+    168:168:long getDuration() -> a
+    173:173:long getCount() -> b
+    178:178:it.unimi.dsi.fastutil.objects.Object2LongMap getCounters() -> c
+    161:161:long access$000(net.minecraft.util.profiling.ActiveProfiler$PathEntry) -> a
+    161:161:long access$002(net.minecraft.util.profiling.ActiveProfiler$PathEntry,long) -> a
+    161:161:long access$100(net.minecraft.util.profiling.ActiveProfiler$PathEntry) -> b
+    161:161:long access$102(net.minecraft.util.profiling.ActiveProfiler$PathEntry,long) -> b
+    161:161:it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap access$200(net.minecraft.util.profiling.ActiveProfiler$PathEntry) -> c
+    161:161:void <init>(net.minecraft.util.profiling.ActiveProfiler$1) -> <init>
+net.minecraft.util.profiling.ContinuousProfiler -> amc:
+    java.util.function.LongSupplier realTime -> a
+    java.util.function.IntSupplier tickCount -> b
+    net.minecraft.util.profiling.ProfileCollector profiler -> c
+    9:14:void <init>(java.util.function.LongSupplier,java.util.function.IntSupplier) -> <init>
+    17:17:boolean isEnabled() -> a
+    21:22:void disable() -> b
+    25:26:void enable() -> c
+    29:29:net.minecraft.util.profiling.ProfilerFiller getFiller() -> d
+    33:33:net.minecraft.util.profiling.ProfileResults getResults() -> e
+net.minecraft.util.profiling.EmptyProfileResults -> amd:
     net.minecraft.util.profiling.EmptyProfileResults EMPTY -> a
     10:11:void <init>() -> <init>
     15:15:java.util.List getTimes(java.lang.String) -> a
@@ -35273,7 +38323,7 @@ net.minecraft.util.profiling.EmptyProfileResults -> aii:
     40:40:int getEndTimeTicks() -> d
     45:45:java.lang.String getProfilerResults() -> e
     8:8:void <clinit>() -> <clinit>
-net.minecraft.util.profiling.FilledProfileResults -> aij:
+net.minecraft.util.profiling.FilledProfileResults -> ame:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.util.profiling.ProfilerPathEntry EMPTY -> b
     com.google.common.base.Splitter SPLITTER -> c
@@ -35284,84 +38334,50 @@ net.minecraft.util.profiling.FilledProfileResults -> aij:
     long endTimeNano -> h
     int endTimeTicks -> i
     int tickDuration -> j
-    56:63:void <init>(java.util.Map,long,int,long,int) -> <init>
-    67:68:net.minecraft.util.profiling.ProfilerPathEntry getEntry(java.lang.String) -> c
-    73:118:java.util.List getTimes(java.lang.String) -> a
-    122:122:boolean isDirectChild(java.lang.String,java.lang.String) -> a
-    126:136:java.util.Map getCounterValues() -> h
-    141:141:long getStartTimeNano() -> a
-    146:146:int getStartTimeTicks() -> b
-    151:151:long getEndTimeNano() -> c
-    156:156:int getEndTimeTicks() -> d
-    161:173:boolean saveResults(java.io.File) -> a
-    177:203:java.lang.String getProfilerResults(long,int) -> a
-    208:210:java.lang.String getProfilerResults() -> e
-    214:218:java.lang.StringBuilder indentLine(java.lang.StringBuilder,int) -> a
-    222:263:void appendProfilerResults(int,java.lang.String,java.lang.StringBuilder) -> a
-    266:275:void appendCounterResults(int,java.lang.String,net.minecraft.util.profiling.FilledProfileResults$CounterCollector,int,java.lang.StringBuilder) -> a
-    278:283:void appendCounters(java.util.Map,java.lang.StringBuilder,int) -> a
-    287:307:java.lang.String getComment() -> i
-    313:313:int getTickDuration() -> f
-    279:282:void lambda$appendCounters$6(java.lang.StringBuilder,int,java.lang.String,net.minecraft.util.profiling.FilledProfileResults$CounterCollector) -> a
-    274:274:void lambda$appendCounterResults$5(int,int,java.lang.StringBuilder,java.util.Map$Entry) -> a
-    226:233:void lambda$appendProfilerResults$4(java.lang.StringBuilder,int,java.lang.String,java.lang.Long) -> a
-    128:135:void lambda$getCounterValues$3(java.util.Map,java.lang.String,net.minecraft.util.profiling.ProfilerPathEntry) -> a
-    132:132:void lambda$null$2(java.util.Map,java.util.List,java.lang.String,java.lang.Long) -> a
-    132:132:net.minecraft.util.profiling.FilledProfileResults$CounterCollector lambda$null$1(java.lang.String) -> d
-    47:47:long lambda$static$0(net.minecraft.util.profiling.FilledProfileResults$CounterCollector) -> a
-    27:47:void <clinit>() -> <clinit>
-net.minecraft.util.profiling.FilledProfileResults$1 -> aij$1:
-    29:29:void <init>() -> <init>
-    32:32:long getDuration() -> a
-    37:37:long getCount() -> b
-    42:42:it.unimi.dsi.fastutil.objects.Object2LongMap getCounters() -> c
-net.minecraft.util.profiling.FilledProfileResults$CounterCollector -> aij$a:
+    57:64:void <init>(java.util.Map,long,int,long,int) -> <init>
+    68:69:net.minecraft.util.profiling.ProfilerPathEntry getEntry(java.lang.String) -> c
+    74:119:java.util.List getTimes(java.lang.String) -> a
+    123:123:boolean isDirectChild(java.lang.String,java.lang.String) -> a
+    127:137:java.util.Map getCounterValues() -> h
+    142:142:long getStartTimeNano() -> a
+    147:147:int getStartTimeTicks() -> b
+    152:152:long getEndTimeNano() -> c
+    157:157:int getEndTimeTicks() -> d
+    162:174:boolean saveResults(java.io.File) -> a
+    178:204:java.lang.String getProfilerResults(long,int) -> a
+    209:211:java.lang.String getProfilerResults() -> e
+    215:219:java.lang.StringBuilder indentLine(java.lang.StringBuilder,int) -> a
+    223:264:void appendProfilerResults(int,java.lang.String,java.lang.StringBuilder) -> a
+    267:276:void appendCounterResults(int,java.lang.String,net.minecraft.util.profiling.FilledProfileResults$CounterCollector,int,java.lang.StringBuilder) -> a
+    279:284:void appendCounters(java.util.Map,java.lang.StringBuilder,int) -> a
+    288:308:java.lang.String getComment() -> i
+    314:314:int getTickDuration() -> f
+    280:283:void lambda$appendCounters$6(java.lang.StringBuilder,int,java.lang.String,net.minecraft.util.profiling.FilledProfileResults$CounterCollector) -> a
+    275:275:void lambda$appendCounterResults$5(int,int,java.lang.StringBuilder,java.util.Map$Entry) -> a
+    227:234:void lambda$appendProfilerResults$4(java.lang.StringBuilder,int,java.lang.String,java.lang.Long) -> a
+    129:136:void lambda$getCounterValues$3(java.util.Map,java.lang.String,net.minecraft.util.profiling.ProfilerPathEntry) -> a
+    133:133:void lambda$null$2(java.util.Map,java.util.List,java.lang.String,java.lang.Long) -> a
+    133:133:net.minecraft.util.profiling.FilledProfileResults$CounterCollector lambda$null$1(java.lang.String) -> d
+    48:48:long lambda$static$0(net.minecraft.util.profiling.FilledProfileResults$CounterCollector) -> a
+    28:48:void <clinit>() -> <clinit>
+net.minecraft.util.profiling.FilledProfileResults$1 -> ame$1:
+    30:30:void <init>() -> <init>
+    33:33:long getDuration() -> a
+    38:38:long getCount() -> b
+    43:43:it.unimi.dsi.fastutil.objects.Object2LongMap getCounters() -> c
+net.minecraft.util.profiling.FilledProfileResults$CounterCollector -> ame$a:
     long selfValue -> a
     long totalValue -> b
     java.util.Map children -> c
-    316:319:void <init>() -> <init>
-    322:328:void addValue(java.util.Iterator,long) -> a
-    326:326:net.minecraft.util.profiling.FilledProfileResults$CounterCollector lambda$addValue$0(java.lang.String) -> a
-    316:316:long access$000(net.minecraft.util.profiling.FilledProfileResults$CounterCollector) -> a
-    316:316:long access$100(net.minecraft.util.profiling.FilledProfileResults$CounterCollector) -> b
-    316:316:java.util.Map access$200(net.minecraft.util.profiling.FilledProfileResults$CounterCollector) -> c
-    316:316:void <init>(net.minecraft.util.profiling.FilledProfileResults$1) -> <init>
-net.minecraft.util.profiling.GameProfiler -> aik:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    long MAXIMUM_TICK_TIME_NANOS -> b
-    java.util.function.IntSupplier getTickTime -> c
-    net.minecraft.util.profiling.GameProfiler$ProfilerImpl continuous -> d
-    net.minecraft.util.profiling.GameProfiler$ProfilerImpl perTick -> e
-    22:27:void <init>(java.util.function.IntSupplier) -> <init>
-    30:30:net.minecraft.util.profiling.GameProfiler$Profiler continuous() -> d
-    39:41:void startTick() -> a
-    45:56:void endTick() -> b
-    60:62:void push(java.lang.String) -> a
-    66:68:void push(java.util.function.Supplier) -> a
-    72:74:void pop() -> c
-    78:80:void popPush(java.lang.String) -> b
-    84:86:void popPush(java.util.function.Supplier) -> b
-    90:92:void incrementCounter(java.lang.String) -> c
-    96:98:void incrementCounter(java.util.function.Supplier) -> c
-    14:14:java.util.function.IntSupplier access$100(net.minecraft.util.profiling.GameProfiler) -> a
-    15:17:void <clinit>() -> <clinit>
-net.minecraft.util.profiling.GameProfiler$1 -> aik$1:
-net.minecraft.util.profiling.GameProfiler$Profiler -> aik$a:
-    boolean isEnabled() -> a
-    net.minecraft.util.profiling.ProfileResults disable() -> b
-    net.minecraft.util.profiling.ProfileResults getResults() -> c
-    void enable() -> d
-net.minecraft.util.profiling.GameProfiler$ProfilerImpl -> aik$b:
-    net.minecraft.util.profiling.ProfileCollector collector -> a
-    net.minecraft.util.profiling.GameProfiler this$0 -> b
-    110:111:void <init>(net.minecraft.util.profiling.GameProfiler) -> <init>
-    115:115:boolean isEnabled() -> a
-    120:122:net.minecraft.util.profiling.ProfileResults disable() -> b
-    127:127:net.minecraft.util.profiling.ProfileResults getResults() -> c
-    132:135:void enable() -> d
-    110:110:void <init>(net.minecraft.util.profiling.GameProfiler,net.minecraft.util.profiling.GameProfiler$1) -> <init>
-net.minecraft.util.profiling.InactiveProfiler -> ail:
-    net.minecraft.util.profiling.InactiveProfiler INACTIVE -> a
+    317:320:void <init>() -> <init>
+    323:329:void addValue(java.util.Iterator,long) -> a
+    327:327:net.minecraft.util.profiling.FilledProfileResults$CounterCollector lambda$addValue$0(java.lang.String) -> a
+    317:317:long access$000(net.minecraft.util.profiling.FilledProfileResults$CounterCollector) -> a
+    317:317:long access$100(net.minecraft.util.profiling.FilledProfileResults$CounterCollector) -> b
+    317:317:java.util.Map access$200(net.minecraft.util.profiling.FilledProfileResults$CounterCollector) -> c
+    317:317:void <init>(net.minecraft.util.profiling.FilledProfileResults$1) -> <init>
+net.minecraft.util.profiling.InactiveProfiler -> amf:
+    net.minecraft.util.profiling.InactiveProfiler INSTANCE -> a
     8:9:void <init>() -> <init>
     13:13:void startTick() -> a
     17:17:void endTick() -> b
@@ -35374,9 +38390,9 @@ net.minecraft.util.profiling.InactiveProfiler -> ail:
     45:45:void incrementCounter(java.util.function.Supplier) -> c
     49:49:net.minecraft.util.profiling.ProfileResults getResults() -> d
     6:6:void <clinit>() -> <clinit>
-net.minecraft.util.profiling.ProfileCollector -> aim:
+net.minecraft.util.profiling.ProfileCollector -> amg:
     net.minecraft.util.profiling.ProfileResults getResults() -> d
-net.minecraft.util.profiling.ProfileResults -> ain:
+net.minecraft.util.profiling.ProfileResults -> amh:
     java.util.List getTimes(java.lang.String) -> a
     boolean saveResults(java.io.File) -> a
     long getStartTimeNano() -> a
@@ -35387,7 +38403,7 @@ net.minecraft.util.profiling.ProfileResults -> ain:
     26:26:int getTickDuration() -> f
     java.lang.String getProfilerResults() -> e
     32:32:java.lang.String demanglePath(java.lang.String) -> b
-net.minecraft.util.profiling.ProfilerFiller -> aio:
+net.minecraft.util.profiling.ProfilerFiller -> ami:
     void startTick() -> a
     void endTick() -> b
     void push(java.lang.String) -> a
@@ -35397,11 +38413,25 @@ net.minecraft.util.profiling.ProfilerFiller -> aio:
     void popPush(java.util.function.Supplier) -> b
     void incrementCounter(java.lang.String) -> c
     void incrementCounter(java.util.function.Supplier) -> c
-net.minecraft.util.profiling.ProfilerPathEntry -> aip:
+    27:33:net.minecraft.util.profiling.ProfilerFiller tee(net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.ProfilerFiller) -> a
+net.minecraft.util.profiling.ProfilerFiller$1 -> ami$1:
+    net.minecraft.util.profiling.ProfilerFiller val$first -> a
+    net.minecraft.util.profiling.ProfilerFiller val$second -> b
+    33:33:void <init>(net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.ProfilerFiller) -> <init>
+    36:38:void startTick() -> a
+    42:44:void endTick() -> b
+    48:50:void push(java.lang.String) -> a
+    54:56:void push(java.util.function.Supplier) -> a
+    60:62:void pop() -> c
+    66:68:void popPush(java.lang.String) -> b
+    72:74:void popPush(java.util.function.Supplier) -> b
+    78:80:void incrementCounter(java.lang.String) -> c
+    84:86:void incrementCounter(java.util.function.Supplier) -> c
+net.minecraft.util.profiling.ProfilerPathEntry -> amj:
     long getDuration() -> a
     long getCount() -> b
     it.unimi.dsi.fastutil.objects.Object2LongMap getCounters() -> c
-net.minecraft.util.profiling.ResultField -> aiq:
+net.minecraft.util.profiling.ResultField -> amk:
     double percentage -> a
     double globalPercentage -> b
     long count -> c
@@ -35410,8 +38440,22 @@ net.minecraft.util.profiling.ResultField -> aiq:
     18:24:int compareTo(net.minecraft.util.profiling.ResultField) -> a
     28:28:int getColor() -> a
     3:3:int compareTo(java.lang.Object) -> compareTo
-net.minecraft.util.profiling.package-info -> air:
-net.minecraft.util.thread.BlockableEventLoop -> ais:
+net.minecraft.util.profiling.SingleTickProfiler -> aml:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    java.util.function.LongSupplier realTime -> b
+    long saveThreshold -> c
+    int tick -> d
+    java.io.File location -> e
+    net.minecraft.util.profiling.ProfileCollector profiler -> f
+    20:26:void <init>(java.util.function.LongSupplier,java.lang.String,long) -> <init>
+    29:31:net.minecraft.util.profiling.ProfilerFiller startTick() -> a
+    35:47:void endTick() -> b
+    54:54:net.minecraft.util.profiling.SingleTickProfiler createTickProfiler(java.lang.String) -> a
+    58:61:net.minecraft.util.profiling.ProfilerFiller decorateFiller(net.minecraft.util.profiling.ProfilerFiller,net.minecraft.util.profiling.SingleTickProfiler) -> a
+    29:29:int lambda$startTick$0() -> c
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.util.profiling.package-info -> amm:
+net.minecraft.util.thread.BlockableEventLoop -> amn:
     java.lang.String name -> b
     org.apache.logging.log4j.Logger LOGGER -> c
     java.util.Queue pendingRunnables -> d
@@ -35419,27 +38463,27 @@ net.minecraft.util.thread.BlockableEventLoop -> ais:
     19:24:void <init>(java.lang.String) -> <init>
     java.lang.Runnable wrapRunnable(java.lang.Runnable) -> e
     boolean shouldRun(java.lang.Runnable) -> d
-    31:31:boolean isSameThread() -> bg
-    java.lang.Thread getRunningThread() -> az
-    37:37:boolean scheduleExecutables() -> ay
-    41:41:int getPendingTasksCount() -> bh
-    46:46:java.lang.String name() -> bi
+    31:31:boolean isSameThread() -> bf
+    java.lang.Thread getRunningThread() -> au
+    37:37:boolean scheduleExecutables() -> at
+    41:41:int getPendingTasksCount() -> bg
+    46:46:java.lang.String name() -> bh
     50:53:java.util.concurrent.CompletableFuture submit(java.util.function.Supplier) -> a
     58:58:java.util.concurrent.CompletableFuture submitAsync(java.lang.Runnable) -> a
     67:71:java.util.concurrent.CompletableFuture submit(java.lang.Runnable) -> f
     76:81:void executeBlocking(java.lang.Runnable) -> g
     85:87:void tell(java.lang.Runnable) -> h
     91:96:void execute(java.lang.Runnable) -> execute
-    99:100:void dropAllTasks() -> bj
-    103:106:void runAllTasks() -> bk
-    109:120:boolean pollTask() -> w
+    99:100:void dropAllTasks() -> bi
+    103:106:void runAllTasks() -> bj
+    109:120:boolean pollTask() -> x
     124:135:void managedBlock(java.util.function.BooleanSupplier) -> c
-    138:140:void waitForTasks() -> bl
+    138:140:void waitForTasks() -> bk
     144:148:void doRunTask(java.lang.Runnable) -> c
     14:14:void tell(java.lang.Object) -> a
     59:60:java.lang.Void lambda$submitAsync$0(java.lang.Runnable) -> b
     17:17:void <clinit>() -> <clinit>
-net.minecraft.util.thread.NamedThreadFactory -> ait:
+net.minecraft.util.thread.NamedThreadFactory -> amo:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.lang.ThreadGroup group -> b
     java.util.concurrent.atomic.AtomicInteger threadNumber -> c
@@ -35448,52 +38492,54 @@ net.minecraft.util.thread.NamedThreadFactory -> ait:
     24:32:java.lang.Thread newThread(java.lang.Runnable) -> newThread
     26:28:void lambda$newThread$0(java.lang.Runnable,java.lang.Thread,java.lang.Throwable) -> a
     10:10:void <clinit>() -> <clinit>
-net.minecraft.util.thread.ProcessorHandle -> aiu:
-    java.lang.String name() -> bi
+net.minecraft.util.thread.ProcessorHandle -> amp:
+    java.lang.String name() -> bh
     void tell(java.lang.Object) -> a
-    14:14:void close() -> close
-    17:20:java.util.concurrent.CompletableFuture ask(java.util.function.Function) -> a
-    24:24:net.minecraft.util.thread.ProcessorHandle of(java.lang.String,java.util.function.Consumer) -> a
-net.minecraft.util.thread.ProcessorHandle$1 -> aiu$1:
+    16:16:void close() -> close
+    19:22:java.util.concurrent.CompletableFuture ask(java.util.function.Function) -> b
+    26:32:java.util.concurrent.CompletableFuture askEither(java.util.function.Function) -> c
+    36:36:net.minecraft.util.thread.ProcessorHandle of(java.lang.String,java.util.function.Consumer) -> a
+    28:30:void lambda$askEither$0(java.util.concurrent.CompletableFuture,com.mojang.datafixers.util.Either) -> a
+net.minecraft.util.thread.ProcessorHandle$1 -> amp$1:
     java.lang.String val$name -> a
     java.util.function.Consumer val$tell -> b
-    24:24:void <init>(java.lang.String,java.util.function.Consumer) -> <init>
-    27:27:java.lang.String name() -> bi
-    32:33:void tell(java.lang.Object) -> a
-    37:37:java.lang.String toString() -> toString
-net.minecraft.util.thread.ProcessorMailbox -> aiv:
+    36:36:void <init>(java.lang.String,java.util.function.Consumer) -> <init>
+    39:39:java.lang.String name() -> bh
+    44:45:void tell(java.lang.Object) -> a
+    49:49:java.lang.String toString() -> toString
+net.minecraft.util.thread.ProcessorMailbox -> amq:
     org.apache.logging.log4j.Logger LOGGER -> b
     java.util.concurrent.atomic.AtomicInteger status -> c
     net.minecraft.util.thread.StrictQueue queue -> a
     java.util.concurrent.Executor dispatcher -> d
     java.lang.String name -> e
-    26:26:net.minecraft.util.thread.ProcessorMailbox create(java.util.concurrent.Executor,java.lang.String) -> a
-    20:33:void <init>(net.minecraft.util.thread.StrictQueue,java.util.concurrent.Executor,java.lang.String) -> <init>
-    38:43:boolean setAsScheduled() -> a
-    49:51:void setAsIdle() -> b
-    54:58:boolean canBeScheduled() -> c
-    65:67:void close() -> close
-    70:70:boolean shouldProcess() -> d
-    74:85:boolean pollTask() -> e
-    91:96:void run() -> run
-    100:102:void tell(java.lang.Object) -> a
-    105:119:void registerForExecution() -> f
-    122:126:int pollUntil(it.unimi.dsi.fastutil.ints.Int2BooleanFunction) -> a
-    131:131:java.lang.String toString() -> toString
-    136:136:java.lang.String name() -> bi
-    91:91:boolean lambda$run$0(int) -> a
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.util.thread.ReentrantBlockableEventLoop -> aiw:
+    27:27:net.minecraft.util.thread.ProcessorMailbox create(java.util.concurrent.Executor,java.lang.String) -> a
+    21:34:void <init>(net.minecraft.util.thread.StrictQueue,java.util.concurrent.Executor,java.lang.String) -> <init>
+    39:44:boolean setAsScheduled() -> a
+    50:52:void setAsIdle() -> b
+    55:59:boolean canBeScheduled() -> c
+    66:68:void close() -> close
+    71:71:boolean shouldProcess() -> d
+    75:99:boolean pollTask() -> e
+    105:110:void run() -> run
+    114:116:void tell(java.lang.Object) -> a
+    119:133:void registerForExecution() -> f
+    136:140:int pollUntil(it.unimi.dsi.fastutil.ints.Int2BooleanFunction) -> a
+    145:145:java.lang.String toString() -> toString
+    150:150:java.lang.String name() -> bh
+    105:105:boolean lambda$run$0(int) -> a
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.util.thread.ReentrantBlockableEventLoop -> amr:
     int reentrantCount -> b
     7:8:void <init>(java.lang.String) -> <init>
-    12:12:boolean scheduleExecutables() -> ay
-    16:16:boolean runningTask() -> bm
+    12:12:boolean scheduleExecutables() -> at
+    16:16:boolean runningTask() -> bl
     21:27:void doRunTask(java.lang.Runnable) -> c
-net.minecraft.util.thread.StrictQueue -> aix:
+net.minecraft.util.thread.StrictQueue -> ams:
     java.lang.Object pop() -> a
     boolean push(java.lang.Object) -> a
     boolean isEmpty() -> b
-net.minecraft.util.thread.StrictQueue$FixedPriorityQueue -> aix$a:
+net.minecraft.util.thread.StrictQueue$FixedPriorityQueue -> ams$a:
     java.util.List queueList -> a
     65:67:void <init>(int) -> <init>
     73:79:java.lang.Runnable pop() -> c
@@ -35502,27 +38548,27 @@ net.minecraft.util.thread.StrictQueue$FixedPriorityQueue -> aix$a:
     62:62:boolean push(java.lang.Object) -> a
     62:62:java.lang.Object pop() -> a
     66:66:java.util.concurrent.ConcurrentLinkedQueue lambda$new$0(int) -> a
-net.minecraft.util.thread.StrictQueue$IntRunnable -> aix$b:
+net.minecraft.util.thread.StrictQueue$IntRunnable -> ams$b:
     int priority -> a
     java.lang.Runnable task -> b
     47:50:void <init>(int,java.lang.Runnable) -> <init>
     54:55:void run() -> run
     58:58:int getPriority() -> a
-net.minecraft.util.thread.StrictQueue$QueueStrictQueue -> aix$c:
+net.minecraft.util.thread.StrictQueue$QueueStrictQueue -> ams$c:
     java.util.Queue queue -> a
     22:24:void <init>(java.util.Queue) -> <init>
     29:29:java.lang.Object pop() -> a
     34:34:boolean push(java.lang.Object) -> a
     39:39:boolean isEmpty() -> b
-net.minecraft.util.thread.package-info -> aiy:
-net.minecraft.util.worldupdate.WorldUpgrader -> aiz:
+net.minecraft.util.thread.package-info -> amt:
+net.minecraft.util.worldupdate.WorldUpgrader -> amu:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.concurrent.ThreadFactory THREAD_FACTORY -> b
-    java.lang.String levelName -> c
+    com.google.common.collect.ImmutableSet levels -> c
     boolean eraseCache -> d
-    net.minecraft.world.level.storage.LevelStorage levelStorage -> e
+    net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess levelStorage -> e
     java.lang.Thread thread -> f
-    java.io.File pathToWorld -> g
+    com.mojang.datafixers.DataFixer dataFixer -> g
     boolean running -> h
     boolean finished -> i
     float progress -> j
@@ -35533,24 +38579,24 @@ net.minecraft.util.worldupdate.WorldUpgrader -> aiz:
     net.minecraft.network.chat.Component status -> o
     java.util.regex.Pattern REGEX -> p
     net.minecraft.world.level.storage.DimensionDataStorage overworldDataStorage -> q
-    46:74:void <init>(java.lang.String,net.minecraft.world.level.storage.LevelStorageSource,net.minecraft.world.level.storage.LevelData,boolean) -> <init>
+    47:74:void <init>(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,com.mojang.datafixers.DataFixer,com.google.common.collect.ImmutableSet,boolean) -> <init>
     77:82:void cancel() -> a
-    85:190:void work() -> i
-    193:226:java.util.List getAllChunkPos(net.minecraft.world.level.dimension.DimensionType) -> b
-    230:230:boolean isFinished() -> b
-    234:234:float dimensionProgress(net.minecraft.world.level.dimension.DimensionType) -> a
-    238:238:float getProgress() -> c
-    242:242:int getTotalChunks() -> d
-    246:246:int getConverted() -> e
-    250:250:int getSkipped() -> f
-    254:254:net.minecraft.network.chat.Component getStatus() -> g
-    258:258:java.lang.String getLevelName() -> h
-    196:196:boolean lambda$getAllChunkPos$2(java.io.File,java.lang.String) -> a
-    125:125:net.minecraft.world.level.storage.DimensionDataStorage lambda$work$1() -> j
+    85:188:void work() -> i
+    191:224:java.util.List getAllChunkPos(net.minecraft.resources.ResourceKey) -> b
+    228:228:boolean isFinished() -> b
+    232:232:com.google.common.collect.ImmutableSet levels() -> c
+    236:236:float dimensionProgress(net.minecraft.resources.ResourceKey) -> a
+    240:240:float getProgress() -> d
+    244:244:int getTotalChunks() -> e
+    248:248:int getConverted() -> f
+    252:252:int getSkipped() -> g
+    256:256:net.minecraft.network.chat.Component getStatus() -> h
+    194:194:boolean lambda$getAllChunkPos$2(java.io.File,java.lang.String) -> a
+    123:123:net.minecraft.world.level.storage.DimensionDataStorage lambda$work$1() -> j
     69:72:void lambda$new$0(java.lang.Thread,java.lang.Throwable) -> a
-    37:56:void <clinit>() -> <clinit>
-net.minecraft.util.worldupdate.package-info -> aja:
-net.minecraft.world.BossEvent -> ajb:
+    38:57:void <clinit>() -> <clinit>
+net.minecraft.util.worldupdate.package-info -> amv:
+net.minecraft.world.BossEvent -> amw:
     java.util.UUID id -> h
     net.minecraft.network.chat.Component name -> a
     float percent -> b
@@ -35575,7 +38621,7 @@ net.minecraft.world.BossEvent -> ajb:
     76:77:net.minecraft.world.BossEvent setPlayBossMusic(boolean) -> b
     81:82:net.minecraft.world.BossEvent setCreateWorldFog(boolean) -> c
     86:86:boolean shouldCreateWorldFog() -> p
-net.minecraft.world.BossEvent$BossBarColor -> ajb$a:
+net.minecraft.world.BossEvent$BossBarColor -> amw$a:
     net.minecraft.world.BossEvent$BossBarColor PINK -> a
     net.minecraft.world.BossEvent$BossBarColor BLUE -> b
     net.minecraft.world.BossEvent$BossBarColor RED -> c
@@ -35593,7 +38639,7 @@ net.minecraft.world.BossEvent$BossBarColor -> ajb$a:
     112:112:java.lang.String getName() -> b
     116:121:net.minecraft.world.BossEvent$BossBarColor byName(java.lang.String) -> a
     89:96:void <clinit>() -> <clinit>
-net.minecraft.world.BossEvent$BossBarOverlay -> ajb$b:
+net.minecraft.world.BossEvent$BossBarOverlay -> amw$b:
     net.minecraft.world.BossEvent$BossBarOverlay PROGRESS -> a
     net.minecraft.world.BossEvent$BossBarOverlay NOTCHED_6 -> b
     net.minecraft.world.BossEvent$BossBarOverlay NOTCHED_10 -> c
@@ -35607,52 +38653,54 @@ net.minecraft.world.BossEvent$BossBarOverlay -> ajb$b:
     140:140:java.lang.String getName() -> a
     144:149:net.minecraft.world.BossEvent$BossBarOverlay byName(java.lang.String) -> a
     125:130:void <clinit>() -> <clinit>
-net.minecraft.world.Clearable -> ajc:
-    void clearContent() -> N_
+net.minecraft.world.Clearable -> amx:
+    void clearContent() -> aa_
     9:12:void tryClear(java.lang.Object) -> a
-net.minecraft.world.CompoundContainer -> ajd:
+net.minecraft.world.CompoundContainer -> amy:
     net.minecraft.world.Container container1 -> a
     net.minecraft.world.Container container2 -> b
     10:19:void <init>(net.minecraft.world.Container,net.minecraft.world.Container) -> <init>
-    23:23:int getContainerSize() -> O_
+    23:23:int getContainerSize() -> ab_
     28:28:boolean isEmpty() -> c
     32:32:boolean contains(net.minecraft.world.Container) -> a
     37:40:net.minecraft.world.item.ItemStack getItem(int) -> a
     46:49:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
     55:58:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
     64:69:void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    73:73:int getMaxStackSize() -> L_
-    78:80:void setChanged() -> e
+    73:73:int getMaxStackSize() -> X_
+    78:80:void setChanged() -> Z_
     84:84:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    89:91:void startOpen(net.minecraft.world.entity.player.Player) -> a_
+    89:91:void startOpen(net.minecraft.world.entity.player.Player) -> c_
     95:97:void stopOpen(net.minecraft.world.entity.player.Player) -> b_
     101:104:boolean canPlaceItem(int,net.minecraft.world.item.ItemStack) -> b
-    110:112:void clearContent() -> N_
-net.minecraft.world.Container -> aje:
-    int getContainerSize() -> O_
+    110:112:void clearContent() -> aa_
+net.minecraft.world.Container -> amz:
+    int getContainerSize() -> ab_
     boolean isEmpty() -> c
     net.minecraft.world.item.ItemStack getItem(int) -> a
     net.minecraft.world.item.ItemStack removeItem(int,int) -> a
     net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
     void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    25:25:int getMaxStackSize() -> L_
-    void setChanged() -> e
+    25:25:int getMaxStackSize() -> X_
+    void setChanged() -> Z_
     boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    33:33:void startOpen(net.minecraft.world.entity.player.Player) -> a_
+    33:33:void startOpen(net.minecraft.world.entity.player.Player) -> c_
     36:36:void stopOpen(net.minecraft.world.entity.player.Player) -> b_
     39:39:boolean canPlaceItem(int,net.minecraft.world.item.ItemStack) -> b
     43:50:int countItem(net.minecraft.world.item.Item) -> a
     54:60:boolean hasAnyOf(java.util.Set) -> a
-net.minecraft.world.ContainerHelper -> ajf:
-    11:11:void <init>() -> <init>
-    13:17:net.minecraft.world.item.ItemStack removeItem(java.util.List,int,int) -> a
-    21:25:net.minecraft.world.item.ItemStack takeItem(java.util.List,int) -> a
-    29:29:net.minecraft.nbt.CompoundTag saveAllItems(net.minecraft.nbt.CompoundTag,net.minecraft.core.NonNullList) -> a
-    33:46:net.minecraft.nbt.CompoundTag saveAllItems(net.minecraft.nbt.CompoundTag,net.minecraft.core.NonNullList,boolean) -> a
-    50:58:void loadAllItems(net.minecraft.nbt.CompoundTag,net.minecraft.core.NonNullList) -> b
-net.minecraft.world.ContainerListener -> ajg:
+net.minecraft.world.ContainerHelper -> ana:
+    12:12:void <init>() -> <init>
+    14:18:net.minecraft.world.item.ItemStack removeItem(java.util.List,int,int) -> a
+    22:26:net.minecraft.world.item.ItemStack takeItem(java.util.List,int) -> a
+    30:30:net.minecraft.nbt.CompoundTag saveAllItems(net.minecraft.nbt.CompoundTag,net.minecraft.core.NonNullList) -> a
+    34:47:net.minecraft.nbt.CompoundTag saveAllItems(net.minecraft.nbt.CompoundTag,net.minecraft.core.NonNullList,boolean) -> a
+    51:59:void loadAllItems(net.minecraft.nbt.CompoundTag,net.minecraft.core.NonNullList) -> b
+    62:71:int clearOrCountMatchingItems(net.minecraft.world.Container,java.util.function.Predicate,int,boolean) -> a
+    76:86:int clearOrCountMatchingItems(net.minecraft.world.item.ItemStack,java.util.function.Predicate,int,boolean) -> a
+net.minecraft.world.ContainerListener -> anb:
     void containerChanged(net.minecraft.world.Container) -> a
-net.minecraft.world.Containers -> ajh:
+net.minecraft.world.Containers -> anc:
     java.util.Random RANDOM -> a
     13:13:void <init>() -> <init>
     17:18:void dropContents(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.Container) -> a
@@ -35662,7 +38710,7 @@ net.minecraft.world.Containers -> ajh:
     35:54:void dropItemStack(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.item.ItemStack) -> a
     31:31:void lambda$dropContents$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.world.Difficulty -> aji:
+net.minecraft.world.Difficulty -> and:
     net.minecraft.world.Difficulty PEACEFUL -> a
     net.minecraft.world.Difficulty EASY -> b
     net.minecraft.world.Difficulty NORMAL -> c
@@ -35679,19 +38727,20 @@ net.minecraft.world.Difficulty -> aji:
     36:36:net.minecraft.world.Difficulty byId(int) -> a
     41:46:net.minecraft.world.Difficulty byName(java.lang.String) -> a
     53:53:java.lang.String getKey() -> c
+    57:57:net.minecraft.world.Difficulty nextById() -> d
     17:17:net.minecraft.world.Difficulty[] lambda$static$0(int) -> b
     10:17:void <clinit>() -> <clinit>
-net.minecraft.world.DifficultyInstance -> ajj:
+net.minecraft.world.DifficultyInstance -> ane:
     net.minecraft.world.Difficulty base -> a
     float effectiveDifficulty -> b
-    17:20:void <init>(net.minecraft.world.Difficulty,long,long,float) -> <init>
-    23:23:net.minecraft.world.Difficulty getDifficulty() -> a
-    27:27:float getEffectiveDifficulty() -> b
-    31:31:boolean isHard() -> c
-    35:35:boolean isHarderThan(float) -> a
-    48:54:float getSpecialMultiplier() -> d
-    58:83:float calculateDifficulty(net.minecraft.world.Difficulty,long,long,float) -> a
-net.minecraft.world.InteractionHand -> ajk:
+    21:24:void <init>(net.minecraft.world.Difficulty,long,long,float) -> <init>
+    27:27:net.minecraft.world.Difficulty getDifficulty() -> a
+    31:31:float getEffectiveDifficulty() -> b
+    35:35:boolean isHard() -> c
+    39:39:boolean isHarderThan(float) -> a
+    52:58:float getSpecialMultiplier() -> d
+    62:87:float calculateDifficulty(net.minecraft.world.Difficulty,long,long,float) -> a
+net.minecraft.world.InteractionHand -> anf:
     net.minecraft.world.InteractionHand MAIN_HAND -> a
     net.minecraft.world.InteractionHand OFF_HAND -> b
     net.minecraft.world.InteractionHand[] $VALUES -> c
@@ -35699,7 +38748,7 @@ net.minecraft.world.InteractionHand -> ajk:
     3:3:net.minecraft.world.InteractionHand valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:5:void <clinit>() -> <clinit>
-net.minecraft.world.InteractionResult -> ajl:
+net.minecraft.world.InteractionResult -> ang:
     net.minecraft.world.InteractionResult SUCCESS -> a
     net.minecraft.world.InteractionResult CONSUME -> b
     net.minecraft.world.InteractionResult PASS -> c
@@ -35710,8 +38759,9 @@ net.minecraft.world.InteractionResult -> ajl:
     3:3:void <init>(java.lang.String,int) -> <init>
     10:10:boolean consumesAction() -> a
     14:14:boolean shouldSwing() -> b
+    22:22:net.minecraft.world.InteractionResult sidedSuccess(boolean) -> a
     3:7:void <clinit>() -> <clinit>
-net.minecraft.world.InteractionResultHolder -> ajm:
+net.minecraft.world.InteractionResultHolder -> anh:
     net.minecraft.world.InteractionResult result -> a
     java.lang.Object object -> b
     7:10:void <init>(net.minecraft.world.InteractionResult,java.lang.Object) -> <init>
@@ -35721,7 +38771,8 @@ net.minecraft.world.InteractionResultHolder -> ajm:
     25:25:net.minecraft.world.InteractionResultHolder consume(java.lang.Object) -> b
     29:29:net.minecraft.world.InteractionResultHolder pass(java.lang.Object) -> c
     33:33:net.minecraft.world.InteractionResultHolder fail(java.lang.Object) -> d
-net.minecraft.world.LockCode -> ajn:
+    41:41:net.minecraft.world.InteractionResultHolder sidedSuccess(java.lang.Object,boolean) -> a
+net.minecraft.world.LockCode -> ani:
     net.minecraft.world.LockCode NO_LOCK -> a
     java.lang.String key -> b
     16:18:void <init>(java.lang.String) -> <init>
@@ -35729,45 +38780,54 @@ net.minecraft.world.LockCode -> ajn:
     25:28:void addToTag(net.minecraft.nbt.CompoundTag) -> a
     31:34:net.minecraft.world.LockCode fromTag(net.minecraft.nbt.CompoundTag) -> b
     11:11:void <clinit>() -> <clinit>
-net.minecraft.world.MenuProvider -> ajo:
+net.minecraft.world.MenuProvider -> anj:
     net.minecraft.network.chat.Component getDisplayName() -> d
-net.minecraft.world.Nameable -> ajp:
-    net.minecraft.network.chat.Component getName() -> M
-    11:11:boolean hasCustomName() -> N
+net.minecraft.world.Nameable -> ank:
+    net.minecraft.network.chat.Component getName() -> P
+    11:11:boolean hasCustomName() -> Q
     15:15:net.minecraft.network.chat.Component getDisplayName() -> d
-    20:20:net.minecraft.network.chat.Component getCustomName() -> O
-net.minecraft.world.SimpleContainer -> ajq:
+    20:20:net.minecraft.network.chat.Component getCustomName() -> R
+net.minecraft.world.ShulkerSharedHelper -> anl:
+    10:10:void <init>() -> <init>
+    12:20:net.minecraft.world.phys.AABB openBoundingBox(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+net.minecraft.world.SimpleContainer -> anm:
     int size -> a
     net.minecraft.core.NonNullList items -> b
     java.util.List listeners -> c
-    19:22:void <init>(int) -> <init>
-    24:27:void <init>(net.minecraft.world.item.ItemStack[]) -> <init>
-    30:34:void addListener(net.minecraft.world.ContainerListener) -> a
-    37:38:void removeListener(net.minecraft.world.ContainerListener) -> b
-    42:45:net.minecraft.world.item.ItemStack getItem(int) -> a
-    50:54:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
-    62:78:net.minecraft.world.item.ItemStack removeItemType(net.minecraft.world.item.Item,int) -> a
-    86:98:net.minecraft.world.item.ItemStack addItem(net.minecraft.world.item.ItemStack) -> a
-    103:108:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
-    113:118:void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    122:122:int getContainerSize() -> O_
-    127:132:boolean isEmpty() -> c
-    137:142:void setChanged() -> e
-    146:146:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    151:153:void clearContent() -> N_
-    157:160:void fillStackedContents(net.minecraft.world.entity.player.StackedContents) -> a
-    164:167:java.lang.String toString() -> toString
-    171:179:void moveItemToEmptySlots(net.minecraft.world.item.ItemStack) -> b
-    182:191:void moveItemToOccupiedSlotsWithSameType(net.minecraft.world.item.ItemStack) -> c
-    197:204:void moveItemsBetweenStacks(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    165:165:boolean lambda$toString$0(net.minecraft.world.item.ItemStack) -> d
-net.minecraft.world.SimpleMenuProvider -> ajr:
+    21:24:void <init>(int) -> <init>
+    26:29:void <init>(net.minecraft.world.item.ItemStack[]) -> <init>
+    32:36:void addListener(net.minecraft.world.ContainerListener) -> a
+    39:40:void removeListener(net.minecraft.world.ContainerListener) -> b
+    44:47:net.minecraft.world.item.ItemStack getItem(int) -> a
+    51:53:java.util.List removeAllItems() -> f
+    58:62:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
+    70:86:net.minecraft.world.item.ItemStack removeItemType(net.minecraft.world.item.Item,int) -> a
+    94:106:net.minecraft.world.item.ItemStack addItem(net.minecraft.world.item.ItemStack) -> a
+    110:117:boolean canAddItem(net.minecraft.world.item.ItemStack) -> b
+    122:127:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
+    132:137:void setItem(int,net.minecraft.world.item.ItemStack) -> a
+    141:141:int getContainerSize() -> ab_
+    146:151:boolean isEmpty() -> c
+    156:161:void setChanged() -> Z_
+    165:165:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    170:172:void clearContent() -> aa_
+    176:179:void fillStackedContents(net.minecraft.world.entity.player.StackedContents) -> a
+    183:186:java.lang.String toString() -> toString
+    190:198:void moveItemToEmptySlots(net.minecraft.world.item.ItemStack) -> c
+    201:210:void moveItemToOccupiedSlotsWithSameType(net.minecraft.world.item.ItemStack) -> d
+    213:213:boolean isSameItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    220:227:void moveItemsBetweenStacks(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> b
+    230:236:void fromTag(net.minecraft.nbt.ListTag) -> a
+    239:246:net.minecraft.nbt.ListTag createTag() -> g
+    184:184:boolean lambda$toString$1(net.minecraft.world.item.ItemStack) -> e
+    51:51:boolean lambda$removeAllItems$0(net.minecraft.world.item.ItemStack) -> f
+net.minecraft.world.SimpleMenuProvider -> ann:
     net.minecraft.network.chat.Component title -> a
     net.minecraft.world.inventory.MenuConstructor menuConstructor -> b
     13:16:void <init>(net.minecraft.world.inventory.MenuConstructor,net.minecraft.network.chat.Component) -> <init>
     20:20:net.minecraft.network.chat.Component getDisplayName() -> d
     25:25:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
-net.minecraft.world.Snooper -> ajs:
+net.minecraft.world.Snooper -> ano:
     java.util.Map fixedData -> a
     java.util.Map dynamicData -> b
     java.lang.String token -> c
@@ -35799,21 +38859,25 @@ net.minecraft.world.Snooper -> ajs:
     16:16:int access$308(net.minecraft.world.Snooper) -> f
     16:16:java.lang.String access$500(net.minecraft.world.Snooper) -> g
     16:16:java.net.URL access$600(net.minecraft.world.Snooper) -> h
-net.minecraft.world.Snooper$1 -> ajs$1:
+net.minecraft.world.Snooper$1 -> ano$1:
     net.minecraft.world.Snooper this$0 -> a
     52:52:void <init>(net.minecraft.world.Snooper) -> <init>
     55:71:void run() -> run
-net.minecraft.world.SnooperPopulator -> ajt:
+net.minecraft.world.SnooperPopulator -> anp:
     void populateSnooper(net.minecraft.world.Snooper) -> a
     void populateSnooperInitial(net.minecraft.world.Snooper) -> b
-    boolean isSnooperEnabled() -> W
-net.minecraft.world.WorldlyContainer -> aju:
+    boolean isSnooperEnabled() -> S
+net.minecraft.world.WorldlyContainer -> anq:
     int[] getSlotsForFace(net.minecraft.core.Direction) -> a
     boolean canPlaceItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> a
     boolean canTakeItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> b
-net.minecraft.world.WorldlyContainerHolder -> ajv:
+net.minecraft.world.WorldlyContainerHolder -> anr:
     net.minecraft.world.WorldlyContainer getContainer(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.damagesource.CombatEntry -> ajw:
+net.minecraft.world.damagesource.BadRespawnPointDamage -> ans:
+    13:16:void <init>() -> <init>
+    20:24:net.minecraft.network.chat.Component getLocalizedDeathMessage(net.minecraft.world.entity.LivingEntity) -> a
+    20:22:net.minecraft.network.chat.Style lambda$getLocalizedDeathMessage$0(net.minecraft.network.chat.Style) -> a
+net.minecraft.world.damagesource.CombatEntry -> ant:
     net.minecraft.world.damagesource.DamageSource source -> a
     int time -> b
     float damage -> c
@@ -35831,11 +38895,11 @@ net.minecraft.world.damagesource.CombatEntry -> ajw:
     57:57:net.minecraft.network.chat.Component getAttackerName() -> h
     62:62:net.minecraft.world.entity.Entity getAttacker() -> i
     66:69:float getFallDistance() -> j
-net.minecraft.world.damagesource.CombatRules -> ajx:
+net.minecraft.world.damagesource.CombatRules -> anu:
     5:5:void <init>() -> <init>
     13:15:float getDamageAfterAbsorb(float,float,float) -> a
     19:20:float getDamageAfterMagicAbsorb(float,float) -> a
-net.minecraft.world.damagesource.CombatTracker -> ajy:
+net.minecraft.world.damagesource.CombatTracker -> anv:
     java.util.List entries -> a
     net.minecraft.world.entity.LivingEntity mob -> b
     int lastDamageTime -> c
@@ -35844,21 +38908,21 @@ net.minecraft.world.damagesource.CombatTracker -> ajy:
     boolean inCombat -> f
     boolean takingDamage -> g
     java.lang.String nextLocation -> h
-    22:33:void <init>(net.minecraft.world.entity.LivingEntity) -> <init>
-    36:49:void prepareForDamage() -> a
-    52:67:void recordDamage(net.minecraft.world.damagesource.DamageSource,float,float) -> a
-    70:108:net.minecraft.network.chat.Component getDeathMessage() -> b
-    113:133:net.minecraft.world.entity.LivingEntity getKiller() -> c
-    139:168:net.minecraft.world.damagesource.CombatEntry getMostSignificantFall() -> j
-    173:173:java.lang.String getFallLocation(net.minecraft.world.damagesource.CombatEntry) -> a
-    177:178:boolean isTakingDamage() -> d
-    182:183:boolean isInCombat() -> e
-    187:190:int getCombatDuration() -> f
-    195:196:void resetPreparedStatus() -> k
-    199:212:void recheckStatus() -> g
-    215:215:net.minecraft.world.entity.LivingEntity getMob() -> h
-    220:223:net.minecraft.world.damagesource.CombatEntry getLastEntry() -> i
-net.minecraft.world.damagesource.DamageSource -> ajz:
+    24:35:void <init>(net.minecraft.world.entity.LivingEntity) -> <init>
+    38:60:void prepareForDamage() -> a
+    63:78:void recordDamage(net.minecraft.world.damagesource.DamageSource,float,float) -> a
+    81:119:net.minecraft.network.chat.Component getDeathMessage() -> b
+    124:144:net.minecraft.world.entity.LivingEntity getKiller() -> c
+    150:179:net.minecraft.world.damagesource.CombatEntry getMostSignificantFall() -> j
+    184:184:java.lang.String getFallLocation(net.minecraft.world.damagesource.CombatEntry) -> a
+    188:189:boolean isTakingDamage() -> d
+    193:194:boolean isInCombat() -> e
+    198:201:int getCombatDuration() -> f
+    206:207:void resetPreparedStatus() -> k
+    210:223:void recheckStatus() -> g
+    226:226:net.minecraft.world.entity.LivingEntity getMob() -> h
+    231:234:net.minecraft.world.damagesource.CombatEntry getLastEntry() -> i
+net.minecraft.world.damagesource.DamageSource -> anw:
     net.minecraft.world.damagesource.DamageSource IN_FIRE -> a
     net.minecraft.world.damagesource.DamageSource LIGHTNING_BOLT -> b
     net.minecraft.world.damagesource.DamageSource ON_FIRE -> c
@@ -35878,94 +38942,93 @@ net.minecraft.world.damagesource.DamageSource -> ajz:
     net.minecraft.world.damagesource.DamageSource ANVIL -> q
     net.minecraft.world.damagesource.DamageSource FALLING_BLOCK -> r
     net.minecraft.world.damagesource.DamageSource DRAGON_BREATH -> s
-    net.minecraft.world.damagesource.DamageSource FIREWORKS -> t
-    net.minecraft.world.damagesource.DamageSource DRY_OUT -> u
-    net.minecraft.world.damagesource.DamageSource SWEET_BERRY_BUSH -> v
-    boolean bypassArmor -> x
-    boolean bypassInvul -> y
-    boolean bypassMagic -> z
-    float exhaustion -> A
-    boolean isFireSource -> B
-    boolean isProjectile -> C
-    boolean scalesWithDifficulty -> D
-    boolean isMagic -> E
-    boolean isExplosion -> F
-    java.lang.String msgId -> w
-    41:41:net.minecraft.world.damagesource.DamageSource sting(net.minecraft.world.entity.LivingEntity) -> a
-    45:45:net.minecraft.world.damagesource.DamageSource mobAttack(net.minecraft.world.entity.LivingEntity) -> b
-    49:49:net.minecraft.world.damagesource.DamageSource indirectMobAttack(net.minecraft.world.entity.Entity,net.minecraft.world.entity.LivingEntity) -> a
-    53:53:net.minecraft.world.damagesource.DamageSource playerAttack(net.minecraft.world.entity.player.Player) -> a
-    57:57:net.minecraft.world.damagesource.DamageSource arrow(net.minecraft.world.entity.projectile.AbstractArrow,net.minecraft.world.entity.Entity) -> a
-    61:61:net.minecraft.world.damagesource.DamageSource trident(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
-    65:68:net.minecraft.world.damagesource.DamageSource fireball(net.minecraft.world.entity.projectile.AbstractHurtingProjectile,net.minecraft.world.entity.Entity) -> a
-    72:72:net.minecraft.world.damagesource.DamageSource thrown(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> b
-    76:76:net.minecraft.world.damagesource.DamageSource indirectMagic(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> c
-    80:80:net.minecraft.world.damagesource.DamageSource thorns(net.minecraft.world.entity.Entity) -> a
-    84:87:net.minecraft.world.damagesource.DamageSource explosion(net.minecraft.world.level.Explosion) -> a
-    92:95:net.minecraft.world.damagesource.DamageSource explosion(net.minecraft.world.entity.LivingEntity) -> c
-    100:100:net.minecraft.world.damagesource.DamageSource netherBedExplosion() -> a
-    115:115:boolean isProjectile() -> b
-    119:120:net.minecraft.world.damagesource.DamageSource setProjectile() -> c
-    124:124:boolean isExplosion() -> d
-    128:129:net.minecraft.world.damagesource.DamageSource setExplosion() -> e
-    133:133:boolean isBypassArmor() -> f
-    137:137:float getFoodExhaustion() -> g
-    141:141:boolean isBypassInvul() -> h
-    145:145:boolean isBypassMagic() -> i
-    107:152:void <init>(java.lang.String) -> <init>
-    160:160:net.minecraft.world.entity.Entity getDirectEntity() -> j
-    169:169:net.minecraft.world.entity.Entity getEntity() -> k
-    173:176:net.minecraft.world.damagesource.DamageSource bypassArmor() -> l
-    180:181:net.minecraft.world.damagesource.DamageSource bypassInvul() -> m
-    185:188:net.minecraft.world.damagesource.DamageSource bypassMagic() -> n
-    192:193:net.minecraft.world.damagesource.DamageSource setIsFire() -> o
-    197:204:net.minecraft.network.chat.Component getLocalizedDeathMessage(net.minecraft.world.entity.LivingEntity) -> d
-    209:209:boolean isFire() -> p
-    213:213:java.lang.String getMsgId() -> q
-    217:218:net.minecraft.world.damagesource.DamageSource setScalesWithDifficulty() -> r
-    222:222:boolean scalesWithDifficulty() -> s
-    226:226:boolean isMagic() -> t
-    230:231:net.minecraft.world.damagesource.DamageSource setMagic() -> u
-    235:236:boolean isCreativePlayer() -> v
-    241:241:net.minecraft.world.phys.Vec3 getSourcePosition() -> w
-    17:38:void <clinit>() -> <clinit>
-net.minecraft.world.damagesource.EntityDamageSource -> aka:
-    net.minecraft.world.entity.Entity entity -> x
-    boolean isThorns -> y
+    net.minecraft.world.damagesource.DamageSource DRY_OUT -> t
+    net.minecraft.world.damagesource.DamageSource SWEET_BERRY_BUSH -> u
+    boolean bypassArmor -> w
+    boolean bypassInvul -> x
+    boolean bypassMagic -> y
+    float exhaustion -> z
+    boolean isFireSource -> A
+    boolean isProjectile -> B
+    boolean scalesWithDifficulty -> C
+    boolean isMagic -> D
+    boolean isExplosion -> E
+    java.lang.String msgId -> v
+    42:42:net.minecraft.world.damagesource.DamageSource sting(net.minecraft.world.entity.LivingEntity) -> b
+    46:46:net.minecraft.world.damagesource.DamageSource mobAttack(net.minecraft.world.entity.LivingEntity) -> c
+    50:50:net.minecraft.world.damagesource.DamageSource indirectMobAttack(net.minecraft.world.entity.Entity,net.minecraft.world.entity.LivingEntity) -> a
+    54:54:net.minecraft.world.damagesource.DamageSource playerAttack(net.minecraft.world.entity.player.Player) -> a
+    58:58:net.minecraft.world.damagesource.DamageSource arrow(net.minecraft.world.entity.projectile.AbstractArrow,net.minecraft.world.entity.Entity) -> a
+    62:62:net.minecraft.world.damagesource.DamageSource trident(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
+    66:66:net.minecraft.world.damagesource.DamageSource fireworks(net.minecraft.world.entity.projectile.FireworkRocketEntity,net.minecraft.world.entity.Entity) -> a
+    70:73:net.minecraft.world.damagesource.DamageSource fireball(net.minecraft.world.entity.projectile.Fireball,net.minecraft.world.entity.Entity) -> a
+    77:77:net.minecraft.world.damagesource.DamageSource witherSkull(net.minecraft.world.entity.projectile.WitherSkull,net.minecraft.world.entity.Entity) -> a
+    81:81:net.minecraft.world.damagesource.DamageSource thrown(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> b
+    85:85:net.minecraft.world.damagesource.DamageSource indirectMagic(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> c
+    89:89:net.minecraft.world.damagesource.DamageSource thorns(net.minecraft.world.entity.Entity) -> a
+    93:93:net.minecraft.world.damagesource.DamageSource explosion(net.minecraft.world.level.Explosion) -> a
+    97:100:net.minecraft.world.damagesource.DamageSource explosion(net.minecraft.world.entity.LivingEntity) -> d
+    105:105:net.minecraft.world.damagesource.DamageSource badRespawnPointExplosion() -> a
+    121:121:java.lang.String toString() -> toString
+    125:125:boolean isProjectile() -> b
+    129:130:net.minecraft.world.damagesource.DamageSource setProjectile() -> c
+    134:134:boolean isExplosion() -> d
+    138:139:net.minecraft.world.damagesource.DamageSource setExplosion() -> e
+    143:143:boolean isBypassArmor() -> f
+    147:147:float getFoodExhaustion() -> g
+    151:151:boolean isBypassInvul() -> h
+    155:155:boolean isBypassMagic() -> i
+    112:162:void <init>(java.lang.String) -> <init>
+    170:170:net.minecraft.world.entity.Entity getDirectEntity() -> j
+    179:179:net.minecraft.world.entity.Entity getEntity() -> k
+    183:186:net.minecraft.world.damagesource.DamageSource bypassArmor() -> l
+    190:191:net.minecraft.world.damagesource.DamageSource bypassInvul() -> m
+    195:198:net.minecraft.world.damagesource.DamageSource bypassMagic() -> n
+    202:203:net.minecraft.world.damagesource.DamageSource setIsFire() -> o
+    207:214:net.minecraft.network.chat.Component getLocalizedDeathMessage(net.minecraft.world.entity.LivingEntity) -> a
+    219:219:boolean isFire() -> p
+    223:223:java.lang.String getMsgId() -> q
+    227:228:net.minecraft.world.damagesource.DamageSource setScalesWithDifficulty() -> r
+    232:232:boolean scalesWithDifficulty() -> s
+    236:236:boolean isMagic() -> t
+    240:241:net.minecraft.world.damagesource.DamageSource setMagic() -> u
+    245:246:boolean isCreativePlayer() -> v
+    251:251:net.minecraft.world.phys.Vec3 getSourcePosition() -> w
+    19:39:void <clinit>() -> <clinit>
+net.minecraft.world.damagesource.EntityDamageSource -> anx:
+    net.minecraft.world.entity.Entity entity -> w
+    boolean isThorns -> x
     19:21:void <init>(java.lang.String,net.minecraft.world.entity.Entity) -> <init>
     24:25:net.minecraft.world.damagesource.EntityDamageSource setThorns() -> x
     29:29:boolean isThorns() -> y
     35:35:net.minecraft.world.entity.Entity getEntity() -> k
-    40:46:net.minecraft.network.chat.Component getLocalizedDeathMessage(net.minecraft.world.entity.LivingEntity) -> d
+    40:46:net.minecraft.network.chat.Component getLocalizedDeathMessage(net.minecraft.world.entity.LivingEntity) -> a
     52:52:boolean scalesWithDifficulty() -> s
     58:58:net.minecraft.world.phys.Vec3 getSourcePosition() -> w
-net.minecraft.world.damagesource.IndirectEntityDamageSource -> akb:
-    net.minecraft.world.entity.Entity owner -> y
+    63:63:java.lang.String toString() -> toString
+net.minecraft.world.damagesource.IndirectEntityDamageSource -> any:
+    net.minecraft.world.entity.Entity owner -> x
     15:17:void <init>(java.lang.String,net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> <init>
     22:22:net.minecraft.world.entity.Entity getDirectEntity() -> j
     28:28:net.minecraft.world.entity.Entity getEntity() -> k
-    33:41:net.minecraft.network.chat.Component getLocalizedDeathMessage(net.minecraft.world.entity.LivingEntity) -> d
-net.minecraft.world.damagesource.NetherBedDamage -> akc:
-    13:16:void <init>() -> <init>
-    20:24:net.minecraft.network.chat.Component getLocalizedDeathMessage(net.minecraft.world.entity.LivingEntity) -> d
-    20:22:void lambda$getLocalizedDeathMessage$0(net.minecraft.network.chat.Style) -> a
-net.minecraft.world.damagesource.package-info -> akd:
-net.minecraft.world.effect.AbsoptionMobEffect -> ake:
+    33:41:net.minecraft.network.chat.Component getLocalizedDeathMessage(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.damagesource.package-info -> anz:
+net.minecraft.world.effect.AbsoptionMobEffect -> aoa:
     8:9:void <init>(net.minecraft.world.effect.MobEffectCategory,int) -> <init>
-    13:15:void removeAttributeModifiers(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.attributes.BaseAttributeMap,int) -> a
-    19:21:void addAttributeModifiers(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.attributes.BaseAttributeMap,int) -> b
-net.minecraft.world.effect.AttackDamageMobEffect -> akf:
+    13:15:void removeAttributeModifiers(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.attributes.AttributeMap,int) -> a
+    19:21:void addAttributeModifiers(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.attributes.AttributeMap,int) -> b
+net.minecraft.world.effect.AttackDamageMobEffect -> aob:
     double multiplier -> a
     9:11:void <init>(net.minecraft.world.effect.MobEffectCategory,int,double) -> <init>
     15:15:double getAttributeModifierValue(int,net.minecraft.world.entity.ai.attributes.AttributeModifier) -> a
-net.minecraft.world.effect.HealthBoostMobEffect -> akg:
+net.minecraft.world.effect.HealthBoostMobEffect -> aoc:
     8:9:void <init>(net.minecraft.world.effect.MobEffectCategory,int) -> <init>
-    13:17:void removeAttributeModifiers(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.attributes.BaseAttributeMap,int) -> a
-net.minecraft.world.effect.InstantenousMobEffect -> akh:
+    13:17:void removeAttributeModifiers(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.attributes.AttributeMap,int) -> a
+net.minecraft.world.effect.InstantenousMobEffect -> aod:
     5:6:void <init>(net.minecraft.world.effect.MobEffectCategory,int) -> <init>
     10:10:boolean isInstantenous() -> a
     15:15:boolean isDurationEffectTick(int,int) -> a
-net.minecraft.world.effect.MobEffect -> aki:
+net.minecraft.world.effect.MobEffect -> aoe:
     java.util.Map attributeModifiers -> a
     net.minecraft.world.effect.MobEffectCategory category -> b
     int color -> c
@@ -35984,11 +39047,11 @@ net.minecraft.world.effect.MobEffect -> aki:
     158:158:int getColor() -> f
     162:164:net.minecraft.world.effect.MobEffect addAttributeModifier(net.minecraft.world.entity.ai.attributes.Attribute,java.lang.String,double,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> a
     168:168:java.util.Map getAttributeModifiers() -> g
-    172:179:void removeAttributeModifiers(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.attributes.BaseAttributeMap,int) -> a
-    182:191:void addAttributeModifiers(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.attributes.BaseAttributeMap,int) -> b
+    172:179:void removeAttributeModifiers(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.attributes.AttributeMap,int) -> a
+    182:191:void addAttributeModifiers(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.attributes.AttributeMap,int) -> b
     194:194:double getAttributeModifierValue(int,net.minecraft.world.entity.ai.attributes.AttributeModifier) -> a
     198:198:boolean isBeneficial() -> h
-net.minecraft.world.effect.MobEffectCategory -> akj:
+net.minecraft.world.effect.MobEffectCategory -> aof:
     net.minecraft.world.effect.MobEffectCategory BENEFICIAL -> a
     net.minecraft.world.effect.MobEffectCategory HARMFUL -> b
     net.minecraft.world.effect.MobEffectCategory NEUTRAL -> c
@@ -35999,7 +39062,7 @@ net.minecraft.world.effect.MobEffectCategory -> akj:
     12:14:void <init>(java.lang.String,int,net.minecraft.ChatFormatting) -> <init>
     17:17:net.minecraft.ChatFormatting getTooltipFormatting() -> a
     5:8:void <clinit>() -> <clinit>
-net.minecraft.world.effect.MobEffectInstance -> akk:
+net.minecraft.world.effect.MobEffectInstance -> aog:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.effect.MobEffect effect -> b
     int duration -> c
@@ -36042,13 +39105,13 @@ net.minecraft.world.effect.MobEffectInstance -> akk:
     279:291:int compareTo(net.minecraft.world.effect.MobEffectInstance) -> c
     13:13:int compareTo(java.lang.Object) -> compareTo
     14:14:void <clinit>() -> <clinit>
-net.minecraft.world.effect.MobEffectUtil -> akl:
+net.minecraft.world.effect.MobEffectUtil -> aoh:
     7:7:void <init>() -> <init>
     9:13:java.lang.String formatDuration(net.minecraft.world.effect.MobEffectInstance,float) -> a
     17:17:boolean hasDigSpeed(net.minecraft.world.entity.LivingEntity) -> a
     21:29:int getDigSpeedAmplification(net.minecraft.world.entity.LivingEntity) -> b
     33:33:boolean hasWaterBreathing(net.minecraft.world.entity.LivingEntity) -> c
-net.minecraft.world.effect.MobEffects -> akm:
+net.minecraft.world.effect.MobEffects -> aoi:
     net.minecraft.world.effect.MobEffect MOVEMENT_SPEED -> a
     net.minecraft.world.effect.MobEffect MOVEMENT_SLOWDOWN -> b
     net.minecraft.world.effect.MobEffect DIG_SPEED -> c
@@ -36081,83 +39144,83 @@ net.minecraft.world.effect.MobEffects -> akm:
     net.minecraft.world.effect.MobEffect DOLPHINS_GRACE -> D
     net.minecraft.world.effect.MobEffect BAD_OMEN -> E
     net.minecraft.world.effect.MobEffect HERO_OF_THE_VILLAGE -> F
-    12:12:void <init>() -> <init>
-    67:67:net.minecraft.world.effect.MobEffect register(int,java.lang.String,net.minecraft.world.effect.MobEffect) -> a
-    13:63:void <clinit>() -> <clinit>
-net.minecraft.world.effect.MobEffects$1 -> akm$1:
-    43:43:void <init>(net.minecraft.world.effect.MobEffectCategory,int) -> <init>
-    46:46:boolean isDurationEffectTick(int,int) -> a
-    51:61:void applyEffectTick(net.minecraft.world.entity.LivingEntity,int) -> a
-net.minecraft.world.effect.package-info -> akn:
-net.minecraft.world.entity.AgableMob -> ako:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_BABY_ID -> bw
+    11:11:void <init>() -> <init>
+    66:66:net.minecraft.world.effect.MobEffect register(int,java.lang.String,net.minecraft.world.effect.MobEffect) -> a
+    12:62:void <clinit>() -> <clinit>
+net.minecraft.world.effect.MobEffects$1 -> aoi$1:
+    42:42:void <init>(net.minecraft.world.effect.MobEffectCategory,int) -> <init>
+    45:45:boolean isDurationEffectTick(int,int) -> a
+    50:60:void applyEffectTick(net.minecraft.world.entity.LivingEntity,int) -> a
+net.minecraft.world.effect.package-info -> aoj:
+net.minecraft.world.entity.AgableMob -> aok:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_BABY_ID -> bv
     int age -> b
     int forcedAge -> c
     int forcedAgeTimer -> d
-    32:33:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    37:49:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    27:28:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    32:44:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
     net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    56:56:void onOffspringSpawnedFromEgg(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.AgableMob) -> a
-    60:84:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    89:91:void defineSynchedData() -> w_
-    94:97:int getAge() -> i
-    102:119:void ageUp(int,boolean) -> a
-    122:123:void ageUp(int) -> a
-    126:133:void setAge(int) -> b_
-    137:140:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    144:147:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    151:155:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    159:178:void aiStep() -> k
-    181:181:void ageBoundaryReached() -> l
-    185:185:boolean isBaby() -> x_
-    21:21:void <clinit>() -> <clinit>
-net.minecraft.world.entity.AgableMob$AgableMobGroupData -> ako$a:
+    52:54:void defineSynchedData() -> e
+    57:57:boolean canBreed() -> f
+    61:64:int getAge() -> i
+    69:86:void ageUp(int,boolean) -> a
+    89:90:void ageUp(int) -> a
+    93:100:void setAge(int) -> c_
+    104:107:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    111:114:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    118:122:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    126:145:void aiStep() -> k
+    148:148:void ageBoundaryReached() -> m
+    152:152:boolean isBaby() -> x_
+    157:158:void setBaby(boolean) -> a
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.world.entity.AgableMob$AgableMobGroupData -> aok$a:
     int groupSize -> a
     boolean shouldSpawnBaby -> b
     float babySpawnChance -> c
-    188:191:void <init>() -> <init>
-    194:194:int getGroupSize() -> a
-    198:199:void increaseGroupSizeByOne() -> b
-    202:202:boolean isShouldSpawnBaby() -> c
-    206:207:void setShouldSpawnBaby(boolean) -> a
-    210:210:float getBabySpawnChance() -> d
-    214:215:void setBabySpawnChance(float) -> a
-net.minecraft.world.entity.AreaEffectCloud -> akp:
+    160:163:void <init>() -> <init>
+    166:166:int getGroupSize() -> a
+    170:171:void increaseGroupSizeByOne() -> b
+    174:174:boolean isShouldSpawnBaby() -> c
+    178:179:void setShouldSpawnBaby(boolean) -> a
+    182:182:float getBabySpawnChance() -> d
+    186:187:void setBabySpawnChance(float) -> a
+net.minecraft.world.entity.AreaEffectCloud -> aol:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_RADIUS -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_COLOR -> d
     net.minecraft.network.syncher.EntityDataAccessor DATA_WAITING -> e
     net.minecraft.network.syncher.EntityDataAccessor DATA_PARTICLE -> f
     net.minecraft.world.item.alchemy.Potion potion -> g
-    java.util.List effects -> ao
-    java.util.Map victims -> ap
-    int duration -> aq
-    int waitTime -> ar
-    int reapplicationDelay -> as
-    boolean fixedColor -> at
-    int durationOnUse -> au
-    float radiusOnUse -> av
-    float radiusPerTick -> aw
-    net.minecraft.world.entity.LivingEntity owner -> ax
-    java.util.UUID ownerUUID -> ay
+    java.util.List effects -> an
+    java.util.Map victims -> ao
+    int duration -> ap
+    int waitTime -> aq
+    int reapplicationDelay -> ar
+    boolean fixedColor -> as
+    int durationOnUse -> at
+    float radiusOnUse -> au
+    float radiusPerTick -> av
+    net.minecraft.world.entity.LivingEntity owner -> aw
+    java.util.UUID ownerUUID -> ax
     47:64:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     67:69:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    73:77:void defineSynchedData() -> w_
+    73:77:void defineSynchedData() -> e
     80:83:void setRadius(float) -> a
-    87:92:void refreshDimensions() -> z_
-    95:95:float getRadius() -> f
+    87:92:void refreshDimensions() -> y_
+    95:95:float getRadius() -> g
     99:103:void setPotion(net.minecraft.world.item.alchemy.Potion) -> a
-    106:111:void updateColor() -> z
+    106:111:void updateColor() -> x
     114:118:void addEffect(net.minecraft.world.effect.MobEffectInstance) -> a
-    121:121:int getColor() -> i
+    121:121:int getColor() -> h
     125:127:void setFixedColor(int) -> a
-    130:130:net.minecraft.core.particles.ParticleOptions getParticle() -> k
+    130:130:net.minecraft.core.particles.ParticleOptions getParticle() -> i
     134:135:void setParticle(net.minecraft.core.particles.ParticleOptions) -> a
     138:139:void setWaiting(boolean) -> a
-    142:142:boolean isWaiting() -> l
+    142:142:boolean isWaiting() -> k
     146:146:int getDuration() -> m
     150:151:void setDuration(int) -> b
-    155:279:void tick() -> h
+    155:279:void tick() -> j
     282:282:float getRadiusOnUse() -> n
     286:287:void setRadiusOnUse(float) -> b
     290:290:float getRadiusPerTick() -> o
@@ -36169,17 +39232,17 @@ net.minecraft.world.entity.AreaEffectCloud -> akp:
     315:315:boolean canUse() -> s
     319:320:void setWaitTime(int) -> d
     323:325:void setOwner(net.minecraft.world.entity.LivingEntity) -> a
-    329:336:net.minecraft.world.entity.LivingEntity getOwner() -> u
-    341:376:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    380:409:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    413:417:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    420:420:net.minecraft.world.item.alchemy.Potion getPotion() -> v
-    424:424:java.util.List getEffects() -> w
-    429:429:net.minecraft.world.level.material.PushReaction getPistonPushReaction() -> A_
-    434:434:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    439:439:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
+    329:336:net.minecraft.world.entity.LivingEntity getOwner() -> t
+    341:378:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    382:411:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    415:419:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    422:422:net.minecraft.world.item.alchemy.Potion getPotion() -> u
+    426:426:java.util.List getEffects() -> v
+    431:431:net.minecraft.world.level.material.PushReaction getPistonPushReaction() -> z_
+    436:436:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    441:441:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
     38:45:void <clinit>() -> <clinit>
-net.minecraft.world.entity.Entity -> akq:
+net.minecraft.world.entity.Entity -> aom:
     org.apache.logging.log4j.Logger LOGGER -> h
     java.util.concurrent.atomic.AtomicInteger ENTITY_COUNTER -> b
     java.util.List EMPTY_LIST -> c
@@ -36188,63 +39251,63 @@ net.minecraft.world.entity.Entity -> akq:
     net.minecraft.world.entity.EntityType type -> f
     int id -> g
     boolean blocksBuilding -> i
-    java.util.List passengers -> ao
+    java.util.List passengers -> an
     int boardingCooldown -> j
-    net.minecraft.world.entity.Entity vehicle -> ap
+    net.minecraft.world.entity.Entity vehicle -> ao
     boolean forcedLoading -> k
     net.minecraft.world.level.Level level -> l
     double xo -> m
     double yo -> n
     double zo -> o
-    double x -> aq
-    double y -> ar
-    double z -> as
-    net.minecraft.world.phys.Vec3 deltaMovement -> at
+    net.minecraft.world.phys.Vec3 position -> ap
+    net.minecraft.core.BlockPos blockPosition -> aq
+    net.minecraft.world.phys.Vec3 deltaMovement -> ar
     float yRot -> p
     float xRot -> q
     float yRotO -> r
     float xRotO -> s
-    net.minecraft.world.phys.AABB bb -> au
+    net.minecraft.world.phys.AABB bb -> as
     boolean onGround -> t
     boolean horizontalCollision -> u
     boolean verticalCollision -> v
-    boolean collision -> w
-    boolean hurtMarked -> x
-    net.minecraft.world.phys.Vec3 stuckSpeedMultiplier -> y
-    boolean removed -> z
-    float walkDistO -> A
-    float walkDist -> B
-    float moveDist -> C
-    float fallDistance -> D
-    float nextStep -> av
-    float nextFlap -> aw
-    double xOld -> E
-    double yOld -> F
-    double zOld -> G
-    float maxUpStep -> H
-    boolean noPhysics -> I
-    float pushthrough -> J
-    java.util.Random random -> K
-    int tickCount -> L
-    int remainingFireTicks -> ax
-    boolean wasInWater -> M
-    double waterHeight -> N
-    boolean wasUnderWater -> O
-    boolean isInLava -> P
+    boolean hurtMarked -> w
+    net.minecraft.world.phys.Vec3 stuckSpeedMultiplier -> x
+    boolean removed -> y
+    float walkDistO -> z
+    float walkDist -> A
+    float moveDist -> B
+    float fallDistance -> C
+    float nextStep -> at
+    float nextFlap -> au
+    double xOld -> D
+    double yOld -> E
+    double zOld -> F
+    float maxUpStep -> G
+    boolean noPhysics -> H
+    float pushthrough -> I
+    java.util.Random random -> J
+    int tickCount -> K
+    int remainingFireTicks -> av
+    boolean wasTouchingWater -> L
+    it.unimi.dsi.fastutil.objects.Object2DoubleMap fluidHeight -> M
+    boolean wasEyeInWater -> N
+    net.minecraft.tags.Tag fluidOnEyes -> O
+    boolean isTouchingLava -> P
     int invulnerableTime -> Q
     boolean firstTick -> R
     net.minecraft.network.syncher.SynchedEntityData entityData -> S
     net.minecraft.network.syncher.EntityDataAccessor DATA_SHARED_FLAGS_ID -> T
-    net.minecraft.network.syncher.EntityDataAccessor DATA_AIR_SUPPLY_ID -> ay
-    net.minecraft.network.syncher.EntityDataAccessor DATA_CUSTOM_NAME -> az
-    net.minecraft.network.syncher.EntityDataAccessor DATA_CUSTOM_NAME_VISIBLE -> aA
-    net.minecraft.network.syncher.EntityDataAccessor DATA_SILENT -> aB
-    net.minecraft.network.syncher.EntityDataAccessor DATA_NO_GRAVITY -> aC
+    net.minecraft.network.syncher.EntityDataAccessor DATA_AIR_SUPPLY_ID -> aw
+    net.minecraft.network.syncher.EntityDataAccessor DATA_CUSTOM_NAME -> ax
+    net.minecraft.network.syncher.EntityDataAccessor DATA_CUSTOM_NAME_VISIBLE -> ay
+    net.minecraft.network.syncher.EntityDataAccessor DATA_SILENT -> az
+    net.minecraft.network.syncher.EntityDataAccessor DATA_NO_GRAVITY -> aA
     net.minecraft.network.syncher.EntityDataAccessor DATA_POSE -> U
     boolean inChunk -> V
     int xChunk -> W
     int yChunk -> X
     int zChunk -> Y
+    boolean movedSinceLastChunkCheck -> aB
     long xp -> Z
     long yp -> aa
     long zp -> ab
@@ -36253,358 +39316,368 @@ net.minecraft.world.entity.Entity -> akq:
     int changingDimensionDelay -> ae
     boolean isInsidePortal -> af
     int portalTime -> ag
-    net.minecraft.world.level.dimension.DimensionType dimension -> ah
-    net.minecraft.core.BlockPos portalEntranceBlock -> ai
-    net.minecraft.world.phys.Vec3 portalEntranceOffset -> aj
-    net.minecraft.core.Direction portalEntranceForwards -> ak
-    boolean invulnerable -> aD
-    java.util.UUID uuid -> al
-    java.lang.String stringUUID -> am
-    boolean glowing -> an
-    java.util.Set tags -> aE
-    boolean teleported -> aF
-    double[] pistonDeltas -> aG
-    long pistonDeltasGameTime -> aH
-    net.minecraft.world.entity.EntityDimensions dimensions -> aI
-    float eyeHeight -> aJ
-    124:256:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    259:263:int getTeamColor() -> P
-    267:267:boolean isSpectator() -> t
-    271:277:void unRide() -> Q
-    280:283:void setPacketCoordinates(double,double,double) -> c
-    286:286:net.minecraft.world.entity.EntityType getType() -> R
-    290:290:int getId() -> S
-    294:295:void setId(int) -> e
-    298:298:java.util.Set getTags() -> T
-    302:305:boolean addTag(java.lang.String) -> a
-    309:309:boolean removeTag(java.lang.String) -> b
-    313:314:void kill() -> U
-    void defineSynchedData() -> w_
-    319:319:net.minecraft.network.syncher.SynchedEntityData getEntityData() -> V
-    324:327:boolean equals(java.lang.Object) -> equals
-    332:332:int hashCode() -> hashCode
-    336:350:void resetPos() -> W
-    354:355:void remove() -> X
-    358:358:void setDropContainerContent(boolean) -> b
-    361:362:void setPose(net.minecraft.world.entity.Pose) -> b
-    365:365:net.minecraft.world.entity.Pose getPose() -> Y
-    369:371:void setRot(float,float) -> a
-    375:379:void setPos(double,double,double) -> d
-    383:384:void reapplyPosition() -> Z
-    387:401:void turn(double,double) -> a
-    404:408:void tick() -> h
-    411:466:void baseTick() -> aa
-    469:472:void processDimensionDelay() -> E
-    475:475:int getPortalWaitTime() -> ab
-    479:485:void lavaHurt() -> ac
-    488:495:void setSecondsOnFire(int) -> f
-    498:499:void setRemainingFireTicks(int) -> g
-    502:502:int getRemainingFireTicks() -> ad
-    506:507:void clearFire() -> ae
-    510:511:void outOfWorld() -> af
-    514:514:boolean isFree(double,double,double) -> e
-    518:518:boolean isFree(net.minecraft.world.phys.AABB) -> b
-    522:656:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
-    669:688:net.minecraft.core.BlockPos getOnPos() -> ag
-    697:699:float getBlockJumpFactor() -> ah
-    708:713:float getBlockSpeedFactor() -> ai
-    724:724:net.minecraft.core.BlockPos getBlockPosBelowThatAffectsMyMovement() -> aj
-    731:731:net.minecraft.world.phys.Vec3 maybeBackOffFromEdge(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.MoverType) -> a
-    736:759:net.minecraft.world.phys.Vec3 limitPistonMovement(net.minecraft.world.phys.Vec3) -> a
-    763:767:double applyPistonMovementRestriction(net.minecraft.core.Direction$Axis,double) -> a
-    771:808:net.minecraft.world.phys.Vec3 collide(net.minecraft.world.phys.Vec3) -> e
-    812:812:double getHorizontalDistanceSqr(net.minecraft.world.phys.Vec3) -> b
-    816:828:net.minecraft.world.phys.Vec3 collideBoundingBoxHeuristically(net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,net.minecraft.world.level.Level,net.minecraft.world.phys.shapes.CollisionContext,net.minecraft.util.RewindableStream) -> a
-    833:865:net.minecraft.world.phys.Vec3 collideBoundingBoxLegacy(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,net.minecraft.util.RewindableStream) -> a
-    869:901:net.minecraft.world.phys.Vec3 collideBoundingBox(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,net.minecraft.world.level.LevelReader,net.minecraft.world.phys.shapes.CollisionContext,net.minecraft.util.RewindableStream) -> a
-    905:905:float nextStep() -> ak
-    909:911:void setLocationFromBoundingbox() -> al
-    914:914:net.minecraft.sounds.SoundEvent getSwimSound() -> am
-    918:918:net.minecraft.sounds.SoundEvent getSwimSplashSound() -> an
-    922:922:net.minecraft.sounds.SoundEvent getSwimHighSpeedSplashSound() -> ao
-    926:955:void checkInsideBlocks() -> ap
-    958:958:void onInsideBlock(net.minecraft.world.level.block.state.BlockState) -> a
-    961:968:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    971:972:void playSwimSound(float) -> d
-    975:975:float playFlySound(float) -> e
-    979:979:boolean makeFlySound() -> aq
-    983:986:void playSound(net.minecraft.sounds.SoundEvent,float,float) -> a
-    989:989:boolean isSilent() -> ar
-    993:994:void setSilent(boolean) -> c
-    997:997:boolean isNoGravity() -> as
-    1001:1002:void setNoGravity(boolean) -> d
-    1005:1005:boolean isMovementNoisy() -> at
-    1010:1019:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    1023:1023:net.minecraft.world.phys.AABB getCollideBox() -> au
-    1027:1030:void burn(int) -> h
-    1033:1033:boolean fireImmune() -> av
-    1040:1045:boolean causeFallDamage(float,float) -> b
-    1049:1049:boolean isInWater() -> aw
-    1053:1055:boolean isInRain() -> k
-    1059:1059:boolean isInBubbleColumn() -> l
-    1063:1063:boolean isInWaterOrRain() -> ax
-    1067:1067:boolean isInWaterRainOrBubble() -> ay
-    1071:1071:boolean isInWaterOrBubble() -> az
-    1075:1075:boolean isUnderWater() -> aA
-    1079:1082:void updateWaterState() -> m
-    1085:1090:void updateSwimming() -> aB
-    1093:1105:boolean updateInWaterState() -> aC
-    1109:1110:void updateUnderWaterState() -> n
-    1113:1141:void doWaterSplashEffect() -> aD
-    1144:1147:void updateSprintingState() -> aE
-    1150:1160:void doSprintParticleEffect() -> aF
-    1163:1163:boolean isUnderLiquid(net.minecraft.tags.Tag) -> a
-    1167:1179:boolean isUnderLiquid(net.minecraft.tags.Tag,boolean) -> a
-    1183:1184:void setInLava() -> aG
-    1187:1187:boolean isInLava() -> aH
-    1191:1194:void moveRelative(float,net.minecraft.world.phys.Vec3) -> a
-    1197:1206:net.minecraft.world.phys.Vec3 getInputVector(net.minecraft.world.phys.Vec3,float,float) -> a
-    1211:1216:float getBrightness() -> aI
-    1220:1221:void setLevel(net.minecraft.world.level.Level) -> a
-    1224:1238:void absMoveTo(double,double,double,float,float) -> a
-    1241:1242:void moveTo(net.minecraft.core.BlockPos,float,float) -> a
-    1245:1250:void moveTo(double,double,double,float,float) -> b
-    1253:1260:void setPosAndOldPos(double,double,double) -> f
-    1263:1266:float distanceTo(net.minecraft.world.entity.Entity) -> g
-    1270:1273:double distanceToSqr(double,double,double) -> g
-    1277:1277:double distanceToSqr(net.minecraft.world.entity.Entity) -> h
-    1281:1284:double distanceToSqr(net.minecraft.world.phys.Vec3) -> c
-    1288:1288:void playerTouch(net.minecraft.world.entity.player.Player) -> b
-    1291:1328:void push(net.minecraft.world.entity.Entity) -> i
-    1331:1333:void push(double,double,double) -> h
-    1336:1337:void markHurt() -> aJ
-    1340:1344:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    1348:1348:net.minecraft.world.phys.Vec3 getViewVector(float) -> f
-    1352:1355:float getViewXRot(float) -> g
-    1359:1362:float getViewYRot(float) -> h
-    1368:1376:net.minecraft.world.phys.Vec3 calculateViewVector(float,float) -> c
-    1380:1380:net.minecraft.world.phys.Vec3 getUpVector(float) -> i
-    1384:1384:net.minecraft.world.phys.Vec3 calculateUpVector(float,float) -> d
-    1388:1395:net.minecraft.world.phys.Vec3 getEyePosition(float) -> j
-    1399:1402:net.minecraft.world.phys.HitResult pick(double,float,boolean) -> a
-    1406:1406:boolean isPickable() -> aK
-    1410:1410:boolean isPushable() -> aL
-    1414:1417:void awardKillScore(net.minecraft.world.entity.Entity,int,net.minecraft.world.damagesource.DamageSource) -> a
-    1420:1424:boolean shouldRender(double,double,double) -> i
-    1428:1433:boolean shouldRenderAtSqrDistance(double) -> a
-    1437:1443:boolean saveAsPassenger(net.minecraft.nbt.CompoundTag) -> c
-    1447:1450:boolean save(net.minecraft.nbt.CompoundTag) -> d
-    1455:1515:net.minecraft.nbt.CompoundTag saveWithoutId(net.minecraft.nbt.CompoundTag) -> e
-    1520:1598:void load(net.minecraft.nbt.CompoundTag) -> f
-    1601:1601:boolean repositionEntityAfterLoad() -> aM
-    1606:1608:java.lang.String getEncodeId() -> aN
+    net.minecraft.core.BlockPos portalEntranceBlock -> ah
+    net.minecraft.world.phys.Vec3 portalEntranceOffset -> ai
+    net.minecraft.core.Direction portalEntranceForwards -> aj
+    boolean invulnerable -> aC
+    java.util.UUID uuid -> ak
+    java.lang.String stringUUID -> al
+    boolean glowing -> am
+    java.util.Set tags -> aD
+    boolean forceChunkAddition -> aE
+    double[] pistonDeltas -> aF
+    long pistonDeltasGameTime -> aG
+    net.minecraft.world.entity.EntityDimensions dimensions -> aH
+    float eyeHeight -> aI
+    133:264:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    267:271:int getTeamColor() -> S
+    275:275:boolean isSpectator() -> a_
+    279:285:void unRide() -> T
+    288:291:void setPacketCoordinates(double,double,double) -> c
+    294:294:net.minecraft.world.entity.EntityType getType() -> U
+    298:298:int getId() -> V
+    302:303:void setId(int) -> e
+    306:306:java.util.Set getTags() -> W
+    310:313:boolean addTag(java.lang.String) -> a
+    317:317:boolean removeTag(java.lang.String) -> b
+    321:322:void kill() -> X
+    void defineSynchedData() -> e
+    327:327:net.minecraft.network.syncher.SynchedEntityData getEntityData() -> Y
+    332:335:boolean equals(java.lang.Object) -> equals
+    340:340:int hashCode() -> hashCode
+    344:358:void resetPos() -> Z
+    362:363:void remove() -> aa
+    366:366:void setDropContainerContent(boolean) -> a_
+    369:370:void setPose(net.minecraft.world.entity.Pose) -> b
+    373:373:net.minecraft.world.entity.Pose getPose() -> ab
+    377:380:boolean closerThan(net.minecraft.world.entity.Entity,double) -> a
+    384:386:void setRot(float,float) -> a
+    390:394:void setPos(double,double,double) -> d
+    398:399:void reapplyPosition() -> ac
+    402:416:void turn(double,double) -> a
+    419:423:void tick() -> j
+    426:485:void baseTick() -> ad
+    488:491:void processDimensionDelay() -> E
+    494:494:int getPortalWaitTime() -> ae
+    498:504:void lavaHurt() -> af
+    507:514:void setSecondsOnFire(int) -> f
+    517:518:void setRemainingFireTicks(int) -> g
+    521:521:int getRemainingFireTicks() -> ag
+    525:526:void clearFire() -> ah
+    529:530:void outOfWorld() -> ai
+    533:533:boolean isFree(double,double,double) -> e
+    537:537:boolean isFree(net.minecraft.world.phys.AABB) -> b
+    541:542:void setOnGround(boolean) -> c
+    545:545:boolean isOnGround() -> aj
+    549:674:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
+    687:706:net.minecraft.core.BlockPos getOnPos() -> ak
+    715:717:float getBlockJumpFactor() -> al
+    726:731:float getBlockSpeedFactor() -> am
+    742:742:net.minecraft.core.BlockPos getBlockPosBelowThatAffectsMyMovement() -> an
+    749:749:net.minecraft.world.phys.Vec3 maybeBackOffFromEdge(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.MoverType) -> a
+    754:777:net.minecraft.world.phys.Vec3 limitPistonMovement(net.minecraft.world.phys.Vec3) -> a
+    781:785:double applyPistonMovementRestriction(net.minecraft.core.Direction$Axis,double) -> a
+    789:826:net.minecraft.world.phys.Vec3 collide(net.minecraft.world.phys.Vec3) -> f
+    830:830:double getHorizontalDistanceSqr(net.minecraft.world.phys.Vec3) -> b
+    834:846:net.minecraft.world.phys.Vec3 collideBoundingBoxHeuristically(net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,net.minecraft.world.level.Level,net.minecraft.world.phys.shapes.CollisionContext,net.minecraft.util.RewindableStream) -> a
+    851:883:net.minecraft.world.phys.Vec3 collideBoundingBoxLegacy(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,net.minecraft.util.RewindableStream) -> a
+    887:919:net.minecraft.world.phys.Vec3 collideBoundingBox(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,net.minecraft.world.level.LevelReader,net.minecraft.world.phys.shapes.CollisionContext,net.minecraft.util.RewindableStream) -> a
+    923:923:float nextStep() -> ao
+    927:929:void setLocationFromBoundingbox() -> ap
+    932:932:net.minecraft.sounds.SoundEvent getSwimSound() -> aq
+    936:936:net.minecraft.sounds.SoundEvent getSwimSplashSound() -> ar
+    940:940:net.minecraft.sounds.SoundEvent getSwimHighSpeedSplashSound() -> as
+    944:971:void checkInsideBlocks() -> at
+    974:974:void onInsideBlock(net.minecraft.world.level.block.state.BlockState) -> a
+    977:984:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    987:988:void playSwimSound(float) -> d
+    991:991:float playFlySound(float) -> e
+    995:995:boolean makeFlySound() -> au
+    1003:1006:void playSound(net.minecraft.sounds.SoundEvent,float,float) -> a
+    1009:1009:boolean isSilent() -> av
+    1013:1014:void setSilent(boolean) -> d
+    1017:1017:boolean isNoGravity() -> aw
+    1021:1022:void setNoGravity(boolean) -> e
+    1025:1025:boolean isMovementNoisy() -> ax
+    1030:1039:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    1043:1043:net.minecraft.world.phys.AABB getCollideBox() -> ay
+    1047:1050:void burn(int) -> h
+    1053:1053:boolean fireImmune() -> az
+    1060:1065:boolean causeFallDamage(float,float) -> b
+    1069:1069:boolean isInWater() -> aA
+    1073:1074:boolean isInRain() -> i
+    1078:1078:boolean isInBubbleColumn() -> k
+    1082:1082:boolean isInWaterOrRain() -> aB
+    1086:1086:boolean isInWaterRainOrBubble() -> aC
+    1090:1090:boolean isInWaterOrBubble() -> aD
+    1094:1094:boolean isUnderWater() -> aE
+    1098:1103:void updateSwimming() -> aF
+    1109:1115:boolean updateInWaterStateAndDoFluidPushing() -> aG
+    1119:1131:void updateInWaterStateAndDoWaterCurrentPushing() -> aH
+    1134:1157:void updateFluidOnEyes() -> n
+    1160:1188:void doWaterSplashEffect() -> aI
+    1191:1191:net.minecraft.world.level.block.state.BlockState getBlockStateOn() -> aJ
+    1195:1195:boolean canSpawnSprintParticle() -> aK
+    1199:1209:void spawnSprintParticle() -> aL
+    1212:1212:boolean isEyeInFluid(net.minecraft.tags.Tag) -> a
+    1216:1217:void setInLava() -> aM
+    1221:1221:boolean isInLava() -> aN
+    1225:1228:void moveRelative(float,net.minecraft.world.phys.Vec3) -> a
+    1231:1240:net.minecraft.world.phys.Vec3 getInputVector(net.minecraft.world.phys.Vec3,float,float) -> a
+    1245:1250:float getBrightness() -> aO
+    1254:1255:void setLevel(net.minecraft.world.level.Level) -> a_
+    1258:1272:void absMoveTo(double,double,double,float,float) -> a
+    1275:1276:void moveTo(net.minecraft.world.phys.Vec3) -> c
+    1279:1280:void moveTo(double,double,double) -> b
+    1283:1284:void moveTo(net.minecraft.core.BlockPos,float,float) -> a
+    1287:1292:void moveTo(double,double,double,float,float) -> b
+    1295:1302:void setPosAndOldPos(double,double,double) -> f
+    1305:1308:float distanceTo(net.minecraft.world.entity.Entity) -> g
+    1312:1315:double distanceToSqr(double,double,double) -> g
+    1319:1319:double distanceToSqr(net.minecraft.world.entity.Entity) -> h
+    1323:1326:double distanceToSqr(net.minecraft.world.phys.Vec3) -> d
+    1330:1330:void playerTouch(net.minecraft.world.entity.player.Player) -> a_
+    1333:1370:void push(net.minecraft.world.entity.Entity) -> i
+    1373:1375:void push(double,double,double) -> h
+    1378:1379:void markHurt() -> aP
+    1382:1386:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    1390:1390:net.minecraft.world.phys.Vec3 getViewVector(float) -> f
+    1394:1397:float getViewXRot(float) -> g
+    1401:1404:float getViewYRot(float) -> h
+    1410:1418:net.minecraft.world.phys.Vec3 calculateViewVector(float,float) -> c
+    1422:1422:net.minecraft.world.phys.Vec3 getUpVector(float) -> i
+    1426:1426:net.minecraft.world.phys.Vec3 calculateUpVector(float,float) -> d
+    1430:1437:net.minecraft.world.phys.Vec3 getEyePosition(float) -> j
+    1441:1444:net.minecraft.world.phys.HitResult pick(double,float,boolean) -> a
+    1448:1448:boolean isPickable() -> aQ
+    1452:1452:boolean isPushable() -> aR
+    1456:1459:void awardKillScore(net.minecraft.world.entity.Entity,int,net.minecraft.world.damagesource.DamageSource) -> a
+    1462:1466:boolean shouldRender(double,double,double) -> i
+    1470:1475:boolean shouldRenderAtSqrDistance(double) -> a
+    1479:1485:boolean saveAsPassenger(net.minecraft.nbt.CompoundTag) -> a_
+    1489:1492:boolean save(net.minecraft.nbt.CompoundTag) -> d
+    1497:1562:net.minecraft.nbt.CompoundTag saveWithoutId(net.minecraft.nbt.CompoundTag) -> e
+    1567:1647:void load(net.minecraft.nbt.CompoundTag) -> f
+    1650:1650:boolean repositionEntityAfterLoad() -> aS
+    1655:1657:java.lang.String getEncodeId() -> aT
     void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    1616:1620:net.minecraft.nbt.ListTag newDoubleList(double[]) -> a
-    1624:1628:net.minecraft.nbt.ListTag newFloatList(float[]) -> a
-    1633:1633:net.minecraft.world.entity.item.ItemEntity spawnAtLocation(net.minecraft.world.level.ItemLike) -> a
-    1638:1638:net.minecraft.world.entity.item.ItemEntity spawnAtLocation(net.minecraft.world.level.ItemLike,int) -> a
-    1643:1643:net.minecraft.world.entity.item.ItemEntity spawnAtLocation(net.minecraft.world.item.ItemStack) -> a
-    1648:1658:net.minecraft.world.entity.item.ItemEntity spawnAtLocation(net.minecraft.world.item.ItemStack,float) -> a
-    1662:1662:boolean isAlive() -> aO
-    1666:1686:boolean isInWall() -> aP
-    1690:1690:boolean interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
-    1695:1695:net.minecraft.world.phys.AABB getCollideAgainstBox(net.minecraft.world.entity.Entity) -> j
-    1699:1706:void rideTick() -> aQ
-    1709:1710:void positionRider(net.minecraft.world.entity.Entity) -> k
-    1713:1717:void positionRider(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity$MoveCallback) -> a
-    1720:1720:void onPassengerTurned(net.minecraft.world.entity.Entity) -> l
-    1723:1723:double getRidingHeight() -> aR
-    1727:1727:double getRideHeight() -> aS
-    1731:1731:boolean startRiding(net.minecraft.world.entity.Entity) -> m
-    1735:1735:boolean showVehicleHealth() -> aT
-    1739:1759:boolean startRiding(net.minecraft.world.entity.Entity,boolean) -> a
-    1763:1763:boolean canRide(net.minecraft.world.entity.Entity) -> n
-    1767:1767:boolean canEnterPose(net.minecraft.world.entity.Pose) -> c
-    1771:1774:void ejectPassengers() -> aU
-    1777:1782:void stopRiding() -> j
-    1785:1794:void addPassenger(net.minecraft.world.entity.Entity) -> o
-    1797:1803:void removePassenger(net.minecraft.world.entity.Entity) -> p
-    1806:1806:boolean canAddPassenger(net.minecraft.world.entity.Entity) -> q
-    1810:1812:void lerpTo(double,double,double,float,float,int,boolean) -> a
-    1815:1816:void lerpHeadTo(float,int) -> a
-    1819:1819:float getPickRadius() -> aV
-    1823:1823:net.minecraft.world.phys.Vec3 getLookAngle() -> aW
-    1827:1827:net.minecraft.world.phys.Vec2 getRotationVector() -> aX
-    1831:1831:net.minecraft.world.phys.Vec3 getForward() -> aY
-    1835:1852:void handleInsidePortal(net.minecraft.core.BlockPos) -> c
-    1855:1881:void handleNetherPortal() -> aZ
-    1884:1884:int getDimensionChangingDelay() -> ba
-    1888:1889:void lerpMotion(double,double,double) -> j
-    1892:1897:void handleEntityEvent(byte) -> a
-    1900:1900:void animateHurt() -> bb
-    1903:1903:java.lang.Iterable getHandSlots() -> bc
-    1907:1907:java.lang.Iterable getArmorSlots() -> bd
-    1911:1911:java.lang.Iterable getAllSlots() -> be
-    1915:1915:void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
-    1919:1921:boolean isOnFire() -> bf
-    1925:1925:boolean isPassenger() -> bg
-    1929:1929:boolean isVehicle() -> bh
-    1933:1933:boolean rideableUnderWater() -> bi
-    1937:1938:void setShiftKeyDown(boolean) -> e
-    1942:1942:boolean isShiftKeyDown() -> bj
-    1949:1949:boolean isSteppingCarefully() -> bk
-    1953:1953:boolean isSuppressingBounce() -> bl
-    1960:1960:boolean isDiscrete() -> bm
-    1967:1967:boolean isDescending() -> bn
-    1974:1974:boolean isCrouching() -> bo
-    1978:1978:boolean isSprinting() -> bp
-    1982:1983:void setSprinting(boolean) -> f
-    1986:1986:boolean isSwimming() -> bq
-    1996:1996:boolean isVisuallySwimming() -> br
-    2000:2000:boolean isVisuallyCrawling() -> bs
-    2004:2005:void setSwimming(boolean) -> g
-    2008:2008:boolean isGlowing() -> bt
-    2012:2016:void setGlowing(boolean) -> h
-    2019:2019:boolean isInvisible() -> bu
-    2023:2030:boolean isInvisibleTo(net.minecraft.world.entity.player.Player) -> c
-    2035:2035:net.minecraft.world.scores.Team getTeam() -> bv
-    2039:2039:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
-    2043:2046:boolean isAlliedTo(net.minecraft.world.scores.Team) -> a
-    2050:2051:void setInvisible(boolean) -> i
-    2054:2054:boolean getSharedFlag(int) -> i
-    2058:2064:void setSharedFlag(int,boolean) -> b
-    2067:2067:int getMaxAirSupply() -> bw
-    2071:2071:int getAirSupply() -> bx
-    2075:2076:void setAirSupply(int) -> j
-    2079:2084:void thunderHit(net.minecraft.world.entity.global.LightningBolt) -> a
-    2087:2095:void onAboveBubbleCol(boolean) -> j
-    2098:2107:void onInsideBubbleColumn(boolean) -> k
-    2110:2110:void killed(net.minecraft.world.entity.LivingEntity) -> b
-    2113:2159:void checkInBlock(double,double,double) -> k
-    2162:2164:void makeStuckInBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.Vec3) -> a
-    2167:2168:void removeAction(net.minecraft.network.chat.Component) -> c
-    2172:2178:net.minecraft.network.chat.Component getName() -> M
-    2182:2182:net.minecraft.network.chat.Component getTypeName() -> by
-    2187:2187:boolean is(net.minecraft.world.entity.Entity) -> s
-    2191:2191:float getYHeadRot() -> bz
-    2195:2195:void setYHeadRot(float) -> k
-    2198:2198:void setYBodyRot(float) -> l
-    2201:2201:boolean isAttackable() -> bA
-    2205:2205:boolean skipAttackInteraction(net.minecraft.world.entity.Entity) -> t
-    2210:2210:java.lang.String toString() -> toString
-    2214:2214:boolean isInvulnerableTo(net.minecraft.world.damagesource.DamageSource) -> b
-    2218:2218:boolean isInvulnerable() -> bB
-    2222:2223:void setInvulnerable(boolean) -> l
-    2226:2227:void copyPosition(net.minecraft.world.entity.Entity) -> u
-    2230:2237:void restoreFrom(net.minecraft.world.entity.Entity) -> v
-    2241:2318:net.minecraft.world.entity.Entity changeDimension(net.minecraft.world.level.dimension.DimensionType) -> a
-    2322:2322:boolean canChangeDimensions() -> bC
-    2326:2326:float getBlockExplosionResistance(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState,float) -> a
-    2330:2330:boolean shouldBlockExplode(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,float) -> a
-    2334:2334:int getMaxFallDistance() -> bD
-    2338:2338:net.minecraft.core.BlockPos getPortalEntranceBlock() -> bE
-    2342:2342:net.minecraft.world.phys.Vec3 getPortalEntranceOffset() -> bF
-    2346:2346:net.minecraft.core.Direction getPortalEntranceForwards() -> bG
-    2350:2350:boolean isIgnoringBlockTriggers() -> bH
-    2354:2363:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
-    2366:2366:boolean displayFireAnimation() -> bI
-    2370:2372:void setUUID(java.util.UUID) -> a
-    2375:2375:java.util.UUID getUUID() -> bJ
-    2379:2379:java.lang.String getStringUUID() -> bK
-    2383:2383:java.lang.String getScoreboardName() -> bL
-    2387:2387:boolean isPushedByWater() -> bM
-    2391:2391:double getViewScale() -> bN
-    2395:2396:void setViewScale(double) -> b
-    2400:2400:net.minecraft.network.chat.Component getDisplayName() -> d
-    2404:2405:void setCustomName(net.minecraft.network.chat.Component) -> b
-    2410:2410:net.minecraft.network.chat.Component getCustomName() -> O
-    2415:2415:boolean hasCustomName() -> N
-    2419:2420:void setCustomNameVisible(boolean) -> m
-    2423:2423:boolean isCustomNameVisible() -> bO
-    2427:2436:void teleportToWithTicket(double,double,double) -> l
-    2439:2449:void teleportTo(double,double,double) -> a
-    2452:2452:boolean shouldShowName() -> bP
-    2456:2459:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    2462:2482:void refreshDimensions() -> z_
-    2485:2485:net.minecraft.core.Direction getDirection() -> bQ
-    2489:2489:net.minecraft.core.Direction getMotionDirection() -> bR
-    2493:2502:net.minecraft.network.chat.HoverEvent createHoverEvent() -> bS
-    2506:2506:boolean broadcastToPlayer(net.minecraft.server.level.ServerPlayer) -> a
-    2510:2510:net.minecraft.world.phys.AABB getBoundingBox() -> bT
-    2514:2514:net.minecraft.world.phys.AABB getBoundingBoxForCulling() -> bU
-    2521:2526:net.minecraft.world.phys.AABB getBoundingBoxForPose(net.minecraft.world.entity.Pose) -> d
-    2530:2531:void setBoundingBox(net.minecraft.world.phys.AABB) -> a
-    2534:2534:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
-    2538:2538:float getEyeHeight(net.minecraft.world.entity.Pose) -> e
-    2542:2542:float getEyeHeight() -> bV
-    2546:2546:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
-    2551:2551:void sendMessage(net.minecraft.network.chat.Component) -> a
-    2554:2554:net.minecraft.core.BlockPos getCommandSenderBlockPosition() -> bW
-    2558:2558:net.minecraft.world.phys.Vec3 getCommandSenderWorldPosition() -> bX
-    2562:2562:net.minecraft.world.level.Level getCommandSenderWorld() -> bY
-    2567:2567:net.minecraft.server.MinecraftServer getServer() -> bZ
-    2571:2571:net.minecraft.world.InteractionResult interactAt(net.minecraft.world.entity.player.Player,net.minecraft.world.phys.Vec3,net.minecraft.world.InteractionHand) -> a
-    2575:2575:boolean ignoreExplosion() -> ca
-    2579:2583:void doEnchantDamageEffects(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity) -> a
-    2586:2586:void startSeenByPlayer(net.minecraft.server.level.ServerPlayer) -> b
-    2589:2589:void stopSeenByPlayer(net.minecraft.server.level.ServerPlayer) -> c
-    2592:2601:float rotate(net.minecraft.world.level.block.Rotation) -> a
-    2606:2613:float mirror(net.minecraft.world.level.block.Mirror) -> a
-    2618:2618:boolean onlyOpCanSetNbt() -> cb
-    2622:2624:boolean checkAndResetTeleportedFlag() -> cc
-    2629:2629:net.minecraft.world.entity.Entity getControllingPassenger() -> cd
-    2633:2636:java.util.List getPassengers() -> ce
-    2641:2646:boolean hasPassenger(net.minecraft.world.entity.Entity) -> w
-    2650:2655:boolean hasPassenger(java.lang.Class) -> a
-    2659:2664:java.util.Collection getIndirectPassengers() -> cf
-    2668:2668:java.util.stream.Stream getSelfAndPassengers() -> cg
-    2672:2674:boolean hasOnePlayerPassenger() -> ch
-    2678:2685:void fillIndirectPassengers(boolean,java.util.Set) -> a
-    2688:2692:net.minecraft.world.entity.Entity getRootVehicle() -> ci
-    2696:2696:boolean isPassengerOfSameVehicle(net.minecraft.world.entity.Entity) -> x
-    2700:2708:boolean hasIndirectPassenger(net.minecraft.world.entity.Entity) -> y
-    2712:2715:void repositionDirectPassengers(net.minecraft.world.entity.Entity$MoveCallback) -> a
-    2719:2723:boolean isControlledByLocalInstance() -> cj
-    2729:2729:net.minecraft.world.entity.Entity getVehicle() -> ck
-    2733:2733:net.minecraft.world.level.material.PushReaction getPistonPushReaction() -> A_
-    2737:2737:net.minecraft.sounds.SoundSource getSoundSource() -> cl
-    2741:2741:int getFireImmuneTicks() -> cm
-    2746:2746:net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> cn
-    2750:2750:int getPermissionLevel() -> y
-    2754:2754:boolean hasPermissions(int) -> k
-    2759:2759:boolean acceptsSuccess() -> a
-    2764:2764:boolean acceptsFailure() -> b
-    2769:2769:boolean shouldInformAdmins() -> I_
-    2773:2784:void lookAt(net.minecraft.commands.arguments.EntityAnchorArgument$Anchor,net.minecraft.world.phys.Vec3) -> a
-    2787:2844:boolean checkAndHandleWater(net.minecraft.tags.Tag) -> b
-    2848:2848:double getWaterHeight() -> co
-    2852:2852:float getBbWidth() -> cp
-    2856:2856:float getBbHeight() -> cq
-    net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    2862:2862:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
-    2866:2866:net.minecraft.world.phys.Vec3 position() -> cr
-    2870:2870:net.minecraft.world.phys.Vec3 getDeltaMovement() -> cs
-    2874:2875:void setDeltaMovement(net.minecraft.world.phys.Vec3) -> d
-    2878:2879:void setDeltaMovement(double,double,double) -> m
-    2882:2882:double getX() -> ct
-    2886:2886:double getX(double) -> c
-    2890:2890:double getRandomX(double) -> d
-    2894:2894:double getY() -> cu
-    2898:2898:double getY(double) -> e
-    2902:2902:double getRandomY() -> cv
-    2906:2906:double getEyeY() -> cw
-    2910:2910:double getZ() -> cx
-    2914:2914:double getZ(double) -> f
-    2918:2918:double getRandomZ(double) -> g
-    2922:2925:void setPosRaw(double,double,double) -> n
-    2928:2928:void checkDespawn() -> cy
-    2931:2932:void forceMove(double,double,double) -> b
-    2445:2448:void lambda$teleportTo$6(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Entity) -> a
-    2400:2400:void lambda$getDisplayName$5(net.minecraft.network.chat.Style) -> a
-    2362:2362:java.lang.String lambda$fillCrashReportCategory$4() -> o
-    2361:2361:java.lang.String lambda$fillCrashReportCategory$3() -> p
-    2356:2356:java.lang.String lambda$fillCrashReportCategory$2() -> q
-    2354:2354:java.lang.String lambda$fillCrashReportCategory$1() -> r
-    2167:2167:void lambda$removeAction$0(net.minecraft.network.chat.Style) -> b
-    109:203:void <clinit>() -> <clinit>
-net.minecraft.world.entity.Entity$1 -> akq$1:
+    1665:1669:net.minecraft.nbt.ListTag newDoubleList(double[]) -> a
+    1673:1677:net.minecraft.nbt.ListTag newFloatList(float[]) -> a
+    1682:1682:net.minecraft.world.entity.item.ItemEntity spawnAtLocation(net.minecraft.world.level.ItemLike) -> a
+    1687:1687:net.minecraft.world.entity.item.ItemEntity spawnAtLocation(net.minecraft.world.level.ItemLike,int) -> a
+    1692:1692:net.minecraft.world.entity.item.ItemEntity spawnAtLocation(net.minecraft.world.item.ItemStack) -> a
+    1697:1707:net.minecraft.world.entity.item.ItemEntity spawnAtLocation(net.minecraft.world.item.ItemStack,float) -> a
+    1711:1711:boolean isAlive() -> aU
+    1715:1722:boolean isInWall() -> aV
+    1727:1727:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    1732:1732:net.minecraft.world.phys.AABB getCollideAgainstBox(net.minecraft.world.entity.Entity) -> j
+    1736:1743:void rideTick() -> aW
+    1750:1751:void positionRider(net.minecraft.world.entity.Entity) -> k
+    1754:1759:void positionRider(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity$MoveFunction) -> a
+    1762:1762:void onPassengerTurned(net.minecraft.world.entity.Entity) -> l
+    1770:1770:double getMyRidingOffset() -> aX
+    1778:1778:double getPassengersRidingOffset() -> aY
+    1782:1782:boolean startRiding(net.minecraft.world.entity.Entity) -> m
+    1786:1786:boolean showVehicleHealth() -> aZ
+    1790:1811:boolean startRiding(net.minecraft.world.entity.Entity,boolean) -> a
+    1815:1815:boolean canRide(net.minecraft.world.entity.Entity) -> n
+    1819:1819:boolean canEnterPose(net.minecraft.world.entity.Pose) -> c
+    1823:1826:void ejectPassengers() -> ba
+    1829:1834:void removeVehicle() -> bb
+    1837:1838:void stopRiding() -> l
+    1841:1850:void addPassenger(net.minecraft.world.entity.Entity) -> o
+    1853:1859:void removePassenger(net.minecraft.world.entity.Entity) -> p
+    1862:1862:boolean canAddPassenger(net.minecraft.world.entity.Entity) -> q
+    1866:1868:void lerpTo(double,double,double,float,float,int,boolean) -> a
+    1871:1872:void lerpHeadTo(float,int) -> a
+    1875:1875:float getPickRadius() -> bc
+    1879:1879:net.minecraft.world.phys.Vec3 getLookAngle() -> bd
+    1883:1883:net.minecraft.world.phys.Vec2 getRotationVector() -> be
+    1887:1887:net.minecraft.world.phys.Vec3 getForward() -> bf
+    1891:1908:void handleInsidePortal(net.minecraft.core.BlockPos) -> d
+    1911:1942:void handleNetherPortal() -> bg
+    1945:1945:int getDimensionChangingDelay() -> bh
+    1949:1950:void lerpMotion(double,double,double) -> j
+    1953:1958:void handleEntityEvent(byte) -> a
+    1961:1961:void animateHurt() -> bi
+    1964:1964:java.lang.Iterable getHandSlots() -> bj
+    1968:1968:java.lang.Iterable getArmorSlots() -> bk
+    1972:1972:java.lang.Iterable getAllSlots() -> bl
+    1976:1976:void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
+    1980:1982:boolean isOnFire() -> bm
+    1986:1986:boolean isPassenger() -> bn
+    1990:1990:boolean isVehicle() -> bo
+    1994:1994:boolean rideableUnderWater() -> bp
+    1998:1999:void setShiftKeyDown(boolean) -> f
+    2003:2003:boolean isShiftKeyDown() -> bq
+    2010:2010:boolean isSteppingCarefully() -> br
+    2014:2014:boolean isSuppressingBounce() -> bs
+    2021:2021:boolean isDiscrete() -> bt
+    2028:2028:boolean isDescending() -> bu
+    2035:2035:boolean isCrouching() -> bv
+    2039:2039:boolean isSprinting() -> bw
+    2043:2044:void setSprinting(boolean) -> g
+    2047:2047:boolean isSwimming() -> bx
+    2057:2057:boolean isVisuallySwimming() -> by
+    2061:2061:boolean isVisuallyCrawling() -> bz
+    2065:2066:void setSwimming(boolean) -> h
+    2069:2069:boolean isGlowing() -> bA
+    2073:2077:void setGlowing(boolean) -> i
+    2080:2080:boolean isInvisible() -> bB
+    2084:2091:boolean isInvisibleTo(net.minecraft.world.entity.player.Player) -> c
+    2096:2096:net.minecraft.world.scores.Team getTeam() -> bC
+    2100:2100:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
+    2104:2107:boolean isAlliedTo(net.minecraft.world.scores.Team) -> a
+    2111:2112:void setInvisible(boolean) -> j
+    2115:2115:boolean getSharedFlag(int) -> i
+    2119:2125:void setSharedFlag(int,boolean) -> b
+    2128:2128:int getMaxAirSupply() -> bD
+    2132:2132:int getAirSupply() -> bE
+    2136:2137:void setAirSupply(int) -> j
+    2140:2145:void thunderHit(net.minecraft.world.entity.LightningBolt) -> a
+    2148:2156:void onAboveBubbleCol(boolean) -> k
+    2159:2168:void onInsideBubbleColumn(boolean) -> l
+    2171:2171:void killed(net.minecraft.world.entity.LivingEntity) -> a_
+    2174:2220:void checkInBlock(double,double,double) -> k
+    2223:2225:void makeStuckInBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.Vec3) -> a
+    2228:2232:net.minecraft.network.chat.Component removeAction(net.minecraft.network.chat.Component) -> b
+    2237:2241:net.minecraft.network.chat.Component getName() -> P
+    2245:2245:net.minecraft.network.chat.Component getTypeName() -> bF
+    2250:2250:boolean is(net.minecraft.world.entity.Entity) -> s
+    2254:2254:float getYHeadRot() -> bG
+    2258:2258:void setYHeadRot(float) -> k
+    2261:2261:void setYBodyRot(float) -> l
+    2264:2264:boolean isAttackable() -> bH
+    2268:2268:boolean skipAttackInteraction(net.minecraft.world.entity.Entity) -> t
+    2273:2273:java.lang.String toString() -> toString
+    2277:2277:boolean isInvulnerableTo(net.minecraft.world.damagesource.DamageSource) -> b
+    2281:2281:boolean isInvulnerable() -> bI
+    2285:2286:void setInvulnerable(boolean) -> m
+    2289:2290:void copyPosition(net.minecraft.world.entity.Entity) -> u
+    2293:2300:void restoreFrom(net.minecraft.world.entity.Entity) -> v
+    2304:2379:net.minecraft.world.entity.Entity changeDimension(net.minecraft.server.level.ServerLevel) -> a
+    2383:2384:void removeAfterChangingDimensions() -> bJ
+    2387:2387:boolean canChangeDimensions() -> bK
+    2391:2391:float getBlockExplosionResistance(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState,float) -> a
+    2395:2395:boolean shouldBlockExplode(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,float) -> a
+    2399:2399:int getMaxFallDistance() -> bL
+    2403:2403:net.minecraft.core.BlockPos getPortalEntranceBlock() -> bM
+    2407:2407:net.minecraft.world.phys.Vec3 getPortalEntranceOffset() -> bN
+    2411:2411:net.minecraft.core.Direction getPortalEntranceForwards() -> bO
+    2415:2415:boolean isIgnoringBlockTriggers() -> bP
+    2419:2428:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
+    2431:2431:boolean displayFireAnimation() -> bQ
+    2435:2437:void setUUID(java.util.UUID) -> a_
+    2440:2440:java.util.UUID getUUID() -> bR
+    2444:2444:java.lang.String getStringUUID() -> bS
+    2448:2448:java.lang.String getScoreboardName() -> bT
+    2452:2452:boolean isPushedByFluid() -> bU
+    2456:2456:double getViewScale() -> bV
+    2460:2461:void setViewScale(double) -> b
+    2465:2465:net.minecraft.network.chat.Component getDisplayName() -> d
+    2469:2470:void setCustomName(net.minecraft.network.chat.Component) -> a
+    2475:2475:net.minecraft.network.chat.Component getCustomName() -> R
+    2480:2480:boolean hasCustomName() -> Q
+    2484:2485:void setCustomNameVisible(boolean) -> n
+    2488:2488:boolean isCustomNameVisible() -> bW
+    2492:2501:void teleportToWithTicket(double,double,double) -> l
+    2504:2516:void teleportTo(double,double,double) -> a
+    2519:2519:boolean shouldShowName() -> bX
+    2523:2526:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    2529:2549:void refreshDimensions() -> y_
+    2552:2552:net.minecraft.core.Direction getDirection() -> bY
+    2556:2556:net.minecraft.core.Direction getMotionDirection() -> bZ
+    2560:2560:net.minecraft.network.chat.HoverEvent createHoverEvent() -> ca
+    2564:2564:boolean broadcastToPlayer(net.minecraft.server.level.ServerPlayer) -> a
+    2568:2568:net.minecraft.world.phys.AABB getBoundingBox() -> cb
+    2572:2572:net.minecraft.world.phys.AABB getBoundingBoxForCulling() -> cc
+    2579:2584:net.minecraft.world.phys.AABB getBoundingBoxForPose(net.minecraft.world.entity.Pose) -> d
+    2588:2589:void setBoundingBox(net.minecraft.world.phys.AABB) -> a
+    2592:2592:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
+    2596:2596:float getEyeHeight(net.minecraft.world.entity.Pose) -> e
+    2600:2600:float getEyeHeight() -> cd
+    2604:2604:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    2608:2608:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
+    2613:2613:void sendMessage(net.minecraft.network.chat.Component,java.util.UUID) -> a
+    2616:2616:net.minecraft.world.level.Level getCommandSenderWorld() -> cf
+    2621:2621:net.minecraft.server.MinecraftServer getServer() -> cg
+    2625:2625:net.minecraft.world.InteractionResult interactAt(net.minecraft.world.entity.player.Player,net.minecraft.world.phys.Vec3,net.minecraft.world.InteractionHand) -> a
+    2629:2629:boolean ignoreExplosion() -> ch
+    2636:2640:void doEnchantDamageEffects(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity) -> a
+    2643:2643:void startSeenByPlayer(net.minecraft.server.level.ServerPlayer) -> b
+    2646:2646:void stopSeenByPlayer(net.minecraft.server.level.ServerPlayer) -> c
+    2649:2658:float rotate(net.minecraft.world.level.block.Rotation) -> a
+    2663:2670:float mirror(net.minecraft.world.level.block.Mirror) -> a
+    2675:2675:boolean onlyOpCanSetNbt() -> ci
+    2679:2681:boolean checkAndResetForcedChunkAdditionFlag() -> cj
+    2685:2687:boolean checkAndResetUpdateChunkPos() -> ck
+    2692:2692:net.minecraft.world.entity.Entity getControllingPassenger() -> cl
+    2696:2699:java.util.List getPassengers() -> cm
+    2704:2709:boolean hasPassenger(net.minecraft.world.entity.Entity) -> w
+    2713:2718:boolean hasPassenger(java.lang.Class) -> a
+    2722:2727:java.util.Collection getIndirectPassengers() -> cn
+    2731:2731:java.util.stream.Stream getSelfAndPassengers() -> co
+    2735:2737:boolean hasOnePlayerPassenger() -> cp
+    2741:2748:void fillIndirectPassengers(boolean,java.util.Set) -> a
+    2751:2755:net.minecraft.world.entity.Entity getRootVehicle() -> cq
+    2759:2759:boolean isPassengerOfSameVehicle(net.minecraft.world.entity.Entity) -> x
+    2763:2771:boolean hasIndirectPassenger(net.minecraft.world.entity.Entity) -> y
+    2776:2780:boolean isControlledByLocalInstance() -> cr
+    2785:2792:net.minecraft.world.phys.Vec3 getCollisionHorizontalEscapeVector(double,double,float) -> a
+    2796:2796:net.minecraft.world.phys.Vec3 getDismountLocationForPassenger(net.minecraft.world.entity.LivingEntity) -> c
+    2801:2801:net.minecraft.world.entity.Entity getVehicle() -> cs
+    2805:2805:net.minecraft.world.level.material.PushReaction getPistonPushReaction() -> z_
+    2809:2809:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    2813:2813:int getFireImmuneTicks() -> cu
+    2818:2818:net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> cv
+    2822:2822:int getPermissionLevel() -> y
+    2826:2826:boolean hasPermissions(int) -> k
+    2831:2831:boolean acceptsSuccess() -> a
+    2836:2836:boolean acceptsFailure() -> b
+    2841:2841:boolean shouldInformAdmins() -> S_
+    2845:2856:void lookAt(net.minecraft.commands.arguments.EntityAnchorArgument$Anchor,net.minecraft.world.phys.Vec3) -> a
+    2863:2928:boolean updateFluidHeightAndDoFluidPushing(net.minecraft.tags.Tag,double) -> a
+    2932:2932:double getFluidHeight(net.minecraft.tags.Tag) -> b
+    2939:2939:double getFluidJumpThreshold() -> cw
+    2943:2943:float getBbWidth() -> cx
+    2947:2947:float getBbHeight() -> cy
+    net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    2953:2953:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
+    2957:2957:net.minecraft.world.phys.Vec3 position() -> cz
+    2961:2961:net.minecraft.core.BlockPos blockPosition() -> cA
+    2965:2965:net.minecraft.world.phys.Vec3 getDeltaMovement() -> cB
+    2969:2970:void setDeltaMovement(net.minecraft.world.phys.Vec3) -> e
+    2973:2974:void setDeltaMovement(double,double,double) -> m
+    2977:2977:double getX() -> cC
+    2981:2981:double getX(double) -> c
+    2985:2985:double getRandomX(double) -> d
+    2989:2989:double getY() -> cD
+    2993:2993:double getY(double) -> e
+    2997:2997:double getRandomY() -> cE
+    3001:3001:double getEyeY() -> cF
+    3005:3005:double getZ() -> cG
+    3009:3009:double getZ(double) -> f
+    3013:3013:double getRandomZ(double) -> g
+    3017:3028:void setPosRaw(double,double,double) -> n
+    3031:3031:void checkDespawn() -> cH
+    2510:2515:void lambda$teleportTo$8(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Entity) -> a
+    2465:2465:net.minecraft.network.chat.Style lambda$getDisplayName$7(net.minecraft.network.chat.Style) -> a
+    2427:2427:java.lang.String lambda$fillCrashReportCategory$6() -> o
+    2426:2426:java.lang.String lambda$fillCrashReportCategory$5() -> p
+    2421:2421:java.lang.String lambda$fillCrashReportCategory$4() -> q
+    2419:2419:java.lang.String lambda$fillCrashReportCategory$3() -> r
+    1722:1722:boolean lambda$isInWall$2(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    796:796:boolean lambda$collide$1(net.minecraft.world.entity.Entity) -> a
+    662:662:boolean lambda$move$0(net.minecraft.world.level.block.state.BlockState) -> b
+    110:213:void <clinit>() -> <clinit>
+net.minecraft.world.entity.Entity$1 -> aom$1:
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> b
-    2593:2607:void <clinit>() -> <clinit>
-net.minecraft.world.entity.Entity$MoveCallback -> akq$a:
+    2650:2664:void <clinit>() -> <clinit>
+net.minecraft.world.entity.Entity$MoveFunction -> aom$a:
     void accept(net.minecraft.world.entity.Entity,double,double,double) -> accept
-net.minecraft.world.entity.EntityDimensions -> akr:
+net.minecraft.world.entity.EntityDimensions -> aon:
     float width -> a
     float height -> b
     boolean fixed -> c
@@ -36614,34 +39687,36 @@ net.minecraft.world.entity.EntityDimensions -> akr:
     27:27:net.minecraft.world.entity.EntityDimensions scalable(float,float) -> b
     31:31:net.minecraft.world.entity.EntityDimensions fixed(float,float) -> c
     36:36:java.lang.String toString() -> toString
-net.minecraft.world.entity.EntityEvent -> aks:
+net.minecraft.world.entity.EntityEvent -> aoo:
     3:3:void <init>() -> <init>
-net.minecraft.world.entity.EntitySelector -> akt:
+net.minecraft.world.entity.EntitySelector -> aop:
     java.util.function.Predicate ENTITY_STILL_ALIVE -> a
     java.util.function.Predicate LIVING_ENTITY_STILL_ALIVE -> b
     java.util.function.Predicate ENTITY_NOT_BEING_RIDDEN -> c
     java.util.function.Predicate CONTAINER_ENTITY_SELECTOR -> d
     java.util.function.Predicate NO_CREATIVE_OR_SPECTATOR -> e
-    java.util.function.Predicate NO_SPECTATORS -> f
-    13:14:void <init>() -> <init>
-    44:45:java.util.function.Predicate withinDistance(double,double,double,double) -> a
-    49:54:java.util.function.Predicate pushableBy(net.minecraft.world.entity.Entity) -> a
-    78:78:java.util.function.Predicate notRiding(net.minecraft.world.entity.Entity) -> b
-    79:85:boolean lambda$notRiding$6(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
-    55:73:boolean lambda$pushableBy$5(net.minecraft.world.entity.Entity,net.minecraft.world.scores.Team,net.minecraft.world.scores.Team$CollisionRule,net.minecraft.world.entity.Entity) -> a
-    45:45:boolean lambda$withinDistance$4(double,double,double,double,net.minecraft.world.entity.Entity) -> a
-    21:21:boolean lambda$static$3(net.minecraft.world.entity.Entity) -> c
-    20:20:boolean lambda$static$2(net.minecraft.world.entity.Entity) -> d
-    19:19:boolean lambda$static$1(net.minecraft.world.entity.Entity) -> e
-    18:18:boolean lambda$static$0(net.minecraft.world.entity.Entity) -> f
-    16:21:void <clinit>() -> <clinit>
-net.minecraft.world.entity.EntitySelector$MobCanWearArmourEntitySelector -> akt$a:
+    java.util.function.Predicate ATTACK_ALLOWED -> f
+    java.util.function.Predicate NO_SPECTATORS -> g
+    14:15:void <init>() -> <init>
+    46:47:java.util.function.Predicate withinDistance(double,double,double,double) -> a
+    51:56:java.util.function.Predicate pushableBy(net.minecraft.world.entity.Entity) -> a
+    80:80:java.util.function.Predicate notRiding(net.minecraft.world.entity.Entity) -> b
+    81:87:boolean lambda$notRiding$7(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
+    57:75:boolean lambda$pushableBy$6(net.minecraft.world.entity.Entity,net.minecraft.world.scores.Team,net.minecraft.world.scores.Team$CollisionRule,net.minecraft.world.entity.Entity) -> a
+    47:47:boolean lambda$withinDistance$5(double,double,double,double,net.minecraft.world.entity.Entity) -> a
+    23:23:boolean lambda$static$4(net.minecraft.world.entity.Entity) -> c
+    22:22:boolean lambda$static$3(net.minecraft.world.entity.Entity) -> d
+    21:21:boolean lambda$static$2(net.minecraft.world.entity.Entity) -> e
+    20:20:boolean lambda$static$1(net.minecraft.world.entity.Entity) -> f
+    19:19:boolean lambda$static$0(net.minecraft.world.entity.Entity) -> g
+    17:23:void <clinit>() -> <clinit>
+net.minecraft.world.entity.EntitySelector$MobCanWearArmorEntitySelector -> aop$a:
     net.minecraft.world.item.ItemStack itemStack -> a
-    26:28:void <init>(net.minecraft.world.item.ItemStack) -> <init>
-    32:39:boolean test(net.minecraft.world.entity.Entity) -> a
-    23:23:boolean test(java.lang.Object) -> test
-net.minecraft.world.entity.EntityType -> aku:
-    org.apache.logging.log4j.Logger LOGGER -> aZ
+    28:30:void <init>(net.minecraft.world.item.ItemStack) -> <init>
+    34:41:boolean test(net.minecraft.world.entity.Entity) -> a
+    25:25:boolean test(java.lang.Object) -> test
+net.minecraft.world.entity.EntityType -> aoq:
+    org.apache.logging.log4j.Logger LOGGER -> bd
     net.minecraft.world.entity.EntityType AREA_EFFECT_CLOUD -> a
     net.minecraft.world.entity.EntityType ARMOR_STAND -> b
     net.minecraft.world.entity.EntityType ARROW -> c
@@ -36655,8 +39730,8 @@ net.minecraft.world.entity.EntityType -> aku:
     net.minecraft.world.entity.EntityType COD -> k
     net.minecraft.world.entity.EntityType COW -> l
     net.minecraft.world.entity.EntityType CREEPER -> m
-    net.minecraft.world.entity.EntityType DONKEY -> n
-    net.minecraft.world.entity.EntityType DOLPHIN -> o
+    net.minecraft.world.entity.EntityType DOLPHIN -> n
+    net.minecraft.world.entity.EntityType DONKEY -> o
     net.minecraft.world.entity.EntityType DRAGON_FIREBALL -> p
     net.minecraft.world.entity.EntityType DROWNED -> q
     net.minecraft.world.entity.EntityType ELDER_GUARDIAN -> r
@@ -36664,8 +39739,8 @@ net.minecraft.world.entity.EntityType -> aku:
     net.minecraft.world.entity.EntityType ENDER_DRAGON -> t
     net.minecraft.world.entity.EntityType ENDERMAN -> u
     net.minecraft.world.entity.EntityType ENDERMITE -> v
-    net.minecraft.world.entity.EntityType EVOKER_FANGS -> w
-    net.minecraft.world.entity.EntityType EVOKER -> x
+    net.minecraft.world.entity.EntityType EVOKER -> w
+    net.minecraft.world.entity.EntityType EVOKER_FANGS -> x
     net.minecraft.world.entity.EntityType EXPERIENCE_ORB -> y
     net.minecraft.world.entity.EntityType EYE_OF_ENDER -> z
     net.minecraft.world.entity.EntityType FALLING_BLOCK -> A
@@ -36674,146 +39749,162 @@ net.minecraft.world.entity.EntityType -> aku:
     net.minecraft.world.entity.EntityType GHAST -> D
     net.minecraft.world.entity.EntityType GIANT -> E
     net.minecraft.world.entity.EntityType GUARDIAN -> F
-    net.minecraft.world.entity.EntityType HORSE -> G
-    net.minecraft.world.entity.EntityType HUSK -> H
-    net.minecraft.world.entity.EntityType ILLUSIONER -> I
-    net.minecraft.world.entity.EntityType ITEM -> J
-    net.minecraft.world.entity.EntityType ITEM_FRAME -> K
-    net.minecraft.world.entity.EntityType FIREBALL -> L
-    net.minecraft.world.entity.EntityType LEASH_KNOT -> M
-    net.minecraft.world.entity.EntityType LLAMA -> N
-    net.minecraft.world.entity.EntityType LLAMA_SPIT -> O
-    net.minecraft.world.entity.EntityType MAGMA_CUBE -> P
-    net.minecraft.world.entity.EntityType MINECART -> Q
-    net.minecraft.world.entity.EntityType CHEST_MINECART -> R
-    net.minecraft.world.entity.EntityType COMMAND_BLOCK_MINECART -> S
-    net.minecraft.world.entity.EntityType FURNACE_MINECART -> T
-    net.minecraft.world.entity.EntityType HOPPER_MINECART -> U
-    net.minecraft.world.entity.EntityType SPAWNER_MINECART -> V
-    net.minecraft.world.entity.EntityType TNT_MINECART -> W
-    net.minecraft.world.entity.EntityType MULE -> X
-    net.minecraft.world.entity.EntityType MOOSHROOM -> Y
-    net.minecraft.world.entity.EntityType OCELOT -> Z
-    net.minecraft.world.entity.EntityType PAINTING -> aa
-    net.minecraft.world.entity.EntityType PANDA -> ab
-    net.minecraft.world.entity.EntityType PARROT -> ac
-    net.minecraft.world.entity.EntityType PIG -> ad
-    net.minecraft.world.entity.EntityType PUFFERFISH -> ae
-    net.minecraft.world.entity.EntityType ZOMBIE_PIGMAN -> af
-    net.minecraft.world.entity.EntityType POLAR_BEAR -> ag
-    net.minecraft.world.entity.EntityType TNT -> ah
-    net.minecraft.world.entity.EntityType RABBIT -> ai
-    net.minecraft.world.entity.EntityType SALMON -> aj
-    net.minecraft.world.entity.EntityType SHEEP -> ak
-    net.minecraft.world.entity.EntityType SHULKER -> al
-    net.minecraft.world.entity.EntityType SHULKER_BULLET -> am
-    net.minecraft.world.entity.EntityType SILVERFISH -> an
-    net.minecraft.world.entity.EntityType SKELETON -> ao
-    net.minecraft.world.entity.EntityType SKELETON_HORSE -> ap
-    net.minecraft.world.entity.EntityType SLIME -> aq
-    net.minecraft.world.entity.EntityType SMALL_FIREBALL -> ar
-    net.minecraft.world.entity.EntityType SNOW_GOLEM -> as
-    net.minecraft.world.entity.EntityType SNOWBALL -> at
-    net.minecraft.world.entity.EntityType SPECTRAL_ARROW -> au
-    net.minecraft.world.entity.EntityType SPIDER -> av
-    net.minecraft.world.entity.EntityType SQUID -> aw
-    net.minecraft.world.entity.EntityType STRAY -> ax
-    net.minecraft.world.entity.EntityType TRADER_LLAMA -> ay
-    net.minecraft.world.entity.EntityType TROPICAL_FISH -> az
-    net.minecraft.world.entity.EntityType TURTLE -> aA
-    net.minecraft.world.entity.EntityType EGG -> aB
-    net.minecraft.world.entity.EntityType ENDER_PEARL -> aC
-    net.minecraft.world.entity.EntityType EXPERIENCE_BOTTLE -> aD
-    net.minecraft.world.entity.EntityType POTION -> aE
-    net.minecraft.world.entity.EntityType TRIDENT -> aF
-    net.minecraft.world.entity.EntityType VEX -> aG
-    net.minecraft.world.entity.EntityType VILLAGER -> aH
-    net.minecraft.world.entity.EntityType IRON_GOLEM -> aI
-    net.minecraft.world.entity.EntityType VINDICATOR -> aJ
-    net.minecraft.world.entity.EntityType PILLAGER -> aK
-    net.minecraft.world.entity.EntityType WANDERING_TRADER -> aL
-    net.minecraft.world.entity.EntityType WITCH -> aM
-    net.minecraft.world.entity.EntityType WITHER -> aN
-    net.minecraft.world.entity.EntityType WITHER_SKELETON -> aO
-    net.minecraft.world.entity.EntityType WITHER_SKULL -> aP
-    net.minecraft.world.entity.EntityType WOLF -> aQ
-    net.minecraft.world.entity.EntityType ZOMBIE -> aR
-    net.minecraft.world.entity.EntityType ZOMBIE_HORSE -> aS
-    net.minecraft.world.entity.EntityType ZOMBIE_VILLAGER -> aT
-    net.minecraft.world.entity.EntityType PHANTOM -> aU
-    net.minecraft.world.entity.EntityType RAVAGER -> aV
-    net.minecraft.world.entity.EntityType LIGHTNING_BOLT -> aW
-    net.minecraft.world.entity.EntityType PLAYER -> aX
-    net.minecraft.world.entity.EntityType FISHING_BOBBER -> aY
-    net.minecraft.world.entity.EntityType$EntityFactory factory -> ba
-    net.minecraft.world.entity.MobCategory category -> bb
-    boolean serialize -> bc
-    boolean summon -> bd
-    boolean fireImmune -> be
-    boolean canSpawnFarFromPlayer -> bf
-    java.lang.String descriptionId -> bg
-    net.minecraft.network.chat.Component description -> bh
-    net.minecraft.resources.ResourceLocation lootTable -> bi
-    net.minecraft.world.entity.EntityDimensions dimensions -> bj
-    141:141:net.minecraft.world.entity.EntityType register(java.lang.String,net.minecraft.world.entity.EntityType$Builder) -> a
-    253:253:net.minecraft.resources.ResourceLocation getKey(net.minecraft.world.entity.EntityType) -> a
-    257:257:java.util.Optional byString(java.lang.String) -> a
-    274:282:void <init>(net.minecraft.world.entity.EntityType$EntityFactory,net.minecraft.world.entity.MobCategory,boolean,boolean,boolean,boolean,net.minecraft.world.entity.EntityDimensions) -> <init>
-    286:289:net.minecraft.world.entity.Entity spawn(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.entity.MobSpawnType,boolean,boolean) -> a
-    295:297:net.minecraft.world.entity.Entity spawn(net.minecraft.world.level.Level,net.minecraft.nbt.CompoundTag,net.minecraft.network.chat.Component,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.entity.MobSpawnType,boolean,boolean) -> a
-    305:339:net.minecraft.world.entity.Entity create(net.minecraft.world.level.Level,net.minecraft.nbt.CompoundTag,net.minecraft.network.chat.Component,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.entity.MobSpawnType,boolean,boolean) -> b
-    343:349:double getYOffset(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,boolean,net.minecraft.world.phys.AABB) -> a
-    353:371:void updateCustomEntityTag(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.nbt.CompoundTag) -> a
-    374:374:boolean canSerialize() -> a
-    378:378:boolean canSummon() -> b
-    382:382:boolean fireImmune() -> c
-    386:386:boolean canSpawnFarFromPlayer() -> d
-    390:390:net.minecraft.world.entity.MobCategory getCategory() -> e
-    394:397:java.lang.String getDescriptionId() -> f
-    401:404:net.minecraft.network.chat.Component getDescription() -> g
-    408:413:net.minecraft.resources.ResourceLocation getDefaultLootTable() -> h
-    417:417:float getWidth() -> i
-    421:421:float getHeight() -> j
-    426:426:net.minecraft.world.entity.Entity create(net.minecraft.world.level.Level) -> a
-    431:431:net.minecraft.world.entity.Entity create(int,net.minecraft.world.level.Level) -> a
-    435:435:java.util.Optional create(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.Level) -> a
-    444:444:net.minecraft.world.entity.Entity create(net.minecraft.world.level.Level,net.minecraft.world.entity.EntityType) -> a
-    448:454:net.minecraft.world.phys.AABB getAABB(double,double,double) -> a
-    460:460:net.minecraft.world.entity.EntityDimensions getDimensions() -> k
-    464:464:java.util.Optional by(net.minecraft.nbt.CompoundTag) -> a
-    469:483:net.minecraft.world.entity.Entity loadEntityRecursive(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.Level,java.util.function.Function) -> a
-    488:491:java.util.Optional loadStaticEntity(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.Level) -> b
-    497:540:int chunkRange() -> l
-    545:592:int updateInterval() -> m
-    597:597:boolean trackDeltas() -> n
-    610:610:boolean is(net.minecraft.tags.Tag) -> a
-    472:482:net.minecraft.world.entity.Entity lambda$loadEntityRecursive$3(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.Level,java.util.function.Function,net.minecraft.world.entity.Entity) -> a
-    437:437:void lambda$create$2(net.minecraft.nbt.CompoundTag) -> b
-    436:436:void lambda$create$1(net.minecraft.nbt.CompoundTag,net.minecraft.world.entity.Entity) -> a
-    435:435:net.minecraft.world.entity.Entity lambda$create$0(net.minecraft.world.level.Level,net.minecraft.world.entity.EntityType) -> b
-    136:136:org.apache.logging.log4j.Logger access$000() -> o
-    137:250:void <clinit>() -> <clinit>
-net.minecraft.world.entity.EntityType$Builder -> aku$a:
+    net.minecraft.world.entity.EntityType HOGLIN -> G
+    net.minecraft.world.entity.EntityType HORSE -> H
+    net.minecraft.world.entity.EntityType HUSK -> I
+    net.minecraft.world.entity.EntityType ILLUSIONER -> J
+    net.minecraft.world.entity.EntityType IRON_GOLEM -> K
+    net.minecraft.world.entity.EntityType ITEM -> L
+    net.minecraft.world.entity.EntityType ITEM_FRAME -> M
+    net.minecraft.world.entity.EntityType FIREBALL -> N
+    net.minecraft.world.entity.EntityType LEASH_KNOT -> O
+    net.minecraft.world.entity.EntityType LIGHTNING_BOLT -> P
+    net.minecraft.world.entity.EntityType LLAMA -> Q
+    net.minecraft.world.entity.EntityType LLAMA_SPIT -> R
+    net.minecraft.world.entity.EntityType MAGMA_CUBE -> S
+    net.minecraft.world.entity.EntityType MINECART -> T
+    net.minecraft.world.entity.EntityType CHEST_MINECART -> U
+    net.minecraft.world.entity.EntityType COMMAND_BLOCK_MINECART -> V
+    net.minecraft.world.entity.EntityType FURNACE_MINECART -> W
+    net.minecraft.world.entity.EntityType HOPPER_MINECART -> X
+    net.minecraft.world.entity.EntityType SPAWNER_MINECART -> Y
+    net.minecraft.world.entity.EntityType TNT_MINECART -> Z
+    net.minecraft.world.entity.EntityType MULE -> aa
+    net.minecraft.world.entity.EntityType MOOSHROOM -> ab
+    net.minecraft.world.entity.EntityType OCELOT -> ac
+    net.minecraft.world.entity.EntityType PAINTING -> ad
+    net.minecraft.world.entity.EntityType PANDA -> ae
+    net.minecraft.world.entity.EntityType PARROT -> af
+    net.minecraft.world.entity.EntityType PHANTOM -> ag
+    net.minecraft.world.entity.EntityType PIG -> ah
+    net.minecraft.world.entity.EntityType PIGLIN -> ai
+    net.minecraft.world.entity.EntityType PILLAGER -> aj
+    net.minecraft.world.entity.EntityType POLAR_BEAR -> ak
+    net.minecraft.world.entity.EntityType TNT -> al
+    net.minecraft.world.entity.EntityType PUFFERFISH -> am
+    net.minecraft.world.entity.EntityType RABBIT -> an
+    net.minecraft.world.entity.EntityType RAVAGER -> ao
+    net.minecraft.world.entity.EntityType SALMON -> ap
+    net.minecraft.world.entity.EntityType SHEEP -> aq
+    net.minecraft.world.entity.EntityType SHULKER -> ar
+    net.minecraft.world.entity.EntityType SHULKER_BULLET -> as
+    net.minecraft.world.entity.EntityType SILVERFISH -> at
+    net.minecraft.world.entity.EntityType SKELETON -> au
+    net.minecraft.world.entity.EntityType SKELETON_HORSE -> av
+    net.minecraft.world.entity.EntityType SLIME -> aw
+    net.minecraft.world.entity.EntityType SMALL_FIREBALL -> ax
+    net.minecraft.world.entity.EntityType SNOW_GOLEM -> ay
+    net.minecraft.world.entity.EntityType SNOWBALL -> az
+    net.minecraft.world.entity.EntityType SPECTRAL_ARROW -> aA
+    net.minecraft.world.entity.EntityType SPIDER -> aB
+    net.minecraft.world.entity.EntityType SQUID -> aC
+    net.minecraft.world.entity.EntityType STRAY -> aD
+    net.minecraft.world.entity.EntityType STRIDER -> aE
+    net.minecraft.world.entity.EntityType EGG -> aF
+    net.minecraft.world.entity.EntityType ENDER_PEARL -> aG
+    net.minecraft.world.entity.EntityType EXPERIENCE_BOTTLE -> aH
+    net.minecraft.world.entity.EntityType POTION -> aI
+    net.minecraft.world.entity.EntityType TRIDENT -> aJ
+    net.minecraft.world.entity.EntityType TRADER_LLAMA -> aK
+    net.minecraft.world.entity.EntityType TROPICAL_FISH -> aL
+    net.minecraft.world.entity.EntityType TURTLE -> aM
+    net.minecraft.world.entity.EntityType VEX -> aN
+    net.minecraft.world.entity.EntityType VILLAGER -> aO
+    net.minecraft.world.entity.EntityType VINDICATOR -> aP
+    net.minecraft.world.entity.EntityType WANDERING_TRADER -> aQ
+    net.minecraft.world.entity.EntityType WITCH -> aR
+    net.minecraft.world.entity.EntityType WITHER -> aS
+    net.minecraft.world.entity.EntityType WITHER_SKELETON -> aT
+    net.minecraft.world.entity.EntityType WITHER_SKULL -> aU
+    net.minecraft.world.entity.EntityType WOLF -> aV
+    net.minecraft.world.entity.EntityType ZOGLIN -> aW
+    net.minecraft.world.entity.EntityType ZOMBIE -> aX
+    net.minecraft.world.entity.EntityType ZOMBIE_HORSE -> aY
+    net.minecraft.world.entity.EntityType ZOMBIE_VILLAGER -> aZ
+    net.minecraft.world.entity.EntityType ZOMBIFIED_PIGLIN -> ba
+    net.minecraft.world.entity.EntityType PLAYER -> bb
+    net.minecraft.world.entity.EntityType FISHING_BOBBER -> bc
+    net.minecraft.world.entity.EntityType$EntityFactory factory -> be
+    net.minecraft.world.entity.MobCategory category -> bf
+    com.google.common.collect.ImmutableSet immuneTo -> bg
+    boolean serialize -> bh
+    boolean summon -> bi
+    boolean fireImmune -> bj
+    boolean canSpawnFarFromPlayer -> bk
+    int clientTrackingRange -> bl
+    int updateInterval -> bm
+    java.lang.String descriptionId -> bn
+    net.minecraft.network.chat.Component description -> bo
+    net.minecraft.resources.ResourceLocation lootTable -> bp
+    net.minecraft.world.entity.EntityDimensions dimensions -> bq
+    146:146:net.minecraft.world.entity.EntityType register(java.lang.String,net.minecraft.world.entity.EntityType$Builder) -> a
+    269:269:net.minecraft.resources.ResourceLocation getKey(net.minecraft.world.entity.EntityType) -> a
+    273:273:java.util.Optional byString(java.lang.String) -> a
+    293:304:void <init>(net.minecraft.world.entity.EntityType$EntityFactory,net.minecraft.world.entity.MobCategory,boolean,boolean,boolean,boolean,com.google.common.collect.ImmutableSet,net.minecraft.world.entity.EntityDimensions,int,int) -> <init>
+    308:311:net.minecraft.world.entity.Entity spawn(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.entity.MobSpawnType,boolean,boolean) -> a
+    317:319:net.minecraft.world.entity.Entity spawn(net.minecraft.world.level.Level,net.minecraft.nbt.CompoundTag,net.minecraft.network.chat.Component,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.entity.MobSpawnType,boolean,boolean) -> a
+    327:361:net.minecraft.world.entity.Entity create(net.minecraft.world.level.Level,net.minecraft.nbt.CompoundTag,net.minecraft.network.chat.Component,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.entity.MobSpawnType,boolean,boolean) -> b
+    365:371:double getYOffset(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,boolean,net.minecraft.world.phys.AABB) -> a
+    375:393:void updateCustomEntityTag(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.nbt.CompoundTag) -> a
+    396:396:boolean canSerialize() -> a
+    400:400:boolean canSummon() -> b
+    404:404:boolean fireImmune() -> c
+    408:408:boolean canSpawnFarFromPlayer() -> d
+    412:412:net.minecraft.world.entity.MobCategory getCategory() -> e
+    416:419:java.lang.String getDescriptionId() -> f
+    423:426:net.minecraft.network.chat.Component getDescription() -> g
+    431:431:java.lang.String toString() -> toString
+    435:436:java.lang.String toShortString() -> h
+    440:445:net.minecraft.resources.ResourceLocation getDefaultLootTable() -> i
+    449:449:float getWidth() -> j
+    453:453:float getHeight() -> k
+    458:458:net.minecraft.world.entity.Entity create(net.minecraft.world.level.Level) -> a
+    463:463:net.minecraft.world.entity.Entity create(int,net.minecraft.world.level.Level) -> a
+    467:467:java.util.Optional create(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.Level) -> a
+    476:476:net.minecraft.world.entity.Entity create(net.minecraft.world.level.Level,net.minecraft.world.entity.EntityType) -> a
+    480:486:net.minecraft.world.phys.AABB getAABB(double,double,double) -> a
+    492:498:boolean isBlockDangerous(net.minecraft.world.level.block.state.BlockState) -> a
+    502:502:net.minecraft.world.entity.EntityDimensions getDimensions() -> l
+    506:506:java.util.Optional by(net.minecraft.nbt.CompoundTag) -> a
+    511:525:net.minecraft.world.entity.Entity loadEntityRecursive(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.Level,java.util.function.Function) -> a
+    530:533:java.util.Optional loadStaticEntity(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.Level) -> b
+    538:538:int clientTrackingRange() -> m
+    542:542:int updateInterval() -> n
+    547:547:boolean trackDeltas() -> o
+    560:560:boolean is(net.minecraft.tags.Tag) -> a
+    514:524:net.minecraft.world.entity.Entity lambda$loadEntityRecursive$4(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.Level,java.util.function.Function,net.minecraft.world.entity.Entity) -> a
+    469:469:void lambda$create$3(net.minecraft.nbt.CompoundTag) -> b
+    468:468:void lambda$create$2(net.minecraft.nbt.CompoundTag,net.minecraft.world.entity.Entity) -> a
+    467:467:net.minecraft.world.entity.Entity lambda$create$1(net.minecraft.world.level.Level,net.minecraft.world.entity.EntityType) -> b
+    369:369:boolean lambda$getYOffset$0(net.minecraft.world.entity.Entity) -> a
+    142:266:void <clinit>() -> <clinit>
+net.minecraft.world.entity.EntityType$Builder -> aoq$a:
     net.minecraft.world.entity.EntityType$EntityFactory factory -> a
     net.minecraft.world.entity.MobCategory category -> b
-    boolean serialize -> c
-    boolean summon -> d
-    boolean fireImmune -> e
-    boolean canSpawnFarFromPlayer -> f
-    net.minecraft.world.entity.EntityDimensions dimensions -> g
-    616:626:void <init>(net.minecraft.world.entity.EntityType$EntityFactory,net.minecraft.world.entity.MobCategory) -> <init>
-    629:629:net.minecraft.world.entity.EntityType$Builder of(net.minecraft.world.entity.EntityType$EntityFactory,net.minecraft.world.entity.MobCategory) -> a
-    633:633:net.minecraft.world.entity.EntityType$Builder createNothing(net.minecraft.world.entity.MobCategory) -> a
-    637:638:net.minecraft.world.entity.EntityType$Builder sized(float,float) -> a
-    642:643:net.minecraft.world.entity.EntityType$Builder noSummon() -> a
-    647:648:net.minecraft.world.entity.EntityType$Builder noSave() -> b
-    652:653:net.minecraft.world.entity.EntityType$Builder fireImmune() -> c
-    657:658:net.minecraft.world.entity.EntityType$Builder canSpawnFarFromPlayer() -> d
-    662:673:net.minecraft.world.entity.EntityType build(java.lang.String) -> a
-    633:633:net.minecraft.world.entity.Entity lambda$createNothing$0(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> a
-net.minecraft.world.entity.EntityType$EntityFactory -> aku$b:
+    com.google.common.collect.ImmutableSet immuneTo -> c
+    boolean serialize -> d
+    boolean summon -> e
+    boolean fireImmune -> f
+    boolean canSpawnFarFromPlayer -> g
+    int clientTrackingRange -> h
+    int updateInterval -> i
+    net.minecraft.world.entity.EntityDimensions dimensions -> j
+    566:579:void <init>(net.minecraft.world.entity.EntityType$EntityFactory,net.minecraft.world.entity.MobCategory) -> <init>
+    582:582:net.minecraft.world.entity.EntityType$Builder of(net.minecraft.world.entity.EntityType$EntityFactory,net.minecraft.world.entity.MobCategory) -> a
+    586:586:net.minecraft.world.entity.EntityType$Builder createNothing(net.minecraft.world.entity.MobCategory) -> a
+    590:591:net.minecraft.world.entity.EntityType$Builder sized(float,float) -> a
+    595:596:net.minecraft.world.entity.EntityType$Builder noSummon() -> a
+    600:601:net.minecraft.world.entity.EntityType$Builder noSave() -> b
+    605:606:net.minecraft.world.entity.EntityType$Builder fireImmune() -> c
+    610:611:net.minecraft.world.entity.EntityType$Builder immuneTo(net.minecraft.world.level.block.Block[]) -> a
+    615:616:net.minecraft.world.entity.EntityType$Builder canSpawnFarFromPlayer() -> d
+    620:621:net.minecraft.world.entity.EntityType$Builder clientTrackingRange(int) -> a
+    625:626:net.minecraft.world.entity.EntityType$Builder updateInterval(int) -> b
+    630:633:net.minecraft.world.entity.EntityType build(java.lang.String) -> a
+    586:586:net.minecraft.world.entity.Entity lambda$createNothing$0(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> a
+net.minecraft.world.entity.EntityType$EntityFactory -> aoq$b:
     net.minecraft.world.entity.Entity create(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> create
-net.minecraft.world.entity.EquipmentSlot -> akv:
+net.minecraft.world.entity.EquipmentSlot -> aor:
     net.minecraft.world.entity.EquipmentSlot MAINHAND -> a
     net.minecraft.world.entity.EquipmentSlot OFFHAND -> b
     net.minecraft.world.entity.EquipmentSlot FEET -> c
@@ -36835,7 +39926,7 @@ net.minecraft.world.entity.EquipmentSlot -> akv:
     45:51:net.minecraft.world.entity.EquipmentSlot byName(java.lang.String) -> a
     55:61:net.minecraft.world.entity.EquipmentSlot byTypeAndIndex(net.minecraft.world.entity.EquipmentSlot$Type,int) -> a
     3:9:void <clinit>() -> <clinit>
-net.minecraft.world.entity.EquipmentSlot$Type -> akv$a:
+net.minecraft.world.entity.EquipmentSlot$Type -> aor$a:
     net.minecraft.world.entity.EquipmentSlot$Type HAND -> a
     net.minecraft.world.entity.EquipmentSlot$Type ARMOR -> b
     net.minecraft.world.entity.EquipmentSlot$Type[] $VALUES -> c
@@ -36843,40 +39934,40 @@ net.minecraft.world.entity.EquipmentSlot$Type -> akv$a:
     39:39:net.minecraft.world.entity.EquipmentSlot$Type valueOf(java.lang.String) -> valueOf
     39:39:void <init>(java.lang.String,int) -> <init>
     39:41:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ExperienceOrb -> akw:
+net.minecraft.world.entity.ExperienceOrb -> aos:
     int tickCount -> b
     int age -> c
     int throwTime -> d
     int health -> e
     int value -> f
     net.minecraft.world.entity.player.Player followingPlayer -> g
-    int followingTime -> ao
+    int followingTime -> an
     33:45:void <init>(net.minecraft.world.level.Level,double,double,double,int) -> <init>
     27:49:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    53:53:boolean isMovementNoisy() -> at
-    58:58:void defineSynchedData() -> w_
-    62:135:void tick() -> h
-    139:146:void setUnderwaterMovement() -> k
-    150:150:void doWaterSplashEffect() -> aD
+    53:53:boolean isMovementNoisy() -> ax
+    58:58:void defineSynchedData() -> e
+    62:135:void tick() -> j
+    139:146:void setUnderwaterMovement() -> i
+    150:150:void doWaterSplashEffect() -> aI
     154:155:void burn(int) -> h
     159:167:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
     172:175:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     179:182:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    186:207:void playerTouch(net.minecraft.world.entity.player.Player) -> b
+    186:207:void playerTouch(net.minecraft.world.entity.player.Player) -> a_
     210:210:int durabilityToXp(int) -> b
     214:214:int xpToDurability(int) -> c
-    218:218:int getValue() -> f
-    222:244:int getIcon() -> i
+    218:218:int getValue() -> g
+    222:244:int getIcon() -> h
     256:278:int getExperienceValue(int) -> a
-    283:283:boolean isAttackable() -> bA
-    288:288:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-net.minecraft.world.entity.FlyingMob -> akx:
-    11:12:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    16:16:boolean causeFallDamage(float,float) -> b
-    23:23:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    27:63:void travel(net.minecraft.world.phys.Vec3) -> e
-    67:67:boolean onLadder() -> y_
-net.minecraft.world.entity.HumanoidArm -> aky:
+    283:283:boolean isAttackable() -> bH
+    288:288:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+net.minecraft.world.entity.FlyingMob -> aot:
+    10:11:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    15:15:boolean causeFallDamage(float,float) -> b
+    22:22:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    26:54:void travel(net.minecraft.world.phys.Vec3) -> f
+    58:58:boolean onClimbable() -> c_
+net.minecraft.world.entity.HumanoidArm -> aou:
     net.minecraft.world.entity.HumanoidArm LEFT -> a
     net.minecraft.world.entity.HumanoidArm RIGHT -> b
     net.minecraft.network.chat.Component name -> c
@@ -36886,69 +39977,108 @@ net.minecraft.world.entity.HumanoidArm -> aky:
     13:15:void <init>(java.lang.String,int,net.minecraft.network.chat.Component) -> <init>
     18:21:net.minecraft.world.entity.HumanoidArm getOpposite() -> a
     26:26:java.lang.String toString() -> toString
+    30:30:net.minecraft.network.chat.Component getName() -> b
     6:8:void <clinit>() -> <clinit>
-net.minecraft.world.entity.LivingEntity -> akz:
+net.minecraft.world.entity.ItemBasedSteering -> aov:
+    net.minecraft.network.syncher.SynchedEntityData entityData -> d
+    net.minecraft.network.syncher.EntityDataAccessor boostTimeAccessor -> e
+    net.minecraft.network.syncher.EntityDataAccessor hasSaddleAccessor -> f
+    boolean boosting -> a
+    int boostTime -> b
+    int boostTimeTotal -> c
+    22:26:void <init>(net.minecraft.network.syncher.SynchedEntityData,net.minecraft.network.syncher.EntityDataAccessor,net.minecraft.network.syncher.EntityDataAccessor) -> <init>
+    29:32:void onSynced() -> a
+    35:42:boolean boost(java.util.Random) -> a
+    46:47:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    51:52:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    55:56:void setSaddle(boolean) -> a
+    59:59:boolean hasSaddle() -> b
+net.minecraft.world.entity.ItemSteerable -> aow:
+    boolean boost() -> P_
+    void travelWithInput(net.minecraft.world.phys.Vec3) -> a_
+    float getSteeringSpeed() -> O_
+    14:55:boolean travel(net.minecraft.world.entity.Mob,net.minecraft.world.entity.ItemBasedSteering,net.minecraft.world.phys.Vec3) -> a
+net.minecraft.world.entity.LightningBolt -> aox:
+    int life -> c
+    long seed -> b
+    int flashes -> d
+    boolean visualOnly -> e
+    net.minecraft.server.level.ServerPlayer cause -> f
+    32:38:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    41:42:void setVisualOnly(boolean) -> a
+    46:46:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    51:51:net.minecraft.server.level.ServerPlayer getCause() -> g
+    55:56:void setCause(net.minecraft.server.level.ServerPlayer) -> d
+    60:98:void tick() -> j
+    101:119:void spawnFire(int) -> a
+    124:125:boolean shouldRenderAtSqrDistance(double) -> a
+    130:130:void defineSynchedData() -> e
+    134:134:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    138:138:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    142:142:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+net.minecraft.world.entity.LivingEntity -> aoy:
     java.util.UUID SPEED_MODIFIER_SPRINTING_UUID -> b
-    net.minecraft.world.entity.ai.attributes.AttributeModifier SPEED_MODIFIER_SPRINTING -> c
-    net.minecraft.network.syncher.EntityDataAccessor DATA_LIVING_ENTITY_FLAGS -> ao
-    net.minecraft.network.syncher.EntityDataAccessor DATA_HEALTH_ID -> d
-    net.minecraft.network.syncher.EntityDataAccessor DATA_EFFECT_COLOR_ID -> e
-    net.minecraft.network.syncher.EntityDataAccessor DATA_EFFECT_AMBIENCE_ID -> f
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ARROW_COUNT_ID -> g
+    java.util.UUID SPEED_MODIFIER_SOUL_SPEED_UUID -> c
+    net.minecraft.world.entity.ai.attributes.AttributeModifier SPEED_MODIFIER_SPRINTING -> d
+    net.minecraft.network.syncher.EntityDataAccessor DATA_LIVING_ENTITY_FLAGS -> an
+    net.minecraft.network.syncher.EntityDataAccessor DATA_HEALTH_ID -> e
+    net.minecraft.network.syncher.EntityDataAccessor DATA_EFFECT_COLOR_ID -> f
+    net.minecraft.network.syncher.EntityDataAccessor DATA_EFFECT_AMBIENCE_ID -> g
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ARROW_COUNT_ID -> bo
     net.minecraft.network.syncher.EntityDataAccessor DATA_STINGER_COUNT_ID -> bp
     net.minecraft.network.syncher.EntityDataAccessor SLEEPING_POS_ID -> bq
-    net.minecraft.world.entity.EntityDimensions SLEEPING_DIMENSIONS -> ap
-    net.minecraft.world.entity.ai.attributes.BaseAttributeMap attributes -> br
+    net.minecraft.world.entity.EntityDimensions SLEEPING_DIMENSIONS -> ao
+    net.minecraft.world.entity.ai.attributes.AttributeMap attributes -> br
     net.minecraft.world.damagesource.CombatTracker combatTracker -> bs
     java.util.Map activeEffects -> bt
     net.minecraft.core.NonNullList lastHandItemStacks -> bu
     net.minecraft.core.NonNullList lastArmorItemStacks -> bv
-    boolean swinging -> aq
-    net.minecraft.world.InteractionHand swingingArm -> ar
-    int swingTime -> as
-    int removeArrowTime -> at
-    int removeStingerTime -> au
-    int hurtTime -> av
-    int hurtDuration -> aw
-    float hurtDir -> ax
-    int deathTime -> ay
-    float oAttackAnim -> az
-    float attackAnim -> aA
-    int attackStrengthTicker -> aB
-    float animationSpeedOld -> aC
-    float animationSpeed -> aD
-    float animationPosition -> aE
-    int invulnerableDuration -> aF
-    float timeOffs -> aG
-    float rotA -> aH
-    float yBodyRot -> aI
-    float yBodyRotO -> aJ
-    float yHeadRot -> aK
-    float yHeadRotO -> aL
-    float flyingSpeed -> aM
-    net.minecraft.world.entity.player.Player lastHurtByPlayer -> aN
-    int lastHurtByPlayerTime -> aO
-    boolean dead -> aP
-    int noActionTime -> aQ
-    float oRun -> aR
-    float run -> aS
-    float animStep -> aT
-    float animStepO -> aU
-    float rotOffs -> aV
-    int deathScore -> aW
-    float lastHurt -> aX
-    boolean jumping -> aY
-    float xxa -> aZ
-    float yya -> ba
-    float zza -> bb
-    int lerpSteps -> bc
-    double lerpX -> bd
-    double lerpY -> be
-    double lerpZ -> bf
-    double lerpYRot -> bg
-    double lerpXRot -> bh
-    double lyHeadRot -> bi
-    int lerpHeadSteps -> bj
+    boolean swinging -> ap
+    net.minecraft.world.InteractionHand swingingArm -> aq
+    int swingTime -> ar
+    int removeArrowTime -> as
+    int removeStingerTime -> at
+    int hurtTime -> au
+    int hurtDuration -> av
+    float hurtDir -> aw
+    int deathTime -> ax
+    float oAttackAnim -> ay
+    float attackAnim -> az
+    int attackStrengthTicker -> aA
+    float animationSpeedOld -> aB
+    float animationSpeed -> aC
+    float animationPosition -> aD
+    int invulnerableDuration -> aE
+    float timeOffs -> aF
+    float rotA -> aG
+    float yBodyRot -> aH
+    float yBodyRotO -> aI
+    float yHeadRot -> aJ
+    float yHeadRotO -> aK
+    float flyingSpeed -> aL
+    net.minecraft.world.entity.player.Player lastHurtByPlayer -> aM
+    int lastHurtByPlayerTime -> aN
+    boolean dead -> aO
+    int noActionTime -> aP
+    float oRun -> aQ
+    float run -> aR
+    float animStep -> aS
+    float animStepO -> aT
+    float rotOffs -> aU
+    int deathScore -> aV
+    float lastHurt -> aW
+    boolean jumping -> aX
+    float xxa -> aY
+    float yya -> aZ
+    float zza -> ba
+    int lerpSteps -> bb
+    double lerpX -> bc
+    double lerpY -> bd
+    double lerpZ -> be
+    double lerpYRot -> bf
+    double lerpXRot -> bg
+    double lyHeadRot -> bh
+    int lerpHeadSteps -> bi
     boolean effectsDirty -> bw
     net.minecraft.world.entity.LivingEntity lastHurtByMob -> bx
     int lastHurtByMobTimestamp -> by
@@ -36957,413 +40087,478 @@ net.minecraft.world.entity.LivingEntity -> akz:
     float speed -> bB
     int noJumpDelay -> bC
     float absorptionAmount -> bD
-    net.minecraft.world.item.ItemStack useItem -> bk
-    int useItemRemaining -> bl
-    int fallFlyTicks -> bm
+    net.minecraft.world.item.ItemStack useItem -> bj
+    int useItemRemaining -> bk
+    int fallFlyTicks -> bl
     net.minecraft.core.BlockPos lastPos -> bE
-    net.minecraft.world.damagesource.DamageSource lastDamageSource -> bF
-    long lastDamageStamp -> bG
-    int autoSpinAttackTicks -> bn
-    float swimAmount -> bH
-    float swimAmountO -> bI
-    net.minecraft.world.entity.ai.Brain brain -> bo
-    139:224:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    227:227:net.minecraft.world.entity.ai.Brain getBrain() -> cz
-    231:231:net.minecraft.world.entity.ai.Brain makeBrain(com.mojang.datafixers.Dynamic) -> a
-    236:237:void kill() -> U
-    240:240:boolean canAttackType(net.minecraft.world.entity.EntityType) -> a
-    245:252:void defineSynchedData() -> w_
-    255:260:void registerAttributes() -> cA
-    264:279:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    282:282:boolean canBreatheUnderwater() -> cB
-    286:286:float getSwimAmount(float) -> a
-    291:395:void baseTick() -> aa
-    398:402:void onChangedBlock(net.minecraft.core.BlockPos) -> b
-    405:405:boolean isBaby() -> x_
-    409:409:float getScale() -> cC
-    414:414:boolean rideableUnderWater() -> bi
-    418:428:void tickDeath() -> cD
-    431:431:boolean shouldDropExperience() -> cE
-    435:442:int decreaseAirSupply(int) -> l
-    446:446:int increaseAirSupply(int) -> m
-    450:450:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
-    454:454:boolean isAlwaysExperienceDropper() -> cF
-    458:458:java.util.Random getRandom() -> cG
-    463:463:net.minecraft.world.entity.LivingEntity getLastHurtByMob() -> cH
-    467:467:int getLastHurtByMobTimestamp() -> cI
-    471:473:void setLastHurtByMob(net.minecraft.world.entity.LivingEntity) -> a
-    477:477:net.minecraft.world.entity.LivingEntity getLastHurtMob() -> cJ
-    481:481:int getLastHurtMobTimestamp() -> cK
-    485:491:void setLastHurtMob(net.minecraft.world.entity.Entity) -> z
-    494:494:int getNoActionTime() -> cL
-    498:499:void setNoActionTime(int) -> n
-    502:515:void playEquipSound(net.minecraft.world.item.ItemStack) -> b
-    519:545:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    549:605:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    608:660:void tickEffects() -> cM
-    663:672:void updateInvisibilityStatus() -> C
-    675:700:double getVisibilityPercent(net.minecraft.world.entity.Entity) -> A
-    704:704:boolean canAttack(net.minecraft.world.entity.LivingEntity) -> c
-    708:708:boolean canAttack(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.targeting.TargetingConditions) -> a
-    712:718:boolean areAllEffectsAmbient(java.util.Collection) -> c
-    722:724:void removeEffectParticles() -> cN
-    727:738:boolean removeAllEffects() -> cO
-    742:742:java.util.Collection getActiveEffects() -> cP
-    746:746:java.util.Map getActiveEffectsMap() -> cQ
-    750:750:boolean hasEffect(net.minecraft.world.effect.MobEffect) -> a
-    755:755:net.minecraft.world.effect.MobEffectInstance getEffect(net.minecraft.world.effect.MobEffect) -> b
-    759:776:boolean addEffect(net.minecraft.world.effect.MobEffectInstance) -> c
-    780:787:boolean canBeAffected(net.minecraft.world.effect.MobEffectInstance) -> d
-    791:791:boolean isInvertedHealAndHarm() -> cR
-    796:796:net.minecraft.world.effect.MobEffectInstance removeEffectNoUpdate(net.minecraft.world.effect.MobEffect) -> c
-    800:805:boolean removeEffect(net.minecraft.world.effect.MobEffect) -> d
-    809:813:void onEffectAdded(net.minecraft.world.effect.MobEffectInstance) -> a
-    816:822:void onEffectUpdated(net.minecraft.world.effect.MobEffectInstance,boolean) -> a
-    825:829:void onEffectRemoved(net.minecraft.world.effect.MobEffectInstance) -> b
-    832:836:void heal(float) -> b
-    839:839:float getHealth() -> cS
-    843:844:void setHealth(float) -> c
-    848:1000:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    1004:1005:void blockUsingShield(net.minecraft.world.entity.LivingEntity) -> d
-    1008:1009:void blockedByShield(net.minecraft.world.entity.LivingEntity) -> e
-    1012:1040:boolean checkTotemDeathProtection(net.minecraft.world.damagesource.DamageSource) -> f
-    1045:1048:net.minecraft.world.damagesource.DamageSource getLastDamageSource() -> cT
-    1052:1056:void playHurtSound(net.minecraft.world.damagesource.DamageSource) -> c
-    1059:1081:boolean isDamageSourceBlocked(net.minecraft.world.damagesource.DamageSource) -> g
-    1085:1091:void breakItem(net.minecraft.world.item.ItemStack) -> g
-    1094:1122:void die(net.minecraft.world.damagesource.DamageSource) -> a
-    1125:1145:void createWitherRose(net.minecraft.world.entity.LivingEntity) -> f
-    1148:1165:void dropAllDeathLoot(net.minecraft.world.damagesource.DamageSource) -> d
-    1168:1168:void dropEquipment() -> cU
-    1171:1179:void dropExperience() -> cV
-    1182:1182:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
-    1185:1185:net.minecraft.resources.ResourceLocation getLootTable() -> cW
-    1189:1195:void dropFromLootTable(net.minecraft.world.damagesource.DamageSource,boolean) -> a
-    1198:1209:net.minecraft.world.level.storage.loot.LootContext$Builder createLootContext(boolean,net.minecraft.world.damagesource.DamageSource) -> a
-    1213:1228:void knockback(net.minecraft.world.entity.Entity,float,double,double) -> a
-    1232:1232:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    1237:1237:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    1241:1244:net.minecraft.sounds.SoundEvent getFallDamageSound(int) -> o
-    1249:1249:net.minecraft.sounds.SoundEvent getDrinkingSound(net.minecraft.world.item.ItemStack) -> c
-    1253:1253:net.minecraft.sounds.SoundEvent getEatingSound(net.minecraft.world.item.ItemStack) -> d
-    1257:1267:boolean onLadder() -> y_
-    1271:1271:net.minecraft.world.level.block.state.BlockState getFeetBlockState() -> cY
-    1275:1281:boolean trapdoorUsableAsLadder(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    1286:1286:boolean isAlive() -> aO
-    1291:1300:boolean causeFallDamage(float,float) -> b
-    1304:1306:int calculateFallDamage(float,float) -> e
-    1310:1322:void playBlockFallSound() -> cZ
-    1326:1329:void animateHurt() -> bb
-    1337:1338:int getArmorValue() -> da
-    1342:1342:void hurtArmor(float) -> m
-    1345:1345:void hurtCurrentlyUsedShield(float) -> n
-    1348:1352:float getDamageAfterArmorAbsorb(net.minecraft.world.damagesource.DamageSource,float) -> b
-    1356:1386:float getDamageAfterMagicAbsorb(net.minecraft.world.damagesource.DamageSource,float) -> c
-    1390:1413:void actuallyHurt(net.minecraft.world.damagesource.DamageSource,float) -> d
-    1416:1416:net.minecraft.world.damagesource.CombatTracker getCombatTracker() -> db
-    1421:1430:net.minecraft.world.entity.LivingEntity getKillCredit() -> dc
-    1434:1434:float getMaxHealth() -> dd
-    1438:1438:int getArrowCount() -> de
-    1442:1443:void setArrowCount(int) -> p
-    1446:1446:int getStingerCount() -> df
-    1450:1451:void setStingerCount(int) -> q
-    1454:1460:int getCurrentSwingDuration() -> l
-    1464:1465:void swing(net.minecraft.world.InteractionHand) -> a
-    1468:1484:void swing(net.minecraft.world.InteractionHand,boolean) -> a
-    1488:1586:void handleEntityEvent(byte) -> a
-    1590:1591:void outOfWorld() -> af
-    1594:1606:void updateSwingTime() -> dg
-    1609:1609:net.minecraft.world.entity.ai.attributes.AttributeInstance getAttribute(net.minecraft.world.entity.ai.attributes.Attribute) -> a
-    1613:1617:net.minecraft.world.entity.ai.attributes.BaseAttributeMap getAttributes() -> dh
-    1621:1621:net.minecraft.world.entity.MobType getMobType() -> di
-    1625:1625:net.minecraft.world.item.ItemStack getMainHandItem() -> dj
-    1629:1629:net.minecraft.world.item.ItemStack getOffhandItem() -> dk
-    java.lang.Iterable getHandSlots() -> bc
-    1636:1641:net.minecraft.world.item.ItemStack getItemInHand(net.minecraft.world.InteractionHand) -> b
-    1646:1653:void setItemInHand(net.minecraft.world.InteractionHand,net.minecraft.world.item.ItemStack) -> a
-    1656:1656:boolean hasItemInSlot(net.minecraft.world.entity.EquipmentSlot) -> a
-    java.lang.Iterable getArmorSlots() -> bd
+    java.util.Optional lastClimbablePos -> bF
+    net.minecraft.world.damagesource.DamageSource lastDamageSource -> bG
+    long lastDamageStamp -> bH
+    int autoSpinAttackTicks -> bm
+    float swimAmount -> bI
+    float swimAmountO -> bJ
+    net.minecraft.world.entity.ai.Brain brain -> bn
+    144:232:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    235:235:net.minecraft.world.entity.ai.Brain getBrain() -> cI
+    239:239:net.minecraft.world.entity.ai.Brain$Provider brainProvider() -> cJ
+    243:243:net.minecraft.world.entity.ai.Brain makeBrain(com.mojang.serialization.Dynamic) -> a
+    248:249:void kill() -> X
+    252:252:boolean canAttackType(net.minecraft.world.entity.EntityType) -> a
+    257:264:void defineSynchedData() -> e
+    267:272:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createLivingAttributes() -> cK
+    277:299:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    302:302:boolean canBreatheUnderwater() -> cL
+    306:306:float getSwimAmount(float) -> a
+    311:420:void baseTick() -> ad
+    423:423:boolean canSpawnSoulSpeedParticle() -> cM
+    427:432:void spawnSoulSpeedParticle() -> cN
+    435:435:boolean onSoulSpeedBlock() -> cO
+    440:444:float getBlockSpeedFactor() -> am
+    448:448:boolean shouldRemoveSoulSpeed(net.minecraft.world.level.block.state.BlockState) -> b
+    452:461:void removeSoulSpeed() -> cP
+    464:486:void tryAddSoulSpeed() -> cQ
+    489:499:void onChangedBlock(net.minecraft.core.BlockPos) -> c
+    502:502:boolean isBaby() -> x_
+    506:506:float getScale() -> cR
+    510:510:boolean isAffectedByFluids() -> cS
+    515:515:boolean rideableUnderWater() -> bp
+    519:529:void tickDeath() -> cT
+    532:532:boolean shouldDropExperience() -> cU
+    536:536:boolean shouldDropLoot() -> cV
+    540:547:int decreaseAirSupply(int) -> l
+    551:551:int increaseAirSupply(int) -> m
+    555:555:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
+    559:559:boolean isAlwaysExperienceDropper() -> cW
+    563:563:java.util.Random getRandom() -> cX
+    568:568:net.minecraft.world.entity.LivingEntity getLastHurtByMob() -> cY
+    572:572:int getLastHurtByMobTimestamp() -> cZ
+    576:578:void setLastHurtByPlayer(net.minecraft.world.entity.player.Player) -> e
+    581:583:void setLastHurtByMob(net.minecraft.world.entity.LivingEntity) -> a
+    587:587:net.minecraft.world.entity.LivingEntity getLastHurtMob() -> da
+    591:591:int getLastHurtMobTimestamp() -> db
+    595:601:void setLastHurtMob(net.minecraft.world.entity.Entity) -> z
+    604:604:int getNoActionTime() -> dc
+    608:609:void setNoActionTime(int) -> n
+    612:625:void playEquipSound(net.minecraft.world.item.ItemStack) -> b
+    629:656:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    660:716:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    719:771:void tickEffects() -> dd
+    774:783:void updateInvisibilityStatus() -> C
+    786:811:double getVisibilityPercent(net.minecraft.world.entity.Entity) -> A
+    815:815:boolean canAttack(net.minecraft.world.entity.LivingEntity) -> d
+    819:819:boolean canAttack(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.targeting.TargetingConditions) -> a
+    823:829:boolean areAllEffectsAmbient(java.util.Collection) -> c
+    833:835:void removeEffectParticles() -> de
+    838:849:boolean removeAllEffects() -> df
+    853:853:java.util.Collection getActiveEffects() -> dg
+    857:857:java.util.Map getActiveEffectsMap() -> dh
+    861:861:boolean hasEffect(net.minecraft.world.effect.MobEffect) -> a
+    866:866:net.minecraft.world.effect.MobEffectInstance getEffect(net.minecraft.world.effect.MobEffect) -> b
+    870:887:boolean addEffect(net.minecraft.world.effect.MobEffectInstance) -> c
+    891:898:boolean canBeAffected(net.minecraft.world.effect.MobEffectInstance) -> d
+    902:912:void forceAddEffect(net.minecraft.world.effect.MobEffectInstance) -> e
+    915:915:boolean isInvertedHealAndHarm() -> di
+    920:920:net.minecraft.world.effect.MobEffectInstance removeEffectNoUpdate(net.minecraft.world.effect.MobEffect) -> c
+    924:929:boolean removeEffect(net.minecraft.world.effect.MobEffect) -> d
+    933:937:void onEffectAdded(net.minecraft.world.effect.MobEffectInstance) -> a
+    940:946:void onEffectUpdated(net.minecraft.world.effect.MobEffectInstance,boolean) -> a
+    949:953:void onEffectRemoved(net.minecraft.world.effect.MobEffectInstance) -> b
+    956:960:void heal(float) -> b
+    963:963:float getHealth() -> dj
+    967:968:void setHealth(float) -> c
+    971:971:boolean isDeadOrDying() -> dk
+    976:1127:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    1131:1132:void blockUsingShield(net.minecraft.world.entity.LivingEntity) -> e
+    1135:1136:void blockedByShield(net.minecraft.world.entity.LivingEntity) -> f
+    1139:1167:boolean checkTotemDeathProtection(net.minecraft.world.damagesource.DamageSource) -> f
+    1175:1178:net.minecraft.world.damagesource.DamageSource getLastDamageSource() -> dl
+    1182:1186:void playHurtSound(net.minecraft.world.damagesource.DamageSource) -> c
+    1189:1211:boolean isDamageSourceBlocked(net.minecraft.world.damagesource.DamageSource) -> g
+    1215:1221:void breakItem(net.minecraft.world.item.ItemStack) -> g
+    1224:1252:void die(net.minecraft.world.damagesource.DamageSource) -> a
+    1255:1275:void createWitherRose(net.minecraft.world.entity.LivingEntity) -> g
+    1278:1295:void dropAllDeathLoot(net.minecraft.world.damagesource.DamageSource) -> d
+    1298:1298:void dropEquipment() -> dm
+    1301:1309:void dropExperience() -> dn
+    1312:1312:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
+    1315:1315:net.minecraft.resources.ResourceLocation getLootTable() -> do
+    1319:1325:void dropFromLootTable(net.minecraft.world.damagesource.DamageSource,boolean) -> a
+    1328:1339:net.minecraft.world.level.storage.loot.LootContext$Builder createLootContext(boolean,net.minecraft.world.damagesource.DamageSource) -> a
+    1343:1359:void knockback(float,double,double) -> a
+    1363:1363:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    1368:1368:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    1372:1375:net.minecraft.sounds.SoundEvent getFallDamageSound(int) -> o
+    1380:1380:net.minecraft.sounds.SoundEvent getDrinkingSound(net.minecraft.world.item.ItemStack) -> c
+    1384:1384:net.minecraft.sounds.SoundEvent getEatingSound(net.minecraft.world.item.ItemStack) -> d
+    1389:1393:void setOnGround(boolean) -> c
+    1396:1396:java.util.Optional getLastClimbablePos() -> dq
+    1400:1417:boolean onClimbable() -> c_
+    1421:1421:net.minecraft.world.level.block.state.BlockState getFeetBlockState() -> dr
+    1425:1431:boolean trapdoorUsableAsLadder(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    1439:1439:boolean isAlive() -> aU
+    1444:1453:boolean causeFallDamage(float,float) -> b
+    1457:1459:int calculateFallDamage(float,float) -> e
+    1463:1475:void playBlockFallSound() -> ds
+    1479:1482:void animateHurt() -> bi
+    1490:1490:int getArmorValue() -> dt
+    1494:1494:void hurtArmor(net.minecraft.world.damagesource.DamageSource,float) -> b
+    1497:1497:void hurtCurrentlyUsedShield(float) -> m
+    1500:1504:float getDamageAfterArmorAbsorb(net.minecraft.world.damagesource.DamageSource,float) -> c
+    1508:1538:float getDamageAfterMagicAbsorb(net.minecraft.world.damagesource.DamageSource,float) -> d
+    1542:1565:void actuallyHurt(net.minecraft.world.damagesource.DamageSource,float) -> e
+    1568:1568:net.minecraft.world.damagesource.CombatTracker getCombatTracker() -> du
+    1573:1582:net.minecraft.world.entity.LivingEntity getKillCredit() -> dv
+    1586:1586:float getMaxHealth() -> dw
+    1590:1590:int getArrowCount() -> dx
+    1594:1595:void setArrowCount(int) -> p
+    1598:1598:int getStingerCount() -> dy
+    1602:1603:void setStingerCount(int) -> q
+    1606:1612:int getCurrentSwingDuration() -> o
+    1616:1617:void swing(net.minecraft.world.InteractionHand) -> a
+    1620:1636:void swing(net.minecraft.world.InteractionHand,boolean) -> a
+    1640:1741:void handleEntityEvent(byte) -> a
+    1744:1747:void swapHandItems() -> p
+    1751:1752:void outOfWorld() -> ai
+    1755:1767:void updateSwingTime() -> dz
+    1771:1771:net.minecraft.world.entity.ai.attributes.AttributeInstance getAttribute(net.minecraft.world.entity.ai.attributes.Attribute) -> a
+    1775:1775:double getAttributeValue(net.minecraft.world.entity.ai.attributes.Attribute) -> b
+    1779:1779:double getAttributeBaseValue(net.minecraft.world.entity.ai.attributes.Attribute) -> c
+    1783:1783:net.minecraft.world.entity.ai.attributes.AttributeMap getAttributes() -> dA
+    1787:1787:net.minecraft.world.entity.MobType getMobType() -> dB
+    1791:1791:net.minecraft.world.item.ItemStack getMainHandItem() -> dC
+    1795:1795:net.minecraft.world.item.ItemStack getOffhandItem() -> dD
+    1799:1799:boolean isHolding(net.minecraft.world.item.Item) -> a
+    1803:1803:boolean isHolding(java.util.function.Predicate) -> a
+    java.lang.Iterable getHandSlots() -> bj
+    1810:1815:net.minecraft.world.item.ItemStack getItemInHand(net.minecraft.world.InteractionHand) -> b
+    1820:1827:void setItemInHand(net.minecraft.world.InteractionHand,net.minecraft.world.item.ItemStack) -> a
+    1830:1830:boolean hasItemInSlot(net.minecraft.world.entity.EquipmentSlot) -> a
+    java.lang.Iterable getArmorSlots() -> bk
     net.minecraft.world.item.ItemStack getItemBySlot(net.minecraft.world.entity.EquipmentSlot) -> b
     void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
-    1668:1678:float getArmorCoverPercentage() -> dl
-    1683:1692:void setSprinting(boolean) -> f
-    1695:1695:float getSoundVolume() -> dm
-    1699:1702:float getVoicePitch() -> dn
-    1706:1706:boolean isImmobile() -> do
-    1711:1714:void push(net.minecraft.world.entity.Entity) -> i
-    1717:1818:void findStandUpPosition(net.minecraft.world.entity.Entity) -> a
-    1822:1822:boolean shouldShowName() -> bP
-    1826:1826:float getJumpPower() -> dp
-    1830:1849:void jumpFromGround() -> dq
-    1852:1853:void goDownInWater() -> dr
-    1856:1857:void jumpInLiquid(net.minecraft.tags.Tag) -> c
-    1860:1860:float getWaterSlowDown() -> ds
-    1864:2054:void travel(net.minecraft.world.phys.Vec3) -> e
-    2057:2071:net.minecraft.world.phys.Vec3 handleOnClimbable(net.minecraft.world.phys.Vec3) -> f
-    2075:2078:float getFrictionInfluencedSpeed(float) -> r
-    2083:2083:float getSpeed() -> dt
-    2087:2088:void setSpeed(float) -> o
-    2091:2092:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    2097:2252:void tick() -> h
-    2255:2275:float tickHeadTurn(float,float) -> f
-    2279:2370:void aiStep() -> k
-    2373:2391:void updateFallFlying() -> n
-    2394:2394:void serverAiStep() -> du
-    2397:2417:void pushEntities() -> dv
-    2420:2438:void checkAutoSpinAttack(net.minecraft.world.phys.AABB,net.minecraft.world.phys.AABB) -> a
-    2441:2442:void doPush(net.minecraft.world.entity.Entity) -> C
-    2445:2445:void doAutoAttackOnTouch(net.minecraft.world.entity.LivingEntity) -> g
-    2448:2452:void startAutoSpinAttack(int) -> r
-    2455:2455:boolean isAutoSpinAttack() -> dw
-    2460:2465:void stopRiding() -> j
-    2469:2473:void rideTick() -> aQ
-    2477:2484:void lerpTo(double,double,double,float,float,int,boolean) -> a
-    2488:2491:void lerpHeadTo(float,int) -> a
-    2494:2495:void setJumping(boolean) -> a_
-    2498:2503:void take(net.minecraft.world.entity.Entity,int) -> a
-    2506:2508:boolean canSee(net.minecraft.world.entity.Entity) -> D
-    2513:2516:float getViewYRot(float) -> h
-    2520:2524:float getAttackAnim(float) -> p
-    2528:2528:boolean isEffectiveAi() -> dx
-    2533:2533:boolean isPickable() -> aK
-    2538:2538:boolean isPushable() -> aL
-    2543:2544:void markHurt() -> aJ
-    2548:2548:float getYHeadRot() -> bz
-    2553:2554:void setYHeadRot(float) -> k
-    2558:2559:void setYBodyRot(float) -> l
-    2562:2562:float getAbsorptionAmount() -> dy
-    2566:2570:void setAbsorptionAmount(float) -> q
-    2573:2573:void onEnterCombat() -> e
-    2576:2576:void onLeaveCombat() -> f
-    2579:2580:void updateEffectVisibility() -> dz
-    net.minecraft.world.entity.HumanoidArm getMainArm() -> dA
-    2585:2585:boolean isUsingItem() -> dB
-    2589:2589:net.minecraft.world.InteractionHand getUsedItemHand() -> dC
-    2593:2607:void updatingUsingItem() -> o
-    2610:2615:boolean shouldTriggerItemUseEffects() -> p
-    2619:2625:void updateSwimAmount() -> r
-    2628:2635:void setLivingEntityFlag(int,boolean) -> c
-    2638:2650:void startUsingItem(net.minecraft.world.InteractionHand) -> c
-    2654:2672:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    2676:2680:void lookAt(net.minecraft.commands.arguments.EntityAnchorArgument$Anchor,net.minecraft.world.phys.Vec3) -> a
-    2683:2695:void triggerItemUseEffects(net.minecraft.world.item.ItemStack,int) -> b
-    2698:2710:void spawnItemParticles(net.minecraft.world.item.ItemStack,int) -> a
-    2713:2724:void completeUsingItem() -> q
-    2727:2727:net.minecraft.world.item.ItemStack getUseItem() -> dD
-    2731:2731:int getUseItemRemainingTicks() -> dE
-    2735:2738:int getTicksUsingItem() -> dF
-    2742:2749:void releaseUsingItem() -> dG
-    2752:2757:void stopUsingItem() -> dH
-    2760:2770:boolean isBlocking() -> dI
-    2774:2774:boolean isSuppressingSlidingDownLadder() -> dJ
-    2778:2778:boolean isFallFlying() -> dK
-    2785:2785:boolean isVisuallySwimming() -> br
-    2789:2789:int getFallFlyingTicks() -> dL
-    2793:2835:boolean randomTeleport(double,double,double,boolean) -> a
-    2839:2839:boolean isAffectedByPotions() -> dM
-    2843:2843:boolean attackable() -> dN
-    2847:2847:void setRecordPlayingNearby(net.minecraft.core.BlockPos,boolean) -> a
-    2850:2850:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
-    2855:2855:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    2860:2860:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
-    2864:2864:java.util.Optional getSleepingPos() -> dO
-    2868:2869:void setSleepingPos(net.minecraft.core.BlockPos) -> d
-    2872:2873:void clearSleepingPos() -> dP
-    2876:2876:boolean isSleeping() -> dQ
-    2880:2894:void startSleeping(net.minecraft.core.BlockPos) -> e
-    2897:2898:void setPosToBed(net.minecraft.core.BlockPos) -> a
-    2901:2901:boolean checkBedExists() -> s
-    2905:2920:void stopSleeping() -> dR
-    2924:2925:net.minecraft.core.Direction getBedOrientation() -> dS
-    2930:2930:boolean isInWall() -> aP
-    2935:2935:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
-    2939:2939:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    2943:2943:net.minecraft.world.item.ItemStack getProjectile(net.minecraft.world.item.ItemStack) -> f
-    2947:2955:net.minecraft.world.item.ItemStack eat(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack) -> a
-    2959:2968:void addEatEffect(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-    2971:2985:byte entityEventForEquipmentBreak(net.minecraft.world.entity.EquipmentSlot) -> d
-    2990:2991:void broadcastBreakEvent(net.minecraft.world.entity.EquipmentSlot) -> c
-    2994:2995:void broadcastBreakEvent(net.minecraft.world.InteractionHand) -> d
-    2906:2916:void lambda$stopSleeping$6(net.minecraft.core.BlockPos) -> f
-    2911:2912:net.minecraft.world.phys.Vec3 lambda$null$5(net.minecraft.core.BlockPos) -> g
-    2901:2901:java.lang.Boolean lambda$checkBedExists$4(net.minecraft.core.BlockPos) -> h
-    2380:2380:void lambda$updateFallFlying$3(net.minecraft.world.entity.LivingEntity) -> h
-    871:871:void lambda$hurt$2(net.minecraft.world.entity.LivingEntity) -> i
-    614:614:void lambda$tickEffects$1(net.minecraft.world.effect.MobEffectInstance) -> e
-    539:542:void lambda$addAdditionalSaveData$0(net.minecraft.nbt.CompoundTag,net.minecraft.core.BlockPos) -> a
-    110:136:void <clinit>() -> <clinit>
-net.minecraft.world.entity.LivingEntity$1 -> akz$1:
+    1842:1852:float getArmorCoverPercentage() -> dE
+    1857:1866:void setSprinting(boolean) -> g
+    1869:1869:float getSoundVolume() -> dF
+    1873:1876:float getVoicePitch() -> dG
+    1880:1880:boolean isImmobile() -> dH
+    1885:1888:void push(net.minecraft.world.entity.Entity) -> i
+    1892:1899:void dismountVehicle(net.minecraft.world.entity.Entity) -> a
+    1903:1903:boolean shouldShowName() -> bX
+    1907:1907:float getJumpPower() -> dI
+    1911:1930:void jumpFromGround() -> dJ
+    1933:1934:void goDownInWater() -> dK
+    1937:1938:void jumpInLiquid(net.minecraft.tags.Tag) -> c
+    1941:1941:float getWaterSlowDown() -> dL
+    1945:1945:boolean canStandOnFluid(net.minecraft.world.level.material.Fluid) -> a
+    1949:2121:void travel(net.minecraft.world.phys.Vec3) -> f
+    2124:2136:void calculateEntityAnimation(net.minecraft.world.entity.LivingEntity,boolean) -> a
+    2139:2148:net.minecraft.world.phys.Vec3 handleRelativeFrictionAndCalculateMovement(net.minecraft.world.phys.Vec3,float) -> a
+    2152:2162:net.minecraft.world.phys.Vec3 getFluidFallingAdjustedMovement(double,boolean,net.minecraft.world.phys.Vec3) -> a
+    2166:2180:net.minecraft.world.phys.Vec3 handleOnClimbable(net.minecraft.world.phys.Vec3) -> g
+    2184:2187:float getFrictionInfluencedSpeed(float) -> q
+    2192:2192:float getSpeed() -> dM
+    2196:2197:void setSpeed(float) -> n
+    2200:2201:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    2206:2330:void tick() -> j
+    2333:2342:void detectEquipmentUpdates() -> q
+    2346:2375:java.util.Map collectEquipmentChanges() -> r
+    2380:2392:void handleHandSwap(java.util.Map) -> a
+    2395:2410:void handleEquipmentChanges(java.util.Map) -> b
+    2413:2413:net.minecraft.world.item.ItemStack getLastArmorItem(net.minecraft.world.entity.EquipmentSlot) -> d
+    2417:2418:void setLastArmorItem(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> b
+    2421:2421:net.minecraft.world.item.ItemStack getLastHandItem(net.minecraft.world.entity.EquipmentSlot) -> e
+    2425:2426:void setLastHandItem(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> c
+    2429:2449:float tickHeadTurn(float,float) -> f
+    2453:2559:void aiStep() -> k
+    2565:2565:boolean isSensitiveToWater() -> dN
+    2569:2587:void updateFallFlying() -> t
+    2590:2590:void serverAiStep() -> dO
+    2593:2613:void pushEntities() -> dP
+    2616:2634:void checkAutoSpinAttack(net.minecraft.world.phys.AABB,net.minecraft.world.phys.AABB) -> a
+    2637:2638:void doPush(net.minecraft.world.entity.Entity) -> C
+    2641:2641:void doAutoAttackOnTouch(net.minecraft.world.entity.LivingEntity) -> h
+    2644:2648:void startAutoSpinAttack(int) -> r
+    2651:2651:boolean isAutoSpinAttack() -> dQ
+    2656:2661:void stopRiding() -> l
+    2665:2669:void rideTick() -> aW
+    2673:2680:void lerpTo(double,double,double,float,float,int,boolean) -> a
+    2684:2687:void lerpHeadTo(float,int) -> a
+    2690:2691:void setJumping(boolean) -> o
+    2694:2698:void onItemPickup(net.minecraft.world.entity.item.ItemEntity) -> a
+    2701:2706:void take(net.minecraft.world.entity.Entity,int) -> a
+    2709:2711:boolean canSee(net.minecraft.world.entity.Entity) -> D
+    2716:2719:float getViewYRot(float) -> h
+    2723:2727:float getAttackAnim(float) -> o
+    2731:2731:boolean isEffectiveAi() -> dR
+    2736:2736:boolean isPickable() -> aQ
+    2741:2741:boolean isPushable() -> aR
+    2746:2747:void markHurt() -> aP
+    2751:2751:float getYHeadRot() -> bG
+    2756:2757:void setYHeadRot(float) -> k
+    2761:2762:void setYBodyRot(float) -> l
+    2765:2765:float getAbsorptionAmount() -> dS
+    2769:2773:void setAbsorptionAmount(float) -> p
+    2776:2776:void onEnterCombat() -> g
+    2779:2779:void onLeaveCombat() -> h
+    2782:2783:void updateEffectVisibility() -> dT
+    net.minecraft.world.entity.HumanoidArm getMainArm() -> dU
+    2788:2788:boolean isUsingItem() -> dV
+    2792:2792:net.minecraft.world.InteractionHand getUsedItemHand() -> dW
+    2796:2811:void updatingUsingItem() -> u
+    2814:2819:boolean shouldTriggerItemUseEffects() -> v
+    2823:2829:void updateSwimAmount() -> x
+    2832:2839:void setLivingEntityFlag(int,boolean) -> c
+    2842:2854:void startUsingItem(net.minecraft.world.InteractionHand) -> c
+    2858:2876:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    2880:2884:void lookAt(net.minecraft.commands.arguments.EntityAnchorArgument$Anchor,net.minecraft.world.phys.Vec3) -> a
+    2887:2899:void triggerItemUseEffects(net.minecraft.world.item.ItemStack,int) -> b
+    2902:2914:void spawnItemParticles(net.minecraft.world.item.ItemStack,int) -> a
+    2917:2928:void completeUsingItem() -> s
+    2931:2931:net.minecraft.world.item.ItemStack getUseItem() -> dX
+    2935:2935:int getUseItemRemainingTicks() -> dY
+    2939:2942:int getTicksUsingItem() -> dZ
+    2946:2953:void releaseUsingItem() -> ea
+    2956:2961:void stopUsingItem() -> eb
+    2964:2974:boolean isBlocking() -> ec
+    2978:2978:boolean isSuppressingSlidingDownLadder() -> ed
+    2982:2982:boolean isFallFlying() -> ee
+    2989:2989:boolean isVisuallySwimming() -> by
+    2993:2993:int getFallFlyingTicks() -> ef
+    2997:3039:boolean randomTeleport(double,double,double,boolean) -> a
+    3043:3043:boolean isAffectedByPotions() -> eg
+    3047:3047:boolean attackable() -> eh
+    3051:3051:void setRecordPlayingNearby(net.minecraft.core.BlockPos,boolean) -> a
+    3054:3054:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
+    3059:3059:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    3064:3064:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
+    3068:3068:com.google.common.collect.ImmutableList getDismountPoses() -> ei
+    3072:3073:net.minecraft.world.phys.AABB getLocalBoundsForPose(net.minecraft.world.entity.Pose) -> f
+    3080:3080:java.util.Optional getSleepingPos() -> ej
+    3084:3085:void setSleepingPos(net.minecraft.core.BlockPos) -> e
+    3088:3089:void clearSleepingPos() -> ek
+    3092:3092:boolean isSleeping() -> el
+    3096:3110:void startSleeping(net.minecraft.core.BlockPos) -> b
+    3113:3114:void setPosToBed(net.minecraft.core.BlockPos) -> a
+    3117:3117:boolean checkBedExists() -> z
+    3121:3138:void stopSleeping() -> em
+    3142:3143:net.minecraft.core.Direction getBedOrientation() -> en
+    3148:3148:boolean isInWall() -> aV
+    3153:3153:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
+    3157:3157:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    3161:3161:net.minecraft.world.item.ItemStack getProjectile(net.minecraft.world.item.ItemStack) -> f
+    3165:3173:net.minecraft.world.item.ItemStack eat(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack) -> a
+    3177:3186:void addEatEffect(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
+    3189:3203:byte entityEventForEquipmentBreak(net.minecraft.world.entity.EquipmentSlot) -> f
+    3208:3209:void broadcastBreakEvent(net.minecraft.world.entity.EquipmentSlot) -> c
+    3212:3213:void broadcastBreakEvent(net.minecraft.world.InteractionHand) -> d
+    3122:3132:void lambda$stopSleeping$10(net.minecraft.core.BlockPos) -> f
+    3127:3128:net.minecraft.world.phys.Vec3 lambda$null$9(net.minecraft.core.BlockPos) -> g
+    3117:3117:java.lang.Boolean lambda$checkBedExists$8(net.minecraft.core.BlockPos) -> h
+    2576:2576:void lambda$updateFallFlying$7(net.minecraft.world.entity.LivingEntity) -> i
+    2398:2408:void lambda$handleEquipmentChanges$6(java.util.List,net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
+    1799:1799:boolean lambda$isHolding$5(net.minecraft.world.item.Item,net.minecraft.world.item.Item) -> a
+    999:999:void lambda$hurt$4(net.minecraft.world.entity.LivingEntity) -> j
+    725:725:void lambda$tickEffects$3(net.minecraft.world.effect.MobEffectInstance) -> f
+    655:655:void lambda$addAdditionalSaveData$2(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> a
+    649:652:void lambda$addAdditionalSaveData$1(net.minecraft.nbt.CompoundTag,net.minecraft.core.BlockPos) -> a
+    481:481:void lambda$tryAddSoulSpeed$0(net.minecraft.world.entity.LivingEntity) -> k
+    114:141:void <clinit>() -> <clinit>
+net.minecraft.world.entity.LivingEntity$1 -> aoy$1:
     int[] $SwitchMap$net$minecraft$world$entity$EquipmentSlot$Type -> a
     int[] $SwitchMap$net$minecraft$world$entity$EquipmentSlot -> b
-    2126:2971:void <clinit>() -> <clinit>
-net.minecraft.world.entity.Mob -> ala:
+    2349:3189:void <clinit>() -> <clinit>
+net.minecraft.world.entity.Mob -> aoz:
     net.minecraft.network.syncher.EntityDataAccessor DATA_MOB_FLAGS_ID -> b
     int ambientSoundTime -> e
     int xpReward -> f
     net.minecraft.world.entity.ai.control.LookControl lookControl -> g
-    net.minecraft.world.entity.ai.control.MoveControl moveControl -> bp
-    net.minecraft.world.entity.ai.control.JumpControl jumpControl -> bq
+    net.minecraft.world.entity.ai.control.MoveControl moveControl -> bo
+    net.minecraft.world.entity.ai.control.JumpControl jumpControl -> bp
     net.minecraft.world.entity.ai.control.BodyRotationControl bodyRotationControl -> c
-    net.minecraft.world.entity.ai.navigation.PathNavigation navigation -> br
-    net.minecraft.world.entity.ai.goal.GoalSelector goalSelector -> bs
-    net.minecraft.world.entity.ai.goal.GoalSelector targetSelector -> bt
+    net.minecraft.world.entity.ai.navigation.PathNavigation navigation -> bq
+    net.minecraft.world.entity.ai.goal.GoalSelector goalSelector -> br
+    net.minecraft.world.entity.ai.goal.GoalSelector targetSelector -> bs
     net.minecraft.world.entity.LivingEntity target -> d
-    net.minecraft.world.entity.ai.sensing.Sensing sensing -> bw
-    net.minecraft.core.NonNullList handItems -> bx
-    float[] handDropChances -> bu
-    net.minecraft.core.NonNullList armorItems -> by
-    float[] armorDropChances -> bv
-    boolean canPickUpLoot -> bz
-    boolean persistenceRequired -> bA
-    java.util.Map pathfindingMalus -> bB
-    net.minecraft.resources.ResourceLocation lootTable -> bC
-    long lootTableSeed -> bD
-    net.minecraft.world.entity.Entity leashHolder -> bE
-    int delayedLeashHolderId -> bF
-    net.minecraft.nbt.CompoundTag leashInfoTag -> bG
-    net.minecraft.core.BlockPos restrictCenter -> bH
-    float restrictRadius -> bI
-    94:133:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    136:136:void registerGoals() -> n
-    140:144:void registerAttributes() -> cA
-    147:147:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
-    151:152:float getPathfindingMalus(net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
-    156:157:void setPathfindingMalus(net.minecraft.world.level.pathfinder.BlockPathTypes,float) -> a
-    160:160:net.minecraft.world.entity.ai.control.BodyRotationControl createBodyControl() -> o
-    164:164:net.minecraft.world.entity.ai.control.LookControl getLookControl() -> p
-    168:172:net.minecraft.world.entity.ai.control.MoveControl getMoveControl() -> r
-    176:176:net.minecraft.world.entity.ai.control.JumpControl getJumpControl() -> s
-    180:184:net.minecraft.world.entity.ai.navigation.PathNavigation getNavigation() -> u
-    188:188:net.minecraft.world.entity.ai.sensing.Sensing getSensing() -> v
-    193:193:net.minecraft.world.entity.LivingEntity getTarget() -> w
-    197:198:void setTarget(net.minecraft.world.entity.LivingEntity) -> h
-    202:202:boolean canAttackType(net.minecraft.world.entity.EntityType) -> a
-    207:207:void ate() -> z
-    211:213:void defineSynchedData() -> w_
-    216:216:int getAmbientSoundInterval() -> A
-    220:224:void playAmbientSound() -> B
-    228:236:void baseTick() -> aa
-    240:242:void playHurtSound(net.minecraft.world.damagesource.DamageSource) -> c
-    245:246:void resetAmbientSoundTime() -> l
-    250:266:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
-    271:282:void spawnAnim() -> D
-    286:291:void handleEntityEvent(byte) -> a
-    295:304:void tick() -> h
-    310:315:void updateControlFlags() -> F
-    319:320:float tickHeadTurn(float,float) -> f
-    325:325:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    330:396:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    400:447:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    451:453:void dropFromLootTable(net.minecraft.world.damagesource.DamageSource,boolean) -> a
-    457:458:net.minecraft.world.level.storage.loot.LootContext$Builder createLootContext(boolean,net.minecraft.world.damagesource.DamageSource) -> a
-    463:463:net.minecraft.resources.ResourceLocation getLootTable() -> cW
-    467:467:net.minecraft.resources.ResourceLocation getDefaultLootTable() -> H
-    471:472:void setZza(float) -> r
-    475:476:void setYya(float) -> s
-    479:480:void setXxa(float) -> t
-    484:486:void setSpeed(float) -> o
-    490:504:void aiStep() -> k
-    507:532:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> a
-    535:573:boolean canReplaceCurrentItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.EquipmentSlot) -> a
-    577:577:boolean canHoldItem(net.minecraft.world.item.ItemStack) -> g
-    581:581:boolean removeWhenFarAway(double) -> h
-    585:585:boolean requiresCustomPersistence() -> I
-    589:589:boolean shouldDespawnInPeaceful() -> J
-    594:617:void checkDespawn() -> cy
-    622:655:void serverAiStep() -> du
-    658:659:void sendDebugPackets() -> K
-    662:662:void customServerAiStep() -> dT
-    665:665:int getMaxHeadXRot() -> dU
-    672:672:int getMaxHeadYRot() -> dV
-    679:679:int getHeadRotSpeed() -> dW
-    683:700:void lookAt(net.minecraft.world.entity.Entity,float,float) -> a
-    703:710:float rotlerp(float,float,float) -> a
-    714:715:boolean checkMobSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> a
-    719:719:boolean checkSpawnRules(net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType) -> a
-    723:723:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
-    727:727:int getMaxSpawnClusterSize() -> dX
-    731:731:boolean isMaxGroupSizeReached(int) -> c
-    736:744:int getMaxFallDistance() -> bD
-    749:749:java.lang.Iterable getHandSlots() -> bc
-    754:754:java.lang.Iterable getArmorSlots() -> bd
-    759:765:net.minecraft.world.item.ItemStack getItemBySlot(net.minecraft.world.entity.EquipmentSlot) -> b
-    770:778:void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
-    782:794:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
-    798:810:float getEquipmentDropChance(net.minecraft.world.entity.EquipmentSlot) -> d
-    814:845:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
-    848:865:net.minecraft.world.entity.EquipmentSlot getEquipmentSlotForItem(net.minecraft.world.item.ItemStack) -> h
-    870:937:net.minecraft.world.item.Item getEquipmentForSlot(net.minecraft.world.entity.EquipmentSlot,int) -> a
-    941:956:void populateDefaultEquipmentEnchantments(net.minecraft.world.DifficultyInstance) -> b
-    960:968:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    972:972:boolean canBeControlledByRider() -> dY
-    976:977:void setPersistenceRequired() -> dZ
-    980:988:void setDropChance(net.minecraft.world.entity.EquipmentSlot,float) -> a
-    991:991:boolean canPickUpLoot() -> ea
-    995:996:void setCanPickUpLoot(boolean) -> n
-    1000:1001:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
-    1005:1005:boolean isPersistenceRequired() -> eb
-    1010:1032:boolean interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
-    1036:1036:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    1043:1043:boolean isWithinRestriction() -> ec
-    1047:1050:boolean isWithinRestriction(net.minecraft.core.BlockPos) -> a
-    1054:1056:void restrictTo(net.minecraft.core.BlockPos,int) -> a
-    1059:1059:net.minecraft.core.BlockPos getRestrictCenter() -> ed
-    1063:1063:float getRestrictRadius() -> ee
-    1067:1068:void clearRestriction() -> ef
-    1071:1071:boolean hasRestriction() -> eg
-    1075:1084:void tickLeash() -> eh
-    1087:1102:void dropLeash(boolean,boolean) -> a
-    1105:1105:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
-    1109:1109:boolean isLeashed() -> ei
-    1115:1118:net.minecraft.world.entity.Entity getLeashHolder() -> ej
-    1122:1136:void setLeashedTo(net.minecraft.world.entity.Entity,boolean) -> b
-    1139:1141:void setDelayedLeashHolderId(int) -> d
-    1145:1150:boolean startRiding(net.minecraft.world.entity.Entity,boolean) -> a
-    1155:1170:void restoreLeashFromSave() -> eo
-    1175:1196:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
-    1201:1201:boolean isControlledByLocalInstance() -> cj
-    1205:1206:boolean isValidSlotForItem(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> b
-    1214:1214:boolean isEffectiveAi() -> dx
-    1218:1220:void setNoAi(boolean) -> o
-    1223:1225:void setLeftHanded(boolean) -> p
-    1228:1230:void setAggressive(boolean) -> q
-    1233:1233:boolean isNoAi() -> ek
-    1237:1237:boolean isLeftHanded() -> el
-    1241:1241:boolean isAggressive() -> em
-    1246:1246:net.minecraft.world.entity.HumanoidArm getMainArm() -> dA
-    1251:1255:boolean canAttack(net.minecraft.world.entity.LivingEntity) -> c
-    1266:1310:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    1314:1321:boolean isSunBurnTick() -> en
-    1326:1331:void jumpInLiquid(net.minecraft.tags.Tag) -> c
-    1334:1334:boolean isHolding(net.minecraft.world.item.Item) -> a
-    72:72:void <clinit>() -> <clinit>
-net.minecraft.world.entity.Mob$1 -> ala$1:
+    net.minecraft.world.entity.ai.sensing.Sensing sensing -> bv
+    net.minecraft.core.NonNullList handItems -> bw
+    float[] handDropChances -> bt
+    net.minecraft.core.NonNullList armorItems -> bx
+    float[] armorDropChances -> bu
+    boolean canPickUpLoot -> by
+    boolean persistenceRequired -> bz
+    java.util.Map pathfindingMalus -> bA
+    net.minecraft.resources.ResourceLocation lootTable -> bB
+    long lootTableSeed -> bC
+    net.minecraft.world.entity.Entity leashHolder -> bD
+    int delayedLeashHolderId -> bE
+    net.minecraft.nbt.CompoundTag leashInfoTag -> bF
+    net.minecraft.core.BlockPos restrictCenter -> bG
+    float restrictRadius -> bH
+    102:141:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    144:144:void registerGoals() -> o
+    147:149:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createMobAttributes() -> p
+    153:153:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
+    166:166:boolean shouldPassengersInheritMalus() -> q
+    174:181:float getPathfindingMalus(net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
+    185:186:void setPathfindingMalus(net.minecraft.world.level.pathfinder.BlockPathTypes,float) -> a
+    195:195:boolean canCutCorner(net.minecraft.world.level.pathfinder.BlockPathTypes) -> b
+    199:199:net.minecraft.world.entity.ai.control.BodyRotationControl createBodyControl() -> r
+    203:203:net.minecraft.world.entity.ai.control.LookControl getLookControl() -> t
+    207:211:net.minecraft.world.entity.ai.control.MoveControl getMoveControl() -> u
+    215:215:net.minecraft.world.entity.ai.control.JumpControl getJumpControl() -> v
+    219:223:net.minecraft.world.entity.ai.navigation.PathNavigation getNavigation() -> x
+    227:227:net.minecraft.world.entity.ai.sensing.Sensing getSensing() -> z
+    232:232:net.minecraft.world.entity.LivingEntity getTarget() -> A
+    236:237:void setTarget(net.minecraft.world.entity.LivingEntity) -> i
+    241:241:boolean canAttackType(net.minecraft.world.entity.EntityType) -> a
+    245:245:boolean canFireProjectileWeapon(net.minecraft.world.item.ProjectileWeaponItem) -> a
+    250:250:void ate() -> B
+    254:256:void defineSynchedData() -> e
+    259:259:int getAmbientSoundInterval() -> D
+    263:267:void playAmbientSound() -> F
+    271:279:void baseTick() -> ad
+    283:285:void playHurtSound(net.minecraft.world.damagesource.DamageSource) -> c
+    288:289:void resetAmbientSoundTime() -> eJ
+    293:309:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
+    314:325:void spawnAnim() -> G
+    329:334:void handleEntityEvent(byte) -> a
+    338:347:void tick() -> j
+    353:358:void updateControlFlags() -> H
+    362:363:float tickHeadTurn(float,float) -> f
+    373:373:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    378:444:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    448:495:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    499:501:void dropFromLootTable(net.minecraft.world.damagesource.DamageSource,boolean) -> a
+    505:506:net.minecraft.world.level.storage.loot.LootContext$Builder createLootContext(boolean,net.minecraft.world.damagesource.DamageSource) -> a
+    511:511:net.minecraft.resources.ResourceLocation getLootTable() -> do
+    515:515:net.minecraft.resources.ResourceLocation getDefaultLootTable() -> J
+    519:520:void setZza(float) -> q
+    523:524:void setYya(float) -> r
+    527:528:void setXxa(float) -> s
+    532:534:void setSpeed(float) -> n
+    538:554:void aiStep() -> k
+    560:566:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> b
+    569:582:boolean equipItemIfPossible(net.minecraft.world.item.ItemStack) -> g
+    586:589:void setItemSlotAndDropWhenKilled(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> b
+    592:600:void setGuaranteedDrop(net.minecraft.world.entity.EquipmentSlot) -> d
+    603:651:boolean canReplaceCurrentItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    655:661:boolean canReplaceEqualItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> b
+    666:666:boolean canHoldItem(net.minecraft.world.item.ItemStack) -> h
+    671:671:boolean wantsToPickUp(net.minecraft.world.item.ItemStack) -> i
+    675:675:boolean removeWhenFarAway(double) -> h
+    679:679:boolean requiresCustomPersistence() -> K
+    683:683:boolean shouldDespawnInPeaceful() -> L
+    688:716:void checkDespawn() -> cH
+    721:754:void serverAiStep() -> dO
+    757:758:void sendDebugPackets() -> M
+    761:761:void customServerAiStep() -> N
+    764:764:int getMaxHeadXRot() -> eo
+    771:771:int getMaxHeadYRot() -> ep
+    778:778:int getHeadRotSpeed() -> eq
+    782:799:void lookAt(net.minecraft.world.entity.Entity,float,float) -> a
+    802:809:float rotlerp(float,float,float) -> a
+    813:814:boolean checkMobSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> a
+    818:818:boolean checkSpawnRules(net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType) -> a
+    822:822:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
+    826:826:int getMaxSpawnClusterSize() -> er
+    830:830:boolean isMaxGroupSizeReached(int) -> c
+    835:843:int getMaxFallDistance() -> bL
+    848:848:java.lang.Iterable getHandSlots() -> bj
+    853:853:java.lang.Iterable getArmorSlots() -> bk
+    858:864:net.minecraft.world.item.ItemStack getItemBySlot(net.minecraft.world.entity.EquipmentSlot) -> b
+    869:877:void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
+    881:893:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
+    897:909:float getEquipmentDropChance(net.minecraft.world.entity.EquipmentSlot) -> e
+    913:944:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
+    947:964:net.minecraft.world.entity.EquipmentSlot getEquipmentSlotForItem(net.minecraft.world.item.ItemStack) -> j
+    969:1036:net.minecraft.world.item.Item getEquipmentForSlot(net.minecraft.world.entity.EquipmentSlot,int) -> a
+    1040:1055:void populateDefaultEquipmentEnchantments(net.minecraft.world.DifficultyInstance) -> b
+    1059:1067:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    1071:1071:boolean canBeControlledByRider() -> es
+    1075:1076:void setPersistenceRequired() -> et
+    1079:1087:void setDropChance(net.minecraft.world.entity.EquipmentSlot,float) -> a
+    1090:1090:boolean canPickUpLoot() -> eu
+    1094:1095:void setCanPickUpLoot(boolean) -> p
+    1099:1100:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
+    1104:1104:boolean isPersistenceRequired() -> ev
+    1109:1128:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    1134:1159:net.minecraft.world.InteractionResult checkAndHandleImportantInteractions(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> c
+    1163:1163:void onOffspringSpawnedFromEgg(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Mob) -> a
+    1166:1166:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    1171:1171:boolean isWithinRestriction() -> ew
+    1175:1178:boolean isWithinRestriction(net.minecraft.core.BlockPos) -> a
+    1182:1184:void restrictTo(net.minecraft.core.BlockPos,int) -> a
+    1187:1187:net.minecraft.core.BlockPos getRestrictCenter() -> ex
+    1191:1191:float getRestrictRadius() -> ey
+    1195:1196:void clearRestriction() -> ez
+    1199:1199:boolean hasRestriction() -> eA
+    1204:1232:net.minecraft.world.entity.Mob convertTo(net.minecraft.world.entity.EntityType) -> b
+    1236:1245:void tickLeash() -> eB
+    1248:1264:void dropLeash(boolean,boolean) -> a
+    1267:1267:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
+    1271:1271:boolean isLeashed() -> eC
+    1277:1280:net.minecraft.world.entity.Entity getLeashHolder() -> eD
+    1284:1299:void setLeashedTo(net.minecraft.world.entity.Entity,boolean) -> b
+    1302:1304:void setDelayedLeashHolderId(int) -> d
+    1308:1313:boolean startRiding(net.minecraft.world.entity.Entity,boolean) -> a
+    1319:1338:void restoreLeashFromSave() -> eK
+    1343:1364:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
+    1369:1369:boolean isControlledByLocalInstance() -> cr
+    1373:1374:boolean isValidSlotForItem(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> c
+    1382:1382:boolean isEffectiveAi() -> dR
+    1386:1388:void setNoAi(boolean) -> q
+    1391:1393:void setLeftHanded(boolean) -> r
+    1396:1398:void setAggressive(boolean) -> s
+    1401:1401:boolean isNoAi() -> eE
+    1405:1405:boolean isLeftHanded() -> eF
+    1409:1409:boolean isAggressive() -> eG
+    1414:1414:void setBaby(boolean) -> a
+    1418:1418:net.minecraft.world.entity.HumanoidArm getMainArm() -> dU
+    1423:1427:boolean canAttack(net.minecraft.world.entity.LivingEntity) -> d
+    1438:1472:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    1476:1484:void maybeDisableShield(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    1487:1494:boolean isSunBurnTick() -> eH
+    1499:1504:void jumpInLiquid(net.minecraft.tags.Tag) -> c
+    1507:1509:void removeFreeWill() -> eI
+    1513:1516:void removeAfterChangingDimensions() -> bJ
+    1153:1153:void lambda$checkAndHandleImportantInteractions$2(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Mob) -> b
+    659:659:boolean lambda$canReplaceEqualItem$1(java.lang.String) -> c
+    659:659:boolean lambda$canReplaceEqualItem$0(java.lang.String) -> d
+    79:79:void <clinit>() -> <clinit>
+net.minecraft.world.entity.Mob$1 -> aoz$1:
     int[] $SwitchMap$net$minecraft$world$entity$EquipmentSlot$Type -> a
     int[] $SwitchMap$net$minecraft$world$entity$EquipmentSlot -> b
-    520:870:void <clinit>() -> <clinit>
-net.minecraft.world.entity.MobCategory -> alb:
+    592:969:void <clinit>() -> <clinit>
+net.minecraft.world.entity.MobCategory -> apa:
     net.minecraft.world.entity.MobCategory MONSTER -> a
     net.minecraft.world.entity.MobCategory CREATURE -> b
     net.minecraft.world.entity.MobCategory AMBIENT -> c
     net.minecraft.world.entity.MobCategory WATER_CREATURE -> d
-    net.minecraft.world.entity.MobCategory MISC -> e
-    java.util.Map BY_NAME -> f
-    int max -> g
-    boolean isFriendly -> h
-    boolean isPersistent -> i
-    java.lang.String name -> j
-    net.minecraft.world.entity.MobCategory[] $VALUES -> k
-    7:7:net.minecraft.world.entity.MobCategory[] values() -> values
-    7:7:net.minecraft.world.entity.MobCategory valueOf(java.lang.String) -> valueOf
-    21:26:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean) -> <init>
-    29:29:java.lang.String getName() -> a
-    33:33:net.minecraft.world.entity.MobCategory byName(java.lang.String) -> a
-    37:37:int getMaxInstancesPerChunk() -> b
-    41:41:boolean isFriendly() -> c
-    45:45:boolean isPersistent() -> d
-    15:15:net.minecraft.world.entity.MobCategory lambda$static$0(net.minecraft.world.entity.MobCategory) -> a
-    7:15:void <clinit>() -> <clinit>
-net.minecraft.world.entity.MobSpawnType -> alc:
+    net.minecraft.world.entity.MobCategory WATER_AMBIENT -> e
+    net.minecraft.world.entity.MobCategory MISC -> f
+    com.mojang.serialization.Codec CODEC -> g
+    java.util.Map BY_NAME -> h
+    int max -> i
+    boolean isFriendly -> j
+    boolean isPersistent -> k
+    java.lang.String name -> l
+    int noDespawnDistance -> m
+    int despawnDistance -> n
+    net.minecraft.world.entity.MobCategory[] $VALUES -> o
+    10:10:net.minecraft.world.entity.MobCategory[] values() -> values
+    10:10:net.minecraft.world.entity.MobCategory valueOf(java.lang.String) -> valueOf
+    26:35:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean,int) -> <init>
+    38:38:java.lang.String getName() -> b
+    43:43:java.lang.String getSerializedName() -> a
+    47:47:net.minecraft.world.entity.MobCategory byName(java.lang.String) -> a
+    51:51:int getMaxInstancesPerChunk() -> c
+    55:55:boolean isFriendly() -> d
+    59:59:boolean isPersistent() -> e
+    63:63:int getDespawnDistance() -> f
+    67:67:int getNoDespawnDistance() -> g
+    21:21:net.minecraft.world.entity.MobCategory lambda$static$0(net.minecraft.world.entity.MobCategory) -> a
+    10:21:void <clinit>() -> <clinit>
+net.minecraft.world.entity.MobSpawnType -> apb:
     net.minecraft.world.entity.MobSpawnType NATURAL -> a
     net.minecraft.world.entity.MobSpawnType CHUNK_GENERATION -> b
     net.minecraft.world.entity.MobSpawnType SPAWNER -> c
@@ -37385,7 +40580,7 @@ net.minecraft.world.entity.MobSpawnType -> alc:
     3:3:net.minecraft.world.entity.MobSpawnType valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:19:void <clinit>() -> <clinit>
-net.minecraft.world.entity.MobType -> ald:
+net.minecraft.world.entity.MobType -> apc:
     net.minecraft.world.entity.MobType UNDEFINED -> a
     net.minecraft.world.entity.MobType UNDEAD -> b
     net.minecraft.world.entity.MobType ARTHROPOD -> c
@@ -37393,7 +40588,7 @@ net.minecraft.world.entity.MobType -> ald:
     net.minecraft.world.entity.MobType WATER -> e
     3:3:void <init>() -> <init>
     4:8:void <clinit>() -> <clinit>
-net.minecraft.world.entity.MoverType -> ale:
+net.minecraft.world.entity.MoverType -> apd:
     net.minecraft.world.entity.MoverType SELF -> a
     net.minecraft.world.entity.MoverType PLAYER -> b
     net.minecraft.world.entity.MoverType PISTON -> c
@@ -37404,27 +40599,47 @@ net.minecraft.world.entity.MoverType -> ale:
     3:3:net.minecraft.world.entity.MoverType valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:8:void <clinit>() -> <clinit>
-net.minecraft.world.entity.OwnableEntity -> alf:
-    java.util.UUID getOwnerUUID() -> C_
-    net.minecraft.world.entity.Entity getOwner() -> D_
-net.minecraft.world.entity.PathfinderMob -> alg:
+net.minecraft.world.entity.NeutralMob -> ape:
+    int getRemainingPersistentAngerTime() -> F_
+    void setRemainingPersistentAngerTime(int) -> a_
+    java.util.UUID getPersistentAngerTarget() -> G_
+    void setPersistentAngerTarget(java.util.UUID) -> a
+    void startPersistentAngerTimer() -> H_
+    57:61:void addPersistentAngerSaveData(net.minecraft.nbt.CompoundTag) -> c
+    67:86:void readPersistentAngerSaveData(net.minecraft.server.level.ServerLevel,net.minecraft.nbt.CompoundTag) -> a
+    92:118:void updatePersistentAnger(net.minecraft.server.level.ServerLevel,boolean) -> a
+    124:132:boolean isAngryAt(net.minecraft.world.entity.LivingEntity) -> b
+    138:138:boolean isAngryAtAllPlayers(net.minecraft.world.level.Level) -> a
+    142:142:boolean isAngry() -> I_
+    146:156:void playerDied(net.minecraft.world.entity.player.Player) -> b
+    162:164:void forgetCurrentTargetAndRefreshUniversalAnger() -> J_
+    167:171:void stopBeingAngry() -> K_
+    net.minecraft.world.entity.LivingEntity getLastHurtByMob() -> cY
+    void setLastHurtByMob(net.minecraft.world.entity.LivingEntity) -> a
+    void setLastHurtByPlayer(net.minecraft.world.entity.player.Player) -> e
+    void setTarget(net.minecraft.world.entity.LivingEntity) -> i
+    net.minecraft.world.entity.LivingEntity getTarget() -> A
+net.minecraft.world.entity.OwnableEntity -> apf:
+    java.util.UUID getOwnerUUID() -> B_
+    net.minecraft.world.entity.Entity getOwner() -> C_
+net.minecraft.world.entity.PathfinderMob -> apg:
     12:13:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     16:16:float getWalkTargetValue(net.minecraft.core.BlockPos) -> f
     20:20:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
     25:25:boolean checkSpawnRules(net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType) -> a
-    29:29:boolean isPathFinding() -> eo
-    34:74:void tickLeash() -> eh
-    77:77:double followLeashSpeed() -> ep
-    81:81:void onLeashDistance(float) -> u
-net.minecraft.world.entity.PlayerRideable -> alh:
-net.minecraft.world.entity.PlayerRideableJumping -> ali:
-    void onPlayerJump(int) -> a_
-    boolean canJump() -> G_
-    float getJumpRidingScale() -> H_
+    29:29:boolean isPathFinding() -> eJ
+    34:74:void tickLeash() -> eB
+    77:77:double followLeashSpeed() -> eK
+    81:81:void onLeashDistance(float) -> t
+net.minecraft.world.entity.PlayerRideable -> aph:
+net.minecraft.world.entity.PlayerRideableJumping -> api:
+    void onPlayerJump(int) -> b_
+    boolean canJump() -> Q_
+    float getJumpRidingScale() -> R_
     void setJumpRidingScale(float) -> a_
     void handleStartJump(int) -> b
     void handleStopJump() -> c
-net.minecraft.world.entity.Pose -> alj:
+net.minecraft.world.entity.Pose -> apj:
     net.minecraft.world.entity.Pose STANDING -> a
     net.minecraft.world.entity.Pose FALL_FLYING -> b
     net.minecraft.world.entity.Pose SLEEPING -> c
@@ -37437,291 +40652,426 @@ net.minecraft.world.entity.Pose -> alj:
     3:3:net.minecraft.world.entity.Pose valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:10:void <clinit>() -> <clinit>
-net.minecraft.world.entity.PowerableMob -> alk:
-    boolean isPowered() -> J_
-net.minecraft.world.entity.ReputationEventHandler -> all:
+net.minecraft.world.entity.PowerableMob -> apk:
+    boolean isPowered() -> T_
+net.minecraft.world.entity.ReputationEventHandler -> apl:
     void onReputationEventFrom(net.minecraft.world.entity.ai.village.ReputationEventType,net.minecraft.world.entity.Entity) -> a
-net.minecraft.world.entity.SpawnGroupData -> alm:
-net.minecraft.world.entity.SpawnPlacements -> aln:
+net.minecraft.world.entity.Saddleable -> apm:
+    boolean isSaddleable() -> M_
+    void equipSaddle(net.minecraft.sounds.SoundSource) -> a
+    boolean isSaddled() -> N_
+net.minecraft.world.entity.Shearable -> apn:
+    void shear(net.minecraft.sounds.SoundSource) -> a
+    boolean readyForShearing() -> L_
+net.minecraft.world.entity.SpawnGroupData -> apo:
+net.minecraft.world.entity.SpawnPlacements -> app:
     java.util.Map DATA_BY_TYPE -> a
-    36:36:void <init>() -> <init>
-    57:61:void register(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.SpawnPlacements$Type,net.minecraft.world.level.levelgen.Heightmap$Types,net.minecraft.world.entity.SpawnPlacements$SpawnPredicate) -> a
-    134:135:net.minecraft.world.entity.SpawnPlacements$Type getPlacementType(net.minecraft.world.entity.EntityType) -> a
-    139:140:net.minecraft.world.level.levelgen.Heightmap$Types getHeightmapType(net.minecraft.world.entity.EntityType) -> b
-    145:146:boolean checkSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> a
-    54:131:void <clinit>() -> <clinit>
-net.minecraft.world.entity.SpawnPlacements$Data -> aln$a:
+    39:39:void <init>() -> <init>
+    60:64:void register(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.SpawnPlacements$Type,net.minecraft.world.level.levelgen.Heightmap$Types,net.minecraft.world.entity.SpawnPlacements$SpawnPredicate) -> a
+    140:141:net.minecraft.world.entity.SpawnPlacements$Type getPlacementType(net.minecraft.world.entity.EntityType) -> a
+    145:146:net.minecraft.world.level.levelgen.Heightmap$Types getHeightmapType(net.minecraft.world.entity.EntityType) -> b
+    151:152:boolean checkSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> a
+    57:137:void <clinit>() -> <clinit>
+net.minecraft.world.entity.SpawnPlacements$Data -> app$a:
     net.minecraft.world.level.levelgen.Heightmap$Types heightMap -> a
     net.minecraft.world.entity.SpawnPlacements$Type placement -> b
     net.minecraft.world.entity.SpawnPlacements$SpawnPredicate predicate -> c
-    47:51:void <init>(net.minecraft.world.level.levelgen.Heightmap$Types,net.minecraft.world.entity.SpawnPlacements$Type,net.minecraft.world.entity.SpawnPlacements$SpawnPredicate) -> <init>
-    42:42:net.minecraft.world.entity.SpawnPlacements$Type access$000(net.minecraft.world.entity.SpawnPlacements$Data) -> a
-    42:42:net.minecraft.world.level.levelgen.Heightmap$Types access$100(net.minecraft.world.entity.SpawnPlacements$Data) -> b
-    42:42:net.minecraft.world.entity.SpawnPlacements$SpawnPredicate access$200(net.minecraft.world.entity.SpawnPlacements$Data) -> c
-net.minecraft.world.entity.SpawnPlacements$SpawnPredicate -> aln$b:
+    50:54:void <init>(net.minecraft.world.level.levelgen.Heightmap$Types,net.minecraft.world.entity.SpawnPlacements$Type,net.minecraft.world.entity.SpawnPlacements$SpawnPredicate) -> <init>
+    45:45:net.minecraft.world.entity.SpawnPlacements$Type access$000(net.minecraft.world.entity.SpawnPlacements$Data) -> a
+    45:45:net.minecraft.world.level.levelgen.Heightmap$Types access$100(net.minecraft.world.entity.SpawnPlacements$Data) -> b
+    45:45:net.minecraft.world.entity.SpawnPlacements$SpawnPredicate access$200(net.minecraft.world.entity.SpawnPlacements$Data) -> c
+net.minecraft.world.entity.SpawnPlacements$SpawnPredicate -> app$b:
     boolean test(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> test
-net.minecraft.world.entity.SpawnPlacements$Type -> aln$c:
+net.minecraft.world.entity.SpawnPlacements$Type -> app$c:
     net.minecraft.world.entity.SpawnPlacements$Type ON_GROUND -> a
     net.minecraft.world.entity.SpawnPlacements$Type IN_WATER -> b
     net.minecraft.world.entity.SpawnPlacements$Type NO_RESTRICTIONS -> c
-    net.minecraft.world.entity.SpawnPlacements$Type[] $VALUES -> d
-    149:149:net.minecraft.world.entity.SpawnPlacements$Type[] values() -> values
-    149:149:net.minecraft.world.entity.SpawnPlacements$Type valueOf(java.lang.String) -> valueOf
-    149:149:void <init>(java.lang.String,int) -> <init>
-    149:152:void <clinit>() -> <clinit>
-net.minecraft.world.entity.TamableAnimal -> alo:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_FLAGS_ID -> bw
-    net.minecraft.network.syncher.EntityDataAccessor DATA_OWNERUUID_ID -> bx
-    net.minecraft.world.entity.ai.goal.SitGoal sitGoal -> by
-    32:34:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    38:41:void defineSynchedData() -> w_
-    45:52:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    56:76:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    80:80:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
-    84:94:void spawnTamingParticles(boolean) -> r
-    98:105:void handleEntityEvent(byte) -> a
-    108:108:boolean isTame() -> eq
-    112:120:void setTame(boolean) -> s
-    123:123:void reassessTameGoals() -> er
-    126:126:boolean isSitting() -> es
-    130:136:void setSitting(boolean) -> t
-    141:141:java.util.UUID getOwnerUUID() -> C_
-    145:146:void setOwnerUUID(java.util.UUID) -> b
-    149:154:void tame(net.minecraft.world.entity.player.Player) -> e
-    160:166:net.minecraft.world.entity.LivingEntity getOwner() -> et
-    172:175:boolean canAttack(net.minecraft.world.entity.LivingEntity) -> c
-    179:179:boolean isOwnedBy(net.minecraft.world.entity.LivingEntity) -> i
-    183:183:net.minecraft.world.entity.ai.goal.SitGoal getSitGoal() -> eu
-    187:187:boolean wantsToAttack(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    192:198:net.minecraft.world.scores.Team getTeam() -> bv
-    203:212:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
-    217:223:void die(net.minecraft.world.damagesource.DamageSource) -> a
-    25:25:net.minecraft.world.entity.Entity getOwner() -> D_
-    26:27:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.Brain -> alp:
-    java.util.Map memories -> a
-    java.util.Map sensors -> b
-    java.util.Map availableGoalsByPriority -> c
-    net.minecraft.world.entity.schedule.Schedule schedule -> d
-    java.util.Map activityRequirements -> e
-    java.util.Set coreActivities -> f
-    java.util.Set activeActivities -> g
-    net.minecraft.world.entity.schedule.Activity defaultActivity -> h
-    long lastScheduleUpdate -> i
-    44:81:void <init>(java.util.Collection,java.util.Collection,com.mojang.datafixers.Dynamic) -> <init>
-    84:84:boolean hasMemoryValue(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> a
-    88:89:void readMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType,com.mojang.datafixers.Dynamic) -> a
-    92:93:void eraseMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> b
-    100:101:void setMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.lang.Object) -> a
-    108:115:void setMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.util.Optional) -> a
-    119:119:java.util.Optional getMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> c
-    125:125:java.util.Map getMemories() -> a
-    130:137:boolean checkMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.world.entity.ai.memory.MemoryStatus) -> a
-    141:141:net.minecraft.world.entity.schedule.Schedule getSchedule() -> b
-    145:146:void setSchedule(net.minecraft.world.entity.schedule.Schedule) -> a
-    149:150:void setCoreActivities(java.util.Set) -> a
-    153:153:java.util.Set getActiveActivities() -> c
-    159:162:java.util.stream.Stream getRunningBehaviorsStream() -> d
-    166:167:void useDefaultActivity() -> e
-    173:178:void setActivity(net.minecraft.world.entity.schedule.Activity) -> a
-    181:188:void updateActivity(long,long) -> a
-    191:192:void setDefaultActivity(net.minecraft.world.entity.schedule.Activity) -> b
-    195:196:void addActivity(net.minecraft.world.entity.schedule.Activity,com.google.common.collect.ImmutableList) -> a
-    199:207:void addActivity(net.minecraft.world.entity.schedule.Activity,com.google.common.collect.ImmutableList,java.util.Set) -> a
-    210:210:boolean isActive(net.minecraft.world.entity.schedule.Activity) -> c
-    215:217:net.minecraft.world.entity.ai.Brain copyWithoutGoals() -> f
-    221:224:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    227:230:void stopAll(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> b
-    234:244:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    249:250:void tickEachSensor(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> c
-    256:264:void startEachNonRunningBehavior(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> d
-    271:273:void tickEachRunningBehavior(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> e
-    276:277:boolean activityRequirementsAreMet(net.minecraft.world.entity.schedule.Activity) -> d
-    285:285:boolean isEmptyCollection(java.lang.Object) -> a
-    278:280:boolean lambda$activityRequirementsAreMet$19(com.mojang.datafixers.util.Pair) -> a
-    272:272:void lambda$tickEachRunningBehavior$18(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long,net.minecraft.world.entity.ai.behavior.Behavior) -> a
-    263:263:void lambda$startEachNonRunningBehavior$17(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long,net.minecraft.world.entity.ai.behavior.Behavior) -> b
-    262:262:boolean lambda$startEachNonRunningBehavior$16(net.minecraft.world.entity.ai.behavior.Behavior) -> a
-    259:259:boolean lambda$startEachNonRunningBehavior$15(java.util.Map$Entry) -> a
-    258:258:java.util.stream.Stream lambda$startEachNonRunningBehavior$14(java.util.Map) -> a
-    249:249:void lambda$tickEachSensor$13(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.sensing.Sensor) -> a
-    236:238:com.mojang.datafixers.util.Pair lambda$serialize$12(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> a
-    235:235:boolean lambda$serialize$11(java.util.Map$Entry) -> b
-    229:229:void lambda$stopAll$10(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long,net.minecraft.world.entity.ai.behavior.Behavior) -> c
-    216:216:void lambda$copyWithoutGoals$9(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.ai.memory.MemoryModuleType,java.util.Optional) -> a
-    216:216:void lambda$null$8(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.ai.memory.MemoryModuleType,java.lang.Object) -> a
-    202:206:void lambda$addActivity$7(net.minecraft.world.entity.schedule.Activity,com.mojang.datafixers.util.Pair) -> a
-    204:204:java.util.Set lambda$null$6(net.minecraft.world.entity.schedule.Activity) -> e
-    203:203:java.util.Map lambda$null$5(java.lang.Integer) -> a
-    162:162:boolean lambda$getRunningBehaviorsStream$4(net.minecraft.world.entity.ai.behavior.Behavior) -> b
-    160:160:java.util.stream.Stream lambda$getRunningBehaviorsStream$3(java.util.Map) -> b
-    73:76:void lambda$new$2(net.minecraft.world.entity.ai.sensing.Sensor) -> a
-    70:70:void lambda$new$1(net.minecraft.world.entity.ai.sensing.SensorType) -> a
-    69:69:void lambda$new$0(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> d
-net.minecraft.world.entity.ai.attributes.Attribute -> alq:
-    java.lang.String getName() -> a
-    double sanitizeValue(double) -> a
-    double getDefaultValue() -> b
-    boolean isClientSyncable() -> c
-    net.minecraft.world.entity.ai.attributes.Attribute getParentAttribute() -> d
-net.minecraft.world.entity.ai.attributes.AttributeInstance -> alr:
-    net.minecraft.world.entity.ai.attributes.Attribute getAttribute() -> a
-    double getBaseValue() -> b
-    void setBaseValue(double) -> a
-    java.util.Set getModifiers(net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> a
-    java.util.Set getModifiers() -> c
-    boolean hasModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> a
-    net.minecraft.world.entity.ai.attributes.AttributeModifier getModifier(java.util.UUID) -> a
-    void addModifiers(java.util.Collection) -> a
-    void addModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> b
-    void removeModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> c
-    java.util.Collection getModifiers(java.lang.String) -> a
-    void removeModifiers(java.lang.String) -> b
-    void removeModifier(java.util.UUID) -> b
-    void removeModifiers() -> d
-    double getValue() -> e
-    44:52:void copyFrom(net.minecraft.world.entity.ai.attributes.AttributeInstance) -> a
-net.minecraft.world.entity.ai.attributes.AttributeModifier -> als:
-    double amount -> a
-    net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation operation -> b
-    java.util.function.Supplier nameGetter -> c
-    java.util.UUID id -> d
-    boolean serialize -> e
-    44:45:void <init>(java.lang.String,double,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> <init>
-    48:49:void <init>(java.util.UUID,java.lang.String,double,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> <init>
-    41:56:void <init>(java.util.UUID,java.util.function.Supplier,double,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> <init>
-    59:59:java.util.UUID getId() -> a
-    63:63:java.lang.String getName() -> b
-    67:67:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation getOperation() -> c
-    71:71:double getAmount() -> d
-    75:75:boolean isSerializable() -> e
-    79:80:net.minecraft.world.entity.ai.attributes.AttributeModifier setSerialize(boolean) -> a
-    85:94:boolean equals(java.lang.Object) -> equals
-    99:99:int hashCode() -> hashCode
-    104:107:java.lang.String toString() -> toString
-    48:48:java.lang.String lambda$new$1(java.lang.String) -> a
-    44:44:java.lang.String lambda$new$0(java.lang.String) -> b
-net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation -> als$a:
+    net.minecraft.world.entity.SpawnPlacements$Type IN_LAVA -> d
+    net.minecraft.world.entity.SpawnPlacements$Type[] $VALUES -> e
+    155:155:net.minecraft.world.entity.SpawnPlacements$Type[] values() -> values
+    155:155:net.minecraft.world.entity.SpawnPlacements$Type valueOf(java.lang.String) -> valueOf
+    155:155:void <init>(java.lang.String,int) -> <init>
+    155:159:void <clinit>() -> <clinit>
+net.minecraft.world.entity.TamableAnimal -> apq:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_FLAGS_ID -> bv
+    net.minecraft.network.syncher.EntityDataAccessor DATA_OWNERUUID_ID -> bw
+    boolean orderedToSit -> bx
+    31:33:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    37:40:void defineSynchedData() -> e
+    44:49:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    53:71:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    75:75:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
+    79:89:void spawnTamingParticles(boolean) -> t
+    93:100:void handleEntityEvent(byte) -> a
+    103:103:boolean isTame() -> eL
+    107:115:void setTame(boolean) -> u
+    118:118:void reassessTameGoals() -> eM
+    121:121:boolean isInSittingPose() -> eN
+    125:131:void setInSittingPose(boolean) -> v
+    136:136:java.util.UUID getOwnerUUID() -> B_
+    140:141:void setOwnerUUID(java.util.UUID) -> b
+    144:149:void tame(net.minecraft.world.entity.player.Player) -> f
+    155:161:net.minecraft.world.entity.LivingEntity getOwner() -> eO
+    167:170:boolean canAttack(net.minecraft.world.entity.LivingEntity) -> d
+    174:174:boolean isOwnedBy(net.minecraft.world.entity.LivingEntity) -> j
+    178:178:boolean wantsToAttack(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    183:189:net.minecraft.world.scores.Team getTeam() -> bC
+    194:203:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
+    208:214:void die(net.minecraft.world.damagesource.DamageSource) -> a
+    217:217:boolean isOrderedToSit() -> eP
+    221:222:void setOrderedToSit(boolean) -> w
+    24:24:net.minecraft.world.entity.Entity getOwner() -> C_
+    25:26:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.Brain -> apr:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    java.util.function.Supplier codec -> b
+    java.util.Map memories -> c
+    java.util.Map sensors -> d
+    java.util.Map availableBehaviorsByPriority -> e
+    net.minecraft.world.entity.schedule.Schedule schedule -> f
+    java.util.Map activityRequirements -> g
+    java.util.Map activityMemoriesToEraseWhenStopped -> h
+    java.util.Set coreActivities -> i
+    java.util.Set activeActivities -> j
+    net.minecraft.world.entity.schedule.Activity defaultActivity -> k
+    long lastScheduleUpdate -> l
+    69:69:net.minecraft.world.entity.ai.Brain$Provider provider(java.util.Collection,java.util.Collection) -> a
+    73:108:com.mojang.serialization.Codec codec(java.util.Collection,java.util.Collection) -> b
+    113:157:void <init>(java.util.Collection,java.util.Collection,com.google.common.collect.ImmutableList,java.util.function.Supplier) -> <init>
+    160:160:com.mojang.serialization.DataResult serializeStart(com.mojang.serialization.DynamicOps) -> a
+    187:187:java.util.stream.Stream memories() -> j
+    194:194:boolean hasMemoryValue(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> a
+    198:199:void eraseMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> b
+    206:207:void setMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.lang.Object) -> a
+    215:216:void setMemoryWithExpiry(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.lang.Object,long) -> a
+    223:224:void setMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.util.Optional) -> a
+    232:239:void setMemoryInternal(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.util.Optional) -> b
+    243:243:java.util.Optional getMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> c
+    249:249:java.util.Map getMemories() -> a
+    256:259:boolean isMemoryValue(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.lang.Object) -> b
+    264:271:boolean checkMemory(net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.world.entity.ai.memory.MemoryStatus) -> a
+    275:275:net.minecraft.world.entity.schedule.Schedule getSchedule() -> b
+    279:280:void setSchedule(net.minecraft.world.entity.schedule.Schedule) -> a
+    283:284:void setCoreActivities(java.util.Set) -> a
+    289:289:java.util.Set getActiveActivities() -> c
+    295:305:java.util.List getRunningBehaviors() -> d
+    309:310:void useDefaultActivity() -> e
+    313:318:java.util.Optional getActiveNonCoreActivity() -> f
+    327:332:void setActiveActivityIfPossible(net.minecraft.world.entity.schedule.Activity) -> a
+    335:343:void setActiveActivity(net.minecraft.world.entity.schedule.Activity) -> d
+    346:356:void eraseMemoriesForOtherActivitesThan(net.minecraft.world.entity.schedule.Activity) -> e
+    363:370:void updateActivityFromSchedule(long,long) -> a
+    376:382:void setActiveActivityToFirstValid(java.util.List) -> a
+    385:386:void setDefaultActivity(net.minecraft.world.entity.schedule.Activity) -> b
+    392:393:void addActivity(net.minecraft.world.entity.schedule.Activity,int,com.google.common.collect.ImmutableList) -> a
+    401:406:void addActivityAndRemoveMemoryWhenStopped(net.minecraft.world.entity.schedule.Activity,int,com.google.common.collect.ImmutableList,net.minecraft.world.entity.ai.memory.MemoryModuleType) -> a
+    412:413:void addActivity(net.minecraft.world.entity.schedule.Activity,com.google.common.collect.ImmutableList) -> a
+    420:421:void addActivityWithConditions(net.minecraft.world.entity.schedule.Activity,com.google.common.collect.ImmutableList,java.util.Set) -> a
+    429:439:void addActivityAndRemoveMemoriesWhenStopped(net.minecraft.world.entity.schedule.Activity,com.google.common.collect.ImmutableList,java.util.Set,java.util.Set) -> a
+    443:444:void removeAllBehaviors() -> g
+    447:447:boolean isActive(net.minecraft.world.entity.schedule.Activity) -> c
+    452:459:net.minecraft.world.entity.ai.Brain copyWithoutBehaviors() -> h
+    463:467:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    470:473:void tickSensors(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> c
+    476:485:void forgetOutdatedMemories() -> k
+    488:492:void stopAll(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> b
+    498:512:void startEachNonRunningBehavior(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> d
+    519:523:void tickEachRunningBehavior(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> e
+    526:538:boolean activityRequirementsAreMet(net.minecraft.world.entity.schedule.Activity) -> f
+    542:542:boolean isEmptyCollection(java.lang.Object) -> a
+    549:554:com.google.common.collect.ImmutableList createPriorityPairs(int,com.google.common.collect.ImmutableList) -> a
+    436:436:java.util.Set lambda$addActivityAndRemoveMemoriesWhenStopped$3(net.minecraft.world.entity.schedule.Activity) -> g
+    435:435:java.util.Map lambda$addActivityAndRemoveMemoriesWhenStopped$2(java.lang.Integer) -> a
+    259:259:boolean lambda$isMemoryValue$1(java.lang.Object,java.lang.Object) -> a
+    187:187:net.minecraft.world.entity.ai.Brain$MemoryValue lambda$memories$0(java.util.Map$Entry) -> a
+    48:48:org.apache.logging.log4j.Logger access$000() -> i
+    48:48:java.util.stream.Stream access$200(net.minecraft.world.entity.ai.Brain) -> a
+    48:48:void access$500(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.ai.memory.MemoryModuleType,java.util.Optional) -> a
+    49:49:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.Brain$1 -> apr$1:
+    java.util.Collection val$memoryTypes -> a
+    java.util.Collection val$sensorTypes -> b
+    org.apache.commons.lang3.mutable.MutableObject val$codecReference -> c
+    75:75:void <init>(java.util.Collection,java.util.Collection,org.apache.commons.lang3.mutable.MutableObject) -> <init>
+    78:78:java.util.stream.Stream keys(com.mojang.serialization.DynamicOps) -> keys
+    83:92:com.mojang.serialization.DataResult decode(com.mojang.serialization.DynamicOps,com.mojang.serialization.MapLike) -> decode
+    96:98:com.mojang.serialization.DataResult captureRead(net.minecraft.world.entity.ai.memory.MemoryModuleType,com.mojang.serialization.DynamicOps,java.lang.Object) -> a
+    103:104:com.mojang.serialization.RecordBuilder encode(net.minecraft.world.entity.ai.Brain,com.mojang.serialization.DynamicOps,com.mojang.serialization.RecordBuilder) -> a
+    75:75:com.mojang.serialization.RecordBuilder encode(java.lang.Object,com.mojang.serialization.DynamicOps,com.mojang.serialization.RecordBuilder) -> encode
+    103:103:void lambda$encode$8(com.mojang.serialization.DynamicOps,com.mojang.serialization.RecordBuilder,net.minecraft.world.entity.ai.Brain$MemoryValue) -> a
+    98:98:net.minecraft.world.entity.ai.Brain$MemoryValue lambda$captureRead$7(net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.world.entity.ai.memory.ExpirableValue) -> a
+    97:97:com.mojang.serialization.DataResult lambda$captureRead$6(com.mojang.serialization.DynamicOps,java.lang.Object,com.mojang.serialization.Codec) -> a
+    96:96:com.mojang.serialization.DataResult lambda$captureRead$5(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> a
+    86:89:void lambda$decode$4(com.mojang.serialization.DynamicOps,org.apache.commons.lang3.mutable.MutableObject,com.mojang.datafixers.util.Pair) -> a
+    87:87:com.mojang.serialization.DataResult lambda$null$3(com.mojang.serialization.DynamicOps,com.mojang.datafixers.util.Pair,net.minecraft.world.entity.ai.memory.MemoryModuleType) -> a
+    78:78:java.lang.Object lambda$keys$2(com.mojang.serialization.DynamicOps,net.minecraft.resources.ResourceLocation) -> a
+    78:78:java.util.stream.Stream lambda$keys$1(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> b
+    78:78:net.minecraft.resources.ResourceLocation lambda$null$0(net.minecraft.world.entity.ai.memory.MemoryModuleType,com.mojang.serialization.Codec) -> a
+net.minecraft.world.entity.ai.Brain$MemoryValue -> apr$a:
+    net.minecraft.world.entity.ai.memory.MemoryModuleType type -> a
+    java.util.Optional value -> b
+    169:169:net.minecraft.world.entity.ai.Brain$MemoryValue createUnchecked(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.util.Optional) -> b
+    172:175:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.util.Optional) -> <init>
+    178:179:void setMemoryInternal(net.minecraft.world.entity.ai.Brain) -> a
+    182:183:void serialize(com.mojang.serialization.DynamicOps,com.mojang.serialization.RecordBuilder) -> a
+    182:182:void lambda$serialize$1(com.mojang.serialization.RecordBuilder,com.mojang.serialization.DynamicOps,com.mojang.serialization.Codec) -> a
+    182:182:void lambda$null$0(com.mojang.serialization.RecordBuilder,com.mojang.serialization.DynamicOps,com.mojang.serialization.Codec,net.minecraft.world.entity.ai.memory.ExpirableValue) -> a
+    163:163:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.util.Optional,net.minecraft.world.entity.ai.Brain$1) -> <init>
+    163:163:void access$400(net.minecraft.world.entity.ai.Brain$MemoryValue,net.minecraft.world.entity.ai.Brain) -> a
+    163:163:net.minecraft.world.entity.ai.Brain$MemoryValue access$600(net.minecraft.world.entity.ai.memory.MemoryModuleType,java.util.Optional) -> a
+net.minecraft.world.entity.ai.Brain$Provider -> apr$b:
+    java.util.Collection memoryTypes -> a
+    java.util.Collection sensorTypes -> b
+    com.mojang.serialization.Codec codec -> c
+    57:61:void <init>(java.util.Collection,java.util.Collection) -> <init>
+    64:64:net.minecraft.world.entity.ai.Brain makeBrain(com.mojang.serialization.Dynamic) -> a
+    64:64:net.minecraft.world.entity.ai.Brain lambda$makeBrain$1() -> a
+    64:64:com.mojang.serialization.Codec lambda$null$0() -> b
+    52:52:void <init>(java.util.Collection,java.util.Collection,net.minecraft.world.entity.ai.Brain$1) -> <init>
+net.minecraft.world.entity.ai.attributes.Attribute -> aps:
+    double defaultValue -> a
+    boolean syncable -> b
+    java.lang.String descriptionId -> c
+    9:12:void <init>(java.lang.String,double) -> <init>
+    15:15:double getDefaultValue() -> a
+    20:20:boolean isClientSyncable() -> b
+    24:25:net.minecraft.world.entity.ai.attributes.Attribute setSyncable(boolean) -> a
+    29:29:double sanitizeValue(double) -> a
+    33:33:java.lang.String getDescriptionId() -> c
+net.minecraft.world.entity.ai.attributes.AttributeInstance -> apt:
+    net.minecraft.world.entity.ai.attributes.Attribute attribute -> a
+    java.util.Map modifiersByOperation -> b
+    java.util.Map modifierById -> c
+    java.util.Set permanentModifiers -> d
+    double baseValue -> e
+    boolean dirty -> f
+    double cachedValue -> g
+    java.util.function.Consumer onDirty -> h
+    23:35:void <init>(net.minecraft.world.entity.ai.attributes.Attribute,java.util.function.Consumer) -> <init>
+    38:38:net.minecraft.world.entity.ai.attributes.Attribute getAttribute() -> a
+    42:42:double getBaseValue() -> b
+    46:51:void setBaseValue(double) -> a
+    54:54:java.util.Set getModifiers(net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> a
+    58:58:java.util.Set getModifiers() -> c
+    63:63:net.minecraft.world.entity.ai.attributes.AttributeModifier getModifier(java.util.UUID) -> a
+    67:67:boolean hasModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> a
+    71:78:void addModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> e
+    81:82:void addTransientModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> b
+    85:87:void addPermanentModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> c
+    90:92:void setDirty() -> d
+    95:99:void removeModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> d
+    102:106:void removeModifier(java.util.UUID) -> b
+    109:114:boolean removePermanentModifier(java.util.UUID) -> c
+    118:121:void removeModifiers() -> e
+    124:129:double getValue() -> f
+    133:149:double calculateValue() -> h
+    153:153:java.util.Collection getModifiersOrEmpty(net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> b
+    157:170:void replaceFrom(net.minecraft.world.entity.ai.attributes.AttributeInstance) -> a
+    173:185:net.minecraft.nbt.CompoundTag save() -> g
+    189:204:void load(net.minecraft.nbt.CompoundTag) -> a
+    167:167:void lambda$replaceFrom$1(net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation,java.util.Set) -> a
+    54:54:java.util.Set lambda$getModifiers$0(net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> c
+net.minecraft.world.entity.ai.attributes.AttributeMap -> apu:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    java.util.Map attributes -> b
+    java.util.Set dirtyAttributes -> c
+    net.minecraft.world.entity.ai.attributes.AttributeSupplier supplier -> d
+    24:30:void <init>(net.minecraft.world.entity.ai.attributes.AttributeSupplier) -> <init>
+    33:36:void onAttributeModified(net.minecraft.world.entity.ai.attributes.AttributeInstance) -> a
+    39:39:java.util.Set getDirtyAttributes() -> a
+    43:43:java.util.Collection getSyncableAttributes() -> b
+    48:48:net.minecraft.world.entity.ai.attributes.AttributeInstance getInstance(net.minecraft.world.entity.ai.attributes.Attribute) -> a
+    52:52:boolean hasAttribute(net.minecraft.world.entity.ai.attributes.Attribute) -> b
+    56:57:boolean hasModifier(net.minecraft.world.entity.ai.attributes.Attribute,java.util.UUID) -> a
+    61:62:double getValue(net.minecraft.world.entity.ai.attributes.Attribute) -> c
+    66:67:double getBaseValue(net.minecraft.world.entity.ai.attributes.Attribute) -> d
+    71:72:double getModifierValue(net.minecraft.world.entity.ai.attributes.Attribute,java.util.UUID) -> b
+    76:83:void removeAttributeModifiers(com.google.common.collect.Multimap) -> a
+    86:94:void addTransientAttributeModifiers(com.google.common.collect.Multimap) -> b
+    97:103:void assignValues(net.minecraft.world.entity.ai.attributes.AttributeMap) -> a
+    106:110:net.minecraft.nbt.ListTag save() -> c
+    114:126:void load(net.minecraft.nbt.ListTag) -> a
+    124:124:void lambda$load$6(java.lang.String) -> a
+    119:123:void lambda$load$5(net.minecraft.nbt.CompoundTag,net.minecraft.world.entity.ai.attributes.Attribute) -> a
+    98:102:void lambda$assignValues$4(net.minecraft.world.entity.ai.attributes.AttributeInstance) -> b
+    87:93:void lambda$addTransientAttributeModifiers$3(net.minecraft.world.entity.ai.attributes.Attribute,net.minecraft.world.entity.ai.attributes.AttributeModifier) -> a
+    77:82:void lambda$removeAttributeModifiers$2(net.minecraft.world.entity.ai.attributes.Attribute,java.util.Collection) -> a
+    48:48:net.minecraft.world.entity.ai.attributes.AttributeInstance lambda$getInstance$1(net.minecraft.world.entity.ai.attributes.Attribute) -> e
+    43:43:boolean lambda$getSyncableAttributes$0(net.minecraft.world.entity.ai.attributes.AttributeInstance) -> c
+    22:22:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.attributes.AttributeModifier -> apv:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    double amount -> b
+    net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation operation -> c
+    java.util.function.Supplier nameGetter -> d
+    java.util.UUID id -> e
+    49:50:void <init>(java.lang.String,double,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> <init>
+    53:54:void <init>(java.util.UUID,java.lang.String,double,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> <init>
+    56:61:void <init>(java.util.UUID,java.util.function.Supplier,double,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> <init>
+    64:64:java.util.UUID getId() -> a
+    68:68:java.lang.String getName() -> b
+    72:72:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation getOperation() -> c
+    76:76:double getAmount() -> d
+    81:90:boolean equals(java.lang.Object) -> equals
+    95:95:int hashCode() -> hashCode
+    100:103:java.lang.String toString() -> toString
+    109:114:net.minecraft.nbt.CompoundTag save() -> e
+    120:125:net.minecraft.world.entity.ai.attributes.AttributeModifier load(net.minecraft.nbt.CompoundTag) -> a
+    53:53:java.lang.String lambda$new$1(java.lang.String) -> a
+    49:49:java.lang.String lambda$new$0(java.lang.String) -> b
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation -> apv$a:
     net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation ADDITION -> a
     net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation MULTIPLY_BASE -> b
     net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation MULTIPLY_TOTAL -> c
     net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation[] OPERATIONS -> d
     int value -> e
     net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation[] $VALUES -> f
-    11:11:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation[] values() -> values
-    11:11:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation valueOf(java.lang.String) -> valueOf
-    20:22:void <init>(java.lang.String,int,int) -> <init>
-    25:25:int toValue() -> a
-    29:33:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation fromValue(int) -> a
-    11:16:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.attributes.BaseAttribute -> alt:
-    net.minecraft.world.entity.ai.attributes.Attribute parent -> a
-    java.lang.String name -> b
-    double defaultValue -> c
-    boolean syncable -> d
-    11:19:void <init>(net.minecraft.world.entity.ai.attributes.Attribute,java.lang.String,double) -> <init>
-    23:23:java.lang.String getName() -> a
-    28:28:double getDefaultValue() -> b
-    33:33:boolean isClientSyncable() -> c
-    37:38:net.minecraft.world.entity.ai.attributes.BaseAttribute setSyncable(boolean) -> a
-    44:44:net.minecraft.world.entity.ai.attributes.Attribute getParentAttribute() -> d
-    49:49:int hashCode() -> hashCode
-    54:54:boolean equals(java.lang.Object) -> equals
-net.minecraft.world.entity.ai.attributes.BaseAttributeMap -> alu:
-    java.util.Map attributesByObject -> a
-    java.util.Map attributesByName -> b
-    com.google.common.collect.Multimap descendantsByParent -> c
-    12:15:void <init>() -> <init>
-    19:19:net.minecraft.world.entity.ai.attributes.AttributeInstance getInstance(net.minecraft.world.entity.ai.attributes.Attribute) -> a
-    24:24:net.minecraft.world.entity.ai.attributes.AttributeInstance getInstance(java.lang.String) -> a
-    28:42:net.minecraft.world.entity.ai.attributes.AttributeInstance registerAttribute(net.minecraft.world.entity.ai.attributes.Attribute) -> b
-    net.minecraft.world.entity.ai.attributes.AttributeInstance createAttributeInstance(net.minecraft.world.entity.ai.attributes.Attribute) -> c
-    48:48:java.util.Collection getAttributes() -> a
-    52:52:void onAttributeModified(net.minecraft.world.entity.ai.attributes.AttributeInstance) -> a
-    55:62:void removeAttributeModifiers(com.google.common.collect.Multimap) -> a
-    65:73:void addAttributeModifiers(com.google.common.collect.Multimap) -> b
-    76:76:java.util.Collection getDescendants(net.minecraft.world.entity.ai.attributes.Attribute) -> d
-    80:86:void assignValues(net.minecraft.world.entity.ai.attributes.BaseAttributeMap) -> a
-    81:85:void lambda$assignValues$0(net.minecraft.world.entity.ai.attributes.BaseAttributeMap,net.minecraft.world.entity.ai.attributes.AttributeInstance) -> a
-net.minecraft.world.entity.ai.attributes.ModifiableAttributeInstance -> alv:
-    net.minecraft.world.entity.ai.attributes.BaseAttributeMap attributeMap -> a
-    net.minecraft.world.entity.ai.attributes.Attribute attribute -> b
-    java.util.Map modifiers -> c
-    java.util.Map modifiersByName -> d
-    java.util.Map modifierById -> e
-    double baseValue -> f
-    boolean dirty -> g
-    double cachedValue -> h
-    16:31:void <init>(net.minecraft.world.entity.ai.attributes.BaseAttributeMap,net.minecraft.world.entity.ai.attributes.Attribute) -> <init>
-    35:35:net.minecraft.world.entity.ai.attributes.Attribute getAttribute() -> a
-    40:40:double getBaseValue() -> b
-    45:50:void setBaseValue(double) -> a
-    54:54:java.util.Set getModifiers(net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> a
-    59:65:java.util.Set getModifiers() -> c
-    71:71:net.minecraft.world.entity.ai.attributes.AttributeModifier getModifier(java.util.UUID) -> a
-    76:76:boolean hasModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> a
-    81:84:void addModifiers(java.util.Collection) -> a
-    88:99:void addModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> b
-    102:104:void setDirty() -> f
-    108:124:void removeModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> c
-    128:128:java.util.Collection getModifiers(java.lang.String) -> a
-    133:143:void removeModifiers(java.lang.String) -> b
-    147:151:void removeModifier(java.util.UUID) -> b
-    155:165:void removeModifiers() -> d
-    169:174:double getValue() -> e
-    178:194:double calculateValue() -> g
-    198:209:java.util.Collection getAppliedModifiers(net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> b
-    92:92:java.util.Set lambda$addModifier$0(java.lang.String) -> c
-net.minecraft.world.entity.ai.attributes.ModifiableAttributeMap -> alw:
-    java.util.Set dirtyAttributes -> e
-    java.util.Map attributesByLegacy -> d
-    10:12:void <init>() -> <init>
-    16:16:net.minecraft.world.entity.ai.attributes.ModifiableAttributeInstance getInstance(net.minecraft.world.entity.ai.attributes.Attribute) -> e
-    21:25:net.minecraft.world.entity.ai.attributes.ModifiableAttributeInstance getInstance(java.lang.String) -> b
-    30:36:net.minecraft.world.entity.ai.attributes.AttributeInstance registerAttribute(net.minecraft.world.entity.ai.attributes.Attribute) -> b
-    41:41:net.minecraft.world.entity.ai.attributes.AttributeInstance createAttributeInstance(net.minecraft.world.entity.ai.attributes.Attribute) -> c
-    46:56:void onAttributeModified(net.minecraft.world.entity.ai.attributes.AttributeInstance) -> a
-    59:59:java.util.Set getDirtyAttributes() -> b
-    63:71:java.util.Collection getSyncableAttributes() -> c
-    10:10:net.minecraft.world.entity.ai.attributes.AttributeInstance getInstance(java.lang.String) -> a
-    10:10:net.minecraft.world.entity.ai.attributes.AttributeInstance getInstance(net.minecraft.world.entity.ai.attributes.Attribute) -> a
-net.minecraft.world.entity.ai.attributes.RangedAttribute -> alx:
+    17:17:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation[] values() -> values
+    17:17:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation valueOf(java.lang.String) -> valueOf
+    26:28:void <init>(java.lang.String,int,int) -> <init>
+    31:31:int toValue() -> a
+    35:39:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation fromValue(int) -> a
+    17:22:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.attributes.AttributeSupplier -> apw:
+    java.util.Map instances -> a
+    15:17:void <init>(java.util.Map) -> <init>
+    20:24:net.minecraft.world.entity.ai.attributes.AttributeInstance getAttributeInstance(net.minecraft.world.entity.ai.attributes.Attribute) -> d
+    28:28:double getValue(net.minecraft.world.entity.ai.attributes.Attribute) -> a
+    32:32:double getBaseValue(net.minecraft.world.entity.ai.attributes.Attribute) -> b
+    36:40:double getModifierValue(net.minecraft.world.entity.ai.attributes.Attribute,java.util.UUID) -> a
+    45:51:net.minecraft.world.entity.ai.attributes.AttributeInstance createInstance(java.util.function.Consumer,net.minecraft.world.entity.ai.attributes.Attribute) -> a
+    55:55:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder builder() -> a
+    59:59:boolean hasAttribute(net.minecraft.world.entity.ai.attributes.Attribute) -> c
+    63:64:boolean hasModifier(net.minecraft.world.entity.ai.attributes.Attribute,java.util.UUID) -> b
+net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder -> apw$a:
+    java.util.Map builder -> a
+    boolean instanceFrozen -> b
+    67:68:void <init>() -> <init>
+    72:78:net.minecraft.world.entity.ai.attributes.AttributeInstance create(net.minecraft.world.entity.ai.attributes.Attribute) -> b
+    82:83:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder add(net.minecraft.world.entity.ai.attributes.Attribute) -> a
+    87:89:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder add(net.minecraft.world.entity.ai.attributes.Attribute,double) -> a
+    93:94:net.minecraft.world.entity.ai.attributes.AttributeSupplier build() -> a
+    73:76:void lambda$create$0(net.minecraft.world.entity.ai.attributes.Attribute,net.minecraft.world.entity.ai.attributes.AttributeInstance) -> a
+net.minecraft.world.entity.ai.attributes.Attributes -> apx:
+    net.minecraft.world.entity.ai.attributes.Attribute MAX_HEALTH -> a
+    net.minecraft.world.entity.ai.attributes.Attribute FOLLOW_RANGE -> b
+    net.minecraft.world.entity.ai.attributes.Attribute KNOCKBACK_RESISTANCE -> c
+    net.minecraft.world.entity.ai.attributes.Attribute MOVEMENT_SPEED -> d
+    net.minecraft.world.entity.ai.attributes.Attribute FLYING_SPEED -> e
+    net.minecraft.world.entity.ai.attributes.Attribute ATTACK_DAMAGE -> f
+    net.minecraft.world.entity.ai.attributes.Attribute ATTACK_KNOCKBACK -> g
+    net.minecraft.world.entity.ai.attributes.Attribute ATTACK_SPEED -> h
+    net.minecraft.world.entity.ai.attributes.Attribute ARMOR -> i
+    net.minecraft.world.entity.ai.attributes.Attribute ARMOR_TOUGHNESS -> j
+    net.minecraft.world.entity.ai.attributes.Attribute LUCK -> k
+    net.minecraft.world.entity.ai.attributes.Attribute SPAWN_REINFORCEMENTS_CHANCE -> l
+    net.minecraft.world.entity.ai.attributes.Attribute JUMP_STRENGTH -> m
+    5:5:void <init>() -> <init>
+    22:22:net.minecraft.world.entity.ai.attributes.Attribute register(java.lang.String,net.minecraft.world.entity.ai.attributes.Attribute) -> a
+    6:19:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.attributes.DefaultAttributes -> apy:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    java.util.Map SUPPLIERS -> b
+    72:72:void <init>() -> <init>
+    150:150:net.minecraft.world.entity.ai.attributes.AttributeSupplier getSupplier(net.minecraft.world.entity.EntityType) -> a
+    154:154:boolean hasSupplier(net.minecraft.world.entity.EntityType) -> b
+    158:169:void validate() -> a
+    163:168:void lambda$validate$2(net.minecraft.resources.ResourceLocation) -> a
+    160:160:boolean lambda$validate$1(net.minecraft.world.entity.EntityType) -> c
+    159:159:boolean lambda$validate$0(net.minecraft.world.entity.EntityType) -> d
+    73:147:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.attributes.RangedAttribute -> apz:
     double minValue -> a
     double maxValue -> b
-    java.lang.String importLegacyName -> c
-    13:26:void <init>(net.minecraft.world.entity.ai.attributes.Attribute,java.lang.String,double,double,double) -> <init>
-    29:29:double getMinValue() -> e
-    33:33:double getMaxValue() -> f
-    37:38:net.minecraft.world.entity.ai.attributes.RangedAttribute importLegacyName(java.lang.String) -> a
-    42:42:java.lang.String getImportLegacyName() -> g
-    47:49:double sanitizeValue(double) -> a
-net.minecraft.world.entity.ai.attributes.package-info -> aly:
-net.minecraft.world.entity.ai.behavior.AcquirePoi -> alz:
-    net.minecraft.world.entity.ai.village.poi.PoiType poiType -> a
-    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryType -> b
-    boolean onlyIfAdult -> c
-    long lastUpdate -> d
-    it.unimi.dsi.fastutil.longs.Long2LongMap batchCache -> e
-    int triedCount -> f
-    39:48:void <init>(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.ai.memory.MemoryModuleType,boolean) -> <init>
-    52:59:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
-    64:96:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
-    27:27:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    27:27:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    94:94:boolean lambda$start$3(it.unimi.dsi.fastutil.longs.Long2LongMap$Entry) -> a
-    89:92:void lambda$start$2(net.minecraft.world.entity.ai.village.poi.PoiManager,net.minecraft.core.BlockPos,net.minecraft.world.entity.PathfinderMob,net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-    89:89:boolean lambda$null$1(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    70:80:boolean lambda$start$0(net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.behavior.AssignProfessionFromJobSite -> ama:
-    20:21:void <init>() -> <init>
-    25:25:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
-    30:39:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
-    18:18:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    18:18:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    34:38:void lambda$start$2(net.minecraft.world.entity.npc.Villager,net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-    35:37:void lambda$null$1(net.minecraft.world.entity.npc.Villager,net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.VillagerProfession) -> a
-    34:34:boolean lambda$null$0(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.npc.VillagerProfession) -> a
-net.minecraft.world.entity.ai.behavior.Behavior -> amb:
+    10:23:void <init>(java.lang.String,double,double,double) -> <init>
+    26:26:double getMinValue() -> d
+    30:30:double getMaxValue() -> e
+    35:37:double sanitizeValue(double) -> a
+net.minecraft.world.entity.ai.attributes.package-info -> aqa:
+net.minecraft.world.entity.ai.behavior.AcquirePoi -> aqb:
+    net.minecraft.world.entity.ai.village.poi.PoiType poiType -> b
+    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryToAcquire -> c
+    boolean onlyIfAdult -> d
+    long nextScheduledStart -> e
+    it.unimi.dsi.fastutil.longs.Long2ObjectMap batchCache -> f
+    40:47:void <init>(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.world.entity.ai.memory.MemoryModuleType,boolean) -> <init>
+    50:51:void <init>(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.ai.memory.MemoryModuleType,boolean) -> <init>
+    54:59:com.google.common.collect.ImmutableMap constructEntryConditionMap(net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.world.entity.ai.memory.MemoryModuleType) -> a
+    64:76:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
+    81:120:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
+    29:29:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    29:29:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    117:117:net.minecraft.world.entity.ai.behavior.AcquirePoi$JitteredLinearRetry lambda$start$4(net.minecraft.world.entity.PathfinderMob,long,long) -> a
+    110:114:void lambda$start$3(net.minecraft.world.entity.ai.village.poi.PoiManager,net.minecraft.core.BlockPos,net.minecraft.world.entity.PathfinderMob,net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    110:110:boolean lambda$null$2(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    88:98:boolean lambda$start$1(long,net.minecraft.core.BlockPos) -> a
+    85:85:boolean lambda$start$0(long,it.unimi.dsi.fastutil.longs.Long2ObjectMap$Entry) -> a
+net.minecraft.world.entity.ai.behavior.AcquirePoi$JitteredLinearRetry -> aqb$a:
+    java.util.Random random -> a
+    long previousAttemptTimestamp -> b
+    long nextScheduledAttemptTimestamp -> c
+    int currentDelay -> d
+    133:136:void <init>(java.util.Random,long) -> <init>
+    139:143:void markAttempt(long) -> a
+    146:146:boolean isStillValid(long) -> b
+    150:150:boolean shouldRetry(long) -> c
+    155:155:java.lang.String toString() -> toString
+net.minecraft.world.entity.ai.behavior.AnimalMakeLove -> aqc:
+    net.minecraft.world.entity.EntityType partnerType -> b
+    float speedModifier -> c
+    long spawnChildAtTime -> d
+    29:40:void <init>(net.minecraft.world.entity.EntityType,float) -> <init>
+    44:44:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.animal.Animal) -> a
+    49:58:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.animal.Animal,long) -> a
+    62:69:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.animal.Animal,long) -> b
+    75:86:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.animal.Animal,long) -> c
+    90:94:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.animal.Animal,long) -> d
+    97:97:net.minecraft.world.entity.animal.Animal getBreedTarget(net.minecraft.world.entity.animal.Animal) -> a
+    101:103:boolean hasBreedTargetOfRightType(net.minecraft.world.entity.animal.Animal) -> b
+    107:111:java.util.Optional findValidBreedPartner(net.minecraft.world.entity.animal.Animal) -> c
+    17:17:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    17:17:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    17:17:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    17:17:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
+    17:17:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    109:109:net.minecraft.world.entity.animal.Animal lambda$findValidBreedPartner$1(net.minecraft.world.entity.LivingEntity) -> a
+    108:108:boolean lambda$findValidBreedPartner$0(net.minecraft.world.entity.LivingEntity) -> b
+net.minecraft.world.entity.ai.behavior.AssignProfessionFromJobSite -> aqd:
+    24:27:void <init>() -> <init>
+    31:32:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    37:52:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    22:22:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    22:22:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    49:51:void lambda$start$3(net.minecraft.world.entity.npc.Villager,net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.VillagerProfession) -> a
+    47:47:java.util.Optional lambda$start$2(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    47:47:boolean lambda$null$1(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.npc.VillagerProfession) -> a
+    46:46:java.util.Optional lambda$start$0(net.minecraft.core.GlobalPos,net.minecraft.server.level.ServerLevel) -> a
+net.minecraft.world.entity.ai.behavior.BabyFollowAdult -> aqe:
+    net.minecraft.util.IntRange followRange -> b
+    float speedModifier -> c
+    15:21:void <init>(net.minecraft.util.IntRange,float) -> <init>
+    25:30:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.AgableMob) -> a
+    35:36:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.AgableMob,long) -> a
+    39:39:net.minecraft.world.entity.AgableMob getNearestAdult(net.minecraft.world.entity.AgableMob) -> a
+    10:10:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    10:10:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.BackUpIfTooClose -> aqf:
+    int tooCloseDistance -> b
+    float strafeSpeed -> c
+    19:27:void <init>(int,float) -> <init>
+    31:31:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
+    36:42:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    45:45:boolean isTargetVisible(net.minecraft.world.entity.Mob) -> a
+    49:49:boolean isTargetTooClose(net.minecraft.world.entity.Mob) -> b
+    53:53:net.minecraft.world.entity.LivingEntity getTarget(net.minecraft.world.entity.Mob) -> c
+    14:14:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    14:14:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.BecomePassiveIfMemoryPresent -> aqg:
+    int pacifyDuration -> b
+    13:19:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,int) -> <init>
+    23:25:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.Behavior -> aqh:
     java.util.Map entryCondition -> a
     net.minecraft.world.entity.ai.behavior.Behavior$Status status -> b
     long endTimestamp -> c
@@ -37731,83 +41081,145 @@ net.minecraft.world.entity.ai.behavior.Behavior -> amb:
     28:29:void <init>(java.util.Map,int) -> <init>
     18:38:void <init>(java.util.Map,int,int) -> <init>
     41:41:net.minecraft.world.entity.ai.behavior.Behavior$Status getStatus() -> a
-    45:52:boolean tryStart(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    45:52:boolean tryStart(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> e
     59:59:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    62:67:void tickOrStop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    62:67:void tickOrStop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
     73:73:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
-    76:78:void doStop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> e
-    84:84:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
-    94:94:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
+    76:78:void doStop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
+    84:84:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    94:94:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
     102:102:boolean timedOut(long) -> a
     110:110:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     115:115:java.lang.String toString() -> toString
-    119:119:boolean hasRequiredMemories(net.minecraft.world.entity.LivingEntity) -> a
-    120:122:boolean lambda$hasRequiredMemories$0(net.minecraft.world.entity.LivingEntity,java.util.Map$Entry) -> a
-net.minecraft.world.entity.ai.behavior.Behavior$Status -> amb$a:
+    119:127:boolean hasRequiredMemories(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.behavior.Behavior$Status -> aqh$a:
     net.minecraft.world.entity.ai.behavior.Behavior$Status STOPPED -> a
     net.minecraft.world.entity.ai.behavior.Behavior$Status RUNNING -> b
     net.minecraft.world.entity.ai.behavior.Behavior$Status[] $VALUES -> c
-    126:126:net.minecraft.world.entity.ai.behavior.Behavior$Status[] values() -> values
-    126:126:net.minecraft.world.entity.ai.behavior.Behavior$Status valueOf(java.lang.String) -> valueOf
-    126:126:void <init>(java.lang.String,int) -> <init>
-    126:128:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.behavior.BehaviorUtils -> amc:
-    22:22:void <init>() -> <init>
-    24:26:void lockGazeAndWalkToEachOther(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    29:31:boolean entityIsVisible(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> a
-    36:40:boolean targetIsValid(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.world.entity.EntityType) -> a
-    44:46:void lookAtEachOther(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> b
-    49:50:void lookAtEntity(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> c
-    53:56:void walkToEachOther(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> d
-    59:64:void walkToEntity(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity,int) -> a
-    67:79:void throwItem(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity) -> a
-    82:87:net.minecraft.core.SectionPos findSectionClosestToVillage(net.minecraft.server.level.ServerLevel,net.minecraft.core.SectionPos,int) -> a
-    85:85:boolean lambda$findSectionClosestToVillage$3(net.minecraft.server.level.ServerLevel,int,net.minecraft.core.SectionPos) -> a
-    39:39:boolean lambda$targetIsValid$2(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> b
-    37:37:boolean lambda$targetIsValid$1(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity) -> a
-    30:30:boolean lambda$entityIsVisible$0(net.minecraft.world.entity.LivingEntity,java.util.List) -> a
-net.minecraft.world.entity.ai.behavior.BlockPosWrapper -> amd:
-    net.minecraft.core.BlockPos pos -> a
-    net.minecraft.world.phys.Vec3 lookAt -> b
+    130:130:net.minecraft.world.entity.ai.behavior.Behavior$Status[] values() -> values
+    130:130:net.minecraft.world.entity.ai.behavior.Behavior$Status valueOf(java.lang.String) -> valueOf
+    130:130:void <init>(java.lang.String,int) -> <init>
+    130:132:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.behavior.BehaviorUtils -> aqi:
+    29:29:void <init>() -> <init>
+    31:33:void lockGazeAndWalkToEachOther(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity,float) -> a
+    36:38:boolean entityIsVisible(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> a
+    43:43:boolean targetIsValid(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.world.entity.EntityType) -> a
+    47:51:boolean targetIsValid(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.ai.memory.MemoryModuleType,java.util.function.Predicate) -> a
+    55:57:void lookAtEachOther(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> d
+    60:61:void lookAtEntity(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    64:67:void setWalkAndLookTargetMemoriesToEachOther(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity,float) -> b
+    70:73:void setWalkAndLookTargetMemories(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity,float,int) -> a
+    76:79:void setWalkAndLookTargetMemories(net.minecraft.world.entity.LivingEntity,net.minecraft.core.BlockPos,float,int) -> a
+    82:92:void throwItem(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.phys.Vec3) -> a
+    95:100:net.minecraft.core.SectionPos findSectionClosestToVillage(net.minecraft.server.level.ServerLevel,net.minecraft.core.SectionPos,int) -> a
+    107:112:boolean isWithinAttackRange(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity,int) -> a
+    116:118:boolean isWithinMeleeAttackRange(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> b
+    126:132:boolean isOtherTargetMuchFurtherAwayThanCurrentAttackTarget(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity,double) -> a
+    136:140:boolean canSee(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> c
+    144:147:net.minecraft.world.entity.LivingEntity getNearestTarget(net.minecraft.world.entity.LivingEntity,java.util.Optional,net.minecraft.world.entity.LivingEntity) -> a
+    151:153:net.minecraft.world.entity.LivingEntity getTargetNearestMe(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    157:159:java.util.Optional getLivingEntityFromUUIDMemory(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.memory.MemoryModuleType) -> a
+    163:168:java.util.stream.Stream getNearbyVillagersWithCondition(net.minecraft.world.entity.npc.Villager,java.util.function.Predicate) -> a
+    163:167:java.util.stream.Stream lambda$getNearbyVillagersWithCondition$7(net.minecraft.world.entity.npc.Villager,java.util.function.Predicate,java.util.List) -> a
+    165:165:net.minecraft.world.entity.npc.Villager lambda$null$6(net.minecraft.world.entity.LivingEntity) -> a
+    164:164:boolean lambda$null$5(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.LivingEntity) -> a
+    159:159:net.minecraft.world.entity.LivingEntity lambda$getLivingEntityFromUUIDMemory$4(net.minecraft.world.entity.LivingEntity,java.util.UUID) -> a
+    98:98:boolean lambda$findSectionClosestToVillage$3(net.minecraft.server.level.ServerLevel,int,net.minecraft.core.SectionPos) -> a
+    50:50:boolean lambda$targetIsValid$2(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> b
+    43:43:boolean lambda$targetIsValid$1(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity) -> a
+    37:37:boolean lambda$entityIsVisible$0(net.minecraft.world.entity.LivingEntity,java.util.List) -> a
+net.minecraft.world.entity.ai.behavior.BlockPosTracker -> aqj:
+    net.minecraft.core.BlockPos blockPos -> a
+    net.minecraft.world.phys.Vec3 centerPosition -> b
     11:14:void <init>(net.minecraft.core.BlockPos) -> <init>
-    18:18:net.minecraft.core.BlockPos getPos() -> a
-    23:23:net.minecraft.world.phys.Vec3 getLookAtPos() -> b
-    28:28:boolean isVisible(net.minecraft.world.entity.LivingEntity) -> a
+    18:18:net.minecraft.world.phys.Vec3 currentPosition() -> a
+    23:23:net.minecraft.core.BlockPos currentBlockPosition() -> b
+    28:28:boolean isVisibleBy(net.minecraft.world.entity.LivingEntity) -> a
     33:33:java.lang.String toString() -> toString
-net.minecraft.world.entity.ai.behavior.Celebrate -> ame:
-    net.minecraft.world.entity.raid.Raid currentRaid -> a
-    26:27:void <init>(int,int) -> <init>
-    31:33:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
-    38:38:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
-    43:45:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
-    49:63:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
-    67:91:net.minecraft.world.item.ItemStack getFirework(net.minecraft.world.item.DyeColor,int) -> a
-    21:21:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    21:21:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    21:21:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
-    21:21:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
-net.minecraft.world.entity.ai.behavior.DoNothing -> amf:
+net.minecraft.world.entity.ai.behavior.CelebrateVillagersSurvivedRaid -> aqk:
+    net.minecraft.world.entity.raid.Raid currentRaid -> b
+    27:28:void <init>(int,int) -> <init>
+    32:34:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    39:39:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    44:46:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
+    50:64:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
+    68:92:net.minecraft.world.item.ItemStack getFirework(net.minecraft.world.item.DyeColor,int) -> a
+    22:22:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    22:22:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    22:22:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    22:22:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
+net.minecraft.world.entity.ai.behavior.CopyMemoryWithExpiry -> aql:
+    java.util.function.Predicate predicate -> b
+    net.minecraft.world.entity.ai.memory.MemoryModuleType sourceMemory -> c
+    net.minecraft.world.entity.ai.memory.MemoryModuleType targetMemory -> d
+    net.minecraft.util.IntRange durationOfCopy -> e
+    20:28:void <init>(java.util.function.Predicate,net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.util.IntRange) -> <init>
+    32:32:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
+    37:39:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    13:13:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    13:13:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.CrossbowAttack -> aqm:
+    int attackDelay -> b
+    net.minecraft.world.entity.ai.behavior.CrossbowAttack$CrossbowState crossbowState -> c
+    30:37:void <init>() -> <init>
+    41:42:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
+    47:47:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    53:56:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> b
+    60:67:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> c
+    71:102:void crossbowAttack(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
+    105:106:void lookAtTarget(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> b
+    109:109:net.minecraft.world.entity.LivingEntity getAttackTarget(net.minecraft.world.entity.LivingEntity) -> a
+    20:20:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    20:20:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    20:20:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    20:20:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
+net.minecraft.world.entity.ai.behavior.CrossbowAttack$CrossbowState -> aqm$a:
+    net.minecraft.world.entity.ai.behavior.CrossbowAttack$CrossbowState UNCHARGED -> a
+    net.minecraft.world.entity.ai.behavior.CrossbowAttack$CrossbowState CHARGING -> b
+    net.minecraft.world.entity.ai.behavior.CrossbowAttack$CrossbowState CHARGED -> c
+    net.minecraft.world.entity.ai.behavior.CrossbowAttack$CrossbowState READY_TO_ATTACK -> d
+    net.minecraft.world.entity.ai.behavior.CrossbowAttack$CrossbowState[] $VALUES -> e
+    23:23:net.minecraft.world.entity.ai.behavior.CrossbowAttack$CrossbowState[] values() -> values
+    23:23:net.minecraft.world.entity.ai.behavior.CrossbowAttack$CrossbowState valueOf(java.lang.String) -> valueOf
+    23:23:void <init>(java.lang.String,int) -> <init>
+    23:27:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.behavior.DismountOrSkipMounting -> aqn:
+    int maxWalkDistToRideTarget -> b
+    java.util.function.BiPredicate dontRideIf -> c
+    21:26:void <init>(int,java.util.function.BiPredicate) -> <init>
+    30:36:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    40:41:boolean isVehicleValid(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity) -> a
+    47:49:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.DoNothing -> aqo:
     14:15:void <init>(int,int) -> <init>
-    19:19:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-net.minecraft.world.entity.ai.behavior.EntityPosWrapper -> amg:
+    19:19:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+net.minecraft.world.entity.ai.behavior.EntityTracker -> aqp:
     net.minecraft.world.entity.Entity entity -> a
-    15:17:void <init>(net.minecraft.world.entity.Entity) -> <init>
-    21:21:net.minecraft.core.BlockPos getPos() -> a
-    26:26:net.minecraft.world.phys.Vec3 getLookAtPos() -> b
-    31:32:boolean isVisible(net.minecraft.world.entity.LivingEntity) -> a
-    36:36:net.minecraft.world.entity.Entity getEntity() -> c
-    41:41:java.lang.String toString() -> toString
-net.minecraft.world.entity.ai.behavior.GateBehavior -> amh:
-    java.util.Set exitErasedMemories -> a
-    net.minecraft.world.entity.ai.behavior.GateBehavior$OrderPolicy orderPolicy -> b
-    net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy runningPolicy -> c
-    net.minecraft.world.entity.ai.behavior.WeightedList behaviors -> d
+    boolean trackEyeHeight -> b
+    16:19:void <init>(net.minecraft.world.entity.Entity,boolean) -> <init>
+    23:23:net.minecraft.world.phys.Vec3 currentPosition() -> a
+    28:28:net.minecraft.core.BlockPos currentBlockPosition() -> b
+    33:37:boolean isVisibleBy(net.minecraft.world.entity.LivingEntity) -> a
+    41:41:net.minecraft.world.entity.Entity getEntity() -> c
+    46:46:java.lang.String toString() -> toString
+net.minecraft.world.entity.ai.behavior.EraseMemoryIf -> aqq:
+    java.util.function.Predicate predicate -> b
+    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryType -> c
+    17:22:void <init>(java.util.function.Predicate,net.minecraft.world.entity.ai.memory.MemoryModuleType) -> <init>
+    26:26:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    31:32:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.GateBehavior -> aqr:
+    java.util.Set exitErasedMemories -> b
+    net.minecraft.world.entity.ai.behavior.GateBehavior$OrderPolicy orderPolicy -> c
+    net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy runningPolicy -> d
+    net.minecraft.world.entity.ai.behavior.WeightedList behaviors -> e
     25:33:void <init>(java.util.Map,java.util.Set,net.minecraft.world.entity.ai.behavior.GateBehavior$OrderPolicy,net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy,java.util.List) -> <init>
-    38:40:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
+    38:40:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
     46:46:boolean timedOut(long) -> a
     51:54:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     59:62:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
-    67:72:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
+    67:72:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
     115:119:java.lang.String toString() -> toString
     116:116:boolean lambda$toString$7(net.minecraft.world.entity.ai.behavior.Behavior) -> a
     69:69:void lambda$stop$6(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long,net.minecraft.world.entity.ai.behavior.Behavior) -> a
@@ -37817,8 +41229,8 @@ net.minecraft.world.entity.ai.behavior.GateBehavior -> amh:
     40:40:boolean lambda$canStillUse$2(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long,net.minecraft.world.entity.ai.behavior.Behavior) -> c
     39:39:boolean lambda$canStillUse$1(net.minecraft.world.entity.ai.behavior.Behavior) -> d
     32:32:void lambda$new$0(com.mojang.datafixers.util.Pair) -> a
-net.minecraft.world.entity.ai.behavior.GateBehavior$1 -> amh$1:
-net.minecraft.world.entity.ai.behavior.GateBehavior$OrderPolicy -> amh$a:
+net.minecraft.world.entity.ai.behavior.GateBehavior$1 -> aqr$1:
+net.minecraft.world.entity.ai.behavior.GateBehavior$OrderPolicy -> aqr$a:
     net.minecraft.world.entity.ai.behavior.GateBehavior$OrderPolicy ORDERED -> a
     net.minecraft.world.entity.ai.behavior.GateBehavior$OrderPolicy SHUFFLED -> b
     java.util.function.Consumer consumer -> c
@@ -37829,7 +41241,7 @@ net.minecraft.world.entity.ai.behavior.GateBehavior$OrderPolicy -> amh$a:
     86:87:void apply(net.minecraft.world.entity.ai.behavior.WeightedList) -> a
     75:75:void lambda$static$0(net.minecraft.world.entity.ai.behavior.WeightedList) -> b
     74:76:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy -> amh$b:
+net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy -> aqr$b:
     net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy RUN_ONE -> a
     net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy TRY_ALL -> b
     net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy[] $VALUES -> c
@@ -37839,75 +41251,106 @@ net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy -> amh$b:
     void apply(net.minecraft.world.entity.ai.behavior.WeightedList,net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     90:90:void <init>(java.lang.String,int,net.minecraft.world.entity.ai.behavior.GateBehavior$1) -> <init>
     90:100:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy$1 -> amh$b$1:
+net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy$1 -> aqr$b$1:
     91:91:void <init>(java.lang.String,int) -> <init>
     94:98:void apply(net.minecraft.world.entity.ai.behavior.WeightedList,net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     96:96:boolean lambda$apply$1(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long,net.minecraft.world.entity.ai.behavior.Behavior) -> a
     95:95:boolean lambda$apply$0(net.minecraft.world.entity.ai.behavior.Behavior) -> a
-net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy$2 -> amh$b$2:
+net.minecraft.world.entity.ai.behavior.GateBehavior$RunningPolicy$2 -> aqr$b$2:
     100:100:void <init>(java.lang.String,int) -> <init>
     103:106:void apply(net.minecraft.world.entity.ai.behavior.WeightedList,net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     105:105:void lambda$apply$1(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long,net.minecraft.world.entity.ai.behavior.Behavior) -> a
     104:104:boolean lambda$apply$0(net.minecraft.world.entity.ai.behavior.Behavior) -> a
-net.minecraft.world.entity.ai.behavior.GiveGiftToHero -> ami:
-    java.util.Map gifts -> a
-    int timeUntilNextGift -> b
-    boolean giftGivenDuringThisRun -> c
-    long timeSinceStart -> d
-    55:69:void <init>(int) -> <init>
-    73:82:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
-    87:92:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
-    96:96:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
-    101:112:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
-    116:120:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> d
-    123:127:void throwGift(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.LivingEntity) -> a
-    130:145:java.util.List getItemToThrow(net.minecraft.world.entity.npc.Villager) -> a
-    149:149:boolean isHeroVisible(net.minecraft.world.entity.npc.Villager) -> b
-    153:154:java.util.Optional getNearestTargetableHero(net.minecraft.world.entity.npc.Villager) -> c
-    158:158:boolean isHero(net.minecraft.world.entity.player.Player) -> a
-    162:164:boolean isWithinThrowingDistance(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.player.Player) -> a
-    168:168:int calculateTimeUntilNextGift(net.minecraft.server.level.ServerLevel) -> a
+net.minecraft.world.entity.ai.behavior.GiveGiftToHero -> aqs:
+    java.util.Map gifts -> b
+    int timeUntilNextGift -> c
+    boolean giftGivenDuringThisRun -> d
+    long timeSinceStart -> e
+    56:70:void <init>(int) -> <init>
+    74:83:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    88:93:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    97:97:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
+    102:113:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
+    117:121:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> d
+    124:128:void throwGift(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.LivingEntity) -> a
+    131:146:java.util.List getItemToThrow(net.minecraft.world.entity.npc.Villager) -> a
+    150:150:boolean isHeroVisible(net.minecraft.world.entity.npc.Villager) -> b
+    154:155:java.util.Optional getNearestTargetableHero(net.minecraft.world.entity.npc.Villager) -> c
+    159:159:boolean isHero(net.minecraft.world.entity.player.Player) -> a
+    163:165:boolean isWithinThrowingDistance(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.player.Player) -> a
+    169:169:int calculateTimeUntilNextGift(net.minecraft.server.level.ServerLevel) -> a
     30:30:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    30:30:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    30:30:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
+    30:30:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    30:30:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
     30:30:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
     30:30:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     40:53:void lambda$static$0(java.util.HashMap) -> a
     39:39:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.behavior.GoOutsideToCelebrate -> amj:
-    10:11:void <init>(float) -> <init>
-    15:16:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.ai.behavior.GoToClosestVillage -> amk:
-    float speed -> a
-    int closeEnoughDistance -> b
+net.minecraft.world.entity.ai.behavior.GoOutsideToCelebrate -> aqt:
+    9:10:void <init>(float) -> <init>
+    14:15:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.behavior.GoToCelebrateLocation -> aqu:
+    int closeEnoughDist -> b
+    float speedModifier -> c
+    17:25:void <init>(int,float) -> <init>
+    29:34:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    37:38:net.minecraft.core.BlockPos getNearbyPos(net.minecraft.world.entity.Mob,net.minecraft.core.BlockPos) -> a
+    42:42:int getRandomOffset(java.util.Random) -> a
+    46:46:net.minecraft.core.BlockPos getCelebrateLocation(net.minecraft.world.entity.Mob) -> a
+    12:12:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.GoToClosestVillage -> aqv:
+    float speedModifier -> b
+    int closeEnoughDistance -> c
     20:25:void <init>(float,int) -> <init>
     29:29:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
     34:56:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
     15:15:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     15:15:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     39:39:double lambda$start$0(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.behavior.HarvestFarmland -> aml:
-    net.minecraft.core.BlockPos aboveFarmlandPos -> a
-    boolean canPlantStuff -> b
-    boolean wantsToReapStuff -> c
-    long nextOkStartTime -> d
-    int timeWorkedSoFar -> e
-    java.util.List validFarmlandAroundVillager -> f
-    38:46:void <init>() -> <init>
-    50:90:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
-    95:95:net.minecraft.core.BlockPos getValidFarmland(net.minecraft.server.level.ServerLevel) -> a
-    99:103:boolean validPos(net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> a
-    108:112:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
-    116:120:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
-    124:177:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
-    181:181:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> d
+net.minecraft.world.entity.ai.behavior.GoToPotentialJobSite -> aqw:
+    float speedModifier -> b
+    29:33:void <init>(float) -> <init>
+    37:37:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    43:43:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    48:49:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
+    53:67:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
+    24:24:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    24:24:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    24:24:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    24:24:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
+    55:65:void lambda$stop$2(net.minecraft.server.level.ServerLevel,net.minecraft.core.GlobalPos) -> a
+    61:61:boolean lambda$null$1(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    37:37:java.lang.Boolean lambda$checkExtraStartConditions$0(net.minecraft.world.entity.schedule.Activity) -> a
+net.minecraft.world.entity.ai.behavior.GoToWantedItem -> aqx:
+    java.util.function.Predicate predicate -> b
+    int maxDistToWalk -> c
+    float speedModifier -> d
+    18:19:void <init>(float,boolean,int) -> <init>
+    21:29:void <init>(java.util.function.Predicate,float,boolean,int) -> <init>
+    33:33:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    38:39:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    42:42:net.minecraft.world.entity.item.ItemEntity getClosestLovedItem(net.minecraft.world.entity.LivingEntity) -> a
+    18:18:boolean lambda$new$0(net.minecraft.world.entity.LivingEntity) -> b
+net.minecraft.world.entity.ai.behavior.HarvestFarmland -> aqy:
+    net.minecraft.core.BlockPos aboveFarmlandPos -> b
+    long nextOkStartTime -> c
+    int timeWorkedSoFar -> d
+    java.util.List validFarmlandAroundVillager -> e
+    37:45:void <init>() -> <init>
+    49:72:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    77:77:net.minecraft.core.BlockPos getValidFarmland(net.minecraft.server.level.ServerLevel) -> a
+    81:85:boolean validPos(net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> a
+    90:94:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    98:102:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
+    106:163:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
+    167:167:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> d
     28:28:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    28:28:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    28:28:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
+    28:28:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    28:28:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
     28:28:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
     28:28:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.InsideBrownianWalk -> amm:
-    float speed -> a
+net.minecraft.world.entity.ai.behavior.InsideBrownianWalk -> aqz:
+    float speedModifier -> b
     20:22:void <init>(float) -> <init>
     26:26:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
     31:43:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
@@ -37917,27 +41360,30 @@ net.minecraft.world.entity.ai.behavior.InsideBrownianWalk -> amm:
     39:39:boolean lambda$start$2(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,net.minecraft.core.BlockPos) -> a
     38:38:boolean lambda$start$1(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,net.minecraft.core.BlockPos) -> b
     37:37:boolean lambda$start$0(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.behavior.InteractWith -> amn:
-    int maxDist -> a
-    float speed -> b
-    net.minecraft.world.entity.EntityType type -> c
-    int interactionRangeSqr -> d
-    java.util.function.Predicate targetFilter -> e
-    java.util.function.Predicate selfFilter -> f
-    net.minecraft.world.entity.ai.memory.MemoryModuleType memory -> g
-    27:41:void <init>(net.minecraft.world.entity.EntityType,int,java.util.function.Predicate,java.util.function.Predicate,net.minecraft.world.entity.ai.memory.MemoryModuleType,float,int) -> <init>
+net.minecraft.world.entity.ai.behavior.InteractWith -> ara:
+    int maxDist -> b
+    float speedModifier -> c
+    net.minecraft.world.entity.EntityType type -> d
+    int interactionRangeSqr -> e
+    java.util.function.Predicate targetFilter -> f
+    java.util.function.Predicate selfFilter -> g
+    net.minecraft.world.entity.ai.memory.MemoryModuleType memory -> h
+    28:41:void <init>(net.minecraft.world.entity.EntityType,int,java.util.function.Predicate,java.util.function.Predicate,net.minecraft.world.entity.ai.memory.MemoryModuleType,float,int) -> <init>
     44:44:net.minecraft.world.entity.ai.behavior.InteractWith of(net.minecraft.world.entity.EntityType,int,net.minecraft.world.entity.ai.memory.MemoryModuleType,float,int) -> a
-    49:49:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    54:68:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    56:67:void lambda$start$7(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.Brain,java.util.List) -> a
-    63:66:void lambda$null$6(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> a
-    59:59:boolean lambda$null$5(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    58:58:net.minecraft.world.entity.LivingEntity lambda$null$4(net.minecraft.world.entity.LivingEntity) -> a
-    57:57:boolean lambda$null$3(net.minecraft.world.entity.LivingEntity) -> b
-    49:49:boolean lambda$checkExtraStartConditions$2(net.minecraft.world.entity.LivingEntity) -> c
-    44:44:boolean lambda$of$1(net.minecraft.world.entity.LivingEntity) -> d
-    44:44:boolean lambda$of$0(net.minecraft.world.entity.LivingEntity) -> e
-net.minecraft.world.entity.ai.behavior.InteractWithDoor -> amo:
+    48:48:net.minecraft.world.entity.ai.behavior.InteractWith of(net.minecraft.world.entity.EntityType,int,java.util.function.Predicate,net.minecraft.world.entity.ai.memory.MemoryModuleType,float,int) -> a
+    53:53:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    57:58:boolean seesAtLeastOneValidTarget(net.minecraft.world.entity.LivingEntity) -> a
+    62:62:boolean isTargetValid(net.minecraft.world.entity.LivingEntity) -> b
+    67:81:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    69:80:void lambda$start$7(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.Brain,java.util.List) -> a
+    76:79:void lambda$null$6(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> a
+    72:72:boolean lambda$null$5(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    71:71:net.minecraft.world.entity.LivingEntity lambda$null$4(net.minecraft.world.entity.LivingEntity) -> c
+    70:70:boolean lambda$null$3(net.minecraft.world.entity.LivingEntity) -> d
+    48:48:boolean lambda$of$2(net.minecraft.world.entity.LivingEntity) -> e
+    44:44:boolean lambda$of$1(net.minecraft.world.entity.LivingEntity) -> f
+    44:44:boolean lambda$of$0(net.minecraft.world.entity.LivingEntity) -> g
+net.minecraft.world.entity.ai.behavior.InteractWithDoor -> arb:
     31:36:void <init>() -> <init>
     41:51:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     54:59:java.util.Set getDoorsThatAreOnMyPath(net.minecraft.server.level.ServerLevel,java.util.List,java.util.List) -> a
@@ -37948,12 +41394,12 @@ net.minecraft.world.entity.ai.behavior.InteractWithDoor -> amo:
     80:85:void lambda$null$2(boolean,net.minecraft.core.GlobalPos,java.util.Set) -> a
     56:56:boolean lambda$getDoorsThatAreOnMyPath$1(net.minecraft.server.level.ServerLevel,net.minecraft.core.GlobalPos) -> a
     44:44:net.minecraft.core.BlockPos lambda$start$0(net.minecraft.world.level.pathfinder.Node) -> a
-net.minecraft.world.entity.ai.behavior.JumpOnBed -> amp:
-    float speed -> a
-    net.minecraft.core.BlockPos targetBed -> b
-    int remainingTimeToReachBed -> c
-    int remainingJumps -> d
-    int remainingCooldownUntilNextJump -> e
+net.minecraft.world.entity.ai.behavior.JumpOnBed -> arc:
+    float speedModifier -> b
+    net.minecraft.core.BlockPos targetBed -> c
+    int remainingTimeToReachBed -> d
+    int remainingJumps -> e
+    int remainingCooldownUntilNextJump -> f
     35:40:void <init>(float) -> <init>
     44:44:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
     49:58:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
@@ -37970,16 +41416,16 @@ net.minecraft.world.entity.ai.behavior.JumpOnBed -> amp:
     133:133:boolean tiredOfWalking(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> e
     137:137:boolean tiredOfJumping(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> f
     19:19:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    19:19:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    19:19:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
+    19:19:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    19:19:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
     19:19:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
     19:19:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     52:57:void lambda$start$0(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.behavior.LocateHidingPlace -> amq:
-    float speed -> a
-    int radius -> b
-    int closeEnoughDist -> c
-    java.util.Optional currentPos -> d
+net.minecraft.world.entity.ai.behavior.LocateHidingPlace -> ard:
+    float speedModifier -> b
+    int radius -> c
+    int closeEnoughDist -> d
+    java.util.Optional currentPos -> e
     21:33:void <init>(int,float,int) -> <init>
     37:45:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     50:74:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
@@ -37987,11 +41433,11 @@ net.minecraft.world.entity.ai.behavior.LocateHidingPlace -> amq:
     55:55:boolean lambda$start$2(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
     37:37:boolean lambda$checkExtraStartConditions$1(net.minecraft.core.BlockPos) -> b
     37:37:boolean lambda$checkExtraStartConditions$0(net.minecraft.world.entity.ai.village.poi.PoiType) -> b
-net.minecraft.world.entity.ai.behavior.LocateHidingPlaceDuringRaid -> amr:
-    10:11:void <init>(int,float) -> <init>
-    15:16:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.ai.behavior.LookAndFollowTradingPlayerSink -> ams:
-    float speed -> a
+net.minecraft.world.entity.ai.behavior.LocateHidingPlaceDuringRaid -> are:
+    9:10:void <init>(int,float) -> <init>
+    14:15:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.behavior.LookAndFollowTradingPlayerSink -> arf:
+    float speedModifier -> b
     16:24:void <init>(float) -> <init>
     28:34:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
     41:41:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
@@ -37999,77 +41445,66 @@ net.minecraft.world.entity.ai.behavior.LookAndFollowTradingPlayerSink -> ams:
     51:54:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
     58:59:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> d
     63:63:boolean timedOut(long) -> a
-    67:71:void followPlayer(net.minecraft.world.entity.npc.Villager) -> a
+    67:70:void followPlayer(net.minecraft.world.entity.npc.Villager) -> a
     12:12:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    12:12:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    12:12:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
+    12:12:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    12:12:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
     12:12:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
     12:12:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.LookAtTargetSink -> amt:
+net.minecraft.world.entity.ai.behavior.LookAtTargetSink -> arg:
     11:12:void <init>(int,int) -> <init>
     16:18:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
     23:24:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> b
     28:31:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> c
-    9:9:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    9:9:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
+    9:9:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    9:9:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
     9:9:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
-    29:30:void lambda$tick$1(net.minecraft.world.entity.Mob,net.minecraft.world.entity.ai.behavior.PositionWrapper) -> a
-    17:17:boolean lambda$canStillUse$0(net.minecraft.world.entity.Mob,net.minecraft.world.entity.ai.behavior.PositionWrapper) -> b
-net.minecraft.world.entity.ai.behavior.MakeLove -> amu:
-    long birthTimestamp -> a
-    29:37:void <init>() -> <init>
-    41:41:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
-    46:46:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
-    51:60:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
-    64:82:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
-    86:101:void tryToGiveBirth(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.npc.Villager) -> a
-    105:106:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> d
-    109:109:net.minecraft.world.entity.npc.Villager getBreedingTarget(net.minecraft.world.entity.npc.Villager) -> a
-    113:121:boolean isBreedingPossible(net.minecraft.world.entity.npc.Villager) -> b
-    125:126:java.util.Optional takeVacantBed(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> b
-    134:135:boolean canReach(net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos) -> a
-    139:151:java.util.Optional breed(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.npc.Villager) -> a
-    155:157:void giveBedToChild(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos) -> a
-    24:24:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    24:24:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    24:24:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
-    24:24:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
-    24:24:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    127:127:boolean lambda$takeVacantBed$0(net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos) -> b
-net.minecraft.world.entity.ai.behavior.MoveToSkySeeingSpot -> amv:
-    float speed -> a
+    29:30:void lambda$tick$1(net.minecraft.world.entity.Mob,net.minecraft.world.entity.ai.behavior.PositionTracker) -> a
+    17:17:boolean lambda$canStillUse$0(net.minecraft.world.entity.Mob,net.minecraft.world.entity.ai.behavior.PositionTracker) -> b
+net.minecraft.world.entity.ai.behavior.MeleeAttack -> arh:
+    int cooldownBetweenAttacks -> b
+    20:26:void <init>(int) -> <init>
+    30:33:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
+    38:38:boolean isHoldingUsableProjectileWeapon(net.minecraft.world.entity.Mob) -> a
+    43:48:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    51:51:net.minecraft.world.entity.LivingEntity getAttackTarget(net.minecraft.world.entity.Mob) -> b
+    16:16:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    16:16:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    38:38:boolean lambda$isHoldingUsableProjectileWeapon$0(net.minecraft.world.entity.Mob,net.minecraft.world.item.Item) -> a
+net.minecraft.world.entity.ai.behavior.Mount -> ari:
+    float speedModifier -> b
+    19:25:void <init>(float) -> <init>
+    29:29:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    34:39:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    42:42:boolean isCloseEnoughToStartRiding(net.minecraft.world.entity.LivingEntity) -> a
+    46:46:net.minecraft.world.entity.Entity getRidableEntity(net.minecraft.world.entity.LivingEntity) -> b
+net.minecraft.world.entity.ai.behavior.MoveToSkySeeingSpot -> arj:
+    float speedModifier -> b
     21:24:void <init>(float) -> <init>
     28:32:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     36:36:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     41:51:net.minecraft.world.phys.Vec3 getOutdoorPosition(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> b
     55:55:boolean hasNoBlocksAbove(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,net.minecraft.core.BlockPos) -> a
     30:30:net.minecraft.world.entity.ai.memory.WalkTarget lambda$start$0(net.minecraft.world.phys.Vec3) -> a
-net.minecraft.world.entity.ai.behavior.MoveToTargetSink -> amw:
-    net.minecraft.world.level.pathfinder.Path path -> a
-    net.minecraft.core.BlockPos lastTargetPos -> b
-    float speed -> c
-    int remainingDelay -> d
-    36:43:void <init>(int) -> <init>
-    47:58:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
-    63:69:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
-    74:78:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> b
-    82:87:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> c
-    91:115:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> d
-    118:142:boolean tryComputePath(net.minecraft.world.entity.Mob,net.minecraft.world.entity.ai.memory.WalkTarget,long) -> a
-    146:146:boolean reachedTarget(net.minecraft.world.entity.Mob,net.minecraft.world.entity.ai.memory.WalkTarget) -> a
+net.minecraft.world.entity.ai.behavior.MoveToTargetSink -> ark:
+    net.minecraft.world.level.pathfinder.Path path -> b
+    net.minecraft.core.BlockPos lastTargetPos -> c
+    float speedModifier -> d
+    int remainingDelay -> e
+    36:44:void <init>(int) -> <init>
+    48:63:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
+    68:74:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    79:83:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> b
+    87:92:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> c
+    96:120:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> d
+    124:149:boolean tryComputePath(net.minecraft.world.entity.Mob,net.minecraft.world.entity.ai.memory.WalkTarget,long) -> a
+    153:153:boolean reachedTarget(net.minecraft.world.entity.Mob,net.minecraft.world.entity.ai.memory.WalkTarget) -> a
     25:25:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    25:25:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    25:25:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
+    25:25:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    25:25:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
     25:25:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
     25:25:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.PickUpItems -> amx:
-    java.util.List items -> a
-    17:24:void <init>() -> <init>
-    28:29:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
-    34:40:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
-    16:16:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    16:16:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.PlayTagWithOtherKids -> amy:
+net.minecraft.world.entity.ai.behavior.PlayTagWithOtherKids -> arl:
     37:43:void <init>() -> <init>
     50:50:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
     55:71:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
@@ -38092,67 +41527,121 @@ net.minecraft.world.entity.ai.behavior.PlayTagWithOtherKids -> amy:
     114:114:java.lang.Integer lambda$null$2(net.minecraft.world.entity.LivingEntity,java.lang.Integer) -> a
     103:103:boolean lambda$findSomeoneBeingChased$1(java.util.Map$Entry) -> a
     70:70:void lambda$start$0(net.minecraft.world.entity.PathfinderMob,net.minecraft.world.entity.LivingEntity) -> b
-net.minecraft.world.entity.ai.behavior.PositionWrapper -> amz:
-    net.minecraft.core.BlockPos getPos() -> a
-    net.minecraft.world.phys.Vec3 getLookAtPos() -> b
-    boolean isVisible(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.ai.behavior.ReactToBell -> ana:
-    15:16:void <init>() -> <init>
-    20:27:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.ResetProfession -> anb:
+net.minecraft.world.entity.ai.behavior.PoiCompetitorScan -> arm:
+    net.minecraft.world.entity.npc.VillagerProfession profession -> b
+    22:27:void <init>(net.minecraft.world.entity.npc.VillagerProfession) -> <init>
+    31:37:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    42:51:net.minecraft.world.entity.npc.Villager selectWinner(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.npc.Villager) -> a
+    55:57:boolean competesForSameJobsite(net.minecraft.core.GlobalPos,net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.npc.Villager) -> a
+    61:61:boolean hasMatchingProfession(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.npc.VillagerProfession) -> a
+    65:65:boolean hasJobSite(net.minecraft.world.entity.npc.Villager) -> a
+    18:18:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    34:36:void lambda$start$1(net.minecraft.world.entity.npc.Villager,net.minecraft.core.GlobalPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    34:34:boolean lambda$null$0(net.minecraft.core.GlobalPos,net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.npc.Villager) -> b
+net.minecraft.world.entity.ai.behavior.PositionTracker -> arn:
+    net.minecraft.world.phys.Vec3 currentPosition() -> a
+    net.minecraft.core.BlockPos currentBlockPosition() -> b
+    boolean isVisibleBy(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.behavior.RandomStroll -> aro:
+    float speedModifier -> b
+    int maxHorizontalDistance -> c
+    int maxVerticalDistance -> d
+    27:28:void <init>(float) -> <init>
+    31:37:void <init>(float,int,int) -> <init>
+    41:43:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
+    18:18:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    42:42:net.minecraft.world.entity.ai.memory.WalkTarget lambda$start$0(net.minecraft.world.phys.Vec3) -> a
+net.minecraft.world.entity.ai.behavior.ReactToBell -> arp:
+    14:15:void <init>() -> <init>
+    19:26:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.ResetProfession -> arq:
     17:18:void <init>() -> <init>
     22:26:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
     31:33:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
     15:15:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     15:15:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.ResetRaidStatus -> anc:
-    13:14:void <init>() -> <init>
-    18:18:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    23:31:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.RingBell -> and:
+net.minecraft.world.entity.ai.behavior.ResetRaidStatus -> arr:
+    12:13:void <init>() -> <init>
+    17:17:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    22:30:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.RingBell -> ars:
     19:20:void <init>() -> <init>
     24:24:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     29:39:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.RunOne -> ane:
+net.minecraft.world.entity.ai.behavior.RunIf -> art:
+    java.util.function.Predicate predicate -> b
+    net.minecraft.world.entity.ai.behavior.Behavior wrappedBehavior -> c
+    boolean checkWhileRunningAlso -> d
+    26:30:void <init>(java.util.Map,java.util.function.Predicate,net.minecraft.world.entity.ai.behavior.Behavior,boolean) -> <init>
+    33:36:java.util.Map mergeMaps(java.util.Map,java.util.Map) -> a
+    40:41:void <init>(java.util.function.Predicate,net.minecraft.world.entity.ai.behavior.Behavior,boolean) -> <init>
+    44:45:void <init>(java.util.function.Predicate,net.minecraft.world.entity.ai.behavior.Behavior) -> <init>
+    48:49:void <init>(java.util.Map,net.minecraft.world.entity.ai.behavior.Behavior) -> <init>
+    53:53:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    58:58:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    64:64:boolean timedOut(long) -> a
+    69:70:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    74:75:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
+    79:80:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    84:84:java.lang.String toString() -> toString
+    48:48:boolean lambda$new$0(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.behavior.RunOne -> aru:
     19:23:void <init>(java.util.List) -> <init>
     26:33:void <init>(java.util.Map,java.util.List) -> <init>
-net.minecraft.world.entity.ai.behavior.SetClosestHomeAsWalkTarget -> anf:
-    float speed -> a
-    it.unimi.dsi.fastutil.longs.Long2LongMap batchCache -> b
-    int triedCount -> c
-    long lastUpdate -> d
+net.minecraft.world.entity.ai.behavior.RunSometimes -> arv:
+    boolean resetTicks -> b
+    boolean wasRunning -> c
+    net.minecraft.util.IntRange interval -> d
+    net.minecraft.world.entity.ai.behavior.Behavior wrappedBehavior -> e
+    int ticksUntilNextStart -> f
+    19:20:void <init>(net.minecraft.world.entity.ai.behavior.Behavior,net.minecraft.util.IntRange) -> <init>
+    23:28:void <init>(net.minecraft.world.entity.ai.behavior.Behavior,boolean,net.minecraft.util.IntRange) -> <init>
+    32:46:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    51:52:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    56:56:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    61:64:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
+    68:70:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    73:74:void resetTicksUntilNextStart(net.minecraft.server.level.ServerLevel) -> a
+    78:78:boolean timedOut(long) -> a
+    83:83:java.lang.String toString() -> toString
+net.minecraft.world.entity.ai.behavior.SetClosestHomeAsWalkTarget -> arw:
+    float speedModifier -> b
+    it.unimi.dsi.fastutil.longs.Long2LongMap batchCache -> c
+    int triedCount -> d
+    long lastUpdate -> e
     31:42:void <init>(float) -> <init>
     46:54:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     59:93:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    91:91:boolean lambda$start$2(it.unimi.dsi.fastutil.longs.Long2LongMap$Entry) -> a
-    66:76:boolean lambda$start$1(net.minecraft.core.BlockPos) -> a
-    53:53:boolean lambda$checkExtraStartConditions$0(net.minecraft.core.BlockPos) -> b
-net.minecraft.world.entity.ai.behavior.SetEntityLookTarget -> ang:
-    java.util.function.Predicate predicate -> a
-    float maxDistSqr -> b
+    91:91:boolean lambda$start$1(it.unimi.dsi.fastutil.longs.Long2LongMap$Entry) -> a
+    66:76:boolean lambda$start$0(net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.ai.behavior.SetEntityLookTarget -> arx:
+    java.util.function.Predicate predicate -> b
+    float maxDistSqr -> c
     24:25:void <init>(net.minecraft.tags.Tag,float) -> <init>
     28:29:void <init>(net.minecraft.world.entity.MobCategory,float) -> <init>
     32:33:void <init>(net.minecraft.world.entity.EntityType,float) -> <init>
-    36:42:void <init>(java.util.function.Predicate,float) -> <init>
-    46:47:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    52:60:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    54:59:void lambda$start$5(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.Brain,java.util.List) -> a
-    58:58:void lambda$null$4(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> a
-    56:56:boolean lambda$null$3(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    36:37:void <init>(float) -> <init>
+    40:46:void <init>(java.util.function.Predicate,float) -> <init>
+    50:51:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    56:64:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    58:63:void lambda$start$6(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.Brain,java.util.List) -> a
+    62:62:void lambda$null$5(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> a
+    60:60:boolean lambda$null$4(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    36:36:boolean lambda$new$3(net.minecraft.world.entity.LivingEntity) -> a
     32:32:boolean lambda$new$2(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity) -> a
     28:28:boolean lambda$new$1(net.minecraft.world.entity.MobCategory,net.minecraft.world.entity.LivingEntity) -> a
     24:24:boolean lambda$new$0(net.minecraft.tags.Tag,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.ai.behavior.SetHiddenState -> anh:
-    int closeEnoughDist -> a
-    int stayHiddenTicks -> b
-    int ticksHidden -> c
+net.minecraft.world.entity.ai.behavior.SetHiddenState -> ary:
+    int closeEnoughDist -> b
+    int stayHiddenTicks -> c
+    int ticksHidden -> d
     29:37:void <init>(int,int) -> <init>
     41:57:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.SetLookAndInteract -> ani:
-    net.minecraft.world.entity.EntityType type -> a
-    int interactionRangeSqr -> b
-    java.util.function.Predicate targetFilter -> c
-    java.util.function.Predicate selfFilter -> d
+net.minecraft.world.entity.ai.behavior.SetLookAndInteract -> arz:
+    net.minecraft.world.entity.EntityType type -> b
+    int interactionRangeSqr -> c
+    java.util.function.Predicate targetFilter -> d
+    java.util.function.Predicate selfFilter -> e
     21:31:void <init>(net.minecraft.world.entity.EntityType,int,java.util.function.Predicate,java.util.function.Predicate) -> <init>
     34:35:void <init>(net.minecraft.world.entity.EntityType,int) -> <init>
     39:39:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
@@ -38164,25 +41653,38 @@ net.minecraft.world.entity.ai.behavior.SetLookAndInteract -> ani:
     49:49:boolean lambda$null$2(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
     34:34:boolean lambda$new$1(net.minecraft.world.entity.LivingEntity) -> c
     34:34:boolean lambda$new$0(net.minecraft.world.entity.LivingEntity) -> d
-net.minecraft.world.entity.ai.behavior.SetRaidStatus -> anj:
-    13:14:void <init>() -> <init>
-    18:18:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    23:36:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFromEntity -> ank:
-    net.minecraft.world.entity.ai.memory.MemoryModuleType memory -> a
-    float speed -> b
-    23:30:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,float) -> <init>
-    34:35:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
-    40:43:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
-    46:54:void moveAwayFromMob(net.minecraft.world.entity.PathfinderMob,net.minecraft.world.entity.Entity,float) -> a
+net.minecraft.world.entity.ai.behavior.SetRaidStatus -> asa:
+    12:13:void <init>() -> <init>
     17:17:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    22:35:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom -> asb:
+    net.minecraft.world.entity.ai.memory.MemoryModuleType walkAwayFromMemory -> b
+    float speedModifier -> c
+    int desiredDistance -> d
+    java.util.function.Function toPosition -> e
+    23:32:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,float,int,boolean,java.util.function.Function) -> <init>
+    35:35:net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom pos(net.minecraft.world.entity.ai.memory.MemoryModuleType,float,int,boolean) -> a
+    39:39:net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom entity(net.minecraft.world.entity.ai.memory.MemoryModuleType,float,int,boolean) -> b
+    44:47:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
+    51:51:net.minecraft.world.phys.Vec3 getPosToAvoid(net.minecraft.world.entity.PathfinderMob) -> a
+    55:66:boolean alreadyWalkingAwayFromPosWithSameSpeed(net.minecraft.world.entity.PathfinderMob) -> b
+    71:72:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
+    75:83:void moveAwayFrom(net.minecraft.world.entity.PathfinderMob,net.minecraft.world.phys.Vec3,float) -> a
+    16:16:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    16:16:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.ai.behavior.SetWalkTargetFromAttackTargetIfTargetOutOfReach -> asc:
+    float speedModifier -> b
+    22:30:void <init>(float) -> <init>
+    34:40:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    43:49:void setWalkAndLookTarget(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    52:53:void clearWalkTarget(net.minecraft.world.entity.LivingEntity) -> a
     17:17:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.SetWalkTargetFromBlockMemory -> anl:
-    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryType -> a
-    float speed -> b
-    int closeEnoughDist -> c
-    int tooFarDistance -> d
-    int tooLongUnreachableDuration -> e
+net.minecraft.world.entity.ai.behavior.SetWalkTargetFromBlockMemory -> asd:
+    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryType -> b
+    float speedModifier -> c
+    int closeEnoughDist -> d
+    int tooFarDistance -> e
+    int tooLongUnreachableDuration -> f
     34:44:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,float,int,int,int) -> <init>
     47:52:void dropPOI(net.minecraft.world.entity.npc.Villager,long) -> a
     56:85:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
@@ -38191,17 +41693,17 @@ net.minecraft.world.entity.ai.behavior.SetWalkTargetFromBlockMemory -> anl:
     101:102:boolean closeEnough(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,net.minecraft.core.GlobalPos) -> b
     21:21:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     58:84:void lambda$start$0(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long,net.minecraft.world.entity.ai.Brain,net.minecraft.core.GlobalPos) -> a
-net.minecraft.world.entity.ai.behavior.SetWalkTargetFromLookTarget -> anm:
-    float speed -> a
-    int closeEnoughDistance -> b
+net.minecraft.world.entity.ai.behavior.SetWalkTargetFromLookTarget -> ase:
+    float speedModifier -> b
+    int closeEnoughDistance -> c
     19:26:void <init>(float,int) -> <init>
     30:33:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.ShowTradesToPlayer -> ann:
-    net.minecraft.world.item.ItemStack playerItemStack -> a
-    java.util.List displayItems -> b
-    int cycleCounter -> c
-    int displayIndex -> d
-    int lookTime -> e
+net.minecraft.world.entity.ai.behavior.ShowTradesToPlayer -> asf:
+    net.minecraft.world.item.ItemStack playerItemStack -> b
+    java.util.List displayItems -> c
+    int cycleCounter -> d
+    int displayIndex -> e
+    int lookTime -> f
     27:40:void <init>(int,int) -> <init>
     44:54:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
     59:61:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
@@ -38215,107 +41717,162 @@ net.minecraft.world.entity.ai.behavior.ShowTradesToPlayer -> ann:
     133:138:net.minecraft.world.entity.LivingEntity lookAtTarget(net.minecraft.world.entity.npc.Villager) -> c
     142:150:void displayCyclingItems(net.minecraft.world.entity.npc.Villager) -> d
     20:20:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    20:20:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    20:20:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
+    20:20:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    20:20:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
     20:20:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
     20:20:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.SleepInBed -> ano:
-    long nextOkStartTime -> a
-    27:31:void <init>() -> <init>
-    35:54:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    59:66:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    71:78:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    82:82:boolean timedOut(long) -> a
-    87:91:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
-    73:74:void lambda$start$0(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,java.util.Set) -> a
-net.minecraft.world.entity.ai.behavior.SocializeAtBell -> anp:
-    18:25:void <init>() -> <init>
-    29:35:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    40:52:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    42:51:void lambda$start$4(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.Brain,java.util.List) -> a
-    47:50:void lambda$null$3(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> a
-    44:44:boolean lambda$null$2(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    43:43:boolean lambda$null$1(net.minecraft.world.entity.LivingEntity) -> a
-    35:35:boolean lambda$checkExtraStartConditions$0(net.minecraft.world.entity.LivingEntity) -> b
-net.minecraft.world.entity.ai.behavior.StrollAroundPoi -> anq:
-    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryType -> a
+net.minecraft.world.entity.ai.behavior.SleepInBed -> asg:
     long nextOkStartTime -> b
-    int maxDistanceFromPoi -> c
-    31:38:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,int) -> <init>
-    42:45:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
-    50:55:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
-    20:20:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    20:20:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    52:52:net.minecraft.world.entity.ai.memory.WalkTarget lambda$start$0(net.minecraft.world.phys.Vec3) -> a
-net.minecraft.world.entity.ai.behavior.StrollToPoi -> anr:
-    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryType -> a
-    int closeEnoughDist -> b
-    int maxDistanceFromPoi -> c
-    long nextOkStartTime -> d
+    25:29:void <init>() -> <init>
+    33:53:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    58:65:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    70:77:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    81:81:boolean timedOut(long) -> a
+    86:90:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    72:73:void lambda$start$0(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,java.util.Set) -> a
+net.minecraft.world.entity.ai.behavior.SocializeAtBell -> ash:
+    19:26:void <init>() -> <init>
+    30:36:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    41:53:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    43:52:void lambda$start$4(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.Brain,java.util.List) -> a
+    48:51:void lambda$null$3(net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> a
+    45:45:boolean lambda$null$2(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    44:44:boolean lambda$null$1(net.minecraft.world.entity.LivingEntity) -> a
+    36:36:boolean lambda$checkExtraStartConditions$0(net.minecraft.world.entity.LivingEntity) -> b
+net.minecraft.world.entity.ai.behavior.StartAttacking -> asi:
+    java.util.function.Predicate canAttackPredicate -> b
+    java.util.function.Function targetFinderFunction -> c
+    25:31:void <init>(java.util.function.Predicate,java.util.function.Function) -> <init>
+    34:35:void <init>(java.util.function.Function) -> <init>
+    39:44:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
+    49:50:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    53:55:void setAttackTarget(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
+    17:17:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    17:17:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    49:49:void lambda$start$1(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> b
+    34:34:boolean lambda$new$0(net.minecraft.world.entity.Mob) -> a
+net.minecraft.world.entity.ai.behavior.StartCelebratingIfTargetDead -> asj:
+    int celebrateDuration -> b
+    java.util.function.BiPredicate dancePredicate -> c
+    24:32:void <init>(int,java.util.function.BiPredicate) -> <init>
+    36:36:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    41:51:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    54:54:net.minecraft.world.entity.LivingEntity getAttackTarget(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.behavior.StopAttackingIfTargetInvalid -> ask:
+    java.util.function.Predicate stopAttackingWhen -> b
+    24:29:void <init>(java.util.function.Predicate) -> <init>
+    36:37:void <init>() -> <init>
+    42:71:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    74:74:boolean isCurrentTargetInDifferentLevel(net.minecraft.world.entity.Mob) -> a
+    78:78:net.minecraft.world.entity.LivingEntity getAttackTarget(net.minecraft.world.entity.Mob) -> b
+    82:83:boolean isTiredOfTryingToReachTarget(net.minecraft.world.entity.LivingEntity) -> a
+    87:88:boolean isCurrentTargetDeadOrRemoved(net.minecraft.world.entity.Mob) -> c
+    92:93:void clearAttackTarget(net.minecraft.world.entity.Mob) -> d
+    19:19:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    36:36:boolean lambda$new$0(net.minecraft.world.entity.LivingEntity) -> b
+net.minecraft.world.entity.ai.behavior.StopBeingAngryIfTargetDead -> asl:
+    13:16:void <init>() -> <init>
+    20:27:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    11:11:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    21:26:void lambda$start$0(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.behavior.StrollAroundPoi -> asm:
+    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryType -> b
+    long nextOkStartTime -> c
+    int maxDistanceFromPoi -> d
+    30:37:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,int) -> <init>
+    41:44:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
+    49:54:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
+    19:19:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    19:19:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    51:51:net.minecraft.world.entity.ai.memory.WalkTarget lambda$start$0(net.minecraft.world.phys.Vec3) -> a
+net.minecraft.world.entity.ai.behavior.StrollToPoi -> asn:
+    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryType -> b
+    int closeEnoughDist -> c
+    int maxDistanceFromPoi -> d
+    long nextOkStartTime -> e
     23:31:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,int,int) -> <init>
     35:36:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
     41:47:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
+    15:15:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    15:15:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    44:44:void lambda$start$0(net.minecraft.world.entity.ai.Brain,net.minecraft.core.GlobalPos) -> a
+net.minecraft.world.entity.ai.behavior.StrollToPoiList -> aso:
+    net.minecraft.world.entity.ai.memory.MemoryModuleType strollToMemoryType -> b
+    net.minecraft.world.entity.ai.memory.MemoryModuleType mustBeCloseToMemoryType -> c
+    float speedModifier -> d
+    int closeEnoughDist -> e
+    int maxDistanceFromPoi -> f
+    long nextOkStartTime -> g
+    net.minecraft.core.GlobalPos targetPos -> h
+    27:38:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,float,int,int,net.minecraft.world.entity.ai.memory.MemoryModuleType) -> <init>
+    42:51:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    56:60:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
     16:16:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     16:16:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    44:44:void lambda$start$0(net.minecraft.world.entity.ai.Brain,net.minecraft.core.GlobalPos) -> a
-net.minecraft.world.entity.ai.behavior.StrollToPoiList -> ans:
-    net.minecraft.world.entity.ai.memory.MemoryModuleType strollToMemoryType -> a
-    net.minecraft.world.entity.ai.memory.MemoryModuleType mustBeCloseToMemoryType -> b
-    float speed -> c
-    int closeEnoughDist -> d
-    int maxDistanceFromPoi -> e
-    long nextOkStartTime -> f
-    net.minecraft.core.GlobalPos targetPos -> g
-    28:39:void <init>(net.minecraft.world.entity.ai.memory.MemoryModuleType,float,int,int,net.minecraft.world.entity.ai.memory.MemoryModuleType) -> <init>
-    43:52:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
-    57:61:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
-    17:17:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    17:17:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.Swim -> ant:
-    float height -> a
+net.minecraft.world.entity.ai.behavior.Swim -> asp:
     float chance -> b
-    15:19:void <init>(float,float) -> <init>
-    23:23:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
-    28:28:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
-    33:36:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> b
-    10:10:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    10:10:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    10:10:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
-net.minecraft.world.entity.ai.behavior.TradeWithVillager -> anu:
-    java.util.Set trades -> a
-    24:31:void <init>() -> <init>
-    35:35:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
-    40:40:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
-    45:49:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
-    53:70:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
-    74:75:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> d
-    80:82:java.util.Set figureOutWhatIAmWillingToTrade(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.npc.Villager) -> a
-    89:115:void throwHalfStack(net.minecraft.world.entity.npc.Villager,java.util.Set,net.minecraft.world.entity.LivingEntity) -> a
-    22:22:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    22:22:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
-    22:22:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> f
-    22:22:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
-    22:22:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    82:82:boolean lambda$figureOutWhatIAmWillingToTrade$0(com.google.common.collect.ImmutableSet,net.minecraft.world.item.Item) -> a
-net.minecraft.world.entity.ai.behavior.UpdateActivityFromSchedule -> anv:
+    15:17:void <init>(float) -> <init>
+    21:21:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
+    26:26:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> a
+    31:34:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,long) -> b
+    11:11:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    11:11:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    11:11:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
+net.minecraft.world.entity.ai.behavior.TradeWithVillager -> asq:
+    java.util.Set trades -> b
+    26:33:void <init>() -> <init>
+    37:37:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    42:42:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    47:51:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
+    55:76:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
+    80:81:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> d
+    86:88:java.util.Set figureOutWhatIAmWillingToTrade(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.npc.Villager) -> a
+    95:121:void throwHalfStack(net.minecraft.world.entity.npc.Villager,java.util.Set,net.minecraft.world.entity.LivingEntity) -> a
+    23:23:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    23:23:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    23:23:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    23:23:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
+    23:23:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    88:88:boolean lambda$figureOutWhatIAmWillingToTrade$0(com.google.common.collect.ImmutableSet,net.minecraft.world.item.Item) -> a
+net.minecraft.world.entity.ai.behavior.UpdateActivityFromSchedule -> asr:
     9:10:void <init>() -> <init>
     14:15:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.ValidateNearbyPoi -> anw:
-    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryType -> a
-    java.util.function.Predicate poiPredicate -> b
-    30:36:void <init>(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.ai.memory.MemoryModuleType) -> <init>
-    40:42:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    47:58:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    61:62:boolean bedIsOccupied(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
-    66:66:boolean poiDoesntExist(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.behavior.VictoryStroll -> anx:
-    10:11:void <init>(float) -> <init>
-    15:16:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
-    8:8:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.ai.behavior.VillageBoundRandomStroll -> any:
-    float speed -> a
-    int maxXyDist -> b
-    int maxYDist -> c
+net.minecraft.world.entity.ai.behavior.UseBonemeal -> ass:
+    long nextWorkCycleTime -> b
+    long lastBonemealingSession -> c
+    int timeWorkedSoFar -> d
+    java.util.Optional cropPos -> e
+    30:37:void <init>() -> <init>
+    41:49:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    54:54:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    58:74:java.util.Optional pickNextTarget(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> b
+    78:80:boolean validPos(net.minecraft.core.BlockPos,net.minecraft.server.level.ServerLevel) -> a
+    85:91:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
+    94:99:void setCurrentCropAsTarget(net.minecraft.world.entity.npc.Villager) -> a
+    103:105:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
+    109:133:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> d
+    23:23:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    23:23:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    23:23:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    23:23:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
+    23:23:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    95:98:void lambda$setCurrentCropAsTarget$0(net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.ai.behavior.ValidateNearbyPoi -> ast:
+    net.minecraft.world.entity.ai.memory.MemoryModuleType memoryType -> b
+    java.util.function.Predicate poiPredicate -> c
+    29:35:void <init>(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.ai.memory.MemoryModuleType) -> <init>
+    39:41:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    46:57:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    60:61:boolean bedIsOccupied(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
+    65:65:boolean poiDoesntExist(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.ai.behavior.VictoryStroll -> asu:
+    9:10:void <init>(float) -> <init>
+    14:15:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob) -> a
+    7:7:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.behavior.VillageBoundRandomStroll -> asv:
+    float speedModifier -> b
+    int maxXyDist -> c
+    int maxYDist -> d
     31:32:void <init>(float) -> <init>
     35:41:void <init>(float,int,int) -> <init>
     45:58:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.PathfinderMob,long) -> a
@@ -38324,85 +41881,136 @@ net.minecraft.world.entity.ai.behavior.VillageBoundRandomStroll -> any:
     22:22:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     67:67:net.minecraft.world.entity.ai.memory.WalkTarget lambda$setRandomPos$1(net.minecraft.world.phys.Vec3) -> a
     62:62:net.minecraft.world.entity.ai.memory.WalkTarget lambda$setTargetedPos$0(net.minecraft.world.phys.Vec3) -> b
-net.minecraft.world.entity.ai.behavior.VillagerCalmDown -> anz:
+net.minecraft.world.entity.ai.behavior.VillagerCalmDown -> asw:
     16:17:void <init>() -> <init>
     21:27:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
     30:32:boolean isCloseToEntityThatHurtMe(net.minecraft.world.entity.npc.Villager) -> a
     12:12:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
     31:31:boolean lambda$isCloseToEntityThatHurtMe$0(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.ai.behavior.VillagerGoalPackages -> aoa:
-    24:24:void <init>() -> <init>
-    29:44:com.google.common.collect.ImmutableList getCorePackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> a
-    49:63:com.google.common.collect.ImmutableList getWorkPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> b
-    68:86:com.google.common.collect.ImmutableList getPlayPackage(float) -> a
-    91:108:com.google.common.collect.ImmutableList getRestPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> c
-    113:133:com.google.common.collect.ImmutableList getMeetPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> d
-    138:170:com.google.common.collect.ImmutableList getIdlePackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> e
-    175:182:com.google.common.collect.ImmutableList getPanicPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> f
-    187:194:com.google.common.collect.ImmutableList getPreRaidPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> g
-    199:207:com.google.common.collect.ImmutableList getRaidPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> h
-    212:216:com.google.common.collect.ImmutableList getHidePackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> i
-    221:228:com.mojang.datafixers.util.Pair getFullLookBehavior() -> a
-    233:236:com.mojang.datafixers.util.Pair getMinimalLookBehavior() -> b
-net.minecraft.world.entity.ai.behavior.VillagerPanicTrigger -> aob:
+net.minecraft.world.entity.ai.behavior.VillagerGoalPackages -> asx:
+    25:25:void <init>() -> <init>
+    30:50:com.google.common.collect.ImmutableList getCorePackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> a
+    56:76:com.google.common.collect.ImmutableList getWorkPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> b
+    81:99:com.google.common.collect.ImmutableList getPlayPackage(float) -> a
+    104:121:com.google.common.collect.ImmutableList getRestPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> c
+    126:146:com.google.common.collect.ImmutableList getMeetPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> d
+    151:183:com.google.common.collect.ImmutableList getIdlePackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> e
+    188:195:com.google.common.collect.ImmutableList getPanicPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> f
+    200:207:com.google.common.collect.ImmutableList getPreRaidPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> g
+    212:220:com.google.common.collect.ImmutableList getRaidPackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> h
+    225:229:com.google.common.collect.ImmutableList getHidePackage(net.minecraft.world.entity.npc.VillagerProfession,float) -> i
+    234:242:com.mojang.datafixers.util.Pair getFullLookBehavior() -> a
+    247:250:com.mojang.datafixers.util.Pair getMinimalLookBehavior() -> b
+net.minecraft.world.entity.ai.behavior.VillagerMakeLove -> asy:
+    long birthTimestamp -> b
+    31:39:void <init>() -> <init>
+    43:43:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    48:48:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    53:62:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
+    66:84:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
+    88:103:void tryToGiveBirth(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.npc.Villager) -> a
+    107:108:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> d
+    111:119:boolean isBreedingPossible(net.minecraft.world.entity.npc.Villager) -> a
+    123:126:java.util.Optional takeVacantBed(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> b
+    132:133:boolean canReach(net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos) -> a
+    137:149:java.util.Optional breed(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.npc.Villager) -> a
+    153:155:void giveBedToChild(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos) -> a
+    25:25:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    25:25:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    25:25:void stop(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> c
+    25:25:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
+    25:25:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    125:125:boolean lambda$takeVacantBed$1(net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos) -> b
+    113:113:boolean lambda$isBreedingPossible$0(net.minecraft.world.entity.AgableMob) -> a
+net.minecraft.world.entity.ai.behavior.VillagerPanicTrigger -> asz:
     16:17:void <init>() -> <init>
     21:21:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
     26:39:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
     43:46:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> c
     49:49:boolean hasHostile(net.minecraft.world.entity.LivingEntity) -> a
     53:53:boolean isHurt(net.minecraft.world.entity.LivingEntity) -> b
-    14:14:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> g
+    14:14:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
     14:14:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> d
     14:14:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.WakeUp -> aoc:
+net.minecraft.world.entity.ai.behavior.WakeUp -> ata:
     13:14:void <init>() -> <init>
     18:18:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     23:24:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-net.minecraft.world.entity.ai.behavior.WeightedList -> aod:
+net.minecraft.world.entity.ai.behavior.WeightedList -> atb:
     java.util.List entries -> a
     java.util.Random random -> b
-    15:20:void <init>(java.util.Random) -> <init>
-    23:24:void <init>() -> <init>
-    27:36:void <init>(com.mojang.datafixers.Dynamic,java.util.function.Function) -> <init>
-    39:39:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps,java.util.function.Function) -> a
-    49:50:net.minecraft.world.entity.ai.behavior.WeightedList add(java.lang.Object,int) -> a
-    54:54:net.minecraft.world.entity.ai.behavior.WeightedList shuffle() -> a
-    58:60:net.minecraft.world.entity.ai.behavior.WeightedList shuffle(java.util.Random) -> a
-    64:64:java.util.stream.Stream stream() -> b
-    68:68:java.util.stream.Stream streamEntries() -> c
-    72:72:java.lang.Object getOne() -> d
-    76:76:java.lang.Object getOne(java.util.Random) -> b
-    113:113:java.lang.String toString() -> toString
-    59:59:double lambda$shuffle$4(java.lang.Object) -> a
-    58:58:void lambda$shuffle$3(java.util.Random,net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry) -> a
-    39:43:java.lang.Object lambda$serialize$2(com.mojang.datafixers.types.DynamicOps,java.util.function.Function,net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry) -> a
-    29:29:void lambda$new$1(java.util.function.Function,com.mojang.datafixers.Dynamic) -> a
-    30:33:net.minecraft.world.entity.ai.behavior.WeightedList lambda$null$0(java.util.function.Function,com.mojang.datafixers.Dynamic,com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.entity.ai.behavior.WeightedList$1 -> aod$1:
-net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry -> aod$a:
-    java.lang.Object data -> b
-    int weight -> c
-    double randWeight -> d
-    net.minecraft.world.entity.ai.behavior.WeightedList this$0 -> a
-    84:87:void <init>(net.minecraft.world.entity.ai.behavior.WeightedList,java.lang.Object,int) -> <init>
-    90:90:double getRandWeight() -> c
-    94:95:void setRandom(float) -> a
-    98:98:java.lang.Object getData() -> a
-    102:102:int getWeight() -> b
-    107:107:java.lang.String toString() -> toString
-    79:79:void <init>(net.minecraft.world.entity.ai.behavior.WeightedList,java.lang.Object,int,net.minecraft.world.entity.ai.behavior.WeightedList$1) -> <init>
-    79:79:double access$100(net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry) -> a
-    79:79:void access$200(net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry,float) -> a
-net.minecraft.world.entity.ai.behavior.WorkAtPoi -> aoe:
-    long lastCheck -> a
-    24:28:void <init>() -> <init>
-    32:43:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
-    48:59:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
-    19:19:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    19:19:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
-    51:51:void lambda$start$0(net.minecraft.world.entity.ai.Brain,net.minecraft.core.GlobalPos) -> a
-net.minecraft.world.entity.ai.behavior.package-info -> aof:
-net.minecraft.world.entity.ai.control.BodyRotationControl -> aog:
+    20:21:void <init>() -> <init>
+    23:26:void <init>(java.util.List) -> <init>
+    29:29:com.mojang.serialization.Codec codec(com.mojang.serialization.Codec) -> a
+    33:34:net.minecraft.world.entity.ai.behavior.WeightedList add(java.lang.Object,int) -> a
+    38:38:net.minecraft.world.entity.ai.behavior.WeightedList shuffle() -> a
+    42:44:net.minecraft.world.entity.ai.behavior.WeightedList shuffle(java.util.Random) -> a
+    48:48:boolean isEmpty() -> b
+    52:52:java.util.stream.Stream stream() -> c
+    56:56:java.lang.Object getOne() -> d
+    60:60:java.lang.Object getOne(java.util.Random) -> b
+    118:118:java.lang.String toString() -> toString
+    43:43:double lambda$shuffle$2(java.lang.Object) -> a
+    42:42:void lambda$shuffle$1(java.util.Random,net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry) -> a
+    29:29:java.util.List lambda$codec$0(net.minecraft.world.entity.ai.behavior.WeightedList) -> a
+net.minecraft.world.entity.ai.behavior.WeightedList$1 -> atb$1:
+net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry -> atb$a:
+    java.lang.Object data -> a
+    int weight -> b
+    double randWeight -> c
+    68:71:void <init>(java.lang.Object,int) -> <init>
+    74:74:double getRandWeight() -> c
+    78:79:void setRandom(float) -> a
+    82:82:java.lang.Object getData() -> a
+    86:86:int getWeight() -> b
+    91:91:java.lang.String toString() -> toString
+    95:95:com.mojang.serialization.Codec codec(com.mojang.serialization.Codec) -> a
+    63:63:void <init>(java.lang.Object,int,net.minecraft.world.entity.ai.behavior.WeightedList$1) -> <init>
+    63:63:java.lang.Object access$100(net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry) -> a
+    63:63:int access$200(net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry) -> b
+    63:63:double access$300(net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry) -> c
+    63:63:void access$400(net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry,float) -> a
+net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry$1 -> atb$a$1:
+    com.mojang.serialization.Codec val$elementCodec -> a
+    95:95:void <init>(com.mojang.serialization.Codec) -> <init>
+    98:102:com.mojang.serialization.DataResult decode(com.mojang.serialization.DynamicOps,java.lang.Object) -> decode
+    107:110:com.mojang.serialization.DataResult encode(net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry,com.mojang.serialization.DynamicOps,java.lang.Object) -> a
+    95:95:com.mojang.serialization.DataResult encode(java.lang.Object,com.mojang.serialization.DynamicOps,java.lang.Object) -> encode
+    102:102:com.mojang.datafixers.util.Pair lambda$decode$1(com.mojang.serialization.DynamicOps,net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry) -> a
+    101:101:net.minecraft.world.entity.ai.behavior.WeightedList$WeightedEntry lambda$decode$0(com.mojang.serialization.Dynamic,java.lang.Object) -> a
+net.minecraft.world.entity.ai.behavior.WorkAtComposter -> atc:
+    java.util.List COMPOSTABLE_ITEMS -> b
+    19:19:void <init>() -> <init>
+    27:39:void useWorkstation(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    43:78:void compostItems(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,net.minecraft.core.GlobalPos,net.minecraft.world.level.block.state.BlockState) -> a
+    81:100:void makeBread(net.minecraft.world.entity.npc.Villager) -> a
+    20:20:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.behavior.WorkAtPoi -> atd:
+    long lastCheck -> b
+    25:29:void <init>() -> <init>
+    33:44:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> b
+    49:61:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    65:65:void useWorkstation(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    69:76:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> b
+    18:18:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    18:18:boolean canStillUse(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> b
+    18:18:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    52:52:void lambda$start$0(net.minecraft.world.entity.ai.Brain,net.minecraft.core.GlobalPos) -> a
+net.minecraft.world.entity.ai.behavior.YieldJobSite -> ate:
+    float speedModifier -> b
+    25:31:void <init>(float) -> <init>
+    35:39:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    44:54:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,long) -> a
+    58:73:boolean nearbyWantsJobsite(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos) -> a
+    77:84:void yieldJobSite(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos,boolean) -> a
+    87:88:boolean canReachPos(net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    92:95:void eraseMemories(net.minecraft.world.entity.npc.Villager) -> a
+    21:21:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    21:21:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+    53:53:void lambda$start$1(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager,net.minecraft.core.BlockPos,net.minecraft.world.entity.npc.Villager) -> a
+    51:51:boolean lambda$start$0(java.util.Optional,net.minecraft.core.BlockPos,net.minecraft.world.entity.npc.Villager) -> a
+net.minecraft.world.entity.ai.behavior.package-info -> atf:
+net.minecraft.world.entity.ai.control.BodyRotationControl -> atg:
     net.minecraft.world.entity.Mob mob -> a
     int headStableTime -> b
     float lastStableYHeadRot -> c
@@ -38413,23 +42021,23 @@ net.minecraft.world.entity.ai.control.BodyRotationControl -> aog:
     57:65:void rotateHeadTowardsFront() -> d
     68:68:boolean notCarryingMobPassengers() -> e
     72:75:boolean isMoving() -> f
-net.minecraft.world.entity.ai.control.Control -> aoh:
-net.minecraft.world.entity.ai.control.DolphinLookControl -> aoi:
+net.minecraft.world.entity.ai.control.Control -> ath:
+net.minecraft.world.entity.ai.control.DolphinLookControl -> ati:
     int maxYRotFromCenter -> h
     12:14:void <init>(net.minecraft.world.entity.Mob,int) -> <init>
     18:38:void tick() -> a
-net.minecraft.world.entity.ai.control.FlyingMoveControl -> aoj:
+net.minecraft.world.entity.ai.control.FlyingMoveControl -> atj:
     int maxTurn -> i
     boolean hoversInPlace -> j
     12:15:void <init>(net.minecraft.world.entity.Mob,int,boolean) -> <init>
     19:55:void tick() -> a
-net.minecraft.world.entity.ai.control.JumpControl -> aok:
+net.minecraft.world.entity.ai.control.JumpControl -> atk:
     net.minecraft.world.entity.Mob mob -> b
     boolean jump -> a
     9:11:void <init>(net.minecraft.world.entity.Mob) -> <init>
     14:15:void jump() -> a
     18:20:void tick() -> b
-net.minecraft.world.entity.ai.control.LookControl -> aol:
+net.minecraft.world.entity.ai.control.LookControl -> atl:
     net.minecraft.world.entity.Mob mob -> a
     float yMaxRotSpeed -> b
     float xMaxRotAngle -> c
@@ -38453,7 +42061,7 @@ net.minecraft.world.entity.ai.control.LookControl -> aol:
     97:99:float getYRotD() -> h
     103:105:float rotateTowards(float,float,float) -> a
     109:112:double getWantedY(net.minecraft.world.entity.Entity) -> b
-net.minecraft.world.entity.ai.control.MoveControl -> aom:
+net.minecraft.world.entity.ai.control.MoveControl -> atm:
     net.minecraft.world.entity.Mob mob -> a
     double wantedX -> b
     double wantedY -> c
@@ -38468,23 +42076,24 @@ net.minecraft.world.entity.ai.control.MoveControl -> aom:
     44:51:void setWantedPosition(double,double,double,double) -> a
     54:58:void strafe(float,float) -> a
     61:68:void copyFrom(net.minecraft.world.entity.ai.control.MoveControl) -> a
-    71:141:void tick() -> a
-    144:157:float rotlerp(float,float,float) -> a
-    161:161:double getWantedX() -> d
-    165:165:double getWantedY() -> e
-    169:169:double getWantedZ() -> f
-net.minecraft.world.entity.ai.control.MoveControl$Operation -> aom$a:
+    71:136:void tick() -> a
+    139:146:boolean isWalkable(float,float) -> b
+    150:163:float rotlerp(float,float,float) -> a
+    167:167:double getWantedX() -> d
+    171:171:double getWantedY() -> e
+    175:175:double getWantedZ() -> f
+net.minecraft.world.entity.ai.control.MoveControl$Operation -> atm$a:
     net.minecraft.world.entity.ai.control.MoveControl$Operation WAIT -> a
     net.minecraft.world.entity.ai.control.MoveControl$Operation MOVE_TO -> b
     net.minecraft.world.entity.ai.control.MoveControl$Operation STRAFE -> c
     net.minecraft.world.entity.ai.control.MoveControl$Operation JUMPING -> d
     net.minecraft.world.entity.ai.control.MoveControl$Operation[] $VALUES -> e
-    172:172:net.minecraft.world.entity.ai.control.MoveControl$Operation[] values() -> values
-    172:172:net.minecraft.world.entity.ai.control.MoveControl$Operation valueOf(java.lang.String) -> valueOf
-    172:172:void <init>(java.lang.String,int) -> <init>
-    172:176:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.control.package-info -> aon:
-net.minecraft.world.entity.ai.goal.AvoidEntityGoal -> aoo:
+    178:178:net.minecraft.world.entity.ai.control.MoveControl$Operation[] values() -> values
+    178:178:net.minecraft.world.entity.ai.control.MoveControl$Operation valueOf(java.lang.String) -> valueOf
+    178:178:void <init>(java.lang.String,int) -> <init>
+    178:182:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.control.package-info -> atn:
+net.minecraft.world.entity.ai.goal.AvoidEntityGoal -> ato:
     net.minecraft.world.entity.PathfinderMob mob -> a
     double walkSpeedModifier -> i
     double sprintSpeedModifier -> j
@@ -38506,7 +42115,7 @@ net.minecraft.world.entity.ai.goal.AvoidEntityGoal -> aoo:
     88:93:void tick() -> e
     47:47:boolean lambda$new$1(net.minecraft.world.entity.LivingEntity) -> a
     29:29:boolean lambda$new$0(net.minecraft.world.entity.LivingEntity) -> b
-net.minecraft.world.entity.ai.goal.BegGoal -> aop:
+net.minecraft.world.entity.ai.goal.BegGoal -> atp:
     net.minecraft.world.entity.animal.Wolf wolf -> a
     net.minecraft.world.entity.player.Player player -> b
     net.minecraft.world.level.Level level -> c
@@ -38520,7 +42129,7 @@ net.minecraft.world.entity.ai.goal.BegGoal -> aop:
     58:60:void stop() -> d
     64:66:void tick() -> e
     69:78:boolean playerHoldingInteresting(net.minecraft.world.entity.player.Player) -> a
-net.minecraft.world.entity.ai.goal.BoatGoals -> aoq:
+net.minecraft.world.entity.ai.goal.BoatGoals -> atq:
     net.minecraft.world.entity.ai.goal.BoatGoals GO_TO_BOAT -> a
     net.minecraft.world.entity.ai.goal.BoatGoals GO_IN_BOAT_DIRECTION -> b
     net.minecraft.world.entity.ai.goal.BoatGoals[] $VALUES -> c
@@ -38528,7 +42137,7 @@ net.minecraft.world.entity.ai.goal.BoatGoals -> aoq:
     15:15:net.minecraft.world.entity.ai.goal.BoatGoals valueOf(java.lang.String) -> valueOf
     15:15:void <init>(java.lang.String,int) -> <init>
     15:17:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.goal.BreakDoorGoal -> aor:
+net.minecraft.world.entity.ai.goal.BreakDoorGoal -> atr:
     java.util.function.Predicate validDifficulties -> g
     int breakTime -> a
     int lastBreakProgress -> b
@@ -38542,17 +42151,17 @@ net.minecraft.world.entity.ai.goal.BreakDoorGoal -> aor:
     58:60:void stop() -> d
     64:85:void tick() -> e
     88:88:boolean isValidDifficulty(net.minecraft.world.Difficulty) -> a
-net.minecraft.world.entity.ai.goal.BreathAirGoal -> aos:
+net.minecraft.world.entity.ai.goal.BreathAirGoal -> ats:
     net.minecraft.world.entity.PathfinderMob mob -> a
     19:22:void <init>(net.minecraft.world.entity.PathfinderMob) -> <init>
     26:26:boolean canUse() -> a
     31:31:boolean canContinueToUse() -> b
-    36:36:boolean isInterruptable() -> E_
+    36:36:boolean isInterruptable() -> D_
     41:42:void start() -> c
     45:67:void findAirPosition() -> g
     71:75:void tick() -> e
     78:79:boolean givesAir(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.goal.BreedGoal -> aot:
+net.minecraft.world.entity.ai.goal.BreedGoal -> att:
     net.minecraft.world.entity.ai.targeting.TargetingConditions PARTNER_TARGETING -> d
     net.minecraft.world.entity.animal.Animal animal -> a
     java.lang.Class partnerClass -> e
@@ -38560,16 +42169,16 @@ net.minecraft.world.entity.ai.goal.BreedGoal -> aot:
     net.minecraft.world.entity.animal.Animal partner -> c
     int loveTime -> f
     double speedModifier -> g
-    29:30:void <init>(net.minecraft.world.entity.animal.Animal,double) -> <init>
-    32:38:void <init>(net.minecraft.world.entity.animal.Animal,double,java.lang.Class) -> <init>
-    42:46:boolean canUse() -> a
-    51:51:boolean canContinueToUse() -> b
-    56:58:void stop() -> d
-    62:68:void tick() -> e
-    72:81:net.minecraft.world.entity.animal.Animal getFreePartner() -> h
-    85:114:void breed() -> g
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.goal.CatLieOnBedGoal -> aou:
+    22:23:void <init>(net.minecraft.world.entity.animal.Animal,double) -> <init>
+    25:31:void <init>(net.minecraft.world.entity.animal.Animal,double,java.lang.Class) -> <init>
+    35:39:boolean canUse() -> a
+    44:44:boolean canContinueToUse() -> b
+    49:51:void stop() -> d
+    55:61:void tick() -> e
+    65:74:net.minecraft.world.entity.animal.Animal getFreePartner() -> h
+    78:79:void breed() -> g
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.goal.CatLieOnBedGoal -> atu:
     net.minecraft.world.entity.animal.Cat cat -> g
     15:19:void <init>(net.minecraft.world.entity.animal.Cat,double,int) -> <init>
     23:23:boolean canUse() -> a
@@ -38578,15 +42187,17 @@ net.minecraft.world.entity.ai.goal.CatLieOnBedGoal -> aou:
     39:41:void stop() -> d
     45:53:void tick() -> e
     57:57:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.goal.CatSitOnBlockGoal -> aov:
+net.minecraft.world.entity.ai.goal.CatSitOnBlockGoal -> atv:
     net.minecraft.world.entity.animal.Cat cat -> g
-    19:21:void <init>(net.minecraft.world.entity.animal.Cat,double) -> <init>
-    25:25:boolean canUse() -> a
-    30:32:void start() -> c
-    36:38:void stop() -> d
-    42:50:void tick() -> e
-    54:70:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.goal.DolphinJumpGoal -> aow:
+    18:20:void <init>(net.minecraft.world.entity.animal.Cat,double) -> <init>
+    24:24:boolean canUse() -> a
+    29:31:void start() -> c
+    35:37:void stop() -> d
+    41:44:void tick() -> e
+    48:60:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    60:60:boolean lambda$isValidTarget$1(net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase) -> a
+    60:60:java.lang.Boolean lambda$null$0(net.minecraft.world.level.block.state.properties.BedPart) -> a
+net.minecraft.world.entity.ai.goal.DolphinJumpGoal -> atw:
     int[] STEPS_TO_CHECK -> a
     net.minecraft.world.entity.animal.Dolphin dolphin -> b
     int interval -> c
@@ -38596,27 +42207,27 @@ net.minecraft.world.entity.ai.goal.DolphinJumpGoal -> aow:
     48:49:boolean waterIsClear(net.minecraft.core.BlockPos,int,int,int) -> a
     53:54:boolean surfaceIsClear(net.minecraft.core.BlockPos,int,int,int) -> b
     59:60:boolean canContinueToUse() -> b
-    65:65:boolean isInterruptable() -> E_
+    65:65:boolean isInterruptable() -> D_
     71:79:void start() -> c
     83:84:void stop() -> d
     88:106:void tick() -> e
     14:14:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.goal.DoorInteractGoal -> aox:
+net.minecraft.world.entity.ai.goal.DoorInteractGoal -> atx:
     net.minecraft.world.entity.Mob mob -> d
     net.minecraft.core.BlockPos doorPos -> e
     boolean hasDoor -> f
     boolean passed -> a
     float doorOpenDirX -> b
     float doorOpenDirZ -> c
-    15:26:void <init>(net.minecraft.world.entity.Mob) -> <init>
-    29:37:boolean isOpen() -> g
-    41:47:void setOpen(boolean) -> a
-    51:74:boolean canUse() -> a
-    79:79:boolean canContinueToUse() -> b
-    84:87:void start() -> c
-    91:97:void tick() -> e
-    100:101:boolean isDoor(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.goal.EatBlockGoal -> aoy:
+    13:24:void <init>(net.minecraft.world.entity.Mob) -> <init>
+    27:35:boolean isOpen() -> g
+    39:45:void setOpen(boolean) -> a
+    49:75:boolean canUse() -> a
+    80:80:boolean canContinueToUse() -> b
+    85:88:void start() -> c
+    92:98:void tick() -> e
+    101:101:boolean hasGroundPathNavigation() -> h
+net.minecraft.world.entity.ai.goal.EatBlockGoal -> aty:
     java.util.function.Predicate IS_TALL_GRASS -> a
     net.minecraft.world.entity.Mob mob -> b
     net.minecraft.world.level.Level level -> c
@@ -38629,7 +42240,7 @@ net.minecraft.world.entity.ai.goal.EatBlockGoal -> aoy:
     67:67:int getEatAnimationTick() -> g
     72:94:void tick() -> e
     21:21:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.goal.FleeSunGoal -> aoz:
+net.minecraft.world.entity.ai.goal.FleeSunGoal -> atz:
     net.minecraft.world.entity.PathfinderMob mob -> a
     double wantedX -> b
     double wantedY -> c
@@ -38642,24 +42253,24 @@ net.minecraft.world.entity.ai.goal.FleeSunGoal -> aoz:
     62:62:boolean canContinueToUse() -> b
     67:68:void start() -> c
     72:82:net.minecraft.world.phys.Vec3 getHidePos() -> h
-net.minecraft.world.entity.ai.goal.FloatGoal -> apa:
+net.minecraft.world.entity.ai.goal.FloatGoal -> aua:
     net.minecraft.world.entity.Mob mob -> a
-    10:14:void <init>(net.minecraft.world.entity.Mob) -> <init>
-    19:21:boolean canUse() -> a
-    26:29:void tick() -> e
-net.minecraft.world.entity.ai.goal.FollowBoatGoal -> apb:
+    11:15:void <init>(net.minecraft.world.entity.Mob) -> <init>
+    19:19:boolean canUse() -> a
+    24:27:void tick() -> e
+net.minecraft.world.entity.ai.goal.FollowBoatGoal -> aub:
     int timeToRecalcPath -> a
     net.minecraft.world.entity.PathfinderMob mob -> b
-    net.minecraft.world.entity.LivingEntity following -> c
+    net.minecraft.world.entity.player.Player following -> c
     net.minecraft.world.entity.ai.goal.BoatGoals currentGoal -> d
     27:29:void <init>(net.minecraft.world.entity.PathfinderMob) -> <init>
     33:45:boolean canUse() -> a
-    50:50:boolean isInterruptable() -> E_
+    50:50:boolean isInterruptable() -> D_
     55:55:boolean canContinueToUse() -> b
     60:70:void start() -> c
     74:75:void stop() -> d
     79:112:void tick() -> e
-net.minecraft.world.entity.ai.goal.FollowFlockLeaderGoal -> apc:
+net.minecraft.world.entity.ai.goal.FollowFlockLeaderGoal -> auc:
     net.minecraft.world.entity.animal.AbstractSchoolingFish mob -> a
     int timeToRecalcPath -> b
     int nextStartTick -> c
@@ -38672,7 +42283,7 @@ net.minecraft.world.entity.ai.goal.FollowFlockLeaderGoal -> apc:
     68:74:void tick() -> e
     46:46:boolean lambda$canUse$1(net.minecraft.world.entity.animal.AbstractSchoolingFish) -> b
     41:41:boolean lambda$canUse$0(net.minecraft.world.entity.animal.AbstractSchoolingFish) -> c
-net.minecraft.world.entity.ai.goal.FollowMobGoal -> apd:
+net.minecraft.world.entity.ai.goal.FollowMobGoal -> aud:
     net.minecraft.world.entity.Mob mob -> a
     java.util.function.Predicate followPredicate -> b
     net.minecraft.world.entity.Mob followingMob -> c
@@ -38689,7 +42300,7 @@ net.minecraft.world.entity.ai.goal.FollowMobGoal -> apd:
     70:73:void stop() -> d
     77:106:void tick() -> e
     27:27:boolean lambda$new$0(net.minecraft.world.entity.Mob,net.minecraft.world.entity.Mob) -> a
-net.minecraft.world.entity.ai.goal.FollowOwnerGoal -> ape:
+net.minecraft.world.entity.ai.goal.FollowOwnerGoal -> aue:
     net.minecraft.world.entity.TamableAnimal tamable -> a
     net.minecraft.world.entity.LivingEntity owner -> b
     net.minecraft.world.level.LevelReader level -> c
@@ -38710,30 +42321,30 @@ net.minecraft.world.entity.ai.goal.FollowOwnerGoal -> ape:
     134:143:boolean maybeTeleportTo(int,int,int) -> a
     147:165:boolean canTeleportTo(net.minecraft.core.BlockPos) -> a
     169:169:int randomIntInclusive(int,int) -> a
-net.minecraft.world.entity.ai.goal.FollowParentGoal -> apf:
+net.minecraft.world.entity.ai.goal.FollowParentGoal -> auf:
     net.minecraft.world.entity.animal.Animal animal -> a
     net.minecraft.world.entity.animal.Animal parent -> b
     double speedModifier -> c
     int timeToRecalcPath -> d
-    13:16:void <init>(net.minecraft.world.entity.animal.Animal,double) -> <init>
-    20:47:boolean canUse() -> a
-    52:62:boolean canContinueToUse() -> b
-    67:68:void start() -> c
-    72:73:void stop() -> d
-    77:82:void tick() -> e
-net.minecraft.world.entity.ai.goal.Goal -> apg:
+    16:19:void <init>(net.minecraft.world.entity.animal.Animal,double) -> <init>
+    23:50:boolean canUse() -> a
+    55:65:boolean canContinueToUse() -> b
+    70:71:void start() -> c
+    75:76:void stop() -> d
+    80:85:void tick() -> e
+net.minecraft.world.entity.ai.goal.Goal -> aug:
     java.util.EnumSet flags -> a
     5:6:void <init>() -> <init>
     boolean canUse() -> a
     11:11:boolean canContinueToUse() -> b
-    15:15:boolean isInterruptable() -> E_
+    15:15:boolean isInterruptable() -> D_
     19:19:void start() -> c
     22:22:void stop() -> d
     25:25:void tick() -> e
     28:30:void setFlags(java.util.EnumSet) -> a
     34:34:java.lang.String toString() -> toString
     38:38:java.util.EnumSet getFlags() -> i
-net.minecraft.world.entity.ai.goal.Goal$Flag -> apg$a:
+net.minecraft.world.entity.ai.goal.Goal$Flag -> aug$a:
     net.minecraft.world.entity.ai.goal.Goal$Flag MOVE -> a
     net.minecraft.world.entity.ai.goal.Goal$Flag LOOK -> b
     net.minecraft.world.entity.ai.goal.Goal$Flag JUMP -> c
@@ -38743,56 +42354,68 @@ net.minecraft.world.entity.ai.goal.Goal$Flag -> apg$a:
     41:41:net.minecraft.world.entity.ai.goal.Goal$Flag valueOf(java.lang.String) -> valueOf
     41:41:void <init>(java.lang.String,int) -> <init>
     41:45:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.goal.GoalSelector -> aph:
+net.minecraft.world.entity.ai.goal.GoalSelector -> auh:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.entity.ai.goal.WrappedGoal NO_GOAL -> b
     java.util.Map lockedFlags -> c
     java.util.Set availableGoals -> d
-    net.minecraft.util.profiling.ProfilerFiller profiler -> e
+    java.util.function.Supplier profiler -> e
     java.util.EnumSet disabledFlags -> f
     int newGoalRate -> g
-    28:37:void <init>(net.minecraft.util.profiling.ProfilerFiller) -> <init>
-    44:45:void addGoal(int,net.minecraft.world.entity.ai.goal.Goal) -> a
-    48:50:void removeGoal(net.minecraft.world.entity.ai.goal.Goal) -> a
-    54:82:void tick() -> a
-    85:85:java.util.Set getAvailableGoals() -> b
-    89:89:java.util.stream.Stream getRunningGoals() -> c
-    93:94:void setNewGoalRate(int) -> a
-    97:98:void disableControlFlag(net.minecraft.world.entity.ai.goal.Goal$Flag) -> a
-    101:102:void enableControlFlag(net.minecraft.world.entity.ai.goal.Goal$Flag) -> b
-    105:110:void setControlFlag(net.minecraft.world.entity.ai.goal.Goal$Flag,boolean) -> a
-    70:76:void lambda$tick$9(net.minecraft.world.entity.ai.goal.WrappedGoal) -> a
-    71:74:void lambda$null$8(net.minecraft.world.entity.ai.goal.WrappedGoal,net.minecraft.world.entity.ai.goal.Goal$Flag) -> a
-    67:67:boolean lambda$tick$7(net.minecraft.world.entity.ai.goal.WrappedGoal) -> b
-    67:67:boolean lambda$null$6(net.minecraft.world.entity.ai.goal.WrappedGoal,net.minecraft.world.entity.ai.goal.Goal$Flag) -> b
-    66:66:boolean lambda$tick$5(net.minecraft.world.entity.ai.goal.WrappedGoal) -> c
-    65:65:boolean lambda$tick$4(net.minecraft.world.entity.ai.goal.WrappedGoal) -> d
-    57:60:void lambda$tick$3(net.minecraft.world.entity.ai.goal.Goal$Flag,net.minecraft.world.entity.ai.goal.WrappedGoal) -> a
-    55:55:boolean lambda$tick$2(net.minecraft.world.entity.ai.goal.WrappedGoal) -> e
-    49:49:boolean lambda$removeGoal$1(net.minecraft.world.entity.ai.goal.Goal,net.minecraft.world.entity.ai.goal.WrappedGoal) -> a
-    48:48:boolean lambda$removeGoal$0(net.minecraft.world.entity.ai.goal.Goal,net.minecraft.world.entity.ai.goal.WrappedGoal) -> b
-    15:16:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.goal.GoalSelector$1 -> aph$1:
-    16:16:void <init>() -> <init>
-    19:19:boolean canUse() -> a
-net.minecraft.world.entity.ai.goal.GoalSelector$2 -> aph$2:
-    21:21:void <init>(int,net.minecraft.world.entity.ai.goal.Goal) -> <init>
-    24:24:boolean isRunning() -> g
-net.minecraft.world.entity.ai.goal.InteractGoal -> api:
+    30:39:void <init>(java.util.function.Supplier) -> <init>
+    46:47:void addGoal(int,net.minecraft.world.entity.ai.goal.Goal) -> a
+    51:52:void removeAllGoals() -> a
+    55:57:void removeGoal(net.minecraft.world.entity.ai.goal.Goal) -> a
+    61:90:void tick() -> b
+    93:93:java.util.Set getAvailableGoals() -> c
+    97:97:java.util.stream.Stream getRunningGoals() -> d
+    101:102:void setNewGoalRate(int) -> a
+    105:106:void disableControlFlag(net.minecraft.world.entity.ai.goal.Goal$Flag) -> a
+    109:110:void enableControlFlag(net.minecraft.world.entity.ai.goal.Goal$Flag) -> b
+    113:118:void setControlFlag(net.minecraft.world.entity.ai.goal.Goal$Flag,boolean) -> a
+    78:84:void lambda$tick$9(net.minecraft.world.entity.ai.goal.WrappedGoal) -> a
+    79:82:void lambda$null$8(net.minecraft.world.entity.ai.goal.WrappedGoal,net.minecraft.world.entity.ai.goal.Goal$Flag) -> a
+    75:75:boolean lambda$tick$7(net.minecraft.world.entity.ai.goal.WrappedGoal) -> b
+    75:75:boolean lambda$null$6(net.minecraft.world.entity.ai.goal.WrappedGoal,net.minecraft.world.entity.ai.goal.Goal$Flag) -> b
+    74:74:boolean lambda$tick$5(net.minecraft.world.entity.ai.goal.WrappedGoal) -> c
+    73:73:boolean lambda$tick$4(net.minecraft.world.entity.ai.goal.WrappedGoal) -> d
+    65:68:void lambda$tick$3(net.minecraft.world.entity.ai.goal.Goal$Flag,net.minecraft.world.entity.ai.goal.WrappedGoal) -> a
+    63:63:boolean lambda$tick$2(net.minecraft.world.entity.ai.goal.WrappedGoal) -> e
+    56:56:boolean lambda$removeGoal$1(net.minecraft.world.entity.ai.goal.Goal,net.minecraft.world.entity.ai.goal.WrappedGoal) -> a
+    55:55:boolean lambda$removeGoal$0(net.minecraft.world.entity.ai.goal.Goal,net.minecraft.world.entity.ai.goal.WrappedGoal) -> b
+    17:18:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.goal.GoalSelector$1 -> auh$1:
+    18:18:void <init>() -> <init>
+    21:21:boolean canUse() -> a
+net.minecraft.world.entity.ai.goal.GoalSelector$2 -> auh$2:
+    23:23:void <init>(int,net.minecraft.world.entity.ai.goal.Goal) -> <init>
+    26:26:boolean isRunning() -> g
+net.minecraft.world.entity.ai.goal.GolemRandomStrollInVillageGoal -> aui:
+    25:26:void <init>(net.minecraft.world.entity.PathfinderMob,double) -> <init>
+    32:49:net.minecraft.world.phys.Vec3 getPosition() -> g
+    54:54:net.minecraft.world.phys.Vec3 getPositionTowardsAnywhere() -> j
+    59:66:net.minecraft.world.phys.Vec3 getPositionTowardsVillagerWhoWantsGolem() -> k
+    71:82:net.minecraft.world.phys.Vec3 getPositionTowardsPoi() -> l
+    87:96:net.minecraft.core.SectionPos getRandomVillageSection() -> m
+    102:111:net.minecraft.core.BlockPos getRandomPoiWithinSection(net.minecraft.core.SectionPos) -> a
+    115:115:boolean doesVillagerWantGolem(net.minecraft.world.entity.npc.Villager) -> a
+    104:104:boolean lambda$getRandomPoiWithinSection$1(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    90:90:boolean lambda$getRandomVillageSection$0(net.minecraft.server.level.ServerLevel,net.minecraft.core.SectionPos) -> a
+net.minecraft.world.entity.ai.goal.InteractGoal -> auj:
     10:12:void <init>(net.minecraft.world.entity.Mob,java.lang.Class,float) -> <init>
     15:17:void <init>(net.minecraft.world.entity.Mob,java.lang.Class,float,float) -> <init>
-net.minecraft.world.entity.ai.goal.JumpGoal -> apj:
+net.minecraft.world.entity.ai.goal.JumpGoal -> auk:
     6:8:void <init>() -> <init>
-net.minecraft.world.entity.ai.goal.LandOnOwnersShoulderGoal -> apk:
+net.minecraft.world.entity.ai.goal.LandOnOwnersShoulderGoal -> aul:
     net.minecraft.world.entity.animal.ShoulderRidingEntity entity -> a
     net.minecraft.server.level.ServerPlayer owner -> b
     boolean isSittingOnShoulder -> c
     12:14:void <init>(net.minecraft.world.entity.animal.ShoulderRidingEntity) -> <init>
     18:20:boolean canUse() -> a
-    25:25:boolean isInterruptable() -> E_
+    25:25:boolean isInterruptable() -> D_
     30:32:void start() -> c
     36:43:void tick() -> e
-net.minecraft.world.entity.ai.goal.LeapAtTargetGoal -> apl:
+net.minecraft.world.entity.ai.goal.LeapAtTargetGoal -> aum:
     net.minecraft.world.entity.Mob mob -> a
     net.minecraft.world.entity.LivingEntity target -> b
     float yd -> c
@@ -38800,7 +42423,7 @@ net.minecraft.world.entity.ai.goal.LeapAtTargetGoal -> apl:
     23:40:boolean canUse() -> a
     45:45:boolean canContinueToUse() -> b
     51:62:void start() -> c
-net.minecraft.world.entity.ai.goal.LlamaFollowCaravanGoal -> apm:
+net.minecraft.world.entity.ai.goal.LlamaFollowCaravanGoal -> aun:
     net.minecraft.world.entity.animal.horse.Llama llama -> a
     double speedModifier -> b
     int distCheckCounter -> c
@@ -38811,7 +42434,7 @@ net.minecraft.world.entity.ai.goal.LlamaFollowCaravanGoal -> apm:
     127:137:void tick() -> e
     140:150:boolean firstIsLeashed(net.minecraft.world.entity.animal.horse.Llama,int) -> a
     34:35:boolean lambda$canUse$0(net.minecraft.world.entity.Entity) -> a
-net.minecraft.world.entity.ai.goal.LookAtPlayerGoal -> apn:
+net.minecraft.world.entity.ai.goal.LookAtPlayerGoal -> auo:
     net.minecraft.world.entity.Mob mob -> a
     net.minecraft.world.entity.Entity lookAt -> b
     float lookDistance -> c
@@ -38827,35 +42450,39 @@ net.minecraft.world.entity.ai.goal.LookAtPlayerGoal -> apn:
     76:77:void stop() -> d
     81:83:void tick() -> e
     33:33:boolean lambda$new$0(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.ai.goal.LookAtTradingPlayerGoal -> apo:
+net.minecraft.world.entity.ai.goal.LookAtTradingPlayerGoal -> aup:
     net.minecraft.world.entity.npc.AbstractVillager villager -> g
     10:12:void <init>(net.minecraft.world.entity.npc.AbstractVillager) -> <init>
     16:20:boolean canUse() -> a
-net.minecraft.world.entity.ai.goal.MeleeAttackGoal -> app:
+net.minecraft.world.entity.ai.goal.MeleeAttackGoal -> auq:
     net.minecraft.world.entity.PathfinderMob mob -> a
-    int attackTime -> b
-    double speedModifier -> d
-    boolean trackTarget -> e
-    net.minecraft.world.level.pathfinder.Path path -> f
-    int timeToRecalcPath -> g
-    double pathedTargetX -> h
-    double pathedTargetY -> i
-    double pathedTargetZ -> j
-    int attackInterval -> c
-    long lastUpdate -> k
-    24:34:void <init>(net.minecraft.world.entity.PathfinderMob,double,boolean) -> <init>
-    38:59:boolean canUse() -> a
-    64:82:boolean canContinueToUse() -> b
-    87:90:void start() -> c
-    94:100:void stop() -> d
-    104:132:void tick() -> e
-    135:141:void checkAndPerformAttack(net.minecraft.world.entity.LivingEntity,double) -> a
-    144:144:double getAttackReachSqr(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.ai.goal.MoveBackToVillage -> apq:
-    18:19:void <init>(net.minecraft.world.entity.PathfinderMob,double) -> <init>
+    double speedModifier -> b
+    boolean followingTargetEvenIfNotSeen -> c
+    net.minecraft.world.level.pathfinder.Path path -> d
+    double pathedTargetX -> e
+    double pathedTargetY -> f
+    double pathedTargetZ -> g
+    int ticksUntilNextPathRecalculation -> h
+    int ticksUntilNextAttack -> i
+    int attackInterval -> j
+    long lastCanUseCheck -> k
+    26:36:void <init>(net.minecraft.world.entity.PathfinderMob,double,boolean) -> <init>
+    40:61:boolean canUse() -> a
+    66:84:boolean canContinueToUse() -> b
+    89:93:void start() -> c
+    97:103:void stop() -> d
+    107:135:void tick() -> e
+    138:144:void checkAndPerformAttack(net.minecraft.world.entity.LivingEntity,double) -> a
+    147:148:void resetAttackCooldown() -> g
+    151:151:boolean isTimeToAttack() -> h
+    155:155:int getTicksUntilNextAttack() -> j
+    159:159:int getAttackInterval() -> k
+    163:163:double getAttackReachSqr(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.goal.MoveBackToVillageGoal -> aur:
+    18:19:void <init>(net.minecraft.world.entity.PathfinderMob,double,boolean) -> <init>
     23:30:boolean canUse() -> a
     36:46:net.minecraft.world.phys.Vec3 getPosition() -> g
-net.minecraft.world.entity.ai.goal.MoveIndoorsGoal -> apr:
+net.minecraft.world.entity.ai.goal.MoveIndoorsGoal -> aus:
     net.minecraft.world.entity.PathfinderMob mob -> a
     int insideX -> b
     int insideZ -> c
@@ -38865,7 +42492,7 @@ net.minecraft.world.entity.ai.goal.MoveIndoorsGoal -> apr:
     59:59:boolean canContinueToUse() -> b
     78:78:void start() -> c
     85:85:void stop() -> d
-net.minecraft.world.entity.ai.goal.MoveThroughVillageGoal -> aps:
+net.minecraft.world.entity.ai.goal.MoveThroughVillageGoal -> aut:
     net.minecraft.world.entity.PathfinderMob mob -> a
     double speedModifier -> b
     net.minecraft.world.level.pathfinder.Path path -> c
@@ -38874,15 +42501,16 @@ net.minecraft.world.entity.ai.goal.MoveThroughVillageGoal -> aps:
     java.util.List visited -> f
     int distanceToPoi -> g
     java.util.function.BooleanSupplier canDealWithDoors -> h
-    27:42:void <init>(net.minecraft.world.entity.PathfinderMob,double,boolean,int,java.util.function.BooleanSupplier) -> <init>
-    46:106:boolean canUse() -> a
-    111:114:boolean canContinueToUse() -> b
-    119:120:void start() -> c
-    124:127:void stop() -> d
-    130:135:boolean hasNotVisited(net.minecraft.core.BlockPos) -> a
-    139:142:void updateVisited() -> g
-    60:67:double lambda$canUse$0(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.goal.MoveToBlockGoal -> apt:
+    28:43:void <init>(net.minecraft.world.entity.PathfinderMob,double,boolean,int,java.util.function.BooleanSupplier) -> <init>
+    47:110:boolean canUse() -> a
+    115:118:boolean canContinueToUse() -> b
+    123:124:void start() -> c
+    128:131:void stop() -> d
+    134:139:boolean hasNotVisited(net.minecraft.core.BlockPos) -> a
+    143:146:void updateVisited() -> g
+    149:149:boolean hasGroundPathNavigation() -> h
+    64:71:double lambda$canUse$0(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.ai.goal.MoveToBlockGoal -> auu:
     net.minecraft.world.entity.PathfinderMob mob -> a
     double speedModifier -> b
     int nextStartTick -> c
@@ -38906,7 +42534,7 @@ net.minecraft.world.entity.ai.goal.MoveToBlockGoal -> apt:
     93:93:boolean isReachedTarget() -> k
     97:118:boolean findNearestBlock() -> l
     boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.goal.MoveTowardsRestrictionGoal -> apu:
+net.minecraft.world.entity.ai.goal.MoveTowardsRestrictionGoal -> auv:
     net.minecraft.world.entity.PathfinderMob mob -> a
     double wantedX -> b
     double wantedY -> c
@@ -38916,7 +42544,7 @@ net.minecraft.world.entity.ai.goal.MoveTowardsRestrictionGoal -> apu:
     24:34:boolean canUse() -> a
     39:39:boolean canContinueToUse() -> b
     44:45:void start() -> c
-net.minecraft.world.entity.ai.goal.MoveTowardsTargetGoal -> apv:
+net.minecraft.world.entity.ai.goal.MoveTowardsTargetGoal -> auw:
     net.minecraft.world.entity.PathfinderMob mob -> a
     net.minecraft.world.entity.LivingEntity target -> b
     double wantedX -> c
@@ -38929,7 +42557,7 @@ net.minecraft.world.entity.ai.goal.MoveTowardsTargetGoal -> apv:
     47:47:boolean canContinueToUse() -> b
     52:53:void stop() -> d
     57:58:void start() -> c
-net.minecraft.world.entity.ai.goal.OcelotAttackGoal -> apw:
+net.minecraft.world.entity.ai.goal.OcelotAttackGoal -> auy:
     net.minecraft.world.level.BlockGetter level -> a
     net.minecraft.world.entity.Mob mob -> b
     net.minecraft.world.entity.LivingEntity target -> c
@@ -38939,7 +42567,7 @@ net.minecraft.world.entity.ai.goal.OcelotAttackGoal -> apw:
     34:40:boolean canContinueToUse() -> b
     45:47:void stop() -> d
     51:75:void tick() -> e
-net.minecraft.world.entity.ai.goal.OfferFlowerGoal -> apx:
+net.minecraft.world.entity.ai.goal.OfferFlowerGoal -> auz:
     net.minecraft.world.entity.ai.targeting.TargetingConditions OFFER_TARGER_CONTEXT -> a
     net.minecraft.world.entity.animal.IronGolem golem -> b
     net.minecraft.world.entity.npc.Villager villager -> c
@@ -38951,7 +42579,7 @@ net.minecraft.world.entity.ai.goal.OfferFlowerGoal -> apx:
     48:50:void stop() -> d
     54:56:void tick() -> e
     10:10:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.goal.OpenDoorGoal -> apy:
+net.minecraft.world.entity.ai.goal.OpenDoorGoal -> ava:
     boolean closeDoor -> a
     int forgetTime -> b
     10:13:void <init>(net.minecraft.world.entity.Mob,boolean) -> <init>
@@ -38959,27 +42587,30 @@ net.minecraft.world.entity.ai.goal.OpenDoorGoal -> apy:
     22:24:void start() -> c
     28:29:void stop() -> d
     33:35:void tick() -> e
-net.minecraft.world.entity.ai.goal.PanicGoal -> apz:
+net.minecraft.world.entity.ai.goal.PanicGoal -> avb:
     net.minecraft.world.entity.PathfinderMob mob -> a
     double speedModifier -> b
     double posX -> c
     double posY -> d
     double posZ -> e
-    21:25:void <init>(net.minecraft.world.entity.PathfinderMob,double) -> <init>
-    29:43:boolean canUse() -> a
-    47:55:boolean findRandomPosition() -> g
-    60:61:void start() -> c
-    65:65:boolean canContinueToUse() -> b
-    70:93:net.minecraft.core.BlockPos lookForWater(net.minecraft.world.level.BlockGetter,net.minecraft.world.entity.Entity,int,int) -> a
-net.minecraft.world.entity.ai.goal.PathfindToRaidGoal -> aqa:
+    boolean isRunning -> f
+    22:26:void <init>(net.minecraft.world.entity.PathfinderMob,double) -> <init>
+    30:44:boolean canUse() -> a
+    48:56:boolean findRandomPosition() -> g
+    60:60:boolean isRunning() -> h
+    65:67:void start() -> c
+    71:72:void stop() -> d
+    76:76:boolean canContinueToUse() -> b
+    81:104:net.minecraft.core.BlockPos lookForWater(net.minecraft.world.level.BlockGetter,net.minecraft.world.entity.Entity,int,int) -> a
+net.minecraft.world.entity.ai.goal.PathfindToRaidGoal -> avc:
     net.minecraft.world.entity.raid.Raider mob -> a
-    21:24:void <init>(net.minecraft.world.entity.raid.Raider) -> <init>
-    28:32:boolean canUse() -> a
-    37:40:boolean canContinueToUse() -> b
-    45:58:void tick() -> e
-    61:71:void recruitNearby(net.minecraft.world.entity.raid.Raid) -> a
-    64:64:boolean lambda$recruitNearby$0(net.minecraft.world.entity.raid.Raid,net.minecraft.world.entity.raid.Raider) -> a
-net.minecraft.world.entity.ai.goal.PlayGoal -> aqb:
+    20:23:void <init>(net.minecraft.world.entity.raid.Raider) -> <init>
+    27:31:boolean canUse() -> a
+    36:39:boolean canContinueToUse() -> b
+    44:57:void tick() -> e
+    60:70:void recruitNearby(net.minecraft.world.entity.raid.Raid) -> a
+    63:63:boolean lambda$recruitNearby$0(net.minecraft.world.entity.raid.Raid,net.minecraft.world.entity.raid.Raider) -> a
+net.minecraft.world.entity.ai.goal.PlayGoal -> avd:
     net.minecraft.world.entity.npc.Villager mob -> a
     net.minecraft.world.entity.LivingEntity followFriend -> b
     double speedModifier -> c
@@ -38990,7 +42621,7 @@ net.minecraft.world.entity.ai.goal.PlayGoal -> aqb:
     68:72:void start() -> c
     76:78:void stop() -> d
     82:96:void tick() -> e
-net.minecraft.world.entity.ai.goal.RandomLookAroundGoal -> aqc:
+net.minecraft.world.entity.ai.goal.RandomLookAroundGoal -> ave:
     net.minecraft.world.entity.Mob mob -> a
     double relX -> b
     double relZ -> c
@@ -39000,7 +42631,7 @@ net.minecraft.world.entity.ai.goal.RandomLookAroundGoal -> aqc:
     25:25:boolean canContinueToUse() -> b
     30:34:void start() -> c
     38:40:void tick() -> e
-net.minecraft.world.entity.ai.goal.RandomStrollGoal -> aqd:
+net.minecraft.world.entity.ai.goal.RandomStrollGoal -> avf:
     net.minecraft.world.entity.PathfinderMob mob -> a
     double wantedX -> b
     double wantedY -> c
@@ -39008,19 +42639,21 @@ net.minecraft.world.entity.ai.goal.RandomStrollGoal -> aqd:
     double speedModifier -> e
     int interval -> f
     boolean forceTrigger -> g
-    21:22:void <init>(net.minecraft.world.entity.PathfinderMob,double) -> <init>
-    24:29:void <init>(net.minecraft.world.entity.PathfinderMob,double,int) -> <init>
-    33:55:boolean canUse() -> a
-    60:60:net.minecraft.world.phys.Vec3 getPosition() -> g
-    65:65:boolean canContinueToUse() -> b
-    70:71:void start() -> c
-    75:77:void stop() -> d
-    80:81:void trigger() -> h
-    84:85:void setInterval(int) -> a
-net.minecraft.world.entity.ai.goal.RandomSwimmingGoal -> aqe:
+    boolean checkNoActionTime -> h
+    23:24:void <init>(net.minecraft.world.entity.PathfinderMob,double) -> <init>
+    27:28:void <init>(net.minecraft.world.entity.PathfinderMob,double,int) -> <init>
+    30:36:void <init>(net.minecraft.world.entity.PathfinderMob,double,int,boolean) -> <init>
+    39:61:boolean canUse() -> a
+    66:66:net.minecraft.world.phys.Vec3 getPosition() -> g
+    71:71:boolean canContinueToUse() -> b
+    76:77:void start() -> c
+    81:83:void stop() -> d
+    86:87:void trigger() -> h
+    90:91:void setInterval(int) -> a
+net.minecraft.world.entity.ai.goal.RandomSwimmingGoal -> avg:
     13:14:void <init>(net.minecraft.world.entity.PathfinderMob,double,int) -> <init>
     19:24:net.minecraft.world.phys.Vec3 getPosition() -> g
-net.minecraft.world.entity.ai.goal.RangedAttackGoal -> aqf:
+net.minecraft.world.entity.ai.goal.RangedAttackGoal -> avh:
     net.minecraft.world.entity.Mob mob -> a
     net.minecraft.world.entity.monster.RangedAttackMob rangedAttackMob -> b
     net.minecraft.world.entity.LivingEntity target -> c
@@ -39037,7 +42670,7 @@ net.minecraft.world.entity.ai.goal.RangedAttackGoal -> aqf:
     52:52:boolean canContinueToUse() -> b
     57:60:void stop() -> d
     64:96:void tick() -> e
-net.minecraft.world.entity.ai.goal.RangedBowAttackGoal -> aqg:
+net.minecraft.world.entity.ai.goal.RangedBowAttackGoal -> avi:
     net.minecraft.world.entity.monster.Monster mob -> a
     double speedModifier -> b
     int attackIntervalMin -> c
@@ -39055,32 +42688,35 @@ net.minecraft.world.entity.ai.goal.RangedBowAttackGoal -> aqg:
     55:58:void start() -> c
     62:68:void stop() -> d
     72:135:void tick() -> e
-net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal -> aqh:
-    net.minecraft.world.entity.monster.Monster mob -> a
-    net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState crossbowState -> b
-    double speedModifier -> c
-    float attackRadiusSqr -> d
-    int seeTime -> e
-    int attackDelay -> f
-    24:35:void <init>(net.minecraft.world.entity.monster.Monster,double,float) -> <init>
-    39:39:boolean canUse() -> a
-    43:43:boolean isHoldingCrossbow() -> g
-    48:48:boolean canContinueToUse() -> b
-    52:52:boolean isValidTarget() -> h
-    57:66:void stop() -> d
-    70:131:void tick() -> e
-    134:134:boolean canRun() -> j
-net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState -> aqh$a:
+net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal -> avj:
+    net.minecraft.util.IntRange PATHFINDING_DELAY_RANGE -> a
+    net.minecraft.world.entity.monster.Monster mob -> b
+    net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState crossbowState -> c
+    double speedModifier -> d
+    float attackRadiusSqr -> e
+    int seeTime -> f
+    int attackDelay -> g
+    int updatePathDelay -> h
+    29:41:void <init>(net.minecraft.world.entity.monster.Monster,double,float) -> <init>
+    45:45:boolean canUse() -> a
+    49:49:boolean isHoldingCrossbow() -> g
+    54:54:boolean canContinueToUse() -> b
+    58:58:boolean isValidTarget() -> h
+    63:72:void stop() -> d
+    76:146:void tick() -> e
+    149:149:boolean canRun() -> j
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState -> avj$a:
     net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState UNCHARGED -> a
     net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState CHARGING -> b
     net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState CHARGED -> c
     net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState READY_TO_ATTACK -> d
     net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState[] $VALUES -> e
-    15:15:net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState[] values() -> values
-    15:15:net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState valueOf(java.lang.String) -> valueOf
-    15:15:void <init>(java.lang.String,int) -> <init>
-    15:19:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.goal.RemoveBlockGoal -> aqi:
+    20:20:net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState[] values() -> values
+    20:20:net.minecraft.world.entity.ai.goal.RangedCrossbowAttackGoal$CrossbowState valueOf(java.lang.String) -> valueOf
+    20:20:void <init>(java.lang.String,int) -> <init>
+    20:24:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.goal.RemoveBlockGoal -> avk:
     net.minecraft.world.level.block.Block blockToRemove -> g
     net.minecraft.world.entity.Mob removerMob -> h
     int ticksSinceReachedGoal -> i
@@ -39094,13 +42730,13 @@ net.minecraft.world.entity.ai.goal.RemoveBlockGoal -> aqi:
     86:137:void tick() -> e
     141:150:net.minecraft.core.BlockPos getPosWithBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.BlockGetter) -> a
     155:159:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.goal.RestrictSunGoal -> aqj:
+net.minecraft.world.entity.ai.goal.RestrictSunGoal -> avl:
     net.minecraft.world.entity.PathfinderMob mob -> a
     10:12:void <init>(net.minecraft.world.entity.PathfinderMob) -> <init>
     16:16:boolean canUse() -> a
     21:22:void start() -> c
     26:27:void stop() -> d
-net.minecraft.world.entity.ai.goal.RunAroundLikeCrazyGoal -> aqk:
+net.minecraft.world.entity.ai.goal.RunAroundLikeCrazyGoal -> avm:
     net.minecraft.world.entity.animal.horse.AbstractHorse horse -> a
     double speedModifier -> b
     double posX -> c
@@ -39111,16 +42747,14 @@ net.minecraft.world.entity.ai.goal.RunAroundLikeCrazyGoal -> aqk:
     42:43:void start() -> c
     47:47:boolean canContinueToUse() -> b
     52:72:void tick() -> e
-net.minecraft.world.entity.ai.goal.SitGoal -> aql:
+net.minecraft.world.entity.ai.goal.SitWhenOrderedToGoal -> avn:
     net.minecraft.world.entity.TamableAnimal mob -> a
-    boolean wantToSit -> b
-    12:15:void <init>(net.minecraft.world.entity.TamableAnimal) -> <init>
-    19:19:boolean canContinueToUse() -> b
-    24:43:boolean canUse() -> a
-    48:50:void start() -> c
-    54:55:void stop() -> d
-    58:59:void wantToSit(boolean) -> a
-net.minecraft.world.entity.ai.goal.StrollThroughVillageGoal -> aqm:
+    11:14:void <init>(net.minecraft.world.entity.TamableAnimal) -> <init>
+    18:18:boolean canContinueToUse() -> b
+    23:42:boolean canUse() -> a
+    47:49:void start() -> c
+    53:54:void stop() -> d
+net.minecraft.world.entity.ai.goal.StrollThroughVillageGoal -> avo:
     net.minecraft.world.entity.PathfinderMob mob -> a
     int interval -> b
     net.minecraft.core.BlockPos wantedPos -> c
@@ -39130,7 +42764,7 @@ net.minecraft.world.entity.ai.goal.StrollThroughVillageGoal -> aqm:
     63:87:void tick() -> e
     90:93:void moveRandomly() -> g
     51:51:double lambda$canUse$0(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.goal.SwellGoal -> aqn:
+net.minecraft.world.entity.ai.goal.SwellGoal -> avp:
     net.minecraft.world.entity.monster.Creeper creeper -> a
     net.minecraft.world.entity.LivingEntity target -> b
     12:15:void <init>(net.minecraft.world.entity.monster.Creeper) -> <init>
@@ -39138,7 +42772,7 @@ net.minecraft.world.entity.ai.goal.SwellGoal -> aqn:
     25:27:void start() -> c
     31:32:void stop() -> d
     36:52:void tick() -> e
-net.minecraft.world.entity.ai.goal.TakeFlowerGoal -> aqo:
+net.minecraft.world.entity.ai.goal.TakeFlowerGoal -> avq:
     net.minecraft.world.entity.npc.Villager villager -> a
     net.minecraft.world.entity.animal.IronGolem golem -> b
     int pickupTick -> c
@@ -39149,7 +42783,7 @@ net.minecraft.world.entity.ai.goal.TakeFlowerGoal -> aqo:
     50:53:void start() -> c
     57:59:void stop() -> d
     63:75:void tick() -> e
-net.minecraft.world.entity.ai.goal.TemptGoal -> aqp:
+net.minecraft.world.entity.ai.goal.TemptGoal -> avr:
     net.minecraft.world.entity.ai.targeting.TargetingConditions TEMP_TARGETING -> c
     net.minecraft.world.entity.PathfinderMob mob -> a
     double speedModifier -> d
@@ -39174,18 +42808,18 @@ net.minecraft.world.entity.ai.goal.TemptGoal -> aqp:
     104:110:void tick() -> e
     113:113:boolean isRunning() -> h
     14:14:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.goal.TradeWithPlayerGoal -> aqq:
+net.minecraft.world.entity.ai.goal.TradeWithPlayerGoal -> avs:
     net.minecraft.world.entity.npc.AbstractVillager mob -> a
     11:14:void <init>(net.minecraft.world.entity.npc.AbstractVillager) -> <init>
     18:42:boolean canUse() -> a
     47:48:void start() -> c
     52:53:void stop() -> d
-net.minecraft.world.entity.ai.goal.TryFindWaterGoal -> aqr:
+net.minecraft.world.entity.ai.goal.TryFindWaterGoal -> avt:
     net.minecraft.world.entity.PathfinderMob mob -> a
     11:13:void <init>(net.minecraft.world.entity.PathfinderMob) -> <init>
     17:17:boolean canUse() -> a
     22:43:void start() -> c
-net.minecraft.world.entity.ai.goal.UseItemGoal -> aqs:
+net.minecraft.world.entity.ai.goal.UseItemGoal -> avu:
     net.minecraft.world.entity.Mob mob -> a
     net.minecraft.world.item.ItemStack item -> b
     java.util.function.Predicate canUseSelector -> c
@@ -39195,16 +42829,16 @@ net.minecraft.world.entity.ai.goal.UseItemGoal -> aqs:
     32:32:boolean canContinueToUse() -> b
     37:39:void start() -> c
     43:48:void stop() -> d
-net.minecraft.world.entity.ai.goal.WaterAvoidingRandomFlyingGoal -> aqt:
+net.minecraft.world.entity.ai.goal.WaterAvoidingRandomFlyingGoal -> avv:
     17:18:void <init>(net.minecraft.world.entity.PathfinderMob,double) -> <init>
     23:30:net.minecraft.world.phys.Vec3 getPosition() -> g
     35:60:net.minecraft.world.phys.Vec3 getTreePos() -> j
-net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal -> aqu:
+net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal -> avw:
     float probability -> h
     15:16:void <init>(net.minecraft.world.entity.PathfinderMob,double) -> <init>
     19:21:void <init>(net.minecraft.world.entity.PathfinderMob,double,float) -> <init>
     26:34:net.minecraft.world.phys.Vec3 getPosition() -> g
-net.minecraft.world.entity.ai.goal.WrappedGoal -> aqv:
+net.minecraft.world.entity.ai.goal.WrappedGoal -> avx:
     net.minecraft.world.entity.ai.goal.Goal goal -> a
     int priority -> b
     boolean isRunning -> c
@@ -39212,7 +42846,7 @@ net.minecraft.world.entity.ai.goal.WrappedGoal -> aqv:
     17:17:boolean canBeReplacedBy(net.minecraft.world.entity.ai.goal.WrappedGoal) -> a
     22:22:boolean canUse() -> a
     27:27:boolean canContinueToUse() -> b
-    32:32:boolean isInterruptable() -> E_
+    32:32:boolean isInterruptable() -> D_
     37:42:void start() -> c
     46:51:void stop() -> d
     55:56:void tick() -> e
@@ -39223,35 +42857,35 @@ net.minecraft.world.entity.ai.goal.WrappedGoal -> aqv:
     77:77:net.minecraft.world.entity.ai.goal.Goal getGoal() -> j
     82:88:boolean equals(java.lang.Object) -> equals
     93:93:int hashCode() -> hashCode
-net.minecraft.world.entity.ai.goal.ZombieAttackGoal -> aqw:
-    net.minecraft.world.entity.monster.Zombie zombie -> d
-    int raiseArmTicks -> e
+net.minecraft.world.entity.ai.goal.ZombieAttackGoal -> avy:
+    net.minecraft.world.entity.monster.Zombie zombie -> b
+    int raiseArmTicks -> c
     10:12:void <init>(net.minecraft.world.entity.monster.Zombie,double,boolean) -> <init>
     16:18:void start() -> c
     22:24:void stop() -> d
     28:36:void tick() -> e
-net.minecraft.world.entity.ai.goal.package-info -> aqx:
-net.minecraft.world.entity.ai.goal.target.DefendVillageTargetGoal -> aqy:
+net.minecraft.world.entity.ai.goal.package-info -> avz:
+net.minecraft.world.entity.ai.goal.target.DefendVillageTargetGoal -> awa:
     net.minecraft.world.entity.animal.IronGolem golem -> a
     net.minecraft.world.entity.LivingEntity potentialTarget -> b
     net.minecraft.world.entity.ai.targeting.TargetingConditions attackTargeting -> c
     17:23:void <init>(net.minecraft.world.entity.animal.IronGolem) -> <init>
     27:50:boolean canUse() -> a
     55:57:void start() -> c
-net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal -> aqz:
+net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal -> awb:
     net.minecraft.world.entity.ai.targeting.TargetingConditions HURT_BY_TARGETING -> a
     boolean alertSameType -> b
     int timestamp -> c
     java.lang.Class[] toIgnoreDamage -> d
     java.lang.Class[] toIgnoreAlert -> i
-    26:29:void <init>(net.minecraft.world.entity.PathfinderMob,java.lang.Class[]) -> <init>
-    33:46:boolean canUse() -> a
-    50:52:net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal setAlertOthers(java.lang.Class[]) -> a
-    57:67:void start() -> c
-    70:101:void alertOthers() -> g
-    104:105:void alertOther(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal -> ara:
+    29:32:void <init>(net.minecraft.world.entity.PathfinderMob,java.lang.Class[]) -> <init>
+    36:54:boolean canUse() -> a
+    58:60:net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal setAlertOthers(java.lang.Class[]) -> a
+    65:75:void start() -> c
+    78:110:void alertOthers() -> g
+    113:114:void alertOther(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal -> awc:
     java.lang.Class targetType -> a
     int randomInterval -> b
     net.minecraft.world.entity.LivingEntity target -> c
@@ -39263,38 +42897,50 @@ net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal -> ara:
     49:49:net.minecraft.world.phys.AABB getTargetSearchArea(double) -> a
     53:58:void findTarget() -> g
     62:64:void start() -> c
-net.minecraft.world.entity.ai.goal.target.NearestAttackableWitchTargetGoal -> arb:
+    67:68:void setTarget(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.goal.target.NearestAttackableWitchTargetGoal -> awd:
     boolean canAttack -> i
     13:15:void <init>(net.minecraft.world.entity.raid.Raider,java.lang.Class,int,boolean,boolean,java.util.function.Predicate) -> <init>
     18:19:void setCanAttack(boolean) -> a
     23:23:boolean canUse() -> a
-net.minecraft.world.entity.ai.goal.target.NearestHealableRaiderTargetGoal -> arc:
+net.minecraft.world.entity.ai.goal.target.NearestHealableRaiderTargetGoal -> awe:
     int cooldown -> i
     15:17:void <init>(net.minecraft.world.entity.raid.Raider,java.lang.Class,boolean,java.util.function.Predicate) -> <init>
     20:20:int getCooldown() -> h
     24:25:void decrementCooldown() -> j
     29:37:boolean canUse() -> a
     42:44:void start() -> c
-net.minecraft.world.entity.ai.goal.target.NonTameRandomTargetGoal -> ard:
+net.minecraft.world.entity.ai.goal.target.NonTameRandomTargetGoal -> awf:
     net.minecraft.world.entity.TamableAnimal tamableMob -> i
     13:15:void <init>(net.minecraft.world.entity.TamableAnimal,java.lang.Class,boolean,java.util.function.Predicate) -> <init>
     19:19:boolean canUse() -> a
     24:27:boolean canContinueToUse() -> b
-net.minecraft.world.entity.ai.goal.target.OwnerHurtByTargetGoal -> are:
+net.minecraft.world.entity.ai.goal.target.OwnerHurtByTargetGoal -> awg:
     net.minecraft.world.entity.TamableAnimal tameAnimal -> a
     net.minecraft.world.entity.LivingEntity ownerLastHurtBy -> b
     int timestamp -> c
     16:19:void <init>(net.minecraft.world.entity.TamableAnimal) -> <init>
     23:32:boolean canUse() -> a
     37:45:void start() -> c
-net.minecraft.world.entity.ai.goal.target.OwnerHurtTargetGoal -> arf:
+net.minecraft.world.entity.ai.goal.target.OwnerHurtTargetGoal -> awh:
     net.minecraft.world.entity.TamableAnimal tameAnimal -> a
     net.minecraft.world.entity.LivingEntity ownerLastHurt -> b
     int timestamp -> c
     16:19:void <init>(net.minecraft.world.entity.TamableAnimal) -> <init>
     23:32:boolean canUse() -> a
     37:45:void start() -> c
-net.minecraft.world.entity.ai.goal.target.TargetGoal -> arg:
+net.minecraft.world.entity.ai.goal.target.ResetUniversalAngerTargetGoal -> awi:
+    net.minecraft.world.entity.Mob mob -> a
+    boolean alertOthersOfSameType -> b
+    int lastHurtByPlayerTimestamp -> c
+    31:34:void <init>(net.minecraft.world.entity.Mob,boolean) -> <init>
+    38:38:boolean canUse() -> a
+    42:44:boolean wasHurtByPlayer() -> g
+    49:58:void start() -> c
+    61:63:java.util.List getNearbyMobsOfSameType() -> h
+    54:54:net.minecraft.world.entity.NeutralMob lambda$start$1(net.minecraft.world.entity.Mob) -> a
+    53:53:boolean lambda$start$0(net.minecraft.world.entity.Mob) -> b
+net.minecraft.world.entity.ai.goal.target.TargetGoal -> awj:
     net.minecraft.world.entity.Mob mob -> e
     boolean mustSee -> f
     boolean mustReach -> a
@@ -39303,71 +42949,69 @@ net.minecraft.world.entity.ai.goal.target.TargetGoal -> arg:
     int unseenTicks -> d
     net.minecraft.world.entity.LivingEntity targetMob -> g
     int unseenMemoryTicks -> h
-    35:36:void <init>(net.minecraft.world.entity.Mob,boolean) -> <init>
-    32:42:void <init>(net.minecraft.world.entity.Mob,boolean,boolean) -> <init>
-    46:82:boolean canContinueToUse() -> b
-    86:87:double getFollowDistance() -> k
-    92:95:void start() -> c
-    99:101:void stop() -> d
-    104:126:boolean canAttack(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.targeting.TargetingConditions) -> a
-    130:141:boolean canReach(net.minecraft.world.entity.LivingEntity) -> a
-    145:146:net.minecraft.world.entity.ai.goal.target.TargetGoal setUnseenMemoryTicks(int) -> a
-net.minecraft.world.entity.ai.goal.target.package-info -> arh:
-net.minecraft.world.entity.ai.gossip.GossipContainer -> ari:
+    33:34:void <init>(net.minecraft.world.entity.Mob,boolean) -> <init>
+    30:40:void <init>(net.minecraft.world.entity.Mob,boolean,boolean) -> <init>
+    44:80:boolean canContinueToUse() -> b
+    84:84:double getFollowDistance() -> k
+    89:92:void start() -> c
+    96:98:void stop() -> d
+    101:123:boolean canAttack(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.targeting.TargetingConditions) -> a
+    127:138:boolean canReach(net.minecraft.world.entity.LivingEntity) -> a
+    142:143:net.minecraft.world.entity.ai.goal.target.TargetGoal setUnseenMemoryTicks(int) -> a
+net.minecraft.world.entity.ai.goal.target.package-info -> awk:
+net.minecraft.world.entity.ai.gossip.GossipContainer -> awl:
     java.util.Map gossips -> a
-    29:127:void <init>() -> <init>
-    131:136:java.util.Map getGossipEntries() -> a
-    140:149:void decay() -> b
-    152:152:java.util.stream.Stream unpack() -> c
-    156:175:java.util.Collection selectGossipsForTransfer(java.util.Random,int) -> a
-    179:179:net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips getOrCreate(java.util.UUID) -> a
-    183:191:void transferFrom(net.minecraft.world.entity.ai.gossip.GossipContainer,java.util.Random,int) -> a
-    198:199:int getReputation(java.util.UUID,java.util.function.Predicate) -> a
-    203:203:long getCountForType(net.minecraft.world.entity.ai.gossip.GossipType,java.util.function.DoublePredicate) -> a
-    210:216:void add(java.util.UUID,net.minecraft.world.entity.ai.gossip.GossipType,int) -> a
-    223:224:void remove(java.util.UUID,net.minecraft.world.entity.ai.gossip.GossipType,int) -> b
-    227:234:void remove(java.util.UUID,net.minecraft.world.entity.ai.gossip.GossipType) -> a
-    237:245:void remove(net.minecraft.world.entity.ai.gossip.GossipType) -> a
-    248:248:com.mojang.datafixers.Dynamic store(com.mojang.datafixers.types.DynamicOps) -> a
-    252:256:void update(com.mojang.datafixers.Dynamic) -> a
-    259:259:int mergeValuesForTransfer(int,int) -> a
-    263:264:int mergeValuesForAddition(net.minecraft.world.entity.ai.gossip.GossipType,int,int) -> a
-    255:255:void lambda$update$7(net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry) -> a
-    248:248:com.mojang.datafixers.Dynamic lambda$store$6(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry) -> a
-    211:211:java.lang.Integer lambda$add$5(net.minecraft.world.entity.ai.gossip.GossipType,java.lang.Integer,java.lang.Integer) -> a
-    203:203:boolean lambda$getCountForType$4(java.util.function.DoublePredicate,net.minecraft.world.entity.ai.gossip.GossipType,net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips) -> a
-    186:190:void lambda$transferFrom$3(net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry) -> b
-    179:179:net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips lambda$getOrCreate$2(java.util.UUID) -> b
-    152:152:java.util.stream.Stream lambda$unpack$1(java.util.Map$Entry) -> a
-    133:135:void lambda$getGossipEntries$0(java.util.Map,java.util.UUID) -> a
-net.minecraft.world.entity.ai.gossip.GossipContainer$1 -> ari$1:
-net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips -> ari$a:
+    30:126:void <init>() -> <init>
+    130:135:java.util.Map getGossipEntries() -> a
+    139:148:void decay() -> b
+    151:151:java.util.stream.Stream unpack() -> c
+    155:174:java.util.Collection selectGossipsForTransfer(java.util.Random,int) -> a
+    178:178:net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips getOrCreate(java.util.UUID) -> a
+    182:190:void transferFrom(net.minecraft.world.entity.ai.gossip.GossipContainer,java.util.Random,int) -> a
+    197:198:int getReputation(java.util.UUID,java.util.function.Predicate) -> a
+    202:202:long getCountForType(net.minecraft.world.entity.ai.gossip.GossipType,java.util.function.DoublePredicate) -> a
+    209:215:void add(java.util.UUID,net.minecraft.world.entity.ai.gossip.GossipType,int) -> a
+    222:223:void remove(java.util.UUID,net.minecraft.world.entity.ai.gossip.GossipType,int) -> b
+    226:233:void remove(java.util.UUID,net.minecraft.world.entity.ai.gossip.GossipType) -> a
+    236:244:void remove(net.minecraft.world.entity.ai.gossip.GossipType) -> a
+    247:247:com.mojang.serialization.Dynamic store(com.mojang.serialization.DynamicOps) -> a
+    251:255:void update(com.mojang.serialization.Dynamic) -> a
+    258:258:int mergeValuesForTransfer(int,int) -> a
+    262:263:int mergeValuesForAddition(net.minecraft.world.entity.ai.gossip.GossipType,int,int) -> a
+    254:254:void lambda$update$8(net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry) -> a
+    253:253:java.util.stream.Stream lambda$update$7(com.mojang.serialization.DataResult) -> a
+    247:247:com.mojang.serialization.Dynamic lambda$store$6(com.mojang.serialization.DynamicOps,net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry) -> a
+    210:210:java.lang.Integer lambda$add$5(net.minecraft.world.entity.ai.gossip.GossipType,java.lang.Integer,java.lang.Integer) -> a
+    202:202:boolean lambda$getCountForType$4(java.util.function.DoublePredicate,net.minecraft.world.entity.ai.gossip.GossipType,net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips) -> a
+    185:189:void lambda$transferFrom$3(net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry) -> b
+    178:178:net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips lambda$getOrCreate$2(java.util.UUID) -> b
+    151:151:java.util.stream.Stream lambda$unpack$1(java.util.Map$Entry) -> a
+    132:134:void lambda$getGossipEntries$0(java.util.Map,java.util.UUID) -> a
+net.minecraft.world.entity.ai.gossip.GossipContainer$1 -> awl$1:
+net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips -> awl$a:
     it.unimi.dsi.fastutil.objects.Object2IntMap entries -> a
-    80:81:void <init>() -> <init>
-    84:88:int weightedValue(java.util.function.Predicate) -> a
-    92:92:java.util.stream.Stream unpack(java.util.UUID) -> a
-    96:106:void decay() -> a
-    109:109:boolean isEmpty() -> b
-    113:120:void makeSureValueIsntTooLowOrTooHigh(net.minecraft.world.entity.ai.gossip.GossipType) -> a
-    123:124:void remove(net.minecraft.world.entity.ai.gossip.GossipType) -> b
-    92:92:net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry lambda$unpack$2(java.util.UUID,it.unimi.dsi.fastutil.objects.Object2IntMap$Entry) -> a
-    87:87:int lambda$weightedValue$1(it.unimi.dsi.fastutil.objects.Object2IntMap$Entry) -> a
-    86:86:boolean lambda$weightedValue$0(java.util.function.Predicate,it.unimi.dsi.fastutil.objects.Object2IntMap$Entry) -> a
-    80:80:it.unimi.dsi.fastutil.objects.Object2IntMap access$000(net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips) -> a
-    80:80:void <init>(net.minecraft.world.entity.ai.gossip.GossipContainer$1) -> <init>
-net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry -> ari$b:
+    79:80:void <init>() -> <init>
+    83:87:int weightedValue(java.util.function.Predicate) -> a
+    91:91:java.util.stream.Stream unpack(java.util.UUID) -> a
+    95:105:void decay() -> a
+    108:108:boolean isEmpty() -> b
+    112:119:void makeSureValueIsntTooLowOrTooHigh(net.minecraft.world.entity.ai.gossip.GossipType) -> a
+    122:123:void remove(net.minecraft.world.entity.ai.gossip.GossipType) -> b
+    91:91:net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry lambda$unpack$2(java.util.UUID,it.unimi.dsi.fastutil.objects.Object2IntMap$Entry) -> a
+    86:86:int lambda$weightedValue$1(it.unimi.dsi.fastutil.objects.Object2IntMap$Entry) -> a
+    85:85:boolean lambda$weightedValue$0(java.util.function.Predicate,it.unimi.dsi.fastutil.objects.Object2IntMap$Entry) -> a
+    79:79:it.unimi.dsi.fastutil.objects.Object2IntMap access$000(net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips) -> a
+    79:79:void <init>(net.minecraft.world.entity.ai.gossip.GossipContainer$1) -> <init>
+net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry -> awl$b:
     java.util.UUID target -> a
     net.minecraft.world.entity.ai.gossip.GossipType type -> b
     int value -> c
-    41:45:void <init>(java.util.UUID,net.minecraft.world.entity.ai.gossip.GossipType,int) -> <init>
-    48:48:int weightedValue() -> a
-    53:53:java.lang.String toString() -> toString
-    61:64:com.mojang.datafixers.Dynamic store(com.mojang.datafixers.types.DynamicOps) -> a
-    70:70:java.util.Optional load(com.mojang.datafixers.Dynamic) -> a
-    71:71:java.util.Optional lambda$load$2(com.mojang.datafixers.Dynamic,net.minecraft.world.entity.ai.gossip.GossipType) -> a
-    72:72:java.util.Optional lambda$null$1(com.mojang.datafixers.Dynamic,net.minecraft.world.entity.ai.gossip.GossipType,java.util.UUID) -> a
-    73:73:net.minecraft.world.entity.ai.gossip.GossipContainer$GossipEntry lambda$null$0(java.util.UUID,net.minecraft.world.entity.ai.gossip.GossipType,java.lang.Number) -> a
-net.minecraft.world.entity.ai.gossip.GossipType -> arj:
+    42:46:void <init>(java.util.UUID,net.minecraft.world.entity.ai.gossip.GossipType,int) -> <init>
+    49:49:int weightedValue() -> a
+    54:54:java.lang.String toString() -> toString
+    62:65:com.mojang.serialization.Dynamic store(com.mojang.serialization.DynamicOps) -> a
+    71:75:com.mojang.serialization.DataResult load(com.mojang.serialization.Dynamic) -> a
+net.minecraft.world.entity.ai.gossip.GossipType -> awm:
     net.minecraft.world.entity.ai.gossip.GossipType MAJOR_NEGATIVE -> a
     net.minecraft.world.entity.ai.gossip.GossipType MINOR_NEGATIVE -> b
     net.minecraft.world.entity.ai.gossip.GossipType MINOR_POSITIVE -> c
@@ -39386,44 +43030,92 @@ net.minecraft.world.entity.ai.gossip.GossipType -> arj:
     43:43:net.minecraft.world.entity.ai.gossip.GossipType byId(java.lang.String) -> a
     31:31:java.lang.String lambda$static$0(net.minecraft.world.entity.ai.gossip.GossipType) -> a
     10:31:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.gossip.package-info -> ark:
-net.minecraft.world.entity.ai.memory.MemoryModuleType -> arl:
+net.minecraft.world.entity.ai.gossip.package-info -> awn:
+net.minecraft.world.entity.ai.memory.ExpirableValue -> awo:
+    java.lang.Object value -> a
+    long timeToLive -> b
+    17:20:void <init>(java.lang.Object,long) -> <init>
+    23:26:void tick() -> a
+    29:29:net.minecraft.world.entity.ai.memory.ExpirableValue of(java.lang.Object) -> a
+    33:33:net.minecraft.world.entity.ai.memory.ExpirableValue of(java.lang.Object,long) -> a
+    37:37:long getTimeToLive() -> b
+    41:41:java.lang.Object getValue() -> c
+    45:45:boolean hasExpired() -> d
+    50:50:java.lang.String toString() -> toString
+    56:56:boolean canExpire() -> e
+    60:60:com.mojang.serialization.Codec codec(com.mojang.serialization.Codec) -> a
+    60:63:com.mojang.datafixers.kinds.App lambda$codec$3(com.mojang.serialization.Codec,com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    63:63:net.minecraft.world.entity.ai.memory.ExpirableValue lambda$null$2(java.lang.Object,java.util.Optional) -> a
+    62:62:java.util.Optional lambda$null$1(net.minecraft.world.entity.ai.memory.ExpirableValue) -> a
+    61:61:java.lang.Object lambda$null$0(net.minecraft.world.entity.ai.memory.ExpirableValue) -> b
+net.minecraft.world.entity.ai.memory.MemoryModuleType -> awp:
     net.minecraft.world.entity.ai.memory.MemoryModuleType DUMMY -> a
     net.minecraft.world.entity.ai.memory.MemoryModuleType HOME -> b
     net.minecraft.world.entity.ai.memory.MemoryModuleType JOB_SITE -> c
-    net.minecraft.world.entity.ai.memory.MemoryModuleType MEETING_POINT -> d
-    net.minecraft.world.entity.ai.memory.MemoryModuleType SECONDARY_JOB_SITE -> e
-    net.minecraft.world.entity.ai.memory.MemoryModuleType LIVING_ENTITIES -> f
-    net.minecraft.world.entity.ai.memory.MemoryModuleType VISIBLE_LIVING_ENTITIES -> g
-    net.minecraft.world.entity.ai.memory.MemoryModuleType VISIBLE_VILLAGER_BABIES -> h
-    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_PLAYERS -> i
-    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_PLAYER -> j
-    net.minecraft.world.entity.ai.memory.MemoryModuleType WALK_TARGET -> k
-    net.minecraft.world.entity.ai.memory.MemoryModuleType LOOK_TARGET -> l
-    net.minecraft.world.entity.ai.memory.MemoryModuleType INTERACTION_TARGET -> m
-    net.minecraft.world.entity.ai.memory.MemoryModuleType BREED_TARGET -> n
-    net.minecraft.world.entity.ai.memory.MemoryModuleType PATH -> o
-    net.minecraft.world.entity.ai.memory.MemoryModuleType INTERACTABLE_DOORS -> p
-    net.minecraft.world.entity.ai.memory.MemoryModuleType OPENED_DOORS -> q
-    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_BED -> r
-    net.minecraft.world.entity.ai.memory.MemoryModuleType HURT_BY -> s
-    net.minecraft.world.entity.ai.memory.MemoryModuleType HURT_BY_ENTITY -> t
-    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_HOSTILE -> u
-    net.minecraft.world.entity.ai.memory.MemoryModuleType HIDING_PLACE -> v
-    net.minecraft.world.entity.ai.memory.MemoryModuleType HEARD_BELL_TIME -> w
-    net.minecraft.world.entity.ai.memory.MemoryModuleType CANT_REACH_WALK_TARGET_SINCE -> x
-    net.minecraft.world.entity.ai.memory.MemoryModuleType GOLEM_LAST_SEEN_TIME -> y
-    net.minecraft.world.entity.ai.memory.MemoryModuleType LAST_SLEPT -> z
-    net.minecraft.world.entity.ai.memory.MemoryModuleType LAST_WOKEN -> A
-    net.minecraft.world.entity.ai.memory.MemoryModuleType LAST_WORKED_AT_POI -> B
-    java.util.Optional deserializer -> C
-    54:56:void <init>(java.util.Optional) -> <init>
-    60:60:java.lang.String toString() -> toString
-    64:64:java.util.Optional getDeserializer() -> a
-    68:68:net.minecraft.world.entity.ai.memory.MemoryModuleType register(java.lang.String,java.util.Optional) -> a
-    72:72:net.minecraft.world.entity.ai.memory.MemoryModuleType register(java.lang.String) -> a
-    23:50:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.memory.MemoryStatus -> arm:
+    net.minecraft.world.entity.ai.memory.MemoryModuleType POTENTIAL_JOB_SITE -> d
+    net.minecraft.world.entity.ai.memory.MemoryModuleType MEETING_POINT -> e
+    net.minecraft.world.entity.ai.memory.MemoryModuleType SECONDARY_JOB_SITE -> f
+    net.minecraft.world.entity.ai.memory.MemoryModuleType LIVING_ENTITIES -> g
+    net.minecraft.world.entity.ai.memory.MemoryModuleType VISIBLE_LIVING_ENTITIES -> h
+    net.minecraft.world.entity.ai.memory.MemoryModuleType VISIBLE_VILLAGER_BABIES -> i
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_PLAYERS -> j
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_PLAYER -> k
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_TARGETABLE_PLAYER -> l
+    net.minecraft.world.entity.ai.memory.MemoryModuleType WALK_TARGET -> m
+    net.minecraft.world.entity.ai.memory.MemoryModuleType LOOK_TARGET -> n
+    net.minecraft.world.entity.ai.memory.MemoryModuleType ATTACK_TARGET -> o
+    net.minecraft.world.entity.ai.memory.MemoryModuleType ATTACK_COOLING_DOWN -> p
+    net.minecraft.world.entity.ai.memory.MemoryModuleType INTERACTION_TARGET -> q
+    net.minecraft.world.entity.ai.memory.MemoryModuleType BREED_TARGET -> r
+    net.minecraft.world.entity.ai.memory.MemoryModuleType RIDE_TARGET -> s
+    net.minecraft.world.entity.ai.memory.MemoryModuleType PATH -> t
+    net.minecraft.world.entity.ai.memory.MemoryModuleType INTERACTABLE_DOORS -> u
+    net.minecraft.world.entity.ai.memory.MemoryModuleType OPENED_DOORS -> v
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_BED -> w
+    net.minecraft.world.entity.ai.memory.MemoryModuleType HURT_BY -> x
+    net.minecraft.world.entity.ai.memory.MemoryModuleType HURT_BY_ENTITY -> y
+    net.minecraft.world.entity.ai.memory.MemoryModuleType AVOID_TARGET -> z
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_HOSTILE -> A
+    net.minecraft.world.entity.ai.memory.MemoryModuleType HIDING_PLACE -> B
+    net.minecraft.world.entity.ai.memory.MemoryModuleType HEARD_BELL_TIME -> C
+    net.minecraft.world.entity.ai.memory.MemoryModuleType CANT_REACH_WALK_TARGET_SINCE -> D
+    net.minecraft.world.entity.ai.memory.MemoryModuleType GOLEM_LAST_SEEN_TIME -> E
+    net.minecraft.world.entity.ai.memory.MemoryModuleType LAST_SLEPT -> F
+    net.minecraft.world.entity.ai.memory.MemoryModuleType LAST_WOKEN -> G
+    net.minecraft.world.entity.ai.memory.MemoryModuleType LAST_WORKED_AT_POI -> H
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_ADULT -> I
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_WANTED_ITEM -> J
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_NEMESIS -> K
+    net.minecraft.world.entity.ai.memory.MemoryModuleType ANGRY_AT -> L
+    net.minecraft.world.entity.ai.memory.MemoryModuleType UNIVERSAL_ANGER -> M
+    net.minecraft.world.entity.ai.memory.MemoryModuleType ADMIRING_ITEM -> N
+    net.minecraft.world.entity.ai.memory.MemoryModuleType ADMIRING_DISABLED -> O
+    net.minecraft.world.entity.ai.memory.MemoryModuleType HUNTED_RECENTLY -> P
+    net.minecraft.world.entity.ai.memory.MemoryModuleType CELEBRATE_LOCATION -> Q
+    net.minecraft.world.entity.ai.memory.MemoryModuleType DANCING -> R
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_HUNTABLE_HOGLIN -> S
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_BABY_HOGLIN -> T
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_BABY_PIGLIN -> U
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_TARGETABLE_PLAYER_NOT_WEARING_GOLD -> V
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_ADULT_PIGLINS -> W
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_ADULT_PIGLINS -> X
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_ADULT_HOGLINS -> Y
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_ADULT_PIGLIN -> Z
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_VISIBLE_ZOMBIFIED -> aa
+    net.minecraft.world.entity.ai.memory.MemoryModuleType VISIBLE_ADULT_PIGLIN_COUNT -> ab
+    net.minecraft.world.entity.ai.memory.MemoryModuleType VISIBLE_ADULT_HOGLIN_COUNT -> ac
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_PLAYER_HOLDING_WANTED_ITEM -> ad
+    net.minecraft.world.entity.ai.memory.MemoryModuleType ATE_RECENTLY -> ae
+    net.minecraft.world.entity.ai.memory.MemoryModuleType NEAREST_REPELLENT -> af
+    net.minecraft.world.entity.ai.memory.MemoryModuleType PACIFIED -> ag
+    java.util.Optional codec -> ah
+    106:108:void <init>(java.util.Optional) -> <init>
+    112:112:java.lang.String toString() -> toString
+    116:116:java.util.Optional getCodec() -> a
+    120:120:net.minecraft.world.entity.ai.memory.MemoryModuleType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    124:124:net.minecraft.world.entity.ai.memory.MemoryModuleType register(java.lang.String) -> a
+    27:102:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.memory.MemoryStatus -> awq:
     net.minecraft.world.entity.ai.memory.MemoryStatus VALUE_PRESENT -> a
     net.minecraft.world.entity.ai.memory.MemoryStatus VALUE_ABSENT -> b
     net.minecraft.world.entity.ai.memory.MemoryStatus REGISTERED -> c
@@ -39432,19 +43124,19 @@ net.minecraft.world.entity.ai.memory.MemoryStatus -> arm:
     3:3:net.minecraft.world.entity.ai.memory.MemoryStatus valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:6:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.memory.WalkTarget -> arn:
-    net.minecraft.world.entity.ai.behavior.PositionWrapper target -> a
-    float speed -> b
+net.minecraft.world.entity.ai.memory.WalkTarget -> awr:
+    net.minecraft.world.entity.ai.behavior.PositionTracker target -> a
+    float speedModifier -> b
     int closeEnoughDist -> c
     16:17:void <init>(net.minecraft.core.BlockPos,float,int) -> <init>
     20:21:void <init>(net.minecraft.world.phys.Vec3,float,int) -> <init>
-    24:25:void <init>(net.minecraft.world.entity.LivingEntity,float,int) -> <init>
-    27:31:void <init>(net.minecraft.world.entity.ai.behavior.PositionWrapper,float,int) -> <init>
-    34:34:net.minecraft.world.entity.ai.behavior.PositionWrapper getTarget() -> a
-    38:38:float getSpeed() -> b
+    24:25:void <init>(net.minecraft.world.entity.Entity,float,int) -> <init>
+    27:31:void <init>(net.minecraft.world.entity.ai.behavior.PositionTracker,float,int) -> <init>
+    34:34:net.minecraft.world.entity.ai.behavior.PositionTracker getTarget() -> a
+    38:38:float getSpeedModifier() -> b
     42:42:int getCloseEnoughDist() -> c
-net.minecraft.world.entity.ai.memory.package-info -> aro:
-net.minecraft.world.entity.ai.navigation.FlyingPathNavigation -> arp:
+net.minecraft.world.entity.ai.memory.package-info -> aws:
+net.minecraft.world.entity.ai.navigation.FlyingPathNavigation -> awt:
     16:17:void <init>(net.minecraft.world.entity.Mob,net.minecraft.world.level.Level) -> <init>
     21:23:net.minecraft.world.level.pathfinder.PathFinder createPathFinder(int) -> a
     28:28:boolean canUpdatePath() -> a
@@ -39457,7 +43149,7 @@ net.minecraft.world.entity.ai.navigation.FlyingPathNavigation -> arp:
     148:149:void setCanPassDoors(boolean) -> b
     152:152:boolean canOpenDoors() -> e
     157:157:boolean isStableDestination(net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.navigation.GroundPathNavigation -> arq:
+net.minecraft.world.entity.ai.navigation.GroundPathNavigation -> awu:
     boolean avoidSun -> p
     22:23:void <init>(net.minecraft.world.entity.Mob,net.minecraft.world.level.Level) -> <init>
     27:29:net.minecraft.world.level.pathfinder.PathFinder createPathFinder(int) -> a
@@ -39466,25 +43158,25 @@ net.minecraft.world.entity.ai.navigation.GroundPathNavigation -> arq:
     44:68:net.minecraft.world.level.pathfinder.Path createPath(net.minecraft.core.BlockPos,int) -> a
     73:73:net.minecraft.world.level.pathfinder.Path createPath(net.minecraft.world.entity.Entity,int) -> a
     77:92:int getSurfaceY() -> t
-    97:112:void trimPath() -> F_
+    97:112:void trimPath() -> E_
     116:173:boolean canMoveDirectly(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,int,int,int) -> a
-    177:219:boolean canWalkOn(int,int,int,int,int,int,net.minecraft.world.phys.Vec3,double,double) -> a
-    223:233:boolean canWalkAbove(int,int,int,int,int,int,net.minecraft.world.phys.Vec3,double,double) -> b
-    237:238:void setCanOpenDoors(boolean) -> a
-    241:241:boolean canPassDoors() -> e
-    245:246:void setCanPassDoors(boolean) -> b
-    249:249:boolean canOpenDoors() -> f
-    253:254:void setAvoidSun(boolean) -> c
-net.minecraft.world.entity.ai.navigation.PathNavigation -> arr:
+    177:211:boolean canWalkOn(int,int,int,int,int,int,net.minecraft.world.phys.Vec3,double,double) -> a
+    215:227:boolean hasValidPathType(net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
+    231:241:boolean canWalkAbove(int,int,int,int,int,int,net.minecraft.world.phys.Vec3,double,double) -> b
+    245:246:void setCanOpenDoors(boolean) -> a
+    249:249:boolean canPassDoors() -> e
+    253:254:void setCanPassDoors(boolean) -> b
+    257:257:boolean canOpenDoors() -> f
+    261:262:void setAvoidSun(boolean) -> c
+net.minecraft.world.entity.ai.navigation.PathNavigation -> awv:
     net.minecraft.world.entity.Mob mob -> a
     net.minecraft.world.level.Level level -> b
     net.minecraft.world.level.pathfinder.Path path -> c
     double speedModifier -> d
-    net.minecraft.world.entity.ai.attributes.AttributeInstance followRange -> p
     int tick -> e
     int lastStuckCheck -> f
     net.minecraft.world.phys.Vec3 lastStuckCheckPos -> g
-    net.minecraft.world.phys.Vec3 timeoutCachedNode -> h
+    net.minecraft.core.Vec3i timeoutCachedNode -> h
     long timeoutTimer -> i
     long lastTimeoutCheck -> j
     double timeoutLimit -> k
@@ -39492,85 +43184,106 @@ net.minecraft.world.entity.ai.navigation.PathNavigation -> arr:
     boolean hasDelayedRecomputation -> m
     long timeLastRecompute -> n
     net.minecraft.world.level.pathfinder.NodeEvaluator nodeEvaluator -> o
-    net.minecraft.core.BlockPos targetPos -> q
-    int reachRange -> r
-    float maxVisitedNodesMultiplier -> s
-    net.minecraft.world.level.pathfinder.PathFinder pathFinder -> t
-    56:82:void <init>(net.minecraft.world.entity.Mob,net.minecraft.world.level.Level) -> <init>
-    85:86:void resetMaxVisitedNodesMultiplier() -> g
-    92:93:void setMaxVisitedNodesMultiplier(float) -> a
-    96:96:net.minecraft.core.BlockPos getTargetPos() -> h
+    net.minecraft.core.BlockPos targetPos -> p
+    int reachRange -> q
+    float maxVisitedNodesMultiplier -> r
+    net.minecraft.world.level.pathfinder.PathFinder pathFinder -> s
+    54:79:void <init>(net.minecraft.world.entity.Mob,net.minecraft.world.level.Level) -> <init>
+    82:83:void resetMaxVisitedNodesMultiplier() -> g
+    89:90:void setMaxVisitedNodesMultiplier(float) -> a
+    93:93:net.minecraft.core.BlockPos getTargetPos() -> h
     net.minecraft.world.level.pathfinder.PathFinder createPathFinder(int) -> a
-    102:103:void setSpeedModifier(double) -> a
-    106:106:boolean hasDelayedRecomputation() -> i
-    110:120:void recomputePath() -> j
-    124:124:net.minecraft.world.level.pathfinder.Path createPath(double,double,double,int) -> a
-    136:136:net.minecraft.world.level.pathfinder.Path createPath(java.util.stream.Stream,int) -> a
-    148:148:net.minecraft.world.level.pathfinder.Path createPath(net.minecraft.core.BlockPos,int) -> a
-    160:160:net.minecraft.world.level.pathfinder.Path createPath(net.minecraft.world.entity.Entity,int) -> a
-    165:200:net.minecraft.world.level.pathfinder.Path createPath(java.util.Set,int,boolean,int) -> a
-    209:209:boolean moveTo(double,double,double,double) -> a
-    218:219:boolean moveTo(net.minecraft.world.entity.Entity,double) -> a
-    227:246:boolean moveTo(net.minecraft.world.level.pathfinder.Path,double) -> a
-    251:251:net.minecraft.world.level.pathfinder.Path getPath() -> k
-    255:286:void tick() -> c
-    289:299:void updatePath() -> l
-    303:330:void doStuckDetection(net.minecraft.world.phys.Vec3) -> a
-    334:334:boolean isDone() -> m
-    341:341:boolean isInProgress() -> n
-    345:346:void stop() -> o
+    99:100:void setSpeedModifier(double) -> a
+    103:103:boolean hasDelayedRecomputation() -> i
+    107:117:void recomputePath() -> j
+    121:121:net.minecraft.world.level.pathfinder.Path createPath(double,double,double,int) -> a
+    134:134:net.minecraft.world.level.pathfinder.Path createPath(java.util.stream.Stream,int) -> a
+    139:139:net.minecraft.world.level.pathfinder.Path createPath(java.util.Set,int) -> a
+    152:152:net.minecraft.world.level.pathfinder.Path createPath(net.minecraft.core.BlockPos,int) -> a
+    165:165:net.minecraft.world.level.pathfinder.Path createPath(net.minecraft.world.entity.Entity,int) -> a
+    170:206:net.minecraft.world.level.pathfinder.Path createPath(java.util.Set,int,boolean,int) -> a
+    215:215:boolean moveTo(double,double,double,double) -> a
+    224:225:boolean moveTo(net.minecraft.world.entity.Entity,double) -> a
+    233:252:boolean moveTo(net.minecraft.world.level.pathfinder.Path,double) -> a
+    257:257:net.minecraft.world.level.pathfinder.Path getPath() -> k
+    261:292:void tick() -> c
+    298:313:void followThePath() -> l
+    316:333:boolean shouldTargetNextNodeInDirection(net.minecraft.world.phys.Vec3) -> b
+    338:368:void doStuckDetection(net.minecraft.world.phys.Vec3) -> a
+    371:374:void resetStuckTimeout() -> e
+    378:378:boolean isDone() -> m
+    385:385:boolean isInProgress() -> n
+    389:390:void stop() -> o
     net.minecraft.world.phys.Vec3 getTempMobPos() -> b
     boolean canUpdatePath() -> a
-    353:353:boolean isInLiquid() -> p
-    361:379:void trimPath() -> F_
+    397:397:boolean isInLiquid() -> p
+    405:422:void trimPath() -> E_
     boolean canMoveDirectly(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,int,int,int) -> a
-    384:385:boolean isStableDestination(net.minecraft.core.BlockPos) -> a
-    389:389:net.minecraft.world.level.pathfinder.NodeEvaluator getNodeEvaluator() -> q
-    393:394:void setCanFloat(boolean) -> d
-    397:397:boolean canFloat() -> r
-    401:416:void recomputePath(net.minecraft.core.BlockPos) -> b
-    419:419:float getMaxDistanceToWaypoint() -> s
-net.minecraft.world.entity.ai.navigation.WallClimberNavigation -> ars:
+    427:428:boolean isStableDestination(net.minecraft.core.BlockPos) -> a
+    432:432:net.minecraft.world.level.pathfinder.NodeEvaluator getNodeEvaluator() -> q
+    436:437:void setCanFloat(boolean) -> d
+    440:440:boolean canFloat() -> r
+    444:459:void recomputePath(net.minecraft.core.BlockPos) -> b
+    462:462:float getMaxDistanceToWaypoint() -> s
+net.minecraft.world.entity.ai.navigation.WallClimberNavigation -> aww:
     net.minecraft.core.BlockPos pathToPosition -> p
     21:22:void <init>(net.minecraft.world.entity.Mob,net.minecraft.world.level.Level) -> <init>
     26:27:net.minecraft.world.level.pathfinder.Path createPath(net.minecraft.core.BlockPos,int) -> a
     32:33:net.minecraft.world.level.pathfinder.Path createPath(net.minecraft.world.entity.Entity,int) -> a
     38:44:boolean moveTo(net.minecraft.world.entity.Entity,double) -> a
     50:62:void tick() -> c
-net.minecraft.world.entity.ai.navigation.WaterBoundPathNavigation -> art:
+net.minecraft.world.entity.ai.navigation.WaterBoundPathNavigation -> awx:
     boolean allowBreaching -> p
-    20:21:void <init>(net.minecraft.world.entity.Mob,net.minecraft.world.level.Level) -> <init>
-    25:27:net.minecraft.world.level.pathfinder.PathFinder createPathFinder(int) -> a
-    32:32:boolean canUpdatePath() -> a
-    37:37:net.minecraft.world.phys.Vec3 getTempMobPos() -> b
-    42:69:void tick() -> c
-    73:105:void updatePath() -> l
-    110:137:void doStuckDetection(net.minecraft.world.phys.Vec3) -> a
-    141:142:boolean canMoveDirectly(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,int,int,int) -> a
-    147:147:boolean isStableDestination(net.minecraft.core.BlockPos) -> a
-    152:152:void setCanFloat(boolean) -> d
-net.minecraft.world.entity.ai.navigation.package-info -> aru:
-net.minecraft.world.entity.ai.package-info -> arv:
-net.minecraft.world.entity.ai.sensing.DummySensor -> arw:
+    21:22:void <init>(net.minecraft.world.entity.Mob,net.minecraft.world.level.Level) -> <init>
+    26:28:net.minecraft.world.level.pathfinder.PathFinder createPathFinder(int) -> a
+    33:33:boolean canUpdatePath() -> a
+    38:38:net.minecraft.world.phys.Vec3 getTempMobPos() -> b
+    43:70:void tick() -> c
+    74:106:void followThePath() -> l
+    111:138:void doStuckDetection(net.minecraft.world.phys.Vec3) -> a
+    142:143:boolean canMoveDirectly(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,int,int,int) -> a
+    148:148:boolean isStableDestination(net.minecraft.core.BlockPos) -> a
+    153:153:void setCanFloat(boolean) -> d
+net.minecraft.world.entity.ai.navigation.package-info -> awy:
+net.minecraft.world.entity.ai.package-info -> awz:
+net.minecraft.world.entity.ai.sensing.AdultSensor -> axa:
+    17:17:void <init>() -> <init>
+    20:20:java.util.Set requires() -> a
+    27:30:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.AgableMob) -> a
+    33:39:void setNearestVisibleAdult(net.minecraft.world.entity.AgableMob,java.util.List) -> a
+    17:17:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    36:36:boolean lambda$setNearestVisibleAdult$3(net.minecraft.world.entity.AgableMob) -> a
+    35:35:net.minecraft.world.entity.AgableMob lambda$setNearestVisibleAdult$2(net.minecraft.world.entity.LivingEntity) -> a
+    34:34:boolean lambda$setNearestVisibleAdult$1(net.minecraft.world.entity.AgableMob,net.minecraft.world.entity.LivingEntity) -> a
+    28:28:void lambda$doTick$0(net.minecraft.world.entity.AgableMob,java.util.List) -> b
+net.minecraft.world.entity.ai.sensing.DummySensor -> axb:
     10:10:void <init>() -> <init>
     13:13:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     17:17:java.util.Set requires() -> a
-net.minecraft.world.entity.ai.sensing.GolemSensor -> arx:
+net.minecraft.world.entity.ai.sensing.GolemSensor -> axc:
     22:23:void <init>() -> <init>
     26:27:void <init>(int) -> <init>
     31:32:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     36:36:java.util.Set requires() -> a
     40:51:void checkForNearbyGolem(long,net.minecraft.world.entity.LivingEntity) -> a
     46:46:boolean lambda$checkForNearbyGolem$0(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.ai.sensing.HurtBySensor -> ary:
-    12:12:void <init>() -> <init>
-    15:26:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    30:30:java.util.Set requires() -> a
-net.minecraft.world.entity.ai.sensing.InteractableDoorsSensor -> arz:
-    17:17:void <init>() -> <init>
-    20:41:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    45:45:java.util.Set requires() -> a
-net.minecraft.world.entity.ai.sensing.NearestBedSensor -> asa:
+net.minecraft.world.entity.ai.sensing.HoglinSpecificSensor -> axd:
+    22:22:void <init>() -> <init>
+    25:25:java.util.Set requires() -> a
+    40:68:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.hoglin.Hoglin) -> a
+    71:72:java.util.Optional findNearestRepellent(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.hoglin.Hoglin) -> b
+    22:22:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    75:75:boolean lambda$findNearestRepellent$0(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.ai.sensing.HurtBySensor -> axe:
+    18:18:void <init>() -> <init>
+    21:21:java.util.Set requires() -> a
+    26:46:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    42:45:void lambda$doTick$0(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.sensing.InteractableDoorsSensor -> axf:
+    18:18:void <init>() -> <init>
+    21:42:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    46:46:java.util.Set requires() -> a
+net.minecraft.world.entity.ai.sensing.NearestBedSensor -> axg:
     it.unimi.dsi.fastutil.longs.Long2LongMap batchCache -> a
     int triedCount -> b
     long lastUpdate -> c
@@ -39580,32 +43293,50 @@ net.minecraft.world.entity.ai.sensing.NearestBedSensor -> asa:
     24:24:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     78:78:boolean lambda$doTick$1(it.unimi.dsi.fastutil.longs.Long2LongMap$Entry) -> a
     54:64:boolean lambda$doTick$0(net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.sensing.NearestLivingEntitySensor -> asb:
+net.minecraft.world.entity.ai.sensing.NearestItemSensor -> axh:
+    15:15:void <init>() -> <init>
+    22:22:java.util.Set requires() -> a
+    28:39:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob) -> a
+    15:15:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    35:35:boolean lambda$doTick$2(net.minecraft.world.entity.Mob,net.minecraft.world.entity.item.ItemEntity) -> a
+    34:34:boolean lambda$doTick$1(net.minecraft.world.entity.Mob,net.minecraft.world.entity.item.ItemEntity) -> b
+    30:30:boolean lambda$doTick$0(net.minecraft.world.entity.item.ItemEntity) -> a
+net.minecraft.world.entity.ai.sensing.NearestLivingEntitySensor -> axi:
     net.minecraft.world.entity.ai.targeting.TargetingConditions TARGETING -> a
     19:19:void <init>() -> <init>
-    25:34:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    38:38:java.util.Set requires() -> a
+    25:33:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    37:37:java.util.Set requires() -> a
     31:31:boolean lambda$doTick$1(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
     25:25:boolean lambda$doTick$0(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> b
     21:21:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.sensing.PlayerSensor -> asc:
-    16:16:void <init>() -> <init>
-    21:30:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.sensing.PiglinSpecificSensor -> axj:
+    31:31:void <init>() -> <init>
     34:34:java.util.Set requires() -> a
-    23:23:boolean lambda$doTick$0(net.minecraft.world.entity.LivingEntity,net.minecraft.server.level.ServerPlayer) -> a
-net.minecraft.world.entity.ai.sensing.SecondaryPoiSensor -> asd:
-    20:21:void <init>() -> <init>
-    25:47:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
-    51:51:java.util.Set requires() -> a
-    16:16:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.ai.sensing.Sensing -> ase:
+    55:129:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    132:133:java.util.Optional findNearestRepellent(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> c
+    141:146:boolean isValidRepellent(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    136:136:boolean lambda$findNearestRepellent$0(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> b
+net.minecraft.world.entity.ai.sensing.PlayerSensor -> axk:
+    net.minecraft.world.entity.ai.targeting.TargetingConditions TARGETING -> a
+    18:18:void <init>() -> <init>
+    25:25:java.util.Set requires() -> a
+    34:48:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    43:43:boolean lambda$doTick$1(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.player.Player) -> a
+    36:36:boolean lambda$doTick$0(net.minecraft.world.entity.LivingEntity,net.minecraft.server.level.ServerPlayer) -> a
+    21:21:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.sensing.SecondaryPoiSensor -> axl:
+    21:22:void <init>() -> <init>
+    26:48:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.npc.Villager) -> a
+    52:52:java.util.Set requires() -> a
+    17:17:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.ai.sensing.Sensing -> axm:
     net.minecraft.world.entity.Mob mob -> a
     java.util.List seen -> b
     java.util.List unseen -> c
     11:16:void <init>(net.minecraft.world.entity.Mob) -> <init>
     19:21:void tick() -> a
     24:39:boolean canSee(net.minecraft.world.entity.Entity) -> a
-net.minecraft.world.entity.ai.sensing.Sensor -> asf:
+net.minecraft.world.entity.ai.sensing.Sensor -> axn:
     java.util.Random RANDOM -> a
     int scanRate -> b
     long timeToTick -> c
@@ -39615,45 +43346,49 @@ net.minecraft.world.entity.ai.sensing.Sensor -> asf:
     void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     java.util.Set requires() -> a
     17:17:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.sensing.SensorType -> asg:
+net.minecraft.world.entity.ai.sensing.SensorType -> axo:
     net.minecraft.world.entity.ai.sensing.SensorType DUMMY -> a
-    net.minecraft.world.entity.ai.sensing.SensorType NEAREST_LIVING_ENTITIES -> b
-    net.minecraft.world.entity.ai.sensing.SensorType NEAREST_PLAYERS -> c
-    net.minecraft.world.entity.ai.sensing.SensorType INTERACTABLE_DOORS -> d
-    net.minecraft.world.entity.ai.sensing.SensorType NEAREST_BED -> e
-    net.minecraft.world.entity.ai.sensing.SensorType HURT_BY -> f
-    net.minecraft.world.entity.ai.sensing.SensorType VILLAGER_HOSTILES -> g
-    net.minecraft.world.entity.ai.sensing.SensorType VILLAGER_BABIES -> h
-    net.minecraft.world.entity.ai.sensing.SensorType SECONDARY_POIS -> i
-    net.minecraft.world.entity.ai.sensing.SensorType GOLEM_LAST_SEEN -> j
-    java.util.function.Supplier factory -> k
-    22:24:void <init>(java.util.function.Supplier) -> <init>
-    27:27:net.minecraft.world.entity.ai.sensing.Sensor create() -> a
-    31:31:net.minecraft.world.entity.ai.sensing.SensorType register(java.lang.String,java.util.function.Supplier) -> a
-    9:18:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.sensing.VillagerBabiesSensor -> ash:
+    net.minecraft.world.entity.ai.sensing.SensorType NEAREST_ITEMS -> b
+    net.minecraft.world.entity.ai.sensing.SensorType NEAREST_LIVING_ENTITIES -> c
+    net.minecraft.world.entity.ai.sensing.SensorType NEAREST_PLAYERS -> d
+    net.minecraft.world.entity.ai.sensing.SensorType INTERACTABLE_DOORS -> e
+    net.minecraft.world.entity.ai.sensing.SensorType NEAREST_BED -> f
+    net.minecraft.world.entity.ai.sensing.SensorType HURT_BY -> g
+    net.minecraft.world.entity.ai.sensing.SensorType VILLAGER_HOSTILES -> h
+    net.minecraft.world.entity.ai.sensing.SensorType VILLAGER_BABIES -> i
+    net.minecraft.world.entity.ai.sensing.SensorType SECONDARY_POIS -> j
+    net.minecraft.world.entity.ai.sensing.SensorType GOLEM_LAST_SEEN -> k
+    net.minecraft.world.entity.ai.sensing.SensorType PIGLIN_SPECIFIC_SENSOR -> l
+    net.minecraft.world.entity.ai.sensing.SensorType HOGLIN_SPECIFIC_SENSOR -> m
+    net.minecraft.world.entity.ai.sensing.SensorType NEAREST_ADULT -> n
+    java.util.function.Supplier factory -> o
+    26:28:void <init>(java.util.function.Supplier) -> <init>
+    31:31:net.minecraft.world.entity.ai.sensing.Sensor create() -> a
+    35:35:net.minecraft.world.entity.ai.sensing.SensorType register(java.lang.String,java.util.function.Supplier) -> a
+    9:22:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.sensing.VillagerBabiesSensor -> axp:
     18:18:void <init>() -> <init>
     21:21:java.util.Set requires() -> a
     26:27:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
     30:32:java.util.List getNearestVillagerBabies(net.minecraft.world.entity.LivingEntity) -> a
     36:36:boolean isVillagerBaby(net.minecraft.world.entity.LivingEntity) -> b
     40:41:java.util.List getVisibleEntities(net.minecraft.world.entity.LivingEntity) -> c
-net.minecraft.world.entity.ai.sensing.VillagerHostilesSensor -> asi:
+net.minecraft.world.entity.ai.sensing.VillagerHostilesSensor -> axq:
     com.google.common.collect.ImmutableMap ACCEPTABLE_DISTANCE_FROM_HOSTILES -> a
     19:19:void <init>() -> <init>
-    35:35:java.util.Set requires() -> a
-    42:43:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
-    46:46:java.util.Optional getNearestHostile(net.minecraft.world.entity.LivingEntity) -> a
-    55:55:java.util.Optional getVisibleEntities(net.minecraft.world.entity.LivingEntity) -> b
-    63:63:int compareMobDistance(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    67:68:boolean isClose(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    72:72:boolean isHostile(net.minecraft.world.entity.LivingEntity) -> c
-    47:50:java.util.Optional lambda$getNearestHostile$2(net.minecraft.world.entity.LivingEntity,java.util.List) -> a
-    50:50:int lambda$null$1(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> b
-    49:49:boolean lambda$null$0(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> b
-    20:31:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.sensing.package-info -> asj:
-net.minecraft.world.entity.ai.targeting.TargetingConditions -> ask:
+    36:36:java.util.Set requires() -> a
+    43:44:void doTick(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    47:47:java.util.Optional getNearestHostile(net.minecraft.world.entity.LivingEntity) -> a
+    56:56:java.util.Optional getVisibleEntities(net.minecraft.world.entity.LivingEntity) -> b
+    64:64:int compareMobDistance(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    68:69:boolean isClose(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    73:73:boolean isHostile(net.minecraft.world.entity.LivingEntity) -> c
+    48:51:java.util.Optional lambda$getNearestHostile$2(net.minecraft.world.entity.LivingEntity,java.util.List) -> a
+    51:51:int lambda$null$1(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> b
+    50:50:boolean lambda$null$0(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> b
+    20:32:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.sensing.package-info -> axr:
+net.minecraft.world.entity.ai.targeting.TargetingConditions -> axs:
     net.minecraft.world.entity.ai.targeting.TargetingConditions DEFAULT -> a
     double range -> b
     boolean allowInvulnerable -> c
@@ -39672,25 +43407,26 @@ net.minecraft.world.entity.ai.targeting.TargetingConditions -> ask:
     51:52:net.minecraft.world.entity.ai.targeting.TargetingConditions selector(java.util.function.Predicate) -> a
     56:100:boolean test(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
     10:10:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.targeting.package-info -> asl:
-net.minecraft.world.entity.ai.util.RandomPos -> asm:
+net.minecraft.world.entity.ai.targeting.package-info -> axt:
+net.minecraft.world.entity.ai.util.RandomPos -> axu:
     37:37:void <init>() -> <init>
     41:41:net.minecraft.world.phys.Vec3 getPos(net.minecraft.world.entity.PathfinderMob,int,int) -> a
     49:49:net.minecraft.world.phys.Vec3 getAirPos(net.minecraft.world.entity.PathfinderMob,int,int,int,net.minecraft.world.phys.Vec3,double) -> a
     54:54:net.minecraft.world.phys.Vec3 getLandPos(net.minecraft.world.entity.PathfinderMob,int,int) -> b
     59:59:net.minecraft.world.phys.Vec3 getLandPos(net.minecraft.world.entity.PathfinderMob,int,int,java.util.function.ToDoubleFunction) -> a
     64:64:net.minecraft.world.phys.Vec3 getAboveLandPos(net.minecraft.world.entity.PathfinderMob,int,int,net.minecraft.world.phys.Vec3,float,int,int) -> a
-    69:70:net.minecraft.world.phys.Vec3 getPosTowards(net.minecraft.world.entity.PathfinderMob,int,int,net.minecraft.world.phys.Vec3) -> a
-    75:76:net.minecraft.world.phys.Vec3 getPosTowards(net.minecraft.world.entity.PathfinderMob,int,int,net.minecraft.world.phys.Vec3,double) -> a
-    85:87:net.minecraft.world.phys.Vec3 getAirPosTowards(net.minecraft.world.entity.PathfinderMob,int,int,int,net.minecraft.world.phys.Vec3,double) -> b
-    93:94:net.minecraft.world.phys.Vec3 getPosAvoid(net.minecraft.world.entity.PathfinderMob,int,int,net.minecraft.world.phys.Vec3) -> b
-    99:100:net.minecraft.world.phys.Vec3 getLandPosAvoid(net.minecraft.world.entity.PathfinderMob,int,int,net.minecraft.world.phys.Vec3) -> c
-    131:206:net.minecraft.world.phys.Vec3 generateRandomPos(net.minecraft.world.entity.PathfinderMob,int,int,int,net.minecraft.world.phys.Vec3,boolean,double,java.util.function.ToDoubleFunction,boolean,int,int,boolean) -> a
-    228:244:net.minecraft.core.BlockPos getRandomDelta(java.util.Random,int,int,int,net.minecraft.world.phys.Vec3,double) -> a
-    248:268:net.minecraft.core.BlockPos moveUpToAboveSolid(net.minecraft.core.BlockPos,int,int,java.util.function.Predicate) -> a
-    184:184:boolean lambda$generateRandomPos$0(net.minecraft.world.entity.PathfinderMob,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.util.package-info -> asn:
-net.minecraft.world.entity.ai.village.ReputationEventType -> aso:
+    69:70:net.minecraft.world.phys.Vec3 getLandPosTowards(net.minecraft.world.entity.PathfinderMob,int,int,net.minecraft.world.phys.Vec3) -> a
+    75:76:net.minecraft.world.phys.Vec3 getPosTowards(net.minecraft.world.entity.PathfinderMob,int,int,net.minecraft.world.phys.Vec3) -> b
+    81:82:net.minecraft.world.phys.Vec3 getPosTowards(net.minecraft.world.entity.PathfinderMob,int,int,net.minecraft.world.phys.Vec3,double) -> a
+    91:93:net.minecraft.world.phys.Vec3 getAirPosTowards(net.minecraft.world.entity.PathfinderMob,int,int,int,net.minecraft.world.phys.Vec3,double) -> b
+    99:100:net.minecraft.world.phys.Vec3 getPosAvoid(net.minecraft.world.entity.PathfinderMob,int,int,net.minecraft.world.phys.Vec3) -> c
+    105:106:net.minecraft.world.phys.Vec3 getLandPosAvoid(net.minecraft.world.entity.PathfinderMob,int,int,net.minecraft.world.phys.Vec3) -> d
+    137:212:net.minecraft.world.phys.Vec3 generateRandomPos(net.minecraft.world.entity.PathfinderMob,int,int,int,net.minecraft.world.phys.Vec3,boolean,double,java.util.function.ToDoubleFunction,boolean,int,int,boolean) -> a
+    234:250:net.minecraft.core.BlockPos getRandomDelta(java.util.Random,int,int,int,net.minecraft.world.phys.Vec3,double) -> a
+    254:274:net.minecraft.core.BlockPos moveUpToAboveSolid(net.minecraft.core.BlockPos,int,int,java.util.function.Predicate) -> a
+    190:190:boolean lambda$generateRandomPos$0(net.minecraft.world.entity.PathfinderMob,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.ai.util.package-info -> axv:
+net.minecraft.world.entity.ai.village.ReputationEventType -> axw:
     net.minecraft.world.entity.ai.village.ReputationEventType ZOMBIE_VILLAGER_CURED -> a
     net.minecraft.world.entity.ai.village.ReputationEventType GOLEM_KILLED -> b
     net.minecraft.world.entity.ai.village.ReputationEventType VILLAGER_HURT -> c
@@ -39698,11 +43434,11 @@ net.minecraft.world.entity.ai.village.ReputationEventType -> aso:
     net.minecraft.world.entity.ai.village.ReputationEventType TRADE -> e
     11:11:net.minecraft.world.entity.ai.village.ReputationEventType register(java.lang.String) -> a
     4:8:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.village.ReputationEventType$1 -> aso$1:
+net.minecraft.world.entity.ai.village.ReputationEventType$1 -> axw$1:
     java.lang.String val$name -> f
     11:11:void <init>(java.lang.String) -> <init>
     14:14:java.lang.String toString() -> toString
-net.minecraft.world.entity.ai.village.VillageSiege -> asp:
+net.minecraft.world.entity.ai.village.VillageSiege -> axx:
     boolean hasSetupSiege -> a
     net.minecraft.world.entity.ai.village.VillageSiege$State siegeState -> b
     int zombiesToSpawn -> c
@@ -39715,7 +43451,7 @@ net.minecraft.world.entity.ai.village.VillageSiege -> asp:
     77:100:boolean tryToSetupSiege(net.minecraft.server.level.ServerLevel) -> a
     104:119:void trySpawn(net.minecraft.server.level.ServerLevel) -> b
     123:136:net.minecraft.world.phys.Vec3 findRandomSpawnPos(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.ai.village.VillageSiege$State -> asp$a:
+net.minecraft.world.entity.ai.village.VillageSiege$State -> axx$a:
     net.minecraft.world.entity.ai.village.VillageSiege$State SIEGE_CAN_ACTIVATE -> a
     net.minecraft.world.entity.ai.village.VillageSiege$State SIEGE_TONIGHT -> b
     net.minecraft.world.entity.ai.village.VillageSiege$State SIEGE_DONE -> c
@@ -39724,107 +43460,107 @@ net.minecraft.world.entity.ai.village.VillageSiege$State -> asp$a:
     27:27:net.minecraft.world.entity.ai.village.VillageSiege$State valueOf(java.lang.String) -> valueOf
     27:27:void <init>(java.lang.String,int) -> <init>
     27:30:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.village.package-info -> asq:
-net.minecraft.world.entity.ai.village.poi.PoiManager -> asr:
+net.minecraft.world.entity.ai.village.package-info -> axy:
+net.minecraft.world.entity.ai.village.poi.PoiManager -> axz:
     net.minecraft.world.entity.ai.village.poi.PoiManager$DistanceTracker distanceTracker -> a
     it.unimi.dsi.fastutil.longs.LongSet loadedChunks -> b
-    41:46:void <init>(java.io.File,com.mojang.datafixers.DataFixer) -> <init>
+    41:46:void <init>(java.io.File,com.mojang.datafixers.DataFixer,boolean) -> <init>
     49:50:void add(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
     53:54:void remove(net.minecraft.core.BlockPos) -> a
     57:57:long getCountInRange(java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> a
-    61:61:java.util.stream.Stream getInSquare(java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> b
-    65:66:java.util.stream.Stream getInRange(java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> c
-    71:71:java.util.stream.Stream getInChunk(java.util.function.Predicate,net.minecraft.world.level.ChunkPos,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> a
-    75:75:java.util.stream.Stream getInSection(java.util.function.Predicate,long,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> a
-    79:81:java.util.stream.Stream findAll(java.util.function.Predicate,java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> a
-    85:85:java.util.Optional find(java.util.function.Predicate,java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> b
-    90:94:java.util.Optional findClosest(java.util.function.Predicate,java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> c
-    98:101:java.util.Optional take(java.util.function.Predicate,java.util.function.Predicate,net.minecraft.core.BlockPos,int) -> a
-    109:113:java.util.Optional takeClosest(java.util.function.Predicate,java.util.function.Predicate,net.minecraft.core.BlockPos,int) -> b
-    120:122:java.util.Optional getRandom(java.util.function.Predicate,java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy,net.minecraft.core.BlockPos,int,java.util.Random) -> a
-    126:126:boolean release(net.minecraft.core.BlockPos) -> b
-    130:130:boolean exists(net.minecraft.core.BlockPos,java.util.function.Predicate) -> a
-    134:135:java.util.Optional getType(net.minecraft.core.BlockPos) -> c
-    139:140:int getFreeTickets(net.minecraft.core.BlockPos) -> d
-    144:145:int sectionsToVillage(net.minecraft.core.SectionPos) -> a
-    152:157:boolean isVillageCenter(long) -> f
-    162:164:void tick(java.util.function.BooleanSupplier) -> a
-    168:170:void setDirty(long) -> a
-    174:175:void onSectionLoad(long) -> b
-    178:194:void checkConsistencyWithBlocks(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.LevelChunkSection) -> a
-    197:197:boolean mayHavePoi(net.minecraft.world.level.chunk.LevelChunkSection) -> a
-    201:209:void updateFromSection(net.minecraft.world.level.chunk.LevelChunkSection,net.minecraft.core.SectionPos,java.util.function.BiConsumer) -> a
-    212:218:void ensureLoadedAndValid(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int) -> a
-    217:217:void lambda$ensureLoadedAndValid$22(net.minecraft.world.level.LevelReader,net.minecraft.world.level.ChunkPos) -> a
-    216:216:boolean lambda$ensureLoadedAndValid$21(net.minecraft.world.level.ChunkPos) -> b
-    215:215:net.minecraft.world.level.ChunkPos lambda$ensureLoadedAndValid$20(com.mojang.datafixers.util.Pair) -> a
-    214:214:boolean lambda$ensureLoadedAndValid$19(com.mojang.datafixers.util.Pair) -> b
-    213:213:com.mojang.datafixers.util.Pair lambda$ensureLoadedAndValid$18(net.minecraft.core.SectionPos) -> c
-    202:208:void lambda$updateFromSection$17(net.minecraft.world.level.chunk.LevelChunkSection,java.util.function.BiConsumer,net.minecraft.core.BlockPos) -> a
-    207:207:void lambda$null$16(java.util.function.BiConsumer,net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-    188:192:void lambda$checkConsistencyWithBlocks$15(net.minecraft.world.level.chunk.LevelChunkSection,net.minecraft.core.SectionPos) -> a
-    181:186:void lambda$checkConsistencyWithBlocks$14(net.minecraft.world.level.chunk.LevelChunkSection,net.minecraft.core.SectionPos,net.minecraft.world.entity.ai.village.poi.PoiSection) -> a
-    182:185:void lambda$null$13(net.minecraft.world.level.chunk.LevelChunkSection,net.minecraft.core.SectionPos,java.util.function.BiConsumer) -> b
-    157:157:java.lang.Boolean lambda$isVillageCenter$12(net.minecraft.world.entity.ai.village.poi.PoiSection) -> a
-    130:130:java.lang.Boolean lambda$exists$11(net.minecraft.core.BlockPos,java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiSection) -> a
-    122:122:boolean lambda$getRandom$10(java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
-    114:115:net.minecraft.core.BlockPos lambda$takeClosest$9(net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
-    111:111:boolean lambda$takeClosest$8(java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> b
-    110:110:double lambda$takeClosest$7(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
-    102:103:net.minecraft.core.BlockPos lambda$take$6(net.minecraft.world.entity.ai.village.poi.PoiRecord) -> b
-    99:99:boolean lambda$take$5(java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> c
-    92:92:double lambda$findClosest$4(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    75:75:java.util.stream.Stream lambda$getInSection$3(java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy,net.minecraft.world.entity.ai.village.poi.PoiSection) -> a
-    71:71:java.util.stream.Stream lambda$getInChunk$2(java.util.function.Predicate,net.minecraft.world.level.ChunkPos,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy,java.lang.Integer) -> a
-    66:66:boolean lambda$getInRange$1(net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
-    61:61:java.util.stream.Stream lambda$getInSquare$0(java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy,net.minecraft.world.level.ChunkPos) -> a
+    61:62:boolean existsAtPosition(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.core.BlockPos) -> a
+    69:71:java.util.stream.Stream getInSquare(java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> b
+    75:76:java.util.stream.Stream getInRange(java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> c
+    81:84:java.util.stream.Stream getInChunk(java.util.function.Predicate,net.minecraft.world.level.ChunkPos,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> a
+    88:90:java.util.stream.Stream findAll(java.util.function.Predicate,java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> a
+    94:94:java.util.Optional find(java.util.function.Predicate,java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> b
+    98:100:java.util.Optional findClosest(java.util.function.Predicate,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> d
+    104:107:java.util.Optional take(java.util.function.Predicate,java.util.function.Predicate,net.minecraft.core.BlockPos,int) -> a
+    114:116:java.util.Optional getRandom(java.util.function.Predicate,java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy,net.minecraft.core.BlockPos,int,java.util.Random) -> a
+    120:120:boolean release(net.minecraft.core.BlockPos) -> b
+    124:124:boolean exists(net.minecraft.core.BlockPos,java.util.function.Predicate) -> a
+    128:129:java.util.Optional getType(net.minecraft.core.BlockPos) -> c
+    133:134:int getFreeTickets(net.minecraft.core.BlockPos) -> d
+    143:144:int sectionsToVillage(net.minecraft.core.SectionPos) -> a
+    148:153:boolean isVillageCenter(long) -> f
+    158:160:void tick(java.util.function.BooleanSupplier) -> a
+    164:166:void setDirty(long) -> a
+    170:171:void onSectionLoad(long) -> b
+    174:190:void checkConsistencyWithBlocks(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.LevelChunkSection) -> a
+    193:193:boolean mayHavePoi(net.minecraft.world.level.chunk.LevelChunkSection) -> a
+    197:205:void updateFromSection(net.minecraft.world.level.chunk.LevelChunkSection,net.minecraft.core.SectionPos,java.util.function.BiConsumer) -> a
+    208:214:void ensureLoadedAndValid(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int) -> a
+    213:213:void lambda$ensureLoadedAndValid$19(net.minecraft.world.level.LevelReader,net.minecraft.world.level.ChunkPos) -> a
+    212:212:boolean lambda$ensureLoadedAndValid$18(net.minecraft.world.level.ChunkPos) -> b
+    211:211:net.minecraft.world.level.ChunkPos lambda$ensureLoadedAndValid$17(com.mojang.datafixers.util.Pair) -> a
+    210:210:boolean lambda$ensureLoadedAndValid$16(com.mojang.datafixers.util.Pair) -> b
+    209:209:com.mojang.datafixers.util.Pair lambda$ensureLoadedAndValid$15(net.minecraft.core.SectionPos) -> c
+    198:204:void lambda$updateFromSection$14(net.minecraft.world.level.chunk.LevelChunkSection,java.util.function.BiConsumer,net.minecraft.core.BlockPos) -> a
+    203:203:void lambda$null$13(java.util.function.BiConsumer,net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    184:188:void lambda$checkConsistencyWithBlocks$12(net.minecraft.world.level.chunk.LevelChunkSection,net.minecraft.core.SectionPos) -> a
+    177:182:void lambda$checkConsistencyWithBlocks$11(net.minecraft.world.level.chunk.LevelChunkSection,net.minecraft.core.SectionPos,net.minecraft.world.entity.ai.village.poi.PoiSection) -> a
+    178:181:void lambda$null$10(net.minecraft.world.level.chunk.LevelChunkSection,net.minecraft.core.SectionPos,java.util.function.BiConsumer) -> b
+    153:153:java.lang.Boolean lambda$isVillageCenter$9(net.minecraft.world.entity.ai.village.poi.PoiSection) -> a
+    124:124:java.lang.Boolean lambda$exists$8(net.minecraft.core.BlockPos,java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiSection) -> a
+    116:116:boolean lambda$getRandom$7(java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
+    108:109:net.minecraft.core.BlockPos lambda$take$6(net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
+    105:105:boolean lambda$take$5(java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> b
+    100:100:double lambda$findClosest$4(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    84:84:java.util.stream.Stream lambda$getInChunk$3(java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy,java.util.Optional) -> a
+    82:82:java.util.Optional lambda$getInChunk$2(net.minecraft.world.level.ChunkPos,java.lang.Integer) -> a
+    76:76:boolean lambda$getInRange$1(net.minecraft.core.BlockPos,int,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
+    71:71:java.util.stream.Stream lambda$getInSquare$0(java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy,net.minecraft.world.level.ChunkPos) -> a
     37:37:boolean access$000(net.minecraft.world.entity.ai.village.poi.PoiManager,long) -> a
-net.minecraft.world.entity.ai.village.poi.PoiManager$DistanceTracker -> asr$a:
+net.minecraft.world.entity.ai.village.poi.PoiManager$DistanceTracker -> axz$a:
     it.unimi.dsi.fastutil.longs.Long2ByteMap levels -> b
     net.minecraft.world.entity.ai.village.poi.PoiManager this$0 -> a
-    239:243:void <init>(net.minecraft.world.entity.ai.village.poi.PoiManager) -> <init>
-    247:247:int getLevelFromSource(long) -> b
-    252:252:int getLevel(long) -> c
-    257:262:void setLevel(long,int) -> a
-    265:266:void runAllUpdates() -> a
-net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy -> asr$b:
+    235:239:void <init>(net.minecraft.world.entity.ai.village.poi.PoiManager) -> <init>
+    243:243:int getLevelFromSource(long) -> b
+    248:248:int getLevel(long) -> c
+    253:258:void setLevel(long,int) -> a
+    261:262:void runAllUpdates() -> a
+net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy -> axz$b:
     net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy HAS_SPACE -> a
     net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy IS_OCCUPIED -> b
     net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy ANY -> c
     java.util.function.Predicate test -> d
     net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy[] $VALUES -> e
-    220:220:net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy[] values() -> values
-    220:220:net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy valueOf(java.lang.String) -> valueOf
-    227:229:void <init>(java.lang.String,int,java.util.function.Predicate) -> <init>
-    232:232:java.util.function.Predicate getTest() -> a
-    223:223:boolean lambda$static$0(net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
-    220:223:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.village.poi.PoiRecord -> ass:
+    216:216:net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy[] values() -> values
+    216:216:net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy valueOf(java.lang.String) -> valueOf
+    223:225:void <init>(java.lang.String,int,java.util.function.Predicate) -> <init>
+    228:228:java.util.function.Predicate getTest() -> a
+    219:219:boolean lambda$static$0(net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
+    216:219:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.village.poi.PoiRecord -> aya:
     net.minecraft.core.BlockPos pos -> a
     net.minecraft.world.entity.ai.village.poi.PoiType poiType -> b
     int freeTickets -> c
     java.lang.Runnable setDirty -> d
-    20:25:void <init>(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType,int,java.lang.Runnable) -> <init>
-    28:29:void <init>(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType,java.lang.Runnable) -> <init>
-    32:33:void <init>(com.mojang.datafixers.Dynamic,java.lang.Runnable) -> <init>
-    37:40:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    47:47:int getFreeTickets() -> a
-    51:57:boolean acquireTicket() -> b
-    61:67:boolean releaseTicket() -> c
-    71:71:boolean hasSpace() -> d
-    75:75:boolean isOccupied() -> e
-    79:79:net.minecraft.core.BlockPos getPos() -> f
-    83:83:net.minecraft.world.entity.ai.village.poi.PoiType getPoiType() -> g
-    88:95:boolean equals(java.lang.Object) -> equals
-    100:100:int hashCode() -> hashCode
-net.minecraft.world.entity.ai.village.poi.PoiSection -> ast:
+    13:13:com.mojang.serialization.Codec codec(java.lang.Runnable) -> a
+    26:31:void <init>(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType,int,java.lang.Runnable) -> <init>
+    34:35:void <init>(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType,java.lang.Runnable) -> <init>
+    40:40:int getFreeTickets() -> a
+    44:50:boolean acquireTicket() -> b
+    54:60:boolean releaseTicket() -> c
+    64:64:boolean hasSpace() -> d
+    68:68:boolean isOccupied() -> e
+    72:72:net.minecraft.core.BlockPos getPos() -> f
+    76:76:net.minecraft.world.entity.ai.village.poi.PoiType getPoiType() -> g
+    81:88:boolean equals(java.lang.Object) -> equals
+    93:93:int hashCode() -> hashCode
+    13:18:com.mojang.datafixers.kinds.App lambda$codec$3(java.lang.Runnable,com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    16:16:java.lang.Integer lambda$null$2(net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
+    15:15:net.minecraft.world.entity.ai.village.poi.PoiType lambda$null$1(net.minecraft.world.entity.ai.village.poi.PoiRecord) -> b
+    14:14:net.minecraft.core.BlockPos lambda$null$0(net.minecraft.world.entity.ai.village.poi.PoiRecord) -> c
+net.minecraft.world.entity.ai.village.poi.PoiSection -> ayb:
     org.apache.logging.log4j.Logger LOGGER -> a
     it.unimi.dsi.fastutil.shorts.Short2ObjectMap records -> b
     java.util.Map byType -> c
     java.lang.Runnable setDirty -> d
     boolean isValid -> e
-    31:39:void <init>(java.lang.Runnable) -> <init>
-    31:54:void <init>(java.lang.Runnable,com.mojang.datafixers.Dynamic) -> <init>
+    34:38:com.mojang.serialization.Codec codec(java.lang.Runnable) -> a
+    47:48:void <init>(java.lang.Runnable) -> <init>
+    41:54:void <init>(java.lang.Runnable,boolean,java.util.List) -> <init>
     57:61:java.util.stream.Stream getRecords(java.util.function.Predicate,net.minecraft.world.entity.ai.village.poi.PoiManager$Occupancy) -> a
     66:70:void add(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
     73:88:boolean add(net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
@@ -39833,202 +43569,210 @@ net.minecraft.world.entity.ai.village.poi.PoiSection -> ast:
     112:118:boolean release(net.minecraft.core.BlockPos) -> c
     122:124:boolean exists(net.minecraft.core.BlockPos,java.util.function.Predicate) -> a
     128:130:java.util.Optional getType(net.minecraft.core.BlockPos) -> d
-    135:138:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    143:154:void refresh(java.util.function.Consumer) -> a
-    157:159:void clear() -> b
-    162:162:boolean isValid() -> a
-    147:150:void lambda$refresh$8(it.unimi.dsi.fastutil.shorts.Short2ObjectMap,net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-    148:148:net.minecraft.world.entity.ai.village.poi.PoiRecord lambda$null$7(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType,int) -> a
-    135:135:java.lang.Object lambda$serialize$6(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
-    87:87:java.util.Set lambda$add$5(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-    67:67:java.lang.Object lambda$add$4(net.minecraft.core.BlockPos) -> e
-    67:67:java.lang.Object lambda$add$3(net.minecraft.world.entity.ai.village.poi.PoiType) -> b
-    60:60:java.util.stream.Stream lambda$getRecords$2(java.util.Map$Entry) -> a
-    59:59:boolean lambda$getRecords$1(java.util.function.Predicate,java.util.Map$Entry) -> a
-    45:45:void lambda$new$0(java.lang.Runnable,com.mojang.datafixers.Dynamic) -> a
+    134:145:void refresh(java.util.function.Consumer) -> a
+    148:150:void clear() -> b
+    153:153:boolean isValid() -> a
+    138:141:void lambda$refresh$10(it.unimi.dsi.fastutil.shorts.Short2ObjectMap,net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    139:139:net.minecraft.world.entity.ai.village.poi.PoiRecord lambda$null$9(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiType,int) -> a
+    87:87:java.util.Set lambda$add$8(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    67:67:java.lang.Object lambda$add$7(net.minecraft.core.BlockPos) -> e
+    67:67:java.lang.Object lambda$add$6(net.minecraft.world.entity.ai.village.poi.PoiType) -> b
+    60:60:java.util.stream.Stream lambda$getRecords$5(java.util.Map$Entry) -> a
+    59:59:boolean lambda$getRecords$4(java.util.function.Predicate,java.util.Map$Entry) -> a
+    38:38:net.minecraft.world.entity.ai.village.poi.PoiSection lambda$codec$3(java.lang.Runnable) -> b
+    34:38:com.mojang.datafixers.kinds.App lambda$codec$2(java.lang.Runnable,com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    37:37:java.util.List lambda$null$1(net.minecraft.world.entity.ai.village.poi.PoiSection) -> a
+    36:36:java.lang.Boolean lambda$null$0(net.minecraft.world.entity.ai.village.poi.PoiSection) -> b
     27:27:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.village.poi.PoiType -> asu:
-    java.util.function.Predicate ALL_JOBS -> v
-    java.util.function.Predicate ALL -> a
-    java.util.Set BEDS -> w
-    java.util.Map TYPE_BY_STATE -> x
-    net.minecraft.world.entity.ai.village.poi.PoiType UNEMPLOYED -> b
-    net.minecraft.world.entity.ai.village.poi.PoiType ARMORER -> c
-    net.minecraft.world.entity.ai.village.poi.PoiType BUTCHER -> d
-    net.minecraft.world.entity.ai.village.poi.PoiType CARTOGRAPHER -> e
-    net.minecraft.world.entity.ai.village.poi.PoiType CLERIC -> f
-    net.minecraft.world.entity.ai.village.poi.PoiType FARMER -> g
-    net.minecraft.world.entity.ai.village.poi.PoiType FISHERMAN -> h
-    net.minecraft.world.entity.ai.village.poi.PoiType FLETCHER -> i
-    net.minecraft.world.entity.ai.village.poi.PoiType LEATHERWORKER -> j
-    net.minecraft.world.entity.ai.village.poi.PoiType LIBRARIAN -> k
-    net.minecraft.world.entity.ai.village.poi.PoiType MASON -> l
-    net.minecraft.world.entity.ai.village.poi.PoiType NITWIT -> m
-    net.minecraft.world.entity.ai.village.poi.PoiType SHEPHERD -> n
-    net.minecraft.world.entity.ai.village.poi.PoiType TOOLSMITH -> o
-    net.minecraft.world.entity.ai.village.poi.PoiType WEAPONSMITH -> p
-    net.minecraft.world.entity.ai.village.poi.PoiType HOME -> q
-    net.minecraft.world.entity.ai.village.poi.PoiType MEETING -> r
-    net.minecraft.world.entity.ai.village.poi.PoiType BEEHIVE -> s
-    net.minecraft.world.entity.ai.village.poi.PoiType BEE_NEST -> t
-    net.minecraft.world.entity.ai.village.poi.PoiType NETHER_PORTAL -> u
-    java.lang.String name -> y
-    java.util.Set matchingStates -> z
-    int maxTickets -> A
-    java.util.function.Predicate predicate -> B
-    int validRange -> C
-    66:66:java.util.Set getBlockStates(net.minecraft.world.level.block.Block) -> a
-    69:75:void <init>(java.lang.String,java.util.Set,int,java.util.function.Predicate,int) -> <init>
-    77:83:void <init>(java.lang.String,java.util.Set,int,int) -> <init>
-    86:86:java.lang.String getName() -> a
-    90:90:int getMaxTickets() -> b
-    94:94:java.util.function.Predicate getPredicate() -> c
-    98:98:boolean is(net.minecraft.world.level.block.state.BlockState) -> a
-    102:102:int getValidRange() -> d
-    107:107:java.lang.String toString() -> toString
-    111:111:net.minecraft.world.entity.ai.village.poi.PoiType register(java.lang.String,java.util.Set,int,int) -> a
-    115:115:net.minecraft.world.entity.ai.village.poi.PoiType register(java.lang.String,java.util.Set,int,java.util.function.Predicate,int) -> a
-    119:126:net.minecraft.world.entity.ai.village.poi.PoiType registerBlockStates(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-    130:130:java.util.Optional forState(net.minecraft.world.level.block.state.BlockState) -> b
-    134:134:java.util.stream.Stream allPoiStates() -> e
-    120:124:void lambda$registerBlockStates$5(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.level.block.state.BlockState) -> a
-    81:81:boolean lambda$new$4(net.minecraft.world.entity.ai.village.poi.PoiType) -> b
-    32:32:boolean lambda$static$3(net.minecraft.world.level.block.state.BlockState) -> c
-    31:31:java.util.stream.Stream lambda$static$2(net.minecraft.world.level.block.Block) -> b
-    26:26:boolean lambda$static$1(net.minecraft.world.entity.ai.village.poi.PoiType) -> c
-    25:25:boolean lambda$static$0(net.minecraft.world.entity.ai.village.poi.PoiType) -> d
-    25:57:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ai.village.poi.package-info -> asv:
-net.minecraft.world.entity.ambient.AmbientCreature -> asw:
+net.minecraft.world.entity.ai.village.poi.PoiType -> ayc:
+    java.util.function.Supplier ALL_JOB_POI_TYPES -> y
+    java.util.function.Predicate ALL_JOBS -> a
+    java.util.function.Predicate ALL -> b
+    java.util.Set BEDS -> z
+    java.util.Map TYPE_BY_STATE -> A
+    net.minecraft.world.entity.ai.village.poi.PoiType UNEMPLOYED -> c
+    net.minecraft.world.entity.ai.village.poi.PoiType ARMORER -> d
+    net.minecraft.world.entity.ai.village.poi.PoiType BUTCHER -> e
+    net.minecraft.world.entity.ai.village.poi.PoiType CARTOGRAPHER -> f
+    net.minecraft.world.entity.ai.village.poi.PoiType CLERIC -> g
+    net.minecraft.world.entity.ai.village.poi.PoiType FARMER -> h
+    net.minecraft.world.entity.ai.village.poi.PoiType FISHERMAN -> i
+    net.minecraft.world.entity.ai.village.poi.PoiType FLETCHER -> j
+    net.minecraft.world.entity.ai.village.poi.PoiType LEATHERWORKER -> k
+    net.minecraft.world.entity.ai.village.poi.PoiType LIBRARIAN -> l
+    net.minecraft.world.entity.ai.village.poi.PoiType MASON -> m
+    net.minecraft.world.entity.ai.village.poi.PoiType NITWIT -> n
+    net.minecraft.world.entity.ai.village.poi.PoiType SHEPHERD -> o
+    net.minecraft.world.entity.ai.village.poi.PoiType TOOLSMITH -> p
+    net.minecraft.world.entity.ai.village.poi.PoiType WEAPONSMITH -> q
+    net.minecraft.world.entity.ai.village.poi.PoiType HOME -> r
+    net.minecraft.world.entity.ai.village.poi.PoiType MEETING -> s
+    net.minecraft.world.entity.ai.village.poi.PoiType BEEHIVE -> t
+    net.minecraft.world.entity.ai.village.poi.PoiType BEE_NEST -> u
+    net.minecraft.world.entity.ai.village.poi.PoiType NETHER_PORTAL -> v
+    net.minecraft.world.entity.ai.village.poi.PoiType LODESTONE -> w
+    java.util.Set ALL_STATES -> x
+    java.lang.String name -> B
+    java.util.Set matchingStates -> C
+    int maxTickets -> D
+    java.util.function.Predicate predicate -> E
+    int validRange -> F
+    71:71:java.util.Set getBlockStates(net.minecraft.world.level.block.Block) -> a
+    74:80:void <init>(java.lang.String,java.util.Set,int,java.util.function.Predicate,int) -> <init>
+    82:88:void <init>(java.lang.String,java.util.Set,int,int) -> <init>
+    91:91:java.lang.String getName() -> a
+    95:95:int getMaxTickets() -> b
+    99:99:java.util.function.Predicate getPredicate() -> c
+    103:103:boolean is(net.minecraft.world.level.block.state.BlockState) -> a
+    107:107:int getValidRange() -> d
+    112:112:java.lang.String toString() -> toString
+    116:116:net.minecraft.world.entity.ai.village.poi.PoiType register(java.lang.String,java.util.Set,int,int) -> a
+    120:120:net.minecraft.world.entity.ai.village.poi.PoiType register(java.lang.String,java.util.Set,int,java.util.function.Predicate,int) -> a
+    124:131:net.minecraft.world.entity.ai.village.poi.PoiType registerBlockStates(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    135:135:java.util.Optional forState(net.minecraft.world.level.block.state.BlockState) -> b
+    125:129:void lambda$registerBlockStates$6(net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.world.level.block.state.BlockState) -> a
+    86:86:boolean lambda$new$5(net.minecraft.world.entity.ai.village.poi.PoiType) -> b
+    34:34:boolean lambda$static$4(net.minecraft.world.level.block.state.BlockState) -> c
+    33:33:java.util.stream.Stream lambda$static$3(net.minecraft.world.level.block.Block) -> b
+    28:28:boolean lambda$static$2(net.minecraft.world.entity.ai.village.poi.PoiType) -> c
+    27:27:boolean lambda$static$1(net.minecraft.world.entity.ai.village.poi.PoiType) -> d
+    26:26:java.util.Set lambda$static$0() -> e
+    26:62:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ai.village.poi.package-info -> ayd:
+net.minecraft.world.entity.ambient.AmbientCreature -> aye:
     10:11:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     15:15:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
-net.minecraft.world.entity.ambient.Bat -> asx:
+net.minecraft.world.entity.ambient.Bat -> ayf:
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_FLAGS -> b
     net.minecraft.world.entity.ai.targeting.TargetingConditions BAT_RESTING_TARGETING -> c
     net.minecraft.core.BlockPos targetPosition -> d
-    38:41:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    45:48:void defineSynchedData() -> w_
-    52:52:float getSoundVolume() -> dm
-    57:57:float getVoicePitch() -> dn
-    63:66:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    71:71:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    76:76:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    82:82:boolean isPushable() -> aL
-    88:88:void doPush(net.minecraft.world.entity.Entity) -> C
-    93:93:void pushEntities() -> dv
-    97:100:void registerAttributes() -> cA
-    103:103:boolean isResting() -> l
-    107:113:void setResting(boolean) -> r
-    117:125:void tick() -> h
-    129:178:void customServerAiStep() -> dT
-    182:182:boolean isMovementNoisy() -> at
-    187:187:boolean causeFallDamage(float,float) -> b
-    194:194:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    198:198:boolean isIgnoringBlockTriggers() -> bH
-    203:212:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    217:220:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    224:227:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    230:247:boolean checkBatSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    251:255:boolean isHalloween() -> eo
-    260:260:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    31:33:void <clinit>() -> <clinit>
-net.minecraft.world.entity.ambient.package-info -> asy:
-net.minecraft.world.entity.animal.AbstractFish -> asz:
+    40:43:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    47:50:void defineSynchedData() -> e
+    54:54:float getSoundVolume() -> dF
+    59:59:float getVoicePitch() -> dG
+    65:68:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    73:73:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    78:78:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    84:84:boolean isPushable() -> aR
+    90:90:void doPush(net.minecraft.world.entity.Entity) -> C
+    95:95:void pushEntities() -> dP
+    98:99:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    103:103:boolean isResting() -> eJ
+    107:113:void setResting(boolean) -> t
+    117:125:void tick() -> j
+    129:183:void customServerAiStep() -> N
+    187:187:boolean isMovementNoisy() -> ax
+    192:192:boolean causeFallDamage(float,float) -> b
+    199:199:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    203:203:boolean isIgnoringBlockTriggers() -> bP
+    208:217:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    222:225:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    229:232:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    235:252:boolean checkBatSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
+    256:260:boolean isHalloween() -> eK
+    265:265:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    33:35:void <clinit>() -> <clinit>
+net.minecraft.world.entity.ambient.package-info -> ayg:
+net.minecraft.world.entity.animal.AbstractFish -> ayh:
     net.minecraft.network.syncher.EntityDataAccessor FROM_BUCKET -> b
-    42:45:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    49:49:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    54:57:void registerAttributes() -> cA
-    61:61:boolean requiresCustomPersistence() -> I
-    65:65:boolean checkFishSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    70:70:boolean removeWhenFarAway(double) -> h
-    75:75:int getMaxSpawnClusterSize() -> dX
-    80:83:void defineSynchedData() -> w_
-    86:86:boolean fromBucket() -> es
-    90:91:void setFromBucket(boolean) -> r
-    95:98:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    102:105:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    109:114:void registerGoals() -> n
-    118:118:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
-    123:134:void travel(net.minecraft.world.phys.Vec3) -> e
-    138:150:void aiStep() -> k
-    154:177:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    181:184:void saveToBucketTag(net.minecraft.world.item.ItemStack) -> i
-    net.minecraft.world.item.ItemStack getBucketItemStack() -> l
-    203:203:boolean canRandomSwim() -> eq
-    net.minecraft.sounds.SoundEvent getFlopSound() -> er
-    247:247:net.minecraft.sounds.SoundEvent getSwimSound() -> am
-    39:39:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.AbstractFish$FishMoveControl -> asz$a:
+    46:49:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    53:53:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    57:58:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    63:63:boolean requiresCustomPersistence() -> K
+    67:67:boolean checkFishSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
+    72:72:boolean removeWhenFarAway(double) -> h
+    77:77:int getMaxSpawnClusterSize() -> er
+    82:85:void defineSynchedData() -> e
+    88:88:boolean fromBucket() -> eO
+    92:93:void setFromBucket(boolean) -> t
+    97:100:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    104:107:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    111:116:void registerGoals() -> o
+    120:120:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
+    125:136:void travel(net.minecraft.world.phys.Vec3) -> f
+    140:152:void aiStep() -> k
+    156:179:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    183:186:void saveToBucketTag(net.minecraft.world.item.ItemStack) -> k
+    net.minecraft.world.item.ItemStack getBucketItemStack() -> eL
+    205:205:boolean canRandomSwim() -> eM
+    net.minecraft.sounds.SoundEvent getFlopSound() -> eN
+    254:254:net.minecraft.sounds.SoundEvent getSwimSound() -> aq
+    260:260:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    43:43:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.AbstractFish$FishMoveControl -> ayh$a:
     net.minecraft.world.entity.animal.AbstractFish fish -> i
-    210:212:void <init>(net.minecraft.world.entity.animal.AbstractFish) -> <init>
-    216:240:void tick() -> a
-net.minecraft.world.entity.animal.AbstractFish$FishSwimGoal -> asz$b:
+    212:214:void <init>(net.minecraft.world.entity.animal.AbstractFish) -> <init>
+    218:247:void tick() -> a
+net.minecraft.world.entity.animal.AbstractFish$FishSwimGoal -> ayh$b:
     net.minecraft.world.entity.animal.AbstractFish fish -> h
-    192:194:void <init>(net.minecraft.world.entity.animal.AbstractFish) -> <init>
-    198:198:boolean canUse() -> a
-net.minecraft.world.entity.animal.AbstractGolem -> ata:
+    194:196:void <init>(net.minecraft.world.entity.animal.AbstractFish) -> <init>
+    200:200:boolean canUse() -> a
+net.minecraft.world.entity.animal.AbstractGolem -> ayi:
     13:14:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     18:18:boolean causeFallDamage(float,float) -> b
-    24:24:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    24:24:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     30:30:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    36:36:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    41:41:int getAmbientSoundInterval() -> A
+    36:36:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    41:41:int getAmbientSoundInterval() -> D
     46:46:boolean removeWhenFarAway(double) -> h
-net.minecraft.world.entity.animal.AbstractSchoolingFish -> atb:
+net.minecraft.world.entity.animal.AbstractSchoolingFish -> ayj:
     net.minecraft.world.entity.animal.AbstractSchoolingFish leader -> b
     int schoolSize -> c
     18:22:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    26:29:void registerGoals() -> n
-    33:33:int getMaxSpawnClusterSize() -> dX
-    37:37:int getMaxSchoolSize() -> es
-    42:42:boolean canRandomSwim() -> eq
-    46:46:boolean isFollower() -> et
+    26:29:void registerGoals() -> o
+    33:33:int getMaxSpawnClusterSize() -> er
+    37:37:int getMaxSchoolSize() -> eO
+    42:42:boolean canRandomSwim() -> eM
+    46:46:boolean isFollower() -> eP
     50:53:net.minecraft.world.entity.animal.AbstractSchoolingFish startFollowing(net.minecraft.world.entity.animal.AbstractSchoolingFish) -> a
-    57:59:void stopFollowing() -> eu
-    62:63:void addFollower() -> ez
-    66:67:void removeFollower() -> eA
-    70:70:boolean canBeFollowed() -> ev
-    75:84:void tick() -> h
-    87:87:boolean hasFollowers() -> ew
-    91:91:boolean inRangeOfLeader() -> ex
-    95:98:void pathToLeader() -> ey
+    57:59:void stopFollowing() -> eQ
+    62:63:void addFollower() -> eV
+    66:67:void removeFollower() -> eW
+    70:70:boolean canBeFollowed() -> eR
+    75:84:void tick() -> j
+    87:87:boolean hasFollowers() -> eS
+    91:91:boolean inRangeOfLeader() -> eT
+    95:98:void pathToLeader() -> eU
     101:102:void addFollowers(java.util.stream.Stream) -> a
     107:115:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
     101:101:void lambda$addFollowers$1(net.minecraft.world.entity.animal.AbstractSchoolingFish) -> b
     101:101:boolean lambda$addFollowers$0(net.minecraft.world.entity.animal.AbstractSchoolingFish) -> c
-net.minecraft.world.entity.animal.AbstractSchoolingFish$SchoolSpawnGroupData -> atb$a:
+net.minecraft.world.entity.animal.AbstractSchoolingFish$SchoolSpawnGroupData -> ayj$a:
     net.minecraft.world.entity.animal.AbstractSchoolingFish leader -> a
     121:123:void <init>(net.minecraft.world.entity.animal.AbstractSchoolingFish) -> <init>
-net.minecraft.world.entity.animal.Animal -> atc:
-    int inLove -> bw
-    java.util.UUID loveCause -> bx
-    31:32:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    36:40:void customServerAiStep() -> dT
-    44:59:void aiStep() -> k
-    63:67:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    72:75:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
-    80:85:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    89:89:double getRidingHeight() -> aR
-    94:97:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    100:101:boolean checkAnimalSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    106:106:int getAmbientSoundInterval() -> A
-    111:111:boolean removeWhenFarAway(double) -> h
-    116:116:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
-    120:120:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    125:143:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    147:150:void usePlayerItem(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
-    153:153:boolean canFallInLove() -> ev
-    157:164:void setInLove(net.minecraft.world.entity.player.Player) -> f
-    167:168:void setInLoveTime(int) -> s
-    172:179:net.minecraft.server.level.ServerPlayer getLoveCause() -> ew
-    184:184:boolean isInLove() -> ex
-    188:189:void resetLove() -> ey
-    192:198:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
-    203:213:void handleEntityEvent(byte) -> a
-net.minecraft.world.entity.animal.Bee -> atd:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_FLAGS_ID -> bw
-    net.minecraft.network.syncher.EntityDataAccessor ANGER_TIME -> bx
-    java.util.UUID lastHurtByUUID -> by
+net.minecraft.world.entity.animal.Animal -> ayk:
+    int inLove -> bv
+    java.util.UUID loveCause -> bw
+    38:41:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    45:49:void customServerAiStep() -> N
+    53:68:void aiStep() -> k
+    72:76:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    81:84:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
+    89:94:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    98:98:double getMyRidingOffset() -> aX
+    103:106:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    109:110:boolean checkAnimalSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
+    115:115:int getAmbientSoundInterval() -> D
+    120:120:boolean removeWhenFarAway(double) -> h
+    125:125:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
+    129:129:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    134:152:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    156:159:void usePlayerItem(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+    162:162:boolean canFallInLove() -> eQ
+    166:173:void setInLove(net.minecraft.world.entity.player.Player) -> g
+    176:177:void setInLoveTime(int) -> s
+    180:180:int getInLoveTime() -> eR
+    185:192:net.minecraft.server.level.ServerPlayer getLoveCause() -> eS
+    197:197:boolean isInLove() -> eT
+    201:202:void resetLove() -> eU
+    205:211:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
+    215:244:void spawnChildFromBreeding(net.minecraft.world.level.Level,net.minecraft.world.entity.animal.Animal) -> a
+    248:258:void handleEntityEvent(byte) -> a
+net.minecraft.world.entity.animal.Bee -> ayl:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_FLAGS_ID -> bv
+    net.minecraft.network.syncher.EntityDataAccessor DATA_REMAINING_ANGER_TIME -> bw
+    net.minecraft.util.IntRange PERSISTENT_ANGER_TIME -> bx
+    java.util.UUID persistentAngerTarget -> by
     float rollAmount -> bz
     float rollAmountO -> bA
     int timeSinceSting -> bB
@@ -40043,219 +43787,222 @@ net.minecraft.world.entity.animal.Bee -> atd:
     net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal goToHiveGoal -> bK
     net.minecraft.world.entity.animal.Bee$BeeGoToKnownFlowerGoal goToKnownFlowerGoal -> bL
     int underWaterTicks -> bM
-    144:169:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    173:176:void defineSynchedData() -> w_
-    181:184:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
-    189:213:void registerGoals() -> n
-    217:237:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    241:270:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    274:295:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    300:310:void tick() -> h
-    313:314:void spawnFluidParticle(net.minecraft.world.level.Level,double,double,double,double,double,net.minecraft.core.particles.ParticleOptions) -> a
-    317:341:void pathfindRandomlyTowards(net.minecraft.core.BlockPos) -> h
-    345:345:net.minecraft.core.BlockPos getSavedFlowerPos() -> eq
-    349:349:boolean hasSavedFlowerPos() -> er
-    353:354:void setSavedFlowerPos(net.minecraft.core.BlockPos) -> g
-    358:358:int getTravellingTicks() -> es
-    363:363:java.util.List getBlacklistedHives() -> et
-    367:367:boolean isTiredOfLookingForNectar() -> eH
-    372:380:boolean wantsToEnterHive() -> eI
-    384:385:void setStayOutOfHiveCountdown(int) -> t
-    388:388:float getRollAmount(float) -> v
-    392:398:void updateRollAmount() -> eJ
-    402:406:void setLastHurtByMob(net.minecraft.world.entity.LivingEntity) -> a
-    410:446:void customServerAiStep() -> dT
-    449:450:void resetTicksWithoutNectarSinceExitingHive() -> eu
-    453:457:boolean isHiveNearFire() -> eK
-    461:461:boolean isAngry() -> ez
-    465:465:int getAngerTime() -> eL
-    469:470:void setAngerTime(int) -> u
-    473:477:boolean doesHiveHaveSpace(net.minecraft.core.BlockPos) -> i
-    482:482:boolean hasHive() -> eA
-    488:488:net.minecraft.core.BlockPos getHivePos() -> eB
-    493:493:net.minecraft.world.entity.ai.goal.GoalSelector getGoalSelector() -> eC
-    498:501:void sendDebugPackets() -> K
-    504:504:int getCropsGrownSincePollination() -> eM
-    508:509:void resetNumCropsGrownSincePollination() -> eN
-    512:513:void incrementNumCropsGrownSincePollination() -> eO
-    517:541:void aiStep() -> k
-    544:548:boolean isHiveValid() -> eP
-    552:552:boolean hasNectar() -> eD
-    556:560:void setHasNectar(boolean) -> r
-    563:563:boolean hasStung() -> eE
-    567:568:void setHasStung(boolean) -> s
-    571:571:boolean isRolling() -> eQ
-    575:576:void setRolling(boolean) -> t
-    579:579:boolean isTooFarAway(net.minecraft.core.BlockPos) -> j
-    583:588:void setFlag(int,boolean) -> d
-    591:591:boolean getFlag(int) -> v
-    596:605:void registerAttributes() -> cA
-    609:627:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
-    632:632:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    636:636:boolean isFlowerValid(net.minecraft.core.BlockPos) -> k
-    642:642:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    646:646:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    651:651:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    656:656:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    661:661:float getSoundVolume() -> dm
-    666:666:net.minecraft.world.entity.animal.Bee getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    671:674:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    679:679:boolean causeFallDamage(float,float) -> b
-    685:685:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    689:689:boolean makeFlySound() -> aq
-    694:694:boolean isFlying() -> eF
-    698:700:void dropOffNectar() -> eG
-    703:708:boolean makeAngry(net.minecraft.world.entity.Entity) -> a
-    713:721:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    726:726:net.minecraft.world.entity.MobType getMobType() -> di
-    731:732:void jumpInLiquid(net.minecraft.tags.Tag) -> c
-    735:735:boolean closerThan(net.minecraft.core.BlockPos,int) -> b
-    86:86:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    86:86:net.minecraft.world.entity.animal.Bee$BeePollinateGoal access$700(net.minecraft.world.entity.animal.Bee) -> a
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$900(net.minecraft.world.entity.animal.Bee) -> b
-    86:86:java.util.Random access$1000(net.minecraft.world.entity.animal.Bee) -> c
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$1100(net.minecraft.world.entity.animal.Bee) -> d
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$1200(net.minecraft.world.entity.animal.Bee) -> e
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$1300(net.minecraft.world.entity.animal.Bee) -> f
-    86:86:boolean access$1400(net.minecraft.world.entity.animal.Bee) -> g
-    86:86:net.minecraft.core.BlockPos access$1500(net.minecraft.world.entity.animal.Bee) -> h
-    86:86:boolean access$1600(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos,int) -> a
-    86:86:boolean access$1800(net.minecraft.world.entity.animal.Bee) -> i
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$1900(net.minecraft.world.entity.animal.Bee) -> j
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$2000(net.minecraft.world.entity.animal.Bee) -> k
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$2100(net.minecraft.world.entity.animal.Bee) -> l
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$2200(net.minecraft.world.entity.animal.Bee) -> m
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$2300(net.minecraft.world.entity.animal.Bee) -> n
-    86:86:boolean access$2400(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> a
-    86:86:void access$2500(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> b
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$2600(net.minecraft.world.entity.animal.Bee) -> o
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$2700(net.minecraft.world.entity.animal.Bee) -> p
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$2800(net.minecraft.world.entity.animal.Bee) -> q
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$2900(net.minecraft.world.entity.animal.Bee) -> r
-    86:86:net.minecraft.core.BlockPos access$1502(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> c
-    86:86:int access$3002(net.minecraft.world.entity.animal.Bee,int) -> a
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$3100(net.minecraft.world.entity.animal.Bee) -> s
-    86:86:net.minecraft.core.BlockPos access$3200(net.minecraft.world.entity.animal.Bee) -> t
-    86:86:boolean access$3300(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> d
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$3400(net.minecraft.world.entity.animal.Bee) -> u
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$3500(net.minecraft.world.entity.animal.Bee) -> v
-    86:86:net.minecraft.core.BlockPos access$3202(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> e
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$3600(net.minecraft.world.entity.animal.Bee) -> w
-    86:86:int access$3700(net.minecraft.world.entity.animal.Bee) -> x
-    86:86:int access$3800(net.minecraft.world.entity.animal.Bee) -> y
-    86:86:java.util.Random access$3900(net.minecraft.world.entity.animal.Bee) -> z
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$4000(net.minecraft.world.entity.animal.Bee) -> A
-    86:86:java.util.Random access$4100(net.minecraft.world.entity.animal.Bee) -> B
-    86:86:void access$4200(net.minecraft.world.entity.animal.Bee,boolean) -> a
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$4300(net.minecraft.world.entity.animal.Bee) -> C
-    86:86:int access$3802(net.minecraft.world.entity.animal.Bee,int) -> b
-    86:86:java.util.Random access$4400(net.minecraft.world.entity.animal.Bee) -> D
-    86:86:net.minecraft.world.entity.ai.navigation.PathNavigation access$4500(net.minecraft.world.entity.animal.Bee) -> E
-    86:86:java.util.Random access$4600(net.minecraft.world.entity.animal.Bee) -> F
-    86:86:java.util.Random access$4700(net.minecraft.world.entity.animal.Bee) -> G
-    86:86:int access$3000(net.minecraft.world.entity.animal.Bee) -> H
-    86:86:net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal access$4800(net.minecraft.world.entity.animal.Bee) -> I
-    86:86:boolean access$5100(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> f
-    86:86:int access$5200(net.minecraft.world.entity.animal.Bee) -> J
-    86:86:java.util.Random access$5300(net.minecraft.world.entity.animal.Bee) -> K
-    86:86:java.util.Random access$5400(net.minecraft.world.entity.animal.Bee) -> L
-    86:86:void access$5500(net.minecraft.world.entity.animal.Bee) -> M
-    88:89:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Bee$1 -> atd$1:
+    148:175:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    179:182:void defineSynchedData() -> e
+    187:190:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
+    195:220:void registerGoals() -> o
+    224:239:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    243:261:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    265:286:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    291:301:void tick() -> j
+    304:305:void spawnFluidParticle(net.minecraft.world.level.Level,double,double,double,double,double,net.minecraft.core.particles.ParticleOptions) -> a
+    308:332:void pathfindRandomlyTowards(net.minecraft.core.BlockPos) -> h
+    336:336:net.minecraft.core.BlockPos getSavedFlowerPos() -> eL
+    340:340:boolean hasSavedFlowerPos() -> eM
+    344:345:void setSavedFlowerPos(net.minecraft.core.BlockPos) -> g
+    349:349:int getTravellingTicks() -> eN
+    354:354:java.util.List getBlacklistedHives() -> eO
+    358:358:boolean isTiredOfLookingForNectar() -> fd
+    363:371:boolean wantsToEnterHive() -> fe
+    375:376:void setStayOutOfHiveCountdown(int) -> t
+    379:379:float getRollAmount(float) -> u
+    383:389:void updateRollAmount() -> ff
+    393:422:void customServerAiStep() -> N
+    425:426:void resetTicksWithoutNectarSinceExitingHive() -> eP
+    429:433:boolean isHiveNearFire() -> fg
+    438:438:int getRemainingPersistentAngerTime() -> F_
+    443:444:void setRemainingPersistentAngerTime(int) -> a_
+    448:448:java.util.UUID getPersistentAngerTarget() -> G_
+    453:454:void setPersistentAngerTarget(java.util.UUID) -> a
+    458:459:void startPersistentAngerTimer() -> H_
+    462:466:boolean doesHiveHaveSpace(net.minecraft.core.BlockPos) -> i
+    471:471:boolean hasHive() -> eV
+    477:477:net.minecraft.core.BlockPos getHivePos() -> eW
+    482:482:net.minecraft.world.entity.ai.goal.GoalSelector getGoalSelector() -> eX
+    487:490:void sendDebugPackets() -> M
+    493:493:int getCropsGrownSincePollination() -> fh
+    497:498:void resetNumCropsGrownSincePollination() -> fi
+    501:502:void incrementNumCropsGrownSincePollination() -> fj
+    506:530:void aiStep() -> k
+    533:537:boolean isHiveValid() -> fk
+    541:541:boolean hasNectar() -> eY
+    545:549:void setHasNectar(boolean) -> t
+    552:552:boolean hasStung() -> eZ
+    556:557:void setHasStung(boolean) -> u
+    560:560:boolean isRolling() -> fl
+    564:565:void setRolling(boolean) -> v
+    568:568:boolean isTooFarAway(net.minecraft.core.BlockPos) -> j
+    572:577:void setFlag(int,boolean) -> d
+    580:580:boolean getFlag(int) -> u
+    584:589:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> fa
+    594:612:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
+    617:617:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    621:621:boolean isFlowerValid(net.minecraft.core.BlockPos) -> k
+    627:627:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    631:631:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    636:636:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    641:641:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    646:646:float getSoundVolume() -> dF
+    651:651:net.minecraft.world.entity.animal.Bee getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    656:659:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    664:664:boolean causeFallDamage(float,float) -> b
+    670:670:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    674:674:boolean makeFlySound() -> au
+    679:679:boolean isFlying() -> fb
+    683:685:void dropOffNectar() -> fc
+    689:696:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    701:701:net.minecraft.world.entity.MobType getMobType() -> dB
+    706:707:void jumpInLiquid(net.minecraft.tags.Tag) -> c
+    711:711:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    715:715:boolean closerThan(net.minecraft.core.BlockPos,int) -> b
+    91:91:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    91:91:net.minecraft.world.entity.animal.Bee$BeePollinateGoal access$700(net.minecraft.world.entity.animal.Bee) -> a
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$900(net.minecraft.world.entity.animal.Bee) -> b
+    91:91:java.util.Random access$1000(net.minecraft.world.entity.animal.Bee) -> c
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$1100(net.minecraft.world.entity.animal.Bee) -> d
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$1200(net.minecraft.world.entity.animal.Bee) -> e
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$1300(net.minecraft.world.entity.animal.Bee) -> f
+    91:91:boolean access$1400(net.minecraft.world.entity.animal.Bee) -> g
+    91:91:net.minecraft.core.BlockPos access$1500(net.minecraft.world.entity.animal.Bee) -> h
+    91:91:boolean access$1600(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos,int) -> a
+    91:91:boolean access$1800(net.minecraft.world.entity.animal.Bee) -> i
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$1900(net.minecraft.world.entity.animal.Bee) -> j
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$2000(net.minecraft.world.entity.animal.Bee) -> k
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$2100(net.minecraft.world.entity.animal.Bee) -> l
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$2200(net.minecraft.world.entity.animal.Bee) -> m
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$2300(net.minecraft.world.entity.animal.Bee) -> n
+    91:91:boolean access$2400(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> a
+    91:91:void access$2500(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> b
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$2600(net.minecraft.world.entity.animal.Bee) -> o
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$2700(net.minecraft.world.entity.animal.Bee) -> p
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$2800(net.minecraft.world.entity.animal.Bee) -> q
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$2900(net.minecraft.world.entity.animal.Bee) -> r
+    91:91:net.minecraft.core.BlockPos access$1502(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> c
+    91:91:int access$3002(net.minecraft.world.entity.animal.Bee,int) -> a
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$3100(net.minecraft.world.entity.animal.Bee) -> s
+    91:91:net.minecraft.core.BlockPos access$3200(net.minecraft.world.entity.animal.Bee) -> t
+    91:91:boolean access$3300(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> d
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$3400(net.minecraft.world.entity.animal.Bee) -> u
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$3500(net.minecraft.world.entity.animal.Bee) -> v
+    91:91:net.minecraft.core.BlockPos access$3202(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> e
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$3600(net.minecraft.world.entity.animal.Bee) -> w
+    91:91:int access$3700(net.minecraft.world.entity.animal.Bee) -> x
+    91:91:int access$3800(net.minecraft.world.entity.animal.Bee) -> y
+    91:91:java.util.Random access$3900(net.minecraft.world.entity.animal.Bee) -> z
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$4000(net.minecraft.world.entity.animal.Bee) -> A
+    91:91:java.util.Random access$4100(net.minecraft.world.entity.animal.Bee) -> B
+    91:91:void access$4200(net.minecraft.world.entity.animal.Bee,boolean) -> a
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$4300(net.minecraft.world.entity.animal.Bee) -> C
+    91:91:int access$3802(net.minecraft.world.entity.animal.Bee,int) -> b
+    91:91:java.util.Random access$4400(net.minecraft.world.entity.animal.Bee) -> D
+    91:91:net.minecraft.world.entity.ai.navigation.PathNavigation access$4500(net.minecraft.world.entity.animal.Bee) -> E
+    91:91:java.util.Random access$4600(net.minecraft.world.entity.animal.Bee) -> F
+    91:91:java.util.Random access$4700(net.minecraft.world.entity.animal.Bee) -> G
+    91:91:int access$3000(net.minecraft.world.entity.animal.Bee) -> H
+    91:91:net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal access$4800(net.minecraft.world.entity.animal.Bee) -> I
+    91:91:boolean access$5100(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> f
+    91:91:int access$5200(net.minecraft.world.entity.animal.Bee) -> J
+    91:91:java.util.Random access$5300(net.minecraft.world.entity.animal.Bee) -> K
+    91:91:java.util.Random access$5400(net.minecraft.world.entity.animal.Bee) -> L
+    91:91:void access$5500(net.minecraft.world.entity.animal.Bee) -> M
+    93:128:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Bee$1 -> ayl$1:
     net.minecraft.world.entity.animal.Bee this$0 -> p
-    609:609:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.Mob,net.minecraft.world.level.Level) -> <init>
-    612:612:boolean isStableDestination(net.minecraft.core.BlockPos) -> a
-    617:622:void tick() -> c
-net.minecraft.world.entity.animal.Bee$BaseBeeGoal -> atd$a:
+    594:594:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.Mob,net.minecraft.world.level.Level) -> <init>
+    597:597:boolean isStableDestination(net.minecraft.core.BlockPos) -> a
+    602:607:void tick() -> c
+net.minecraft.world.entity.animal.Bee$BaseBeeGoal -> ayl$a:
     net.minecraft.world.entity.animal.Bee this$0 -> a
-    778:778:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
+    764:764:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
     boolean canBeeUse() -> g
     boolean canBeeContinueToUse() -> h
-    785:785:boolean canUse() -> a
-    790:790:boolean canContinueToUse() -> b
-    778:778:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.animal.Bee$1) -> <init>
-net.minecraft.world.entity.animal.Bee$BeeAttackGoal -> atd$b:
-    net.minecraft.world.entity.animal.Bee this$0 -> d
-    1411:1413:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.PathfinderMob,double,boolean) -> <init>
-    1417:1417:boolean canUse() -> a
-    1422:1422:boolean canContinueToUse() -> b
-net.minecraft.world.entity.animal.Bee$BeeBecomeAngryTargetGoal -> atd$c:
-    753:754:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
-    758:758:boolean canUse() -> a
-    763:768:boolean canContinueToUse() -> b
-    772:773:boolean beeCanTarget() -> h
-net.minecraft.world.entity.animal.Bee$BeeEnterHiveGoal -> atd$d:
+    771:771:boolean canUse() -> a
+    776:776:boolean canContinueToUse() -> b
+    764:764:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.animal.Bee$1) -> <init>
+net.minecraft.world.entity.animal.Bee$BeeAttackGoal -> ayl$b:
     net.minecraft.world.entity.animal.Bee this$0 -> b
-    1429:1429:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
-    1432:1443:boolean canBeeUse() -> g
-    1448:1448:boolean canBeeContinueToUse() -> h
-    1453:1458:void start() -> c
-    1429:1429:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.animal.Bee$1) -> <init>
-net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal -> atd$e:
+    1407:1409:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.PathfinderMob,double,boolean) -> <init>
+    1413:1413:boolean canUse() -> a
+    1418:1418:boolean canContinueToUse() -> b
+net.minecraft.world.entity.animal.Bee$BeeBecomeAngryTargetGoal -> ayl$c:
+    739:740:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
+    744:744:boolean canUse() -> a
+    749:754:boolean canContinueToUse() -> b
+    758:759:boolean beeCanTarget() -> h
+net.minecraft.world.entity.animal.Bee$BeeEnterHiveGoal -> ayl$d:
+    net.minecraft.world.entity.animal.Bee this$0 -> b
+    1425:1425:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
+    1428:1439:boolean canBeeUse() -> g
+    1444:1444:boolean canBeeContinueToUse() -> h
+    1449:1454:void start() -> c
+    1425:1425:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.animal.Bee$1) -> <init>
+net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal -> ayl$e:
     int travellingTicks -> c
     java.util.List blacklistedTargets -> d
     net.minecraft.world.level.pathfinder.Path lastPath -> e
+    int ticksStuck -> f
     net.minecraft.world.entity.animal.Bee this$0 -> b
-    852:862:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
-    866:870:boolean canBeeUse() -> g
-    875:875:boolean canBeeContinueToUse() -> h
-    880:882:void start() -> c
-    886:889:void stop() -> d
-    893:944:void tick() -> e
-    950:952:boolean pathfindDirectlyTowards(net.minecraft.core.BlockPos) -> a
-    956:956:boolean isTargetBlacklisted(net.minecraft.core.BlockPos) -> b
-    960:964:void blacklistTarget(net.minecraft.core.BlockPos) -> c
-    967:968:void clearBlacklist() -> j
-    971:975:void dropAndBlacklistHive() -> k
-    978:980:void dropHive() -> l
-    983:987:boolean hasReachedTarget(net.minecraft.core.BlockPos) -> d
-    846:846:boolean canContinueToUse() -> b
-    846:846:boolean canUse() -> a
-    847:847:int access$300(net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal) -> a
-    847:847:java.util.List access$500(net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal) -> b
-    847:847:boolean access$4900(net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal,net.minecraft.core.BlockPos) -> a
-    847:847:void access$5000(net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal) -> c
-net.minecraft.world.entity.animal.Bee$BeeGoToKnownFlowerGoal -> atd$f:
+    838:851:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
+    855:859:boolean canBeeUse() -> g
+    864:864:boolean canBeeContinueToUse() -> h
+    869:872:void start() -> c
+    876:880:void stop() -> d
+    884:940:void tick() -> e
+    946:948:boolean pathfindDirectlyTowards(net.minecraft.core.BlockPos) -> a
+    952:952:boolean isTargetBlacklisted(net.minecraft.core.BlockPos) -> b
+    956:960:void blacklistTarget(net.minecraft.core.BlockPos) -> c
+    963:964:void clearBlacklist() -> j
+    967:971:void dropAndBlacklistHive() -> k
+    974:976:void dropHive() -> l
+    979:983:boolean hasReachedTarget(net.minecraft.core.BlockPos) -> d
+    832:832:boolean canContinueToUse() -> b
+    832:832:boolean canUse() -> a
+    833:833:int access$300(net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal) -> a
+    833:833:java.util.List access$500(net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal) -> b
+    833:833:boolean access$4900(net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal,net.minecraft.core.BlockPos) -> a
+    833:833:void access$5000(net.minecraft.world.entity.animal.Bee$BeeGoToHiveGoal) -> c
+net.minecraft.world.entity.animal.Bee$BeeGoToKnownFlowerGoal -> ayl$f:
     int travellingTicks -> c
     net.minecraft.world.entity.animal.Bee this$0 -> b
-    1000:1004:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
-    1008:1012:boolean canBeeUse() -> g
-    1017:1017:boolean canBeeContinueToUse() -> h
-    1022:1024:void start() -> c
-    1028:1031:void stop() -> d
-    1035:1061:void tick() -> e
-    1064:1064:boolean wantsToGoToKnownFlower() -> j
-    995:995:boolean canContinueToUse() -> b
-    995:995:boolean canUse() -> a
-    995:995:int access$400(net.minecraft.world.entity.animal.Bee$BeeGoToKnownFlowerGoal) -> a
-net.minecraft.world.entity.animal.Bee$BeeGrowCropGoal -> atd$g:
+    996:1000:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
+    1004:1008:boolean canBeeUse() -> g
+    1013:1013:boolean canBeeContinueToUse() -> h
+    1018:1020:void start() -> c
+    1024:1027:void stop() -> d
+    1031:1057:void tick() -> e
+    1060:1060:boolean wantsToGoToKnownFlower() -> j
+    991:991:boolean canContinueToUse() -> b
+    991:991:boolean canUse() -> a
+    991:991:int access$400(net.minecraft.world.entity.animal.Bee$BeeGoToKnownFlowerGoal) -> a
+net.minecraft.world.entity.animal.Bee$BeeGrowCropGoal -> ayl$g:
     net.minecraft.world.entity.animal.Bee this$0 -> b
-    1343:1343:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
-    1349:1358:boolean canBeeUse() -> g
-    1363:1363:boolean canBeeContinueToUse() -> h
-    1368:1406:void tick() -> e
-    1343:1343:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.animal.Bee$1) -> <init>
-net.minecraft.world.entity.animal.Bee$BeeHurtByOtherGoal -> atd$h:
+    1339:1339:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
+    1345:1354:boolean canBeeUse() -> g
+    1359:1359:boolean canBeeContinueToUse() -> h
+    1364:1402:void tick() -> e
+    1339:1339:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.animal.Bee$1) -> <init>
+net.minecraft.world.entity.animal.Bee$BeeHurtByOtherGoal -> ayl$h:
     net.minecraft.world.entity.animal.Bee this$0 -> a
-    739:741:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.animal.Bee) -> <init>
-    745:748:void alertOther(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.animal.Bee$BeeLocateHiveGoal -> atd$i:
+    719:721:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.animal.Bee) -> <init>
+    726:726:boolean canContinueToUse() -> b
+    731:734:void alertOther(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.animal.Bee$BeeLocateHiveGoal -> ayl$i:
     net.minecraft.world.entity.animal.Bee this$0 -> b
-    1291:1291:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
-    1294:1296:boolean canBeeUse() -> g
-    1301:1301:boolean canBeeContinueToUse() -> h
-    1306:1331:void start() -> c
-    1334:1339:java.util.List findNearbyHivesWithSpace() -> j
-    1339:1339:double lambda$findNearbyHivesWithSpace$2(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    1338:1338:boolean lambda$findNearbyHivesWithSpace$1(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> a
-    1336:1336:boolean lambda$findNearbyHivesWithSpace$0(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-    1291:1291:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.animal.Bee$1) -> <init>
-net.minecraft.world.entity.animal.Bee$BeeLookControl -> atd$j:
+    1287:1287:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
+    1290:1292:boolean canBeeUse() -> g
+    1297:1297:boolean canBeeContinueToUse() -> h
+    1302:1327:void start() -> c
+    1330:1335:java.util.List findNearbyHivesWithSpace() -> j
+    1335:1335:double lambda$findNearbyHivesWithSpace$2(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    1334:1334:boolean lambda$findNearbyHivesWithSpace$1(net.minecraft.world.entity.animal.Bee,net.minecraft.core.BlockPos) -> a
+    1332:1332:boolean lambda$findNearbyHivesWithSpace$0(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    1287:1287:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.animal.Bee$1) -> <init>
+net.minecraft.world.entity.animal.Bee$BeeLookControl -> ayl$j:
     net.minecraft.world.entity.animal.Bee this$0 -> h
-    1069:1071:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.Mob) -> <init>
-    1075:1079:void tick() -> a
-    1083:1083:boolean resetXRotOnTick() -> b
-net.minecraft.world.entity.animal.Bee$BeePollinateGoal -> atd$k:
+    1065:1067:void <init>(net.minecraft.world.entity.animal.Bee,net.minecraft.world.entity.Mob) -> <init>
+    1071:1075:void tick() -> a
+    1079:1079:boolean resetXRotOnTick() -> b
+net.minecraft.world.entity.animal.Bee$BeePollinateGoal -> ayl$k:
     java.util.function.Predicate VALID_POLLINATION_BLOCKS -> c
     int successfulPollinatingTicks -> d
     int lastSoundPlayedTick -> e
@@ -40263,499 +44010,505 @@ net.minecraft.world.entity.animal.Bee$BeePollinateGoal -> atd$k:
     net.minecraft.world.phys.Vec3 hoverPos -> g
     int pollinatingTicks -> h
     net.minecraft.world.entity.animal.Bee this$0 -> b
-    1092:1117:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
-    1121:1141:boolean canBeeUse() -> g
-    1146:1163:boolean canBeeContinueToUse() -> h
-    1167:1167:boolean hasPollinatedLongEnough() -> j
-    1171:1171:boolean isPollinating() -> k
-    1175:1176:void stopPollinating() -> l
-    1180:1185:void start() -> c
-    1189:1196:void stop() -> d
-    1200:1251:void tick() -> e
-    1254:1255:void setWantedPos() -> m
-    1258:1258:float getOffset() -> n
-    1262:1262:java.util.Optional findNearbyFlower() -> o
-    1266:1284:java.util.Optional findNearestBlock(java.util.function.Predicate,double) -> a
-    1093:1099:boolean lambda$new$0(net.minecraft.world.level.block.state.BlockState) -> a
-    1090:1090:boolean access$600(net.minecraft.world.entity.animal.Bee$BeePollinateGoal) -> a
-    1090:1090:void access$800(net.minecraft.world.entity.animal.Bee$BeePollinateGoal) -> b
-net.minecraft.world.entity.animal.Bee$BeeWanderGoal -> atd$l:
+    1088:1113:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
+    1117:1137:boolean canBeeUse() -> g
+    1142:1159:boolean canBeeContinueToUse() -> h
+    1163:1163:boolean hasPollinatedLongEnough() -> j
+    1167:1167:boolean isPollinating() -> k
+    1171:1172:void stopPollinating() -> l
+    1176:1181:void start() -> c
+    1185:1192:void stop() -> d
+    1196:1247:void tick() -> e
+    1250:1251:void setWantedPos() -> m
+    1254:1254:float getOffset() -> n
+    1258:1258:java.util.Optional findNearbyFlower() -> o
+    1262:1280:java.util.Optional findNearestBlock(java.util.function.Predicate,double) -> a
+    1089:1095:boolean lambda$new$0(net.minecraft.world.level.block.state.BlockState) -> a
+    1086:1086:boolean access$600(net.minecraft.world.entity.animal.Bee$BeePollinateGoal) -> a
+    1086:1086:void access$800(net.minecraft.world.entity.animal.Bee$BeePollinateGoal) -> b
+net.minecraft.world.entity.animal.Bee$BeeWanderGoal -> ayl$l:
     net.minecraft.world.entity.animal.Bee this$0 -> a
-    798:800:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
-    804:804:boolean canUse() -> a
-    809:809:boolean canContinueToUse() -> b
-    814:818:void start() -> c
-    824:839:net.minecraft.world.phys.Vec3 findPos() -> g
-net.minecraft.world.entity.animal.Cat -> ate:
-    net.minecraft.world.item.crafting.Ingredient TEMPT_INGREDIENT -> bA
-    net.minecraft.network.syncher.EntityDataAccessor DATA_TYPE_ID -> bB
-    net.minecraft.network.syncher.EntityDataAccessor IS_LYING -> bC
-    net.minecraft.network.syncher.EntityDataAccessor RELAX_STATE_ONE -> bD
-    net.minecraft.network.syncher.EntityDataAccessor DATA_COLLAR_COLOR -> bE
-    java.util.Map TEXTURE_BY_TYPE -> bz
-    net.minecraft.world.entity.animal.Cat$CatAvoidEntityGoal avoidPlayersGoal -> bF
-    net.minecraft.world.entity.ai.goal.TemptGoal temptGoal -> bG
-    float lieDownAmount -> bH
-    float lieDownAmountO -> bI
-    float lieDownAmountTail -> bJ
-    float lieDownAmountOTail -> bK
-    float relaxStateOneAmount -> bL
-    float relaxStateOneAmountO -> bM
-    126:127:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    130:130:net.minecraft.resources.ResourceLocation getResourceLocation() -> ez
-    135:153:void registerGoals() -> n
-    156:156:int getCatType() -> eA
+    784:786:void <init>(net.minecraft.world.entity.animal.Bee) -> <init>
+    790:790:boolean canUse() -> a
+    795:795:boolean canContinueToUse() -> b
+    800:804:void start() -> c
+    810:825:net.minecraft.world.phys.Vec3 findPos() -> g
+net.minecraft.world.entity.animal.Cat -> aym:
+    net.minecraft.world.item.crafting.Ingredient TEMPT_INGREDIENT -> by
+    net.minecraft.network.syncher.EntityDataAccessor DATA_TYPE_ID -> bz
+    net.minecraft.network.syncher.EntityDataAccessor IS_LYING -> bA
+    net.minecraft.network.syncher.EntityDataAccessor RELAX_STATE_ONE -> bB
+    net.minecraft.network.syncher.EntityDataAccessor DATA_COLLAR_COLOR -> bC
+    java.util.Map TEXTURE_BY_TYPE -> bx
+    net.minecraft.world.entity.animal.Cat$CatAvoidEntityGoal avoidPlayersGoal -> bD
+    net.minecraft.world.entity.ai.goal.TemptGoal temptGoal -> bE
+    float lieDownAmount -> bF
+    float lieDownAmountO -> bG
+    float lieDownAmountTail -> bH
+    float lieDownAmountOTail -> bI
+    float relaxStateOneAmount -> bJ
+    float relaxStateOneAmountO -> bK
+    127:128:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    131:131:net.minecraft.resources.ResourceLocation getResourceLocation() -> eV
+    136:153:void registerGoals() -> o
+    156:156:int getCatType() -> eW
     160:165:void setCatType(int) -> t
-    168:169:void setLying(boolean) -> u
-    172:172:boolean isLying() -> eB
-    176:177:void setRelaxStateOne(boolean) -> v
-    180:180:boolean isRelaxStateOne() -> eC
-    184:184:net.minecraft.world.item.DyeColor getCollarColor() -> eD
+    168:169:void setLying(boolean) -> x
+    172:172:boolean isLying() -> eX
+    176:177:void setRelaxStateOne(boolean) -> y
+    180:180:boolean isRelaxStateOne() -> eY
+    184:184:net.minecraft.world.item.DyeColor getCollarColor() -> eZ
     188:189:void setCollarColor(net.minecraft.world.item.DyeColor) -> a
-    193:199:void defineSynchedData() -> w_
+    193:199:void defineSynchedData() -> e
     203:206:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     210:215:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    219:235:void customServerAiStep() -> dT
-    240:250:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    255:255:int getAmbientSoundInterval() -> A
-    259:260:void hiss() -> eE
+    219:235:void customServerAiStep() -> N
+    240:250:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    255:255:int getAmbientSoundInterval() -> D
+    259:260:void hiss() -> fa
     264:264:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    269:269:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    274:279:void registerAttributes() -> cA
-    283:283:boolean causeFallDamage(float,float) -> b
-    288:292:void usePlayerItem(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
-    295:295:float getAttackDamage() -> eF
-    300:300:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    305:311:void tick() -> h
-    314:319:void handleLieDown() -> eG
-    322:331:void updateLieDownAmount() -> eH
-    334:340:void updateRelaxStateOneAmount() -> eI
-    343:343:float getLieDownAmount(float) -> v
-    347:347:float getLieDownAmountTail(float) -> w
-    351:351:float getRelaxStateOneAmount(float) -> x
-    356:375:net.minecraft.world.entity.animal.Cat getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    380:389:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
-    395:409:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    414:475:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    480:480:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    485:485:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    490:490:boolean removeWhenFarAway(double) -> h
-    495:504:void reassessTameGoals() -> er
-    74:74:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    102:113:void lambda$static$0(java.util.HashMap) -> a
-    79:101:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Cat$CatAvoidEntityGoal -> ate$a:
+    269:269:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    273:276:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> fb
+    281:281:boolean causeFallDamage(float,float) -> b
+    286:290:void usePlayerItem(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+    293:293:float getAttackDamage() -> fc
+    298:298:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    303:309:void tick() -> j
+    312:317:void handleLieDown() -> fd
+    320:329:void updateLieDownAmount() -> fe
+    332:338:void updateRelaxStateOneAmount() -> ff
+    341:341:float getLieDownAmount(float) -> u
+    345:345:float getLieDownAmountTail(float) -> v
+    349:349:float getRelaxStateOneAmount(float) -> w
+    354:373:net.minecraft.world.entity.animal.Cat getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    378:387:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
+    393:413:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    418:481:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    486:486:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    491:491:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    496:496:boolean removeWhenFarAway(double) -> h
+    501:510:void reassessTameGoals() -> eM
+    75:75:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    103:114:void lambda$static$0(java.util.HashMap) -> a
+    80:102:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Cat$CatAvoidEntityGoal -> aym$a:
     net.minecraft.world.entity.animal.Cat cat -> i
-    510:512:void <init>(net.minecraft.world.entity.animal.Cat,java.lang.Class,float,double,double) -> <init>
-    516:516:boolean canUse() -> a
-    521:521:boolean canContinueToUse() -> b
-net.minecraft.world.entity.animal.Cat$CatRelaxOnOwnerGoal -> ate$b:
+    516:518:void <init>(net.minecraft.world.entity.animal.Cat,java.lang.Class,float,double,double) -> <init>
+    522:522:boolean canUse() -> a
+    527:527:boolean canContinueToUse() -> b
+net.minecraft.world.entity.animal.Cat$CatRelaxOnOwnerGoal -> aym$b:
     net.minecraft.world.entity.animal.Cat cat -> a
     net.minecraft.world.entity.player.Player ownerPlayer -> b
     net.minecraft.core.BlockPos goalPos -> c
     int onBedTicks -> d
-    567:569:void <init>(net.minecraft.world.entity.animal.Cat) -> <init>
-    573:602:boolean canUse() -> a
-    606:613:boolean spaceIsOccupied() -> g
-    618:618:boolean canContinueToUse() -> b
-    623:627:void start() -> c
-    631:641:void stop() -> d
-    644:659:void giveMorningGift() -> h
-    663:679:void tick() -> e
-net.minecraft.world.entity.animal.Cat$CatTemptGoal -> ate$c:
+    573:575:void <init>(net.minecraft.world.entity.animal.Cat) -> <init>
+    579:607:boolean canUse() -> a
+    611:618:boolean spaceIsOccupied() -> g
+    623:623:boolean canContinueToUse() -> b
+    628:632:void start() -> c
+    636:646:void stop() -> d
+    649:665:void giveMorningGift() -> h
+    669:685:void tick() -> e
+    602:602:net.minecraft.core.BlockPos lambda$canUse$1(net.minecraft.core.BlockPos) -> a
+    602:602:net.minecraft.core.BlockPos lambda$canUse$0(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+net.minecraft.world.entity.animal.Cat$CatTemptGoal -> aym$c:
     net.minecraft.world.entity.player.Player selectedPlayer -> c
     net.minecraft.world.entity.animal.Cat cat -> d
-    531:533:void <init>(net.minecraft.world.entity.animal.Cat,double,net.minecraft.world.item.crafting.Ingredient,boolean) -> <init>
-    537:544:void tick() -> e
-    548:552:boolean canScare() -> g
-    557:557:boolean canUse() -> a
-net.minecraft.world.entity.animal.Chicken -> atf:
-    net.minecraft.world.item.crafting.Ingredient FOOD_ITEMS -> bD
-    float flap -> bw
-    float flapSpeed -> bx
-    float oFlapSpeed -> by
-    float oFlap -> bz
-    float flapping -> bA
-    int eggTime -> bB
-    boolean isChickenJockey -> bC
-    41:51:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    55:63:void registerGoals() -> n
-    67:67:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    72:76:void registerAttributes() -> cA
+    537:539:void <init>(net.minecraft.world.entity.animal.Cat,double,net.minecraft.world.item.crafting.Ingredient,boolean) -> <init>
+    543:550:void tick() -> e
+    554:558:boolean canScare() -> g
+    563:563:boolean canUse() -> a
+net.minecraft.world.entity.animal.Chicken -> ayn:
+    net.minecraft.world.item.crafting.Ingredient FOOD_ITEMS -> bC
+    float flap -> bv
+    float flapSpeed -> bw
+    float oFlapSpeed -> bx
+    float oFlap -> by
+    float flapping -> bz
+    int eggTime -> bA
+    boolean isChickenJockey -> bB
+    43:53:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    57:65:void registerGoals() -> o
+    69:69:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    73:75:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
     80:105:void aiStep() -> k
     109:109:boolean causeFallDamage(float,float) -> b
-    114:114:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    114:114:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     119:119:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    124:124:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    124:124:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     129:130:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     134:134:net.minecraft.world.entity.animal.Chicken getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    139:139:boolean isFood(net.minecraft.world.item.ItemStack) -> i
+    139:139:boolean isFood(net.minecraft.world.item.ItemStack) -> k
     144:147:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
     152:157:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     161:164:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     168:168:boolean removeWhenFarAway(double) -> h
     173:183:void positionRider(net.minecraft.world.entity.Entity) -> k
-    186:186:boolean isChickenJockey() -> eq
-    190:191:void setChickenJockey(boolean) -> r
-    34:34:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    35:35:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Cod -> atg:
+    186:186:boolean isChickenJockey() -> eM
+    190:191:void setChickenJockey(boolean) -> t
+    36:36:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    37:37:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Cod -> ayo:
     13:14:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    18:18:net.minecraft.world.item.ItemStack getBucketItemStack() -> l
-    23:23:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    28:28:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    18:18:net.minecraft.world.item.ItemStack getBucketItemStack() -> eL
+    23:23:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    28:28:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     33:33:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    38:38:net.minecraft.sounds.SoundEvent getFlopSound() -> er
-net.minecraft.world.entity.animal.Cow -> ath:
-    30:31:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    35:43:void registerGoals() -> n
-    47:51:void registerAttributes() -> cA
-    55:55:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    60:60:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    65:65:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    70:71:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    75:75:float getSoundVolume() -> dm
-    80:94:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    99:99:net.minecraft.world.entity.animal.Cow getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    104:107:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    28:28:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-net.minecraft.world.entity.animal.Dolphin -> ati:
+    38:38:net.minecraft.sounds.SoundEvent getFlopSound() -> eN
+net.minecraft.world.entity.animal.Cow -> ayp:
+    34:35:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    39:47:void registerGoals() -> o
+    50:52:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    57:57:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    62:62:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    67:67:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    72:73:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    77:77:float getSoundVolume() -> dF
+    82:89:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    94:94:net.minecraft.world.entity.animal.Cow getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    99:102:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    32:32:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+net.minecraft.world.entity.animal.Dolphin -> ayq:
     net.minecraft.network.syncher.EntityDataAccessor TREASURE_POS -> c
     net.minecraft.network.syncher.EntityDataAccessor GOT_FISH -> d
-    net.minecraft.network.syncher.EntityDataAccessor MOISNTESS_LEVEL -> bw
-    net.minecraft.world.entity.ai.targeting.TargetingConditions SWIM_WITH_PLAYER_TARGETING -> bx
+    net.minecraft.network.syncher.EntityDataAccessor MOISTNESS_LEVEL -> bv
+    net.minecraft.world.entity.ai.targeting.TargetingConditions SWIM_WITH_PLAYER_TARGETING -> bw
     java.util.function.Predicate ALLOWED_ITEMS -> b
-    79:85:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    90:93:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    98:98:boolean canBreatheUnderwater() -> cB
-    105:105:void handleAirSupply(int) -> a
-    108:109:void setTreasurePos(net.minecraft.core.BlockPos) -> g
-    112:112:net.minecraft.core.BlockPos getTreasurePos() -> l
-    116:116:boolean gotFish() -> eq
-    120:121:void setGotFish(boolean) -> r
-    124:124:int getMoistnessLevel() -> er
-    128:129:void setMoisntessLevel(int) -> b
-    133:137:void defineSynchedData() -> w_
-    141:148:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    152:160:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    164:178:void registerGoals() -> n
-    182:188:void registerAttributes() -> cA
-    192:192:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
-    198:203:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    208:208:int getMaxAirSupply() -> bw
-    213:213:int increaseAirSupply(int) -> m
-    218:218:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    223:223:int getMaxHeadXRot() -> dU
-    228:228:int getMaxHeadYRot() -> dV
-    233:233:boolean canRide(net.minecraft.world.entity.Entity) -> n
-    238:242:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
-    247:256:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> a
-    260:297:void tick() -> h
-    301:306:void handleEntityEvent(byte) -> a
-    309:315:void addParticlesAroundSelf(net.minecraft.core.particles.ParticleOptions) -> a
-    319:335:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    339:341:boolean checkDolphinSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    346:346:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    352:352:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    358:358:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    363:363:net.minecraft.sounds.SoundEvent getSwimSplashSound() -> an
-    368:368:net.minecraft.sounds.SoundEvent getSwimSound() -> am
-    372:376:boolean closeToNextPos() -> es
-    381:393:void travel(net.minecraft.world.phys.Vec3) -> e
-    397:397:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
-    76:76:boolean lambda$static$0(net.minecraft.world.entity.item.ItemEntity) -> b
-    67:67:java.util.Random access$100(net.minecraft.world.entity.animal.Dolphin) -> a
-    67:67:java.util.Random access$200(net.minecraft.world.entity.animal.Dolphin) -> b
-    67:67:java.util.Random access$300(net.minecraft.world.entity.animal.Dolphin) -> c
-    67:67:net.minecraft.world.entity.ai.targeting.TargetingConditions access$400() -> et
-    68:76:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Dolphin$1 -> ati$1:
-net.minecraft.world.entity.animal.Dolphin$DolphinMoveControl -> ati$a:
+    81:87:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    92:95:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    100:100:boolean canBreatheUnderwater() -> cL
+    107:107:void handleAirSupply(int) -> a
+    110:111:void setTreasurePos(net.minecraft.core.BlockPos) -> g
+    114:114:net.minecraft.core.BlockPos getTreasurePos() -> m
+    118:118:boolean gotFish() -> eL
+    122:123:void setGotFish(boolean) -> t
+    126:126:int getMoistnessLevel() -> eM
+    130:131:void setMoisntessLevel(int) -> b
+    135:139:void defineSynchedData() -> e
+    143:150:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    154:162:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    166:180:void registerGoals() -> o
+    183:186:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eN
+    191:191:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
+    197:202:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    207:207:int getMaxAirSupply() -> bD
+    212:212:int increaseAirSupply(int) -> m
+    217:217:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    222:222:int getMaxHeadXRot() -> eo
+    227:227:int getMaxHeadYRot() -> ep
+    232:232:boolean canRide(net.minecraft.world.entity.Entity) -> n
+    237:241:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
+    246:256:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> b
+    260:299:void tick() -> j
+    303:308:void handleEntityEvent(byte) -> a
+    311:317:void addParticlesAroundSelf(net.minecraft.core.particles.ParticleOptions) -> a
+    321:337:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    341:343:boolean checkDolphinSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
+    348:348:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    354:354:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    360:360:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    365:365:net.minecraft.sounds.SoundEvent getSwimSplashSound() -> ar
+    370:370:net.minecraft.sounds.SoundEvent getSwimSound() -> aq
+    374:378:boolean closeToNextPos() -> eO
+    383:395:void travel(net.minecraft.world.phys.Vec3) -> f
+    399:399:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
+    78:78:boolean lambda$static$0(net.minecraft.world.entity.item.ItemEntity) -> c
+    69:69:java.util.Random access$100(net.minecraft.world.entity.animal.Dolphin) -> a
+    69:69:java.util.Random access$200(net.minecraft.world.entity.animal.Dolphin) -> b
+    69:69:java.util.Random access$300(net.minecraft.world.entity.animal.Dolphin) -> c
+    69:69:net.minecraft.world.entity.ai.targeting.TargetingConditions access$400() -> eP
+    70:78:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Dolphin$1 -> ayq$1:
+net.minecraft.world.entity.animal.Dolphin$DolphinMoveControl -> ayq$a:
     net.minecraft.world.entity.animal.Dolphin dolphin -> i
-    407:409:void <init>(net.minecraft.world.entity.animal.Dolphin) -> <init>
-    413:457:void tick() -> a
-net.minecraft.world.entity.animal.Dolphin$DolphinSwimToTreasureGoal -> ati$b:
+    409:411:void <init>(net.minecraft.world.entity.animal.Dolphin) -> <init>
+    415:459:void tick() -> a
+net.minecraft.world.entity.animal.Dolphin$DolphinSwimToTreasureGoal -> ayq$b:
     net.minecraft.world.entity.animal.Dolphin dolphin -> a
     boolean stuck -> b
-    584:587:void <init>(net.minecraft.world.entity.animal.Dolphin) -> <init>
-    591:591:boolean isInterruptable() -> E_
-    596:596:boolean canUse() -> a
-    601:602:boolean canContinueToUse() -> b
-    607:632:void start() -> c
-    636:640:void stop() -> d
-    644:672:void tick() -> e
-net.minecraft.world.entity.animal.Dolphin$DolphinSwimWithPlayerGoal -> ati$c:
+    586:589:void <init>(net.minecraft.world.entity.animal.Dolphin) -> <init>
+    593:593:boolean isInterruptable() -> D_
+    598:598:boolean canUse() -> a
+    603:604:boolean canContinueToUse() -> b
+    609:635:void start() -> c
+    639:643:void stop() -> d
+    647:675:void tick() -> e
+net.minecraft.world.entity.animal.Dolphin$DolphinSwimWithPlayerGoal -> ayq$c:
     net.minecraft.world.entity.animal.Dolphin dolphin -> a
     double speedModifier -> b
     net.minecraft.world.entity.player.Player player -> c
-    534:538:void <init>(net.minecraft.world.entity.animal.Dolphin,double) -> <init>
-    542:546:boolean canUse() -> a
-    551:551:boolean canContinueToUse() -> b
-    556:557:void start() -> c
-    561:563:void stop() -> d
-    567:577:void tick() -> e
-net.minecraft.world.entity.animal.Dolphin$PlayWithItemsGoal -> ati$d:
+    536:540:void <init>(net.minecraft.world.entity.animal.Dolphin,double) -> <init>
+    544:548:boolean canUse() -> a
+    553:553:boolean canContinueToUse() -> b
+    558:559:void start() -> c
+    563:565:void stop() -> d
+    569:579:void tick() -> e
+net.minecraft.world.entity.animal.Dolphin$PlayWithItemsGoal -> ayq$d:
     int cooldown -> b
     net.minecraft.world.entity.animal.Dolphin this$0 -> a
-    460:460:void <init>(net.minecraft.world.entity.animal.Dolphin) -> <init>
-    465:469:boolean canUse() -> a
-    474:480:void start() -> c
-    484:490:void stop() -> d
-    494:503:void tick() -> e
-    506:526:void drop(net.minecraft.world.item.ItemStack) -> a
-    460:460:void <init>(net.minecraft.world.entity.animal.Dolphin,net.minecraft.world.entity.animal.Dolphin$1) -> <init>
-net.minecraft.world.entity.animal.FlyingAnimal -> atj:
-    boolean isFlying() -> eF
-net.minecraft.world.entity.animal.Fox -> atk:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_TYPE_ID -> bw
-    net.minecraft.network.syncher.EntityDataAccessor DATA_FLAGS_ID -> bx
-    net.minecraft.network.syncher.EntityDataAccessor DATA_TRUSTED_ID_0 -> by
-    net.minecraft.network.syncher.EntityDataAccessor DATA_TRUSTED_ID_1 -> bz
-    java.util.function.Predicate ALLOWED_ITEMS -> bA
-    java.util.function.Predicate TRUSTED_TARGET_SELECTOR -> bB
-    java.util.function.Predicate STALKABLE_PREY -> bC
-    java.util.function.Predicate AVOID_PLAYERS -> bD
-    net.minecraft.world.entity.ai.goal.Goal landTargetGoal -> bE
-    net.minecraft.world.entity.ai.goal.Goal turtleEggTargetGoal -> bF
-    net.minecraft.world.entity.ai.goal.Goal fishTargetGoal -> bG
-    float interestedAngle -> bH
-    float interestedAngleO -> bI
-    float crouchAmount -> bJ
-    float crouchAmountO -> bK
-    int ticksSinceEaten -> bL
-    177:186:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    190:195:void defineSynchedData() -> w_
-    199:224:void registerGoals() -> n
-    228:228:net.minecraft.sounds.SoundEvent getEatingSound(net.minecraft.world.item.ItemStack) -> d
-    233:271:void aiStep() -> k
-    275:275:boolean isImmobile() -> do
-    279:279:boolean canEat(net.minecraft.world.item.ItemStack) -> j
-    284:302:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
-    306:320:void handleEntityEvent(byte) -> a
-    324:330:void registerAttributes() -> cA
-    334:336:net.minecraft.world.entity.animal.Fox getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    342:364:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    369:378:void setTargetGoals() -> eD
-    382:386:void usePlayerItem(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
-    390:393:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    397:397:net.minecraft.world.entity.animal.Fox$Type getFoxType() -> eq
-    401:402:void setFoxType(net.minecraft.world.entity.animal.Fox$Type) -> a
-    405:408:java.util.List getTrustedUUIDs() -> eE
-    412:417:void addTrustedUUID(java.util.UUID) -> b
-    421:434:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    438:449:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    452:452:boolean isSitting() -> er
-    456:457:void setSitting(boolean) -> r
-    460:460:boolean isFaceplanted() -> es
-    464:465:void setFaceplanted(boolean) -> v
-    468:468:boolean isDefending() -> eF
-    472:473:void setDefending(boolean) -> w
-    477:477:boolean isSleeping() -> dQ
-    481:482:void setSleeping(boolean) -> x
-    485:490:void setFlag(int,boolean) -> d
-    493:493:boolean getFlag(int) -> t
-    498:502:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
-    507:510:boolean canHoldItem(net.minecraft.world.item.ItemStack) -> g
-    514:524:void spitOutItem(net.minecraft.world.item.ItemStack) -> k
-    527:529:void dropItemStack(net.minecraft.world.item.ItemStack) -> l
-    533:548:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> a
-    552:587:void tick() -> h
-    591:591:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    596:597:void onOffspringSpawnedFromEgg(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.AgableMob) -> a
-    600:600:boolean isPouncing() -> et
-    604:605:void setIsPouncing(boolean) -> s
-    608:608:boolean isJumping() -> eu
-    612:612:boolean isFullyCrouched() -> ez
-    616:617:void setIsCrouching(boolean) -> t
-    621:621:boolean isCrouching() -> bo
-    625:626:void setIsInterested(boolean) -> u
-    629:629:boolean isInterested() -> eA
-    633:633:float getHeadRollAngle(float) -> v
-    637:637:float getCrouchAmount(float) -> w
-    642:646:void setTarget(net.minecraft.world.entity.LivingEntity) -> h
-    650:650:int calculateFallDamage(float,float) -> e
-    654:655:void wakeUp() -> eG
-    658:664:void clearStates() -> eH
-    667:667:boolean canMove() -> eI
-    672:679:void playAmbientSound() -> B
-    684:693:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    699:699:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    705:705:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    709:709:boolean trusts(java.util.UUID) -> c
-    714:722:void dropAllDeathLoot(net.minecraft.world.damagesource.DamageSource) -> d
-    725:740:boolean isPathClear(net.minecraft.world.entity.animal.Fox,net.minecraft.world.entity.LivingEntity) -> a
-    88:88:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    223:223:boolean lambda$registerGoals$8(net.minecraft.world.entity.LivingEntity) -> i
-    208:208:boolean lambda$registerGoals$7(net.minecraft.world.entity.LivingEntity) -> j
-    207:207:boolean lambda$registerGoals$6(net.minecraft.world.entity.LivingEntity) -> k
-    201:201:boolean lambda$registerGoals$5(net.minecraft.world.entity.LivingEntity) -> l
-    199:199:boolean lambda$registerGoals$4(net.minecraft.world.entity.LivingEntity) -> m
-    115:115:boolean lambda$static$3(net.minecraft.world.entity.Entity) -> a
-    113:113:boolean lambda$static$2(net.minecraft.world.entity.Entity) -> b
-    106:110:boolean lambda$static$1(net.minecraft.world.entity.Entity) -> c
-    103:103:boolean lambda$static$0(net.minecraft.world.entity.item.ItemEntity) -> b
-    88:88:boolean access$000(net.minecraft.world.entity.animal.Fox) -> a
-    88:88:java.util.function.Predicate access$100() -> eB
-    88:88:java.util.function.Predicate access$200() -> eC
-    88:88:boolean access$300(net.minecraft.world.entity.animal.Fox) -> b
-    88:88:void access$400(net.minecraft.world.entity.animal.Fox,boolean) -> a
-    88:88:void access$500(net.minecraft.world.entity.animal.Fox) -> c
-    88:88:void access$600(net.minecraft.world.entity.animal.Fox,java.util.UUID) -> a
-    88:88:java.util.List access$700(net.minecraft.world.entity.animal.Fox) -> d
-    88:88:void access$800(net.minecraft.world.entity.animal.Fox,boolean) -> b
-    88:88:void access$900(net.minecraft.world.entity.animal.Fox) -> e
-    88:88:boolean access$1000(net.minecraft.world.entity.animal.Fox,java.util.UUID) -> b
-    88:88:java.util.Random access$1200(net.minecraft.world.entity.animal.Fox) -> f
-    88:88:java.util.Random access$1300(net.minecraft.world.entity.animal.Fox) -> g
-    88:88:void access$1400(net.minecraft.world.entity.animal.Fox,boolean) -> c
-    88:88:java.util.Random access$1500(net.minecraft.world.entity.animal.Fox) -> h
-    88:88:boolean access$1600(net.minecraft.world.entity.animal.Fox) -> i
-    88:88:float access$1702(net.minecraft.world.entity.animal.Fox,float) -> a
-    88:88:float access$1802(net.minecraft.world.entity.animal.Fox,float) -> b
-    89:115:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Fox$1 -> atk$1:
-net.minecraft.world.entity.animal.Fox$DefendTrustedTargetGoal -> atk$a:
+    462:462:void <init>(net.minecraft.world.entity.animal.Dolphin) -> <init>
+    467:471:boolean canUse() -> a
+    476:482:void start() -> c
+    486:492:void stop() -> d
+    496:505:void tick() -> e
+    508:528:void drop(net.minecraft.world.item.ItemStack) -> a
+    462:462:void <init>(net.minecraft.world.entity.animal.Dolphin,net.minecraft.world.entity.animal.Dolphin$1) -> <init>
+net.minecraft.world.entity.animal.FlyingAnimal -> ayr:
+    boolean isFlying() -> fb
+net.minecraft.world.entity.animal.Fox -> ays:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_TYPE_ID -> bv
+    net.minecraft.network.syncher.EntityDataAccessor DATA_FLAGS_ID -> bw
+    net.minecraft.network.syncher.EntityDataAccessor DATA_TRUSTED_ID_0 -> bx
+    net.minecraft.network.syncher.EntityDataAccessor DATA_TRUSTED_ID_1 -> by
+    java.util.function.Predicate ALLOWED_ITEMS -> bz
+    java.util.function.Predicate TRUSTED_TARGET_SELECTOR -> bA
+    java.util.function.Predicate STALKABLE_PREY -> bB
+    java.util.function.Predicate AVOID_PLAYERS -> bC
+    net.minecraft.world.entity.ai.goal.Goal landTargetGoal -> bD
+    net.minecraft.world.entity.ai.goal.Goal turtleEggTargetGoal -> bE
+    net.minecraft.world.entity.ai.goal.Goal fishTargetGoal -> bF
+    float interestedAngle -> bG
+    float interestedAngleO -> bH
+    float crouchAmount -> bI
+    float crouchAmountO -> bJ
+    int ticksSinceEaten -> bK
+    179:188:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    192:197:void defineSynchedData() -> e
+    201:227:void registerGoals() -> o
+    231:231:net.minecraft.sounds.SoundEvent getEatingSound(net.minecraft.world.item.ItemStack) -> d
+    236:274:void aiStep() -> k
+    278:278:boolean isImmobile() -> dH
+    282:282:boolean canEat(net.minecraft.world.item.ItemStack) -> l
+    287:305:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
+    309:323:void handleEntityEvent(byte) -> a
+    326:330:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    335:337:net.minecraft.world.entity.animal.Fox getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    343:367:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    372:381:void setTargetGoals() -> fa
+    385:389:void usePlayerItem(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+    393:396:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    400:400:net.minecraft.world.entity.animal.Fox$Type getFoxType() -> eM
+    404:405:void setFoxType(net.minecraft.world.entity.animal.Fox$Type) -> a
+    408:411:java.util.List getTrustedUUIDs() -> fb
+    415:420:void addTrustedUUID(java.util.UUID) -> b
+    424:437:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    441:455:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    458:458:boolean isSitting() -> eN
+    462:463:void setSitting(boolean) -> t
+    466:466:boolean isFaceplanted() -> eO
+    470:471:void setFaceplanted(boolean) -> x
+    474:474:boolean isDefending() -> fc
+    478:479:void setDefending(boolean) -> y
+    483:483:boolean isSleeping() -> el
+    487:488:void setSleeping(boolean) -> z
+    491:496:void setFlag(int,boolean) -> d
+    499:499:boolean getFlag(int) -> t
+    504:508:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
+    513:516:boolean canHoldItem(net.minecraft.world.item.ItemStack) -> h
+    520:530:void spitOutItem(net.minecraft.world.item.ItemStack) -> m
+    533:535:void dropItemStack(net.minecraft.world.item.ItemStack) -> n
+    539:556:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> b
+    560:595:void tick() -> j
+    599:599:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    604:605:void onOffspringSpawnedFromEgg(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Mob) -> a
+    608:608:boolean isPouncing() -> eP
+    612:613:void setIsPouncing(boolean) -> u
+    616:616:boolean isJumping() -> eV
+    620:620:boolean isFullyCrouched() -> eW
+    624:625:void setIsCrouching(boolean) -> v
+    629:629:boolean isCrouching() -> bv
+    633:634:void setIsInterested(boolean) -> w
+    637:637:boolean isInterested() -> eX
+    641:641:float getHeadRollAngle(float) -> u
+    645:645:float getCrouchAmount(float) -> v
+    650:654:void setTarget(net.minecraft.world.entity.LivingEntity) -> i
+    658:658:int calculateFallDamage(float,float) -> e
+    662:663:void wakeUp() -> fd
+    666:672:void clearStates() -> fe
+    675:675:boolean canMove() -> ff
+    680:687:void playAmbientSound() -> F
+    692:701:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    707:707:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    713:713:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    717:717:boolean trusts(java.util.UUID) -> c
+    722:730:void dropAllDeathLoot(net.minecraft.world.damagesource.DamageSource) -> d
+    733:748:boolean isPathClear(net.minecraft.world.entity.animal.Fox,net.minecraft.world.entity.LivingEntity) -> a
+    1458:1458:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    90:90:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    226:226:boolean lambda$registerGoals$9(net.minecraft.world.entity.LivingEntity) -> j
+    211:211:boolean lambda$registerGoals$8(net.minecraft.world.entity.LivingEntity) -> k
+    210:210:boolean lambda$registerGoals$7(net.minecraft.world.entity.LivingEntity) -> l
+    209:209:boolean lambda$registerGoals$6(net.minecraft.world.entity.LivingEntity) -> m
+    203:203:boolean lambda$registerGoals$5(net.minecraft.world.entity.LivingEntity) -> n
+    201:201:boolean lambda$registerGoals$4(net.minecraft.world.entity.LivingEntity) -> o
+    117:117:boolean lambda$static$3(net.minecraft.world.entity.Entity) -> a
+    115:115:boolean lambda$static$2(net.minecraft.world.entity.Entity) -> b
+    108:112:boolean lambda$static$1(net.minecraft.world.entity.Entity) -> c
+    105:105:boolean lambda$static$0(net.minecraft.world.entity.item.ItemEntity) -> c
+    90:90:boolean access$000(net.minecraft.world.entity.animal.Fox) -> a
+    90:90:java.util.function.Predicate access$100() -> eY
+    90:90:java.util.function.Predicate access$200() -> eZ
+    90:90:boolean access$300(net.minecraft.world.entity.animal.Fox) -> b
+    90:90:void access$400(net.minecraft.world.entity.animal.Fox,boolean) -> a
+    90:90:void access$500(net.minecraft.world.entity.animal.Fox) -> c
+    90:90:void access$600(net.minecraft.world.entity.animal.Fox,java.util.UUID) -> a
+    90:90:java.util.List access$700(net.minecraft.world.entity.animal.Fox) -> d
+    90:90:void access$800(net.minecraft.world.entity.animal.Fox,boolean) -> b
+    90:90:void access$900(net.minecraft.world.entity.animal.Fox) -> e
+    90:90:boolean access$1000(net.minecraft.world.entity.animal.Fox,java.util.UUID) -> b
+    90:90:java.util.Random access$1200(net.minecraft.world.entity.animal.Fox) -> f
+    90:90:java.util.Random access$1300(net.minecraft.world.entity.animal.Fox) -> g
+    90:90:void access$1400(net.minecraft.world.entity.animal.Fox,boolean) -> c
+    90:90:java.util.Random access$1500(net.minecraft.world.entity.animal.Fox) -> h
+    90:90:boolean access$1600(net.minecraft.world.entity.animal.Fox) -> i
+    90:90:boolean access$1700(net.minecraft.world.entity.animal.Fox) -> j
+    90:90:float access$1802(net.minecraft.world.entity.animal.Fox,float) -> a
+    90:90:float access$1902(net.minecraft.world.entity.animal.Fox,float) -> b
+    90:90:boolean access$2000(net.minecraft.world.entity.animal.Fox) -> k
+    91:117:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Fox$1 -> ays$1:
+net.minecraft.world.entity.animal.Fox$DefendTrustedTargetGoal -> ays$a:
     net.minecraft.world.entity.LivingEntity trustedLastHurtBy -> j
     net.minecraft.world.entity.LivingEntity trustedLastHurt -> k
     int timestamp -> l
     net.minecraft.world.entity.animal.Fox this$0 -> i
-    939:941:void <init>(net.minecraft.world.entity.animal.Fox,java.lang.Class,boolean,boolean,java.util.function.Predicate) -> <init>
-    945:964:boolean canUse() -> a
-    969:984:void start() -> c
-net.minecraft.world.entity.animal.Fox$FaceplantGoal -> atk$b:
+    946:948:void <init>(net.minecraft.world.entity.animal.Fox,java.lang.Class,boolean,boolean,java.util.function.Predicate) -> <init>
+    952:971:boolean canUse() -> a
+    976:991:void start() -> c
+net.minecraft.world.entity.animal.Fox$FaceplantGoal -> ays$b:
     int countdown -> a
     net.minecraft.world.entity.animal.Fox this$0 -> b
-    1259:1261:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    1265:1265:boolean canUse() -> a
-    1270:1270:boolean canContinueToUse() -> b
-    1275:1276:void start() -> c
-    1280:1281:void stop() -> d
-    1285:1286:void tick() -> e
-net.minecraft.world.entity.animal.Fox$FoxAlertableEntitiesSelector -> atk$c:
+    1266:1268:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    1272:1272:boolean canUse() -> a
+    1277:1277:boolean canContinueToUse() -> b
+    1282:1283:void start() -> c
+    1287:1288:void stop() -> d
+    1292:1293:void tick() -> e
+net.minecraft.world.entity.animal.Fox$FoxAlertableEntitiesSelector -> ays$c:
     net.minecraft.world.entity.animal.Fox this$0 -> a
-    1024:1024:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    1027:1052:boolean test(net.minecraft.world.entity.LivingEntity) -> a
-    1024:1024:boolean test(java.lang.Object) -> test
-net.minecraft.world.entity.animal.Fox$FoxBehaviorGoal -> atk$d:
+    1031:1031:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    1034:1059:boolean test(net.minecraft.world.entity.LivingEntity) -> a
+    1031:1031:boolean test(java.lang.Object) -> test
+net.minecraft.world.entity.animal.Fox$FoxBehaviorGoal -> ays$d:
     net.minecraft.world.entity.ai.targeting.TargetingConditions alertableTargeting -> b
     net.minecraft.world.entity.animal.Fox this$0 -> a
-    1056:1057:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    1060:1061:boolean hasShelter() -> g
-    1065:1065:boolean alertable() -> h
-    1056:1056:void <init>(net.minecraft.world.entity.animal.Fox,net.minecraft.world.entity.animal.Fox$1) -> <init>
-net.minecraft.world.entity.animal.Fox$FoxBreedGoal -> atk$e:
+    1063:1064:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    1067:1068:boolean hasShelter() -> g
+    1072:1072:boolean alertable() -> h
+    1063:1063:void <init>(net.minecraft.world.entity.animal.Fox,net.minecraft.world.entity.animal.Fox$1) -> <init>
+net.minecraft.world.entity.animal.Fox$FoxBreedGoal -> ays$e:
     net.minecraft.world.entity.animal.Fox this$0 -> d
-    879:881:void <init>(net.minecraft.world.entity.animal.Fox,double) -> <init>
-    885:888:void start() -> c
-    892:930:void breed() -> g
-net.minecraft.world.entity.animal.Fox$FoxEatBerriesGoal -> atk$f:
+    887:889:void <init>(net.minecraft.world.entity.animal.Fox,double) -> <init>
+    893:896:void start() -> c
+    900:937:void breed() -> g
+net.minecraft.world.entity.animal.Fox$FoxEatBerriesGoal -> ays$f:
     int ticksWaited -> g
     net.minecraft.world.entity.animal.Fox this$0 -> h
-    1173:1175:void <init>(net.minecraft.world.entity.animal.Fox,double,int,int) -> <init>
-    1179:1179:double acceptedDistance() -> h
-    1184:1184:boolean shouldRecalculatePath() -> j
-    1189:1190:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    1195:1206:void tick() -> e
-    1209:1232:void onReachedTarget() -> m
-    1236:1236:boolean canUse() -> a
-    1241:1244:void start() -> c
-net.minecraft.world.entity.animal.Fox$FoxFloatGoal -> atk$g:
+    1180:1182:void <init>(net.minecraft.world.entity.animal.Fox,double,int,int) -> <init>
+    1186:1186:double acceptedDistance() -> h
+    1191:1191:boolean shouldRecalculatePath() -> j
+    1196:1197:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    1202:1213:void tick() -> e
+    1216:1239:void onReachedTarget() -> m
+    1243:1243:boolean canUse() -> a
+    1248:1251:void start() -> c
+net.minecraft.world.entity.animal.Fox$FoxFloatGoal -> ays$g:
     net.minecraft.world.entity.animal.Fox this$0 -> a
-    1327:1329:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    1333:1335:void start() -> c
-    1339:1339:boolean canUse() -> a
-net.minecraft.world.entity.animal.Fox$FoxFollowParentGoal -> atk$h:
+    1334:1336:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    1340:1342:void start() -> c
+    1346:1346:boolean canUse() -> a
+net.minecraft.world.entity.animal.Fox$FoxFollowParentGoal -> ays$h:
     net.minecraft.world.entity.animal.Fox fox -> b
     net.minecraft.world.entity.animal.Fox this$0 -> a
-    1470:1473:void <init>(net.minecraft.world.entity.animal.Fox,net.minecraft.world.entity.animal.Fox,double) -> <init>
-    1477:1477:boolean canUse() -> a
-    1482:1482:boolean canContinueToUse() -> b
-    1487:1489:void start() -> c
-net.minecraft.world.entity.animal.Fox$FoxGroupData -> atk$i:
+    1482:1485:void <init>(net.minecraft.world.entity.animal.Fox,net.minecraft.world.entity.animal.Fox,double) -> <init>
+    1489:1489:boolean canUse() -> a
+    1494:1494:boolean canContinueToUse() -> b
+    1499:1501:void start() -> c
+net.minecraft.world.entity.animal.Fox$FoxGroupData -> ays$i:
     net.minecraft.world.entity.animal.Fox$Type type -> a
-    1250:1253:void <init>(net.minecraft.world.entity.animal.Fox$Type) -> <init>
-net.minecraft.world.entity.animal.Fox$FoxLookAtPlayerGoal -> atk$j:
+    1257:1260:void <init>(net.minecraft.world.entity.animal.Fox$Type) -> <init>
+net.minecraft.world.entity.animal.Fox$FoxLookAtPlayerGoal -> ays$j:
     net.minecraft.world.entity.animal.Fox this$0 -> g
-    1493:1495:void <init>(net.minecraft.world.entity.animal.Fox,net.minecraft.world.entity.Mob,java.lang.Class,float) -> <init>
-    1499:1499:boolean canUse() -> a
-    1504:1504:boolean canContinueToUse() -> b
-net.minecraft.world.entity.animal.Fox$FoxLookControl -> atk$k:
+    1505:1507:void <init>(net.minecraft.world.entity.animal.Fox,net.minecraft.world.entity.Mob,java.lang.Class,float) -> <init>
+    1511:1511:boolean canUse() -> a
+    1516:1516:boolean canContinueToUse() -> b
+net.minecraft.world.entity.animal.Fox$FoxLookControl -> ays$k:
     net.minecraft.world.entity.animal.Fox this$0 -> h
-    1450:1452:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    1456:1459:void tick() -> a
-    1463:1463:boolean resetXRotOnTick() -> b
-net.minecraft.world.entity.animal.Fox$FoxMeleeAttackGoal -> atk$l:
-    net.minecraft.world.entity.animal.Fox this$0 -> d
-    852:854:void <init>(net.minecraft.world.entity.animal.Fox,double,boolean) -> <init>
-    858:864:void checkAndPerformAttack(net.minecraft.world.entity.LivingEntity,double) -> a
-    868:870:void start() -> c
-    874:874:boolean canUse() -> a
-net.minecraft.world.entity.animal.Fox$FoxMoveControl -> atk$m:
+    1462:1464:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    1468:1471:void tick() -> a
+    1475:1475:boolean resetXRotOnTick() -> b
+net.minecraft.world.entity.animal.Fox$FoxMeleeAttackGoal -> ays$l:
+    net.minecraft.world.entity.animal.Fox this$0 -> b
+    860:862:void <init>(net.minecraft.world.entity.animal.Fox,double,boolean) -> <init>
+    866:872:void checkAndPerformAttack(net.minecraft.world.entity.LivingEntity,double) -> a
+    876:878:void start() -> c
+    882:882:boolean canUse() -> a
+net.minecraft.world.entity.animal.Fox$FoxMoveControl -> ays$m:
     net.minecraft.world.entity.animal.Fox this$0 -> i
-    789:791:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    795:798:void tick() -> a
-net.minecraft.world.entity.animal.Fox$FoxPanicGoal -> atk$n:
-    net.minecraft.world.entity.animal.Fox this$0 -> f
-    1290:1292:void <init>(net.minecraft.world.entity.animal.Fox,double) -> <init>
-    1296:1296:boolean canUse() -> a
-net.minecraft.world.entity.animal.Fox$FoxPounceGoal -> atk$o:
+    797:799:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    803:806:void tick() -> a
+net.minecraft.world.entity.animal.Fox$FoxPanicGoal -> ays$n:
+    net.minecraft.world.entity.animal.Fox this$0 -> g
+    1297:1299:void <init>(net.minecraft.world.entity.animal.Fox,double) -> <init>
+    1303:1303:boolean canUse() -> a
+net.minecraft.world.entity.animal.Fox$FoxPounceGoal -> ays$o:
     net.minecraft.world.entity.animal.Fox this$0 -> a
-    1343:1343:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    1346:1367:boolean canUse() -> a
-    1372:1379:boolean canContinueToUse() -> b
-    1384:1384:boolean isInterruptable() -> E_
-    1389:1404:void start() -> c
-    1408:1413:void stop() -> d
-    1417:1446:void tick() -> e
-net.minecraft.world.entity.animal.Fox$FoxSearchForItemsGoal -> atk$p:
+    1350:1350:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    1353:1374:boolean canUse() -> a
+    1379:1386:boolean canContinueToUse() -> b
+    1391:1391:boolean isInterruptable() -> D_
+    1396:1411:void start() -> c
+    1415:1420:void stop() -> d
+    1424:1453:void tick() -> e
+net.minecraft.world.entity.animal.Fox$FoxSearchForItemsGoal -> ays$p:
     net.minecraft.world.entity.animal.Fox this$0 -> a
-    744:746:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    750:766:boolean canUse() -> a
-    771:777:void tick() -> e
-    781:785:void start() -> c
-net.minecraft.world.entity.animal.Fox$FoxStrollThroughVillageGoal -> atk$q:
+    752:754:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    758:774:boolean canUse() -> a
+    779:785:void tick() -> e
+    789:793:void start() -> c
+net.minecraft.world.entity.animal.Fox$FoxStrollThroughVillageGoal -> ays$q:
     net.minecraft.world.entity.animal.Fox this$0 -> a
-    1301:1303:void <init>(net.minecraft.world.entity.animal.Fox,int,int) -> <init>
-    1307:1309:void start() -> c
-    1313:1313:boolean canUse() -> a
-    1318:1318:boolean canContinueToUse() -> b
-    1322:1322:boolean canFoxMove() -> g
-net.minecraft.world.entity.animal.Fox$PerchAndSearchGoal -> atk$r:
+    1308:1310:void <init>(net.minecraft.world.entity.animal.Fox,int,int) -> <init>
+    1314:1316:void start() -> c
+    1320:1320:boolean canUse() -> a
+    1325:1325:boolean canContinueToUse() -> b
+    1329:1329:boolean canFoxMove() -> g
+net.minecraft.world.entity.animal.Fox$PerchAndSearchGoal -> ays$r:
     double relX -> c
     double relZ -> d
     int lookTime -> e
     int looksRemaining -> f
     net.minecraft.world.entity.animal.Fox this$0 -> b
-    1123:1125:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    1129:1129:boolean canUse() -> a
-    1134:1134:boolean canContinueToUse() -> b
-    1139:1143:void start() -> c
-    1147:1148:void stop() -> d
-    1152:1158:void tick() -> e
-    1161:1165:void resetLook() -> j
-net.minecraft.world.entity.animal.Fox$SeekShelterGoal -> atk$s:
+    1130:1132:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    1136:1136:boolean canUse() -> a
+    1141:1141:boolean canContinueToUse() -> b
+    1146:1150:void start() -> c
+    1154:1155:void stop() -> d
+    1159:1165:void tick() -> e
+    1168:1172:void resetLook() -> j
+net.minecraft.world.entity.animal.Fox$SeekShelterGoal -> ays$s:
     int interval -> c
     net.minecraft.world.entity.animal.Fox this$0 -> b
-    990:993:void <init>(net.minecraft.world.entity.animal.Fox,double) -> <init>
-    997:1014:boolean canUse() -> a
-    1019:1021:void start() -> c
-net.minecraft.world.entity.animal.Fox$SleepGoal -> atk$t:
+    997:1000:void <init>(net.minecraft.world.entity.animal.Fox,double) -> <init>
+    1004:1021:boolean canUse() -> a
+    1026:1028:void start() -> c
+net.minecraft.world.entity.animal.Fox$SleepGoal -> ays$t:
     int countdown -> c
     net.minecraft.world.entity.animal.Fox this$0 -> b
-    1073:1076:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    1080:1083:boolean canUse() -> a
-    1088:1088:boolean canContinueToUse() -> b
-    1092:1096:boolean canSleep() -> j
-    1101:1103:void stop() -> d
-    1107:1114:void start() -> c
-net.minecraft.world.entity.animal.Fox$StalkPreyGoal -> atk$u:
+    1080:1083:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    1087:1090:boolean canUse() -> a
+    1095:1095:boolean canContinueToUse() -> b
+    1099:1103:boolean canSleep() -> j
+    1108:1110:void stop() -> d
+    1114:1121:void start() -> c
+net.minecraft.world.entity.animal.Fox$StalkPreyGoal -> ays$u:
     net.minecraft.world.entity.animal.Fox this$0 -> a
-    802:804:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
-    808:813:boolean canUse() -> a
-    818:820:void start() -> c
-    825:835:void stop() -> d
-    839:848:void tick() -> e
-net.minecraft.world.entity.animal.Fox$Type -> atk$v:
+    810:812:void <init>(net.minecraft.world.entity.animal.Fox) -> <init>
+    816:821:boolean canUse() -> a
+    826:828:void start() -> c
+    833:843:void stop() -> d
+    847:856:void tick() -> e
+net.minecraft.world.entity.animal.Fox$Type -> ays$v:
     net.minecraft.world.entity.animal.Fox$Type RED -> a
     net.minecraft.world.entity.animal.Fox$Type SNOW -> b
     net.minecraft.world.entity.animal.Fox$Type[] BY_ID -> c
@@ -40764,52 +44517,60 @@ net.minecraft.world.entity.animal.Fox$Type -> atk$v:
     java.lang.String name -> f
     java.util.List biomes -> g
     net.minecraft.world.entity.animal.Fox$Type[] $VALUES -> h
-    131:131:net.minecraft.world.entity.animal.Fox$Type[] values() -> values
-    131:131:net.minecraft.world.entity.animal.Fox$Type valueOf(java.lang.String) -> valueOf
-    142:146:void <init>(java.lang.String,int,int,java.lang.String,net.minecraft.world.level.biome.Biome[]) -> <init>
-    149:149:java.lang.String getName() -> a
-    153:153:java.util.List getBiomes() -> b
-    157:157:int getId() -> c
-    161:161:net.minecraft.world.entity.animal.Fox$Type byName(java.lang.String) -> a
-    165:168:net.minecraft.world.entity.animal.Fox$Type byId(int) -> a
-    172:172:net.minecraft.world.entity.animal.Fox$Type byBiome(net.minecraft.world.level.biome.Biome) -> a
-    136:136:net.minecraft.world.entity.animal.Fox$Type lambda$static$1(net.minecraft.world.entity.animal.Fox$Type) -> a
-    135:135:net.minecraft.world.entity.animal.Fox$Type[] lambda$static$0(int) -> b
-    131:136:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.IronGolem -> atl:
+    133:133:net.minecraft.world.entity.animal.Fox$Type[] values() -> values
+    133:133:net.minecraft.world.entity.animal.Fox$Type valueOf(java.lang.String) -> valueOf
+    144:148:void <init>(java.lang.String,int,int,java.lang.String,net.minecraft.world.level.biome.Biome[]) -> <init>
+    151:151:java.lang.String getName() -> a
+    155:155:java.util.List getBiomes() -> b
+    159:159:int getId() -> c
+    163:163:net.minecraft.world.entity.animal.Fox$Type byName(java.lang.String) -> a
+    167:170:net.minecraft.world.entity.animal.Fox$Type byId(int) -> a
+    174:174:net.minecraft.world.entity.animal.Fox$Type byBiome(net.minecraft.world.level.biome.Biome) -> a
+    138:138:net.minecraft.world.entity.animal.Fox$Type lambda$static$1(net.minecraft.world.entity.animal.Fox$Type) -> a
+    137:137:net.minecraft.world.entity.animal.Fox$Type[] lambda$static$0(int) -> b
+    133:138:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.IronGolem -> ayt:
     net.minecraft.network.syncher.EntityDataAccessor DATA_FLAGS_ID -> b
     int attackAnimationTick -> c
     int offerFlowerTick -> d
-    58:60:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    64:76:void registerGoals() -> n
-    80:82:void defineSynchedData() -> w_
-    86:93:void registerAttributes() -> cA
-    98:98:int decreaseAirSupply(int) -> l
-    103:109:void doPush(net.minecraft.world.entity.Entity) -> C
-    113:131:void aiStep() -> k
-    135:141:boolean canAttackType(net.minecraft.world.entity.EntityType) -> a
-    146:148:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    152:154:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    157:157:float getAttackDamage() -> et
-    162:172:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    177:182:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    189:189:net.minecraft.world.entity.animal.IronGolem$Crackiness getCrackiness() -> l
-    194:204:void handleEntityEvent(byte) -> a
-    207:207:int getAttackAnimationTick() -> eq
-    211:218:void offerFlower(boolean) -> r
-    222:222:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    227:227:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    232:250:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    255:256:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    259:259:int getOfferFlowerTick() -> er
-    263:263:boolean isPlayerCreated() -> es
-    267:273:void setPlayerCreated(boolean) -> s
-    278:279:void die(net.minecraft.world.damagesource.DamageSource) -> a
-    284:298:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
-    75:75:boolean lambda$registerGoals$1(net.minecraft.world.entity.LivingEntity) -> i
-    67:67:boolean lambda$registerGoals$0() -> eu
-    51:51:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.IronGolem$Crackiness -> atl$a:
+    net.minecraft.util.IntRange PERSISTENT_ANGER_TIME -> bv
+    int remainingPersistentAngerTime -> bw
+    java.util.UUID persistentAngerTarget -> bx
+    71:73:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    77:90:void registerGoals() -> o
+    94:96:void defineSynchedData() -> e
+    99:103:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    109:109:int decreaseAirSupply(int) -> l
+    114:120:void doPush(net.minecraft.world.entity.Entity) -> C
+    124:146:void aiStep() -> k
+    150:156:boolean canAttackType(net.minecraft.world.entity.EntityType) -> a
+    161:164:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    168:171:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    175:176:void startPersistentAngerTimer() -> H_
+    180:181:void setRemainingPersistentAngerTime(int) -> a_
+    185:185:int getRemainingPersistentAngerTime() -> F_
+    190:191:void setPersistentAngerTarget(java.util.UUID) -> a
+    195:195:java.util.UUID getPersistentAngerTarget() -> G_
+    199:199:float getAttackDamage() -> eP
+    204:214:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    219:224:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    231:231:net.minecraft.world.entity.animal.IronGolem$Crackiness getCrackiness() -> eL
+    236:246:void handleEntityEvent(byte) -> a
+    249:249:int getAttackAnimationTick() -> eM
+    253:260:void offerFlower(boolean) -> t
+    264:264:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    269:269:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    274:292:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    297:298:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    301:301:int getOfferFlowerTick() -> eN
+    305:305:boolean isPlayerCreated() -> eO
+    309:315:void setPlayerCreated(boolean) -> u
+    320:321:void die(net.minecraft.world.damagesource.DamageSource) -> a
+    326:340:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
+    345:345:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    88:88:boolean lambda$registerGoals$0(net.minecraft.world.entity.LivingEntity) -> j
+    60:66:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.IronGolem$Crackiness -> ayt$a:
     net.minecraft.world.entity.animal.IronGolem$Crackiness NONE -> a
     net.minecraft.world.entity.animal.IronGolem$Crackiness LOW -> b
     net.minecraft.world.entity.animal.IronGolem$Crackiness MEDIUM -> c
@@ -40817,199 +44578,203 @@ net.minecraft.world.entity.animal.IronGolem$Crackiness -> atl$a:
     java.util.List BY_DAMAGE -> e
     float fraction -> f
     net.minecraft.world.entity.animal.IronGolem$Crackiness[] $VALUES -> g
-    301:301:net.minecraft.world.entity.animal.IronGolem$Crackiness[] values() -> values
-    301:301:net.minecraft.world.entity.animal.IronGolem$Crackiness valueOf(java.lang.String) -> valueOf
-    312:314:void <init>(java.lang.String,int,float) -> <init>
-    317:323:net.minecraft.world.entity.animal.IronGolem$Crackiness byFraction(float) -> a
-    308:308:double lambda$static$0(net.minecraft.world.entity.animal.IronGolem$Crackiness) -> a
-    301:308:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.MushroomCow -> atm:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_TYPE -> bw
-    net.minecraft.world.effect.MobEffect effect -> bx
-    int effectDuration -> by
-    java.util.UUID lastLightningBoltUUID -> bz
-    45:46:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    50:53:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
-    57:58:boolean checkMushroomSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
-    63:69:void thunderHit(net.minecraft.world.entity.global.LightningBolt) -> a
-    73:76:void defineSynchedData() -> w_
-    80:162:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    167:174:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    178:188:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    191:192:org.apache.commons.lang3.tuple.Pair getEffectFromItemStack(net.minecraft.world.item.ItemStack) -> j
-    196:197:void setMushroomType(net.minecraft.world.entity.animal.MushroomCow$MushroomType) -> a
-    200:200:net.minecraft.world.entity.animal.MushroomCow$MushroomType getMushroomType() -> eq
-    205:207:net.minecraft.world.entity.animal.MushroomCow getBreedOffspring(net.minecraft.world.entity.AgableMob) -> c
-    211:220:net.minecraft.world.entity.animal.MushroomCow$MushroomType getOffspringType(net.minecraft.world.entity.animal.MushroomCow) -> a
-    36:36:net.minecraft.world.entity.animal.Cow getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    36:36:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    136:136:void lambda$mobInteract$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
-    37:37:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.MushroomCow$MushroomType -> atm$a:
+    348:348:net.minecraft.world.entity.animal.IronGolem$Crackiness[] values() -> values
+    348:348:net.minecraft.world.entity.animal.IronGolem$Crackiness valueOf(java.lang.String) -> valueOf
+    359:361:void <init>(java.lang.String,int,float) -> <init>
+    364:370:net.minecraft.world.entity.animal.IronGolem$Crackiness byFraction(float) -> a
+    355:355:double lambda$static$0(net.minecraft.world.entity.animal.IronGolem$Crackiness) -> a
+    348:355:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.MushroomCow -> ayu:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_TYPE -> bv
+    net.minecraft.world.effect.MobEffect effect -> bw
+    int effectDuration -> bx
+    java.util.UUID lastLightningBoltUUID -> by
+    53:54:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    58:61:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
+    65:66:boolean checkMushroomSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
+    71:77:void thunderHit(net.minecraft.world.entity.LightningBolt) -> a
+    81:84:void defineSynchedData() -> e
+    88:152:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    157:181:void shear(net.minecraft.sounds.SoundSource) -> a
+    185:185:boolean readyForShearing() -> L_
+    190:197:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    201:211:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    214:222:java.util.Optional getEffectFromItemStack(net.minecraft.world.item.ItemStack) -> l
+    226:227:void setMushroomType(net.minecraft.world.entity.animal.MushroomCow$MushroomType) -> a
+    230:230:net.minecraft.world.entity.animal.MushroomCow$MushroomType getMushroomType() -> eM
+    235:237:net.minecraft.world.entity.animal.MushroomCow getBreedOffspring(net.minecraft.world.entity.AgableMob) -> c
+    241:250:net.minecraft.world.entity.animal.MushroomCow$MushroomType getOffspringType(net.minecraft.world.entity.animal.MushroomCow) -> a
+    44:44:net.minecraft.world.entity.animal.Cow getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    44:44:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    121:121:void lambda$mobInteract$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
+    45:45:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.MushroomCow$MushroomType -> ayu$a:
     net.minecraft.world.entity.animal.MushroomCow$MushroomType RED -> a
     net.minecraft.world.entity.animal.MushroomCow$MushroomType BROWN -> b
     java.lang.String type -> c
     net.minecraft.world.level.block.state.BlockState blockState -> d
     net.minecraft.world.entity.animal.MushroomCow$MushroomType[] $VALUES -> e
-    223:223:net.minecraft.world.entity.animal.MushroomCow$MushroomType[] values() -> values
-    223:223:net.minecraft.world.entity.animal.MushroomCow$MushroomType valueOf(java.lang.String) -> valueOf
-    230:233:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.block.state.BlockState) -> <init>
-    236:236:net.minecraft.world.level.block.state.BlockState getBlockState() -> a
-    240:246:net.minecraft.world.entity.animal.MushroomCow$MushroomType byType(java.lang.String) -> b
-    223:223:java.lang.String access$000(net.minecraft.world.entity.animal.MushroomCow$MushroomType) -> a
-    223:223:net.minecraft.world.level.block.state.BlockState access$100(net.minecraft.world.entity.animal.MushroomCow$MushroomType) -> b
-    223:223:net.minecraft.world.entity.animal.MushroomCow$MushroomType access$200(java.lang.String) -> a
-    223:225:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Ocelot -> atn:
-    net.minecraft.world.item.crafting.Ingredient TEMPT_INGREDIENT -> bw
-    net.minecraft.network.syncher.EntityDataAccessor DATA_TRUSTING -> bx
-    net.minecraft.world.entity.animal.Ocelot$OcelotAvoidEntityGoal ocelotAvoidPlayersGoal -> by
-    net.minecraft.world.entity.animal.Ocelot$OcelotTemptGoal temptGoal -> bz
-    63:66:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    69:69:boolean isTrusting() -> er
-    73:76:void setTrusting(boolean) -> r
-    80:83:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    87:90:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    94:97:void defineSynchedData() -> w_
-    101:112:void registerGoals() -> n
-    116:132:void customServerAiStep() -> dT
-    136:136:boolean removeWhenFarAway(double) -> h
-    141:146:void registerAttributes() -> cA
-    150:150:boolean causeFallDamage(float,float) -> b
-    156:156:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    161:161:int getAmbientSoundInterval() -> A
-    166:166:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    171:171:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    175:175:float getAttackDamage() -> es
-    180:180:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    185:189:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    194:211:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    216:223:void handleEntityEvent(byte) -> a
-    226:236:void spawnTrustingParticles(boolean) -> s
-    239:248:void reassessTrustingGoals() -> eq
-    252:252:net.minecraft.world.entity.animal.Ocelot getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    257:257:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    263:263:boolean checkOcelotSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
-    268:280:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
-    286:292:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    50:50:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    50:50:boolean access$000(net.minecraft.world.entity.animal.Ocelot) -> a
-    55:57:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Ocelot$OcelotAvoidEntityGoal -> atn$a:
+    253:253:net.minecraft.world.entity.animal.MushroomCow$MushroomType[] values() -> values
+    253:253:net.minecraft.world.entity.animal.MushroomCow$MushroomType valueOf(java.lang.String) -> valueOf
+    260:263:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.block.state.BlockState) -> <init>
+    266:266:net.minecraft.world.level.block.state.BlockState getBlockState() -> a
+    270:276:net.minecraft.world.entity.animal.MushroomCow$MushroomType byType(java.lang.String) -> b
+    253:253:java.lang.String access$000(net.minecraft.world.entity.animal.MushroomCow$MushroomType) -> a
+    253:253:net.minecraft.world.level.block.state.BlockState access$100(net.minecraft.world.entity.animal.MushroomCow$MushroomType) -> b
+    253:253:net.minecraft.world.entity.animal.MushroomCow$MushroomType access$200(java.lang.String) -> a
+    253:255:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Ocelot -> ayv:
+    net.minecraft.world.item.crafting.Ingredient TEMPT_INGREDIENT -> bv
+    net.minecraft.network.syncher.EntityDataAccessor DATA_TRUSTING -> bw
+    net.minecraft.world.entity.animal.Ocelot$OcelotAvoidEntityGoal ocelotAvoidPlayersGoal -> bx
+    net.minecraft.world.entity.animal.Ocelot$OcelotTemptGoal temptGoal -> by
+    66:69:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    72:72:boolean isTrusting() -> eN
+    76:79:void setTrusting(boolean) -> t
+    83:86:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    90:93:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    97:100:void defineSynchedData() -> e
+    104:115:void registerGoals() -> o
+    119:135:void customServerAiStep() -> N
+    139:139:boolean removeWhenFarAway(double) -> h
+    143:146:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    151:151:boolean causeFallDamage(float,float) -> b
+    157:157:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    162:162:int getAmbientSoundInterval() -> D
+    167:167:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    172:172:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    176:176:float getAttackDamage() -> eO
+    181:181:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    186:190:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    195:213:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    218:225:void handleEntityEvent(byte) -> a
+    228:238:void spawnTrustingParticles(boolean) -> u
+    241:250:void reassessTrustingGoals() -> eM
+    254:254:net.minecraft.world.entity.animal.Ocelot getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    259:259:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    265:265:boolean checkOcelotSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
+    270:281:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
+    287:293:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    298:298:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    53:53:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    53:53:boolean access$000(net.minecraft.world.entity.animal.Ocelot) -> a
+    58:60:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Ocelot$OcelotAvoidEntityGoal -> ayv$a:
     net.minecraft.world.entity.animal.Ocelot ocelot -> i
-    299:301:void <init>(net.minecraft.world.entity.animal.Ocelot,java.lang.Class,float,double,double) -> <init>
-    305:305:boolean canUse() -> a
-    310:310:boolean canContinueToUse() -> b
-net.minecraft.world.entity.animal.Ocelot$OcelotTemptGoal -> atn$b:
+    305:307:void <init>(net.minecraft.world.entity.animal.Ocelot,java.lang.Class,float,double,double) -> <init>
+    311:311:boolean canUse() -> a
+    316:316:boolean canContinueToUse() -> b
+net.minecraft.world.entity.animal.Ocelot$OcelotTemptGoal -> ayv$b:
     net.minecraft.world.entity.animal.Ocelot ocelot -> c
-    318:320:void <init>(net.minecraft.world.entity.animal.Ocelot,double,net.minecraft.world.item.crafting.Ingredient,boolean) -> <init>
-    324:324:boolean canScare() -> g
-net.minecraft.world.entity.animal.Panda -> ato:
-    net.minecraft.network.syncher.EntityDataAccessor UNHAPPY_COUNTER -> bx
-    net.minecraft.network.syncher.EntityDataAccessor SNEEZE_COUNTER -> by
-    net.minecraft.network.syncher.EntityDataAccessor EAT_COUNTER -> bz
-    net.minecraft.network.syncher.EntityDataAccessor MAIN_GENE_ID -> bA
-    net.minecraft.network.syncher.EntityDataAccessor HIDDEN_GENE_ID -> bB
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_FLAGS -> bC
-    net.minecraft.world.entity.ai.targeting.TargetingConditions BREED_TARGETING -> bD
-    boolean gotBamboo -> bE
-    boolean didBite -> bF
-    int rollCounter -> bw
-    net.minecraft.world.phys.Vec3 rollDelta -> bG
-    float sitAmount -> bH
-    float sitAmountO -> bI
-    float onBackAmount -> bJ
-    float onBackAmountO -> bK
-    float rollAmount -> bL
-    float rollAmountO -> bM
-    net.minecraft.world.entity.animal.Panda$PandaLookAtPlayerGoal lookAtPlayerGoal -> bN
-    java.util.function.Predicate PANDA_ITEMS -> bO
-    99:106:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    110:114:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
-    118:118:int getUnhappyCounter() -> eq
-    122:123:void setUnhappyCounter(int) -> t
-    126:126:boolean isSneezing() -> er
-    130:130:boolean isSitting() -> es
-    134:135:void sit(boolean) -> r
-    138:138:boolean isOnBack() -> et
-    142:143:void setOnBack(boolean) -> s
-    146:146:boolean isEating() -> eu
-    150:151:void eat(boolean) -> t
-    154:154:int getEatCounter() -> eO
-    158:159:void setEatCounter(int) -> v
-    162:167:void sneeze(boolean) -> u
-    170:170:int getSneezeCounter() -> ez
-    174:175:void setSneezeCounter(int) -> u
-    178:178:net.minecraft.world.entity.animal.Panda$Gene getMainGene() -> eA
-    182:187:void setMainGene(net.minecraft.world.entity.animal.Panda$Gene) -> a
-    190:190:net.minecraft.world.entity.animal.Panda$Gene getHiddenGene() -> eB
-    194:199:void setHiddenGene(net.minecraft.world.entity.animal.Panda$Gene) -> b
-    202:202:boolean isRolling() -> eC
-    206:207:void roll(boolean) -> v
-    211:218:void defineSynchedData() -> w_
-    221:221:boolean getFlag(int) -> w
-    225:231:void setFlag(int,boolean) -> d
-    235:239:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    243:247:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    252:259:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    264:282:void registerGoals() -> n
-    286:290:void registerAttributes() -> cA
-    383:383:net.minecraft.world.entity.animal.Panda$Gene getVariant() -> eD
-    387:387:boolean isLazy() -> eE
-    391:391:boolean isWorried() -> eF
-    395:395:boolean isPlayful() -> eG
-    399:399:boolean isBrown() -> eH
-    403:403:boolean isWeak() -> eI
-    408:408:boolean isAggressive() -> em
-    413:413:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
-    418:422:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    427:479:void tick() -> h
-    482:482:boolean isScared() -> eJ
-    486:510:void handleEating() -> eP
-    513:529:void addEatingParticles() -> eQ
-    532:538:void updateSitAmount() -> eR
-    541:547:void updateOnBackAnimation() -> eS
-    550:556:void updateRollAmount() -> eT
-    559:559:float getSitAmount(float) -> v
-    563:563:float getLieOnBackAmount(float) -> w
-    567:567:float getRollAmount(float) -> x
-    571:594:void handleRoll() -> eU
-    597:613:void afterSneeze() -> eV
-    617:624:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> a
+    324:326:void <init>(net.minecraft.world.entity.animal.Ocelot,double,net.minecraft.world.item.crafting.Ingredient,boolean) -> <init>
+    330:330:boolean canScare() -> g
+net.minecraft.world.entity.animal.Panda -> ayw:
+    net.minecraft.network.syncher.EntityDataAccessor UNHAPPY_COUNTER -> bw
+    net.minecraft.network.syncher.EntityDataAccessor SNEEZE_COUNTER -> bx
+    net.minecraft.network.syncher.EntityDataAccessor EAT_COUNTER -> by
+    net.minecraft.network.syncher.EntityDataAccessor MAIN_GENE_ID -> bz
+    net.minecraft.network.syncher.EntityDataAccessor HIDDEN_GENE_ID -> bA
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_FLAGS -> bB
+    net.minecraft.world.entity.ai.targeting.TargetingConditions BREED_TARGETING -> bC
+    boolean gotBamboo -> bD
+    boolean didBite -> bE
+    int rollCounter -> bv
+    net.minecraft.world.phys.Vec3 rollDelta -> bF
+    float sitAmount -> bG
+    float sitAmountO -> bH
+    float onBackAmount -> bI
+    float onBackAmountO -> bJ
+    float rollAmount -> bK
+    float rollAmountO -> bL
+    net.minecraft.world.entity.animal.Panda$PandaLookAtPlayerGoal lookAtPlayerGoal -> bM
+    java.util.function.Predicate PANDA_ITEMS -> bN
+    100:107:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    111:115:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
+    119:119:int getUnhappyCounter() -> eL
+    123:124:void setUnhappyCounter(int) -> t
+    127:127:boolean isSneezing() -> eM
+    131:131:boolean isSitting() -> eN
+    135:136:void sit(boolean) -> t
+    139:139:boolean isOnBack() -> eO
+    143:144:void setOnBack(boolean) -> u
+    147:147:boolean isEating() -> eP
+    151:152:void eat(boolean) -> v
+    155:155:int getEatCounter() -> fl
+    159:160:void setEatCounter(int) -> v
+    163:168:void sneeze(boolean) -> w
+    171:171:int getSneezeCounter() -> eV
+    175:176:void setSneezeCounter(int) -> u
+    179:179:net.minecraft.world.entity.animal.Panda$Gene getMainGene() -> eW
+    183:188:void setMainGene(net.minecraft.world.entity.animal.Panda$Gene) -> a
+    191:191:net.minecraft.world.entity.animal.Panda$Gene getHiddenGene() -> eX
+    195:200:void setHiddenGene(net.minecraft.world.entity.animal.Panda$Gene) -> b
+    203:203:boolean isRolling() -> eY
+    207:208:void roll(boolean) -> x
+    212:219:void defineSynchedData() -> e
+    222:222:boolean getFlag(int) -> w
+    226:232:void setFlag(int,boolean) -> d
+    236:240:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    244:248:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    253:260:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    265:283:void registerGoals() -> o
+    286:288:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eZ
+    382:382:net.minecraft.world.entity.animal.Panda$Gene getVariant() -> fa
+    386:386:boolean isLazy() -> fb
+    390:390:boolean isWorried() -> fc
+    394:394:boolean isPlayful() -> fd
+    398:398:boolean isBrown() -> fe
+    402:402:boolean isWeak() -> ff
+    407:407:boolean isAggressive() -> eG
+    412:412:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
+    417:421:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    426:478:void tick() -> j
+    481:481:boolean isScared() -> fg
+    485:509:void handleEating() -> fm
+    512:528:void addEatingParticles() -> fn
+    531:537:void updateSitAmount() -> fo
+    540:546:void updateOnBackAnimation() -> fp
+    549:555:void updateRollAmount() -> fq
+    558:558:float getSitAmount(float) -> u
+    562:562:float getLieOnBackAmount(float) -> v
+    566:566:float getRollAmount(float) -> w
+    570:593:void handleRoll() -> fr
+    596:612:void afterSneeze() -> fs
+    616:624:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> b
     628:629:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
     635:645:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
     649:675:void setGeneFromParents(net.minecraft.world.entity.animal.Panda,net.minecraft.world.entity.animal.Panda) -> a
-    678:682:net.minecraft.world.entity.animal.Panda$Gene getOneOfGenesRandomly() -> eW
-    686:693:void setAttributes() -> eK
-    696:701:void tryToSit() -> eX
-    705:751:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    757:762:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    768:769:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    773:773:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    777:777:boolean isFoodOrCake(net.minecraft.world.item.ItemStack) -> j
-    783:783:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    789:789:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    793:793:boolean canPerformAction() -> eL
-    1029:1030:boolean lambda$static$0(net.minecraft.world.entity.item.ItemEntity) -> b
-    64:64:java.util.Random access$100(net.minecraft.world.entity.animal.Panda) -> a
-    64:64:java.util.Random access$200(net.minecraft.world.entity.animal.Panda) -> b
-    64:64:java.util.Random access$300(net.minecraft.world.entity.animal.Panda) -> c
-    64:64:java.util.Random access$400(net.minecraft.world.entity.animal.Panda) -> d
-    64:64:net.minecraft.world.entity.ai.targeting.TargetingConditions access$500() -> eM
-    64:64:net.minecraft.world.entity.animal.Panda$PandaLookAtPlayerGoal access$600(net.minecraft.world.entity.animal.Panda) -> e
-    64:64:java.util.function.Predicate access$700() -> eN
-    64:64:java.util.Random access$800(net.minecraft.world.entity.animal.Panda) -> f
-    64:64:java.util.Random access$900(net.minecraft.world.entity.animal.Panda) -> g
-    64:64:void access$1000(net.minecraft.world.entity.animal.Panda) -> h
-    64:64:java.util.Random access$1100(net.minecraft.world.entity.animal.Panda) -> i
-    64:64:java.util.Random access$1200(net.minecraft.world.entity.animal.Panda) -> j
-    64:64:java.util.Random access$1300(net.minecraft.world.entity.animal.Panda) -> k
-    64:64:java.util.Random access$1400(net.minecraft.world.entity.animal.Panda) -> l
-    64:64:java.util.Random access$1500(net.minecraft.world.entity.animal.Panda) -> m
-    64:64:boolean access$1600(net.minecraft.world.entity.animal.Panda) -> n
-    64:64:boolean access$1700(net.minecraft.world.entity.animal.Panda) -> o
-    65:1028:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Panda$Gene -> ato$a:
+    678:682:net.minecraft.world.entity.animal.Panda$Gene getOneOfGenesRandomly() -> ft
+    686:693:void setAttributes() -> fh
+    696:701:void tryToSit() -> fu
+    705:745:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    751:756:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    762:763:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    767:767:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    771:771:boolean isFoodOrCake(net.minecraft.world.item.ItemStack) -> l
+    777:777:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    783:783:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    787:787:boolean canPerformAction() -> fi
+    1023:1024:boolean lambda$static$0(net.minecraft.world.entity.item.ItemEntity) -> c
+    65:65:boolean access$100(net.minecraft.world.entity.animal.Panda) -> a
+    65:65:java.util.Random access$200(net.minecraft.world.entity.animal.Panda) -> b
+    65:65:java.util.Random access$300(net.minecraft.world.entity.animal.Panda) -> c
+    65:65:java.util.Random access$400(net.minecraft.world.entity.animal.Panda) -> d
+    65:65:java.util.Random access$500(net.minecraft.world.entity.animal.Panda) -> e
+    65:65:net.minecraft.world.entity.ai.targeting.TargetingConditions access$600() -> fj
+    65:65:net.minecraft.world.entity.animal.Panda$PandaLookAtPlayerGoal access$700(net.minecraft.world.entity.animal.Panda) -> f
+    65:65:java.util.function.Predicate access$800() -> fk
+    65:65:java.util.Random access$900(net.minecraft.world.entity.animal.Panda) -> g
+    65:65:java.util.Random access$1000(net.minecraft.world.entity.animal.Panda) -> h
+    65:65:void access$1100(net.minecraft.world.entity.animal.Panda) -> i
+    65:65:java.util.Random access$1200(net.minecraft.world.entity.animal.Panda) -> j
+    65:65:java.util.Random access$1300(net.minecraft.world.entity.animal.Panda) -> k
+    65:65:java.util.Random access$1400(net.minecraft.world.entity.animal.Panda) -> l
+    65:65:java.util.Random access$1500(net.minecraft.world.entity.animal.Panda) -> m
+    65:65:java.util.Random access$1600(net.minecraft.world.entity.animal.Panda) -> n
+    65:65:boolean access$1700(net.minecraft.world.entity.animal.Panda) -> o
+    65:65:boolean access$1800(net.minecraft.world.entity.animal.Panda) -> p
+    66:1022:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Panda$Gene -> ayw$a:
     net.minecraft.world.entity.animal.Panda$Gene NORMAL -> a
     net.minecraft.world.entity.animal.Panda$Gene LAZY -> b
     net.minecraft.world.entity.animal.Panda$Gene WORRIED -> c
@@ -41022,467 +44787,488 @@ net.minecraft.world.entity.animal.Panda$Gene -> ato$a:
     java.lang.String name -> j
     boolean isRecessive -> k
     net.minecraft.world.entity.animal.Panda$Gene[] $VALUES -> l
-    294:294:net.minecraft.world.entity.animal.Panda$Gene[] values() -> values
-    294:294:net.minecraft.world.entity.animal.Panda$Gene valueOf(java.lang.String) -> valueOf
-    310:314:void <init>(java.lang.String,int,int,java.lang.String,boolean) -> <init>
-    317:317:int getId() -> a
-    321:321:java.lang.String getName() -> b
-    325:325:boolean isRecessive() -> c
-    329:337:net.minecraft.world.entity.animal.Panda$Gene getVariantFromGenes(net.minecraft.world.entity.animal.Panda$Gene,net.minecraft.world.entity.animal.Panda$Gene) -> b
-    341:344:net.minecraft.world.entity.animal.Panda$Gene byId(int) -> a
-    348:354:net.minecraft.world.entity.animal.Panda$Gene byName(java.lang.String) -> a
-    358:378:net.minecraft.world.entity.animal.Panda$Gene getRandom(java.util.Random) -> a
-    303:303:net.minecraft.world.entity.animal.Panda$Gene[] lambda$static$0(int) -> b
-    294:294:net.minecraft.world.entity.animal.Panda$Gene access$000(net.minecraft.world.entity.animal.Panda$Gene,net.minecraft.world.entity.animal.Panda$Gene) -> a
-    294:303:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Panda$PandaAttackGoal -> ato$b:
-    net.minecraft.world.entity.animal.Panda panda -> d
-    818:820:void <init>(net.minecraft.world.entity.animal.Panda,double,boolean) -> <init>
-    824:824:boolean canUse() -> a
-net.minecraft.world.entity.animal.Panda$PandaAvoidGoal -> ato$c:
+    293:293:net.minecraft.world.entity.animal.Panda$Gene[] values() -> values
+    293:293:net.minecraft.world.entity.animal.Panda$Gene valueOf(java.lang.String) -> valueOf
+    309:313:void <init>(java.lang.String,int,int,java.lang.String,boolean) -> <init>
+    316:316:int getId() -> a
+    320:320:java.lang.String getName() -> b
+    324:324:boolean isRecessive() -> c
+    328:336:net.minecraft.world.entity.animal.Panda$Gene getVariantFromGenes(net.minecraft.world.entity.animal.Panda$Gene,net.minecraft.world.entity.animal.Panda$Gene) -> b
+    340:343:net.minecraft.world.entity.animal.Panda$Gene byId(int) -> a
+    347:353:net.minecraft.world.entity.animal.Panda$Gene byName(java.lang.String) -> a
+    357:377:net.minecraft.world.entity.animal.Panda$Gene getRandom(java.util.Random) -> a
+    302:302:net.minecraft.world.entity.animal.Panda$Gene[] lambda$static$0(int) -> b
+    293:293:net.minecraft.world.entity.animal.Panda$Gene access$000(net.minecraft.world.entity.animal.Panda$Gene,net.minecraft.world.entity.animal.Panda$Gene) -> a
+    293:302:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Panda$PandaAttackGoal -> ayw$b:
+    net.minecraft.world.entity.animal.Panda panda -> b
+    812:814:void <init>(net.minecraft.world.entity.animal.Panda,double,boolean) -> <init>
+    818:818:boolean canUse() -> a
+net.minecraft.world.entity.animal.Panda$PandaAvoidGoal -> ayw$c:
     net.minecraft.world.entity.animal.Panda panda -> i
-    1017:1020:void <init>(net.minecraft.world.entity.animal.Panda,java.lang.Class,float,double,double) -> <init>
-    1024:1024:boolean canUse() -> a
-net.minecraft.world.entity.animal.Panda$PandaBreedGoal -> ato$d:
+    1011:1014:void <init>(net.minecraft.world.entity.animal.Panda,java.lang.Class,float,double,double) -> <init>
+    1018:1018:boolean canUse() -> a
+net.minecraft.world.entity.animal.Panda$PandaBreedGoal -> ayw$d:
     net.minecraft.world.entity.animal.Panda panda -> e
     int unhappyCooldown -> f
     net.minecraft.world.entity.animal.Panda this$0 -> d
-    966:969:void <init>(net.minecraft.world.entity.animal.Panda,net.minecraft.world.entity.animal.Panda,double) -> <init>
-    973:990:boolean canUse() -> a
-    994:1009:boolean canFindBamboo() -> h
-net.minecraft.world.entity.animal.Panda$PandaHurtByTargetGoal -> ato$e:
+    960:963:void <init>(net.minecraft.world.entity.animal.Panda,net.minecraft.world.entity.animal.Panda,double) -> <init>
+    967:984:boolean canUse() -> a
+    988:1003:boolean canFindBamboo() -> h
+net.minecraft.world.entity.animal.Panda$PandaHurtByTargetGoal -> ayw$e:
     net.minecraft.world.entity.animal.Panda panda -> a
-    1139:1141:void <init>(net.minecraft.world.entity.animal.Panda,java.lang.Class[]) -> <init>
-    1145:1149:boolean canContinueToUse() -> b
-    1154:1157:void alertOther(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.animal.Panda$PandaLieOnBackGoal -> ato$f:
+    1133:1135:void <init>(net.minecraft.world.entity.animal.Panda,java.lang.Class[]) -> <init>
+    1139:1143:boolean canContinueToUse() -> b
+    1148:1151:void alertOther(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.animal.Panda$PandaLieOnBackGoal -> ayw$f:
     net.minecraft.world.entity.animal.Panda panda -> a
     int cooldown -> b
-    1100:1102:void <init>(net.minecraft.world.entity.animal.Panda) -> <init>
-    1106:1106:boolean canUse() -> a
-    1111:1119:boolean canContinueToUse() -> b
-    1124:1126:void start() -> c
-    1130:1132:void stop() -> d
-net.minecraft.world.entity.animal.Panda$PandaLookAtPlayerGoal -> ato$g:
+    1094:1096:void <init>(net.minecraft.world.entity.animal.Panda) -> <init>
+    1100:1100:boolean canUse() -> a
+    1105:1113:boolean canContinueToUse() -> b
+    1118:1120:void start() -> c
+    1124:1126:void stop() -> d
+net.minecraft.world.entity.animal.Panda$PandaLookAtPlayerGoal -> ayw$g:
     net.minecraft.world.entity.animal.Panda panda -> g
-    832:834:void <init>(net.minecraft.world.entity.animal.Panda,java.lang.Class,float) -> <init>
-    837:838:void setTarget(net.minecraft.world.entity.LivingEntity) -> a
-    842:842:boolean canContinueToUse() -> b
-    847:861:boolean canUse() -> a
-    866:869:void tick() -> e
-net.minecraft.world.entity.animal.Panda$PandaMoveControl -> ato$h:
+    826:828:void <init>(net.minecraft.world.entity.animal.Panda,java.lang.Class,float) -> <init>
+    831:832:void setTarget(net.minecraft.world.entity.LivingEntity) -> a
+    836:836:boolean canContinueToUse() -> b
+    841:855:boolean canUse() -> a
+    860:863:void tick() -> e
+net.minecraft.world.entity.animal.Panda$PandaMoveControl -> ayw$h:
     net.minecraft.world.entity.animal.Panda panda -> i
-    800:802:void <init>(net.minecraft.world.entity.animal.Panda) -> <init>
-    806:811:void tick() -> a
-net.minecraft.world.entity.animal.Panda$PandaPanicGoal -> ato$i:
-    net.minecraft.world.entity.animal.Panda panda -> f
-    1164:1166:void <init>(net.minecraft.world.entity.animal.Panda,double) -> <init>
-    1171:1184:boolean canUse() -> a
-    1189:1193:boolean canContinueToUse() -> b
-net.minecraft.world.entity.animal.Panda$PandaRollGoal -> ato$j:
+    794:796:void <init>(net.minecraft.world.entity.animal.Panda) -> <init>
+    800:805:void tick() -> a
+net.minecraft.world.entity.animal.Panda$PandaPanicGoal -> ayw$i:
+    net.minecraft.world.entity.animal.Panda panda -> g
+    1158:1160:void <init>(net.minecraft.world.entity.animal.Panda,double) -> <init>
+    1165:1178:boolean canUse() -> a
+    1183:1187:boolean canContinueToUse() -> b
+net.minecraft.world.entity.animal.Panda$PandaRollGoal -> ayw$j:
     net.minecraft.world.entity.animal.Panda panda -> a
-    875:878:void <init>(net.minecraft.world.entity.animal.Panda) -> <init>
-    882:911:boolean canUse() -> a
-    916:916:boolean canContinueToUse() -> b
-    921:922:void start() -> c
-    926:926:boolean isInterruptable() -> E_
-net.minecraft.world.entity.animal.Panda$PandaSitGoal -> ato$k:
+    869:872:void <init>(net.minecraft.world.entity.animal.Panda) -> <init>
+    876:905:boolean canUse() -> a
+    910:910:boolean canContinueToUse() -> b
+    915:916:void start() -> c
+    920:920:boolean isInterruptable() -> D_
+net.minecraft.world.entity.animal.Panda$PandaSitGoal -> ayw$k:
     int cooldown -> b
     net.minecraft.world.entity.animal.Panda this$0 -> a
-    1036:1038:void <init>(net.minecraft.world.entity.animal.Panda) -> <init>
-    1042:1047:boolean canUse() -> a
-    1052:1060:boolean canContinueToUse() -> b
-    1065:1068:void tick() -> e
-    1072:1080:void start() -> c
-    1084:1093:void stop() -> d
-net.minecraft.world.entity.animal.Panda$PandaSneezeGoal -> ato$l:
+    1030:1032:void <init>(net.minecraft.world.entity.animal.Panda) -> <init>
+    1036:1041:boolean canUse() -> a
+    1046:1054:boolean canContinueToUse() -> b
+    1059:1062:void tick() -> e
+    1066:1074:void start() -> c
+    1078:1087:void stop() -> d
+net.minecraft.world.entity.animal.Panda$PandaSneezeGoal -> ayw$l:
     net.minecraft.world.entity.animal.Panda panda -> a
-    934:936:void <init>(net.minecraft.world.entity.animal.Panda) -> <init>
-    940:948:boolean canUse() -> a
-    953:953:boolean canContinueToUse() -> b
-    958:959:void start() -> c
-net.minecraft.world.entity.animal.Parrot -> atp:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_VARIANT_ID -> bD
-    java.util.function.Predicate NOT_PARROT_PREDICATE -> bE
-    net.minecraft.world.item.Item POISONOUS_FOOD -> bF
-    java.util.Set TAME_FOOD -> bG
-    java.util.Map MOB_SOUND_MAP -> bH
-    float flap -> bz
-    float flapSpeed -> bA
-    float oFlapSpeed -> bB
-    float oFlap -> bC
-    float flapping -> bI
-    boolean partyParrot -> bJ
-    net.minecraft.core.BlockPos jukebox -> bK
-    114:128:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    133:140:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    145:155:void registerGoals() -> n
-    159:165:void registerAttributes() -> cA
-    169:173:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
-    178:178:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    183:193:void aiStep() -> k
-    197:199:void setRecordPlayingNearby(net.minecraft.core.BlockPos,boolean) -> a
-    202:202:boolean isPartyParrot() -> ez
-    206:223:void calculateFlapping() -> eD
-    226:241:boolean imitateNearbyMobs(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity) -> b
-    246:289:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    294:294:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    298:300:boolean checkParrotSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
-    305:305:boolean causeFallDamage(float,float) -> b
-    311:311:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    315:315:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
-    321:321:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    325:330:void playAmbientSound(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity) -> a
-    334:334:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    340:340:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    344:349:net.minecraft.sounds.SoundEvent getAmbient(java.util.Random) -> a
-    353:353:net.minecraft.sounds.SoundEvent getImitatedSound(net.minecraft.world.entity.EntityType) -> b
-    358:358:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    363:363:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    368:369:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    373:374:float playFlySound(float) -> e
-    379:379:boolean makeFlySound() -> aq
-    384:384:float getVoicePitch() -> dn
-    388:388:float getPitch(java.util.Random) -> b
-    393:393:net.minecraft.sounds.SoundSource getSoundSource() -> cl
-    398:398:boolean isPushable() -> aL
-    403:407:void doPush(net.minecraft.world.entity.Entity) -> C
-    411:419:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    423:423:int getVariant() -> eA
-    427:428:void setVariant(int) -> t
-    432:434:void defineSynchedData() -> w_
-    438:440:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    444:446:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    450:450:boolean isFlying() -> eF
-    79:108:void lambda$static$0(java.util.HashMap) -> a
-    64:64:java.util.Map access$000() -> eB
+    928:930:void <init>(net.minecraft.world.entity.animal.Panda) -> <init>
+    934:942:boolean canUse() -> a
+    947:947:boolean canContinueToUse() -> b
+    952:953:void start() -> c
+net.minecraft.world.entity.animal.Parrot -> ayx:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_VARIANT_ID -> bB
+    java.util.function.Predicate NOT_PARROT_PREDICATE -> bC
+    net.minecraft.world.item.Item POISONOUS_FOOD -> bD
+    java.util.Set TAME_FOOD -> bE
+    java.util.Map MOB_SOUND_MAP -> bF
+    float flap -> bx
+    float flapSpeed -> by
+    float oFlapSpeed -> bz
+    float oFlap -> bA
+    float flapping -> bG
+    boolean partyParrot -> bH
+    net.minecraft.core.BlockPos jukebox -> bI
+    117:131:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    136:143:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    148:148:boolean isBaby() -> x_
+    153:161:void registerGoals() -> o
+    164:167:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eV
+    172:176:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
+    181:181:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    186:198:void aiStep() -> k
+    202:204:void setRecordPlayingNearby(net.minecraft.core.BlockPos,boolean) -> a
+    207:207:boolean isPartyParrot() -> eW
+    211:228:void calculateFlapping() -> fa
+    231:246:boolean imitateNearbyMobs(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity) -> a
+    251:290:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    295:295:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    299:301:boolean checkParrotSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
+    306:306:boolean causeFallDamage(float,float) -> b
+    312:312:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    316:316:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
+    322:322:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    327:327:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    333:333:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    337:342:net.minecraft.sounds.SoundEvent getAmbient(net.minecraft.world.level.Level,java.util.Random) -> a
+    346:346:net.minecraft.sounds.SoundEvent getImitatedSound(net.minecraft.world.entity.EntityType) -> c
+    351:351:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    356:356:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    361:362:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    366:367:float playFlySound(float) -> e
+    372:372:boolean makeFlySound() -> au
+    377:377:float getVoicePitch() -> dG
+    381:381:float getPitch(java.util.Random) -> a
+    386:386:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    391:391:boolean isPushable() -> aR
+    396:400:void doPush(net.minecraft.world.entity.Entity) -> C
+    404:409:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    413:413:int getVariant() -> eX
+    417:418:void setVariant(int) -> t
+    422:424:void defineSynchedData() -> e
+    428:430:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    434:436:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    440:440:boolean isFlying() -> fb
+    445:445:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    79:111:void lambda$static$0(java.util.HashMap) -> a
+    64:64:java.util.Map access$000() -> eY
     65:78:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Parrot$1 -> atp$1:
+net.minecraft.world.entity.animal.Parrot$1 -> ayx$1:
     66:66:void <init>() -> <init>
     69:69:boolean test(net.minecraft.world.entity.Mob) -> a
     66:66:boolean test(java.lang.Object) -> test
-net.minecraft.world.entity.animal.Pig -> atq:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_SADDLE_ID -> bw
-    net.minecraft.network.syncher.EntityDataAccessor DATA_BOOST_TIME -> bx
-    net.minecraft.world.item.crafting.Ingredient FOOD_ITEMS -> by
-    boolean boosting -> bz
-    int boostTime -> bA
-    int boostTimeTotal -> bB
-    51:52:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    56:65:void registerGoals() -> n
-    69:73:void registerAttributes() -> cA
-    78:81:net.minecraft.world.entity.Entity getControllingPassenger() -> cd
-    86:96:boolean canBeControlledByRider() -> dY
-    101:107:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    111:114:void defineSynchedData() -> w_
-    118:120:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    124:126:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    130:130:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    135:135:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    140:140:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    145:146:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    150:166:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    171:175:void dropEquipment() -> cU
-    178:178:boolean hasSaddle() -> eq
-    182:187:void setSaddle(boolean) -> r
-    191:201:void thunderHit(net.minecraft.world.entity.global.LightningBolt) -> a
-    205:257:void travel(net.minecraft.world.phys.Vec3) -> e
-    260:267:boolean boost() -> er
-    272:272:net.minecraft.world.entity.animal.Pig getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    277:277:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    39:39:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    40:42:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.PolarBear -> atr:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_STANDING_ID -> bw
-    float clientSideStandAnimationO -> bx
-    float clientSideStandAnimation -> by
-    int warningSoundTicks -> bz
-    55:56:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    60:60:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    65:65:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    70:83:void registerGoals() -> n
-    87:95:void registerAttributes() -> cA
-    98:103:boolean checkPolarBearSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
-    108:111:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    116:116:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    121:121:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    126:127:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    130:135:void playWarningSound() -> eq
-    139:142:void defineSynchedData() -> w_
-    146:163:void tick() -> h
-    167:173:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
-    180:184:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    188:188:boolean isStanding() -> er
-    192:193:void setStanding(boolean) -> r
-    196:196:float getStandingAnimationScale(float) -> v
-    201:201:float getWaterSlowDown() -> ds
-    206:211:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    47:47:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.PolarBear$PolarBearAttackPlayersGoal -> atr$a:
+net.minecraft.world.entity.animal.Pig -> ayy:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_SADDLE_ID -> bv
+    net.minecraft.network.syncher.EntityDataAccessor DATA_BOOST_TIME -> bw
+    net.minecraft.world.item.crafting.Ingredient FOOD_ITEMS -> bx
+    net.minecraft.world.entity.ItemBasedSteering steering -> by
+    58:60:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    64:73:void registerGoals() -> o
+    76:78:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    84:87:net.minecraft.world.entity.Entity getControllingPassenger() -> cl
+    92:102:boolean canBeControlledByRider() -> es
+    107:111:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    115:118:void defineSynchedData() -> e
+    122:124:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    128:130:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    134:134:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    139:139:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    144:144:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    149:150:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    154:171:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    176:176:boolean isSaddleable() -> M_
+    181:185:void dropEquipment() -> dm
+    189:189:boolean isSaddled() -> N_
+    194:198:void equipSaddle(net.minecraft.sounds.SoundSource) -> a
+    202:230:net.minecraft.world.phys.Vec3 getDismountLocationForPassenger(net.minecraft.world.entity.LivingEntity) -> c
+    235:251:void thunderHit(net.minecraft.world.entity.LightningBolt) -> a
+    255:256:void travel(net.minecraft.world.phys.Vec3) -> f
+    260:260:float getSteeringSpeed() -> O_
+    265:266:void travelWithInput(net.minecraft.world.phys.Vec3) -> a_
+    270:270:boolean boost() -> P_
+    275:275:net.minecraft.world.entity.animal.Pig getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    280:280:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    285:285:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    50:50:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    51:53:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.PolarBear -> ayz:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_STANDING_ID -> bv
+    float clientSideStandAnimationO -> bw
+    float clientSideStandAnimation -> bx
+    int warningSoundTicks -> by
+    net.minecraft.util.IntRange PERSISTENT_ANGER_TIME -> bz
+    int remainingPersistentAngerTime -> bA
+    java.util.UUID persistentAngerTarget -> bB
+    66:67:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    71:71:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    76:76:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    81:96:void registerGoals() -> o
+    99:103:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    107:112:boolean checkPolarBearSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
+    117:119:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    123:125:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    129:130:void startPersistentAngerTimer() -> H_
+    134:135:void setRemainingPersistentAngerTime(int) -> a_
+    139:139:int getRemainingPersistentAngerTime() -> F_
+    144:145:void setPersistentAngerTarget(java.util.UUID) -> a
+    149:149:java.util.UUID getPersistentAngerTarget() -> G_
+    154:157:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    162:162:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    167:167:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    172:173:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    176:181:void playWarningSound() -> eM
+    185:188:void defineSynchedData() -> e
+    192:213:void tick() -> j
+    217:223:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
+    230:234:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    238:238:boolean isStanding() -> eN
+    242:243:void setStanding(boolean) -> t
+    246:246:float getStandingAnimationScale(float) -> u
+    251:251:float getWaterSlowDown() -> dL
+    256:261:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    54:61:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.PolarBear$PolarBearAttackPlayersGoal -> ayz$a:
     net.minecraft.world.entity.animal.PolarBear this$0 -> i
-    247:249:void <init>(net.minecraft.world.entity.animal.PolarBear) -> <init>
-    253:267:boolean canUse() -> a
-    272:272:double getFollowDistance() -> k
-net.minecraft.world.entity.animal.PolarBear$PolarBearHurtByTargetGoal -> atr$b:
+    297:299:void <init>(net.minecraft.world.entity.animal.PolarBear) -> <init>
+    303:317:boolean canUse() -> a
+    322:322:double getFollowDistance() -> k
+net.minecraft.world.entity.animal.PolarBear$PolarBearHurtByTargetGoal -> ayz$b:
     net.minecraft.world.entity.animal.PolarBear this$0 -> a
-    219:221:void <init>(net.minecraft.world.entity.animal.PolarBear) -> <init>
-    225:230:void start() -> c
-    234:239:void alertOther(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.animal.PolarBear$PolarBearMeleeAttackGoal -> atr$c:
-    net.minecraft.world.entity.animal.PolarBear this$0 -> d
-    277:279:void <init>(net.minecraft.world.entity.animal.PolarBear) -> <init>
-    283:302:void checkAndPerformAttack(net.minecraft.world.entity.LivingEntity,double) -> a
-    306:308:void stop() -> d
-    312:312:double getAttackReachSqr(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.animal.PolarBear$PolarBearPanicGoal -> atr$d:
-    net.minecraft.world.entity.animal.PolarBear this$0 -> f
-    317:319:void <init>(net.minecraft.world.entity.animal.PolarBear) -> <init>
-    323:326:boolean canUse() -> a
-net.minecraft.world.entity.animal.Pufferfish -> ats:
+    269:271:void <init>(net.minecraft.world.entity.animal.PolarBear) -> <init>
+    275:280:void start() -> c
+    284:289:void alertOther(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.animal.PolarBear$PolarBearMeleeAttackGoal -> ayz$c:
+    net.minecraft.world.entity.animal.PolarBear this$0 -> b
+    327:329:void <init>(net.minecraft.world.entity.animal.PolarBear) -> <init>
+    333:352:void checkAndPerformAttack(net.minecraft.world.entity.LivingEntity,double) -> a
+    356:358:void stop() -> d
+    362:362:double getAttackReachSqr(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.animal.PolarBear$PolarBearPanicGoal -> ayz$d:
+    net.minecraft.world.entity.animal.PolarBear this$0 -> g
+    367:369:void <init>(net.minecraft.world.entity.animal.PolarBear) -> <init>
+    373:376:boolean canUse() -> a
+net.minecraft.world.entity.animal.Pufferfish -> aza:
     net.minecraft.network.syncher.EntityDataAccessor PUFF_STATE -> b
     int inflateCounter -> c
     int deflateTimer -> d
-    java.util.function.Predicate NO_SPECTATORS_AND_NO_WATER_MOB -> bw
+    java.util.function.Predicate NO_SPECTATORS_AND_NO_WATER_MOB -> bv
     52:53:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    57:60:void defineSynchedData() -> w_
-    63:63:int getPuffState() -> es
+    57:60:void defineSynchedData() -> e
+    63:63:int getPuffState() -> eO
     67:68:void setPuffState(int) -> b
     72:77:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
     81:84:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     88:91:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    95:95:net.minecraft.world.item.ItemStack getBucketItemStack() -> l
-    100:103:void registerGoals() -> n
-    107:135:void tick() -> h
+    95:95:net.minecraft.world.item.ItemStack getBucketItemStack() -> eL
+    100:103:void registerGoals() -> o
+    107:135:void tick() -> j
     139:149:void aiStep() -> k
     152:157:void touch(net.minecraft.world.entity.Mob) -> a
-    161:168:void playerTouch(net.minecraft.world.entity.player.Player) -> b
-    172:172:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    177:177:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    182:182:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    187:187:net.minecraft.sounds.SoundEvent getFlopSound() -> er
-    192:192:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
-    196:202:float getScale(int) -> s
-    36:44:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> i
-    30:30:java.util.function.Predicate access$000() -> et
+    161:170:void playerTouch(net.minecraft.world.entity.player.Player) -> a_
+    174:174:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    179:179:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    184:184:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    189:189:net.minecraft.sounds.SoundEvent getFlopSound() -> eN
+    194:194:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
+    198:204:float getScale(int) -> s
+    36:44:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> j
+    30:30:java.util.function.Predicate access$000() -> eP
     30:30:int access$102(net.minecraft.world.entity.animal.Pufferfish,int) -> a
     30:30:int access$202(net.minecraft.world.entity.animal.Pufferfish,int) -> b
     31:35:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Pufferfish$PufferfishPuffGoal -> ats$a:
+net.minecraft.world.entity.animal.Pufferfish$PufferfishPuffGoal -> aza$a:
     net.minecraft.world.entity.animal.Pufferfish fish -> a
-    209:211:void <init>(net.minecraft.world.entity.animal.Pufferfish) -> <init>
-    215:217:boolean canUse() -> a
-    222:224:void start() -> c
-    228:229:void stop() -> d
-    233:235:boolean canContinueToUse() -> b
-net.minecraft.world.entity.animal.Rabbit -> att:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_TYPE_ID -> bw
-    net.minecraft.resources.ResourceLocation KILLER_BUNNY -> bx
-    int jumpTicks -> by
-    int jumpDuration -> bz
-    boolean wasOnGround -> bA
-    int jumpDelayTicks -> bB
-    int moreCarrotTicks -> bC
-    95:102:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    106:116:void registerGoals() -> n
-    120:133:float getJumpPower() -> dp
-    138:150:void jumpFromGround() -> dq
-    153:156:float getJumpCompletion(float) -> v
-    160:162:void setSpeedModifier(double) -> i
-    166:170:void setJumping(boolean) -> a_
-    173:176:void startJumping() -> eq
-    180:183:void defineSynchedData() -> w_
-    187:231:void customServerAiStep() -> dT
-    236:236:void updateSprintingState() -> aE
-    239:240:void facePoint(double,double) -> b
-    243:244:void enableJumpControl() -> et
-    247:248:void disableJumpControl() -> eu
-    251:256:void setLandingDelay() -> ez
-    259:261:void checkLandingDelay() -> eA
-    265:273:void aiStep() -> k
-    277:281:void registerAttributes() -> cA
+    211:213:void <init>(net.minecraft.world.entity.animal.Pufferfish) -> <init>
+    217:219:boolean canUse() -> a
+    224:226:void start() -> c
+    230:231:void stop() -> d
+    235:237:boolean canContinueToUse() -> b
+net.minecraft.world.entity.animal.Rabbit -> azb:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_TYPE_ID -> bv
+    net.minecraft.resources.ResourceLocation KILLER_BUNNY -> bw
+    int jumpTicks -> bx
+    int jumpDuration -> by
+    boolean wasOnGround -> bz
+    int jumpDelayTicks -> bA
+    int moreCarrotTicks -> bB
+    97:104:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    108:118:void registerGoals() -> o
+    122:135:float getJumpPower() -> dI
+    140:152:void jumpFromGround() -> dJ
+    155:158:float getJumpCompletion(float) -> u
+    162:164:void setSpeedModifier(double) -> i
+    168:172:void setJumping(boolean) -> o
+    175:178:void startJumping() -> eL
+    182:185:void defineSynchedData() -> e
+    189:233:void customServerAiStep() -> N
+    237:237:boolean canSpawnSprintParticle() -> aK
+    241:242:void facePoint(double,double) -> b
+    245:246:void enableJumpControl() -> eP
+    249:250:void disableJumpControl() -> eV
+    253:258:void setLandingDelay() -> eW
+    261:263:void checkLandingDelay() -> eX
+    267:275:void aiStep() -> k
+    278:280:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eM
     285:288:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     292:295:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    298:298:net.minecraft.sounds.SoundEvent getJumpSound() -> er
-    303:303:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    298:298:net.minecraft.sounds.SoundEvent getJumpSound() -> eN
+    303:303:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     308:308:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    313:313:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    313:313:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     318:322:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    327:327:net.minecraft.sounds.SoundSource getSoundSource() -> cl
+    327:327:net.minecraft.sounds.SoundSource getSoundSource() -> ct
     332:335:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
     339:339:boolean isTemptingItem(net.minecraft.world.item.Item) -> b
     344:354:net.minecraft.world.entity.animal.Rabbit getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    359:359:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    363:363:int getRabbitType() -> es
+    359:359:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    363:363:int getRabbitType() -> eO
     367:380:void setRabbitType(int) -> t
     385:395:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
     399:410:int getRandomRabbitType(net.minecraft.world.level.LevelAccessor) -> a
     414:418:boolean checkRabbitSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
-    432:432:boolean wantsMoreFood() -> eB
+    432:432:boolean wantsMoreFood() -> eY
     437:444:void handleEntityEvent(byte) -> a
-    61:61:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    61:61:boolean access$000(net.minecraft.world.entity.animal.Rabbit) -> a
-    61:61:net.minecraft.world.entity.ai.control.JumpControl access$100(net.minecraft.world.entity.animal.Rabbit) -> b
-    61:61:boolean access$200(net.minecraft.world.entity.animal.Rabbit) -> c
-    61:61:int access$302(net.minecraft.world.entity.animal.Rabbit,int) -> a
-    68:79:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Rabbit$EvilRabbitAttackGoal -> att$a:
-    622:623:void <init>(net.minecraft.world.entity.animal.Rabbit) -> <init>
-    627:627:double getAttackReachSqr(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.animal.Rabbit$RabbitAvoidEntityGoal -> att$b:
+    448:448:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    63:63:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    63:63:boolean access$000(net.minecraft.world.entity.animal.Rabbit) -> a
+    63:63:boolean access$100(net.minecraft.world.entity.animal.Rabbit) -> b
+    63:63:net.minecraft.world.entity.ai.control.JumpControl access$200(net.minecraft.world.entity.animal.Rabbit) -> c
+    63:63:boolean access$300(net.minecraft.world.entity.animal.Rabbit) -> d
+    63:63:int access$402(net.minecraft.world.entity.animal.Rabbit,int) -> a
+    70:81:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Rabbit$EvilRabbitAttackGoal -> azb$a:
+    627:628:void <init>(net.minecraft.world.entity.animal.Rabbit) -> <init>
+    632:632:double getAttackReachSqr(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.animal.Rabbit$RabbitAvoidEntityGoal -> azb$b:
     net.minecraft.world.entity.animal.Rabbit rabbit -> i
-    512:514:void <init>(net.minecraft.world.entity.animal.Rabbit,java.lang.Class,float,double,double) -> <init>
-    518:518:boolean canUse() -> a
-net.minecraft.world.entity.animal.Rabbit$RabbitGroupData -> att$c:
+    517:519:void <init>(net.minecraft.world.entity.animal.Rabbit,java.lang.Class,float,double,double) -> <init>
+    523:523:boolean canUse() -> a
+net.minecraft.world.entity.animal.Rabbit$RabbitGroupData -> azb$c:
     int rabbitType -> a
     424:428:void <init>(int) -> <init>
-net.minecraft.world.entity.animal.Rabbit$RabbitJumpControl -> att$d:
+net.minecraft.world.entity.animal.Rabbit$RabbitJumpControl -> azb$d:
     net.minecraft.world.entity.animal.Rabbit rabbit -> c
     boolean canJump -> d
     net.minecraft.world.entity.animal.Rabbit this$0 -> b
-    450:453:void <init>(net.minecraft.world.entity.animal.Rabbit,net.minecraft.world.entity.animal.Rabbit) -> <init>
-    456:456:boolean wantJump() -> c
-    460:460:boolean canJump() -> d
-    464:465:void setCanJump(boolean) -> a
-    469:473:void tick() -> b
-net.minecraft.world.entity.animal.Rabbit$RabbitMoveControl -> att$e:
+    455:458:void <init>(net.minecraft.world.entity.animal.Rabbit,net.minecraft.world.entity.animal.Rabbit) -> <init>
+    461:461:boolean wantJump() -> c
+    465:465:boolean canJump() -> d
+    469:470:void setCanJump(boolean) -> a
+    474:478:void tick() -> b
+net.minecraft.world.entity.animal.Rabbit$RabbitMoveControl -> azb$e:
     net.minecraft.world.entity.animal.Rabbit rabbit -> i
     double nextJumpSpeed -> j
-    481:483:void <init>(net.minecraft.world.entity.animal.Rabbit) -> <init>
-    487:493:void tick() -> a
-    497:505:void setWantedPosition(double,double,double,double) -> a
-net.minecraft.world.entity.animal.Rabbit$RabbitPanicGoal -> att$f:
-    net.minecraft.world.entity.animal.Rabbit rabbit -> f
-    608:610:void <init>(net.minecraft.world.entity.animal.Rabbit,double) -> <init>
-    614:617:void tick() -> e
-net.minecraft.world.entity.animal.Rabbit$RaidGardenGoal -> att$g:
+    486:488:void <init>(net.minecraft.world.entity.animal.Rabbit) -> <init>
+    492:498:void tick() -> a
+    502:510:void setWantedPosition(double,double,double,double) -> a
+net.minecraft.world.entity.animal.Rabbit$RabbitPanicGoal -> azb$f:
+    net.minecraft.world.entity.animal.Rabbit rabbit -> g
+    613:615:void <init>(net.minecraft.world.entity.animal.Rabbit,double) -> <init>
+    619:622:void tick() -> e
+net.minecraft.world.entity.animal.Rabbit$RaidGardenGoal -> azb$g:
     net.minecraft.world.entity.animal.Rabbit rabbit -> g
     boolean wantsToRaid -> h
     boolean canRaid -> i
-    529:531:void <init>(net.minecraft.world.entity.animal.Rabbit) -> <init>
-    535:546:boolean canUse() -> a
-    551:551:boolean canContinueToUse() -> b
-    556:584:void tick() -> e
-    588:600:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.animal.Salmon -> atu:
+    534:536:void <init>(net.minecraft.world.entity.animal.Rabbit) -> <init>
+    540:551:boolean canUse() -> a
+    556:556:boolean canContinueToUse() -> b
+    561:589:void tick() -> e
+    593:605:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.animal.Salmon -> azc:
     13:14:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    20:20:int getMaxSchoolSize() -> es
-    25:25:net.minecraft.world.item.ItemStack getBucketItemStack() -> l
-    30:30:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    35:35:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    20:20:int getMaxSchoolSize() -> eO
+    25:25:net.minecraft.world.item.ItemStack getBucketItemStack() -> eL
+    30:30:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    35:35:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     40:40:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    45:45:net.minecraft.sounds.SoundEvent getFlopSound() -> er
-net.minecraft.world.entity.animal.Sheep -> atv:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_WOOL_ID -> bw
-    java.util.Map ITEM_BY_DYE -> bx
-    java.util.Map COLORARRAY_BY_COLOR -> by
-    int eatAnimationTick -> bz
-    net.minecraft.world.entity.ai.goal.EatBlockGoal eatBlockGoal -> bA
-    85:93:float[] createSheepColor(net.minecraft.world.item.DyeColor) -> c
-    97:97:float[] getColorArray(net.minecraft.world.item.DyeColor) -> a
-    104:105:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    109:119:void registerGoals() -> n
-    123:125:void customServerAiStep() -> dT
-    129:133:void aiStep() -> k
-    137:141:void registerAttributes() -> cA
-    145:149:void defineSynchedData() -> w_
-    153:189:net.minecraft.resources.ResourceLocation getDefaultLootTable() -> H
-    195:200:void handleEntityEvent(byte) -> a
-    203:212:float getHeadEatPositionScale(float) -> v
-    216:223:float getHeadEatAngleScale(float) -> w
-    228:237:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    241:256:void shear() -> eq
-    260:263:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    267:270:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    274:274:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    279:279:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    284:284:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    289:290:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    293:293:net.minecraft.world.item.DyeColor getColor() -> er
-    297:299:void setColor(net.minecraft.world.item.DyeColor) -> b
-    302:302:boolean isSheared() -> es
-    306:312:void setSheared(boolean) -> r
-    315:331:net.minecraft.world.item.DyeColor getRandomSheepColor(java.util.Random) -> a
-    336:341:net.minecraft.world.entity.animal.Sheep getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    346:351:void ate() -> z
-    356:357:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    361:372:net.minecraft.world.item.DyeColor getOffspringColor(net.minecraft.world.entity.animal.Animal,net.minecraft.world.entity.animal.Animal) -> a
-    376:384:net.minecraft.world.inventory.CraftingContainer makeContainer(net.minecraft.world.item.DyeColor,net.minecraft.world.item.DyeColor) -> a
-    389:389:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    58:58:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    372:372:net.minecraft.world.item.DyeColor lambda$getOffspringColor$4(net.minecraft.world.item.DyeColor,net.minecraft.world.item.DyeColor) -> b
-    367:367:net.minecraft.world.item.ItemStack lambda$getOffspringColor$3(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.item.crafting.CraftingRecipe) -> a
-    232:232:void lambda$mobInteract$2(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
-    82:82:net.minecraft.world.item.DyeColor lambda$static$1(net.minecraft.world.item.DyeColor) -> d
-    64:80:void lambda$static$0(java.util.EnumMap) -> a
-    61:82:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Sheep$1 -> atv$1:
-    376:376:void <init>(net.minecraft.world.inventory.MenuType,int) -> <init>
-    379:379:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-net.minecraft.world.entity.animal.Sheep$2 -> atv$2:
+    45:45:net.minecraft.sounds.SoundEvent getFlopSound() -> eN
+net.minecraft.world.entity.animal.Sheep -> azd:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_WOOL_ID -> bv
+    java.util.Map ITEM_BY_DYE -> bw
+    java.util.Map COLORARRAY_BY_COLOR -> bx
+    int eatAnimationTick -> by
+    net.minecraft.world.entity.ai.goal.EatBlockGoal eatBlockGoal -> bz
+    90:98:float[] createSheepColor(net.minecraft.world.item.DyeColor) -> c
+    102:102:float[] getColorArray(net.minecraft.world.item.DyeColor) -> a
+    109:110:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    114:124:void registerGoals() -> o
+    128:130:void customServerAiStep() -> N
+    134:138:void aiStep() -> k
+    141:143:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    148:152:void defineSynchedData() -> e
+    156:192:net.minecraft.resources.ResourceLocation getDefaultLootTable() -> J
+    198:203:void handleEntityEvent(byte) -> a
+    206:215:float getHeadEatPositionScale(float) -> u
+    219:226:float getHeadEatAngleScale(float) -> v
+    231:241:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    246:260:void shear(net.minecraft.sounds.SoundSource) -> a
+    264:264:boolean readyForShearing() -> L_
+    269:272:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    276:279:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    283:283:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    288:288:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    293:293:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    298:299:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    302:302:net.minecraft.world.item.DyeColor getColor() -> eM
+    306:308:void setColor(net.minecraft.world.item.DyeColor) -> b
+    311:311:boolean isSheared() -> eN
+    315:321:void setSheared(boolean) -> t
+    324:340:net.minecraft.world.item.DyeColor getRandomSheepColor(java.util.Random) -> a
+    345:350:net.minecraft.world.entity.animal.Sheep getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    355:360:void ate() -> B
+    365:366:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    370:381:net.minecraft.world.item.DyeColor getOffspringColor(net.minecraft.world.entity.animal.Animal,net.minecraft.world.entity.animal.Animal) -> a
+    385:393:net.minecraft.world.inventory.CraftingContainer makeContainer(net.minecraft.world.item.DyeColor,net.minecraft.world.item.DyeColor) -> a
+    398:398:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    63:63:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    381:381:net.minecraft.world.item.DyeColor lambda$getOffspringColor$4(net.minecraft.world.item.DyeColor,net.minecraft.world.item.DyeColor) -> b
+    376:376:net.minecraft.world.item.ItemStack lambda$getOffspringColor$3(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.item.crafting.CraftingRecipe) -> a
+    235:235:void lambda$mobInteract$2(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
+    87:87:net.minecraft.world.item.DyeColor lambda$static$1(net.minecraft.world.item.DyeColor) -> d
+    69:85:void lambda$static$0(java.util.EnumMap) -> a
+    66:87:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Sheep$1 -> azd$1:
+    385:385:void <init>(net.minecraft.world.inventory.MenuType,int) -> <init>
+    388:388:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+net.minecraft.world.entity.animal.Sheep$2 -> azd$2:
     int[] $SwitchMap$net$minecraft$world$item$DyeColor -> a
-    156:156:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.ShoulderRidingEntity -> atw:
-    int rideCooldownCounter -> bz
+    159:159:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.ShoulderRidingEntity -> aze:
+    int rideCooldownCounter -> bx
     15:16:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     19:28:boolean setEntityOnShoulder(net.minecraft.server.level.ServerPlayer) -> d
-    33:35:void tick() -> h
-    38:38:boolean canSitOnShoulder() -> eC
-net.minecraft.world.entity.animal.SnowGolem -> atx:
+    33:35:void tick() -> j
+    38:38:boolean canSitOnShoulder() -> eZ
+net.minecraft.world.entity.animal.SnowGolem -> azf:
     net.minecraft.network.syncher.EntityDataAccessor DATA_PUMPKIN_ID -> b
-    44:45:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    49:55:void registerGoals() -> n
-    59:63:void registerAttributes() -> cA
-    67:69:void defineSynchedData() -> w_
-    73:76:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    80:85:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    89:120:void aiStep() -> k
-    124:134:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
-    138:138:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    143:151:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    155:155:boolean hasPumpkin() -> l
-    159:165:void setPumpkin(boolean) -> r
-    170:170:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    176:176:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    182:182:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    147:147:void lambda$mobInteract$1(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
-    54:54:boolean lambda$registerGoals$0(net.minecraft.world.entity.LivingEntity) -> i
-    39:39:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Squid -> aty:
+    50:51:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    55:61:void registerGoals() -> o
+    64:66:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    71:73:void defineSynchedData() -> e
+    77:80:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    84:89:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    93:93:boolean isSensitiveToWater() -> dN
+    98:125:void aiStep() -> k
+    129:139:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
+    143:143:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    148:156:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    161:167:void shear(net.minecraft.sounds.SoundSource) -> a
+    171:171:boolean readyForShearing() -> L_
+    175:175:boolean hasPumpkin() -> eL
+    179:185:void setPumpkin(boolean) -> t
+    190:190:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    196:196:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    202:202:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    207:207:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    152:152:void lambda$mobInteract$1(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
+    60:60:boolean lambda$registerGoals$0(net.minecraft.world.entity.LivingEntity) -> j
+    44:44:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Squid -> azg:
     float xBodyRot -> b
     float xBodyRotO -> c
     float zBodyRot -> d
-    float zBodyRotO -> bw
-    float tentacleMovement -> bx
-    float oldTentacleMovement -> by
-    float tentacleAngle -> bz
-    float oldTentacleAngle -> bA
-    float speed -> bB
-    float tentacleSpeed -> bC
-    float rotateSpeed -> bD
-    float tx -> bE
-    float ty -> bF
-    float tz -> bG
-    50:54:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    58:60:void registerGoals() -> n
-    64:67:void registerAttributes() -> cA
+    float zBodyRotO -> bv
+    float tentacleMovement -> bw
+    float oldTentacleMovement -> bx
+    float tentacleAngle -> by
+    float oldTentacleAngle -> bz
+    float speed -> bA
+    float tentacleSpeed -> bB
+    float rotateSpeed -> bC
+    float tx -> bD
+    float ty -> bE
+    float tz -> bF
+    52:56:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    60:62:void registerGoals() -> o
+    65:66:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
     71:71:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    76:76:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    76:76:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     81:81:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    86:86:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    91:91:float getSoundVolume() -> dm
-    96:96:boolean isMovementNoisy() -> at
+    86:86:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    91:91:float getSoundVolume() -> dF
+    96:96:boolean isMovementNoisy() -> ax
     101:172:void aiStep() -> k
     176:181:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    185:187:net.minecraft.world.phys.Vec3 rotateVector(net.minecraft.world.phys.Vec3) -> f
-    191:198:void spawnInk() -> eq
-    202:203:void travel(net.minecraft.world.phys.Vec3) -> e
+    185:187:net.minecraft.world.phys.Vec3 rotateVector(net.minecraft.world.phys.Vec3) -> g
+    191:198:void spawnInk() -> eM
+    202:203:void travel(net.minecraft.world.phys.Vec3) -> f
     206:206:boolean checkSquidSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
     211:216:void handleEntityEvent(byte) -> a
     219:222:void setMovementVector(float,float,float) -> a
-    225:225:boolean hasMovementVector() -> l
-    30:30:boolean access$100(net.minecraft.world.entity.animal.Squid) -> a
-net.minecraft.world.entity.animal.Squid$1 -> aty$1:
-net.minecraft.world.entity.animal.Squid$SquidFleeGoal -> aty$a:
+    225:225:boolean hasMovementVector() -> eL
+    32:32:boolean access$100(net.minecraft.world.entity.animal.Squid) -> a
+net.minecraft.world.entity.animal.Squid$1 -> azg$1:
+net.minecraft.world.entity.animal.Squid$SquidFleeGoal -> azg$a:
     int fleeTicks -> b
     net.minecraft.world.entity.animal.Squid this$0 -> a
     256:256:void <init>(net.minecraft.world.entity.animal.Squid) -> <init>
@@ -41490,50 +45276,50 @@ net.minecraft.world.entity.animal.Squid$SquidFleeGoal -> aty$a:
     275:276:void start() -> c
     280:316:void tick() -> e
     256:256:void <init>(net.minecraft.world.entity.animal.Squid,net.minecraft.world.entity.animal.Squid$1) -> <init>
-net.minecraft.world.entity.animal.Squid$SquidRandomMovementGoal -> aty$b:
+net.minecraft.world.entity.animal.Squid$SquidRandomMovementGoal -> azg$b:
     net.minecraft.world.entity.animal.Squid squid -> b
     net.minecraft.world.entity.animal.Squid this$0 -> a
     231:233:void <init>(net.minecraft.world.entity.animal.Squid,net.minecraft.world.entity.animal.Squid) -> <init>
     237:237:boolean canUse() -> a
     242:253:void tick() -> e
-net.minecraft.world.entity.animal.TropicalFish -> atz:
+net.minecraft.world.entity.animal.TropicalFish -> azh:
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_TYPE_VARIANT -> c
     net.minecraft.resources.ResourceLocation[] BASE_TEXTURE_LOCATIONS -> d
-    net.minecraft.resources.ResourceLocation[] PATTERN_A_TEXTURE_LOCATIONS -> bw
-    net.minecraft.resources.ResourceLocation[] PATTERN_B_TEXTURE_LOCATIONS -> bx
+    net.minecraft.resources.ResourceLocation[] PATTERN_A_TEXTURE_LOCATIONS -> bv
+    net.minecraft.resources.ResourceLocation[] PATTERN_B_TEXTURE_LOCATIONS -> bw
     int[] COMMON_VARIANTS -> b
-    boolean isSchool -> by
-    125:125:int calculateVariant(net.minecraft.world.entity.animal.TropicalFish$Pattern,net.minecraft.world.item.DyeColor,net.minecraft.world.item.DyeColor) -> a
-    128:132:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    135:135:java.lang.String getPredefinedName(int) -> b
-    139:139:net.minecraft.world.item.DyeColor getBaseColor(int) -> s
-    143:143:net.minecraft.world.item.DyeColor getPatternColor(int) -> t
-    147:149:java.lang.String getFishTypeName(int) -> u
-    154:157:void defineSynchedData() -> w_
-    161:164:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    168:171:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    174:175:void setVariant(int) -> v
-    179:179:boolean isMaxGroupSizeReached(int) -> c
-    183:183:int getVariant() -> ez
-    188:192:void saveToBucketTag(net.minecraft.world.item.ItemStack) -> i
-    196:196:net.minecraft.world.item.ItemStack getBucketItemStack() -> l
-    201:201:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    206:206:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    211:211:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    216:216:net.minecraft.sounds.SoundEvent getFlopSound() -> er
-    220:220:int getBaseColorIdx(int) -> x
-    224:224:float[] getBaseColor() -> eA
-    228:228:int getPatternColorIdx(int) -> y
-    232:232:float[] getPatternColor() -> eB
-    236:236:int getBaseVariant(int) -> w
-    240:240:int getBaseVariant() -> eC
-    244:244:int getPatternVariant(int) -> z
-    248:252:net.minecraft.resources.ResourceLocation getPatternTextureLocation() -> eD
-    256:256:net.minecraft.resources.ResourceLocation getBaseTextureLocation() -> eE
-    262:299:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    27:81:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.TropicalFish$1 -> atz$1:
-net.minecraft.world.entity.animal.TropicalFish$Pattern -> atz$a:
+    boolean isSchool -> bx
+    126:126:int calculateVariant(net.minecraft.world.entity.animal.TropicalFish$Pattern,net.minecraft.world.item.DyeColor,net.minecraft.world.item.DyeColor) -> a
+    129:133:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    136:136:java.lang.String getPredefinedName(int) -> b
+    140:140:net.minecraft.world.item.DyeColor getBaseColor(int) -> s
+    144:144:net.minecraft.world.item.DyeColor getPatternColor(int) -> t
+    148:150:java.lang.String getFishTypeName(int) -> u
+    155:158:void defineSynchedData() -> e
+    162:165:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    169:172:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    175:176:void setVariant(int) -> v
+    180:180:boolean isMaxGroupSizeReached(int) -> c
+    184:184:int getVariant() -> eV
+    189:193:void saveToBucketTag(net.minecraft.world.item.ItemStack) -> k
+    197:197:net.minecraft.world.item.ItemStack getBucketItemStack() -> eL
+    202:202:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    207:207:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    212:212:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    217:217:net.minecraft.sounds.SoundEvent getFlopSound() -> eN
+    221:221:int getBaseColorIdx(int) -> x
+    225:225:float[] getBaseColor() -> eW
+    229:229:int getPatternColorIdx(int) -> y
+    233:233:float[] getPatternColor() -> eX
+    237:237:int getBaseVariant(int) -> w
+    241:241:int getBaseVariant() -> eY
+    245:245:int getPatternVariant(int) -> z
+    249:253:net.minecraft.resources.ResourceLocation getPatternTextureLocation() -> eZ
+    257:257:net.minecraft.resources.ResourceLocation getBaseTextureLocation() -> fa
+    263:300:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    28:82:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.TropicalFish$1 -> azh$1:
+net.minecraft.world.entity.animal.TropicalFish$Pattern -> azh$a:
     net.minecraft.world.entity.animal.TropicalFish$Pattern KOB -> a
     net.minecraft.world.entity.animal.TropicalFish$Pattern SUNSTREAK -> b
     net.minecraft.world.entity.animal.TropicalFish$Pattern SNOOPER -> c
@@ -41550,98 +45336,99 @@ net.minecraft.world.entity.animal.TropicalFish$Pattern -> atz$a:
     int index -> n
     net.minecraft.world.entity.animal.TropicalFish$Pattern[] VALUES -> o
     net.minecraft.world.entity.animal.TropicalFish$Pattern[] $VALUES -> p
-    84:84:net.minecraft.world.entity.animal.TropicalFish$Pattern[] values() -> values
-    84:84:net.minecraft.world.entity.animal.TropicalFish$Pattern valueOf(java.lang.String) -> valueOf
-    102:105:void <init>(java.lang.String,int,int,int) -> <init>
-    108:108:int getBase() -> a
-    112:112:int getIndex() -> b
-    116:116:java.lang.String getPatternName(int,int) -> a
-    120:120:java.lang.String getName() -> c
-    84:100:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.TropicalFish$TropicalFishGroupData -> atz$b:
+    85:85:net.minecraft.world.entity.animal.TropicalFish$Pattern[] values() -> values
+    85:85:net.minecraft.world.entity.animal.TropicalFish$Pattern valueOf(java.lang.String) -> valueOf
+    103:106:void <init>(java.lang.String,int,int,int) -> <init>
+    109:109:int getBase() -> a
+    113:113:int getIndex() -> b
+    117:117:java.lang.String getPatternName(int,int) -> a
+    121:121:java.lang.String getName() -> c
+    85:101:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.TropicalFish$TropicalFishGroupData -> azh$b:
     int base -> b
     int pattern -> c
     int baseColor -> d
     int patternColor -> e
-    309:314:void <init>(net.minecraft.world.entity.animal.TropicalFish,int,int,int,int) -> <init>
-    302:302:int access$000(net.minecraft.world.entity.animal.TropicalFish$TropicalFishGroupData) -> a
-    302:302:int access$100(net.minecraft.world.entity.animal.TropicalFish$TropicalFishGroupData) -> b
-    302:302:int access$200(net.minecraft.world.entity.animal.TropicalFish$TropicalFishGroupData) -> c
-    302:302:int access$300(net.minecraft.world.entity.animal.TropicalFish$TropicalFishGroupData) -> d
-    302:302:void <init>(net.minecraft.world.entity.animal.TropicalFish,int,int,int,int,net.minecraft.world.entity.animal.TropicalFish$1) -> <init>
-net.minecraft.world.entity.animal.Turtle -> aua:
-    net.minecraft.network.syncher.EntityDataAccessor HOME_POS -> bx
-    net.minecraft.network.syncher.EntityDataAccessor HAS_EGG -> by
-    net.minecraft.network.syncher.EntityDataAccessor LAYING_EGG -> bz
-    net.minecraft.network.syncher.EntityDataAccessor TRAVEL_POS -> bA
-    net.minecraft.network.syncher.EntityDataAccessor GOING_HOME -> bB
-    net.minecraft.network.syncher.EntityDataAccessor TRAVELLING -> bC
-    int layEggCounter -> bD
-    java.util.function.Predicate BABY_ON_LAND_SELECTOR -> bw
-    78:83:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    86:87:void setHomePos(net.minecraft.core.BlockPos) -> g
-    90:90:net.minecraft.core.BlockPos getHomePos() -> es
-    94:95:void setTravelPos(net.minecraft.core.BlockPos) -> h
-    98:98:net.minecraft.core.BlockPos getTravelPos() -> et
-    102:102:boolean hasEgg() -> eq
-    106:107:void setHasEgg(boolean) -> r
-    110:110:boolean isLayingEgg() -> er
-    114:116:void setLayingEgg(boolean) -> s
-    119:119:boolean isGoingHome() -> eu
-    123:124:void setGoingHome(boolean) -> t
-    127:127:boolean isTravelling() -> ez
-    131:132:void setTravelling(boolean) -> u
-    136:143:void defineSynchedData() -> w_
-    147:157:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    161:173:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    178:180:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    184:186:boolean checkTurtleSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
-    191:200:void registerGoals() -> n
-    204:208:void registerAttributes() -> cA
-    212:212:boolean isPushedByWater() -> bM
-    218:218:boolean canBreatheUnderwater() -> cB
-    223:223:net.minecraft.world.entity.MobType getMobType() -> di
-    228:228:int getAmbientSoundInterval() -> A
-    234:238:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    310:315:void <init>(net.minecraft.world.entity.animal.TropicalFish,int,int,int,int) -> <init>
+    303:303:int access$000(net.minecraft.world.entity.animal.TropicalFish$TropicalFishGroupData) -> a
+    303:303:int access$100(net.minecraft.world.entity.animal.TropicalFish$TropicalFishGroupData) -> b
+    303:303:int access$200(net.minecraft.world.entity.animal.TropicalFish$TropicalFishGroupData) -> c
+    303:303:int access$300(net.minecraft.world.entity.animal.TropicalFish$TropicalFishGroupData) -> d
+    303:303:void <init>(net.minecraft.world.entity.animal.TropicalFish,int,int,int,int,net.minecraft.world.entity.animal.TropicalFish$1) -> <init>
+net.minecraft.world.entity.animal.Turtle -> azi:
+    net.minecraft.network.syncher.EntityDataAccessor HOME_POS -> bw
+    net.minecraft.network.syncher.EntityDataAccessor HAS_EGG -> bx
+    net.minecraft.network.syncher.EntityDataAccessor LAYING_EGG -> by
+    net.minecraft.network.syncher.EntityDataAccessor TRAVEL_POS -> bz
+    net.minecraft.network.syncher.EntityDataAccessor GOING_HOME -> bA
+    net.minecraft.network.syncher.EntityDataAccessor TRAVELLING -> bB
+    int layEggCounter -> bC
+    java.util.function.Predicate BABY_ON_LAND_SELECTOR -> bv
+    80:85:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    88:89:void setHomePos(net.minecraft.core.BlockPos) -> g
+    92:92:net.minecraft.core.BlockPos getHomePos() -> eO
+    96:97:void setTravelPos(net.minecraft.core.BlockPos) -> h
+    100:100:net.minecraft.core.BlockPos getTravelPos() -> eP
+    104:104:boolean hasEgg() -> eL
+    108:109:void setHasEgg(boolean) -> t
+    112:112:boolean isLayingEgg() -> eM
+    116:118:void setLayingEgg(boolean) -> u
+    121:121:boolean isGoingHome() -> eV
+    125:126:void setGoingHome(boolean) -> v
+    129:129:boolean isTravelling() -> eW
+    133:134:void setTravelling(boolean) -> w
+    138:145:void defineSynchedData() -> e
+    149:159:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    163:175:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    180:182:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    186:188:boolean checkTurtleSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
+    193:202:void registerGoals() -> o
+    205:207:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eN
+    212:212:boolean isPushedByFluid() -> bU
+    218:218:boolean canBreatheUnderwater() -> cL
+    223:223:net.minecraft.world.entity.MobType getMobType() -> dB
+    228:228:int getAmbientSoundInterval() -> D
+    234:238:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     243:244:void playSwimSound(float) -> d
-    248:248:net.minecraft.sounds.SoundEvent getSwimSound() -> am
+    248:248:net.minecraft.sounds.SoundEvent getSwimSound() -> aq
     254:257:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    263:266:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    263:266:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     271:274:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    278:278:boolean canFallInLove() -> ev
-    283:283:float nextStep() -> ak
-    288:288:float getScale() -> cC
+    278:278:boolean canFallInLove() -> eQ
+    283:283:float nextStep() -> ao
+    288:288:float getScale() -> cR
     293:293:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
     299:299:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    304:304:boolean isFood(net.minecraft.world.item.ItemStack) -> i
+    304:304:boolean isFood(net.minecraft.world.item.ItemStack) -> k
     309:317:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
     322:330:void aiStep() -> k
-    334:340:void ageBoundaryReached() -> l
-    344:355:void travel(net.minecraft.world.phys.Vec3) -> e
+    334:340:void ageBoundaryReached() -> m
+    344:355:void travel(net.minecraft.world.phys.Vec3) -> f
     359:359:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
-    364:365:void thunderHit(net.minecraft.world.entity.global.LightningBolt) -> a
-    75:75:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> i
-    65:65:boolean access$200(net.minecraft.world.entity.animal.Turtle) -> a
-    65:65:java.util.Random access$300(net.minecraft.world.entity.animal.Turtle) -> b
-    65:65:void access$400(net.minecraft.world.entity.animal.Turtle,net.minecraft.core.BlockPos) -> a
-    65:65:void access$500(net.minecraft.world.entity.animal.Turtle,boolean) -> a
-    65:65:net.minecraft.core.BlockPos access$600(net.minecraft.world.entity.animal.Turtle) -> c
-    65:65:net.minecraft.core.BlockPos access$700(net.minecraft.world.entity.animal.Turtle) -> d
-    65:65:void access$800(net.minecraft.world.entity.animal.Turtle,boolean) -> b
-    65:65:void access$900(net.minecraft.world.entity.animal.Turtle,boolean) -> c
-    65:65:int access$1000(net.minecraft.world.entity.animal.Turtle) -> e
-    65:65:void access$1100(net.minecraft.world.entity.animal.Turtle,boolean) -> d
-    65:65:java.util.Random access$1200(net.minecraft.world.entity.animal.Turtle) -> f
-    65:65:int access$1008(net.minecraft.world.entity.animal.Turtle) -> g
-    65:65:boolean access$1300(net.minecraft.world.entity.animal.Turtle) -> h
-    66:75:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Turtle$1 -> aua$1:
-net.minecraft.world.entity.animal.Turtle$TurtleBreedGoal -> aua$a:
+    364:365:void thunderHit(net.minecraft.world.entity.LightningBolt) -> a
+    77:77:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> j
+    67:67:boolean access$200(net.minecraft.world.entity.animal.Turtle) -> a
+    67:67:java.util.Random access$300(net.minecraft.world.entity.animal.Turtle) -> b
+    67:67:void access$400(net.minecraft.world.entity.animal.Turtle,net.minecraft.core.BlockPos) -> a
+    67:67:void access$500(net.minecraft.world.entity.animal.Turtle,boolean) -> a
+    67:67:net.minecraft.core.BlockPos access$600(net.minecraft.world.entity.animal.Turtle) -> c
+    67:67:net.minecraft.core.BlockPos access$700(net.minecraft.world.entity.animal.Turtle) -> d
+    67:67:void access$800(net.minecraft.world.entity.animal.Turtle,boolean) -> b
+    67:67:void access$900(net.minecraft.world.entity.animal.Turtle,boolean) -> c
+    67:67:int access$1000(net.minecraft.world.entity.animal.Turtle) -> e
+    67:67:void access$1100(net.minecraft.world.entity.animal.Turtle,boolean) -> d
+    67:67:java.util.Random access$1200(net.minecraft.world.entity.animal.Turtle) -> f
+    67:67:int access$1008(net.minecraft.world.entity.animal.Turtle) -> g
+    67:67:boolean access$1300(net.minecraft.world.entity.animal.Turtle) -> h
+    67:67:boolean access$1400(net.minecraft.world.entity.animal.Turtle) -> i
+    68:77:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Turtle$1 -> azi$1:
+net.minecraft.world.entity.animal.Turtle$TurtleBreedGoal -> azi$a:
     net.minecraft.world.entity.animal.Turtle turtle -> d
     601:603:void <init>(net.minecraft.world.entity.animal.Turtle,double) -> <init>
     607:607:boolean canUse() -> a
     612:630:void breed() -> g
-net.minecraft.world.entity.animal.Turtle$TurtleGoHomeGoal -> aua$b:
+net.minecraft.world.entity.animal.Turtle$TurtleGoHomeGoal -> azi$b:
     net.minecraft.world.entity.animal.Turtle turtle -> a
     double speedModifier -> b
     boolean stuck -> c
@@ -41652,40 +45439,40 @@ net.minecraft.world.entity.animal.Turtle$TurtleGoHomeGoal -> aua$b:
     502:503:void stop() -> d
     507:507:boolean canContinueToUse() -> b
     512:537:void tick() -> e
-net.minecraft.world.entity.animal.Turtle$TurtleGoToWaterGoal -> aua$c:
+net.minecraft.world.entity.animal.Turtle$TurtleGoToWaterGoal -> azi$c:
     net.minecraft.world.entity.animal.Turtle turtle -> g
-    711:714:void <init>(net.minecraft.world.entity.animal.Turtle,double) -> <init>
-    718:718:boolean canContinueToUse() -> b
-    723:731:boolean canUse() -> a
-    736:736:boolean shouldRecalculatePath() -> j
-    741:742:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    705:705:void <init>(net.minecraft.world.entity.animal.Turtle,double,net.minecraft.world.entity.animal.Turtle$1) -> <init>
-net.minecraft.world.entity.animal.Turtle$TurtleLayEggGoal -> aua$d:
+    710:713:void <init>(net.minecraft.world.entity.animal.Turtle,double) -> <init>
+    717:717:boolean canContinueToUse() -> b
+    722:730:boolean canUse() -> a
+    735:735:boolean shouldRecalculatePath() -> j
+    740:740:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    704:704:void <init>(net.minecraft.world.entity.animal.Turtle,double,net.minecraft.world.entity.animal.Turtle$1) -> <init>
+net.minecraft.world.entity.animal.Turtle$TurtleLayEggGoal -> azi$d:
     net.minecraft.world.entity.animal.Turtle turtle -> g
     637:639:void <init>(net.minecraft.world.entity.animal.Turtle,double) -> <init>
     643:646:boolean canUse() -> a
     651:651:boolean canContinueToUse() -> b
     656:674:void tick() -> e
-    678:683:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.animal.Turtle$TurtleMoveControl -> aua$e:
+    678:682:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.animal.Turtle$TurtleMoveControl -> azi$e:
     net.minecraft.world.entity.animal.Turtle turtle -> i
-    750:752:void <init>(net.minecraft.world.entity.animal.Turtle) -> <init>
-    755:769:void updateSpeed() -> g
-    773:794:void tick() -> a
-net.minecraft.world.entity.animal.Turtle$TurtlePanicGoal -> aua$f:
+    748:750:void <init>(net.minecraft.world.entity.animal.Turtle) -> <init>
+    753:767:void updateSpeed() -> g
+    771:792:void tick() -> a
+net.minecraft.world.entity.animal.Turtle$TurtlePanicGoal -> azi$f:
     369:370:void <init>(net.minecraft.world.entity.animal.Turtle,double) -> <init>
     374:387:boolean canUse() -> a
-net.minecraft.world.entity.animal.Turtle$TurtlePathNavigation -> aua$g:
-    799:800:void <init>(net.minecraft.world.entity.animal.Turtle,net.minecraft.world.level.Level) -> <init>
-    804:804:boolean canUpdatePath() -> a
-    810:811:net.minecraft.world.level.pathfinder.PathFinder createPathFinder(int) -> a
-    816:823:boolean isStableDestination(net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.animal.Turtle$TurtleRandomStrollGoal -> aua$h:
+net.minecraft.world.entity.animal.Turtle$TurtlePathNavigation -> azi$g:
+    797:798:void <init>(net.minecraft.world.entity.animal.Turtle,net.minecraft.world.level.Level) -> <init>
+    802:802:boolean canUpdatePath() -> a
+    808:809:net.minecraft.world.level.pathfinder.PathFinder createPathFinder(int) -> a
+    814:821:boolean isStableDestination(net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.animal.Turtle$TurtleRandomStrollGoal -> azi$h:
     net.minecraft.world.entity.animal.Turtle turtle -> h
-    691:693:void <init>(net.minecraft.world.entity.animal.Turtle,double,int) -> <init>
-    697:701:boolean canUse() -> a
-    687:687:void <init>(net.minecraft.world.entity.animal.Turtle,double,int,net.minecraft.world.entity.animal.Turtle$1) -> <init>
-net.minecraft.world.entity.animal.Turtle$TurtleTemptGoal -> aua$i:
+    690:692:void <init>(net.minecraft.world.entity.animal.Turtle,double,int) -> <init>
+    696:700:boolean canUse() -> a
+    686:686:void <init>(net.minecraft.world.entity.animal.Turtle,double,int,net.minecraft.world.entity.animal.Turtle$1) -> <init>
+net.minecraft.world.entity.animal.Turtle$TurtleTemptGoal -> azi$i:
     net.minecraft.world.entity.ai.targeting.TargetingConditions TEMPT_TARGETING -> a
     net.minecraft.world.entity.animal.Turtle turtle -> b
     double speedModifier -> c
@@ -41699,7 +45486,7 @@ net.minecraft.world.entity.animal.Turtle$TurtleTemptGoal -> aua$i:
     581:584:void stop() -> d
     588:594:void tick() -> e
     541:541:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Turtle$TurtleTravelGoal -> aua$j:
+net.minecraft.world.entity.animal.Turtle$TurtleTravelGoal -> azi$j:
     net.minecraft.world.entity.animal.Turtle turtle -> a
     double speedModifier -> b
     boolean stuck -> c
@@ -41709,392 +45496,420 @@ net.minecraft.world.entity.animal.Turtle$TurtleTravelGoal -> aua$j:
     426:450:void tick() -> e
     454:454:boolean canContinueToUse() -> b
     459:461:void stop() -> d
-net.minecraft.world.entity.animal.WaterAnimal -> aub:
+net.minecraft.world.entity.animal.WaterAnimal -> azj:
     14:17:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    21:21:boolean canBreatheUnderwater() -> cB
-    26:26:net.minecraft.world.entity.MobType getMobType() -> di
+    21:21:boolean canBreatheUnderwater() -> cL
+    26:26:net.minecraft.world.entity.MobType getMobType() -> dB
     31:31:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
-    36:36:int getAmbientSoundInterval() -> A
+    36:36:int getAmbientSoundInterval() -> D
     41:41:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
     45:54:void handleAirSupply(int) -> a
-    58:61:void baseTick() -> aa
-    66:66:boolean isPushedByWater() -> bM
+    58:61:void baseTick() -> ad
+    66:66:boolean isPushedByFluid() -> bU
     71:71:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
-net.minecraft.world.entity.animal.Wolf -> auc:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_INTERESTED_ID -> bA
-    net.minecraft.network.syncher.EntityDataAccessor DATA_COLLAR_COLOR -> bB
-    java.util.function.Predicate PREY_SELECTOR -> bz
-    float interestedAngle -> bC
-    float interestedAngleO -> bD
-    boolean isWet -> bE
-    boolean isShaking -> bF
-    float shakeAnim -> bG
-    float shakeAnimO -> bH
-    81:84:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    88:108:void registerGoals() -> n
-    112:123:void registerAttributes() -> cA
-    127:133:void setTarget(net.minecraft.world.entity.LivingEntity) -> h
-    137:140:void defineSynchedData() -> w_
-    144:145:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    149:153:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    157:163:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    167:176:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    181:181:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    186:186:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    191:191:float getSoundVolume() -> dm
-    196:207:void aiStep() -> k
-    211:257:void tick() -> h
-    261:267:void die(net.minecraft.world.damagesource.DamageSource) -> a
-    270:270:boolean isWet() -> ez
-    274:274:float getWetShade(float) -> v
-    278:284:float getBodyRollAngle(float,float) -> g
-    288:288:float getHeadRollAngle(float) -> w
-    293:293:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    298:301:int getMaxHeadXRot() -> dU
-    306:319:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    324:328:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    333:343:void setTame(boolean) -> s
-    347:412:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    417:424:void handleEntityEvent(byte) -> a
-    427:432:float getTailAngle() -> eA
-    437:438:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    443:443:int getMaxSpawnClusterSize() -> dX
-    447:447:boolean isAngry() -> eB
-    451:457:void setAngry(boolean) -> u
-    460:460:net.minecraft.world.item.DyeColor getCollarColor() -> eC
+net.minecraft.world.entity.animal.Wolf -> azk:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_INTERESTED_ID -> by
+    net.minecraft.network.syncher.EntityDataAccessor DATA_COLLAR_COLOR -> bz
+    net.minecraft.network.syncher.EntityDataAccessor DATA_REMAINING_ANGER_TIME -> bA
+    java.util.function.Predicate PREY_SELECTOR -> bx
+    float interestedAngle -> bB
+    float interestedAngleO -> bC
+    boolean isWet -> bD
+    boolean isShaking -> bE
+    float shakeAnim -> bF
+    float shakeAnimO -> bG
+    net.minecraft.util.IntRange PERSISTENT_ANGER_TIME -> bH
+    java.util.UUID persistentAngerTarget -> bI
+    92:95:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    99:119:void registerGoals() -> o
+    122:125:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eV
+    130:134:void defineSynchedData() -> e
+    138:139:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    143:147:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    151:158:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    162:171:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    176:176:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    181:181:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    186:186:float getSoundVolume() -> dF
+    191:202:void aiStep() -> k
+    206:252:void tick() -> j
+    256:262:void die(net.minecraft.world.damagesource.DamageSource) -> a
+    265:265:boolean isWet() -> eW
+    269:269:float getWetShade(float) -> u
+    273:279:float getBodyRollAngle(float,float) -> g
+    283:283:float getHeadRollAngle(float) -> v
+    288:288:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    293:296:int getMaxHeadXRot() -> eo
+    301:312:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    317:321:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    326:336:void setTame(boolean) -> u
+    340:399:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    404:411:void handleEntityEvent(byte) -> a
+    414:419:float getTailAngle() -> eX
+    424:425:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    430:430:int getMaxSpawnClusterSize() -> er
+    435:435:int getRemainingPersistentAngerTime() -> F_
+    440:441:void setRemainingPersistentAngerTime(int) -> a_
+    445:446:void startPersistentAngerTimer() -> H_
+    451:451:java.util.UUID getPersistentAngerTarget() -> G_
+    456:457:void setPersistentAngerTarget(java.util.UUID) -> a
+    460:460:net.minecraft.world.item.DyeColor getCollarColor() -> eY
     464:465:void setCollarColor(net.minecraft.world.item.DyeColor) -> a
     469:475:net.minecraft.world.entity.animal.Wolf getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    479:480:void setIsInterested(boolean) -> v
+    479:480:void setIsInterested(boolean) -> x
     484:502:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
-    506:506:boolean isInterested() -> eD
+    506:506:boolean isInterested() -> eZ
     512:529:boolean wantsToAttack(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
     534:534:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
-    61:61:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    66:67:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> j
-    61:61:java.util.Random access$000(net.minecraft.world.entity.animal.Wolf) -> a
-    62:65:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.Wolf$WolfAvoidEntityGoal -> auc$a:
+    539:539:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    68:68:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    74:75:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> k
+    68:68:java.util.Random access$000(net.minecraft.world.entity.animal.Wolf) -> a
+    69:88:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.Wolf$WolfAvoidEntityGoal -> azk$a:
     net.minecraft.world.entity.animal.Wolf wolf -> j
     net.minecraft.world.entity.animal.Wolf this$0 -> i
-    543:546:void <init>(net.minecraft.world.entity.animal.Wolf,net.minecraft.world.entity.animal.Wolf,java.lang.Class,float,double,double) -> <init>
-    550:556:boolean canUse() -> a
-    560:560:boolean avoidLlama(net.minecraft.world.entity.animal.horse.Llama) -> a
-    565:567:void start() -> c
-    571:573:void tick() -> e
-net.minecraft.world.entity.animal.horse.AbstractChestedHorse -> aud:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_CHEST -> bF
+    548:551:void <init>(net.minecraft.world.entity.animal.Wolf,net.minecraft.world.entity.animal.Wolf,java.lang.Class,float,double,double) -> <init>
+    555:561:boolean canUse() -> a
+    565:565:boolean avoidLlama(net.minecraft.world.entity.animal.horse.Llama) -> a
+    570:572:void start() -> c
+    576:578:void tick() -> e
+net.minecraft.world.entity.animal.horse.AbstractChestedHorse -> azl:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_CHEST -> bD
     26:29:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    33:36:void defineSynchedData() -> w_
-    40:45:void registerAttributes() -> cA
-    48:48:boolean hasChest() -> eq
-    52:53:void setChest(boolean) -> r
-    57:60:int getInventorySize() -> er
-    65:65:double getRideHeight() -> aS
-    70:72:net.minecraft.sounds.SoundEvent getAngrySound() -> es
-    77:84:void dropEquipment() -> cU
-    88:108:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    112:131:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    135:147:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
-    152:206:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    210:211:void playChestEquipsSound() -> et
-    214:214:int getInventoryColumns() -> eu
+    33:34:void randomizeAttributes() -> eL
+    38:41:void defineSynchedData() -> e
+    44:46:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createBaseChestedHorseAttributes() -> eM
+    50:50:boolean hasChest() -> eN
+    54:55:void setChest(boolean) -> t
+    59:62:int getInventorySize() -> eO
+    67:67:double getPassengersRidingOffset() -> aY
+    72:79:void dropEquipment() -> dm
+    83:103:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    107:126:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    130:142:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
+    147:191:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    195:196:void playChestEquipsSound() -> eP
+    199:199:int getInventoryColumns() -> eV
     22:22:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.horse.AbstractHorse -> aue:
-    java.util.function.Predicate PARENT_HORSE_SELECTOR -> bF
-    net.minecraft.world.entity.ai.targeting.TargetingConditions MOMMY_TARGETING -> bG
-    net.minecraft.world.entity.ai.attributes.Attribute JUMP_STRENGTH -> bw
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_FLAGS -> bH
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_OWNER_UUID -> bI
-    int eatingCounter -> bJ
-    int mouthCounter -> bK
-    int standCounter -> bL
-    int tailCounter -> bx
-    int sprintCounter -> by
-    boolean isJumping -> bz
-    net.minecraft.world.SimpleContainer inventory -> bA
-    int temper -> bB
-    float playerJumpPendingScale -> bC
-    boolean allowStandSliding -> bM
-    float eatAnim -> bN
-    float eatAnimO -> bO
-    float standAnim -> bP
-    float standAnimO -> bQ
-    float mouthAnim -> bR
-    float mouthAnimO -> bS
-    boolean canGallop -> bD
-    int gallopSoundCounter -> bE
-    111:120:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    124:133:void registerGoals() -> n
-    136:137:void addBehaviourGoals() -> ez
-    141:144:void defineSynchedData() -> w_
-    147:147:boolean getFlag(int) -> t
-    151:157:void setFlag(int,boolean) -> d
-    160:160:boolean isTamed() -> eA
-    165:165:java.util.UUID getOwnerUUID() -> eB
-    169:170:void setOwnerUUID(java.util.UUID) -> b
-    173:173:boolean isJumping() -> eC
-    177:178:void setTamed(boolean) -> s
-    181:182:void setIsJumping(boolean) -> t
-    186:186:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
-    191:194:void onLeashDistance(float) -> u
-    197:197:boolean isEating() -> eD
-    201:201:boolean isStanding() -> eE
-    205:205:boolean isBred() -> eF
-    209:210:void setBred(boolean) -> u
-    213:214:void setSaddled(boolean) -> v
-    217:217:int getTemper() -> eG
-    221:222:void setTemper(int) -> u
-    225:228:int modifyTemper(int) -> v
-    233:238:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    243:243:boolean isPushable() -> aL
-    247:251:void eating() -> eq
-    255:273:boolean causeFallDamage(float,float) -> b
-    278:278:int calculateFallDamage(float,float) -> e
-    282:282:int getInventorySize() -> er
-    286:301:void createInventory() -> eH
-    304:309:void updateEquipment() -> eI
-    313:318:void containerChanged(net.minecraft.world.Container) -> a
-    321:321:double getCustomJump() -> eJ
-    327:327:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    333:336:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    342:345:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    349:349:boolean canBeSaddled() -> eK
-    353:353:boolean isSaddled() -> eL
-    358:359:net.minecraft.sounds.SoundEvent getAngrySound() -> es
-    364:386:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    389:390:void playGallopSound(net.minecraft.world.level.block.SoundType) -> a
-    394:400:void registerAttributes() -> cA
-    404:404:int getMaxSpawnClusterSize() -> dX
-    408:408:int getMaxTemper() -> eM
-    413:413:float getSoundVolume() -> dm
-    418:418:int getAmbientSoundInterval() -> A
-    422:425:void openInventory(net.minecraft.world.entity.player.Player) -> e
-    428:486:boolean handleEating(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> b
-    490:497:void doPlayerRide(net.minecraft.world.entity.player.Player) -> g
-    501:501:boolean isImmobile() -> do
-    507:507:boolean isFood(net.minecraft.world.item.ItemStack) -> i
-    511:512:void moveTail() -> et
-    516:527:void dropEquipment() -> cU
-    531:559:void aiStep() -> k
-    562:568:void followMommy() -> eN
-    571:571:boolean canEatGrass() -> eO
-    576:643:void tick() -> h
-    646:650:void openMouth() -> eu
-    653:654:void setEating(boolean) -> w
-    657:661:void setStanding(boolean) -> x
-    664:668:void stand() -> eW
-    671:676:void makeMad() -> eP
-    679:685:boolean tameWithName(net.minecraft.world.entity.player.Player) -> h
-    690:777:void travel(net.minecraft.world.phys.Vec3) -> e
-    780:781:void playJumpSound() -> eQ
-    785:799:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    803:832:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    836:836:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
-    840:840:boolean canParent() -> eR
-    846:846:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    851:859:void setOffspringAttributes(net.minecraft.world.entity.AgableMob,net.minecraft.world.entity.animal.horse.AbstractHorse) -> a
-    863:863:boolean canBeControlledByRider() -> dY
-    867:867:float getEatAnim(float) -> v
-    871:871:float getStandAnim(float) -> w
-    875:875:float getMouthAnim(float) -> x
-    880:896:void onPlayerJump(int) -> a_
-    900:900:boolean canJump() -> G_
-    905:905:float getJumpRidingScale() -> H_
-    910:911:void setJumpRidingScale(float) -> a_
-    915:917:void handleStartJump(int) -> b
-    921:921:void handleStopJump() -> c
-    924:932:void spawnTamingParticles(boolean) -> y
-    936:943:void handleEntityEvent(byte) -> a
-    947:965:void positionRider(net.minecraft.world.entity.Entity) -> k
-    969:969:float generateRandomMaxHealth() -> eS
-    973:973:double generateRandomJumpStrength() -> eT
-    977:977:double generateRandomSpeed() -> eU
-    982:982:boolean onLadder() -> y_
-    987:987:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    991:991:boolean wearsArmor() -> eV
-    995:995:boolean isArmor(net.minecraft.world.item.ItemStack) -> j
-    1000:1017:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
-    1023:1026:net.minecraft.world.entity.Entity getControllingPassenger() -> cd
-    1032:1037:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    74:74:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> i
-    74:80:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.horse.Donkey -> auf:
-    13:14:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    18:19:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    24:25:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    30:31:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    36:44:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
-    49:54:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-net.minecraft.world.entity.animal.horse.Horse -> aug:
-    java.util.UUID ARMOR_MODIFIER_UUID -> bF
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_TYPE_VARIANT -> bG
-    java.lang.String[] VARIANT_TEXTURES -> bH
-    java.lang.String[] VARIANT_HASHES -> bI
-    java.lang.String[] MARKING_TEXTURES -> bJ
-    java.lang.String[] MARKING_HASHES -> bK
-    java.lang.String layerTextureHashName -> bL
-    java.lang.String[] layerTextureLayers -> bM
-    67:71:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    75:78:void defineSynchedData() -> w_
-    82:89:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    92:92:net.minecraft.world.item.ItemStack getArmor() -> eq
-    96:98:void setArmor(net.minecraft.world.item.ItemStack) -> k
-    102:114:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    117:119:void setVariant(int) -> w
-    122:122:int getVariant() -> et
-    126:127:void clearLayeredTextureInfo() -> eX
-    130:139:void rebuildLayeredTextureInfo() -> eY
-    142:145:java.lang.String getLayeredTextureHashName() -> eu
-    149:152:java.lang.String[] getLayeredTextureLayers() -> eW
-    157:162:void updateEquipment() -> eI
-    165:176:void setArmorEquipment(net.minecraft.world.item.ItemStack) -> l
-    180:188:void containerChanged(net.minecraft.world.Container) -> a
-    192:196:void playGallopSound(net.minecraft.world.level.block.SoundType) -> a
-    200:205:void registerAttributes() -> cA
-    209:216:void tick() -> h
-    220:221:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    226:227:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    232:233:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    238:239:net.minecraft.sounds.SoundEvent getAngrySound() -> es
-    244:291:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    296:304:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
-    310:339:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    344:344:boolean wearsArmor() -> eV
-    349:349:boolean isArmor(net.minecraft.world.item.ItemStack) -> j
-    356:364:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    35:61:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.horse.Horse$HorseGroupData -> aug$a:
+net.minecraft.world.entity.animal.horse.AbstractHorse -> azm:
+    java.util.function.Predicate PARENT_HORSE_SELECTOR -> bD
+    net.minecraft.world.entity.ai.targeting.TargetingConditions MOMMY_TARGETING -> bE
+    net.minecraft.world.item.crafting.Ingredient FOOD_ITEMS -> bF
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_FLAGS -> bG
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_OWNER_UUID -> bH
+    int eatingCounter -> bI
+    int mouthCounter -> bJ
+    int standCounter -> bK
+    int tailCounter -> bv
+    int sprintCounter -> bw
+    boolean isJumping -> bx
+    net.minecraft.world.SimpleContainer inventory -> by
+    int temper -> bz
+    float playerJumpPendingScale -> bA
+    boolean allowStandSliding -> bL
+    float eatAnim -> bM
+    float eatAnimO -> bN
+    float standAnim -> bO
+    float standAnimO -> bP
+    float mouthAnim -> bQ
+    float mouthAnimO -> bR
+    boolean canGallop -> bB
+    int gallopSoundCounter -> bC
+    117:126:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    130:139:void registerGoals() -> o
+    142:143:void addBehaviourGoals() -> eW
+    147:150:void defineSynchedData() -> e
+    153:153:boolean getFlag(int) -> t
+    157:163:void setFlag(int,boolean) -> d
+    166:166:boolean isTamed() -> eX
+    171:171:java.util.UUID getOwnerUUID() -> eY
+    175:176:void setOwnerUUID(java.util.UUID) -> b
+    179:179:boolean isJumping() -> eZ
+    183:184:void setTamed(boolean) -> u
+    187:188:void setIsJumping(boolean) -> v
+    192:195:void onLeashDistance(float) -> t
+    198:198:boolean isEating() -> fa
+    202:202:boolean isStanding() -> fb
+    206:206:boolean isBred() -> fc
+    210:211:void setBred(boolean) -> w
+    215:215:boolean isSaddleable() -> M_
+    220:224:void equipSaddle(net.minecraft.sounds.SoundSource) -> a
+    228:228:boolean isSaddled() -> N_
+    232:232:int getTemper() -> fd
+    236:237:void setTemper(int) -> u
+    240:243:int modifyTemper(int) -> v
+    248:248:boolean isPushable() -> aR
+    252:259:void eating() -> eM
+    263:281:boolean causeFallDamage(float,float) -> b
+    286:286:int calculateFallDamage(float,float) -> e
+    290:290:int getInventorySize() -> eO
+    294:309:void createInventory() -> fe
+    312:317:void updateContainerEquipment() -> ff
+    321:326:void containerChanged(net.minecraft.world.Container) -> a
+    329:329:double getCustomJump() -> fg
+    334:334:net.minecraft.sounds.SoundEvent getEatingSound() -> fh
+    340:340:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    346:349:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    355:358:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    363:364:net.minecraft.sounds.SoundEvent getAngrySound() -> fi
+    369:391:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    394:395:void playGallopSound(net.minecraft.world.level.block.SoundType) -> a
+    398:401:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createBaseHorseAttributes() -> fj
+    406:406:int getMaxSpawnClusterSize() -> er
+    410:410:int getMaxTemper() -> fk
+    415:415:float getSoundVolume() -> dF
+    420:420:int getAmbientSoundInterval() -> D
+    424:427:void openInventory(net.minecraft.world.entity.player.Player) -> f
+    431:438:net.minecraft.world.InteractionResult fedFood(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> b
+    442:500:boolean handleEating(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> c
+    504:511:void doPlayerRide(net.minecraft.world.entity.player.Player) -> h
+    515:515:boolean isImmobile() -> dH
+    522:522:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    526:527:void moveTail() -> eN
+    531:542:void dropEquipment() -> dm
+    546:574:void aiStep() -> k
+    577:583:void followMommy() -> fl
+    586:586:boolean canEatGrass() -> fm
+    591:658:void tick() -> j
+    661:665:void openMouth() -> eP
+    668:669:void setEating(boolean) -> x
+    672:676:void setStanding(boolean) -> y
+    679:683:void stand() -> eV
+    686:693:void makeMad() -> fn
+    696:702:boolean tameWithName(net.minecraft.world.entity.player.Player) -> i
+    707:784:void travel(net.minecraft.world.phys.Vec3) -> f
+    787:788:void playJumpSound() -> fo
+    792:806:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    810:834:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    838:838:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
+    842:842:boolean canParent() -> fp
+    848:848:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    853:861:void setOffspringAttributes(net.minecraft.world.entity.AgableMob,net.minecraft.world.entity.animal.horse.AbstractHorse) -> a
+    865:865:boolean canBeControlledByRider() -> es
+    869:869:float getEatAnim(float) -> u
+    873:873:float getStandAnim(float) -> v
+    877:877:float getMouthAnim(float) -> w
+    882:898:void onPlayerJump(int) -> b_
+    902:902:boolean canJump() -> Q_
+    907:907:float getJumpRidingScale() -> R_
+    912:913:void setJumpRidingScale(float) -> a_
+    917:920:void handleStartJump(int) -> b
+    924:924:void handleStopJump() -> c
+    927:935:void spawnTamingParticles(boolean) -> z
+    939:946:void handleEntityEvent(byte) -> a
+    950:968:void positionRider(net.minecraft.world.entity.Entity) -> k
+    972:972:float generateRandomMaxHealth() -> fq
+    976:976:double generateRandomJumpStrength() -> fr
+    980:980:double generateRandomSpeed() -> fs
+    985:985:boolean onClimbable() -> c_
+    990:990:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    994:994:boolean canWearArmor() -> ft
+    998:998:boolean isWearingArmor() -> fu
+    1002:1002:boolean isArmor(net.minecraft.world.item.ItemStack) -> l
+    1007:1024:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
+    1030:1033:net.minecraft.world.entity.Entity getControllingPassenger() -> cl
+    1038:1068:net.minecraft.world.phys.Vec3 getDismountLocationInDirection(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.LivingEntity) -> a
+    1073:1087:net.minecraft.world.phys.Vec3 getDismountLocationForPassenger(net.minecraft.world.entity.LivingEntity) -> c
+    1091:1091:void randomizeAttributes() -> eL
+    1096:1103:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    80:80:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> j
+    80:86:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.horse.Donkey -> azn:
+    15:16:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    20:21:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    26:27:net.minecraft.sounds.SoundEvent getAngrySound() -> fi
+    32:33:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    39:39:net.minecraft.sounds.SoundEvent getEatingSound() -> fh
+    44:45:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    50:58:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
+    63:68:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+net.minecraft.world.entity.animal.horse.Horse -> azo:
+    java.util.UUID ARMOR_MODIFIER_UUID -> bD
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_TYPE_VARIANT -> bE
+    41:42:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    46:49:void randomizeAttributes() -> eL
+    53:56:void defineSynchedData() -> e
+    60:67:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    70:70:net.minecraft.world.item.ItemStack getArmor() -> eM
+    74:76:void setArmor(net.minecraft.world.item.ItemStack) -> m
+    80:92:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    95:96:void setTypeVariant(int) -> w
+    99:99:int getTypeVariant() -> eV
+    103:104:void setVariantAndMarkings(net.minecraft.world.entity.animal.horse.Variant,net.minecraft.world.entity.animal.horse.Markings) -> a
+    107:107:net.minecraft.world.entity.animal.horse.Variant getVariant() -> eN
+    111:111:net.minecraft.world.entity.animal.horse.Markings getMarkings() -> eP
+    116:125:void updateContainerEquipment() -> ff
+    128:139:void setArmorEquipment(net.minecraft.world.item.ItemStack) -> n
+    143:151:void containerChanged(net.minecraft.world.Container) -> a
+    155:159:void playGallopSound(net.minecraft.world.level.block.SoundType) -> a
+    163:164:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    169:170:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    176:176:net.minecraft.sounds.SoundEvent getEatingSound() -> fh
+    181:182:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    187:188:net.minecraft.sounds.SoundEvent getAngrySound() -> fi
+    193:234:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    239:247:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
+    253:284:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    289:289:boolean canWearArmor() -> ft
+    294:294:boolean isArmor(net.minecraft.world.item.ItemStack) -> l
+    301:309:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    36:38:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.horse.Horse$HorseGroupData -> azo$a:
+    net.minecraft.world.entity.animal.horse.Variant variant -> a
+    315:317:void <init>(net.minecraft.world.entity.animal.horse.Variant) -> <init>
+net.minecraft.world.entity.animal.horse.Llama -> azp:
+    net.minecraft.world.item.crafting.Ingredient FOOD_ITEMS -> bD
+    net.minecraft.network.syncher.EntityDataAccessor DATA_STRENGTH_ID -> bE
+    net.minecraft.network.syncher.EntityDataAccessor DATA_SWAG_ID -> bF
+    net.minecraft.network.syncher.EntityDataAccessor DATA_VARIANT_ID -> bG
+    boolean didSpit -> bH
+    net.minecraft.world.entity.animal.horse.Llama caravanHead -> bI
+    net.minecraft.world.entity.animal.horse.Llama caravanTail -> bJ
+    75:76:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    79:79:boolean isTraderLlama() -> fv
+    83:84:void setStrength(int) -> x
+    87:90:void setRandomStrength() -> fF
+    93:93:int getStrength() -> fw
+    98:106:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    110:120:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    124:137:void registerGoals() -> o
+    140:141:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> fx
+    146:151:void defineSynchedData() -> e
+    154:154:int getVariant() -> fy
+    158:159:void setVariant(int) -> w
+    163:166:int getInventorySize() -> eO
+    171:178:void positionRider(net.minecraft.world.entity.Entity) -> k
+    182:182:double getPassengersRidingOffset() -> aY
+    187:187:boolean canBeControlledByRider() -> es
+    194:194:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    199:242:boolean handleEating(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> c
+    247:247:boolean isImmobile() -> dH
+    253:264:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    277:277:net.minecraft.sounds.SoundEvent getAngrySound() -> fi
+    282:282:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    287:287:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    292:292:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    298:298:net.minecraft.sounds.SoundEvent getEatingSound() -> fh
+    303:304:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    308:309:void playChestEquipsSound() -> eP
+    313:317:void makeMad() -> fn
+    321:321:int getInventoryColumns() -> eV
+    326:326:boolean canWearArmor() -> ft
+    331:331:boolean isWearingArmor() -> fu
+    336:337:boolean isArmor(net.minecraft.world.item.ItemStack) -> l
+    342:342:boolean isSaddleable() -> M_
+    347:354:void containerChanged(net.minecraft.world.Container) -> a
+    358:365:void updateContainerEquipment() -> ff
+    368:369:void setSwag(net.minecraft.world.item.DyeColor) -> a
+    373:377:net.minecraft.world.item.DyeColor getDyeColor(net.minecraft.world.item.ItemStack) -> m
+    382:383:net.minecraft.world.item.DyeColor getSwag() -> fz
+    388:388:int getMaxTemper() -> fk
+    393:393:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
+    398:412:net.minecraft.world.entity.animal.horse.Llama getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    416:416:net.minecraft.world.entity.animal.horse.Llama makeBabyLlama() -> fA
+    420:432:void spit(net.minecraft.world.entity.LivingEntity) -> j
+    435:436:void setDidSpit(boolean) -> A
+    440:457:boolean causeFallDamage(float,float) -> b
+    461:465:void leaveCaravan() -> fB
+    468:470:void joinCaravan(net.minecraft.world.entity.animal.horse.Llama) -> a
+    473:473:boolean hasCaravanTail() -> fC
+    477:477:boolean inCaravan() -> fD
+    482:482:net.minecraft.world.entity.animal.horse.Llama getCaravanHead() -> fE
+    487:487:double followLeashSpeed() -> eK
+    492:495:void followMommy() -> fl
+    499:499:boolean canEatGrass() -> fm
+    504:505:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
+    57:57:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    57:57:boolean access$100(net.minecraft.world.entity.animal.horse.Llama) -> b
+    57:57:void access$200(net.minecraft.world.entity.animal.horse.Llama,boolean) -> a
+    61:65:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.horse.Llama$1 -> azp$1:
+net.minecraft.world.entity.animal.horse.Llama$LlamaAttackWolfGoal -> azp$a:
+    527:528:void <init>(net.minecraft.world.entity.animal.horse.Llama) -> <init>
+    532:532:double getFollowDistance() -> k
+    527:527:boolean lambda$new$0(net.minecraft.world.entity.LivingEntity) -> b
+net.minecraft.world.entity.animal.horse.Llama$LlamaGroupData -> azp$b:
     int variant -> a
-    370:372:void <init>(int) -> <init>
-net.minecraft.world.entity.animal.horse.Llama -> auh:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_STRENGTH_ID -> bF
-    net.minecraft.network.syncher.EntityDataAccessor DATA_SWAG_ID -> bG
-    net.minecraft.network.syncher.EntityDataAccessor DATA_VARIANT_ID -> bH
-    boolean didSpit -> bI
-    net.minecraft.world.entity.animal.horse.Llama caravanHead -> bJ
-    net.minecraft.world.entity.animal.horse.Llama caravanTail -> bK
-    71:72:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    75:75:boolean isTraderLlama() -> eW
-    79:80:void setStrength(int) -> x
-    83:86:void setRandomStrength() -> ff
-    89:89:int getStrength() -> eX
-    94:102:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    106:116:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    120:133:void registerGoals() -> n
-    137:139:void registerAttributes() -> cA
-    143:148:void defineSynchedData() -> w_
-    151:151:int getVariant() -> eY
-    155:156:void setVariant(int) -> w
-    160:163:int getInventorySize() -> er
-    168:175:void positionRider(net.minecraft.world.entity.Entity) -> k
-    179:179:double getRideHeight() -> aS
-    184:184:boolean canBeControlledByRider() -> dY
-    189:229:boolean handleEating(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> b
-    234:234:boolean isImmobile() -> do
-    240:251:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    264:264:net.minecraft.sounds.SoundEvent getAngrySound() -> es
-    269:269:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    274:274:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    279:279:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    284:285:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    289:290:void playChestEquipsSound() -> et
-    294:298:void makeMad() -> eP
-    302:302:int getInventoryColumns() -> eu
-    307:307:boolean wearsArmor() -> eV
-    312:313:boolean isArmor(net.minecraft.world.item.ItemStack) -> j
-    318:318:boolean canBeSaddled() -> eK
-    323:330:void containerChanged(net.minecraft.world.Container) -> a
-    334:341:void updateEquipment() -> eI
-    344:345:void setSwag(net.minecraft.world.item.DyeColor) -> a
-    349:353:net.minecraft.world.item.DyeColor getDyeColor(net.minecraft.world.item.ItemStack) -> k
-    358:359:net.minecraft.world.item.DyeColor getSwag() -> eZ
-    364:364:int getMaxTemper() -> eM
-    369:369:boolean canMate(net.minecraft.world.entity.animal.Animal) -> a
-    374:388:net.minecraft.world.entity.animal.horse.Llama getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    392:392:net.minecraft.world.entity.animal.horse.Llama makeBabyLlama() -> fa
-    396:406:void spit(net.minecraft.world.entity.LivingEntity) -> i
-    409:410:void setDidSpit(boolean) -> z
-    414:431:boolean causeFallDamage(float,float) -> b
-    435:439:void leaveCaravan() -> fb
-    442:444:void joinCaravan(net.minecraft.world.entity.animal.horse.Llama) -> a
-    447:447:boolean hasCaravanTail() -> fc
-    451:451:boolean inCaravan() -> fd
-    456:456:net.minecraft.world.entity.animal.horse.Llama getCaravanHead() -> fe
-    461:461:double followLeashSpeed() -> ep
-    466:469:void followMommy() -> eN
-    473:473:boolean canEatGrass() -> eO
-    478:479:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
-    55:55:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    55:55:boolean access$100(net.minecraft.world.entity.animal.horse.Llama) -> b
-    55:55:void access$200(net.minecraft.world.entity.animal.horse.Llama,boolean) -> a
-    59:61:void <clinit>() -> <clinit>
-net.minecraft.world.entity.animal.horse.Llama$1 -> auh$1:
-net.minecraft.world.entity.animal.horse.Llama$LlamaAttackWolfGoal -> auh$a:
-    501:502:void <init>(net.minecraft.world.entity.animal.horse.Llama) -> <init>
-    506:506:double getFollowDistance() -> k
-    501:501:boolean lambda$new$0(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.animal.horse.Llama$LlamaGroupData -> auh$b:
-    int variant -> a
-    257:259:void <init>(int) -> <init>
-    254:254:void <init>(int,net.minecraft.world.entity.animal.horse.Llama$1) -> <init>
-net.minecraft.world.entity.animal.horse.Llama$LlamaHurtByTargetGoal -> auh$c:
-    483:484:void <init>(net.minecraft.world.entity.animal.horse.Llama) -> <init>
-    488:495:boolean canContinueToUse() -> b
-net.minecraft.world.entity.animal.horse.Mule -> aui:
-    12:13:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    17:18:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    23:24:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    29:30:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    35:36:void playChestEquipsSound() -> et
-    40:40:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-net.minecraft.world.entity.animal.horse.SkeletonHorse -> auj:
-    net.minecraft.world.entity.animal.horse.SkeletonTrapGoal skeletonTrapGoal -> bF
-    boolean isTrap -> bG
-    int trapTime -> bH
-    23:31:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    35:40:void registerAttributes() -> cA
-    45:45:void addBehaviourGoals() -> ez
-    49:53:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    59:60:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    65:66:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    71:83:net.minecraft.sounds.SoundEvent getSwimSound() -> am
-    88:93:void playSwimSound(float) -> d
-    97:102:void playJumpSound() -> eQ
-    106:106:net.minecraft.world.entity.MobType getMobType() -> di
-    111:111:double getRideHeight() -> aS
-    116:121:void aiStep() -> k
-    125:129:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    133:137:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    141:141:boolean rideableUnderWater() -> bi
-    146:146:float getWaterSlowDown() -> ds
-    150:150:boolean isTrap() -> eq
-    154:164:void setTrap(boolean) -> r
-    169:169:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    174:208:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.entity.animal.horse.SkeletonTrapGoal -> auk:
+    270:272:void <init>(int) -> <init>
+    267:267:void <init>(int,net.minecraft.world.entity.animal.horse.Llama$1) -> <init>
+net.minecraft.world.entity.animal.horse.Llama$LlamaHurtByTargetGoal -> azp$c:
+    509:510:void <init>(net.minecraft.world.entity.animal.horse.Llama) -> <init>
+    514:521:boolean canContinueToUse() -> b
+net.minecraft.world.entity.animal.horse.Markings -> azq:
+    net.minecraft.world.entity.animal.horse.Markings NONE -> a
+    net.minecraft.world.entity.animal.horse.Markings WHITE -> b
+    net.minecraft.world.entity.animal.horse.Markings WHITE_FIELD -> c
+    net.minecraft.world.entity.animal.horse.Markings WHITE_DOTS -> d
+    net.minecraft.world.entity.animal.horse.Markings BLACK_DOTS -> e
+    net.minecraft.world.entity.animal.horse.Markings[] BY_ID -> f
+    int id -> g
+    net.minecraft.world.entity.animal.horse.Markings[] $VALUES -> h
+    6:6:net.minecraft.world.entity.animal.horse.Markings[] values() -> values
+    6:6:net.minecraft.world.entity.animal.horse.Markings valueOf(java.lang.String) -> valueOf
+    17:19:void <init>(java.lang.String,int,int) -> <init>
+    22:22:int getId() -> a
+    26:26:net.minecraft.world.entity.animal.horse.Markings byId(int) -> a
+    14:14:net.minecraft.world.entity.animal.horse.Markings[] lambda$static$0(int) -> b
+    6:14:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.horse.Mule -> azr:
+    14:15:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    19:20:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    25:26:net.minecraft.sounds.SoundEvent getAngrySound() -> fi
+    31:32:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    38:38:net.minecraft.sounds.SoundEvent getEatingSound() -> fh
+    43:44:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    49:50:void playChestEquipsSound() -> eP
+    54:54:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+net.minecraft.world.entity.animal.horse.SkeletonHorse -> azs:
+    net.minecraft.world.entity.animal.horse.SkeletonTrapGoal skeletonTrapGoal -> bD
+    boolean isTrap -> bE
+    int trapTime -> bF
+    24:32:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    35:37:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eM
+    42:43:void randomizeAttributes() -> eL
+    48:48:void addBehaviourGoals() -> eW
+    52:56:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    62:63:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    68:69:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    74:86:net.minecraft.sounds.SoundEvent getSwimSound() -> aq
+    91:96:void playSwimSound(float) -> d
+    100:105:void playJumpSound() -> fo
+    109:109:net.minecraft.world.entity.MobType getMobType() -> dB
+    114:114:double getPassengersRidingOffset() -> aY
+    119:124:void aiStep() -> k
+    128:132:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    136:140:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    144:144:boolean rideableUnderWater() -> bp
+    149:149:float getWaterSlowDown() -> dL
+    153:153:boolean isTrap() -> eN
+    157:167:void setTrap(boolean) -> t
+    172:172:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    177:210:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+net.minecraft.world.entity.animal.horse.SkeletonTrapGoal -> azt:
     net.minecraft.world.entity.animal.horse.SkeletonHorse horse -> a
-    20:22:void <init>(net.minecraft.world.entity.animal.horse.SkeletonHorse) -> <init>
-    26:26:boolean canUse() -> a
-    31:45:void tick() -> e
-    48:56:net.minecraft.world.entity.animal.horse.AbstractHorse createHorse(net.minecraft.world.DifficultyInstance) -> a
-    60:74:net.minecraft.world.entity.monster.Skeleton createSkeleton(net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.animal.horse.AbstractHorse) -> a
-net.minecraft.world.entity.animal.horse.TraderLlama -> aul:
-    int despawnDelay -> bF
+    18:20:void <init>(net.minecraft.world.entity.animal.horse.SkeletonHorse) -> <init>
+    24:24:boolean canUse() -> a
+    29:46:void tick() -> e
+    49:57:net.minecraft.world.entity.animal.horse.AbstractHorse createHorse(net.minecraft.world.DifficultyInstance) -> a
+    61:75:net.minecraft.world.entity.monster.Skeleton createSkeleton(net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.animal.horse.AbstractHorse) -> a
+net.minecraft.world.entity.animal.horse.TraderLlama -> azu:
+    int despawnDelay -> bD
     27:29:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    33:33:boolean isTraderLlama() -> eW
-    38:38:net.minecraft.world.entity.animal.horse.Llama makeBabyLlama() -> fa
+    33:33:boolean isTraderLlama() -> fv
+    38:38:net.minecraft.world.entity.animal.horse.Llama makeBabyLlama() -> fA
     43:45:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     49:53:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    57:62:void registerGoals() -> n
+    57:62:void registerGoals() -> o
     65:66:void setDespawnDelay(int) -> x
-    70:76:void doPlayerRide(net.minecraft.world.entity.player.Player) -> g
+    70:76:void doPlayerRide(net.minecraft.world.entity.player.Player) -> h
     80:85:void aiStep() -> k
-    88:98:void maybeDespawn() -> ff
-    101:103:boolean canDespawn() -> fg
-    107:107:boolean isLeashedToWanderingTrader() -> fh
-    111:111:boolean isLeashedToSomethingOtherThanTheWanderingTrader() -> fi
+    88:98:void maybeDespawn() -> fF
+    101:103:boolean canDespawn() -> fG
+    107:107:boolean isLeashedToWanderingTrader() -> fH
+    111:111:boolean isLeashedToSomethingOtherThanTheWanderingTrader() -> fI
     117:126:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-net.minecraft.world.entity.animal.horse.TraderLlama$TraderLlamaDefendWanderingTraderGoal -> aul$a:
+net.minecraft.world.entity.animal.horse.TraderLlama$TraderLlamaDefendWanderingTraderGoal -> azu$a:
     net.minecraft.world.entity.animal.horse.Llama llama -> b
     net.minecraft.world.entity.LivingEntity ownerLastHurtBy -> c
     int timestamp -> d
@@ -42102,128 +45917,147 @@ net.minecraft.world.entity.animal.horse.TraderLlama$TraderLlamaDefendWanderingTr
     134:138:void <init>(net.minecraft.world.entity.animal.horse.TraderLlama,net.minecraft.world.entity.animal.horse.Llama) -> <init>
     142:153:boolean canUse() -> a
     158:166:void start() -> c
-net.minecraft.world.entity.animal.horse.ZombieHorse -> aum:
-    21:22:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    26:31:void registerAttributes() -> cA
-    35:35:net.minecraft.world.entity.MobType getMobType() -> di
-    40:41:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    46:47:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    52:53:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    59:59:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    64:98:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    104:104:void addBehaviourGoals() -> ez
-net.minecraft.world.entity.animal.horse.package-info -> aun:
-net.minecraft.world.entity.animal.package-info -> auo:
-net.minecraft.world.entity.boss.BossMob -> aup:
-    float getMaxHealth() -> dd
-    float getHealth() -> cS
+net.minecraft.world.entity.animal.horse.Variant -> azv:
+    net.minecraft.world.entity.animal.horse.Variant WHITE -> a
+    net.minecraft.world.entity.animal.horse.Variant CREAMY -> b
+    net.minecraft.world.entity.animal.horse.Variant CHESTNUT -> c
+    net.minecraft.world.entity.animal.horse.Variant BROWN -> d
+    net.minecraft.world.entity.animal.horse.Variant BLACK -> e
+    net.minecraft.world.entity.animal.horse.Variant GRAY -> f
+    net.minecraft.world.entity.animal.horse.Variant DARKBROWN -> g
+    net.minecraft.world.entity.animal.horse.Variant[] BY_ID -> h
+    int id -> i
+    net.minecraft.world.entity.animal.horse.Variant[] $VALUES -> j
+    6:6:net.minecraft.world.entity.animal.horse.Variant[] values() -> values
+    6:6:net.minecraft.world.entity.animal.horse.Variant valueOf(java.lang.String) -> valueOf
+    19:21:void <init>(java.lang.String,int,int) -> <init>
+    24:24:int getId() -> a
+    28:28:net.minecraft.world.entity.animal.horse.Variant byId(int) -> a
+    16:16:net.minecraft.world.entity.animal.horse.Variant[] lambda$static$0(int) -> b
+    6:16:void <clinit>() -> <clinit>
+net.minecraft.world.entity.animal.horse.ZombieHorse -> azw:
+    22:23:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    26:28:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eM
+    33:34:void randomizeAttributes() -> eL
+    38:38:net.minecraft.world.entity.MobType getMobType() -> dB
+    43:44:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    49:50:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    55:56:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    62:62:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    68:101:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    107:107:void addBehaviourGoals() -> eW
+net.minecraft.world.entity.animal.horse.package-info -> azx:
+net.minecraft.world.entity.animal.package-info -> azy:
+net.minecraft.world.entity.boss.BossMob -> azz:
+    float getMaxHealth() -> dw
+    float getHealth() -> dj
     net.minecraft.network.chat.Component getDisplayName() -> d
-net.minecraft.world.entity.boss.EnderDragonPart -> auq:
+net.minecraft.world.entity.boss.EnderDragonPart -> baa:
     net.minecraft.world.entity.boss.enderdragon.EnderDragon parentMob -> b
     java.lang.String name -> c
     net.minecraft.world.entity.EntityDimensions size -> d
     18:23:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon,java.lang.String,float,float) -> <init>
-    27:27:void defineSynchedData() -> w_
+    27:27:void defineSynchedData() -> e
     31:31:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     35:35:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    39:39:boolean isPickable() -> aK
+    39:39:boolean isPickable() -> aQ
     44:47:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
     52:52:boolean is(net.minecraft.world.entity.Entity) -> s
-    58:58:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
+    58:58:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
     63:63:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
-net.minecraft.world.entity.boss.enderdragon.EndCrystal -> aur:
+net.minecraft.world.entity.boss.enderdragon.EndCrystal -> bab:
     net.minecraft.network.syncher.EntityDataAccessor DATA_BEAM_TARGET -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_SHOW_BOTTOM -> d
     int time -> b
     31:35:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     38:40:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    44:44:boolean isMovementNoisy() -> at
-    49:51:void defineSynchedData() -> w_
-    55:63:void tick() -> h
+    44:44:boolean isMovementNoisy() -> ax
+    49:51:void defineSynchedData() -> e
+    55:63:void tick() -> j
     67:71:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     75:81:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    85:85:boolean isPickable() -> aK
+    85:85:boolean isPickable() -> aQ
     90:104:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    109:111:void kill() -> U
-    114:121:void onDestroyedBy(net.minecraft.world.damagesource.DamageSource) -> a
-    124:125:void setBeamTarget(net.minecraft.core.BlockPos) -> a
-    129:129:net.minecraft.core.BlockPos getBeamTarget() -> f
-    133:134:void setShowBottom(boolean) -> a
-    137:137:boolean showsBottom() -> i
-    142:142:boolean shouldRenderAtSqrDistance(double) -> a
-    147:147:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
+    109:111:void kill() -> X
+    114:120:void onDestroyedBy(net.minecraft.world.damagesource.DamageSource) -> a
+    123:124:void setBeamTarget(net.minecraft.core.BlockPos) -> a
+    128:128:net.minecraft.core.BlockPos getBeamTarget() -> g
+    132:133:void setShowBottom(boolean) -> a
+    136:136:boolean showsBottom() -> h
+    141:141:boolean shouldRenderAtSqrDistance(double) -> a
+    146:146:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
     25:26:void <clinit>() -> <clinit>
-net.minecraft.world.entity.boss.enderdragon.EnderDragon -> aus:
-    org.apache.logging.log4j.Logger LOGGER -> bD
+net.minecraft.world.entity.boss.enderdragon.EnderDragon -> bac:
+    org.apache.logging.log4j.Logger LOGGER -> bC
     net.minecraft.network.syncher.EntityDataAccessor DATA_PHASE -> b
-    net.minecraft.world.entity.ai.targeting.TargetingConditions CRYSTAL_DESTROY_TARGETING -> bE
+    net.minecraft.world.entity.ai.targeting.TargetingConditions CRYSTAL_DESTROY_TARGETING -> bD
     double[][] positions -> c
     int posPointer -> d
-    net.minecraft.world.entity.boss.EnderDragonPart[] subEntities -> bF
-    net.minecraft.world.entity.boss.EnderDragonPart head -> bw
-    net.minecraft.world.entity.boss.EnderDragonPart neck -> bG
-    net.minecraft.world.entity.boss.EnderDragonPart body -> bH
-    net.minecraft.world.entity.boss.EnderDragonPart tail1 -> bI
-    net.minecraft.world.entity.boss.EnderDragonPart tail2 -> bJ
-    net.minecraft.world.entity.boss.EnderDragonPart tail3 -> bK
-    net.minecraft.world.entity.boss.EnderDragonPart wing1 -> bL
-    net.minecraft.world.entity.boss.EnderDragonPart wing2 -> bM
-    float oFlapTime -> bx
-    float flapTime -> by
-    boolean inWall -> bz
-    int dragonDeathTime -> bA
-    float yRotA -> bB
-    net.minecraft.world.entity.boss.enderdragon.EndCrystal nearestCrystal -> bC
-    net.minecraft.world.level.dimension.end.EndDragonFight dragonFight -> bN
-    net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhaseManager phaseManager -> bO
-    int growlTime -> bP
-    int sittingDamageReceived -> bQ
-    net.minecraft.world.level.pathfinder.Node[] nodes -> bR
-    int[] nodeAdjacency -> bS
-    net.minecraft.world.level.pathfinder.BinaryHeap openSet -> bT
-    68:126:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    130:133:void registerAttributes() -> cA
-    137:139:void defineSynchedData() -> w_
-    142:160:double[] getLatencyPos(int,float) -> a
-    165:367:void aiStep() -> k
-    370:371:void tickPart(net.minecraft.world.entity.boss.EnderDragonPart,double,double,double) -> a
-    374:379:float getHeadYOffset() -> er
-    383:408:void checkCrystals() -> es
-    411:426:void knockBack(java.util.List) -> a
-    429:435:void hurt(java.util.List) -> b
-    438:438:float rotWrap(double) -> i
-    442:476:boolean checkWalls(net.minecraft.world.phys.AABB) -> b
-    480:513:boolean hurt(net.minecraft.world.entity.boss.EnderDragonPart,net.minecraft.world.damagesource.DamageSource,float) -> a
-    518:521:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    525:525:boolean reallyHurt(net.minecraft.world.damagesource.DamageSource,float) -> e
-    530:536:void kill() -> U
-    540:579:void tickDeath() -> cD
-    582:587:void dropExperience(int) -> a
-    591:651:int findClosestNode() -> l
-    655:674:int findClosestNode(double,double,double) -> o
-    679:763:net.minecraft.world.level.pathfinder.Path findPath(int,int,net.minecraft.world.level.pathfinder.Node) -> a
-    767:774:net.minecraft.world.level.pathfinder.Path reconstructPath(net.minecraft.world.level.pathfinder.Node,net.minecraft.world.level.pathfinder.Node) -> a
-    779:781:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    785:789:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    793:793:void checkDespawn() -> cy
-    796:796:net.minecraft.world.entity.boss.EnderDragonPart[] getSubEntities() -> eo
-    801:801:boolean isPickable() -> aK
-    806:806:net.minecraft.sounds.SoundSource getSoundSource() -> cl
-    811:811:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    816:816:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    821:821:float getSoundVolume() -> dm
-    825:843:float getHeadPartYOffset(int,double[],double[]) -> a
-    847:873:net.minecraft.world.phys.Vec3 getHeadLookVector(float) -> u
-    879:890:void onCrystalDestroyed(net.minecraft.world.entity.boss.enderdragon.EndCrystal,net.minecraft.core.BlockPos,net.minecraft.world.damagesource.DamageSource) -> a
-    894:899:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    902:902:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhaseManager getPhaseManager() -> ep
-    907:907:net.minecraft.world.level.dimension.end.EndDragonFight getDragonFight() -> eq
-    912:912:boolean addEffect(net.minecraft.world.effect.MobEffectInstance) -> c
-    917:917:boolean canRide(net.minecraft.world.entity.Entity) -> n
-    922:922:boolean canChangeDimensions() -> bC
-    58:62:void <clinit>() -> <clinit>
-net.minecraft.world.entity.boss.enderdragon.package-info -> aut:
-net.minecraft.world.entity.boss.enderdragon.phases.AbstractDragonPhaseInstance -> auu:
+    net.minecraft.world.entity.boss.EnderDragonPart[] subEntities -> bE
+    net.minecraft.world.entity.boss.EnderDragonPart head -> bv
+    net.minecraft.world.entity.boss.EnderDragonPart neck -> bF
+    net.minecraft.world.entity.boss.EnderDragonPart body -> bG
+    net.minecraft.world.entity.boss.EnderDragonPart tail1 -> bH
+    net.minecraft.world.entity.boss.EnderDragonPart tail2 -> bI
+    net.minecraft.world.entity.boss.EnderDragonPart tail3 -> bJ
+    net.minecraft.world.entity.boss.EnderDragonPart wing1 -> bK
+    net.minecraft.world.entity.boss.EnderDragonPart wing2 -> bL
+    float oFlapTime -> bw
+    float flapTime -> bx
+    boolean inWall -> by
+    int dragonDeathTime -> bz
+    float yRotA -> bA
+    net.minecraft.world.entity.boss.enderdragon.EndCrystal nearestCrystal -> bB
+    net.minecraft.world.level.dimension.end.EndDragonFight dragonFight -> bM
+    net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhaseManager phaseManager -> bN
+    int growlTime -> bO
+    int sittingDamageReceived -> bP
+    net.minecraft.world.level.pathfinder.Node[] nodes -> bQ
+    int[] nodeAdjacency -> bR
+    net.minecraft.world.level.pathfinder.BinaryHeap openSet -> bS
+    69:127:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    130:131:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    136:138:void defineSynchedData() -> e
+    141:159:double[] getLatencyPos(int,float) -> a
+    164:366:void aiStep() -> k
+    369:370:void tickPart(net.minecraft.world.entity.boss.EnderDragonPart,double,double,double) -> a
+    373:378:float getHeadYOffset() -> eN
+    382:407:void checkCrystals() -> eO
+    410:425:void knockBack(java.util.List) -> a
+    428:434:void hurt(java.util.List) -> b
+    437:437:float rotWrap(double) -> i
+    441:475:boolean checkWalls(net.minecraft.world.phys.AABB) -> b
+    479:512:boolean hurt(net.minecraft.world.entity.boss.EnderDragonPart,net.minecraft.world.damagesource.DamageSource,float) -> a
+    517:520:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    524:524:boolean reallyHurt(net.minecraft.world.damagesource.DamageSource,float) -> f
+    529:535:void kill() -> X
+    539:578:void tickDeath() -> cT
+    581:586:void dropExperience(int) -> a
+    590:650:int findClosestNode() -> eJ
+    654:673:int findClosestNode(double,double,double) -> o
+    678:762:net.minecraft.world.level.pathfinder.Path findPath(int,int,net.minecraft.world.level.pathfinder.Node) -> a
+    766:773:net.minecraft.world.level.pathfinder.Path reconstructPath(net.minecraft.world.level.pathfinder.Node,net.minecraft.world.level.pathfinder.Node) -> a
+    778:780:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    784:788:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    792:792:void checkDespawn() -> cH
+    795:795:net.minecraft.world.entity.boss.EnderDragonPart[] getSubEntities() -> eK
+    800:800:boolean isPickable() -> aQ
+    805:805:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    810:810:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    815:815:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    820:820:float getSoundVolume() -> dF
+    824:842:float getHeadPartYOffset(int,double[],double[]) -> a
+    846:872:net.minecraft.world.phys.Vec3 getHeadLookVector(float) -> t
+    878:889:void onCrystalDestroyed(net.minecraft.world.entity.boss.enderdragon.EndCrystal,net.minecraft.core.BlockPos,net.minecraft.world.damagesource.DamageSource) -> a
+    893:898:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    901:901:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhaseManager getPhaseManager() -> eL
+    906:906:net.minecraft.world.level.dimension.end.EndDragonFight getDragonFight() -> eM
+    911:911:boolean addEffect(net.minecraft.world.effect.MobEffectInstance) -> c
+    916:916:boolean canRide(net.minecraft.world.entity.Entity) -> n
+    921:921:boolean canChangeDimensions() -> bK
+    59:63:void <clinit>() -> <clinit>
+net.minecraft.world.entity.boss.enderdragon.package-info -> bad:
+net.minecraft.world.entity.boss.enderdragon.phases.AbstractDragonPhaseInstance -> bae:
     net.minecraft.world.entity.boss.enderdragon.EnderDragon dragon -> a
     17:19:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
     23:23:boolean isSitting() -> a
@@ -42236,11 +46070,11 @@ net.minecraft.world.entity.boss.enderdragon.phases.AbstractDragonPhaseInstance -
     54:54:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
     59:59:float onHurt(net.minecraft.world.damagesource.DamageSource,float) -> a
     64:67:float getTurnSpeed() -> h
-net.minecraft.world.entity.boss.enderdragon.phases.AbstractDragonSittingPhase -> auv:
+net.minecraft.world.entity.boss.enderdragon.phases.AbstractDragonSittingPhase -> baf:
     9:10:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
     14:14:boolean isSitting() -> a
     19:23:float onHurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-net.minecraft.world.entity.boss.enderdragon.phases.DragonChargePlayerPhase -> auw:
+net.minecraft.world.entity.boss.enderdragon.phases.DragonChargePlayerPhase -> bag:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.world.phys.Vec3 targetLocation -> c
     int timeSinceCharge -> d
@@ -42252,7 +46086,7 @@ net.minecraft.world.entity.boss.enderdragon.phases.DragonChargePlayerPhase -> au
     60:60:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
     65:65:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
     11:11:void <clinit>() -> <clinit>
-net.minecraft.world.entity.boss.enderdragon.phases.DragonDeathPhase -> auy:
+net.minecraft.world.entity.boss.enderdragon.phases.DragonDeathPhase -> bah:
     net.minecraft.world.phys.Vec3 targetLocation -> b
     int time -> c
     17:18:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
@@ -42262,22 +46096,22 @@ net.minecraft.world.entity.boss.enderdragon.phases.DragonDeathPhase -> auy:
     55:55:float getFlySpeed() -> f
     61:61:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
     66:66:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
-net.minecraft.world.entity.boss.enderdragon.phases.DragonHoldingPatternPhase -> auz:
+net.minecraft.world.entity.boss.enderdragon.phases.DragonHoldingPatternPhase -> bai:
     net.minecraft.world.entity.ai.targeting.TargetingConditions NEW_TARGET_TARGETING -> b
     net.minecraft.world.level.pathfinder.Path currentPath -> c
     net.minecraft.world.phys.Vec3 targetLocation -> d
     boolean clockwise -> e
-    25:26:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
-    30:30:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
-    35:39:void doServerTick() -> c
-    43:45:void begin() -> d
-    50:50:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
-    54:113:void findNewTarget() -> j
-    116:118:void strafePlayer(net.minecraft.world.entity.player.Player) -> a
-    121:135:void navigateToNextPathNode() -> k
-    139:142:void onCrystalDestroyed(net.minecraft.world.entity.boss.enderdragon.EndCrystal,net.minecraft.core.BlockPos,net.minecraft.world.damagesource.DamageSource,net.minecraft.world.entity.player.Player) -> a
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.world.entity.boss.enderdragon.phases.DragonHoverPhase -> ava:
+    26:27:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
+    31:31:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
+    36:40:void doServerTick() -> c
+    44:46:void begin() -> d
+    51:51:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
+    55:114:void findNewTarget() -> j
+    117:119:void strafePlayer(net.minecraft.world.entity.player.Player) -> a
+    122:136:void navigateToNextPathNode() -> k
+    140:143:void onCrystalDestroyed(net.minecraft.world.entity.boss.enderdragon.EndCrystal,net.minecraft.core.BlockPos,net.minecraft.world.damagesource.DamageSource,net.minecraft.world.entity.player.Player) -> a
+    19:19:void <clinit>() -> <clinit>
+net.minecraft.world.entity.boss.enderdragon.phases.DragonHoverPhase -> baj:
     net.minecraft.world.phys.Vec3 targetLocation -> b
     12:13:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
     17:20:void doServerTick() -> c
@@ -42286,19 +46120,19 @@ net.minecraft.world.entity.boss.enderdragon.phases.DragonHoverPhase -> ava:
     34:34:float getFlySpeed() -> f
     40:40:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
     45:45:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
-net.minecraft.world.entity.boss.enderdragon.phases.DragonLandingApproachPhase -> avb:
+net.minecraft.world.entity.boss.enderdragon.phases.DragonLandingApproachPhase -> bak:
     net.minecraft.world.entity.ai.targeting.TargetingConditions NEAR_EGG_TARGETING -> b
     net.minecraft.world.level.pathfinder.Path currentPath -> c
     net.minecraft.world.phys.Vec3 targetLocation -> d
-    22:23:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
-    27:27:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
-    32:34:void begin() -> d
-    38:42:void doServerTick() -> c
-    47:47:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
-    51:78:void findNewTarget() -> j
-    81:95:void navigateToNextPathNode() -> k
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.world.entity.boss.enderdragon.phases.DragonLandingPhase -> avc:
+    23:24:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
+    28:28:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
+    33:35:void begin() -> d
+    39:43:void doServerTick() -> c
+    48:48:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
+    52:79:void findNewTarget() -> j
+    82:96:void navigateToNextPathNode() -> k
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.entity.boss.enderdragon.phases.DragonLandingPhase -> bal:
     net.minecraft.world.phys.Vec3 targetLocation -> b
     18:19:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
     23:38:void doClientTick() -> b
@@ -42308,7 +46142,7 @@ net.minecraft.world.entity.boss.enderdragon.phases.DragonLandingPhase -> avc:
     67:68:void begin() -> d
     73:73:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
     78:78:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
-net.minecraft.world.entity.boss.enderdragon.phases.DragonPhaseInstance -> avd:
+net.minecraft.world.entity.boss.enderdragon.phases.DragonPhaseInstance -> bam:
     boolean isSitting() -> a
     void doClientTick() -> b
     void doServerTick() -> c
@@ -42320,14 +46154,14 @@ net.minecraft.world.entity.boss.enderdragon.phases.DragonPhaseInstance -> avd:
     net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
     net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
     float onHurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-net.minecraft.world.entity.boss.enderdragon.phases.DragonSittingAttackingPhase -> ave:
+net.minecraft.world.entity.boss.enderdragon.phases.DragonSittingAttackingPhase -> ban:
     int attackingTicks -> b
     13:14:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
     18:19:void doClientTick() -> b
     23:26:void doServerTick() -> c
     30:31:void begin() -> d
     35:35:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
-net.minecraft.world.entity.boss.enderdragon.phases.DragonSittingFlamingPhase -> avf:
+net.minecraft.world.entity.boss.enderdragon.phases.DragonSittingFlamingPhase -> bao:
     int flameTicks -> b
     int flameCount -> c
     net.minecraft.world.entity.AreaEffectCloud flame -> d
@@ -42338,7 +46172,7 @@ net.minecraft.world.entity.boss.enderdragon.phases.DragonSittingFlamingPhase ->
     94:98:void end() -> e
     102:102:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
     106:107:void resetFlameCount() -> j
-net.minecraft.world.entity.boss.enderdragon.phases.DragonSittingScanningPhase -> avg:
+net.minecraft.world.entity.boss.enderdragon.phases.DragonSittingScanningPhase -> bap:
     net.minecraft.world.entity.ai.targeting.TargetingConditions CHARGE_TARGETING -> b
     net.minecraft.world.entity.ai.targeting.TargetingConditions scanTargeting -> c
     int scanningTime -> d
@@ -42348,7 +46182,7 @@ net.minecraft.world.entity.boss.enderdragon.phases.DragonSittingScanningPhase ->
     73:73:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
     23:23:boolean lambda$new$0(net.minecraft.world.entity.boss.enderdragon.EnderDragon,net.minecraft.world.entity.LivingEntity) -> a
     15:15:void <clinit>() -> <clinit>
-net.minecraft.world.entity.boss.enderdragon.phases.DragonStrafePlayerPhase -> avh:
+net.minecraft.world.entity.boss.enderdragon.phases.DragonStrafePlayerPhase -> baq:
     org.apache.logging.log4j.Logger LOGGER -> b
     int fireballCharge -> c
     net.minecraft.world.level.pathfinder.Path currentPath -> d
@@ -42356,26 +46190,26 @@ net.minecraft.world.entity.boss.enderdragon.phases.DragonStrafePlayerPhase -> av
     net.minecraft.world.entity.LivingEntity attackTarget -> f
     boolean holdingPatternClockwise -> g
     28:29:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
-    33:101:void doServerTick() -> c
-    104:140:void findNewTarget() -> j
-    143:157:void navigateToNextPathNode() -> k
-    161:165:void begin() -> d
-    168:191:void setTarget(net.minecraft.world.entity.LivingEntity) -> a
-    196:196:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
-    201:201:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
+    33:103:void doServerTick() -> c
+    106:142:void findNewTarget() -> j
+    145:159:void navigateToNextPathNode() -> k
+    163:167:void begin() -> d
+    170:193:void setTarget(net.minecraft.world.entity.LivingEntity) -> a
+    198:198:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
+    203:203:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
     18:18:void <clinit>() -> <clinit>
-net.minecraft.world.entity.boss.enderdragon.phases.DragonTakeoffPhase -> avi:
+net.minecraft.world.entity.boss.enderdragon.phases.DragonTakeoffPhase -> bar:
     boolean firstTick -> b
     net.minecraft.world.level.pathfinder.Path currentPath -> c
     net.minecraft.world.phys.Vec3 targetLocation -> d
-    18:19:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
-    23:32:void doServerTick() -> c
-    36:39:void begin() -> d
-    42:62:void findNewTarget() -> j
-    65:79:void navigateToNextPathNode() -> k
-    84:84:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
-    89:89:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
-net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase -> avj:
+    19:20:void <init>(net.minecraft.world.entity.boss.enderdragon.EnderDragon) -> <init>
+    24:33:void doServerTick() -> c
+    37:40:void begin() -> d
+    43:63:void findNewTarget() -> j
+    66:80:void navigateToNextPathNode() -> k
+    85:85:net.minecraft.world.phys.Vec3 getFlyTargetLocation() -> g
+    90:90:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase getPhase() -> i
+net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase -> bas:
     net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase[] phases -> l
     net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase HOLDING_PATTERN -> a
     net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase STRAFE_PLAYER -> b
@@ -42400,7 +46234,7 @@ net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase -> avj:
     62:62:int getCount() -> c
     66:69:net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase create(java.lang.Class,java.lang.String) -> a
     9:20:void <clinit>() -> <clinit>
-net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhaseManager -> avk:
+net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhaseManager -> bat:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.entity.boss.enderdragon.EnderDragon dragon -> b
     net.minecraft.world.entity.boss.enderdragon.phases.DragonPhaseInstance[] phases -> c
@@ -42410,274 +46244,277 @@ net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhaseManager -> av
     39:39:net.minecraft.world.entity.boss.enderdragon.phases.DragonPhaseInstance getCurrentPhase() -> a
     44:48:net.minecraft.world.entity.boss.enderdragon.phases.DragonPhaseInstance getPhase(net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase) -> b
     8:8:void <clinit>() -> <clinit>
-net.minecraft.world.entity.boss.enderdragon.phases.package-info -> avl:
-net.minecraft.world.entity.boss.package-info -> avm:
-net.minecraft.world.entity.boss.wither.WitherBoss -> avn:
+net.minecraft.world.entity.boss.enderdragon.phases.package-info -> bau:
+net.minecraft.world.entity.boss.package-info -> bav:
+net.minecraft.world.entity.boss.wither.WitherBoss -> baw:
     net.minecraft.network.syncher.EntityDataAccessor DATA_TARGET_A -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_TARGET_B -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_TARGET_C -> d
-    java.util.List DATA_TARGETS -> bw
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_INV -> bx
-    float[] xRotHeads -> by
-    float[] yRotHeads -> bz
-    float[] xRotOHeads -> bA
-    float[] yRotOHeads -> bB
-    int[] nextHeadUpdate -> bC
-    int[] idleHeadUpdates -> bD
-    int destroyBlocksTick -> bE
-    net.minecraft.server.level.ServerBossEvent bossEvent -> bF
-    java.util.function.Predicate LIVING_ENTITY_SELECTOR -> bG
-    net.minecraft.world.entity.ai.targeting.TargetingConditions TARGETING_CONDITIONS -> bH
-    66:86:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    90:99:void registerGoals() -> n
-    103:109:void defineSynchedData() -> w_
-    113:116:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    120:126:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    130:132:void setCustomName(net.minecraft.network.chat.Component) -> b
-    136:136:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    141:141:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    146:146:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    151:227:void aiStep() -> k
-    231:344:void customServerAiStep() -> dT
-    347:347:boolean canDestroy(net.minecraft.world.level.block.state.BlockState) -> b
-    351:353:void makeInvulnerable() -> l
-    357:357:void makeStuckInBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.Vec3) -> a
-    361:363:void startSeenByPlayer(net.minecraft.server.level.ServerPlayer) -> b
-    367:369:void stopSeenByPlayer(net.minecraft.server.level.ServerPlayer) -> c
-    372:377:double getHeadX(int) -> u
-    381:384:double getHeadY(int) -> v
-    389:394:double getHeadZ(int) -> w
-    398:405:float rotlerp(float,float,float) -> a
-    409:410:void performRangedAttack(int,net.minecraft.world.entity.LivingEntity) -> a
-    413:430:void performRangedAttack(int,double,double,double,boolean) -> a
-    434:435:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
-    439:472:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    477:482:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
-    486:492:void checkDespawn() -> cy
-    496:496:boolean causeFallDamage(float,float) -> b
-    501:501:boolean addEffect(net.minecraft.world.effect.MobEffectInstance) -> c
-    506:512:void registerAttributes() -> cA
-    515:515:float getHeadYRot(int) -> a
-    519:519:float getHeadXRot(int) -> b
-    523:523:int getInvulnerableTicks() -> eq
-    527:528:void setInvulnerableTicks(int) -> s
-    531:531:int getAlternativeTarget(int) -> t
-    535:536:void setAlternativeTarget(int,int) -> a
-    540:540:boolean isPowered() -> J_
-    545:545:net.minecraft.world.entity.MobType getMobType() -> di
-    550:550:boolean canRide(net.minecraft.world.entity.Entity) -> n
-    555:555:boolean canChangeDimensions() -> bC
-    571:574:boolean canBeAffected(net.minecraft.world.effect.MobEffectInstance) -> d
-    75:75:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> i
-    60:76:void <clinit>() -> <clinit>
-net.minecraft.world.entity.boss.wither.WitherBoss$WitherDoNothingGoal -> avn$a:
+    java.util.List DATA_TARGETS -> bv
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_INV -> bw
+    float[] xRotHeads -> bx
+    float[] yRotHeads -> by
+    float[] xRotOHeads -> bz
+    float[] yRotOHeads -> bA
+    int[] nextHeadUpdate -> bB
+    int[] idleHeadUpdates -> bC
+    int destroyBlocksTick -> bD
+    net.minecraft.server.level.ServerBossEvent bossEvent -> bE
+    java.util.function.Predicate LIVING_ENTITY_SELECTOR -> bF
+    net.minecraft.world.entity.ai.targeting.TargetingConditions TARGETING_CONDITIONS -> bG
+    67:87:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    91:100:void registerGoals() -> o
+    104:110:void defineSynchedData() -> e
+    114:117:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    121:127:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    131:133:void setCustomName(net.minecraft.network.chat.Component) -> a
+    137:137:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    142:142:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    147:147:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    152:228:void aiStep() -> k
+    232:347:void customServerAiStep() -> N
+    350:350:boolean canDestroy(net.minecraft.world.level.block.state.BlockState) -> c
+    354:356:void makeInvulnerable() -> m
+    360:360:void makeStuckInBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.Vec3) -> a
+    364:366:void startSeenByPlayer(net.minecraft.server.level.ServerPlayer) -> b
+    370:372:void stopSeenByPlayer(net.minecraft.server.level.ServerPlayer) -> c
+    375:380:double getHeadX(int) -> u
+    384:387:double getHeadY(int) -> v
+    392:397:double getHeadZ(int) -> w
+    401:408:float rotlerp(float,float,float) -> a
+    412:413:void performRangedAttack(int,net.minecraft.world.entity.LivingEntity) -> a
+    416:436:void performRangedAttack(int,double,double,double,boolean) -> a
+    440:441:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
+    445:478:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    483:488:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
+    492:498:void checkDespawn() -> cH
+    502:502:boolean causeFallDamage(float,float) -> b
+    507:507:boolean addEffect(net.minecraft.world.effect.MobEffectInstance) -> c
+    511:515:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    519:519:float getHeadYRot(int) -> a
+    523:523:float getHeadXRot(int) -> b
+    527:527:int getInvulnerableTicks() -> eM
+    531:532:void setInvulnerableTicks(int) -> s
+    535:535:int getAlternativeTarget(int) -> t
+    539:540:void setAlternativeTarget(int,int) -> a
+    544:544:boolean isPowered() -> T_
+    549:549:net.minecraft.world.entity.MobType getMobType() -> dB
+    554:554:boolean canRide(net.minecraft.world.entity.Entity) -> n
+    559:559:boolean canChangeDimensions() -> bK
+    575:578:boolean canBeAffected(net.minecraft.world.effect.MobEffectInstance) -> d
+    76:76:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> j
+    61:77:void <clinit>() -> <clinit>
+net.minecraft.world.entity.boss.wither.WitherBoss$WitherDoNothingGoal -> baw$a:
     net.minecraft.world.entity.boss.wither.WitherBoss this$0 -> a
-    559:561:void <init>(net.minecraft.world.entity.boss.wither.WitherBoss) -> <init>
-    565:565:boolean canUse() -> a
-net.minecraft.world.entity.boss.wither.package-info -> avo:
-net.minecraft.world.entity.decoration.ArmorStand -> avp:
-    net.minecraft.core.Rotations DEFAULT_HEAD_POSE -> br
-    net.minecraft.core.Rotations DEFAULT_BODY_POSE -> bs
-    net.minecraft.core.Rotations DEFAULT_LEFT_ARM_POSE -> bt
-    net.minecraft.core.Rotations DEFAULT_RIGHT_ARM_POSE -> bu
-    net.minecraft.core.Rotations DEFAULT_LEFT_LEG_POSE -> bv
-    net.minecraft.core.Rotations DEFAULT_RIGHT_LEG_POSE -> bw
+    563:565:void <init>(net.minecraft.world.entity.boss.wither.WitherBoss) -> <init>
+    569:569:boolean canUse() -> a
+net.minecraft.world.entity.boss.wither.package-info -> bax:
+net.minecraft.world.entity.decoration.ArmorStand -> bay:
+    net.minecraft.core.Rotations DEFAULT_HEAD_POSE -> bq
+    net.minecraft.core.Rotations DEFAULT_BODY_POSE -> br
+    net.minecraft.core.Rotations DEFAULT_LEFT_ARM_POSE -> bs
+    net.minecraft.core.Rotations DEFAULT_RIGHT_ARM_POSE -> bt
+    net.minecraft.core.Rotations DEFAULT_LEFT_LEG_POSE -> bu
+    net.minecraft.core.Rotations DEFAULT_RIGHT_LEG_POSE -> bv
     net.minecraft.network.syncher.EntityDataAccessor DATA_CLIENT_FLAGS -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_HEAD_POSE -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_BODY_POSE -> d
     net.minecraft.network.syncher.EntityDataAccessor DATA_LEFT_ARM_POSE -> e
     net.minecraft.network.syncher.EntityDataAccessor DATA_RIGHT_ARM_POSE -> f
     net.minecraft.network.syncher.EntityDataAccessor DATA_LEFT_LEG_POSE -> g
-    net.minecraft.network.syncher.EntityDataAccessor DATA_RIGHT_LEG_POSE -> bp
-    java.util.function.Predicate RIDABLE_MINECARTS -> bx
-    net.minecraft.core.NonNullList handItems -> by
-    net.minecraft.core.NonNullList armorItems -> bz
-    boolean invisible -> bA
-    long lastHit -> bq
-    int disabledSlots -> bB
-    net.minecraft.core.Rotations headPose -> bC
-    net.minecraft.core.Rotations bodyPose -> bD
-    net.minecraft.core.Rotations leftArmPose -> bE
-    net.minecraft.core.Rotations rightArmPose -> bF
-    net.minecraft.core.Rotations leftLegPose -> bG
-    net.minecraft.core.Rotations rightLegPose -> bH
-    80:96:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    99:101:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    105:110:void refreshDimensions() -> z_
-    113:113:boolean hasPhysics() -> A
-    118:118:boolean isEffectiveAi() -> dx
-    123:131:void defineSynchedData() -> w_
-    135:135:java.lang.Iterable getHandSlots() -> bc
-    140:140:java.lang.Iterable getArmorSlots() -> bd
-    145:151:net.minecraft.world.item.ItemStack getItemBySlot(net.minecraft.world.entity.EquipmentSlot) -> b
-    156:166:void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
-    171:192:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
-    197:198:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
-    203:236:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    240:269:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    272:289:void readPose(net.minecraft.nbt.CompoundTag) -> g
-    292:311:net.minecraft.nbt.CompoundTag writePose() -> B
-    317:317:boolean isPushable() -> aL
-    323:323:void doPush(net.minecraft.world.entity.Entity) -> C
-    328:336:void pushEntities() -> dv
-    340:370:net.minecraft.world.InteractionResult interactAt(net.minecraft.world.entity.player.Player,net.minecraft.world.phys.Vec3,net.minecraft.world.InteractionHand) -> a
-    374:390:net.minecraft.world.entity.EquipmentSlot getClickedSlot(net.minecraft.world.phys.Vec3) -> f
-    394:394:boolean isDisabled(net.minecraft.world.entity.EquipmentSlot) -> d
-    398:431:boolean swapItem(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
-    436:491:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    496:504:void handleEntityEvent(byte) -> a
-    508:513:boolean shouldRenderAtSqrDistance(double) -> a
-    517:520:void showBreakingParticles() -> D
-    523:531:void causeDamage(net.minecraft.world.damagesource.DamageSource,float) -> e
-    534:536:void brokenByPlayer(net.minecraft.world.damagesource.DamageSource) -> f
-    539:555:void brokenByAnything(net.minecraft.world.damagesource.DamageSource) -> g
-    558:559:void playBrokenSound() -> F
-    563:565:float tickHeadTurn(float,float) -> f
-    570:570:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    575:575:double getRidingHeight() -> aR
-    580:584:void travel(net.minecraft.world.phys.Vec3) -> e
-    588:590:void setYBodyRot(float) -> l
-    594:596:void setYHeadRot(float) -> k
-    600:626:void tick() -> h
-    630:631:void updateInvisibilityStatus() -> C
-    635:637:void setInvisible(boolean) -> i
-    641:641:boolean isBaby() -> x_
-    646:647:void kill() -> U
-    651:651:boolean ignoreExplosion() -> ca
-    656:659:net.minecraft.world.level.material.PushReaction getPistonPushReaction() -> A_
-    663:664:void setSmall(boolean) -> n
-    667:667:boolean isSmall() -> l
-    671:672:void setShowArms(boolean) -> o
-    675:675:boolean isShowArms() -> n
-    679:680:void setNoBasePlate(boolean) -> p
-    683:683:boolean isNoBasePlate() -> o
-    687:688:void setMarker(boolean) -> q
-    691:691:boolean isMarker() -> p
-    695:700:byte setBit(byte,int,boolean) -> a
-    704:706:void setHeadPose(net.minecraft.core.Rotations) -> a
-    709:711:void setBodyPose(net.minecraft.core.Rotations) -> b
-    714:716:void setLeftArmPose(net.minecraft.core.Rotations) -> c
-    719:721:void setRightArmPose(net.minecraft.core.Rotations) -> d
-    724:726:void setLeftLegPose(net.minecraft.core.Rotations) -> e
-    729:731:void setRightLegPose(net.minecraft.core.Rotations) -> f
-    734:734:net.minecraft.core.Rotations getHeadPose() -> r
-    738:738:net.minecraft.core.Rotations getBodyPose() -> s
-    742:742:net.minecraft.core.Rotations getLeftArmPose() -> u
-    746:746:net.minecraft.core.Rotations getRightArmPose() -> v
-    750:750:net.minecraft.core.Rotations getLeftLegPose() -> w
-    754:754:net.minecraft.core.Rotations getRightLegPose() -> z
-    759:759:boolean isPickable() -> aK
-    764:764:boolean skipAttackInteraction(net.minecraft.world.entity.Entity) -> t
-    769:769:net.minecraft.world.entity.HumanoidArm getMainArm() -> dA
-    774:774:net.minecraft.sounds.SoundEvent getFallDamageSound(int) -> o
-    780:780:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    786:786:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    791:791:void thunderHit(net.minecraft.world.entity.global.LightningBolt) -> a
-    795:795:boolean isAffectedByPotions() -> dM
-    800:805:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    809:809:boolean attackable() -> dN
-    814:815:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
-    78:78:boolean lambda$static$0(net.minecraft.world.entity.Entity) -> a
-    50:78:void <clinit>() -> <clinit>
-net.minecraft.world.entity.decoration.ArmorStand$1 -> avp$1:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_RIGHT_LEG_POSE -> bo
+    java.util.function.Predicate RIDABLE_MINECARTS -> bw
+    net.minecraft.core.NonNullList handItems -> bx
+    net.minecraft.core.NonNullList armorItems -> by
+    boolean invisible -> bz
+    long lastHit -> bp
+    int disabledSlots -> bA
+    net.minecraft.core.Rotations headPose -> bB
+    net.minecraft.core.Rotations bodyPose -> bC
+    net.minecraft.core.Rotations leftArmPose -> bD
+    net.minecraft.core.Rotations rightArmPose -> bE
+    net.minecraft.core.Rotations leftLegPose -> bF
+    net.minecraft.core.Rotations rightLegPose -> bG
+    79:95:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    98:100:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    104:109:void refreshDimensions() -> y_
+    112:112:boolean hasPhysics() -> A
+    117:117:boolean isEffectiveAi() -> dR
+    122:130:void defineSynchedData() -> e
+    134:134:java.lang.Iterable getHandSlots() -> bj
+    139:139:java.lang.Iterable getArmorSlots() -> bk
+    144:150:net.minecraft.world.item.ItemStack getItemBySlot(net.minecraft.world.entity.EquipmentSlot) -> b
+    155:165:void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
+    170:191:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
+    196:197:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
+    202:235:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    239:268:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    271:288:void readPose(net.minecraft.nbt.CompoundTag) -> g
+    291:310:net.minecraft.nbt.CompoundTag writePose() -> B
+    316:316:boolean isPushable() -> aR
+    322:322:void doPush(net.minecraft.world.entity.Entity) -> C
+    327:335:void pushEntities() -> dP
+    339:369:net.minecraft.world.InteractionResult interactAt(net.minecraft.world.entity.player.Player,net.minecraft.world.phys.Vec3,net.minecraft.world.InteractionHand) -> a
+    373:389:net.minecraft.world.entity.EquipmentSlot getClickedSlot(net.minecraft.world.phys.Vec3) -> g
+    393:393:boolean isDisabled(net.minecraft.world.entity.EquipmentSlot) -> d
+    397:430:boolean swapItem(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
+    435:490:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    495:503:void handleEntityEvent(byte) -> a
+    507:512:boolean shouldRenderAtSqrDistance(double) -> a
+    516:519:void showBreakingParticles() -> D
+    522:530:void causeDamage(net.minecraft.world.damagesource.DamageSource,float) -> f
+    533:535:void brokenByPlayer(net.minecraft.world.damagesource.DamageSource) -> f
+    538:554:void brokenByAnything(net.minecraft.world.damagesource.DamageSource) -> g
+    557:558:void playBrokenSound() -> F
+    562:564:float tickHeadTurn(float,float) -> f
+    569:569:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    574:574:double getMyRidingOffset() -> aX
+    579:583:void travel(net.minecraft.world.phys.Vec3) -> f
+    587:589:void setYBodyRot(float) -> l
+    593:595:void setYHeadRot(float) -> k
+    599:625:void tick() -> j
+    629:630:void updateInvisibilityStatus() -> C
+    634:636:void setInvisible(boolean) -> j
+    640:640:boolean isBaby() -> x_
+    645:646:void kill() -> X
+    650:650:boolean ignoreExplosion() -> ch
+    655:658:net.minecraft.world.level.material.PushReaction getPistonPushReaction() -> z_
+    662:663:void setSmall(boolean) -> a
+    666:666:boolean isSmall() -> m
+    670:671:void setShowArms(boolean) -> p
+    674:674:boolean isShowArms() -> o
+    678:679:void setNoBasePlate(boolean) -> q
+    682:682:boolean isNoBasePlate() -> p
+    686:687:void setMarker(boolean) -> r
+    690:690:boolean isMarker() -> q
+    694:699:byte setBit(byte,int,boolean) -> a
+    703:705:void setHeadPose(net.minecraft.core.Rotations) -> a
+    708:710:void setBodyPose(net.minecraft.core.Rotations) -> b
+    713:715:void setLeftArmPose(net.minecraft.core.Rotations) -> c
+    718:720:void setRightArmPose(net.minecraft.core.Rotations) -> d
+    723:725:void setLeftLegPose(net.minecraft.core.Rotations) -> e
+    728:730:void setRightLegPose(net.minecraft.core.Rotations) -> f
+    733:733:net.minecraft.core.Rotations getHeadPose() -> r
+    737:737:net.minecraft.core.Rotations getBodyPose() -> t
+    741:741:net.minecraft.core.Rotations getLeftArmPose() -> u
+    745:745:net.minecraft.core.Rotations getRightArmPose() -> v
+    749:749:net.minecraft.core.Rotations getLeftLegPose() -> x
+    753:753:net.minecraft.core.Rotations getRightLegPose() -> z
+    758:758:boolean isPickable() -> aQ
+    763:763:boolean skipAttackInteraction(net.minecraft.world.entity.Entity) -> t
+    768:768:net.minecraft.world.entity.HumanoidArm getMainArm() -> dU
+    773:773:net.minecraft.sounds.SoundEvent getFallDamageSound(int) -> o
+    779:779:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    785:785:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    790:790:void thunderHit(net.minecraft.world.entity.LightningBolt) -> a
+    794:794:boolean isAffectedByPotions() -> eg
+    799:804:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    808:808:boolean attackable() -> eh
+    813:814:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
+    77:77:boolean lambda$static$0(net.minecraft.world.entity.Entity) -> a
+    49:77:void <clinit>() -> <clinit>
+net.minecraft.world.entity.decoration.ArmorStand$1 -> bay$1:
     int[] $SwitchMap$net$minecraft$world$entity$EquipmentSlot$Type -> a
-    145:145:void <clinit>() -> <clinit>
-net.minecraft.world.entity.decoration.HangingEntity -> avq:
+    144:144:void <clinit>() -> <clinit>
+net.minecraft.world.entity.decoration.HangingEntity -> baz:
     java.util.function.Predicate HANGING_ENTITY -> b
     int checkInterval -> e
     net.minecraft.core.BlockPos pos -> c
     net.minecraft.core.Direction direction -> d
     32:36:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     39:41:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> <init>
-    45:45:void defineSynchedData() -> w_
+    45:45:void defineSynchedData() -> e
     48:56:void setDirection(net.minecraft.core.Direction) -> a
-    59:95:void recalculateBoundingBox() -> f
+    59:95:void recalculateBoundingBox() -> g
     98:98:double offs(int) -> a
-    103:110:void tick() -> h
-    113:138:boolean survives() -> i
-    143:143:boolean isPickable() -> aK
-    148:155:boolean skipAttackInteraction(net.minecraft.world.entity.Entity) -> t
-    160:160:net.minecraft.core.Direction getDirection() -> bQ
-    165:173:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    178:182:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
-    186:190:void push(double,double,double) -> h
-    194:199:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    203:205:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    int getWidth() -> k
-    int getHeight() -> l
+    103:115:void tick() -> j
+    118:143:boolean survives() -> h
+    148:148:boolean isPickable() -> aQ
+    153:160:boolean skipAttackInteraction(net.minecraft.world.entity.Entity) -> t
+    165:165:net.minecraft.core.Direction getDirection() -> bY
+    170:178:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    183:187:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
+    191:195:void push(double,double,double) -> h
+    199:204:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    208:210:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    int getWidth() -> i
+    int getHeight() -> k
     void dropItem(net.minecraft.world.entity.Entity) -> a
     void playPlacementSound() -> m
-    217:220:net.minecraft.world.entity.item.ItemEntity spawnAtLocation(net.minecraft.world.item.ItemStack,float) -> a
-    225:225:boolean repositionEntityAfterLoad() -> aM
-    230:233:void setPos(double,double,double) -> d
-    236:236:net.minecraft.core.BlockPos getPos() -> n
-    241:266:float rotate(net.minecraft.world.level.block.Rotation) -> a
-    272:272:float mirror(net.minecraft.world.level.block.Mirror) -> a
-    277:277:void thunderHit(net.minecraft.world.entity.global.LightningBolt) -> a
-    282:282:void refreshDimensions() -> z_
+    222:225:net.minecraft.world.entity.item.ItemEntity spawnAtLocation(net.minecraft.world.item.ItemStack,float) -> a
+    230:230:boolean repositionEntityAfterLoad() -> aS
+    235:238:void setPos(double,double,double) -> d
+    241:241:net.minecraft.core.BlockPos getPos() -> n
+    246:271:float rotate(net.minecraft.world.level.block.Rotation) -> a
+    277:277:float mirror(net.minecraft.world.level.block.Mirror) -> a
+    282:282:void thunderHit(net.minecraft.world.entity.LightningBolt) -> a
+    287:287:void refreshDimensions() -> y_
     28:28:boolean lambda$static$0(net.minecraft.world.entity.Entity) -> b
     28:28:void <clinit>() -> <clinit>
-net.minecraft.world.entity.decoration.HangingEntity$1 -> avq$1:
+net.minecraft.world.entity.decoration.HangingEntity$1 -> baz$1:
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
-    242:242:void <clinit>() -> <clinit>
-net.minecraft.world.entity.decoration.ItemFrame -> avr:
+    247:247:void <clinit>() -> <clinit>
+net.minecraft.world.entity.decoration.ItemFrame -> bba:
     org.apache.logging.log4j.Logger LOGGER -> e
     net.minecraft.network.syncher.EntityDataAccessor DATA_ITEM -> f
     net.minecraft.network.syncher.EntityDataAccessor DATA_ROTATION -> g
-    float dropChance -> ao
-    43:47:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    43:52:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> <init>
-    56:56:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
-    61:63:void defineSynchedData() -> w_
-    67:81:void setDirection(net.minecraft.core.Direction) -> a
-    85:116:void recalculateBoundingBox() -> f
-    120:129:boolean survives() -> i
-    134:134:float getPickRadius() -> aV
-    139:141:void kill() -> U
-    145:156:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    161:161:int getWidth() -> k
-    166:166:int getHeight() -> l
-    171:173:boolean shouldRenderAtSqrDistance(double) -> a
-    178:180:void dropItem(net.minecraft.world.entity.Entity) -> a
-    184:185:void playPlacementSound() -> m
-    188:217:void dropItem(net.minecraft.world.entity.Entity,boolean) -> b
-    220:226:void removeFramedMap(net.minecraft.world.item.ItemStack) -> c
-    229:229:net.minecraft.world.item.ItemStack getItem() -> o
-    233:234:void setItem(net.minecraft.world.item.ItemStack) -> b
-    237:250:void setItem(net.minecraft.world.item.ItemStack,boolean) -> a
-    254:259:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
-    264:270:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    273:273:int getRotation() -> p
-    277:278:void setRotation(int) -> a
-    281:286:void setRotation(int,boolean) -> a
-    290:299:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    303:328:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    332:353:boolean interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
-    357:361:int getAnalogOutput() -> q
-    366:366:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    37:40:void <clinit>() -> <clinit>
-net.minecraft.world.entity.decoration.ItemFrame$1 -> avr$1:
+    float dropChance -> an
+    boolean fixed -> ao
+    46:51:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    46:56:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> <init>
+    60:60:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
+    65:67:void defineSynchedData() -> e
+    71:85:void setDirection(net.minecraft.core.Direction) -> a
+    89:120:void recalculateBoundingBox() -> g
+    124:137:boolean survives() -> h
+    142:145:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
+    149:152:void push(double,double,double) -> h
+    156:156:float getPickRadius() -> bc
+    161:163:void kill() -> X
+    167:185:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    190:190:int getWidth() -> i
+    195:195:int getHeight() -> k
+    200:202:boolean shouldRenderAtSqrDistance(double) -> a
+    207:209:void dropItem(net.minecraft.world.entity.Entity) -> a
+    213:214:void playPlacementSound() -> m
+    217:250:void dropItem(net.minecraft.world.entity.Entity,boolean) -> b
+    253:259:void removeFramedMap(net.minecraft.world.item.ItemStack) -> c
+    262:262:net.minecraft.world.item.ItemStack getItem() -> o
+    266:267:void setItem(net.minecraft.world.item.ItemStack) -> b
+    270:283:void setItem(net.minecraft.world.item.ItemStack,boolean) -> a
+    287:292:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
+    297:303:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    306:306:int getRotation() -> p
+    310:311:void setRotation(int) -> a
+    314:319:void setRotation(int,boolean) -> a
+    323:334:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    338:365:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    369:395:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    399:403:int getAnalogOutput() -> q
+    408:408:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    40:43:void <clinit>() -> <clinit>
+net.minecraft.world.entity.decoration.ItemFrame$1 -> bba$1:
     int[] $SwitchMap$net$minecraft$core$Direction$Axis -> a
-    100:100:void <clinit>() -> <clinit>
-net.minecraft.world.entity.decoration.LeashFenceKnotEntity -> avs:
-    26:27:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    30:38:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> <init>
-    42:43:void setPos(double,double,double) -> d
-    47:48:void recalculateBoundingBox() -> f
-    53:53:void setDirection(net.minecraft.core.Direction) -> a
-    57:57:int getWidth() -> k
-    62:62:int getHeight() -> l
-    67:67:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
-    72:72:boolean shouldRenderAtSqrDistance(double) -> a
-    77:78:void dropItem(net.minecraft.world.entity.Entity) -> a
-    82:82:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    86:86:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    90:115:boolean interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
-    121:121:boolean survives() -> i
-    125:139:net.minecraft.world.entity.decoration.LeashFenceKnotEntity getOrCreateKnot(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    144:145:void playPlacementSound() -> m
-    149:149:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-net.minecraft.world.entity.decoration.Motive -> avt:
+    104:104:void <clinit>() -> <clinit>
+net.minecraft.world.entity.decoration.LeashFenceKnotEntity -> bbb:
+    27:28:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    31:39:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> <init>
+    43:44:void setPos(double,double,double) -> d
+    48:49:void recalculateBoundingBox() -> g
+    54:54:void setDirection(net.minecraft.core.Direction) -> a
+    58:58:int getWidth() -> i
+    63:63:int getHeight() -> k
+    68:68:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
+    73:73:boolean shouldRenderAtSqrDistance(double) -> a
+    78:79:void dropItem(net.minecraft.world.entity.Entity) -> a
+    83:83:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    87:87:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    91:116:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    122:122:boolean survives() -> h
+    126:140:net.minecraft.world.entity.decoration.LeashFenceKnotEntity getOrCreateKnot(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    145:146:void playPlacementSound() -> m
+    150:150:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+net.minecraft.world.entity.decoration.Motive -> bbc:
     net.minecraft.world.entity.decoration.Motive KEBAB -> a
     net.minecraft.world.entity.decoration.Motive AZTEC -> b
     net.minecraft.world.entity.decoration.Motive ALBAN -> c
@@ -42711,195 +46548,133 @@ net.minecraft.world.entity.decoration.Motive -> avt:
     46:46:int getWidth() -> a
     50:50:int getHeight() -> b
     6:31:void <clinit>() -> <clinit>
-net.minecraft.world.entity.decoration.Painting -> avu:
+net.minecraft.world.entity.decoration.Painting -> bbd:
     net.minecraft.world.entity.decoration.Motive motive -> e
     27:28:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     31:59:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> <init>
     62:66:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction,net.minecraft.world.entity.decoration.Motive) -> <init>
     70:72:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     76:78:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    82:85:int getWidth() -> k
-    90:93:int getHeight() -> l
+    82:85:int getWidth() -> i
+    90:93:int getHeight() -> k
     98:113:void dropItem(net.minecraft.world.entity.Entity) -> a
     117:118:void playPlacementSound() -> m
     122:123:void moveTo(double,double,double,float,float) -> b
     127:129:void lerpTo(double,double,double,float,float,int,boolean) -> a
-    133:133:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-net.minecraft.world.entity.decoration.package-info -> avv:
-net.minecraft.world.entity.fishing.FishingHook -> avw:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_HOOKED_ENTITY -> c
-    boolean inGround -> d
-    int life -> e
-    net.minecraft.world.entity.player.Player owner -> f
-    int flightTime -> g
-    int nibble -> ao
-    int timeUntilLured -> ap
-    int timeUntilHooked -> aq
-    float fishAngle -> ar
-    net.minecraft.world.entity.Entity hookedIn -> b
-    net.minecraft.world.entity.fishing.FishingHook$FishHookState currentState -> as
-    int luck -> at
-    int lureSpeed -> au
-    64:76:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,int,int) -> <init>
-    79:84:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,double,double,double) -> <init>
-    87:121:void <init>(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,int,int) -> <init>
-    125:126:void defineSynchedData() -> w_
-    130:136:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    140:141:boolean shouldRenderAtSqrDistance(double) -> a
-    147:147:void lerpTo(double,double,double,float,float,int,boolean) -> a
-    151:242:void tick() -> h
-    245:253:boolean shouldStopFishing() -> k
-    257:278:void updateRotation() -> l
-    281:291:void checkCollision() -> m
-    294:295:void setHookedEntity() -> n
-    298:385:void catchingFish(net.minecraft.core.BlockPos) -> a
-    388:388:boolean canBeHooked(net.minecraft.world.entity.Entity) -> a
-    393:393:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    397:397:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    400:445:int retrieve(net.minecraft.world.item.ItemStack) -> b
-    450:457:void handleEntityEvent(byte) -> a
-    460:471:void bringInHookedEntity() -> f
-    475:475:boolean isMovementNoisy() -> at
-    480:484:void remove() -> X
-    488:488:net.minecraft.world.entity.player.Player getOwner() -> i
-    493:493:boolean canChangeDimensions() -> bC
-    498:499:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    281:281:boolean lambda$checkCollision$0(net.minecraft.world.entity.Entity) -> b
-    51:51:void <clinit>() -> <clinit>
-net.minecraft.world.entity.fishing.FishingHook$FishHookState -> avw$a:
-    net.minecraft.world.entity.fishing.FishingHook$FishHookState FLYING -> a
-    net.minecraft.world.entity.fishing.FishingHook$FishHookState HOOKED_IN_ENTITY -> b
-    net.minecraft.world.entity.fishing.FishingHook$FishHookState BOBBING -> c
-    net.minecraft.world.entity.fishing.FishingHook$FishHookState[] $VALUES -> d
-    49:49:net.minecraft.world.entity.fishing.FishingHook$FishHookState[] values() -> values
-    49:49:net.minecraft.world.entity.fishing.FishingHook$FishHookState valueOf(java.lang.String) -> valueOf
-    49:49:void <init>(java.lang.String,int) -> <init>
-    49:49:void <clinit>() -> <clinit>
-net.minecraft.world.entity.fishing.package-info -> avx:
-net.minecraft.world.entity.global.LightningBolt -> avy:
-    int life -> c
-    long seed -> b
-    int flashes -> d
-    boolean visualOnly -> e
-    net.minecraft.server.level.ServerPlayer cause -> f
-    34:46:void <init>(net.minecraft.world.level.Level,double,double,double,boolean) -> <init>
-    50:50:net.minecraft.sounds.SoundSource getSoundSource() -> cl
-    55:55:net.minecraft.server.level.ServerPlayer getCause() -> f
-    59:60:void setCause(net.minecraft.server.level.ServerPlayer) -> d
-    64:97:void tick() -> h
-    100:117:void spawnFire(int) -> a
-    122:123:boolean shouldRenderAtSqrDistance(double) -> a
-    128:128:void defineSynchedData() -> w_
-    132:132:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    136:136:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    141:141:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-net.minecraft.world.entity.global.package-info -> avz:
-net.minecraft.world.entity.item.FallingBlockEntity -> awa:
+    133:133:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+net.minecraft.world.entity.decoration.package-info -> bbe:
+net.minecraft.world.entity.item.FallingBlockEntity -> bbf:
     net.minecraft.world.level.block.state.BlockState blockState -> f
     int time -> b
     boolean dropItem -> c
     boolean cancelDrop -> g
-    boolean hurtEntities -> ao
-    int fallDamageMax -> ap
-    float fallDamageAmount -> aq
+    boolean hurtEntities -> an
+    int fallDamageMax -> ao
+    float fallDamageAmount -> ap
     net.minecraft.nbt.CompoundTag blockData -> d
     net.minecraft.network.syncher.EntityDataAccessor DATA_START_POS -> e
     44:57:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     60:73:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.level.block.state.BlockState) -> <init>
-    77:77:boolean isAttackable() -> bA
+    77:77:boolean isAttackable() -> bH
     81:82:void setStartPos(net.minecraft.core.BlockPos) -> a
-    85:85:net.minecraft.core.BlockPos getStartPos() -> f
-    90:90:boolean isMovementNoisy() -> at
-    95:96:void defineSynchedData() -> w_
-    100:100:boolean isPickable() -> aK
-    105:203:void tick() -> h
+    85:85:net.minecraft.core.BlockPos getStartPos() -> g
+    90:90:boolean isMovementNoisy() -> ax
+    95:96:void defineSynchedData() -> e
+    100:100:boolean isPickable() -> aQ
+    105:203:void tick() -> j
     207:228:boolean causeFallDamage(float,float) -> b
     233:242:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     246:269:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    272:272:net.minecraft.world.level.Level getLevel() -> i
+    272:272:net.minecraft.world.level.Level getLevel() -> h
     276:277:void setHurtsEntities(boolean) -> a
-    281:281:boolean displayFireAnimation() -> bI
+    281:281:boolean displayFireAnimation() -> bQ
     286:288:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
-    291:291:net.minecraft.world.level.block.state.BlockState getBlockState() -> k
-    296:296:boolean onlyOpCanSetNbt() -> cb
-    301:301:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
+    291:291:net.minecraft.world.level.block.state.BlockState getBlockState() -> i
+    296:296:boolean onlyOpCanSetNbt() -> ci
+    301:301:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
     53:53:void <clinit>() -> <clinit>
-net.minecraft.world.entity.item.ItemEntity -> awb:
+net.minecraft.world.entity.item.ItemEntity -> bbg:
     net.minecraft.network.syncher.EntityDataAccessor DATA_ITEM -> c
     int age -> d
     int pickupDelay -> e
     int health -> f
     java.util.UUID thrower -> g
-    java.util.UUID owner -> ao
+    java.util.UUID owner -> an
     float bobOffs -> b
-    46:53:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    56:66:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    69:71:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.item.ItemStack) -> <init>
-    75:75:boolean isMovementNoisy() -> at
-    80:81:void defineSynchedData() -> w_
-    85:167:void tick() -> h
-    170:178:void setUnderwaterMovement() -> u
-    181:193:void mergeWithNeighbours() -> v
-    196:197:boolean isMergable() -> w
-    201:213:void tryToMerge(net.minecraft.world.entity.item.ItemEntity) -> a
-    216:228:boolean areMergable(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    232:236:net.minecraft.world.item.ItemStack merge(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,int) -> a
-    240:242:void merge(net.minecraft.world.entity.item.ItemEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    245:252:void merge(net.minecraft.world.entity.item.ItemEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.item.ItemEntity,net.minecraft.world.item.ItemStack) -> a
-    256:257:void burn(int) -> h
-    261:272:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    277:289:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    293:309:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    313:330:void playerTouch(net.minecraft.world.entity.player.Player) -> b
-    334:339:net.minecraft.network.chat.Component getName() -> M
-    344:344:boolean isAttackable() -> bA
-    350:355:net.minecraft.world.entity.Entity changeDimension(net.minecraft.world.level.dimension.DimensionType) -> a
-    359:359:net.minecraft.world.item.ItemStack getItem() -> f
-    363:364:void setItem(net.minecraft.world.item.ItemStack) -> b
-    368:368:java.util.UUID getOwner() -> i
-    372:373:void setOwner(java.util.UUID) -> b
-    377:377:java.util.UUID getThrower() -> k
-    381:382:void setThrower(java.util.UUID) -> c
-    385:385:int getAge() -> l
-    390:391:void setDefaultPickUpDelay() -> m
-    394:395:void setNoPickUpDelay() -> n
-    398:399:void setNeverPickUp() -> o
-    402:403:void setPickUpDelay(int) -> a
-    406:406:boolean hasPickUpDelay() -> p
-    410:411:void setUnlimitedLifetime() -> q
-    414:415:void setExtendedLifetime() -> r
-    418:420:void makeFakeItem() -> s
-    424:424:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    184:184:boolean lambda$mergeWithNeighbours$0(net.minecraft.world.entity.item.ItemEntity) -> b
-    37:37:void <clinit>() -> <clinit>
-net.minecraft.world.entity.item.PrimedTnt -> awc:
+    43:51:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    54:64:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    67:69:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.item.ItemStack) -> <init>
+    43:77:void <init>(net.minecraft.world.entity.item.ItemEntity) -> <init>
+    81:81:boolean isMovementNoisy() -> ax
+    86:87:void defineSynchedData() -> e
+    91:170:void tick() -> j
+    173:181:void setUnderwaterMovement() -> u
+    184:192:void setUnderLavaMovement() -> v
+    195:207:void mergeWithNeighbours() -> x
+    210:211:boolean isMergable() -> z
+    215:227:void tryToMerge(net.minecraft.world.entity.item.ItemEntity) -> a
+    230:242:boolean areMergable(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    246:250:net.minecraft.world.item.ItemStack merge(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,int) -> a
+    254:256:void merge(net.minecraft.world.entity.item.ItemEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    259:266:void merge(net.minecraft.world.entity.item.ItemEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.item.ItemEntity,net.minecraft.world.item.ItemStack) -> a
+    270:270:boolean fireImmune() -> az
+    275:276:void burn(int) -> h
+    280:294:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    299:311:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    315:331:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    335:353:void playerTouch(net.minecraft.world.entity.player.Player) -> a_
+    357:362:net.minecraft.network.chat.Component getName() -> P
+    367:367:boolean isAttackable() -> bH
+    373:378:net.minecraft.world.entity.Entity changeDimension(net.minecraft.server.level.ServerLevel) -> a
+    382:382:net.minecraft.world.item.ItemStack getItem() -> g
+    386:387:void setItem(net.minecraft.world.item.ItemStack) -> b
+    391:395:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    399:399:java.util.UUID getOwner() -> h
+    403:404:void setOwner(java.util.UUID) -> b
+    408:408:java.util.UUID getThrower() -> i
+    412:413:void setThrower(java.util.UUID) -> c
+    416:416:int getAge() -> k
+    421:422:void setDefaultPickUpDelay() -> m
+    425:426:void setNoPickUpDelay() -> n
+    429:430:void setNeverPickUp() -> o
+    433:434:void setPickUpDelay(int) -> a
+    437:437:boolean hasPickUpDelay() -> p
+    441:442:void setUnlimitedLifetime() -> q
+    445:446:void setExtendedLifetime() -> r
+    449:451:void makeFakeItem() -> s
+    454:454:float getSpin(float) -> a
+    459:459:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    463:463:net.minecraft.world.entity.item.ItemEntity copy() -> t
+    198:198:boolean lambda$mergeWithNeighbours$0(net.minecraft.world.entity.item.ItemEntity) -> b
+    35:35:void <clinit>() -> <clinit>
+net.minecraft.world.entity.item.PrimedTnt -> bbh:
     net.minecraft.network.syncher.EntityDataAccessor DATA_FUSE_ID -> b
     net.minecraft.world.entity.LivingEntity owner -> c
     int life -> d
     28:33:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     36:54:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.entity.LivingEntity) -> <init>
-    58:59:void defineSynchedData() -> w_
-    63:63:boolean isMovementNoisy() -> at
-    68:68:boolean isPickable() -> aK
-    73:96:void tick() -> h
-    99:101:void explode() -> l
+    58:59:void defineSynchedData() -> e
+    63:63:boolean isMovementNoisy() -> ax
+    68:68:boolean isPickable() -> aQ
+    73:96:void tick() -> j
+    99:101:void explode() -> k
     105:106:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     110:111:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    115:115:net.minecraft.world.entity.LivingEntity getOwner() -> f
+    115:115:net.minecraft.world.entity.LivingEntity getOwner() -> g
     120:120:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
     124:126:void setFuse(int) -> a
     130:133:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    136:136:int getFuse() -> i
-    140:140:int getLife() -> k
-    145:145:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
+    136:136:int getFuse() -> h
+    140:140:int getLife() -> i
+    145:145:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
     23:23:void <clinit>() -> <clinit>
-net.minecraft.world.entity.item.package-info -> awd:
-net.minecraft.world.entity.monster.AbstractIllager -> awe:
+net.minecraft.world.entity.item.package-info -> bbi:
+net.minecraft.world.entity.monster.AbstractIllager -> bbj:
     23:24:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    28:29:void registerGoals() -> n
-    33:33:net.minecraft.world.entity.MobType getMobType() -> di
-    37:37:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose getArmPose() -> l
-net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose -> awe$a:
+    28:29:void registerGoals() -> o
+    33:33:net.minecraft.world.entity.MobType getMobType() -> dB
+    37:37:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose getArmPose() -> m
+net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose -> bbj$a:
     net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose CROSSED -> a
     net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose ATTACKING -> b
     net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose SPELLCASTING -> c
@@ -42913,323 +46688,339 @@ net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose -> awe$a:
     10:10:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose valueOf(java.lang.String) -> valueOf
     10:10:void <init>(java.lang.String,int) -> <init>
     10:18:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.AbstractIllager$RaiderOpenDoorGoal -> awe$b:
+net.minecraft.world.entity.monster.AbstractIllager$RaiderOpenDoorGoal -> bbj$b:
     net.minecraft.world.entity.monster.AbstractIllager this$0 -> a
     41:43:void <init>(net.minecraft.world.entity.monster.AbstractIllager,net.minecraft.world.entity.raid.Raider) -> <init>
     47:47:boolean canUse() -> a
-net.minecraft.world.entity.monster.AbstractSkeleton -> awf:
+net.minecraft.world.entity.monster.AbstractSkeleton -> bbk:
     net.minecraft.world.entity.ai.goal.RangedBowAttackGoal bowGoal -> b
     net.minecraft.world.entity.ai.goal.MeleeAttackGoal meleeGoal -> c
-    48:67:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    71:82:void registerGoals() -> n
-    86:89:void registerAttributes() -> cA
-    93:94:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    net.minecraft.sounds.SoundEvent getStepSound() -> l
-    100:100:net.minecraft.world.entity.MobType getMobType() -> di
-    105:126:void aiStep() -> k
-    130:136:void rideTick() -> aQ
-    140:143:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
-    148:167:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    171:190:void reassessWeaponGoal() -> eq
-    194:204:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
-    207:207:net.minecraft.world.entity.projectile.AbstractArrow getArrow(net.minecraft.world.item.ItemStack,float) -> b
-    212:215:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    219:224:void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
-    228:228:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    233:233:double getRidingHeight() -> aR
-net.minecraft.world.entity.monster.AbstractSkeleton$1 -> awf$1:
-    net.minecraft.world.entity.monster.AbstractSkeleton this$0 -> d
-    49:49:void <init>(net.minecraft.world.entity.monster.AbstractSkeleton,net.minecraft.world.entity.PathfinderMob,double,boolean) -> <init>
-    52:54:void stop() -> d
-    58:60:void start() -> c
-net.minecraft.world.entity.monster.Blaze -> awg:
+    52:71:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    75:86:void registerGoals() -> o
+    89:90:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    95:96:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    net.minecraft.sounds.SoundEvent getStepSound() -> eL
+    102:102:net.minecraft.world.entity.MobType getMobType() -> dB
+    107:128:void aiStep() -> k
+    132:138:void rideTick() -> aW
+    142:145:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
+    150:169:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    173:192:void reassessWeaponGoal() -> eM
+    196:206:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
+    209:209:net.minecraft.world.entity.projectile.AbstractArrow getArrow(net.minecraft.world.item.ItemStack,float) -> b
+    214:214:boolean canFireProjectileWeapon(net.minecraft.world.item.ProjectileWeaponItem) -> a
+    219:222:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    226:231:void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
+    235:235:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    240:240:double getMyRidingOffset() -> aX
+net.minecraft.world.entity.monster.AbstractSkeleton$1 -> bbk$1:
+    net.minecraft.world.entity.monster.AbstractSkeleton this$0 -> b
+    53:53:void <init>(net.minecraft.world.entity.monster.AbstractSkeleton,net.minecraft.world.entity.PathfinderMob,double,boolean) -> <init>
+    56:58:void stop() -> d
+    62:64:void start() -> c
+net.minecraft.world.entity.monster.Blaze -> bbl:
     float allowedHeightOffset -> b
     int nextHeightOffsetChangeTick -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_FLAGS_ID -> d
-    32:45:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    49:57:void registerGoals() -> n
-    61:65:void registerAttributes() -> cA
-    69:72:void defineSynchedData() -> w_
-    76:76:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    33:46:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    50:58:void registerGoals() -> o
+    61:64:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    69:72:void defineSynchedData() -> e
+    76:76:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     81:81:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    86:86:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    91:91:float getBrightness() -> aI
+    86:86:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    91:91:float getBrightness() -> aO
     97:111:void aiStep() -> k
-    115:133:void customServerAiStep() -> dT
-    137:137:boolean causeFallDamage(float,float) -> b
-    142:142:boolean isOnFire() -> bf
-    146:146:boolean isCharged() -> l
-    150:157:void setCharged(boolean) -> r
-    31:31:void access$000(net.minecraft.world.entity.monster.Blaze,boolean) -> a
-    35:35:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Blaze$BlazeAttackGoal -> awg$a:
+    115:115:boolean isSensitiveToWater() -> dN
+    120:134:void customServerAiStep() -> N
+    138:138:boolean causeFallDamage(float,float) -> b
+    143:143:boolean isOnFire() -> bm
+    147:147:boolean isCharged() -> eL
+    151:158:void setCharged(boolean) -> t
+    32:32:void access$000(net.minecraft.world.entity.monster.Blaze,boolean) -> a
+    36:36:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Blaze$BlazeAttackGoal -> bbl$a:
     net.minecraft.world.entity.monster.Blaze blaze -> a
     int attackStep -> b
     int attackTime -> c
     int lastSeen -> d
-    165:169:void <init>(net.minecraft.world.entity.monster.Blaze) -> <init>
-    173:174:boolean canUse() -> a
-    179:180:void start() -> c
-    184:186:void stop() -> d
-    190:255:void tick() -> e
-    258:258:double getFollowDistance() -> g
-net.minecraft.world.entity.monster.CaveSpider -> awh:
-    23:24:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    28:31:void registerAttributes() -> cA
+    166:170:void <init>(net.minecraft.world.entity.monster.Blaze) -> <init>
+    174:175:boolean canUse() -> a
+    180:181:void start() -> c
+    185:187:void stop() -> d
+    191:258:void tick() -> e
+    261:261:double getFollowDistance() -> g
+net.minecraft.world.entity.monster.CaveSpider -> bbm:
+    25:26:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    29:30:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createCaveSpider() -> m
     35:51:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
     58:58:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
     63:63:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-net.minecraft.world.entity.monster.Creeper -> awi:
+net.minecraft.world.entity.monster.Creeper -> bbn:
     net.minecraft.network.syncher.EntityDataAccessor DATA_SWELL_DIR -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_IS_POWERED -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_IS_IGNITED -> d
-    int oldSwell -> bw
-    int swell -> bx
-    int maxSwell -> by
-    int explosionRadius -> bz
-    int droppedSkulls -> bA
-    47:53:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    57:68:void registerGoals() -> n
-    72:75:void registerAttributes() -> cA
-    79:83:int getMaxFallDistance() -> bD
-    88:94:boolean causeFallDamage(float,float) -> b
-    99:104:void defineSynchedData() -> w_
-    108:115:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    119:130:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    134:156:void tick() -> h
-    160:160:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    165:165:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    170:179:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
-    183:183:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    188:188:boolean isPowered() -> J_
-    192:192:float getSwelling(float) -> v
-    196:196:int getSwellDir() -> l
-    200:201:void setSwellDir(int) -> a
-    205:207:void thunderHit(net.minecraft.world.entity.global.LightningBolt) -> a
-    211:221:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    225:233:void explodeCreeper() -> eu
-    236:249:void spawnLingeringCloud() -> ev
-    252:252:boolean isIgnited() -> eq
-    256:257:void ignite() -> er
-    260:260:boolean canDropMobsSkull() -> es
-    264:265:void increaseDroppedSkulls() -> et
-    216:216:void lambda$mobInteract$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
-    41:43:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.CrossbowAttackMob -> awj:
-    void setChargingCrossbow(boolean) -> a
-    void shootProjectile(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.Projectile,float) -> a
-    net.minecraft.world.entity.LivingEntity getTarget() -> w
-net.minecraft.world.entity.monster.Drowned -> awk:
-    boolean searchingForLand -> bw
+    int oldSwell -> bv
+    int swell -> bw
+    int maxSwell -> bx
+    int explosionRadius -> by
+    int droppedSkulls -> bz
+    50:56:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    60:71:void registerGoals() -> o
+    74:75:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    80:84:int getMaxFallDistance() -> bL
+    89:95:boolean causeFallDamage(float,float) -> b
+    100:105:void defineSynchedData() -> e
+    109:116:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    120:131:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    135:157:void tick() -> j
+    161:161:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    166:166:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    171:180:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
+    184:184:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    189:189:boolean isPowered() -> T_
+    193:193:float getSwelling(float) -> u
+    197:197:int getSwellDir() -> eL
+    201:202:void setSwellDir(int) -> a
+    206:208:void thunderHit(net.minecraft.world.entity.LightningBolt) -> a
+    212:222:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    226:234:void explodeCreeper() -> eQ
+    237:250:void spawnLingeringCloud() -> eT
+    253:253:boolean isIgnited() -> eM
+    257:258:void ignite() -> eN
+    261:261:boolean canDropMobsSkull() -> eO
+    265:266:void increaseDroppedSkulls() -> eP
+    217:217:void lambda$mobInteract$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
+    44:46:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.CrossbowAttackMob -> bbo:
+    void setChargingCrossbow(boolean) -> b
+    void shootCrossbowProjectile(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.Projectile,float) -> a
+    net.minecraft.world.entity.LivingEntity getTarget() -> A
+    void onCrossbowAttackPerformed() -> V_
+    30:36:void performCrossbowAttack(net.minecraft.world.entity.LivingEntity,float) -> b
+    39:48:void shootCrossbowProjectile(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.projectile.Projectile,float,float) -> a
+    51:64:com.mojang.math.Vector3f getProjectileShotVector(net.minecraft.world.entity.LivingEntity,net.minecraft.world.phys.Vec3,float) -> a
+net.minecraft.world.entity.monster.Drowned -> bbp:
+    boolean searchingForLand -> d
     net.minecraft.world.entity.ai.navigation.WaterBoundPathNavigation waterNavigation -> b
     net.minecraft.world.entity.ai.navigation.GroundPathNavigation groundNavigation -> c
-    62:69:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    73:85:void addBehaviourGoals() -> l
-    89:98:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    102:110:boolean checkDrownedSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    115:115:boolean isDeepEnoughToSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    120:120:boolean supportsBreakDoorGoal() -> eq
-    125:128:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    133:136:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    141:144:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    149:149:net.minecraft.sounds.SoundEvent getStepSound() -> er
-    154:154:net.minecraft.sounds.SoundEvent getSwimSound() -> am
-    159:159:net.minecraft.world.item.ItemStack getSkull() -> es
-    164:172:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
-    176:190:boolean canReplaceCurrentItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.EquipmentSlot) -> a
-    195:195:boolean convertsInWater() -> et
-    200:200:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
-    204:211:boolean okTarget(net.minecraft.world.entity.LivingEntity) -> i
-    216:216:boolean isPushedByWater() -> bM
-    220:229:boolean wantsToSwim() -> ez
-    234:242:void travel(net.minecraft.world.phys.Vec3) -> e
-    246:255:void updateSwimming() -> aB
-    258:268:boolean closeToNextPos() -> eu
-    273:282:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
-    285:286:void setSearchingForLand(boolean) -> r
-    53:53:net.minecraft.world.entity.ai.navigation.PathNavigation access$002(net.minecraft.world.entity.monster.Drowned,net.minecraft.world.entity.ai.navigation.PathNavigation) -> a
-    53:53:boolean access$100(net.minecraft.world.entity.monster.Drowned) -> a
-    53:53:boolean access$200(net.minecraft.world.entity.monster.Drowned) -> b
-net.minecraft.world.entity.monster.Drowned$DrownedAttackGoal -> awk$a:
-    net.minecraft.world.entity.monster.Drowned drowned -> d
-    471:473:void <init>(net.minecraft.world.entity.monster.Drowned,double,boolean) -> <init>
-    477:477:boolean canUse() -> a
-    482:482:boolean canContinueToUse() -> b
-net.minecraft.world.entity.monster.Drowned$DrownedGoToBeachGoal -> awk$b:
+    63:70:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    74:86:void addBehaviourGoals() -> m
+    90:99:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    103:111:boolean checkDrownedSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
+    116:116:boolean isDeepEnoughToSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    121:121:boolean supportsBreakDoorGoal() -> eL
+    126:129:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    134:137:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    142:145:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    150:150:net.minecraft.sounds.SoundEvent getStepSound() -> eM
+    155:155:net.minecraft.sounds.SoundEvent getSwimSound() -> aq
+    160:160:net.minecraft.world.item.ItemStack getSkull() -> eN
+    165:173:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
+    177:191:boolean canReplaceCurrentItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    196:196:boolean convertsInWater() -> eO
+    201:201:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
+    205:212:boolean okTarget(net.minecraft.world.entity.LivingEntity) -> j
+    217:217:boolean isPushedByFluid() -> bU
+    221:230:boolean wantsToSwim() -> eX
+    235:243:void travel(net.minecraft.world.phys.Vec3) -> f
+    247:256:void updateSwimming() -> aF
+    259:269:boolean closeToNextPos() -> eP
+    274:283:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
+    286:287:void setSearchingForLand(boolean) -> t
+    54:54:net.minecraft.world.entity.ai.navigation.PathNavigation access$002(net.minecraft.world.entity.monster.Drowned,net.minecraft.world.entity.ai.navigation.PathNavigation) -> a
+    54:54:boolean access$100(net.minecraft.world.entity.monster.Drowned) -> a
+    54:54:boolean access$200(net.minecraft.world.entity.monster.Drowned) -> b
+    54:54:boolean access$300(net.minecraft.world.entity.monster.Drowned) -> c
+net.minecraft.world.entity.monster.Drowned$DrownedAttackGoal -> bbp$a:
+    net.minecraft.world.entity.monster.Drowned drowned -> b
+    472:474:void <init>(net.minecraft.world.entity.monster.Drowned,double,boolean) -> <init>
+    478:478:boolean canUse() -> a
+    483:483:boolean canContinueToUse() -> b
+net.minecraft.world.entity.monster.Drowned$DrownedGoToBeachGoal -> bbp$b:
     net.minecraft.world.entity.monster.Drowned drowned -> g
-    370:372:void <init>(net.minecraft.world.entity.monster.Drowned,double) -> <init>
-    376:376:boolean canUse() -> a
-    381:381:boolean canContinueToUse() -> b
-    386:391:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    396:399:void start() -> c
-    403:404:void stop() -> d
-net.minecraft.world.entity.monster.Drowned$DrownedGoToWaterGoal -> awk$c:
+    371:373:void <init>(net.minecraft.world.entity.monster.Drowned,double) -> <init>
+    377:377:boolean canUse() -> a
+    382:382:boolean canContinueToUse() -> b
+    387:392:boolean isValidTarget(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    397:400:void start() -> c
+    404:405:void stop() -> d
+net.minecraft.world.entity.monster.Drowned$DrownedGoToWaterGoal -> bbp$c:
     net.minecraft.world.entity.PathfinderMob mob -> a
     double wantedX -> b
     double wantedY -> c
     double wantedZ -> d
     double speedModifier -> e
     net.minecraft.world.level.Level level -> f
-    415:420:void <init>(net.minecraft.world.entity.PathfinderMob,double) -> <init>
-    424:438:boolean canUse() -> a
-    443:443:boolean canContinueToUse() -> b
-    448:449:void start() -> c
-    453:463:net.minecraft.world.phys.Vec3 getWaterPos() -> g
-net.minecraft.world.entity.monster.Drowned$DrownedMoveControl -> awk$d:
+    416:421:void <init>(net.minecraft.world.entity.PathfinderMob,double) -> <init>
+    425:439:boolean canUse() -> a
+    444:444:boolean canContinueToUse() -> b
+    449:450:void start() -> c
+    454:464:net.minecraft.world.phys.Vec3 getWaterPos() -> g
+net.minecraft.world.entity.monster.Drowned$DrownedMoveControl -> bbp$d:
     net.minecraft.world.entity.monster.Drowned drowned -> i
-    490:492:void <init>(net.minecraft.world.entity.monster.Drowned) -> <init>
-    496:532:void tick() -> a
-net.minecraft.world.entity.monster.Drowned$DrownedSwimUpGoal -> awk$e:
+    491:493:void <init>(net.minecraft.world.entity.monster.Drowned) -> <init>
+    497:533:void tick() -> a
+net.minecraft.world.entity.monster.Drowned$DrownedSwimUpGoal -> bbp$e:
     net.minecraft.world.entity.monster.Drowned drowned -> a
     double speedModifier -> b
     int seaLevel -> c
     boolean stuck -> d
-    322:326:void <init>(net.minecraft.world.entity.monster.Drowned,double,int) -> <init>
-    330:330:boolean canUse() -> a
-    335:335:boolean canContinueToUse() -> b
-    340:351:void tick() -> e
-    355:357:void start() -> c
-    361:362:void stop() -> d
-net.minecraft.world.entity.monster.Drowned$DrownedTridentAttackGoal -> awk$f:
+    323:327:void <init>(net.minecraft.world.entity.monster.Drowned,double,int) -> <init>
+    331:331:boolean canUse() -> a
+    336:336:boolean canContinueToUse() -> b
+    341:352:void tick() -> e
+    356:358:void start() -> c
+    362:363:void stop() -> d
+net.minecraft.world.entity.monster.Drowned$DrownedTridentAttackGoal -> bbp$f:
     net.minecraft.world.entity.monster.Drowned drowned -> a
-    292:294:void <init>(net.minecraft.world.entity.monster.RangedAttackMob,double,int,float) -> <init>
-    298:298:boolean canUse() -> a
-    303:306:void start() -> c
-    310:313:void stop() -> d
-net.minecraft.world.entity.monster.ElderGuardian -> awl:
+    293:295:void <init>(net.minecraft.world.entity.monster.RangedAttackMob,double,int,float) -> <init>
+    299:299:boolean canUse() -> a
+    304:307:void start() -> c
+    311:314:void stop() -> d
+net.minecraft.world.entity.monster.ElderGuardian -> bbq:
     float ELDER_SIZE_SCALE -> b
-    23:31:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    35:39:void registerAttributes() -> cA
-    43:43:int getAttackDuration() -> l
-    47:49:void setGhost() -> eq
-    53:53:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    58:58:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    63:63:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    68:68:net.minecraft.sounds.SoundEvent getFlopSound() -> er
-    73:98:void customServerAiStep() -> dT
-    80:80:boolean lambda$customServerAiStep$0(net.minecraft.server.level.ServerPlayer) -> d
-    20:20:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.EnderMan -> awm:
+    24:32:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    35:38:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    43:43:int getAttackDuration() -> eL
+    48:48:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    53:53:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    58:58:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    63:63:net.minecraft.sounds.SoundEvent getFlopSound() -> eM
+    68:93:void customServerAiStep() -> N
+    75:75:boolean lambda$customServerAiStep$0(net.minecraft.server.level.ServerPlayer) -> d
+    21:21:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.EnderMan -> bbr:
     java.util.UUID SPEED_MODIFIER_ATTACKING_UUID -> b
     net.minecraft.world.entity.ai.attributes.AttributeModifier SPEED_MODIFIER_ATTACKING -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_CARRY_STATE -> d
-    net.minecraft.network.syncher.EntityDataAccessor DATA_CREEPY -> bw
-    net.minecraft.network.syncher.EntityDataAccessor DATA_STARED_AT -> bx
-    java.util.function.Predicate ENDERMITE_SELECTOR -> by
-    int lastStareSound -> bz
-    int targetChangeTime -> bA
-    69:78:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    82:95:void registerGoals() -> n
-    99:105:void registerAttributes() -> cA
-    109:127:void setTarget(net.minecraft.world.entity.LivingEntity) -> h
-    131:136:void defineSynchedData() -> w_
-    139:145:void playStareSound() -> l
-    149:155:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    159:164:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    168:177:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    180:193:boolean isLookingAtMe(net.minecraft.world.entity.player.Player) -> f
-    198:198:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    203:212:void aiStep() -> k
-    216:231:void customServerAiStep() -> dT
-    234:241:boolean teleport() -> eq
-    245:251:boolean teleportTowards(net.minecraft.world.entity.Entity) -> a
-    255:272:boolean teleport(double,double,double) -> o
-    277:277:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    282:282:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    287:287:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    292:297:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
-    300:301:void setCarriedBlock(net.minecraft.world.level.block.state.BlockState) -> b
-    305:305:net.minecraft.world.level.block.state.BlockState getCarriedBlock() -> er
-    310:328:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    332:332:boolean isCreepy() -> es
-    336:336:boolean hasBeenStaredAt() -> et
-    340:341:void setBeingStaredAt() -> eu
-    67:67:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> i
-    57:57:boolean access$000(net.minecraft.world.entity.monster.EnderMan,net.minecraft.world.entity.player.Player) -> a
-    57:57:boolean access$100(net.minecraft.world.entity.monster.EnderMan,net.minecraft.world.entity.Entity) -> a
-    58:67:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.EnderMan$EndermanFreezeWhenLookedAt -> awm$a:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_CREEPY -> bv
+    net.minecraft.network.syncher.EntityDataAccessor DATA_STARED_AT -> bw
+    java.util.function.Predicate ENDERMITE_SELECTOR -> bx
+    int lastStareSound -> by
+    int targetChangeTime -> bz
+    net.minecraft.util.IntRange PERSISTENT_ANGER_TIME -> bA
+    int remainingPersistentAngerTime -> bB
+    java.util.UUID persistentAngerTarget -> bC
+    76:89:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    93:108:void registerGoals() -> o
+    111:115:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    120:138:void setTarget(net.minecraft.world.entity.LivingEntity) -> i
+    142:147:void defineSynchedData() -> e
+    151:152:void startPersistentAngerTimer() -> H_
+    156:157:void setRemainingPersistentAngerTime(int) -> a_
+    161:161:int getRemainingPersistentAngerTime() -> F_
+    166:167:void setPersistentAngerTarget(java.util.UUID) -> a
+    171:171:java.util.UUID getPersistentAngerTarget() -> G_
+    175:181:void playStareSound() -> eL
+    185:191:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    195:201:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    205:215:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    218:231:boolean isLookingAtMe(net.minecraft.world.entity.player.Player) -> g
+    236:236:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    241:253:void aiStep() -> k
+    257:257:boolean isSensitiveToWater() -> dN
+    262:273:void customServerAiStep() -> N
+    276:283:boolean teleport() -> eM
+    287:293:boolean teleportTowards(net.minecraft.world.entity.Entity) -> a
+    297:316:boolean teleport(double,double,double) -> o
+    321:321:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    326:326:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    331:331:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    336:341:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
+    344:345:void setCarriedBlock(net.minecraft.world.level.block.state.BlockState) -> c
+    349:349:net.minecraft.world.level.block.state.BlockState getCarriedBlock() -> eN
+    354:376:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    380:380:boolean isCreepy() -> eO
+    384:384:boolean hasBeenStaredAt() -> eP
+    388:389:void setBeingStaredAt() -> eQ
+    393:393:boolean requiresCustomPersistence() -> K
+    74:74:boolean lambda$static$0(net.minecraft.world.entity.LivingEntity) -> j
+    64:64:boolean access$000(net.minecraft.world.entity.monster.EnderMan,net.minecraft.world.entity.player.Player) -> a
+    64:64:boolean access$100(net.minecraft.world.entity.monster.EnderMan,net.minecraft.world.entity.Entity) -> a
+    65:79:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.EnderMan$EndermanFreezeWhenLookedAt -> bbr$a:
     net.minecraft.world.entity.monster.EnderMan enderman -> a
     net.minecraft.world.entity.LivingEntity target -> b
-    427:430:void <init>(net.minecraft.world.entity.monster.EnderMan) -> <init>
-    434:442:boolean canUse() -> a
-    447:448:void start() -> c
-    452:453:void tick() -> e
-net.minecraft.world.entity.monster.EnderMan$EndermanLeaveBlockGoal -> awm$b:
+    484:487:void <init>(net.minecraft.world.entity.monster.EnderMan) -> <init>
+    491:499:boolean canUse() -> a
+    504:505:void start() -> c
+    509:510:void tick() -> e
+net.minecraft.world.entity.monster.EnderMan$EndermanLeaveBlockGoal -> bbr$b:
     net.minecraft.world.entity.monster.EnderMan enderman -> a
-    459:461:void <init>(net.minecraft.world.entity.monster.EnderMan) -> <init>
-    465:474:boolean canUse() -> a
-    479:495:void tick() -> e
-    498:498:boolean canPlaceBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.entity.monster.EnderMan$EndermanLookForPlayerGoal -> awm$c:
+    516:518:void <init>(net.minecraft.world.entity.monster.EnderMan) -> <init>
+    522:531:boolean canUse() -> a
+    536:552:void tick() -> e
+    555:555:boolean canPlaceBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.monster.EnderMan$EndermanLookForPlayerGoal -> bbr$c:
     net.minecraft.world.entity.monster.EnderMan enderman -> i
     net.minecraft.world.entity.player.Player pendingTarget -> j
     int aggroTime -> k
     int teleportTime -> l
     net.minecraft.world.entity.ai.targeting.TargetingConditions startAggroTargetConditions -> m
     net.minecraft.world.entity.ai.targeting.TargetingConditions continueAggroTargetConditions -> n
-    350:357:void <init>(net.minecraft.world.entity.monster.EnderMan) -> <init>
-    361:362:boolean canUse() -> a
-    367:371:void start() -> c
-    375:378:void stop() -> d
-    382:391:boolean canContinueToUse() -> b
-    396:420:void tick() -> e
-    356:356:boolean lambda$new$0(net.minecraft.world.entity.monster.EnderMan,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.monster.EnderMan$EndermanTakeBlockGoal -> awm$d:
+    403:410:void <init>(net.minecraft.world.entity.monster.EnderMan) -> <init>
+    414:415:boolean canUse() -> a
+    420:424:void start() -> c
+    428:431:void stop() -> d
+    435:444:boolean canContinueToUse() -> b
+    449:477:void tick() -> e
+    409:409:boolean lambda$new$0(net.minecraft.world.entity.monster.EnderMan,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.monster.EnderMan$EndermanTakeBlockGoal -> bbr$d:
     net.minecraft.world.entity.monster.EnderMan enderman -> a
-    505:507:void <init>(net.minecraft.world.entity.monster.EnderMan) -> <init>
-    511:520:boolean canUse() -> a
-    525:544:void tick() -> e
-net.minecraft.world.entity.monster.Endermite -> awn:
+    562:564:void <init>(net.minecraft.world.entity.monster.EnderMan) -> <init>
+    568:577:boolean canUse() -> a
+    582:601:void tick() -> e
+net.minecraft.world.entity.monster.Endermite -> bbs:
     int life -> b
     boolean playerSpawned -> c
-    36:38:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    42:50:void registerGoals() -> n
-    54:54:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    59:64:void registerAttributes() -> cA
-    68:68:boolean isMovementNoisy() -> at
-    73:73:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    38:40:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    44:52:void registerGoals() -> o
+    56:56:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    60:63:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    68:68:boolean isMovementNoisy() -> ax
+    73:73:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     78:78:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    83:83:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    83:83:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     88:89:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     93:96:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     100:103:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    108:111:void tick() -> h
+    108:111:void tick() -> j
     115:117:void setYBodyRot(float) -> l
-    121:121:double getRidingHeight() -> aR
-    125:125:boolean isPlayerSpawned() -> l
-    129:130:void setPlayerSpawned(boolean) -> r
+    121:121:double getMyRidingOffset() -> aX
+    125:125:boolean isPlayerSpawned() -> eL
+    129:130:void setPlayerSpawned(boolean) -> t
     134:149:void aiStep() -> k
     152:156:boolean checkEndermiteSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    161:161:net.minecraft.world.entity.MobType getMobType() -> di
-net.minecraft.world.entity.monster.Enemy -> awo:
-net.minecraft.world.entity.monster.Evoker -> awp:
-    net.minecraft.world.entity.animal.Sheep wololoTarget -> bw
-    44:47:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    51:67:void registerGoals() -> n
-    71:76:void registerAttributes() -> cA
-    80:81:void defineSynchedData() -> w_
+    161:161:net.minecraft.world.entity.MobType getMobType() -> dB
+net.minecraft.world.entity.monster.Enemy -> bbt:
+net.minecraft.world.entity.monster.Evoker -> bbu:
+    net.minecraft.world.entity.animal.Sheep wololoTarget -> bv
+    46:49:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    53:69:void registerGoals() -> o
+    72:75:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    80:81:void defineSynchedData() -> e
     85:86:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    90:90:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eq
+    90:90:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eM
     95:96:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    100:101:void customServerAiStep() -> dT
+    100:101:void customServerAiStep() -> N
     105:121:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
-    126:126:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    131:131:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    126:126:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    131:131:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     136:136:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
     140:141:void setWololoTarget(net.minecraft.world.entity.animal.Sheep) -> a
-    145:145:net.minecraft.world.entity.animal.Sheep getWololoTarget() -> eK
-    150:150:net.minecraft.sounds.SoundEvent getCastingSoundEvent() -> er
+    145:145:net.minecraft.world.entity.animal.Sheep getWololoTarget() -> fh
+    150:150:net.minecraft.sounds.SoundEvent getCastingSoundEvent() -> eN
     155:155:void applyRaidBuffs(int,boolean) -> a
-    39:39:net.minecraft.world.entity.animal.Sheep access$300(net.minecraft.world.entity.monster.Evoker) -> a
-    39:39:java.util.Random access$400(net.minecraft.world.entity.monster.Evoker) -> b
-    39:39:java.util.Random access$500(net.minecraft.world.entity.monster.Evoker) -> c
-    39:39:java.util.Random access$600(net.minecraft.world.entity.monster.Evoker) -> d
-    39:39:java.util.Random access$700(net.minecraft.world.entity.monster.Evoker) -> e
-    39:39:java.util.Random access$800(net.minecraft.world.entity.monster.Evoker) -> f
-    39:39:void access$900(net.minecraft.world.entity.monster.Evoker,net.minecraft.world.entity.animal.Sheep) -> a
-net.minecraft.world.entity.monster.Evoker$1 -> awp$1:
-net.minecraft.world.entity.monster.Evoker$EvokerAttackSpellGoal -> awp$a:
+    41:41:net.minecraft.world.entity.animal.Sheep access$300(net.minecraft.world.entity.monster.Evoker) -> a
+    41:41:java.util.Random access$400(net.minecraft.world.entity.monster.Evoker) -> b
+    41:41:java.util.Random access$500(net.minecraft.world.entity.monster.Evoker) -> c
+    41:41:java.util.Random access$600(net.minecraft.world.entity.monster.Evoker) -> d
+    41:41:java.util.Random access$700(net.minecraft.world.entity.monster.Evoker) -> e
+    41:41:java.util.Random access$800(net.minecraft.world.entity.monster.Evoker) -> f
+    41:41:void access$900(net.minecraft.world.entity.monster.Evoker,net.minecraft.world.entity.animal.Sheep) -> a
+net.minecraft.world.entity.monster.Evoker$1 -> bbu$1:
+net.minecraft.world.entity.monster.Evoker$EvokerAttackSpellGoal -> bbu$a:
     net.minecraft.world.entity.monster.Evoker this$0 -> a
     168:168:void <init>(net.minecraft.world.entity.monster.Evoker) -> <init>
     171:171:int getCastingTime() -> g
@@ -43239,12 +47030,12 @@ net.minecraft.world.entity.monster.Evoker$EvokerAttackSpellGoal -> awp$a:
     235:235:net.minecraft.sounds.SoundEvent getSpellPrepareSound() -> k
     240:240:net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell getSpell() -> l
     168:168:void <init>(net.minecraft.world.entity.monster.Evoker,net.minecraft.world.entity.monster.Evoker$1) -> <init>
-net.minecraft.world.entity.monster.Evoker$EvokerCastingSpellGoal -> awp$b:
+net.minecraft.world.entity.monster.Evoker$EvokerCastingSpellGoal -> bbu$b:
     net.minecraft.world.entity.monster.Evoker this$0 -> a
     157:157:void <init>(net.minecraft.world.entity.monster.Evoker) -> <init>
     160:165:void tick() -> e
     157:157:void <init>(net.minecraft.world.entity.monster.Evoker,net.minecraft.world.entity.monster.Evoker$1) -> <init>
-net.minecraft.world.entity.monster.Evoker$EvokerSummonSpellGoal -> awp$c:
+net.minecraft.world.entity.monster.Evoker$EvokerSummonSpellGoal -> bbu$c:
     net.minecraft.world.entity.ai.targeting.TargetingConditions vexCountTargeting -> e
     net.minecraft.world.entity.monster.Evoker this$0 -> a
     244:245:void <init>(net.minecraft.world.entity.monster.Evoker) -> <init>
@@ -43255,7 +47046,7 @@ net.minecraft.world.entity.monster.Evoker$EvokerSummonSpellGoal -> awp$c:
     284:284:net.minecraft.sounds.SoundEvent getSpellPrepareSound() -> k
     289:289:net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell getSpell() -> l
     244:244:void <init>(net.minecraft.world.entity.monster.Evoker,net.minecraft.world.entity.monster.Evoker$1) -> <init>
-net.minecraft.world.entity.monster.Evoker$EvokerWololoSpellGoal -> awp$d:
+net.minecraft.world.entity.monster.Evoker$EvokerWololoSpellGoal -> bbu$d:
     net.minecraft.world.entity.ai.targeting.TargetingConditions wololoTargeting -> e
     net.minecraft.world.entity.monster.Evoker this$0 -> a
     293:294:void <init>(net.minecraft.world.entity.monster.Evoker) -> <init>
@@ -43271,244 +47062,245 @@ net.minecraft.world.entity.monster.Evoker$EvokerWololoSpellGoal -> awp$d:
     293:293:void tick() -> e
     293:293:void start() -> c
     294:294:boolean lambda$new$0(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.monster.Ghast -> awq:
+net.minecraft.world.entity.monster.Ghast -> bbv:
     net.minecraft.network.syncher.EntityDataAccessor DATA_IS_CHARGING -> b
     int explosionPower -> c
-    38:46:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    50:57:void registerGoals() -> n
-    60:60:boolean isCharging() -> l
-    64:65:void setCharging(boolean) -> r
-    68:68:int getExplosionPower() -> eo
-    73:73:boolean shouldDespawnInPeaceful() -> J
-    78:89:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    94:97:void defineSynchedData() -> w_
-    101:105:void registerAttributes() -> cA
-    109:109:net.minecraft.sounds.SoundSource getSoundSource() -> cl
-    114:114:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    119:119:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    124:124:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    129:129:float getSoundVolume() -> dm
-    133:135:boolean checkGhastSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    140:140:int getMaxSpawnClusterSize() -> dX
-    145:147:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    151:155:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    342:342:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    56:56:boolean lambda$registerGoals$0(net.minecraft.world.entity.LivingEntity) -> i
-    36:36:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Ghast$GhastLookGoal -> awq$a:
+    41:49:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    53:60:void registerGoals() -> o
+    63:63:boolean isCharging() -> m
+    67:68:void setCharging(boolean) -> t
+    71:71:int getExplosionPower() -> eJ
+    76:76:boolean shouldDespawnInPeaceful() -> L
+    81:92:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    97:100:void defineSynchedData() -> e
+    103:105:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eK
+    110:110:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    115:115:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    120:120:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    125:125:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    130:130:float getSoundVolume() -> dF
+    134:136:boolean checkGhastSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
+    141:141:int getMaxSpawnClusterSize() -> er
+    146:148:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    152:156:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    345:345:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    59:59:boolean lambda$registerGoals$0(net.minecraft.world.entity.LivingEntity) -> j
+    39:39:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Ghast$GhastLookGoal -> bbv$a:
     net.minecraft.world.entity.monster.Ghast ghast -> a
-    252:256:void <init>(net.minecraft.world.entity.monster.Ghast) -> <init>
-    260:260:boolean canUse() -> a
-    265:280:void tick() -> e
-net.minecraft.world.entity.monster.Ghast$GhastMoveControl -> awq$b:
+    253:257:void <init>(net.minecraft.world.entity.monster.Ghast) -> <init>
+    261:261:boolean canUse() -> a
+    266:281:void tick() -> e
+net.minecraft.world.entity.monster.Ghast$GhastMoveControl -> bbv$b:
     net.minecraft.world.entity.monster.Ghast ghast -> i
     int floatDuration -> j
-    162:164:void <init>(net.minecraft.world.entity.monster.Ghast) -> <init>
-    168:190:void tick() -> a
-    193:201:boolean canReach(net.minecraft.world.phys.Vec3,int) -> a
-net.minecraft.world.entity.monster.Ghast$GhastShootFireballGoal -> awq$c:
+    163:165:void <init>(net.minecraft.world.entity.monster.Ghast) -> <init>
+    169:191:void tick() -> a
+    194:202:boolean canReach(net.minecraft.world.phys.Vec3,int) -> a
+net.minecraft.world.entity.monster.Ghast$GhastShootFireballGoal -> bbv$c:
     net.minecraft.world.entity.monster.Ghast ghast -> b
     int chargeTime -> a
-    287:289:void <init>(net.minecraft.world.entity.monster.Ghast) -> <init>
-    293:293:boolean canUse() -> a
-    298:299:void start() -> c
-    303:304:void stop() -> d
-    308:337:void tick() -> e
-net.minecraft.world.entity.monster.Ghast$RandomFloatAroundGoal -> awq$d:
+    288:290:void <init>(net.minecraft.world.entity.monster.Ghast) -> <init>
+    294:294:boolean canUse() -> a
+    299:300:void start() -> c
+    304:305:void stop() -> d
+    309:340:void tick() -> e
+net.minecraft.world.entity.monster.Ghast$RandomFloatAroundGoal -> bbv$d:
     net.minecraft.world.entity.monster.Ghast ghast -> a
-    208:212:void <init>(net.minecraft.world.entity.monster.Ghast) -> <init>
-    216:231:boolean canUse() -> a
-    236:236:boolean canContinueToUse() -> b
-    241:246:void start() -> c
-net.minecraft.world.entity.monster.Giant -> awr:
-    12:13:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    17:17:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    22:27:void registerAttributes() -> cA
+    209:213:void <init>(net.minecraft.world.entity.monster.Ghast) -> <init>
+    217:232:boolean canUse() -> a
+    237:237:boolean canContinueToUse() -> b
+    242:247:void start() -> c
+net.minecraft.world.entity.monster.Giant -> bbw:
+    14:15:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    19:19:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    23:26:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
     31:31:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
-net.minecraft.world.entity.monster.Guardian -> aws:
+net.minecraft.world.entity.monster.Guardian -> bbx:
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_MOVING -> b
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_ATTACK_TARGET -> bA
-    float clientSideTailAnimation -> c
-    float clientSideTailAnimationO -> d
-    float clientSideTailAnimationSpeed -> bw
-    float clientSideSpikesAnimation -> bx
-    float clientSideSpikesAnimationO -> by
-    net.minecraft.world.entity.LivingEntity clientSideCachedAttackTarget -> bB
-    int clientSideAttackTime -> bC
-    boolean clientSideTouchedGround -> bD
-    net.minecraft.world.entity.ai.goal.RandomStrollGoal randomStrollGoal -> bz
-    64:73:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    77:93:void registerGoals() -> n
-    97:102:void registerAttributes() -> cA
-    106:106:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
-    111:115:void defineSynchedData() -> w_
-    119:119:boolean canBreatheUnderwater() -> cB
-    124:124:net.minecraft.world.entity.MobType getMobType() -> di
-    128:128:boolean isMoving() -> es
-    132:133:void setMoving(boolean) -> r
-    136:136:int getAttackDuration() -> l
-    140:141:void setActiveAttackTarget(int) -> a
-    144:144:boolean hasActiveAttackTarget() -> et
-    149:163:net.minecraft.world.entity.LivingEntity getActiveAttackTarget() -> eu
-    168:174:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    178:178:int getAmbientSoundInterval() -> A
-    183:183:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    188:188:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    193:193:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    198:198:boolean isMovementNoisy() -> at
-    203:203:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    208:211:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
-    216:302:void aiStep() -> k
-    305:305:net.minecraft.sounds.SoundEvent getFlopSound() -> er
-    309:309:float getTailAnimation(float) -> v
-    313:313:float getSpikesAnimation(float) -> w
-    317:317:float getAttackAnimationScale(float) -> x
-    322:322:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
-    327:329:boolean checkGuardianSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    334:347:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    352:352:int getMaxHeadXRot() -> dU
-    357:369:void travel(net.minecraft.world.phys.Vec3) -> e
-    47:47:void access$000(net.minecraft.world.entity.monster.Guardian,int) -> a
-    47:47:void access$100(net.minecraft.world.entity.monster.Guardian,boolean) -> a
-    50:51:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Guardian$GuardianAttackGoal -> aws$a:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_ATTACK_TARGET -> d
+    float clientSideTailAnimation -> bv
+    float clientSideTailAnimationO -> bw
+    float clientSideTailAnimationSpeed -> bx
+    float clientSideSpikesAnimation -> by
+    float clientSideSpikesAnimationO -> bz
+    net.minecraft.world.entity.LivingEntity clientSideCachedAttackTarget -> bA
+    int clientSideAttackTime -> bB
+    boolean clientSideTouchedGround -> bC
+    net.minecraft.world.entity.ai.goal.RandomStrollGoal randomStrollGoal -> c
+    66:75:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    79:95:void registerGoals() -> o
+    98:102:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eN
+    107:107:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
+    112:116:void defineSynchedData() -> e
+    120:120:boolean canBreatheUnderwater() -> cL
+    125:125:net.minecraft.world.entity.MobType getMobType() -> dB
+    129:129:boolean isMoving() -> eO
+    133:134:void setMoving(boolean) -> t
+    137:137:int getAttackDuration() -> eL
+    141:142:void setActiveAttackTarget(int) -> a
+    145:145:boolean hasActiveAttackTarget() -> eP
+    150:164:net.minecraft.world.entity.LivingEntity getActiveAttackTarget() -> eQ
+    169:175:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    179:179:int getAmbientSoundInterval() -> D
+    184:184:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    189:189:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    194:194:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    199:199:boolean isMovementNoisy() -> ax
+    204:204:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    209:212:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
+    217:303:void aiStep() -> k
+    306:306:net.minecraft.sounds.SoundEvent getFlopSound() -> eM
+    310:310:float getTailAnimation(float) -> u
+    314:314:float getSpikesAnimation(float) -> v
+    318:318:float getAttackAnimationScale(float) -> w
+    323:323:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
+    328:330:boolean checkGuardianSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
+    335:348:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    353:353:int getMaxHeadXRot() -> eo
+    358:370:void travel(net.minecraft.world.phys.Vec3) -> f
+    49:49:void access$000(net.minecraft.world.entity.monster.Guardian,int) -> a
+    49:49:void access$100(net.minecraft.world.entity.monster.Guardian,boolean) -> a
+    52:53:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Guardian$GuardianAttackGoal -> bbx$a:
     net.minecraft.world.entity.monster.Guardian guardian -> a
     int attackTime -> b
     boolean elder -> c
-    389:396:void <init>(net.minecraft.world.entity.monster.Guardian) -> <init>
-    400:401:boolean canUse() -> a
-    406:406:boolean canContinueToUse() -> b
-    411:417:void start() -> c
-    421:425:void stop() -> d
-    429:458:void tick() -> e
-net.minecraft.world.entity.monster.Guardian$GuardianAttackSelector -> aws$b:
+    390:397:void <init>(net.minecraft.world.entity.monster.Guardian) -> <init>
+    401:402:boolean canUse() -> a
+    407:407:boolean canContinueToUse() -> b
+    412:418:void start() -> c
+    422:426:void stop() -> d
+    430:461:void tick() -> e
+net.minecraft.world.entity.monster.Guardian$GuardianAttackSelector -> bbx$b:
     net.minecraft.world.entity.monster.Guardian guardian -> a
-    374:376:void <init>(net.minecraft.world.entity.monster.Guardian) -> <init>
-    380:380:boolean test(net.minecraft.world.entity.LivingEntity) -> a
-    371:371:boolean test(java.lang.Object) -> test
-net.minecraft.world.entity.monster.Guardian$GuardianMoveControl -> aws$c:
+    375:377:void <init>(net.minecraft.world.entity.monster.Guardian) -> <init>
+    381:381:boolean test(net.minecraft.world.entity.LivingEntity) -> a
+    372:372:boolean test(java.lang.Object) -> test
+net.minecraft.world.entity.monster.Guardian$GuardianMoveControl -> bbx$c:
     net.minecraft.world.entity.monster.Guardian guardian -> i
-    465:467:void <init>(net.minecraft.world.entity.monster.Guardian) -> <init>
-    471:523:void tick() -> a
-net.minecraft.world.entity.monster.Husk -> awt:
+    468:470:void <init>(net.minecraft.world.entity.monster.Guardian) -> <init>
+    474:526:void tick() -> a
+net.minecraft.world.entity.monster.Husk -> bby:
     23:24:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     27:28:boolean checkHuskSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    33:33:boolean isSunSensitive() -> K_
-    38:38:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    33:33:boolean isSunSensitive() -> U_
+    38:38:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     43:43:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    48:48:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    53:53:net.minecraft.sounds.SoundEvent getStepSound() -> er
+    48:48:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    53:53:net.minecraft.sounds.SoundEvent getStepSound() -> eM
     58:64:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    69:69:boolean convertsInWater() -> et
-    74:76:void doUnderWaterConversion() -> ev
-    80:80:net.minecraft.world.item.ItemStack getSkull() -> es
-net.minecraft.world.entity.monster.Illusioner -> awu:
-    int clientSideIllusionTicks -> bw
-    net.minecraft.world.phys.Vec3[][] clientSideIllusionOffsets -> bx
-    53:62:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    66:81:void registerGoals() -> n
-    85:90:void registerAttributes() -> cA
-    94:96:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    101:102:void defineSynchedData() -> w_
-    106:106:net.minecraft.world.phys.AABB getBoundingBoxForCulling() -> bU
-    111:142:void aiStep() -> k
-    146:146:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eq
-    150:159:net.minecraft.world.phys.Vec3[] getIllusionOffsets(float) -> v
-    164:171:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
-    176:176:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    181:181:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    186:186:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    191:191:net.minecraft.sounds.SoundEvent getCastingSoundEvent() -> er
-    197:197:void applyRaidBuffs(int,boolean) -> a
-    293:303:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
-    307:312:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose getArmPose() -> l
-net.minecraft.world.entity.monster.Illusioner$1 -> awu$1:
-net.minecraft.world.entity.monster.Illusioner$IllusionerBlindnessSpellGoal -> awu$a:
+    69:69:boolean convertsInWater() -> eO
+    74:78:void doUnderWaterConversion() -> eQ
+    82:82:net.minecraft.world.item.ItemStack getSkull() -> eN
+net.minecraft.world.entity.monster.Illusioner -> bbz:
+    int clientSideIllusionTicks -> bv
+    net.minecraft.world.phys.Vec3[][] clientSideIllusionOffsets -> bw
+    54:63:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    67:82:void registerGoals() -> o
+    85:88:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    93:95:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    100:101:void defineSynchedData() -> e
+    105:105:net.minecraft.world.phys.AABB getBoundingBoxForCulling() -> cc
+    110:141:void aiStep() -> k
+    145:145:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eM
+    149:158:net.minecraft.world.phys.Vec3[] getIllusionOffsets(float) -> u
+    163:170:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
+    175:175:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    180:180:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    185:185:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    190:190:net.minecraft.sounds.SoundEvent getCastingSoundEvent() -> eN
+    196:196:void applyRaidBuffs(int,boolean) -> a
+    292:302:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
+    306:311:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose getArmPose() -> m
+net.minecraft.world.entity.monster.Illusioner$1 -> bbz$1:
+net.minecraft.world.entity.monster.Illusioner$IllusionerBlindnessSpellGoal -> bbz$a:
     int lastTargetId -> e
     net.minecraft.world.entity.monster.Illusioner this$0 -> a
-    238:238:void <init>(net.minecraft.world.entity.monster.Illusioner) -> <init>
-    243:255:boolean canUse() -> a
-    260:263:void start() -> c
-    267:267:int getCastingTime() -> g
-    272:272:int getCastingInterval() -> h
-    277:278:void performSpellCasting() -> j
-    282:282:net.minecraft.sounds.SoundEvent getSpellPrepareSound() -> k
-    287:287:net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell getSpell() -> l
-    238:238:void <init>(net.minecraft.world.entity.monster.Illusioner,net.minecraft.world.entity.monster.Illusioner$1) -> <init>
-net.minecraft.world.entity.monster.Illusioner$IllusionerMirrorSpellGoal -> awu$b:
+    237:237:void <init>(net.minecraft.world.entity.monster.Illusioner) -> <init>
+    242:254:boolean canUse() -> a
+    259:262:void start() -> c
+    266:266:int getCastingTime() -> g
+    271:271:int getCastingInterval() -> h
+    276:277:void performSpellCasting() -> j
+    281:281:net.minecraft.sounds.SoundEvent getSpellPrepareSound() -> k
+    286:286:net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell getSpell() -> l
+    237:237:void <init>(net.minecraft.world.entity.monster.Illusioner,net.minecraft.world.entity.monster.Illusioner$1) -> <init>
+net.minecraft.world.entity.monster.Illusioner$IllusionerMirrorSpellGoal -> bbz$b:
     net.minecraft.world.entity.monster.Illusioner this$0 -> a
-    199:199:void <init>(net.minecraft.world.entity.monster.Illusioner) -> <init>
-    202:208:boolean canUse() -> a
-    213:213:int getCastingTime() -> g
-    218:218:int getCastingInterval() -> h
-    223:224:void performSpellCasting() -> j
-    229:229:net.minecraft.sounds.SoundEvent getSpellPrepareSound() -> k
-    234:234:net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell getSpell() -> l
-    199:199:void <init>(net.minecraft.world.entity.monster.Illusioner,net.minecraft.world.entity.monster.Illusioner$1) -> <init>
-net.minecraft.world.entity.monster.MagmaCube -> awv:
-    26:27:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    31:34:void registerAttributes() -> cA
+    198:198:void <init>(net.minecraft.world.entity.monster.Illusioner) -> <init>
+    201:207:boolean canUse() -> a
+    212:212:int getCastingTime() -> g
+    217:217:int getCastingInterval() -> h
+    222:223:void performSpellCasting() -> j
+    228:228:net.minecraft.sounds.SoundEvent getSpellPrepareSound() -> k
+    233:233:net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell getSpell() -> l
+    198:198:void <init>(net.minecraft.world.entity.monster.Illusioner,net.minecraft.world.entity.monster.Illusioner$1) -> <init>
+net.minecraft.world.entity.monster.MagmaCube -> bca:
+    28:29:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    32:33:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
     37:37:boolean checkMagmaCubeSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
     42:42:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
     47:49:void setSize(int,boolean) -> a
-    53:53:float getBrightness() -> aI
-    58:58:net.minecraft.core.particles.ParticleOptions getParticleType() -> l
-    63:63:net.minecraft.resources.ResourceLocation getDefaultLootTable() -> H
-    68:68:boolean isOnFire() -> bf
-    73:73:int getJumpDelay() -> eo
-    78:79:void decreaseSquish() -> ep
-    83:86:void jumpFromGround() -> dq
+    53:53:float getBrightness() -> aO
+    58:58:net.minecraft.core.particles.ParticleOptions getParticleType() -> eJ
+    63:63:net.minecraft.resources.ResourceLocation getDefaultLootTable() -> J
+    68:68:boolean isOnFire() -> bm
+    73:73:int getJumpDelay() -> eK
+    78:79:void decreaseSquish() -> eL
+    83:86:void jumpFromGround() -> dJ
     90:97:void jumpInLiquid(net.minecraft.tags.Tag) -> c
     101:101:boolean causeFallDamage(float,float) -> b
-    106:106:boolean isDealsDamage() -> eq
-    111:111:float getAttackDamage() -> er
+    106:106:boolean isDealsDamage() -> eM
+    111:111:float getAttackDamage() -> eN
     116:119:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    125:128:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    134:137:net.minecraft.sounds.SoundEvent getSquishSound() -> es
-    143:143:net.minecraft.sounds.SoundEvent getJumpSound() -> et
-net.minecraft.world.entity.monster.Monster -> aww:
-    26:28:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    32:32:net.minecraft.sounds.SoundSource getSoundSource() -> cl
-    37:40:void aiStep() -> k
-    43:47:void updateNoActionTime() -> ew
-    51:51:boolean shouldDespawnInPeaceful() -> J
-    56:56:net.minecraft.sounds.SoundEvent getSwimSound() -> am
-    61:61:net.minecraft.sounds.SoundEvent getSwimSplashSound() -> an
-    66:69:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    74:74:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    79:79:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    84:87:net.minecraft.sounds.SoundEvent getFallDamageSound(int) -> o
-    93:93:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
-    97:102:boolean isDarkEnoughToSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,java.util.Random) -> a
-    106:108:boolean checkMonsterSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
-    112:113:boolean checkAnyLightMonsterSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> d
-    118:121:void registerAttributes() -> cA
-    125:125:boolean shouldDropExperience() -> cE
-    129:129:boolean isPreventingPlayerRest(net.minecraft.world.entity.player.Player) -> e
-    134:139:net.minecraft.world.item.ItemStack getProjectile(net.minecraft.world.item.ItemStack) -> f
-net.minecraft.world.entity.monster.PatrollingMonster -> awx:
+    125:128:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    134:137:net.minecraft.sounds.SoundEvent getSquishSound() -> eO
+    143:143:net.minecraft.sounds.SoundEvent getJumpSound() -> eP
+net.minecraft.world.entity.monster.Monster -> bcb:
+    29:31:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    35:35:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    40:43:void aiStep() -> k
+    46:50:void updateNoActionTime() -> eR
+    54:54:boolean shouldDespawnInPeaceful() -> L
+    59:59:net.minecraft.sounds.SoundEvent getSwimSound() -> aq
+    64:64:net.minecraft.sounds.SoundEvent getSwimSplashSound() -> ar
+    69:72:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    77:77:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    82:82:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    87:90:net.minecraft.sounds.SoundEvent getFallDamageSound(int) -> o
+    96:96:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
+    100:105:boolean isDarkEnoughToSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,java.util.Random) -> a
+    109:111:boolean checkMonsterSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
+    115:116:boolean checkAnyLightMonsterSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> d
+    120:121:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createMonsterAttributes() -> eS
+    126:126:boolean shouldDropExperience() -> cU
+    131:131:boolean shouldDropLoot() -> cV
+    135:135:boolean isPreventingPlayerRest(net.minecraft.world.entity.player.Player) -> f
+    140:145:net.minecraft.world.item.ItemStack getProjectile(net.minecraft.world.item.ItemStack) -> f
+net.minecraft.world.entity.monster.PatrollingMonster -> bcc:
     net.minecraft.core.BlockPos patrolTarget -> b
     boolean patrolLeader -> c
     boolean patrolling -> d
     32:33:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    37:39:void registerGoals() -> n
+    37:39:void registerGoals() -> o
     43:51:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     55:63:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    67:67:double getRidingHeight() -> aR
-    71:71:boolean canBeLeader() -> es
+    67:67:double getMyRidingOffset() -> aX
+    71:71:boolean canBeLeader() -> eO
     79:94:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
     98:102:boolean checkPatrollingMonsterSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
     107:107:boolean removeWhenFarAway(double) -> h
     111:113:void setPatrolTarget(net.minecraft.core.BlockPos) -> g
-    116:116:net.minecraft.core.BlockPos getPatrolTarget() -> et
-    120:120:boolean hasPatrolTarget() -> eu
-    124:126:void setPatrolLeader(boolean) -> r
-    129:129:boolean isPatrolLeader() -> ev
-    133:133:boolean canJoinPatrol() -> ex
-    137:139:void findPatrolTarget() -> ey
-    142:142:boolean isPatrolling() -> ez
-    146:147:void setPatrolling(boolean) -> s
-net.minecraft.world.entity.monster.PatrollingMonster$LongDistancePatrolGoal -> awx$a:
+    116:116:net.minecraft.core.BlockPos getPatrolTarget() -> eP
+    120:120:boolean hasPatrolTarget() -> eQ
+    124:126:void setPatrolLeader(boolean) -> t
+    129:129:boolean isPatrolLeader() -> eT
+    133:133:boolean canJoinPatrol() -> eU
+    137:139:void findPatrolTarget() -> eV
+    142:142:boolean isPatrolling() -> eW
+    146:147:void setPatrolling(boolean) -> u
+net.minecraft.world.entity.monster.PatrollingMonster$LongDistancePatrolGoal -> bcc$a:
     net.minecraft.world.entity.monster.PatrollingMonster mob -> a
     double speedModifier -> b
     double leaderSpeedModifier -> c
@@ -43521,488 +47313,434 @@ net.minecraft.world.entity.monster.PatrollingMonster$LongDistancePatrolGoal -> a
     216:216:java.util.List findPatrolCompanions() -> g
     220:222:boolean moveRandomly() -> h
     216:216:boolean lambda$findPatrolCompanions$0(net.minecraft.world.entity.monster.PatrollingMonster) -> a
-net.minecraft.world.entity.monster.Phantom -> awy:
+net.minecraft.world.entity.monster.Phantom -> bcd:
     net.minecraft.network.syncher.EntityDataAccessor ID_SIZE -> b
     net.minecraft.world.phys.Vec3 moveTargetPoint -> c
     net.minecraft.core.BlockPos anchorPoint -> d
-    net.minecraft.world.entity.monster.Phantom$AttackPhase attackPhase -> bw
-    48:64:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    68:68:net.minecraft.world.entity.ai.control.BodyRotationControl createBodyControl() -> o
-    73:78:void registerGoals() -> n
-    82:85:void registerAttributes() -> cA
-    89:92:void defineSynchedData() -> w_
-    95:96:void setPhantomSize(int) -> a
-    99:101:void updatePhantomSizeInfo() -> ep
-    104:104:int getPhantomSize() -> l
-    109:109:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    114:119:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    123:123:boolean shouldDespawnInPeaceful() -> J
-    128:144:void tick() -> h
-    148:152:void aiStep() -> k
-    156:157:void customServerAiStep() -> dT
-    161:163:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    168:174:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    178:184:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    188:188:boolean shouldRenderAtSqrDistance(double) -> a
-    193:193:net.minecraft.sounds.SoundSource getSoundSource() -> cl
-    198:198:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    203:203:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    208:208:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    213:213:net.minecraft.world.entity.MobType getMobType() -> di
-    218:218:float getSoundVolume() -> dm
-    223:223:boolean canAttackType(net.minecraft.world.entity.EntityType) -> a
-    227:227:net.minecraft.world.phys.Vec3 getMovementTarget() -> eo
-    232:236:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
-    43:43:net.minecraft.world.phys.Vec3 access$400(net.minecraft.world.entity.monster.Phantom) -> a
-    43:43:net.minecraft.world.entity.monster.Phantom$AttackPhase access$500(net.minecraft.world.entity.monster.Phantom) -> b
-    43:43:java.util.Random access$600(net.minecraft.world.entity.monster.Phantom) -> c
-    43:43:java.util.Random access$700(net.minecraft.world.entity.monster.Phantom) -> d
-    43:43:java.util.Random access$800(net.minecraft.world.entity.monster.Phantom) -> e
-    43:43:java.util.Random access$900(net.minecraft.world.entity.monster.Phantom) -> f
-    43:43:java.util.Random access$1000(net.minecraft.world.entity.monster.Phantom) -> g
-    43:43:java.util.Random access$1100(net.minecraft.world.entity.monster.Phantom) -> h
-    43:43:java.util.Random access$1200(net.minecraft.world.entity.monster.Phantom) -> i
-    43:43:java.util.Random access$1300(net.minecraft.world.entity.monster.Phantom) -> j
-    43:43:net.minecraft.core.BlockPos access$1400(net.minecraft.world.entity.monster.Phantom) -> k
-    43:43:net.minecraft.core.BlockPos access$1402(net.minecraft.world.entity.monster.Phantom,net.minecraft.core.BlockPos) -> a
-    43:43:net.minecraft.world.phys.Vec3 access$402(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.phys.Vec3) -> a
-    43:43:net.minecraft.world.entity.monster.Phantom$AttackPhase access$502(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.monster.Phantom$AttackPhase) -> a
-    43:43:java.util.Random access$1500(net.minecraft.world.entity.monster.Phantom) -> l
-    43:43:java.util.Random access$1600(net.minecraft.world.entity.monster.Phantom) -> m
-    43:43:java.util.Random access$1700(net.minecraft.world.entity.monster.Phantom) -> n
-    43:43:java.util.Random access$1800(net.minecraft.world.entity.monster.Phantom) -> o
-    46:46:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Phantom$1 -> awy$1:
-net.minecraft.world.entity.monster.Phantom$AttackPhase -> awy$a:
+    net.minecraft.world.entity.monster.Phantom$AttackPhase attackPhase -> bv
+    51:67:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    71:71:net.minecraft.world.entity.ai.control.BodyRotationControl createBodyControl() -> r
+    76:81:void registerGoals() -> o
+    85:88:void defineSynchedData() -> e
+    91:92:void setPhantomSize(int) -> a
+    95:97:void updatePhantomSizeInfo() -> eK
+    100:100:int getPhantomSize() -> m
+    105:105:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    110:115:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    119:119:boolean shouldDespawnInPeaceful() -> L
+    124:140:void tick() -> j
+    144:148:void aiStep() -> k
+    152:153:void customServerAiStep() -> N
+    157:159:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    164:170:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    174:180:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    184:184:boolean shouldRenderAtSqrDistance(double) -> a
+    189:189:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    194:194:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    199:199:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    204:204:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    209:209:net.minecraft.world.entity.MobType getMobType() -> dB
+    214:214:float getSoundVolume() -> dF
+    219:219:boolean canAttackType(net.minecraft.world.entity.EntityType) -> a
+    223:223:net.minecraft.world.phys.Vec3 getMovementTarget() -> eJ
+    228:232:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
+    46:46:net.minecraft.world.phys.Vec3 access$400(net.minecraft.world.entity.monster.Phantom) -> a
+    46:46:net.minecraft.world.entity.monster.Phantom$AttackPhase access$500(net.minecraft.world.entity.monster.Phantom) -> b
+    46:46:java.util.Random access$600(net.minecraft.world.entity.monster.Phantom) -> c
+    46:46:java.util.Random access$700(net.minecraft.world.entity.monster.Phantom) -> d
+    46:46:java.util.Random access$800(net.minecraft.world.entity.monster.Phantom) -> e
+    46:46:java.util.Random access$900(net.minecraft.world.entity.monster.Phantom) -> f
+    46:46:java.util.Random access$1000(net.minecraft.world.entity.monster.Phantom) -> g
+    46:46:java.util.Random access$1100(net.minecraft.world.entity.monster.Phantom) -> h
+    46:46:java.util.Random access$1200(net.minecraft.world.entity.monster.Phantom) -> i
+    46:46:java.util.Random access$1300(net.minecraft.world.entity.monster.Phantom) -> j
+    46:46:net.minecraft.core.BlockPos access$1400(net.minecraft.world.entity.monster.Phantom) -> k
+    46:46:net.minecraft.core.BlockPos access$1402(net.minecraft.world.entity.monster.Phantom,net.minecraft.core.BlockPos) -> a
+    46:46:net.minecraft.world.phys.Vec3 access$402(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.phys.Vec3) -> a
+    46:46:net.minecraft.world.entity.monster.Phantom$AttackPhase access$502(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.monster.Phantom$AttackPhase) -> a
+    46:46:java.util.Random access$1500(net.minecraft.world.entity.monster.Phantom) -> l
+    46:46:java.util.Random access$1600(net.minecraft.world.entity.monster.Phantom) -> m
+    46:46:java.util.Random access$1700(net.minecraft.world.entity.monster.Phantom) -> n
+    46:46:java.util.Random access$1800(net.minecraft.world.entity.monster.Phantom) -> o
+    49:49:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Phantom$1 -> bcd$1:
+net.minecraft.world.entity.monster.Phantom$AttackPhase -> bcd$a:
     net.minecraft.world.entity.monster.Phantom$AttackPhase CIRCLE -> a
     net.minecraft.world.entity.monster.Phantom$AttackPhase SWOOP -> b
     net.minecraft.world.entity.monster.Phantom$AttackPhase[] $VALUES -> c
-    51:51:net.minecraft.world.entity.monster.Phantom$AttackPhase[] values() -> values
-    51:51:net.minecraft.world.entity.monster.Phantom$AttackPhase valueOf(java.lang.String) -> valueOf
-    51:51:void <init>(java.lang.String,int) -> <init>
-    51:53:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Phantom$PhantomAttackPlayerTargetGoal -> awy$b:
+    54:54:net.minecraft.world.entity.monster.Phantom$AttackPhase[] values() -> values
+    54:54:net.minecraft.world.entity.monster.Phantom$AttackPhase valueOf(java.lang.String) -> valueOf
+    54:54:void <init>(java.lang.String,int) -> <init>
+    54:56:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Phantom$PhantomAttackPlayerTargetGoal -> bcd$b:
     net.minecraft.world.entity.ai.targeting.TargetingConditions attackTargeting -> b
     int nextScanTick -> c
     net.minecraft.world.entity.monster.Phantom this$0 -> a
-    491:494:void <init>(net.minecraft.world.entity.monster.Phantom) -> <init>
-    498:515:boolean canUse() -> a
-    520:525:boolean canContinueToUse() -> b
-    507:507:int lambda$canUse$0(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.player.Player) -> a
-    491:491:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.monster.Phantom$1) -> <init>
-net.minecraft.world.entity.monster.Phantom$PhantomAttackStrategyGoal -> awy$c:
+    489:492:void <init>(net.minecraft.world.entity.monster.Phantom) -> <init>
+    496:513:boolean canUse() -> a
+    518:523:boolean canContinueToUse() -> b
+    489:489:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.monster.Phantom$1) -> <init>
+net.minecraft.world.entity.monster.Phantom$PhantomAttackStrategyGoal -> bcd$c:
     int nextSweepTick -> b
     net.minecraft.world.entity.monster.Phantom this$0 -> a
-    444:444:void <init>(net.minecraft.world.entity.monster.Phantom) -> <init>
-    449:453:boolean canUse() -> a
-    458:461:void start() -> c
-    465:466:void stop() -> d
-    470:480:void tick() -> e
-    483:487:void setAnchorAboveTarget() -> g
-    444:444:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.monster.Phantom$1) -> <init>
-net.minecraft.world.entity.monster.Phantom$PhantomBodyRotationControl -> awy$d:
+    442:442:void <init>(net.minecraft.world.entity.monster.Phantom) -> <init>
+    447:451:boolean canUse() -> a
+    456:459:void start() -> c
+    463:464:void stop() -> d
+    468:478:void tick() -> e
+    481:485:void setAnchorAboveTarget() -> g
+    442:442:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.monster.Phantom$1) -> <init>
+net.minecraft.world.entity.monster.Phantom$PhantomBodyRotationControl -> bcd$d:
     net.minecraft.world.entity.monster.Phantom this$0 -> a
-    293:295:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.Mob) -> <init>
-    299:301:void clientTick() -> a
-net.minecraft.world.entity.monster.Phantom$PhantomCircleAroundAnchorGoal -> awy$e:
+    289:291:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.Mob) -> <init>
+    295:297:void clientTick() -> a
+net.minecraft.world.entity.monster.Phantom$PhantomCircleAroundAnchorGoal -> bcd$e:
     float angle -> c
     float distance -> d
     float height -> e
     float clockwise -> f
     net.minecraft.world.entity.monster.Phantom this$0 -> a
-    324:324:void <init>(net.minecraft.world.entity.monster.Phantom) -> <init>
-    332:332:boolean canUse() -> a
-    337:341:void start() -> c
-    345:372:void tick() -> e
-    375:380:void selectNext() -> h
-    324:324:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.monster.Phantom$1) -> <init>
-net.minecraft.world.entity.monster.Phantom$PhantomLookControl -> awy$f:
+    320:320:void <init>(net.minecraft.world.entity.monster.Phantom) -> <init>
+    328:328:boolean canUse() -> a
+    333:337:void start() -> c
+    341:368:void tick() -> e
+    371:376:void selectNext() -> h
+    320:320:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.monster.Phantom$1) -> <init>
+net.minecraft.world.entity.monster.Phantom$PhantomLookControl -> bcd$f:
     net.minecraft.world.entity.monster.Phantom this$0 -> h
-    305:307:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.Mob) -> <init>
-    311:311:void tick() -> a
-net.minecraft.world.entity.monster.Phantom$PhantomMoveControl -> awy$g:
+    301:303:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.Mob) -> <init>
+    307:307:void tick() -> a
+net.minecraft.world.entity.monster.Phantom$PhantomMoveControl -> bcd$g:
     float speed -> j
     net.minecraft.world.entity.monster.Phantom this$0 -> i
-    240:244:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.Mob) -> <init>
-    248:289:void tick() -> a
-net.minecraft.world.entity.monster.Phantom$PhantomMoveTargetGoal -> awy$h:
+    236:240:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.Mob) -> <init>
+    244:285:void tick() -> a
+net.minecraft.world.entity.monster.Phantom$PhantomMoveTargetGoal -> bcd$h:
     net.minecraft.world.entity.monster.Phantom this$0 -> b
-    315:317:void <init>(net.minecraft.world.entity.monster.Phantom) -> <init>
-    320:320:boolean touchingTarget() -> g
-net.minecraft.world.entity.monster.Phantom$PhantomSweepAttackGoal -> awy$i:
+    311:313:void <init>(net.minecraft.world.entity.monster.Phantom) -> <init>
+    316:316:boolean touchingTarget() -> g
+net.minecraft.world.entity.monster.Phantom$PhantomSweepAttackGoal -> bcd$i:
     net.minecraft.world.entity.monster.Phantom this$0 -> a
-    383:383:void <init>(net.minecraft.world.entity.monster.Phantom) -> <init>
-    386:386:boolean canUse() -> a
-    391:416:boolean canContinueToUse() -> b
-    421:421:void start() -> c
-    425:427:void stop() -> d
-    431:441:void tick() -> e
-    383:383:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.monster.Phantom$1) -> <init>
-net.minecraft.world.entity.monster.PigZombie -> awz:
-    java.util.UUID SPEED_MODIFIER_ATTACKING_UUID -> b
-    net.minecraft.world.entity.ai.attributes.AttributeModifier SPEED_MODIFIER_ATTACKING -> c
-    int angerTime -> bw
-    int playAngrySoundIn -> bx
-    java.util.UUID lastHurtByUUID -> by
-    52:54:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    58:62:void setLastHurtByMob(net.minecraft.world.entity.LivingEntity) -> a
-    66:71:void addBehaviourGoals() -> l
-    75:80:void registerAttributes() -> cA
-    84:84:boolean convertsInWater() -> et
-    89:124:void customServerAiStep() -> dT
-    127:127:boolean checkPigZombieSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    132:132:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
-    137:144:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    148:161:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    165:172:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    176:180:boolean makeAngry(net.minecraft.world.entity.LivingEntity) -> i
-    184:184:int getAngerTime() -> ez
-    188:188:boolean isAngry() -> eA
-    193:193:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    198:198:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    203:203:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    208:209:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
-    213:213:net.minecraft.world.item.ItemStack getSkull() -> es
-    243:243:boolean isPreventingPlayerRest(net.minecraft.world.entity.player.Player) -> e
-    43:43:boolean access$000(net.minecraft.world.entity.monster.PigZombie,net.minecraft.world.entity.LivingEntity) -> a
-    43:43:boolean access$100(net.minecraft.world.entity.monster.PigZombie) -> a
-    44:45:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.PigZombie$PigZombieAngerTargetGoal -> awz$a:
-    232:233:void <init>(net.minecraft.world.entity.monster.PigZombie) -> <init>
-    237:237:boolean canUse() -> a
-net.minecraft.world.entity.monster.PigZombie$PigZombieHurtByOtherGoal -> awz$b:
-    218:220:void <init>(net.minecraft.world.entity.monster.PigZombie) -> <init>
-    224:227:void alertOther(net.minecraft.world.entity.Mob,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.monster.Pillager -> axa:
+    379:379:void <init>(net.minecraft.world.entity.monster.Phantom) -> <init>
+    382:382:boolean canUse() -> a
+    387:412:boolean canContinueToUse() -> b
+    417:417:void start() -> c
+    421:423:void stop() -> d
+    427:439:void tick() -> e
+    379:379:void <init>(net.minecraft.world.entity.monster.Phantom,net.minecraft.world.entity.monster.Phantom$1) -> <init>
+net.minecraft.world.entity.monster.Pillager -> bce:
     net.minecraft.network.syncher.EntityDataAccessor IS_CHARGING_CROSSBOW -> b
-    net.minecraft.world.SimpleContainer inventory -> bw
-    70:74:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    78:91:void registerGoals() -> n
-    95:101:void registerAttributes() -> cA
-    105:108:void defineSynchedData() -> w_
-    111:111:boolean isChargingCrossbow() -> er
-    116:117:void setChargingCrossbow(boolean) -> a
-    121:130:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    134:142:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose getArmPose() -> l
-    147:157:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    161:165:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
-    170:170:int getMaxSpawnClusterSize() -> dX
-    176:179:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    184:191:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
-    195:202:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
-    207:207:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    212:212:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    217:217:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    222:229:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
-    233:242:void shootProjectile(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.Projectile,float) -> a
-    245:258:com.mojang.math.Vector3f getProjectileShotVector(net.minecraft.world.phys.Vec3,float) -> a
-    262:262:net.minecraft.world.SimpleContainer getInventory() -> eA
-    267:281:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> a
-    284:284:boolean wantsItem(net.minecraft.world.item.Item) -> b
-    289:297:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
-    302:319:void applyRaidBuffs(int,boolean) -> a
-    323:323:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eq
-    63:63:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.RangedAttackMob -> axb:
-    void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
-net.minecraft.world.entity.monster.Ravager -> axc:
-    java.util.function.Predicate NO_RAVAGER_AND_ALIVE -> b
-    int attackTick -> bw
-    int stunnedTick -> bx
-    int roarTick -> by
+    net.minecraft.world.SimpleContainer inventory -> bv
     66:70:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    74:86:void registerGoals() -> n
-    90:96:void updateControlFlags() -> F
-    100:108:void registerAttributes() -> cA
+    74:87:void registerGoals() -> o
+    90:94:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    99:102:void defineSynchedData() -> e
+    106:106:boolean canFireProjectileWeapon(net.minecraft.world.item.ProjectileWeaponItem) -> a
+    110:110:boolean isChargingCrossbow() -> eN
+    115:116:void setChargingCrossbow(boolean) -> b
+    120:121:void onCrossbowAttackPerformed() -> V_
+    125:134:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    138:146:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose getArmPose() -> m
+    151:161:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    165:169:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
+    174:174:int getMaxSpawnClusterSize() -> er
+    180:183:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    188:195:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
+    199:206:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
+    211:211:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    216:216:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    221:221:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    226:227:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
+    231:232:void shootCrossbowProjectile(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.Projectile,float) -> a
+    235:235:net.minecraft.world.SimpleContainer getInventory() -> eX
+    240:255:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> b
+    258:258:boolean wantsItem(net.minecraft.world.item.Item) -> b
+    263:271:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
+    276:293:void applyRaidBuffs(int,boolean) -> a
+    297:297:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eM
+    59:59:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.RangedAttackMob -> bcf:
+    void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
+net.minecraft.world.entity.monster.Ravager -> bcg:
+    java.util.function.Predicate NO_RAVAGER_AND_ALIVE -> b
+    int attackTick -> bv
+    int stunnedTick -> bw
+    int roarTick -> bx
+    68:72:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    76:88:void registerGoals() -> o
+    92:98:void updateControlFlags() -> H
+    101:107:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
     112:117:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     121:126:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    130:130:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eq
+    130:130:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eM
     135:135:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
-    140:140:int getMaxHeadYRot() -> dV
-    145:145:double getRideHeight() -> aS
-    150:150:boolean canBeControlledByRider() -> dY
-    156:159:net.minecraft.world.entity.Entity getControllingPassenger() -> cd
+    140:140:int getMaxHeadYRot() -> ep
+    145:145:double getPassengersRidingOffset() -> aY
+    150:150:boolean canBeControlledByRider() -> es
+    156:159:net.minecraft.world.entity.Entity getControllingPassenger() -> cl
     164:213:void aiStep() -> k
-    216:223:void stunEffect() -> eB
-    227:227:boolean isImmobile() -> do
+    216:223:void stunEffect() -> eY
+    227:227:boolean isImmobile() -> dH
     232:235:boolean canSee(net.minecraft.world.entity.Entity) -> D
-    240:252:void blockedByShield(net.minecraft.world.entity.LivingEntity) -> e
-    255:272:void roar() -> eC
+    240:252:void blockedByShield(net.minecraft.world.entity.LivingEntity) -> f
+    255:272:void roar() -> eZ
     275:279:void strongKnockback(net.minecraft.world.entity.Entity) -> a
     283:290:void handleEntityEvent(byte) -> a
-    293:293:int getAttackTick() -> l
-    297:297:int getStunnedTick() -> er
-    301:301:int getRoarTick() -> eA
+    293:293:int getAttackTick() -> eL
+    297:297:int getStunnedTick() -> eN
+    301:301:int getRoarTick() -> eX
     306:310:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    316:316:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    316:316:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     321:321:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    326:326:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    326:326:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     331:332:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     336:336:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
     341:341:void applyRaidBuffs(int,boolean) -> a
-    345:345:boolean canBeLeader() -> es
-    49:49:boolean lambda$static$0(net.minecraft.world.entity.Entity) -> b
-    49:49:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Ravager$1 -> axc$1:
-net.minecraft.world.entity.monster.Ravager$RavagerMeleeAttackGoal -> axc$a:
-    net.minecraft.world.entity.monster.Ravager this$0 -> d
+    345:345:boolean canBeLeader() -> eO
+    51:51:boolean lambda$static$0(net.minecraft.world.entity.Entity) -> b
+    51:51:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Ravager$1 -> bcg$1:
+net.minecraft.world.entity.monster.Ravager$RavagerMeleeAttackGoal -> bcg$a:
+    net.minecraft.world.entity.monster.Ravager this$0 -> b
     349:351:void <init>(net.minecraft.world.entity.monster.Ravager) -> <init>
     356:357:double getAttackReachSqr(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.monster.Ravager$RavagerNavigation -> axc$b:
+net.minecraft.world.entity.monster.Ravager$RavagerNavigation -> bcg$b:
     363:364:void <init>(net.minecraft.world.entity.Mob,net.minecraft.world.level.Level) -> <init>
     368:369:net.minecraft.world.level.pathfinder.PathFinder createPathFinder(int) -> a
-net.minecraft.world.entity.monster.Ravager$RavagerNodeEvaluator -> axc$c:
+net.minecraft.world.entity.monster.Ravager$RavagerNodeEvaluator -> bcg$c:
     373:373:void <init>() -> <init>
     376:379:net.minecraft.world.level.pathfinder.BlockPathTypes evaluateBlockPathType(net.minecraft.world.level.BlockGetter,boolean,boolean,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
     373:373:void <init>(net.minecraft.world.entity.monster.Ravager$1) -> <init>
-net.minecraft.world.entity.monster.SharedMonsterAttributes -> axd:
-    org.apache.logging.log4j.Logger LOGGER -> l
-    net.minecraft.world.entity.ai.attributes.Attribute MAX_HEALTH -> a
-    net.minecraft.world.entity.ai.attributes.Attribute FOLLOW_RANGE -> b
-    net.minecraft.world.entity.ai.attributes.Attribute KNOCKBACK_RESISTANCE -> c
-    net.minecraft.world.entity.ai.attributes.Attribute MOVEMENT_SPEED -> d
-    net.minecraft.world.entity.ai.attributes.Attribute FLYING_SPEED -> e
-    net.minecraft.world.entity.ai.attributes.Attribute ATTACK_DAMAGE -> f
-    net.minecraft.world.entity.ai.attributes.Attribute ATTACK_KNOCKBACK -> g
-    net.minecraft.world.entity.ai.attributes.Attribute ATTACK_SPEED -> h
-    net.minecraft.world.entity.ai.attributes.Attribute ARMOR -> i
-    net.minecraft.world.entity.ai.attributes.Attribute ARMOR_TOUGHNESS -> j
-    net.minecraft.world.entity.ai.attributes.Attribute LUCK -> k
-    18:18:void <init>() -> <init>
-    33:39:net.minecraft.nbt.ListTag saveAttributes(net.minecraft.world.entity.ai.attributes.BaseAttributeMap) -> a
-    43:63:net.minecraft.nbt.CompoundTag saveAttribute(net.minecraft.world.entity.ai.attributes.AttributeInstance) -> a
-    67:74:net.minecraft.nbt.CompoundTag saveAttributeModifier(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> a
-    78:88:void loadAttributes(net.minecraft.world.entity.ai.attributes.BaseAttributeMap,net.minecraft.nbt.ListTag) -> a
-    91:108:void loadAttribute(net.minecraft.world.entity.ai.attributes.AttributeInstance,net.minecraft.nbt.CompoundTag) -> a
-    112:118:net.minecraft.world.entity.ai.attributes.AttributeModifier loadAttributeModifier(net.minecraft.nbt.CompoundTag) -> a
-    19:30:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Shulker -> axe:
-    java.util.UUID COVERED_ARMOR_MODIFIER_UUID -> bx
-    net.minecraft.world.entity.ai.attributes.AttributeModifier COVERED_ARMOR_MODIFIER -> by
+net.minecraft.world.entity.monster.Shulker -> bch:
+    java.util.UUID COVERED_ARMOR_MODIFIER_UUID -> bw
+    net.minecraft.world.entity.ai.attributes.AttributeModifier COVERED_ARMOR_MODIFIER -> bx
     net.minecraft.network.syncher.EntityDataAccessor DATA_ATTACH_FACE_ID -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_ATTACH_POS_ID -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_PEEK_ID -> d
-    net.minecraft.network.syncher.EntityDataAccessor DATA_COLOR_ID -> bw
-    float currentPeekAmountO -> bz
-    float currentPeekAmount -> bA
-    net.minecraft.core.BlockPos oldAttachPosition -> bB
-    int clientSideTeleportInterpolation -> bC
-    72:79:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    84:91:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    96:104:void registerGoals() -> n
-    108:108:boolean isMovementNoisy() -> at
-    113:113:net.minecraft.sounds.SoundSource getSoundSource() -> cl
-    118:118:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    123:126:void playAmbientSound() -> B
-    130:130:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    135:138:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    143:149:void defineSynchedData() -> w_
-    153:156:void registerAttributes() -> cA
-    160:160:net.minecraft.world.entity.ai.control.BodyRotationControl createBodyControl() -> o
-    165:178:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    182:193:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    197:303:void tick() -> h
-    307:312:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
-    316:328:void setPos(double,double,double) -> d
-    331:356:boolean teleportSomewhere() -> l
-    361:367:void aiStep() -> k
-    371:388:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    394:395:void lerpTo(double,double,double,float,float,int,boolean) -> a
-    399:413:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    417:417:boolean isClosed() -> ey
-    423:423:net.minecraft.world.phys.AABB getCollideBox() -> au
-    427:427:net.minecraft.core.Direction getAttachFace() -> eq
-    432:432:net.minecraft.core.BlockPos getAttachPosition() -> er
-    436:437:void setAttachPosition(net.minecraft.core.BlockPos) -> g
-    440:440:int getRawPeekAmount() -> es
-    444:455:void setRawPeekAmount(int) -> a
-    458:458:float getClientPeekAmount(float) -> v
-    462:462:int getClientSideTeleportInterpolation() -> et
-    466:466:net.minecraft.core.BlockPos getOldAttachPosition() -> eu
-    471:471:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    476:476:int getMaxHeadXRot() -> dU
-    481:481:int getMaxHeadYRot() -> dV
-    486:486:void push(net.minecraft.world.entity.Entity) -> i
-    490:490:float getPickRadius() -> aV
-    494:494:boolean hasValidInterpolationPositions() -> ev
-    651:652:void setDefaultColor() -> ew
-    655:656:void setColor(net.minecraft.world.item.DyeColor) -> a
-    660:664:net.minecraft.world.item.DyeColor getColor() -> ex
-    53:53:java.util.Random access$100(net.minecraft.world.entity.monster.Shulker) -> a
-    53:53:java.util.Random access$200(net.minecraft.world.entity.monster.Shulker) -> b
-    53:53:java.util.Random access$300(net.minecraft.world.entity.monster.Shulker) -> c
-    53:53:java.util.Random access$400(net.minecraft.world.entity.monster.Shulker) -> d
-    53:53:java.util.Random access$500(net.minecraft.world.entity.monster.Shulker) -> e
-    54:60:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Shulker$1 -> axe$1:
-net.minecraft.world.entity.monster.Shulker$ShulkerAttackGoal -> axe$a:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_COLOR_ID -> bv
+    float currentPeekAmountO -> by
+    float currentPeekAmount -> bz
+    net.minecraft.core.BlockPos oldAttachPosition -> bA
+    int clientSideTeleportInterpolation -> bB
+    71:75:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    79:87:void registerGoals() -> o
+    91:91:boolean isMovementNoisy() -> ax
+    96:96:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    101:101:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    106:109:void playAmbientSound() -> F
+    113:113:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    118:121:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    126:132:void defineSynchedData() -> e
+    135:136:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    141:141:net.minecraft.world.entity.ai.control.BodyRotationControl createBodyControl() -> r
+    146:159:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    163:174:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    178:275:void tick() -> j
+    279:284:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
+    288:300:void setPos(double,double,double) -> d
+    304:310:net.minecraft.core.Direction findAttachableFace(net.minecraft.core.BlockPos) -> g
+    314:314:boolean canAttachOnBlockFace(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    318:338:boolean teleportSomewhere() -> eL
+    343:351:void aiStep() -> k
+    355:372:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    378:379:void lerpTo(double,double,double,float,float,int,boolean) -> a
+    383:397:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    401:401:boolean isClosed() -> eU
+    407:407:net.minecraft.world.phys.AABB getCollideBox() -> ay
+    411:411:net.minecraft.core.Direction getAttachFace() -> eM
+    416:416:net.minecraft.core.BlockPos getAttachPosition() -> eN
+    420:421:void setAttachPosition(net.minecraft.core.BlockPos) -> h
+    424:424:int getRawPeekAmount() -> eO
+    428:439:void setRawPeekAmount(int) -> a
+    442:442:float getClientPeekAmount(float) -> u
+    446:446:int getClientSideTeleportInterpolation() -> eP
+    450:450:net.minecraft.core.BlockPos getOldAttachPosition() -> eQ
+    455:455:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    460:460:int getMaxHeadXRot() -> eo
+    465:465:int getMaxHeadYRot() -> ep
+    470:470:void push(net.minecraft.world.entity.Entity) -> i
+    474:474:float getPickRadius() -> bc
+    478:478:boolean hasValidInterpolationPositions() -> eR
+    635:636:void setDefaultColor() -> eS
+    639:640:void setColor(net.minecraft.world.item.DyeColor) -> a
+    644:648:net.minecraft.world.item.DyeColor getColor() -> eT
+    52:52:java.util.Random access$100(net.minecraft.world.entity.monster.Shulker) -> a
+    52:52:java.util.Random access$200(net.minecraft.world.entity.monster.Shulker) -> b
+    52:52:java.util.Random access$300(net.minecraft.world.entity.monster.Shulker) -> c
+    52:52:java.util.Random access$400(net.minecraft.world.entity.monster.Shulker) -> d
+    52:52:java.util.Random access$500(net.minecraft.world.entity.monster.Shulker) -> e
+    53:59:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Shulker$1 -> bch$1:
+net.minecraft.world.entity.monster.Shulker$ShulkerAttackGoal -> bch$a:
     int attackTime -> b
     net.minecraft.world.entity.monster.Shulker this$0 -> a
-    543:545:void <init>(net.minecraft.world.entity.monster.Shulker) -> <init>
-    549:557:boolean canUse() -> a
-    562:564:void start() -> c
-    568:569:void stop() -> d
-    573:595:void tick() -> e
-net.minecraft.world.entity.monster.Shulker$ShulkerBodyRotationControl -> axe$b:
+    527:529:void <init>(net.minecraft.world.entity.monster.Shulker) -> <init>
+    533:541:boolean canUse() -> a
+    546:548:void start() -> c
+    552:553:void stop() -> d
+    557:579:void tick() -> e
+net.minecraft.world.entity.monster.Shulker$ShulkerBodyRotationControl -> bch$b:
     net.minecraft.world.entity.monster.Shulker this$0 -> a
-    498:500:void <init>(net.minecraft.world.entity.monster.Shulker,net.minecraft.world.entity.Mob) -> <init>
-    505:505:void clientTick() -> a
-net.minecraft.world.entity.monster.Shulker$ShulkerDefenseAttackGoal -> axe$c:
-    626:627:void <init>(net.minecraft.world.entity.monster.Shulker) -> <init>
-    631:634:boolean canUse() -> a
-    639:646:net.minecraft.world.phys.AABB getTargetSearchArea(double) -> a
-    626:626:boolean lambda$new$0(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.monster.Shulker$ShulkerNearestAttackGoal -> axe$d:
+    482:484:void <init>(net.minecraft.world.entity.monster.Shulker,net.minecraft.world.entity.Mob) -> <init>
+    489:489:void clientTick() -> a
+net.minecraft.world.entity.monster.Shulker$ShulkerDefenseAttackGoal -> bch$c:
+    610:611:void <init>(net.minecraft.world.entity.monster.Shulker) -> <init>
+    615:618:boolean canUse() -> a
+    623:630:net.minecraft.world.phys.AABB getTargetSearchArea(double) -> a
+    610:610:boolean lambda$new$0(net.minecraft.world.entity.LivingEntity) -> b
+net.minecraft.world.entity.monster.Shulker$ShulkerNearestAttackGoal -> bch$d:
     net.minecraft.world.entity.monster.Shulker this$0 -> i
-    599:601:void <init>(net.minecraft.world.entity.monster.Shulker,net.minecraft.world.entity.monster.Shulker) -> <init>
-    605:608:boolean canUse() -> a
-    613:620:net.minecraft.world.phys.AABB getTargetSearchArea(double) -> a
-net.minecraft.world.entity.monster.Shulker$ShulkerPeekGoal -> axe$e:
+    583:585:void <init>(net.minecraft.world.entity.monster.Shulker,net.minecraft.world.entity.monster.Shulker) -> <init>
+    589:592:boolean canUse() -> a
+    597:604:net.minecraft.world.phys.AABB getTargetSearchArea(double) -> a
+net.minecraft.world.entity.monster.Shulker$ShulkerPeekGoal -> bch$e:
     int peekTime -> b
     net.minecraft.world.entity.monster.Shulker this$0 -> a
-    508:508:void <init>(net.minecraft.world.entity.monster.Shulker) -> <init>
-    513:513:boolean canUse() -> a
-    518:518:boolean canContinueToUse() -> b
-    523:525:void start() -> c
-    529:532:void stop() -> d
-    536:537:void tick() -> e
-    508:508:void <init>(net.minecraft.world.entity.monster.Shulker,net.minecraft.world.entity.monster.Shulker$1) -> <init>
-net.minecraft.world.entity.monster.Silverfish -> axf:
+    492:492:void <init>(net.minecraft.world.entity.monster.Shulker) -> <init>
+    497:497:boolean canUse() -> a
+    502:502:boolean canContinueToUse() -> b
+    507:509:void start() -> c
+    513:516:void stop() -> d
+    520:521:void tick() -> e
+    492:492:void <init>(net.minecraft.world.entity.monster.Shulker,net.minecraft.world.entity.monster.Shulker$1) -> <init>
+net.minecraft.world.entity.monster.Silverfish -> bci:
     net.minecraft.world.entity.monster.Silverfish$SilverfishWakeUpFriendsGoal friendsGoal -> b
-    37:38:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    42:53:void registerGoals() -> n
-    57:57:double getRidingHeight() -> aR
-    62:62:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    67:72:void registerAttributes() -> cA
-    76:76:boolean isMovementNoisy() -> at
-    81:81:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    39:40:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    44:55:void registerGoals() -> o
+    59:59:double getMyRidingOffset() -> aX
+    64:64:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    68:71:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    76:76:boolean isMovementNoisy() -> ax
+    81:81:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     86:86:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    91:91:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    91:91:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     96:97:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     101:107:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    113:116:void tick() -> h
+    113:116:void tick() -> j
     120:122:void setYBodyRot(float) -> l
     127:130:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
     134:139:boolean checkSliverfishSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    144:144:net.minecraft.world.entity.MobType getMobType() -> di
-net.minecraft.world.entity.monster.Silverfish$SilverfishMergeWithStoneGoal -> axf$a:
+    144:144:net.minecraft.world.entity.MobType getMobType() -> dB
+net.minecraft.world.entity.monster.Silverfish$SilverfishMergeWithStoneGoal -> bci$a:
     net.minecraft.core.Direction selectedDirection -> h
     boolean doMerge -> i
     206:209:void <init>(net.minecraft.world.entity.monster.Silverfish) -> <init>
     213:233:boolean canUse() -> a
     238:241:boolean canContinueToUse() -> b
     246:260:void start() -> c
-net.minecraft.world.entity.monster.Silverfish$SilverfishWakeUpFriendsGoal -> axf$b:
+net.minecraft.world.entity.monster.Silverfish$SilverfishWakeUpFriendsGoal -> bci$b:
     net.minecraft.world.entity.monster.Silverfish silverfish -> a
     int lookForFriends -> b
     151:153:void <init>(net.minecraft.world.entity.monster.Silverfish) -> <init>
     156:159:void notifyHurt() -> g
     163:163:boolean canUse() -> a
     168:198:void tick() -> e
-net.minecraft.world.entity.monster.Skeleton -> axg:
+net.minecraft.world.entity.monster.Skeleton -> bcj:
     13:14:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    18:18:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    18:18:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     23:23:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    28:28:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    33:33:net.minecraft.sounds.SoundEvent getStepSound() -> l
+    28:28:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    33:33:net.minecraft.sounds.SoundEvent getStepSound() -> eL
     38:47:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
-net.minecraft.world.entity.monster.Slime -> axh:
-    net.minecraft.network.syncher.EntityDataAccessor ID_SIZE -> bw
+net.minecraft.world.entity.monster.Slime -> bck:
+    net.minecraft.network.syncher.EntityDataAccessor ID_SIZE -> bv
     float targetSquish -> b
     float squish -> c
     float oSquish -> d
-    boolean wasOnGround -> bx
-    55:58:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    62:72:void registerGoals() -> n
-    76:79:void defineSynchedData() -> w_
-    83:86:void registerAttributes() -> cA
-    89:101:void setSize(int,boolean) -> a
-    104:104:int getSize() -> eu
-    109:112:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    116:123:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    126:126:boolean isTiny() -> ev
-    130:130:net.minecraft.core.particles.ParticleOptions getParticleType() -> l
-    135:135:boolean shouldDespawnInPeaceful() -> J
-    140:161:void tick() -> h
-    164:165:void decreaseSquish() -> ep
-    168:168:int getJumpDelay() -> eo
-    173:178:void refreshDimensions() -> z_
-    182:195:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    200:200:net.minecraft.world.entity.EntityType getType() -> R
-    205:226:void remove() -> X
+    boolean wasOnGround -> bw
+    57:60:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    64:74:void registerGoals() -> o
+    78:81:void defineSynchedData() -> e
+    84:96:void setSize(int,boolean) -> a
+    99:99:int getSize() -> eQ
+    104:107:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    111:118:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    121:121:boolean isTiny() -> eR
+    125:125:net.minecraft.core.particles.ParticleOptions getParticleType() -> eJ
+    130:130:boolean shouldDespawnInPeaceful() -> L
+    135:156:void tick() -> j
+    159:160:void decreaseSquish() -> eL
+    163:163:int getJumpDelay() -> eK
+    168:173:void refreshDimensions() -> y_
+    177:190:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    195:195:net.minecraft.world.entity.EntityType getType() -> U
+    200:226:void remove() -> aa
     230:234:void push(net.minecraft.world.entity.Entity) -> i
-    238:241:void playerTouch(net.minecraft.world.entity.player.Player) -> b
-    244:253:void dealDamage(net.minecraft.world.entity.LivingEntity) -> i
+    238:241:void playerTouch(net.minecraft.world.entity.player.Player) -> a_
+    244:253:void dealDamage(net.minecraft.world.entity.LivingEntity) -> j
     257:257:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    261:261:boolean isDealsDamage() -> eq
-    265:265:float getAttackDamage() -> er
+    261:261:boolean isDealsDamage() -> eM
+    265:265:float getAttackDamage() -> eN
     270:273:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    279:282:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    287:290:net.minecraft.sounds.SoundEvent getSquishSound() -> es
-    296:296:net.minecraft.resources.ResourceLocation getDefaultLootTable() -> H
-    300:319:boolean checkSlimeSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
-    324:324:float getSoundVolume() -> dm
-    329:329:int getMaxHeadXRot() -> dU
-    333:333:boolean doPlayJumpSound() -> ew
-    338:341:void jumpFromGround() -> dq
-    346:353:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    413:413:net.minecraft.sounds.SoundEvent getJumpSound() -> et
-    418:418:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
-    70:70:boolean lambda$registerGoals$0(net.minecraft.world.entity.LivingEntity) -> j
-    47:47:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Slime$SlimeAttackGoal -> axh$a:
+    279:282:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    287:290:net.minecraft.sounds.SoundEvent getSquishSound() -> eO
+    296:296:net.minecraft.resources.ResourceLocation getDefaultLootTable() -> J
+    300:320:boolean checkSlimeSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
+    325:325:float getSoundVolume() -> dF
+    330:330:int getMaxHeadXRot() -> eo
+    334:334:boolean doPlayJumpSound() -> eS
+    339:342:void jumpFromGround() -> dJ
+    347:354:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    414:415:float getSoundPitch() -> m
+    419:419:net.minecraft.sounds.SoundEvent getJumpSound() -> eP
+    424:424:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
+    72:72:boolean lambda$registerGoals$0(net.minecraft.world.entity.LivingEntity) -> k
+    48:48:float access$000(net.minecraft.world.entity.monster.Slime) -> a
+    48:48:boolean access$100(net.minecraft.world.entity.monster.Slime) -> b
+    49:49:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Slime$SlimeAttackGoal -> bck$a:
     net.minecraft.world.entity.monster.Slime slime -> a
     int growTiredTimer -> b
-    425:428:void <init>(net.minecraft.world.entity.monster.Slime) -> <init>
-    432:445:boolean canUse() -> a
-    450:452:void start() -> c
-    456:472:boolean canContinueToUse() -> b
-    477:479:void tick() -> e
-net.minecraft.world.entity.monster.Slime$SlimeFloatGoal -> axh$b:
+    431:434:void <init>(net.minecraft.world.entity.monster.Slime) -> <init>
+    438:451:boolean canUse() -> a
+    456:458:void start() -> c
+    462:478:boolean canContinueToUse() -> b
+    483:485:void tick() -> e
+net.minecraft.world.entity.monster.Slime$SlimeFloatGoal -> bck$b:
     net.minecraft.world.entity.monster.Slime slime -> a
-    511:515:void <init>(net.minecraft.world.entity.monster.Slime) -> <init>
-    519:519:boolean canUse() -> a
-    524:528:void tick() -> e
-net.minecraft.world.entity.monster.Slime$SlimeKeepOnJumpingGoal -> axh$c:
+    517:521:void <init>(net.minecraft.world.entity.monster.Slime) -> <init>
+    525:525:boolean canUse() -> a
+    530:534:void tick() -> e
+net.minecraft.world.entity.monster.Slime$SlimeKeepOnJumpingGoal -> bck$c:
     net.minecraft.world.entity.monster.Slime slime -> a
-    534:537:void <init>(net.minecraft.world.entity.monster.Slime) -> <init>
-    541:541:boolean canUse() -> a
-    546:547:void tick() -> e
-net.minecraft.world.entity.monster.Slime$SlimeMoveControl -> axh$d:
+    540:543:void <init>(net.minecraft.world.entity.monster.Slime) -> <init>
+    547:547:boolean canUse() -> a
+    552:553:void tick() -> e
+net.minecraft.world.entity.monster.Slime$SlimeMoveControl -> bck$d:
     float yRot -> i
     int jumpDelay -> j
     net.minecraft.world.entity.monster.Slime slime -> k
     boolean isAggressive -> l
-    363:366:void <init>(net.minecraft.world.entity.monster.Slime) -> <init>
-    369:371:void setDirection(float,boolean) -> a
-    374:376:void setWantedMovement(double) -> a
-    380:409:void tick() -> a
-net.minecraft.world.entity.monster.Slime$SlimeRandomDirectionGoal -> axh$e:
+    364:367:void <init>(net.minecraft.world.entity.monster.Slime) -> <init>
+    370:372:void setDirection(float,boolean) -> a
+    375:377:void setWantedMovement(double) -> a
+    381:410:void tick() -> a
+net.minecraft.world.entity.monster.Slime$SlimeRandomDirectionGoal -> bck$e:
     net.minecraft.world.entity.monster.Slime slime -> a
     float chosenDegrees -> b
     int nextRandomizeTime -> c
-    488:491:void <init>(net.minecraft.world.entity.monster.Slime) -> <init>
-    495:495:boolean canUse() -> a
-    500:505:void tick() -> e
-net.minecraft.world.entity.monster.SpellcasterIllager -> axi:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_SPELL_CASTING_ID -> bw
+    494:497:void <init>(net.minecraft.world.entity.monster.Slime) -> <init>
+    501:501:boolean canUse() -> a
+    506:511:void tick() -> e
+net.minecraft.world.entity.monster.SpellcasterIllager -> bcl:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_SPELL_CASTING_ID -> bv
     int spellCastingTickCount -> b
-    net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell currentSpell -> bx
+    net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell currentSpell -> bw
     23:27:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    31:34:void defineSynchedData() -> w_
+    31:34:void defineSynchedData() -> e
     38:41:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     45:48:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    52:57:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose getArmPose() -> l
-    61:64:boolean isCastingSpell() -> eA
+    52:57:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose getArmPose() -> m
+    61:64:boolean isCastingSpell() -> eX
     68:70:void setIsCastingSpell(net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell) -> a
-    73:76:net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell getCurrentSpell() -> eB
-    81:86:void customServerAiStep() -> dT
-    90:106:void tick() -> h
-    109:109:int getSpellCastingTime() -> eC
-    net.minecraft.sounds.SoundEvent getCastingSoundEvent() -> er
+    73:76:net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell getCurrentSpell() -> eY
+    81:86:void customServerAiStep() -> N
+    90:106:void tick() -> j
+    109:109:int getSpellCastingTime() -> eZ
+    net.minecraft.sounds.SoundEvent getCastingSoundEvent() -> eN
     19:19:net.minecraft.world.entity.ai.navigation.PathNavigation access$200(net.minecraft.world.entity.monster.SpellcasterIllager) -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell -> axi$a:
+net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell -> bcl$a:
     net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell NONE -> a
     net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell SUMMON_VEX -> b
     net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell FANGS -> c
@@ -44019,14 +47757,14 @@ net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell -> axi$a:
     207:207:int access$000(net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell) -> a
     207:207:double[] access$100(net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell) -> b
     207:213:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.SpellcasterIllager$SpellcasterCastingSpellGoal -> axi$b:
+net.minecraft.world.entity.monster.SpellcasterIllager$SpellcasterCastingSpellGoal -> bcl$b:
     net.minecraft.world.entity.monster.SpellcasterIllager this$0 -> b
     115:117:void <init>(net.minecraft.world.entity.monster.SpellcasterIllager) -> <init>
     121:121:boolean canUse() -> a
     126:128:void start() -> c
     132:134:void stop() -> d
     138:141:void tick() -> e
-net.minecraft.world.entity.monster.SpellcasterIllager$SpellcasterUseSpellGoal -> axi$c:
+net.minecraft.world.entity.monster.SpellcasterIllager$SpellcasterUseSpellGoal -> bcl$c:
     int attackWarmupDelay -> b
     int nextAttackTickCount -> c
     net.minecraft.world.entity.monster.SpellcasterIllager this$0 -> d
@@ -44041,88 +47779,164 @@ net.minecraft.world.entity.monster.SpellcasterIllager$SpellcasterUseSpellGoal ->
     int getCastingInterval() -> h
     net.minecraft.sounds.SoundEvent getSpellPrepareSound() -> k
     net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell getSpell() -> l
-net.minecraft.world.entity.monster.Spider -> axj:
+net.minecraft.world.entity.monster.Spider -> bcm:
     net.minecraft.network.syncher.EntityDataAccessor DATA_FLAGS_ID -> b
-    48:49:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    53:65:void registerGoals() -> n
-    69:69:double getRideHeight() -> aS
-    74:74:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
-    79:82:void defineSynchedData() -> w_
-    86:93:void tick() -> h
-    97:101:void registerAttributes() -> cA
-    105:105:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    50:51:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    55:67:void registerGoals() -> o
+    71:71:double getPassengersRidingOffset() -> aY
+    76:76:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
+    81:84:void defineSynchedData() -> e
+    88:95:void tick() -> j
+    98:100:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    105:105:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     110:110:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    115:115:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    115:115:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     120:121:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    129:129:boolean onLadder() -> y_
+    129:129:boolean onClimbable() -> c_
     135:138:void makeStuckInBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.Vec3) -> a
-    142:142:net.minecraft.world.entity.MobType getMobType() -> di
+    142:142:net.minecraft.world.entity.MobType getMobType() -> dB
     147:150:boolean canBeAffected(net.minecraft.world.effect.MobEffectInstance) -> d
-    154:154:boolean isClimbing() -> l
-    158:165:void setClimbing(boolean) -> r
+    154:154:boolean isClimbing() -> eM
+    158:165:void setClimbing(boolean) -> t
     170:194:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
     199:199:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    45:45:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Spider$SpiderAttackGoal -> axj$a:
+    47:47:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Spider$SpiderAttackGoal -> bcm$a:
     223:224:void <init>(net.minecraft.world.entity.monster.Spider) -> <init>
     228:228:boolean canUse() -> a
     233:238:boolean canContinueToUse() -> b
     243:243:double getAttackReachSqr(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.monster.Spider$SpiderEffectsGroupData -> axj$b:
+net.minecraft.world.entity.monster.Spider$SpiderEffectsGroupData -> bcm$b:
     net.minecraft.world.effect.MobEffect effect -> a
     204:204:void <init>() -> <init>
     208:218:void setRandomEffect(java.util.Random) -> a
-net.minecraft.world.entity.monster.Spider$SpiderTargetGoal -> axj$c:
+net.minecraft.world.entity.monster.Spider$SpiderTargetGoal -> bcm$c:
     249:250:void <init>(net.minecraft.world.entity.monster.Spider,java.lang.Class) -> <init>
     254:259:boolean canUse() -> a
-net.minecraft.world.entity.monster.Stray -> axk:
+net.minecraft.world.entity.monster.Stray -> bcn:
     22:23:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     26:27:boolean checkStraySpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
-    32:32:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
+    32:32:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
     37:37:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    42:42:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    47:47:net.minecraft.sounds.SoundEvent getStepSound() -> l
+    42:42:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    47:47:net.minecraft.sounds.SoundEvent getStepSound() -> eL
     52:56:net.minecraft.world.entity.projectile.AbstractArrow getArrow(net.minecraft.world.item.ItemStack,float) -> b
-net.minecraft.world.entity.monster.Vex -> axl:
+net.minecraft.world.entity.monster.Strider -> bco:
+    net.minecraft.world.item.crafting.Ingredient FOOD_ITEMS -> bv
+    net.minecraft.world.item.crafting.Ingredient TEMPT_ITEMS -> bw
+    net.minecraft.network.syncher.EntityDataAccessor DATA_BOOST_TIME -> bx
+    net.minecraft.network.syncher.EntityDataAccessor DATA_SUFFOCATING -> by
+    net.minecraft.network.syncher.EntityDataAccessor DATA_SADDLE_ID -> bz
+    net.minecraft.world.entity.ItemBasedSteering steering -> bA
+    net.minecraft.world.entity.ai.goal.TemptGoal temptGoal -> bB
+    net.minecraft.world.entity.ai.goal.PanicGoal panicGoal -> bC
+    84:93:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    96:101:boolean checkStriderSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
+    106:110:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    114:118:void defineSynchedData() -> e
+    122:124:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    128:130:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    134:134:boolean isSaddled() -> N_
+    139:139:boolean isSaddleable() -> M_
+    144:148:void equipSaddle(net.minecraft.sounds.SoundSource) -> a
+    152:162:void registerGoals() -> o
+    165:166:void setSuffocating(boolean) -> t
+    170:174:boolean isSuffocating() -> eL
+    179:179:boolean canStandOnFluid(net.minecraft.world.level.material.Fluid) -> a
+    185:188:net.minecraft.world.phys.AABB getCollideAgainstBox(net.minecraft.world.entity.Entity) -> j
+    193:193:boolean isPushable() -> aR
+    198:201:double getPassengersRidingOffset() -> aY
+    206:213:boolean canBeControlledByRider() -> es
+    218:218:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
+    224:227:net.minecraft.world.entity.Entity getControllingPassenger() -> cl
+    232:275:net.minecraft.world.phys.Vec3 getDismountLocationForPassenger(net.minecraft.world.entity.LivingEntity) -> c
+    280:282:void travel(net.minecraft.world.phys.Vec3) -> f
+    285:285:float getMoveSpeed() -> eM
+    290:290:float getSteeringSpeed() -> O_
+    295:296:void travelWithInput(net.minecraft.world.phys.Vec3) -> a_
+    300:300:float nextStep() -> ao
+    305:306:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    310:310:boolean boost() -> P_
+    315:323:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    327:345:void tick() -> j
+    348:348:boolean isPanicking() -> eO
+    352:352:boolean isBeingTempted() -> eP
+    357:357:boolean shouldPassengersInheritMalus() -> q
+    361:369:void floatStrider() -> eV
+    372:374:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eN
+    379:382:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    387:387:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    392:392:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    397:397:boolean canAddPassenger(net.minecraft.world.entity.Entity) -> q
+    402:402:boolean isSensitiveToWater() -> dN
+    407:407:boolean isOnFire() -> bm
+    412:412:net.minecraft.world.entity.ai.navigation.PathNavigation createNavigation(net.minecraft.world.level.Level) -> b
+    417:421:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
+    426:426:net.minecraft.world.entity.monster.Strider getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    431:431:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    436:440:void dropEquipment() -> dm
+    444:464:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    469:469:net.minecraft.world.phys.Vec3 getLeashOffset() -> ce
+    476:519:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    66:66:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    71:76:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Strider$StriderGroupData -> bco$a:
+    net.minecraft.world.entity.monster.Strider$StriderGroupData$Rider rider -> a
+    531:533:void <init>(net.minecraft.world.entity.monster.Strider$StriderGroupData$Rider) -> <init>
+net.minecraft.world.entity.monster.Strider$StriderGroupData$Rider -> bco$a$a:
+    net.minecraft.world.entity.monster.Strider$StriderGroupData$Rider NO_RIDER -> a
+    net.minecraft.world.entity.monster.Strider$StriderGroupData$Rider BABY_RIDER -> b
+    net.minecraft.world.entity.monster.Strider$StriderGroupData$Rider PIGLIN_RIDER -> c
+    net.minecraft.world.entity.monster.Strider$StriderGroupData$Rider[] $VALUES -> d
+    523:523:net.minecraft.world.entity.monster.Strider$StriderGroupData$Rider[] values() -> values
+    523:523:net.minecraft.world.entity.monster.Strider$StriderGroupData$Rider valueOf(java.lang.String) -> valueOf
+    523:523:void <init>(java.lang.String,int) -> <init>
+    523:526:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Strider$StriderPathNavigation -> bco$b:
+    538:539:void <init>(net.minecraft.world.entity.monster.Strider,net.minecraft.world.level.Level) -> <init>
+    544:545:net.minecraft.world.level.pathfinder.PathFinder createPathFinder(int) -> a
+    550:554:boolean hasValidPathType(net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
+    559:559:boolean isStableDestination(net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.monster.Vex -> bcp:
     net.minecraft.network.syncher.EntityDataAccessor DATA_FLAGS_ID -> b
     net.minecraft.world.entity.Mob owner -> c
     net.minecraft.core.BlockPos boundOrigin -> d
-    boolean hasLimitedLife -> bw
-    int limitedLifeTicks -> bx
-    53:58:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    62:65:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
-    69:81:void tick() -> h
-    85:96:void registerGoals() -> n
-    100:104:void registerAttributes() -> cA
-    108:111:void defineSynchedData() -> w_
+    boolean hasLimitedLife -> bv
+    int limitedLifeTicks -> bw
+    55:60:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    64:67:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
+    71:83:void tick() -> j
+    87:98:void registerGoals() -> o
+    101:103:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    108:111:void defineSynchedData() -> e
     115:123:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     127:137:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    140:140:net.minecraft.world.entity.Mob getOwner() -> l
-    145:145:net.minecraft.core.BlockPos getBoundOrigin() -> eq
+    140:140:net.minecraft.world.entity.Mob getOwner() -> eL
+    145:145:net.minecraft.core.BlockPos getBoundOrigin() -> eM
     149:150:void setBoundOrigin(net.minecraft.core.BlockPos) -> g
     153:154:boolean getVexFlag(int) -> b
     158:165:void setVexFlag(int,boolean) -> a
-    168:168:boolean isCharging() -> er
-    172:173:void setIsCharging(boolean) -> r
+    168:168:boolean isCharging() -> eN
+    172:173:void setIsCharging(boolean) -> t
     176:177:void setOwner(net.minecraft.world.entity.Mob) -> a
     180:182:void setLimitedLife(int) -> a
-    186:186:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    191:191:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
+    186:186:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    191:191:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
     196:196:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    201:201:float getBrightness() -> aI
+    201:201:float getBrightness() -> aO
     331:334:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
     339:341:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
-    41:41:java.util.Random access$000(net.minecraft.world.entity.monster.Vex) -> a
-    41:41:net.minecraft.world.entity.ai.control.MoveControl access$100(net.minecraft.world.entity.monster.Vex) -> b
-    41:41:net.minecraft.world.entity.ai.control.MoveControl access$200(net.minecraft.world.entity.monster.Vex) -> c
-    41:41:java.util.Random access$300(net.minecraft.world.entity.monster.Vex) -> d
-    41:41:java.util.Random access$400(net.minecraft.world.entity.monster.Vex) -> e
-    41:41:java.util.Random access$500(net.minecraft.world.entity.monster.Vex) -> f
-    41:41:java.util.Random access$600(net.minecraft.world.entity.monster.Vex) -> g
-    41:41:net.minecraft.world.entity.ai.control.MoveControl access$700(net.minecraft.world.entity.monster.Vex) -> h
-    41:41:net.minecraft.world.entity.Mob access$800(net.minecraft.world.entity.monster.Vex) -> i
-    42:42:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Vex$VexChargeAttackGoal -> axl$a:
+    43:43:java.util.Random access$000(net.minecraft.world.entity.monster.Vex) -> a
+    43:43:net.minecraft.world.entity.ai.control.MoveControl access$100(net.minecraft.world.entity.monster.Vex) -> b
+    43:43:net.minecraft.world.entity.ai.control.MoveControl access$200(net.minecraft.world.entity.monster.Vex) -> c
+    43:43:java.util.Random access$300(net.minecraft.world.entity.monster.Vex) -> d
+    43:43:java.util.Random access$400(net.minecraft.world.entity.monster.Vex) -> e
+    43:43:java.util.Random access$500(net.minecraft.world.entity.monster.Vex) -> f
+    43:43:java.util.Random access$600(net.minecraft.world.entity.monster.Vex) -> g
+    43:43:net.minecraft.world.entity.ai.control.MoveControl access$700(net.minecraft.world.entity.monster.Vex) -> h
+    43:43:net.minecraft.world.entity.Mob access$800(net.minecraft.world.entity.monster.Vex) -> i
+    44:44:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Vex$VexChargeAttackGoal -> bcp$a:
     net.minecraft.world.entity.monster.Vex this$0 -> a
     245:247:void <init>(net.minecraft.world.entity.monster.Vex) -> <init>
     251:254:boolean canUse() -> a
@@ -44130,400 +47944,812 @@ net.minecraft.world.entity.monster.Vex$VexChargeAttackGoal -> axl$a:
     264:269:void start() -> c
     273:274:void stop() -> d
     278:289:void tick() -> e
-net.minecraft.world.entity.monster.Vex$VexCopyOwnerTargetGoal -> axl$b:
+net.minecraft.world.entity.monster.Vex$VexCopyOwnerTargetGoal -> bcp$b:
     net.minecraft.world.entity.ai.targeting.TargetingConditions copyOwnerTargeting -> b
     net.minecraft.world.entity.monster.Vex this$0 -> a
     344:348:void <init>(net.minecraft.world.entity.monster.Vex,net.minecraft.world.entity.PathfinderMob) -> <init>
     352:352:boolean canUse() -> a
     357:359:void start() -> c
-net.minecraft.world.entity.monster.Vex$VexMoveControl -> axl$c:
+net.minecraft.world.entity.monster.Vex$VexMoveControl -> bcp$c:
     net.minecraft.world.entity.monster.Vex this$0 -> i
     205:207:void <init>(net.minecraft.world.entity.monster.Vex,net.minecraft.world.entity.monster.Vex) -> <init>
     211:241:void tick() -> a
-net.minecraft.world.entity.monster.Vex$VexRandomMoveGoal -> axl$d:
+net.minecraft.world.entity.monster.Vex$VexRandomMoveGoal -> bcp$d:
     net.minecraft.world.entity.monster.Vex this$0 -> a
     293:295:void <init>(net.minecraft.world.entity.monster.Vex) -> <init>
     299:299:boolean canUse() -> a
     304:304:boolean canContinueToUse() -> b
     309:325:void tick() -> e
-net.minecraft.world.entity.monster.Vindicator -> axm:
+net.minecraft.world.entity.monster.Vindicator -> bcq:
     java.util.function.Predicate DOOR_BREAKING_PREDICATE -> b
-    boolean isJohnny -> bw
-    57:58:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    62:77:void registerGoals() -> n
-    97:106:void customServerAiStep() -> dT
-    110:116:void registerAttributes() -> cA
-    120:125:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    129:134:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose getArmPose() -> l
-    139:144:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    148:148:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eq
-    154:161:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    166:169:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
-    173:180:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
-    185:189:void setCustomName(net.minecraft.network.chat.Component) -> b
-    193:193:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    198:198:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    203:203:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    208:223:void applyRaidBuffs(int,boolean) -> a
-    52:52:boolean lambda$static$0(net.minecraft.world.Difficulty) -> a
-    50:50:java.util.function.Predicate access$000() -> er
-    50:50:java.util.Random access$100(net.minecraft.world.entity.monster.Vindicator) -> a
-    50:50:boolean access$200(net.minecraft.world.entity.monster.Vindicator) -> b
-    52:52:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Vindicator$VindicatorBreakDoorGoal -> axm$a:
-    227:229:void <init>(net.minecraft.world.entity.Mob) -> <init>
-    233:234:boolean canContinueToUse() -> b
-    239:240:boolean canUse() -> a
-    245:247:void start() -> c
-net.minecraft.world.entity.monster.Vindicator$VindicatorJohnnyAttackGoal -> axm$b:
-    252:253:void <init>(net.minecraft.world.entity.monster.Vindicator) -> <init>
-    257:257:boolean canUse() -> a
-    262:264:void start() -> c
-net.minecraft.world.entity.monster.Vindicator$VindicatorMeleeAttackGoal -> axm$c:
-    net.minecraft.world.entity.monster.Vindicator this$0 -> d
-    80:82:void <init>(net.minecraft.world.entity.monster.Vindicator,net.minecraft.world.entity.monster.Vindicator) -> <init>
-    86:91:double getAttackReachSqr(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.entity.monster.Witch -> axn:
+    boolean isJohnny -> bv
+    58:59:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    63:78:void registerGoals() -> o
+    98:107:void customServerAiStep() -> N
+    110:114:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    119:124:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    128:133:net.minecraft.world.entity.monster.AbstractIllager$IllagerArmPose getArmPose() -> m
+    138:143:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    147:147:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eM
+    153:160:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    165:168:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
+    172:179:boolean isAlliedTo(net.minecraft.world.entity.Entity) -> r
+    184:188:void setCustomName(net.minecraft.network.chat.Component) -> a
+    192:192:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    197:197:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    202:202:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    207:222:void applyRaidBuffs(int,boolean) -> a
+    53:53:boolean lambda$static$0(net.minecraft.world.Difficulty) -> a
+    51:51:java.util.function.Predicate access$000() -> eN
+    51:51:java.util.Random access$100(net.minecraft.world.entity.monster.Vindicator) -> a
+    51:51:boolean access$200(net.minecraft.world.entity.monster.Vindicator) -> b
+    53:53:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Vindicator$VindicatorBreakDoorGoal -> bcq$a:
+    226:228:void <init>(net.minecraft.world.entity.Mob) -> <init>
+    232:233:boolean canContinueToUse() -> b
+    238:239:boolean canUse() -> a
+    244:246:void start() -> c
+net.minecraft.world.entity.monster.Vindicator$VindicatorJohnnyAttackGoal -> bcq$b:
+    251:252:void <init>(net.minecraft.world.entity.monster.Vindicator) -> <init>
+    256:256:boolean canUse() -> a
+    261:263:void start() -> c
+net.minecraft.world.entity.monster.Vindicator$VindicatorMeleeAttackGoal -> bcq$c:
+    net.minecraft.world.entity.monster.Vindicator this$0 -> b
+    81:83:void <init>(net.minecraft.world.entity.monster.Vindicator,net.minecraft.world.entity.monster.Vindicator) -> <init>
+    87:92:double getAttackReachSqr(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.entity.monster.Witch -> bcr:
     java.util.UUID SPEED_MODIFIER_DRINKING_UUID -> b
-    net.minecraft.world.entity.ai.attributes.AttributeModifier SPEED_MODIFIER_DRINKING -> bw
-    net.minecraft.network.syncher.EntityDataAccessor DATA_USING_ITEM -> bx
-    int usingTime -> by
-    net.minecraft.world.entity.ai.goal.target.NearestHealableRaiderTargetGoal healRaidersGoal -> bz
-    net.minecraft.world.entity.ai.goal.target.NearestAttackableWitchTargetGoal attackPlayersGoal -> bA
-    57:58:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    62:77:void registerGoals() -> n
-    81:84:void defineSynchedData() -> w_
-    88:88:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    93:93:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    98:98:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    102:103:void setUsingItem(boolean) -> t
-    106:106:boolean isDrinkingPotion() -> l
-    111:115:void registerAttributes() -> cA
-    119:175:void aiStep() -> k
-    179:179:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eq
-    184:191:void handleEntityEvent(byte) -> a
-    195:204:float getDamageAfterMagicAbsorb(net.minecraft.world.damagesource.DamageSource,float) -> c
-    209:245:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
-    249:249:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    254:254:void applyRaidBuffs(int,boolean) -> a
-    258:258:boolean canBeLeader() -> es
-    65:65:boolean lambda$registerGoals$0(net.minecraft.world.entity.LivingEntity) -> i
-    46:49:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.WitherSkeleton -> axo:
-    30:33:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    37:37:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    42:42:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    47:47:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    52:52:net.minecraft.sounds.SoundEvent getStepSound() -> l
-    57:66:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
-    70:71:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
-    75:75:void populateDefaultEquipmentEnchantments(net.minecraft.world.DifficultyInstance) -> b
-    80:86:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    91:91:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    96:103:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    108:110:net.minecraft.world.entity.projectile.AbstractArrow getArrow(net.minecraft.world.item.ItemStack,float) -> b
-    115:118:boolean canBeAffected(net.minecraft.world.effect.MobEffectInstance) -> d
-net.minecraft.world.entity.monster.Zombie -> axp:
-    net.minecraft.world.entity.ai.attributes.Attribute SPAWN_REINFORCEMENTS_CHANCE -> d
+    net.minecraft.world.entity.ai.attributes.AttributeModifier SPEED_MODIFIER_DRINKING -> bv
+    net.minecraft.network.syncher.EntityDataAccessor DATA_USING_ITEM -> bw
+    int usingTime -> bx
+    net.minecraft.world.entity.ai.goal.target.NearestHealableRaiderTargetGoal healRaidersGoal -> by
+    net.minecraft.world.entity.ai.goal.target.NearestAttackableWitchTargetGoal attackPlayersGoal -> bz
+    59:60:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    64:79:void registerGoals() -> o
+    83:86:void defineSynchedData() -> e
+    90:90:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    95:95:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    100:100:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    104:105:void setUsingItem(boolean) -> v
+    108:108:boolean isDrinkingPotion() -> m
+    112:114:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    119:177:void aiStep() -> k
+    181:181:net.minecraft.sounds.SoundEvent getCelebrateSound() -> eM
+    186:193:void handleEntityEvent(byte) -> a
+    197:206:float getDamageAfterMagicAbsorb(net.minecraft.world.damagesource.DamageSource,float) -> d
+    211:249:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
+    253:253:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    258:258:void applyRaidBuffs(int,boolean) -> a
+    262:262:boolean canBeLeader() -> eO
+    67:67:boolean lambda$registerGoals$0(net.minecraft.world.entity.LivingEntity) -> j
+    48:51:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.WitherSkeleton -> bcs:
+    33:36:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    40:42:void registerGoals() -> o
+    46:46:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    51:51:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    56:56:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    61:61:net.minecraft.sounds.SoundEvent getStepSound() -> eL
+    66:75:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
+    79:80:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
+    84:84:void populateDefaultEquipmentEnchantments(net.minecraft.world.DifficultyInstance) -> b
+    89:95:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    100:100:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    105:112:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    117:119:net.minecraft.world.entity.projectile.AbstractArrow getArrow(net.minecraft.world.item.ItemStack,float) -> b
+    124:127:boolean canBeAffected(net.minecraft.world.effect.MobEffectInstance) -> d
+net.minecraft.world.entity.monster.Zoglin -> bct:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_BABY_ID -> d
+    int attackAnimationRemainingTicks -> bv
+    com.google.common.collect.ImmutableList SENSOR_TYPES -> b
+    com.google.common.collect.ImmutableList MEMORY_TYPES -> c
+    93:95:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    99:99:net.minecraft.world.entity.ai.Brain$Provider brainProvider() -> cJ
+    104:112:net.minecraft.world.entity.ai.Brain makeBrain(com.mojang.serialization.Dynamic) -> a
+    117:121:void initCoreActivity(net.minecraft.world.entity.ai.Brain) -> a
+    124:133:void initIdleActivity(net.minecraft.world.entity.ai.Brain) -> b
+    136:142:void initFightActivity(net.minecraft.world.entity.ai.Brain) -> c
+    145:145:java.util.Optional findNearestValidAttackTarget() -> eP
+    149:150:boolean isTargetable(net.minecraft.world.entity.LivingEntity) -> j
+    155:157:void defineSynchedData() -> e
+    161:165:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    168:173:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> m
+    177:177:boolean isAdult() -> eL
+    182:189:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    194:197:void blockedByShield(net.minecraft.world.entity.LivingEntity) -> f
+    201:212:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    216:218:void setAttackTarget(net.minecraft.world.entity.LivingEntity) -> k
+    223:223:net.minecraft.world.entity.ai.Brain getBrain() -> cI
+    227:240:void updateActivity() -> eM
+    245:250:void customServerAiStep() -> N
+    254:258:void setBaby(boolean) -> a
+    262:262:boolean isBaby() -> x_
+    268:272:void aiStep() -> k
+    277:284:void handleEntityEvent(byte) -> a
+    288:288:int getAttackAnimationRemainingTicks() -> eN
+    293:299:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    304:304:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    309:309:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    314:315:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    318:319:void playAngrySound() -> eO
+    323:325:void sendDebugPackets() -> M
+    329:329:net.minecraft.world.entity.MobType getMobType() -> dB
+    334:339:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    343:348:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    58:79:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Zombie -> bcu:
     java.util.UUID SPEED_MODIFIER_BABY_UUID -> b
     net.minecraft.world.entity.ai.attributes.AttributeModifier SPEED_MODIFIER_BABY -> c
-    net.minecraft.network.syncher.EntityDataAccessor DATA_BABY_ID -> bw
-    net.minecraft.network.syncher.EntityDataAccessor DATA_SPECIAL_TYPE_ID -> bx
-    net.minecraft.network.syncher.EntityDataAccessor DATA_DROWNED_CONVERSION_ID -> by
-    java.util.function.Predicate DOOR_BREAKING_PREDICATE -> bz
-    net.minecraft.world.entity.ai.goal.BreakDoorGoal breakDoorGoal -> bA
-    boolean canBreakDoors -> bB
-    int inWaterTime -> bC
-    int conversionTime -> bD
-    84:92:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    95:96:void <init>(net.minecraft.world.level.Level) -> <init>
-    100:105:void registerGoals() -> n
-    111:120:void addBehaviourGoals() -> l
-    124:132:void registerAttributes() -> cA
-    136:141:void defineSynchedData() -> w_
-    144:144:boolean isUnderWaterConverting() -> ex
-    148:148:boolean canBreakDoors() -> ey
-    152:169:void setCanBreakDoors(boolean) -> s
-    172:172:boolean supportsBreakDoorGoal() -> eq
-    177:177:boolean isBaby() -> x_
-    182:186:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
-    190:199:void setBaby(boolean) -> t
-    203:208:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    211:211:boolean convertsInWater() -> et
-    216:237:void tick() -> h
-    241:264:void aiStep() -> k
-    267:269:void startUnderWaterConversion(int) -> a
-    273:275:void doUnderWaterConversion() -> ev
-    278:311:void convertTo(net.minecraft.world.entity.EntityType) -> b
-    315:338:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    342:342:boolean isSunSensitive() -> K_
-    347:385:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    390:403:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
-    408:408:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    413:413:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    418:418:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    422:422:net.minecraft.sounds.SoundEvent getStepSound() -> er
-    427:428:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    432:432:net.minecraft.world.entity.MobType getMobType() -> di
-    437:447:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
-    451:460:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    464:476:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    480:511:void killed(net.minecraft.world.entity.LivingEntity) -> b
-    515:515:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    520:523:boolean canHoldItem(net.minecraft.world.item.ItemStack) -> g
-    529:583:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    587:598:void handleAttributes(float) -> v
-    610:610:double getRidingHeight() -> aR
-    615:627:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
-    630:630:net.minecraft.world.item.ItemStack getSkull() -> es
-    83:83:boolean lambda$static$0(net.minecraft.world.Difficulty) -> a
-    69:69:java.util.Random access$100(net.minecraft.world.entity.monster.Zombie) -> a
-    70:83:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.Zombie$1 -> axp$1:
-net.minecraft.world.entity.monster.Zombie$ZombieAttackTurtleEggGoal -> axp$a:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_BABY_ID -> d
+    net.minecraft.network.syncher.EntityDataAccessor DATA_SPECIAL_TYPE_ID -> bv
+    net.minecraft.network.syncher.EntityDataAccessor DATA_DROWNED_CONVERSION_ID -> bw
+    java.util.function.Predicate DOOR_BREAKING_PREDICATE -> bx
+    net.minecraft.world.entity.ai.goal.BreakDoorGoal breakDoorGoal -> by
+    boolean canBreakDoors -> bz
+    int inWaterTime -> bA
+    int conversionTime -> bB
+    83:91:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    94:95:void <init>(net.minecraft.world.level.Level) -> <init>
+    99:104:void registerGoals() -> o
+    107:116:void addBehaviourGoals() -> m
+    119:124:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eT
+    129:134:void defineSynchedData() -> e
+    137:137:boolean isUnderWaterConverting() -> eU
+    141:141:boolean canBreakDoors() -> eV
+    145:162:void setCanBreakDoors(boolean) -> u
+    165:165:boolean supportsBreakDoorGoal() -> eL
+    170:170:boolean isBaby() -> x_
+    175:179:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
+    184:193:void setBaby(boolean) -> a
+    197:202:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    205:205:boolean convertsInWater() -> eO
+    210:231:void tick() -> j
+    235:258:void aiStep() -> k
+    261:263:void startUnderWaterConversion(int) -> a
+    267:271:void doUnderWaterConversion() -> eQ
+    274:279:void convertToZombieType(net.minecraft.world.entity.EntityType) -> c
+    282:282:boolean isSunSensitive() -> U_
+    287:329:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    334:347:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    352:352:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    357:357:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    362:362:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    366:366:net.minecraft.sounds.SoundEvent getStepSound() -> eM
+    371:372:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    376:376:net.minecraft.world.entity.MobType getMobType() -> dB
+    381:391:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
+    395:404:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    408:420:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    424:457:void killed(net.minecraft.world.entity.LivingEntity) -> a_
+    461:461:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    466:469:boolean canHoldItem(net.minecraft.world.item.ItemStack) -> h
+    475:531:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    535:535:boolean getSpawnAsBabyOdds(java.util.Random) -> a
+    539:551:void handleAttributes(float) -> u
+    554:555:void randomizeReinforcementsChance() -> eW
+    569:569:double getMyRidingOffset() -> aX
+    574:586:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
+    589:589:net.minecraft.world.item.ItemStack getSkull() -> eN
+    82:82:boolean lambda$static$0(net.minecraft.world.Difficulty) -> a
+    69:69:java.util.Random access$000(net.minecraft.world.entity.monster.Zombie) -> a
+    70:82:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.Zombie$ZombieAttackTurtleEggGoal -> bcu$a:
     net.minecraft.world.entity.monster.Zombie this$0 -> g
-    634:636:void <init>(net.minecraft.world.entity.monster.Zombie,net.minecraft.world.entity.PathfinderMob,double,int) -> <init>
-    640:641:void playDestroyProgressSound(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    645:646:void playBreakSound(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    650:650:double acceptedDistance() -> h
-net.minecraft.world.entity.monster.Zombie$ZombieGroupData -> axp$b:
+    593:595:void <init>(net.minecraft.world.entity.monster.Zombie,net.minecraft.world.entity.PathfinderMob,double,int) -> <init>
+    599:600:void playDestroyProgressSound(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    604:605:void playBreakSound(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    609:609:double acceptedDistance() -> h
+net.minecraft.world.entity.monster.Zombie$ZombieGroupData -> bcu$b:
     boolean isBaby -> a
-    net.minecraft.world.entity.monster.Zombie this$0 -> b
-    603:605:void <init>(net.minecraft.world.entity.monster.Zombie,boolean) -> <init>
-    600:600:void <init>(net.minecraft.world.entity.monster.Zombie,boolean,net.minecraft.world.entity.monster.Zombie$1) -> <init>
-net.minecraft.world.entity.monster.ZombieVillager -> axq:
+    boolean canSpawnJockey -> b
+    561:564:void <init>(boolean,boolean) -> <init>
+net.minecraft.world.entity.monster.ZombieVillager -> bcv:
     net.minecraft.network.syncher.EntityDataAccessor DATA_CONVERTING_ID -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_VILLAGER_DATA -> c
-    int villagerConversionTime -> bw
-    java.util.UUID conversionStarter -> bx
-    net.minecraft.nbt.Tag gossips -> by
-    net.minecraft.nbt.CompoundTag tradeOffers -> bz
-    int villagerXp -> bA
-    67:70:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    74:78:void defineSynchedData() -> w_
-    82:100:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    104:125:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    129:140:void tick() -> h
-    144:159:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    164:164:boolean convertsInWater() -> et
-    169:169:boolean removeWhenFarAway(double) -> h
-    173:173:boolean isConverting() -> ez
-    177:185:void startConverting(java.util.UUID,int) -> a
-    189:196:void handleEntityEvent(byte) -> a
-    199:252:void finishConversion(net.minecraft.server.level.ServerLevel) -> a
-    255:276:int getConversionProgress() -> eC
-    281:284:float getVoicePitch() -> dn
-    289:289:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    294:294:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    299:299:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    304:304:net.minecraft.sounds.SoundEvent getStepSound() -> er
-    309:309:net.minecraft.world.item.ItemStack getSkull() -> es
-    313:314:void setTradeOffers(net.minecraft.nbt.CompoundTag) -> g
-    317:318:void setGossips(net.minecraft.nbt.Tag) -> a
-    323:325:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    330:336:void setVillagerData(net.minecraft.world.entity.npc.VillagerData) -> a
-    340:340:net.minecraft.world.entity.npc.VillagerData getVillagerData() -> eA
-    344:344:int getVillagerXp() -> eB
-    348:349:void setVillagerXp(int) -> a
-    51:52:void <clinit>() -> <clinit>
-net.minecraft.world.entity.monster.package-info -> axr:
-net.minecraft.world.entity.npc.AbstractVillager -> axs:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_UNHAPPY_COUNTER -> bx
-    net.minecraft.world.entity.player.Player tradingPlayer -> by
-    net.minecraft.world.item.trading.MerchantOffers offers -> bw
-    net.minecraft.world.SimpleContainer inventory -> bz
-    49:53:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    57:62:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    66:66:int getUnhappyCounter() -> eq
-    70:71:void setUnhappyCounter(int) -> s
-    75:75:int getVillagerXp() -> er
-    80:83:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    88:90:void defineSynchedData() -> w_
-    94:95:void setTradingPlayer(net.minecraft.world.entity.player.Player) -> e
-    100:100:net.minecraft.world.entity.player.Player getTradingPlayer() -> es
-    104:104:boolean isTrading() -> et
-    109:113:net.minecraft.world.item.trading.MerchantOffers getOffers() -> eu
-    118:118:void overrideOffers(net.minecraft.world.item.trading.MerchantOffers) -> a
-    122:122:void overrideXp(int) -> t
-    126:134:void notifyTrade(net.minecraft.world.item.trading.MerchantOffer) -> a
+    int villagerConversionTime -> d
+    java.util.UUID conversionStarter -> bv
+    net.minecraft.nbt.Tag gossips -> bw
+    net.minecraft.nbt.CompoundTag tradeOffers -> bx
+    int villagerXp -> by
+    69:72:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    76:80:void defineSynchedData() -> e
+    84:105:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    109:131:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    135:146:void tick() -> j
+    150:167:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    172:172:boolean convertsInWater() -> eO
+    177:177:boolean removeWhenFarAway(double) -> h
+    181:181:boolean isConverting() -> eX
+    185:193:void startConverting(java.util.UUID,int) -> a
+    197:204:void handleEntityEvent(byte) -> a
+    207:262:void finishConversion(net.minecraft.server.level.ServerLevel) -> b
+    265:286:int getConversionProgress() -> fa
+    291:294:float getVoicePitch() -> dG
+    299:299:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    304:304:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    309:309:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    314:314:net.minecraft.sounds.SoundEvent getStepSound() -> eM
+    319:319:net.minecraft.world.item.ItemStack getSkull() -> eN
+    323:324:void setTradeOffers(net.minecraft.nbt.CompoundTag) -> g
+    327:328:void setGossips(net.minecraft.nbt.Tag) -> a
+    333:335:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    340:346:void setVillagerData(net.minecraft.world.entity.npc.VillagerData) -> a
+    350:350:net.minecraft.world.entity.npc.VillagerData getVillagerData() -> eY
+    354:354:int getVillagerXp() -> eZ
+    358:359:void setVillagerXp(int) -> a
+    88:88:void lambda$addAdditionalSaveData$0(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> a
+    53:54:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.ZombifiedPiglin -> bcw:
+    java.util.UUID SPEED_MODIFIER_ATTACKING_UUID -> b
+    net.minecraft.world.entity.ai.attributes.AttributeModifier SPEED_MODIFIER_ATTACKING -> c
+    net.minecraft.util.IntRange FIRST_ANGER_SOUND_DELAY -> d
+    int playFirstAngerSoundIn -> bv
+    net.minecraft.util.IntRange PERSISTENT_ANGER_TIME -> bw
+    int remainingPersistentAngerTime -> bx
+    java.util.UUID persistentAngerTarget -> by
+    net.minecraft.util.IntRange ALERT_INTERVAL -> bz
+    int ticksUntilNextAlert -> bA
+    57:59:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    63:64:void setPersistentAngerTarget(java.util.UUID) -> a
+    68:68:double getMyRidingOffset() -> aX
+    73:79:void addBehaviourGoals() -> m
+    82:85:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eX
+    90:90:boolean convertsInWater() -> eO
+    95:118:void customServerAiStep() -> N
+    121:127:void maybePlayFirstAngerSound() -> eY
+    134:142:void maybeAlertOthers() -> eZ
+    145:152:void alertOthers() -> fa
+    155:156:void playAngerSound() -> fb
+    160:175:void setTarget(net.minecraft.world.entity.LivingEntity) -> i
+    179:180:void startPersistentAngerTimer() -> H_
+    183:183:boolean checkZombifiedPiglinSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
+    188:188:boolean checkSpawnObstruction(net.minecraft.world.level.LevelReader) -> a
+    193:195:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    199:201:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    205:206:void setRemainingPersistentAngerTime(int) -> a_
+    210:210:int getRemainingPersistentAngerTime() -> F_
+    215:218:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    223:223:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    228:228:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    233:233:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    238:239:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
+    243:243:net.minecraft.world.item.ItemStack getSkull() -> eN
+    248:249:void randomizeReinforcementsChance() -> eW
+    253:253:java.util.UUID getPersistentAngerTarget() -> G_
+    258:258:boolean isPreventingPlayerRest(net.minecraft.world.entity.player.Player) -> f
+    151:151:void lambda$alertOthers$3(net.minecraft.world.entity.monster.ZombifiedPiglin) -> a
+    150:150:boolean lambda$alertOthers$2(net.minecraft.world.entity.monster.ZombifiedPiglin) -> b
+    149:149:boolean lambda$alertOthers$1(net.minecraft.world.entity.monster.ZombifiedPiglin) -> c
+    148:148:boolean lambda$alertOthers$0(net.minecraft.world.entity.monster.ZombifiedPiglin) -> d
+    42:53:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.hoglin.Hoglin -> bcx:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_IMMUNE_TO_ZOMBIFICATION -> bx
+    int attackAnimationRemainingTicks -> by
+    int timeInOverworld -> bz
+    boolean cannotBeHunted -> bA
+    com.google.common.collect.ImmutableList SENSOR_TYPES -> bv
+    com.google.common.collect.ImmutableList MEMORY_TYPES -> bw
+    68:102:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    106:106:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
+    110:115:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    120:128:boolean doHurtTarget(net.minecraft.world.entity.Entity) -> B
+    133:136:void blockedByShield(net.minecraft.world.entity.LivingEntity) -> f
+    140:147:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    152:152:net.minecraft.world.entity.ai.Brain$Provider brainProvider() -> cJ
+    157:157:net.minecraft.world.entity.ai.Brain makeBrain(com.mojang.serialization.Dynamic) -> a
+    163:163:net.minecraft.world.entity.ai.Brain getBrain() -> cI
+    168:183:void customServerAiStep() -> N
+    188:192:void aiStep() -> k
+    196:203:void ageBoundaryReached() -> m
+    206:206:boolean checkHoglinSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> c
+    212:216:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    221:221:boolean removeWhenFarAway(double) -> h
+    226:233:float getWalkTargetValue(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader) -> a
+    238:238:double getPassengersRidingOffset() -> aY
+    243:247:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    253:260:void handleEntityEvent(byte) -> a
+    264:264:int getAttackAnimationRemainingTicks() -> eN
+    269:269:boolean shouldDropExperience() -> cU
+    274:274:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
+    278:280:void finishConversion(net.minecraft.server.level.ServerLevel) -> b
+    284:284:boolean isFood(net.minecraft.world.item.ItemStack) -> k
+    288:288:boolean isAdult() -> eM
+    293:295:void defineSynchedData() -> e
+    299:307:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    311:315:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    318:319:void setImmuneToZombification(boolean) -> t
+    322:322:boolean isImmuneToZombification() -> eW
+    326:326:boolean isConverting() -> eO
+    330:331:void setCannotBeHunted(boolean) -> u
+    334:334:boolean canBeHunted() -> eP
+    340:344:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    348:348:float getMovementSpeed() -> eV
+    353:353:boolean canFallInLove() -> eQ
+    358:358:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    363:366:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    371:371:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    376:376:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    381:381:net.minecraft.sounds.SoundEvent getSwimSound() -> aq
+    386:386:net.minecraft.sounds.SoundEvent getSwimSplashSound() -> ar
+    391:392:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    395:396:void playSound(net.minecraft.sounds.SoundEvent) -> a
+    400:402:void sendDebugPackets() -> M
+    56:77:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.hoglin.HoglinAi -> bcy:
+    net.minecraft.util.IntRange RETREAT_DURATION -> a
+    net.minecraft.util.IntRange ADULT_FOLLOW_RANGE -> b
+    48:48:void <init>() -> <init>
+    69:78:net.minecraft.world.entity.ai.Brain makeBrain(net.minecraft.world.entity.ai.Brain) -> a
+    82:86:void initCoreActivity(net.minecraft.world.entity.ai.Brain) -> b
+    89:99:void initIdleActivity(net.minecraft.world.entity.ai.Brain) -> c
+    102:111:void initFightActivity(net.minecraft.world.entity.ai.Brain) -> d
+    114:120:void initRetreatActivity(net.minecraft.world.entity.ai.Brain) -> e
+    123:126:net.minecraft.world.entity.ai.behavior.RunOne createIdleMovementBehaviors() -> a
+    131:150:void updateActivity(net.minecraft.world.entity.monster.hoglin.Hoglin) -> a
+    153:164:void onHitTarget(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.LivingEntity) -> a
+    167:168:void broadcastRetreat(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.LivingEntity) -> c
+    171:178:void retreatFromNearestTarget(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.LivingEntity) -> d
+    181:184:void setAvoidTarget(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.LivingEntity) -> e
+    187:193:java.util.Optional findNearestValidAttackTarget(net.minecraft.world.entity.monster.hoglin.Hoglin) -> d
+    197:198:boolean isPosNearNearestRepellent(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.core.BlockPos) -> a
+    202:202:boolean wantsToStopFleeing(net.minecraft.world.entity.monster.hoglin.Hoglin) -> e
+    206:212:boolean piglinsOutnumberHoglins(net.minecraft.world.entity.monster.hoglin.Hoglin) -> f
+    218:229:void wasHurtBy(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.LivingEntity) -> b
+    232:248:void maybeRetaliate(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.LivingEntity) -> f
+    251:255:void setAttackTarget(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.LivingEntity) -> g
+    259:260:void broadcastAttackTarget(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.LivingEntity) -> h
+    263:270:void setAttackTargetIfCloserThanCurrent(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.LivingEntity) -> i
+    273:273:java.util.Optional getSoundForCurrentActivity(net.minecraft.world.entity.monster.hoglin.Hoglin) -> b
+    277:284:net.minecraft.sounds.SoundEvent getSoundForActivity(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.schedule.Activity) -> a
+    289:289:java.util.List getVisibleAdultHoglins(net.minecraft.world.entity.monster.hoglin.Hoglin) -> g
+    293:293:boolean isNearRepellent(net.minecraft.world.entity.monster.hoglin.Hoglin) -> h
+    297:297:boolean isBreeding(net.minecraft.world.entity.monster.hoglin.Hoglin) -> i
+    301:301:boolean isPacified(net.minecraft.world.entity.monster.hoglin.Hoglin) -> c
+    273:273:net.minecraft.sounds.SoundEvent lambda$getSoundForCurrentActivity$2(net.minecraft.world.entity.monster.hoglin.Hoglin,net.minecraft.world.entity.schedule.Activity) -> b
+    259:259:void lambda$broadcastAttackTarget$1(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.monster.hoglin.Hoglin) -> a
+    167:167:void lambda$broadcastRetreat$0(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.monster.hoglin.Hoglin) -> b
+    52:59:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.hoglin.HoglinBase -> bcz:
+    int getAttackAnimationRemainingTicks() -> eN
+    17:31:boolean hurtAndThrowTarget(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    35:51:void throwTarget(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> b
+net.minecraft.world.entity.monster.hoglin.package-info -> bda:
+net.minecraft.world.entity.monster.package-info -> bdb:
+net.minecraft.world.entity.monster.piglin.Piglin -> bdc:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_BABY_ID -> d
+    net.minecraft.network.syncher.EntityDataAccessor DATA_IMMUNE_TO_ZOMBIFICATION -> bv
+    net.minecraft.network.syncher.EntityDataAccessor DATA_IS_CHARGING_CROSSBOW -> bw
+    net.minecraft.network.syncher.EntityDataAccessor DATA_IS_DANCING -> bx
+    java.util.UUID SPEED_MODIFIER_BABY_UUID -> by
+    net.minecraft.world.entity.ai.attributes.AttributeModifier SPEED_MODIFIER_BABY -> bz
+    int timeInOverworld -> bA
+    net.minecraft.world.SimpleContainer inventory -> bB
+    boolean cannotHunt -> bC
+    com.google.common.collect.ImmutableList SENSOR_TYPES -> b
+    com.google.common.collect.ImmutableList MEMORY_TYPES -> c
+    91:161:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    165:178:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    182:189:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    194:194:net.minecraft.world.Container getInventory() -> W_
+    199:202:void dropCustomDeathLoot(net.minecraft.world.damagesource.DamageSource,int,boolean) -> a
+    208:208:net.minecraft.world.item.ItemStack addToInventory(net.minecraft.world.item.ItemStack) -> k
+    212:212:boolean canAddToInventory(net.minecraft.world.item.ItemStack) -> l
+    217:222:void defineSynchedData() -> e
+    226:230:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    233:236:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eL
+    240:240:boolean checkPiglinSpawnRules(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.MobSpawnType,net.minecraft.core.BlockPos,java.util.Random) -> b
+    246:256:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    261:261:boolean shouldDespawnInPeaceful() -> L
+    266:266:boolean removeWhenFarAway(double) -> h
+    271:277:void populateDefaultEquipmentSlots(net.minecraft.world.DifficultyInstance) -> a
+    280:283:void maybeWearArmor(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> d
+    287:287:net.minecraft.world.entity.ai.Brain$Provider brainProvider() -> cJ
+    292:292:net.minecraft.world.entity.ai.Brain makeBrain(com.mojang.serialization.Dynamic) -> a
+    298:298:net.minecraft.world.entity.ai.Brain getBrain() -> cI
+    303:312:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    317:317:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    322:322:double getMyRidingOffset() -> aX
+    327:327:double getPassengersRidingOffset() -> aY
+    332:341:void setBaby(boolean) -> a
+    345:345:boolean isBaby() -> x_
+    349:349:boolean isAdult() -> eM
+    353:354:void setImmuneToZombification(boolean) -> t
+    357:357:boolean isImmuneToZombification() -> eT
+    361:362:void setCannotHunt(boolean) -> v
+    365:365:boolean canHunt() -> eN
+    369:369:boolean isConverting() -> eO
+    374:389:void customServerAiStep() -> N
+    393:393:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
+    397:401:void finishConversion(net.minecraft.server.level.ServerLevel) -> b
+    407:407:net.minecraft.world.entity.LivingEntity getTarget() -> A
+    411:414:net.minecraft.world.item.ItemStack createSpawnWeapon() -> eU
+    418:418:boolean isChargingCrossbow() -> eV
+    423:424:void setChargingCrossbow(boolean) -> b
+    428:429:void onCrossbowAttackPerformed() -> V_
+    433:444:net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose getArmPose() -> eP
+    449:449:boolean isDancing() -> eQ
+    453:454:void setDancing(boolean) -> u
+    457:457:boolean isHoldingMeleeWeapon() -> eW
+    462:469:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    474:475:void performRangedAttack(net.minecraft.world.entity.LivingEntity,float) -> a
+    479:480:void shootCrossbowProjectile(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.projectile.Projectile,float) -> a
+    484:484:boolean canFireProjectileWeapon(net.minecraft.world.item.ProjectileWeaponItem) -> a
+    488:489:void holdInMainHand(net.minecraft.world.item.ItemStack) -> m
+    492:499:void holdInOffHand(net.minecraft.world.item.ItemStack) -> n
+    503:503:boolean wantsToPickUp(net.minecraft.world.item.ItemStack) -> i
+    507:509:boolean canReplaceCurrentItem(net.minecraft.world.item.ItemStack) -> o
+    514:537:boolean canReplaceCurrentItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    542:544:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> b
+    548:551:boolean startRiding(net.minecraft.world.entity.Entity,boolean) -> a
+    555:559:net.minecraft.world.entity.Entity getTopPassenger(net.minecraft.world.entity.Entity,int) -> b
+    565:568:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    573:573:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    578:578:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    583:584:void playStepSound(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    587:588:void playSound(net.minecraft.sounds.SoundEvent) -> a
+    592:594:void sendDebugPackets() -> M
+    72:104:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose -> bdc$a:
+    net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose ATTACKING_WITH_MELEE_WEAPON -> a
+    net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose CROSSBOW_HOLD -> b
+    net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose CROSSBOW_CHARGE -> c
+    net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose ADMIRING_ITEM -> d
+    net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose DANCING -> e
+    net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose DEFAULT -> f
+    net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose[] $VALUES -> g
+    145:145:net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose[] values() -> values
+    145:145:net.minecraft.world.entity.monster.piglin.Piglin$PiglinArmPose valueOf(java.lang.String) -> valueOf
+    145:145:void <init>(java.lang.String,int) -> <init>
+    145:151:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.piglin.PiglinAi -> bdd:
+    net.minecraft.world.item.Item BARTERING_ITEM -> a
+    net.minecraft.util.IntRange TIME_BETWEEN_HUNTS -> b
+    net.minecraft.util.IntRange RIDE_START_INTERVAL -> c
+    net.minecraft.util.IntRange RIDE_DURATION -> d
+    net.minecraft.util.IntRange RETREAT_DURATION -> e
+    net.minecraft.util.IntRange AVOID_ZOMBIFIED_DURATION -> f
+    net.minecraft.util.IntRange BABY_AVOID_NEMESIS_DURATION -> g
+    java.util.Set FOOD_ITEMS -> h
+    83:83:void <init>() -> <init>
+    128:144:net.minecraft.world.entity.ai.Brain makeBrain(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.ai.Brain) -> a
+    148:150:void initMemories(net.minecraft.world.entity.monster.piglin.Piglin) -> a
+    153:164:void initCoreActivity(net.minecraft.world.entity.ai.Brain) -> a
+    167:177:void initIdleActivity(net.minecraft.world.entity.ai.Brain) -> b
+    180:189:void initFightActivity(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.ai.Brain) -> b
+    192:204:void initCelebrateActivity(net.minecraft.world.entity.ai.Brain) -> c
+    207:211:void initAdmireItemActivity(net.minecraft.world.entity.ai.Brain) -> d
+    214:220:void initRetreatActivity(net.minecraft.world.entity.ai.Brain) -> e
+    223:229:void initRideHoglinActivity(net.minecraft.world.entity.ai.Brain) -> f
+    232:236:net.minecraft.world.entity.ai.behavior.RunOne createIdleLookBehaviors() -> a
+    241:246:net.minecraft.world.entity.ai.behavior.RunOne createIdleMovementBehaviors() -> b
+    251:251:net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom avoidRepellent() -> c
+    255:255:net.minecraft.world.entity.ai.behavior.CopyMemoryWithExpiry babyAvoidNemesis() -> d
+    259:259:net.minecraft.world.entity.ai.behavior.CopyMemoryWithExpiry avoidZombified() -> e
+    263:301:void updateActivity(net.minecraft.world.entity.monster.piglin.Piglin) -> b
+    304:309:boolean isBabyRidingBaby(net.minecraft.world.entity.monster.piglin.Piglin) -> l
+    313:347:void pickUpItem(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.item.ItemEntity) -> a
+    350:354:void holdInOffhand(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.item.ItemStack) -> c
+    357:364:net.minecraft.world.item.ItemStack removeOneItemFromItemEntity(net.minecraft.world.entity.item.ItemEntity) -> a
+    368:396:void stopHoldingOffHandItem(net.minecraft.world.entity.monster.piglin.Piglin,boolean) -> a
+    399:403:void cancelAdmiring(net.minecraft.world.entity.monster.piglin.Piglin) -> c
+    406:408:void putInInventory(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.item.ItemStack) -> d
+    411:417:void throwItems(net.minecraft.world.entity.monster.piglin.Piglin,java.util.List) -> a
+    420:421:void throwItemsTowardRandomPos(net.minecraft.world.entity.monster.piglin.Piglin,java.util.List) -> b
+    424:425:void throwItemsTowardPlayer(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.player.Player,java.util.List) -> a
+    428:434:void throwItemsTowardPos(net.minecraft.world.entity.monster.piglin.Piglin,java.util.List,net.minecraft.world.phys.Vec3) -> a
+    437:442:java.util.List getBarterResponseItems(net.minecraft.world.entity.monster.piglin.Piglin) -> m
+    446:450:boolean wantsToDance(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    459:480:boolean wantsToPickup(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.item.ItemStack) -> a
+    485:485:boolean isLovedItem(net.minecraft.world.item.Item) -> a
+    489:497:boolean wantsToStopRiding(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.Entity) -> a
+    501:503:boolean isNearestValidAttackTarget(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> d
+    507:512:boolean isNearZombified(net.minecraft.world.entity.monster.piglin.Piglin) -> n
+    516:544:java.util.Optional findNearestValidAttackTarget(net.minecraft.world.entity.monster.piglin.Piglin) -> o
+    548:559:void angerNearbyPiglins(net.minecraft.world.entity.player.Player,boolean) -> a
+    562:571:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    575:575:boolean canAdmire(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.item.ItemStack) -> b
+    580:622:void wasHurtBy(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> a
+    625:646:void maybeRetaliate(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> e
+    649:649:java.util.Optional getSoundForCurrentActivity(net.minecraft.world.entity.monster.piglin.Piglin) -> d
+    653:668:net.minecraft.sounds.SoundEvent getSoundForActivity(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.schedule.Activity) -> a
+    673:677:boolean isNearAvoidTarget(net.minecraft.world.entity.monster.piglin.Piglin) -> p
+    681:683:boolean hasAnyoneNearbyHuntedRecently(net.minecraft.world.entity.monster.piglin.Piglin) -> e
+    687:687:java.util.List getVisibleAdultPiglins(net.minecraft.world.entity.monster.piglin.Piglin) -> q
+    691:691:java.util.List getAdultPiglins(net.minecraft.world.entity.monster.piglin.Piglin) -> r
+    695:702:boolean isWearingGold(net.minecraft.world.entity.LivingEntity) -> a
+    706:708:void stopWalking(net.minecraft.world.entity.monster.piglin.Piglin) -> s
+    711:711:net.minecraft.world.entity.ai.behavior.RunSometimes babySometimesRideBabyHoglin() -> f
+    715:721:void broadcastAngerTarget(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> b
+    724:727:void broadcastUniversalAnger(net.minecraft.world.entity.monster.piglin.Piglin) -> f
+    730:731:void broadcastDontKillAnyMoreHoglinsForAWhile(net.minecraft.world.entity.monster.piglin.Piglin) -> g
+    734:746:void setAngerTarget(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> c
+    749:755:void setAngerTargetToNearestTargetablePlayerIfFound(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> f
+    758:764:void setAngerTargetIfCloserThanCurrent(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> g
+    767:767:java.util.Optional getAngerTarget(net.minecraft.world.entity.monster.piglin.Piglin) -> t
+    771:774:java.util.Optional getAvoidTarget(net.minecraft.world.entity.monster.piglin.Piglin) -> h
+    778:781:java.util.Optional getNearestVisibleTargetablePlayer(net.minecraft.world.entity.monster.piglin.Piglin) -> i
+    785:786:void broadcastRetreat(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> h
+    789:794:void retreatFromNearestTarget(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> i
+    797:810:boolean wantsToStopFleeing(net.minecraft.world.entity.monster.piglin.Piglin) -> u
+    814:814:boolean piglinsEqualOrOutnumberHoglins(net.minecraft.world.entity.monster.piglin.Piglin) -> v
+    818:820:boolean hoglinsOutnumberPiglins(net.minecraft.world.entity.monster.piglin.Piglin) -> w
+    824:829:void setAvoidTargetAndDontHuntForAWhile(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> j
+    832:833:void dontKillAnyMoreHoglinsForAWhile(net.minecraft.world.entity.monster.piglin.Piglin) -> j
+    836:836:boolean seesPlayerHoldingWantedItem(net.minecraft.world.entity.monster.piglin.Piglin) -> x
+    840:841:void eat(net.minecraft.world.entity.monster.piglin.Piglin) -> y
+    844:845:net.minecraft.world.phys.Vec3 getRandomNearbyPos(net.minecraft.world.entity.monster.piglin.Piglin) -> z
+    849:849:boolean hasEatenRecently(net.minecraft.world.entity.monster.piglin.Piglin) -> A
+    853:853:boolean isIdle(net.minecraft.world.entity.monster.piglin.Piglin) -> k
+    857:857:boolean hasCrossbow(net.minecraft.world.entity.LivingEntity) -> c
+    861:862:void admireGoldItem(net.minecraft.world.entity.LivingEntity) -> d
+    865:865:boolean isAdmiringItem(net.minecraft.world.entity.monster.piglin.Piglin) -> B
+    869:869:boolean isBarterCurrency(net.minecraft.world.item.Item) -> b
+    873:873:boolean isFood(net.minecraft.world.item.Item) -> c
+    880:880:boolean isAttackAllowed(net.minecraft.world.entity.LivingEntity) -> e
+    884:884:boolean isNearRepellent(net.minecraft.world.entity.monster.piglin.Piglin) -> C
+    888:888:boolean seesPlayerHoldingLovedItem(net.minecraft.world.entity.LivingEntity) -> f
+    892:892:boolean doesntSeeAnyPlayerHoldingLovedItem(net.minecraft.world.entity.LivingEntity) -> g
+    896:896:boolean isPlayerHoldingLovedItem(net.minecraft.world.entity.LivingEntity) -> b
+    900:900:boolean isAdmiringDisabled(net.minecraft.world.entity.monster.piglin.Piglin) -> D
+    904:904:boolean wasHurtRecently(net.minecraft.world.entity.LivingEntity) -> h
+    908:908:boolean isHoldingItemInOffHand(net.minecraft.world.entity.monster.piglin.Piglin) -> E
+    912:912:boolean isNotHoldingLovedItemInOffHand(net.minecraft.world.entity.monster.piglin.Piglin) -> F
+    916:916:boolean isZombified(net.minecraft.world.entity.EntityType) -> a
+    785:785:void lambda$broadcastRetreat$11(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.monster.piglin.Piglin) -> a
+    725:726:void lambda$broadcastUniversalAnger$10(net.minecraft.world.entity.monster.piglin.Piglin) -> G
+    725:725:void lambda$null$9(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.player.Player) -> a
+    716:720:void lambda$broadcastAngerTarget$8(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.monster.piglin.Piglin) -> b
+    683:683:boolean lambda$hasAnyoneNearbyHuntedRecently$7(net.minecraft.world.entity.monster.piglin.Piglin) -> H
+    649:649:net.minecraft.sounds.SoundEvent lambda$getSoundForCurrentActivity$6(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.schedule.Activity) -> b
+    599:603:void lambda$wasHurtBy$5(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.ai.Brain,net.minecraft.world.entity.LivingEntity) -> a
+    553:558:void lambda$angerNearbyPiglins$4(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.monster.piglin.Piglin) -> a
+    551:551:boolean lambda$angerNearbyPiglins$3(boolean,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.monster.piglin.Piglin) -> a
+    502:502:boolean lambda$isNearestValidAttackTarget$2(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> b
+    196:196:boolean lambda$initCelebrateActivity$1(net.minecraft.world.entity.monster.piglin.Piglin) -> I
+    181:181:boolean lambda$initFightActivity$0(net.minecraft.world.entity.monster.piglin.Piglin,net.minecraft.world.entity.LivingEntity) -> k
+    86:122:void <clinit>() -> <clinit>
+net.minecraft.world.entity.monster.piglin.RememberIfHoglinWasKilled -> bde:
+    13:17:void <init>() -> <init>
+    21:24:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.piglin.Piglin,long) -> a
+    27:28:boolean isAttackTargetDeadHoglin(net.minecraft.world.entity.monster.piglin.Piglin) -> a
+    11:11:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.monster.piglin.StartAdmiringItemIfSeen -> bdf:
+    int admireDuration -> b
+    14:20:void <init>(int) -> <init>
+    24:25:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.piglin.Piglin) -> a
+    30:31:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.piglin.Piglin,long) -> a
+    10:10:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    10:10:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.monster.piglin.StartHuntingHoglin -> bdg:
+    12:18:void <init>() -> <init>
+    22:22:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.piglin.Piglin) -> a
+    27:33:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.piglin.Piglin,long) -> a
+    10:10:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    10:10:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.monster.piglin.StopAdmiringIfItemTooFarAway -> bdh:
+    int maxDistanceToItem -> b
+    16:21:void <init>(int) -> <init>
+    25:33:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.piglin.Piglin) -> a
+    38:39:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.piglin.Piglin,long) -> a
+    12:12:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    12:12:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.monster.piglin.StopHoldingItemIfNoLongerAdmiring -> bdi:
+    12:15:void <init>() -> <init>
+    19:19:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.piglin.Piglin) -> a
+    24:25:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.monster.piglin.Piglin,long) -> a
+    10:10:boolean checkExtraStartConditions(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity) -> a
+    10:10:void start(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.LivingEntity,long) -> a
+net.minecraft.world.entity.monster.piglin.package-info -> bdj:
+net.minecraft.world.entity.npc.AbstractVillager -> bdk:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_UNHAPPY_COUNTER -> bw
+    net.minecraft.world.entity.player.Player tradingPlayer -> bx
+    net.minecraft.world.item.trading.MerchantOffers offers -> bv
+    net.minecraft.world.SimpleContainer inventory -> by
+    49:56:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    60:65:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    69:69:int getUnhappyCounter() -> eL
+    73:74:void setUnhappyCounter(int) -> s
+    78:78:int getVillagerXp() -> eM
+    83:86:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    91:93:void defineSynchedData() -> e
+    97:98:void setTradingPlayer(net.minecraft.world.entity.player.Player) -> f
+    103:103:net.minecraft.world.entity.player.Player getTradingPlayer() -> eN
+    107:107:boolean isTrading() -> eO
+    112:116:net.minecraft.world.item.trading.MerchantOffers getOffers() -> eP
+    121:121:void overrideOffers(net.minecraft.world.item.trading.MerchantOffers) -> a
+    125:125:void overrideXp(int) -> t
+    129:137:void notifyTrade(net.minecraft.world.item.trading.MerchantOffer) -> a
     void rewardTradeXp(net.minecraft.world.item.trading.MerchantOffer) -> b
-    140:140:boolean showProgressBar() -> ev
-    145:149:void notifyTradeUpdated(net.minecraft.world.item.ItemStack) -> i
-    153:153:net.minecraft.sounds.SoundEvent getNotifyTradeSound() -> ew
-    157:157:net.minecraft.sounds.SoundEvent getTradeUpdatedSound(boolean) -> r
-    161:162:void playCelebrateSound() -> ex
-    166:180:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    184:198:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    203:204:net.minecraft.world.entity.Entity changeDimension(net.minecraft.world.level.dimension.DimensionType) -> a
-    208:209:void stopTrading() -> ey
-    213:215:void die(net.minecraft.world.damagesource.DamageSource) -> a
-    218:224:void addParticlesAroundSelf(net.minecraft.core.particles.ParticleOptions) -> a
-    228:228:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
-    232:232:net.minecraft.world.SimpleContainer getInventory() -> ez
-    237:245:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
-    250:250:net.minecraft.world.level.Level getLevel() -> eB
-    void updateTrades() -> eC
-    256:274:void addOffersFromItemListings(net.minecraft.world.item.trading.MerchantOffers,net.minecraft.world.entity.npc.VillagerTrades$ItemListing[],int) -> a
+    143:143:boolean showProgressBar() -> eQ
+    148:152:void notifyTradeUpdated(net.minecraft.world.item.ItemStack) -> k
+    156:156:net.minecraft.sounds.SoundEvent getNotifyTradeSound() -> eR
+    160:160:net.minecraft.sounds.SoundEvent getTradeUpdatedSound(boolean) -> t
+    164:165:void playCelebrateSound() -> eS
+    169:177:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    181:188:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    193:194:net.minecraft.world.entity.Entity changeDimension(net.minecraft.server.level.ServerLevel) -> a
+    198:199:void stopTrading() -> eT
+    203:205:void die(net.minecraft.world.damagesource.DamageSource) -> a
+    208:214:void addParticlesAroundSelf(net.minecraft.core.particles.ParticleOptions) -> a
+    218:218:boolean canBeLeashed(net.minecraft.world.entity.player.Player) -> a
+    223:223:net.minecraft.world.SimpleContainer getInventory() -> eU
+    228:236:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
+    241:241:net.minecraft.world.level.Level getLevel() -> eV
+    void updateTrades() -> eW
+    247:265:void addOffersFromItemListings(net.minecraft.world.item.trading.MerchantOffers,net.minecraft.world.entity.npc.VillagerTrades$ItemListing[],int) -> a
+    38:38:net.minecraft.world.Container getInventory() -> W_
     39:39:void <clinit>() -> <clinit>
-net.minecraft.world.entity.npc.CatSpawner -> axt:
+net.minecraft.world.entity.npc.CatSpawner -> bdl:
     int nextTick -> a
     24:24:void <init>() -> <init>
     31:66:int tick(net.minecraft.server.level.ServerLevel,boolean,boolean) -> a
     70:77:int spawnInVillage(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
     81:87:int spawnInHut(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     91:99:int spawnCat(net.minecraft.core.BlockPos,net.minecraft.world.level.Level) -> a
-net.minecraft.world.entity.npc.ClientSideMerchant -> axu:
+net.minecraft.world.entity.npc.ClientSideMerchant -> bdm:
     net.minecraft.world.inventory.MerchantContainer container -> a
     net.minecraft.world.entity.player.Player source -> b
     net.minecraft.world.item.trading.MerchantOffers offers -> c
     int xp -> d
     19:25:void <init>(net.minecraft.world.entity.player.Player) -> <init>
     28:28:net.minecraft.world.Container getContainer() -> a
-    34:34:net.minecraft.world.entity.player.Player getTradingPlayer() -> es
-    39:39:void setTradingPlayer(net.minecraft.world.entity.player.Player) -> e
-    43:43:net.minecraft.world.item.trading.MerchantOffers getOffers() -> eu
+    34:34:net.minecraft.world.entity.player.Player getTradingPlayer() -> eN
+    39:39:void setTradingPlayer(net.minecraft.world.entity.player.Player) -> f
+    43:43:net.minecraft.world.item.trading.MerchantOffers getOffers() -> eP
     48:49:void overrideOffers(net.minecraft.world.item.trading.MerchantOffers) -> a
     53:54:void notifyTrade(net.minecraft.world.item.trading.MerchantOffer) -> a
-    58:58:void notifyTradeUpdated(net.minecraft.world.item.ItemStack) -> i
-    62:62:net.minecraft.world.level.Level getLevel() -> eB
-    67:67:int getVillagerXp() -> er
+    58:58:void notifyTradeUpdated(net.minecraft.world.item.ItemStack) -> k
+    62:62:net.minecraft.world.level.Level getLevel() -> eV
+    67:67:int getVillagerXp() -> eM
     72:73:void overrideXp(int) -> t
-    77:77:boolean showProgressBar() -> ev
-    82:82:net.minecraft.sounds.SoundEvent getNotifyTradeSound() -> ew
-net.minecraft.world.entity.npc.Npc -> axv:
-net.minecraft.world.entity.npc.Villager -> axw:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_VILLAGER_DATA -> bz
-    java.util.Map FOOD_POINTS -> bx
-    java.util.Set WANTED_ITEMS -> bA
-    int updateMerchantTimer -> bB
-    boolean increaseProfessionLevelOnUpdate -> bC
-    net.minecraft.world.entity.player.Player lastTradedPlayer -> bD
-    boolean chasing -> bE
-    byte foodLevel -> bF
-    net.minecraft.world.entity.ai.gossip.GossipContainer gossips -> bG
-    long lastGossipTime -> bH
-    long lastGossipDecayTime -> bI
-    int villagerXp -> bJ
-    long lastRestockGameTime -> bK
-    int numberOfRestocksToday -> bL
-    long lastRestockCheckDayTime -> bM
+    77:77:boolean showProgressBar() -> eQ
+    82:82:net.minecraft.sounds.SoundEvent getNotifyTradeSound() -> eR
+net.minecraft.world.entity.npc.InventoryCarrier -> bdn:
+    net.minecraft.world.Container getInventory() -> W_
+net.minecraft.world.entity.npc.Npc -> bdo:
+net.minecraft.world.entity.npc.Villager -> bdp:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_VILLAGER_DATA -> by
+    java.util.Map FOOD_POINTS -> bw
+    java.util.Set WANTED_ITEMS -> bz
+    int updateMerchantTimer -> bA
+    boolean increaseProfessionLevelOnUpdate -> bB
+    net.minecraft.world.entity.player.Player lastTradedPlayer -> bC
+    boolean chasing -> bD
+    byte foodLevel -> bE
+    net.minecraft.world.entity.ai.gossip.GossipContainer gossips -> bF
+    long lastGossipTime -> bG
+    long lastGossipDecayTime -> bH
+    int villagerXp -> bI
+    long lastRestockGameTime -> bJ
+    int numberOfRestocksToday -> bK
+    long lastRestockCheckDayTime -> bL
+    boolean assignProfessionWhenSpawned -> bM
     com.google.common.collect.ImmutableList MEMORY_TYPES -> bN
     com.google.common.collect.ImmutableList SENSOR_TYPES -> bO
-    java.util.Map POI_MEMORIES -> by
-    178:179:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    119:188:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level,net.minecraft.world.entity.npc.VillagerType) -> <init>
-    193:193:net.minecraft.world.entity.ai.Brain getBrain() -> cz
-    198:200:net.minecraft.world.entity.ai.Brain makeBrain(com.mojang.datafixers.Dynamic) -> a
-    204:208:void refreshBrain(net.minecraft.server.level.ServerLevel) -> a
-    211:234:void registerBrainGoals(net.minecraft.world.entity.ai.Brain) -> a
-    238:242:void ageBoundaryReached() -> l
-    246:250:void registerAttributes() -> cA
-    254:288:void customServerAiStep() -> dT
-    292:299:void tick() -> h
-    304:338:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    342:346:void setUnhappy() -> eO
-    349:352:void startTrading(net.minecraft.world.entity.player.Player) -> g
-    356:361:void setTradingPlayer(net.minecraft.world.entity.player.Player) -> e
-    365:367:void stopTrading() -> ey
-    370:373:void resetSpecialPrices() -> eP
-    377:377:boolean canRestock() -> eD
-    381:390:void restock() -> eE
-    393:398:boolean needsToRestock() -> eQ
-    403:403:boolean allowedToRestock() -> eR
-    407:426:boolean shouldRestock() -> eF
-    431:440:void catchUpDemand() -> eS
-    443:446:void updateDemand() -> eT
-    449:465:void updateSpecialPrices(net.minecraft.world.entity.player.Player) -> h
-    469:471:void defineSynchedData() -> w_
-    475:483:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    487:521:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    525:525:boolean removeWhenFarAway(double) -> h
-    531:538:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    543:543:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    548:548:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    552:556:void playWorkSound() -> eG
-    560:566:void setVillagerData(net.minecraft.world.entity.npc.VillagerData) -> a
-    570:570:net.minecraft.world.entity.npc.VillagerData getVillagerData() -> eA
-    575:589:void rewardTradeXp(net.minecraft.world.item.trading.MerchantOffer) -> b
-    592:593:void setChasing(boolean) -> s
-    596:596:boolean isChasing() -> eH
-    602:609:void setLastHurtByMob(net.minecraft.world.entity.LivingEntity) -> a
-    613:623:void die(net.minecraft.world.damagesource.DamageSource) -> a
-    626:639:void tellWitnessesThatIWasMurdered(net.minecraft.world.entity.Entity) -> a
-    642:656:void releasePoi(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> a
-    659:659:boolean canBreed() -> eI
-    663:663:boolean hungry() -> eU
-    667:689:void eatUntilFull() -> eV
-    692:692:int getPlayerReputation(net.minecraft.world.entity.player.Player) -> f
-    696:697:void digestFood(int) -> v
-    700:702:void eatAndDigestFood() -> eJ
-    705:706:void setOffers(net.minecraft.world.item.trading.MerchantOffers) -> b
-    709:710:boolean shouldIncreaseLevel() -> eW
-    714:717:void increaseMerchantCareer() -> eX
-    721:721:net.minecraft.network.chat.Component getTypeName() -> by
-    726:737:void handleEntityEvent(byte) -> a
-    742:749:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    755:766:net.minecraft.world.entity.npc.Villager getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
-    771:781:void thunderHit(net.minecraft.world.entity.global.LightningBolt) -> a
-    785:823:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> a
-    826:826:boolean wantToPickUp(net.minecraft.world.item.Item) -> b
-    830:830:boolean hasExcessFood() -> eK
-    834:834:boolean wantsMoreFood() -> eL
-    838:839:int countFoodPointsInInventory() -> eY
-    843:856:void makeBread() -> eZ
-    859:860:boolean hasFarmSeeds() -> eM
-    865:880:void updateTrades() -> eC
-    883:894:void gossip(net.minecraft.world.entity.npc.Villager,long) -> a
-    897:910:void maybeDecayGossip() -> fa
-    913:938:void spawnGolemIfNeeded(long,int) -> a
-    941:942:void sawGolem(long) -> b
-    945:950:boolean hasSeenGolemRecently(long) -> c
-    954:965:boolean wantsToSpawnGolem(long) -> a
-    970:994:net.minecraft.world.entity.animal.IronGolem trySpawnGolem() -> fb
-    999:1009:void onReputationEventFrom(net.minecraft.world.entity.ai.village.ReputationEventType,net.minecraft.world.entity.Entity) -> a
-    1013:1013:int getVillagerXp() -> er
-    1017:1018:void setVillagerXp(int) -> u
-    1021:1023:void resetNumberOfRestocks() -> fc
-    1026:1026:net.minecraft.world.entity.ai.gossip.GossipContainer getGossips() -> eN
-    1030:1031:void setGossips(net.minecraft.nbt.Tag) -> a
-    1035:1038:void sendDebugPackets() -> K
-    1042:1044:void startSleeping(net.minecraft.core.BlockPos) -> e
-    1048:1050:void stopSleeping() -> dR
-    1053:1058:boolean golemSpawnConditionsMet(long) -> d
-    84:84:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    937:937:void lambda$spawnGolemIfNeeded$9(long,net.minecraft.world.entity.npc.Villager) -> a
-    922:922:boolean lambda$spawnGolemIfNeeded$8(long,net.minecraft.world.entity.npc.Villager) -> b
-    839:839:int lambda$countFoodPointsInInventory$7(net.minecraft.world.SimpleContainer,java.util.Map$Entry) -> a
-    692:692:boolean lambda$getPlayerReputation$6(net.minecraft.world.entity.ai.gossip.GossipType) -> a
-    647:655:void lambda$releasePoi$5(net.minecraft.server.MinecraftServer,net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.core.GlobalPos) -> a
-    638:638:void lambda$tellWitnessesThatIWasMurdered$4(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Entity,net.minecraft.world.entity.LivingEntity) -> a
-    637:637:boolean lambda$tellWitnessesThatIWasMurdered$3(net.minecraft.world.entity.LivingEntity) -> i
-    174:174:boolean lambda$static$2(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-    173:173:boolean lambda$static$1(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.ai.village.poi.PoiType) -> b
-    172:172:boolean lambda$static$0(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.ai.village.poi.PoiType) -> c
-    85:171:void <clinit>() -> <clinit>
-net.minecraft.world.entity.npc.VillagerData -> axx:
-    int[] NEXT_LEVEL_XP_THRESHOLDS -> a
-    net.minecraft.world.entity.npc.VillagerType type -> b
-    net.minecraft.world.entity.npc.VillagerProfession profession -> c
-    int level -> d
-    18:22:void <init>(net.minecraft.world.entity.npc.VillagerType,net.minecraft.world.entity.npc.VillagerProfession,int) -> <init>
-    25:30:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    33:33:net.minecraft.world.entity.npc.VillagerType getType() -> a
-    37:37:net.minecraft.world.entity.npc.VillagerProfession getProfession() -> b
-    41:41:int getLevel() -> c
-    45:45:net.minecraft.world.entity.npc.VillagerData setType(net.minecraft.world.entity.npc.VillagerType) -> a
-    49:49:net.minecraft.world.entity.npc.VillagerData setProfession(net.minecraft.world.entity.npc.VillagerProfession) -> a
-    53:53:net.minecraft.world.entity.npc.VillagerData setLevel(int) -> a
-    57:60:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    65:65:int getMinXpPerLevel(int) -> b
-    69:69:int getMaxXpPerLevel(int) -> c
-    73:73:boolean canLevelUp(int) -> d
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.world.entity.npc.VillagerDataHolder -> axy:
-    net.minecraft.world.entity.npc.VillagerData getVillagerData() -> eA
+    java.util.Map POI_MEMORIES -> bx
+    192:193:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    127:201:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level,net.minecraft.world.entity.npc.VillagerType) -> <init>
+    206:206:net.minecraft.world.entity.ai.Brain getBrain() -> cI
+    211:211:net.minecraft.world.entity.ai.Brain$Provider brainProvider() -> cJ
+    216:218:net.minecraft.world.entity.ai.Brain makeBrain(com.mojang.serialization.Dynamic) -> a
+    222:226:void refreshBrain(net.minecraft.server.level.ServerLevel) -> b
+    229:251:void registerBrainGoals(net.minecraft.world.entity.ai.Brain) -> a
+    255:259:void ageBoundaryReached() -> m
+    262:264:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eX
+    268:268:boolean assignProfessionWhenSpawned() -> eZ
+    273:311:void customServerAiStep() -> N
+    315:322:void tick() -> j
+    327:357:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    361:365:void setUnhappy() -> fk
+    368:371:void startTrading(net.minecraft.world.entity.player.Player) -> h
+    375:380:void setTradingPlayer(net.minecraft.world.entity.player.Player) -> f
+    384:386:void stopTrading() -> eT
+    389:392:void resetSpecialPrices() -> fl
+    396:396:boolean canRestock() -> fa
+    400:407:void restock() -> fb
+    410:415:boolean needsToRestock() -> fm
+    420:420:boolean allowedToRestock() -> fn
+    424:443:boolean shouldRestock() -> fc
+    448:457:void catchUpDemand() -> fo
+    460:463:void updateDemand() -> fp
+    466:482:void updateSpecialPrices(net.minecraft.world.entity.player.Player) -> i
+    486:488:void defineSynchedData() -> e
+    492:506:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    510:549:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    553:553:boolean removeWhenFarAway(double) -> h
+    559:566:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    571:571:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    576:576:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    580:584:void playWorkSound() -> fd
+    588:594:void setVillagerData(net.minecraft.world.entity.npc.VillagerData) -> a
+    598:598:net.minecraft.world.entity.npc.VillagerData getVillagerData() -> eY
+    603:617:void rewardTradeXp(net.minecraft.world.item.trading.MerchantOffer) -> b
+    620:621:void setChasing(boolean) -> u
+    624:624:boolean isChasing() -> fe
+    630:637:void setLastHurtByMob(net.minecraft.world.entity.LivingEntity) -> a
+    641:651:void die(net.minecraft.world.damagesource.DamageSource) -> a
+    654:667:void tellWitnessesThatIWasMurdered(net.minecraft.world.entity.Entity) -> a
+    670:687:void releasePoi(net.minecraft.world.entity.ai.memory.MemoryModuleType) -> a
+    691:691:boolean canBreed() -> f
+    695:695:boolean hungry() -> fq
+    699:721:void eatUntilFull() -> fr
+    724:724:int getPlayerReputation(net.minecraft.world.entity.player.Player) -> g
+    728:729:void digestFood(int) -> v
+    732:734:void eatAndDigestFood() -> ff
+    737:738:void setOffers(net.minecraft.world.item.trading.MerchantOffers) -> b
+    741:742:boolean shouldIncreaseLevel() -> fs
+    746:749:void increaseMerchantCareer() -> ft
+    753:753:net.minecraft.network.chat.Component getTypeName() -> bF
+    758:769:void handleEntityEvent(byte) -> a
+    774:785:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    791:802:net.minecraft.world.entity.npc.Villager getBreedOffspring(net.minecraft.world.entity.AgableMob) -> b
+    807:823:void thunderHit(net.minecraft.world.entity.LightningBolt) -> a
+    827:846:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> b
+    850:851:boolean wantsToPickUp(net.minecraft.world.item.ItemStack) -> i
+    855:855:boolean hasExcessFood() -> fg
+    859:859:boolean wantsMoreFood() -> fh
+    863:864:int countFoodPointsInInventory() -> fu
+    868:868:boolean hasFarmSeeds() -> fi
+    873:888:void updateTrades() -> eW
+    891:902:void gossip(net.minecraft.world.entity.npc.Villager,long) -> a
+    905:918:void maybeDecayGossip() -> fv
+    921:946:void spawnGolemIfNeeded(long,int) -> a
+    949:950:void sawGolem(long) -> b
+    953:958:boolean hasSeenGolemRecently(long) -> c
+    962:968:boolean wantsToSpawnGolem(long) -> a
+    973:992:net.minecraft.world.entity.animal.IronGolem trySpawnGolem() -> fw
+    997:1011:net.minecraft.core.BlockPos findSpawnPositionForGolemInColumn(net.minecraft.core.BlockPos,double,double) -> a
+    1016:1026:void onReputationEventFrom(net.minecraft.world.entity.ai.village.ReputationEventType,net.minecraft.world.entity.Entity) -> a
+    1030:1030:int getVillagerXp() -> eM
+    1034:1035:void setVillagerXp(int) -> u
+    1038:1040:void resetNumberOfRestocks() -> fx
+    1043:1043:net.minecraft.world.entity.ai.gossip.GossipContainer getGossips() -> fj
+    1047:1048:void setGossips(net.minecraft.nbt.Tag) -> a
+    1052:1055:void sendDebugPackets() -> M
+    1059:1063:void startSleeping(net.minecraft.core.BlockPos) -> b
+    1067:1069:void stopSleeping() -> em
+    1072:1076:boolean golemSpawnConditionsMet(long) -> d
+    90:90:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    945:945:void lambda$spawnGolemIfNeeded$11(long,net.minecraft.world.entity.npc.Villager) -> a
+    930:930:boolean lambda$spawnGolemIfNeeded$10(long,net.minecraft.world.entity.npc.Villager) -> b
+    864:864:int lambda$countFoodPointsInInventory$9(net.minecraft.world.SimpleContainer,java.util.Map$Entry) -> a
+    724:724:boolean lambda$getPlayerReputation$8(net.minecraft.world.entity.ai.gossip.GossipType) -> a
+    675:686:void lambda$releasePoi$7(net.minecraft.server.MinecraftServer,net.minecraft.world.entity.ai.memory.MemoryModuleType,net.minecraft.core.GlobalPos) -> a
+    666:666:void lambda$tellWitnessesThatIWasMurdered$6(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Entity,net.minecraft.world.entity.LivingEntity) -> a
+    665:665:boolean lambda$tellWitnessesThatIWasMurdered$5(net.minecraft.world.entity.LivingEntity) -> j
+    495:495:void lambda$addAdditionalSaveData$4(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> a
+    188:188:boolean lambda$static$3(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+    187:187:boolean lambda$static$2(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.ai.village.poi.PoiType) -> b
+    186:186:boolean lambda$static$1(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.ai.village.poi.PoiType) -> c
+    185:185:boolean lambda$static$0(net.minecraft.world.entity.npc.Villager,net.minecraft.world.entity.ai.village.poi.PoiType) -> d
+    91:184:void <clinit>() -> <clinit>
+net.minecraft.world.entity.npc.VillagerData -> bdq:
+    int[] NEXT_LEVEL_XP_THRESHOLDS -> b
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.entity.npc.VillagerType type -> c
+    net.minecraft.world.entity.npc.VillagerProfession profession -> d
+    int level -> e
+    22:26:void <init>(net.minecraft.world.entity.npc.VillagerType,net.minecraft.world.entity.npc.VillagerProfession,int) -> <init>
+    29:29:net.minecraft.world.entity.npc.VillagerType getType() -> a
+    33:33:net.minecraft.world.entity.npc.VillagerProfession getProfession() -> b
+    37:37:int getLevel() -> c
+    41:41:net.minecraft.world.entity.npc.VillagerData setType(net.minecraft.world.entity.npc.VillagerType) -> a
+    45:45:net.minecraft.world.entity.npc.VillagerData setProfession(net.minecraft.world.entity.npc.VillagerProfession) -> a
+    49:49:net.minecraft.world.entity.npc.VillagerData setLevel(int) -> a
+    53:53:int getMinXpPerLevel(int) -> b
+    57:57:int getMaxXpPerLevel(int) -> c
+    61:61:boolean canLevelUp(int) -> d
+    12:16:com.mojang.datafixers.kinds.App lambda$static$5(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    15:15:java.lang.Integer lambda$null$4(net.minecraft.world.entity.npc.VillagerData) -> a
+    14:14:net.minecraft.world.entity.npc.VillagerProfession lambda$null$3(net.minecraft.world.entity.npc.VillagerData) -> b
+    14:14:net.minecraft.world.entity.npc.VillagerProfession lambda$null$2() -> d
+    13:13:net.minecraft.world.entity.npc.VillagerType lambda$null$1(net.minecraft.world.entity.npc.VillagerData) -> c
+    13:13:net.minecraft.world.entity.npc.VillagerType lambda$null$0() -> e
+    10:12:void <clinit>() -> <clinit>
+net.minecraft.world.entity.npc.VillagerDataHolder -> bdr:
+    net.minecraft.world.entity.npc.VillagerData getVillagerData() -> eY
     void setVillagerData(net.minecraft.world.entity.npc.VillagerData) -> a
-net.minecraft.world.entity.npc.VillagerProfession -> axz:
+net.minecraft.world.entity.npc.VillagerProfession -> bds:
     net.minecraft.world.entity.npc.VillagerProfession NONE -> a
     net.minecraft.world.entity.npc.VillagerProfession ARMORER -> b
     net.minecraft.world.entity.npc.VillagerProfession BUTCHER -> c
@@ -44554,14 +48780,14 @@ net.minecraft.world.entity.npc.VillagerProfession -> axz:
     75:75:net.minecraft.world.entity.npc.VillagerProfession register(java.lang.String,net.minecraft.world.entity.ai.village.poi.PoiType,net.minecraft.sounds.SoundEvent) -> a
     79:79:net.minecraft.world.entity.npc.VillagerProfession register(java.lang.String,net.minecraft.world.entity.ai.village.poi.PoiType,com.google.common.collect.ImmutableSet,com.google.common.collect.ImmutableSet,net.minecraft.sounds.SoundEvent) -> a
     17:31:void <clinit>() -> <clinit>
-net.minecraft.world.entity.npc.VillagerTrades -> aya:
+net.minecraft.world.entity.npc.VillagerTrades -> bdt:
     java.util.Map TRADES -> a
     it.unimi.dsi.fastutil.ints.Int2ObjectMap WANDERING_TRADER_TRADES -> b
     49:49:void <init>() -> <init>
     598:598:it.unimi.dsi.fastutil.ints.Int2ObjectMap toIntMap(com.google.common.collect.ImmutableMap) -> a
     67:524:void lambda$static$0(java.util.HashMap) -> a
     66:587:void <clinit>() -> <clinit>
-net.minecraft.world.entity.npc.VillagerTrades$DyedArmorForEmeralds -> aya$a:
+net.minecraft.world.entity.npc.VillagerTrades$DyedArmorForEmeralds -> bdt$a:
     net.minecraft.world.item.Item item -> a
     int value -> b
     int maxUses -> c
@@ -44570,7 +48796,7 @@ net.minecraft.world.entity.npc.VillagerTrades$DyedArmorForEmeralds -> aya$a:
     789:794:void <init>(net.minecraft.world.item.Item,int,int,int) -> <init>
     798:816:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
     820:820:net.minecraft.world.item.DyeItem getRandomDye(java.util.Random) -> a
-net.minecraft.world.entity.npc.VillagerTrades$EmeraldForItems -> aya$b:
+net.minecraft.world.entity.npc.VillagerTrades$EmeraldForItems -> bdt$b:
     net.minecraft.world.item.Item item -> a
     int cost -> b
     int maxUses -> c
@@ -44578,7 +48804,7 @@ net.minecraft.world.entity.npc.VillagerTrades$EmeraldForItems -> aya$b:
     float priceMultiplier -> e
     613:619:void <init>(net.minecraft.world.level.ItemLike,int,int,int) -> <init>
     623:624:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
-net.minecraft.world.entity.npc.VillagerTrades$EmeraldsForVillagerTypeItem -> aya$c:
+net.minecraft.world.entity.npc.VillagerTrades$EmeraldsForVillagerTypeItem -> bdt$c:
     java.util.Map trades -> a
     int cost -> b
     int maxUses -> c
@@ -44587,11 +48813,11 @@ net.minecraft.world.entity.npc.VillagerTrades$EmeraldsForVillagerTypeItem -> aya
     648:652:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
     636:636:void lambda$new$1(net.minecraft.world.entity.npc.VillagerType) -> a
     635:635:boolean lambda$new$0(java.util.Map,net.minecraft.world.entity.npc.VillagerType) -> a
-net.minecraft.world.entity.npc.VillagerTrades$EnchantBookForEmeralds -> aya$d:
+net.minecraft.world.entity.npc.VillagerTrades$EnchantBookForEmeralds -> bdt$d:
     int villagerXp -> a
     827:829:void <init>(int) -> <init>
-    833:844:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
-net.minecraft.world.entity.npc.VillagerTrades$EnchantedItemForEmeralds -> aya$e:
+    833:845:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
+net.minecraft.world.entity.npc.VillagerTrades$EnchantedItemForEmeralds -> bdt$e:
     net.minecraft.world.item.ItemStack itemStack -> a
     int baseEmeraldCost -> b
     int maxUses -> c
@@ -44600,9 +48826,9 @@ net.minecraft.world.entity.npc.VillagerTrades$EnchantedItemForEmeralds -> aya$e:
     725:726:void <init>(net.minecraft.world.item.Item,int,int,int) -> <init>
     728:734:void <init>(net.minecraft.world.item.Item,int,int,int,float) -> <init>
     738:743:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
-net.minecraft.world.entity.npc.VillagerTrades$ItemListing -> aya$f:
+net.minecraft.world.entity.npc.VillagerTrades$ItemListing -> bdt$f:
     net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
-net.minecraft.world.entity.npc.VillagerTrades$ItemsAndEmeraldsToItems -> aya$g:
+net.minecraft.world.entity.npc.VillagerTrades$ItemsAndEmeraldsToItems -> bdt$g:
     net.minecraft.world.item.ItemStack fromItem -> a
     int fromCount -> b
     int emeraldCost -> c
@@ -44611,10 +48837,10 @@ net.minecraft.world.entity.npc.VillagerTrades$ItemsAndEmeraldsToItems -> aya$g:
     int maxUses -> f
     int villagerXp -> g
     float priceMultiplier -> h
-    895:896:void <init>(net.minecraft.world.level.ItemLike,int,net.minecraft.world.item.Item,int,int,int) -> <init>
-    898:907:void <init>(net.minecraft.world.level.ItemLike,int,int,net.minecraft.world.item.Item,int,int,int) -> <init>
-    912:912:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
-net.minecraft.world.entity.npc.VillagerTrades$ItemsForEmeralds -> aya$h:
+    896:897:void <init>(net.minecraft.world.level.ItemLike,int,net.minecraft.world.item.Item,int,int,int) -> <init>
+    899:908:void <init>(net.minecraft.world.level.ItemLike,int,int,net.minecraft.world.item.Item,int,int,int) -> <init>
+    913:913:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
+net.minecraft.world.entity.npc.VillagerTrades$ItemsForEmeralds -> bdt$h:
     net.minecraft.world.item.ItemStack itemStack -> a
     int emeraldCost -> b
     int numberOfItems -> c
@@ -44627,14 +48853,14 @@ net.minecraft.world.entity.npc.VillagerTrades$ItemsForEmeralds -> aya$h:
     677:678:void <init>(net.minecraft.world.item.ItemStack,int,int,int,int) -> <init>
     680:687:void <init>(net.minecraft.world.item.ItemStack,int,int,int,int,float) -> <init>
     691:691:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
-net.minecraft.world.entity.npc.VillagerTrades$SuspisciousStewForEmerald -> aya$i:
+net.minecraft.world.entity.npc.VillagerTrades$SuspisciousStewForEmerald -> bdt$i:
     net.minecraft.world.effect.MobEffect effect -> a
     int duration -> b
     int xp -> c
     float priceMultiplier -> d
     701:706:void <init>(net.minecraft.world.effect.MobEffect,int,int) -> <init>
     711:713:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
-net.minecraft.world.entity.npc.VillagerTrades$TippedArrowForItemsAndEmeralds -> aya$j:
+net.minecraft.world.entity.npc.VillagerTrades$TippedArrowForItemsAndEmeralds -> bdt$j:
     net.minecraft.world.item.ItemStack toItem -> a
     int toCount -> b
     int emeraldCost -> c
@@ -44646,15 +48872,15 @@ net.minecraft.world.entity.npc.VillagerTrades$TippedArrowForItemsAndEmeralds ->
     757:766:void <init>(net.minecraft.world.item.Item,int,net.minecraft.world.item.Item,int,int,int,int) -> <init>
     770:775:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
     771:771:boolean lambda$getOffer$0(net.minecraft.world.item.alchemy.Potion) -> a
-net.minecraft.world.entity.npc.VillagerTrades$TreasureMapForEmeralds -> aya$k:
+net.minecraft.world.entity.npc.VillagerTrades$TreasureMapForEmeralds -> bdt$k:
     int emeraldCost -> a
-    java.lang.String destination -> b
+    net.minecraft.world.level.levelgen.feature.StructureFeature destination -> b
     net.minecraft.world.level.saveddata.maps.MapDecoration$Type destinationType -> c
     int maxUses -> d
     int villagerXp -> e
-    855:861:void <init>(int,java.lang.String,net.minecraft.world.level.saveddata.maps.MapDecoration$Type,int,int) -> <init>
-    867:880:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
-net.minecraft.world.entity.npc.VillagerType -> ayb:
+    856:862:void <init>(int,net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.saveddata.maps.MapDecoration$Type,int,int) -> <init>
+    868:881:net.minecraft.world.item.trading.MerchantOffer getOffer(net.minecraft.world.entity.Entity,java.util.Random) -> a
+net.minecraft.world.entity.npc.VillagerType -> bdu:
     net.minecraft.world.entity.npc.VillagerType DESERT -> a
     net.minecraft.world.entity.npc.VillagerType JUNGLE -> b
     net.minecraft.world.entity.npc.VillagerType PLAINS -> c
@@ -44667,68 +48893,68 @@ net.minecraft.world.entity.npc.VillagerType -> ayb:
     85:85:net.minecraft.world.entity.npc.VillagerType byBiome(net.minecraft.world.level.biome.Biome) -> a
     33:82:void lambda$static$0(java.util.HashMap) -> a
     13:30:void <clinit>() -> <clinit>
-net.minecraft.world.entity.npc.VillagerType$1 -> ayb$1:
+net.minecraft.world.entity.npc.VillagerType$1 -> bdu$1:
     java.lang.String val$name -> i
     22:22:void <init>(java.lang.String) -> <init>
     25:25:java.lang.String toString() -> toString
-net.minecraft.world.entity.npc.WanderingTrader -> ayc:
-    net.minecraft.core.BlockPos wanderTarget -> bx
-    int despawnDelay -> by
-    55:57:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    61:78:void registerGoals() -> n
-    83:83:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
-    88:88:boolean showProgressBar() -> ev
-    94:119:boolean mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    124:140:void updateTrades() -> eC
-    144:150:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    154:163:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    167:167:boolean removeWhenFarAway(double) -> h
-    172:176:void rewardTradeXp(net.minecraft.world.item.trading.MerchantOffer) -> b
-    180:183:net.minecraft.sounds.SoundEvent getAmbientSound() -> G
-    188:188:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    193:193:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    198:202:net.minecraft.sounds.SoundEvent getDrinkingSound(net.minecraft.world.item.ItemStack) -> c
-    208:208:net.minecraft.sounds.SoundEvent getTradeUpdatedSound(boolean) -> r
-    213:213:net.minecraft.sounds.SoundEvent getNotifyTradeSound() -> ew
-    217:218:void setDespawnDelay(int) -> u
-    221:221:int getDespawnDelay() -> eA
-    226:231:void aiStep() -> k
-    234:237:void maybeDespawn() -> eE
-    240:241:void setWanderTarget(net.minecraft.core.BlockPos) -> g
-    245:245:net.minecraft.core.BlockPos getWanderTarget() -> eF
-    63:63:boolean lambda$registerGoals$1(net.minecraft.world.entity.npc.WanderingTrader) -> f
-    62:62:boolean lambda$registerGoals$0(net.minecraft.world.entity.npc.WanderingTrader) -> g
-    47:47:net.minecraft.world.entity.ai.navigation.PathNavigation access$000(net.minecraft.world.entity.npc.WanderingTrader) -> a
-    47:47:net.minecraft.core.BlockPos access$100(net.minecraft.world.entity.npc.WanderingTrader) -> b
-    47:47:net.minecraft.world.entity.ai.navigation.PathNavigation access$200(net.minecraft.world.entity.npc.WanderingTrader) -> c
-    47:47:net.minecraft.world.entity.ai.navigation.PathNavigation access$300(net.minecraft.world.entity.npc.WanderingTrader) -> d
-    47:47:net.minecraft.world.entity.ai.navigation.PathNavigation access$400(net.minecraft.world.entity.npc.WanderingTrader) -> e
-net.minecraft.world.entity.npc.WanderingTrader$WanderToPositionGoal -> ayc$a:
+net.minecraft.world.entity.npc.WanderingTrader -> bdv:
+    net.minecraft.core.BlockPos wanderTarget -> bw
+    int despawnDelay -> bx
+    57:59:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    63:81:void registerGoals() -> o
+    86:86:net.minecraft.world.entity.AgableMob getBreedOffspring(net.minecraft.world.entity.AgableMob) -> a
+    91:91:boolean showProgressBar() -> eQ
+    97:115:net.minecraft.world.InteractionResult mobInteract(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
+    120:136:void updateTrades() -> eW
+    140:146:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    150:159:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    163:163:boolean removeWhenFarAway(double) -> h
+    168:172:void rewardTradeXp(net.minecraft.world.item.trading.MerchantOffer) -> b
+    176:179:net.minecraft.sounds.SoundEvent getAmbientSound() -> I
+    184:184:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    189:189:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    194:198:net.minecraft.sounds.SoundEvent getDrinkingSound(net.minecraft.world.item.ItemStack) -> c
+    204:204:net.minecraft.sounds.SoundEvent getTradeUpdatedSound(boolean) -> t
+    209:209:net.minecraft.sounds.SoundEvent getNotifyTradeSound() -> eR
+    213:214:void setDespawnDelay(int) -> u
+    217:217:int getDespawnDelay() -> eX
+    222:227:void aiStep() -> k
+    230:233:void maybeDespawn() -> eY
+    236:237:void setWanderTarget(net.minecraft.core.BlockPos) -> g
+    241:241:net.minecraft.core.BlockPos getWanderTarget() -> eZ
+    65:65:boolean lambda$registerGoals$1(net.minecraft.world.entity.npc.WanderingTrader) -> f
+    64:64:boolean lambda$registerGoals$0(net.minecraft.world.entity.npc.WanderingTrader) -> g
+    49:49:net.minecraft.world.entity.ai.navigation.PathNavigation access$000(net.minecraft.world.entity.npc.WanderingTrader) -> a
+    49:49:net.minecraft.core.BlockPos access$100(net.minecraft.world.entity.npc.WanderingTrader) -> b
+    49:49:net.minecraft.world.entity.ai.navigation.PathNavigation access$200(net.minecraft.world.entity.npc.WanderingTrader) -> c
+    49:49:net.minecraft.world.entity.ai.navigation.PathNavigation access$300(net.minecraft.world.entity.npc.WanderingTrader) -> d
+    49:49:net.minecraft.world.entity.ai.navigation.PathNavigation access$400(net.minecraft.world.entity.npc.WanderingTrader) -> e
+net.minecraft.world.entity.npc.WanderingTrader$WanderToPositionGoal -> bdv$a:
     net.minecraft.world.entity.npc.WanderingTrader trader -> a
     double stopDistance -> b
     double speedModifier -> c
     net.minecraft.world.entity.npc.WanderingTrader this$0 -> d
-    253:258:void <init>(net.minecraft.world.entity.npc.WanderingTrader,net.minecraft.world.entity.npc.WanderingTrader,double,double) -> <init>
-    262:264:void stop() -> d
-    268:269:boolean canUse() -> a
-    274:285:void tick() -> e
-    288:288:boolean isTooFarAway(net.minecraft.core.BlockPos,double) -> a
-net.minecraft.world.entity.npc.WanderingTraderSpawner -> ayd:
+    249:254:void <init>(net.minecraft.world.entity.npc.WanderingTrader,net.minecraft.world.entity.npc.WanderingTrader,double,double) -> <init>
+    258:260:void stop() -> d
+    264:265:boolean canUse() -> a
+    270:281:void tick() -> e
+    284:284:boolean isTooFarAway(net.minecraft.core.BlockPos,double) -> a
+net.minecraft.world.entity.npc.WanderingTraderSpawner -> bdw:
     java.util.Random random -> a
-    net.minecraft.server.level.ServerLevel level -> b
+    net.minecraft.world.level.storage.ServerLevelData serverLevelData -> b
     int tickDelay -> c
     int spawnDelay -> d
     int spawnChance -> e
-    35:54:void <init>(net.minecraft.server.level.ServerLevel) -> <init>
-    57:90:void tick() -> a
-    93:130:boolean spawn() -> b
-    134:145:void tryToSpawnLlamaFor(net.minecraft.world.entity.npc.WanderingTrader,int) -> a
-    149:162:net.minecraft.core.BlockPos findSpawnPositionNear(net.minecraft.core.BlockPos,int) -> a
-    166:171:boolean hasEnoughSpace(net.minecraft.core.BlockPos) -> a
-    106:106:boolean lambda$spawn$0(net.minecraft.core.BlockPos) -> b
-net.minecraft.world.entity.npc.package-info -> aye:
-net.minecraft.world.entity.package-info -> ayf:
-net.minecraft.world.entity.player.Abilities -> ayg:
+    38:56:void <init>(net.minecraft.world.level.storage.ServerLevelData) -> <init>
+    60:93:int tick(net.minecraft.server.level.ServerLevel,boolean,boolean) -> a
+    97:134:boolean spawn(net.minecraft.server.level.ServerLevel) -> a
+    138:149:void tryToSpawnLlamaFor(net.minecraft.world.entity.npc.WanderingTrader,int) -> a
+    153:166:net.minecraft.core.BlockPos findSpawnPositionNear(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int) -> a
+    170:175:boolean hasEnoughSpace(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    110:110:boolean lambda$spawn$0(net.minecraft.core.BlockPos) -> a
+net.minecraft.world.entity.npc.package-info -> bdx:
+net.minecraft.world.entity.package-info -> bdy:
+net.minecraft.world.entity.player.Abilities -> bdz:
     boolean invulnerable -> a
     boolean flying -> b
     boolean mayfly -> c
@@ -44743,7 +48969,7 @@ net.minecraft.world.entity.player.Abilities -> ayg:
     52:53:void setFlyingSpeed(float) -> a
     56:56:float getWalkingSpeed() -> b
     60:61:void setWalkingSpeed(float) -> b
-net.minecraft.world.entity.player.ChatVisiblity -> ayh:
+net.minecraft.world.entity.player.ChatVisiblity -> bea:
     net.minecraft.world.entity.player.ChatVisiblity FULL -> a
     net.minecraft.world.entity.player.ChatVisiblity SYSTEM -> b
     net.minecraft.world.entity.player.ChatVisiblity HIDDEN -> c
@@ -44759,7 +48985,7 @@ net.minecraft.world.entity.player.ChatVisiblity -> ayh:
     31:31:net.minecraft.world.entity.player.ChatVisiblity byId(int) -> a
     13:13:net.minecraft.world.entity.player.ChatVisiblity[] lambda$static$0(int) -> b
     8:13:void <clinit>() -> <clinit>
-net.minecraft.world.entity.player.Inventory -> ayi:
+net.minecraft.world.entity.player.Inventory -> beb:
     net.minecraft.core.NonNullList items -> a
     net.minecraft.core.NonNullList armor -> b
     net.minecraft.core.NonNullList offhand -> c
@@ -44768,282 +48994,276 @@ net.minecraft.world.entity.player.Inventory -> ayi:
     net.minecraft.world.entity.player.Player player -> e
     net.minecraft.world.item.ItemStack carried -> g
     int timesChanged -> h
-    36:49:void <init>(net.minecraft.world.entity.player.Player) -> <init>
-    54:57:net.minecraft.world.item.ItemStack getSelected() -> f
-    61:61:int getSelectionSize() -> g
-    65:69:boolean hasRemainingSpaceForItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    74:74:boolean isSameItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> b
-    78:83:int getFreeSlot() -> h
-    87:108:void setPickedItem(net.minecraft.world.item.ItemStack) -> a
-    111:117:void pickSlot(int) -> c
-    120:120:boolean isHotbarSlot(int) -> d
-    124:129:int findSlotMatchingItem(net.minecraft.world.item.ItemStack) -> b
-    133:144:int findSlotMatchingUnusedItem(net.minecraft.world.item.ItemStack) -> c
-    149:166:int getSuitableHotbarSlot() -> i
-    170:185:void swapPaint(double) -> a
-    188:224:int clearInventory(java.util.function.Predicate,int) -> a
-    228:235:int addResource(net.minecraft.world.item.ItemStack) -> i
-    239:267:int addResource(int,net.minecraft.world.item.ItemStack) -> d
-    271:282:int getSlotWithRemainingSpace(net.minecraft.world.item.ItemStack) -> d
-    286:293:void tick() -> j
-    296:296:boolean add(net.minecraft.world.item.ItemStack) -> e
-    300:345:boolean add(int,net.minecraft.world.item.ItemStack) -> c
-    350:371:void placeItemBackInInventory(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack) -> a
-    375:389:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
-    398:406:void removeItem(net.minecraft.world.item.ItemStack) -> f
-    410:425:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
-    430:444:void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    447:447:float getDestroySpeed(net.minecraft.world.level.block.state.BlockState) -> a
-    452:476:net.minecraft.nbt.ListTag save(net.minecraft.nbt.ListTag) -> a
-    480:497:void load(net.minecraft.nbt.ListTag) -> b
-    501:501:int getContainerSize() -> O_
-    506:521:boolean isEmpty() -> c
-    526:537:net.minecraft.world.item.ItemStack getItem(int) -> a
-    542:542:net.minecraft.network.chat.Component getName() -> M
-    546:546:boolean canDestroy(net.minecraft.world.level.block.state.BlockState) -> b
-    550:550:net.minecraft.world.item.ItemStack getArmor(int) -> e
-    554:569:void hurtArmor(float) -> a
-    572:581:void dropAll() -> k
-    585:586:void setChanged() -> e
-    589:589:int getTimesChanged() -> l
-    593:594:void setCarried(net.minecraft.world.item.ItemStack) -> g
-    597:597:net.minecraft.world.item.ItemStack getCarried() -> m
-    602:608:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    612:619:boolean contains(net.minecraft.world.item.ItemStack) -> h
-    623:630:boolean contains(net.minecraft.tags.Tag) -> a
-    634:638:void replaceWith(net.minecraft.world.entity.player.Inventory) -> a
-    642:645:void clearContent() -> N_
-    648:651:void fillStackedContents(net.minecraft.world.entity.player.StackedContents) -> a
-    566:566:void lambda$hurtArmor$1(int,net.minecraft.world.entity.player.Player) -> a
-    343:343:java.lang.String lambda$add$0(net.minecraft.world.item.ItemStack) -> j
-net.minecraft.world.entity.player.Player -> ayj:
-    net.minecraft.world.entity.EntityDimensions STANDING_DIMENSIONS -> bp
+    37:50:void <init>(net.minecraft.world.entity.player.Player) -> <init>
+    55:58:net.minecraft.world.item.ItemStack getSelected() -> f
+    62:62:int getSelectionSize() -> g
+    66:70:boolean hasRemainingSpaceForItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    75:75:boolean isSameItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> b
+    79:84:int getFreeSlot() -> h
+    88:109:void setPickedItem(net.minecraft.world.item.ItemStack) -> a
+    112:118:void pickSlot(int) -> c
+    121:121:boolean isHotbarSlot(int) -> d
+    125:130:int findSlotMatchingItem(net.minecraft.world.item.ItemStack) -> b
+    134:145:int findSlotMatchingUnusedItem(net.minecraft.world.item.ItemStack) -> c
+    150:167:int getSuitableHotbarSlot() -> i
+    171:186:void swapPaint(double) -> a
+    189:198:int clearOrCountMatchingItems(java.util.function.Predicate,int,net.minecraft.world.Container) -> a
+    202:209:int addResource(net.minecraft.world.item.ItemStack) -> i
+    213:241:int addResource(int,net.minecraft.world.item.ItemStack) -> d
+    245:256:int getSlotWithRemainingSpace(net.minecraft.world.item.ItemStack) -> d
+    260:267:void tick() -> j
+    270:270:boolean add(net.minecraft.world.item.ItemStack) -> e
+    274:319:boolean add(int,net.minecraft.world.item.ItemStack) -> c
+    324:345:void placeItemBackInInventory(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack) -> a
+    349:363:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
+    372:380:void removeItem(net.minecraft.world.item.ItemStack) -> f
+    384:399:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
+    404:418:void setItem(int,net.minecraft.world.item.ItemStack) -> a
+    421:421:float getDestroySpeed(net.minecraft.world.level.block.state.BlockState) -> a
+    426:450:net.minecraft.nbt.ListTag save(net.minecraft.nbt.ListTag) -> a
+    454:471:void load(net.minecraft.nbt.ListTag) -> b
+    475:475:int getContainerSize() -> ab_
+    480:495:boolean isEmpty() -> c
+    500:511:net.minecraft.world.item.ItemStack getItem(int) -> a
+    516:516:net.minecraft.network.chat.Component getName() -> P
+    520:520:net.minecraft.world.item.ItemStack getArmor(int) -> e
+    524:542:void hurtArmor(net.minecraft.world.damagesource.DamageSource,float) -> a
+    545:554:void dropAll() -> k
+    558:559:void setChanged() -> Z_
+    562:562:int getTimesChanged() -> l
+    566:567:void setCarried(net.minecraft.world.item.ItemStack) -> g
+    570:570:net.minecraft.world.item.ItemStack getCarried() -> m
+    575:581:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    585:592:boolean contains(net.minecraft.world.item.ItemStack) -> h
+    596:603:boolean contains(net.minecraft.tags.Tag) -> a
+    607:611:void replaceWith(net.minecraft.world.entity.player.Inventory) -> a
+    615:618:void clearContent() -> aa_
+    621:624:void fillStackedContents(net.minecraft.world.entity.player.StackedContents) -> a
+    539:539:void lambda$hurtArmor$1(int,net.minecraft.world.entity.player.Player) -> a
+    317:317:java.lang.String lambda$add$0(net.minecraft.world.item.ItemStack) -> j
+net.minecraft.world.entity.player.Player -> bec:
+    net.minecraft.world.entity.EntityDimensions STANDING_DIMENSIONS -> bo
     java.util.Map POSES -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_PLAYER_ABSORPTION_ID -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_SCORE_ID -> d
-    net.minecraft.network.syncher.EntityDataAccessor DATA_PLAYER_MODE_CUSTOMISATION -> bq
-    net.minecraft.network.syncher.EntityDataAccessor DATA_PLAYER_MAIN_HAND -> br
-    net.minecraft.network.syncher.EntityDataAccessor DATA_SHOULDER_LEFT -> bs
-    net.minecraft.network.syncher.EntityDataAccessor DATA_SHOULDER_RIGHT -> bt
+    net.minecraft.network.syncher.EntityDataAccessor DATA_PLAYER_MODE_CUSTOMISATION -> bp
+    net.minecraft.network.syncher.EntityDataAccessor DATA_PLAYER_MAIN_HAND -> bq
+    net.minecraft.network.syncher.EntityDataAccessor DATA_SHOULDER_LEFT -> br
+    net.minecraft.network.syncher.EntityDataAccessor DATA_SHOULDER_RIGHT -> bs
     long timeEntitySatOnShoulder -> e
-    net.minecraft.world.entity.player.Inventory inventory -> bu
-    net.minecraft.world.inventory.PlayerEnderChestContainer enderChestInventory -> bv
-    net.minecraft.world.inventory.InventoryMenu inventoryMenu -> bw
-    net.minecraft.world.inventory.AbstractContainerMenu containerMenu -> bx
-    net.minecraft.world.food.FoodData foodData -> by
-    int jumpTriggerTime -> bz
-    float oBob -> bA
-    float bob -> bB
-    int takeXpDelay -> bC
-    double xCloakO -> bD
-    double yCloakO -> bE
-    double zCloakO -> bF
-    double xCloak -> bG
-    double yCloak -> bH
-    double zCloak -> bI
+    net.minecraft.world.entity.player.Inventory inventory -> bt
+    net.minecraft.world.inventory.PlayerEnderChestContainer enderChestInventory -> bu
+    net.minecraft.world.inventory.InventoryMenu inventoryMenu -> bv
+    net.minecraft.world.inventory.AbstractContainerMenu containerMenu -> bw
+    net.minecraft.world.food.FoodData foodData -> bx
+    int jumpTriggerTime -> by
+    float oBob -> bz
+    float bob -> bA
+    int takeXpDelay -> bB
+    double xCloakO -> bC
+    double yCloakO -> bD
+    double zCloakO -> bE
+    double xCloak -> bF
+    double yCloak -> bG
+    double zCloak -> bH
     int sleepCounter -> f
-    boolean wasUnderwater -> bJ
-    net.minecraft.core.BlockPos respawnPosition -> g
-    boolean respawnForced -> bR
-    net.minecraft.world.entity.player.Abilities abilities -> bK
-    int experienceLevel -> bL
-    int totalExperience -> bM
-    float experienceProgress -> bN
-    int enchantmentSeed -> bO
-    float defaultFlySpeed -> bP
-    int lastLevelUpTime -> bS
-    com.mojang.authlib.GameProfile gameProfile -> bT
-    boolean reducedDebugInfo -> bU
-    net.minecraft.world.item.ItemStack lastItemInMainHand -> bV
-    net.minecraft.world.item.ItemCooldowns cooldowns -> bW
-    net.minecraft.world.entity.fishing.FishingHook fishing -> bQ
-    154:212:void <init>(net.minecraft.world.level.Level,com.mojang.authlib.GameProfile) -> <init>
-    215:225:boolean blockActionRestricted(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.GameType) -> a
-    230:236:void registerAttributes() -> cA
-    240:248:void defineSynchedData() -> w_
-    252:330:void tick() -> h
-    338:338:boolean isSecondaryUseActive() -> dT
-    342:342:boolean wantsToStopRiding() -> dU
-    350:350:boolean isStayingOnGroundSurface() -> dV
-    354:355:boolean updateIsUnderwater() -> dW
-    359:363:void turtleHelmetTick() -> l
-    366:366:net.minecraft.world.item.ItemCooldowns createItemCooldowns() -> g
-    370:407:void moveCloak() -> n
-    410:444:void updatePlayerPose() -> dX
-    448:448:int getPortalWaitTime() -> ab
-    453:453:net.minecraft.sounds.SoundEvent getSwimSound() -> am
-    458:458:net.minecraft.sounds.SoundEvent getSwimSplashSound() -> an
-    463:463:net.minecraft.sounds.SoundEvent getSwimHighSpeedSplashSound() -> ao
-    468:468:int getDimensionChangingDelay() -> ba
-    474:475:void playSound(net.minecraft.sounds.SoundEvent,float,float) -> a
-    478:478:void playNotifySound(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
-    482:482:net.minecraft.sounds.SoundSource getSoundSource() -> cl
-    487:487:int getFireImmuneTicks() -> cm
-    492:503:void handleEntityEvent(byte) -> a
-    506:512:void addParticlesAroundSelf(net.minecraft.core.particles.ParticleOptions) -> a
-    515:516:void closeContainer() -> v_
-    520:543:void rideTick() -> aQ
-    547:551:void resetPos() -> W
-    555:559:void serverAiStep() -> du
-    563:627:void aiStep() -> k
-    630:634:void playShoulderEntityAmbientSound(net.minecraft.nbt.CompoundTag) -> j
-    637:638:void touch(net.minecraft.world.entity.Entity) -> c
-    641:641:int getScore() -> dY
-    645:646:void setScore(int) -> s
-    649:651:void increaseScore(int) -> t
-    655:677:void die(net.minecraft.world.damagesource.DamageSource) -> a
-    681:686:void dropEquipment() -> cU
-    689:695:void destroyVanishingCursedItems() -> dZ
-    699:708:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
-    713:713:net.minecraft.sounds.SoundEvent getDeathSound() -> cX
-    717:717:boolean drop(boolean) -> n
-    722:722:net.minecraft.world.entity.item.ItemEntity drop(net.minecraft.world.item.ItemStack,boolean) -> a
-    727:763:net.minecraft.world.entity.item.ItemEntity drop(net.minecraft.world.item.ItemStack,boolean,boolean) -> a
-    767:809:float getDestroySpeed(net.minecraft.world.level.block.state.BlockState) -> b
-    813:813:boolean canDestroy(net.minecraft.world.level.block.state.BlockState) -> c
-    818:853:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    857:885:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    889:900:boolean isInvulnerableTo(net.minecraft.world.damagesource.DamageSource) -> b
-    905:935:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    940:945:void blockUsingShield(net.minecraft.world.entity.LivingEntity) -> d
-    948:957:boolean canHarmPlayer(net.minecraft.world.entity.player.Player) -> a
-    962:963:void hurtArmor(float) -> m
-    967:982:void hurtCurrentlyUsedShield(float) -> n
-    986:1012:void actuallyHurt(net.minecraft.world.damagesource.DamageSource,float) -> d
-    1015:1015:void openTextEdit(net.minecraft.world.level.block.entity.SignBlockEntity) -> a
-    1018:1018:void openMinecartCommandBlock(net.minecraft.world.level.BaseCommandBlock) -> a
-    1021:1021:void openCommandBlock(net.minecraft.world.level.block.entity.CommandBlockEntity) -> a
-    1024:1024:void openStructureBlock(net.minecraft.world.level.block.entity.StructureBlockEntity) -> a
-    1027:1027:void openJigsawBlock(net.minecraft.world.level.block.entity.JigsawBlockEntity) -> a
-    1030:1030:void openHorseInventory(net.minecraft.world.entity.animal.horse.AbstractHorse,net.minecraft.world.Container) -> a
-    1033:1033:java.util.OptionalInt openMenu(net.minecraft.world.MenuProvider) -> a
-    1037:1037:void sendMerchantOffers(int,net.minecraft.world.item.trading.MerchantOffers,int,int,boolean,boolean) -> a
-    1046:1046:void openItemGui(net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
-    1049:1079:net.minecraft.world.InteractionResult interactOn(net.minecraft.world.entity.Entity,net.minecraft.world.InteractionHand) -> a
-    1084:1084:double getRidingHeight() -> aR
-    1089:1093:void stopRiding() -> j
-    1097:1097:boolean isImmobile() -> do
-    1106:1155:net.minecraft.world.phys.Vec3 maybeBackOffFromEdge(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.MoverType) -> a
-    1159:1338:void attack(net.minecraft.world.entity.Entity) -> f
-    1342:1343:void doAutoAttackOnTouch(net.minecraft.world.entity.LivingEntity) -> g
-    1346:1357:void disableShield(boolean) -> o
-    1360:1360:void crit(net.minecraft.world.entity.Entity) -> a
-    1363:1363:void magicCrit(net.minecraft.world.entity.Entity) -> b
-    1367:1372:void sweepAttack() -> ea
-    1375:1375:void respawn() -> eb
-    1379:1384:void remove() -> X
-    1387:1387:boolean isLocalPlayer() -> ec
-    1391:1391:com.mojang.authlib.GameProfile getGameProfile() -> ed
-    1420:1464:com.mojang.datafixers.util.Either startSleepInBed(net.minecraft.core.BlockPos) -> a
-    1469:1472:void startSleeping(net.minecraft.core.BlockPos) -> e
-    1475:1475:boolean bedInRange(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    1479:1480:boolean isReachableBedBlock(net.minecraft.core.BlockPos) -> g
-    1484:1485:boolean bedBlocked(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    1496:1503:void stopSleepInBed(boolean,boolean) -> a
-    1507:1508:void stopSleeping() -> dR
-    1512:1529:java.util.Optional checkBedValidRespawnPosition(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,boolean) -> a
-    1533:1533:boolean isSleepingLongEnough() -> ee
-    1537:1537:int getSleepTimer() -> ef
-    1549:1549:void displayClientMessage(net.minecraft.network.chat.Component,boolean) -> a
-    1552:1552:net.minecraft.core.BlockPos getRespawnPosition() -> eg
-    1556:1556:boolean isRespawnForced() -> eh
-    1560:1570:void setRespawnPosition(net.minecraft.core.BlockPos,boolean,boolean) -> a
-    1573:1574:void awardStat(net.minecraft.resources.ResourceLocation) -> a
-    1577:1578:void awardStat(net.minecraft.resources.ResourceLocation,int) -> a
-    1581:1582:void awardStat(net.minecraft.stats.Stat) -> b
-    1585:1585:void awardStat(net.minecraft.stats.Stat,int) -> a
-    1588:1588:void resetStat(net.minecraft.stats.Stat) -> a
-    1591:1591:int awardRecipes(java.util.Collection) -> a
-    1595:1595:void awardRecipesByKey(net.minecraft.resources.ResourceLocation[]) -> a
-    1598:1598:int resetRecipes(java.util.Collection) -> b
-    1603:1611:void jumpFromGround() -> dq
-    1615:1647:void travel(net.minecraft.world.phys.Vec3) -> e
-    1651:1656:void updateSwimming() -> aB
-    1659:1659:boolean freeAt(net.minecraft.core.BlockPos) -> f
-    1664:1664:float getSpeed() -> dt
-    1668:1717:void checkMovementStatistics(double,double,double) -> o
-    1720:1734:void checkRidingStatistiscs(double,double,double) -> p
-    1739:1746:boolean causeFallDamage(float,float) -> b
-    1750:1757:boolean tryToStartFallFlying() -> ei
-    1761:1762:void startFallFlying() -> ej
-    1766:1768:void stopFallFlying() -> ek
-    1772:1775:void doWaterSplashEffect() -> aD
-    1779:1782:net.minecraft.sounds.SoundEvent getFallDamageSound(int) -> o
-    1788:1789:void killed(net.minecraft.world.entity.LivingEntity) -> b
-    1793:1796:void makeStuckInBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.Vec3) -> a
-    1799:1817:void giveExperiencePoints(int) -> d
-    1820:1820:int getEnchantmentSeed() -> el
-    1824:1831:void onEnchantmentPerformed(net.minecraft.world.item.ItemStack,int) -> a
-    1834:1846:void giveExperienceLevels(int) -> c
-    1849:1855:int getXpNeededForNextLevel() -> em
-    1867:1874:void causeFoodExhaustion(float) -> r
-    1877:1877:net.minecraft.world.food.FoodData getFoodData() -> en
-    1881:1881:boolean canEat(boolean) -> p
-    1885:1885:boolean isHurt() -> eo
-    1889:1889:boolean mayBuild() -> ep
-    1894:1900:boolean mayUseItemAt(net.minecraft.core.BlockPos,net.minecraft.core.Direction,net.minecraft.world.item.ItemStack) -> a
-    1905:1913:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
-    1919:1919:boolean isAlwaysExperienceDropper() -> cF
-    1924:1924:boolean shouldShowName() -> bP
-    1931:1931:boolean isMovementNoisy() -> at
-    1935:1935:void onUpdateAbilities() -> r
-    1938:1938:void setGameMode(net.minecraft.world.level.GameType) -> a
-    1942:1942:net.minecraft.network.chat.Component getName() -> M
-    1946:1946:net.minecraft.world.inventory.PlayerEnderChestContainer getEnderChestInventory() -> eq
-    1951:1958:net.minecraft.world.item.ItemStack getItemBySlot(net.minecraft.world.entity.EquipmentSlot) -> b
-    1963:1973:void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
-    1976:1977:boolean addItem(net.minecraft.world.item.ItemStack) -> g
-    1982:1982:java.lang.Iterable getHandSlots() -> bc
-    1987:1987:java.lang.Iterable getArmorSlots() -> bd
-    1991:2006:boolean setEntityOnShoulder(net.minecraft.nbt.CompoundTag) -> g
-    2010:2016:void removeEntitiesOnShoulder() -> er
-    2019:2030:void respawnEntityOnShoulder(net.minecraft.nbt.CompoundTag) -> k
-    boolean isSpectator() -> t
-    2037:2037:boolean isSwimming() -> bq
-    boolean isCreative() -> u
-    2044:2044:boolean isPushedByWater() -> bM
-    2048:2048:net.minecraft.world.scores.Scoreboard getScoreboard() -> es
-    2053:2054:net.minecraft.network.chat.Component getDisplayName() -> d
-    2058:2058:net.minecraft.network.chat.Component getDisplayNameWithUuid() -> et
-    2062:2064:net.minecraft.network.chat.Component decorateDisplayNameComponent(net.minecraft.network.chat.Component) -> c
-    2073:2073:java.lang.String getScoreboardName() -> bL
-    2078:2087:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
-    2093:2097:void setAbsorptionAmount(float) -> q
-    2101:2101:float getAbsorptionAmount() -> dy
-    2105:2109:java.util.UUID createPlayerUUID(com.mojang.authlib.GameProfile) -> a
-    2113:2113:java.util.UUID createPlayerUUID(java.lang.String) -> c
-    2117:2117:boolean isModelPartShown(net.minecraft.world.entity.player.PlayerModelPart) -> a
-    2122:2166:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
-    2170:2170:boolean isReducedDebugInfo() -> eu
-    2174:2175:void setReducedDebugInfo(boolean) -> q
-    2179:2179:net.minecraft.world.entity.HumanoidArm getMainArm() -> dA
-    2183:2184:void setMainArm(net.minecraft.world.entity.HumanoidArm) -> a
-    2187:2187:net.minecraft.nbt.CompoundTag getShoulderEntityLeft() -> ev
-    2191:2192:void setShoulderEntityLeft(net.minecraft.nbt.CompoundTag) -> h
-    2195:2195:net.minecraft.nbt.CompoundTag getShoulderEntityRight() -> ew
-    2199:2200:void setShoulderEntityRight(net.minecraft.nbt.CompoundTag) -> i
-    2203:2203:float getCurrentItemAttackStrengthDelay() -> ex
-    2207:2207:float getAttackStrengthScale(float) -> s
-    2211:2212:void resetAttackStrengthTicker() -> ey
-    2215:2215:net.minecraft.world.item.ItemCooldowns getCooldowns() -> ez
-    2220:2220:float getBlockSpeedFactor() -> ai
-    2224:2224:float getLuck() -> eA
-    2228:2228:boolean canUseGameMasterBlocks() -> eB
-    2233:2234:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
-    2239:2239:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
-    2244:2261:net.minecraft.world.item.ItemStack getProjectile(net.minecraft.world.item.ItemStack) -> f
-    2266:2273:net.minecraft.world.item.ItemStack eat(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack) -> a
-    2064:2067:void lambda$decorateDisplayNameComponent$5(java.lang.String,net.minecraft.network.chat.Style) -> a
-    2021:2028:void lambda$respawnEntityOnShoulder$4(net.minecraft.world.entity.Entity) -> d
-    1449:1449:boolean lambda$startSleepInBed$3(net.minecraft.world.entity.monster.Monster) -> a
-    970:970:void lambda$hurtCurrentlyUsedShield$2(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
-    632:632:void lambda$playShoulderEntityAmbientSound$1(net.minecraft.world.entity.EntityType) -> b
-    632:632:boolean lambda$playShoulderEntityAmbientSound$0(net.minecraft.world.entity.EntityType) -> c
-    132:151:void <clinit>() -> <clinit>
-net.minecraft.world.entity.player.Player$1 -> ayj$1:
+    boolean wasUnderwater -> bI
+    net.minecraft.world.entity.player.Abilities abilities -> bJ
+    int experienceLevel -> bK
+    int totalExperience -> bL
+    float experienceProgress -> bM
+    int enchantmentSeed -> bN
+    float defaultFlySpeed -> bO
+    int lastLevelUpTime -> g
+    com.mojang.authlib.GameProfile gameProfile -> bQ
+    boolean reducedDebugInfo -> bR
+    net.minecraft.world.item.ItemStack lastItemInMainHand -> bS
+    net.minecraft.world.item.ItemCooldowns cooldowns -> bT
+    net.minecraft.world.entity.projectile.FishingHook fishing -> bP
+    156:210:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,com.mojang.authlib.GameProfile) -> <init>
+    213:223:boolean blockActionRestricted(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.GameType) -> a
+    227:231:net.minecraft.world.entity.ai.attributes.AttributeSupplier$Builder createAttributes() -> eo
+    236:244:void defineSynchedData() -> e
+    248:322:void tick() -> j
+    330:330:boolean isSecondaryUseActive() -> ep
+    334:334:boolean wantsToStopRiding() -> eq
+    342:342:boolean isStayingOnGroundSurface() -> er
+    346:347:boolean updateIsUnderwater() -> es
+    351:355:void turtleHelmetTick() -> o
+    358:358:net.minecraft.world.item.ItemCooldowns createItemCooldowns() -> i
+    362:399:void moveCloak() -> p
+    402:436:void updatePlayerPose() -> et
+    440:440:int getPortalWaitTime() -> ae
+    445:445:net.minecraft.sounds.SoundEvent getSwimSound() -> aq
+    450:450:net.minecraft.sounds.SoundEvent getSwimSplashSound() -> ar
+    455:455:net.minecraft.sounds.SoundEvent getSwimHighSpeedSplashSound() -> as
+    460:460:int getDimensionChangingDelay() -> bh
+    466:467:void playSound(net.minecraft.sounds.SoundEvent,float,float) -> a
+    470:470:void playNotifySound(net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
+    474:474:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    479:479:int getFireImmuneTicks() -> cu
+    484:495:void handleEntityEvent(byte) -> a
+    498:504:void addParticlesAroundSelf(net.minecraft.core.particles.ParticleOptions) -> a
+    507:508:void closeContainer() -> m
+    512:527:void rideTick() -> aW
+    531:535:void resetPos() -> Z
+    539:543:void serverAiStep() -> dO
+    547:607:void aiStep() -> k
+    610:618:void playShoulderEntityAmbientSound(net.minecraft.nbt.CompoundTag) -> j
+    621:622:void touch(net.minecraft.world.entity.Entity) -> c
+    625:625:int getScore() -> eu
+    629:630:void setScore(int) -> s
+    633:635:void increaseScore(int) -> t
+    639:661:void die(net.minecraft.world.damagesource.DamageSource) -> a
+    665:670:void dropEquipment() -> dm
+    673:679:void destroyVanishingCursedItems() -> ev
+    683:692:net.minecraft.sounds.SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource) -> e
+    697:697:net.minecraft.sounds.SoundEvent getDeathSound() -> dp
+    701:701:boolean drop(boolean) -> a
+    706:706:net.minecraft.world.entity.item.ItemEntity drop(net.minecraft.world.item.ItemStack,boolean) -> a
+    711:752:net.minecraft.world.entity.item.ItemEntity drop(net.minecraft.world.item.ItemStack,boolean,boolean) -> a
+    756:798:float getDestroySpeed(net.minecraft.world.level.block.state.BlockState) -> c
+    802:802:boolean hasCorrectToolForDrops(net.minecraft.world.level.block.state.BlockState) -> d
+    807:839:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    843:864:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    868:879:boolean isInvulnerableTo(net.minecraft.world.damagesource.DamageSource) -> b
+    884:914:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    919:924:void blockUsingShield(net.minecraft.world.entity.LivingEntity) -> e
+    927:936:boolean canHarmPlayer(net.minecraft.world.entity.player.Player) -> a
+    941:942:void hurtArmor(net.minecraft.world.damagesource.DamageSource,float) -> b
+    946:967:void hurtCurrentlyUsedShield(float) -> m
+    971:997:void actuallyHurt(net.minecraft.world.damagesource.DamageSource,float) -> e
+    1001:1001:boolean onSoulSpeedBlock() -> cO
+    1005:1005:void openTextEdit(net.minecraft.world.level.block.entity.SignBlockEntity) -> a
+    1008:1008:void openMinecartCommandBlock(net.minecraft.world.level.BaseCommandBlock) -> a
+    1011:1011:void openCommandBlock(net.minecraft.world.level.block.entity.CommandBlockEntity) -> a
+    1014:1014:void openStructureBlock(net.minecraft.world.level.block.entity.StructureBlockEntity) -> a
+    1017:1017:void openJigsawBlock(net.minecraft.world.level.block.entity.JigsawBlockEntity) -> a
+    1020:1020:void openHorseInventory(net.minecraft.world.entity.animal.horse.AbstractHorse,net.minecraft.world.Container) -> a
+    1023:1023:java.util.OptionalInt openMenu(net.minecraft.world.MenuProvider) -> a
+    1027:1027:void sendMerchantOffers(int,net.minecraft.world.item.trading.MerchantOffers,int,int,boolean,boolean) -> a
+    1036:1036:void openItemGui(net.minecraft.world.item.ItemStack,net.minecraft.world.InteractionHand) -> a
+    1039:1071:net.minecraft.world.InteractionResult interactOn(net.minecraft.world.entity.Entity,net.minecraft.world.InteractionHand) -> a
+    1076:1076:double getMyRidingOffset() -> aX
+    1081:1084:void removeVehicle() -> bb
+    1088:1088:boolean isImmobile() -> dH
+    1093:1093:boolean isAffectedByFluids() -> cS
+    1102:1151:net.minecraft.world.phys.Vec3 maybeBackOffFromEdge(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.MoverType) -> a
+    1155:1334:void attack(net.minecraft.world.entity.Entity) -> f
+    1338:1339:void doAutoAttackOnTouch(net.minecraft.world.entity.LivingEntity) -> h
+    1342:1353:void disableShield(boolean) -> p
+    1356:1356:void crit(net.minecraft.world.entity.Entity) -> a
+    1359:1359:void magicCrit(net.minecraft.world.entity.Entity) -> b
+    1363:1368:void sweepAttack() -> ew
+    1371:1371:void respawn() -> ex
+    1375:1380:void remove() -> aa
+    1383:1383:boolean isLocalPlayer() -> ey
+    1387:1387:com.mojang.authlib.GameProfile getGameProfile() -> ez
+    1416:1420:com.mojang.datafixers.util.Either startSleepInBed(net.minecraft.core.BlockPos) -> a
+    1431:1438:void stopSleepInBed(boolean,boolean) -> a
+    1442:1443:void stopSleeping() -> em
+    1446:1470:java.util.Optional findRespawnPositionAndUseSpawnBlock(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,boolean,boolean) -> a
+    1475:1475:boolean isSleepingLongEnough() -> eA
+    1479:1479:int getSleepTimer() -> eB
+    1491:1491:void displayClientMessage(net.minecraft.network.chat.Component,boolean) -> a
+    1494:1495:void awardStat(net.minecraft.resources.ResourceLocation) -> a
+    1498:1499:void awardStat(net.minecraft.resources.ResourceLocation,int) -> a
+    1502:1503:void awardStat(net.minecraft.stats.Stat) -> b
+    1506:1506:void awardStat(net.minecraft.stats.Stat,int) -> a
+    1509:1509:void resetStat(net.minecraft.stats.Stat) -> a
+    1512:1512:int awardRecipes(java.util.Collection) -> a
+    1516:1516:void awardRecipesByKey(net.minecraft.resources.ResourceLocation[]) -> a
+    1519:1519:int resetRecipes(java.util.Collection) -> b
+    1524:1532:void jumpFromGround() -> dJ
+    1536:1568:void travel(net.minecraft.world.phys.Vec3) -> f
+    1572:1577:void updateSwimming() -> aF
+    1580:1580:boolean freeAt(net.minecraft.core.BlockPos) -> f
+    1585:1585:float getSpeed() -> dM
+    1589:1638:void checkMovementStatistics(double,double,double) -> o
+    1641:1658:void checkRidingStatistics(double,double,double) -> p
+    1663:1670:boolean causeFallDamage(float,float) -> b
+    1674:1681:boolean tryToStartFallFlying() -> eC
+    1685:1686:void startFallFlying() -> eD
+    1690:1692:void stopFallFlying() -> eE
+    1696:1699:void doWaterSplashEffect() -> aI
+    1703:1706:net.minecraft.sounds.SoundEvent getFallDamageSound(int) -> o
+    1712:1713:void killed(net.minecraft.world.entity.LivingEntity) -> a_
+    1717:1720:void makeStuckInBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.Vec3) -> a
+    1723:1741:void giveExperiencePoints(int) -> d
+    1744:1744:int getEnchantmentSeed() -> eF
+    1748:1755:void onEnchantmentPerformed(net.minecraft.world.item.ItemStack,int) -> a
+    1758:1770:void giveExperienceLevels(int) -> c
+    1773:1779:int getXpNeededForNextLevel() -> eG
+    1791:1798:void causeFoodExhaustion(float) -> q
+    1801:1801:net.minecraft.world.food.FoodData getFoodData() -> eH
+    1805:1805:boolean canEat(boolean) -> q
+    1809:1809:boolean isHurt() -> eI
+    1813:1813:boolean mayBuild() -> eJ
+    1818:1824:boolean mayUseItemAt(net.minecraft.core.BlockPos,net.minecraft.core.Direction,net.minecraft.world.item.ItemStack) -> a
+    1829:1837:int getExperienceReward(net.minecraft.world.entity.player.Player) -> d
+    1843:1843:boolean isAlwaysExperienceDropper() -> cW
+    1848:1848:boolean shouldShowName() -> bX
+    1855:1855:boolean isMovementNoisy() -> ax
+    1859:1859:void onUpdateAbilities() -> t
+    1862:1862:void setGameMode(net.minecraft.world.level.GameType) -> a
+    1866:1866:net.minecraft.network.chat.Component getName() -> P
+    1870:1870:net.minecraft.world.inventory.PlayerEnderChestContainer getEnderChestInventory() -> eK
+    1875:1882:net.minecraft.world.item.ItemStack getItemBySlot(net.minecraft.world.entity.EquipmentSlot) -> b
+    1887:1897:void setItemSlot(net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.ItemStack) -> a
+    1900:1901:boolean addItem(net.minecraft.world.item.ItemStack) -> g
+    1906:1906:java.lang.Iterable getHandSlots() -> bj
+    1911:1911:java.lang.Iterable getArmorSlots() -> bk
+    1915:1930:boolean setEntityOnShoulder(net.minecraft.nbt.CompoundTag) -> g
+    1934:1940:void removeEntitiesOnShoulder() -> eL
+    1943:1954:void respawnEntityOnShoulder(net.minecraft.nbt.CompoundTag) -> k
+    boolean isSpectator() -> a_
+    1961:1961:boolean isSwimming() -> bx
+    boolean isCreative() -> b_
+    1968:1968:boolean isPushedByFluid() -> bU
+    1972:1972:net.minecraft.world.scores.Scoreboard getScoreboard() -> eM
+    1977:1978:net.minecraft.network.chat.Component getDisplayName() -> d
+    1982:1982:net.minecraft.network.chat.Component getDisplayNameWithUuid() -> eN
+    1986:1988:net.minecraft.network.chat.MutableComponent decorateDisplayNameComponent(net.minecraft.network.chat.MutableComponent) -> a
+    1997:1997:java.lang.String getScoreboardName() -> bT
+    2002:2011:float getStandingEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> b
+    2017:2021:void setAbsorptionAmount(float) -> p
+    2025:2025:float getAbsorptionAmount() -> dS
+    2029:2033:java.util.UUID createPlayerUUID(com.mojang.authlib.GameProfile) -> a
+    2037:2037:java.util.UUID createPlayerUUID(java.lang.String) -> c
+    2041:2041:boolean isModelPartShown(net.minecraft.world.entity.player.PlayerModelPart) -> a
+    2046:2090:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
+    2094:2094:boolean isReducedDebugInfo() -> eO
+    2098:2099:void setReducedDebugInfo(boolean) -> r
+    2103:2104:void setRemainingFireTicks(int) -> g
+    2108:2108:net.minecraft.world.entity.HumanoidArm getMainArm() -> dU
+    2112:2113:void setMainArm(net.minecraft.world.entity.HumanoidArm) -> a
+    2116:2116:net.minecraft.nbt.CompoundTag getShoulderEntityLeft() -> eP
+    2120:2121:void setShoulderEntityLeft(net.minecraft.nbt.CompoundTag) -> h
+    2124:2124:net.minecraft.nbt.CompoundTag getShoulderEntityRight() -> eQ
+    2128:2129:void setShoulderEntityRight(net.minecraft.nbt.CompoundTag) -> i
+    2132:2132:float getCurrentItemAttackStrengthDelay() -> eR
+    2136:2136:float getAttackStrengthScale(float) -> r
+    2140:2141:void resetAttackStrengthTicker() -> eS
+    2144:2144:net.minecraft.world.item.ItemCooldowns getCooldowns() -> eT
+    2149:2149:float getBlockSpeedFactor() -> am
+    2153:2153:float getLuck() -> eU
+    2157:2157:boolean canUseGameMasterBlocks() -> eV
+    2162:2163:boolean canTakeItem(net.minecraft.world.item.ItemStack) -> e
+    2168:2168:net.minecraft.world.entity.EntityDimensions getDimensions(net.minecraft.world.entity.Pose) -> a
+    2173:2173:com.google.common.collect.ImmutableList getDismountPoses() -> ei
+    2178:2195:net.minecraft.world.item.ItemStack getProjectile(net.minecraft.world.item.ItemStack) -> f
+    2200:2207:net.minecraft.world.item.ItemStack eat(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack) -> a
+    2212:2212:boolean shouldRemoveSoulSpeed(net.minecraft.world.level.block.state.BlockState) -> b
+    1988:1991:net.minecraft.network.chat.Style lambda$decorateDisplayNameComponent$4(java.lang.String,net.minecraft.network.chat.Style) -> a
+    1945:1952:void lambda$respawnEntityOnShoulder$3(net.minecraft.world.entity.Entity) -> d
+    955:955:void lambda$hurtCurrentlyUsedShield$2(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
+    613:616:void lambda$playShoulderEntityAmbientSound$1(net.minecraft.world.entity.EntityType) -> b
+    612:612:boolean lambda$playShoulderEntityAmbientSound$0(net.minecraft.world.entity.EntityType) -> c
+    134:153:void <clinit>() -> <clinit>
+net.minecraft.world.entity.player.Player$1 -> bec$1:
     int[] $SwitchMap$net$minecraft$world$entity$Pose -> a
-    2078:2078:void <clinit>() -> <clinit>
-net.minecraft.world.entity.player.Player$BedSleepingProblem -> ayj$a:
+    2002:2002:void <clinit>() -> <clinit>
+net.minecraft.world.entity.player.Player$BedSleepingProblem -> bec$a:
     net.minecraft.world.entity.player.Player$BedSleepingProblem NOT_POSSIBLE_HERE -> a
     net.minecraft.world.entity.player.Player$BedSleepingProblem NOT_POSSIBLE_NOW -> b
     net.minecraft.world.entity.player.Player$BedSleepingProblem TOO_FAR_AWAY -> c
@@ -45052,13 +49272,13 @@ net.minecraft.world.entity.player.Player$BedSleepingProblem -> ayj$a:
     net.minecraft.world.entity.player.Player$BedSleepingProblem NOT_SAFE -> f
     net.minecraft.network.chat.Component message -> g
     net.minecraft.world.entity.player.Player$BedSleepingProblem[] $VALUES -> h
-    1394:1394:net.minecraft.world.entity.player.Player$BedSleepingProblem[] values() -> values
-    1394:1394:net.minecraft.world.entity.player.Player$BedSleepingProblem valueOf(java.lang.String) -> valueOf
-    1405:1407:void <init>(java.lang.String,int) -> <init>
-    1409:1411:void <init>(java.lang.String,int,net.minecraft.network.chat.Component) -> <init>
-    1415:1415:net.minecraft.network.chat.Component getMessage() -> a
-    1394:1400:void <clinit>() -> <clinit>
-net.minecraft.world.entity.player.PlayerModelPart -> ayk:
+    1390:1390:net.minecraft.world.entity.player.Player$BedSleepingProblem[] values() -> values
+    1390:1390:net.minecraft.world.entity.player.Player$BedSleepingProblem valueOf(java.lang.String) -> valueOf
+    1401:1403:void <init>(java.lang.String,int) -> <init>
+    1405:1407:void <init>(java.lang.String,int,net.minecraft.network.chat.Component) -> <init>
+    1411:1411:net.minecraft.network.chat.Component getMessage() -> a
+    1390:1396:void <clinit>() -> <clinit>
+net.minecraft.world.entity.player.PlayerModelPart -> bed:
     net.minecraft.world.entity.player.PlayerModelPart CAPE -> a
     net.minecraft.world.entity.player.PlayerModelPart JACKET -> b
     net.minecraft.world.entity.player.PlayerModelPart LEFT_SLEEVE -> c
@@ -45079,7 +49299,7 @@ net.minecraft.world.entity.player.PlayerModelPart -> ayk:
     37:37:java.lang.String getId() -> c
     41:41:net.minecraft.network.chat.Component getName() -> d
     6:13:void <clinit>() -> <clinit>
-net.minecraft.world.entity.player.StackedContents -> ayl:
+net.minecraft.world.entity.player.StackedContents -> bee:
     it.unimi.dsi.fastutil.ints.Int2IntMap contents -> a
     21:23:void <init>() -> <init>
     26:29:void accountSimpleStack(net.minecraft.world.item.ItemStack) -> a
@@ -45098,7 +49318,7 @@ net.minecraft.world.entity.player.StackedContents -> ayl:
     21:21:int access$000(net.minecraft.world.entity.player.StackedContents,int,int) -> a
     21:21:void access$100(net.minecraft.world.entity.player.StackedContents,int,int) -> b
     21:21:boolean access$200(net.minecraft.world.entity.player.StackedContents,int) -> a
-net.minecraft.world.entity.player.StackedContents$RecipePicker -> ayl$a:
+net.minecraft.world.entity.player.StackedContents$RecipePicker -> bee$a:
     net.minecraft.world.item.crafting.Recipe recipe -> b
     java.util.List ingredients -> c
     int ingredientCount -> d
@@ -45123,110 +49343,105 @@ net.minecraft.world.entity.player.StackedContents$RecipePicker -> ayl$a:
     267:267:int getVisitedIndex(boolean,int) -> c
     271:292:int tryPickAll(int,it.unimi.dsi.fastutil.ints.IntList) -> b
     296:306:int getMinIngredientCount() -> b
-net.minecraft.world.entity.player.package-info -> aym:
-net.minecraft.world.entity.projectile.AbstractArrow -> ayn:
-    net.minecraft.network.syncher.EntityDataAccessor ID_FLAGS -> ao
-    net.minecraft.network.syncher.EntityDataAccessor DATA_OWNERUUID_ID -> b
-    net.minecraft.network.syncher.EntityDataAccessor PIERCE_LEVEL -> ap
-    net.minecraft.world.level.block.state.BlockState lastState -> aq
-    boolean inGround -> c
-    int inGroundTime -> d
-    net.minecraft.world.entity.projectile.AbstractArrow$Pickup pickup -> e
-    int shakeTime -> f
-    java.util.UUID ownerUUID -> g
-    int life -> ar
-    int flightTime -> as
-    double baseDamage -> at
-    int knockback -> au
-    net.minecraft.sounds.SoundEvent soundEvent -> av
-    it.unimi.dsi.fastutil.ints.IntOpenHashSet piercingIgnoreEntityIds -> aw
-    java.util.List piercedAndKilledEntities -> ax
-    79:95:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    98:101:void <init>(net.minecraft.world.entity.EntityType,double,double,double,net.minecraft.world.level.Level) -> <init>
-    104:111:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity,net.minecraft.world.level.Level) -> <init>
-    114:114:boolean isInGround() -> f
-    118:119:void setSoundEvent(net.minecraft.sounds.SoundEvent) -> a
-    123:128:boolean shouldRenderAtSqrDistance(double) -> a
-    133:136:void defineSynchedData() -> w_
-    140:150:void shootFromRotation(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-    154:169:void shoot(double,double,double,float,float) -> c
-    173:175:void lerpTo(double,double,double,float,float,int,boolean) -> a
-    179:189:void lerpMotion(double,double,double) -> j
-    193:349:void tick() -> h
-    352:356:void tickDespawn() -> i
-    359:384:void onHit(net.minecraft.world.phys.HitResult) -> a
-    387:393:void resetPiercedEntities() -> w
-    396:506:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
-    509:509:net.minecraft.sounds.SoundEvent getDefaultHitGroundSoundEvent() -> k
-    513:513:net.minecraft.sounds.SoundEvent getHitGroundSoundEvent() -> l
-    517:517:void doPostHurtEffects(net.minecraft.world.entity.LivingEntity) -> a
-    521:521:net.minecraft.world.phys.EntityHitResult findHitEntity(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3) -> a
-    526:543:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    547:574:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    577:582:void setOwner(net.minecraft.world.entity.Entity) -> a
-    586:590:net.minecraft.world.entity.Entity getOwner() -> m
-    595:611:void playerTouch(net.minecraft.world.entity.player.Player) -> b
-    net.minecraft.world.item.ItemStack getPickupItem() -> n
-    617:617:boolean isMovementNoisy() -> at
-    621:622:void setBaseDamage(double) -> h
-    625:625:double getBaseDamage() -> o
-    629:630:void setKnockback(int) -> a
-    633:633:int getKnockback() -> p
-    638:638:boolean isAttackable() -> bA
-    643:643:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
-    647:648:void setCritArrow(boolean) -> a
-    651:652:void setPierceLevel(byte) -> b
-    655:661:void setFlag(int,boolean) -> a
-    664:665:boolean isCritArrow() -> q
-    669:670:boolean shotFromCrossbow() -> r
-    674:674:byte getPierceLevel() -> s
-    678:691:void setEnchantmentEffectsFromEntity(net.minecraft.world.entity.LivingEntity,float) -> a
-    694:694:float getWaterInertia() -> u
-    698:700:void setNoPhysics(boolean) -> n
-    703:706:boolean isNoPhysics() -> v
-    710:711:void setShotFromCrossbow(boolean) -> o
-    715:716:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    521:521:boolean lambda$findHitEntity$0(net.minecraft.world.entity.Entity) -> b
-    68:70:void <clinit>() -> <clinit>
-net.minecraft.world.entity.projectile.AbstractArrow$Pickup -> ayn$a:
+net.minecraft.world.entity.player.package-info -> bef:
+net.minecraft.world.entity.projectile.AbstractArrow -> beg:
+    net.minecraft.network.syncher.EntityDataAccessor ID_FLAGS -> f
+    net.minecraft.network.syncher.EntityDataAccessor PIERCE_LEVEL -> g
+    net.minecraft.world.level.block.state.BlockState lastState -> an
+    boolean inGround -> b
+    int inGroundTime -> c
+    net.minecraft.world.entity.projectile.AbstractArrow$Pickup pickup -> d
+    int shakeTime -> e
+    int life -> ao
+    double baseDamage -> ap
+    int knockback -> aq
+    net.minecraft.sounds.SoundEvent soundEvent -> ar
+    it.unimi.dsi.fastutil.ints.IntOpenHashSet piercingIgnoreEntityIds -> as
+    java.util.List piercedAndKilledEntities -> at
+    76:90:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    93:96:void <init>(net.minecraft.world.entity.EntityType,double,double,double,net.minecraft.world.level.Level) -> <init>
+    99:106:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity,net.minecraft.world.level.Level) -> <init>
+    109:109:boolean isInGround() -> g
+    113:114:void setSoundEvent(net.minecraft.sounds.SoundEvent) -> a
+    118:123:boolean shouldRenderAtSqrDistance(double) -> a
+    128:130:void defineSynchedData() -> e
+    134:136:void shoot(double,double,double,float,float) -> c
+    140:142:void lerpTo(double,double,double,float,float,int,boolean) -> a
+    146:148:void lerpMotion(double,double,double) -> j
+    152:284:void tick() -> j
+    287:287:boolean shouldFall() -> u
+    291:299:void startFalling() -> z
+    303:307:void move(net.minecraft.world.entity.MoverType,net.minecraft.world.phys.Vec3) -> a
+    310:314:void tickDespawn() -> h
+    317:323:void resetPiercedEntities() -> A
+    327:438:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    442:459:void onHitBlock(net.minecraft.world.phys.BlockHitResult) -> a
+    462:462:net.minecraft.sounds.SoundEvent getDefaultHitGroundSoundEvent() -> i
+    466:466:net.minecraft.sounds.SoundEvent getHitGroundSoundEvent() -> k
+    470:470:void doPostHurtEffects(net.minecraft.world.entity.LivingEntity) -> a
+    474:474:net.minecraft.world.phys.EntityHitResult findHitEntity(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3) -> a
+    479:479:boolean canHitEntity(net.minecraft.world.entity.Entity) -> a
+    484:500:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    504:529:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    533:538:void setOwner(net.minecraft.world.entity.Entity) -> b
+    542:558:void playerTouch(net.minecraft.world.entity.player.Player) -> a_
+    net.minecraft.world.item.ItemStack getPickupItem() -> m
+    564:564:boolean isMovementNoisy() -> ax
+    568:569:void setBaseDamage(double) -> h
+    572:572:double getBaseDamage() -> n
+    576:577:void setKnockback(int) -> a
+    580:580:int getKnockback() -> o
+    585:585:boolean isAttackable() -> bH
+    590:590:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
+    594:595:void setCritArrow(boolean) -> a
+    598:599:void setPierceLevel(byte) -> b
+    602:608:void setFlag(int,boolean) -> a
+    611:612:boolean isCritArrow() -> p
+    616:617:boolean shotFromCrossbow() -> q
+    621:621:byte getPierceLevel() -> r
+    625:638:void setEnchantmentEffectsFromEntity(net.minecraft.world.entity.LivingEntity,float) -> a
+    641:641:float getWaterInertia() -> s
+    645:647:void setNoPhysics(boolean) -> o
+    650:653:boolean isNoPhysics() -> t
+    657:658:void setShotFromCrossbow(boolean) -> p
+    662:663:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    66:67:void <clinit>() -> <clinit>
+net.minecraft.world.entity.projectile.AbstractArrow$Pickup -> beg$a:
     net.minecraft.world.entity.projectile.AbstractArrow$Pickup DISALLOWED -> a
     net.minecraft.world.entity.projectile.AbstractArrow$Pickup ALLOWED -> b
     net.minecraft.world.entity.projectile.AbstractArrow$Pickup CREATIVE_ONLY -> c
     net.minecraft.world.entity.projectile.AbstractArrow$Pickup[] $VALUES -> d
-    56:56:net.minecraft.world.entity.projectile.AbstractArrow$Pickup[] values() -> values
-    56:56:net.minecraft.world.entity.projectile.AbstractArrow$Pickup valueOf(java.lang.String) -> valueOf
-    56:56:void <init>(java.lang.String,int) -> <init>
-    60:64:net.minecraft.world.entity.projectile.AbstractArrow$Pickup byOrdinal(int) -> a
-    56:57:void <clinit>() -> <clinit>
-net.minecraft.world.entity.projectile.AbstractHurtingProjectile -> ayo:
-    net.minecraft.world.entity.LivingEntity owner -> b
-    int life -> f
-    int flightTime -> g
-    double xPower -> c
-    double yPower -> d
-    double zPower -> e
-    32:33:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    36:45:void <init>(net.minecraft.world.entity.EntityType,double,double,double,double,double,double,net.minecraft.world.level.Level) -> <init>
-    48:63:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity,double,double,double,net.minecraft.world.level.Level) -> <init>
-    67:67:void defineSynchedData() -> w_
-    71:76:boolean shouldRenderAtSqrDistance(double) -> a
-    81:119:void tick() -> h
-    122:122:boolean shouldBurn() -> M_
-    126:126:net.minecraft.core.particles.ParticleOptions getTrailParticle() -> i
-    130:130:float getInertia() -> k
-    134:140:void onHit(net.minecraft.world.phys.HitResult) -> a
-    144:148:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    152:175:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    179:179:boolean isPickable() -> aK
-    184:184:float getPickRadius() -> aV
-    189:206:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    211:211:float getBrightness() -> aI
-    216:217:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-net.minecraft.world.entity.projectile.Arrow -> ayp:
-    net.minecraft.network.syncher.EntityDataAccessor ID_EFFECT_COLOR -> ao
-    net.minecraft.world.item.alchemy.Potion potion -> ap
-    java.util.Set effects -> aq
-    boolean fixedColor -> ar
+    54:54:net.minecraft.world.entity.projectile.AbstractArrow$Pickup[] values() -> values
+    54:54:net.minecraft.world.entity.projectile.AbstractArrow$Pickup valueOf(java.lang.String) -> valueOf
+    54:54:void <init>(java.lang.String,int) -> <init>
+    58:62:net.minecraft.world.entity.projectile.AbstractArrow$Pickup byOrdinal(int) -> a
+    54:55:void <clinit>() -> <clinit>
+net.minecraft.world.entity.projectile.AbstractHurtingProjectile -> beh:
+    double xPower -> b
+    double yPower -> c
+    double zPower -> d
+    26:27:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    30:41:void <init>(net.minecraft.world.entity.EntityType,double,double,double,double,double,double,net.minecraft.world.level.Level) -> <init>
+    44:47:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity,double,double,double,net.minecraft.world.level.Level) -> <init>
+    51:51:void defineSynchedData() -> e
+    55:60:boolean shouldRenderAtSqrDistance(double) -> a
+    65:102:void tick() -> j
+    106:106:boolean canHitEntity(net.minecraft.world.entity.Entity) -> a
+    110:110:boolean shouldBurn() -> Y_
+    114:114:net.minecraft.core.particles.ParticleOptions getTrailParticle() -> h
+    118:118:float getInertia() -> i
+    123:125:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    129:138:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    142:142:boolean isPickable() -> aQ
+    147:147:float getPickRadius() -> bc
+    152:168:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    173:173:float getBrightness() -> aO
+    178:180:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+net.minecraft.world.entity.projectile.Arrow -> bei:
+    net.minecraft.network.syncher.EntityDataAccessor ID_EFFECT_COLOR -> f
+    net.minecraft.world.item.alchemy.Potion potion -> g
+    java.util.Set effects -> an
+    boolean fixedColor -> ao
     34:40:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     34:44:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
     34:48:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> <init>
@@ -45234,27 +49449,27 @@ net.minecraft.world.entity.projectile.Arrow -> ayp:
     74:78:int getCustomColor(net.minecraft.world.item.ItemStack) -> c
     82:88:void updateColor() -> z
     91:93:void addEffect(net.minecraft.world.effect.MobEffectInstance) -> a
-    97:99:void defineSynchedData() -> w_
-    103:123:void tick() -> h
+    97:99:void defineSynchedData() -> e
+    103:123:void tick() -> j
     126:138:void makeParticle(int) -> b
-    141:141:int getColor() -> w
+    141:141:int getColor() -> u
     145:147:void setFixedColor(int) -> c
     151:166:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     170:184:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     188:198:void doPostHurtEffects(net.minecraft.world.entity.LivingEntity) -> a
-    202:211:net.minecraft.world.item.ItemStack getPickupItem() -> n
+    202:211:net.minecraft.world.item.ItemStack getPickupItem() -> m
     217:231:void handleEntityEvent(byte) -> a
     30:30:void <clinit>() -> <clinit>
-net.minecraft.world.entity.projectile.DragonFireball -> ayq:
+net.minecraft.world.entity.projectile.DragonFireball -> bej:
     24:25:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     28:29:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
     32:33:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,double,double,double) -> <init>
-    37:67:void onHit(net.minecraft.world.phys.HitResult) -> a
-    71:71:boolean isPickable() -> aK
-    76:76:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    81:81:net.minecraft.core.particles.ParticleOptions getTrailParticle() -> i
-    86:86:boolean shouldBurn() -> M_
-net.minecraft.world.entity.projectile.EvokerFangs -> ayr:
+    37:70:void onHit(net.minecraft.world.phys.HitResult) -> a
+    74:74:boolean isPickable() -> aQ
+    79:79:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    84:84:net.minecraft.core.particles.ParticleOptions getTrailParticle() -> h
+    89:89:boolean shouldBurn() -> Y_
+net.minecraft.world.entity.projectile.EvokerFangs -> bek:
     int warmupDelayTicks -> b
     boolean sentSpikeEvent -> c
     int lifeTicks -> d
@@ -45263,17 +49478,17 @@ net.minecraft.world.entity.projectile.EvokerFangs -> ayr:
     java.util.UUID ownerUUID -> g
     29:37:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     40:45:void <init>(net.minecraft.world.level.Level,double,double,double,float,int,net.minecraft.world.entity.LivingEntity) -> <init>
-    49:49:void defineSynchedData() -> w_
+    49:49:void defineSynchedData() -> e
     52:54:void setOwner(net.minecraft.world.entity.LivingEntity) -> a
-    58:65:net.minecraft.world.entity.LivingEntity getOwner() -> f
+    58:65:net.minecraft.world.entity.LivingEntity getOwner() -> g
     70:74:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     78:83:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    87:122:void tick() -> h
-    125:137:void dealDamageTo(net.minecraft.world.entity.LivingEntity) -> c
+    87:122:void tick() -> j
+    125:137:void dealDamageTo(net.minecraft.world.entity.LivingEntity) -> d
     141:149:void handleEntityEvent(byte) -> a
     152:159:float getAnimationProgress(float) -> a
-    164:164:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-net.minecraft.world.entity.projectile.EyeOfEnder -> ays:
+    164:164:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+net.minecraft.world.entity.projectile.EyeOfEnder -> bel:
     net.minecraft.network.syncher.EntityDataAccessor DATA_ITEM_STACK -> b
     double tx -> c
     double ty -> d
@@ -45283,291 +49498,345 @@ net.minecraft.world.entity.projectile.EyeOfEnder -> ays:
     34:35:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     38:42:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
     45:48:void setItem(net.minecraft.world.item.ItemStack) -> b
-    51:51:net.minecraft.world.item.ItemStack getItemRaw() -> i
-    56:57:net.minecraft.world.item.ItemStack getItem() -> f
-    62:63:void defineSynchedData() -> w_
+    51:51:net.minecraft.world.item.ItemStack getItemRaw() -> h
+    56:57:net.minecraft.world.item.ItemStack getItem() -> g
+    62:63:void defineSynchedData() -> e
     67:72:boolean shouldRenderAtSqrDistance(double) -> a
     76:96:void signalTo(net.minecraft.core.BlockPos) -> a
     100:108:void lerpMotion(double,double,double) -> j
-    112:181:void tick() -> h
-    185:189:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    193:195:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    199:199:float getBrightness() -> aI
-    204:204:boolean isAttackable() -> bA
-    209:209:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
+    112:164:void tick() -> j
+    168:172:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    176:178:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    182:182:float getBrightness() -> aO
+    187:187:boolean isAttackable() -> bH
+    192:192:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
     46:46:void lambda$setItem$0(net.minecraft.world.item.ItemStack) -> c
     25:25:void <clinit>() -> <clinit>
-net.minecraft.world.entity.projectile.Fireball -> ayt:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ITEM_STACK -> f
+net.minecraft.world.entity.projectile.Fireball -> bem:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ITEM_STACK -> e
     18:19:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     22:23:void <init>(net.minecraft.world.entity.EntityType,double,double,double,double,double,double,net.minecraft.world.level.Level) -> <init>
     26:27:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity,double,double,double,net.minecraft.world.level.Level) -> <init>
     30:33:void setItem(net.minecraft.world.item.ItemStack) -> b
-    36:36:net.minecraft.world.item.ItemStack getItemRaw() -> l
-    41:42:net.minecraft.world.item.ItemStack getItem() -> f
-    47:48:void defineSynchedData() -> w_
+    36:36:net.minecraft.world.item.ItemStack getItemRaw() -> k
+    41:42:net.minecraft.world.item.ItemStack getItem() -> g
+    47:48:void defineSynchedData() -> e
     52:57:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     61:64:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     31:31:void lambda$setItem$0(net.minecraft.world.item.ItemStack) -> c
     15:15:void <clinit>() -> <clinit>
-net.minecraft.world.entity.projectile.FireworkRocketEntity -> ayu:
+net.minecraft.world.entity.projectile.FireworkRocketEntity -> ben:
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_FIREWORKS_ITEM -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_ATTACHED_TO_TARGET -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_SHOT_AT_ANGLE -> d
     int life -> e
     int lifetime -> f
     net.minecraft.world.entity.LivingEntity attachedToEntity -> g
-    45:46:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    50:53:void defineSynchedData() -> w_
-    57:57:boolean shouldRenderAtSqrDistance(double) -> a
-    62:62:boolean shouldRender(double,double,double) -> i
-    66:84:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.item.ItemStack) -> <init>
-    87:90:void <init>(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity) -> <init>
-    93:95:void <init>(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,double,double,double,boolean) -> <init>
-    99:107:void lerpMotion(double,double,double) -> j
-    111:187:void tick() -> h
-    190:193:void explode() -> k
-    196:210:void performHitChecks(net.minecraft.world.phys.HitResult) -> a
-    213:216:boolean hasExplosion() -> l
-    221:259:void dealExplosionDamage() -> m
-    262:262:boolean isAttachedToEntity() -> n
-    266:266:boolean isShotAtAngle() -> i
-    271:285:void handleEntityEvent(byte) -> a
-    289:296:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    300:311:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    315:316:net.minecraft.world.item.ItemStack getItem() -> f
-    321:321:boolean isAttackable() -> bA
-    326:326:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    331:346:void shoot(double,double,double,float,float) -> c
-    350:369:void shootFromRotation(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-    148:148:boolean lambda$tick$1(net.minecraft.world.entity.Entity) -> a
-    116:120:void lambda$tick$0(int) -> a
-    36:38:void <clinit>() -> <clinit>
-net.minecraft.world.entity.projectile.ItemSupplier -> ayv:
-    net.minecraft.world.item.ItemStack getItem() -> f
-net.minecraft.world.entity.projectile.LargeFireball -> ayw:
-    int explosionPower -> f
+    46:47:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    50:68:void <init>(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.item.ItemStack) -> <init>
+    71:73:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,double,double,double,net.minecraft.world.item.ItemStack) -> <init>
+    76:79:void <init>(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity) -> <init>
+    82:84:void <init>(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,double,double,double,boolean) -> <init>
+    87:89:void <init>(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.Entity,double,double,double,boolean) -> <init>
+    93:96:void defineSynchedData() -> e
+    100:100:boolean shouldRenderAtSqrDistance(double) -> a
+    105:105:boolean shouldRender(double,double,double) -> i
+    110:168:void tick() -> j
+    171:174:void explode() -> i
+    178:181:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    185:191:void onHitBlock(net.minecraft.world.phys.BlockHitResult) -> a
+    194:197:boolean hasExplosion() -> k
+    202:240:void dealExplosionDamage() -> m
+    243:243:boolean isAttachedToEntity() -> n
+    247:247:boolean isShotAtAngle() -> h
+    252:266:void handleEntityEvent(byte) -> a
+    270:278:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    282:294:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    298:299:net.minecraft.world.item.ItemStack getItem() -> g
+    304:304:boolean isAttackable() -> bH
+    309:309:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    115:119:void lambda$tick$0(int) -> a
+    37:39:void <clinit>() -> <clinit>
+net.minecraft.world.entity.projectile.FishingHook -> beo:
+    java.util.Random syncronizedRandom -> b
+    boolean biting -> c
+    int outOfWaterTime -> d
+    net.minecraft.network.syncher.EntityDataAccessor DATA_HOOKED_ENTITY -> e
+    net.minecraft.network.syncher.EntityDataAccessor DATA_BITING -> f
+    int life -> g
+    int nibble -> an
+    int timeUntilLured -> ao
+    int timeUntilHooked -> ap
+    float fishAngle -> aq
+    boolean openWater -> ar
+    net.minecraft.world.entity.Entity hookedIn -> as
+    net.minecraft.world.entity.projectile.FishingHook$FishHookState currentState -> at
+    int luck -> au
+    int lureSpeed -> av
+    50:81:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,int,int) -> <init>
+    84:89:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,double,double,double) -> <init>
+    92:126:void <init>(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,int,int) -> <init>
+    130:132:void defineSynchedData() -> e
+    136:148:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    152:153:boolean shouldRenderAtSqrDistance(double) -> a
+    159:159:void lerpTo(double,double,double,float,float,int,boolean) -> a
+    164:272:void tick() -> j
+    275:283:boolean shouldStopFishing(net.minecraft.world.entity.player.Player) -> a
+    287:289:void checkCollision() -> m
+    293:293:boolean canHitEntity(net.minecraft.world.entity.Entity) -> a
+    298:303:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    307:309:void onHitBlock(net.minecraft.world.phys.BlockHitResult) -> a
+    312:313:void setHookedEntity() -> n
+    316:401:void catchingFish(net.minecraft.core.BlockPos) -> a
+    408:426:boolean calculateOpenWater(net.minecraft.core.BlockPos) -> b
+    430:430:net.minecraft.world.entity.projectile.FishingHook$OpenWaterType getOpenWaterTypeForArea(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    434:442:net.minecraft.world.entity.projectile.FishingHook$OpenWaterType getOpenWaterTypeForBlock(net.minecraft.core.BlockPos) -> c
+    446:446:boolean isOpenWaterFishing() -> g
+    451:451:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    455:455:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    458:505:int retrieve(net.minecraft.world.item.ItemStack) -> b
+    510:517:void handleEntityEvent(byte) -> a
+    520:532:void bringInHookedEntity() -> h
+    536:536:boolean isMovementNoisy() -> ax
+    541:546:void remove() -> aa
+    550:551:net.minecraft.world.entity.player.Player getPlayerOwner() -> i
+    556:556:net.minecraft.world.entity.Entity getHookedIn() -> k
+    561:561:boolean canChangeDimensions() -> bK
+    566:567:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    430:430:net.minecraft.world.entity.projectile.FishingHook$OpenWaterType lambda$getOpenWaterTypeForArea$0(net.minecraft.world.entity.projectile.FishingHook$OpenWaterType,net.minecraft.world.entity.projectile.FishingHook$OpenWaterType) -> a
+    58:59:void <clinit>() -> <clinit>
+net.minecraft.world.entity.projectile.FishingHook$1 -> beo$1:
+    int[] $SwitchMap$net$minecraft$world$entity$projectile$FishingHook$OpenWaterType -> a
+    411:411:void <clinit>() -> <clinit>
+net.minecraft.world.entity.projectile.FishingHook$FishHookState -> beo$a:
+    net.minecraft.world.entity.projectile.FishingHook$FishHookState FLYING -> a
+    net.minecraft.world.entity.projectile.FishingHook$FishHookState HOOKED_IN_ENTITY -> b
+    net.minecraft.world.entity.projectile.FishingHook$FishHookState BOBBING -> c
+    net.minecraft.world.entity.projectile.FishingHook$FishHookState[] $VALUES -> d
+    54:54:net.minecraft.world.entity.projectile.FishingHook$FishHookState[] values() -> values
+    54:54:net.minecraft.world.entity.projectile.FishingHook$FishHookState valueOf(java.lang.String) -> valueOf
+    54:54:void <init>(java.lang.String,int) -> <init>
+    54:54:void <clinit>() -> <clinit>
+net.minecraft.world.entity.projectile.FishingHook$OpenWaterType -> beo$b:
+    net.minecraft.world.entity.projectile.FishingHook$OpenWaterType ABOVE_WATER -> a
+    net.minecraft.world.entity.projectile.FishingHook$OpenWaterType INSIDE_WATER -> b
+    net.minecraft.world.entity.projectile.FishingHook$OpenWaterType INVALID -> c
+    net.minecraft.world.entity.projectile.FishingHook$OpenWaterType[] $VALUES -> d
+    403:403:net.minecraft.world.entity.projectile.FishingHook$OpenWaterType[] values() -> values
+    403:403:net.minecraft.world.entity.projectile.FishingHook$OpenWaterType valueOf(java.lang.String) -> valueOf
+    403:403:void <init>(java.lang.String,int) -> <init>
+    403:404:void <clinit>() -> <clinit>
+net.minecraft.world.entity.projectile.ItemSupplier -> bep:
+    net.minecraft.world.item.ItemStack getItem() -> g
+net.minecraft.world.entity.projectile.LargeFireball -> beq:
+    int explosionPower -> e
     16:20:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     16:24:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
     16:28:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,double,double,double) -> <init>
-    32:43:void onHit(net.minecraft.world.phys.HitResult) -> a
-    47:49:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    53:57:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-net.minecraft.world.entity.projectile.LlamaSpit -> ayx:
-    net.minecraft.world.entity.animal.horse.Llama owner -> b
-    net.minecraft.nbt.CompoundTag ownerTag -> c
-    28:29:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    32:35:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.animal.horse.Llama) -> <init>
-    38:47:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
-    51:108:void tick() -> h
-    112:121:void lerpMotion(double,double,double) -> j
-    125:138:void shoot(double,double,double,float,float) -> c
-    143:143:void shootFromRotation(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-    146:155:void onHit(net.minecraft.world.phys.HitResult) -> a
-    159:159:void defineSynchedData() -> w_
-    163:166:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    170:176:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    180:194:void restoreOwnerFromSave() -> f
-    198:198:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    58:58:boolean lambda$tick$0(net.minecraft.world.entity.Entity) -> a
-net.minecraft.world.entity.projectile.Projectile -> ayy:
-    void shoot(double,double,double,float,float) -> c
-    void shootFromRotation(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-net.minecraft.world.entity.projectile.ProjectileUtil -> ayz:
-    27:27:void <init>() -> <init>
-    32:32:net.minecraft.world.phys.HitResult forwardsRaycast(net.minecraft.world.entity.Entity,boolean,boolean,net.minecraft.world.entity.Entity,net.minecraft.world.level.ClipContext$Block) -> a
-    36:36:net.minecraft.world.phys.HitResult getHitResult(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate,net.minecraft.world.level.ClipContext$Block,boolean) -> a
-    41:41:net.minecraft.world.phys.EntityHitResult getHitResult(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
-    45:68:net.minecraft.world.phys.HitResult forwardsRaycast(net.minecraft.world.entity.Entity,boolean,boolean,net.minecraft.world.entity.Entity,net.minecraft.world.level.ClipContext$Block,boolean,java.util.function.Predicate,net.minecraft.world.phys.AABB) -> a
-    73:110:net.minecraft.world.phys.EntityHitResult getEntityHitResult(net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,java.util.function.Predicate,double) -> a
-    115:133:net.minecraft.world.phys.EntityHitResult getHitResult(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,java.util.function.Predicate,double) -> a
-    137:138:java.util.Set getIgnoredEntities(net.minecraft.world.entity.Entity) -> a
-    148:170:void rotateTowardsMovement(net.minecraft.world.entity.Entity,float) -> a
-    173:173:net.minecraft.world.InteractionHand getWeaponHoldingHand(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.Item) -> a
-    177:187:net.minecraft.world.entity.projectile.AbstractArrow getMobArrow(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,float) -> a
-    32:32:boolean lambda$forwardsRaycast$0(boolean,net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
-net.minecraft.world.entity.projectile.ShulkerBullet -> aza:
-    net.minecraft.world.entity.LivingEntity owner -> b
-    net.minecraft.world.entity.Entity finalTarget -> c
-    net.minecraft.core.Direction currentMoveDirection -> d
-    int flightSteps -> e
-    double targetDeltaX -> f
-    double targetDeltaY -> g
-    double targetDeltaZ -> ao
-    java.util.UUID ownerId -> ap
-    net.minecraft.core.BlockPos lastKnownOwnerPos -> aq
-    java.util.UUID targetId -> ar
-    net.minecraft.core.BlockPos lastKnownTargetPos -> as
-    57:60:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    63:68:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
-    71:85:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity,net.minecraft.core.Direction$Axis) -> <init>
-    89:89:net.minecraft.sounds.SoundSource getSoundSource() -> cl
-    94:119:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    123:140:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    144:144:void defineSynchedData() -> w_
-    148:148:net.minecraft.core.Direction getMoveDirection() -> f
-    152:153:void setMoveDirection(net.minecraft.core.Direction) -> a
-    157:231:void selectNextMoveDirection(net.minecraft.core.Direction$Axis) -> a
-    235:238:void checkDespawn() -> cy
-    242:323:void tick() -> h
-    327:327:boolean isOnFire() -> bf
-    332:332:boolean shouldRenderAtSqrDistance(double) -> a
-    337:337:float getBrightness() -> aI
-    341:355:void onHit(net.minecraft.world.phys.HitResult) -> a
-    359:359:boolean isPickable() -> aK
-    364:369:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    374:374:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-net.minecraft.world.entity.projectile.SmallFireball -> azb:
+    32:38:void onHit(net.minecraft.world.phys.HitResult) -> a
+    42:50:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    54:56:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    60:64:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+net.minecraft.world.entity.projectile.LlamaSpit -> ber:
+    22:23:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    26:29:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.animal.horse.Llama) -> <init>
+    32:41:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    45:79:void tick() -> j
+    83:88:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    92:97:void onHitBlock(net.minecraft.world.phys.BlockHitResult) -> a
+    101:101:void defineSynchedData() -> e
+    105:105:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+net.minecraft.world.entity.projectile.Projectile -> bes:
+    java.util.UUID ownerUUID -> b
+    int ownerNetworkId -> c
+    boolean leftOwner -> d
+    24:25:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    28:32:void setOwner(net.minecraft.world.entity.Entity) -> b
+    36:41:net.minecraft.world.entity.Entity getOwner() -> v
+    46:52:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    56:60:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    64:69:void tick() -> j
+    72:80:boolean checkLeftOwner() -> h
+    84:98:void shoot(double,double,double,float,float) -> c
+    101:113:void shootFromRotation(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
+    116:122:void onHit(net.minecraft.world.phys.HitResult) -> a
+    124:124:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    127:130:void onHitBlock(net.minecraft.world.phys.BlockHitResult) -> a
+    134:143:void lerpMotion(double,double,double) -> j
+    146:150:boolean canHitEntity(net.minecraft.world.entity.Entity) -> a
+    154:159:void updateRotation() -> x
+    162:168:float lerpRotation(float,float) -> e
+    74:74:boolean lambda$checkLeftOwner$0(net.minecraft.world.entity.Entity) -> c
+net.minecraft.world.entity.projectile.ProjectileUtil -> bet:
+    22:22:void <init>() -> <init>
+    27:43:net.minecraft.world.phys.HitResult getHitResult(net.minecraft.world.entity.Entity,java.util.function.Predicate,net.minecraft.world.level.ClipContext$Block) -> a
+    48:85:net.minecraft.world.phys.EntityHitResult getEntityHitResult(net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,java.util.function.Predicate,double) -> a
+    90:108:net.minecraft.world.phys.EntityHitResult getEntityHitResult(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
+    118:144:void rotateTowardsMovement(net.minecraft.world.entity.Entity,float) -> a
+    147:147:net.minecraft.world.InteractionHand getWeaponHoldingHand(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.Item) -> a
+    151:161:net.minecraft.world.entity.projectile.AbstractArrow getMobArrow(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,float) -> a
+net.minecraft.world.entity.projectile.ShulkerBullet -> beu:
+    net.minecraft.world.entity.Entity finalTarget -> b
+    net.minecraft.core.Direction currentMoveDirection -> c
+    int flightSteps -> d
+    double targetDeltaX -> e
+    double targetDeltaY -> f
+    double targetDeltaZ -> g
+    java.util.UUID targetId -> an
+    51:54:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    57:62:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
+    65:79:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity,net.minecraft.core.Direction$Axis) -> <init>
+    83:83:net.minecraft.sounds.SoundSource getSoundSource() -> ct
+    88:99:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    103:114:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    118:118:void defineSynchedData() -> e
+    122:122:net.minecraft.core.Direction getMoveDirection() -> g
+    126:127:void setMoveDirection(net.minecraft.core.Direction) -> a
+    131:205:void selectNextMoveDirection(net.minecraft.core.Direction$Axis) -> a
+    209:212:void checkDespawn() -> cH
+    216:283:void tick() -> j
+    287:287:boolean canHitEntity(net.minecraft.world.entity.Entity) -> a
+    292:292:boolean isOnFire() -> bm
+    297:297:boolean shouldRenderAtSqrDistance(double) -> a
+    302:302:float getBrightness() -> aO
+    307:318:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    322:325:void onHitBlock(net.minecraft.world.phys.BlockHitResult) -> a
+    329:331:void onHit(net.minecraft.world.phys.HitResult) -> a
+    335:335:boolean isPickable() -> aQ
+    340:345:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    350:350:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+net.minecraft.world.entity.projectile.SmallFireball -> bev:
     18:19:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     22:23:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,double,double,double) -> <init>
     26:27:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
-    31:58:void onHit(net.minecraft.world.phys.HitResult) -> a
-    62:62:boolean isPickable() -> aK
-    67:67:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-net.minecraft.world.entity.projectile.Snowball -> azc:
+    31:47:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    51:61:void onHitBlock(net.minecraft.world.phys.BlockHitResult) -> a
+    65:69:void onHit(net.minecraft.world.phys.HitResult) -> a
+    73:73:boolean isPickable() -> aQ
+    78:78:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+net.minecraft.world.entity.projectile.Snowball -> bew:
     21:22:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     25:26:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> <init>
     29:30:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    34:34:net.minecraft.world.item.Item getDefaultItem() -> i
-    38:39:net.minecraft.core.particles.ParticleOptions getParticle() -> n
+    34:34:net.minecraft.world.item.Item getDefaultItem() -> h
+    38:39:net.minecraft.core.particles.ParticleOptions getParticle() -> m
     44:50:void handleEntityEvent(byte) -> a
-    54:64:void onHit(net.minecraft.world.phys.HitResult) -> a
-net.minecraft.world.entity.projectile.SpectralArrow -> azd:
-    int duration -> ao
+    54:59:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    63:69:void onHit(net.minecraft.world.phys.HitResult) -> a
+net.minecraft.world.entity.projectile.SpectralArrow -> bex:
+    int duration -> f
     15:19:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     15:23:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> <init>
     15:27:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    31:36:void tick() -> h
-    40:40:net.minecraft.world.item.ItemStack getPickupItem() -> n
+    31:36:void tick() -> j
+    40:40:net.minecraft.world.item.ItemStack getPickupItem() -> m
     45:49:void doPostHurtEffects(net.minecraft.world.entity.LivingEntity) -> a
     53:57:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     61:63:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-net.minecraft.world.entity.projectile.ThrowableItemProjectile -> aze:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ITEM_STACK -> e
+net.minecraft.world.entity.projectile.ThrowableItemProjectile -> bey:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ITEM_STACK -> b
     18:19:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     22:23:void <init>(net.minecraft.world.entity.EntityType,double,double,double,net.minecraft.world.level.Level) -> <init>
     26:27:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity,net.minecraft.world.level.Level) -> <init>
     30:33:void setItem(net.minecraft.world.item.ItemStack) -> b
-    net.minecraft.world.item.Item getDefaultItem() -> i
-    38:38:net.minecraft.world.item.ItemStack getItemRaw() -> k
-    43:44:net.minecraft.world.item.ItemStack getItem() -> f
-    49:50:void defineSynchedData() -> w_
+    net.minecraft.world.item.Item getDefaultItem() -> h
+    38:38:net.minecraft.world.item.ItemStack getItemRaw() -> i
+    43:44:net.minecraft.world.item.ItemStack getItem() -> g
+    49:50:void defineSynchedData() -> e
     54:59:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     63:66:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     31:31:void lambda$setItem$0(net.minecraft.world.item.ItemStack) -> c
     15:15:void <clinit>() -> <clinit>
-net.minecraft.world.entity.projectile.ThrowableProjectile -> azf:
-    int xBlock -> e
-    int yBlock -> f
-    int zBlock -> g
-    boolean inGround -> b
-    int shakeTime -> c
-    net.minecraft.world.entity.LivingEntity owner -> d
-    java.util.UUID ownerId -> ao
-    net.minecraft.world.entity.Entity entityToIgnore -> ap
-    int timeToIgnore -> aq
-    26:38:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    41:44:void <init>(net.minecraft.world.entity.EntityType,double,double,double,net.minecraft.world.level.Level) -> <init>
-    47:51:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity,net.minecraft.world.level.Level) -> <init>
-    55:60:boolean shouldRenderAtSqrDistance(double) -> a
-    65:76:void shootFromRotation(net.minecraft.world.entity.Entity,float,float,float,float,float) -> a
-    80:94:void shoot(double,double,double,float,float) -> c
-    98:107:void lerpMotion(double,double,double) -> j
-    111:202:void tick() -> h
-    205:205:float getGravity() -> l
-    void onHit(net.minecraft.world.phys.HitResult) -> a
-    212:222:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    226:235:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    239:247:net.minecraft.world.entity.LivingEntity getOwner() -> m
-    252:252:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    141:141:boolean lambda$tick$1(net.minecraft.world.entity.Entity) -> a
-    129:129:boolean lambda$tick$0(net.minecraft.world.entity.Entity) -> b
-net.minecraft.world.entity.projectile.ThrownEgg -> azg:
+net.minecraft.world.entity.projectile.ThrowableProjectile -> bez:
+    21:22:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    25:28:void <init>(net.minecraft.world.entity.EntityType,double,double,double,net.minecraft.world.level.Level) -> <init>
+    31:34:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.entity.LivingEntity,net.minecraft.world.level.Level) -> <init>
+    38:43:boolean shouldRenderAtSqrDistance(double) -> a
+    48:97:void tick() -> j
+    100:100:float getGravity() -> k
+    105:105:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+net.minecraft.world.entity.projectile.ThrownEgg -> bfa:
     18:19:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     22:23:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> <init>
     26:27:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
     31:37:void handleEntityEvent(byte) -> a
-    41:63:void onHit(net.minecraft.world.phys.HitResult) -> a
-    67:67:net.minecraft.world.item.Item getDefaultItem() -> i
-net.minecraft.world.entity.projectile.ThrownEnderpearl -> azh:
-    net.minecraft.world.entity.LivingEntity originalOwner -> e
-    30:31:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    34:36:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> <init>
-    39:40:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    44:44:net.minecraft.world.item.Item getDefaultItem() -> i
-    49:107:void onHit(net.minecraft.world.phys.HitResult) -> a
-    111:117:void tick() -> h
-    122:125:net.minecraft.world.entity.Entity changeDimension(net.minecraft.world.level.dimension.DimensionType) -> a
-net.minecraft.world.entity.projectile.ThrownExperienceBottle -> azi:
-    17:18:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    21:22:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> <init>
-    25:26:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    30:30:net.minecraft.world.item.Item getDefaultItem() -> i
-    35:35:float getGravity() -> l
-    40:52:void onHit(net.minecraft.world.phys.HitResult) -> a
-net.minecraft.world.entity.projectile.ThrownPotion -> azj:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ITEM_STACK -> f
-    org.apache.logging.log4j.Logger LOGGER -> g
-    java.util.function.Predicate WATER_SENSITIVE -> e
-    50:51:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    54:55:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> <init>
-    58:59:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    63:64:void defineSynchedData() -> w_
-    68:77:net.minecraft.world.item.ItemStack getItem() -> f
-    81:82:void setItem(net.minecraft.world.item.ItemStack) -> b
-    86:86:float getGravity() -> l
-    91:124:void onHit(net.minecraft.world.phys.HitResult) -> a
-    127:137:void applyWater() -> i
-    140:169:void applySplash(java.util.List,net.minecraft.world.entity.Entity) -> a
-    172:189:void makeAreaOfEffectCloud(net.minecraft.world.item.ItemStack,net.minecraft.world.item.alchemy.Potion) -> a
-    192:192:boolean isLingering() -> k
-    196:204:void dowseFire(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    208:216:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    220:225:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    228:228:boolean isWaterSensitiveEntity(net.minecraft.world.entity.LivingEntity) -> a
-    45:47:void <clinit>() -> <clinit>
-net.minecraft.world.entity.projectile.ThrownTrident -> azk:
-    net.minecraft.network.syncher.EntityDataAccessor ID_LOYALTY -> ap
-    net.minecraft.network.syncher.EntityDataAccessor ID_FOIL -> aq
-    net.minecraft.world.item.ItemStack tridentItem -> ar
-    boolean dealtDamage -> as
-    int clientSideReturnTridentTickCount -> ao
+    41:43:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    47:67:void onHit(net.minecraft.world.phys.HitResult) -> a
+    71:71:net.minecraft.world.item.Item getDefaultItem() -> h
+net.minecraft.world.entity.projectile.ThrownEnderpearl -> bfb:
+    23:24:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    27:28:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> <init>
+    31:32:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    36:36:net.minecraft.world.item.Item getDefaultItem() -> h
+    41:43:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    47:80:void onHit(net.minecraft.world.phys.HitResult) -> a
+    84:90:void tick() -> j
+    95:99:net.minecraft.world.entity.Entity changeDimension(net.minecraft.server.level.ServerLevel) -> a
+net.minecraft.world.entity.projectile.ThrownExperienceBottle -> bfc:
+    16:17:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    20:21:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> <init>
+    24:25:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    29:29:net.minecraft.world.item.Item getDefaultItem() -> h
+    34:34:float getGravity() -> k
+    39:53:void onHit(net.minecraft.world.phys.HitResult) -> a
+net.minecraft.world.entity.projectile.ThrownPotion -> bfd:
+    java.util.function.Predicate WATER_SENSITIVE -> b
+    43:44:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    47:48:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> <init>
+    51:52:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    56:56:net.minecraft.world.item.Item getDefaultItem() -> h
+    61:61:float getGravity() -> k
+    66:85:void onHitBlock(net.minecraft.world.phys.BlockHitResult) -> a
+    89:112:void onHit(net.minecraft.world.phys.HitResult) -> a
+    115:125:void applyWater() -> m
+    128:157:void applySplash(java.util.List,net.minecraft.world.entity.Entity) -> a
+    160:180:void makeAreaOfEffectCloud(net.minecraft.world.item.ItemStack,net.minecraft.world.item.alchemy.Potion) -> a
+    183:183:boolean isLingering() -> n
+    187:195:void dowseFire(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    40:40:void <clinit>() -> <clinit>
+net.minecraft.world.entity.projectile.ThrownTrident -> bfe:
+    net.minecraft.network.syncher.EntityDataAccessor ID_LOYALTY -> g
+    net.minecraft.network.syncher.EntityDataAccessor ID_FOIL -> an
+    net.minecraft.world.item.ItemStack tridentItem -> ao
+    boolean dealtDamage -> ap
+    int clientSideReturnTridentTickCount -> f
     33:40:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     33:47:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> <init>
     33:51:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    55:59:void defineSynchedData() -> w_
-    63:94:void tick() -> h
+    55:59:void defineSynchedData() -> e
+    63:94:void tick() -> j
     97:104:boolean isAcceptibleReturnOwner() -> z
-    109:109:net.minecraft.world.item.ItemStack getPickupItem() -> n
-    113:113:boolean isFoil() -> w
+    109:109:net.minecraft.world.item.ItemStack getPickupItem() -> m
+    113:113:boolean isFoil() -> u
     119:122:net.minecraft.world.phys.EntityHitResult findHitEntity(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3) -> a
-    127:169:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
-    173:173:net.minecraft.sounds.SoundEvent getDefaultHitGroundSoundEvent() -> k
-    178:184:void playerTouch(net.minecraft.world.entity.player.Player) -> b
-    188:196:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    200:204:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    208:213:void tickDespawn() -> i
-    217:217:float getWaterInertia() -> u
-    222:222:boolean shouldRender(double,double,double) -> i
+    127:170:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    174:174:net.minecraft.sounds.SoundEvent getDefaultHitGroundSoundEvent() -> i
+    179:185:void playerTouch(net.minecraft.world.entity.player.Player) -> a_
+    189:197:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    201:205:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    209:214:void tickDespawn() -> h
+    218:218:float getWaterInertia() -> s
+    223:223:boolean shouldRender(double,double,double) -> i
     30:31:void <clinit>() -> <clinit>
-net.minecraft.world.entity.projectile.WitherSkull -> azl:
-    net.minecraft.network.syncher.EntityDataAccessor DATA_DANGEROUS -> f
+net.minecraft.world.entity.projectile.WitherSkull -> bff:
+    net.minecraft.network.syncher.EntityDataAccessor DATA_DANGEROUS -> e
     29:30:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     33:34:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,double,double,double) -> <init>
     37:38:void <init>(net.minecraft.world.level.Level,double,double,double,double,double,double) -> <init>
-    42:42:float getInertia() -> k
-    47:47:boolean isOnFire() -> bf
+    42:42:float getInertia() -> i
+    47:47:boolean isOnFire() -> bm
     52:56:float getBlockExplosionResistance(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState,float) -> a
-    61:92:void onHit(net.minecraft.world.phys.HitResult) -> a
-    96:96:boolean isPickable() -> aK
-    101:101:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    106:107:void defineSynchedData() -> w_
-    110:110:boolean isDangerous() -> l
-    114:115:void setDangerous(boolean) -> a
-    119:119:boolean shouldBurn() -> M_
+    61:90:void onHitEntity(net.minecraft.world.phys.EntityHitResult) -> a
+    94:100:void onHit(net.minecraft.world.phys.HitResult) -> a
+    104:104:boolean isPickable() -> aQ
+    109:109:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    114:115:void defineSynchedData() -> e
+    118:118:boolean isDangerous() -> k
+    122:123:void setDangerous(boolean) -> a
+    127:127:boolean shouldBurn() -> Y_
     26:26:void <clinit>() -> <clinit>
-net.minecraft.world.entity.projectile.package-info -> azm:
-net.minecraft.world.entity.raid.Raid -> azn:
+net.minecraft.world.entity.projectile.package-info -> bfg:
+net.minecraft.world.entity.raid.Raid -> bfh:
     net.minecraft.network.chat.TranslatableComponent RAID_NAME_COMPONENT -> a
     net.minecraft.network.chat.TranslatableComponent VICTORY -> b
     net.minecraft.network.chat.TranslatableComponent DEFEAT -> c
@@ -45593,45 +49862,45 @@ net.minecraft.world.entity.raid.Raid -> azn:
     net.minecraft.world.entity.raid.Raid$RaidStatus status -> w
     int celebrationTicks -> x
     java.util.Optional waveSpawnPos -> y
-    137:169:void <init>(int,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> <init>
-    137:195:void <init>(net.minecraft.server.level.ServerLevel,net.minecraft.nbt.CompoundTag) -> <init>
-    198:198:boolean isOver() -> a
-    202:202:boolean isBetweenWaves() -> b
-    206:206:boolean hasFirstWaveSpawned() -> c
-    210:210:boolean isStopped() -> d
-    214:214:boolean isVictory() -> e
-    218:218:boolean isLoss() -> f
-    222:222:float getTotalHealth() -> g
-    226:230:java.util.Set getAllRaiders() -> h
-    234:234:net.minecraft.world.level.Level getLevel() -> i
-    238:238:boolean isStarted() -> j
-    242:242:int getGroupsSpawned() -> k
-    249:249:java.util.function.Predicate validPlayer() -> x
-    256:270:void updatePlayers() -> y
-    273:273:int getMaxBadOmenLevel() -> l
-    277:277:int getBadOmenLevel() -> m
-    281:282:void setBadOmenLevel(int) -> a
-    285:290:void absorbBadOmen(net.minecraft.world.entity.player.Player) -> a
-    293:296:void stop() -> n
-    299:467:void tick() -> o
-    470:477:void moveRaidCenterToNearbyVillageSection() -> z
-    480:486:java.util.Optional getValidSpawnPos(int) -> d
-    490:493:boolean hasMoreWaves() -> A
-    497:497:boolean isFinalWave() -> B
-    501:501:boolean hasBonusWave() -> C
-    505:505:boolean hasSpawnedBonusWave() -> D
-    509:509:boolean shouldSpawnBonusGroup() -> E
-    513:549:void updateRaiders() -> F
-    552:568:void playSound(net.minecraft.core.BlockPos) -> a
-    571:619:void spawnGroup(net.minecraft.core.BlockPos) -> b
-    622:638:void joinRaid(int,net.minecraft.world.entity.raid.Raider,net.minecraft.core.BlockPos,boolean) -> a
-    641:642:void updateBossbar() -> p
-    645:651:float getHealthOfLivingRaiders() -> q
-    655:655:boolean shouldSpawnGroup() -> G
-    659:659:int getTotalRaidersAlive() -> r
-    663:677:void removeFromRaid(net.minecraft.world.entity.raid.Raider,boolean) -> a
-    680:681:void setDirty() -> H
-    684:702:net.minecraft.world.item.ItemStack getLeaderBannerInstance() -> s
+    138:170:void <init>(int,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> <init>
+    138:194:void <init>(net.minecraft.server.level.ServerLevel,net.minecraft.nbt.CompoundTag) -> <init>
+    197:197:boolean isOver() -> a
+    201:201:boolean isBetweenWaves() -> b
+    205:205:boolean hasFirstWaveSpawned() -> c
+    209:209:boolean isStopped() -> d
+    213:213:boolean isVictory() -> e
+    217:217:boolean isLoss() -> f
+    221:221:float getTotalHealth() -> g
+    225:229:java.util.Set getAllRaiders() -> h
+    233:233:net.minecraft.world.level.Level getLevel() -> i
+    237:237:boolean isStarted() -> j
+    241:241:int getGroupsSpawned() -> k
+    248:248:java.util.function.Predicate validPlayer() -> x
+    255:269:void updatePlayers() -> y
+    272:272:int getMaxBadOmenLevel() -> l
+    276:276:int getBadOmenLevel() -> m
+    280:281:void setBadOmenLevel(int) -> a
+    284:289:void absorbBadOmen(net.minecraft.world.entity.player.Player) -> a
+    292:295:void stop() -> n
+    298:466:void tick() -> o
+    469:476:void moveRaidCenterToNearbyVillageSection() -> z
+    479:485:java.util.Optional getValidSpawnPos(int) -> d
+    489:492:boolean hasMoreWaves() -> A
+    496:496:boolean isFinalWave() -> B
+    500:500:boolean hasBonusWave() -> C
+    504:504:boolean hasSpawnedBonusWave() -> D
+    508:508:boolean shouldSpawnBonusGroup() -> E
+    512:548:void updateRaiders() -> F
+    551:567:void playSound(net.minecraft.core.BlockPos) -> a
+    570:618:void spawnGroup(net.minecraft.core.BlockPos) -> b
+    621:637:void joinRaid(int,net.minecraft.world.entity.raid.Raider,net.minecraft.core.BlockPos,boolean) -> a
+    640:641:void updateBossbar() -> p
+    644:650:float getHealthOfLivingRaiders() -> q
+    654:654:boolean shouldSpawnGroup() -> G
+    658:658:int getTotalRaidersAlive() -> r
+    662:676:void removeFromRaid(net.minecraft.world.entity.raid.Raider,boolean) -> a
+    679:680:void setDirty() -> H
+    683:702:net.minecraft.world.item.ItemStack getLeaderBannerInstance() -> s
     707:707:net.minecraft.world.entity.raid.Raider getLeader(int) -> b
     712:749:net.minecraft.core.BlockPos findRandomSpawnPos(int,int) -> a
     753:753:boolean addWaveMob(int,net.minecraft.world.entity.raid.Raider) -> b
@@ -45644,33 +49913,33 @@ net.minecraft.world.entity.raid.Raid -> azn:
     807:807:int getDefaultNumSpawns(net.minecraft.world.entity.raid.Raid$RaiderType,int,boolean) -> a
     812:842:int getPotentialBonusSpawns(net.minecraft.world.entity.raid.Raid$RaiderType,java.util.Random,int,net.minecraft.world.DifficultyInstance,boolean) -> a
     846:846:boolean isActive() -> v
-    850:874:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
-    878:886:int getNumGroups(net.minecraft.world.Difficulty) -> a
-    891:904:float getEnchantOdds() -> w
-    908:909:void addHeroOfTheVillage(net.minecraft.world.entity.Entity) -> a
+    850:872:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    876:884:int getNumGroups(net.minecraft.world.Difficulty) -> a
+    889:902:float getEnchantOdds() -> w
+    906:907:void addHeroOfTheVillage(net.minecraft.world.entity.Entity) -> a
     757:757:java.util.Set lambda$addWaveMob$2(java.lang.Integer) -> a
-    475:475:double lambda$moveRaidCenterToNearbyVillageSection$1(net.minecraft.core.BlockPos) -> d
-    250:251:boolean lambda$validPlayer$0(net.minecraft.server.level.ServerPlayer) -> a
-    125:129:void <clinit>() -> <clinit>
-net.minecraft.world.entity.raid.Raid$1 -> azn$1:
+    474:474:double lambda$moveRaidCenterToNearbyVillageSection$1(net.minecraft.core.BlockPos) -> d
+    249:250:boolean lambda$validPlayer$0(net.minecraft.server.level.ServerPlayer) -> a
+    126:130:void <clinit>() -> <clinit>
+net.minecraft.world.entity.raid.Raid$1 -> bfh$1:
     int[] $SwitchMap$net$minecraft$world$entity$raid$Raid$RaiderType -> a
     int[] $SwitchMap$net$minecraft$world$Difficulty -> b
-    816:878:void <clinit>() -> <clinit>
-net.minecraft.world.entity.raid.Raid$RaidStatus -> azn$a:
+    816:876:void <clinit>() -> <clinit>
+net.minecraft.world.entity.raid.Raid$RaidStatus -> bfh$a:
     net.minecraft.world.entity.raid.Raid$RaidStatus ONGOING -> a
     net.minecraft.world.entity.raid.Raid$RaidStatus VICTORY -> b
     net.minecraft.world.entity.raid.Raid$RaidStatus LOSS -> c
     net.minecraft.world.entity.raid.Raid$RaidStatus STOPPED -> d
     net.minecraft.world.entity.raid.Raid$RaidStatus[] VALUES -> e
     net.minecraft.world.entity.raid.Raid$RaidStatus[] $VALUES -> f
-    63:63:net.minecraft.world.entity.raid.Raid$RaidStatus[] values() -> values
-    63:63:net.minecraft.world.entity.raid.Raid$RaidStatus valueOf(java.lang.String) -> valueOf
-    63:63:void <init>(java.lang.String,int) -> <init>
-    72:77:net.minecraft.world.entity.raid.Raid$RaidStatus getByName(java.lang.String) -> b
-    81:81:java.lang.String getName() -> a
-    63:63:net.minecraft.world.entity.raid.Raid$RaidStatus access$000(java.lang.String) -> a
-    63:69:void <clinit>() -> <clinit>
-net.minecraft.world.entity.raid.Raid$RaiderType -> azn$b:
+    64:64:net.minecraft.world.entity.raid.Raid$RaidStatus[] values() -> values
+    64:64:net.minecraft.world.entity.raid.Raid$RaidStatus valueOf(java.lang.String) -> valueOf
+    64:64:void <init>(java.lang.String,int) -> <init>
+    73:78:net.minecraft.world.entity.raid.Raid$RaidStatus getByName(java.lang.String) -> b
+    82:82:java.lang.String getName() -> a
+    64:64:net.minecraft.world.entity.raid.Raid$RaidStatus access$000(java.lang.String) -> a
+    64:70:void <clinit>() -> <clinit>
+net.minecraft.world.entity.raid.Raid$RaiderType -> bfh$b:
     net.minecraft.world.entity.raid.Raid$RaiderType VINDICATOR -> a
     net.minecraft.world.entity.raid.Raid$RaiderType EVOKER -> b
     net.minecraft.world.entity.raid.Raid$RaiderType PILLAGER -> c
@@ -45680,49 +49949,49 @@ net.minecraft.world.entity.raid.Raid$RaiderType -> azn$b:
     net.minecraft.world.entity.EntityType entityType -> g
     int[] spawnsPerWaveBeforeBonus -> h
     net.minecraft.world.entity.raid.Raid$RaiderType[] $VALUES -> i
-    85:85:net.minecraft.world.entity.raid.Raid$RaiderType[] values() -> values
-    85:85:net.minecraft.world.entity.raid.Raid$RaiderType valueOf(java.lang.String) -> valueOf
-    99:102:void <init>(java.lang.String,int,net.minecraft.world.entity.EntityType,int[]) -> <init>
-    85:85:net.minecraft.world.entity.raid.Raid$RaiderType[] access$100() -> a
-    85:85:net.minecraft.world.entity.EntityType access$200(net.minecraft.world.entity.raid.Raid$RaiderType) -> a
-    85:85:int[] access$300(net.minecraft.world.entity.raid.Raid$RaiderType) -> b
-    85:94:void <clinit>() -> <clinit>
-net.minecraft.world.entity.raid.Raider -> azo:
+    86:86:net.minecraft.world.entity.raid.Raid$RaiderType[] values() -> values
+    86:86:net.minecraft.world.entity.raid.Raid$RaiderType valueOf(java.lang.String) -> valueOf
+    100:103:void <init>(java.lang.String,int,net.minecraft.world.entity.EntityType,int[]) -> <init>
+    86:86:net.minecraft.world.entity.raid.Raid$RaiderType[] access$100() -> a
+    86:86:net.minecraft.world.entity.EntityType access$200(net.minecraft.world.entity.raid.Raid$RaiderType) -> a
+    86:86:int[] access$300(net.minecraft.world.entity.raid.Raid$RaiderType) -> b
+    86:95:void <clinit>() -> <clinit>
+net.minecraft.world.entity.raid.Raider -> bfi:
     net.minecraft.network.syncher.EntityDataAccessor IS_CELEBRATING -> c
     java.util.function.Predicate ALLOWED_ITEMS -> b
     net.minecraft.world.entity.raid.Raid raid -> d
-    int wave -> bw
-    boolean canJoinRaid -> bx
-    int ticksOutsideRaid -> by
+    int wave -> bv
+    boolean canJoinRaid -> bw
+    int ticksOutsideRaid -> bx
     61:62:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    66:71:void registerGoals() -> n
-    75:78:void defineSynchedData() -> w_
+    66:71:void registerGoals() -> o
+    75:78:void defineSynchedData() -> e
     void applyRaidBuffs(int,boolean) -> a
-    83:83:boolean canJoinRaid() -> eD
-    87:88:void setCanJoinRaid(boolean) -> u
+    83:83:boolean canJoinRaid() -> fa
+    87:88:void setCanJoinRaid(boolean) -> w
     95:115:void aiStep() -> k
-    120:121:void updateNoActionTime() -> ew
+    120:121:void updateNoActionTime() -> eR
     125:179:void die(net.minecraft.world.damagesource.DamageSource) -> a
-    183:183:boolean canJoinPatrol() -> ex
+    183:183:boolean canJoinPatrol() -> eU
     187:188:void setCurrentRaid(net.minecraft.world.entity.raid.Raid) -> a
-    192:192:net.minecraft.world.entity.raid.Raid getCurrentRaid() -> eE
-    196:196:boolean hasActiveRaid() -> eF
+    192:192:net.minecraft.world.entity.raid.Raid getCurrentRaid() -> fb
+    196:196:boolean hasActiveRaid() -> fc
     200:201:void setWave(int) -> a
-    204:204:int getWave() -> eG
-    208:208:boolean isCelebrating() -> eH
-    212:213:void setCelebrating(boolean) -> v
+    204:204:int getWave() -> fd
+    208:208:boolean isCelebrating() -> fe
+    212:213:void setCelebrating(boolean) -> x
     217:223:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     227:243:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    247:266:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> a
-    270:273:boolean removeWhenFarAway(double) -> h
-    278:278:boolean requiresCustomPersistence() -> I
-    282:282:int getTicksOutsideRaid() -> eI
-    286:287:void setTicksOutsideRaid(int) -> b
-    291:294:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    301:303:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
-    net.minecraft.sounds.SoundEvent getCelebrateSound() -> eq
-    50:52:boolean lambda$static$0(net.minecraft.world.entity.item.ItemEntity) -> b
-    47:47:java.util.function.Predicate access$000() -> eJ
+    247:267:void pickUpItem(net.minecraft.world.entity.item.ItemEntity) -> b
+    271:274:boolean removeWhenFarAway(double) -> h
+    279:279:boolean requiresCustomPersistence() -> K
+    283:283:int getTicksOutsideRaid() -> ff
+    287:288:void setTicksOutsideRaid(int) -> b
+    292:295:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    302:304:net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.LevelAccessor,net.minecraft.world.DifficultyInstance,net.minecraft.world.entity.MobSpawnType,net.minecraft.world.entity.SpawnGroupData,net.minecraft.nbt.CompoundTag) -> a
+    net.minecraft.sounds.SoundEvent getCelebrateSound() -> eM
+    50:52:boolean lambda$static$0(net.minecraft.world.entity.item.ItemEntity) -> c
+    47:47:java.util.function.Predicate access$000() -> fg
     47:47:java.util.Random access$100(net.minecraft.world.entity.raid.Raider) -> a
     47:47:float access$200(net.minecraft.world.entity.raid.Raider) -> b
     47:47:float access$300(net.minecraft.world.entity.raid.Raider) -> c
@@ -45731,66 +50000,66 @@ net.minecraft.world.entity.raid.Raider -> azo:
     47:47:java.util.Random access$600(net.minecraft.world.entity.raid.Raider) -> f
     47:47:java.util.Random access$700(net.minecraft.world.entity.raid.Raider) -> g
     48:50:void <clinit>() -> <clinit>
-net.minecraft.world.entity.raid.Raider$HoldGroundAttackGoal -> azo$a:
+net.minecraft.world.entity.raid.Raider$HoldGroundAttackGoal -> bfi$a:
     net.minecraft.world.entity.raid.Raider mob -> c
     float hostileRadiusSqr -> d
     net.minecraft.world.entity.ai.targeting.TargetingConditions shoutTargeting -> a
     net.minecraft.world.entity.raid.Raider this$0 -> b
-    388:394:void <init>(net.minecraft.world.entity.raid.Raider,net.minecraft.world.entity.monster.AbstractIllager,float) -> <init>
-    399:400:boolean canUse() -> a
-    405:412:void start() -> c
-    416:427:void stop() -> d
-    431:447:void tick() -> e
-net.minecraft.world.entity.raid.Raider$ObtainRaidLeaderBannerGoal -> azo$b:
+    389:395:void <init>(net.minecraft.world.entity.raid.Raider,net.minecraft.world.entity.monster.AbstractIllager,float) -> <init>
+    400:401:boolean canUse() -> a
+    406:413:void start() -> c
+    417:428:void stop() -> d
+    432:448:void tick() -> e
+net.minecraft.world.entity.raid.Raider$ObtainRaidLeaderBannerGoal -> bfi$b:
     net.minecraft.world.entity.raid.Raider mob -> b
     net.minecraft.world.entity.raid.Raider this$0 -> a
-    311:314:void <init>(net.minecraft.world.entity.raid.Raider,net.minecraft.world.entity.raid.Raider) -> <init>
-    318:331:boolean canUse() -> a
-    336:342:void tick() -> e
-net.minecraft.world.entity.raid.Raider$RaiderCelebration -> azo$c:
+    312:315:void <init>(net.minecraft.world.entity.raid.Raider,net.minecraft.world.entity.raid.Raider) -> <init>
+    319:332:boolean canUse() -> a
+    337:343:void tick() -> e
+net.minecraft.world.entity.raid.Raider$RaiderCelebration -> bfi$c:
     net.minecraft.world.entity.raid.Raider mob -> b
     net.minecraft.world.entity.raid.Raider this$0 -> a
-    348:351:void <init>(net.minecraft.world.entity.raid.Raider,net.minecraft.world.entity.raid.Raider) -> <init>
-    355:356:boolean canUse() -> a
-    361:363:void start() -> c
-    367:369:void stop() -> d
-    373:382:void tick() -> e
-net.minecraft.world.entity.raid.Raider$RaiderMoveThroughVillageGoal -> azo$d:
+    349:352:void <init>(net.minecraft.world.entity.raid.Raider,net.minecraft.world.entity.raid.Raider) -> <init>
+    356:357:boolean canUse() -> a
+    362:364:void start() -> c
+    368:370:void stop() -> d
+    374:383:void tick() -> e
+net.minecraft.world.entity.raid.Raider$RaiderMoveThroughVillageGoal -> bfi$d:
     net.minecraft.world.entity.raid.Raider raider -> a
     double speedModifier -> b
     net.minecraft.core.BlockPos poiPos -> c
     java.util.List visited -> d
     int distanceToPoi -> e
     boolean stuck -> f
-    454:463:void <init>(net.minecraft.world.entity.raid.Raider,double,int) -> <init>
-    467:468:boolean canUse() -> a
-    472:472:boolean isValidRaid() -> g
-    476:485:boolean hasSuitablePoi() -> h
-    490:493:boolean canContinueToUse() -> b
-    498:501:void stop() -> d
-    505:509:void start() -> c
-    513:527:void tick() -> e
-    530:535:boolean hasNotVisited(net.minecraft.core.BlockPos) -> a
-    539:542:void updateVisited() -> j
-    478:478:boolean lambda$hasSuitablePoi$0(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-net.minecraft.world.entity.raid.Raids -> azp:
+    455:464:void <init>(net.minecraft.world.entity.raid.Raider,double,int) -> <init>
+    468:469:boolean canUse() -> a
+    473:473:boolean isValidRaid() -> g
+    477:486:boolean hasSuitablePoi() -> h
+    491:494:boolean canContinueToUse() -> b
+    499:502:void stop() -> d
+    506:510:void start() -> c
+    514:528:void tick() -> e
+    531:536:boolean hasNotVisited(net.minecraft.core.BlockPos) -> a
+    540:543:void updateVisited() -> j
+    479:479:boolean lambda$hasSuitablePoi$0(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
+net.minecraft.world.entity.raid.Raids -> bfj:
     java.util.Map raidMap -> a
     net.minecraft.server.level.ServerLevel level -> b
     int nextAvailableID -> c
     int tick -> d
-    36:48:void <init>(net.minecraft.server.level.ServerLevel) -> <init>
-    51:51:net.minecraft.world.entity.raid.Raid get(int) -> a
-    55:78:void tick() -> a
-    81:84:boolean canJoinRaid(net.minecraft.world.entity.raid.Raider,net.minecraft.world.entity.raid.Raid) -> a
-    93:159:net.minecraft.world.entity.raid.Raid createOrExtendRaid(net.minecraft.server.level.ServerPlayer) -> a
-    163:164:net.minecraft.world.entity.raid.Raid getOrCreateRaid(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-    169:178:void load(net.minecraft.nbt.CompoundTag) -> a
-    182:192:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    196:196:java.lang.String getFileId(net.minecraft.world.level.dimension.Dimension) -> a
-    200:200:int getUniqueId() -> e
-    205:217:net.minecraft.world.entity.raid.Raid getNearbyRaid(net.minecraft.core.BlockPos,int) -> a
-net.minecraft.world.entity.raid.package-info -> azq:
-net.minecraft.world.entity.schedule.Activity -> azr:
+    35:47:void <init>(net.minecraft.server.level.ServerLevel) -> <init>
+    50:50:net.minecraft.world.entity.raid.Raid get(int) -> a
+    54:77:void tick() -> a
+    80:83:boolean canJoinRaid(net.minecraft.world.entity.raid.Raider,net.minecraft.world.entity.raid.Raid) -> a
+    92:157:net.minecraft.world.entity.raid.Raid createOrExtendRaid(net.minecraft.server.level.ServerPlayer) -> a
+    161:162:net.minecraft.world.entity.raid.Raid getOrCreateRaid(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    167:176:void load(net.minecraft.nbt.CompoundTag) -> a
+    180:190:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
+    194:194:java.lang.String getFileId(net.minecraft.world.level.dimension.DimensionType) -> a
+    198:198:int getUniqueId() -> e
+    203:215:net.minecraft.world.entity.raid.Raid getNearbyRaid(net.minecraft.core.BlockPos,int) -> a
+net.minecraft.world.entity.raid.package-info -> bfk:
+net.minecraft.world.entity.schedule.Activity -> bfl:
     net.minecraft.world.entity.schedule.Activity CORE -> a
     net.minecraft.world.entity.schedule.Activity IDLE -> b
     net.minecraft.world.entity.schedule.Activity WORK -> c
@@ -45801,19 +50070,27 @@ net.minecraft.world.entity.schedule.Activity -> azr:
     net.minecraft.world.entity.schedule.Activity RAID -> h
     net.minecraft.world.entity.schedule.Activity PRE_RAID -> i
     net.minecraft.world.entity.schedule.Activity HIDE -> j
-    java.lang.String name -> k
-    19:21:void <init>(java.lang.String) -> <init>
-    24:24:java.lang.String getName() -> a
-    28:28:net.minecraft.world.entity.schedule.Activity register(java.lang.String) -> a
-    33:33:java.lang.String toString() -> toString
-    6:15:void <clinit>() -> <clinit>
-net.minecraft.world.entity.schedule.Keyframe -> azs:
+    net.minecraft.world.entity.schedule.Activity FIGHT -> k
+    net.minecraft.world.entity.schedule.Activity CELEBRATE -> l
+    net.minecraft.world.entity.schedule.Activity ADMIRE_ITEM -> m
+    net.minecraft.world.entity.schedule.Activity AVOID -> n
+    net.minecraft.world.entity.schedule.Activity RIDE -> o
+    java.lang.String name -> p
+    int hashCode -> q
+    25:28:void <init>(java.lang.String) -> <init>
+    31:31:java.lang.String getName() -> a
+    35:35:net.minecraft.world.entity.schedule.Activity register(java.lang.String) -> a
+    40:49:boolean equals(java.lang.Object) -> equals
+    54:54:int hashCode() -> hashCode
+    59:59:java.lang.String toString() -> toString
+    6:20:void <clinit>() -> <clinit>
+net.minecraft.world.entity.schedule.Keyframe -> bfm:
     int timeStamp -> a
     float value -> b
     7:10:void <init>(int,float) -> <init>
     13:13:int getTimeStamp() -> a
     17:17:float getValue() -> b
-net.minecraft.world.entity.schedule.Schedule -> azt:
+net.minecraft.world.entity.schedule.Schedule -> bfn:
     net.minecraft.world.entity.schedule.Schedule EMPTY -> a
     net.minecraft.world.entity.schedule.Schedule SIMPLE -> b
     net.minecraft.world.entity.schedule.Schedule VILLAGER_BABY -> c
@@ -45828,7 +50105,7 @@ net.minecraft.world.entity.schedule.Schedule -> azt:
     64:64:double lambda$getActivityAt$1(int,java.util.Map$Entry) -> a
     56:56:boolean lambda$getAllTimelinesExceptFor$0(net.minecraft.world.entity.schedule.Activity,java.util.Map$Entry) -> a
     15:35:void <clinit>() -> <clinit>
-net.minecraft.world.entity.schedule.ScheduleBuilder -> azu:
+net.minecraft.world.entity.schedule.ScheduleBuilder -> bfo:
     net.minecraft.world.entity.schedule.Schedule schedule -> a
     java.util.List transitions -> b
     10:14:void <init>(net.minecraft.world.entity.schedule.Schedule) -> <init>
@@ -45836,13 +50113,13 @@ net.minecraft.world.entity.schedule.ScheduleBuilder -> azu:
     22:39:net.minecraft.world.entity.schedule.Schedule build() -> a
     28:37:void lambda$build$1(net.minecraft.world.entity.schedule.ScheduleBuilder$ActivityTransition) -> a
     32:32:void lambda$null$0(net.minecraft.world.entity.schedule.ScheduleBuilder$ActivityTransition,net.minecraft.world.entity.schedule.Timeline) -> a
-net.minecraft.world.entity.schedule.ScheduleBuilder$ActivityTransition -> azu$a:
+net.minecraft.world.entity.schedule.ScheduleBuilder$ActivityTransition -> bfo$a:
     int time -> a
     net.minecraft.world.entity.schedule.Activity activity -> b
     46:49:void <init>(int,net.minecraft.world.entity.schedule.Activity) -> <init>
     52:52:int getTime() -> a
     56:56:net.minecraft.world.entity.schedule.Activity getActivity() -> b
-net.minecraft.world.entity.schedule.Timeline -> azv:
+net.minecraft.world.entity.schedule.Timeline -> bfp:
     java.util.List keyframes -> a
     int previousIndex -> b
     11:12:void <init>() -> <init>
@@ -45852,14 +50129,15 @@ net.minecraft.world.entity.schedule.Timeline -> azv:
     32:39:void sortAndDeduplicateKeyframes() -> b
     42:62:float getValueAt(int) -> a
     33:33:void lambda$sortAndDeduplicateKeyframes$0(it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,net.minecraft.world.entity.schedule.Keyframe) -> a
-net.minecraft.world.entity.schedule.package-info -> azw:
-net.minecraft.world.entity.vehicle.AbstractMinecart -> azx:
+net.minecraft.world.entity.schedule.package-info -> bfq:
+net.minecraft.world.entity.vehicle.AbstractMinecart -> bfr:
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_HURT -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_HURTDIR -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_DAMAGE -> d
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_DISPLAY_BLOCK -> e
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_DISPLAY_OFFSET -> f
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_CUSTOM_DISPLAY -> g
+    com.google.common.collect.ImmutableMap POSE_DISMOUNT_HEIGHTS -> an
     boolean flipped -> ao
     java.util.Map EXITS -> ap
     int lSteps -> aq
@@ -45871,57 +50149,60 @@ net.minecraft.world.entity.vehicle.AbstractMinecart -> azx:
     double lxd -> aw
     double lyd -> ax
     double lzd -> ay
-    65:67:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    70:78:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level,double,double,double) -> <init>
-    81:94:net.minecraft.world.entity.vehicle.AbstractMinecart createMinecart(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.entity.vehicle.AbstractMinecart$Type) -> a
-    100:100:boolean isMovementNoisy() -> at
-    105:111:void defineSynchedData() -> w_
-    116:119:net.minecraft.world.phys.AABB getCollideAgainstBox(net.minecraft.world.entity.Entity) -> j
-    124:124:boolean isPushable() -> aL
-    129:129:double getRideHeight() -> aS
-    134:155:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    159:168:void destroy(net.minecraft.world.damagesource.DamageSource) -> a
-    172:175:void animateHurt() -> bb
-    179:179:boolean isPickable() -> aK
-    206:206:com.mojang.datafixers.util.Pair exits(net.minecraft.world.level.block.state.properties.RailShape) -> a
-    211:211:net.minecraft.core.Direction getMotionDirection() -> bR
-    216:312:void tick() -> h
-    315:315:double getMaxSpeed() -> f
-    319:319:void activateMinecart(int,int,int,boolean) -> a
-    322:337:void comeOffTrack() -> i
-    340:536:void moveAlongTrack(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    539:539:boolean isRedstoneConductor(net.minecraft.core.BlockPos) -> a
-    543:545:void applyNaturalSlowdown() -> k
-    549:585:net.minecraft.world.phys.Vec3 getPosOffs(double,double,double,double) -> a
-    590:638:net.minecraft.world.phys.Vec3 getPos(double,double,double) -> o
-    643:647:net.minecraft.world.phys.AABB getBoundingBoxForCulling() -> bU
-    652:657:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    661:666:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    670:741:void push(net.minecraft.world.entity.Entity) -> i
-    755:764:void lerpTo(double,double,double,float,float,int,boolean) -> a
-    768:772:void lerpMotion(double,double,double) -> j
-    775:776:void setDamage(float) -> a
-    779:779:float getDamage() -> l
-    783:784:void setHurtTime(int) -> c
-    787:787:int getHurtTime() -> m
-    791:792:void setHurtDir(int) -> d
-    795:795:int getHurtDir() -> n
+    77:79:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    82:90:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level,double,double,double) -> <init>
+    93:106:net.minecraft.world.entity.vehicle.AbstractMinecart createMinecart(net.minecraft.world.level.Level,double,double,double,net.minecraft.world.entity.vehicle.AbstractMinecart$Type) -> a
+    112:112:boolean isMovementNoisy() -> ax
+    117:123:void defineSynchedData() -> e
+    128:131:net.minecraft.world.phys.AABB getCollideAgainstBox(net.minecraft.world.entity.Entity) -> j
+    136:136:boolean isPushable() -> aR
+    141:141:double getPassengersRidingOffset() -> aY
+    146:205:net.minecraft.world.phys.Vec3 getDismountLocationForPassenger(net.minecraft.world.entity.LivingEntity) -> c
+    210:231:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    236:240:float getBlockSpeedFactor() -> am
+    244:253:void destroy(net.minecraft.world.damagesource.DamageSource) -> a
+    257:260:void animateHurt() -> bi
+    264:264:boolean isPickable() -> aQ
+    291:291:com.mojang.datafixers.util.Pair exits(net.minecraft.world.level.block.state.properties.RailShape) -> a
+    296:296:net.minecraft.core.Direction getMotionDirection() -> bZ
+    301:397:void tick() -> j
+    400:400:double getMaxSpeed() -> g
+    404:404:void activateMinecart(int,int,int,boolean) -> a
+    407:422:void comeOffTrack() -> h
+    425:621:void moveAlongTrack(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    624:624:boolean isRedstoneConductor(net.minecraft.core.BlockPos) -> a
+    628:630:void applyNaturalSlowdown() -> i
+    634:670:net.minecraft.world.phys.Vec3 getPosOffs(double,double,double,double) -> a
+    675:723:net.minecraft.world.phys.Vec3 getPos(double,double,double) -> o
+    728:732:net.minecraft.world.phys.AABB getBoundingBoxForCulling() -> cc
+    737:742:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    746:751:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    755:826:void push(net.minecraft.world.entity.Entity) -> i
+    840:849:void lerpTo(double,double,double,float,float,int,boolean) -> a
+    853:857:void lerpMotion(double,double,double) -> j
+    860:861:void setDamage(float) -> a
+    864:864:float getDamage() -> k
+    868:869:void setHurtTime(int) -> c
+    872:872:int getHurtTime() -> m
+    876:877:void setHurtDir(int) -> d
+    880:880:int getHurtDir() -> n
     net.minecraft.world.entity.vehicle.AbstractMinecart$Type getMinecartType() -> o
-    801:804:net.minecraft.world.level.block.state.BlockState getDisplayBlockState() -> p
-    808:808:net.minecraft.world.level.block.state.BlockState getDefaultDisplayBlockState() -> q
-    812:815:int getDisplayOffset() -> r
-    819:819:int getDefaultDisplayOffset() -> s
-    823:825:void setDisplayBlockState(net.minecraft.world.level.block.state.BlockState) -> b
-    828:830:void setDisplayOffset(int) -> l
-    833:833:boolean hasCustomDisplay() -> u
-    837:838:void setCustomDisplay(boolean) -> a
-    842:842:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    183:203:void lambda$static$0(java.util.EnumMap) -> a
-    55:182:void <clinit>() -> <clinit>
-net.minecraft.world.entity.vehicle.AbstractMinecart$1 -> azx$1:
+    886:889:net.minecraft.world.level.block.state.BlockState getDisplayBlockState() -> p
+    893:893:net.minecraft.world.level.block.state.BlockState getDefaultDisplayBlockState() -> q
+    897:900:int getDisplayOffset() -> r
+    904:904:int getDefaultDisplayOffset() -> s
+    908:910:void setDisplayBlockState(net.minecraft.world.level.block.state.BlockState) -> b
+    913:915:void setDisplayOffset(int) -> l
+    918:918:boolean hasCustomDisplay() -> t
+    922:923:void setCustomDisplay(boolean) -> a
+    927:927:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    268:288:void lambda$static$1(java.util.EnumMap) -> a
+    168:172:boolean lambda$getDismountLocationForPassenger$0(net.minecraft.world.level.block.state.BlockState) -> c
+    61:267:void <clinit>() -> <clinit>
+net.minecraft.world.entity.vehicle.AbstractMinecart$1 -> bfr$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$RailShape -> a
-    360:360:void <clinit>() -> <clinit>
-net.minecraft.world.entity.vehicle.AbstractMinecart$Type -> azx$a:
+    445:445:void <clinit>() -> <clinit>
+net.minecraft.world.entity.vehicle.AbstractMinecart$Type -> bfr$a:
     net.minecraft.world.entity.vehicle.AbstractMinecart$Type RIDEABLE -> a
     net.minecraft.world.entity.vehicle.AbstractMinecart$Type CHEST -> b
     net.minecraft.world.entity.vehicle.AbstractMinecart$Type FURNACE -> c
@@ -45930,139 +50211,142 @@ net.minecraft.world.entity.vehicle.AbstractMinecart$Type -> azx$a:
     net.minecraft.world.entity.vehicle.AbstractMinecart$Type HOPPER -> f
     net.minecraft.world.entity.vehicle.AbstractMinecart$Type COMMAND_BLOCK -> g
     net.minecraft.world.entity.vehicle.AbstractMinecart$Type[] $VALUES -> h
-    44:44:net.minecraft.world.entity.vehicle.AbstractMinecart$Type[] values() -> values
-    44:44:net.minecraft.world.entity.vehicle.AbstractMinecart$Type valueOf(java.lang.String) -> valueOf
-    44:44:void <init>(java.lang.String,int) -> <init>
-    44:51:void <clinit>() -> <clinit>
-net.minecraft.world.entity.vehicle.AbstractMinecartContainer -> azy:
+    50:50:net.minecraft.world.entity.vehicle.AbstractMinecart$Type[] values() -> values
+    50:50:net.minecraft.world.entity.vehicle.AbstractMinecart$Type valueOf(java.lang.String) -> valueOf
+    50:50:void <init>(java.lang.String,int) -> <init>
+    50:57:void <clinit>() -> <clinit>
+net.minecraft.world.entity.vehicle.AbstractMinecartContainer -> bfs:
     net.minecraft.core.NonNullList itemStacks -> b
     boolean dropEquipment -> c
     net.minecraft.resources.ResourceLocation lootTable -> d
     long lootTableSeed -> e
-    33:41:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    33:45:void <init>(net.minecraft.world.entity.EntityType,double,double,double,net.minecraft.world.level.Level) -> <init>
-    49:54:void destroy(net.minecraft.world.damagesource.DamageSource) -> a
-    58:63:boolean isEmpty() -> c
-    68:69:net.minecraft.world.item.ItemStack getItem(int) -> a
-    74:76:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
-    81:87:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
-    92:97:void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    101:106:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
-    111:111:void setChanged() -> e
-    115:121:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    127:128:net.minecraft.world.entity.Entity changeDimension(net.minecraft.world.level.dimension.DimensionType) -> a
-    133:138:void remove() -> X
-    142:143:void setDropContainerContent(boolean) -> b
-    147:157:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    161:170:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    174:175:boolean interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
-    180:192:void applyNaturalSlowdown() -> k
-    195:208:void unpackLootTable(net.minecraft.world.entity.player.Player) -> d
-    212:214:void clearContent() -> N_
-    217:219:void setLootTable(net.minecraft.resources.ResourceLocation,long) -> a
-    224:228:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
+    34:42:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    34:46:void <init>(net.minecraft.world.entity.EntityType,double,double,double,net.minecraft.world.level.Level) -> <init>
+    50:55:void destroy(net.minecraft.world.damagesource.DamageSource) -> a
+    59:64:boolean isEmpty() -> c
+    69:70:net.minecraft.world.item.ItemStack getItem(int) -> a
+    75:77:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
+    82:88:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
+    93:98:void setItem(int,net.minecraft.world.item.ItemStack) -> a
+    102:107:boolean setSlot(int,net.minecraft.world.item.ItemStack) -> a_
+    112:112:void setChanged() -> Z_
+    116:122:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    128:129:net.minecraft.world.entity.Entity changeDimension(net.minecraft.server.level.ServerLevel) -> a
+    134:139:void remove() -> aa
+    143:144:void setDropContainerContent(boolean) -> a_
+    148:158:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    162:171:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    175:176:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    181:193:void applyNaturalSlowdown() -> i
+    196:212:void unpackLootTable(net.minecraft.world.entity.player.Player) -> d
+    216:218:void clearContent() -> aa_
+    221:223:void setLootTable(net.minecraft.resources.ResourceLocation,long) -> a
+    228:232:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
     net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
-net.minecraft.world.entity.vehicle.Boat -> azz:
+net.minecraft.world.entity.vehicle.Boat -> bft:
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_HURT -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_HURTDIR -> c
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_DAMAGE -> d
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_TYPE -> e
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_PADDLE_LEFT -> f
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_PADDLE_RIGHT -> g
-    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_BUBBLE_TIME -> ao
-    float[] paddlePositions -> ap
-    float invFriction -> aq
-    float outOfControlTicks -> ar
-    float deltaRotation -> as
-    int lerpSteps -> at
-    double lerpX -> au
-    double lerpY -> av
-    double lerpZ -> aw
-    double lerpYRot -> ax
-    double lerpXRot -> ay
-    boolean inputLeft -> az
-    boolean inputRight -> aA
-    boolean inputUp -> aB
-    boolean inputDown -> aC
-    double waterLevel -> aD
-    float landFriction -> aE
-    net.minecraft.world.entity.vehicle.Boat$Status status -> aF
-    net.minecraft.world.entity.vehicle.Boat$Status oldStatus -> aG
-    double lastYd -> aH
-    boolean isAboveBubbleColumn -> aI
-    boolean bubbleColumnDirectionIsDown -> aJ
-    float bubbleMultiplier -> aK
-    float bubbleAngle -> aL
-    float bubbleAngleO -> aM
-    63:93:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    96:104:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    108:108:boolean isMovementNoisy() -> at
-    113:120:void defineSynchedData() -> w_
-    125:128:net.minecraft.world.phys.AABB getCollideAgainstBox(net.minecraft.world.entity.Entity) -> j
-    134:134:net.minecraft.world.phys.AABB getCollideBox() -> au
-    139:139:boolean isPushable() -> aL
-    144:144:double getRideHeight() -> aS
-    149:169:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
-    174:186:void onAboveBubbleCol(boolean) -> j
-    190:197:void push(net.minecraft.world.entity.Entity) -> i
-    200:213:net.minecraft.world.item.Item getDropItem() -> f
-    219:222:void animateHurt() -> bb
-    226:226:boolean isPickable() -> aK
-    231:237:void lerpTo(double,double,double,float,float,int,boolean) -> a
-    241:241:net.minecraft.core.Direction getMotionDirection() -> bR
-    246:330:void tick() -> h
-    333:371:void tickBubbleColumn() -> q
-    375:384:net.minecraft.sounds.SoundEvent getPaddleSound() -> i
-    389:409:void tickLerp() -> r
-    412:414:void setPaddleState(boolean,boolean) -> a
-    417:420:float getRowingTime(int,float) -> a
-    432:448:net.minecraft.world.entity.vehicle.Boat$Status getStatus() -> s
-    452:481:float getWaterLevelAbove() -> k
-    485:537:float getGroundFriction() -> l
-    541:571:boolean checkInWater() -> u
-    576:607:net.minecraft.world.entity.vehicle.Boat$Status isUnderwater() -> v
-    611:659:void floatBoat() -> w
-    662:692:void controlBoat() -> z
+    net.minecraft.network.syncher.EntityDataAccessor DATA_ID_BUBBLE_TIME -> an
+    float[] paddlePositions -> ao
+    float invFriction -> ap
+    float outOfControlTicks -> aq
+    float deltaRotation -> ar
+    int lerpSteps -> as
+    double lerpX -> at
+    double lerpY -> au
+    double lerpZ -> av
+    double lerpYRot -> aw
+    double lerpXRot -> ax
+    boolean inputLeft -> ay
+    boolean inputRight -> az
+    boolean inputUp -> aA
+    boolean inputDown -> aB
+    double waterLevel -> aC
+    float landFriction -> aD
+    net.minecraft.world.entity.vehicle.Boat$Status status -> aE
+    net.minecraft.world.entity.vehicle.Boat$Status oldStatus -> aF
+    double lastYd -> aG
+    boolean isAboveBubbleColumn -> aH
+    boolean bubbleColumnDirectionIsDown -> aI
+    float bubbleMultiplier -> aJ
+    float bubbleAngle -> aK
+    float bubbleAngleO -> aL
+    65:95:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    98:106:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    110:110:float getEyeHeight(net.minecraft.world.entity.Pose,net.minecraft.world.entity.EntityDimensions) -> a
+    115:115:boolean isMovementNoisy() -> ax
+    120:127:void defineSynchedData() -> e
+    132:135:net.minecraft.world.phys.AABB getCollideAgainstBox(net.minecraft.world.entity.Entity) -> j
+    141:141:net.minecraft.world.phys.AABB getCollideBox() -> ay
+    146:146:boolean isPushable() -> aR
+    151:151:double getPassengersRidingOffset() -> aY
+    156:173:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
+    178:190:void onAboveBubbleCol(boolean) -> k
+    194:201:void push(net.minecraft.world.entity.Entity) -> i
+    204:217:net.minecraft.world.item.Item getDropItem() -> g
+    223:226:void animateHurt() -> bi
+    230:230:boolean isPickable() -> aQ
+    235:241:void lerpTo(double,double,double,float,float,int,boolean) -> a
+    245:245:net.minecraft.core.Direction getMotionDirection() -> bZ
+    250:334:void tick() -> j
+    337:375:void tickBubbleColumn() -> q
+    379:388:net.minecraft.sounds.SoundEvent getPaddleSound() -> h
+    393:413:void tickLerp() -> r
+    416:418:void setPaddleState(boolean,boolean) -> a
+    421:424:float getRowingTime(int,float) -> a
+    436:452:net.minecraft.world.entity.vehicle.Boat$Status getStatus() -> s
+    456:484:float getWaterLevelAbove() -> i
+    488:539:float getGroundFriction() -> k
+    543:572:boolean checkInWater() -> t
+    577:607:net.minecraft.world.entity.vehicle.Boat$Status isUnderwater() -> u
+    611:659:void floatBoat() -> v
+    662:692:void controlBoat() -> x
     696:730:void positionRider(net.minecraft.world.entity.Entity) -> k
-    733:740:void clampRotation(net.minecraft.world.entity.Entity) -> a
-    744:745:void onPassengerTurned(net.minecraft.world.entity.Entity) -> l
-    749:750:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    754:757:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    761:768:boolean interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
-    773:805:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    808:808:boolean getPaddleState(int) -> a
-    812:813:void setDamage(float) -> a
-    816:816:float getDamage() -> m
-    820:821:void setHurtTime(int) -> b
-    824:824:int getHurtTime() -> n
-    828:829:void setBubbleTime(int) -> d
-    832:832:int getBubbleTime() -> A
-    836:836:float getBubbleAngle(float) -> b
-    840:841:void setHurtDir(int) -> c
-    844:844:int getHurtDir() -> o
-    848:849:void setType(net.minecraft.world.entity.vehicle.Boat$Type) -> a
-    852:852:net.minecraft.world.entity.vehicle.Boat$Type getBoatType() -> p
-    857:857:boolean canAddPassenger(net.minecraft.world.entity.Entity) -> q
-    863:864:net.minecraft.world.entity.Entity getControllingPassenger() -> cd
-    868:872:void setInput(boolean,boolean,boolean,boolean) -> a
-    924:924:net.minecraft.network.protocol.Packet getAddEntityPacket() -> L
-    49:55:void <clinit>() -> <clinit>
-net.minecraft.world.entity.vehicle.Boat$1 -> azz$1:
+    734:769:net.minecraft.world.phys.Vec3 getDismountLocationForPassenger(net.minecraft.world.entity.LivingEntity) -> c
+    773:780:void clampRotation(net.minecraft.world.entity.Entity) -> a
+    784:785:void onPassengerTurned(net.minecraft.world.entity.Entity) -> l
+    789:790:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    794:797:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    801:811:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    816:848:void checkFallDamage(double,boolean,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    851:851:boolean getPaddleState(int) -> a
+    855:856:void setDamage(float) -> a
+    859:859:float getDamage() -> m
+    863:864:void setHurtTime(int) -> b
+    867:867:int getHurtTime() -> n
+    871:872:void setBubbleTime(int) -> d
+    875:875:int getBubbleTime() -> z
+    879:879:float getBubbleAngle(float) -> b
+    883:884:void setHurtDir(int) -> c
+    887:887:int getHurtDir() -> o
+    891:892:void setType(net.minecraft.world.entity.vehicle.Boat$Type) -> a
+    895:895:net.minecraft.world.entity.vehicle.Boat$Type getBoatType() -> p
+    900:900:boolean canAddPassenger(net.minecraft.world.entity.Entity) -> q
+    906:907:net.minecraft.world.entity.Entity getControllingPassenger() -> cl
+    911:915:void setInput(boolean,boolean,boolean,boolean) -> a
+    967:967:net.minecraft.network.protocol.Packet getAddEntityPacket() -> O
+    972:972:boolean isUnderWater() -> aE
+    51:57:void <clinit>() -> <clinit>
+net.minecraft.world.entity.vehicle.Boat$1 -> bft$1:
     int[] $SwitchMap$net$minecraft$world$entity$vehicle$Boat$Type -> a
     int[] $SwitchMap$net$minecraft$world$entity$vehicle$Boat$Status -> b
-    200:375:void <clinit>() -> <clinit>
-net.minecraft.world.entity.vehicle.Boat$Status -> azz$a:
+    204:379:void <clinit>() -> <clinit>
+net.minecraft.world.entity.vehicle.Boat$Status -> bft$a:
     net.minecraft.world.entity.vehicle.Boat$Status IN_WATER -> a
     net.minecraft.world.entity.vehicle.Boat$Status UNDER_WATER -> b
     net.minecraft.world.entity.vehicle.Boat$Status UNDER_FLOWING_WATER -> c
     net.minecraft.world.entity.vehicle.Boat$Status ON_LAND -> d
     net.minecraft.world.entity.vehicle.Boat$Status IN_AIR -> e
     net.minecraft.world.entity.vehicle.Boat$Status[] $VALUES -> f
-    423:423:net.minecraft.world.entity.vehicle.Boat$Status[] values() -> values
-    423:423:net.minecraft.world.entity.vehicle.Boat$Status valueOf(java.lang.String) -> valueOf
-    423:423:void <init>(java.lang.String,int) -> <init>
-    423:428:void <clinit>() -> <clinit>
-net.minecraft.world.entity.vehicle.Boat$Type -> azz$b:
+    427:427:net.minecraft.world.entity.vehicle.Boat$Status[] values() -> values
+    427:427:net.minecraft.world.entity.vehicle.Boat$Status valueOf(java.lang.String) -> valueOf
+    427:427:void <init>(java.lang.String,int) -> <init>
+    427:432:void <clinit>() -> <clinit>
+net.minecraft.world.entity.vehicle.Boat$Type -> bft$b:
     net.minecraft.world.entity.vehicle.Boat$Type OAK -> a
     net.minecraft.world.entity.vehicle.Boat$Type SPRUCE -> b
     net.minecraft.world.entity.vehicle.Boat$Type BIRCH -> c
@@ -46072,82 +50356,86 @@ net.minecraft.world.entity.vehicle.Boat$Type -> azz$b:
     java.lang.String name -> g
     net.minecraft.world.level.block.Block planks -> h
     net.minecraft.world.entity.vehicle.Boat$Type[] $VALUES -> i
-    874:874:net.minecraft.world.entity.vehicle.Boat$Type[] values() -> values
-    874:874:net.minecraft.world.entity.vehicle.Boat$Type valueOf(java.lang.String) -> valueOf
-    885:888:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block,java.lang.String) -> <init>
-    891:891:java.lang.String getName() -> a
-    895:895:net.minecraft.world.level.block.Block getPlanks() -> b
-    900:900:java.lang.String toString() -> toString
-    904:908:net.minecraft.world.entity.vehicle.Boat$Type byId(int) -> a
-    912:918:net.minecraft.world.entity.vehicle.Boat$Type byName(java.lang.String) -> a
-    874:880:void <clinit>() -> <clinit>
-net.minecraft.world.entity.vehicle.Minecart -> baa:
-    10:11:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    14:15:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    19:30:boolean interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
-    35:46:void activateMinecart(int,int,int,boolean) -> a
-    50:50:net.minecraft.world.entity.vehicle.AbstractMinecart$Type getMinecartType() -> o
-net.minecraft.world.entity.vehicle.MinecartChest -> bab:
+    917:917:net.minecraft.world.entity.vehicle.Boat$Type[] values() -> values
+    917:917:net.minecraft.world.entity.vehicle.Boat$Type valueOf(java.lang.String) -> valueOf
+    928:931:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block,java.lang.String) -> <init>
+    934:934:java.lang.String getName() -> a
+    938:938:net.minecraft.world.level.block.Block getPlanks() -> b
+    943:943:java.lang.String toString() -> toString
+    947:951:net.minecraft.world.entity.vehicle.Boat$Type byId(int) -> a
+    955:961:net.minecraft.world.entity.vehicle.Boat$Type byName(java.lang.String) -> a
+    917:923:void <clinit>() -> <clinit>
+net.minecraft.world.entity.vehicle.DismountHelper -> bfu:
+    9:9:void <init>() -> <init>
+    13:25:int[][] offsetsForDirection(net.minecraft.core.Direction) -> a
+    30:30:boolean isFloorValid(double) -> a
+    34:34:boolean canDismountTo(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.phys.AABB) -> a
+net.minecraft.world.entity.vehicle.Minecart -> bfv:
+    11:12:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    15:16:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    20:31:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    36:47:void activateMinecart(int,int,int,boolean) -> a
+    51:51:net.minecraft.world.entity.vehicle.AbstractMinecart$Type getMinecartType() -> o
+net.minecraft.world.entity.vehicle.MinecartChest -> bfw:
     17:18:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     21:22:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
     26:31:void destroy(net.minecraft.world.damagesource.DamageSource) -> a
-    35:35:int getContainerSize() -> O_
+    35:35:int getContainerSize() -> ab_
     40:40:net.minecraft.world.entity.vehicle.AbstractMinecart$Type getMinecartType() -> o
     45:45:net.minecraft.world.level.block.state.BlockState getDefaultDisplayBlockState() -> q
     50:50:int getDefaultDisplayOffset() -> s
     55:55:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
-net.minecraft.world.entity.vehicle.MinecartCommandBlock -> bac:
+net.minecraft.world.entity.vehicle.MinecartCommandBlock -> bfx:
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_COMMAND_NAME -> b
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_LAST_OUTPUT -> c
     net.minecraft.world.level.BaseCommandBlock commandBlock -> d
     int lastActivated -> e
     27:34:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     27:38:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    42:45:void defineSynchedData() -> w_
+    42:45:void defineSynchedData() -> e
     49:53:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     57:59:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     63:63:net.minecraft.world.entity.vehicle.AbstractMinecart$Type getMinecartType() -> o
     68:68:net.minecraft.world.level.block.state.BlockState getDefaultDisplayBlockState() -> q
-    72:72:net.minecraft.world.level.BaseCommandBlock getCommandBlock() -> v
+    72:72:net.minecraft.world.level.BaseCommandBlock getCommandBlock() -> u
     77:83:void activateMinecart(int,int,int,boolean) -> a
-    87:88:boolean interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
-    93:103:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
-    107:107:boolean onlyOpCanSetNbt() -> cb
-    23:23:net.minecraft.network.syncher.EntityDataAccessor access$000() -> w
-    23:23:net.minecraft.network.syncher.EntityDataAccessor access$100() -> z
+    87:87:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    92:102:void onSyncedDataUpdated(net.minecraft.network.syncher.EntityDataAccessor) -> a
+    106:106:boolean onlyOpCanSetNbt() -> ci
+    23:23:net.minecraft.network.syncher.EntityDataAccessor access$000() -> v
+    23:23:net.minecraft.network.syncher.EntityDataAccessor access$100() -> x
     24:25:void <clinit>() -> <clinit>
-net.minecraft.world.entity.vehicle.MinecartCommandBlock$MinecartCommandBase -> bac$a:
+net.minecraft.world.entity.vehicle.MinecartCommandBlock$MinecartCommandBase -> bfx$a:
     net.minecraft.world.entity.vehicle.MinecartCommandBlock this$0 -> b
-    110:110:void <init>(net.minecraft.world.entity.vehicle.MinecartCommandBlock) -> <init>
-    113:113:net.minecraft.server.level.ServerLevel getLevel() -> d
-    118:120:void onUpdated() -> e
-    124:125:void writeCoordinates(io.netty.buffer.ByteBuf) -> a
-    129:129:net.minecraft.world.phys.Vec3 getPosition() -> f
-    133:133:net.minecraft.world.entity.vehicle.MinecartCommandBlock getMinecart() -> g
-    138:138:net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> h
-net.minecraft.world.entity.vehicle.MinecartFurnace -> bad:
+    109:109:void <init>(net.minecraft.world.entity.vehicle.MinecartCommandBlock) -> <init>
+    112:112:net.minecraft.server.level.ServerLevel getLevel() -> d
+    117:119:void onUpdated() -> e
+    123:123:net.minecraft.world.phys.Vec3 getPosition() -> f
+    127:127:net.minecraft.world.entity.vehicle.MinecartCommandBlock getMinecart() -> g
+    132:132:net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> h
+net.minecraft.world.entity.vehicle.MinecartFurnace -> bfy:
     net.minecraft.network.syncher.EntityDataAccessor DATA_ID_FUEL -> d
     int fuel -> e
     double xPush -> b
     double zPush -> c
     net.minecraft.world.item.crafting.Ingredient INGREDIENT -> f
-    36:37:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
-    40:41:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
-    45:45:net.minecraft.world.entity.vehicle.AbstractMinecart$Type getMinecartType() -> o
-    50:52:void defineSynchedData() -> w_
-    56:72:void tick() -> h
-    76:76:double getMaxSpeed() -> f
-    81:86:void destroy(net.minecraft.world.damagesource.DamageSource) -> a
-    91:108:void moveAlongTrack(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    112:128:void applyNaturalSlowdown() -> k
-    132:145:boolean interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> b
-    150:154:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-    158:162:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    165:165:boolean hasFuel() -> v
-    169:170:void setHasFuel(boolean) -> n
-    174:174:net.minecraft.world.level.block.state.BlockState getDefaultDisplayBlockState() -> q
-    28:33:void <clinit>() -> <clinit>
-net.minecraft.world.entity.vehicle.MinecartHopper -> bae:
+    37:38:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
+    41:42:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
+    46:46:net.minecraft.world.entity.vehicle.AbstractMinecart$Type getMinecartType() -> o
+    51:53:void defineSynchedData() -> e
+    57:73:void tick() -> j
+    77:77:double getMaxSpeed() -> g
+    82:87:void destroy(net.minecraft.world.damagesource.DamageSource) -> a
+    92:109:void moveAlongTrack(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    113:129:void applyNaturalSlowdown() -> i
+    133:146:net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    151:155:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
+    159:163:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    166:166:boolean hasFuel() -> u
+    170:171:void setHasFuel(boolean) -> o
+    175:175:net.minecraft.world.level.block.state.BlockState getDefaultDisplayBlockState() -> q
+    29:34:void <clinit>() -> <clinit>
+net.minecraft.world.entity.vehicle.MinecartHopper -> bfz:
     boolean enabled -> d
     int cooldownTime -> e
     net.minecraft.core.BlockPos lastPosition -> f
@@ -46156,23 +50444,23 @@ net.minecraft.world.entity.vehicle.MinecartHopper -> bae:
     37:37:net.minecraft.world.entity.vehicle.AbstractMinecart$Type getMinecartType() -> o
     42:42:net.minecraft.world.level.block.state.BlockState getDefaultDisplayBlockState() -> q
     47:47:int getDefaultDisplayOffset() -> s
-    52:52:int getContainerSize() -> O_
+    52:52:int getContainerSize() -> ab_
     57:62:void activateMinecart(int,int,int,boolean) -> a
-    65:65:boolean isEnabled() -> v
-    69:70:void setEnabled(boolean) -> n
-    74:74:net.minecraft.world.level.Level getLevel() -> w
-    79:79:double getLevelX() -> z
-    84:84:double getLevelY() -> A
-    89:89:double getLevelZ() -> B
-    94:113:void tick() -> h
-    116:126:boolean suckInItems() -> C
+    65:65:boolean isEnabled() -> u
+    69:70:void setEnabled(boolean) -> o
+    74:74:net.minecraft.world.level.Level getLevel() -> v
+    79:79:double getLevelX() -> x
+    84:84:double getLevelY() -> z
+    89:89:double getLevelZ() -> A
+    94:113:void tick() -> j
+    116:126:boolean suckInItems() -> B
     131:136:void destroy(net.minecraft.world.damagesource.DamageSource) -> a
     140:143:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     147:150:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     153:154:void setCooldown(int) -> m
-    157:157:boolean isOnCooldown() -> D
+    157:157:boolean isOnCooldown() -> C
     162:162:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
-net.minecraft.world.entity.vehicle.MinecartSpawner -> baf:
+net.minecraft.world.entity.vehicle.MinecartSpawner -> bga:
     net.minecraft.world.level.BaseSpawner spawner -> b
     12:31:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     12:35:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
@@ -46181,39 +50469,39 @@ net.minecraft.world.entity.vehicle.MinecartSpawner -> baf:
     49:51:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     55:57:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
     61:62:void handleEntityEvent(byte) -> a
-    66:68:void tick() -> h
-    71:71:net.minecraft.world.level.BaseSpawner getSpawner() -> v
-    76:76:boolean onlyOpCanSetNbt() -> cb
-net.minecraft.world.entity.vehicle.MinecartSpawner$1 -> baf$1:
+    66:68:void tick() -> j
+    71:71:net.minecraft.world.level.BaseSpawner getSpawner() -> u
+    76:76:boolean onlyOpCanSetNbt() -> ci
+net.minecraft.world.entity.vehicle.MinecartSpawner$1 -> bga$1:
     net.minecraft.world.entity.vehicle.MinecartSpawner this$0 -> a
     12:12:void <init>(net.minecraft.world.entity.vehicle.MinecartSpawner) -> <init>
     15:16:void broadcastEvent(int) -> a
     20:20:net.minecraft.world.level.Level getLevel() -> a
     25:25:net.minecraft.core.BlockPos getPos() -> b
-net.minecraft.world.entity.vehicle.MinecartTNT -> bag:
+net.minecraft.world.entity.vehicle.MinecartTNT -> bgb:
     int fuse -> b
     25:29:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level) -> <init>
     25:33:void <init>(net.minecraft.world.level.Level,double,double,double) -> <init>
     37:37:net.minecraft.world.entity.vehicle.AbstractMinecart$Type getMinecartType() -> o
     42:42:net.minecraft.world.level.block.state.BlockState getDefaultDisplayBlockState() -> q
-    47:63:void tick() -> h
+    47:63:void tick() -> j
     67:74:boolean hurt(net.minecraft.world.damagesource.DamageSource,float) -> a
     79:94:void destroy(net.minecraft.world.damagesource.DamageSource) -> a
     97:105:void explode(double) -> h
     109:114:boolean causeFallDamage(float,float) -> b
     119:122:void activateMinecart(int,int,int,boolean) -> a
     126:131:void handleEntityEvent(byte) -> a
-    134:142:void primeFuse() -> v
-    145:145:int getFuse() -> w
-    149:149:boolean isPrimed() -> z
+    134:142:void primeFuse() -> u
+    145:145:int getFuse() -> v
+    149:149:boolean isPrimed() -> x
     154:158:float getBlockExplosionResistance(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState,float) -> a
     163:167:boolean shouldBlockExplode(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,float) -> a
     172:176:void readAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     180:182:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> b
-net.minecraft.world.entity.vehicle.package-info -> bah:
-net.minecraft.world.food.FoodConstants -> bai:
+net.minecraft.world.entity.vehicle.package-info -> bgc:
+net.minecraft.world.food.FoodConstants -> bgd:
     3:3:void <init>() -> <init>
-net.minecraft.world.food.FoodData -> baj:
+net.minecraft.world.food.FoodData -> bge:
     int foodLevel -> a
     float saturationLevel -> b
     float exhaustionLevel -> c
@@ -46234,7 +50522,7 @@ net.minecraft.world.food.FoodData -> baj:
     123:124:void setFoodLevel(int) -> a
     127:128:void setSaturation(float) -> b
     131:132:void setExhaustion(float) -> c
-net.minecraft.world.food.FoodProperties -> bak:
+net.minecraft.world.food.FoodProperties -> bgf:
     int nutrition -> a
     float saturationModifier -> b
     boolean isMeat -> c
@@ -46249,8 +50537,8 @@ net.minecraft.world.food.FoodProperties -> bak:
     45:45:boolean isFastFood() -> e
     49:49:java.util.List getEffects() -> f
     9:9:void <init>(int,float,boolean,boolean,boolean,java.util.List,net.minecraft.world.food.FoodProperties$1) -> <init>
-net.minecraft.world.food.FoodProperties$1 -> bak$1:
-net.minecraft.world.food.FoodProperties$Builder -> bak$a:
+net.minecraft.world.food.FoodProperties$1 -> bgf$1:
+net.minecraft.world.food.FoodProperties$Builder -> bgf$a:
     int nutrition -> a
     float saturationModifier -> b
     boolean isMeat -> c
@@ -46265,7 +50553,7 @@ net.minecraft.world.food.FoodProperties$Builder -> bak$a:
     82:83:net.minecraft.world.food.FoodProperties$Builder fast() -> c
     87:88:net.minecraft.world.food.FoodProperties$Builder effect(net.minecraft.world.effect.MobEffectInstance,float) -> a
     92:92:net.minecraft.world.food.FoodProperties build() -> d
-net.minecraft.world.food.Foods -> bal:
+net.minecraft.world.food.Foods -> bgg:
     net.minecraft.world.food.FoodProperties APPLE -> a
     net.minecraft.world.food.FoodProperties BAKED_POTATO -> b
     net.minecraft.world.food.FoodProperties BEEF -> c
@@ -46308,8 +50596,8 @@ net.minecraft.world.food.Foods -> bal:
     8:8:void <init>() -> <init>
     70:70:net.minecraft.world.food.FoodProperties stew(int) -> a
     9:67:void <clinit>() -> <clinit>
-net.minecraft.world.food.package-info -> bam:
-net.minecraft.world.inventory.AbstractContainerMenu -> ban:
+net.minecraft.world.food.package-info -> bgh:
+net.minecraft.world.inventory.AbstractContainerMenu -> bgi:
     net.minecraft.core.NonNullList lastSlots -> c
     java.util.List slots -> a
     java.util.List dataSlots -> d
@@ -46321,49 +50609,52 @@ net.minecraft.world.inventory.AbstractContainerMenu -> ban:
     java.util.Set quickcraftSlots -> i
     java.util.List containerListeners -> j
     java.util.Set unSynchedPlayers -> k
-    31:487:void <init>(net.minecraft.world.inventory.MenuType,int) -> <init>
-    52:57:boolean stillValid(net.minecraft.world.inventory.ContainerLevelAccess,net.minecraft.world.entity.player.Player,net.minecraft.world.level.block.Block) -> a
-    61:64:net.minecraft.world.inventory.MenuType getType() -> a
-    68:72:void checkContainerSize(net.minecraft.world.Container,int) -> a
-    75:79:void checkContainerDataCount(net.minecraft.world.inventory.ContainerData,int) -> a
-    82:85:net.minecraft.world.inventory.Slot addSlot(net.minecraft.world.inventory.Slot) -> a
-    89:90:net.minecraft.world.inventory.DataSlot addDataSlot(net.minecraft.world.inventory.DataSlot) -> a
-    94:97:void addDataSlots(net.minecraft.world.inventory.ContainerData) -> a
-    100:107:void addSlotListener(net.minecraft.world.inventory.ContainerListener) -> a
-    110:111:void removeSlotListener(net.minecraft.world.inventory.ContainerListener) -> b
-    114:118:net.minecraft.core.NonNullList getItems() -> b
-    122:142:void broadcastChanges() -> c
-    145:145:boolean clickMenuButton(net.minecraft.world.entity.player.Player,int) -> a
-    150:156:net.minecraft.world.inventory.Slot getSlotFor(net.minecraft.world.Container,int) -> b
-    160:160:net.minecraft.world.inventory.Slot getSlot(int) -> a
-    164:168:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
-    173:423:net.minecraft.world.item.ItemStack clicked(int,int,net.minecraft.world.inventory.ClickType,net.minecraft.world.entity.player.Player) -> a
-    427:427:boolean consideredTheSameItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    431:431:boolean canTakeItemForPickAll(net.minecraft.world.item.ItemStack,net.minecraft.world.inventory.Slot) -> a
-    435:440:void removed(net.minecraft.world.entity.player.Player) -> b
-    443:453:void clearContainer(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.world.Container) -> a
-    456:457:void slotsChanged(net.minecraft.world.Container) -> a
-    460:461:void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    464:467:void setAll(java.util.List) -> a
-    470:476:void addItem(int,net.minecraft.world.item.ItemStack) -> b
-    479:480:void setData(int,int) -> a
-    483:484:short backup(net.minecraft.world.entity.player.Inventory) -> a
-    490:490:boolean isSynched(net.minecraft.world.entity.player.Player) -> c
-    494:499:void setSynched(net.minecraft.world.entity.player.Player,boolean) -> a
+    35:507:void <init>(net.minecraft.world.inventory.MenuType,int) -> <init>
+    56:61:boolean stillValid(net.minecraft.world.inventory.ContainerLevelAccess,net.minecraft.world.entity.player.Player,net.minecraft.world.level.block.Block) -> a
+    65:68:net.minecraft.world.inventory.MenuType getType() -> a
+    72:76:void checkContainerSize(net.minecraft.world.Container,int) -> a
+    79:83:void checkContainerDataCount(net.minecraft.world.inventory.ContainerData,int) -> a
+    86:89:net.minecraft.world.inventory.Slot addSlot(net.minecraft.world.inventory.Slot) -> a
+    93:94:net.minecraft.world.inventory.DataSlot addDataSlot(net.minecraft.world.inventory.DataSlot) -> a
+    98:101:void addDataSlots(net.minecraft.world.inventory.ContainerData) -> a
+    104:111:void addSlotListener(net.minecraft.world.inventory.ContainerListener) -> a
+    114:115:void removeSlotListener(net.minecraft.world.inventory.ContainerListener) -> b
+    118:122:net.minecraft.core.NonNullList getItems() -> b
+    126:146:void broadcastChanges() -> c
+    149:149:boolean clickMenuButton(net.minecraft.world.entity.player.Player,int) -> a
+    154:160:net.minecraft.world.inventory.Slot getSlotFor(net.minecraft.world.Container,int) -> b
+    164:164:net.minecraft.world.inventory.Slot getSlot(int) -> a
+    168:172:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
+    177:187:net.minecraft.world.item.ItemStack clicked(int,int,net.minecraft.world.inventory.ClickType,net.minecraft.world.entity.player.Player) -> a
+    193:443:net.minecraft.world.item.ItemStack doClick(int,int,net.minecraft.world.inventory.ClickType,net.minecraft.world.entity.player.Player) -> b
+    447:447:boolean consideredTheSameItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    451:451:boolean canTakeItemForPickAll(net.minecraft.world.item.ItemStack,net.minecraft.world.inventory.Slot) -> a
+    455:460:void removed(net.minecraft.world.entity.player.Player) -> b
+    463:473:void clearContainer(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.world.Container) -> a
+    476:477:void slotsChanged(net.minecraft.world.Container) -> a
+    480:481:void setItem(int,net.minecraft.world.item.ItemStack) -> a
+    484:487:void setAll(java.util.List) -> a
+    490:496:void addItem(int,net.minecraft.world.item.ItemStack) -> b
+    499:500:void setData(int,int) -> a
+    503:504:short backup(net.minecraft.world.entity.player.Inventory) -> a
+    510:510:boolean isSynched(net.minecraft.world.entity.player.Player) -> c
+    514:519:void setSynched(net.minecraft.world.entity.player.Player,boolean) -> a
     boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    504:569:boolean moveItemStackTo(net.minecraft.world.item.ItemStack,int,int,boolean) -> a
-    573:573:int getQuickcraftType(int) -> b
-    577:577:int getQuickcraftHeader(int) -> c
-    581:581:int getQuickcraftMask(int,int) -> b
-    585:594:boolean isValidQuickcraftType(int,net.minecraft.world.entity.player.Player) -> a
-    598:600:void resetQuickCraft() -> d
-    603:609:boolean canItemQuickReplace(net.minecraft.world.inventory.Slot,net.minecraft.world.item.ItemStack,boolean) -> a
-    613:626:void getQuickCraftSlotCount(java.util.Set,int,net.minecraft.world.item.ItemStack,int) -> a
-    629:629:boolean canDragTo(net.minecraft.world.inventory.Slot) -> b
-    633:637:int getRedstoneSignalFromBlockEntity(net.minecraft.world.level.block.entity.BlockEntity) -> a
-    641:657:int getRedstoneSignalFromContainer(net.minecraft.world.Container) -> b
-    53:56:java.lang.Boolean lambda$stillValid$0(net.minecraft.world.level.block.Block,net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.inventory.AbstractFurnaceMenu -> bao:
+    524:589:boolean moveItemStackTo(net.minecraft.world.item.ItemStack,int,int,boolean) -> a
+    593:593:int getQuickcraftType(int) -> b
+    597:597:int getQuickcraftHeader(int) -> c
+    601:601:int getQuickcraftMask(int,int) -> b
+    605:614:boolean isValidQuickcraftType(int,net.minecraft.world.entity.player.Player) -> a
+    618:620:void resetQuickCraft() -> d
+    623:629:boolean canItemQuickReplace(net.minecraft.world.inventory.Slot,net.minecraft.world.item.ItemStack,boolean) -> a
+    633:646:void getQuickCraftSlotCount(java.util.Set,int,net.minecraft.world.item.ItemStack,int) -> a
+    649:649:boolean canDragTo(net.minecraft.world.inventory.Slot) -> b
+    653:657:int getRedstoneSignalFromBlockEntity(net.minecraft.world.level.block.entity.BlockEntity) -> a
+    661:677:int getRedstoneSignalFromContainer(net.minecraft.world.Container) -> b
+    182:182:java.lang.String lambda$clicked$2() -> e
+    181:181:java.lang.String lambda$clicked$1() -> f
+    57:60:java.lang.Boolean lambda$stillValid$0(net.minecraft.world.level.block.Block,net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.inventory.AbstractFurnaceMenu -> bgj:
     net.minecraft.world.Container container -> d
     net.minecraft.world.inventory.ContainerData data -> e
     net.minecraft.world.level.Level level -> c
@@ -46385,76 +50676,55 @@ net.minecraft.world.inventory.AbstractFurnaceMenu -> bao:
     172:177:int getBurnProgress() -> j
     182:186:int getLitProgress() -> k
     190:190:boolean isLit() -> l
-net.minecraft.world.inventory.AnvilMenu -> bap:
-    org.apache.logging.log4j.Logger LOGGER -> c
-    net.minecraft.world.Container resultSlots -> d
-    net.minecraft.world.Container repairSlots -> e
-    net.minecraft.world.inventory.DataSlot cost -> f
-    net.minecraft.world.inventory.ContainerLevelAccess access -> g
+net.minecraft.world.inventory.AnvilMenu -> bgk:
+    org.apache.logging.log4j.Logger LOGGER -> g
     int repairItemCountCost -> h
     java.lang.String itemName -> i
-    net.minecraft.world.entity.player.Player player -> j
-    73:74:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
-    37:143:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
-    147:152:void slotsChanged(net.minecraft.world.Container) -> a
-    155:366:void createResult() -> e
-    369:369:int calculateIncreasedRepairCost(int) -> d
-    374:376:void removed(net.minecraft.world.entity.player.Player) -> b
-    380:385:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    390:422:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
-    426:439:void setItemName(java.lang.String) -> a
-    442:442:int getCost() -> f
-    381:384:java.lang.Boolean lambda$stillValid$1(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    375:375:void lambda$removed$0(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-    24:24:net.minecraft.world.inventory.DataSlot access$000(net.minecraft.world.inventory.AnvilMenu) -> a
-    24:24:net.minecraft.world.Container access$100(net.minecraft.world.inventory.AnvilMenu) -> b
-    24:24:int access$200(net.minecraft.world.inventory.AnvilMenu) -> c
-    25:25:void <clinit>() -> <clinit>
-net.minecraft.world.inventory.AnvilMenu$1 -> bap$1:
-    net.minecraft.world.inventory.AnvilMenu this$0 -> a
-    38:38:void <init>(net.minecraft.world.inventory.AnvilMenu,int) -> <init>
-    41:43:void setChanged() -> e
-net.minecraft.world.inventory.AnvilMenu$2 -> bap$2:
-    net.minecraft.world.inventory.ContainerLevelAccess val$access -> a
-    net.minecraft.world.inventory.AnvilMenu this$0 -> b
-    85:85:void <init>(net.minecraft.world.inventory.AnvilMenu,net.minecraft.world.Container,int,int,int,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
-    88:88:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-    93:93:boolean mayPickup(net.minecraft.world.entity.player.Player) -> a
-    98:131:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
-    117:130:void lambda$onTake$0(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.inventory.AnvilMenu$3 -> bap$3:
+    net.minecraft.world.inventory.DataSlot cost -> j
+    54:55:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
+    31:61:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
+    65:65:boolean isValidBlock(net.minecraft.world.level.block.state.BlockState) -> a
+    70:70:boolean mayPickup(net.minecraft.world.entity.player.Player,boolean) -> b
+    75:108:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+    113:324:void createResult() -> e
+    327:327:int calculateIncreasedRepairCost(int) -> d
+    331:344:void setItemName(java.lang.String) -> a
+    347:347:int getCost() -> f
+    94:107:void lambda$onTake$0(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    23:23:void <clinit>() -> <clinit>
+net.minecraft.world.inventory.AnvilMenu$1 -> bgk$1:
     int[] $SwitchMap$net$minecraft$world$item$enchantment$Enchantment$Rarity -> a
-    264:264:void <clinit>() -> <clinit>
-net.minecraft.world.inventory.BeaconMenu -> baq:
+    223:223:void <clinit>() -> <clinit>
+net.minecraft.world.inventory.BeaconMenu -> bgl:
     net.minecraft.world.Container beacon -> c
     net.minecraft.world.inventory.BeaconMenu$PaymentSlot paymentSlot -> d
     net.minecraft.world.inventory.ContainerLevelAccess access -> e
     net.minecraft.world.inventory.ContainerData beaconData -> f
-    42:43:void <init>(int,net.minecraft.world.Container) -> <init>
-    25:67:void <init>(int,net.minecraft.world.Container,net.minecraft.world.inventory.ContainerData,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
-    71:80:void removed(net.minecraft.world.entity.player.Player) -> b
-    84:84:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    89:91:void setData(int,int) -> a
-    95:134:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
-    138:138:int getLevels() -> e
-    143:143:net.minecraft.world.effect.MobEffect getPrimaryEffect() -> f
-    148:148:net.minecraft.world.effect.MobEffect getSecondaryEffect() -> g
-    152:157:void updateEffects(int,int) -> c
-    160:160:boolean hasPayment() -> h
-net.minecraft.world.inventory.BeaconMenu$1 -> baq$1:
+    41:42:void <init>(int,net.minecraft.world.Container) -> <init>
+    24:66:void <init>(int,net.minecraft.world.Container,net.minecraft.world.inventory.ContainerData,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
+    70:79:void removed(net.minecraft.world.entity.player.Player) -> b
+    83:83:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    88:90:void setData(int,int) -> a
+    94:133:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
+    137:137:int getLevels() -> e
+    142:142:net.minecraft.world.effect.MobEffect getPrimaryEffect() -> f
+    147:147:net.minecraft.world.effect.MobEffect getSecondaryEffect() -> g
+    151:156:void updateEffects(int,int) -> c
+    159:159:boolean hasPayment() -> h
+net.minecraft.world.inventory.BeaconMenu$1 -> bgl$1:
     net.minecraft.world.inventory.BeaconMenu this$0 -> a
-    25:25:void <init>(net.minecraft.world.inventory.BeaconMenu,int) -> <init>
-    28:28:boolean canPlaceItem(int,net.minecraft.world.item.ItemStack) -> b
-    33:33:int getMaxStackSize() -> L_
-net.minecraft.world.inventory.BeaconMenu$PaymentSlot -> baq$a:
+    24:24:void <init>(net.minecraft.world.inventory.BeaconMenu,int) -> <init>
+    27:27:boolean canPlaceItem(int,net.minecraft.world.item.ItemStack) -> b
+    32:32:int getMaxStackSize() -> X_
+net.minecraft.world.inventory.BeaconMenu$PaymentSlot -> bgl$a:
     net.minecraft.world.inventory.BeaconMenu this$0 -> a
-    164:166:void <init>(net.minecraft.world.inventory.BeaconMenu,net.minecraft.world.Container,int,int,int) -> <init>
-    170:171:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-    176:176:int getMaxStackSize() -> a
-net.minecraft.world.inventory.BlastFurnaceMenu -> bar:
+    163:165:void <init>(net.minecraft.world.inventory.BeaconMenu,net.minecraft.world.Container,int,int,int) -> <init>
+    169:169:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
+    174:174:int getMaxStackSize() -> a
+net.minecraft.world.inventory.BlastFurnaceMenu -> bgm:
     9:10:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
     13:14:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.Container,net.minecraft.world.inventory.ContainerData) -> <init>
-net.minecraft.world.inventory.BrewingStandMenu -> bas:
+net.minecraft.world.inventory.BrewingStandMenu -> bgn:
     net.minecraft.world.Container brewingStand -> c
     net.minecraft.world.inventory.ContainerData brewingStandData -> d
     net.minecraft.world.inventory.Slot ingredientSlot -> e
@@ -46464,22 +50734,22 @@ net.minecraft.world.inventory.BrewingStandMenu -> bas:
     71:118:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
     122:122:int getFuel() -> e
     126:126:int getBrewingTicks() -> f
-net.minecraft.world.inventory.BrewingStandMenu$FuelSlot -> bas$a:
+net.minecraft.world.inventory.BrewingStandMenu$FuelSlot -> bgn$a:
     178:179:void <init>(net.minecraft.world.Container,int,int,int) -> <init>
     183:183:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
     187:187:boolean mayPlaceItem(net.minecraft.world.item.ItemStack) -> a_
     192:192:int getMaxStackSize() -> a
-net.minecraft.world.inventory.BrewingStandMenu$IngredientsSlot -> bas$b:
+net.minecraft.world.inventory.BrewingStandMenu$IngredientsSlot -> bgn$b:
     162:163:void <init>(net.minecraft.world.Container,int,int,int) -> <init>
     167:167:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
     172:172:int getMaxStackSize() -> a
-net.minecraft.world.inventory.BrewingStandMenu$PotionSlot -> bas$c:
+net.minecraft.world.inventory.BrewingStandMenu$PotionSlot -> bgn$c:
     131:132:void <init>(net.minecraft.world.Container,int,int,int) -> <init>
     136:136:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
     141:141:int getMaxStackSize() -> a
     146:151:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
     155:156:boolean mayPlaceItem(net.minecraft.world.item.ItemStack) -> b_
-net.minecraft.world.inventory.CartographyTableMenu -> bat:
+net.minecraft.world.inventory.CartographyTableMenu -> bgo:
     net.minecraft.world.inventory.ContainerLevelAccess access -> d
     boolean quickMoved -> e
     long lastSoundTime -> f
@@ -46499,23 +50769,23 @@ net.minecraft.world.inventory.CartographyTableMenu -> bat:
     16:16:long access$000(net.minecraft.world.inventory.CartographyTableMenu) -> a
     16:16:long access$002(net.minecraft.world.inventory.CartographyTableMenu,long) -> a
     16:16:boolean access$100(net.minecraft.world.inventory.CartographyTableMenu) -> b
-net.minecraft.world.inventory.CartographyTableMenu$1 -> bat$1:
+net.minecraft.world.inventory.CartographyTableMenu$1 -> bgo$1:
     net.minecraft.world.inventory.CartographyTableMenu this$0 -> a
     30:30:void <init>(net.minecraft.world.inventory.CartographyTableMenu,int) -> <init>
-    33:35:void setChanged() -> e
-net.minecraft.world.inventory.CartographyTableMenu$2 -> bat$2:
+    33:35:void setChanged() -> Z_
+net.minecraft.world.inventory.CartographyTableMenu$2 -> bgo$2:
     net.minecraft.world.inventory.CartographyTableMenu this$0 -> a
     37:37:void <init>(net.minecraft.world.inventory.CartographyTableMenu) -> <init>
-    41:43:void setChanged() -> e
-net.minecraft.world.inventory.CartographyTableMenu$3 -> bat$3:
+    41:43:void setChanged() -> Z_
+net.minecraft.world.inventory.CartographyTableMenu$3 -> bgo$3:
     net.minecraft.world.inventory.CartographyTableMenu this$0 -> a
     55:55:void <init>(net.minecraft.world.inventory.CartographyTableMenu,net.minecraft.world.Container,int,int,int) -> <init>
     58:58:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.CartographyTableMenu$4 -> bat$4:
+net.minecraft.world.inventory.CartographyTableMenu$4 -> bgo$4:
     net.minecraft.world.inventory.CartographyTableMenu this$0 -> a
     62:62:void <init>(net.minecraft.world.inventory.CartographyTableMenu,net.minecraft.world.Container,int,int,int) -> <init>
     65:66:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.CartographyTableMenu$5 -> bat$5:
+net.minecraft.world.inventory.CartographyTableMenu$5 -> bgo$5:
     net.minecraft.world.inventory.ContainerLevelAccess val$access -> a
     net.minecraft.world.inventory.CartographyTableMenu this$0 -> b
     70:70:void <init>(net.minecraft.world.inventory.CartographyTableMenu,net.minecraft.world.Container,int,int,int,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
@@ -46525,7 +50795,7 @@ net.minecraft.world.inventory.CartographyTableMenu$5 -> bat$5:
     104:115:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
     108:113:void lambda$onTake$1(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     80:87:net.minecraft.world.item.ItemStack lambda$remove$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.inventory.ChestMenu -> bau:
+net.minecraft.world.inventory.ChestMenu -> bgp:
     net.minecraft.world.Container container -> c
     int containerRows -> d
     15:16:void <init>(net.minecraft.world.inventory.MenuType,int,net.minecraft.world.entity.player.Inventory,int) -> <init>
@@ -46543,7 +50813,7 @@ net.minecraft.world.inventory.ChestMenu -> bau:
     108:110:void removed(net.minecraft.world.entity.player.Player) -> b
     113:113:net.minecraft.world.Container getContainer() -> e
     117:117:int getRowCount() -> f
-net.minecraft.world.inventory.ClickType -> bav:
+net.minecraft.world.inventory.ClickType -> bgq:
     net.minecraft.world.inventory.ClickType PICKUP -> a
     net.minecraft.world.inventory.ClickType QUICK_MOVE -> b
     net.minecraft.world.inventory.ClickType SWAP -> c
@@ -46556,11 +50826,11 @@ net.minecraft.world.inventory.ClickType -> bav:
     3:3:net.minecraft.world.inventory.ClickType valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:4:void <clinit>() -> <clinit>
-net.minecraft.world.inventory.ContainerData -> baw:
+net.minecraft.world.inventory.ContainerData -> bgr:
     int get(int) -> a
     void set(int,int) -> a
     int getCount() -> a
-net.minecraft.world.inventory.ContainerLevelAccess -> bax:
+net.minecraft.world.inventory.ContainerLevelAccess -> bgs:
     net.minecraft.world.inventory.ContainerLevelAccess NULL -> a
     19:19:net.minecraft.world.inventory.ContainerLevelAccess create(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     java.util.Optional evaluate(java.util.function.BiFunction) -> a
@@ -46568,38 +50838,38 @@ net.minecraft.world.inventory.ContainerLevelAccess -> bax:
     34:38:void execute(java.util.function.BiConsumer) -> a
     35:36:java.util.Optional lambda$execute$0(java.util.function.BiConsumer,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.world.inventory.ContainerLevelAccess$1 -> bax$1:
+net.minecraft.world.inventory.ContainerLevelAccess$1 -> bgs$1:
     11:11:void <init>() -> <init>
     14:14:java.util.Optional evaluate(java.util.function.BiFunction) -> a
-net.minecraft.world.inventory.ContainerLevelAccess$2 -> bax$2:
+net.minecraft.world.inventory.ContainerLevelAccess$2 -> bgs$2:
     net.minecraft.world.level.Level val$level -> b
     net.minecraft.core.BlockPos val$pos -> c
     19:19:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> <init>
     22:22:java.util.Optional evaluate(java.util.function.BiFunction) -> a
-net.minecraft.world.inventory.ContainerListener -> bay:
+net.minecraft.world.inventory.ContainerListener -> bgt:
     void refreshContainer(net.minecraft.world.inventory.AbstractContainerMenu,net.minecraft.core.NonNullList) -> a
     void slotChanged(net.minecraft.world.inventory.AbstractContainerMenu,int,net.minecraft.world.item.ItemStack) -> a
     void setContainerData(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> a
-net.minecraft.world.inventory.CraftingContainer -> baz:
+net.minecraft.world.inventory.CraftingContainer -> bgu:
     net.minecraft.core.NonNullList items -> a
     int width -> b
     int height -> c
     net.minecraft.world.inventory.AbstractContainerMenu menu -> d
     16:21:void <init>(net.minecraft.world.inventory.AbstractContainerMenu,int,int) -> <init>
-    25:25:int getContainerSize() -> O_
+    25:25:int getContainerSize() -> ab_
     30:35:boolean isEmpty() -> c
     40:43:net.minecraft.world.item.ItemStack getItem(int) -> a
     47:50:net.minecraft.world.item.ItemStack getItem(int,int) -> b
     55:55:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
     60:64:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
     69:71:void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    75:75:void setChanged() -> e
+    75:75:void setChanged() -> Z_
     79:79:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    84:85:void clearContent() -> N_
+    84:85:void clearContent() -> aa_
     88:88:int getHeight() -> f
     92:92:int getWidth() -> g
     97:100:void fillStackedContents(net.minecraft.world.entity.player.StackedContents) -> a
-net.minecraft.world.inventory.CraftingMenu -> bba:
+net.minecraft.world.inventory.CraftingMenu -> bgv:
     net.minecraft.world.inventory.CraftingContainer craftSlots -> c
     net.minecraft.world.inventory.ResultContainer resultSlots -> d
     net.minecraft.world.inventory.ContainerLevelAccess access -> e
@@ -46622,7 +50892,7 @@ net.minecraft.world.inventory.CraftingMenu -> bba:
     119:119:void lambda$quickMoveStack$2(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     102:102:void lambda$removed$1(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     80:80:void lambda$slotsChanged$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.inventory.DataSlot -> bbb:
+net.minecraft.world.inventory.DataSlot -> bgw:
     int prevValue -> a
     3:3:void <init>() -> <init>
     5:5:net.minecraft.world.inventory.DataSlot forContainer(net.minecraft.world.inventory.ContainerData,int) -> a
@@ -46631,31 +50901,31 @@ net.minecraft.world.inventory.DataSlot -> bbb:
     int get() -> b
     void set(int) -> a
     55:58:boolean checkAndClearUpdateFlag() -> c
-net.minecraft.world.inventory.DataSlot$1 -> bbb$1:
+net.minecraft.world.inventory.DataSlot$1 -> bgw$1:
     net.minecraft.world.inventory.ContainerData val$container -> a
     int val$dataId -> b
     5:5:void <init>(net.minecraft.world.inventory.ContainerData,int) -> <init>
     8:8:int get() -> b
     13:14:void set(int) -> a
-net.minecraft.world.inventory.DataSlot$2 -> bbb$2:
+net.minecraft.world.inventory.DataSlot$2 -> bgw$2:
     int[] val$storage -> a
     int val$index -> b
     19:19:void <init>(int[],int) -> <init>
     22:22:int get() -> b
     27:28:void set(int) -> a
-net.minecraft.world.inventory.DataSlot$3 -> bbb$3:
+net.minecraft.world.inventory.DataSlot$3 -> bgw$3:
     int value -> a
     33:33:void <init>() -> <init>
     38:38:int get() -> b
     43:44:void set(int) -> a
-net.minecraft.world.inventory.DispenserMenu -> bbc:
+net.minecraft.world.inventory.DispenserMenu -> bgx:
     net.minecraft.world.Container dispenser -> c
     21:22:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
     25:44:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.Container) -> <init>
     48:48:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
     53:80:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
     85:87:void removed(net.minecraft.world.entity.player.Player) -> b
-net.minecraft.world.inventory.EnchantmentMenu -> bbd:
+net.minecraft.world.inventory.EnchantmentMenu -> bgy:
     net.minecraft.world.Container enchantSlots -> f
     net.minecraft.world.inventory.ContainerLevelAccess access -> g
     java.util.Random random -> h
@@ -46663,42 +50933,42 @@ net.minecraft.world.inventory.EnchantmentMenu -> bbd:
     int[] costs -> c
     int[] enchantClue -> d
     int[] levelClue -> e
-    41:42:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
-    24:88:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
-    92:162:void slotsChanged(net.minecraft.world.Container) -> a
-    166:218:boolean clickMenuButton(net.minecraft.world.entity.player.Player,int) -> a
-    222:230:java.util.List getEnchantmentList(net.minecraft.world.item.ItemStack,int,int) -> a
-    234:238:int getGoldCount() -> e
-    242:242:int getEnchantmentSeed() -> f
-    247:249:void removed(net.minecraft.world.entity.player.Player) -> b
-    253:253:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    258:298:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
-    248:248:void lambda$removed$2(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    176:215:void lambda$clickMenuButton$1(net.minecraft.world.item.ItemStack,int,net.minecraft.world.entity.player.Player,int,net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    104:159:void lambda$slotsChanged$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.inventory.EnchantmentMenu$1 -> bbd$1:
+    42:43:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
+    25:89:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
+    93:163:void slotsChanged(net.minecraft.world.Container) -> a
+    167:223:boolean clickMenuButton(net.minecraft.world.entity.player.Player,int) -> a
+    227:235:java.util.List getEnchantmentList(net.minecraft.world.item.ItemStack,int,int) -> a
+    239:243:int getGoldCount() -> e
+    247:247:int getEnchantmentSeed() -> f
+    252:254:void removed(net.minecraft.world.entity.player.Player) -> b
+    258:258:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    263:300:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
+    253:253:void lambda$removed$2(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    177:220:void lambda$clickMenuButton$1(net.minecraft.world.item.ItemStack,int,net.minecraft.world.entity.player.Player,int,net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    105:160:void lambda$slotsChanged$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.inventory.EnchantmentMenu$1 -> bgy$1:
     net.minecraft.world.inventory.EnchantmentMenu this$0 -> a
-    24:24:void <init>(net.minecraft.world.inventory.EnchantmentMenu,int) -> <init>
-    27:29:void setChanged() -> e
-net.minecraft.world.inventory.EnchantmentMenu$2 -> bbd$2:
+    25:25:void <init>(net.minecraft.world.inventory.EnchantmentMenu,int) -> <init>
+    28:30:void setChanged() -> Z_
+net.minecraft.world.inventory.EnchantmentMenu$2 -> bgy$2:
     net.minecraft.world.inventory.EnchantmentMenu this$0 -> a
-    47:47:void <init>(net.minecraft.world.inventory.EnchantmentMenu,net.minecraft.world.Container,int,int,int) -> <init>
-    50:50:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-    55:55:int getMaxStackSize() -> a
-net.minecraft.world.inventory.EnchantmentMenu$3 -> bbd$3:
+    48:48:void <init>(net.minecraft.world.inventory.EnchantmentMenu,net.minecraft.world.Container,int,int,int) -> <init>
+    51:51:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
+    56:56:int getMaxStackSize() -> a
+net.minecraft.world.inventory.EnchantmentMenu$3 -> bgy$3:
     net.minecraft.world.inventory.EnchantmentMenu this$0 -> a
-    59:59:void <init>(net.minecraft.world.inventory.EnchantmentMenu,net.minecraft.world.Container,int,int,int) -> <init>
-    62:62:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.FurnaceFuelSlot -> bbe:
+    60:60:void <init>(net.minecraft.world.inventory.EnchantmentMenu,net.minecraft.world.Container,int,int,int) -> <init>
+    63:63:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
+net.minecraft.world.inventory.FurnaceFuelSlot -> bgz:
     net.minecraft.world.inventory.AbstractFurnaceMenu menu -> a
     11:13:void <init>(net.minecraft.world.inventory.AbstractFurnaceMenu,net.minecraft.world.Container,int,int,int) -> <init>
     17:17:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
     22:22:int getMaxStackSize(net.minecraft.world.item.ItemStack) -> b
     26:26:boolean isBucket(net.minecraft.world.item.ItemStack) -> c_
-net.minecraft.world.inventory.FurnaceMenu -> bbf:
+net.minecraft.world.inventory.FurnaceMenu -> bha:
     9:10:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
     13:14:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.Container,net.minecraft.world.inventory.ContainerData) -> <init>
-net.minecraft.world.inventory.FurnaceResultSlot -> bbg:
+net.minecraft.world.inventory.FurnaceResultSlot -> bhb:
     net.minecraft.world.entity.player.Player player -> a
     int removeCount -> b
     13:15:void <init>(net.minecraft.world.entity.player.Player,net.minecraft.world.Container,int,int,int) -> <init>
@@ -46707,7 +50977,7 @@ net.minecraft.world.inventory.FurnaceResultSlot -> bbg:
     32:34:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
     39:41:void onQuickCraft(net.minecraft.world.item.ItemStack,int) -> a
     45:51:void checkTakeAchievements(net.minecraft.world.item.ItemStack) -> c
-net.minecraft.world.inventory.GrindstoneMenu -> bbh:
+net.minecraft.world.inventory.GrindstoneMenu -> bhc:
     net.minecraft.world.Container resultSlots -> c
     net.minecraft.world.Container repairSlots -> d
     net.minecraft.world.inventory.ContainerLevelAccess access -> e
@@ -46723,19 +50993,19 @@ net.minecraft.world.inventory.GrindstoneMenu -> bbh:
     244:244:void lambda$removed$1(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     221:221:boolean lambda$removeNonCurses$0(java.util.Map$Entry) -> a
     21:21:net.minecraft.world.Container access$000(net.minecraft.world.inventory.GrindstoneMenu) -> a
-net.minecraft.world.inventory.GrindstoneMenu$1 -> bbh$1:
+net.minecraft.world.inventory.GrindstoneMenu$1 -> bhc$1:
     net.minecraft.world.inventory.GrindstoneMenu this$0 -> a
     32:32:void <init>(net.minecraft.world.inventory.GrindstoneMenu,int) -> <init>
-    35:37:void setChanged() -> e
-net.minecraft.world.inventory.GrindstoneMenu$2 -> bbh$2:
+    35:37:void setChanged() -> Z_
+net.minecraft.world.inventory.GrindstoneMenu$2 -> bhc$2:
     net.minecraft.world.inventory.GrindstoneMenu this$0 -> a
     50:50:void <init>(net.minecraft.world.inventory.GrindstoneMenu,net.minecraft.world.Container,int,int,int) -> <init>
     53:53:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.GrindstoneMenu$3 -> bbh$3:
+net.minecraft.world.inventory.GrindstoneMenu$3 -> bhc$3:
     net.minecraft.world.inventory.GrindstoneMenu this$0 -> a
     56:56:void <init>(net.minecraft.world.inventory.GrindstoneMenu,net.minecraft.world.Container,int,int,int) -> <init>
     59:59:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.GrindstoneMenu$4 -> bbh$4:
+net.minecraft.world.inventory.GrindstoneMenu$4 -> bhc$4:
     net.minecraft.world.inventory.ContainerLevelAccess val$access -> a
     net.minecraft.world.inventory.GrindstoneMenu this$0 -> b
     62:62:void <init>(net.minecraft.world.inventory.GrindstoneMenu,net.minecraft.world.Container,int,int,int,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
@@ -46744,7 +51014,7 @@ net.minecraft.world.inventory.GrindstoneMenu$4 -> bbh$4:
     87:96:int getExperienceAmount(net.minecraft.world.level.Level) -> a
     100:111:int getExperienceFromItem(net.minecraft.world.item.ItemStack) -> e
     71:78:void lambda$onTake$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.inventory.HopperMenu -> bbi:
+net.minecraft.world.inventory.HopperMenu -> bhd:
     net.minecraft.world.Container hopper -> c
     16:17:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
     20:39:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.Container) -> <init>
@@ -46752,7 +51022,7 @@ net.minecraft.world.inventory.HopperMenu -> bbi:
     48:69:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
     74:76:void removed(net.minecraft.world.entity.player.Player) -> b
     79:79:net.minecraft.world.Container getContainer() -> e
-net.minecraft.world.inventory.HorseInventoryMenu -> bbj:
+net.minecraft.world.inventory.HorseInventoryMenu -> bhe:
     net.minecraft.world.Container horseContainer -> c
     net.minecraft.world.entity.animal.horse.AbstractHorse horse -> d
     16:70:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.Container,net.minecraft.world.entity.animal.horse.AbstractHorse) -> <init>
@@ -46760,20 +51030,20 @@ net.minecraft.world.inventory.HorseInventoryMenu -> bbj:
     79:122:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
     127:129:void removed(net.minecraft.world.entity.player.Player) -> b
     132:132:net.minecraft.world.Container getContainer() -> e
-net.minecraft.world.inventory.HorseInventoryMenu$1 -> bbj$1:
+net.minecraft.world.inventory.HorseInventoryMenu$1 -> bhe$1:
     net.minecraft.world.entity.animal.horse.AbstractHorse val$horse -> a
     net.minecraft.world.inventory.HorseInventoryMenu this$0 -> b
     25:25:void <init>(net.minecraft.world.inventory.HorseInventoryMenu,net.minecraft.world.Container,int,int,int,net.minecraft.world.entity.animal.horse.AbstractHorse) -> <init>
     28:28:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
     33:33:boolean isActive() -> b
-net.minecraft.world.inventory.HorseInventoryMenu$2 -> bbj$2:
+net.minecraft.world.inventory.HorseInventoryMenu$2 -> bhe$2:
     net.minecraft.world.entity.animal.horse.AbstractHorse val$horse -> a
     net.minecraft.world.inventory.HorseInventoryMenu this$0 -> b
     37:37:void <init>(net.minecraft.world.inventory.HorseInventoryMenu,net.minecraft.world.Container,int,int,int,net.minecraft.world.entity.animal.horse.AbstractHorse) -> <init>
     40:40:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
     45:45:boolean isActive() -> b
     50:50:int getMaxStackSize() -> a
-net.minecraft.world.inventory.InventoryMenu -> bbk:
+net.minecraft.world.inventory.InventoryMenu -> bhf:
     net.minecraft.resources.ResourceLocation BLOCK_ATLAS -> c
     net.minecraft.resources.ResourceLocation EMPTY_ARMOR_SLOT_HELMET -> d
     net.minecraft.resources.ResourceLocation EMPTY_ARMOR_SLOT_CHESTPLATE -> e
@@ -46790,18 +51060,19 @@ net.minecraft.world.inventory.InventoryMenu -> bbk:
     116:117:void fillCraftSlotsStackedContents(net.minecraft.world.entity.player.StackedContents) -> a
     121:123:void clearCraftingContent() -> e
     127:127:boolean recipeMatches(net.minecraft.world.item.crafting.Recipe) -> a
-    132:133:void slotsChanged(net.minecraft.world.Container) -> a
-    137:146:void removed(net.minecraft.world.entity.player.Player) -> b
-    150:150:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    155:213:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
-    218:218:boolean canTakeItemForPickAll(net.minecraft.world.item.ItemStack,net.minecraft.world.inventory.Slot) -> a
-    223:223:int getResultSlotIndex() -> f
-    228:228:int getGridWidth() -> g
-    233:233:int getGridHeight() -> h
-    238:238:int getSize() -> i
-    15:15:net.minecraft.resources.ResourceLocation[] access$000() -> j
+    134:135:void slotsChanged(net.minecraft.world.Container) -> a
+    139:148:void removed(net.minecraft.world.entity.player.Player) -> b
+    152:152:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    157:215:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
+    220:220:boolean canTakeItemForPickAll(net.minecraft.world.item.ItemStack,net.minecraft.world.inventory.Slot) -> a
+    225:225:int getResultSlotIndex() -> f
+    230:230:int getGridWidth() -> g
+    235:235:int getGridHeight() -> h
+    240:240:int getSize() -> i
+    244:244:net.minecraft.world.inventory.CraftingContainer getCraftSlots() -> j
+    15:15:net.minecraft.resources.ResourceLocation[] access$000() -> k
     29:45:void <clinit>() -> <clinit>
-net.minecraft.world.inventory.InventoryMenu$1 -> bbk$1:
+net.minecraft.world.inventory.InventoryMenu$1 -> bhf$1:
     net.minecraft.world.entity.EquipmentSlot val$slot -> a
     net.minecraft.world.inventory.InventoryMenu this$0 -> b
     71:71:void <init>(net.minecraft.world.inventory.InventoryMenu,net.minecraft.world.Container,int,int,int,net.minecraft.world.entity.EquipmentSlot) -> <init>
@@ -46809,11 +51080,38 @@ net.minecraft.world.inventory.InventoryMenu$1 -> bbk$1:
     79:79:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
     84:88:boolean mayPickup(net.minecraft.world.entity.player.Player) -> a
     93:93:com.mojang.datafixers.util.Pair getNoItemIcon() -> c
-net.minecraft.world.inventory.InventoryMenu$2 -> bbk$2:
+net.minecraft.world.inventory.InventoryMenu$2 -> bhf$2:
     net.minecraft.world.inventory.InventoryMenu this$0 -> a
     106:106:void <init>(net.minecraft.world.inventory.InventoryMenu,net.minecraft.world.Container,int,int,int) -> <init>
     109:109:com.mojang.datafixers.util.Pair getNoItemIcon() -> c
-net.minecraft.world.inventory.LecternMenu -> bbl:
+net.minecraft.world.inventory.ItemCombinerMenu -> bhg:
+    net.minecraft.world.Container resultSlots -> c
+    net.minecraft.world.Container inputSlots -> d
+    net.minecraft.world.inventory.ContainerLevelAccess access -> e
+    net.minecraft.world.entity.player.Player player -> f
+    boolean mayPickup(net.minecraft.world.entity.player.Player,boolean) -> b
+    net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+    boolean isValidBlock(net.minecraft.world.level.block.state.BlockState) -> a
+    21:71:void <init>(net.minecraft.world.inventory.MenuType,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
+    void createResult() -> e
+    77:82:void slotsChanged(net.minecraft.world.Container) -> a
+    86:88:void removed(net.minecraft.world.entity.player.Player) -> b
+    92:97:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    101:101:boolean shouldQuickMoveToAdditionalSlot(net.minecraft.world.item.ItemStack) -> a
+    106:139:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
+    93:96:java.lang.Boolean lambda$stillValid$1(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    87:87:void lambda$removed$0(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
+net.minecraft.world.inventory.ItemCombinerMenu$1 -> bhg$1:
+    net.minecraft.world.inventory.ItemCombinerMenu this$0 -> a
+    22:22:void <init>(net.minecraft.world.inventory.ItemCombinerMenu,int) -> <init>
+    25:27:void setChanged() -> Z_
+net.minecraft.world.inventory.ItemCombinerMenu$2 -> bhg$2:
+    net.minecraft.world.inventory.ItemCombinerMenu this$0 -> a
+    46:46:void <init>(net.minecraft.world.inventory.ItemCombinerMenu,net.minecraft.world.Container,int,int,int) -> <init>
+    49:49:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
+    54:54:boolean mayPickup(net.minecraft.world.entity.player.Player) -> a
+    59:59:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.world.inventory.LecternMenu -> bhh:
     net.minecraft.world.Container lectern -> c
     net.minecraft.world.inventory.ContainerData lecternData -> d
     22:23:void <init>(int) -> <init>
@@ -46823,11 +51121,11 @@ net.minecraft.world.inventory.LecternMenu -> bbl:
     84:84:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
     88:88:net.minecraft.world.item.ItemStack getBook() -> e
     92:92:int getPage() -> f
-net.minecraft.world.inventory.LecternMenu$1 -> bbl$1:
+net.minecraft.world.inventory.LecternMenu$1 -> bhh$1:
     net.minecraft.world.inventory.LecternMenu this$0 -> a
     31:31:void <init>(net.minecraft.world.inventory.LecternMenu,net.minecraft.world.Container,int,int,int) -> <init>
     34:36:void setChanged() -> d
-net.minecraft.world.inventory.LoomMenu -> bbm:
+net.minecraft.world.inventory.LoomMenu -> bhi:
     net.minecraft.world.inventory.ContainerLevelAccess access -> c
     net.minecraft.world.inventory.DataSlot selectedBannerPatternIndex -> d
     java.lang.Runnable slotUpdateListener -> e
@@ -46860,36 +51158,36 @@ net.minecraft.world.inventory.LoomMenu -> bbm:
     22:22:net.minecraft.world.inventory.DataSlot access$300(net.minecraft.world.inventory.LoomMenu) -> d
     22:22:long access$400(net.minecraft.world.inventory.LoomMenu) -> e
     22:22:long access$402(net.minecraft.world.inventory.LoomMenu,long) -> a
-net.minecraft.world.inventory.LoomMenu$1 -> bbm$1:
+net.minecraft.world.inventory.LoomMenu$1 -> bhi$1:
     net.minecraft.world.inventory.LoomMenu this$0 -> a
     39:39:void <init>(net.minecraft.world.inventory.LoomMenu,int) -> <init>
-    42:45:void setChanged() -> e
-net.minecraft.world.inventory.LoomMenu$2 -> bbm$2:
+    42:45:void setChanged() -> Z_
+net.minecraft.world.inventory.LoomMenu$2 -> bhi$2:
     net.minecraft.world.inventory.LoomMenu this$0 -> a
     48:48:void <init>(net.minecraft.world.inventory.LoomMenu,int) -> <init>
-    51:53:void setChanged() -> e
-net.minecraft.world.inventory.LoomMenu$3 -> bbm$3:
+    51:53:void setChanged() -> Z_
+net.minecraft.world.inventory.LoomMenu$3 -> bhi$3:
     net.minecraft.world.inventory.LoomMenu this$0 -> a
     64:64:void <init>(net.minecraft.world.inventory.LoomMenu,net.minecraft.world.Container,int,int,int) -> <init>
     67:67:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.LoomMenu$4 -> bbm$4:
+net.minecraft.world.inventory.LoomMenu$4 -> bhi$4:
     net.minecraft.world.inventory.LoomMenu this$0 -> a
     71:71:void <init>(net.minecraft.world.inventory.LoomMenu,net.minecraft.world.Container,int,int,int) -> <init>
     74:74:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.LoomMenu$5 -> bbm$5:
+net.minecraft.world.inventory.LoomMenu$5 -> bhi$5:
     net.minecraft.world.inventory.LoomMenu this$0 -> a
     78:78:void <init>(net.minecraft.world.inventory.LoomMenu,net.minecraft.world.Container,int,int,int) -> <init>
     81:81:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.LoomMenu$6 -> bbm$6:
+net.minecraft.world.inventory.LoomMenu$6 -> bhi$6:
     net.minecraft.world.inventory.ContainerLevelAccess val$access -> a
     net.minecraft.world.inventory.LoomMenu this$0 -> b
     85:85:void <init>(net.minecraft.world.inventory.LoomMenu,net.minecraft.world.Container,int,int,int,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
     88:88:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
     93:108:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
     100:105:void lambda$onTake$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.inventory.MenuConstructor -> bbn:
+net.minecraft.world.inventory.MenuConstructor -> bhj:
     net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
-net.minecraft.world.inventory.MenuType -> bbo:
+net.minecraft.world.inventory.MenuType -> bhk:
     net.minecraft.world.inventory.MenuType GENERIC_9x1 -> a
     net.minecraft.world.inventory.MenuType GENERIC_9x2 -> b
     net.minecraft.world.inventory.MenuType GENERIC_9x3 -> c
@@ -46910,25 +51208,26 @@ net.minecraft.world.inventory.MenuType -> bbo:
     net.minecraft.world.inventory.MenuType LOOM -> r
     net.minecraft.world.inventory.MenuType MERCHANT -> s
     net.minecraft.world.inventory.MenuType SHULKER_BOX -> t
-    net.minecraft.world.inventory.MenuType SMOKER -> u
-    net.minecraft.world.inventory.MenuType CARTOGRAPHY_TABLE -> v
-    net.minecraft.world.inventory.MenuType STONECUTTER -> w
-    net.minecraft.world.inventory.MenuType$MenuSupplier constructor -> x
-    37:37:net.minecraft.world.inventory.MenuType register(java.lang.String,net.minecraft.world.inventory.MenuType$MenuSupplier) -> a
-    42:44:void <init>(net.minecraft.world.inventory.MenuType$MenuSupplier) -> <init>
-    47:47:net.minecraft.world.inventory.AbstractContainerMenu create(int,net.minecraft.world.entity.player.Inventory) -> a
+    net.minecraft.world.inventory.MenuType SMITHING -> u
+    net.minecraft.world.inventory.MenuType SMOKER -> v
+    net.minecraft.world.inventory.MenuType CARTOGRAPHY_TABLE -> w
+    net.minecraft.world.inventory.MenuType STONECUTTER -> x
+    net.minecraft.world.inventory.MenuType$MenuSupplier constructor -> y
+    38:38:net.minecraft.world.inventory.MenuType register(java.lang.String,net.minecraft.world.inventory.MenuType$MenuSupplier) -> a
+    43:45:void <init>(net.minecraft.world.inventory.MenuType$MenuSupplier) -> <init>
+    48:48:net.minecraft.world.inventory.AbstractContainerMenu create(int,net.minecraft.world.entity.player.Inventory) -> a
     28:28:net.minecraft.world.inventory.LecternMenu lambda$static$0(int,net.minecraft.world.entity.player.Inventory) -> b
-    11:34:void <clinit>() -> <clinit>
-net.minecraft.world.inventory.MenuType$MenuSupplier -> bbo$a:
+    11:35:void <clinit>() -> <clinit>
+net.minecraft.world.inventory.MenuType$MenuSupplier -> bhk$a:
     net.minecraft.world.inventory.AbstractContainerMenu create(int,net.minecraft.world.entity.player.Inventory) -> create
-net.minecraft.world.inventory.MerchantContainer -> bbp:
+net.minecraft.world.inventory.MerchantContainer -> bhl:
     net.minecraft.world.item.trading.Merchant merchant -> a
     net.minecraft.core.NonNullList itemStacks -> b
     net.minecraft.world.item.trading.MerchantOffer activeOffer -> c
     int selectionHint -> d
     int futureXp -> e
     16:24:void <init>(net.minecraft.world.item.trading.Merchant) -> <init>
-    28:28:int getContainerSize() -> O_
+    28:28:int getContainerSize() -> ab_
     33:38:boolean isEmpty() -> c
     43:43:net.minecraft.world.item.ItemStack getItem(int) -> a
     48:57:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
@@ -46936,13 +51235,13 @@ net.minecraft.world.inventory.MerchantContainer -> bbp:
     66:66:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
     71:78:void setItem(int,net.minecraft.world.item.ItemStack) -> a
     82:82:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    87:88:void setChanged() -> e
+    87:88:void setChanged() -> Z_
     91:128:void updateSellItem() -> f
     132:132:net.minecraft.world.item.trading.MerchantOffer getActiveOffer() -> g
     136:138:void setSelectionHint(int) -> c
-    142:143:void clearContent() -> N_
+    142:143:void clearContent() -> aa_
     146:146:int getFutureXp() -> h
-net.minecraft.world.inventory.MerchantMenu -> bbq:
+net.minecraft.world.inventory.MerchantMenu -> bhm:
     net.minecraft.world.item.trading.Merchant trader -> c
     net.minecraft.world.inventory.MerchantContainer tradeContainer -> d
     int merchantLevel -> e
@@ -46971,7 +51270,7 @@ net.minecraft.world.inventory.MerchantMenu -> bbq:
     249:250:void setOffers(net.minecraft.world.item.trading.MerchantOffers) -> a
     253:253:net.minecraft.world.item.trading.MerchantOffers getOffers() -> i
     257:257:boolean showProgressBar() -> j
-net.minecraft.world.inventory.MerchantResultSlot -> bbr:
+net.minecraft.world.inventory.MerchantResultSlot -> bhn:
     net.minecraft.world.inventory.MerchantContainer slots -> a
     net.minecraft.world.entity.player.Player player -> b
     int removeCount -> g
@@ -46982,16 +51281,16 @@ net.minecraft.world.inventory.MerchantResultSlot -> bbr:
     37:39:void onQuickCraft(net.minecraft.world.item.ItemStack,int) -> a
     43:45:void checkTakeAchievements(net.minecraft.world.item.ItemStack) -> c
     49:67:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.PlayerEnderChestContainer -> bbs:
+net.minecraft.world.inventory.PlayerEnderChestContainer -> bho:
     net.minecraft.world.level.block.entity.EnderChestBlockEntity activeChest -> a
     14:15:void <init>() -> <init>
     18:19:void setActiveChest(net.minecraft.world.level.block.entity.EnderChestBlockEntity) -> a
-    22:32:void fromTag(net.minecraft.nbt.ListTag) -> a
-    35:45:net.minecraft.nbt.ListTag createTag() -> f
-    50:53:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    58:62:void startOpen(net.minecraft.world.entity.player.Player) -> a_
-    66:71:void stopOpen(net.minecraft.world.entity.player.Player) -> b_
-net.minecraft.world.inventory.RecipeBookMenu -> bbt:
+    23:33:void fromTag(net.minecraft.nbt.ListTag) -> a
+    37:47:net.minecraft.nbt.ListTag createTag() -> g
+    52:55:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    60:64:void startOpen(net.minecraft.world.entity.player.Player) -> c_
+    68:73:void stopOpen(net.minecraft.world.entity.player.Player) -> b_
+net.minecraft.world.inventory.RecipeBookMenu -> bhp:
     11:12:void <init>(net.minecraft.world.inventory.MenuType,int) -> <init>
     16:17:void handlePlacement(boolean,net.minecraft.world.item.crafting.Recipe,net.minecraft.server.level.ServerPlayer) -> a
     void fillCraftSlotsStackedContents(net.minecraft.world.entity.player.StackedContents) -> a
@@ -47001,27 +51300,27 @@ net.minecraft.world.inventory.RecipeBookMenu -> bbt:
     int getGridWidth() -> g
     int getGridHeight() -> h
     int getSize() -> i
-net.minecraft.world.inventory.RecipeHolder -> bbu:
+net.minecraft.world.inventory.RecipeHolder -> bhq:
     void setRecipeUsed(net.minecraft.world.item.crafting.Recipe) -> a
-    net.minecraft.world.item.crafting.Recipe getRecipeUsed() -> aa_
-    19:24:void awardAndReset(net.minecraft.world.entity.player.Player) -> b
+    net.minecraft.world.item.crafting.Recipe getRecipeUsed() -> am_
+    19:24:void awardUsedRecipes(net.minecraft.world.entity.player.Player) -> b
     27:32:boolean setRecipeUsed(net.minecraft.world.level.Level,net.minecraft.server.level.ServerPlayer,net.minecraft.world.item.crafting.Recipe) -> a
-net.minecraft.world.inventory.ResultContainer -> bbv:
+net.minecraft.world.inventory.ResultContainer -> bhr:
     net.minecraft.core.NonNullList itemStacks -> a
     net.minecraft.world.item.crafting.Recipe recipeUsed -> b
     12:13:void <init>() -> <init>
-    18:18:int getContainerSize() -> O_
+    18:18:int getContainerSize() -> ab_
     23:28:boolean isEmpty() -> c
     33:33:net.minecraft.world.item.ItemStack getItem(int) -> a
     38:38:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
     43:43:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
     48:49:void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    53:53:void setChanged() -> e
+    53:53:void setChanged() -> Z_
     57:57:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    62:63:void clearContent() -> N_
+    62:63:void clearContent() -> aa_
     67:68:void setRecipeUsed(net.minecraft.world.item.crafting.Recipe) -> a
-    73:73:net.minecraft.world.item.crafting.Recipe getRecipeUsed() -> aa_
-net.minecraft.world.inventory.ResultSlot -> bbw:
+    73:73:net.minecraft.world.item.crafting.Recipe getRecipeUsed() -> am_
+net.minecraft.world.inventory.ResultSlot -> bhs:
     net.minecraft.world.inventory.CraftingContainer craftSlots -> a
     net.minecraft.world.entity.player.Player player -> b
     int removeCount -> g
@@ -47032,23 +51331,23 @@ net.minecraft.world.inventory.ResultSlot -> bbw:
     41:42:void onSwapCraft(int) -> b
     46:53:void checkTakeAchievements(net.minecraft.world.item.ItemStack) -> c
     57:83:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.ShulkerBoxMenu -> bbx:
+net.minecraft.world.inventory.ShulkerBoxMenu -> bht:
     net.minecraft.world.Container container -> c
     16:17:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
     20:42:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.Container) -> <init>
     46:46:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
     51:72:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
     77:79:void removed(net.minecraft.world.entity.player.Player) -> b
-net.minecraft.world.inventory.ShulkerBoxSlot -> bby:
+net.minecraft.world.inventory.ShulkerBoxSlot -> bhu:
     10:11:void <init>(net.minecraft.world.Container,int,int,int) -> <init>
     15:15:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.inventory.SimpleContainerData -> bbz:
+net.minecraft.world.inventory.SimpleContainerData -> bhv:
     int[] ints -> a
     6:8:void <init>(int) -> <init>
     12:12:int get(int) -> a
     17:18:void set(int,int) -> a
     22:22:int getCount() -> a
-net.minecraft.world.inventory.Slot -> bca:
+net.minecraft.world.inventory.Slot -> bhw:
     int slot -> a
     net.minecraft.world.Container container -> c
     int index -> d
@@ -47073,12 +51372,26 @@ net.minecraft.world.inventory.Slot -> bca:
     108:108:boolean isAt(net.minecraft.world.Container,int) -> a
     112:112:boolean mayPickup(net.minecraft.world.entity.player.Player) -> a
     116:116:boolean isActive() -> b
-net.minecraft.world.inventory.SmokerMenu -> bcb:
+net.minecraft.world.inventory.SmithingMenu -> bhx:
+    net.minecraft.world.level.Level level -> g
+    net.minecraft.world.item.crafting.UpgradeRecipe selectedRecipe -> h
+    java.util.List recipes -> i
+    25:26:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
+    29:32:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
+    36:36:boolean isValidBlock(net.minecraft.world.level.block.state.BlockState) -> a
+    41:41:boolean mayPickup(net.minecraft.world.entity.player.Player,boolean) -> b
+    46:50:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+    54:57:void shrinkStackInSlot(int) -> d
+    61:69:void createResult() -> e
+    73:73:boolean shouldQuickMoveToAdditionalSlot(net.minecraft.world.item.ItemStack) -> a
+    73:73:boolean lambda$shouldQuickMoveToAdditionalSlot$1(net.minecraft.world.item.ItemStack,net.minecraft.world.item.crafting.UpgradeRecipe) -> a
+    49:49:void lambda$onTake$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.inventory.SmokerMenu -> bhy:
     9:10:void <init>(int,net.minecraft.world.entity.player.Inventory) -> <init>
     13:14:void <init>(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.Container,net.minecraft.world.inventory.ContainerData) -> <init>
-net.minecraft.world.inventory.StackedContentsCompatible -> bcc:
+net.minecraft.world.inventory.StackedContentsCompatible -> bhz:
     void fillStackedContents(net.minecraft.world.entity.player.StackedContents) -> a
-net.minecraft.world.inventory.StonecutterMenu -> bcd:
+net.minecraft.world.inventory.StonecutterMenu -> bia:
     net.minecraft.world.inventory.ContainerLevelAccess access -> f
     net.minecraft.world.inventory.DataSlot selectedRecipeIndex -> g
     net.minecraft.world.level.Level level -> h
@@ -47098,58 +51411,62 @@ net.minecraft.world.inventory.StonecutterMenu -> bcd:
     115:115:boolean hasInputItem() -> h
     120:120:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
     125:130:boolean clickMenuButton(net.minecraft.world.entity.player.Player,int) -> a
-    135:140:void slotsChanged(net.minecraft.world.Container) -> a
-    143:150:void setupRecipeList(net.minecraft.world.Container,net.minecraft.world.item.ItemStack) -> a
-    153:161:void setupResultSlot() -> i
-    165:165:net.minecraft.world.inventory.MenuType getType() -> a
-    169:170:void registerUpdateListener(java.lang.Runnable) -> a
-    174:174:boolean canTakeItemForPickAll(net.minecraft.world.item.ItemStack,net.minecraft.world.inventory.Slot) -> a
-    179:223:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
-    228:232:void removed(net.minecraft.world.entity.player.Player) -> b
-    231:231:void lambda$removed$1(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    134:134:boolean isValidRecipeIndex(int) -> d
+    139:144:void slotsChanged(net.minecraft.world.Container) -> a
+    147:154:void setupRecipeList(net.minecraft.world.Container,net.minecraft.world.item.ItemStack) -> a
+    157:165:void setupResultSlot() -> i
+    169:169:net.minecraft.world.inventory.MenuType getType() -> a
+    173:174:void registerUpdateListener(java.lang.Runnable) -> a
+    178:178:boolean canTakeItemForPickAll(net.minecraft.world.item.ItemStack,net.minecraft.world.inventory.Slot) -> a
+    183:227:net.minecraft.world.item.ItemStack quickMoveStack(net.minecraft.world.entity.player.Player,int) -> b
+    232:236:void removed(net.minecraft.world.entity.player.Player) -> b
+    235:235:void lambda$removed$1(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     38:38:void lambda$new$0() -> j
     19:19:java.lang.Runnable access$000(net.minecraft.world.inventory.StonecutterMenu) -> a
     19:19:void access$100(net.minecraft.world.inventory.StonecutterMenu) -> b
     19:19:long access$200(net.minecraft.world.inventory.StonecutterMenu) -> c
     19:19:long access$202(net.minecraft.world.inventory.StonecutterMenu,long) -> a
-net.minecraft.world.inventory.StonecutterMenu$1 -> bcd$1:
+net.minecraft.world.inventory.StonecutterMenu$1 -> bia$1:
     net.minecraft.world.inventory.StonecutterMenu this$0 -> a
     40:40:void <init>(net.minecraft.world.inventory.StonecutterMenu,int) -> <init>
-    43:46:void setChanged() -> e
-net.minecraft.world.inventory.StonecutterMenu$2 -> bcd$2:
+    43:46:void setChanged() -> Z_
+net.minecraft.world.inventory.StonecutterMenu$2 -> bia$2:
     net.minecraft.world.inventory.ContainerLevelAccess val$access -> a
     net.minecraft.world.inventory.StonecutterMenu this$0 -> b
     62:62:void <init>(net.minecraft.world.inventory.StonecutterMenu,net.minecraft.world.Container,int,int,int,net.minecraft.world.inventory.ContainerLevelAccess) -> <init>
     65:65:boolean mayPlace(net.minecraft.world.item.ItemStack) -> a
     70:86:net.minecraft.world.item.ItemStack onTake(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
     79:84:void lambda$onTake$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.inventory.package-info -> bce:
-net.minecraft.world.item.AirItem -> bcf:
+net.minecraft.world.inventory.package-info -> bib:
+net.minecraft.world.item.AirItem -> bic:
     net.minecraft.world.level.block.Block block -> a
     14:16:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
     20:20:java.lang.String getDescriptionId() -> a
     25:27:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-net.minecraft.world.item.ArmorItem -> bcg:
-    java.util.UUID[] ARMOR_MODIFIER_UUID_PER_SLOT -> k
+net.minecraft.world.item.ArmorItem -> bid:
+    java.util.UUID[] ARMOR_MODIFIER_UUID_PER_SLOT -> j
     net.minecraft.core.dispenser.DispenseItemBehavior DISPENSE_ITEM_BEHAVIOR -> a
     net.minecraft.world.entity.EquipmentSlot slot -> b
-    int defense -> c
-    float toughness -> d
-    net.minecraft.world.item.ArmorMaterial material -> e
-    40:57:boolean dispenseArmor(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-    66:73:void <init>(net.minecraft.world.item.ArmorMaterial,net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.Item$Properties) -> <init>
-    76:76:net.minecraft.world.entity.EquipmentSlot getSlot() -> b
-    81:81:int getEnchantmentValue() -> c
-    85:85:net.minecraft.world.item.ArmorMaterial getMaterial() -> Q_
-    90:90:boolean isValidRepairItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    95:105:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    110:118:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
-    122:122:int getDefense() -> e
-    25:32:void <clinit>() -> <clinit>
-net.minecraft.world.item.ArmorItem$1 -> bcg$1:
-    32:32:void <init>() -> <init>
-    35:35:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.item.ArmorMaterial -> bch:
+    int defense -> k
+    float toughness -> l
+    float knockbackResistance -> c
+    net.minecraft.world.item.ArmorMaterial material -> d
+    com.google.common.collect.Multimap defaultModifiers -> m
+    42:59:boolean dispenseArmor(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+    71:92:void <init>(net.minecraft.world.item.ArmorMaterial,net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.Item$Properties) -> <init>
+    95:95:net.minecraft.world.entity.EquipmentSlot getSlot() -> b
+    100:100:int getEnchantmentValue() -> c
+    104:104:net.minecraft.world.item.ArmorMaterial getMaterial() -> ad_
+    109:109:boolean isValidRepairItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    114:124:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    129:132:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
+    136:136:int getDefense() -> e
+    140:140:float getToughness() -> f
+    27:34:void <clinit>() -> <clinit>
+net.minecraft.world.item.ArmorItem$1 -> bid$1:
+    34:34:void <init>() -> <init>
+    37:37:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.world.item.ArmorMaterial -> bie:
     int getDurabilityForSlot(net.minecraft.world.entity.EquipmentSlot) -> a
     int getDefenseForSlot(net.minecraft.world.entity.EquipmentSlot) -> b
     int getEnchantmentValue() -> a
@@ -47157,178 +51474,169 @@ net.minecraft.world.item.ArmorMaterial -> bch:
     net.minecraft.world.item.crafting.Ingredient getRepairIngredient() -> c
     java.lang.String getName() -> d
     float getToughness() -> e
-net.minecraft.world.item.ArmorMaterials -> bci:
+    float getKnockbackResistance() -> f
+net.minecraft.world.item.ArmorMaterials -> bif:
     net.minecraft.world.item.ArmorMaterials LEATHER -> a
     net.minecraft.world.item.ArmorMaterials CHAIN -> b
     net.minecraft.world.item.ArmorMaterials IRON -> c
     net.minecraft.world.item.ArmorMaterials GOLD -> d
     net.minecraft.world.item.ArmorMaterials DIAMOND -> e
     net.minecraft.world.item.ArmorMaterials TURTLE -> f
-    int[] HEALTH_PER_SLOT -> g
-    java.lang.String name -> h
-    int durabilityMultiplier -> i
-    int[] slotProtections -> j
-    int enchantmentValue -> k
-    net.minecraft.sounds.SoundEvent sound -> l
-    float toughness -> m
-    net.minecraft.util.LazyLoadedValue repairIngredient -> n
-    net.minecraft.world.item.ArmorMaterials[] $VALUES -> o
+    net.minecraft.world.item.ArmorMaterials NETHERITE -> g
+    int[] HEALTH_PER_SLOT -> h
+    java.lang.String name -> i
+    int durabilityMultiplier -> j
+    int[] slotProtections -> k
+    int enchantmentValue -> l
+    net.minecraft.sounds.SoundEvent sound -> m
+    float toughness -> n
+    float knockbackResistance -> o
+    net.minecraft.util.LazyLoadedValue repairIngredient -> p
+    net.minecraft.world.item.ArmorMaterials[] $VALUES -> q
     11:11:net.minecraft.world.item.ArmorMaterials[] values() -> values
     11:11:net.minecraft.world.item.ArmorMaterials valueOf(java.lang.String) -> valueOf
-    33:41:void <init>(java.lang.String,int,java.lang.String,int,int[],int,net.minecraft.sounds.SoundEvent,float,java.util.function.Supplier) -> <init>
-    45:45:int getDurabilityForSlot(net.minecraft.world.entity.EquipmentSlot) -> a
-    50:50:int getDefenseForSlot(net.minecraft.world.entity.EquipmentSlot) -> b
-    55:55:int getEnchantmentValue() -> a
-    60:60:net.minecraft.sounds.SoundEvent getEquipSound() -> b
-    65:65:net.minecraft.world.item.crafting.Ingredient getRepairIngredient() -> c
-    70:70:java.lang.String getName() -> d
-    75:75:float getToughness() -> e
-    17:17:net.minecraft.world.item.crafting.Ingredient lambda$static$5() -> f
-    16:16:net.minecraft.world.item.crafting.Ingredient lambda$static$4() -> g
-    15:15:net.minecraft.world.item.crafting.Ingredient lambda$static$3() -> h
-    14:14:net.minecraft.world.item.crafting.Ingredient lambda$static$2() -> i
-    13:13:net.minecraft.world.item.crafting.Ingredient lambda$static$1() -> j
-    12:12:net.minecraft.world.item.crafting.Ingredient lambda$static$0() -> k
-    11:21:void <clinit>() -> <clinit>
-net.minecraft.world.item.ArmorStandItem -> bcj:
-    21:22:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    26:66:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    75:85:void randomizePose(net.minecraft.world.entity.decoration.ArmorStand,java.util.Random) -> a
-net.minecraft.world.item.ArrowItem -> bck:
+    35:44:void <init>(java.lang.String,int,java.lang.String,int,int[],int,net.minecraft.sounds.SoundEvent,float,float,java.util.function.Supplier) -> <init>
+    48:48:int getDurabilityForSlot(net.minecraft.world.entity.EquipmentSlot) -> a
+    53:53:int getDefenseForSlot(net.minecraft.world.entity.EquipmentSlot) -> b
+    58:58:int getEnchantmentValue() -> a
+    63:63:net.minecraft.sounds.SoundEvent getEquipSound() -> b
+    68:68:net.minecraft.world.item.crafting.Ingredient getRepairIngredient() -> c
+    73:73:java.lang.String getName() -> d
+    78:78:float getToughness() -> e
+    83:83:float getKnockbackResistance() -> f
+    18:18:net.minecraft.world.item.crafting.Ingredient lambda$static$6() -> g
+    17:17:net.minecraft.world.item.crafting.Ingredient lambda$static$5() -> h
+    16:16:net.minecraft.world.item.crafting.Ingredient lambda$static$4() -> i
+    15:15:net.minecraft.world.item.crafting.Ingredient lambda$static$3() -> j
+    14:14:net.minecraft.world.item.crafting.Ingredient lambda$static$2() -> k
+    13:13:net.minecraft.world.item.crafting.Ingredient lambda$static$1() -> l
+    12:12:net.minecraft.world.item.crafting.Ingredient lambda$static$0() -> m
+    11:22:void <clinit>() -> <clinit>
+net.minecraft.world.item.ArmorStandItem -> big:
+    19:20:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    24:51:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    60:70:void randomizePose(net.minecraft.world.entity.decoration.ArmorStand,java.util.Random) -> a
+net.minecraft.world.item.ArrowItem -> bih:
     10:11:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     14:16:net.minecraft.world.entity.projectile.AbstractArrow createArrow(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.item.AxeItem -> bcl:
-    java.util.Set DIGGABLES -> e
+net.minecraft.world.item.AxeItem -> bii:
+    java.util.Set DIGGABLE_MATERIALS -> c
+    java.util.Set OTHER_DIGGABLE_BLOCKS -> d
     java.util.Map STRIPABLES -> a
-    78:79:void <init>(net.minecraft.world.item.Tier,float,float,net.minecraft.world.item.Item$Properties) -> <init>
-    83:87:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
-    92:111:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    105:105:void lambda$useOn$0(net.minecraft.world.item.UseOnContext,net.minecraft.world.entity.player.Player) -> a
-    21:75:void <clinit>() -> <clinit>
-net.minecraft.world.item.BannerItem -> bcm:
+    63:64:void <init>(net.minecraft.world.item.Tier,float,float,net.minecraft.world.item.Item$Properties) -> <init>
+    68:72:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
+    77:96:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    90:90:void lambda$useOn$0(net.minecraft.world.item.UseOnContext,net.minecraft.world.entity.player.Player) -> a
+    21:60:void <clinit>() -> <clinit>
+net.minecraft.world.item.BannerItem -> bij:
     23:27:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
     30:45:void appendHoverTextFromBannerBlockEntityTag(net.minecraft.world.item.ItemStack,java.util.List) -> a
     48:48:net.minecraft.world.item.DyeColor getColor() -> b
     53:54:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-net.minecraft.world.item.BannerPatternItem -> bcn:
+net.minecraft.world.item.BannerPatternItem -> bik:
     net.minecraft.world.level.block.entity.BannerPattern bannerPattern -> a
-    16:18:void <init>(net.minecraft.world.level.block.entity.BannerPattern,net.minecraft.world.item.Item$Properties) -> <init>
-    21:21:net.minecraft.world.level.block.entity.BannerPattern getBannerPattern() -> b
-    26:27:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    30:30:net.minecraft.network.chat.Component getDisplayName() -> d
-net.minecraft.world.item.BedItem -> bco:
+    17:19:void <init>(net.minecraft.world.level.block.entity.BannerPattern,net.minecraft.world.item.Item$Properties) -> <init>
+    22:22:net.minecraft.world.level.block.entity.BannerPattern getBannerPattern() -> b
+    27:28:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+    31:31:net.minecraft.network.chat.MutableComponent getDisplayName() -> d
+net.minecraft.world.item.BedItem -> bil:
     8:9:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
     13:13:boolean placeBlock(net.minecraft.world.item.BlockPlaceContext,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.item.BlockItem -> bcp:
+net.minecraft.world.item.BlockItem -> bim:
     net.minecraft.world.level.block.Block block -> a
     35:37:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
     41:48:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    52:90:net.minecraft.world.InteractionResult place(net.minecraft.world.item.BlockPlaceContext) -> a
-    94:94:net.minecraft.sounds.SoundEvent getPlaceSound(net.minecraft.world.level.block.state.BlockState) -> a
-    99:99:net.minecraft.world.item.BlockPlaceContext updatePlacementContext(net.minecraft.world.item.BlockPlaceContext) -> b
-    103:103:boolean updateCustomBlockEntityTag(net.minecraft.core.BlockPos,net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
-    108:109:net.minecraft.world.level.block.state.BlockState getPlacementState(net.minecraft.world.item.BlockPlaceContext) -> c
-    113:130:net.minecraft.world.level.block.state.BlockState updateBlockStateFromTag(net.minecraft.core.BlockPos,net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
-    134:134:net.minecraft.world.level.block.state.BlockState updateState(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.properties.Property,java.lang.String) -> a
-    138:140:boolean canPlace(net.minecraft.world.item.BlockPlaceContext,net.minecraft.world.level.block.state.BlockState) -> b
-    144:144:boolean mustSurvive() -> T_
-    148:148:boolean placeBlock(net.minecraft.world.item.BlockPlaceContext,net.minecraft.world.level.block.state.BlockState) -> a
-    153:181:boolean updateCustomBlockEntityTag(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    186:186:java.lang.String getDescriptionId() -> a
-    191:194:void fillItemCategory(net.minecraft.world.item.CreativeModeTab,net.minecraft.core.NonNullList) -> a
-    198:200:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    203:203:net.minecraft.world.level.block.Block getBlock() -> e
-    207:208:void registerBlocks(java.util.Map,net.minecraft.world.item.Item) -> a
-    134:134:net.minecraft.world.level.block.state.BlockState lambda$updateState$0(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
-net.minecraft.world.item.BlockPlaceContext -> bcq:
+    52:91:net.minecraft.world.InteractionResult place(net.minecraft.world.item.BlockPlaceContext) -> a
+    95:95:net.minecraft.sounds.SoundEvent getPlaceSound(net.minecraft.world.level.block.state.BlockState) -> a
+    100:100:net.minecraft.world.item.BlockPlaceContext updatePlacementContext(net.minecraft.world.item.BlockPlaceContext) -> b
+    104:104:boolean updateCustomBlockEntityTag(net.minecraft.core.BlockPos,net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
+    109:110:net.minecraft.world.level.block.state.BlockState getPlacementState(net.minecraft.world.item.BlockPlaceContext) -> c
+    114:131:net.minecraft.world.level.block.state.BlockState updateBlockStateFromTag(net.minecraft.core.BlockPos,net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
+    135:135:net.minecraft.world.level.block.state.BlockState updateState(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.properties.Property,java.lang.String) -> a
+    139:141:boolean canPlace(net.minecraft.world.item.BlockPlaceContext,net.minecraft.world.level.block.state.BlockState) -> b
+    145:145:boolean mustSurvive() -> d
+    149:149:boolean placeBlock(net.minecraft.world.item.BlockPlaceContext,net.minecraft.world.level.block.state.BlockState) -> a
+    154:182:boolean updateCustomBlockEntityTag(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    187:187:java.lang.String getDescriptionId() -> a
+    192:195:void fillItemCategory(net.minecraft.world.item.CreativeModeTab,net.minecraft.core.NonNullList) -> a
+    199:201:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+    204:204:net.minecraft.world.level.block.Block getBlock() -> e
+    208:209:void registerBlocks(java.util.Map,net.minecraft.world.item.Item) -> a
+    135:135:net.minecraft.world.level.block.state.BlockState lambda$updateState$0(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
+net.minecraft.world.item.BlockPlaceContext -> bin:
     net.minecraft.core.BlockPos relativePos -> g
     boolean replaceClicked -> a
-    20:21:void <init>(net.minecraft.world.item.UseOnContext) -> <init>
-    16:28:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.item.ItemStack,net.minecraft.world.phys.BlockHitResult) -> <init>
-    31:40:net.minecraft.world.item.BlockPlaceContext at(net.minecraft.world.item.BlockPlaceContext,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    51:51:net.minecraft.core.BlockPos getClickedPos() -> a
-    55:55:boolean canPlace() -> b
-    59:59:boolean replacingClickedOnBlock() -> c
-    63:63:net.minecraft.core.Direction getNearestLookingDirection() -> d
-    67:87:net.minecraft.core.Direction[] getNearestLookingDirections() -> e
-net.minecraft.world.item.BoatItem -> bcr:
+    20:21:void <init>(net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.item.ItemStack,net.minecraft.world.phys.BlockHitResult) -> <init>
+    24:25:void <init>(net.minecraft.world.item.UseOnContext) -> <init>
+    16:32:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.item.ItemStack,net.minecraft.world.phys.BlockHitResult) -> <init>
+    35:44:net.minecraft.world.item.BlockPlaceContext at(net.minecraft.world.item.BlockPlaceContext,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    55:55:net.minecraft.core.BlockPos getClickedPos() -> a
+    59:59:boolean canPlace() -> b
+    63:63:boolean replacingClickedOnBlock() -> c
+    67:67:net.minecraft.core.Direction getNearestLookingDirection() -> d
+    71:91:net.minecraft.core.Direction[] getNearestLookingDirections() -> e
+net.minecraft.world.item.BoatItem -> bio:
     java.util.function.Predicate ENTITY_PREDICATE -> a
     net.minecraft.world.entity.vehicle.Boat$Type type -> b
     25:27:void <init>(net.minecraft.world.entity.vehicle.Boat$Type,net.minecraft.world.item.Item$Properties) -> <init>
     31:69:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.world.item.BoneMealItem -> bcs:
-    25:26:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    30:54:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    58:73:boolean growCrop(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    77:133:boolean growWaterPlant(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    137:152:void addGrowthParticles(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> a
-net.minecraft.world.item.BookItem -> bct:
+net.minecraft.world.item.BoneMealItem -> bip:
+    29:30:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    34:58:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    62:77:boolean growCrop(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    81:137:boolean growWaterPlant(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    141:181:void addGrowthParticles(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> a
+net.minecraft.world.item.BookItem -> biq:
     5:6:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    10:10:boolean isEnchantable(net.minecraft.world.item.ItemStack) -> g_
+    10:10:boolean isEnchantable(net.minecraft.world.item.ItemStack) -> f_
     15:15:int getEnchantmentValue() -> c
-net.minecraft.world.item.BottleItem -> bcu:
+net.minecraft.world.item.BottleItem -> bir:
     24:25:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     29:58:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
     62:70:net.minecraft.world.item.ItemStack turnBottleIntoItem(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
     29:29:boolean lambda$use$0(net.minecraft.world.entity.AreaEffectCloud) -> a
-net.minecraft.world.item.BowItem -> bcv:
-    23:41:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    45:105:void releaseUsing(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> a
-    108:113:float getPowerForTime(int) -> a
-    118:118:int getUseDuration(net.minecraft.world.item.ItemStack) -> f_
-    123:123:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> e_
-    128:134:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    139:139:java.util.function.Predicate getAllSupportedProjectiles() -> b
-    87:87:void lambda$releaseUsing$2(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.player.Player) -> a
-    39:39:float lambda$new$1(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> b
-    27:34:float lambda$new$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> c
-net.minecraft.world.item.BowlFoodItem -> bcw:
+net.minecraft.world.item.BowItem -> bis:
+    23:24:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    28:88:void releaseUsing(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> a
+    91:96:float getPowerForTime(int) -> a
+    101:101:int getUseDuration(net.minecraft.world.item.ItemStack) -> e_
+    106:106:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> d_
+    111:117:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    122:122:java.util.function.Predicate getAllSupportedProjectiles() -> b
+    127:127:int getDefaultProjectileRange() -> d
+    70:70:void lambda$releaseUsing$0(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.player.Player) -> a
+net.minecraft.world.item.BowlFoodItem -> bit:
     9:10:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     14:18:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.item.BucketItem -> bcx:
+net.minecraft.world.item.BucketItem -> biu:
     net.minecraft.world.level.material.Fluid content -> a
     36:38:void <init>(net.minecraft.world.level.material.Fluid,net.minecraft.world.item.Item$Properties) -> <init>
     42:91:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
     95:98:net.minecraft.world.item.ItemStack getEmptySuccessItem(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player) -> a
     102:102:void checkExtraContent(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos) -> a
-    105:116:net.minecraft.world.item.ItemStack createResultItem(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.item.Item) -> a
-    120:160:boolean emptyBucket(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.phys.BlockHitResult) -> a
-    165:167:void playEmptySound(net.minecraft.world.entity.player.Player,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.item.CarrotOnAStickItem -> bcy:
-    12:13:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    17:37:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    26:26:void lambda$use$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
-net.minecraft.world.item.ChorusFruitItem -> bcz:
-    13:14:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    18:45:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.item.ClockItem -> bda:
-    13:63:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-net.minecraft.world.item.ClockItem$1 -> bda$1:
-    double rotation -> b
-    double rota -> c
-    long lastUpdateTick -> d
-    net.minecraft.world.item.ClockItem this$0 -> a
-    17:17:void <init>(net.minecraft.world.item.ClockItem) -> <init>
-    24:44:float call(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> call
-    48:59:double wobble(net.minecraft.world.level.Level,double) -> a
-net.minecraft.world.item.CompassItem -> bdb:
-    16:80:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-net.minecraft.world.item.CompassItem$1 -> bdb$1:
-    double rotation -> b
-    double rota -> c
-    long lastUpdateTick -> d
-    net.minecraft.world.item.CompassItem this$0 -> a
-    20:20:void <init>(net.minecraft.world.item.CompassItem) -> <init>
-    27:52:float call(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> call
-    56:67:double wobble(net.minecraft.world.level.Level,double) -> a
-    71:71:double getFrameRotation(net.minecraft.world.entity.decoration.ItemFrame) -> a
-    75:76:double getSpawnToAngle(net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.Entity) -> a
-net.minecraft.world.item.ComplexItem -> bdc:
+    105:153:boolean emptyBucket(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.phys.BlockHitResult) -> a
+    157:159:void playEmptySound(net.minecraft.world.entity.player.Player,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.item.ChorusFruitItem -> biv:
+    15:16:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    20:49:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.item.CompassItem -> biw:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    29:30:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    33:34:boolean isLodestoneCompass(net.minecraft.world.item.ItemStack) -> d
+    39:39:boolean isFoil(net.minecraft.world.item.ItemStack) -> e
+    43:43:java.util.Optional getLodestoneDimension(net.minecraft.nbt.CompoundTag) -> a
+    48:65:void inventoryTick(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,int,boolean) -> a
+    69:92:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    96:99:void addLodestoneTags(net.minecraft.resources.ResourceKey,net.minecraft.core.BlockPos,net.minecraft.nbt.CompoundTag) -> a
+    103:103:java.lang.String getDescriptionId(net.minecraft.world.item.ItemStack) -> f
+    97:97:void lambda$addLodestoneTags$0(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> a
+    22:22:void <clinit>() -> <clinit>
+net.minecraft.world.item.ComplexItem -> bix:
     11:12:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    16:16:boolean isComplex() -> R_
+    16:16:boolean isComplex() -> ae_
     21:21:net.minecraft.network.protocol.Packet getUpdatePacket(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player) -> a
-net.minecraft.world.item.CreativeModeTab -> bdd:
+net.minecraft.world.item.CreativeModeTab -> biy:
     net.minecraft.world.item.CreativeModeTab[] TABS -> a
     net.minecraft.world.item.CreativeModeTab TAB_BUILDING_BLOCKS -> b
     net.minecraft.world.item.CreativeModeTab TAB_DECORATIONS -> c
@@ -47373,83 +51681,80 @@ net.minecraft.world.item.CreativeModeTab -> bdd:
     196:204:boolean hasEnchantmentCategory(net.minecraft.world.item.enchantment.EnchantmentCategory) -> a
     208:211:void fillItemList(net.minecraft.core.NonNullList) -> a
     13:97:void <clinit>() -> <clinit>
-net.minecraft.world.item.CreativeModeTab$1 -> bdd$1:
+net.minecraft.world.item.CreativeModeTab$1 -> biy$1:
     14:14:void <init>(int,java.lang.String) -> <init>
     17:17:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CreativeModeTab$10 -> bdd$2:
+net.minecraft.world.item.CreativeModeTab$10 -> biy$2:
     69:69:void <init>(int,java.lang.String) -> <init>
     72:72:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CreativeModeTab$11 -> bdd$3:
+net.minecraft.world.item.CreativeModeTab$11 -> biy$3:
     76:76:void <init>(int,java.lang.String) -> <init>
     79:79:net.minecraft.world.item.ItemStack makeIcon() -> f
     84:84:void fillItemList(net.minecraft.core.NonNullList) -> a
     89:89:boolean isAlignedRight() -> n
-net.minecraft.world.item.CreativeModeTab$12 -> bdd$4:
+net.minecraft.world.item.CreativeModeTab$12 -> biy$4:
     92:92:void <init>(int,java.lang.String) -> <init>
     95:95:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CreativeModeTab$2 -> bdd$5:
+net.minecraft.world.item.CreativeModeTab$2 -> biy$5:
     20:20:void <init>(int,java.lang.String) -> <init>
     23:23:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CreativeModeTab$3 -> bdd$6:
+net.minecraft.world.item.CreativeModeTab$3 -> biy$6:
     26:26:void <init>(int,java.lang.String) -> <init>
     29:29:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CreativeModeTab$4 -> bdd$7:
+net.minecraft.world.item.CreativeModeTab$4 -> biy$7:
     32:32:void <init>(int,java.lang.String) -> <init>
     35:35:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CreativeModeTab$5 -> bdd$8:
+net.minecraft.world.item.CreativeModeTab$5 -> biy$8:
     38:38:void <init>(int,java.lang.String) -> <init>
     41:41:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CreativeModeTab$6 -> bdd$9:
+net.minecraft.world.item.CreativeModeTab$6 -> biy$9:
     44:44:void <init>(int,java.lang.String) -> <init>
     47:47:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CreativeModeTab$7 -> bdd$10:
+net.minecraft.world.item.CreativeModeTab$7 -> biy$10:
     51:51:void <init>(int,java.lang.String) -> <init>
     54:54:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CreativeModeTab$8 -> bdd$11:
+net.minecraft.world.item.CreativeModeTab$8 -> biy$11:
     57:57:void <init>(int,java.lang.String) -> <init>
     60:60:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CreativeModeTab$9 -> bdd$12:
+net.minecraft.world.item.CreativeModeTab$9 -> biy$12:
     63:63:void <init>(int,java.lang.String) -> <init>
     66:66:net.minecraft.world.item.ItemStack makeIcon() -> f
-net.minecraft.world.item.CrossbowItem -> bde:
+net.minecraft.world.item.CrossbowItem -> biz:
     boolean startSoundPlayed -> c
     boolean midLoadSoundPlayed -> d
-    56:85:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    89:89:java.util.function.Predicate getSupportedHeldProjectiles() -> d
-    94:94:java.util.function.Predicate getAllSupportedProjectiles() -> b
-    99:115:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    120:130:void releaseUsing(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> a
-    133:154:boolean tryLoadProjectiles(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    158:175:boolean loadProjectile(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,boolean,boolean) -> a
-    179:180:boolean isCharged(net.minecraft.world.item.ItemStack) -> d
-    184:186:void setCharged(net.minecraft.world.item.ItemStack,boolean) -> a
-    189:200:void addChargedProjectile(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> b
-    203:216:java.util.List getChargedProjectiles(net.minecraft.world.item.ItemStack) -> j
-    220:226:void clearChargedProjectiles(net.minecraft.world.item.ItemStack) -> k
-    229:229:boolean containsChargedProjectile(net.minecraft.world.item.ItemStack,net.minecraft.world.item.Item) -> a
-    233:264:void shootProjectile(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,float,boolean,float,float,float) -> a
-    267:280:net.minecraft.world.entity.projectile.AbstractArrow getArrow(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    284:305:void performShooting(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand,net.minecraft.world.item.ItemStack,float,float) -> a
-    308:309:float[] getShotPitches(java.util.Random) -> a
-    313:314:float getRandomShotPitch(boolean) -> a
-    318:328:void onCrossbowShot(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    332:353:void onUseTick(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,int) -> a
-    357:357:int getUseDuration(net.minecraft.world.item.ItemStack) -> f_
-    361:362:int getChargeDuration(net.minecraft.world.item.ItemStack) -> e
-    367:367:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> e_
-    371:379:net.minecraft.sounds.SoundEvent getStartSound(int) -> a
-    384:388:float getPowerForTime(int,net.minecraft.world.item.ItemStack) -> a
-    393:411:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    414:417:float getShootingPower(net.minecraft.world.item.ItemStack) -> l
-    261:261:void lambda$shootProjectile$5(net.minecraft.world.InteractionHand,net.minecraft.world.entity.LivingEntity) -> a
-    229:229:boolean lambda$containsChargedProjectile$4(net.minecraft.world.item.Item,net.minecraft.world.item.ItemStack) -> a
-    83:83:float lambda$new$3(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> b
-    79:79:float lambda$new$2(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> c
-    75:75:float lambda$new$1(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> d
-    62:70:float lambda$new$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> e
-net.minecraft.world.item.DebugStickItem -> bdf:
+    57:60:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    64:64:java.util.function.Predicate getSupportedHeldProjectiles() -> e
+    69:69:java.util.function.Predicate getAllSupportedProjectiles() -> b
+    74:90:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    95:105:void releaseUsing(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> a
+    108:129:boolean tryLoadProjectiles(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    133:150:boolean loadProjectile(net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,boolean,boolean) -> a
+    154:155:boolean isCharged(net.minecraft.world.item.ItemStack) -> d
+    159:161:void setCharged(net.minecraft.world.item.ItemStack,boolean) -> a
+    164:175:void addChargedProjectile(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> b
+    178:191:java.util.List getChargedProjectiles(net.minecraft.world.item.ItemStack) -> k
+    195:201:void clearChargedProjectiles(net.minecraft.world.item.ItemStack) -> l
+    204:204:boolean containsChargedProjectile(net.minecraft.world.item.ItemStack,net.minecraft.world.item.Item) -> a
+    208:239:void shootProjectile(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,float,boolean,float,float,float) -> a
+    242:255:net.minecraft.world.entity.projectile.AbstractArrow getArrow(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    259:280:void performShooting(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand,net.minecraft.world.item.ItemStack,float,float) -> a
+    283:284:float[] getShotPitches(java.util.Random) -> a
+    288:289:float getRandomShotPitch(boolean) -> a
+    293:303:void onCrossbowShot(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    307:328:void onUseTick(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,int) -> a
+    332:332:int getUseDuration(net.minecraft.world.item.ItemStack) -> e_
+    336:337:int getChargeDuration(net.minecraft.world.item.ItemStack) -> g
+    342:342:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> d_
+    346:354:net.minecraft.sounds.SoundEvent getStartSound(int) -> a
+    359:363:float getPowerForTime(int,net.minecraft.world.item.ItemStack) -> a
+    368:386:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+    389:392:float getShootingPower(net.minecraft.world.item.ItemStack) -> m
+    397:397:int getDefaultProjectileRange() -> d
+    236:236:void lambda$shootProjectile$1(net.minecraft.world.InteractionHand,net.minecraft.world.entity.LivingEntity) -> a
+    204:204:boolean lambda$containsChargedProjectile$0(net.minecraft.world.item.Item,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.world.item.DebugStickItem -> bja:
     26:27:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    31:31:boolean isFoil(net.minecraft.world.item.ItemStack) -> d_
+    31:31:boolean isFoil(net.minecraft.world.item.ItemStack) -> e
     36:40:boolean canAttackBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
     45:53:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
     57:90:void handleInteraction(net.minecraft.world.entity.player.Player,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,boolean,net.minecraft.world.item.ItemStack) -> a
@@ -47457,19 +51762,20 @@ net.minecraft.world.item.DebugStickItem -> bdf:
     97:97:java.lang.Object getRelative(java.lang.Iterable,java.lang.Object,boolean) -> a
     101:102:void message(net.minecraft.world.entity.player.Player,net.minecraft.network.chat.Component) -> a
     105:105:java.lang.String getNameHelper(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.properties.Property) -> a
-net.minecraft.world.item.DiggerItem -> bdg:
+net.minecraft.world.item.DiggerItem -> bjb:
     java.util.Set blocks -> a
     float speed -> b
-    float attackDamage -> c
-    float attackSpeed -> d
-    22:27:void <init>(float,float,net.minecraft.world.item.Tier,java.util.Set,net.minecraft.world.item.Item$Properties) -> <init>
-    31:31:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
-    36:37:boolean hurtEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    43:46:boolean mineBlock(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
-    51:59:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
-    44:44:void lambda$mineBlock$1(net.minecraft.world.entity.LivingEntity) -> a
-    36:36:void lambda$hurtEnemy$0(net.minecraft.world.entity.LivingEntity) -> b
-net.minecraft.world.item.DirectionalPlaceContext -> bdh:
+    float attackDamageBaseline -> c
+    com.google.common.collect.Multimap defaultModifiers -> d
+    24:34:void <init>(float,float,net.minecraft.world.item.Tier,java.util.Set,net.minecraft.world.item.Item$Properties) -> <init>
+    38:38:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
+    43:44:boolean hurtEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    50:53:boolean mineBlock(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
+    58:61:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
+    65:65:float getAttackDamage() -> d
+    51:51:void lambda$mineBlock$1(net.minecraft.world.entity.LivingEntity) -> a
+    43:43:void lambda$hurtEnemy$0(net.minecraft.world.entity.LivingEntity) -> b
+net.minecraft.world.item.DirectionalPlaceContext -> bjc:
     net.minecraft.core.Direction direction -> g
     14:17:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> <init>
     21:21:net.minecraft.core.BlockPos getClickedPos() -> a
@@ -47480,13 +51786,13 @@ net.minecraft.world.item.DirectionalPlaceContext -> bdh:
     60:60:net.minecraft.core.Direction getHorizontalDirection() -> f
     65:65:boolean isSecondaryUseActive() -> g
     70:70:float getRotation() -> h
-net.minecraft.world.item.DirectionalPlaceContext$1 -> bdh$1:
+net.minecraft.world.item.DirectionalPlaceContext$1 -> bjc$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     41:41:void <clinit>() -> <clinit>
-net.minecraft.world.item.DoubleHighBlockItem -> bdi:
+net.minecraft.world.item.DoubleHighBlockItem -> bjd:
     9:10:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
     14:15:boolean placeBlock(net.minecraft.world.item.BlockPlaceContext,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.item.DyeColor -> bdj:
+net.minecraft.world.item.DyeColor -> bje:
     net.minecraft.world.item.DyeColor WHITE -> a
     net.minecraft.world.item.DyeColor ORANGE -> b
     net.minecraft.world.item.DyeColor MAGENTA -> c
@@ -47517,89 +51823,88 @@ net.minecraft.world.item.DyeColor -> bdj:
     12:12:net.minecraft.world.item.DyeColor[] values() -> values
     12:12:net.minecraft.world.item.DyeColor valueOf(java.lang.String) -> valueOf
     43:56:void <init>(java.lang.String,int,int,java.lang.String,int,net.minecraft.world.level.material.MaterialColor,int,int) -> <init>
-    59:59:int getId() -> a
-    63:63:java.lang.String getName() -> b
-    67:67:int getTextureDiffuseColorBGR() -> c
-    71:71:float[] getTextureDiffuseColors() -> d
-    75:75:net.minecraft.world.level.material.MaterialColor getMaterialColor() -> e
-    79:79:int getFireworkColor() -> f
-    83:83:int getTextColor() -> g
+    59:59:int getId() -> b
+    63:63:java.lang.String getName() -> c
+    67:67:int getTextureDiffuseColorBGR() -> d
+    71:71:float[] getTextureDiffuseColors() -> e
+    75:75:net.minecraft.world.level.material.MaterialColor getMaterialColor() -> f
+    79:79:int getFireworkColor() -> g
+    83:83:int getTextColor() -> h
     87:90:net.minecraft.world.item.DyeColor byId(int) -> a
     94:100:net.minecraft.world.item.DyeColor byName(java.lang.String,net.minecraft.world.item.DyeColor) -> a
     105:105:net.minecraft.world.item.DyeColor byFireworkColor(int) -> b
     110:110:java.lang.String toString() -> toString
-    115:115:java.lang.String getSerializedName() -> o
+    115:115:java.lang.String getSerializedName() -> a
     32:32:net.minecraft.world.item.DyeColor lambda$static$2(net.minecraft.world.item.DyeColor) -> a
     32:32:java.lang.Integer lambda$static$1(net.minecraft.world.item.DyeColor) -> b
     31:31:net.minecraft.world.item.DyeColor[] lambda$static$0(int) -> c
     12:32:void <clinit>() -> <clinit>
-net.minecraft.world.item.DyeItem -> bdk:
+net.minecraft.world.item.DyeItem -> bjf:
     java.util.Map ITEM_BY_COLOR -> a
     net.minecraft.world.item.DyeColor dyeColor -> b
-    17:20:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.item.Item$Properties) -> <init>
-    24:33:boolean interactEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand) -> a
-    37:37:net.minecraft.world.item.DyeColor getDyeColor() -> d
-    41:41:net.minecraft.world.item.DyeItem byColor(net.minecraft.world.item.DyeColor) -> a
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.world.item.DyeableArmorItem -> bdl:
+    18:21:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.item.Item$Properties) -> <init>
+    25:35:net.minecraft.world.InteractionResult interactLivingEntity(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand) -> a
+    39:39:net.minecraft.world.item.DyeColor getDyeColor() -> d
+    43:43:net.minecraft.world.item.DyeItem byColor(net.minecraft.world.item.DyeColor) -> a
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.world.item.DyeableArmorItem -> bjg:
     7:8:void <init>(net.minecraft.world.item.ArmorMaterial,net.minecraft.world.entity.EquipmentSlot,net.minecraft.world.item.Item$Properties) -> <init>
-net.minecraft.world.item.DyeableHorseArmorItem -> bdm:
+net.minecraft.world.item.DyeableHorseArmorItem -> bjh:
     5:6:void <init>(int,java.lang.String,net.minecraft.world.item.Item$Properties) -> <init>
-net.minecraft.world.item.DyeableLeatherItem -> bdn:
+net.minecraft.world.item.DyeableLeatherItem -> bji:
     14:15:boolean hasCustomColor(net.minecraft.world.item.ItemStack) -> a
     19:23:int getColor(net.minecraft.world.item.ItemStack) -> b
     27:31:void clearColor(net.minecraft.world.item.ItemStack) -> c
     34:35:void setColor(net.minecraft.world.item.ItemStack,int) -> a
     38:102:net.minecraft.world.item.ItemStack dyeArmor(net.minecraft.world.item.ItemStack,java.util.List) -> a
-net.minecraft.world.item.EggItem -> bdo:
+net.minecraft.world.item.EggItem -> bjj:
     14:15:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     19:31:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.ElytraItem -> bdp:
-    14:21:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    24:24:boolean isFlyEnabled(net.minecraft.world.item.ItemStack) -> e
-    29:29:boolean isValidRepairItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    34:44:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    18:18:float lambda$new$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> b
-net.minecraft.world.item.EmptyMapItem -> bdq:
-    12:13:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    17:31:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.EnchantedBookItem -> bdr:
+net.minecraft.world.item.ElytraItem -> bjk:
+    13:16:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    19:19:boolean isFlyEnabled(net.minecraft.world.item.ItemStack) -> d
+    24:24:boolean isValidRepairItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    29:39:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+net.minecraft.world.item.EmptyMapItem -> bjl:
+    13:14:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    18:35:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+net.minecraft.world.item.EnchantedBookItem -> bjm:
     21:22:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    26:26:boolean isFoil(net.minecraft.world.item.ItemStack) -> d_
-    31:31:boolean isEnchantable(net.minecraft.world.item.ItemStack) -> g_
-    35:40:net.minecraft.nbt.ListTag getEnchantments(net.minecraft.world.item.ItemStack) -> e
+    26:26:boolean isFoil(net.minecraft.world.item.ItemStack) -> e
+    31:31:boolean isEnchantable(net.minecraft.world.item.ItemStack) -> f_
+    35:40:net.minecraft.nbt.ListTag getEnchantments(net.minecraft.world.item.ItemStack) -> d
     45:47:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
     50:78:void addEnchantment(net.minecraft.world.item.ItemStack,net.minecraft.world.item.enchantment.EnchantmentInstance) -> a
     81:83:net.minecraft.world.item.ItemStack createForEnchantment(net.minecraft.world.item.enchantment.EnchantmentInstance) -> a
     88:103:void fillItemCategory(net.minecraft.world.item.CreativeModeTab,net.minecraft.core.NonNullList) -> a
-net.minecraft.world.item.EnchantedGoldenAppleItem -> bds:
+net.minecraft.world.item.EnchantedGoldenAppleItem -> bjn:
     5:6:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    10:10:boolean isFoil(net.minecraft.world.item.ItemStack) -> d_
-net.minecraft.world.item.EndCrystalItem -> bdt:
+    10:10:boolean isFoil(net.minecraft.world.item.ItemStack) -> e
+net.minecraft.world.item.EndCrystalItem -> bjo:
     18:19:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    23:56:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    61:61:boolean isFoil(net.minecraft.world.item.ItemStack) -> d_
-net.minecraft.world.item.EnderEyeItem -> bdu:
+    23:57:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    62:62:boolean isFoil(net.minecraft.world.item.ItemStack) -> e
+net.minecraft.world.item.EnderEyeItem -> bjp:
     29:30:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     34:67:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
     72:103:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.EnderpearlItem -> bdv:
+net.minecraft.world.item.EnderpearlItem -> bjq:
     15:16:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     20:34:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.ExperienceBottleItem -> bdw:
+net.minecraft.world.item.ExperienceBottleItem -> bjr:
     14:15:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    19:19:boolean isFoil(net.minecraft.world.item.ItemStack) -> d_
+    19:19:boolean isFoil(net.minecraft.world.item.ItemStack) -> e
     24:36:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.FireChargeItem -> bdx:
-    15:16:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    20:45:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    49:50:void playSound(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.item.FireworkRocketItem -> bdy:
+net.minecraft.world.item.FireChargeItem -> bjs:
+    16:17:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    21:44:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    48:49:void playSound(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.item.FireworkRocketItem -> bjt:
     39:40:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    78:95:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    100:111:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    117:142:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-net.minecraft.world.item.FireworkRocketItem$Shape -> bdy$a:
+    78:96:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    101:112:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    118:143:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+net.minecraft.world.item.FireworkRocketItem$Shape -> bjt$a:
     net.minecraft.world.item.FireworkRocketItem$Shape SMALL_BALL -> a
     net.minecraft.world.item.FireworkRocketItem$Shape LARGE_BALL -> b
     net.minecraft.world.item.FireworkRocketItem$Shape STAR -> c
@@ -47618,168 +51923,160 @@ net.minecraft.world.item.FireworkRocketItem$Shape -> bdy$a:
     50:50:net.minecraft.world.item.FireworkRocketItem$Shape[] lambda$static$1(int) -> b
     50:50:int lambda$static$0(net.minecraft.world.item.FireworkRocketItem$Shape) -> a
     42:50:void <clinit>() -> <clinit>
-net.minecraft.world.item.FireworkStarItem -> bdz:
-    15:16:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    20:24:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    27:51:void appendHoverText(net.minecraft.nbt.CompoundTag,java.util.List) -> a
-    54:61:net.minecraft.network.chat.Component appendColors(net.minecraft.network.chat.Component,int[]) -> a
-    65:69:net.minecraft.network.chat.Component getColorName(int) -> a
-net.minecraft.world.item.FishBucketItem -> bea:
+net.minecraft.world.item.FireworkStarItem -> bju:
+    16:17:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    21:25:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+    28:52:void appendHoverText(net.minecraft.nbt.CompoundTag,java.util.List) -> a
+    55:62:net.minecraft.network.chat.Component appendColors(net.minecraft.network.chat.MutableComponent,int[]) -> a
+    66:70:net.minecraft.network.chat.Component getColorName(int) -> a
+net.minecraft.world.item.FishBucketItem -> bjv:
     net.minecraft.world.entity.EntityType type -> a
-    28:30:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.material.Fluid,net.minecraft.world.item.Item$Properties) -> <init>
-    34:37:void checkExtraContent(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos) -> a
-    41:42:void playEmptySound(net.minecraft.world.entity.player.Player,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    45:50:void spawn(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos) -> b
-    54:78:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-net.minecraft.world.item.FishingRodItem -> beb:
-    16:33:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    37:53:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    58:58:int getEnchantmentValue() -> c
-    41:41:void lambda$use$1(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
-    21:30:float lambda$new$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> b
-net.minecraft.world.item.FlintAndSteelItem -> bec:
-    22:23:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    27:56:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    60:60:boolean canLightCampFire(net.minecraft.world.level.block.state.BlockState) -> a
-    64:73:boolean canUse(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    50:50:void lambda$useOn$1(net.minecraft.world.item.UseOnContext,net.minecraft.world.entity.player.Player) -> a
-    36:36:void lambda$useOn$0(net.minecraft.world.item.UseOnContext,net.minecraft.world.entity.player.Player) -> b
-net.minecraft.world.item.GameMasterBlockItem -> bed:
+    29:31:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.level.material.Fluid,net.minecraft.world.item.Item$Properties) -> <init>
+    35:38:void checkExtraContent(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos) -> a
+    42:43:void playEmptySound(net.minecraft.world.entity.player.Player,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    46:51:void spawn(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos) -> b
+    55:79:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+net.minecraft.world.item.FishingRodItem -> bjw:
+    15:16:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    20:36:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    41:41:int getEnchantmentValue() -> c
+    24:24:void lambda$use$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
+net.minecraft.world.item.FlintAndSteelItem -> bjx:
+    20:21:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    25:55:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    49:49:void lambda$useOn$1(net.minecraft.world.item.UseOnContext,net.minecraft.world.entity.player.Player) -> a
+    34:34:void lambda$useOn$0(net.minecraft.world.item.UseOnContext,net.minecraft.world.entity.player.Player) -> b
+net.minecraft.world.item.FoodOnAStickItem -> bjy:
+    net.minecraft.world.entity.EntityType canInteractWith -> a
+    int consumeItemDamage -> b
+    17:21:void <init>(net.minecraft.world.item.Item$Properties,net.minecraft.world.entity.EntityType,int) -> <init>
+    25:48:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    36:36:void lambda$use$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
+net.minecraft.world.item.GameMasterBlockItem -> bjz:
     11:12:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
     17:18:net.minecraft.world.level.block.state.BlockState getPlacementState(net.minecraft.world.item.BlockPlaceContext) -> c
-net.minecraft.world.item.HangingEntityItem -> bee:
+net.minecraft.world.item.HangingEntityItem -> bka:
     net.minecraft.world.entity.EntityType type -> a
     18:20:void <init>(net.minecraft.world.entity.EntityType,net.minecraft.world.item.Item$Properties) -> <init>
     24:59:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
     63:63:boolean mayPlace(net.minecraft.world.entity.player.Player,net.minecraft.core.Direction,net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.item.HoeItem -> bef:
-    float attackSpeed -> b
+net.minecraft.world.item.HoeItem -> bkb:
+    java.util.Set DIGGABLES -> c
     java.util.Map TILLABLES -> a
-    34:37:void <init>(net.minecraft.world.item.Tier,float,net.minecraft.world.item.Item$Properties) -> <init>
-    41:61:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    66:67:boolean hurtEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    72:80:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
-    66:66:void lambda$hurtEnemy$1(net.minecraft.world.entity.LivingEntity) -> a
-    54:54:void lambda$useOn$0(net.minecraft.world.item.UseOnContext,net.minecraft.world.entity.player.Player) -> a
-    26:30:void <clinit>() -> <clinit>
-net.minecraft.world.item.HoneyBottleItem -> beg:
+    46:47:void <init>(net.minecraft.world.item.Tier,int,float,net.minecraft.world.item.Item$Properties) -> <init>
+    51:71:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    64:64:void lambda$useOn$0(net.minecraft.world.item.UseOnContext,net.minecraft.world.entity.player.Player) -> a
+    21:42:void <clinit>() -> <clinit>
+net.minecraft.world.item.HoneyBottleItem -> bkc:
     20:21:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     25:47:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-    52:52:int getUseDuration(net.minecraft.world.item.ItemStack) -> f_
-    57:57:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> e_
-    62:62:net.minecraft.sounds.SoundEvent getDrinkingSound() -> U_
-    67:67:net.minecraft.sounds.SoundEvent getEatingSound() -> S_
-    72:73:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.HorseArmorItem -> beh:
+    52:52:int getUseDuration(net.minecraft.world.item.ItemStack) -> e_
+    57:57:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> d_
+    62:62:net.minecraft.sounds.SoundEvent getDrinkingSound() -> ag_
+    67:67:net.minecraft.sounds.SoundEvent getEatingSound() -> af_
+    72:72:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+net.minecraft.world.item.HorseArmorItem -> bkd:
     int protection -> a
     java.lang.String texture -> b
     12:15:void <init>(int,java.lang.String,net.minecraft.world.item.Item$Properties) -> <init>
     18:18:net.minecraft.resources.ResourceLocation getTexture() -> f
     22:22:int getProtection() -> g
-net.minecraft.world.item.Item -> bei:
-    java.util.Map BY_BLOCK -> f
-    net.minecraft.world.item.ItemPropertyFunction PROPERTY_DAMAGED -> a
-    net.minecraft.world.item.ItemPropertyFunction PROPERTY_DAMAGE -> b
-    net.minecraft.world.item.ItemPropertyFunction PROPERTY_LEFTHANDED -> c
-    net.minecraft.world.item.ItemPropertyFunction PROPERTY_COOLDOWN -> d
-    net.minecraft.world.item.ItemPropertyFunction PROPERTY_CUSTOM_MODEL_DATA -> e
-    java.util.UUID BASE_ATTACK_DAMAGE_UUID -> g
-    java.util.UUID BASE_ATTACK_SPEED_UUID -> h
-    java.util.Random random -> i
-    java.util.Map properties -> k
-    net.minecraft.world.item.CreativeModeTab category -> j
-    net.minecraft.world.item.Rarity rarity -> l
-    int maxStackSize -> m
-    int maxDamage -> n
-    net.minecraft.world.item.Item craftingRemainingItem -> o
-    java.lang.String descriptionId -> p
-    net.minecraft.world.food.FoodProperties foodProperties -> q
-    63:63:int getId(net.minecraft.world.item.Item) -> a
-    67:67:net.minecraft.world.item.Item byId(int) -> b
-    73:73:net.minecraft.world.item.Item byBlock(net.minecraft.world.level.block.Block) -> a
-    76:108:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    158:158:void onUseTick(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,int) -> a
-    162:162:net.minecraft.world.item.ItemPropertyFunction getProperty(net.minecraft.resources.ResourceLocation) -> a
-    166:166:boolean hasProperties() -> h
-    170:170:boolean verifyTagAfterLoad(net.minecraft.nbt.CompoundTag) -> a
-    174:174:boolean canAttackBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    179:179:net.minecraft.world.item.Item asItem() -> i
-    183:184:void addProperty(net.minecraft.resources.ResourceLocation,net.minecraft.world.item.ItemPropertyFunction) -> a
-    187:187:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    191:191:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
-    195:203:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    207:210:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-    214:214:int getMaxStackSize() -> j
-    218:218:int getMaxDamage() -> k
-    222:222:boolean canBeDepleted() -> l
-    229:229:boolean hurtEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    236:236:boolean mineBlock(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
-    240:240:boolean canDestroySpecial(net.minecraft.world.level.block.state.BlockState) -> b
-    244:244:boolean interactEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand) -> a
-    248:248:net.minecraft.network.chat.Component getDescription() -> m
-    254:254:java.lang.String toString() -> toString
-    258:261:java.lang.String getOrCreateDescriptionId() -> n
-    268:268:java.lang.String getDescriptionId() -> a
-    272:272:java.lang.String getDescriptionId(net.minecraft.world.item.ItemStack) -> f
-    276:276:boolean shouldOverrideMultiplayerNbt() -> o
-    282:282:net.minecraft.world.item.Item getCraftingRemainingItem() -> p
-    286:286:boolean hasCraftingRemainingItem() -> q
-    290:290:void inventoryTick(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,int,boolean) -> a
-    293:293:void onCraftedBy(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player) -> b
-    296:296:boolean isComplex() -> R_
-    300:300:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> e_
-    304:307:int getUseDuration(net.minecraft.world.item.ItemStack) -> f_
-    311:311:void releaseUsing(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> a
-    314:314:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    317:317:net.minecraft.network.chat.Component getName(net.minecraft.world.item.ItemStack) -> g
-    321:321:boolean isFoil(net.minecraft.world.item.ItemStack) -> d_
-    325:339:net.minecraft.world.item.Rarity getRarity(net.minecraft.world.item.ItemStack) -> h
-    344:344:boolean isEnchantable(net.minecraft.world.item.ItemStack) -> g_
-    348:366:net.minecraft.world.phys.HitResult getPlayerPOVHitResult(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.level.ClipContext$Fluid) -> a
-    370:370:int getEnchantmentValue() -> c
-    374:377:void fillItemCategory(net.minecraft.world.item.CreativeModeTab,net.minecraft.core.NonNullList) -> a
-    380:381:boolean allowdedIn(net.minecraft.world.item.CreativeModeTab) -> a
-    386:386:net.minecraft.world.item.CreativeModeTab getItemCategory() -> r
-    390:390:boolean isValidRepairItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    394:394:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
-    398:398:boolean useOnRelease(net.minecraft.world.item.ItemStack) -> i
-    402:402:net.minecraft.world.item.ItemStack getDefaultInstance() -> s
-    406:406:boolean is(net.minecraft.tags.Tag) -> a
-    410:410:boolean isEdible() -> t
-    415:415:net.minecraft.world.food.FoodProperties getFoodProperties() -> u
-    419:419:net.minecraft.sounds.SoundEvent getDrinkingSound() -> U_
-    423:423:net.minecraft.sounds.SoundEvent getEatingSound() -> S_
-    53:53:float lambda$static$4(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> b
-    52:52:float lambda$static$3(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> c
-    51:51:float lambda$static$2(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> d
-    50:50:float lambda$static$1(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> e
-    49:49:float lambda$static$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> f
-    45:58:void <clinit>() -> <clinit>
-net.minecraft.world.item.Item$1 -> bei$1:
+net.minecraft.world.item.Item -> bke:
+    java.util.Map BY_BLOCK -> e
+    java.util.UUID BASE_ATTACK_DAMAGE_UUID -> f
+    java.util.UUID BASE_ATTACK_SPEED_UUID -> g
+    java.util.Random random -> h
+    net.minecraft.world.item.CreativeModeTab category -> i
+    net.minecraft.world.item.Rarity rarity -> a
+    int maxStackSize -> b
+    int maxDamage -> c
+    boolean isFireResistant -> d
+    net.minecraft.world.item.Item craftingRemainingItem -> j
+    java.lang.String descriptionId -> k
+    net.minecraft.world.food.FoodProperties foodProperties -> l
+    55:55:int getId(net.minecraft.world.item.Item) -> a
+    59:59:net.minecraft.world.item.Item byId(int) -> b
+    65:65:net.minecraft.world.item.Item byBlock(net.minecraft.world.level.block.Block) -> a
+    83:91:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    147:147:void onUseTick(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack,int) -> a
+    150:150:boolean verifyTagAfterLoad(net.minecraft.nbt.CompoundTag) -> b
+    154:154:boolean canAttackBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    159:159:net.minecraft.world.item.Item asItem() -> h
+    163:163:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    167:167:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
+    171:179:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    183:186:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
+    190:190:int getMaxStackSize() -> i
+    194:194:int getMaxDamage() -> j
+    198:198:boolean canBeDepleted() -> k
+    205:205:boolean hurtEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    212:212:boolean mineBlock(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
+    216:216:boolean isCorrectToolForDrops(net.minecraft.world.level.block.state.BlockState) -> b
+    220:220:net.minecraft.world.InteractionResult interactLivingEntity(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand) -> a
+    224:224:net.minecraft.network.chat.Component getDescription() -> l
+    230:230:java.lang.String toString() -> toString
+    234:237:java.lang.String getOrCreateDescriptionId() -> m
+    244:244:java.lang.String getDescriptionId() -> a
+    248:248:java.lang.String getDescriptionId(net.minecraft.world.item.ItemStack) -> f
+    252:252:boolean shouldOverrideMultiplayerNbt() -> n
+    258:258:net.minecraft.world.item.Item getCraftingRemainingItem() -> o
+    262:262:boolean hasCraftingRemainingItem() -> p
+    266:266:void inventoryTick(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,int,boolean) -> a
+    269:269:void onCraftedBy(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player) -> b
+    272:272:boolean isComplex() -> ae_
+    276:276:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> d_
+    280:283:int getUseDuration(net.minecraft.world.item.ItemStack) -> e_
+    287:287:void releaseUsing(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> a
+    290:290:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+    293:293:net.minecraft.network.chat.Component getName(net.minecraft.world.item.ItemStack) -> h
+    297:297:boolean isFoil(net.minecraft.world.item.ItemStack) -> e
+    301:315:net.minecraft.world.item.Rarity getRarity(net.minecraft.world.item.ItemStack) -> i
+    320:320:boolean isEnchantable(net.minecraft.world.item.ItemStack) -> f_
+    324:341:net.minecraft.world.phys.BlockHitResult getPlayerPOVHitResult(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.level.ClipContext$Fluid) -> a
+    345:345:int getEnchantmentValue() -> c
+    349:352:void fillItemCategory(net.minecraft.world.item.CreativeModeTab,net.minecraft.core.NonNullList) -> a
+    355:356:boolean allowdedIn(net.minecraft.world.item.CreativeModeTab) -> a
+    361:361:net.minecraft.world.item.CreativeModeTab getItemCategory() -> q
+    365:365:boolean isValidRepairItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    369:369:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
+    373:373:boolean useOnRelease(net.minecraft.world.item.ItemStack) -> j
+    377:377:net.minecraft.world.item.ItemStack getDefaultInstance() -> r
+    381:381:boolean is(net.minecraft.tags.Tag) -> a
+    385:385:boolean isEdible() -> s
+    390:390:net.minecraft.world.food.FoodProperties getFoodProperties() -> t
+    394:394:net.minecraft.sounds.SoundEvent getDrinkingSound() -> ag_
+    398:398:net.minecraft.sounds.SoundEvent getEatingSound() -> af_
+    402:402:boolean isFireResistant() -> u
+    406:406:boolean canBeHurtBy(net.minecraft.world.damagesource.DamageSource) -> a
+    45:50:void <clinit>() -> <clinit>
+net.minecraft.world.item.Item$1 -> bke$1:
     int[] $SwitchMap$net$minecraft$world$item$Rarity -> a
-    329:329:void <clinit>() -> <clinit>
-net.minecraft.world.item.Item$Properties -> bei$a:
+    305:305:void <clinit>() -> <clinit>
+net.minecraft.world.item.Item$Properties -> bke$a:
     int maxStackSize -> a
     int maxDamage -> b
     net.minecraft.world.item.Item craftingRemainingItem -> c
     net.minecraft.world.item.CreativeModeTab category -> d
     net.minecraft.world.item.Rarity rarity -> e
     net.minecraft.world.food.FoodProperties foodProperties -> f
-    110:115:void <init>() -> <init>
-    119:120:net.minecraft.world.item.Item$Properties food(net.minecraft.world.food.FoodProperties) -> a
-    124:128:net.minecraft.world.item.Item$Properties stacksTo(int) -> a
-    132:132:net.minecraft.world.item.Item$Properties defaultDurability(int) -> b
-    136:138:net.minecraft.world.item.Item$Properties durability(int) -> c
-    142:143:net.minecraft.world.item.Item$Properties craftRemainder(net.minecraft.world.item.Item) -> a
-    147:148:net.minecraft.world.item.Item$Properties tab(net.minecraft.world.item.CreativeModeTab) -> a
-    152:153:net.minecraft.world.item.Item$Properties rarity(net.minecraft.world.item.Rarity) -> a
-    110:110:net.minecraft.world.item.CreativeModeTab access$000(net.minecraft.world.item.Item$Properties) -> a
-    110:110:net.minecraft.world.item.Rarity access$100(net.minecraft.world.item.Item$Properties) -> b
-    110:110:net.minecraft.world.item.Item access$200(net.minecraft.world.item.Item$Properties) -> c
-    110:110:int access$300(net.minecraft.world.item.Item$Properties) -> d
-    110:110:int access$400(net.minecraft.world.item.Item$Properties) -> e
-    110:110:net.minecraft.world.food.FoodProperties access$500(net.minecraft.world.item.Item$Properties) -> f
-net.minecraft.world.item.ItemCooldowns -> bej:
+    boolean isFireResistant -> g
+    93:98:void <init>() -> <init>
+    103:104:net.minecraft.world.item.Item$Properties food(net.minecraft.world.food.FoodProperties) -> a
+    108:112:net.minecraft.world.item.Item$Properties stacksTo(int) -> a
+    116:116:net.minecraft.world.item.Item$Properties defaultDurability(int) -> b
+    120:122:net.minecraft.world.item.Item$Properties durability(int) -> c
+    126:127:net.minecraft.world.item.Item$Properties craftRemainder(net.minecraft.world.item.Item) -> a
+    131:132:net.minecraft.world.item.Item$Properties tab(net.minecraft.world.item.CreativeModeTab) -> a
+    136:137:net.minecraft.world.item.Item$Properties rarity(net.minecraft.world.item.Rarity) -> a
+    141:142:net.minecraft.world.item.Item$Properties fireResistant() -> a
+    93:93:net.minecraft.world.item.CreativeModeTab access$000(net.minecraft.world.item.Item$Properties) -> a
+    93:93:net.minecraft.world.item.Rarity access$100(net.minecraft.world.item.Item$Properties) -> b
+    93:93:net.minecraft.world.item.Item access$200(net.minecraft.world.item.Item$Properties) -> c
+    93:93:int access$300(net.minecraft.world.item.Item$Properties) -> d
+    93:93:int access$400(net.minecraft.world.item.Item$Properties) -> e
+    93:93:net.minecraft.world.food.FoodProperties access$500(net.minecraft.world.item.Item$Properties) -> f
+    93:93:boolean access$600(net.minecraft.world.item.Item$Properties) -> g
+net.minecraft.world.item.ItemCooldowns -> bkf:
     java.util.Map cooldowns -> a
     int tickCount -> b
     9:10:void <init>() -> <init>
@@ -47790,8 +52087,8 @@ net.minecraft.world.item.ItemCooldowns -> bej:
     49:51:void removeCooldown(net.minecraft.world.item.Item) -> b
     54:54:void onCooldownStarted(net.minecraft.world.item.Item,int) -> b
     57:57:void onCooldownEnded(net.minecraft.world.item.Item) -> c
-net.minecraft.world.item.ItemCooldowns$1 -> bej$1:
-net.minecraft.world.item.ItemCooldowns$CooldownInstance -> bej$a:
+net.minecraft.world.item.ItemCooldowns$1 -> bkf$1:
+net.minecraft.world.item.ItemCooldowns$CooldownInstance -> bkf$a:
     int startTime -> b
     int endTime -> c
     net.minecraft.world.item.ItemCooldowns this$0 -> a
@@ -47799,119 +52096,128 @@ net.minecraft.world.item.ItemCooldowns$CooldownInstance -> bej$a:
     59:59:int access$000(net.minecraft.world.item.ItemCooldowns$CooldownInstance) -> a
     59:59:int access$100(net.minecraft.world.item.ItemCooldowns$CooldownInstance) -> b
     59:59:void <init>(net.minecraft.world.item.ItemCooldowns,int,int,net.minecraft.world.item.ItemCooldowns$1) -> <init>
-net.minecraft.world.item.ItemFrameItem -> bek:
+net.minecraft.world.item.ItemFrameItem -> bkg:
     11:12:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     16:16:boolean mayPlace(net.minecraft.world.entity.player.Player,net.minecraft.core.Direction,net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.item.ItemNameBlockItem -> bel:
+net.minecraft.world.item.ItemNameBlockItem -> bkh:
     7:8:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
     12:12:java.lang.String getDescriptionId() -> a
-net.minecraft.world.item.ItemPropertyFunction -> bem:
-    float call(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> call
-net.minecraft.world.item.ItemStack -> ben:
-    org.apache.logging.log4j.Logger LOGGER -> c
-    net.minecraft.world.item.ItemStack EMPTY -> a
-    java.text.DecimalFormat ATTRIBUTE_MODIFIER_FORMAT -> b
-    int count -> d
-    int popTime -> e
-    net.minecraft.world.item.Item item -> f
-    net.minecraft.nbt.CompoundTag tag -> g
-    boolean emptyCacheFlag -> h
-    net.minecraft.world.entity.decoration.ItemFrame frame -> i
-    net.minecraft.world.level.block.state.pattern.BlockInWorld cachedBreakBlock -> j
-    boolean cachedBreakBlockResult -> k
-    net.minecraft.world.level.block.state.pattern.BlockInWorld cachedPlaceBlock -> l
-    boolean cachedPlaceBlockResult -> m
-    107:109:java.text.DecimalFormat getAttributeDecimalFormat() -> H
-    113:114:void <init>(net.minecraft.world.level.ItemLike) -> <init>
-    116:125:void <init>(net.minecraft.world.level.ItemLike,int) -> <init>
-    128:130:void updateEmptyCacheFlag() -> I
-    132:146:void <init>(net.minecraft.nbt.CompoundTag) -> <init>
-    150:153:net.minecraft.world.item.ItemStack of(net.minecraft.nbt.CompoundTag) -> a
-    158:168:boolean isEmpty() -> a
-    172:178:net.minecraft.world.item.ItemStack split(int) -> a
-    182:182:net.minecraft.world.item.Item getItem() -> b
-    186:198:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    202:202:float getDestroySpeed(net.minecraft.world.level.block.state.BlockState) -> a
-    206:206:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    210:210:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-    214:220:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    224:224:int getMaxStackSize() -> c
-    228:228:boolean isStackable() -> d
-    232:236:boolean isDamageableItem() -> e
-    240:240:boolean isDamaged() -> f
-    244:244:int getDamageValue() -> g
-    248:249:void setDamageValue(int) -> b
-    252:252:int getMaxDamage() -> h
-    256:284:boolean hurt(int,java.util.Random,net.minecraft.server.level.ServerPlayer) -> a
-    290:309:void hurtAndBreak(int,net.minecraft.world.entity.LivingEntity,java.util.function.Consumer) -> a
-    312:316:void hurtEnemy(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.player.Player) -> a
-    319:323:void mineBlock(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    326:326:boolean canDestroySpecial(net.minecraft.world.level.block.state.BlockState) -> b
-    330:330:boolean interactEnemy(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand) -> a
-    334:342:net.minecraft.world.item.ItemStack copy() -> i
-    346:359:boolean tagMatches(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    363:369:boolean matches(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> b
-    373:385:boolean matches(net.minecraft.world.item.ItemStack) -> c
-    389:395:boolean isSame(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> c
-    399:405:boolean isSameIgnoreDurability(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> d
-    416:416:boolean sameItem(net.minecraft.world.item.ItemStack) -> a
-    428:431:boolean sameItemStackIgnoreDurability(net.minecraft.world.item.ItemStack) -> b
-    435:435:java.lang.String getDescriptionId() -> j
-    440:440:java.lang.String toString() -> toString
-    444:450:void inventoryTick(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,int,boolean) -> a
-    453:455:void onCraftedBy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,int) -> a
-    458:458:int getUseDuration() -> k
-    462:462:net.minecraft.world.item.UseAnim getUseAnimation() -> l
-    466:467:void releaseUsing(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> a
-    470:470:boolean useOnRelease() -> m
-    474:474:boolean hasTag() -> n
-    479:479:net.minecraft.nbt.CompoundTag getTag() -> o
-    483:487:net.minecraft.nbt.CompoundTag getOrCreateTag() -> p
-    491:496:net.minecraft.nbt.CompoundTag getOrCreateTagElement(java.lang.String) -> a
-    501:504:net.minecraft.nbt.CompoundTag getTagElement(java.lang.String) -> b
-    508:514:void removeTagKey(java.lang.String) -> c
-    517:520:net.minecraft.nbt.ListTag getEnchantmentTags() -> q
-    524:529:void setTag(net.minecraft.nbt.CompoundTag) -> c
-    532:548:net.minecraft.network.chat.Component getHoverName() -> r
-    552:558:net.minecraft.world.item.ItemStack setHoverName(net.minecraft.network.chat.Component) -> a
-    562:574:void resetHoverName() -> s
-    577:578:boolean hasCustomHoverName() -> t
-    583:734:java.util.List getTooltipLines(net.minecraft.world.entity.player.Player,net.minecraft.world.item.TooltipFlag) -> a
-    738:744:void appendEnchantmentNames(java.util.List,net.minecraft.nbt.ListTag) -> a
-    748:769:java.util.Collection expandBlockState(java.lang.String) -> d
-    773:773:boolean hasFoil() -> u
-    777:777:net.minecraft.world.item.Rarity getRarity() -> v
-    781:787:boolean isEnchantable() -> w
-    791:800:void enchant(net.minecraft.world.item.enchantment.Enchantment,int) -> a
-    803:806:boolean isEnchanted() -> x
-    810:811:void addTagElement(java.lang.String,net.minecraft.nbt.Tag) -> a
-    814:814:boolean isFramed() -> y
-    818:819:void setFramed(net.minecraft.world.entity.decoration.ItemFrame) -> a
-    823:823:net.minecraft.world.entity.decoration.ItemFrame getFrame() -> z
-    827:830:int getBaseRepairCost() -> A
-    834:835:void setRepairCost(int) -> c
-    840:866:com.google.common.collect.Multimap getAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
-    870:881:void addAttributeModifier(java.lang.String,net.minecraft.world.entity.ai.attributes.AttributeModifier,net.minecraft.world.entity.EquipmentSlot) -> a
-    884:896:net.minecraft.network.chat.Component getDisplayName() -> B
-    900:909:boolean areSameBlocks(net.minecraft.world.level.block.state.pattern.BlockInWorld,net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
-    917:939:boolean hasAdventureModeBreakTagForBlock(net.minecraft.tags.TagManager,net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
-    947:969:boolean hasAdventureModePlaceTagForBlock(net.minecraft.tags.TagManager,net.minecraft.world.level.block.state.pattern.BlockInWorld) -> b
-    973:973:int getPopTime() -> C
-    977:978:void setPopTime(int) -> d
-    981:981:int getCount() -> D
-    985:988:void setCount(int) -> e
-    991:992:void grow(int) -> f
-    995:996:void shrink(int) -> g
-    999:1000:void onUseTick(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> b
-    1003:1003:boolean isEdible() -> E
-    1007:1007:net.minecraft.sounds.SoundEvent getDrinkingSound() -> F
-    1011:1011:net.minecraft.sounds.SoundEvent getEatingSound() -> G
-    893:893:void lambda$getDisplayName$3(net.minecraft.nbt.CompoundTag,net.minecraft.network.chat.Style) -> a
-    865:865:void lambda$getAttributeModifiers$2(net.minecraft.world.entity.ai.attributes.AttributeModifier) -> a
-    763:763:net.minecraft.network.chat.Component lambda$expandBlockState$1(net.minecraft.network.chat.Component) -> b
-    742:742:void lambda$appendEnchantmentNames$0(java.util.List,net.minecraft.nbt.CompoundTag,net.minecraft.world.item.enchantment.Enchantment) -> a
-    67:70:void <clinit>() -> <clinit>
-net.minecraft.world.item.Items -> beo:
+net.minecraft.world.item.ItemStack -> bki:
+    com.mojang.serialization.Codec CODEC -> a
+    org.apache.logging.log4j.Logger LOGGER -> d
+    net.minecraft.world.item.ItemStack EMPTY -> b
+    java.text.DecimalFormat ATTRIBUTE_MODIFIER_FORMAT -> c
+    net.minecraft.network.chat.Style LORE_STYLE -> e
+    int count -> f
+    int popTime -> g
+    net.minecraft.world.item.Item item -> h
+    net.minecraft.nbt.CompoundTag tag -> i
+    boolean emptyCacheFlag -> j
+    net.minecraft.world.entity.Entity entityRepresentation -> k
+    net.minecraft.world.level.block.state.pattern.BlockInWorld cachedBreakBlock -> l
+    boolean cachedBreakBlockResult -> m
+    net.minecraft.world.level.block.state.pattern.BlockInWorld cachedPlaceBlock -> n
+    boolean cachedPlaceBlockResult -> o
+    123:124:void <init>(net.minecraft.world.level.ItemLike) -> <init>
+    127:129:void <init>(net.minecraft.world.level.ItemLike,int,java.util.Optional) -> <init>
+    131:140:void <init>(net.minecraft.world.level.ItemLike,int) -> <init>
+    143:145:void updateEmptyCacheFlag() -> I
+    147:161:void <init>(net.minecraft.nbt.CompoundTag) -> <init>
+    165:168:net.minecraft.world.item.ItemStack of(net.minecraft.nbt.CompoundTag) -> a
+    173:183:boolean isEmpty() -> a
+    191:197:net.minecraft.world.item.ItemStack split(int) -> a
+    201:201:net.minecraft.world.item.Item getItem() -> b
+    205:217:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    221:221:float getDestroySpeed(net.minecraft.world.level.block.state.BlockState) -> a
+    225:225:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    229:229:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
+    233:239:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
+    243:243:int getMaxStackSize() -> c
+    247:247:boolean isStackable() -> d
+    251:255:boolean isDamageableItem() -> e
+    259:259:boolean isDamaged() -> f
+    263:263:int getDamageValue() -> g
+    267:268:void setDamageValue(int) -> b
+    271:271:int getMaxDamage() -> h
+    275:303:boolean hurt(int,java.util.Random,net.minecraft.server.level.ServerPlayer) -> a
+    309:328:void hurtAndBreak(int,net.minecraft.world.entity.LivingEntity,java.util.function.Consumer) -> a
+    331:335:void hurtEnemy(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.player.Player) -> a
+    338:342:void mineBlock(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    345:345:boolean isCorrectToolForDrops(net.minecraft.world.level.block.state.BlockState) -> b
+    349:349:net.minecraft.world.InteractionResult interactLivingEntity(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand) -> a
+    353:361:net.minecraft.world.item.ItemStack copy() -> i
+    365:378:boolean tagMatches(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    382:388:boolean matches(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> b
+    392:404:boolean matches(net.minecraft.world.item.ItemStack) -> c
+    408:414:boolean isSame(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> c
+    418:424:boolean isSameIgnoreDurability(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> d
+    435:435:boolean sameItem(net.minecraft.world.item.ItemStack) -> a
+    447:450:boolean sameItemStackIgnoreDurability(net.minecraft.world.item.ItemStack) -> b
+    454:454:java.lang.String getDescriptionId() -> j
+    459:459:java.lang.String toString() -> toString
+    463:469:void inventoryTick(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,int,boolean) -> a
+    472:474:void onCraftedBy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,int) -> a
+    477:477:int getUseDuration() -> k
+    481:481:net.minecraft.world.item.UseAnim getUseAnimation() -> l
+    485:486:void releaseUsing(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> a
+    489:489:boolean useOnRelease() -> m
+    493:493:boolean hasTag() -> n
+    498:498:net.minecraft.nbt.CompoundTag getTag() -> o
+    502:506:net.minecraft.nbt.CompoundTag getOrCreateTag() -> p
+    510:515:net.minecraft.nbt.CompoundTag getOrCreateTagElement(java.lang.String) -> a
+    520:523:net.minecraft.nbt.CompoundTag getTagElement(java.lang.String) -> b
+    527:533:void removeTagKey(java.lang.String) -> c
+    536:539:net.minecraft.nbt.ListTag getEnchantmentTags() -> q
+    543:548:void setTag(net.minecraft.nbt.CompoundTag) -> c
+    551:567:net.minecraft.network.chat.Component getHoverName() -> r
+    571:577:net.minecraft.world.item.ItemStack setHoverName(net.minecraft.network.chat.Component) -> a
+    581:593:void resetHoverName() -> s
+    596:597:boolean hasCustomHoverName() -> t
+    602:755:java.util.List getTooltipLines(net.minecraft.world.entity.player.Player,net.minecraft.world.item.TooltipFlag) -> a
+    759:765:void appendEnchantmentNames(java.util.List,net.minecraft.nbt.ListTag) -> a
+    769:790:java.util.Collection expandBlockState(java.lang.String) -> d
+    794:794:boolean hasFoil() -> u
+    798:798:net.minecraft.world.item.Rarity getRarity() -> v
+    802:808:boolean isEnchantable() -> w
+    812:821:void enchant(net.minecraft.world.item.enchantment.Enchantment,int) -> a
+    824:827:boolean isEnchanted() -> x
+    831:832:void addTagElement(java.lang.String,net.minecraft.nbt.Tag) -> a
+    835:835:boolean isFramed() -> y
+    839:840:void setEntityRepresentation(net.minecraft.world.entity.Entity) -> a
+    844:844:net.minecraft.world.entity.decoration.ItemFrame getFrame() -> z
+    849:849:net.minecraft.world.entity.Entity getEntityRepresentation() -> A
+    853:856:int getBaseRepairCost() -> B
+    860:861:void setRepairCost(int) -> c
+    866:896:com.google.common.collect.Multimap getAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
+    900:911:void addAttributeModifier(net.minecraft.world.entity.ai.attributes.Attribute,net.minecraft.world.entity.ai.attributes.AttributeModifier,net.minecraft.world.entity.EquipmentSlot) -> a
+    914:925:net.minecraft.network.chat.Component getDisplayName() -> C
+    929:938:boolean areSameBlocks(net.minecraft.world.level.block.state.pattern.BlockInWorld,net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
+    946:968:boolean hasAdventureModeBreakTagForBlock(net.minecraft.tags.TagManager,net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
+    976:998:boolean hasAdventureModePlaceTagForBlock(net.minecraft.tags.TagManager,net.minecraft.world.level.block.state.pattern.BlockInWorld) -> b
+    1002:1002:int getPopTime() -> D
+    1006:1007:void setPopTime(int) -> d
+    1010:1010:int getCount() -> E
+    1014:1017:void setCount(int) -> e
+    1020:1021:void grow(int) -> f
+    1024:1025:void shrink(int) -> g
+    1028:1029:void onUseTick(net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> b
+    1032:1032:boolean isEdible() -> F
+    1036:1036:net.minecraft.sounds.SoundEvent getDrinkingSound() -> G
+    1040:1040:net.minecraft.sounds.SoundEvent getEatingSound() -> H
+    922:922:net.minecraft.network.chat.Style lambda$getDisplayName$7(net.minecraft.network.chat.Style) -> a
+    784:784:net.minecraft.network.chat.MutableComponent lambda$expandBlockState$6(net.minecraft.network.chat.MutableComponent) -> a
+    763:763:void lambda$appendEnchantmentNames$5(java.util.List,net.minecraft.nbt.CompoundTag,net.minecraft.world.item.enchantment.Enchantment) -> a
+    83:83:void lambda$static$4(java.text.DecimalFormat) -> a
+    73:77:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    76:76:java.util.Optional lambda$null$2(net.minecraft.world.item.ItemStack) -> d
+    75:75:java.lang.Integer lambda$null$1(net.minecraft.world.item.ItemStack) -> e
+    74:74:net.minecraft.world.item.Item lambda$null$0(net.minecraft.world.item.ItemStack) -> f
+    73:109:void <clinit>() -> <clinit>
+net.minecraft.world.item.ItemUtils -> bkj:
+    11:11:void <init>() -> <init>
+    16:17:net.minecraft.world.InteractionResultHolder useDrink(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    21:35:net.minecraft.world.item.ItemStack createBucketResult(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.world.item.Items -> bkk:
     net.minecraft.world.item.Item AIR -> a
     net.minecraft.world.item.Item STONE -> b
     net.minecraft.world.item.Item GRANITE -> c
@@ -47924,906 +52230,997 @@ net.minecraft.world.item.Items -> beo:
     net.minecraft.world.item.Item DIRT -> j
     net.minecraft.world.item.Item COARSE_DIRT -> k
     net.minecraft.world.item.Item PODZOL -> l
-    net.minecraft.world.item.Item COBBLESTONE -> m
-    net.minecraft.world.item.Item OAK_PLANKS -> n
-    net.minecraft.world.item.Item SPRUCE_PLANKS -> o
-    net.minecraft.world.item.Item BIRCH_PLANKS -> p
-    net.minecraft.world.item.Item JUNGLE_PLANKS -> q
-    net.minecraft.world.item.Item ACACIA_PLANKS -> r
-    net.minecraft.world.item.Item DARK_OAK_PLANKS -> s
-    net.minecraft.world.item.Item OAK_SAPLING -> t
-    net.minecraft.world.item.Item SPRUCE_SAPLING -> u
-    net.minecraft.world.item.Item BIRCH_SAPLING -> v
-    net.minecraft.world.item.Item JUNGLE_SAPLING -> w
-    net.minecraft.world.item.Item ACACIA_SAPLING -> x
-    net.minecraft.world.item.Item DARK_OAK_SAPLING -> y
-    net.minecraft.world.item.Item BEDROCK -> z
-    net.minecraft.world.item.Item SAND -> A
-    net.minecraft.world.item.Item RED_SAND -> B
-    net.minecraft.world.item.Item GRAVEL -> C
-    net.minecraft.world.item.Item GOLD_ORE -> D
-    net.minecraft.world.item.Item IRON_ORE -> E
-    net.minecraft.world.item.Item COAL_ORE -> F
-    net.minecraft.world.item.Item OAK_LOG -> G
-    net.minecraft.world.item.Item SPRUCE_LOG -> H
-    net.minecraft.world.item.Item BIRCH_LOG -> I
-    net.minecraft.world.item.Item JUNGLE_LOG -> J
-    net.minecraft.world.item.Item ACACIA_LOG -> K
-    net.minecraft.world.item.Item DARK_OAK_LOG -> L
-    net.minecraft.world.item.Item STRIPPED_OAK_LOG -> M
-    net.minecraft.world.item.Item STRIPPED_SPRUCE_LOG -> N
-    net.minecraft.world.item.Item STRIPPED_BIRCH_LOG -> O
-    net.minecraft.world.item.Item STRIPPED_JUNGLE_LOG -> P
-    net.minecraft.world.item.Item STRIPPED_ACACIA_LOG -> Q
-    net.minecraft.world.item.Item STRIPPED_DARK_OAK_LOG -> R
-    net.minecraft.world.item.Item STRIPPED_OAK_WOOD -> S
-    net.minecraft.world.item.Item STRIPPED_SPRUCE_WOOD -> T
-    net.minecraft.world.item.Item STRIPPED_BIRCH_WOOD -> U
-    net.minecraft.world.item.Item STRIPPED_JUNGLE_WOOD -> V
-    net.minecraft.world.item.Item STRIPPED_ACACIA_WOOD -> W
-    net.minecraft.world.item.Item STRIPPED_DARK_OAK_WOOD -> X
-    net.minecraft.world.item.Item OAK_WOOD -> Y
-    net.minecraft.world.item.Item SPRUCE_WOOD -> Z
-    net.minecraft.world.item.Item BIRCH_WOOD -> aa
-    net.minecraft.world.item.Item JUNGLE_WOOD -> ab
-    net.minecraft.world.item.Item ACACIA_WOOD -> ac
-    net.minecraft.world.item.Item DARK_OAK_WOOD -> ad
-    net.minecraft.world.item.Item OAK_LEAVES -> ae
-    net.minecraft.world.item.Item SPRUCE_LEAVES -> af
-    net.minecraft.world.item.Item BIRCH_LEAVES -> ag
-    net.minecraft.world.item.Item JUNGLE_LEAVES -> ah
-    net.minecraft.world.item.Item ACACIA_LEAVES -> ai
-    net.minecraft.world.item.Item DARK_OAK_LEAVES -> aj
-    net.minecraft.world.item.Item SPONGE -> ak
-    net.minecraft.world.item.Item WET_SPONGE -> al
-    net.minecraft.world.item.Item GLASS -> am
-    net.minecraft.world.item.Item LAPIS_ORE -> an
-    net.minecraft.world.item.Item LAPIS_BLOCK -> ao
-    net.minecraft.world.item.Item DISPENSER -> ap
-    net.minecraft.world.item.Item SANDSTONE -> aq
-    net.minecraft.world.item.Item CHISELED_SANDSTONE -> ar
-    net.minecraft.world.item.Item CUT_SANDSTONE -> as
-    net.minecraft.world.item.Item NOTE_BLOCK -> at
-    net.minecraft.world.item.Item POWERED_RAIL -> au
-    net.minecraft.world.item.Item DETECTOR_RAIL -> av
-    net.minecraft.world.item.Item STICKY_PISTON -> aw
-    net.minecraft.world.item.Item COBWEB -> ax
-    net.minecraft.world.item.Item GRASS -> ay
-    net.minecraft.world.item.Item FERN -> az
-    net.minecraft.world.item.Item DEAD_BUSH -> aA
-    net.minecraft.world.item.Item SEAGRASS -> aB
-    net.minecraft.world.item.Item SEA_PICKLE -> aC
-    net.minecraft.world.item.Item PISTON -> aD
-    net.minecraft.world.item.Item WHITE_WOOL -> aE
-    net.minecraft.world.item.Item ORANGE_WOOL -> aF
-    net.minecraft.world.item.Item MAGENTA_WOOL -> aG
-    net.minecraft.world.item.Item LIGHT_BLUE_WOOL -> aH
-    net.minecraft.world.item.Item YELLOW_WOOL -> aI
-    net.minecraft.world.item.Item LIME_WOOL -> aJ
-    net.minecraft.world.item.Item PINK_WOOL -> aK
-    net.minecraft.world.item.Item GRAY_WOOL -> aL
-    net.minecraft.world.item.Item LIGHT_GRAY_WOOL -> aM
-    net.minecraft.world.item.Item CYAN_WOOL -> aN
-    net.minecraft.world.item.Item PURPLE_WOOL -> aO
-    net.minecraft.world.item.Item BLUE_WOOL -> aP
-    net.minecraft.world.item.Item BROWN_WOOL -> aQ
-    net.minecraft.world.item.Item GREEN_WOOL -> aR
-    net.minecraft.world.item.Item RED_WOOL -> aS
-    net.minecraft.world.item.Item BLACK_WOOL -> aT
-    net.minecraft.world.item.Item DANDELION -> aU
-    net.minecraft.world.item.Item POPPY -> aV
-    net.minecraft.world.item.Item BLUE_ORCHID -> aW
-    net.minecraft.world.item.Item ALLIUM -> aX
-    net.minecraft.world.item.Item AZURE_BLUET -> aY
-    net.minecraft.world.item.Item RED_TULIP -> aZ
-    net.minecraft.world.item.Item ORANGE_TULIP -> ba
-    net.minecraft.world.item.Item WHITE_TULIP -> bb
-    net.minecraft.world.item.Item PINK_TULIP -> bc
-    net.minecraft.world.item.Item OXEYE_DAISY -> bd
-    net.minecraft.world.item.Item CORNFLOWER -> be
-    net.minecraft.world.item.Item LILY_OF_THE_VALLEY -> bf
-    net.minecraft.world.item.Item WITHER_ROSE -> bg
-    net.minecraft.world.item.Item BROWN_MUSHROOM -> bh
-    net.minecraft.world.item.Item RED_MUSHROOM -> bi
-    net.minecraft.world.item.Item GOLD_BLOCK -> bj
-    net.minecraft.world.item.Item IRON_BLOCK -> bk
-    net.minecraft.world.item.Item OAK_SLAB -> bl
-    net.minecraft.world.item.Item SPRUCE_SLAB -> bm
-    net.minecraft.world.item.Item BIRCH_SLAB -> bn
-    net.minecraft.world.item.Item JUNGLE_SLAB -> bo
-    net.minecraft.world.item.Item ACACIA_SLAB -> bp
-    net.minecraft.world.item.Item DARK_OAK_SLAB -> bq
-    net.minecraft.world.item.Item STONE_SLAB -> br
-    net.minecraft.world.item.Item SMOOTH_STONE_SLAB -> bs
-    net.minecraft.world.item.Item SANDSTONE_SLAB -> bt
-    net.minecraft.world.item.Item CUT_STANDSTONE_SLAB -> bu
-    net.minecraft.world.item.Item PETRIFIED_OAK_SLAB -> bv
-    net.minecraft.world.item.Item COBBLESTONE_SLAB -> bw
-    net.minecraft.world.item.Item BRICK_SLAB -> bx
-    net.minecraft.world.item.Item STONE_BRICK_SLAB -> by
-    net.minecraft.world.item.Item NETHER_BRICK_SLAB -> bz
-    net.minecraft.world.item.Item QUARTZ_SLAB -> bA
-    net.minecraft.world.item.Item RED_SANDSTONE_SLAB -> bB
-    net.minecraft.world.item.Item CUT_RED_SANDSTONE_SLAB -> bC
-    net.minecraft.world.item.Item PURPUR_SLAB -> bD
-    net.minecraft.world.item.Item PRISMARINE_SLAB -> bE
-    net.minecraft.world.item.Item PRISMARINE_BRICK_SLAB -> bF
-    net.minecraft.world.item.Item DARK_PRISMARINE_SLAB -> bG
-    net.minecraft.world.item.Item SMOOTH_QUARTZ -> bH
-    net.minecraft.world.item.Item SMOOTH_RED_SANDSTONE -> bI
-    net.minecraft.world.item.Item SMOOTH_SANDSTONE -> bJ
-    net.minecraft.world.item.Item SMOOTH_STONE -> bK
-    net.minecraft.world.item.Item BRICKS -> bL
-    net.minecraft.world.item.Item TNT -> bM
-    net.minecraft.world.item.Item BOOKSHELF -> bN
-    net.minecraft.world.item.Item MOSSY_COBBLESTONE -> bO
-    net.minecraft.world.item.Item OBSIDIAN -> bP
-    net.minecraft.world.item.Item TORCH -> bQ
-    net.minecraft.world.item.Item END_ROD -> bR
-    net.minecraft.world.item.Item CHORUS_PLANT -> bS
-    net.minecraft.world.item.Item CHORUS_FLOWER -> bT
-    net.minecraft.world.item.Item PURPUR_BLOCK -> bU
-    net.minecraft.world.item.Item PURPUR_PILLAR -> bV
-    net.minecraft.world.item.Item PURPUR_STAIRS -> bW
-    net.minecraft.world.item.Item SPAWNER -> bX
-    net.minecraft.world.item.Item OAK_STAIRS -> bY
-    net.minecraft.world.item.Item CHEST -> bZ
-    net.minecraft.world.item.Item DIAMOND_ORE -> ca
-    net.minecraft.world.item.Item DIAMOND_BLOCK -> cb
-    net.minecraft.world.item.Item CRAFTING_TABLE -> cc
-    net.minecraft.world.item.Item FARMLAND -> cd
-    net.minecraft.world.item.Item FURNACE -> ce
-    net.minecraft.world.item.Item LADDER -> cf
-    net.minecraft.world.item.Item RAIL -> cg
-    net.minecraft.world.item.Item COBBLESTONE_STAIRS -> ch
-    net.minecraft.world.item.Item LEVER -> ci
-    net.minecraft.world.item.Item STONE_PRESSURE_PLATE -> cj
-    net.minecraft.world.item.Item OAK_PRESSURE_PLATE -> ck
-    net.minecraft.world.item.Item SPRUCE_PRESSURE_PLATE -> cl
-    net.minecraft.world.item.Item BIRCH_PRESSURE_PLATE -> cm
-    net.minecraft.world.item.Item JUNGLE_PRESSURE_PLATE -> cn
-    net.minecraft.world.item.Item ACACIA_PRESSURE_PLATE -> co
-    net.minecraft.world.item.Item DARK_OAK_PRESSURE_PLATE -> cp
-    net.minecraft.world.item.Item REDSTONE_ORE -> cq
-    net.minecraft.world.item.Item REDSTONE_TORCH -> cr
-    net.minecraft.world.item.Item STONE_BUTTON -> cs
-    net.minecraft.world.item.Item SNOW -> ct
-    net.minecraft.world.item.Item ICE -> cu
-    net.minecraft.world.item.Item SNOW_BLOCK -> cv
-    net.minecraft.world.item.Item CACTUS -> cw
-    net.minecraft.world.item.Item CLAY -> cx
-    net.minecraft.world.item.Item JUKEBOX -> cy
-    net.minecraft.world.item.Item OAK_FENCE -> cz
-    net.minecraft.world.item.Item SPRUCE_FENCE -> cA
-    net.minecraft.world.item.Item BIRCH_FENCE -> cB
-    net.minecraft.world.item.Item JUNGLE_FENCE -> cC
-    net.minecraft.world.item.Item ACACIA_FENCE -> cD
-    net.minecraft.world.item.Item DARK_OAK_FENCE -> cE
-    net.minecraft.world.item.Item PUMPKIN -> cF
-    net.minecraft.world.item.Item CARVED_PUMPKIN -> cG
-    net.minecraft.world.item.Item NETHERRACK -> cH
-    net.minecraft.world.item.Item SOUL_SAND -> cI
-    net.minecraft.world.item.Item GLOWSTONE -> cJ
-    net.minecraft.world.item.Item JACK_O_LANTERN -> cK
-    net.minecraft.world.item.Item OAK_TRAPDOOR -> cL
-    net.minecraft.world.item.Item SPRUCE_TRAPDOOR -> cM
-    net.minecraft.world.item.Item BIRCH_TRAPDOOR -> cN
-    net.minecraft.world.item.Item JUNGLE_TRAPDOOR -> cO
-    net.minecraft.world.item.Item ACACIA_TRAPDOOR -> cP
-    net.minecraft.world.item.Item DARK_OAK_TRAPDOOR -> cQ
-    net.minecraft.world.item.Item INFESTED_STONE -> cR
-    net.minecraft.world.item.Item INFESTED_COBBLESTONE -> cS
-    net.minecraft.world.item.Item INFESTED_STONE_BRICKS -> cT
-    net.minecraft.world.item.Item INFESTED_MOSSY_STONE_BRICKS -> cU
-    net.minecraft.world.item.Item INFESTED_CRACKED_STONE_BRICKS -> cV
-    net.minecraft.world.item.Item INFESTED_CHISELED_STONE_BRICKS -> cW
-    net.minecraft.world.item.Item STONE_BRICKS -> cX
-    net.minecraft.world.item.Item MOSSY_STONE_BRICKS -> cY
-    net.minecraft.world.item.Item CRACKED_STONE_BRICKS -> cZ
-    net.minecraft.world.item.Item CHISELED_STONE_BRICKS -> da
-    net.minecraft.world.item.Item BROWN_MUSHROOM_BLOCK -> db
-    net.minecraft.world.item.Item RED_MUSHROOM_BLOCK -> dc
-    net.minecraft.world.item.Item MUSHROOM_STEM -> dd
-    net.minecraft.world.item.Item IRON_BARS -> de
-    net.minecraft.world.item.Item GLASS_PANE -> df
-    net.minecraft.world.item.Item MELON -> dg
-    net.minecraft.world.item.Item VINE -> dh
-    net.minecraft.world.item.Item OAK_FENCE_GATE -> di
-    net.minecraft.world.item.Item SPRUCE_FENCE_GATE -> dj
-    net.minecraft.world.item.Item BIRCH_FENCE_GATE -> dk
-    net.minecraft.world.item.Item JUNGLE_FENCE_GATE -> dl
-    net.minecraft.world.item.Item ACACIA_FENCE_GATE -> dm
-    net.minecraft.world.item.Item DARK_OAK_FENCE_GATE -> dn
-    net.minecraft.world.item.Item BRICK_STAIRS -> do
-    net.minecraft.world.item.Item STONE_BRICK_STAIRS -> dp
-    net.minecraft.world.item.Item MYCELIUM -> dq
-    net.minecraft.world.item.Item LILY_PAD -> dr
-    net.minecraft.world.item.Item NETHER_BRICKS -> ds
-    net.minecraft.world.item.Item NETHER_BRICK_FENCE -> dt
-    net.minecraft.world.item.Item NETHER_BRICK_STAIRS -> du
-    net.minecraft.world.item.Item ENCHANTING_TABLE -> dv
-    net.minecraft.world.item.Item END_PORTAL_FRAME -> dw
-    net.minecraft.world.item.Item END_STONE -> dx
-    net.minecraft.world.item.Item END_STONE_BRICKS -> dy
-    net.minecraft.world.item.Item DRAGON_EGG -> dz
-    net.minecraft.world.item.Item REDSTONE_LAMP -> dA
-    net.minecraft.world.item.Item SANDSTONE_STAIRS -> dB
-    net.minecraft.world.item.Item EMERALD_ORE -> dC
-    net.minecraft.world.item.Item ENDER_CHEST -> dD
-    net.minecraft.world.item.Item TRIPWIRE_HOOK -> dE
-    net.minecraft.world.item.Item EMERALD_BLOCK -> dF
-    net.minecraft.world.item.Item SPRUCE_STAIRS -> dG
-    net.minecraft.world.item.Item BIRCH_STAIRS -> dH
-    net.minecraft.world.item.Item JUNGLE_STAIRS -> dI
-    net.minecraft.world.item.Item COMMAND_BLOCK -> dJ
-    net.minecraft.world.item.Item BEACON -> dK
-    net.minecraft.world.item.Item COBBLESTONE_WALL -> dL
-    net.minecraft.world.item.Item MOSSY_COBBLESTONE_WALL -> dM
-    net.minecraft.world.item.Item BRICK_WALL -> dN
-    net.minecraft.world.item.Item PRISMARINE_WALL -> dO
-    net.minecraft.world.item.Item RED_SANDSTONE_WALL -> dP
-    net.minecraft.world.item.Item MOSSY_STONE_BRICK_WALL -> dQ
-    net.minecraft.world.item.Item GRANITE_WALL -> dR
-    net.minecraft.world.item.Item STONE_BRICK_WALL -> dS
-    net.minecraft.world.item.Item NETHER_BRICK_WALL -> dT
-    net.minecraft.world.item.Item ANDESITE_WALL -> dU
-    net.minecraft.world.item.Item RED_NETHER_BRICK_WALL -> dV
-    net.minecraft.world.item.Item SANDSTONE_WALL -> dW
-    net.minecraft.world.item.Item END_STONE_BRICK_WALL -> dX
-    net.minecraft.world.item.Item DIORITE_WALL -> dY
-    net.minecraft.world.item.Item OAK_BUTTON -> dZ
-    net.minecraft.world.item.Item SPRUCE_BUTTON -> ea
-    net.minecraft.world.item.Item BIRCH_BUTTON -> eb
-    net.minecraft.world.item.Item JUNGLE_BUTTON -> ec
-    net.minecraft.world.item.Item ACACIA_BUTTON -> ed
-    net.minecraft.world.item.Item DARK_OAK_BUTTON -> ee
-    net.minecraft.world.item.Item ANVIL -> ef
-    net.minecraft.world.item.Item CHIPPED_ANVIL -> eg
-    net.minecraft.world.item.Item DAMAGED_ANVIL -> eh
-    net.minecraft.world.item.Item TRAPPED_CHEST -> ei
-    net.minecraft.world.item.Item LIGHT_WEIGHTED_PRESSURE_PLATE -> ej
-    net.minecraft.world.item.Item HEAVY_WEIGHTED_PRESSURE_PLATE -> ek
-    net.minecraft.world.item.Item DAYLIGHT_DETECTOR -> el
-    net.minecraft.world.item.Item REDSTONE_BLOCK -> em
-    net.minecraft.world.item.Item NETHER_QUARTZ_ORE -> en
-    net.minecraft.world.item.Item HOPPER -> eo
-    net.minecraft.world.item.Item CHISELED_QUARTZ_BLOCK -> ep
-    net.minecraft.world.item.Item QUARTZ_BLOCK -> eq
-    net.minecraft.world.item.Item QUARTZ_PILLAR -> er
-    net.minecraft.world.item.Item QUARTZ_STAIRS -> es
-    net.minecraft.world.item.Item ACTIVATOR_RAIL -> et
-    net.minecraft.world.item.Item DROPPER -> eu
-    net.minecraft.world.item.Item WHITE_TERRACOTTA -> ev
-    net.minecraft.world.item.Item ORANGE_TERRACOTTA -> ew
-    net.minecraft.world.item.Item MAGENTA_TERRACOTTA -> ex
-    net.minecraft.world.item.Item LIGHT_BLUE_TERRACOTTA -> ey
-    net.minecraft.world.item.Item YELLOW_TERRACOTTA -> ez
-    net.minecraft.world.item.Item LIME_TERRACOTTA -> eA
-    net.minecraft.world.item.Item PINK_TERRACOTTA -> eB
-    net.minecraft.world.item.Item GRAY_TERRACOTTA -> eC
-    net.minecraft.world.item.Item LIGHT_GRAY_TERRACOTTA -> eD
-    net.minecraft.world.item.Item CYAN_TERRACOTTA -> eE
-    net.minecraft.world.item.Item PURPLE_TERRACOTTA -> eF
-    net.minecraft.world.item.Item BLUE_TERRACOTTA -> eG
-    net.minecraft.world.item.Item BROWN_TERRACOTTA -> eH
-    net.minecraft.world.item.Item GREEN_TERRACOTTA -> eI
-    net.minecraft.world.item.Item RED_TERRACOTTA -> eJ
-    net.minecraft.world.item.Item BLACK_TERRACOTTA -> eK
-    net.minecraft.world.item.Item BARRIER -> eL
-    net.minecraft.world.item.Item IRON_TRAPDOOR -> eM
-    net.minecraft.world.item.Item HAY_BLOCK -> eN
-    net.minecraft.world.item.Item WHITE_CARPET -> eO
-    net.minecraft.world.item.Item ORANGE_CARPET -> eP
-    net.minecraft.world.item.Item MAGENTA_CARPET -> eQ
-    net.minecraft.world.item.Item LIGHT_BLUE_CARPET -> eR
-    net.minecraft.world.item.Item YELLOW_CARPET -> eS
-    net.minecraft.world.item.Item LIME_CARPET -> eT
-    net.minecraft.world.item.Item PINK_CARPET -> eU
-    net.minecraft.world.item.Item GRAY_CARPET -> eV
-    net.minecraft.world.item.Item LIGHT_GRAY_CARPET -> eW
-    net.minecraft.world.item.Item CYAN_CARPET -> eX
-    net.minecraft.world.item.Item PURPLE_CARPET -> eY
-    net.minecraft.world.item.Item BLUE_CARPET -> eZ
-    net.minecraft.world.item.Item BROWN_CARPET -> fa
-    net.minecraft.world.item.Item GREEN_CARPET -> fb
-    net.minecraft.world.item.Item RED_CARPET -> fc
-    net.minecraft.world.item.Item BLACK_CARPET -> fd
-    net.minecraft.world.item.Item TERRACOTTA -> fe
-    net.minecraft.world.item.Item COAL_BLOCK -> ff
-    net.minecraft.world.item.Item PACKED_ICE -> fg
-    net.minecraft.world.item.Item ACACIA_STAIRS -> fh
-    net.minecraft.world.item.Item DARK_OAK_STAIRS -> fi
-    net.minecraft.world.item.Item SLIME_BLOCK -> fj
-    net.minecraft.world.item.Item GRASS_PATH -> fk
-    net.minecraft.world.item.Item SUNFLOWER -> fl
-    net.minecraft.world.item.Item LILAC -> fm
-    net.minecraft.world.item.Item ROSE_BUSH -> fn
-    net.minecraft.world.item.Item PEONY -> fo
-    net.minecraft.world.item.Item TALL_GRASS -> fp
-    net.minecraft.world.item.Item LARGE_FERN -> fq
-    net.minecraft.world.item.Item WHITE_STAINED_GLASS -> fr
-    net.minecraft.world.item.Item ORANGE_STAINED_GLASS -> fs
-    net.minecraft.world.item.Item MAGENTA_STAINED_GLASS -> ft
-    net.minecraft.world.item.Item LIGHT_BLUE_STAINED_GLASS -> fu
-    net.minecraft.world.item.Item YELLOW_STAINED_GLASS -> fv
-    net.minecraft.world.item.Item LIME_STAINED_GLASS -> fw
-    net.minecraft.world.item.Item PINK_STAINED_GLASS -> fx
-    net.minecraft.world.item.Item GRAY_STAINED_GLASS -> fy
-    net.minecraft.world.item.Item LIGHT_GRAY_STAINED_GLASS -> fz
-    net.minecraft.world.item.Item CYAN_STAINED_GLASS -> fA
-    net.minecraft.world.item.Item PURPLE_STAINED_GLASS -> fB
-    net.minecraft.world.item.Item BLUE_STAINED_GLASS -> fC
-    net.minecraft.world.item.Item BROWN_STAINED_GLASS -> fD
-    net.minecraft.world.item.Item GREEN_STAINED_GLASS -> fE
-    net.minecraft.world.item.Item RED_STAINED_GLASS -> fF
-    net.minecraft.world.item.Item BLACK_STAINED_GLASS -> fG
-    net.minecraft.world.item.Item WHITE_STAINED_GLASS_PANE -> fH
-    net.minecraft.world.item.Item ORANGE_STAINED_GLASS_PANE -> fI
-    net.minecraft.world.item.Item MAGENTA_STAINED_GLASS_PANE -> fJ
-    net.minecraft.world.item.Item LIGHT_BLUE_STAINED_GLASS_PANE -> fK
-    net.minecraft.world.item.Item YELLOW_STAINED_GLASS_PANE -> fL
-    net.minecraft.world.item.Item LIME_STAINED_GLASS_PANE -> fM
-    net.minecraft.world.item.Item PINK_STAINED_GLASS_PANE -> fN
-    net.minecraft.world.item.Item GRAY_STAINED_GLASS_PANE -> fO
-    net.minecraft.world.item.Item LIGHT_GRAY_STAINED_GLASS_PANE -> fP
-    net.minecraft.world.item.Item CYAN_STAINED_GLASS_PANE -> fQ
-    net.minecraft.world.item.Item PURPLE_STAINED_GLASS_PANE -> fR
-    net.minecraft.world.item.Item BLUE_STAINED_GLASS_PANE -> fS
-    net.minecraft.world.item.Item BROWN_STAINED_GLASS_PANE -> fT
-    net.minecraft.world.item.Item GREEN_STAINED_GLASS_PANE -> fU
-    net.minecraft.world.item.Item RED_STAINED_GLASS_PANE -> fV
-    net.minecraft.world.item.Item BLACK_STAINED_GLASS_PANE -> fW
-    net.minecraft.world.item.Item PRISMARINE -> fX
-    net.minecraft.world.item.Item PRISMARINE_BRICKS -> fY
-    net.minecraft.world.item.Item DARK_PRISMARINE -> fZ
-    net.minecraft.world.item.Item PRISMARINE_STAIRS -> ga
-    net.minecraft.world.item.Item PRISMARINE_BRICK_STAIRS -> gb
-    net.minecraft.world.item.Item DARK_PRISMARINE_STAIRS -> gc
-    net.minecraft.world.item.Item SEA_LANTERN -> gd
-    net.minecraft.world.item.Item RED_SANDSTONE -> ge
-    net.minecraft.world.item.Item CHISELED_RED_SANDSTONE -> gf
-    net.minecraft.world.item.Item CUT_RED_SANDSTONE -> gg
-    net.minecraft.world.item.Item RED_SANDSTONE_STAIRS -> gh
-    net.minecraft.world.item.Item REPEATING_COMMAND_BLOCK -> gi
-    net.minecraft.world.item.Item CHAIN_COMMAND_BLOCK -> gj
-    net.minecraft.world.item.Item MAGMA_BLOCK -> gk
-    net.minecraft.world.item.Item NETHER_WART_BLOCK -> gl
-    net.minecraft.world.item.Item RED_NETHER_BRICKS -> gm
-    net.minecraft.world.item.Item BONE_BLOCK -> gn
-    net.minecraft.world.item.Item STRUCTURE_VOID -> go
-    net.minecraft.world.item.Item OBSERVER -> gp
-    net.minecraft.world.item.Item SHULKER_BOX -> gq
-    net.minecraft.world.item.Item WHITE_SHULKER_BOX -> gr
-    net.minecraft.world.item.Item ORANGE_SHULKER_BOX -> gs
-    net.minecraft.world.item.Item MAGENTA_SHULKER_BOX -> gt
-    net.minecraft.world.item.Item LIGHT_BLUE_SHULKER_BOX -> gu
-    net.minecraft.world.item.Item YELLOW_SHULKER_BOX -> gv
-    net.minecraft.world.item.Item LIME_SHULKER_BOX -> gw
-    net.minecraft.world.item.Item PINK_SHULKER_BOX -> gx
-    net.minecraft.world.item.Item GRAY_SHULKER_BOX -> gy
-    net.minecraft.world.item.Item LIGHT_GRAY_SHULKER_BOX -> gz
-    net.minecraft.world.item.Item CYAN_SHULKER_BOX -> gA
-    net.minecraft.world.item.Item PURPLE_SHULKER_BOX -> gB
-    net.minecraft.world.item.Item BLUE_SHULKER_BOX -> gC
-    net.minecraft.world.item.Item BROWN_SHULKER_BOX -> gD
-    net.minecraft.world.item.Item GREEN_SHULKER_BOX -> gE
-    net.minecraft.world.item.Item RED_SHULKER_BOX -> gF
-    net.minecraft.world.item.Item BLACK_SHULKER_BOX -> gG
-    net.minecraft.world.item.Item WHITE_GLAZED_TERRACOTTA -> gH
-    net.minecraft.world.item.Item ORANGE_GLAZED_TERRACOTTA -> gI
-    net.minecraft.world.item.Item MAGENTA_GLAZED_TERRACOTTA -> gJ
-    net.minecraft.world.item.Item LIGHT_BLUE_GLAZED_TERRACOTTA -> gK
-    net.minecraft.world.item.Item YELLOW_GLAZED_TERRACOTTA -> gL
-    net.minecraft.world.item.Item LIME_GLAZED_TERRACOTTA -> gM
-    net.minecraft.world.item.Item PINK_GLAZED_TERRACOTTA -> gN
-    net.minecraft.world.item.Item GRAY_GLAZED_TERRACOTTA -> gO
-    net.minecraft.world.item.Item LIGHT_GRAY_GLAZED_TERRACOTTA -> gP
-    net.minecraft.world.item.Item CYAN_GLAZED_TERRACOTTA -> gQ
-    net.minecraft.world.item.Item PURPLE_GLAZED_TERRACOTTA -> gR
-    net.minecraft.world.item.Item BLUE_GLAZED_TERRACOTTA -> gS
-    net.minecraft.world.item.Item BROWN_GLAZED_TERRACOTTA -> gT
-    net.minecraft.world.item.Item GREEN_GLAZED_TERRACOTTA -> gU
-    net.minecraft.world.item.Item RED_GLAZED_TERRACOTTA -> gV
-    net.minecraft.world.item.Item BLACK_GLAZED_TERRACOTTA -> gW
-    net.minecraft.world.item.Item WHITE_CONCRETE -> gX
-    net.minecraft.world.item.Item ORANGE_CONCRETE -> gY
-    net.minecraft.world.item.Item MAGENTA_CONCRETE -> gZ
-    net.minecraft.world.item.Item LIGHT_BLUE_CONCRETE -> ha
-    net.minecraft.world.item.Item YELLOW_CONCRETE -> hb
-    net.minecraft.world.item.Item LIME_CONCRETE -> hc
-    net.minecraft.world.item.Item PINK_CONCRETE -> hd
-    net.minecraft.world.item.Item GRAY_CONCRETE -> he
-    net.minecraft.world.item.Item LIGHT_GRAY_CONCRETE -> hf
-    net.minecraft.world.item.Item CYAN_CONCRETE -> hg
-    net.minecraft.world.item.Item PURPLE_CONCRETE -> hh
-    net.minecraft.world.item.Item BLUE_CONCRETE -> hi
-    net.minecraft.world.item.Item BROWN_CONCRETE -> hj
-    net.minecraft.world.item.Item GREEN_CONCRETE -> hk
-    net.minecraft.world.item.Item RED_CONCRETE -> hl
-    net.minecraft.world.item.Item BLACK_CONCRETE -> hm
-    net.minecraft.world.item.Item WHITE_CONCRETE_POWDER -> hn
-    net.minecraft.world.item.Item ORANGE_CONCRETE_POWDER -> ho
-    net.minecraft.world.item.Item MAGENTA_CONCRETE_POWDER -> hp
-    net.minecraft.world.item.Item LIGHT_BLUE_CONCRETE_POWDER -> hq
-    net.minecraft.world.item.Item YELLOW_CONCRETE_POWDER -> hr
-    net.minecraft.world.item.Item LIME_CONCRETE_POWDER -> hs
-    net.minecraft.world.item.Item PINK_CONCRETE_POWDER -> ht
-    net.minecraft.world.item.Item GRAY_CONCRETE_POWDER -> hu
-    net.minecraft.world.item.Item LIGHT_GRAY_CONCRETE_POWDER -> hv
-    net.minecraft.world.item.Item CYAN_CONCRETE_POWDER -> hw
-    net.minecraft.world.item.Item PURPLE_CONCRETE_POWDER -> hx
-    net.minecraft.world.item.Item BLUE_CONCRETE_POWDER -> hy
-    net.minecraft.world.item.Item BROWN_CONCRETE_POWDER -> hz
-    net.minecraft.world.item.Item GREEN_CONCRETE_POWDER -> hA
-    net.minecraft.world.item.Item RED_CONCRETE_POWDER -> hB
-    net.minecraft.world.item.Item BLACK_CONCRETE_POWDER -> hC
-    net.minecraft.world.item.Item TURTLE_EGG -> hD
-    net.minecraft.world.item.Item DEAD_TUBE_CORAL_BLOCK -> hE
-    net.minecraft.world.item.Item DEAD_BRAIN_CORAL_BLOCK -> hF
-    net.minecraft.world.item.Item DEAD_BUBBLE_CORAL_BLOCK -> hG
-    net.minecraft.world.item.Item DEAD_FIRE_CORAL_BLOCK -> hH
-    net.minecraft.world.item.Item DEAD_HORN_CORAL_BLOCK -> hI
-    net.minecraft.world.item.Item TUBE_CORAL_BLOCK -> hJ
-    net.minecraft.world.item.Item BRAIN_CORAL_BLOCK -> hK
-    net.minecraft.world.item.Item BUBBLE_CORAL_BLOCK -> hL
-    net.minecraft.world.item.Item FIRE_CORAL_BLOCK -> hM
-    net.minecraft.world.item.Item HORN_CORAL_BLOCK -> hN
-    net.minecraft.world.item.Item TUBE_CORAL -> hO
-    net.minecraft.world.item.Item BRAIN_CORAL -> hP
-    net.minecraft.world.item.Item BUBBLE_CORAL -> hQ
-    net.minecraft.world.item.Item FIRE_CORAL -> hR
-    net.minecraft.world.item.Item HORN_CORAL -> hS
-    net.minecraft.world.item.Item DEAD_BRAIN_CORAL -> hT
-    net.minecraft.world.item.Item DEAD_BUBBLE_CORAL -> hU
-    net.minecraft.world.item.Item DEAD_FIRE_CORAL -> hV
-    net.minecraft.world.item.Item DEAD_HORN_CORAL -> hW
-    net.minecraft.world.item.Item DEAD_TUBE_CORAL -> hX
-    net.minecraft.world.item.Item TUBE_CORAL_FAN -> hY
-    net.minecraft.world.item.Item BRAIN_CORAL_FAN -> hZ
-    net.minecraft.world.item.Item BUBBLE_CORAL_FAN -> ia
-    net.minecraft.world.item.Item FIRE_CORAL_FAN -> ib
-    net.minecraft.world.item.Item HORN_CORAL_FAN -> ic
-    net.minecraft.world.item.Item DEAD_TUBE_CORAL_FAN -> id
-    net.minecraft.world.item.Item DEAD_BRAIN_CORAL_FAN -> ie
-    net.minecraft.world.item.Item DEAD_BUBBLE_CORAL_FAN -> if
-    net.minecraft.world.item.Item DEAD_FIRE_CORAL_FAN -> ig
-    net.minecraft.world.item.Item DEAD_HORN_CORAL_FAN -> ih
-    net.minecraft.world.item.Item BLUE_ICE -> ii
-    net.minecraft.world.item.Item CONDUIT -> ij
-    net.minecraft.world.item.Item POLISHED_GRANITE_STAIRS -> ik
-    net.minecraft.world.item.Item SMOOTH_RED_SANDSTONE_STAIRS -> il
-    net.minecraft.world.item.Item MOSSY_STONE_BRICK_STAIRS -> im
-    net.minecraft.world.item.Item POLISHED_DIORITE_STAIRS -> in
-    net.minecraft.world.item.Item MOSSY_COBBLESTONE_STAIRS -> io
-    net.minecraft.world.item.Item END_STONE_BRICK_STAIRS -> ip
-    net.minecraft.world.item.Item STONE_STAIRS -> iq
-    net.minecraft.world.item.Item SMOOTH_SANDSTONE_STAIRS -> ir
-    net.minecraft.world.item.Item SMOOTH_QUARTZ_STAIRS -> is
-    net.minecraft.world.item.Item GRANITE_STAIRS -> it
-    net.minecraft.world.item.Item ANDESITE_STAIRS -> iu
-    net.minecraft.world.item.Item RED_NETHER_BRICK_STAIRS -> iv
-    net.minecraft.world.item.Item POLISHED_ANDESITE_STAIRS -> iw
-    net.minecraft.world.item.Item DIORITE_STAIRS -> ix
-    net.minecraft.world.item.Item POLISHED_GRANITE_SLAB -> iy
-    net.minecraft.world.item.Item SMOOTH_RED_SANDSTONE_SLAB -> iz
-    net.minecraft.world.item.Item MOSSY_STONE_BRICK_SLAB -> iA
-    net.minecraft.world.item.Item POLISHED_DIORITE_SLAB -> iB
-    net.minecraft.world.item.Item MOSSY_COBBLESTONE_SLAB -> iC
-    net.minecraft.world.item.Item END_STONE_BRICK_SLAB -> iD
-    net.minecraft.world.item.Item SMOOTH_SANDSTONE_SLAB -> iE
-    net.minecraft.world.item.Item SMOOTH_QUARTZ_SLAB -> iF
-    net.minecraft.world.item.Item GRANITE_SLAB -> iG
-    net.minecraft.world.item.Item ANDESITE_SLAB -> iH
-    net.minecraft.world.item.Item RED_NETHER_BRICK_SLAB -> iI
-    net.minecraft.world.item.Item POLISHED_ANDESITE_SLAB -> iJ
-    net.minecraft.world.item.Item DIORITE_SLAB -> iK
-    net.minecraft.world.item.Item SCAFFOLDING -> iL
-    net.minecraft.world.item.Item IRON_DOOR -> iM
-    net.minecraft.world.item.Item OAK_DOOR -> iN
-    net.minecraft.world.item.Item SPRUCE_DOOR -> iO
-    net.minecraft.world.item.Item BIRCH_DOOR -> iP
-    net.minecraft.world.item.Item JUNGLE_DOOR -> iQ
-    net.minecraft.world.item.Item ACACIA_DOOR -> iR
-    net.minecraft.world.item.Item DARK_OAK_DOOR -> iS
-    net.minecraft.world.item.Item REPEATER -> iT
-    net.minecraft.world.item.Item COMPARATOR -> iU
-    net.minecraft.world.item.Item STRUCTURE_BLOCK -> iV
-    net.minecraft.world.item.Item JIGSAW -> iW
-    net.minecraft.world.item.Item COMPOSTER -> iX
-    net.minecraft.world.item.Item TURTLE_HELMET -> iY
-    net.minecraft.world.item.Item SCUTE -> iZ
-    net.minecraft.world.item.Item IRON_SHOVEL -> ja
-    net.minecraft.world.item.Item IRON_PICKAXE -> jb
-    net.minecraft.world.item.Item IRON_AXE -> jc
-    net.minecraft.world.item.Item FLINT_AND_STEEL -> jd
-    net.minecraft.world.item.Item APPLE -> je
-    net.minecraft.world.item.Item BOW -> jf
-    net.minecraft.world.item.Item ARROW -> jg
-    net.minecraft.world.item.Item COAL -> jh
-    net.minecraft.world.item.Item CHARCOAL -> ji
-    net.minecraft.world.item.Item DIAMOND -> jj
-    net.minecraft.world.item.Item IRON_INGOT -> jk
-    net.minecraft.world.item.Item GOLD_INGOT -> jl
-    net.minecraft.world.item.Item IRON_SWORD -> jm
-    net.minecraft.world.item.Item WOODEN_SWORD -> jn
-    net.minecraft.world.item.Item WOODEN_SHOVEL -> jo
-    net.minecraft.world.item.Item WOODEN_PICKAXE -> jp
-    net.minecraft.world.item.Item WOODEN_AXE -> jq
-    net.minecraft.world.item.Item STONE_SWORD -> jr
-    net.minecraft.world.item.Item STONE_SHOVEL -> js
-    net.minecraft.world.item.Item STONE_PICKAXE -> jt
-    net.minecraft.world.item.Item STONE_AXE -> ju
-    net.minecraft.world.item.Item DIAMOND_SWORD -> jv
-    net.minecraft.world.item.Item DIAMOND_SHOVEL -> jw
-    net.minecraft.world.item.Item DIAMOND_PICKAXE -> jx
-    net.minecraft.world.item.Item DIAMOND_AXE -> jy
-    net.minecraft.world.item.Item STICK -> jz
-    net.minecraft.world.item.Item BOWL -> jA
-    net.minecraft.world.item.Item MUSHROOM_STEW -> jB
-    net.minecraft.world.item.Item GOLDEN_SWORD -> jC
-    net.minecraft.world.item.Item GOLDEN_SHOVEL -> jD
-    net.minecraft.world.item.Item GOLDEN_PICKAXE -> jE
-    net.minecraft.world.item.Item GOLDEN_AXE -> jF
-    net.minecraft.world.item.Item STRING -> jG
-    net.minecraft.world.item.Item FEATHER -> jH
-    net.minecraft.world.item.Item GUNPOWDER -> jI
-    net.minecraft.world.item.Item WOODEN_HOE -> jJ
-    net.minecraft.world.item.Item STONE_HOE -> jK
-    net.minecraft.world.item.Item IRON_HOE -> jL
-    net.minecraft.world.item.Item DIAMOND_HOE -> jM
-    net.minecraft.world.item.Item GOLDEN_HOE -> jN
-    net.minecraft.world.item.Item WHEAT_SEEDS -> jO
-    net.minecraft.world.item.Item WHEAT -> jP
-    net.minecraft.world.item.Item BREAD -> jQ
-    net.minecraft.world.item.Item LEATHER_HELMET -> jR
-    net.minecraft.world.item.Item LEATHER_CHESTPLATE -> jS
-    net.minecraft.world.item.Item LEATHER_LEGGINGS -> jT
-    net.minecraft.world.item.Item LEATHER_BOOTS -> jU
-    net.minecraft.world.item.Item CHAINMAIL_HELMET -> jV
-    net.minecraft.world.item.Item CHAINMAIL_CHESTPLATE -> jW
-    net.minecraft.world.item.Item CHAINMAIL_LEGGINGS -> jX
-    net.minecraft.world.item.Item CHAINMAIL_BOOTS -> jY
-    net.minecraft.world.item.Item IRON_HELMET -> jZ
-    net.minecraft.world.item.Item IRON_CHESTPLATE -> ka
-    net.minecraft.world.item.Item IRON_LEGGINGS -> kb
-    net.minecraft.world.item.Item IRON_BOOTS -> kc
-    net.minecraft.world.item.Item DIAMOND_HELMET -> kd
-    net.minecraft.world.item.Item DIAMOND_CHESTPLATE -> ke
-    net.minecraft.world.item.Item DIAMOND_LEGGINGS -> kf
-    net.minecraft.world.item.Item DIAMOND_BOOTS -> kg
-    net.minecraft.world.item.Item GOLDEN_HELMET -> kh
-    net.minecraft.world.item.Item GOLDEN_CHESTPLATE -> ki
-    net.minecraft.world.item.Item GOLDEN_LEGGINGS -> kj
-    net.minecraft.world.item.Item GOLDEN_BOOTS -> kk
-    net.minecraft.world.item.Item FLINT -> kl
-    net.minecraft.world.item.Item PORKCHOP -> km
-    net.minecraft.world.item.Item COOKED_PORKCHOP -> kn
-    net.minecraft.world.item.Item PAINTING -> ko
-    net.minecraft.world.item.Item GOLDEN_APPLE -> kp
-    net.minecraft.world.item.Item ENCHANTED_GOLDEN_APPLE -> kq
-    net.minecraft.world.item.Item OAK_SIGN -> kr
-    net.minecraft.world.item.Item SPRUCE_SIGN -> ks
-    net.minecraft.world.item.Item BIRCH_SIGN -> kt
-    net.minecraft.world.item.Item JUNGLE_SIGN -> ku
-    net.minecraft.world.item.Item ACACIA_SIGN -> kv
-    net.minecraft.world.item.Item DARK_OAK_SIGN -> kw
-    net.minecraft.world.item.Item BUCKET -> kx
-    net.minecraft.world.item.Item WATER_BUCKET -> ky
-    net.minecraft.world.item.Item LAVA_BUCKET -> kz
-    net.minecraft.world.item.Item MINECART -> kA
-    net.minecraft.world.item.Item SADDLE -> kB
-    net.minecraft.world.item.Item REDSTONE -> kC
-    net.minecraft.world.item.Item SNOWBALL -> kD
-    net.minecraft.world.item.Item OAK_BOAT -> kE
-    net.minecraft.world.item.Item LEATHER -> kF
-    net.minecraft.world.item.Item MILK_BUCKET -> kG
-    net.minecraft.world.item.Item PUFFERFISH_BUCKET -> kH
-    net.minecraft.world.item.Item SALMON_BUCKET -> kI
-    net.minecraft.world.item.Item COD_BUCKET -> kJ
-    net.minecraft.world.item.Item TROPICAL_FISH_BUCKET -> kK
-    net.minecraft.world.item.Item BRICK -> kL
-    net.minecraft.world.item.Item CLAY_BALL -> kM
-    net.minecraft.world.item.Item SUGAR_CANE -> kN
-    net.minecraft.world.item.Item KELP -> kO
-    net.minecraft.world.item.Item DRIED_KELP_BLOCK -> kP
-    net.minecraft.world.item.Item BAMBOO -> kQ
-    net.minecraft.world.item.Item PAPER -> kR
-    net.minecraft.world.item.Item BOOK -> kS
-    net.minecraft.world.item.Item SLIME_BALL -> kT
-    net.minecraft.world.item.Item CHEST_MINECART -> kU
-    net.minecraft.world.item.Item FURNACE_MINECART -> kV
-    net.minecraft.world.item.Item EGG -> kW
-    net.minecraft.world.item.Item COMPASS -> kX
-    net.minecraft.world.item.Item FISHING_ROD -> kY
-    net.minecraft.world.item.Item CLOCK -> kZ
-    net.minecraft.world.item.Item GLOWSTONE_DUST -> la
-    net.minecraft.world.item.Item COD -> lb
-    net.minecraft.world.item.Item SALMON -> lc
-    net.minecraft.world.item.Item TROPICAL_FISH -> ld
-    net.minecraft.world.item.Item PUFFERFISH -> le
-    net.minecraft.world.item.Item COOKED_COD -> lf
-    net.minecraft.world.item.Item COOKED_SALMON -> lg
-    net.minecraft.world.item.Item INK_SAC -> lh
-    net.minecraft.world.item.Item RED_DYE -> li
-    net.minecraft.world.item.Item GREEN_DYE -> lj
-    net.minecraft.world.item.Item COCOA_BEANS -> lk
-    net.minecraft.world.item.Item LAPIS_LAZULI -> ll
-    net.minecraft.world.item.Item PURPLE_DYE -> lm
-    net.minecraft.world.item.Item CYAN_DYE -> ln
-    net.minecraft.world.item.Item LIGHT_GRAY_DYE -> lo
-    net.minecraft.world.item.Item GRAY_DYE -> lp
-    net.minecraft.world.item.Item PINK_DYE -> lq
-    net.minecraft.world.item.Item LIME_DYE -> lr
-    net.minecraft.world.item.Item YELLOW_DYE -> ls
-    net.minecraft.world.item.Item LIGHT_BLUE_DYE -> lt
-    net.minecraft.world.item.Item MAGENTA_DYE -> lu
-    net.minecraft.world.item.Item ORANGE_DYE -> lv
-    net.minecraft.world.item.Item BONE_MEAL -> lw
-    net.minecraft.world.item.Item BLUE_DYE -> lx
-    net.minecraft.world.item.Item BROWN_DYE -> ly
-    net.minecraft.world.item.Item BLACK_DYE -> lz
-    net.minecraft.world.item.Item WHITE_DYE -> lA
-    net.minecraft.world.item.Item BONE -> lB
-    net.minecraft.world.item.Item SUGAR -> lC
-    net.minecraft.world.item.Item CAKE -> lD
-    net.minecraft.world.item.Item WHITE_BED -> lE
-    net.minecraft.world.item.Item ORANGE_BED -> lF
-    net.minecraft.world.item.Item MAGENTA_BED -> lG
-    net.minecraft.world.item.Item LIGHT_BLUE_BED -> lH
-    net.minecraft.world.item.Item YELLOW_BED -> lI
-    net.minecraft.world.item.Item LIME_BED -> lJ
-    net.minecraft.world.item.Item PINK_BED -> lK
-    net.minecraft.world.item.Item GRAY_BED -> lL
-    net.minecraft.world.item.Item LIGHT_GRAY_BED -> lM
-    net.minecraft.world.item.Item CYAN_BED -> lN
-    net.minecraft.world.item.Item PURPLE_BED -> lO
-    net.minecraft.world.item.Item BLUE_BED -> lP
-    net.minecraft.world.item.Item BROWN_BED -> lQ
-    net.minecraft.world.item.Item GREEN_BED -> lR
-    net.minecraft.world.item.Item RED_BED -> lS
-    net.minecraft.world.item.Item BLACK_BED -> lT
-    net.minecraft.world.item.Item COOKIE -> lU
-    net.minecraft.world.item.Item FILLED_MAP -> lV
-    net.minecraft.world.item.Item SHEARS -> lW
-    net.minecraft.world.item.Item MELON_SLICE -> lX
-    net.minecraft.world.item.Item DRIED_KELP -> lY
-    net.minecraft.world.item.Item PUMPKIN_SEEDS -> lZ
-    net.minecraft.world.item.Item MELON_SEEDS -> ma
-    net.minecraft.world.item.Item BEEF -> mb
-    net.minecraft.world.item.Item COOKED_BEEF -> mc
-    net.minecraft.world.item.Item CHICKEN -> md
-    net.minecraft.world.item.Item COOKED_CHICKEN -> me
-    net.minecraft.world.item.Item ROTTEN_FLESH -> mf
-    net.minecraft.world.item.Item ENDER_PEARL -> mg
-    net.minecraft.world.item.Item BLAZE_ROD -> mh
-    net.minecraft.world.item.Item GHAST_TEAR -> mi
-    net.minecraft.world.item.Item GOLD_NUGGET -> mj
-    net.minecraft.world.item.Item NETHER_WART -> mk
-    net.minecraft.world.item.Item POTION -> ml
-    net.minecraft.world.item.Item GLASS_BOTTLE -> mm
-    net.minecraft.world.item.Item SPIDER_EYE -> mn
-    net.minecraft.world.item.Item FERMENTED_SPIDER_EYE -> mo
-    net.minecraft.world.item.Item BLAZE_POWDER -> mp
-    net.minecraft.world.item.Item MAGMA_CREAM -> mq
-    net.minecraft.world.item.Item BREWING_STAND -> mr
-    net.minecraft.world.item.Item CAULDRON -> ms
-    net.minecraft.world.item.Item ENDER_EYE -> mt
-    net.minecraft.world.item.Item GLISTERING_MELON_SLICE -> mu
-    net.minecraft.world.item.Item BAT_SPAWN_EGG -> mv
-    net.minecraft.world.item.Item BEE_SPAWN_EGG -> mw
-    net.minecraft.world.item.Item BLAZE_SPAWN_EGG -> mx
-    net.minecraft.world.item.Item CAT_SPAWN_EGG -> my
-    net.minecraft.world.item.Item CAVE_SPIDER_SPAWN_EGG -> mz
-    net.minecraft.world.item.Item CHICKEN_SPAWN_EGG -> mA
-    net.minecraft.world.item.Item COD_SPAWN_EGG -> mB
-    net.minecraft.world.item.Item COW_SPAWN_EGG -> mC
-    net.minecraft.world.item.Item CREEPER_SPAWN_EGG -> mD
-    net.minecraft.world.item.Item DOLPHIN_SPAWN_EGG -> mE
-    net.minecraft.world.item.Item DONKEY_SPAWN_EGG -> mF
-    net.minecraft.world.item.Item DROWNED_SPAWN_EGG -> mG
-    net.minecraft.world.item.Item ELDER_GUARDIAN_SPAWN_EGG -> mH
-    net.minecraft.world.item.Item ENDERMAN_SPAWN_EGG -> mI
-    net.minecraft.world.item.Item ENDERMITE_SPAWN_EGG -> mJ
-    net.minecraft.world.item.Item EVOKER_SPAWN_EGG -> mK
-    net.minecraft.world.item.Item FOX_SPAWN_EGG -> mL
-    net.minecraft.world.item.Item GHAST_SPAWN_EGG -> mM
-    net.minecraft.world.item.Item GUARDIAN_SPAWN_EGG -> mN
-    net.minecraft.world.item.Item HORSE_SPAWN_EGG -> mO
-    net.minecraft.world.item.Item HUSK_SPAWN_EGG -> mP
-    net.minecraft.world.item.Item LLAMA_SPAWN_EGG -> mQ
-    net.minecraft.world.item.Item MAGMA_CUBE_SPAWN_EGG -> mR
-    net.minecraft.world.item.Item MOOSHROOM_SPAWN_EGG -> mS
-    net.minecraft.world.item.Item MULE_SPAWN_EGG -> mT
-    net.minecraft.world.item.Item OCELOT_SPAWN_EGG -> mU
-    net.minecraft.world.item.Item PANDA_SPAWN_EGG -> mV
-    net.minecraft.world.item.Item PARROT_SPAWN_EGG -> mW
-    net.minecraft.world.item.Item PHANTOM_SPAWN_EGG -> mX
-    net.minecraft.world.item.Item PIG_SPAWN_EGG -> mY
-    net.minecraft.world.item.Item PILLAGER_SPAWN_EGG -> mZ
-    net.minecraft.world.item.Item POLAR_BEAR_SPAWN_EGG -> na
-    net.minecraft.world.item.Item PUFFERFISH_SPAWN_EGG -> nb
-    net.minecraft.world.item.Item RABBIT_SPAWN_EGG -> nc
-    net.minecraft.world.item.Item RAVAGER_SPAWN_EGG -> nd
-    net.minecraft.world.item.Item SALMON_SPAWN_EGG -> ne
-    net.minecraft.world.item.Item SHEEP_SPAWN_EGG -> nf
-    net.minecraft.world.item.Item SHULKER_SPAWN_EGG -> ng
-    net.minecraft.world.item.Item SILVERFISH_SPAWN_EGG -> nh
-    net.minecraft.world.item.Item SKELETON_SPAWN_EGG -> ni
-    net.minecraft.world.item.Item SKELETON_HORSE_SPAWN_EGG -> nj
-    net.minecraft.world.item.Item SLIME_SPAWN_EGG -> nk
-    net.minecraft.world.item.Item SPIDER_SPAWN_EGG -> nl
-    net.minecraft.world.item.Item SQUID_SPAWN_EGG -> nm
-    net.minecraft.world.item.Item STRAY_SPAWN_EGG -> nn
-    net.minecraft.world.item.Item TRADER_LLAMA_SPAWN_EGG -> no
-    net.minecraft.world.item.Item TROPICAL_FISH_SPAWN_EGG -> np
-    net.minecraft.world.item.Item TURTLE_SPAWN_EGG -> nq
-    net.minecraft.world.item.Item VEX_SPAWN_EGG -> nr
-    net.minecraft.world.item.Item VILLAGER_SPAWN_EGG -> ns
-    net.minecraft.world.item.Item VINDICATOR_SPAWN_EGG -> nt
-    net.minecraft.world.item.Item WANDERING_TRADER_SPAWN_EGG -> nu
-    net.minecraft.world.item.Item WITCH_SPAWN_EGG -> nv
-    net.minecraft.world.item.Item WITHER_SKELETON_SPAWN_EGG -> nw
-    net.minecraft.world.item.Item WOLF_SPAWN_EGG -> nx
-    net.minecraft.world.item.Item ZOMBIE_SPAWN_EGG -> ny
-    net.minecraft.world.item.Item ZOMBIE_HORSE_SPAWN_EGG -> nz
-    net.minecraft.world.item.Item ZOMBIE_PIGMAN_SPAWN_EGG -> nA
-    net.minecraft.world.item.Item ZOMBIE_VILLAGER_SPAWN_EGG -> nB
-    net.minecraft.world.item.Item EXPERIENCE_BOTTLE -> nC
-    net.minecraft.world.item.Item FIRE_CHARGE -> nD
-    net.minecraft.world.item.Item WRITABLE_BOOK -> nE
-    net.minecraft.world.item.Item WRITTEN_BOOK -> nF
-    net.minecraft.world.item.Item EMERALD -> nG
-    net.minecraft.world.item.Item ITEM_FRAME -> nH
-    net.minecraft.world.item.Item FLOWER_POT -> nI
-    net.minecraft.world.item.Item CARROT -> nJ
-    net.minecraft.world.item.Item POTATO -> nK
-    net.minecraft.world.item.Item BAKED_POTATO -> nL
-    net.minecraft.world.item.Item POISONOUS_POTATO -> nM
-    net.minecraft.world.item.Item MAP -> nN
-    net.minecraft.world.item.Item GOLDEN_CARROT -> nO
-    net.minecraft.world.item.Item SKELETON_SKULL -> nP
-    net.minecraft.world.item.Item WITHER_SKELETON_SKULL -> nQ
-    net.minecraft.world.item.Item PLAYER_HEAD -> nR
-    net.minecraft.world.item.Item ZOMBIE_HEAD -> nS
-    net.minecraft.world.item.Item CREEPER_HEAD -> nT
-    net.minecraft.world.item.Item DRAGON_HEAD -> nU
-    net.minecraft.world.item.Item CARROT_ON_A_STICK -> nV
-    net.minecraft.world.item.Item NETHER_STAR -> nW
-    net.minecraft.world.item.Item PUMPKIN_PIE -> nX
-    net.minecraft.world.item.Item FIREWORK_ROCKET -> nY
-    net.minecraft.world.item.Item FIREWORK_STAR -> nZ
-    net.minecraft.world.item.Item ENCHANTED_BOOK -> oa
-    net.minecraft.world.item.Item NETHER_BRICK -> ob
-    net.minecraft.world.item.Item QUARTZ -> oc
-    net.minecraft.world.item.Item TNT_MINECART -> od
-    net.minecraft.world.item.Item HOPPER_MINECART -> oe
-    net.minecraft.world.item.Item PRISMARINE_SHARD -> of
-    net.minecraft.world.item.Item PRISMARINE_CRYSTALS -> og
-    net.minecraft.world.item.Item RABBIT -> oh
-    net.minecraft.world.item.Item COOKED_RABBIT -> oi
-    net.minecraft.world.item.Item RABBIT_STEW -> oj
-    net.minecraft.world.item.Item RABBIT_FOOT -> ok
-    net.minecraft.world.item.Item RABBIT_HIDE -> ol
-    net.minecraft.world.item.Item ARMOR_STAND -> om
-    net.minecraft.world.item.Item IRON_HORSE_ARMOR -> on
-    net.minecraft.world.item.Item GOLDEN_HORSE_ARMOR -> oo
-    net.minecraft.world.item.Item DIAMOND_HORSE_ARMOR -> op
-    net.minecraft.world.item.Item LEATHER_HORSE_ARMOR -> oq
-    net.minecraft.world.item.Item LEAD -> or
-    net.minecraft.world.item.Item NAME_TAG -> os
-    net.minecraft.world.item.Item COMMAND_BLOCK_MINECART -> ot
-    net.minecraft.world.item.Item MUTTON -> ou
-    net.minecraft.world.item.Item COOKED_MUTTON -> ov
-    net.minecraft.world.item.Item WHITE_BANNER -> ow
-    net.minecraft.world.item.Item ORANGE_BANNER -> ox
-    net.minecraft.world.item.Item MAGENTA_BANNER -> oy
-    net.minecraft.world.item.Item LIGHT_BLUE_BANNER -> oz
-    net.minecraft.world.item.Item YELLOW_BANNER -> oA
-    net.minecraft.world.item.Item LIME_BANNER -> oB
-    net.minecraft.world.item.Item PINK_BANNER -> oC
-    net.minecraft.world.item.Item GRAY_BANNER -> oD
-    net.minecraft.world.item.Item LIGHT_GRAY_BANNER -> oE
-    net.minecraft.world.item.Item CYAN_BANNER -> oF
-    net.minecraft.world.item.Item PURPLE_BANNER -> oG
-    net.minecraft.world.item.Item BLUE_BANNER -> oH
-    net.minecraft.world.item.Item BROWN_BANNER -> oI
-    net.minecraft.world.item.Item GREEN_BANNER -> oJ
-    net.minecraft.world.item.Item RED_BANNER -> oK
-    net.minecraft.world.item.Item BLACK_BANNER -> oL
-    net.minecraft.world.item.Item END_CRYSTAL -> oM
-    net.minecraft.world.item.Item CHORUS_FRUIT -> oN
-    net.minecraft.world.item.Item POPPED_CHORUS_FRUIT -> oO
-    net.minecraft.world.item.Item BEETROOT -> oP
-    net.minecraft.world.item.Item BEETROOT_SEEDS -> oQ
-    net.minecraft.world.item.Item BEETROOT_SOUP -> oR
-    net.minecraft.world.item.Item DRAGON_BREATH -> oS
-    net.minecraft.world.item.Item SPLASH_POTION -> oT
-    net.minecraft.world.item.Item SPECTRAL_ARROW -> oU
-    net.minecraft.world.item.Item TIPPED_ARROW -> oV
-    net.minecraft.world.item.Item LINGERING_POTION -> oW
-    net.minecraft.world.item.Item SHIELD -> oX
-    net.minecraft.world.item.Item ELYTRA -> oY
-    net.minecraft.world.item.Item SPRUCE_BOAT -> oZ
-    net.minecraft.world.item.Item BIRCH_BOAT -> pa
-    net.minecraft.world.item.Item JUNGLE_BOAT -> pb
-    net.minecraft.world.item.Item ACACIA_BOAT -> pc
-    net.minecraft.world.item.Item DARK_OAK_BOAT -> pd
-    net.minecraft.world.item.Item TOTEM_OF_UNDYING -> pe
-    net.minecraft.world.item.Item SHULKER_SHELL -> pf
-    net.minecraft.world.item.Item IRON_NUGGET -> pg
-    net.minecraft.world.item.Item KNOWLEDGE_BOOK -> ph
-    net.minecraft.world.item.Item DEBUG_STICK -> pi
-    net.minecraft.world.item.Item MUSIC_DISC_13 -> pj
-    net.minecraft.world.item.Item MUSIC_DISC_CAT -> pk
-    net.minecraft.world.item.Item MUSIC_DISC_BLOCKS -> pl
-    net.minecraft.world.item.Item MUSIC_DISC_CHIRP -> pm
-    net.minecraft.world.item.Item MUSIC_DISC_FAR -> pn
-    net.minecraft.world.item.Item MUSIC_DISC_MALL -> po
-    net.minecraft.world.item.Item MUSIC_DISC_MELLOHI -> pp
-    net.minecraft.world.item.Item MUSIC_DISC_STAL -> pq
-    net.minecraft.world.item.Item MUSIC_DISC_STRAD -> pr
-    net.minecraft.world.item.Item MUSIC_DISC_WARD -> ps
-    net.minecraft.world.item.Item MUSIC_DISC_11 -> pt
-    net.minecraft.world.item.Item MUSIC_DISC_WAIT -> pu
-    net.minecraft.world.item.Item TRIDENT -> pv
-    net.minecraft.world.item.Item PHANTOM_MEMBRANE -> pw
-    net.minecraft.world.item.Item NAUTILUS_SHELL -> px
-    net.minecraft.world.item.Item HEART_OF_THE_SEA -> py
-    net.minecraft.world.item.Item CROSSBOW -> pz
-    net.minecraft.world.item.Item SUSPICIOUS_STEW -> pA
-    net.minecraft.world.item.Item LOOM -> pB
-    net.minecraft.world.item.Item FLOWER_BANNER_PATTERN -> pC
-    net.minecraft.world.item.Item CREEPER_BANNER_PATTERN -> pD
-    net.minecraft.world.item.Item SKULL_BANNER_PATTERN -> pE
-    net.minecraft.world.item.Item MOJANG_BANNER_PATTERN -> pF
-    net.minecraft.world.item.Item GLOBE_BANNER_PATTER -> pG
-    net.minecraft.world.item.Item BARREL -> pH
-    net.minecraft.world.item.Item SMOKER -> pI
-    net.minecraft.world.item.Item BLAST_FURNACE -> pJ
-    net.minecraft.world.item.Item CARTOGRAPHY_TABLE -> pK
-    net.minecraft.world.item.Item FLETCHING_TABLE -> pL
-    net.minecraft.world.item.Item GRINDSTONE -> pM
-    net.minecraft.world.item.Item LECTERN -> pN
-    net.minecraft.world.item.Item SMITHING_TABLE -> pO
-    net.minecraft.world.item.Item STONECUTTER -> pP
-    net.minecraft.world.item.Item BELL -> pQ
-    net.minecraft.world.item.Item LANTERN -> pR
-    net.minecraft.world.item.Item SWEET_BERRIES -> pS
-    net.minecraft.world.item.Item CAMPFIRE -> pT
-    net.minecraft.world.item.Item HONEYCOMB -> pU
-    net.minecraft.world.item.Item BEE_NEST -> pV
-    net.minecraft.world.item.Item BEEHIVE -> pW
-    net.minecraft.world.item.Item HONEY_BOTTLE -> pX
-    net.minecraft.world.item.Item HONEY_BLOCK -> pY
-    net.minecraft.world.item.Item HONEYCOMB_BLOCK -> pZ
+    net.minecraft.world.item.Item CRIMSON_NYLIUM -> m
+    net.minecraft.world.item.Item WARPED_NYLIUM -> n
+    net.minecraft.world.item.Item COBBLESTONE -> o
+    net.minecraft.world.item.Item OAK_PLANKS -> p
+    net.minecraft.world.item.Item SPRUCE_PLANKS -> q
+    net.minecraft.world.item.Item BIRCH_PLANKS -> r
+    net.minecraft.world.item.Item JUNGLE_PLANKS -> s
+    net.minecraft.world.item.Item ACACIA_PLANKS -> t
+    net.minecraft.world.item.Item DARK_OAK_PLANKS -> u
+    net.minecraft.world.item.Item CRIMSON_PLANKS -> v
+    net.minecraft.world.item.Item WARPED_PLANKS -> w
+    net.minecraft.world.item.Item OAK_SAPLING -> x
+    net.minecraft.world.item.Item SPRUCE_SAPLING -> y
+    net.minecraft.world.item.Item BIRCH_SAPLING -> z
+    net.minecraft.world.item.Item JUNGLE_SAPLING -> A
+    net.minecraft.world.item.Item ACACIA_SAPLING -> B
+    net.minecraft.world.item.Item DARK_OAK_SAPLING -> C
+    net.minecraft.world.item.Item BEDROCK -> D
+    net.minecraft.world.item.Item SAND -> E
+    net.minecraft.world.item.Item RED_SAND -> F
+    net.minecraft.world.item.Item GRAVEL -> G
+    net.minecraft.world.item.Item GOLD_ORE -> H
+    net.minecraft.world.item.Item IRON_ORE -> I
+    net.minecraft.world.item.Item COAL_ORE -> J
+    net.minecraft.world.item.Item NETHER_GOLD_ORE -> K
+    net.minecraft.world.item.Item OAK_LOG -> L
+    net.minecraft.world.item.Item SPRUCE_LOG -> M
+    net.minecraft.world.item.Item BIRCH_LOG -> N
+    net.minecraft.world.item.Item JUNGLE_LOG -> O
+    net.minecraft.world.item.Item ACACIA_LOG -> P
+    net.minecraft.world.item.Item DARK_OAK_LOG -> Q
+    net.minecraft.world.item.Item CRIMSON_STEM -> R
+    net.minecraft.world.item.Item WARPED_STEM -> S
+    net.minecraft.world.item.Item STRIPPED_OAK_LOG -> T
+    net.minecraft.world.item.Item STRIPPED_SPRUCE_LOG -> U
+    net.minecraft.world.item.Item STRIPPED_BIRCH_LOG -> V
+    net.minecraft.world.item.Item STRIPPED_JUNGLE_LOG -> W
+    net.minecraft.world.item.Item STRIPPED_ACACIA_LOG -> X
+    net.minecraft.world.item.Item STRIPPED_DARK_OAK_LOG -> Y
+    net.minecraft.world.item.Item STRIPPED_CRIMSON_STEM -> Z
+    net.minecraft.world.item.Item STRIPPED_WARPED_STEM -> aa
+    net.minecraft.world.item.Item STRIPPED_OAK_WOOD -> ab
+    net.minecraft.world.item.Item STRIPPED_SPRUCE_WOOD -> ac
+    net.minecraft.world.item.Item STRIPPED_BIRCH_WOOD -> ad
+    net.minecraft.world.item.Item STRIPPED_JUNGLE_WOOD -> ae
+    net.minecraft.world.item.Item STRIPPED_ACACIA_WOOD -> af
+    net.minecraft.world.item.Item STRIPPED_DARK_OAK_WOOD -> ag
+    net.minecraft.world.item.Item STRIPPED_CRIMSON_HYPHAE -> ah
+    net.minecraft.world.item.Item STRIPPED_WARPED_HYPHAE -> ai
+    net.minecraft.world.item.Item OAK_WOOD -> aj
+    net.minecraft.world.item.Item SPRUCE_WOOD -> ak
+    net.minecraft.world.item.Item BIRCH_WOOD -> al
+    net.minecraft.world.item.Item JUNGLE_WOOD -> am
+    net.minecraft.world.item.Item ACACIA_WOOD -> an
+    net.minecraft.world.item.Item DARK_OAK_WOOD -> ao
+    net.minecraft.world.item.Item CRIMSON_HYPHAE -> ap
+    net.minecraft.world.item.Item WARPED_HYPHAE -> aq
+    net.minecraft.world.item.Item OAK_LEAVES -> ar
+    net.minecraft.world.item.Item SPRUCE_LEAVES -> as
+    net.minecraft.world.item.Item BIRCH_LEAVES -> at
+    net.minecraft.world.item.Item JUNGLE_LEAVES -> au
+    net.minecraft.world.item.Item ACACIA_LEAVES -> av
+    net.minecraft.world.item.Item DARK_OAK_LEAVES -> aw
+    net.minecraft.world.item.Item SPONGE -> ax
+    net.minecraft.world.item.Item WET_SPONGE -> ay
+    net.minecraft.world.item.Item GLASS -> az
+    net.minecraft.world.item.Item LAPIS_ORE -> aA
+    net.minecraft.world.item.Item LAPIS_BLOCK -> aB
+    net.minecraft.world.item.Item DISPENSER -> aC
+    net.minecraft.world.item.Item SANDSTONE -> aD
+    net.minecraft.world.item.Item CHISELED_SANDSTONE -> aE
+    net.minecraft.world.item.Item CUT_SANDSTONE -> aF
+    net.minecraft.world.item.Item NOTE_BLOCK -> aG
+    net.minecraft.world.item.Item POWERED_RAIL -> aH
+    net.minecraft.world.item.Item DETECTOR_RAIL -> aI
+    net.minecraft.world.item.Item STICKY_PISTON -> aJ
+    net.minecraft.world.item.Item COBWEB -> aK
+    net.minecraft.world.item.Item GRASS -> aL
+    net.minecraft.world.item.Item FERN -> aM
+    net.minecraft.world.item.Item DEAD_BUSH -> aN
+    net.minecraft.world.item.Item SEAGRASS -> aO
+    net.minecraft.world.item.Item SEA_PICKLE -> aP
+    net.minecraft.world.item.Item PISTON -> aQ
+    net.minecraft.world.item.Item WHITE_WOOL -> aR
+    net.minecraft.world.item.Item ORANGE_WOOL -> aS
+    net.minecraft.world.item.Item MAGENTA_WOOL -> aT
+    net.minecraft.world.item.Item LIGHT_BLUE_WOOL -> aU
+    net.minecraft.world.item.Item YELLOW_WOOL -> aV
+    net.minecraft.world.item.Item LIME_WOOL -> aW
+    net.minecraft.world.item.Item PINK_WOOL -> aX
+    net.minecraft.world.item.Item GRAY_WOOL -> aY
+    net.minecraft.world.item.Item LIGHT_GRAY_WOOL -> aZ
+    net.minecraft.world.item.Item CYAN_WOOL -> ba
+    net.minecraft.world.item.Item PURPLE_WOOL -> bb
+    net.minecraft.world.item.Item BLUE_WOOL -> bc
+    net.minecraft.world.item.Item BROWN_WOOL -> bd
+    net.minecraft.world.item.Item GREEN_WOOL -> be
+    net.minecraft.world.item.Item RED_WOOL -> bf
+    net.minecraft.world.item.Item BLACK_WOOL -> bg
+    net.minecraft.world.item.Item DANDELION -> bh
+    net.minecraft.world.item.Item POPPY -> bi
+    net.minecraft.world.item.Item BLUE_ORCHID -> bj
+    net.minecraft.world.item.Item ALLIUM -> bk
+    net.minecraft.world.item.Item AZURE_BLUET -> bl
+    net.minecraft.world.item.Item RED_TULIP -> bm
+    net.minecraft.world.item.Item ORANGE_TULIP -> bn
+    net.minecraft.world.item.Item WHITE_TULIP -> bo
+    net.minecraft.world.item.Item PINK_TULIP -> bp
+    net.minecraft.world.item.Item OXEYE_DAISY -> bq
+    net.minecraft.world.item.Item CORNFLOWER -> br
+    net.minecraft.world.item.Item LILY_OF_THE_VALLEY -> bs
+    net.minecraft.world.item.Item WITHER_ROSE -> bt
+    net.minecraft.world.item.Item BROWN_MUSHROOM -> bu
+    net.minecraft.world.item.Item RED_MUSHROOM -> bv
+    net.minecraft.world.item.Item CRIMSON_FUNGUS -> bw
+    net.minecraft.world.item.Item WARPED_FUNGUS -> bx
+    net.minecraft.world.item.Item CRIMSON_ROOTS -> by
+    net.minecraft.world.item.Item WARPED_ROOTS -> bz
+    net.minecraft.world.item.Item NETHER_SPROUTS -> bA
+    net.minecraft.world.item.Item WEEPING_VINES -> bB
+    net.minecraft.world.item.Item TWISTING_VINES -> bC
+    net.minecraft.world.item.Item SUGAR_CANE -> bD
+    net.minecraft.world.item.Item KELP -> bE
+    net.minecraft.world.item.Item BAMBOO -> bF
+    net.minecraft.world.item.Item GOLD_BLOCK -> bG
+    net.minecraft.world.item.Item IRON_BLOCK -> bH
+    net.minecraft.world.item.Item OAK_SLAB -> bI
+    net.minecraft.world.item.Item SPRUCE_SLAB -> bJ
+    net.minecraft.world.item.Item BIRCH_SLAB -> bK
+    net.minecraft.world.item.Item JUNGLE_SLAB -> bL
+    net.minecraft.world.item.Item ACACIA_SLAB -> bM
+    net.minecraft.world.item.Item DARK_OAK_SLAB -> bN
+    net.minecraft.world.item.Item CRIMSON_SLAB -> bO
+    net.minecraft.world.item.Item WARPED_SLAB -> bP
+    net.minecraft.world.item.Item STONE_SLAB -> bQ
+    net.minecraft.world.item.Item SMOOTH_STONE_SLAB -> bR
+    net.minecraft.world.item.Item SANDSTONE_SLAB -> bS
+    net.minecraft.world.item.Item CUT_STANDSTONE_SLAB -> bT
+    net.minecraft.world.item.Item PETRIFIED_OAK_SLAB -> bU
+    net.minecraft.world.item.Item COBBLESTONE_SLAB -> bV
+    net.minecraft.world.item.Item BRICK_SLAB -> bW
+    net.minecraft.world.item.Item STONE_BRICK_SLAB -> bX
+    net.minecraft.world.item.Item NETHER_BRICK_SLAB -> bY
+    net.minecraft.world.item.Item QUARTZ_SLAB -> bZ
+    net.minecraft.world.item.Item RED_SANDSTONE_SLAB -> ca
+    net.minecraft.world.item.Item CUT_RED_SANDSTONE_SLAB -> cb
+    net.minecraft.world.item.Item PURPUR_SLAB -> cc
+    net.minecraft.world.item.Item PRISMARINE_SLAB -> cd
+    net.minecraft.world.item.Item PRISMARINE_BRICK_SLAB -> ce
+    net.minecraft.world.item.Item DARK_PRISMARINE_SLAB -> cf
+    net.minecraft.world.item.Item SMOOTH_QUARTZ -> cg
+    net.minecraft.world.item.Item SMOOTH_RED_SANDSTONE -> ch
+    net.minecraft.world.item.Item SMOOTH_SANDSTONE -> ci
+    net.minecraft.world.item.Item SMOOTH_STONE -> cj
+    net.minecraft.world.item.Item BRICKS -> ck
+    net.minecraft.world.item.Item TNT -> cl
+    net.minecraft.world.item.Item BOOKSHELF -> cm
+    net.minecraft.world.item.Item MOSSY_COBBLESTONE -> cn
+    net.minecraft.world.item.Item OBSIDIAN -> co
+    net.minecraft.world.item.Item TORCH -> cp
+    net.minecraft.world.item.Item END_ROD -> cq
+    net.minecraft.world.item.Item CHORUS_PLANT -> cr
+    net.minecraft.world.item.Item CHORUS_FLOWER -> cs
+    net.minecraft.world.item.Item PURPUR_BLOCK -> ct
+    net.minecraft.world.item.Item PURPUR_PILLAR -> cu
+    net.minecraft.world.item.Item PURPUR_STAIRS -> cv
+    net.minecraft.world.item.Item SPAWNER -> cw
+    net.minecraft.world.item.Item OAK_STAIRS -> cx
+    net.minecraft.world.item.Item CHEST -> cy
+    net.minecraft.world.item.Item DIAMOND_ORE -> cz
+    net.minecraft.world.item.Item DIAMOND_BLOCK -> cA
+    net.minecraft.world.item.Item CRAFTING_TABLE -> cB
+    net.minecraft.world.item.Item FARMLAND -> cC
+    net.minecraft.world.item.Item FURNACE -> cD
+    net.minecraft.world.item.Item LADDER -> cE
+    net.minecraft.world.item.Item RAIL -> cF
+    net.minecraft.world.item.Item COBBLESTONE_STAIRS -> cG
+    net.minecraft.world.item.Item LEVER -> cH
+    net.minecraft.world.item.Item STONE_PRESSURE_PLATE -> cI
+    net.minecraft.world.item.Item OAK_PRESSURE_PLATE -> cJ
+    net.minecraft.world.item.Item SPRUCE_PRESSURE_PLATE -> cK
+    net.minecraft.world.item.Item BIRCH_PRESSURE_PLATE -> cL
+    net.minecraft.world.item.Item JUNGLE_PRESSURE_PLATE -> cM
+    net.minecraft.world.item.Item ACACIA_PRESSURE_PLATE -> cN
+    net.minecraft.world.item.Item DARK_OAK_PRESSURE_PLATE -> cO
+    net.minecraft.world.item.Item CRIMSON_PRESSURE_PLATE -> cP
+    net.minecraft.world.item.Item WARPED_PRESSURE_PLATE -> cQ
+    net.minecraft.world.item.Item POLISHED_BLACKSTONE_PRESSURE_PLATE -> cR
+    net.minecraft.world.item.Item REDSTONE_ORE -> cS
+    net.minecraft.world.item.Item REDSTONE_TORCH -> cT
+    net.minecraft.world.item.Item SNOW -> cU
+    net.minecraft.world.item.Item ICE -> cV
+    net.minecraft.world.item.Item SNOW_BLOCK -> cW
+    net.minecraft.world.item.Item CACTUS -> cX
+    net.minecraft.world.item.Item CLAY -> cY
+    net.minecraft.world.item.Item JUKEBOX -> cZ
+    net.minecraft.world.item.Item OAK_FENCE -> da
+    net.minecraft.world.item.Item SPRUCE_FENCE -> db
+    net.minecraft.world.item.Item BIRCH_FENCE -> dc
+    net.minecraft.world.item.Item JUNGLE_FENCE -> dd
+    net.minecraft.world.item.Item ACACIA_FENCE -> de
+    net.minecraft.world.item.Item DARK_OAK_FENCE -> df
+    net.minecraft.world.item.Item CRIMSON_FENCE -> dg
+    net.minecraft.world.item.Item WARPED_FENCE -> dh
+    net.minecraft.world.item.Item PUMPKIN -> di
+    net.minecraft.world.item.Item CARVED_PUMPKIN -> dj
+    net.minecraft.world.item.Item NETHERRACK -> dk
+    net.minecraft.world.item.Item SOUL_SAND -> dl
+    net.minecraft.world.item.Item SOUL_SOIL -> dm
+    net.minecraft.world.item.Item BASALT -> dn
+    net.minecraft.world.item.Item POLISHED_BASALT -> do
+    net.minecraft.world.item.Item SOUL_TORCH -> dp
+    net.minecraft.world.item.Item GLOWSTONE -> dq
+    net.minecraft.world.item.Item JACK_O_LANTERN -> dr
+    net.minecraft.world.item.Item OAK_TRAPDOOR -> ds
+    net.minecraft.world.item.Item SPRUCE_TRAPDOOR -> dt
+    net.minecraft.world.item.Item BIRCH_TRAPDOOR -> du
+    net.minecraft.world.item.Item JUNGLE_TRAPDOOR -> dv
+    net.minecraft.world.item.Item ACACIA_TRAPDOOR -> dw
+    net.minecraft.world.item.Item DARK_OAK_TRAPDOOR -> dx
+    net.minecraft.world.item.Item CRIMSON_TRAPDOOR -> dy
+    net.minecraft.world.item.Item WARPED_TRAPDOOR -> dz
+    net.minecraft.world.item.Item INFESTED_STONE -> dA
+    net.minecraft.world.item.Item INFESTED_COBBLESTONE -> dB
+    net.minecraft.world.item.Item INFESTED_STONE_BRICKS -> dC
+    net.minecraft.world.item.Item INFESTED_MOSSY_STONE_BRICKS -> dD
+    net.minecraft.world.item.Item INFESTED_CRACKED_STONE_BRICKS -> dE
+    net.minecraft.world.item.Item INFESTED_CHISELED_STONE_BRICKS -> dF
+    net.minecraft.world.item.Item STONE_BRICKS -> dG
+    net.minecraft.world.item.Item MOSSY_STONE_BRICKS -> dH
+    net.minecraft.world.item.Item CRACKED_STONE_BRICKS -> dI
+    net.minecraft.world.item.Item CHISELED_STONE_BRICKS -> dJ
+    net.minecraft.world.item.Item BROWN_MUSHROOM_BLOCK -> dK
+    net.minecraft.world.item.Item RED_MUSHROOM_BLOCK -> dL
+    net.minecraft.world.item.Item MUSHROOM_STEM -> dM
+    net.minecraft.world.item.Item IRON_BARS -> dN
+    net.minecraft.world.item.Item CHAIN -> dO
+    net.minecraft.world.item.Item GLASS_PANE -> dP
+    net.minecraft.world.item.Item MELON -> dQ
+    net.minecraft.world.item.Item VINE -> dR
+    net.minecraft.world.item.Item OAK_FENCE_GATE -> dS
+    net.minecraft.world.item.Item SPRUCE_FENCE_GATE -> dT
+    net.minecraft.world.item.Item BIRCH_FENCE_GATE -> dU
+    net.minecraft.world.item.Item JUNGLE_FENCE_GATE -> dV
+    net.minecraft.world.item.Item ACACIA_FENCE_GATE -> dW
+    net.minecraft.world.item.Item DARK_OAK_FENCE_GATE -> dX
+    net.minecraft.world.item.Item CRIMSON_FENCE_GATE -> dY
+    net.minecraft.world.item.Item WARPED_FENCE_GATE -> dZ
+    net.minecraft.world.item.Item BRICK_STAIRS -> ea
+    net.minecraft.world.item.Item STONE_BRICK_STAIRS -> eb
+    net.minecraft.world.item.Item MYCELIUM -> ec
+    net.minecraft.world.item.Item LILY_PAD -> ed
+    net.minecraft.world.item.Item NETHER_BRICKS -> ee
+    net.minecraft.world.item.Item CRACKED_NETHER_BRICKS -> ef
+    net.minecraft.world.item.Item CHISELED_NETHER_BRICKS -> eg
+    net.minecraft.world.item.Item NETHER_BRICK_FENCE -> eh
+    net.minecraft.world.item.Item NETHER_BRICK_STAIRS -> ei
+    net.minecraft.world.item.Item ENCHANTING_TABLE -> ej
+    net.minecraft.world.item.Item END_PORTAL_FRAME -> ek
+    net.minecraft.world.item.Item END_STONE -> el
+    net.minecraft.world.item.Item END_STONE_BRICKS -> em
+    net.minecraft.world.item.Item DRAGON_EGG -> en
+    net.minecraft.world.item.Item REDSTONE_LAMP -> eo
+    net.minecraft.world.item.Item SANDSTONE_STAIRS -> ep
+    net.minecraft.world.item.Item EMERALD_ORE -> eq
+    net.minecraft.world.item.Item ENDER_CHEST -> er
+    net.minecraft.world.item.Item TRIPWIRE_HOOK -> es
+    net.minecraft.world.item.Item EMERALD_BLOCK -> et
+    net.minecraft.world.item.Item SPRUCE_STAIRS -> eu
+    net.minecraft.world.item.Item BIRCH_STAIRS -> ev
+    net.minecraft.world.item.Item JUNGLE_STAIRS -> ew
+    net.minecraft.world.item.Item CRIMSON_STAIRS -> ex
+    net.minecraft.world.item.Item WARPED_STAIRS -> ey
+    net.minecraft.world.item.Item COMMAND_BLOCK -> ez
+    net.minecraft.world.item.Item BEACON -> eA
+    net.minecraft.world.item.Item COBBLESTONE_WALL -> eB
+    net.minecraft.world.item.Item MOSSY_COBBLESTONE_WALL -> eC
+    net.minecraft.world.item.Item BRICK_WALL -> eD
+    net.minecraft.world.item.Item PRISMARINE_WALL -> eE
+    net.minecraft.world.item.Item RED_SANDSTONE_WALL -> eF
+    net.minecraft.world.item.Item MOSSY_STONE_BRICK_WALL -> eG
+    net.minecraft.world.item.Item GRANITE_WALL -> eH
+    net.minecraft.world.item.Item STONE_BRICK_WALL -> eI
+    net.minecraft.world.item.Item NETHER_BRICK_WALL -> eJ
+    net.minecraft.world.item.Item ANDESITE_WALL -> eK
+    net.minecraft.world.item.Item RED_NETHER_BRICK_WALL -> eL
+    net.minecraft.world.item.Item SANDSTONE_WALL -> eM
+    net.minecraft.world.item.Item END_STONE_BRICK_WALL -> eN
+    net.minecraft.world.item.Item DIORITE_WALL -> eO
+    net.minecraft.world.item.Item BLACKSTONE_WALL -> eP
+    net.minecraft.world.item.Item POLISHED_BLACKSTONE_WALL -> eQ
+    net.minecraft.world.item.Item POLISHED_BLACKSTONE_BRICK_WALL -> eR
+    net.minecraft.world.item.Item STONE_BUTTON -> eS
+    net.minecraft.world.item.Item OAK_BUTTON -> eT
+    net.minecraft.world.item.Item SPRUCE_BUTTON -> eU
+    net.minecraft.world.item.Item BIRCH_BUTTON -> eV
+    net.minecraft.world.item.Item JUNGLE_BUTTON -> eW
+    net.minecraft.world.item.Item ACACIA_BUTTON -> eX
+    net.minecraft.world.item.Item DARK_OAK_BUTTON -> eY
+    net.minecraft.world.item.Item CRIMSON_BUTTON -> eZ
+    net.minecraft.world.item.Item WARPED_BUTTON -> fa
+    net.minecraft.world.item.Item POLISHED_BLACKSTONE_BUTTON -> fb
+    net.minecraft.world.item.Item ANVIL -> fc
+    net.minecraft.world.item.Item CHIPPED_ANVIL -> fd
+    net.minecraft.world.item.Item DAMAGED_ANVIL -> fe
+    net.minecraft.world.item.Item TRAPPED_CHEST -> ff
+    net.minecraft.world.item.Item LIGHT_WEIGHTED_PRESSURE_PLATE -> fg
+    net.minecraft.world.item.Item HEAVY_WEIGHTED_PRESSURE_PLATE -> fh
+    net.minecraft.world.item.Item DAYLIGHT_DETECTOR -> fi
+    net.minecraft.world.item.Item REDSTONE_BLOCK -> fj
+    net.minecraft.world.item.Item NETHER_QUARTZ_ORE -> fk
+    net.minecraft.world.item.Item HOPPER -> fl
+    net.minecraft.world.item.Item CHISELED_QUARTZ_BLOCK -> fm
+    net.minecraft.world.item.Item QUARTZ_BLOCK -> fn
+    net.minecraft.world.item.Item QUARTZ_BRICKS -> fo
+    net.minecraft.world.item.Item QUARTZ_PILLAR -> fp
+    net.minecraft.world.item.Item QUARTZ_STAIRS -> fq
+    net.minecraft.world.item.Item ACTIVATOR_RAIL -> fr
+    net.minecraft.world.item.Item DROPPER -> fs
+    net.minecraft.world.item.Item WHITE_TERRACOTTA -> ft
+    net.minecraft.world.item.Item ORANGE_TERRACOTTA -> fu
+    net.minecraft.world.item.Item MAGENTA_TERRACOTTA -> fv
+    net.minecraft.world.item.Item LIGHT_BLUE_TERRACOTTA -> fw
+    net.minecraft.world.item.Item YELLOW_TERRACOTTA -> fx
+    net.minecraft.world.item.Item LIME_TERRACOTTA -> fy
+    net.minecraft.world.item.Item PINK_TERRACOTTA -> fz
+    net.minecraft.world.item.Item GRAY_TERRACOTTA -> fA
+    net.minecraft.world.item.Item LIGHT_GRAY_TERRACOTTA -> fB
+    net.minecraft.world.item.Item CYAN_TERRACOTTA -> fC
+    net.minecraft.world.item.Item PURPLE_TERRACOTTA -> fD
+    net.minecraft.world.item.Item BLUE_TERRACOTTA -> fE
+    net.minecraft.world.item.Item BROWN_TERRACOTTA -> fF
+    net.minecraft.world.item.Item GREEN_TERRACOTTA -> fG
+    net.minecraft.world.item.Item RED_TERRACOTTA -> fH
+    net.minecraft.world.item.Item BLACK_TERRACOTTA -> fI
+    net.minecraft.world.item.Item BARRIER -> fJ
+    net.minecraft.world.item.Item IRON_TRAPDOOR -> fK
+    net.minecraft.world.item.Item HAY_BLOCK -> fL
+    net.minecraft.world.item.Item WHITE_CARPET -> fM
+    net.minecraft.world.item.Item ORANGE_CARPET -> fN
+    net.minecraft.world.item.Item MAGENTA_CARPET -> fO
+    net.minecraft.world.item.Item LIGHT_BLUE_CARPET -> fP
+    net.minecraft.world.item.Item YELLOW_CARPET -> fQ
+    net.minecraft.world.item.Item LIME_CARPET -> fR
+    net.minecraft.world.item.Item PINK_CARPET -> fS
+    net.minecraft.world.item.Item GRAY_CARPET -> fT
+    net.minecraft.world.item.Item LIGHT_GRAY_CARPET -> fU
+    net.minecraft.world.item.Item CYAN_CARPET -> fV
+    net.minecraft.world.item.Item PURPLE_CARPET -> fW
+    net.minecraft.world.item.Item BLUE_CARPET -> fX
+    net.minecraft.world.item.Item BROWN_CARPET -> fY
+    net.minecraft.world.item.Item GREEN_CARPET -> fZ
+    net.minecraft.world.item.Item RED_CARPET -> ga
+    net.minecraft.world.item.Item BLACK_CARPET -> gb
+    net.minecraft.world.item.Item TERRACOTTA -> gc
+    net.minecraft.world.item.Item COAL_BLOCK -> gd
+    net.minecraft.world.item.Item PACKED_ICE -> ge
+    net.minecraft.world.item.Item ACACIA_STAIRS -> gf
+    net.minecraft.world.item.Item DARK_OAK_STAIRS -> gg
+    net.minecraft.world.item.Item SLIME_BLOCK -> gh
+    net.minecraft.world.item.Item GRASS_PATH -> gi
+    net.minecraft.world.item.Item SUNFLOWER -> gj
+    net.minecraft.world.item.Item LILAC -> gk
+    net.minecraft.world.item.Item ROSE_BUSH -> gl
+    net.minecraft.world.item.Item PEONY -> gm
+    net.minecraft.world.item.Item TALL_GRASS -> gn
+    net.minecraft.world.item.Item LARGE_FERN -> go
+    net.minecraft.world.item.Item WHITE_STAINED_GLASS -> gp
+    net.minecraft.world.item.Item ORANGE_STAINED_GLASS -> gq
+    net.minecraft.world.item.Item MAGENTA_STAINED_GLASS -> gr
+    net.minecraft.world.item.Item LIGHT_BLUE_STAINED_GLASS -> gs
+    net.minecraft.world.item.Item YELLOW_STAINED_GLASS -> gt
+    net.minecraft.world.item.Item LIME_STAINED_GLASS -> gu
+    net.minecraft.world.item.Item PINK_STAINED_GLASS -> gv
+    net.minecraft.world.item.Item GRAY_STAINED_GLASS -> gw
+    net.minecraft.world.item.Item LIGHT_GRAY_STAINED_GLASS -> gx
+    net.minecraft.world.item.Item CYAN_STAINED_GLASS -> gy
+    net.minecraft.world.item.Item PURPLE_STAINED_GLASS -> gz
+    net.minecraft.world.item.Item BLUE_STAINED_GLASS -> gA
+    net.minecraft.world.item.Item BROWN_STAINED_GLASS -> gB
+    net.minecraft.world.item.Item GREEN_STAINED_GLASS -> gC
+    net.minecraft.world.item.Item RED_STAINED_GLASS -> gD
+    net.minecraft.world.item.Item BLACK_STAINED_GLASS -> gE
+    net.minecraft.world.item.Item WHITE_STAINED_GLASS_PANE -> gF
+    net.minecraft.world.item.Item ORANGE_STAINED_GLASS_PANE -> gG
+    net.minecraft.world.item.Item MAGENTA_STAINED_GLASS_PANE -> gH
+    net.minecraft.world.item.Item LIGHT_BLUE_STAINED_GLASS_PANE -> gI
+    net.minecraft.world.item.Item YELLOW_STAINED_GLASS_PANE -> gJ
+    net.minecraft.world.item.Item LIME_STAINED_GLASS_PANE -> gK
+    net.minecraft.world.item.Item PINK_STAINED_GLASS_PANE -> gL
+    net.minecraft.world.item.Item GRAY_STAINED_GLASS_PANE -> gM
+    net.minecraft.world.item.Item LIGHT_GRAY_STAINED_GLASS_PANE -> gN
+    net.minecraft.world.item.Item CYAN_STAINED_GLASS_PANE -> gO
+    net.minecraft.world.item.Item PURPLE_STAINED_GLASS_PANE -> gP
+    net.minecraft.world.item.Item BLUE_STAINED_GLASS_PANE -> gQ
+    net.minecraft.world.item.Item BROWN_STAINED_GLASS_PANE -> gR
+    net.minecraft.world.item.Item GREEN_STAINED_GLASS_PANE -> gS
+    net.minecraft.world.item.Item RED_STAINED_GLASS_PANE -> gT
+    net.minecraft.world.item.Item BLACK_STAINED_GLASS_PANE -> gU
+    net.minecraft.world.item.Item PRISMARINE -> gV
+    net.minecraft.world.item.Item PRISMARINE_BRICKS -> gW
+    net.minecraft.world.item.Item DARK_PRISMARINE -> gX
+    net.minecraft.world.item.Item PRISMARINE_STAIRS -> gY
+    net.minecraft.world.item.Item PRISMARINE_BRICK_STAIRS -> gZ
+    net.minecraft.world.item.Item DARK_PRISMARINE_STAIRS -> ha
+    net.minecraft.world.item.Item SEA_LANTERN -> hb
+    net.minecraft.world.item.Item RED_SANDSTONE -> hc
+    net.minecraft.world.item.Item CHISELED_RED_SANDSTONE -> hd
+    net.minecraft.world.item.Item CUT_RED_SANDSTONE -> he
+    net.minecraft.world.item.Item RED_SANDSTONE_STAIRS -> hf
+    net.minecraft.world.item.Item REPEATING_COMMAND_BLOCK -> hg
+    net.minecraft.world.item.Item CHAIN_COMMAND_BLOCK -> hh
+    net.minecraft.world.item.Item MAGMA_BLOCK -> hi
+    net.minecraft.world.item.Item NETHER_WART_BLOCK -> hj
+    net.minecraft.world.item.Item WARPED_WART_BLOCK -> hk
+    net.minecraft.world.item.Item RED_NETHER_BRICKS -> hl
+    net.minecraft.world.item.Item BONE_BLOCK -> hm
+    net.minecraft.world.item.Item STRUCTURE_VOID -> hn
+    net.minecraft.world.item.Item OBSERVER -> ho
+    net.minecraft.world.item.Item SHULKER_BOX -> hp
+    net.minecraft.world.item.Item WHITE_SHULKER_BOX -> hq
+    net.minecraft.world.item.Item ORANGE_SHULKER_BOX -> hr
+    net.minecraft.world.item.Item MAGENTA_SHULKER_BOX -> hs
+    net.minecraft.world.item.Item LIGHT_BLUE_SHULKER_BOX -> ht
+    net.minecraft.world.item.Item YELLOW_SHULKER_BOX -> hu
+    net.minecraft.world.item.Item LIME_SHULKER_BOX -> hv
+    net.minecraft.world.item.Item PINK_SHULKER_BOX -> hw
+    net.minecraft.world.item.Item GRAY_SHULKER_BOX -> hx
+    net.minecraft.world.item.Item LIGHT_GRAY_SHULKER_BOX -> hy
+    net.minecraft.world.item.Item CYAN_SHULKER_BOX -> hz
+    net.minecraft.world.item.Item PURPLE_SHULKER_BOX -> hA
+    net.minecraft.world.item.Item BLUE_SHULKER_BOX -> hB
+    net.minecraft.world.item.Item BROWN_SHULKER_BOX -> hC
+    net.minecraft.world.item.Item GREEN_SHULKER_BOX -> hD
+    net.minecraft.world.item.Item RED_SHULKER_BOX -> hE
+    net.minecraft.world.item.Item BLACK_SHULKER_BOX -> hF
+    net.minecraft.world.item.Item WHITE_GLAZED_TERRACOTTA -> hG
+    net.minecraft.world.item.Item ORANGE_GLAZED_TERRACOTTA -> hH
+    net.minecraft.world.item.Item MAGENTA_GLAZED_TERRACOTTA -> hI
+    net.minecraft.world.item.Item LIGHT_BLUE_GLAZED_TERRACOTTA -> hJ
+    net.minecraft.world.item.Item YELLOW_GLAZED_TERRACOTTA -> hK
+    net.minecraft.world.item.Item LIME_GLAZED_TERRACOTTA -> hL
+    net.minecraft.world.item.Item PINK_GLAZED_TERRACOTTA -> hM
+    net.minecraft.world.item.Item GRAY_GLAZED_TERRACOTTA -> hN
+    net.minecraft.world.item.Item LIGHT_GRAY_GLAZED_TERRACOTTA -> hO
+    net.minecraft.world.item.Item CYAN_GLAZED_TERRACOTTA -> hP
+    net.minecraft.world.item.Item PURPLE_GLAZED_TERRACOTTA -> hQ
+    net.minecraft.world.item.Item BLUE_GLAZED_TERRACOTTA -> hR
+    net.minecraft.world.item.Item BROWN_GLAZED_TERRACOTTA -> hS
+    net.minecraft.world.item.Item GREEN_GLAZED_TERRACOTTA -> hT
+    net.minecraft.world.item.Item RED_GLAZED_TERRACOTTA -> hU
+    net.minecraft.world.item.Item BLACK_GLAZED_TERRACOTTA -> hV
+    net.minecraft.world.item.Item WHITE_CONCRETE -> hW
+    net.minecraft.world.item.Item ORANGE_CONCRETE -> hX
+    net.minecraft.world.item.Item MAGENTA_CONCRETE -> hY
+    net.minecraft.world.item.Item LIGHT_BLUE_CONCRETE -> hZ
+    net.minecraft.world.item.Item YELLOW_CONCRETE -> ia
+    net.minecraft.world.item.Item LIME_CONCRETE -> ib
+    net.minecraft.world.item.Item PINK_CONCRETE -> ic
+    net.minecraft.world.item.Item GRAY_CONCRETE -> id
+    net.minecraft.world.item.Item LIGHT_GRAY_CONCRETE -> ie
+    net.minecraft.world.item.Item CYAN_CONCRETE -> if
+    net.minecraft.world.item.Item PURPLE_CONCRETE -> ig
+    net.minecraft.world.item.Item BLUE_CONCRETE -> ih
+    net.minecraft.world.item.Item BROWN_CONCRETE -> ii
+    net.minecraft.world.item.Item GREEN_CONCRETE -> ij
+    net.minecraft.world.item.Item RED_CONCRETE -> ik
+    net.minecraft.world.item.Item BLACK_CONCRETE -> il
+    net.minecraft.world.item.Item WHITE_CONCRETE_POWDER -> im
+    net.minecraft.world.item.Item ORANGE_CONCRETE_POWDER -> in
+    net.minecraft.world.item.Item MAGENTA_CONCRETE_POWDER -> io
+    net.minecraft.world.item.Item LIGHT_BLUE_CONCRETE_POWDER -> ip
+    net.minecraft.world.item.Item YELLOW_CONCRETE_POWDER -> iq
+    net.minecraft.world.item.Item LIME_CONCRETE_POWDER -> ir
+    net.minecraft.world.item.Item PINK_CONCRETE_POWDER -> is
+    net.minecraft.world.item.Item GRAY_CONCRETE_POWDER -> it
+    net.minecraft.world.item.Item LIGHT_GRAY_CONCRETE_POWDER -> iu
+    net.minecraft.world.item.Item CYAN_CONCRETE_POWDER -> iv
+    net.minecraft.world.item.Item PURPLE_CONCRETE_POWDER -> iw
+    net.minecraft.world.item.Item BLUE_CONCRETE_POWDER -> ix
+    net.minecraft.world.item.Item BROWN_CONCRETE_POWDER -> iy
+    net.minecraft.world.item.Item GREEN_CONCRETE_POWDER -> iz
+    net.minecraft.world.item.Item RED_CONCRETE_POWDER -> iA
+    net.minecraft.world.item.Item BLACK_CONCRETE_POWDER -> iB
+    net.minecraft.world.item.Item TURTLE_EGG -> iC
+    net.minecraft.world.item.Item DEAD_TUBE_CORAL_BLOCK -> iD
+    net.minecraft.world.item.Item DEAD_BRAIN_CORAL_BLOCK -> iE
+    net.minecraft.world.item.Item DEAD_BUBBLE_CORAL_BLOCK -> iF
+    net.minecraft.world.item.Item DEAD_FIRE_CORAL_BLOCK -> iG
+    net.minecraft.world.item.Item DEAD_HORN_CORAL_BLOCK -> iH
+    net.minecraft.world.item.Item TUBE_CORAL_BLOCK -> iI
+    net.minecraft.world.item.Item BRAIN_CORAL_BLOCK -> iJ
+    net.minecraft.world.item.Item BUBBLE_CORAL_BLOCK -> iK
+    net.minecraft.world.item.Item FIRE_CORAL_BLOCK -> iL
+    net.minecraft.world.item.Item HORN_CORAL_BLOCK -> iM
+    net.minecraft.world.item.Item TUBE_CORAL -> iN
+    net.minecraft.world.item.Item BRAIN_CORAL -> iO
+    net.minecraft.world.item.Item BUBBLE_CORAL -> iP
+    net.minecraft.world.item.Item FIRE_CORAL -> iQ
+    net.minecraft.world.item.Item HORN_CORAL -> iR
+    net.minecraft.world.item.Item DEAD_BRAIN_CORAL -> iS
+    net.minecraft.world.item.Item DEAD_BUBBLE_CORAL -> iT
+    net.minecraft.world.item.Item DEAD_FIRE_CORAL -> iU
+    net.minecraft.world.item.Item DEAD_HORN_CORAL -> iV
+    net.minecraft.world.item.Item DEAD_TUBE_CORAL -> iW
+    net.minecraft.world.item.Item TUBE_CORAL_FAN -> iX
+    net.minecraft.world.item.Item BRAIN_CORAL_FAN -> iY
+    net.minecraft.world.item.Item BUBBLE_CORAL_FAN -> iZ
+    net.minecraft.world.item.Item FIRE_CORAL_FAN -> ja
+    net.minecraft.world.item.Item HORN_CORAL_FAN -> jb
+    net.minecraft.world.item.Item DEAD_TUBE_CORAL_FAN -> jc
+    net.minecraft.world.item.Item DEAD_BRAIN_CORAL_FAN -> jd
+    net.minecraft.world.item.Item DEAD_BUBBLE_CORAL_FAN -> je
+    net.minecraft.world.item.Item DEAD_FIRE_CORAL_FAN -> jf
+    net.minecraft.world.item.Item DEAD_HORN_CORAL_FAN -> jg
+    net.minecraft.world.item.Item BLUE_ICE -> jh
+    net.minecraft.world.item.Item CONDUIT -> ji
+    net.minecraft.world.item.Item POLISHED_GRANITE_STAIRS -> jj
+    net.minecraft.world.item.Item SMOOTH_RED_SANDSTONE_STAIRS -> jk
+    net.minecraft.world.item.Item MOSSY_STONE_BRICK_STAIRS -> jl
+    net.minecraft.world.item.Item POLISHED_DIORITE_STAIRS -> jm
+    net.minecraft.world.item.Item MOSSY_COBBLESTONE_STAIRS -> jn
+    net.minecraft.world.item.Item END_STONE_BRICK_STAIRS -> jo
+    net.minecraft.world.item.Item STONE_STAIRS -> jp
+    net.minecraft.world.item.Item SMOOTH_SANDSTONE_STAIRS -> jq
+    net.minecraft.world.item.Item SMOOTH_QUARTZ_STAIRS -> jr
+    net.minecraft.world.item.Item GRANITE_STAIRS -> js
+    net.minecraft.world.item.Item ANDESITE_STAIRS -> jt
+    net.minecraft.world.item.Item RED_NETHER_BRICK_STAIRS -> ju
+    net.minecraft.world.item.Item POLISHED_ANDESITE_STAIRS -> jv
+    net.minecraft.world.item.Item DIORITE_STAIRS -> jw
+    net.minecraft.world.item.Item POLISHED_GRANITE_SLAB -> jx
+    net.minecraft.world.item.Item SMOOTH_RED_SANDSTONE_SLAB -> jy
+    net.minecraft.world.item.Item MOSSY_STONE_BRICK_SLAB -> jz
+    net.minecraft.world.item.Item POLISHED_DIORITE_SLAB -> jA
+    net.minecraft.world.item.Item MOSSY_COBBLESTONE_SLAB -> jB
+    net.minecraft.world.item.Item END_STONE_BRICK_SLAB -> jC
+    net.minecraft.world.item.Item SMOOTH_SANDSTONE_SLAB -> jD
+    net.minecraft.world.item.Item SMOOTH_QUARTZ_SLAB -> jE
+    net.minecraft.world.item.Item GRANITE_SLAB -> jF
+    net.minecraft.world.item.Item ANDESITE_SLAB -> jG
+    net.minecraft.world.item.Item RED_NETHER_BRICK_SLAB -> jH
+    net.minecraft.world.item.Item POLISHED_ANDESITE_SLAB -> jI
+    net.minecraft.world.item.Item DIORITE_SLAB -> jJ
+    net.minecraft.world.item.Item SCAFFOLDING -> jK
+    net.minecraft.world.item.Item IRON_DOOR -> jL
+    net.minecraft.world.item.Item OAK_DOOR -> jM
+    net.minecraft.world.item.Item SPRUCE_DOOR -> jN
+    net.minecraft.world.item.Item BIRCH_DOOR -> jO
+    net.minecraft.world.item.Item JUNGLE_DOOR -> jP
+    net.minecraft.world.item.Item ACACIA_DOOR -> jQ
+    net.minecraft.world.item.Item DARK_OAK_DOOR -> jR
+    net.minecraft.world.item.Item CRIMSON_DOOR -> jS
+    net.minecraft.world.item.Item WARPED_DOOR -> jT
+    net.minecraft.world.item.Item REPEATER -> jU
+    net.minecraft.world.item.Item COMPARATOR -> jV
+    net.minecraft.world.item.Item STRUCTURE_BLOCK -> jW
+    net.minecraft.world.item.Item JIGSAW -> jX
+    net.minecraft.world.item.Item TURTLE_HELMET -> jY
+    net.minecraft.world.item.Item SCUTE -> jZ
+    net.minecraft.world.item.Item IRON_SHOVEL -> ka
+    net.minecraft.world.item.Item IRON_PICKAXE -> kb
+    net.minecraft.world.item.Item IRON_AXE -> kc
+    net.minecraft.world.item.Item FLINT_AND_STEEL -> kd
+    net.minecraft.world.item.Item APPLE -> ke
+    net.minecraft.world.item.Item BOW -> kf
+    net.minecraft.world.item.Item ARROW -> kg
+    net.minecraft.world.item.Item COAL -> kh
+    net.minecraft.world.item.Item CHARCOAL -> ki
+    net.minecraft.world.item.Item DIAMOND -> kj
+    net.minecraft.world.item.Item IRON_INGOT -> kk
+    net.minecraft.world.item.Item GOLD_INGOT -> kl
+    net.minecraft.world.item.Item NETHERITE_INGOT -> km
+    net.minecraft.world.item.Item NETHERITE_SCRAP -> kn
+    net.minecraft.world.item.Item IRON_SWORD -> ko
+    net.minecraft.world.item.Item WOODEN_SWORD -> kp
+    net.minecraft.world.item.Item WOODEN_SHOVEL -> kq
+    net.minecraft.world.item.Item WOODEN_PICKAXE -> kr
+    net.minecraft.world.item.Item WOODEN_AXE -> ks
+    net.minecraft.world.item.Item STONE_SWORD -> kt
+    net.minecraft.world.item.Item STONE_SHOVEL -> ku
+    net.minecraft.world.item.Item STONE_PICKAXE -> kv
+    net.minecraft.world.item.Item STONE_AXE -> kw
+    net.minecraft.world.item.Item DIAMOND_SWORD -> kx
+    net.minecraft.world.item.Item DIAMOND_SHOVEL -> ky
+    net.minecraft.world.item.Item DIAMOND_PICKAXE -> kz
+    net.minecraft.world.item.Item DIAMOND_AXE -> kA
+    net.minecraft.world.item.Item STICK -> kB
+    net.minecraft.world.item.Item BOWL -> kC
+    net.minecraft.world.item.Item MUSHROOM_STEW -> kD
+    net.minecraft.world.item.Item GOLDEN_SWORD -> kE
+    net.minecraft.world.item.Item GOLDEN_SHOVEL -> kF
+    net.minecraft.world.item.Item GOLDEN_PICKAXE -> kG
+    net.minecraft.world.item.Item GOLDEN_AXE -> kH
+    net.minecraft.world.item.Item NETHERITE_SWORD -> kI
+    net.minecraft.world.item.Item NETHERITE_SHOVEL -> kJ
+    net.minecraft.world.item.Item NETHERITE_PICKAXE -> kK
+    net.minecraft.world.item.Item NETHERITE_AXE -> kL
+    net.minecraft.world.item.Item STRING -> kM
+    net.minecraft.world.item.Item FEATHER -> kN
+    net.minecraft.world.item.Item GUNPOWDER -> kO
+    net.minecraft.world.item.Item WOODEN_HOE -> kP
+    net.minecraft.world.item.Item STONE_HOE -> kQ
+    net.minecraft.world.item.Item IRON_HOE -> kR
+    net.minecraft.world.item.Item DIAMOND_HOE -> kS
+    net.minecraft.world.item.Item GOLDEN_HOE -> kT
+    net.minecraft.world.item.Item NETHERITE_HOE -> kU
+    net.minecraft.world.item.Item WHEAT_SEEDS -> kV
+    net.minecraft.world.item.Item WHEAT -> kW
+    net.minecraft.world.item.Item BREAD -> kX
+    net.minecraft.world.item.Item LEATHER_HELMET -> kY
+    net.minecraft.world.item.Item LEATHER_CHESTPLATE -> kZ
+    net.minecraft.world.item.Item LEATHER_LEGGINGS -> la
+    net.minecraft.world.item.Item LEATHER_BOOTS -> lb
+    net.minecraft.world.item.Item CHAINMAIL_HELMET -> lc
+    net.minecraft.world.item.Item CHAINMAIL_CHESTPLATE -> ld
+    net.minecraft.world.item.Item CHAINMAIL_LEGGINGS -> le
+    net.minecraft.world.item.Item CHAINMAIL_BOOTS -> lf
+    net.minecraft.world.item.Item IRON_HELMET -> lg
+    net.minecraft.world.item.Item IRON_CHESTPLATE -> lh
+    net.minecraft.world.item.Item IRON_LEGGINGS -> li
+    net.minecraft.world.item.Item IRON_BOOTS -> lj
+    net.minecraft.world.item.Item DIAMOND_HELMET -> lk
+    net.minecraft.world.item.Item DIAMOND_CHESTPLATE -> ll
+    net.minecraft.world.item.Item DIAMOND_LEGGINGS -> lm
+    net.minecraft.world.item.Item DIAMOND_BOOTS -> ln
+    net.minecraft.world.item.Item GOLDEN_HELMET -> lo
+    net.minecraft.world.item.Item GOLDEN_CHESTPLATE -> lp
+    net.minecraft.world.item.Item GOLDEN_LEGGINGS -> lq
+    net.minecraft.world.item.Item GOLDEN_BOOTS -> lr
+    net.minecraft.world.item.Item NETHERITE_HELMET -> ls
+    net.minecraft.world.item.Item NETHERITE_CHESTPLATE -> lt
+    net.minecraft.world.item.Item NETHERITE_LEGGINGS -> lu
+    net.minecraft.world.item.Item NETHERITE_BOOTS -> lv
+    net.minecraft.world.item.Item FLINT -> lw
+    net.minecraft.world.item.Item PORKCHOP -> lx
+    net.minecraft.world.item.Item COOKED_PORKCHOP -> ly
+    net.minecraft.world.item.Item PAINTING -> lz
+    net.minecraft.world.item.Item GOLDEN_APPLE -> lA
+    net.minecraft.world.item.Item ENCHANTED_GOLDEN_APPLE -> lB
+    net.minecraft.world.item.Item OAK_SIGN -> lC
+    net.minecraft.world.item.Item SPRUCE_SIGN -> lD
+    net.minecraft.world.item.Item BIRCH_SIGN -> lE
+    net.minecraft.world.item.Item JUNGLE_SIGN -> lF
+    net.minecraft.world.item.Item ACACIA_SIGN -> lG
+    net.minecraft.world.item.Item DARK_OAK_SIGN -> lH
+    net.minecraft.world.item.Item CRIMSON_SIGN -> lI
+    net.minecraft.world.item.Item WARPED_SIGN -> lJ
+    net.minecraft.world.item.Item BUCKET -> lK
+    net.minecraft.world.item.Item WATER_BUCKET -> lL
+    net.minecraft.world.item.Item LAVA_BUCKET -> lM
+    net.minecraft.world.item.Item MINECART -> lN
+    net.minecraft.world.item.Item SADDLE -> lO
+    net.minecraft.world.item.Item REDSTONE -> lP
+    net.minecraft.world.item.Item SNOWBALL -> lQ
+    net.minecraft.world.item.Item OAK_BOAT -> lR
+    net.minecraft.world.item.Item LEATHER -> lS
+    net.minecraft.world.item.Item MILK_BUCKET -> lT
+    net.minecraft.world.item.Item PUFFERFISH_BUCKET -> lU
+    net.minecraft.world.item.Item SALMON_BUCKET -> lV
+    net.minecraft.world.item.Item COD_BUCKET -> lW
+    net.minecraft.world.item.Item TROPICAL_FISH_BUCKET -> lX
+    net.minecraft.world.item.Item BRICK -> lY
+    net.minecraft.world.item.Item CLAY_BALL -> lZ
+    net.minecraft.world.item.Item DRIED_KELP_BLOCK -> ma
+    net.minecraft.world.item.Item PAPER -> mb
+    net.minecraft.world.item.Item BOOK -> mc
+    net.minecraft.world.item.Item SLIME_BALL -> md
+    net.minecraft.world.item.Item CHEST_MINECART -> me
+    net.minecraft.world.item.Item FURNACE_MINECART -> mf
+    net.minecraft.world.item.Item EGG -> mg
+    net.minecraft.world.item.Item COMPASS -> mh
+    net.minecraft.world.item.Item FISHING_ROD -> mi
+    net.minecraft.world.item.Item CLOCK -> mj
+    net.minecraft.world.item.Item GLOWSTONE_DUST -> mk
+    net.minecraft.world.item.Item COD -> ml
+    net.minecraft.world.item.Item SALMON -> mm
+    net.minecraft.world.item.Item TROPICAL_FISH -> mn
+    net.minecraft.world.item.Item PUFFERFISH -> mo
+    net.minecraft.world.item.Item COOKED_COD -> mp
+    net.minecraft.world.item.Item COOKED_SALMON -> mq
+    net.minecraft.world.item.Item INK_SAC -> mr
+    net.minecraft.world.item.Item RED_DYE -> ms
+    net.minecraft.world.item.Item GREEN_DYE -> mt
+    net.minecraft.world.item.Item COCOA_BEANS -> mu
+    net.minecraft.world.item.Item LAPIS_LAZULI -> mv
+    net.minecraft.world.item.Item PURPLE_DYE -> mw
+    net.minecraft.world.item.Item CYAN_DYE -> mx
+    net.minecraft.world.item.Item LIGHT_GRAY_DYE -> my
+    net.minecraft.world.item.Item GRAY_DYE -> mz
+    net.minecraft.world.item.Item PINK_DYE -> mA
+    net.minecraft.world.item.Item LIME_DYE -> mB
+    net.minecraft.world.item.Item YELLOW_DYE -> mC
+    net.minecraft.world.item.Item LIGHT_BLUE_DYE -> mD
+    net.minecraft.world.item.Item MAGENTA_DYE -> mE
+    net.minecraft.world.item.Item ORANGE_DYE -> mF
+    net.minecraft.world.item.Item BONE_MEAL -> mG
+    net.minecraft.world.item.Item BLUE_DYE -> mH
+    net.minecraft.world.item.Item BROWN_DYE -> mI
+    net.minecraft.world.item.Item BLACK_DYE -> mJ
+    net.minecraft.world.item.Item WHITE_DYE -> mK
+    net.minecraft.world.item.Item BONE -> mL
+    net.minecraft.world.item.Item SUGAR -> mM
+    net.minecraft.world.item.Item CAKE -> mN
+    net.minecraft.world.item.Item WHITE_BED -> mO
+    net.minecraft.world.item.Item ORANGE_BED -> mP
+    net.minecraft.world.item.Item MAGENTA_BED -> mQ
+    net.minecraft.world.item.Item LIGHT_BLUE_BED -> mR
+    net.minecraft.world.item.Item YELLOW_BED -> mS
+    net.minecraft.world.item.Item LIME_BED -> mT
+    net.minecraft.world.item.Item PINK_BED -> mU
+    net.minecraft.world.item.Item GRAY_BED -> mV
+    net.minecraft.world.item.Item LIGHT_GRAY_BED -> mW
+    net.minecraft.world.item.Item CYAN_BED -> mX
+    net.minecraft.world.item.Item PURPLE_BED -> mY
+    net.minecraft.world.item.Item BLUE_BED -> mZ
+    net.minecraft.world.item.Item BROWN_BED -> na
+    net.minecraft.world.item.Item GREEN_BED -> nb
+    net.minecraft.world.item.Item RED_BED -> nc
+    net.minecraft.world.item.Item BLACK_BED -> nd
+    net.minecraft.world.item.Item COOKIE -> ne
+    net.minecraft.world.item.Item FILLED_MAP -> nf
+    net.minecraft.world.item.Item SHEARS -> ng
+    net.minecraft.world.item.Item MELON_SLICE -> nh
+    net.minecraft.world.item.Item DRIED_KELP -> ni
+    net.minecraft.world.item.Item PUMPKIN_SEEDS -> nj
+    net.minecraft.world.item.Item MELON_SEEDS -> nk
+    net.minecraft.world.item.Item BEEF -> nl
+    net.minecraft.world.item.Item COOKED_BEEF -> nm
+    net.minecraft.world.item.Item CHICKEN -> nn
+    net.minecraft.world.item.Item COOKED_CHICKEN -> no
+    net.minecraft.world.item.Item ROTTEN_FLESH -> np
+    net.minecraft.world.item.Item ENDER_PEARL -> nq
+    net.minecraft.world.item.Item BLAZE_ROD -> nr
+    net.minecraft.world.item.Item GHAST_TEAR -> ns
+    net.minecraft.world.item.Item GOLD_NUGGET -> nt
+    net.minecraft.world.item.Item NETHER_WART -> nu
+    net.minecraft.world.item.Item POTION -> nv
+    net.minecraft.world.item.Item GLASS_BOTTLE -> nw
+    net.minecraft.world.item.Item SPIDER_EYE -> nx
+    net.minecraft.world.item.Item FERMENTED_SPIDER_EYE -> ny
+    net.minecraft.world.item.Item BLAZE_POWDER -> nz
+    net.minecraft.world.item.Item MAGMA_CREAM -> nA
+    net.minecraft.world.item.Item BREWING_STAND -> nB
+    net.minecraft.world.item.Item CAULDRON -> nC
+    net.minecraft.world.item.Item ENDER_EYE -> nD
+    net.minecraft.world.item.Item GLISTERING_MELON_SLICE -> nE
+    net.minecraft.world.item.Item BAT_SPAWN_EGG -> nF
+    net.minecraft.world.item.Item BEE_SPAWN_EGG -> nG
+    net.minecraft.world.item.Item BLAZE_SPAWN_EGG -> nH
+    net.minecraft.world.item.Item CAT_SPAWN_EGG -> nI
+    net.minecraft.world.item.Item CAVE_SPIDER_SPAWN_EGG -> nJ
+    net.minecraft.world.item.Item CHICKEN_SPAWN_EGG -> nK
+    net.minecraft.world.item.Item COD_SPAWN_EGG -> nL
+    net.minecraft.world.item.Item COW_SPAWN_EGG -> nM
+    net.minecraft.world.item.Item CREEPER_SPAWN_EGG -> nN
+    net.minecraft.world.item.Item DOLPHIN_SPAWN_EGG -> nO
+    net.minecraft.world.item.Item DONKEY_SPAWN_EGG -> nP
+    net.minecraft.world.item.Item DROWNED_SPAWN_EGG -> nQ
+    net.minecraft.world.item.Item ELDER_GUARDIAN_SPAWN_EGG -> nR
+    net.minecraft.world.item.Item ENDERMAN_SPAWN_EGG -> nS
+    net.minecraft.world.item.Item ENDERMITE_SPAWN_EGG -> nT
+    net.minecraft.world.item.Item EVOKER_SPAWN_EGG -> nU
+    net.minecraft.world.item.Item FOX_SPAWN_EGG -> nV
+    net.minecraft.world.item.Item GHAST_SPAWN_EGG -> nW
+    net.minecraft.world.item.Item GUARDIAN_SPAWN_EGG -> nX
+    net.minecraft.world.item.Item HOGLIN_SPAWN_EGG -> nY
+    net.minecraft.world.item.Item HORSE_SPAWN_EGG -> nZ
+    net.minecraft.world.item.Item HUSK_SPAWN_EGG -> oa
+    net.minecraft.world.item.Item LLAMA_SPAWN_EGG -> ob
+    net.minecraft.world.item.Item MAGMA_CUBE_SPAWN_EGG -> oc
+    net.minecraft.world.item.Item MOOSHROOM_SPAWN_EGG -> od
+    net.minecraft.world.item.Item MULE_SPAWN_EGG -> oe
+    net.minecraft.world.item.Item OCELOT_SPAWN_EGG -> of
+    net.minecraft.world.item.Item PANDA_SPAWN_EGG -> og
+    net.minecraft.world.item.Item PARROT_SPAWN_EGG -> oh
+    net.minecraft.world.item.Item PHANTOM_SPAWN_EGG -> oi
+    net.minecraft.world.item.Item PIG_SPAWN_EGG -> oj
+    net.minecraft.world.item.Item PIGLIN_SPAWN_EGG -> ok
+    net.minecraft.world.item.Item PILLAGER_SPAWN_EGG -> ol
+    net.minecraft.world.item.Item POLAR_BEAR_SPAWN_EGG -> om
+    net.minecraft.world.item.Item PUFFERFISH_SPAWN_EGG -> on
+    net.minecraft.world.item.Item RABBIT_SPAWN_EGG -> oo
+    net.minecraft.world.item.Item RAVAGER_SPAWN_EGG -> op
+    net.minecraft.world.item.Item SALMON_SPAWN_EGG -> oq
+    net.minecraft.world.item.Item SHEEP_SPAWN_EGG -> or
+    net.minecraft.world.item.Item SHULKER_SPAWN_EGG -> os
+    net.minecraft.world.item.Item SILVERFISH_SPAWN_EGG -> ot
+    net.minecraft.world.item.Item SKELETON_SPAWN_EGG -> ou
+    net.minecraft.world.item.Item SKELETON_HORSE_SPAWN_EGG -> ov
+    net.minecraft.world.item.Item SLIME_SPAWN_EGG -> ow
+    net.minecraft.world.item.Item SPIDER_SPAWN_EGG -> ox
+    net.minecraft.world.item.Item SQUID_SPAWN_EGG -> oy
+    net.minecraft.world.item.Item STRAY_SPAWN_EGG -> oz
+    net.minecraft.world.item.Item STRIDER_SPAWN_EGG -> oA
+    net.minecraft.world.item.Item TRADER_LLAMA_SPAWN_EGG -> oB
+    net.minecraft.world.item.Item TROPICAL_FISH_SPAWN_EGG -> oC
+    net.minecraft.world.item.Item TURTLE_SPAWN_EGG -> oD
+    net.minecraft.world.item.Item VEX_SPAWN_EGG -> oE
+    net.minecraft.world.item.Item VILLAGER_SPAWN_EGG -> oF
+    net.minecraft.world.item.Item VINDICATOR_SPAWN_EGG -> oG
+    net.minecraft.world.item.Item WANDERING_TRADER_SPAWN_EGG -> oH
+    net.minecraft.world.item.Item WITCH_SPAWN_EGG -> oI
+    net.minecraft.world.item.Item WITHER_SKELETON_SPAWN_EGG -> oJ
+    net.minecraft.world.item.Item WOLF_SPAWN_EGG -> oK
+    net.minecraft.world.item.Item ZOGLIN_SPAWN_EGG -> oL
+    net.minecraft.world.item.Item ZOMBIE_SPAWN_EGG -> oM
+    net.minecraft.world.item.Item ZOMBIE_HORSE_SPAWN_EGG -> oN
+    net.minecraft.world.item.Item ZOMBIE_VILLAGER_SPAWN_EGG -> oO
+    net.minecraft.world.item.Item ZOMBIFIED_PIGLIN_SPAWN_EGG -> oP
+    net.minecraft.world.item.Item EXPERIENCE_BOTTLE -> oQ
+    net.minecraft.world.item.Item FIRE_CHARGE -> oR
+    net.minecraft.world.item.Item WRITABLE_BOOK -> oS
+    net.minecraft.world.item.Item WRITTEN_BOOK -> oT
+    net.minecraft.world.item.Item EMERALD -> oU
+    net.minecraft.world.item.Item ITEM_FRAME -> oV
+    net.minecraft.world.item.Item FLOWER_POT -> oW
+    net.minecraft.world.item.Item CARROT -> oX
+    net.minecraft.world.item.Item POTATO -> oY
+    net.minecraft.world.item.Item BAKED_POTATO -> oZ
+    net.minecraft.world.item.Item POISONOUS_POTATO -> pa
+    net.minecraft.world.item.Item MAP -> pb
+    net.minecraft.world.item.Item GOLDEN_CARROT -> pc
+    net.minecraft.world.item.Item SKELETON_SKULL -> pd
+    net.minecraft.world.item.Item WITHER_SKELETON_SKULL -> pe
+    net.minecraft.world.item.Item PLAYER_HEAD -> pf
+    net.minecraft.world.item.Item ZOMBIE_HEAD -> pg
+    net.minecraft.world.item.Item CREEPER_HEAD -> ph
+    net.minecraft.world.item.Item DRAGON_HEAD -> pi
+    net.minecraft.world.item.Item CARROT_ON_A_STICK -> pj
+    net.minecraft.world.item.Item WARPED_FUNGUS_ON_A_STICK -> pk
+    net.minecraft.world.item.Item NETHER_STAR -> pl
+    net.minecraft.world.item.Item PUMPKIN_PIE -> pm
+    net.minecraft.world.item.Item FIREWORK_ROCKET -> pn
+    net.minecraft.world.item.Item FIREWORK_STAR -> po
+    net.minecraft.world.item.Item ENCHANTED_BOOK -> pp
+    net.minecraft.world.item.Item NETHER_BRICK -> pq
+    net.minecraft.world.item.Item QUARTZ -> pr
+    net.minecraft.world.item.Item TNT_MINECART -> ps
+    net.minecraft.world.item.Item HOPPER_MINECART -> pt
+    net.minecraft.world.item.Item PRISMARINE_SHARD -> pu
+    net.minecraft.world.item.Item PRISMARINE_CRYSTALS -> pv
+    net.minecraft.world.item.Item RABBIT -> pw
+    net.minecraft.world.item.Item COOKED_RABBIT -> px
+    net.minecraft.world.item.Item RABBIT_STEW -> py
+    net.minecraft.world.item.Item RABBIT_FOOT -> pz
+    net.minecraft.world.item.Item RABBIT_HIDE -> pA
+    net.minecraft.world.item.Item ARMOR_STAND -> pB
+    net.minecraft.world.item.Item IRON_HORSE_ARMOR -> pC
+    net.minecraft.world.item.Item GOLDEN_HORSE_ARMOR -> pD
+    net.minecraft.world.item.Item DIAMOND_HORSE_ARMOR -> pE
+    net.minecraft.world.item.Item LEATHER_HORSE_ARMOR -> pF
+    net.minecraft.world.item.Item LEAD -> pG
+    net.minecraft.world.item.Item NAME_TAG -> pH
+    net.minecraft.world.item.Item COMMAND_BLOCK_MINECART -> pI
+    net.minecraft.world.item.Item MUTTON -> pJ
+    net.minecraft.world.item.Item COOKED_MUTTON -> pK
+    net.minecraft.world.item.Item WHITE_BANNER -> pL
+    net.minecraft.world.item.Item ORANGE_BANNER -> pM
+    net.minecraft.world.item.Item MAGENTA_BANNER -> pN
+    net.minecraft.world.item.Item LIGHT_BLUE_BANNER -> pO
+    net.minecraft.world.item.Item YELLOW_BANNER -> pP
+    net.minecraft.world.item.Item LIME_BANNER -> pQ
+    net.minecraft.world.item.Item PINK_BANNER -> pR
+    net.minecraft.world.item.Item GRAY_BANNER -> pS
+    net.minecraft.world.item.Item LIGHT_GRAY_BANNER -> pT
+    net.minecraft.world.item.Item CYAN_BANNER -> pU
+    net.minecraft.world.item.Item PURPLE_BANNER -> pV
+    net.minecraft.world.item.Item BLUE_BANNER -> pW
+    net.minecraft.world.item.Item BROWN_BANNER -> pX
+    net.minecraft.world.item.Item GREEN_BANNER -> pY
+    net.minecraft.world.item.Item RED_BANNER -> pZ
+    net.minecraft.world.item.Item BLACK_BANNER -> qa
+    net.minecraft.world.item.Item END_CRYSTAL -> qb
+    net.minecraft.world.item.Item CHORUS_FRUIT -> qc
+    net.minecraft.world.item.Item POPPED_CHORUS_FRUIT -> qd
+    net.minecraft.world.item.Item BEETROOT -> qe
+    net.minecraft.world.item.Item BEETROOT_SEEDS -> qf
+    net.minecraft.world.item.Item BEETROOT_SOUP -> qg
+    net.minecraft.world.item.Item DRAGON_BREATH -> qh
+    net.minecraft.world.item.Item SPLASH_POTION -> qi
+    net.minecraft.world.item.Item SPECTRAL_ARROW -> qj
+    net.minecraft.world.item.Item TIPPED_ARROW -> qk
+    net.minecraft.world.item.Item LINGERING_POTION -> ql
+    net.minecraft.world.item.Item SHIELD -> qm
+    net.minecraft.world.item.Item ELYTRA -> qn
+    net.minecraft.world.item.Item SPRUCE_BOAT -> qo
+    net.minecraft.world.item.Item BIRCH_BOAT -> qp
+    net.minecraft.world.item.Item JUNGLE_BOAT -> qq
+    net.minecraft.world.item.Item ACACIA_BOAT -> qr
+    net.minecraft.world.item.Item DARK_OAK_BOAT -> qs
+    net.minecraft.world.item.Item TOTEM_OF_UNDYING -> qt
+    net.minecraft.world.item.Item SHULKER_SHELL -> qu
+    net.minecraft.world.item.Item IRON_NUGGET -> qv
+    net.minecraft.world.item.Item KNOWLEDGE_BOOK -> qw
+    net.minecraft.world.item.Item DEBUG_STICK -> qx
+    net.minecraft.world.item.Item MUSIC_DISC_13 -> qy
+    net.minecraft.world.item.Item MUSIC_DISC_CAT -> qz
+    net.minecraft.world.item.Item MUSIC_DISC_BLOCKS -> qA
+    net.minecraft.world.item.Item MUSIC_DISC_CHIRP -> qB
+    net.minecraft.world.item.Item MUSIC_DISC_FAR -> qC
+    net.minecraft.world.item.Item MUSIC_DISC_MALL -> qD
+    net.minecraft.world.item.Item MUSIC_DISC_MELLOHI -> qE
+    net.minecraft.world.item.Item MUSIC_DISC_STAL -> qF
+    net.minecraft.world.item.Item MUSIC_DISC_STRAD -> qG
+    net.minecraft.world.item.Item MUSIC_DISC_WARD -> qH
+    net.minecraft.world.item.Item MUSIC_DISC_11 -> qI
+    net.minecraft.world.item.Item MUSIC_DISC_WAIT -> qJ
+    net.minecraft.world.item.Item MUSIC_DISC_PIGSTEP -> qK
+    net.minecraft.world.item.Item TRIDENT -> qL
+    net.minecraft.world.item.Item PHANTOM_MEMBRANE -> qM
+    net.minecraft.world.item.Item NAUTILUS_SHELL -> qN
+    net.minecraft.world.item.Item HEART_OF_THE_SEA -> qO
+    net.minecraft.world.item.Item CROSSBOW -> qP
+    net.minecraft.world.item.Item SUSPICIOUS_STEW -> qQ
+    net.minecraft.world.item.Item LOOM -> qR
+    net.minecraft.world.item.Item FLOWER_BANNER_PATTERN -> qS
+    net.minecraft.world.item.Item CREEPER_BANNER_PATTERN -> qT
+    net.minecraft.world.item.Item SKULL_BANNER_PATTERN -> qU
+    net.minecraft.world.item.Item MOJANG_BANNER_PATTERN -> qV
+    net.minecraft.world.item.Item GLOBE_BANNER_PATTER -> qW
+    net.minecraft.world.item.Item PIGLIN_BANNER_PATTERN -> qX
+    net.minecraft.world.item.Item COMPOSTER -> qY
+    net.minecraft.world.item.Item BARREL -> qZ
+    net.minecraft.world.item.Item SMOKER -> ra
+    net.minecraft.world.item.Item BLAST_FURNACE -> rb
+    net.minecraft.world.item.Item CARTOGRAPHY_TABLE -> rc
+    net.minecraft.world.item.Item FLETCHING_TABLE -> rd
+    net.minecraft.world.item.Item GRINDSTONE -> re
+    net.minecraft.world.item.Item LECTERN -> rf
+    net.minecraft.world.item.Item SMITHING_TABLE -> rg
+    net.minecraft.world.item.Item STONECUTTER -> rh
+    net.minecraft.world.item.Item BELL -> ri
+    net.minecraft.world.item.Item LANTERN -> rj
+    net.minecraft.world.item.Item SOUL_LANTERN -> rk
+    net.minecraft.world.item.Item SWEET_BERRIES -> rl
+    net.minecraft.world.item.Item CAMPFIRE -> rm
+    net.minecraft.world.item.Item SOUL_CAMPFIRE -> rn
+    net.minecraft.world.item.Item SHROOMLIGHT -> ro
+    net.minecraft.world.item.Item HONEYCOMB -> rp
+    net.minecraft.world.item.Item BEE_NEST -> rq
+    net.minecraft.world.item.Item BEEHIVE -> rr
+    net.minecraft.world.item.Item HONEY_BOTTLE -> rs
+    net.minecraft.world.item.Item HONEY_BLOCK -> rt
+    net.minecraft.world.item.Item HONEYCOMB_BLOCK -> ru
+    net.minecraft.world.item.Item LODESTONE -> rv
+    net.minecraft.world.item.Item NETHERITE_BLOCK -> rw
+    net.minecraft.world.item.Item ANCIENT_DEBRIS -> rx
+    net.minecraft.world.item.Item TARGET -> ry
+    net.minecraft.world.item.Item CRYING_OBSIDIAN -> rz
+    net.minecraft.world.item.Item BLACKSTONE -> rA
+    net.minecraft.world.item.Item BLACKSTONE_SLAB -> rB
+    net.minecraft.world.item.Item BLACKSTONE_STAIRS -> rC
+    net.minecraft.world.item.Item GILDED_BLACKSTONE -> rD
+    net.minecraft.world.item.Item POLISHED_BLACKSTONE -> rE
+    net.minecraft.world.item.Item POLISHED_BLACKSTONE_SLAB -> rF
+    net.minecraft.world.item.Item POLISHED_BLACKSTONE_STAIRS -> rG
+    net.minecraft.world.item.Item CHISELED_POLISHED_BLACKSTONE -> rH
+    net.minecraft.world.item.Item POLISHED_BLACKSTONE_BRICKS -> rI
+    net.minecraft.world.item.Item POLISHED_BLACKSTONE_BRICK_SLAB -> rJ
+    net.minecraft.world.item.Item POLISHED_BLACKSTONE_BRICK_STAIRS -> rK
+    net.minecraft.world.item.Item CRACKED_POLISHED_BLACKSTONE_BRICKS -> rL
+    net.minecraft.world.item.Item RESPAWN_ANCHOR -> rM
     16:16:void <init>() -> <init>
-    912:912:net.minecraft.world.item.Item registerBlock(net.minecraft.world.level.block.Block) -> a
-    916:916:net.minecraft.world.item.Item registerBlock(net.minecraft.world.level.block.Block,net.minecraft.world.item.CreativeModeTab) -> a
-    920:920:net.minecraft.world.item.Item registerBlock(net.minecraft.world.item.BlockItem) -> a
-    924:924:net.minecraft.world.item.Item registerBlock(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item) -> a
-    928:928:net.minecraft.world.item.Item registerItem(java.lang.String,net.minecraft.world.item.Item) -> a
-    932:935:net.minecraft.world.item.Item registerItem(net.minecraft.resources.ResourceLocation,net.minecraft.world.item.Item) -> a
-    17:909:void <clinit>() -> <clinit>
-net.minecraft.world.item.KnowledgeBookItem -> bep:
+    1009:1009:net.minecraft.world.item.Item registerBlock(net.minecraft.world.level.block.Block) -> a
+    1013:1013:net.minecraft.world.item.Item registerBlock(net.minecraft.world.level.block.Block,net.minecraft.world.item.CreativeModeTab) -> a
+    1017:1017:net.minecraft.world.item.Item registerBlock(net.minecraft.world.item.BlockItem) -> a
+    1021:1021:net.minecraft.world.item.Item registerBlock(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item) -> a
+    1025:1025:net.minecraft.world.item.Item registerItem(java.lang.String,net.minecraft.world.item.Item) -> a
+    1029:1032:net.minecraft.world.item.Item registerItem(net.minecraft.resources.ResourceLocation,net.minecraft.world.item.Item) -> a
+    17:1006:void <clinit>() -> <clinit>
+net.minecraft.world.item.KnowledgeBookItem -> bkl:
     org.apache.logging.log4j.Logger LOGGER -> a
     26:27:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     31:63:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
     23:23:void <clinit>() -> <clinit>
-net.minecraft.world.item.LeadItem -> beq:
+net.minecraft.world.item.LeadItem -> bkm:
     17:18:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     22:34:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
     38:57:net.minecraft.world.InteractionResult bindPlayerMobs(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.item.LingeringPotionItem -> ber:
+net.minecraft.world.item.LingeringPotionItem -> bkn:
     17:18:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     22:23:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
     27:28:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.MapItem -> bes:
+net.minecraft.world.item.MapItem -> bko:
     45:46:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     49:53:net.minecraft.world.item.ItemStack create(net.minecraft.world.level.Level,int,int,byte,boolean,boolean) -> a
     58:58:net.minecraft.world.level.saveddata.maps.MapItemSavedData getSavedData(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level) -> a
     63:69:net.minecraft.world.level.saveddata.maps.MapItemSavedData getOrCreateSavedData(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level) -> b
-    73:74:int getMapId(net.minecraft.world.item.ItemStack) -> e
-    78:87:net.minecraft.world.level.saveddata.maps.MapItemSavedData createAndStoreSavedData(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,int,int,int,boolean,boolean,net.minecraft.world.level.dimension.DimensionType) -> a
+    73:74:int getMapId(net.minecraft.world.item.ItemStack) -> d
+    78:87:net.minecraft.world.level.saveddata.maps.MapItemSavedData createAndStoreSavedData(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,int,int,int,boolean,boolean,net.minecraft.resources.ResourceKey) -> a
     91:91:java.lang.String makeKey(int) -> a
     95:241:void update(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
     244:249:net.minecraft.world.level.block.state.BlockState getCorrectStateForFluidBlock(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
@@ -48835,62 +53232,63 @@ net.minecraft.world.item.MapItem -> bes:
     384:389:void scaleMap(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,int) -> a
     393:402:net.minecraft.world.item.ItemStack lockMap(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack) -> a
     407:422:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    425:430:int getColor(net.minecraft.world.item.ItemStack) -> j
+    425:430:int getColor(net.minecraft.world.item.ItemStack) -> g
     435:443:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-net.minecraft.world.item.MilkBucketItem -> bet:
+net.minecraft.world.item.MilkBucketItem -> bkp:
     16:17:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     21:38:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-    43:43:int getUseDuration(net.minecraft.world.item.ItemStack) -> f_
-    48:48:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> e_
-    53:54:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.MinecartItem -> beu:
+    43:43:int getUseDuration(net.minecraft.world.item.ItemStack) -> e_
+    48:48:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> d_
+    53:53:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+net.minecraft.world.item.MinecartItem -> bkq:
     net.minecraft.core.dispenser.DispenseItemBehavior DISPENSE_ITEM_BEHAVIOR -> a
     net.minecraft.world.entity.vehicle.AbstractMinecart$Type type -> b
     75:78:void <init>(net.minecraft.world.entity.vehicle.AbstractMinecart$Type,net.minecraft.world.item.Item$Properties) -> <init>
     82:104:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
     18:18:net.minecraft.world.entity.vehicle.AbstractMinecart$Type access$000(net.minecraft.world.item.MinecartItem) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.world.item.MinecartItem$1 -> beu$1:
+net.minecraft.world.item.MinecartItem$1 -> bkq$1:
     net.minecraft.core.dispenser.DefaultDispenseItemBehavior defaultDispenseItemBehavior -> b
     19:20:void <init>() -> <init>
     24:63:net.minecraft.world.item.ItemStack execute(net.minecraft.core.BlockSource,net.minecraft.world.item.ItemStack) -> a
     68:69:void playSound(net.minecraft.core.BlockSource) -> a
-net.minecraft.world.item.NameTagItem -> bev:
-    10:11:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    15:27:boolean interactEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.PickaxeItem -> bew:
+net.minecraft.world.item.NameTagItem -> bkr:
+    11:12:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    16:28:net.minecraft.world.InteractionResult interactLivingEntity(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand) -> a
+net.minecraft.world.item.PickaxeItem -> bks:
     java.util.Set DIGGABLES -> a
-    96:97:void <init>(net.minecraft.world.item.Tier,int,float,net.minecraft.world.item.Item$Properties) -> <init>
-    101:125:boolean canDestroySpecial(net.minecraft.world.level.block.state.BlockState) -> b
-    132:136:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
+    100:101:void <init>(net.minecraft.world.item.Tier,int,float,net.minecraft.world.item.Item$Properties) -> <init>
+    105:136:boolean isCorrectToolForDrops(net.minecraft.world.level.block.state.BlockState) -> b
+    141:145:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
     12:12:void <clinit>() -> <clinit>
-net.minecraft.world.item.PlayerHeadItem -> bex:
+net.minecraft.world.item.PlayerHeadItem -> bkt:
     17:18:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
-    22:37:net.minecraft.network.chat.Component getName(net.minecraft.world.item.ItemStack) -> g
-    42:49:boolean verifyTagAfterLoad(net.minecraft.nbt.CompoundTag) -> a
-net.minecraft.world.item.PotionItem -> bey:
+    22:37:net.minecraft.network.chat.Component getName(net.minecraft.world.item.ItemStack) -> h
+    42:49:boolean verifyTagAfterLoad(net.minecraft.nbt.CompoundTag) -> b
+net.minecraft.world.item.PotionItem -> bku:
     26:27:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    31:31:net.minecraft.world.item.ItemStack getDefaultInstance() -> s
+    31:31:net.minecraft.world.item.ItemStack getDefaultInstance() -> r
     36:66:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-    71:71:int getUseDuration(net.minecraft.world.item.ItemStack) -> f_
-    76:76:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> e_
-    81:82:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    87:87:java.lang.String getDescriptionId(net.minecraft.world.item.ItemStack) -> f
-    92:93:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    97:97:boolean isFoil(net.minecraft.world.item.ItemStack) -> d_
-    102:109:void fillItemCategory(net.minecraft.world.item.CreativeModeTab,net.minecraft.core.NonNullList) -> a
-net.minecraft.world.item.ProjectileWeaponItem -> bez:
+    71:71:int getUseDuration(net.minecraft.world.item.ItemStack) -> e_
+    76:76:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> d_
+    81:81:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    86:86:java.lang.String getDescriptionId(net.minecraft.world.item.ItemStack) -> f
+    91:92:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+    96:96:boolean isFoil(net.minecraft.world.item.ItemStack) -> e
+    101:108:void fillItemCategory(net.minecraft.world.item.CreativeModeTab,net.minecraft.core.NonNullList) -> a
+net.minecraft.world.item.ProjectileWeaponItem -> bkv:
     java.util.function.Predicate ARROW_ONLY -> a
     java.util.function.Predicate ARROW_OR_FIREWORK -> b
     19:20:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    24:24:java.util.function.Predicate getSupportedHeldProjectiles() -> d
+    24:24:java.util.function.Predicate getSupportedHeldProjectiles() -> e
     java.util.function.Predicate getAllSupportedProjectiles() -> b
     31:37:net.minecraft.world.item.ItemStack getHeldProjectile(net.minecraft.world.entity.LivingEntity,java.util.function.Predicate) -> a
     42:42:int getEnchantmentValue() -> c
-    11:11:boolean lambda$static$1(net.minecraft.world.item.ItemStack) -> e
-    10:10:boolean lambda$static$0(net.minecraft.world.item.ItemStack) -> j
+    int getDefaultProjectileRange() -> d
+    11:11:boolean lambda$static$1(net.minecraft.world.item.ItemStack) -> d
+    10:10:boolean lambda$static$0(net.minecraft.world.item.ItemStack) -> g
     10:11:void <clinit>() -> <clinit>
-net.minecraft.world.item.ProjectileWeaponItem$Type -> bez$a:
+net.minecraft.world.item.ProjectileWeaponItem$Type -> bkv$a:
     net.minecraft.world.item.ProjectileWeaponItem$Type BOW -> a
     net.minecraft.world.item.ProjectileWeaponItem$Type CROSSBOW -> b
     net.minecraft.world.item.ProjectileWeaponItem$Type[] $VALUES -> c
@@ -48898,7 +53296,7 @@ net.minecraft.world.item.ProjectileWeaponItem$Type -> bez$a:
     13:13:net.minecraft.world.item.ProjectileWeaponItem$Type valueOf(java.lang.String) -> valueOf
     13:13:void <init>(java.lang.String,int) -> <init>
     13:15:void <clinit>() -> <clinit>
-net.minecraft.world.item.Rarity -> bfa:
+net.minecraft.world.item.Rarity -> bkw:
     net.minecraft.world.item.Rarity COMMON -> a
     net.minecraft.world.item.Rarity UNCOMMON -> b
     net.minecraft.world.item.Rarity RARE -> c
@@ -48909,136 +53307,137 @@ net.minecraft.world.item.Rarity -> bfa:
     5:5:net.minecraft.world.item.Rarity valueOf(java.lang.String) -> valueOf
     13:15:void <init>(java.lang.String,int,net.minecraft.ChatFormatting) -> <init>
     5:9:void <clinit>() -> <clinit>
-net.minecraft.world.item.RecordItem -> bfb:
+net.minecraft.world.item.RecordItem -> bkx:
     java.util.Map BY_NAME -> a
     int analogOutput -> b
     net.minecraft.sounds.SoundEvent sound -> c
-    29:35:void <init>(int,net.minecraft.sounds.SoundEvent,net.minecraft.world.item.Item$Properties) -> <init>
-    39:58:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    62:62:int getAnalogOutput() -> f
-    67:68:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    71:71:net.minecraft.network.chat.Component getDisplayName() -> g
-    76:76:net.minecraft.world.item.RecordItem getBySound(net.minecraft.sounds.SoundEvent) -> a
-    80:80:net.minecraft.sounds.SoundEvent getSound() -> v
-    23:23:void <clinit>() -> <clinit>
-net.minecraft.world.item.SaddleItem -> bfc:
+    30:36:void <init>(int,net.minecraft.sounds.SoundEvent,net.minecraft.world.item.Item$Properties) -> <init>
+    40:59:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    63:63:int getAnalogOutput() -> f
+    68:69:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+    72:72:net.minecraft.network.chat.MutableComponent getDisplayName() -> g
+    77:77:net.minecraft.world.item.RecordItem getBySound(net.minecraft.sounds.SoundEvent) -> a
+    81:81:net.minecraft.sounds.SoundEvent getSound() -> v
+    24:24:void <clinit>() -> <clinit>
+net.minecraft.world.item.SaddleItem -> bky:
     12:13:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    17:26:boolean interactEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.ScaffoldingBlockItem -> bfd:
-    20:21:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
-    26:75:net.minecraft.world.item.BlockPlaceContext updatePlacementContext(net.minecraft.world.item.BlockPlaceContext) -> b
-    80:80:boolean mustSurvive() -> T_
-net.minecraft.world.item.ServerItemCooldowns -> bfe:
+    17:27:net.minecraft.world.InteractionResult interactLivingEntity(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player,net.minecraft.world.entity.LivingEntity,net.minecraft.world.InteractionHand) -> a
+net.minecraft.world.item.ScaffoldingBlockItem -> bkz:
+    21:22:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
+    27:76:net.minecraft.world.item.BlockPlaceContext updatePlacementContext(net.minecraft.world.item.BlockPlaceContext) -> b
+    81:81:boolean mustSurvive() -> d
+net.minecraft.world.item.ServerItemCooldowns -> bla:
     net.minecraft.server.level.ServerPlayer player -> a
     9:11:void <init>(net.minecraft.server.level.ServerPlayer) -> <init>
     15:17:void onCooldownStarted(net.minecraft.world.item.Item,int) -> b
     21:23:void onCooldownEnded(net.minecraft.world.item.Item) -> c
-net.minecraft.world.item.ShearsItem -> bff:
-    14:15:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    19:35:boolean mineBlock(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
-    40:41:boolean canDestroySpecial(net.minecraft.world.level.block.state.BlockState) -> b
-    46:53:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
-    20:20:void lambda$mineBlock$0(net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.item.ShieldItem -> bfg:
-    23:27:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    31:34:java.lang.String getDescriptionId(net.minecraft.world.item.ItemStack) -> f
-    39:40:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    44:44:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> e_
-    49:49:int getUseDuration(net.minecraft.world.item.ItemStack) -> f_
-    54:56:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    61:61:boolean isValidRepairItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    65:65:net.minecraft.world.item.DyeColor getColor(net.minecraft.world.item.ItemStack) -> e
-    25:25:float lambda$new$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> b
-net.minecraft.world.item.ShovelItem -> bfh:
-    java.util.Set DIGGABLES -> e
+net.minecraft.world.item.ShearsItem -> blb:
+    13:14:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    18:33:boolean mineBlock(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
+    38:38:boolean isCorrectToolForDrops(net.minecraft.world.level.block.state.BlockState) -> b
+    43:49:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
+    19:19:void lambda$mineBlock$0(net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.item.ShieldItem -> blc:
+    22:25:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    29:32:java.lang.String getDescriptionId(net.minecraft.world.item.ItemStack) -> f
+    37:38:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+    42:42:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> d_
+    47:47:int getUseDuration(net.minecraft.world.item.ItemStack) -> e_
+    52:54:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    59:59:boolean isValidRepairItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
+    63:63:net.minecraft.world.item.DyeColor getColor(net.minecraft.world.item.ItemStack) -> d
+net.minecraft.world.item.ShovelItem -> bld:
+    java.util.Set DIGGABLES -> c
     java.util.Map FLATTENABLES -> a
-    61:62:void <init>(net.minecraft.world.item.Tier,float,float,net.minecraft.world.item.Item$Properties) -> <init>
-    66:67:boolean canDestroySpecial(net.minecraft.world.level.block.state.BlockState) -> b
-    72:101:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    93:93:void lambda$useOn$0(net.minecraft.world.item.UseOnContext,net.minecraft.world.entity.player.Player) -> a
-    23:57:void <clinit>() -> <clinit>
-net.minecraft.world.item.SignItem -> bfi:
+    62:63:void <init>(net.minecraft.world.item.Tier,float,float,net.minecraft.world.item.Item$Properties) -> <init>
+    67:67:boolean isCorrectToolForDrops(net.minecraft.world.level.block.state.BlockState) -> b
+    72:104:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    96:96:void lambda$useOn$0(net.minecraft.world.item.UseOnContext,net.minecraft.world.entity.player.Player) -> a
+    23:58:void <clinit>() -> <clinit>
+net.minecraft.world.item.SignItem -> ble:
     14:15:void <init>(net.minecraft.world.item.Item$Properties,net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> <init>
     19:25:boolean updateCustomBlockEntityTag(net.minecraft.core.BlockPos,net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.item.SimpleFoiledItem -> bfj:
+net.minecraft.world.item.SimpleFoiledItem -> blf:
     5:6:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    10:10:boolean isFoil(net.minecraft.world.item.ItemStack) -> d_
-net.minecraft.world.item.SnowballItem -> bfk:
+    10:10:boolean isFoil(net.minecraft.world.item.ItemStack) -> e
+net.minecraft.world.item.SnowballItem -> blg:
     14:15:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     19:31:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.SpawnEggItem -> bfl:
+net.minecraft.world.item.SpawnEggItem -> blh:
     java.util.Map BY_ID -> a
     int color1 -> b
     int color2 -> c
     net.minecraft.world.entity.EntityType defaultType -> d
-    40:46:void <init>(net.minecraft.world.entity.EntityType,int,int,net.minecraft.world.item.Item$Properties) -> <init>
-    50:86:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    91:118:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    122:122:boolean spawnsEntity(net.minecraft.nbt.CompoundTag,net.minecraft.world.entity.EntityType) -> a
-    126:126:int getColor(int) -> a
-    131:131:net.minecraft.world.item.SpawnEggItem byId(net.minecraft.world.entity.EntityType) -> a
-    135:135:java.lang.Iterable eggs() -> f
-    139:147:net.minecraft.world.entity.EntityType getType(net.minecraft.nbt.CompoundTag) -> b
-    33:33:void <clinit>() -> <clinit>
-net.minecraft.world.item.SpectralArrowItem -> bfm:
+    44:50:void <init>(net.minecraft.world.entity.EntityType,int,int,net.minecraft.world.item.Item$Properties) -> <init>
+    54:89:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    94:121:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    125:125:boolean spawnsEntity(net.minecraft.nbt.CompoundTag,net.minecraft.world.entity.EntityType) -> a
+    129:129:int getColor(int) -> a
+    134:134:net.minecraft.world.item.SpawnEggItem byId(net.minecraft.world.entity.EntityType) -> a
+    138:138:java.lang.Iterable eggs() -> f
+    142:150:net.minecraft.world.entity.EntityType getType(net.minecraft.nbt.CompoundTag) -> a
+    154:183:java.util.Optional spawnOffspringFromSpawnEgg(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Mob,net.minecraft.world.entity.EntityType,net.minecraft.world.level.Level,net.minecraft.world.phys.Vec3,net.minecraft.world.item.ItemStack) -> a
+    37:37:void <clinit>() -> <clinit>
+net.minecraft.world.item.SpectralArrowItem -> bli:
     10:11:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     15:15:net.minecraft.world.entity.projectile.AbstractArrow createArrow(net.minecraft.world.level.Level,net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.item.SplashPotionItem -> bfn:
+net.minecraft.world.item.SplashPotionItem -> blj:
     12:13:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     17:18:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.StandingAndWallBlockItem -> bfo:
+net.minecraft.world.item.StandingAndWallBlockItem -> blk:
     net.minecraft.world.level.block.Block wallBlock -> a
     17:19:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
     24:42:net.minecraft.world.level.block.state.BlockState getPlacementState(net.minecraft.world.item.BlockPlaceContext) -> c
     47:50:void registerBlocks(java.util.Map,net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.SuspiciousStewItem -> bfp:
+net.minecraft.world.item.SuspiciousStewItem -> bll:
     19:20:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     23:31:void saveMobEffect(net.minecraft.world.item.ItemStack,net.minecraft.world.effect.MobEffect,int) -> a
     35:57:net.minecraft.world.item.ItemStack finishUsingItem(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.item.SwordItem -> bfq:
+net.minecraft.world.item.SwordItem -> blm:
     float attackDamage -> a
-    float attackSpeed -> b
-    22:26:void <init>(net.minecraft.world.item.Tier,int,float,net.minecraft.world.item.Item$Properties) -> <init>
-    29:29:float getDamage() -> f
-    34:34:boolean canAttackBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    39:48:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
-    53:54:boolean hurtEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    60:63:boolean mineBlock(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
-    68:68:boolean canDestroySpecial(net.minecraft.world.level.block.state.BlockState) -> b
-    73:81:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
-    61:61:void lambda$mineBlock$1(net.minecraft.world.entity.LivingEntity) -> a
-    53:53:void lambda$hurtEnemy$0(net.minecraft.world.entity.LivingEntity) -> b
-net.minecraft.world.item.ThrowablePotionItem -> bfr:
+    com.google.common.collect.Multimap defaultModifiers -> b
+    24:33:void <init>(net.minecraft.world.item.Tier,int,float,net.minecraft.world.item.Item$Properties) -> <init>
+    36:36:float getDamage() -> f
+    41:41:boolean canAttackBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    46:54:float getDestroySpeed(net.minecraft.world.item.ItemStack,net.minecraft.world.level.block.state.BlockState) -> a
+    59:60:boolean hurtEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    66:69:boolean mineBlock(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
+    74:74:boolean isCorrectToolForDrops(net.minecraft.world.level.block.state.BlockState) -> b
+    79:82:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
+    67:67:void lambda$mineBlock$1(net.minecraft.world.entity.LivingEntity) -> a
+    59:59:void lambda$hurtEnemy$0(net.minecraft.world.entity.LivingEntity) -> b
+net.minecraft.world.item.ThrowablePotionItem -> bln:
     12:13:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     17:28:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.Tier -> bfs:
+net.minecraft.world.item.Tier -> blo:
     int getUses() -> a
     float getSpeed() -> b
     float getAttackDamageBonus() -> c
     int getLevel() -> d
     int getEnchantmentValue() -> e
     net.minecraft.world.item.crafting.Ingredient getRepairIngredient() -> f
-net.minecraft.world.item.TieredItem -> bft:
+net.minecraft.world.item.TieredItem -> blp:
     net.minecraft.world.item.Tier tier -> a
     7:9:void <init>(net.minecraft.world.item.Tier,net.minecraft.world.item.Item$Properties) -> <init>
     12:12:net.minecraft.world.item.Tier getTier() -> g
     17:17:int getEnchantmentValue() -> c
     22:22:boolean isValidRepairItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.item.Tiers -> bfu:
+net.minecraft.world.item.Tiers -> blq:
     net.minecraft.world.item.Tiers WOOD -> a
     net.minecraft.world.item.Tiers STONE -> b
     net.minecraft.world.item.Tiers IRON -> c
     net.minecraft.world.item.Tiers DIAMOND -> d
     net.minecraft.world.item.Tiers GOLD -> e
-    int level -> f
-    int uses -> g
-    float speed -> h
-    float damage -> i
-    int enchantmentValue -> j
-    net.minecraft.util.LazyLoadedValue repairIngredient -> k
-    net.minecraft.world.item.Tiers[] $VALUES -> l
-    10:10:net.minecraft.world.item.Tiers[] values() -> values
-    10:10:net.minecraft.world.item.Tiers valueOf(java.lang.String) -> valueOf
+    net.minecraft.world.item.Tiers NETHERITE -> f
+    int level -> g
+    int uses -> h
+    float speed -> i
+    float damage -> j
+    int enchantmentValue -> k
+    net.minecraft.util.LazyLoadedValue repairIngredient -> l
+    net.minecraft.world.item.Tiers[] $VALUES -> m
+    9:9:net.minecraft.world.item.Tiers[] values() -> values
+    9:9:net.minecraft.world.item.Tiers valueOf(java.lang.String) -> valueOf
     25:32:void <init>(java.lang.String,int,int,int,float,float,int,java.util.function.Supplier) -> <init>
     36:36:int getUses() -> a
     41:41:float getSpeed() -> b
@@ -49046,21 +53445,22 @@ net.minecraft.world.item.Tiers -> bfu:
     51:51:int getLevel() -> d
     56:56:int getEnchantmentValue() -> e
     61:61:net.minecraft.world.item.crafting.Ingredient getRepairIngredient() -> f
-    15:15:net.minecraft.world.item.crafting.Ingredient lambda$static$4() -> g
-    14:14:net.minecraft.world.item.crafting.Ingredient lambda$static$3() -> h
-    13:13:net.minecraft.world.item.crafting.Ingredient lambda$static$2() -> i
-    12:12:net.minecraft.world.item.crafting.Ingredient lambda$static$1() -> j
-    11:11:net.minecraft.world.item.crafting.Ingredient lambda$static$0() -> k
-    10:15:void <clinit>() -> <clinit>
-net.minecraft.world.item.TippedArrowItem -> bfv:
+    15:15:net.minecraft.world.item.crafting.Ingredient lambda$static$5() -> g
+    14:14:net.minecraft.world.item.crafting.Ingredient lambda$static$4() -> h
+    13:13:net.minecraft.world.item.crafting.Ingredient lambda$static$3() -> i
+    12:12:net.minecraft.world.item.crafting.Ingredient lambda$static$2() -> j
+    11:11:net.minecraft.world.item.crafting.Ingredient lambda$static$1() -> k
+    10:10:net.minecraft.world.item.crafting.Ingredient lambda$static$0() -> l
+    9:15:void <clinit>() -> <clinit>
+net.minecraft.world.item.TippedArrowItem -> blr:
     16:17:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    21:21:net.minecraft.world.item.ItemStack getDefaultInstance() -> s
+    21:21:net.minecraft.world.item.ItemStack getDefaultInstance() -> r
     26:33:void fillItemCategory(net.minecraft.world.item.CreativeModeTab,net.minecraft.core.NonNullList) -> a
     37:38:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
     42:42:java.lang.String getDescriptionId(net.minecraft.world.item.ItemStack) -> f
-net.minecraft.world.item.TooltipFlag -> bfw:
+net.minecraft.world.item.TooltipFlag -> bls:
     boolean isAdvanced() -> a
-net.minecraft.world.item.TooltipFlag$Default -> bfw$a:
+net.minecraft.world.item.TooltipFlag$Default -> bls$a:
     net.minecraft.world.item.TooltipFlag$Default NORMAL -> a
     net.minecraft.world.item.TooltipFlag$Default ADVANCED -> b
     boolean advanced -> c
@@ -49070,22 +53470,22 @@ net.minecraft.world.item.TooltipFlag$Default -> bfw$a:
     9:11:void <init>(java.lang.String,int,boolean) -> <init>
     15:15:boolean isAdvanced() -> a
     4:5:void <clinit>() -> <clinit>
-net.minecraft.world.item.TridentItem -> bfx:
-    33:39:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    43:43:boolean canAttackBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    48:48:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> e_
-    53:53:int getUseDuration(net.minecraft.world.item.ItemStack) -> f_
-    58:128:void releaseUsing(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> a
-    132:142:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    147:148:boolean hurtEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
-    154:157:boolean mineBlock(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
-    162:170:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
-    175:175:int getEnchantmentValue() -> c
-    155:155:void lambda$mineBlock$3(net.minecraft.world.entity.LivingEntity) -> a
-    147:147:void lambda$hurtEnemy$2(net.minecraft.world.entity.LivingEntity) -> b
-    75:75:void lambda$releaseUsing$1(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.player.Player) -> a
-    37:37:float lambda$new$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> b
-net.minecraft.world.item.UseAnim -> bfy:
+net.minecraft.world.item.TridentItem -> blt:
+    com.google.common.collect.Multimap defaultModifiers -> a
+    35:42:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
+    46:46:boolean canAttackBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    51:51:net.minecraft.world.item.UseAnim getUseAnimation(net.minecraft.world.item.ItemStack) -> d_
+    56:56:int getUseDuration(net.minecraft.world.item.ItemStack) -> e_
+    61:131:void releaseUsing(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity,int) -> a
+    135:145:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+    150:151:boolean hurtEnemy(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.LivingEntity) -> a
+    157:160:boolean mineBlock(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
+    165:168:com.google.common.collect.Multimap getDefaultAttributeModifiers(net.minecraft.world.entity.EquipmentSlot) -> a
+    173:173:int getEnchantmentValue() -> c
+    158:158:void lambda$mineBlock$2(net.minecraft.world.entity.LivingEntity) -> a
+    150:150:void lambda$hurtEnemy$1(net.minecraft.world.entity.LivingEntity) -> b
+    78:78:void lambda$releaseUsing$0(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.player.Player) -> a
+net.minecraft.world.item.UseAnim -> blu:
     net.minecraft.world.item.UseAnim NONE -> a
     net.minecraft.world.item.UseAnim EAT -> b
     net.minecraft.world.item.UseAnim DRINK -> c
@@ -49098,7 +53498,7 @@ net.minecraft.world.item.UseAnim -> bfy:
     3:3:net.minecraft.world.item.UseAnim valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:10:void <clinit>() -> <clinit>
-net.minecraft.world.item.UseOnContext -> bfz:
+net.minecraft.world.item.UseOnContext -> blv:
     net.minecraft.world.entity.player.Player player -> b
     net.minecraft.world.InteractionHand hand -> c
     net.minecraft.world.phys.BlockHitResult hitResult -> d
@@ -49117,27 +53517,29 @@ net.minecraft.world.item.UseOnContext -> bfz:
     68:68:net.minecraft.core.Direction getHorizontalDirection() -> f
     72:72:boolean isSecondaryUseActive() -> g
     76:76:float getRotation() -> h
-net.minecraft.world.item.WaterLilyBlockItem -> bga:
-    27:28:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
-    32:32:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
-    38:70:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-net.minecraft.world.item.WritableBookItem -> bgb:
+net.minecraft.world.item.Vanishable -> blw:
+net.minecraft.world.item.WaterLilyBlockItem -> blx:
+    14:15:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.item.Item$Properties) -> <init>
+    19:19:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
+    24:27:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
+net.minecraft.world.item.Wearable -> bly:
+net.minecraft.world.item.WritableBookItem -> blz:
     21:22:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
     26:34:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
     39:42:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
-    46:62:boolean makeSureTagIsValid(net.minecraft.nbt.CompoundTag) -> b
-net.minecraft.world.item.WrittenBookItem -> bgc:
+    46:62:boolean makeSureTagIsValid(net.minecraft.nbt.CompoundTag) -> a
+net.minecraft.world.item.WrittenBookItem -> bma:
     42:43:void <init>(net.minecraft.world.item.Item$Properties) -> <init>
-    46:58:boolean makeSureTagIsValid(net.minecraft.nbt.CompoundTag) -> b
-    62:62:int getGeneration(net.minecraft.world.item.ItemStack) -> e
-    66:67:int getPageCount(net.minecraft.world.item.ItemStack) -> j
-    72:80:net.minecraft.network.chat.Component getName(net.minecraft.world.item.ItemStack) -> g
+    46:58:boolean makeSureTagIsValid(net.minecraft.nbt.CompoundTag) -> a
+    62:62:int getGeneration(net.minecraft.world.item.ItemStack) -> d
+    66:67:int getPageCount(net.minecraft.world.item.ItemStack) -> g
+    72:80:net.minecraft.network.chat.Component getName(net.minecraft.world.item.ItemStack) -> h
     85:95:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.Level,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
     99:107:net.minecraft.world.InteractionResult useOn(net.minecraft.world.item.UseOnContext) -> a
     112:115:net.minecraft.world.InteractionResultHolder use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand) -> a
     119:140:boolean resolveBookComponents(net.minecraft.world.item.ItemStack,net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.player.Player) -> a
-    145:145:boolean isFoil(net.minecraft.world.item.ItemStack) -> d_
-net.minecraft.world.item.alchemy.Potion -> bgd:
+    145:145:boolean isFoil(net.minecraft.world.item.ItemStack) -> e
+net.minecraft.world.item.alchemy.Potion -> bmb:
     java.lang.String name -> a
     com.google.common.collect.ImmutableList effects -> b
     15:15:net.minecraft.world.item.alchemy.Potion byName(java.lang.String) -> a
@@ -49146,7 +53548,7 @@ net.minecraft.world.item.alchemy.Potion -> bgd:
     30:30:java.lang.String getName(java.lang.String) -> b
     34:34:java.util.List getEffects() -> a
     38:46:boolean hasInstantEffects() -> b
-net.minecraft.world.item.alchemy.PotionBrewing -> bge:
+net.minecraft.world.item.alchemy.PotionBrewing -> bmc:
     java.util.List POTION_MIXES -> a
     java.util.List CONTAINER_MIXES -> b
     java.util.List ALLOWED_CONTAINERS -> c
@@ -49166,7 +53568,7 @@ net.minecraft.world.item.alchemy.PotionBrewing -> bge:
     220:221:void addMix(net.minecraft.world.item.alchemy.Potion,net.minecraft.world.item.Item,net.minecraft.world.item.alchemy.Potion) -> a
     22:27:boolean lambda$static$0(net.minecraft.world.item.ItemStack) -> d
     17:21:void <clinit>() -> <clinit>
-net.minecraft.world.item.alchemy.PotionBrewing$Mix -> bge$a:
+net.minecraft.world.item.alchemy.PotionBrewing$Mix -> bmc$a:
     java.lang.Object from -> a
     net.minecraft.world.item.crafting.Ingredient ingredient -> b
     java.lang.Object to -> c
@@ -49174,23 +53576,23 @@ net.minecraft.world.item.alchemy.PotionBrewing$Mix -> bge$a:
     223:223:net.minecraft.world.item.crafting.Ingredient access$000(net.minecraft.world.item.alchemy.PotionBrewing$Mix) -> a
     223:223:java.lang.Object access$100(net.minecraft.world.item.alchemy.PotionBrewing$Mix) -> b
     223:223:java.lang.Object access$200(net.minecraft.world.item.alchemy.PotionBrewing$Mix) -> c
-net.minecraft.world.item.alchemy.PotionUtils -> bgf:
-    27:27:void <init>() -> <init>
-    34:34:java.util.List getMobEffects(net.minecraft.world.item.ItemStack) -> a
-    38:43:java.util.List getAllEffects(net.minecraft.world.item.alchemy.Potion,java.util.Collection) -> a
-    47:52:java.util.List getAllEffects(net.minecraft.nbt.CompoundTag) -> a
-    56:56:java.util.List getCustomEffects(net.minecraft.world.item.ItemStack) -> b
-    60:62:java.util.List getCustomEffects(net.minecraft.nbt.CompoundTag) -> b
-    66:77:void getCustomEffects(net.minecraft.nbt.CompoundTag,java.util.List) -> a
-    80:86:int getColor(net.minecraft.world.item.ItemStack) -> c
-    90:90:int getColor(net.minecraft.world.item.alchemy.Potion) -> a
-    94:125:int getColor(java.util.Collection) -> a
-    129:129:net.minecraft.world.item.alchemy.Potion getPotion(net.minecraft.world.item.ItemStack) -> d
-    133:137:net.minecraft.world.item.alchemy.Potion getPotion(net.minecraft.nbt.CompoundTag) -> c
-    141:149:net.minecraft.world.item.ItemStack setPotion(net.minecraft.world.item.ItemStack,net.minecraft.world.item.alchemy.Potion) -> a
-    153:165:net.minecraft.world.item.ItemStack setCustomEffects(net.minecraft.world.item.ItemStack,java.util.Collection) -> a
-    169:233:void addPotionTooltip(net.minecraft.world.item.ItemStack,java.util.List,float) -> a
-net.minecraft.world.item.alchemy.Potions -> bgg:
+net.minecraft.world.item.alchemy.PotionUtils -> bmd:
+    28:28:void <init>() -> <init>
+    35:35:java.util.List getMobEffects(net.minecraft.world.item.ItemStack) -> a
+    39:44:java.util.List getAllEffects(net.minecraft.world.item.alchemy.Potion,java.util.Collection) -> a
+    48:53:java.util.List getAllEffects(net.minecraft.nbt.CompoundTag) -> a
+    57:57:java.util.List getCustomEffects(net.minecraft.world.item.ItemStack) -> b
+    61:63:java.util.List getCustomEffects(net.minecraft.nbt.CompoundTag) -> b
+    67:78:void getCustomEffects(net.minecraft.nbt.CompoundTag,java.util.List) -> a
+    81:87:int getColor(net.minecraft.world.item.ItemStack) -> c
+    91:91:int getColor(net.minecraft.world.item.alchemy.Potion) -> a
+    95:126:int getColor(java.util.Collection) -> a
+    130:130:net.minecraft.world.item.alchemy.Potion getPotion(net.minecraft.world.item.ItemStack) -> d
+    134:138:net.minecraft.world.item.alchemy.Potion getPotion(net.minecraft.nbt.CompoundTag) -> c
+    142:150:net.minecraft.world.item.ItemStack setPotion(net.minecraft.world.item.ItemStack,net.minecraft.world.item.alchemy.Potion) -> a
+    154:166:net.minecraft.world.item.ItemStack setCustomEffects(net.minecraft.world.item.ItemStack,java.util.Collection) -> a
+    170:234:void addPotionTooltip(net.minecraft.world.item.ItemStack,java.util.List,float) -> a
+net.minecraft.world.item.alchemy.Potions -> bme:
     net.minecraft.world.item.alchemy.Potion EMPTY -> a
     net.minecraft.world.item.alchemy.Potion WATER -> b
     net.minecraft.world.item.alchemy.Potion MUNDANE -> c
@@ -49237,8 +53639,8 @@ net.minecraft.world.item.alchemy.Potions -> bgg:
     7:7:void <init>() -> <init>
     69:69:net.minecraft.world.item.alchemy.Potion register(java.lang.String,net.minecraft.world.item.alchemy.Potion) -> a
     8:66:void <clinit>() -> <clinit>
-net.minecraft.world.item.alchemy.package-info -> bgh:
-net.minecraft.world.item.crafting.AbstractCookingRecipe -> bgi:
+net.minecraft.world.item.alchemy.package-info -> bmf:
+net.minecraft.world.item.crafting.AbstractCookingRecipe -> bmg:
     net.minecraft.world.item.crafting.RecipeType type -> a
     net.minecraft.resources.ResourceLocation id -> b
     java.lang.String group -> c
@@ -49257,51 +53659,51 @@ net.minecraft.world.item.crafting.AbstractCookingRecipe -> bgi:
     66:66:int getCookingTime() -> e
     71:71:net.minecraft.resources.ResourceLocation getId() -> f
     76:76:net.minecraft.world.item.crafting.RecipeType getType() -> g
-net.minecraft.world.item.crafting.ArmorDyeRecipe -> bgj:
+net.minecraft.world.item.crafting.ArmorDyeRecipe -> bmh:
     16:17:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     21:42:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
     47:74:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     79:79:boolean canCraftInDimensions(int,int) -> a
-    84:84:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    84:84:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     14:14:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     14:14:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-net.minecraft.world.item.crafting.BannerDuplicateRecipe -> bgk:
+net.minecraft.world.item.crafting.BannerDuplicateRecipe -> bmi:
     15:16:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     21:60:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
     66:79:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     84:101:net.minecraft.core.NonNullList getRemainingItems(net.minecraft.world.inventory.CraftingContainer) -> b
-    106:106:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    106:106:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     111:111:boolean canCraftInDimensions(int,int) -> a
     13:13:net.minecraft.core.NonNullList getRemainingItems(net.minecraft.world.Container) -> b
     13:13:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     13:13:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-net.minecraft.world.item.crafting.BlastingRecipe -> bgl:
+net.minecraft.world.item.crafting.BlastingRecipe -> bmj:
     9:10:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.ItemStack,float,int) -> <init>
     14:14:net.minecraft.world.item.ItemStack getToastSymbol() -> h
-    19:19:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
-net.minecraft.world.item.crafting.BookCloningRecipe -> bgm:
+    19:19:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
+net.minecraft.world.item.crafting.BookCloningRecipe -> bmk:
     14:15:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     19:40:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
     45:77:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     82:96:net.minecraft.core.NonNullList getRemainingItems(net.minecraft.world.inventory.CraftingContainer) -> b
-    101:101:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    101:101:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     106:106:boolean canCraftInDimensions(int,int) -> a
     12:12:net.minecraft.core.NonNullList getRemainingItems(net.minecraft.world.Container) -> b
     12:12:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     12:12:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-net.minecraft.world.item.crafting.CampfireCookingRecipe -> bgn:
+net.minecraft.world.item.crafting.CampfireCookingRecipe -> bml:
     9:10:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.ItemStack,float,int) -> <init>
     14:14:net.minecraft.world.item.ItemStack getToastSymbol() -> h
-    19:19:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
-net.minecraft.world.item.crafting.CraftingRecipe -> bgo:
+    19:19:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
+net.minecraft.world.item.crafting.CraftingRecipe -> bmm:
     8:8:net.minecraft.world.item.crafting.RecipeType getType() -> g
-net.minecraft.world.item.crafting.CustomRecipe -> bgp:
+net.minecraft.world.item.crafting.CustomRecipe -> bmn:
     net.minecraft.resources.ResourceLocation id -> a
     9:11:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     15:15:net.minecraft.resources.ResourceLocation getId() -> f
-    20:20:boolean isSpecial() -> V_
+    20:20:boolean isSpecial() -> ah_
     25:25:net.minecraft.world.item.ItemStack getResultItem() -> c
-net.minecraft.world.item.crafting.FireworkRocketRecipe -> bgq:
+net.minecraft.world.item.crafting.FireworkRocketRecipe -> bmo:
     net.minecraft.world.item.crafting.Ingredient PAPER_INGREDIENT -> a
     net.minecraft.world.item.crafting.Ingredient GUNPOWDER_INGREDIENT -> b
     net.minecraft.world.item.crafting.Ingredient STAR_INGREDIENT -> c
@@ -49310,21 +53712,21 @@ net.minecraft.world.item.crafting.FireworkRocketRecipe -> bgq:
     52:79:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     84:84:boolean canCraftInDimensions(int,int) -> a
     89:89:net.minecraft.world.item.ItemStack getResultItem() -> c
-    94:94:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    94:94:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     12:12:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     12:12:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
     13:15:void <clinit>() -> <clinit>
-net.minecraft.world.item.crafting.FireworkStarFadeRecipe -> bgr:
+net.minecraft.world.item.crafting.FireworkStarFadeRecipe -> bmp:
     net.minecraft.world.item.crafting.Ingredient STAR_INGREDIENT -> a
     19:20:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     24:45:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
     50:72:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     77:77:boolean canCraftInDimensions(int,int) -> a
-    82:82:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    82:82:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     15:15:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     15:15:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.world.item.crafting.FireworkStarRecipe -> bgs:
+net.minecraft.world.item.crafting.FireworkStarRecipe -> bmq:
     net.minecraft.world.item.crafting.Ingredient SHAPE_INGREDIENT -> a
     net.minecraft.world.item.crafting.Ingredient TRAIL_INGREDIENT -> b
     net.minecraft.world.item.crafting.Ingredient FLICKER_INGREDIENT -> c
@@ -49335,121 +53737,122 @@ net.minecraft.world.item.crafting.FireworkStarRecipe -> bgs:
     98:124:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     129:129:boolean canCraftInDimensions(int,int) -> a
     134:134:net.minecraft.world.item.ItemStack getResultItem() -> c
-    139:139:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    139:139:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     19:19:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     19:19:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
     35:44:void lambda$static$0(java.util.HashMap) -> a
     20:46:void <clinit>() -> <clinit>
-net.minecraft.world.item.crafting.Ingredient -> bgt:
-    java.util.function.Predicate NON_ALL_EMPTY -> b
+net.minecraft.world.item.crafting.Ingredient -> bmr:
     net.minecraft.world.item.crafting.Ingredient EMPTY -> a
-    net.minecraft.world.item.crafting.Ingredient$Value[] values -> c
-    net.minecraft.world.item.ItemStack[] itemStacks -> d
-    it.unimi.dsi.fastutil.ints.IntList stackingIds -> e
-    41:43:void <init>(java.util.stream.Stream) -> <init>
-    46:47:net.minecraft.world.item.ItemStack[] getItems() -> a
-    51:54:void dissolve() -> f
-    58:72:boolean test(net.minecraft.world.item.ItemStack) -> a
-    76:85:it.unimi.dsi.fastutil.ints.IntList getStackingIds() -> b
-    89:94:void toNetwork(net.minecraft.network.FriendlyByteBuf) -> a
-    97:104:com.google.gson.JsonElement toJson() -> c
-    109:109:boolean isEmpty() -> d
-    113:115:net.minecraft.world.item.crafting.Ingredient fromValues(java.util.stream.Stream) -> a
-    119:119:net.minecraft.world.item.crafting.Ingredient of() -> e
-    123:123:net.minecraft.world.item.crafting.Ingredient of(net.minecraft.world.level.ItemLike[]) -> a
-    127:127:net.minecraft.world.item.crafting.Ingredient of(net.minecraft.world.item.ItemStack[]) -> a
-    131:131:net.minecraft.world.item.crafting.Ingredient of(net.minecraft.tags.Tag) -> a
-    135:136:net.minecraft.world.item.crafting.Ingredient fromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
-    140:152:net.minecraft.world.item.crafting.Ingredient fromJson(com.google.gson.JsonElement) -> a
-    157:172:net.minecraft.world.item.crafting.Ingredient$Value valueFromJson(com.google.gson.JsonObject) -> a
+    net.minecraft.world.item.crafting.Ingredient$Value[] values -> b
+    net.minecraft.world.item.ItemStack[] itemStacks -> c
+    it.unimi.dsi.fastutil.ints.IntList stackingIds -> d
+    39:41:void <init>(java.util.stream.Stream) -> <init>
+    44:45:net.minecraft.world.item.ItemStack[] getItems() -> a
+    49:52:void dissolve() -> f
+    56:71:boolean test(net.minecraft.world.item.ItemStack) -> a
+    75:84:it.unimi.dsi.fastutil.ints.IntList getStackingIds() -> b
+    88:93:void toNetwork(net.minecraft.network.FriendlyByteBuf) -> a
+    96:103:com.google.gson.JsonElement toJson() -> c
+    108:108:boolean isEmpty() -> d
+    112:114:net.minecraft.world.item.crafting.Ingredient fromValues(java.util.stream.Stream) -> b
+    118:118:net.minecraft.world.item.crafting.Ingredient of() -> e
+    122:122:net.minecraft.world.item.crafting.Ingredient of(net.minecraft.world.level.ItemLike[]) -> a
+    126:126:net.minecraft.world.item.crafting.Ingredient of(net.minecraft.world.item.ItemStack[]) -> a
+    130:130:net.minecraft.world.item.crafting.Ingredient of(java.util.stream.Stream) -> a
+    134:134:net.minecraft.world.item.crafting.Ingredient of(net.minecraft.tags.Tag) -> a
+    138:139:net.minecraft.world.item.crafting.Ingredient fromNetwork(net.minecraft.network.FriendlyByteBuf) -> b
+    143:155:net.minecraft.world.item.crafting.Ingredient fromJson(com.google.gson.JsonElement) -> a
+    160:175:net.minecraft.world.item.crafting.Ingredient$Value valueFromJson(com.google.gson.JsonObject) -> a
     32:32:boolean test(java.lang.Object) -> test
-    162:162:com.google.gson.JsonSyntaxException lambda$valueFromJson$8(net.minecraft.resources.ResourceLocation) -> a
-    150:150:net.minecraft.world.item.crafting.Ingredient$Value lambda$fromJson$7(com.google.gson.JsonElement) -> b
-    136:136:net.minecraft.world.item.crafting.Ingredient$ItemValue lambda$fromNetwork$6(net.minecraft.network.FriendlyByteBuf) -> c
-    127:127:net.minecraft.world.item.crafting.Ingredient$ItemValue lambda$of$5(net.minecraft.world.item.ItemStack) -> b
-    123:123:net.minecraft.world.item.crafting.Ingredient$ItemValue lambda$of$4(net.minecraft.world.level.ItemLike) -> a
-    52:52:net.minecraft.world.item.ItemStack[] lambda$dissolve$3(int) -> a
-    52:52:java.util.stream.Stream lambda$dissolve$2(net.minecraft.world.item.crafting.Ingredient$Value) -> a
-    42:42:net.minecraft.world.item.crafting.Ingredient$Value[] lambda$new$1(int) -> b
-    33:33:boolean lambda$static$0(net.minecraft.world.item.crafting.Ingredient$Value) -> b
-    33:35:void <clinit>() -> <clinit>
-net.minecraft.world.item.crafting.Ingredient$1 -> bgt$1:
-net.minecraft.world.item.crafting.Ingredient$ItemValue -> bgt$a:
+    165:165:com.google.gson.JsonSyntaxException lambda$valueFromJson$7(net.minecraft.resources.ResourceLocation) -> a
+    153:153:net.minecraft.world.item.crafting.Ingredient$Value lambda$fromJson$6(com.google.gson.JsonElement) -> b
+    139:139:net.minecraft.world.item.crafting.Ingredient$ItemValue lambda$fromNetwork$5(net.minecraft.network.FriendlyByteBuf) -> c
+    130:130:net.minecraft.world.item.crafting.Ingredient$ItemValue lambda$of$4(net.minecraft.world.item.ItemStack) -> b
+    130:130:boolean lambda$of$3(net.minecraft.world.item.ItemStack) -> c
+    50:50:net.minecraft.world.item.ItemStack[] lambda$dissolve$2(int) -> a
+    50:50:java.util.stream.Stream lambda$dissolve$1(net.minecraft.world.item.crafting.Ingredient$Value) -> a
+    40:40:net.minecraft.world.item.crafting.Ingredient$Value[] lambda$new$0(int) -> b
+    33:33:void <clinit>() -> <clinit>
+net.minecraft.world.item.crafting.Ingredient$1 -> bmr$1:
+net.minecraft.world.item.crafting.Ingredient$ItemValue -> bmr$a:
     net.minecraft.world.item.ItemStack item -> a
-    185:187:void <init>(net.minecraft.world.item.ItemStack) -> <init>
-    191:191:java.util.Collection getItems() -> a
-    196:198:com.google.gson.JsonObject serialize() -> b
-    182:182:void <init>(net.minecraft.world.item.ItemStack,net.minecraft.world.item.crafting.Ingredient$1) -> <init>
-net.minecraft.world.item.crafting.Ingredient$TagValue -> bgt$b:
+    188:190:void <init>(net.minecraft.world.item.ItemStack) -> <init>
+    194:194:java.util.Collection getItems() -> a
+    199:201:com.google.gson.JsonObject serialize() -> b
+    185:185:void <init>(net.minecraft.world.item.ItemStack,net.minecraft.world.item.crafting.Ingredient$1) -> <init>
+net.minecraft.world.item.crafting.Ingredient$TagValue -> bmr$b:
     net.minecraft.tags.Tag tag -> a
-    205:207:void <init>(net.minecraft.tags.Tag) -> <init>
-    211:215:java.util.Collection getItems() -> a
-    220:222:com.google.gson.JsonObject serialize() -> b
-    202:202:void <init>(net.minecraft.tags.Tag,net.minecraft.world.item.crafting.Ingredient$1) -> <init>
-net.minecraft.world.item.crafting.Ingredient$Value -> bgt$c:
+    208:210:void <init>(net.minecraft.tags.Tag) -> <init>
+    214:218:java.util.Collection getItems() -> a
+    223:225:com.google.gson.JsonObject serialize() -> b
+    205:205:void <init>(net.minecraft.tags.Tag,net.minecraft.world.item.crafting.Ingredient$1) -> <init>
+net.minecraft.world.item.crafting.Ingredient$Value -> bmr$c:
     java.util.Collection getItems() -> a
     com.google.gson.JsonObject serialize() -> b
-net.minecraft.world.item.crafting.MapCloningRecipe -> bgu:
+net.minecraft.world.item.crafting.MapCloningRecipe -> bms:
     11:12:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     16:37:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
     42:70:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     75:75:boolean canCraftInDimensions(int,int) -> a
-    80:80:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    80:80:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     9:9:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     9:9:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-net.minecraft.world.item.crafting.MapExtendingRecipe -> bgv:
+net.minecraft.world.item.crafting.MapExtendingRecipe -> bmt:
     15:23:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     27:51:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
     55:62:boolean isExplorationMap(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
     67:80:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
-    85:85:boolean isSpecial() -> V_
-    90:90:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    85:85:boolean isSpecial() -> ah_
+    90:90:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     13:13:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     13:13:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-net.minecraft.world.item.crafting.Recipe -> bgw:
+net.minecraft.world.item.crafting.Recipe -> bmu:
     boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
     net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     boolean canCraftInDimensions(int,int) -> a
     net.minecraft.world.item.ItemStack getResultItem() -> c
     22:31:net.minecraft.core.NonNullList getRemainingItems(net.minecraft.world.Container) -> b
     35:35:net.minecraft.core.NonNullList getIngredients() -> a
-    39:39:boolean isSpecial() -> V_
+    39:39:boolean isSpecial() -> ah_
     43:43:java.lang.String getGroup() -> d
     47:47:net.minecraft.world.item.ItemStack getToastSymbol() -> h
     net.minecraft.resources.ResourceLocation getId() -> f
-    net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     net.minecraft.world.item.crafting.RecipeType getType() -> g
-net.minecraft.world.item.crafting.RecipeManager -> bgx:
+net.minecraft.world.item.crafting.RecipeManager -> bmv:
     com.google.gson.Gson GSON -> a
     org.apache.logging.log4j.Logger LOGGER -> b
     java.util.Map recipes -> c
     boolean hasErrors -> d
-    38:43:void <init>() -> <init>
-    47:62:void apply(java.util.Map,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    65:65:boolean hadErrorsLoading() -> a
-    69:69:java.util.Optional getRecipeFor(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-    73:77:java.util.List getRecipesFor(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.Container,net.minecraft.world.level.Level) -> b
-    83:83:java.util.Map byType(net.minecraft.world.item.crafting.RecipeType) -> a
-    87:96:net.minecraft.core.NonNullList getRemainingItemsFor(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.Container,net.minecraft.world.level.Level) -> c
-    100:100:java.util.Optional byKey(net.minecraft.resources.ResourceLocation) -> a
-    104:104:java.util.Collection getRecipes() -> b
-    108:108:java.util.stream.Stream getRecipeIds() -> c
-    112:115:net.minecraft.world.item.crafting.Recipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
-    119:131:void replaceRecipes(java.lang.Iterable) -> a
-    34:34:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    123:128:void lambda$replaceRecipes$10(java.util.Map,net.minecraft.world.item.crafting.Recipe) -> a
-    123:123:java.util.Map lambda$null$9(net.minecraft.world.item.crafting.RecipeType) -> b
-    114:114:com.google.gson.JsonSyntaxException lambda$fromJson$8(java.lang.String) -> a
-    108:108:java.util.stream.Stream lambda$getRecipeIds$7(java.util.Map) -> a
-    104:104:java.util.stream.Stream lambda$getRecipes$6(java.util.Map) -> b
-    100:100:net.minecraft.world.item.crafting.Recipe lambda$byKey$5(net.minecraft.resources.ResourceLocation,java.util.Map) -> a
-    76:76:java.lang.String lambda$getRecipesFor$4(net.minecraft.world.item.crafting.Recipe) -> a
-    75:75:java.util.stream.Stream lambda$getRecipesFor$3(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.level.Level,net.minecraft.world.Container,net.minecraft.world.item.crafting.Recipe) -> a
-    69:69:java.util.stream.Stream lambda$getRecipeFor$2(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.level.Level,net.minecraft.world.Container,net.minecraft.world.item.crafting.Recipe) -> b
-    60:60:java.util.Map lambda$apply$1(java.util.Map$Entry) -> a
-    54:54:com.google.common.collect.ImmutableMap$Builder lambda$apply$0(net.minecraft.world.item.crafting.RecipeType) -> c
-    35:36:void <clinit>() -> <clinit>
-net.minecraft.world.item.crafting.RecipeSerializer -> bgy:
+    39:44:void <init>() -> <init>
+    48:63:void apply(java.util.Map,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    66:66:boolean hadErrorsLoading() -> a
+    70:70:java.util.Optional getRecipeFor(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
+    74:77:java.util.List getAllRecipesFor(net.minecraft.world.item.crafting.RecipeType) -> a
+    81:85:java.util.List getRecipesFor(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.Container,net.minecraft.world.level.Level) -> b
+    91:91:java.util.Map byType(net.minecraft.world.item.crafting.RecipeType) -> b
+    95:104:net.minecraft.core.NonNullList getRemainingItemsFor(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.Container,net.minecraft.world.level.Level) -> c
+    108:108:java.util.Optional byKey(net.minecraft.resources.ResourceLocation) -> a
+    112:112:java.util.Collection getRecipes() -> b
+    116:116:java.util.stream.Stream getRecipeIds() -> d
+    120:123:net.minecraft.world.item.crafting.Recipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
+    127:139:void replaceRecipes(java.lang.Iterable) -> a
+    35:35:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    131:136:void lambda$replaceRecipes$11(java.util.Map,net.minecraft.world.item.crafting.Recipe) -> a
+    131:131:java.util.Map lambda$null$10(net.minecraft.world.item.crafting.RecipeType) -> c
+    122:122:com.google.gson.JsonSyntaxException lambda$fromJson$9(java.lang.String) -> a
+    116:116:java.util.stream.Stream lambda$getRecipeIds$8(java.util.Map) -> a
+    112:112:java.util.stream.Stream lambda$getRecipes$7(java.util.Map) -> b
+    108:108:net.minecraft.world.item.crafting.Recipe lambda$byKey$6(net.minecraft.resources.ResourceLocation,java.util.Map) -> a
+    84:84:java.lang.String lambda$getRecipesFor$5(net.minecraft.world.item.crafting.Recipe) -> a
+    83:83:java.util.stream.Stream lambda$getRecipesFor$4(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.level.Level,net.minecraft.world.Container,net.minecraft.world.item.crafting.Recipe) -> a
+    76:76:net.minecraft.world.item.crafting.Recipe lambda$getAllRecipesFor$3(net.minecraft.world.item.crafting.Recipe) -> b
+    70:70:java.util.stream.Stream lambda$getRecipeFor$2(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.level.Level,net.minecraft.world.Container,net.minecraft.world.item.crafting.Recipe) -> b
+    61:61:java.util.Map lambda$apply$1(java.util.Map$Entry) -> a
+    55:55:com.google.common.collect.ImmutableMap$Builder lambda$apply$0(net.minecraft.world.item.crafting.RecipeType) -> d
+    36:37:void <clinit>() -> <clinit>
+net.minecraft.world.item.crafting.RecipeSerializer -> bmw:
     net.minecraft.world.item.crafting.RecipeSerializer SHAPED_RECIPE -> a
     net.minecraft.world.item.crafting.RecipeSerializer SHAPELESS_RECIPE -> b
     net.minecraft.world.item.crafting.SimpleRecipeSerializer ARMOR_DYE -> c
@@ -49470,34 +53873,37 @@ net.minecraft.world.item.crafting.RecipeSerializer -> bgy:
     net.minecraft.world.item.crafting.SimpleCookingSerializer SMOKING_RECIPE -> r
     net.minecraft.world.item.crafting.SimpleCookingSerializer CAMPFIRE_COOKING_RECIPE -> s
     net.minecraft.world.item.crafting.RecipeSerializer STONECUTTER -> t
+    net.minecraft.world.item.crafting.RecipeSerializer SMITHING -> u
     net.minecraft.world.item.crafting.Recipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
     net.minecraft.world.item.crafting.Recipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> a
     void toNetwork(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.item.crafting.Recipe) -> a
-    37:37:net.minecraft.world.item.crafting.RecipeSerializer register(java.lang.String,net.minecraft.world.item.crafting.RecipeSerializer) -> a
-    9:28:void <clinit>() -> <clinit>
-net.minecraft.world.item.crafting.RecipeType -> bgz:
+    38:38:net.minecraft.world.item.crafting.RecipeSerializer register(java.lang.String,net.minecraft.world.item.crafting.RecipeSerializer) -> a
+    9:29:void <clinit>() -> <clinit>
+net.minecraft.world.item.crafting.RecipeType -> bmx:
     net.minecraft.world.item.crafting.RecipeType CRAFTING -> a
     net.minecraft.world.item.crafting.RecipeType SMELTING -> b
     net.minecraft.world.item.crafting.RecipeType BLASTING -> c
     net.minecraft.world.item.crafting.RecipeType SMOKING -> d
     net.minecraft.world.item.crafting.RecipeType CAMPFIRE_COOKING -> e
     net.minecraft.world.item.crafting.RecipeType STONECUTTING -> f
-    19:19:net.minecraft.world.item.crafting.RecipeType register(java.lang.String) -> a
-    29:29:java.util.Optional tryMatch(net.minecraft.world.item.crafting.Recipe,net.minecraft.world.level.Level,net.minecraft.world.Container) -> a
-    11:16:void <clinit>() -> <clinit>
-net.minecraft.world.item.crafting.RecipeType$1 -> bgz$1:
-    java.lang.String val$name -> g
-    19:19:void <init>(java.lang.String) -> <init>
-    22:22:java.lang.String toString() -> toString
-net.minecraft.world.item.crafting.RepairItemRecipe -> bha:
-    14:15:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    19:36:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
-    41:78:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
-    83:83:boolean canCraftInDimensions(int,int) -> a
-    88:88:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
-    12:12:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
-    12:12:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-net.minecraft.world.item.crafting.ShapedRecipe -> bhb:
+    net.minecraft.world.item.crafting.RecipeType SMITHING -> g
+    20:20:net.minecraft.world.item.crafting.RecipeType register(java.lang.String) -> a
+    30:30:java.util.Optional tryMatch(net.minecraft.world.item.crafting.Recipe,net.minecraft.world.level.Level,net.minecraft.world.Container) -> a
+    11:17:void <clinit>() -> <clinit>
+net.minecraft.world.item.crafting.RecipeType$1 -> bmx$1:
+    java.lang.String val$name -> h
+    20:20:void <init>(java.lang.String) -> <init>
+    23:23:java.lang.String toString() -> toString
+net.minecraft.world.item.crafting.RepairItemRecipe -> bmy:
+    19:20:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
+    24:41:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
+    46:98:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
+    103:103:boolean canCraftInDimensions(int,int) -> a
+    108:108:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
+    17:17:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
+    17:17:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
+    84:88:void lambda$assemble$0(java.util.Map,java.util.Map,java.util.Map,net.minecraft.world.item.enchantment.Enchantment) -> a
+net.minecraft.world.item.crafting.ShapedRecipe -> bmz:
     int width -> a
     int height -> b
     net.minecraft.core.NonNullList recipeItems -> c
@@ -49506,7 +53912,7 @@ net.minecraft.world.item.crafting.ShapedRecipe -> bhb:
     java.lang.String group -> f
     32:39:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String,int,int,net.minecraft.core.NonNullList,net.minecraft.world.item.ItemStack) -> <init>
     43:43:net.minecraft.resources.ResourceLocation getId() -> f
-    48:48:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    48:48:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     53:53:java.lang.String getGroup() -> d
     58:58:net.minecraft.world.item.ItemStack getResultItem() -> c
     63:63:net.minecraft.core.NonNullList getIngredients() -> a
@@ -49534,7 +53940,7 @@ net.minecraft.world.item.crafting.ShapedRecipe -> bhb:
     24:24:java.lang.String access$500(net.minecraft.world.item.crafting.ShapedRecipe) -> c
     24:24:net.minecraft.core.NonNullList access$600(net.minecraft.world.item.crafting.ShapedRecipe) -> d
     24:24:net.minecraft.world.item.ItemStack access$700(net.minecraft.world.item.crafting.ShapedRecipe) -> e
-net.minecraft.world.item.crafting.ShapedRecipe$Serializer -> bhb$a:
+net.minecraft.world.item.crafting.ShapedRecipe$Serializer -> bmz$a:
     241:241:void <init>() -> <init>
     244:256:net.minecraft.world.item.crafting.ShapedRecipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> b
     261:269:net.minecraft.world.item.crafting.ShapedRecipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> b
@@ -49542,14 +53948,14 @@ net.minecraft.world.item.crafting.ShapedRecipe$Serializer -> bhb$a:
     241:241:void toNetwork(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.item.crafting.Recipe) -> a
     241:241:net.minecraft.world.item.crafting.Recipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> a
     241:241:net.minecraft.world.item.crafting.Recipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
-net.minecraft.world.item.crafting.ShapelessRecipe -> bhc:
+net.minecraft.world.item.crafting.ShapelessRecipe -> bna:
     net.minecraft.resources.ResourceLocation id -> a
     java.lang.String group -> b
     net.minecraft.world.item.ItemStack result -> c
     net.minecraft.core.NonNullList ingredients -> d
     21:26:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String,net.minecraft.world.item.ItemStack,net.minecraft.core.NonNullList) -> <init>
     30:30:net.minecraft.resources.ResourceLocation getId() -> f
-    35:35:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    35:35:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     40:40:java.lang.String getGroup() -> d
     45:45:net.minecraft.world.item.ItemStack getResultItem() -> c
     50:50:net.minecraft.core.NonNullList getIngredients() -> a
@@ -49561,7 +53967,7 @@ net.minecraft.world.item.crafting.ShapelessRecipe -> bhc:
     15:15:java.lang.String access$000(net.minecraft.world.item.crafting.ShapelessRecipe) -> a
     15:15:net.minecraft.core.NonNullList access$100(net.minecraft.world.item.crafting.ShapelessRecipe) -> b
     15:15:net.minecraft.world.item.ItemStack access$200(net.minecraft.world.item.crafting.ShapelessRecipe) -> c
-net.minecraft.world.item.crafting.ShapelessRecipe$Serializer -> bhc$a:
+net.minecraft.world.item.crafting.ShapelessRecipe$Serializer -> bna$a:
     79:79:void <init>() -> <init>
     82:91:net.minecraft.world.item.crafting.ShapelessRecipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> b
     95:104:net.minecraft.core.NonNullList itemsFromJson(com.google.gson.JsonArray) -> a
@@ -49570,25 +53976,25 @@ net.minecraft.world.item.crafting.ShapelessRecipe$Serializer -> bhc$a:
     79:79:void toNetwork(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.item.crafting.Recipe) -> a
     79:79:net.minecraft.world.item.crafting.Recipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> a
     79:79:net.minecraft.world.item.crafting.Recipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
-net.minecraft.world.item.crafting.ShieldDecorationRecipe -> bhd:
+net.minecraft.world.item.crafting.ShieldDecorationRecipe -> bnb:
     15:16:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     20:56:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
     61:88:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     93:93:boolean canCraftInDimensions(int,int) -> a
-    98:98:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    98:98:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     13:13:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     13:13:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-net.minecraft.world.item.crafting.ShulkerBoxColoring -> bhe:
+net.minecraft.world.item.crafting.ShulkerBoxColoring -> bnc:
     15:16:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     20:43:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
     48:71:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     76:76:boolean canCraftInDimensions(int,int) -> a
-    81:81:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    81:81:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     13:13:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     13:13:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-net.minecraft.world.item.crafting.SimpleCookingSerializer -> bhf:
-    int defaultCookingTime -> u
-    net.minecraft.world.item.crafting.SimpleCookingSerializer$CookieBaker factory -> v
+net.minecraft.world.item.crafting.SimpleCookingSerializer -> bnd:
+    int defaultCookingTime -> v
+    net.minecraft.world.item.crafting.SimpleCookingSerializer$CookieBaker factory -> w
     19:22:void <init>(net.minecraft.world.item.crafting.SimpleCookingSerializer$CookieBaker,int) -> <init>
     26:37:net.minecraft.world.item.crafting.AbstractCookingRecipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> b
     42:47:net.minecraft.world.item.crafting.AbstractCookingRecipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> b
@@ -49597,15 +54003,15 @@ net.minecraft.world.item.crafting.SimpleCookingSerializer -> bhf:
     11:11:net.minecraft.world.item.crafting.Recipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> a
     11:11:net.minecraft.world.item.crafting.Recipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
     33:33:java.lang.IllegalStateException lambda$fromJson$0(java.lang.String) -> a
-net.minecraft.world.item.crafting.SimpleCookingSerializer$CookieBaker -> bhf$a:
+net.minecraft.world.item.crafting.SimpleCookingSerializer$CookieBaker -> bnd$a:
     net.minecraft.world.item.crafting.AbstractCookingRecipe create(net.minecraft.resources.ResourceLocation,java.lang.String,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.ItemStack,float,int) -> create
-net.minecraft.world.item.crafting.SimpleRecipeSerializer -> bhg:
-    java.util.function.Function constructor -> u
+net.minecraft.world.item.crafting.SimpleRecipeSerializer -> bne:
+    java.util.function.Function constructor -> v
     12:14:void <init>(java.util.function.Function) -> <init>
     18:18:net.minecraft.world.item.crafting.Recipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
     23:23:net.minecraft.world.item.crafting.Recipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> a
     28:28:void toNetwork(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.item.crafting.Recipe) -> a
-net.minecraft.world.item.crafting.SingleItemRecipe -> bhh:
+net.minecraft.world.item.crafting.SingleItemRecipe -> bnf:
     net.minecraft.world.item.crafting.Ingredient ingredient -> a
     net.minecraft.world.item.ItemStack result -> b
     net.minecraft.world.item.crafting.RecipeType type -> e
@@ -49614,15 +54020,15 @@ net.minecraft.world.item.crafting.SingleItemRecipe -> bhh:
     java.lang.String group -> d
     20:27:void <init>(net.minecraft.world.item.crafting.RecipeType,net.minecraft.world.item.crafting.RecipeSerializer,net.minecraft.resources.ResourceLocation,java.lang.String,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.ItemStack) -> <init>
     31:31:net.minecraft.world.item.crafting.RecipeType getType() -> g
-    36:36:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    36:36:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     41:41:net.minecraft.resources.ResourceLocation getId() -> f
     46:46:java.lang.String getGroup() -> d
     51:51:net.minecraft.world.item.ItemStack getResultItem() -> c
     56:58:net.minecraft.core.NonNullList getIngredients() -> a
     63:63:boolean canCraftInDimensions(int,int) -> a
     68:68:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
-net.minecraft.world.item.crafting.SingleItemRecipe$Serializer -> bhh$a:
-    net.minecraft.world.item.crafting.SingleItemRecipe$Serializer$SingleItemMaker factory -> u
+net.minecraft.world.item.crafting.SingleItemRecipe$Serializer -> bnf$a:
+    net.minecraft.world.item.crafting.SingleItemRecipe$Serializer$SingleItemMaker factory -> v
     74:76:void <init>(net.minecraft.world.item.crafting.SingleItemRecipe$Serializer$SingleItemMaker) -> <init>
     84:97:net.minecraft.world.item.crafting.SingleItemRecipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> b
     102:105:net.minecraft.world.item.crafting.SingleItemRecipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> b
@@ -49630,72 +54036,98 @@ net.minecraft.world.item.crafting.SingleItemRecipe$Serializer -> bhh$a:
     71:71:void toNetwork(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.item.crafting.Recipe) -> a
     71:71:net.minecraft.world.item.crafting.Recipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> a
     71:71:net.minecraft.world.item.crafting.Recipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
-net.minecraft.world.item.crafting.SingleItemRecipe$Serializer$SingleItemMaker -> bhh$a$a:
+net.minecraft.world.item.crafting.SingleItemRecipe$Serializer$SingleItemMaker -> bnf$a$a:
     net.minecraft.world.item.crafting.SingleItemRecipe create(net.minecraft.resources.ResourceLocation,java.lang.String,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.ItemStack) -> create
-net.minecraft.world.item.crafting.SmeltingRecipe -> bhi:
+net.minecraft.world.item.crafting.SmeltingRecipe -> bng:
     9:10:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.ItemStack,float,int) -> <init>
     14:14:net.minecraft.world.item.ItemStack getToastSymbol() -> h
-    19:19:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
-net.minecraft.world.item.crafting.SmokingRecipe -> bhj:
+    19:19:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
+net.minecraft.world.item.crafting.SmokingRecipe -> bnh:
     9:10:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.ItemStack,float,int) -> <init>
     14:14:net.minecraft.world.item.ItemStack getToastSymbol() -> h
-    19:19:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
-net.minecraft.world.item.crafting.StonecutterRecipe -> bhk:
+    19:19:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
+net.minecraft.world.item.crafting.StonecutterRecipe -> bni:
     11:12:void <init>(net.minecraft.resources.ResourceLocation,java.lang.String,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.ItemStack) -> <init>
     16:16:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
     21:21:net.minecraft.world.item.ItemStack getToastSymbol() -> h
-net.minecraft.world.item.crafting.SuspiciousStewRecipe -> bhl:
+net.minecraft.world.item.crafting.SuspiciousStewRecipe -> bnj:
     17:18:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     22:46:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
     51:71:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     76:76:boolean canCraftInDimensions(int,int) -> a
-    81:81:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    81:81:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     15:15:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     15:15:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-net.minecraft.world.item.crafting.TippedArrowRecipe -> bhm:
+net.minecraft.world.item.crafting.TippedArrowRecipe -> bnk:
     13:14:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     18:41:boolean matches(net.minecraft.world.inventory.CraftingContainer,net.minecraft.world.level.Level) -> a
     46:55:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.inventory.CraftingContainer) -> a
     60:60:boolean canCraftInDimensions(int,int) -> a
-    65:65:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> W_
+    65:65:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
     11:11:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
     11:11:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
-net.minecraft.world.item.crafting.package-info -> bhn:
-net.minecraft.world.item.enchantment.ArrowDamageEnchantment -> bho:
+net.minecraft.world.item.crafting.UpgradeRecipe -> bnl:
+    net.minecraft.world.item.crafting.Ingredient base -> a
+    net.minecraft.world.item.crafting.Ingredient addition -> b
+    net.minecraft.world.item.ItemStack result -> c
+    net.minecraft.resources.ResourceLocation id -> d
+    19:24:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.crafting.Ingredient,net.minecraft.world.item.ItemStack) -> <init>
+    28:28:boolean matches(net.minecraft.world.Container,net.minecraft.world.level.Level) -> a
+    33:38:net.minecraft.world.item.ItemStack assemble(net.minecraft.world.Container) -> a
+    43:43:boolean canCraftInDimensions(int,int) -> a
+    48:48:net.minecraft.world.item.ItemStack getResultItem() -> c
+    52:52:boolean isAdditionIngredient(net.minecraft.world.item.ItemStack) -> a
+    57:57:net.minecraft.world.item.ItemStack getToastSymbol() -> h
+    62:62:net.minecraft.resources.ResourceLocation getId() -> f
+    67:67:net.minecraft.world.item.crafting.RecipeSerializer getSerializer() -> ai_
+    72:72:net.minecraft.world.item.crafting.RecipeType getType() -> g
+    13:13:net.minecraft.world.item.crafting.Ingredient access$000(net.minecraft.world.item.crafting.UpgradeRecipe) -> a
+    13:13:net.minecraft.world.item.crafting.Ingredient access$100(net.minecraft.world.item.crafting.UpgradeRecipe) -> b
+    13:13:net.minecraft.world.item.ItemStack access$200(net.minecraft.world.item.crafting.UpgradeRecipe) -> c
+net.minecraft.world.item.crafting.UpgradeRecipe$Serializer -> bnl$a:
+    75:75:void <init>() -> <init>
+    78:81:net.minecraft.world.item.crafting.UpgradeRecipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> b
+    86:89:net.minecraft.world.item.crafting.UpgradeRecipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> b
+    94:97:void toNetwork(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.item.crafting.UpgradeRecipe) -> a
+    75:75:void toNetwork(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.item.crafting.Recipe) -> a
+    75:75:net.minecraft.world.item.crafting.Recipe fromNetwork(net.minecraft.resources.ResourceLocation,net.minecraft.network.FriendlyByteBuf) -> a
+    75:75:net.minecraft.world.item.crafting.Recipe fromJson(net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
+net.minecraft.world.item.crafting.package-info -> bnm:
+net.minecraft.world.item.enchantment.ArrowDamageEnchantment -> bnn:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
-net.minecraft.world.item.enchantment.ArrowFireEnchantment -> bhp:
+net.minecraft.world.item.enchantment.ArrowFireEnchantment -> bno:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
-net.minecraft.world.item.enchantment.ArrowInfiniteEnchantment -> bhq:
+net.minecraft.world.item.enchantment.ArrowInfiniteEnchantment -> bnp:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:30:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.ArrowKnockbackEnchantment -> bhr:
+net.minecraft.world.item.enchantment.ArrowKnockbackEnchantment -> bnq:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
-net.minecraft.world.item.enchantment.ArrowPiercingEnchantment -> bhs:
+net.minecraft.world.item.enchantment.ArrowPiercingEnchantment -> bnr:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:27:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.BindingCurseEnchantment -> bht:
+net.minecraft.world.item.enchantment.BindingCurseEnchantment -> bns:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:27:boolean isTreasureOnly() -> b
     32:32:boolean isCurse() -> c
-net.minecraft.world.item.enchantment.DamageEnchantment -> bhu:
+net.minecraft.world.item.enchantment.DamageEnchantment -> bnt:
     java.lang.String[] NAMES -> d
     int[] MIN_COST -> e
     int[] LEVEL_COST -> f
@@ -49710,25 +54142,25 @@ net.minecraft.world.item.enchantment.DamageEnchantment -> bhu:
     77:80:boolean canEnchant(net.minecraft.world.item.ItemStack) -> a
     85:93:void doPostAttack(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity,int) -> a
     18:30:void <clinit>() -> <clinit>
-net.minecraft.world.item.enchantment.DigDurabilityEnchantment -> bhv:
+net.minecraft.world.item.enchantment.DigDurabilityEnchantment -> bnu:
     11:12:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     16:16:int getMinCost(int) -> a
     21:21:int getMaxCost(int) -> b
     26:26:int getMaxLevel() -> a
     31:34:boolean canEnchant(net.minecraft.world.item.ItemStack) -> a
     38:41:boolean shouldIgnoreDurabilityDrop(net.minecraft.world.item.ItemStack,int,java.util.Random) -> a
-net.minecraft.world.item.enchantment.DiggingEnchantment -> bhw:
+net.minecraft.world.item.enchantment.DiggingEnchantment -> bnv:
     9:10:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     14:14:int getMinCost(int) -> a
     19:19:int getMaxCost(int) -> b
     24:24:int getMaxLevel() -> a
     29:32:boolean canEnchant(net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.item.enchantment.Enchantment -> bhx:
+net.minecraft.world.item.enchantment.Enchantment -> bnw:
     net.minecraft.world.entity.EquipmentSlot[] slots -> a
     net.minecraft.world.item.enchantment.Enchantment$Rarity rarity -> d
     net.minecraft.world.item.enchantment.EnchantmentCategory category -> b
     java.lang.String descriptionId -> c
-    24:24:net.minecraft.world.item.enchantment.Enchantment byId(int) -> c
+    25:25:net.minecraft.world.item.enchantment.Enchantment byId(int) -> c
     51:55:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.item.enchantment.EnchantmentCategory,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     58:65:java.util.Map getSlotItems(net.minecraft.world.entity.LivingEntity) -> a
     69:69:net.minecraft.world.item.enchantment.Enchantment$Rarity getRarity() -> d
@@ -49748,132 +54180,137 @@ net.minecraft.world.item.enchantment.Enchantment -> bhx:
     136:136:void doPostHurt(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity,int) -> b
     139:139:boolean isTreasureOnly() -> b
     143:143:boolean isCurse() -> c
-net.minecraft.world.item.enchantment.Enchantment$Rarity -> bhx$a:
+    146:146:boolean isTradeable() -> h
+    154:154:boolean isDiscoverable() -> i
+net.minecraft.world.item.enchantment.Enchantment$Rarity -> bnw$a:
     net.minecraft.world.item.enchantment.Enchantment$Rarity COMMON -> a
     net.minecraft.world.item.enchantment.Enchantment$Rarity UNCOMMON -> b
     net.minecraft.world.item.enchantment.Enchantment$Rarity RARE -> c
     net.minecraft.world.item.enchantment.Enchantment$Rarity VERY_RARE -> d
     int weight -> e
     net.minecraft.world.item.enchantment.Enchantment$Rarity[] $VALUES -> f
-    27:27:net.minecraft.world.item.enchantment.Enchantment$Rarity[] values() -> values
-    27:27:net.minecraft.world.item.enchantment.Enchantment$Rarity valueOf(java.lang.String) -> valueOf
-    35:37:void <init>(java.lang.String,int,int) -> <init>
-    40:40:int getWeight() -> a
-    27:31:void <clinit>() -> <clinit>
-net.minecraft.world.item.enchantment.EnchantmentCategory -> bhy:
-    net.minecraft.world.item.enchantment.EnchantmentCategory ALL -> a
-    net.minecraft.world.item.enchantment.EnchantmentCategory ARMOR -> b
-    net.minecraft.world.item.enchantment.EnchantmentCategory ARMOR_FEET -> c
-    net.minecraft.world.item.enchantment.EnchantmentCategory ARMOR_LEGS -> d
-    net.minecraft.world.item.enchantment.EnchantmentCategory ARMOR_CHEST -> e
-    net.minecraft.world.item.enchantment.EnchantmentCategory ARMOR_HEAD -> f
-    net.minecraft.world.item.enchantment.EnchantmentCategory WEAPON -> g
-    net.minecraft.world.item.enchantment.EnchantmentCategory DIGGER -> h
-    net.minecraft.world.item.enchantment.EnchantmentCategory FISHING_ROD -> i
-    net.minecraft.world.item.enchantment.EnchantmentCategory TRIDENT -> j
-    net.minecraft.world.item.enchantment.EnchantmentCategory BREAKABLE -> k
-    net.minecraft.world.item.enchantment.EnchantmentCategory BOW -> l
-    net.minecraft.world.item.enchantment.EnchantmentCategory WEARABLE -> m
-    net.minecraft.world.item.enchantment.EnchantmentCategory CROSSBOW -> n
+    28:28:net.minecraft.world.item.enchantment.Enchantment$Rarity[] values() -> values
+    28:28:net.minecraft.world.item.enchantment.Enchantment$Rarity valueOf(java.lang.String) -> valueOf
+    36:38:void <init>(java.lang.String,int,int) -> <init>
+    41:41:int getWeight() -> a
+    28:32:void <clinit>() -> <clinit>
+net.minecraft.world.item.enchantment.EnchantmentCategory -> bnx:
+    net.minecraft.world.item.enchantment.EnchantmentCategory ARMOR -> a
+    net.minecraft.world.item.enchantment.EnchantmentCategory ARMOR_FEET -> b
+    net.minecraft.world.item.enchantment.EnchantmentCategory ARMOR_LEGS -> c
+    net.minecraft.world.item.enchantment.EnchantmentCategory ARMOR_CHEST -> d
+    net.minecraft.world.item.enchantment.EnchantmentCategory ARMOR_HEAD -> e
+    net.minecraft.world.item.enchantment.EnchantmentCategory WEAPON -> f
+    net.minecraft.world.item.enchantment.EnchantmentCategory DIGGER -> g
+    net.minecraft.world.item.enchantment.EnchantmentCategory FISHING_ROD -> h
+    net.minecraft.world.item.enchantment.EnchantmentCategory TRIDENT -> i
+    net.minecraft.world.item.enchantment.EnchantmentCategory BREAKABLE -> j
+    net.minecraft.world.item.enchantment.EnchantmentCategory BOW -> k
+    net.minecraft.world.item.enchantment.EnchantmentCategory WEARABLE -> l
+    net.minecraft.world.item.enchantment.EnchantmentCategory CROSSBOW -> m
+    net.minecraft.world.item.enchantment.EnchantmentCategory VANISHABLE -> n
     net.minecraft.world.item.enchantment.EnchantmentCategory[] $VALUES -> o
-    17:17:net.minecraft.world.item.enchantment.EnchantmentCategory[] values() -> values
-    17:17:net.minecraft.world.item.enchantment.EnchantmentCategory valueOf(java.lang.String) -> valueOf
-    17:17:void <init>(java.lang.String,int) -> <init>
+    16:16:net.minecraft.world.item.enchantment.EnchantmentCategory[] values() -> values
+    16:16:net.minecraft.world.item.enchantment.EnchantmentCategory valueOf(java.lang.String) -> valueOf
+    16:16:void <init>(java.lang.String,int) -> <init>
     boolean canEnchant(net.minecraft.world.item.Item) -> a
-    17:17:void <init>(java.lang.String,int,net.minecraft.world.item.enchantment.EnchantmentCategory$1) -> <init>
-    17:109:void <clinit>() -> <clinit>
-net.minecraft.world.item.enchantment.EnchantmentCategory$1 -> bhy$1:
-    18:18:void <init>(java.lang.String,int) -> <init>
-    21:31:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$10 -> bhy$2:
-    84:84:void <init>(java.lang.String,int) -> <init>
-    87:87:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$11 -> bhy$3:
-    90:90:void <init>(java.lang.String,int) -> <init>
-    93:93:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$12 -> bhy$4:
-    96:96:void <init>(java.lang.String,int) -> <init>
-    99:99:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$13 -> bhy$5:
-    102:102:void <init>(java.lang.String,int) -> <init>
-    105:106:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$14 -> bhy$6:
-    109:109:void <init>(java.lang.String,int) -> <init>
-    112:112:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$2 -> bhy$7:
+    16:16:void <init>(java.lang.String,int,net.minecraft.world.item.enchantment.EnchantmentCategory$1) -> <init>
+    16:95:void <clinit>() -> <clinit>
+net.minecraft.world.item.enchantment.EnchantmentCategory$1 -> bnx$1:
+    17:17:void <init>(java.lang.String,int) -> <init>
+    20:20:boolean canEnchant(net.minecraft.world.item.Item) -> a
+net.minecraft.world.item.enchantment.EnchantmentCategory$10 -> bnx$2:
+    71:71:void <init>(java.lang.String,int) -> <init>
+    74:74:boolean canEnchant(net.minecraft.world.item.Item) -> a
+net.minecraft.world.item.enchantment.EnchantmentCategory$11 -> bnx$3:
+    77:77:void <init>(java.lang.String,int) -> <init>
+    80:80:boolean canEnchant(net.minecraft.world.item.Item) -> a
+net.minecraft.world.item.enchantment.EnchantmentCategory$12 -> bnx$4:
+    83:83:void <init>(java.lang.String,int) -> <init>
+    86:86:boolean canEnchant(net.minecraft.world.item.Item) -> a
+net.minecraft.world.item.enchantment.EnchantmentCategory$13 -> bnx$5:
+    89:89:void <init>(java.lang.String,int) -> <init>
+    92:92:boolean canEnchant(net.minecraft.world.item.Item) -> a
+net.minecraft.world.item.enchantment.EnchantmentCategory$14 -> bnx$6:
+    95:95:void <init>(java.lang.String,int) -> <init>
+    98:98:boolean canEnchant(net.minecraft.world.item.Item) -> a
+net.minecraft.world.item.enchantment.EnchantmentCategory$2 -> bnx$7:
+    23:23:void <init>(java.lang.String,int) -> <init>
+    26:26:boolean canEnchant(net.minecraft.world.item.Item) -> a
+net.minecraft.world.item.enchantment.EnchantmentCategory$3 -> bnx$8:
+    29:29:void <init>(java.lang.String,int) -> <init>
+    32:32:boolean canEnchant(net.minecraft.world.item.Item) -> a
+net.minecraft.world.item.enchantment.EnchantmentCategory$4 -> bnx$9:
     35:35:void <init>(java.lang.String,int) -> <init>
     38:38:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$3 -> bhy$8:
+net.minecraft.world.item.enchantment.EnchantmentCategory$5 -> bnx$10:
     41:41:void <init>(java.lang.String,int) -> <init>
     44:44:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$4 -> bhy$9:
+net.minecraft.world.item.enchantment.EnchantmentCategory$6 -> bnx$11:
     47:47:void <init>(java.lang.String,int) -> <init>
     50:50:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$5 -> bhy$10:
+net.minecraft.world.item.enchantment.EnchantmentCategory$7 -> bnx$12:
     53:53:void <init>(java.lang.String,int) -> <init>
     56:56:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$6 -> bhy$11:
+net.minecraft.world.item.enchantment.EnchantmentCategory$8 -> bnx$13:
     59:59:void <init>(java.lang.String,int) -> <init>
     62:62:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$7 -> bhy$12:
-    66:66:void <init>(java.lang.String,int) -> <init>
-    69:69:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$8 -> bhy$13:
-    72:72:void <init>(java.lang.String,int) -> <init>
-    75:75:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentCategory$9 -> bhy$14:
-    78:78:void <init>(java.lang.String,int) -> <init>
-    81:81:boolean canEnchant(net.minecraft.world.item.Item) -> a
-net.minecraft.world.item.enchantment.EnchantmentHelper -> bhz:
-    32:32:void <init>() -> <init>
-    34:49:int getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.item.ItemStack) -> a
-    53:54:java.util.Map getEnchantments(net.minecraft.world.item.ItemStack) -> a
-    58:66:java.util.Map deserializeEnchantments(net.minecraft.nbt.ListTag) -> a
-    70:95:void setEnchantments(java.util.Map,net.minecraft.world.item.ItemStack) -> a
-    103:115:void runIterationOnItem(net.minecraft.world.item.enchantment.EnchantmentHelper$EnchantmentVisitor,net.minecraft.world.item.ItemStack) -> a
-    118:121:void runIterationOnInventory(net.minecraft.world.item.enchantment.EnchantmentHelper$EnchantmentVisitor,java.lang.Iterable) -> a
-    124:126:int getDamageProtection(java.lang.Iterable,net.minecraft.world.damagesource.DamageSource) -> a
-    130:132:float getDamageBonus(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.MobType) -> a
-    136:140:float getSweepingDamageRatio(net.minecraft.world.entity.LivingEntity) -> a
-    144:151:void doPostHurtEffects(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity) -> a
-    154:161:void doPostDamageEffects(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity) -> b
-    164:175:int getEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.entity.LivingEntity) -> a
-    179:179:int getKnockbackBonus(net.minecraft.world.entity.LivingEntity) -> b
-    183:183:int getFireAspect(net.minecraft.world.entity.LivingEntity) -> c
-    187:187:int getRespiration(net.minecraft.world.entity.LivingEntity) -> d
-    191:191:int getDepthStrider(net.minecraft.world.entity.LivingEntity) -> e
-    195:195:int getBlockEfficiency(net.minecraft.world.entity.LivingEntity) -> f
-    199:199:int getFishingLuckBonus(net.minecraft.world.item.ItemStack) -> b
-    203:203:int getFishingSpeedBonus(net.minecraft.world.item.ItemStack) -> c
-    207:207:int getMobLooting(net.minecraft.world.entity.LivingEntity) -> g
-    211:211:boolean hasAquaAffinity(net.minecraft.world.entity.LivingEntity) -> h
-    215:215:boolean hasFrostWalker(net.minecraft.world.entity.LivingEntity) -> i
-    219:219:boolean hasBindingCurse(net.minecraft.world.item.ItemStack) -> d
-    223:223:boolean hasVanishingCurse(net.minecraft.world.item.ItemStack) -> e
-    227:227:int getLoyalty(net.minecraft.world.item.ItemStack) -> f
-    231:231:int getRiptide(net.minecraft.world.item.ItemStack) -> g
-    235:235:boolean hasChanneling(net.minecraft.world.item.ItemStack) -> h
-    240:252:java.util.Map$Entry getRandomItemWith(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.entity.LivingEntity) -> b
-    263:281:int getEnchantmentCost(java.util.Random,int,int,net.minecraft.world.item.ItemStack) -> a
-    285:300:net.minecraft.world.item.ItemStack enchantItem(java.util.Random,net.minecraft.world.item.ItemStack,int,boolean) -> a
-    311:342:java.util.List selectEnchantment(java.util.Random,net.minecraft.world.item.ItemStack,int,boolean) -> b
-    346:352:void filterCompatibleEnchantments(java.util.List,net.minecraft.world.item.enchantment.EnchantmentInstance) -> a
-    355:360:boolean isEnchantmentCompatible(java.util.Collection,net.minecraft.world.item.enchantment.Enchantment) -> a
-    364:385:java.util.List getAvailableEnchantmentResults(int,net.minecraft.world.item.ItemStack,boolean) -> a
-    154:154:void lambda$doPostDamageEffects$5(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity,net.minecraft.world.item.enchantment.Enchantment,int) -> a
-    144:144:void lambda$doPostHurtEffects$4(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity,net.minecraft.world.item.enchantment.Enchantment,int) -> b
-    131:131:void lambda$getDamageBonus$3(org.apache.commons.lang3.mutable.MutableFloat,net.minecraft.world.entity.MobType,net.minecraft.world.item.enchantment.Enchantment,int) -> a
-    125:125:void lambda$getDamageProtection$2(org.apache.commons.lang3.mutable.MutableInt,net.minecraft.world.damagesource.DamageSource,net.minecraft.world.item.enchantment.Enchantment,int) -> a
-    113:113:void lambda$runIterationOnItem$1(net.minecraft.world.item.enchantment.EnchantmentHelper$EnchantmentVisitor,int,net.minecraft.world.item.enchantment.Enchantment) -> a
-    63:63:void lambda$deserializeEnchantments$0(java.util.Map,net.minecraft.nbt.CompoundTag,net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.EnchantmentHelper$EnchantmentVisitor -> bhz$a:
+net.minecraft.world.item.enchantment.EnchantmentCategory$9 -> bnx$14:
+    65:65:void <init>(java.lang.String,int) -> <init>
+    68:68:boolean canEnchant(net.minecraft.world.item.Item) -> a
+net.minecraft.world.item.enchantment.EnchantmentHelper -> bny:
+    33:33:void <init>() -> <init>
+    35:50:int getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.item.ItemStack) -> a
+    54:55:java.util.Map getEnchantments(net.minecraft.world.item.ItemStack) -> a
+    59:67:java.util.Map deserializeEnchantments(net.minecraft.nbt.ListTag) -> a
+    71:96:void setEnchantments(java.util.Map,net.minecraft.world.item.ItemStack) -> a
+    104:116:void runIterationOnItem(net.minecraft.world.item.enchantment.EnchantmentHelper$EnchantmentVisitor,net.minecraft.world.item.ItemStack) -> a
+    119:122:void runIterationOnInventory(net.minecraft.world.item.enchantment.EnchantmentHelper$EnchantmentVisitor,java.lang.Iterable) -> a
+    125:127:int getDamageProtection(java.lang.Iterable,net.minecraft.world.damagesource.DamageSource) -> a
+    131:133:float getDamageBonus(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.MobType) -> a
+    137:141:float getSweepingDamageRatio(net.minecraft.world.entity.LivingEntity) -> a
+    145:152:void doPostHurtEffects(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity) -> a
+    155:162:void doPostDamageEffects(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity) -> b
+    165:176:int getEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.entity.LivingEntity) -> a
+    180:180:int getKnockbackBonus(net.minecraft.world.entity.LivingEntity) -> b
+    184:184:int getFireAspect(net.minecraft.world.entity.LivingEntity) -> c
+    188:188:int getRespiration(net.minecraft.world.entity.LivingEntity) -> d
+    192:192:int getDepthStrider(net.minecraft.world.entity.LivingEntity) -> e
+    196:196:int getBlockEfficiency(net.minecraft.world.entity.LivingEntity) -> f
+    200:200:int getFishingLuckBonus(net.minecraft.world.item.ItemStack) -> b
+    204:204:int getFishingSpeedBonus(net.minecraft.world.item.ItemStack) -> c
+    208:208:int getMobLooting(net.minecraft.world.entity.LivingEntity) -> g
+    212:212:boolean hasAquaAffinity(net.minecraft.world.entity.LivingEntity) -> h
+    216:216:boolean hasFrostWalker(net.minecraft.world.entity.LivingEntity) -> i
+    220:220:boolean hasSoulSpeed(net.minecraft.world.entity.LivingEntity) -> j
+    224:224:boolean hasBindingCurse(net.minecraft.world.item.ItemStack) -> d
+    228:228:boolean hasVanishingCurse(net.minecraft.world.item.ItemStack) -> e
+    232:232:int getLoyalty(net.minecraft.world.item.ItemStack) -> f
+    236:236:int getRiptide(net.minecraft.world.item.ItemStack) -> g
+    240:240:boolean hasChanneling(net.minecraft.world.item.ItemStack) -> h
+    245:245:java.util.Map$Entry getRandomItemWith(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.entity.LivingEntity) -> b
+    250:262:java.util.Map$Entry getRandomItemWith(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.entity.LivingEntity,java.util.function.Predicate) -> a
+    273:291:int getEnchantmentCost(java.util.Random,int,int,net.minecraft.world.item.ItemStack) -> a
+    295:310:net.minecraft.world.item.ItemStack enchantItem(java.util.Random,net.minecraft.world.item.ItemStack,int,boolean) -> a
+    321:352:java.util.List selectEnchantment(java.util.Random,net.minecraft.world.item.ItemStack,int,boolean) -> b
+    356:362:void filterCompatibleEnchantments(java.util.List,net.minecraft.world.item.enchantment.EnchantmentInstance) -> a
+    365:370:boolean isEnchantmentCompatible(java.util.Collection,net.minecraft.world.item.enchantment.Enchantment) -> a
+    374:398:java.util.List getAvailableEnchantmentResults(int,net.minecraft.world.item.ItemStack,boolean) -> a
+    245:245:boolean lambda$getRandomItemWith$6(net.minecraft.world.item.ItemStack) -> i
+    155:155:void lambda$doPostDamageEffects$5(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity,net.minecraft.world.item.enchantment.Enchantment,int) -> a
+    145:145:void lambda$doPostHurtEffects$4(net.minecraft.world.entity.LivingEntity,net.minecraft.world.entity.Entity,net.minecraft.world.item.enchantment.Enchantment,int) -> b
+    132:132:void lambda$getDamageBonus$3(org.apache.commons.lang3.mutable.MutableFloat,net.minecraft.world.entity.MobType,net.minecraft.world.item.enchantment.Enchantment,int) -> a
+    126:126:void lambda$getDamageProtection$2(org.apache.commons.lang3.mutable.MutableInt,net.minecraft.world.damagesource.DamageSource,net.minecraft.world.item.enchantment.Enchantment,int) -> a
+    114:114:void lambda$runIterationOnItem$1(net.minecraft.world.item.enchantment.EnchantmentHelper$EnchantmentVisitor,int,net.minecraft.world.item.enchantment.Enchantment) -> a
+    64:64:void lambda$deserializeEnchantments$0(java.util.Map,net.minecraft.nbt.CompoundTag,net.minecraft.world.item.enchantment.Enchantment) -> a
+net.minecraft.world.item.enchantment.EnchantmentHelper$EnchantmentVisitor -> bny$a:
     void accept(net.minecraft.world.item.enchantment.Enchantment,int) -> accept
-net.minecraft.world.item.enchantment.EnchantmentInstance -> bia:
+net.minecraft.world.item.enchantment.EnchantmentInstance -> bnz:
     net.minecraft.world.item.enchantment.Enchantment enchantment -> b
     int level -> c
     10:13:void <init>(net.minecraft.world.item.enchantment.Enchantment,int) -> <init>
-net.minecraft.world.item.enchantment.Enchantments -> bib:
-    net.minecraft.world.entity.EquipmentSlot[] ARMOR_SLOTS -> L
+net.minecraft.world.item.enchantment.Enchantments -> boa:
+    net.minecraft.world.entity.EquipmentSlot[] ARMOR_SLOTS -> M
     net.minecraft.world.item.enchantment.Enchantment ALL_DAMAGE_PROTECTION -> a
     net.minecraft.world.item.enchantment.Enchantment FIRE_PROTECTION -> b
     net.minecraft.world.item.enchantment.Enchantment FALL_PROTECTION -> c
@@ -49885,46 +54322,47 @@ net.minecraft.world.item.enchantment.Enchantments -> bib:
     net.minecraft.world.item.enchantment.Enchantment DEPTH_STRIDER -> i
     net.minecraft.world.item.enchantment.Enchantment FROST_WALKER -> j
     net.minecraft.world.item.enchantment.Enchantment BINDING_CURSE -> k
-    net.minecraft.world.item.enchantment.Enchantment SHARPNESS -> l
-    net.minecraft.world.item.enchantment.Enchantment SMITE -> m
-    net.minecraft.world.item.enchantment.Enchantment BANE_OF_ARTHROPODS -> n
-    net.minecraft.world.item.enchantment.Enchantment KNOCKBACK -> o
-    net.minecraft.world.item.enchantment.Enchantment FIRE_ASPECT -> p
-    net.minecraft.world.item.enchantment.Enchantment MOB_LOOTING -> q
-    net.minecraft.world.item.enchantment.Enchantment SWEEPING_EDGE -> r
-    net.minecraft.world.item.enchantment.Enchantment BLOCK_EFFICIENCY -> s
-    net.minecraft.world.item.enchantment.Enchantment SILK_TOUCH -> t
-    net.minecraft.world.item.enchantment.Enchantment UNBREAKING -> u
-    net.minecraft.world.item.enchantment.Enchantment BLOCK_FORTUNE -> v
-    net.minecraft.world.item.enchantment.Enchantment POWER_ARROWS -> w
-    net.minecraft.world.item.enchantment.Enchantment PUNCH_ARROWS -> x
-    net.minecraft.world.item.enchantment.Enchantment FLAMING_ARROWS -> y
-    net.minecraft.world.item.enchantment.Enchantment INFINITY_ARROWS -> z
-    net.minecraft.world.item.enchantment.Enchantment FISHING_LUCK -> A
-    net.minecraft.world.item.enchantment.Enchantment FISHING_SPEED -> B
-    net.minecraft.world.item.enchantment.Enchantment LOYALTY -> C
-    net.minecraft.world.item.enchantment.Enchantment IMPALING -> D
-    net.minecraft.world.item.enchantment.Enchantment RIPTIDE -> E
-    net.minecraft.world.item.enchantment.Enchantment CHANNELING -> F
-    net.minecraft.world.item.enchantment.Enchantment MULTISHOT -> G
-    net.minecraft.world.item.enchantment.Enchantment QUICK_CHARGE -> H
-    net.minecraft.world.item.enchantment.Enchantment PIERCING -> I
-    net.minecraft.world.item.enchantment.Enchantment MENDING -> J
-    net.minecraft.world.item.enchantment.Enchantment VANISHING_CURSE -> K
+    net.minecraft.world.item.enchantment.Enchantment SOUL_SPEED -> l
+    net.minecraft.world.item.enchantment.Enchantment SHARPNESS -> m
+    net.minecraft.world.item.enchantment.Enchantment SMITE -> n
+    net.minecraft.world.item.enchantment.Enchantment BANE_OF_ARTHROPODS -> o
+    net.minecraft.world.item.enchantment.Enchantment KNOCKBACK -> p
+    net.minecraft.world.item.enchantment.Enchantment FIRE_ASPECT -> q
+    net.minecraft.world.item.enchantment.Enchantment MOB_LOOTING -> r
+    net.minecraft.world.item.enchantment.Enchantment SWEEPING_EDGE -> s
+    net.minecraft.world.item.enchantment.Enchantment BLOCK_EFFICIENCY -> t
+    net.minecraft.world.item.enchantment.Enchantment SILK_TOUCH -> u
+    net.minecraft.world.item.enchantment.Enchantment UNBREAKING -> v
+    net.minecraft.world.item.enchantment.Enchantment BLOCK_FORTUNE -> w
+    net.minecraft.world.item.enchantment.Enchantment POWER_ARROWS -> x
+    net.minecraft.world.item.enchantment.Enchantment PUNCH_ARROWS -> y
+    net.minecraft.world.item.enchantment.Enchantment FLAMING_ARROWS -> z
+    net.minecraft.world.item.enchantment.Enchantment INFINITY_ARROWS -> A
+    net.minecraft.world.item.enchantment.Enchantment FISHING_LUCK -> B
+    net.minecraft.world.item.enchantment.Enchantment FISHING_SPEED -> C
+    net.minecraft.world.item.enchantment.Enchantment LOYALTY -> D
+    net.minecraft.world.item.enchantment.Enchantment IMPALING -> E
+    net.minecraft.world.item.enchantment.Enchantment RIPTIDE -> F
+    net.minecraft.world.item.enchantment.Enchantment CHANNELING -> G
+    net.minecraft.world.item.enchantment.Enchantment MULTISHOT -> H
+    net.minecraft.world.item.enchantment.Enchantment QUICK_CHARGE -> I
+    net.minecraft.world.item.enchantment.Enchantment PIERCING -> J
+    net.minecraft.world.item.enchantment.Enchantment MENDING -> K
+    net.minecraft.world.item.enchantment.Enchantment VANISHING_CURSE -> L
     6:6:void <init>() -> <init>
-    68:68:net.minecraft.world.item.enchantment.Enchantment register(java.lang.String,net.minecraft.world.item.enchantment.Enchantment) -> a
-    7:65:void <clinit>() -> <clinit>
-net.minecraft.world.item.enchantment.FireAspectEnchantment -> bic:
+    69:69:net.minecraft.world.item.enchantment.Enchantment register(java.lang.String,net.minecraft.world.item.enchantment.Enchantment) -> a
+    7:66:void <clinit>() -> <clinit>
+net.minecraft.world.item.enchantment.FireAspectEnchantment -> bob:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
-net.minecraft.world.item.enchantment.FishingSpeedEnchantment -> bid:
+net.minecraft.world.item.enchantment.FishingSpeedEnchantment -> boc:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.item.enchantment.EnchantmentCategory,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
-net.minecraft.world.item.enchantment.FrostWalkerEnchantment -> bie:
+net.minecraft.world.item.enchantment.FrostWalkerEnchantment -> bod:
     17:18:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     22:22:int getMinCost(int) -> a
     27:27:int getMaxCost(int) -> b
@@ -49932,45 +54370,45 @@ net.minecraft.world.item.enchantment.FrostWalkerEnchantment -> bie:
     37:37:int getMaxLevel() -> a
     41:65:void onEntityMoved(net.minecraft.world.entity.LivingEntity,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int) -> a
     69:69:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.KnockbackEnchantment -> bif:
+net.minecraft.world.item.enchantment.KnockbackEnchantment -> boe:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
-net.minecraft.world.item.enchantment.LootBonusEnchantment -> big:
+net.minecraft.world.item.enchantment.LootBonusEnchantment -> bof:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.item.enchantment.EnchantmentCategory,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:27:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.MendingEnchantment -> bih:
+net.minecraft.world.item.enchantment.MendingEnchantment -> bog:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:boolean isTreasureOnly() -> b
     27:27:int getMaxLevel() -> a
-net.minecraft.world.item.enchantment.MultiShotEnchantment -> bii:
+net.minecraft.world.item.enchantment.MultiShotEnchantment -> boh:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:27:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.OxygenEnchantment -> bij:
+net.minecraft.world.item.enchantment.OxygenEnchantment -> boi:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
-net.minecraft.world.item.enchantment.ProtectionEnchantment -> bik:
+net.minecraft.world.item.enchantment.ProtectionEnchantment -> boj:
     net.minecraft.world.item.enchantment.ProtectionEnchantment$Type type -> a
-    42:48:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.item.enchantment.ProtectionEnchantment$Type,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
-    52:52:int getMinCost(int) -> a
-    57:57:int getMaxCost(int) -> b
-    62:62:int getMaxLevel() -> a
-    67:86:int getDamageProtection(int,net.minecraft.world.damagesource.DamageSource) -> a
-    91:100:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-    104:110:int getFireAfterDampener(net.minecraft.world.entity.LivingEntity,int) -> a
-    114:120:double getExplosionKnockbackAfterDampener(net.minecraft.world.entity.LivingEntity,double) -> a
-net.minecraft.world.item.enchantment.ProtectionEnchantment$Type -> bik$a:
+    42:44:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.item.enchantment.ProtectionEnchantment$Type,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
+    48:48:int getMinCost(int) -> a
+    53:53:int getMaxCost(int) -> b
+    58:58:int getMaxLevel() -> a
+    63:82:int getDamageProtection(int,net.minecraft.world.damagesource.DamageSource) -> a
+    87:96:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
+    100:106:int getFireAfterDampener(net.minecraft.world.entity.LivingEntity,int) -> a
+    110:116:double getExplosionKnockbackAfterDampener(net.minecraft.world.entity.LivingEntity,double) -> a
+net.minecraft.world.item.enchantment.ProtectionEnchantment$Type -> boj$a:
     net.minecraft.world.item.enchantment.ProtectionEnchantment$Type ALL -> a
     net.minecraft.world.item.enchantment.ProtectionEnchantment$Type FIRE -> b
     net.minecraft.world.item.enchantment.ProtectionEnchantment$Type FALL -> c
@@ -49987,18 +54425,26 @@ net.minecraft.world.item.enchantment.ProtectionEnchantment$Type -> bik$a:
     31:31:int getMinCost() -> b
     35:35:int getLevelCost() -> c
     9:14:void <clinit>() -> <clinit>
-net.minecraft.world.item.enchantment.QuickChargeEnchantment -> bil:
+net.minecraft.world.item.enchantment.QuickChargeEnchantment -> bok:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
-net.minecraft.world.item.enchantment.SweepingEdgeEnchantment -> bim:
+net.minecraft.world.item.enchantment.SoulSpeedEnchantment -> bol:
+    7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
+    12:12:int getMinCost(int) -> a
+    17:17:int getMaxCost(int) -> b
+    22:22:boolean isTreasureOnly() -> b
+    27:27:boolean isTradeable() -> h
+    32:32:boolean isDiscoverable() -> i
+    37:37:int getMaxLevel() -> a
+net.minecraft.world.item.enchantment.SweepingEdgeEnchantment -> bom:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     26:26:float getSweepingDamageRatio(int) -> e
-net.minecraft.world.item.enchantment.ThornsEnchantment -> bin:
+net.minecraft.world.item.enchantment.ThornsEnchantment -> bon:
     17:18:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     22:22:int getMinCost(int) -> a
     27:27:int getMaxCost(int) -> b
@@ -50009,72 +54455,72 @@ net.minecraft.world.item.enchantment.ThornsEnchantment -> bin:
     71:74:int getDamage(int,java.util.Random) -> b
     58:58:void lambda$doPostHurt$1(java.util.Map$Entry,net.minecraft.world.entity.LivingEntity) -> a
     54:54:void lambda$doPostHurt$0(java.util.Map$Entry,net.minecraft.world.entity.LivingEntity) -> b
-net.minecraft.world.item.enchantment.TridentChannelingEnchantment -> bio:
+net.minecraft.world.item.enchantment.TridentChannelingEnchantment -> boo:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:27:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.TridentImpalerEnchantment -> bip:
+net.minecraft.world.item.enchantment.TridentImpalerEnchantment -> bop:
     8:9:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     13:13:int getMinCost(int) -> a
     18:18:int getMaxCost(int) -> b
     23:23:int getMaxLevel() -> a
     28:31:float getDamageBonus(int,net.minecraft.world.entity.MobType) -> a
-net.minecraft.world.item.enchantment.TridentLoyaltyEnchantment -> biq:
+net.minecraft.world.item.enchantment.TridentLoyaltyEnchantment -> boq:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:27:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.TridentRiptideEnchantment -> bir:
+net.minecraft.world.item.enchantment.TridentRiptideEnchantment -> bor:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:27:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.UntouchingEnchantment -> bis:
+net.minecraft.world.item.enchantment.UntouchingEnchantment -> bos:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:27:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.VanishingCurseEnchantment -> bit:
+net.minecraft.world.item.enchantment.VanishingCurseEnchantment -> bot:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:27:boolean isTreasureOnly() -> b
     32:32:boolean isCurse() -> c
-net.minecraft.world.item.enchantment.WaterWalkerEnchantment -> biu:
+net.minecraft.world.item.enchantment.WaterWalkerEnchantment -> bou:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
     27:27:boolean checkCompatibility(net.minecraft.world.item.enchantment.Enchantment) -> a
-net.minecraft.world.item.enchantment.WaterWorkerEnchantment -> biv:
+net.minecraft.world.item.enchantment.WaterWorkerEnchantment -> bov:
     7:8:void <init>(net.minecraft.world.item.enchantment.Enchantment$Rarity,net.minecraft.world.entity.EquipmentSlot[]) -> <init>
     12:12:int getMinCost(int) -> a
     17:17:int getMaxCost(int) -> b
     22:22:int getMaxLevel() -> a
-net.minecraft.world.item.enchantment.package-info -> biw:
-net.minecraft.world.item.package-info -> bix:
-net.minecraft.world.item.trading.Merchant -> biy:
-    void setTradingPlayer(net.minecraft.world.entity.player.Player) -> e
-    net.minecraft.world.entity.player.Player getTradingPlayer() -> es
-    net.minecraft.world.item.trading.MerchantOffers getOffers() -> eu
+net.minecraft.world.item.enchantment.package-info -> bow:
+net.minecraft.world.item.package-info -> box:
+net.minecraft.world.item.trading.Merchant -> boy:
+    void setTradingPlayer(net.minecraft.world.entity.player.Player) -> f
+    net.minecraft.world.entity.player.Player getTradingPlayer() -> eN
+    net.minecraft.world.item.trading.MerchantOffers getOffers() -> eP
     void overrideOffers(net.minecraft.world.item.trading.MerchantOffers) -> a
     void notifyTrade(net.minecraft.world.item.trading.MerchantOffer) -> a
-    void notifyTradeUpdated(net.minecraft.world.item.ItemStack) -> i
-    net.minecraft.world.level.Level getLevel() -> eB
-    int getVillagerXp() -> er
+    void notifyTradeUpdated(net.minecraft.world.item.ItemStack) -> k
+    net.minecraft.world.level.Level getLevel() -> eV
+    int getVillagerXp() -> eM
     void overrideXp(int) -> t
-    boolean showProgressBar() -> ev
-    net.minecraft.sounds.SoundEvent getNotifyTradeSound() -> ew
-    39:39:boolean canRestock() -> eD
+    boolean showProgressBar() -> eQ
+    net.minecraft.sounds.SoundEvent getNotifyTradeSound() -> eR
+    39:39:boolean canRestock() -> fa
     43:51:void openTradingScreen(net.minecraft.world.entity.player.Player,net.minecraft.network.chat.Component,int) -> a
     43:43:net.minecraft.world.inventory.AbstractContainerMenu lambda$openTradingScreen$0(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
-net.minecraft.world.item.trading.MerchantOffer -> biz:
+net.minecraft.world.item.trading.MerchantOffer -> boz:
     net.minecraft.world.item.ItemStack baseCostA -> a
     net.minecraft.world.item.ItemStack costB -> b
     net.minecraft.world.item.ItemStack result -> c
@@ -50116,15 +54562,15 @@ net.minecraft.world.item.trading.MerchantOffer -> biz:
     189:190:boolean satisfiedBy(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
     194:202:boolean isRequiredItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> c
     206:214:boolean take(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> b
-net.minecraft.world.item.trading.MerchantOffers -> bja:
+net.minecraft.world.item.trading.MerchantOffers -> bpa:
     13:14:void <init>() -> <init>
     16:22:void <init>(net.minecraft.nbt.CompoundTag) -> <init>
     26:41:net.minecraft.world.item.trading.MerchantOffer getRecipeFor(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack,int) -> a
     45:64:void writeToStream(net.minecraft.network.FriendlyByteBuf) -> a
     67:94:net.minecraft.world.item.trading.MerchantOffers createFromStream(net.minecraft.network.FriendlyByteBuf) -> b
     98:106:net.minecraft.nbt.CompoundTag createTag() -> a
-net.minecraft.world.item.trading.package-info -> bjb:
-net.minecraft.world.level.BaseCommandBlock -> bjc:
+net.minecraft.world.item.trading.package-info -> bpb:
+net.minecraft.world.level.BaseCommandBlock -> bpc:
     java.text.SimpleDateFormat TIME_FORMAT -> b
     net.minecraft.network.chat.Component DEFAULT_NAME -> c
     long lastExecution -> d
@@ -50134,34 +54580,33 @@ net.minecraft.world.level.BaseCommandBlock -> bjc:
     net.minecraft.network.chat.Component lastOutput -> h
     java.lang.String command -> i
     net.minecraft.network.chat.Component name -> j
-    23:33:void <init>() -> <init>
-    36:36:int getSuccessCount() -> i
-    40:41:void setSuccessCount(int) -> a
-    44:44:net.minecraft.network.chat.Component getLastOutput() -> j
-    48:60:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
-    64:89:void load(net.minecraft.nbt.CompoundTag) -> b
-    92:94:void setCommand(java.lang.String) -> a
-    97:97:java.lang.String getCommand() -> k
-    101:142:boolean performCommand(net.minecraft.world.level.Level) -> a
-    146:146:net.minecraft.network.chat.Component getName() -> l
-    150:155:void setName(net.minecraft.network.chat.Component) -> b
-    159:163:void sendMessage(net.minecraft.network.chat.Component) -> a
+    24:35:void <init>() -> <init>
+    38:38:int getSuccessCount() -> i
+    42:43:void setSuccessCount(int) -> a
+    46:46:net.minecraft.network.chat.Component getLastOutput() -> j
+    50:62:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    66:91:void load(net.minecraft.nbt.CompoundTag) -> b
+    94:96:void setCommand(java.lang.String) -> a
+    99:99:java.lang.String getCommand() -> k
+    103:144:boolean performCommand(net.minecraft.world.level.Level) -> a
+    148:148:net.minecraft.network.chat.Component getName() -> l
+    152:157:void setName(net.minecraft.network.chat.Component) -> a
+    161:165:void sendMessage(net.minecraft.network.chat.Component,java.util.UUID) -> a
     net.minecraft.server.level.ServerLevel getLevel() -> d
     void onUpdated() -> e
-    void writeCoordinates(io.netty.buffer.ByteBuf) -> a
-    172:173:void setLastOutput(net.minecraft.network.chat.Component) -> c
+    172:173:void setLastOutput(net.minecraft.network.chat.Component) -> b
     176:177:void setTrackOutput(boolean) -> a
     180:180:boolean isTrackOutput() -> m
-    184:190:boolean usedBy(net.minecraft.world.entity.player.Player) -> a
+    184:190:net.minecraft.world.InteractionResult usedBy(net.minecraft.world.entity.player.Player) -> a
     net.minecraft.world.phys.Vec3 getPosition() -> f
     net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> h
     199:199:boolean acceptsSuccess() -> a
     204:204:boolean acceptsFailure() -> b
-    209:209:boolean shouldInformAdmins() -> I_
-    130:130:java.lang.String lambda$performCommand$1() -> g
-    119:122:void lambda$performCommand$0(com.mojang.brigadier.context.CommandContext,boolean,int) -> a
-    24:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.BaseSpawner -> bjd:
+    209:209:boolean shouldInformAdmins() -> S_
+    132:132:java.lang.String lambda$performCommand$1() -> g
+    121:124:void lambda$performCommand$0(com.mojang.brigadier.context.CommandContext,boolean,int) -> a
+    25:26:void <clinit>() -> <clinit>
+net.minecraft.world.level.BaseSpawner -> bpd:
     org.apache.logging.log4j.Logger LOGGER -> a
     int spawnDelay -> b
     java.util.List spawnPotentials -> c
@@ -50194,13 +54639,14 @@ net.minecraft.world.level.BaseSpawner -> bjd:
     288:288:double getoSpin() -> f
     125:126:net.minecraft.world.entity.Entity lambda$tick$0(double,double,double,net.minecraft.world.entity.Entity) -> a
     31:31:void <clinit>() -> <clinit>
-net.minecraft.world.level.BlockAndTintGetter -> bje:
+net.minecraft.world.level.BlockAndTintGetter -> bpe:
+    float getShade(net.minecraft.core.Direction,boolean) -> a
     net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
     int getBlockTint(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> a
-    12:12:int getBrightness(net.minecraft.world.level.LightLayer,net.minecraft.core.BlockPos) -> a
-    16:16:int getRawBrightness(net.minecraft.core.BlockPos,int) -> b
-    20:20:boolean canSeeSky(net.minecraft.core.BlockPos) -> f
-net.minecraft.world.level.BlockEventData -> bjf:
+    15:15:int getBrightness(net.minecraft.world.level.LightLayer,net.minecraft.core.BlockPos) -> a
+    19:19:int getRawBrightness(net.minecraft.core.BlockPos,int) -> b
+    23:23:boolean canSeeSky(net.minecraft.core.BlockPos) -> f
+net.minecraft.world.level.BlockEventData -> bpf:
     net.minecraft.core.BlockPos pos -> a
     net.minecraft.world.level.block.Block block -> b
     int paramA -> c
@@ -50213,20 +54659,21 @@ net.minecraft.world.level.BlockEventData -> bjf:
     37:41:boolean equals(java.lang.Object) -> equals
     46:50:int hashCode() -> hashCode
     55:55:java.lang.String toString() -> toString
-net.minecraft.world.level.BlockGetter -> bjg:
+net.minecraft.world.level.BlockGetter -> bpg:
     net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
     net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
     net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
-    35:35:int getLightBlock(net.minecraft.core.BlockPos) -> g
-    39:39:int getLightEmission(net.minecraft.core.BlockPos) -> h
-    43:43:int getMaxLightLevel() -> H
-    47:47:int getMaxBuildHeight() -> I
-    51:51:net.minecraft.world.phys.BlockHitResult clip(net.minecraft.world.level.ClipContext) -> a
-    77:85:net.minecraft.world.phys.BlockHitResult clipWithInteractionOverride(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.level.block.state.BlockState) -> a
-    89:159:java.lang.Object traverseBlocks(net.minecraft.world.level.ClipContext,java.util.function.BiFunction,java.util.function.Function) -> a
-    69:70:net.minecraft.world.phys.BlockHitResult lambda$clip$1(net.minecraft.world.level.ClipContext) -> b
-    52:67:net.minecraft.world.phys.BlockHitResult lambda$clip$0(net.minecraft.world.level.ClipContext,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.ChunkPos -> bjh:
+    37:37:int getLightBlock(net.minecraft.core.BlockPos) -> g
+    41:41:int getLightEmission(net.minecraft.core.BlockPos) -> h
+    45:45:int getMaxLightLevel() -> H
+    49:49:int getMaxBuildHeight() -> I
+    53:53:java.util.stream.Stream getBlockStates(net.minecraft.world.phys.AABB) -> a
+    57:57:net.minecraft.world.phys.BlockHitResult clip(net.minecraft.world.level.ClipContext) -> a
+    83:91:net.minecraft.world.phys.BlockHitResult clipWithInteractionOverride(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.level.block.state.BlockState) -> a
+    95:165:java.lang.Object traverseBlocks(net.minecraft.world.level.ClipContext,java.util.function.BiFunction,java.util.function.Function) -> a
+    75:76:net.minecraft.world.phys.BlockHitResult lambda$clip$1(net.minecraft.world.level.ClipContext) -> b
+    58:73:net.minecraft.world.phys.BlockHitResult lambda$clip$0(net.minecraft.world.level.ClipContext,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.ChunkPos -> bph:
     long INVALID_CHUNK_POS -> a
     int x -> b
     int z -> c
@@ -50257,7 +54704,7 @@ net.minecraft.world.level.ChunkPos -> bjh:
     141:141:java.util.stream.Stream rangeClosed(net.minecraft.world.level.ChunkPos,int) -> a
     145:149:java.util.stream.Stream rangeClosed(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.ChunkPos) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.world.level.ChunkPos$1 -> bjh$1:
+net.minecraft.world.level.ChunkPos$1 -> bph$1:
     net.minecraft.world.level.ChunkPos pos -> e
     net.minecraft.world.level.ChunkPos val$from -> a
     net.minecraft.world.level.ChunkPos val$to -> b
@@ -50265,20 +54712,31 @@ net.minecraft.world.level.ChunkPos$1 -> bjh$1:
     int val$xDiff -> d
     149:149:void <init>(long,int,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.ChunkPos,int,int) -> <init>
     154:169:boolean tryAdvance(java.util.function.Consumer) -> tryAdvance
-net.minecraft.world.level.ChunkTickList -> bji:
-    java.util.Set ticks -> a
+net.minecraft.world.level.ChunkTickList -> bpi:
+    java.util.List ticks -> a
     java.util.function.Function toId -> b
-    19:20:void <init>(java.util.function.Function,java.util.List) -> <init>
-    22:25:void <init>(java.util.function.Function,java.util.Set) -> <init>
-    29:29:boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
-    34:35:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
-    39:39:boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
-    44:45:void addAll(java.util.stream.Stream) -> a
-    48:48:java.util.stream.Stream ticks() -> b
-    52:52:net.minecraft.nbt.ListTag save(long) -> a
-    56:65:net.minecraft.world.level.ChunkTickList create(net.minecraft.nbt.ListTag,java.util.function.Function,java.util.function.Function) -> a
-    70:70:int size() -> a
-net.minecraft.world.level.ClipContext -> bjj:
+    37:38:void <init>(java.util.function.Function,java.util.List,long) -> <init>
+    40:43:void <init>(java.util.function.Function,java.util.List) -> <init>
+    47:47:boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
+    52:53:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
+    57:57:boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
+    61:74:net.minecraft.nbt.ListTag save() -> b
+    78:88:net.minecraft.world.level.ChunkTickList create(net.minecraft.nbt.ListTag,java.util.function.Function,java.util.function.Function) -> a
+    92:93:void copyOut(net.minecraft.world.level.TickList) -> a
+    97:97:int size() -> a
+    92:92:void lambda$copyOut$1(net.minecraft.world.level.TickList,net.minecraft.world.level.ChunkTickList$ScheduledTick) -> a
+    37:37:net.minecraft.world.level.ChunkTickList$ScheduledTick lambda$new$0(long,net.minecraft.world.level.TickNextTickData) -> a
+net.minecraft.world.level.ChunkTickList$1 -> bpi$1:
+net.minecraft.world.level.ChunkTickList$ScheduledTick -> bpi$a:
+    java.lang.Object type -> d
+    net.minecraft.core.BlockPos pos -> a
+    int delay -> b
+    net.minecraft.world.level.TickPriority priority -> c
+    20:25:void <init>(java.lang.Object,net.minecraft.core.BlockPos,int,net.minecraft.world.level.TickPriority) -> <init>
+    29:29:java.lang.String toString() -> toString
+    14:14:void <init>(java.lang.Object,net.minecraft.core.BlockPos,int,net.minecraft.world.level.TickPriority,net.minecraft.world.level.ChunkTickList$1) -> <init>
+    14:14:java.lang.Object access$100(net.minecraft.world.level.ChunkTickList$ScheduledTick) -> a
+net.minecraft.world.level.ClipContext -> bpj:
     net.minecraft.world.phys.Vec3 from -> a
     net.minecraft.world.phys.Vec3 to -> b
     net.minecraft.world.level.ClipContext$Block block -> c
@@ -50289,60 +54747,95 @@ net.minecraft.world.level.ClipContext -> bjj:
     34:34:net.minecraft.world.phys.Vec3 getFrom() -> b
     38:38:net.minecraft.world.phys.shapes.VoxelShape getBlockShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
     42:42:net.minecraft.world.phys.shapes.VoxelShape getFluidShape(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.ClipContext$Block -> bjj$a:
+net.minecraft.world.level.ClipContext$Block -> bpj$a:
     net.minecraft.world.level.ClipContext$Block COLLIDER -> a
     net.minecraft.world.level.ClipContext$Block OUTLINE -> b
-    net.minecraft.world.level.ClipContext$ShapeGetter shapeGetter -> c
-    net.minecraft.world.level.ClipContext$Block[] $VALUES -> d
+    net.minecraft.world.level.ClipContext$Block VISUAL -> c
+    net.minecraft.world.level.ClipContext$ShapeGetter shapeGetter -> d
+    net.minecraft.world.level.ClipContext$Block[] $VALUES -> e
     45:45:net.minecraft.world.level.ClipContext$Block[] values() -> values
     45:45:net.minecraft.world.level.ClipContext$Block valueOf(java.lang.String) -> valueOf
-    52:54:void <init>(java.lang.String,int,net.minecraft.world.level.ClipContext$ShapeGetter) -> <init>
-    58:58:net.minecraft.world.phys.shapes.VoxelShape get(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> get
-    45:47:void <clinit>() -> <clinit>
-net.minecraft.world.level.ClipContext$Fluid -> bjj$b:
+    53:55:void <init>(java.lang.String,int,net.minecraft.world.level.ClipContext$ShapeGetter) -> <init>
+    59:59:net.minecraft.world.phys.shapes.VoxelShape get(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> get
+    45:48:void <clinit>() -> <clinit>
+net.minecraft.world.level.ClipContext$Fluid -> bpj$b:
     net.minecraft.world.level.ClipContext$Fluid NONE -> a
     net.minecraft.world.level.ClipContext$Fluid SOURCE_ONLY -> b
     net.minecraft.world.level.ClipContext$Fluid ANY -> c
     java.util.function.Predicate canPick -> d
     net.minecraft.world.level.ClipContext$Fluid[] $VALUES -> e
-    66:66:net.minecraft.world.level.ClipContext$Fluid[] values() -> values
-    66:66:net.minecraft.world.level.ClipContext$Fluid valueOf(java.lang.String) -> valueOf
-    74:76:void <init>(java.lang.String,int,java.util.function.Predicate) -> <init>
-    79:79:boolean canPick(net.minecraft.world.level.material.FluidState) -> a
-    69:69:boolean lambda$static$1(net.minecraft.world.level.material.FluidState) -> b
-    67:67:boolean lambda$static$0(net.minecraft.world.level.material.FluidState) -> c
-    66:69:void <clinit>() -> <clinit>
-net.minecraft.world.level.ClipContext$ShapeGetter -> bjj$c:
+    67:67:net.minecraft.world.level.ClipContext$Fluid[] values() -> values
+    67:67:net.minecraft.world.level.ClipContext$Fluid valueOf(java.lang.String) -> valueOf
+    75:77:void <init>(java.lang.String,int,java.util.function.Predicate) -> <init>
+    80:80:boolean canPick(net.minecraft.world.level.material.FluidState) -> a
+    70:70:boolean lambda$static$1(net.minecraft.world.level.material.FluidState) -> b
+    68:68:boolean lambda$static$0(net.minecraft.world.level.material.FluidState) -> c
+    67:70:void <clinit>() -> <clinit>
+net.minecraft.world.level.ClipContext$ShapeGetter -> bpj$c:
     net.minecraft.world.phys.shapes.VoxelShape get(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> get
-net.minecraft.world.level.CollisionGetter -> bjk:
+net.minecraft.world.level.CollisionGetter -> bpk:
     net.minecraft.world.level.border.WorldBorder getWorldBorder() -> f
     net.minecraft.world.level.BlockGetter getChunkForCollisions(int,int) -> c
-    32:32:java.util.stream.Stream getEntityCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.shapes.VoxelShape,java.util.Set) -> a
-    36:36:boolean isUnobstructed(net.minecraft.world.entity.Entity,net.minecraft.world.phys.shapes.VoxelShape) -> a
-    40:41:boolean isUnobstructed(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    45:45:boolean isUnobstructed(net.minecraft.world.entity.Entity) -> i
-    49:49:boolean noCollision(net.minecraft.world.phys.AABB) -> a
-    53:53:boolean noCollision(net.minecraft.world.entity.Entity) -> j
-    57:57:boolean noCollision(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB) -> a_
-    61:61:boolean noCollision(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.Set) -> a
-    65:65:java.util.stream.Stream getEntityCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.Set) -> b
-    69:71:java.util.stream.Stream getCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.Set) -> c
-    77:91:java.util.stream.Stream getBlockCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB) -> b
-net.minecraft.world.level.CollisionGetter$1 -> bjk$1:
-    boolean checkedBorder -> a
-    net.minecraft.world.entity.Entity val$source -> b
-    net.minecraft.core.Cursor3D val$cursor -> c
-    net.minecraft.core.BlockPos$MutableBlockPos val$pos -> d
-    net.minecraft.world.phys.shapes.CollisionContext val$context -> e
-    net.minecraft.world.phys.shapes.VoxelShape val$testArea -> f
-    net.minecraft.world.level.CollisionGetter this$0 -> g
-    91:92:void <init>(net.minecraft.world.level.CollisionGetter,long,int,net.minecraft.world.entity.Entity,net.minecraft.core.Cursor3D,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.world.phys.shapes.CollisionContext,net.minecraft.world.phys.shapes.VoxelShape) -> <init>
-    96:145:boolean tryAdvance(java.util.function.Consumer) -> tryAdvance
+    25:25:boolean isUnobstructed(net.minecraft.world.entity.Entity,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    29:30:boolean isUnobstructed(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    34:34:boolean isUnobstructed(net.minecraft.world.entity.Entity) -> i
+    38:38:boolean noCollision(net.minecraft.world.phys.AABB) -> b
+    42:42:boolean noCollision(net.minecraft.world.entity.Entity) -> j
+    46:46:boolean noCollision(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB) -> a_
+    50:50:boolean noCollision(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> b
+    java.util.stream.Stream getEntityCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> c
+    56:58:java.util.stream.Stream getCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> d
+    63:63:java.util.stream.Stream getBlockCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB) -> b
+    67:67:java.util.stream.Stream getBlockCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.BiPredicate) -> a
+    46:46:boolean lambda$noCollision$2(net.minecraft.world.entity.Entity) -> a
+    42:42:boolean lambda$noCollision$1(net.minecraft.world.entity.Entity) -> b
+    38:38:boolean lambda$noCollision$0(net.minecraft.world.entity.Entity) -> d
+net.minecraft.world.level.CollisionSpliterator -> bpl:
+    net.minecraft.world.entity.Entity source -> a
+    net.minecraft.world.phys.AABB box -> b
+    net.minecraft.world.phys.shapes.CollisionContext context -> c
+    net.minecraft.core.Cursor3D cursor -> d
+    net.minecraft.core.BlockPos$MutableBlockPos pos -> e
+    net.minecraft.world.phys.shapes.VoxelShape entityShape -> f
+    net.minecraft.world.level.CollisionGetter collisionGetter -> g
+    boolean needsBorderCheck -> h
+    java.util.function.BiPredicate predicate -> i
+    36:37:void <init>(net.minecraft.world.level.CollisionGetter,net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB) -> <init>
+    40:58:void <init>(net.minecraft.world.level.CollisionGetter,net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.BiPredicate) -> <init>
+    62:62:boolean tryAdvance(java.util.function.Consumer) -> tryAdvance
+    66:112:boolean collisionCheck(java.util.function.Consumer) -> a
+    117:120:net.minecraft.world.level.BlockGetter getChunk(int,int) -> a
+    124:135:boolean worldBorderCheck(java.util.function.Consumer) -> b
+    139:139:boolean isCloseToBorder(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.AABB) -> a
+    143:143:boolean isOutsideBorder(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.AABB) -> b
+    147:153:boolean isBoxFullyWithinWorldBorder(net.minecraft.world.level.border.WorldBorder,net.minecraft.world.phys.AABB) -> a
+    36:36:boolean lambda$new$0(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
 net.minecraft.world.level.ColorResolver -> net.minecraft.world.level.ColorResolver:
     int getColor(net.minecraft.world.level.biome.Biome,double,double) -> getColor
-net.minecraft.world.level.CustomSpawner -> bjl:
+net.minecraft.world.level.CustomSpawner -> bpm:
     int tick(net.minecraft.server.level.ServerLevel,boolean,boolean) -> a
-net.minecraft.world.level.EmptyBlockGetter -> bjm:
+net.minecraft.world.level.DataPackConfig -> bpn:
+    net.minecraft.world.level.DataPackConfig DEFAULT -> a
+    com.mojang.serialization.Codec CODEC -> b
+    java.util.List enabled -> c
+    java.util.List disabled -> d
+    21:24:void <init>(java.util.List,java.util.List) -> <init>
+    27:27:java.util.List getEnabled() -> a
+    31:31:java.util.List getDisabled() -> b
+    13:16:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    15:15:java.util.List lambda$null$1(net.minecraft.world.level.DataPackConfig) -> a
+    14:14:java.util.List lambda$null$0(net.minecraft.world.level.DataPackConfig) -> b
+    11:13:void <clinit>() -> <clinit>
+net.minecraft.world.level.DefaultExplosionDamageCalculator -> bpo:
+    net.minecraft.world.level.DefaultExplosionDamageCalculator INSTANCE -> a
+    net.minecraft.world.level.DefaultExplosionDamageCalculator[] $VALUES -> b
+    9:9:net.minecraft.world.level.DefaultExplosionDamageCalculator[] values() -> values
+    9:9:net.minecraft.world.level.DefaultExplosionDamageCalculator valueOf(java.lang.String) -> valueOf
+    9:9:void <init>(java.lang.String,int) -> <init>
+    14:17:java.util.Optional getBlockExplosionResistance(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
+    22:22:boolean shouldBlockExplode(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,float) -> a
+    9:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.EmptyBlockGetter -> bpp:
     net.minecraft.world.level.EmptyBlockGetter INSTANCE -> a
     net.minecraft.world.level.EmptyBlockGetter[] $VALUES -> b
     12:12:net.minecraft.world.level.EmptyBlockGetter[] values() -> values
@@ -50352,48 +54845,48 @@ net.minecraft.world.level.EmptyBlockGetter -> bjm:
     23:23:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
     28:28:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
     12:13:void <clinit>() -> <clinit>
-net.minecraft.world.level.EmptyTickList -> bjn:
+net.minecraft.world.level.EmptyTickList -> bpq:
     net.minecraft.world.level.EmptyTickList INSTANCE -> a
-    7:7:void <init>() -> <init>
-    12:12:net.minecraft.world.level.EmptyTickList empty() -> b
-    17:17:boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
-    22:22:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int) -> a
-    26:26:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
-    30:30:boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
-    35:35:void addAll(java.util.stream.Stream) -> a
-    39:39:int size() -> a
-    8:8:void <clinit>() -> <clinit>
-net.minecraft.world.level.EntityGetter -> bjo:
+    5:5:void <init>() -> <init>
+    10:10:net.minecraft.world.level.EmptyTickList empty() -> b
+    15:15:boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
+    20:20:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int) -> a
+    24:24:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
+    28:28:boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
+    33:33:int size() -> a
+    6:6:void <clinit>() -> <clinit>
+net.minecraft.world.level.EntityBasedExplosionDamageCalculator -> bpr:
+    net.minecraft.world.entity.Entity source -> a
+    13:15:void <init>(net.minecraft.world.entity.Entity) -> <init>
+    19:20:java.util.Optional getBlockExplosionResistance(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
+    25:25:boolean shouldBlockExplode(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,float) -> a
+    20:20:java.lang.Float lambda$getBlockExplosionResistance$0(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState,java.lang.Float) -> a
+net.minecraft.world.level.EntityGetter -> bps:
     java.util.List getEntities(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
     java.util.List getEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
-    28:28:java.util.List getLoadedEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> b
-    java.util.List players() -> A
-    34:34:java.util.List getEntities(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB) -> a
-    38:45:boolean isUnobstructed(net.minecraft.world.entity.Entity,net.minecraft.world.phys.shapes.VoxelShape) -> a
-    49:49:java.util.List getEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB) -> a
-    53:53:java.util.List getLoadedEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB) -> b
-    58:71:java.util.stream.Stream getEntityCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.Set) -> b
-    77:91:net.minecraft.world.entity.player.Player getNearestPlayer(double,double,double,double,java.util.function.Predicate) -> a
-    96:96:net.minecraft.world.entity.player.Player getNearestPlayer(net.minecraft.world.entity.Entity,double) -> a
-    101:102:net.minecraft.world.entity.player.Player getNearestPlayer(double,double,double,double,boolean) -> a
-    107:119:net.minecraft.world.entity.player.Player getNearestPlayerIgnoreY(double,double,double) -> a
-    123:132:boolean hasNearbyAlivePlayer(double,double,double,double) -> a
-    137:137:net.minecraft.world.entity.player.Player getNearestPlayer(net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity) -> a
-    142:142:net.minecraft.world.entity.player.Player getNearestPlayer(net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,double,double,double) -> a
-    147:147:net.minecraft.world.entity.player.Player getNearestPlayer(net.minecraft.world.entity.ai.targeting.TargetingConditions,double,double,double) -> a
-    152:152:net.minecraft.world.entity.LivingEntity getNearestEntity(java.lang.Class,net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,double,double,double,net.minecraft.world.phys.AABB) -> a
-    157:157:net.minecraft.world.entity.LivingEntity getNearestLoadedEntity(java.lang.Class,net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,double,double,double,net.minecraft.world.phys.AABB) -> b
-    162:176:net.minecraft.world.entity.LivingEntity getNearestEntity(java.util.List,net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,double,double,double) -> a
-    180:187:java.util.List getNearbyPlayers(net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,net.minecraft.world.phys.AABB) -> a
-    191:200:java.util.List getNearbyEntities(java.lang.Class,net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,net.minecraft.world.phys.AABB) -> a
-    205:211:net.minecraft.world.entity.player.Player getPlayerByName(java.lang.String) -> b
-    216:222:net.minecraft.world.entity.player.Player getPlayerByUUID(java.util.UUID) -> b
-    68:68:java.util.stream.Stream lambda$getEntityCollisions$4(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
-    67:67:boolean lambda$getEntityCollisions$3(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> b
-    66:66:boolean lambda$getEntityCollisions$2(java.util.Set,net.minecraft.world.entity.Entity) -> a
-    45:45:boolean lambda$isUnobstructed$1(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.entity.Entity) -> a
-    44:44:boolean lambda$isUnobstructed$0(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> c
-net.minecraft.world.level.Explosion -> bjp:
+    27:27:java.util.List getLoadedEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> b
+    java.util.List players() -> w
+    33:33:java.util.List getEntities(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB) -> a
+    37:48:boolean isUnobstructed(net.minecraft.world.entity.Entity,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    52:52:java.util.List getEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB) -> a
+    56:56:java.util.List getLoadedEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB) -> b
+    61:79:java.util.stream.Stream getEntityCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> c
+    85:99:net.minecraft.world.entity.player.Player getNearestPlayer(double,double,double,double,java.util.function.Predicate) -> a
+    104:104:net.minecraft.world.entity.player.Player getNearestPlayer(net.minecraft.world.entity.Entity,double) -> a
+    109:110:net.minecraft.world.entity.player.Player getNearestPlayer(double,double,double,double,boolean) -> a
+    114:123:boolean hasNearbyAlivePlayer(double,double,double,double) -> a
+    128:128:net.minecraft.world.entity.player.Player getNearestPlayer(net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity) -> a
+    133:133:net.minecraft.world.entity.player.Player getNearestPlayer(net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,double,double,double) -> a
+    138:138:net.minecraft.world.entity.player.Player getNearestPlayer(net.minecraft.world.entity.ai.targeting.TargetingConditions,double,double,double) -> a
+    143:143:net.minecraft.world.entity.LivingEntity getNearestEntity(java.lang.Class,net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,double,double,double,net.minecraft.world.phys.AABB) -> a
+    148:148:net.minecraft.world.entity.LivingEntity getNearestLoadedEntity(java.lang.Class,net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,double,double,double,net.minecraft.world.phys.AABB) -> b
+    153:167:net.minecraft.world.entity.LivingEntity getNearestEntity(java.util.List,net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,double,double,double) -> a
+    171:178:java.util.List getNearbyPlayers(net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,net.minecraft.world.phys.AABB) -> a
+    182:191:java.util.List getNearbyEntities(java.lang.Class,net.minecraft.world.entity.ai.targeting.TargetingConditions,net.minecraft.world.entity.LivingEntity,net.minecraft.world.phys.AABB) -> a
+    196:202:net.minecraft.world.entity.player.Player getPlayerByUUID(java.util.UUID) -> b
+    70:76:java.util.stream.Stream lambda$getEntityCollisions$1(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,net.minecraft.world.entity.Entity) -> a
+    67:67:boolean lambda$getEntityCollisions$0(net.minecraft.world.entity.Entity,net.minecraft.world.entity.Entity) -> a
+net.minecraft.world.level.Explosion -> bpt:
     boolean fire -> a
     net.minecraft.world.level.Explosion$BlockInteraction blockInteraction -> b
     java.util.Random random -> c
@@ -50404,33 +54897,38 @@ net.minecraft.world.level.Explosion -> bjp:
     net.minecraft.world.entity.Entity source -> h
     float radius -> i
     net.minecraft.world.damagesource.DamageSource damageSource -> j
-    java.util.List toBlow -> k
-    java.util.Map hitPlayers -> l
-    66:67:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,double,double,double,float) -> <init>
-    70:71:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,double,double,double,float,java.util.List) -> <init>
-    74:76:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction,java.util.List) -> <init>
-    52:88:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction) -> <init>
-    91:119:float getSeenPercent(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> a
-    123:230:void explode() -> a
-    233:289:void finalizeExplosion(boolean) -> a
-    292:305:void addBlockDrops(it.unimi.dsi.fastutil.objects.ObjectArrayList,net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos) -> a
-    308:308:net.minecraft.world.damagesource.DamageSource getDamageSource() -> b
-    312:313:void setDamageSource(net.minecraft.world.damagesource.DamageSource) -> a
-    316:316:java.util.Map getHitPlayers() -> c
-    321:334:net.minecraft.world.entity.LivingEntity getSourceMob() -> d
-    338:339:void clearToBlow() -> e
-    342:342:java.util.List getToBlow() -> f
-    270:270:void lambda$finalizeExplosion$0(it.unimi.dsi.fastutil.objects.ObjectArrayList,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.level.Explosion$BlockInteraction -> bjp$a:
+    net.minecraft.world.level.ExplosionDamageCalculator damageCalculator -> k
+    java.util.List toBlow -> l
+    java.util.Map hitPlayers -> m
+    69:70:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,double,double,double,float) -> <init>
+    73:74:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,double,double,double,float,java.util.List) -> <init>
+    77:79:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction,java.util.List) -> <init>
+    82:83:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction) -> <init>
+    54:96:void <init>(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource,net.minecraft.world.level.ExplosionDamageCalculator,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction) -> <init>
+    99:99:net.minecraft.world.level.ExplosionDamageCalculator makeDamageCalculator(net.minecraft.world.entity.Entity) -> a
+    103:131:float getSeenPercent(net.minecraft.world.phys.Vec3,net.minecraft.world.entity.Entity) -> a
+    135:239:void explode() -> a
+    242:298:void finalizeExplosion(boolean) -> a
+    301:314:void addBlockDrops(it.unimi.dsi.fastutil.objects.ObjectArrayList,net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos) -> a
+    317:317:net.minecraft.world.damagesource.DamageSource getDamageSource() -> b
+    321:321:java.util.Map getHitPlayers() -> c
+    326:342:net.minecraft.world.entity.LivingEntity getSourceMob() -> d
+    346:347:void clearToBlow() -> e
+    350:350:java.util.List getToBlow() -> f
+    279:279:void lambda$finalizeExplosion$0(it.unimi.dsi.fastutil.objects.ObjectArrayList,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.world.level.Explosion$BlockInteraction -> bpt$a:
     net.minecraft.world.level.Explosion$BlockInteraction NONE -> a
     net.minecraft.world.level.Explosion$BlockInteraction BREAK -> b
     net.minecraft.world.level.Explosion$BlockInteraction DESTROY -> c
     net.minecraft.world.level.Explosion$BlockInteraction[] $VALUES -> d
-    42:42:net.minecraft.world.level.Explosion$BlockInteraction[] values() -> values
-    42:42:net.minecraft.world.level.Explosion$BlockInteraction valueOf(java.lang.String) -> valueOf
-    42:42:void <init>(java.lang.String,int) -> <init>
-    42:45:void <clinit>() -> <clinit>
-net.minecraft.world.level.FoliageColor -> bjq:
+    44:44:net.minecraft.world.level.Explosion$BlockInteraction[] values() -> values
+    44:44:net.minecraft.world.level.Explosion$BlockInteraction valueOf(java.lang.String) -> valueOf
+    44:44:void <init>(java.lang.String,int) -> <init>
+    44:47:void <clinit>() -> <clinit>
+net.minecraft.world.level.ExplosionDamageCalculator -> bpu:
+    java.util.Optional getBlockExplosionResistance(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
+    boolean shouldBlockExplode(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,float) -> a
+net.minecraft.world.level.FoliageColor -> bpv:
     int[] pixels -> a
     3:3:void <init>() -> <init>
     7:8:void init(int[]) -> a
@@ -50439,15 +54937,15 @@ net.minecraft.world.level.FoliageColor -> bjq:
     22:22:int getBirchColor() -> b
     26:26:int getDefaultColor() -> c
     4:4:void <clinit>() -> <clinit>
-net.minecraft.world.level.ForcedChunksSavedData -> bjr:
+net.minecraft.world.level.ForcedChunksSavedData -> bpw:
     it.unimi.dsi.fastutil.longs.LongSet chunks -> a
     11:15:void <init>() -> <init>
     19:20:void load(net.minecraft.nbt.CompoundTag) -> a
     24:25:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
     29:29:it.unimi.dsi.fastutil.longs.LongSet getChunks() -> a
-net.minecraft.world.level.GameRules -> bjs:
-    org.apache.logging.log4j.Logger LOGGER -> F
-    java.util.Map GAME_RULE_TYPES -> G
+net.minecraft.world.level.GameRules -> bpx:
+    org.apache.logging.log4j.Logger LOGGER -> H
+    java.util.Map GAME_RULE_TYPES -> I
     net.minecraft.world.level.GameRules$Key RULE_DOFIRETICK -> a
     net.minecraft.world.level.GameRules$Key RULE_MOBGRIEFING -> b
     net.minecraft.world.level.GameRules$Key RULE_KEEPINVENTORY -> c
@@ -50479,91 +54977,136 @@ net.minecraft.world.level.GameRules -> bjs:
     net.minecraft.world.level.GameRules$Key RULE_FIRE_DAMAGE -> C
     net.minecraft.world.level.GameRules$Key RULE_DO_PATROL_SPAWNING -> D
     net.minecraft.world.level.GameRules$Key RULE_DO_TRADER_SPAWNING -> E
-    java.util.Map rules -> H
-    34:39:net.minecraft.world.level.GameRules$Key register(java.lang.String,net.minecraft.world.level.GameRules$Type) -> a
-    85:87:void <init>() -> <init>
-    91:91:net.minecraft.world.level.GameRules$Value getRule(net.minecraft.world.level.GameRules$Key) -> a
-    95:97:net.minecraft.nbt.CompoundTag createTag() -> a
-    101:106:void loadFromTag(net.minecraft.nbt.CompoundTag) -> a
-    114:115:void visitGameRuleTypes(net.minecraft.world.level.GameRules$GameRuleTypeVisitor) -> a
-    119:122:void cap(net.minecraft.world.level.GameRules$GameRuleTypeVisitor,net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> a
-    125:125:boolean getBoolean(net.minecraft.world.level.GameRules$Key) -> b
-    129:129:int getInt(net.minecraft.world.level.GameRules$Key) -> c
-    114:114:void lambda$visitGameRuleTypes$6(net.minecraft.world.level.GameRules$GameRuleTypeVisitor,net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> b
-    102:105:void lambda$loadFromTag$5(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Value) -> a
-    96:96:void lambda$createTag$4(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Value) -> b
-    86:86:net.minecraft.world.level.GameRules$Value lambda$new$3(java.util.Map$Entry) -> a
-    73:76:void lambda$static$2(net.minecraft.server.MinecraftServer,net.minecraft.world.level.GameRules$BooleanValue) -> a
-    57:61:void lambda$static$1(net.minecraft.server.MinecraftServer,net.minecraft.world.level.GameRules$BooleanValue) -> b
-    31:31:java.lang.String lambda$static$0(net.minecraft.world.level.GameRules$Key) -> d
-    28:28:org.apache.logging.log4j.Logger access$500() -> b
-    29:81:void <clinit>() -> <clinit>
-net.minecraft.world.level.GameRules$1 -> bjs$1:
-net.minecraft.world.level.GameRules$BooleanValue -> bjs$a:
-    boolean value -> a
-    282:282:net.minecraft.world.level.GameRules$Type create(boolean,java.util.function.BiConsumer) -> b
-    290:290:net.minecraft.world.level.GameRules$Type create(boolean) -> b
-    296:298:void <init>(net.minecraft.world.level.GameRules$Type,boolean) -> <init>
-    302:303:void updateFromArgument(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    306:306:boolean get() -> a
-    310:312:void set(boolean,net.minecraft.server.MinecraftServer) -> a
-    316:316:java.lang.String serialize() -> b
-    321:322:void deserialize(java.lang.String) -> a
-    326:326:int getCommandResult() -> c
-    331:331:net.minecraft.world.level.GameRules$BooleanValue getSelf() -> d
-    280:280:net.minecraft.world.level.GameRules$Value getSelf() -> e
-    290:290:void lambda$create$1(net.minecraft.server.MinecraftServer,net.minecraft.world.level.GameRules$BooleanValue) -> a
-    284:284:net.minecraft.world.level.GameRules$BooleanValue lambda$create$0(boolean,net.minecraft.world.level.GameRules$Type) -> a
-    280:280:net.minecraft.world.level.GameRules$Type access$000(boolean) -> a
-    280:280:net.minecraft.world.level.GameRules$Type access$200(boolean,java.util.function.BiConsumer) -> a
-net.minecraft.world.level.GameRules$GameRuleTypeVisitor -> bjs$b:
-    void visit(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> a
-net.minecraft.world.level.GameRules$IntegerValue -> bjs$c:
-    int value -> a
-    216:216:net.minecraft.world.level.GameRules$Type create(int,java.util.function.BiConsumer) -> a
-    224:224:net.minecraft.world.level.GameRules$Type create(int) -> b
-    230:232:void <init>(net.minecraft.world.level.GameRules$Type,int) -> <init>
-    236:237:void updateFromArgument(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    240:240:int get() -> a
-    244:246:void set(int,net.minecraft.server.MinecraftServer) -> a
-    250:250:java.lang.String serialize() -> b
-    255:256:void deserialize(java.lang.String) -> a
-    259:266:int safeParse(java.lang.String) -> b
-    271:271:int getCommandResult() -> c
-    276:276:net.minecraft.world.level.GameRules$IntegerValue getSelf() -> d
-    214:214:net.minecraft.world.level.GameRules$Value getSelf() -> e
-    224:224:void lambda$create$1(net.minecraft.server.MinecraftServer,net.minecraft.world.level.GameRules$IntegerValue) -> a
-    218:218:net.minecraft.world.level.GameRules$IntegerValue lambda$create$0(int,net.minecraft.world.level.GameRules$Type) -> a
-    214:214:net.minecraft.world.level.GameRules$Type access$100(int) -> a
-net.minecraft.world.level.GameRules$Key -> bjs$d:
+    net.minecraft.world.level.GameRules$Key RULE_FORGIVE_DEAD_PLAYERS -> F
+    net.minecraft.world.level.GameRules$Key RULE_UNIVERSAL_ANGER -> G
+    java.util.Map rules -> J
+    56:61:net.minecraft.world.level.GameRules$Key register(java.lang.String,net.minecraft.world.level.GameRules$Category,net.minecraft.world.level.GameRules$Type) -> a
+    110:112:void <init>(com.mojang.serialization.DynamicLike) -> <init>
+    115:117:void <init>(net.minecraft.world.level.GameRules,net.minecraft.server.MinecraftServer) -> <init>
+    119:121:void <init>() -> <init>
+    123:125:void <init>(java.util.Map) -> <init>
+    129:129:net.minecraft.world.level.GameRules$Value getRule(net.minecraft.world.level.GameRules$Key) -> a
+    133:135:net.minecraft.nbt.CompoundTag createTag() -> a
+    139:142:void loadFromTag(com.mojang.serialization.DynamicLike) -> a
+    145:145:net.minecraft.world.level.GameRules copy() -> b
+    164:165:void visitGameRuleTypes(net.minecraft.world.level.GameRules$GameRuleTypeVisitor) -> a
+    169:173:void callVisitorCap(net.minecraft.world.level.GameRules$GameRuleTypeVisitor,net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> a
+    176:177:void assignFrom(net.minecraft.world.level.GameRules,net.minecraft.server.MinecraftServer) -> a
+    180:182:void assignCap(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules,net.minecraft.server.MinecraftServer) -> a
+    185:185:boolean getBoolean(net.minecraft.world.level.GameRules$Key) -> b
+    189:189:int getInt(net.minecraft.world.level.GameRules$Key) -> c
+    176:176:void lambda$assignFrom$8(net.minecraft.world.level.GameRules,net.minecraft.server.MinecraftServer,net.minecraft.world.level.GameRules$Key) -> a
+    164:164:void lambda$visitGameRuleTypes$7(net.minecraft.world.level.GameRules$GameRuleTypeVisitor,net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> b
+    145:145:net.minecraft.world.level.GameRules$Value lambda$copy$6(java.util.Map$Entry) -> a
+    140:141:void lambda$loadFromTag$5(com.mojang.serialization.DynamicLike,net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Value) -> a
+    134:134:void lambda$createTag$4(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Value) -> a
+    120:120:net.minecraft.world.level.GameRules$Value lambda$new$3(java.util.Map$Entry) -> b
+    95:98:void lambda$static$2(net.minecraft.server.MinecraftServer,net.minecraft.world.level.GameRules$BooleanValue) -> a
+    79:83:void lambda$static$1(net.minecraft.server.MinecraftServer,net.minecraft.world.level.GameRules$BooleanValue) -> b
+    53:53:java.lang.String lambda$static$0(net.minecraft.world.level.GameRules$Key) -> d
+    29:29:org.apache.logging.log4j.Logger access$500() -> c
+    51:105:void <clinit>() -> <clinit>
+net.minecraft.world.level.GameRules$1 -> bpx$1:
+net.minecraft.world.level.GameRules$BooleanValue -> bpx$a:
+    boolean value -> b
+    384:384:net.minecraft.world.level.GameRules$Type create(boolean,java.util.function.BiConsumer) -> b
+    393:393:net.minecraft.world.level.GameRules$Type create(boolean) -> b
+    399:401:void <init>(net.minecraft.world.level.GameRules$Type,boolean) -> <init>
+    405:406:void updateFromArgument(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    409:409:boolean get() -> a
+    413:415:void set(boolean,net.minecraft.server.MinecraftServer) -> a
+    419:419:java.lang.String serialize() -> b
+    424:425:void deserialize(java.lang.String) -> a
+    429:429:int getCommandResult() -> c
+    434:434:net.minecraft.world.level.GameRules$BooleanValue getSelf() -> d
+    439:439:net.minecraft.world.level.GameRules$BooleanValue copy() -> e
+    444:446:void setFrom(net.minecraft.world.level.GameRules$BooleanValue,net.minecraft.server.MinecraftServer) -> a
+    382:382:void setFrom(net.minecraft.world.level.GameRules$Value,net.minecraft.server.MinecraftServer) -> a
+    382:382:net.minecraft.world.level.GameRules$Value copy() -> f
+    382:382:net.minecraft.world.level.GameRules$Value getSelf() -> g
+    393:393:void lambda$create$1(net.minecraft.server.MinecraftServer,net.minecraft.world.level.GameRules$BooleanValue) -> a
+    386:386:net.minecraft.world.level.GameRules$BooleanValue lambda$create$0(boolean,net.minecraft.world.level.GameRules$Type) -> a
+    382:382:net.minecraft.world.level.GameRules$Type access$000(boolean) -> a
+    382:382:net.minecraft.world.level.GameRules$Type access$200(boolean,java.util.function.BiConsumer) -> a
+net.minecraft.world.level.GameRules$Category -> bpx$b:
+    net.minecraft.world.level.GameRules$Category PLAYER -> a
+    net.minecraft.world.level.GameRules$Category MOBS -> b
+    net.minecraft.world.level.GameRules$Category SPAWNING -> c
+    net.minecraft.world.level.GameRules$Category DROPS -> d
+    net.minecraft.world.level.GameRules$Category UPDATES -> e
+    net.minecraft.world.level.GameRules$Category CHAT -> f
+    net.minecraft.world.level.GameRules$Category MISC -> g
+    java.lang.String descriptionId -> h
+    net.minecraft.world.level.GameRules$Category[] $VALUES -> i
+    30:30:net.minecraft.world.level.GameRules$Category[] values() -> values
+    30:30:net.minecraft.world.level.GameRules$Category valueOf(java.lang.String) -> valueOf
+    42:44:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    47:47:java.lang.String getDescriptionId() -> a
+    30:37:void <clinit>() -> <clinit>
+net.minecraft.world.level.GameRules$GameRuleTypeVisitor -> bpx$c:
+    154:154:void visit(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> a
+    157:157:void visitBoolean(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> b
+    160:160:void visitInteger(net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> c
+net.minecraft.world.level.GameRules$IntegerValue -> bpx$d:
+    int value -> b
+    296:296:net.minecraft.world.level.GameRules$Type create(int,java.util.function.BiConsumer) -> a
+    305:305:net.minecraft.world.level.GameRules$Type create(int) -> b
+    311:313:void <init>(net.minecraft.world.level.GameRules$Type,int) -> <init>
+    317:318:void updateFromArgument(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
+    321:321:int get() -> a
+    325:327:void set(int,net.minecraft.server.MinecraftServer) -> a
+    331:331:java.lang.String serialize() -> b
+    336:337:void deserialize(java.lang.String) -> a
+    341:346:boolean tryDeserialize(java.lang.String) -> b
+    350:357:int safeParse(java.lang.String) -> c
+    362:362:int getCommandResult() -> c
+    367:367:net.minecraft.world.level.GameRules$IntegerValue getSelf() -> d
+    372:372:net.minecraft.world.level.GameRules$IntegerValue copy() -> e
+    377:379:void setFrom(net.minecraft.world.level.GameRules$IntegerValue,net.minecraft.server.MinecraftServer) -> a
+    294:294:void setFrom(net.minecraft.world.level.GameRules$Value,net.minecraft.server.MinecraftServer) -> a
+    294:294:net.minecraft.world.level.GameRules$Value copy() -> f
+    294:294:net.minecraft.world.level.GameRules$Value getSelf() -> g
+    305:305:void lambda$create$1(net.minecraft.server.MinecraftServer,net.minecraft.world.level.GameRules$IntegerValue) -> a
+    298:298:net.minecraft.world.level.GameRules$IntegerValue lambda$create$0(int,net.minecraft.world.level.GameRules$Type) -> a
+    294:294:net.minecraft.world.level.GameRules$Type access$100(int) -> a
+net.minecraft.world.level.GameRules$Key -> bpx$e:
     java.lang.String id -> a
-    135:137:void <init>(java.lang.String) -> <init>
-    141:141:java.lang.String toString() -> toString
-    146:147:boolean equals(java.lang.Object) -> equals
-    152:152:int hashCode() -> hashCode
-    156:156:java.lang.String getId() -> a
-    132:132:java.lang.String access$600(net.minecraft.world.level.GameRules$Key) -> a
-net.minecraft.world.level.GameRules$Type -> bjs$e:
+    net.minecraft.world.level.GameRules$Category category -> b
+    196:199:void <init>(java.lang.String,net.minecraft.world.level.GameRules$Category) -> <init>
+    203:203:java.lang.String toString() -> toString
+    208:209:boolean equals(java.lang.Object) -> equals
+    214:214:int hashCode() -> hashCode
+    218:218:java.lang.String getId() -> a
+    222:222:java.lang.String getDescriptionId() -> b
+    226:226:net.minecraft.world.level.GameRules$Category getCategory() -> c
+    192:192:java.lang.String access$600(net.minecraft.world.level.GameRules$Key) -> a
+net.minecraft.world.level.GameRules$Type -> bpx$f:
     java.util.function.Supplier argument -> a
     java.util.function.Function constructor -> b
     java.util.function.BiConsumer callback -> c
-    165:169:void <init>(java.util.function.Supplier,java.util.function.Function,java.util.function.BiConsumer) -> <init>
-    172:172:com.mojang.brigadier.builder.RequiredArgumentBuilder createArgument(java.lang.String) -> a
-    176:176:net.minecraft.world.level.GameRules$Value createRule() -> a
-    160:160:java.util.function.BiConsumer access$300(net.minecraft.world.level.GameRules$Type) -> a
-    160:160:void <init>(java.util.function.Supplier,java.util.function.Function,java.util.function.BiConsumer,net.minecraft.world.level.GameRules$1) -> <init>
-net.minecraft.world.level.GameRules$Value -> bjs$f:
+    net.minecraft.world.level.GameRules$VisitorCaller visitorCaller -> d
+    236:241:void <init>(java.util.function.Supplier,java.util.function.Function,java.util.function.BiConsumer,net.minecraft.world.level.GameRules$VisitorCaller) -> <init>
+    244:244:com.mojang.brigadier.builder.RequiredArgumentBuilder createArgument(java.lang.String) -> a
+    248:248:net.minecraft.world.level.GameRules$Value createRule() -> a
+    252:253:void callVisitor(net.minecraft.world.level.GameRules$GameRuleTypeVisitor,net.minecraft.world.level.GameRules$Key) -> a
+    230:230:java.util.function.BiConsumer access$300(net.minecraft.world.level.GameRules$Type) -> a
+    230:230:void <init>(java.util.function.Supplier,java.util.function.Function,java.util.function.BiConsumer,net.minecraft.world.level.GameRules$VisitorCaller,net.minecraft.world.level.GameRules$1) -> <init>
+net.minecraft.world.level.GameRules$Value -> bpx$g:
     net.minecraft.world.level.GameRules$Type type -> a
-    183:185:void <init>(net.minecraft.world.level.GameRules$Type) -> <init>
+    259:261:void <init>(net.minecraft.world.level.GameRules$Type) -> <init>
     void updateFromArgument(com.mojang.brigadier.context.CommandContext,java.lang.String) -> a
-    190:192:void setFromArgument(com.mojang.brigadier.context.CommandContext,java.lang.String) -> b
-    195:198:void onChanged(net.minecraft.server.MinecraftServer) -> a
+    266:268:void setFromArgument(com.mojang.brigadier.context.CommandContext,java.lang.String) -> b
+    271:274:void onChanged(net.minecraft.server.MinecraftServer) -> a
     void deserialize(java.lang.String) -> a
     java.lang.String serialize() -> b
-    206:206:java.lang.String toString() -> toString
+    282:282:java.lang.String toString() -> toString
     int getCommandResult() -> c
-    net.minecraft.world.level.GameRules$Value getSelf() -> e
-net.minecraft.world.level.GameType -> bjt:
+    net.minecraft.world.level.GameRules$Value getSelf() -> g
+    net.minecraft.world.level.GameRules$Value copy() -> f
+    void setFrom(net.minecraft.world.level.GameRules$Value,net.minecraft.server.MinecraftServer) -> a
+net.minecraft.world.level.GameRules$VisitorCaller -> bpx$h:
+    void call(net.minecraft.world.level.GameRules$GameRuleTypeVisitor,net.minecraft.world.level.GameRules$Key,net.minecraft.world.level.GameRules$Type) -> call
+net.minecraft.world.level.GameType -> bpy:
     net.minecraft.world.level.GameType NOT_SET -> a
     net.minecraft.world.level.GameType SURVIVAL -> b
     net.minecraft.world.level.GameType CREATIVE -> c
@@ -50587,297 +55130,266 @@ net.minecraft.world.level.GameType -> bjt:
     80:80:net.minecraft.world.level.GameType byName(java.lang.String) -> a
     84:89:net.minecraft.world.level.GameType byName(java.lang.String,net.minecraft.world.level.GameType) -> a
     7:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.GrassColor -> bju:
+net.minecraft.world.level.GrassColor -> bpz:
     int[] pixels -> a
     3:3:void <init>() -> <init>
     7:8:void init(int[]) -> a
     11:18:int get(double,double) -> a
     4:4:void <clinit>() -> <clinit>
-net.minecraft.world.level.ItemLike -> bjv:
-    net.minecraft.world.item.Item asItem() -> i
-net.minecraft.world.level.Level -> bjw:
-    org.apache.logging.log4j.Logger LOGGER -> d
+net.minecraft.world.level.ItemLike -> bqa:
+    net.minecraft.world.item.Item asItem() -> h
+net.minecraft.world.level.Level -> bqb:
+    org.apache.logging.log4j.Logger LOGGER -> e
+    com.mojang.serialization.Codec RESOURCE_KEY_CODEC -> f
+    net.minecraft.resources.ResourceKey OVERWORLD -> g
+    net.minecraft.resources.ResourceKey NETHER -> h
+    net.minecraft.resources.ResourceKey END -> i
     net.minecraft.core.Direction[] DIRECTIONS -> a
-    java.util.List blockEntityList -> e
-    java.util.List tickableBlockEntities -> f
-    java.util.List pendingBlockEntities -> g
-    java.util.List blockEntitiesToUnload -> h
+    java.util.List blockEntityList -> j
+    java.util.List tickableBlockEntities -> k
+    java.util.List pendingBlockEntities -> l
+    java.util.List blockEntitiesToUnload -> m
     java.lang.Thread thread -> b
-    int skyDarken -> c
-    int randValue -> i
-    int addend -> j
-    float oRainLevel -> k
-    float rainLevel -> l
-    float oThunderLevel -> m
-    float thunderLevel -> n
-    java.util.Random random -> o
-    net.minecraft.world.level.dimension.Dimension dimension -> p
-    net.minecraft.world.level.chunk.ChunkSource chunkSource -> q
-    net.minecraft.world.level.storage.LevelData levelData -> r
-    net.minecraft.util.profiling.ProfilerFiller profiler -> u
-    boolean isClientSide -> s
-    boolean updatingBlockEntities -> t
-    net.minecraft.world.level.border.WorldBorder worldBorder -> v
-    net.minecraft.world.level.biome.BiomeManager biomeManager -> w
-    93:132:void <init>(net.minecraft.world.level.storage.LevelData,net.minecraft.world.level.dimension.DimensionType,java.util.function.BiFunction,net.minecraft.util.profiling.ProfilerFiller,boolean) -> <init>
-    136:136:boolean isClientSide() -> p_
-    142:142:net.minecraft.server.MinecraftServer getServer() -> p
-    146:147:void validateSpawn() -> k_
-    150:154:net.minecraft.world.level.block.state.BlockState getTopBlockState(net.minecraft.core.BlockPos) -> i
-    158:158:boolean isInWorldBounds(net.minecraft.core.BlockPos) -> j
-    162:162:boolean isOutsideBuildHeight(net.minecraft.core.BlockPos) -> k
-    166:166:boolean isOutsideBuildHeight(int) -> b
-    170:170:net.minecraft.world.level.chunk.LevelChunk getChunkAt(net.minecraft.core.BlockPos) -> l
-    175:175:net.minecraft.world.level.chunk.LevelChunk getChunk(int,int) -> d
-    180:184:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> a
-    189:243:boolean setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
-    247:247:void onBlockStateChange(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
-    258:259:boolean removeBlock(net.minecraft.core.BlockPos,boolean) -> a
-    272:283:boolean destroyBlock(net.minecraft.core.BlockPos,boolean,net.minecraft.world.entity.Entity) -> a
-    287:287:boolean setBlockAndUpdate(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    boolean isDebug -> c
+    int skyDarken -> d
+    int randValue -> n
+    int addend -> o
+    float oRainLevel -> p
+    float rainLevel -> q
+    float oThunderLevel -> r
+    float thunderLevel -> s
+    java.util.Random random -> t
+    net.minecraft.world.level.dimension.DimensionType dimensionType -> x
+    net.minecraft.world.level.storage.WritableLevelData levelData -> u
+    java.util.function.Supplier profiler -> y
+    boolean isClientSide -> v
+    boolean updatingBlockEntities -> w
+    net.minecraft.world.level.border.WorldBorder worldBorder -> z
+    net.minecraft.world.level.biome.BiomeManager biomeManager -> A
+    net.minecraft.resources.ResourceKey dimension -> B
+    net.minecraft.resources.ResourceKey dimensionTypeKey -> C
+    102:158:void <init>(net.minecraft.world.level.storage.WritableLevelData,net.minecraft.resources.ResourceKey,net.minecraft.resources.ResourceKey,net.minecraft.world.level.dimension.DimensionType,java.util.function.Supplier,boolean,boolean,long) -> <init>
+    162:162:boolean isClientSide() -> s_
+    168:168:net.minecraft.server.MinecraftServer getServer() -> l
+    172:176:net.minecraft.world.level.block.state.BlockState getTopBlockState(net.minecraft.core.BlockPos) -> i
+    180:180:boolean isInWorldBounds(net.minecraft.core.BlockPos) -> j
+    184:184:boolean isInSpawnableBounds(net.minecraft.core.BlockPos) -> k
+    188:188:boolean isInWorldBoundsHorizontal(net.minecraft.core.BlockPos) -> e
+    192:192:boolean isOutsideSpawnableHeight(int) -> d
+    196:196:boolean isOutsideBuildHeight(net.minecraft.core.BlockPos) -> l
+    200:200:boolean isOutsideBuildHeight(int) -> b
+    204:204:double getRelativeFloorHeight(net.minecraft.core.BlockPos) -> m
+    208:221:double getRelativeFloorHeight(net.minecraft.core.BlockPos,java.util.function.Predicate) -> c
+    225:237:double getRelativeCeilingHeight(net.minecraft.core.BlockPos,double) -> a
+    241:241:net.minecraft.world.level.chunk.LevelChunk getChunkAt(net.minecraft.core.BlockPos) -> n
+    246:246:net.minecraft.world.level.chunk.LevelChunk getChunk(int,int) -> d
+    251:255:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> a
+    259:259:boolean setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
+    263:317:boolean setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int,int) -> a
+    321:321:void onBlockStateChange(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
+    332:333:boolean removeBlock(net.minecraft.core.BlockPos,boolean) -> a
+    346:359:boolean destroyBlock(net.minecraft.core.BlockPos,boolean,net.minecraft.world.entity.Entity,int) -> a
+    363:363:boolean setBlockAndUpdate(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     void sendBlockUpdated(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int) -> a
-    294:297:void blockUpdated(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
-    300:300:void setBlocksDirty(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> b
-    303:309:void updateNeighborsAt(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> b
-    312:330:void updateNeighborsAtExceptFromFacing(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.Direction) -> a
-    333:356:void neighborChanged(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos) -> a
-    361:368:int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
-    373:373:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
-    378:382:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
-    387:391:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
-    395:395:boolean isDay() -> J
-    399:399:boolean isNight() -> K
-    405:406:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
+    369:369:void setBlocksDirty(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> b
+    372:378:void updateNeighborsAt(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> b
+    381:399:void updateNeighborsAtExceptFromFacing(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.Direction) -> a
+    402:425:void neighborChanged(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos) -> a
+    430:437:int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
+    442:442:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
+    447:451:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
+    456:460:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
+    464:464:boolean isDay() -> J
+    468:468:boolean isNight() -> K
+    474:475:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
     void playSound(net.minecraft.world.entity.player.Player,double,double,double,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
     void playSound(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.Entity,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
-    415:415:void playLocalSound(double,double,double,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,boolean) -> a
-    419:419:void addParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
-    422:422:void addParticle(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> a
-    427:427:void addAlwaysVisibleParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> b
-    430:430:void addAlwaysVisibleParticle(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> b
-    433:434:float getSunAngle(float) -> a
-    438:452:boolean addBlockEntity(net.minecraft.world.level.block.entity.BlockEntity) -> a
-    456:463:void addAllPendingBlockEntities(java.util.Collection) -> a
-    466:530:void tickBlockEntities() -> L
-    534:543:void guardEntityTick(java.util.function.Consumer,net.minecraft.world.entity.Entity) -> a
-    546:565:boolean containsAnyBlocks(net.minecraft.world.phys.AABB) -> b
-    569:590:boolean containsFireBlock(net.minecraft.world.phys.AABB) -> c
-    595:616:net.minecraft.world.level.block.state.BlockState containsBlock(net.minecraft.world.phys.AABB,net.minecraft.world.level.block.Block) -> a
-    620:628:boolean containsMaterial(net.minecraft.world.phys.AABB,net.minecraft.world.level.material.Material) -> a
-    632:632:net.minecraft.world.level.Explosion explode(net.minecraft.world.entity.Entity,double,double,double,float,net.minecraft.world.level.Explosion$BlockInteraction) -> a
-    636:636:net.minecraft.world.level.Explosion explode(net.minecraft.world.entity.Entity,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction) -> a
-    640:646:net.minecraft.world.level.Explosion explode(net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction) -> a
-    650:657:boolean extinguishFire(net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    661:661:java.lang.String gatherChunkSourceStats() -> M
-    667:689:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
-    694:700:net.minecraft.world.level.block.entity.BlockEntity getPendingBlockEntityAt(net.minecraft.core.BlockPos) -> e
-    704:728:void setBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
-    731:744:void removeBlockEntity(net.minecraft.core.BlockPos) -> m
-    747:750:boolean isLoaded(net.minecraft.core.BlockPos) -> n
-    759:768:boolean loadedAndEntityCanStandOn(net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    772:778:void updateSkyBrightness() -> N
-    781:782:void setSpawnSettings(boolean,boolean) -> a
-    785:791:void prepareWeather() -> O
-    795:796:void close() -> close
-    801:801:net.minecraft.world.level.BlockGetter getChunkForCollisions(int,int) -> c
-    806:820:java.util.List getEntities(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
-    824:840:java.util.List getEntities(net.minecraft.world.entity.EntityType,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
-    845:862:java.util.List getEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
-    867:884:java.util.List getLoadedEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> b
+    484:484:void playLocalSound(double,double,double,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float,boolean) -> a
+    488:488:void addParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
+    491:491:void addParticle(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> a
+    496:496:void addAlwaysVisibleParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> b
+    499:499:void addAlwaysVisibleParticle(net.minecraft.core.particles.ParticleOptions,boolean,double,double,double,double,double,double) -> b
+    502:503:float getSunAngle(float) -> a
+    507:521:boolean addBlockEntity(net.minecraft.world.level.block.entity.BlockEntity) -> a
+    525:532:void addAllPendingBlockEntities(java.util.Collection) -> a
+    535:599:void tickBlockEntities() -> L
+    603:612:void guardEntityTick(java.util.function.Consumer,net.minecraft.world.entity.Entity) -> a
+    615:615:net.minecraft.world.level.Explosion explode(net.minecraft.world.entity.Entity,double,double,double,float,net.minecraft.world.level.Explosion$BlockInteraction) -> a
+    619:619:net.minecraft.world.level.Explosion explode(net.minecraft.world.entity.Entity,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction) -> a
+    623:626:net.minecraft.world.level.Explosion explode(net.minecraft.world.entity.Entity,net.minecraft.world.damagesource.DamageSource,net.minecraft.world.level.ExplosionDamageCalculator,double,double,double,float,boolean,net.minecraft.world.level.Explosion$BlockInteraction) -> a
+    630:630:java.lang.String gatherChunkSourceStats() -> M
+    636:658:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
+    663:669:net.minecraft.world.level.block.entity.BlockEntity getPendingBlockEntityAt(net.minecraft.core.BlockPos) -> D
+    673:697:void setBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
+    700:713:void removeBlockEntity(net.minecraft.core.BlockPos) -> o
+    716:719:boolean isLoaded(net.minecraft.core.BlockPos) -> p
+    728:737:boolean loadedAndEntityCanStandOnFace(net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,net.minecraft.core.Direction) -> a
+    741:741:boolean loadedAndEntityCanStandOn(net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    745:751:void updateSkyBrightness() -> N
+    754:755:void setSpawnSettings(boolean,boolean) -> b
+    758:764:void prepareWeather() -> O
+    768:769:void close() -> close
+    774:774:net.minecraft.world.level.BlockGetter getChunkForCollisions(int,int) -> c
+    779:794:java.util.List getEntities(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
+    798:814:java.util.List getEntities(net.minecraft.world.entity.EntityType,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
+    819:836:java.util.List getEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> a
+    841:858:java.util.List getLoadedEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> b
     net.minecraft.world.entity.Entity getEntity(int) -> a
-    891:894:void blockEntityChanged(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> b
-    898:898:int getSeaLevel() -> q_
-    903:903:net.minecraft.world.level.Level getLevel() -> q
-    907:907:net.minecraft.world.level.LevelType getGeneratorType() -> P
-    911:936:int getDirectSignalTo(net.minecraft.core.BlockPos) -> o
-    940:940:boolean hasSignal(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    944:949:int getSignal(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    953:971:boolean hasNeighborSignal(net.minecraft.core.BlockPos) -> p
-    975:988:int getBestNeighborSignal(net.minecraft.core.BlockPos) -> q
-    992:992:void disconnect() -> Q
-    void checkSession() -> v
-    997:998:void setGameTime(long) -> a
-    1002:1002:long getSeed() -> r_
-    1009:1009:long getGameTime() -> R
-    1017:1017:long getDayTime() -> S
-    1021:1022:void setDayTime(long) -> b
-    1025:1029:void tickTime() -> a
-    1033:1037:net.minecraft.core.BlockPos getSharedSpawnPos() -> s_
-    1041:1042:void setSpawnPos(net.minecraft.core.BlockPos) -> a_
-    1045:1045:boolean mayInteract(net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos) -> a
-    1049:1049:void broadcastEntityEvent(net.minecraft.world.entity.Entity,byte) -> a
-    1053:1053:net.minecraft.world.level.chunk.ChunkSource getChunkSource() -> E
-    1057:1058:void blockEvent(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,int,int) -> a
-    1062:1062:net.minecraft.world.level.storage.LevelData getLevelData() -> i
-    1066:1066:net.minecraft.world.level.GameRules getGameRules() -> T
-    1070:1070:float getThunderLevel(float) -> b
-    1074:1076:void setThunderLevel(float) -> c
-    1079:1079:float getRainLevel(float) -> d
-    1083:1085:void setRainLevel(float) -> e
-    1088:1091:boolean isThundering() -> U
-    1095:1095:boolean isRaining() -> V
-    1099:1109:boolean isRainingAt(net.minecraft.core.BlockPos) -> r
-    1113:1114:boolean isHumidAt(net.minecraft.core.BlockPos) -> s
+    865:868:void blockEntityChanged(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> b
+    872:872:int getSeaLevel() -> t_
+    877:877:net.minecraft.world.level.Level getLevel() -> n
+    881:906:int getDirectSignalTo(net.minecraft.core.BlockPos) -> q
+    910:910:boolean hasSignal(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    914:920:int getSignal(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    924:942:boolean hasNeighborSignal(net.minecraft.core.BlockPos) -> r
+    946:959:int getBestNeighborSignal(net.minecraft.core.BlockPos) -> s
+    963:963:void disconnect() -> P
+    969:969:long getGameTime() -> Q
+    977:977:long getDayTime() -> R
+    981:981:boolean mayInteract(net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos) -> a
+    985:985:void broadcastEntityEvent(net.minecraft.world.entity.Entity,byte) -> a
+    988:989:void blockEvent(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,int,int) -> a
+    993:993:net.minecraft.world.level.storage.LevelData getLevelData() -> u_
+    997:997:net.minecraft.world.level.GameRules getGameRules() -> S
+    1001:1001:float getThunderLevel(float) -> b
+    1005:1007:void setThunderLevel(float) -> c
+    1010:1010:float getRainLevel(float) -> d
+    1014:1016:void setRainLevel(float) -> e
+    1019:1022:boolean isThundering() -> T
+    1026:1026:boolean isRaining() -> U
+    1030:1042:boolean isRainingAt(net.minecraft.core.BlockPos) -> t
+    1046:1047:boolean isHumidAt(net.minecraft.core.BlockPos) -> u
     net.minecraft.world.level.saveddata.maps.MapItemSavedData getMapData(java.lang.String) -> a
     void setMapData(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
-    int getFreeMapId() -> y
-    1125:1125:void globalLevelEvent(int,net.minecraft.core.BlockPos,int) -> b
-    1128:1128:int getHeight() -> W
-    1132:1144:net.minecraft.CrashReportCategory fillReportDetails(net.minecraft.CrashReport) -> a
+    int getFreeMapId() -> t
+    1058:1058:void globalLevelEvent(int,net.minecraft.core.BlockPos,int) -> b
+    1061:1073:net.minecraft.CrashReportCategory fillReportDetails(net.minecraft.CrashReport) -> a
     void destroyBlockProgress(int,net.minecraft.core.BlockPos,int) -> a
-    1150:1150:void createFireworks(double,double,double,double,double,double,net.minecraft.nbt.CompoundTag) -> a
+    1079:1079:void createFireworks(double,double,double,double,double,double,net.minecraft.nbt.CompoundTag) -> a
     net.minecraft.world.scores.Scoreboard getScoreboard() -> D
-    1155:1172:void updateNeighbourForOutputSignal(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> c
-    1176:1183:net.minecraft.world.DifficultyInstance getCurrentDifficultyAt(net.minecraft.core.BlockPos) -> d
-    1188:1188:int getSkyDarken() -> c
-    1192:1192:void setSkyFlashTime(int) -> c
-    1196:1196:net.minecraft.world.level.border.WorldBorder getWorldBorder() -> f
-    1200:1200:void sendPacketToServer(net.minecraft.network.protocol.Packet) -> a
-    1205:1205:net.minecraft.world.level.dimension.Dimension getDimension() -> o
-    1210:1210:java.util.Random getRandom() -> t_
-    1215:1215:boolean isStateAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> a
-    1220:1220:boolean isFluidAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> b
-    net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> s
-    net.minecraft.tags.TagManager getTagManager() -> t
-    1228:1231:net.minecraft.core.BlockPos getBlockRandomPos(int,int,int,int) -> a
-    1235:1235:boolean noSave() -> u
-    1239:1239:net.minecraft.util.profiling.ProfilerFiller getProfiler() -> X
-    1244:1244:net.minecraft.world.level.biome.BiomeManager getBiomeManager() -> d
-    69:69:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int) -> a
-    1136:1136:java.lang.String lambda$fillReportDetails$5() -> b
-    1134:1134:java.lang.String lambda$fillReportDetails$4() -> h
-    628:628:boolean lambda$containsMaterial$3(net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate,net.minecraft.core.BlockPos) -> a
-    481:481:java.lang.String lambda$tickBlockEntities$2(net.minecraft.world.level.block.entity.BlockEntity) -> b
-    439:439:java.lang.Object lambda$addBlockEntity$1(net.minecraft.world.level.block.entity.BlockEntity) -> c
-    346:348:java.lang.String lambda$neighborChanged$0(net.minecraft.world.level.block.Block) -> a
-    70:86:void <clinit>() -> <clinit>
-net.minecraft.world.level.LevelAccessor -> bjx:
-    long getSeed() -> r_
-    30:30:float getMoonBrightness() -> Y
-    34:34:float getTimeOfDay(float) -> f
-    38:38:int getMoonPhase() -> Z
+    1084:1101:void updateNeighbourForOutputSignal(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> c
+    1105:1112:net.minecraft.world.DifficultyInstance getCurrentDifficultyAt(net.minecraft.core.BlockPos) -> d
+    1117:1117:int getSkyDarken() -> c
+    1121:1121:void setSkyFlashTime(int) -> c
+    1125:1125:net.minecraft.world.level.border.WorldBorder getWorldBorder() -> f
+    1129:1129:void sendPacketToServer(net.minecraft.network.protocol.Packet) -> a
+    1134:1134:net.minecraft.world.level.dimension.DimensionType dimensionType() -> m
+    1138:1138:net.minecraft.resources.ResourceKey dimensionTypeKey() -> V
+    1142:1142:net.minecraft.resources.ResourceKey dimension() -> W
+    1147:1147:java.util.Random getRandom() -> v_
+    1152:1152:boolean isStateAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> a
+    1157:1157:boolean isFluidAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> b
+    net.minecraft.world.item.crafting.RecipeManager getRecipeManager() -> o
+    net.minecraft.tags.TagManager getTagManager() -> p
+    1165:1168:net.minecraft.core.BlockPos getBlockRandomPos(int,int,int,int) -> a
+    1172:1172:boolean noSave() -> q
+    1176:1176:net.minecraft.util.profiling.ProfilerFiller getProfiler() -> X
+    1180:1180:java.util.function.Supplier getProfilerSupplier() -> Y
+    1185:1185:net.minecraft.world.level.biome.BiomeManager getBiomeManager() -> d
+    1189:1189:boolean isDebug() -> Z
+    net.minecraft.core.RegistryAccess registryAccess() -> r
+    74:74:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int) -> a
+    1065:1065:java.lang.String lambda$fillReportDetails$5() -> a
+    1063:1063:java.lang.String lambda$fillReportDetails$4() -> b
+    550:550:java.lang.String lambda$tickBlockEntities$3(net.minecraft.world.level.block.entity.BlockEntity) -> b
+    508:508:java.lang.Object lambda$addBlockEntity$2(net.minecraft.world.level.block.entity.BlockEntity) -> c
+    415:417:java.lang.String lambda$neighborChanged$1(net.minecraft.world.level.block.Block) -> a
+    204:204:boolean lambda$getRelativeFloorHeight$0(net.minecraft.world.level.block.state.BlockState) -> a
+    75:92:void <clinit>() -> <clinit>
+net.minecraft.world.level.Level$1 -> bqb$1:
+    net.minecraft.world.level.Level this$0 -> a
+    141:141:void <init>(net.minecraft.world.level.Level) -> <init>
+    144:144:double getCenterX() -> a
+    149:149:double getCenterZ() -> b
+net.minecraft.world.level.LevelAccessor -> bqc:
+    33:33:float getMoonBrightness() -> aa
+    37:37:float getTimeOfDay(float) -> f
+    41:41:int getMoonPhase() -> ab
     net.minecraft.world.level.TickList getBlockTicks() -> G
     net.minecraft.world.level.TickList getLiquidTicks() -> F
-    net.minecraft.world.level.Level getLevel() -> q
-    net.minecraft.world.level.storage.LevelData getLevelData() -> i
+    net.minecraft.world.level.Level getLevel() -> n
+    net.minecraft.world.level.storage.LevelData getLevelData() -> u_
     net.minecraft.world.DifficultyInstance getCurrentDifficultyAt(net.minecraft.core.BlockPos) -> d
-    net.minecraft.server.MinecraftServer getServer() -> p
-    55:55:net.minecraft.world.Difficulty getDifficulty() -> aa
+    net.minecraft.server.MinecraftServer getServer() -> l
+    58:58:net.minecraft.world.Difficulty getDifficulty() -> ac
     net.minecraft.world.level.chunk.ChunkSource getChunkSource() -> E
-    62:62:boolean hasChunk(int,int) -> b
-    java.util.Random getRandom() -> t_
-    void blockUpdated(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
-    net.minecraft.core.BlockPos getSharedSpawnPos() -> s_
+    65:65:boolean hasChunk(int,int) -> b
+    java.util.Random getRandom() -> v_
+    70:70:void blockUpdated(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
     void playSound(net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundSource,float,float) -> a
     void addParticle(net.minecraft.core.particles.ParticleOptions,double,double,double,double,double,double) -> a
     void levelEvent(net.minecraft.world.entity.player.Player,int,net.minecraft.core.BlockPos,int) -> a
-    78:79:void levelEvent(int,net.minecraft.core.BlockPos,int) -> c
-    83:83:java.util.stream.Stream getEntityCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.Set) -> b
-    88:88:boolean isUnobstructed(net.minecraft.world.entity.Entity,net.minecraft.world.phys.shapes.VoxelShape) -> a
-    93:93:net.minecraft.core.BlockPos getHeightmapPos(net.minecraft.world.level.levelgen.Heightmap$Types,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.LevelConflictException -> bjy:
-    5:6:void <init>(java.lang.String) -> <init>
-net.minecraft.world.level.LevelReader -> bjz:
+    79:79:int getHeight() -> ad
+    83:84:void levelEvent(int,net.minecraft.core.BlockPos,int) -> c
+    88:88:java.util.stream.Stream getEntityCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> c
+    93:93:boolean isUnobstructed(net.minecraft.world.entity.Entity,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    98:98:net.minecraft.core.BlockPos getHeightmapPos(net.minecraft.world.level.levelgen.Heightmap$Types,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.LevelReader -> bqd:
     net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int,net.minecraft.world.level.chunk.ChunkStatus,boolean) -> a
     boolean hasChunk(int,int) -> b
     int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
     int getSkyDarken() -> c
     net.minecraft.world.level.biome.BiomeManager getBiomeManager() -> d
-    35:35:net.minecraft.world.level.biome.Biome getBiome(net.minecraft.core.BlockPos) -> t
-    40:40:int getBlockTint(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> a
-    45:49:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
+    37:37:net.minecraft.world.level.biome.Biome getBiome(net.minecraft.core.BlockPos) -> v
+    41:51:java.util.stream.Stream getBlockStatesIfLoaded(net.minecraft.world.phys.AABB) -> c
+    56:56:int getBlockTint(net.minecraft.core.BlockPos,net.minecraft.world.level.ColorResolver) -> a
+    61:65:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
     net.minecraft.world.level.biome.Biome getUncachedNoiseBiome(int,int,int) -> a
-    boolean isClientSide() -> p_
-    int getSeaLevel() -> q_
-    net.minecraft.world.level.dimension.Dimension getDimension() -> o
-    61:61:net.minecraft.core.BlockPos getHeightmapPos(net.minecraft.world.level.levelgen.Heightmap$Types,net.minecraft.core.BlockPos) -> a
-    65:65:boolean isEmptyBlock(net.minecraft.core.BlockPos) -> u
-    69:84:boolean canSeeSkyFromBelowWater(net.minecraft.core.BlockPos) -> v
-    92:92:float getBrightness(net.minecraft.core.BlockPos) -> w
-    96:96:int getDirectSignal(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> c
-    100:100:net.minecraft.world.level.chunk.ChunkAccess getChunk(net.minecraft.core.BlockPos) -> x
-    104:104:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int) -> a
-    108:108:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int,net.minecraft.world.level.chunk.ChunkStatus) -> a
-    114:114:net.minecraft.world.level.BlockGetter getChunkForCollisions(int,int) -> c
-    118:118:boolean isWaterAt(net.minecraft.core.BlockPos) -> y
-    122:141:boolean containsAnyLiquid(net.minecraft.world.phys.AABB) -> d
-    145:145:int getMaxLocalRawBrightness(net.minecraft.core.BlockPos) -> z
-    149:153:int getMaxLocalRawBrightness(net.minecraft.core.BlockPos,int) -> c
-    161:161:boolean hasChunkAt(net.minecraft.core.BlockPos) -> A
-    169:169:boolean hasChunksAt(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    177:194:boolean hasChunksAt(int,int,int,int,int,int) -> a
-net.minecraft.world.level.LevelSettings -> bka:
-    long seed -> a
+    boolean isClientSide() -> s_
+    int getSeaLevel() -> t_
+    net.minecraft.world.level.dimension.DimensionType dimensionType() -> m
+    81:81:net.minecraft.core.BlockPos getHeightmapPos(net.minecraft.world.level.levelgen.Heightmap$Types,net.minecraft.core.BlockPos) -> a
+    85:85:boolean isEmptyBlock(net.minecraft.core.BlockPos) -> w
+    89:104:boolean canSeeSkyFromBelowWater(net.minecraft.core.BlockPos) -> x
+    112:112:float getBrightness(net.minecraft.core.BlockPos) -> y
+    116:116:int getDirectSignal(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> c
+    120:120:net.minecraft.world.level.chunk.ChunkAccess getChunk(net.minecraft.core.BlockPos) -> z
+    124:124:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int) -> a
+    128:128:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int,net.minecraft.world.level.chunk.ChunkStatus) -> a
+    134:134:net.minecraft.world.level.BlockGetter getChunkForCollisions(int,int) -> c
+    138:138:boolean isWaterAt(net.minecraft.core.BlockPos) -> A
+    142:160:boolean containsAnyLiquid(net.minecraft.world.phys.AABB) -> d
+    164:164:int getMaxLocalRawBrightness(net.minecraft.core.BlockPos) -> B
+    168:172:int getMaxLocalRawBrightness(net.minecraft.core.BlockPos,int) -> c
+    180:180:boolean hasChunkAt(net.minecraft.core.BlockPos) -> C
+    188:188:boolean hasChunksAt(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    196:213:boolean hasChunksAt(int,int,int,int,int,int) -> a
+net.minecraft.world.level.LevelSettings -> bqe:
+    java.lang.String levelName -> a
     net.minecraft.world.level.GameType gameType -> b
-    boolean generateMapFeatures -> c
-    boolean hardcore -> d
-    net.minecraft.world.level.LevelType levelType -> e
-    boolean allowCommands -> f
-    boolean startingBonusItems -> g
-    com.google.gson.JsonElement levelTypeOptions -> h
-    15:23:void <init>(long,net.minecraft.world.level.GameType,boolean,boolean,net.minecraft.world.level.LevelType) -> <init>
-    26:27:void <init>(net.minecraft.world.level.storage.LevelData) -> <init>
-    30:31:net.minecraft.world.level.LevelSettings enableStartingBonusItems() -> a
-    35:36:net.minecraft.world.level.LevelSettings enableSinglePlayerCommands() -> b
-    40:41:net.minecraft.world.level.LevelSettings setLevelTypeOptions(com.google.gson.JsonElement) -> a
-    45:45:boolean hasStartingBonusItems() -> c
-    49:49:long getSeed() -> d
-    53:53:net.minecraft.world.level.GameType getGameType() -> e
-    57:57:boolean isHardcore() -> f
-    61:61:boolean isGenerateMapFeatures() -> g
-    65:65:net.minecraft.world.level.LevelType getLevelType() -> h
-    69:69:boolean getAllowCommands() -> i
-    73:73:com.google.gson.JsonElement getLevelTypeOptions() -> j
-net.minecraft.world.level.LevelSimulatedRW -> bkb:
-net.minecraft.world.level.LevelSimulatedReader -> bkc:
+    boolean hardcore -> c
+    net.minecraft.world.Difficulty difficulty -> d
+    boolean allowCommands -> e
+    net.minecraft.world.level.GameRules gameRules -> f
+    net.minecraft.world.level.DataPackConfig dataPackConfig -> g
+    15:23:void <init>(java.lang.String,net.minecraft.world.level.GameType,boolean,net.minecraft.world.Difficulty,boolean,net.minecraft.world.level.GameRules,net.minecraft.world.level.DataPackConfig) -> <init>
+    26:32:net.minecraft.world.level.LevelSettings parse(com.mojang.serialization.Dynamic,net.minecraft.world.level.DataPackConfig) -> a
+    38:38:java.lang.String levelName() -> a
+    42:42:net.minecraft.world.level.GameType gameType() -> b
+    46:46:boolean hardcore() -> c
+    50:50:net.minecraft.world.Difficulty difficulty() -> d
+    54:54:boolean allowCommands() -> e
+    58:58:net.minecraft.world.level.GameRules gameRules() -> f
+    62:62:net.minecraft.world.level.DataPackConfig getDataPackConfig() -> g
+    66:66:net.minecraft.world.level.LevelSettings withGameType(net.minecraft.world.level.GameType) -> a
+    70:70:net.minecraft.world.level.LevelSettings withDifficulty(net.minecraft.world.Difficulty) -> a
+    74:74:net.minecraft.world.level.LevelSettings withDataPackConfig(net.minecraft.world.level.DataPackConfig) -> a
+    78:78:net.minecraft.world.level.LevelSettings copy() -> h
+    30:30:net.minecraft.world.Difficulty lambda$parse$0(java.lang.Number) -> a
+net.minecraft.world.level.LevelSimulatedRW -> bqf:
+net.minecraft.world.level.LevelSimulatedReader -> bqg:
     boolean isStateAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> a
     boolean isFluidAtPosition(net.minecraft.core.BlockPos,java.util.function.Predicate) -> b
     net.minecraft.core.BlockPos getHeightmapPos(net.minecraft.world.level.levelgen.Heightmap$Types,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.LevelType -> bkd:
-    net.minecraft.world.level.LevelType[] LEVEL_TYPES -> a
-    net.minecraft.world.level.LevelType NORMAL -> b
-    net.minecraft.world.level.LevelType FLAT -> c
-    net.minecraft.world.level.LevelType LARGE_BIOMES -> d
-    net.minecraft.world.level.LevelType AMPLIFIED -> e
-    net.minecraft.world.level.LevelType CUSTOMIZED -> f
-    net.minecraft.world.level.LevelType BUFFET -> g
-    net.minecraft.world.level.LevelType DEBUG_ALL_BLOCK_STATES -> h
-    net.minecraft.world.level.LevelType NORMAL_1_1 -> i
-    int id -> j
-    java.lang.String generatorName -> k
-    java.lang.String generatorSerialization -> l
-    int version -> m
-    boolean selectable -> n
-    boolean replacement -> o
-    boolean hasHelpText -> p
-    boolean hasCustomOptions -> q
-    28:29:void <init>(int,java.lang.String) -> <init>
-    32:33:void <init>(int,java.lang.String,int) -> <init>
-    35:42:void <init>(int,java.lang.String,java.lang.String,int) -> <init>
-    45:45:java.lang.String getName() -> a
-    49:49:java.lang.String getSerialization() -> b
-    53:53:java.lang.String getDescriptionId() -> c
-    57:57:java.lang.String getHelpTextId() -> d
-    61:61:int getVersion() -> e
-    65:68:net.minecraft.world.level.LevelType getReplacementForVersion(int) -> a
-    72:72:boolean hasCustomOptions() -> f
-    76:77:net.minecraft.world.level.LevelType setCustomOptions(boolean) -> a
-    81:82:net.minecraft.world.level.LevelType setSelectableByUser(boolean) -> b
-    86:86:boolean isSelectable() -> g
-    90:91:net.minecraft.world.level.LevelType setHasReplacement() -> k
-    95:95:boolean hasReplacement() -> h
-    100:105:net.minecraft.world.level.LevelType getLevelType(java.lang.String) -> a
-    109:109:int getId() -> i
-    113:113:boolean hasHelpText() -> j
-    117:118:net.minecraft.world.level.LevelType setHasHelpText() -> l
-    6:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.LevelWriter -> bke:
-    boolean setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
+net.minecraft.world.level.LevelWriter -> bqh:
+    boolean setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int,int) -> a
+    15:15:boolean setBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
     boolean removeBlock(net.minecraft.core.BlockPos,boolean) -> a
-    15:15:boolean destroyBlock(net.minecraft.core.BlockPos,boolean) -> b
-    boolean destroyBlock(net.minecraft.core.BlockPos,boolean,net.minecraft.world.entity.Entity) -> a
-    24:24:boolean addFreshEntity(net.minecraft.world.entity.Entity) -> c
-net.minecraft.world.level.LightLayer -> bkf:
+    22:22:boolean destroyBlock(net.minecraft.core.BlockPos,boolean) -> b
+    27:27:boolean destroyBlock(net.minecraft.core.BlockPos,boolean,net.minecraft.world.entity.Entity) -> a
+    boolean destroyBlock(net.minecraft.core.BlockPos,boolean,net.minecraft.world.entity.Entity,int) -> a
+    36:36:boolean addFreshEntity(net.minecraft.world.entity.Entity) -> c
+net.minecraft.world.level.LightLayer -> bqi:
     net.minecraft.world.level.LightLayer SKY -> a
     net.minecraft.world.level.LightLayer BLOCK -> b
     int surrounding -> c
@@ -50886,36 +55398,89 @@ net.minecraft.world.level.LightLayer -> bkf:
     3:3:net.minecraft.world.level.LightLayer valueOf(java.lang.String) -> valueOf
     9:11:void <init>(java.lang.String,int,int) -> <init>
     3:5:void <clinit>() -> <clinit>
-net.minecraft.world.level.NaturalSpawner -> bkg:
+net.minecraft.world.level.NaturalSpawner -> bqj:
     org.apache.logging.log4j.Logger LOGGER -> a
-    42:43:void <init>() -> <init>
-    46:173:void spawnCategoryForChunk(net.minecraft.world.entity.MobCategory,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.LevelChunk,net.minecraft.core.BlockPos) -> a
-    177:182:net.minecraft.world.level.biome.Biome$SpawnerData getRandomSpawnMobAt(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.entity.MobCategory,java.util.Random,net.minecraft.core.BlockPos) -> a
-    186:190:boolean canSpawnMobAt(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.entity.MobCategory,net.minecraft.world.level.biome.Biome$SpawnerData,net.minecraft.core.BlockPos) -> a
-    194:201:net.minecraft.core.BlockPos getRandomPosWithin(net.minecraft.world.level.Level,net.minecraft.world.level.chunk.LevelChunk) -> a
-    206:222:boolean isValidEmptySpawnBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
-    226:249:boolean isSpawnPositionOk(net.minecraft.world.entity.SpawnPlacements$Type,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-    254:321:void spawnMobsForChunkGeneration(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.biome.Biome,int,int,java.util.Random) -> a
-    324:331:net.minecraft.core.BlockPos getTopNonCollidingPos(net.minecraft.world.level.LevelReader,net.minecraft.world.entity.EntityType,int,int) -> a
-    38:38:void <clinit>() -> <clinit>
-net.minecraft.world.level.NaturalSpawner$1 -> bkg$1:
+    int MAGIC_NUMBER -> b
+    net.minecraft.world.entity.MobCategory[] SPAWNING_CATEGORIES -> c
+    141:142:void <init>() -> <init>
+    145:172:net.minecraft.world.level.NaturalSpawner$SpawnState createState(int,java.lang.Iterable,net.minecraft.world.level.NaturalSpawner$ChunkGetter) -> a
+    177:177:net.minecraft.world.level.biome.Biome getRoughBiome(net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.ChunkAccess) -> b
+    181:192:void spawnForChunk(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.LevelChunk,net.minecraft.world.level.NaturalSpawner$SpawnState,boolean,boolean,boolean) -> a
+    195:201:void spawnCategoryForChunk(net.minecraft.world.entity.MobCategory,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.LevelChunk,net.minecraft.world.level.NaturalSpawner$SpawnPredicate,net.minecraft.world.level.NaturalSpawner$AfterSpawnCallback) -> a
+    205:206:void spawnCategoryForPosition(net.minecraft.world.entity.MobCategory,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    209:297:void spawnCategoryForPosition(net.minecraft.world.entity.MobCategory,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.core.BlockPos,net.minecraft.world.level.NaturalSpawner$SpawnPredicate,net.minecraft.world.level.NaturalSpawner$AfterSpawnCallback) -> a
+    300:311:boolean isRightDistanceToPlayerAndSpawnPoint(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.core.BlockPos$MutableBlockPos,double) -> a
+    315:339:boolean isValidSpawnPostitionForType(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.MobCategory,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.Biome$SpawnerData,net.minecraft.core.BlockPos$MutableBlockPos,double) -> a
+    346:355:net.minecraft.world.entity.Mob getMobForSpawn(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.EntityType) -> a
+    359:365:boolean isValidPositionForMob(net.minecraft.server.level.ServerLevel,net.minecraft.world.entity.Mob,double) -> a
+    370:380:net.minecraft.world.level.biome.Biome$SpawnerData getRandomSpawnMobAt(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.entity.MobCategory,java.util.Random,net.minecraft.core.BlockPos) -> a
+    384:384:boolean canSpawnMobAt(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.entity.MobCategory,net.minecraft.world.level.biome.Biome$SpawnerData,net.minecraft.core.BlockPos) -> a
+    389:392:java.util.List mobsAt(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.entity.MobCategory,net.minecraft.core.BlockPos,net.minecraft.world.level.biome.Biome) -> a
+    396:403:net.minecraft.core.BlockPos getRandomPosWithin(net.minecraft.world.level.Level,net.minecraft.world.level.chunk.LevelChunk) -> a
+    408:427:boolean isValidEmptySpawnBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState,net.minecraft.world.entity.EntityType) -> a
+    431:456:boolean isSpawnPositionOk(net.minecraft.world.entity.SpawnPlacements$Type,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
+    461:528:void spawnMobsForChunkGeneration(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.biome.Biome,int,int,java.util.Random) -> a
+    531:551:net.minecraft.core.BlockPos getTopNonCollidingPos(net.minecraft.world.level.LevelReader,net.minecraft.world.entity.EntityType,int,int) -> a
+    205:205:void lambda$spawnCategoryForPosition$6(net.minecraft.world.entity.Mob,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    205:205:boolean lambda$spawnCategoryForPosition$5(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    188:188:void lambda$spawnForChunk$4(net.minecraft.world.level.NaturalSpawner$SpawnState,net.minecraft.world.entity.Mob,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    188:188:boolean lambda$spawnForChunk$3(net.minecraft.world.level.NaturalSpawner$SpawnState,net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    164:170:void lambda$createState$2(net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,net.minecraft.world.level.PotentialCalculator,it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,net.minecraft.world.entity.MobCategory,net.minecraft.world.level.chunk.LevelChunk) -> a
+    55:55:net.minecraft.world.entity.MobCategory[] lambda$static$1(int) -> a
+    55:55:boolean lambda$static$0(net.minecraft.world.entity.MobCategory) -> a
+    48:48:net.minecraft.world.level.biome.Biome access$000(net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    48:48:int access$100() -> a
+    49:55:void <clinit>() -> <clinit>
+net.minecraft.world.level.NaturalSpawner$1 -> bqj$1:
     int[] $SwitchMap$net$minecraft$world$entity$SpawnPlacements$Type -> a
-    237:237:void <clinit>() -> <clinit>
-net.minecraft.world.level.PathNavigationRegion -> bkh:
+    442:442:void <clinit>() -> <clinit>
+net.minecraft.world.level.NaturalSpawner$AfterSpawnCallback -> bqj$a:
+    void run(net.minecraft.world.entity.Mob,net.minecraft.world.level.chunk.ChunkAccess) -> run
+net.minecraft.world.level.NaturalSpawner$ChunkGetter -> bqj$b:
+    void query(long,java.util.function.Consumer) -> query
+net.minecraft.world.level.NaturalSpawner$SpawnPredicate -> bqj$c:
+    boolean test(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.ChunkAccess) -> test
+net.minecraft.world.level.NaturalSpawner$SpawnState -> bqj$d:
+    int spawnableChunkCount -> a
+    it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap mobCategoryCounts -> b
+    net.minecraft.world.level.PotentialCalculator spawnPotential -> c
+    it.unimi.dsi.fastutil.objects.Object2IntMap unmodifiableMobCategoryCounts -> d
+    net.minecraft.core.BlockPos lastCheckedPos -> e
+    net.minecraft.world.entity.EntityType lastCheckedType -> f
+    double lastCharge -> g
+    69:74:void <init>(int,it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,net.minecraft.world.level.PotentialCalculator) -> <init>
+    77:89:boolean canSpawn(net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    93:110:void afterSpawn(net.minecraft.world.entity.Mob,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    113:113:int getSpawnableChunkCount() -> a
+    117:117:it.unimi.dsi.fastutil.objects.Object2IntMap getMobCategoryCounts() -> b
+    121:122:boolean canSpawnForCategory(net.minecraft.world.entity.MobCategory) -> a
+    57:57:void <init>(int,it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,net.minecraft.world.level.PotentialCalculator,net.minecraft.world.level.NaturalSpawner$1) -> <init>
+    57:57:boolean access$300(net.minecraft.world.level.NaturalSpawner$SpawnState,net.minecraft.world.entity.MobCategory) -> a
+    57:57:void access$400(net.minecraft.world.level.NaturalSpawner$SpawnState,net.minecraft.world.entity.Mob,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    57:57:boolean access$500(net.minecraft.world.level.NaturalSpawner$SpawnState,net.minecraft.world.entity.EntityType,net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.ChunkAccess) -> a
+net.minecraft.world.level.NoiseColumn -> bqk:
+    net.minecraft.world.level.block.state.BlockState[] column -> a
+    14:16:void <init>(net.minecraft.world.level.block.state.BlockState[]) -> <init>
+    21:21:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
+    26:30:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
+    35:35:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
+net.minecraft.world.level.PathNavigationRegion -> bql:
     int centerX -> a
     int centerZ -> b
     net.minecraft.world.level.chunk.ChunkAccess[][] chunks -> c
     boolean allEmpty -> d
     net.minecraft.world.level.Level level -> e
-    25:54:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> <init>
-    57:57:net.minecraft.world.level.chunk.ChunkAccess getChunk(net.minecraft.core.BlockPos) -> d
-    61:68:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int) -> a
-    73:73:net.minecraft.world.level.border.WorldBorder getWorldBorder() -> f
-    78:78:net.minecraft.world.level.BlockGetter getChunkForCollisions(int,int) -> c
-    84:85:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
-    90:95:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
-    100:105:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
-net.minecraft.world.level.PortalForcer -> bki:
+    30:59:void <init>(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> <init>
+    62:62:net.minecraft.world.level.chunk.ChunkAccess getChunk(net.minecraft.core.BlockPos) -> d
+    66:73:net.minecraft.world.level.chunk.ChunkAccess getChunk(int,int) -> a
+    78:78:net.minecraft.world.level.border.WorldBorder getWorldBorder() -> f
+    83:83:net.minecraft.world.level.BlockGetter getChunkForCollisions(int,int) -> c
+    89:90:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
+    95:100:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
+    105:105:java.util.stream.Stream getEntityCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> c
+    110:110:java.util.stream.Stream getCollisions(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.function.Predicate) -> d
+    115:120:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
+net.minecraft.world.level.PortalForcer -> bqm:
     net.minecraft.server.level.ServerLevel level -> a
     java.util.Random random -> b
     34:37:void <init>(net.minecraft.server.level.ServerLevel) -> <init>
@@ -50926,50 +55491,73 @@ net.minecraft.world.level.PortalForcer -> bki:
     65:65:int lambda$findPortal$2(net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
     65:65:double lambda$findPortal$1(net.minecraft.core.BlockPos,net.minecraft.world.entity.ai.village.poi.PoiRecord) -> a
     63:63:boolean lambda$findPortal$0(net.minecraft.world.entity.ai.village.poi.PoiType) -> a
-net.minecraft.world.level.ServerTickList -> bkj:
+net.minecraft.world.level.PotentialCalculator -> bqn:
+    java.util.List charges -> a
+    8:29:void <init>() -> <init>
+    32:35:void addCharge(net.minecraft.core.BlockPos,double) -> a
+    38:45:double getPotentialEnergyChange(net.minecraft.core.BlockPos,double) -> b
+net.minecraft.world.level.PotentialCalculator$PointCharge -> bqn$a:
+    net.minecraft.core.BlockPos pos -> a
+    double charge -> b
+    14:17:void <init>(net.minecraft.core.BlockPos,double) -> <init>
+    20:25:double getPotentialChange(net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.ServerTickList -> bqo:
     java.util.function.Predicate ignore -> a
     java.util.function.Function toId -> b
-    java.util.function.Function fromId -> c
-    java.util.Set tickNextTickSet -> d
-    java.util.TreeSet tickNextTickList -> e
-    net.minecraft.server.level.ServerLevel level -> f
-    java.util.Queue currentlyTicking -> g
-    java.util.List alreadyTicked -> h
-    java.util.function.Consumer ticker -> i
-    38:52:void <init>(net.minecraft.server.level.ServerLevel,java.util.function.Predicate,java.util.function.Function,java.util.function.Function,java.util.function.Consumer) -> <init>
-    55:102:void tick() -> b
-    107:107:boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
-    112:113:void addAll(java.util.stream.Stream) -> a
-    116:121:java.util.List fetchTicksInChunk(net.minecraft.world.level.ChunkPos,boolean,boolean) -> a
-    125:133:java.util.List fetchTicksInArea(net.minecraft.world.level.levelgen.structure.BoundingBox,boolean,boolean) -> a
-    138:152:java.util.List fetchTicksInArea(java.util.List,java.util.Collection,net.minecraft.world.level.levelgen.structure.BoundingBox,boolean) -> a
-    157:165:void copy(net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos) -> a
-    169:170:net.minecraft.nbt.ListTag save(net.minecraft.world.level.ChunkPos) -> a
-    174:187:net.minecraft.nbt.ListTag saveTickList(java.util.function.Function,java.lang.Iterable,long) -> a
-    191:200:void load(net.minecraft.nbt.ListTag) -> a
-    208:208:boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
-    213:216:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
-    219:223:void addTickData(net.minecraft.world.level.TickNextTickData) -> a
-    227:227:int size() -> a
-net.minecraft.world.level.SpawnData -> bkk:
+    java.util.Set tickNextTickSet -> c
+    java.util.TreeSet tickNextTickList -> d
+    net.minecraft.server.level.ServerLevel level -> e
+    java.util.Queue currentlyTicking -> f
+    java.util.List alreadyTicked -> g
+    java.util.function.Consumer ticker -> h
+    36:49:void <init>(net.minecraft.server.level.ServerLevel,java.util.function.Predicate,java.util.function.Function,java.util.function.Consumer) -> <init>
+    52:99:void tick() -> b
+    104:104:boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
+    108:113:java.util.List fetchTicksInChunk(net.minecraft.world.level.ChunkPos,boolean,boolean) -> a
+    117:125:java.util.List fetchTicksInArea(net.minecraft.world.level.levelgen.structure.BoundingBox,boolean,boolean) -> a
+    130:144:java.util.List fetchTicksInArea(java.util.List,java.util.Collection,net.minecraft.world.level.levelgen.structure.BoundingBox,boolean) -> a
+    149:157:void copy(net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos) -> a
+    161:162:net.minecraft.nbt.ListTag save(net.minecraft.world.level.ChunkPos) -> a
+    166:179:net.minecraft.nbt.ListTag saveTickList(java.util.function.Function,java.lang.Iterable,long) -> a
+    188:188:boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
+    193:196:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
+    199:203:void addTickData(net.minecraft.world.level.TickNextTickData) -> a
+    207:207:int size() -> a
+net.minecraft.world.level.SpawnData -> bqp:
     net.minecraft.nbt.CompoundTag tag -> b
     15:19:void <init>() -> <init>
     22:23:void <init>(net.minecraft.nbt.CompoundTag) -> <init>
-    26:29:void <init>(int,net.minecraft.nbt.CompoundTag) -> <init>
-    32:42:net.minecraft.nbt.CompoundTag save() -> a
-    46:46:net.minecraft.nbt.CompoundTag getTag() -> b
-net.minecraft.world.level.TickList -> bkl:
+    26:37:void <init>(int,net.minecraft.nbt.CompoundTag) -> <init>
+    40:45:net.minecraft.nbt.CompoundTag save() -> a
+    49:49:net.minecraft.nbt.CompoundTag getTag() -> b
+net.minecraft.world.level.StructureFeatureManager -> bqq:
+    net.minecraft.world.level.LevelAccessor level -> a
+    net.minecraft.world.level.levelgen.WorldGenSettings worldGenSettings -> b
+    22:25:void <init>(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.WorldGenSettings) -> <init>
+    29:32:net.minecraft.world.level.StructureFeatureManager forWorldGenRegion(net.minecraft.server.level.WorldGenRegion) -> a
+    37:41:java.util.stream.Stream startsForFeature(net.minecraft.core.SectionPos,net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    46:46:net.minecraft.world.level.levelgen.structure.StructureStart getStartForFeature(net.minecraft.core.SectionPos,net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.chunk.FeatureAccess) -> a
+    50:51:void setStartForFeature(net.minecraft.core.SectionPos,net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.levelgen.structure.StructureStart,net.minecraft.world.level.chunk.FeatureAccess) -> a
+    54:55:void addReferenceForFeature(net.minecraft.core.SectionPos,net.minecraft.world.level.levelgen.feature.StructureFeature,long,net.minecraft.world.level.chunk.FeatureAccess) -> a
+    58:58:boolean shouldGenerateFeatures() -> a
+    62:65:net.minecraft.world.level.levelgen.structure.StructureStart getStructureAt(net.minecraft.core.BlockPos,boolean,net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    64:64:boolean lambda$getStructureAt$5(boolean,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    64:64:boolean lambda$null$4(net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.StructurePiece) -> a
+    63:63:boolean lambda$getStructureAt$3(net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    41:41:boolean lambda$startsForFeature$2(net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    40:40:net.minecraft.world.level.levelgen.structure.StructureStart lambda$startsForFeature$1(net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.core.SectionPos) -> a
+    39:39:net.minecraft.core.SectionPos lambda$startsForFeature$0(java.lang.Long) -> a
+net.minecraft.world.level.TickList -> bqr:
     boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
-    11:12:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int) -> a
+    9:10:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int) -> a
     void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
     boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
-    void addAll(java.util.stream.Stream) -> a
     int size() -> a
-net.minecraft.world.level.TickNextTickData -> bkm:
+net.minecraft.world.level.TickNextTickData -> bqs:
     long counter -> d
     java.lang.Object type -> e
     net.minecraft.core.BlockPos pos -> a
-    long delay -> b
+    long triggerTick -> b
     net.minecraft.world.level.TickPriority priority -> c
     long c -> f
     16:17:void <init>(net.minecraft.core.BlockPos,java.lang.Object) -> <init>
@@ -50982,7 +55570,7 @@ net.minecraft.world.level.TickNextTickData -> bkm:
     53:53:long lambda$createTimeComparator$2(net.minecraft.world.level.TickNextTickData) -> a
     53:53:net.minecraft.world.level.TickPriority lambda$createTimeComparator$1(net.minecraft.world.level.TickNextTickData) -> b
     53:53:long lambda$createTimeComparator$0(net.minecraft.world.level.TickNextTickData) -> c
-net.minecraft.world.level.TickPriority -> bkn:
+net.minecraft.world.level.TickPriority -> bqt:
     net.minecraft.world.level.TickPriority EXTREMELY_HIGH -> a
     net.minecraft.world.level.TickPriority VERY_HIGH -> b
     net.minecraft.world.level.TickPriority HIGH -> c
@@ -50998,105 +55586,176 @@ net.minecraft.world.level.TickPriority -> bkn:
     20:28:net.minecraft.world.level.TickPriority byValue(int) -> a
     32:32:int getValue() -> a
     3:10:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.BadlandsBiome -> bko:
-    13:54:void <init>() -> <init>
-    58:58:int getFoliageColor() -> a
-    63:63:int getGrassColor(double,double) -> a
-net.minecraft.world.level.biome.BadlandsPlateauBiome -> bkp:
-    13:54:void <init>() -> <init>
-    58:58:int getFoliageColor() -> a
-    63:63:int getGrassColor(double,double) -> a
-net.minecraft.world.level.biome.BambooJungleBiome -> bkq:
-    13:65:void <init>() -> <init>
-net.minecraft.world.level.biome.BambooJungleHillsBiome -> bkr:
-    13:65:void <init>() -> <init>
-net.minecraft.world.level.biome.BeachBiome -> bks:
-    14:57:void <init>() -> <init>
-net.minecraft.world.level.biome.Biome -> bkt:
+net.minecraft.world.level.WorldGenLevel -> bqu:
+    long getSeed() -> B
+net.minecraft.world.level.biome.AmbientAdditionsSettings -> bqv:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.sounds.SoundEvent soundEvent -> b
+    double tickChance -> c
+    16:19:void <init>(net.minecraft.sounds.SoundEvent,double) -> <init>
+    22:22:net.minecraft.sounds.SoundEvent getSoundEvent() -> a
+    26:26:double getTickChance() -> b
+    8:11:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:java.lang.Double lambda$null$1(net.minecraft.world.level.biome.AmbientAdditionsSettings) -> a
+    9:9:net.minecraft.sounds.SoundEvent lambda$null$0(net.minecraft.world.level.biome.AmbientAdditionsSettings) -> b
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.AmbientMoodSettings -> bqw:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.biome.AmbientMoodSettings LEGACY_CAVE_SETTINGS -> b
+    net.minecraft.sounds.SoundEvent soundEvent -> c
+    int tickDelay -> d
+    int blockSearchExtent -> e
+    double soundPositionOffset -> f
+    29:34:void <init>(net.minecraft.sounds.SoundEvent,int,int,double) -> <init>
+    37:37:net.minecraft.sounds.SoundEvent getSoundEvent() -> a
+    41:41:int getTickDelay() -> b
+    45:45:int getBlockSearchExtent() -> c
+    49:49:double getSoundPositionOffset() -> d
+    10:15:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:java.lang.Double lambda$null$3(net.minecraft.world.level.biome.AmbientMoodSettings) -> a
+    13:13:java.lang.Integer lambda$null$2(net.minecraft.world.level.biome.AmbientMoodSettings) -> b
+    12:12:java.lang.Integer lambda$null$1(net.minecraft.world.level.biome.AmbientMoodSettings) -> c
+    11:11:net.minecraft.sounds.SoundEvent lambda$null$0(net.minecraft.world.level.biome.AmbientMoodSettings) -> d
+    10:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.AmbientParticleSettings -> bqx:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.core.particles.ParticleOptions options -> b
+    float probability -> c
+    19:22:void <init>(net.minecraft.core.particles.ParticleOptions,float) -> <init>
+    25:25:net.minecraft.core.particles.ParticleOptions getOptions() -> a
+    29:29:boolean canSpawn(java.util.Random) -> a
+    11:14:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    13:13:java.lang.Float lambda$null$1(net.minecraft.world.level.biome.AmbientParticleSettings) -> a
+    12:12:net.minecraft.core.particles.ParticleOptions lambda$null$0(net.minecraft.world.level.biome.AmbientParticleSettings) -> b
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.BadlandsBiome -> bqy:
+    10:58:void <init>() -> <init>
+    62:62:int getFoliageColor() -> a
+    67:67:int getGrassColor(double,double) -> a
+net.minecraft.world.level.biome.BadlandsPlateauBiome -> bqz:
+    10:58:void <init>() -> <init>
+    62:62:int getFoliageColor() -> a
+    67:67:int getGrassColor(double,double) -> a
+net.minecraft.world.level.biome.BambooJungleBiome -> bra:
+    10:69:void <init>() -> <init>
+net.minecraft.world.level.biome.BambooJungleHillsBiome -> brb:
+    10:69:void <init>() -> <init>
+net.minecraft.world.level.biome.BasaltDeltasBiome -> brc:
+    26:92:void <init>() -> <init>
+net.minecraft.world.level.biome.BeachBiome -> brd:
+    10:61:void <init>() -> <init>
+net.minecraft.world.level.biome.Biome -> bre:
     org.apache.logging.log4j.Logger LOGGER -> a
-    java.util.Set EXPLORABLE_BIOMES -> b
-    net.minecraft.core.IdMapper MUTATED_BIOMES -> c
-    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise TEMPERATURE_NOISE -> d
-    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise BIOME_INFO_NOISE -> e
-    java.lang.String descriptionId -> f
-    float depth -> g
-    float scale -> h
-    float temperature -> i
-    float downfall -> j
-    int waterColor -> k
-    int waterFogColor -> l
-    int skyColor -> u
-    java.lang.String parent -> m
-    net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder surfaceBuilder -> n
-    net.minecraft.world.level.biome.Biome$BiomeCategory biomeCategory -> o
-    net.minecraft.world.level.biome.Biome$Precipitation precipitation -> p
+    com.mojang.serialization.Codec CODEC -> b
+    java.util.Set EXPLORABLE_BIOMES -> c
+    net.minecraft.core.IdMapper MUTATED_BIOMES -> d
+    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise TEMPERATURE_NOISE -> e
+    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise BIOME_INFO_NOISE -> f
+    java.lang.String descriptionId -> g
+    float depth -> h
+    float scale -> i
+    float temperature -> j
+    float downfall -> k
+    int skyColor -> t
+    java.lang.String parent -> l
+    net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder surfaceBuilder -> m
+    net.minecraft.world.level.biome.Biome$BiomeCategory biomeCategory -> n
+    net.minecraft.world.level.biome.Biome$Precipitation precipitation -> o
+    net.minecraft.world.level.biome.BiomeSpecialEffects specialEffects -> p
     java.util.Map carvers -> q
     java.util.Map features -> r
     java.util.List flowerFeatures -> s
-    java.util.Map validFeatureStarts -> t
+    java.util.Map validFeatureStarts -> u
     java.util.Map spawners -> v
-    java.lang.ThreadLocal temperatureCache -> w
-    80:80:net.minecraft.world.level.biome.Biome getMutatedVariant(net.minecraft.world.level.biome.Biome) -> a
-    84:84:net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver makeCarver(net.minecraft.world.level.levelgen.carver.WorldCarver,net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> a
-    184:233:void <init>(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> <init>
-    236:236:boolean isMutated() -> b
-    240:243:int calculateSkyColor() -> u
-    247:247:int getSkyColor() -> c
-    251:252:void addSpawn(net.minecraft.world.entity.MobCategory,net.minecraft.world.level.biome.Biome$SpawnerData) -> a
-    255:255:java.util.List getMobs(net.minecraft.world.entity.MobCategory) -> a
-    297:297:net.minecraft.world.level.biome.Biome$Precipitation getPrecipitation() -> d
-    301:301:boolean isHumid() -> e
-    305:305:float getCreatureProbability() -> f
-    309:313:float getTemperatureNoCache(net.minecraft.core.BlockPos) -> a
-    317:328:float getTemperature(net.minecraft.core.BlockPos) -> b
-    332:332:boolean shouldFreeze(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    336:354:boolean shouldFreeze(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,boolean) -> a
-    358:371:boolean shouldSnow(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> b
-    375:380:void addFeature(net.minecraft.world.level.levelgen.GenerationStep$Decoration,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
-    383:384:void addCarver(net.minecraft.world.level.levelgen.GenerationStep$Carving,net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver) -> a
-    387:387:java.util.List getCarvers(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
-    391:392:void addStructureStart(net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
-    395:395:boolean isValidStart(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
-    401:401:net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration getStructureConfiguration(net.minecraft.world.level.levelgen.feature.StructureFeature) -> b
-    405:405:java.util.List getFlowerFeatures() -> g
-    409:409:java.util.List getFeaturesForStep(net.minecraft.world.level.levelgen.GenerationStep$Decoration) -> a
-    413:427:void generate(net.minecraft.world.level.levelgen.GenerationStep$Decoration,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.LevelAccessor,long,net.minecraft.world.level.levelgen.WorldgenRandom,net.minecraft.core.BlockPos) -> a
-    430:433:int getGrassColor(double,double) -> a
-    437:440:int getFoliageColor() -> a
-    445:447:void buildSurfaceAt(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long) -> a
-    450:460:net.minecraft.world.level.biome.Biome$BiomeTempCategory getTemperatureCategory() -> h
-    464:465:net.minecraft.world.level.biome.Biome getBiome(int,net.minecraft.world.level.biome.Biome) -> a
-    469:469:float getDepth() -> i
-    473:473:float getDownfall() -> j
-    477:477:net.minecraft.network.chat.Component getName() -> k
-    481:484:java.lang.String getDescriptionId() -> l
-    488:488:float getScale() -> m
-    492:492:float getTemperature() -> n
-    496:496:int getWaterColor() -> o
-    500:500:int getWaterFogColor() -> p
-    504:504:net.minecraft.world.level.biome.Biome$BiomeCategory getBiomeCategory() -> q
-    508:508:net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder getSurfaceBuilder() -> r
-    512:512:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration getSurfaceBuilderConfig() -> s
-    517:517:java.lang.String getParent() -> t
-    524:569:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    549:551:com.mojang.datafixers.util.Pair lambda$serialize$11(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> a
-    551:551:java.lang.Object lambda$null$10(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.biome.Biome$SpawnerData) -> a
-    541:543:com.mojang.datafixers.util.Pair lambda$serialize$9(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> b
-    533:535:com.mojang.datafixers.util.Pair lambda$serialize$8(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> c
-    535:535:java.lang.Object lambda$null$7(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
-    525:527:com.mojang.datafixers.util.Pair lambda$serialize$6(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> d
-    527:527:java.lang.Object lambda$null$5(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver) -> a
-    422:422:java.lang.String lambda$generate$4(net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> b
-    387:387:java.util.List lambda$getCarvers$3(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> b
-    383:383:java.util.List lambda$addCarver$2(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> c
-    190:190:it.unimi.dsi.fastutil.longs.Long2FloatLinkedOpenHashMap lambda$new$1() -> v
-    191:197:it.unimi.dsi.fastutil.longs.Long2FloatLinkedOpenHashMap lambda$null$0() -> w
-    65:75:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.Biome$1 -> bkt$1:
+    java.util.Map mobSpawnCosts -> w
+    java.util.List optimalParameters -> x
+    java.lang.ThreadLocal temperatureCache -> y
+    120:120:net.minecraft.world.level.biome.Biome getMutatedVariant(net.minecraft.world.level.biome.Biome) -> a
+    124:124:net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver makeCarver(net.minecraft.world.level.levelgen.carver.WorldCarver,net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> a
+    257:311:void <init>(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> <init>
+    257:347:void <init>(net.minecraft.world.level.biome.Biome$Precipitation,net.minecraft.world.level.biome.Biome$BiomeCategory,float,float,float,float,net.minecraft.world.level.biome.BiomeSpecialEffects,int,net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder,java.util.Map,java.util.Map,java.util.List,java.util.Map,java.util.List,java.util.Optional) -> <init>
+    350:350:boolean isMutated() -> b
+    354:357:int calculateSkyColor() -> D
+    361:361:int getSkyColor() -> c
+    365:366:void addSpawn(net.minecraft.world.entity.MobCategory,net.minecraft.world.level.biome.Biome$SpawnerData) -> a
+    391:392:void addMobCharge(net.minecraft.world.entity.EntityType,double,double) -> a
+    395:395:java.util.List getMobs(net.minecraft.world.entity.MobCategory) -> a
+    400:400:net.minecraft.world.level.biome.Biome$MobSpawnCost getMobSpawnCost(net.minecraft.world.entity.EntityType) -> a
+    429:429:net.minecraft.world.level.biome.Biome$Precipitation getPrecipitation() -> d
+    433:433:boolean isHumid() -> e
+    437:437:float getCreatureProbability() -> f
+    441:445:float getTemperatureNoCache(net.minecraft.core.BlockPos) -> a
+    449:460:float getTemperature(net.minecraft.core.BlockPos) -> b
+    464:464:boolean shouldFreeze(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    468:486:boolean shouldFreeze(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,boolean) -> a
+    490:503:boolean shouldSnow(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> b
+    507:512:void addFeature(net.minecraft.world.level.levelgen.GenerationStep$Decoration,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
+    515:516:void addCarver(net.minecraft.world.level.levelgen.GenerationStep$Carving,net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver) -> a
+    519:519:java.util.List getCarvers(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
+    523:524:void addStructureStart(net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature) -> a
+    527:527:boolean isValidStart(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    531:531:java.lang.Iterable structures() -> g
+    535:535:net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature withBiomeConfig(net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature) -> b
+    539:539:java.util.List getFlowerFeatures() -> h
+    543:543:java.util.List getFeaturesForStep(net.minecraft.world.level.levelgen.GenerationStep$Decoration) -> a
+    547:586:void generate(net.minecraft.world.level.levelgen.GenerationStep$Decoration,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.WorldGenLevel,long,net.minecraft.world.level.levelgen.WorldgenRandom,net.minecraft.core.BlockPos) -> a
+    589:589:int getFogColor() -> i
+    593:596:int getGrassColor(double,double) -> a
+    600:603:int getFoliageColor() -> a
+    608:610:void buildSurfaceAt(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long) -> a
+    613:623:net.minecraft.world.level.biome.Biome$BiomeTempCategory getTemperatureCategory() -> j
+    627:628:net.minecraft.world.level.biome.Biome getBiome(int,net.minecraft.world.level.biome.Biome) -> a
+    632:632:float getDepth() -> k
+    636:636:float getDownfall() -> l
+    640:640:net.minecraft.network.chat.Component getName() -> m
+    644:647:java.lang.String getDescriptionId() -> n
+    651:651:float getScale() -> o
+    655:655:float getTemperature() -> p
+    659:659:net.minecraft.world.level.biome.BiomeSpecialEffects getSpecialEffects() -> q
+    663:663:int getWaterColor() -> r
+    667:667:int getWaterFogColor() -> s
+    671:671:java.util.Optional getAmbientParticle() -> t
+    675:675:java.util.Optional getAmbientLoop() -> u
+    679:679:java.util.Optional getAmbientMood() -> v
+    683:683:java.util.Optional getAmbientAdditions() -> w
+    687:687:java.util.Optional getBackgroundMusic() -> x
+    691:691:net.minecraft.world.level.biome.Biome$BiomeCategory getBiomeCategory() -> y
+    695:695:net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder getSurfaceBuilder() -> z
+    699:699:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration getSurfaceBuilderConfig() -> A
+    703:703:java.util.stream.Stream optimalParameters() -> B
+    708:708:java.lang.String getParent() -> C
+    581:581:java.lang.String lambda$generate$25(net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
+    566:566:java.lang.String lambda$generate$24(net.minecraft.world.level.levelgen.feature.StructureFeature) -> b
+    560:560:void lambda$generate$23(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,int,int,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    519:519:java.util.List lambda$getCarvers$22(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> b
+    515:515:java.util.List lambda$addCarver$21(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> c
+    346:346:boolean lambda$new$20(net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> b
+    341:341:net.minecraft.world.level.levelgen.feature.StructureFeature lambda$new$19(net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature) -> c
+    264:264:it.unimi.dsi.fastutil.longs.Long2FloatLinkedOpenHashMap lambda$new$18() -> E
+    265:271:it.unimi.dsi.fastutil.longs.Long2FloatLinkedOpenHashMap lambda$null$17() -> F
+    77:105:com.mojang.datafixers.kinds.App lambda$static$16(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    104:104:java.util.Optional lambda$null$15(net.minecraft.world.level.biome.Biome) -> b
+    103:103:java.util.List lambda$null$14(net.minecraft.world.level.biome.Biome) -> c
+    102:102:java.util.Map lambda$null$13(net.minecraft.world.level.biome.Biome) -> d
+    97:97:java.util.List lambda$null$12(net.minecraft.world.level.biome.Biome) -> e
+    97:97:net.minecraft.resources.ResourceLocation lambda$null$11(net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature) -> d
+    96:96:java.util.Map lambda$null$10(net.minecraft.world.level.biome.Biome) -> f
+    91:91:java.util.Map lambda$null$9(net.minecraft.world.level.biome.Biome) -> g
+    86:86:net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder lambda$null$8(net.minecraft.world.level.biome.Biome) -> h
+    85:85:java.lang.Integer lambda$null$7(net.minecraft.world.level.biome.Biome) -> i
+    84:84:net.minecraft.world.level.biome.BiomeSpecialEffects lambda$null$6(net.minecraft.world.level.biome.Biome) -> j
+    83:83:java.lang.Float lambda$null$5(net.minecraft.world.level.biome.Biome) -> k
+    82:82:java.lang.Float lambda$null$4(net.minecraft.world.level.biome.Biome) -> l
+    81:81:java.lang.Float lambda$null$3(net.minecraft.world.level.biome.Biome) -> m
+    80:80:java.lang.Float lambda$null$2(net.minecraft.world.level.biome.Biome) -> n
+    79:79:net.minecraft.world.level.biome.Biome$BiomeCategory lambda$null$1(net.minecraft.world.level.biome.Biome) -> o
+    78:78:net.minecraft.world.level.biome.Biome$Precipitation lambda$null$0(net.minecraft.world.level.biome.Biome) -> p
+    74:115:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.Biome$1 -> bre$1:
     net.minecraft.world.level.biome.Biome this$0 -> a
-    191:191:void <init>(net.minecraft.world.level.biome.Biome,int,float) -> <init>
-    194:194:void rehash(int) -> rehash
-net.minecraft.world.level.biome.Biome$BiomeBuilder -> bkt$a:
+    265:265:void <init>(net.minecraft.world.level.biome.Biome,int,float) -> <init>
+    268:268:void rehash(int) -> rehash
+net.minecraft.world.level.biome.Biome$BiomeBuilder -> bre$a:
     net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder surfaceBuilder -> a
     net.minecraft.world.level.biome.Biome$Precipitation precipitation -> b
     net.minecraft.world.level.biome.Biome$BiomeCategory biomeCategory -> c
@@ -51104,33 +55763,33 @@ net.minecraft.world.level.biome.Biome$BiomeBuilder -> bkt$a:
     java.lang.Float scale -> e
     java.lang.Float temperature -> f
     java.lang.Float downfall -> g
-    java.lang.Integer waterColor -> h
-    java.lang.Integer waterFogColor -> i
-    java.lang.String parent -> j
-    573:573:void <init>() -> <init>
-    596:597:net.minecraft.world.level.biome.Biome$BiomeBuilder surfaceBuilder(net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-    601:602:net.minecraft.world.level.biome.Biome$BiomeBuilder surfaceBuilder(net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder) -> a
-    606:607:net.minecraft.world.level.biome.Biome$BiomeBuilder precipitation(net.minecraft.world.level.biome.Biome$Precipitation) -> a
-    611:612:net.minecraft.world.level.biome.Biome$BiomeBuilder biomeCategory(net.minecraft.world.level.biome.Biome$BiomeCategory) -> a
-    616:617:net.minecraft.world.level.biome.Biome$BiomeBuilder depth(float) -> a
-    621:622:net.minecraft.world.level.biome.Biome$BiomeBuilder scale(float) -> b
-    626:627:net.minecraft.world.level.biome.Biome$BiomeBuilder temperature(float) -> c
-    631:632:net.minecraft.world.level.biome.Biome$BiomeBuilder downfall(float) -> d
-    636:637:net.minecraft.world.level.biome.Biome$BiomeBuilder waterColor(int) -> a
-    641:642:net.minecraft.world.level.biome.Biome$BiomeBuilder waterFogColor(int) -> b
-    646:647:net.minecraft.world.level.biome.Biome$BiomeBuilder parent(java.lang.String) -> a
-    652:652:java.lang.String toString() -> toString
-    573:573:net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder access$000(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> a
-    573:573:net.minecraft.world.level.biome.Biome$Precipitation access$100(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> b
-    573:573:net.minecraft.world.level.biome.Biome$BiomeCategory access$200(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> c
-    573:573:java.lang.Float access$300(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> d
-    573:573:java.lang.Float access$400(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> e
-    573:573:java.lang.Float access$500(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> f
-    573:573:java.lang.Float access$600(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> g
-    573:573:java.lang.Integer access$700(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> h
-    573:573:java.lang.Integer access$800(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> i
-    573:573:java.lang.String access$900(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> j
-net.minecraft.world.level.biome.Biome$BiomeCategory -> bkt$b:
+    java.lang.String parent -> h
+    java.util.List optimalParameters -> i
+    net.minecraft.world.level.biome.BiomeSpecialEffects specialEffects -> j
+    711:711:void <init>() -> <init>
+    734:735:net.minecraft.world.level.biome.Biome$BiomeBuilder surfaceBuilder(net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+    739:740:net.minecraft.world.level.biome.Biome$BiomeBuilder surfaceBuilder(net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder) -> a
+    744:745:net.minecraft.world.level.biome.Biome$BiomeBuilder precipitation(net.minecraft.world.level.biome.Biome$Precipitation) -> a
+    749:750:net.minecraft.world.level.biome.Biome$BiomeBuilder biomeCategory(net.minecraft.world.level.biome.Biome$BiomeCategory) -> a
+    754:755:net.minecraft.world.level.biome.Biome$BiomeBuilder depth(float) -> a
+    759:760:net.minecraft.world.level.biome.Biome$BiomeBuilder scale(float) -> b
+    764:765:net.minecraft.world.level.biome.Biome$BiomeBuilder temperature(float) -> c
+    769:770:net.minecraft.world.level.biome.Biome$BiomeBuilder downfall(float) -> d
+    774:775:net.minecraft.world.level.biome.Biome$BiomeBuilder parent(java.lang.String) -> a
+    779:780:net.minecraft.world.level.biome.Biome$BiomeBuilder optimalParameters(java.util.List) -> a
+    784:785:net.minecraft.world.level.biome.Biome$BiomeBuilder specialEffects(net.minecraft.world.level.biome.BiomeSpecialEffects) -> a
+    790:790:java.lang.String toString() -> toString
+    711:711:net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder access$000(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> a
+    711:711:net.minecraft.world.level.biome.Biome$Precipitation access$100(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> b
+    711:711:net.minecraft.world.level.biome.Biome$BiomeCategory access$200(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> c
+    711:711:java.lang.Float access$300(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> d
+    711:711:java.lang.Float access$400(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> e
+    711:711:java.lang.Float access$500(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> f
+    711:711:java.lang.Float access$600(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> g
+    711:711:net.minecraft.world.level.biome.BiomeSpecialEffects access$700(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> h
+    711:711:java.lang.String access$800(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> i
+    711:711:java.util.List access$900(net.minecraft.world.level.biome.Biome$BiomeBuilder) -> j
+net.minecraft.world.level.biome.Biome$BiomeCategory -> bre$b:
     net.minecraft.world.level.biome.Biome$BiomeCategory NONE -> a
     net.minecraft.world.level.biome.Biome$BiomeCategory TAIGA -> b
     net.minecraft.world.level.biome.Biome$BiomeCategory EXTREME_HILLS -> c
@@ -51148,17 +55807,19 @@ net.minecraft.world.level.biome.Biome$BiomeCategory -> bkt$b:
     net.minecraft.world.level.biome.Biome$BiomeCategory SWAMP -> o
     net.minecraft.world.level.biome.Biome$BiomeCategory MUSHROOM -> p
     net.minecraft.world.level.biome.Biome$BiomeCategory NETHER -> q
-    java.util.Map BY_NAME -> r
-    java.lang.String name -> s
-    net.minecraft.world.level.biome.Biome$BiomeCategory[] $VALUES -> t
-    110:110:net.minecraft.world.level.biome.Biome$BiomeCategory[] values() -> values
-    110:110:net.minecraft.world.level.biome.Biome$BiomeCategory valueOf(java.lang.String) -> valueOf
-    133:135:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    138:138:java.lang.String getName() -> a
-    142:142:net.minecraft.world.level.biome.Biome$BiomeCategory byName(java.lang.String) -> a
-    130:130:net.minecraft.world.level.biome.Biome$BiomeCategory lambda$static$0(net.minecraft.world.level.biome.Biome$BiomeCategory) -> a
-    110:130:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.Biome$BiomeTempCategory -> bkt$c:
+    com.mojang.serialization.Codec CODEC -> r
+    java.util.Map BY_NAME -> s
+    java.lang.String name -> t
+    net.minecraft.world.level.biome.Biome$BiomeCategory[] $VALUES -> u
+    150:150:net.minecraft.world.level.biome.Biome$BiomeCategory[] values() -> values
+    150:150:net.minecraft.world.level.biome.Biome$BiomeCategory valueOf(java.lang.String) -> valueOf
+    175:177:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    180:180:java.lang.String getName() -> b
+    184:184:net.minecraft.world.level.biome.Biome$BiomeCategory byName(java.lang.String) -> a
+    189:189:java.lang.String getSerializedName() -> a
+    172:172:net.minecraft.world.level.biome.Biome$BiomeCategory lambda$static$0(net.minecraft.world.level.biome.Biome$BiomeCategory) -> a
+    150:172:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.Biome$BiomeTempCategory -> bre$c:
     net.minecraft.world.level.biome.Biome$BiomeTempCategory OCEAN -> a
     net.minecraft.world.level.biome.Biome$BiomeTempCategory COLD -> b
     net.minecraft.world.level.biome.Biome$BiomeTempCategory MEDIUM -> c
@@ -51166,271 +55827,414 @@ net.minecraft.world.level.biome.Biome$BiomeTempCategory -> bkt$c:
     java.util.Map BY_NAME -> e
     java.lang.String name -> f
     net.minecraft.world.level.biome.Biome$BiomeTempCategory[] $VALUES -> g
-    87:87:net.minecraft.world.level.biome.Biome$BiomeTempCategory[] values() -> values
-    87:87:net.minecraft.world.level.biome.Biome$BiomeTempCategory valueOf(java.lang.String) -> valueOf
-    97:99:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    102:102:java.lang.String getName() -> a
-    106:106:net.minecraft.world.level.biome.Biome$BiomeTempCategory byName(java.lang.String) -> a
-    94:94:net.minecraft.world.level.biome.Biome$BiomeTempCategory lambda$static$0(net.minecraft.world.level.biome.Biome$BiomeTempCategory) -> a
-    87:94:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.Biome$Precipitation -> bkt$d:
+    127:127:net.minecraft.world.level.biome.Biome$BiomeTempCategory[] values() -> values
+    127:127:net.minecraft.world.level.biome.Biome$BiomeTempCategory valueOf(java.lang.String) -> valueOf
+    137:139:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    142:142:java.lang.String getName() -> a
+    146:146:net.minecraft.world.level.biome.Biome$BiomeTempCategory byName(java.lang.String) -> a
+    134:134:net.minecraft.world.level.biome.Biome$BiomeTempCategory lambda$static$0(net.minecraft.world.level.biome.Biome$BiomeTempCategory) -> a
+    127:134:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.Biome$ClimateParameters -> bre$d:
+    com.mojang.serialization.Codec CODEC -> a
+    float temperature -> b
+    float humidity -> c
+    float altitude -> d
+    float weirdness -> e
+    float offset -> f
+    819:825:void <init>(float,float,float,float,float) -> <init>
+    829:847:boolean equals(java.lang.Object) -> equals
+    852:856:int hashCode() -> hashCode
+    860:860:float fitness(net.minecraft.world.level.biome.Biome$ClimateParameters) -> a
+    805:811:com.mojang.datafixers.kinds.App lambda$static$5(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    810:810:java.lang.Float lambda$null$4(net.minecraft.world.level.biome.Biome$ClimateParameters) -> b
+    809:809:java.lang.Float lambda$null$3(net.minecraft.world.level.biome.Biome$ClimateParameters) -> c
+    808:808:java.lang.Float lambda$null$2(net.minecraft.world.level.biome.Biome$ClimateParameters) -> d
+    807:807:java.lang.Float lambda$null$1(net.minecraft.world.level.biome.Biome$ClimateParameters) -> e
+    806:806:java.lang.Float lambda$null$0(net.minecraft.world.level.biome.Biome$ClimateParameters) -> f
+    805:805:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.Biome$MobSpawnCost -> bre$e:
+    double energyBudget -> a
+    double charge -> b
+    226:229:void <init>(double,double) -> <init>
+    232:232:double getEnergyBudget() -> a
+    236:236:double getCharge() -> b
+net.minecraft.world.level.biome.Biome$Precipitation -> bre$f:
     net.minecraft.world.level.biome.Biome$Precipitation NONE -> a
     net.minecraft.world.level.biome.Biome$Precipitation RAIN -> b
     net.minecraft.world.level.biome.Biome$Precipitation SNOW -> c
-    java.util.Map BY_NAME -> d
-    java.lang.String name -> e
-    net.minecraft.world.level.biome.Biome$Precipitation[] $VALUES -> f
-    146:146:net.minecraft.world.level.biome.Biome$Precipitation[] values() -> values
-    146:146:net.minecraft.world.level.biome.Biome$Precipitation valueOf(java.lang.String) -> valueOf
-    155:157:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    160:160:java.lang.String getName() -> a
-    164:164:net.minecraft.world.level.biome.Biome$Precipitation byName(java.lang.String) -> a
-    152:152:net.minecraft.world.level.biome.Biome$Precipitation lambda$static$0(net.minecraft.world.level.biome.Biome$Precipitation) -> a
-    146:152:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.Biome$SpawnerData -> bkt$e:
-    net.minecraft.world.entity.EntityType type -> b
-    int minCount -> c
-    int maxCount -> d
-    264:268:void <init>(net.minecraft.world.entity.EntityType,int,int,int) -> <init>
-    272:272:java.lang.String toString() -> toString
-    276:280:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    286:292:net.minecraft.world.level.biome.Biome$SpawnerData deserialize(com.mojang.datafixers.Dynamic) -> a
-    290:290:boolean lambda$deserialize$0(net.minecraft.world.entity.EntityType) -> a
-net.minecraft.world.level.biome.BiomeDefaultFeatures -> bku:
-    net.minecraft.world.level.block.state.BlockState GRASS -> ah
-    net.minecraft.world.level.block.state.BlockState FERN -> ai
-    net.minecraft.world.level.block.state.BlockState PODZOL -> aj
-    net.minecraft.world.level.block.state.BlockState OAK_LOG -> ak
-    net.minecraft.world.level.block.state.BlockState OAK_LEAVES -> al
-    net.minecraft.world.level.block.state.BlockState JUNGLE_LOG -> am
-    net.minecraft.world.level.block.state.BlockState JUNGLE_LEAVES -> an
-    net.minecraft.world.level.block.state.BlockState SPRUCE_LOG -> ao
-    net.minecraft.world.level.block.state.BlockState SPRUCE_LEAVES -> ap
-    net.minecraft.world.level.block.state.BlockState ACACIA_LOG -> aq
-    net.minecraft.world.level.block.state.BlockState ACACIA_LEAVES -> ar
-    net.minecraft.world.level.block.state.BlockState BIRCH_LOG -> as
-    net.minecraft.world.level.block.state.BlockState BIRCH_LEAVES -> at
-    net.minecraft.world.level.block.state.BlockState DARK_OAK_LOG -> au
-    net.minecraft.world.level.block.state.BlockState DARK_OAK_LEAVES -> av
-    net.minecraft.world.level.block.state.BlockState WATER -> aw
-    net.minecraft.world.level.block.state.BlockState LAVA -> ax
-    net.minecraft.world.level.block.state.BlockState DIRT -> ay
-    net.minecraft.world.level.block.state.BlockState GRAVEL -> az
-    net.minecraft.world.level.block.state.BlockState GRANITE -> aA
-    net.minecraft.world.level.block.state.BlockState DIORITE -> aB
-    net.minecraft.world.level.block.state.BlockState ANDESITE -> aC
-    net.minecraft.world.level.block.state.BlockState COAL_ORE -> aD
-    net.minecraft.world.level.block.state.BlockState IRON_ORE -> aE
-    net.minecraft.world.level.block.state.BlockState GOLD_ORE -> aF
-    net.minecraft.world.level.block.state.BlockState REDSTONE_ORE -> aG
-    net.minecraft.world.level.block.state.BlockState DIAMOND_ORE -> aH
-    net.minecraft.world.level.block.state.BlockState LAPIS_ORE -> aI
-    net.minecraft.world.level.block.state.BlockState STONE -> aJ
-    net.minecraft.world.level.block.state.BlockState EMERALD_ORE -> aK
-    net.minecraft.world.level.block.state.BlockState INFESTED_STONE -> aL
-    net.minecraft.world.level.block.state.BlockState SAND -> aM
-    net.minecraft.world.level.block.state.BlockState CLAY -> aN
-    net.minecraft.world.level.block.state.BlockState GRASS_BLOCK -> aO
-    net.minecraft.world.level.block.state.BlockState MOSSY_COBBLESTONE -> aP
-    net.minecraft.world.level.block.state.BlockState LARGE_FERN -> aQ
-    net.minecraft.world.level.block.state.BlockState TALL_GRASS -> aR
-    net.minecraft.world.level.block.state.BlockState LILAC -> aS
-    net.minecraft.world.level.block.state.BlockState ROSE_BUSH -> aT
-    net.minecraft.world.level.block.state.BlockState PEONY -> aU
-    net.minecraft.world.level.block.state.BlockState BROWN_MUSHROOM -> aV
-    net.minecraft.world.level.block.state.BlockState RED_MUSHROOM -> aW
-    net.minecraft.world.level.block.state.BlockState SEAGRASS -> aX
-    net.minecraft.world.level.block.state.BlockState PACKED_ICE -> aY
-    net.minecraft.world.level.block.state.BlockState BLUE_ICE -> aZ
-    net.minecraft.world.level.block.state.BlockState LILY_OF_THE_VALLEY -> ba
-    net.minecraft.world.level.block.state.BlockState BLUE_ORCHID -> bb
-    net.minecraft.world.level.block.state.BlockState POPPY -> bc
-    net.minecraft.world.level.block.state.BlockState DANDELION -> bd
-    net.minecraft.world.level.block.state.BlockState DEAD_BUSH -> be
-    net.minecraft.world.level.block.state.BlockState MELON -> bf
-    net.minecraft.world.level.block.state.BlockState PUMPKIN -> bg
-    net.minecraft.world.level.block.state.BlockState SWEET_BERRY_BUSH -> bh
-    net.minecraft.world.level.block.state.BlockState FIRE -> bi
-    net.minecraft.world.level.block.state.BlockState NETHERRACK -> bj
-    net.minecraft.world.level.block.state.BlockState LILY_PAD -> bk
-    net.minecraft.world.level.block.state.BlockState SNOW -> bl
-    net.minecraft.world.level.block.state.BlockState JACK_O_LANTERN -> bm
-    net.minecraft.world.level.block.state.BlockState SUNFLOWER -> bn
-    net.minecraft.world.level.block.state.BlockState CACTUS -> bo
-    net.minecraft.world.level.block.state.BlockState SUGAR_CANE -> bp
-    net.minecraft.world.level.block.state.BlockState HUGE_RED_MUSHROOM -> bq
-    net.minecraft.world.level.block.state.BlockState HUGE_BROWN_MUSHROOM -> br
-    net.minecraft.world.level.block.state.BlockState HUGE_MUSHROOM_STEM -> bs
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration NORMAL_TREE_CONFIG -> a
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration JUNGLE_TREE_CONFIG -> b
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration JUNGLE_TREE_NOVINE_CONFIG -> c
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration PINE_TREE_CONFIG -> d
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration SPRUCE_TREE_CONFIG -> e
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration ACACIA_TREE_CONFIG -> f
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration BIRCH_TREE_CONFIG -> g
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration BIRCH_TREE_WITH_BEES_0002_CONFIG -> h
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration SUPER_BIRCH_TREE_WITH_BEES_0002_CONFIG -> i
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration SWAMP_TREE_CONFIG -> j
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration FANCY_TREE_CONFIG -> k
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration NORMAL_TREE_WITH_BEES_005_CONFIG -> l
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration FANCY_TREE_WITH_BEES_0002_CONFIG -> m
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration FANCY_TREE_WITH_BEES_005_CONFIG -> n
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration NORMAL_TREE_WITH_BEES_0002_CONFIG -> o
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration NORMAL_TREE_WITH_BEES_002_CONFIG -> p
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration FANCY_TREE_WITH_BEES_002_CONFIG -> q
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration BIRCH_TREE_WITH_BEES_002_CONFIG -> r
-    net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration BIRCH_TREE_WITH_BEES_005_CONFIG -> s
-    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration JUNGLE_BUSH_CONFIG -> t
-    net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration DARK_OAK_TREE_CONFIG -> u
-    net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration MEGA_SPRUCE_TREE_CONFIG -> v
-    net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration MEGA_PINE_TREE_CONFIG -> w
-    net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration MEGA_JUNGLE_TREE_CONFIG -> x
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DEFAULT_GRASS_CONFIG -> y
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration TAIGA_GRASS_CONFIG -> z
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration JUNGLE_GRASS_CONFIG -> A
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration GENERAL_FOREST_FLOWER_CONFIG -> B
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration SwAMP_FLOWER_CONFIG -> C
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DEFAULT_FLOWER_CONFIG -> D
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration PLAIN_FLOWER_CONFIG -> E
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration FOREST_FLOWER_CONFIG -> F
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DEAD_BUSH_CONFIG -> G
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration MELON_CONFIG -> H
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration PUMPKIN_CONFIG -> I
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration SWEET_BERRY_BUSH_CONFIG -> J
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration HELL_FIRE_CONFIG -> K
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration WATERLILLY_CONFIG -> L
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration RED_MUSHROOM_CONFIG -> M
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration BROWN_MUSHROOM_CONFIG -> N
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DOUBLE_LILAC_CONFIG -> O
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DOUBLE_ROSE_BUSH_CONFIG -> P
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DOUBLE_PEONY_CONFIG -> Q
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration SUNFLOWER_CONFIG -> R
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration TALL_GRASS_CONFIG -> S
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration LARGE_FERN_CONFIG -> T
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration CACTUS_CONFIG -> U
-    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration SUGAR_CANE_CONFIG -> V
-    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration HAY_PILE_CONFIG -> W
-    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration SNOW_PILE_CONFIG -> X
-    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration MELON_PILE_CONFIG -> Y
-    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration PUMPKIN_PILE_CONFIG -> Z
-    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration ICE_PILE_CONFIG -> aa
-    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration WATER_SPRING_CONFIG -> ab
-    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration LAVA_SPRING_CONFIG -> ac
-    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration OPEN_NETHER_SPRING_CONFIG -> ad
-    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration CLOSED_NETHER_SPRING_CONFIG -> ae
-    net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration HUGE_RED_MUSHROOM_CONFIG -> af
-    net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration HUGE_BROWN_MUSHROOM_CONFIG -> ag
-    71:71:void <init>() -> <init>
-    553:555:void addDefaultCarvers(net.minecraft.world.level.biome.Biome) -> a
-    558:562:void addOceanCarvers(net.minecraft.world.level.biome.Biome) -> b
-    565:578:void addStructureFeaturePlacement(net.minecraft.world.level.biome.Biome) -> c
-    581:583:void addDefaultLakes(net.minecraft.world.level.biome.Biome) -> d
-    586:587:void addDesertLakes(net.minecraft.world.level.biome.Biome) -> e
-    590:591:void addDefaultMonsterRoom(net.minecraft.world.level.biome.Biome) -> f
-    594:599:void addDefaultUndergroundVariety(net.minecraft.world.level.biome.Biome) -> g
-    602:608:void addDefaultOres(net.minecraft.world.level.biome.Biome) -> h
-    611:612:void addExtraGold(net.minecraft.world.level.biome.Biome) -> i
-    615:616:void addExtraEmeralds(net.minecraft.world.level.biome.Biome) -> j
-    619:620:void addInfestedStone(net.minecraft.world.level.biome.Biome) -> k
-    623:626:void addDefaultSoftDisks(net.minecraft.world.level.biome.Biome) -> l
-    629:630:void addSwampClayDisk(net.minecraft.world.level.biome.Biome) -> m
-    633:634:void addMossyStoneBlock(net.minecraft.world.level.biome.Biome) -> n
-    637:638:void addFerns(net.minecraft.world.level.biome.Biome) -> o
-    641:642:void addBerryBushes(net.minecraft.world.level.biome.Biome) -> p
-    645:646:void addSparseBerryBushes(net.minecraft.world.level.biome.Biome) -> q
-    649:650:void addLightBambooVegetation(net.minecraft.world.level.biome.Biome) -> r
-    653:662:void addBambooVegetation(net.minecraft.world.level.biome.Biome) -> s
-    665:669:void addTaigaTrees(net.minecraft.world.level.biome.Biome) -> t
-    672:676:void addWaterTrees(net.minecraft.world.level.biome.Biome) -> u
-    679:680:void addBirchTrees(net.minecraft.world.level.biome.Biome) -> v
-    683:690:void addOtherBirchTrees(net.minecraft.world.level.biome.Biome) -> w
-    693:697:void addTallBirchTrees(net.minecraft.world.level.biome.Biome) -> x
-    700:704:void addSavannaTrees(net.minecraft.world.level.biome.Biome) -> y
-    707:711:void addShatteredSavannaTrees(net.minecraft.world.level.biome.Biome) -> z
-    714:721:void addMountainTrees(net.minecraft.world.level.biome.Biome) -> A
-    724:731:void addMountainEdgeTrees(net.minecraft.world.level.biome.Biome) -> B
-    734:742:void addJungleTrees(net.minecraft.world.level.biome.Biome) -> C
-    745:752:void addJungleEdgeTrees(net.minecraft.world.level.biome.Biome) -> D
-    755:756:void addBadlandsTrees(net.minecraft.world.level.biome.Biome) -> E
-    759:760:void addSnowyTrees(net.minecraft.world.level.biome.Biome) -> F
-    763:770:void addGiantSpruceTrees(net.minecraft.world.level.biome.Biome) -> G
-    773:781:void addGiantTrees(net.minecraft.world.level.biome.Biome) -> H
-    784:785:void addJungleGrass(net.minecraft.world.level.biome.Biome) -> I
-    788:789:void addSavannaGrass(net.minecraft.world.level.biome.Biome) -> J
-    792:793:void addShatteredSavannaGrass(net.minecraft.world.level.biome.Biome) -> K
-    796:797:void addSavannaExtraGrass(net.minecraft.world.level.biome.Biome) -> L
-    800:802:void addBadlandGrass(net.minecraft.world.level.biome.Biome) -> M
-    805:814:void addForestFlowers(net.minecraft.world.level.biome.Biome) -> N
-    817:818:void addForestGrass(net.minecraft.world.level.biome.Biome) -> O
-    821:828:void addSwampVegetation(net.minecraft.world.level.biome.Biome) -> P
-    831:837:void addMushroomFieldVegetation(net.minecraft.world.level.biome.Biome) -> Q
-    840:846:void addPlainVegetation(net.minecraft.world.level.biome.Biome) -> R
-    849:850:void addDesertVegetation(net.minecraft.world.level.biome.Biome) -> S
-    853:857:void addGiantTaigaVegetation(net.minecraft.world.level.biome.Biome) -> T
-    860:861:void addDefaultFlowers(net.minecraft.world.level.biome.Biome) -> U
-    864:865:void addWarmFlowers(net.minecraft.world.level.biome.Biome) -> V
-    868:869:void addDefaultGrass(net.minecraft.world.level.biome.Biome) -> W
-    872:875:void addTaigaGrass(net.minecraft.world.level.biome.Biome) -> X
-    878:879:void addPlainGrass(net.minecraft.world.level.biome.Biome) -> Y
-    882:884:void addDefaultMushrooms(net.minecraft.world.level.biome.Biome) -> Z
-    887:889:void addDefaultExtraVegetation(net.minecraft.world.level.biome.Biome) -> aa
-    892:895:void addBadlandExtraVegetation(net.minecraft.world.level.biome.Biome) -> ab
-    898:900:void addJungleExtraVegetation(net.minecraft.world.level.biome.Biome) -> ac
-    903:906:void addDesertExtraVegetation(net.minecraft.world.level.biome.Biome) -> ad
-    909:911:void addSwampExtraVegetation(net.minecraft.world.level.biome.Biome) -> ae
-    914:916:void addDesertExtraDecoration(net.minecraft.world.level.biome.Biome) -> af
-    919:920:void addSwampExtraDecoration(net.minecraft.world.level.biome.Biome) -> ag
-    923:924:void addColdOceanExtraVegetation(net.minecraft.world.level.biome.Biome) -> ah
-    927:928:void addDefaultSeagrass(net.minecraft.world.level.biome.Biome) -> ai
-    931:932:void addWarmSeagrass(net.minecraft.world.level.biome.Biome) -> aj
-    935:936:void addDeepWarmSeagrass(net.minecraft.world.level.biome.Biome) -> ak
-    939:940:void addLukeWarmKelp(net.minecraft.world.level.biome.Biome) -> al
-    943:945:void addDefaultSprings(net.minecraft.world.level.biome.Biome) -> am
-    948:950:void addIcebergs(net.minecraft.world.level.biome.Biome) -> an
-    953:954:void addBlueIce(net.minecraft.world.level.biome.Biome) -> ao
-    957:958:void addSurfaceFreezing(net.minecraft.world.level.biome.Biome) -> ap
-    961:962:void addEndCity(net.minecraft.world.level.biome.Biome) -> aq
-    74:550:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.BiomeManager -> bkv:
+    com.mojang.serialization.Codec CODEC -> d
+    java.util.Map BY_NAME -> e
+    java.lang.String name -> f
+    net.minecraft.world.level.biome.Biome$Precipitation[] $VALUES -> g
+    193:193:net.minecraft.world.level.biome.Biome$Precipitation[] values() -> values
+    193:193:net.minecraft.world.level.biome.Biome$Precipitation valueOf(java.lang.String) -> valueOf
+    204:206:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    209:209:java.lang.String getName() -> b
+    213:213:net.minecraft.world.level.biome.Biome$Precipitation byName(java.lang.String) -> a
+    218:218:java.lang.String getSerializedName() -> a
+    201:201:net.minecraft.world.level.biome.Biome$Precipitation lambda$static$0(net.minecraft.world.level.biome.Biome$Precipitation) -> a
+    193:201:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.Biome$SpawnerData -> bre$g:
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.world.entity.EntityType type -> c
+    int minCount -> d
+    int maxCount -> e
+    416:420:void <init>(net.minecraft.world.entity.EntityType,int,int,int) -> <init>
+    424:424:java.lang.String toString() -> toString
+    404:409:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    408:408:java.lang.Integer lambda$null$3(net.minecraft.world.level.biome.Biome$SpawnerData) -> a
+    407:407:java.lang.Integer lambda$null$2(net.minecraft.world.level.biome.Biome$SpawnerData) -> b
+    406:406:java.lang.Integer lambda$null$1(net.minecraft.world.level.biome.Biome$SpawnerData) -> c
+    405:405:net.minecraft.world.entity.EntityType lambda$null$0(net.minecraft.world.level.biome.Biome$SpawnerData) -> d
+    404:404:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.BiomeDefaultFeatures -> brf:
+    net.minecraft.world.level.block.state.BlockState GRASS -> bb
+    net.minecraft.world.level.block.state.BlockState FERN -> bc
+    net.minecraft.world.level.block.state.BlockState PODZOL -> bd
+    net.minecraft.world.level.block.state.BlockState OAK_LOG -> be
+    net.minecraft.world.level.block.state.BlockState OAK_LEAVES -> bf
+    net.minecraft.world.level.block.state.BlockState JUNGLE_LOG -> bg
+    net.minecraft.world.level.block.state.BlockState JUNGLE_LEAVES -> bh
+    net.minecraft.world.level.block.state.BlockState SPRUCE_LOG -> bi
+    net.minecraft.world.level.block.state.BlockState SPRUCE_LEAVES -> bj
+    net.minecraft.world.level.block.state.BlockState ACACIA_LOG -> bk
+    net.minecraft.world.level.block.state.BlockState ACACIA_LEAVES -> bl
+    net.minecraft.world.level.block.state.BlockState BIRCH_LOG -> bm
+    net.minecraft.world.level.block.state.BlockState BIRCH_LEAVES -> bn
+    net.minecraft.world.level.block.state.BlockState DARK_OAK_LOG -> bo
+    net.minecraft.world.level.block.state.BlockState DARK_OAK_LEAVES -> bp
+    net.minecraft.world.level.block.state.BlockState WATER -> bq
+    net.minecraft.world.level.block.state.BlockState LAVA -> br
+    net.minecraft.world.level.block.state.BlockState DIRT -> bs
+    net.minecraft.world.level.block.state.BlockState GRAVEL -> bt
+    net.minecraft.world.level.block.state.BlockState GRANITE -> bu
+    net.minecraft.world.level.block.state.BlockState DIORITE -> bv
+    net.minecraft.world.level.block.state.BlockState ANDESITE -> bw
+    net.minecraft.world.level.block.state.BlockState COAL_ORE -> bx
+    net.minecraft.world.level.block.state.BlockState IRON_ORE -> by
+    net.minecraft.world.level.block.state.BlockState GOLD_ORE -> bz
+    net.minecraft.world.level.block.state.BlockState REDSTONE_ORE -> bA
+    net.minecraft.world.level.block.state.BlockState DIAMOND_ORE -> bB
+    net.minecraft.world.level.block.state.BlockState LAPIS_ORE -> bC
+    net.minecraft.world.level.block.state.BlockState STONE -> bD
+    net.minecraft.world.level.block.state.BlockState EMERALD_ORE -> bE
+    net.minecraft.world.level.block.state.BlockState INFESTED_STONE -> bF
+    net.minecraft.world.level.block.state.BlockState SAND -> bG
+    net.minecraft.world.level.block.state.BlockState CLAY -> bH
+    net.minecraft.world.level.block.state.BlockState GRASS_BLOCK -> bI
+    net.minecraft.world.level.block.state.BlockState MOSSY_COBBLESTONE -> bJ
+    net.minecraft.world.level.block.state.BlockState LARGE_FERN -> bK
+    net.minecraft.world.level.block.state.BlockState TALL_GRASS -> bL
+    net.minecraft.world.level.block.state.BlockState LILAC -> bM
+    net.minecraft.world.level.block.state.BlockState ROSE_BUSH -> bN
+    net.minecraft.world.level.block.state.BlockState PEONY -> bO
+    net.minecraft.world.level.block.state.BlockState BROWN_MUSHROOM -> bP
+    net.minecraft.world.level.block.state.BlockState RED_MUSHROOM -> bQ
+    net.minecraft.world.level.block.state.BlockState SEAGRASS -> bR
+    net.minecraft.world.level.block.state.BlockState PACKED_ICE -> bS
+    net.minecraft.world.level.block.state.BlockState BLUE_ICE -> bT
+    net.minecraft.world.level.block.state.BlockState LILY_OF_THE_VALLEY -> bU
+    net.minecraft.world.level.block.state.BlockState BLUE_ORCHID -> bV
+    net.minecraft.world.level.block.state.BlockState POPPY -> bW
+    net.minecraft.world.level.block.state.BlockState DANDELION -> bX
+    net.minecraft.world.level.block.state.BlockState DEAD_BUSH -> bY
+    net.minecraft.world.level.block.state.BlockState MELON -> bZ
+    net.minecraft.world.level.block.state.BlockState PUMPKIN -> ca
+    net.minecraft.world.level.block.state.BlockState SWEET_BERRY_BUSH -> cb
+    net.minecraft.world.level.block.state.BlockState FIRE -> cc
+    net.minecraft.world.level.block.state.BlockState SOUL_FIRE -> cd
+    net.minecraft.world.level.block.state.BlockState NETHERRACK -> ce
+    net.minecraft.world.level.block.state.BlockState SOUL_SOIL -> cf
+    net.minecraft.world.level.block.state.BlockState CRIMSON_ROOTS -> cg
+    net.minecraft.world.level.block.state.BlockState LILY_PAD -> ch
+    net.minecraft.world.level.block.state.BlockState SNOW -> ci
+    net.minecraft.world.level.block.state.BlockState JACK_O_LANTERN -> cj
+    net.minecraft.world.level.block.state.BlockState SUNFLOWER -> ck
+    net.minecraft.world.level.block.state.BlockState CACTUS -> cl
+    net.minecraft.world.level.block.state.BlockState SUGAR_CANE -> cm
+    net.minecraft.world.level.block.state.BlockState HUGE_RED_MUSHROOM -> cn
+    net.minecraft.world.level.block.state.BlockState HUGE_BROWN_MUSHROOM -> co
+    net.minecraft.world.level.block.state.BlockState HUGE_MUSHROOM_STEM -> cp
+    net.minecraft.world.level.block.state.BlockState NETHER_GOLD_ORE -> cq
+    net.minecraft.world.level.block.state.BlockState NETHER_QUARTZ_ORE -> cr
+    net.minecraft.world.level.block.state.BlockState WARPED_STEM -> cs
+    net.minecraft.world.level.block.state.BlockState WARPED_WART_BLOCK -> ct
+    net.minecraft.world.level.block.state.BlockState NETHER_WART_BLOCK -> cu
+    net.minecraft.world.level.block.state.BlockState CRIMSON_STEM -> cv
+    net.minecraft.world.level.block.state.BlockState SHROOMLIGHT -> cw
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature PILLAGER_OUTPOST -> a
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature MINESHAFT -> b
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature MINESHAFT_MESA -> c
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature WOODLAND_MANSION -> d
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature JUNGLE_TEMPLE -> e
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature DESERT_PYRAMID -> f
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature IGLOO -> g
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature SHIPWRECK -> h
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature SHIPWRECH_BEACHED -> i
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature SWAMP_HUT -> j
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature STRONGHOLD -> k
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature OCEAN_MONUMENT -> l
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature OCEAN_RUIN_COLD -> m
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature OCEAN_RUIN_WARM -> n
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature NETHER_BRIDGE -> o
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature NETHER_FOSSIL -> p
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature END_CITY -> q
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature BURIED_TREASURE -> r
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature BASTION_REMNANT -> s
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature VILLAGE_PLAINS -> t
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature VILLAGE_DESERT -> u
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature VILLAGE_SAVANNA -> v
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature VILLAGE_SNOVY -> w
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature VILLAGE_TAIGA -> x
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature RUINED_PORTAL_STANDARD -> y
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature RUINED_PORTAL_DESERT -> z
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature RUINED_PORTAL_JUNGLE -> A
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature RUINED_PORTAL_SWAMP -> B
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature RUINED_PORTAL_MOUNTAIN -> C
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature RUINED_PORTAL_OCEAN -> D
+    net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature RUINED_PORTAL_NETHER -> E
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration NORMAL_TREE_CONFIG -> F
+    net.minecraft.world.level.levelgen.feature.treedecorators.BeehiveDecorator BEEHIVE_0002 -> cx
+    net.minecraft.world.level.levelgen.feature.treedecorators.BeehiveDecorator BEEHIVE_002 -> cy
+    net.minecraft.world.level.levelgen.feature.treedecorators.BeehiveDecorator BEEHIVE_005 -> cz
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration NORMAL_TREE_WITH_BEES_0002_CONFIG -> G
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration NORMAL_TREE_WITH_BEES_002_CONFIG -> H
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration NORMAL_TREE_WITH_BEES_005_CONFIG -> I
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration JUNGLE_TREE_CONFIG -> J
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration JUNGLE_TREE_NOVINE_CONFIG -> K
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration PINE_TREE_CONFIG -> L
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration SPRUCE_TREE_CONFIG -> M
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration ACACIA_TREE_CONFIG -> N
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration BIRCH_TREE_CONFIG -> O
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration BIRCH_TREE_WITH_BEES_0002_CONFIG -> P
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration BIRCH_TREE_WITH_BEES_002_CONFIG -> Q
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration BIRCH_TREE_WITH_BEES_005_CONFIG -> R
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration SUPER_BIRCH_TREE_WITH_BEES_0002_CONFIG -> S
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration SWAMP_TREE_CONFIG -> T
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration FANCY_TREE_CONFIG -> U
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration FANCY_TREE_WITH_BEES_0002_CONFIG -> V
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration FANCY_TREE_WITH_BEES_002_CONFIG -> W
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration FANCY_TREE_WITH_BEES_005_CONFIG -> X
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration JUNGLE_BUSH_CONFIG -> Y
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration DARK_OAK_TREE_CONFIG -> Z
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration MEGA_SPRUCE_TREE_CONFIG -> aa
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration MEGA_PINE_TREE_CONFIG -> ab
+    net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration MEGA_JUNGLE_TREE_CONFIG -> ac
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DEFAULT_GRASS_CONFIG -> ad
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration TAIGA_GRASS_CONFIG -> ae
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration JUNGLE_GRASS_CONFIG -> af
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration GENERAL_FOREST_FLOWER_CONFIG -> ag
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration SwAMP_FLOWER_CONFIG -> ah
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DEFAULT_FLOWER_CONFIG -> ai
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration PLAIN_FLOWER_CONFIG -> aj
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration FOREST_FLOWER_CONFIG -> ak
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DEAD_BUSH_CONFIG -> al
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration MELON_CONFIG -> am
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration PUMPKIN_CONFIG -> an
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration SWEET_BERRY_BUSH_CONFIG -> ao
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration FIRE_CONFIG -> ap
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration SOUL_FIRE_CONFIG -> aq
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration WATERLILLY_CONFIG -> ar
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration RED_MUSHROOM_CONFIG -> as
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration BROWN_MUSHROOM_CONFIG -> at
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration CRIMSON_ROOTS_CONFIG -> au
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DOUBLE_LILAC_CONFIG -> av
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DOUBLE_ROSE_BUSH_CONFIG -> aw
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration DOUBLE_PEONY_CONFIG -> ax
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration SUNFLOWER_CONFIG -> ay
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration TALL_GRASS_CONFIG -> az
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration LARGE_FERN_CONFIG -> aA
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration CACTUS_CONFIG -> aB
+    net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration SUGAR_CANE_CONFIG -> aC
+    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration HAY_PILE_CONFIG -> aD
+    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration SNOW_PILE_CONFIG -> aE
+    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration MELON_PILE_CONFIG -> aF
+    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration PUMPKIN_PILE_CONFIG -> aG
+    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration ICE_PILE_CONFIG -> aH
+    net.minecraft.world.level.material.FluidState WATER_STATE -> aI
+    net.minecraft.world.level.material.FluidState LAVA_STATE -> aJ
+    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration WATER_SPRING_CONFIG -> aK
+    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration LAVA_SPRING_CONFIG -> aL
+    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration OPEN_NETHER_SPRING_CONFIG -> aM
+    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration BASALT_DELTA_SPRING_CONFIG -> aN
+    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration CLOSED_NETHER_SPRING_CONFIG -> aO
+    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration OPEN_NETHER_SPRING_SOUL_SAND_CONFIG -> aP
+    net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration CLOSED_NETHER_SPRING_SOUL_SAND_CONFIG -> aQ
+    net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration SMALL_BASALT_COLUMN_FEATURE_CONFIG -> aR
+    net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration LARGE_BASALT_COLUMN_FEATURE_CONFIG -> aS
+    net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration BASALT_BLOBS_FEATURE_CONFIG -> aT
+    net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration BLACKSTONE_BLOBS_FEATURE_CONFIG -> aU
+    net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration BASALT_DELTA_FEATURE_CONFIG -> aV
+    net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration HUGE_RED_MUSHROOM_CONFIG -> aW
+    net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration HUGE_BROWN_MUSHROOM_CONFIG -> aX
+    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration CRIMSON_FOREST_CONFIG -> aY
+    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration WARPED_FOREST_CONFIG -> aZ
+    net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration NETHER_SPROUTS_CONFIG -> ba
+    98:98:void <init>() -> <init>
+    647:649:void addDefaultOverworldLandMesaStructures(net.minecraft.world.level.biome.Biome) -> a
+    652:654:void addDefaultOverworldLandStructures(net.minecraft.world.level.biome.Biome) -> b
+    657:659:void addDefaultOverworldOceanStructures(net.minecraft.world.level.biome.Biome) -> c
+    662:664:void addDefaultCarvers(net.minecraft.world.level.biome.Biome) -> d
+    667:671:void addOceanCarvers(net.minecraft.world.level.biome.Biome) -> e
+    674:676:void addDefaultLakes(net.minecraft.world.level.biome.Biome) -> f
+    679:680:void addDesertLakes(net.minecraft.world.level.biome.Biome) -> g
+    683:684:void addDefaultMonsterRoom(net.minecraft.world.level.biome.Biome) -> h
+    687:692:void addDefaultUndergroundVariety(net.minecraft.world.level.biome.Biome) -> i
+    695:701:void addDefaultOres(net.minecraft.world.level.biome.Biome) -> j
+    704:705:void addExtraGold(net.minecraft.world.level.biome.Biome) -> k
+    708:709:void addExtraEmeralds(net.minecraft.world.level.biome.Biome) -> l
+    712:713:void addInfestedStone(net.minecraft.world.level.biome.Biome) -> m
+    716:719:void addDefaultSoftDisks(net.minecraft.world.level.biome.Biome) -> n
+    722:723:void addSwampClayDisk(net.minecraft.world.level.biome.Biome) -> o
+    726:727:void addMossyStoneBlock(net.minecraft.world.level.biome.Biome) -> p
+    730:731:void addFerns(net.minecraft.world.level.biome.Biome) -> q
+    734:735:void addBerryBushes(net.minecraft.world.level.biome.Biome) -> r
+    738:739:void addSparseBerryBushes(net.minecraft.world.level.biome.Biome) -> s
+    742:743:void addLightBambooVegetation(net.minecraft.world.level.biome.Biome) -> t
+    746:755:void addBambooVegetation(net.minecraft.world.level.biome.Biome) -> u
+    758:762:void addTaigaTrees(net.minecraft.world.level.biome.Biome) -> v
+    765:769:void addWaterTrees(net.minecraft.world.level.biome.Biome) -> w
+    772:773:void addBirchTrees(net.minecraft.world.level.biome.Biome) -> x
+    776:783:void addOtherBirchTrees(net.minecraft.world.level.biome.Biome) -> y
+    786:790:void addTallBirchTrees(net.minecraft.world.level.biome.Biome) -> z
+    793:797:void addSavannaTrees(net.minecraft.world.level.biome.Biome) -> A
+    800:804:void addShatteredSavannaTrees(net.minecraft.world.level.biome.Biome) -> B
+    807:814:void addMountainTrees(net.minecraft.world.level.biome.Biome) -> C
+    817:824:void addMountainEdgeTrees(net.minecraft.world.level.biome.Biome) -> D
+    827:835:void addJungleTrees(net.minecraft.world.level.biome.Biome) -> E
+    838:845:void addJungleEdgeTrees(net.minecraft.world.level.biome.Biome) -> F
+    848:849:void addBadlandsTrees(net.minecraft.world.level.biome.Biome) -> G
+    852:853:void addSnowyTrees(net.minecraft.world.level.biome.Biome) -> H
+    856:863:void addGiantSpruceTrees(net.minecraft.world.level.biome.Biome) -> I
+    866:874:void addGiantTrees(net.minecraft.world.level.biome.Biome) -> J
+    877:878:void addJungleGrass(net.minecraft.world.level.biome.Biome) -> K
+    881:882:void addSavannaGrass(net.minecraft.world.level.biome.Biome) -> L
+    885:886:void addShatteredSavannaGrass(net.minecraft.world.level.biome.Biome) -> M
+    889:890:void addSavannaExtraGrass(net.minecraft.world.level.biome.Biome) -> N
+    893:895:void addBadlandGrass(net.minecraft.world.level.biome.Biome) -> O
+    898:907:void addForestFlowers(net.minecraft.world.level.biome.Biome) -> P
+    910:911:void addForestGrass(net.minecraft.world.level.biome.Biome) -> Q
+    914:921:void addSwampVegetation(net.minecraft.world.level.biome.Biome) -> R
+    924:930:void addMushroomFieldVegetation(net.minecraft.world.level.biome.Biome) -> S
+    933:939:void addPlainVegetation(net.minecraft.world.level.biome.Biome) -> T
+    942:943:void addDesertVegetation(net.minecraft.world.level.biome.Biome) -> U
+    946:950:void addGiantTaigaVegetation(net.minecraft.world.level.biome.Biome) -> V
+    953:954:void addDefaultFlowers(net.minecraft.world.level.biome.Biome) -> W
+    957:958:void addWarmFlowers(net.minecraft.world.level.biome.Biome) -> X
+    961:962:void addDefaultGrass(net.minecraft.world.level.biome.Biome) -> Y
+    965:968:void addTaigaGrass(net.minecraft.world.level.biome.Biome) -> Z
+    971:972:void addPlainGrass(net.minecraft.world.level.biome.Biome) -> aa
+    975:977:void addDefaultMushrooms(net.minecraft.world.level.biome.Biome) -> ab
+    980:982:void addDefaultExtraVegetation(net.minecraft.world.level.biome.Biome) -> ac
+    985:988:void addBadlandExtraVegetation(net.minecraft.world.level.biome.Biome) -> ad
+    991:993:void addJungleExtraVegetation(net.minecraft.world.level.biome.Biome) -> ae
+    996:999:void addDesertExtraVegetation(net.minecraft.world.level.biome.Biome) -> af
+    1002:1004:void addSwampExtraVegetation(net.minecraft.world.level.biome.Biome) -> ag
+    1007:1008:void addDesertExtraDecoration(net.minecraft.world.level.biome.Biome) -> ah
+    1011:1012:void addFossilDecoration(net.minecraft.world.level.biome.Biome) -> ai
+    1015:1016:void addColdOceanExtraVegetation(net.minecraft.world.level.biome.Biome) -> aj
+    1019:1020:void addDefaultSeagrass(net.minecraft.world.level.biome.Biome) -> ak
+    1023:1024:void addWarmSeagrass(net.minecraft.world.level.biome.Biome) -> al
+    1027:1028:void addDeepWarmSeagrass(net.minecraft.world.level.biome.Biome) -> am
+    1031:1032:void addLukeWarmKelp(net.minecraft.world.level.biome.Biome) -> an
+    1035:1037:void addDefaultSprings(net.minecraft.world.level.biome.Biome) -> ao
+    1040:1042:void addIcebergs(net.minecraft.world.level.biome.Biome) -> ap
+    1045:1046:void addBlueIce(net.minecraft.world.level.biome.Biome) -> aq
+    1049:1050:void addSurfaceFreezing(net.minecraft.world.level.biome.Biome) -> ar
+    1053:1058:void addNetherDefaultOres(net.minecraft.world.level.biome.Biome) -> as
+    1061:1063:void addNetherOres(net.minecraft.world.level.biome.Biome,int,int) -> a
+    1066:1068:void addAncientDebris(net.minecraft.world.level.biome.Biome) -> at
+    1071:1073:void addCrimsonForestVegetation(net.minecraft.world.level.biome.Biome) -> au
+    1076:1080:void addWarpedForestVegetation(net.minecraft.world.level.biome.Biome) -> av
+    99:644:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.BiomeManager -> brg:
     net.minecraft.world.level.biome.BiomeManager$NoiseBiomeSource noiseBiomeSource -> a
     long biomeZoomSeed -> b
     net.minecraft.world.level.biome.BiomeZoomer zoomer -> c
-    10:14:void <init>(net.minecraft.world.level.biome.BiomeManager$NoiseBiomeSource,long,net.minecraft.world.level.biome.BiomeZoomer) -> <init>
-    17:17:net.minecraft.world.level.biome.BiomeManager withDifferentSource(net.minecraft.world.level.biome.BiomeSource) -> a
-    21:21:net.minecraft.world.level.biome.Biome getBiome(net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.biome.BiomeManager$NoiseBiomeSource -> bkv$a:
+    12:16:void <init>(net.minecraft.world.level.biome.BiomeManager$NoiseBiomeSource,long,net.minecraft.world.level.biome.BiomeZoomer) -> <init>
+    19:19:long obfuscateSeed(long) -> a
+    23:23:net.minecraft.world.level.biome.BiomeManager withDifferentSource(net.minecraft.world.level.biome.BiomeSource) -> a
+    27:27:net.minecraft.world.level.biome.Biome getBiome(net.minecraft.core.BlockPos) -> a
+    31:34:net.minecraft.world.level.biome.Biome getNoiseBiomeAtPosition(double,double,double) -> a
+    38:41:net.minecraft.world.level.biome.Biome getNoiseBiomeAtPosition(net.minecraft.core.BlockPos) -> b
+    45:45:net.minecraft.world.level.biome.Biome getNoiseBiomeAtQuart(int,int,int) -> a
+net.minecraft.world.level.biome.BiomeManager$NoiseBiomeSource -> brg$a:
     net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
-net.minecraft.world.level.biome.BiomeSource -> bkw:
-    java.util.List PLAYER_SPAWN_BIOMES -> d
-    java.util.Map supportedStructures -> a
-    java.util.Set surfaceBlocks -> b
-    java.util.Set possibleBiomes -> c
-    19:25:void <init>(java.util.Set) -> <init>
-    28:28:java.util.List getPlayerSpawnBiomes() -> a
-    32:56:java.util.Set getBiomesWithin(int,int,int,int) -> a
-    67:93:net.minecraft.core.BlockPos findBiomeHorizontal(int,int,int,int,java.util.List,java.util.Random) -> a
-    98:98:float getHeightValue(int,int) -> a
-    102:102:boolean canGenerateStructure(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
-    106:111:java.util.Set getSurfaceBlocks() -> b
-    102:102:java.lang.Boolean lambda$canGenerateStructure$1(net.minecraft.world.level.levelgen.feature.StructureFeature) -> b
-    102:102:boolean lambda$null$0(net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.biome.Biome) -> a
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.BiomeSourceSettings -> bkx:
-net.minecraft.world.level.biome.BiomeSourceType -> bky:
-    net.minecraft.world.level.biome.BiomeSourceType CHECKERBOARD -> a
-    net.minecraft.world.level.biome.BiomeSourceType FIXED -> b
-    net.minecraft.world.level.biome.BiomeSourceType VANILLA_LAYERED -> c
-    net.minecraft.world.level.biome.BiomeSourceType THE_END -> d
-    java.util.function.Function factory -> e
-    java.util.function.Function settingsFactory -> f
-    15:15:net.minecraft.world.level.biome.BiomeSourceType register(java.lang.String,java.util.function.Function,java.util.function.Function) -> a
-    21:24:void <init>(java.util.function.Function,java.util.function.Function) -> <init>
-    27:27:net.minecraft.world.level.biome.BiomeSource create(net.minecraft.world.level.biome.BiomeSourceSettings) -> a
-    31:31:net.minecraft.world.level.biome.BiomeSourceSettings createSettings(net.minecraft.world.level.storage.LevelData) -> a
-    9:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.BiomeZoomer -> bkz:
+net.minecraft.world.level.biome.BiomeSource -> brh:
+    com.mojang.serialization.Codec CODEC -> a
+    java.util.List PLAYER_SPAWN_BIOMES -> e
+    java.util.Map supportedStructures -> b
+    java.util.Set surfaceBlocks -> c
+    java.util.List possibleBiomes -> d
+    32:38:void <init>(java.util.List) -> <init>
+    com.mojang.serialization.Codec codec() -> a
+    net.minecraft.world.level.biome.BiomeSource withSeed(long) -> a
+    45:45:java.util.List getPlayerSpawnBiomes() -> b
+    49:49:java.util.List possibleBiomes() -> c
+    53:77:java.util.Set getBiomesWithin(int,int,int,int) -> a
+    82:82:net.minecraft.core.BlockPos findBiomeHorizontal(int,int,int,int,java.util.List,java.util.Random) -> a
+    94:131:net.minecraft.core.BlockPos findBiomeHorizontal(int,int,int,int,int,java.util.List,java.util.Random,boolean) -> a
+    135:135:boolean canGenerateStructure(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    139:144:java.util.Set getSurfaceBlocks() -> d
+    135:135:java.lang.Boolean lambda$canGenerateStructure$1(net.minecraft.world.level.levelgen.feature.StructureFeature) -> b
+    135:135:boolean lambda$null$0(net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.biome.Biome) -> a
+    21:30:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.BiomeSpecialEffects -> bri:
+    com.mojang.serialization.Codec CODEC -> a
+    int fogColor -> b
+    int waterColor -> c
+    int waterFogColor -> d
+    java.util.Optional ambientParticleSettings -> e
+    java.util.Optional ambientLoopSoundEvent -> f
+    java.util.Optional ambientMoodSettings -> g
+    java.util.Optional ambientAdditionsSettings -> h
+    java.util.Optional backgroundMusic -> i
+    32:41:void <init>(int,int,int,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional) -> <init>
+    44:44:int getFogColor() -> a
+    48:48:int getWaterColor() -> b
+    52:52:int getWaterFogColor() -> c
+    56:56:java.util.Optional getAmbientParticleSettings() -> d
+    60:60:java.util.Optional getAmbientLoopSoundEvent() -> e
+    64:64:java.util.Optional getAmbientMoodSettings() -> f
+    68:68:java.util.Optional getAmbientAdditionsSettings() -> g
+    72:72:java.util.Optional getBackgroundMusic() -> h
+    12:21:com.mojang.datafixers.kinds.App lambda$static$8(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    20:20:java.util.Optional lambda$null$7(net.minecraft.world.level.biome.BiomeSpecialEffects) -> a
+    19:19:java.util.Optional lambda$null$6(net.minecraft.world.level.biome.BiomeSpecialEffects) -> b
+    18:18:java.util.Optional lambda$null$5(net.minecraft.world.level.biome.BiomeSpecialEffects) -> c
+    17:17:java.util.Optional lambda$null$4(net.minecraft.world.level.biome.BiomeSpecialEffects) -> d
+    16:16:java.util.Optional lambda$null$3(net.minecraft.world.level.biome.BiomeSpecialEffects) -> e
+    15:15:java.lang.Integer lambda$null$2(net.minecraft.world.level.biome.BiomeSpecialEffects) -> f
+    14:14:java.lang.Integer lambda$null$1(net.minecraft.world.level.biome.BiomeSpecialEffects) -> g
+    13:13:java.lang.Integer lambda$null$0(net.minecraft.world.level.biome.BiomeSpecialEffects) -> h
+    11:11:void <init>(int,int,int,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,net.minecraft.world.level.biome.BiomeSpecialEffects$1) -> <init>
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.BiomeSpecialEffects$1 -> bri$1:
+net.minecraft.world.level.biome.BiomeSpecialEffects$Builder -> bri$a:
+    java.util.OptionalInt fogColor -> a
+    java.util.OptionalInt waterColor -> b
+    java.util.OptionalInt waterFogColor -> c
+    java.util.Optional ambientParticle -> d
+    java.util.Optional ambientLoopSoundEvent -> e
+    java.util.Optional ambientMoodSettings -> f
+    java.util.Optional ambientAdditionsSettings -> g
+    java.util.Optional backgroundMusic -> h
+    75:83:void <init>() -> <init>
+    86:87:net.minecraft.world.level.biome.BiomeSpecialEffects$Builder fogColor(int) -> a
+    91:92:net.minecraft.world.level.biome.BiomeSpecialEffects$Builder waterColor(int) -> b
+    96:97:net.minecraft.world.level.biome.BiomeSpecialEffects$Builder waterFogColor(int) -> c
+    101:102:net.minecraft.world.level.biome.BiomeSpecialEffects$Builder ambientParticle(net.minecraft.world.level.biome.AmbientParticleSettings) -> a
+    106:107:net.minecraft.world.level.biome.BiomeSpecialEffects$Builder ambientLoopSound(net.minecraft.sounds.SoundEvent) -> a
+    111:112:net.minecraft.world.level.biome.BiomeSpecialEffects$Builder ambientMoodSound(net.minecraft.world.level.biome.AmbientMoodSettings) -> a
+    116:117:net.minecraft.world.level.biome.BiomeSpecialEffects$Builder ambientAdditionsSound(net.minecraft.world.level.biome.AmbientAdditionsSettings) -> a
+    121:122:net.minecraft.world.level.biome.BiomeSpecialEffects$Builder backgroundMusic(net.minecraft.sounds.Music) -> a
+    126:129:net.minecraft.world.level.biome.BiomeSpecialEffects build() -> a
+    129:129:java.lang.IllegalStateException lambda$build$2() -> b
+    128:128:java.lang.IllegalStateException lambda$build$1() -> c
+    127:127:java.lang.IllegalStateException lambda$build$0() -> d
+net.minecraft.world.level.biome.BiomeZoomer -> brj:
     net.minecraft.world.level.biome.Biome getBiome(long,int,int,int,net.minecraft.world.level.biome.BiomeManager$NoiseBiomeSource) -> a
-net.minecraft.world.level.biome.Biomes -> bla:
+net.minecraft.world.level.biome.Biomes -> brk:
     net.minecraft.world.level.biome.Biome OCEAN -> a
     net.minecraft.world.level.biome.Biome DEFAULT -> b
     net.minecraft.world.level.biome.Biome PLAINS -> c
@@ -51440,7 +56244,7 @@ net.minecraft.world.level.biome.Biomes -> bla:
     net.minecraft.world.level.biome.Biome TAIGA -> g
     net.minecraft.world.level.biome.Biome SWAMP -> h
     net.minecraft.world.level.biome.Biome RIVER -> i
-    net.minecraft.world.level.biome.Biome NETHER -> j
+    net.minecraft.world.level.biome.Biome NETHER_WASTES -> j
     net.minecraft.world.level.biome.Biome THE_END -> k
     net.minecraft.world.level.biome.Biome FROZEN_OCEAN -> l
     net.minecraft.world.level.biome.Biome FROZEN_RIVER -> m
@@ -51507,100 +56311,106 @@ net.minecraft.world.level.biome.Biomes -> bla:
     net.minecraft.world.level.biome.Biome MODIFIED_BADLANDS_PLATEAU -> av
     net.minecraft.world.level.biome.Biome BAMBOO_JUNGLE -> aw
     net.minecraft.world.level.biome.Biome BAMBOO_JUNGLE_HILLS -> ax
+    net.minecraft.world.level.biome.Biome SOUL_SAND_VALLEY -> ay
+    net.minecraft.world.level.biome.Biome CRIMSON_FOREST -> az
+    net.minecraft.world.level.biome.Biome WARPED_FOREST -> aA
+    net.minecraft.world.level.biome.Biome BASALT_DELTAS -> aB
     8:8:void <init>() -> <init>
-    131:136:net.minecraft.world.level.biome.Biome register(int,java.lang.String,net.minecraft.world.level.biome.Biome) -> a
-    9:128:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.BirchForestBiome -> blb:
-    13:60:void <init>() -> <init>
-net.minecraft.world.level.biome.BirchForestHillsBiome -> blc:
-    13:60:void <init>() -> <init>
-net.minecraft.world.level.biome.CheckerboardBiomeSourceSettings -> bld:
-    net.minecraft.world.level.biome.Biome[] allowedBiomes -> a
-    int size -> b
-    6:10:void <init>(net.minecraft.world.level.storage.LevelData) -> <init>
-    13:14:net.minecraft.world.level.biome.CheckerboardBiomeSourceSettings setAllowedBiomes(net.minecraft.world.level.biome.Biome[]) -> a
-    18:19:net.minecraft.world.level.biome.CheckerboardBiomeSourceSettings setSize(int) -> a
-    23:23:net.minecraft.world.level.biome.Biome[] getAllowedBiomes() -> a
-    27:27:int getSize() -> b
-net.minecraft.world.level.biome.CheckerboardColumnBiomeSource -> ble:
-    net.minecraft.world.level.biome.Biome[] allowedBiomes -> d
-    int bitShift -> e
-    10:13:void <init>(net.minecraft.world.level.biome.CheckerboardBiomeSourceSettings) -> <init>
-    17:17:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
-net.minecraft.world.level.biome.ColdOceanBiome -> blf:
-    19:69:void <init>() -> <init>
-net.minecraft.world.level.biome.DarkForestBiome -> blg:
-    18:75:void <init>() -> <init>
-    79:80:int getGrassColor(double,double) -> a
-net.minecraft.world.level.biome.DarkForestHillsBiome -> blh:
-    18:75:void <init>() -> <init>
-    79:80:int getGrassColor(double,double) -> a
-net.minecraft.world.level.biome.DeepColdOceanBiome -> bli:
-    20:71:void <init>() -> <init>
-net.minecraft.world.level.biome.DeepFrozenOceanBiome -> blj:
-    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise FROZEN_TEMPERATURE_NOISE -> u
-    21:71:void <init>() -> <init>
-    75:92:float getTemperatureNoCache(net.minecraft.core.BlockPos) -> a
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.DeepLukeWarmOceanBiome -> blk:
-    16:69:void <init>() -> <init>
-net.minecraft.world.level.biome.DeepOceanBiome -> bll:
-    20:71:void <init>() -> <init>
-net.minecraft.world.level.biome.DeepWarmOceanBiome -> blm:
-    16:66:void <init>() -> <init>
-net.minecraft.world.level.biome.DesertBiome -> bln:
-    14:62:void <init>() -> <init>
-net.minecraft.world.level.biome.DesertHillsBiome -> blo:
-    13:59:void <init>() -> <init>
-net.minecraft.world.level.biome.DesertLakesBiome -> blp:
-    13:58:void <init>() -> <init>
-net.minecraft.world.level.biome.EndBarrensBiome -> blq:
-    9:26:void <init>() -> <init>
-    30:30:int getSkyColor() -> c
-net.minecraft.world.level.biome.EndHighlandsBiome -> blr:
-    16:37:void <init>() -> <init>
-    41:41:int getSkyColor() -> c
-net.minecraft.world.level.biome.EndMidlandsBiome -> bls:
-    11:30:void <init>() -> <init>
-    34:34:int getSkyColor() -> c
-net.minecraft.world.level.biome.ErodedBadlandsBiome -> blt:
-    13:54:void <init>() -> <init>
+    136:141:net.minecraft.world.level.biome.Biome register(int,java.lang.String,net.minecraft.world.level.biome.Biome) -> a
+    9:133:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.BirchForestBiome -> brl:
+    10:64:void <init>() -> <init>
+net.minecraft.world.level.biome.BirchForestHillsBiome -> brm:
+    10:64:void <init>() -> <init>
+net.minecraft.world.level.biome.CheckerboardColumnBiomeSource -> brn:
+    com.mojang.serialization.Codec CODEC -> e
+    java.util.List allowedBiomes -> f
+    int bitShift -> g
+    int size -> h
+    22:26:void <init>(java.util.List,int) -> <init>
+    30:30:com.mojang.serialization.Codec codec() -> a
+    35:35:net.minecraft.world.level.biome.BiomeSource withSeed(long) -> a
+    40:40:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
+    12:15:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:java.lang.Integer lambda$null$1(net.minecraft.world.level.biome.CheckerboardColumnBiomeSource) -> a
+    13:13:java.util.List lambda$null$0(net.minecraft.world.level.biome.CheckerboardColumnBiomeSource) -> b
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.ColdOceanBiome -> bro:
+    14:68:void <init>() -> <init>
+net.minecraft.world.level.biome.CrimsonForestBiome -> brp:
+    25:84:void <init>() -> <init>
+net.minecraft.world.level.biome.DarkForestBiome -> brq:
+    15:76:void <init>() -> <init>
+    80:81:int getGrassColor(double,double) -> a
+net.minecraft.world.level.biome.DarkForestHillsBiome -> brr:
+    15:76:void <init>() -> <init>
+    80:81:int getGrassColor(double,double) -> a
+net.minecraft.world.level.biome.DeepColdOceanBiome -> brs:
+    14:69:void <init>() -> <init>
+net.minecraft.world.level.biome.DeepFrozenOceanBiome -> brt:
+    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise FROZEN_TEMPERATURE_NOISE -> t
+    15:69:void <init>() -> <init>
+    73:90:float getTemperatureNoCache(net.minecraft.core.BlockPos) -> a
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.DeepLukeWarmOceanBiome -> bru:
+    9:66:void <init>() -> <init>
+net.minecraft.world.level.biome.DeepOceanBiome -> brv:
+    14:69:void <init>() -> <init>
+net.minecraft.world.level.biome.DeepWarmOceanBiome -> brw:
+    10:64:void <init>() -> <init>
+net.minecraft.world.level.biome.DesertBiome -> brx:
+    10:65:void <init>() -> <init>
+net.minecraft.world.level.biome.DesertHillsBiome -> bry:
+    9:59:void <init>() -> <init>
+net.minecraft.world.level.biome.DesertLakesBiome -> brz:
+    9:58:void <init>() -> <init>
+net.minecraft.world.level.biome.EndBarrensBiome -> bsa:
+    9:29:void <init>() -> <init>
+    33:33:int getSkyColor() -> c
+net.minecraft.world.level.biome.EndHighlandsBiome -> bsb:
+    16:41:void <init>() -> <init>
+    45:45:int getSkyColor() -> c
+net.minecraft.world.level.biome.EndMidlandsBiome -> bsc:
+    9:31:void <init>() -> <init>
+    35:35:int getSkyColor() -> c
+net.minecraft.world.level.biome.ErodedBadlandsBiome -> bsd:
+    9:54:void <init>() -> <init>
     58:58:int getFoliageColor() -> a
     63:63:int getGrassColor(double,double) -> a
-net.minecraft.world.level.biome.FixedBiomeSource -> blu:
-    net.minecraft.world.level.biome.Biome biome -> d
-    16:18:void <init>(net.minecraft.world.level.biome.FixedBiomeSourceSettings) -> <init>
-    22:22:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
-    28:32:net.minecraft.core.BlockPos findBiomeHorizontal(int,int,int,int,java.util.List,java.util.Random) -> a
-    37:37:java.util.Set getBiomesWithin(int,int,int,int) -> a
-net.minecraft.world.level.biome.FixedBiomeSourceSettings -> blv:
-    net.minecraft.world.level.biome.Biome biome -> a
-    6:9:void <init>(net.minecraft.world.level.storage.LevelData) -> <init>
-    12:13:net.minecraft.world.level.biome.FixedBiomeSourceSettings setBiome(net.minecraft.world.level.biome.Biome) -> a
-    17:17:net.minecraft.world.level.biome.Biome getBiome() -> a
-net.minecraft.world.level.biome.ForestBiome -> blw:
-    13:62:void <init>() -> <init>
-net.minecraft.world.level.biome.ForestFlowerBiome -> blx:
-    21:82:void <init>() -> <init>
-net.minecraft.world.level.biome.FrozenOceanBiome -> bly:
-    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise FROZEN_TEMPERATURE_NOISE -> u
-    20:69:void <init>() -> <init>
-    73:90:float getTemperatureNoCache(net.minecraft.core.BlockPos) -> a
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.FrozenRiverBiome -> blz:
-    12:56:void <init>() -> <init>
-net.minecraft.world.level.biome.FuzzyOffsetBiomeZoomer -> bma:
+net.minecraft.world.level.biome.FixedBiomeSource -> bse:
+    com.mojang.serialization.Codec CODEC -> e
+    net.minecraft.world.level.biome.Biome biome -> f
+    20:22:void <init>(net.minecraft.world.level.biome.Biome) -> <init>
+    26:26:com.mojang.serialization.Codec codec() -> a
+    31:31:net.minecraft.world.level.biome.BiomeSource withSeed(long) -> a
+    36:36:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
+    42:49:net.minecraft.core.BlockPos findBiomeHorizontal(int,int,int,int,int,java.util.List,java.util.Random,boolean) -> a
+    54:54:java.util.Set getBiomesWithin(int,int,int,int) -> a
+    15:15:net.minecraft.world.level.biome.Biome lambda$static$0(net.minecraft.world.level.biome.FixedBiomeSource) -> a
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.ForestBiome -> bsf:
+    9:61:void <init>() -> <init>
+net.minecraft.world.level.biome.ForestFlowerBiome -> bsg:
+    18:83:void <init>() -> <init>
+net.minecraft.world.level.biome.FrozenOceanBiome -> bsh:
+    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise FROZEN_TEMPERATURE_NOISE -> t
+    15:68:void <init>() -> <init>
+    72:89:float getTemperatureNoCache(net.minecraft.core.BlockPos) -> a
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.FrozenRiverBiome -> bsi:
+    9:58:void <init>() -> <init>
+net.minecraft.world.level.biome.FuzzyOffsetBiomeZoomer -> bsj:
     net.minecraft.world.level.biome.FuzzyOffsetBiomeZoomer INSTANCE -> a
     net.minecraft.world.level.biome.FuzzyOffsetBiomeZoomer[] $VALUES -> b
     5:5:net.minecraft.world.level.biome.FuzzyOffsetBiomeZoomer[] values() -> values
     5:5:net.minecraft.world.level.biome.FuzzyOffsetBiomeZoomer valueOf(java.lang.String) -> valueOf
     5:5:void <init>(java.lang.String,int) -> <init>
-    15:66:net.minecraft.world.level.biome.Biome getBiome(long,int,int,int,net.minecraft.world.level.biome.BiomeManager$NoiseBiomeSource) -> a
+    14:65:net.minecraft.world.level.biome.Biome getBiome(long,int,int,int,net.minecraft.world.level.biome.BiomeManager$NoiseBiomeSource) -> a
     69:88:double getFiddledDistance(long,int,int,int,double,double,double) -> a
     92:93:double getFiddle(long) -> a
     97:97:double sqr(double) -> a
     5:6:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.FuzzyOffsetConstantColumnBiomeZoomer -> bmb:
+net.minecraft.world.level.biome.FuzzyOffsetConstantColumnBiomeZoomer -> bsk:
     net.minecraft.world.level.biome.FuzzyOffsetConstantColumnBiomeZoomer INSTANCE -> a
     net.minecraft.world.level.biome.FuzzyOffsetConstantColumnBiomeZoomer[] $VALUES -> b
     3:3:net.minecraft.world.level.biome.FuzzyOffsetConstantColumnBiomeZoomer[] values() -> values
@@ -51608,50 +56418,95 @@ net.minecraft.world.level.biome.FuzzyOffsetConstantColumnBiomeZoomer -> bmb:
     3:3:void <init>(java.lang.String,int) -> <init>
     8:8:net.minecraft.world.level.biome.Biome getBiome(long,int,int,int,net.minecraft.world.level.biome.BiomeManager$NoiseBiomeSource) -> a
     3:4:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.GiantSpruceTaigaBiome -> bmc:
-    13:65:void <init>() -> <init>
-net.minecraft.world.level.biome.GiantSpruceTaigaHillsMutatedBiome -> bmd:
-    13:65:void <init>() -> <init>
-net.minecraft.world.level.biome.GiantTreeTaigaBiome -> bme:
-    13:65:void <init>() -> <init>
-net.minecraft.world.level.biome.GiantTreeTaigaHillsBiome -> bmf:
-    13:65:void <init>() -> <init>
-net.minecraft.world.level.biome.GravellyMountainsBiome -> bmg:
-    13:62:void <init>() -> <init>
-net.minecraft.world.level.biome.IceSpikesBiome -> bmh:
-    19:66:void <init>() -> <init>
-    70:70:float getCreatureProbability() -> f
-net.minecraft.world.level.biome.JungleBiome -> bmi:
-    13:66:void <init>() -> <init>
-net.minecraft.world.level.biome.JungleEdgeBiome -> bmj:
-    13:61:void <init>() -> <init>
-net.minecraft.world.level.biome.JungleHillsBiome -> bmk:
-    13:66:void <init>() -> <init>
-net.minecraft.world.level.biome.LukeWarmOceanBiome -> bml:
-    15:66:void <init>() -> <init>
-net.minecraft.world.level.biome.ModifiedBadlandsPlateauBiome -> bmm:
-    13:54:void <init>() -> <init>
+net.minecraft.world.level.biome.GiantSpruceTaigaBiome -> bsl:
+    9:65:void <init>() -> <init>
+net.minecraft.world.level.biome.GiantSpruceTaigaHillsMutatedBiome -> bsm:
+    9:65:void <init>() -> <init>
+net.minecraft.world.level.biome.GiantTreeTaigaBiome -> bsn:
+    9:65:void <init>() -> <init>
+net.minecraft.world.level.biome.GiantTreeTaigaHillsBiome -> bso:
+    9:65:void <init>() -> <init>
+net.minecraft.world.level.biome.GravellyMountainsBiome -> bsp:
+    9:62:void <init>() -> <init>
+net.minecraft.world.level.biome.IceSpikesBiome -> bsq:
+    17:68:void <init>() -> <init>
+    72:72:float getCreatureProbability() -> f
+net.minecraft.world.level.biome.JungleBiome -> bsr:
+    10:70:void <init>() -> <init>
+net.minecraft.world.level.biome.JungleEdgeBiome -> bss:
+    9:61:void <init>() -> <init>
+net.minecraft.world.level.biome.JungleHillsBiome -> bst:
+    9:66:void <init>() -> <init>
+net.minecraft.world.level.biome.LukeWarmOceanBiome -> bsu:
+    9:64:void <init>() -> <init>
+net.minecraft.world.level.biome.ModifiedBadlandsPlateauBiome -> bsv:
+    9:54:void <init>() -> <init>
     58:58:int getFoliageColor() -> a
     63:63:int getGrassColor(double,double) -> a
-net.minecraft.world.level.biome.ModifiedGravellyMountainsBiome -> bmn:
-    13:62:void <init>() -> <init>
-net.minecraft.world.level.biome.ModifiedJungleBiome -> bmo:
-    13:63:void <init>() -> <init>
-net.minecraft.world.level.biome.ModifiedJungleEdgeBiome -> bmp:
-    13:61:void <init>() -> <init>
-net.minecraft.world.level.biome.ModifiedWoodedBadlandsPlateauBiome -> bmq:
-    13:55:void <init>() -> <init>
+net.minecraft.world.level.biome.ModifiedGravellyMountainsBiome -> bsw:
+    9:62:void <init>() -> <init>
+net.minecraft.world.level.biome.ModifiedJungleBiome -> bsx:
+    9:63:void <init>() -> <init>
+net.minecraft.world.level.biome.ModifiedJungleEdgeBiome -> bsy:
+    9:61:void <init>() -> <init>
+net.minecraft.world.level.biome.ModifiedWoodedBadlandsPlateauBiome -> bsz:
+    9:55:void <init>() -> <init>
     59:59:int getFoliageColor() -> a
     64:64:int getGrassColor(double,double) -> a
-net.minecraft.world.level.biome.MountainBiome -> bmr:
-    13:62:void <init>() -> <init>
-net.minecraft.world.level.biome.MountainEdgeBiome -> bms:
-    13:62:void <init>() -> <init>
-net.minecraft.world.level.biome.MushroomFieldsBiome -> bmt:
-    13:46:void <init>() -> <init>
-net.minecraft.world.level.biome.MushroomFieldsShoreBiome -> bmu:
-    13:46:void <init>() -> <init>
-net.minecraft.world.level.biome.NearestNeighborBiomeZoomer -> bmv:
+net.minecraft.world.level.biome.MountainBiome -> bta:
+    9:62:void <init>() -> <init>
+net.minecraft.world.level.biome.MountainEdgeBiome -> btb:
+    9:62:void <init>() -> <init>
+net.minecraft.world.level.biome.MultiNoiseBiomeSource -> btc:
+    com.mojang.serialization.MapCodec DIRECT_CODEC -> e
+    com.mojang.serialization.Codec CODEC -> f
+    net.minecraft.world.level.levelgen.synth.NormalNoise temperatureNoise -> g
+    net.minecraft.world.level.levelgen.synth.NormalNoise humidityNoise -> h
+    net.minecraft.world.level.levelgen.synth.NormalNoise altitudeNoise -> i
+    net.minecraft.world.level.levelgen.synth.NormalNoise weirdnessNoise -> j
+    java.util.List parameters -> k
+    boolean useY -> l
+    long seed -> m
+    java.util.Optional preset -> n
+    51:52:void <init>(long,java.util.List) -> <init>
+    55:70:void <init>(long,java.util.List,java.util.Optional) -> <init>
+    73:80:net.minecraft.world.level.biome.MultiNoiseBiomeSource defaultNether(long) -> d
+    85:85:com.mojang.serialization.Codec codec() -> a
+    90:90:net.minecraft.world.level.biome.BiomeSource withSeed(long) -> a
+    95:108:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
+    112:112:boolean stable(long) -> b
+    106:106:java.lang.Float lambda$getNoiseBiome$11(net.minecraft.world.level.biome.Biome$ClimateParameters,com.mojang.datafixers.util.Pair) -> a
+    80:80:java.util.stream.Stream lambda$defaultNether$10(net.minecraft.world.level.biome.Biome) -> a
+    80:80:com.mojang.datafixers.util.Pair lambda$null$9(net.minecraft.world.level.biome.Biome,net.minecraft.world.level.biome.Biome$ClimateParameters) -> a
+    38:38:com.mojang.datafixers.util.Either lambda$static$8(net.minecraft.world.level.biome.MultiNoiseBiomeSource) -> a
+    38:38:com.mojang.datafixers.util.Either lambda$null$7(net.minecraft.world.level.biome.MultiNoiseBiomeSource) -> b
+    38:38:com.mojang.datafixers.util.Either lambda$null$6(net.minecraft.world.level.biome.MultiNoiseBiomeSource,net.minecraft.world.level.biome.MultiNoiseBiomeSource$Preset) -> a
+    37:37:net.minecraft.world.level.biome.MultiNoiseBiomeSource lambda$static$5(com.mojang.datafixers.util.Either) -> a
+    37:37:net.minecraft.world.level.biome.MultiNoiseBiomeSource lambda$null$4(com.mojang.datafixers.util.Pair) -> a
+    28:34:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    33:33:java.util.List lambda$null$2(net.minecraft.world.level.biome.MultiNoiseBiomeSource) -> c
+    30:32:com.mojang.datafixers.kinds.App lambda$null$1(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> b
+    29:29:java.lang.Long lambda$null$0(net.minecraft.world.level.biome.MultiNoiseBiomeSource) -> d
+    26:26:net.minecraft.world.level.biome.MultiNoiseBiomeSource access$000(long) -> c
+    28:39:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.MultiNoiseBiomeSource$Preset -> btc$a:
+    java.util.Map BY_NAME -> c
+    com.mojang.serialization.MapCodec CODEC -> a
+    net.minecraft.world.level.biome.MultiNoiseBiomeSource$Preset NETHER -> b
+    net.minecraft.resources.ResourceLocation name -> d
+    java.util.function.LongFunction biomeSource -> e
+    128:132:void <init>(net.minecraft.resources.ResourceLocation,java.util.function.LongFunction) -> <init>
+    135:135:net.minecraft.world.level.biome.MultiNoiseBiomeSource biomeSource(long) -> a
+    123:123:net.minecraft.world.level.biome.MultiNoiseBiomeSource lambda$static$3(long) -> b
+    120:120:com.mojang.serialization.DataResult lambda$static$2(net.minecraft.world.level.biome.MultiNoiseBiomeSource$Preset) -> a
+    119:119:com.mojang.serialization.DataResult lambda$static$1(net.minecraft.resources.ResourceLocation) -> a
+    119:119:com.mojang.serialization.DataResult lambda$null$0(net.minecraft.resources.ResourceLocation) -> b
+    116:123:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.MushroomFieldsBiome -> btd:
+    9:46:void <init>() -> <init>
+net.minecraft.world.level.biome.MushroomFieldsShoreBiome -> bte:
+    9:46:void <init>() -> <init>
+net.minecraft.world.level.biome.NearestNeighborBiomeZoomer -> btf:
     net.minecraft.world.level.biome.NearestNeighborBiomeZoomer INSTANCE -> a
     net.minecraft.world.level.biome.NearestNeighborBiomeZoomer[] $VALUES -> b
     3:3:net.minecraft.world.level.biome.NearestNeighborBiomeZoomer[] values() -> values
@@ -51659,152 +56514,155 @@ net.minecraft.world.level.biome.NearestNeighborBiomeZoomer -> bmv:
     3:3:void <init>(java.lang.String,int) -> <init>
     8:8:net.minecraft.world.level.biome.Biome getBiome(long,int,int,int,net.minecraft.world.level.biome.BiomeManager$NoiseBiomeSource) -> a
     3:4:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.NetherBiome -> bmw:
-    22:57:void <init>() -> <init>
-net.minecraft.world.level.biome.OceanBiome -> bmx:
-    19:69:void <init>() -> <init>
-net.minecraft.world.level.biome.OverworldBiomeSource -> bmy:
-    net.minecraft.world.level.newbiome.layer.Layer noiseBiomeLayer -> d
-    java.util.Set POSSIBLE_BIOMES -> e
-    82:84:void <init>(net.minecraft.world.level.biome.OverworldBiomeSourceSettings) -> <init>
-    88:88:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.OverworldBiomeSourceSettings -> bmz:
-    long seed -> a
-    net.minecraft.world.level.LevelType generatorType -> b
-    net.minecraft.world.level.levelgen.OverworldGeneratorSettings generatorSettings -> c
-    10:15:void <init>(net.minecraft.world.level.storage.LevelData) -> <init>
-    18:19:net.minecraft.world.level.biome.OverworldBiomeSourceSettings setGeneratorSettings(net.minecraft.world.level.levelgen.OverworldGeneratorSettings) -> a
-    23:23:long getSeed() -> a
-    27:27:net.minecraft.world.level.LevelType getGeneratorType() -> b
-    31:31:net.minecraft.world.level.levelgen.OverworldGeneratorSettings getGeneratorSettings() -> c
-net.minecraft.world.level.biome.PlainsBiome -> bna:
-    14:63:void <init>() -> <init>
-net.minecraft.world.level.biome.RiverBiome -> bnb:
-    16:61:void <init>() -> <init>
-net.minecraft.world.level.biome.SavannaBiome -> bnc:
-    14:65:void <init>() -> <init>
-net.minecraft.world.level.biome.SavannaPlateauBiome -> bnd:
-    13:63:void <init>() -> <init>
-net.minecraft.world.level.biome.ShatteredSavannaBiome -> bne:
-    13:61:void <init>() -> <init>
-net.minecraft.world.level.biome.ShatteredSavannaPlateauBiome -> bnf:
-    13:61:void <init>() -> <init>
-net.minecraft.world.level.biome.SmallEndIslandsBiome -> bng:
-    14:32:void <init>() -> <init>
-    36:36:int getSkyColor() -> c
-net.minecraft.world.level.biome.SnowyBeachBiome -> bnh:
-    14:56:void <init>() -> <init>
-net.minecraft.world.level.biome.SnowyMountainsBiome -> bni:
-    13:58:void <init>() -> <init>
+net.minecraft.world.level.biome.NetherWastesBiome -> btg:
+    25:84:void <init>() -> <init>
+net.minecraft.world.level.biome.OceanBiome -> bth:
+    15:72:void <init>() -> <init>
+net.minecraft.world.level.biome.OverworldBiomeSource -> bti:
+    com.mojang.serialization.Codec CODEC -> e
+    net.minecraft.world.level.newbiome.layer.Layer noiseBiomeLayer -> f
+    java.util.List POSSIBLE_BIOMES -> g
+    long seed -> h
+    boolean legacyBiomeInitLayer -> i
+    boolean largeBiomes -> j
+    95:100:void <init>(long,boolean,boolean) -> <init>
+    104:104:com.mojang.serialization.Codec codec() -> a
+    109:109:net.minecraft.world.level.biome.BiomeSource withSeed(long) -> a
+    114:114:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
+    13:17:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    16:16:java.lang.Boolean lambda$null$2(net.minecraft.world.level.biome.OverworldBiomeSource) -> a
+    15:15:java.lang.Boolean lambda$null$1(net.minecraft.world.level.biome.OverworldBiomeSource) -> b
+    14:14:java.lang.Long lambda$null$0(net.minecraft.world.level.biome.OverworldBiomeSource) -> c
+    13:21:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.PlainsBiome -> btj:
+    10:66:void <init>() -> <init>
+net.minecraft.world.level.biome.RiverBiome -> btk:
+    14:64:void <init>() -> <init>
+net.minecraft.world.level.biome.SavannaBiome -> btl:
+    9:64:void <init>() -> <init>
+net.minecraft.world.level.biome.SavannaPlateauBiome -> btm:
+    9:63:void <init>() -> <init>
+net.minecraft.world.level.biome.ShatteredSavannaBiome -> btn:
+    9:61:void <init>() -> <init>
+net.minecraft.world.level.biome.ShatteredSavannaPlateauBiome -> bto:
+    9:61:void <init>() -> <init>
+net.minecraft.world.level.biome.SmallEndIslandsBiome -> btp:
+    14:36:void <init>() -> <init>
+    40:40:int getSkyColor() -> c
+net.minecraft.world.level.biome.SnowyBeachBiome -> btq:
+    9:56:void <init>() -> <init>
+net.minecraft.world.level.biome.SnowyMountainsBiome -> btr:
+    9:58:void <init>() -> <init>
     62:62:float getCreatureProbability() -> f
-net.minecraft.world.level.biome.SnowyTaigaBiome -> bnj:
-    13:65:void <init>() -> <init>
-net.minecraft.world.level.biome.SnowyTaigaHillsBiome -> bnk:
-    13:64:void <init>() -> <init>
-net.minecraft.world.level.biome.SnowyTaigaMountainsBiome -> bnl:
-    13:64:void <init>() -> <init>
-net.minecraft.world.level.biome.SnowyTundraBiome -> bnm:
-    14:62:void <init>() -> <init>
-    66:66:float getCreatureProbability() -> f
-net.minecraft.world.level.biome.StoneShoreBiome -> bnn:
-    13:54:void <init>() -> <init>
-net.minecraft.world.level.biome.SunflowerPlainsBiome -> bno:
-    17:66:void <init>() -> <init>
-net.minecraft.world.level.biome.SwampBiome -> bnp:
-    17:64:void <init>() -> <init>
-    68:72:int getGrassColor(double,double) -> a
-    77:77:int getFoliageColor() -> a
-net.minecraft.world.level.biome.SwampHillsBiome -> bnq:
-    12:57:void <init>() -> <init>
-    61:65:int getGrassColor(double,double) -> a
-    70:70:int getFoliageColor() -> a
-net.minecraft.world.level.biome.TaigaBiome -> bnr:
+net.minecraft.world.level.biome.SnowyTaigaBiome -> bts:
+    9:65:void <init>() -> <init>
+net.minecraft.world.level.biome.SnowyTaigaHillsBiome -> btt:
+    9:64:void <init>() -> <init>
+net.minecraft.world.level.biome.SnowyTaigaMountainsBiome -> btu:
+    9:64:void <init>() -> <init>
+net.minecraft.world.level.biome.SnowyTundraBiome -> btv:
+    10:65:void <init>() -> <init>
+    69:69:float getCreatureProbability() -> f
+net.minecraft.world.level.biome.SoulSandValleyBiome -> btw:
+    26:95:void <init>() -> <init>
+net.minecraft.world.level.biome.StoneShoreBiome -> btx:
+    9:54:void <init>() -> <init>
+net.minecraft.world.level.biome.SunflowerPlainsBiome -> bty:
     14:67:void <init>() -> <init>
-net.minecraft.world.level.biome.TaigaHillsBiome -> bns:
-    13:64:void <init>() -> <init>
-net.minecraft.world.level.biome.TaigaMountainsBiome -> bnt:
-    13:64:void <init>() -> <init>
-net.minecraft.world.level.biome.TallBirchForestBiome -> bnu:
-    13:60:void <init>() -> <init>
-net.minecraft.world.level.biome.TallBirchHillsBiome -> bnv:
-    13:60:void <init>() -> <init>
-net.minecraft.world.level.biome.TheEndBiome -> bnw:
-    15:33:void <init>() -> <init>
-    37:37:int getSkyColor() -> c
-net.minecraft.world.level.biome.TheEndBiomeSource -> bnx:
-    net.minecraft.world.level.levelgen.synth.SimplexNoise islandNoise -> d
-    net.minecraft.world.level.levelgen.WorldgenRandom random -> e
-    java.util.Set POSSIBLE_BIOMES -> f
-    27:32:void <init>(net.minecraft.world.level.biome.TheEndBiomeSourceSettings) -> <init>
-    36:56:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
-    61:86:float getHeightValue(int,int) -> a
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.biome.TheEndBiomeSourceSettings -> bny:
-    long seed -> a
-    8:10:void <init>(net.minecraft.world.level.storage.LevelData) -> <init>
-    13:13:long getSeed() -> a
-net.minecraft.world.level.biome.TheVoidBiome -> bnz:
-    12:27:void <init>() -> <init>
-net.minecraft.world.level.biome.WarmOceanBiome -> boa:
-    24:78:void <init>() -> <init>
-net.minecraft.world.level.biome.WoodedBadlandsBiome -> bob:
-    13:55:void <init>() -> <init>
+net.minecraft.world.level.biome.SwampBiome -> btz:
+    14:65:void <init>() -> <init>
+    69:73:int getGrassColor(double,double) -> a
+    78:78:int getFoliageColor() -> a
+net.minecraft.world.level.biome.SwampHillsBiome -> bua:
+    9:59:void <init>() -> <init>
+    63:67:int getGrassColor(double,double) -> a
+    72:72:int getFoliageColor() -> a
+net.minecraft.world.level.biome.TaigaBiome -> bub:
+    9:66:void <init>() -> <init>
+net.minecraft.world.level.biome.TaigaHillsBiome -> buc:
+    9:64:void <init>() -> <init>
+net.minecraft.world.level.biome.TaigaMountainsBiome -> bud:
+    9:64:void <init>() -> <init>
+net.minecraft.world.level.biome.TallBirchForestBiome -> bue:
+    9:60:void <init>() -> <init>
+net.minecraft.world.level.biome.TallBirchHillsBiome -> buf:
+    9:60:void <init>() -> <init>
+net.minecraft.world.level.biome.TheEndBiome -> bug:
+    13:35:void <init>() -> <init>
+    39:39:int getSkyColor() -> c
+net.minecraft.world.level.biome.TheEndBiomeSource -> buh:
+    com.mojang.serialization.Codec CODEC -> e
+    net.minecraft.world.level.levelgen.synth.SimplexNoise islandNoise -> f
+    java.util.List POSSIBLE_BIOMES -> g
+    long seed -> h
+    30:36:void <init>(long) -> <init>
+    40:40:com.mojang.serialization.Codec codec() -> a
+    45:45:net.minecraft.world.level.biome.BiomeSource withSeed(long) -> a
+    50:70:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
+    74:74:boolean stable(long) -> b
+    78:103:float getHeightValue(net.minecraft.world.level.levelgen.synth.SimplexNoise,int,int) -> a
+    12:12:java.lang.Long lambda$static$0(net.minecraft.world.level.biome.TheEndBiomeSource) -> a
+    12:20:void <clinit>() -> <clinit>
+net.minecraft.world.level.biome.TheVoidBiome -> bui:
+    10:30:void <init>() -> <init>
+net.minecraft.world.level.biome.WarmOceanBiome -> buj:
+    19:80:void <init>() -> <init>
+net.minecraft.world.level.biome.WarpedForestBiome -> buk:
+    25:85:void <init>() -> <init>
+net.minecraft.world.level.biome.WoodedBadlandsBiome -> bul:
+    9:55:void <init>() -> <init>
     59:59:int getFoliageColor() -> a
     64:64:int getGrassColor(double,double) -> a
-net.minecraft.world.level.biome.WoodedHillsBiome -> boc:
-    13:62:void <init>() -> <init>
-net.minecraft.world.level.biome.WoodedMountainBiome -> bod:
-    13:62:void <init>() -> <init>
-net.minecraft.world.level.biome.package-info -> boe:
-net.minecraft.world.level.block.AbstractBannerBlock -> bof:
+net.minecraft.world.level.biome.WoodedHillsBiome -> bum:
+    9:61:void <init>() -> <init>
+net.minecraft.world.level.biome.WoodedMountainBiome -> bun:
+    9:62:void <init>() -> <init>
+net.minecraft.world.level.biome.package-info -> buo:
+net.minecraft.world.level.block.AbstractBannerBlock -> bup:
     net.minecraft.world.item.DyeColor color -> a
-    19:21:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.Block$Properties) -> <init>
-    25:25:boolean isPossibleToRespawnInThis() -> Y_
+    19:21:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    25:25:boolean isPossibleToRespawnInThis() -> ak_
     30:30:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     35:41:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
     45:50:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     54:54:net.minecraft.world.item.DyeColor getColor() -> b
-net.minecraft.world.level.block.AbstractChestBlock -> bog:
+net.minecraft.world.level.block.AbstractChestBlock -> buq:
     java.util.function.Supplier blockEntityType -> a
-    16:18:void <init>(net.minecraft.world.level.block.Block$Properties,java.util.function.Supplier) -> <init>
+    16:18:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,java.util.function.Supplier) -> <init>
     net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult combine(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
-net.minecraft.world.level.block.AbstractFurnaceBlock -> boh:
+net.minecraft.world.level.block.AbstractFurnaceBlock -> bur:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty LIT -> b
-    29:31:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    35:35:int getLightEmission(net.minecraft.world.level.block.state.BlockState) -> a
-    40:46:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    31:33:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    37:43:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     void openContainer(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    53:53:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    58:64:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    68:79:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    83:83:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    88:88:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    50:50:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    55:61:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    65:76:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    80:80:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    85:85:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    96:96:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    101:101:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    106:106:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    111:112:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    25:26:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.AbstractGlassBlock -> boi:
-    10:11:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    15:15:float getShadeBrightness(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    20:20:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    25:25:boolean isSuffocating(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
-    30:30:boolean isRedstoneConductor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
-    35:35:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-net.minecraft.world.level.block.AbstractSkullBlock -> boj:
+    93:93:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    98:98:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    103:103:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    108:109:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    27:28:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.AbstractGlassBlock -> bus:
+    12:13:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    17:17:net.minecraft.world.phys.shapes.VoxelShape getVisualShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    22:22:float getShadeBrightness(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    27:27:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+net.minecraft.world.level.block.AbstractSkullBlock -> but:
     net.minecraft.world.level.block.SkullBlock$Type type -> a
-    11:13:void <init>(net.minecraft.world.level.block.SkullBlock$Type,net.minecraft.world.level.block.Block$Properties) -> <init>
-    17:17:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    21:21:net.minecraft.world.level.block.SkullBlock$Type getType() -> b
-net.minecraft.world.level.block.AirBlock -> bok:
-    12:13:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    17:17:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    22:22:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    27:27:boolean isAir(net.minecraft.world.level.block.state.BlockState) -> d
-net.minecraft.world.level.block.AnvilBlock -> bol:
+    15:17:void <init>(net.minecraft.world.level.block.SkullBlock$Type,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    21:21:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    25:25:net.minecraft.world.level.block.SkullBlock$Type getType() -> b
+    30:30:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+net.minecraft.world.level.block.AirBlock -> buu:
+    12:13:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    17:17:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    22:22:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+net.minecraft.world.level.block.AnvilBlock -> buv:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.phys.shapes.VoxelShape BASE -> b
     net.minecraft.world.phys.shapes.VoxelShape X_LEG1 -> c
@@ -51816,66 +56674,69 @@ net.minecraft.world.level.block.AnvilBlock -> bol:
     net.minecraft.world.phys.shapes.VoxelShape X_AXIS_AABB -> i
     net.minecraft.world.phys.shapes.VoxelShape Z_AXIS_AABB -> j
     net.minecraft.network.chat.TranslatableComponent CONTAINER_TITLE -> k
-    48:50:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    48:50:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     54:54:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     59:65:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     71:71:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-    76:80:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    76:80:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     86:87:void falling(net.minecraft.world.entity.item.FallingBlockEntity) -> a
-    91:92:void onLand(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
-    96:97:void onBroken(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    101:108:net.minecraft.world.level.block.state.BlockState damage(net.minecraft.world.level.block.state.BlockState) -> e
-    113:113:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    118:119:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    123:123:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    91:94:void onLand(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.item.FallingBlockEntity) -> a
+    98:101:void onBroken(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.item.FallingBlockEntity) -> a
+    105:111:net.minecraft.world.level.block.state.BlockState damage(net.minecraft.world.level.block.state.BlockState) -> c
+    116:116:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    121:122:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    126:126:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    131:131:int getDustColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
     71:71:net.minecraft.world.inventory.AbstractContainerMenu lambda$getMenuProvider$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
     30:45:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.AttachedStemBlock -> bom:
+net.minecraft.world.level.block.AttachedStemBlock -> buw:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.StemGrownBlock fruit -> b
     java.util.Map AABBS -> c
-    34:37:void <init>(net.minecraft.world.level.block.StemGrownBlock,net.minecraft.world.level.block.Block$Properties) -> <init>
-    41:41:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    34:37:void <init>(net.minecraft.world.level.block.StemGrownBlock,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    41:41:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     46:49:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    54:54:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
+    54:54:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
     58:66:net.minecraft.world.item.Item getSeedItem() -> b
     71:71:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     76:76:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     81:81:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     86:87:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     21:30:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BambooBlock -> bon:
+net.minecraft.world.level.block.BambooBlock -> bux:
     net.minecraft.world.phys.shapes.VoxelShape SMALL_SHAPE -> a
     net.minecraft.world.phys.shapes.VoxelShape LARGE_SHAPE -> b
     net.minecraft.world.phys.shapes.VoxelShape COLLISION_SHAPE -> c
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> d
     net.minecraft.world.level.block.state.properties.EnumProperty LEAVES -> e
     net.minecraft.world.level.block.state.properties.IntegerProperty STAGE -> f
-    49:51:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    49:51:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     55:56:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    60:60:net.minecraft.world.level.block.Block$OffsetType getOffsetType() -> X_
+    60:60:net.minecraft.world.level.block.state.BlockBehaviour$OffsetType getOffsetType() -> aj_
     65:65:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    70:72:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    70:72:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     77:77:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    82:83:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    89:107:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    112:127:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    131:131:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    136:146:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    151:153:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    158:158:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    163:180:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    184:188:float getDestroyProgress(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    192:213:void growBamboo(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random,int) -> a
-    216:220:int getHeightAboveUpToMax(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    224:228:int getHeightBelowUpToMax(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    82:83:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    89:106:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    111:114:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    118:118:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    123:133:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    137:137:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    142:152:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    157:159:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    164:164:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    169:186:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    190:194:float getDestroyProgress(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    198:219:void growBamboo(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random,int) -> a
+    222:226:int getHeightAboveUpToMax(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    230:234:int getHeightBelowUpToMax(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
     34:40:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BambooSaplingBlock -> boo:
+net.minecraft.world.level.block.BambooSaplingBlock -> buy:
     net.minecraft.world.phys.shapes.VoxelShape SAPLING_SHAPE -> a
-    28:29:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    33:33:net.minecraft.world.level.block.Block$OffsetType getOffsetType() -> X_
-    38:39:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    44:47:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    28:29:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    33:33:net.minecraft.world.level.block.state.BlockBehaviour$OffsetType getOffsetType() -> aj_
+    38:39:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    44:47:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
     51:51:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     56:64:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     69:69:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
@@ -51885,13 +56746,13 @@ net.minecraft.world.level.block.BambooSaplingBlock -> boo:
     89:93:float getDestroyProgress(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
     97:98:void growBamboo(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     25:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BannerBlock -> bop:
+net.minecraft.world.level.block.BannerBlock -> buz:
     net.minecraft.world.level.block.state.properties.IntegerProperty ROTATION -> a
     java.util.Map BY_COLOR -> b
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> c
-    28:32:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.Block$Properties) -> <init>
+    28:32:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     36:36:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    41:41:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    41:41:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     46:46:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     51:55:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     60:60:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
@@ -51899,57 +56760,56 @@ net.minecraft.world.level.block.BannerBlock -> bop:
     70:71:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     74:74:net.minecraft.world.level.block.Block byColor(net.minecraft.world.item.DyeColor) -> a
     22:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BarrelBlock -> boq:
+net.minecraft.world.level.block.BarrelBlock -> bva:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty OPEN -> b
-    35:37:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    41:51:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    56:66:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    70:75:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    80:80:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    85:85:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    90:96:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    100:100:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    105:105:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    110:110:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    115:115:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    120:121:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    125:125:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    31:32:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BarrierBlock -> bor:
-    10:11:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    15:15:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    20:20:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    25:25:float getShadeBrightness(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    30:30:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-net.minecraft.world.level.block.BaseCoralFanBlock -> bos:
+    36:38:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    42:53:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    58:68:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    72:77:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    82:82:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    87:87:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    92:98:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    102:102:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    107:107:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    112:112:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    117:117:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    122:123:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    127:127:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    32:33:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.BarrierBlock -> bvb:
+    9:10:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    14:14:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    19:19:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    24:24:float getShadeBrightness(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.block.BaseCoralFanBlock -> bvc:
     net.minecraft.world.phys.shapes.VoxelShape AABB -> a
-    13:14:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    18:18:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    13:14:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    18:18:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     10:10:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BaseCoralPlantBlock -> bot:
+net.minecraft.world.level.block.BaseCoralPlantBlock -> bvd:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    14:15:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    19:19:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    14:15:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    19:19:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     11:11:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BaseCoralPlantTypeBlock -> bou:
+net.minecraft.world.level.block.BaseCoralPlantTypeBlock -> bve:
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> b
     net.minecraft.world.phys.shapes.VoxelShape AABB -> a
-    26:28:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    26:28:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     31:34:void tryScheduleDieTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    37:46:boolean scanForWater(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b_
+    37:46:boolean scanForWater(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
     52:54:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    59:59:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    59:59:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     64:71:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     76:77:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     82:83:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    87:91:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
+    87:91:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
     22:23:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BaseCoralWallFanBlock -> bov:
+net.minecraft.world.level.block.BaseCoralWallFanBlock -> bvf:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     java.util.Map SHAPES -> c
-    32:34:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    38:38:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    32:34:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    38:38:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     43:43:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     48:48:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     53:54:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
@@ -51957,66 +56817,90 @@ net.minecraft.world.level.block.BaseCoralWallFanBlock -> bov:
     71:75:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     81:98:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     22:28:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BaseEntityBlock -> bow:
-    13:14:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    18:18:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
+net.minecraft.world.level.block.BaseEntityBlock -> bvg:
+    13:14:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    18:18:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
     23:29:boolean triggerEvent(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,int) -> a
     35:36:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-net.minecraft.world.level.block.BasePressurePlateBlock -> box:
+net.minecraft.world.level.block.BaseFireBlock -> bvh:
+    float fireDamage -> g
+    net.minecraft.world.phys.shapes.VoxelShape UP_AABB -> a
+    net.minecraft.world.phys.shapes.VoxelShape DOWN_AABB -> b
+    net.minecraft.world.phys.shapes.VoxelShape WEST_AABB -> c
+    net.minecraft.world.phys.shapes.VoxelShape EAST_AABB -> d
+    net.minecraft.world.phys.shapes.VoxelShape NORTH_AABB -> e
+    net.minecraft.world.phys.shapes.VoxelShape SOUTH_AABB -> f
+    35:37:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,float) -> <init>
+    41:41:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    45:52:net.minecraft.world.level.block.state.BlockState getState(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    57:57:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    62:117:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    boolean canBurn(net.minecraft.world.level.block.state.BlockState) -> e
+    123:133:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    137:149:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    153:156:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
+    159:162:boolean canBePlacedAt(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    166:171:boolean isPortal(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
+    27:32:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.BasePressurePlateBlock -> bvi:
     net.minecraft.world.phys.shapes.VoxelShape PRESSED_AABB -> a
     net.minecraft.world.phys.shapes.VoxelShape AABB -> b
     net.minecraft.world.phys.AABB TOUCH_AABB -> c
-    27:28:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    32:32:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    37:37:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    42:42:boolean isPossibleToRespawnInThis() -> Y_
-    47:50:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    55:56:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    61:65:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    69:77:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    80:100:void checkPressed(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
+    27:28:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    32:32:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    36:36:int getPressedTime() -> c
+    41:41:boolean isPossibleToRespawnInThis() -> ak_
+    46:49:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    54:55:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    60:64:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    68:76:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    79:99:void checkPressed(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
     void playOnSound(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
     void playOffSound(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
-    108:116:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    119:121:void updateNeighbours(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    125:125:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    130:134:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    139:139:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
-    144:144:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
+    107:115:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    118:120:void updateNeighbours(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    124:124:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    129:133:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    138:138:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
+    143:143:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
     int getSignalStrength(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-    int getSignalForState(net.minecraft.world.level.block.state.BlockState) -> h
+    int getSignalForState(net.minecraft.world.level.block.state.BlockState) -> g
     net.minecraft.world.level.block.state.BlockState setSignalForState(net.minecraft.world.level.block.state.BlockState,int) -> a
     22:24:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BaseRailBlock -> boy:
+net.minecraft.world.level.block.BaseRailBlock -> bvj:
     net.minecraft.world.phys.shapes.VoxelShape FLAT_AABB -> a
     net.minecraft.world.phys.shapes.VoxelShape HALF_BLOCK_AABB -> b
     boolean isStraight -> c
     24:24:boolean isRail(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    28:28:boolean isRail(net.minecraft.world.level.block.state.BlockState) -> h
-    32:34:void <init>(boolean,net.minecraft.world.level.block.Block$Properties) -> <init>
+    28:28:boolean isRail(net.minecraft.world.level.block.state.BlockState) -> g
+    32:34:void <init>(boolean,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     37:37:boolean isStraight() -> c
-    42:46:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    42:46:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     52:52:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    57:65:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    69:108:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    111:111:void updateState(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
-    114:118:net.minecraft.world.level.block.state.BlockState updateDir(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    123:123:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
-    128:142:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    146:149:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    57:61:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    64:70:net.minecraft.world.level.block.state.BlockState updateState(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
+    75:89:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    92:105:boolean shouldBeRemoved(net.minecraft.core.BlockPos,net.minecraft.world.level.Level,net.minecraft.world.level.block.state.properties.RailShape) -> a
+    110:110:void updateState(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
+    113:117:net.minecraft.world.level.block.state.BlockState updateDir(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    122:122:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
+    127:141:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    145:148:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     net.minecraft.world.level.block.state.properties.Property getShapeProperty() -> d
     18:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BeaconBeamBlock -> boz:
+net.minecraft.world.level.block.BaseRailBlock$1 -> bvj$1:
+    int[] $SwitchMap$net$minecraft$world$level$block$state$properties$RailShape -> a
+    95:95:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.BeaconBeamBlock -> bvk:
     net.minecraft.world.item.DyeColor getColor() -> a
-net.minecraft.world.level.block.BeaconBlock -> bpa:
-    20:21:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.BeaconBlock -> bvl:
+    20:21:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     25:25:net.minecraft.world.item.DyeColor getColor() -> a
     30:30:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     35:45:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    50:50:boolean isRedstoneConductor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
-    55:55:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    60:66:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.level.block.BedBlock -> bpb:
+    50:50:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    55:61:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.world.level.block.BedBlock -> bvm:
     net.minecraft.world.level.block.state.properties.EnumProperty PART -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty OCCUPIED -> b
     net.minecraft.world.phys.shapes.VoxelShape BASE -> c
@@ -52028,84 +56912,81 @@ net.minecraft.world.level.block.BedBlock -> bpb:
     net.minecraft.world.phys.shapes.VoxelShape SOUTH_SHAPE -> i
     net.minecraft.world.phys.shapes.VoxelShape WEST_SHAPE -> j
     net.minecraft.world.phys.shapes.VoxelShape EAST_SHAPE -> k
-    net.minecraft.world.item.DyeColor color -> w
-    69:72:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.Block$Properties) -> <init>
-    76:79:net.minecraft.world.level.material.MaterialColor getMapColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> e
-    84:85:net.minecraft.core.Direction getBedOrientation(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    90:130:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    137:142:boolean kickVillagerOutOfBed(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    147:148:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
-    152:157:void updateEntityAfterFallOn(net.minecraft.world.level.BlockGetter,net.minecraft.world.entity.Entity) -> a
-    160:170:void bounceUp(net.minecraft.world.entity.Entity) -> a
-    174:182:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    186:186:net.minecraft.core.Direction getNeighbourDirection(net.minecraft.world.level.block.state.properties.BedPart,net.minecraft.core.Direction) -> a
-    192:193:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
-    197:219:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
-    224:232:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    237:246:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    251:252:net.minecraft.core.Direction getConnectedDirection(net.minecraft.world.level.block.state.BlockState) -> h
-    256:260:net.minecraft.world.level.block.DoubleBlockCombiner$BlockType getBlockType(net.minecraft.world.level.block.state.BlockState) -> i
-    264:293:java.util.Optional findStandUpPosition(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int) -> a
-    297:330:java.util.Optional getStandingLocationAtOrBelow(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    335:335:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
-    340:340:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    345:346:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    350:350:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    355:365:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    368:368:net.minecraft.world.item.DyeColor getColor() -> c
-    373:374:long getSeed(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    379:379:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    126:129:void lambda$use$0(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.player.Player$BedSleepingProblem) -> a
-    48:64:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BedBlock$1 -> bpb$1:
+    net.minecraft.world.item.DyeColor color -> o
+    66:69:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    73:74:net.minecraft.core.Direction getBedOrientation(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    79:119:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    123:123:boolean canSetSpawn(net.minecraft.world.level.Level) -> a
+    130:135:boolean kickVillagerOutOfBed(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    140:141:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
+    145:150:void updateEntityAfterFallOn(net.minecraft.world.level.BlockGetter,net.minecraft.world.entity.Entity) -> a
+    153:163:void bounceUp(net.minecraft.world.entity.Entity) -> a
+    167:175:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    179:179:net.minecraft.core.Direction getNeighbourDirection(net.minecraft.world.level.block.state.properties.BedPart,net.minecraft.core.Direction) -> a
+    184:198:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
+    203:211:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    216:225:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    230:231:net.minecraft.core.Direction getConnectedDirection(net.minecraft.world.level.block.state.BlockState) -> g
+    235:239:net.minecraft.world.level.block.DoubleBlockCombiner$BlockType getBlockType(net.minecraft.world.level.block.state.BlockState) -> h
+    243:272:java.util.Optional findStandUpPosition(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int) -> a
+    276:302:java.util.Optional getStandingLocationAtOrBelow(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    307:307:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
+    312:312:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    317:318:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    322:322:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    327:337:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    340:340:net.minecraft.world.item.DyeColor getColor() -> c
+    345:346:long getSeed(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    351:351:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    115:118:void lambda$use$0(net.minecraft.world.entity.player.Player,net.minecraft.world.entity.player.Player$BedSleepingProblem) -> a
+    45:61:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.BedBlock$1 -> bvm$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    238:238:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BedrockBlock -> bpc:
-    10:11:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    15:15:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-net.minecraft.world.level.block.BeehiveBlock -> bpd:
-    net.minecraft.core.Direction[] SPAWN_DIRECTIONS -> a
-    net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> b
-    net.minecraft.world.level.block.state.properties.IntegerProperty HONEY_LEVEL -> c
-    64:66:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    70:70:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
+    217:217:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.BeehiveBlock -> bvn:
+    net.minecraft.core.Direction[] SPAWN_DIRECTIONS -> c
+    net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
+    net.minecraft.world.level.block.state.properties.IntegerProperty HONEY_LEVEL -> b
+    64:66:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    70:70:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
     75:75:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     80:97:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
     100:110:void angerNearbyBees(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
     113:114:void dropHoneycomb(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    118:157:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    161:167:boolean hiveContainsBees(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
-    171:178:void releaseBeesAndResetHoneyLevel(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus) -> a
-    181:182:void resetHoneyLevel(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    186:191:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    194:214:void trySpawnDripParticles(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    217:222:void spawnParticle(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.VoxelShape,double) -> a
-    225:226:void spawnFluidParticle(net.minecraft.world.level.Level,double,double,double,double,double) -> a
-    230:230:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    235:236:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    240:240:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    246:246:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    251:282:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
-    286:300:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
-    305:313:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    127:127:void lambda$use$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
-    54:57:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BeetrootBlock -> bpe:
+    118:153:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    157:163:boolean hiveContainsBees(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
+    167:174:void releaseBeesAndResetHoneyLevel(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus) -> a
+    177:178:void resetHoneyLevel(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    182:187:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    190:210:void trySpawnDripParticles(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    213:218:void spawnParticle(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.VoxelShape,double) -> a
+    221:222:void spawnFluidParticle(net.minecraft.world.level.Level,double,double,double,double,double) -> a
+    226:226:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    231:232:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    236:236:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    242:242:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    247:278:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
+    282:296:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
+    301:309:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    313:313:net.minecraft.core.Direction getRandomOffset(java.util.Random) -> a
+    126:126:void lambda$use$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
+    55:58:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.BeetrootBlock -> bvo:
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
     net.minecraft.world.phys.shapes.VoxelShape[] SHAPE_BY_AGE -> c
-    30:31:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    30:31:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     35:35:net.minecraft.world.level.block.state.properties.IntegerProperty getAgeProperty() -> c
     40:40:int getMaxAge() -> d
     45:45:net.minecraft.world.level.ItemLike getBaseSeedId() -> e
-    51:54:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    51:54:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
     58:58:int getBonemealAgeIncrease(net.minecraft.world.level.Level) -> a
     63:64:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    68:68:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    68:68:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     20:26:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BellBlock -> bpf:
+net.minecraft.world.level.block.BellBlock -> bvp:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
-    net.minecraft.world.level.block.state.properties.EnumProperty ATTACHMENT -> c
-    net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> b
+    net.minecraft.world.level.block.state.properties.EnumProperty ATTACHMENT -> b
+    net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> c
     net.minecraft.world.phys.shapes.VoxelShape NORTH_SOUTH_FLOOR_SHAPE -> d
     net.minecraft.world.phys.shapes.VoxelShape EAST_WEST_FLOOR_SHAPE -> e
     net.minecraft.world.phys.shapes.VoxelShape BELL_TOP_SHAPE -> f
@@ -52114,262 +56995,131 @@ net.minecraft.world.level.block.BellBlock -> bpf:
     net.minecraft.world.phys.shapes.VoxelShape NORTH_SOUTH_BETWEEN -> i
     net.minecraft.world.phys.shapes.VoxelShape EAST_WEST_BETWEEN -> j
     net.minecraft.world.phys.shapes.VoxelShape TO_WEST -> k
-    net.minecraft.world.phys.shapes.VoxelShape TO_EAST -> w
-    net.minecraft.world.phys.shapes.VoxelShape TO_NORTH -> x
-    net.minecraft.world.phys.shapes.VoxelShape TO_SOUTH -> y
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_SHAPE -> z
-    59:61:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    net.minecraft.world.phys.shapes.VoxelShape TO_EAST -> o
+    net.minecraft.world.phys.shapes.VoxelShape TO_NORTH -> p
+    net.minecraft.world.phys.shapes.VoxelShape TO_SOUTH -> q
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_SHAPE -> r
+    59:61:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     65:73:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    77:82:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.Entity) -> a
-    86:86:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    90:100:boolean onHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.player.Player,boolean) -> a
-    104:120:boolean isProperHit(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,double) -> a
-    125:134:boolean attemptToRing(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    138:161:net.minecraft.world.phys.shapes.VoxelShape getVoxelShape(net.minecraft.world.level.block.state.BlockState) -> h
-    167:167:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    172:172:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    177:177:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    184:215:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    220:235:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    240:240:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    244:250:net.minecraft.core.Direction getConnectedDirection(net.minecraft.world.level.block.state.BlockState) -> i
-    256:256:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
-    261:262:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    267:267:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    272:272:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    77:80:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.projectile.Projectile) -> a
+    84:84:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    88:98:boolean onHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.player.Player,boolean) -> a
+    102:118:boolean isProperHit(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,double) -> a
+    123:132:boolean attemptToRing(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    136:159:net.minecraft.world.phys.shapes.VoxelShape getVoxelShape(net.minecraft.world.level.block.state.BlockState) -> h
+    165:165:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    170:170:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    175:175:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    182:213:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    218:233:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    238:243:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    248:254:net.minecraft.core.Direction getConnectedDirection(net.minecraft.world.level.block.state.BlockState) -> l
+    260:260:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
+    265:266:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    271:271:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    276:276:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     37:54:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BellBlock$1 -> bpf$1:
+net.minecraft.world.level.block.BellBlock$1 -> bvp$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$BellAttachType -> a
-    111:111:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BlastFurnaceBlock -> bpg:
-    21:22:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    109:109:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.BlastFurnaceBlock -> bvq:
+    21:22:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     26:26:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     31:36:void openContainer(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
     40:63:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-net.minecraft.world.level.block.Block -> bph:
+net.minecraft.world.level.block.Block -> bvr:
     org.apache.logging.log4j.Logger LOGGER -> l
     net.minecraft.core.IdMapper BLOCK_STATE_REGISTRY -> m
-    net.minecraft.core.Direction[] UPDATE_SHAPE_ORDER -> a
-    com.google.common.cache.LoadingCache SHAPE_FULL_BLOCK_CACHE -> b
-    net.minecraft.world.phys.shapes.VoxelShape RIGID_SUPPORT_SHAPE -> c
-    net.minecraft.world.phys.shapes.VoxelShape CENTER_SUPPORT_SHAPE -> d
-    int lightEmission -> n
-    float destroySpeed -> o
-    float explosionResistance -> p
-    boolean isTicking -> q
-    net.minecraft.world.level.block.SoundType soundType -> r
-    net.minecraft.world.level.material.Material material -> s
-    net.minecraft.world.level.material.MaterialColor materialColor -> t
-    float friction -> e
-    float speedFactor -> f
-    float jumpFactor -> g
-    net.minecraft.world.level.block.state.StateDefinition stateDefinition -> u
-    net.minecraft.world.level.block.state.BlockState defaultBlockState -> h
-    boolean hasCollision -> v
-    boolean dynamicShape -> i
-    boolean canOcclude -> j
-    net.minecraft.resources.ResourceLocation drops -> k
-    java.lang.String descriptionId -> w
-    net.minecraft.world.item.Item item -> x
-    java.lang.ThreadLocal OCCLUSION_CACHE -> y
-    123:127:int getId(net.minecraft.world.level.block.state.BlockState) -> j
-    131:132:net.minecraft.world.level.block.state.BlockState stateById(int) -> a
-    136:140:net.minecraft.world.level.block.Block byItem(net.minecraft.world.item.Item) -> a
-    144:151:net.minecraft.world.level.block.state.BlockState pushEntitiesUp(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    155:155:net.minecraft.world.phys.shapes.VoxelShape box(double,double,double,double,double,double) -> a
-    161:161:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-    167:167:boolean isAir(net.minecraft.world.level.block.state.BlockState) -> d
-    173:173:int getLightEmission(net.minecraft.world.level.block.state.BlockState) -> a
-    179:179:net.minecraft.world.level.material.Material getMaterial(net.minecraft.world.level.block.state.BlockState) -> k
-    185:185:net.minecraft.world.level.material.MaterialColor getMapColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> e
-    191:199:void updateNeighbourShapes(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> a
-    202:202:boolean is(net.minecraft.tags.Tag) -> a
-    206:214:net.minecraft.world.level.block.state.BlockState updateFromNeighbourShapes(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
-    218:227:void updateOrDestroy(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> a
-    232:232:void updateIndirectNeighbourShapes(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> b
-    242:242:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    248:248:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    254:254:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    285:305:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    308:314:boolean isExceptionForConnection(net.minecraft.world.level.block.Block) -> a
-    321:321:boolean isRedstoneConductor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
-    327:327:boolean isSuffocating(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
-    333:333:boolean isViewBlocking(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> f
-    340:348:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    355:355:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    361:361:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
-    367:367:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
-    373:373:float getDestroySpeed(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> g
-    377:377:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> l
-    381:381:boolean isEntityBlock() -> f
-    387:387:boolean hasPostProcess(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> h
-    393:393:boolean emissiveRendering(net.minecraft.world.level.block.state.BlockState) -> m
-    443:467:boolean shouldRenderFace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> c
-    473:473:boolean canOcclude(net.minecraft.world.level.block.state.BlockState) -> n
-    479:479:boolean skipRendering(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
-    485:485:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    491:491:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    497:497:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> i
-    503:503:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> j
-    507:508:boolean canSupportRigidBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
-    512:513:boolean canSupportCenter(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    517:517:boolean isFaceSturdy(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> d
-    521:522:boolean isFaceFull(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.core.Direction) -> a
-    526:526:boolean isShapeFullBlock(net.minecraft.world.phys.shapes.VoxelShape) -> a
-    532:535:boolean isSolidRender(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> k
-    539:539:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    545:548:int getLightBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> l
-    554:554:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
-    560:561:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
-    566:566:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    569:569:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    573:573:void destroy(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    581:582:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    585:585:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    592:592:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-    598:598:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    603:606:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    611:616:float getDestroyProgress(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    622:622:void spawnAfterBreak(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    625:630:net.minecraft.resources.ResourceLocation getLootTable() -> g
-    636:643:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
-    648:653:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
-    657:663:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.entity.Entity,net.minecraft.world.item.ItemStack) -> a
-    667:671:void dropResources(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> b
-    674:678:void dropResources(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> c
-    681:685:void dropResources(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
-    688:692:void dropResources(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.entity.Entity,net.minecraft.world.item.ItemStack) -> a
-    695:706:void popResource(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    709:716:void popExperience(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int) -> a
-    719:719:float getExplosionResistance() -> h
-    723:723:void wasExploded(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.Explosion) -> a
-    728:728:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    734:734:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    738:738:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    742:742:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    746:746:void prepareRender(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
-    751:751:void attack(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    756:756:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    762:762:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
-    768:768:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    773:773:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    778:781:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
-    784:784:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    787:787:boolean isPossibleToRespawnInThis() -> Y_
-    791:791:net.minecraft.network.chat.Component getName() -> j
-    795:798:java.lang.String getDescriptionId() -> k
-    804:804:boolean triggerEvent(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,int) -> a
-    810:810:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
-    816:816:float getShadeBrightness(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    820:821:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
-    824:825:void updateEntityAfterFallOn(net.minecraft.world.level.BlockGetter,net.minecraft.world.entity.Entity) -> a
-    828:828:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    832:833:void fillItemCategory(net.minecraft.world.item.CreativeModeTab,net.minecraft.core.NonNullList) -> a
-    838:838:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    842:842:float getFriction() -> l
-    846:846:float getSpeedFactor() -> m
-    850:850:float getJumpFactor() -> n
-    856:856:long getSeed(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    860:860:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.Entity) -> a
-    989:990:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
-    993:993:void handleRain(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> c
-    996:996:boolean dropFromExplosion(net.minecraft.world.level.Explosion) -> a
-    1002:1002:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    1008:1008:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    1012:1012:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    1015:1015:net.minecraft.world.level.block.state.StateDefinition getStateDefinition() -> o
-    1019:1020:void registerDefaultState(net.minecraft.world.level.block.state.BlockState) -> p
-    1023:1023:net.minecraft.world.level.block.state.BlockState defaultBlockState() -> p
-    1027:1027:net.minecraft.world.level.block.Block$OffsetType getOffsetType() -> X_
-    1033:1039:net.minecraft.world.phys.Vec3 getOffset(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> m
-    1047:1047:net.minecraft.world.level.block.SoundType getSoundType(net.minecraft.world.level.block.state.BlockState) -> q
-    1052:1055:net.minecraft.world.item.Item asItem() -> i
-    1065:1065:boolean hasDynamicShape() -> q
-    1070:1070:java.lang.String toString() -> toString
-    1074:1074:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.BlockGetter,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    689:689:void lambda$dropResources$4(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> b
-    682:682:void lambda$dropResources$3(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> c
-    675:675:void lambda$dropResources$2(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> d
-    669:669:void lambda$dropResources$1(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    430:436:it.unimi.dsi.fastutil.objects.Object2ByteLinkedOpenHashMap lambda$static$0() -> c
-    79:79:boolean access$1400(net.minecraft.world.level.block.Block) -> b
-    79:79:boolean access$1500(net.minecraft.world.level.block.Block) -> c
-    80:429:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.Block$1 -> bph$1:
-    89:89:void <init>() -> <init>
-    92:92:java.lang.Boolean load(net.minecraft.world.phys.shapes.VoxelShape) -> a
-    89:89:java.lang.Object load(java.lang.Object) -> load
-net.minecraft.world.level.block.Block$2 -> bph$2:
-    430:430:void <init>(int,float) -> <init>
-    433:433:void rehash(int) -> rehash
-net.minecraft.world.level.block.Block$3 -> bph$3:
-    int[] $SwitchMap$net$minecraft$world$level$pathfinder$PathComputationType -> a
-    340:340:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.Block$BlockStatePairKey -> bph$a:
+    com.google.common.cache.LoadingCache SHAPE_FULL_BLOCK_CACHE -> a
+    net.minecraft.world.phys.shapes.VoxelShape RIGID_SUPPORT_SHAPE -> b
+    net.minecraft.world.phys.shapes.VoxelShape CENTER_SUPPORT_SHAPE -> c
+    net.minecraft.world.level.block.state.StateDefinition stateDefinition -> n
+    net.minecraft.world.level.block.state.BlockState defaultBlockState -> d
+    java.lang.String descriptionId -> e
+    net.minecraft.world.item.Item item -> f
+    java.lang.ThreadLocal OCCLUSION_CACHE -> g
+    100:104:int getId(net.minecraft.world.level.block.state.BlockState) -> i
+    108:109:net.minecraft.world.level.block.state.BlockState stateById(int) -> a
+    113:117:net.minecraft.world.level.block.Block byItem(net.minecraft.world.item.Item) -> a
+    121:128:net.minecraft.world.level.block.state.BlockState pushEntitiesUp(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    132:132:net.minecraft.world.phys.shapes.VoxelShape box(double,double,double,double,double,double) -> a
+    136:136:boolean is(net.minecraft.tags.Tag) -> a
+    140:140:boolean is(net.minecraft.world.level.block.Block) -> a
+    144:152:net.minecraft.world.level.block.state.BlockState updateFromNeighbourShapes(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
+    156:157:void updateOrDestroy(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> a
+    160:169:void updateOrDestroy(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int,int) -> a
+    181:187:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    190:196:boolean isExceptionForConnection(net.minecraft.world.level.block.Block) -> b
+    201:201:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    251:275:boolean shouldRenderFace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> c
+    279:281:boolean canSupportRigidBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    285:291:boolean canSupportCenter(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    295:295:boolean isFaceSturdy(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> d
+    299:300:boolean isFaceFull(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.core.Direction) -> a
+    304:304:boolean isShapeFullBlock(net.minecraft.world.phys.shapes.VoxelShape) -> a
+    308:308:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    312:312:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    316:316:void destroy(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    319:319:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
+    323:328:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
+    332:338:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.entity.Entity,net.minecraft.world.item.ItemStack) -> a
+    342:346:void dropResources(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> b
+    349:353:void dropResources(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> c
+    356:360:void dropResources(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
+    363:367:void dropResources(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.entity.Entity,net.minecraft.world.item.ItemStack) -> a
+    370:381:void popResource(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    384:391:void popExperience(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int) -> a
+    394:394:float getExplosionResistance() -> f
+    398:398:void wasExploded(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.Explosion) -> a
+    401:401:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    405:405:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    409:409:void prepareRender(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
+    413:416:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
+    419:419:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    422:422:boolean isPossibleToRespawnInThis() -> ak_
+    426:426:net.minecraft.network.chat.MutableComponent getName() -> g
+    430:433:java.lang.String getDescriptionId() -> i
+    437:438:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
+    441:442:void updateEntityAfterFallOn(net.minecraft.world.level.BlockGetter,net.minecraft.world.entity.Entity) -> a
+    445:445:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    449:450:void fillItemCategory(net.minecraft.world.item.CreativeModeTab,net.minecraft.core.NonNullList) -> a
+    453:453:float getFriction() -> j
+    457:457:float getSpeedFactor() -> k
+    461:461:float getJumpFactor() -> l
+    466:471:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
+    474:474:void handleRain(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> c
+    477:477:boolean dropFromExplosion(net.minecraft.world.level.Explosion) -> a
+    481:481:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    484:484:net.minecraft.world.level.block.state.StateDefinition getStateDefinition() -> m
+    488:489:void registerDefaultState(net.minecraft.world.level.block.state.BlockState) -> j
+    492:492:net.minecraft.world.level.block.state.BlockState defaultBlockState() -> n
+    496:496:net.minecraft.world.level.block.SoundType getSoundType(net.minecraft.world.level.block.state.BlockState) -> k
+    501:504:net.minecraft.world.item.Item asItem() -> h
+    508:508:boolean hasDynamicShape() -> o
+    513:513:java.lang.String toString() -> toString
+    517:517:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.BlockGetter,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+    521:521:net.minecraft.world.level.block.Block asBlock() -> p
+    364:364:void lambda$dropResources$4(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> b
+    357:357:void lambda$dropResources$3(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> c
+    350:350:void lambda$dropResources$2(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> d
+    344:344:void lambda$dropResources$1(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    238:244:it.unimi.dsi.fastutil.objects.Object2ByteLinkedOpenHashMap lambda$static$0() -> c
+    59:237:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.Block$1 -> bvr$1:
+    66:66:void <init>() -> <init>
+    69:69:java.lang.Boolean load(net.minecraft.world.phys.shapes.VoxelShape) -> a
+    66:66:java.lang.Object load(java.lang.Object) -> load
+net.minecraft.world.level.block.Block$2 -> bvr$2:
+    238:238:void <init>(int,float) -> <init>
+    241:241:void rehash(int) -> rehash
+net.minecraft.world.level.block.Block$BlockStatePairKey -> bvr$a:
     net.minecraft.world.level.block.state.BlockState first -> a
     net.minecraft.world.level.block.state.BlockState second -> b
     net.minecraft.core.Direction direction -> c
-    401:405:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> <init>
-    409:416:boolean equals(java.lang.Object) -> equals
-    421:424:int hashCode() -> hashCode
-net.minecraft.world.level.block.Block$OffsetType -> bph$b:
-    net.minecraft.world.level.block.Block$OffsetType NONE -> a
-    net.minecraft.world.level.block.Block$OffsetType XZ -> b
-    net.minecraft.world.level.block.Block$OffsetType XYZ -> c
-    net.minecraft.world.level.block.Block$OffsetType[] $VALUES -> d
-    1058:1058:net.minecraft.world.level.block.Block$OffsetType[] values() -> values
-    1058:1058:net.minecraft.world.level.block.Block$OffsetType valueOf(java.lang.String) -> valueOf
-    1058:1058:void <init>(java.lang.String,int) -> <init>
-    1058:1061:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.Block$Properties -> bph$c:
-    net.minecraft.world.level.material.Material material -> a
-    net.minecraft.world.level.material.MaterialColor materialColor -> b
-    boolean hasCollision -> c
-    net.minecraft.world.level.block.SoundType soundType -> d
-    int lightEmission -> e
-    float explosionResistance -> f
-    float destroyTime -> g
-    boolean isTicking -> h
-    float friction -> i
-    float speedFactor -> j
-    float jumpFactor -> k
-    net.minecraft.resources.ResourceLocation drops -> l
-    boolean canOcclude -> m
-    boolean dynamicShape -> n
-    865:883:void <init>(net.minecraft.world.level.material.Material,net.minecraft.world.level.material.MaterialColor) -> <init>
-    886:886:net.minecraft.world.level.block.Block$Properties of(net.minecraft.world.level.material.Material) -> a
-    890:890:net.minecraft.world.level.block.Block$Properties of(net.minecraft.world.level.material.Material,net.minecraft.world.item.DyeColor) -> a
-    894:894:net.minecraft.world.level.block.Block$Properties of(net.minecraft.world.level.material.Material,net.minecraft.world.level.material.MaterialColor) -> a
-    898:912:net.minecraft.world.level.block.Block$Properties copy(net.minecraft.world.level.block.Block) -> a
-    916:918:net.minecraft.world.level.block.Block$Properties noCollission() -> a
-    922:923:net.minecraft.world.level.block.Block$Properties noOcclusion() -> b
-    927:928:net.minecraft.world.level.block.Block$Properties friction(float) -> a
-    932:933:net.minecraft.world.level.block.Block$Properties speedFactor(float) -> b
-    937:938:net.minecraft.world.level.block.Block$Properties jumpFactor(float) -> c
-    942:943:net.minecraft.world.level.block.Block$Properties sound(net.minecraft.world.level.block.SoundType) -> a
-    947:948:net.minecraft.world.level.block.Block$Properties lightLevel(int) -> a
-    952:954:net.minecraft.world.level.block.Block$Properties strength(float,float) -> a
-    958:958:net.minecraft.world.level.block.Block$Properties instabreak() -> c
-    962:963:net.minecraft.world.level.block.Block$Properties strength(float) -> d
-    967:968:net.minecraft.world.level.block.Block$Properties randomTicks() -> d
-    972:973:net.minecraft.world.level.block.Block$Properties dynamicShape() -> e
-    977:978:net.minecraft.world.level.block.Block$Properties noDrops() -> f
-    982:983:net.minecraft.world.level.block.Block$Properties dropsLike(net.minecraft.world.level.block.Block) -> b
-    862:862:net.minecraft.world.level.material.Material access$000(net.minecraft.world.level.block.Block$Properties) -> a
-    862:862:net.minecraft.world.level.material.MaterialColor access$100(net.minecraft.world.level.block.Block$Properties) -> b
-    862:862:boolean access$200(net.minecraft.world.level.block.Block$Properties) -> c
-    862:862:net.minecraft.world.level.block.SoundType access$300(net.minecraft.world.level.block.Block$Properties) -> d
-    862:862:int access$400(net.minecraft.world.level.block.Block$Properties) -> e
-    862:862:float access$500(net.minecraft.world.level.block.Block$Properties) -> f
-    862:862:float access$600(net.minecraft.world.level.block.Block$Properties) -> g
-    862:862:boolean access$700(net.minecraft.world.level.block.Block$Properties) -> h
-    862:862:float access$800(net.minecraft.world.level.block.Block$Properties) -> i
-    862:862:float access$900(net.minecraft.world.level.block.Block$Properties) -> j
-    862:862:float access$1000(net.minecraft.world.level.block.Block$Properties) -> k
-    862:862:boolean access$1100(net.minecraft.world.level.block.Block$Properties) -> l
-    862:862:net.minecraft.resources.ResourceLocation access$1200(net.minecraft.world.level.block.Block$Properties) -> m
-    862:862:boolean access$1300(net.minecraft.world.level.block.Block$Properties) -> n
-net.minecraft.world.level.block.Blocks -> bpi:
+    209:213:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> <init>
+    217:224:boolean equals(java.lang.Object) -> equals
+    229:232:int hashCode() -> hashCode
+net.minecraft.world.level.block.Blocks -> bvs:
     net.minecraft.world.level.block.Block AIR -> a
     net.minecraft.world.level.block.Block STONE -> b
     net.minecraft.world.level.block.Block GRANITE -> c
@@ -52404,705 +57154,840 @@ net.minecraft.world.level.block.Blocks -> bpi:
     net.minecraft.world.level.block.Block GOLD_ORE -> F
     net.minecraft.world.level.block.Block IRON_ORE -> G
     net.minecraft.world.level.block.Block COAL_ORE -> H
-    net.minecraft.world.level.block.Block OAK_LOG -> I
-    net.minecraft.world.level.block.Block SPRUCE_LOG -> J
-    net.minecraft.world.level.block.Block BIRCH_LOG -> K
-    net.minecraft.world.level.block.Block JUNGLE_LOG -> L
-    net.minecraft.world.level.block.Block ACACIA_LOG -> M
-    net.minecraft.world.level.block.Block DARK_OAK_LOG -> N
-    net.minecraft.world.level.block.Block STRIPPED_SPRUCE_LOG -> O
-    net.minecraft.world.level.block.Block STRIPPED_BIRCH_LOG -> P
-    net.minecraft.world.level.block.Block STRIPPED_JUNGLE_LOG -> Q
-    net.minecraft.world.level.block.Block STRIPPED_ACACIA_LOG -> R
-    net.minecraft.world.level.block.Block STRIPPED_DARK_OAK_LOG -> S
-    net.minecraft.world.level.block.Block STRIPPED_OAK_LOG -> T
-    net.minecraft.world.level.block.Block OAK_WOOD -> U
-    net.minecraft.world.level.block.Block SPRUCE_WOOD -> V
-    net.minecraft.world.level.block.Block BIRCH_WOOD -> W
-    net.minecraft.world.level.block.Block JUNGLE_WOOD -> X
-    net.minecraft.world.level.block.Block ACACIA_WOOD -> Y
-    net.minecraft.world.level.block.Block DARK_OAK_WOOD -> Z
-    net.minecraft.world.level.block.Block STRIPPED_OAK_WOOD -> aa
-    net.minecraft.world.level.block.Block STRIPPED_SPRUCE_WOOD -> ab
-    net.minecraft.world.level.block.Block STRIPPED_BIRCH_WOOD -> ac
-    net.minecraft.world.level.block.Block STRIPPED_JUNGLE_WOOD -> ad
-    net.minecraft.world.level.block.Block STRIPPED_ACACIA_WOOD -> ae
-    net.minecraft.world.level.block.Block STRIPPED_DARK_OAK_WOOD -> af
-    net.minecraft.world.level.block.Block OAK_LEAVES -> ag
-    net.minecraft.world.level.block.Block SPRUCE_LEAVES -> ah
-    net.minecraft.world.level.block.Block BIRCH_LEAVES -> ai
-    net.minecraft.world.level.block.Block JUNGLE_LEAVES -> aj
-    net.minecraft.world.level.block.Block ACACIA_LEAVES -> ak
-    net.minecraft.world.level.block.Block DARK_OAK_LEAVES -> al
-    net.minecraft.world.level.block.Block SPONGE -> am
-    net.minecraft.world.level.block.Block WET_SPONGE -> an
-    net.minecraft.world.level.block.Block GLASS -> ao
-    net.minecraft.world.level.block.Block LAPIS_ORE -> ap
-    net.minecraft.world.level.block.Block LAPIS_BLOCK -> aq
-    net.minecraft.world.level.block.Block DISPENSER -> ar
-    net.minecraft.world.level.block.Block SANDSTONE -> as
-    net.minecraft.world.level.block.Block CHISELED_SANDSTONE -> at
-    net.minecraft.world.level.block.Block CUT_SANDSTONE -> au
-    net.minecraft.world.level.block.Block NOTE_BLOCK -> av
-    net.minecraft.world.level.block.Block WHITE_BED -> aw
-    net.minecraft.world.level.block.Block ORANGE_BED -> ax
-    net.minecraft.world.level.block.Block MAGENTA_BED -> ay
-    net.minecraft.world.level.block.Block LIGHT_BLUE_BED -> az
-    net.minecraft.world.level.block.Block YELLOW_BED -> aA
-    net.minecraft.world.level.block.Block LIME_BED -> aB
-    net.minecraft.world.level.block.Block PINK_BED -> aC
-    net.minecraft.world.level.block.Block GRAY_BED -> aD
-    net.minecraft.world.level.block.Block LIGHT_GRAY_BED -> aE
-    net.minecraft.world.level.block.Block CYAN_BED -> aF
-    net.minecraft.world.level.block.Block PURPLE_BED -> aG
-    net.minecraft.world.level.block.Block BLUE_BED -> aH
-    net.minecraft.world.level.block.Block BROWN_BED -> aI
-    net.minecraft.world.level.block.Block GREEN_BED -> aJ
-    net.minecraft.world.level.block.Block RED_BED -> aK
-    net.minecraft.world.level.block.Block BLACK_BED -> aL
-    net.minecraft.world.level.block.Block POWERED_RAIL -> aM
-    net.minecraft.world.level.block.Block DETECTOR_RAIL -> aN
-    net.minecraft.world.level.block.Block STICKY_PISTON -> aO
-    net.minecraft.world.level.block.Block COBWEB -> aP
-    net.minecraft.world.level.block.Block GRASS -> aQ
-    net.minecraft.world.level.block.Block FERN -> aR
-    net.minecraft.world.level.block.Block DEAD_BUSH -> aS
-    net.minecraft.world.level.block.Block SEAGRASS -> aT
-    net.minecraft.world.level.block.Block TALL_SEAGRASS -> aU
-    net.minecraft.world.level.block.Block PISTON -> aV
-    net.minecraft.world.level.block.Block PISTON_HEAD -> aW
-    net.minecraft.world.level.block.Block WHITE_WOOL -> aX
-    net.minecraft.world.level.block.Block ORANGE_WOOL -> aY
-    net.minecraft.world.level.block.Block MAGENTA_WOOL -> aZ
-    net.minecraft.world.level.block.Block LIGHT_BLUE_WOOL -> ba
-    net.minecraft.world.level.block.Block YELLOW_WOOL -> bb
-    net.minecraft.world.level.block.Block LIME_WOOL -> bc
-    net.minecraft.world.level.block.Block PINK_WOOL -> bd
-    net.minecraft.world.level.block.Block GRAY_WOOL -> be
-    net.minecraft.world.level.block.Block LIGHT_GRAY_WOOL -> bf
-    net.minecraft.world.level.block.Block CYAN_WOOL -> bg
-    net.minecraft.world.level.block.Block PURPLE_WOOL -> bh
-    net.minecraft.world.level.block.Block BLUE_WOOL -> bi
-    net.minecraft.world.level.block.Block BROWN_WOOL -> bj
-    net.minecraft.world.level.block.Block GREEN_WOOL -> bk
-    net.minecraft.world.level.block.Block RED_WOOL -> bl
-    net.minecraft.world.level.block.Block BLACK_WOOL -> bm
-    net.minecraft.world.level.block.Block MOVING_PISTON -> bn
-    net.minecraft.world.level.block.Block DANDELION -> bo
-    net.minecraft.world.level.block.Block POPPY -> bp
-    net.minecraft.world.level.block.Block BLUE_ORCHID -> bq
-    net.minecraft.world.level.block.Block ALLIUM -> br
-    net.minecraft.world.level.block.Block AZURE_BLUET -> bs
-    net.minecraft.world.level.block.Block RED_TULIP -> bt
-    net.minecraft.world.level.block.Block ORANGE_TULIP -> bu
-    net.minecraft.world.level.block.Block WHITE_TULIP -> bv
-    net.minecraft.world.level.block.Block PINK_TULIP -> bw
-    net.minecraft.world.level.block.Block OXEYE_DAISY -> bx
-    net.minecraft.world.level.block.Block CORNFLOWER -> by
-    net.minecraft.world.level.block.Block WITHER_ROSE -> bz
-    net.minecraft.world.level.block.Block LILY_OF_THE_VALLEY -> bA
-    net.minecraft.world.level.block.Block BROWN_MUSHROOM -> bB
-    net.minecraft.world.level.block.Block RED_MUSHROOM -> bC
-    net.minecraft.world.level.block.Block GOLD_BLOCK -> bD
-    net.minecraft.world.level.block.Block IRON_BLOCK -> bE
-    net.minecraft.world.level.block.Block BRICKS -> bF
-    net.minecraft.world.level.block.Block TNT -> bG
-    net.minecraft.world.level.block.Block BOOKSHELF -> bH
-    net.minecraft.world.level.block.Block MOSSY_COBBLESTONE -> bI
-    net.minecraft.world.level.block.Block OBSIDIAN -> bJ
-    net.minecraft.world.level.block.Block TORCH -> bK
-    net.minecraft.world.level.block.Block WALL_TORCH -> bL
-    net.minecraft.world.level.block.Block FIRE -> bM
-    net.minecraft.world.level.block.Block SPAWNER -> bN
-    net.minecraft.world.level.block.Block OAK_STAIRS -> bO
-    net.minecraft.world.level.block.Block CHEST -> bP
-    net.minecraft.world.level.block.Block REDSTONE_WIRE -> bQ
-    net.minecraft.world.level.block.Block DIAMOND_ORE -> bR
-    net.minecraft.world.level.block.Block DIAMOND_BLOCK -> bS
-    net.minecraft.world.level.block.Block CRAFTING_TABLE -> bT
-    net.minecraft.world.level.block.Block WHEAT -> bU
-    net.minecraft.world.level.block.Block FARMLAND -> bV
-    net.minecraft.world.level.block.Block FURNACE -> bW
-    net.minecraft.world.level.block.Block OAK_SIGN -> bX
-    net.minecraft.world.level.block.Block SPRUCE_SIGN -> bY
-    net.minecraft.world.level.block.Block BIRCH_SIGN -> bZ
-    net.minecraft.world.level.block.Block ACACIA_SIGN -> ca
-    net.minecraft.world.level.block.Block JUNGLE_SIGN -> cb
-    net.minecraft.world.level.block.Block DARK_OAK_SIGN -> cc
-    net.minecraft.world.level.block.Block OAK_DOOR -> cd
-    net.minecraft.world.level.block.Block LADDER -> ce
-    net.minecraft.world.level.block.Block RAIL -> cf
-    net.minecraft.world.level.block.Block COBBLESTONE_STAIRS -> cg
-    net.minecraft.world.level.block.Block OAK_WALL_SIGN -> ch
-    net.minecraft.world.level.block.Block SPRUCE_WALL_SIGN -> ci
-    net.minecraft.world.level.block.Block BIRCH_WALL_SIGN -> cj
-    net.minecraft.world.level.block.Block ACACIA_WALL_SIGN -> ck
-    net.minecraft.world.level.block.Block JUNGLE_WALL_SIGN -> cl
-    net.minecraft.world.level.block.Block DARK_OAK_WALL_SIGN -> cm
-    net.minecraft.world.level.block.Block LEVER -> cn
-    net.minecraft.world.level.block.Block STONE_PRESSURE_PLATE -> co
-    net.minecraft.world.level.block.Block IRON_DOOR -> cp
-    net.minecraft.world.level.block.Block OAK_PRESSURE_PLATE -> cq
-    net.minecraft.world.level.block.Block SPRUCE_PRESSURE_PLATE -> cr
-    net.minecraft.world.level.block.Block BIRCH_PRESSURE_PLATE -> cs
-    net.minecraft.world.level.block.Block JUNGLE_PRESSURE_PLATE -> ct
-    net.minecraft.world.level.block.Block ACACIA_PRESSURE_PLATE -> cu
-    net.minecraft.world.level.block.Block DARK_OAK_PRESSURE_PLATE -> cv
-    net.minecraft.world.level.block.Block REDSTONE_ORE -> cw
-    net.minecraft.world.level.block.Block REDSTONE_TORCH -> cx
-    net.minecraft.world.level.block.Block REDSTONE_WALL_TORCH -> cy
-    net.minecraft.world.level.block.Block STONE_BUTTON -> cz
-    net.minecraft.world.level.block.Block SNOW -> cA
-    net.minecraft.world.level.block.Block ICE -> cB
-    net.minecraft.world.level.block.Block SNOW_BLOCK -> cC
-    net.minecraft.world.level.block.Block CACTUS -> cD
-    net.minecraft.world.level.block.Block CLAY -> cE
-    net.minecraft.world.level.block.Block SUGAR_CANE -> cF
-    net.minecraft.world.level.block.Block JUKEBOX -> cG
-    net.minecraft.world.level.block.Block OAK_FENCE -> cH
-    net.minecraft.world.level.block.Block PUMPKIN -> cI
-    net.minecraft.world.level.block.Block NETHERRACK -> cJ
-    net.minecraft.world.level.block.Block SOUL_SAND -> cK
-    net.minecraft.world.level.block.Block GLOWSTONE -> cL
-    net.minecraft.world.level.block.Block NETHER_PORTAL -> cM
-    net.minecraft.world.level.block.Block CARVED_PUMPKIN -> cN
-    net.minecraft.world.level.block.Block JACK_O_LANTERN -> cO
-    net.minecraft.world.level.block.Block CAKE -> cP
-    net.minecraft.world.level.block.Block REPEATER -> cQ
-    net.minecraft.world.level.block.Block WHITE_STAINED_GLASS -> cR
-    net.minecraft.world.level.block.Block ORANGE_STAINED_GLASS -> cS
-    net.minecraft.world.level.block.Block MAGENTA_STAINED_GLASS -> cT
-    net.minecraft.world.level.block.Block LIGHT_BLUE_STAINED_GLASS -> cU
-    net.minecraft.world.level.block.Block YELLOW_STAINED_GLASS -> cV
-    net.minecraft.world.level.block.Block LIME_STAINED_GLASS -> cW
-    net.minecraft.world.level.block.Block PINK_STAINED_GLASS -> cX
-    net.minecraft.world.level.block.Block GRAY_STAINED_GLASS -> cY
-    net.minecraft.world.level.block.Block LIGHT_GRAY_STAINED_GLASS -> cZ
-    net.minecraft.world.level.block.Block CYAN_STAINED_GLASS -> da
-    net.minecraft.world.level.block.Block PURPLE_STAINED_GLASS -> db
-    net.minecraft.world.level.block.Block BLUE_STAINED_GLASS -> dc
-    net.minecraft.world.level.block.Block BROWN_STAINED_GLASS -> dd
-    net.minecraft.world.level.block.Block GREEN_STAINED_GLASS -> de
-    net.minecraft.world.level.block.Block RED_STAINED_GLASS -> df
-    net.minecraft.world.level.block.Block BLACK_STAINED_GLASS -> dg
-    net.minecraft.world.level.block.Block OAK_TRAPDOOR -> dh
-    net.minecraft.world.level.block.Block SPRUCE_TRAPDOOR -> di
-    net.minecraft.world.level.block.Block BIRCH_TRAPDOOR -> dj
-    net.minecraft.world.level.block.Block JUNGLE_TRAPDOOR -> dk
-    net.minecraft.world.level.block.Block ACACIA_TRAPDOOR -> dl
-    net.minecraft.world.level.block.Block DARK_OAK_TRAPDOOR -> dm
-    net.minecraft.world.level.block.Block STONE_BRICKS -> dn
-    net.minecraft.world.level.block.Block MOSSY_STONE_BRICKS -> do
-    net.minecraft.world.level.block.Block CRACKED_STONE_BRICKS -> dp
-    net.minecraft.world.level.block.Block CHISELED_STONE_BRICKS -> dq
-    net.minecraft.world.level.block.Block INFESTED_STONE -> dr
-    net.minecraft.world.level.block.Block INFESTED_COBBLESTONE -> ds
-    net.minecraft.world.level.block.Block INFESTED_STONE_BRICKS -> dt
-    net.minecraft.world.level.block.Block INFESTED_MOSSY_STONE_BRICKS -> du
-    net.minecraft.world.level.block.Block INFESTED_CRACKED_STONE_BRICKS -> dv
-    net.minecraft.world.level.block.Block INFESTED_CHISELED_STONE_BRICKS -> dw
-    net.minecraft.world.level.block.Block BROWN_MUSHROOM_BLOCK -> dx
-    net.minecraft.world.level.block.Block RED_MUSHROOM_BLOCK -> dy
-    net.minecraft.world.level.block.Block MUSHROOM_STEM -> dz
-    net.minecraft.world.level.block.Block IRON_BARS -> dA
-    net.minecraft.world.level.block.Block GLASS_PANE -> dB
-    net.minecraft.world.level.block.Block MELON -> dC
-    net.minecraft.world.level.block.Block ATTACHED_PUMPKIN_STEM -> dD
-    net.minecraft.world.level.block.Block ATTACHED_MELON_STEM -> dE
-    net.minecraft.world.level.block.Block PUMPKIN_STEM -> dF
-    net.minecraft.world.level.block.Block MELON_STEM -> dG
-    net.minecraft.world.level.block.Block VINE -> dH
-    net.minecraft.world.level.block.Block OAK_FENCE_GATE -> dI
-    net.minecraft.world.level.block.Block BRICK_STAIRS -> dJ
-    net.minecraft.world.level.block.Block STONE_BRICK_STAIRS -> dK
-    net.minecraft.world.level.block.Block MYCELIUM -> dL
-    net.minecraft.world.level.block.Block LILY_PAD -> dM
-    net.minecraft.world.level.block.Block NETHER_BRICKS -> dN
-    net.minecraft.world.level.block.Block NETHER_BRICK_FENCE -> dO
-    net.minecraft.world.level.block.Block NETHER_BRICK_STAIRS -> dP
-    net.minecraft.world.level.block.Block NETHER_WART -> dQ
-    net.minecraft.world.level.block.Block ENCHANTING_TABLE -> dR
-    net.minecraft.world.level.block.Block BREWING_STAND -> dS
-    net.minecraft.world.level.block.Block CAULDRON -> dT
-    net.minecraft.world.level.block.Block END_PORTAL -> dU
-    net.minecraft.world.level.block.Block END_PORTAL_FRAME -> dV
-    net.minecraft.world.level.block.Block END_STONE -> dW
-    net.minecraft.world.level.block.Block DRAGON_EGG -> dX
-    net.minecraft.world.level.block.Block REDSTONE_LAMP -> dY
-    net.minecraft.world.level.block.Block COCOA -> dZ
-    net.minecraft.world.level.block.Block SANDSTONE_STAIRS -> ea
-    net.minecraft.world.level.block.Block EMERALD_ORE -> eb
-    net.minecraft.world.level.block.Block ENDER_CHEST -> ec
-    net.minecraft.world.level.block.Block TRIPWIRE_HOOK -> ed
-    net.minecraft.world.level.block.Block TRIPWIRE -> ee
-    net.minecraft.world.level.block.Block EMERALD_BLOCK -> ef
-    net.minecraft.world.level.block.Block SPRUCE_STAIRS -> eg
-    net.minecraft.world.level.block.Block BIRCH_STAIRS -> eh
-    net.minecraft.world.level.block.Block JUNGLE_STAIRS -> ei
-    net.minecraft.world.level.block.Block COMMAND_BLOCK -> ej
-    net.minecraft.world.level.block.Block BEACON -> ek
-    net.minecraft.world.level.block.Block COBBLESTONE_WALL -> el
-    net.minecraft.world.level.block.Block MOSSY_COBBLESTONE_WALL -> em
-    net.minecraft.world.level.block.Block FLOWER_POT -> en
-    net.minecraft.world.level.block.Block POTTED_OAK_SAPLING -> eo
-    net.minecraft.world.level.block.Block POTTED_SPRUCE_SAPLING -> ep
-    net.minecraft.world.level.block.Block POTTED_BIRCH_SAPLING -> eq
-    net.minecraft.world.level.block.Block POTTED_JUNGLE_SAPLING -> er
-    net.minecraft.world.level.block.Block POTTED_ACACIA_SAPLING -> es
-    net.minecraft.world.level.block.Block POTTED_DARK_OAK_SAPLING -> et
-    net.minecraft.world.level.block.Block POTTED_FERN -> eu
-    net.minecraft.world.level.block.Block POTTED_DANDELION -> ev
-    net.minecraft.world.level.block.Block POTTED_POPPY -> ew
-    net.minecraft.world.level.block.Block POTTED_BLUE_ORCHID -> ex
-    net.minecraft.world.level.block.Block POTTED_ALLIUM -> ey
-    net.minecraft.world.level.block.Block POTTED_AZURE_BLUET -> ez
-    net.minecraft.world.level.block.Block POTTED_RED_TULIP -> eA
-    net.minecraft.world.level.block.Block POTTED_ORANGE_TULIP -> eB
-    net.minecraft.world.level.block.Block POTTED_WHITE_TULIP -> eC
-    net.minecraft.world.level.block.Block POTTED_PINK_TULIP -> eD
-    net.minecraft.world.level.block.Block POTTED_OXEYE_DAISY -> eE
-    net.minecraft.world.level.block.Block POTTED_CORNFLOWER -> eF
-    net.minecraft.world.level.block.Block POTTED_LILY_OF_THE_VALLEY -> eG
-    net.minecraft.world.level.block.Block POTTED_WITHER_ROSE -> eH
-    net.minecraft.world.level.block.Block POTTED_RED_MUSHROOM -> eI
-    net.minecraft.world.level.block.Block POTTED_BROWN_MUSHROOM -> eJ
-    net.minecraft.world.level.block.Block POTTED_DEAD_BUSH -> eK
-    net.minecraft.world.level.block.Block POTTED_CACTUS -> eL
-    net.minecraft.world.level.block.Block CARROTS -> eM
-    net.minecraft.world.level.block.Block POTATOES -> eN
-    net.minecraft.world.level.block.Block OAK_BUTTON -> eO
-    net.minecraft.world.level.block.Block SPRUCE_BUTTON -> eP
-    net.minecraft.world.level.block.Block BIRCH_BUTTON -> eQ
-    net.minecraft.world.level.block.Block JUNGLE_BUTTON -> eR
-    net.minecraft.world.level.block.Block ACACIA_BUTTON -> eS
-    net.minecraft.world.level.block.Block DARK_OAK_BUTTON -> eT
-    net.minecraft.world.level.block.Block SKELETON_SKULL -> eU
-    net.minecraft.world.level.block.Block SKELETON_WALL_SKULL -> eV
-    net.minecraft.world.level.block.Block WITHER_SKELETON_SKULL -> eW
-    net.minecraft.world.level.block.Block WITHER_SKELETON_WALL_SKULL -> eX
-    net.minecraft.world.level.block.Block ZOMBIE_HEAD -> eY
-    net.minecraft.world.level.block.Block ZOMBIE_WALL_HEAD -> eZ
-    net.minecraft.world.level.block.Block PLAYER_HEAD -> fa
-    net.minecraft.world.level.block.Block PLAYER_WALL_HEAD -> fb
-    net.minecraft.world.level.block.Block CREEPER_HEAD -> fc
-    net.minecraft.world.level.block.Block CREEPER_WALL_HEAD -> fd
-    net.minecraft.world.level.block.Block DRAGON_HEAD -> fe
-    net.minecraft.world.level.block.Block DRAGON_WALL_HEAD -> ff
-    net.minecraft.world.level.block.Block ANVIL -> fg
-    net.minecraft.world.level.block.Block CHIPPED_ANVIL -> fh
-    net.minecraft.world.level.block.Block DAMAGED_ANVIL -> fi
-    net.minecraft.world.level.block.Block TRAPPED_CHEST -> fj
-    net.minecraft.world.level.block.Block LIGHT_WEIGHTED_PRESSURE_PLATE -> fk
-    net.minecraft.world.level.block.Block HEAVY_WEIGHTED_PRESSURE_PLATE -> fl
-    net.minecraft.world.level.block.Block COMPARATOR -> fm
-    net.minecraft.world.level.block.Block DAYLIGHT_DETECTOR -> fn
-    net.minecraft.world.level.block.Block REDSTONE_BLOCK -> fo
-    net.minecraft.world.level.block.Block NETHER_QUARTZ_ORE -> fp
-    net.minecraft.world.level.block.Block HOPPER -> fq
-    net.minecraft.world.level.block.Block QUARTZ_BLOCK -> fr
-    net.minecraft.world.level.block.Block CHISELED_QUARTZ_BLOCK -> fs
-    net.minecraft.world.level.block.Block QUARTZ_PILLAR -> ft
-    net.minecraft.world.level.block.Block QUARTZ_STAIRS -> fu
-    net.minecraft.world.level.block.Block ACTIVATOR_RAIL -> fv
-    net.minecraft.world.level.block.Block DROPPER -> fw
-    net.minecraft.world.level.block.Block WHITE_TERRACOTTA -> fx
-    net.minecraft.world.level.block.Block ORANGE_TERRACOTTA -> fy
-    net.minecraft.world.level.block.Block MAGENTA_TERRACOTTA -> fz
-    net.minecraft.world.level.block.Block LIGHT_BLUE_TERRACOTTA -> fA
-    net.minecraft.world.level.block.Block YELLOW_TERRACOTTA -> fB
-    net.minecraft.world.level.block.Block LIME_TERRACOTTA -> fC
-    net.minecraft.world.level.block.Block PINK_TERRACOTTA -> fD
-    net.minecraft.world.level.block.Block GRAY_TERRACOTTA -> fE
-    net.minecraft.world.level.block.Block LIGHT_GRAY_TERRACOTTA -> fF
-    net.minecraft.world.level.block.Block CYAN_TERRACOTTA -> fG
-    net.minecraft.world.level.block.Block PURPLE_TERRACOTTA -> fH
-    net.minecraft.world.level.block.Block BLUE_TERRACOTTA -> fI
-    net.minecraft.world.level.block.Block BROWN_TERRACOTTA -> fJ
-    net.minecraft.world.level.block.Block GREEN_TERRACOTTA -> fK
-    net.minecraft.world.level.block.Block RED_TERRACOTTA -> fL
-    net.minecraft.world.level.block.Block BLACK_TERRACOTTA -> fM
-    net.minecraft.world.level.block.Block WHITE_STAINED_GLASS_PANE -> fN
-    net.minecraft.world.level.block.Block ORANGE_STAINED_GLASS_PANE -> fO
-    net.minecraft.world.level.block.Block MAGENTA_STAINED_GLASS_PANE -> fP
-    net.minecraft.world.level.block.Block LIGHT_BLUE_STAINED_GLASS_PANE -> fQ
-    net.minecraft.world.level.block.Block YELLOW_STAINED_GLASS_PANE -> fR
-    net.minecraft.world.level.block.Block LIME_STAINED_GLASS_PANE -> fS
-    net.minecraft.world.level.block.Block PINK_STAINED_GLASS_PANE -> fT
-    net.minecraft.world.level.block.Block GRAY_STAINED_GLASS_PANE -> fU
-    net.minecraft.world.level.block.Block LIGHT_GRAY_STAINED_GLASS_PANE -> fV
-    net.minecraft.world.level.block.Block CYAN_STAINED_GLASS_PANE -> fW
-    net.minecraft.world.level.block.Block PURPLE_STAINED_GLASS_PANE -> fX
-    net.minecraft.world.level.block.Block BLUE_STAINED_GLASS_PANE -> fY
-    net.minecraft.world.level.block.Block BROWN_STAINED_GLASS_PANE -> fZ
-    net.minecraft.world.level.block.Block GREEN_STAINED_GLASS_PANE -> ga
-    net.minecraft.world.level.block.Block RED_STAINED_GLASS_PANE -> gb
-    net.minecraft.world.level.block.Block BLACK_STAINED_GLASS_PANE -> gc
-    net.minecraft.world.level.block.Block ACACIA_STAIRS -> gd
-    net.minecraft.world.level.block.Block DARK_OAK_STAIRS -> ge
-    net.minecraft.world.level.block.Block SLIME_BLOCK -> gf
-    net.minecraft.world.level.block.Block BARRIER -> gg
-    net.minecraft.world.level.block.Block IRON_TRAPDOOR -> gh
-    net.minecraft.world.level.block.Block PRISMARINE -> gi
-    net.minecraft.world.level.block.Block PRISMARINE_BRICKS -> gj
-    net.minecraft.world.level.block.Block DARK_PRISMARINE -> gk
-    net.minecraft.world.level.block.Block PRISMARINE_STAIRS -> gl
-    net.minecraft.world.level.block.Block PRISMARINE_BRICK_STAIRS -> gm
-    net.minecraft.world.level.block.Block DARK_PRISMARINE_STAIRS -> gn
-    net.minecraft.world.level.block.Block PRISMARINE_SLAB -> go
-    net.minecraft.world.level.block.Block PRISMARINE_BRICK_SLAB -> gp
-    net.minecraft.world.level.block.Block DARK_PRISMARINE_SLAB -> gq
-    net.minecraft.world.level.block.Block SEA_LANTERN -> gr
-    net.minecraft.world.level.block.Block HAY_BLOCK -> gs
-    net.minecraft.world.level.block.Block WHITE_CARPET -> gt
-    net.minecraft.world.level.block.Block ORANGE_CARPET -> gu
-    net.minecraft.world.level.block.Block MAGENTA_CARPET -> gv
-    net.minecraft.world.level.block.Block LIGHT_BLUE_CARPET -> gw
-    net.minecraft.world.level.block.Block YELLOW_CARPET -> gx
-    net.minecraft.world.level.block.Block LIME_CARPET -> gy
-    net.minecraft.world.level.block.Block PINK_CARPET -> gz
-    net.minecraft.world.level.block.Block GRAY_CARPET -> gA
-    net.minecraft.world.level.block.Block LIGHT_GRAY_CARPET -> gB
-    net.minecraft.world.level.block.Block CYAN_CARPET -> gC
-    net.minecraft.world.level.block.Block PURPLE_CARPET -> gD
-    net.minecraft.world.level.block.Block BLUE_CARPET -> gE
-    net.minecraft.world.level.block.Block BROWN_CARPET -> gF
-    net.minecraft.world.level.block.Block GREEN_CARPET -> gG
-    net.minecraft.world.level.block.Block RED_CARPET -> gH
-    net.minecraft.world.level.block.Block BLACK_CARPET -> gI
-    net.minecraft.world.level.block.Block TERRACOTTA -> gJ
-    net.minecraft.world.level.block.Block COAL_BLOCK -> gK
-    net.minecraft.world.level.block.Block PACKED_ICE -> gL
-    net.minecraft.world.level.block.Block SUNFLOWER -> gM
-    net.minecraft.world.level.block.Block LILAC -> gN
-    net.minecraft.world.level.block.Block ROSE_BUSH -> gO
-    net.minecraft.world.level.block.Block PEONY -> gP
-    net.minecraft.world.level.block.Block TALL_GRASS -> gQ
-    net.minecraft.world.level.block.Block LARGE_FERN -> gR
-    net.minecraft.world.level.block.Block WHITE_BANNER -> gS
-    net.minecraft.world.level.block.Block ORANGE_BANNER -> gT
-    net.minecraft.world.level.block.Block MAGENTA_BANNER -> gU
-    net.minecraft.world.level.block.Block LIGHT_BLUE_BANNER -> gV
-    net.minecraft.world.level.block.Block YELLOW_BANNER -> gW
-    net.minecraft.world.level.block.Block LIME_BANNER -> gX
-    net.minecraft.world.level.block.Block PINK_BANNER -> gY
-    net.minecraft.world.level.block.Block GRAY_BANNER -> gZ
-    net.minecraft.world.level.block.Block LIGHT_GRAY_BANNER -> ha
-    net.minecraft.world.level.block.Block CYAN_BANNER -> hb
-    net.minecraft.world.level.block.Block PURPLE_BANNER -> hc
-    net.minecraft.world.level.block.Block BLUE_BANNER -> hd
-    net.minecraft.world.level.block.Block BROWN_BANNER -> he
-    net.minecraft.world.level.block.Block GREEN_BANNER -> hf
-    net.minecraft.world.level.block.Block RED_BANNER -> hg
-    net.minecraft.world.level.block.Block BLACK_BANNER -> hh
-    net.minecraft.world.level.block.Block WHITE_WALL_BANNER -> hi
-    net.minecraft.world.level.block.Block ORANGE_WALL_BANNER -> hj
-    net.minecraft.world.level.block.Block MAGENTA_WALL_BANNER -> hk
-    net.minecraft.world.level.block.Block LIGHT_BLUE_WALL_BANNER -> hl
-    net.minecraft.world.level.block.Block YELLOW_WALL_BANNER -> hm
-    net.minecraft.world.level.block.Block LIME_WALL_BANNER -> hn
-    net.minecraft.world.level.block.Block PINK_WALL_BANNER -> ho
-    net.minecraft.world.level.block.Block GRAY_WALL_BANNER -> hp
-    net.minecraft.world.level.block.Block LIGHT_GRAY_WALL_BANNER -> hq
-    net.minecraft.world.level.block.Block CYAN_WALL_BANNER -> hr
-    net.minecraft.world.level.block.Block PURPLE_WALL_BANNER -> hs
-    net.minecraft.world.level.block.Block BLUE_WALL_BANNER -> ht
-    net.minecraft.world.level.block.Block BROWN_WALL_BANNER -> hu
-    net.minecraft.world.level.block.Block GREEN_WALL_BANNER -> hv
-    net.minecraft.world.level.block.Block RED_WALL_BANNER -> hw
-    net.minecraft.world.level.block.Block BLACK_WALL_BANNER -> hx
-    net.minecraft.world.level.block.Block RED_SANDSTONE -> hy
-    net.minecraft.world.level.block.Block CHISELED_RED_SANDSTONE -> hz
-    net.minecraft.world.level.block.Block CUT_RED_SANDSTONE -> hA
-    net.minecraft.world.level.block.Block RED_SANDSTONE_STAIRS -> hB
-    net.minecraft.world.level.block.Block OAK_SLAB -> hC
-    net.minecraft.world.level.block.Block SPRUCE_SLAB -> hD
-    net.minecraft.world.level.block.Block BIRCH_SLAB -> hE
-    net.minecraft.world.level.block.Block JUNGLE_SLAB -> hF
-    net.minecraft.world.level.block.Block ACACIA_SLAB -> hG
-    net.minecraft.world.level.block.Block DARK_OAK_SLAB -> hH
-    net.minecraft.world.level.block.Block STONE_SLAB -> hI
-    net.minecraft.world.level.block.Block SMOOTH_STONE_SLAB -> hJ
-    net.minecraft.world.level.block.Block SANDSTONE_SLAB -> hK
-    net.minecraft.world.level.block.Block CUT_SANDSTONE_SLAB -> hL
-    net.minecraft.world.level.block.Block PETRIFIED_OAK_SLAB -> hM
-    net.minecraft.world.level.block.Block COBBLESTONE_SLAB -> hN
-    net.minecraft.world.level.block.Block BRICK_SLAB -> hO
-    net.minecraft.world.level.block.Block STONE_BRICK_SLAB -> hP
-    net.minecraft.world.level.block.Block NETHER_BRICK_SLAB -> hQ
-    net.minecraft.world.level.block.Block QUARTZ_SLAB -> hR
-    net.minecraft.world.level.block.Block RED_SANDSTONE_SLAB -> hS
-    net.minecraft.world.level.block.Block CUT_RED_SANDSTONE_SLAB -> hT
-    net.minecraft.world.level.block.Block PURPUR_SLAB -> hU
-    net.minecraft.world.level.block.Block SMOOTH_STONE -> hV
-    net.minecraft.world.level.block.Block SMOOTH_SANDSTONE -> hW
-    net.minecraft.world.level.block.Block SMOOTH_QUARTZ -> hX
-    net.minecraft.world.level.block.Block SMOOTH_RED_SANDSTONE -> hY
-    net.minecraft.world.level.block.Block SPRUCE_FENCE_GATE -> hZ
-    net.minecraft.world.level.block.Block BIRCH_FENCE_GATE -> ia
-    net.minecraft.world.level.block.Block JUNGLE_FENCE_GATE -> ib
-    net.minecraft.world.level.block.Block ACACIA_FENCE_GATE -> ic
-    net.minecraft.world.level.block.Block DARK_OAK_FENCE_GATE -> id
-    net.minecraft.world.level.block.Block SPRUCE_FENCE -> ie
-    net.minecraft.world.level.block.Block BIRCH_FENCE -> if
-    net.minecraft.world.level.block.Block JUNGLE_FENCE -> ig
-    net.minecraft.world.level.block.Block ACACIA_FENCE -> ih
-    net.minecraft.world.level.block.Block DARK_OAK_FENCE -> ii
-    net.minecraft.world.level.block.Block SPRUCE_DOOR -> ij
-    net.minecraft.world.level.block.Block BIRCH_DOOR -> ik
-    net.minecraft.world.level.block.Block JUNGLE_DOOR -> il
-    net.minecraft.world.level.block.Block ACACIA_DOOR -> im
-    net.minecraft.world.level.block.Block DARK_OAK_DOOR -> in
-    net.minecraft.world.level.block.Block END_ROD -> io
-    net.minecraft.world.level.block.Block CHORUS_PLANT -> ip
-    net.minecraft.world.level.block.Block CHORUS_FLOWER -> iq
-    net.minecraft.world.level.block.Block PURPUR_BLOCK -> ir
-    net.minecraft.world.level.block.Block PURPUR_PILLAR -> is
-    net.minecraft.world.level.block.Block PURPUR_STAIRS -> it
-    net.minecraft.world.level.block.Block END_STONE_BRICKS -> iu
-    net.minecraft.world.level.block.Block BEETROOTS -> iv
-    net.minecraft.world.level.block.Block GRASS_PATH -> iw
-    net.minecraft.world.level.block.Block END_GATEWAY -> ix
-    net.minecraft.world.level.block.Block REPEATING_COMMAND_BLOCK -> iy
-    net.minecraft.world.level.block.Block CHAIN_COMMAND_BLOCK -> iz
-    net.minecraft.world.level.block.Block FROSTED_ICE -> iA
-    net.minecraft.world.level.block.Block MAGMA_BLOCK -> iB
-    net.minecraft.world.level.block.Block NETHER_WART_BLOCK -> iC
-    net.minecraft.world.level.block.Block RED_NETHER_BRICKS -> iD
-    net.minecraft.world.level.block.Block BONE_BLOCK -> iE
-    net.minecraft.world.level.block.Block STRUCTURE_VOID -> iF
-    net.minecraft.world.level.block.Block OBSERVER -> iG
-    net.minecraft.world.level.block.Block SHULKER_BOX -> iH
-    net.minecraft.world.level.block.Block WHITE_SHULKER_BOX -> iI
-    net.minecraft.world.level.block.Block ORANGE_SHULKER_BOX -> iJ
-    net.minecraft.world.level.block.Block MAGENTA_SHULKER_BOX -> iK
-    net.minecraft.world.level.block.Block LIGHT_BLUE_SHULKER_BOX -> iL
-    net.minecraft.world.level.block.Block YELLOW_SHULKER_BOX -> iM
-    net.minecraft.world.level.block.Block LIME_SHULKER_BOX -> iN
-    net.minecraft.world.level.block.Block PINK_SHULKER_BOX -> iO
-    net.minecraft.world.level.block.Block GRAY_SHULKER_BOX -> iP
-    net.minecraft.world.level.block.Block LIGHT_GRAY_SHULKER_BOX -> iQ
-    net.minecraft.world.level.block.Block CYAN_SHULKER_BOX -> iR
-    net.minecraft.world.level.block.Block PURPLE_SHULKER_BOX -> iS
-    net.minecraft.world.level.block.Block BLUE_SHULKER_BOX -> iT
-    net.minecraft.world.level.block.Block BROWN_SHULKER_BOX -> iU
-    net.minecraft.world.level.block.Block GREEN_SHULKER_BOX -> iV
-    net.minecraft.world.level.block.Block RED_SHULKER_BOX -> iW
-    net.minecraft.world.level.block.Block BLACK_SHULKER_BOX -> iX
-    net.minecraft.world.level.block.Block WHITE_GLAZED_TERRACOTTA -> iY
-    net.minecraft.world.level.block.Block ORANGE_GLAZED_TERRACOTTA -> iZ
-    net.minecraft.world.level.block.Block MAGENTA_GLAZED_TERRACOTTA -> ja
-    net.minecraft.world.level.block.Block LIGHT_BLUE_GLAZED_TERRACOTTA -> jb
-    net.minecraft.world.level.block.Block YELLOW_GLAZED_TERRACOTTA -> jc
-    net.minecraft.world.level.block.Block LIME_GLAZED_TERRACOTTA -> jd
-    net.minecraft.world.level.block.Block PINK_GLAZED_TERRACOTTA -> je
-    net.minecraft.world.level.block.Block GRAY_GLAZED_TERRACOTTA -> jf
-    net.minecraft.world.level.block.Block LIGHT_GRAY_GLAZED_TERRACOTTA -> jg
-    net.minecraft.world.level.block.Block CYAN_GLAZED_TERRACOTTA -> jh
-    net.minecraft.world.level.block.Block PURPLE_GLAZED_TERRACOTTA -> ji
-    net.minecraft.world.level.block.Block BLUE_GLAZED_TERRACOTTA -> jj
-    net.minecraft.world.level.block.Block BROWN_GLAZED_TERRACOTTA -> jk
-    net.minecraft.world.level.block.Block GREEN_GLAZED_TERRACOTTA -> jl
-    net.minecraft.world.level.block.Block RED_GLAZED_TERRACOTTA -> jm
-    net.minecraft.world.level.block.Block BLACK_GLAZED_TERRACOTTA -> jn
-    net.minecraft.world.level.block.Block WHITE_CONCRETE -> jo
-    net.minecraft.world.level.block.Block ORANGE_CONCRETE -> jp
-    net.minecraft.world.level.block.Block MAGENTA_CONCRETE -> jq
-    net.minecraft.world.level.block.Block LIGHT_BLUE_CONCRETE -> jr
-    net.minecraft.world.level.block.Block YELLOW_CONCRETE -> js
-    net.minecraft.world.level.block.Block LIME_CONCRETE -> jt
-    net.minecraft.world.level.block.Block PINK_CONCRETE -> ju
-    net.minecraft.world.level.block.Block GRAY_CONCRETE -> jv
-    net.minecraft.world.level.block.Block LIGHT_GRAY_CONCRETE -> jw
-    net.minecraft.world.level.block.Block CYAN_CONCRETE -> jx
-    net.minecraft.world.level.block.Block PURPLE_CONCRETE -> jy
-    net.minecraft.world.level.block.Block BLUE_CONCRETE -> jz
-    net.minecraft.world.level.block.Block BROWN_CONCRETE -> jA
-    net.minecraft.world.level.block.Block GREEN_CONCRETE -> jB
-    net.minecraft.world.level.block.Block RED_CONCRETE -> jC
-    net.minecraft.world.level.block.Block BLACK_CONCRETE -> jD
-    net.minecraft.world.level.block.Block WHITE_CONCRETE_POWDER -> jE
-    net.minecraft.world.level.block.Block ORANGE_CONCRETE_POWDER -> jF
-    net.minecraft.world.level.block.Block MAGENTA_CONCRETE_POWDER -> jG
-    net.minecraft.world.level.block.Block LIGHT_BLUE_CONCRETE_POWDER -> jH
-    net.minecraft.world.level.block.Block YELLOW_CONCRETE_POWDER -> jI
-    net.minecraft.world.level.block.Block LIME_CONCRETE_POWDER -> jJ
-    net.minecraft.world.level.block.Block PINK_CONCRETE_POWDER -> jK
-    net.minecraft.world.level.block.Block GRAY_CONCRETE_POWDER -> jL
-    net.minecraft.world.level.block.Block LIGHT_GRAY_CONCRETE_POWDER -> jM
-    net.minecraft.world.level.block.Block CYAN_CONCRETE_POWDER -> jN
-    net.minecraft.world.level.block.Block PURPLE_CONCRETE_POWDER -> jO
-    net.minecraft.world.level.block.Block BLUE_CONCRETE_POWDER -> jP
-    net.minecraft.world.level.block.Block BROWN_CONCRETE_POWDER -> jQ
-    net.minecraft.world.level.block.Block GREEN_CONCRETE_POWDER -> jR
-    net.minecraft.world.level.block.Block RED_CONCRETE_POWDER -> jS
-    net.minecraft.world.level.block.Block BLACK_CONCRETE_POWDER -> jT
-    net.minecraft.world.level.block.Block KELP -> jU
-    net.minecraft.world.level.block.Block KELP_PLANT -> jV
-    net.minecraft.world.level.block.Block DRIED_KELP_BLOCK -> jW
-    net.minecraft.world.level.block.Block TURTLE_EGG -> jX
-    net.minecraft.world.level.block.Block DEAD_TUBE_CORAL_BLOCK -> jY
-    net.minecraft.world.level.block.Block DEAD_BRAIN_CORAL_BLOCK -> jZ
-    net.minecraft.world.level.block.Block DEAD_BUBBLE_CORAL_BLOCK -> ka
-    net.minecraft.world.level.block.Block DEAD_FIRE_CORAL_BLOCK -> kb
-    net.minecraft.world.level.block.Block DEAD_HORN_CORAL_BLOCK -> kc
-    net.minecraft.world.level.block.Block TUBE_CORAL_BLOCK -> kd
-    net.minecraft.world.level.block.Block BRAIN_CORAL_BLOCK -> ke
-    net.minecraft.world.level.block.Block BUBBLE_CORAL_BLOCK -> kf
-    net.minecraft.world.level.block.Block FIRE_CORAL_BLOCK -> kg
-    net.minecraft.world.level.block.Block HORN_CORAL_BLOCK -> kh
-    net.minecraft.world.level.block.Block DEAD_TUBE_CORAL -> ki
-    net.minecraft.world.level.block.Block DEAD_BRAIN_CORAL -> kj
-    net.minecraft.world.level.block.Block DEAD_BUBBLE_CORAL -> kk
-    net.minecraft.world.level.block.Block DEAD_FIRE_CORAL -> kl
-    net.minecraft.world.level.block.Block DEAD_HORN_CORAL -> km
-    net.minecraft.world.level.block.Block TUBE_CORAL -> kn
-    net.minecraft.world.level.block.Block BRAIN_CORAL -> ko
-    net.minecraft.world.level.block.Block BUBBLE_CORAL -> kp
-    net.minecraft.world.level.block.Block FIRE_CORAL -> kq
-    net.minecraft.world.level.block.Block HORN_CORAL -> kr
-    net.minecraft.world.level.block.Block DEAD_TUBE_CORAL_FAN -> ks
-    net.minecraft.world.level.block.Block DEAD_BRAIN_CORAL_FAN -> kt
-    net.minecraft.world.level.block.Block DEAD_BUBBLE_CORAL_FAN -> ku
-    net.minecraft.world.level.block.Block DEAD_FIRE_CORAL_FAN -> kv
-    net.minecraft.world.level.block.Block DEAD_HORN_CORAL_FAN -> kw
-    net.minecraft.world.level.block.Block TUBE_CORAL_FAN -> kx
-    net.minecraft.world.level.block.Block BRAIN_CORAL_FAN -> ky
-    net.minecraft.world.level.block.Block BUBBLE_CORAL_FAN -> kz
-    net.minecraft.world.level.block.Block FIRE_CORAL_FAN -> kA
-    net.minecraft.world.level.block.Block HORN_CORAL_FAN -> kB
-    net.minecraft.world.level.block.Block DEAD_TUBE_CORAL_WALL_FAN -> kC
-    net.minecraft.world.level.block.Block DEAD_BRAIN_CORAL_WALL_FAN -> kD
-    net.minecraft.world.level.block.Block DEAD_BUBBLE_CORAL_WALL_FAN -> kE
-    net.minecraft.world.level.block.Block DEAD_FIRE_CORAL_WALL_FAN -> kF
-    net.minecraft.world.level.block.Block DEAD_HORN_CORAL_WALL_FAN -> kG
-    net.minecraft.world.level.block.Block TUBE_CORAL_WALL_FAN -> kH
-    net.minecraft.world.level.block.Block BRAIN_CORAL_WALL_FAN -> kI
-    net.minecraft.world.level.block.Block BUBBLE_CORAL_WALL_FAN -> kJ
-    net.minecraft.world.level.block.Block FIRE_CORAL_WALL_FAN -> kK
-    net.minecraft.world.level.block.Block HORN_CORAL_WALL_FAN -> kL
-    net.minecraft.world.level.block.Block SEA_PICKLE -> kM
-    net.minecraft.world.level.block.Block BLUE_ICE -> kN
-    net.minecraft.world.level.block.Block CONDUIT -> kO
-    net.minecraft.world.level.block.Block BAMBOO_SAPLING -> kP
-    net.minecraft.world.level.block.Block BAMBOO -> kQ
-    net.minecraft.world.level.block.Block POTTED_BAMBOO -> kR
-    net.minecraft.world.level.block.Block VOID_AIR -> kS
-    net.minecraft.world.level.block.Block CAVE_AIR -> kT
-    net.minecraft.world.level.block.Block BUBBLE_COLUMN -> kU
-    net.minecraft.world.level.block.Block POLISHED_GRANITE_STAIRS -> kV
-    net.minecraft.world.level.block.Block SMOOTH_RED_SANDSTONE_STAIRS -> kW
-    net.minecraft.world.level.block.Block MOSSY_STONE_BRICK_STAIRS -> kX
-    net.minecraft.world.level.block.Block POLISHED_DIORITE_STAIRS -> kY
-    net.minecraft.world.level.block.Block MOSSY_COBBLESTONE_STAIRS -> kZ
-    net.minecraft.world.level.block.Block END_STONE_BRICK_STAIRS -> la
-    net.minecraft.world.level.block.Block STONE_STAIRS -> lb
-    net.minecraft.world.level.block.Block SMOOTH_SANDSTONE_STAIRS -> lc
-    net.minecraft.world.level.block.Block SMOOTH_QUARTZ_STAIRS -> ld
-    net.minecraft.world.level.block.Block GRANITE_STAIRS -> le
-    net.minecraft.world.level.block.Block ANDESITE_STAIRS -> lf
-    net.minecraft.world.level.block.Block RED_NETHER_BRICK_STAIRS -> lg
-    net.minecraft.world.level.block.Block POLISHED_ANDESITE_STAIRS -> lh
-    net.minecraft.world.level.block.Block DIORITE_STAIRS -> li
-    net.minecraft.world.level.block.Block POLISHED_GRANITE_SLAB -> lj
-    net.minecraft.world.level.block.Block SMOOTH_RED_SANDSTONE_SLAB -> lk
-    net.minecraft.world.level.block.Block MOSSY_STONE_BRICK_SLAB -> ll
-    net.minecraft.world.level.block.Block POLISHED_DIORITE_SLAB -> lm
-    net.minecraft.world.level.block.Block MOSSY_COBBLESTONE_SLAB -> ln
-    net.minecraft.world.level.block.Block END_STONE_BRICK_SLAB -> lo
-    net.minecraft.world.level.block.Block SMOOTH_SANDSTONE_SLAB -> lp
-    net.minecraft.world.level.block.Block SMOOTH_QUARTZ_SLAB -> lq
-    net.minecraft.world.level.block.Block GRANITE_SLAB -> lr
-    net.minecraft.world.level.block.Block ANDESITE_SLAB -> ls
-    net.minecraft.world.level.block.Block RED_NETHER_BRICK_SLAB -> lt
-    net.minecraft.world.level.block.Block POLISHED_ANDESITE_SLAB -> lu
-    net.minecraft.world.level.block.Block DIORITE_SLAB -> lv
-    net.minecraft.world.level.block.Block BRICK_WALL -> lw
-    net.minecraft.world.level.block.Block PRISMARINE_WALL -> lx
-    net.minecraft.world.level.block.Block RED_SANDSTONE_WALL -> ly
-    net.minecraft.world.level.block.Block MOSSY_STONE_BRICK_WALL -> lz
-    net.minecraft.world.level.block.Block GRANITE_WALL -> lA
-    net.minecraft.world.level.block.Block STONE_BRICK_WALL -> lB
-    net.minecraft.world.level.block.Block NETHER_BRICK_WALL -> lC
-    net.minecraft.world.level.block.Block ANDESITE_WALL -> lD
-    net.minecraft.world.level.block.Block RED_NETHER_BRICK_WALL -> lE
-    net.minecraft.world.level.block.Block SANDSTONE_WALL -> lF
-    net.minecraft.world.level.block.Block END_STONE_BRICK_WALL -> lG
-    net.minecraft.world.level.block.Block DIORITE_WALL -> lH
-    net.minecraft.world.level.block.Block SCAFFOLDING -> lI
-    net.minecraft.world.level.block.Block LOOM -> lJ
-    net.minecraft.world.level.block.Block BARREL -> lK
-    net.minecraft.world.level.block.Block SMOKER -> lL
-    net.minecraft.world.level.block.Block BLAST_FURNACE -> lM
-    net.minecraft.world.level.block.Block CARTOGRAPHY_TABLE -> lN
-    net.minecraft.world.level.block.Block FLETCHING_TABLE -> lO
-    net.minecraft.world.level.block.Block GRINDSTONE -> lP
-    net.minecraft.world.level.block.Block LECTERN -> lQ
-    net.minecraft.world.level.block.Block SMITHING_TABLE -> lR
-    net.minecraft.world.level.block.Block STONECUTTER -> lS
-    net.minecraft.world.level.block.Block BELL -> lT
-    net.minecraft.world.level.block.Block LANTERN -> lU
-    net.minecraft.world.level.block.Block CAMPFIRE -> lV
-    net.minecraft.world.level.block.Block SWEET_BERRY_BUSH -> lW
-    net.minecraft.world.level.block.Block STRUCTURE_BLOCK -> lX
-    net.minecraft.world.level.block.Block JIGSAW -> lY
-    net.minecraft.world.level.block.Block COMPOSTER -> lZ
-    net.minecraft.world.level.block.Block BEE_NEST -> ma
-    net.minecraft.world.level.block.Block BEEHIVE -> mb
-    net.minecraft.world.level.block.Block HONEY_BLOCK -> mc
-    net.minecraft.world.level.block.Block HONEYCOMB_BLOCK -> md
-    23:23:void <init>() -> <init>
-    714:714:net.minecraft.world.level.block.Block register(java.lang.String,net.minecraft.world.level.block.Block) -> a
-    169:169:net.minecraft.world.level.block.entity.BlockEntityType lambda$static$0() -> a
-    24:725:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BonemealableBlock -> bpj:
+    net.minecraft.world.level.block.Block NETHER_GOLD_ORE -> I
+    net.minecraft.world.level.block.Block OAK_LOG -> J
+    net.minecraft.world.level.block.Block SPRUCE_LOG -> K
+    net.minecraft.world.level.block.Block BIRCH_LOG -> L
+    net.minecraft.world.level.block.Block JUNGLE_LOG -> M
+    net.minecraft.world.level.block.Block ACACIA_LOG -> N
+    net.minecraft.world.level.block.Block DARK_OAK_LOG -> O
+    net.minecraft.world.level.block.Block STRIPPED_SPRUCE_LOG -> P
+    net.minecraft.world.level.block.Block STRIPPED_BIRCH_LOG -> Q
+    net.minecraft.world.level.block.Block STRIPPED_JUNGLE_LOG -> R
+    net.minecraft.world.level.block.Block STRIPPED_ACACIA_LOG -> S
+    net.minecraft.world.level.block.Block STRIPPED_DARK_OAK_LOG -> T
+    net.minecraft.world.level.block.Block STRIPPED_OAK_LOG -> U
+    net.minecraft.world.level.block.Block OAK_WOOD -> V
+    net.minecraft.world.level.block.Block SPRUCE_WOOD -> W
+    net.minecraft.world.level.block.Block BIRCH_WOOD -> X
+    net.minecraft.world.level.block.Block JUNGLE_WOOD -> Y
+    net.minecraft.world.level.block.Block ACACIA_WOOD -> Z
+    net.minecraft.world.level.block.Block DARK_OAK_WOOD -> aa
+    net.minecraft.world.level.block.Block STRIPPED_OAK_WOOD -> ab
+    net.minecraft.world.level.block.Block STRIPPED_SPRUCE_WOOD -> ac
+    net.minecraft.world.level.block.Block STRIPPED_BIRCH_WOOD -> ad
+    net.minecraft.world.level.block.Block STRIPPED_JUNGLE_WOOD -> ae
+    net.minecraft.world.level.block.Block STRIPPED_ACACIA_WOOD -> af
+    net.minecraft.world.level.block.Block STRIPPED_DARK_OAK_WOOD -> ag
+    net.minecraft.world.level.block.Block OAK_LEAVES -> ah
+    net.minecraft.world.level.block.Block SPRUCE_LEAVES -> ai
+    net.minecraft.world.level.block.Block BIRCH_LEAVES -> aj
+    net.minecraft.world.level.block.Block JUNGLE_LEAVES -> ak
+    net.minecraft.world.level.block.Block ACACIA_LEAVES -> al
+    net.minecraft.world.level.block.Block DARK_OAK_LEAVES -> am
+    net.minecraft.world.level.block.Block SPONGE -> an
+    net.minecraft.world.level.block.Block WET_SPONGE -> ao
+    net.minecraft.world.level.block.Block GLASS -> ap
+    net.minecraft.world.level.block.Block LAPIS_ORE -> aq
+    net.minecraft.world.level.block.Block LAPIS_BLOCK -> ar
+    net.minecraft.world.level.block.Block DISPENSER -> as
+    net.minecraft.world.level.block.Block SANDSTONE -> at
+    net.minecraft.world.level.block.Block CHISELED_SANDSTONE -> au
+    net.minecraft.world.level.block.Block CUT_SANDSTONE -> av
+    net.minecraft.world.level.block.Block NOTE_BLOCK -> aw
+    net.minecraft.world.level.block.Block WHITE_BED -> ax
+    net.minecraft.world.level.block.Block ORANGE_BED -> ay
+    net.minecraft.world.level.block.Block MAGENTA_BED -> az
+    net.minecraft.world.level.block.Block LIGHT_BLUE_BED -> aA
+    net.minecraft.world.level.block.Block YELLOW_BED -> aB
+    net.minecraft.world.level.block.Block LIME_BED -> aC
+    net.minecraft.world.level.block.Block PINK_BED -> aD
+    net.minecraft.world.level.block.Block GRAY_BED -> aE
+    net.minecraft.world.level.block.Block LIGHT_GRAY_BED -> aF
+    net.minecraft.world.level.block.Block CYAN_BED -> aG
+    net.minecraft.world.level.block.Block PURPLE_BED -> aH
+    net.minecraft.world.level.block.Block BLUE_BED -> aI
+    net.minecraft.world.level.block.Block BROWN_BED -> aJ
+    net.minecraft.world.level.block.Block GREEN_BED -> aK
+    net.minecraft.world.level.block.Block RED_BED -> aL
+    net.minecraft.world.level.block.Block BLACK_BED -> aM
+    net.minecraft.world.level.block.Block POWERED_RAIL -> aN
+    net.minecraft.world.level.block.Block DETECTOR_RAIL -> aO
+    net.minecraft.world.level.block.Block STICKY_PISTON -> aP
+    net.minecraft.world.level.block.Block COBWEB -> aQ
+    net.minecraft.world.level.block.Block GRASS -> aR
+    net.minecraft.world.level.block.Block FERN -> aS
+    net.minecraft.world.level.block.Block DEAD_BUSH -> aT
+    net.minecraft.world.level.block.Block SEAGRASS -> aU
+    net.minecraft.world.level.block.Block TALL_SEAGRASS -> aV
+    net.minecraft.world.level.block.Block PISTON -> aW
+    net.minecraft.world.level.block.Block PISTON_HEAD -> aX
+    net.minecraft.world.level.block.Block WHITE_WOOL -> aY
+    net.minecraft.world.level.block.Block ORANGE_WOOL -> aZ
+    net.minecraft.world.level.block.Block MAGENTA_WOOL -> ba
+    net.minecraft.world.level.block.Block LIGHT_BLUE_WOOL -> bb
+    net.minecraft.world.level.block.Block YELLOW_WOOL -> bc
+    net.minecraft.world.level.block.Block LIME_WOOL -> bd
+    net.minecraft.world.level.block.Block PINK_WOOL -> be
+    net.minecraft.world.level.block.Block GRAY_WOOL -> bf
+    net.minecraft.world.level.block.Block LIGHT_GRAY_WOOL -> bg
+    net.minecraft.world.level.block.Block CYAN_WOOL -> bh
+    net.minecraft.world.level.block.Block PURPLE_WOOL -> bi
+    net.minecraft.world.level.block.Block BLUE_WOOL -> bj
+    net.minecraft.world.level.block.Block BROWN_WOOL -> bk
+    net.minecraft.world.level.block.Block GREEN_WOOL -> bl
+    net.minecraft.world.level.block.Block RED_WOOL -> bm
+    net.minecraft.world.level.block.Block BLACK_WOOL -> bn
+    net.minecraft.world.level.block.Block MOVING_PISTON -> bo
+    net.minecraft.world.level.block.Block DANDELION -> bp
+    net.minecraft.world.level.block.Block POPPY -> bq
+    net.minecraft.world.level.block.Block BLUE_ORCHID -> br
+    net.minecraft.world.level.block.Block ALLIUM -> bs
+    net.minecraft.world.level.block.Block AZURE_BLUET -> bt
+    net.minecraft.world.level.block.Block RED_TULIP -> bu
+    net.minecraft.world.level.block.Block ORANGE_TULIP -> bv
+    net.minecraft.world.level.block.Block WHITE_TULIP -> bw
+    net.minecraft.world.level.block.Block PINK_TULIP -> bx
+    net.minecraft.world.level.block.Block OXEYE_DAISY -> by
+    net.minecraft.world.level.block.Block CORNFLOWER -> bz
+    net.minecraft.world.level.block.Block WITHER_ROSE -> bA
+    net.minecraft.world.level.block.Block LILY_OF_THE_VALLEY -> bB
+    net.minecraft.world.level.block.Block BROWN_MUSHROOM -> bC
+    net.minecraft.world.level.block.Block RED_MUSHROOM -> bD
+    net.minecraft.world.level.block.Block GOLD_BLOCK -> bE
+    net.minecraft.world.level.block.Block IRON_BLOCK -> bF
+    net.minecraft.world.level.block.Block BRICKS -> bG
+    net.minecraft.world.level.block.Block TNT -> bH
+    net.minecraft.world.level.block.Block BOOKSHELF -> bI
+    net.minecraft.world.level.block.Block MOSSY_COBBLESTONE -> bJ
+    net.minecraft.world.level.block.Block OBSIDIAN -> bK
+    net.minecraft.world.level.block.Block TORCH -> bL
+    net.minecraft.world.level.block.Block WALL_TORCH -> bM
+    net.minecraft.world.level.block.Block FIRE -> bN
+    net.minecraft.world.level.block.Block SOUL_FIRE -> bO
+    net.minecraft.world.level.block.Block SPAWNER -> bP
+    net.minecraft.world.level.block.Block OAK_STAIRS -> bQ
+    net.minecraft.world.level.block.Block CHEST -> bR
+    net.minecraft.world.level.block.Block REDSTONE_WIRE -> bS
+    net.minecraft.world.level.block.Block DIAMOND_ORE -> bT
+    net.minecraft.world.level.block.Block DIAMOND_BLOCK -> bU
+    net.minecraft.world.level.block.Block CRAFTING_TABLE -> bV
+    net.minecraft.world.level.block.Block WHEAT -> bW
+    net.minecraft.world.level.block.Block FARMLAND -> bX
+    net.minecraft.world.level.block.Block FURNACE -> bY
+    net.minecraft.world.level.block.Block OAK_SIGN -> bZ
+    net.minecraft.world.level.block.Block SPRUCE_SIGN -> ca
+    net.minecraft.world.level.block.Block BIRCH_SIGN -> cb
+    net.minecraft.world.level.block.Block ACACIA_SIGN -> cc
+    net.minecraft.world.level.block.Block JUNGLE_SIGN -> cd
+    net.minecraft.world.level.block.Block DARK_OAK_SIGN -> ce
+    net.minecraft.world.level.block.Block OAK_DOOR -> cf
+    net.minecraft.world.level.block.Block LADDER -> cg
+    net.minecraft.world.level.block.Block RAIL -> ch
+    net.minecraft.world.level.block.Block COBBLESTONE_STAIRS -> ci
+    net.minecraft.world.level.block.Block OAK_WALL_SIGN -> cj
+    net.minecraft.world.level.block.Block SPRUCE_WALL_SIGN -> ck
+    net.minecraft.world.level.block.Block BIRCH_WALL_SIGN -> cl
+    net.minecraft.world.level.block.Block ACACIA_WALL_SIGN -> cm
+    net.minecraft.world.level.block.Block JUNGLE_WALL_SIGN -> cn
+    net.minecraft.world.level.block.Block DARK_OAK_WALL_SIGN -> co
+    net.minecraft.world.level.block.Block LEVER -> cp
+    net.minecraft.world.level.block.Block STONE_PRESSURE_PLATE -> cq
+    net.minecraft.world.level.block.Block IRON_DOOR -> cr
+    net.minecraft.world.level.block.Block OAK_PRESSURE_PLATE -> cs
+    net.minecraft.world.level.block.Block SPRUCE_PRESSURE_PLATE -> ct
+    net.minecraft.world.level.block.Block BIRCH_PRESSURE_PLATE -> cu
+    net.minecraft.world.level.block.Block JUNGLE_PRESSURE_PLATE -> cv
+    net.minecraft.world.level.block.Block ACACIA_PRESSURE_PLATE -> cw
+    net.minecraft.world.level.block.Block DARK_OAK_PRESSURE_PLATE -> cx
+    net.minecraft.world.level.block.Block REDSTONE_ORE -> cy
+    net.minecraft.world.level.block.Block REDSTONE_TORCH -> cz
+    net.minecraft.world.level.block.Block REDSTONE_WALL_TORCH -> cA
+    net.minecraft.world.level.block.Block STONE_BUTTON -> cB
+    net.minecraft.world.level.block.Block SNOW -> cC
+    net.minecraft.world.level.block.Block ICE -> cD
+    net.minecraft.world.level.block.Block SNOW_BLOCK -> cE
+    net.minecraft.world.level.block.Block CACTUS -> cF
+    net.minecraft.world.level.block.Block CLAY -> cG
+    net.minecraft.world.level.block.Block SUGAR_CANE -> cH
+    net.minecraft.world.level.block.Block JUKEBOX -> cI
+    net.minecraft.world.level.block.Block OAK_FENCE -> cJ
+    net.minecraft.world.level.block.Block PUMPKIN -> cK
+    net.minecraft.world.level.block.Block NETHERRACK -> cL
+    net.minecraft.world.level.block.Block SOUL_SAND -> cM
+    net.minecraft.world.level.block.Block SOUL_SOIL -> cN
+    net.minecraft.world.level.block.Block BASALT -> cO
+    net.minecraft.world.level.block.Block POLISHED_BASALT -> cP
+    net.minecraft.world.level.block.Block SOUL_TORCH -> cQ
+    net.minecraft.world.level.block.Block SOUL_WALL_TORCH -> cR
+    net.minecraft.world.level.block.Block GLOWSTONE -> cS
+    net.minecraft.world.level.block.Block NETHER_PORTAL -> cT
+    net.minecraft.world.level.block.Block CARVED_PUMPKIN -> cU
+    net.minecraft.world.level.block.Block JACK_O_LANTERN -> cV
+    net.minecraft.world.level.block.Block CAKE -> cW
+    net.minecraft.world.level.block.Block REPEATER -> cX
+    net.minecraft.world.level.block.Block WHITE_STAINED_GLASS -> cY
+    net.minecraft.world.level.block.Block ORANGE_STAINED_GLASS -> cZ
+    net.minecraft.world.level.block.Block MAGENTA_STAINED_GLASS -> da
+    net.minecraft.world.level.block.Block LIGHT_BLUE_STAINED_GLASS -> db
+    net.minecraft.world.level.block.Block YELLOW_STAINED_GLASS -> dc
+    net.minecraft.world.level.block.Block LIME_STAINED_GLASS -> dd
+    net.minecraft.world.level.block.Block PINK_STAINED_GLASS -> de
+    net.minecraft.world.level.block.Block GRAY_STAINED_GLASS -> df
+    net.minecraft.world.level.block.Block LIGHT_GRAY_STAINED_GLASS -> dg
+    net.minecraft.world.level.block.Block CYAN_STAINED_GLASS -> dh
+    net.minecraft.world.level.block.Block PURPLE_STAINED_GLASS -> di
+    net.minecraft.world.level.block.Block BLUE_STAINED_GLASS -> dj
+    net.minecraft.world.level.block.Block BROWN_STAINED_GLASS -> dk
+    net.minecraft.world.level.block.Block GREEN_STAINED_GLASS -> dl
+    net.minecraft.world.level.block.Block RED_STAINED_GLASS -> dm
+    net.minecraft.world.level.block.Block BLACK_STAINED_GLASS -> dn
+    net.minecraft.world.level.block.Block OAK_TRAPDOOR -> do
+    net.minecraft.world.level.block.Block SPRUCE_TRAPDOOR -> dp
+    net.minecraft.world.level.block.Block BIRCH_TRAPDOOR -> dq
+    net.minecraft.world.level.block.Block JUNGLE_TRAPDOOR -> dr
+    net.minecraft.world.level.block.Block ACACIA_TRAPDOOR -> ds
+    net.minecraft.world.level.block.Block DARK_OAK_TRAPDOOR -> dt
+    net.minecraft.world.level.block.Block STONE_BRICKS -> du
+    net.minecraft.world.level.block.Block MOSSY_STONE_BRICKS -> dv
+    net.minecraft.world.level.block.Block CRACKED_STONE_BRICKS -> dw
+    net.minecraft.world.level.block.Block CHISELED_STONE_BRICKS -> dx
+    net.minecraft.world.level.block.Block INFESTED_STONE -> dy
+    net.minecraft.world.level.block.Block INFESTED_COBBLESTONE -> dz
+    net.minecraft.world.level.block.Block INFESTED_STONE_BRICKS -> dA
+    net.minecraft.world.level.block.Block INFESTED_MOSSY_STONE_BRICKS -> dB
+    net.minecraft.world.level.block.Block INFESTED_CRACKED_STONE_BRICKS -> dC
+    net.minecraft.world.level.block.Block INFESTED_CHISELED_STONE_BRICKS -> dD
+    net.minecraft.world.level.block.Block BROWN_MUSHROOM_BLOCK -> dE
+    net.minecraft.world.level.block.Block RED_MUSHROOM_BLOCK -> dF
+    net.minecraft.world.level.block.Block MUSHROOM_STEM -> dG
+    net.minecraft.world.level.block.Block IRON_BARS -> dH
+    net.minecraft.world.level.block.Block CHAIN -> dI
+    net.minecraft.world.level.block.Block GLASS_PANE -> dJ
+    net.minecraft.world.level.block.Block MELON -> dK
+    net.minecraft.world.level.block.Block ATTACHED_PUMPKIN_STEM -> dL
+    net.minecraft.world.level.block.Block ATTACHED_MELON_STEM -> dM
+    net.minecraft.world.level.block.Block PUMPKIN_STEM -> dN
+    net.minecraft.world.level.block.Block MELON_STEM -> dO
+    net.minecraft.world.level.block.Block VINE -> dP
+    net.minecraft.world.level.block.Block OAK_FENCE_GATE -> dQ
+    net.minecraft.world.level.block.Block BRICK_STAIRS -> dR
+    net.minecraft.world.level.block.Block STONE_BRICK_STAIRS -> dS
+    net.minecraft.world.level.block.Block MYCELIUM -> dT
+    net.minecraft.world.level.block.Block LILY_PAD -> dU
+    net.minecraft.world.level.block.Block NETHER_BRICKS -> dV
+    net.minecraft.world.level.block.Block NETHER_BRICK_FENCE -> dW
+    net.minecraft.world.level.block.Block NETHER_BRICK_STAIRS -> dX
+    net.minecraft.world.level.block.Block NETHER_WART -> dY
+    net.minecraft.world.level.block.Block ENCHANTING_TABLE -> dZ
+    net.minecraft.world.level.block.Block BREWING_STAND -> ea
+    net.minecraft.world.level.block.Block CAULDRON -> eb
+    net.minecraft.world.level.block.Block END_PORTAL -> ec
+    net.minecraft.world.level.block.Block END_PORTAL_FRAME -> ed
+    net.minecraft.world.level.block.Block END_STONE -> ee
+    net.minecraft.world.level.block.Block DRAGON_EGG -> ef
+    net.minecraft.world.level.block.Block REDSTONE_LAMP -> eg
+    net.minecraft.world.level.block.Block COCOA -> eh
+    net.minecraft.world.level.block.Block SANDSTONE_STAIRS -> ei
+    net.minecraft.world.level.block.Block EMERALD_ORE -> ej
+    net.minecraft.world.level.block.Block ENDER_CHEST -> ek
+    net.minecraft.world.level.block.Block TRIPWIRE_HOOK -> el
+    net.minecraft.world.level.block.Block TRIPWIRE -> em
+    net.minecraft.world.level.block.Block EMERALD_BLOCK -> en
+    net.minecraft.world.level.block.Block SPRUCE_STAIRS -> eo
+    net.minecraft.world.level.block.Block BIRCH_STAIRS -> ep
+    net.minecraft.world.level.block.Block JUNGLE_STAIRS -> eq
+    net.minecraft.world.level.block.Block COMMAND_BLOCK -> er
+    net.minecraft.world.level.block.Block BEACON -> es
+    net.minecraft.world.level.block.Block COBBLESTONE_WALL -> et
+    net.minecraft.world.level.block.Block MOSSY_COBBLESTONE_WALL -> eu
+    net.minecraft.world.level.block.Block FLOWER_POT -> ev
+    net.minecraft.world.level.block.Block POTTED_OAK_SAPLING -> ew
+    net.minecraft.world.level.block.Block POTTED_SPRUCE_SAPLING -> ex
+    net.minecraft.world.level.block.Block POTTED_BIRCH_SAPLING -> ey
+    net.minecraft.world.level.block.Block POTTED_JUNGLE_SAPLING -> ez
+    net.minecraft.world.level.block.Block POTTED_ACACIA_SAPLING -> eA
+    net.minecraft.world.level.block.Block POTTED_DARK_OAK_SAPLING -> eB
+    net.minecraft.world.level.block.Block POTTED_FERN -> eC
+    net.minecraft.world.level.block.Block POTTED_DANDELION -> eD
+    net.minecraft.world.level.block.Block POTTED_POPPY -> eE
+    net.minecraft.world.level.block.Block POTTED_BLUE_ORCHID -> eF
+    net.minecraft.world.level.block.Block POTTED_ALLIUM -> eG
+    net.minecraft.world.level.block.Block POTTED_AZURE_BLUET -> eH
+    net.minecraft.world.level.block.Block POTTED_RED_TULIP -> eI
+    net.minecraft.world.level.block.Block POTTED_ORANGE_TULIP -> eJ
+    net.minecraft.world.level.block.Block POTTED_WHITE_TULIP -> eK
+    net.minecraft.world.level.block.Block POTTED_PINK_TULIP -> eL
+    net.minecraft.world.level.block.Block POTTED_OXEYE_DAISY -> eM
+    net.minecraft.world.level.block.Block POTTED_CORNFLOWER -> eN
+    net.minecraft.world.level.block.Block POTTED_LILY_OF_THE_VALLEY -> eO
+    net.minecraft.world.level.block.Block POTTED_WITHER_ROSE -> eP
+    net.minecraft.world.level.block.Block POTTED_RED_MUSHROOM -> eQ
+    net.minecraft.world.level.block.Block POTTED_BROWN_MUSHROOM -> eR
+    net.minecraft.world.level.block.Block POTTED_DEAD_BUSH -> eS
+    net.minecraft.world.level.block.Block POTTED_CACTUS -> eT
+    net.minecraft.world.level.block.Block CARROTS -> eU
+    net.minecraft.world.level.block.Block POTATOES -> eV
+    net.minecraft.world.level.block.Block OAK_BUTTON -> eW
+    net.minecraft.world.level.block.Block SPRUCE_BUTTON -> eX
+    net.minecraft.world.level.block.Block BIRCH_BUTTON -> eY
+    net.minecraft.world.level.block.Block JUNGLE_BUTTON -> eZ
+    net.minecraft.world.level.block.Block ACACIA_BUTTON -> fa
+    net.minecraft.world.level.block.Block DARK_OAK_BUTTON -> fb
+    net.minecraft.world.level.block.Block SKELETON_SKULL -> fc
+    net.minecraft.world.level.block.Block SKELETON_WALL_SKULL -> fd
+    net.minecraft.world.level.block.Block WITHER_SKELETON_SKULL -> fe
+    net.minecraft.world.level.block.Block WITHER_SKELETON_WALL_SKULL -> ff
+    net.minecraft.world.level.block.Block ZOMBIE_HEAD -> fg
+    net.minecraft.world.level.block.Block ZOMBIE_WALL_HEAD -> fh
+    net.minecraft.world.level.block.Block PLAYER_HEAD -> fi
+    net.minecraft.world.level.block.Block PLAYER_WALL_HEAD -> fj
+    net.minecraft.world.level.block.Block CREEPER_HEAD -> fk
+    net.minecraft.world.level.block.Block CREEPER_WALL_HEAD -> fl
+    net.minecraft.world.level.block.Block DRAGON_HEAD -> fm
+    net.minecraft.world.level.block.Block DRAGON_WALL_HEAD -> fn
+    net.minecraft.world.level.block.Block ANVIL -> fo
+    net.minecraft.world.level.block.Block CHIPPED_ANVIL -> fp
+    net.minecraft.world.level.block.Block DAMAGED_ANVIL -> fq
+    net.minecraft.world.level.block.Block TRAPPED_CHEST -> fr
+    net.minecraft.world.level.block.Block LIGHT_WEIGHTED_PRESSURE_PLATE -> fs
+    net.minecraft.world.level.block.Block HEAVY_WEIGHTED_PRESSURE_PLATE -> ft
+    net.minecraft.world.level.block.Block COMPARATOR -> fu
+    net.minecraft.world.level.block.Block DAYLIGHT_DETECTOR -> fv
+    net.minecraft.world.level.block.Block REDSTONE_BLOCK -> fw
+    net.minecraft.world.level.block.Block NETHER_QUARTZ_ORE -> fx
+    net.minecraft.world.level.block.Block HOPPER -> fy
+    net.minecraft.world.level.block.Block QUARTZ_BLOCK -> fz
+    net.minecraft.world.level.block.Block CHISELED_QUARTZ_BLOCK -> fA
+    net.minecraft.world.level.block.Block QUARTZ_PILLAR -> fB
+    net.minecraft.world.level.block.Block QUARTZ_STAIRS -> fC
+    net.minecraft.world.level.block.Block ACTIVATOR_RAIL -> fD
+    net.minecraft.world.level.block.Block DROPPER -> fE
+    net.minecraft.world.level.block.Block WHITE_TERRACOTTA -> fF
+    net.minecraft.world.level.block.Block ORANGE_TERRACOTTA -> fG
+    net.minecraft.world.level.block.Block MAGENTA_TERRACOTTA -> fH
+    net.minecraft.world.level.block.Block LIGHT_BLUE_TERRACOTTA -> fI
+    net.minecraft.world.level.block.Block YELLOW_TERRACOTTA -> fJ
+    net.minecraft.world.level.block.Block LIME_TERRACOTTA -> fK
+    net.minecraft.world.level.block.Block PINK_TERRACOTTA -> fL
+    net.minecraft.world.level.block.Block GRAY_TERRACOTTA -> fM
+    net.minecraft.world.level.block.Block LIGHT_GRAY_TERRACOTTA -> fN
+    net.minecraft.world.level.block.Block CYAN_TERRACOTTA -> fO
+    net.minecraft.world.level.block.Block PURPLE_TERRACOTTA -> fP
+    net.minecraft.world.level.block.Block BLUE_TERRACOTTA -> fQ
+    net.minecraft.world.level.block.Block BROWN_TERRACOTTA -> fR
+    net.minecraft.world.level.block.Block GREEN_TERRACOTTA -> fS
+    net.minecraft.world.level.block.Block RED_TERRACOTTA -> fT
+    net.minecraft.world.level.block.Block BLACK_TERRACOTTA -> fU
+    net.minecraft.world.level.block.Block WHITE_STAINED_GLASS_PANE -> fV
+    net.minecraft.world.level.block.Block ORANGE_STAINED_GLASS_PANE -> fW
+    net.minecraft.world.level.block.Block MAGENTA_STAINED_GLASS_PANE -> fX
+    net.minecraft.world.level.block.Block LIGHT_BLUE_STAINED_GLASS_PANE -> fY
+    net.minecraft.world.level.block.Block YELLOW_STAINED_GLASS_PANE -> fZ
+    net.minecraft.world.level.block.Block LIME_STAINED_GLASS_PANE -> ga
+    net.minecraft.world.level.block.Block PINK_STAINED_GLASS_PANE -> gb
+    net.minecraft.world.level.block.Block GRAY_STAINED_GLASS_PANE -> gc
+    net.minecraft.world.level.block.Block LIGHT_GRAY_STAINED_GLASS_PANE -> gd
+    net.minecraft.world.level.block.Block CYAN_STAINED_GLASS_PANE -> ge
+    net.minecraft.world.level.block.Block PURPLE_STAINED_GLASS_PANE -> gf
+    net.minecraft.world.level.block.Block BLUE_STAINED_GLASS_PANE -> gg
+    net.minecraft.world.level.block.Block BROWN_STAINED_GLASS_PANE -> gh
+    net.minecraft.world.level.block.Block GREEN_STAINED_GLASS_PANE -> gi
+    net.minecraft.world.level.block.Block RED_STAINED_GLASS_PANE -> gj
+    net.minecraft.world.level.block.Block BLACK_STAINED_GLASS_PANE -> gk
+    net.minecraft.world.level.block.Block ACACIA_STAIRS -> gl
+    net.minecraft.world.level.block.Block DARK_OAK_STAIRS -> gm
+    net.minecraft.world.level.block.Block SLIME_BLOCK -> gn
+    net.minecraft.world.level.block.Block BARRIER -> go
+    net.minecraft.world.level.block.Block IRON_TRAPDOOR -> gp
+    net.minecraft.world.level.block.Block PRISMARINE -> gq
+    net.minecraft.world.level.block.Block PRISMARINE_BRICKS -> gr
+    net.minecraft.world.level.block.Block DARK_PRISMARINE -> gs
+    net.minecraft.world.level.block.Block PRISMARINE_STAIRS -> gt
+    net.minecraft.world.level.block.Block PRISMARINE_BRICK_STAIRS -> gu
+    net.minecraft.world.level.block.Block DARK_PRISMARINE_STAIRS -> gv
+    net.minecraft.world.level.block.Block PRISMARINE_SLAB -> gw
+    net.minecraft.world.level.block.Block PRISMARINE_BRICK_SLAB -> gx
+    net.minecraft.world.level.block.Block DARK_PRISMARINE_SLAB -> gy
+    net.minecraft.world.level.block.Block SEA_LANTERN -> gz
+    net.minecraft.world.level.block.Block HAY_BLOCK -> gA
+    net.minecraft.world.level.block.Block WHITE_CARPET -> gB
+    net.minecraft.world.level.block.Block ORANGE_CARPET -> gC
+    net.minecraft.world.level.block.Block MAGENTA_CARPET -> gD
+    net.minecraft.world.level.block.Block LIGHT_BLUE_CARPET -> gE
+    net.minecraft.world.level.block.Block YELLOW_CARPET -> gF
+    net.minecraft.world.level.block.Block LIME_CARPET -> gG
+    net.minecraft.world.level.block.Block PINK_CARPET -> gH
+    net.minecraft.world.level.block.Block GRAY_CARPET -> gI
+    net.minecraft.world.level.block.Block LIGHT_GRAY_CARPET -> gJ
+    net.minecraft.world.level.block.Block CYAN_CARPET -> gK
+    net.minecraft.world.level.block.Block PURPLE_CARPET -> gL
+    net.minecraft.world.level.block.Block BLUE_CARPET -> gM
+    net.minecraft.world.level.block.Block BROWN_CARPET -> gN
+    net.minecraft.world.level.block.Block GREEN_CARPET -> gO
+    net.minecraft.world.level.block.Block RED_CARPET -> gP
+    net.minecraft.world.level.block.Block BLACK_CARPET -> gQ
+    net.minecraft.world.level.block.Block TERRACOTTA -> gR
+    net.minecraft.world.level.block.Block COAL_BLOCK -> gS
+    net.minecraft.world.level.block.Block PACKED_ICE -> gT
+    net.minecraft.world.level.block.Block SUNFLOWER -> gU
+    net.minecraft.world.level.block.Block LILAC -> gV
+    net.minecraft.world.level.block.Block ROSE_BUSH -> gW
+    net.minecraft.world.level.block.Block PEONY -> gX
+    net.minecraft.world.level.block.Block TALL_GRASS -> gY
+    net.minecraft.world.level.block.Block LARGE_FERN -> gZ
+    net.minecraft.world.level.block.Block WHITE_BANNER -> ha
+    net.minecraft.world.level.block.Block ORANGE_BANNER -> hb
+    net.minecraft.world.level.block.Block MAGENTA_BANNER -> hc
+    net.minecraft.world.level.block.Block LIGHT_BLUE_BANNER -> hd
+    net.minecraft.world.level.block.Block YELLOW_BANNER -> he
+    net.minecraft.world.level.block.Block LIME_BANNER -> hf
+    net.minecraft.world.level.block.Block PINK_BANNER -> hg
+    net.minecraft.world.level.block.Block GRAY_BANNER -> hh
+    net.minecraft.world.level.block.Block LIGHT_GRAY_BANNER -> hi
+    net.minecraft.world.level.block.Block CYAN_BANNER -> hj
+    net.minecraft.world.level.block.Block PURPLE_BANNER -> hk
+    net.minecraft.world.level.block.Block BLUE_BANNER -> hl
+    net.minecraft.world.level.block.Block BROWN_BANNER -> hm
+    net.minecraft.world.level.block.Block GREEN_BANNER -> hn
+    net.minecraft.world.level.block.Block RED_BANNER -> ho
+    net.minecraft.world.level.block.Block BLACK_BANNER -> hp
+    net.minecraft.world.level.block.Block WHITE_WALL_BANNER -> hq
+    net.minecraft.world.level.block.Block ORANGE_WALL_BANNER -> hr
+    net.minecraft.world.level.block.Block MAGENTA_WALL_BANNER -> hs
+    net.minecraft.world.level.block.Block LIGHT_BLUE_WALL_BANNER -> ht
+    net.minecraft.world.level.block.Block YELLOW_WALL_BANNER -> hu
+    net.minecraft.world.level.block.Block LIME_WALL_BANNER -> hv
+    net.minecraft.world.level.block.Block PINK_WALL_BANNER -> hw
+    net.minecraft.world.level.block.Block GRAY_WALL_BANNER -> hx
+    net.minecraft.world.level.block.Block LIGHT_GRAY_WALL_BANNER -> hy
+    net.minecraft.world.level.block.Block CYAN_WALL_BANNER -> hz
+    net.minecraft.world.level.block.Block PURPLE_WALL_BANNER -> hA
+    net.minecraft.world.level.block.Block BLUE_WALL_BANNER -> hB
+    net.minecraft.world.level.block.Block BROWN_WALL_BANNER -> hC
+    net.minecraft.world.level.block.Block GREEN_WALL_BANNER -> hD
+    net.minecraft.world.level.block.Block RED_WALL_BANNER -> hE
+    net.minecraft.world.level.block.Block BLACK_WALL_BANNER -> hF
+    net.minecraft.world.level.block.Block RED_SANDSTONE -> hG
+    net.minecraft.world.level.block.Block CHISELED_RED_SANDSTONE -> hH
+    net.minecraft.world.level.block.Block CUT_RED_SANDSTONE -> hI
+    net.minecraft.world.level.block.Block RED_SANDSTONE_STAIRS -> hJ
+    net.minecraft.world.level.block.Block OAK_SLAB -> hK
+    net.minecraft.world.level.block.Block SPRUCE_SLAB -> hL
+    net.minecraft.world.level.block.Block BIRCH_SLAB -> hM
+    net.minecraft.world.level.block.Block JUNGLE_SLAB -> hN
+    net.minecraft.world.level.block.Block ACACIA_SLAB -> hO
+    net.minecraft.world.level.block.Block DARK_OAK_SLAB -> hP
+    net.minecraft.world.level.block.Block STONE_SLAB -> hQ
+    net.minecraft.world.level.block.Block SMOOTH_STONE_SLAB -> hR
+    net.minecraft.world.level.block.Block SANDSTONE_SLAB -> hS
+    net.minecraft.world.level.block.Block CUT_SANDSTONE_SLAB -> hT
+    net.minecraft.world.level.block.Block PETRIFIED_OAK_SLAB -> hU
+    net.minecraft.world.level.block.Block COBBLESTONE_SLAB -> hV
+    net.minecraft.world.level.block.Block BRICK_SLAB -> hW
+    net.minecraft.world.level.block.Block STONE_BRICK_SLAB -> hX
+    net.minecraft.world.level.block.Block NETHER_BRICK_SLAB -> hY
+    net.minecraft.world.level.block.Block QUARTZ_SLAB -> hZ
+    net.minecraft.world.level.block.Block RED_SANDSTONE_SLAB -> ia
+    net.minecraft.world.level.block.Block CUT_RED_SANDSTONE_SLAB -> ib
+    net.minecraft.world.level.block.Block PURPUR_SLAB -> ic
+    net.minecraft.world.level.block.Block SMOOTH_STONE -> id
+    net.minecraft.world.level.block.Block SMOOTH_SANDSTONE -> ie
+    net.minecraft.world.level.block.Block SMOOTH_QUARTZ -> if
+    net.minecraft.world.level.block.Block SMOOTH_RED_SANDSTONE -> ig
+    net.minecraft.world.level.block.Block SPRUCE_FENCE_GATE -> ih
+    net.minecraft.world.level.block.Block BIRCH_FENCE_GATE -> ii
+    net.minecraft.world.level.block.Block JUNGLE_FENCE_GATE -> ij
+    net.minecraft.world.level.block.Block ACACIA_FENCE_GATE -> ik
+    net.minecraft.world.level.block.Block DARK_OAK_FENCE_GATE -> il
+    net.minecraft.world.level.block.Block SPRUCE_FENCE -> im
+    net.minecraft.world.level.block.Block BIRCH_FENCE -> in
+    net.minecraft.world.level.block.Block JUNGLE_FENCE -> io
+    net.minecraft.world.level.block.Block ACACIA_FENCE -> ip
+    net.minecraft.world.level.block.Block DARK_OAK_FENCE -> iq
+    net.minecraft.world.level.block.Block SPRUCE_DOOR -> ir
+    net.minecraft.world.level.block.Block BIRCH_DOOR -> is
+    net.minecraft.world.level.block.Block JUNGLE_DOOR -> it
+    net.minecraft.world.level.block.Block ACACIA_DOOR -> iu
+    net.minecraft.world.level.block.Block DARK_OAK_DOOR -> iv
+    net.minecraft.world.level.block.Block END_ROD -> iw
+    net.minecraft.world.level.block.Block CHORUS_PLANT -> ix
+    net.minecraft.world.level.block.Block CHORUS_FLOWER -> iy
+    net.minecraft.world.level.block.Block PURPUR_BLOCK -> iz
+    net.minecraft.world.level.block.Block PURPUR_PILLAR -> iA
+    net.minecraft.world.level.block.Block PURPUR_STAIRS -> iB
+    net.minecraft.world.level.block.Block END_STONE_BRICKS -> iC
+    net.minecraft.world.level.block.Block BEETROOTS -> iD
+    net.minecraft.world.level.block.Block GRASS_PATH -> iE
+    net.minecraft.world.level.block.Block END_GATEWAY -> iF
+    net.minecraft.world.level.block.Block REPEATING_COMMAND_BLOCK -> iG
+    net.minecraft.world.level.block.Block CHAIN_COMMAND_BLOCK -> iH
+    net.minecraft.world.level.block.Block FROSTED_ICE -> iI
+    net.minecraft.world.level.block.Block MAGMA_BLOCK -> iJ
+    net.minecraft.world.level.block.Block NETHER_WART_BLOCK -> iK
+    net.minecraft.world.level.block.Block RED_NETHER_BRICKS -> iL
+    net.minecraft.world.level.block.Block BONE_BLOCK -> iM
+    net.minecraft.world.level.block.Block STRUCTURE_VOID -> iN
+    net.minecraft.world.level.block.Block OBSERVER -> iO
+    net.minecraft.world.level.block.Block SHULKER_BOX -> iP
+    net.minecraft.world.level.block.Block WHITE_SHULKER_BOX -> iQ
+    net.minecraft.world.level.block.Block ORANGE_SHULKER_BOX -> iR
+    net.minecraft.world.level.block.Block MAGENTA_SHULKER_BOX -> iS
+    net.minecraft.world.level.block.Block LIGHT_BLUE_SHULKER_BOX -> iT
+    net.minecraft.world.level.block.Block YELLOW_SHULKER_BOX -> iU
+    net.minecraft.world.level.block.Block LIME_SHULKER_BOX -> iV
+    net.minecraft.world.level.block.Block PINK_SHULKER_BOX -> iW
+    net.minecraft.world.level.block.Block GRAY_SHULKER_BOX -> iX
+    net.minecraft.world.level.block.Block LIGHT_GRAY_SHULKER_BOX -> iY
+    net.minecraft.world.level.block.Block CYAN_SHULKER_BOX -> iZ
+    net.minecraft.world.level.block.Block PURPLE_SHULKER_BOX -> ja
+    net.minecraft.world.level.block.Block BLUE_SHULKER_BOX -> jb
+    net.minecraft.world.level.block.Block BROWN_SHULKER_BOX -> jc
+    net.minecraft.world.level.block.Block GREEN_SHULKER_BOX -> jd
+    net.minecraft.world.level.block.Block RED_SHULKER_BOX -> je
+    net.minecraft.world.level.block.Block BLACK_SHULKER_BOX -> jf
+    net.minecraft.world.level.block.Block WHITE_GLAZED_TERRACOTTA -> jg
+    net.minecraft.world.level.block.Block ORANGE_GLAZED_TERRACOTTA -> jh
+    net.minecraft.world.level.block.Block MAGENTA_GLAZED_TERRACOTTA -> ji
+    net.minecraft.world.level.block.Block LIGHT_BLUE_GLAZED_TERRACOTTA -> jj
+    net.minecraft.world.level.block.Block YELLOW_GLAZED_TERRACOTTA -> jk
+    net.minecraft.world.level.block.Block LIME_GLAZED_TERRACOTTA -> jl
+    net.minecraft.world.level.block.Block PINK_GLAZED_TERRACOTTA -> jm
+    net.minecraft.world.level.block.Block GRAY_GLAZED_TERRACOTTA -> jn
+    net.minecraft.world.level.block.Block LIGHT_GRAY_GLAZED_TERRACOTTA -> jo
+    net.minecraft.world.level.block.Block CYAN_GLAZED_TERRACOTTA -> jp
+    net.minecraft.world.level.block.Block PURPLE_GLAZED_TERRACOTTA -> jq
+    net.minecraft.world.level.block.Block BLUE_GLAZED_TERRACOTTA -> jr
+    net.minecraft.world.level.block.Block BROWN_GLAZED_TERRACOTTA -> js
+    net.minecraft.world.level.block.Block GREEN_GLAZED_TERRACOTTA -> jt
+    net.minecraft.world.level.block.Block RED_GLAZED_TERRACOTTA -> ju
+    net.minecraft.world.level.block.Block BLACK_GLAZED_TERRACOTTA -> jv
+    net.minecraft.world.level.block.Block WHITE_CONCRETE -> jw
+    net.minecraft.world.level.block.Block ORANGE_CONCRETE -> jx
+    net.minecraft.world.level.block.Block MAGENTA_CONCRETE -> jy
+    net.minecraft.world.level.block.Block LIGHT_BLUE_CONCRETE -> jz
+    net.minecraft.world.level.block.Block YELLOW_CONCRETE -> jA
+    net.minecraft.world.level.block.Block LIME_CONCRETE -> jB
+    net.minecraft.world.level.block.Block PINK_CONCRETE -> jC
+    net.minecraft.world.level.block.Block GRAY_CONCRETE -> jD
+    net.minecraft.world.level.block.Block LIGHT_GRAY_CONCRETE -> jE
+    net.minecraft.world.level.block.Block CYAN_CONCRETE -> jF
+    net.minecraft.world.level.block.Block PURPLE_CONCRETE -> jG
+    net.minecraft.world.level.block.Block BLUE_CONCRETE -> jH
+    net.minecraft.world.level.block.Block BROWN_CONCRETE -> jI
+    net.minecraft.world.level.block.Block GREEN_CONCRETE -> jJ
+    net.minecraft.world.level.block.Block RED_CONCRETE -> jK
+    net.minecraft.world.level.block.Block BLACK_CONCRETE -> jL
+    net.minecraft.world.level.block.Block WHITE_CONCRETE_POWDER -> jM
+    net.minecraft.world.level.block.Block ORANGE_CONCRETE_POWDER -> jN
+    net.minecraft.world.level.block.Block MAGENTA_CONCRETE_POWDER -> jO
+    net.minecraft.world.level.block.Block LIGHT_BLUE_CONCRETE_POWDER -> jP
+    net.minecraft.world.level.block.Block YELLOW_CONCRETE_POWDER -> jQ
+    net.minecraft.world.level.block.Block LIME_CONCRETE_POWDER -> jR
+    net.minecraft.world.level.block.Block PINK_CONCRETE_POWDER -> jS
+    net.minecraft.world.level.block.Block GRAY_CONCRETE_POWDER -> jT
+    net.minecraft.world.level.block.Block LIGHT_GRAY_CONCRETE_POWDER -> jU
+    net.minecraft.world.level.block.Block CYAN_CONCRETE_POWDER -> jV
+    net.minecraft.world.level.block.Block PURPLE_CONCRETE_POWDER -> jW
+    net.minecraft.world.level.block.Block BLUE_CONCRETE_POWDER -> jX
+    net.minecraft.world.level.block.Block BROWN_CONCRETE_POWDER -> jY
+    net.minecraft.world.level.block.Block GREEN_CONCRETE_POWDER -> jZ
+    net.minecraft.world.level.block.Block RED_CONCRETE_POWDER -> ka
+    net.minecraft.world.level.block.Block BLACK_CONCRETE_POWDER -> kb
+    net.minecraft.world.level.block.Block KELP -> kc
+    net.minecraft.world.level.block.Block KELP_PLANT -> kd
+    net.minecraft.world.level.block.Block DRIED_KELP_BLOCK -> ke
+    net.minecraft.world.level.block.Block TURTLE_EGG -> kf
+    net.minecraft.world.level.block.Block DEAD_TUBE_CORAL_BLOCK -> kg
+    net.minecraft.world.level.block.Block DEAD_BRAIN_CORAL_BLOCK -> kh
+    net.minecraft.world.level.block.Block DEAD_BUBBLE_CORAL_BLOCK -> ki
+    net.minecraft.world.level.block.Block DEAD_FIRE_CORAL_BLOCK -> kj
+    net.minecraft.world.level.block.Block DEAD_HORN_CORAL_BLOCK -> kk
+    net.minecraft.world.level.block.Block TUBE_CORAL_BLOCK -> kl
+    net.minecraft.world.level.block.Block BRAIN_CORAL_BLOCK -> km
+    net.minecraft.world.level.block.Block BUBBLE_CORAL_BLOCK -> kn
+    net.minecraft.world.level.block.Block FIRE_CORAL_BLOCK -> ko
+    net.minecraft.world.level.block.Block HORN_CORAL_BLOCK -> kp
+    net.minecraft.world.level.block.Block DEAD_TUBE_CORAL -> kq
+    net.minecraft.world.level.block.Block DEAD_BRAIN_CORAL -> kr
+    net.minecraft.world.level.block.Block DEAD_BUBBLE_CORAL -> ks
+    net.minecraft.world.level.block.Block DEAD_FIRE_CORAL -> kt
+    net.minecraft.world.level.block.Block DEAD_HORN_CORAL -> ku
+    net.minecraft.world.level.block.Block TUBE_CORAL -> kv
+    net.minecraft.world.level.block.Block BRAIN_CORAL -> kw
+    net.minecraft.world.level.block.Block BUBBLE_CORAL -> kx
+    net.minecraft.world.level.block.Block FIRE_CORAL -> ky
+    net.minecraft.world.level.block.Block HORN_CORAL -> kz
+    net.minecraft.world.level.block.Block DEAD_TUBE_CORAL_FAN -> kA
+    net.minecraft.world.level.block.Block DEAD_BRAIN_CORAL_FAN -> kB
+    net.minecraft.world.level.block.Block DEAD_BUBBLE_CORAL_FAN -> kC
+    net.minecraft.world.level.block.Block DEAD_FIRE_CORAL_FAN -> kD
+    net.minecraft.world.level.block.Block DEAD_HORN_CORAL_FAN -> kE
+    net.minecraft.world.level.block.Block TUBE_CORAL_FAN -> kF
+    net.minecraft.world.level.block.Block BRAIN_CORAL_FAN -> kG
+    net.minecraft.world.level.block.Block BUBBLE_CORAL_FAN -> kH
+    net.minecraft.world.level.block.Block FIRE_CORAL_FAN -> kI
+    net.minecraft.world.level.block.Block HORN_CORAL_FAN -> kJ
+    net.minecraft.world.level.block.Block DEAD_TUBE_CORAL_WALL_FAN -> kK
+    net.minecraft.world.level.block.Block DEAD_BRAIN_CORAL_WALL_FAN -> kL
+    net.minecraft.world.level.block.Block DEAD_BUBBLE_CORAL_WALL_FAN -> kM
+    net.minecraft.world.level.block.Block DEAD_FIRE_CORAL_WALL_FAN -> kN
+    net.minecraft.world.level.block.Block DEAD_HORN_CORAL_WALL_FAN -> kO
+    net.minecraft.world.level.block.Block TUBE_CORAL_WALL_FAN -> kP
+    net.minecraft.world.level.block.Block BRAIN_CORAL_WALL_FAN -> kQ
+    net.minecraft.world.level.block.Block BUBBLE_CORAL_WALL_FAN -> kR
+    net.minecraft.world.level.block.Block FIRE_CORAL_WALL_FAN -> kS
+    net.minecraft.world.level.block.Block HORN_CORAL_WALL_FAN -> kT
+    net.minecraft.world.level.block.Block SEA_PICKLE -> kU
+    net.minecraft.world.level.block.Block BLUE_ICE -> kV
+    net.minecraft.world.level.block.Block CONDUIT -> kW
+    net.minecraft.world.level.block.Block BAMBOO_SAPLING -> kX
+    net.minecraft.world.level.block.Block BAMBOO -> kY
+    net.minecraft.world.level.block.Block POTTED_BAMBOO -> kZ
+    net.minecraft.world.level.block.Block VOID_AIR -> la
+    net.minecraft.world.level.block.Block CAVE_AIR -> lb
+    net.minecraft.world.level.block.Block BUBBLE_COLUMN -> lc
+    net.minecraft.world.level.block.Block POLISHED_GRANITE_STAIRS -> ld
+    net.minecraft.world.level.block.Block SMOOTH_RED_SANDSTONE_STAIRS -> le
+    net.minecraft.world.level.block.Block MOSSY_STONE_BRICK_STAIRS -> lf
+    net.minecraft.world.level.block.Block POLISHED_DIORITE_STAIRS -> lg
+    net.minecraft.world.level.block.Block MOSSY_COBBLESTONE_STAIRS -> lh
+    net.minecraft.world.level.block.Block END_STONE_BRICK_STAIRS -> li
+    net.minecraft.world.level.block.Block STONE_STAIRS -> lj
+    net.minecraft.world.level.block.Block SMOOTH_SANDSTONE_STAIRS -> lk
+    net.minecraft.world.level.block.Block SMOOTH_QUARTZ_STAIRS -> ll
+    net.minecraft.world.level.block.Block GRANITE_STAIRS -> lm
+    net.minecraft.world.level.block.Block ANDESITE_STAIRS -> ln
+    net.minecraft.world.level.block.Block RED_NETHER_BRICK_STAIRS -> lo
+    net.minecraft.world.level.block.Block POLISHED_ANDESITE_STAIRS -> lp
+    net.minecraft.world.level.block.Block DIORITE_STAIRS -> lq
+    net.minecraft.world.level.block.Block POLISHED_GRANITE_SLAB -> lr
+    net.minecraft.world.level.block.Block SMOOTH_RED_SANDSTONE_SLAB -> ls
+    net.minecraft.world.level.block.Block MOSSY_STONE_BRICK_SLAB -> lt
+    net.minecraft.world.level.block.Block POLISHED_DIORITE_SLAB -> lu
+    net.minecraft.world.level.block.Block MOSSY_COBBLESTONE_SLAB -> lv
+    net.minecraft.world.level.block.Block END_STONE_BRICK_SLAB -> lw
+    net.minecraft.world.level.block.Block SMOOTH_SANDSTONE_SLAB -> lx
+    net.minecraft.world.level.block.Block SMOOTH_QUARTZ_SLAB -> ly
+    net.minecraft.world.level.block.Block GRANITE_SLAB -> lz
+    net.minecraft.world.level.block.Block ANDESITE_SLAB -> lA
+    net.minecraft.world.level.block.Block RED_NETHER_BRICK_SLAB -> lB
+    net.minecraft.world.level.block.Block POLISHED_ANDESITE_SLAB -> lC
+    net.minecraft.world.level.block.Block DIORITE_SLAB -> lD
+    net.minecraft.world.level.block.Block BRICK_WALL -> lE
+    net.minecraft.world.level.block.Block PRISMARINE_WALL -> lF
+    net.minecraft.world.level.block.Block RED_SANDSTONE_WALL -> lG
+    net.minecraft.world.level.block.Block MOSSY_STONE_BRICK_WALL -> lH
+    net.minecraft.world.level.block.Block GRANITE_WALL -> lI
+    net.minecraft.world.level.block.Block STONE_BRICK_WALL -> lJ
+    net.minecraft.world.level.block.Block NETHER_BRICK_WALL -> lK
+    net.minecraft.world.level.block.Block ANDESITE_WALL -> lL
+    net.minecraft.world.level.block.Block RED_NETHER_BRICK_WALL -> lM
+    net.minecraft.world.level.block.Block SANDSTONE_WALL -> lN
+    net.minecraft.world.level.block.Block END_STONE_BRICK_WALL -> lO
+    net.minecraft.world.level.block.Block DIORITE_WALL -> lP
+    net.minecraft.world.level.block.Block SCAFFOLDING -> lQ
+    net.minecraft.world.level.block.Block LOOM -> lR
+    net.minecraft.world.level.block.Block BARREL -> lS
+    net.minecraft.world.level.block.Block SMOKER -> lT
+    net.minecraft.world.level.block.Block BLAST_FURNACE -> lU
+    net.minecraft.world.level.block.Block CARTOGRAPHY_TABLE -> lV
+    net.minecraft.world.level.block.Block FLETCHING_TABLE -> lW
+    net.minecraft.world.level.block.Block GRINDSTONE -> lX
+    net.minecraft.world.level.block.Block LECTERN -> lY
+    net.minecraft.world.level.block.Block SMITHING_TABLE -> lZ
+    net.minecraft.world.level.block.Block STONECUTTER -> ma
+    net.minecraft.world.level.block.Block BELL -> mb
+    net.minecraft.world.level.block.Block LANTERN -> mc
+    net.minecraft.world.level.block.Block SOUL_LANTERN -> md
+    net.minecraft.world.level.block.Block CAMPFIRE -> me
+    net.minecraft.world.level.block.Block SOUL_CAMPFIRE -> mf
+    net.minecraft.world.level.block.Block SWEET_BERRY_BUSH -> mg
+    net.minecraft.world.level.block.Block WARPED_STEM -> mh
+    net.minecraft.world.level.block.Block STRIPPED_WARPED_STEM -> mi
+    net.minecraft.world.level.block.Block WARPED_HYPHAE -> mj
+    net.minecraft.world.level.block.Block STRIPPED_WARPED_HYPHAE -> mk
+    net.minecraft.world.level.block.Block WARPED_NYLIUM -> ml
+    net.minecraft.world.level.block.Block WARPED_FUNGUS -> mm
+    net.minecraft.world.level.block.Block WARPED_WART_BLOCK -> mn
+    net.minecraft.world.level.block.Block WARPED_ROOTS -> mo
+    net.minecraft.world.level.block.Block NETHER_SPROUTS -> mp
+    net.minecraft.world.level.block.Block CRIMSON_STEM -> mq
+    net.minecraft.world.level.block.Block STRIPPED_CRIMSON_STEM -> mr
+    net.minecraft.world.level.block.Block CRIMSON_HYPHAE -> ms
+    net.minecraft.world.level.block.Block STRIPPED_CRIMSON_HYPHAE -> mt
+    net.minecraft.world.level.block.Block CRIMSON_NYLIUM -> mu
+    net.minecraft.world.level.block.Block CRIMSON_FUNGUS -> mv
+    net.minecraft.world.level.block.Block SHROOMLIGHT -> mw
+    net.minecraft.world.level.block.Block WEEPING_VINES -> mx
+    net.minecraft.world.level.block.Block WEEPING_VINES_PLANT -> my
+    net.minecraft.world.level.block.Block TWISTING_VINES -> mz
+    net.minecraft.world.level.block.Block TWISTING_VINES_PLANT -> mA
+    net.minecraft.world.level.block.Block CRIMSON_ROOTS -> mB
+    net.minecraft.world.level.block.Block CRIMSON_PLANKS -> mC
+    net.minecraft.world.level.block.Block WARPED_PLANKS -> mD
+    net.minecraft.world.level.block.Block CRIMSON_SLAB -> mE
+    net.minecraft.world.level.block.Block WARPED_SLAB -> mF
+    net.minecraft.world.level.block.Block CRIMSON_PRESSURE_PLATE -> mG
+    net.minecraft.world.level.block.Block WARPED_PRESSURE_PLATE -> mH
+    net.minecraft.world.level.block.Block CRIMSON_FENCE -> mI
+    net.minecraft.world.level.block.Block WARPED_FENCE -> mJ
+    net.minecraft.world.level.block.Block CRIMSON_TRAPDOOR -> mK
+    net.minecraft.world.level.block.Block WARPED_TRAPDOOR -> mL
+    net.minecraft.world.level.block.Block CRIMSON_FENCE_GATE -> mM
+    net.minecraft.world.level.block.Block WARPED_FENCE_GATE -> mN
+    net.minecraft.world.level.block.Block CRIMSON_STAIRS -> mO
+    net.minecraft.world.level.block.Block WARPED_STAIRS -> mP
+    net.minecraft.world.level.block.Block CRIMSON_BUTTON -> mQ
+    net.minecraft.world.level.block.Block WARPED_BUTTON -> mR
+    net.minecraft.world.level.block.Block CRIMSON_DOOR -> mS
+    net.minecraft.world.level.block.Block WARPED_DOOR -> mT
+    net.minecraft.world.level.block.Block CRIMSON_SIGN -> mU
+    net.minecraft.world.level.block.Block WARPED_SIGN -> mV
+    net.minecraft.world.level.block.Block CRIMSON_WALL_SIGN -> mW
+    net.minecraft.world.level.block.Block WARPED_WALL_SIGN -> mX
+    net.minecraft.world.level.block.Block STRUCTURE_BLOCK -> mY
+    net.minecraft.world.level.block.Block JIGSAW -> mZ
+    net.minecraft.world.level.block.Block COMPOSTER -> na
+    net.minecraft.world.level.block.Block TARGET -> nb
+    net.minecraft.world.level.block.Block BEE_NEST -> nc
+    net.minecraft.world.level.block.Block BEEHIVE -> nd
+    net.minecraft.world.level.block.Block HONEY_BLOCK -> ne
+    net.minecraft.world.level.block.Block HONEYCOMB_BLOCK -> nf
+    net.minecraft.world.level.block.Block NETHERITE_BLOCK -> ng
+    net.minecraft.world.level.block.Block ANCIENT_DEBRIS -> nh
+    net.minecraft.world.level.block.Block CRYING_OBSIDIAN -> ni
+    net.minecraft.world.level.block.Block RESPAWN_ANCHOR -> nj
+    net.minecraft.world.level.block.Block POTTED_CRIMSON_FUNGUS -> nk
+    net.minecraft.world.level.block.Block POTTED_WARPED_FUNGUS -> nl
+    net.minecraft.world.level.block.Block POTTED_CRIMSON_ROOTS -> nm
+    net.minecraft.world.level.block.Block POTTED_WARPED_ROOTS -> nn
+    net.minecraft.world.level.block.Block LODESTONE -> no
+    net.minecraft.world.level.block.Block BLACKSTONE -> np
+    net.minecraft.world.level.block.Block BLACKSTONE_STAIRS -> nq
+    net.minecraft.world.level.block.Block BLACKSTONE_WALL -> nr
+    net.minecraft.world.level.block.Block BLACKSTONE_SLAB -> ns
+    net.minecraft.world.level.block.Block POLISHED_BLACKSTONE -> nt
+    net.minecraft.world.level.block.Block POLISHED_BLACKSTONE_BRICKS -> nu
+    net.minecraft.world.level.block.Block CRACKED_POLISHED_BLACKSTONE_BRICKS -> nv
+    net.minecraft.world.level.block.Block CHISELED_POLISHED_BLACKSTONE -> nw
+    net.minecraft.world.level.block.Block POLISHED_BLACKSTONE_BRICK_SLAB -> nx
+    net.minecraft.world.level.block.Block POLISHED_BLACKSTONE_BRICK_STAIRS -> ny
+    net.minecraft.world.level.block.Block POLISHED_BLACKSTONE_BRICK_WALL -> nz
+    net.minecraft.world.level.block.Block GILDED_BLACKSTONE -> nA
+    net.minecraft.world.level.block.Block POLISHED_BLACKSTONE_STAIRS -> nB
+    net.minecraft.world.level.block.Block POLISHED_BLACKSTONE_SLAB -> nC
+    net.minecraft.world.level.block.Block POLISHED_BLACKSTONE_PRESSURE_PLATE -> nD
+    net.minecraft.world.level.block.Block POLISHED_BLACKSTONE_BUTTON -> nE
+    net.minecraft.world.level.block.Block POLISHED_BLACKSTONE_WALL -> nF
+    net.minecraft.world.level.block.Block CHISELED_NETHER_BRICKS -> nG
+    net.minecraft.world.level.block.Block CRACKED_NETHER_BRICKS -> nH
+    net.minecraft.world.level.block.Block QUARTZ_BRICKS -> nI
+    38:38:void <init>() -> <init>
+    40:40:java.util.function.ToIntFunction litBlockEmission(int) -> a
+    44:44:java.lang.Boolean never(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
+    48:48:java.lang.Boolean always(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> b
+    52:52:java.lang.Boolean ocelotOrParrot(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> c
+    56:56:net.minecraft.world.level.block.BedBlock bed(net.minecraft.world.item.DyeColor) -> a
+    60:60:net.minecraft.world.level.block.RotatedPillarBlock log(net.minecraft.world.level.material.MaterialColor,net.minecraft.world.level.material.MaterialColor) -> a
+    64:64:net.minecraft.world.level.block.Block netherStem(net.minecraft.world.level.material.MaterialColor) -> a
+    68:68:boolean always(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    72:72:boolean never(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    76:76:net.minecraft.world.level.block.StainedGlassBlock stainedGlass(net.minecraft.world.item.DyeColor) -> b
+    80:80:net.minecraft.world.level.block.LeavesBlock leaves() -> b
+    84:92:net.minecraft.world.level.block.ShulkerBoxBlock shulkerBox(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> a
+    96:97:net.minecraft.world.level.block.piston.PistonBaseBlock pistonBase(boolean) -> a
+    880:880:net.minecraft.world.level.block.Block register(java.lang.String,net.minecraft.world.level.block.Block) -> a
+    893:894:void rebuildCache() -> a
+    849:849:int lambda$static$39(net.minecraft.world.level.block.state.BlockState) -> a
+    848:848:int lambda$static$38(net.minecraft.world.level.block.state.BlockState) -> b
+    806:806:int lambda$static$37(net.minecraft.world.level.block.state.BlockState) -> c
+    805:805:net.minecraft.world.level.levelgen.feature.ConfiguredFeature lambda$static$36() -> c
+    796:796:net.minecraft.world.level.levelgen.feature.ConfiguredFeature lambda$static$35() -> d
+    786:786:int lambda$static$34(net.minecraft.world.level.block.state.BlockState) -> d
+    785:785:int lambda$static$33(net.minecraft.world.level.block.state.BlockState) -> e
+    721:721:int lambda$static$32(net.minecraft.world.level.block.state.BlockState) -> f
+    719:719:int lambda$static$31(net.minecraft.world.level.block.state.BlockState) -> g
+    604:604:boolean lambda$static$30(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> d
+    604:604:int lambda$static$29(net.minecraft.world.level.block.state.BlockState) -> h
+    603:603:boolean lambda$static$28(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> e
+    600:600:int lambda$static$27(net.minecraft.world.level.block.state.BlockState) -> i
+    591:591:int lambda$static$26(net.minecraft.world.level.block.state.BlockState) -> j
+    490:490:int lambda$static$25(net.minecraft.world.level.block.state.BlockState) -> k
+    379:379:int lambda$static$24(net.minecraft.world.level.block.state.BlockState) -> l
+    371:371:int lambda$static$23(net.minecraft.world.level.block.state.BlockState) -> m
+    366:366:int lambda$static$22(net.minecraft.world.level.block.state.BlockState) -> n
+    364:364:int lambda$static$21(net.minecraft.world.level.block.state.BlockState) -> o
+    363:363:int lambda$static$20(net.minecraft.world.level.block.state.BlockState) -> p
+    361:361:int lambda$static$19(net.minecraft.world.level.block.state.BlockState) -> q
+    304:304:int lambda$static$18(net.minecraft.world.level.block.state.BlockState) -> r
+    302:302:int lambda$static$17(net.minecraft.world.level.block.state.BlockState) -> s
+    301:301:int lambda$static$16(net.minecraft.world.level.block.state.BlockState) -> t
+    300:300:int lambda$static$15(net.minecraft.world.level.block.state.BlockState) -> u
+    299:299:int lambda$static$14(net.minecraft.world.level.block.state.BlockState) -> v
+    286:286:boolean lambda$static$13(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> f
+    247:247:net.minecraft.world.level.block.entity.BlockEntityType lambda$static$12() -> e
+    244:244:int lambda$static$11(net.minecraft.world.level.block.state.BlockState) -> w
+    243:243:int lambda$static$10(net.minecraft.world.level.block.state.BlockState) -> x
+    242:242:int lambda$static$9(net.minecraft.world.level.block.state.BlockState) -> y
+    241:241:int lambda$static$8(net.minecraft.world.level.block.state.BlockState) -> z
+    232:232:int lambda$static$7(net.minecraft.world.level.block.state.BlockState) -> A
+    127:127:int lambda$static$6(net.minecraft.world.level.block.state.BlockState) -> B
+    96:96:boolean lambda$pistonBase$5(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    85:90:boolean lambda$shulkerBox$4(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
+    64:64:net.minecraft.world.level.material.MaterialColor lambda$netherStem$3(net.minecraft.world.level.material.MaterialColor,net.minecraft.world.level.block.state.BlockState) -> a
+    60:60:net.minecraft.world.level.material.MaterialColor lambda$log$2(net.minecraft.world.level.material.MaterialColor,net.minecraft.world.level.material.MaterialColor,net.minecraft.world.level.block.state.BlockState) -> a
+    56:56:net.minecraft.world.level.material.MaterialColor lambda$bed$1(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.state.BlockState) -> a
+    40:40:int lambda$litBlockEmission$0(int,net.minecraft.world.level.block.state.BlockState) -> a
+    100:890:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.BonemealableBlock -> bvt:
     boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
     boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.level.block.BrewingStandBlock -> bpk:
+net.minecraft.world.level.block.BrewingStandBlock -> bvu:
     net.minecraft.world.level.block.state.properties.BooleanProperty[] HAS_BOTTLE -> a
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
-    42:44:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    48:48:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
+    42:44:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    48:48:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
     53:53:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    58:58:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    58:58:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     63:73:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     78:84:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
     88:93:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
     97:105:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    109:109:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
+    109:109:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
     114:114:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     119:120:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     124:124:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     30:38:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BubbleColumnBlock -> bpl:
+net.minecraft.world.level.block.BubbleColumnBlock -> bvv:
     net.minecraft.world.level.block.state.properties.BooleanProperty DRAG_DOWN -> a
-    31:33:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    37:51:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    55:56:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    60:61:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    65:65:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    69:72:void growColumn(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,boolean) -> a
-    75:76:boolean canExistIn(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    80:87:boolean getDrag(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    92:92:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    97:113:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    117:128:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    133:135:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    140:140:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    145:145:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    150:151:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    155:156:net.minecraft.world.level.material.Fluid takeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    32:34:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    38:52:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    56:57:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    61:62:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    66:66:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    70:73:void growColumn(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,boolean) -> a
+    76:77:boolean canExistIn(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    81:87:boolean getDrag(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    92:108:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    112:123:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    128:130:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    135:135:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    140:140:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    145:146:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    150:151:net.minecraft.world.level.material.Fluid takeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
     28:28:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.BucketPickup -> bpm:
+net.minecraft.world.level.block.BucketPickup -> bvw:
     net.minecraft.world.level.material.Fluid takeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-net.minecraft.world.level.block.BushBlock -> bpn:
-    13:14:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    17:18:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
-    23:26:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    31:32:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    37:37:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    42:45:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-net.minecraft.world.level.block.ButtonBlock -> bpo:
+net.minecraft.world.level.block.BushBlock -> bvx:
+    13:14:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    17:17:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    22:25:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    30:31:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    36:36:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    41:44:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+net.minecraft.world.level.block.ButtonBlock -> bvy:
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> a
     net.minecraft.world.phys.shapes.VoxelShape CEILING_AABB_X -> b
     net.minecraft.world.phys.shapes.VoxelShape CEILING_AABB_Z -> c
@@ -53114,114 +57999,118 @@ net.minecraft.world.level.block.ButtonBlock -> bpo:
     net.minecraft.world.phys.shapes.VoxelShape EAST_AABB -> i
     net.minecraft.world.phys.shapes.VoxelShape PRESSED_CEILING_AABB_X -> j
     net.minecraft.world.phys.shapes.VoxelShape PRESSED_CEILING_AABB_Z -> k
-    net.minecraft.world.phys.shapes.VoxelShape PRESSED_FLOOR_AABB_X -> w
-    net.minecraft.world.phys.shapes.VoxelShape PRESSED_FLOOR_AABB_Z -> x
-    net.minecraft.world.phys.shapes.VoxelShape PRESSED_NORTH_AABB -> y
-    net.minecraft.world.phys.shapes.VoxelShape PRESSED_SOUTH_AABB -> z
-    net.minecraft.world.phys.shapes.VoxelShape PRESSED_WEST_AABB -> A
-    net.minecraft.world.phys.shapes.VoxelShape PRESSED_EAST_AABB -> B
-    boolean sensitive -> D
-    62:65:void <init>(boolean,net.minecraft.world.level.block.Block$Properties) -> <init>
-    69:69:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    74:101:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    108:113:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    117:120:void press(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
-    123:124:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,boolean) -> a
+    net.minecraft.world.phys.shapes.VoxelShape PRESSED_FLOOR_AABB_X -> o
+    net.minecraft.world.phys.shapes.VoxelShape PRESSED_FLOOR_AABB_Z -> p
+    net.minecraft.world.phys.shapes.VoxelShape PRESSED_NORTH_AABB -> q
+    net.minecraft.world.phys.shapes.VoxelShape PRESSED_SOUTH_AABB -> r
+    net.minecraft.world.phys.shapes.VoxelShape PRESSED_WEST_AABB -> s
+    net.minecraft.world.phys.shapes.VoxelShape PRESSED_EAST_AABB -> t
+    boolean sensitive -> v
+    61:64:void <init>(boolean,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    67:67:int getPressDuration() -> c
+    72:99:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    106:111:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    115:118:void press(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
+    121:122:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,boolean) -> a
     net.minecraft.sounds.SoundEvent getSound(boolean) -> a
-    130:137:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    141:141:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    146:149:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    154:154:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
-    159:172:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    176:181:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    184:197:void checkPressed(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> e
-    201:203:void updateNeighbours(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> f
-    207:208:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    32:56:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ButtonBlock$1 -> bpo$1:
+    128:135:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    139:139:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    144:147:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    152:152:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
+    157:170:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    174:179:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    182:195:void checkPressed(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> e
+    199:201:void updateNeighbours(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> f
+    205:206:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    31:55:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.ButtonBlock$1 -> bvy$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$AttachFace -> b
-    77:85:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CactusBlock -> bpp:
+    75:83:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.CactusBlock -> bvz:
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
     net.minecraft.world.phys.shapes.VoxelShape COLLISION_SHAPE -> b
     net.minecraft.world.phys.shapes.VoxelShape OUTLINE_SHAPE -> c
-    32:34:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    38:67:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    71:71:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    76:76:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    81:85:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    90:100:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    105:106:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    110:111:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    115:115:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    25:29:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CakeBlock -> bpq:
+    33:35:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    39:42:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    46:70:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    74:74:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    79:79:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    84:88:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    93:103:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    108:109:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    113:114:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    118:118:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    25:30:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.CakeBlock -> bwa:
     net.minecraft.world.level.block.state.properties.IntegerProperty BITES -> a
     net.minecraft.world.phys.shapes.VoxelShape[] SHAPE_BY_BITE -> b
-    41:43:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    47:47:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    41:43:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    47:47:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     52:61:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     65:78:net.minecraft.world.InteractionResult eat(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
     83:87:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     92:92:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     97:98:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     102:102:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    107:107:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
+    107:107:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
     112:112:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     26:37:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CampfireBlock -> bpr:
+net.minecraft.world.level.block.CampfireBlock -> bwb:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty LIT -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty SIGNAL_FIRE -> c
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> d
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> e
     net.minecraft.world.phys.shapes.VoxelShape VIRTUAL_FENCE_POST -> f
-    58:60:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    64:79:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    84:89:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    93:103:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    108:115:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    120:127:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    131:131:boolean isSmokeSource(net.minecraft.world.level.block.state.BlockState) -> h
-    136:136:int getLightEmission(net.minecraft.world.level.block.state.BlockState) -> a
-    141:141:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    146:146:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
+    boolean spawnParticles -> g
+    int fireDamage -> h
+    62:66:void <init>(boolean,int,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    70:84:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    89:94:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    98:108:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    113:120:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    125:132:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    136:136:boolean isSmokeSource(net.minecraft.world.level.block.state.BlockState) -> l
+    141:141:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    146:146:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
     151:164:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    168:189:boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
-    194:200:net.minecraft.world.entity.Entity getShooter(net.minecraft.world.entity.Entity) -> a
-    205:216:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.Entity) -> a
-    219:236:void makeParticles(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean,boolean) -> a
-    245:260:boolean isSmokeyPos(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int) -> b
-    264:264:boolean isLitCampfire(net.minecraft.world.level.block.state.BlockState) -> i
-    269:272:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    277:277:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    282:282:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    287:288:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    292:292:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    297:297:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    167:177:void dowse(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> c
+    181:195:boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
+    200:208:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.projectile.Projectile) -> a
+    211:228:void makeParticles(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean,boolean) -> a
+    237:252:boolean isSmokeyPos(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    257:257:boolean isLitCampfire(net.minecraft.world.level.block.state.BlockState) -> g
+    262:265:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    270:270:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    275:275:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    280:281:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    285:285:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    290:290:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    294:295:boolean canLight(net.minecraft.world.level.block.state.BlockState) -> h
+    294:294:boolean lambda$canLight$0(net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase) -> a
     48:55:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CarrotBlock -> bps:
+net.minecraft.world.level.block.CarrotBlock -> bwc:
     net.minecraft.world.phys.shapes.VoxelShape[] SHAPE_BY_AGE -> a
-    24:25:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    24:25:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     29:29:net.minecraft.world.level.ItemLike getBaseSeedId() -> e
-    34:34:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    34:34:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     12:20:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CartographyTableBlock -> bpt:
+net.minecraft.world.level.block.CartographyTableBlock -> bwd:
     net.minecraft.network.chat.TranslatableComponent CONTAINER_TITLE -> a
-    23:24:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    23:24:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     28:34:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     40:40:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
     40:40:net.minecraft.world.inventory.AbstractContainerMenu lambda$getMenuProvider$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CarvedPumpkinBlock -> bpu:
+net.minecraft.world.level.block.CarvedPumpkinBlock -> bwe:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.pattern.BlockPattern snowGolemBase -> b
     net.minecraft.world.level.block.state.pattern.BlockPattern snowGolemFull -> c
     net.minecraft.world.level.block.state.pattern.BlockPattern ironGolemBase -> d
     net.minecraft.world.level.block.state.pattern.BlockPattern ironGolemFull -> e
     java.util.function.Predicate PUMPKINS_PREDICATE -> f
-    43:45:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    43:45:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     49:53:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
     56:56:boolean canSpawnGolem(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     60:111:void trySpawnGolem(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
@@ -53230,27 +58119,37 @@ net.minecraft.world.level.block.CarvedPumpkinBlock -> bpu:
     126:137:net.minecraft.world.level.block.state.pattern.BlockPattern getOrCreateSnowGolemBase() -> c
     141:153:net.minecraft.world.level.block.state.pattern.BlockPattern getOrCreateSnowGolemFull() -> d
     157:169:net.minecraft.world.level.block.state.pattern.BlockPattern getOrCreateIronGolemBase() -> e
-    173:186:net.minecraft.world.level.block.state.pattern.BlockPattern getOrCreateIronGolemFull() -> r
-    191:191:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
+    173:186:net.minecraft.world.level.block.state.pattern.BlockPattern getOrCreateIronGolemFull() -> t
     123:123:boolean lambda$static$0(net.minecraft.world.level.block.state.BlockState) -> h
     28:123:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CauldronBlock -> bpv:
+net.minecraft.world.level.block.CauldronBlock -> bwf:
     net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL -> a
     net.minecraft.world.phys.shapes.VoxelShape INSIDE -> c
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
-    61:63:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    67:67:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    72:72:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> j
+    61:63:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    67:67:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    72:72:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
     77:85:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    89:218:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    222:224:void setWaterLevel(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
-    228:241:void handleRain(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> c
-    245:245:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    250:250:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    255:256:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    260:260:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    89:219:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    223:225:void setWaterLevel(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
+    229:242:void handleRain(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> c
+    246:246:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    251:251:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    256:257:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    261:261:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     39:55:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ChestBlock -> bpw:
+net.minecraft.world.level.block.ChainBlock -> bwg:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
+    net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> b
+    25:27:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    31:31:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    37:39:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    44:47:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    52:53:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    57:60:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    65:65:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    21:22:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.ChestBlock -> bwh:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> b
     net.minecraft.world.level.block.state.properties.EnumProperty TYPE -> c
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> d
@@ -53261,292 +58160,299 @@ net.minecraft.world.level.block.ChestBlock -> bpw:
     net.minecraft.world.phys.shapes.VoxelShape AABB -> i
     net.minecraft.world.level.block.DoubleBlockCombiner$Combiner CHEST_COMBINER -> j
     net.minecraft.world.level.block.DoubleBlockCombiner$Combiner MENU_PROVIDER_COMBINER -> k
-    68:70:void <init>(net.minecraft.world.level.block.Block$Properties,java.util.function.Supplier) -> <init>
-    73:80:net.minecraft.world.level.block.DoubleBlockCombiner$BlockType getBlockType(net.minecraft.world.level.block.state.BlockState) -> h
-    85:85:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    90:103:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    108:121:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    126:127:net.minecraft.core.Direction getConnectedDirection(net.minecraft.world.level.block.state.BlockState) -> i
-    132:154:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    159:162:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    167:169:net.minecraft.core.Direction candidatePartnerFacing(net.minecraft.world.item.BlockPlaceContext,net.minecraft.core.Direction) -> a
-    174:180:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    184:194:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    198:208:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    212:212:net.minecraft.stats.Stat getOpenChestStat() -> c
-    216:216:net.minecraft.world.level.block.entity.BlockEntityType blockEntityType() -> d
-    238:238:net.minecraft.world.Container getContainer(net.minecraft.world.level.block.ChestBlock,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
-    244:249:net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult combine(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
-    296:296:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-    300:300:net.minecraft.world.level.block.DoubleBlockCombiner$Combiner opennessCombiner(net.minecraft.world.level.block.entity.LidBlockEntity) -> a
-    320:320:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    324:324:boolean isChestBlockedAt(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    328:329:boolean isBlockedChestByBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    334:342:boolean isCatSittingOnChest(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
-    347:347:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    352:352:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    357:357:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    362:362:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    367:368:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    372:372:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    245:245:boolean lambda$combine$0(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> c
-    54:252:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ChestBlock$1 -> bpw$1:
-    219:219:void <init>() -> <init>
-    222:222:java.util.Optional acceptDouble(net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
-    227:227:java.util.Optional acceptSingle(net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
-    232:232:java.util.Optional acceptNone() -> a
-    219:219:java.lang.Object acceptNone() -> b
-    219:219:java.lang.Object acceptSingle(java.lang.Object) -> a
-    219:219:java.lang.Object acceptDouble(java.lang.Object,java.lang.Object) -> a
-net.minecraft.world.level.block.ChestBlock$2 -> bpw$2:
-    252:252:void <init>() -> <init>
-    255:256:java.util.Optional acceptDouble(net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
-    284:284:java.util.Optional acceptSingle(net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
-    289:289:java.util.Optional acceptNone() -> a
-    252:252:java.lang.Object acceptNone() -> b
-    252:252:java.lang.Object acceptSingle(java.lang.Object) -> a
-    252:252:java.lang.Object acceptDouble(java.lang.Object,java.lang.Object) -> a
-net.minecraft.world.level.block.ChestBlock$2$1 -> bpw$2$1:
+    69:71:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,java.util.function.Supplier) -> <init>
+    74:81:net.minecraft.world.level.block.DoubleBlockCombiner$BlockType getBlockType(net.minecraft.world.level.block.state.BlockState) -> g
+    86:86:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    91:104:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    109:122:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    127:128:net.minecraft.core.Direction getConnectedDirection(net.minecraft.world.level.block.state.BlockState) -> h
+    133:155:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    160:163:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    168:170:net.minecraft.core.Direction candidatePartnerFacing(net.minecraft.world.item.BlockPlaceContext,net.minecraft.core.Direction) -> a
+    175:181:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    185:195:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    199:210:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    214:214:net.minecraft.stats.Stat getOpenChestStat() -> c
+    218:218:net.minecraft.world.level.block.entity.BlockEntityType blockEntityType() -> d
+    240:240:net.minecraft.world.Container getContainer(net.minecraft.world.level.block.ChestBlock,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
+    246:251:net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult combine(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
+    298:298:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
+    302:302:net.minecraft.world.level.block.DoubleBlockCombiner$Combiner opennessCombiner(net.minecraft.world.level.block.entity.LidBlockEntity) -> a
+    322:322:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    326:326:boolean isChestBlockedAt(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    330:331:boolean isBlockedChestByBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    336:344:boolean isCatSittingOnChest(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
+    349:349:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    354:354:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    359:359:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    364:364:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    369:370:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    374:374:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    247:247:boolean lambda$combine$0(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> c
+    55:254:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.ChestBlock$1 -> bwh$1:
+    221:221:void <init>() -> <init>
+    224:224:java.util.Optional acceptDouble(net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
+    229:229:java.util.Optional acceptSingle(net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
+    234:234:java.util.Optional acceptNone() -> a
+    221:221:java.lang.Object acceptNone() -> b
+    221:221:java.lang.Object acceptSingle(java.lang.Object) -> a
+    221:221:java.lang.Object acceptDouble(java.lang.Object,java.lang.Object) -> a
+net.minecraft.world.level.block.ChestBlock$2 -> bwh$2:
+    254:254:void <init>() -> <init>
+    257:258:java.util.Optional acceptDouble(net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
+    286:286:java.util.Optional acceptSingle(net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
+    291:291:java.util.Optional acceptNone() -> a
+    254:254:java.lang.Object acceptNone() -> b
+    254:254:java.lang.Object acceptSingle(java.lang.Object) -> a
+    254:254:java.lang.Object acceptDouble(java.lang.Object,java.lang.Object) -> a
+net.minecraft.world.level.block.ChestBlock$2$1 -> bwh$2$1:
     net.minecraft.world.level.block.entity.ChestBlockEntity val$first -> a
     net.minecraft.world.level.block.entity.ChestBlockEntity val$second -> b
     net.minecraft.world.Container val$container -> c
     net.minecraft.world.level.block.ChestBlock$2 this$0 -> d
-    256:256:void <init>(net.minecraft.world.level.block.ChestBlock$2,net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.Container) -> <init>
-    260:266:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
-    271:277:net.minecraft.network.chat.Component getDisplayName() -> d
-net.minecraft.world.level.block.ChestBlock$3 -> bpw$3:
+    258:258:void <init>(net.minecraft.world.level.block.ChestBlock$2,net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.Container) -> <init>
+    262:268:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
+    273:279:net.minecraft.network.chat.Component getDisplayName() -> d
+net.minecraft.world.level.block.ChestBlock$3 -> bwh$3:
     net.minecraft.world.level.block.entity.LidBlockEntity val$entity -> a
-    300:300:void <init>(net.minecraft.world.level.block.entity.LidBlockEntity) -> <init>
-    303:303:it.unimi.dsi.fastutil.floats.Float2FloatFunction acceptDouble(net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
-    308:308:it.unimi.dsi.fastutil.floats.Float2FloatFunction acceptSingle(net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
-    313:313:it.unimi.dsi.fastutil.floats.Float2FloatFunction acceptNone() -> a
-    300:300:java.lang.Object acceptNone() -> b
-    300:300:java.lang.Object acceptSingle(java.lang.Object) -> a
-    300:300:java.lang.Object acceptDouble(java.lang.Object,java.lang.Object) -> a
-    303:303:float lambda$acceptDouble$0(net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity,float) -> a
-net.minecraft.world.level.block.ChestBlock$4 -> bpw$4:
+    302:302:void <init>(net.minecraft.world.level.block.entity.LidBlockEntity) -> <init>
+    305:305:it.unimi.dsi.fastutil.floats.Float2FloatFunction acceptDouble(net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
+    310:310:it.unimi.dsi.fastutil.floats.Float2FloatFunction acceptSingle(net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
+    315:315:it.unimi.dsi.fastutil.floats.Float2FloatFunction acceptNone() -> a
+    302:302:java.lang.Object acceptNone() -> b
+    302:302:java.lang.Object acceptSingle(java.lang.Object) -> a
+    302:302:java.lang.Object acceptDouble(java.lang.Object,java.lang.Object) -> a
+    305:305:float lambda$acceptDouble$0(net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity,float) -> a
+net.minecraft.world.level.block.ChestBlock$4 -> bwh$4:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    112:112:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ChorusFlowerBlock -> bpx:
+    113:113:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.ChorusFlowerBlock -> bwi:
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
     net.minecraft.world.level.block.ChorusPlantBlock plant -> b
-    26:29:void <init>(net.minecraft.world.level.block.ChorusPlantBlock,net.minecraft.world.level.block.Block$Properties) -> <init>
-    33:103:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    106:108:void placeGrownFlower(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int) -> b
-    111:113:void placeDeadFlower(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    116:121:boolean allNeighborsEmpty(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    126:130:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    135:156:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    161:162:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    165:167:void generatePlant(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,java.util.Random,int) -> a
-    170:211:void growTreeRecursive(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,java.util.Random,net.minecraft.core.BlockPos,int,int) -> a
-    215:217:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.Entity) -> a
-    21:21:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ChorusPlantBlock -> bpy:
-    18:21:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    27:30:void <init>(net.minecraft.world.level.block.ChorusPlantBlock,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    34:37:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    41:41:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    47:111:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    114:116:void placeGrownFlower(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int) -> b
+    119:121:void placeDeadFlower(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    124:129:boolean allNeighborsEmpty(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    134:138:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    143:163:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    168:169:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    172:174:void generatePlant(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,java.util.Random,int) -> a
+    177:218:void growTreeRecursive(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,java.util.Random,net.minecraft.core.BlockPos,int,int) -> a
+    222:226:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.projectile.Projectile) -> a
+    22:22:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.ChorusPlantBlock -> bwj:
+    18:21:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     25:25:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     29:42:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    48:56:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    61:64:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    71:88:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    93:94:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    98:98:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-net.minecraft.world.level.block.CocoaBlock -> bpz:
+    48:55:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    60:63:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    70:87:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    92:93:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    97:97:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+net.minecraft.world.level.block.CocoaBlock -> bwk:
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
     net.minecraft.world.phys.shapes.VoxelShape[] EAST_AABB -> b
     net.minecraft.world.phys.shapes.VoxelShape[] WEST_AABB -> c
     net.minecraft.world.phys.shapes.VoxelShape[] NORTH_AABB -> d
     net.minecraft.world.phys.shapes.VoxelShape[] SOUTH_AABB -> e
-    61:63:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    67:73:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    77:78:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    83:93:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    100:114:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    119:123:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    128:128:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    133:133:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    138:139:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    143:144:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    24:57:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CocoaBlock$1 -> bpz$1:
+    62:64:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    68:68:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    73:79:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    83:84:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    89:99:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    106:120:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    125:129:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    134:134:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    139:139:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    144:145:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    149:150:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    154:154:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    25:58:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.CocoaBlock$1 -> bwk$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    84:84:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CommandBlock -> bqa:
+    90:90:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.CommandBlock -> bwl:
     org.apache.logging.log4j.Logger LOGGER -> c
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty CONDITIONAL -> b
-    39:41:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    45:47:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    52:76:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    80:110:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    113:120:void execute(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.BaseCommandBlock,boolean) -> a
-    124:124:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    129:135:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    140:140:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    145:149:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    154:177:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    181:181:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    186:186:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    191:191:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    196:197:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    201:201:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    205:247:void executeChain(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    34:36:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ComparatorBlock -> bqb:
+    38:40:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    44:46:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    51:75:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    79:109:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    112:119:void execute(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.BaseCommandBlock,boolean) -> a
+    123:129:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    134:134:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    139:143:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    148:171:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    175:175:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    180:180:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    185:185:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    190:191:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    195:195:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    199:241:void executeChain(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    33:35:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.ComparatorBlock -> bwm:
     net.minecraft.world.level.block.state.properties.EnumProperty MODE -> a
-    34:36:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    40:40:int getDelay(net.minecraft.world.level.block.state.BlockState) -> h
+    34:36:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    40:40:int getDelay(net.minecraft.world.level.block.state.BlockState) -> g
     45:50:int getOutputSignal(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
     54:58:int calculateOutputSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> e
     63:73:boolean shouldTurnOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    78:100:int getInputSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    105:111:net.minecraft.world.entity.decoration.ItemFrame getItemFrame(net.minecraft.world.level.Level,net.minecraft.core.Direction,net.minecraft.core.BlockPos) -> a
-    116:126:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    131:144:void checkTickOnNeighbor(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> c
-    147:170:void refreshOutputState(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> f
-    174:175:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    179:182:boolean triggerEvent(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,int) -> a
-    187:187:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    192:193:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    105:105:boolean lambda$getItemFrame$0(net.minecraft.core.Direction,net.minecraft.world.entity.decoration.ItemFrame) -> a
+    78:101:int getInputSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    106:112:net.minecraft.world.entity.decoration.ItemFrame getItemFrame(net.minecraft.world.level.Level,net.minecraft.core.Direction,net.minecraft.core.BlockPos) -> a
+    117:127:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    132:145:void checkTickOnNeighbor(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> c
+    148:171:void refreshOutputState(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> f
+    175:176:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    180:183:boolean triggerEvent(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,int) -> a
+    188:188:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    193:194:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    106:106:boolean lambda$getItemFrame$0(net.minecraft.core.Direction,net.minecraft.world.entity.decoration.ItemFrame) -> a
     31:31:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ComposterBlock -> bqc:
+net.minecraft.world.level.block.ComposterBlock -> bwn:
     net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL -> a
     it.unimi.dsi.fastutil.objects.Object2FloatMap COMPOSTABLES -> b
     net.minecraft.world.phys.shapes.VoxelShape OUTER_SHAPE -> c
     net.minecraft.world.phys.shapes.VoxelShape[] SHAPES -> d
-    48:134:void bootStrap() -> c
-    137:138:void add(float,net.minecraft.world.level.ItemLike) -> a
-    152:154:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    157:178:void handleFill(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
-    182:182:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    187:187:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> j
-    193:193:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    198:201:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    205:239:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    243:244:void empty(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> d
-    247:259:boolean addItem(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> b
-    264:269:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    273:273:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    278:278:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    283:284:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    288:288:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    293:302:net.minecraft.world.WorldlyContainer getContainer(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    145:149:void lambda$static$0(net.minecraft.world.phys.shapes.VoxelShape[]) -> a
-    39:39:void access$000(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> c
-    39:39:boolean access$100(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    43:144:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ComposterBlock$EmptyContainer -> bqc$a:
-    307:308:void <init>() -> <init>
-    312:312:int[] getSlotsForFace(net.minecraft.core.Direction) -> a
-    317:317:boolean canPlaceItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> a
-    322:322:boolean canTakeItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> b
-net.minecraft.world.level.block.ComposterBlock$InputContainer -> bqc$b:
+    48:145:void bootStrap() -> c
+    148:149:void add(float,net.minecraft.world.level.ItemLike) -> a
+    163:165:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    168:189:void handleFill(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
+    193:193:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    198:198:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
+    204:204:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    209:212:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    216:235:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    239:248:net.minecraft.world.level.block.state.BlockState insertItem(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos) -> a
+    252:265:net.minecraft.world.level.block.state.BlockState extractProduce(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
+    269:271:net.minecraft.world.level.block.state.BlockState empty(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> d
+    275:288:net.minecraft.world.level.block.state.BlockState addItem(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> b
+    293:297:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    301:301:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    306:306:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    311:312:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    316:316:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    321:330:net.minecraft.world.WorldlyContainer getContainer(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    156:160:void lambda$static$0(net.minecraft.world.phys.shapes.VoxelShape[]) -> a
+    39:39:net.minecraft.world.level.block.state.BlockState access$000(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> c
+    39:39:net.minecraft.world.level.block.state.BlockState access$100(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    43:155:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.ComposterBlock$EmptyContainer -> bwn$a:
+    335:336:void <init>() -> <init>
+    340:340:int[] getSlotsForFace(net.minecraft.core.Direction) -> a
+    345:345:boolean canPlaceItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> a
+    350:350:boolean canTakeItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> b
+net.minecraft.world.level.block.ComposterBlock$InputContainer -> bwn$b:
     net.minecraft.world.level.block.state.BlockState state -> a
     net.minecraft.world.level.LevelAccessor level -> b
     net.minecraft.core.BlockPos pos -> c
     boolean changed -> d
-    373:377:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> <init>
-    381:381:int getMaxStackSize() -> L_
-    386:386:int[] getSlotsForFace(net.minecraft.core.Direction) -> a
-    391:391:boolean canPlaceItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> a
-    396:396:boolean canTakeItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> b
-    401:407:void setChanged() -> e
-net.minecraft.world.level.block.ComposterBlock$OutputContainer -> bqc$c:
+    401:405:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> <init>
+    409:409:int getMaxStackSize() -> X_
+    414:414:int[] getSlotsForFace(net.minecraft.core.Direction) -> a
+    419:419:boolean canPlaceItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> a
+    424:424:boolean canTakeItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> b
+    429:436:void setChanged() -> Z_
+net.minecraft.world.level.block.ComposterBlock$OutputContainer -> bwn$c:
     net.minecraft.world.level.block.state.BlockState state -> a
     net.minecraft.world.level.LevelAccessor level -> b
     net.minecraft.core.BlockPos pos -> c
     boolean changed -> d
-    333:337:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> <init>
-    341:341:int getMaxStackSize() -> L_
-    346:346:int[] getSlotsForFace(net.minecraft.core.Direction) -> a
-    351:351:boolean canPlaceItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> a
-    356:356:boolean canTakeItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> b
-    361:363:void setChanged() -> e
-net.minecraft.world.level.block.ConcretePowderBlock -> bqd:
+    361:365:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> <init>
+    369:369:int getMaxStackSize() -> X_
+    374:374:int[] getSlotsForFace(net.minecraft.core.Direction) -> a
+    379:379:boolean canPlaceItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> a
+    384:384:boolean canTakeItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> b
+    389:391:void setChanged() -> Z_
+net.minecraft.world.level.block.ConcretePowderBlock -> bwo:
     net.minecraft.world.level.block.state.BlockState concrete -> a
-    16:18:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block$Properties) -> <init>
-    22:25:void onLand(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
-    29:36:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    40:40:boolean shouldSolidify(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    44:58:boolean touchesLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    62:62:boolean canSolidify(net.minecraft.world.level.block.state.BlockState) -> r
-    67:71:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.block.ConduitBlock -> bqe:
+    17:19:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    23:26:void onLand(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.item.FallingBlockEntity) -> a
+    30:37:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    41:41:boolean shouldSolidify(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    45:59:boolean touchesLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    63:63:boolean canSolidify(net.minecraft.world.level.block.state.BlockState) -> l
+    68:72:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    77:77:int getDustColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+net.minecraft.world.level.block.ConduitBlock -> bwp:
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> a
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
-    33:35:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    33:35:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     39:40:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     44:44:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    49:49:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    54:58:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
+    49:49:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    54:58:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
     63:67:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    72:72:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    72:72:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     77:83:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
     88:89:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     94:94:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     28:30:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CoralBlock -> bqf:
+net.minecraft.world.level.block.CoralBlock -> bwq:
     net.minecraft.world.level.block.Block deadBlock -> a
-    20:22:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block$Properties) -> <init>
+    20:22:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     26:29:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
     33:36:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     40:46:boolean scanForWater(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
     52:55:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-net.minecraft.world.level.block.CoralFanBlock -> bqg:
+net.minecraft.world.level.block.CoralFanBlock -> bwr:
     net.minecraft.world.level.block.Block deadBlock -> a
-    17:19:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block$Properties) -> <init>
+    17:19:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     23:24:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
     28:31:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
     35:45:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.block.CoralPlantBlock -> bqh:
+net.minecraft.world.level.block.CoralPlantBlock -> bws:
     net.minecraft.world.level.block.Block deadBlock -> c
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    22:24:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block$Properties) -> <init>
+    22:24:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     28:29:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
     33:36:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
     40:50:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    55:55:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    55:55:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CoralWallFanBlock -> bqi:
+net.minecraft.world.level.block.CoralWallFanBlock -> bwt:
     net.minecraft.world.level.block.Block deadBlock -> c
-    17:19:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block$Properties) -> <init>
+    17:19:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     23:24:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
     28:31:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
     35:44:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.block.CraftingTableBlock -> bqj:
+net.minecraft.world.level.block.CraftingTableBlock -> bwu:
     net.minecraft.network.chat.Component CONTAINER_TITLE -> a
-    22:23:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    22:23:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     27:33:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     38:38:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
     38:38:net.minecraft.world.inventory.AbstractContainerMenu lambda$getMenuProvider$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CropBlock -> bqk:
+net.minecraft.world.level.block.CropBlock -> bwv:
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> b
     net.minecraft.world.phys.shapes.VoxelShape[] SHAPE_BY_AGE -> a
-    40:42:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    46:46:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    51:51:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
+    40:42:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    46:46:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    51:51:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
     55:55:net.minecraft.world.level.block.state.properties.IntegerProperty getAgeProperty() -> c
     59:59:int getMaxAge() -> d
-    63:63:int getAge(net.minecraft.world.level.block.state.BlockState) -> h
+    63:63:int getAge(net.minecraft.world.level.block.state.BlockState) -> g
     67:67:net.minecraft.world.level.block.state.BlockState getStateForAge(int) -> b
-    71:71:boolean isMaxAge(net.minecraft.world.level.block.state.BlockState) -> i
-    76:87:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    90:96:void growCrops(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    99:99:int getBonemealAgeIncrease(net.minecraft.world.level.Level) -> a
-    103:148:float getGrowthSpeed(net.minecraft.world.level.block.Block,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    153:153:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    158:162:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    166:166:net.minecraft.world.level.ItemLike getBaseSeedId() -> e
-    171:171:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    176:176:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    181:181:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    186:187:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    191:192:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    71:71:boolean isMaxAge(net.minecraft.world.level.block.state.BlockState) -> h
+    76:76:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    81:91:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    94:100:void growCrops(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    103:103:int getBonemealAgeIncrease(net.minecraft.world.level.Level) -> a
+    107:152:float getGrowthSpeed(net.minecraft.world.level.block.Block,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    157:157:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    162:166:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    170:170:net.minecraft.world.level.ItemLike getBaseSeedId() -> e
+    175:175:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    180:180:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    185:185:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    190:191:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    195:196:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     26:36:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CrossCollisionBlock -> bql:
+net.minecraft.world.level.block.CrossCollisionBlock -> bww:
     net.minecraft.world.level.block.state.properties.BooleanProperty NORTH -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty EAST -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty SOUTH -> c
@@ -53556,77 +58462,79 @@ net.minecraft.world.level.block.CrossCollisionBlock -> bql:
     net.minecraft.world.phys.shapes.VoxelShape[] collisionShapeByIndex -> g
     net.minecraft.world.phys.shapes.VoxelShape[] shapeByIndex -> h
     it.unimi.dsi.fastutil.objects.Object2IntMap stateToIndex -> i
-    31:38:void <init>(float,float,float,float,float,net.minecraft.world.level.block.Block$Properties) -> <init>
-    41:77:net.minecraft.world.phys.shapes.VoxelShape[] makeShapes(float,float,float,float,float) -> a
-    82:82:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    87:87:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    92:92:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    96:96:int indexFor(net.minecraft.core.Direction) -> a
-    100:100:int getAABBIndex(net.minecraft.world.level.block.state.BlockState) -> h
-    120:123:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    128:128:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    133:141:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    147:155:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    101:114:int lambda$getAABBIndex$1(net.minecraft.world.level.block.state.BlockState) -> i
+    31:42:void <init>(float,float,float,float,float,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    45:81:net.minecraft.world.phys.shapes.VoxelShape[] makeShapes(float,float,float,float,float) -> a
+    86:86:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    91:91:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    96:96:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    100:100:int indexFor(net.minecraft.core.Direction) -> a
+    104:104:int getAABBIndex(net.minecraft.world.level.block.state.BlockState) -> g
+    124:127:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    132:132:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    137:145:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    151:159:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    105:118:int lambda$getAABBIndex$1(net.minecraft.world.level.block.state.BlockState) -> h
     27:27:boolean lambda$static$0(java.util.Map$Entry) -> a
     22:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.CrossCollisionBlock$1 -> bql$1:
+net.minecraft.world.level.block.CrossCollisionBlock$1 -> bww$1:
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> b
-    133:147:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DaylightDetectorBlock -> bqm:
+    137:151:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.CryingObsidianBlock -> bwx:
+    13:14:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    18:37:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+net.minecraft.world.level.block.DaylightDetectorBlock -> bwy:
     net.minecraft.world.level.block.state.properties.IntegerProperty POWER -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty INVERTED -> b
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> c
-    31:34:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    38:38:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    43:43:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
+    31:34:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    38:38:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    43:43:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
     48:48:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
     52:74:void updateSignalStrength(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
     78:89:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    94:94:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    99:99:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
+    94:94:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    99:99:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
     104:104:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     109:110:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     25:28:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DeadBushBlock -> bqn:
+net.minecraft.world.level.block.DeadBushBlock -> bwz:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    14:15:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    19:19:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    24:25:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
+    14:15:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    19:19:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    24:25:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
     11:11:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DetectorRailBlock -> bqo:
+net.minecraft.world.level.block.DetectorRailBlock -> bxa:
     net.minecraft.world.level.block.state.properties.EnumProperty SHAPE -> c
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> d
-    35:37:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    41:41:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    46:46:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
-    51:60:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    64:69:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    73:73:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    78:81:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    85:116:void checkPressed(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    119:126:void updatePowerToConnected(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    130:135:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    139:139:net.minecraft.world.level.block.state.properties.Property getShapeProperty() -> d
-    144:144:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    149:161:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    165:165:java.util.List getInteractingMinecartOfType(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.lang.Class,java.util.function.Predicate) -> a
-    169:171:net.minecraft.world.phys.AABB getSearchBB(net.minecraft.core.BlockPos) -> a
-    176:243:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    249:290:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    295:296:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    31:32:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DetectorRailBlock$1 -> bqo$1:
+    35:37:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    41:41:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
+    46:55:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    59:64:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    68:68:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    73:76:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    80:111:void checkPressed(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    114:121:void updatePowerToConnected(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    125:129:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    133:133:net.minecraft.world.level.block.state.properties.Property getShapeProperty() -> d
+    138:138:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    143:155:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    159:159:java.util.List getInteractingMinecartOfType(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.lang.Class,java.util.function.Predicate) -> a
+    163:165:net.minecraft.world.phys.AABB getSearchBB(net.minecraft.core.BlockPos) -> a
+    170:237:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    243:284:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    289:290:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    30:31:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.DetectorRailBlock$1 -> bxa$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$RailShape -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> b
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> c
-    176:250:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DiodeBlock -> bqp:
+    170:244:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.DiodeBlock -> bxb:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> c
-    29:30:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    34:34:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    29:30:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    34:34:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     39:39:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     44:60:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
     64:64:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
@@ -53637,49 +58545,48 @@ net.minecraft.world.level.block.DiodeBlock -> bqp:
     121:121:boolean shouldTurnOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     125:134:int getInputSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
     138:141:int getAlternateSignal(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    145:157:int getAlternateSignalAt(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    162:162:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
-    167:167:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    172:175:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    179:180:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    184:190:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    193:198:void updateNeighborsInFront(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> d
-    201:201:boolean isAlternateInput(net.minecraft.world.level.block.state.BlockState) -> i
-    205:205:int getOutputSignal(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    209:209:boolean isDiode(net.minecraft.world.level.block.state.BlockState) -> r
-    213:216:boolean shouldPrioritize(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> c
-    int getDelay(net.minecraft.world.level.block.state.BlockState) -> h
+    145:156:int getAlternateSignalAt(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    161:161:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
+    166:166:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    171:174:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    178:179:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    183:189:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    192:197:void updateNeighborsInFront(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> d
+    200:200:boolean isAlternateInput(net.minecraft.world.level.block.state.BlockState) -> h
+    204:204:int getOutputSignal(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    208:208:boolean isDiode(net.minecraft.world.level.block.state.BlockState) -> l
+    212:215:boolean shouldPrioritize(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> c
+    int getDelay(net.minecraft.world.level.block.state.BlockState) -> g
     24:26:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DirectionalBlock -> bqq:
+net.minecraft.world.level.block.DirectionalBlock -> bxc:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
-    10:11:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    10:11:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     7:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DispenserBlock -> bqr:
+net.minecraft.world.level.block.DispenserBlock -> bxd:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty TRIGGERED -> b
     java.util.Map DISPENSER_REGISTRY -> c
     48:49:void registerBehavior(net.minecraft.world.level.ItemLike,net.minecraft.core.dispenser.DispenseItemBehavior) -> a
-    52:54:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    58:58:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    63:77:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    81:96:void dispenseFrom(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    99:99:net.minecraft.core.dispenser.DispenseItemBehavior getDispenseMethod(net.minecraft.world.item.ItemStack) -> a
-    104:113:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    117:118:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    122:122:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    127:127:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    132:138:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    142:152:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    155:161:net.minecraft.core.Position getDispensePosition(net.minecraft.core.BlockSource) -> a
-    166:166:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    171:171:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    176:176:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    181:181:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    186:186:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    191:192:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    45:45:void lambda$static$0(it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap) -> a
-    42:45:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DoorBlock -> bqs:
+    52:54:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    58:72:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    76:91:void dispenseFrom(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    94:94:net.minecraft.core.dispenser.DispenseItemBehavior getDispenseMethod(net.minecraft.world.item.ItemStack) -> a
+    99:108:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    112:113:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    117:117:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    122:122:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    127:133:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    137:147:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    150:156:net.minecraft.core.Position getDispensePosition(net.minecraft.core.BlockSource) -> a
+    161:161:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    166:166:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    171:171:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    176:176:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    181:181:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    186:187:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    44:44:void lambda$static$0(it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap) -> a
+    41:44:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.DoorBlock -> bxe:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty OPEN -> b
     net.minecraft.world.level.block.state.properties.EnumProperty HINGE -> c
@@ -53689,36 +58596,37 @@ net.minecraft.world.level.block.DoorBlock -> bqs:
     net.minecraft.world.phys.shapes.VoxelShape NORTH_AABB -> g
     net.minecraft.world.phys.shapes.VoxelShape WEST_AABB -> h
     net.minecraft.world.phys.shapes.VoxelShape EAST_AABB -> i
-    50:52:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    56:69:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    75:92:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    98:99:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
-    103:122:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
-    126:134:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    139:139:int getCloseSound() -> c
-    143:143:int getOpenSound() -> d
-    149:157:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    162:163:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    166:205:net.minecraft.world.level.block.state.properties.DoorHingeSide getHinge(net.minecraft.world.item.BlockPlaceContext) -> b
-    210:217:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    221:228:void setOpen(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
-    232:239:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    244:249:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    254:255:void playSound(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> b
-    259:259:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
-    264:264:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    269:272:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    277:277:long getSeed(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
-    282:283:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    36:47:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DoorBlock$1 -> bqs$1:
+    49:51:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    55:68:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    74:91:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    96:101:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
+    105:113:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    118:118:int getCloseSound() -> c
+    122:122:int getOpenSound() -> d
+    128:136:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    141:142:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    145:184:net.minecraft.world.level.block.state.properties.DoorHingeSide getHinge(net.minecraft.world.item.BlockPlaceContext) -> b
+    189:196:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    200:207:void setOpen(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
+    211:218:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    223:228:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    233:234:void playSound(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> b
+    238:238:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
+    243:243:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    248:251:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    256:256:long getSeed(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    261:262:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    265:265:boolean isWoodenDoor(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    269:269:boolean isWoodenDoor(net.minecraft.world.level.block.state.BlockState) -> h
+    35:46:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.DoorBlock$1 -> bxe$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     int[] $SwitchMap$net$minecraft$world$level$pathfinder$PathComputationType -> b
-    60:126:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DoubleBlockCombiner -> bqt:
+    59:105:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.DoubleBlockCombiner -> bxf:
     14:14:void <init>() -> <init>
     23:58:net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult combineWithNeigbour(net.minecraft.world.level.block.entity.BlockEntityType,java.util.function.Function,java.util.function.Function,net.minecraft.world.level.block.state.properties.DirectionProperty,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,java.util.function.BiPredicate) -> a
-net.minecraft.world.level.block.DoubleBlockCombiner$BlockType -> bqt$a:
+net.minecraft.world.level.block.DoubleBlockCombiner$BlockType -> bxf$a:
     net.minecraft.world.level.block.DoubleBlockCombiner$BlockType SINGLE -> a
     net.minecraft.world.level.block.DoubleBlockCombiner$BlockType FIRST -> b
     net.minecraft.world.level.block.DoubleBlockCombiner$BlockType SECOND -> c
@@ -53727,59 +58635,60 @@ net.minecraft.world.level.block.DoubleBlockCombiner$BlockType -> bqt$a:
     15:15:net.minecraft.world.level.block.DoubleBlockCombiner$BlockType valueOf(java.lang.String) -> valueOf
     15:15:void <init>(java.lang.String,int) -> <init>
     15:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DoubleBlockCombiner$Combiner -> bqt$b:
+net.minecraft.world.level.block.DoubleBlockCombiner$Combiner -> bxf$b:
     java.lang.Object acceptDouble(java.lang.Object,java.lang.Object) -> a
     java.lang.Object acceptSingle(java.lang.Object) -> a
     java.lang.Object acceptNone() -> b
-net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult -> bqt$c:
+net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult -> bxf$c:
     java.lang.Object apply(net.minecraft.world.level.block.DoubleBlockCombiner$Combiner) -> apply
-net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult$Double -> bqt$c$a:
+net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult$Double -> bxf$c$a:
     java.lang.Object first -> a
     java.lang.Object second -> b
     76:79:void <init>(java.lang.Object,java.lang.Object) -> <init>
     83:83:java.lang.Object apply(net.minecraft.world.level.block.DoubleBlockCombiner$Combiner) -> apply
-net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult$Single -> bqt$c$b:
+net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult$Single -> bxf$c$b:
     java.lang.Object single -> a
     90:92:void <init>(java.lang.Object) -> <init>
     96:96:java.lang.Object apply(net.minecraft.world.level.block.DoubleBlockCombiner$Combiner) -> apply
-net.minecraft.world.level.block.DoublePlantBlock -> bqu:
+net.minecraft.world.level.block.DoublePlantBlock -> bxg:
     net.minecraft.world.level.block.state.properties.EnumProperty HALF -> a
-    26:29:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    26:29:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     33:44:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     50:55:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     60:61:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
     66:71:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     75:77:void placeAt(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> a
-    82:83:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
-    87:104:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
-    108:109:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    113:113:net.minecraft.world.level.block.Block$OffsetType getOffsetType() -> X_
-    118:118:long getSeed(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    81:91:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
+    96:97:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
+    101:111:void preventCreativeDropFromBottomPart(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> b
+    115:116:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    120:120:net.minecraft.world.level.block.state.BlockBehaviour$OffsetType getOffsetType() -> aj_
+    125:125:long getSeed(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
     23:23:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DragonEggBlock -> bqv:
+net.minecraft.world.level.block.DragonEggBlock -> bxh:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    22:23:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    27:27:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    32:33:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    38:39:void attack(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    42:64:void teleport(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
-    68:68:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    73:73:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.DropperBlock -> bqw:
+    21:22:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    26:26:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    31:32:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    37:38:void attack(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    41:63:void teleport(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
+    67:67:int getDelayAfterPlace() -> c
+    72:72:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.DropperBlock -> bxi:
     net.minecraft.core.dispenser.DispenseItemBehavior DISPENSE_BEHAVIOUR -> c
-    21:22:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    21:22:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     26:26:net.minecraft.core.dispenser.DispenseItemBehavior getDispenseMethod(net.minecraft.world.item.ItemStack) -> a
     31:31:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     36:69:void dispenseFrom(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     18:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.EnchantmentTableBlock -> bqx:
+net.minecraft.world.level.block.EnchantmentTableBlock -> bxj:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    33:34:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    38:38:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
-    43:43:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    33:34:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    38:38:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
+    43:43:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     48:70:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    74:74:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
+    74:74:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
     79:79:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     84:89:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     95:101:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
@@ -53787,34 +58696,34 @@ net.minecraft.world.level.block.EnchantmentTableBlock -> bqx:
     116:116:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     99:99:net.minecraft.world.inventory.AbstractContainerMenu lambda$getMenuProvider$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
     30:30:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.EndGatewayBlock -> bqy:
-    17:18:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.EndGatewayBlock -> bxk:
+    17:18:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     22:22:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     27:51:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
     55:55:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     60:60:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
-net.minecraft.world.level.block.EndPortalBlock -> bqz:
+net.minecraft.world.level.block.EndPortalBlock -> bxl:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    25:26:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    30:30:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    35:35:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    40:45:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    49:57:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    61:61:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    66:66:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.EndPortalFrameBlock -> bra:
+    26:27:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    31:31:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    36:36:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    41:51:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    55:60:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    64:64:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    69:69:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
+    23:23:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.EndPortalFrameBlock -> bxm:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty HAS_EYE -> b
     net.minecraft.world.phys.shapes.VoxelShape BASE_SHAPE -> c
     net.minecraft.world.phys.shapes.VoxelShape EYE_SHAPE -> d
     net.minecraft.world.phys.shapes.VoxelShape FULL_SHAPE -> e
     net.minecraft.world.level.block.state.pattern.BlockPattern portalShape -> f
-    33:35:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    39:39:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
-    44:44:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    33:35:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    39:39:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
+    44:44:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     49:49:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    54:54:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
+    54:54:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
     59:63:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     68:68:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     73:73:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
@@ -53822,99 +58731,102 @@ net.minecraft.world.level.block.EndPortalFrameBlock -> bra:
     82:98:net.minecraft.world.level.block.state.pattern.BlockPattern getOrCreatePortalShape() -> c
     103:103:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     25:29:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.EndRodBlock -> brb:
+net.minecraft.world.level.block.EndRodBlock -> bxn:
     net.minecraft.world.phys.shapes.VoxelShape Y_AXIS_AABB -> b
     net.minecraft.world.phys.shapes.VoxelShape Z_AXIS_AABB -> c
     net.minecraft.world.phys.shapes.VoxelShape X_AXIS_AABB -> d
-    26:28:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    32:32:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    37:37:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    42:49:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    56:63:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    68:77:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    81:82:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    86:86:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
-    21:23:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.EndRodBlock$1 -> brb$1:
+    27:29:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    33:33:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    38:38:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    43:50:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    57:64:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    69:78:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    82:83:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    87:87:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
+    92:92:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    22:24:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.EndRodBlock$1 -> bxn$1:
     int[] $SwitchMap$net$minecraft$core$Direction$Axis -> a
-    42:42:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.EnderChestBlock -> brc:
+    43:43:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.EnderChestBlock -> bxo:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> c
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> d
     net.minecraft.network.chat.TranslatableComponent CONTAINER_TITLE -> e
-    48:50:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    54:54:net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult combine(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
-    59:59:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    64:64:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    69:70:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    75:96:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    101:101:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    106:119:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    123:123:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    128:128:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    133:134:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    138:141:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    146:149:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    154:154:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    93:93:net.minecraft.world.inventory.AbstractContainerMenu lambda$use$1(net.minecraft.world.inventory.PlayerEnderChestContainer,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
-    48:48:net.minecraft.world.level.block.entity.BlockEntityType lambda$new$0() -> c
-    42:45:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.EntityBlock -> brd:
+    49:51:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    55:55:net.minecraft.world.level.block.DoubleBlockCombiner$NeighborCombineResult combine(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
+    60:60:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    65:65:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    70:71:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    76:97:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    102:102:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    107:120:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    124:124:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    129:129:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    134:135:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    139:142:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    147:150:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    155:155:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    94:94:net.minecraft.world.inventory.AbstractContainerMenu lambda$use$1(net.minecraft.world.inventory.PlayerEnderChestContainer,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
+    49:49:net.minecraft.world.level.block.entity.BlockEntityType lambda$new$0() -> c
+    43:46:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.EntityBlock -> bxp:
     net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-net.minecraft.world.level.block.FaceAttachedHorizontalDirectionalBlock -> bre:
-    net.minecraft.world.level.block.state.properties.EnumProperty FACE -> C
-    19:20:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.FaceAttachedHorizontalDirectionalBlock -> bxq:
+    net.minecraft.world.level.block.state.properties.EnumProperty FACE -> u
+    19:20:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     24:24:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     28:29:boolean canAttach(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
     35:48:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     53:56:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     60:66:net.minecraft.core.Direction getConnectedDirection(net.minecraft.world.level.block.state.BlockState) -> h
     16:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.FaceAttachedHorizontalDirectionalBlock$1 -> bre$1:
+net.minecraft.world.level.block.FaceAttachedHorizontalDirectionalBlock$1 -> bxq$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$AttachFace -> a
     60:60:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.FallingBlock -> brf:
-    19:20:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    24:25:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    29:31:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    36:44:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    47:47:void falling(net.minecraft.world.entity.item.FallingBlockEntity) -> a
-    51:51:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    56:58:boolean isFree(net.minecraft.world.level.block.state.BlockState) -> h
-    62:62:void onLand(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
-    65:65:void onBroken(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.block.FallingBlock -> bxr:
+    21:22:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    26:27:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    31:33:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    38:46:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    49:49:void falling(net.minecraft.world.entity.item.FallingBlockEntity) -> a
+    52:52:int getDelayAfterPlace() -> c
+    57:58:boolean isFree(net.minecraft.world.level.block.state.BlockState) -> h
+    62:62:void onLand(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.item.FallingBlockEntity) -> a
+    65:65:void onBroken(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.item.FallingBlockEntity) -> a
     69:80:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    83:83:int getDustColor(net.minecraft.world.level.block.state.BlockState) -> i
-net.minecraft.world.level.block.FarmBlock -> brg:
+    83:83:int getDustColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+net.minecraft.world.level.block.FarmBlock -> bxs:
     net.minecraft.world.level.block.state.properties.IntegerProperty MOISTURE -> a
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
-    34:36:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    34:36:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     40:43:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     48:49:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     54:57:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    62:62:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
-    67:67:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    72:87:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    91:100:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
-    103:104:void turnToDirt(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
-    107:108:boolean isUnderCrops(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    112:117:boolean isNearWater(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    122:123:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    127:127:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    132:132:boolean isViewBlocking(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> f
+    62:62:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
+    67:67:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    72:75:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    79:89:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    93:102:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
+    105:106:void turnToDirt(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
+    109:110:boolean isUnderCrops(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    114:119:boolean isNearWater(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    124:125:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    129:129:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     28:29:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.FenceBlock -> brh:
+net.minecraft.world.level.block.FenceBlock -> bxt:
     net.minecraft.world.phys.shapes.VoxelShape[] occlusionByIndex -> i
-    28:32:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    36:36:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> i
-    41:41:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    45:49:boolean connectsTo(net.minecraft.world.level.block.state.BlockState,boolean,net.minecraft.core.Direction) -> a
-    54:63:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    68:88:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    93:99:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    104:105:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-net.minecraft.world.level.block.FenceGateBlock -> bri:
+    29:33:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    37:37:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
+    42:42:net.minecraft.world.phys.shapes.VoxelShape getVisualShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    47:47:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    51:55:boolean connectsTo(net.minecraft.world.level.block.state.BlockState,boolean,net.minecraft.core.Direction) -> a
+    60:60:boolean isSameFence(net.minecraft.world.level.block.Block) -> c
+    65:74:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    79:99:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    104:110:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    115:116:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+net.minecraft.world.level.block.FenceGateBlock -> bxu:
     net.minecraft.world.level.block.state.properties.BooleanProperty OPEN -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty IN_WALL -> c
@@ -53926,13 +58838,13 @@ net.minecraft.world.level.block.FenceGateBlock -> bri:
     net.minecraft.world.phys.shapes.VoxelShape X_COLLISION_SHAPE -> i
     net.minecraft.world.phys.shapes.VoxelShape Z_OCCLUSION_SHAPE -> j
     net.minecraft.world.phys.shapes.VoxelShape X_OCCLUSION_SHAPE -> k
-    net.minecraft.world.phys.shapes.VoxelShape Z_OCCLUSION_SHAPE_LOW -> w
-    net.minecraft.world.phys.shapes.VoxelShape X_OCCLUSION_SHAPE_LOW -> x
-    56:59:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    63:66:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    net.minecraft.world.phys.shapes.VoxelShape Z_OCCLUSION_SHAPE_LOW -> o
+    net.minecraft.world.phys.shapes.VoxelShape X_OCCLUSION_SHAPE_LOW -> p
+    56:59:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    63:66:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     71:77:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    82:85:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    90:93:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> i
+    82:85:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    90:93:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
     98:106:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     112:121:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     125:125:boolean isWall(net.minecraft.world.level.block.state.BlockState) -> h
@@ -53941,109 +58853,120 @@ net.minecraft.world.level.block.FenceGateBlock -> bri:
     164:165:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     168:168:boolean connectsToDirection(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
     24:52:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.FenceGateBlock$1 -> bri$1:
+net.minecraft.world.level.block.FenceGateBlock$1 -> bxu$1:
     int[] $SwitchMap$net$minecraft$world$level$pathfinder$PathComputationType -> a
     98:98:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.FireBlock -> brj:
-    net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
-    net.minecraft.world.level.block.state.properties.BooleanProperty NORTH -> b
-    net.minecraft.world.level.block.state.properties.BooleanProperty EAST -> c
-    net.minecraft.world.level.block.state.properties.BooleanProperty SOUTH -> d
-    net.minecraft.world.level.block.state.properties.BooleanProperty WEST -> e
-    net.minecraft.world.level.block.state.properties.BooleanProperty UP -> f
-    java.util.Map PROPERTY_BY_DIRECTION -> g
-    it.unimi.dsi.fastutil.objects.Object2IntMap flameOdds -> h
-    it.unimi.dsi.fastutil.objects.Object2IntMap burnOdds -> i
-    54:60:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    65:65:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    70:74:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    80:80:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    86:100:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    105:106:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    111:111:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    116:204:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    207:207:boolean isNearRain(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    211:214:int getBurnOdd(net.minecraft.world.level.block.state.BlockState) -> i
-    218:221:int getFlameOdds(net.minecraft.world.level.block.state.BlockState) -> r
-    225:241:void checkBurnOut(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,java.util.Random,int) -> a
-    244:250:boolean isValidFireLocation(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    254:264:int getFireOdds(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    268:268:boolean canBurn(net.minecraft.world.level.block.state.BlockState) -> h
-    273:288:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    292:347:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    351:352:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    355:357:void setFlammable(net.minecraft.world.level.block.Block,int,int) -> a
-    360:488:void bootStrap() -> c
-    42:42:boolean lambda$static$0(java.util.Map$Entry) -> a
-    35:42:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.FletchingTableBlock -> brk:
-    13:14:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.FireBlock -> bxv:
+    net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> g
+    net.minecraft.world.level.block.state.properties.BooleanProperty NORTH -> h
+    net.minecraft.world.level.block.state.properties.BooleanProperty EAST -> i
+    net.minecraft.world.level.block.state.properties.BooleanProperty SOUTH -> j
+    net.minecraft.world.level.block.state.properties.BooleanProperty WEST -> k
+    net.minecraft.world.level.block.state.properties.BooleanProperty UP -> o
+    java.util.Map PROPERTY_BY_DIRECTION -> p
+    it.unimi.dsi.fastutil.objects.Object2IntMap flameOdds -> q
+    it.unimi.dsi.fastutil.objects.Object2IntMap burnOdds -> r
+    49:55:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    59:63:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    68:89:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    94:94:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    100:114:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    119:120:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    126:211:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    214:214:boolean isNearRain(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    218:221:int getBurnOdd(net.minecraft.world.level.block.state.BlockState) -> h
+    225:228:int getFlameOdds(net.minecraft.world.level.block.state.BlockState) -> l
+    232:248:void checkBurnOut(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,java.util.Random,int) -> a
+    251:256:net.minecraft.world.level.block.state.BlockState getStateWithAge(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> a
+    260:266:boolean isValidFireLocation(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> e
+    270:280:int getFireOdds(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    285:285:boolean canBurn(net.minecraft.world.level.block.state.BlockState) -> e
+    290:293:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    296:296:int getFireTickDelay(java.util.Random) -> a
+    301:302:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    305:307:void setFlammable(net.minecraft.world.level.block.Block,int,int) -> a
+    310:439:void bootStrap() -> c
+    37:37:boolean lambda$static$0(java.util.Map$Entry) -> a
+    29:37:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.FletchingTableBlock -> bxw:
+    13:14:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     18:18:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-net.minecraft.world.level.block.FlowerBlock -> brl:
+net.minecraft.world.level.block.FlowerBlock -> bxx:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
     net.minecraft.world.effect.MobEffect suspiciousStewEffect -> b
     int effectDuration -> c
-    19:26:void <init>(net.minecraft.world.effect.MobEffect,int,net.minecraft.world.level.block.Block$Properties) -> <init>
-    30:31:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    36:36:net.minecraft.world.level.block.Block$OffsetType getOffsetType() -> X_
+    19:26:void <init>(net.minecraft.world.effect.MobEffect,int,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    30:31:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    36:36:net.minecraft.world.level.block.state.BlockBehaviour$OffsetType getOffsetType() -> aj_
     40:40:net.minecraft.world.effect.MobEffect getSuspiciousStewEffect() -> c
     44:44:int getEffectDuration() -> d
     14:14:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.FlowerPotBlock -> brm:
+net.minecraft.world.level.block.FlowerPotBlock -> bxy:
     java.util.Map POTTED_BY_CONTENT -> b
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
     net.minecraft.world.level.block.Block content -> c
-    32:36:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block$Properties) -> <init>
-    40:40:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    45:45:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    50:77:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    82:85:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    90:94:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    98:98:net.minecraft.world.level.block.Block getContent() -> c
-    24:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.FrostedIceBlock -> brn:
+    33:37:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    41:41:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    46:46:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    51:78:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    83:86:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    91:95:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    99:99:net.minecraft.world.level.block.Block getContent() -> c
+    104:104:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    25:28:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.FrostedIceBlock -> bxz:
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
-    25:27:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    31:46:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    49:55:boolean slightlyMelt(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> e
-    61:68:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    71:83:boolean fewerNeigboursThan(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,int) -> a
-    88:89:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    93:93:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    25:27:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    32:33:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    37:51:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    54:60:boolean slightlyMelt(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> e
+    66:73:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    76:87:boolean fewerNeigboursThan(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,int) -> a
+    92:93:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    97:97:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.FurnaceBlock -> bro:
-    21:22:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.FungusBlock -> bya:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
+    java.util.function.Supplier feature -> b
+    24:26:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,java.util.function.Supplier) -> <init>
+    30:30:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    35:35:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    40:43:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    48:48:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    53:54:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.FurnaceBlock -> byb:
+    21:22:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     26:26:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     31:36:void openContainer(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
     40:64:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-net.minecraft.world.level.block.GlassBlock -> brp:
-    5:6:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-net.minecraft.world.level.block.GlazedTerracottaBlock -> brq:
-    10:11:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.GlassBlock -> byc:
+    5:6:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+net.minecraft.world.level.block.GlazedTerracottaBlock -> byd:
+    10:11:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     15:16:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     20:20:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    25:25:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
-net.minecraft.world.level.block.GrassBlock -> brr:
-    17:18:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    25:25:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
+net.minecraft.world.level.block.GrassBlock -> bye:
+    17:18:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     22:22:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
     27:27:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     32:73:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.level.block.GrassPathBlock -> brs:
+net.minecraft.world.level.block.GrassPathBlock -> byf:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    21:22:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    26:26:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
+    21:22:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    26:26:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
     31:34:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     39:44:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     49:50:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
     54:55:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    60:60:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    60:60:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     65:65:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    70:70:boolean isViewBlocking(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> f
     18:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.GravelBlock -> brt:
-    7:8:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    12:12:int getDustColor(net.minecraft.world.level.block.state.BlockState) -> i
-net.minecraft.world.level.block.GrindstoneBlock -> bru:
+net.minecraft.world.level.block.GravelBlock -> byg:
+    9:10:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    14:14:int getDustColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+net.minecraft.world.level.block.GrindstoneBlock -> byh:
     net.minecraft.world.phys.shapes.VoxelShape FLOOR_NORTH_SOUTH_LEFT_POST -> a
     net.minecraft.world.phys.shapes.VoxelShape FLOOR_NORTH_SOUTH_RIGHT_POST -> b
     net.minecraft.world.phys.shapes.VoxelShape FLOOR_NORTH_SOUTH_LEFT_PIVOT -> c
@@ -54055,65 +58978,65 @@ net.minecraft.world.level.block.GrindstoneBlock -> bru:
     net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_LEFT_POST -> i
     net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_RIGHT_POST -> j
     net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_LEFT_PIVOT -> k
-    net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_RIGHT_PIVOT -> w
-    net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_LEFT_LEG -> x
-    net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_RIGHT_LEG -> y
-    net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_ALL_LEGS -> z
-    net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_GRINDSTONE -> A
-    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_LEFT_POST -> B
-    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_RIGHT_POST -> D
-    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_LEFT_PIVOT -> E
-    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_RIGHT_PIVOT -> F
-    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_LEFT_LEG -> G
-    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_RIGHT_LEG -> H
-    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_ALL_LEGS -> I
-    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_GRINDSTONE -> J
-    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_LEFT_POST -> K
-    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_RIGHT_POST -> L
-    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_LEFT_PIVOT -> M
-    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_RIGHT_PIVOT -> N
-    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_LEFT_LEG -> O
-    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_RIGHT_LEG -> P
-    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_ALL_LEGS -> Q
-    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_GRINDSTONE -> R
-    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_LEFT_POST -> S
-    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_RIGHT_POST -> T
-    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_LEFT_PIVOT -> U
-    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_RIGHT_PIVOT -> V
-    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_LEFT_LEG -> W
-    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_RIGHT_LEG -> X
-    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_ALL_LEGS -> Y
-    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_GRINDSTONE -> Z
-    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_LEFT_POST -> aa
-    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_RIGHT_POST -> ab
-    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_LEFT_PIVOT -> ac
-    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_RIGHT_PIVOT -> ad
-    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_LEFT_LEG -> ae
-    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_RIGHT_LEG -> af
-    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_ALL_LEGS -> ag
-    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_GRINDSTONE -> ah
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_LEFT_POST -> ai
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_RIGHT_POST -> aj
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_LEFT_PIVOT -> ak
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_RIGHT_PIVOT -> al
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_LEFT_LEG -> am
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_RIGHT_LEG -> an
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_ALL_LEGS -> ao
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_GRINDSTONE -> ap
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_LEFT_POST -> aq
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_RIGHT_POST -> ar
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_LEFT_PIVOT -> as
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_RIGHT_PIVOT -> at
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_LEFT_LEG -> au
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_RIGHT_LEG -> av
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_ALL_LEGS -> aw
-    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_GRINDSTONE -> ax
-    net.minecraft.network.chat.TranslatableComponent CONTAINER_TITLE -> az
-    103:105:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    109:109:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    113:142:net.minecraft.world.phys.shapes.VoxelShape getVoxelShape(net.minecraft.world.level.block.state.BlockState) -> i
-    147:147:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    152:152:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_RIGHT_PIVOT -> o
+    net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_LEFT_LEG -> p
+    net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_RIGHT_LEG -> q
+    net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_ALL_LEGS -> r
+    net.minecraft.world.phys.shapes.VoxelShape FLOOR_EAST_WEST_GRINDSTONE -> s
+    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_LEFT_POST -> t
+    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_RIGHT_POST -> v
+    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_LEFT_PIVOT -> w
+    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_RIGHT_PIVOT -> x
+    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_LEFT_LEG -> y
+    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_RIGHT_LEG -> z
+    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_ALL_LEGS -> A
+    net.minecraft.world.phys.shapes.VoxelShape WALL_SOUTH_GRINDSTONE -> B
+    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_LEFT_POST -> C
+    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_RIGHT_POST -> D
+    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_LEFT_PIVOT -> E
+    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_RIGHT_PIVOT -> F
+    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_LEFT_LEG -> G
+    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_RIGHT_LEG -> H
+    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_ALL_LEGS -> I
+    net.minecraft.world.phys.shapes.VoxelShape WALL_NORTH_GRINDSTONE -> J
+    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_LEFT_POST -> K
+    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_RIGHT_POST -> L
+    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_LEFT_PIVOT -> M
+    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_RIGHT_PIVOT -> N
+    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_LEFT_LEG -> O
+    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_RIGHT_LEG -> P
+    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_ALL_LEGS -> Q
+    net.minecraft.world.phys.shapes.VoxelShape WALL_WEST_GRINDSTONE -> R
+    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_LEFT_POST -> S
+    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_RIGHT_POST -> T
+    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_LEFT_PIVOT -> U
+    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_RIGHT_PIVOT -> V
+    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_LEFT_LEG -> W
+    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_RIGHT_LEG -> X
+    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_ALL_LEGS -> Y
+    net.minecraft.world.phys.shapes.VoxelShape WALL_EAST_GRINDSTONE -> Z
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_LEFT_POST -> aa
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_RIGHT_POST -> ab
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_LEFT_PIVOT -> ac
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_RIGHT_PIVOT -> ad
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_LEFT_LEG -> ae
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_RIGHT_LEG -> af
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_ALL_LEGS -> ag
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_NORTH_SOUTH_GRINDSTONE -> ah
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_LEFT_POST -> ai
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_RIGHT_POST -> aj
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_LEFT_PIVOT -> ak
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_RIGHT_PIVOT -> al
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_LEFT_LEG -> am
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_RIGHT_LEG -> an
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_ALL_LEGS -> ao
+    net.minecraft.world.phys.shapes.VoxelShape CEILING_EAST_WEST_GRINDSTONE -> ap
+    net.minecraft.network.chat.TranslatableComponent CONTAINER_TITLE -> aD
+    103:105:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    109:109:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    113:142:net.minecraft.world.phys.shapes.VoxelShape getVoxelShape(net.minecraft.world.level.block.state.BlockState) -> l
+    147:147:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    152:152:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     157:157:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     162:168:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     173:173:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
@@ -54123,20 +59046,58 @@ net.minecraft.world.level.block.GrindstoneBlock -> bru:
     193:193:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     173:173:net.minecraft.world.inventory.AbstractContainerMenu lambda$getMenuProvider$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
     28:100:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.GrindstoneBlock$1 -> bru$1:
+net.minecraft.world.level.block.GrindstoneBlock$1 -> byh$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$AttachFace -> a
     114:114:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.HalfTransparentBlock -> brv:
-    8:9:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.GrowingPlantBlock -> byi:
+    net.minecraft.core.Direction growthDirection -> a
+    boolean scheduleFluidTicks -> b
+    net.minecraft.world.phys.shapes.VoxelShape shape -> c
+    17:21:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,net.minecraft.core.Direction,net.minecraft.world.phys.shapes.VoxelShape,boolean) -> <init>
+    25:32:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    36:36:boolean canAttachToBlock(net.minecraft.world.level.block.Block) -> c
+    41:41:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    net.minecraft.world.level.block.GrowingPlantHeadBlock getHeadBlock() -> c
+    net.minecraft.world.level.block.Block getBodyBlock() -> d
+net.minecraft.world.level.block.GrowingPlantBodyBlock -> byj:
+    20:21:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,net.minecraft.core.Direction,net.minecraft.world.phys.shapes.VoxelShape,boolean) -> <init>
+    25:28:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    32:48:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    54:54:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    59:60:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    65:65:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    70:76:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    79:89:java.util.Optional getHeadPos(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    95:99:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
+    104:104:net.minecraft.world.level.block.Block getBodyBlock() -> d
+net.minecraft.world.level.block.GrowingPlantHeadBlock -> byk:
+    net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> d
+    double growPerTickProbability -> e
+    25:28:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,net.minecraft.core.Direction,net.minecraft.world.phys.shapes.VoxelShape,boolean,double) -> <init>
+    31:31:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.level.LevelAccessor) -> a
+    36:39:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    43:43:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    48:54:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    58:68:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    73:74:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    78:78:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    83:83:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    88:101:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    int getBlocksToGrowWhenBonemealed(java.util.Random) -> a
+    boolean canGrowInto(net.minecraft.world.level.block.state.BlockState) -> h
+    109:109:net.minecraft.world.level.block.GrowingPlantHeadBlock getHeadBlock() -> c
+    19:19:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.HalfTransparentBlock -> byl:
+    8:9:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     13:16:boolean skipRendering(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
-net.minecraft.world.level.block.HayBlock -> brw:
-    10:12:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.HayBlock -> bym:
+    10:12:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     16:17:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
-net.minecraft.world.level.block.HoneyBlock -> brx:
+net.minecraft.world.level.block.HoneyBlock -> byn:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    64:65:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    64:65:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     69:69:boolean doesEntityDoHoneyBlockSlideEffects(net.minecraft.world.entity.Entity) -> c
-    77:77:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    77:77:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
     82:93:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
     97:103:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
     106:122:boolean isSlidingDown(net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
@@ -54145,9 +59106,9 @@ net.minecraft.world.level.block.HoneyBlock -> brx:
     151:162:void maybeDoSlideEffects(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity) -> a
     165:166:void showSlideParticles(net.minecraft.world.entity.Entity) -> a
     169:170:void showJumpParticles(net.minecraft.world.entity.Entity) -> b
-    173:185:void showParticles(net.minecraft.world.entity.Entity,int) -> a
+    173:182:void showParticles(net.minecraft.world.entity.Entity,int) -> a
     61:61:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.HopperBlock -> bry:
+net.minecraft.world.level.block.HopperBlock -> byo:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty ENABLED -> b
     net.minecraft.world.phys.shapes.VoxelShape TOP -> c
@@ -54159,14 +59120,14 @@ net.minecraft.world.level.block.HopperBlock -> bry:
     net.minecraft.world.phys.shapes.VoxelShape NORTH_SHAPE -> i
     net.minecraft.world.phys.shapes.VoxelShape SOUTH_SHAPE -> j
     net.minecraft.world.phys.shapes.VoxelShape WEST_SHAPE -> k
-    net.minecraft.world.phys.shapes.VoxelShape DOWN_INTERACTION_SHAPE -> w
-    net.minecraft.world.phys.shapes.VoxelShape EAST_INTERACTION_SHAPE -> x
-    net.minecraft.world.phys.shapes.VoxelShape NORTH_INTERACTION_SHAPE -> y
-    net.minecraft.world.phys.shapes.VoxelShape SOUTH_INTERACTION_SHAPE -> z
-    net.minecraft.world.phys.shapes.VoxelShape WEST_INTERACTION_SHAPE -> A
-    55:57:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    61:73:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    78:90:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> j
+    net.minecraft.world.phys.shapes.VoxelShape DOWN_INTERACTION_SHAPE -> o
+    net.minecraft.world.phys.shapes.VoxelShape EAST_INTERACTION_SHAPE -> p
+    net.minecraft.world.phys.shapes.VoxelShape NORTH_INTERACTION_SHAPE -> q
+    net.minecraft.world.phys.shapes.VoxelShape SOUTH_INTERACTION_SHAPE -> r
+    net.minecraft.world.phys.shapes.VoxelShape WEST_INTERACTION_SHAPE -> s
+    55:57:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    61:73:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    78:90:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
     95:96:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     101:101:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     106:112:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
@@ -54175,8 +59136,8 @@ net.minecraft.world.level.block.HopperBlock -> bry:
     139:140:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
     143:147:void checkPoweredState(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     151:162:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    166:166:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    171:171:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
+    166:166:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    171:171:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
     176:176:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     181:181:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     186:186:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
@@ -54184,16 +59145,16 @@ net.minecraft.world.level.block.HopperBlock -> bry:
     196:200:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
     204:204:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     33:52:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.HopperBlock$1 -> bry$1:
+net.minecraft.world.level.block.HopperBlock$1 -> byo$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     61:61:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.HorizontalDirectionalBlock -> brz:
-    net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> ay
-    11:12:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.HorizontalDirectionalBlock -> byp:
+    net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> aq
+    11:12:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     16:16:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     21:21:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     8:8:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.HugeMushroomBlock -> bsa:
+net.minecraft.world.level.block.HugeMushroomBlock -> byq:
     net.minecraft.world.level.block.state.properties.BooleanProperty NORTH -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty EAST -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty SOUTH -> c
@@ -54201,91 +59162,93 @@ net.minecraft.world.level.block.HugeMushroomBlock -> bsa:
     net.minecraft.world.level.block.state.properties.BooleanProperty UP -> e
     net.minecraft.world.level.block.state.properties.BooleanProperty DOWN -> f
     java.util.Map PROPERTY_BY_DIRECTION -> g
-    25:27:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    25:27:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     31:40:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     46:49:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     54:60:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     66:72:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     78:79:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     15:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.IceBlock -> bsb:
-    23:24:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    28:41:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
-    45:48:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    51:58:void melt(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
-    62:62:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
-    67:67:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-net.minecraft.world.level.block.InfestedBlock -> bsc:
+net.minecraft.world.level.block.IceBlock -> byr:
+    21:22:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    26:39:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
+    43:46:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    49:56:void melt(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
+    60:60:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
+net.minecraft.world.level.block.InfestedBlock -> bys:
     net.minecraft.world.level.block.Block hostBlock -> a
     java.util.Map BLOCK_BY_HOST_BLOCK -> b
-    22:25:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block$Properties) -> <init>
-    28:28:net.minecraft.world.level.block.Block getHostBlock() -> c
-    32:32:boolean isCompatibleHostBlock(net.minecraft.world.level.block.state.BlockState) -> h
-    37:47:void spawnAfterBreak(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    50:50:net.minecraft.world.level.block.state.BlockState stateByHostBlock(net.minecraft.world.level.block.Block) -> d
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.IronBarsBlock -> bsd:
-    15:17:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    21:40:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    46:52:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    57:65:boolean skipRendering(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
-    69:70:boolean attachsTo(net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    75:76:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-net.minecraft.world.level.block.JigsawBlock -> bse:
-    22:24:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    28:29:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    33:33:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    38:38:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    44:44:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    49:56:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    60:60:boolean canAttach(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo) -> a
-net.minecraft.world.level.block.JukeboxBlock -> bsf:
-    net.minecraft.world.level.block.state.properties.BooleanProperty HAS_RECORD -> a
-    27:29:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    33:42:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    46:53:void setRecord(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.ItemStack) -> a
-    56:84:void dropRecording(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    88:93:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    97:97:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    102:102:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    107:115:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    120:120:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    125:126:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    23:26:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    29:29:net.minecraft.world.level.block.Block getHostBlock() -> c
+    33:33:boolean isCompatibleHostBlock(net.minecraft.world.level.block.state.BlockState) -> h
+    37:42:void spawnInfestation(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    46:52:void spawnAfterBreak(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    56:59:void wasExploded(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.Explosion) -> a
+    62:62:net.minecraft.world.level.block.state.BlockState stateByHostBlock(net.minecraft.world.level.block.Block) -> c
+    20:20:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.IronBarsBlock -> byt:
+    19:21:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    25:44:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    50:56:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    61:61:net.minecraft.world.phys.shapes.VoxelShape getVisualShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    66:74:boolean skipRendering(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
+    78:79:boolean attachsTo(net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    84:85:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+net.minecraft.world.level.block.JigsawBlock -> byu:
+    net.minecraft.world.level.block.state.properties.EnumProperty ORIENTATION -> a
+    27:29:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    33:34:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    38:38:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    43:43:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    48:56:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    62:62:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    67:74:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    78:90:boolean canAttach(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo) -> a
+    94:94:net.minecraft.core.Direction getFrontFacing(net.minecraft.world.level.block.state.BlockState) -> h
+    98:98:net.minecraft.core.Direction getTopFacing(net.minecraft.world.level.block.state.BlockState) -> l
+    85:85:net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType lambda$canAttach$0(net.minecraft.core.Direction) -> a
     24:24:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.KelpBlock -> bsg:
-    net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
-    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
-    31:33:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    37:37:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    43:47:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    51:51:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.level.LevelAccessor) -> a
-    56:56:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    61:71:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    75:82:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    87:99:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    104:105:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    109:109:boolean canPlaceLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
-    114:114:boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
-    25:28:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.KelpPlantBlock -> bsh:
-    net.minecraft.world.level.block.KelpBlock top -> a
-    21:23:void <init>(net.minecraft.world.level.block.KelpBlock,net.minecraft.world.level.block.Block$Properties) -> <init>
-    27:27:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    32:37:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    41:54:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    59:62:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    67:67:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    72:72:boolean canPlaceLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
-    77:77:boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
-net.minecraft.world.level.block.LadderBlock -> bsi:
+net.minecraft.world.level.block.JukeboxBlock -> byv:
+    net.minecraft.world.level.block.state.properties.BooleanProperty HAS_RECORD -> a
+    32:34:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    38:46:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    50:59:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    63:70:void setRecord(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.ItemStack) -> a
+    73:101:void dropRecording(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    105:110:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    114:114:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    119:119:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    124:132:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    137:137:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    142:143:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    29:29:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.KelpBlock -> byw:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> e
+    23:24:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    28:28:boolean canGrowInto(net.minecraft.world.level.block.state.BlockState) -> h
+    33:33:net.minecraft.world.level.block.Block getBodyBlock() -> d
+    38:38:boolean canAttachToBlock(net.minecraft.world.level.block.Block) -> c
+    43:43:boolean canPlaceLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
+    48:48:boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
+    53:53:int getBlocksToGrowWhenBonemealed(java.util.Random) -> a
+    59:63:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    68:68:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    19:19:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.KelpPlantBlock -> byx:
+    15:16:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    20:20:net.minecraft.world.level.block.GrowingPlantHeadBlock getHeadBlock() -> c
+    25:25:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    30:30:boolean canPlaceLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
+    35:35:boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
+net.minecraft.world.level.block.LadderBlock -> byy:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> b
     net.minecraft.world.phys.shapes.VoxelShape EAST_AABB -> c
     net.minecraft.world.phys.shapes.VoxelShape WEST_AABB -> d
     net.minecraft.world.phys.shapes.VoxelShape SOUTH_AABB -> e
     net.minecraft.world.phys.shapes.VoxelShape NORTH_AABB -> f
-    31:33:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    37:46:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    31:33:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    37:46:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     51:52:boolean canAttachTo(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
     57:58:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     63:70:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
@@ -54293,43 +59256,42 @@ net.minecraft.world.level.block.LadderBlock -> bsi:
     104:104:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     109:109:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     114:115:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    119:122:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
+    119:122:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
     22:28:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.LadderBlock$1 -> bsi$1:
+net.minecraft.world.level.block.LadderBlock$1 -> byy$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     37:37:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.Lantern -> bsj:
+net.minecraft.world.level.block.Lantern -> byz:
     net.minecraft.world.level.block.state.properties.BooleanProperty HANGING -> a
     net.minecraft.world.phys.shapes.VoxelShape AABB -> b
     net.minecraft.world.phys.shapes.VoxelShape HANGING_AABB -> c
-    28:30:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    28:30:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     35:46:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    51:51:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    51:51:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     56:57:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     61:62:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     66:66:net.minecraft.core.Direction getConnectedDirection(net.minecraft.world.level.block.state.BlockState) -> h
-    71:71:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
+    71:71:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
     76:79:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     84:84:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     22:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.LeavesBlock -> bsk:
+net.minecraft.world.level.block.LeavesBlock -> bza:
     net.minecraft.world.level.block.state.properties.IntegerProperty DISTANCE -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty PERSISTENT -> b
-    30:32:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    36:36:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> l
-    41:45:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
-    49:50:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    54:54:int getLightBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> l
-    59:63:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    67:77:net.minecraft.world.level.block.state.BlockState updateDistance(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    81:87:int getDistanceAt(net.minecraft.world.level.block.state.BlockState) -> h
-    92:111:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    115:115:boolean isSuffocating(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
-    120:120:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-    125:126:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    130:130:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    24:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.LecternBlock -> bsl:
+    31:33:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    37:37:net.minecraft.world.phys.shapes.VoxelShape getBlockSupportShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> e
+    42:42:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    47:51:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    55:56:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    60:60:int getLightBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> f
+    65:69:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    73:82:net.minecraft.world.level.block.state.BlockState updateDistance(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    86:92:int getDistanceAt(net.minecraft.world.level.block.state.BlockState) -> h
+    97:116:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    120:121:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    125:125:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    25:26:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.LecternBlock -> bzb:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty HAS_BOOK -> c
@@ -54341,43 +59303,43 @@ net.minecraft.world.level.block.LecternBlock -> bsl:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE_WEST -> i
     net.minecraft.world.phys.shapes.VoxelShape SHAPE_NORTH -> j
     net.minecraft.world.phys.shapes.VoxelShape SHAPE_EAST -> k
-    net.minecraft.world.phys.shapes.VoxelShape SHAPE_SOUTH -> w
-    77:79:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    83:83:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    88:88:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> i
-    93:93:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
-    98:98:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    103:103:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    108:118:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    124:124:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    129:129:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    134:135:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    140:140:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    144:151:boolean tryPlaceBook(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.ItemStack) -> a
-    155:162:void placeBook(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.ItemStack) -> b
-    165:167:void resetBookState(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    170:173:void signalPageChange(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    176:178:void changePowered(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    181:182:void updateBelow(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    186:187:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    191:204:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    207:221:void popBook(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
-    225:225:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
-    230:230:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    235:235:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    240:240:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    245:252:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    257:271:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    277:281:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-    285:290:void openScreen(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    294:294:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    37:70:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.LecternBlock$1 -> bsl$1:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE_SOUTH -> o
+    79:81:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    85:85:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    90:90:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
+    95:95:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
+    100:112:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    117:117:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    122:132:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    138:138:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    143:143:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    148:149:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    154:154:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    158:165:boolean tryPlaceBook(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.ItemStack) -> a
+    169:176:void placeBook(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.ItemStack) -> b
+    179:181:void resetBookState(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    184:187:void signalPageChange(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    190:192:void changePowered(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    195:196:void updateBelow(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    200:201:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    205:218:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    221:235:void popBook(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
+    239:239:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
+    244:244:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    249:249:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    254:254:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    259:266:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    271:285:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    291:295:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
+    299:304:void openScreen(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    308:308:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    39:72:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.LecternBlock$1 -> bzb$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    108:108:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.LevelEvent -> bsm:
+    122:122:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.LevelEvent -> bzc:
     3:3:void <init>() -> <init>
-net.minecraft.world.level.block.LeverBlock -> bsn:
+net.minecraft.world.level.block.LeverBlock -> bzd:
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> a
     net.minecraft.world.phys.shapes.VoxelShape NORTH_AABB -> b
     net.minecraft.world.phys.shapes.VoxelShape SOUTH_AABB -> c
@@ -54387,8 +59349,8 @@ net.minecraft.world.level.block.LeverBlock -> bsn:
     net.minecraft.world.phys.shapes.VoxelShape UP_AABB_X -> g
     net.minecraft.world.phys.shapes.VoxelShape DOWN_AABB_Z -> h
     net.minecraft.world.phys.shapes.VoxelShape DOWN_AABB_X -> i
-    45:47:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    51:79:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    45:47:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    51:79:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     87:100:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     107:110:net.minecraft.world.level.block.state.BlockState pull(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
     114:121:void makeParticle(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,float) -> a
@@ -54396,122 +59358,117 @@ net.minecraft.world.level.block.LeverBlock -> bsn:
     132:139:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
     143:143:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
     148:151:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    156:156:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
+    156:156:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
     161:163:void updateNeighbours(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> e
     167:168:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     27:42:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.LeverBlock$1 -> bsn$1:
+net.minecraft.world.level.block.LeverBlock$1 -> bzd$1:
     int[] $SwitchMap$net$minecraft$core$Direction$Axis -> a
     int[] $SwitchMap$net$minecraft$core$Direction -> b
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$AttachFace -> c
     51:61:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.LiquidBlock -> bso:
+net.minecraft.world.level.block.LiquidBlock -> bze:
     net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL -> a
     net.minecraft.world.level.material.FlowingFluid fluid -> b
-    java.util.List stateCache -> c
-    40:49:void <init>(net.minecraft.world.level.material.FlowingFluid,net.minecraft.world.level.block.Block$Properties) -> <init>
-    53:54:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
-    58:58:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    63:63:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    68:69:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    74:74:boolean skipRendering(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
-    79:79:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    84:84:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
-    89:89:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    94:94:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    99:102:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    106:110:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    115:118:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    121:143:boolean shouldSpreadLiquid(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    147:148:void fizz(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    152:153:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    157:161:net.minecraft.world.level.material.Fluid takeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    166:169:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    34:34:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.LiquidBlockContainer -> bsp:
+    java.util.List stateCache -> d
+    net.minecraft.world.phys.shapes.VoxelShape STABLE_SHAPE -> c
+    41:50:void <init>(net.minecraft.world.level.material.FlowingFluid,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    55:58:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    63:63:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    68:69:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    73:73:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    78:78:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    83:84:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    89:89:boolean skipRendering(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
+    94:94:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    99:99:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
+    104:104:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    109:112:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    116:120:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    125:128:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    131:154:boolean shouldSpreadLiquid(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    158:159:void fizz(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    163:164:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    168:172:net.minecraft.world.level.material.Fluid takeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    177:185:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    33:38:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.LiquidBlockContainer -> bzf:
     boolean canPlaceLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
     boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
-net.minecraft.world.level.block.LogBlock -> bsq:
-    net.minecraft.world.level.material.MaterialColor woodMaterialColor -> b
-    13:15:void <init>(net.minecraft.world.level.material.MaterialColor,net.minecraft.world.level.block.Block$Properties) -> <init>
-    19:19:net.minecraft.world.level.material.MaterialColor getMapColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> e
-net.minecraft.world.level.block.LoomBlock -> bsr:
+net.minecraft.world.level.block.LoomBlock -> bzg:
     net.minecraft.network.chat.TranslatableComponent CONTAINER_TITLE -> a
-    23:24:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    23:24:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     28:34:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     39:39:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
     44:44:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     49:50:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     39:39:net.minecraft.world.inventory.AbstractContainerMenu lambda$getMenuProvider$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.MagmaBlock -> bss:
-    25:26:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    30:35:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    39:39:boolean emissiveRendering(net.minecraft.world.level.block.state.BlockState) -> m
-    44:45:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    49:53:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    58:63:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
-    67:67:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    72:73:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    77:77:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-    82:82:boolean hasPostProcess(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> h
-net.minecraft.world.level.block.MelonBlock -> bst:
-    5:6:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.MagmaBlock -> bzh:
+    24:25:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    29:34:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    38:39:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    43:47:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    52:57:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    61:62:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+net.minecraft.world.level.block.MelonBlock -> bzi:
+    5:6:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     10:10:net.minecraft.world.level.block.StemBlock getStem() -> c
     15:15:net.minecraft.world.level.block.AttachedStemBlock getAttachedStem() -> d
-net.minecraft.world.level.block.Mirror -> bsu:
+net.minecraft.world.level.block.Mirror -> bzj:
     net.minecraft.world.level.block.Mirror NONE -> a
     net.minecraft.world.level.block.Mirror LEFT_RIGHT -> b
     net.minecraft.world.level.block.Mirror FRONT_BACK -> c
-    net.minecraft.world.level.block.Mirror[] $VALUES -> d
-    5:5:net.minecraft.world.level.block.Mirror[] values() -> values
-    5:5:net.minecraft.world.level.block.Mirror valueOf(java.lang.String) -> valueOf
-    5:5:void <init>(java.lang.String,int) -> <init>
-    12:20:int mirror(int,int) -> a
-    25:26:net.minecraft.world.level.block.Rotation getRotation(net.minecraft.core.Direction) -> a
-    30:36:net.minecraft.core.Direction mirror(net.minecraft.core.Direction) -> b
-    5:8:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.Mirror$1 -> bsu$1:
+    com.mojang.math.OctahedralGroup rotation -> d
+    net.minecraft.world.level.block.Mirror[] $VALUES -> e
+    7:7:net.minecraft.world.level.block.Mirror[] values() -> values
+    7:7:net.minecraft.world.level.block.Mirror valueOf(java.lang.String) -> valueOf
+    15:17:void <init>(java.lang.String,int,com.mojang.math.OctahedralGroup) -> <init>
+    20:28:int mirror(int,int) -> a
+    33:34:net.minecraft.world.level.block.Rotation getRotation(net.minecraft.core.Direction) -> a
+    38:44:net.minecraft.core.Direction mirror(net.minecraft.core.Direction) -> b
+    48:48:com.mojang.math.OctahedralGroup rotation() -> a
+    7:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.Mirror$1 -> bzj$1:
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> a
-    14:14:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.MushroomBlock -> bsv:
+    22:22:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.MushroomBlock -> bzk:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    23:24:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    28:28:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    33:55:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    59:59:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
-    64:71:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    75:92:boolean growMushroom(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    97:97:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    102:102:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    107:108:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    112:112:boolean hasPostProcess(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> h
+    23:24:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    28:28:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    33:55:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    59:59:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    64:70:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    74:91:boolean growMushroom(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    96:96:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    101:101:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    106:107:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.MyceliumBlock -> bsw:
-    12:13:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.MyceliumBlock -> bzl:
+    12:13:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     17:21:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-net.minecraft.world.level.block.NetherPortalBlock -> bsx:
+net.minecraft.world.level.block.NetherPortalBlock -> bzm:
     net.minecraft.world.level.block.state.properties.EnumProperty AXIS -> a
     net.minecraft.world.phys.shapes.VoxelShape X_AXIS_AABB -> b
     net.minecraft.world.phys.shapes.VoxelShape Z_AXIS_AABB -> c
-    44:46:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    50:55:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    61:73:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    76:82:boolean trySpawnPortal(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    87:97:net.minecraft.world.level.block.NetherPortalBlock$PortalShape isPortal(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
-    102:110:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    115:118:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    122:145:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    149:149:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    154:166:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    172:173:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    176:212:net.minecraft.world.level.block.state.pattern.BlockPattern$BlockPatternMatch getPortalShape(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> c
-    31:35:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.NetherPortalBlock$1 -> bsx$1:
+    45:47:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    51:56:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    62:74:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    77:83:boolean trySpawnPortal(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    88:98:net.minecraft.world.level.block.NetherPortalBlock$PortalShape isPortal(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
+    103:111:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    116:119:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    123:146:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    150:150:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    155:167:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    173:174:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    177:213:net.minecraft.world.level.block.state.pattern.BlockPattern$BlockPatternMatch getPortalShape(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> c
+    32:36:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.NetherPortalBlock$1 -> bzm$1:
     int[] $SwitchMap$net$minecraft$core$Direction$Axis -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> b
-    50:154:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.NetherPortalBlock$PortalShape -> bsx$a:
+    51:155:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.NetherPortalBlock$PortalShape -> bzm$a:
     net.minecraft.world.level.LevelAccessor level -> a
     net.minecraft.core.Direction$Axis axis -> b
     net.minecraft.core.Direction rightDir -> c
@@ -54520,34 +59477,51 @@ net.minecraft.world.level.block.NetherPortalBlock$PortalShape -> bsx$a:
     net.minecraft.core.BlockPos bottomLeft -> f
     int height -> g
     int width -> h
-    226:258:void <init>(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.Direction$Axis) -> <init>
-    262:278:int getDistanceUntilEdge(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    227:259:void <init>(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.Direction$Axis) -> <init>
+    263:278:int getDistanceUntilEdge(net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
     282:282:int getHeight() -> a
     286:286:int getWidth() -> b
-    291:332:int calculatePortalHeight() -> c
-    337:338:boolean isEmpty(net.minecraft.world.level.block.state.BlockState) -> a
-    342:342:boolean isValid() -> d
-    346:352:void createPortalBlocks() -> e
-    355:355:boolean hasAllPortalBlocks() -> g
-    359:359:boolean isComplete() -> f
-    215:215:int access$000(net.minecraft.world.level.block.NetherPortalBlock$PortalShape) -> a
-    215:215:net.minecraft.core.Direction access$100(net.minecraft.world.level.block.NetherPortalBlock$PortalShape) -> b
-    215:215:net.minecraft.core.BlockPos access$200(net.minecraft.world.level.block.NetherPortalBlock$PortalShape) -> c
-net.minecraft.world.level.block.NetherWartBlock -> bsy:
+    291:329:int calculatePortalHeight() -> c
+    334:334:boolean isEmpty(net.minecraft.world.level.block.state.BlockState) -> a
+    338:338:boolean isValid() -> d
+    342:348:void createPortalBlocks() -> e
+    351:351:boolean hasAllPortalBlocks() -> g
+    355:355:boolean isComplete() -> f
+    216:216:int access$000(net.minecraft.world.level.block.NetherPortalBlock$PortalShape) -> a
+    216:216:net.minecraft.core.Direction access$100(net.minecraft.world.level.block.NetherPortalBlock$PortalShape) -> b
+    216:216:net.minecraft.core.BlockPos access$200(net.minecraft.world.level.block.NetherPortalBlock$PortalShape) -> c
+net.minecraft.world.level.block.NetherSproutsBlock -> bzn:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
+    14:15:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    19:19:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    24:24:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    29:29:net.minecraft.world.level.block.state.BlockBehaviour$OffsetType getOffsetType() -> aj_
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.NetherVines -> bzo:
+    7:7:void <init>() -> <init>
+    12:12:boolean isValidGrowthState(net.minecraft.world.level.block.state.BlockState) -> a
+    16:22:int getBlocksToGrowWhenBonemealed(java.util.Random) -> a
+net.minecraft.world.level.block.NetherWartBlock -> bzp:
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
     net.minecraft.world.phys.shapes.VoxelShape[] SHAPE_BY_AGE -> b
-    29:31:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    35:35:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    40:40:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
-    45:52:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    56:56:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    61:62:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    29:31:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    35:35:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    40:40:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    45:45:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    50:55:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    59:59:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    64:65:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     19:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.NoteBlock -> bsz:
+net.minecraft.world.level.block.NetherrackBlock -> bzq:
+    14:15:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    19:28:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    33:33:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    38:62:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+net.minecraft.world.level.block.NoteBlock -> bzr:
     net.minecraft.world.level.block.state.properties.EnumProperty INSTRUMENT -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> b
     net.minecraft.world.level.block.state.properties.IntegerProperty NOTE -> c
-    29:31:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    29:31:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     35:35:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     40:43:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     48:56:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
@@ -54557,9 +59531,16 @@ net.minecraft.world.level.block.NoteBlock -> bsz:
     90:95:boolean triggerEvent(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,int) -> a
     100:101:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     24:26:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ObserverBlock -> bta:
+net.minecraft.world.level.block.NyliumBlock -> bzs:
+    20:21:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    24:29:boolean canBeNylium(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> b
+    34:37:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    41:41:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    46:46:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    51:62:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+net.minecraft.world.level.block.ObserverBlock -> bzt:
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> b
-    22:25:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    22:25:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     29:30:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     34:34:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     39:39:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
@@ -54567,18 +59548,18 @@ net.minecraft.world.level.block.ObserverBlock -> bta:
     55:59:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     63:66:void startSignal(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
     69:74:void updateNeighborsInFront(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    78:78:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
+    78:78:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
     83:83:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
     88:91:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
     96:106:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
     110:117:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
     121:121:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.OreBlock -> btb:
-    15:16:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    19:30:int xpOnDrop(java.util.Random) -> a
-    35:43:void spawnAfterBreak(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.level.block.PipeBlock -> btc:
+net.minecraft.world.level.block.OreBlock -> bzu:
+    15:16:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    19:32:int xpOnDrop(java.util.Random) -> a
+    37:45:void spawnAfterBreak(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.world.level.block.PipeBlock -> bzv:
     net.minecraft.core.Direction[] DIRECTIONS -> i
     net.minecraft.world.level.block.state.properties.BooleanProperty NORTH -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty EAST -> b
@@ -54588,34 +59569,34 @@ net.minecraft.world.level.block.PipeBlock -> btc:
     net.minecraft.world.level.block.state.properties.BooleanProperty DOWN -> f
     java.util.Map PROPERTY_BY_DIRECTION -> g
     net.minecraft.world.phys.shapes.VoxelShape[] shapeByIndex -> h
-    39:42:void <init>(float,net.minecraft.world.level.block.Block$Properties) -> <init>
+    39:42:void <init>(float,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     45:74:net.minecraft.world.phys.shapes.VoxelShape[] makeShapes(float) -> a
     79:79:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    84:84:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    84:84:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     88:94:int getAABBIndex(net.minecraft.world.level.block.state.BlockState) -> h
     28:34:void lambda$static$0(java.util.EnumMap) -> a
     18:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.PlayerHeadBlock -> btd:
-    22:23:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    27:47:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.level.block.PlayerWallHeadBlock -> bte:
-    15:16:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.PlayerHeadBlock -> bzw:
+    20:21:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    25:45:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.world.level.block.PlayerWallHeadBlock -> bzx:
+    15:16:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     20:21:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
     25:25:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
-net.minecraft.world.level.block.PotatoBlock -> btf:
+net.minecraft.world.level.block.PotatoBlock -> bzy:
     net.minecraft.world.phys.shapes.VoxelShape[] SHAPE_BY_AGE -> a
-    24:25:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    24:25:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     29:29:net.minecraft.world.level.ItemLike getBaseSeedId() -> e
-    34:34:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    34:34:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     12:20:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.PoweredBlock -> btg:
-    11:12:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    16:16:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
+net.minecraft.world.level.block.PoweredBlock -> bzz:
+    11:12:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    16:16:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
     21:21:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-net.minecraft.world.level.block.PoweredRailBlock -> bth:
+net.minecraft.world.level.block.PoweredRailBlock -> caa:
     net.minecraft.world.level.block.state.properties.EnumProperty SHAPE -> c
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> d
-    18:20:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    18:20:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     23:96:boolean findPoweredRailSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean,int) -> a
     100:121:boolean isSameRailWithPower(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean,int,net.minecraft.world.level.block.state.properties.RailShape) -> a
     126:140:void updateState(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
@@ -54624,26 +59605,26 @@ net.minecraft.world.level.block.PoweredRailBlock -> bth:
     222:263:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     268:269:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     14:15:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.PoweredRailBlock$1 -> bth$1:
+net.minecraft.world.level.block.PoweredRailBlock$1 -> caa$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$RailShape -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> b
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> c
     33:223:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.PressurePlateBlock -> bti:
+net.minecraft.world.level.block.PressurePlateBlock -> cab:
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> d
     net.minecraft.world.level.block.PressurePlateBlock$Sensitivity sensitivity -> e
-    30:33:void <init>(net.minecraft.world.level.block.PressurePlateBlock$Sensitivity,net.minecraft.world.level.block.Block$Properties) -> <init>
-    37:37:int getSignalForState(net.minecraft.world.level.block.state.BlockState) -> h
+    30:33:void <init>(net.minecraft.world.level.block.PressurePlateBlock$Sensitivity,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    37:37:int getSignalForState(net.minecraft.world.level.block.state.BlockState) -> g
     42:42:net.minecraft.world.level.block.state.BlockState setSignalForState(net.minecraft.world.level.block.state.BlockState,int) -> a
     47:52:void playOnSound(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
     56:61:void playOffSound(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
     65:87:int getSignalStrength(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
     92:93:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     21:21:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.PressurePlateBlock$1 -> bti$1:
+net.minecraft.world.level.block.PressurePlateBlock$1 -> cab$1:
     int[] $SwitchMap$net$minecraft$world$level$block$PressurePlateBlock$Sensitivity -> a
     68:68:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.PressurePlateBlock$Sensitivity -> bti$a:
+net.minecraft.world.level.block.PressurePlateBlock$Sensitivity -> cab$a:
     net.minecraft.world.level.block.PressurePlateBlock$Sensitivity EVERYTHING -> a
     net.minecraft.world.level.block.PressurePlateBlock$Sensitivity MOBS -> b
     net.minecraft.world.level.block.PressurePlateBlock$Sensitivity[] $VALUES -> c
@@ -54651,27 +59632,27 @@ net.minecraft.world.level.block.PressurePlateBlock$Sensitivity -> bti$a:
     23:23:net.minecraft.world.level.block.PressurePlateBlock$Sensitivity valueOf(java.lang.String) -> valueOf
     23:23:void <init>(java.lang.String,int) -> <init>
     23:24:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.PumpkinBlock -> btj:
-    19:20:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.PumpkinBlock -> cac:
+    19:20:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     24:54:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     59:59:net.minecraft.world.level.block.StemBlock getStem() -> c
     64:64:net.minecraft.world.level.block.AttachedStemBlock getAttachedStem() -> d
     48:48:void lambda$use$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
-net.minecraft.world.level.block.RailBlock -> btk:
+net.minecraft.world.level.block.RailBlock -> cad:
     net.minecraft.world.level.block.state.properties.EnumProperty SHAPE -> c
-    16:18:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    16:18:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     22:27:void updateState(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
     31:31:net.minecraft.world.level.block.state.properties.Property getShapeProperty() -> d
     36:103:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     109:150:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     155:156:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RailBlock$1 -> btk$1:
+net.minecraft.world.level.block.RailBlock$1 -> cad$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$RailShape -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> b
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> c
     36:110:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RailState -> btl:
+net.minecraft.world.level.block.RailState -> cae:
     net.minecraft.world.level.Level level -> a
     net.minecraft.core.BlockPos pos -> b
     net.minecraft.world.level.block.BaseRailBlock block -> c
@@ -54692,119 +59673,126 @@ net.minecraft.world.level.block.RailState -> btl:
     210:216:boolean hasNeighborRail(net.minecraft.core.BlockPos) -> d
     220:340:net.minecraft.world.level.block.RailState place(boolean,boolean,net.minecraft.world.level.block.state.properties.RailShape) -> a
     344:344:net.minecraft.world.level.block.state.BlockState getState() -> c
-net.minecraft.world.level.block.RailState$1 -> btl$1:
+net.minecraft.world.level.block.RailState$1 -> cae$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$RailShape -> a
     37:37:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RedStoneOreBlock -> btm:
+net.minecraft.world.level.block.RedStoneOreBlock -> caf:
     net.minecraft.world.level.block.state.properties.BooleanProperty LIT -> a
-    26:28:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    32:32:int getLightEmission(net.minecraft.world.level.block.state.BlockState) -> a
-    37:39:void attack(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    43:45:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    49:54:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    58:62:void interact(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
-    66:69:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    73:80:void spawnAfterBreak(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    84:87:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    90:105:void spawnParticles(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    109:110:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    23:23:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RedStoneWireBlock -> btn:
+    28:30:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    34:36:void attack(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    40:42:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    46:57:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    61:65:void interact(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
+    69:69:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    74:77:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    81:88:void spawnAfterBreak(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    92:95:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    98:113:void spawnParticles(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    117:118:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    25:25:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.RedStoneWireBlock -> cag:
     net.minecraft.world.level.block.state.properties.EnumProperty NORTH -> a
     net.minecraft.world.level.block.state.properties.EnumProperty EAST -> b
     net.minecraft.world.level.block.state.properties.EnumProperty SOUTH -> c
     net.minecraft.world.level.block.state.properties.EnumProperty WEST -> d
     net.minecraft.world.level.block.state.properties.IntegerProperty POWER -> e
     java.util.Map PROPERTY_BY_DIRECTION -> f
-    net.minecraft.world.phys.shapes.VoxelShape[] SHAPE_BY_INDEX -> g
-    boolean shouldSignal -> h
-    java.util.Set toUpdate -> i
-    73:79:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    83:83:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    87:105:int getAABBIndex(net.minecraft.world.level.block.state.BlockState) -> i
-    110:117:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    122:133:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    138:160:void updateIndirectNeighbourShapes(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> b
-    163:185:net.minecraft.world.level.block.state.properties.RedstoneSide getConnectingSide(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    190:192:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    196:204:net.minecraft.world.level.block.state.BlockState updatePowerStrength(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    208:250:net.minecraft.world.level.block.state.BlockState updatePowerStrengthImpl(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    254:262:void checkCornerChangeAt(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    266:289:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    293:319:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    322:329:int checkTarget(int,net.minecraft.world.level.block.state.BlockState) -> a
-    334:344:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    348:351:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    356:384:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    388:407:boolean isPowerSourceAt(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    411:411:boolean shouldConnectTo(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    415:415:boolean shouldConnectTo(net.minecraft.world.level.block.state.BlockState) -> h
-    419:433:boolean shouldConnectTo(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
-    438:438:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
-    442:460:int getColorForData(int) -> b
-    465:481:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    485:493:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    499:507:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    512:513:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    34:70:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RedStoneWireBlock$1 -> btn$1:
-    int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
-    int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> b
-    485:499:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RedstoneLampBlock -> bto:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE_DOT -> g
+    java.util.Map SHAPES_FLOOR -> h
+    java.util.Map SHAPES_UP -> i
+    java.util.Map SHAPES_CACHE -> j
+    com.mojang.math.Vector3f[] COLORS -> k
+    net.minecraft.world.level.block.state.BlockState crossState -> o
+    boolean shouldSignal -> p
+    71:97:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    100:109:net.minecraft.world.phys.shapes.VoxelShape calculateShape(net.minecraft.world.level.block.state.BlockState) -> l
+    114:114:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    119:119:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    123:150:net.minecraft.world.level.block.state.BlockState getConnectionState(net.minecraft.world.level.BlockGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    154:161:net.minecraft.world.level.block.state.BlockState getMissingConnections(net.minecraft.world.level.BlockGetter,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> b
+    166:177:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    181:181:boolean isCross(net.minecraft.world.level.block.state.BlockState) -> m
+    185:185:boolean isDot(net.minecraft.world.level.block.state.BlockState) -> n
+    190:211:void updateIndirectNeighbourShapes(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int,int) -> a
+    214:214:net.minecraft.world.level.block.state.properties.RedstoneSide getConnectingSide(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    218:236:net.minecraft.world.level.block.state.properties.RedstoneSide getConnectingSide(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction,boolean) -> a
+    241:243:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    247:247:boolean canSurviveOn(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    251:268:void updatePowerStrength(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    271:292:int calculateTargetStrength(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    296:296:int getWireSignal(net.minecraft.world.level.block.state.BlockState) -> o
+    300:308:void checkCornerChangeAt(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
+    312:323:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    327:341:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    344:357:void updateNeighborsOfNeighboringWires(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
+    361:371:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    375:378:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    383:394:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    399:399:boolean shouldConnectTo(net.minecraft.world.level.block.state.BlockState) -> h
+    403:416:boolean shouldConnectTo(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
+    421:421:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
+    425:426:int getColorForPower(int) -> b
+    430:440:void spawnParticlesAlongLine(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,com.mojang.math.Vector3f,net.minecraft.core.Direction,net.minecraft.core.Direction,float,float) -> a
+    444:462:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    466:474:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    480:488:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    493:494:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    498:513:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    517:523:void updatesOnShapeChange(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
+    37:82:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.RedStoneWireBlock$1 -> cag$1:
+    int[] $SwitchMap$net$minecraft$world$level$block$state$properties$RedstoneSide -> a
+    int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> b
+    int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> c
+    450:480:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.RedstoneLampBlock -> cah:
     net.minecraft.world.level.block.state.properties.BooleanProperty LIT -> a
-    20:22:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    26:26:int getLightEmission(net.minecraft.world.level.block.state.BlockState) -> a
-    31:32:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    37:37:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    42:54:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    58:61:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    65:66:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    70:70:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RedstoneTorchBlock -> btp:
+    18:20:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    25:25:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    30:42:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    46:49:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    53:54:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.RedstoneTorchBlock -> cai:
     net.minecraft.world.level.block.state.properties.BooleanProperty LIT -> a
     java.util.Map RECENT_TOGGLES -> b
-    33:35:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    39:39:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    44:47:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    51:58:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    62:66:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    70:70:boolean hasNeighborSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    75:76:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    80:99:void handleTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random,boolean) -> a
-    103:106:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    110:113:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    118:118:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
-    123:132:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    136:136:int getLightEmission(net.minecraft.world.level.block.state.BlockState) -> a
-    141:142:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    155:171:boolean isToggledTooFrequently(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
-    155:155:java.util.List lambda$isToggledTooFrequently$0(net.minecraft.world.level.BlockGetter) -> a
-    23:26:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RedstoneTorchBlock$Toggle -> btp$a:
+    33:35:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    39:42:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    46:53:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    57:61:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    65:65:boolean hasNeighborSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    70:91:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    95:98:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    102:105:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    110:110:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
+    115:124:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    128:129:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    142:158:boolean isToggledTooFrequently(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
+    142:142:java.util.List lambda$isToggledTooFrequently$0(net.minecraft.world.level.BlockGetter) -> a
+    22:25:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.RedstoneTorchBlock$Toggle -> cai$a:
     net.minecraft.core.BlockPos pos -> a
     long when -> b
-    148:151:void <init>(net.minecraft.core.BlockPos,long) -> <init>
-    144:144:long access$000(net.minecraft.world.level.block.RedstoneTorchBlock$Toggle) -> a
-    144:144:net.minecraft.core.BlockPos access$100(net.minecraft.world.level.block.RedstoneTorchBlock$Toggle) -> b
-net.minecraft.world.level.block.RedstoneWallTorchBlock -> btq:
+    135:138:void <init>(net.minecraft.core.BlockPos,long) -> <init>
+    131:131:long access$000(net.minecraft.world.level.block.RedstoneTorchBlock$Toggle) -> a
+    131:131:net.minecraft.core.BlockPos access$100(net.minecraft.world.level.block.RedstoneTorchBlock$Toggle) -> b
+net.minecraft.world.level.block.RedstoneWallTorchBlock -> caj:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty LIT -> c
-    27:29:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    33:33:java.lang.String getDescriptionId() -> k
-    38:38:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    43:43:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    48:48:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    54:55:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    60:71:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    75:77:boolean hasNeighborSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    82:86:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    91:91:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    96:96:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    101:102:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    23:24:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RenderShape -> btr:
+    26:28:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    32:32:java.lang.String getDescriptionId() -> i
+    37:37:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    42:42:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    47:47:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    53:54:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    59:70:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    74:76:boolean hasNeighborSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    81:85:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    90:90:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    95:95:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    100:101:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    22:23:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.RenderShape -> cak:
     net.minecraft.world.level.block.RenderShape INVISIBLE -> a
     net.minecraft.world.level.block.RenderShape ENTITYBLOCK_ANIMATED -> b
     net.minecraft.world.level.block.RenderShape MODEL -> c
@@ -54813,66 +59801,101 @@ net.minecraft.world.level.block.RenderShape -> btr:
     3:3:net.minecraft.world.level.block.RenderShape valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:4:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RepeaterBlock -> bts:
+net.minecraft.world.level.block.RepeaterBlock -> cal:
     net.minecraft.world.level.block.state.properties.BooleanProperty LOCKED -> a
     net.minecraft.world.level.block.state.properties.IntegerProperty DELAY -> d
-    28:30:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    28:30:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     34:39:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    44:44:int getDelay(net.minecraft.world.level.block.state.BlockState) -> h
+    44:44:int getDelay(net.minecraft.world.level.block.state.BlockState) -> g
     49:50:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     56:59:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     64:64:boolean isLocked(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    69:69:boolean isAlternateInput(net.minecraft.world.level.block.state.BlockState) -> i
+    69:69:boolean isAlternateInput(net.minecraft.world.level.block.state.BlockState) -> h
     74:93:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
     97:98:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     24:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RotatedPillarBlock -> btt:
+net.minecraft.world.level.block.RespawnAnchorBlock -> cam:
+    net.minecraft.world.level.block.state.properties.IntegerProperty CHARGE -> a
+    43:45:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    49:90:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    95:95:boolean isRespawnFuel(net.minecraft.world.item.ItemStack) -> a
+    99:99:boolean canBeCharged(net.minecraft.world.level.block.state.BlockState) -> h
+    103:117:boolean isWaterThatWouldFlow(net.minecraft.core.BlockPos,net.minecraft.world.level.Level) -> a
+    121:141:void explode(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> d
+    144:144:boolean canSetSpawn(net.minecraft.world.level.Level) -> a
+    148:150:void charge(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    154:168:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    172:173:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    177:177:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    181:181:int getScaledChargeLevel(net.minecraft.world.level.block.state.BlockState,int) -> a
+    186:186:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    190:197:java.util.Optional findStandUpPosition(net.minecraft.world.entity.EntityType,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    202:202:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    123:123:boolean lambda$explode$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    40:40:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.RespawnAnchorBlock$1 -> cam$1:
+    net.minecraft.core.BlockPos val$pos -> a
+    boolean val$inWater -> b
+    net.minecraft.world.level.block.RespawnAnchorBlock this$0 -> c
+    125:125:void <init>(net.minecraft.world.level.block.RespawnAnchorBlock,net.minecraft.core.BlockPos,boolean) -> <init>
+    128:132:java.util.Optional getBlockExplosionResistance(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
+    137:137:boolean shouldBlockExplode(net.minecraft.world.level.Explosion,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,float) -> a
+net.minecraft.world.level.block.RootsBlock -> can:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
+    15:16:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    20:20:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    25:25:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    30:30:net.minecraft.world.level.block.state.BlockBehaviour$OffsetType getOffsetType() -> aj_
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.RotatedPillarBlock -> cao:
     net.minecraft.world.level.block.state.properties.EnumProperty AXIS -> a
-    14:16:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    14:16:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     20:32:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     38:39:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     43:43:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.RotatedPillarBlock$1 -> btt$1:
+net.minecraft.world.level.block.RotatedPillarBlock$1 -> cao$1:
     int[] $SwitchMap$net$minecraft$core$Direction$Axis -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> b
     20:23:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.Rotation -> btu:
+net.minecraft.world.level.block.Rotation -> cap:
     net.minecraft.world.level.block.Rotation NONE -> a
     net.minecraft.world.level.block.Rotation CLOCKWISE_90 -> b
     net.minecraft.world.level.block.Rotation CLOCKWISE_180 -> c
     net.minecraft.world.level.block.Rotation COUNTERCLOCKWISE_90 -> d
-    net.minecraft.world.level.block.Rotation[] $VALUES -> e
-    10:10:net.minecraft.world.level.block.Rotation[] values() -> values
-    10:10:net.minecraft.world.level.block.Rotation valueOf(java.lang.String) -> valueOf
-    10:10:void <init>(java.lang.String,int) -> <init>
-    18:53:net.minecraft.world.level.block.Rotation getRotated(net.minecraft.world.level.block.Rotation) -> a
-    58:69:net.minecraft.core.Direction rotate(net.minecraft.core.Direction) -> a
-    74:82:int rotate(int,int) -> a
-    87:88:net.minecraft.world.level.block.Rotation getRandom(java.util.Random) -> a
-    92:94:java.util.List getShuffled(java.util.Random) -> b
-    10:14:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.Rotation$1 -> btu$1:
+    com.mojang.math.OctahedralGroup rotation -> e
+    net.minecraft.world.level.block.Rotation[] $VALUES -> f
+    13:13:net.minecraft.world.level.block.Rotation[] values() -> values
+    13:13:net.minecraft.world.level.block.Rotation valueOf(java.lang.String) -> valueOf
+    22:24:void <init>(java.lang.String,int,com.mojang.math.OctahedralGroup) -> <init>
+    27:62:net.minecraft.world.level.block.Rotation getRotated(net.minecraft.world.level.block.Rotation) -> a
+    67:67:com.mojang.math.OctahedralGroup rotation() -> a
+    71:82:net.minecraft.core.Direction rotate(net.minecraft.core.Direction) -> a
+    87:95:int rotate(int,int) -> a
+    100:100:net.minecraft.world.level.block.Rotation getRandom(java.util.Random) -> a
+    104:106:java.util.List getShuffled(java.util.Random) -> b
+    13:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.Rotation$1 -> cap$1:
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
-    20:20:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SandBlock -> btv:
+    29:29:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.SandBlock -> caq:
     int dustColor -> a
-    9:11:void <init>(int,net.minecraft.world.level.block.Block$Properties) -> <init>
-    15:15:int getDustColor(net.minecraft.world.level.block.state.BlockState) -> i
-net.minecraft.world.level.block.SaplingBlock -> btw:
+    11:13:void <init>(int,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    17:17:int getDustColor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+net.minecraft.world.level.block.SaplingBlock -> car:
     net.minecraft.world.level.block.state.properties.IntegerProperty STAGE -> a
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
     net.minecraft.world.level.block.grower.AbstractTreeGrower treeGrower -> c
-    26:29:void <init>(net.minecraft.world.level.block.grower.AbstractTreeGrower,net.minecraft.world.level.block.Block$Properties) -> <init>
-    33:33:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    38:45:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    48:53:void advanceTree(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    57:57:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    62:62:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    67:68:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    72:73:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    26:29:void <init>(net.minecraft.world.level.block.grower.AbstractTreeGrower,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    33:33:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    38:43:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    46:51:void advanceTree(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    55:55:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    60:60:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    65:66:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    70:71:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     18:21:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ScaffoldingBlock -> btx:
+net.minecraft.world.level.block.ScaffoldingBlock -> cas:
     net.minecraft.world.phys.shapes.VoxelShape STABLE_SHAPE -> d
     net.minecraft.world.phys.shapes.VoxelShape UNSTABLE_SHAPE -> e
     net.minecraft.world.phys.shapes.VoxelShape UNSTABLE_SHAPE_BOTTOM -> f
@@ -54880,125 +59903,119 @@ net.minecraft.world.level.block.ScaffoldingBlock -> btx:
     net.minecraft.world.level.block.state.properties.IntegerProperty DISTANCE -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty BOTTOM -> c
-    54:56:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    54:56:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     60:61:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    65:68:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    73:73:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> j
+    65:68:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    73:73:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
     78:78:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
     83:90:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     95:98:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
     102:110:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     115:131:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
     135:135:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    140:146:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    151:154:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
+    140:146:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    151:154:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
     158:158:boolean isBottom(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,int) -> a
     162:185:int getDistance(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
     30:51:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SeaPickleBlock -> bty:
+net.minecraft.world.level.block.SeaPickleBlock -> cat:
     net.minecraft.world.level.block.state.properties.IntegerProperty PICKLES -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> b
     net.minecraft.world.phys.shapes.VoxelShape ONE_AABB -> c
     net.minecraft.world.phys.shapes.VoxelShape TWO_AABB -> d
     net.minecraft.world.phys.shapes.VoxelShape THREE_AABB -> e
     net.minecraft.world.phys.shapes.VoxelShape FOUR_AABB -> f
-    37:39:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    43:43:int getLightEmission(net.minecraft.world.level.block.state.BlockState) -> a
-    49:56:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    60:60:boolean isDead(net.minecraft.world.level.block.state.BlockState) -> h
-    65:65:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
-    70:71:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    76:84:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    89:92:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
-    97:106:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    112:116:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    121:122:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    126:126:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    131:131:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    136:175:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    37:39:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    44:51:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    55:55:boolean isDead(net.minecraft.world.level.block.state.BlockState) -> h
+    60:60:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    65:66:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    71:79:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    84:87:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
+    92:101:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    107:111:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    116:117:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    121:121:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    126:126:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    131:170:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    174:174:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     28:34:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.Seagrass -> btz:
+net.minecraft.world.level.block.Seagrass -> cau:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    27:28:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    32:32:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    37:37:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
+    27:28:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    32:32:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    37:37:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
     43:48:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     53:57:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     62:62:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
     67:67:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    72:72:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
+    72:72:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
     77:84:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     88:88:boolean canPlaceLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
     93:93:boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
     24:24:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ShearableDoublePlantBlock -> bua:
-    net.minecraft.world.level.block.state.properties.EnumProperty HALF -> b
-    12:13:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    17:21:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
-    9:9:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ShulkerBoxBlock -> bub:
+net.minecraft.world.level.block.ShulkerBoxBlock -> cav:
     net.minecraft.world.level.block.state.properties.EnumProperty FACING -> a
     net.minecraft.resources.ResourceLocation CONTENTS -> b
     net.minecraft.world.item.DyeColor color -> c
-    56:59:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.Block$Properties) -> <init>
-    63:63:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
-    68:68:boolean isSuffocating(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
-    73:73:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    78:115:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    120:120:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    125:126:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    130:154:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
-    158:168:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
-    173:179:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    183:193:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    197:229:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.BlockGetter,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
-    233:233:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
-    238:242:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    247:247:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> b
-    252:252:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    259:265:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    270:270:net.minecraft.world.item.DyeColor getColorFromItem(net.minecraft.world.item.Item) -> b
-    275:278:net.minecraft.world.item.DyeColor getColorFromBlock(net.minecraft.world.level.block.Block) -> d
-    283:319:net.minecraft.world.level.block.Block getBlockByColor(net.minecraft.world.item.DyeColor) -> a
-    325:325:net.minecraft.world.item.DyeColor getColor() -> c
-    329:329:net.minecraft.world.item.ItemStack getColoredItemStack(net.minecraft.world.item.DyeColor) -> b
-    334:334:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    339:339:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    163:165:void lambda$getDrops$0(net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity,net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
-    48:50:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.ShulkerBoxBlock$1 -> bub$1:
+    58:61:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    65:65:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
+    70:70:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    75:100:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    105:105:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    110:111:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    115:138:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
+    142:152:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
+    157:163:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    167:177:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    181:213:void appendHoverText(net.minecraft.world.item.ItemStack,net.minecraft.world.level.BlockGetter,java.util.List,net.minecraft.world.item.TooltipFlag) -> a
+    217:217:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
+    222:226:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    231:231:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    236:236:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    243:249:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    254:254:net.minecraft.world.item.DyeColor getColorFromItem(net.minecraft.world.item.Item) -> b
+    259:262:net.minecraft.world.item.DyeColor getColorFromBlock(net.minecraft.world.level.block.Block) -> c
+    267:303:net.minecraft.world.level.block.Block getBlockByColor(net.minecraft.world.item.DyeColor) -> a
+    309:309:net.minecraft.world.item.DyeColor getColor() -> c
+    313:313:net.minecraft.world.item.ItemStack getColoredItemStack(net.minecraft.world.item.DyeColor) -> b
+    318:318:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    323:323:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    147:149:void lambda$getDrops$0(net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity,net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
+    50:52:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.ShulkerBoxBlock$1 -> cav$1:
     int[] $SwitchMap$net$minecraft$world$item$DyeColor -> a
-    286:286:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SignBlock -> buc:
+    270:270:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.SignBlock -> caw:
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> a
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
     net.minecraft.world.level.block.state.properties.WoodType type -> c
-    32:34:void <init>(net.minecraft.world.level.block.Block$Properties,net.minecraft.world.level.block.state.properties.WoodType) -> <init>
+    32:34:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,net.minecraft.world.level.block.state.properties.WoodType) -> <init>
     38:42:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    47:47:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    52:52:boolean isPossibleToRespawnInThis() -> Y_
+    47:47:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    52:52:boolean isPossibleToRespawnInThis() -> ak_
     57:57:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     62:82:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    87:90:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
+    87:90:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
     94:94:net.minecraft.world.level.block.state.properties.WoodType type() -> c
     26:28:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SimpleWaterloggedBlock -> bud:
+net.minecraft.world.level.block.SimpleWaterloggedBlock -> cax:
     15:15:boolean canPlaceLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
     20:27:boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
     32:36:net.minecraft.world.level.material.Fluid takeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-net.minecraft.world.level.block.SkullBlock -> bue:
+net.minecraft.world.level.block.SkullBlock -> cay:
     net.minecraft.world.level.block.state.properties.IntegerProperty ROTATION -> a
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
-    30:32:void <init>(net.minecraft.world.level.block.SkullBlock$Type,net.minecraft.world.level.block.Block$Properties) -> <init>
-    36:36:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    41:41:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> i
+    30:32:void <init>(net.minecraft.world.level.block.SkullBlock$Type,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    36:36:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    41:41:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
     46:46:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     51:51:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     56:56:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     61:62:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     25:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SkullBlock$Type -> bue$a:
-net.minecraft.world.level.block.SkullBlock$Types -> bue$b:
+net.minecraft.world.level.block.SkullBlock$Type -> cay$a:
+net.minecraft.world.level.block.SkullBlock$Types -> cay$b:
     net.minecraft.world.level.block.SkullBlock$Types SKELETON -> a
     net.minecraft.world.level.block.SkullBlock$Types WITHER_SKELETON -> b
     net.minecraft.world.level.block.SkullBlock$Types PLAYER -> c
@@ -55010,145 +60027,179 @@ net.minecraft.world.level.block.SkullBlock$Types -> bue$b:
     18:18:net.minecraft.world.level.block.SkullBlock$Types valueOf(java.lang.String) -> valueOf
     18:18:void <init>(java.lang.String,int) -> <init>
     18:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SlabBlock -> buf:
+net.minecraft.world.level.block.SlabBlock -> caz:
     net.minecraft.world.level.block.state.properties.EnumProperty TYPE -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> b
     net.minecraft.world.phys.shapes.VoxelShape BOTTOM_AABB -> c
     net.minecraft.world.phys.shapes.VoxelShape TOP_AABB -> d
-    34:37:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    41:41:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
+    34:37:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    41:41:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
     46:47:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    51:58:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    51:58:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     65:78:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     83:99:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
-    104:107:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
+    104:107:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
     112:115:boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
     120:123:boolean canPlaceLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
     128:131:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     136:144:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     27:31:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SlabBlock$1 -> buf$1:
+net.minecraft.world.level.block.SlabBlock$1 -> caz$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$SlabType -> a
     int[] $SwitchMap$net$minecraft$world$level$pathfinder$PathComputationType -> b
     52:136:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SlimeBlock -> bug:
-    12:13:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.SlimeBlock -> cba:
+    12:13:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     17:23:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
     27:32:void updateEntityAfterFallOn(net.minecraft.world.level.BlockGetter,net.minecraft.world.entity.Entity) -> a
     35:45:void bounceUp(net.minecraft.world.entity.Entity) -> a
     49:55:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-net.minecraft.world.level.block.SmithingTableBlock -> buh:
-    13:14:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    18:18:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-net.minecraft.world.level.block.SmokerBlock -> bui:
-    20:21:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.SmithingTableBlock -> cbb:
+    net.minecraft.network.chat.TranslatableComponent CONTAINER_TITLE -> a
+    19:20:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    26:26:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
+    31:37:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    26:26:net.minecraft.world.inventory.AbstractContainerMenu lambda$getMenuProvider$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
+    22:22:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.SmokerBlock -> cbc:
+    20:21:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     25:25:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     30:35:void openContainer(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
     39:52:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-net.minecraft.world.level.block.SnowLayerBlock -> buj:
+net.minecraft.world.level.block.SnowLayerBlock -> cbd:
     net.minecraft.world.level.block.state.properties.IntegerProperty LAYERS -> a
     net.minecraft.world.phys.shapes.VoxelShape[] SHAPE_BY_LAYER -> b
-    42:44:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    42:44:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     48:56:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    62:62:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    67:67:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    72:72:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
-    77:87:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    92:95:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    100:104:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    108:117:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
-    123:129:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    134:135:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    62:62:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    67:67:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    72:72:net.minecraft.world.phys.shapes.VoxelShape getBlockSupportShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> e
+    77:77:net.minecraft.world.phys.shapes.VoxelShape getVisualShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    82:82:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
+    87:96:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    101:104:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    109:113:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    117:126:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
+    132:138:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    143:144:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     25:36:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SnowLayerBlock$1 -> buj$1:
+net.minecraft.world.level.block.SnowLayerBlock$1 -> cbd$1:
     int[] $SwitchMap$net$minecraft$world$level$pathfinder$PathComputationType -> a
     48:48:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SnowyDirtBlock -> buk:
+net.minecraft.world.level.block.SnowyDirtBlock -> cbe:
     net.minecraft.world.level.block.state.properties.BooleanProperty SNOWY -> a
-    16:18:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    22:26:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    31:32:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    37:38:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    16:18:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    22:25:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    30:31:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    36:37:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     13:13:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SoulsandBlock -> bul:
+net.minecraft.world.level.block.SoulFireBlock -> cbf:
+    12:13:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    17:21:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    26:26:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    30:30:boolean canSurviveOnBlock(net.minecraft.world.level.block.Block) -> c
+    35:35:boolean canBurn(net.minecraft.world.level.block.state.BlockState) -> e
+net.minecraft.world.level.block.SoulSandBlock -> cbg:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    20:21:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    25:25:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    30:31:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    35:36:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    40:40:boolean isRedstoneConductor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
-    45:45:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    50:51:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    55:55:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    60:60:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-    65:65:boolean isViewBlocking(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> f
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SoundType -> bum:
+    22:23:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    27:27:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    32:32:net.minecraft.world.phys.shapes.VoxelShape getBlockSupportShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> e
+    37:37:net.minecraft.world.phys.shapes.VoxelShape getVisualShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    42:43:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    47:51:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    56:57:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    61:61:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.SoundType -> cbh:
     net.minecraft.world.level.block.SoundType WOOD -> a
     net.minecraft.world.level.block.SoundType GRAVEL -> b
     net.minecraft.world.level.block.SoundType GRASS -> c
-    net.minecraft.world.level.block.SoundType STONE -> d
-    net.minecraft.world.level.block.SoundType METAL -> e
-    net.minecraft.world.level.block.SoundType GLASS -> f
-    net.minecraft.world.level.block.SoundType WOOL -> g
-    net.minecraft.world.level.block.SoundType SAND -> h
-    net.minecraft.world.level.block.SoundType SNOW -> i
-    net.minecraft.world.level.block.SoundType LADDER -> j
-    net.minecraft.world.level.block.SoundType ANVIL -> k
-    net.minecraft.world.level.block.SoundType SLIME_BLOCK -> l
-    net.minecraft.world.level.block.SoundType HONEY_BLOCK -> m
-    net.minecraft.world.level.block.SoundType WET_GRASS -> n
-    net.minecraft.world.level.block.SoundType CORAL_BLOCK -> o
-    net.minecraft.world.level.block.SoundType BAMBOO -> p
-    net.minecraft.world.level.block.SoundType BAMBOO_SAPLING -> q
-    net.minecraft.world.level.block.SoundType SCAFFOLDING -> r
-    net.minecraft.world.level.block.SoundType SWEET_BERRY_BUSH -> s
-    net.minecraft.world.level.block.SoundType CROP -> t
-    net.minecraft.world.level.block.SoundType HARD_CROP -> u
-    net.minecraft.world.level.block.SoundType NETHER_WART -> v
-    net.minecraft.world.level.block.SoundType LANTERN -> w
-    float volume -> x
-    float pitch -> y
-    net.minecraft.sounds.SoundEvent breakSound -> z
-    net.minecraft.sounds.SoundEvent stepSound -> A
-    net.minecraft.sounds.SoundEvent placeSound -> B
-    net.minecraft.sounds.SoundEvent hitSound -> C
-    net.minecraft.sounds.SoundEvent fallSound -> D
-    40:49:void <init>(float,float,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundEvent) -> <init>
-    52:52:float getVolume() -> a
-    56:56:float getPitch() -> b
-    60:60:net.minecraft.sounds.SoundEvent getBreakSound() -> c
-    64:64:net.minecraft.sounds.SoundEvent getStepSound() -> d
-    68:68:net.minecraft.sounds.SoundEvent getPlaceSound() -> e
-    72:72:net.minecraft.sounds.SoundEvent getHitSound() -> f
-    76:76:net.minecraft.sounds.SoundEvent getFallSound() -> g
-    7:29:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SpawnerBlock -> bun:
-    13:14:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    net.minecraft.world.level.block.SoundType LILY_PAD -> d
+    net.minecraft.world.level.block.SoundType STONE -> e
+    net.minecraft.world.level.block.SoundType METAL -> f
+    net.minecraft.world.level.block.SoundType GLASS -> g
+    net.minecraft.world.level.block.SoundType WOOL -> h
+    net.minecraft.world.level.block.SoundType SAND -> i
+    net.minecraft.world.level.block.SoundType SNOW -> j
+    net.minecraft.world.level.block.SoundType LADDER -> k
+    net.minecraft.world.level.block.SoundType ANVIL -> l
+    net.minecraft.world.level.block.SoundType SLIME_BLOCK -> m
+    net.minecraft.world.level.block.SoundType HONEY_BLOCK -> n
+    net.minecraft.world.level.block.SoundType WET_GRASS -> o
+    net.minecraft.world.level.block.SoundType CORAL_BLOCK -> p
+    net.minecraft.world.level.block.SoundType BAMBOO -> q
+    net.minecraft.world.level.block.SoundType BAMBOO_SAPLING -> r
+    net.minecraft.world.level.block.SoundType SCAFFOLDING -> s
+    net.minecraft.world.level.block.SoundType SWEET_BERRY_BUSH -> t
+    net.minecraft.world.level.block.SoundType CROP -> u
+    net.minecraft.world.level.block.SoundType HARD_CROP -> v
+    net.minecraft.world.level.block.SoundType VINE -> w
+    net.minecraft.world.level.block.SoundType NETHER_WART -> x
+    net.minecraft.world.level.block.SoundType LANTERN -> y
+    net.minecraft.world.level.block.SoundType STEM -> z
+    net.minecraft.world.level.block.SoundType NYLIUM -> A
+    net.minecraft.world.level.block.SoundType FUNGUS -> B
+    net.minecraft.world.level.block.SoundType ROOTS -> C
+    net.minecraft.world.level.block.SoundType SHROOMLIGHT -> D
+    net.minecraft.world.level.block.SoundType WEEPING_VINES -> E
+    net.minecraft.world.level.block.SoundType TWISTING_VINES -> F
+    net.minecraft.world.level.block.SoundType SOUL_SAND -> G
+    net.minecraft.world.level.block.SoundType SOUL_SOIL -> H
+    net.minecraft.world.level.block.SoundType BASALT -> I
+    net.minecraft.world.level.block.SoundType WART_BLOCK -> J
+    net.minecraft.world.level.block.SoundType NETHERRACK -> K
+    net.minecraft.world.level.block.SoundType NETHER_BRICKS -> L
+    net.minecraft.world.level.block.SoundType NETHER_SPROUTS -> M
+    net.minecraft.world.level.block.SoundType NETHER_ORE -> N
+    net.minecraft.world.level.block.SoundType BONE_BLOCK -> O
+    net.minecraft.world.level.block.SoundType NETHERITE_BLOCK -> P
+    net.minecraft.world.level.block.SoundType ANCIENT_DEBRIS -> Q
+    net.minecraft.world.level.block.SoundType LODESTONE -> R
+    net.minecraft.world.level.block.SoundType CHAIN -> S
+    net.minecraft.world.level.block.SoundType NETHER_GOLD_ORE -> T
+    net.minecraft.world.level.block.SoundType GILDED_BLACKSTONE -> U
+    float volume -> V
+    float pitch -> W
+    net.minecraft.sounds.SoundEvent breakSound -> X
+    net.minecraft.sounds.SoundEvent stepSound -> Y
+    net.minecraft.sounds.SoundEvent placeSound -> Z
+    net.minecraft.sounds.SoundEvent hitSound -> aa
+    net.minecraft.sounds.SoundEvent fallSound -> ab
+    67:76:void <init>(float,float,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundEvent,net.minecraft.sounds.SoundEvent) -> <init>
+    79:79:float getVolume() -> a
+    83:83:float getPitch() -> b
+    87:87:net.minecraft.sounds.SoundEvent getBreakSound() -> c
+    91:91:net.minecraft.sounds.SoundEvent getStepSound() -> d
+    95:95:net.minecraft.sounds.SoundEvent getPlaceSound() -> e
+    99:99:net.minecraft.sounds.SoundEvent getHitSound() -> f
+    103:103:net.minecraft.sounds.SoundEvent getFallSound() -> g
+    7:56:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.SpawnerBlock -> cbi:
+    13:14:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     18:18:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     23:27:void spawnAfterBreak(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    31:31:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
+    31:31:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
     36:36:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.level.block.SpongeBlock -> buo:
-    22:23:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.SpongeBlock -> cbj:
+    22:23:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     27:31:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
     35:37:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
     40:45:void tryAbsorbWater(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     48:89:boolean removeWaterBreadthFirstSearch(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-net.minecraft.world.level.block.SpreadingSnowyDirtBlock -> bup:
-    18:19:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    22:30:boolean canBeGrass(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> b
-    34:35:boolean canPropagate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> c
-    40:55:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-net.minecraft.world.level.block.StainedGlassBlock -> buq:
+net.minecraft.world.level.block.SpreadingSnowyDirtBlock -> cbk:
+    17:18:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    21:34:boolean canBeGrass(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> b
+    38:39:boolean canPropagate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> c
+    44:59:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+net.minecraft.world.level.block.StainedGlassBlock -> cbl:
     net.minecraft.world.item.DyeColor color -> a
-    9:11:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.Block$Properties) -> <init>
+    9:11:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     15:15:net.minecraft.world.item.DyeColor getColor() -> a
-net.minecraft.world.level.block.StainedGlassPaneBlock -> bur:
+net.minecraft.world.level.block.StainedGlassPaneBlock -> cbm:
     net.minecraft.world.item.DyeColor color -> i
-    9:12:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.Block$Properties) -> <init>
+    9:12:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     16:16:net.minecraft.world.item.DyeColor getColor() -> a
-net.minecraft.world.level.block.StairBlock -> bus:
+net.minecraft.world.level.block.StairBlock -> cbn:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.EnumProperty HALF -> b
     net.minecraft.world.level.block.state.properties.EnumProperty SHAPE -> c
@@ -55160,52 +60211,53 @@ net.minecraft.world.level.block.StairBlock -> bus:
     net.minecraft.world.phys.shapes.VoxelShape OCTET_NPN -> i
     net.minecraft.world.phys.shapes.VoxelShape OCTET_NPP -> j
     net.minecraft.world.phys.shapes.VoxelShape OCTET_PNN -> k
-    net.minecraft.world.phys.shapes.VoxelShape OCTET_PNP -> w
-    net.minecraft.world.phys.shapes.VoxelShape OCTET_PPN -> x
-    net.minecraft.world.phys.shapes.VoxelShape OCTET_PPP -> y
-    net.minecraft.world.phys.shapes.VoxelShape[] TOP_SHAPES -> z
-    net.minecraft.world.phys.shapes.VoxelShape[] BOTTOM_SHAPES -> A
-    int[] SHAPE_BY_STATE -> B
-    net.minecraft.world.level.block.Block base -> C
-    net.minecraft.world.level.block.state.BlockState baseState -> D
-    57:57:net.minecraft.world.phys.shapes.VoxelShape[] makeShapes(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape) -> a
-    61:74:net.minecraft.world.phys.shapes.VoxelShape makeStairShape(int,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape) -> a
-    89:93:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Block$Properties) -> <init>
-    97:97:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
-    102:102:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    106:106:int getShapeIndex(net.minecraft.world.level.block.state.BlockState) -> i
-    111:112:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    116:117:void attack(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    121:122:void destroy(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    126:126:float getExplosionResistance() -> h
-    131:131:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    136:141:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    145:149:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    153:154:void prepareRender(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
-    158:159:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    163:164:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    168:168:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    173:174:void wasExploded(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.Explosion) -> a
-    178:187:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    192:198:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    202:225:net.minecraft.world.level.block.state.properties.StairsShape getStairsShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> n
-    229:230:boolean canTakeShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> e
-    234:234:boolean isStairs(net.minecraft.world.level.block.state.BlockState) -> h
-    239:239:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    244:282:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    287:288:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    292:295:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    300:300:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    57:57:net.minecraft.world.phys.shapes.VoxelShape[] lambda$makeShapes$1(int) -> b
-    57:57:net.minecraft.world.phys.shapes.VoxelShape lambda$makeShapes$0(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,int) -> a
-    36:77:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.StairBlock$1 -> bus$1:
+    net.minecraft.world.phys.shapes.VoxelShape OCTET_PNP -> o
+    net.minecraft.world.phys.shapes.VoxelShape OCTET_PPN -> p
+    net.minecraft.world.phys.shapes.VoxelShape OCTET_PPP -> q
+    net.minecraft.world.phys.shapes.VoxelShape[] TOP_SHAPES -> r
+    net.minecraft.world.phys.shapes.VoxelShape[] BOTTOM_SHAPES -> s
+    int[] SHAPE_BY_STATE -> t
+    net.minecraft.world.level.block.Block base -> u
+    net.minecraft.world.level.block.state.BlockState baseState -> v
+    56:56:net.minecraft.world.phys.shapes.VoxelShape[] makeShapes(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    60:73:net.minecraft.world.phys.shapes.VoxelShape makeStairShape(int,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    88:92:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    96:96:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
+    101:101:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    105:105:int getShapeIndex(net.minecraft.world.level.block.state.BlockState) -> l
+    110:111:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    115:116:void attack(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    120:121:void destroy(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    125:125:float getExplosionResistance() -> f
+    130:135:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    139:143:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    147:148:void prepareRender(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
+    152:153:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    157:157:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    162:163:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    167:168:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    172:172:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    177:178:void wasExploded(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.Explosion) -> a
+    182:191:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    196:202:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    206:229:net.minecraft.world.level.block.state.properties.StairsShape getStairsShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> g
+    233:234:boolean canTakeShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> e
+    238:238:boolean isStairs(net.minecraft.world.level.block.state.BlockState) -> h
+    243:243:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    248:286:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    291:292:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    296:299:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    304:304:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    56:56:net.minecraft.world.phys.shapes.VoxelShape[] lambda$makeShapes$1(int) -> b
+    56:56:net.minecraft.world.phys.shapes.VoxelShape lambda$makeShapes$0(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape,int) -> a
+    35:76:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.StairBlock$1 -> cbn$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$StairsShape -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> b
-    246:249:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.StandingSignBlock -> but:
+    250:253:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.StandingSignBlock -> cbo:
     net.minecraft.world.level.block.state.properties.IntegerProperty ROTATION -> c
-    21:23:void <init>(net.minecraft.world.level.block.Block$Properties,net.minecraft.world.level.block.state.properties.WoodType) -> <init>
+    21:23:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,net.minecraft.world.level.block.state.properties.WoodType) -> <init>
     27:27:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     32:33:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     38:41:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
@@ -55213,125 +60265,140 @@ net.minecraft.world.level.block.StandingSignBlock -> but:
     51:51:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     56:57:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     18:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.StemBlock -> buu:
+net.minecraft.world.level.block.StemBlock -> cbp:
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
     net.minecraft.world.phys.shapes.VoxelShape[] SHAPE_BY_AGE -> b
     net.minecraft.world.level.block.StemGrownBlock fruit -> c
-    41:44:void <init>(net.minecraft.world.level.block.StemGrownBlock,net.minecraft.world.level.block.Block$Properties) -> <init>
-    48:48:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    53:53:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
-    58:80:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    84:92:net.minecraft.world.item.Item getSeedItem() -> c
-    97:99:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    104:104:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    109:109:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    114:120:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    124:125:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    128:128:net.minecraft.world.level.block.StemGrownBlock getFruit() -> d
+    41:44:void <init>(net.minecraft.world.level.block.StemGrownBlock,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    48:48:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    53:53:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    58:79:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    83:91:net.minecraft.world.item.Item getSeedItem() -> c
+    96:98:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    103:103:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    108:108:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    113:119:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    123:124:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    127:127:net.minecraft.world.level.block.StemGrownBlock getFruit() -> d
     24:35:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.StemGrownBlock -> buv:
-    5:6:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.StemGrownBlock -> cbq:
+    5:6:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     net.minecraft.world.level.block.StemBlock getStem() -> c
     net.minecraft.world.level.block.AttachedStemBlock getAttachedStem() -> d
-net.minecraft.world.level.block.StoneButtonBlock -> buw:
-    8:9:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.StoneButtonBlock -> cbr:
+    8:9:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     13:13:net.minecraft.sounds.SoundEvent getSound(boolean) -> a
-net.minecraft.world.level.block.StonecutterBlock -> bux:
+net.minecraft.world.level.block.StonecutterBlock -> cbs:
     net.minecraft.network.chat.TranslatableComponent CONTAINER_TITLE -> c
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
-    34:36:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    34:36:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     40:40:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     45:52:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     58:58:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-    63:63:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    68:68:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
-    73:73:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
+    63:63:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    68:68:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
+    73:73:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
     78:78:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     83:83:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     88:89:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     93:93:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     58:58:net.minecraft.world.inventory.AbstractContainerMenu lambda$getMenuProvider$0(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> a
     28:31:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.StructureBlock -> buy:
+net.minecraft.world.level.block.StructureBlock -> cbt:
     net.minecraft.world.level.block.state.properties.EnumProperty MODE -> a
-    27:28:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    27:28:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     32:32:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     37:42:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
     47:56:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    60:60:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
+    60:60:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
     65:65:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     70:71:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     75:95:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
     98:114:void trigger(net.minecraft.world.level.block.entity.StructureBlockEntity) -> a
     24:24:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.StructureBlock$1 -> buy$1:
+net.minecraft.world.level.block.StructureBlock$1 -> cbt$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$StructureMode -> a
     98:98:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.StructureVoidBlock -> buz:
+net.minecraft.world.level.block.StructureVoidBlock -> cbu:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    15:16:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    20:20:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> c
-    25:25:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    15:16:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    20:20:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    25:25:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     30:30:float getShadeBrightness(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    35:35:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> g
+    35:35:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
     12:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SugarCaneBlock -> bva:
+net.minecraft.world.level.block.SugarCaneBlock -> cbv:
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> b
-    27:29:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    33:33:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    38:55:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    59:63:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    68:84:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    89:90:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    27:29:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    33:33:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    38:41:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    45:60:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    64:68:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    73:89:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    94:95:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     21:24:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.SweetBerryBushBlock -> bvb:
+net.minecraft.world.level.block.SweetBerryBushBlock -> cbw:
     net.minecraft.world.level.block.state.properties.IntegerProperty AGE -> a
     net.minecraft.world.phys.shapes.VoxelShape SAPLING_SHAPE -> b
     net.minecraft.world.phys.shapes.VoxelShape MID_GROWTH_SHAPE -> c
-    38:40:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    38:40:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     44:44:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    49:55:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    60:65:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    69:83:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    87:102:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    107:108:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    112:112:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    117:117:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    122:124:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    49:55:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    60:60:boolean isRandomlyTicking(net.minecraft.world.level.block.state.BlockState) -> a_
+    65:69:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    73:87:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    91:106:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    111:112:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    116:116:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    121:121:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    126:128:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     32:35:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TallFlowerBlock -> bvc:
-    15:16:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.TallFlowerBlock -> cbx:
+    15:16:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     21:21:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
     26:26:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
     31:31:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     36:37:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.level.block.TallGrassBlock -> bvd:
+net.minecraft.world.level.block.TallGrassBlock -> cby:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
-    18:19:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    23:23:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    18:19:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    23:23:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     28:28:boolean isValidBonemealTarget(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
     33:33:boolean isBonemealSuccess(net.minecraft.world.level.Level,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     38:43:void performBonemeal(net.minecraft.server.level.ServerLevel,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    47:47:net.minecraft.world.level.block.Block$OffsetType getOffsetType() -> X_
+    47:47:net.minecraft.world.level.block.state.BlockBehaviour$OffsetType getOffsetType() -> aj_
     15:15:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TallSeagrass -> bve:
-    net.minecraft.world.level.block.state.properties.EnumProperty HALF -> c
-    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> d
-    29:30:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    34:34:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    39:39:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
+net.minecraft.world.level.block.TallSeagrass -> cbz:
+    net.minecraft.world.level.block.state.properties.EnumProperty HALF -> b
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> c
+    29:30:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    34:34:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    39:39:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
     44:44:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     50:59:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     64:70:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    75:75:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
+    75:75:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
     80:80:boolean canPlaceLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
     85:85:boolean placeLiquid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
     23:26:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TntBlock -> bvf:
+net.minecraft.world.level.block.TargetBlock -> cca:
+    net.minecraft.world.level.block.state.properties.IntegerProperty OUTPUT_POWER -> a
+    34:36:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    40:48:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.projectile.Projectile) -> a
+    51:58:int updateRedstoneOutput(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.Entity) -> a
+    62:77:int getRedstoneStrength(net.minecraft.world.phys.BlockHitResult,net.minecraft.world.phys.Vec3) -> a
+    81:83:void setOutputPower(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.block.state.BlockState,int,net.minecraft.core.BlockPos,int) -> a
+    87:90:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    94:94:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    99:99:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
+    104:105:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    109:116:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    28:28:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.TntBlock -> ccb:
     net.minecraft.world.level.block.state.properties.BooleanProperty UNSTABLE -> a
-    30:32:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    30:32:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     36:43:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
     47:51:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
     55:60:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
@@ -55339,20 +60406,21 @@ net.minecraft.world.level.block.TntBlock -> bvf:
     74:75:void explode(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     78:84:void explode(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
     88:103:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    108:117:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.Entity) -> a
-    121:121:boolean dropFromExplosion(net.minecraft.world.level.Explosion) -> a
-    126:127:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    108:116:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.projectile.Projectile) -> a
+    120:120:boolean dropFromExplosion(net.minecraft.world.level.Explosion) -> a
+    125:126:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     96:96:void lambda$use$0(net.minecraft.world.InteractionHand,net.minecraft.world.entity.player.Player) -> a
     27:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TorchBlock -> bvg:
+net.minecraft.world.level.block.TorchBlock -> ccc:
     net.minecraft.world.phys.shapes.VoxelShape AABB -> d
-    21:22:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    26:26:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    31:34:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    39:39:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    44:49:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TrapDoorBlock -> bvh:
+    net.minecraft.core.particles.ParticleOptions flameParticle -> e
+    23:25:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,net.minecraft.core.particles.ParticleOptions) -> <init>
+    29:29:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    34:37:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    42:42:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    47:52:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    19:19:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.TrapDoorBlock -> ccd:
     net.minecraft.world.level.block.state.properties.BooleanProperty OPEN -> a
     net.minecraft.world.level.block.state.properties.EnumProperty HALF -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> c
@@ -55363,31 +60431,30 @@ net.minecraft.world.level.block.TrapDoorBlock -> bvh:
     net.minecraft.world.phys.shapes.VoxelShape NORTH_OPEN_AABB -> h
     net.minecraft.world.phys.shapes.VoxelShape BOTTOM_AABB -> i
     net.minecraft.world.phys.shapes.VoxelShape TOP_AABB -> j
-    44:46:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    50:63:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    69:77:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    83:95:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    99:106:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
-    110:126:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    130:142:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    147:148:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    152:155:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> a_
-    160:164:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    169:169:boolean isValidSpawn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-    30:41:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TrapDoorBlock$1 -> bvh$1:
+    43:45:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    49:62:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    68:76:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    82:94:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    98:105:void playSound(net.minecraft.world.entity.player.Player,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean) -> a
+    109:125:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    129:141:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    146:147:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    151:154:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    159:163:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    29:40:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.TrapDoorBlock$1 -> ccd$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     int[] $SwitchMap$net$minecraft$world$level$pathfinder$PathComputationType -> b
-    54:69:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TrappedChestBlock -> bvi:
-    19:20:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    53:68:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.TrappedChestBlock -> cce:
+    19:20:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     24:24:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     29:29:net.minecraft.stats.Stat getOpenChestStat() -> c
-    34:34:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
+    34:34:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
     39:39:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
     44:48:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
     19:19:net.minecraft.world.level.block.entity.BlockEntityType lambda$new$0() -> e
-net.minecraft.world.level.block.TripWireBlock -> bvj:
+net.minecraft.world.level.block.TripWireBlock -> ccf:
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty ATTACHED -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty DISARMED -> c
@@ -55399,27 +60466,27 @@ net.minecraft.world.level.block.TripWireBlock -> bvj:
     net.minecraft.world.phys.shapes.VoxelShape AABB -> h
     net.minecraft.world.phys.shapes.VoxelShape NOT_ATTACHED_AABB -> i
     net.minecraft.world.level.block.TripWireHookBlock hook -> k
-    41:44:void <init>(net.minecraft.world.level.block.TripWireHookBlock,net.minecraft.world.level.block.Block$Properties) -> <init>
-    48:48:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    53:60:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    65:68:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    73:77:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    81:85:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    89:93:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
-    96:112:void updateSource(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    116:125:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    129:134:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    137:160:void checkPressed(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    163:169:boolean shouldConnectTo(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
-    174:182:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    188:196:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    201:202:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    42:45:void <init>(net.minecraft.world.level.block.TripWireHookBlock,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    49:49:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    54:61:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    66:69:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    74:78:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    82:86:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    90:94:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
+    97:113:void updateSource(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    117:126:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    130:135:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    138:161:void checkPressed(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    164:170:boolean shouldConnectTo(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
+    175:183:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    189:197:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    202:203:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     25:36:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TripWireBlock$1 -> bvj$1:
+net.minecraft.world.level.block.TripWireBlock$1 -> ccf$1:
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> b
-    174:188:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TripWireHookBlock -> bvk:
+    175:189:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.TripWireHookBlock -> ccg:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty POWERED -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty ATTACHED -> c
@@ -55427,49 +60494,62 @@ net.minecraft.world.level.block.TripWireHookBlock -> bvk:
     net.minecraft.world.phys.shapes.VoxelShape SOUTH_AABB -> e
     net.minecraft.world.phys.shapes.VoxelShape WEST_AABB -> f
     net.minecraft.world.phys.shapes.VoxelShape EAST_AABB -> g
-    43:45:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    49:58:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    64:67:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    72:75:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    81:100:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    105:106:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    109:183:void calculateState(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean,boolean,int,net.minecraft.world.level.block.state.BlockState) -> a
-    187:188:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    191:200:void playSound(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean,boolean,boolean,boolean) -> a
-    203:205:void notifyNeighbors(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    209:225:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    229:229:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    234:242:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    247:247:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> f
-    252:252:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    257:257:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    262:263:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    29:40:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TripWireHookBlock$1 -> bvk$1:
+    44:46:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    50:59:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    65:68:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    73:76:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    82:101:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    106:107:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    110:184:void calculateState(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean,boolean,int,net.minecraft.world.level.block.state.BlockState) -> a
+    188:189:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    192:201:void playSound(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,boolean,boolean,boolean,boolean) -> a
+    204:206:void notifyNeighbors(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    210:226:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    230:230:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    235:243:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    248:248:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
+    253:253:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    258:258:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    263:264:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    29:41:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.TripWireHookBlock$1 -> ccg$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    49:49:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.TurtleEggBlock -> bvl:
+    50:50:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.TurtleEggBlock -> cch:
     net.minecraft.world.phys.shapes.VoxelShape ONE_EGG_AABB -> c
     net.minecraft.world.phys.shapes.VoxelShape MULTIPLE_EGGS_AABB -> d
     net.minecraft.world.level.block.state.properties.IntegerProperty HATCH -> a
     net.minecraft.world.level.block.state.properties.IntegerProperty EGGS -> b
-    41:43:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    47:49:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    53:58:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
-    61:69:void destroyEgg(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,int) -> a
-    72:82:void decreaseEggs(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    86:108:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    111:111:boolean onSand(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    116:119:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    122:127:boolean shouldUpdateHatchLevel(net.minecraft.world.level.Level) -> a
-    132:135:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
-    139:142:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
-    148:153:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    158:162:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    167:168:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    171:179:boolean canDestroyEgg(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity) -> a
-    34:38:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.VineBlock -> bvm:
+    43:45:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    49:51:void stepOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    55:60:void fallOn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,float) -> a
+    63:73:void destroyEgg(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,int) -> a
+    76:86:void decreaseEggs(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    90:112:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    115:115:boolean onSand(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    119:119:boolean isSand(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    124:127:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    130:135:boolean shouldUpdateHatchLevel(net.minecraft.world.level.Level) -> a
+    140:143:void playerDestroy(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BlockEntity,net.minecraft.world.item.ItemStack) -> a
+    147:150:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
+    156:161:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    166:170:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    175:176:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    179:187:boolean canDestroyEgg(net.minecraft.world.level.Level,net.minecraft.world.entity.Entity) -> a
+    36:40:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.TwistingVines -> cci:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> e
+    13:14:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    18:18:int getBlocksToGrowWhenBonemealed(java.util.Random) -> a
+    23:23:net.minecraft.world.level.block.Block getBodyBlock() -> d
+    28:28:boolean canGrowInto(net.minecraft.world.level.block.state.BlockState) -> h
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.TwistingVinesPlant -> ccj:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> d
+    10:11:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    15:15:net.minecraft.world.level.block.GrowingPlantHeadBlock getHeadBlock() -> c
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.VineBlock -> cck:
     net.minecraft.world.level.block.state.properties.BooleanProperty UP -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty NORTH -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty EAST -> c
@@ -55481,63 +60561,91 @@ net.minecraft.world.level.block.VineBlock -> bvm:
     net.minecraft.world.phys.shapes.VoxelShape WEST_AABB -> i
     net.minecraft.world.phys.shapes.VoxelShape SOUTH_AABB -> j
     net.minecraft.world.phys.shapes.VoxelShape NORTH_AABB -> k
-    40:42:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    46:63:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    40:42:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    46:63:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     68:68:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     72:72:boolean hasFaces(net.minecraft.world.level.block.state.BlockState) -> h
-    76:83:int countFaces(net.minecraft.world.level.block.state.BlockState) -> i
+    76:83:int countFaces(net.minecraft.world.level.block.state.BlockState) -> l
     87:102:boolean canSupportAtFace(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
     106:108:boolean isAcceptableNeighbour(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    112:133:net.minecraft.world.level.block.state.BlockState getUpdatedState(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> n
+    112:133:net.minecraft.world.level.block.state.BlockState getUpdatedState(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> g
     138:148:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    153:252:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    255:263:net.minecraft.world.level.block.state.BlockState copyRandomFaces(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    267:267:boolean hasHorizontalConnection(net.minecraft.world.level.block.state.BlockState) -> r
-    271:286:boolean canSpread(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    291:296:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
-    302:316:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    321:322:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    326:334:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    340:348:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    352:352:net.minecraft.world.level.block.state.properties.BooleanProperty getPropertyForFace(net.minecraft.core.Direction) -> a
+    153:241:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    244:252:net.minecraft.world.level.block.state.BlockState copyRandomFaces(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    256:256:boolean hasHorizontalConnection(net.minecraft.world.level.block.state.BlockState) -> m
+    260:275:boolean canSpread(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    280:285:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
+    291:305:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    310:311:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    315:323:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    329:337:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    341:341:net.minecraft.world.level.block.state.properties.BooleanProperty getPropertyForFace(net.minecraft.core.Direction) -> a
     30:30:boolean lambda$static$0(java.util.Map$Entry) -> a
     24:37:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.VineBlock$1 -> bvm$1:
+net.minecraft.world.level.block.VineBlock$1 -> cck$1:
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> b
-    326:340:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.WallBannerBlock -> bvn:
+    315:329:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.WallBannerBlock -> ccl:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     java.util.Map SHAPES -> b
-    31:33:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.Block$Properties) -> <init>
-    37:37:java.lang.String getDescriptionId() -> k
+    31:33:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    37:37:java.lang.String getDescriptionId() -> i
     43:43:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     48:52:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    57:57:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    57:57:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     62:81:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     86:86:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     91:91:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     96:97:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     21:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.WallBlock -> bvo:
-    net.minecraft.world.level.block.state.properties.BooleanProperty UP -> i
-    net.minecraft.world.phys.shapes.VoxelShape[] shapeWithPostByIndex -> j
-    net.minecraft.world.phys.shapes.VoxelShape[] collisionShapeWithPostByIndex -> k
-    27:32:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    36:39:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    44:47:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    52:52:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    56:59:boolean connectsTo(net.minecraft.world.level.block.state.BlockState,boolean,net.minecraft.core.Direction) -> a
-    64:91:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    96:111:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    116:117:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    21:21:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.WallSignBlock -> bvp:
+net.minecraft.world.level.block.WallBlock -> ccm:
+    net.minecraft.world.level.block.state.properties.BooleanProperty UP -> a
+    net.minecraft.world.level.block.state.properties.EnumProperty EAST_WALL -> b
+    net.minecraft.world.level.block.state.properties.EnumProperty NORTH_WALL -> c
+    net.minecraft.world.level.block.state.properties.EnumProperty SOUTH_WALL -> d
+    net.minecraft.world.level.block.state.properties.EnumProperty WEST_WALL -> e
+    net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> f
+    java.util.Map shapeByIndex -> g
+    java.util.Map collisionShapeByIndex -> h
+    net.minecraft.world.phys.shapes.VoxelShape POST_TEST -> i
+    net.minecraft.world.phys.shapes.VoxelShape NORTH_TEST -> j
+    net.minecraft.world.phys.shapes.VoxelShape SOUTH_TEST -> k
+    net.minecraft.world.phys.shapes.VoxelShape WEST_TEST -> o
+    net.minecraft.world.phys.shapes.VoxelShape EAST_TEST -> p
+    54:59:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    62:68:net.minecraft.world.phys.shapes.VoxelShape applyWallShape(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.level.block.state.properties.WallSide,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    72:119:java.util.Map makeShapes(float,float,float,float,float,float) -> a
+    124:124:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    129:129:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    134:134:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    138:141:boolean connectsTo(net.minecraft.world.level.block.state.BlockState,boolean,net.minecraft.core.Direction) -> a
+    146:168:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    173:185:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    189:189:boolean isConnected(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.properties.Property) -> a
+    193:193:boolean isCovered(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    197:202:net.minecraft.world.level.block.state.BlockState topUpdate(net.minecraft.world.level.LevelReader,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    206:214:net.minecraft.world.level.block.state.BlockState sideUpdate(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
+    218:221:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.LevelReader,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean,boolean,boolean,boolean) -> a
+    225:254:boolean shouldRaisePost(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    259:263:net.minecraft.world.level.block.state.BlockState updateSides(net.minecraft.world.level.block.state.BlockState,boolean,boolean,boolean,boolean,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    267:274:net.minecraft.world.level.block.state.properties.WallSide makeWallState(boolean,net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.world.phys.shapes.VoxelShape) -> a
+    280:283:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    288:288:boolean propagatesSkylightDown(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    293:294:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    298:306:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    312:320:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    29:51:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.WallBlock$1 -> ccm$1:
+    int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
+    int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> b
+    298:312:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.WallSignBlock -> ccn:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> c
     java.util.Map AABBS -> d
-    38:40:void <init>(net.minecraft.world.level.block.Block$Properties,net.minecraft.world.level.block.state.properties.WoodType) -> <init>
-    44:44:java.lang.String getDescriptionId() -> k
-    49:49:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    38:40:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,net.minecraft.world.level.block.state.properties.WoodType) -> <init>
+    44:44:java.lang.String getDescriptionId() -> i
+    49:49:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     54:54:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     60:80:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     85:88:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
@@ -55545,88 +60653,102 @@ net.minecraft.world.level.block.WallSignBlock -> bvp:
     98:98:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     103:104:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     24:34:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.WallSkullBlock -> bvq:
+net.minecraft.world.level.block.WallSkullBlock -> cco:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     java.util.Map AABBS -> b
-    28:30:void <init>(net.minecraft.world.level.block.SkullBlock$Type,net.minecraft.world.level.block.Block$Properties) -> <init>
-    34:34:java.lang.String getDescriptionId() -> k
-    39:39:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    28:30:void <init>(net.minecraft.world.level.block.SkullBlock$Type,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    34:34:java.lang.String getDescriptionId() -> i
+    39:39:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     44:63:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
     68:68:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
     73:73:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
     78:79:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     18:24:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.WallTorchBlock -> bvr:
+net.minecraft.world.level.block.WallTorchBlock -> ccp:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     java.util.Map AABBS -> b
-    35:37:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    41:41:java.lang.String getDescriptionId() -> k
-    46:46:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    50:50:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState) -> h
-    55:59:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    65:84:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    89:92:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    97:107:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    111:111:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    116:116:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    121:122:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    24:31:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.WaterlilyBlock -> bvs:
+    36:38:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties,net.minecraft.core.particles.ParticleOptions) -> <init>
+    42:42:java.lang.String getDescriptionId() -> i
+    47:47:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    51:51:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState) -> h
+    56:60:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    66:85:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    90:93:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    98:108:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    112:112:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    117:117:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    122:123:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    25:32:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.WaterlilyBlock -> ccq:
     net.minecraft.world.phys.shapes.VoxelShape AABB -> a
-    20:21:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    20:21:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     25:30:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    34:34:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    39:40:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
+    34:34:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    39:41:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
     17:17:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.WebBlock -> bvt:
-    11:12:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.WebBlock -> ccr:
+    11:12:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     16:17:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-net.minecraft.world.level.block.WeightedPressurePlateBlock -> bvu:
+net.minecraft.world.level.block.WeepingVines -> ccs:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> e
+    13:14:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    18:18:int getBlocksToGrowWhenBonemealed(java.util.Random) -> a
+    23:23:net.minecraft.world.level.block.Block getBodyBlock() -> d
+    28:28:boolean canGrowInto(net.minecraft.world.level.block.state.BlockState) -> h
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.WeepingVinesPlant -> cct:
+    net.minecraft.world.phys.shapes.VoxelShape SHAPE -> d
+    10:11:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    15:15:net.minecraft.world.level.block.GrowingPlantHeadBlock getHeadBlock() -> c
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.WeightedPressurePlateBlock -> ccu:
     net.minecraft.world.level.block.state.properties.IntegerProperty POWER -> d
     int maxWeight -> e
-    24:27:void <init>(int,net.minecraft.world.level.block.Block$Properties) -> <init>
-    31:37:int getSignalStrength(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-    42:43:void playOnSound(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    47:48:void playOffSound(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
-    52:52:int getSignalForState(net.minecraft.world.level.block.state.BlockState) -> h
-    57:57:net.minecraft.world.level.block.state.BlockState setSignalForState(net.minecraft.world.level.block.state.BlockState,int) -> a
-    62:62:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    67:68:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.WetSpongeBlock -> bvv:
-    16:17:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    23:26:void <init>(int,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    30:36:int getSignalStrength(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
+    41:42:void playOnSound(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    46:47:void playOffSound(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
+    51:51:int getSignalForState(net.minecraft.world.level.block.state.BlockState) -> g
+    56:56:net.minecraft.world.level.block.state.BlockState setSignalForState(net.minecraft.world.level.block.state.BlockState,int) -> a
+    61:61:int getPressedTime() -> c
+    66:67:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.WetSpongeBlock -> ccv:
+    16:17:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     21:26:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
     30:70:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-net.minecraft.world.level.block.WitherRoseBlock -> bvw:
-    24:25:void <init>(net.minecraft.world.effect.MobEffect,net.minecraft.world.level.block.Block$Properties) -> <init>
-    29:30:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
-    35:44:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    48:58:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-net.minecraft.world.level.block.WitherSkullBlock -> bvx:
+net.minecraft.world.level.block.WitherRoseBlock -> ccw:
+    24:25:void <init>(net.minecraft.world.effect.MobEffect,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    29:29:boolean mayPlaceOn(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    34:43:void animateTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    47:57:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+net.minecraft.world.level.block.WitherSkullBlock -> ccx:
     net.minecraft.world.level.block.state.pattern.BlockPattern witherPatternFull -> c
     net.minecraft.world.level.block.state.pattern.BlockPattern witherPatternBase -> d
-    34:35:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
-    39:45:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    48:88:void checkSpawn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.SkullBlockEntity) -> a
-    91:95:boolean canSpawnMob(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> b
-    99:114:net.minecraft.world.level.block.state.pattern.BlockPattern getOrCreateWitherFull() -> c
-    118:130:net.minecraft.world.level.block.state.pattern.BlockPattern getOrCreateWitherBase() -> d
-net.minecraft.world.level.block.WitherWallSkullBlock -> bvy:
-    13:14:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    35:36:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    40:46:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    49:89:void checkSpawn(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.SkullBlockEntity) -> a
+    92:96:boolean canSpawnMob(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> b
+    100:115:net.minecraft.world.level.block.state.pattern.BlockPattern getOrCreateWitherFull() -> c
+    119:131:net.minecraft.world.level.block.state.pattern.BlockPattern getOrCreateWitherBase() -> d
+    126:126:boolean lambda$getOrCreateWitherBase$1(net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
+    107:107:boolean lambda$getOrCreateWitherFull$0(net.minecraft.world.level.block.state.pattern.BlockInWorld) -> b
+net.minecraft.world.level.block.WitherWallSkullBlock -> ccy:
+    13:14:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     18:19:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.level.block.WoodButtonBlock -> bvz:
-    8:9:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+net.minecraft.world.level.block.WoodButtonBlock -> ccz:
+    8:9:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     13:13:net.minecraft.sounds.SoundEvent getSound(boolean) -> a
-net.minecraft.world.level.block.WoolCarpetBlock -> bwa:
+net.minecraft.world.level.block.WoolCarpetBlock -> cda:
     net.minecraft.world.phys.shapes.VoxelShape SHAPE -> a
     net.minecraft.world.item.DyeColor color -> b
-    19:21:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.Block$Properties) -> <init>
+    19:21:void <init>(net.minecraft.world.item.DyeColor,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     24:24:net.minecraft.world.item.DyeColor getColor() -> c
-    29:29:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    29:29:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
     34:38:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
     43:43:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity -> bwb:
+net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity -> cdb:
     int[] SLOTS_FOR_UP -> g
     int[] SLOTS_FOR_DOWN -> h
     int[] SLOTS_FOR_SIDES -> i
@@ -55636,57 +60758,59 @@ net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity -> bwb:
     int cookingProgress -> l
     int cookingTotalTime -> m
     net.minecraft.world.inventory.ContainerData dataAccess -> b
-    java.util.Map recipesUsed -> n
+    it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap recipesUsed -> n
     net.minecraft.world.item.crafting.RecipeType recipeType -> c
-    59:115:void <init>(net.minecraft.world.level.block.entity.BlockEntityType,net.minecraft.world.item.crafting.RecipeType) -> <init>
-    118:181:java.util.Map getFuel() -> f
-    185:188:void add(java.util.Map,net.minecraft.tags.Tag,int) -> a
-    191:192:void add(java.util.Map,net.minecraft.world.level.ItemLike,int) -> a
-    195:195:boolean isLit() -> j
-    200:217:void load(net.minecraft.nbt.CompoundTag) -> a
-    221:237:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    242:300:void tick() -> Z_
-    303:321:boolean canBurn(net.minecraft.world.item.crafting.Recipe) -> b
-    325:347:void burn(net.minecraft.world.item.crafting.Recipe) -> c
-    350:355:int getBurnDuration(net.minecraft.world.item.ItemStack) -> a
-    359:359:int getTotalCookTime() -> h
-    363:363:boolean isFuel(net.minecraft.world.item.ItemStack) -> b
-    368:373:int[] getSlotsForFace(net.minecraft.core.Direction) -> a
-    379:379:boolean canPlaceItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> a
-    384:391:boolean canTakeItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> b
-    396:396:int getContainerSize() -> O_
-    401:406:boolean isEmpty() -> c
-    411:411:net.minecraft.world.item.ItemStack getItem(int) -> a
-    416:416:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
-    421:421:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
-    426:438:void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    442:445:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    450:457:boolean canPlaceItem(int,net.minecraft.world.item.ItemStack) -> b
-    462:463:void clearContent() -> N_
-    467:470:void setRecipeUsed(net.minecraft.world.item.crafting.Recipe) -> a
-    475:475:net.minecraft.world.item.crafting.Recipe getRecipeUsed() -> aa_
-    481:481:void awardAndReset(net.minecraft.world.entity.player.Player) -> b
-    484:495:void awardResetAndExperience(net.minecraft.world.entity.player.Player) -> d
-    498:513:void createExperience(net.minecraft.world.entity.player.Player,int,float) -> a
-    517:520:void fillStackedContents(net.minecraft.world.entity.player.StackedContents) -> a
-    487:489:void lambda$awardResetAndExperience$1(java.util.List,net.minecraft.world.entity.player.Player,java.util.Map$Entry,net.minecraft.world.item.crafting.Recipe) -> a
-    468:468:java.lang.Integer lambda$setRecipeUsed$0(net.minecraft.resources.ResourceLocation,java.lang.Integer) -> a
-    35:35:int access$000(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity) -> a
-    35:35:int access$100(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity) -> b
-    35:35:int access$200(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity) -> c
-    35:35:int access$300(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity) -> d
-    35:35:int access$002(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity,int) -> a
-    35:35:int access$102(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity,int) -> b
-    35:35:int access$202(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity,int) -> c
-    35:35:int access$302(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity,int) -> d
-    41:47:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity$1 -> bwb$1:
+    66:122:void <init>(net.minecraft.world.level.block.entity.BlockEntityType,net.minecraft.world.item.crafting.RecipeType) -> <init>
+    125:188:java.util.Map getFuel() -> f
+    192:192:boolean isNeverAFurnaceFuel(net.minecraft.world.item.Item) -> b
+    196:201:void add(java.util.Map,net.minecraft.tags.Tag,int) -> a
+    204:212:void add(java.util.Map,net.minecraft.world.level.ItemLike,int) -> a
+    215:215:boolean isLit() -> j
+    220:234:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    238:249:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    254:312:void tick() -> al_
+    315:333:boolean canBurn(net.minecraft.world.item.crafting.Recipe) -> b
+    337:359:void burn(net.minecraft.world.item.crafting.Recipe) -> c
+    362:367:int getBurnDuration(net.minecraft.world.item.ItemStack) -> a
+    371:371:int getTotalCookTime() -> h
+    375:375:boolean isFuel(net.minecraft.world.item.ItemStack) -> b
+    380:385:int[] getSlotsForFace(net.minecraft.core.Direction) -> a
+    391:391:boolean canPlaceItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> a
+    396:403:boolean canTakeItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> b
+    408:408:int getContainerSize() -> ab_
+    413:418:boolean isEmpty() -> c
+    423:423:net.minecraft.world.item.ItemStack getItem(int) -> a
+    428:428:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
+    433:433:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
+    438:450:void setItem(int,net.minecraft.world.item.ItemStack) -> a
+    454:457:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    462:469:boolean canPlaceItem(int,net.minecraft.world.item.ItemStack) -> b
+    474:475:void clearContent() -> aa_
+    479:483:void setRecipeUsed(net.minecraft.world.item.crafting.Recipe) -> a
+    488:488:net.minecraft.world.item.crafting.Recipe getRecipeUsed() -> am_
+    494:494:void awardUsedRecipes(net.minecraft.world.entity.player.Player) -> b
+    497:500:void awardUsedRecipesAndPopExperience(net.minecraft.world.entity.player.Player) -> d
+    503:510:java.util.List getRecipesToAwardAndPopExperience(net.minecraft.world.level.Level,net.minecraft.world.phys.Vec3) -> a
+    514:525:void createExperience(net.minecraft.world.level.Level,net.minecraft.world.phys.Vec3,int,float) -> a
+    529:532:void fillStackedContents(net.minecraft.world.entity.player.StackedContents) -> a
+    506:508:void lambda$getRecipesToAwardAndPopExperience$1(java.util.List,net.minecraft.world.level.Level,net.minecraft.world.phys.Vec3,it.unimi.dsi.fastutil.objects.Object2IntMap$Entry,net.minecraft.world.item.crafting.Recipe) -> a
+    246:246:void lambda$save$0(net.minecraft.nbt.CompoundTag,net.minecraft.resources.ResourceLocation,java.lang.Integer) -> a
+    42:42:int access$000(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity) -> a
+    42:42:int access$100(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity) -> b
+    42:42:int access$200(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity) -> c
+    42:42:int access$300(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity) -> d
+    42:42:int access$002(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity,int) -> a
+    42:42:int access$102(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity,int) -> b
+    42:42:int access$202(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity,int) -> c
+    42:42:int access$302(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity,int) -> d
+    48:54:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity$1 -> cdb$1:
     net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity this$0 -> a
-    65:65:void <init>(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity) -> <init>
-    68:80:int get(int) -> a
-    85:101:void set(int,int) -> a
-    105:105:int getCount() -> a
-net.minecraft.world.level.block.entity.BannerBlockEntity -> bwc:
+    72:72:void <init>(net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity) -> <init>
+    75:87:int get(int) -> a
+    92:108:void set(int,int) -> a
+    112:112:int getCount() -> a
+net.minecraft.world.level.block.entity.BannerBlockEntity -> cdc:
     net.minecraft.network.chat.Component name -> a
     net.minecraft.world.item.DyeColor baseColor -> b
     net.minecraft.nbt.ListTag itemPatterns -> c
@@ -55696,11 +60820,11 @@ net.minecraft.world.level.block.entity.BannerBlockEntity -> bwc:
     47:49:void <init>(net.minecraft.world.item.DyeColor) -> <init>
     53:58:net.minecraft.nbt.ListTag getItemPatterns(net.minecraft.world.item.ItemStack) -> a
     62:67:void fromItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.DyeColor) -> a
-    71:74:net.minecraft.network.chat.Component getName() -> M
-    80:80:net.minecraft.network.chat.Component getCustomName() -> O
+    71:74:net.minecraft.network.chat.Component getName() -> P
+    80:80:net.minecraft.network.chat.Component getCustomName() -> R
     84:85:void setCustomName(net.minecraft.network.chat.Component) -> a
-    89:99:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    104:119:void load(net.minecraft.nbt.CompoundTag) -> a
+    89:99:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    104:119:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
     124:124:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
     129:129:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
     133:137:int getPatternCount(net.minecraft.world.item.ItemStack) -> b
@@ -55710,7 +60834,7 @@ net.minecraft.world.level.block.entity.BannerBlockEntity -> bwc:
     184:192:net.minecraft.world.item.ItemStack getItem(net.minecraft.world.level.block.state.BlockState) -> a
     196:199:net.minecraft.world.item.DyeColor getBaseColor(java.util.function.Supplier) -> a
     184:184:net.minecraft.world.level.block.state.BlockState lambda$getItem$0(net.minecraft.world.level.block.state.BlockState) -> b
-net.minecraft.world.level.block.entity.BannerPattern -> bwd:
+net.minecraft.world.level.block.entity.BannerPattern -> cdd:
     net.minecraft.world.level.block.entity.BannerPattern BASE -> a
     net.minecraft.world.level.block.entity.BannerPattern SQUARE_BOTTOM_LEFT -> b
     net.minecraft.world.level.block.entity.BannerPattern SQUARE_BOTTOM_RIGHT -> c
@@ -55751,67 +60875,65 @@ net.minecraft.world.level.block.entity.BannerPattern -> bwd:
     net.minecraft.world.level.block.entity.BannerPattern SKULL -> L
     net.minecraft.world.level.block.entity.BannerPattern FLOWER -> M
     net.minecraft.world.level.block.entity.BannerPattern MOJANG -> N
-    int COUNT -> O
-    int AVAILABLE_PATTERNS -> P
-    java.lang.String filename -> Q
-    java.lang.String hashname -> R
-    java.lang.String[] patterns -> S
-    net.minecraft.world.item.ItemStack patternItem -> T
-    net.minecraft.world.level.block.entity.BannerPattern[] $VALUES -> U
-    16:16:net.minecraft.world.level.block.entity.BannerPattern[] values() -> values
-    16:16:net.minecraft.world.level.block.entity.BannerPattern valueOf(java.lang.String) -> valueOf
-    193:199:void <init>(java.lang.String,int,java.lang.String,java.lang.String) -> <init>
-    202:204:void <init>(java.lang.String,int,java.lang.String,java.lang.String,net.minecraft.world.item.ItemStack) -> <init>
-    207:211:void <init>(java.lang.String,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String) -> <init>
-    214:215:net.minecraft.resources.ResourceLocation location(boolean) -> a
-    219:219:java.lang.String getFilename() -> a
-    223:223:java.lang.String getHashname() -> b
-    227:227:java.lang.String[] getPatterns() -> c
-    231:231:boolean hasPattern() -> d
-    235:235:boolean hasPatternItem() -> e
-    239:239:net.minecraft.world.item.ItemStack getPatternItem() -> f
-    244:249:net.minecraft.world.level.block.entity.BannerPattern byHash(java.lang.String) -> a
-    16:16:java.lang.String access$000(net.minecraft.world.level.block.entity.BannerPattern) -> a
-    16:189:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.BannerPattern$Builder -> bwd$a:
+    net.minecraft.world.level.block.entity.BannerPattern PIGLIN -> O
+    net.minecraft.world.level.block.entity.BannerPattern[] VALUES -> S
+    int COUNT -> P
+    int PATTERN_ITEM_COUNT -> Q
+    int AVAILABLE_PATTERNS -> R
+    boolean hasPatternItem -> T
+    java.lang.String filename -> U
+    java.lang.String hashname -> V
+    net.minecraft.world.level.block.entity.BannerPattern[] $VALUES -> W
+    14:14:net.minecraft.world.level.block.entity.BannerPattern[] values() -> values
+    14:14:net.minecraft.world.level.block.entity.BannerPattern valueOf(java.lang.String) -> valueOf
+    71:72:void <init>(java.lang.String,int,java.lang.String,java.lang.String) -> <init>
+    74:78:void <init>(java.lang.String,int,java.lang.String,java.lang.String,boolean) -> <init>
+    81:82:net.minecraft.resources.ResourceLocation location(boolean) -> a
+    86:86:java.lang.String getFilename() -> a
+    90:90:java.lang.String getHashname() -> b
+    95:100:net.minecraft.world.level.block.entity.BannerPattern byHash(java.lang.String) -> a
+    63:63:boolean lambda$static$0(net.minecraft.world.level.block.entity.BannerPattern) -> b
+    14:14:java.lang.String access$000(net.minecraft.world.level.block.entity.BannerPattern) -> a
+    14:64:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.BannerPattern$Builder -> cdd$a:
     java.util.List patterns -> a
-    252:253:void <init>() -> <init>
-    256:257:net.minecraft.world.level.block.entity.BannerPattern$Builder addPattern(net.minecraft.world.level.block.entity.BannerPattern,net.minecraft.world.item.DyeColor) -> a
-    261:270:net.minecraft.nbt.ListTag toListTag() -> a
-net.minecraft.world.level.block.entity.BarrelBlockEntity -> bwe:
+    103:104:void <init>() -> <init>
+    107:108:net.minecraft.world.level.block.entity.BannerPattern$Builder addPattern(net.minecraft.world.level.block.entity.BannerPattern,net.minecraft.world.item.DyeColor) -> a
+    112:121:net.minecraft.nbt.ListTag toListTag() -> a
+net.minecraft.world.level.block.entity.BarrelBlockEntity -> cde:
     net.minecraft.core.NonNullList items -> a
     int openCount -> b
     24:29:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
     32:33:void <init>() -> <init>
-    37:41:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    46:52:void load(net.minecraft.nbt.CompoundTag) -> a
-    56:56:int getContainerSize() -> O_
+    37:41:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    46:52:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    56:56:int getContainerSize() -> ab_
     61:61:net.minecraft.core.NonNullList getItems() -> f
     66:67:void setItems(net.minecraft.core.NonNullList) -> a
     71:71:net.minecraft.network.chat.Component getDefaultName() -> g
     76:76:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
-    81:95:void startOpen(net.minecraft.world.entity.player.Player) -> a_
+    81:95:void startOpen(net.minecraft.world.entity.player.Player) -> c_
     98:99:void scheduleRecheck() -> j
     102:123:void recheckOpen() -> h
     127:130:void stopOpen(net.minecraft.world.entity.player.Player) -> b_
     133:134:void updateBlockState(net.minecraft.world.level.block.state.BlockState,boolean) -> a
     138:144:void playSound(net.minecraft.world.level.block.state.BlockState,net.minecraft.sounds.SoundEvent) -> a
-net.minecraft.world.level.block.entity.BaseContainerBlockEntity -> bwf:
+net.minecraft.world.level.block.entity.BaseContainerBlockEntity -> cdf:
     net.minecraft.world.LockCode lockKey -> a
     net.minecraft.network.chat.Component name -> b
-    20:25:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
-    29:36:void load(net.minecraft.nbt.CompoundTag) -> a
-    40:47:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    51:52:void setCustomName(net.minecraft.network.chat.Component) -> a
-    56:59:net.minecraft.network.chat.Component getName() -> M
-    64:64:net.minecraft.network.chat.Component getDisplayName() -> d
-    70:70:net.minecraft.network.chat.Component getCustomName() -> O
+    21:26:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
+    30:37:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    41:48:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    52:53:void setCustomName(net.minecraft.network.chat.Component) -> a
+    57:60:net.minecraft.network.chat.Component getName() -> P
+    65:65:net.minecraft.network.chat.Component getDisplayName() -> d
+    71:71:net.minecraft.network.chat.Component getCustomName() -> R
     net.minecraft.network.chat.Component getDefaultName() -> g
-    76:76:boolean canOpen(net.minecraft.world.entity.player.Player) -> e
-    80:86:boolean canUnlock(net.minecraft.world.entity.player.Player,net.minecraft.world.LockCode,net.minecraft.network.chat.Component) -> a
-    92:96:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
+    77:77:boolean canOpen(net.minecraft.world.entity.player.Player) -> e
+    81:87:boolean canUnlock(net.minecraft.world.entity.player.Player,net.minecraft.world.LockCode,net.minecraft.network.chat.Component) -> a
+    93:97:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
     net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
-net.minecraft.world.level.block.entity.BeaconBlockEntity -> bwg:
+net.minecraft.world.level.block.entity.BeaconBlockEntity -> cdg:
     net.minecraft.world.effect.MobEffect[][] BEACON_EFFECTS -> a
     java.util.Set VALID_EFFECTS -> b
     java.util.List beamSections -> c
@@ -55823,10 +60945,10 @@ net.minecraft.world.level.block.entity.BeaconBlockEntity -> bwg:
     net.minecraft.network.chat.Component name -> l
     net.minecraft.world.LockCode lockKey -> m
     net.minecraft.world.inventory.ContainerData dataAccess -> n
-    59:115:void <init>() -> <init>
-    119:207:void tick() -> Z_
-    210:234:void updateBase(int,int,int) -> a
-    238:240:void setRemoved() -> ab_
+    60:116:void <init>() -> <init>
+    120:208:void tick() -> al_
+    211:234:void updateBase(int,int,int) -> a
+    238:240:void setRemoved() -> an_
     243:265:void applyEffects() -> j
     268:269:void playSound(net.minecraft.sounds.SoundEvent) -> a
     272:272:java.util.List getBeamSections() -> f
@@ -55835,27 +60957,27 @@ net.minecraft.world.level.block.entity.BeaconBlockEntity -> bwg:
     287:287:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
     292:292:double getViewDistance() -> i
     297:299:net.minecraft.world.effect.MobEffect getValidEffectById(int) -> b
-    304:314:void load(net.minecraft.nbt.CompoundTag) -> a
-    318:330:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
+    304:314:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    318:330:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
     334:335:void setCustomName(net.minecraft.network.chat.Component) -> a
     340:343:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
     348:348:net.minecraft.network.chat.Component getDisplayName() -> d
-    42:42:int access$000(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> a
-    42:42:net.minecraft.world.effect.MobEffect access$100(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> b
-    42:42:net.minecraft.world.effect.MobEffect access$200(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> c
-    42:42:int access$002(net.minecraft.world.level.block.entity.BeaconBlockEntity,int) -> a
-    42:42:java.util.List access$300(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> d
-    42:42:net.minecraft.world.effect.MobEffect access$102(net.minecraft.world.level.block.entity.BeaconBlockEntity,net.minecraft.world.effect.MobEffect) -> a
-    42:42:net.minecraft.world.effect.MobEffect access$400(int) -> a
-    42:42:net.minecraft.world.effect.MobEffect access$202(net.minecraft.world.level.block.entity.BeaconBlockEntity,net.minecraft.world.effect.MobEffect) -> b
-    45:50:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.BeaconBlockEntity$1 -> bwg$1:
+    43:43:int access$000(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> a
+    43:43:net.minecraft.world.effect.MobEffect access$100(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> b
+    43:43:net.minecraft.world.effect.MobEffect access$200(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> c
+    43:43:int access$002(net.minecraft.world.level.block.entity.BeaconBlockEntity,int) -> a
+    43:43:java.util.List access$300(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> d
+    43:43:net.minecraft.world.effect.MobEffect access$102(net.minecraft.world.level.block.entity.BeaconBlockEntity,net.minecraft.world.effect.MobEffect) -> a
+    43:43:net.minecraft.world.effect.MobEffect access$400(int) -> a
+    43:43:net.minecraft.world.effect.MobEffect access$202(net.minecraft.world.level.block.entity.BeaconBlockEntity,net.minecraft.world.effect.MobEffect) -> b
+    46:51:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.BeaconBlockEntity$1 -> cdg$1:
     net.minecraft.world.level.block.entity.BeaconBlockEntity this$0 -> a
-    75:75:void <init>(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> <init>
-    78:86:int get(int) -> a
-    91:105:void set(int,int) -> a
-    109:109:int getCount() -> a
-net.minecraft.world.level.block.entity.BeaconBlockEntity$BeaconBeamSection -> bwg$a:
+    76:76:void <init>(net.minecraft.world.level.block.entity.BeaconBlockEntity) -> <init>
+    79:87:int get(int) -> a
+    92:106:void set(int,int) -> a
+    110:110:int getCount() -> a
+net.minecraft.world.level.block.entity.BeaconBlockEntity$BeaconBeamSection -> cdg$a:
     float[] color -> a
     int height -> b
     355:358:void <init>(float[]) -> <init>
@@ -55863,18 +60985,18 @@ net.minecraft.world.level.block.entity.BeaconBlockEntity$BeaconBeamSection -> bw
     365:365:float[] getColor() -> b
     369:369:int getHeight() -> c
     351:351:float[] access$500(net.minecraft.world.level.block.entity.BeaconBlockEntity$BeaconBeamSection) -> a
-net.minecraft.world.level.block.entity.BedBlockEntity -> bwh:
+net.minecraft.world.level.block.entity.BedBlockEntity -> cdh:
     net.minecraft.world.item.DyeColor color -> a
     11:12:void <init>() -> <init>
     15:17:void <init>(net.minecraft.world.item.DyeColor) -> <init>
     21:21:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
     25:28:net.minecraft.world.item.DyeColor getColor() -> d
     32:33:void setColor(net.minecraft.world.item.DyeColor) -> a
-net.minecraft.world.level.block.entity.BeehiveBlockEntity -> bwi:
+net.minecraft.world.level.block.entity.BeehiveBlockEntity -> cdi:
     java.util.List stored -> a
     net.minecraft.core.BlockPos savedFlowerPos -> b
     50:63:void <init>() -> <init>
-    67:72:void setChanged() -> e
+    67:72:void setChanged() -> Z_
     75:85:boolean isFireNearby() -> d
     89:89:boolean isEmpty() -> f
     93:93:boolean isFull() -> h
@@ -55886,27 +61008,28 @@ net.minecraft.world.level.block.entity.BeehiveBlockEntity -> bwi:
     136:136:boolean isSedated() -> k
     140:141:void sendDebugPackets() -> l
     144:170:void addOccupantWithPresetTicks(net.minecraft.world.entity.Entity,boolean,int) -> a
-    176:247:boolean releaseOccupant(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag,java.util.List,net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus) -> a
-    251:251:boolean hasSavedFlowerPos() -> x
-    255:270:void tickOccupants() -> y
-    274:290:void tick() -> Z_
-    294:309:void load(net.minecraft.nbt.CompoundTag) -> a
-    313:320:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    324:333:net.minecraft.nbt.ListTag writeBees() -> m
-    197:197:net.minecraft.world.entity.Entity lambda$releaseOccupant$1(net.minecraft.world.entity.Entity) -> a
+    176:249:boolean releaseOccupant(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData,java.util.List,net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus) -> a
+    253:261:void setBeeReleaseData(int,net.minecraft.world.entity.animal.Bee) -> a
+    264:264:boolean hasSavedFlowerPos() -> x
+    268:281:void tickOccupants() -> y
+    285:301:void tick() -> al_
+    305:320:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    324:331:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    335:344:net.minecraft.nbt.ListTag writeBees() -> m
+    198:198:net.minecraft.world.entity.Entity lambda$releaseOccupant$1(net.minecraft.world.entity.Entity) -> a
     117:117:boolean lambda$releaseAllOccupants$0(net.minecraft.world.level.block.state.BlockState,java.util.List,net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus,net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData) -> a
-net.minecraft.world.level.block.entity.BeehiveBlockEntity$1 -> bwi$1:
-net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData -> bwi$a:
+net.minecraft.world.level.block.entity.BeehiveBlockEntity$1 -> cdi$1:
+net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData -> cdi$a:
     net.minecraft.nbt.CompoundTag entityData -> a
     int ticksInHive -> b
     int minOccupationTicks -> c
-    341:346:void <init>(net.minecraft.nbt.CompoundTag,int,int) -> <init>
-    336:336:void <init>(net.minecraft.nbt.CompoundTag,int,int,net.minecraft.world.level.block.entity.BeehiveBlockEntity$1) -> <init>
-    336:336:int access$100(net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData) -> a
-    336:336:int access$200(net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData) -> b
-    336:336:net.minecraft.nbt.CompoundTag access$300(net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData) -> c
-    336:336:int access$108(net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData) -> d
-net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus -> bwi$b:
+    352:357:void <init>(net.minecraft.nbt.CompoundTag,int,int) -> <init>
+    347:347:void <init>(net.minecraft.nbt.CompoundTag,int,int,net.minecraft.world.level.block.entity.BeehiveBlockEntity$1) -> <init>
+    347:347:net.minecraft.nbt.CompoundTag access$100(net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData) -> a
+    347:347:int access$200(net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData) -> b
+    347:347:int access$300(net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData) -> c
+    347:347:int access$208(net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData) -> d
+net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus -> cdi$b:
     net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus HONEY_DELIVERED -> a
     net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus BEE_RELEASED -> b
     net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus EMERGENCY -> c
@@ -55915,7 +61038,7 @@ net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus -> bw
     55:55:net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeReleaseStatus valueOf(java.lang.String) -> valueOf
     55:55:void <init>(java.lang.String,int) -> <init>
     55:58:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.BellBlockEntity -> bwj:
+net.minecraft.world.level.block.entity.BellBlockEntity -> cdj:
     long lastRingTimestamp -> g
     int ticks -> a
     boolean shaking -> b
@@ -55923,25 +61046,25 @@ net.minecraft.world.level.block.entity.BellBlockEntity -> bwj:
     java.util.List nearbyEntities -> h
     boolean resonating -> i
     int resonationTicks -> j
-    43:44:void <init>() -> <init>
-    48:56:boolean triggerEvent(int,int) -> a_
-    61:84:void tick() -> Z_
-    87:88:void playResonateSound() -> d
-    91:101:void onHit(net.minecraft.core.Direction) -> a
-    104:122:void updateEntities() -> f
-    125:136:boolean areRaidersNearby() -> h
-    140:147:void makeRaidersGlow(net.minecraft.world.level.Level) -> a
-    150:176:void showBellParticles(net.minecraft.world.level.Level) -> b
-    179:182:boolean isRaiderWithinRange(net.minecraft.world.entity.LivingEntity) -> a
-    186:187:void glow(net.minecraft.world.entity.LivingEntity) -> b
-    162:175:void lambda$showBellParticles$1(net.minecraft.core.BlockPos,int,java.util.concurrent.atomic.AtomicInteger,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
-    157:157:boolean lambda$showBellParticles$0(net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
-net.minecraft.world.level.block.entity.BlastFurnaceBlockEntity -> bwk:
+    44:45:void <init>() -> <init>
+    49:57:boolean triggerEvent(int,int) -> a_
+    62:85:void tick() -> al_
+    88:89:void playResonateSound() -> d
+    92:102:void onHit(net.minecraft.core.Direction) -> a
+    105:123:void updateEntities() -> f
+    126:137:boolean areRaidersNearby() -> h
+    141:148:void makeRaidersGlow(net.minecraft.world.level.Level) -> a
+    151:177:void showBellParticles(net.minecraft.world.level.Level) -> b
+    180:183:boolean isRaiderWithinRange(net.minecraft.world.entity.LivingEntity) -> a
+    187:188:void glow(net.minecraft.world.entity.LivingEntity) -> b
+    163:176:void lambda$showBellParticles$1(net.minecraft.core.BlockPos,int,org.apache.commons.lang3.mutable.MutableInt,net.minecraft.world.level.Level,net.minecraft.world.entity.LivingEntity) -> a
+    158:158:boolean lambda$showBellParticles$0(net.minecraft.core.BlockPos,net.minecraft.world.entity.LivingEntity) -> a
+net.minecraft.world.level.block.entity.BlastFurnaceBlockEntity -> cdk:
     13:14:void <init>() -> <init>
     18:18:net.minecraft.network.chat.Component getDefaultName() -> g
     23:23:int getBurnDuration(net.minecraft.world.item.ItemStack) -> a
     28:28:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
-net.minecraft.world.level.block.entity.BlockEntity -> bwl:
+net.minecraft.world.level.block.entity.BlockEntity -> cdl:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.level.block.entity.BlockEntityType type -> b
     net.minecraft.world.level.Level level -> d
@@ -55950,39 +61073,38 @@ net.minecraft.world.level.block.entity.BlockEntity -> bwl:
     net.minecraft.world.level.block.state.BlockState blockState -> c
     boolean hasLoggedInvalidStateBefore -> g
     24:34:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
-    38:38:net.minecraft.world.level.Level getLevel() -> w
+    38:38:net.minecraft.world.level.Level getLevel() -> v
     42:44:void setLevelAndPosition(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
     47:47:boolean hasLevel() -> n
-    51:52:void load(net.minecraft.nbt.CompoundTag) -> a
-    55:55:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    59:68:net.minecraft.nbt.CompoundTag saveMetadata(net.minecraft.nbt.CompoundTag) -> d
-    73:93:net.minecraft.world.level.block.entity.BlockEntity loadStatic(net.minecraft.nbt.CompoundTag) -> c
-    100:108:void setChanged() -> e
-    111:114:double distanceToSqr(double,double,double) -> a
-    118:118:double getViewDistance() -> i
-    122:122:net.minecraft.core.BlockPos getBlockPos() -> o
-    129:132:net.minecraft.world.level.block.state.BlockState getBlockState() -> p
-    137:137:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
-    141:141:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
-    145:145:boolean isRemoved() -> q
-    149:150:void setRemoved() -> ab_
-    153:154:void clearRemoved() -> r
-    157:157:boolean triggerEvent(int,int) -> a_
-    161:162:void clearCache() -> s
-    165:174:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
-    177:178:void setPosition(net.minecraft.core.BlockPos) -> a
-    181:181:boolean onlyOpCanSetNbt() -> t
-    185:185:void rotate(net.minecraft.world.level.block.Rotation) -> a
-    188:188:void mirror(net.minecraft.world.level.block.Mirror) -> a
-    191:191:net.minecraft.world.level.block.entity.BlockEntityType getType() -> u
-    195:201:void logInvalidState() -> v
-    200:200:java.lang.Object lambda$logInvalidState$4() -> f
-    165:165:java.lang.String lambda$fillCrashReportCategory$3() -> h
+    51:52:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    55:55:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    59:68:net.minecraft.nbt.CompoundTag saveMetadata(net.minecraft.nbt.CompoundTag) -> b
+    73:93:net.minecraft.world.level.block.entity.BlockEntity loadStatic(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> b
+    100:108:void setChanged() -> Z_
+    112:112:double getViewDistance() -> i
+    116:116:net.minecraft.core.BlockPos getBlockPos() -> o
+    123:126:net.minecraft.world.level.block.state.BlockState getBlockState() -> p
+    131:131:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
+    135:135:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
+    139:139:boolean isRemoved() -> q
+    143:144:void setRemoved() -> an_
+    147:148:void clearRemoved() -> r
+    151:151:boolean triggerEvent(int,int) -> a_
+    155:156:void clearCache() -> s
+    159:168:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
+    171:172:void setPosition(net.minecraft.core.BlockPos) -> a
+    175:175:boolean onlyOpCanSetNbt() -> t
+    179:179:void rotate(net.minecraft.world.level.block.Rotation) -> a
+    182:182:void mirror(net.minecraft.world.level.block.Mirror) -> a
+    185:185:net.minecraft.world.level.block.entity.BlockEntityType getType() -> u
+    189:195:void logInvalidState() -> w
+    194:194:java.lang.Object lambda$logInvalidState$4() -> f
+    159:159:java.lang.String lambda$fillCrashReportCategory$3() -> j
     94:95:net.minecraft.world.level.block.entity.BlockEntity lambda$loadStatic$2(java.lang.String) -> a
-    86:90:net.minecraft.world.level.block.entity.BlockEntity lambda$loadStatic$1(net.minecraft.nbt.CompoundTag,java.lang.String,net.minecraft.world.level.block.entity.BlockEntity) -> a
+    86:90:net.minecraft.world.level.block.entity.BlockEntity lambda$loadStatic$1(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag,java.lang.String,net.minecraft.world.level.block.entity.BlockEntity) -> a
     78:81:net.minecraft.world.level.block.entity.BlockEntity lambda$loadStatic$0(java.lang.String,net.minecraft.world.level.block.entity.BlockEntityType) -> a
     19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.BlockEntityType -> bwm:
+net.minecraft.world.level.block.entity.BlockEntityType -> cdm:
     org.apache.logging.log4j.Logger LOGGER -> H
     net.minecraft.world.level.block.entity.BlockEntityType FURNACE -> a
     net.minecraft.world.level.block.entity.BlockEntityType CHEST -> b
@@ -56020,21 +61142,21 @@ net.minecraft.world.level.block.entity.BlockEntityType -> bwm:
     java.util.function.Supplier factory -> I
     java.util.Set validBlocks -> J
     com.mojang.datafixers.types.Type dataType -> K
-    28:28:net.minecraft.resources.ResourceLocation getKey(net.minecraft.world.level.block.entity.BlockEntityType) -> a
-    66:78:net.minecraft.world.level.block.entity.BlockEntityType register(java.lang.String,net.minecraft.world.level.block.entity.BlockEntityType$Builder) -> a
-    85:89:void <init>(java.util.function.Supplier,java.util.Set,com.mojang.datafixers.types.Type) -> <init>
-    93:93:net.minecraft.world.level.block.entity.BlockEntity create() -> a
-    100:100:boolean isValid(net.minecraft.world.level.block.Block) -> a
-    124:128:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    24:63:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.BlockEntityType$Builder -> bwm$a:
+    26:26:net.minecraft.resources.ResourceLocation getKey(net.minecraft.world.level.block.entity.BlockEntityType) -> a
+    64:68:net.minecraft.world.level.block.entity.BlockEntityType register(java.lang.String,net.minecraft.world.level.block.entity.BlockEntityType$Builder) -> a
+    75:79:void <init>(java.util.function.Supplier,java.util.Set,com.mojang.datafixers.types.Type) -> <init>
+    83:83:net.minecraft.world.level.block.entity.BlockEntity create() -> a
+    90:90:boolean isValid(net.minecraft.world.level.block.Block) -> a
+    114:118:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    22:61:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.BlockEntityType$Builder -> cdm$a:
     java.util.function.Supplier factory -> a
     java.util.Set validBlocks -> b
-    107:110:void <init>(java.util.function.Supplier,java.util.Set) -> <init>
-    113:113:net.minecraft.world.level.block.entity.BlockEntityType$Builder of(java.util.function.Supplier,net.minecraft.world.level.block.Block[]) -> a
-    117:117:net.minecraft.world.level.block.entity.BlockEntityType build(com.mojang.datafixers.types.Type) -> a
-    103:103:java.util.Set access$000(net.minecraft.world.level.block.entity.BlockEntityType$Builder) -> a
-net.minecraft.world.level.block.entity.BrewingStandBlockEntity -> bwn:
+    97:100:void <init>(java.util.function.Supplier,java.util.Set) -> <init>
+    103:103:net.minecraft.world.level.block.entity.BlockEntityType$Builder of(java.util.function.Supplier,net.minecraft.world.level.block.Block[]) -> a
+    107:107:net.minecraft.world.level.block.entity.BlockEntityType build(com.mojang.datafixers.types.Type) -> a
+    93:93:java.util.Set access$000(net.minecraft.world.level.block.entity.BlockEntityType$Builder) -> a
+net.minecraft.world.level.block.entity.BrewingStandBlockEntity -> cdn:
     int[] SLOTS_FOR_UP -> b
     int[] SLOTS_FOR_DOWN -> c
     int[] SLOTS_FOR_SIDES -> g
@@ -56046,14 +61168,14 @@ net.minecraft.world.level.block.entity.BrewingStandBlockEntity -> bwn:
     net.minecraft.world.inventory.ContainerData dataAccess -> a
     49:88:void <init>() -> <init>
     92:92:net.minecraft.network.chat.Component getDefaultName() -> g
-    97:97:int getContainerSize() -> O_
+    97:97:int getContainerSize() -> ab_
     102:107:boolean isEmpty() -> c
-    112:158:void tick() -> Z_
+    112:158:void tick() -> al_
     162:168:boolean[] getPotionBits() -> f
     172:191:boolean isBrewable() -> h
     195:217:void doBrew() -> j
-    221:228:void load(net.minecraft.nbt.CompoundTag) -> a
-    232:239:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
+    221:228:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    232:239:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
     244:247:net.minecraft.world.item.ItemStack getItem(int) -> a
     252:252:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
     257:257:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
@@ -56063,40 +61185,40 @@ net.minecraft.world.level.block.entity.BrewingStandBlockEntity -> bwn:
     294:300:int[] getSlotsForFace(net.minecraft.core.Direction) -> a
     305:305:boolean canPlaceItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> a
     310:313:boolean canTakeItemThroughFace(int,net.minecraft.world.item.ItemStack,net.minecraft.core.Direction) -> b
-    318:319:void clearContent() -> N_
+    318:319:void clearContent() -> aa_
     323:323:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
     30:30:int access$000(net.minecraft.world.level.block.entity.BrewingStandBlockEntity) -> a
     30:30:int access$100(net.minecraft.world.level.block.entity.BrewingStandBlockEntity) -> b
     30:30:int access$002(net.minecraft.world.level.block.entity.BrewingStandBlockEntity,int) -> a
     30:30:int access$102(net.minecraft.world.level.block.entity.BrewingStandBlockEntity,int) -> b
     33:39:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.BrewingStandBlockEntity$1 -> bwn$1:
+net.minecraft.world.level.block.entity.BrewingStandBlockEntity$1 -> cdn$1:
     net.minecraft.world.level.block.entity.BrewingStandBlockEntity this$0 -> a
     56:56:void <init>(net.minecraft.world.level.block.entity.BrewingStandBlockEntity) -> <init>
     59:65:int get(int) -> a
     70:78:void set(int,int) -> a
     82:82:int getCount() -> a
-net.minecraft.world.level.block.entity.CampfireBlockEntity -> bwo:
+net.minecraft.world.level.block.entity.CampfireBlockEntity -> cdo:
     net.minecraft.core.NonNullList items -> a
     int[] cookingProgress -> b
     int[] cookingTime -> c
-    31:37:void <init>() -> <init>
-    41:60:void tick() -> Z_
-    63:79:void cook() -> h
-    82:112:void makeParticles() -> j
-    115:115:net.minecraft.core.NonNullList getItems() -> d
-    120:134:void load(net.minecraft.nbt.CompoundTag) -> a
-    138:143:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    147:151:net.minecraft.nbt.CompoundTag saveMetadataAndItems(net.minecraft.nbt.CompoundTag) -> d
-    157:157:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
-    162:162:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
-    166:170:java.util.Optional getCookableRecipe(net.minecraft.world.item.ItemStack) -> a
-    174:187:boolean placeFood(net.minecraft.world.item.ItemStack,int) -> a
-    191:193:void markUpdated() -> k
-    197:198:void clearContent() -> N_
-    201:206:void dowse() -> f
-    72:72:net.minecraft.world.item.ItemStack lambda$cook$0(net.minecraft.world.Container,net.minecraft.world.item.crafting.CampfireCookingRecipe) -> a
-net.minecraft.world.level.block.entity.ChestBlockEntity -> bwp:
+    32:38:void <init>() -> <init>
+    42:61:void tick() -> al_
+    64:80:void cook() -> h
+    83:113:void makeParticles() -> j
+    116:116:net.minecraft.core.NonNullList getItems() -> d
+    121:135:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    139:144:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    148:152:net.minecraft.nbt.CompoundTag saveMetadataAndItems(net.minecraft.nbt.CompoundTag) -> b
+    158:158:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
+    163:163:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
+    167:171:java.util.Optional getCookableRecipe(net.minecraft.world.item.ItemStack) -> a
+    175:188:boolean placeFood(net.minecraft.world.item.ItemStack,int) -> a
+    192:194:void markUpdated() -> k
+    198:199:void clearContent() -> aa_
+    203:210:void dowse() -> f
+    73:73:net.minecraft.world.item.ItemStack lambda$cook$0(net.minecraft.world.Container,net.minecraft.world.item.crafting.CampfireCookingRecipe) -> a
+net.minecraft.world.level.block.entity.ChestBlockEntity -> cdp:
     net.minecraft.core.NonNullList items -> i
     float openness -> a
     float oOpenness -> b
@@ -56104,16 +61226,16 @@ net.minecraft.world.level.block.entity.ChestBlockEntity -> bwp:
     int tickInterval -> j
     33:42:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
     45:46:void <init>() -> <init>
-    50:50:int getContainerSize() -> O_
+    50:50:int getContainerSize() -> ab_
     55:55:net.minecraft.network.chat.Component getDefaultName() -> g
-    60:66:void load(net.minecraft.nbt.CompoundTag) -> a
-    70:75:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    80:112:void tick() -> Z_
+    60:66:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    70:75:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    80:112:void tick() -> al_
     115:119:int getOpenCount(net.minecraft.world.level.Level,net.minecraft.world.level.block.entity.BaseContainerBlockEntity,int,int,int,int,int) -> a
     123:135:int getOpenCount(net.minecraft.world.level.Level,net.minecraft.world.level.block.entity.BaseContainerBlockEntity,int,int,int) -> a
     139:156:void playSound(net.minecraft.sounds.SoundEvent) -> a
     160:164:boolean triggerEvent(int,int) -> a_
-    169:176:void startOpen(net.minecraft.world.entity.player.Player) -> a_
+    169:176:void startOpen(net.minecraft.world.entity.player.Player) -> c_
     180:184:void stopOpen(net.minecraft.world.entity.player.Player) -> b_
     187:192:void signalOpenCount() -> h
     196:196:net.minecraft.core.NonNullList getItems() -> f
@@ -56122,57 +61244,56 @@ net.minecraft.world.level.block.entity.ChestBlockEntity -> bwp:
     210:217:int getOpenCount(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
     221:224:void swapContents(net.minecraft.world.level.block.entity.ChestBlockEntity,net.minecraft.world.level.block.entity.ChestBlockEntity) -> a
     228:228:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
-net.minecraft.world.level.block.entity.CommandBlockEntity -> bwq:
+net.minecraft.world.level.block.entity.CommandBlockEntity -> cdq:
     boolean powered -> a
     boolean auto -> b
     boolean conditionMet -> c
     boolean sendToClient -> g
     net.minecraft.world.level.BaseCommandBlock commandBlock -> h
-    27:164:void <init>() -> <init>
-    32:38:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    43:48:void load(net.minecraft.nbt.CompoundTag) -> a
-    53:58:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
-    63:63:boolean onlyOpCanSetNbt() -> t
-    67:67:net.minecraft.world.level.BaseCommandBlock getCommandBlock() -> d
-    71:72:void setPowered(boolean) -> a
-    75:75:boolean isPowered() -> f
-    79:79:boolean isAutomatic() -> g
-    83:88:void setAutomatic(boolean) -> b
-    91:95:void onModeSwitch() -> h
-    98:104:void scheduleTick() -> y
-    107:107:boolean wasConditionMet() -> j
-    111:121:boolean markConditionMet() -> k
-    125:125:boolean isSendToClient() -> l
-    129:130:void setSendToClient(boolean) -> c
-    133:141:net.minecraft.world.level.block.entity.CommandBlockEntity$Mode getMode() -> m
-    145:149:boolean isConditional() -> x
-    154:156:void clearRemoved() -> r
-net.minecraft.world.level.block.entity.CommandBlockEntity$1 -> bwq$1:
+    26:163:void <init>() -> <init>
+    31:37:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    42:47:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    52:57:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
+    62:62:boolean onlyOpCanSetNbt() -> t
+    66:66:net.minecraft.world.level.BaseCommandBlock getCommandBlock() -> d
+    70:71:void setPowered(boolean) -> a
+    74:74:boolean isPowered() -> f
+    78:78:boolean isAutomatic() -> g
+    82:87:void setAutomatic(boolean) -> b
+    90:94:void onModeSwitch() -> h
+    97:103:void scheduleTick() -> y
+    106:106:boolean wasConditionMet() -> j
+    110:120:boolean markConditionMet() -> k
+    124:124:boolean isSendToClient() -> l
+    128:129:void setSendToClient(boolean) -> c
+    132:140:net.minecraft.world.level.block.entity.CommandBlockEntity$Mode getMode() -> m
+    144:148:boolean isConditional() -> x
+    153:155:void clearRemoved() -> r
+net.minecraft.world.level.block.entity.CommandBlockEntity$1 -> cdq$1:
     net.minecraft.world.level.block.entity.CommandBlockEntity this$0 -> b
-    164:164:void <init>(net.minecraft.world.level.block.entity.CommandBlockEntity) -> <init>
-    167:169:void setCommand(java.lang.String) -> a
-    173:173:net.minecraft.server.level.ServerLevel getLevel() -> d
-    178:180:void onUpdated() -> e
-    184:187:void writeCoordinates(io.netty.buffer.ByteBuf) -> a
-    191:191:net.minecraft.world.phys.Vec3 getPosition() -> f
-    196:196:net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> h
-net.minecraft.world.level.block.entity.CommandBlockEntity$Mode -> bwq$a:
+    163:163:void <init>(net.minecraft.world.level.block.entity.CommandBlockEntity) -> <init>
+    166:168:void setCommand(java.lang.String) -> a
+    172:172:net.minecraft.server.level.ServerLevel getLevel() -> d
+    177:179:void onUpdated() -> e
+    183:183:net.minecraft.world.phys.Vec3 getPosition() -> f
+    188:188:net.minecraft.commands.CommandSourceStack createCommandSourceStack() -> h
+net.minecraft.world.level.block.entity.CommandBlockEntity$Mode -> cdq$a:
     net.minecraft.world.level.block.entity.CommandBlockEntity$Mode SEQUENCE -> a
     net.minecraft.world.level.block.entity.CommandBlockEntity$Mode AUTO -> b
     net.minecraft.world.level.block.entity.CommandBlockEntity$Mode REDSTONE -> c
     net.minecraft.world.level.block.entity.CommandBlockEntity$Mode[] $VALUES -> d
-    158:158:net.minecraft.world.level.block.entity.CommandBlockEntity$Mode[] values() -> values
-    158:158:net.minecraft.world.level.block.entity.CommandBlockEntity$Mode valueOf(java.lang.String) -> valueOf
-    158:158:void <init>(java.lang.String,int) -> <init>
-    158:161:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.ComparatorBlockEntity -> bwr:
+    157:157:net.minecraft.world.level.block.entity.CommandBlockEntity$Mode[] values() -> values
+    157:157:net.minecraft.world.level.block.entity.CommandBlockEntity$Mode valueOf(java.lang.String) -> valueOf
+    157:157:void <init>(java.lang.String,int) -> <init>
+    157:160:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.ComparatorBlockEntity -> cdr:
     int output -> a
-    9:10:void <init>() -> <init>
-    14:17:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    22:24:void load(net.minecraft.nbt.CompoundTag) -> a
-    27:27:int getOutputSignal() -> d
-    31:32:void setOutputSignal(int) -> a
-net.minecraft.world.level.block.entity.ConduitBlockEntity -> bws:
+    10:11:void <init>() -> <init>
+    15:18:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    23:25:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    28:28:int getOutputSignal() -> d
+    32:33:void setOutputSignal(int) -> a
+net.minecraft.world.level.block.entity.ConduitBlockEntity -> cds:
     net.minecraft.world.level.block.Block[] VALID_BLOCKS -> b
     int tickCount -> a
     float activeRotation -> c
@@ -56182,51 +61303,51 @@ net.minecraft.world.level.block.entity.ConduitBlockEntity -> bws:
     net.minecraft.world.entity.LivingEntity destroyTarget -> j
     java.util.UUID destroyTargetUUID -> k
     long nextAmbientSoundActivation -> l
-    56:57:void <init>() -> <init>
-    47:61:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
-    65:72:void load(net.minecraft.nbt.CompoundTag) -> a
-    76:82:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    88:88:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
-    93:93:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
-    98:125:void tick() -> Z_
-    128:167:boolean updateShape() -> h
-    171:190:void applyEffects() -> j
-    193:219:void updateDestroyTarget() -> k
-    222:230:void updateClientTarget() -> l
-    233:236:net.minecraft.world.phys.AABB getDestroyRangeAABB() -> m
-    241:245:net.minecraft.world.entity.LivingEntity findDestroyTarget() -> x
-    249:276:void animationTick() -> y
-    279:279:boolean isActive() -> d
-    283:283:boolean isHunting() -> f
-    287:292:void setActive(boolean) -> a
-    295:296:void setHunting(boolean) -> b
-    299:299:float getActiveRotation(float) -> a
-    303:304:void playSound(net.minecraft.sounds.SoundEvent) -> a
-    241:241:boolean lambda$findDestroyTarget$1(net.minecraft.world.entity.LivingEntity) -> a
-    202:202:boolean lambda$updateDestroyTarget$0(net.minecraft.world.entity.LivingEntity) -> b
-    40:40:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.DaylightDetectorBlockEntity -> bwt:
+    55:56:void <init>() -> <init>
+    46:60:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
+    64:71:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    75:81:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    87:87:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
+    92:92:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
+    97:124:void tick() -> al_
+    127:166:boolean updateShape() -> h
+    170:189:void applyEffects() -> j
+    192:218:void updateDestroyTarget() -> k
+    221:229:void updateClientTarget() -> l
+    232:235:net.minecraft.world.phys.AABB getDestroyRangeAABB() -> m
+    240:244:net.minecraft.world.entity.LivingEntity findDestroyTarget() -> x
+    248:275:void animationTick() -> y
+    278:278:boolean isActive() -> d
+    282:282:boolean isHunting() -> f
+    286:291:void setActive(boolean) -> a
+    294:295:void setHunting(boolean) -> b
+    298:298:float getActiveRotation(float) -> a
+    302:303:void playSound(net.minecraft.sounds.SoundEvent) -> a
+    240:240:boolean lambda$findDestroyTarget$1(net.minecraft.world.entity.LivingEntity) -> a
+    201:201:boolean lambda$updateDestroyTarget$0(net.minecraft.world.entity.LivingEntity) -> b
+    39:39:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.DaylightDetectorBlockEntity -> cdt:
     10:11:void <init>() -> <init>
-    15:22:void tick() -> Z_
-net.minecraft.world.level.block.entity.DispenserBlockEntity -> bwu:
+    15:22:void tick() -> al_
+net.minecraft.world.level.block.entity.DispenserBlockEntity -> cdu:
     java.util.Random RANDOM -> a
     net.minecraft.core.NonNullList items -> b
-    19:23:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
-    26:27:void <init>() -> <init>
-    31:31:int getContainerSize() -> O_
-    35:45:int getRandomSlot() -> h
-    49:56:int addItem(net.minecraft.world.item.ItemStack) -> a
-    61:61:net.minecraft.network.chat.Component getDefaultName() -> g
-    66:72:void load(net.minecraft.nbt.CompoundTag) -> a
-    76:81:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    86:86:net.minecraft.core.NonNullList getItems() -> f
-    91:92:void setItems(net.minecraft.core.NonNullList) -> a
-    96:96:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.DropperBlockEntity -> bwv:
+    20:24:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
+    27:28:void <init>() -> <init>
+    32:32:int getContainerSize() -> ab_
+    36:46:int getRandomSlot() -> h
+    50:57:int addItem(net.minecraft.world.item.ItemStack) -> a
+    62:62:net.minecraft.network.chat.Component getDefaultName() -> g
+    67:73:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    77:82:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    87:87:net.minecraft.core.NonNullList getItems() -> f
+    92:93:void setItems(net.minecraft.core.NonNullList) -> a
+    97:97:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.DropperBlockEntity -> cdv:
     8:9:void <init>() -> <init>
     13:13:net.minecraft.network.chat.Component getDefaultName() -> g
-net.minecraft.world.level.block.entity.EnchantmentTableBlockEntity -> bww:
+net.minecraft.world.level.block.entity.EnchantmentTableBlockEntity -> cdw:
     int time -> a
     float flip -> b
     float oFlip -> c
@@ -56239,56 +61360,56 @@ net.minecraft.world.level.block.entity.EnchantmentTableBlockEntity -> bww:
     float tRot -> m
     java.util.Random RANDOM -> n
     net.minecraft.network.chat.Component name -> o
-    29:30:void <init>() -> <init>
-    34:39:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    44:48:void load(net.minecraft.nbt.CompoundTag) -> a
-    52:108:void tick() -> Z_
-    112:115:net.minecraft.network.chat.Component getName() -> M
-    119:120:void setCustomName(net.minecraft.network.chat.Component) -> a
-    125:125:net.minecraft.network.chat.Component getCustomName() -> O
-    25:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.EnderChestBlockEntity -> bwx:
+    30:31:void <init>() -> <init>
+    35:40:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    45:49:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    53:109:void tick() -> al_
+    113:116:net.minecraft.network.chat.Component getName() -> P
+    120:121:void setCustomName(net.minecraft.network.chat.Component) -> a
+    126:126:net.minecraft.network.chat.Component getCustomName() -> R
+    26:26:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.EnderChestBlockEntity -> cdx:
     float openness -> a
     float oOpenness -> b
     int openCount -> c
     int tickInterval -> g
     17:18:void <init>() -> <init>
-    22:60:void tick() -> Z_
+    22:60:void tick() -> al_
     64:68:boolean triggerEvent(int,int) -> a_
-    73:75:void setRemoved() -> ab_
+    73:75:void setRemoved() -> an_
     78:80:void startOpen() -> d
     83:85:void stopOpen() -> f
     88:95:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
     100:100:float getOpenNess(float) -> a
-net.minecraft.world.level.block.entity.FurnaceBlockEntity -> bwy:
+net.minecraft.world.level.block.entity.FurnaceBlockEntity -> cdy:
     12:13:void <init>() -> <init>
     17:17:net.minecraft.network.chat.Component getDefaultName() -> g
     22:22:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
-net.minecraft.world.level.block.entity.Hopper -> bwz:
+net.minecraft.world.level.block.entity.Hopper -> cdz:
     net.minecraft.world.phys.shapes.VoxelShape INSIDE -> a
     net.minecraft.world.phys.shapes.VoxelShape ABOVE -> b
     net.minecraft.world.phys.shapes.VoxelShape SUCK -> c
-    17:17:net.minecraft.world.phys.shapes.VoxelShape getSuckShape() -> P_
-    net.minecraft.world.level.Level getLevel() -> w
-    double getLevelX() -> z
-    double getLevelY() -> A
-    double getLevelZ() -> B
+    17:17:net.minecraft.world.phys.shapes.VoxelShape getSuckShape() -> ac_
+    net.minecraft.world.level.Level getLevel() -> v
+    double getLevelX() -> x
+    double getLevelY() -> z
+    double getLevelZ() -> A
     12:14:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.HopperBlockEntity -> bxa:
+net.minecraft.world.level.block.entity.HopperBlockEntity -> cea:
     net.minecraft.core.NonNullList items -> i
     int cooldownTime -> j
     long tickedGameTime -> k
     39:45:void <init>() -> <init>
-    49:56:void load(net.minecraft.nbt.CompoundTag) -> a
-    60:67:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    72:72:int getContainerSize() -> O_
+    49:56:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    60:67:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    72:72:int getContainerSize() -> ab_
     77:80:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
     85:91:void setItem(int,net.minecraft.world.item.ItemStack) -> a
     95:95:net.minecraft.network.chat.Component getDefaultName() -> g
-    100:111:void tick() -> Z_
+    100:111:void tick() -> al_
     114:135:boolean tryMoveItems(java.util.function.Supplier) -> a
-    139:145:boolean inventoryFull() -> h
-    149:175:boolean ejectItems() -> j
+    139:145:boolean inventoryFull() -> j
+    149:175:boolean ejectItems() -> k
     179:183:java.util.stream.IntStream getSlots(net.minecraft.world.Container,net.minecraft.core.Direction) -> a
     187:187:boolean isFullContainer(net.minecraft.world.Container,net.minecraft.core.Direction) -> b
     194:194:boolean isEmptyContainer(net.minecraft.world.Container,net.minecraft.core.Direction) -> c
@@ -56299,18 +61420,18 @@ net.minecraft.world.level.block.entity.HopperBlockEntity -> bxa:
     272:278:boolean canPlaceItemInContainer(net.minecraft.world.Container,net.minecraft.world.item.ItemStack,int,net.minecraft.core.Direction) -> a
     282:285:boolean canTakeItemFromContainer(net.minecraft.world.Container,net.minecraft.world.item.ItemStack,int,net.minecraft.core.Direction) -> b
     289:324:net.minecraft.world.item.ItemStack tryMoveInItem(net.minecraft.world.Container,net.minecraft.world.Container,net.minecraft.world.item.ItemStack,int,net.minecraft.core.Direction) -> a
-    329:330:net.minecraft.world.Container getAttachedContainer() -> k
+    329:330:net.minecraft.world.Container getAttachedContainer() -> l
     335:335:net.minecraft.world.Container getSourceContainer(net.minecraft.world.level.block.entity.Hopper) -> b
     339:339:java.util.List getItemsAtAndAbove(net.minecraft.world.level.block.entity.Hopper) -> c
     344:344:net.minecraft.world.Container getContainerAt(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
     349:381:net.minecraft.world.Container getContainerAt(net.minecraft.world.level.Level,double,double,double) -> a
     385:397:boolean canMergeItems(net.minecraft.world.item.ItemStack,net.minecraft.world.item.ItemStack) -> a
-    402:402:double getLevelX() -> z
-    407:407:double getLevelY() -> A
-    412:412:double getLevelZ() -> B
+    402:402:double getLevelX() -> x
+    407:407:double getLevelY() -> z
+    412:412:double getLevelZ() -> A
     416:417:void setCooldown(int) -> c
-    420:420:boolean isOnCooldown() -> l
-    424:424:boolean isOnCustomCooldown() -> m
+    420:420:boolean isOnCooldown() -> m
+    424:424:boolean isOnCustomCooldown() -> y
     429:429:net.minecraft.core.NonNullList getItems() -> f
     434:435:void setItems(net.minecraft.core.NonNullList) -> a
     438:444:void entityInside(net.minecraft.world.entity.Entity) -> a
@@ -56320,102 +61441,125 @@ net.minecraft.world.level.block.entity.HopperBlockEntity -> bxa:
     206:206:boolean lambda$suckInItems$3(net.minecraft.world.level.block.entity.Hopper,net.minecraft.world.Container,net.minecraft.core.Direction,int) -> a
     194:194:boolean lambda$isEmptyContainer$2(net.minecraft.world.Container,int) -> a
     188:189:boolean lambda$isFullContainer$1(net.minecraft.world.Container,int) -> b
-    109:109:java.lang.Boolean lambda$tick$0() -> x
-net.minecraft.world.level.block.entity.JigsawBlockEntity -> bxb:
-    net.minecraft.resources.ResourceLocation attachementType -> a
-    net.minecraft.resources.ResourceLocation targetPool -> b
-    java.lang.String finalState -> c
-    10:16:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
-    19:20:void <init>() -> <init>
-    23:23:net.minecraft.resources.ResourceLocation getAttachementType() -> d
-    27:27:net.minecraft.resources.ResourceLocation getTargetPool() -> f
-    31:31:java.lang.String getFinalState() -> g
-    35:36:void setAttachementType(net.minecraft.resources.ResourceLocation) -> a
-    39:40:void setTargetPool(net.minecraft.resources.ResourceLocation) -> b
-    43:44:void setFinalState(java.lang.String) -> a
-    48:52:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    57:61:void load(net.minecraft.nbt.CompoundTag) -> a
-    66:66:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
-    71:71:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
-net.minecraft.world.level.block.entity.JukeboxBlockEntity -> bxc:
+    109:109:java.lang.Boolean lambda$tick$0() -> B
+net.minecraft.world.level.block.entity.JigsawBlockEntity -> ceb:
+    net.minecraft.resources.ResourceLocation name -> a
+    net.minecraft.resources.ResourceLocation target -> b
+    net.minecraft.resources.ResourceLocation pool -> c
+    net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType joint -> g
+    java.lang.String finalState -> h
+    64:72:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
+    75:76:void <init>() -> <init>
+    79:79:net.minecraft.resources.ResourceLocation getName() -> d
+    83:83:net.minecraft.resources.ResourceLocation getTarget() -> f
+    87:87:net.minecraft.resources.ResourceLocation getPool() -> g
+    91:91:java.lang.String getFinalState() -> h
+    95:95:net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType getJoint() -> j
+    99:100:void setName(net.minecraft.resources.ResourceLocation) -> a
+    103:104:void setTarget(net.minecraft.resources.ResourceLocation) -> b
+    107:108:void setPool(net.minecraft.resources.ResourceLocation) -> c
+    111:112:void setFinalState(java.lang.String) -> a
+    115:116:void setJoint(net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType) -> a
+    120:126:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    131:138:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    143:143:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
+    148:148:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
+    152:171:void generate(net.minecraft.server.level.ServerLevel,int,boolean) -> a
+    137:137:net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType lambda$load$0(net.minecraft.world.level.block.state.BlockState) -> a
+net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType -> ceb$a:
+    net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType ROLLABLE -> a
+    net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType ALIGNED -> b
+    java.lang.String name -> c
+    net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType[] $VALUES -> d
+    33:33:net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType[] values() -> values
+    33:33:net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType valueOf(java.lang.String) -> valueOf
+    39:41:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    45:45:java.lang.String getSerializedName() -> a
+    49:49:java.util.Optional byName(java.lang.String) -> a
+    49:49:boolean lambda$byName$0(java.lang.String,net.minecraft.world.level.block.entity.JigsawBlockEntity$JointType) -> a
+    33:35:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.JigsawBlockEntity$RuntimePiece -> ceb$b:
+    175:176:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement,net.minecraft.core.BlockPos,int,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
+    179:180:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+net.minecraft.world.level.block.entity.JukeboxBlockEntity -> cec:
     net.minecraft.world.item.ItemStack record -> a
-    9:13:void <init>() -> <init>
-    17:22:void load(net.minecraft.nbt.CompoundTag) -> a
-    26:32:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    36:36:net.minecraft.world.item.ItemStack getRecord() -> d
-    40:42:void setRecord(net.minecraft.world.item.ItemStack) -> a
-    46:47:void clearContent() -> N_
-net.minecraft.world.level.block.entity.LecternBlockEntity -> bxd:
+    10:14:void <init>() -> <init>
+    18:23:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    27:33:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    37:37:net.minecraft.world.item.ItemStack getRecord() -> d
+    41:43:void setRecord(net.minecraft.world.item.ItemStack) -> a
+    47:48:void clearContent() -> aa_
+net.minecraft.world.level.block.entity.LecternBlockEntity -> ced:
     net.minecraft.world.Container bookAccess -> a
     net.minecraft.world.inventory.ContainerData dataAccess -> b
     net.minecraft.world.item.ItemStack book -> c
     int page -> g
     int pageCount -> h
-    39:139:void <init>() -> <init>
-    142:142:net.minecraft.world.item.ItemStack getBook() -> f
-    146:147:boolean hasBook() -> g
-    151:152:void setBook(net.minecraft.world.item.ItemStack) -> a
-    155:158:void onBookItemRemove() -> k
-    161:165:void setBook(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player) -> a
-    168:174:void setPage(int) -> a
-    177:177:int getPage() -> h
-    181:182:int getRedstoneSignal() -> j
-    186:189:net.minecraft.world.item.ItemStack resolveBook(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player) -> b
-    195:203:net.minecraft.commands.CommandSourceStack createCommandSourceStack(net.minecraft.world.entity.player.Player) -> a
-    208:208:boolean onlyOpCanSetNbt() -> t
-    213:223:void load(net.minecraft.nbt.CompoundTag) -> a
-    227:234:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    239:240:void clearContent() -> N_
-    244:244:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
-    249:249:net.minecraft.network.chat.Component getDisplayName() -> d
-    32:32:net.minecraft.world.item.ItemStack access$000(net.minecraft.world.level.block.entity.LecternBlockEntity) -> a
-    32:32:void access$100(net.minecraft.world.level.block.entity.LecternBlockEntity) -> b
-    32:32:net.minecraft.world.item.ItemStack access$002(net.minecraft.world.level.block.entity.LecternBlockEntity,net.minecraft.world.item.ItemStack) -> a
-    32:32:int access$200(net.minecraft.world.level.block.entity.LecternBlockEntity) -> c
-    32:32:void access$300(net.minecraft.world.level.block.entity.LecternBlockEntity,int) -> a
-net.minecraft.world.level.block.entity.LecternBlockEntity$1 -> bxd$1:
+    40:140:void <init>() -> <init>
+    143:143:net.minecraft.world.item.ItemStack getBook() -> f
+    147:148:boolean hasBook() -> g
+    152:153:void setBook(net.minecraft.world.item.ItemStack) -> a
+    156:159:void onBookItemRemove() -> k
+    162:166:void setBook(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player) -> a
+    169:175:void setPage(int) -> a
+    178:178:int getPage() -> h
+    182:183:int getRedstoneSignal() -> j
+    187:190:net.minecraft.world.item.ItemStack resolveBook(net.minecraft.world.item.ItemStack,net.minecraft.world.entity.player.Player) -> b
+    196:204:net.minecraft.commands.CommandSourceStack createCommandSourceStack(net.minecraft.world.entity.player.Player) -> a
+    209:209:boolean onlyOpCanSetNbt() -> t
+    214:224:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    228:235:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    240:241:void clearContent() -> aa_
+    245:245:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
+    250:250:net.minecraft.network.chat.Component getDisplayName() -> d
+    33:33:net.minecraft.world.item.ItemStack access$000(net.minecraft.world.level.block.entity.LecternBlockEntity) -> a
+    33:33:void access$100(net.minecraft.world.level.block.entity.LecternBlockEntity) -> b
+    33:33:net.minecraft.world.item.ItemStack access$002(net.minecraft.world.level.block.entity.LecternBlockEntity,net.minecraft.world.item.ItemStack) -> a
+    33:33:int access$200(net.minecraft.world.level.block.entity.LecternBlockEntity) -> c
+    33:33:void access$300(net.minecraft.world.level.block.entity.LecternBlockEntity,int) -> a
+net.minecraft.world.level.block.entity.LecternBlockEntity$1 -> ced$1:
     net.minecraft.world.level.block.entity.LecternBlockEntity this$0 -> a
-    39:39:void <init>(net.minecraft.world.level.block.entity.LecternBlockEntity) -> <init>
-    42:42:int getContainerSize() -> O_
-    47:47:boolean isEmpty() -> c
-    52:52:net.minecraft.world.item.ItemStack getItem(int) -> a
-    57:64:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
-    69:75:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
-    81:81:void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    85:85:int getMaxStackSize() -> L_
-    90:91:void setChanged() -> e
-    95:101:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    106:106:boolean canPlaceItem(int,net.minecraft.world.item.ItemStack) -> b
-    111:111:void clearContent() -> N_
-net.minecraft.world.level.block.entity.LecternBlockEntity$2 -> bxd$2:
+    40:40:void <init>(net.minecraft.world.level.block.entity.LecternBlockEntity) -> <init>
+    43:43:int getContainerSize() -> ab_
+    48:48:boolean isEmpty() -> c
+    53:53:net.minecraft.world.item.ItemStack getItem(int) -> a
+    58:65:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
+    70:76:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
+    82:82:void setItem(int,net.minecraft.world.item.ItemStack) -> a
+    86:86:int getMaxStackSize() -> X_
+    91:92:void setChanged() -> Z_
+    96:102:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    107:107:boolean canPlaceItem(int,net.minecraft.world.item.ItemStack) -> b
+    112:112:void clearContent() -> aa_
+net.minecraft.world.level.block.entity.LecternBlockEntity$2 -> ced$2:
     net.minecraft.world.level.block.entity.LecternBlockEntity this$0 -> a
-    114:114:void <init>(net.minecraft.world.level.block.entity.LecternBlockEntity) -> <init>
-    117:117:int get(int) -> a
-    122:125:void set(int,int) -> a
-    129:129:int getCount() -> a
-net.minecraft.world.level.block.entity.LidBlockEntity -> bxe:
+    115:115:void <init>(net.minecraft.world.level.block.entity.LecternBlockEntity) -> <init>
+    118:118:int get(int) -> a
+    123:126:void set(int,int) -> a
+    130:130:int getCount() -> a
+net.minecraft.world.level.block.entity.LidBlockEntity -> cee:
     float getOpenNess(float) -> a
-net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity -> bxf:
+net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity -> cef:
     net.minecraft.resources.ResourceLocation lootTable -> g
     long lootTableSeed -> h
-    32:33:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
-    36:40:void setLootTable(net.minecraft.world.level.BlockGetter,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.resources.ResourceLocation) -> a
-    43:48:boolean tryLoadLootTable(net.minecraft.nbt.CompoundTag) -> d
-    52:60:boolean trySaveLootTable(net.minecraft.nbt.CompoundTag) -> e
-    64:77:void unpackLootTable(net.minecraft.world.entity.player.Player) -> d
-    80:82:void setLootTable(net.minecraft.resources.ResourceLocation,long) -> a
-    86:87:boolean isEmpty() -> c
-    92:93:net.minecraft.world.item.ItemStack getItem(int) -> a
-    98:104:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
-    109:111:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
-    116:122:void setItem(int,net.minecraft.world.item.ItemStack) -> a
-    126:132:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
-    137:138:void clearContent() -> N_
+    34:35:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
+    38:42:void setLootTable(net.minecraft.world.level.BlockGetter,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.resources.ResourceLocation) -> a
+    45:50:boolean tryLoadLootTable(net.minecraft.nbt.CompoundTag) -> b
+    54:62:boolean trySaveLootTable(net.minecraft.nbt.CompoundTag) -> c
+    66:82:void unpackLootTable(net.minecraft.world.entity.player.Player) -> d
+    85:87:void setLootTable(net.minecraft.resources.ResourceLocation,long) -> a
+    91:92:boolean isEmpty() -> c
+    97:98:net.minecraft.world.item.ItemStack getItem(int) -> a
+    103:109:net.minecraft.world.item.ItemStack removeItem(int,int) -> a
+    114:116:net.minecraft.world.item.ItemStack removeItemNoUpdate(int) -> b
+    121:127:void setItem(int,net.minecraft.world.item.ItemStack) -> a
+    131:137:boolean stillValid(net.minecraft.world.entity.player.Player) -> a
+    142:143:void clearContent() -> aa_
     net.minecraft.core.NonNullList getItems() -> f
     void setItems(net.minecraft.core.NonNullList) -> a
-    146:146:boolean canOpen(net.minecraft.world.entity.player.Player) -> e
-    152:156:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
-net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity -> bxg:
+    151:151:boolean canOpen(net.minecraft.world.entity.player.Player) -> e
+    157:161:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory,net.minecraft.world.entity.player.Player) -> createMenu
+net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity -> ceg:
     int[] SLOTS -> a
     net.minecraft.core.NonNullList itemStacks -> b
     int openCount -> c
@@ -56426,23 +61570,23 @@ net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity -> bxg:
     boolean loadColorFromBlock -> m
     46:58:void <init>(net.minecraft.world.item.DyeColor) -> <init>
     61:63:void <init>() -> <init>
-    74:78:void tick() -> Z_
+    74:78:void tick() -> al_
     81:107:void updateAnimation() -> h
     110:110:net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity$AnimationStatus getAnimationStatus() -> j
     114:114:net.minecraft.world.phys.AABB getBoundingBox(net.minecraft.world.level.block.state.BlockState) -> a
     118:122:net.minecraft.world.phys.AABB getBoundingBox(net.minecraft.core.Direction) -> b
     127:131:net.minecraft.world.phys.AABB getTopBoundingBox(net.minecraft.core.Direction) -> c
-    136:189:void moveCollidedEntities() -> l
-    193:193:int getContainerSize() -> O_
+    136:189:void moveCollidedEntities() -> m
+    193:193:int getContainerSize() -> ab_
     198:211:boolean triggerEvent(int,int) -> a_
-    215:216:void doNeighborUpdates() -> m
-    220:230:void startOpen(net.minecraft.world.entity.player.Player) -> a_
+    215:216:void doNeighborUpdates() -> x
+    220:230:void startOpen(net.minecraft.world.entity.player.Player) -> c_
     234:241:void stopOpen(net.minecraft.world.entity.player.Player) -> b_
     245:245:net.minecraft.network.chat.Component getDefaultName() -> g
-    250:252:void load(net.minecraft.nbt.CompoundTag) -> a
-    256:257:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    261:267:void loadFromTag(net.minecraft.nbt.CompoundTag) -> f
-    270:273:net.minecraft.nbt.CompoundTag saveToTag(net.minecraft.nbt.CompoundTag) -> g
+    250:252:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    256:257:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    261:267:void loadFromTag(net.minecraft.nbt.CompoundTag) -> d
+    270:273:net.minecraft.nbt.CompoundTag saveToTag(net.minecraft.nbt.CompoundTag) -> e
     278:278:net.minecraft.core.NonNullList getItems() -> f
     283:284:void setItems(net.minecraft.core.NonNullList) -> a
     288:288:int[] getSlotsForFace(net.minecraft.core.Direction) -> a
@@ -56451,12 +61595,13 @@ net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity -> bxg:
     302:302:float getProgress(float) -> a
     307:311:net.minecraft.world.item.DyeColor getColor() -> k
     316:316:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
+    320:320:boolean isClosed() -> l
     44:44:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity$1 -> bxg$1:
+net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity$1 -> ceg$1:
     int[] $SwitchMap$net$minecraft$world$level$block$entity$ShulkerBoxBlockEntity$AnimationStatus -> a
     int[] $SwitchMap$net$minecraft$core$Direction$Axis -> b
     82:160:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity$AnimationStatus -> bxg$a:
+net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity$AnimationStatus -> ceg$a:
     net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity$AnimationStatus CLOSED -> a
     net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity$AnimationStatus OPENING -> b
     net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity$AnimationStatus OPENED -> c
@@ -56466,72 +61611,72 @@ net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity$AnimationStatus ->
     65:65:net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity$AnimationStatus valueOf(java.lang.String) -> valueOf
     65:65:void <init>(java.lang.String,int) -> <init>
     65:69:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.SignBlockEntity -> bxh:
+net.minecraft.world.level.block.entity.SignBlockEntity -> ceh:
     net.minecraft.network.chat.Component[] messages -> a
     boolean isEditable -> b
     net.minecraft.world.entity.player.Player playerWhoMayEdit -> c
-    java.lang.String[] renderMessages -> g
+    net.minecraft.network.chat.FormattedText[] renderMessages -> g
     net.minecraft.world.item.DyeColor color -> h
-    28:39:void <init>() -> <init>
-    43:50:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    55:74:void load(net.minecraft.nbt.CompoundTag) -> a
-    77:77:net.minecraft.network.chat.Component getMessage(int) -> a
-    81:83:void setMessage(int,net.minecraft.network.chat.Component) -> a
-    87:90:java.lang.String getRenderMessage(int,java.util.function.Function) -> a
-    96:96:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
-    101:101:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
-    106:106:boolean onlyOpCanSetNbt() -> t
-    110:110:boolean isEditable() -> d
-    114:118:void setEditable(boolean) -> a
-    121:122:void setAllowedPlayerEditor(net.minecraft.world.entity.player.Player) -> a
-    125:125:net.minecraft.world.entity.player.Player getPlayerWhoMayEdit() -> f
-    129:140:boolean executeClickCommands(net.minecraft.world.entity.player.Player) -> b
-    144:146:net.minecraft.commands.CommandSourceStack createCommandSourceStack(net.minecraft.server.level.ServerPlayer) -> a
-    150:150:net.minecraft.world.item.DyeColor getColor() -> g
-    154:160:boolean setColor(net.minecraft.world.item.DyeColor) -> a
-net.minecraft.world.level.block.entity.SkullBlockEntity -> bxi:
-    com.mojang.authlib.GameProfile owner -> a
-    int mouthTickCount -> b
-    boolean isMovingMouth -> c
-    net.minecraft.server.players.GameProfileCache profileCache -> g
-    com.mojang.authlib.minecraft.MinecraftSessionService sessionService -> h
-    28:29:void <init>() -> <init>
-    32:33:void setProfileCache(net.minecraft.server.players.GameProfileCache) -> a
-    36:37:void setSessionService(com.mojang.authlib.minecraft.MinecraftSessionService) -> a
-    41:49:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    54:64:void load(net.minecraft.nbt.CompoundTag) -> a
-    68:77:void tick() -> Z_
-    80:83:float getMouthAnimation(float) -> a
-    88:88:com.mojang.authlib.GameProfile getOwnerProfile() -> d
-    94:94:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
-    99:99:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
-    103:105:void setOwner(com.mojang.authlib.GameProfile) -> a
-    108:110:void updateOwnerProfile() -> f
-    113:134:com.mojang.authlib.GameProfile updateGameprofile(com.mojang.authlib.GameProfile) -> b
-net.minecraft.world.level.block.entity.SmokerBlockEntity -> bxj:
+    30:41:void <init>() -> <init>
+    45:52:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    57:76:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    79:79:net.minecraft.network.chat.Component getMessage(int) -> a
+    83:85:void setMessage(int,net.minecraft.network.chat.Component) -> a
+    89:92:net.minecraft.network.chat.FormattedText getRenderMessage(int,java.util.function.UnaryOperator) -> a
+    98:98:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
+    103:103:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
+    108:108:boolean onlyOpCanSetNbt() -> t
+    112:112:boolean isEditable() -> d
+    116:120:void setEditable(boolean) -> a
+    123:124:void setAllowedPlayerEditor(net.minecraft.world.entity.player.Player) -> a
+    127:127:net.minecraft.world.entity.player.Player getPlayerWhoMayEdit() -> f
+    131:142:boolean executeClickCommands(net.minecraft.world.entity.player.Player) -> b
+    146:148:net.minecraft.commands.CommandSourceStack createCommandSourceStack(net.minecraft.server.level.ServerPlayer) -> a
+    152:152:net.minecraft.world.item.DyeColor getColor() -> g
+    156:162:boolean setColor(net.minecraft.world.item.DyeColor) -> a
+net.minecraft.world.level.block.entity.SkullBlockEntity -> cei:
+    net.minecraft.server.players.GameProfileCache profileCache -> a
+    com.mojang.authlib.minecraft.MinecraftSessionService sessionService -> b
+    com.mojang.authlib.GameProfile owner -> c
+    int mouthTickCount -> g
+    boolean isMovingMouth -> h
+    33:34:void <init>() -> <init>
+    37:38:void setProfileCache(net.minecraft.server.players.GameProfileCache) -> a
+    41:42:void setSessionService(com.mojang.authlib.minecraft.MinecraftSessionService) -> a
+    46:54:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    59:69:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    73:82:void tick() -> al_
+    85:88:float getMouthAnimation(float) -> a
+    93:93:com.mojang.authlib.GameProfile getOwnerProfile() -> d
+    99:99:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
+    104:104:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
+    108:110:void setOwner(com.mojang.authlib.GameProfile) -> a
+    113:115:void updateOwnerProfile() -> f
+    119:140:com.mojang.authlib.GameProfile updateGameprofile(com.mojang.authlib.GameProfile) -> b
+net.minecraft.world.level.block.entity.SmokerBlockEntity -> cej:
     13:14:void <init>() -> <init>
     18:18:net.minecraft.network.chat.Component getDefaultName() -> g
     23:23:int getBurnDuration(net.minecraft.world.item.ItemStack) -> a
     28:28:net.minecraft.world.inventory.AbstractContainerMenu createMenu(int,net.minecraft.world.entity.player.Inventory) -> a
-net.minecraft.world.level.block.entity.SpawnerBlockEntity -> bxk:
+net.minecraft.world.level.block.entity.SpawnerBlockEntity -> cek:
     net.minecraft.world.level.BaseSpawner spawner -> a
     16:44:void <init>() -> <init>
-    48:50:void load(net.minecraft.nbt.CompoundTag) -> a
-    54:57:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    62:63:void tick() -> Z_
+    48:50:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    54:57:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    62:63:void tick() -> al_
     68:68:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
     73:75:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
     80:83:boolean triggerEvent(int,int) -> a_
     88:88:boolean onlyOpCanSetNbt() -> t
     92:92:net.minecraft.world.level.BaseSpawner getSpawner() -> d
-net.minecraft.world.level.block.entity.SpawnerBlockEntity$1 -> bxk$1:
+net.minecraft.world.level.block.entity.SpawnerBlockEntity$1 -> cek$1:
     net.minecraft.world.level.block.entity.SpawnerBlockEntity this$0 -> a
     16:16:void <init>(net.minecraft.world.level.block.entity.SpawnerBlockEntity) -> <init>
     19:20:void broadcastEvent(int) -> a
     24:24:net.minecraft.world.level.Level getLevel() -> a
     29:29:net.minecraft.core.BlockPos getPos() -> b
     34:39:void setNextSpawnData(net.minecraft.world.level.SpawnData) -> a
-net.minecraft.world.level.block.entity.StructureBlockEntity -> bxl:
+net.minecraft.world.level.block.entity.StructureBlockEntity -> cel:
     net.minecraft.resources.ResourceLocation structureName -> a
     java.lang.String author -> b
     java.lang.String metaData -> c
@@ -56546,167 +61691,167 @@ net.minecraft.world.level.block.entity.StructureBlockEntity -> bxl:
     boolean showBoundingBox -> o
     float integrity -> p
     long seed -> q
-    45:61:void <init>() -> <init>
-    65:84:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    89:127:void load(net.minecraft.nbt.CompoundTag) -> a
-    130:138:void updateBlockState() -> L
-    143:143:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
-    148:148:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
-    152:158:boolean usedBy(net.minecraft.world.entity.player.Player) -> a
-    162:162:java.lang.String getStructureName() -> d
-    166:166:java.lang.String getStructurePath() -> f
-    170:170:boolean hasStructureName() -> g
-    174:175:void setStructureName(java.lang.String) -> a
-    178:179:void setStructureName(net.minecraft.resources.ResourceLocation) -> a
-    182:183:void createdBy(net.minecraft.world.entity.LivingEntity) -> a
-    186:186:net.minecraft.core.BlockPos getStructurePos() -> h
-    190:191:void setStructurePos(net.minecraft.core.BlockPos) -> b
-    194:194:net.minecraft.core.BlockPos getStructureSize() -> j
-    198:199:void setStructureSize(net.minecraft.core.BlockPos) -> c
-    202:202:net.minecraft.world.level.block.Mirror getMirror() -> k
-    206:207:void setMirror(net.minecraft.world.level.block.Mirror) -> b
-    210:210:net.minecraft.world.level.block.Rotation getRotation() -> l
-    214:215:void setRotation(net.minecraft.world.level.block.Rotation) -> b
-    218:218:java.lang.String getMetaData() -> m
-    222:223:void setMetaData(java.lang.String) -> b
-    226:226:net.minecraft.world.level.block.state.properties.StructureMode getMode() -> x
-    230:235:void setMode(net.minecraft.world.level.block.state.properties.StructureMode) -> a
-    238:252:void nextMode() -> y
-    255:255:boolean isIgnoreEntities() -> z
-    259:260:void setIgnoreEntities(boolean) -> a
-    263:263:float getIntegrity() -> A
-    267:268:void setIntegrity(float) -> a
-    271:271:long getSeed() -> B
-    275:276:void setSeed(long) -> a
-    279:302:boolean detectSize() -> C
-    306:307:java.util.List filterRelatedCornerBlocks(java.util.List) -> a
-    311:322:java.util.List getNearbyCornerBlocks(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    327:352:net.minecraft.world.level.levelgen.structure.BoundingBox calculateEnclosingBoundingBox(net.minecraft.core.BlockPos,java.util.List) -> a
-    356:356:boolean saveStructure() -> D
-    360:383:boolean saveStructure(boolean) -> b
-    387:387:boolean loadStructure() -> E
-    391:394:java.util.Random createRandom(long) -> b
-    398:414:boolean loadStructure(boolean) -> c
-    418:443:boolean loadStructure(boolean,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate) -> a
-    448:454:void unloadStructure() -> F
-    457:465:boolean isStructureLoadable() -> G
-    470:470:boolean isPowered() -> H
-    474:475:void setPowered(boolean) -> d
-    478:478:boolean getShowAir() -> I
-    482:483:void setShowAir(boolean) -> e
-    486:486:boolean getShowBoundingBox() -> J
-    490:491:void setShowBoundingBox(boolean) -> f
-    494:494:net.minecraft.network.chat.Component getDisplayName() -> K
-    306:306:boolean lambda$filterRelatedCornerBlocks$0(net.minecraft.world.level.block.entity.StructureBlockEntity) -> a
-net.minecraft.world.level.block.entity.StructureBlockEntity$1 -> bxl$1:
+    46:62:void <init>() -> <init>
+    66:66:double getViewDistance() -> i
+    71:90:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    95:133:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    136:144:void updateBlockState() -> L
+    149:149:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
+    154:154:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
+    158:164:boolean usedBy(net.minecraft.world.entity.player.Player) -> a
+    168:168:java.lang.String getStructureName() -> d
+    172:172:java.lang.String getStructurePath() -> f
+    176:176:boolean hasStructureName() -> g
+    180:181:void setStructureName(java.lang.String) -> a
+    184:185:void setStructureName(net.minecraft.resources.ResourceLocation) -> a
+    188:189:void createdBy(net.minecraft.world.entity.LivingEntity) -> a
+    192:192:net.minecraft.core.BlockPos getStructurePos() -> h
+    196:197:void setStructurePos(net.minecraft.core.BlockPos) -> b
+    200:200:net.minecraft.core.BlockPos getStructureSize() -> j
+    204:205:void setStructureSize(net.minecraft.core.BlockPos) -> c
+    208:208:net.minecraft.world.level.block.Mirror getMirror() -> k
+    212:213:void setMirror(net.minecraft.world.level.block.Mirror) -> b
+    216:216:net.minecraft.world.level.block.Rotation getRotation() -> l
+    220:221:void setRotation(net.minecraft.world.level.block.Rotation) -> b
+    224:224:java.lang.String getMetaData() -> m
+    228:229:void setMetaData(java.lang.String) -> b
+    232:232:net.minecraft.world.level.block.state.properties.StructureMode getMode() -> x
+    236:241:void setMode(net.minecraft.world.level.block.state.properties.StructureMode) -> a
+    244:258:void nextMode() -> y
+    261:261:boolean isIgnoreEntities() -> z
+    265:266:void setIgnoreEntities(boolean) -> a
+    269:269:float getIntegrity() -> A
+    273:274:void setIntegrity(float) -> a
+    277:277:long getSeed() -> B
+    281:282:void setSeed(long) -> a
+    285:308:boolean detectSize() -> C
+    312:313:java.util.List filterRelatedCornerBlocks(java.util.List) -> a
+    317:328:java.util.List getNearbyCornerBlocks(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    333:358:net.minecraft.world.level.levelgen.structure.BoundingBox calculateEnclosingBoundingBox(net.minecraft.core.BlockPos,java.util.List) -> a
+    362:362:boolean saveStructure() -> D
+    366:389:boolean saveStructure(boolean) -> b
+    393:393:boolean loadStructure() -> E
+    397:400:java.util.Random createRandom(long) -> b
+    404:420:boolean loadStructure(boolean) -> c
+    424:462:boolean loadStructure(boolean,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate) -> a
+    467:473:void unloadStructure() -> F
+    476:484:boolean isStructureLoadable() -> G
+    489:489:boolean isPowered() -> H
+    493:494:void setPowered(boolean) -> d
+    497:497:boolean getShowAir() -> I
+    501:502:void setShowAir(boolean) -> e
+    505:505:boolean getShowBoundingBox() -> J
+    509:510:void setShowBoundingBox(boolean) -> f
+    513:513:net.minecraft.network.chat.Component getDisplayName() -> K
+    524:537:net.minecraft.world.level.levelgen.structure.BoundingBox getStructureBoundingBox(net.minecraft.core.BlockPos) -> d
+    312:312:boolean lambda$filterRelatedCornerBlocks$0(net.minecraft.world.level.block.entity.StructureBlockEntity) -> a
+net.minecraft.world.level.block.entity.StructureBlockEntity$1 -> cel$1:
     int[] $SwitchMap$net$minecraft$world$level$block$state$properties$StructureMode -> a
-    238:238:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType -> bxl$a:
+    244:244:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType -> cel$a:
     net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType UPDATE_DATA -> a
     net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType SAVE_AREA -> b
     net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType LOAD_AREA -> c
     net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType SCAN_AREA -> d
     net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType[] $VALUES -> e
-    497:497:net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType[] values() -> values
-    497:497:net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType valueOf(java.lang.String) -> valueOf
-    497:497:void <init>(java.lang.String,int) -> <init>
-    497:501:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity -> bxm:
+    516:516:net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType[] values() -> values
+    516:516:net.minecraft.world.level.block.entity.StructureBlockEntity$UpdateType valueOf(java.lang.String) -> valueOf
+    516:516:void <init>(java.lang.String,int) -> <init>
+    516:520:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity -> cem:
     org.apache.logging.log4j.Logger LOGGER -> a
     long age -> b
     int teleportCooldown -> c
     net.minecraft.core.BlockPos exitPortal -> g
     boolean exactTeleport -> h
-    50:51:void <init>() -> <init>
-    55:64:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    69:75:void load(net.minecraft.nbt.CompoundTag) -> a
-    79:79:double getViewDistance() -> i
-    84:103:void tick() -> Z_
-    106:106:boolean isSpawning() -> d
-    110:110:boolean isCoolingDown() -> f
-    114:114:float getSpawnPercent(float) -> a
-    118:118:float getCooldownPercent(float) -> b
-    124:124:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
-    129:129:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
-    133:138:void triggerCooldown() -> h
-    142:147:boolean triggerEvent(int,int) -> a_
-    151:166:void teleportEntity(net.minecraft.world.entity.Entity) -> a
-    169:171:net.minecraft.core.BlockPos findExitPosition() -> k
-    175:209:void findExitPortal(net.minecraft.server.level.ServerLevel) -> a
-    212:231:net.minecraft.core.BlockPos findTallestBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,int,boolean) -> a
-    235:235:net.minecraft.world.level.chunk.LevelChunk getChunk(net.minecraft.world.level.Level,net.minecraft.world.phys.Vec3) -> a
-    240:262:net.minecraft.core.BlockPos findValidSpawnInChunk(net.minecraft.world.level.chunk.LevelChunk) -> a
-    267:268:void createExitPortal(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
-    272:272:boolean shouldRenderFace(net.minecraft.core.Direction) -> a
-    276:280:int getParticleAmount() -> j
-    284:286:void setExitPosition(net.minecraft.core.BlockPos,boolean) -> a
-    36:36:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.entity.TheEndPortalBlockEntity -> bxn:
+    52:53:void <init>() -> <init>
+    57:66:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    71:77:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    81:81:double getViewDistance() -> i
+    86:105:void tick() -> al_
+    108:108:boolean isSpawning() -> d
+    112:112:boolean isCoolingDown() -> f
+    116:116:float getSpawnPercent(float) -> a
+    120:120:float getCooldownPercent(float) -> b
+    126:126:net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket getUpdatePacket() -> a
+    131:131:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
+    135:140:void triggerCooldown() -> h
+    144:149:boolean triggerEvent(int,int) -> a_
+    153:184:void teleportEntity(net.minecraft.world.entity.Entity) -> a
+    187:189:net.minecraft.core.BlockPos findExitPosition() -> k
+    193:227:void findExitPortal(net.minecraft.server.level.ServerLevel) -> a
+    230:249:net.minecraft.core.BlockPos findTallestBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,int,boolean) -> a
+    253:253:net.minecraft.world.level.chunk.LevelChunk getChunk(net.minecraft.world.level.Level,net.minecraft.world.phys.Vec3) -> a
+    258:280:net.minecraft.core.BlockPos findValidSpawnInChunk(net.minecraft.world.level.chunk.LevelChunk) -> a
+    285:286:void createExitPortal(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos) -> a
+    290:290:boolean shouldRenderFace(net.minecraft.core.Direction) -> a
+    294:298:int getParticleAmount() -> j
+    302:304:void setExitPosition(net.minecraft.core.BlockPos,boolean) -> a
+    38:38:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.entity.TheEndPortalBlockEntity -> cen:
     7:8:void <init>(net.minecraft.world.level.block.entity.BlockEntityType) -> <init>
     11:12:void <init>() -> <init>
     15:15:boolean shouldRenderFace(net.minecraft.core.Direction) -> a
-net.minecraft.world.level.block.entity.TickableBlockEntity -> bxo:
-    void tick() -> Z_
-net.minecraft.world.level.block.entity.TrappedChestBlockEntity -> bxp:
+net.minecraft.world.level.block.entity.TickableBlockEntity -> ceo:
+    void tick() -> al_
+net.minecraft.world.level.block.entity.TrappedChestBlockEntity -> cep:
     5:6:void <init>() -> <init>
     10:12:void signalOpenCount() -> h
-net.minecraft.world.level.block.entity.package-info -> bxq:
-net.minecraft.world.level.block.grower.AbstractMegaTreeGrower -> bxr:
+net.minecraft.world.level.block.entity.package-info -> ceq:
+net.minecraft.world.level.block.grower.AbstractMegaTreeGrower -> cer:
     16:16:void <init>() -> <init>
-    19:27:boolean growTree(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    19:27:boolean growTree(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
     net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredMegaFeature(java.util.Random) -> a
-    34:53:boolean placeMega(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random,int,int) -> a
-    57:61:boolean isTwoByTwoSapling(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,int,int) -> a
-net.minecraft.world.level.block.grower.AbstractTreeGrower -> bxs:
-    16:16:void <init>() -> <init>
+    34:54:boolean placeMega(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random,int,int) -> a
+    58:62:boolean isTwoByTwoSapling(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,int,int) -> a
+net.minecraft.world.level.block.grower.AbstractTreeGrower -> ces:
+    17:17:void <init>() -> <init>
     net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredFeature(java.util.Random,boolean) -> a
-    23:35:boolean growTree(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    39:44:boolean hasFlowers(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.block.grower.AcaciaTreeGrower -> bxt:
+    22:34:boolean growTree(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    38:43:boolean hasFlowers(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.block.grower.AcaciaTreeGrower -> cet:
     11:11:void <init>() -> <init>
     15:15:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredFeature(java.util.Random,boolean) -> a
-net.minecraft.world.level.block.grower.BirchTreeGrower -> bxu:
+net.minecraft.world.level.block.grower.BirchTreeGrower -> ceu:
     11:11:void <init>() -> <init>
     15:15:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredFeature(java.util.Random,boolean) -> a
-net.minecraft.world.level.block.grower.DarkOakTreeGrower -> bxv:
+net.minecraft.world.level.block.grower.DarkOakTreeGrower -> cev:
+    11:11:void <init>() -> <init>
+    15:15:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredFeature(java.util.Random,boolean) -> a
+    21:21:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredMegaFeature(java.util.Random) -> a
+net.minecraft.world.level.block.grower.JungleTreeGrower -> cew:
     12:12:void <init>() -> <init>
     16:16:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredFeature(java.util.Random,boolean) -> a
     22:22:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredMegaFeature(java.util.Random) -> a
-net.minecraft.world.level.block.grower.JungleTreeGrower -> bxw:
-    13:13:void <init>() -> <init>
-    17:17:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredFeature(java.util.Random,boolean) -> a
-    23:23:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredMegaFeature(java.util.Random) -> a
-net.minecraft.world.level.block.grower.OakTreeGrower -> bxx:
+net.minecraft.world.level.block.grower.OakTreeGrower -> cex:
     11:11:void <init>() -> <init>
     15:17:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredFeature(java.util.Random,boolean) -> a
-net.minecraft.world.level.block.grower.SpruceTreeGrower -> bxy:
-    12:12:void <init>() -> <init>
-    16:16:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredFeature(java.util.Random,boolean) -> a
-    22:23:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredMegaFeature(java.util.Random) -> a
-net.minecraft.world.level.block.grower.package-info -> bxz:
-net.minecraft.world.level.block.package-info -> bya:
-net.minecraft.world.level.block.piston.MovingPistonBlock -> byb:
+net.minecraft.world.level.block.grower.SpruceTreeGrower -> cey:
+    11:11:void <init>() -> <init>
+    15:15:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredFeature(java.util.Random,boolean) -> a
+    21:22:net.minecraft.world.level.levelgen.feature.ConfiguredFeature getConfiguredMegaFeature(java.util.Random) -> a
+net.minecraft.world.level.block.grower.package-info -> cez:
+net.minecraft.world.level.block.package-info -> cfa:
+net.minecraft.world.level.block.piston.MovingPistonBlock -> cfb:
     net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> a
     net.minecraft.world.level.block.state.properties.EnumProperty TYPE -> b
-    39:41:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    39:41:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     46:46:net.minecraft.world.level.block.entity.BlockEntity newBlockEntity(net.minecraft.world.level.BlockGetter) -> a
     51:51:net.minecraft.world.level.block.entity.BlockEntity newMovingBlockEntity(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,boolean,boolean) -> a
     56:63:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
     68:73:void destroy(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    77:77:boolean isRedstoneConductor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
-    82:82:boolean isSuffocating(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
-    88:93:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    99:104:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
-    110:110:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    115:119:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    124:128:net.minecraft.world.level.block.piston.PistonMovingBlockEntity getBlockEntity(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    133:133:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    138:138:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    143:143:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    148:149:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    153:153:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    78:83:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    89:94:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
+    100:100:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    105:109:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    114:118:net.minecraft.world.level.block.piston.PistonMovingBlockEntity getBlockEntity(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    123:123:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    128:128:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    133:133:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    138:139:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    143:143:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     35:36:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.piston.PistonBaseBlock -> byc:
+net.minecraft.world.level.block.piston.PistonBaseBlock -> cfc:
     net.minecraft.world.level.block.state.properties.BooleanProperty EXTENDED -> b
     net.minecraft.world.phys.shapes.VoxelShape EAST_AABB -> c
     net.minecraft.world.phys.shapes.VoxelShape WEST_AABB -> d
@@ -56715,30 +61860,28 @@ net.minecraft.world.level.block.piston.PistonBaseBlock -> byc:
     net.minecraft.world.phys.shapes.VoxelShape UP_AABB -> g
     net.minecraft.world.phys.shapes.VoxelShape DOWN_AABB -> h
     boolean isSticky -> i
-    53:56:void <init>(boolean,net.minecraft.world.level.block.Block$Properties) -> <init>
-    60:60:boolean isSuffocating(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
-    65:82:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    88:88:boolean isRedstoneConductor(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
-    93:96:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
-    100:103:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    107:113:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    117:117:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
-    121:147:void checkIfExtend(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    161:179:boolean getNeighborSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    184:248:boolean triggerEvent(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,int) -> a
-    253:293:boolean isPushable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction,boolean,net.minecraft.core.Direction) -> a
-    297:398:boolean moveBlocks(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction,boolean) -> a
-    403:403:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    408:408:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    413:414:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    418:418:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
-    423:423:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    53:56:void <init>(boolean,net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    60:77:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    83:86:void setPlacedBy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.LivingEntity,net.minecraft.world.item.ItemStack) -> a
+    90:93:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    97:103:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    107:107:net.minecraft.world.level.block.state.BlockState getStateForPlacement(net.minecraft.world.item.BlockPlaceContext) -> a
+    111:137:void checkIfExtend(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    151:169:boolean getNeighborSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    174:241:boolean triggerEvent(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,int) -> a
+    246:285:boolean isPushable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction,boolean,net.minecraft.core.Direction) -> a
+    289:390:boolean moveBlocks(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.Direction,boolean) -> a
+    395:395:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    400:400:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    405:406:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    410:410:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
+    415:415:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     36:48:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.piston.PistonBaseBlock$1 -> byc$1:
+net.minecraft.world.level.block.piston.PistonBaseBlock$1 -> cfc$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     int[] $SwitchMap$net$minecraft$world$level$material$PushReaction -> b
-    66:278:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.piston.PistonHeadBlock -> byd:
+    61:270:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.piston.PistonHeadBlock -> cfd:
     net.minecraft.world.level.block.state.properties.EnumProperty TYPE -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty SHORT -> c
     net.minecraft.world.phys.shapes.VoxelShape EAST_AABB -> d
@@ -56749,42 +61892,43 @@ net.minecraft.world.level.block.piston.PistonHeadBlock -> byd:
     net.minecraft.world.phys.shapes.VoxelShape DOWN_AABB -> i
     net.minecraft.world.phys.shapes.VoxelShape UP_ARM_AABB -> j
     net.minecraft.world.phys.shapes.VoxelShape DOWN_ARM_AABB -> k
-    net.minecraft.world.phys.shapes.VoxelShape SOUTH_ARM_AABB -> w
-    net.minecraft.world.phys.shapes.VoxelShape NORTH_ARM_AABB -> x
-    net.minecraft.world.phys.shapes.VoxelShape EAST_ARM_AABB -> y
-    net.minecraft.world.phys.shapes.VoxelShape WEST_ARM_AABB -> z
-    net.minecraft.world.phys.shapes.VoxelShape SHORT_UP_ARM_AABB -> A
-    net.minecraft.world.phys.shapes.VoxelShape SHORT_DOWN_ARM_AABB -> B
-    net.minecraft.world.phys.shapes.VoxelShape SHORT_SOUTH_ARM_AABB -> C
-    net.minecraft.world.phys.shapes.VoxelShape SHORT_NORTH_ARM_AABB -> D
-    net.minecraft.world.phys.shapes.VoxelShape SHORT_EAST_ARM_AABB -> E
-    net.minecraft.world.phys.shapes.VoxelShape SHORT_WEST_ARM_AABB -> F
-    59:61:void <init>(net.minecraft.world.level.block.Block$Properties) -> <init>
+    net.minecraft.world.phys.shapes.VoxelShape SOUTH_ARM_AABB -> o
+    net.minecraft.world.phys.shapes.VoxelShape NORTH_ARM_AABB -> p
+    net.minecraft.world.phys.shapes.VoxelShape EAST_ARM_AABB -> q
+    net.minecraft.world.phys.shapes.VoxelShape WEST_ARM_AABB -> r
+    net.minecraft.world.phys.shapes.VoxelShape SHORT_UP_ARM_AABB -> s
+    net.minecraft.world.phys.shapes.VoxelShape SHORT_DOWN_ARM_AABB -> t
+    net.minecraft.world.phys.shapes.VoxelShape SHORT_SOUTH_ARM_AABB -> u
+    net.minecraft.world.phys.shapes.VoxelShape SHORT_NORTH_ARM_AABB -> v
+    net.minecraft.world.phys.shapes.VoxelShape SHORT_EAST_ARM_AABB -> w
+    net.minecraft.world.phys.shapes.VoxelShape SHORT_WEST_ARM_AABB -> x
+    59:61:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
     64:77:net.minecraft.world.phys.shapes.VoxelShape getBaseShape(net.minecraft.world.level.block.state.BlockState) -> h
-    83:83:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> o
-    88:88:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    92:106:net.minecraft.world.phys.shapes.VoxelShape getArmShape(net.minecraft.world.level.block.state.BlockState) -> i
-    112:120:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
-    124:138:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    83:83:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
+    88:88:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    92:106:net.minecraft.world.phys.shapes.VoxelShape getArmShape(net.minecraft.world.level.block.state.BlockState) -> l
+    111:112:boolean isFittingBase(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
+    117:124:void playerWillDestroy(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player) -> a
+    128:138:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
     142:147:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    152:153:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    158:162:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    166:166:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    171:171:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
-    176:176:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
-    181:182:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    186:186:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    152:154:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    159:163:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    167:167:net.minecraft.world.item.ItemStack getCloneItemStack(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    172:172:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    177:177:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    182:183:void createBlockStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    187:187:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
     28:56:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.piston.PistonHeadBlock$1 -> byd$1:
+net.minecraft.world.level.block.piston.PistonHeadBlock$1 -> cfd$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     64:64:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.piston.PistonMath -> bye:
+net.minecraft.world.level.block.piston.PistonMath -> cfe:
     10:10:void <init>() -> <init>
     15:31:net.minecraft.world.phys.AABB getMovementArea(net.minecraft.world.phys.AABB,net.minecraft.core.Direction,double) -> a
-net.minecraft.world.level.block.piston.PistonMath$1 -> bye$1:
+net.minecraft.world.level.block.piston.PistonMath$1 -> cfe$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     18:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.piston.PistonMovingBlockEntity -> byf:
+net.minecraft.world.level.block.piston.PistonMovingBlockEntity -> cff:
     net.minecraft.world.level.block.state.BlockState movedState -> a
     net.minecraft.core.Direction direction -> b
     boolean extending -> c
@@ -56793,43 +61937,42 @@ net.minecraft.world.level.block.piston.PistonMovingBlockEntity -> byf:
     float progress -> i
     float progressO -> j
     long lastTicked -> k
-    45:46:void <init>() -> <init>
-    49:54:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,boolean,boolean) -> <init>
-    58:58:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
-    62:62:boolean isExtending() -> d
-    66:66:net.minecraft.core.Direction getDirection() -> f
-    70:70:boolean isSourcePiston() -> h
-    74:77:float getProgress(float) -> a
-    81:81:float getXOff(float) -> b
-    85:85:float getYOff(float) -> c
-    89:89:float getZOff(float) -> d
-    93:93:float getExtendedProgress(float) -> e
-    97:102:net.minecraft.world.level.block.state.BlockState getCollisionRelatedBlockState() -> x
-    106:178:void moveCollidedEntities(float) -> f
-    182:185:void moveEntityByPiston(net.minecraft.core.Direction,net.minecraft.world.entity.Entity,double,net.minecraft.core.Direction) -> a
-    188:206:void moveStuckEntities(float) -> g
-    209:214:boolean matchesStickyCritera(net.minecraft.world.phys.AABB,net.minecraft.world.entity.Entity) -> a
-    219:219:boolean isStickyForEntities() -> y
-    223:223:net.minecraft.core.Direction getMovementDirection() -> j
-    228:244:net.minecraft.world.phys.AABB getMinMaxPiecesAABB(java.util.List) -> a
-    248:261:double getMovement(net.minecraft.world.phys.AABB,net.minecraft.core.Direction,net.minecraft.world.phys.AABB) -> a
-    266:270:net.minecraft.world.phys.AABB moveByPositionAndProgress(net.minecraft.world.phys.AABB) -> a
-    275:289:void fixEntityWithinPistonBase(net.minecraft.world.entity.Entity,net.minecraft.core.Direction,double) -> a
-    292:292:net.minecraft.world.level.block.state.BlockState getMovedState() -> k
-    296:312:void finalTick() -> l
-    316:345:void tick() -> Z_
-    349:357:void load(net.minecraft.nbt.CompoundTag) -> a
-    361:369:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    376:397:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    401:401:long getLastTicked() -> m
-    202:202:boolean lambda$moveStuckEntities$1(net.minecraft.world.phys.AABB,net.minecraft.world.entity.Entity) -> b
-    37:37:net.minecraft.core.Direction lambda$static$0() -> z
-    37:37:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.piston.PistonMovingBlockEntity$1 -> byf$1:
+    47:48:void <init>() -> <init>
+    51:56:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,boolean,boolean) -> <init>
+    60:60:net.minecraft.nbt.CompoundTag getUpdateTag() -> b
+    64:64:boolean isExtending() -> d
+    68:68:net.minecraft.core.Direction getDirection() -> f
+    72:72:boolean isSourcePiston() -> h
+    76:79:float getProgress(float) -> a
+    83:83:float getXOff(float) -> b
+    87:87:float getYOff(float) -> c
+    91:91:float getZOff(float) -> d
+    95:95:float getExtendedProgress(float) -> e
+    99:105:net.minecraft.world.level.block.state.BlockState getCollisionRelatedBlockState() -> x
+    109:184:void moveCollidedEntities(float) -> f
+    188:191:void moveEntityByPiston(net.minecraft.core.Direction,net.minecraft.world.entity.Entity,double,net.minecraft.core.Direction) -> a
+    194:212:void moveStuckEntities(float) -> g
+    215:220:boolean matchesStickyCritera(net.minecraft.world.phys.AABB,net.minecraft.world.entity.Entity) -> a
+    225:225:boolean isStickyForEntities() -> y
+    229:229:net.minecraft.core.Direction getMovementDirection() -> j
+    233:246:double getMovement(net.minecraft.world.phys.AABB,net.minecraft.core.Direction,net.minecraft.world.phys.AABB) -> a
+    251:255:net.minecraft.world.phys.AABB moveByPositionAndProgress(net.minecraft.world.phys.AABB) -> a
+    260:274:void fixEntityWithinPistonBase(net.minecraft.world.entity.Entity,net.minecraft.core.Direction,double) -> a
+    277:277:net.minecraft.world.level.block.state.BlockState getMovedState() -> k
+    281:297:void finalTick() -> l
+    301:330:void tick() -> al_
+    334:342:void load(net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> a
+    346:354:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    361:382:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    386:386:long getLastTicked() -> m
+    208:208:boolean lambda$moveStuckEntities$1(net.minecraft.world.phys.AABB,net.minecraft.world.entity.Entity) -> b
+    39:39:net.minecraft.core.Direction lambda$static$0() -> z
+    39:39:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.piston.PistonMovingBlockEntity$1 -> cff$1:
     int[] $SwitchMap$net$minecraft$core$Direction$Axis -> a
     int[] $SwitchMap$net$minecraft$core$Direction -> b
-    133:248:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.piston.PistonStructureResolver -> byg:
+    136:233:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.piston.PistonStructureResolver -> cfg:
     net.minecraft.world.level.Level level -> a
     net.minecraft.core.BlockPos pistonPos -> b
     boolean extending -> c
@@ -56848,170 +61991,340 @@ net.minecraft.world.level.block.piston.PistonStructureResolver -> byg:
     223:223:net.minecraft.core.Direction getPushDirection() -> b
     227:227:java.util.List getToPush() -> c
     231:231:java.util.List getToDestroy() -> d
-net.minecraft.world.level.block.piston.package-info -> byh:
-net.minecraft.world.level.block.state.AbstractStateHolder -> byi:
-    java.util.function.Function PROPERTY_ENTRY_TO_STRING_FUNCTION -> c
-    java.lang.Object owner -> a
-    com.google.common.collect.ImmutableMap values -> d
-    com.google.common.collect.Table neighbours -> e
-    40:43:void <init>(java.lang.Object,com.google.common.collect.ImmutableMap) -> <init>
-    47:47:java.lang.Object cycle(net.minecraft.world.level.block.state.properties.Property) -> a
-    51:62:java.lang.Object findNextInCollection(java.util.Collection,java.lang.Object) -> a
-    67:76:java.lang.String toString() -> toString
-    81:81:java.util.Collection getProperties() -> a
-    86:86:boolean hasProperty(net.minecraft.world.level.block.state.properties.Property) -> b
-    91:96:java.lang.Comparable getValue(net.minecraft.world.level.block.state.properties.Property) -> c
-    102:115:java.lang.Object setValue(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
-    119:134:void populateNeighbours(java.util.Map) -> a
-    137:139:java.util.Map makeNeighbourValues(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> c
-    144:144:com.google.common.collect.ImmutableMap getValues() -> b
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.AbstractStateHolder$1 -> byi$1:
-    19:19:void <init>() -> <init>
-    22:27:java.lang.String apply(java.util.Map$Entry) -> a
-    32:32:java.lang.String getName(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
-    19:19:java.lang.Object apply(java.lang.Object) -> apply
-net.minecraft.world.level.block.state.BlockState -> byj:
-    net.minecraft.world.level.block.state.BlockState$Cache cache -> c
-    int lightEmission -> d
+net.minecraft.world.level.block.piston.package-info -> cfh:
+net.minecraft.world.level.block.state.BlockBehaviour -> cfi:
+    net.minecraft.core.Direction[] UPDATE_SHAPE_ORDER -> ar
+    net.minecraft.world.level.material.Material material -> as
+    boolean hasCollision -> at
+    float explosionResistance -> au
+    boolean isRandomlyTicking -> av
+    net.minecraft.world.level.block.SoundType soundType -> aw
+    float friction -> ax
+    float speedFactor -> ay
+    float jumpFactor -> az
+    boolean dynamicShape -> aA
+    net.minecraft.world.level.block.state.BlockBehaviour$Properties properties -> aB
+    net.minecraft.resources.ResourceLocation drops -> aC
+    82:94:void <init>(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> <init>
+    101:101:void updateIndirectNeighbourShapes(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int,int) -> a
+    107:115:boolean isPathfindable(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    127:127:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    133:133:boolean skipRendering(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
+    142:143:void neighborChanged(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    148:148:void onPlace(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    153:156:void onRemove(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    161:161:net.minecraft.world.InteractionResult use(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    167:167:boolean triggerEvent(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,int) -> a
+    175:175:net.minecraft.world.level.block.RenderShape getRenderShape(net.minecraft.world.level.block.state.BlockState) -> b
+    181:181:boolean useShapeForLightOcclusion(net.minecraft.world.level.block.state.BlockState) -> c_
+    187:187:boolean isSignalSource(net.minecraft.world.level.block.state.BlockState) -> b_
+    193:193:net.minecraft.world.level.material.PushReaction getPistonPushReaction(net.minecraft.world.level.block.state.BlockState) -> f
+    199:199:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.world.level.block.state.BlockState) -> d
+    205:205:boolean hasAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState) -> a
+    209:209:net.minecraft.world.level.block.state.BlockBehaviour$OffsetType getOffsetType() -> aj_
+    217:217:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Rotation) -> a
+    223:223:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.Mirror) -> a
+    229:229:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.item.BlockPlaceContext) -> a
+    235:235:boolean canBeReplaced(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
+    241:248:java.util.List getDrops(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
+    255:255:long getSeed(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos) -> a
+    263:263:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
+    269:269:net.minecraft.world.phys.shapes.VoxelShape getBlockSupportShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> e
+    275:275:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a_
+    281:284:int getLightBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> f
+    291:291:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
+    297:297:boolean canSurvive(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    303:303:float getShadeBrightness(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    309:309:int getAnalogOutputSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    317:317:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    323:323:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    329:329:net.minecraft.world.phys.shapes.VoxelShape getVisualShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    335:336:void randomTick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    341:341:void tick(net.minecraft.world.level.block.state.BlockState,net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    346:351:float getDestroyProgress(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.entity.player.Player,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    357:357:void spawnAfterBreak(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    362:362:void attack(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    367:367:int getSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    373:373:void entityInside(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    378:378:int getDirectSignal(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    382:382:boolean isEntityBlock() -> q
+    386:391:net.minecraft.resources.ResourceLocation getLootTable() -> r
+    397:397:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.projectile.Projectile) -> a
+    net.minecraft.world.item.Item asItem() -> h
+    net.minecraft.world.level.block.Block asBlock() -> p
+    410:410:net.minecraft.world.level.material.MaterialColor defaultMaterialColor() -> s
+    66:66:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.BlockBehaviour$1 -> cfi$1:
+    int[] $SwitchMap$net$minecraft$world$level$pathfinder$PathComputationType -> a
+    107:107:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase -> cfi$a:
+    int lightEmission -> b
     boolean useShapeForLightOcclusion -> e
-    63:66:void <init>(net.minecraft.world.level.block.Block,com.google.common.collect.ImmutableMap) -> <init>
-    69:72:void initCache() -> c
-    75:75:net.minecraft.world.level.block.Block getBlock() -> d
-    79:79:net.minecraft.world.level.material.Material getMaterial() -> e
-    83:83:boolean isValidSpawn(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
-    87:90:boolean propagatesSkylightDown(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    94:97:int getLightBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    101:105:net.minecraft.world.phys.shapes.VoxelShape getFaceOcclusionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    110:110:boolean hasLargeCollisionShape() -> f
-    114:114:boolean useShapeForLightOcclusion() -> g
-    118:118:int getLightEmission() -> h
-    122:122:boolean isAir() -> i
-    126:126:net.minecraft.world.level.material.MaterialColor getMapColor(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
-    130:130:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.Rotation) -> a
-    134:134:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.Mirror) -> a
-    138:138:net.minecraft.world.level.block.RenderShape getRenderShape() -> j
-    142:142:boolean emissiveRendering() -> k
-    146:146:float getShadeBrightness(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
-    150:150:boolean isRedstoneConductor(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> e
-    154:154:boolean isSignalSource() -> l
-    158:158:int getSignal(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
-    162:162:boolean hasAnalogOutputSignal() -> m
-    166:166:int getAnalogOutputSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    170:170:float getDestroySpeed(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> f
-    174:174:float getDestroyProgress(net.minecraft.world.entity.player.Player,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    178:178:int getDirectSignal(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> c
-    182:182:net.minecraft.world.level.material.PushReaction getPistonPushReaction() -> n
-    186:189:boolean isSolidRender(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> g
-    193:196:boolean canOcclude() -> o
-    200:200:boolean skipRendering(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
-    204:204:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> h
-    208:208:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
-    212:215:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> i
-    219:219:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
-    223:223:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> j
-    227:227:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> k
-    231:231:boolean entityCanStandOn(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    235:235:net.minecraft.world.phys.Vec3 getOffset(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> l
-    239:239:boolean triggerEvent(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,int) -> a
-    243:244:void neighborChanged(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
-    247:248:void updateNeighbourShapes(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> a
-    251:252:void updateIndirectNeighbourShapes(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> b
-    255:256:void onPlace(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    259:260:void onRemove(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
-    263:264:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
-    267:268:void randomTick(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
-    271:272:void entityInside(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
-    275:276:void spawnAfterBreak(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
-    279:279:java.util.List getDrops(net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
-    283:283:net.minecraft.world.InteractionResult use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
-    287:288:void attack(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
-    291:291:boolean isSuffocating(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> m
-    295:295:boolean isViewBlocking(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> n
-    299:299:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    303:303:boolean isPathfindable(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
-    307:307:boolean canBeReplaced(net.minecraft.world.item.BlockPlaceContext) -> a
-    311:311:boolean canBeReplaced(net.minecraft.world.level.material.Fluid) -> a
-    315:315:boolean canSurvive(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    319:319:boolean hasPostProcess(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> o
-    324:324:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
-    328:328:boolean is(net.minecraft.tags.Tag) -> a
-    332:332:net.minecraft.world.level.material.FluidState getFluidState() -> p
-    336:336:boolean isRandomlyTicking() -> q
-    340:340:long getSeed(net.minecraft.core.BlockPos) -> a
-    344:344:net.minecraft.world.level.block.SoundType getSoundType() -> r
-    348:349:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.Entity) -> a
-    352:355:boolean isFaceSturdy(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> d
-    359:362:boolean isCollisionShapeFullBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> p
-    366:384:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.block.state.BlockState) -> a
-    388:401:net.minecraft.world.level.block.state.BlockState deserialize(com.mojang.datafixers.Dynamic) -> a
-    389:389:java.lang.String lambda$deserialize$2(com.mojang.datafixers.Dynamic) -> b
-    389:389:java.lang.String lambda$deserialize$1(com.mojang.datafixers.Dynamic) -> c
-    378:378:com.mojang.datafixers.util.Pair lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> a
-net.minecraft.world.level.block.state.BlockState$1 -> byj$1:
-net.minecraft.world.level.block.state.BlockState$Cache -> byj$a:
-    net.minecraft.core.Direction[] DIRECTIONS -> a
-    boolean canOcclude -> b
-    boolean solidRender -> c
-    boolean propagatesSkylightDown -> d
-    int lightBlock -> e
-    net.minecraft.world.phys.shapes.VoxelShape[] occlusionShapes -> f
-    net.minecraft.world.phys.shapes.VoxelShape collisionShape -> g
-    boolean largeCollisionShape -> h
-    boolean[] isFaceSturdy -> i
-    boolean isCollisionShapeFullBlock -> j
-    416:439:void <init>(net.minecraft.world.level.block.state.BlockState) -> <init>
-    433:433:boolean lambda$new$0(net.minecraft.core.Direction$Axis) -> a
-    404:404:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState$1) -> <init>
-    404:404:boolean access$100(net.minecraft.world.level.block.state.BlockState$Cache) -> a
-    404:404:int access$200(net.minecraft.world.level.block.state.BlockState$Cache) -> b
-    404:404:net.minecraft.world.phys.shapes.VoxelShape[] access$300(net.minecraft.world.level.block.state.BlockState$Cache) -> c
-    404:404:boolean access$400(net.minecraft.world.level.block.state.BlockState$Cache) -> d
-    404:404:boolean access$500(net.minecraft.world.level.block.state.BlockState$Cache) -> e
-    404:404:boolean access$600(net.minecraft.world.level.block.state.BlockState$Cache) -> f
-    404:404:net.minecraft.world.phys.shapes.VoxelShape access$700(net.minecraft.world.level.block.state.BlockState$Cache) -> g
-    404:404:boolean[] access$800(net.minecraft.world.level.block.state.BlockState$Cache) -> h
-    404:404:boolean access$900(net.minecraft.world.level.block.state.BlockState$Cache) -> i
-    405:405:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.StateDefinition -> byk:
+    boolean isAir -> f
+    net.minecraft.world.level.material.Material material -> g
+    net.minecraft.world.level.material.MaterialColor materialColor -> h
+    float destroySpeed -> i
+    boolean requiresCorrectToolForDrops -> j
+    boolean canOcclude -> k
+    net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate isRedstoneConductor -> l
+    net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate isSuffocating -> m
+    net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate isViewBlocking -> n
+    net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate hasPostProcess -> o
+    net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate emissiveRendering -> p
+    net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase$Cache cache -> a
+    622:638:void <init>(net.minecraft.world.level.block.Block,com.google.common.collect.ImmutableMap,com.mojang.serialization.MapCodec) -> <init>
+    641:644:void initCache() -> a
+    647:647:net.minecraft.world.level.block.Block getBlock() -> b
+    651:651:net.minecraft.world.level.material.Material getMaterial() -> c
+    655:655:boolean isValidSpawn(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
+    659:662:boolean propagatesSkylightDown(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    666:669:int getLightBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    673:677:net.minecraft.world.phys.shapes.VoxelShape getFaceOcclusionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    681:681:net.minecraft.world.phys.shapes.VoxelShape getOcclusionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    686:686:boolean hasLargeCollisionShape() -> d
+    690:690:boolean useShapeForLightOcclusion() -> e
+    694:694:int getLightEmission() -> f
+    698:698:boolean isAir() -> g
+    702:702:net.minecraft.world.level.material.MaterialColor getMapColor(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
+    706:706:net.minecraft.world.level.block.state.BlockState rotate(net.minecraft.world.level.block.Rotation) -> a
+    710:710:net.minecraft.world.level.block.state.BlockState mirror(net.minecraft.world.level.block.Mirror) -> a
+    714:714:net.minecraft.world.level.block.RenderShape getRenderShape() -> h
+    718:718:boolean emissiveRendering(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> e
+    722:722:float getShadeBrightness(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> f
+    726:726:boolean isRedstoneConductor(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> g
+    730:730:boolean isSignalSource() -> i
+    734:734:int getSignal(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> b
+    738:738:boolean hasAnalogOutputSignal() -> j
+    742:742:int getAnalogOutputSignal(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    746:746:float getDestroySpeed(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> h
+    750:750:float getDestroyProgress(net.minecraft.world.entity.player.Player,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    754:754:int getDirectSignal(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> c
+    758:758:net.minecraft.world.level.material.PushReaction getPistonPushReaction() -> k
+    762:769:boolean isSolidRender(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> i
+    773:773:boolean canOcclude() -> l
+    777:777:boolean skipRendering(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction) -> a
+    781:781:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> j
+    785:785:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> a
+    789:792:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> k
+    796:796:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> b
+    800:800:net.minecraft.world.phys.shapes.VoxelShape getBlockSupportShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> l
+    804:804:net.minecraft.world.phys.shapes.VoxelShape getVisualShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.phys.shapes.CollisionContext) -> c
+    808:808:net.minecraft.world.phys.shapes.VoxelShape getInteractionShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> m
+    812:812:boolean entityCanStandOn(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    816:816:boolean entityCanStandOnFace(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity,net.minecraft.core.Direction) -> a
+    820:826:net.minecraft.world.phys.Vec3 getOffset(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> n
+    834:834:boolean triggerEvent(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,int,int) -> a
+    838:839:void neighborChanged(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block,net.minecraft.core.BlockPos,boolean) -> a
+    842:843:void updateNeighbourShapes(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> a
+    846:854:void updateNeighbourShapes(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int,int) -> a
+    857:858:void updateIndirectNeighbourShapes(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int) -> b
+    861:862:void updateIndirectNeighbourShapes(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int,int) -> b
+    865:866:void onPlace(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    869:870:void onRemove(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> b
+    873:874:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> a
+    877:878:void randomTick(net.minecraft.server.level.ServerLevel,net.minecraft.core.BlockPos,java.util.Random) -> b
+    881:882:void entityInside(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.Entity) -> a
+    885:886:void spawnAfterBreak(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.item.ItemStack) -> a
+    889:889:java.util.List getDrops(net.minecraft.world.level.storage.loot.LootContext$Builder) -> a
+    893:893:net.minecraft.world.InteractionResult use(net.minecraft.world.level.Level,net.minecraft.world.entity.player.Player,net.minecraft.world.InteractionHand,net.minecraft.world.phys.BlockHitResult) -> a
+    897:898:void attack(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.entity.player.Player) -> a
+    901:901:boolean isSuffocating(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> o
+    905:905:boolean isViewBlocking(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> p
+    909:909:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    913:913:boolean isPathfindable(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.PathComputationType) -> a
+    917:917:boolean canBeReplaced(net.minecraft.world.item.BlockPlaceContext) -> a
+    921:921:boolean canBeReplaced(net.minecraft.world.level.material.Fluid) -> a
+    925:925:boolean canSurvive(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    929:929:boolean hasPostProcess(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> q
+    934:934:net.minecraft.world.MenuProvider getMenuProvider(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> b
+    938:938:boolean is(net.minecraft.tags.Tag) -> a
+    942:942:boolean is(net.minecraft.tags.Tag,java.util.function.Predicate) -> a
+    946:946:boolean is(net.minecraft.world.level.block.Block) -> a
+    950:950:net.minecraft.world.level.material.FluidState getFluidState() -> m
+    954:954:boolean isRandomlyTicking() -> n
+    958:958:long getSeed(net.minecraft.core.BlockPos) -> a
+    962:962:net.minecraft.world.level.block.SoundType getSoundType() -> o
+    966:967:void onProjectileHit(net.minecraft.world.level.Level,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.phys.BlockHitResult,net.minecraft.world.entity.projectile.Projectile) -> a
+    970:973:boolean isFaceSturdy(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> d
+    977:980:boolean isCollisionShapeFullBlock(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> r
+    net.minecraft.world.level.block.state.BlockState asState() -> p
+    986:986:boolean requiresCorrectToolForDrops() -> q
+net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase$Cache -> cfi$a$a:
+    net.minecraft.core.Direction[] DIRECTIONS -> f
+    boolean solidRender -> a
+    boolean propagatesSkylightDown -> g
+    int lightBlock -> h
+    net.minecraft.world.phys.shapes.VoxelShape[] occlusionShapes -> i
+    net.minecraft.world.phys.shapes.VoxelShape collisionShape -> b
+    boolean largeCollisionShape -> c
+    boolean[] isFaceSturdy -> d
+    boolean isCollisionShapeFullBlock -> e
+    1001:1023:void <init>(net.minecraft.world.level.block.state.BlockState) -> <init>
+    1017:1017:boolean lambda$new$0(net.minecraft.core.Direction$Axis) -> a
+    989:989:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockBehaviour$1) -> <init>
+    989:989:boolean access$2300(net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase$Cache) -> a
+    989:989:int access$2400(net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase$Cache) -> b
+    989:989:net.minecraft.world.phys.shapes.VoxelShape[] access$2500(net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase$Cache) -> c
+    990:990:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.BlockBehaviour$OffsetType -> cfi$b:
+    net.minecraft.world.level.block.state.BlockBehaviour$OffsetType NONE -> a
+    net.minecraft.world.level.block.state.BlockBehaviour$OffsetType XZ -> b
+    net.minecraft.world.level.block.state.BlockBehaviour$OffsetType XYZ -> c
+    net.minecraft.world.level.block.state.BlockBehaviour$OffsetType[] $VALUES -> d
+    403:403:net.minecraft.world.level.block.state.BlockBehaviour$OffsetType[] values() -> values
+    403:403:net.minecraft.world.level.block.state.BlockBehaviour$OffsetType valueOf(java.lang.String) -> valueOf
+    403:403:void <init>(java.lang.String,int) -> <init>
+    403:406:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.BlockBehaviour$Properties -> cfi$c:
+    net.minecraft.world.level.material.Material material -> a
+    java.util.function.Function materialColor -> b
+    boolean hasCollision -> c
+    net.minecraft.world.level.block.SoundType soundType -> d
+    java.util.function.ToIntFunction lightEmission -> e
+    float explosionResistance -> f
+    float destroyTime -> g
+    boolean requiresCorrectToolForDrops -> h
+    boolean isRandomlyTicking -> i
+    float friction -> j
+    float speedFactor -> k
+    float jumpFactor -> l
+    net.minecraft.resources.ResourceLocation drops -> m
+    boolean canOcclude -> n
+    boolean isAir -> o
+    net.minecraft.world.level.block.state.BlockBehaviour$StateArgumentPredicate isValidSpawn -> p
+    net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate isRedstoneConductor -> q
+    net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate isSuffocating -> r
+    net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate isViewBlocking -> s
+    net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate hasPostProcess -> t
+    net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate emissiveRendering -> u
+    boolean dynamicShape -> v
+    446:447:void <init>(net.minecraft.world.level.material.Material,net.minecraft.world.level.material.MaterialColor) -> <init>
+    416:452:void <init>(net.minecraft.world.level.material.Material,java.util.function.Function) -> <init>
+    455:455:net.minecraft.world.level.block.state.BlockBehaviour$Properties of(net.minecraft.world.level.material.Material) -> a
+    459:459:net.minecraft.world.level.block.state.BlockBehaviour$Properties of(net.minecraft.world.level.material.Material,net.minecraft.world.item.DyeColor) -> a
+    463:463:net.minecraft.world.level.block.state.BlockBehaviour$Properties of(net.minecraft.world.level.material.Material,net.minecraft.world.level.material.MaterialColor) -> a
+    467:467:net.minecraft.world.level.block.state.BlockBehaviour$Properties of(net.minecraft.world.level.material.Material,java.util.function.Function) -> a
+    471:488:net.minecraft.world.level.block.state.BlockBehaviour$Properties copy(net.minecraft.world.level.block.state.BlockBehaviour) -> a
+    492:494:net.minecraft.world.level.block.state.BlockBehaviour$Properties noCollission() -> a
+    498:499:net.minecraft.world.level.block.state.BlockBehaviour$Properties noOcclusion() -> b
+    503:504:net.minecraft.world.level.block.state.BlockBehaviour$Properties friction(float) -> a
+    508:509:net.minecraft.world.level.block.state.BlockBehaviour$Properties speedFactor(float) -> b
+    513:514:net.minecraft.world.level.block.state.BlockBehaviour$Properties jumpFactor(float) -> c
+    518:519:net.minecraft.world.level.block.state.BlockBehaviour$Properties sound(net.minecraft.world.level.block.SoundType) -> a
+    523:524:net.minecraft.world.level.block.state.BlockBehaviour$Properties lightLevel(java.util.function.ToIntFunction) -> a
+    528:530:net.minecraft.world.level.block.state.BlockBehaviour$Properties strength(float,float) -> a
+    534:534:net.minecraft.world.level.block.state.BlockBehaviour$Properties instabreak() -> c
+    538:539:net.minecraft.world.level.block.state.BlockBehaviour$Properties strength(float) -> d
+    543:544:net.minecraft.world.level.block.state.BlockBehaviour$Properties randomTicks() -> d
+    548:549:net.minecraft.world.level.block.state.BlockBehaviour$Properties dynamicShape() -> e
+    553:554:net.minecraft.world.level.block.state.BlockBehaviour$Properties noDrops() -> f
+    558:559:net.minecraft.world.level.block.state.BlockBehaviour$Properties dropsLike(net.minecraft.world.level.block.Block) -> a
+    563:564:net.minecraft.world.level.block.state.BlockBehaviour$Properties air() -> g
+    568:569:net.minecraft.world.level.block.state.BlockBehaviour$Properties isValidSpawn(net.minecraft.world.level.block.state.BlockBehaviour$StateArgumentPredicate) -> a
+    573:574:net.minecraft.world.level.block.state.BlockBehaviour$Properties isRedstoneConductor(net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate) -> a
+    578:579:net.minecraft.world.level.block.state.BlockBehaviour$Properties isSuffocating(net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate) -> b
+    583:584:net.minecraft.world.level.block.state.BlockBehaviour$Properties isViewBlocking(net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate) -> c
+    588:589:net.minecraft.world.level.block.state.BlockBehaviour$Properties hasPostProcess(net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate) -> d
+    593:594:net.minecraft.world.level.block.state.BlockBehaviour$Properties emissiveRendering(net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate) -> e
+    598:599:net.minecraft.world.level.block.state.BlockBehaviour$Properties requiresCorrectToolForDrops() -> h
+    446:446:net.minecraft.world.level.material.MaterialColor lambda$new$6(net.minecraft.world.level.material.MaterialColor,net.minecraft.world.level.block.state.BlockState) -> a
+    441:441:boolean lambda$new$5(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    440:440:boolean lambda$new$4(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    437:437:boolean lambda$new$3(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    434:434:boolean lambda$new$2(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
+    431:431:boolean lambda$new$1(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.entity.EntityType) -> a
+    419:419:int lambda$new$0(net.minecraft.world.level.block.state.BlockState) -> a
+    413:413:net.minecraft.world.level.material.Material access$000(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> a
+    413:413:boolean access$100(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> b
+    413:413:net.minecraft.resources.ResourceLocation access$200(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> c
+    413:413:float access$300(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> d
+    413:413:boolean access$400(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> e
+    413:413:net.minecraft.world.level.block.SoundType access$500(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> f
+    413:413:float access$600(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> g
+    413:413:float access$700(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> h
+    413:413:float access$800(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> i
+    413:413:boolean access$900(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> j
+    413:413:java.util.function.Function access$1000(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> k
+    413:413:java.util.function.ToIntFunction access$1100(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> l
+    413:413:boolean access$1200(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> m
+    413:413:float access$1300(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> n
+    413:413:boolean access$1400(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> o
+    413:413:boolean access$1500(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> p
+    413:413:net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate access$1600(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> q
+    413:413:net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate access$1700(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> r
+    413:413:net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate access$1800(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> s
+    413:413:net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate access$1900(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> t
+    413:413:net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate access$2000(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> u
+    413:413:net.minecraft.world.level.block.state.BlockBehaviour$StateArgumentPredicate access$2200(net.minecraft.world.level.block.state.BlockBehaviour$Properties) -> v
+net.minecraft.world.level.block.state.BlockBehaviour$StateArgumentPredicate -> cfi$d:
+    boolean test(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,java.lang.Object) -> test
+net.minecraft.world.level.block.state.BlockBehaviour$StatePredicate -> cfi$e:
+    boolean test(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> test
+net.minecraft.world.level.block.state.BlockState -> cfj:
+    com.mojang.serialization.Codec CODEC -> b
+    17:18:void <init>(net.minecraft.world.level.block.Block,com.google.common.collect.ImmutableMap,com.mojang.serialization.MapCodec) -> <init>
+    22:22:net.minecraft.world.level.block.state.BlockState asState() -> p
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.StateDefinition -> cfk:
     java.util.regex.Pattern NAME_PATTERN -> a
     java.lang.Object owner -> b
     com.google.common.collect.ImmutableSortedMap propertiesByName -> c
     com.google.common.collect.ImmutableList states -> d
-    29:59:void <init>(java.lang.Object,net.minecraft.world.level.block.state.StateDefinition$Factory,java.util.Map) -> <init>
-    62:62:com.google.common.collect.ImmutableList getPossibleStates() -> a
-    66:66:net.minecraft.world.level.block.state.StateHolder any() -> b
-    70:70:java.lang.Object getOwner() -> c
-    74:74:java.util.Collection getProperties() -> d
-    79:82:java.lang.String toString() -> toString
-    87:87:net.minecraft.world.level.block.state.properties.Property getProperty(java.lang.String) -> a
-    47:52:void lambda$new$2(net.minecraft.world.level.block.state.StateDefinition$Factory,java.lang.Object,java.util.Map,java.util.List,java.util.List) -> a
-    39:39:java.util.stream.Stream lambda$new$1(net.minecraft.world.level.block.state.properties.Property,java.util.List) -> a
-    40:42:java.util.List lambda$null$0(java.util.List,java.lang.Comparable) -> a
-    21:21:java.util.regex.Pattern access$000() -> e
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.StateDefinition$Builder -> byk$a:
+    35:73:void <init>(java.util.function.Function,java.lang.Object,net.minecraft.world.level.block.state.StateDefinition$Factory,java.util.Map) -> <init>
+    76:76:com.mojang.serialization.MapCodec appendPropertyCodec(com.mojang.serialization.MapCodec,java.util.function.Supplier,java.lang.String,net.minecraft.world.level.block.state.properties.Property) -> a
+    83:83:com.google.common.collect.ImmutableList getPossibleStates() -> a
+    87:87:net.minecraft.world.level.block.state.StateHolder any() -> b
+    91:91:java.lang.Object getOwner() -> c
+    95:95:java.util.Collection getProperties() -> d
+    100:103:java.lang.String toString() -> toString
+    108:108:net.minecraft.world.level.block.state.properties.Property getProperty(java.lang.String) -> a
+    78:78:com.mojang.datafixers.util.Pair lambda$appendPropertyCodec$6(net.minecraft.world.level.block.state.properties.Property,net.minecraft.world.level.block.state.StateHolder) -> a
+    77:77:net.minecraft.world.level.block.state.StateHolder lambda$appendPropertyCodec$5(net.minecraft.world.level.block.state.properties.Property,com.mojang.datafixers.util.Pair) -> a
+    76:76:net.minecraft.world.level.block.state.properties.Property$Value lambda$appendPropertyCodec$4(net.minecraft.world.level.block.state.properties.Property,java.util.function.Supplier) -> a
+    61:66:void lambda$new$3(net.minecraft.world.level.block.state.StateDefinition$Factory,java.lang.Object,com.mojang.serialization.MapCodec,java.util.Map,java.util.List,java.util.List) -> a
+    53:53:java.util.stream.Stream lambda$new$2(net.minecraft.world.level.block.state.properties.Property,java.util.List) -> a
+    54:56:java.util.List lambda$null$1(java.util.List,net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
+    39:39:net.minecraft.world.level.block.state.StateHolder lambda$new$0(java.util.function.Function,java.lang.Object) -> a
+    28:28:java.util.regex.Pattern access$000() -> e
+    29:29:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.StateDefinition$Builder -> cfk$a:
     java.lang.Object owner -> a
     java.util.Map properties -> b
-    96:100:void <init>(java.lang.Object) -> <init>
-    103:107:net.minecraft.world.level.block.state.StateDefinition$Builder add(net.minecraft.world.level.block.state.properties.Property[]) -> a
-    111:131:void validateProperty(net.minecraft.world.level.block.state.properties.Property) -> a
-    134:134:net.minecraft.world.level.block.state.StateDefinition create(net.minecraft.world.level.block.state.StateDefinition$Factory) -> a
-net.minecraft.world.level.block.state.StateDefinition$Factory -> byk$b:
-    net.minecraft.world.level.block.state.AbstractStateHolder create(java.lang.Object,com.google.common.collect.ImmutableMap) -> create
-net.minecraft.world.level.block.state.StateHolder -> byl:
-    org.apache.logging.log4j.Logger LOGGER -> b
-    java.util.Collection getProperties() -> a
-    boolean hasProperty(net.minecraft.world.level.block.state.properties.Property) -> b
-    java.lang.Comparable getValue(net.minecraft.world.level.block.state.properties.Property) -> c
-    java.lang.Object setValue(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
-    java.lang.Object cycle(net.minecraft.world.level.block.state.properties.Property) -> a
-    com.google.common.collect.ImmutableMap getValues() -> b
-    27:27:java.lang.String getName(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> b
-    31:37:net.minecraft.world.level.block.state.StateHolder setValueHelper(net.minecraft.world.level.block.state.StateHolder,net.minecraft.world.level.block.state.properties.Property,java.lang.String,java.lang.String,java.lang.String) -> a
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.package-info -> bym:
-net.minecraft.world.level.block.state.pattern.BlockInWorld -> byn:
+    117:121:void <init>(java.lang.Object) -> <init>
+    124:128:net.minecraft.world.level.block.state.StateDefinition$Builder add(net.minecraft.world.level.block.state.properties.Property[]) -> a
+    132:152:void validateProperty(net.minecraft.world.level.block.state.properties.Property) -> a
+    155:155:net.minecraft.world.level.block.state.StateDefinition create(java.util.function.Function,net.minecraft.world.level.block.state.StateDefinition$Factory) -> a
+net.minecraft.world.level.block.state.StateDefinition$Factory -> cfk$b:
+    java.lang.Object create(java.lang.Object,com.google.common.collect.ImmutableMap,com.mojang.serialization.MapCodec) -> create
+net.minecraft.world.level.block.state.StateHolder -> cfl:
+    java.util.function.Function PROPERTY_ENTRY_TO_STRING_FUNCTION -> a
+    java.lang.Object owner -> c
+    com.google.common.collect.ImmutableMap values -> b
+    com.google.common.collect.Table neighbours -> e
+    com.mojang.serialization.MapCodec propertiesCodec -> d
+    45:49:void <init>(java.lang.Object,com.google.common.collect.ImmutableMap,com.mojang.serialization.MapCodec) -> <init>
+    52:52:java.lang.Object cycle(net.minecraft.world.level.block.state.properties.Property) -> a
+    56:67:java.lang.Object findNextInCollection(java.util.Collection,java.lang.Object) -> a
+    72:81:java.lang.String toString() -> toString
+    85:85:java.util.Collection getProperties() -> r
+    89:89:boolean hasProperty(net.minecraft.world.level.block.state.properties.Property) -> b
+    93:98:java.lang.Comparable getValue(net.minecraft.world.level.block.state.properties.Property) -> c
+    102:107:java.util.Optional getOptionalValue(net.minecraft.world.level.block.state.properties.Property) -> d
+    112:125:java.lang.Object setValue(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
+    129:144:void populateNeighbours(java.util.Map) -> a
+    147:149:java.util.Map makeNeighbourValues(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> b
+    153:153:com.google.common.collect.ImmutableMap getValues() -> s
+    157:157:com.mojang.serialization.Codec codec(com.mojang.serialization.Codec,java.util.function.Function) -> a
+    158:162:com.mojang.serialization.Codec lambda$codec$1(java.util.function.Function,java.lang.Object) -> a
+    157:157:java.lang.Object lambda$codec$0(net.minecraft.world.level.block.state.StateHolder) -> a
+    22:22:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.StateHolder$1 -> cfl$1:
+    22:22:void <init>() -> <init>
+    25:30:java.lang.String apply(java.util.Map$Entry) -> a
+    35:35:java.lang.String getName(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> a
+    22:22:java.lang.Object apply(java.lang.Object) -> apply
+net.minecraft.world.level.block.state.package-info -> cfm:
+net.minecraft.world.level.block.state.pattern.BlockInWorld -> cfn:
     net.minecraft.world.level.LevelReader level -> a
     net.minecraft.core.BlockPos pos -> b
     boolean loadChunks -> c
@@ -57027,7 +62340,7 @@ net.minecraft.world.level.block.state.pattern.BlockInWorld -> byn:
     56:56:java.util.function.Predicate hasState(net.minecraft.world.level.block.state.BlockState) -> a
     56:56:boolean lambda$hasState$1(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
     52:52:boolean lambda$hasState$0(java.util.function.Predicate,net.minecraft.world.level.block.state.pattern.BlockInWorld) -> a
-net.minecraft.world.level.block.state.pattern.BlockPattern -> byo:
+net.minecraft.world.level.block.state.pattern.BlockPattern -> cfo:
     java.util.function.Predicate[][][] pattern -> a
     int depth -> b
     int height -> c
@@ -57042,13 +62355,13 @@ net.minecraft.world.level.block.state.pattern.BlockPattern -> byo:
     80:99:net.minecraft.world.level.block.state.pattern.BlockPattern$BlockPatternMatch find(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
     103:103:com.google.common.cache.LoadingCache createLevelCache(net.minecraft.world.level.LevelReader,boolean) -> a
     107:118:net.minecraft.core.BlockPos translateAndRotate(net.minecraft.core.BlockPos,net.minecraft.core.Direction,net.minecraft.core.Direction,int,int,int) -> a
-net.minecraft.world.level.block.state.pattern.BlockPattern$BlockCacheLoader -> byo$a:
+net.minecraft.world.level.block.state.pattern.BlockPattern$BlockCacheLoader -> cfo$a:
     net.minecraft.world.level.LevelReader level -> a
     boolean loadChunks -> b
     126:129:void <init>(net.minecraft.world.level.LevelReader,boolean) -> <init>
     133:133:net.minecraft.world.level.block.state.pattern.BlockInWorld load(net.minecraft.core.BlockPos) -> a
     122:122:java.lang.Object load(java.lang.Object) -> load
-net.minecraft.world.level.block.state.pattern.BlockPattern$BlockPatternMatch -> byo$b:
+net.minecraft.world.level.block.state.pattern.BlockPattern$BlockPatternMatch -> cfo$b:
     net.minecraft.core.BlockPos frontTopLeft -> a
     net.minecraft.core.Direction forwards -> b
     net.minecraft.core.Direction up -> c
@@ -57066,12 +62379,12 @@ net.minecraft.world.level.block.state.pattern.BlockPattern$BlockPatternMatch ->
     181:181:net.minecraft.world.level.block.state.pattern.BlockInWorld getBlock(int,int,int) -> a
     186:190:java.lang.String toString() -> toString
     194:233:net.minecraft.world.level.block.state.pattern.BlockPattern$PortalInfo getPortalOutput(net.minecraft.core.Direction,net.minecraft.core.BlockPos,double,net.minecraft.world.phys.Vec3,double) -> a
-net.minecraft.world.level.block.state.pattern.BlockPattern$PortalInfo -> byo$c:
+net.minecraft.world.level.block.state.pattern.BlockPattern$PortalInfo -> cfo$c:
     net.minecraft.world.phys.Vec3 pos -> a
     net.minecraft.world.phys.Vec3 speed -> b
     int angle -> c
     242:246:void <init>(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,int) -> <init>
-net.minecraft.world.level.block.state.pattern.BlockPatternBuilder -> byp:
+net.minecraft.world.level.block.state.pattern.BlockPatternBuilder -> cfp:
     com.google.common.base.Joiner COMMA_JOINED -> a
     java.util.List pattern -> b
     java.util.Map lookup -> c
@@ -57085,8 +62398,8 @@ net.minecraft.world.level.block.state.pattern.BlockPatternBuilder -> byp:
     73:85:java.util.function.Predicate[][][] createPattern() -> c
     89:100:void ensureAllCharactersMatched() -> d
     16:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.pattern.package-info -> byq:
-net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate -> byr:
+net.minecraft.world.level.block.state.pattern.package-info -> cfq:
+net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate -> cfr:
     net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate AIR -> a
     net.minecraft.world.level.material.Material material -> b
     19:21:void <init>(net.minecraft.world.level.material.Material) -> <init>
@@ -57095,17 +62408,17 @@ net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate -> byr:
     9:9:boolean test(java.lang.Object) -> test
     9:9:void <init>(net.minecraft.world.level.material.Material,net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate$1) -> <init>
     10:10:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate$1 -> byr$1:
+net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate$1 -> cfr$1:
     10:10:void <init>(net.minecraft.world.level.material.Material) -> <init>
     13:13:boolean test(net.minecraft.world.level.block.state.BlockState) -> a
     10:10:boolean test(java.lang.Object) -> test
-net.minecraft.world.level.block.state.predicate.BlockPredicate -> bys:
+net.minecraft.world.level.block.state.predicate.BlockPredicate -> cfs:
     net.minecraft.world.level.block.Block block -> a
     12:14:void <init>(net.minecraft.world.level.block.Block) -> <init>
     17:17:net.minecraft.world.level.block.state.predicate.BlockPredicate forBlock(net.minecraft.world.level.block.Block) -> a
     22:22:boolean test(net.minecraft.world.level.block.state.BlockState) -> a
     9:9:boolean test(java.lang.Object) -> test
-net.minecraft.world.level.block.state.predicate.BlockStatePredicate -> byt:
+net.minecraft.world.level.block.state.predicate.BlockStatePredicate -> cft:
     java.util.function.Predicate ANY -> a
     net.minecraft.world.level.block.state.StateDefinition definition -> b
     java.util.Map properties -> c
@@ -57118,19 +62431,8 @@ net.minecraft.world.level.block.state.predicate.BlockStatePredicate -> byt:
     13:13:boolean test(java.lang.Object) -> test
     14:14:boolean lambda$static$0(net.minecraft.world.level.block.state.BlockState) -> b
     14:14:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.predicate.package-info -> byu:
-net.minecraft.world.level.block.state.properties.AbstractProperty -> byv:
-    java.lang.Class clazz -> a
-    java.lang.String name -> b
-    java.lang.Integer hashCode -> c
-    10:13:void <init>(java.lang.String,java.lang.Class) -> <init>
-    17:17:java.lang.String getName() -> a
-    22:22:java.lang.Class getValueClass() -> b
-    27:31:java.lang.String toString() -> toString
-    36:46:boolean equals(java.lang.Object) -> equals
-    51:54:int hashCode() -> hashCode
-    58:58:int generateHashCode() -> c
-net.minecraft.world.level.block.state.properties.AttachFace -> byw:
+net.minecraft.world.level.block.state.predicate.package-info -> cfu:
+net.minecraft.world.level.block.state.properties.AttachFace -> cfv:
     net.minecraft.world.level.block.state.properties.AttachFace FLOOR -> a
     net.minecraft.world.level.block.state.properties.AttachFace WALL -> b
     net.minecraft.world.level.block.state.properties.AttachFace CEILING -> c
@@ -57139,9 +62441,9 @@ net.minecraft.world.level.block.state.properties.AttachFace -> byw:
     5:5:net.minecraft.world.level.block.state.properties.AttachFace[] values() -> values
     5:5:net.minecraft.world.level.block.state.properties.AttachFace valueOf(java.lang.String) -> valueOf
     13:15:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    19:19:java.lang.String getSerializedName() -> o
+    19:19:java.lang.String getSerializedName() -> a
     5:8:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.BambooLeaves -> byx:
+net.minecraft.world.level.block.state.properties.BambooLeaves -> cfw:
     net.minecraft.world.level.block.state.properties.BambooLeaves NONE -> a
     net.minecraft.world.level.block.state.properties.BambooLeaves SMALL -> b
     net.minecraft.world.level.block.state.properties.BambooLeaves LARGE -> c
@@ -57151,9 +62453,9 @@ net.minecraft.world.level.block.state.properties.BambooLeaves -> byx:
     5:5:net.minecraft.world.level.block.state.properties.BambooLeaves valueOf(java.lang.String) -> valueOf
     13:15:void <init>(java.lang.String,int,java.lang.String) -> <init>
     19:19:java.lang.String toString() -> toString
-    24:24:java.lang.String getSerializedName() -> o
+    24:24:java.lang.String getSerializedName() -> a
     5:8:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.BedPart -> byy:
+net.minecraft.world.level.block.state.properties.BedPart -> cfx:
     net.minecraft.world.level.block.state.properties.BedPart HEAD -> a
     net.minecraft.world.level.block.state.properties.BedPart FOOT -> b
     java.lang.String name -> c
@@ -57162,9 +62464,9 @@ net.minecraft.world.level.block.state.properties.BedPart -> byy:
     5:5:net.minecraft.world.level.block.state.properties.BedPart valueOf(java.lang.String) -> valueOf
     12:14:void <init>(java.lang.String,int,java.lang.String) -> <init>
     18:18:java.lang.String toString() -> toString
-    23:23:java.lang.String getSerializedName() -> o
+    23:23:java.lang.String getSerializedName() -> a
     5:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.BellAttachType -> byz:
+net.minecraft.world.level.block.state.properties.BellAttachType -> cfy:
     net.minecraft.world.level.block.state.properties.BellAttachType FLOOR -> a
     net.minecraft.world.level.block.state.properties.BellAttachType CEILING -> b
     net.minecraft.world.level.block.state.properties.BellAttachType SINGLE_WALL -> c
@@ -57174,9 +62476,9 @@ net.minecraft.world.level.block.state.properties.BellAttachType -> byz:
     5:5:net.minecraft.world.level.block.state.properties.BellAttachType[] values() -> values
     5:5:net.minecraft.world.level.block.state.properties.BellAttachType valueOf(java.lang.String) -> valueOf
     14:16:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    20:20:java.lang.String getSerializedName() -> o
+    20:20:java.lang.String getSerializedName() -> a
     5:9:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.BlockStateProperties -> bza:
+net.minecraft.world.level.block.state.properties.BlockStateProperties -> cfz:
     net.minecraft.world.level.block.state.properties.BooleanProperty ATTACHED -> a
     net.minecraft.world.level.block.state.properties.BooleanProperty BOTTOM -> b
     net.minecraft.world.level.block.state.properties.BooleanProperty CONDITIONAL -> c
@@ -57206,77 +62508,84 @@ net.minecraft.world.level.block.state.properties.BlockStateProperties -> bza:
     net.minecraft.world.level.block.state.properties.BooleanProperty TRIGGERED -> A
     net.minecraft.world.level.block.state.properties.BooleanProperty UNSTABLE -> B
     net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED -> C
-    net.minecraft.world.level.block.state.properties.EnumProperty HORIZONTAL_AXIS -> D
-    net.minecraft.world.level.block.state.properties.EnumProperty AXIS -> E
-    net.minecraft.world.level.block.state.properties.BooleanProperty UP -> F
-    net.minecraft.world.level.block.state.properties.BooleanProperty DOWN -> G
-    net.minecraft.world.level.block.state.properties.BooleanProperty NORTH -> H
-    net.minecraft.world.level.block.state.properties.BooleanProperty EAST -> I
-    net.minecraft.world.level.block.state.properties.BooleanProperty SOUTH -> J
-    net.minecraft.world.level.block.state.properties.BooleanProperty WEST -> K
-    net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> L
-    net.minecraft.world.level.block.state.properties.DirectionProperty FACING_HOPPER -> M
-    net.minecraft.world.level.block.state.properties.DirectionProperty HORIZONTAL_FACING -> N
-    net.minecraft.world.level.block.state.properties.EnumProperty ATTACH_FACE -> O
-    net.minecraft.world.level.block.state.properties.EnumProperty BELL_ATTACHMENT -> P
-    net.minecraft.world.level.block.state.properties.EnumProperty EAST_REDSTONE -> Q
-    net.minecraft.world.level.block.state.properties.EnumProperty NORTH_REDSTONE -> R
-    net.minecraft.world.level.block.state.properties.EnumProperty SOUTH_REDSTONE -> S
-    net.minecraft.world.level.block.state.properties.EnumProperty WEST_REDSTONE -> T
-    net.minecraft.world.level.block.state.properties.EnumProperty DOUBLE_BLOCK_HALF -> U
-    net.minecraft.world.level.block.state.properties.EnumProperty HALF -> V
-    net.minecraft.world.level.block.state.properties.EnumProperty RAIL_SHAPE -> W
-    net.minecraft.world.level.block.state.properties.EnumProperty RAIL_SHAPE_STRAIGHT -> X
-    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_1 -> Y
-    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_2 -> Z
-    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_3 -> aa
-    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_5 -> ab
-    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_7 -> ac
-    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_15 -> ad
-    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_25 -> ae
-    net.minecraft.world.level.block.state.properties.IntegerProperty BITES -> af
-    net.minecraft.world.level.block.state.properties.IntegerProperty DELAY -> ag
-    net.minecraft.world.level.block.state.properties.IntegerProperty DISTANCE -> ah
-    net.minecraft.world.level.block.state.properties.IntegerProperty EGGS -> ai
-    net.minecraft.world.level.block.state.properties.IntegerProperty HATCH -> aj
-    net.minecraft.world.level.block.state.properties.IntegerProperty LAYERS -> ak
-    net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL_CAULDRON -> al
-    net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL_COMPOSTER -> am
-    net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL_FLOWING -> an
-    net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL_HONEY -> ao
-    net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL -> ap
-    net.minecraft.world.level.block.state.properties.IntegerProperty MOISTURE -> aq
-    net.minecraft.world.level.block.state.properties.IntegerProperty NOTE -> ar
-    net.minecraft.world.level.block.state.properties.IntegerProperty PICKLES -> as
-    net.minecraft.world.level.block.state.properties.IntegerProperty POWER -> at
-    net.minecraft.world.level.block.state.properties.IntegerProperty STAGE -> au
-    net.minecraft.world.level.block.state.properties.IntegerProperty STABILITY_DISTANCE -> av
-    net.minecraft.world.level.block.state.properties.IntegerProperty ROTATION_16 -> aw
-    net.minecraft.world.level.block.state.properties.EnumProperty BED_PART -> ax
-    net.minecraft.world.level.block.state.properties.EnumProperty CHEST_TYPE -> ay
-    net.minecraft.world.level.block.state.properties.EnumProperty MODE_COMPARATOR -> az
-    net.minecraft.world.level.block.state.properties.EnumProperty DOOR_HINGE -> aA
-    net.minecraft.world.level.block.state.properties.EnumProperty NOTEBLOCK_INSTRUMENT -> aB
-    net.minecraft.world.level.block.state.properties.EnumProperty PISTON_TYPE -> aC
-    net.minecraft.world.level.block.state.properties.EnumProperty SLAB_TYPE -> aD
-    net.minecraft.world.level.block.state.properties.EnumProperty STAIRS_SHAPE -> aE
-    net.minecraft.world.level.block.state.properties.EnumProperty STRUCTUREBLOCK_MODE -> aF
-    net.minecraft.world.level.block.state.properties.EnumProperty BAMBOO_LEAVES -> aG
-    10:10:void <init>() -> <init>
-    68:68:boolean lambda$static$1(net.minecraft.world.level.block.state.properties.RailShape) -> a
-    52:52:boolean lambda$static$0(net.minecraft.core.Direction) -> a
-    11:124:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.BooleanProperty -> bzb:
+    net.minecraft.world.level.block.state.properties.BooleanProperty VINE_END -> D
+    net.minecraft.world.level.block.state.properties.EnumProperty HORIZONTAL_AXIS -> E
+    net.minecraft.world.level.block.state.properties.EnumProperty AXIS -> F
+    net.minecraft.world.level.block.state.properties.BooleanProperty UP -> G
+    net.minecraft.world.level.block.state.properties.BooleanProperty DOWN -> H
+    net.minecraft.world.level.block.state.properties.BooleanProperty NORTH -> I
+    net.minecraft.world.level.block.state.properties.BooleanProperty EAST -> J
+    net.minecraft.world.level.block.state.properties.BooleanProperty SOUTH -> K
+    net.minecraft.world.level.block.state.properties.BooleanProperty WEST -> L
+    net.minecraft.world.level.block.state.properties.DirectionProperty FACING -> M
+    net.minecraft.world.level.block.state.properties.DirectionProperty FACING_HOPPER -> N
+    net.minecraft.world.level.block.state.properties.DirectionProperty HORIZONTAL_FACING -> O
+    net.minecraft.world.level.block.state.properties.EnumProperty ORIENTATION -> P
+    net.minecraft.world.level.block.state.properties.EnumProperty ATTACH_FACE -> Q
+    net.minecraft.world.level.block.state.properties.EnumProperty BELL_ATTACHMENT -> R
+    net.minecraft.world.level.block.state.properties.EnumProperty EAST_WALL -> S
+    net.minecraft.world.level.block.state.properties.EnumProperty NORTH_WALL -> T
+    net.minecraft.world.level.block.state.properties.EnumProperty SOUTH_WALL -> U
+    net.minecraft.world.level.block.state.properties.EnumProperty WEST_WALL -> V
+    net.minecraft.world.level.block.state.properties.EnumProperty EAST_REDSTONE -> W
+    net.minecraft.world.level.block.state.properties.EnumProperty NORTH_REDSTONE -> X
+    net.minecraft.world.level.block.state.properties.EnumProperty SOUTH_REDSTONE -> Y
+    net.minecraft.world.level.block.state.properties.EnumProperty WEST_REDSTONE -> Z
+    net.minecraft.world.level.block.state.properties.EnumProperty DOUBLE_BLOCK_HALF -> aa
+    net.minecraft.world.level.block.state.properties.EnumProperty HALF -> ab
+    net.minecraft.world.level.block.state.properties.EnumProperty RAIL_SHAPE -> ac
+    net.minecraft.world.level.block.state.properties.EnumProperty RAIL_SHAPE_STRAIGHT -> ad
+    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_1 -> ae
+    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_2 -> af
+    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_3 -> ag
+    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_5 -> ah
+    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_7 -> ai
+    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_15 -> aj
+    net.minecraft.world.level.block.state.properties.IntegerProperty AGE_25 -> ak
+    net.minecraft.world.level.block.state.properties.IntegerProperty BITES -> al
+    net.minecraft.world.level.block.state.properties.IntegerProperty DELAY -> am
+    net.minecraft.world.level.block.state.properties.IntegerProperty DISTANCE -> an
+    net.minecraft.world.level.block.state.properties.IntegerProperty EGGS -> ao
+    net.minecraft.world.level.block.state.properties.IntegerProperty HATCH -> ap
+    net.minecraft.world.level.block.state.properties.IntegerProperty LAYERS -> aq
+    net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL_CAULDRON -> ar
+    net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL_COMPOSTER -> as
+    net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL_FLOWING -> at
+    net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL_HONEY -> au
+    net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL -> av
+    net.minecraft.world.level.block.state.properties.IntegerProperty MOISTURE -> aw
+    net.minecraft.world.level.block.state.properties.IntegerProperty NOTE -> ax
+    net.minecraft.world.level.block.state.properties.IntegerProperty PICKLES -> ay
+    net.minecraft.world.level.block.state.properties.IntegerProperty POWER -> az
+    net.minecraft.world.level.block.state.properties.IntegerProperty STAGE -> aA
+    net.minecraft.world.level.block.state.properties.IntegerProperty STABILITY_DISTANCE -> aB
+    net.minecraft.world.level.block.state.properties.IntegerProperty RESPAWN_ANCHOR_CHARGES -> aC
+    net.minecraft.world.level.block.state.properties.IntegerProperty ROTATION_16 -> aD
+    net.minecraft.world.level.block.state.properties.EnumProperty BED_PART -> aE
+    net.minecraft.world.level.block.state.properties.EnumProperty CHEST_TYPE -> aF
+    net.minecraft.world.level.block.state.properties.EnumProperty MODE_COMPARATOR -> aG
+    net.minecraft.world.level.block.state.properties.EnumProperty DOOR_HINGE -> aH
+    net.minecraft.world.level.block.state.properties.EnumProperty NOTEBLOCK_INSTRUMENT -> aI
+    net.minecraft.world.level.block.state.properties.EnumProperty PISTON_TYPE -> aJ
+    net.minecraft.world.level.block.state.properties.EnumProperty SLAB_TYPE -> aK
+    net.minecraft.world.level.block.state.properties.EnumProperty STAIRS_SHAPE -> aL
+    net.minecraft.world.level.block.state.properties.EnumProperty STRUCTUREBLOCK_MODE -> aM
+    net.minecraft.world.level.block.state.properties.EnumProperty BAMBOO_LEAVES -> aN
+    11:11:void <init>() -> <init>
+    77:77:boolean lambda$static$1(net.minecraft.world.level.block.state.properties.RailShape) -> a
+    54:54:boolean lambda$static$0(net.minecraft.core.Direction) -> a
+    12:136:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.properties.BooleanProperty -> cga:
     com.google.common.collect.ImmutableSet values -> a
     12:14:void <init>(java.lang.String) -> <init>
-    18:18:java.util.Collection getPossibleValues() -> d
+    18:18:java.util.Collection getPossibleValues() -> a
     22:22:net.minecraft.world.level.block.state.properties.BooleanProperty create(java.lang.String) -> a
     27:31:java.util.Optional getValue(java.lang.String) -> b
     36:36:java.lang.String getName(java.lang.Boolean) -> a
     41:51:boolean equals(java.lang.Object) -> equals
-    56:56:int generateHashCode() -> c
+    56:56:int generateHashCode() -> b
     8:8:java.lang.String getName(java.lang.Comparable) -> a
-net.minecraft.world.level.block.state.properties.ChestType -> bzc:
+net.minecraft.world.level.block.state.properties.ChestType -> cgb:
     net.minecraft.world.level.block.state.properties.ChestType SINGLE -> a
     net.minecraft.world.level.block.state.properties.ChestType LEFT -> b
     net.minecraft.world.level.block.state.properties.ChestType RIGHT -> c
@@ -57287,10 +62596,10 @@ net.minecraft.world.level.block.state.properties.ChestType -> bzc:
     5:5:net.minecraft.world.level.block.state.properties.ChestType[] values() -> values
     5:5:net.minecraft.world.level.block.state.properties.ChestType valueOf(java.lang.String) -> valueOf
     16:19:void <init>(java.lang.String,int,java.lang.String,int) -> <init>
-    23:23:java.lang.String getSerializedName() -> o
-    27:27:net.minecraft.world.level.block.state.properties.ChestType getOpposite() -> a
+    23:23:java.lang.String getSerializedName() -> a
+    27:27:net.minecraft.world.level.block.state.properties.ChestType getOpposite() -> b
     5:11:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.ComparatorMode -> bzd:
+net.minecraft.world.level.block.state.properties.ComparatorMode -> cgc:
     net.minecraft.world.level.block.state.properties.ComparatorMode COMPARE -> a
     net.minecraft.world.level.block.state.properties.ComparatorMode SUBTRACT -> b
     java.lang.String name -> c
@@ -57299,15 +62608,15 @@ net.minecraft.world.level.block.state.properties.ComparatorMode -> bzd:
     5:5:net.minecraft.world.level.block.state.properties.ComparatorMode valueOf(java.lang.String) -> valueOf
     12:14:void <init>(java.lang.String,int,java.lang.String) -> <init>
     18:18:java.lang.String toString() -> toString
-    23:23:java.lang.String getSerializedName() -> o
+    23:23:java.lang.String getSerializedName() -> a
     5:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.DirectionProperty -> bze:
+net.minecraft.world.level.block.state.properties.DirectionProperty -> cgd:
     14:15:void <init>(java.lang.String,java.util.Collection) -> <init>
     18:18:net.minecraft.world.level.block.state.properties.DirectionProperty create(java.lang.String) -> a
     22:22:net.minecraft.world.level.block.state.properties.DirectionProperty create(java.lang.String,java.util.function.Predicate) -> a
     26:26:net.minecraft.world.level.block.state.properties.DirectionProperty create(java.lang.String,net.minecraft.core.Direction[]) -> a
     30:30:net.minecraft.world.level.block.state.properties.DirectionProperty create(java.lang.String,java.util.Collection) -> a
-net.minecraft.world.level.block.state.properties.DoorHingeSide -> bzf:
+net.minecraft.world.level.block.state.properties.DoorHingeSide -> cge:
     net.minecraft.world.level.block.state.properties.DoorHingeSide LEFT -> a
     net.minecraft.world.level.block.state.properties.DoorHingeSide RIGHT -> b
     net.minecraft.world.level.block.state.properties.DoorHingeSide[] $VALUES -> c
@@ -57315,9 +62624,9 @@ net.minecraft.world.level.block.state.properties.DoorHingeSide -> bzf:
     5:5:net.minecraft.world.level.block.state.properties.DoorHingeSide valueOf(java.lang.String) -> valueOf
     5:5:void <init>(java.lang.String,int) -> <init>
     12:12:java.lang.String toString() -> toString
-    17:17:java.lang.String getSerializedName() -> o
+    17:17:java.lang.String getSerializedName() -> a
     5:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.DoubleBlockHalf -> bzg:
+net.minecraft.world.level.block.state.properties.DoubleBlockHalf -> cgf:
     net.minecraft.world.level.block.state.properties.DoubleBlockHalf UPPER -> a
     net.minecraft.world.level.block.state.properties.DoubleBlockHalf LOWER -> b
     net.minecraft.world.level.block.state.properties.DoubleBlockHalf[] $VALUES -> c
@@ -57325,23 +62634,23 @@ net.minecraft.world.level.block.state.properties.DoubleBlockHalf -> bzg:
     5:5:net.minecraft.world.level.block.state.properties.DoubleBlockHalf valueOf(java.lang.String) -> valueOf
     5:5:void <init>(java.lang.String,int) -> <init>
     12:12:java.lang.String toString() -> toString
-    17:17:java.lang.String getSerializedName() -> o
+    17:17:java.lang.String getSerializedName() -> a
     5:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.EnumProperty -> bzh:
+net.minecraft.world.level.block.state.properties.EnumProperty -> cgg:
     com.google.common.collect.ImmutableSet values -> a
     java.util.Map names -> b
     18:31:void <init>(java.lang.String,java.lang.Class,java.util.Collection) -> <init>
-    35:35:java.util.Collection getPossibleValues() -> d
+    35:35:java.util.Collection getPossibleValues() -> a
     40:40:java.util.Optional getValue(java.lang.String) -> b
     45:45:java.lang.String getName(java.lang.Enum) -> a
     50:59:boolean equals(java.lang.Object) -> equals
-    64:67:int generateHashCode() -> c
+    64:67:int generateHashCode() -> b
     71:71:net.minecraft.world.level.block.state.properties.EnumProperty create(java.lang.String,java.lang.Class) -> a
     75:75:net.minecraft.world.level.block.state.properties.EnumProperty create(java.lang.String,java.lang.Class,java.util.function.Predicate) -> a
     79:79:net.minecraft.world.level.block.state.properties.EnumProperty create(java.lang.String,java.lang.Class,java.lang.Enum[]) -> a
     83:83:net.minecraft.world.level.block.state.properties.EnumProperty create(java.lang.String,java.lang.Class,java.util.Collection) -> a
     16:16:java.lang.String getName(java.lang.Comparable) -> a
-net.minecraft.world.level.block.state.properties.Half -> bzi:
+net.minecraft.world.level.block.state.properties.Half -> cgh:
     net.minecraft.world.level.block.state.properties.Half TOP -> a
     net.minecraft.world.level.block.state.properties.Half BOTTOM -> b
     java.lang.String name -> c
@@ -57350,19 +62659,19 @@ net.minecraft.world.level.block.state.properties.Half -> bzi:
     5:5:net.minecraft.world.level.block.state.properties.Half valueOf(java.lang.String) -> valueOf
     12:14:void <init>(java.lang.String,int,java.lang.String) -> <init>
     18:18:java.lang.String toString() -> toString
-    23:23:java.lang.String getSerializedName() -> o
+    23:23:java.lang.String getSerializedName() -> a
     5:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.IntegerProperty -> bzj:
+net.minecraft.world.level.block.state.properties.IntegerProperty -> cgi:
     com.google.common.collect.ImmutableSet values -> a
     14:29:void <init>(java.lang.String,int,int) -> <init>
-    33:33:java.util.Collection getPossibleValues() -> d
+    33:33:java.util.Collection getPossibleValues() -> a
     38:48:boolean equals(java.lang.Object) -> equals
-    53:53:int generateHashCode() -> c
+    53:53:int generateHashCode() -> b
     57:57:net.minecraft.world.level.block.state.properties.IntegerProperty create(java.lang.String,int,int) -> a
     63:67:java.util.Optional getValue(java.lang.String) -> b
     73:73:java.lang.String getName(java.lang.Integer) -> a
     10:10:java.lang.String getName(java.lang.Comparable) -> a
-net.minecraft.world.level.block.state.properties.NoteBlockInstrument -> bzk:
+net.minecraft.world.level.block.state.properties.NoteBlockInstrument -> cgj:
     net.minecraft.world.level.block.state.properties.NoteBlockInstrument HARP -> a
     net.minecraft.world.level.block.state.properties.NoteBlockInstrument BASEDRUM -> b
     net.minecraft.world.level.block.state.properties.NoteBlockInstrument SNARE -> c
@@ -57382,14 +62691,14 @@ net.minecraft.world.level.block.state.properties.NoteBlockInstrument -> bzk:
     java.lang.String name -> q
     net.minecraft.sounds.SoundEvent soundEvent -> r
     net.minecraft.world.level.block.state.properties.NoteBlockInstrument[] $VALUES -> s
-    12:12:net.minecraft.world.level.block.state.properties.NoteBlockInstrument[] values() -> values
-    12:12:net.minecraft.world.level.block.state.properties.NoteBlockInstrument valueOf(java.lang.String) -> valueOf
-    34:37:void <init>(java.lang.String,int,java.lang.String,net.minecraft.sounds.SoundEvent) -> <init>
-    41:41:java.lang.String getSerializedName() -> o
-    45:45:net.minecraft.sounds.SoundEvent getSoundEvent() -> a
-    49:98:net.minecraft.world.level.block.state.properties.NoteBlockInstrument byState(net.minecraft.world.level.block.state.BlockState) -> a
-    12:28:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.PistonType -> bzl:
+    11:11:net.minecraft.world.level.block.state.properties.NoteBlockInstrument[] values() -> values
+    11:11:net.minecraft.world.level.block.state.properties.NoteBlockInstrument valueOf(java.lang.String) -> valueOf
+    33:36:void <init>(java.lang.String,int,java.lang.String,net.minecraft.sounds.SoundEvent) -> <init>
+    40:40:java.lang.String getSerializedName() -> a
+    44:44:net.minecraft.sounds.SoundEvent getSoundEvent() -> b
+    48:96:net.minecraft.world.level.block.state.properties.NoteBlockInstrument byState(net.minecraft.world.level.block.state.BlockState) -> a
+    11:27:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.properties.PistonType -> cgk:
     net.minecraft.world.level.block.state.properties.PistonType DEFAULT -> a
     net.minecraft.world.level.block.state.properties.PistonType STICKY -> b
     java.lang.String name -> c
@@ -57398,15 +62707,45 @@ net.minecraft.world.level.block.state.properties.PistonType -> bzl:
     5:5:net.minecraft.world.level.block.state.properties.PistonType valueOf(java.lang.String) -> valueOf
     11:13:void <init>(java.lang.String,int,java.lang.String) -> <init>
     17:17:java.lang.String toString() -> toString
-    22:22:java.lang.String getSerializedName() -> o
+    22:22:java.lang.String getSerializedName() -> a
     5:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.Property -> bzm:
-    java.lang.String getName() -> a
-    java.util.Collection getPossibleValues() -> d
-    java.lang.Class getValueClass() -> b
-    java.util.Optional getValue(java.lang.String) -> b
+net.minecraft.world.level.block.state.properties.Property -> cgl:
+    java.lang.Class clazz -> a
+    java.lang.String name -> b
+    java.lang.Integer hashCode -> c
+    com.mojang.serialization.Codec codec -> d
+    com.mojang.serialization.Codec valueCodec -> e
+    17:27:void <init>(java.lang.String,java.lang.Class) -> <init>
+    30:30:net.minecraft.world.level.block.state.properties.Property$Value value(java.lang.Comparable) -> b
+    34:34:net.minecraft.world.level.block.state.properties.Property$Value value(net.minecraft.world.level.block.state.StateHolder) -> a
+    38:38:java.util.stream.Stream getAllValues() -> c
+    42:42:com.mojang.serialization.Codec codec() -> d
+    46:46:com.mojang.serialization.Codec valueCodec() -> e
+    50:50:java.lang.String getName() -> f
+    54:54:java.lang.Class getValueClass() -> g
+    java.util.Collection getPossibleValues() -> a
     java.lang.String getName(java.lang.Comparable) -> a
-net.minecraft.world.level.block.state.properties.RailShape -> bzn:
+    java.util.Optional getValue(java.lang.String) -> b
+    65:69:java.lang.String toString() -> toString
+    74:84:boolean equals(java.lang.Object) -> equals
+    89:92:int hashCode() -> hashCode
+    96:96:int generateHashCode() -> b
+    100:101:com.mojang.serialization.DataResult parseValue(com.mojang.serialization.DynamicOps,net.minecraft.world.level.block.state.StateHolder,java.lang.Object) -> a
+    101:101:net.minecraft.world.level.block.state.StateHolder lambda$parseValue$2(net.minecraft.world.level.block.state.StateHolder,java.lang.Comparable) -> a
+    18:18:com.mojang.serialization.DataResult lambda$new$1(java.lang.String) -> a
+    18:18:com.mojang.serialization.DataResult lambda$null$0(java.lang.String) -> c
+net.minecraft.world.level.block.state.properties.Property$1 -> cgl$1:
+net.minecraft.world.level.block.state.properties.Property$Value -> cgl$a:
+    net.minecraft.world.level.block.state.properties.Property property -> a
+    java.lang.Comparable value -> b
+    108:114:void <init>(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable) -> <init>
+    117:117:net.minecraft.world.level.block.state.properties.Property getProperty() -> a
+    121:121:java.lang.Comparable value() -> b
+    126:126:java.lang.String toString() -> toString
+    131:139:boolean equals(java.lang.Object) -> equals
+    144:146:int hashCode() -> hashCode
+    104:104:void <init>(net.minecraft.world.level.block.state.properties.Property,java.lang.Comparable,net.minecraft.world.level.block.state.properties.Property$1) -> <init>
+net.minecraft.world.level.block.state.properties.RailShape -> cgm:
     net.minecraft.world.level.block.state.properties.RailShape NORTH_SOUTH -> a
     net.minecraft.world.level.block.state.properties.RailShape EAST_WEST -> b
     net.minecraft.world.level.block.state.properties.RailShape ASCENDING_EAST -> c
@@ -57422,12 +62761,12 @@ net.minecraft.world.level.block.state.properties.RailShape -> bzn:
     5:5:net.minecraft.world.level.block.state.properties.RailShape[] values() -> values
     5:5:net.minecraft.world.level.block.state.properties.RailShape valueOf(java.lang.String) -> valueOf
     20:22:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    25:25:java.lang.String getName() -> a
+    25:25:java.lang.String getName() -> b
     30:30:java.lang.String toString() -> toString
-    34:34:boolean isAscending() -> b
-    39:39:java.lang.String getSerializedName() -> o
+    34:34:boolean isAscending() -> c
+    39:39:java.lang.String getSerializedName() -> a
     5:15:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.RedstoneSide -> bzo:
+net.minecraft.world.level.block.state.properties.RedstoneSide -> cgn:
     net.minecraft.world.level.block.state.properties.RedstoneSide UP -> a
     net.minecraft.world.level.block.state.properties.RedstoneSide SIDE -> b
     net.minecraft.world.level.block.state.properties.RedstoneSide NONE -> c
@@ -57437,9 +62776,10 @@ net.minecraft.world.level.block.state.properties.RedstoneSide -> bzo:
     5:5:net.minecraft.world.level.block.state.properties.RedstoneSide valueOf(java.lang.String) -> valueOf
     13:15:void <init>(java.lang.String,int,java.lang.String) -> <init>
     19:19:java.lang.String toString() -> toString
-    24:24:java.lang.String getSerializedName() -> o
+    24:24:java.lang.String getSerializedName() -> a
+    28:28:boolean isConnected() -> b
     5:8:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.SlabType -> bzp:
+net.minecraft.world.level.block.state.properties.SlabType -> cgo:
     net.minecraft.world.level.block.state.properties.SlabType TOP -> a
     net.minecraft.world.level.block.state.properties.SlabType BOTTOM -> b
     net.minecraft.world.level.block.state.properties.SlabType DOUBLE -> c
@@ -57449,9 +62789,9 @@ net.minecraft.world.level.block.state.properties.SlabType -> bzp:
     5:5:net.minecraft.world.level.block.state.properties.SlabType valueOf(java.lang.String) -> valueOf
     13:15:void <init>(java.lang.String,int,java.lang.String) -> <init>
     19:19:java.lang.String toString() -> toString
-    24:24:java.lang.String getSerializedName() -> o
+    24:24:java.lang.String getSerializedName() -> a
     5:8:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.StairsShape -> bzq:
+net.minecraft.world.level.block.state.properties.StairsShape -> cgp:
     net.minecraft.world.level.block.state.properties.StairsShape STRAIGHT -> a
     net.minecraft.world.level.block.state.properties.StairsShape INNER_LEFT -> b
     net.minecraft.world.level.block.state.properties.StairsShape INNER_RIGHT -> c
@@ -57463,9 +62803,9 @@ net.minecraft.world.level.block.state.properties.StairsShape -> bzq:
     5:5:net.minecraft.world.level.block.state.properties.StairsShape valueOf(java.lang.String) -> valueOf
     15:17:void <init>(java.lang.String,int,java.lang.String) -> <init>
     21:21:java.lang.String toString() -> toString
-    26:26:java.lang.String getSerializedName() -> o
+    26:26:java.lang.String getSerializedName() -> a
     5:10:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.StructureMode -> bzr:
+net.minecraft.world.level.block.state.properties.StructureMode -> cgq:
     net.minecraft.world.level.block.state.properties.StructureMode SAVE -> a
     net.minecraft.world.level.block.state.properties.StructureMode LOAD -> b
     net.minecraft.world.level.block.state.properties.StructureMode CORNER -> c
@@ -57475,24 +62815,38 @@ net.minecraft.world.level.block.state.properties.StructureMode -> bzr:
     5:5:net.minecraft.world.level.block.state.properties.StructureMode[] values() -> values
     5:5:net.minecraft.world.level.block.state.properties.StructureMode valueOf(java.lang.String) -> valueOf
     14:16:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    20:20:java.lang.String getSerializedName() -> o
+    20:20:java.lang.String getSerializedName() -> a
     5:9:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.WoodType -> bzs:
-    java.util.Set VALUES -> g
+net.minecraft.world.level.block.state.properties.WallSide -> cgr:
+    net.minecraft.world.level.block.state.properties.WallSide NONE -> a
+    net.minecraft.world.level.block.state.properties.WallSide LOW -> b
+    net.minecraft.world.level.block.state.properties.WallSide TALL -> c
+    java.lang.String name -> d
+    net.minecraft.world.level.block.state.properties.WallSide[] $VALUES -> e
+    5:5:net.minecraft.world.level.block.state.properties.WallSide[] values() -> values
+    5:5:net.minecraft.world.level.block.state.properties.WallSide valueOf(java.lang.String) -> valueOf
+    13:15:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    19:19:java.lang.String toString() -> toString
+    24:24:java.lang.String getSerializedName() -> a
+    5:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.properties.WoodType -> cgs:
+    java.util.Set VALUES -> i
     net.minecraft.world.level.block.state.properties.WoodType OAK -> a
     net.minecraft.world.level.block.state.properties.WoodType SPRUCE -> b
     net.minecraft.world.level.block.state.properties.WoodType BIRCH -> c
     net.minecraft.world.level.block.state.properties.WoodType ACACIA -> d
     net.minecraft.world.level.block.state.properties.WoodType JUNGLE -> e
     net.minecraft.world.level.block.state.properties.WoodType DARK_OAK -> f
-    java.lang.String name -> h
-    20:22:void <init>(java.lang.String) -> <init>
-    25:26:net.minecraft.world.level.block.state.properties.WoodType register(net.minecraft.world.level.block.state.properties.WoodType) -> a
-    30:30:java.util.stream.Stream values() -> a
-    34:34:java.lang.String name() -> b
-    9:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.block.state.properties.package-info -> bzt:
-net.minecraft.world.level.border.BorderChangeListener -> bzu:
+    net.minecraft.world.level.block.state.properties.WoodType CRIMSON -> g
+    net.minecraft.world.level.block.state.properties.WoodType WARPED -> h
+    java.lang.String name -> j
+    22:24:void <init>(java.lang.String) -> <init>
+    27:28:net.minecraft.world.level.block.state.properties.WoodType register(net.minecraft.world.level.block.state.properties.WoodType) -> a
+    32:32:java.util.stream.Stream values() -> a
+    36:36:java.lang.String name() -> b
+    9:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.block.state.properties.package-info -> cgt:
+net.minecraft.world.level.border.BorderChangeListener -> cgu:
     void onBorderSizeSet(net.minecraft.world.level.border.WorldBorder,double) -> a
     void onBorderSizeLerping(net.minecraft.world.level.border.WorldBorder,double,double,long) -> a
     void onBorderCenterSet(net.minecraft.world.level.border.WorldBorder,double,double) -> a
@@ -57500,7 +62854,7 @@ net.minecraft.world.level.border.BorderChangeListener -> bzu:
     void onBorderSetWarningBlocks(net.minecraft.world.level.border.WorldBorder,int) -> b
     void onBorderSetDamagePerBlock(net.minecraft.world.level.border.WorldBorder,double) -> b
     void onBorderSetDamageSafeZOne(net.minecraft.world.level.border.WorldBorder,double) -> c
-net.minecraft.world.level.border.BorderChangeListener$DelegateBorderChangeListener -> bzu$a:
+net.minecraft.world.level.border.BorderChangeListener$DelegateBorderChangeListener -> cgu$a:
     net.minecraft.world.level.border.WorldBorder worldBorder -> a
     21:23:void <init>(net.minecraft.world.level.border.WorldBorder) -> <init>
     27:28:void onBorderSizeSet(net.minecraft.world.level.border.WorldBorder,double) -> a
@@ -57510,7 +62864,7 @@ net.minecraft.world.level.border.BorderChangeListener$DelegateBorderChangeListen
     47:48:void onBorderSetWarningBlocks(net.minecraft.world.level.border.WorldBorder,int) -> b
     52:53:void onBorderSetDamagePerBlock(net.minecraft.world.level.border.WorldBorder,double) -> b
     57:58:void onBorderSetDamageSafeZOne(net.minecraft.world.level.border.WorldBorder,double) -> c
-net.minecraft.world.level.border.BorderStatus -> bzv:
+net.minecraft.world.level.border.BorderStatus -> cgv:
     net.minecraft.world.level.border.BorderStatus GROWING -> a
     net.minecraft.world.level.border.BorderStatus SHRINKING -> b
     net.minecraft.world.level.border.BorderStatus STATIONARY -> c
@@ -57521,57 +62875,59 @@ net.minecraft.world.level.border.BorderStatus -> bzv:
     11:13:void <init>(java.lang.String,int,int) -> <init>
     16:16:int getColor() -> a
     3:6:void <clinit>() -> <clinit>
-net.minecraft.world.level.border.WorldBorder -> bzw:
+net.minecraft.world.level.border.WorldBorder -> cgw:
     java.util.List listeners -> a
-    double damagePerBlock -> b
-    double damageSafeZone -> c
-    int warningTime -> d
-    int warningBlocks -> e
-    double centerX -> f
-    double centerZ -> g
-    int absoluteMaxSize -> h
-    net.minecraft.world.level.border.WorldBorder$BorderExtent extent -> i
-    18:242:void <init>() -> <init>
-    245:245:boolean isWithinBounds(net.minecraft.core.BlockPos) -> a
-    249:249:boolean isWithinBounds(net.minecraft.world.level.ChunkPos) -> a
-    253:253:boolean isWithinBounds(double,double) -> a
-    257:257:boolean isWithinBounds(net.minecraft.world.phys.AABB) -> a
-    261:261:double getDistanceToBorder(net.minecraft.world.entity.Entity) -> a
-    265:265:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape() -> a
-    269:275:double getDistanceToBorder(double,double) -> b
-    279:279:net.minecraft.world.level.border.BorderStatus getStatus() -> b
-    283:283:double getMinX() -> c
-    287:287:double getMinZ() -> d
-    291:291:double getMaxX() -> e
-    295:295:double getMaxZ() -> f
-    299:299:double getCenterX() -> g
-    303:303:double getCenterZ() -> h
-    307:315:void setCenter(double,double) -> c
-    318:318:double getSize() -> i
-    322:322:long getLerpRemainingTime() -> j
-    326:326:double getLerpTarget() -> k
-    330:335:void setSize(double) -> a
-    338:343:void lerpSizeBetween(double,double,long) -> a
-    346:346:java.util.List getListeners() -> l
-    350:351:void addListener(net.minecraft.world.level.border.BorderChangeListener) -> a
-    354:355:void removeListener(net.minecraft.world.level.border.BorderChangeListener) -> b
-    358:360:void setAbsoluteMaxSize(int) -> a
-    363:363:int getAbsoluteMaxSize() -> m
-    367:367:double getDamageSafeZone() -> n
-    371:376:void setDamageSafeZone(double) -> b
-    379:379:double getDamagePerBlock() -> o
-    383:388:void setDamagePerBlock(double) -> c
-    391:391:double getLerpSpeed() -> p
-    395:395:int getWarningTime() -> q
-    399:404:void setWarningTime(int) -> b
-    407:407:int getWarningBlocks() -> r
-    411:416:void setWarningBlocks(int) -> c
-    419:420:void tick() -> s
-    423:433:void saveWorldBorderData(net.minecraft.world.level.storage.LevelData) -> a
-    436:447:void readBorderData(net.minecraft.world.level.storage.LevelData) -> b
-    18:18:int access$000(net.minecraft.world.level.border.WorldBorder) -> a
-net.minecraft.world.level.border.WorldBorder$1 -> bzw$1:
-net.minecraft.world.level.border.WorldBorder$BorderExtent -> bzw$a:
+    double damagePerBlock -> c
+    double damageSafeZone -> d
+    int warningTime -> e
+    int warningBlocks -> f
+    double centerX -> g
+    double centerZ -> h
+    int absoluteMaxSize -> i
+    net.minecraft.world.level.border.WorldBorder$BorderExtent extent -> j
+    net.minecraft.world.level.border.WorldBorder$Settings DEFAULT_SETTINGS -> b
+    20:244:void <init>() -> <init>
+    247:247:boolean isWithinBounds(net.minecraft.core.BlockPos) -> a
+    251:251:boolean isWithinBounds(net.minecraft.world.level.ChunkPos) -> a
+    255:255:boolean isWithinBounds(double,double) -> a
+    259:259:boolean isWithinBounds(net.minecraft.world.phys.AABB) -> a
+    263:263:double getDistanceToBorder(net.minecraft.world.entity.Entity) -> a
+    267:267:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape() -> c
+    271:277:double getDistanceToBorder(double,double) -> b
+    281:281:net.minecraft.world.level.border.BorderStatus getStatus() -> d
+    285:285:double getMinX() -> e
+    289:289:double getMinZ() -> f
+    293:293:double getMaxX() -> g
+    297:297:double getMaxZ() -> h
+    301:301:double getCenterX() -> a
+    305:305:double getCenterZ() -> b
+    309:317:void setCenter(double,double) -> c
+    320:320:double getSize() -> i
+    324:324:long getLerpRemainingTime() -> j
+    328:328:double getLerpTarget() -> k
+    332:337:void setSize(double) -> a
+    340:345:void lerpSizeBetween(double,double,long) -> a
+    348:348:java.util.List getListeners() -> l
+    352:353:void addListener(net.minecraft.world.level.border.BorderChangeListener) -> a
+    356:357:void removeListener(net.minecraft.world.level.border.BorderChangeListener) -> b
+    360:362:void setAbsoluteMaxSize(int) -> a
+    365:365:int getAbsoluteMaxSize() -> m
+    369:369:double getDamageSafeZone() -> n
+    373:378:void setDamageSafeZone(double) -> b
+    381:381:double getDamagePerBlock() -> o
+    385:390:void setDamagePerBlock(double) -> c
+    393:393:double getLerpSpeed() -> p
+    397:397:int getWarningTime() -> q
+    401:406:void setWarningTime(int) -> b
+    409:409:int getWarningBlocks() -> r
+    413:418:void setWarningBlocks(int) -> c
+    421:422:void tick() -> s
+    425:425:net.minecraft.world.level.border.WorldBorder$Settings createSettings() -> t
+    429:440:void applySettings(net.minecraft.world.level.border.WorldBorder$Settings) -> a
+    20:20:int access$000(net.minecraft.world.level.border.WorldBorder) -> a
+    442:442:void <clinit>() -> <clinit>
+net.minecraft.world.level.border.WorldBorder$1 -> cgw$1:
+net.minecraft.world.level.border.WorldBorder$BorderExtent -> cgw$a:
     double getMinX() -> a
     double getMaxX() -> b
     double getMinZ() -> c
@@ -57585,29 +62941,54 @@ net.minecraft.world.level.border.WorldBorder$BorderExtent -> bzw$a:
     void onCenterChange() -> k
     net.minecraft.world.level.border.WorldBorder$BorderExtent update() -> l
     net.minecraft.world.phys.shapes.VoxelShape getCollisionShape() -> m
-net.minecraft.world.level.border.WorldBorder$MovingBorderExtent -> bzw$b:
+net.minecraft.world.level.border.WorldBorder$MovingBorderExtent -> cgw$b:
     double from -> b
     double to -> c
     long lerpEnd -> d
     long lerpBegin -> e
     double lerpDuration -> f
     net.minecraft.world.level.border.WorldBorder this$0 -> a
-    56:63:void <init>(net.minecraft.world.level.border.WorldBorder,double,double,long) -> <init>
-    67:67:double getMinX() -> a
-    72:72:double getMinZ() -> c
-    77:77:double getMaxX() -> b
-    82:82:double getMaxZ() -> d
-    87:88:double getSize() -> e
-    93:93:double getLerpSpeed() -> f
-    98:98:long getLerpRemainingTime() -> g
-    103:103:double getLerpTarget() -> h
-    108:108:net.minecraft.world.level.border.BorderStatus getStatus() -> i
-    113:113:void onCenterChange() -> k
-    117:117:void onAbsoluteMaxSizeChange() -> j
-    121:125:net.minecraft.world.level.border.WorldBorder$BorderExtent update() -> l
-    130:132:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape() -> m
-    47:47:void <init>(net.minecraft.world.level.border.WorldBorder,double,double,long,net.minecraft.world.level.border.WorldBorder$1) -> <init>
-net.minecraft.world.level.border.WorldBorder$StaticBorderExtent -> bzw$c:
+    58:65:void <init>(net.minecraft.world.level.border.WorldBorder,double,double,long) -> <init>
+    69:69:double getMinX() -> a
+    74:74:double getMinZ() -> c
+    79:79:double getMaxX() -> b
+    84:84:double getMaxZ() -> d
+    89:90:double getSize() -> e
+    95:95:double getLerpSpeed() -> f
+    100:100:long getLerpRemainingTime() -> g
+    105:105:double getLerpTarget() -> h
+    110:110:net.minecraft.world.level.border.BorderStatus getStatus() -> i
+    115:115:void onCenterChange() -> k
+    119:119:void onAbsoluteMaxSizeChange() -> j
+    123:127:net.minecraft.world.level.border.WorldBorder$BorderExtent update() -> l
+    132:134:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape() -> m
+    49:49:void <init>(net.minecraft.world.level.border.WorldBorder,double,double,long,net.minecraft.world.level.border.WorldBorder$1) -> <init>
+net.minecraft.world.level.border.WorldBorder$Settings -> cgw$c:
+    double centerX -> a
+    double centerZ -> b
+    double damagePerBlock -> c
+    double safeZone -> d
+    int warningBlocks -> e
+    int warningTime -> f
+    double size -> g
+    long sizeLerpTime -> h
+    double sizeLerpTarget -> i
+    455:465:void <init>(double,double,double,double,int,int,double,long,double) -> <init>
+    467:477:void <init>(net.minecraft.world.level.border.WorldBorder) -> <init>
+    480:480:double getCenterX() -> a
+    484:484:double getCenterZ() -> b
+    488:488:double getDamagePerBlock() -> c
+    492:492:double getSafeZone() -> d
+    496:496:int getWarningBlocks() -> e
+    500:500:int getWarningTime() -> f
+    504:504:double getSize() -> g
+    508:508:long getSizeLerpTime() -> h
+    512:512:double getSizeLerpTarget() -> i
+    516:526:net.minecraft.world.level.border.WorldBorder$Settings read(com.mojang.serialization.DynamicLike,net.minecraft.world.level.border.WorldBorder$Settings) -> a
+    530:539:void write(net.minecraft.nbt.CompoundTag) -> a
+    444:444:void <init>(net.minecraft.world.level.border.WorldBorder,net.minecraft.world.level.border.WorldBorder$1) -> <init>
+    444:444:void <init>(double,double,double,double,int,int,double,long,double,net.minecraft.world.level.border.WorldBorder$1) -> <init>
+net.minecraft.world.level.border.WorldBorder$StaticBorderExtent -> cgw$d:
     double size -> b
     double minX -> c
     double minZ -> d
@@ -57615,28 +62996,28 @@ net.minecraft.world.level.border.WorldBorder$StaticBorderExtent -> bzw$c:
     double maxZ -> f
     net.minecraft.world.phys.shapes.VoxelShape shape -> g
     net.minecraft.world.level.border.WorldBorder this$0 -> a
-    147:150:void <init>(net.minecraft.world.level.border.WorldBorder,double) -> <init>
-    154:154:double getMinX() -> a
-    159:159:double getMaxX() -> b
-    164:164:double getMinZ() -> c
-    169:169:double getMaxZ() -> d
-    174:174:double getSize() -> e
-    179:179:net.minecraft.world.level.border.BorderStatus getStatus() -> i
-    184:184:double getLerpSpeed() -> f
-    189:189:long getLerpRemainingTime() -> g
-    194:194:double getLerpTarget() -> h
-    198:207:void updateBox() -> n
-    211:212:void onAbsoluteMaxSizeChange() -> j
-    216:217:void onCenterChange() -> k
-    221:221:net.minecraft.world.level.border.WorldBorder$BorderExtent update() -> l
-    226:226:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape() -> m
-net.minecraft.world.level.border.package-info -> bzx:
-net.minecraft.world.level.chunk.ChunkAccess -> bzy:
+    149:152:void <init>(net.minecraft.world.level.border.WorldBorder,double) -> <init>
+    156:156:double getMinX() -> a
+    161:161:double getMaxX() -> b
+    166:166:double getMinZ() -> c
+    171:171:double getMaxZ() -> d
+    176:176:double getSize() -> e
+    181:181:net.minecraft.world.level.border.BorderStatus getStatus() -> i
+    186:186:double getLerpSpeed() -> f
+    191:191:long getLerpRemainingTime() -> g
+    196:196:double getLerpTarget() -> h
+    200:209:void updateBox() -> n
+    213:214:void onAbsoluteMaxSizeChange() -> j
+    218:219:void onCenterChange() -> k
+    223:223:net.minecraft.world.level.border.WorldBorder$BorderExtent update() -> l
+    228:228:net.minecraft.world.phys.shapes.VoxelShape getCollisionShape() -> m
+net.minecraft.world.level.border.package-info -> cgx:
+net.minecraft.world.level.chunk.ChunkAccess -> cgy:
     net.minecraft.world.level.block.state.BlockState setBlockState(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
     void setBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
     void addEntity(net.minecraft.world.entity.Entity) -> a
-    40:47:net.minecraft.world.level.chunk.LevelChunkSection getHighestSection() -> a
-    51:52:int getHighestSectionPosition() -> b
+    38:45:net.minecraft.world.level.chunk.LevelChunkSection getHighestSection() -> a
+    49:50:int getHighestSectionPosition() -> b
     java.util.Set getBlockEntitiesPos() -> c
     net.minecraft.world.level.chunk.LevelChunkSection[] getSections() -> d
     net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
@@ -57649,29 +63030,28 @@ net.minecraft.world.level.chunk.ChunkAccess -> bzy:
     void setLastSaveTime(long) -> a
     java.util.Map getAllStarts() -> h
     void setAllStarts(java.util.Map) -> a
-    81:92:boolean isYSpaceEmpty(int,int) -> a
+    79:90:boolean isYSpaceEmpty(int,int) -> a
     net.minecraft.world.level.chunk.ChunkBiomeContainer getBiomes() -> i
     void setUnsaved(boolean) -> a
     boolean isUnsaved() -> j
     net.minecraft.world.level.chunk.ChunkStatus getStatus() -> k
     void removeBlockEntity(net.minecraft.core.BlockPos) -> d
-    107:108:void markPosForPostprocessing(net.minecraft.core.BlockPos) -> e
+    105:106:void markPosForPostprocessing(net.minecraft.core.BlockPos) -> e
     it.unimi.dsi.fastutil.shorts.ShortList[] getPostProcessing() -> l
-    113:114:void addPackedPostProcess(short,int) -> a
-    117:118:void setBlockEntityNbt(net.minecraft.nbt.CompoundTag) -> a
+    111:112:void addPackedPostProcess(short,int) -> a
+    115:116:void setBlockEntityNbt(net.minecraft.nbt.CompoundTag) -> a
     net.minecraft.nbt.CompoundTag getBlockEntityNbt(net.minecraft.core.BlockPos) -> f
     net.minecraft.nbt.CompoundTag getBlockEntityNbtForSaving(net.minecraft.core.BlockPos) -> i
     java.util.stream.Stream getLights() -> m
     net.minecraft.world.level.TickList getBlockTicks() -> n
     net.minecraft.world.level.TickList getLiquidTicks() -> o
-    133:133:java.util.BitSet getCarvingMask(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
     net.minecraft.world.level.chunk.UpgradeData getUpgradeData() -> p
     void setInhabitedTime(long) -> b
     long getInhabitedTime() -> q
-    143:146:it.unimi.dsi.fastutil.shorts.ShortList getOrCreateOffsetList(it.unimi.dsi.fastutil.shorts.ShortList[],int) -> a
+    137:140:it.unimi.dsi.fastutil.shorts.ShortList getOrCreateOffsetList(it.unimi.dsi.fastutil.shorts.ShortList[],int) -> a
     boolean isLightCorrect() -> r
     void setLightCorrect(boolean) -> b
-net.minecraft.world.level.chunk.ChunkBiomeContainer -> bzz:
+net.minecraft.world.level.chunk.ChunkBiomeContainer -> cgz:
     org.apache.logging.log4j.Logger LOGGER -> d
     int WIDTH_BITS -> e
     int HEIGHT_BITS -> f
@@ -57689,54 +63069,44 @@ net.minecraft.world.level.chunk.ChunkBiomeContainer -> bzz:
     107:107:net.minecraft.world.level.chunk.ChunkBiomeContainer copy() -> b
     112:115:net.minecraft.world.level.biome.Biome getNoiseBiome(int,int,int) -> b
     18:26:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.ChunkGenerator -> caa:
-    net.minecraft.world.level.LevelAccessor level -> a
-    long seed -> b
-    net.minecraft.world.level.biome.BiomeSource biomeSource -> c
-    net.minecraft.world.level.levelgen.ChunkGeneratorSettings settings -> d
-    54:59:void <init>(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.ChunkGeneratorSettings) -> <init>
-    65:67:void createBiomes(net.minecraft.world.level.chunk.ChunkAccess) -> a
-    70:70:net.minecraft.world.level.biome.Biome getCarvingOrDecorationBiome(net.minecraft.world.level.biome.BiomeManager,net.minecraft.core.BlockPos) -> a
-    77:101:void applyCarvers(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
-    105:110:net.minecraft.core.BlockPos findNearestMapFeature(net.minecraft.world.level.Level,java.lang.String,net.minecraft.core.BlockPos,int,boolean) -> a
-    114:137:void applyBiomeDecoration(net.minecraft.server.level.WorldGenRegion) -> a
+net.minecraft.world.level.chunk.ChunkGenerator -> cha:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.biome.BiomeSource biomeSource -> b
+    net.minecraft.world.level.biome.BiomeSource runtimeBiomeSource -> c
+    net.minecraft.world.level.levelgen.StructureSettings settings -> d
+    long strongholdSeed -> e
+    java.util.List strongholdPositions -> f
+    62:63:void <init>(net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.StructureSettings) -> <init>
+    59:70:void <init>(net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.StructureSettings,long) -> <init>
+    73:123:void generateStrongholds() -> g
+    com.mojang.serialization.Codec codec() -> a
+    net.minecraft.world.level.chunk.ChunkGenerator withSeed(long) -> a
+    133:135:void createBiomes(net.minecraft.world.level.chunk.ChunkAccess) -> a
+    141:168:void applyCarvers(long,net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
+    172:195:net.minecraft.core.BlockPos findNearestMapFeature(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.core.BlockPos,int,boolean) -> a
+    199:222:void applyBiomeDecoration(net.minecraft.server.level.WorldGenRegion,net.minecraft.world.level.StructureFeatureManager) -> a
     void buildSurfaceAndBedrock(net.minecraft.server.level.WorldGenRegion,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    145:145:void spawnOriginalMobs(net.minecraft.server.level.WorldGenRegion) -> b
-    148:148:net.minecraft.world.level.levelgen.ChunkGeneratorSettings getSettings() -> a
-    int getSpawnHeight() -> b
-    154:154:void tickCustomSpawners(net.minecraft.server.level.ServerLevel,boolean,boolean) -> a
-    158:158:boolean isBiomeValidStartForStructure(net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
-    163:163:net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration getStructureConfiguration(net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.StructureFeature) -> b
-    167:167:net.minecraft.world.level.biome.BiomeSource getBiomeSource() -> c
-    171:171:long getSeed() -> d
-    175:175:int getGenDepth() -> e
-    179:179:java.util.List getMobsAt(net.minecraft.world.entity.MobCategory,net.minecraft.core.BlockPos) -> a
-    183:205:void createStructures(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
-    208:228:void createReferences(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    void fillFromNoise(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkAccess) -> b
-    233:233:int getSeaLevel() -> f
+    230:230:void spawnOriginalMobs(net.minecraft.server.level.WorldGenRegion) -> a
+    233:233:net.minecraft.world.level.levelgen.StructureSettings getSettings() -> b
+    237:237:int getSpawnHeight() -> c
+    241:241:net.minecraft.world.level.biome.BiomeSource getBiomeSource() -> d
+    245:245:int getGenDepth() -> e
+    249:249:java.util.List getMobsAt(net.minecraft.world.level.biome.Biome,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.entity.MobCategory,net.minecraft.core.BlockPos) -> a
+    253:261:void createStructures(net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,long) -> a
+    265:271:void createStructure(net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,long,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.biome.Biome) -> a
+    274:303:void createReferences(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    void fillFromNoise(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkAccess) -> b
+    308:308:int getSeaLevel() -> f
     int getBaseHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> a
-    239:239:int getFirstFreeHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> b
-    243:243:int getFirstOccupiedHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> c
-    96:96:net.minecraft.world.level.biome.Biome lambda$applyCarvers$0(net.minecraft.world.level.biome.BiomeManager,net.minecraft.core.BlockPos) -> b
-net.minecraft.world.level.chunk.ChunkGeneratorFactory -> cab:
-    net.minecraft.world.level.chunk.ChunkGenerator create(net.minecraft.world.level.Level,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.ChunkGeneratorSettings) -> create
-net.minecraft.world.level.chunk.ChunkGeneratorType -> cac:
-    net.minecraft.world.level.chunk.ChunkGeneratorType SURFACE -> a
-    net.minecraft.world.level.chunk.ChunkGeneratorType CAVES -> b
-    net.minecraft.world.level.chunk.ChunkGeneratorType FLOATING_ISLANDS -> c
-    net.minecraft.world.level.chunk.ChunkGeneratorType DEBUG -> d
-    net.minecraft.world.level.chunk.ChunkGeneratorType FLAT -> e
-    net.minecraft.world.level.chunk.ChunkGeneratorFactory factory -> f
-    boolean isPublic -> g
-    java.util.function.Supplier settingsFactory -> h
-    28:28:net.minecraft.world.level.chunk.ChunkGeneratorType register(java.lang.String,net.minecraft.world.level.chunk.ChunkGeneratorFactory,java.util.function.Supplier,boolean) -> a
-    35:39:void <init>(net.minecraft.world.level.chunk.ChunkGeneratorFactory,boolean,java.util.function.Supplier) -> <init>
-    43:43:net.minecraft.world.level.chunk.ChunkGenerator create(net.minecraft.world.level.Level,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.ChunkGeneratorSettings) -> create
-    47:47:net.minecraft.world.level.levelgen.ChunkGeneratorSettings createSettings() -> a
-    51:51:boolean isPublic() -> b
-    21:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.ChunkSource -> cad:
+    net.minecraft.world.level.BlockGetter getBaseColumn(int,int) -> a
+    316:316:int getFirstFreeHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> b
+    320:320:int getFirstOccupiedHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> c
+    324:325:boolean hasStronghold(net.minecraft.world.level.ChunkPos) -> a
+    297:297:java.lang.String lambda$createReferences$2(net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    296:296:java.lang.String lambda$createReferences$1(net.minecraft.world.level.levelgen.structure.StructureStart) -> b
+    295:295:java.lang.String lambda$createReferences$0(net.minecraft.world.level.levelgen.structure.StructureStart) -> c
+    47:52:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.ChunkSource -> chb:
     13:13:void <init>() -> <init>
     16:16:net.minecraft.world.level.chunk.LevelChunk getChunk(int,int,boolean) -> a
     21:21:net.minecraft.world.level.chunk.LevelChunk getChunkNow(int,int) -> a
@@ -57747,13 +63117,13 @@ net.minecraft.world.level.chunk.ChunkSource -> cad:
     java.lang.String gatherStats() -> e
     int getLoadedChunksCount() -> h
     48:48:void close() -> close
-    net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> k
+    net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> l
     53:53:void setSpawnSettings(boolean,boolean) -> a
     56:56:void updateChunkForced(net.minecraft.world.level.ChunkPos,boolean) -> a
     59:59:boolean isEntityTickingChunk(net.minecraft.world.entity.Entity) -> a
     63:63:boolean isEntityTickingChunk(net.minecraft.world.level.ChunkPos) -> a
     67:67:boolean isTickingChunk(net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.chunk.ChunkStatus -> cae:
+net.minecraft.world.level.chunk.ChunkStatus -> chc:
     java.util.EnumSet PRE_FEATURES -> n
     java.util.EnumSet POST_FEATURES -> o
     net.minecraft.world.level.chunk.ChunkStatus$LoadingTask PASSTHROUGH_LOAD_TASK -> p
@@ -57780,61 +63150,61 @@ net.minecraft.world.level.chunk.ChunkStatus -> cae:
     int range -> x
     net.minecraft.world.level.chunk.ChunkStatus$ChunkType chunkType -> y
     java.util.EnumSet heightmapsAfter -> z
-    92:98:java.util.concurrent.CompletableFuture lightChunk(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ThreadedLevelLightEngine,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    112:112:net.minecraft.world.level.chunk.ChunkStatus registerSimple(java.lang.String,net.minecraft.world.level.chunk.ChunkStatus,int,java.util.EnumSet,net.minecraft.world.level.chunk.ChunkStatus$ChunkType,net.minecraft.world.level.chunk.ChunkStatus$SimpleGenerationTask) -> a
-    116:116:net.minecraft.world.level.chunk.ChunkStatus register(java.lang.String,net.minecraft.world.level.chunk.ChunkStatus,int,java.util.EnumSet,net.minecraft.world.level.chunk.ChunkStatus$ChunkType,net.minecraft.world.level.chunk.ChunkStatus$GenerationTask) -> a
-    120:120:net.minecraft.world.level.chunk.ChunkStatus register(java.lang.String,net.minecraft.world.level.chunk.ChunkStatus,int,java.util.EnumSet,net.minecraft.world.level.chunk.ChunkStatus$ChunkType,net.minecraft.world.level.chunk.ChunkStatus$GenerationTask,net.minecraft.world.level.chunk.ChunkStatus$LoadingTask) -> a
-    124:132:java.util.List getStatusList() -> a
-    136:136:boolean isLighted(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    164:170:net.minecraft.world.level.chunk.ChunkStatus getStatus(int) -> a
-    174:174:int maxDistance() -> b
-    178:178:int getDistance(net.minecraft.world.level.chunk.ChunkStatus) -> a
-    190:199:void <init>(java.lang.String,net.minecraft.world.level.chunk.ChunkStatus,int,java.util.EnumSet,net.minecraft.world.level.chunk.ChunkStatus$ChunkType,net.minecraft.world.level.chunk.ChunkStatus$GenerationTask,net.minecraft.world.level.chunk.ChunkStatus$LoadingTask) -> <init>
-    202:202:int getIndex() -> c
-    206:206:java.lang.String getName() -> d
-    210:210:net.minecraft.world.level.chunk.ChunkStatus getParent() -> e
-    214:214:java.util.concurrent.CompletableFuture generate(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List) -> a
-    218:218:java.util.concurrent.CompletableFuture load(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    222:222:int getRange() -> f
-    226:226:net.minecraft.world.level.chunk.ChunkStatus$ChunkType getChunkType() -> g
-    230:230:net.minecraft.world.level.chunk.ChunkStatus byName(java.lang.String) -> a
-    234:234:java.util.EnumSet heightmapsAfter() -> h
-    238:238:boolean isOrAfter(net.minecraft.world.level.chunk.ChunkStatus) -> b
-    243:243:java.lang.String toString() -> toString
-    154:161:void lambda$static$16(it.unimi.dsi.fastutil.ints.IntArrayList) -> a
-    108:108:java.util.concurrent.CompletableFuture lambda$static$15(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    107:107:java.util.concurrent.CompletableFuture lambda$static$14(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    104:104:void lambda$static$13(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    102:102:void lambda$static$12(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> b
-    89:89:java.util.concurrent.CompletableFuture lambda$static$11(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,net.minecraft.world.level.chunk.ChunkAccess) -> b
-    89:89:java.util.concurrent.CompletableFuture lambda$static$10(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> b
-    80:87:java.util.concurrent.CompletableFuture lambda$static$9(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> c
-    77:77:void lambda$static$8(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> c
-    74:74:void lambda$static$7(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> d
-    71:71:void lambda$static$6(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> e
-    68:68:void lambda$static$5(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> f
-    65:65:void lambda$static$4(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> g
-    62:62:void lambda$static$3(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> h
+    97:103:java.util.concurrent.CompletableFuture lightChunk(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ThreadedLevelLightEngine,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    117:117:net.minecraft.world.level.chunk.ChunkStatus registerSimple(java.lang.String,net.minecraft.world.level.chunk.ChunkStatus,int,java.util.EnumSet,net.minecraft.world.level.chunk.ChunkStatus$ChunkType,net.minecraft.world.level.chunk.ChunkStatus$SimpleGenerationTask) -> a
+    121:121:net.minecraft.world.level.chunk.ChunkStatus register(java.lang.String,net.minecraft.world.level.chunk.ChunkStatus,int,java.util.EnumSet,net.minecraft.world.level.chunk.ChunkStatus$ChunkType,net.minecraft.world.level.chunk.ChunkStatus$GenerationTask) -> a
+    125:125:net.minecraft.world.level.chunk.ChunkStatus register(java.lang.String,net.minecraft.world.level.chunk.ChunkStatus,int,java.util.EnumSet,net.minecraft.world.level.chunk.ChunkStatus$ChunkType,net.minecraft.world.level.chunk.ChunkStatus$GenerationTask,net.minecraft.world.level.chunk.ChunkStatus$LoadingTask) -> a
+    129:137:java.util.List getStatusList() -> a
+    141:141:boolean isLighted(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    169:175:net.minecraft.world.level.chunk.ChunkStatus getStatus(int) -> a
+    179:179:int maxDistance() -> b
+    183:183:int getDistance(net.minecraft.world.level.chunk.ChunkStatus) -> a
+    195:204:void <init>(java.lang.String,net.minecraft.world.level.chunk.ChunkStatus,int,java.util.EnumSet,net.minecraft.world.level.chunk.ChunkStatus$ChunkType,net.minecraft.world.level.chunk.ChunkStatus$GenerationTask,net.minecraft.world.level.chunk.ChunkStatus$LoadingTask) -> <init>
+    207:207:int getIndex() -> c
+    211:211:java.lang.String getName() -> d
+    215:215:net.minecraft.world.level.chunk.ChunkStatus getParent() -> e
+    219:219:java.util.concurrent.CompletableFuture generate(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List) -> a
+    223:223:java.util.concurrent.CompletableFuture load(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    227:227:int getRange() -> f
+    231:231:net.minecraft.world.level.chunk.ChunkStatus$ChunkType getChunkType() -> g
+    235:235:net.minecraft.world.level.chunk.ChunkStatus byName(java.lang.String) -> a
+    239:239:java.util.EnumSet heightmapsAfter() -> h
+    243:243:boolean isOrAfter(net.minecraft.world.level.chunk.ChunkStatus) -> b
+    248:248:java.lang.String toString() -> toString
+    159:166:void lambda$static$16(it.unimi.dsi.fastutil.ints.IntArrayList) -> a
+    113:113:java.util.concurrent.CompletableFuture lambda$static$15(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    112:112:java.util.concurrent.CompletableFuture lambda$static$14(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    109:109:void lambda$static$13(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    107:107:void lambda$static$12(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> b
+    94:94:java.util.concurrent.CompletableFuture lambda$static$11(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,net.minecraft.world.level.chunk.ChunkAccess) -> b
+    94:94:java.util.concurrent.CompletableFuture lambda$static$10(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> b
+    84:92:java.util.concurrent.CompletableFuture lambda$static$9(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> c
+    81:81:void lambda$static$8(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> c
+    78:78:void lambda$static$7(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> d
+    75:75:void lambda$static$6(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> e
+    70:72:void lambda$static$5(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> f
+    67:67:void lambda$static$4(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> g
+    62:64:void lambda$static$3(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> h
     49:58:java.util.concurrent.CompletableFuture lambda$static$2(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> d
     46:46:void lambda$static$1(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> i
     40:43:java.util.concurrent.CompletableFuture lambda$static$0(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,net.minecraft.world.level.chunk.ChunkAccess) -> c
-    27:153:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.ChunkStatus$ChunkType -> cae$a:
+    27:158:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.ChunkStatus$ChunkType -> chc$a:
     net.minecraft.world.level.chunk.ChunkStatus$ChunkType PROTOCHUNK -> a
     net.minecraft.world.level.chunk.ChunkStatus$ChunkType LEVELCHUNK -> b
     net.minecraft.world.level.chunk.ChunkStatus$ChunkType[] $VALUES -> c
-    270:270:net.minecraft.world.level.chunk.ChunkStatus$ChunkType[] values() -> values
-    270:270:net.minecraft.world.level.chunk.ChunkStatus$ChunkType valueOf(java.lang.String) -> valueOf
-    270:270:void <init>(java.lang.String,int) -> <init>
-    270:272:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.ChunkStatus$GenerationTask -> cae$b:
+    275:275:net.minecraft.world.level.chunk.ChunkStatus$ChunkType[] values() -> values
+    275:275:net.minecraft.world.level.chunk.ChunkStatus$ChunkType valueOf(java.lang.String) -> valueOf
+    275:275:void <init>(java.lang.String,int) -> <init>
+    275:277:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.ChunkStatus$GenerationTask -> chc$b:
     java.util.concurrent.CompletableFuture doWork(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> doWork
-net.minecraft.world.level.chunk.ChunkStatus$LoadingTask -> cae$c:
+net.minecraft.world.level.chunk.ChunkStatus$LoadingTask -> chc$c:
     java.util.concurrent.CompletableFuture doWork(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,net.minecraft.world.level.chunk.ChunkAccess) -> doWork
-net.minecraft.world.level.chunk.ChunkStatus$SimpleGenerationTask -> cae$d:
-    257:264:java.util.concurrent.CompletableFuture doWork(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> doWork
+net.minecraft.world.level.chunk.ChunkStatus$SimpleGenerationTask -> chc$d:
+    262:269:java.util.concurrent.CompletableFuture doWork(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> doWork
     void doWork(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.List,net.minecraft.world.level.chunk.ChunkAccess) -> doWork
-net.minecraft.world.level.chunk.DataLayer -> caf:
+net.minecraft.world.level.chunk.DataLayer -> chd:
     byte[] data -> a
     14:15:void <init>() -> <init>
     17:23:void <init>(byte[]) -> <init>
@@ -57851,7 +63221,7 @@ net.minecraft.world.level.chunk.DataLayer -> caf:
     91:101:java.lang.String toString() -> toString
     106:113:java.lang.String layerToString(int) -> a
     117:117:boolean isEmpty() -> c
-net.minecraft.world.level.chunk.EmptyLevelChunk -> cag:
+net.minecraft.world.level.chunk.EmptyLevelChunk -> che:
     net.minecraft.world.level.biome.Biome[] BIOMES -> b
     28:29:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.ChunkPos) -> <init>
     33:33:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
@@ -57875,91 +63245,92 @@ net.minecraft.world.level.chunk.EmptyLevelChunk -> cag:
     117:117:net.minecraft.server.level.ChunkHolder$FullChunkStatus getFullStatus() -> u
     25:25:void lambda$static$0(net.minecraft.world.level.biome.Biome[]) -> a
     25:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.FeatureAccess -> cah:
-    net.minecraft.world.level.levelgen.structure.StructureStart getStartForFeature(java.lang.String) -> a
-    void setStartForFeature(java.lang.String,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
-    it.unimi.dsi.fastutil.longs.LongSet getReferencesForFeature(java.lang.String) -> b
-    void addReferenceForFeature(java.lang.String,long) -> a
+net.minecraft.world.level.chunk.FeatureAccess -> chf:
+    net.minecraft.world.level.levelgen.structure.StructureStart getStartForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    void setStartForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    it.unimi.dsi.fastutil.longs.LongSet getReferencesForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> b
+    void addReferenceForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature,long) -> a
     java.util.Map getAllReferences() -> v
     void setAllReferences(java.util.Map) -> b
-net.minecraft.world.level.chunk.GlobalPalette -> cai:
+net.minecraft.world.level.chunk.GlobalPalette -> chg:
     net.minecraft.core.IdMapper registry -> a
     java.lang.Object defaultValue -> b
-    11:14:void <init>(net.minecraft.core.IdMapper,java.lang.Object) -> <init>
-    18:19:int idFor(java.lang.Object) -> a
-    24:24:boolean maybeHas(java.lang.Object) -> b
-    29:30:java.lang.Object valueFor(int) -> a
-    35:35:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    39:39:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    43:43:int getSerializedSize() -> a
-    48:48:int getSize() -> b
-    53:53:void read(net.minecraft.nbt.ListTag) -> a
-net.minecraft.world.level.chunk.HashMapPalette -> caj:
+    13:16:void <init>(net.minecraft.core.IdMapper,java.lang.Object) -> <init>
+    20:21:int idFor(java.lang.Object) -> a
+    26:26:boolean maybeHas(java.util.function.Predicate) -> a
+    31:32:java.lang.Object valueFor(int) -> a
+    37:37:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    41:41:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    45:45:int getSerializedSize() -> a
+    50:50:int getSize() -> b
+    55:55:void read(net.minecraft.nbt.ListTag) -> a
+net.minecraft.world.level.chunk.HashMapPalette -> chh:
     net.minecraft.core.IdMapper registry -> a
     net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap values -> b
     net.minecraft.world.level.chunk.PaletteResize resizeHandler -> c
     java.util.function.Function reader -> d
     java.util.function.Function writer -> e
     int bits -> f
-    20:27:void <init>(net.minecraft.core.IdMapper,int,net.minecraft.world.level.chunk.PaletteResize,java.util.function.Function,java.util.function.Function) -> <init>
-    31:39:int idFor(java.lang.Object) -> a
-    44:44:boolean maybeHas(java.lang.Object) -> b
-    50:50:java.lang.Object valueFor(int) -> a
-    55:60:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    64:70:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    74:80:int getSerializedSize() -> a
-    85:85:int getSize() -> b
-    90:94:void read(net.minecraft.nbt.ListTag) -> a
-    97:100:void write(net.minecraft.nbt.ListTag) -> b
-net.minecraft.world.level.chunk.ImposterProtoChunk -> cak:
+    21:28:void <init>(net.minecraft.core.IdMapper,int,net.minecraft.world.level.chunk.PaletteResize,java.util.function.Function,java.util.function.Function) -> <init>
+    32:40:int idFor(java.lang.Object) -> a
+    45:50:boolean maybeHas(java.util.function.Predicate) -> a
+    56:56:java.lang.Object valueFor(int) -> a
+    61:66:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    70:76:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    80:86:int getSerializedSize() -> a
+    91:91:int getSize() -> b
+    96:100:void read(net.minecraft.nbt.ListTag) -> a
+    103:106:void write(net.minecraft.nbt.ListTag) -> b
+net.minecraft.world.level.chunk.ImposterProtoChunk -> chi:
     net.minecraft.world.level.chunk.LevelChunk wrapped -> a
-    28:31:void <init>(net.minecraft.world.level.chunk.LevelChunk) -> <init>
-    36:36:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
-    42:42:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
-    47:47:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
-    52:52:int getMaxLightLevel() -> H
-    58:58:net.minecraft.world.level.block.state.BlockState setBlockState(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    63:63:void setBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
-    67:67:void addEntity(net.minecraft.world.entity.Entity) -> a
-    71:71:void setStatus(net.minecraft.world.level.chunk.ChunkStatus) -> a
-    75:75:net.minecraft.world.level.chunk.LevelChunkSection[] getSections() -> d
-    81:81:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
-    86:86:void setHeightmap(net.minecraft.world.level.levelgen.Heightmap$Types,long[]) -> a
-    89:97:net.minecraft.world.level.levelgen.Heightmap$Types fixType(net.minecraft.world.level.levelgen.Heightmap$Types) -> c
-    102:102:int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
-    107:107:net.minecraft.core.BlockPos getHeighestPosition(net.minecraft.world.level.levelgen.Heightmap$Types) -> b
-    112:112:net.minecraft.world.level.ChunkPos getPos() -> g
-    117:117:void setLastSaveTime(long) -> a
-    122:122:net.minecraft.world.level.levelgen.structure.StructureStart getStartForFeature(java.lang.String) -> a
-    127:127:void setStartForFeature(java.lang.String,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
-    131:131:java.util.Map getAllStarts() -> h
-    136:136:void setAllStarts(java.util.Map) -> a
-    140:140:it.unimi.dsi.fastutil.longs.LongSet getReferencesForFeature(java.lang.String) -> b
-    145:145:void addReferenceForFeature(java.lang.String,long) -> a
-    149:149:java.util.Map getAllReferences() -> v
-    154:154:void setAllReferences(java.util.Map) -> b
-    158:158:net.minecraft.world.level.chunk.ChunkBiomeContainer getBiomes() -> i
-    163:163:void setUnsaved(boolean) -> a
-    168:168:boolean isUnsaved() -> j
-    173:173:net.minecraft.world.level.chunk.ChunkStatus getStatus() -> k
-    178:178:void removeBlockEntity(net.minecraft.core.BlockPos) -> d
-    182:182:void markPosForPostprocessing(net.minecraft.core.BlockPos) -> e
-    186:186:void setBlockEntityNbt(net.minecraft.nbt.CompoundTag) -> a
-    191:191:net.minecraft.nbt.CompoundTag getBlockEntityNbt(net.minecraft.core.BlockPos) -> f
-    197:197:net.minecraft.nbt.CompoundTag getBlockEntityNbtForSaving(net.minecraft.core.BlockPos) -> i
-    202:202:void setBiomes(net.minecraft.world.level.chunk.ChunkBiomeContainer) -> a
-    206:206:java.util.stream.Stream getLights() -> m
-    211:211:net.minecraft.world.level.chunk.ProtoTickList getBlockTicks() -> s
-    216:216:net.minecraft.world.level.chunk.ProtoTickList getLiquidTicks() -> t
-    221:221:java.util.BitSet getCarvingMask(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
-    225:225:net.minecraft.world.level.chunk.LevelChunk getWrapped() -> u
-    230:230:boolean isLightCorrect() -> r
-    235:236:void setLightCorrect(boolean) -> b
-    24:24:net.minecraft.world.level.TickList getLiquidTicks() -> o
-    24:24:net.minecraft.world.level.TickList getBlockTicks() -> n
-    216:216:boolean lambda$getLiquidTicks$1(net.minecraft.world.level.material.Fluid) -> a
-    211:211:boolean lambda$getBlockTicks$0(net.minecraft.world.level.block.Block) -> a
-net.minecraft.world.level.chunk.LevelChunk -> cal:
+    30:33:void <init>(net.minecraft.world.level.chunk.LevelChunk) -> <init>
+    38:38:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
+    44:44:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
+    49:49:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
+    54:54:int getMaxLightLevel() -> H
+    60:60:net.minecraft.world.level.block.state.BlockState setBlockState(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    65:65:void setBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
+    69:69:void addEntity(net.minecraft.world.entity.Entity) -> a
+    73:73:void setStatus(net.minecraft.world.level.chunk.ChunkStatus) -> a
+    77:77:net.minecraft.world.level.chunk.LevelChunkSection[] getSections() -> d
+    83:83:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
+    88:88:void setHeightmap(net.minecraft.world.level.levelgen.Heightmap$Types,long[]) -> a
+    91:99:net.minecraft.world.level.levelgen.Heightmap$Types fixType(net.minecraft.world.level.levelgen.Heightmap$Types) -> c
+    104:104:int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
+    109:109:net.minecraft.core.BlockPos getHeighestPosition(net.minecraft.world.level.levelgen.Heightmap$Types) -> b
+    114:114:net.minecraft.world.level.ChunkPos getPos() -> g
+    119:119:void setLastSaveTime(long) -> a
+    124:124:net.minecraft.world.level.levelgen.structure.StructureStart getStartForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    129:129:void setStartForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    133:133:java.util.Map getAllStarts() -> h
+    138:138:void setAllStarts(java.util.Map) -> a
+    142:142:it.unimi.dsi.fastutil.longs.LongSet getReferencesForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> b
+    147:147:void addReferenceForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature,long) -> a
+    151:151:java.util.Map getAllReferences() -> v
+    156:156:void setAllReferences(java.util.Map) -> b
+    160:160:net.minecraft.world.level.chunk.ChunkBiomeContainer getBiomes() -> i
+    165:165:void setUnsaved(boolean) -> a
+    170:170:boolean isUnsaved() -> j
+    175:175:net.minecraft.world.level.chunk.ChunkStatus getStatus() -> k
+    180:180:void removeBlockEntity(net.minecraft.core.BlockPos) -> d
+    184:184:void markPosForPostprocessing(net.minecraft.core.BlockPos) -> e
+    188:188:void setBlockEntityNbt(net.minecraft.nbt.CompoundTag) -> a
+    193:193:net.minecraft.nbt.CompoundTag getBlockEntityNbt(net.minecraft.core.BlockPos) -> f
+    199:199:net.minecraft.nbt.CompoundTag getBlockEntityNbtForSaving(net.minecraft.core.BlockPos) -> i
+    204:204:void setBiomes(net.minecraft.world.level.chunk.ChunkBiomeContainer) -> a
+    208:208:java.util.stream.Stream getLights() -> m
+    213:213:net.minecraft.world.level.chunk.ProtoTickList getBlockTicks() -> s
+    218:218:net.minecraft.world.level.chunk.ProtoTickList getLiquidTicks() -> t
+    223:223:java.util.BitSet getCarvingMask(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
+    228:228:java.util.BitSet getOrCreateCarvingMask(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> b
+    232:232:net.minecraft.world.level.chunk.LevelChunk getWrapped() -> u
+    237:237:boolean isLightCorrect() -> r
+    242:243:void setLightCorrect(boolean) -> b
+    26:26:net.minecraft.world.level.TickList getLiquidTicks() -> o
+    26:26:net.minecraft.world.level.TickList getBlockTicks() -> n
+    218:218:boolean lambda$getLiquidTicks$1(net.minecraft.world.level.material.Fluid) -> a
+    213:213:boolean lambda$getBlockTicks$0(net.minecraft.world.level.block.Block) -> a
+net.minecraft.world.level.chunk.LevelChunk -> chj:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.world.level.chunk.LevelChunkSection EMPTY_SECTION -> a
     net.minecraft.world.level.chunk.LevelChunkSection[] sections -> c
@@ -57984,129 +63355,129 @@ net.minecraft.world.level.chunk.LevelChunk -> cal:
     java.util.function.Consumer postLoad -> v
     net.minecraft.world.level.ChunkPos chunkPos -> w
     boolean isLightCorrect -> x
-    99:100:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.ChunkBiomeContainer) -> <init>
-    67:130:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.ChunkBiomeContainer,net.minecraft.world.level.chunk.UpgradeData,net.minecraft.world.level.TickList,net.minecraft.world.level.TickList,long,net.minecraft.world.level.chunk.LevelChunkSection[],java.util.function.Consumer) -> <init>
-    133:164:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.chunk.ProtoChunk) -> <init>
-    168:168:net.minecraft.world.level.levelgen.Heightmap getOrCreateHeightmapUnprimed(net.minecraft.world.level.levelgen.Heightmap$Types) -> a
-    173:175:java.util.Set getBlockEntitiesPos() -> c
-    180:180:net.minecraft.world.level.chunk.LevelChunkSection[] getSections() -> d
-    185:211:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
-    217:217:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
-    222:233:net.minecraft.world.level.material.FluidState getFluidState(int,int,int) -> a
-    240:305:net.minecraft.world.level.block.state.BlockState setBlockState(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    311:311:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
-    316:337:void addEntity(net.minecraft.world.entity.Entity) -> a
-    341:342:void setHeightmap(net.minecraft.world.level.levelgen.Heightmap$Types,long[]) -> a
-    345:346:void removeEntity(net.minecraft.world.entity.Entity) -> b
-    349:356:void removeEntity(net.minecraft.world.entity.Entity,int) -> a
-    360:360:int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
-    365:377:net.minecraft.core.BlockPos getHeighestPosition(net.minecraft.world.level.levelgen.Heightmap$Types) -> b
-    382:388:net.minecraft.world.level.block.entity.BlockEntity createBlockEntity(net.minecraft.core.BlockPos) -> j
-    394:394:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
-    399:419:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.LevelChunk$EntityCreationType) -> a
-    423:427:void addBlockEntity(net.minecraft.world.level.block.entity.BlockEntity) -> a
-    431:442:void setBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
-    446:447:void setBlockEntityNbt(net.minecraft.nbt.CompoundTag) -> a
-    452:463:net.minecraft.nbt.CompoundTag getBlockEntityNbtForSaving(net.minecraft.core.BlockPos) -> i
-    468:474:void removeBlockEntity(net.minecraft.core.BlockPos) -> d
-    477:481:void runPostLoad() -> w
-    484:485:void markUnsaved() -> s
-    488:513:void getEntities(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.List,java.util.function.Predicate) -> a
-    516:535:void getEntities(net.minecraft.world.entity.EntityType,net.minecraft.world.phys.AABB,java.util.List,java.util.function.Predicate) -> a
-    538:552:void getEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.List,java.util.function.Predicate) -> a
-    555:555:boolean isEmpty() -> t
-    560:560:net.minecraft.world.level.ChunkPos getPos() -> g
-    564:598:void replaceWithPacketData(net.minecraft.world.level.chunk.ChunkBiomeContainer,net.minecraft.network.FriendlyByteBuf,net.minecraft.nbt.CompoundTag,int) -> a
-    602:602:net.minecraft.world.level.chunk.ChunkBiomeContainer getBiomes() -> i
-    606:607:void setLoaded(boolean) -> c
-    610:610:net.minecraft.world.level.Level getLevel() -> x
-    615:615:java.util.Collection getHeightmaps() -> f
-    619:619:java.util.Map getBlockEntities() -> y
-    623:623:net.minecraft.util.ClassInstanceMultiMap[] getEntitySections() -> z
-    628:628:net.minecraft.nbt.CompoundTag getBlockEntityNbt(net.minecraft.core.BlockPos) -> f
-    633:633:java.util.stream.Stream getLights() -> m
-    638:638:net.minecraft.world.level.TickList getBlockTicks() -> n
-    643:643:net.minecraft.world.level.TickList getLiquidTicks() -> o
-    648:649:void setUnsaved(boolean) -> a
-    653:653:boolean isUnsaved() -> j
-    657:658:void setLastSaveHadEntities(boolean) -> d
-    662:663:void setLastSaveTime(long) -> a
-    668:668:net.minecraft.world.level.levelgen.structure.StructureStart getStartForFeature(java.lang.String) -> a
-    673:674:void setStartForFeature(java.lang.String,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
-    678:678:java.util.Map getAllStarts() -> h
-    683:685:void setAllStarts(java.util.Map) -> a
-    689:689:it.unimi.dsi.fastutil.longs.LongSet getReferencesForFeature(java.lang.String) -> b
-    694:695:void addReferenceForFeature(java.lang.String,long) -> a
-    699:699:java.util.Map getAllReferences() -> v
-    704:706:void setAllReferences(java.util.Map) -> b
-    710:710:long getInhabitedTime() -> q
-    715:716:void setInhabitedTime(long) -> b
-    719:739:void postProcessGeneration() -> A
-    744:763:net.minecraft.world.level.block.entity.BlockEntity promotePendingBlockEntity(net.minecraft.core.BlockPos,net.minecraft.nbt.CompoundTag) -> a
-    768:768:net.minecraft.world.level.chunk.UpgradeData getUpgradeData() -> p
-    773:773:it.unimi.dsi.fastutil.shorts.ShortList[] getPostProcessing() -> l
-    778:793:void unpackTicks() -> B
-    797:805:void packTicks(net.minecraft.server.level.ServerLevel) -> a
-    815:815:net.minecraft.world.level.chunk.ChunkStatus getStatus() -> k
-    819:822:net.minecraft.server.level.ChunkHolder$FullChunkStatus getFullStatus() -> u
-    826:827:void setFullStatus(java.util.function.Supplier) -> a
-    831:831:boolean isLightCorrect() -> r
-    836:838:void setLightCorrect(boolean) -> b
-    787:787:net.minecraft.world.level.material.Fluid lambda$unpackTicks$10(net.minecraft.core.BlockPos) -> k
-    779:779:net.minecraft.world.level.block.Block lambda$unpackTicks$9(net.minecraft.core.BlockPos) -> l
-    694:694:it.unimi.dsi.fastutil.longs.LongSet lambda$addReferenceForFeature$8(java.lang.String) -> c
-    689:689:it.unimi.dsi.fastutil.longs.LongSet lambda$getReferencesForFeature$7(java.lang.String) -> d
-    633:633:boolean lambda$getLights$6(net.minecraft.core.BlockPos) -> m
-    565:565:boolean lambda$replaceWithPacketData$5(int,net.minecraft.core.BlockPos) -> a
-    565:565:boolean lambda$replaceWithPacketData$4(net.minecraft.core.BlockPos) -> n
-    232:232:java.lang.String lambda$getFluidState$3(int,int,int) -> b
-    210:210:java.lang.String lambda$getBlockState$2(int,int,int) -> c
-    168:168:net.minecraft.world.level.levelgen.Heightmap lambda$getOrCreateHeightmapUnprimed$1(net.minecraft.world.level.levelgen.Heightmap$Types) -> c
-    137:138:net.minecraft.world.entity.Entity lambda$new$0(net.minecraft.world.entity.Entity) -> c
-    59:65:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.LevelChunk$EntityCreationType -> cal$a:
+    100:101:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.ChunkBiomeContainer) -> <init>
+    68:131:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.ChunkBiomeContainer,net.minecraft.world.level.chunk.UpgradeData,net.minecraft.world.level.TickList,net.minecraft.world.level.TickList,long,net.minecraft.world.level.chunk.LevelChunkSection[],java.util.function.Consumer) -> <init>
+    134:165:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.chunk.ProtoChunk) -> <init>
+    169:169:net.minecraft.world.level.levelgen.Heightmap getOrCreateHeightmapUnprimed(net.minecraft.world.level.levelgen.Heightmap$Types) -> a
+    174:176:java.util.Set getBlockEntitiesPos() -> c
+    181:181:net.minecraft.world.level.chunk.LevelChunkSection[] getSections() -> d
+    186:212:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
+    218:218:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
+    223:234:net.minecraft.world.level.material.FluidState getFluidState(int,int,int) -> a
+    241:306:net.minecraft.world.level.block.state.BlockState setBlockState(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    312:312:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
+    317:338:void addEntity(net.minecraft.world.entity.Entity) -> a
+    342:343:void setHeightmap(net.minecraft.world.level.levelgen.Heightmap$Types,long[]) -> a
+    346:347:void removeEntity(net.minecraft.world.entity.Entity) -> b
+    350:357:void removeEntity(net.minecraft.world.entity.Entity,int) -> a
+    361:361:int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
+    366:378:net.minecraft.core.BlockPos getHeighestPosition(net.minecraft.world.level.levelgen.Heightmap$Types) -> b
+    383:389:net.minecraft.world.level.block.entity.BlockEntity createBlockEntity(net.minecraft.core.BlockPos) -> j
+    395:395:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
+    400:420:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.LevelChunk$EntityCreationType) -> a
+    424:428:void addBlockEntity(net.minecraft.world.level.block.entity.BlockEntity) -> a
+    432:443:void setBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
+    447:448:void setBlockEntityNbt(net.minecraft.nbt.CompoundTag) -> a
+    453:464:net.minecraft.nbt.CompoundTag getBlockEntityNbtForSaving(net.minecraft.core.BlockPos) -> i
+    469:475:void removeBlockEntity(net.minecraft.core.BlockPos) -> d
+    478:482:void runPostLoad() -> w
+    485:486:void markUnsaved() -> s
+    489:516:void getEntities(net.minecraft.world.entity.Entity,net.minecraft.world.phys.AABB,java.util.List,java.util.function.Predicate) -> a
+    519:538:void getEntities(net.minecraft.world.entity.EntityType,net.minecraft.world.phys.AABB,java.util.List,java.util.function.Predicate) -> a
+    541:555:void getEntitiesOfClass(java.lang.Class,net.minecraft.world.phys.AABB,java.util.List,java.util.function.Predicate) -> a
+    558:558:boolean isEmpty() -> t
+    563:563:net.minecraft.world.level.ChunkPos getPos() -> g
+    567:601:void replaceWithPacketData(net.minecraft.world.level.chunk.ChunkBiomeContainer,net.minecraft.network.FriendlyByteBuf,net.minecraft.nbt.CompoundTag,int) -> a
+    605:605:net.minecraft.world.level.chunk.ChunkBiomeContainer getBiomes() -> i
+    609:610:void setLoaded(boolean) -> c
+    613:613:net.minecraft.world.level.Level getLevel() -> x
+    618:618:java.util.Collection getHeightmaps() -> f
+    622:622:java.util.Map getBlockEntities() -> y
+    626:626:net.minecraft.util.ClassInstanceMultiMap[] getEntitySections() -> z
+    631:631:net.minecraft.nbt.CompoundTag getBlockEntityNbt(net.minecraft.core.BlockPos) -> f
+    636:636:java.util.stream.Stream getLights() -> m
+    641:641:net.minecraft.world.level.TickList getBlockTicks() -> n
+    646:646:net.minecraft.world.level.TickList getLiquidTicks() -> o
+    651:652:void setUnsaved(boolean) -> a
+    656:656:boolean isUnsaved() -> j
+    660:661:void setLastSaveHadEntities(boolean) -> d
+    665:666:void setLastSaveTime(long) -> a
+    671:671:net.minecraft.world.level.levelgen.structure.StructureStart getStartForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    676:677:void setStartForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    681:681:java.util.Map getAllStarts() -> h
+    686:688:void setAllStarts(java.util.Map) -> a
+    692:692:it.unimi.dsi.fastutil.longs.LongSet getReferencesForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> b
+    697:698:void addReferenceForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature,long) -> a
+    702:702:java.util.Map getAllReferences() -> v
+    707:709:void setAllReferences(java.util.Map) -> b
+    713:713:long getInhabitedTime() -> q
+    718:719:void setInhabitedTime(long) -> b
+    722:742:void postProcessGeneration() -> A
+    747:767:net.minecraft.world.level.block.entity.BlockEntity promotePendingBlockEntity(net.minecraft.core.BlockPos,net.minecraft.nbt.CompoundTag) -> a
+    772:772:net.minecraft.world.level.chunk.UpgradeData getUpgradeData() -> p
+    777:777:it.unimi.dsi.fastutil.shorts.ShortList[] getPostProcessing() -> l
+    782:797:void unpackTicks() -> B
+    801:809:void packTicks(net.minecraft.server.level.ServerLevel) -> a
+    819:819:net.minecraft.world.level.chunk.ChunkStatus getStatus() -> k
+    823:826:net.minecraft.server.level.ChunkHolder$FullChunkStatus getFullStatus() -> u
+    830:831:void setFullStatus(java.util.function.Supplier) -> a
+    835:835:boolean isLightCorrect() -> r
+    840:842:void setLightCorrect(boolean) -> b
+    791:791:net.minecraft.world.level.material.Fluid lambda$unpackTicks$10(net.minecraft.core.BlockPos) -> k
+    783:783:net.minecraft.world.level.block.Block lambda$unpackTicks$9(net.minecraft.core.BlockPos) -> l
+    697:697:it.unimi.dsi.fastutil.longs.LongSet lambda$addReferenceForFeature$8(net.minecraft.world.level.levelgen.feature.StructureFeature) -> c
+    692:692:it.unimi.dsi.fastutil.longs.LongSet lambda$getReferencesForFeature$7(net.minecraft.world.level.levelgen.feature.StructureFeature) -> d
+    636:636:boolean lambda$getLights$6(net.minecraft.core.BlockPos) -> m
+    568:568:boolean lambda$replaceWithPacketData$5(int,net.minecraft.core.BlockPos) -> a
+    568:568:boolean lambda$replaceWithPacketData$4(net.minecraft.core.BlockPos) -> n
+    233:233:java.lang.String lambda$getFluidState$3(int,int,int) -> b
+    211:211:java.lang.String lambda$getBlockState$2(int,int,int) -> c
+    169:169:net.minecraft.world.level.levelgen.Heightmap lambda$getOrCreateHeightmapUnprimed$1(net.minecraft.world.level.levelgen.Heightmap$Types) -> c
+    138:139:net.minecraft.world.entity.Entity lambda$new$0(net.minecraft.world.entity.Entity) -> c
+    59:66:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.LevelChunk$EntityCreationType -> chj$a:
     net.minecraft.world.level.chunk.LevelChunk$EntityCreationType IMMEDIATE -> a
     net.minecraft.world.level.chunk.LevelChunk$EntityCreationType QUEUED -> b
     net.minecraft.world.level.chunk.LevelChunk$EntityCreationType CHECK -> c
     net.minecraft.world.level.chunk.LevelChunk$EntityCreationType[] $VALUES -> d
-    807:807:net.minecraft.world.level.chunk.LevelChunk$EntityCreationType[] values() -> values
-    807:807:net.minecraft.world.level.chunk.LevelChunk$EntityCreationType valueOf(java.lang.String) -> valueOf
-    807:807:void <init>(java.lang.String,int) -> <init>
-    807:810:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.LevelChunkSection -> cam:
+    811:811:net.minecraft.world.level.chunk.LevelChunk$EntityCreationType[] values() -> values
+    811:811:net.minecraft.world.level.chunk.LevelChunk$EntityCreationType valueOf(java.lang.String) -> valueOf
+    811:811:void <init>(java.lang.String,int) -> <init>
+    811:814:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.LevelChunkSection -> chk:
     net.minecraft.world.level.chunk.Palette GLOBAL_BLOCKSTATE_PALETTE -> a
     int bottomBlockY -> b
     short nonEmptyBlockCount -> c
     short tickingBlockCount -> d
     short tickingFluidCount -> e
     net.minecraft.world.level.chunk.PalettedContainer states -> f
-    26:27:void <init>(int) -> <init>
-    29:35:void <init>(int,short,short,short) -> <init>
-    38:38:net.minecraft.world.level.block.state.BlockState getBlockState(int,int,int) -> a
-    42:42:net.minecraft.world.level.material.FluidState getFluidState(int,int,int) -> b
-    46:47:void acquire() -> a
-    50:51:void release() -> b
-    54:54:net.minecraft.world.level.block.state.BlockState setBlockState(int,int,int,net.minecraft.world.level.block.state.BlockState) -> a
-    59:89:net.minecraft.world.level.block.state.BlockState setBlockState(int,int,int,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    93:93:boolean isEmpty() -> c
-    97:97:boolean isEmpty(net.minecraft.world.level.chunk.LevelChunkSection) -> a
-    101:101:boolean isRandomlyTicking() -> d
-    105:105:boolean isRandomlyTickingBlocks() -> e
-    109:109:boolean isRandomlyTickingFluids() -> f
-    113:113:int bottomBlockY() -> g
-    117:137:void recalcBlockCounts() -> h
-    140:140:net.minecraft.world.level.chunk.PalettedContainer getStates() -> i
-    144:146:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    149:151:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    154:154:int getSerializedSize() -> j
-    158:158:boolean maybeHas(net.minecraft.world.level.block.state.BlockState) -> a
-    122:136:void lambda$recalcBlockCounts$0(net.minecraft.world.level.block.state.BlockState,int) -> a
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.LightChunkGetter -> can:
+    27:28:void <init>(int) -> <init>
+    30:36:void <init>(int,short,short,short) -> <init>
+    39:39:net.minecraft.world.level.block.state.BlockState getBlockState(int,int,int) -> a
+    43:43:net.minecraft.world.level.material.FluidState getFluidState(int,int,int) -> b
+    47:48:void acquire() -> a
+    51:52:void release() -> b
+    55:55:net.minecraft.world.level.block.state.BlockState setBlockState(int,int,int,net.minecraft.world.level.block.state.BlockState) -> a
+    60:90:net.minecraft.world.level.block.state.BlockState setBlockState(int,int,int,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    94:94:boolean isEmpty() -> c
+    98:98:boolean isEmpty(net.minecraft.world.level.chunk.LevelChunkSection) -> a
+    102:102:boolean isRandomlyTicking() -> d
+    106:106:boolean isRandomlyTickingBlocks() -> e
+    110:110:boolean isRandomlyTickingFluids() -> f
+    114:114:int bottomBlockY() -> g
+    118:138:void recalcBlockCounts() -> h
+    141:141:net.minecraft.world.level.chunk.PalettedContainer getStates() -> i
+    145:147:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    150:152:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    155:155:int getSerializedSize() -> j
+    159:159:boolean maybeHas(java.util.function.Predicate) -> a
+    123:137:void lambda$recalcBlockCounts$0(net.minecraft.world.level.block.state.BlockState,int) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.LightChunkGetter -> chl:
     net.minecraft.world.level.BlockGetter getChunkForLighting(int,int) -> c
     14:14:void onLightUpdate(net.minecraft.world.level.LightLayer,net.minecraft.core.SectionPos) -> a
-    net.minecraft.world.level.BlockGetter getLevel() -> l
-net.minecraft.world.level.chunk.LinearPalette -> cao:
+    net.minecraft.world.level.BlockGetter getLevel() -> m
+net.minecraft.world.level.chunk.LinearPalette -> chm:
     net.minecraft.core.IdMapper registry -> a
     java.lang.Object[] values -> b
     net.minecraft.world.level.chunk.PaletteResize resizeHandler -> c
@@ -58115,14 +63486,14 @@ net.minecraft.world.level.chunk.LinearPalette -> cao:
     int size -> f
     21:27:void <init>(net.minecraft.core.IdMapper,int,net.minecraft.world.level.chunk.PaletteResize,java.util.function.Function) -> <init>
     31:44:int idFor(java.lang.Object) -> a
-    49:49:boolean maybeHas(java.lang.Object) -> b
-    55:58:java.lang.Object valueFor(int) -> a
-    63:67:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    71:75:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    79:85:int getSerializedSize() -> a
-    90:90:int getSize() -> b
-    95:99:void read(net.minecraft.nbt.ListTag) -> a
-net.minecraft.world.level.chunk.OldDataLayer -> cap:
+    49:54:boolean maybeHas(java.util.function.Predicate) -> a
+    60:63:java.lang.Object valueFor(int) -> a
+    68:72:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    76:80:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    84:90:int getSerializedSize() -> a
+    95:95:int getSize() -> b
+    100:104:void read(net.minecraft.nbt.ListTag) -> a
+net.minecraft.world.level.chunk.OldDataLayer -> chn:
     byte[] data -> a
     int depthBits -> b
     int depthBitsPlusFour -> c
@@ -58131,18 +63502,18 @@ net.minecraft.world.level.chunk.OldDataLayer -> cap:
     27:37:void set(int,int,int,int) -> a
     40:40:boolean isValid() -> a
     44:48:void setAll(int) -> a
-net.minecraft.world.level.chunk.Palette -> caq:
+net.minecraft.world.level.chunk.Palette -> cho:
     int idFor(java.lang.Object) -> a
-    boolean maybeHas(java.lang.Object) -> b
+    boolean maybeHas(java.util.function.Predicate) -> a
     java.lang.Object valueFor(int) -> a
     void read(net.minecraft.network.FriendlyByteBuf) -> a
     void write(net.minecraft.network.FriendlyByteBuf) -> b
     int getSerializedSize() -> a
     int getSize() -> b
     void read(net.minecraft.nbt.ListTag) -> a
-net.minecraft.world.level.chunk.PaletteResize -> car:
+net.minecraft.world.level.chunk.PaletteResize -> chp:
     int onResize(int,java.lang.Object) -> onResize
-net.minecraft.world.level.chunk.PalettedContainer -> cas:
+net.minecraft.world.level.chunk.PalettedContainer -> chq:
     net.minecraft.world.level.chunk.Palette globalPalette -> b
     net.minecraft.world.level.chunk.PaletteResize dummyPaletteResize -> c
     net.minecraft.core.IdMapper registry -> d
@@ -58153,33 +63524,33 @@ net.minecraft.world.level.chunk.PalettedContainer -> cas:
     net.minecraft.world.level.chunk.Palette palette -> h
     int bits -> i
     java.util.concurrent.locks.ReentrantLock lock -> j
-    40:50:void acquire() -> a
-    53:54:void release() -> b
-    27:63:void <init>(net.minecraft.world.level.chunk.Palette,net.minecraft.core.IdMapper,java.util.function.Function,java.util.function.Function,java.lang.Object) -> <init>
-    66:66:int getIndex(int,int,int) -> b
-    70:88:void setBits(int) -> b
-    92:107:int onResize(int,java.lang.Object) -> onResize
-    111:114:java.lang.Object getAndSet(int,int,int,java.lang.Object) -> a
-    118:118:java.lang.Object getAndSetUnchecked(int,int,int,java.lang.Object) -> b
-    122:125:java.lang.Object getAndSet(int,java.lang.Object) -> a
-    129:132:void set(int,int,int,java.lang.Object) -> c
-    135:137:void set(int,java.lang.Object) -> b
-    140:140:java.lang.Object get(int,int,int) -> a
-    144:145:java.lang.Object get(int) -> a
-    149:159:void read(net.minecraft.network.FriendlyByteBuf) -> a
-    162:167:void write(net.minecraft.network.FriendlyByteBuf) -> b
-    170:201:void read(net.minecraft.nbt.ListTag,long[]) -> a
-    204:231:void write(net.minecraft.nbt.CompoundTag,java.lang.String,java.lang.String) -> a
-    234:234:int getSerializedSize() -> c
-    238:238:boolean maybeHas(java.lang.Object) -> a
-    247:250:void count(net.minecraft.world.level.chunk.PalettedContainer$CountConsumer) -> a
-    249:249:void lambda$count$3(net.minecraft.world.level.chunk.PalettedContainer$CountConsumer,it.unimi.dsi.fastutil.ints.Int2IntMap$Entry) -> a
-    248:248:void lambda$count$2(it.unimi.dsi.fastutil.ints.Int2IntMap,int) -> a
-    42:42:java.lang.String lambda$acquire$1(java.lang.Thread) -> a
-    27:27:int lambda$new$0(int,java.lang.Object) -> c
-net.minecraft.world.level.chunk.PalettedContainer$CountConsumer -> cas$a:
+    41:51:void acquire() -> a
+    54:55:void release() -> b
+    28:64:void <init>(net.minecraft.world.level.chunk.Palette,net.minecraft.core.IdMapper,java.util.function.Function,java.util.function.Function,java.lang.Object) -> <init>
+    67:67:int getIndex(int,int,int) -> b
+    71:89:void setBits(int) -> b
+    93:108:int onResize(int,java.lang.Object) -> onResize
+    112:115:java.lang.Object getAndSet(int,int,int,java.lang.Object) -> a
+    119:119:java.lang.Object getAndSetUnchecked(int,int,int,java.lang.Object) -> b
+    123:126:java.lang.Object getAndSet(int,java.lang.Object) -> a
+    130:133:void set(int,int,int,java.lang.Object) -> c
+    136:138:void set(int,java.lang.Object) -> b
+    141:141:java.lang.Object get(int,int,int) -> a
+    145:146:java.lang.Object get(int) -> a
+    150:160:void read(net.minecraft.network.FriendlyByteBuf) -> a
+    163:168:void write(net.minecraft.network.FriendlyByteBuf) -> b
+    171:202:void read(net.minecraft.nbt.ListTag,long[]) -> a
+    205:232:void write(net.minecraft.nbt.CompoundTag,java.lang.String,java.lang.String) -> a
+    235:235:int getSerializedSize() -> c
+    239:239:boolean maybeHas(java.util.function.Predicate) -> a
+    248:251:void count(net.minecraft.world.level.chunk.PalettedContainer$CountConsumer) -> a
+    250:250:void lambda$count$3(net.minecraft.world.level.chunk.PalettedContainer$CountConsumer,it.unimi.dsi.fastutil.ints.Int2IntMap$Entry) -> a
+    249:249:void lambda$count$2(it.unimi.dsi.fastutil.ints.Int2IntMap,int) -> a
+    43:43:java.lang.String lambda$acquire$1(java.lang.Thread) -> a
+    28:28:int lambda$new$0(int,java.lang.Object) -> c
+net.minecraft.world.level.chunk.PalettedContainer$CountConsumer -> chq$a:
     void accept(java.lang.Object,int) -> accept
-net.minecraft.world.level.chunk.ProtoChunk -> cat:
+net.minecraft.world.level.chunk.ProtoChunk -> chr:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.level.ChunkPos chunkPos -> b
     boolean isDirty -> c
@@ -58201,90 +63572,89 @@ net.minecraft.world.level.chunk.ProtoChunk -> cat:
     long inhabitedTime -> s
     java.util.Map carvingMasks -> t
     boolean isLightCorrect -> u
-    75:82:void <init>(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.UpgradeData) -> <init>
-    51:96:void <init>(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.UpgradeData,net.minecraft.world.level.chunk.LevelChunkSection[],net.minecraft.world.level.chunk.ProtoTickList,net.minecraft.world.level.chunk.ProtoTickList) -> <init>
-    100:110:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
-    115:125:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
-    130:130:java.util.stream.Stream getLights() -> m
-    134:138:it.unimi.dsi.fastutil.shorts.ShortList[] getPackedLights() -> w
-    142:143:void addLight(short,int) -> b
-    146:147:void addLight(net.minecraft.core.BlockPos) -> j
-    152:203:net.minecraft.world.level.block.state.BlockState setBlockState(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    207:211:net.minecraft.world.level.chunk.LevelChunkSection getOrCreateSection(int) -> a
-    216:218:void setBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
-    222:224:java.util.Set getBlockEntitiesPos() -> c
-    230:230:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
-    234:234:java.util.Map getBlockEntities() -> x
-    238:239:void addEntity(net.minecraft.nbt.CompoundTag) -> b
-    243:246:void addEntity(net.minecraft.world.entity.Entity) -> a
-    249:249:java.util.List getEntities() -> y
-    253:254:void setBiomes(net.minecraft.world.level.chunk.ChunkBiomeContainer) -> a
-    259:259:net.minecraft.world.level.chunk.ChunkBiomeContainer getBiomes() -> i
-    264:265:void setUnsaved(boolean) -> a
-    269:269:boolean isUnsaved() -> j
-    274:274:net.minecraft.world.level.chunk.ChunkStatus getStatus() -> k
-    278:280:void setStatus(net.minecraft.world.level.chunk.ChunkStatus) -> a
-    284:284:net.minecraft.world.level.chunk.LevelChunkSection[] getSections() -> d
-    290:290:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
-    295:295:java.util.Collection getHeightmaps() -> f
-    300:301:void setHeightmap(net.minecraft.world.level.levelgen.Heightmap$Types,long[]) -> a
-    305:305:net.minecraft.world.level.levelgen.Heightmap getOrCreateHeightmapUnprimed(net.minecraft.world.level.levelgen.Heightmap$Types) -> a
-    310:315:int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
-    320:331:net.minecraft.core.BlockPos getHeighestPosition(net.minecraft.world.level.levelgen.Heightmap$Types) -> b
-    336:336:net.minecraft.world.level.ChunkPos getPos() -> g
-    341:341:void setLastSaveTime(long) -> a
-    346:346:net.minecraft.world.level.levelgen.structure.StructureStart getStartForFeature(java.lang.String) -> a
-    351:353:void setStartForFeature(java.lang.String,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
-    357:357:java.util.Map getAllStarts() -> h
-    362:365:void setAllStarts(java.util.Map) -> a
-    369:369:it.unimi.dsi.fastutil.longs.LongSet getReferencesForFeature(java.lang.String) -> b
-    374:376:void addReferenceForFeature(java.lang.String,long) -> a
-    380:380:java.util.Map getAllReferences() -> v
-    385:388:void setAllReferences(java.util.Map) -> b
-    391:397:short packOffsetCoordinates(net.minecraft.core.BlockPos) -> k
-    401:404:net.minecraft.core.BlockPos unpackOffsetCoordinates(short,int,net.minecraft.world.level.ChunkPos) -> a
-    409:412:void markPosForPostprocessing(net.minecraft.core.BlockPos) -> e
-    416:416:it.unimi.dsi.fastutil.shorts.ShortList[] getPostProcessing() -> l
-    421:422:void addPackedPostProcess(short,int) -> a
-    426:426:net.minecraft.world.level.chunk.ProtoTickList getBlockTicks() -> s
-    431:431:net.minecraft.world.level.chunk.ProtoTickList getLiquidTicks() -> t
-    436:436:net.minecraft.world.level.chunk.UpgradeData getUpgradeData() -> p
-    441:442:void setInhabitedTime(long) -> b
-    446:446:long getInhabitedTime() -> q
-    451:452:void setBlockEntityNbt(net.minecraft.nbt.CompoundTag) -> a
-    455:455:java.util.Map getBlockEntityNbts() -> z
-    460:460:net.minecraft.nbt.CompoundTag getBlockEntityNbt(net.minecraft.core.BlockPos) -> f
-    466:470:net.minecraft.nbt.CompoundTag getBlockEntityNbtForSaving(net.minecraft.core.BlockPos) -> i
-    475:477:void removeBlockEntity(net.minecraft.core.BlockPos) -> d
-    481:481:java.util.BitSet getCarvingMask(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
-    485:486:void setCarvingMask(net.minecraft.world.level.levelgen.GenerationStep$Carving,java.util.BitSet) -> a
-    489:490:void setLightEngine(net.minecraft.world.level.lighting.LevelLightEngine) -> a
-    494:494:boolean isLightCorrect() -> r
-    499:501:void setLightCorrect(boolean) -> b
-    38:38:net.minecraft.world.level.TickList getLiquidTicks() -> o
-    38:38:net.minecraft.world.level.TickList getBlockTicks() -> n
-    481:481:java.util.BitSet lambda$getCarvingMask$5(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> b
-    374:374:it.unimi.dsi.fastutil.longs.LongSet lambda$addReferenceForFeature$4(java.lang.String) -> c
-    369:369:it.unimi.dsi.fastutil.longs.LongSet lambda$getReferencesForFeature$3(java.lang.String) -> d
-    305:305:net.minecraft.world.level.levelgen.Heightmap lambda$getOrCreateHeightmapUnprimed$2(net.minecraft.world.level.levelgen.Heightmap$Types) -> c
-    80:80:boolean lambda$new$1(net.minecraft.world.level.material.Fluid) -> a
-    79:79:boolean lambda$new$0(net.minecraft.world.level.block.Block) -> a
-    39:39:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.ProtoTickList -> cau:
+    77:84:void <init>(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.UpgradeData) -> <init>
+    53:98:void <init>(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.UpgradeData,net.minecraft.world.level.chunk.LevelChunkSection[],net.minecraft.world.level.chunk.ProtoTickList,net.minecraft.world.level.chunk.ProtoTickList) -> <init>
+    102:112:net.minecraft.world.level.block.state.BlockState getBlockState(net.minecraft.core.BlockPos) -> d_
+    117:127:net.minecraft.world.level.material.FluidState getFluidState(net.minecraft.core.BlockPos) -> b
+    132:132:java.util.stream.Stream getLights() -> m
+    136:140:it.unimi.dsi.fastutil.shorts.ShortList[] getPackedLights() -> w
+    144:145:void addLight(short,int) -> b
+    148:149:void addLight(net.minecraft.core.BlockPos) -> j
+    154:205:net.minecraft.world.level.block.state.BlockState setBlockState(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    209:213:net.minecraft.world.level.chunk.LevelChunkSection getOrCreateSection(int) -> a
+    218:220:void setBlockEntity(net.minecraft.core.BlockPos,net.minecraft.world.level.block.entity.BlockEntity) -> a
+    224:226:java.util.Set getBlockEntitiesPos() -> c
+    232:232:net.minecraft.world.level.block.entity.BlockEntity getBlockEntity(net.minecraft.core.BlockPos) -> c
+    236:236:java.util.Map getBlockEntities() -> x
+    240:241:void addEntity(net.minecraft.nbt.CompoundTag) -> b
+    245:254:void addEntity(net.minecraft.world.entity.Entity) -> a
+    257:257:java.util.List getEntities() -> y
+    261:262:void setBiomes(net.minecraft.world.level.chunk.ChunkBiomeContainer) -> a
+    267:267:net.minecraft.world.level.chunk.ChunkBiomeContainer getBiomes() -> i
+    272:273:void setUnsaved(boolean) -> a
+    277:277:boolean isUnsaved() -> j
+    282:282:net.minecraft.world.level.chunk.ChunkStatus getStatus() -> k
+    286:288:void setStatus(net.minecraft.world.level.chunk.ChunkStatus) -> a
+    292:292:net.minecraft.world.level.chunk.LevelChunkSection[] getSections() -> d
+    298:298:net.minecraft.world.level.lighting.LevelLightEngine getLightEngine() -> e
+    303:303:java.util.Collection getHeightmaps() -> f
+    308:309:void setHeightmap(net.minecraft.world.level.levelgen.Heightmap$Types,long[]) -> a
+    313:313:net.minecraft.world.level.levelgen.Heightmap getOrCreateHeightmapUnprimed(net.minecraft.world.level.levelgen.Heightmap$Types) -> a
+    318:323:int getHeight(net.minecraft.world.level.levelgen.Heightmap$Types,int,int) -> a
+    328:339:net.minecraft.core.BlockPos getHeighestPosition(net.minecraft.world.level.levelgen.Heightmap$Types) -> b
+    344:344:net.minecraft.world.level.ChunkPos getPos() -> g
+    349:349:void setLastSaveTime(long) -> a
+    354:354:net.minecraft.world.level.levelgen.structure.StructureStart getStartForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    359:361:void setStartForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    365:365:java.util.Map getAllStarts() -> h
+    370:373:void setAllStarts(java.util.Map) -> a
+    377:377:it.unimi.dsi.fastutil.longs.LongSet getReferencesForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature) -> b
+    382:384:void addReferenceForFeature(net.minecraft.world.level.levelgen.feature.StructureFeature,long) -> a
+    388:388:java.util.Map getAllReferences() -> v
+    393:396:void setAllReferences(java.util.Map) -> b
+    399:405:short packOffsetCoordinates(net.minecraft.core.BlockPos) -> k
+    409:412:net.minecraft.core.BlockPos unpackOffsetCoordinates(short,int,net.minecraft.world.level.ChunkPos) -> a
+    417:420:void markPosForPostprocessing(net.minecraft.core.BlockPos) -> e
+    424:424:it.unimi.dsi.fastutil.shorts.ShortList[] getPostProcessing() -> l
+    429:430:void addPackedPostProcess(short,int) -> a
+    434:434:net.minecraft.world.level.chunk.ProtoTickList getBlockTicks() -> s
+    439:439:net.minecraft.world.level.chunk.ProtoTickList getLiquidTicks() -> t
+    444:444:net.minecraft.world.level.chunk.UpgradeData getUpgradeData() -> p
+    449:450:void setInhabitedTime(long) -> b
+    454:454:long getInhabitedTime() -> q
+    459:460:void setBlockEntityNbt(net.minecraft.nbt.CompoundTag) -> a
+    463:463:java.util.Map getBlockEntityNbts() -> z
+    468:468:net.minecraft.nbt.CompoundTag getBlockEntityNbt(net.minecraft.core.BlockPos) -> f
+    474:478:net.minecraft.nbt.CompoundTag getBlockEntityNbtForSaving(net.minecraft.core.BlockPos) -> i
+    483:485:void removeBlockEntity(net.minecraft.core.BlockPos) -> d
+    489:489:java.util.BitSet getCarvingMask(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
+    493:493:java.util.BitSet getOrCreateCarvingMask(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> b
+    497:498:void setCarvingMask(net.minecraft.world.level.levelgen.GenerationStep$Carving,java.util.BitSet) -> a
+    501:502:void setLightEngine(net.minecraft.world.level.lighting.LevelLightEngine) -> a
+    506:506:boolean isLightCorrect() -> r
+    511:513:void setLightCorrect(boolean) -> b
+    40:40:net.minecraft.world.level.TickList getLiquidTicks() -> o
+    40:40:net.minecraft.world.level.TickList getBlockTicks() -> n
+    493:493:java.util.BitSet lambda$getOrCreateCarvingMask$5(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> c
+    382:382:it.unimi.dsi.fastutil.longs.LongSet lambda$addReferenceForFeature$4(net.minecraft.world.level.levelgen.feature.StructureFeature) -> c
+    377:377:it.unimi.dsi.fastutil.longs.LongSet lambda$getReferencesForFeature$3(net.minecraft.world.level.levelgen.feature.StructureFeature) -> d
+    313:313:net.minecraft.world.level.levelgen.Heightmap lambda$getOrCreateHeightmapUnprimed$2(net.minecraft.world.level.levelgen.Heightmap$Types) -> c
+    82:82:boolean lambda$new$1(net.minecraft.world.level.material.Fluid) -> a
+    81:81:boolean lambda$new$0(net.minecraft.world.level.block.Block) -> a
+    41:41:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.ProtoTickList -> chs:
     java.util.function.Predicate ignore -> a
     net.minecraft.world.level.ChunkPos chunkPos -> b
     it.unimi.dsi.fastutil.shorts.ShortList[] toBeTicked -> c
-    23:24:void <init>(java.util.function.Predicate,net.minecraft.world.level.ChunkPos) -> <init>
-    20:35:void <init>(java.util.function.Predicate,net.minecraft.world.level.ChunkPos,net.minecraft.nbt.ListTag) -> <init>
-    38:38:net.minecraft.nbt.ListTag save() -> b
-    42:51:void copyOut(net.minecraft.world.level.TickList,java.util.function.Function) -> a
-    55:55:boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
-    60:61:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
-    65:65:boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
-    70:71:void addAll(java.util.stream.Stream) -> a
-    75:75:int size() -> a
-    70:70:void lambda$addAll$0(net.minecraft.world.level.TickNextTickData) -> a
-net.minecraft.world.level.chunk.UpgradeData -> cav:
+    22:23:void <init>(java.util.function.Predicate,net.minecraft.world.level.ChunkPos) -> <init>
+    19:34:void <init>(java.util.function.Predicate,net.minecraft.world.level.ChunkPos,net.minecraft.nbt.ListTag) -> <init>
+    37:37:net.minecraft.nbt.ListTag save() -> b
+    41:50:void copyOut(net.minecraft.world.level.TickList,java.util.function.Function) -> a
+    54:54:boolean hasScheduledTick(net.minecraft.core.BlockPos,java.lang.Object) -> a
+    59:60:void scheduleTick(net.minecraft.core.BlockPos,java.lang.Object,int,net.minecraft.world.level.TickPriority) -> a
+    64:64:boolean willTickThisTick(net.minecraft.core.BlockPos,java.lang.Object) -> b
+    69:69:int size() -> a
+net.minecraft.world.level.chunk.UpgradeData -> cht:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.world.level.chunk.UpgradeData EMPTY -> a
     net.minecraft.core.Direction8[] DIRECTIONS -> c
@@ -58297,18 +63667,18 @@ net.minecraft.world.level.chunk.UpgradeData -> cav:
     69:76:void upgrade(net.minecraft.world.level.chunk.LevelChunk) -> a
     79:115:void upgradeSides(net.minecraft.world.level.chunk.LevelChunk,net.minecraft.core.Direction8) -> a
     118:118:net.minecraft.world.level.block.state.BlockState updateState(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    122:167:void upgradeInside(net.minecraft.world.level.chunk.LevelChunk) -> b
-    173:178:boolean isEmpty() -> a
-    351:369:net.minecraft.nbt.CompoundTag write() -> b
+    122:165:void upgradeInside(net.minecraft.world.level.chunk.LevelChunk) -> b
+    171:176:boolean isEmpty() -> a
+    349:367:net.minecraft.nbt.CompoundTag write() -> b
     75:75:void lambda$upgrade$0(net.minecraft.world.level.Level,net.minecraft.world.level.chunk.UpgradeData$BlockFixer) -> a
     35:35:java.util.Map access$200() -> c
     35:35:java.util.Set access$300() -> d
-    36:170:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.UpgradeData$1 -> cav$1:
-net.minecraft.world.level.chunk.UpgradeData$BlockFixer -> cav$a:
+    36:168:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.UpgradeData$1 -> cht$1:
+net.minecraft.world.level.chunk.UpgradeData$BlockFixer -> cht$a:
     net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    185:185:void processChunk(net.minecraft.world.level.LevelAccessor) -> a
-net.minecraft.world.level.chunk.UpgradeData$BlockFixers -> cav$b:
+    183:183:void processChunk(net.minecraft.world.level.LevelAccessor) -> a
+net.minecraft.world.level.chunk.UpgradeData$BlockFixers -> cht$b:
     net.minecraft.world.level.chunk.UpgradeData$BlockFixers BLACKLIST -> a
     net.minecraft.world.level.chunk.UpgradeData$BlockFixers DEFAULT -> b
     net.minecraft.world.level.chunk.UpgradeData$BlockFixers CHEST -> c
@@ -58316,112 +63686,109 @@ net.minecraft.world.level.chunk.UpgradeData$BlockFixers -> cav$b:
     net.minecraft.world.level.chunk.UpgradeData$BlockFixers STEM_BLOCK -> e
     net.minecraft.core.Direction[] DIRECTIONS -> f
     net.minecraft.world.level.chunk.UpgradeData$BlockFixers[] $VALUES -> g
-    188:188:net.minecraft.world.level.chunk.UpgradeData$BlockFixers[] values() -> values
-    188:188:net.minecraft.world.level.chunk.UpgradeData$BlockFixers valueOf(java.lang.String) -> valueOf
-    337:338:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[]) -> <init>
-    340:347:void <init>(java.lang.String,int,boolean,net.minecraft.world.level.block.Block[]) -> <init>
-    188:188:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[],net.minecraft.world.level.chunk.UpgradeData$1) -> <init>
-    188:188:void <init>(java.lang.String,int,boolean,net.minecraft.world.level.block.Block[],net.minecraft.world.level.chunk.UpgradeData$1) -> <init>
-    188:334:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.UpgradeData$BlockFixers$1 -> cav$b$1:
-    189:189:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[]) -> <init>
-    232:232:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.chunk.UpgradeData$BlockFixers$2 -> cav$b$2:
-    235:235:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[]) -> <init>
-    238:238:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.chunk.UpgradeData$BlockFixers$3 -> cav$b$3:
-    241:241:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[]) -> <init>
-    244:264:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.chunk.UpgradeData$BlockFixers$4 -> cav$b$4:
+    186:186:net.minecraft.world.level.chunk.UpgradeData$BlockFixers[] values() -> values
+    186:186:net.minecraft.world.level.chunk.UpgradeData$BlockFixers valueOf(java.lang.String) -> valueOf
+    335:336:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[]) -> <init>
+    338:345:void <init>(java.lang.String,int,boolean,net.minecraft.world.level.block.Block[]) -> <init>
+    186:186:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[],net.minecraft.world.level.chunk.UpgradeData$1) -> <init>
+    186:186:void <init>(java.lang.String,int,boolean,net.minecraft.world.level.block.Block[],net.minecraft.world.level.chunk.UpgradeData$1) -> <init>
+    186:332:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.UpgradeData$BlockFixers$1 -> cht$b$1:
+    187:187:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[]) -> <init>
+    230:230:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.chunk.UpgradeData$BlockFixers$2 -> cht$b$2:
+    233:233:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[]) -> <init>
+    236:236:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.chunk.UpgradeData$BlockFixers$3 -> cht$b$3:
+    239:239:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[]) -> <init>
+    242:262:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.chunk.UpgradeData$BlockFixers$4 -> cht$b$4:
     java.lang.ThreadLocal queue -> g
-    267:268:void <init>(java.lang.String,int,boolean,net.minecraft.world.level.block.Block[]) -> <init>
-    272:283:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    288:318:void processChunk(net.minecraft.world.level.LevelAccessor) -> a
-    268:268:java.util.List lambda$$0() -> a
-net.minecraft.world.level.chunk.UpgradeData$BlockFixers$5 -> cav$b$5:
-    320:320:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[]) -> <init>
-    323:329:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.chunk.package-info -> caw:
-net.minecraft.world.level.chunk.storage.ChunkSerializer -> cax:
+    265:266:void <init>(java.lang.String,int,boolean,net.minecraft.world.level.block.Block[]) -> <init>
+    270:281:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    286:316:void processChunk(net.minecraft.world.level.LevelAccessor) -> a
+    266:266:java.util.List lambda$$0() -> a
+net.minecraft.world.level.chunk.UpgradeData$BlockFixers$5 -> cht$b$5:
+    318:318:void <init>(java.lang.String,int,net.minecraft.world.level.block.Block[]) -> <init>
+    321:327:net.minecraft.world.level.block.state.BlockState updateShape(net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.chunk.package-info -> chu:
+net.minecraft.world.level.chunk.storage.ChunkSerializer -> chv:
     org.apache.logging.log4j.Logger LOGGER -> a
     59:59:void <init>() -> <init>
     64:221:net.minecraft.world.level.chunk.ProtoChunk read(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.entity.ai.village.poi.PoiManager,net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag) -> a
-    225:357:net.minecraft.nbt.CompoundTag write(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    361:367:net.minecraft.world.level.chunk.ChunkStatus$ChunkType getChunkTypeFromTag(net.minecraft.nbt.CompoundTag) -> a
-    371:395:void postLoadChunk(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.chunk.LevelChunk) -> a
-    398:412:net.minecraft.nbt.CompoundTag packStructureData(net.minecraft.world.level.ChunkPos,java.util.Map,java.util.Map) -> a
-    416:423:java.util.Map unpackStructureStart(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> a
-    427:443:java.util.Map unpackStructureReferences(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag) -> a
-    447:457:net.minecraft.nbt.ListTag packOffsets(it.unimi.dsi.fastutil.shorts.ShortList[]) -> a
-    433:438:boolean lambda$unpackStructureReferences$5(net.minecraft.world.level.ChunkPos,java.lang.String,long) -> a
-    376:377:net.minecraft.world.entity.Entity lambda$postLoadChunk$4(net.minecraft.world.level.chunk.LevelChunk,net.minecraft.world.entity.Entity) -> a
+    225:360:net.minecraft.nbt.CompoundTag write(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    364:370:net.minecraft.world.level.chunk.ChunkStatus$ChunkType getChunkTypeFromTag(net.minecraft.nbt.CompoundTag) -> a
+    374:400:void postLoadChunk(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.chunk.LevelChunk) -> a
+    403:417:net.minecraft.nbt.CompoundTag packStructureData(net.minecraft.world.level.ChunkPos,java.util.Map,java.util.Map) -> a
+    421:437:java.util.Map unpackStructureStart(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag,long) -> a
+    441:457:java.util.Map unpackStructureReferences(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag) -> a
+    461:471:net.minecraft.nbt.ListTag packOffsets(it.unimi.dsi.fastutil.shorts.ShortList[]) -> a
+    447:452:boolean lambda$unpackStructureReferences$5(net.minecraft.world.level.ChunkPos,java.lang.String,long) -> a
+    379:380:net.minecraft.world.entity.Entity lambda$postLoadChunk$4(net.minecraft.world.level.chunk.LevelChunk,net.minecraft.world.entity.Entity) -> a
     250:250:boolean lambda$write$3(int,net.minecraft.world.level.chunk.LevelChunkSection) -> a
     138:138:void lambda$read$2(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.chunk.LevelChunk) -> b
     78:78:boolean lambda$read$1(net.minecraft.world.level.material.Fluid) -> a
     77:77:boolean lambda$read$0(net.minecraft.world.level.block.Block) -> a
     60:60:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.storage.ChunkStorage -> cay:
+net.minecraft.world.level.chunk.storage.ChunkStorage -> chw:
     net.minecraft.world.level.chunk.storage.IOWorker worker -> a
     com.mojang.datafixers.DataFixer fixerUpper -> b
     net.minecraft.world.level.levelgen.structure.LegacyStructureDataHandler legacyStructureHandler -> c
-    26:29:void <init>(java.io.File,com.mojang.datafixers.DataFixer) -> <init>
-    32:51:net.minecraft.nbt.CompoundTag upgradeChunkTag(net.minecraft.world.level.dimension.DimensionType,java.util.function.Supplier,net.minecraft.nbt.CompoundTag) -> a
-    55:55:int getVersion(net.minecraft.nbt.CompoundTag) -> a
-    60:60:net.minecraft.nbt.CompoundTag read(net.minecraft.world.level.ChunkPos) -> e
-    64:69:void write(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag) -> a
-    72:73:void flushWorker() -> i
-    77:78:void close() -> close
-net.minecraft.world.level.chunk.storage.IOWorker -> caz:
+    27:30:void <init>(java.io.File,com.mojang.datafixers.DataFixer,boolean) -> <init>
+    33:52:net.minecraft.nbt.CompoundTag upgradeChunkTag(net.minecraft.resources.ResourceKey,java.util.function.Supplier,net.minecraft.nbt.CompoundTag) -> a
+    56:56:int getVersion(net.minecraft.nbt.CompoundTag) -> a
+    61:61:net.minecraft.nbt.CompoundTag read(net.minecraft.world.level.ChunkPos) -> e
+    65:70:void write(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag) -> a
+    73:74:void flushWorker() -> i
+    78:79:void close() -> close
+net.minecraft.world.level.chunk.storage.IOWorker -> chx:
     org.apache.logging.log4j.Logger LOGGER -> a
-    java.lang.Thread thread -> b
-    java.util.concurrent.atomic.AtomicBoolean shutdownRequested -> c
-    java.util.Queue inbox -> d
-    net.minecraft.world.level.chunk.storage.RegionFileStorage storage -> e
-    java.util.Map pendingWrites -> f
-    boolean running -> g
-    java.util.concurrent.CompletableFuture shutdownListener -> h
-    43:58:void <init>(net.minecraft.world.level.chunk.storage.RegionFileStorage,java.lang.String) -> <init>
-    61:61:java.util.concurrent.CompletableFuture store(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag) -> a
-    77:98:net.minecraft.nbt.CompoundTag load(net.minecraft.world.level.ChunkPos) -> a
-    103:103:java.util.concurrent.CompletableFuture shutdown() -> b
-    110:110:java.util.concurrent.CompletableFuture synchronize() -> a
-    117:120:java.util.concurrent.CompletableFuture submitTask(java.util.function.Function) -> a
-    124:125:void waitForQueueNonEmpty() -> c
-    129:142:void loop() -> d
-    145:153:boolean storePendingChunk() -> e
-    157:159:void storeRemainingPendingChunks() -> f
-    163:169:void runStore(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.storage.IOWorker$PendingStore) -> a
-    173:179:void closeStorage() -> g
-    182:189:boolean processInbox() -> h
-    194:205:void close() -> close
-    110:110:java.lang.Runnable lambda$synchronize$12(java.util.concurrent.CompletableFuture) -> a
-    111:113:void lambda$null$11(java.util.concurrent.CompletableFuture) -> b
-    112:112:void lambda$null$10(java.util.concurrent.CompletableFuture,java.lang.Object,java.lang.Throwable) -> a
-    111:111:java.util.concurrent.CompletableFuture[] lambda$null$9(int) -> a
-    111:111:java.util.concurrent.CompletableFuture lambda$null$8(net.minecraft.world.level.chunk.storage.IOWorker$PendingStore) -> a
-    103:103:java.lang.Runnable lambda$shutdown$7(java.util.concurrent.CompletableFuture) -> c
-    104:106:void lambda$null$6(java.util.concurrent.CompletableFuture) -> d
-    77:77:java.lang.Runnable lambda$load$5(net.minecraft.world.level.ChunkPos,java.util.concurrent.CompletableFuture) -> a
-    78:90:void lambda$null$4(net.minecraft.world.level.ChunkPos,java.util.concurrent.CompletableFuture) -> b
-    61:61:java.lang.Runnable lambda$store$3(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag,java.util.concurrent.CompletableFuture) -> a
-    62:71:void lambda$null$2(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag,java.util.concurrent.CompletableFuture) -> b
-    65:70:void lambda$null$1(java.util.concurrent.CompletableFuture,java.lang.Void,java.lang.Throwable) -> a
-    62:62:net.minecraft.world.level.chunk.storage.IOWorker$PendingStore lambda$null$0(net.minecraft.world.level.ChunkPos) -> b
-    33:33:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.storage.IOWorker$1 -> caz$1:
-net.minecraft.world.level.chunk.storage.IOWorker$PendingStore -> caz$a:
+    java.util.concurrent.atomic.AtomicBoolean shutdownRequested -> b
+    net.minecraft.util.thread.ProcessorMailbox mailbox -> c
+    net.minecraft.world.level.chunk.storage.RegionFileStorage storage -> d
+    java.util.Map pendingWrites -> e
+    56:66:void <init>(java.io.File,boolean,java.lang.String) -> <init>
+    69:73:java.util.concurrent.CompletableFuture store(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag) -> a
+    79:100:net.minecraft.nbt.CompoundTag load(net.minecraft.world.level.ChunkPos) -> a
+    105:106:java.util.concurrent.CompletableFuture synchronize() -> a
+    118:118:java.util.concurrent.CompletableFuture submitTask(java.util.function.Supplier) -> a
+    127:136:void storePendingChunk() -> b
+    139:140:void tellStorePending() -> c
+    144:150:void runStore(net.minecraft.world.level.ChunkPos,net.minecraft.world.level.chunk.storage.IOWorker$PendingStore) -> a
+    154:176:void close() -> close
+    158:158:net.minecraft.util.thread.StrictQueue$IntRunnable lambda$close$11(net.minecraft.util.thread.ProcessorHandle) -> a
+    158:158:void lambda$null$10(net.minecraft.util.thread.ProcessorHandle) -> b
+    118:118:net.minecraft.util.thread.StrictQueue$IntRunnable lambda$submitTask$9(java.util.function.Supplier,net.minecraft.util.thread.ProcessorHandle) -> a
+    119:123:void lambda$null$8(net.minecraft.util.thread.ProcessorHandle,java.util.function.Supplier) -> a
+    106:106:java.util.concurrent.CompletionStage lambda$synchronize$7(java.lang.Void) -> a
+    108:112:com.mojang.datafixers.util.Either lambda$null$6() -> d
+    105:105:com.mojang.datafixers.util.Either lambda$synchronize$5() -> e
+    105:105:java.util.concurrent.CompletableFuture[] lambda$null$4(int) -> a
+    105:105:java.util.concurrent.CompletableFuture lambda$null$3(net.minecraft.world.level.chunk.storage.IOWorker$PendingStore) -> a
+    80:89:com.mojang.datafixers.util.Either lambda$load$2(net.minecraft.world.level.ChunkPos) -> b
+    70:72:com.mojang.datafixers.util.Either lambda$store$1(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag) -> b
+    70:70:net.minecraft.world.level.chunk.storage.IOWorker$PendingStore lambda$null$0(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.ChunkPos) -> a
+    40:40:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.storage.IOWorker$PendingStore -> chx$a:
     net.minecraft.nbt.CompoundTag data -> a
     java.util.concurrent.CompletableFuture result -> b
-    35:37:void <init>() -> <init>
-    35:35:net.minecraft.nbt.CompoundTag access$000(net.minecraft.world.level.chunk.storage.IOWorker$PendingStore) -> a
-    35:35:java.util.concurrent.CompletableFuture access$100(net.minecraft.world.level.chunk.storage.IOWorker$PendingStore) -> b
-    35:35:net.minecraft.nbt.CompoundTag access$002(net.minecraft.world.level.chunk.storage.IOWorker$PendingStore,net.minecraft.nbt.CompoundTag) -> a
-    35:35:void <init>(net.minecraft.world.level.chunk.storage.IOWorker$1) -> <init>
-net.minecraft.world.level.chunk.storage.OldChunkStorage -> cba:
+    48:52:void <init>(net.minecraft.nbt.CompoundTag) -> <init>
+    46:46:net.minecraft.nbt.CompoundTag access$000(net.minecraft.world.level.chunk.storage.IOWorker$PendingStore) -> a
+    46:46:java.util.concurrent.CompletableFuture access$100(net.minecraft.world.level.chunk.storage.IOWorker$PendingStore) -> b
+    46:46:net.minecraft.nbt.CompoundTag access$002(net.minecraft.world.level.chunk.storage.IOWorker$PendingStore,net.minecraft.nbt.CompoundTag) -> a
+net.minecraft.world.level.chunk.storage.IOWorker$Priority -> chx$b:
+    net.minecraft.world.level.chunk.storage.IOWorker$Priority HIGH -> a
+    net.minecraft.world.level.chunk.storage.IOWorker$Priority LOW -> b
+    net.minecraft.world.level.chunk.storage.IOWorker$Priority[] $VALUES -> c
+    42:42:net.minecraft.world.level.chunk.storage.IOWorker$Priority[] values() -> values
+    42:42:net.minecraft.world.level.chunk.storage.IOWorker$Priority valueOf(java.lang.String) -> valueOf
+    42:42:void <init>(java.lang.String,int) -> <init>
+    42:43:void <clinit>() -> <clinit>
+net.minecraft.world.level.chunk.storage.OldChunkStorage -> chy:
     12:12:void <init>() -> <init>
     16:37:net.minecraft.world.level.chunk.storage.OldChunkStorage$OldLevelChunk load(net.minecraft.nbt.CompoundTag) -> a
     41:110:void convertToAnvilFormat(net.minecraft.world.level.chunk.storage.OldChunkStorage$OldLevelChunk,net.minecraft.nbt.CompoundTag,net.minecraft.world.level.biome.BiomeSource) -> a
-net.minecraft.world.level.chunk.storage.OldChunkStorage$OldLevelChunk -> cba$a:
+net.minecraft.world.level.chunk.storage.OldChunkStorage$OldLevelChunk -> chy$a:
     long lastUpdated -> a
     boolean terrainPopulated -> b
     byte[] heightmap -> c
@@ -58435,14 +63802,14 @@ net.minecraft.world.level.chunk.storage.OldChunkStorage$OldLevelChunk -> cba$a:
     int x -> k
     int z -> l
     128:131:void <init>(int,int) -> <init>
-net.minecraft.world.level.chunk.storage.RegionBitmap -> cbb:
+net.minecraft.world.level.chunk.storage.RegionBitmap -> chz:
     java.util.BitSet used -> a
     9:10:void <init>() -> <init>
     13:14:void force(int,int) -> a
     17:18:void free(int,int) -> b
     21:30:int allocate(int) -> a
     35:35:it.unimi.dsi.fastutil.ints.IntSet getUsed() -> a
-net.minecraft.world.level.chunk.storage.RegionFile -> cbc:
+net.minecraft.world.level.chunk.storage.RegionFile -> cia:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.nio.ByteBuffer PADDING_BUFFER -> b
     java.nio.channels.FileChannel file -> c
@@ -58452,50 +63819,53 @@ net.minecraft.world.level.chunk.storage.RegionFile -> cbc:
     java.nio.IntBuffer offsets -> g
     java.nio.IntBuffer timestamps -> h
     net.minecraft.world.level.chunk.storage.RegionBitmap usedSectors -> i
-    108:109:void <init>(java.io.File,java.io.File) -> <init>
-    101:143:void <init>(java.nio.file.Path,java.nio.file.Path,net.minecraft.world.level.chunk.storage.RegionFileVersion) -> <init>
-    146:147:java.nio.file.Path getExternalChunkPath(net.minecraft.world.level.ChunkPos) -> e
-    152:198:java.io.DataInputStream getChunkDataInputStream(net.minecraft.world.level.ChunkPos) -> a
-    202:202:boolean isExternalStreamChunk(byte) -> a
-    206:206:byte getExternalChunkVersion(byte) -> b
-    211:216:java.io.DataInputStream createChunkInputStream(net.minecraft.world.level.ChunkPos,byte,java.io.InputStream) -> a
-    221:227:java.io.DataInputStream createExternalChunkInputStream(net.minecraft.world.level.ChunkPos,byte) -> a
-    231:231:java.io.ByteArrayInputStream createStream(java.nio.ByteBuffer,int) -> a
-    235:235:int packSectorOffset(int,int) -> a
-    239:239:int getNumSectors(int) -> a
-    243:243:int getSectorNumber(int) -> b
-    247:247:int sizeToSectors(int) -> c
-    251:295:boolean doesChunkExist(net.minecraft.world.level.ChunkPos) -> b
-    299:299:java.io.DataOutputStream getChunkDataOutputStream(net.minecraft.world.level.ChunkPos) -> c
-    332:367:void write(net.minecraft.world.level.ChunkPos,java.nio.ByteBuffer) -> a
-    370:374:java.nio.ByteBuffer createExternalStub() -> a
-    378:383:net.minecraft.world.level.chunk.storage.RegionFile$CommitOp writeToExternalFile(java.nio.file.Path,java.nio.ByteBuffer) -> a
-    387:389:void writeHeader() -> b
-    392:392:int getOffset(net.minecraft.world.level.ChunkPos) -> f
-    396:396:boolean hasChunk(net.minecraft.world.level.ChunkPos) -> d
-    400:400:int getOffsetIndex(net.minecraft.world.level.ChunkPos) -> g
-    406:418:void close() -> close
-    423:430:void padToFullSector() -> c
-    383:383:void lambda$writeToExternalFile$1(java.nio.file.Path,java.nio.file.Path) -> a
-    353:353:void lambda$write$0(net.minecraft.world.level.ChunkPos) -> h
+    108:109:void <init>(java.io.File,java.io.File,boolean) -> <init>
+    101:147:void <init>(java.nio.file.Path,java.nio.file.Path,net.minecraft.world.level.chunk.storage.RegionFileVersion,boolean) -> <init>
+    150:151:java.nio.file.Path getExternalChunkPath(net.minecraft.world.level.ChunkPos) -> e
+    156:202:java.io.DataInputStream getChunkDataInputStream(net.minecraft.world.level.ChunkPos) -> a
+    206:206:boolean isExternalStreamChunk(byte) -> a
+    210:210:byte getExternalChunkVersion(byte) -> b
+    215:220:java.io.DataInputStream createChunkInputStream(net.minecraft.world.level.ChunkPos,byte,java.io.InputStream) -> a
+    225:231:java.io.DataInputStream createExternalChunkInputStream(net.minecraft.world.level.ChunkPos,byte) -> a
+    235:235:java.io.ByteArrayInputStream createStream(java.nio.ByteBuffer,int) -> a
+    239:239:int packSectorOffset(int,int) -> a
+    243:243:int getNumSectors(int) -> a
+    247:247:int getSectorNumber(int) -> b
+    251:251:int sizeToSectors(int) -> c
+    255:299:boolean doesChunkExist(net.minecraft.world.level.ChunkPos) -> b
+    303:303:java.io.DataOutputStream getChunkDataOutputStream(net.minecraft.world.level.ChunkPos) -> c
+    307:308:void flush() -> a
+    340:375:void write(net.minecraft.world.level.ChunkPos,java.nio.ByteBuffer) -> a
+    378:382:java.nio.ByteBuffer createExternalStub() -> b
+    386:391:net.minecraft.world.level.chunk.storage.RegionFile$CommitOp writeToExternalFile(java.nio.file.Path,java.nio.ByteBuffer) -> a
+    395:397:void writeHeader() -> c
+    400:400:int getOffset(net.minecraft.world.level.ChunkPos) -> f
+    404:404:boolean hasChunk(net.minecraft.world.level.ChunkPos) -> d
+    408:408:int getOffsetIndex(net.minecraft.world.level.ChunkPos) -> g
+    414:422:void close() -> close
+    427:434:void padToFullSector() -> d
+    391:391:void lambda$writeToExternalFile$1(java.nio.file.Path,java.nio.file.Path) -> a
+    361:361:void lambda$write$0(net.minecraft.world.level.ChunkPos) -> h
     84:84:net.minecraft.world.level.chunk.storage.RegionFileVersion access$000(net.minecraft.world.level.chunk.storage.RegionFile) -> a
     85:93:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.storage.RegionFile$ChunkBuffer -> cbc$a:
+net.minecraft.world.level.chunk.storage.RegionFile$ChunkBuffer -> cia$a:
     net.minecraft.world.level.ChunkPos pos -> b
     net.minecraft.world.level.chunk.storage.RegionFile this$0 -> a
-    309:320:void <init>(net.minecraft.world.level.chunk.storage.RegionFile,net.minecraft.world.level.ChunkPos) -> <init>
-    324:328:void close() -> close
-net.minecraft.world.level.chunk.storage.RegionFile$CommitOp -> cbc$b:
+    317:328:void <init>(net.minecraft.world.level.chunk.storage.RegionFile,net.minecraft.world.level.ChunkPos) -> <init>
+    332:336:void close() -> close
+net.minecraft.world.level.chunk.storage.RegionFile$CommitOp -> cia$b:
     void run() -> run
-net.minecraft.world.level.chunk.storage.RegionFileStorage -> cbd:
+net.minecraft.world.level.chunk.storage.RegionFileStorage -> cib:
     it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap regionCache -> a
     java.io.File folder -> b
-    17:22:void <init>(java.io.File) -> <init>
-    25:42:net.minecraft.world.level.chunk.storage.RegionFile getRegionFile(net.minecraft.world.level.ChunkPos) -> b
-    47:54:net.minecraft.nbt.CompoundTag read(net.minecraft.world.level.ChunkPos) -> a
-    58:62:void write(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag) -> a
-    66:69:void close() -> close
-net.minecraft.world.level.chunk.storage.RegionFileVersion -> cbe:
+    boolean sync -> c
+    18:25:void <init>(java.io.File,boolean) -> <init>
+    28:45:net.minecraft.world.level.chunk.storage.RegionFile getRegionFile(net.minecraft.world.level.ChunkPos) -> b
+    50:57:net.minecraft.nbt.CompoundTag read(net.minecraft.world.level.ChunkPos) -> a
+    61:65:void write(net.minecraft.world.level.ChunkPos,net.minecraft.nbt.CompoundTag) -> a
+    69:78:void close() -> close
+    81:84:void flush() -> a
+net.minecraft.world.level.chunk.storage.RegionFileVersion -> cic:
     it.unimi.dsi.fastutil.ints.Int2ObjectMap VERSIONS -> d
     net.minecraft.world.level.chunk.storage.RegionFileVersion VERSION_GZIP -> a
     net.minecraft.world.level.chunk.storage.RegionFileVersion VERSION_DEFLATE -> b
@@ -58513,128 +63883,124 @@ net.minecraft.world.level.chunk.storage.RegionFileVersion -> cbe:
     20:20:java.io.OutputStream lambda$static$1(java.io.OutputStream) -> b
     20:20:java.io.InputStream lambda$static$0(java.io.InputStream) -> b
     16:20:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.storage.RegionFileVersion$StreamWrapper -> cbe$a:
+net.minecraft.world.level.chunk.storage.RegionFileVersion$StreamWrapper -> cic$a:
     java.lang.Object wrap(java.lang.Object) -> wrap
-net.minecraft.world.level.chunk.storage.SectionStorage -> cbf:
+net.minecraft.world.level.chunk.storage.SectionStorage -> cid:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.level.chunk.storage.IOWorker worker -> b
     it.unimi.dsi.fastutil.longs.Long2ObjectMap storage -> c
     it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet dirty -> d
-    java.util.function.BiFunction deserializer -> e
+    java.util.function.Function codec -> e
     java.util.function.Function factory -> f
     com.mojang.datafixers.DataFixer fixerUpper -> g
     net.minecraft.util.datafix.DataFixTypes type -> h
-    43:56:void <init>(java.io.File,java.util.function.BiFunction,java.util.function.Function,com.mojang.datafixers.DataFixer,net.minecraft.util.datafix.DataFixTypes) -> <init>
+    43:56:void <init>(java.io.File,java.util.function.Function,java.util.function.Function,com.mojang.datafixers.DataFixer,net.minecraft.util.datafix.DataFixTypes,boolean) -> <init>
     59:63:void tick(java.util.function.BooleanSupplier) -> a
     67:67:java.util.Optional get(long) -> c
     71:85:java.util.Optional getOrLoad(long) -> d
     89:89:boolean outsideStoredRange(net.minecraft.core.SectionPos) -> b
-    93:99:net.minecraft.util.Serializable getOrCreate(long) -> e
+    93:99:java.lang.Object getOrCreate(long) -> e
     103:104:void readColumn(net.minecraft.world.level.ChunkPos) -> b
     109:112:net.minecraft.nbt.CompoundTag tryRead(net.minecraft.world.level.ChunkPos) -> c
-    117:142:void readColumn(net.minecraft.world.level.ChunkPos,com.mojang.datafixers.types.DynamicOps,java.lang.Object) -> a
+    117:142:void readColumn(net.minecraft.world.level.ChunkPos,com.mojang.serialization.DynamicOps,java.lang.Object) -> a
     145:152:void writeColumn(net.minecraft.world.level.ChunkPos) -> d
-    155:168:com.mojang.datafixers.Dynamic writeColumn(net.minecraft.world.level.ChunkPos,com.mojang.datafixers.types.DynamicOps) -> a
-    172:172:void onSectionLoad(long) -> b
-    175:181:void setDirty(long) -> a
-    185:185:int getVersion(com.mojang.datafixers.Dynamic) -> a
-    189:198:void flush(net.minecraft.world.level.ChunkPos) -> a
-    202:203:void close() -> close
-    135:139:void lambda$readColumn$3(long,boolean,net.minecraft.util.Serializable) -> a
-    131:131:net.minecraft.util.Serializable lambda$readColumn$2(long,com.mojang.datafixers.Dynamic) -> a
-    131:131:void lambda$null$1(long) -> f
-    97:97:void lambda$getOrCreate$0(long) -> g
+    155:170:com.mojang.serialization.Dynamic writeColumn(net.minecraft.world.level.ChunkPos,com.mojang.serialization.DynamicOps) -> a
+    174:174:void onSectionLoad(long) -> b
+    177:183:void setDirty(long) -> a
+    187:187:int getVersion(com.mojang.serialization.Dynamic) -> a
+    191:200:void flush(net.minecraft.world.level.ChunkPos) -> a
+    204:205:void close() -> close
+    165:165:void lambda$writeColumn$5(java.util.Map,com.mojang.serialization.DynamicOps,java.lang.String,java.lang.Object) -> a
+    163:163:void lambda$writeColumn$4(long) -> f
+    135:139:void lambda$readColumn$3(long,boolean,java.lang.Object) -> a
+    131:131:java.util.Optional lambda$readColumn$2(long,com.mojang.serialization.Dynamic) -> a
+    131:131:void lambda$null$1(long) -> g
+    97:97:void lambda$getOrCreate$0(long) -> h
     36:36:void <clinit>() -> <clinit>
-net.minecraft.world.level.chunk.storage.package-info -> cbg:
-net.minecraft.world.level.dimension.Dimension -> cbh:
-    float[] MOON_BRIGHTNESS_PER_PHASE -> a
-    net.minecraft.world.level.Level level -> b
-    net.minecraft.world.level.dimension.DimensionType type -> f
-    boolean ultraWarm -> c
-    boolean hasCeiling -> d
-    float[] brightnessRamp -> e
-    float[] sunriseCol -> g
-    23:38:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.dimension.DimensionType,float) -> <init>
-    42:42:int getMoonPhase(long) -> a
-    47:61:float[] getSunriseColor(float,float) -> a
-    65:65:float getCloudHeight() -> a
-    69:69:boolean hasGround() -> b
-    74:74:net.minecraft.core.BlockPos getDimensionSpecificSpawn() -> c
-    78:81:double getClearColorScale() -> d
-    85:85:boolean isUltraWarm() -> e
-    89:89:boolean isHasSkyLight() -> f
-    93:93:boolean isHasCeiling() -> g
-    98:98:float getBrightness(int) -> a
-    102:102:net.minecraft.world.level.border.WorldBorder createWorldBorder() -> h
-    106:106:void saveData() -> i
-    109:109:void tick() -> j
-    net.minecraft.world.level.chunk.ChunkGenerator createRandomLevelGenerator() -> k
-    net.minecraft.core.BlockPos getSpawnPosInChunk(net.minecraft.world.level.ChunkPos,boolean) -> a
-    net.minecraft.core.BlockPos getValidSpawnPosition(int,int,boolean) -> a
-    float getTimeOfDay(long,float) -> a
-    boolean isNaturalDimension() -> l
-    net.minecraft.world.phys.Vec3 getFogColor(float,float) -> b
-    boolean mayRespawn() -> m
-    boolean isFoggyAt(int,int) -> a
-    net.minecraft.world.level.dimension.DimensionType getType() -> n
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.dimension.DimensionType -> cbi:
-    net.minecraft.world.level.dimension.DimensionType OVERWORLD -> a
-    net.minecraft.world.level.dimension.DimensionType NETHER -> b
-    net.minecraft.world.level.dimension.DimensionType THE_END -> c
-    int id -> d
-    java.lang.String fileSuffix -> e
-    java.lang.String folder -> f
-    java.util.function.BiFunction factory -> g
-    boolean hasSkylight -> h
-    net.minecraft.world.level.biome.BiomeZoomer biomeZoomer -> i
-    26:26:net.minecraft.world.level.dimension.DimensionType register(java.lang.String,net.minecraft.world.level.dimension.DimensionType) -> a
-    36:43:void <init>(int,java.lang.String,java.lang.String,java.util.function.BiFunction,boolean,net.minecraft.world.level.biome.BiomeZoomer) -> <init>
-    46:46:net.minecraft.world.level.dimension.DimensionType of(com.mojang.datafixers.Dynamic) -> a
-    50:50:java.lang.Iterable getAllTypes() -> a
-    54:54:int getId() -> b
-    58:58:java.lang.String getFileSuffix() -> c
-    62:65:java.io.File getStorageFolder(java.io.File) -> a
-    69:69:net.minecraft.world.level.dimension.Dimension create(net.minecraft.world.level.Level) -> a
-    74:74:java.lang.String toString() -> toString
-    79:79:net.minecraft.world.level.dimension.DimensionType getById(int) -> a
-    84:84:net.minecraft.world.level.dimension.DimensionType getByName(net.minecraft.resources.ResourceLocation) -> a
-    89:89:net.minecraft.resources.ResourceLocation getName(net.minecraft.world.level.dimension.DimensionType) -> a
-    93:93:boolean hasSkyLight() -> d
-    97:97:net.minecraft.world.level.biome.BiomeZoomer getBiomeZoomer() -> e
-    102:102:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    21:23:void <clinit>() -> <clinit>
-net.minecraft.world.level.dimension.NetherDimension -> cbj:
-    net.minecraft.world.phys.Vec3 NETHER_FOG_COLOR -> f
-    21:24:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.dimension.DimensionType) -> <init>
-    28:28:net.minecraft.world.phys.Vec3 getFogColor(float,float) -> b
-    33:36:net.minecraft.world.level.chunk.ChunkGenerator createRandomLevelGenerator() -> k
-    41:41:boolean isNaturalDimension() -> l
-    47:47:net.minecraft.core.BlockPos getSpawnPosInChunk(net.minecraft.world.level.ChunkPos,boolean) -> a
-    53:53:net.minecraft.core.BlockPos getValidSpawnPosition(int,int,boolean) -> a
-    58:58:float getTimeOfDay(long,float) -> a
-    63:63:boolean mayRespawn() -> m
-    68:68:boolean isFoggyAt(int,int) -> a
-    73:73:net.minecraft.world.level.border.WorldBorder createWorldBorder() -> h
-    88:88:net.minecraft.world.level.dimension.DimensionType getType() -> n
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.dimension.NetherDimension$1 -> cbj$1:
-    net.minecraft.world.level.dimension.NetherDimension this$0 -> a
-    73:73:void <init>(net.minecraft.world.level.dimension.NetherDimension) -> <init>
-    76:76:double getCenterX() -> g
-    81:81:double getCenterZ() -> h
-net.minecraft.world.level.dimension.NormalDimension -> cbk:
-    52:53:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.dimension.DimensionType) -> <init>
-    57:57:net.minecraft.world.level.dimension.DimensionType getType() -> n
-    62:167:net.minecraft.world.level.chunk.ChunkGenerator createRandomLevelGenerator() -> k
-    174:183:net.minecraft.core.BlockPos getSpawnPosInChunk(net.minecraft.world.level.ChunkPos,boolean) -> a
-    189:225:net.minecraft.core.BlockPos getValidSpawnPosition(int,int,boolean) -> a
-    231:236:float getTimeOfDay(long,float) -> a
-    241:241:boolean isNaturalDimension() -> l
-    246:256:net.minecraft.world.phys.Vec3 getFogColor(float,float) -> b
-    261:261:boolean mayRespawn() -> m
-    266:266:boolean isFoggyAt(int,int) -> a
-net.minecraft.world.level.dimension.end.DragonRespawnAnimation -> cbl:
+net.minecraft.world.level.chunk.storage.package-info -> cie:
+net.minecraft.world.level.dimension.DimensionType -> cif:
+    com.mojang.serialization.MapCodec DIRECT_CODEC -> a
+    float[] MOON_BRIGHTNESS_PER_PHASE -> b
+    net.minecraft.resources.ResourceKey OVERWORLD_LOCATION -> c
+    net.minecraft.resources.ResourceKey NETHER_LOCATION -> d
+    net.minecraft.resources.ResourceKey END_LOCATION -> e
+    net.minecraft.world.level.dimension.DimensionType DEFAULT_OVERWORLD -> f
+    net.minecraft.world.level.dimension.DimensionType DEFAULT_NETHER -> g
+    net.minecraft.world.level.dimension.DimensionType DEFAULT_END -> h
+    net.minecraft.resources.ResourceKey OVERWORLD_CAVES_LOCATION -> i
+    net.minecraft.world.level.dimension.DimensionType DEFAULT_OVERWORLD_CAVES -> j
+    com.mojang.serialization.Codec CODEC -> k
+    java.util.OptionalLong fixedTime -> l
+    boolean hasSkylight -> m
+    boolean hasCeiling -> n
+    boolean ultraWarm -> o
+    boolean natural -> p
+    boolean shrunk -> q
+    boolean createDragonFight -> r
+    boolean piglinSafe -> s
+    boolean bedWorks -> t
+    boolean respawnAnchorWorks -> u
+    boolean hasRaids -> v
+    int logicalHeight -> w
+    net.minecraft.world.level.biome.BiomeZoomer biomeZoomer -> x
+    net.minecraft.resources.ResourceLocation infiniburn -> y
+    float ambientLight -> z
+    float[] brightnessRamp -> A
+    74:74:net.minecraft.world.level.dimension.DimensionType defaultOverworld() -> a
+    78:78:net.minecraft.world.level.dimension.DimensionType defaultOverworldCaves() -> b
+    103:104:void <init>(java.util.OptionalLong,boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean,int,net.minecraft.resources.ResourceLocation,float) -> <init>
+    106:123:void <init>(java.util.OptionalLong,boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean,int,net.minecraft.world.level.biome.BiomeZoomer,net.minecraft.resources.ResourceLocation,float) -> <init>
+    126:134:float[] fillBrightnessRamp(float) -> a
+    140:152:com.mojang.serialization.DataResult parseLegacy(com.mojang.serialization.Dynamic) -> a
+    156:160:net.minecraft.core.RegistryAccess$RegistryHolder registerBuiltin(net.minecraft.core.RegistryAccess$RegistryHolder) -> a
+    164:164:net.minecraft.world.level.chunk.ChunkGenerator defaultEndGenerator(long) -> d
+    168:168:net.minecraft.world.level.chunk.ChunkGenerator defaultNetherGenerator(long) -> e
+    172:177:net.minecraft.core.MappedRegistry defaultDimensions(long) -> a
+    182:185:java.lang.String getFileSuffix() -> c
+    189:198:java.io.File getStorageFolder(net.minecraft.resources.ResourceKey,java.io.File) -> a
+    202:202:boolean hasSkyLight() -> d
+    206:206:boolean hasCeiling() -> e
+    210:210:boolean ultraWarm() -> f
+    214:214:boolean natural() -> g
+    218:218:boolean shrunk() -> h
+    222:222:boolean piglinSafe() -> i
+    226:226:boolean bedWorks() -> j
+    230:230:boolean respawnAnchorWorks() -> k
+    234:234:boolean hasRaids() -> l
+    238:238:int logicalHeight() -> m
+    242:242:boolean createDragonFight() -> n
+    246:246:net.minecraft.world.level.biome.BiomeZoomer getBiomeZoomer() -> o
+    250:250:boolean hasFixedTime() -> p
+    255:260:float timeOfDay(long) -> b
+    265:265:int moonPhase(long) -> c
+    270:270:float brightness(int) -> a
+    274:275:net.minecraft.tags.Tag infiniburn() -> q
+    174:174:net.minecraft.world.level.dimension.DimensionType lambda$defaultDimensions$7() -> r
+    173:173:net.minecraft.world.level.dimension.DimensionType lambda$defaultDimensions$6() -> s
+    36:50:com.mojang.datafixers.kinds.App lambda$static$5(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    49:49:java.lang.Float lambda$null$4(net.minecraft.world.level.dimension.DimensionType) -> a
+    48:48:net.minecraft.resources.ResourceLocation lambda$null$3(net.minecraft.world.level.dimension.DimensionType) -> b
+    37:37:java.util.OptionalLong lambda$null$2(net.minecraft.world.level.dimension.DimensionType) -> c
+    37:37:java.util.Optional lambda$null$1(java.util.OptionalLong) -> a
+    37:37:java.util.OptionalLong lambda$null$0(java.util.Optional) -> a
+    36:81:void <clinit>() -> <clinit>
+net.minecraft.world.level.dimension.LevelStem -> cig:
+    com.mojang.serialization.MapCodec CODEC -> a
+    net.minecraft.resources.ResourceKey OVERWORLD -> b
+    net.minecraft.resources.ResourceKey NETHER -> c
+    net.minecraft.resources.ResourceKey END -> d
+    java.util.LinkedHashSet BUILTIN_ORDER -> e
+    java.util.function.Supplier type -> f
+    net.minecraft.world.level.chunk.ChunkGenerator generator -> g
+    43:46:void <init>(java.util.function.Supplier,net.minecraft.world.level.chunk.ChunkGenerator) -> <init>
+    49:49:java.util.function.Supplier typeSupplier() -> a
+    53:53:net.minecraft.world.level.dimension.DimensionType type() -> b
+    57:57:net.minecraft.world.level.chunk.ChunkGenerator generator() -> c
+    61:81:net.minecraft.core.MappedRegistry sortMap(net.minecraft.core.MappedRegistry) -> a
+    85:144:boolean stable(long,net.minecraft.core.MappedRegistry) -> a
+    25:28:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    25:34:void <clinit>() -> <clinit>
+net.minecraft.world.level.dimension.end.DragonRespawnAnimation -> cih:
     net.minecraft.world.level.dimension.end.DragonRespawnAnimation START -> a
     net.minecraft.world.level.dimension.end.DragonRespawnAnimation PREPARING_TO_SUMMON_PILLARS -> b
     net.minecraft.world.level.dimension.end.DragonRespawnAnimation SUMMONING_PILLARS -> c
@@ -58647,22 +64013,22 @@ net.minecraft.world.level.dimension.end.DragonRespawnAnimation -> cbl:
     void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.dimension.end.EndDragonFight,java.util.List,int,net.minecraft.core.BlockPos) -> a
     17:17:void <init>(java.lang.String,int,net.minecraft.world.level.dimension.end.DragonRespawnAnimation$1) -> <init>
     17:97:void <clinit>() -> <clinit>
-net.minecraft.world.level.dimension.end.DragonRespawnAnimation$1 -> cbl$1:
+net.minecraft.world.level.dimension.end.DragonRespawnAnimation$1 -> cih$1:
     18:18:void <init>(java.lang.String,int) -> <init>
     21:26:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.dimension.end.EndDragonFight,java.util.List,int,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.dimension.end.DragonRespawnAnimation$2 -> cbl$2:
+net.minecraft.world.level.dimension.end.DragonRespawnAnimation$2 -> cih$2:
     28:28:void <init>(java.lang.String,int) -> <init>
     31:38:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.dimension.end.EndDragonFight,java.util.List,int,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.dimension.end.DragonRespawnAnimation$3 -> cbl$3:
+net.minecraft.world.level.dimension.end.DragonRespawnAnimation$3 -> cih$3:
     40:40:void <init>(java.lang.String,int) -> <init>
     43:73:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.dimension.end.EndDragonFight,java.util.List,int,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.dimension.end.DragonRespawnAnimation$4 -> cbl$4:
+net.minecraft.world.level.dimension.end.DragonRespawnAnimation$4 -> cih$4:
     75:75:void <init>(java.lang.String,int) -> <init>
     78:95:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.dimension.end.EndDragonFight,java.util.List,int,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.dimension.end.DragonRespawnAnimation$5 -> cbl$5:
+net.minecraft.world.level.dimension.end.DragonRespawnAnimation$5 -> cih$5:
     97:97:void <init>(java.lang.String,int) -> <init>
     101:101:void tick(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.dimension.end.EndDragonFight,java.util.List,int,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.dimension.end.EndDragonFight -> cbm:
+net.minecraft.world.level.dimension.end.EndDragonFight -> cii:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.function.Predicate VALID_PLAYER -> b
     net.minecraft.server.level.ServerBossEvent dragonEvent -> c
@@ -58681,7 +64047,7 @@ net.minecraft.world.level.dimension.end.EndDragonFight -> cbm:
     net.minecraft.world.level.dimension.end.DragonRespawnAnimation respawnStage -> p
     int respawnTime -> q
     java.util.List respawnCrystals -> r
-    77:172:void <init>(net.minecraft.server.level.ServerLevel,net.minecraft.nbt.CompoundTag) -> <init>
+    77:172:void <init>(net.minecraft.server.level.ServerLevel,long,net.minecraft.nbt.CompoundTag) -> <init>
     175:194:net.minecraft.nbt.CompoundTag saveData() -> a
     198:237:void tick() -> b
     240:273:void scanState() -> g
@@ -58705,302 +64071,368 @@ net.minecraft.world.level.dimension.end.EndDragonFight -> cbm:
     516:537:void respawnDragon(java.util.List) -> a
     540:547:void resetSpikeCrystals() -> f
     66:75:void <clinit>() -> <clinit>
-net.minecraft.world.level.dimension.end.TheEndDimension -> cbn:
-    net.minecraft.core.BlockPos END_SPAWN_POINT -> f
-    net.minecraft.world.level.dimension.end.EndDragonFight dragonFight -> g
-    26:29:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.dimension.DimensionType) -> <init>
-    33:37:net.minecraft.world.level.chunk.ChunkGenerator createRandomLevelGenerator() -> k
-    42:42:float getTimeOfDay(long,float) -> a
-    48:48:float[] getSunriseColor(float,float) -> a
-    53:64:net.minecraft.world.phys.Vec3 getFogColor(float,float) -> b
-    69:69:boolean hasGround() -> b
-    74:74:boolean mayRespawn() -> m
-    79:79:boolean isNaturalDimension() -> l
-    84:84:float getCloudHeight() -> a
-    90:92:net.minecraft.core.BlockPos getSpawnPosInChunk(net.minecraft.world.level.ChunkPos,boolean) -> a
-    97:97:net.minecraft.core.BlockPos getDimensionSpecificSpawn() -> c
-    103:103:net.minecraft.core.BlockPos getValidSpawnPosition(int,int,boolean) -> a
-    109:109:boolean isFoggyAt(int,int) -> a
-    114:114:net.minecraft.world.level.dimension.DimensionType getType() -> n
-    119:124:void saveData() -> i
-    128:131:void tick() -> j
-    135:135:net.minecraft.world.level.dimension.end.EndDragonFight getDragonFight() -> o
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.dimension.end.package-info -> cbo:
-net.minecraft.world.level.dimension.package-info -> cbp:
-net.minecraft.world.level.levelgen.ChunkGeneratorSettings -> cbq:
-    int villagesSpacing -> a
-    int villagesSeparation -> b
-    int monumentsSpacing -> c
-    int monumentsSeparation -> d
-    int strongholdsDistance -> e
-    int strongholdsCount -> f
-    int strongholdsSpread -> g
-    int templesSpacing -> h
-    int templesSeparation -> i
-    int oceanRuinSpacing -> j
-    int oceanRuinSeparation -> k
-    int endCitySpacing -> l
-    int endCitySeparation -> m
-    int shipwreckSpacing -> n
-    int shipwreckSeparation -> o
-    int woodlandMansionSpacing -> p
-    int woodlandMangionSeparation -> q
-    net.minecraft.world.level.block.state.BlockState defaultBlock -> r
-    net.minecraft.world.level.block.state.BlockState defaultFluid -> s
-    7:26:void <init>() -> <init>
-    29:29:int getVillagesSpacing() -> a
-    33:33:int getVillagesSeparation() -> b
-    37:37:int getMonumentsSpacing() -> c
-    41:41:int getMonumentsSeparation() -> d
-    45:45:int getStrongholdsDistance() -> e
-    49:49:int getStrongholdsCount() -> f
-    53:53:int getStrongholdsSpread() -> g
-    57:57:int getTemplesSpacing() -> h
-    61:61:int getTemplesSeparation() -> i
-    65:65:int getShipwreckSpacing() -> j
-    69:69:int getShipwreckSeparation() -> k
-    73:73:int getOceanRuinSpacing() -> l
-    77:77:int getOceanRuinSeparation() -> m
-    81:81:int getEndCitySpacing() -> n
-    85:85:int getEndCitySeparation() -> o
-    89:89:int getWoodlandMansionSpacing() -> p
-    93:93:int getWoodlandMangionSeparation() -> q
-    97:97:net.minecraft.world.level.block.state.BlockState getDefaultBlock() -> r
-    101:101:net.minecraft.world.level.block.state.BlockState getDefaultFluid() -> s
-    105:106:void setDefaultBlock(net.minecraft.world.level.block.state.BlockState) -> a
-    109:110:void setDefaultFluid(net.minecraft.world.level.block.state.BlockState) -> b
-    113:113:int getBedrockRoofPosition() -> t
-    117:117:int getBedrockFloorPosition() -> u
-net.minecraft.world.level.levelgen.DebugGeneratorSettings -> cbr:
-    3:3:void <init>() -> <init>
-net.minecraft.world.level.levelgen.DebugLevelSource -> cbs:
-    java.util.List ALL_BLOCKS -> g
-    int GRID_WIDTH -> h
-    int GRID_HEIGHT -> i
-    net.minecraft.world.level.block.state.BlockState AIR -> e
-    net.minecraft.world.level.block.state.BlockState BARRIER -> f
-    31:32:void <init>(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.DebugGeneratorSettings) -> <init>
-    36:36:void buildSurfaceAndBedrock(net.minecraft.server.level.WorldGenRegion,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    40:40:void applyCarvers(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
-    44:44:int getSpawnHeight() -> b
-    49:65:void applyBiomeDecoration(net.minecraft.server.level.WorldGenRegion) -> a
-    69:69:void fillFromNoise(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkAccess) -> b
-    73:73:int getBaseHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> a
-    77:91:net.minecraft.world.level.block.state.BlockState getBlockStateFor(int,int) -> a
-    23:23:java.util.stream.Stream lambda$static$0(net.minecraft.world.level.block.Block) -> a
-    23:28:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.FlatLevelSource -> cbt:
-    net.minecraft.world.level.biome.Biome biomeWrapper -> e
-    net.minecraft.world.level.levelgen.PhantomSpawner phantomSpawner -> f
-    net.minecraft.world.entity.npc.CatSpawner catSpawner -> g
-    36:59:void <init>(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> <init>
-    62:120:net.minecraft.world.level.biome.Biome getBiomeFromSettings() -> g
-    125:125:void buildSurfaceAndBedrock(net.minecraft.server.level.WorldGenRegion,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    129:130:int getSpawnHeight() -> b
-    135:135:net.minecraft.world.level.biome.Biome getCarvingOrDecorationBiome(net.minecraft.world.level.biome.BiomeManager,net.minecraft.core.BlockPos) -> a
-    142:162:void fillFromNoise(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkAccess) -> b
-    166:176:int getBaseHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> a
-    181:183:void tickCustomSpawners(net.minecraft.server.level.ServerLevel,boolean,boolean) -> a
-    187:187:boolean isBiomeValidStartForStructure(net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
-    193:193:net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration getStructureConfiguration(net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.StructureFeature) -> b
-    199:202:net.minecraft.core.BlockPos findNearestMapFeature(net.minecraft.world.level.Level,java.lang.String,net.minecraft.core.BlockPos,int,boolean) -> a
-net.minecraft.world.level.levelgen.FlatLevelSource$FlatLevelBiomeWrapper -> cbt$a:
-    net.minecraft.world.level.levelgen.FlatLevelSource this$0 -> u
-    40:53:void <init>(net.minecraft.world.level.levelgen.FlatLevelSource,net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder,net.minecraft.world.level.biome.Biome$Precipitation,net.minecraft.world.level.biome.Biome$BiomeCategory,float,float,float,float,int,int,java.lang.String) -> <init>
-net.minecraft.world.level.levelgen.GenerationStep -> cbu:
-    7:7:void <init>() -> <init>
-net.minecraft.world.level.levelgen.GenerationStep$Carving -> cbu$a:
+net.minecraft.world.level.dimension.end.package-info -> cij:
+net.minecraft.world.level.dimension.package-info -> cik:
+net.minecraft.world.level.levelgen.DebugLevelSource -> cil:
+    net.minecraft.world.level.levelgen.DebugLevelSource INSTANCE -> d
+    com.mojang.serialization.Codec CODEC -> e
+    java.util.List ALL_BLOCKS -> h
+    int GRID_WIDTH -> i
+    int GRID_HEIGHT -> j
+    net.minecraft.world.level.block.state.BlockState AIR -> f
+    net.minecraft.world.level.block.state.BlockState BARRIER -> g
+    43:44:void <init>() -> <init>
+    48:48:com.mojang.serialization.Codec codec() -> a
+    53:53:net.minecraft.world.level.chunk.ChunkGenerator withSeed(long) -> a
+    58:58:void buildSurfaceAndBedrock(net.minecraft.server.level.WorldGenRegion,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    62:62:void applyCarvers(long,net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
+    66:82:void applyBiomeDecoration(net.minecraft.server.level.WorldGenRegion,net.minecraft.world.level.StructureFeatureManager) -> a
+    86:86:void fillFromNoise(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkAccess) -> b
+    90:90:int getBaseHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> a
+    95:95:net.minecraft.world.level.BlockGetter getBaseColumn(int,int) -> a
+    99:113:net.minecraft.world.level.block.state.BlockState getBlockStateFor(int,int) -> b
+    35:35:java.util.stream.Stream lambda$static$1(net.minecraft.world.level.block.Block) -> a
+    32:32:net.minecraft.world.level.levelgen.DebugLevelSource lambda$static$0() -> g
+    30:40:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.FlatLevelSource -> cim:
+    com.mojang.serialization.Codec CODEC -> d
+    net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings settings -> e
+    26:28:void <init>(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> <init>
+    32:32:com.mojang.serialization.Codec codec() -> a
+    37:37:net.minecraft.world.level.chunk.ChunkGenerator withSeed(long) -> a
+    41:41:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings settings() -> g
+    46:46:void buildSurfaceAndBedrock(net.minecraft.server.level.WorldGenRegion,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    50:57:int getSpawnHeight() -> c
+    64:84:void fillFromNoise(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkAccess) -> b
+    88:98:int getBaseHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> a
+    103:103:net.minecraft.world.level.BlockGetter getBaseColumn(int,int) -> a
+    103:103:net.minecraft.world.level.block.state.BlockState[] lambda$getBaseColumn$1(int) -> a
+    103:103:net.minecraft.world.level.block.state.BlockState lambda$getBaseColumn$0(net.minecraft.world.level.block.state.BlockState) -> a
+    21:21:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.GenerationStep -> cin:
+    11:11:void <init>() -> <init>
+net.minecraft.world.level.levelgen.GenerationStep$Carving -> cin$a:
     net.minecraft.world.level.levelgen.GenerationStep$Carving AIR -> a
     net.minecraft.world.level.levelgen.GenerationStep$Carving LIQUID -> b
-    java.util.Map BY_NAME -> c
-    java.lang.String name -> d
-    net.minecraft.world.level.levelgen.GenerationStep$Carving[] $VALUES -> e
-    35:35:net.minecraft.world.level.levelgen.GenerationStep$Carving[] values() -> values
-    35:35:net.minecraft.world.level.levelgen.GenerationStep$Carving valueOf(java.lang.String) -> valueOf
-    43:45:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    48:48:java.lang.String getName() -> a
-    52:52:net.minecraft.world.level.levelgen.GenerationStep$Carving byName(java.lang.String) -> a
-    40:40:net.minecraft.world.level.levelgen.GenerationStep$Carving lambda$static$0(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
-    35:40:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.GenerationStep$Decoration -> cbu$b:
+    com.mojang.serialization.Codec CODEC -> c
+    java.util.Map BY_NAME -> d
+    java.lang.String name -> e
+    net.minecraft.world.level.levelgen.GenerationStep$Carving[] $VALUES -> f
+    48:48:net.minecraft.world.level.levelgen.GenerationStep$Carving[] values() -> values
+    48:48:net.minecraft.world.level.levelgen.GenerationStep$Carving valueOf(java.lang.String) -> valueOf
+    58:60:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    63:63:java.lang.String getName() -> b
+    68:68:net.minecraft.world.level.levelgen.GenerationStep$Carving byName(java.lang.String) -> a
+    73:73:java.lang.String getSerializedName() -> a
+    55:55:net.minecraft.world.level.levelgen.GenerationStep$Carving lambda$static$0(net.minecraft.world.level.levelgen.GenerationStep$Carving) -> a
+    48:55:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.GenerationStep$Decoration -> cin$b:
     net.minecraft.world.level.levelgen.GenerationStep$Decoration RAW_GENERATION -> a
-    net.minecraft.world.level.levelgen.GenerationStep$Decoration LOCAL_MODIFICATIONS -> b
-    net.minecraft.world.level.levelgen.GenerationStep$Decoration UNDERGROUND_STRUCTURES -> c
-    net.minecraft.world.level.levelgen.GenerationStep$Decoration SURFACE_STRUCTURES -> d
-    net.minecraft.world.level.levelgen.GenerationStep$Decoration UNDERGROUND_ORES -> e
-    net.minecraft.world.level.levelgen.GenerationStep$Decoration UNDERGROUND_DECORATION -> f
-    net.minecraft.world.level.levelgen.GenerationStep$Decoration VEGETAL_DECORATION -> g
-    net.minecraft.world.level.levelgen.GenerationStep$Decoration TOP_LAYER_MODIFICATION -> h
-    java.util.Map BY_NAME -> i
-    java.lang.String name -> j
-    net.minecraft.world.level.levelgen.GenerationStep$Decoration[] $VALUES -> k
-    8:8:net.minecraft.world.level.levelgen.GenerationStep$Decoration[] values() -> values
-    8:8:net.minecraft.world.level.levelgen.GenerationStep$Decoration valueOf(java.lang.String) -> valueOf
-    22:24:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    27:27:java.lang.String getName() -> a
-    31:31:net.minecraft.world.level.levelgen.GenerationStep$Decoration byName(java.lang.String) -> a
-    19:19:net.minecraft.world.level.levelgen.GenerationStep$Decoration lambda$static$0(net.minecraft.world.level.levelgen.GenerationStep$Decoration) -> a
-    8:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.Heightmap -> cbv:
+    net.minecraft.world.level.levelgen.GenerationStep$Decoration LAKES -> b
+    net.minecraft.world.level.levelgen.GenerationStep$Decoration LOCAL_MODIFICATIONS -> c
+    net.minecraft.world.level.levelgen.GenerationStep$Decoration UNDERGROUND_STRUCTURES -> d
+    net.minecraft.world.level.levelgen.GenerationStep$Decoration SURFACE_STRUCTURES -> e
+    net.minecraft.world.level.levelgen.GenerationStep$Decoration STRONGHOLDS -> f
+    net.minecraft.world.level.levelgen.GenerationStep$Decoration UNDERGROUND_ORES -> g
+    net.minecraft.world.level.levelgen.GenerationStep$Decoration UNDERGROUND_DECORATION -> h
+    net.minecraft.world.level.levelgen.GenerationStep$Decoration VEGETAL_DECORATION -> i
+    net.minecraft.world.level.levelgen.GenerationStep$Decoration TOP_LAYER_MODIFICATION -> j
+    com.mojang.serialization.Codec CODEC -> k
+    java.util.Map BY_NAME -> l
+    java.lang.String name -> m
+    net.minecraft.world.level.levelgen.GenerationStep$Decoration[] $VALUES -> n
+    12:12:net.minecraft.world.level.levelgen.GenerationStep$Decoration[] values() -> values
+    12:12:net.minecraft.world.level.levelgen.GenerationStep$Decoration valueOf(java.lang.String) -> valueOf
+    30:32:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    35:35:java.lang.String getName() -> b
+    39:39:net.minecraft.world.level.levelgen.GenerationStep$Decoration byName(java.lang.String) -> a
+    44:44:java.lang.String getSerializedName() -> a
+    27:27:net.minecraft.world.level.levelgen.GenerationStep$Decoration lambda$static$0(net.minecraft.world.level.levelgen.GenerationStep$Decoration) -> a
+    12:27:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.Heightmap -> cio:
     java.util.function.Predicate NOT_AIR -> a
     java.util.function.Predicate MATERIAL_MOTION_BLOCKING -> b
     net.minecraft.util.BitStorage data -> c
     java.util.function.Predicate isOpaque -> d
     net.minecraft.world.level.chunk.ChunkAccess chunk -> e
-    78:85:void <init>(net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.levelgen.Heightmap$Types) -> <init>
-    88:121:void primeHeightmaps(net.minecraft.world.level.chunk.ChunkAccess,java.util.Set) -> a
-    124:151:boolean update(int,int,int,net.minecraft.world.level.block.state.BlockState) -> a
-    155:155:int getFirstAvailable(int,int) -> a
-    159:159:int getHighestTaken(int,int) -> b
-    163:163:int getFirstAvailable(int) -> a
-    167:168:void setHeight(int,int,int) -> a
-    171:172:void setRawData(long[]) -> a
-    175:175:long[] getRawData() -> a
-    179:179:int getIndex(int,int) -> c
-    22:22:boolean lambda$static$1(net.minecraft.world.level.block.state.BlockState) -> a
-    21:21:boolean lambda$static$0(net.minecraft.world.level.block.state.BlockState) -> b
-    20:20:java.util.function.Predicate access$000() -> b
-    20:20:java.util.function.Predicate access$100() -> c
-    21:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.Heightmap$Types -> cbv$a:
+    89:96:void <init>(net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.levelgen.Heightmap$Types) -> <init>
+    99:131:void primeHeightmaps(net.minecraft.world.level.chunk.ChunkAccess,java.util.Set) -> a
+    134:161:boolean update(int,int,int,net.minecraft.world.level.block.state.BlockState) -> a
+    165:165:int getFirstAvailable(int,int) -> a
+    169:169:int getHighestTaken(int,int) -> b
+    173:173:int getFirstAvailable(int) -> a
+    177:178:void setHeight(int,int,int) -> a
+    181:182:void setRawData(long[]) -> a
+    185:185:long[] getRawData() -> a
+    189:189:int getIndex(int,int) -> c
+    25:25:boolean lambda$static$1(net.minecraft.world.level.block.state.BlockState) -> a
+    24:24:boolean lambda$static$0(net.minecraft.world.level.block.state.BlockState) -> b
+    23:23:java.util.function.Predicate access$000() -> b
+    23:23:java.util.function.Predicate access$100() -> c
+    24:25:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.Heightmap$Types -> cio$a:
     net.minecraft.world.level.levelgen.Heightmap$Types WORLD_SURFACE_WG -> a
     net.minecraft.world.level.levelgen.Heightmap$Types WORLD_SURFACE -> b
     net.minecraft.world.level.levelgen.Heightmap$Types OCEAN_FLOOR_WG -> c
     net.minecraft.world.level.levelgen.Heightmap$Types OCEAN_FLOOR -> d
     net.minecraft.world.level.levelgen.Heightmap$Types MOTION_BLOCKING -> e
     net.minecraft.world.level.levelgen.Heightmap$Types MOTION_BLOCKING_NO_LEAVES -> f
-    java.lang.String serializationKey -> g
-    net.minecraft.world.level.levelgen.Heightmap$Usage usage -> h
-    java.util.function.Predicate isOpaque -> i
-    java.util.Map REVERSE_LOOKUP -> j
-    net.minecraft.world.level.levelgen.Heightmap$Types[] $VALUES -> k
-    31:31:net.minecraft.world.level.levelgen.Heightmap$Types[] values() -> values
-    31:31:net.minecraft.world.level.levelgen.Heightmap$Types valueOf(java.lang.String) -> valueOf
-    51:55:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.levelgen.Heightmap$Usage,java.util.function.Predicate) -> <init>
-    58:58:java.lang.String getSerializationKey() -> a
-    62:62:boolean sendToClient() -> b
-    66:66:boolean keepAfterWorldgen() -> c
-    70:70:net.minecraft.world.level.levelgen.Heightmap$Types getFromKey(java.lang.String) -> a
-    74:74:java.util.function.Predicate isOpaque() -> d
-    46:49:void lambda$static$2(java.util.HashMap) -> a
-    37:37:boolean lambda$static$1(net.minecraft.world.level.block.state.BlockState) -> a
-    36:36:boolean lambda$static$0(net.minecraft.world.level.block.state.BlockState) -> b
-    31:45:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.Heightmap$Usage -> cbv$b:
+    com.mojang.serialization.Codec CODEC -> g
+    java.lang.String serializationKey -> h
+    net.minecraft.world.level.levelgen.Heightmap$Usage usage -> i
+    java.util.function.Predicate isOpaque -> j
+    java.util.Map REVERSE_LOOKUP -> k
+    net.minecraft.world.level.levelgen.Heightmap$Types[] $VALUES -> l
+    34:34:net.minecraft.world.level.levelgen.Heightmap$Types[] values() -> values
+    34:34:net.minecraft.world.level.levelgen.Heightmap$Types valueOf(java.lang.String) -> valueOf
+    56:60:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.levelgen.Heightmap$Usage,java.util.function.Predicate) -> <init>
+    63:63:java.lang.String getSerializationKey() -> b
+    67:67:boolean sendToClient() -> c
+    71:71:boolean keepAfterWorldgen() -> d
+    76:76:net.minecraft.world.level.levelgen.Heightmap$Types getFromKey(java.lang.String) -> a
+    80:80:java.util.function.Predicate isOpaque() -> e
+    85:85:java.lang.String getSerializedName() -> a
+    51:54:void lambda$static$2(java.util.HashMap) -> a
+    40:40:boolean lambda$static$1(net.minecraft.world.level.block.state.BlockState) -> a
+    39:39:boolean lambda$static$0(net.minecraft.world.level.block.state.BlockState) -> b
+    34:50:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.Heightmap$Usage -> cio$b:
     net.minecraft.world.level.levelgen.Heightmap$Usage WORLDGEN -> a
     net.minecraft.world.level.levelgen.Heightmap$Usage LIVE_WORLD -> b
     net.minecraft.world.level.levelgen.Heightmap$Usage CLIENT -> c
     net.minecraft.world.level.levelgen.Heightmap$Usage[] $VALUES -> d
-    24:24:net.minecraft.world.level.levelgen.Heightmap$Usage[] values() -> values
-    24:24:net.minecraft.world.level.levelgen.Heightmap$Usage valueOf(java.lang.String) -> valueOf
-    24:24:void <init>(java.lang.String,int) -> <init>
-    24:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.NetherGeneratorSettings -> cbw:
-    5:5:void <init>() -> <init>
-    8:8:int getBedrockFloorPosition() -> u
-    13:13:int getBedrockRoofPosition() -> t
-net.minecraft.world.level.levelgen.NetherLevelSource -> cbx:
-    double[] yOffsets -> h
-    14:18:void <init>(net.minecraft.world.level.Level,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.NetherGeneratorSettings) -> <init>
-    22:32:void fillNoiseColumn(double[],int,int) -> a
-    36:36:double[] getDepthAndScale(int,int) -> a
-    41:41:double getYOffset(double,double,int) -> a
-    45:58:double[] makeYOffsets() -> j
-    64:73:java.util.List getMobsAt(net.minecraft.world.entity.MobCategory,net.minecraft.core.BlockPos) -> a
-    78:78:int getSpawnHeight() -> b
-    83:83:int getGenDepth() -> e
-    88:88:int getSeaLevel() -> f
-net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator -> cby:
-    float[] BEARD_KERNEL -> h
-    net.minecraft.world.level.block.state.BlockState AIR -> i
-    int chunkHeight -> j
-    int chunkWidth -> k
-    int chunkCountX -> l
-    int chunkCountY -> m
-    int chunkCountZ -> n
+    27:27:net.minecraft.world.level.levelgen.Heightmap$Usage[] values() -> values
+    27:27:net.minecraft.world.level.levelgen.Heightmap$Usage valueOf(java.lang.String) -> valueOf
+    27:27:void <init>(java.lang.String,int) -> <init>
+    27:30:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator -> cip:
+    com.mojang.serialization.Codec CODEC -> d
+    float[] BEARD_KERNEL -> i
+    float[] BIOME_WEIGHTS -> j
+    net.minecraft.world.level.block.state.BlockState AIR -> k
+    int chunkHeight -> l
+    int chunkWidth -> m
+    int chunkCountX -> n
+    int chunkCountY -> o
+    int chunkCountZ -> p
     net.minecraft.world.level.levelgen.WorldgenRandom random -> e
-    net.minecraft.world.level.levelgen.synth.PerlinNoise minLimitPerlinNoise -> o
-    net.minecraft.world.level.levelgen.synth.PerlinNoise maxLimitPerlinNoise -> p
-    net.minecraft.world.level.levelgen.synth.PerlinNoise mainPerlinNoise -> q
-    net.minecraft.world.level.levelgen.synth.SurfaceNoise surfaceNoise -> r
+    net.minecraft.world.level.levelgen.synth.PerlinNoise minLimitPerlinNoise -> q
+    net.minecraft.world.level.levelgen.synth.PerlinNoise maxLimitPerlinNoise -> r
+    net.minecraft.world.level.levelgen.synth.PerlinNoise mainPerlinNoise -> s
+    net.minecraft.world.level.levelgen.synth.SurfaceNoise surfaceNoise -> t
+    net.minecraft.world.level.levelgen.synth.PerlinNoise depthNoise -> u
+    net.minecraft.world.level.levelgen.synth.SimplexNoise islandNoise -> v
     net.minecraft.world.level.block.state.BlockState defaultBlock -> f
     net.minecraft.world.level.block.state.BlockState defaultFluid -> g
-    68:84:void <init>(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.biome.BiomeSource,int,int,int,net.minecraft.world.level.levelgen.ChunkGeneratorSettings,boolean) -> <init>
-    87:115:double sampleAndClampNoise(int,int,int,double,double,double,double) -> a
-    119:121:double[] makeAndFillNoiseColumn(int,int) -> b
-    125:145:void fillNoiseColumn(double[],int,int,double,double,double,double,int,int) -> a
-    double[] getDepthAndScale(int,int) -> a
-    double getYOffset(double,double,int) -> a
-    152:152:double getTopSlideStart() -> g
-    156:156:double getBottomSlideStart() -> h
-    161:214:int getBaseHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> a
-    void fillNoiseColumn(double[],int,int) -> a
-    220:220:int getNoiseSizeY() -> i
-    225:251:void buildSurfaceAndBedrock(net.minecraft.server.level.WorldGenRegion,net.minecraft.world.level.chunk.ChunkAccess) -> a
-    254:278:void setBedrock(net.minecraft.world.level.chunk.ChunkAccess,java.util.Random) -> a
-    282:464:void fillFromNoise(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkAccess) -> b
-    467:480:double getContribution(int,int,int) -> a
-    484:493:double computeContribution(int,int,int) -> b
-    41:48:void lambda$static$0(float[]) -> a
-    40:50:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.OverworldGeneratorSettings -> cbz:
-    int biomeSize -> t
-    int riverSize -> u
-    int fixedBiome -> v
-    int seaLevel -> w
-    3:10:void <init>() -> <init>
-    13:13:int getBiomeSize() -> v
-    17:17:int getRiverSize() -> w
-    21:21:int getFixedBiome() -> x
-    25:25:int getSeaLevel() -> y
-    30:30:int getBedrockFloorPosition() -> u
-net.minecraft.world.level.levelgen.OverworldLevelSource -> cca:
-    float[] BIOME_WEIGHTS -> h
-    net.minecraft.world.level.levelgen.synth.PerlinNoise depthNoise -> i
-    boolean isAmplified -> j
-    net.minecraft.world.level.levelgen.PhantomSpawner phantomSpawner -> k
-    net.minecraft.world.level.levelgen.PatrolSpawner patrolSpawner -> l
-    net.minecraft.world.entity.npc.CatSpawner catSpawner -> m
-    net.minecraft.world.entity.ai.village.VillageSiege villageSiege -> n
-    36:46:void <init>(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.OverworldGeneratorSettings) -> <init>
-    50:57:void spawnOriginalMobs(net.minecraft.server.level.WorldGenRegion) -> b
-    62:72:void fillNoiseColumn(double[],int,int) -> a
-    76:83:double getYOffset(double,double,int) -> a
-    88:130:double[] getDepthAndScale(int,int) -> a
-    134:151:double getRdepth(int,int) -> c
-    157:171:java.util.List getMobsAt(net.minecraft.world.entity.MobCategory,net.minecraft.core.BlockPos) -> a
-    176:180:void tickCustomSpawners(net.minecraft.server.level.ServerLevel,boolean,boolean) -> a
-    184:184:int getSpawnHeight() -> b
-    189:189:int getSeaLevel() -> f
-    26:32:void lambda$static$0(float[]) -> a
-    25:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.PatrolSpawner -> ccb:
+    long seed -> w
+    net.minecraft.world.level.levelgen.NoiseGeneratorSettings settings -> h
+    int height -> x
+    101:102:void <init>(net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.NoiseGeneratorSettings) -> <init>
+    105:138:void <init>(net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.NoiseGeneratorSettings) -> <init>
+    142:142:com.mojang.serialization.Codec codec() -> a
+    147:147:net.minecraft.world.level.chunk.ChunkGenerator withSeed(long) -> a
+    151:151:boolean stable(long,net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> a
+    155:192:double sampleAndClampNoise(int,int,int,double,double,double,double) -> a
+    196:198:double[] makeAndFillNoiseColumn(int,int) -> b
+    205:346:void fillNoiseColumn(double[],int,int) -> a
+    350:367:double getRandomDensity(int,int) -> c
+    373:373:int getBaseHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types) -> a
+    378:380:net.minecraft.world.level.BlockGetter getBaseColumn(int,int) -> a
+    384:430:int iterateNoiseColumn(int,int,net.minecraft.world.level.block.state.BlockState[],java.util.function.Predicate) -> a
+    435:444:net.minecraft.world.level.block.state.BlockState generateBaseState(double,int) -> a
+    449:475:void buildSurfaceAndBedrock(net.minecraft.server.level.WorldGenRegion,net.minecraft.world.level.chunk.ChunkAccess) -> a
+    478:512:void setBedrock(net.minecraft.world.level.chunk.ChunkAccess,java.util.Random) -> a
+    516:676:void fillFromNoise(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkAccess) -> b
+    679:692:double getContribution(int,int,int) -> a
+    696:705:double computeContribution(int,int,int) -> b
+    710:710:int getGenDepth() -> e
+    715:715:int getSeaLevel() -> f
+    721:738:java.util.List getMobsAt(net.minecraft.world.level.biome.Biome,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.entity.MobCategory,net.minecraft.core.BlockPos) -> a
+    744:754:void spawnOriginalMobs(net.minecraft.server.level.WorldGenRegion) -> a
+    530:559:void lambda$fillFromNoise$6(net.minecraft.world.level.ChunkPos,it.unimi.dsi.fastutil.objects.ObjectList,int,int,it.unimi.dsi.fastutil.objects.ObjectList,net.minecraft.world.level.levelgen.structure.StructureStart) -> a
+    68:74:void lambda$static$5(float[]) -> a
+    58:65:void lambda$static$4(float[]) -> b
+    49:53:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    52:52:net.minecraft.world.level.levelgen.NoiseGeneratorSettings lambda$null$2(net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator) -> a
+    51:51:java.lang.Long lambda$null$1(net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator) -> b
+    50:50:net.minecraft.world.level.biome.BiomeSource lambda$null$0(net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator) -> c
+    49:76:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.NoiseGeneratorSettings -> ciq:
+    com.mojang.serialization.Codec DIRECT_CODEC -> a
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.world.level.levelgen.StructureSettings structureSettings -> c
+    net.minecraft.world.level.levelgen.NoiseSettings noiseSettings -> d
+    net.minecraft.world.level.block.state.BlockState defaultBlock -> e
+    net.minecraft.world.level.block.state.BlockState defaultFluid -> f
+    int bedrockRoofPosition -> g
+    int bedrockFloorPosition -> h
+    int seaLevel -> i
+    boolean disableMobGeneration -> j
+    java.util.Optional preset -> k
+    55:56:void <init>(net.minecraft.world.level.levelgen.StructureSettings,net.minecraft.world.level.levelgen.NoiseSettings,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,int,int,boolean) -> <init>
+    58:72:void <init>(net.minecraft.world.level.levelgen.StructureSettings,net.minecraft.world.level.levelgen.NoiseSettings,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,int,int,boolean,java.util.Optional) -> <init>
+    75:75:net.minecraft.world.level.levelgen.StructureSettings structureSettings() -> a
+    79:79:net.minecraft.world.level.levelgen.NoiseSettings noiseSettings() -> b
+    83:83:net.minecraft.world.level.block.state.BlockState getDefaultBlock() -> c
+    87:87:net.minecraft.world.level.block.state.BlockState getDefaultFluid() -> d
+    91:91:int getBedrockRoofPosition() -> e
+    95:95:int getBedrockFloorPosition() -> f
+    99:99:int seaLevel() -> g
+    104:104:boolean disableMobGeneration() -> h
+    108:108:boolean stable(net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> a
+    38:38:com.mojang.datafixers.util.Either lambda$static$3(net.minecraft.world.level.levelgen.NoiseGeneratorSettings) -> a
+    38:38:com.mojang.datafixers.util.Either lambda$null$2(net.minecraft.world.level.levelgen.NoiseGeneratorSettings) -> b
+    37:37:net.minecraft.world.level.levelgen.NoiseGeneratorSettings lambda$static$1(com.mojang.datafixers.util.Either) -> a
+    25:34:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    24:24:void <init>(net.minecraft.world.level.levelgen.StructureSettings,net.minecraft.world.level.levelgen.NoiseSettings,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,int,int,boolean,java.util.Optional,net.minecraft.world.level.levelgen.NoiseGeneratorSettings$1) -> <init>
+    25:36:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.NoiseGeneratorSettings$1 -> ciq$1:
+net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset -> ciq$a:
+    java.util.Map BY_NAME -> h
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset OVERWORLD -> b
+    net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset AMPLIFIED -> c
+    net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset NETHER -> d
+    net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset END -> e
+    net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset CAVES -> f
+    net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset FLOATING_ISLANDS -> g
+    net.minecraft.network.chat.Component description -> i
+    net.minecraft.resources.ResourceLocation name -> j
+    net.minecraft.world.level.levelgen.NoiseGeneratorSettings settings -> k
+    130:135:void <init>(java.lang.String,java.util.function.Function) -> <init>
+    138:138:net.minecraft.network.chat.Component description() -> a
+    142:142:net.minecraft.world.level.levelgen.NoiseGeneratorSettings settings() -> b
+    146:166:net.minecraft.world.level.levelgen.NoiseGeneratorSettings end(net.minecraft.world.level.levelgen.StructureSettings,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset,boolean,boolean) -> a
+    171:194:net.minecraft.world.level.levelgen.NoiseGeneratorSettings nether(net.minecraft.world.level.levelgen.StructureSettings,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> a
+    203:224:net.minecraft.world.level.levelgen.NoiseGeneratorSettings overworld(net.minecraft.world.level.levelgen.StructureSettings,boolean,net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> a
+    124:124:net.minecraft.world.level.levelgen.NoiseGeneratorSettings lambda$static$8(net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> a
+    123:123:net.minecraft.world.level.levelgen.NoiseGeneratorSettings lambda$static$7(net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> b
+    122:122:net.minecraft.world.level.levelgen.NoiseGeneratorSettings lambda$static$6(net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> c
+    121:121:net.minecraft.world.level.levelgen.NoiseGeneratorSettings lambda$static$5(net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> d
+    120:120:net.minecraft.world.level.levelgen.NoiseGeneratorSettings lambda$static$4(net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> e
+    119:119:net.minecraft.world.level.levelgen.NoiseGeneratorSettings lambda$static$3(net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> f
+    116:116:com.mojang.serialization.DataResult lambda$static$2(net.minecraft.world.level.levelgen.NoiseGeneratorSettings$Preset) -> g
+    115:115:com.mojang.serialization.DataResult lambda$static$1(net.minecraft.resources.ResourceLocation) -> a
+    115:115:com.mojang.serialization.DataResult lambda$null$0(net.minecraft.resources.ResourceLocation) -> b
+    112:124:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.NoiseSamplingSettings -> cir:
+    com.mojang.serialization.Codec SCALE_RANGE -> b
+    com.mojang.serialization.Codec CODEC -> a
+    double xzScale -> c
+    double yScale -> d
+    double xzFactor -> e
+    double yFactor -> f
+    22:27:void <init>(double,double,double,double) -> <init>
+    30:30:double xzScale() -> a
+    34:34:double yScale() -> b
+    38:38:double xzFactor() -> c
+    42:42:double yFactor() -> d
+    10:15:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    8:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.NoiseSettings -> cis:
+    com.mojang.serialization.Codec CODEC -> a
+    int height -> b
+    net.minecraft.world.level.levelgen.NoiseSamplingSettings noiseSamplingSettings -> c
+    net.minecraft.world.level.levelgen.NoiseSlideSettings topSlideSettings -> d
+    net.minecraft.world.level.levelgen.NoiseSlideSettings bottomSlideSettings -> e
+    int noiseSizeHorizontal -> f
+    int noiseSizeVertical -> g
+    double densityFactor -> h
+    double densityOffset -> i
+    boolean useSimplexSurfaceNoise -> j
+    boolean randomDensityOffset -> k
+    boolean islandNoiseOverride -> l
+    boolean isAmplified -> m
+    45:63:void <init>(int,net.minecraft.world.level.levelgen.NoiseSamplingSettings,net.minecraft.world.level.levelgen.NoiseSlideSettings,net.minecraft.world.level.levelgen.NoiseSlideSettings,int,int,double,double,boolean,boolean,boolean,boolean) -> <init>
+    66:66:int height() -> a
+    70:70:net.minecraft.world.level.levelgen.NoiseSamplingSettings noiseSamplingSettings() -> b
+    74:74:net.minecraft.world.level.levelgen.NoiseSlideSettings topSlideSettings() -> c
+    78:78:net.minecraft.world.level.levelgen.NoiseSlideSettings bottomSlideSettings() -> d
+    82:82:int noiseSizeHorizontal() -> e
+    86:86:int noiseSizeVertical() -> f
+    90:90:double densityFactor() -> g
+    94:94:double densityOffset() -> h
+    99:99:boolean useSimplexSurfaceNoise() -> i
+    104:104:boolean randomDensityOffset() -> j
+    109:109:boolean islandNoiseOverride() -> k
+    114:114:boolean isAmplified() -> l
+    10:23:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.NoiseSlideSettings -> cit:
+    com.mojang.serialization.Codec CODEC -> a
+    int target -> b
+    int size -> c
+    int offset -> d
+    19:23:void <init>(int,int,int) -> <init>
+    26:26:int target() -> a
+    30:30:int size() -> b
+    34:34:int offset() -> c
+    9:13:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.PatrolSpawner -> ciu:
     int nextTick -> a
     19:19:void <init>() -> <init>
     24:98:int tick(net.minecraft.server.level.ServerLevel,boolean,boolean) -> a
     102:125:boolean spawnPatrolMember(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random,boolean) -> a
-net.minecraft.world.level.levelgen.PhantomSpawner -> ccc:
+net.minecraft.world.level.levelgen.PhantomSpawner -> civ:
     int nextTick -> a
     25:25:void <init>() -> <init>
     30:89:int tick(net.minecraft.server.level.ServerLevel,boolean,boolean) -> a
-net.minecraft.world.level.levelgen.TheEndGeneratorSettings -> ccd:
-    net.minecraft.core.BlockPos spawnPosition -> t
-    5:5:void <init>() -> <init>
-    9:10:net.minecraft.world.level.levelgen.TheEndGeneratorSettings setSpawnPosition(net.minecraft.core.BlockPos) -> a
-    14:14:net.minecraft.core.BlockPos getSpawnPosition() -> v
-net.minecraft.world.level.levelgen.TheEndLevelSource -> cce:
-    net.minecraft.core.BlockPos dimensionSpawnPosition -> h
-    12:14:void <init>(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.TheEndGeneratorSettings) -> <init>
-    18:28:void fillNoiseColumn(double[],int,int) -> a
-    32:32:double[] getDepthAndScale(int,int) -> a
-    37:37:double getYOffset(double,double,int) -> a
-    42:42:double getTopSlideStart() -> g
-    47:47:double getBottomSlideStart() -> h
-    51:51:net.minecraft.core.BlockPos getDimensionSpawnPosition() -> j
-    56:56:int getSpawnHeight() -> b
-    61:61:int getSeaLevel() -> f
-net.minecraft.world.level.levelgen.WorldgenRandom -> ccf:
+net.minecraft.world.level.levelgen.StructureSettings -> ciw:
+    com.mojang.serialization.Codec CODEC -> a
+    com.google.common.collect.ImmutableMap DEFAULTS -> b
+    net.minecraft.world.level.levelgen.feature.configurations.StrongholdConfiguration DEFAULT_STRONGHOLD -> c
+    java.util.Map structureConfig -> d
+    net.minecraft.world.level.levelgen.feature.configurations.StrongholdConfiguration stronghold -> e
+    68:71:void <init>(java.util.Optional,java.util.Map) -> <init>
+    73:76:void <init>(boolean) -> <init>
+    79:79:java.util.Map structureConfig() -> a
+    83:83:net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration getConfig(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    88:88:net.minecraft.world.level.levelgen.feature.configurations.StrongholdConfiguration stronghold() -> b
+    24:27:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    26:26:java.util.Map lambda$null$1(net.minecraft.world.level.levelgen.StructureSettings) -> a
+    25:25:java.util.Optional lambda$null$0(net.minecraft.world.level.levelgen.StructureSettings) -> b
+    24:61:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.WorldGenSettings -> cix:
+    com.mojang.serialization.Codec CODEC -> a
+    org.apache.logging.log4j.Logger LOGGER -> c
+    int DEMO_SEED -> d
+    net.minecraft.world.level.levelgen.WorldGenSettings DEMO_SETTINGS -> b
+    long seed -> e
+    boolean generateFeatures -> f
+    boolean generateBonusChest -> g
+    net.minecraft.core.MappedRegistry dimensions -> h
+    java.util.Optional legacyCustomOptions -> i
+    61:64:com.mojang.serialization.DataResult guardExperimental() -> n
+    68:68:boolean stable() -> o
+    72:73:void <init>(long,boolean,boolean,net.minecraft.core.MappedRegistry) -> <init>
+    75:81:void <init>(long,boolean,boolean,net.minecraft.core.MappedRegistry,java.util.Optional) -> <init>
+    84:85:net.minecraft.world.level.levelgen.WorldGenSettings makeDefault() -> a
+    89:89:net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator makeDefaultOverworld(long) -> a
+    93:93:long seed() -> b
+    97:97:boolean generateFeatures() -> c
+    101:101:boolean generateBonusChest() -> d
+    105:108:net.minecraft.core.MappedRegistry withOverworld(net.minecraft.core.MappedRegistry,net.minecraft.world.level.chunk.ChunkGenerator) -> a
+    112:125:net.minecraft.core.MappedRegistry withOverworld(net.minecraft.core.MappedRegistry,java.util.function.Supplier,net.minecraft.world.level.chunk.ChunkGenerator) -> a
+    129:129:net.minecraft.core.MappedRegistry dimensions() -> e
+    133:137:net.minecraft.world.level.chunk.ChunkGenerator overworld() -> f
+    141:141:com.google.common.collect.ImmutableSet levels() -> g
+    145:145:boolean isDebug() -> h
+    149:149:boolean isFlatWorld() -> i
+    153:153:boolean isOldCustomizedWorld() -> j
+    157:157:net.minecraft.world.level.levelgen.WorldGenSettings withBonusChest() -> k
+    161:161:net.minecraft.world.level.levelgen.WorldGenSettings withFeaturesToggled() -> l
+    165:165:net.minecraft.world.level.levelgen.WorldGenSettings withBonusChestToggled() -> m
+    169:169:net.minecraft.world.level.levelgen.WorldGenSettings withDimensions(net.minecraft.core.MappedRegistry) -> a
+    175:213:net.minecraft.world.level.levelgen.WorldGenSettings create(java.util.Properties) -> a
+    219:239:net.minecraft.world.level.levelgen.WorldGenSettings withSeed(boolean,java.util.OptionalLong) -> a
+    186:186:java.lang.String lambda$create$4(java.lang.String) -> a
+    141:141:net.minecraft.resources.ResourceKey lambda$levels$3(java.util.Map$Entry) -> a
+    106:106:net.minecraft.world.level.dimension.DimensionType lambda$withOverworld$2(net.minecraft.world.level.dimension.LevelStem) -> a
+    37:45:com.mojang.datafixers.kinds.App lambda$static$1(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    44:44:java.util.Optional lambda$null$0(net.minecraft.world.level.levelgen.WorldGenSettings) -> a
+    37:50:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.WorldgenRandom -> ciy:
     int count -> a
     8:9:void <init>() -> <init>
     12:13:void <init>(long) -> <init>
@@ -59013,21 +64445,20 @@ net.minecraft.world.level.levelgen.WorldgenRandom -> ccf:
     54:59:long setLargeFeatureSeed(long,int,int) -> c
     63:65:long setLargeFeatureWithSalt(long,int,int,int) -> a
     69:69:java.util.Random seedSlimeChunk(int,int,long,long) -> a
-net.minecraft.world.level.levelgen.carver.CanyonWorldCarver -> ccg:
+net.minecraft.world.level.levelgen.carver.CanyonWorldCarver -> ciz:
     float[] rs -> m
-    16:20:void <init>(java.util.function.Function) -> <init>
+    16:20:void <init>(com.mojang.serialization.Codec) -> <init>
     24:24:boolean isStartChunk(java.util.Random,int,int,net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration) -> a
     29:43:boolean carve(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.Random,int,int,int,int,int,java.util.BitSet,net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration) -> a
     47:93:void genCanyon(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,long,int,int,int,double,double,double,float,float,float,int,int,double,java.util.BitSet) -> a
     97:97:boolean skip(double,double,double,int) -> a
     15:15:boolean isStartChunk(java.util.Random,int,int,net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> a
     15:15:boolean carve(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.Random,int,int,int,int,int,java.util.BitSet,net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> a
-net.minecraft.world.level.levelgen.carver.CarverConfiguration -> cch:
+net.minecraft.world.level.levelgen.carver.CarverConfiguration -> cja:
     net.minecraft.world.level.levelgen.carver.NoneCarverConfiguration NONE -> a
-    com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    7:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.carver.CaveWorldCarver -> cci:
-    16:17:void <init>(java.util.function.Function,int) -> <init>
+    4:4:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.carver.CaveWorldCarver -> cjb:
+    16:17:void <init>(com.mojang.serialization.Codec,int) -> <init>
     21:21:boolean isStartChunk(java.util.Random,int,int,net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration) -> a
     26:55:boolean carve(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.Random,int,int,int,int,int,java.util.BitSet,net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration) -> a
     59:59:int getCaveBound() -> a
@@ -59039,38 +64470,40 @@ net.minecraft.world.level.levelgen.carver.CaveWorldCarver -> cci:
     132:132:boolean skip(double,double,double,int) -> a
     14:14:boolean isStartChunk(java.util.Random,int,int,net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> a
     14:14:boolean carve(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.Random,int,int,int,int,int,java.util.BitSet,net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> a
-net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver -> ccj:
-    net.minecraft.world.level.levelgen.carver.WorldCarver worldCarver -> a
-    net.minecraft.world.level.levelgen.carver.CarverConfiguration config -> b
-    20:23:void <init>(net.minecraft.world.level.levelgen.carver.WorldCarver,net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> <init>
-    26:27:void <init>(net.minecraft.world.level.levelgen.carver.WorldCarver,com.mojang.datafixers.Dynamic) -> <init>
-    30:32:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    37:37:boolean isStartChunk(java.util.Random,int,int) -> a
-    41:41:boolean carve(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.Random,int,int,int,int,int,java.util.BitSet) -> a
-    45:46:net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.carver.HellCaveWorldCarver -> cck:
-    21:38:void <init>(java.util.function.Function) -> <init>
-    42:42:int getCaveBound() -> a
-    47:47:float getThickness(java.util.Random) -> a
-    52:52:double getYScale() -> b
-    57:57:int getCaveY(java.util.Random) -> b
-    62:80:boolean carveBlock(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.BitSet,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int,int,int,int,int,int,java.util.concurrent.atomic.AtomicBoolean) -> a
-net.minecraft.world.level.levelgen.carver.NoneCarverConfiguration -> ccl:
-    6:6:void <init>() -> <init>
-    9:9:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    13:13:net.minecraft.world.level.levelgen.carver.NoneCarverConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.carver.UnderwaterCanyonWorldCarver -> ccm:
-    18:57:void <init>(java.util.function.Function) -> <init>
+net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver -> cjc:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.carver.WorldCarver worldCarver -> b
+    net.minecraft.world.level.levelgen.carver.CarverConfiguration config -> c
+    19:22:void <init>(net.minecraft.world.level.levelgen.carver.WorldCarver,net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> <init>
+    25:25:boolean isStartChunk(java.util.Random,int,int) -> a
+    29:29:boolean carve(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.Random,int,int,int,int,int,java.util.BitSet) -> a
+    14:14:net.minecraft.world.level.levelgen.carver.WorldCarver lambda$static$0(net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver) -> a
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.carver.NetherWorldCarver -> cjd:
+    21:46:void <init>(com.mojang.serialization.Codec) -> <init>
+    50:50:int getCaveBound() -> a
+    55:55:float getThickness(java.util.Random) -> a
+    60:60:double getYScale() -> b
+    65:65:int getCaveY(java.util.Random) -> b
+    70:88:boolean carveBlock(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.BitSet,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int,int,int,int,int,int,org.apache.commons.lang3.mutable.MutableBoolean) -> a
+net.minecraft.world.level.levelgen.carver.NoneCarverConfiguration -> cje:
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.world.level.levelgen.carver.NoneCarverConfiguration INSTANCE -> c
+    5:5:void <init>() -> <init>
+    6:6:net.minecraft.world.level.levelgen.carver.NoneCarverConfiguration lambda$static$0() -> a
+    6:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.carver.UnderwaterCanyonWorldCarver -> cjf:
+    18:57:void <init>(com.mojang.serialization.Codec) -> <init>
     61:61:boolean hasWater(net.minecraft.world.level.chunk.ChunkAccess,int,int,int,int,int,int,int,int) -> a
-    66:66:boolean carveBlock(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.BitSet,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int,int,int,int,int,int,java.util.concurrent.atomic.AtomicBoolean) -> a
-net.minecraft.world.level.levelgen.carver.UnderwaterCaveWorldCarver -> ccn:
-    21:61:void <init>(java.util.function.Function) -> <init>
+    66:66:boolean carveBlock(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.BitSet,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int,int,int,int,int,int,org.apache.commons.lang3.mutable.MutableBoolean) -> a
+net.minecraft.world.level.levelgen.carver.UnderwaterCaveWorldCarver -> cjg:
+    21:61:void <init>(com.mojang.serialization.Codec) -> <init>
     65:65:boolean hasWater(net.minecraft.world.level.chunk.ChunkAccess,int,int,int,int,int,int,int,int) -> a
-    70:70:boolean carveBlock(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.BitSet,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int,int,int,int,int,int,java.util.concurrent.atomic.AtomicBoolean) -> a
+    70:70:boolean carveBlock(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.BitSet,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int,int,int,int,int,int,org.apache.commons.lang3.mutable.MutableBoolean) -> a
     74:125:boolean carveBlock(net.minecraft.world.level.levelgen.carver.WorldCarver,net.minecraft.world.level.chunk.ChunkAccess,java.util.BitSet,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int,int,int,int,int,int) -> a
-net.minecraft.world.level.levelgen.carver.WorldCarver -> cco:
+net.minecraft.world.level.levelgen.carver.WorldCarver -> cjh:
     net.minecraft.world.level.levelgen.carver.WorldCarver CAVE -> a
-    net.minecraft.world.level.levelgen.carver.WorldCarver HELL_CAVE -> b
+    net.minecraft.world.level.levelgen.carver.WorldCarver NETHER_CAVE -> b
     net.minecraft.world.level.levelgen.carver.WorldCarver CANYON -> c
     net.minecraft.world.level.levelgen.carver.WorldCarver UNDERWATER_CANYON -> d
     net.minecraft.world.level.levelgen.carver.WorldCarver UNDERWATER_CAVE -> e
@@ -59080,669 +64513,744 @@ net.minecraft.world.level.levelgen.carver.WorldCarver -> cco:
     net.minecraft.world.level.material.FluidState LAVA -> i
     java.util.Set replaceableBlocks -> j
     java.util.Set liquids -> k
-    java.util.function.Function configurationFactory -> m
+    com.mojang.serialization.Codec configuredCodec -> m
     int genHeight -> l
     40:40:net.minecraft.world.level.levelgen.carver.WorldCarver register(java.lang.String,net.minecraft.world.level.levelgen.carver.WorldCarver) -> a
-    43:86:void <init>(java.util.function.Function,int) -> <init>
-    89:89:net.minecraft.world.level.levelgen.carver.CarverConfiguration createSettings(com.mojang.datafixers.Dynamic) -> a
-    93:93:int getRange() -> c
+    43:86:void <init>(com.mojang.serialization.Codec,int) -> <init>
+    89:89:com.mojang.serialization.Codec configuredCodec() -> c
+    93:93:int getRange() -> d
     97:147:boolean carveSphere(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,long,int,int,int,double,double,double,double,double,java.util.BitSet) -> a
-    151:182:boolean carveBlock(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.BitSet,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int,int,int,int,int,int,java.util.concurrent.atomic.AtomicBoolean) -> a
+    151:182:boolean carveBlock(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.BitSet,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int,int,int,int,int,int,org.apache.commons.lang3.mutable.MutableBoolean) -> a
     boolean carve(net.minecraft.world.level.chunk.ChunkAccess,java.util.function.Function,java.util.Random,int,int,int,int,int,java.util.BitSet,net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> a
     boolean isStartChunk(java.util.Random,int,int,net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> a
     190:190:boolean canReplaceBlock(net.minecraft.world.level.block.state.BlockState) -> a
-    194:195:boolean canReplaceBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
-    199:215:boolean hasWater(net.minecraft.world.level.chunk.ChunkAccess,int,int,int,int,int,int,int,int) -> a
-    219:219:boolean isEdge(int,int,int,int,int,int) -> a
-    223:231:boolean canReach(int,int,double,double,int,int,float) -> a
+    194:194:boolean canReplaceBlock(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> a
+    198:214:boolean hasWater(net.minecraft.world.level.chunk.ChunkAccess,int,int,int,int,int,int,int,int) -> a
+    218:218:boolean isEdge(int,int,int,int,int,int) -> a
+    222:230:boolean canReach(int,int,double,double,int,int,float) -> a
     boolean skip(double,double,double,int) -> a
+    85:85:net.minecraft.world.level.levelgen.carver.CarverConfiguration lambda$new$1(net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver) -> a
+    85:85:net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver lambda$new$0(net.minecraft.world.level.levelgen.carver.CarverConfiguration) -> a
     28:37:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.carver.package-info -> ccp:
-net.minecraft.world.level.levelgen.feature.AbstractFlowerFeature -> ccq:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:34:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.carver.package-info -> cji:
+net.minecraft.world.level.levelgen.feature.AbstractFlowerFeature -> cjj:
+    18:19:void <init>(com.mojang.serialization.Codec) -> <init>
+    23:34:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
     boolean isValid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
     int getCount(net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
     net.minecraft.core.BlockPos getPos(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
     net.minecraft.world.level.block.state.BlockState getRandomFlower(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> b
-net.minecraft.world.level.levelgen.feature.AbstractHugeMushroomFeature -> ccr:
-    20:21:void <init>(java.util.function.Function) -> <init>
+net.minecraft.world.level.levelgen.feature.AbstractHugeMushroomFeature -> cjk:
+    20:21:void <init>(com.mojang.serialization.Codec) -> <init>
     24:30:void placeTrunk(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration,int,net.minecraft.core.BlockPos$MutableBlockPos) -> a
     33:37:int getTreeHeight(java.util.Random) -> a
     41:62:boolean isValidPosition(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> a
-    67:76:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> a
+    67:76:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> a
     int getTreeRadiusForHeight(int,int,int,int) -> a
     void makeCap(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,int,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> a
-    18:18:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.AbstractSmallTreeFeature -> ccs:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    22:25:void placeTrunk(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,int,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    30:68:java.util.Optional getProjectedOrigin(net.minecraft.world.level.LevelSimulatedRW,int,int,int,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.AbstractTreeFeature -> cct:
-    36:37:void <init>(java.util.function.Function) -> <init>
-    40:40:boolean isFree(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> a
-    53:53:boolean isAir(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> b
-    57:57:boolean isDirt(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> c
-    66:66:boolean isVine(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> d
-    70:70:boolean isBlockWater(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> e
-    74:74:boolean isAirOrLeaves(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> f
-    78:78:boolean isGrassOrDirt(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> g
-    82:82:boolean isGrassOrDirtOrFarmland(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> h
-    89:89:boolean isReplaceablePlant(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> i
-    96:99:void setDirtAt(net.minecraft.world.level.LevelSimulatedRW,net.minecraft.core.BlockPos) -> a
-    102:107:boolean placeLog(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-    111:116:boolean placeLeaf(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> b
-    121:122:void setBlock(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    125:127:void setBlock(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    130:131:void setBlockKnownShape(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    135:157:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-    161:222:net.minecraft.world.phys.shapes.DiscreteVoxelShape updateLeaves(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Set,java.util.Set) -> a
-    227:230:void simulate(net.minecraft.server.level.FeatureSimulator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-    boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-    34:34:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    34:34:void simulate(net.minecraft.server.level.FeatureSimulator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    151:151:void lambda$place$8(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator) -> a
-    90:91:boolean lambda$isReplaceablePlant$7(net.minecraft.world.level.block.state.BlockState) -> a
-    83:84:boolean lambda$isGrassOrDirtOrFarmland$6(net.minecraft.world.level.block.state.BlockState) -> b
-    78:78:boolean lambda$isGrassOrDirt$5(net.minecraft.world.level.block.state.BlockState) -> c
-    74:74:boolean lambda$isAirOrLeaves$4(net.minecraft.world.level.block.state.BlockState) -> d
-    70:70:boolean lambda$isBlockWater$3(net.minecraft.world.level.block.state.BlockState) -> e
-    66:66:boolean lambda$isVine$2(net.minecraft.world.level.block.state.BlockState) -> f
-    58:59:boolean lambda$isDirt$1(net.minecraft.world.level.block.state.BlockState) -> g
-    41:46:boolean lambda$isFree$0(net.minecraft.world.level.block.state.BlockState) -> h
-net.minecraft.world.level.levelgen.feature.AcaciaFeature -> ccu:
-    20:21:void <init>(java.util.function.Function) -> <init>
-    25:86:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    18:18:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.BambooFeature -> ccv:
+    18:18:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.BambooFeature -> cjl:
     net.minecraft.world.level.block.state.BlockState BAMBOO_TRUNK -> a
-    net.minecraft.world.level.block.state.BlockState BAMBOO_FINAL_LARGE -> aq
-    net.minecraft.world.level.block.state.BlockState BAMBOO_TOP_LARGE -> ar
-    net.minecraft.world.level.block.state.BlockState BAMBOO_TOP_SMALL -> as
-    27:28:void <init>(java.util.function.Function) -> <init>
-    32:77:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration) -> a
-    20:20:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    21:24:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.BlockBlobFeature -> ccw:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:52:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.BlockBlobConfiguration) -> a
-    14:14:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.BlockPileFeature -> ccx:
-    19:20:void <init>(java.util.function.Function) -> <init>
-    24:41:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration) -> a
+    net.minecraft.world.level.block.state.BlockState BAMBOO_FINAL_LARGE -> ac
+    net.minecraft.world.level.block.state.BlockState BAMBOO_TOP_LARGE -> ad
+    net.minecraft.world.level.block.state.BlockState BAMBOO_TOP_SMALL -> ae
+    26:27:void <init>(com.mojang.serialization.Codec) -> <init>
+    31:76:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration) -> a
+    19:19:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    20:23:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.BasaltColumnsFeature -> cjm:
+    com.google.common.collect.ImmutableList CANNOT_PLACE_ON -> a
+    34:35:void <init>(com.mojang.serialization.Codec) -> <init>
+    39:60:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration) -> a
+    64:93:boolean placeColumn(net.minecraft.world.level.LevelAccessor,int,net.minecraft.core.BlockPos,int,int) -> a
+    98:113:net.minecraft.core.BlockPos findSurface(net.minecraft.world.level.LevelAccessor,int,net.minecraft.core.BlockPos$MutableBlockPos,int) -> a
+    118:132:net.minecraft.core.BlockPos findAir(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos$MutableBlockPos,int) -> a
+    136:136:int calculateHeight(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration) -> a
+    140:140:int calculateReach(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration) -> b
+    144:145:boolean isAirOrLavaOcean(net.minecraft.world.level.LevelAccessor,int,net.minecraft.core.BlockPos) -> a
+    19:19:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    20:20:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.BasaltPillarFeature -> cjn:
+    20:21:void <init>(com.mojang.serialization.Codec) -> <init>
+    25:84:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    88:91:void placeBaseHangOff(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos) -> a
+    94:99:boolean placeHangOff(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos) -> b
+    18:18:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.BastionBridgePools -> cjo:
+    18:18:void <init>() -> <init>
+    134:134:void bootstrap() -> a
+    20:131:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.BastionFeature -> cjp:
+    20:21:void <init>(com.mojang.serialization.Codec) -> <init>
+    26:26:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.MultiJigsawConfiguration) -> a
+    31:31:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    16:16:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.BastionFeature$FeatureStart -> cjp$a:
+    36:37:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    41:46:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.MultiJigsawConfiguration) -> a
+    34:34:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.BastionHoglinStablePools -> cjq:
+    18:18:void <init>() -> <init>
+    204:204:void bootstrap() -> a
+    20:201:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.BastionHousingUnitsPools -> cjr:
+    18:18:void <init>() -> <init>
+    191:191:void bootstrap() -> a
+    20:188:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.BastionPieces -> cjs:
+    com.google.common.collect.ImmutableMap POOLS -> a
+    20:20:void <init>() -> <init>
+    29:34:void bootstrap() -> a
+    37:41:void addPieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,java.util.List,net.minecraft.world.level.levelgen.WorldgenRandom,net.minecraft.world.level.levelgen.feature.configurations.MultiJigsawConfiguration) -> a
+    21:26:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.BastionPieces$BastionPiece -> cjs$a:
+    45:46:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement,net.minecraft.core.BlockPos,int,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
+    49:50:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+net.minecraft.world.level.levelgen.feature.BastionSharedPools -> cjt:
+    net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule GILDED_BLACKSTONE_REPLACEMENT_RULE -> a
+    14:14:void <init>() -> <init>
+    65:65:void bootstrap() -> a
+    18:62:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.BastionTreasureRoomPools -> cju:
+    20:20:void <init>() -> <init>
+    297:297:void bootstrap() -> a
+    22:294:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.BlockBlobFeature -> cjv:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:51:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.BlockBlobConfiguration) -> a
+    13:13:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.BlockPileFeature -> cjw:
+    19:20:void <init>(com.mojang.serialization.Codec) -> <init>
+    24:41:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration) -> a
     45:51:boolean mayPlaceOn(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,java.util.Random) -> a
     55:58:void tryPlaceBlock(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration) -> a
-    17:17:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.BlueIceFeature -> ccy:
-    20:21:void <init>(java.util.function.Function) -> <init>
-    25:74:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    18:18:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.BonusChestFeature -> ccz:
-    27:28:void <init>(java.util.function.Function) -> <init>
-    32:62:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    25:25:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.BuriedTreasureFeature -> cda:
-    22:23:void <init>(java.util.function.Function) -> <init>
-    27:32:boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
-    37:37:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    42:42:java.lang.String getFeatureName() -> b
-    47:47:int getLookupRange() -> c
-net.minecraft.world.level.levelgen.feature.BuriedTreasureFeature$BuriedTreasureStart -> cda$a:
-    52:53:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    57:64:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-    68:68:net.minecraft.core.BlockPos getLocatePos() -> a
-net.minecraft.world.level.levelgen.feature.ChorusPlantFeature -> cdb:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:26:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    15:15:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.ConfiguredFeature -> cdc:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.world.level.levelgen.feature.Feature feature -> b
+    17:17:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.BlueIceFeature -> cjx:
+    19:20:void <init>(com.mojang.serialization.Codec) -> <init>
+    24:72:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    17:17:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.BonusChestFeature -> cjy:
+    26:27:void <init>(com.mojang.serialization.Codec) -> <init>
+    31:61:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    24:24:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.BuriedTreasureFeature -> cjz:
+    20:21:void <init>(com.mojang.serialization.Codec) -> <init>
+    25:26:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration) -> a
+    31:31:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    16:16:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.BuriedTreasureFeature$BuriedTreasureStart -> cjz$a:
+    36:37:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    41:48:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration) -> a
+    52:52:net.minecraft.core.BlockPos getLocatePos() -> a
+    34:34:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.ChorusPlantFeature -> cka:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:25:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    14:14:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.ConfiguredFeature -> ckb:
+    net.minecraft.world.level.levelgen.feature.ConfiguredFeature NOPE -> a
+    com.mojang.serialization.Codec CODEC -> b
+    org.apache.logging.log4j.Logger LOGGER -> c
+    net.minecraft.world.level.levelgen.feature.Feature feature -> d
+    net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration config -> e
+    29:32:void <init>(net.minecraft.world.level.levelgen.feature.Feature,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> <init>
+    35:36:net.minecraft.world.level.levelgen.feature.ConfiguredFeature decorated(net.minecraft.world.level.levelgen.placement.ConfiguredDecorator) -> a
+    40:40:net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature weighted(float) -> a
+    44:44:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos) -> a
+    22:22:net.minecraft.world.level.levelgen.feature.Feature lambda$static$0(net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
+    19:24:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature -> ckc:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.StructureFeature feature -> b
     net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration config -> c
-    27:30:void <init>(net.minecraft.world.level.levelgen.feature.Feature,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> <init>
-    33:34:void <init>(net.minecraft.world.level.levelgen.feature.Feature,com.mojang.datafixers.Dynamic) -> <init>
-    37:38:net.minecraft.world.level.levelgen.feature.ConfiguredFeature decorated(net.minecraft.world.level.levelgen.placement.ConfiguredDecorator) -> a
-    42:42:net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature weighted(float) -> a
-    46:48:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    53:53:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos) -> a
-    57:65:net.minecraft.world.level.levelgen.feature.ConfiguredFeature deserialize(com.mojang.datafixers.Dynamic) -> a
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.CoralClawFeature -> cdd:
-    18:19:void <init>(java.util.function.Function) -> <init>
+    21:24:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> <init>
+    27:27:net.minecraft.world.level.levelgen.structure.StructureStart generate(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,long,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.biome.Biome,int,net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration) -> a
+    16:16:net.minecraft.world.level.levelgen.feature.StructureFeature lambda$static$0(net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature) -> a
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.CoralClawFeature -> ckd:
+    18:19:void <init>(com.mojang.serialization.Codec) -> <init>
     23:74:boolean placeFeature(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.level.levelgen.feature.CoralFeature -> cde:
-    22:23:void <init>(java.util.function.Function) -> <init>
-    27:28:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.CoralFeature -> cke:
+    22:23:void <init>(com.mojang.serialization.Codec) -> <init>
+    27:28:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
     boolean placeFeature(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     34:58:boolean placeCoralBlock(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    20:20:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.CoralMushroomFeature -> cdf:
-    15:16:void <init>(java.util.function.Function) -> <init>
-    20:65:boolean placeFeature(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.level.levelgen.feature.CoralTreeFeature -> cdg:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:59:boolean placeFeature(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.level.levelgen.feature.DarkOakFeature -> cdh:
-    21:22:void <init>(java.util.function.Function) -> <init>
-    26:141:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration) -> a
-    145:167:boolean canPlaceTreeOfHeight(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos,int) -> a
-    19:19:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.DecoratedFeature -> cdi:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:21:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration) -> a
-    26:26:java.lang.String toString() -> toString
-    14:14:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.DecoratedFlowerFeature -> cdj:
-    10:11:void <init>(java.util.function.Function) -> <init>
-net.minecraft.world.level.levelgen.feature.DefaultFlowerFeature -> cdk:
-    14:15:void <init>(java.util.function.Function) -> <init>
-    19:19:boolean isValid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> a
-    24:24:int getCount(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> a
-    29:29:net.minecraft.core.BlockPos getPos(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> a
-    34:34:net.minecraft.world.level.block.state.BlockState getRandomFlower(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> b
-    12:12:net.minecraft.world.level.block.state.BlockState getRandomFlower(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> b
-    12:12:net.minecraft.core.BlockPos getPos(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    12:12:int getCount(net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    12:12:boolean isValid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.DesertPyramidFeature -> cdl:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:21:java.lang.String getFeatureName() -> b
-    26:26:int getLookupRange() -> c
-    31:31:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    36:36:int getRandomSalt() -> d
-net.minecraft.world.level.levelgen.feature.DesertPyramidFeature$FeatureStart -> cdl$a:
-    41:42:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    46:49:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.DesertVillagePools -> cdm:
+    20:20:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.CoralMushroomFeature -> ckf:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:64:boolean placeFeature(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+net.minecraft.world.level.levelgen.feature.CoralTreeFeature -> ckg:
+    17:18:void <init>(com.mojang.serialization.Codec) -> <init>
+    22:58:boolean placeFeature(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+net.minecraft.world.level.levelgen.feature.DecoratedFeature -> ckh:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:20:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration) -> a
+    25:25:java.lang.String toString() -> toString
+    13:13:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.DecoratedFlowerFeature -> cki:
+    8:9:void <init>(com.mojang.serialization.Codec) -> <init>
+net.minecraft.world.level.levelgen.feature.DefaultFlowerFeature -> ckj:
+    13:14:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:18:boolean isValid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> a
+    23:23:int getCount(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> a
+    28:28:net.minecraft.core.BlockPos getPos(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> a
+    33:33:net.minecraft.world.level.block.state.BlockState getRandomFlower(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> b
+    11:11:net.minecraft.world.level.block.state.BlockState getRandomFlower(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> b
+    11:11:net.minecraft.core.BlockPos getPos(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    11:11:int getCount(net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    11:11:boolean isValid(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.DeltaFeature -> ckk:
+    com.google.common.collect.ImmutableList CANNOT_REPLACE -> a
+    net.minecraft.core.Direction[] DIRECTIONS -> ac
+    31:31:int calculateRadius(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration) -> a
+    35:35:int calculateRimSize(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration) -> b
+    39:40:void <init>(com.mojang.serialization.Codec) -> <init>
+    44:77:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration) -> a
+    81:96:boolean isClear(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration) -> a
+    101:114:net.minecraft.core.BlockPos findDeltaLevel(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos$MutableBlockPos) -> a
+    19:19:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    20:27:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.DesertPyramidFeature -> ckl:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:19:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+net.minecraft.world.level.levelgen.feature.DesertPyramidFeature$FeatureStart -> ckl$a:
+    24:25:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    29:32:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    22:22:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.DesertVillagePools -> ckm:
     22:22:void <init>() -> <init>
     237:237:void bootstrap() -> a
     24:234:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.DesertWellFeature -> cdn:
+net.minecraft.world.level.levelgen.feature.DesertWellFeature -> ckn:
     net.minecraft.world.level.block.state.predicate.BlockStatePredicate IS_SAND -> a
-    net.minecraft.world.level.block.state.BlockState sandSlab -> aq
-    net.minecraft.world.level.block.state.BlockState sandstone -> ar
-    net.minecraft.world.level.block.state.BlockState water -> as
-    21:27:void <init>(java.util.function.Function) -> <init>
-    31:99:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    18:18:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.DiskReplaceFeature -> cdo:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:51:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration) -> a
-    16:16:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.EndCityFeature -> cdp:
-    25:26:void <init>(java.util.function.Function) -> <init>
-    30:49:net.minecraft.world.level.ChunkPos getPotentialFeatureChunkFromLocationWithOffset(net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,int,int) -> a
-    54:70:boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
-    75:75:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    80:80:java.lang.String getFeatureName() -> b
-    85:85:int getLookupRange() -> c
-    89:110:int getYPositionForFeature(int,int,net.minecraft.world.level.chunk.ChunkGenerator) -> b
-    21:21:int access$000(int,int,net.minecraft.world.level.chunk.ChunkGenerator) -> a
-net.minecraft.world.level.levelgen.feature.EndCityFeature$EndCityStart -> cdp$a:
-    115:116:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    120:133:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.EndGatewayFeature -> cdq:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:50:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration) -> a
-    16:16:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    33:39:void lambda$place$0(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.feature.EndIslandFeature -> cdr:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:36:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    15:15:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.EndPodiumFeature -> cds:
+    net.minecraft.world.level.block.state.BlockState sandSlab -> ac
+    net.minecraft.world.level.block.state.BlockState sandstone -> ad
+    net.minecraft.world.level.block.state.BlockState water -> ae
+    20:26:void <init>(com.mojang.serialization.Codec) -> <init>
+    30:98:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    17:17:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.DiskReplaceFeature -> cko:
+    17:18:void <init>(com.mojang.serialization.Codec) -> <init>
+    22:50:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration) -> a
+    15:15:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.EndCityFeature -> ckp:
+    24:25:void <init>(com.mojang.serialization.Codec) -> <init>
+    29:29:boolean linearSeparation() -> b
+    34:34:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    39:39:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    43:64:int getYPositionForFeature(int,int,net.minecraft.world.level.chunk.ChunkGenerator) -> b
+    20:20:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    20:20:int access$000(int,int,net.minecraft.world.level.chunk.ChunkGenerator) -> a
+net.minecraft.world.level.levelgen.feature.EndCityFeature$EndCityStart -> ckp$a:
+    69:70:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    74:87:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    67:67:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.EndGatewayFeature -> ckq:
+    17:18:void <init>(com.mojang.serialization.Codec) -> <init>
+    22:49:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration) -> a
+    15:15:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    32:38:void lambda$place$0(net.minecraft.world.level.WorldGenLevel,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.feature.EndIslandFeature -> ckr:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:35:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    14:14:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.EndPodiumFeature -> cks:
     net.minecraft.core.BlockPos END_PODIUM_LOCATION -> a
-    boolean active -> aq
+    boolean active -> ac
     25:27:void <init>(boolean) -> <init>
-    31:68:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    14:14:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    31:68:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    14:14:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
     20:20:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.FancyTreeFeature -> cdt:
-    40:41:void <init>(java.util.function.Function) -> <init>
-    44:53:void crossSection(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,float,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    57:71:float treeShape(int,int) -> a
-    75:80:float foliageShape(int) -> a
-    85:88:void foliageCluster(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    92:115:int makeLimb(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,boolean,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    119:129:int getSteps(net.minecraft.core.BlockPos) -> a
-    133:145:net.minecraft.core.Direction$Axis getLogAxis(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    149:154:void makeFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    157:157:boolean trimBranches(int,int) -> b
-    161:162:void makeTrunk(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,int,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    165:173:void makeBranches(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> b
-    178:244:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    248:261:int checkLocation(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,int,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> b
-    19:19:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.FancyTreeFeature$FoliageCoords -> cdt$a:
-    int branchBase -> b
-    30:32:void <init>(net.minecraft.core.BlockPos,int) -> <init>
-    35:35:int getBranchBase() -> r
-net.minecraft.world.level.levelgen.feature.Feature -> cdu:
+net.minecraft.world.level.levelgen.feature.Feature -> ckt:
+    net.minecraft.world.level.levelgen.feature.Feature NO_OP -> b
+    net.minecraft.world.level.levelgen.feature.Feature TREE -> c
+    net.minecraft.world.level.levelgen.feature.AbstractFlowerFeature FLOWER -> d
+    net.minecraft.world.level.levelgen.feature.Feature RANDOM_PATCH -> e
+    net.minecraft.world.level.levelgen.feature.Feature BLOCK_PILE -> f
+    net.minecraft.world.level.levelgen.feature.Feature SPRING -> g
+    net.minecraft.world.level.levelgen.feature.Feature CHORUS_PLANT -> h
+    net.minecraft.world.level.levelgen.feature.Feature EMERALD_ORE -> i
+    net.minecraft.world.level.levelgen.feature.Feature VOID_START_PLATFORM -> j
+    net.minecraft.world.level.levelgen.feature.Feature DESERT_WELL -> k
+    net.minecraft.world.level.levelgen.feature.Feature FOSSIL -> l
+    net.minecraft.world.level.levelgen.feature.Feature HUGE_RED_MUSHROOM -> m
+    net.minecraft.world.level.levelgen.feature.Feature HUGE_BROWN_MUSHROOM -> n
+    net.minecraft.world.level.levelgen.feature.Feature ICE_SPIKE -> o
+    net.minecraft.world.level.levelgen.feature.Feature GLOWSTONE_BLOB -> p
+    net.minecraft.world.level.levelgen.feature.Feature FREEZE_TOP_LAYER -> q
+    net.minecraft.world.level.levelgen.feature.Feature VINES -> r
+    net.minecraft.world.level.levelgen.feature.Feature MONSTER_ROOM -> s
+    net.minecraft.world.level.levelgen.feature.Feature BLUE_ICE -> t
+    net.minecraft.world.level.levelgen.feature.Feature ICEBERG -> u
+    net.minecraft.world.level.levelgen.feature.Feature FOREST_ROCK -> v
+    net.minecraft.world.level.levelgen.feature.Feature DISK -> w
+    net.minecraft.world.level.levelgen.feature.Feature ICE_PATCH -> x
+    net.minecraft.world.level.levelgen.feature.Feature LAKE -> y
+    net.minecraft.world.level.levelgen.feature.Feature ORE -> z
+    net.minecraft.world.level.levelgen.feature.Feature END_SPIKE -> A
+    net.minecraft.world.level.levelgen.feature.Feature END_ISLAND -> B
+    net.minecraft.world.level.levelgen.feature.Feature END_GATEWAY -> C
+    net.minecraft.world.level.levelgen.feature.Feature SEAGRASS -> D
+    net.minecraft.world.level.levelgen.feature.Feature KELP -> E
+    net.minecraft.world.level.levelgen.feature.Feature CORAL_TREE -> F
+    net.minecraft.world.level.levelgen.feature.Feature CORAL_MUSHROOM -> G
+    net.minecraft.world.level.levelgen.feature.Feature CORAL_CLAW -> H
+    net.minecraft.world.level.levelgen.feature.Feature SEA_PICKLE -> I
+    net.minecraft.world.level.levelgen.feature.Feature SIMPLE_BLOCK -> J
+    net.minecraft.world.level.levelgen.feature.Feature BAMBOO -> K
+    net.minecraft.world.level.levelgen.feature.Feature HUGE_FUNGUS -> L
+    net.minecraft.world.level.levelgen.feature.Feature NETHER_FOREST_VEGETATION -> M
+    net.minecraft.world.level.levelgen.feature.Feature WEEPING_VINES -> N
+    net.minecraft.world.level.levelgen.feature.Feature TWISTING_VINES -> O
+    net.minecraft.world.level.levelgen.feature.Feature BASALT_COLUMNS -> P
+    net.minecraft.world.level.levelgen.feature.Feature DELTA_FEATURE -> Q
+    net.minecraft.world.level.levelgen.feature.Feature REPLACE_BLOBS -> R
+    net.minecraft.world.level.levelgen.feature.Feature FILL_LAYER -> S
+    net.minecraft.world.level.levelgen.feature.BonusChestFeature BONUS_CHEST -> T
+    net.minecraft.world.level.levelgen.feature.Feature BASALT_PILLAR -> U
+    net.minecraft.world.level.levelgen.feature.Feature NO_SURFACE_ORE -> V
+    net.minecraft.world.level.levelgen.feature.Feature RANDOM_RANDOM_SELECTOR -> W
+    net.minecraft.world.level.levelgen.feature.Feature RANDOM_SELECTOR -> X
+    net.minecraft.world.level.levelgen.feature.Feature SIMPLE_RANDOM_SELECTOR -> Y
+    net.minecraft.world.level.levelgen.feature.Feature RANDOM_BOOLEAN_SELECTOR -> Z
+    net.minecraft.world.level.levelgen.feature.Feature DECORATED -> aa
+    net.minecraft.world.level.levelgen.feature.Feature DECORATED_FLOWER -> ab
+    com.mojang.serialization.Codec configuredCodec -> a
+    108:108:net.minecraft.world.level.levelgen.feature.Feature register(java.lang.String,net.minecraft.world.level.levelgen.feature.Feature) -> a
+    113:115:void <init>(com.mojang.serialization.Codec) -> <init>
+    118:118:com.mojang.serialization.Codec configuredCodec() -> a
+    122:122:net.minecraft.world.level.levelgen.feature.ConfiguredFeature configured(net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> b
+    126:127:void setBlock(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    132:132:boolean isStone(net.minecraft.world.level.block.Block) -> a
+    139:139:boolean isDirt(net.minecraft.world.level.block.Block) -> b
+    147:147:boolean isGrassOrDirt(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> a
+    151:151:boolean isAir(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> b
+    147:147:boolean lambda$isGrassOrDirt$2(net.minecraft.world.level.block.state.BlockState) -> a
+    114:114:net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration lambda$new$1(net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
+    114:114:net.minecraft.world.level.levelgen.feature.ConfiguredFeature lambda$new$0(net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    46:105:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.FillLayerFeature -> cku:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:34:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration) -> a
+    13:13:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.FossilFeature -> ckv:
+    net.minecraft.resources.ResourceLocation SPINE_1 -> a
+    net.minecraft.resources.ResourceLocation SPINE_2 -> ac
+    net.minecraft.resources.ResourceLocation SPINE_3 -> ad
+    net.minecraft.resources.ResourceLocation SPINE_4 -> ae
+    net.minecraft.resources.ResourceLocation SPINE_1_COAL -> af
+    net.minecraft.resources.ResourceLocation SPINE_2_COAL -> ag
+    net.minecraft.resources.ResourceLocation SPINE_3_COAL -> ah
+    net.minecraft.resources.ResourceLocation SPINE_4_COAL -> ai
+    net.minecraft.resources.ResourceLocation SKULL_1 -> aj
+    net.minecraft.resources.ResourceLocation SKULL_2 -> ak
+    net.minecraft.resources.ResourceLocation SKULL_3 -> al
+    net.minecraft.resources.ResourceLocation SKULL_4 -> am
+    net.minecraft.resources.ResourceLocation SKULL_1_COAL -> an
+    net.minecraft.resources.ResourceLocation SKULL_2_COAL -> ao
+    net.minecraft.resources.ResourceLocation SKULL_3_COAL -> ap
+    net.minecraft.resources.ResourceLocation SKULL_4_COAL -> aq
+    net.minecraft.resources.ResourceLocation[] fossils -> ar
+    net.minecraft.resources.ResourceLocation[] fossilsCoal -> as
+    70:71:void <init>(com.mojang.serialization.Codec) -> <init>
+    75:110:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    26:26:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    27:58:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.GlowstoneFeature -> ckw:
+    18:19:void <init>(com.mojang.serialization.Codec) -> <init>
+    23:56:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    16:16:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.HugeBrownMushroomFeature -> ckx:
+    13:14:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:47:void makeCap(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,int,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> a
+    51:51:int getTreeRadiusForHeight(int,int,int,int) -> a
+net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration -> cky:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration HUGE_CRIMSON_FUNGI_PLANTED_CONFIG -> b
+    net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration HUGE_CRIMSON_FUNGI_NOT_PLANTED_CONFIG -> c
+    net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration HUGE_WARPED_FUNGI_PLANTED_CONFIG -> d
+    net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration HUGE_WARPED_FUNGI_NOT_PLANTED_CONFIG -> e
+    net.minecraft.world.level.block.state.BlockState validBaseState -> f
+    net.minecraft.world.level.block.state.BlockState stemState -> g
+    net.minecraft.world.level.block.state.BlockState hatState -> h
+    net.minecraft.world.level.block.state.BlockState decorState -> i
+    boolean planted -> j
+    29:35:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,boolean) -> <init>
+    10:16:com.mojang.datafixers.kinds.App lambda$static$5(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    15:15:java.lang.Boolean lambda$null$4(net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration) -> a
+    14:14:net.minecraft.world.level.block.state.BlockState lambda$null$3(net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration) -> b
+    13:13:net.minecraft.world.level.block.state.BlockState lambda$null$2(net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration) -> c
+    12:12:net.minecraft.world.level.block.state.BlockState lambda$null$1(net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration) -> d
+    11:11:net.minecraft.world.level.block.state.BlockState lambda$null$0(net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration) -> e
+    10:21:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.HugeFungusFeature -> ckz:
+    24:25:void <init>(com.mojang.serialization.Codec) -> <init>
+    29:64:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration) -> a
+    68:68:boolean isReplaceable(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,boolean) -> a
+    79:109:void placeStem(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration,net.minecraft.core.BlockPos,int,boolean) -> a
+    112:155:void placeHat(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration,net.minecraft.core.BlockPos,int,boolean) -> b
+    158:166:void placeHatBlock(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration,net.minecraft.core.BlockPos$MutableBlockPos,float,float,float) -> a
+    169:177:void placeHatDropBlock(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    181:191:net.minecraft.core.BlockPos$MutableBlockPos findOnNyliumPosition(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Block) -> a
+    195:209:void tryPlaceWeepingVines(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random) -> a
+    20:20:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    69:72:boolean lambda$isReplaceable$0(boolean,net.minecraft.world.level.block.state.BlockState) -> a
+net.minecraft.world.level.levelgen.feature.HugeRedMushroomFeature -> cla:
+    13:14:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:49:void makeCap(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,int,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> a
+    53:59:int getTreeRadiusForHeight(int,int,int,int) -> a
+net.minecraft.world.level.levelgen.feature.IcePatchFeature -> clb:
+    net.minecraft.world.level.block.Block block -> a
+    15:19:void <init>(com.mojang.serialization.Codec) -> <init>
+    23:50:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureRadiusConfiguration) -> a
+    14:14:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.IceSpikeFeature -> clc:
+    18:19:void <init>(com.mojang.serialization.Codec) -> <init>
+    23:106:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    16:16:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.IcebergFeature -> cld:
+    21:22:void <init>(com.mojang.serialization.Codec) -> <init>
+    26:82:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration) -> a
+    86:114:void generateCutOut(java.util.Random,net.minecraft.world.level.LevelAccessor,int,int,net.minecraft.core.BlockPos,boolean,int,double,int) -> a
+    117:137:void carve(int,int,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,boolean,double,net.minecraft.core.BlockPos,int,int) -> a
+    140:143:void removeFloatingSnowLayer(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    146:155:void generateIcebergBlock(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,int,int,int,int,int,int,boolean,int,double,boolean,net.minecraft.world.level.block.state.BlockState) -> a
+    158:168:void setIcebergBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,int,int,boolean,boolean,net.minecraft.world.level.block.state.BlockState) -> a
+    171:176:int getEllipseC(int,int,int) -> a
+    180:181:double signedDistanceCircle(int,int,net.minecraft.core.BlockPos,int,java.util.Random) -> a
+    185:185:double signedDistanceEllipse(int,int,net.minecraft.core.BlockPos,int,int,double) -> a
+    189:197:int heightDependentRadiusRound(java.util.Random,int,int,int) -> a
+    201:203:int heightDependentRadiusEllipse(int,int,int) -> b
+    207:209:int heightDependentRadiusSteep(java.util.Random,int,int,int) -> b
+    213:213:boolean isIcebergBlock(net.minecraft.world.level.block.Block) -> c
+    217:217:boolean belowIsAir(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    221:254:void smooth(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int,int,boolean,int) -> a
+    19:19:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.IglooFeature -> cle:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:21:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+net.minecraft.world.level.levelgen.feature.IglooFeature$FeatureStart -> cle$a:
+    26:27:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    31:38:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    24:24:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.JunglePyramidFeature -> clf:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:19:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+net.minecraft.world.level.levelgen.feature.JunglePyramidFeature$FeatureStart -> clf$a:
+    24:25:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    29:32:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    22:22:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.KelpFeature -> clg:
+    19:20:void <init>(com.mojang.serialization.Codec) -> <init>
+    24:53:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    17:17:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.LakeFeature -> clh:
+    net.minecraft.world.level.block.state.BlockState AIR -> a
+    23:24:void <init>(com.mojang.serialization.Codec) -> <init>
+    28:157:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration) -> a
+    19:19:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    20:20:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.MineshaftFeature -> cli:
+    23:24:void <init>(com.mojang.serialization.Codec) -> <init>
+    28:31:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration) -> a
+    36:36:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    21:21:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.MineshaftFeature$MineShaftStart -> cli$a:
+    75:76:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    80:98:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration) -> a
+    73:73:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type -> cli$b:
+    net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type NORMAL -> a
+    net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type MESA -> b
+    com.mojang.serialization.Codec CODEC -> c
+    java.util.Map BY_NAME -> d
+    java.lang.String name -> e
+    net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type[] $VALUES -> f
+    39:39:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type[] values() -> values
+    39:39:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type valueOf(java.lang.String) -> valueOf
+    48:50:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    53:53:java.lang.String getName() -> b
+    57:57:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type byName(java.lang.String) -> a
+    61:64:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type byId(int) -> a
+    69:69:java.lang.String getSerializedName() -> a
+    45:45:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type lambda$static$0(net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> a
+    39:45:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.MonsterRoomFeature -> clj:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.world.entity.EntityType[] MOBS -> ac
+    net.minecraft.world.level.block.state.BlockState AIR -> ad
+    32:33:void <init>(com.mojang.serialization.Codec) -> <init>
+    37:142:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    146:146:net.minecraft.world.entity.EntityType randomEntityId(java.util.Random) -> a
+    26:26:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    27:29:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.NetherForestVegetationFeature -> clk:
+    20:21:void <init>(com.mojang.serialization.Codec) -> <init>
+    26:26:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration) -> a
+    30:56:boolean place(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration,int,int) -> a
+    17:17:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.NetherFortressFeature -> cll:
+    java.util.List FORTRESS_ENEMIES -> u
+    30:31:void <init>(com.mojang.serialization.Codec) -> <init>
+    36:36:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    41:41:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    46:46:java.util.List getSpecialEnemies() -> c
+    20:20:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    21:21:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.NetherFortressFeature$NetherBridgeStart -> cll$a:
+    51:52:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    56:69:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    49:49:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.NoOpFeature -> clm:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:19:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    12:12:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.NoSurfaceOreFeature -> cln:
+    22:23:void <init>(com.mojang.serialization.Codec) -> <init>
+    30:42:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration) -> a
+    46:50:void offsetTargetPos(net.minecraft.core.BlockPos$MutableBlockPos,java.util.Random,net.minecraft.core.BlockPos,int) -> a
+    53:53:int getRandomPlacementInOneAxisRelativeToOrigin(java.util.Random,int) -> a
+    57:64:boolean isFacingAir(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    18:18:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.OceanMonumentFeature -> clo:
+    java.util.List MONUMENT_ENEMIES -> u
+    28:29:void <init>(com.mojang.serialization.Codec) -> <init>
+    33:33:boolean linearSeparation() -> b
+    39:53:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    58:58:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    96:96:java.util.List getSpecialEnemies() -> c
+    24:24:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    25:25:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.OceanMonumentFeature$OceanMonumentStart -> clo$a:
+    boolean isCreated -> e
+    65:66:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    70:71:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    74:82:void generatePieces(int,int) -> b
+    86:91:void placeInChunk(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
+    61:61:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.OreFeature -> clp:
+    19:20:void <init>(com.mojang.serialization.Codec) -> <init>
+    24:53:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration) -> a
+    57:150:boolean doPlace(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration,double,double,double,double,double,double,int,int,int,int,int) -> a
+    17:17:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.PillagerOutpostFeature -> clq:
+    java.util.List OUTPOST_ENEMIES -> u
+    24:25:void <init>(com.mojang.serialization.Codec) -> <init>
+    29:29:java.util.List getSpecialEnemies() -> c
+    34:54:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    59:59:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    20:20:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    21:21:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.PillagerOutpostFeature$FeatureStart -> clq$a:
+    64:65:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    69:73:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    62:62:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.PlainVillagePools -> clr:
+    24:24:void <init>() -> <init>
+    381:381:void bootstrap() -> a
+    26:378:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.RandomBooleanSelectorFeature -> cls:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:23:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration) -> a
+    12:12:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.RandomPatchFeature -> clt:
+    17:18:void <init>(com.mojang.serialization.Codec) -> <init>
+    22:48:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> a
+    15:15:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.RandomRandomFeature -> clu:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:28:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomRandomFeatureConfiguration) -> a
+    12:12:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.RandomSelectorFeature -> clv:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:24:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration) -> a
+    12:12:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.ReplaceBlobsFeature -> clw:
+    20:21:void <init>(com.mojang.serialization.Codec) -> <init>
+    25:48:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration) -> a
+    53:61:net.minecraft.core.BlockPos findTarget(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.world.level.block.Block) -> a
+    65:68:net.minecraft.core.Vec3i calculateReach(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration) -> a
+    18:18:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.ReplaceBlockFeature -> clx:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:23:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockConfiguration) -> a
+    13:13:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.RuinedPortalFeature -> cly:
+    java.lang.String[] STRUCTURE_LOCATION_PORTALS -> u
+    java.lang.String[] STRUCTURE_LOCATION_GIANT_PORTALS -> v
+    51:52:void <init>(com.mojang.serialization.Codec) -> <init>
+    56:56:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    135:135:boolean isCold(net.minecraft.core.BlockPos,net.minecraft.world.level.biome.Biome) -> b
+    142:198:int findSuitableY(java.util.Random,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement,boolean,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> b
+    202:202:int randomIntInclusive(java.util.Random,int,int) -> a
+    207:210:int getRandomWithinInterval(java.util.Random,int,int) -> b
+    174:174:net.minecraft.world.level.BlockGetter lambda$findSuitableY$0(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos) -> a
+    32:32:java.lang.String[] access$000() -> d
+    32:32:java.lang.String[] access$100() -> e
+    32:32:int access$200(java.util.Random,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement,boolean,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    32:32:boolean access$300(net.minecraft.core.BlockPos,net.minecraft.world.level.biome.Biome) -> a
+    33:38:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$FeatureStart -> cly$a:
+    61:62:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    67:131:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.RuinedPortalConfiguration) -> a
+    59:59:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type -> cly$b:
+    net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type STANDARD -> a
+    net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type DESERT -> b
+    net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type JUNGLE -> c
+    net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type SWAMP -> d
+    net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type MOUNTAIN -> e
+    net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type OCEAN -> f
+    net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type NETHER -> g
+    com.mojang.serialization.Codec CODEC -> h
+    java.util.Map BY_NAME -> i
+    java.lang.String name -> j
+    net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type[] $VALUES -> k
+    214:214:net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type[] values() -> values
+    214:214:net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type valueOf(java.lang.String) -> valueOf
+    228:230:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    233:233:java.lang.String getName() -> b
+    237:237:net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type byName(java.lang.String) -> a
+    242:242:java.lang.String getSerializedName() -> a
+    225:225:net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type lambda$static$0(net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type) -> a
+    214:225:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.SavannaVillagePools -> clz:
+    24:24:void <init>() -> <init>
+    291:291:void bootstrap() -> a
+    26:288:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.SeaPickleFeature -> cma:
+    19:20:void <init>(com.mojang.serialization.Codec) -> <init>
+    24:37:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.CountFeatureConfiguration) -> a
+    17:17:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.SeagrassFeature -> cmb:
+    20:21:void <init>(com.mojang.serialization.Codec) -> <init>
+    25:50:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration) -> a
+    18:18:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.ShipwreckFeature -> cmc:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:21:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+net.minecraft.world.level.levelgen.feature.ShipwreckFeature$FeatureStart -> cmc$a:
+    26:27:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    31:36:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration) -> a
+    24:24:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.SimpleBlockFeature -> cmd:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:24:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration) -> a
+    13:13:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.SimpleRandomSelectorFeature -> cme:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:21:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFeatureConfiguration) -> a
+    12:12:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.SimulatedFeature -> cmf:
+    void simulate(net.minecraft.server.level.FeatureSimulator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.SnowAndFreezeFeature -> cmg:
+    21:22:void <init>(com.mojang.serialization.Codec) -> <init>
+    26:53:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    19:19:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.SnowyVillagePools -> cmh:
+    24:24:void <init>() -> <init>
+    271:271:void bootstrap() -> a
+    26:268:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.SpikeFeature -> cmi:
+    com.google.common.cache.LoadingCache SPIKE_CACHE -> a
+    37:38:void <init>(com.mojang.serialization.Codec) -> <init>
+    41:43:java.util.List getSpikesForLevel(net.minecraft.world.level.WorldGenLevel) -> a
+    48:59:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration) -> a
+    63:108:void placeSpike(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration,net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike) -> a
+    31:31:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    34:34:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.SpikeFeature$1 -> cmi$1:
+net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike -> cmi$a:
+    com.mojang.serialization.Codec CODEC -> a
+    int centerX -> b
+    int centerZ -> c
+    int radius -> d
+    int height -> e
+    boolean guarded -> f
+    net.minecraft.world.phys.AABB topBoundingBox -> g
+    126:134:void <init>(int,int,int,int,boolean) -> <init>
+    137:138:boolean isCenterWithinChunk(net.minecraft.core.BlockPos) -> a
+    142:142:int getCenterX() -> a
+    146:146:int getCenterZ() -> b
+    150:150:int getRadius() -> c
+    154:154:int getHeight() -> d
+    158:158:boolean isGuarded() -> e
+    162:162:net.minecraft.world.phys.AABB getTopBoundingBox() -> f
+    111:117:com.mojang.datafixers.kinds.App lambda$static$5(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    116:116:java.lang.Boolean lambda$null$4(net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike) -> a
+    115:115:java.lang.Integer lambda$null$3(net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike) -> b
+    114:114:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike) -> c
+    113:113:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike) -> d
+    112:112:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike) -> e
+    111:111:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.SpikeFeature$SpikeCacheLoader -> cmi$b:
+    166:166:void <init>() -> <init>
+    169:182:java.util.List load(java.lang.Long) -> a
+    166:166:java.lang.Object load(java.lang.Object) -> load
+    166:166:void <init>(net.minecraft.world.level.levelgen.feature.SpikeFeature$1) -> <init>
+net.minecraft.world.level.levelgen.feature.SpringFeature -> cmj:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:75:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration) -> a
+    14:14:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.StrongholdFeature -> cmk:
+    20:21:void <init>(com.mojang.serialization.Codec) -> <init>
+    25:25:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    30:30:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    18:18:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.StrongholdFeature$StrongholdStart -> cmk$a:
+    long seed -> e
+    37:39:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    43:69:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    33:33:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.StructureFeature -> cml:
+    com.google.common.collect.BiMap STRUCTURES_REGISTRY -> a
+    java.util.Map STEP -> u
+    org.apache.logging.log4j.Logger LOGGER -> v
     net.minecraft.world.level.levelgen.feature.StructureFeature PILLAGER_OUTPOST -> b
     net.minecraft.world.level.levelgen.feature.StructureFeature MINESHAFT -> c
     net.minecraft.world.level.levelgen.feature.StructureFeature WOODLAND_MANSION -> d
     net.minecraft.world.level.levelgen.feature.StructureFeature JUNGLE_TEMPLE -> e
     net.minecraft.world.level.levelgen.feature.StructureFeature DESERT_PYRAMID -> f
     net.minecraft.world.level.levelgen.feature.StructureFeature IGLOO -> g
-    net.minecraft.world.level.levelgen.feature.StructureFeature SHIPWRECK -> h
-    net.minecraft.world.level.levelgen.feature.SwamplandHutFeature SWAMP_HUT -> i
-    net.minecraft.world.level.levelgen.feature.StructureFeature STRONGHOLD -> j
-    net.minecraft.world.level.levelgen.feature.StructureFeature OCEAN_MONUMENT -> k
-    net.minecraft.world.level.levelgen.feature.StructureFeature OCEAN_RUIN -> l
-    net.minecraft.world.level.levelgen.feature.StructureFeature NETHER_BRIDGE -> m
-    net.minecraft.world.level.levelgen.feature.StructureFeature END_CITY -> n
-    net.minecraft.world.level.levelgen.feature.StructureFeature BURIED_TREASURE -> o
-    net.minecraft.world.level.levelgen.feature.StructureFeature VILLAGE -> p
-    net.minecraft.world.level.levelgen.feature.Feature NO_OP -> q
-    net.minecraft.world.level.levelgen.feature.Feature NORMAL_TREE -> r
-    net.minecraft.world.level.levelgen.feature.Feature ACACIA_TREE -> s
-    net.minecraft.world.level.levelgen.feature.Feature FANCY_TREE -> t
-    net.minecraft.world.level.levelgen.feature.Feature JUNGLE_GROUND_BUSH -> u
-    net.minecraft.world.level.levelgen.feature.Feature DARK_OAK_TREE -> v
-    net.minecraft.world.level.levelgen.feature.Feature MEGA_JUNGLE_TREE -> w
-    net.minecraft.world.level.levelgen.feature.Feature MEGA_SPRUCE_TREE -> x
-    net.minecraft.world.level.levelgen.feature.AbstractFlowerFeature FLOWER -> y
-    net.minecraft.world.level.levelgen.feature.Feature RANDOM_PATCH -> z
-    net.minecraft.world.level.levelgen.feature.Feature BLOCK_PILE -> A
-    net.minecraft.world.level.levelgen.feature.Feature SPRING -> B
-    net.minecraft.world.level.levelgen.feature.Feature CHORUS_PLANT -> C
-    net.minecraft.world.level.levelgen.feature.Feature EMERALD_ORE -> D
-    net.minecraft.world.level.levelgen.feature.Feature VOID_START_PLATFORM -> E
-    net.minecraft.world.level.levelgen.feature.Feature DESERT_WELL -> F
-    net.minecraft.world.level.levelgen.feature.Feature FOSSIL -> G
-    net.minecraft.world.level.levelgen.feature.Feature HUGE_RED_MUSHROOM -> H
-    net.minecraft.world.level.levelgen.feature.Feature HUGE_BROWN_MUSHROOM -> I
-    net.minecraft.world.level.levelgen.feature.Feature ICE_SPIKE -> J
-    net.minecraft.world.level.levelgen.feature.Feature GLOWSTONE_BLOB -> K
-    net.minecraft.world.level.levelgen.feature.Feature FREEZE_TOP_LAYER -> L
-    net.minecraft.world.level.levelgen.feature.Feature VINES -> M
-    net.minecraft.world.level.levelgen.feature.Feature MONSTER_ROOM -> N
-    net.minecraft.world.level.levelgen.feature.Feature BLUE_ICE -> O
-    net.minecraft.world.level.levelgen.feature.Feature ICEBERG -> P
-    net.minecraft.world.level.levelgen.feature.Feature FOREST_ROCK -> Q
-    net.minecraft.world.level.levelgen.feature.Feature DISK -> R
-    net.minecraft.world.level.levelgen.feature.Feature ICE_PATCH -> S
-    net.minecraft.world.level.levelgen.feature.Feature LAKE -> T
-    net.minecraft.world.level.levelgen.feature.Feature ORE -> U
-    net.minecraft.world.level.levelgen.feature.Feature END_SPIKE -> V
-    net.minecraft.world.level.levelgen.feature.Feature END_ISLAND -> W
-    net.minecraft.world.level.levelgen.feature.Feature END_GATEWAY -> X
-    net.minecraft.world.level.levelgen.feature.Feature SEAGRASS -> Y
-    net.minecraft.world.level.levelgen.feature.Feature KELP -> Z
-    net.minecraft.world.level.levelgen.feature.Feature CORAL_TREE -> aa
-    net.minecraft.world.level.levelgen.feature.Feature CORAL_MUSHROOM -> ab
-    net.minecraft.world.level.levelgen.feature.Feature CORAL_CLAW -> ac
-    net.minecraft.world.level.levelgen.feature.Feature SEA_PICKLE -> ad
-    net.minecraft.world.level.levelgen.feature.Feature SIMPLE_BLOCK -> ae
-    net.minecraft.world.level.levelgen.feature.Feature BAMBOO -> af
-    net.minecraft.world.level.levelgen.feature.Feature FILL_LAYER -> ag
-    net.minecraft.world.level.levelgen.feature.BonusChestFeature BONUS_CHEST -> ah
-    net.minecraft.world.level.levelgen.feature.Feature RANDOM_RANDOM_SELECTOR -> ai
-    net.minecraft.world.level.levelgen.feature.Feature RANDOM_SELECTOR -> aj
-    net.minecraft.world.level.levelgen.feature.Feature SIMPLE_RANDOM_SELECTOR -> ak
-    net.minecraft.world.level.levelgen.feature.Feature RANDOM_BOOLEAN_SELECTOR -> al
-    net.minecraft.world.level.levelgen.feature.Feature DECORATED -> am
-    net.minecraft.world.level.levelgen.feature.Feature DECORATED_FLOWER -> an
-    com.google.common.collect.BiMap STRUCTURES_REGISTRY -> ao
-    java.util.List NOISE_AFFECTING_FEATURES -> ap
-    java.util.function.Function configurationFactory -> a
-    133:133:net.minecraft.world.level.levelgen.feature.Feature register(java.lang.String,net.minecraft.world.level.levelgen.feature.Feature) -> a
-    162:162:boolean isInsideStructure(net.minecraft.world.level.LevelAccessor,java.lang.String,net.minecraft.core.BlockPos) -> a
-    165:167:void <init>(java.util.function.Function) -> <init>
-    170:170:net.minecraft.world.level.levelgen.feature.ConfiguredFeature configured(com.mojang.datafixers.Dynamic) -> a
-    174:174:net.minecraft.world.level.levelgen.feature.ConfiguredFeature configured(net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> b
-    178:178:net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration createSettings(com.mojang.datafixers.Dynamic) -> b
-    182:183:void setBlock(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    188:188:java.util.List getSpecialEnemies() -> e
-    192:192:java.util.List getSpecialAnimals() -> f
-    196:196:boolean isStone(net.minecraft.world.level.block.Block) -> a
-    203:203:boolean isDirt(net.minecraft.world.level.block.Block) -> b
-    137:152:void lambda$static$0(com.google.common.collect.HashBiMap) -> a
-    59:154:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.FillLayerFeature -> cdv:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:35:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration) -> a
-    14:14:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.FossilFeature -> cdw:
-    net.minecraft.resources.ResourceLocation SPINE_1 -> a
-    net.minecraft.resources.ResourceLocation SPINE_2 -> aq
-    net.minecraft.resources.ResourceLocation SPINE_3 -> ar
-    net.minecraft.resources.ResourceLocation SPINE_4 -> as
-    net.minecraft.resources.ResourceLocation SPINE_1_COAL -> at
-    net.minecraft.resources.ResourceLocation SPINE_2_COAL -> au
-    net.minecraft.resources.ResourceLocation SPINE_3_COAL -> av
-    net.minecraft.resources.ResourceLocation SPINE_4_COAL -> aw
-    net.minecraft.resources.ResourceLocation SKULL_1 -> ax
-    net.minecraft.resources.ResourceLocation SKULL_2 -> ay
-    net.minecraft.resources.ResourceLocation SKULL_3 -> az
-    net.minecraft.resources.ResourceLocation SKULL_4 -> aA
-    net.minecraft.resources.ResourceLocation SKULL_1_COAL -> aB
-    net.minecraft.resources.ResourceLocation SKULL_2_COAL -> aC
-    net.minecraft.resources.ResourceLocation SKULL_3_COAL -> aD
-    net.minecraft.resources.ResourceLocation SKULL_4_COAL -> aE
-    net.minecraft.resources.ResourceLocation[] fossils -> aF
-    net.minecraft.resources.ResourceLocation[] fossilsCoal -> aG
-    71:72:void <init>(java.util.function.Function) -> <init>
-    77:114:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    27:27:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    28:59:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.GlowstoneFeature -> cdx:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:53:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    16:16:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.GroundBushFeature -> cdy:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    23:42:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.HugeBrownMushroomFeature -> cdz:
-    14:15:void <init>(java.util.function.Function) -> <init>
-    19:48:void makeCap(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,int,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> a
-    52:52:int getTreeRadiusForHeight(int,int,int,int) -> a
-net.minecraft.world.level.levelgen.feature.HugeRedMushroomFeature -> cea:
-    14:15:void <init>(java.util.function.Function) -> <init>
-    19:50:void makeCap(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,int,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> a
-    54:60:int getTreeRadiusForHeight(int,int,int,int) -> a
-net.minecraft.world.level.levelgen.feature.IcePatchFeature -> ceb:
-    net.minecraft.world.level.block.Block block -> a
-    16:20:void <init>(java.util.function.Function) -> <init>
-    24:51:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureRadiusConfiguration) -> a
-    15:15:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.IceSpikeFeature -> cec:
-    19:20:void <init>(java.util.function.Function) -> <init>
-    24:107:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    17:17:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.IcebergFeature -> ced:
-    21:22:void <init>(java.util.function.Function) -> <init>
-    26:82:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration) -> a
-    86:114:void generateCutOut(java.util.Random,net.minecraft.world.level.LevelAccessor,int,int,net.minecraft.core.BlockPos,boolean,int,double,int) -> a
-    117:137:void carve(int,int,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,boolean,double,net.minecraft.core.BlockPos,int,int) -> a
-    140:143:void removeFloatingSnowLayer(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    146:155:void generateIcebergBlock(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,int,int,int,int,int,int,boolean,int,double,boolean,net.minecraft.world.level.block.state.BlockState) -> a
-    158:169:void setIcebergBlock(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,int,int,boolean,boolean,net.minecraft.world.level.block.state.BlockState) -> a
-    172:177:int getEllipseC(int,int,int) -> a
-    181:182:double signedDistanceCircle(int,int,net.minecraft.core.BlockPos,int,java.util.Random) -> a
-    186:186:double signedDistanceEllipse(int,int,net.minecraft.core.BlockPos,int,int,double) -> a
-    190:198:int heightDependentRadiusRound(java.util.Random,int,int,int) -> a
-    202:204:int heightDependentRadiusEllipse(int,int,int) -> b
-    208:210:int heightDependentRadiusSteep(java.util.Random,int,int,int) -> b
-    214:214:boolean isIcebergBlock(net.minecraft.world.level.block.Block) -> c
-    218:218:boolean belowIsAir(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    222:255:void smooth(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,int,int,boolean,int) -> a
-    19:19:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.IglooFeature -> cee:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:23:java.lang.String getFeatureName() -> b
-    28:28:int getLookupRange() -> c
-    33:33:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    38:38:int getRandomSalt() -> d
-net.minecraft.world.level.levelgen.feature.IglooFeature$FeatureStart -> cee$a:
-    43:44:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    48:57:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.JunglePyramidFeature -> cef:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:21:java.lang.String getFeatureName() -> b
-    26:26:int getLookupRange() -> c
-    31:31:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    36:36:int getRandomSalt() -> d
-net.minecraft.world.level.levelgen.feature.JunglePyramidFeature$FeatureStart -> cef$a:
-    41:42:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    46:49:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.KelpFeature -> ceg:
-    20:21:void <init>(java.util.function.Function) -> <init>
-    25:54:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    18:18:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.LakeFeature -> ceh:
-    net.minecraft.world.level.block.state.BlockState AIR -> a
-    25:26:void <init>(java.util.function.Function) -> <init>
-    30:160:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration) -> a
-    21:21:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.MegaJungleTreeFeature -> cei:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:55:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration) -> a
-    59:63:void createCrown(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,int,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> c
-    15:15:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.MegaPineTreeFeature -> cej:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:28:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration) -> a
-    32:41:void createCrown(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,int,int,int,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration) -> a
-    14:14:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.MegaTreeFeature -> cek:
-    19:20:void <init>(java.util.function.Function) -> <init>
-    23:27:int calcTreeHeigth(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration) -> a
-    31:54:boolean checkIsFree(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos,int) -> a
-    58:68:boolean makeDirtFloor(net.minecraft.world.level.LevelSimulatedRW,net.minecraft.core.BlockPos) -> b
-    72:72:boolean prepareTree(net.minecraft.world.level.LevelSimulatedRW,net.minecraft.core.BlockPos,int) -> a
-    76:92:void placeDoubleTrunkLeaves(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,int,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-    95:106:void placeSingleTrunkLeaves(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,int,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> b
-    109:134:void placeTrunk(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,int,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.MineshaftFeature -> cel:
-    23:24:void <init>(java.util.function.Function) -> <init>
-    28:35:boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
-    40:40:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    45:45:java.lang.String getFeatureName() -> b
-    50:50:int getLookupRange() -> c
-net.minecraft.world.level.levelgen.feature.MineshaftFeature$MineShaftStart -> cel$a:
-    83:84:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    88:108:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type -> cel$b:
-    net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type NORMAL -> a
-    net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type MESA -> b
-    java.util.Map BY_NAME -> c
-    java.lang.String name -> d
-    net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type[] $VALUES -> e
-    53:53:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type[] values() -> values
-    53:53:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type valueOf(java.lang.String) -> valueOf
-    61:63:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    66:66:java.lang.String getName() -> a
-    70:70:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type byName(java.lang.String) -> a
-    74:77:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type byId(int) -> a
-    58:58:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type lambda$static$0(net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> a
-    53:58:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.MonsterRoomFeature -> cem:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.world.entity.EntityType[] MOBS -> aq
-    net.minecraft.world.level.block.state.BlockState AIR -> ar
-    32:33:void <init>(java.util.function.Function) -> <init>
-    37:141:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    145:145:net.minecraft.world.entity.EntityType randomEntityId(java.util.Random) -> a
-    26:26:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    27:29:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.NetherFortressFeature -> cen:
-    java.util.List FORTRESS_ENEMIES -> a
-    30:31:void <init>(java.util.function.Function) -> <init>
-    35:51:boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
-    56:56:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    61:61:java.lang.String getFeatureName() -> b
-    66:66:int getLookupRange() -> c
-    71:71:java.util.List getSpecialEnemies() -> e
-    21:21:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.NetherFortressFeature$NetherBridgeStart -> cen$a:
-    76:77:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    81:94:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.NoOpFeature -> ceo:
-    15:16:void <init>(java.util.function.Function) -> <init>
-    20:20:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    13:13:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.OceanMonumentFeature -> cep:
-    java.util.List MONUMENT_ENEMIES -> a
-    30:31:void <init>(java.util.function.Function) -> <init>
-    35:54:net.minecraft.world.level.ChunkPos getPotentialFeatureChunkFromLocationWithOffset(net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,int,int) -> a
-    59:79:boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
-    84:84:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    122:122:java.lang.String getFeatureName() -> b
-    127:127:int getLookupRange() -> c
-    132:132:java.util.List getSpecialEnemies() -> e
-    27:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.OceanMonumentFeature$OceanMonumentStart -> cep$a:
-    boolean isCreated -> e
-    91:92:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    96:97:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-    100:108:void generatePieces(int,int) -> b
-    112:117:void postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.feature.OreFeature -> ceq:
-    19:20:void <init>(java.util.function.Function) -> <init>
-    24:52:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration) -> a
-    56:149:boolean doPlace(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration,double,double,double,double,double,double,int,int,int,int,int) -> a
-    17:17:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.PillagerOutpostFeature -> cer:
-    java.util.List OUTPOST_ENEMIES -> a
-    25:26:void <init>(java.util.function.Function) -> <init>
-    30:30:java.lang.String getFeatureName() -> b
-    35:35:int getLookupRange() -> c
-    40:40:java.util.List getSpecialEnemies() -> e
-    45:71:boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
-    76:76:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    81:81:int getRandomSalt() -> d
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.PillagerOutpostFeature$FeatureStart -> cer$a:
-    86:87:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    91:95:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.PlainVillagePools -> ces:
-    24:24:void <init>() -> <init>
-    381:381:void bootstrap() -> a
-    26:378:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.RandomBooleanSelectorFeature -> cet:
-    15:16:void <init>(java.util.function.Function) -> <init>
-    20:24:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration) -> a
-    13:13:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.RandomPatchFeature -> ceu:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:49:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> a
-    16:16:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.RandomRandomFeature -> cev:
-    15:16:void <init>(java.util.function.Function) -> <init>
-    20:29:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomRandomFeatureConfiguration) -> a
-    13:13:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.RandomScatteredFeature -> cew:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:40:net.minecraft.world.level.ChunkPos getPotentialFeatureChunkFromLocationWithOffset(net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,int,int) -> a
-    45:53:boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
-    57:57:int getSpacing(net.minecraft.world.level.chunk.ChunkGenerator) -> a
-    61:61:int getSeparation(net.minecraft.world.level.chunk.ChunkGenerator) -> b
-    int getRandomSalt() -> d
-net.minecraft.world.level.levelgen.feature.RandomSelectorFeature -> cex:
-    15:16:void <init>(java.util.function.Function) -> <init>
-    20:25:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration) -> a
-    13:13:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.ReplaceBlockFeature -> cey:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:24:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockConfiguration) -> a
-    14:14:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.SavannaVillagePools -> cez:
-    24:24:void <init>() -> <init>
-    291:291:void bootstrap() -> a
-    26:288:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.SeaPickleFeature -> cfa:
-    19:20:void <init>(java.util.function.Function) -> <init>
-    24:37:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.CountFeatureConfiguration) -> a
-    17:17:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.SeagrassFeature -> cfb:
-    21:22:void <init>(java.util.function.Function) -> <init>
-    26:51:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration) -> a
-    19:19:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.ShipwreckFeature -> cfc:
-    20:21:void <init>(java.util.function.Function) -> <init>
-    25:25:java.lang.String getFeatureName() -> b
-    30:30:int getLookupRange() -> c
-    35:35:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    40:40:int getRandomSalt() -> d
-    45:45:int getSpacing(net.minecraft.world.level.chunk.ChunkGenerator) -> a
-    50:50:int getSeparation(net.minecraft.world.level.chunk.ChunkGenerator) -> b
-net.minecraft.world.level.levelgen.feature.ShipwreckFeature$FeatureStart -> cfc$a:
-    55:56:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    60:67:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.SimpleBlockFeature -> cfd:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:25:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration) -> a
-    14:14:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.SimpleRandomSelectorFeature -> cfe:
-    15:16:void <init>(java.util.function.Function) -> <init>
-    20:22:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFeatureConfiguration) -> a
-    13:13:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.SimulatedFeature -> cff:
-    void simulate(net.minecraft.server.level.FeatureSimulator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.SnowAndFreezeFeature -> cfg:
-    22:23:void <init>(java.util.function.Function) -> <init>
-    27:54:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    20:20:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.SnowyVillagePools -> cfh:
-    24:24:void <init>() -> <init>
-    271:271:void bootstrap() -> a
-    26:268:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.SpikeFeature -> cfi:
-    com.google.common.cache.LoadingCache SPIKE_CACHE -> a
-    38:39:void <init>(java.util.function.Function) -> <init>
-    42:44:java.util.List getSpikesForLevel(net.minecraft.world.level.LevelAccessor) -> a
-    49:60:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration) -> a
-    64:109:void placeSpike(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration,net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike) -> a
-    32:32:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    35:35:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.SpikeFeature$1 -> cfi$1:
-net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike -> cfi$a:
-    int centerX -> a
-    int centerZ -> b
-    int radius -> c
-    int height -> d
-    boolean guarded -> e
-    net.minecraft.world.phys.AABB topBoundingBox -> f
-    119:127:void <init>(int,int,int,int,boolean) -> <init>
-    130:131:boolean isCenterWithinChunk(net.minecraft.core.BlockPos) -> a
-    135:135:int getCenterX() -> a
-    139:139:int getCenterZ() -> b
-    143:143:int getRadius() -> c
-    147:147:int getHeight() -> d
-    151:151:boolean isGuarded() -> e
-    155:155:net.minecraft.world.phys.AABB getTopBoundingBox() -> f
-    159:165:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    169:174:net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.SpikeFeature$SpikeCacheLoader -> cfi$b:
-    179:179:void <init>() -> <init>
-    182:195:java.util.List load(java.lang.Long) -> a
-    179:179:java.lang.Object load(java.lang.Object) -> load
-    179:179:void <init>(net.minecraft.world.level.levelgen.feature.SpikeFeature$1) -> <init>
-net.minecraft.world.level.levelgen.feature.SpringFeature -> cfj:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:76:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration) -> a
-    15:15:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.StrongholdFeature -> cfk:
-    boolean isSpotSelected -> a
-    net.minecraft.world.level.ChunkPos[] strongholdPos -> aq
-    java.util.List discoveredStarts -> ar
-    long currentSeed -> as
-    29:34:void <init>(java.util.function.Function) -> <init>
-    39:52:boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
-    56:59:void reset() -> d
-    63:63:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    108:108:java.lang.String getFeatureName() -> b
-    113:113:int getLookupRange() -> c
-    119:148:net.minecraft.core.BlockPos getNearestGeneratedFeature(net.minecraft.world.level.Level,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,int,boolean) -> a
-    152:211:void generatePositions(net.minecraft.world.level.chunk.ChunkGenerator) -> a
-    25:25:java.util.List access$000(net.minecraft.world.level.levelgen.feature.StrongholdFeature) -> a
-net.minecraft.world.level.levelgen.feature.StrongholdFeature$StrongholdStart -> cfk$a:
-    68:69:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    73:103:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.StructureFeature -> cfl:
-    org.apache.logging.log4j.Logger LOGGER -> a
-    54:55:void <init>(java.util.function.Function) -> <init>
-    59:59:net.minecraft.world.level.levelgen.feature.ConfiguredFeature configured(net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> b
-    64:83:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    87:102:net.minecraft.world.level.levelgen.structure.StructureStart getStructureAt(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,boolean) -> a
-    106:106:boolean isInsideBoundingFeature(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    113:113:boolean isInsideFeature(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
-    118:158:net.minecraft.core.BlockPos getNearestGeneratedFeature(net.minecraft.world.level.Level,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,int,boolean) -> a
-    162:175:java.util.List dereferenceStructureStarts(net.minecraft.world.level.LevelAccessor,int,int) -> a
-    179:179:net.minecraft.world.level.ChunkPos getPotentialFeatureChunkFromLocationWithOffset(net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,int,int) -> a
-    183:183:boolean supportsProjection() -> g
-    boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
+    net.minecraft.world.level.levelgen.feature.StructureFeature RUINED_PORTAL -> h
+    net.minecraft.world.level.levelgen.feature.StructureFeature SHIPWRECK -> i
+    net.minecraft.world.level.levelgen.feature.SwamplandHutFeature SWAMP_HUT -> j
+    net.minecraft.world.level.levelgen.feature.StructureFeature STRONGHOLD -> k
+    net.minecraft.world.level.levelgen.feature.StructureFeature OCEAN_MONUMENT -> l
+    net.minecraft.world.level.levelgen.feature.StructureFeature OCEAN_RUIN -> m
+    net.minecraft.world.level.levelgen.feature.StructureFeature NETHER_BRIDGE -> n
+    net.minecraft.world.level.levelgen.feature.StructureFeature END_CITY -> o
+    net.minecraft.world.level.levelgen.feature.StructureFeature BURIED_TREASURE -> p
+    net.minecraft.world.level.levelgen.feature.StructureFeature VILLAGE -> q
+    net.minecraft.world.level.levelgen.feature.StructureFeature NETHER_FOSSIL -> r
+    net.minecraft.world.level.levelgen.feature.StructureFeature BASTION_REMNANT -> s
+    java.util.List NOISE_AFFECTING_FEATURES -> t
+    com.mojang.serialization.Codec configuredStructureCodec -> w
+    83:85:net.minecraft.world.level.levelgen.feature.StructureFeature register(java.lang.String,net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.levelgen.GenerationStep$Decoration) -> a
+    92:94:void <init>(com.mojang.serialization.Codec) -> <init>
+    97:97:net.minecraft.world.level.levelgen.GenerationStep$Decoration step() -> f
+    101:101:void bootstrap() -> g
+    105:146:net.minecraft.world.level.levelgen.structure.StructureStart loadStaticStart(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag,long) -> a
+    151:151:com.mojang.serialization.Codec configuredStructureCodec() -> h
+    155:155:net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature configured(net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    160:202:net.minecraft.core.BlockPos getNearestGeneratedFeature(net.minecraft.world.level.LevelReader,net.minecraft.world.level.StructureFeatureManager,net.minecraft.core.BlockPos,int,boolean,long,net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration) -> a
+    206:206:boolean linearSeparation() -> b
+    210:229:net.minecraft.world.level.ChunkPos getPotentialFeatureChunk(net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int) -> a
+    236:236:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    240:240:net.minecraft.world.level.levelgen.structure.StructureStart createStart(int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> a
+    244:254:net.minecraft.world.level.levelgen.structure.StructureStart generate(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,long,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.biome.Biome,int,net.minecraft.world.level.levelgen.WorldgenRandom,net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
     net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    java.lang.String getFeatureName() -> b
-    int getLookupRange() -> c
-    51:51:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory -> cfl$a:
+    260:260:java.lang.String getFeatureName() -> i
+    268:268:java.util.List getSpecialEnemies() -> c
+    272:272:java.util.List getSpecialAnimals() -> j
+    93:93:net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration lambda$new$1(net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature) -> a
+    93:93:net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature lambda$new$0(net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> b
+    51:75:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory -> cml$a:
     net.minecraft.world.level.levelgen.structure.StructureStart create(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> create
-net.minecraft.world.level.levelgen.feature.StructurePieceType -> cfm:
+net.minecraft.world.level.levelgen.feature.StructurePieceType -> cmm:
     net.minecraft.world.level.levelgen.feature.StructurePieceType MINE_SHAFT_CORRIDOR -> a
     net.minecraft.world.level.levelgen.feature.StructurePieceType MINE_SHAFT_CROSSING -> b
     net.minecraft.world.level.levelgen.feature.StructurePieceType MINE_SHAFT_ROOM -> c
@@ -59780,337 +65288,507 @@ net.minecraft.world.level.levelgen.feature.StructurePieceType -> cfm:
     net.minecraft.world.level.levelgen.feature.StructurePieceType JUNGLE_PYRAMID_PIECE -> I
     net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_RUIN -> J
     net.minecraft.world.level.levelgen.feature.StructurePieceType IGLOO -> K
-    net.minecraft.world.level.levelgen.feature.StructurePieceType SWAMPLAND_HUT -> L
-    net.minecraft.world.level.levelgen.feature.StructurePieceType DESERT_PYRAMID_PIECE -> M
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_BUILDING -> N
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_CORE_ROOM -> O
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_DOUBLE_X_ROOM -> P
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_DOUBLE_XY_ROOM -> Q
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_DOUBLE_Y_ROOM -> R
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_DOUBLE_YZ_ROOM -> S
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_DOUBLE_Z_ROOM -> T
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_ENTRY_ROOM -> U
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_PENTHOUSE -> V
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_SIMPLE_ROOM -> W
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_SIMPLE_TOP_ROOM -> X
-    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_WING_ROOM -> Y
-    net.minecraft.world.level.levelgen.feature.StructurePieceType END_CITY_PIECE -> Z
-    net.minecraft.world.level.levelgen.feature.StructurePieceType WOODLAND_MANSION_PIECE -> aa
-    net.minecraft.world.level.levelgen.feature.StructurePieceType BURIED_TREASURE_PIECE -> ab
-    net.minecraft.world.level.levelgen.feature.StructurePieceType SHIPWRECK_PIECE -> ac
+    net.minecraft.world.level.levelgen.feature.StructurePieceType RUINED_PORTAL -> L
+    net.minecraft.world.level.levelgen.feature.StructurePieceType SWAMPLAND_HUT -> M
+    net.minecraft.world.level.levelgen.feature.StructurePieceType DESERT_PYRAMID_PIECE -> N
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_BUILDING -> O
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_CORE_ROOM -> P
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_DOUBLE_X_ROOM -> Q
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_DOUBLE_XY_ROOM -> R
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_DOUBLE_Y_ROOM -> S
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_DOUBLE_YZ_ROOM -> T
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_DOUBLE_Z_ROOM -> U
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_ENTRY_ROOM -> V
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_PENTHOUSE -> W
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_SIMPLE_ROOM -> X
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_SIMPLE_TOP_ROOM -> Y
+    net.minecraft.world.level.levelgen.feature.StructurePieceType OCEAN_MONUMENT_WING_ROOM -> Z
+    net.minecraft.world.level.levelgen.feature.StructurePieceType END_CITY_PIECE -> aa
+    net.minecraft.world.level.levelgen.feature.StructurePieceType WOODLAND_MANSION_PIECE -> ab
+    net.minecraft.world.level.levelgen.feature.StructurePieceType BURIED_TREASURE_PIECE -> ac
+    net.minecraft.world.level.levelgen.feature.StructurePieceType SHIPWRECK_PIECE -> ad
+    net.minecraft.world.level.levelgen.feature.StructurePieceType NETHER_FOSSIL -> ae
+    net.minecraft.world.level.levelgen.feature.StructurePieceType BASTION_REMNANT -> af
+    net.minecraft.world.level.levelgen.feature.StructurePieceType RUNTIME -> ag
     net.minecraft.world.level.levelgen.structure.StructurePiece load(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> load
-    86:86:net.minecraft.world.level.levelgen.feature.StructurePieceType setPieceId(net.minecraft.world.level.levelgen.feature.StructurePieceType,java.lang.String) -> a
-    25:79:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.SwamplandHutFeature -> cfn:
-    java.util.List SWAMPHUT_ENEMIES -> a
-    java.util.List SWAMPHUT_ANIMALS -> aq
-    25:26:void <init>(java.util.function.Function) -> <init>
-    30:30:java.lang.String getFeatureName() -> b
-    35:35:int getLookupRange() -> c
-    40:40:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    45:45:int getRandomSalt() -> d
-    63:63:java.util.List getSpecialEnemies() -> e
-    68:68:java.util.List getSpecialAnimals() -> f
-    72:77:boolean isSwamphut(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> c
-    21:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.SwamplandHutFeature$FeatureStart -> cfn$a:
-    50:51:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    55:58:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.TaigaVillagePools -> cfo:
+    93:93:net.minecraft.world.level.levelgen.feature.StructurePieceType setPieceId(net.minecraft.world.level.levelgen.feature.StructurePieceType,java.lang.String) -> a
+    28:86:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.SwamplandHutFeature -> cmn:
+    java.util.List SWAMPHUT_ENEMIES -> u
+    java.util.List SWAMPHUT_ANIMALS -> v
+    21:22:void <init>(com.mojang.serialization.Codec) -> <init>
+    26:26:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    44:44:java.util.List getSpecialEnemies() -> c
+    49:49:java.util.List getSpecialAnimals() -> j
+    17:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.SwamplandHutFeature$FeatureStart -> cmn$a:
+    31:32:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    36:39:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    29:29:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.TaigaVillagePools -> cmo:
     25:25:void <init>() -> <init>
     267:267:void bootstrap() -> a
     27:264:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.TreeFeature -> cfp:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:34:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    14:14:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.VillageFeature -> cfq:
-    22:23:void <init>(java.util.function.Function) -> <init>
-    27:46:net.minecraft.world.level.ChunkPos getPotentialFeatureChunkFromLocationWithOffset(net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,int,int) -> a
-    51:57:boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
-    62:62:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    67:67:java.lang.String getFeatureName() -> b
-    72:72:int getLookupRange() -> c
-    77:77:boolean supportsProjection() -> g
-net.minecraft.world.level.levelgen.feature.VillageFeature$FeatureStart -> cfq$a:
-    82:83:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    87:93:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.feature.VillagePieces -> cfr:
+net.minecraft.world.level.levelgen.feature.TreeFeature -> cmp:
+    40:41:void <init>(com.mojang.serialization.Codec) -> <init>
+    44:44:boolean isFree(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> c
+    48:48:boolean isVine(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> f
+    52:52:boolean isBlockWater(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> g
+    56:56:boolean isAirOrLeaves(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> d
+    60:60:boolean isGrassOrDirtOrFarmland(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> h
+    67:67:boolean isReplaceablePlant(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> i
+    74:75:void setBlockKnownShape(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    78:78:boolean validTreePos(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> e
+    82:132:boolean doPlace(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    136:150:int getMaxFreeTreeHeight(net.minecraft.world.level.LevelSimulatedReader,int,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    155:156:void setBlock(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    160:182:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    186:246:net.minecraft.world.phys.shapes.DiscreteVoxelShape updateLeaves(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Set,java.util.Set) -> a
+    251:254:void simulate(net.minecraft.server.level.FeatureSimulator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    38:38:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    38:38:void simulate(net.minecraft.server.level.FeatureSimulator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    176:176:void lambda$place$7(net.minecraft.world.level.WorldGenLevel,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator) -> a
+    130:130:void lambda$doPlace$6(net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,int,int,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment) -> a
+    68:69:boolean lambda$isReplaceablePlant$5(net.minecraft.world.level.block.state.BlockState) -> a
+    61:62:boolean lambda$isGrassOrDirtOrFarmland$4(net.minecraft.world.level.block.state.BlockState) -> b
+    56:56:boolean lambda$isAirOrLeaves$3(net.minecraft.world.level.block.state.BlockState) -> c
+    52:52:boolean lambda$isBlockWater$2(net.minecraft.world.level.block.state.BlockState) -> d
+    48:48:boolean lambda$isVine$1(net.minecraft.world.level.block.state.BlockState) -> e
+    44:44:boolean lambda$isFree$0(net.minecraft.world.level.block.state.BlockState) -> f
+net.minecraft.world.level.levelgen.feature.TwistingVinesFeature -> cmq:
+    22:23:void <init>(com.mojang.serialization.Codec) -> <init>
+    28:28:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    32:37:boolean place(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,int,int,int) -> a
+    41:70:void placeTwistingVines(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos,int,int,int) -> b
+    74:80:boolean findFirstAirBlockAboveGround(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos$MutableBlockPos) -> a
+    84:96:void placeWeepingVinesColumn(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int) -> a
+    99:104:boolean isInvalidPlacementLocation(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    20:20:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.VillageFeature -> cmr:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:20:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+net.minecraft.world.level.levelgen.feature.VillageFeature$FeatureStart -> cmr$a:
+    25:26:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    30:35:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration) -> a
+    23:23:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.VillagePieces -> cms:
     18:18:void <init>() -> <init>
-    20:27:void addPieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,java.util.List,net.minecraft.world.level.levelgen.WorldgenRandom,net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration) -> a
-net.minecraft.world.level.levelgen.feature.VillagePieces$VillagePiece -> cfr$a:
-    31:32:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement,net.minecraft.core.BlockPos,int,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
-    35:36:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-net.minecraft.world.level.levelgen.feature.VinesFeature -> cfs:
+    20:25:void bootstrap() -> a
+    28:31:void addPieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,java.util.List,net.minecraft.world.level.levelgen.WorldgenRandom,net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.VillagePieces$VillagePiece -> cms$a:
+    35:36:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement,net.minecraft.core.BlockPos,int,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
+    39:40:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+net.minecraft.world.level.levelgen.feature.VinesFeature -> cmt:
     net.minecraft.core.Direction[] DIRECTIONS -> a
-    22:23:void <init>(java.util.function.Function) -> <init>
-    27:48:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    18:18:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    19:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.VoidStartPlatformFeature -> cft:
+    21:22:void <init>(com.mojang.serialization.Codec) -> <init>
+    26:47:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    17:17:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.VoidStartPlatformFeature -> cmu:
     net.minecraft.core.BlockPos PLATFORM_ORIGIN -> a
-    net.minecraft.world.level.ChunkPos PLATFORM_ORIGIN_CHUNK -> aq
-    23:24:void <init>(java.util.function.Function) -> <init>
-    27:27:int checkerboardDistance(int,int,int,int) -> a
-    32:51:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    16:16:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
-    17:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature -> cfu:
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature feature -> a
-    float chance -> b
-    19:22:void <init>(net.minecraft.world.level.levelgen.feature.ConfiguredFeature,float) -> <init>
-    25:28:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    33:33:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos) -> a
-    37:37:net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.WoodlandMansionFeature -> cfv:
-    32:33:void <init>(java.util.function.Function) -> <init>
-    37:56:net.minecraft.world.level.ChunkPos getPotentialFeatureChunkFromLocationWithOffset(net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,int,int) -> a
-    61:73:boolean isFeatureChunk(net.minecraft.world.level.biome.BiomeManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,int,int,net.minecraft.world.level.biome.Biome) -> a
-    78:78:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    83:83:java.lang.String getFeatureName() -> b
-    88:88:int getLookupRange() -> c
-net.minecraft.world.level.levelgen.feature.WoodlandMansionFeature$WoodlandMansionStart -> cfv$a:
-    93:94:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    98:132:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-    136:166:void postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer -> cfw:
-    net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType type -> a
-    13:15:void <init>(net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType) -> <init>
+    net.minecraft.world.level.ChunkPos PLATFORM_ORIGIN_CHUNK -> ac
+    22:23:void <init>(com.mojang.serialization.Codec) -> <init>
+    26:26:int checkerboardDistance(int,int,int,int) -> a
+    31:50:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    15:15:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    16:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.WeepingVinesFeature -> cmv:
+    net.minecraft.core.Direction[] DIRECTIONS -> a
+    23:24:void <init>(com.mojang.serialization.Codec) -> <init>
+    28:40:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    44:71:void placeRoofNetherWart(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos) -> a
+    74:99:void placeRoofWeepingVines(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos) -> b
+    102:114:void placeWeepingVinesColumn(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,int,int,int) -> a
+    19:19:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    20:20:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature -> cmw:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.ConfiguredFeature feature -> b
+    float chance -> c
+    22:25:void <init>(net.minecraft.world.level.levelgen.feature.ConfiguredFeature,float) -> <init>
+    28:28:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos) -> a
+    14:17:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    16:16:java.lang.Float lambda$null$1(net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature) -> a
+    15:15:net.minecraft.world.level.levelgen.feature.ConfiguredFeature lambda$null$0(net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature) -> b
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.WoodlandMansionFeature -> cmx:
+    31:32:void <init>(com.mojang.serialization.Codec) -> <init>
+    36:36:boolean linearSeparation() -> b
+    42:48:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    53:53:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+    28:28:boolean isFeatureChunk(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.biome.BiomeSource,long,net.minecraft.world.level.levelgen.WorldgenRandom,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.ChunkPos,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.WoodlandMansionFeature$WoodlandMansionStart -> cmx$a:
+    58:59:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    63:97:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    101:131:void placeInChunk(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
+    56:56:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer -> cmy:
+    com.mojang.serialization.Codec CODEC -> a
+    11:11:void <init>() -> <init>
     void place(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType -> cfx:
+    net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType type() -> a
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType -> cmz:
     net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType SIMPLE_BLOCK_PLACER -> a
     net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType DOUBLE_PLANT_PLACER -> b
     net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType COLUMN_PLACER -> c
-    java.util.function.Function deserializer -> d
-    14:14:net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType register(java.lang.String,java.util.function.Function) -> a
-    19:21:void <init>(java.util.function.Function) -> <init>
-    24:24:net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer deserialize(com.mojang.datafixers.Dynamic) -> a
-    9:11:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.blockplacers.ColumnPlacer -> cfy:
-    int minSize -> b
-    int extraSize -> c
-    20:23:void <init>(int,int) -> <init>
-    26:30:void <init>(com.mojang.datafixers.Dynamic) -> <init>
+    com.mojang.serialization.Codec codec -> d
+    12:12:net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    17:19:void <init>(com.mojang.serialization.Codec) -> <init>
+    22:22:com.mojang.serialization.Codec codec() -> a
+    7:9:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.blockplacers.ColumnPlacer -> cna:
+    com.mojang.serialization.Codec CODEC -> b
+    int minSize -> c
+    int extraSize -> d
+    22:25:void <init>(int,int) -> <init>
+    29:29:net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType type() -> a
     34:40:void place(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    44:48:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.feature.blockplacers.DoublePlantPlacer -> cfz:
-    17:18:void <init>() -> <init>
-    21:22:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    26:27:void place(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    31:33:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.feature.blockplacers.SimpleBlockPlacer -> cga:
-    16:17:void <init>() -> <init>
-    20:21:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    25:26:void place(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    30:32:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.feature.blockplacers.package-info -> cgb:
-net.minecraft.world.level.levelgen.feature.configurations.BlockBlobConfiguration -> cgc:
-    net.minecraft.world.level.block.state.BlockState state -> a
-    int startRadius -> b
-    13:16:void <init>(net.minecraft.world.level.block.state.BlockState,int) -> <init>
-    20:22:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    27:30:net.minecraft.world.level.levelgen.feature.configurations.BlockBlobConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration -> cgd:
-    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider stateProvider -> a
-    14:16:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider) -> <init>
-    20:24:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    28:31:net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration -> cge:
-    net.minecraft.world.level.block.state.BlockState state -> a
-    12:14:void <init>(net.minecraft.world.level.block.state.BlockState) -> <init>
-    18:19:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    24:25:net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration -> cgf:
-    float probability -> a
-    10:12:void <init>(float) -> <init>
-    16:17:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    22:23:net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration -> cgg:
-    float chance -> a
-    int bottomOffset -> b
-    int topOffset -> c
-    int top -> d
-    13:18:void <init>(float,int,int,int) -> <init>
-    22:26:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    31:35:net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.CountFeatureConfiguration -> cgh:
-    int count -> a
-    10:12:void <init>(int) -> <init>
-    16:17:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    22:23:net.minecraft.world.level.levelgen.feature.configurations.CountFeatureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration -> cgi:
-    int count -> a
-    int bottomOffset -> b
-    int topOffset -> c
-    int maximum -> d
-    13:18:void <init>(int,int,int,int) -> <init>
-    22:26:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    32:37:net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration -> cgj:
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature feature -> a
-    net.minecraft.world.level.levelgen.placement.ConfiguredDecorator decorator -> b
-    14:17:void <init>(net.minecraft.world.level.levelgen.feature.ConfiguredFeature,net.minecraft.world.level.levelgen.placement.ConfiguredDecorator) -> <init>
-    21:23:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    29:29:java.lang.String toString() -> toString
-    33:35:net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration -> cgk:
-    net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration NONE -> e
-    com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    7:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration -> cgl:
-    net.minecraft.world.level.block.state.BlockState state -> a
-    int radius -> b
-    int ySize -> c
-    java.util.List targets -> d
-    17:22:void <init>(net.minecraft.world.level.block.state.BlockState,int,int,java.util.List) -> <init>
-    26:30:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    35:40:net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-    30:30:java.lang.Object lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration -> cgm:
-    java.util.Optional exit -> a
-    boolean exact -> b
-    14:17:void <init>(java.util.Optional,boolean) -> <init>
-    20:20:net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration knownExit(net.minecraft.core.BlockPos,boolean) -> a
-    24:24:net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration delayedExitSearch() -> a
-    28:28:java.util.Optional getExit() -> b
-    32:32:boolean isExitExact() -> c
-    37:43:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    47:57:net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-    49:49:java.util.Optional lambda$deserialize$3(com.mojang.datafixers.Dynamic,java.lang.Number) -> a
-    50:50:java.util.Optional lambda$null$2(com.mojang.datafixers.Dynamic,java.lang.Number,java.lang.Number) -> a
-    51:51:net.minecraft.core.BlockPos lambda$null$1(java.lang.Number,java.lang.Number,java.lang.Number) -> a
-    37:42:java.lang.Object lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration -> cgn:
-    net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration NONE -> e
-    com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    7:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.configurations.FeatureRadiusConfiguration -> cgo:
-    int radius -> a
-    10:12:void <init>(int) -> <init>
-    16:17:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    22:23:net.minecraft.world.level.levelgen.feature.configurations.FeatureRadiusConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration -> cgp:
-    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider capProvider -> a
-    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider stemProvider -> b
-    int foliageRadius -> c
-    16:20:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,int) -> <init>
-    24:30:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    34:40:net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration -> cgq:
-    int height -> a
+    14:17:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    16:16:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.blockplacers.ColumnPlacer) -> a
+    15:15:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.blockplacers.ColumnPlacer) -> b
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.blockplacers.DoublePlantPlacer -> cnb:
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.world.level.levelgen.feature.blockplacers.DoublePlantPlacer INSTANCE -> c
+    12:12:void <init>() -> <init>
+    19:19:net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType type() -> a
+    24:25:void place(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    13:13:net.minecraft.world.level.levelgen.feature.blockplacers.DoublePlantPlacer lambda$static$0() -> b
+    13:15:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.blockplacers.SimpleBlockPlacer -> cnc:
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.world.level.levelgen.feature.blockplacers.SimpleBlockPlacer INSTANCE -> c
+    11:11:void <init>() -> <init>
+    17:17:net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType type() -> a
+    22:23:void place(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    12:12:net.minecraft.world.level.levelgen.feature.blockplacers.SimpleBlockPlacer lambda$static$0() -> b
+    12:13:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.blockplacers.package-info -> cnd:
+net.minecraft.world.level.levelgen.feature.configurations.BlockBlobConfiguration -> cne:
+    com.mojang.serialization.Codec CODEC -> a
     net.minecraft.world.level.block.state.BlockState state -> b
-    13:16:void <init>(int,net.minecraft.world.level.block.state.BlockState) -> <init>
-    20:22:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    27:29:net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration -> cgr:
-    int heightInterval -> a
-    int crownHeight -> b
-    17:20:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,java.util.List,int,int,int) -> <init>
-    24:28:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    32:39:net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration$MegaTreeConfigurationBuilder -> cgr$a:
-    java.util.List decorators -> c
-    int baseHeight -> d
-    int heightInterval -> e
-    int crownHeight -> f
-    44:51:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider) -> <init>
-    55:56:net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration$MegaTreeConfigurationBuilder decorators(java.util.List) -> a
-    61:62:net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration$MegaTreeConfigurationBuilder baseHeight(int) -> a
-    66:67:net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration$MegaTreeConfigurationBuilder heightInterval(int) -> b
-    71:72:net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration$MegaTreeConfigurationBuilder crownHeight(int) -> c
-    77:77:net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration build() -> a
-    43:43:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration build() -> b
-    43:43:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder decorators(java.util.List) -> b
-    43:43:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder baseHeight(int) -> d
-net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration -> cgs:
-    double probability -> a
-    net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type type -> b
-    12:15:void <init>(double,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
-    19:21:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    26:29:net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration -> cgt:
-    double noiseLevel -> a
-    int belowNoise -> b
-    int aboveNoise -> c
-    12:16:void <init>(double,int,int) -> <init>
-    20:23:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    29:33:net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration -> cgu:
-    6:6:void <init>() -> <init>
-    9:9:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    13:13:net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration -> cgv:
-    6:6:void <init>() -> <init>
-    9:9:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    13:13:net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration -> cgw:
-    net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type biomeTemp -> a
-    float largeProbability -> b
-    float clusterProbability -> c
-    13:17:void <init>(net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type,float,float) -> <init>
-    21:24:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    29:32:net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration -> cgx:
-    net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates target -> a
-    int size -> b
+    int startRadius -> c
+    16:19:void <init>(net.minecraft.world.level.block.state.BlockState,int) -> <init>
+    8:11:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.BlockBlobConfiguration) -> a
+    9:9:net.minecraft.world.level.block.state.BlockState lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.BlockBlobConfiguration) -> b
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration -> cnf:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider stateProvider -> b
+    11:13:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider) -> <init>
+    7:7:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider lambda$static$0(net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration) -> a
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration -> cng:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.state.BlockState state -> b
+    11:13:void <init>(net.minecraft.world.level.block.state.BlockState) -> <init>
+    7:7:net.minecraft.world.level.block.state.BlockState lambda$static$0(net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration) -> a
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration -> cnh:
+    com.mojang.serialization.Codec CODEC -> a
+    float probability -> b
+    10:12:void <init>(float) -> <init>
+    6:6:java.lang.Float lambda$static$0(net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration) -> a
+    6:6:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration -> cni:
+    com.mojang.serialization.Codec CODEC -> a
+    float chance -> b
+    int bottomOffset -> c
+    int topOffset -> d
+    int top -> e
+    19:24:void <init>(float,int,int,int) -> <init>
+    7:12:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    11:11:java.lang.Integer lambda$null$3(net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration) -> a
+    10:10:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration) -> b
+    9:9:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration) -> c
+    8:8:java.lang.Float lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration) -> d
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration -> cnj:
+    com.mojang.serialization.Codec CODEC -> a
+    int minimumReach -> b
+    int maximumReach -> c
+    int minimumHeight -> d
+    int maximumHeight -> e
+    19:24:void <init>(int,int,int,int) -> <init>
+    7:12:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    11:11:java.lang.Integer lambda$null$3(net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration) -> a
+    10:10:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration) -> b
+    9:9:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration) -> c
+    8:8:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration) -> d
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration$Builder -> cnj$a:
+    int minReach -> a
+    int maxReach -> b
+    int minHeight -> c
+    int maxHeight -> d
+    26:26:void <init>() -> <init>
+    33:35:net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration$Builder horizontalReach(int) -> a
+    39:41:net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration$Builder horizontalReach(int,int) -> a
+    45:47:net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration$Builder heightRange(int,int) -> b
+    51:60:net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration build() -> a
+net.minecraft.world.level.levelgen.feature.configurations.CountFeatureConfiguration -> cnk:
+    com.mojang.serialization.Codec CODEC -> a
+    int count -> b
+    10:12:void <init>(int) -> <init>
+    6:6:java.lang.Integer lambda$static$0(net.minecraft.world.level.levelgen.feature.configurations.CountFeatureConfiguration) -> a
+    6:6:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration -> cnl:
+    com.mojang.serialization.Codec CODEC -> a
+    int count -> b
+    int bottomOffset -> c
+    int topOffset -> d
+    int maximum -> e
+    19:24:void <init>(int,int,int,int) -> <init>
+    7:12:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    11:11:java.lang.Integer lambda$null$3(net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration) -> a
+    10:10:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration) -> b
+    9:9:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration) -> c
+    8:8:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration) -> d
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration -> cnm:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.ConfiguredFeature feature -> b
+    net.minecraft.world.level.levelgen.placement.ConfiguredDecorator decorator -> c
+    18:21:void <init>(net.minecraft.world.level.levelgen.feature.ConfiguredFeature,net.minecraft.world.level.levelgen.placement.ConfiguredDecorator) -> <init>
+    25:25:java.lang.String toString() -> toString
+    10:13:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    12:12:net.minecraft.world.level.levelgen.placement.ConfiguredDecorator lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration) -> a
+    11:11:net.minecraft.world.level.levelgen.feature.ConfiguredFeature lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration) -> b
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration -> cnn:
+    net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration NONE -> f
+    4:4:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration -> cno:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.state.BlockState contents -> b
+    net.minecraft.world.level.block.state.BlockState rim -> c
+    int minimumRadius -> d
+    int maximumRadius -> e
+    int maximumRimSize -> f
+    24:30:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,int,int) -> <init>
+    10:16:com.mojang.datafixers.kinds.App lambda$static$5(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    15:15:java.lang.Integer lambda$null$4(net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration) -> a
+    14:14:java.lang.Integer lambda$null$3(net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration) -> b
+    13:13:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration) -> c
+    12:12:net.minecraft.world.level.block.state.BlockState lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration) -> d
+    11:11:net.minecraft.world.level.block.state.BlockState lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration) -> e
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration$Builder -> cno$a:
+    java.util.Optional contents -> a
+    java.util.Optional rim -> b
+    int minRadius -> c
+    int maxRadius -> d
+    int maxRim -> e
+    32:34:void <init>() -> <init>
+    40:42:net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration$Builder radius(int,int) -> a
+    46:47:net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration$Builder contents(net.minecraft.world.level.block.state.BlockState) -> a
+    51:53:net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration$Builder rim(net.minecraft.world.level.block.state.BlockState,int) -> a
+    57:66:net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration build() -> a
+net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration -> cnp:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.state.BlockState state -> b
+    int radius -> c
+    int ySize -> d
+    java.util.List targets -> e
+    22:27:void <init>(net.minecraft.world.level.block.state.BlockState,int,int,java.util.List) -> <init>
+    10:15:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:java.util.List lambda$null$3(net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration) -> a
+    13:13:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration) -> b
+    12:12:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration) -> c
+    11:11:net.minecraft.world.level.block.state.BlockState lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration) -> d
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration -> cnq:
+    com.mojang.serialization.Codec CODEC -> a
+    java.util.Optional exit -> b
+    boolean exact -> c
+    18:21:void <init>(java.util.Optional,boolean) -> <init>
+    24:24:net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration knownExit(net.minecraft.core.BlockPos,boolean) -> a
+    28:28:net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration delayedExitSearch() -> a
+    32:32:java.util.Optional getExit() -> b
+    36:36:boolean isExitExact() -> c
+    10:13:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    12:12:java.lang.Boolean lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration) -> a
+    11:11:java.util.Optional lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration) -> b
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration -> cnr:
+    net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration NONE -> k
+    4:4:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.FeatureRadiusConfiguration -> cns:
+    com.mojang.serialization.Codec CODEC -> a
+    int radius -> b
+    10:12:void <init>(int) -> <init>
+    6:6:java.lang.Integer lambda$static$0(net.minecraft.world.level.levelgen.feature.configurations.FeatureRadiusConfiguration) -> a
+    6:6:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration -> cnt:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider capProvider -> b
+    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider stemProvider -> c
+    int foliageRadius -> d
+    18:22:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,int) -> <init>
+    8:12:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    11:11:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> a
+    10:10:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> b
+    9:9:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration) -> c
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration -> cnu:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.resources.ResourceLocation startPool -> b
+    int size -> c
+    16:19:void <init>(net.minecraft.resources.ResourceLocation,int) -> <init>
+    22:22:int getSize() -> a
+    26:26:net.minecraft.resources.ResourceLocation getStartPool() -> b
+    8:11:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration -> cnv:
+    com.mojang.serialization.Codec CODEC -> a
+    int height -> b
     net.minecraft.world.level.block.state.BlockState state -> c
-    54:58:void <init>(net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates,net.minecraft.world.level.block.state.BlockState,int) -> <init>
-    62:65:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    70:74:net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates -> cgx$a:
+    16:19:void <init>(int,net.minecraft.world.level.block.state.BlockState) -> <init>
+    8:11:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:net.minecraft.world.level.block.state.BlockState lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration) -> a
+    9:9:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration) -> b
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration -> cnw:
+    com.mojang.serialization.Codec CODEC -> a
+    double probability -> b
+    net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type type -> c
+    16:19:void <init>(double,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
+    8:11:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration) -> a
+    9:9:java.lang.Double lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration) -> b
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.MultiJigsawConfiguration -> cnx:
+    com.mojang.serialization.Codec CODEC -> a
+    java.util.List configurations -> b
+    17:18:void <init>(java.util.Map) -> <init>
+    20:22:void <init>(java.util.List) -> <init>
+    25:25:net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration getRandomPool(java.util.Random) -> a
+    17:17:net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration lambda$new$1(java.util.Map$Entry) -> a
+    12:12:java.util.List lambda$static$0(net.minecraft.world.level.levelgen.feature.configurations.MultiJigsawConfiguration) -> a
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration -> cny:
+    com.mojang.serialization.Codec CODEC -> a
+    double noiseLevel -> b
+    int belowNoise -> c
+    int aboveNoise -> d
+    17:21:void <init>(double,int,int) -> <init>
+    7:11:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration) -> a
+    9:9:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration) -> b
+    8:8:java.lang.Double lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration) -> c
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration -> cnz:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration INSTANCE -> b
+    5:5:void <init>() -> <init>
+    6:6:net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration lambda$static$0() -> a
+    6:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration -> coa:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration INSTANCE -> b
+    5:5:void <init>() -> <init>
+    6:6:net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration lambda$static$0() -> a
+    6:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration -> cob:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type biomeTemp -> b
+    float largeProbability -> c
+    float clusterProbability -> d
+    18:22:void <init>(net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type,float,float) -> <init>
+    8:12:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    11:11:java.lang.Float lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration) -> a
+    10:10:java.lang.Float lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration) -> b
+    9:9:net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration) -> c
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration -> coc:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates target -> b
+    int size -> c
+    net.minecraft.world.level.block.state.BlockState state -> d
+    71:75:void <init>(net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates,net.minecraft.world.level.block.state.BlockState,int) -> <init>
+    16:20:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    19:19:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration) -> a
+    18:18:net.minecraft.world.level.block.state.BlockState lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration) -> b
+    17:17:net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration) -> c
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates -> coc$a:
     net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates NATURAL_STONE -> a
     net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates NETHERRACK -> b
-    java.util.Map BY_NAME -> c
-    java.lang.String name -> d
-    java.util.function.Predicate predicate -> e
-    net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates[] $VALUES -> f
-    17:17:net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates[] values() -> values
-    17:17:net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates valueOf(java.lang.String) -> valueOf
-    32:35:void <init>(java.lang.String,int,java.lang.String,java.util.function.Predicate) -> <init>
-    38:38:java.lang.String getName() -> a
-    42:42:net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates byName(java.lang.String) -> a
-    46:46:java.util.function.Predicate getPredicate() -> b
-    28:28:net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates lambda$static$1(net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates) -> a
-    19:23:boolean lambda$static$0(net.minecraft.world.level.block.state.BlockState) -> a
-    17:28:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration -> cgy:
-    float probability -> b
-    11:13:void <init>(float) -> <init>
-    17:18:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    23:24:net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration -> cgz:
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature featureTrue -> a
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature featureFalse -> b
-    12:15:void <init>(net.minecraft.world.level.levelgen.feature.ConfiguredFeature,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> <init>
-    19:21:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    26:28:net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration -> cha:
-    java.util.List features -> a
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature defaultFeature -> b
-    15:18:void <init>(java.util.List,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> <init>
-    22:27:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    32:35:net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-    22:22:java.lang.Object lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature) -> a
-net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration -> chb:
-    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider stateProvider -> a
-    net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer blockPlacer -> b
-    java.util.Set whitelist -> c
-    java.util.Set blacklist -> d
+    net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates NETHER_ORE_REPLACEABLES -> c
+    com.mojang.serialization.Codec CODEC -> d
+    java.util.Map BY_NAME -> e
+    java.lang.String name -> f
+    java.util.function.Predicate predicate -> g
+    net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates[] $VALUES -> h
+    22:22:net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates[] values() -> values
+    22:22:net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates valueOf(java.lang.String) -> valueOf
+    44:47:void <init>(java.lang.String,int,java.lang.String,java.util.function.Predicate) -> <init>
+    50:50:java.lang.String getName() -> b
+    54:54:net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates byName(java.lang.String) -> a
+    58:58:java.util.function.Predicate getPredicate() -> c
+    63:63:java.lang.String getSerializedName() -> a
+    40:40:net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates lambda$static$2(net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration$Predicates) -> a
+    31:34:boolean lambda$static$1(net.minecraft.world.level.block.state.BlockState) -> a
+    24:27:boolean lambda$static$0(net.minecraft.world.level.block.state.BlockState) -> b
+    22:40:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration -> cod:
+    com.mojang.serialization.Codec CODEC -> b
+    float probability -> c
+    15:17:void <init>(float) -> <init>
+    9:11:com.mojang.datafixers.kinds.App lambda$static$1(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:java.lang.Float lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration) -> a
+    8:9:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration -> coe:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.ConfiguredFeature featureTrue -> b
+    net.minecraft.world.level.levelgen.feature.ConfiguredFeature featureFalse -> c
+    16:19:void <init>(net.minecraft.world.level.levelgen.feature.ConfiguredFeature,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> <init>
+    8:11:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:net.minecraft.world.level.levelgen.feature.ConfiguredFeature lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration) -> a
+    9:9:net.minecraft.world.level.levelgen.feature.ConfiguredFeature lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration) -> b
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration -> cof:
+    com.mojang.serialization.Codec CODEC -> a
+    java.util.List features -> b
+    net.minecraft.world.level.levelgen.feature.ConfiguredFeature defaultFeature -> c
+    20:23:void <init>(java.util.List,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> <init>
+    11:14:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:net.minecraft.world.level.levelgen.feature.ConfiguredFeature lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration) -> a
+    13:13:java.util.List lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration) -> b
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration -> cog:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider stateProvider -> b
+    net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer blockPlacer -> c
+    java.util.Set whitelist -> d
+    java.util.Set blacklist -> e
     int tries -> f
     int xspread -> g
     int yspread -> h
     int zspread -> i
     boolean canReplace -> j
-    boolean project -> k
-    boolean needWater -> l
-    33:45:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer,java.util.Set,java.util.Set,int,int,int,int,boolean,boolean,boolean) -> <init>
-    49:63:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    67:81:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-    54:54:java.lang.Object lambda$serialize$1(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.block.state.BlockState) -> a
-    53:53:java.lang.Object lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.block.Block) -> a
-    20:20:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer,java.util.Set,java.util.Set,int,int,int,int,boolean,boolean,boolean,net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$1) -> <init>
-net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$1 -> chb$1:
-net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder -> chb$a:
+    boolean project -> l
+    boolean needWater -> m
+    44:49:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer,java.util.List,java.util.List,int,int,int,int,boolean,boolean,boolean) -> <init>
+    51:63:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer,java.util.Set,java.util.Set,int,int,int,int,boolean,boolean,boolean) -> <init>
+    17:29:com.mojang.datafixers.kinds.App lambda$static$11(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    28:28:java.lang.Boolean lambda$null$10(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> a
+    27:27:java.lang.Boolean lambda$null$9(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> b
+    26:26:java.lang.Boolean lambda$null$8(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> c
+    25:25:java.lang.Integer lambda$null$7(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> d
+    24:24:java.lang.Integer lambda$null$6(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> e
+    23:23:java.lang.Integer lambda$null$5(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> f
+    22:22:java.lang.Integer lambda$null$4(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> g
+    21:21:java.util.List lambda$null$3(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> h
+    20:20:java.util.List lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> i
+    19:19:net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> j
+    18:18:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration) -> k
+    16:16:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer,java.util.Set,java.util.Set,int,int,int,int,boolean,boolean,boolean,net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$1) -> <init>
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$1 -> cog$1:
+net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder -> cog$a:
     net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider stateProvider -> a
     net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer blockPlacer -> b
     java.util.Set whitelist -> c
@@ -60122,284 +65800,491 @@ net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfigurati
     boolean canReplace -> i
     boolean project -> j
     boolean needWater -> k
-    88:101:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer) -> <init>
-    104:105:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder whitelist(java.util.Set) -> a
-    109:110:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder blacklist(java.util.Set) -> b
-    114:115:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder tries(int) -> a
-    119:120:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder xspread(int) -> b
-    124:125:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder yspread(int) -> c
-    129:130:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder zspread(int) -> d
-    134:135:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder canReplace() -> a
-    139:140:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder noProjection() -> b
-    144:145:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder needWater() -> c
-    149:149:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration build() -> d
-net.minecraft.world.level.levelgen.feature.configurations.RandomRandomFeatureConfiguration -> chc:
-    java.util.List features -> a
-    int count -> b
-    14:17:void <init>(java.util.List,int) -> <init>
-    21:23:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    28:30:net.minecraft.world.level.levelgen.feature.configurations.RandomRandomFeatureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-    22:22:java.lang.Object lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
-net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockConfiguration -> chd:
+    68:81:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer) -> <init>
+    84:85:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder whitelist(java.util.Set) -> a
+    89:90:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder blacklist(java.util.Set) -> b
+    94:95:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder tries(int) -> a
+    99:100:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder xspread(int) -> b
+    104:105:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder yspread(int) -> c
+    109:110:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder zspread(int) -> d
+    114:115:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder canReplace() -> a
+    119:120:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder noProjection() -> b
+    124:125:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration$GrassConfigurationBuilder needWater() -> c
+    129:129:net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration build() -> d
+net.minecraft.world.level.levelgen.feature.configurations.RandomRandomFeatureConfiguration -> coh:
+    com.mojang.serialization.Codec CODEC -> a
+    java.util.List features -> b
+    int count -> c
+    18:21:void <init>(java.util.List,int) -> <init>
+    10:13:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    12:12:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.RandomRandomFeatureConfiguration) -> a
+    11:11:java.util.List lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.RandomRandomFeatureConfiguration) -> b
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockConfiguration -> coi:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.state.BlockState target -> b
+    net.minecraft.world.level.block.state.BlockState state -> c
+    16:19:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> <init>
+    8:11:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:net.minecraft.world.level.block.state.BlockState lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockConfiguration) -> a
+    9:9:net.minecraft.world.level.block.state.BlockState lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockConfiguration) -> b
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration -> coj:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.state.BlockState targetState -> b
+    net.minecraft.world.level.block.state.BlockState replaceState -> c
+    net.minecraft.core.Vec3i minimumReach -> d
+    net.minecraft.core.Vec3i maximumReach -> e
+    23:28:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Vec3i,net.minecraft.core.Vec3i) -> <init>
+    10:15:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:net.minecraft.core.Vec3i lambda$null$3(net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration) -> a
+    13:13:net.minecraft.core.Vec3i lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration) -> b
+    12:12:net.minecraft.world.level.block.state.BlockState lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration) -> c
+    11:11:net.minecraft.world.level.block.state.BlockState lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration) -> d
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration$Builder -> coj$a:
     net.minecraft.world.level.block.state.BlockState target -> a
     net.minecraft.world.level.block.state.BlockState state -> b
-    13:16:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> <init>
-    20:22:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    27:30:net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration -> che:
-    int count -> a
-    double tallSeagrassProbability -> b
-    11:14:void <init>(int,double) -> <init>
-    18:20:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    25:28:net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration -> chf:
-    boolean isBeached -> a
+    net.minecraft.core.Vec3i minimumReach -> c
+    net.minecraft.core.Vec3i maximumReach -> d
+    30:34:void <init>() -> <init>
+    37:38:net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration$Builder targetBlockState(net.minecraft.world.level.block.state.BlockState) -> a
+    42:43:net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration$Builder replaceWithBlockState(net.minecraft.world.level.block.state.BlockState) -> b
+    47:48:net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration$Builder minimumReach(net.minecraft.core.Vec3i) -> a
+    52:53:net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration$Builder maximumReach(net.minecraft.core.Vec3i) -> b
+    57:65:net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration build() -> a
+net.minecraft.world.level.levelgen.feature.configurations.RuinedPortalConfiguration -> cok:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type portalType -> b
+    11:13:void <init>(net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type) -> <init>
+    7:7:net.minecraft.world.level.levelgen.feature.RuinedPortalFeature$Type lambda$static$0(net.minecraft.world.level.levelgen.feature.configurations.RuinedPortalConfiguration) -> a
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration -> col:
+    com.mojang.serialization.Codec CODEC -> a
+    int count -> b
+    double tallSeagrassProbability -> c
+    15:18:void <init>(int,double) -> <init>
+    7:10:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    9:9:java.lang.Double lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration) -> a
+    8:8:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration) -> b
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration -> com:
+    com.mojang.serialization.Codec CODEC -> a
+    boolean isBeached -> b
     10:12:void <init>(boolean) -> <init>
-    16:17:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    22:23:net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration -> chg:
-    net.minecraft.world.level.block.state.BlockState toPlace -> a
-    java.util.List placeOn -> b
-    java.util.List placeIn -> c
-    java.util.List placeUnder -> d
-    18:23:void <init>(net.minecraft.world.level.block.state.BlockState,java.util.List,java.util.List,java.util.List) -> <init>
-    26:27:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState[],net.minecraft.world.level.block.state.BlockState[],net.minecraft.world.level.block.state.BlockState[]) -> <init>
-    31:40:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    45:50:net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-    34:34:java.lang.Object lambda$serialize$2(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.block.state.BlockState) -> a
-    33:33:java.lang.Object lambda$serialize$1(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.block.state.BlockState) -> b
-    32:32:java.lang.Object lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.block.state.BlockState) -> c
-net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFeatureConfiguration -> chh:
-    java.util.List features -> a
+    6:6:java.lang.Boolean lambda$static$0(net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration) -> a
+    6:6:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration -> coo:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.state.BlockState toPlace -> b
+    java.util.List placeOn -> c
+    java.util.List placeIn -> d
+    java.util.List placeUnder -> e
+    22:27:void <init>(net.minecraft.world.level.block.state.BlockState,java.util.List,java.util.List,java.util.List) -> <init>
+    10:15:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:java.util.List lambda$null$3(net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration) -> a
+    13:13:java.util.List lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration) -> b
+    12:12:java.util.List lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration) -> c
+    11:11:net.minecraft.world.level.block.state.BlockState lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration) -> d
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFeatureConfiguration -> cop:
+    com.mojang.serialization.Codec CODEC -> a
+    java.util.List features -> b
     13:15:void <init>(java.util.List) -> <init>
-    19:20:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    25:26:net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFeatureConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-    20:20:java.lang.Object lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
-net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration -> chi:
-    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer foliagePlacer -> a
-    int heightRandA -> b
-    int heightRandB -> c
-    int trunkHeight -> d
-    int trunkHeightRandom -> f
-    int trunkTopOffset -> g
-    int trunkTopOffsetRandom -> h
-    int foliageHeight -> i
-    int foliageHeightRandom -> j
-    int maxWaterDepth -> k
-    boolean ignoreVines -> l
-    40:52:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer,java.util.List,int,int,int,int,int,int,int,int,int,int,boolean) -> <init>
-    56:71:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    75:92:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder -> chi$a:
-    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer foliagePlacer -> c
-    java.util.List decorators -> d
-    int baseHeight -> e
-    int heightRandA -> f
-    int heightRandB -> g
-    int trunkHeight -> h
-    int trunkHeightRandom -> i
-    int trunkTopOffset -> j
-    int trunkTopOffsetRandom -> k
-    int foliageHeight -> l
-    int foliageHeightRandom -> m
-    int maxWaterDepth -> n
-    boolean ignoreVines -> o
-    98:114:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer) -> <init>
-    118:119:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder decorators(java.util.List) -> a
-    124:125:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder baseHeight(int) -> a
-    129:130:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder heightRandA(int) -> b
-    134:135:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder heightRandB(int) -> c
-    139:140:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder trunkHeight(int) -> e
-    144:145:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder trunkHeightRandom(int) -> f
-    149:150:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder trunkTopOffset(int) -> g
-    154:155:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder trunkTopOffsetRandom(int) -> h
-    159:160:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder foliageHeight(int) -> i
-    164:165:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder foliageHeightRandom(int) -> j
-    169:170:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder maxWaterDepth(int) -> k
-    174:175:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration$SmallTreeConfigurationBuilder ignoreVines() -> a
-    180:180:net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration build() -> c
-    96:96:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration build() -> b
-    96:96:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder decorators(java.util.List) -> b
-    96:96:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder baseHeight(int) -> d
-net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration -> chj:
-    boolean crystalInvulnerable -> a
-    java.util.List spikes -> b
-    net.minecraft.core.BlockPos crystalBeamTarget -> c
-    20:24:void <init>(boolean,java.util.List,net.minecraft.core.BlockPos) -> <init>
-    28:31:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    36:44:net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-    48:48:boolean isCrystalInvulnerable() -> a
-    52:52:java.util.List getSpikes() -> b
-    57:57:net.minecraft.core.BlockPos getCrystalBeamTarget() -> c
-    37:37:java.lang.Integer lambda$deserialize$1(com.mojang.datafixers.Dynamic) -> b
-    30:30:java.lang.Object lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.feature.SpikeFeature$EndSpike) -> a
-net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration -> chk:
-    net.minecraft.world.level.material.FluidState state -> a
-    boolean requiresBlockBelow -> b
-    int rockCount -> c
-    int holeCount -> d
+    9:9:java.util.List lambda$static$0(net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFeatureConfiguration) -> a
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration -> coq:
+    com.mojang.serialization.Codec CODEC -> a
+    boolean crystalInvulnerable -> b
+    java.util.List spikes -> c
+    net.minecraft.core.BlockPos crystalBeamTarget -> d
+    25:26:void <init>(boolean,java.util.List,net.minecraft.core.BlockPos) -> <init>
+    28:32:void <init>(boolean,java.util.List,java.util.Optional) -> <init>
+    35:35:boolean isCrystalInvulnerable() -> a
+    39:39:java.util.List getSpikes() -> b
+    44:44:net.minecraft.core.BlockPos getCrystalBeamTarget() -> c
+    13:17:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    16:16:java.util.Optional lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration) -> a
+    15:15:java.util.List lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration) -> b
+    14:14:java.lang.Boolean lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration) -> c
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration -> cor:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.material.FluidState state -> b
+    boolean requiresBlockBelow -> c
+    int rockCount -> d
+    int holeCount -> e
     java.util.Set validBlocks -> f
-    22:28:void <init>(net.minecraft.world.level.material.FluidState,boolean,int,int,java.util.Set) -> <init>
-    32:37:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    42:47:net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-    47:47:net.minecraft.world.level.block.Block lambda$deserialize$0(com.mojang.datafixers.Dynamic) -> b
-net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration -> chl:
-    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider trunkProvider -> m
-    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider leavesProvider -> n
-    java.util.List decorators -> o
-    int baseHeight -> p
-    boolean fromSapling -> q
-    22:27:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,java.util.List,int) -> <init>
-    30:31:void setFromSapling() -> a
-    35:42:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    46:53:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration deserialize(com.mojang.datafixers.Dynamic) -> b
-    52:52:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator lambda$deserialize$1(com.mojang.datafixers.Dynamic) -> a
-    39:39:java.lang.Object lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator) -> a
-net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder -> chl$a:
+    30:36:void <init>(net.minecraft.world.level.material.FluidState,boolean,int,int,java.util.Set) -> <init>
+    14:22:com.mojang.datafixers.kinds.App lambda$static$5(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    21:21:java.util.Set lambda$null$4(net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration) -> a
+    18:18:java.lang.Integer lambda$null$3(net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration) -> b
+    17:17:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration) -> c
+    16:16:java.lang.Boolean lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration) -> d
+    15:15:net.minecraft.world.level.material.FluidState lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration) -> e
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.StrongholdConfiguration -> cos:
+    com.mojang.serialization.Codec CODEC -> a
+    int distance -> b
+    int spread -> c
+    int count -> d
+    18:22:void <init>(int,int,int) -> <init>
+    25:25:int distance() -> a
+    29:29:int spread() -> b
+    33:33:int count() -> c
+    8:12:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration -> cot:
+    com.mojang.serialization.Codec CODEC -> a
+    int spacing -> b
+    int separation -> c
+    int salt -> d
+    26:30:void <init>(int,int,int) -> <init>
+    33:33:int spacing() -> a
+    37:37:int separation() -> b
+    41:41:int salt() -> c
+    16:19:com.mojang.serialization.DataResult lambda$static$4(net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration) -> a
+    11:15:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration) -> b
+    13:13:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration) -> c
+    12:12:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration) -> d
+    11:20:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration -> cou:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider trunkProvider -> b
+    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider leavesProvider -> c
+    java.util.List decorators -> d
+    boolean fromSapling -> e
+    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer foliagePlacer -> f
+    net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer trunkPlacer -> g
+    net.minecraft.world.level.levelgen.feature.featuresize.FeatureSize minimumSize -> h
+    int maxWaterDepth -> i
+    boolean ignoreVines -> j
+    net.minecraft.world.level.levelgen.Heightmap$Types heightmap -> l
+    48:58:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer,net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer,net.minecraft.world.level.levelgen.feature.featuresize.FeatureSize,java.util.List,int,boolean,net.minecraft.world.level.levelgen.Heightmap$Types) -> <init>
+    61:62:void setFromSapling() -> a
+    65:65:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration withDecorators(java.util.List) -> a
+    16:26:com.mojang.datafixers.kinds.App lambda$static$9(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    25:25:net.minecraft.world.level.levelgen.Heightmap$Types lambda$null$8(net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    24:24:java.lang.Boolean lambda$null$7(net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> b
+    23:23:java.lang.Integer lambda$null$6(net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> c
+    22:22:java.util.List lambda$null$5(net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> d
+    21:21:net.minecraft.world.level.levelgen.feature.featuresize.FeatureSize lambda$null$4(net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> e
+    20:20:net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer lambda$null$3(net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> f
+    19:19:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer lambda$null$2(net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> g
+    18:18:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider lambda$null$1(net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> h
+    17:17:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider lambda$null$0(net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> i
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder -> cou$a:
     net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider trunkProvider -> a
     net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider leavesProvider -> b
-    java.util.List decorators -> c
-    int baseHeight -> d
-    60:66:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider) -> <init>
-    69:70:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder baseHeight(int) -> d
-    74:75:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder decorators(java.util.List) -> b
-    79:79:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration build() -> b
-net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration -> chm:
-    net.minecraft.resources.ResourceLocation startPool -> a
-    int size -> b
-    12:15:void <init>(java.lang.String,int) -> <init>
-    19:21:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    26:28:net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.configurations.package-info -> chn:
-net.minecraft.world.level.levelgen.feature.foliageplacers.AcaciaFoliagePlacer -> cho:
-    13:14:void <init>(int,int) -> <init>
-    17:21:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    25:42:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration,int,int,int,net.minecraft.core.BlockPos,java.util.Set) -> a
-    46:46:int foliageRadius(java.util.Random,int,int,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    51:51:boolean shouldSkipLocation(java.util.Random,int,int,int,int,int) -> a
-    56:56:int getTreeRadiusForHeight(int,int,int,int) -> a
-net.minecraft.world.level.levelgen.feature.foliageplacers.BlobFoliagePlacer -> chp:
-    13:14:void <init>(int,int) -> <init>
-    17:21:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    25:29:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration,int,int,int,net.minecraft.core.BlockPos,java.util.Set) -> a
-    33:33:int foliageRadius(java.util.Random,int,int,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    38:38:boolean shouldSkipLocation(java.util.Random,int,int,int,int,int) -> a
-    43:43:int getTreeRadiusForHeight(int,int,int,int) -> a
-net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer -> chq:
-    int radius -> a
-    int radiusRandom -> b
-    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType type -> c
-    25:29:void <init>(int,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType) -> <init>
-    void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration,int,int,int,net.minecraft.core.BlockPos,java.util.Set) -> a
-    int foliageRadius(java.util.Random,int,int,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    boolean shouldSkipLocation(java.util.Random,int,int,int,int,int) -> a
-    int getTreeRadiusForHeight(int,int,int,int) -> a
-    40:50:void placeLeavesRow(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration,int,net.minecraft.core.BlockPos,int,int,java.util.Set) -> a
-    53:57:void placeLeaf(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration,java.util.Set) -> a
-    60:65:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType -> chr:
+    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer foliagePlacer -> c
+    net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer trunkPlacer -> d
+    net.minecraft.world.level.levelgen.feature.featuresize.FeatureSize minimumSize -> e
+    java.util.List decorators -> f
+    int maxWaterDepth -> g
+    boolean ignoreVines -> h
+    net.minecraft.world.level.levelgen.Heightmap$Types heightmap -> i
+    74:85:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer,net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer,net.minecraft.world.level.levelgen.feature.featuresize.FeatureSize) -> <init>
+    88:89:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder decorators(java.util.List) -> a
+    93:94:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder maxWaterDepth(int) -> a
+    98:99:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder ignoreVines() -> a
+    103:104:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration$TreeConfigurationBuilder heightmap(net.minecraft.world.level.levelgen.Heightmap$Types) -> a
+    108:108:net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration build() -> b
+net.minecraft.world.level.levelgen.feature.configurations.package-info -> cov:
+net.minecraft.world.level.levelgen.feature.featuresize.FeatureSize -> cow:
+    com.mojang.serialization.Codec CODEC -> a
+    java.util.OptionalInt minClippedHeight -> b
+    14:15:com.mojang.serialization.codecs.RecordCodecBuilder minClippedHeightCodec() -> a
+    20:22:void <init>(java.util.OptionalInt) -> <init>
+    net.minecraft.world.level.levelgen.feature.featuresize.FeatureSizeType type() -> b
+    int getSizeAtHeight(int,int) -> a
+    29:29:java.util.OptionalInt minClippedHeight() -> c
+    15:15:java.util.OptionalInt lambda$minClippedHeightCodec$2(net.minecraft.world.level.levelgen.feature.featuresize.FeatureSize) -> a
+    15:15:java.util.Optional lambda$minClippedHeightCodec$1(java.util.OptionalInt) -> a
+    15:15:java.util.OptionalInt lambda$minClippedHeightCodec$0(java.util.Optional) -> a
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.featuresize.FeatureSizeType -> cox:
+    net.minecraft.world.level.levelgen.feature.featuresize.FeatureSizeType TWO_LAYERS_FEATURE_SIZE -> a
+    net.minecraft.world.level.levelgen.feature.featuresize.FeatureSizeType THREE_LAYERS_FEATURE_SIZE -> b
+    com.mojang.serialization.Codec codec -> c
+    11:11:net.minecraft.world.level.levelgen.feature.featuresize.FeatureSizeType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    16:18:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:21:com.mojang.serialization.Codec codec() -> a
+    7:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.featuresize.ThreeLayersFeatureSize -> coy:
+    com.mojang.serialization.Codec CODEC -> c
+    int limit -> d
+    int upperLimit -> e
+    int lowerSize -> f
+    int middleSize -> g
+    int upperSize -> h
+    25:31:void <init>(int,int,int,int,int,java.util.OptionalInt) -> <init>
+    35:35:net.minecraft.world.level.levelgen.feature.featuresize.FeatureSizeType type() -> b
+    40:46:int getSizeAtHeight(int,int) -> a
+    9:16:com.mojang.datafixers.kinds.App lambda$static$5(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:java.lang.Integer lambda$null$4(net.minecraft.world.level.levelgen.feature.featuresize.ThreeLayersFeatureSize) -> a
+    13:13:java.lang.Integer lambda$null$3(net.minecraft.world.level.levelgen.feature.featuresize.ThreeLayersFeatureSize) -> b
+    12:12:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.featuresize.ThreeLayersFeatureSize) -> c
+    11:11:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.featuresize.ThreeLayersFeatureSize) -> d
+    10:10:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.featuresize.ThreeLayersFeatureSize) -> e
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.featuresize.TwoLayersFeatureSize -> coz:
+    com.mojang.serialization.Codec CODEC -> c
+    int limit -> d
+    int lowerSize -> e
+    int upperSize -> f
+    23:24:void <init>(int,int,int) -> <init>
+    27:31:void <init>(int,int,int,java.util.OptionalInt) -> <init>
+    35:35:net.minecraft.world.level.levelgen.feature.featuresize.FeatureSizeType type() -> b
+    40:40:int getSizeAtHeight(int,int) -> a
+    10:15:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    13:13:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.feature.featuresize.TwoLayersFeatureSize) -> a
+    12:12:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.featuresize.TwoLayersFeatureSize) -> b
+    11:11:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.featuresize.TwoLayersFeatureSize) -> c
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.featuresize.package-info -> cpa:
+net.minecraft.world.level.levelgen.feature.foliageplacers.AcaciaFoliagePlacer -> cpb:
+    com.mojang.serialization.Codec CODEC -> a
+    17:18:void <init>(int,int,int,int) -> <init>
+    22:22:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType type() -> a
+    27:33:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    37:37:int foliageHeight(java.util.Random,int,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    42:46:boolean shouldSkipLocation(java.util.Random,int,int,int,int,boolean) -> a
+    14:14:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.BlobFoliagePlacer -> cpc:
+    com.mojang.serialization.Codec CODEC -> a
+    int height -> b
+    18:19:com.mojang.datafixers.Products$P5 blobParts(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    26:28:void <init>(int,int,int,int,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType) -> <init>
+    31:32:void <init>(int,int,int,int,int) -> <init>
+    36:36:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType type() -> a
+    41:45:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    49:49:int foliageHeight(java.util.Random,int,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    54:54:boolean shouldSkipLocation(java.util.Random,int,int,int,int,boolean) -> a
+    19:19:java.lang.Integer lambda$blobParts$1(net.minecraft.world.level.levelgen.feature.foliageplacers.BlobFoliagePlacer) -> a
+    15:15:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> c
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.BushFoliagePlacer -> cpd:
+    com.mojang.serialization.Codec CODEC -> c
+    17:18:void <init>(int,int,int,int,int) -> <init>
+    22:22:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType type() -> a
+    27:31:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    35:35:boolean shouldSkipLocation(java.util.Random,int,int,int,int,boolean) -> a
+    14:14:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> c
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.DarkOakFoliagePlacer -> cpe:
+    com.mojang.serialization.Codec CODEC -> a
+    17:18:void <init>(int,int,int,int) -> <init>
+    22:22:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType type() -> a
+    27:41:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    45:45:int foliageHeight(java.util.Random,int,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    50:55:boolean shouldSkipLocationSigned(java.util.Random,int,int,int,int,boolean) -> b
+    60:66:boolean shouldSkipLocation(java.util.Random,int,int,int,int,boolean) -> a
+    14:14:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.FancyFoliagePlacer -> cpf:
+    com.mojang.serialization.Codec CODEC -> c
+    18:19:void <init>(int,int,int,int,int) -> <init>
+    23:27:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    31:31:boolean shouldSkipLocation(java.util.Random,int,int,int,int,boolean) -> a
+    15:15:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> c
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer -> cpg:
+    com.mojang.serialization.Codec CODEC -> d
+    int radius -> e
+    int radiusRandom -> f
+    int offset -> g
+    int offsetRandom -> h
+    26:30:com.mojang.datafixers.Products$P4 foliagePlacerParts(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> b
+    38:43:void <init>(int,int,int,int) -> <init>
+    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType type() -> a
+    48:49:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    int foliageHeight(java.util.Random,int,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    56:56:int foliageRadius(java.util.Random,int) -> a
+    60:60:int offset(java.util.Random) -> a
+    boolean shouldSkipLocation(java.util.Random,int,int,int,int,boolean) -> a
+    68:75:boolean shouldSkipLocationSigned(java.util.Random,int,int,int,int,boolean) -> b
+    79:94:void placeLeavesRow(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,net.minecraft.core.BlockPos,int,java.util.Set,int,boolean,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    30:30:java.lang.Integer lambda$foliagePlacerParts$3(net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer) -> a
+    29:29:java.lang.Integer lambda$foliagePlacerParts$2(net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer) -> b
+    28:28:java.lang.Integer lambda$foliagePlacerParts$1(net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer) -> c
+    27:27:java.lang.Integer lambda$foliagePlacerParts$0(net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer) -> d
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$Factory -> cpg$a:
+    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer create(int,int,int,int) -> a
+net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment -> cpg$b:
+    net.minecraft.core.BlockPos foliagePos -> a
+    int radiusOffset -> b
+    boolean doubleTrunk -> c
+    101:105:void <init>(net.minecraft.core.BlockPos,int,boolean) -> <init>
+    108:108:net.minecraft.core.BlockPos foliagePos() -> a
+    112:112:int radiusOffset() -> b
+    116:116:boolean doubleTrunk() -> c
+net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType -> cph:
     net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType BLOB_FOLIAGE_PLACER -> a
     net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType SPRUCE_FOLIAGE_PLACER -> b
     net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType PINE_FOLIAGE_PLACER -> c
     net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType ACACIA_FOLIAGE_PLACER -> d
-    java.util.function.Function deserializer -> e
-    15:15:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType register(java.lang.String,java.util.function.Function) -> a
-    20:22:void <init>(java.util.function.Function) -> <init>
-    25:25:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer deserialize(com.mojang.datafixers.Dynamic) -> a
-    9:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.foliageplacers.PineFoliagePlacer -> chs:
-    13:14:void <init>(int,int) -> <init>
-    17:21:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    25:36:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration,int,int,int,net.minecraft.core.BlockPos,java.util.Set) -> a
-    40:40:int foliageRadius(java.util.Random,int,int,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    45:45:boolean shouldSkipLocation(java.util.Random,int,int,int,int,int) -> a
-    50:50:int getTreeRadiusForHeight(int,int,int,int) -> a
-net.minecraft.world.level.levelgen.feature.foliageplacers.SpruceFoliagePlacer -> cht:
-    13:14:void <init>(int,int) -> <init>
-    17:21:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    25:40:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration,int,int,int,net.minecraft.core.BlockPos,java.util.Set) -> a
-    44:44:int foliageRadius(java.util.Random,int,int,net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration) -> a
-    49:49:boolean shouldSkipLocation(java.util.Random,int,int,int,int,int) -> a
-    54:54:int getTreeRadiusForHeight(int,int,int,int) -> a
-net.minecraft.world.level.levelgen.feature.foliageplacers.package-info -> chu:
-net.minecraft.world.level.levelgen.feature.package-info -> chv:
-net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider -> chw:
-    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType type -> a
-    12:14:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType) -> <init>
+    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType BUSH_FOLIAGE_PLACER -> e
+    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType FANCY_FOLIAGE_PLACER -> f
+    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType MEGA_JUNGLE_FOLIAGE_PLACER -> g
+    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType MEGA_PINE_FOLIAGE_PLACER -> h
+    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType DARK_OAK_FOLIAGE_PLACER -> i
+    com.mojang.serialization.Codec codec -> j
+    18:18:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    23:25:void <init>(com.mojang.serialization.Codec) -> <init>
+    28:28:com.mojang.serialization.Codec codec() -> a
+    7:15:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.MegaJungleFoliagePlacer -> cpi:
+    com.mojang.serialization.Codec CODEC -> a
+    int height -> b
+    22:24:void <init>(int,int,int,int,int) -> <init>
+    28:28:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType type() -> a
+    34:40:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    44:44:int foliageHeight(java.util.Random,int,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    49:52:boolean shouldSkipLocation(java.util.Random,int,int,int,int,boolean) -> a
+    15:17:com.mojang.datafixers.kinds.App lambda$static$1(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    16:16:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.foliageplacers.MegaJungleFoliagePlacer) -> a
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.MegaPineFoliagePlacer -> cpj:
+    com.mojang.serialization.Codec CODEC -> a
+    int heightRand -> b
+    int crownHeight -> c
+    25:28:void <init>(int,int,int,int,int,int) -> <init>
+    32:32:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType type() -> a
+    37:53:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    57:57:int foliageHeight(java.util.Random,int,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    62:65:boolean shouldSkipLocation(java.util.Random,int,int,int,int,boolean) -> a
+    16:19:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    18:18:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.foliageplacers.MegaPineFoliagePlacer) -> a
+    17:17:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.foliageplacers.MegaPineFoliagePlacer) -> b
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.PineFoliagePlacer -> cpk:
+    com.mojang.serialization.Codec CODEC -> a
+    int height -> b
+    int heightRandom -> c
+    23:26:void <init>(int,int,int,int,int,int) -> <init>
+    30:30:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType type() -> a
+    35:46:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    50:50:int foliageRadius(java.util.Random,int) -> a
+    55:55:int foliageHeight(java.util.Random,int,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    60:60:boolean shouldSkipLocation(java.util.Random,int,int,int,int,boolean) -> a
+    14:17:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    16:16:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.foliageplacers.PineFoliagePlacer) -> a
+    15:15:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.foliageplacers.PineFoliagePlacer) -> b
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.SpruceFoliagePlacer -> cpl:
+    com.mojang.serialization.Codec CODEC -> a
+    int trunkHeight -> b
+    int trunkHeightRandom -> c
+    23:26:void <init>(int,int,int,int,int,int) -> <init>
+    30:30:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType type() -> a
+    35:52:void createFoliage(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,int,net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment,int,int,java.util.Set,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    57:57:int foliageHeight(java.util.Random,int,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    62:62:boolean shouldSkipLocation(java.util.Random,int,int,int,int,boolean) -> a
+    14:17:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    16:16:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.feature.foliageplacers.SpruceFoliagePlacer) -> a
+    15:15:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.feature.foliageplacers.SpruceFoliagePlacer) -> b
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.foliageplacers.package-info -> cpm:
+net.minecraft.world.level.levelgen.feature.package-info -> cpn:
+net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider -> cpo:
+    com.mojang.serialization.Codec CODEC -> a
+    10:10:void <init>() -> <init>
+    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType type() -> a
     net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType -> chx:
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType -> cpp:
     net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType SIMPLE_STATE_PROVIDER -> a
     net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType WEIGHTED_STATE_PROVIDER -> b
     net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType PLAIN_FLOWER_PROVIDER -> c
     net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType FOREST_FLOWER_PROVIDER -> d
-    java.util.function.Function deserializer -> e
-    15:15:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType register(java.lang.String,java.util.function.Function) -> a
-    20:22:void <init>(java.util.function.Function) -> <init>
-    25:25:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider deserialize(com.mojang.datafixers.Dynamic) -> a
-    9:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.stateproviders.ForestFlowerProvider -> chy:
-    net.minecraft.world.level.block.state.BlockState[] FLOWERS -> b
-    31:32:void <init>() -> <init>
-    35:36:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    40:41:net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
-    46:49:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    16:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.stateproviders.PlainFlowerProvider -> chz:
-    net.minecraft.world.level.block.state.BlockState[] LOW_NOISE_FLOWERS -> b
-    net.minecraft.world.level.block.state.BlockState[] HIGH_NOISE_FLOWERS -> c
-    29:30:void <init>() -> <init>
-    33:34:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    38:47:net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
-    52:55:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    15:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.stateproviders.RotatedBlockProvider -> cia:
-    net.minecraft.world.level.block.Block block -> b
-    19:21:void <init>(net.minecraft.world.level.block.Block) -> <init>
-    24:25:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    29:30:net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
-    35:39:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.feature.stateproviders.SimpleStateProvider -> cib:
-    net.minecraft.world.level.block.state.BlockState state -> b
+    net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType ROTATED_BLOCK_PROVIDER -> e
+    com.mojang.serialization.Codec codec -> f
+    14:14:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    19:21:void <init>(com.mojang.serialization.Codec) -> <init>
+    24:24:com.mojang.serialization.Codec codec() -> a
+    7:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.stateproviders.ForestFlowerProvider -> cpq:
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.world.level.block.state.BlockState[] FLOWERS -> d
+    net.minecraft.world.level.levelgen.feature.stateproviders.ForestFlowerProvider INSTANCE -> c
+    12:12:void <init>() -> <init>
+    31:31:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType type() -> a
+    38:39:net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
+    13:13:net.minecraft.world.level.levelgen.feature.stateproviders.ForestFlowerProvider lambda$static$0() -> b
+    13:34:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.stateproviders.PlainFlowerProvider -> cpr:
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.world.level.levelgen.feature.stateproviders.PlainFlowerProvider INSTANCE -> c
+    net.minecraft.world.level.block.state.BlockState[] LOW_NOISE_FLOWERS -> d
+    net.minecraft.world.level.block.state.BlockState[] HIGH_NOISE_FLOWERS -> e
+    12:12:void <init>() -> <init>
+    32:32:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType type() -> a
+    37:46:net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
+    13:13:net.minecraft.world.level.levelgen.feature.stateproviders.PlainFlowerProvider lambda$static$0() -> b
+    13:27:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.stateproviders.RotatedBlockProvider -> cps:
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.world.level.block.Block block -> c
+    20:22:void <init>(net.minecraft.world.level.block.Block) -> <init>
+    26:26:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType type() -> a
+    31:32:net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
+    15:15:net.minecraft.world.level.block.Block lambda$static$0(net.minecraft.world.level.levelgen.feature.stateproviders.RotatedBlockProvider) -> a
+    13:16:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.stateproviders.SimpleStateProvider -> cpt:
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.world.level.block.state.BlockState state -> c
     16:18:void <init>(net.minecraft.world.level.block.state.BlockState) -> <init>
-    21:22:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    26:26:net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
-    31:35:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider -> cic:
-    net.minecraft.world.entity.ai.behavior.WeightedList weightedList -> b
-    17:19:void <init>(net.minecraft.world.entity.ai.behavior.WeightedList) -> <init>
-    22:23:void <init>() -> <init>
-    26:27:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    30:31:net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider add(net.minecraft.world.level.block.state.BlockState,int) -> a
-    36:36:net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
-    41:46:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    44:44:com.mojang.datafixers.Dynamic lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.level.levelgen.feature.stateproviders.package-info -> cid:
-net.minecraft.world.level.levelgen.feature.structures.EmptyPoolElement -> cie:
-    net.minecraft.world.level.levelgen.feature.structures.EmptyPoolElement INSTANCE -> a
-    21:22:void <init>() -> <init>
-    26:26:net.minecraft.core.BlockPos getSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.block.Rotation) -> a
-    31:31:java.util.List getShuffledJigsawBlocks(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random) -> a
-    36:36:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> a
-    41:41:boolean place(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random) -> a
-    46:46:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType getType() -> a
-    51:51:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-    56:56:java.lang.String toString() -> toString
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.structures.FeaturePoolElement -> cif:
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature feature -> a
-    net.minecraft.nbt.CompoundTag defaultJigsawNBT -> b
-    33:34:void <init>(net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> <init>
-    37:40:void <init>(net.minecraft.world.level.levelgen.feature.ConfiguredFeature,net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
-    43:46:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    49:53:net.minecraft.nbt.CompoundTag fillDefaultJigsawNBT() -> b
-    58:58:net.minecraft.core.BlockPos getSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.block.Rotation) -> a
-    63:65:java.util.List getShuffledJigsawBlocks(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random) -> a
-    70:71:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> a
-    76:76:boolean place(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random) -> a
-    81:82:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-    88:88:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType getType() -> a
-    93:93:java.lang.String toString() -> toString
-net.minecraft.world.level.levelgen.feature.structures.JigsawJunction -> cig:
+    22:22:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType type() -> a
+    26:26:com.mojang.serialization.DataResult read(com.mojang.serialization.Dynamic) -> a
+    31:31:net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
+    12:12:net.minecraft.world.level.block.state.BlockState lambda$static$0(net.minecraft.world.level.levelgen.feature.stateproviders.SimpleStateProvider) -> a
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider -> cpu:
+    com.mojang.serialization.Codec CODEC -> b
+    net.minecraft.world.entity.ai.behavior.WeightedList weightedList -> c
+    16:19:com.mojang.serialization.DataResult create(net.minecraft.world.entity.ai.behavior.WeightedList) -> a
+    22:24:void <init>(net.minecraft.world.entity.ai.behavior.WeightedList) -> <init>
+    28:28:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType type() -> a
+    32:33:void <init>() -> <init>
+    36:37:net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider add(net.minecraft.world.level.block.state.BlockState,int) -> a
+    42:42:net.minecraft.world.level.block.state.BlockState getState(java.util.Random,net.minecraft.core.BlockPos) -> a
+    12:12:net.minecraft.world.entity.ai.behavior.WeightedList lambda$static$0(net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider) -> a
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.stateproviders.package-info -> cpv:
+net.minecraft.world.level.levelgen.feature.structures.EmptyPoolElement -> cpw:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.structures.EmptyPoolElement INSTANCE -> b
+    23:24:void <init>() -> <init>
+    28:28:net.minecraft.core.BlockPos getSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.block.Rotation) -> a
+    33:33:java.util.List getShuffledJigsawBlocks(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random) -> a
+    38:38:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> a
+    43:43:boolean place(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,boolean) -> a
+    48:48:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType getType() -> a
+    53:53:java.lang.String toString() -> toString
+    18:18:net.minecraft.world.level.levelgen.feature.structures.EmptyPoolElement lambda$static$0() -> b
+    18:20:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.structures.FeaturePoolElement -> cpx:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.ConfiguredFeature feature -> b
+    net.minecraft.nbt.CompoundTag defaultJigsawNBT -> c
+    40:41:void <init>(net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> <init>
+    44:47:void <init>(net.minecraft.world.level.levelgen.feature.ConfiguredFeature,net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
+    50:59:net.minecraft.nbt.CompoundTag fillDefaultJigsawNBT() -> b
+    64:64:net.minecraft.core.BlockPos getSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.block.Rotation) -> a
+    69:71:java.util.List getShuffledJigsawBlocks(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random) -> a
+    76:77:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> a
+    82:82:boolean place(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,boolean) -> a
+    87:87:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType getType() -> a
+    92:92:java.lang.String toString() -> toString
+    27:30:com.mojang.datafixers.kinds.App lambda$static$1(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    28:28:net.minecraft.world.level.levelgen.feature.ConfiguredFeature lambda$null$0(net.minecraft.world.level.levelgen.feature.structures.FeaturePoolElement) -> a
+    27:27:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.structures.JigsawJunction -> cpy:
     int sourceX -> a
     int sourceGroundY -> b
     int sourceZ -> c
@@ -60411,33 +66296,35 @@ net.minecraft.world.level.levelgen.feature.structures.JigsawJunction -> cig:
     31:31:int getSourceZ() -> c
     35:35:int getDeltaY() -> d
     39:39:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection getDestProjection() -> e
-    43:51:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    55:60:net.minecraft.world.level.levelgen.feature.structures.JigsawJunction deserialize(com.mojang.datafixers.Dynamic) -> a
+    43:51:com.mojang.serialization.Dynamic serialize(com.mojang.serialization.DynamicOps) -> a
+    55:60:net.minecraft.world.level.levelgen.feature.structures.JigsawJunction deserialize(com.mojang.serialization.Dynamic) -> a
     66:74:boolean equals(java.lang.Object) -> equals
     79:84:int hashCode() -> hashCode
     89:89:java.lang.String toString() -> toString
-net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement -> cih:
+net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement -> cpz:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePools POOLS -> a
-    30:30:void <init>() -> <init>
-    278:281:void addPieces(net.minecraft.resources.ResourceLocation,int,net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceFactory,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,java.util.List,java.util.Random) -> a
-    30:30:org.apache.logging.log4j.Logger access$500() -> a
-    31:36:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$1 -> cih$1:
-net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceFactory -> cih$a:
+    33:33:void <init>() -> <init>
+    42:45:void bootstrap() -> a
+    255:301:void addPieces(net.minecraft.resources.ResourceLocation,int,net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceFactory,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,java.util.List,java.util.Random,boolean,boolean) -> a
+    304:314:void addPieces(net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece,int,net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceFactory,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,java.util.List,java.util.Random) -> a
+    33:33:org.apache.logging.log4j.Logger access$000() -> b
+    34:39:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$1 -> cpz$1:
+net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceFactory -> cpz$a:
     net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece create(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement,net.minecraft.core.BlockPos,int,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox) -> create
-net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceState -> cih$b:
+net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceState -> cpz$b:
     net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece piece -> a
-    java.util.concurrent.atomic.AtomicReference free -> b
+    org.apache.commons.lang3.mutable.MutableObject free -> b
     int boundsTop -> c
     int depth -> d
-    44:49:void <init>(net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece,java.util.concurrent.atomic.AtomicReference,int,int) -> <init>
-    38:38:void <init>(net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece,java.util.concurrent.atomic.AtomicReference,int,int,net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$1) -> <init>
-    38:38:net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece access$100(net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceState) -> a
-    38:38:java.util.concurrent.atomic.AtomicReference access$200(net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceState) -> b
-    38:38:int access$300(net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceState) -> c
-    38:38:int access$400(net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceState) -> d
-net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$Placer -> cih$c:
+    53:58:void <init>(net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece,org.apache.commons.lang3.mutable.MutableObject,int,int) -> <init>
+    47:47:void <init>(net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece,org.apache.commons.lang3.mutable.MutableObject,int,int,net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$1) -> <init>
+    47:47:net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece access$400(net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceState) -> a
+    47:47:org.apache.commons.lang3.mutable.MutableObject access$500(net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceState) -> b
+    47:47:int access$600(net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceState) -> c
+    47:47:int access$700(net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceState) -> d
+net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$Placer -> cpz$c:
     int maxDepth -> a
     net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceFactory factory -> b
     net.minecraft.world.level.chunk.ChunkGenerator chunkGenerator -> c
@@ -60445,370 +66332,485 @@ net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$Placer ->
     java.util.List pieces -> e
     java.util.Random random -> f
     java.util.Deque placing -> g
-    59:100:void <init>(net.minecraft.resources.ResourceLocation,int,net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceFactory,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,java.util.List,java.util.Random) -> <init>
-    103:274:void tryPlacingChildren(net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece,java.util.concurrent.atomic.AtomicReference,int,int) -> a
-    169:175:int lambda$tryPlacingChildren$0(net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo) -> a
-net.minecraft.world.level.levelgen.feature.structures.ListPoolElement -> cii:
-    java.util.List elements -> a
-    28:29:void <init>(java.util.List) -> <init>
-    32:38:void <init>(java.util.List,net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
-    41:47:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    51:61:net.minecraft.core.BlockPos getSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.block.Rotation) -> a
-    66:66:java.util.List getShuffledJigsawBlocks(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random) -> a
-    71:77:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> a
-    82:87:boolean place(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random) -> a
-    92:92:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType getType() -> a
-    97:99:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement setProjection(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> a
-    104:106:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-    112:112:java.lang.String toString() -> toString
-    116:117:void setProjectionOnEachElement(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> b
-    116:116:void lambda$setProjectionOnEachElement$2(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement) -> a
-    104:104:java.lang.Object lambda$getDynamic$1(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement) -> a
-    42:42:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement lambda$new$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement -> cij:
-    net.minecraft.resources.ResourceLocation location -> a
-    com.google.common.collect.ImmutableList processors -> b
-    40:41:void <init>(java.lang.String,java.util.List) -> <init>
-    44:47:void <init>(java.lang.String,java.util.List,net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
-    54:55:void <init>(java.lang.String) -> <init>
-    58:61:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    65:66:net.minecraft.core.BlockPos getSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.block.Rotation) -> a
-    70:86:java.util.List getDataMarkers(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,boolean) -> a
-    91:94:java.util.List getShuffledJigsawBlocks(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random) -> a
-    99:100:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> a
-    105:116:boolean place(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random) -> a
-    120:129:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings getSettings(net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    134:134:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType getType() -> a
-    139:141:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-    147:147:java.lang.String toString() -> toString
-    141:141:java.lang.Object lambda$getDynamic$1(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor) -> a
-    60:60:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor lambda$new$0(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement -> cik:
+    68:77:void <init>(int,net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceFactory,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,java.util.List,java.util.Random) -> <init>
+    80:251:void tryPlacingChildren(net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece,org.apache.commons.lang3.mutable.MutableObject,int,int,boolean) -> a
+    146:152:int lambda$tryPlacingChildren$0(net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo) -> a
+    61:61:void <init>(int,net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$PieceFactory,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,java.util.List,java.util.Random,net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$1) -> <init>
+    61:61:java.util.Deque access$300(net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$Placer) -> a
+    61:61:void access$800(net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement$Placer,net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece,org.apache.commons.lang3.mutable.MutableObject,int,int,boolean) -> a
+net.minecraft.world.level.levelgen.feature.structures.LegacySinglePoolElement -> cqa:
+    com.mojang.serialization.Codec CODEC -> a
+    33:34:void <init>(java.lang.String,java.util.List) -> <init>
+    37:38:void <init>(com.mojang.datafixers.util.Either,java.util.List,net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
+    45:46:void <init>(java.lang.String) -> <init>
+    50:53:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings getSettings(net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,boolean) -> a
+    58:58:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType getType() -> a
+    63:63:java.lang.String toString() -> toString
+    22:26:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    22:22:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.structures.ListPoolElement -> cqb:
+    com.mojang.serialization.Codec CODEC -> a
+    java.util.List elements -> b
+    31:32:void <init>(java.util.List) -> <init>
+    35:41:void <init>(java.util.List,net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
+    45:55:net.minecraft.core.BlockPos getSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.block.Rotation) -> a
+    60:60:java.util.List getShuffledJigsawBlocks(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random) -> a
+    65:71:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> a
+    76:81:boolean place(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,boolean) -> a
+    86:86:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType getType() -> a
+    91:93:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement setProjection(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> a
+    98:98:java.lang.String toString() -> toString
+    102:103:void setProjectionOnEachElement(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> b
+    102:102:void lambda$setProjectionOnEachElement$2(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement) -> a
+    19:22:com.mojang.datafixers.kinds.App lambda$static$1(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    20:20:java.util.List lambda$null$0(net.minecraft.world.level.levelgen.feature.structures.ListPoolElement) -> a
+    19:19:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement -> cqc:
+    com.mojang.serialization.Codec TEMPLATE_CODEC -> a
+    com.mojang.serialization.Codec CODEC -> b
+    com.mojang.datafixers.util.Either template -> c
+    com.google.common.collect.ImmutableList processors -> d
+    36:40:com.mojang.serialization.DataResult encodeTemplate(com.mojang.datafixers.util.Either,com.mojang.serialization.DynamicOps,java.lang.Object) -> a
+    55:55:com.mojang.serialization.codecs.RecordCodecBuilder processorsCodec() -> b
+    59:59:com.mojang.serialization.codecs.RecordCodecBuilder templateCodec() -> c
+    70:71:void <init>(java.lang.String,java.util.List) -> <init>
+    74:77:void <init>(com.mojang.datafixers.util.Either,java.util.List,net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
+    80:81:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate,java.util.List,net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
+    88:89:void <init>(java.lang.String) -> <init>
+    93:94:net.minecraft.core.BlockPos getSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.block.Rotation) -> a
+    98:98:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate getTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
+    102:118:java.util.List getDataMarkers(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,boolean) -> a
+    123:126:java.util.List getShuffledJigsawBlocks(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random) -> a
+    131:132:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> a
+    137:148:boolean place(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,boolean) -> a
+    152:164:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings getSettings(net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,boolean) -> a
+    169:169:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType getType() -> a
+    174:174:java.lang.String toString() -> toString
+    59:59:com.mojang.datafixers.util.Either lambda$templateCodec$2(net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement) -> a
+    55:55:java.util.List lambda$processorsCodec$1(net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement) -> b
+    48:52:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    43:48:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement -> cqd:
+    com.mojang.serialization.Codec CODEC -> e
     net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection projection -> a
-    22:24:void <init>(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
-    26:28:void <init>(com.mojang.datafixers.Dynamic) -> <init>
+    24:24:com.mojang.serialization.codecs.RecordCodecBuilder projectionCodec() -> d
+    30:32:void <init>(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
     net.minecraft.core.BlockPos getSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.block.Rotation) -> a
     java.util.List getShuffledJigsawBlocks(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random) -> a
     net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> a
-    boolean place(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random) -> a
+    boolean place(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,boolean) -> a
     net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType getType() -> a
-    41:41:void handleDataMarker(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    44:45:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement setProjection(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> a
-    49:53:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection getProjection() -> c
-    com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-    59:61:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> b
-    65:65:int getGroundLevelDelta() -> d
-net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType -> cil:
-    net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType SINGLE -> b
-    net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType LIST -> c
-    net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType FEATURE -> d
-    net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType EMPTY -> e
-    14:14:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType register(java.lang.String,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType) -> a
-    10:10:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement lambda$static$0(com.mojang.datafixers.Dynamic) -> a
-    7:10:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool -> cim:
-    net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool EMPTY -> a
-    net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool INVALID -> b
-    net.minecraft.resources.ResourceLocation name -> c
-    com.google.common.collect.ImmutableList rawTemplates -> d
-    java.util.List templates -> e
-    net.minecraft.resources.ResourceLocation fallback -> f
-    net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection projection -> g
-    int maxSize -> h
-    68:82:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,java.util.List,net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
-    85:88:int getMaxSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
-    92:92:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement getTemplate(int) -> a
-    96:96:net.minecraft.resources.ResourceLocation getFallback() -> a
-    100:100:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement getRandomTemplate(java.util.Random) -> a
-    104:104:java.util.List getShuffledTemplates(java.util.Random) -> b
-    108:108:net.minecraft.resources.ResourceLocation getName() -> b
-    112:112:int size() -> c
-    116:130:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    135:143:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool deserialize(com.mojang.datafixers.Dynamic) -> a
-    136:138:com.mojang.datafixers.util.Pair lambda$deserialize$2(com.mojang.datafixers.Dynamic,com.mojang.datafixers.Dynamic) -> a
-    117:122:java.lang.Object lambda$serialize$1(com.mojang.datafixers.types.DynamicOps,com.mojang.datafixers.util.Pair) -> a
-    86:86:int lambda$getMaxSize$0(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement) -> a
-    60:61:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection -> cim$a:
+    45:45:void handleDataMarker(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    48:49:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement setProjection(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> a
+    53:57:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection getProjection() -> e
+    61:61:int getGroundLevelDelta() -> f
+    21:21:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType -> cqe:
+    net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType SINGLE -> a
+    net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType LIST -> b
+    net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType FEATURE -> c
+    net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType EMPTY -> d
+    net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType LEGACY -> e
+    com.mojang.serialization.Codec codec() -> codec
+    17:17:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    17:17:com.mojang.serialization.Codec lambda$register$0(com.mojang.serialization.Codec) -> a
+    7:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool -> cqf:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool EMPTY -> b
+    net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool INVALID -> c
+    net.minecraft.resources.ResourceLocation name -> e
+    com.google.common.collect.ImmutableList rawTemplates -> f
+    java.util.List templates -> g
+    net.minecraft.resources.ResourceLocation fallback -> h
+    net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection projection -> i
+    int maxSize -> j
+    87:101:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.resources.ResourceLocation,java.util.List,net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> <init>
+    104:107:int getMaxSize(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
+    111:111:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement getTemplate(int) -> a
+    115:115:net.minecraft.resources.ResourceLocation getFallback() -> a
+    119:119:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement getRandomTemplate(java.util.Random) -> a
+    123:123:java.util.List getShuffledTemplates(java.util.Random) -> b
+    127:127:net.minecraft.resources.ResourceLocation getName() -> b
+    131:131:int size() -> c
+    105:105:int lambda$getMaxSize$3(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement) -> a
+    30:38:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    37:37:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection lambda$null$1(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool) -> a
+    36:36:java.util.List lambda$null$0(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool) -> b
+    28:80:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection -> cqf$a:
     net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection TERRAIN_MATCHING -> a
     net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection RIGID -> b
-    java.util.Map BY_NAME -> c
-    java.lang.String name -> d
-    com.google.common.collect.ImmutableList processors -> e
-    net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection[] $VALUES -> f
-    28:28:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection[] values() -> values
-    28:28:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection valueOf(java.lang.String) -> valueOf
-    42:45:void <init>(java.lang.String,int,java.lang.String,com.google.common.collect.ImmutableList) -> <init>
-    48:48:java.lang.String getName() -> a
-    52:52:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection byName(java.lang.String) -> a
-    56:56:com.google.common.collect.ImmutableList getProcessors() -> b
-    38:38:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection lambda$static$0(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> a
-    28:38:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePools -> cin:
+    com.mojang.serialization.Codec CODEC -> c
+    java.util.Map BY_NAME -> d
+    java.lang.String name -> e
+    com.google.common.collect.ImmutableList processors -> f
+    net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection[] $VALUES -> g
+    40:40:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection[] values() -> values
+    40:40:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection valueOf(java.lang.String) -> valueOf
+    56:59:void <init>(java.lang.String,int,java.lang.String,com.google.common.collect.ImmutableList) -> <init>
+    62:62:java.lang.String getName() -> b
+    66:66:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection byName(java.lang.String) -> a
+    70:70:com.google.common.collect.ImmutableList getProcessors() -> c
+    75:75:java.lang.String getSerializedName() -> a
+    52:52:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection lambda$static$0(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool$Projection) -> a
+    40:52:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePools -> cqg:
     java.util.Map pools -> a
     10:14:void <init>() -> <init>
     17:18:void register(net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool) -> a
     21:21:java.util.Set getPoolLocations() -> a
     25:26:net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool getPool(net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.world.level.levelgen.feature.structures.package-info -> cio:
-net.minecraft.world.level.levelgen.feature.treedecorators.AlterGroundDecorator -> cip:
+net.minecraft.world.level.levelgen.feature.structures.package-info -> cqh:
+net.minecraft.world.level.levelgen.feature.treedecorators.AlterGroundDecorator -> cqi:
+    com.mojang.serialization.Codec CODEC -> a
     net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider provider -> b
-    24:26:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider) -> <init>
-    29:34:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    38:54:void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    57:64:void placeCircle(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos) -> a
-    67:76:void placeBlockAt(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos) -> b
-    80:83:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    40:53:void lambda$place$1(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos) -> a
-    39:39:boolean lambda$place$0(int,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.feature.treedecorators.BeehiveDecorator -> ciq:
+    21:23:void <init>(net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider) -> <init>
+    27:27:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType type() -> a
+    32:48:void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    51:58:void placeCircle(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos) -> a
+    61:70:void placeBlockAt(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos) -> b
+    34:47:void lambda$place$2(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.core.BlockPos) -> a
+    33:33:boolean lambda$place$1(int,net.minecraft.core.BlockPos) -> a
+    17:17:net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider lambda$static$0(net.minecraft.world.level.levelgen.feature.treedecorators.AlterGroundDecorator) -> a
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.treedecorators.BeehiveDecorator -> cqj:
+    com.mojang.serialization.Codec CODEC -> a
     float probability -> b
-    29:31:void <init>(float) -> <init>
-    34:37:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    41:72:void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    76:79:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    51:51:boolean lambda$place$0(int,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.feature.treedecorators.CocoaDecorator -> cir:
+    27:29:void <init>(float) -> <init>
+    33:33:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType type() -> a
+    38:69:void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    48:48:boolean lambda$place$1(int,net.minecraft.core.BlockPos) -> a
+    23:23:java.lang.Float lambda$static$0(net.minecraft.world.level.levelgen.feature.treedecorators.BeehiveDecorator) -> a
+    23:23:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.treedecorators.CocoaDecorator -> cqk:
+    com.mojang.serialization.Codec CODEC -> a
     float probability -> b
-    24:26:void <init>(float) -> <init>
-    29:30:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    34:53:void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    57:60:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    42:52:void lambda$place$1(java.util.Random,net.minecraft.world.level.LevelAccessor,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos) -> a
-    40:40:boolean lambda$place$0(int,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.feature.treedecorators.LeaveVineDecorator -> cis:
-    21:22:void <init>() -> <init>
-    25:26:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    30:59:void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    62:71:void addHangingVine(net.minecraft.world.level.LevelSimulatedRW,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.properties.BooleanProperty,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    75:77:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    31:58:void lambda$place$0(java.util.Random,net.minecraft.world.level.LevelAccessor,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator -> cit:
-    net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType type -> a
-    20:22:void <init>(net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType) -> <init>
+    22:24:void <init>(float) -> <init>
+    28:28:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType type() -> a
+    33:52:void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    41:51:void lambda$place$2(java.util.Random,net.minecraft.world.level.LevelAccessor,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos) -> a
+    39:39:boolean lambda$place$1(int,net.minecraft.core.BlockPos) -> a
+    18:18:java.lang.Float lambda$static$0(net.minecraft.world.level.levelgen.feature.treedecorators.CocoaDecorator) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.treedecorators.LeaveVineDecorator -> cql:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.treedecorators.LeaveVineDecorator INSTANCE -> b
+    16:16:void <init>() -> <init>
+    19:19:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType type() -> a
+    28:57:void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    60:69:void addHangingVine(net.minecraft.world.level.LevelSimulatedRW,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.properties.BooleanProperty,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    29:56:void lambda$place$1(java.util.Random,net.minecraft.world.level.LevelAccessor,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos) -> a
+    22:22:net.minecraft.world.level.levelgen.feature.treedecorators.LeaveVineDecorator lambda$static$0() -> b
+    22:24:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator -> cqm:
+    com.mojang.serialization.Codec CODEC -> c
+    18:18:void <init>() -> <init>
+    net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType type() -> a
     void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    27:28:void placeVine(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.properties.BooleanProperty,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    31:34:void setBlock(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType -> ciu:
+    26:27:void placeVine(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.properties.BooleanProperty,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    30:33:void setBlock(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    19:19:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType -> cqn:
     net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType TRUNK_VINE -> a
     net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType LEAVE_VINE -> b
     net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType COCOA -> c
     net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType BEEHIVE -> d
     net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType ALTER_GROUND -> e
-    java.util.function.Function deserializer -> f
-    16:16:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType register(java.lang.String,java.util.function.Function) -> a
-    21:23:void <init>(java.util.function.Function) -> <init>
-    26:26:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator deserialize(com.mojang.datafixers.Dynamic) -> a
-    9:13:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.feature.treedecorators.TrunkVineDecorator -> civ:
-    19:20:void <init>() -> <init>
-    23:24:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    28:57:void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    61:63:java.lang.Object serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    29:56:void lambda$place$0(java.util.Random,net.minecraft.world.level.LevelAccessor,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.feature.treedecorators.package-info -> ciw:
-net.minecraft.world.level.levelgen.flat.FlatLayerInfo -> cix:
-    net.minecraft.world.level.block.state.BlockState blockState -> a
-    int height -> b
-    int start -> c
-    12:15:void <init>(int,net.minecraft.world.level.block.Block) -> <init>
-    18:18:int getHeight() -> a
-    22:22:net.minecraft.world.level.block.state.BlockState getBlockState() -> b
-    26:26:int getStart() -> c
-    30:31:void setStart(int) -> a
-    35:35:java.lang.String toString() -> toString
-net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings -> ciy:
-    org.apache.logging.log4j.Logger LOGGER -> w
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature MINESHAFT_COMPOSITE_FEATURE -> x
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature VILLAGE_COMPOSITE_FEATURE -> y
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature STRONGHOLD_COMPOSITE_FEATURE -> z
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature SWAMPHUT_COMPOSITE_FEATURE -> A
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature DESERT_PYRAMID_COMPOSITE_FEATURE -> B
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature JUNGLE_PYRAMID_COMPOSITE_FEATURE -> C
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature IGLOO_COMPOSITE_FEATURE -> D
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature SHIPWRECK_COMPOSITE_FEATURE -> E
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature OCEAN_MONUMENT_COMPOSITE_FEATURE -> F
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature WATER_LAKE_COMPOSITE_FEATURE -> G
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature LAVA_LAKE_COMPOSITE_FEATURE -> H
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature ENDCITY_COMPOSITE_FEATURE -> I
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature WOOLAND_MANSION_COMPOSITE_FEATURE -> J
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature FORTRESS_COMPOSITE_FEATURE -> K
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature OCEAN_RUIN_COMPOSITE_FEATURE -> L
-    net.minecraft.world.level.levelgen.feature.ConfiguredFeature PILLAGER_OUTPOST_COMPOSITE_FEATURE -> M
-    java.util.Map STRUCTURE_FEATURES_STEP -> t
-    java.util.Map STRUCTURE_FEATURES -> u
-    java.util.Map STRUCTURE_FEATURES_DEFAULT -> v
-    java.util.List layersInfo -> N
-    java.util.Map structuresOptions -> O
-    net.minecraft.world.level.biome.Biome biome -> P
-    net.minecraft.world.level.block.state.BlockState[] layers -> Q
-    boolean voidGen -> R
-    int seaLevel -> S
-    47:143:void <init>() -> <init>
-    150:156:net.minecraft.world.level.block.Block byString(java.lang.String) -> a
-    160:160:net.minecraft.world.level.biome.Biome getBiome() -> v
-    164:165:void setBiome(net.minecraft.world.level.biome.Biome) -> a
-    168:168:java.util.Map getStructuresOptions() -> w
-    172:172:java.util.List getLayersInfo() -> x
-    177:204:void updateLayers() -> y
-    208:249:java.lang.String toString() -> toString
-    254:286:net.minecraft.world.level.levelgen.flat.FlatLayerInfo getLayerInfoFromString(java.lang.String,int) -> a
-    290:303:java.util.List getLayersInfoFromString(java.lang.String) -> c
-    307:324:com.mojang.datafixers.Dynamic toObject(com.mojang.datafixers.types.DynamicOps) -> a
-    329:355:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings fromObject(com.mojang.datafixers.Dynamic) -> a
-    359:410:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings fromString(java.lang.String) -> b
-    414:416:void addStructure(java.lang.String) -> d
-    419:462:void addStructureOption(java.lang.String,java.lang.String,java.lang.String) -> a
-    465:474:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings getDefault() -> z
-    478:478:boolean isVoidGen() -> A
-    482:482:int getSeaLevel() -> B
-    486:486:net.minecraft.world.level.block.state.BlockState[] getLayers() -> C
-    490:491:void deleteLayer(int) -> a
-    378:378:java.lang.IllegalArgumentException lambda$fromString$12(net.minecraft.resources.ResourceLocation) -> a
-    348:348:void lambda$fromObject$11(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings,java.util.Map) -> a
-    349:349:void lambda$null$10(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings,com.mojang.datafixers.Dynamic) -> a
-    350:350:java.util.Map lambda$null$9(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings,java.lang.String) -> a
-    336:336:net.minecraft.world.level.levelgen.flat.FlatLayerInfo lambda$fromObject$8(com.mojang.datafixers.util.Pair) -> a
-    333:333:boolean lambda$fromObject$7(com.mojang.datafixers.util.Pair) -> b
-    331:331:com.mojang.datafixers.util.Pair lambda$fromObject$6(com.mojang.datafixers.Dynamic) -> b
-    313:317:com.mojang.datafixers.util.Pair lambda$toObject$5(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> a
-    316:316:com.mojang.datafixers.util.Pair lambda$null$4(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> b
-    307:309:java.lang.Object lambda$toObject$3(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.flat.FlatLayerInfo) -> a
-    124:138:void lambda$static$2(java.util.HashMap) -> a
-    110:121:void lambda$static$1(java.util.HashMap) -> b
-    91:107:void lambda$static$0(java.util.HashMap) -> c
-    48:123:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.flat.package-info -> ciz:
-net.minecraft.world.level.levelgen.package-info -> cja:
-net.minecraft.world.level.levelgen.placement.CarvingMaskDecorator -> cjb:
-    19:20:void <init>(java.util.function.Function) -> <init>
-    24:28:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.CarvingMaskDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    17:17:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    29:32:net.minecraft.core.BlockPos lambda$getPositions$1(net.minecraft.world.level.ChunkPos,int) -> a
-    28:28:boolean lambda$getPositions$0(java.util.BitSet,java.util.Random,net.minecraft.world.level.levelgen.placement.CarvingMaskDecoratorConfiguration,int) -> a
-net.minecraft.world.level.levelgen.placement.CarvingMaskDecoratorConfiguration -> cjc:
-    net.minecraft.world.level.levelgen.GenerationStep$Carving step -> a
-    float probability -> b
-    13:16:void <init>(net.minecraft.world.level.levelgen.GenerationStep$Carving,float) -> <init>
-    20:22:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    28:31:net.minecraft.world.level.levelgen.placement.CarvingMaskDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration -> cjd:
-    int chance -> a
+    com.mojang.serialization.Codec codec -> f
+    14:14:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    19:21:void <init>(com.mojang.serialization.Codec) -> <init>
+    24:24:com.mojang.serialization.Codec codec() -> a
+    7:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.treedecorators.TrunkVineDecorator -> cqo:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.treedecorators.TrunkVineDecorator INSTANCE -> b
+    14:14:void <init>() -> <init>
+    17:17:net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType type() -> a
+    26:55:void place(net.minecraft.world.level.LevelAccessor,java.util.Random,java.util.List,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    27:54:void lambda$place$1(java.util.Random,net.minecraft.world.level.LevelAccessor,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos) -> a
+    20:20:net.minecraft.world.level.levelgen.feature.treedecorators.TrunkVineDecorator lambda$static$0() -> b
+    20:22:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.treedecorators.package-info -> cqp:
+net.minecraft.world.level.levelgen.feature.trunkplacers.DarkOakTrunkPlacer -> cqq:
+    com.mojang.serialization.Codec CODEC -> a
+    22:23:void <init>(int,int,int) -> <init>
+    27:27:net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType type() -> a
+    32:90:java.util.List placeTrunk(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    19:19:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> b
+    19:19:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.trunkplacers.FancyTrunkPlacer -> cqr:
+    com.mojang.serialization.Codec CODEC -> a
+    30:31:void <init>(int,int,int) -> <init>
+    35:35:net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType type() -> a
+    40:101:java.util.List placeTrunk(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    106:130:boolean makeLimb(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,boolean,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    134:138:int getSteps(net.minecraft.core.BlockPos) -> a
+    142:154:net.minecraft.core.Direction$Axis getLogAxis(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    158:158:boolean trimBranches(int,int) -> a
+    162:170:void makeBranches(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,java.util.List,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    174:188:float treeShape(int,int) -> b
+    22:22:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> b
+    22:22:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.trunkplacers.FancyTrunkPlacer$FoliageCoords -> cqr$a:
+    net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment attachment -> a
+    int branchBase -> b
+    195:198:void <init>(net.minecraft.core.BlockPos,int) -> <init>
+    201:201:int getBranchBase() -> a
+    191:191:net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer$FoliageAttachment access$000(net.minecraft.world.level.levelgen.feature.trunkplacers.FancyTrunkPlacer$FoliageCoords) -> a
+net.minecraft.world.level.levelgen.feature.trunkplacers.ForkingTrunkPlacer -> cqs:
+    com.mojang.serialization.Codec CODEC -> a
+    21:22:void <init>(int,int,int) -> <init>
+    26:26:net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType type() -> a
+    31:80:java.util.List placeTrunk(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    18:18:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> b
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.trunkplacers.GiantTrunkPlacer -> cqt:
+    com.mojang.serialization.Codec CODEC -> a
+    20:21:void <init>(int,int,int) -> <init>
+    25:25:net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType type() -> a
+    30:50:java.util.List placeTrunk(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    54:56:void placeLogIfFreeWithOffset(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration,net.minecraft.core.BlockPos,int,int,int) -> a
+    17:17:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> b
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.trunkplacers.MegaJungleTrunkPlacer -> cqu:
+    com.mojang.serialization.Codec CODEC -> b
+    21:22:void <init>(int,int,int) -> <init>
+    26:26:net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType type() -> a
+    31:50:java.util.List placeTrunk(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    18:18:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> b
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.trunkplacers.StraightTrunkPlacer -> cqv:
+    com.mojang.serialization.Codec CODEC -> a
+    20:21:void <init>(int,int,int) -> <init>
+    25:25:net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType type() -> a
+    30:35:java.util.List placeTrunk(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    17:17:com.mojang.datafixers.kinds.App lambda$static$0(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> b
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer -> cqw:
+    com.mojang.serialization.Codec CODEC -> c
+    int baseHeight -> d
+    int heightRandA -> e
+    int heightRandB -> f
+    28:31:com.mojang.datafixers.Products$P3 trunkPlacerParts(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    38:42:void <init>(int,int,int) -> <init>
+    net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType type() -> a
+    java.util.List placeTrunk(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,int,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    49:49:int getTreeHeight(java.util.Random) -> a
+    53:55:void setBlock(net.minecraft.world.level.LevelWriter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    58:58:boolean isDirt(net.minecraft.world.level.LevelSimulatedReader,net.minecraft.core.BlockPos) -> a
+    67:70:void setDirtAt(net.minecraft.world.level.LevelSimulatedRW,net.minecraft.core.BlockPos) -> a
+    73:78:boolean placeLog(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    82:85:void placeLogIfFree(net.minecraft.world.level.LevelSimulatedRW,java.util.Random,net.minecraft.core.BlockPos$MutableBlockPos,java.util.Set,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration) -> a
+    59:62:boolean lambda$isDirt$3(net.minecraft.world.level.block.state.BlockState) -> a
+    31:31:java.lang.Integer lambda$trunkPlacerParts$2(net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer) -> a
+    30:30:java.lang.Integer lambda$trunkPlacerParts$1(net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer) -> b
+    29:29:java.lang.Integer lambda$trunkPlacerParts$0(net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer) -> c
+    25:25:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType -> cqx:
+    net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType STRAIGHT_TRUNK_PLACER -> a
+    net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType FORKING_TRUNK_PLACER -> b
+    net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType GIANT_TRUNK_PLACER -> c
+    net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType MEGA_JUNGLE_TRUNK_PLACER -> d
+    net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType DARK_OAK_TRUNK_PLACER -> e
+    net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType FANCY_TRUNK_PLACER -> f
+    com.mojang.serialization.Codec codec -> g
+    15:15:net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    20:22:void <init>(com.mojang.serialization.Codec) -> <init>
+    25:25:com.mojang.serialization.Codec codec() -> a
+    7:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.feature.trunkplacers.package-info -> cqy:
+net.minecraft.world.level.levelgen.flat.FlatLayerInfo -> cqz:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.state.BlockState blockState -> b
+    int height -> c
+    int start -> d
+    22:25:void <init>(int,net.minecraft.world.level.block.Block) -> <init>
+    28:28:int getHeight() -> a
+    32:32:net.minecraft.world.level.block.state.BlockState getBlockState() -> b
+    36:36:int getStart() -> c
+    40:41:void setStart(int) -> a
+    45:45:java.lang.String toString() -> toString
+    13:16:com.mojang.datafixers.kinds.App lambda$static$1(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    15:15:net.minecraft.world.level.block.Block lambda$null$0(net.minecraft.world.level.levelgen.flat.FlatLayerInfo) -> a
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings -> cra:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.feature.ConfiguredFeature WATER_LAKE_COMPOSITE_FEATURE -> c
+    net.minecraft.world.level.levelgen.feature.ConfiguredFeature LAVA_LAKE_COMPOSITE_FEATURE -> d
+    java.util.Map STRUCTURE_FEATURES -> e
+    net.minecraft.world.level.levelgen.StructureSettings structureSettings -> f
+    java.util.List layersInfo -> g
+    net.minecraft.world.level.biome.Biome biome -> h
+    net.minecraft.world.level.block.state.BlockState[] layers -> i
+    boolean voidGen -> j
+    boolean decoration -> k
+    boolean addLakes -> l
+    79:89:void <init>(net.minecraft.world.level.levelgen.StructureSettings,java.util.List,boolean,boolean,net.minecraft.world.level.biome.Biome) -> <init>
+    71:93:void <init>(net.minecraft.world.level.levelgen.StructureSettings) -> <init>
+    96:96:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings withStructureSettings(net.minecraft.world.level.levelgen.StructureSettings) -> a
+    100:112:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings withLayers(java.util.List,net.minecraft.world.level.levelgen.StructureSettings) -> a
+    116:117:void setDecoration() -> a
+    120:121:void setAddLakes() -> b
+    124:172:net.minecraft.world.level.biome.Biome getBiomeFromSettings() -> c
+    176:176:net.minecraft.world.level.levelgen.StructureSettings structureSettings() -> d
+    180:180:net.minecraft.world.level.biome.Biome getBiome() -> e
+    184:185:void setBiome(net.minecraft.world.level.biome.Biome) -> a
+    188:188:java.util.List getLayersInfo() -> f
+    192:192:net.minecraft.world.level.block.state.BlockState[] getLayers() -> g
+    196:217:void updateLayers() -> h
+    220:233:net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings getDefault() -> i
+    52:68:void lambda$static$5(java.util.HashMap) -> a
+    40:46:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    45:45:net.minecraft.world.level.biome.Biome lambda$null$3(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> a
+    45:45:net.minecraft.world.level.biome.Biome lambda$null$2() -> j
+    44:44:java.lang.Boolean lambda$null$1(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> b
+    43:43:java.lang.Boolean lambda$null$0(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings) -> c
+    38:51:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings$1 -> cra$1:
+    net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings this$0 -> t
+    136:136:void <init>(net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings,net.minecraft.world.level.biome.Biome$BiomeBuilder) -> <init>
+net.minecraft.world.level.levelgen.flat.package-info -> crb:
+net.minecraft.world.level.levelgen.package-info -> crc:
+net.minecraft.world.level.levelgen.placement.CarvingMaskDecorator -> crd:
+    18:19:void <init>(com.mojang.serialization.Codec) -> <init>
+    23:31:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.CarvingMaskDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    16:16:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    32:35:net.minecraft.core.BlockPos lambda$getPositions$1(net.minecraft.world.level.ChunkPos,int) -> a
+    31:31:boolean lambda$getPositions$0(java.util.BitSet,java.util.Random,net.minecraft.world.level.levelgen.placement.CarvingMaskDecoratorConfiguration,int) -> a
+net.minecraft.world.level.levelgen.placement.CarvingMaskDecoratorConfiguration -> cre:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.GenerationStep$Carving step -> b
+    float probability -> c
+    17:20:void <init>(net.minecraft.world.level.levelgen.GenerationStep$Carving,float) -> <init>
+    9:12:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    11:11:java.lang.Float lambda$null$1(net.minecraft.world.level.levelgen.placement.CarvingMaskDecoratorConfiguration) -> a
+    10:10:net.minecraft.world.level.levelgen.GenerationStep$Carving lambda$null$0(net.minecraft.world.level.levelgen.placement.CarvingMaskDecoratorConfiguration) -> b
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration -> crf:
+    com.mojang.serialization.Codec CODEC -> a
+    int chance -> b
     11:13:void <init>(int) -> <init>
-    17:18:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    24:25:net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.placement.ChanceHeightmapDecorator -> cje:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:28:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.ChanceHeightmapDoubleDecorator -> cjf:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:32:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.ChancePassthroughDecorator -> cjg:
-    12:13:void <init>(java.util.function.Function) -> <init>
-    19:23:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    10:10:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.ChanceTopSolidHeightmapDecorator -> cjh:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:28:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.ChorusPlantPlacementDecorator -> cji:
-    19:20:void <init>(java.util.function.Function) -> <init>
-    24:34:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    17:17:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    26:33:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.ConfiguredDecorator -> cjj:
-    net.minecraft.world.level.levelgen.placement.FeatureDecorator decorator -> a
-    net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration config -> b
-    24:28:void <init>(net.minecraft.world.level.levelgen.placement.FeatureDecorator,com.mojang.datafixers.Dynamic) -> <init>
-    30:33:void <init>(net.minecraft.world.level.levelgen.placement.FeatureDecorator,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration) -> <init>
-    36:36:boolean place(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
-    40:42:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    47:48:net.minecraft.world.level.levelgen.placement.ConfiguredDecorator deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.placement.CountBiasedRangeDecorator -> cjk:
-    14:15:void <init>(java.util.function.Function) -> <init>
-    19:19:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    12:12:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    20:23:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,int) -> a
-net.minecraft.world.level.levelgen.placement.CountChanceHeightmapDecorator -> cjl:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:22:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    15:15:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    23:26:net.minecraft.core.BlockPos lambda$getPositions$1(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-    22:22:boolean lambda$getPositions$0(java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration,int) -> a
-net.minecraft.world.level.levelgen.placement.CountChanceHeightmapDoubleDecorator -> cjm:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:33:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    16:16:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    24:32:net.minecraft.core.BlockPos lambda$getPositions$1(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-    23:23:boolean lambda$getPositions$0(java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration,int) -> a
-net.minecraft.world.level.levelgen.placement.CountDepthAverageDecorator -> cjn:
-    13:14:void <init>(java.util.function.Function) -> <init>
-    18:22:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.placement.DepthAverageConfigation,net.minecraft.core.BlockPos) -> a
-    11:11:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    23:26:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,int,int,int) -> a
-net.minecraft.world.level.levelgen.placement.CountHeighmapDoubleDecorator -> cjo:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:33:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    16:16:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    24:32:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.CountHeight64Decorator -> cjp:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:21:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    22:26:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,int) -> a
-net.minecraft.world.level.levelgen.placement.CountHeightmap32Decorator -> cjq:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:33:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    16:16:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    24:32:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.CountHeightmapDecorator -> cjr:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:22:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    15:15:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    23:27:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.CountTopSolidDecorator -> cjs:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:22:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    15:15:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    23:27:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.CountVeryBiasedRangeDecorator -> cjt:
-    14:15:void <init>(java.util.function.Function) -> <init>
-    19:19:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    12:12:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    20:23:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,int) -> a
-net.minecraft.world.level.levelgen.placement.CountWithExtraChanceHeightmapDecorator -> cju:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:27:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyWithExtraChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    15:15:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    28:31:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.DarkOakTreePlacementDecorator -> cjv:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    25:25:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    16:16:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    26:32:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.DepthAverageConfigation -> cjw:
-    int count -> a
-    int baseline -> b
-    int spread -> c
-    13:17:void <init>(int,int,int) -> <init>
-    21:24:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    30:33:net.minecraft.world.level.levelgen.placement.DepthAverageConfigation deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.placement.EmeraldPlacementDecorator -> cjx:
-    14:15:void <init>(java.util.function.Function) -> <init>
-    19:20:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    12:12:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    21:25:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,int) -> a
-net.minecraft.world.level.levelgen.placement.EndGatewayPlacementDecorator -> cjy:
-    17:18:void <init>(java.util.function.Function) -> <init>
+    7:7:java.lang.Integer lambda$static$0(net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration) -> a
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.placement.ChanceHeightmapDecorator -> crg:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:26:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    12:12:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.ChanceHeightmapDoubleDecorator -> crh:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:30:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    12:12:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.ChancePassthroughDecorator -> cri:
+    11:12:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:22:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    9:9:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.ChanceTopSolidHeightmapDecorator -> crj:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:26:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    12:12:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.ChorusPlantPlacementDecorator -> crk:
+    17:18:void <init>(com.mojang.serialization.Codec) -> <init>
     22:32:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
     15:15:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.EndIslandPlacementDecorator -> cjz:
-    13:14:void <init>(java.util.function.Function) -> <init>
-    18:29:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    24:31:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.ConfiguredDecorator -> crl:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.placement.FeatureDecorator decorator -> b
+    net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration config -> c
+    22:25:void <init>(net.minecraft.world.level.levelgen.placement.FeatureDecorator,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration) -> <init>
+    28:28:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
+    17:17:net.minecraft.world.level.levelgen.placement.FeatureDecorator lambda$static$0(net.minecraft.world.level.levelgen.placement.ConfiguredDecorator) -> a
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.placement.CountBiasedRangeDecorator -> crm:
+    13:14:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:18:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
     11:11:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.FeatureDecorator -> cka:
+    19:22:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,int) -> a
+net.minecraft.world.level.levelgen.placement.CountChanceHeightmapDecorator -> crn:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:20:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    21:24:net.minecraft.core.BlockPos lambda$getPositions$1(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+    20:20:boolean lambda$getPositions$0(java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration,int) -> a
+net.minecraft.world.level.levelgen.placement.CountChanceHeightmapDoubleDecorator -> cro:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:31:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    22:30:net.minecraft.core.BlockPos lambda$getPositions$1(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+    21:21:boolean lambda$getPositions$0(java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration,int) -> a
+net.minecraft.world.level.levelgen.placement.CountDepthAverageDecorator -> crp:
+    12:13:void <init>(com.mojang.serialization.Codec) -> <init>
+    17:21:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.placement.DepthAverageConfigation,net.minecraft.core.BlockPos) -> a
+    10:10:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    22:25:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,int,int,int) -> a
+net.minecraft.world.level.levelgen.placement.CountHeighmapDoubleDecorator -> crq:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:31:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    22:30:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.CountHeight64Decorator -> crr:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:19:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    12:12:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    20:24:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,int) -> a
+net.minecraft.world.level.levelgen.placement.CountHeightmap32Decorator -> crs:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:31:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    22:30:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.CountHeightmapDecorator -> crt:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:20:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    21:25:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.CountTopSolidDecorator -> cru:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:20:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    21:25:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.CountVeryBiasedRangeDecorator -> crv:
+    13:14:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:18:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    11:11:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    19:22:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,int) -> a
+net.minecraft.world.level.levelgen.placement.CountWithExtraChanceHeightmapDecorator -> crw:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:25:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyWithExtraChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    26:29:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.DarkOakTreePlacementDecorator -> crx:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    23:23:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    24:30:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.DepthAverageConfigation -> cry:
+    com.mojang.serialization.Codec CODEC -> a
+    int count -> b
+    int baseline -> c
+    int spread -> d
+    18:22:void <init>(int,int,int) -> <init>
+    8:12:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    11:11:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.placement.DepthAverageConfigation) -> a
+    10:10:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.placement.DepthAverageConfigation) -> b
+    9:9:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.placement.DepthAverageConfigation) -> c
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.placement.EmeraldPlacementDecorator -> crz:
+    13:14:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:19:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    11:11:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    20:24:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,int) -> a
+net.minecraft.world.level.levelgen.placement.EndGatewayPlacementDecorator -> csa:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:30:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.EndIslandPlacementDecorator -> csb:
+    12:13:void <init>(com.mojang.serialization.Codec) -> <init>
+    17:28:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    10:10:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.FeatureDecorator -> csc:
     net.minecraft.world.level.levelgen.placement.FeatureDecorator NOPE -> a
     net.minecraft.world.level.levelgen.placement.FeatureDecorator COUNT_HEIGHTMAP -> b
     net.minecraft.world.level.levelgen.placement.FeatureDecorator COUNT_TOP_SOLID -> c
@@ -60835,7 +66837,7 @@ net.minecraft.world.level.levelgen.placement.FeatureDecorator -> cka:
     net.minecraft.world.level.levelgen.placement.FeatureDecorator TOP_SOLID_HEIGHTMAP_NOISE_BIASED -> x
     net.minecraft.world.level.levelgen.placement.FeatureDecorator CARVING_MASK -> y
     net.minecraft.world.level.levelgen.placement.FeatureDecorator FOREST_ROCK -> z
-    net.minecraft.world.level.levelgen.placement.FeatureDecorator HELL_FIRE -> A
+    net.minecraft.world.level.levelgen.placement.FeatureDecorator FIRE -> A
     net.minecraft.world.level.levelgen.placement.FeatureDecorator MAGMA -> B
     net.minecraft.world.level.levelgen.placement.FeatureDecorator EMERALD_ORE -> C
     net.minecraft.world.level.levelgen.placement.FeatureDecorator LAVA_LAKE -> D
@@ -60847,136 +66849,155 @@ net.minecraft.world.level.levelgen.placement.FeatureDecorator -> cka:
     net.minecraft.world.level.levelgen.placement.FeatureDecorator END_ISLAND -> J
     net.minecraft.world.level.levelgen.placement.FeatureDecorator CHORUS_PLANT -> K
     net.minecraft.world.level.levelgen.placement.FeatureDecorator END_GATEWAY -> L
-    java.util.function.Function configurationFactory -> M
+    com.mojang.serialization.Codec configuredCodec -> M
     71:71:net.minecraft.world.level.levelgen.placement.FeatureDecorator register(java.lang.String,net.minecraft.world.level.levelgen.placement.FeatureDecorator) -> a
-    76:78:void <init>(java.util.function.Function) -> <init>
-    81:81:net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration createSettings(com.mojang.datafixers.Dynamic) -> a
-    85:85:net.minecraft.world.level.levelgen.placement.ConfiguredDecorator configured(net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration) -> a
-    89:94:boolean placeFeature(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
+    76:78:void <init>(com.mojang.serialization.Codec) -> <init>
+    81:81:net.minecraft.world.level.levelgen.placement.ConfiguredDecorator configured(net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration) -> a
+    85:85:com.mojang.serialization.Codec configuredCodec() -> a
+    89:95:boolean placeFeature(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.world.level.levelgen.feature.ConfiguredFeature) -> a
     java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    101:101:java.lang.String toString() -> toString
-    91:93:void lambda$placeFeature$0(net.minecraft.world.level.levelgen.feature.ConfiguredFeature,net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,java.util.concurrent.atomic.AtomicBoolean,net.minecraft.core.BlockPos) -> a
+    102:102:java.lang.String toString() -> toString
+    91:94:void lambda$placeFeature$2(net.minecraft.world.level.levelgen.feature.ConfiguredFeature,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,org.apache.commons.lang3.mutable.MutableBoolean,net.minecraft.core.BlockPos) -> a
+    77:77:net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration lambda$new$1(net.minecraft.world.level.levelgen.placement.ConfiguredDecorator) -> a
+    77:77:net.minecraft.world.level.levelgen.placement.ConfiguredDecorator lambda$new$0(net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration) -> b
     30:68:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.placement.ForestRockPlacementDecorator -> ckb:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:23:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    15:15:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    24:27:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration -> ckc:
-    int count -> a
-    float chance -> b
-    12:15:void <init>(int,float) -> <init>
-    19:21:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    27:29:net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration -> ckd:
-    int count -> a
+net.minecraft.world.level.levelgen.placement.ForestRockPlacementDecorator -> csd:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:21:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    22:25:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration -> cse:
+    com.mojang.serialization.Codec CODEC -> a
+    int count -> b
+    float chance -> c
+    16:19:void <init>(int,float) -> <init>
+    8:11:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:java.lang.Float lambda$null$1(net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration) -> a
+    9:9:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.placement.FrequencyChanceDecoratorConfiguration) -> b
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration -> csf:
+    com.mojang.serialization.Codec CODEC -> a
+    int count -> b
     11:13:void <init>(int) -> <init>
-    17:18:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    24:25:net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.placement.FrequencyWithExtraChanceDecoratorConfiguration -> cke:
-    int count -> a
-    float extraChance -> b
-    int extraCount -> c
-    13:17:void <init>(int,float,int) -> <init>
-    21:24:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    30:33:net.minecraft.world.level.levelgen.placement.FrequencyWithExtraChanceDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.placement.IcebergPlacementDecorator -> ckf:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:28:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.LakeLavaPlacementDecorator -> ckg:
-    15:16:void <init>(java.util.function.Function) -> <init>
-    20:29:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.LakeWaterPlacementDecorator -> ckh:
-    15:16:void <init>(java.util.function.Function) -> <init>
-    20:27:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.MonsterRoomPlacementDecorator -> cki:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:22:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    23:27:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.ChunkGenerator,int) -> a
-net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration -> ckj:
-    int noiseToCountRatio -> a
-    double noiseFactor -> b
-    double noiseOffset -> c
-    net.minecraft.world.level.levelgen.Heightmap$Types heightmap -> d
-    15:20:void <init>(int,double,double,net.minecraft.world.level.levelgen.Heightmap$Types) -> <init>
-    24:28:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    34:38:net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.placement.NoiseHeightmap32Decorator -> ckk:
-    20:21:void <init>(java.util.function.Function) -> <init>
-    25:38:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    18:18:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    29:37:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.NoiseHeightmapDoubleDecorator -> ckl:
-    20:21:void <init>(java.util.function.Function) -> <init>
-    25:38:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    18:18:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    29:37:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.NopePlacementDecorator -> ckm:
-    13:14:void <init>(java.util.function.Function) -> <init>
-    18:18:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    11:11:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.RangeDecoratorConfiguration -> ckn:
-    int min -> a
-    int max -> b
-    12:15:void <init>(int,int) -> <init>
-    19:21:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    27:29:net.minecraft.world.level.levelgen.placement.RangeDecoratorConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.placement.SimpleFeatureDecorator -> cko:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:21:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.TopSolidHeightMapDecorator -> ckp:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:25:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    15:15:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.TopSolidHeightMapNoiseBasedDecorator -> ckq:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:25:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    15:15:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    26:30:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration,int) -> a
-net.minecraft.world.level.levelgen.placement.TopSolidHeightMapRangeDecorator -> ckr:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    22:23:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.RangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    15:15:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    24:27:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
-net.minecraft.world.level.levelgen.placement.nether.ChanceRangeDecorator -> cks:
-    14:15:void <init>(java.util.function.Function) -> <init>
-    19:26:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    12:12:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.nether.CountRangeDecorator -> ckt:
-    15:16:void <init>(java.util.function.Function) -> <init>
-    20:20:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    13:13:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    21:24:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,int) -> a
-net.minecraft.world.level.levelgen.placement.nether.HellFireDecorator -> cku:
-    17:18:void <init>(java.util.function.Function) -> <init>
-    24:33:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    15:15:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.placement.nether.LightGemChanceDecorator -> ckv:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:21:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    14:14:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    22:25:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,int) -> a
-net.minecraft.world.level.levelgen.placement.nether.MagmaDecorator -> ckw:
-    18:19:void <init>(java.util.function.Function) -> <init>
-    23:25:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    7:7:java.lang.Integer lambda$static$0(net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration) -> a
+    7:7:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.placement.FrequencyWithExtraChanceDecoratorConfiguration -> csg:
+    com.mojang.serialization.Codec CODEC -> a
+    int count -> b
+    float extraChance -> c
+    int extraCount -> d
+    18:22:void <init>(int,float,int) -> <init>
+    8:12:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    11:11:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.placement.FrequencyWithExtraChanceDecoratorConfiguration) -> a
+    10:10:java.lang.Float lambda$null$1(net.minecraft.world.level.levelgen.placement.FrequencyWithExtraChanceDecoratorConfiguration) -> b
+    9:9:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.placement.FrequencyWithExtraChanceDecoratorConfiguration) -> c
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.placement.IcebergPlacementDecorator -> csh:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:26:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    12:12:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.LakeLavaPlacementDecorator -> csi:
+    13:14:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:27:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    11:11:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.LakeWaterPlacementDecorator -> csj:
+    13:14:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:25:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    11:11:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.MonsterRoomPlacementDecorator -> csk:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:20:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    12:12:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    21:25:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.chunk.ChunkGenerator,int) -> a
+net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration -> csl:
+    com.mojang.serialization.Codec CODEC -> a
+    org.apache.logging.log4j.Logger LOGGER -> g
+    int noiseToCountRatio -> b
+    double noiseFactor -> c
+    double noiseOffset -> d
+    net.minecraft.world.level.levelgen.Heightmap$Types heightmap -> e
+    25:30:void <init>(int,double,double,net.minecraft.world.level.levelgen.Heightmap$Types) -> <init>
+    11:16:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    15:15:net.minecraft.world.level.levelgen.Heightmap$Types lambda$null$3(net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration) -> a
+    14:14:java.lang.Double lambda$null$2(net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration) -> b
+    13:13:java.lang.Double lambda$null$1(net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration) -> c
+    12:12:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration) -> d
+    11:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.placement.NoiseHeightmap32Decorator -> csm:
+    18:19:void <init>(com.mojang.serialization.Codec) -> <init>
+    23:36:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
     16:16:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    26:29:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,int,int) -> a
-net.minecraft.world.level.levelgen.placement.nether.RandomCountRangeDecorator -> ckx:
-    15:16:void <init>(java.util.function.Function) -> <init>
-    20:21:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    27:35:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.NoiseHeightmapDoubleDecorator -> csn:
+    18:19:void <init>(com.mojang.serialization.Codec) -> <init>
+    23:36:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    16:16:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    27:35:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.NopePlacementDecorator -> cso:
+    12:13:void <init>(com.mojang.serialization.Codec) -> <init>
+    17:17:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    10:10:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.RangeDecoratorConfiguration -> csp:
+    com.mojang.serialization.Codec CODEC -> a
+    int min -> b
+    int max -> c
+    16:19:void <init>(int,int) -> <init>
+    8:11:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    10:10:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.placement.RangeDecoratorConfiguration) -> a
+    9:9:java.lang.Integer lambda$null$0(net.minecraft.world.level.levelgen.placement.RangeDecoratorConfiguration) -> b
+    8:8:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.placement.SimpleFeatureDecorator -> csq:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:19:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.TopSolidHeightMapDecorator -> csr:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:23:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.TopSolidHeightMapNoiseBasedDecorator -> css:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:23:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    24:28:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration,int) -> a
+net.minecraft.world.level.levelgen.placement.TopSolidHeightMapRangeDecorator -> cst:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:21:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.RangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    13:13:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    22:25:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,int) -> a
+net.minecraft.world.level.levelgen.placement.nether.ChanceRangeDecorator -> csu:
+    13:14:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:25:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    11:11:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.nether.CountRangeDecorator -> csv:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:19:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    12:12:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    20:23:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,int) -> a
+net.minecraft.world.level.levelgen.placement.nether.FireDecorator -> csw:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    23:32:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    14:14:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.placement.nether.LightGemChanceDecorator -> csx:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:20:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
     13:13:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
-    22:25:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,int) -> a
-net.minecraft.world.level.levelgen.placement.nether.package-info -> cky:
-net.minecraft.world.level.levelgen.placement.package-info -> ckz:
-net.minecraft.world.level.levelgen.structure.BeardedStructureStart -> cla:
-    8:9:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    13:24:void calculateBoundingBox() -> b
-net.minecraft.world.level.levelgen.structure.BoundingBox -> clb:
+    21:24:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,int) -> a
+net.minecraft.world.level.levelgen.placement.nether.MagmaDecorator -> csy:
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:23:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    14:14:java.util.stream.Stream getPositions(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    24:27:net.minecraft.core.BlockPos lambda$getPositions$0(java.util.Random,net.minecraft.core.BlockPos,int,int) -> a
+net.minecraft.world.level.levelgen.placement.nether.RandomCountRangeDecorator -> csz:
+    14:15:void <init>(com.mojang.serialization.Codec) -> <init>
+    19:20:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    12:12:java.util.stream.Stream place(java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration,net.minecraft.core.BlockPos) -> a
+    21:24:net.minecraft.core.BlockPos lambda$place$0(java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration,int) -> a
+net.minecraft.world.level.levelgen.placement.nether.package-info -> cta:
+net.minecraft.world.level.levelgen.placement.package-info -> ctb:
+net.minecraft.world.level.levelgen.structure.BeardedStructureStart -> ctc:
+    9:10:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    14:25:void calculateBoundingBox() -> b
+net.minecraft.world.level.levelgen.structure.BoundingBox -> ctd:
     int x0 -> a
     int y0 -> b
     int z0 -> c
@@ -60986,48 +67007,51 @@ net.minecraft.world.level.levelgen.structure.BoundingBox -> clb:
     19:20:void <init>() -> <init>
     22:31:void <init>(int[]) -> <init>
     34:34:net.minecraft.world.level.levelgen.structure.BoundingBox getUnknownBox() -> a
-    38:52:net.minecraft.world.level.levelgen.structure.BoundingBox orientBox(int,int,int,int,int,int,int,int,int,net.minecraft.core.Direction) -> a
-    57:57:net.minecraft.world.level.levelgen.structure.BoundingBox createProper(int,int,int,int,int,int) -> a
-    60:67:void <init>(net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
-    69:76:void <init>(int,int,int,int,int,int) -> <init>
-    78:85:void <init>(net.minecraft.core.Vec3i,net.minecraft.core.Vec3i) -> <init>
-    87:96:void <init>(int,int,int,int) -> <init>
-    99:99:boolean isInsideOf(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    103:103:boolean intersects(net.minecraft.world.level.levelgen.structure.BoundingBox) -> b
-    107:107:boolean intersects(int,int,int,int,int,int) -> b
-    111:111:boolean intersects(net.minecraft.core.Vec3i,net.minecraft.core.Vec3i) -> a
-    115:115:boolean intersects(int,int,int,int) -> a
-    119:125:void expand(net.minecraft.world.level.levelgen.structure.BoundingBox) -> c
-    129:140:net.minecraft.world.level.levelgen.structure.BoundingBox getIntersection(net.minecraft.world.level.levelgen.structure.BoundingBox) -> d
-    144:150:void move(int,int,int) -> a
-    153:153:net.minecraft.world.level.levelgen.structure.BoundingBox moved(int,int,int) -> b
-    164:165:void move(net.minecraft.core.Vec3i) -> a
-    168:168:boolean isInside(net.minecraft.core.Vec3i) -> b
-    172:172:net.minecraft.core.Vec3i getLength() -> b
-    176:176:int getXSpan() -> c
-    180:180:int getYSpan() -> d
-    184:184:int getZSpan() -> e
-    188:188:net.minecraft.core.Vec3i getCenter() -> f
-    193:200:java.lang.String toString() -> toString
-    204:204:net.minecraft.nbt.IntArrayTag createTag() -> g
-net.minecraft.world.level.levelgen.structure.BoundingBox$1 -> clb$1:
+    38:38:net.minecraft.world.level.levelgen.structure.BoundingBox infinite() -> b
+    42:56:net.minecraft.world.level.levelgen.structure.BoundingBox orientBox(int,int,int,int,int,int,int,int,int,net.minecraft.core.Direction) -> a
+    61:61:net.minecraft.world.level.levelgen.structure.BoundingBox createProper(int,int,int,int,int,int) -> a
+    64:71:void <init>(net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
+    73:80:void <init>(int,int,int,int,int,int) -> <init>
+    82:89:void <init>(net.minecraft.core.Vec3i,net.minecraft.core.Vec3i) -> <init>
+    91:100:void <init>(int,int,int,int) -> <init>
+    103:103:boolean isInsideOf(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    107:107:boolean intersects(net.minecraft.world.level.levelgen.structure.BoundingBox) -> b
+    111:111:boolean intersects(int,int,int,int,int,int) -> b
+    115:115:boolean intersects(net.minecraft.core.Vec3i,net.minecraft.core.Vec3i) -> a
+    119:119:boolean intersects(int,int,int,int) -> a
+    123:129:void expand(net.minecraft.world.level.levelgen.structure.BoundingBox) -> c
+    133:144:net.minecraft.world.level.levelgen.structure.BoundingBox getIntersection(net.minecraft.world.level.levelgen.structure.BoundingBox) -> d
+    152:158:void inflate(double,double,double) -> a
+    161:162:void inflate(double) -> a
+    165:171:void move(int,int,int) -> a
+    174:174:net.minecraft.world.level.levelgen.structure.BoundingBox moved(int,int,int) -> b
+    185:186:void move(net.minecraft.core.Vec3i) -> a
+    189:189:boolean isInside(net.minecraft.core.Vec3i) -> b
+    193:193:net.minecraft.core.Vec3i getLength() -> c
+    197:197:int getXSpan() -> d
+    201:201:int getYSpan() -> e
+    205:205:int getZSpan() -> f
+    209:209:net.minecraft.core.Vec3i getCenter() -> g
+    214:221:java.lang.String toString() -> toString
+    225:225:net.minecraft.nbt.IntArrayTag createTag() -> h
+net.minecraft.world.level.levelgen.structure.BoundingBox$1 -> ctd$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    38:38:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.BuriedTreasurePieces -> clc:
-    19:19:void <init>() -> <init>
-net.minecraft.world.level.levelgen.structure.BuriedTreasurePieces$BuriedTreasurePiece -> clc$a:
-    22:24:void <init>(net.minecraft.core.BlockPos) -> <init>
-    27:28:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    32:32:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    36:72:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    76:77:boolean isLiquid(net.minecraft.world.level.block.state.BlockState) -> a
-net.minecraft.world.level.levelgen.structure.DesertPyramidPiece -> cld:
+    42:42:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.BuriedTreasurePieces -> cte:
+    20:20:void <init>() -> <init>
+net.minecraft.world.level.levelgen.structure.BuriedTreasurePieces$BuriedTreasurePiece -> cte$a:
+    23:25:void <init>(net.minecraft.core.BlockPos) -> <init>
+    28:29:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    33:33:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    37:73:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    77:78:boolean isLiquid(net.minecraft.world.level.block.state.BlockState) -> a
+net.minecraft.world.level.levelgen.structure.DesertPyramidPiece -> ctf:
     boolean[] hasPlacedChest -> e
-    18:22:void <init>(java.util.Random,int,int) -> <init>
-    18:30:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    34:39:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    44:243:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.EndCityPieces -> cle:
+    20:24:void <init>(java.util.Random,int,int) -> <init>
+    20:32:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    36:41:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    46:245:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.EndCityPieces -> ctg:
     net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings OVERWRITE -> a
     net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings INSERT -> b
     net.minecraft.world.level.levelgen.structure.EndCityPieces$SectionGenerator HOUSE_TOWER_GENERATOR -> c
@@ -61053,24 +67077,24 @@ net.minecraft.world.level.levelgen.structure.EndCityPieces -> cle:
     27:27:net.minecraft.world.level.levelgen.structure.EndCityPieces$SectionGenerator access$900() -> g
     27:27:java.util.List access$1000() -> h
     30:295:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.EndCityPieces$1 -> cle$1:
+net.minecraft.world.level.levelgen.structure.EndCityPieces$1 -> ctg$1:
     157:157:void <init>() -> <init>
     160:160:void init() -> a
     164:186:boolean generate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,net.minecraft.world.level.levelgen.structure.EndCityPieces$EndCityPiece,net.minecraft.core.BlockPos,java.util.List,java.util.Random) -> a
-net.minecraft.world.level.levelgen.structure.EndCityPieces$2 -> cle$2:
+net.minecraft.world.level.levelgen.structure.EndCityPieces$2 -> ctg$2:
     197:197:void <init>() -> <init>
     200:200:void init() -> a
     204:236:boolean generate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,net.minecraft.world.level.levelgen.structure.EndCityPieces$EndCityPiece,net.minecraft.core.BlockPos,java.util.List,java.util.Random) -> a
-net.minecraft.world.level.levelgen.structure.EndCityPieces$3 -> cle$3:
+net.minecraft.world.level.levelgen.structure.EndCityPieces$3 -> ctg$3:
     boolean shipCreated -> a
     240:240:void <init>() -> <init>
     245:246:void init() -> a
     250:284:boolean generate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,net.minecraft.world.level.levelgen.structure.EndCityPieces$EndCityPiece,net.minecraft.core.BlockPos,java.util.List,java.util.Random) -> a
-net.minecraft.world.level.levelgen.structure.EndCityPieces$4 -> cle$4:
+net.minecraft.world.level.levelgen.structure.EndCityPieces$4 -> ctg$4:
     295:295:void <init>() -> <init>
     298:298:void init() -> a
     303:323:boolean generate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,net.minecraft.world.level.levelgen.structure.EndCityPieces$EndCityPiece,net.minecraft.core.BlockPos,java.util.List,java.util.Random) -> a
-net.minecraft.world.level.levelgen.structure.EndCityPieces$EndCityPiece -> cle$a:
+net.minecraft.world.level.levelgen.structure.EndCityPieces$EndCityPiece -> ctg$a:
     java.lang.String templateName -> d
     net.minecraft.world.level.block.Rotation rotation -> e
     boolean overwrite -> f
@@ -61079,47 +67103,47 @@ net.minecraft.world.level.levelgen.structure.EndCityPieces$EndCityPiece -> cle$a
     68:72:void loadTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
     76:81:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     85:101:void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-net.minecraft.world.level.levelgen.structure.EndCityPieces$SectionGenerator -> cle$b:
+net.minecraft.world.level.levelgen.structure.EndCityPieces$SectionGenerator -> ctg$b:
     void init() -> a
     boolean generate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,net.minecraft.world.level.levelgen.structure.EndCityPieces$EndCityPiece,net.minecraft.core.BlockPos,java.util.List,java.util.Random) -> a
-net.minecraft.world.level.levelgen.structure.IglooPieces -> clf:
+net.minecraft.world.level.levelgen.structure.IglooPieces -> cth:
     net.minecraft.resources.ResourceLocation STRUCTURE_LOCATION_IGLOO -> a
     net.minecraft.resources.ResourceLocation STRUCTURE_LOCATION_LADDER -> b
     net.minecraft.resources.ResourceLocation STRUCTURE_LOCATION_LABORATORY -> c
     java.util.Map PIVOTS -> d
     java.util.Map OFFSETS -> e
-    30:30:void <init>() -> <init>
-    50:59:void addPieces(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.List,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
-    30:30:java.util.Map access$000() -> a
-    30:30:java.util.Map access$100() -> b
-    30:30:net.minecraft.resources.ResourceLocation access$200() -> c
-    33:43:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.IglooPieces$IglooPiece -> clf$a:
+    31:31:void <init>() -> <init>
+    51:60:void addPieces(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.List,java.util.Random) -> a
+    31:31:java.util.Map access$000() -> a
+    31:31:java.util.Map access$100() -> b
+    31:31:net.minecraft.resources.ResourceLocation access$200() -> c
+    34:44:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.IglooPieces$IglooPiece -> cth$a:
     net.minecraft.resources.ResourceLocation templateLocation -> d
     net.minecraft.world.level.block.Rotation rotation -> e
-    66:72:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.resources.ResourceLocation,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,int) -> <init>
-    75:79:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    82:85:void loadTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
-    89:92:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    96:105:void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    109:128:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.JunglePyramidPiece -> clg:
+    67:73:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.resources.ResourceLocation,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,int) -> <init>
+    76:80:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    83:86:void loadTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
+    90:93:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    97:106:void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    110:129:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.JunglePyramidPiece -> cti:
     boolean placedMainChest -> e
     boolean placedHiddenChest -> f
     boolean placedTrap1 -> g
     boolean placedTrap2 -> h
     net.minecraft.world.level.levelgen.structure.JunglePyramidPiece$MossStoneSelector STONE_SELECTOR -> i
-    33:34:void <init>(java.util.Random,int,int) -> <init>
-    37:42:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    46:51:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    55:249:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    263:263:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.JunglePyramidPiece$1 -> clg$1:
-net.minecraft.world.level.levelgen.structure.JunglePyramidPiece$MossStoneSelector -> clg$a:
-    252:252:void <init>() -> <init>
-    255:260:void next(java.util.Random,int,int,int,boolean) -> a
-    252:252:void <init>(net.minecraft.world.level.levelgen.structure.JunglePyramidPiece$1) -> <init>
-net.minecraft.world.level.levelgen.structure.LegacyStructureDataHandler -> clh:
+    35:36:void <init>(java.util.Random,int,int) -> <init>
+    39:44:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    48:53:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    57:251:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    265:265:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.JunglePyramidPiece$1 -> cti$1:
+net.minecraft.world.level.levelgen.structure.JunglePyramidPiece$MossStoneSelector -> cti$a:
+    254:254:void <init>() -> <init>
+    257:262:void next(java.util.Random,int,int,int,boolean) -> a
+    254:254:void <init>(net.minecraft.world.level.levelgen.structure.JunglePyramidPiece$1) -> <init>
+net.minecraft.world.level.levelgen.structure.LegacyStructureDataHandler -> ctj:
     java.util.Map CURRENT_TO_LEGACY_MAP -> a
     java.util.Map LEGACY_TO_CURRENT_MAP -> b
     boolean hasLegacyData -> c
@@ -61127,302 +67151,323 @@ net.minecraft.world.level.levelgen.structure.LegacyStructureDataHandler -> clh:
     java.util.Map indexMap -> e
     java.util.List legacyKeys -> f
     java.util.List currentKeys -> g
-    50:66:void <init>(net.minecraft.world.level.storage.DimensionDataStorage,java.util.List,java.util.List) -> <init>
-    69:76:void removeIndex(long) -> a
-    79:115:net.minecraft.nbt.CompoundTag updateFromLegacy(net.minecraft.nbt.CompoundTag) -> a
-    119:127:boolean hasLegacyStart(int,int,java.lang.String) -> a
-    131:140:boolean isUnhandledStructureStart(int,int) -> a
-    144:172:net.minecraft.nbt.CompoundTag updateStructureStart(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.ChunkPos) -> a
-    176:225:void populateCaches(net.minecraft.world.level.storage.DimensionDataStorage) -> a
-    228:258:net.minecraft.world.level.levelgen.structure.LegacyStructureDataHandler getLegacyStructureHandler(net.minecraft.world.level.dimension.DimensionType,net.minecraft.world.level.storage.DimensionDataStorage) -> a
-    210:210:net.minecraft.world.level.levelgen.structure.StructureFeatureIndexSavedData lambda$populateCaches$3(java.lang.String) -> a
-    206:206:it.unimi.dsi.fastutil.longs.Long2ObjectMap lambda$populateCaches$2(java.lang.String) -> b
-    42:46:void lambda$static$1(java.util.HashMap) -> a
-    27:38:void lambda$static$0(java.util.HashMap) -> b
-    26:41:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.MineShaftPieces -> cli:
-    34:34:void <init>() -> <init>
-    90:108:net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftPiece createRandomShaftPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> a
-    112:125:net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftPiece generateAndAddPiece(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> b
-    34:34:net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftPiece access$000(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-net.minecraft.world.level.levelgen.structure.MineShaftPieces$1 -> cli$1:
+    51:67:void <init>(net.minecraft.world.level.storage.DimensionDataStorage,java.util.List,java.util.List) -> <init>
+    70:77:void removeIndex(long) -> a
+    80:116:net.minecraft.nbt.CompoundTag updateFromLegacy(net.minecraft.nbt.CompoundTag) -> a
+    120:128:boolean hasLegacyStart(int,int,java.lang.String) -> a
+    132:141:boolean isUnhandledStructureStart(int,int) -> a
+    145:173:net.minecraft.nbt.CompoundTag updateStructureStart(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.ChunkPos) -> a
+    177:226:void populateCaches(net.minecraft.world.level.storage.DimensionDataStorage) -> a
+    229:259:net.minecraft.world.level.levelgen.structure.LegacyStructureDataHandler getLegacyStructureHandler(net.minecraft.resources.ResourceKey,net.minecraft.world.level.storage.DimensionDataStorage) -> a
+    211:211:net.minecraft.world.level.levelgen.structure.StructureFeatureIndexSavedData lambda$populateCaches$3(java.lang.String) -> a
+    207:207:it.unimi.dsi.fastutil.longs.Long2ObjectMap lambda$populateCaches$2(java.lang.String) -> b
+    43:47:void lambda$static$1(java.util.HashMap) -> a
+    28:39:void lambda$static$0(java.util.HashMap) -> b
+    27:42:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.MineShaftPieces -> ctk:
+    36:36:void <init>() -> <init>
+    92:110:net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftPiece createRandomShaftPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> a
+    114:127:net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftPiece generateAndAddPiece(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> b
+    36:36:net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftPiece access$000(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+net.minecraft.world.level.levelgen.structure.MineShaftPieces$1 -> ctk$1:
     int[] $SwitchMap$net$minecraft$world$level$levelgen$feature$MineshaftFeature$Type -> a
     int[] $SwitchMap$net$minecraft$core$Direction -> b
-    60:298:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftCorridor -> cli$a:
+    62:300:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftCorridor -> ctk$a:
     boolean hasRails -> b
     boolean spiderCorridor -> c
     boolean hasPlacedSpider -> d
     int numSections -> e
-    260:266:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    270:275:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    278:289:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
-    292:329:net.minecraft.world.level.levelgen.structure.BoundingBox findCorridorSize(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction) -> a
-    334:401:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    405:417:boolean createChest(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,int,int,int,net.minecraft.resources.ResourceLocation) -> a
-    422:505:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    510:527:void placeSupport(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,java.util.Random) -> a
-    530:533:void placeCobWeb(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,float,int,int,int) -> a
-net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftCrossing -> cli$b:
+    262:268:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    272:277:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    280:291:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
+    294:331:net.minecraft.world.level.levelgen.structure.BoundingBox findCorridorSize(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction) -> a
+    336:403:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    407:419:boolean createChest(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,int,int,int,net.minecraft.resources.ResourceLocation) -> a
+    424:507:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    512:529:void placeSupport(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,java.util.Random) -> a
+    532:535:void placeCobWeb(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,float,int,int,int) -> a
+net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftCrossing -> ctk$b:
     net.minecraft.core.Direction direction -> b
     boolean isTwoFloored -> c
-    541:544:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    548:551:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    554:559:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
-    562:596:net.minecraft.world.level.levelgen.structure.BoundingBox findCrossing(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction) -> a
-    601:642:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    646:680:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    684:687:void placeSupportPillar(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int) -> a
-net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftPiece -> cli$c:
+    543:546:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    550:553:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    556:561:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
+    564:598:net.minecraft.world.level.levelgen.structure.BoundingBox findCrossing(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction) -> a
+    603:644:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    648:682:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    686:689:void placeSupportPillar(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int) -> a
+net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftPiece -> ctk$c:
     net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type type -> a
-    45:47:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
-    50:52:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
-    56:57:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    60:65:net.minecraft.world.level.block.state.BlockState getPlanksBlock() -> a
-    70:75:net.minecraft.world.level.block.state.BlockState getFenceBlock() -> b
-    80:85:boolean isSupportingBox(net.minecraft.world.level.BlockGetter,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int) -> a
-net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftRoom -> cli$d:
+    47:49:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
+    52:54:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
+    58:59:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    62:67:net.minecraft.world.level.block.state.BlockState getPlanksBlock() -> a
+    72:77:net.minecraft.world.level.block.state.BlockState getFenceBlock() -> b
+    82:87:boolean isSupportingBox(net.minecraft.world.level.BlockGetter,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int) -> a
+net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftRoom -> ctk$d:
     java.util.List childEntranceBoxes -> b
-    129:136:void <init>(int,java.util.Random,int,int,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
-    129:144:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    148:213:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    217:231:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    236:240:void move(int,int,int) -> a
-    244:250:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftStairs -> cli$e:
-    692:695:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
-    698:699:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    703:729:net.minecraft.world.level.levelgen.structure.BoundingBox findStairs(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction) -> a
-    734:755:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    759:772:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces -> clj:
+    131:138:void <init>(int,java.util.Random,int,int,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
+    131:146:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    150:215:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    219:233:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    238:242:void move(int,int,int) -> a
+    246:252:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+net.minecraft.world.level.levelgen.structure.MineShaftPieces$MineShaftStairs -> ctk$e:
+    694:697:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.feature.MineshaftFeature$Type) -> <init>
+    700:701:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    705:731:net.minecraft.world.level.levelgen.structure.BoundingBox findStairs(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction) -> a
+    736:757:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    761:774:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces -> ctl:
     net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight[] BRIDGE_PIECE_WEIGHTS -> a
     net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight[] CASTLE_PIECE_WEIGHTS -> b
-    27:27:void <init>() -> <init>
-    78:108:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$NetherBridgePiece findAndCreateBridgePieceFactory(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> b
-    27:27:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$NetherBridgePiece access$000(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    27:27:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight[] access$100() -> a
-    27:27:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight[] access$200() -> b
-    59:67:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$1 -> clj$1:
+    29:29:void <init>() -> <init>
+    80:110:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$NetherBridgePiece findAndCreateBridgePieceFactory(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> b
+    29:29:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$NetherBridgePiece access$000(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    29:29:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight[] access$100() -> a
+    29:29:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight[] access$200() -> b
+    61:69:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$1 -> ctl$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    188:188:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeCrossing -> clj$a:
-    462:466:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    469:478:void <init>(java.util.Random,int,int) -> <init>
-    481:482:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
-    485:486:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    490:493:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    496:502:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeCrossing createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
-    508:546:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeEndFiller -> clj$b:
+    190:190:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeCrossing -> ctl$a:
+    464:468:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    471:480:void <init>(java.util.Random,int,int) -> <init>
+    483:484:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
+    487:488:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    492:495:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    498:504:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeCrossing createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
+    510:548:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeEndFiller -> ctl$b:
     int selfSeed -> a
-    389:394:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    397:399:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    402:408:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeEndFiller createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    413:416:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    420:452:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeStraight -> clj$c:
-    316:320:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    323:324:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    328:329:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    332:338:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeStraight createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    344:377:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleCorridorStairsPiece -> clj$d:
-    1385:1389:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    1392:1393:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1397:1398:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    1401:1407:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleCorridorStairsPiece createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
-    1413:1446:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleCorridorTBalconyPiece -> clj$e:
-    1456:1460:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    1463:1464:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1468:1477:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    1480:1486:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleCorridorTBalconyPiece createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
-    1491:1534:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleEntrance -> clj$f:
-    813:817:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    820:821:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    825:826:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    829:835:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleEntrance createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    841:925:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorCrossingPiece -> clj$g:
-    1155:1159:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    1162:1163:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1167:1170:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    1173:1179:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorCrossingPiece createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
-    1185:1205:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorLeftTurnPiece -> clj$h:
+    391:396:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    399:401:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    404:410:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeEndFiller createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    415:418:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    422:454:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeStraight -> ctl$c:
+    318:322:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    325:326:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    330:331:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    334:340:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$BridgeStraight createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    346:379:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleCorridorStairsPiece -> ctl$d:
+    1387:1391:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    1394:1395:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1399:1400:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    1403:1409:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleCorridorStairsPiece createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
+    1415:1448:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleCorridorTBalconyPiece -> ctl$e:
+    1458:1462:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    1465:1466:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1470:1479:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    1482:1488:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleCorridorTBalconyPiece createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
+    1493:1536:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleEntrance -> ctl$f:
+    815:819:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    822:823:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    827:828:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    831:837:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleEntrance createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    843:927:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorCrossingPiece -> ctl$g:
+    1157:1161:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    1164:1165:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1169:1172:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    1175:1181:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorCrossingPiece createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
+    1187:1207:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorLeftTurnPiece -> ctl$h:
     boolean isNeedingChest -> a
-    1302:1308:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    1311:1313:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1317:1320:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    1324:1325:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    1328:1334:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorLeftTurnPiece createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    1340:1375:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorPiece -> clj$i:
-    1093:1097:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    1100:1101:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1105:1106:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    1109:1115:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorPiece createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
-    1121:1145:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorRightTurnPiece -> clj$j:
+    1304:1310:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    1313:1315:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1319:1322:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    1326:1327:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    1330:1336:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorLeftTurnPiece createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    1342:1377:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorPiece -> ctl$i:
+    1095:1099:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    1102:1103:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1107:1108:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    1111:1117:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorPiece createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
+    1123:1147:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorRightTurnPiece -> ctl$j:
     boolean isNeedingChest -> a
-    1217:1223:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    1226:1228:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1232:1235:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    1239:1240:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    1243:1249:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorRightTurnPiece createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    1255:1290:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleStalkRoom -> clj$k:
-    935:939:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    942:943:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    947:949:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    952:958:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleStalkRoom createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
-    964:1083:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$MonsterThrone -> clj$l:
+    1219:1225:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    1228:1230:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1234:1237:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    1241:1242:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    1245:1251:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleSmallCorridorRightTurnPiece createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    1257:1292:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleStalkRoom -> ctl$k:
+    937:941:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    944:945:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    949:951:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    954:960:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$CastleStalkRoom createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
+    966:1085:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$MonsterThrone -> ctl$l:
     boolean hasPlacedSpawner -> a
-    710:714:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    717:719:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    723:726:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    729:735:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$MonsterThrone createPiece(java.util.List,int,int,int,int,net.minecraft.core.Direction) -> a
-    741:803:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$NetherBridgePiece -> clj$m:
-    113:114:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
-    117:118:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
-    122:122:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    125:133:int updatePieceWeight(java.util.List) -> a
-    137:165:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$NetherBridgePiece generatePiece(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece,java.util.List,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    169:181:net.minecraft.world.level.levelgen.structure.StructurePiece generateAndAddPiece(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int,boolean) -> a
-    186:199:net.minecraft.world.level.levelgen.structure.StructurePiece generateChildForward(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece,java.util.List,java.util.Random,int,int,boolean) -> a
-    204:217:net.minecraft.world.level.levelgen.structure.StructurePiece generateChildLeft(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece,java.util.List,java.util.Random,int,int,boolean) -> b
-    222:235:net.minecraft.world.level.levelgen.structure.StructurePiece generateChildRight(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece,java.util.List,java.util.Random,int,int,boolean) -> c
-    239:239:boolean isOkBox(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    243:261:void generateLightPost(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int) -> a
-    264:265:void generateLightPostFacingRight(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int) -> a
-    268:269:void generateLightPostFacingLeft(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int) -> b
-    272:273:void generateLightPostFacingUp(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int) -> c
-    276:277:void generateLightPostFacingDown(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int) -> d
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight -> clj$n:
+    712:716:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    719:721:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    725:728:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    731:737:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$MonsterThrone createPiece(java.util.List,int,int,int,int,net.minecraft.core.Direction) -> a
+    743:805:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$NetherBridgePiece -> ctl$m:
+    115:116:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
+    119:120:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
+    124:124:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    127:135:int updatePieceWeight(java.util.List) -> a
+    139:167:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$NetherBridgePiece generatePiece(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece,java.util.List,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    171:183:net.minecraft.world.level.levelgen.structure.StructurePiece generateAndAddPiece(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int,boolean) -> a
+    188:201:net.minecraft.world.level.levelgen.structure.StructurePiece generateChildForward(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece,java.util.List,java.util.Random,int,int,boolean) -> a
+    206:219:net.minecraft.world.level.levelgen.structure.StructurePiece generateChildLeft(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece,java.util.List,java.util.Random,int,int,boolean) -> b
+    224:237:net.minecraft.world.level.levelgen.structure.StructurePiece generateChildRight(net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece,java.util.List,java.util.Random,int,int,boolean) -> c
+    241:241:boolean isOkBox(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    245:263:void generateLightPost(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int) -> a
+    266:267:void generateLightPostFacingRight(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int) -> a
+    270:271:void generateLightPostFacingLeft(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int) -> b
+    274:275:void generateLightPostFacingUp(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int) -> c
+    278:279:void generateLightPostFacingDown(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int) -> d
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight -> ctl$n:
     java.lang.Class pieceClass -> a
     int weight -> b
     int placeCount -> c
     int maxPlaceCount -> d
     boolean allowInRow -> e
-    39:44:void <init>(java.lang.Class,int,int,boolean) -> <init>
-    47:48:void <init>(java.lang.Class,int,int) -> <init>
-    51:51:boolean doPlace(int) -> a
-    55:55:boolean isValid() -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$RoomCrossing -> clj$o:
-    556:560:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    563:564:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    568:571:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    574:580:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$RoomCrossing createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
-    586:620:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StairsRoom -> clj$p:
-    630:634:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    637:638:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    642:643:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    646:652:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StairsRoom createPiece(java.util.List,int,int,int,int,net.minecraft.core.Direction) -> a
-    658:698:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece -> clj$q:
+    41:46:void <init>(java.lang.Class,int,int,boolean) -> <init>
+    49:50:void <init>(java.lang.Class,int,int) -> <init>
+    53:53:boolean doPlace(int) -> a
+    57:57:boolean isValid() -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$RoomCrossing -> ctl$o:
+    558:562:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    565:566:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    570:573:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    576:582:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$RoomCrossing createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
+    588:622:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StairsRoom -> ctl$p:
+    632:636:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    639:640:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    644:645:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    648:654:net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StairsRoom createPiece(java.util.List,int,int,int,int,net.minecraft.core.Direction) -> a
+    660:700:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.NetherBridgePieces$StartPiece -> ctl$q:
     net.minecraft.world.level.levelgen.structure.NetherBridgePieces$PieceWeight previousPiece -> a
     java.util.List availableBridgePieces -> b
     java.util.List availableCastlePieces -> c
     java.util.List pendingChildren -> d
-    287:303:void <init>(java.util.Random,int,int) -> <init>
-    287:307:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces -> clk:
-    26:27:void <init>() -> <init>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1 -> clk$1:
+    289:305:void <init>(java.util.Random,int,int) -> <init>
+    289:309:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+net.minecraft.world.level.levelgen.structure.NetherFossilFeature -> ctm:
+    19:20:void <init>(com.mojang.serialization.Codec) -> <init>
+    24:24:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+net.minecraft.world.level.levelgen.structure.NetherFossilFeature$FeatureStart -> ctm$a:
+    29:30:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    34:64:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration) -> a
+    27:27:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.structure.NetherFossilPieces -> ctn:
+    net.minecraft.resources.ResourceLocation[] FOSSILS -> a
+    23:23:void <init>() -> <init>
+    42:44:void addPieces(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,java.util.List,java.util.Random,net.minecraft.core.BlockPos) -> a
+    24:24:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.NetherFossilPieces$NetherFossilPiece -> ctn$a:
+    net.minecraft.resources.ResourceLocation templateLocation -> d
+    net.minecraft.world.level.block.Rotation rotation -> e
+    51:56:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.resources.ResourceLocation,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation) -> <init>
+    59:63:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    66:69:void loadTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
+    73:76:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    80:80:void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    84:85:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces -> cto:
+    28:29:void <init>() -> <init>
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1 -> cto$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    115:115:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitDoubleXRoom -> clk$a:
-    1928:1928:void <init>() -> <init>
-    1931:1931:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
-    1936:1938:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
-    1928:1928:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitDoubleXYRoom -> clk$b:
-    1960:1960:void <init>() -> <init>
-    1963:1970:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
-    1975:1979:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
-    1960:1960:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitDoubleYRoom -> clk$c:
-    1914:1914:void <init>() -> <init>
-    1917:1917:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
-    1922:1924:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
-    1914:1914:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitDoubleYZRoom -> clk$d:
-    1983:1983:void <init>() -> <init>
-    1986:1993:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
-    1998:2002:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
-    1983:1983:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitDoubleZRoom -> clk$e:
-    1942:1942:void <init>() -> <init>
-    1945:1945:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
-    1950:1956:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
-    1942:1942:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitSimpleRoom -> clk$f:
-    1888:1888:void <init>() -> <init>
-    1891:1891:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
-    1896:1897:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
-    1888:1888:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitSimpleTopRoom -> clk$g:
-    1901:1901:void <init>() -> <init>
-    1904:1904:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
-    1909:1910:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
-    1901:1901:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$MonumentBuilding -> clk$h:
+    117:117:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitDoubleXRoom -> cto$a:
+    1930:1930:void <init>() -> <init>
+    1933:1933:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
+    1938:1940:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
+    1930:1930:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitDoubleXYRoom -> cto$b:
+    1962:1962:void <init>() -> <init>
+    1965:1972:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
+    1977:1981:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
+    1962:1962:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitDoubleYRoom -> cto$c:
+    1916:1916:void <init>() -> <init>
+    1919:1919:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
+    1924:1926:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
+    1916:1916:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitDoubleYZRoom -> cto$d:
+    1985:1985:void <init>() -> <init>
+    1988:1995:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
+    2000:2004:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
+    1985:1985:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitDoubleZRoom -> cto$e:
+    1944:1944:void <init>() -> <init>
+    1947:1947:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
+    1952:1958:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
+    1944:1944:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitSimpleRoom -> cto$f:
+    1890:1890:void <init>() -> <init>
+    1893:1893:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
+    1898:1899:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
+    1890:1890:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$FitSimpleTopRoom -> cto$g:
+    1903:1903:void <init>() -> <init>
+    1906:1906:boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
+    1911:1912:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
+    1903:1903:void <init>(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$1) -> <init>
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$MonumentBuilding -> cto$h:
     net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition sourceRoom -> p
     net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition coreRoom -> q
     java.util.List childPieces -> r
-    227:289:void <init>(java.util.Random,int,int,net.minecraft.core.Direction) -> <init>
-    227:293:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    296:411:java.util.List generateRoomGraph(java.util.Random) -> a
-    416:475:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    480:521:void generateWing(boolean,int,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    525:546:void generateEntranceArchs(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    551:613:void generateEntranceWall(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> b
-    618:656:void generateRoofPiece(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> c
-    661:718:void generateLowerWall(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> d
-    723:786:void generateMiddleWall(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> e
-    791:841:void generateUpperWall(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> f
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$MonumentRoomFitter -> clk$i:
+    229:291:void <init>(java.util.Random,int,int,net.minecraft.core.Direction) -> <init>
+    229:295:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    298:413:java.util.List generateRoomGraph(java.util.Random) -> a
+    418:477:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    482:523:void generateWing(boolean,int,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    527:548:void generateEntranceArchs(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    553:615:void generateEntranceWall(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> b
+    620:658:void generateRoofPiece(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> c
+    663:720:void generateLowerWall(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> d
+    725:788:void generateMiddleWall(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> e
+    793:843:void generateUpperWall(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> f
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$MonumentRoomFitter -> cto$i:
     boolean fits(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
     net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece create(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentCoreRoom -> clk$j:
-    1571:1572:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
-    1575:1576:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1580:1654:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentDoubleXRoom -> clk$k:
-    1198:1199:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
-    1202:1203:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1207:1262:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentDoubleXYRoom -> clk$l:
-    1360:1361:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
-    1364:1365:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1369:1463:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentDoubleYRoom -> clk$m:
-    1117:1118:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
-    1121:1122:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1126:1192:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentDoubleYZRoom -> clk$n:
-    1469:1470:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
-    1473:1474:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1478:1565:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentDoubleZRoom -> clk$o:
-    1268:1269:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
-    1272:1273:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1277:1354:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentEntryRoom -> clk$p:
-    846:847:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
-    850:851:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    856:880:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPenthouse -> clk$q:
-    1771:1772:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
-    1775:1776:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1780:1825:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece -> clk$r:
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentCoreRoom -> cto$j:
+    1573:1574:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
+    1577:1578:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1582:1656:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentDoubleXRoom -> cto$k:
+    1200:1201:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
+    1204:1205:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1209:1264:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentDoubleXYRoom -> cto$l:
+    1362:1363:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
+    1366:1367:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1371:1465:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentDoubleYRoom -> cto$m:
+    1119:1120:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
+    1123:1124:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1128:1194:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentDoubleYZRoom -> cto$n:
+    1471:1472:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
+    1475:1476:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1480:1567:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentDoubleZRoom -> cto$o:
+    1270:1271:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
+    1274:1275:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1279:1356:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentEntryRoom -> cto$p:
+    848:849:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
+    852:853:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    858:882:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPenthouse -> cto$q:
+    1773:1774:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
+    1777:1778:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1782:1827:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPiece -> cto$r:
     net.minecraft.world.level.block.state.BlockState BASE_GRAY -> a
     net.minecraft.world.level.block.state.BlockState BASE_LIGHT -> b
     net.minecraft.world.level.block.state.BlockState BASE_BLACK -> c
@@ -61435,79 +67480,77 @@ net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentPi
     int GRIDROOM_LEFTWING_CONNECT_INDEX -> j
     int GRIDROOM_RIGHTWING_CONNECT_INDEX -> k
     net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition roomDefinition -> l
-    68:68:int getRoomIndex(int,int,int) -> b
-    74:74:int getRoomX(int) -> a
-    78:78:int getRoomY(int) -> b
-    82:82:int getRoomZ(int) -> c
-    86:87:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
-    90:93:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
-    96:130:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,int,int,int) -> <init>
-    133:134:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
-    138:138:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    141:155:void generateWaterBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int) -> a
-    158:171:void generateDefaultFloor(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,boolean) -> a
-    174:184:void generateBoxOnFillOnly(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int,net.minecraft.world.level.block.state.BlockState) -> a
-    187:191:boolean chunkIntersects(net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int) -> a
-    195:207:boolean spawnElder(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int) -> a
-    30:59:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentSimpleRoom -> clk$s:
+    70:70:int getRoomIndex(int,int,int) -> b
+    76:76:int getRoomX(int) -> a
+    80:80:int getRoomY(int) -> b
+    84:84:int getRoomZ(int) -> c
+    88:89:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
+    92:95:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
+    98:132:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,int,int,int) -> <init>
+    135:136:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
+    140:140:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    143:157:void generateWaterBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int) -> a
+    160:173:void generateDefaultFloor(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,boolean) -> a
+    176:186:void generateBoxOnFillOnly(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int,net.minecraft.world.level.block.state.BlockState) -> a
+    189:193:boolean chunkIntersects(net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int) -> a
+    197:209:boolean spawnElder(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int) -> a
+    32:61:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentSimpleRoom -> cto$s:
     int mainDesign -> p
-    888:890:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> <init>
-    893:894:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    898:1052:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentSimpleTopRoom -> clk$t:
-    1058:1059:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
-    1062:1063:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1067:1111:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentWingRoom -> clk$u:
+    890:892:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,java.util.Random) -> <init>
+    895:896:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    900:1054:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentSimpleTopRoom -> cto$t:
+    1060:1061:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> <init>
+    1064:1065:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1069:1113:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$OceanMonumentWingRoom -> cto$u:
     int mainDesign -> p
-    1662:1664:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.BoundingBox,int) -> <init>
-    1667:1668:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1672:1765:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition -> clk$v:
+    1664:1666:void <init>(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.BoundingBox,int) -> <init>
+    1669:1670:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1674:1767:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition -> cto$v:
     int index -> a
     net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition[] connections -> b
     boolean[] hasOpening -> c
     boolean claimed -> d
     boolean isSource -> e
     int scanIndex -> f
-    1831:1839:void <init>(int) -> <init>
-    1842:1844:void setConnection(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
-    1847:1850:void updateOpenings() -> a
-    1853:1864:boolean findSource(int) -> a
-    1868:1868:boolean isSpecial() -> b
-    1872:1878:int countOpenings() -> c
-    1829:1829:int access$000(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
-    1829:1829:boolean access$102(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,boolean) -> a
-    1829:1829:boolean access$100(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> b
-    1829:1829:boolean access$902(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,boolean) -> b
-    1829:1829:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition[] access$1000(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> c
-    1829:1829:boolean[] access$1100(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> d
-net.minecraft.world.level.levelgen.structure.OceanRuinFeature -> cll:
-    21:22:void <init>(java.util.function.Function) -> <init>
-    26:26:java.lang.String getFeatureName() -> b
-    31:31:int getLookupRange() -> c
-    36:36:int getSpacing(net.minecraft.world.level.chunk.ChunkGenerator) -> a
-    41:41:int getSeparation(net.minecraft.world.level.chunk.ChunkGenerator) -> b
-    46:46:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
-    51:51:int getRandomSalt() -> d
-net.minecraft.world.level.levelgen.structure.OceanRuinFeature$OceanRuinStart -> cll$a:
-    56:57:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    61:70:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type -> cll$b:
+    1833:1841:void <init>(int) -> <init>
+    1844:1846:void setConnection(net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
+    1849:1852:void updateOpenings() -> a
+    1855:1866:boolean findSource(int) -> a
+    1870:1870:boolean isSpecial() -> b
+    1874:1880:int countOpenings() -> c
+    1831:1831:int access$000(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> a
+    1831:1831:boolean access$102(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,boolean) -> a
+    1831:1831:boolean access$100(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> b
+    1831:1831:boolean access$902(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition,boolean) -> b
+    1831:1831:net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition[] access$1000(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> c
+    1831:1831:boolean[] access$1100(net.minecraft.world.level.levelgen.structure.OceanMonumentPieces$RoomDefinition) -> d
+net.minecraft.world.level.levelgen.structure.OceanRuinFeature -> ctp:
+    20:21:void <init>(com.mojang.serialization.Codec) -> <init>
+    25:25:net.minecraft.world.level.levelgen.feature.StructureFeature$StructureStartFactory getStartFactory() -> a
+net.minecraft.world.level.levelgen.structure.OceanRuinFeature$OceanRuinStart -> ctp$a:
+    30:31:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    35:42:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration) -> a
+    28:28:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type -> ctp$b:
     net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type WARM -> a
     net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type COLD -> b
-    java.util.Map BY_NAME -> c
-    java.lang.String name -> d
-    net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type[] $VALUES -> e
-    73:73:net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type[] values() -> values
-    73:73:net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type valueOf(java.lang.String) -> valueOf
-    81:83:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    86:86:java.lang.String getName() -> a
-    90:90:net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type byName(java.lang.String) -> a
-    78:78:net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type lambda$static$0(net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type) -> a
-    73:78:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.OceanRuinPieces -> clm:
+    com.mojang.serialization.Codec CODEC -> c
+    java.util.Map BY_NAME -> d
+    java.lang.String name -> e
+    net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type[] $VALUES -> f
+    45:45:net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type[] values() -> values
+    45:45:net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type valueOf(java.lang.String) -> valueOf
+    55:57:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    60:60:java.lang.String getName() -> b
+    65:65:net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type byName(java.lang.String) -> a
+    70:70:java.lang.String getSerializedName() -> a
+    52:52:net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type lambda$static$0(net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type) -> a
+    45:52:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.OceanRuinPieces -> ctq:
     net.minecraft.resources.ResourceLocation[] WARM_RUINS -> a
     net.minecraft.resources.ResourceLocation[] RUINS_BRICK -> b
     net.minecraft.resources.ResourceLocation[] RUINS_CRACKED -> c
@@ -61516,55 +67559,123 @@ net.minecraft.world.level.levelgen.structure.OceanRuinPieces -> clm:
     net.minecraft.resources.ResourceLocation[] BIG_RUINS_MOSSY -> f
     net.minecraft.resources.ResourceLocation[] BIG_RUINS_CRACKED -> g
     net.minecraft.resources.ResourceLocation[] BIG_WARM_RUINS -> h
-    39:39:void <init>() -> <init>
-    113:113:net.minecraft.resources.ResourceLocation getSmallWarmRuin(java.util.Random) -> a
-    117:117:net.minecraft.resources.ResourceLocation getBigWarmRuin(java.util.Random) -> b
-    121:129:void addPieces(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.List,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration) -> a
-    132:156:void addClusterRuins(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,java.util.Random,net.minecraft.world.level.block.Rotation,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration,java.util.List) -> a
-    159:169:java.util.List allPositions(java.util.Random,int,int) -> a
-    173:186:void addPiece(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.List,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration,boolean,float) -> a
-    40:105:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.OceanRuinPieces$OceanRuinPiece -> clm$a:
+    42:42:void <init>() -> <init>
+    116:116:net.minecraft.resources.ResourceLocation getSmallWarmRuin(java.util.Random) -> a
+    120:120:net.minecraft.resources.ResourceLocation getBigWarmRuin(java.util.Random) -> b
+    124:132:void addPieces(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.List,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration) -> a
+    135:159:void addClusterRuins(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,java.util.Random,net.minecraft.world.level.block.Rotation,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration,java.util.List) -> a
+    162:172:java.util.List allPositions(java.util.Random,int,int) -> a
+    176:189:void addPiece(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.List,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration,boolean,float) -> a
+    43:108:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.OceanRuinPieces$OceanRuinPiece -> ctq$a:
     net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type biomeType -> d
     float integrity -> e
     net.minecraft.resources.ResourceLocation templateLocation -> f
     net.minecraft.world.level.block.Rotation rotation -> g
     boolean isLarge -> h
-    196:206:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.resources.ResourceLocation,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,float,net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type,boolean) -> <init>
-    209:216:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    219:222:void loadTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
-    226:232:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    236:256:void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    260:266:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    270:299:int getHeight(net.minecraft.core.BlockPos,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.levelgen.structure.PillagerOutpostPieces -> cln:
+    199:209:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.resources.ResourceLocation,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,float,net.minecraft.world.level.levelgen.structure.OceanRuinFeature$Type,boolean) -> <init>
+    212:219:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    222:225:void loadTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
+    229:235:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    239:259:void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    263:269:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    273:302:int getHeight(net.minecraft.core.BlockPos,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.PillagerOutpostPieces -> ctr:
     23:23:void <init>() -> <init>
     72:73:void addPieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,java.util.List,net.minecraft.world.level.levelgen.WorldgenRandom) -> a
+    86:86:void bootstrap() -> a
     25:69:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.PillagerOutpostPieces$PillagerOutpostPiece -> cln$a:
+net.minecraft.world.level.levelgen.structure.PillagerOutpostPieces$PillagerOutpostPiece -> ctr$a:
     77:78:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement,net.minecraft.core.BlockPos,int,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
     81:82:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece -> clo:
+net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece -> cts:
+    org.apache.logging.log4j.Logger LOGGER -> d
     net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement element -> a
     net.minecraft.core.BlockPos position -> b
-    int groundLevelDelta -> d
+    int groundLevelDelta -> e
     net.minecraft.world.level.block.Rotation rotation -> c
-    java.util.List junctions -> e
-    net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager structureManager -> f
-    30:41:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement,net.minecraft.core.BlockPos,int,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
-    30:55:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag,net.minecraft.world.level.levelgen.feature.StructurePieceType) -> <init>
-    59:70:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    74:74:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    79:81:void move(int,int,int) -> a
-    85:85:net.minecraft.world.level.block.Rotation getRotation() -> ad_
-    90:90:java.lang.String toString() -> toString
-    94:94:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement getElement() -> b
-    98:98:net.minecraft.core.BlockPos getPosition() -> c
-    102:102:int getGroundLevelDelta() -> d
-    106:107:void addJunction(net.minecraft.world.level.levelgen.feature.structures.JigsawJunction) -> a
-    110:110:java.util.List getJunctions() -> e
-    54:54:void lambda$new$0(net.minecraft.nbt.Tag) -> a
-net.minecraft.world.level.levelgen.structure.ScatteredFeaturePiece -> clp:
+    java.util.List junctions -> f
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager structureManager -> g
+    33:44:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement,net.minecraft.core.BlockPos,int,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.BoundingBox) -> <init>
+    33:58:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag,net.minecraft.world.level.levelgen.feature.StructurePieceType) -> <init>
+    62:75:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    79:79:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    83:83:boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.BlockPos,boolean) -> a
+    88:90:void move(int,int,int) -> a
+    94:94:net.minecraft.world.level.block.Rotation getRotation() -> ap_
+    99:99:java.lang.String toString() -> toString
+    103:103:net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement getElement() -> b
+    107:107:net.minecraft.core.BlockPos getPosition() -> c
+    111:111:int getGroundLevelDelta() -> d
+    115:116:void addJunction(net.minecraft.world.level.levelgen.feature.structures.JigsawJunction) -> a
+    119:119:java.util.List getJunctions() -> e
+    67:67:void lambda$addAdditionalSaveData$1(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> a
+    57:57:void lambda$new$0(net.minecraft.nbt.Tag) -> a
+    27:27:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.RuinedPortalPiece -> ctt:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    net.minecraft.resources.ResourceLocation templateLocation -> e
+    net.minecraft.world.level.block.Rotation rotation -> f
+    net.minecraft.world.level.block.Mirror mirror -> g
+    net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement verticalPlacement -> h
+    net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$Properties properties -> i
+    96:107:void <init>(net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement,net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$Properties,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.block.Mirror,net.minecraft.core.BlockPos) -> <init>
+    110:119:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    123:129:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    132:154:void loadTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate,net.minecraft.core.BlockPos) -> a
+    157:162:net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule getLavaProcessorRule() -> c
+    169:191:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    197:197:void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    200:216:void maybeAddVines(java.util.Random,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    219:222:void maybeAddLeavesAbove(java.util.Random,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> b
+    225:233:void addNetherrackDripColumnsBelowPortal(java.util.Random,net.minecraft.world.level.LevelAccessor) -> a
+    236:244:void addNetherrackDripColumn(java.util.Random,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> c
+    247:281:void spreadNetherrack(java.util.Random,net.minecraft.world.level.LevelAccessor) -> b
+    284:285:boolean canBlockBeReplacedByNetherrackOrMagma(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    289:294:void placeNetherrackOrMagma(java.util.Random,net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> d
+    297:297:int getSurfaceY(net.minecraft.world.level.LevelAccessor,int,int,net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement) -> a
+    301:301:net.minecraft.world.level.levelgen.Heightmap$Types getHeightMapType(net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement) -> a
+    305:305:net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule getBlockReplaceRule(net.minecraft.world.level.block.Block,float,net.minecraft.world.level.block.Block) -> a
+    309:309:net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule getBlockReplaceRule(net.minecraft.world.level.block.Block,net.minecraft.world.level.block.Block) -> a
+    182:188:void lambda$postProcess$1(java.util.Random,net.minecraft.world.level.WorldGenLevel,net.minecraft.core.BlockPos) -> a
+    128:128:void lambda$addAdditionalSaveData$0(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> a
+    50:50:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$Properties -> ctt$a:
+    com.mojang.serialization.Codec CODEC -> a
+    boolean cold -> b
+    float mossiness -> c
+    boolean airPocket -> d
+    boolean overgrown -> e
+    boolean vines -> f
+    boolean replaceWithBlackstone -> g
+    76:83:void <init>() -> <init>
+    76:92:void <init>(boolean,float,boolean,boolean,boolean,boolean) -> <init>
+    66:73:com.mojang.datafixers.kinds.App lambda$static$6(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    72:72:java.lang.Boolean lambda$null$5(net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$Properties) -> a
+    71:71:java.lang.Boolean lambda$null$4(net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$Properties) -> b
+    70:70:java.lang.Boolean lambda$null$3(net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$Properties) -> c
+    69:69:java.lang.Boolean lambda$null$2(net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$Properties) -> d
+    68:68:java.lang.Float lambda$null$1(net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$Properties) -> e
+    67:67:java.lang.Boolean lambda$null$0(net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$Properties) -> f
+    66:66:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement -> ctt$b:
+    net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement ON_LAND_SURFACE -> a
+    net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement PARTLY_BURIED -> b
+    net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement ON_OCEAN_FLOOR -> c
+    net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement IN_MOUNTAIN -> d
+    net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement UNDERGROUND -> e
+    net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement IN_NETHER -> f
+    java.util.Map BY_NAME -> g
+    java.lang.String name -> h
+    net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement[] $VALUES -> i
+    312:312:net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement[] values() -> values
+    312:312:net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement valueOf(java.lang.String) -> valueOf
+    324:326:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    329:329:java.lang.String getName() -> a
+    333:333:net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement byName(java.lang.String) -> a
+    321:321:net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement lambda$static$0(net.minecraft.world.level.levelgen.structure.RuinedPortalPiece$VerticalPlacement) -> a
+    312:321:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.ScatteredFeaturePiece -> ctu:
     int width -> a
     int height -> b
     int depth -> c
@@ -61573,208 +67684,186 @@ net.minecraft.world.level.levelgen.structure.ScatteredFeaturePiece -> clp:
     17:41:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
     45:49:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     52:74:boolean updateAverageGroundHeight(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int) -> a
-net.minecraft.world.level.levelgen.structure.ShipwreckPieces -> clq:
+net.minecraft.world.level.levelgen.structure.ShipwreckPieces -> ctv:
     net.minecraft.core.BlockPos PIVOT -> a
     net.minecraft.resources.ResourceLocation[] STRUCTURE_LOCATION_BEACHED -> b
     net.minecraft.resources.ResourceLocation[] STRUCTURE_LOCATION_OCEAN -> c
-    25:25:void <init>() -> <init>
-    66:68:void addPieces(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.List,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration) -> a
-    25:25:net.minecraft.core.BlockPos access$000() -> a
-    26:42:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.ShipwreckPieces$ShipwreckPiece -> clq$a:
+    28:28:void <init>() -> <init>
+    69:71:void addPieces(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.List,java.util.Random,net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration) -> a
+    28:28:net.minecraft.core.BlockPos access$000() -> a
+    29:45:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.ShipwreckPieces$ShipwreckPiece -> ctv$a:
     net.minecraft.world.level.block.Rotation rotation -> d
     net.minecraft.resources.ResourceLocation templateLocation -> e
     boolean isBeached -> f
-    76:83:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.resources.ResourceLocation,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,boolean) -> <init>
-    86:91:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    95:99:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    102:105:void loadTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
-    109:116:void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    120:139:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces -> clr:
+    79:86:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.resources.ResourceLocation,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,boolean) -> <init>
+    89:94:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    98:102:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    105:108:void loadTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
+    112:119:void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    123:142:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces -> ctw:
     net.minecraft.world.level.levelgen.structure.StrongholdPieces$PieceWeight[] STRONGHOLD_PIECE_WEIGHTS -> a
     java.util.List currentPieces -> b
     java.lang.Class imposedPiece -> c
     int totalWeight -> d
     net.minecraft.world.level.levelgen.structure.StrongholdPieces$SmoothStoneSelector SMOOTH_STONE_SELECTOR -> e
-    36:36:void <init>() -> <init>
-    95:101:void resetPieces() -> a
-    104:112:boolean updatePieceWeight() -> c
-    116:142:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece findAndCreatePieceFactory(java.lang.Class,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    146:189:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece generatePieceFromSmallDoor(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> b
-    193:205:net.minecraft.world.level.levelgen.structure.StructurePiece generateAndAddPiece(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> c
-    36:36:net.minecraft.world.level.levelgen.structure.StructurePiece access$000(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    36:36:java.lang.Class access$102(java.lang.Class) -> a
-    36:36:net.minecraft.world.level.levelgen.structure.StrongholdPieces$SmoothStoneSelector access$200() -> b
-    67:1554:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$1 -> clr$1:
-    77:77:void <init>(java.lang.Class,int,int) -> <init>
-    80:80:boolean doPlace(int) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$2 -> clr$2:
-    83:83:void <init>(java.lang.Class,int,int) -> <init>
-    86:86:boolean doPlace(int) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$3 -> clr$3:
+    38:38:void <init>() -> <init>
+    97:103:void resetPieces() -> a
+    106:114:boolean updatePieceWeight() -> c
+    118:144:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece findAndCreatePieceFactory(java.lang.Class,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    148:191:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece generatePieceFromSmallDoor(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> b
+    195:207:net.minecraft.world.level.levelgen.structure.StructurePiece generateAndAddPiece(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> c
+    38:38:net.minecraft.world.level.levelgen.structure.StructurePiece access$000(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    38:38:java.lang.Class access$102(java.lang.Class) -> a
+    38:38:net.minecraft.world.level.levelgen.structure.StrongholdPieces$SmoothStoneSelector access$200() -> b
+    69:1556:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$1 -> ctw$1:
+    79:79:void <init>(java.lang.Class,int,int) -> <init>
+    82:82:boolean doPlace(int) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$2 -> ctw$2:
+    85:85:void <init>(java.lang.Class,int,int) -> <init>
+    88:88:boolean doPlace(int) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$3 -> ctw$3:
     int[] $SwitchMap$net$minecraft$world$level$levelgen$structure$StrongholdPieces$StrongholdPiece$SmallDoorType -> a
     int[] $SwitchMap$net$minecraft$core$Direction -> b
-    230:292:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$ChestCorridor -> clr$a:
+    232:294:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$ChestCorridor -> ctw$a:
     boolean hasPlacedChest -> a
-    638:643:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    646:648:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    652:654:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    658:659:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    662:668:net.minecraft.world.level.levelgen.structure.StrongholdPieces$ChestCorridor createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    674:697:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$FillerCorridor -> clr$b:
+    640:645:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    648:650:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    654:656:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    660:661:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    664:670:net.minecraft.world.level.levelgen.structure.StrongholdPieces$ChestCorridor createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    676:699:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$FillerCorridor -> ctw$b:
     int steps -> a
-    354:359:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    362:364:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    368:370:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    373:395:net.minecraft.world.level.levelgen.structure.BoundingBox findPieceBox(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction) -> a
-    401:424:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$FiveCrossing -> clr$c:
+    356:361:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    364:366:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    370:372:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    375:397:net.minecraft.world.level.levelgen.structure.BoundingBox findPieceBox(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction) -> a
+    403:426:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$FiveCrossing -> ctw$c:
     boolean leftLow -> a
     boolean leftHigh -> b
     boolean rightLow -> c
     boolean rightHigh -> e
-    1274:1284:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    1287:1292:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1296:1301:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    1305:1327:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    1330:1336:net.minecraft.world.level.levelgen.structure.StrongholdPieces$FiveCrossing createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    1342:1385:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$LeftTurn -> clr$d:
-    775:780:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    783:784:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    788:794:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    797:803:net.minecraft.world.level.levelgen.structure.StrongholdPieces$LeftTurn createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    809:820:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$Library -> clr$e:
+    1276:1286:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    1289:1294:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1298:1303:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    1307:1329:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    1332:1338:net.minecraft.world.level.levelgen.structure.StrongholdPieces$FiveCrossing createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    1344:1387:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$LeftTurn -> ctw$d:
+    777:782:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    785:786:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    790:796:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    799:805:net.minecraft.world.level.levelgen.structure.StrongholdPieces$LeftTurn createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    811:822:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$Library -> ctw$e:
     boolean isTall -> a
-    1092:1098:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    1101:1103:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1107:1109:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    1113:1124:net.minecraft.world.level.levelgen.structure.StrongholdPieces$Library createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    1129:1259:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$PieceWeight -> clr$f:
+    1094:1100:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    1103:1105:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1109:1111:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    1115:1126:net.minecraft.world.level.levelgen.structure.StrongholdPieces$Library createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    1131:1261:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$PieceWeight -> ctw$f:
     java.lang.Class pieceClass -> a
     int weight -> b
     int placeCount -> c
     int maxPlaceCount -> d
-    52:56:void <init>(java.lang.Class,int,int) -> <init>
-    59:59:boolean doPlace(int) -> a
-    63:63:boolean isValid() -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$PortalRoom -> clr$g:
+    54:58:void <init>(java.lang.Class,int,int) -> <init>
+    61:61:boolean doPlace(int) -> a
+    65:65:boolean isValid() -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$PortalRoom -> ctw$g:
     boolean hasPlacedSpawner -> a
-    1397:1401:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    1404:1406:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1410:1412:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    1416:1419:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    1422:1428:net.minecraft.world.level.levelgen.structure.StrongholdPieces$PortalRoom createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
-    1434:1530:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$PrisonHall -> clr$h:
-    1017:1022:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    1025:1026:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    1030:1031:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    1034:1040:net.minecraft.world.level.levelgen.structure.StrongholdPieces$PrisonHall createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    1046:1079:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$RightTurn -> clr$i:
-    826:831:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    834:835:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    839:845:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    848:854:net.minecraft.world.level.levelgen.structure.StrongholdPieces$RightTurn createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    860:871:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$RoomCrossing -> clr$j:
+    1399:1403:void <init>(int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    1406:1408:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1412:1414:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    1418:1421:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    1424:1430:net.minecraft.world.level.levelgen.structure.StrongholdPieces$PortalRoom createPiece(java.util.List,int,int,int,net.minecraft.core.Direction,int) -> a
+    1436:1532:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$PrisonHall -> ctw$h:
+    1019:1024:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    1027:1028:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    1032:1033:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    1036:1042:net.minecraft.world.level.levelgen.structure.StrongholdPieces$PrisonHall createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    1048:1081:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$RightTurn -> ctw$i:
+    828:833:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    836:837:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    841:847:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    850:856:net.minecraft.world.level.levelgen.structure.StrongholdPieces$RightTurn createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    862:873:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$RoomCrossing -> ctw$j:
     int type -> a
-    883:889:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    892:894:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    898:900:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    904:907:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    910:916:net.minecraft.world.level.levelgen.structure.StrongholdPieces$RoomCrossing createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    922:1007:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$SmoothStoneSelector -> clr$k:
-    1534:1534:void <init>() -> <init>
-    1537:1551:void next(java.util.Random,int,int,int,boolean) -> a
-    1534:1534:void <init>(net.minecraft.world.level.levelgen.structure.StrongholdPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$StairsDown -> clr$l:
+    885:891:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    894:896:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    900:902:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    906:909:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    912:918:net.minecraft.world.level.levelgen.structure.StrongholdPieces$RoomCrossing createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    924:1009:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$SmoothStoneSelector -> ctw$k:
+    1536:1536:void <init>() -> <init>
+    1539:1553:void next(java.util.Random,int,int,int,boolean) -> a
+    1536:1536:void <init>(net.minecraft.world.level.levelgen.structure.StrongholdPieces$1) -> <init>
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$StairsDown -> ctw$l:
     boolean isSource -> a
-    436:447:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int,java.util.Random,int,int) -> <init>
-    450:456:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    459:461:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
-    464:465:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    469:471:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    475:480:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    483:489:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StairsDown createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    495:520:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece -> clr$m:
+    438:449:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int,java.util.Random,int,int) -> <init>
+    452:458:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    461:463:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
+    466:467:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    471:473:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    477:482:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    485:491:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StairsDown createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    497:522:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece -> ctw$m:
     net.minecraft.world.level.levelgen.structure.StrongholdPieces$PieceWeight previousPiece -> a
     net.minecraft.world.level.levelgen.structure.StrongholdPieces$PortalRoom portalRoomPiece -> b
     java.util.List pendingChildren -> c
-    530:534:void <init>(java.util.Random,int,int) -> <init>
-    530:538:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    542:545:net.minecraft.core.BlockPos getLocatorPosition() -> ac_
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$Straight -> clr$n:
+    532:536:void <init>(java.util.Random,int,int) -> <init>
+    532:540:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    544:547:net.minecraft.core.BlockPos getLocatorPosition() -> ao_
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$Straight -> ctw$n:
     boolean leftChild -> a
     boolean rightChild -> b
-    558:566:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    569:572:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    576:579:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    583:590:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    593:599:net.minecraft.world.level.levelgen.structure.StrongholdPieces$Straight createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    605:626:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$StraightStairsDown -> clr$o:
-    707:712:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
-    715:716:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    720:721:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    724:730:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StraightStairsDown createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
-    736:755:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece -> clr$p:
+    560:568:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    571:574:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    578:581:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    585:592:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    595:601:net.minecraft.world.level.levelgen.structure.StrongholdPieces$Straight createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    607:628:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$StraightStairsDown -> ctw$o:
+    709:714:void <init>(int,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction) -> <init>
+    717:718:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    722:723:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    726:732:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StraightStairsDown createPiece(java.util.List,java.util.Random,int,int,int,net.minecraft.core.Direction,int) -> a
+    738:757:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece -> ctw$p:
     net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType entryDoor -> d
-    209:213:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
-    209:218:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
-    226:227:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    230:270:void generateSmallDoor(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType,int,int,int) -> a
-    273:284:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType randomSmallDoor(java.util.Random) -> a
-    290:303:net.minecraft.world.level.levelgen.structure.StructurePiece generateSmallDoorChildForward(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int) -> a
-    308:321:net.minecraft.world.level.levelgen.structure.StructurePiece generateSmallDoorChildLeft(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int) -> b
-    326:339:net.minecraft.world.level.levelgen.structure.StructurePiece generateSmallDoorChildRight(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int) -> c
-    343:343:boolean isOkBox(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType -> clr$p$a:
+    211:215:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
+    211:220:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
+    228:229:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    232:272:void generateSmallDoor(net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType,int,int,int) -> a
+    275:286:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType randomSmallDoor(java.util.Random) -> a
+    292:305:net.minecraft.world.level.levelgen.structure.StructurePiece generateSmallDoorChildForward(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int) -> a
+    310:323:net.minecraft.world.level.levelgen.structure.StructurePiece generateSmallDoorChildLeft(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int) -> b
+    328:341:net.minecraft.world.level.levelgen.structure.StructurePiece generateSmallDoorChildRight(net.minecraft.world.level.levelgen.structure.StrongholdPieces$StartPiece,java.util.List,java.util.Random,int,int) -> c
+    345:345:boolean isOkBox(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType -> ctw$p$a:
     net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType OPENING -> a
     net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType WOOD_DOOR -> b
     net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType GRATES -> c
     net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType IRON_DOOR -> d
     net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType[] $VALUES -> e
-    220:220:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType[] values() -> values
-    220:220:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType valueOf(java.lang.String) -> valueOf
-    220:220:void <init>(java.lang.String,int) -> <init>
-    220:221:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.StrongholdPieces$Turn -> clr$q:
-    765:766:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
-    769:770:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
-net.minecraft.world.level.levelgen.structure.StructureFeatureIO -> cls:
-    org.apache.logging.log4j.Logger LOGGER -> p
-    net.minecraft.world.level.levelgen.feature.StructureFeature MINESHAFT -> a
-    net.minecraft.world.level.levelgen.feature.StructureFeature PILLAGER_OUTPOST -> b
-    net.minecraft.world.level.levelgen.feature.StructureFeature NETHER_FORTRESS -> c
-    net.minecraft.world.level.levelgen.feature.StructureFeature STRONGHOLD -> d
-    net.minecraft.world.level.levelgen.feature.StructureFeature JUNGLE_PYRAMID -> e
-    net.minecraft.world.level.levelgen.feature.StructureFeature OCEAN_RUIN -> f
-    net.minecraft.world.level.levelgen.feature.StructureFeature DESERT_PYRAMID -> g
-    net.minecraft.world.level.levelgen.feature.StructureFeature IGLOO -> h
-    net.minecraft.world.level.levelgen.feature.StructureFeature SWAMP_HUT -> i
-    net.minecraft.world.level.levelgen.feature.StructureFeature OCEAN_MONUMENT -> j
-    net.minecraft.world.level.levelgen.feature.StructureFeature END_CITY -> k
-    net.minecraft.world.level.levelgen.feature.StructureFeature WOODLAND_MANSION -> l
-    net.minecraft.world.level.levelgen.feature.StructureFeature BURIED_TREASURE -> m
-    net.minecraft.world.level.levelgen.feature.StructureFeature SHIPWRECK -> n
-    net.minecraft.world.level.levelgen.feature.StructureFeature VILLAGE -> o
-    19:19:void <init>() -> <init>
-    40:40:net.minecraft.world.level.levelgen.feature.StructureFeature register(java.lang.String,net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
-    44:44:void bootstrap() -> a
-    48:89:net.minecraft.world.level.levelgen.structure.StructureStart loadStaticStart(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> a
-    20:36:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.StructureFeatureIndexSavedData -> clt:
+    222:222:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType[] values() -> values
+    222:222:net.minecraft.world.level.levelgen.structure.StrongholdPieces$StrongholdPiece$SmallDoorType valueOf(java.lang.String) -> valueOf
+    222:222:void <init>(java.lang.String,int) -> <init>
+    222:223:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.StrongholdPieces$Turn -> ctw$q:
+    767:768:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
+    771:772:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
+net.minecraft.world.level.levelgen.structure.StructureFeatureIndexSavedData -> ctx:
     it.unimi.dsi.fastutil.longs.LongSet all -> a
     it.unimi.dsi.fastutil.longs.LongSet remaining -> b
     11:16:void <init>(java.lang.String) -> <init>
@@ -61785,7 +67874,7 @@ net.minecraft.world.level.levelgen.structure.StructureFeatureIndexSavedData -> c
     41:41:boolean hasUnhandledIndex(long) -> c
     45:46:void removeIndex(long) -> d
     49:49:it.unimi.dsi.fastutil.longs.LongSet getAll() -> a
-net.minecraft.world.level.levelgen.structure.StructurePiece -> clu:
+net.minecraft.world.level.levelgen.structure.StructurePiece -> cty:
     net.minecraft.world.level.block.state.BlockState CAVE_AIR -> m
     net.minecraft.world.level.levelgen.structure.BoundingBox boundingBox -> n
     net.minecraft.core.Direction orientation -> a
@@ -61794,56 +67883,56 @@ net.minecraft.world.level.levelgen.structure.StructurePiece -> clu:
     int genDepth -> o
     net.minecraft.world.level.levelgen.feature.StructurePieceType type -> d
     java.util.Set SHAPE_CHECK_BLOCKS -> e
-    73:76:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
-    79:86:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
-    89:99:net.minecraft.nbt.CompoundTag createTag() -> f
+    75:78:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
+    81:88:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
+    91:101:net.minecraft.nbt.CompoundTag createTag() -> f
     void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    105:105:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
-    boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    110:110:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox() -> g
-    114:114:int getGenDepth() -> h
-    118:121:boolean isCloseToChunk(net.minecraft.world.level.ChunkPos,int) -> a
-    125:130:net.minecraft.world.level.levelgen.structure.StructurePiece findCollisionPiece(java.util.List,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    134:134:net.minecraft.core.BlockPos getLocatorPosition() -> ac_
-    138:180:boolean edgesLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    184:184:net.minecraft.core.BlockPos getWorldPos(int,int,int) -> c
-    188:202:int getWorldX(int,int) -> a
-    207:210:int getWorldY(int) -> d
-    214:228:int getWorldZ(int,int) -> b
-    247:268:void placeBlock(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.block.state.BlockState,int,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    283:292:net.minecraft.world.level.block.state.BlockState getBlock(net.minecraft.world.level.BlockGetter,int,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    296:306:boolean isInterior(net.minecraft.world.level.LevelReader,int,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    310:317:void generateAirBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int) -> b
-    320:334:void generateBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    337:338:void generateBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    341:352:void generateBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int,boolean,java.util.Random,net.minecraft.world.level.levelgen.structure.StructurePiece$BlockSelector) -> a
-    355:356:void generateBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.structure.BoundingBox,boolean,java.util.Random,net.minecraft.world.level.levelgen.structure.StructurePiece$BlockSelector) -> a
-    359:379:void generateMaybeBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,float,int,int,int,int,int,int,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,boolean,boolean) -> a
-    382:385:void maybeGenerateBlock(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,float,int,int,int,net.minecraft.world.level.block.state.BlockState) -> a
-    388:415:void generateUpperHalfSphere(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int,net.minecraft.world.level.block.state.BlockState,boolean) -> a
-    418:428:void generateAirColumnUp(net.minecraft.world.level.LevelAccessor,int,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    431:443:void fillColumnDown(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.block.state.BlockState,int,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> b
-    446:447:boolean createChest(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,int,int,int,net.minecraft.resources.ResourceLocation) -> a
-    452:488:net.minecraft.world.level.block.state.BlockState reorient(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    495:508:boolean createChest(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.block.state.BlockState) -> a
-    512:525:boolean createDispenser(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,int,int,int,net.minecraft.core.Direction,net.minecraft.resources.ResourceLocation) -> a
-    529:531:void createDoor(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,int,int,int,net.minecraft.core.Direction,net.minecraft.world.level.block.DoorBlock) -> a
-    534:535:void move(int,int,int) -> a
-    539:539:net.minecraft.core.Direction getOrientation() -> i
-    543:567:void setOrientation(net.minecraft.core.Direction) -> a
-    570:570:net.minecraft.world.level.block.Rotation getRotation() -> ad_
-    574:574:net.minecraft.world.level.block.Mirror getMirror() -> j
-    578:578:net.minecraft.world.level.levelgen.feature.StructurePieceType getType() -> k
-    64:244:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.StructurePiece$1 -> clu$1:
+    107:107:void addChildren(net.minecraft.world.level.levelgen.structure.StructurePiece,java.util.List,java.util.Random) -> a
+    boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    112:112:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox() -> g
+    116:116:int getGenDepth() -> h
+    120:123:boolean isCloseToChunk(net.minecraft.world.level.ChunkPos,int) -> a
+    127:132:net.minecraft.world.level.levelgen.structure.StructurePiece findCollisionPiece(java.util.List,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    136:136:net.minecraft.core.BlockPos getLocatorPosition() -> ao_
+    140:182:boolean edgesLiquid(net.minecraft.world.level.BlockGetter,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    186:186:net.minecraft.core.BlockPos getWorldPos(int,int,int) -> c
+    190:204:int getWorldX(int,int) -> a
+    209:212:int getWorldY(int) -> d
+    216:230:int getWorldZ(int,int) -> b
+    249:270:void placeBlock(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.block.state.BlockState,int,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    285:294:net.minecraft.world.level.block.state.BlockState getBlock(net.minecraft.world.level.BlockGetter,int,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    298:308:boolean isInterior(net.minecraft.world.level.LevelReader,int,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    312:319:void generateAirBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int) -> b
+    322:336:void generateBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    339:340:void generateBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    343:354:void generateBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int,boolean,java.util.Random,net.minecraft.world.level.levelgen.structure.StructurePiece$BlockSelector) -> a
+    357:358:void generateBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.levelgen.structure.BoundingBox,boolean,java.util.Random,net.minecraft.world.level.levelgen.structure.StructurePiece$BlockSelector) -> a
+    361:381:void generateMaybeBox(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,float,int,int,int,int,int,int,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,boolean,boolean) -> a
+    384:387:void maybeGenerateBlock(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,float,int,int,int,net.minecraft.world.level.block.state.BlockState) -> a
+    390:418:void generateUpperHalfSphere(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,int,int,int,int,int,int,net.minecraft.world.level.block.state.BlockState,boolean) -> a
+    421:431:void generateAirColumnUp(net.minecraft.world.level.LevelAccessor,int,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    434:446:void fillColumnDown(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.block.state.BlockState,int,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox) -> b
+    449:450:boolean createChest(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,int,int,int,net.minecraft.resources.ResourceLocation) -> a
+    455:491:net.minecraft.world.level.block.state.BlockState reorient(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    498:511:boolean createChest(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.block.state.BlockState) -> a
+    515:528:boolean createDispenser(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,int,int,int,net.minecraft.core.Direction,net.minecraft.resources.ResourceLocation) -> a
+    532:534:void createDoor(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox,java.util.Random,int,int,int,net.minecraft.core.Direction,net.minecraft.world.level.block.DoorBlock) -> a
+    537:538:void move(int,int,int) -> a
+    542:542:net.minecraft.core.Direction getOrientation() -> i
+    546:570:void setOrientation(net.minecraft.core.Direction) -> a
+    573:573:net.minecraft.world.level.block.Rotation getRotation() -> ap_
+    577:577:net.minecraft.world.level.block.Mirror getMirror() -> j
+    581:581:net.minecraft.world.level.levelgen.feature.StructurePieceType getType() -> k
+    66:246:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.StructurePiece$1 -> cty$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    193:193:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.StructurePiece$BlockSelector -> clu$a:
+    195:195:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.StructurePiece$BlockSelector -> cty$a:
     net.minecraft.world.level.block.state.BlockState next -> a
-    581:582:void <init>() -> <init>
+    584:585:void <init>() -> <init>
     void next(java.util.Random,int,int,int,boolean) -> a
-    587:587:net.minecraft.world.level.block.state.BlockState getNext() -> a
-net.minecraft.world.level.levelgen.structure.StructureStart -> clv:
+    590:590:net.minecraft.world.level.block.state.BlockState getNext() -> a
+net.minecraft.world.level.levelgen.structure.StructureStart -> ctz:
     net.minecraft.world.level.levelgen.structure.StructureStart INVALID_START -> a
     net.minecraft.world.level.levelgen.feature.StructureFeature feature -> e
     java.util.List pieces -> b
@@ -61852,56 +67941,57 @@ net.minecraft.world.level.levelgen.structure.StructureStart -> clv:
     int chunkZ -> g
     int references -> h
     net.minecraft.world.level.levelgen.WorldgenRandom random -> d
-    29:45:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-    50:50:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox() -> c
-    54:54:java.util.List getPieces() -> d
-    58:70:void postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    73:78:void calculateBoundingBox() -> b
-    81:102:net.minecraft.nbt.CompoundTag createTag(int,int) -> a
-    106:121:void moveBelowSeaLevel(int,java.util.Random,int) -> a
-    124:139:void moveInsideHeights(java.util.Random,int,int) -> a
-    142:142:boolean isValid() -> e
-    146:146:int getChunkX() -> f
-    150:150:int getChunkZ() -> g
-    154:154:net.minecraft.core.BlockPos getLocatePos() -> a
-    158:158:boolean canBeReferenced() -> h
-    162:163:void addReference() -> i
-    166:166:int getReferences() -> j
-    170:170:int getMaxReferences() -> k
-    174:174:net.minecraft.world.level.levelgen.feature.StructureFeature getFeature() -> l
-    22:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.StructureStart$1 -> clv$1:
-    22:22:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
-    25:25:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome) -> a
-net.minecraft.world.level.levelgen.structure.SwamplandHutPiece -> clw:
+    32:48:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+    53:53:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox() -> c
+    57:57:java.util.List getPieces() -> d
+    61:82:void placeInChunk(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
+    85:90:void calculateBoundingBox() -> b
+    93:114:net.minecraft.nbt.CompoundTag createTag(int,int) -> a
+    118:133:void moveBelowSeaLevel(int,java.util.Random,int) -> a
+    136:151:void moveInsideHeights(java.util.Random,int,int) -> a
+    154:154:boolean isValid() -> e
+    158:158:int getChunkX() -> f
+    162:162:int getChunkZ() -> g
+    166:166:net.minecraft.core.BlockPos getLocatePos() -> a
+    170:170:boolean canBeReferenced() -> h
+    174:175:void addReference() -> i
+    178:178:int getReferences() -> j
+    182:182:int getMaxReferences() -> k
+    186:186:net.minecraft.world.level.levelgen.feature.StructureFeature getFeature() -> l
+    25:25:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.StructureStart$1 -> ctz$1:
+    25:25:void <init>(net.minecraft.world.level.levelgen.feature.StructureFeature,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,int,long) -> <init>
+    28:28:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration) -> a
+    25:25:void generatePieces(net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,int,int,net.minecraft.world.level.biome.Biome,net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration) -> a
+net.minecraft.world.level.levelgen.structure.SwamplandHutPiece -> cua:
     boolean spawnedWitch -> e
     boolean spawnedCat -> f
-    27:28:void <init>(java.util.Random,int,int) -> <init>
-    31:34:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
-    38:41:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    45:122:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
-    126:141:void spawnCat(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-net.minecraft.world.level.levelgen.structure.TemplateStructurePiece -> clx:
+    29:30:void <init>(java.util.Random,int,int) -> <init>
+    33:36:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.nbt.CompoundTag) -> <init>
+    40:43:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    47:124:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
+    128:143:void spawnCat(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+net.minecraft.world.level.levelgen.structure.TemplateStructurePiece -> cub:
     org.apache.logging.log4j.Logger LOGGER -> d
     net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate template -> a
     net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings placeSettings -> b
     net.minecraft.core.BlockPos templatePosition -> c
-    34:35:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
-    38:40:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
-    43:48:void setup(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
-    52:55:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
-    59:103:boolean postProcess(net.minecraft.world.level.LevelAccessor,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos) -> a
+    37:38:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,int) -> <init>
+    41:43:void <init>(net.minecraft.world.level.levelgen.feature.StructurePieceType,net.minecraft.nbt.CompoundTag) -> <init>
+    46:51:void setup(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    55:58:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
+    62:106:boolean postProcess(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.StructureFeatureManager,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.world.level.ChunkPos,net.minecraft.core.BlockPos) -> a
     void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    110:112:void move(int,int,int) -> a
-    116:116:net.minecraft.world.level.block.Rotation getRotation() -> ad_
-    27:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces -> cly:
+    113:115:void move(int,int,int) -> a
+    119:119:net.minecraft.world.level.block.Rotation getRotation() -> ap_
+    30:30:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces -> cuc:
     32:32:void <init>() -> <init>
     117:120:void generateMansion(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,java.util.List,java.util.Random) -> a
     1183:1189:void main(java.lang.String[]) -> a
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$1 -> cly$1:
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$FirstFloorRoomCollection -> cly$a:
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$1 -> cuc$1:
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$FirstFloorRoomCollection -> cuc$a:
     1098:1098:void <init>() -> <init>
     1101:1101:java.lang.String get1x1(java.util.Random) -> a
     1106:1106:java.lang.String get1x1Secret(java.util.Random) -> b
@@ -61911,7 +68001,7 @@ net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$FirstFloorRoo
     1126:1126:java.lang.String get2x2(java.util.Random) -> d
     1131:1131:java.lang.String get2x2Secret(java.util.Random) -> e
     1098:1098:void <init>(net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$FloorRoomCollection -> cly$b:
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$FloorRoomCollection -> cuc$b:
     1066:1066:void <init>() -> <init>
     java.lang.String get1x1(java.util.Random) -> a
     java.lang.String get1x1Secret(java.util.Random) -> b
@@ -61921,7 +68011,7 @@ net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$FloorRoomColl
     java.lang.String get2x2(java.util.Random) -> d
     java.lang.String get2x2Secret(java.util.Random) -> e
     1066:1066:void <init>(net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$MansionGrid -> cly$c:
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$MansionGrid -> cuc$c:
     java.util.Random random -> a
     net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SimpleGrid baseGrid -> b
     net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SimpleGrid thirdFloorGrid -> c
@@ -61942,7 +68032,7 @@ net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$MansionGrid -
     686:686:int access$300(net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$MansionGrid) -> c
     686:686:int access$400(net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$MansionGrid) -> d
     686:686:net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SimpleGrid[] access$1000(net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$MansionGrid) -> e
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$MansionPiecePlacer -> cly$d:
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$MansionPiecePlacer -> cuc$d:
     net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager structureManager -> a
     java.util.Random random -> b
     int startX -> c
@@ -61959,13 +68049,13 @@ net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$MansionPieceP
     533:612:void addRoom1x2(java.util.List,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.core.Direction,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$FloorRoomCollection,boolean) -> a
     615:678:void addRoom2x2(java.util.List,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.core.Direction,net.minecraft.core.Direction,net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$FloorRoomCollection) -> a
     681:683:void addRoom2x2Secret(java.util.List,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$FloorRoomCollection) -> a
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$PlacementData -> cly$e:
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$PlacementData -> cuc$e:
     net.minecraft.world.level.block.Rotation rotation -> a
     net.minecraft.core.BlockPos position -> b
     java.lang.String wallType -> c
     122:122:void <init>() -> <init>
     122:122:void <init>(net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SecondFloorRoomCollection -> cly$f:
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SecondFloorRoomCollection -> cuc$f:
     1135:1135:void <init>() -> <init>
     1138:1138:java.lang.String get1x1(java.util.Random) -> a
     1143:1143:java.lang.String get1x1Secret(java.util.Random) -> b
@@ -61975,7 +68065,7 @@ net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SecondFloorRo
     1169:1169:java.lang.String get2x2(java.util.Random) -> d
     1174:1174:java.lang.String get2x2Secret(java.util.Random) -> e
     1135:1135:void <init>(net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SimpleGrid -> cly$g:
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SimpleGrid -> cuc$g:
     int[][] grid -> a
     int width -> b
     int height -> c
@@ -61988,10 +68078,10 @@ net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SimpleGrid ->
     1062:1062:boolean edgesTo(int,int,int) -> b
     1021:1021:int access$500(net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SimpleGrid) -> a
     1021:1021:int access$600(net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$SimpleGrid) -> b
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$ThirdFloorRoomCollection -> cly$h:
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$ThirdFloorRoomCollection -> cuc$h:
     1178:1178:void <init>() -> <init>
     1178:1178:void <init>(net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$1) -> <init>
-net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$WoodlandMansionPiece -> cly$i:
+net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$WoodlandMansionPiece -> cuc$i:
     java.lang.String templateName -> d
     net.minecraft.world.level.block.Rotation rotation -> e
     net.minecraft.world.level.block.Mirror mirror -> f
@@ -62001,144 +68091,253 @@ net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces$WoodlandMansi
     64:68:void loadTemplate(net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager) -> a
     72:77:void addAdditionalSaveData(net.minecraft.nbt.CompoundTag) -> a
     81:113:void handleDataMarker(java.lang.String,net.minecraft.core.BlockPos,net.minecraft.world.level.LevelAccessor,java.util.Random,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-net.minecraft.world.level.levelgen.structure.package-info -> clz:
-net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest -> cma:
-    net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest INSTANCE -> a
-    12:13:void <init>() -> <init>
-    17:17:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    22:22:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
-    27:27:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-    10:10:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor -> cmb:
-    net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor STRUCTURE_BLOCK -> a
-    net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor AIR -> b
-    net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor STRUCTURE_AND_AIR -> c
-    com.google.common.collect.ImmutableList toIgnore -> d
-    23:25:void <init>(java.util.List) -> <init>
-    28:29:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    34:37:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
-    42:42:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
-    47:48:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-    48:48:java.lang.Object lambda$getDynamic$1(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.block.Block) -> a
-    28:28:net.minecraft.world.level.block.Block lambda$new$0(com.mojang.datafixers.Dynamic) -> a
-    17:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest -> cmc:
-    net.minecraft.world.level.block.Block block -> a
-    16:18:void <init>(net.minecraft.world.level.block.Block) -> <init>
-    21:22:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    26:26:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    31:31:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
-    36:37:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.structure.templatesystem.BlockRotProcessor -> cmd:
-    float integrity -> a
-    15:17:void <init>(float) -> <init>
-    20:21:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    26:31:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
-    36:36:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
-    41:42:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.structure.templatesystem.BlockStateMatchTest -> cme:
-    net.minecraft.world.level.block.state.BlockState blockState -> a
-    13:15:void <init>(net.minecraft.world.level.block.state.BlockState) -> <init>
-    18:19:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    23:23:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    28:28:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
-    33:34:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.structure.templatesystem.GravityProcessor -> cmf:
-    net.minecraft.world.level.levelgen.Heightmap$Types heightmap -> a
-    int offset -> b
-    16:19:void <init>(net.minecraft.world.level.levelgen.Heightmap$Types,int) -> <init>
-    22:23:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    28:30:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
-    35:35:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
-    40:42:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.structure.templatesystem.JigsawReplacementProcessor -> cmg:
-    net.minecraft.world.level.levelgen.structure.templatesystem.JigsawReplacementProcessor INSTANCE -> a
-    18:19:void <init>() -> <init>
-    24:39:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
-    44:44:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
-    49:49:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.templatesystem.NopProcessor -> cmh:
-    net.minecraft.world.level.levelgen.structure.templatesystem.NopProcessor INSTANCE -> a
+net.minecraft.world.level.levelgen.structure.package-info -> cud:
+net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest -> cue:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest INSTANCE -> b
     13:14:void <init>() -> <init>
-    19:19:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
-    24:24:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
-    29:29:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
+    18:18:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    23:23:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
+    9:9:net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest lambda$static$0() -> b
+    9:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.AxisAlignedLinearPosTest -> cuf:
+    com.mojang.serialization.Codec CODEC -> a
+    float minChance -> b
+    float maxChance -> d
+    int minDist -> e
+    int maxDist -> f
+    net.minecraft.core.Direction$Axis axis -> g
+    26:35:void <init>(float,float,int,int,net.minecraft.core.Direction$Axis) -> <init>
+    39:46:boolean test(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,java.util.Random) -> a
+    51:51:net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType getType() -> a
+    12:18:com.mojang.datafixers.kinds.App lambda$static$5(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    17:17:net.minecraft.core.Direction$Axis lambda$null$4(net.minecraft.world.level.levelgen.structure.templatesystem.AxisAlignedLinearPosTest) -> a
+    16:16:java.lang.Integer lambda$null$3(net.minecraft.world.level.levelgen.structure.templatesystem.AxisAlignedLinearPosTest) -> b
+    15:15:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.structure.templatesystem.AxisAlignedLinearPosTest) -> c
+    14:14:java.lang.Float lambda$null$1(net.minecraft.world.level.levelgen.structure.templatesystem.AxisAlignedLinearPosTest) -> d
+    13:13:java.lang.Float lambda$null$0(net.minecraft.world.level.levelgen.structure.templatesystem.AxisAlignedLinearPosTest) -> e
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.BlackstoneReplaceProcessor -> cug:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.BlackstoneReplaceProcessor INSTANCE -> b
+    java.util.Map replacements -> c
+    25:28:void <init>() -> <init>
+    68:83:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    88:88:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
+    29:64:void lambda$new$1(java.util.HashMap) -> a
+    20:20:net.minecraft.world.level.levelgen.structure.templatesystem.BlackstoneReplaceProcessor lambda$static$0() -> b
+    20:22:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.BlockAgeProcessor -> cuh:
+    com.mojang.serialization.Codec CODEC -> a
+    float mossiness -> b
+    25:27:void <init>(float) -> <init>
+    32:51:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    56:68:net.minecraft.world.level.block.state.BlockState maybeReplaceFullStoneBlock(java.util.Random) -> a
+    73:90:net.minecraft.world.level.block.state.BlockState maybeReplaceStairs(java.util.Random,net.minecraft.world.level.block.state.BlockState) -> a
+    95:98:net.minecraft.world.level.block.state.BlockState maybeReplaceSlab(java.util.Random) -> b
+    103:106:net.minecraft.world.level.block.state.BlockState maybeReplaceWall(java.util.Random) -> c
+    111:114:net.minecraft.world.level.block.state.BlockState maybeReplaceObsidian(java.util.Random) -> d
+    118:120:net.minecraft.world.level.block.state.BlockState getRandomFacingStairs(java.util.Random,net.minecraft.world.level.block.Block) -> a
+    124:127:net.minecraft.world.level.block.state.BlockState getRandomBlock(java.util.Random,net.minecraft.world.level.block.state.BlockState[],net.minecraft.world.level.block.state.BlockState[]) -> a
+    132:132:net.minecraft.world.level.block.state.BlockState getRandomBlock(java.util.Random,net.minecraft.world.level.block.state.BlockState[]) -> a
+    138:138:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
+    18:18:java.lang.Float lambda$static$0(net.minecraft.world.level.levelgen.structure.templatesystem.BlockAgeProcessor) -> a
+    18:18:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor -> cui:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor STRUCTURE_BLOCK -> b
+    net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor AIR -> c
+    net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor STRUCTURE_AND_AIR -> d
+    com.google.common.collect.ImmutableList toIgnore -> e
+    29:31:void <init>(java.util.List) -> <init>
+    36:39:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    44:44:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
+    20:20:java.util.List lambda$static$0(net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor) -> a
+    16:25:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest -> cuj:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.Block block -> b
+    15:17:void <init>(net.minecraft.world.level.block.Block) -> <init>
+    21:21:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    26:26:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
+    11:11:net.minecraft.world.level.block.Block lambda$static$0(net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest) -> a
     11:11:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule -> cmi:
-    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest inputPredicate -> a
-    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest locPredicate -> b
-    net.minecraft.world.level.block.state.BlockState outputState -> c
-    net.minecraft.nbt.CompoundTag outputTag -> d
-    23:24:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest,net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest,net.minecraft.world.level.block.state.BlockState) -> <init>
-    26:31:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest,net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest,net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> <init>
-    34:34:boolean test(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    38:38:net.minecraft.world.level.block.state.BlockState getOutputState() -> a
-    43:43:net.minecraft.nbt.CompoundTag getOutputTag() -> b
-    47:55:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    59:67:net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule deserialize(com.mojang.datafixers.Dynamic) -> a
-    66:66:net.minecraft.nbt.Tag lambda$deserialize$0(com.mojang.datafixers.Dynamic) -> b
-net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest -> cmj:
-    net.minecraft.world.level.block.Block block -> a
-    float probability -> b
-    17:20:void <init>(net.minecraft.world.level.block.Block,float) -> <init>
-    23:24:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    28:28:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    33:33:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
-    38:40:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockStateMatchTest -> cmk:
-    net.minecraft.world.level.block.state.BlockState blockState -> a
-    float probability -> b
-    14:17:void <init>(net.minecraft.world.level.block.state.BlockState,float) -> <init>
-    20:21:void <init>(com.mojang.datafixers.Dynamic) -> <init>
+net.minecraft.world.level.levelgen.structure.templatesystem.BlockRotProcessor -> cuk:
+    com.mojang.serialization.Codec CODEC -> a
+    float integrity -> b
+    15:17:void <init>(float) -> <init>
+    22:27:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    32:32:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
+    11:11:java.lang.Float lambda$static$0(net.minecraft.world.level.levelgen.structure.templatesystem.BlockRotProcessor) -> a
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.BlockStateMatchTest -> cul:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.state.BlockState blockState -> b
+    13:15:void <init>(net.minecraft.world.level.block.state.BlockState) -> <init>
+    19:19:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    24:24:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
+    9:9:net.minecraft.world.level.block.state.BlockState lambda$static$0(net.minecraft.world.level.levelgen.structure.templatesystem.BlockStateMatchTest) -> a
+    9:9:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.GravityProcessor -> cum:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.Heightmap$Types heightmap -> b
+    int offset -> c
+    21:24:void <init>(net.minecraft.world.level.levelgen.Heightmap$Types,int) -> <init>
+    30:44:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    49:49:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
+    13:16:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    15:15:java.lang.Integer lambda$null$1(net.minecraft.world.level.levelgen.structure.templatesystem.GravityProcessor) -> a
+    14:14:net.minecraft.world.level.levelgen.Heightmap$Types lambda$null$0(net.minecraft.world.level.levelgen.structure.templatesystem.GravityProcessor) -> b
+    13:13:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.JigsawReplacementProcessor -> cun:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.JigsawReplacementProcessor INSTANCE -> b
+    21:22:void <init>() -> <init>
+    27:42:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    47:47:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
+    17:17:net.minecraft.world.level.levelgen.structure.templatesystem.JigsawReplacementProcessor lambda$static$0() -> b
+    17:19:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.LavaSubmergedBlockProcessor -> cuo:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.LavaSubmergedBlockProcessor INSTANCE -> b
+    15:15:void <init>() -> <init>
+    22:27:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    32:32:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
+    16:16:net.minecraft.world.level.levelgen.structure.templatesystem.LavaSubmergedBlockProcessor lambda$static$0() -> b
+    16:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.LinearPosTest -> cup:
+    com.mojang.serialization.Codec CODEC -> a
+    float minChance -> b
+    float maxChance -> d
+    int minDist -> e
+    int maxDist -> f
+    23:32:void <init>(float,float,int,int) -> <init>
+    36:39:boolean test(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,java.util.Random) -> a
+    44:44:net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType getType() -> a
+    11:16:com.mojang.datafixers.kinds.App lambda$static$4(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    15:15:java.lang.Integer lambda$null$3(net.minecraft.world.level.levelgen.structure.templatesystem.LinearPosTest) -> a
+    14:14:java.lang.Integer lambda$null$2(net.minecraft.world.level.levelgen.structure.templatesystem.LinearPosTest) -> b
+    13:13:java.lang.Float lambda$null$1(net.minecraft.world.level.levelgen.structure.templatesystem.LinearPosTest) -> c
+    12:12:java.lang.Float lambda$null$0(net.minecraft.world.level.levelgen.structure.templatesystem.LinearPosTest) -> d
+    11:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.NopProcessor -> cuq:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.NopProcessor INSTANCE -> b
+    14:15:void <init>() -> <init>
+    20:20:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    25:25:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
+    10:10:net.minecraft.world.level.levelgen.structure.templatesystem.NopProcessor lambda$static$0() -> b
+    10:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.PosAlwaysTrueTest -> cur:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.PosAlwaysTrueTest INSTANCE -> b
+    13:14:void <init>() -> <init>
+    18:18:boolean test(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,java.util.Random) -> a
+    23:23:net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType getType() -> a
+    9:9:net.minecraft.world.level.levelgen.structure.templatesystem.PosAlwaysTrueTest lambda$static$0() -> b
+    9:11:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTest -> cus:
+    com.mojang.serialization.Codec CODEC -> c
+    9:9:void <init>() -> <init>
+    boolean test(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,java.util.Random) -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType getType() -> a
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType -> cut:
+    net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType ALWAYS_TRUE_TEST -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType LINEAR_POS_TEST -> b
+    net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType AXIS_ALIGNED_LINEAR_POS_TEST -> c
+    com.mojang.serialization.Codec codec() -> codec
+    15:15:net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    15:15:com.mojang.serialization.Codec lambda$register$0(com.mojang.serialization.Codec) -> a
+    7:9:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule -> cuu:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest inputPredicate -> b
+    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest locPredicate -> c
+    net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTest posPredicate -> d
+    net.minecraft.world.level.block.state.BlockState outputState -> e
+    net.minecraft.nbt.CompoundTag outputTag -> f
+    38:39:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest,net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest,net.minecraft.world.level.block.state.BlockState) -> <init>
+    42:43:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest,net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest,net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTest,net.minecraft.world.level.block.state.BlockState) -> <init>
+    45:51:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest,net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest,net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTest,net.minecraft.world.level.block.state.BlockState,java.util.Optional) -> <init>
+    54:54:boolean test(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,java.util.Random) -> a
+    58:58:net.minecraft.world.level.block.state.BlockState getOutputState() -> a
+    63:63:net.minecraft.nbt.CompoundTag getOutputTag() -> b
+    17:23:com.mojang.datafixers.kinds.App lambda$static$5(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    22:22:java.util.Optional lambda$null$4(net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule) -> a
+    21:21:net.minecraft.world.level.block.state.BlockState lambda$null$3(net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule) -> b
+    20:20:net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTest lambda$null$2(net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule) -> c
+    19:19:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest lambda$null$1(net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule) -> d
+    18:18:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest lambda$null$0(net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule) -> e
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest -> cuv:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.Block block -> b
+    float probability -> d
+    20:23:void <init>(net.minecraft.world.level.block.Block,float) -> <init>
+    27:27:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    32:32:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
+    12:15:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    14:14:java.lang.Float lambda$null$1(net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest) -> a
+    13:13:net.minecraft.world.level.block.Block lambda$null$0(net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest) -> b
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockStateMatchTest -> cuw:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.state.BlockState blockState -> b
+    float probability -> d
+    18:21:void <init>(net.minecraft.world.level.block.state.BlockState,float) -> <init>
     25:25:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
     30:30:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
-    35:37:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.structure.templatesystem.RuleProcessor -> cml:
-    com.google.common.collect.ImmutableList rules -> a
+    10:13:com.mojang.datafixers.kinds.App lambda$static$2(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    12:12:java.lang.Float lambda$null$1(net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockStateMatchTest) -> a
+    11:11:net.minecraft.world.level.block.state.BlockState lambda$null$0(net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockStateMatchTest) -> b
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.RuleProcessor -> cux:
+    com.mojang.serialization.Codec CODEC -> a
+    com.google.common.collect.ImmutableList rules -> b
     19:21:void <init>(java.util.List) -> <init>
-    24:25:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    30:37:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
-    42:42:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
-    47:48:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-    48:48:java.lang.Object lambda$getDynamic$0(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule) -> a
-net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest -> cmm:
-    10:10:void <init>() -> <init>
+    26:33:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    38:38:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
+    15:15:java.util.List lambda$static$0(net.minecraft.world.level.levelgen.structure.templatesystem.RuleProcessor) -> a
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest -> cuy:
+    com.mojang.serialization.Codec CODEC -> c
+    9:9:void <init>() -> <init>
     boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    14:15:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> b
     net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
-    com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType -> cmn:
-    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType ALWAYS_TRUE_TEST -> b
-    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType BLOCK_TEST -> c
-    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType BLOCKSTATE_TEST -> d
-    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType TAG_TEST -> e
-    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType RANDOM_BLOCK_TEST -> f
-    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType RANDOM_BLOCKSTATE_TEST -> g
-    16:16:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType register(java.lang.String,net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType) -> a
-    7:7:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest lambda$static$0(com.mojang.datafixers.Dynamic) -> a
+    10:10:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType -> cuz:
+    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType ALWAYS_TRUE_TEST -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType BLOCK_TEST -> b
+    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType BLOCKSTATE_TEST -> c
+    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType TAG_TEST -> d
+    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType RANDOM_BLOCK_TEST -> e
+    net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType RANDOM_BLOCKSTATE_TEST -> f
+    com.mojang.serialization.Codec codec() -> codec
+    18:18:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    18:18:com.mojang.serialization.Codec lambda$register$0(com.mojang.serialization.Codec) -> a
     7:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager -> cmo:
+net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager -> cva:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Map structureRepository -> b
     com.mojang.datafixers.DataFixer fixerUpper -> c
-    net.minecraft.server.MinecraftServer server -> d
+    net.minecraft.server.packs.resources.ResourceManager resourceManager -> d
     java.nio.file.Path generatedDir -> e
-    44:54:void <init>(net.minecraft.server.MinecraftServer,java.io.File,com.mojang.datafixers.DataFixer) -> <init>
-    57:62:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate getOrCreate(net.minecraft.resources.ResourceLocation) -> a
-    67:67:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate get(net.minecraft.resources.ResourceLocation) -> b
-    75:76:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
-    80:87:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate loadFromResource(net.minecraft.resources.ResourceLocation) -> e
-    93:105:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate loadFromGenerated(net.minecraft.resources.ResourceLocation) -> f
-    110:111:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate readStructure(java.io.InputStream) -> a
-    116:122:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate readStructure(net.minecraft.nbt.CompoundTag) -> a
-    126:159:boolean save(net.minecraft.resources.ResourceLocation) -> c
-    164:168:java.nio.file.Path createPathToStructure(net.minecraft.resources.ResourceLocation,java.lang.String) -> a
-    173:183:java.nio.file.Path createAndValidatePathToStructure(net.minecraft.resources.ResourceLocation,java.lang.String) -> b
-    187:188:void remove(net.minecraft.resources.ResourceLocation) -> d
-    68:69:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate lambda$get$0(net.minecraft.resources.ResourceLocation) -> g
-    37:37:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings -> cmp:
+    42:51:void <init>(net.minecraft.server.packs.resources.ResourceManager,net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,com.mojang.datafixers.DataFixer) -> <init>
+    54:59:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate getOrCreate(net.minecraft.resources.ResourceLocation) -> a
+    64:64:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate get(net.minecraft.resources.ResourceLocation) -> b
+    71:73:void onResourceManagerReload(net.minecraft.server.packs.resources.ResourceManager) -> a
+    77:84:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate loadFromResource(net.minecraft.resources.ResourceLocation) -> e
+    90:102:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate loadFromGenerated(net.minecraft.resources.ResourceLocation) -> f
+    107:108:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate readStructure(java.io.InputStream) -> a
+    113:119:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate readStructure(net.minecraft.nbt.CompoundTag) -> a
+    123:156:boolean save(net.minecraft.resources.ResourceLocation) -> c
+    161:165:java.nio.file.Path createPathToStructure(net.minecraft.resources.ResourceLocation,java.lang.String) -> a
+    170:180:java.nio.file.Path createAndValidatePathToStructure(net.minecraft.resources.ResourceLocation,java.lang.String) -> b
+    184:185:void remove(net.minecraft.resources.ResourceLocation) -> d
+    65:66:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate lambda$get$0(net.minecraft.resources.ResourceLocation) -> g
+    36:36:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings -> cvb:
     net.minecraft.world.level.block.Mirror mirror -> a
     net.minecraft.world.level.block.Rotation rotation -> b
     net.minecraft.core.BlockPos rotationPivot -> c
@@ -62150,212 +68349,276 @@ net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettin
     int palette -> i
     java.util.List processors -> j
     boolean knownShape -> k
-    18:32:void <init>() -> <init>
-    36:48:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings copy() -> a
-    52:53:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setMirror(net.minecraft.world.level.block.Mirror) -> a
-    57:58:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setRotation(net.minecraft.world.level.block.Rotation) -> a
-    62:63:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setRotationPivot(net.minecraft.core.BlockPos) -> a
-    67:68:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setIgnoreEntities(boolean) -> a
-    72:73:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setChunkPos(net.minecraft.world.level.ChunkPos) -> a
-    77:78:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setBoundingBox(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    82:83:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setRandom(java.util.Random) -> a
-    87:88:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setKeepLiquids(boolean) -> b
-    92:93:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setKnownShape(boolean) -> c
-    97:98:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings clearProcessors() -> b
-    102:103:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings addProcessor(net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor) -> a
-    107:108:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings popProcessor(net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor) -> b
-    112:112:net.minecraft.world.level.block.Mirror getMirror() -> c
-    116:116:net.minecraft.world.level.block.Rotation getRotation() -> d
-    120:120:net.minecraft.core.BlockPos getRotationPivot() -> e
-    125:125:net.minecraft.world.level.ChunkPos getChunkPos() -> f
-    129:137:java.util.Random getRandom(net.minecraft.core.BlockPos) -> b
-    141:141:boolean isIgnoreEntities() -> g
-    146:149:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox() -> h
-    153:153:boolean getKnownShape() -> i
-    157:157:java.util.List getProcessors() -> j
-    161:164:void updateBoundingBoxFromChunkPos() -> k
-    167:167:boolean shouldKeepLiquids() -> l
-    171:172:java.util.List getRandomPalette(java.util.List,net.minecraft.core.BlockPos) -> a
-    178:183:net.minecraft.world.level.levelgen.structure.BoundingBox calculateBoundingBox(net.minecraft.world.level.ChunkPos) -> b
-net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor -> cmq:
-    11:11:void <init>() -> <init>
-    net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
+    boolean finalizeEntities -> l
+    17:31:void <init>() -> <init>
+    36:49:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings copy() -> a
+    53:54:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setMirror(net.minecraft.world.level.block.Mirror) -> a
+    58:59:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setRotation(net.minecraft.world.level.block.Rotation) -> a
+    63:64:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setRotationPivot(net.minecraft.core.BlockPos) -> a
+    68:69:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setIgnoreEntities(boolean) -> a
+    73:74:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setChunkPos(net.minecraft.world.level.ChunkPos) -> a
+    78:79:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setBoundingBox(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
+    83:84:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setRandom(java.util.Random) -> a
+    88:89:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setKeepLiquids(boolean) -> b
+    93:94:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setKnownShape(boolean) -> c
+    98:99:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings clearProcessors() -> b
+    103:104:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings addProcessor(net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor) -> a
+    108:109:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings popProcessor(net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor) -> b
+    113:113:net.minecraft.world.level.block.Mirror getMirror() -> c
+    117:117:net.minecraft.world.level.block.Rotation getRotation() -> d
+    121:121:net.minecraft.core.BlockPos getRotationPivot() -> e
+    126:126:net.minecraft.world.level.ChunkPos getChunkPos() -> f
+    130:138:java.util.Random getRandom(net.minecraft.core.BlockPos) -> b
+    142:142:boolean isIgnoreEntities() -> g
+    147:150:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox() -> h
+    154:154:boolean getKnownShape() -> i
+    158:158:java.util.List getProcessors() -> j
+    162:165:void updateBoundingBoxFromChunkPos() -> k
+    168:168:boolean shouldKeepLiquids() -> l
+    172:177:net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$Palette getRandomPalette(java.util.List,net.minecraft.core.BlockPos) -> a
+    182:187:net.minecraft.world.level.levelgen.structure.BoundingBox calculateBoundingBox(net.minecraft.world.level.ChunkPos) -> b
+    191:192:net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings setFinalizeEntities(boolean) -> d
+    196:196:boolean shouldFinalizeEntities() -> m
+net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor -> cvc:
+    8:8:void <init>() -> <init>
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo processBlock(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
     net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType getType() -> a
-    com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-    20:21:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> b
-net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType -> cmr:
-    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType BLOCK_IGNORE -> b
-    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType BLOCK_ROT -> c
-    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType GRAVITY -> d
-    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType JIGSAW_REPLACEMENT -> e
-    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType RULE -> f
-    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType NOP -> g
-    16:16:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType register(java.lang.String,net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType) -> a
-    12:12:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor lambda$static$1(com.mojang.datafixers.Dynamic) -> a
-    10:10:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor lambda$static$0(com.mojang.datafixers.Dynamic) -> b
-    7:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate -> cms:
+net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType -> cvd:
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType BLOCK_IGNORE -> a
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType BLOCK_ROT -> b
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType GRAVITY -> c
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType JIGSAW_REPLACEMENT -> d
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType RULE -> e
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType NOP -> f
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType BLOCK_AGE -> g
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType BLACKSTONE_REPLACE -> h
+    net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType LAVA_SUBMERGED_BLOCK -> i
+    com.mojang.serialization.Codec CODEC -> j
+    com.mojang.serialization.Codec codec() -> codec
+    23:23:net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType register(java.lang.String,com.mojang.serialization.Codec) -> a
+    23:23:com.mojang.serialization.Codec lambda$register$0(com.mojang.serialization.Codec) -> a
+    7:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate -> cve:
     java.util.List palettes -> a
     java.util.List entityInfoList -> b
     net.minecraft.core.BlockPos size -> c
     java.lang.String author -> d
-    43:61:void <init>() -> <init>
-    64:64:net.minecraft.core.BlockPos getSize() -> a
-    68:69:void setAuthor(java.lang.String) -> a
-    72:72:java.lang.String getAuthor() -> b
-    76:121:void fillFromWorld(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,boolean,net.minecraft.world.level.block.Block) -> a
-    124:138:void fillEntityList(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    141:141:java.util.List filterBlocks(net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.world.level.block.Block) -> a
-    145:160:java.util.List filterBlocks(net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.world.level.block.Block,boolean) -> a
-    164:166:net.minecraft.core.BlockPos calculateConnectedPosition(net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.core.BlockPos) -> a
-    170:170:net.minecraft.core.BlockPos calculateRelativePosition(net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.core.BlockPos) -> a
-    174:176:void placeInWorldChunk(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> a
-    179:180:void placeInWorld(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings) -> b
-    183:328:boolean placeInWorld(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,int) -> a
-    332:346:void updateShapeAtEdge(net.minecraft.world.level.LevelAccessor,int,net.minecraft.world.phys.shapes.DiscreteVoxelShape,int,int,int) -> a
-    349:363:java.util.List processBlockInfos(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,java.util.List) -> a
-    367:393:void placeEntities(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    398:400:java.util.Optional createEntityIgnoreException(net.minecraft.world.level.LevelAccessor,net.minecraft.nbt.CompoundTag) -> a
-    405:410:net.minecraft.core.BlockPos getSize(net.minecraft.world.level.block.Rotation) -> a
-    415:442:net.minecraft.core.BlockPos transform(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation,net.minecraft.core.BlockPos) -> a
-    447:474:net.minecraft.world.phys.Vec3 transform(net.minecraft.world.phys.Vec3,net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation,net.minecraft.core.BlockPos) -> a
-    479:479:net.minecraft.core.BlockPos getZeroPositionWithTransform(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation) -> a
-    483:505:net.minecraft.core.BlockPos getZeroPositionWithTransform(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation,int,int) -> a
-    509:546:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.core.BlockPos) -> b
-    550:559:void mirrorAABB(net.minecraft.world.level.block.Rotation,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction,net.minecraft.core.Direction) -> a
-    594:660:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
-    664:692:void load(net.minecraft.nbt.CompoundTag) -> b
-    695:719:void loadPalette(net.minecraft.nbt.ListTag,net.minecraft.nbt.ListTag) -> a
-    722:726:net.minecraft.nbt.ListTag newIntegerList(int[]) -> a
-    730:734:net.minecraft.nbt.ListTag newDoubleList(double[]) -> a
-    717:717:int lambda$loadPalette$3(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo) -> a
-    387:391:void lambda$placeEntities$2(net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation,net.minecraft.world.phys.Vec3,net.minecraft.world.level.LevelAccessor,net.minecraft.world.entity.Entity) -> a
-    333:345:void lambda$updateShapeAtEdge$1(int,int,int,net.minecraft.world.level.LevelAccessor,int,net.minecraft.core.Direction,int,int,int) -> a
-    124:124:boolean lambda$fillEntityList$0(net.minecraft.world.entity.Entity) -> a
-net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$1 -> cms$1:
+    52:70:void <init>() -> <init>
+    73:73:net.minecraft.core.BlockPos getSize() -> a
+    77:78:void setAuthor(java.lang.String) -> a
+    81:81:java.lang.String getAuthor() -> b
+    85:129:void fillFromWorld(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,boolean,net.minecraft.world.level.block.Block) -> a
+    132:139:void addToLists(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo,java.util.List,java.util.List,java.util.List) -> a
+    143:152:java.util.List buildInfoList(java.util.List,java.util.List,java.util.List) -> a
+    156:170:void fillEntityList(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    173:173:java.util.List filterBlocks(net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.world.level.block.Block) -> a
+    177:190:java.util.List filterBlocks(net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.world.level.block.Block,boolean) -> a
+    194:196:net.minecraft.core.BlockPos calculateConnectedPosition(net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.core.BlockPos) -> a
+    200:200:net.minecraft.core.BlockPos calculateRelativePosition(net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.core.BlockPos) -> a
+    204:206:void placeInWorldChunk(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,java.util.Random) -> a
+    209:210:void placeInWorld(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,java.util.Random) -> b
+    213:362:boolean placeInWorld(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,java.util.Random,int) -> a
+    366:380:void updateShapeAtEdge(net.minecraft.world.level.LevelAccessor,int,net.minecraft.world.phys.shapes.DiscreteVoxelShape,int,int,int) -> a
+    383:397:java.util.List processBlockInfos(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,java.util.List) -> a
+    401:429:void placeEntities(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.structure.BoundingBox,boolean) -> a
+    434:436:java.util.Optional createEntityIgnoreException(net.minecraft.world.level.LevelAccessor,net.minecraft.nbt.CompoundTag) -> a
+    441:446:net.minecraft.core.BlockPos getSize(net.minecraft.world.level.block.Rotation) -> a
+    451:478:net.minecraft.core.BlockPos transform(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation,net.minecraft.core.BlockPos) -> a
+    483:510:net.minecraft.world.phys.Vec3 transform(net.minecraft.world.phys.Vec3,net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation,net.minecraft.core.BlockPos) -> a
+    515:515:net.minecraft.core.BlockPos getZeroPositionWithTransform(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation) -> a
+    519:541:net.minecraft.core.BlockPos getZeroPositionWithTransform(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation,int,int) -> a
+    545:545:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings,net.minecraft.core.BlockPos) -> b
+    549:583:net.minecraft.world.level.levelgen.structure.BoundingBox getBoundingBox(net.minecraft.core.BlockPos,net.minecraft.world.level.block.Rotation,net.minecraft.core.BlockPos,net.minecraft.world.level.block.Mirror) -> a
+    587:596:void mirrorAABB(net.minecraft.world.level.block.Rotation,int,int,net.minecraft.world.level.levelgen.structure.BoundingBox,net.minecraft.core.Direction,net.minecraft.core.Direction) -> a
+    631:697:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> a
+    701:729:void load(net.minecraft.nbt.CompoundTag) -> b
+    732:761:void loadPalette(net.minecraft.nbt.ListTag,net.minecraft.nbt.ListTag) -> a
+    764:768:net.minecraft.nbt.ListTag newIntegerList(int[]) -> a
+    772:776:net.minecraft.nbt.ListTag newDoubleList(double[]) -> a
+    420:427:void lambda$placeEntities$5(net.minecraft.world.level.block.Mirror,net.minecraft.world.level.block.Rotation,net.minecraft.world.phys.Vec3,boolean,net.minecraft.world.level.LevelAccessor,net.minecraft.nbt.CompoundTag,net.minecraft.world.entity.Entity) -> a
+    367:379:void lambda$updateShapeAtEdge$4(int,int,int,net.minecraft.world.level.LevelAccessor,int,net.minecraft.core.Direction,int,int,int) -> a
+    156:156:boolean lambda$fillEntityList$3(net.minecraft.world.entity.Entity) -> a
+    143:143:int lambda$buildInfoList$2(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo) -> a
+    143:143:int lambda$buildInfoList$1(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo) -> b
+    143:143:int lambda$buildInfoList$0(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo) -> c
+net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$1 -> cve$1:
     int[] $SwitchMap$net$minecraft$world$level$block$Rotation -> a
     int[] $SwitchMap$net$minecraft$world$level$block$Mirror -> b
-    405:420:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$SimplePalette -> cms$a:
+    441:456:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$Palette -> cve$a:
+    java.util.List blocks -> a
+    java.util.Map cache -> b
+    811:815:void <init>(java.util.List) -> <init>
+    818:818:java.util.List blocks() -> a
+    822:822:java.util.List blocks(net.minecraft.world.level.block.Block) -> a
+    822:822:java.util.List lambda$blocks$1(net.minecraft.world.level.block.Block) -> b
+    822:822:boolean lambda$null$0(net.minecraft.world.level.block.Block,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo) -> a
+    808:808:void <init>(java.util.List,net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$1) -> <init>
+net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$SimplePalette -> cve$b:
     net.minecraft.world.level.block.state.BlockState DEFAULT_BLOCK_STATE -> a
     net.minecraft.core.IdMapper ids -> b
     int lastId -> c
-    561:564:void <init>() -> <init>
-    568:574:int idFor(net.minecraft.world.level.block.state.BlockState) -> a
-    579:580:net.minecraft.world.level.block.state.BlockState stateFor(int) -> a
-    585:585:java.util.Iterator iterator() -> iterator
-    589:590:void addMapping(net.minecraft.world.level.block.state.BlockState,int) -> a
-    561:561:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$1) -> <init>
-    562:562:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo -> cms$b:
+    598:601:void <init>() -> <init>
+    605:611:int idFor(net.minecraft.world.level.block.state.BlockState) -> a
+    616:617:net.minecraft.world.level.block.state.BlockState stateFor(int) -> a
+    622:622:java.util.Iterator iterator() -> iterator
+    626:627:void addMapping(net.minecraft.world.level.block.state.BlockState,int) -> a
+    598:598:void <init>(net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$1) -> <init>
+    599:599:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureBlockInfo -> cve$c:
     net.minecraft.core.BlockPos pos -> a
     net.minecraft.world.level.block.state.BlockState state -> b
     net.minecraft.nbt.CompoundTag nbt -> c
-    742:746:void <init>(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> <init>
-    750:750:java.lang.String toString() -> toString
-net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureEntityInfo -> cms$c:
+    784:788:void <init>(net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.nbt.CompoundTag) -> <init>
+    792:792:java.lang.String toString() -> toString
+net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate$StructureEntityInfo -> cve$d:
     net.minecraft.world.phys.Vec3 pos -> a
     net.minecraft.core.BlockPos blockPos -> b
     net.minecraft.nbt.CompoundTag nbt -> c
-    759:763:void <init>(net.minecraft.world.phys.Vec3,net.minecraft.core.BlockPos,net.minecraft.nbt.CompoundTag) -> <init>
-net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest -> cmt:
-    net.minecraft.tags.Tag tag -> a
-    17:19:void <init>(net.minecraft.tags.Tag) -> <init>
-    22:23:void <init>(com.mojang.datafixers.Dynamic) -> <init>
-    27:27:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
-    32:32:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
-    37:38:com.mojang.datafixers.Dynamic getDynamic(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.structure.templatesystem.package-info -> cmu:
-net.minecraft.world.level.levelgen.surfacebuilders.BadlandsSurfaceBuilder -> cmv:
-    net.minecraft.world.level.block.state.BlockState WHITE_TERRACOTTA -> S
-    net.minecraft.world.level.block.state.BlockState ORANGE_TERRACOTTA -> T
-    net.minecraft.world.level.block.state.BlockState TERRACOTTA -> U
-    net.minecraft.world.level.block.state.BlockState YELLOW_TERRACOTTA -> V
-    net.minecraft.world.level.block.state.BlockState BROWN_TERRACOTTA -> W
-    net.minecraft.world.level.block.state.BlockState RED_TERRACOTTA -> X
-    net.minecraft.world.level.block.state.BlockState LIGHT_GRAY_TERRACOTTA -> Y
+    801:805:void <init>(net.minecraft.world.phys.Vec3,net.minecraft.core.BlockPos,net.minecraft.nbt.CompoundTag) -> <init>
+net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest -> cvf:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.tags.Tag tag -> b
+    16:18:void <init>(net.minecraft.tags.Tag) -> <init>
+    22:22:boolean test(net.minecraft.world.level.block.state.BlockState,java.util.Random) -> a
+    27:27:net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType getType() -> a
+    12:12:net.minecraft.tags.Tag lambda$static$0(net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest) -> a
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.structure.templatesystem.package-info -> cvg:
+net.minecraft.world.level.levelgen.surfacebuilders.BadlandsSurfaceBuilder -> cvh:
+    net.minecraft.world.level.block.state.BlockState WHITE_TERRACOTTA -> ah
+    net.minecraft.world.level.block.state.BlockState ORANGE_TERRACOTTA -> ai
+    net.minecraft.world.level.block.state.BlockState TERRACOTTA -> aj
+    net.minecraft.world.level.block.state.BlockState YELLOW_TERRACOTTA -> ak
+    net.minecraft.world.level.block.state.BlockState BROWN_TERRACOTTA -> al
+    net.minecraft.world.level.block.state.BlockState RED_TERRACOTTA -> am
+    net.minecraft.world.level.block.state.BlockState LIGHT_GRAY_TERRACOTTA -> an
     net.minecraft.world.level.block.state.BlockState[] clayBands -> a
     long seed -> b
     net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise pillarNoise -> c
     net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise pillarRoofNoise -> d
     net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise clayBandsOffsetNoise -> e
-    35:36:void <init>(java.util.function.Function) -> <init>
-    40:128:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
-    133:143:void initNoise(long) -> a
-    146:202:void generateBands(long) -> b
-    205:206:net.minecraft.world.level.block.state.BlockState getBand(int,int,int) -> a
-    17:17:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-    20:26:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder -> cmw:
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder surfaceBuilder -> a
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration config -> b
-    18:21:void <init>(net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> <init>
-    24:25:void <init>(net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder,com.mojang.datafixers.Dynamic) -> <init>
-    28:30:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    35:36:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long) -> a
-    39:40:void initNoise(long) -> a
-    43:43:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration getSurfaceBuilderConfiguration() -> a
-    47:48:net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.surfacebuilders.DefaultSurfaceBuilder -> cmx:
-    16:17:void <init>(java.util.function.Function) -> <init>
-    21:22:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
-    25:87:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int) -> a
-    14:14:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-net.minecraft.world.level.levelgen.surfacebuilders.ErodedBadlandsSurfaceBuilder -> cmy:
-    net.minecraft.world.level.block.state.BlockState WHITE_TERRACOTTA -> S
-    net.minecraft.world.level.block.state.BlockState ORANGE_TERRACOTTA -> T
-    net.minecraft.world.level.block.state.BlockState TERRACOTTA -> U
-    20:21:void <init>(java.util.function.Function) -> <init>
-    25:127:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
-    14:14:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-    15:17:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.surfacebuilders.FrozenOceanSurfaceBuilder -> cmz:
+    36:37:void <init>(com.mojang.serialization.Codec) -> <init>
+    41:129:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    134:144:void initNoise(long) -> a
+    147:203:void generateBands(long) -> b
+    206:207:net.minecraft.world.level.block.state.BlockState getBand(int,int,int) -> a
+    18:18:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+    21:27:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.BasaltDeltasSurfaceBuilder -> cvi:
+    net.minecraft.world.level.block.state.BlockState BASALT -> a
+    net.minecraft.world.level.block.state.BlockState BLACKSTONE -> b
+    net.minecraft.world.level.block.state.BlockState GRAVEL -> c
+    com.google.common.collect.ImmutableList FLOOR_BLOCK_STATES -> d
+    com.google.common.collect.ImmutableList CEILING_BLOCK_STATES -> e
+    17:18:void <init>(com.mojang.serialization.Codec) -> <init>
+    22:22:com.google.common.collect.ImmutableList getFloorBlockStates() -> a
+    27:27:com.google.common.collect.ImmutableList getCeilingBlockStates() -> b
+    32:32:net.minecraft.world.level.block.state.BlockState getPatchBlockState() -> c
+    9:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder -> cvj:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder surfaceBuilder -> b
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration config -> c
+    17:20:void <init>(net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> <init>
+    23:24:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long) -> a
+    27:28:void initNoise(long) -> a
+    31:31:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration getSurfaceBuilderConfiguration() -> a
+    12:12:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder lambda$static$0(net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder) -> a
+    12:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.DefaultSurfaceBuilder -> cvk:
+    15:16:void <init>(com.mojang.serialization.Codec) -> <init>
+    20:21:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    24:86:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int) -> a
+    13:13:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+net.minecraft.world.level.levelgen.surfacebuilders.ErodedBadlandsSurfaceBuilder -> cvl:
+    net.minecraft.world.level.block.state.BlockState WHITE_TERRACOTTA -> ah
+    net.minecraft.world.level.block.state.BlockState ORANGE_TERRACOTTA -> ai
+    net.minecraft.world.level.block.state.BlockState TERRACOTTA -> aj
+    19:20:void <init>(com.mojang.serialization.Codec) -> <init>
+    24:126:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    13:13:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+    14:16:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.FrozenOceanSurfaceBuilder -> cvm:
     net.minecraft.world.level.block.state.BlockState PACKED_ICE -> a
     net.minecraft.world.level.block.state.BlockState SNOW_BLOCK -> b
     net.minecraft.world.level.block.state.BlockState AIR -> c
     net.minecraft.world.level.block.state.BlockState GRAVEL -> d
     net.minecraft.world.level.block.state.BlockState ICE -> e
-    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise icebergNoise -> S
-    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise icebergRoofNoise -> T
-    long seed -> U
-    29:30:void <init>(java.util.function.Function) -> <init>
-    34:132:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
-    136:142:void initNoise(long) -> a
-    17:17:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-    18:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.surfacebuilders.GiantTreeTaigaSurfaceBuilder -> cna:
-    13:14:void <init>(java.util.function.Function) -> <init>
-    18:25:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
-    11:11:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-net.minecraft.world.level.levelgen.surfacebuilders.GravellyMountainSurfaceBuilder -> cnb:
-    13:14:void <init>(java.util.function.Function) -> <init>
-    18:25:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
-    11:11:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-net.minecraft.world.level.levelgen.surfacebuilders.MountainSurfaceBuilder -> cnc:
-    13:14:void <init>(java.util.function.Function) -> <init>
-    18:23:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
-    11:11:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-net.minecraft.world.level.levelgen.surfacebuilders.NetherSurfaceBuilder -> cnd:
+    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise icebergNoise -> ah
+    net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise icebergRoofNoise -> ai
+    long seed -> aj
+    30:31:void <init>(com.mojang.serialization.Codec) -> <init>
+    35:133:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    137:143:void initNoise(long) -> a
+    18:18:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+    19:23:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.GiantTreeTaigaSurfaceBuilder -> cvn:
+    12:13:void <init>(com.mojang.serialization.Codec) -> <init>
+    17:24:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    10:10:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+net.minecraft.world.level.levelgen.surfacebuilders.GravellyMountainSurfaceBuilder -> cvo:
+    12:13:void <init>(com.mojang.serialization.Codec) -> <init>
+    17:24:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    10:10:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+net.minecraft.world.level.levelgen.surfacebuilders.MountainSurfaceBuilder -> cvp:
+    12:13:void <init>(com.mojang.serialization.Codec) -> <init>
+    17:22:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    10:10:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+net.minecraft.world.level.levelgen.surfacebuilders.NetherCappedSurfaceBuilder -> cvq:
+    long seed -> a
+    com.google.common.collect.ImmutableMap floorNoises -> b
+    com.google.common.collect.ImmutableMap ceilingNoises -> c
+    net.minecraft.world.level.levelgen.synth.PerlinNoise patchNoise -> d
+    20:26:void <init>(com.mojang.serialization.Codec) -> <init>
+    30:80:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    84:91:void initNoise(long) -> a
+    94:99:com.google.common.collect.ImmutableMap initPerlinNoises(com.google.common.collect.ImmutableList,long) -> a
+    com.google.common.collect.ImmutableList getFloorBlockStates() -> a
+    com.google.common.collect.ImmutableList getCeilingBlockStates() -> b
+    net.minecraft.world.level.block.state.BlockState getPatchBlockState() -> c
+    18:18:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+    41:41:java.lang.Double lambda$apply$1(int,int,int,java.util.Map$Entry) -> a
+    40:40:java.lang.Double lambda$apply$0(int,int,int,java.util.Map$Entry) -> b
+net.minecraft.world.level.levelgen.surfacebuilders.NetherForestSurfaceBuilder -> cvr:
+    net.minecraft.world.level.block.state.BlockState AIR -> b
+    long seed -> a
+    net.minecraft.world.level.levelgen.synth.PerlinNoise decorationNoise -> c
+    23:24:void <init>(com.mojang.serialization.Codec) -> <init>
+    28:81:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    85:89:void initNoise(long) -> a
+    16:16:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.NetherSurfaceBuilder -> cvs:
     net.minecraft.world.level.block.state.BlockState AIR -> c
-    net.minecraft.world.level.block.state.BlockState NETHERRACK -> d
-    net.minecraft.world.level.block.state.BlockState GRAVEL -> e
-    net.minecraft.world.level.block.state.BlockState SOUL_SAND -> S
+    net.minecraft.world.level.block.state.BlockState GRAVEL -> d
+    net.minecraft.world.level.block.state.BlockState SOUL_SAND -> e
     long seed -> a
     net.minecraft.world.level.levelgen.synth.PerlinNoise decorationNoise -> b
-    26:27:void <init>(java.util.function.Function) -> <init>
-    31:87:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    25:26:void <init>(com.mojang.serialization.Codec) -> <init>
+    30:87:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
     91:95:void initNoise(long) -> a
     16:16:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-    17:20:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.surfacebuilders.NopeSurfaceBuilder -> cne:
-    13:14:void <init>(java.util.function.Function) -> <init>
-    18:18:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
-    11:11:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-net.minecraft.world.level.levelgen.surfacebuilders.ShatteredSavanaSurfaceBuilder -> cnf:
-    13:14:void <init>(java.util.function.Function) -> <init>
-    18:25:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
-    11:11:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder -> cng:
+    17:19:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.NopeSurfaceBuilder -> cvt:
+    12:13:void <init>(com.mojang.serialization.Codec) -> <init>
+    17:17:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    10:10:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+net.minecraft.world.level.levelgen.surfacebuilders.ShatteredSavanaSurfaceBuilder -> cvu:
+    12:13:void <init>(com.mojang.serialization.Codec) -> <init>
+    17:24:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    10:10:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+net.minecraft.world.level.levelgen.surfacebuilders.SoulSandValleySurfaceBuilder -> cvv:
+    net.minecraft.world.level.block.state.BlockState SOUL_SAND -> a
+    net.minecraft.world.level.block.state.BlockState SOUL_SOIL -> b
+    net.minecraft.world.level.block.state.BlockState GRAVEL -> c
+    com.google.common.collect.ImmutableList BLOCK_STATES -> d
+    16:17:void <init>(com.mojang.serialization.Codec) -> <init>
+    21:21:com.google.common.collect.ImmutableList getFloorBlockStates() -> a
+    26:26:com.google.common.collect.ImmutableList getCeilingBlockStates() -> b
+    31:31:net.minecraft.world.level.block.state.BlockState getPatchBlockState() -> c
+    9:13:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder -> cvw:
     net.minecraft.world.level.block.state.BlockState AIR -> f
     net.minecraft.world.level.block.state.BlockState DIRT -> g
     net.minecraft.world.level.block.state.BlockState GRASS_BLOCK -> h
@@ -62367,70 +68630,90 @@ net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder -> cng:
     net.minecraft.world.level.block.state.BlockState RED_SAND -> n
     net.minecraft.world.level.block.state.BlockState WHITE_TERRACOTTA -> o
     net.minecraft.world.level.block.state.BlockState MYCELIUM -> p
-    net.minecraft.world.level.block.state.BlockState NETHERRACK -> q
-    net.minecraft.world.level.block.state.BlockState ENDSTONE -> r
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_EMPTY -> s
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_PODZOL -> t
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_GRAVEL -> u
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_GRASS -> v
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_DIRT -> w
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_STONE -> x
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_COARSE_DIRT -> y
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_DESERT -> z
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_OCEAN_SAND -> A
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_FULL_SAND -> B
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_BADLANDS -> C
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_MYCELIUM -> D
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_HELL -> E
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_THEEND -> F
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder DEFAULT -> G
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder MOUNTAIN -> H
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder SHATTERED_SAVANNA -> I
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder GRAVELLY_MOUNTAIN -> J
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder GIANT_TREE_TAIGA -> K
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder SWAMP -> L
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder BADLANDS -> M
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder WOODED_BADLANDS -> N
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder ERODED_BADLANDS -> O
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder FROZEN_OCEAN -> P
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder NETHER -> Q
-    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder NOPE -> R
-    java.util.function.Function configurationFactory -> a
-    57:57:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder register(java.lang.String,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder) -> a
-    62:64:void <init>(java.util.function.Function) -> <init>
-    67:67:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration createSettings(com.mojang.datafixers.Dynamic) -> a
+    net.minecraft.world.level.block.state.BlockState SOUL_SAND -> q
+    net.minecraft.world.level.block.state.BlockState NETHERRACK -> r
+    net.minecraft.world.level.block.state.BlockState ENDSTONE -> s
+    net.minecraft.world.level.block.state.BlockState CRIMSON_NYLIUM -> t
+    net.minecraft.world.level.block.state.BlockState WARPED_NYLIUM -> u
+    net.minecraft.world.level.block.state.BlockState NETHER_WART_BLOCK -> v
+    net.minecraft.world.level.block.state.BlockState WARPED_WART_BLOCK -> w
+    net.minecraft.world.level.block.state.BlockState BLACKSTONE -> x
+    net.minecraft.world.level.block.state.BlockState BASALT -> y
+    net.minecraft.world.level.block.state.BlockState MAGMA -> z
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_EMPTY -> A
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_PODZOL -> B
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_GRAVEL -> C
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_GRASS -> D
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_DIRT -> E
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_STONE -> F
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_COARSE_DIRT -> G
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_DESERT -> H
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_OCEAN_SAND -> I
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_FULL_SAND -> J
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_BADLANDS -> K
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_MYCELIUM -> L
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_HELL -> M
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_SOUL_SAND_VALLEY -> N
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_THEEND -> O
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_CRIMSON_FOREST -> P
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_WARPED_FOREST -> Q
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration CONFIG_BASALT_DELTAS -> R
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder DEFAULT -> S
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder MOUNTAIN -> T
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder SHATTERED_SAVANNA -> U
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder GRAVELLY_MOUNTAIN -> V
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder GIANT_TREE_TAIGA -> W
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder SWAMP -> X
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder BADLANDS -> Y
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder WOODED_BADLANDS -> Z
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder ERODED_BADLANDS -> aa
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder FROZEN_OCEAN -> ab
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder NETHER -> ac
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder NETHER_FOREST -> ad
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder SOUL_SAND_VALLEY -> ae
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder BASALT_DELTAS -> af
+    net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder NOPE -> ag
+    com.mojang.serialization.Codec configuredCodec -> a
+    71:71:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder register(java.lang.String,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder) -> a
+    76:78:void <init>(com.mojang.serialization.Codec) -> <init>
+    81:81:com.mojang.serialization.Codec configuredCodec() -> d
     void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-    73:73:void initNoise(long) -> a
-    14:54:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration -> cnh:
-    net.minecraft.world.level.block.state.BlockState topMaterial -> a
-    net.minecraft.world.level.block.state.BlockState underMaterial -> b
-    net.minecraft.world.level.block.state.BlockState underwaterMaterial -> c
-    14:18:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> <init>
-    22:22:net.minecraft.world.level.block.state.BlockState getTopMaterial() -> a
-    27:27:net.minecraft.world.level.block.state.BlockState getUnderMaterial() -> b
-    32:32:net.minecraft.world.level.block.state.BlockState getUnderwaterMaterial() -> c
-    37:40:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-    45:49:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration deserialize(com.mojang.datafixers.Dynamic) -> a
-net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration -> cni:
+    87:87:void initNoise(long) -> a
+    77:77:net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration lambda$new$1(net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder) -> a
+    77:77:net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder lambda$new$0(net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+    13:68:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration -> cvx:
+    com.mojang.serialization.Codec CODEC -> a
+    net.minecraft.world.level.block.state.BlockState topMaterial -> b
+    net.minecraft.world.level.block.state.BlockState underMaterial -> c
+    net.minecraft.world.level.block.state.BlockState underwaterMaterial -> d
+    19:23:void <init>(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState) -> <init>
+    27:27:net.minecraft.world.level.block.state.BlockState getTopMaterial() -> a
+    32:32:net.minecraft.world.level.block.state.BlockState getUnderMaterial() -> b
+    37:37:net.minecraft.world.level.block.state.BlockState getUnderwaterMaterial() -> c
+    9:13:com.mojang.datafixers.kinds.App lambda$static$3(com.mojang.serialization.codecs.RecordCodecBuilder$Instance) -> a
+    12:12:net.minecraft.world.level.block.state.BlockState lambda$null$2(net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    11:11:net.minecraft.world.level.block.state.BlockState lambda$null$1(net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> b
+    10:10:net.minecraft.world.level.block.state.BlockState lambda$null$0(net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> c
+    8:9:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration -> cvy:
     net.minecraft.world.level.block.state.BlockState getTopMaterial() -> a
     net.minecraft.world.level.block.state.BlockState getUnderMaterial() -> b
     net.minecraft.world.level.block.state.BlockState getUnderwaterMaterial() -> c
-    com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps) -> a
-net.minecraft.world.level.levelgen.surfacebuilders.SwampSurfaceBuilder -> cnj:
-    14:15:void <init>(java.util.function.Function) -> <init>
-    19:38:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+net.minecraft.world.level.levelgen.surfacebuilders.SwampSurfaceBuilder -> cvz:
+    13:14:void <init>(com.mojang.serialization.Codec) -> <init>
+    18:37:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
+    11:11:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
+net.minecraft.world.level.levelgen.surfacebuilders.WoodedBadlandsSurfaceBuilder -> cwa:
+    net.minecraft.world.level.block.state.BlockState WHITE_TERRACOTTA -> ah
+    net.minecraft.world.level.block.state.BlockState ORANGE_TERRACOTTA -> ai
+    net.minecraft.world.level.block.state.BlockState TERRACOTTA -> aj
+    18:19:void <init>(com.mojang.serialization.Codec) -> <init>
+    23:100:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
     12:12:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-net.minecraft.world.level.levelgen.surfacebuilders.WoodedBadlandsSurfaceBuilder -> cnk:
-    net.minecraft.world.level.block.state.BlockState WHITE_TERRACOTTA -> S
-    net.minecraft.world.level.block.state.BlockState ORANGE_TERRACOTTA -> T
-    net.minecraft.world.level.block.state.BlockState TERRACOTTA -> U
-    19:20:void <init>(java.util.function.Function) -> <init>
-    24:101:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration) -> a
-    13:13:void apply(java.util.Random,net.minecraft.world.level.chunk.ChunkAccess,net.minecraft.world.level.biome.Biome,int,int,int,double,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.BlockState,int,long,net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration) -> a
-    14:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.surfacebuilders.package-info -> cnl:
-net.minecraft.world.level.levelgen.synth.ImprovedNoise -> cnm:
+    13:15:void <clinit>() -> <clinit>
+net.minecraft.world.level.levelgen.surfacebuilders.package-info -> cwb:
+net.minecraft.world.level.levelgen.synth.ImprovedNoise -> cwc:
     byte[] p -> d
     double xo -> a
     double yo -> b
@@ -62440,26 +68723,36 @@ net.minecraft.world.level.levelgen.synth.ImprovedNoise -> cnm:
     66:67:double gradDot(int,double,double,double) -> a
     71:71:int p(int) -> a
     76:95:double sampleAndLerp(int,int,int,double,double,double,double,double,double) -> a
-net.minecraft.world.level.levelgen.synth.PerlinNoise -> cnn:
+net.minecraft.world.level.levelgen.synth.NormalNoise -> cwd:
+    double valueFactor -> a
+    net.minecraft.world.level.levelgen.synth.PerlinNoise first -> b
+    net.minecraft.world.level.levelgen.synth.PerlinNoise second -> c
+    28:29:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,java.util.stream.IntStream) -> <init>
+    31:39:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,java.util.List) -> <init>
+    45:45:double expectedDeviation(int) -> a
+    49:52:double getValue(double,double,double) -> a
+net.minecraft.world.level.levelgen.synth.PerlinNoise -> cwe:
     net.minecraft.world.level.levelgen.synth.ImprovedNoise[] noiseLevels -> a
     double highestFreqValueFactor -> b
     double highestFreqInputFactor -> c
-    24:25:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,int,int) -> <init>
-    27:71:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,it.unimi.dsi.fastutil.ints.IntSortedSet) -> <init>
-    74:74:double getValue(double,double,double) -> a
-    78:90:double getValue(double,double,double,double,double,boolean) -> a
-    95:95:net.minecraft.world.level.levelgen.synth.ImprovedNoise getOctaveNoise(int) -> a
-    99:99:double wrap(double) -> a
-    104:104:double getSurfaceNoiseValue(double,double,double,double) -> a
-net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise -> cno:
+    22:23:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,java.util.stream.IntStream) -> <init>
+    26:27:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,java.util.List) -> <init>
+    29:73:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,it.unimi.dsi.fastutil.ints.IntSortedSet) -> <init>
+    76:76:double getValue(double,double,double) -> a
+    80:92:double getValue(double,double,double,double,double,boolean) -> a
+    97:97:net.minecraft.world.level.levelgen.synth.ImprovedNoise getOctaveNoise(int) -> a
+    101:101:double wrap(double) -> a
+    106:106:double getSurfaceNoiseValue(double,double,double,double) -> a
+net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise -> cwf:
     net.minecraft.world.level.levelgen.synth.SimplexNoise[] noiseLevels -> a
     double highestFreqValueFactor -> b
     double highestFreqInputFactor -> c
-    15:16:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,int,int) -> <init>
-    18:62:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,it.unimi.dsi.fastutil.ints.IntSortedSet) -> <init>
-    65:77:double getValue(double,double,boolean) -> a
-    82:82:double getSurfaceNoiseValue(double,double,double,double) -> a
-net.minecraft.world.level.levelgen.synth.SimplexNoise -> cnp:
+    17:18:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,java.util.stream.IntStream) -> <init>
+    21:22:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,java.util.List) -> <init>
+    24:68:void <init>(net.minecraft.world.level.levelgen.WorldgenRandom,it.unimi.dsi.fastutil.ints.IntSortedSet) -> <init>
+    71:83:double getValue(double,double,boolean) -> a
+    88:88:double getSurfaceNoiseValue(double,double,double,double) -> a
+net.minecraft.world.level.levelgen.synth.SimplexNoise -> cwg:
     int[][] GRADIENT -> a
     double SQRT_3 -> e
     double F2 -> f
@@ -62475,10 +68768,10 @@ net.minecraft.world.level.levelgen.synth.SimplexNoise -> cnp:
     76:132:double getValue(double,double) -> a
     137:253:double getValue(double,double,double) -> a
     8:29:void <clinit>() -> <clinit>
-net.minecraft.world.level.levelgen.synth.SurfaceNoise -> cnq:
+net.minecraft.world.level.levelgen.synth.SurfaceNoise -> cwh:
     double getSurfaceNoiseValue(double,double,double,double) -> a
-net.minecraft.world.level.levelgen.synth.package-info -> cnr:
-net.minecraft.world.level.lighting.BlockLightEngine -> cns:
+net.minecraft.world.level.levelgen.synth.package-info -> cwi:
+net.minecraft.world.level.lighting.BlockLightEngine -> cwj:
     net.minecraft.core.Direction[] DIRECTIONS -> e
     net.minecraft.core.BlockPos$MutableBlockPos pos -> f
     17:21:void <init>(net.minecraft.world.level.chunk.LightChunkGetter) -> <init>
@@ -62488,14 +68781,14 @@ net.minecraft.world.level.lighting.BlockLightEngine -> cns:
     88:122:int getComputedLevel(long,long,int) -> a
     128:130:void onBlockEmissionIncrease(net.minecraft.core.BlockPos,int) -> a
     16:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.lighting.BlockLightSectionStorage -> cnt:
+net.minecraft.world.level.lighting.BlockLightSectionStorage -> cwk:
     12:13:void <init>(net.minecraft.world.level.chunk.LightChunkGetter) -> <init>
     17:25:int getLightValue(long) -> d
-net.minecraft.world.level.lighting.BlockLightSectionStorage$BlockDataLayerStorageMap -> cnt$a:
+net.minecraft.world.level.lighting.BlockLightSectionStorage$BlockDataLayerStorageMap -> cwk$a:
     31:32:void <init>(it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap) -> <init>
     36:36:net.minecraft.world.level.lighting.BlockLightSectionStorage$BlockDataLayerStorageMap copy() -> a
     29:29:net.minecraft.world.level.lighting.DataLayerStorageMap copy() -> b
-net.minecraft.world.level.lighting.DataLayerStorageMap -> cnu:
+net.minecraft.world.level.lighting.DataLayerStorageMap -> cwl:
     long[] lastSectionKeys -> b
     net.minecraft.world.level.chunk.DataLayer[] lastSections -> c
     boolean cacheEnabled -> d
@@ -62509,7 +68802,7 @@ net.minecraft.world.level.lighting.DataLayerStorageMap -> cnu:
     63:64:void setLayer(long,net.minecraft.world.level.chunk.DataLayer) -> a
     67:71:void clearCache() -> c
     74:75:void disableCache() -> d
-net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint -> cnv:
+net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint -> cwm:
     int levelCount -> a
     it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet[] queues -> b
     it.unimi.dsi.fastutil.longs.Long2ByteMap computedLevels -> c
@@ -62536,22 +68829,22 @@ net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint -> cnv:
     void setLevel(long,int) -> a
     int computeLevelFromNeighbor(long,long,int) -> b
     106:109:void lambda$removeIf$0(java.util.function.LongPredicate,it.unimi.dsi.fastutil.longs.LongList,long) -> a
-net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint$1 -> cnv$1:
+net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint$1 -> cwm$1:
     int val$minQueueSize -> a
     net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint this$0 -> b
     48:48:void <init>(net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint,int,float,int) -> <init>
     51:54:void rehash(int) -> rehash
-net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint$2 -> cnv$2:
+net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint$2 -> cwm$2:
     int val$minMapSize -> a
     net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint this$0 -> b
     57:57:void <init>(net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint,int,float,int) -> <init>
     60:63:void rehash(int) -> rehash
-net.minecraft.world.level.lighting.FlatDataLayer -> cnw:
+net.minecraft.world.level.lighting.FlatDataLayer -> cwn:
     9:10:void <init>() -> <init>
     14:16:void <init>(net.minecraft.world.level.chunk.DataLayer,int) -> <init>
     20:20:int getIndex(int,int,int) -> b
     25:29:byte[] getData() -> a
-net.minecraft.world.level.lighting.LayerLightEngine -> cnx:
+net.minecraft.world.level.lighting.LayerLightEngine -> cwo:
     net.minecraft.core.Direction[] DIRECTIONS -> e
     net.minecraft.world.level.chunk.LightChunkGetter chunkSource -> a
     net.minecraft.world.level.LightLayer layer -> b
@@ -62575,7 +68868,7 @@ net.minecraft.world.level.lighting.LayerLightEngine -> cnx:
     164:164:int computeLevelFromNeighbor(long,long,int) -> b
     169:169:boolean hasLightWork() -> a
     174:205:int runUpdates(int,boolean,boolean) -> a
-    209:210:void queueSectionData(long,net.minecraft.world.level.chunk.DataLayer) -> a
+    209:210:void queueSectionData(long,net.minecraft.world.level.chunk.DataLayer,boolean) -> a
     215:215:net.minecraft.world.level.chunk.DataLayer getDataLayerData(net.minecraft.core.SectionPos) -> a
     220:220:int getLightValue(net.minecraft.core.BlockPos) -> b
     224:224:java.lang.String getDebugData(long) -> b
@@ -62585,10 +68878,10 @@ net.minecraft.world.level.lighting.LayerLightEngine -> cnx:
     247:249:void enableLightSources(net.minecraft.world.level.ChunkPos,boolean) -> a
     252:254:void retainData(net.minecraft.world.level.ChunkPos,boolean) -> b
     22:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.lighting.LayerLightEventListener -> cny:
+net.minecraft.world.level.lighting.LayerLightEventListener -> cwp:
     net.minecraft.world.level.chunk.DataLayer getDataLayerData(net.minecraft.core.SectionPos) -> a
     int getLightValue(net.minecraft.core.BlockPos) -> b
-net.minecraft.world.level.lighting.LayerLightEventListener$DummyLightLayerEventListener -> cny$a:
+net.minecraft.world.level.lighting.LayerLightEventListener$DummyLightLayerEventListener -> cwp$a:
     net.minecraft.world.level.lighting.LayerLightEventListener$DummyLightLayerEventListener INSTANCE -> a
     net.minecraft.world.level.lighting.LayerLightEventListener$DummyLightLayerEventListener[] $VALUES -> b
     17:17:net.minecraft.world.level.lighting.LayerLightEventListener$DummyLightLayerEventListener[] values() -> values
@@ -62603,7 +68896,7 @@ net.minecraft.world.level.lighting.LayerLightEventListener$DummyLightLayerEventL
     51:51:void updateSectionStatus(net.minecraft.core.SectionPos,boolean) -> a
     55:55:void enableLightSources(net.minecraft.world.level.ChunkPos,boolean) -> a
     17:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.lighting.LayerLightSectionStorage -> cnz:
+net.minecraft.world.level.lighting.LayerLightSectionStorage -> cwq:
     net.minecraft.world.level.chunk.DataLayer EMPTY_DATA -> a
     net.minecraft.core.Direction[] DIRECTIONS -> k
     net.minecraft.world.level.LightLayer layer -> l
@@ -62616,38 +68909,40 @@ net.minecraft.world.level.lighting.LayerLightSectionStorage -> cnz:
     it.unimi.dsi.fastutil.longs.LongSet changedSections -> g
     it.unimi.dsi.fastutil.longs.LongSet sectionsAffectedByLightUpdates -> h
     it.unimi.dsi.fastutil.longs.Long2ObjectMap queuedSections -> i
-    it.unimi.dsi.fastutil.longs.LongSet columnsToRetainQueuedDataFor -> n
-    it.unimi.dsi.fastutil.longs.LongSet toRemove -> o
+    it.unimi.dsi.fastutil.longs.LongSet untrustedSections -> n
+    it.unimi.dsi.fastutil.longs.LongSet columnsToRetainQueuedDataFor -> o
+    it.unimi.dsi.fastutil.longs.LongSet toRemove -> p
     boolean hasToRemove -> j
-    32:60:void <init>(net.minecraft.world.level.LightLayer,net.minecraft.world.level.chunk.LightChunkGetter,net.minecraft.world.level.lighting.DataLayerStorageMap) -> <init>
-    63:63:boolean storingLightForSection(long) -> g
-    68:68:net.minecraft.world.level.chunk.DataLayer getDataLayer(long,boolean) -> a
-    73:73:net.minecraft.world.level.chunk.DataLayer getDataLayer(net.minecraft.world.level.lighting.DataLayerStorageMap,long) -> a
-    78:82:net.minecraft.world.level.chunk.DataLayer getDataLayerData(long) -> h
+    32:62:void <init>(net.minecraft.world.level.LightLayer,net.minecraft.world.level.chunk.LightChunkGetter,net.minecraft.world.level.lighting.DataLayerStorageMap) -> <init>
+    65:65:boolean storingLightForSection(long) -> g
+    70:70:net.minecraft.world.level.chunk.DataLayer getDataLayer(long,boolean) -> a
+    75:75:net.minecraft.world.level.chunk.DataLayer getDataLayer(net.minecraft.world.level.lighting.DataLayerStorageMap,long) -> a
+    80:84:net.minecraft.world.level.chunk.DataLayer getDataLayerData(long) -> h
     int getLightValue(long) -> d
-    92:97:int getStoredLevel(long) -> i
-    104:122:void setStoredLevel(long,int) -> b
-    126:135:int getLevel(long) -> c
-    140:146:int getLevelFromSource(long) -> b
-    151:180:void setLevel(long,int) -> a
-    183:187:net.minecraft.world.level.chunk.DataLayer createDataLayer(long) -> j
-    191:207:void clearQueuedSectionBlocks(net.minecraft.world.level.lighting.LayerLightEngine,long) -> a
-    210:210:boolean hasInconsistencies() -> a
-    215:318:void markNewInconsistencies(net.minecraft.world.level.lighting.LayerLightEngine,boolean,boolean) -> a
-    321:321:void onNodeAdded(long) -> k
-    324:324:void onNodeRemoved(long) -> l
-    327:327:void enableLightSources(long,boolean) -> b
-    330:335:void retainData(long,boolean) -> c
-    338:343:void queueSectionData(long,net.minecraft.world.level.chunk.DataLayer) -> a
-    346:355:void updateSectionStatus(long,boolean) -> d
-    358:361:void runAllUpdates() -> d
-    364:378:void swapSectionMap() -> e
-    192:192:boolean lambda$clearQueuedSectionBlocks$0(long,long) -> a
+    94:99:int getStoredLevel(long) -> i
+    106:124:void setStoredLevel(long,int) -> b
+    128:137:int getLevel(long) -> c
+    142:148:int getLevelFromSource(long) -> b
+    153:182:void setLevel(long,int) -> a
+    185:189:net.minecraft.world.level.chunk.DataLayer createDataLayer(long) -> j
+    193:209:void clearQueuedSectionBlocks(net.minecraft.world.level.lighting.LayerLightEngine,long) -> a
+    212:212:boolean hasInconsistencies() -> a
+    217:275:void markNewInconsistencies(net.minecraft.world.level.lighting.LayerLightEngine,boolean,boolean) -> a
+    278:329:void checkEdgesForSection(net.minecraft.world.level.lighting.LayerLightEngine,long) -> b
+    332:332:void onNodeAdded(long) -> k
+    335:335:void onNodeRemoved(long) -> l
+    338:338:void enableLightSources(long,boolean) -> b
+    341:346:void retainData(long,boolean) -> c
+    349:357:void queueSectionData(long,net.minecraft.world.level.chunk.DataLayer,boolean) -> a
+    360:369:void updateSectionStatus(long,boolean) -> d
+    372:375:void runAllUpdates() -> d
+    378:392:void swapSectionMap() -> e
+    194:194:boolean lambda$clearQueuedSectionBlocks$0(long,long) -> a
     25:26:void <clinit>() -> <clinit>
-net.minecraft.world.level.lighting.LayerLightSectionStorage$1 -> cnz$1:
+net.minecraft.world.level.lighting.LayerLightSectionStorage$1 -> cwq$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
-    275:275:void <clinit>() -> <clinit>
-net.minecraft.world.level.lighting.LevelLightEngine -> coa:
+    296:296:void <clinit>() -> <clinit>
+net.minecraft.world.level.lighting.LevelLightEngine -> cwr:
     net.minecraft.world.level.lighting.LayerLightEngine blockEngine -> a
     net.minecraft.world.level.lighting.LayerLightEngine skyEngine -> b
     21:24:void <init>(net.minecraft.world.level.chunk.LightChunkGetter,boolean,boolean) -> <init>
@@ -62659,10 +68954,10 @@ net.minecraft.world.level.lighting.LevelLightEngine -> coa:
     94:100:void enableLightSources(net.minecraft.world.level.ChunkPos,boolean) -> a
     103:112:net.minecraft.world.level.lighting.LayerLightEventListener getLayerListener(net.minecraft.world.level.LightLayer) -> a
     117:126:java.lang.String getDebugData(net.minecraft.world.level.LightLayer,net.minecraft.core.SectionPos) -> a
-    134:143:void queueSectionData(net.minecraft.world.level.LightLayer,net.minecraft.core.SectionPos,net.minecraft.world.level.chunk.DataLayer) -> a
+    134:143:void queueSectionData(net.minecraft.world.level.LightLayer,net.minecraft.core.SectionPos,net.minecraft.world.level.chunk.DataLayer,boolean) -> a
     146:152:void retainData(net.minecraft.world.level.ChunkPos,boolean) -> b
     155:158:int getRawBrightness(net.minecraft.core.BlockPos,int) -> b
-net.minecraft.world.level.lighting.LightEventListener -> cob:
+net.minecraft.world.level.lighting.LightEventListener -> cws:
     void checkBlock(net.minecraft.core.BlockPos) -> a
     void onBlockEmissionIncrease(net.minecraft.core.BlockPos,int) -> a
     boolean hasLightWork() -> a
@@ -62670,7 +68965,7 @@ net.minecraft.world.level.lighting.LightEventListener -> cob:
     17:18:void updateSectionStatus(net.minecraft.core.BlockPos,boolean) -> a
     void updateSectionStatus(net.minecraft.core.SectionPos,boolean) -> a
     void enableLightSources(net.minecraft.world.level.ChunkPos,boolean) -> a
-net.minecraft.world.level.lighting.SkyLightEngine -> coc:
+net.minecraft.world.level.lighting.SkyLightEngine -> cwt:
     net.minecraft.core.Direction[] DIRECTIONS -> e
     net.minecraft.core.Direction[] HORIZONTALS -> f
     19:20:void <init>(net.minecraft.world.level.chunk.LightChunkGetter) -> <init>
@@ -62680,7 +68975,7 @@ net.minecraft.world.level.lighting.SkyLightEngine -> coc:
     214:228:void checkNode(long) -> f
     232:232:java.lang.String getDebugData(long) -> b
     15:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.lighting.SkyLightSectionStorage -> cod:
+net.minecraft.world.level.lighting.SkyLightSectionStorage -> cwu:
     net.minecraft.core.Direction[] HORIZONTALS -> k
     it.unimi.dsi.fastutil.longs.LongSet sectionsWithSources -> l
     it.unimi.dsi.fastutil.longs.LongSet sectionsToAddSourcesTo -> m
@@ -62703,10 +68998,10 @@ net.minecraft.world.level.lighting.SkyLightSectionStorage -> cod:
     300:302:boolean isAboveData(long) -> n
     306:307:boolean lightOnInSection(long) -> o
     17:17:void <clinit>() -> <clinit>
-net.minecraft.world.level.lighting.SkyLightSectionStorage$1 -> cod$1:
+net.minecraft.world.level.lighting.SkyLightSectionStorage$1 -> cwu$1:
     int[] $SwitchMap$net$minecraft$core$Direction -> a
     201:201:void <clinit>() -> <clinit>
-net.minecraft.world.level.lighting.SkyLightSectionStorage$SkyDataLayerStorageMap -> cod$a:
+net.minecraft.world.level.lighting.SkyLightSectionStorage$SkyDataLayerStorageMap -> cwu$a:
     int currentLowestY -> b
     it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap topSections -> c
     318:322:void <init>(it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap,it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap,int) -> <init>
@@ -62715,7 +69010,7 @@ net.minecraft.world.level.lighting.SkyLightSectionStorage$SkyDataLayerStorageMap
     310:310:it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap access$000(net.minecraft.world.level.lighting.SkyLightSectionStorage$SkyDataLayerStorageMap) -> a
     310:310:int access$100(net.minecraft.world.level.lighting.SkyLightSectionStorage$SkyDataLayerStorageMap) -> b
     310:310:int access$102(net.minecraft.world.level.lighting.SkyLightSectionStorage$SkyDataLayerStorageMap,int) -> a
-net.minecraft.world.level.lighting.SpatialLongSet -> coe:
+net.minecraft.world.level.lighting.SpatialLongSet -> cwv:
     net.minecraft.world.level.lighting.SpatialLongSet$InternalMap map -> a
     15:17:void <init>(int,float) -> <init>
     197:197:boolean add(long) -> add
@@ -62723,7 +69018,7 @@ net.minecraft.world.level.lighting.SpatialLongSet -> coe:
     207:207:long removeFirstLong() -> removeFirstLong
     212:212:int size() -> size
     217:217:boolean isEmpty() -> isEmpty
-net.minecraft.world.level.lighting.SpatialLongSet$InternalMap -> coe$a:
+net.minecraft.world.level.lighting.SpatialLongSet$InternalMap -> cwv$a:
     int X_BITS -> a
     int Z_BITS -> b
     int Y_BITS -> c
@@ -62745,8 +69040,8 @@ net.minecraft.world.level.lighting.SpatialLongSet$InternalMap -> coe$a:
     173:184:long removeFirstBit() -> a
     189:192:void rehash(int) -> rehash
     20:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.lighting.package-info -> cof:
-net.minecraft.world.level.material.EmptyFluid -> cog:
+net.minecraft.world.level.lighting.package-info -> cww:
+net.minecraft.world.level.material.EmptyFluid -> cwx:
     15:15:void <init>() -> <init>
     19:19:net.minecraft.world.item.Item getBucket() -> a
     24:24:boolean canBeReplacedWith(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.Fluid,net.minecraft.core.Direction) -> a
@@ -62760,57 +69055,57 @@ net.minecraft.world.level.material.EmptyFluid -> cog:
     64:64:boolean isSource(net.minecraft.world.level.material.FluidState) -> c
     69:69:int getAmount(net.minecraft.world.level.material.FluidState) -> d
     74:74:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-net.minecraft.world.level.material.FlowingFluid -> coh:
+net.minecraft.world.level.material.FlowingFluid -> cwy:
     net.minecraft.world.level.block.state.properties.BooleanProperty FALLING -> a
     net.minecraft.world.level.block.state.properties.IntegerProperty LEVEL -> b
     java.lang.ThreadLocal OCCLUSION_CACHE -> e
     java.util.Map shapes -> f
     32:47:void <init>() -> <init>
     51:52:void createFluidStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    56:101:net.minecraft.world.phys.Vec3 getFlow(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState) -> a
-    105:105:boolean affectsFlow(net.minecraft.world.level.material.FluidState) -> g
-    109:121:boolean isSolidFace(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
-    125:143:void spread(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState) -> a
-    146:164:void spreadToSides(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,net.minecraft.world.level.block.state.BlockState) -> a
-    167:206:net.minecraft.world.level.material.FluidState getNewLiquid(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    211:238:boolean canPassThroughWall(net.minecraft.core.Direction,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    56:100:net.minecraft.world.phys.Vec3 getFlow(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState) -> a
+    104:104:boolean affectsFlow(net.minecraft.world.level.material.FluidState) -> g
+    108:120:boolean isSolidFace(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.core.Direction) -> a
+    124:142:void spread(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState) -> a
+    145:163:void spreadToSides(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,net.minecraft.world.level.block.state.BlockState) -> a
+    166:205:net.minecraft.world.level.material.FluidState getNewLiquid(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    210:237:boolean canPassThroughWall(net.minecraft.core.Direction,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
     net.minecraft.world.level.material.Fluid getFlowing() -> d
-    244:244:net.minecraft.world.level.material.FluidState getFlowing(int,boolean) -> a
+    243:243:net.minecraft.world.level.material.FluidState getFlowing(int,boolean) -> a
     net.minecraft.world.level.material.Fluid getSource() -> e
-    250:250:net.minecraft.world.level.material.FluidState getSource(boolean) -> a
+    249:249:net.minecraft.world.level.material.FluidState getSource(boolean) -> a
     boolean canConvertToSource() -> f
-    256:264:void spreadTo(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.material.FluidState) -> a
+    255:263:void spreadTo(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.material.FluidState) -> a
     void beforeDestroyingBlock(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    269:271:short getCacheKey(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
-    275:313:int getSlopeDistance(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,it.unimi.dsi.fastutil.shorts.Short2ObjectMap,it.unimi.dsi.fastutil.shorts.Short2BooleanMap) -> a
-    317:325:boolean isWaterHole(net.minecraft.world.level.BlockGetter,net.minecraft.world.level.material.Fluid,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    329:331:boolean canPassThrough(net.minecraft.world.level.BlockGetter,net.minecraft.world.level.material.Fluid,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
-    335:335:boolean isSourceBlockOfThisType(net.minecraft.world.level.material.FluidState) -> h
+    268:270:short getCacheKey(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> a
+    274:312:int getSlopeDistance(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int,net.minecraft.core.Direction,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,it.unimi.dsi.fastutil.shorts.Short2ObjectMap,it.unimi.dsi.fastutil.shorts.Short2BooleanMap) -> a
+    316:324:boolean isWaterHole(net.minecraft.world.level.BlockGetter,net.minecraft.world.level.material.Fluid,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    328:330:boolean canPassThrough(net.minecraft.world.level.BlockGetter,net.minecraft.world.level.material.Fluid,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState) -> a
+    334:334:boolean isSourceBlockOfThisType(net.minecraft.world.level.material.FluidState) -> h
     int getSlopeFindDistance(net.minecraft.world.level.LevelReader) -> b
-    341:351:int sourceNeighborCount(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    355:403:java.util.Map getSpread(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
-    407:426:boolean canHoldFluid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
-    430:432:boolean canSpreadTo(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState,net.minecraft.world.level.material.Fluid) -> a
+    340:350:int sourceNeighborCount(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    354:402:java.util.Map getSpread(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> b
+    406:425:boolean canHoldFluid(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.Fluid) -> a
+    429:431:boolean canSpreadTo(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.material.FluidState,net.minecraft.world.level.material.Fluid) -> a
     int getDropOff(net.minecraft.world.level.LevelReader) -> c
-    438:438:int getSpreadDelay(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,net.minecraft.world.level.material.FluidState) -> a
-    443:460:void tick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState) -> a
-    463:466:int getLegacyLevel(net.minecraft.world.level.material.FluidState) -> e
-    471:471:boolean hasSameAbove(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
-    476:479:float getHeight(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    484:484:float getOwnHeight(net.minecraft.world.level.material.FluidState) -> a
+    437:437:int getSpreadDelay(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,net.minecraft.world.level.material.FluidState) -> a
+    442:459:void tick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState) -> a
+    462:465:int getLegacyLevel(net.minecraft.world.level.material.FluidState) -> e
+    470:470:boolean hasSameAbove(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    475:478:float getHeight(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    483:483:float getOwnHeight(net.minecraft.world.level.material.FluidState) -> a
     int getAmount(net.minecraft.world.level.material.FluidState) -> d
-    492:496:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    496:496:net.minecraft.world.phys.shapes.VoxelShape lambda$getShape$5(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState) -> b
-    381:383:boolean lambda$getSpread$4(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
-    367:368:com.mojang.datafixers.util.Pair lambda$getSpread$3(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int) -> a
-    297:299:boolean lambda$getSlopeDistance$2(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader,net.minecraft.world.level.block.state.BlockState,int) -> a
-    287:288:com.mojang.datafixers.util.Pair lambda$getSlopeDistance$1(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int) -> b
+    491:495:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    495:495:net.minecraft.world.phys.shapes.VoxelShape lambda$getShape$5(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState) -> b
+    380:382:boolean lambda$getSpread$4(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,int) -> a
+    366:367:com.mojang.datafixers.util.Pair lambda$getSpread$3(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int) -> a
+    296:298:boolean lambda$getSlopeDistance$2(net.minecraft.core.BlockPos,net.minecraft.world.level.LevelReader,net.minecraft.world.level.block.state.BlockState,int) -> a
+    286:287:com.mojang.datafixers.util.Pair lambda$getSlopeDistance$1(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos,int) -> b
     38:44:it.unimi.dsi.fastutil.objects.Object2ByteLinkedOpenHashMap lambda$static$0() -> k
     33:37:void <clinit>() -> <clinit>
-net.minecraft.world.level.material.FlowingFluid$1 -> coh$1:
+net.minecraft.world.level.material.FlowingFluid$1 -> cwy$1:
     38:38:void <init>(int) -> <init>
     41:41:void rehash(int) -> rehash
-net.minecraft.world.level.material.Fluid -> coi:
+net.minecraft.world.level.material.Fluid -> cwz:
     net.minecraft.core.IdMapper FLUID_STATE_REGISTRY -> c
     net.minecraft.world.level.block.state.StateDefinition stateDefinition -> d
     net.minecraft.world.level.material.FluidState defaultFluidState -> a
@@ -62839,34 +69134,29 @@ net.minecraft.world.level.material.Fluid -> coi:
     95:95:boolean is(net.minecraft.tags.Tag) -> a
     net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
     21:21:void <clinit>() -> <clinit>
-net.minecraft.world.level.material.FluidState -> coj:
-    net.minecraft.world.level.material.Fluid getType() -> c
-    36:36:boolean isSource() -> d
-    40:40:boolean isEmpty() -> e
-    44:44:float getHeight(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    48:48:float getOwnHeight() -> f
-    52:52:int getAmount() -> g
-    56:65:boolean shouldRenderBackwardUpFace(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-    69:70:void tick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
-    73:74:void animateTick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
-    77:77:boolean isRandomlyTicking() -> h
-    81:82:void randomTick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> b
-    85:85:net.minecraft.world.phys.Vec3 getFlow(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
-    89:89:net.minecraft.world.level.block.state.BlockState createLegacyBlock() -> i
-    94:94:net.minecraft.core.particles.ParticleOptions getDripParticle() -> j
-    98:98:boolean is(net.minecraft.tags.Tag) -> a
-    102:102:float getExplosionResistance() -> k
-    106:106:boolean canBeReplacedWith(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.Fluid,net.minecraft.core.Direction) -> a
-    110:127:com.mojang.datafixers.Dynamic serialize(com.mojang.datafixers.types.DynamicOps,net.minecraft.world.level.material.FluidState) -> a
-    131:144:net.minecraft.world.level.material.FluidState deserialize(com.mojang.datafixers.Dynamic) -> a
-    148:148:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
-    132:132:java.lang.String lambda$deserialize$2(com.mojang.datafixers.Dynamic) -> b
-    132:132:java.lang.String lambda$deserialize$1(com.mojang.datafixers.Dynamic) -> c
-    122:122:com.mojang.datafixers.util.Pair lambda$serialize$0(com.mojang.datafixers.types.DynamicOps,java.util.Map$Entry) -> a
-net.minecraft.world.level.material.FluidStateImpl -> cok:
-    9:10:void <init>(net.minecraft.world.level.material.Fluid,com.google.common.collect.ImmutableMap) -> <init>
-    14:14:net.minecraft.world.level.material.Fluid getType() -> c
-net.minecraft.world.level.material.Fluids -> col:
+net.minecraft.world.level.material.FluidState -> cxa:
+    com.mojang.serialization.Codec CODEC -> a
+    28:29:void <init>(net.minecraft.world.level.material.Fluid,com.google.common.collect.ImmutableMap,com.mojang.serialization.MapCodec) -> <init>
+    35:35:net.minecraft.world.level.material.Fluid getType() -> a
+    39:39:boolean isSource() -> b
+    43:43:boolean isEmpty() -> c
+    47:47:float getHeight(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    51:51:float getOwnHeight() -> d
+    55:55:int getAmount() -> e
+    59:68:boolean shouldRenderBackwardUpFace(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    72:73:void tick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos) -> a
+    76:77:void animateTick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> a
+    80:80:boolean isRandomlyTicking() -> f
+    84:85:void randomTick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,java.util.Random) -> b
+    88:88:net.minecraft.world.phys.Vec3 getFlow(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> c
+    92:92:net.minecraft.world.level.block.state.BlockState createLegacyBlock() -> g
+    97:97:net.minecraft.core.particles.ParticleOptions getDripParticle() -> h
+    101:101:boolean is(net.minecraft.tags.Tag) -> a
+    105:105:float getExplosionResistance() -> i
+    109:109:boolean canBeReplacedWith(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.Fluid,net.minecraft.core.Direction) -> a
+    113:113:net.minecraft.world.phys.shapes.VoxelShape getShape(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> d
+    23:23:void <clinit>() -> <clinit>
+net.minecraft.world.level.material.Fluids -> cxb:
     net.minecraft.world.level.material.Fluid EMPTY -> a
     net.minecraft.world.level.material.FlowingFluid FLOWING_WATER -> b
     net.minecraft.world.level.material.FlowingFluid WATER -> c
@@ -62875,39 +69165,39 @@ net.minecraft.world.level.material.Fluids -> col:
     5:5:void <init>() -> <init>
     13:13:net.minecraft.world.level.material.Fluid register(java.lang.String,net.minecraft.world.level.material.Fluid) -> a
     6:22:void <clinit>() -> <clinit>
-net.minecraft.world.level.material.LavaFluid -> com:
-    27:27:void <init>() -> <init>
-    33:33:net.minecraft.world.level.material.Fluid getFlowing() -> d
-    38:38:net.minecraft.world.level.material.Fluid getSource() -> e
-    43:43:net.minecraft.world.item.Item getBucket() -> a
-    48:62:void animateTick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,java.util.Random) -> a
-    66:100:void randomTick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,java.util.Random) -> b
-    103:108:boolean hasFlammableNeighbours(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
-    112:115:boolean isFlammable(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> b
-    121:121:net.minecraft.core.particles.ParticleOptions getDripParticle() -> i
-    126:127:void beforeDestroyingBlock(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
-    131:131:int getSlopeFindDistance(net.minecraft.world.level.LevelReader) -> b
-    136:136:net.minecraft.world.level.block.state.BlockState createLegacyBlock(net.minecraft.world.level.material.FluidState) -> b
-    141:141:boolean isSame(net.minecraft.world.level.material.Fluid) -> a
-    146:146:int getDropOff(net.minecraft.world.level.LevelReader) -> c
-    151:151:boolean canBeReplacedWith(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.Fluid,net.minecraft.core.Direction) -> a
-    156:156:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
-    161:166:int getSpreadDelay(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,net.minecraft.world.level.material.FluidState) -> a
-    170:171:void fizz(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    175:175:boolean canConvertToSource() -> f
-    180:192:void spreadTo(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.material.FluidState) -> a
-    196:196:boolean isRandomlyTicking() -> j
-    201:201:float getExplosionResistance() -> c
-net.minecraft.world.level.material.LavaFluid$Flowing -> com$a:
-    216:216:void <init>() -> <init>
-    219:221:void createFluidStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
-    225:225:int getAmount(net.minecraft.world.level.material.FluidState) -> d
-    230:230:boolean isSource(net.minecraft.world.level.material.FluidState) -> c
-net.minecraft.world.level.material.LavaFluid$Source -> com$b:
-    204:204:void <init>() -> <init>
-    207:207:int getAmount(net.minecraft.world.level.material.FluidState) -> d
-    212:212:boolean isSource(net.minecraft.world.level.material.FluidState) -> c
-net.minecraft.world.level.material.Material -> coo:
+net.minecraft.world.level.material.LavaFluid -> cxc:
+    28:28:void <init>() -> <init>
+    34:34:net.minecraft.world.level.material.Fluid getFlowing() -> d
+    39:39:net.minecraft.world.level.material.Fluid getSource() -> e
+    44:44:net.minecraft.world.item.Item getBucket() -> a
+    49:63:void animateTick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,java.util.Random) -> a
+    67:101:void randomTick(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,java.util.Random) -> b
+    104:109:boolean hasFlammableNeighbours(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> a
+    113:116:boolean isFlammable(net.minecraft.world.level.LevelReader,net.minecraft.core.BlockPos) -> b
+    122:122:net.minecraft.core.particles.ParticleOptions getDripParticle() -> i
+    127:128:void beforeDestroyingBlock(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState) -> a
+    132:132:int getSlopeFindDistance(net.minecraft.world.level.LevelReader) -> b
+    137:137:net.minecraft.world.level.block.state.BlockState createLegacyBlock(net.minecraft.world.level.material.FluidState) -> b
+    142:142:boolean isSame(net.minecraft.world.level.material.Fluid) -> a
+    147:147:int getDropOff(net.minecraft.world.level.LevelReader) -> c
+    152:152:boolean canBeReplacedWith(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.Fluid,net.minecraft.core.Direction) -> a
+    157:157:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
+    162:167:int getSpreadDelay(net.minecraft.world.level.Level,net.minecraft.core.BlockPos,net.minecraft.world.level.material.FluidState,net.minecraft.world.level.material.FluidState) -> a
+    171:172:void fizz(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    176:176:boolean canConvertToSource() -> f
+    181:193:void spreadTo(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos,net.minecraft.world.level.block.state.BlockState,net.minecraft.core.Direction,net.minecraft.world.level.material.FluidState) -> a
+    197:197:boolean isRandomlyTicking() -> j
+    202:202:float getExplosionResistance() -> c
+net.minecraft.world.level.material.LavaFluid$Flowing -> cxc$a:
+    217:217:void <init>() -> <init>
+    220:222:void createFluidStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
+    226:226:int getAmount(net.minecraft.world.level.material.FluidState) -> d
+    231:231:boolean isSource(net.minecraft.world.level.material.FluidState) -> c
+net.minecraft.world.level.material.LavaFluid$Source -> cxc$b:
+    205:205:void <init>() -> <init>
+    208:208:int getAmount(net.minecraft.world.level.material.FluidState) -> d
+    213:213:boolean isSource(net.minecraft.world.level.material.FluidState) -> c
+net.minecraft.world.level.material.Material -> cxd:
     net.minecraft.world.level.material.Material AIR -> a
     net.minecraft.world.level.material.Material STRUCTURAL_AIR -> b
     net.minecraft.world.level.material.Material PORTAL -> c
@@ -62932,67 +69222,64 @@ net.minecraft.world.level.material.Material -> coo:
     net.minecraft.world.level.material.Material SPONGE -> v
     net.minecraft.world.level.material.Material SHULKER_SHELL -> w
     net.minecraft.world.level.material.Material WOOD -> x
-    net.minecraft.world.level.material.Material BAMBOO_SAPLING -> y
-    net.minecraft.world.level.material.Material BAMBOO -> z
-    net.minecraft.world.level.material.Material WOOL -> A
-    net.minecraft.world.level.material.Material EXPLOSIVE -> B
-    net.minecraft.world.level.material.Material LEAVES -> C
-    net.minecraft.world.level.material.Material GLASS -> D
-    net.minecraft.world.level.material.Material ICE -> E
-    net.minecraft.world.level.material.Material CACTUS -> F
-    net.minecraft.world.level.material.Material STONE -> G
-    net.minecraft.world.level.material.Material METAL -> H
-    net.minecraft.world.level.material.Material SNOW -> I
-    net.minecraft.world.level.material.Material HEAVY_METAL -> J
-    net.minecraft.world.level.material.Material BARRIER -> K
-    net.minecraft.world.level.material.Material PISTON -> L
-    net.minecraft.world.level.material.Material CORAL -> M
-    net.minecraft.world.level.material.Material VEGETABLE -> N
-    net.minecraft.world.level.material.Material EGG -> O
-    net.minecraft.world.level.material.Material CAKE -> P
-    net.minecraft.world.level.material.MaterialColor color -> Q
-    net.minecraft.world.level.material.PushReaction pushReaction -> R
-    boolean blocksMotion -> S
-    boolean flammable -> T
-    boolean alwaysDestroyable -> U
+    net.minecraft.world.level.material.Material NETHER_WOOD -> y
+    net.minecraft.world.level.material.Material BAMBOO_SAPLING -> z
+    net.minecraft.world.level.material.Material BAMBOO -> A
+    net.minecraft.world.level.material.Material WOOL -> B
+    net.minecraft.world.level.material.Material EXPLOSIVE -> C
+    net.minecraft.world.level.material.Material LEAVES -> D
+    net.minecraft.world.level.material.Material GLASS -> E
+    net.minecraft.world.level.material.Material ICE -> F
+    net.minecraft.world.level.material.Material CACTUS -> G
+    net.minecraft.world.level.material.Material STONE -> H
+    net.minecraft.world.level.material.Material METAL -> I
+    net.minecraft.world.level.material.Material SNOW -> J
+    net.minecraft.world.level.material.Material HEAVY_METAL -> K
+    net.minecraft.world.level.material.Material BARRIER -> L
+    net.minecraft.world.level.material.Material PISTON -> M
+    net.minecraft.world.level.material.Material CORAL -> N
+    net.minecraft.world.level.material.Material VEGETABLE -> O
+    net.minecraft.world.level.material.Material EGG -> P
+    net.minecraft.world.level.material.Material CAKE -> Q
+    net.minecraft.world.level.material.MaterialColor color -> R
+    net.minecraft.world.level.material.PushReaction pushReaction -> S
+    boolean blocksMotion -> T
+    boolean flammable -> U
     boolean liquid -> V
     boolean solidBlocking -> W
     boolean replaceable -> X
     boolean solid -> Y
-    63:73:void <init>(net.minecraft.world.level.material.MaterialColor,boolean,boolean,boolean,boolean,boolean,boolean,boolean,net.minecraft.world.level.material.PushReaction) -> <init>
-    76:76:boolean isLiquid() -> a
-    80:80:boolean isSolid() -> b
-    84:84:boolean blocksMotion() -> c
-    89:89:boolean isFlammable() -> d
-    93:93:boolean isReplaceable() -> e
-    97:97:boolean isSolidBlocking() -> f
-    103:103:boolean isAlwaysDestroyable() -> g
-    107:107:net.minecraft.world.level.material.PushReaction getPushReaction() -> h
-    111:111:net.minecraft.world.level.material.MaterialColor getColor() -> i
-    4:51:void <clinit>() -> <clinit>
-net.minecraft.world.level.material.Material$Builder -> coo$a:
+    63:72:void <init>(net.minecraft.world.level.material.MaterialColor,boolean,boolean,boolean,boolean,boolean,boolean,net.minecraft.world.level.material.PushReaction) -> <init>
+    75:75:boolean isLiquid() -> a
+    79:79:boolean isSolid() -> b
+    83:83:boolean blocksMotion() -> c
+    88:88:boolean isFlammable() -> d
+    92:92:boolean isReplaceable() -> e
+    96:96:boolean isSolidBlocking() -> f
+    100:100:net.minecraft.world.level.material.PushReaction getPushReaction() -> g
+    104:104:net.minecraft.world.level.material.MaterialColor getColor() -> h
+    4:52:void <clinit>() -> <clinit>
+net.minecraft.world.level.material.Material$Builder -> cxd$a:
     net.minecraft.world.level.material.PushReaction pushReaction -> a
     boolean blocksMotion -> b
     boolean flammable -> c
-    boolean isAlwaysDestroyable -> d
-    boolean liquid -> e
-    boolean replaceable -> f
-    boolean solid -> g
-    net.minecraft.world.level.material.MaterialColor color -> h
-    boolean solidBlocking -> i
-    115:127:void <init>(net.minecraft.world.level.material.MaterialColor) -> <init>
-    130:131:net.minecraft.world.level.material.Material$Builder liquid() -> a
-    135:136:net.minecraft.world.level.material.Material$Builder nonSolid() -> b
-    140:141:net.minecraft.world.level.material.Material$Builder noCollider() -> c
-    145:146:net.minecraft.world.level.material.Material$Builder notSolidBlocking() -> j
-    150:151:net.minecraft.world.level.material.Material$Builder notAlwaysDestroyable() -> d
-    155:156:net.minecraft.world.level.material.Material$Builder flammable() -> e
-    160:161:net.minecraft.world.level.material.Material$Builder replaceable() -> f
-    165:166:net.minecraft.world.level.material.Material$Builder destroyOnPush() -> g
-    170:171:net.minecraft.world.level.material.Material$Builder notPushable() -> h
-    175:175:net.minecraft.world.level.material.Material build() -> i
-    114:114:net.minecraft.world.level.material.Material$Builder access$000(net.minecraft.world.level.material.Material$Builder) -> a
-net.minecraft.world.level.material.MaterialColor -> cop:
+    boolean liquid -> d
+    boolean replaceable -> e
+    boolean solid -> f
+    net.minecraft.world.level.material.MaterialColor color -> g
+    boolean solidBlocking -> h
+    108:119:void <init>(net.minecraft.world.level.material.MaterialColor) -> <init>
+    122:123:net.minecraft.world.level.material.Material$Builder liquid() -> a
+    127:128:net.minecraft.world.level.material.Material$Builder nonSolid() -> b
+    132:133:net.minecraft.world.level.material.Material$Builder noCollider() -> c
+    137:138:net.minecraft.world.level.material.Material$Builder notSolidBlocking() -> i
+    142:143:net.minecraft.world.level.material.Material$Builder flammable() -> d
+    147:148:net.minecraft.world.level.material.Material$Builder replaceable() -> e
+    152:153:net.minecraft.world.level.material.Material$Builder destroyOnPush() -> f
+    157:158:net.minecraft.world.level.material.Material$Builder notPushable() -> g
+    162:162:net.minecraft.world.level.material.Material build() -> h
+    107:107:net.minecraft.world.level.material.Material$Builder access$000(net.minecraft.world.level.material.Material$Builder) -> a
+net.minecraft.world.level.material.MaterialColor -> cxe:
     net.minecraft.world.level.material.MaterialColor[] MATERIAL_COLORS -> a
     net.minecraft.world.level.material.MaterialColor NONE -> b
     net.minecraft.world.level.material.MaterialColor GRASS -> c
@@ -63046,12 +69333,19 @@ net.minecraft.world.level.material.MaterialColor -> cop:
     net.minecraft.world.level.material.MaterialColor TERRACOTTA_GREEN -> Y
     net.minecraft.world.level.material.MaterialColor TERRACOTTA_RED -> Z
     net.minecraft.world.level.material.MaterialColor TERRACOTTA_BLACK -> aa
-    int col -> ab
-    int id -> ac
-    63:70:void <init>(int,int) -> <init>
-    73:91:int calculateRGBColor(int) -> a
-    4:58:void <clinit>() -> <clinit>
-net.minecraft.world.level.material.PushReaction -> coq:
+    net.minecraft.world.level.material.MaterialColor CRIMSON_NYLIUM -> ab
+    net.minecraft.world.level.material.MaterialColor CRIMSON_STEM -> ac
+    net.minecraft.world.level.material.MaterialColor CRIMSON_HYPHAE -> ad
+    net.minecraft.world.level.material.MaterialColor WARPED_NYLIUM -> ae
+    net.minecraft.world.level.material.MaterialColor WARPED_STEM -> af
+    net.minecraft.world.level.material.MaterialColor WARPED_HYPHAE -> ag
+    net.minecraft.world.level.material.MaterialColor WARPED_WART_BLOCK -> ah
+    int col -> ai
+    int id -> aj
+    71:78:void <init>(int,int) -> <init>
+    81:99:int calculateRGBColor(int) -> a
+    4:66:void <clinit>() -> <clinit>
+net.minecraft.world.level.material.PushReaction -> cxf:
     net.minecraft.world.level.material.PushReaction NORMAL -> a
     net.minecraft.world.level.material.PushReaction DESTROY -> b
     net.minecraft.world.level.material.PushReaction BLOCK -> c
@@ -63062,7 +69356,7 @@ net.minecraft.world.level.material.PushReaction -> coq:
     3:3:net.minecraft.world.level.material.PushReaction valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:4:void <clinit>() -> <clinit>
-net.minecraft.world.level.material.WaterFluid -> cor:
+net.minecraft.world.level.material.WaterFluid -> cxg:
     26:26:void <init>() -> <init>
     29:29:net.minecraft.world.level.material.Fluid getFlowing() -> d
     34:34:net.minecraft.world.level.material.Fluid getSource() -> e
@@ -63078,29 +69372,29 @@ net.minecraft.world.level.material.WaterFluid -> cor:
     92:92:int getTickDelay(net.minecraft.world.level.LevelReader) -> a
     97:97:boolean canBeReplacedWith(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos,net.minecraft.world.level.material.Fluid,net.minecraft.core.Direction) -> a
     102:102:float getExplosionResistance() -> c
-net.minecraft.world.level.material.WaterFluid$Flowing -> cor$a:
+net.minecraft.world.level.material.WaterFluid$Flowing -> cxg$a:
     117:117:void <init>() -> <init>
     120:122:void createFluidStateDefinition(net.minecraft.world.level.block.state.StateDefinition$Builder) -> a
     126:126:int getAmount(net.minecraft.world.level.material.FluidState) -> d
     131:131:boolean isSource(net.minecraft.world.level.material.FluidState) -> c
-net.minecraft.world.level.material.WaterFluid$Source -> cor$b:
+net.minecraft.world.level.material.WaterFluid$Source -> cxg$b:
     105:105:void <init>() -> <init>
     108:108:int getAmount(net.minecraft.world.level.material.FluidState) -> d
     113:113:boolean isSource(net.minecraft.world.level.material.FluidState) -> c
-net.minecraft.world.level.material.package-info -> cos:
-net.minecraft.world.level.newbiome.area.Area -> cot:
+net.minecraft.world.level.material.package-info -> cxh:
+net.minecraft.world.level.newbiome.area.Area -> cxi:
     int get(int,int) -> a
-net.minecraft.world.level.newbiome.area.AreaFactory -> cou:
+net.minecraft.world.level.newbiome.area.AreaFactory -> cxj:
     net.minecraft.world.level.newbiome.area.Area make() -> make
-net.minecraft.world.level.newbiome.area.LazyArea -> cov:
+net.minecraft.world.level.newbiome.area.LazyArea -> cxk:
     net.minecraft.world.level.newbiome.layer.traits.PixelTransformer transformer -> a
     it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap cache -> b
     int maxCache -> c
     12:16:void <init>(it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap,int,net.minecraft.world.level.newbiome.layer.traits.PixelTransformer) -> <init>
     20:34:int get(int,int) -> a
     38:38:int getMaxCache() -> a
-net.minecraft.world.level.newbiome.area.package-info -> cow:
-net.minecraft.world.level.newbiome.context.BigContext -> cox:
+net.minecraft.world.level.newbiome.area.package-info -> cxl:
+net.minecraft.world.level.newbiome.context.BigContext -> cxm:
     void initRandom(long,long) -> a
     net.minecraft.world.level.newbiome.area.Area createResult(net.minecraft.world.level.newbiome.layer.traits.PixelTransformer) -> a
     long getMixedSeed() -> a
@@ -63108,10 +69402,10 @@ net.minecraft.world.level.newbiome.context.BigContext -> cox:
     18:18:net.minecraft.world.level.newbiome.area.Area createResult(net.minecraft.world.level.newbiome.layer.traits.PixelTransformer,net.minecraft.world.level.newbiome.area.Area,net.minecraft.world.level.newbiome.area.Area) -> a
     22:22:int random(int,int) -> a
     26:36:int random(int,int,int,int) -> a
-net.minecraft.world.level.newbiome.context.Context -> coy:
+net.minecraft.world.level.newbiome.context.Context -> cxn:
     int nextRandom(int) -> a
     net.minecraft.world.level.levelgen.synth.ImprovedNoise getBiomeNoise() -> b
-net.minecraft.world.level.newbiome.context.LazyAreaContext -> coz:
+net.minecraft.world.level.newbiome.context.LazyAreaContext -> cxo:
     it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap cache -> a
     int maxCache -> b
     net.minecraft.world.level.levelgen.synth.ImprovedNoise biomeNoise -> c
@@ -63129,8 +69423,8 @@ net.minecraft.world.level.newbiome.context.LazyAreaContext -> coz:
     12:12:net.minecraft.world.level.newbiome.area.Area createResult(net.minecraft.world.level.newbiome.layer.traits.PixelTransformer,net.minecraft.world.level.newbiome.area.Area,net.minecraft.world.level.newbiome.area.Area) -> a
     12:12:net.minecraft.world.level.newbiome.area.Area createResult(net.minecraft.world.level.newbiome.layer.traits.PixelTransformer,net.minecraft.world.level.newbiome.area.Area) -> a
     12:12:net.minecraft.world.level.newbiome.area.Area createResult(net.minecraft.world.level.newbiome.layer.traits.PixelTransformer) -> a
-net.minecraft.world.level.newbiome.context.package-info -> cpa:
-net.minecraft.world.level.newbiome.layer.AddDeepOceanLayer -> cpb:
+net.minecraft.world.level.newbiome.context.package-info -> cxp:
+net.minecraft.world.level.newbiome.layer.AddDeepOceanLayer -> cxq:
     net.minecraft.world.level.newbiome.layer.AddDeepOceanLayer INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.AddDeepOceanLayer[] $VALUES -> b
     7:7:net.minecraft.world.level.newbiome.layer.AddDeepOceanLayer[] values() -> values
@@ -63138,9 +69432,9 @@ net.minecraft.world.level.newbiome.layer.AddDeepOceanLayer -> cpb:
     7:7:void <init>(java.lang.String,int) -> <init>
     12:52:int apply(net.minecraft.world.level.newbiome.context.Context,int,int,int,int,int) -> a
     7:8:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.AddEdgeLayer -> cpc:
+net.minecraft.world.level.newbiome.layer.AddEdgeLayer -> cxr:
     7:7:void <init>() -> <init>
-net.minecraft.world.level.newbiome.layer.AddEdgeLayer$CoolWarm -> cpc$a:
+net.minecraft.world.level.newbiome.layer.AddEdgeLayer$CoolWarm -> cxr$a:
     net.minecraft.world.level.newbiome.layer.AddEdgeLayer$CoolWarm INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.AddEdgeLayer$CoolWarm[] $VALUES -> b
     8:8:net.minecraft.world.level.newbiome.layer.AddEdgeLayer$CoolWarm[] values() -> values
@@ -63148,7 +69442,7 @@ net.minecraft.world.level.newbiome.layer.AddEdgeLayer$CoolWarm -> cpc$a:
     8:8:void <init>(java.lang.String,int) -> <init>
     13:26:int apply(net.minecraft.world.level.newbiome.context.Context,int,int,int,int,int) -> a
     8:9:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.AddEdgeLayer$HeatIce -> cpc$b:
+net.minecraft.world.level.newbiome.layer.AddEdgeLayer$HeatIce -> cxr$b:
     net.minecraft.world.level.newbiome.layer.AddEdgeLayer$HeatIce INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.AddEdgeLayer$HeatIce[] $VALUES -> b
     30:30:net.minecraft.world.level.newbiome.layer.AddEdgeLayer$HeatIce[] values() -> values
@@ -63156,7 +69450,7 @@ net.minecraft.world.level.newbiome.layer.AddEdgeLayer$HeatIce -> cpc$b:
     30:30:void <init>(java.lang.String,int) -> <init>
     35:48:int apply(net.minecraft.world.level.newbiome.context.Context,int,int,int,int,int) -> a
     30:31:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.AddEdgeLayer$IntroduceSpecial -> cpc$c:
+net.minecraft.world.level.newbiome.layer.AddEdgeLayer$IntroduceSpecial -> cxr$c:
     net.minecraft.world.level.newbiome.layer.AddEdgeLayer$IntroduceSpecial INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.AddEdgeLayer$IntroduceSpecial[] $VALUES -> b
     52:52:net.minecraft.world.level.newbiome.layer.AddEdgeLayer$IntroduceSpecial[] values() -> values
@@ -63164,7 +69458,7 @@ net.minecraft.world.level.newbiome.layer.AddEdgeLayer$IntroduceSpecial -> cpc$c:
     52:52:void <init>(java.lang.String,int) -> <init>
     57:61:int apply(net.minecraft.world.level.newbiome.context.Context,int) -> a
     52:53:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.AddIslandLayer -> cpd:
+net.minecraft.world.level.newbiome.layer.AddIslandLayer -> cxs:
     net.minecraft.world.level.newbiome.layer.AddIslandLayer INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.AddIslandLayer[] $VALUES -> b
     6:6:net.minecraft.world.level.newbiome.layer.AddIslandLayer[] values() -> values
@@ -63172,7 +69466,7 @@ net.minecraft.world.level.newbiome.layer.AddIslandLayer -> cpd:
     6:6:void <init>(java.lang.String,int) -> <init>
     11:51:int apply(net.minecraft.world.level.newbiome.context.Context,int,int,int,int,int) -> a
     6:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.AddMushroomIslandLayer -> cpe:
+net.minecraft.world.level.newbiome.layer.AddMushroomIslandLayer -> cxt:
     net.minecraft.world.level.newbiome.layer.AddMushroomIslandLayer INSTANCE -> a
     int MUSHROOM_FIELDS -> b
     net.minecraft.world.level.newbiome.layer.AddMushroomIslandLayer[] $VALUES -> c
@@ -63181,7 +69475,7 @@ net.minecraft.world.level.newbiome.layer.AddMushroomIslandLayer -> cpe:
     8:8:void <init>(java.lang.String,int) -> <init>
     15:18:int apply(net.minecraft.world.level.newbiome.context.Context,int,int,int,int,int) -> a
     8:11:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.AddSnowLayer -> cpf:
+net.minecraft.world.level.newbiome.layer.AddSnowLayer -> cxu:
     net.minecraft.world.level.newbiome.layer.AddSnowLayer INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.AddSnowLayer[] $VALUES -> b
     6:6:net.minecraft.world.level.newbiome.layer.AddSnowLayer[] values() -> values
@@ -63189,7 +69483,7 @@ net.minecraft.world.level.newbiome.layer.AddSnowLayer -> cpf:
     6:6:void <init>(java.lang.String,int) -> <init>
     11:21:int apply(net.minecraft.world.level.newbiome.context.Context,int) -> a
     6:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.BiomeEdgeLayer -> cpg:
+net.minecraft.world.level.newbiome.layer.BiomeEdgeLayer -> cxv:
     net.minecraft.world.level.newbiome.layer.BiomeEdgeLayer INSTANCE -> a
     int DESERT -> b
     int MOUNTAINS -> c
@@ -63216,7 +69510,7 @@ net.minecraft.world.level.newbiome.layer.BiomeEdgeLayer -> cpg:
     74:82:boolean checkEdgeStrict(int[],int,int,int,int,int,int,int) -> b
     86:96:boolean isValidTemperatureEdge(int,int) -> a
     10:28:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.BiomeInitLayer -> cph:
+net.minecraft.world.level.newbiome.layer.BiomeInitLayer -> cxw:
     int BIRCH_FOREST -> a
     int DESERT -> b
     int MOUNTAINS -> c
@@ -63238,12 +69532,11 @@ net.minecraft.world.level.newbiome.layer.BiomeInitLayer -> cph:
     int[] MEDIUM_BIOMES -> s
     int[] COLD_BIOMES -> t
     int[] ICE_BIOMES -> u
-    int fixedBiome -> v
-    int[] warmBiomes -> w
-    34:43:void <init>(net.minecraft.world.level.LevelType,int) -> <init>
-    47:77:int apply(net.minecraft.world.level.newbiome.context.Context,int) -> a
-    10:31:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.IslandLayer -> cpi:
+    int[] warmBiomes -> v
+    32:38:void <init>(boolean) -> <init>
+    42:68:int apply(net.minecraft.world.level.newbiome.context.Context,int) -> a
+    9:30:void <clinit>() -> <clinit>
+net.minecraft.world.level.newbiome.layer.IslandLayer -> cxx:
     net.minecraft.world.level.newbiome.layer.IslandLayer INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.IslandLayer[] $VALUES -> b
     6:6:net.minecraft.world.level.newbiome.layer.IslandLayer[] values() -> values
@@ -63251,7 +69544,7 @@ net.minecraft.world.level.newbiome.layer.IslandLayer -> cpi:
     6:6:void <init>(java.lang.String,int) -> <init>
     12:16:int applyPixel(net.minecraft.world.level.newbiome.context.Context,int,int) -> a
     6:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.Layer -> cpj:
+net.minecraft.world.level.newbiome.layer.Layer -> cxy:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.level.newbiome.area.LazyArea area -> b
     17:19:void <init>(net.minecraft.world.level.newbiome.area.AreaFactory) -> <init>
@@ -63259,7 +69552,7 @@ net.minecraft.world.level.newbiome.layer.Layer -> cpj:
     33:42:net.minecraft.world.level.biome.Biome getBiome(int) -> a
     46:46:net.minecraft.world.level.biome.Biome get(int,int) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.Layers -> cpk:
+net.minecraft.world.level.newbiome.layer.Layers -> cxz:
     int WARM_OCEAN -> a
     int LUKEWARM_OCEAN -> b
     int OCEAN -> c
@@ -63270,16 +69563,16 @@ net.minecraft.world.level.newbiome.layer.Layers -> cpk:
     int DEEP_OCEAN -> h
     int DEEP_COLD_OCEAN -> i
     int DEEP_FROZEN_OCEAN -> j
-    17:17:void <init>() -> <init>
-    38:42:net.minecraft.world.level.newbiome.area.AreaFactory zoom(long,net.minecraft.world.level.newbiome.layer.traits.AreaTransformer1,net.minecraft.world.level.newbiome.area.AreaFactory,int,java.util.function.LongFunction) -> a
-    46:108:net.minecraft.world.level.newbiome.area.AreaFactory getDefaultLayer(net.minecraft.world.level.LevelType,net.minecraft.world.level.levelgen.OverworldGeneratorSettings,java.util.function.LongFunction) -> a
-    113:115:net.minecraft.world.level.newbiome.layer.Layer getDefaultLayer(long,net.minecraft.world.level.LevelType,net.minecraft.world.level.levelgen.OverworldGeneratorSettings) -> a
-    119:141:boolean isSame(int,int) -> a
-    145:145:boolean isOcean(int) -> a
-    159:159:boolean isShallowOcean(int) -> b
-    114:114:net.minecraft.world.level.newbiome.context.LazyAreaContext lambda$getDefaultLayer$0(long,long) -> a
-    25:35:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.OceanLayer -> cpl:
+    15:15:void <init>() -> <init>
+    36:40:net.minecraft.world.level.newbiome.area.AreaFactory zoom(long,net.minecraft.world.level.newbiome.layer.traits.AreaTransformer1,net.minecraft.world.level.newbiome.area.AreaFactory,int,java.util.function.LongFunction) -> a
+    44:103:net.minecraft.world.level.newbiome.area.AreaFactory getDefaultLayer(boolean,int,int,java.util.function.LongFunction) -> a
+    108:110:net.minecraft.world.level.newbiome.layer.Layer getDefaultLayer(long,boolean,int,int) -> a
+    114:136:boolean isSame(int,int) -> a
+    140:140:boolean isOcean(int) -> a
+    154:154:boolean isShallowOcean(int) -> b
+    109:109:net.minecraft.world.level.newbiome.context.LazyAreaContext lambda$getDefaultLayer$0(long,long) -> a
+    23:33:void <clinit>() -> <clinit>
+net.minecraft.world.level.newbiome.layer.OceanLayer -> cya:
     net.minecraft.world.level.newbiome.layer.OceanLayer INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.OceanLayer[] $VALUES -> b
     7:7:net.minecraft.world.level.newbiome.layer.OceanLayer[] values() -> values
@@ -63287,7 +69580,7 @@ net.minecraft.world.level.newbiome.layer.OceanLayer -> cpl:
     7:7:void <init>(java.lang.String,int) -> <init>
     12:31:int applyPixel(net.minecraft.world.level.newbiome.context.Context,int,int) -> a
     7:8:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.OceanMixerLayer -> cpm:
+net.minecraft.world.level.newbiome.layer.OceanMixerLayer -> cyb:
     net.minecraft.world.level.newbiome.layer.OceanMixerLayer INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.OceanMixerLayer[] $VALUES -> b
     8:8:net.minecraft.world.level.newbiome.layer.OceanMixerLayer[] values() -> values
@@ -63295,7 +69588,7 @@ net.minecraft.world.level.newbiome.layer.OceanMixerLayer -> cpm:
     8:8:void <init>(java.lang.String,int) -> <init>
     13:54:int applyPixel(net.minecraft.world.level.newbiome.context.Context,net.minecraft.world.level.newbiome.area.Area,net.minecraft.world.level.newbiome.area.Area,int,int) -> a
     8:9:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.RareBiomeLargeLayer -> cpn:
+net.minecraft.world.level.newbiome.layer.RareBiomeLargeLayer -> cyc:
     net.minecraft.world.level.newbiome.layer.RareBiomeLargeLayer INSTANCE -> a
     int JUNGLE -> b
     int BAMBOO_JUNGLE -> c
@@ -63305,7 +69598,7 @@ net.minecraft.world.level.newbiome.layer.RareBiomeLargeLayer -> cpn:
     8:8:void <init>(java.lang.String,int) -> <init>
     16:19:int apply(net.minecraft.world.level.newbiome.context.Context,int) -> a
     8:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.RareBiomeSpotLayer -> cpo:
+net.minecraft.world.level.newbiome.layer.RareBiomeSpotLayer -> cyd:
     net.minecraft.world.level.newbiome.layer.RareBiomeSpotLayer INSTANCE -> a
     int PLAINS -> b
     int SUNFLOWER_PLAINS -> c
@@ -63315,7 +69608,7 @@ net.minecraft.world.level.newbiome.layer.RareBiomeSpotLayer -> cpo:
     8:8:void <init>(java.lang.String,int) -> <init>
     16:19:int apply(net.minecraft.world.level.newbiome.context.Context,int) -> a
     8:12:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.RegionHillsLayer -> cpp:
+net.minecraft.world.level.newbiome.layer.RegionHillsLayer -> cye:
     net.minecraft.world.level.newbiome.layer.RegionHillsLayer INSTANCE -> a
     org.apache.logging.log4j.Logger LOGGER -> b
     int BIRCH_FOREST -> c
@@ -63350,7 +69643,7 @@ net.minecraft.world.level.newbiome.layer.RegionHillsLayer -> cpp:
     13:13:void <init>(java.lang.String,int) -> <init>
     47:130:int applyPixel(net.minecraft.world.level.newbiome.context.Context,net.minecraft.world.level.newbiome.area.Area,net.minecraft.world.level.newbiome.area.Area,int,int) -> a
     13:43:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.RemoveTooMuchOceanLayer -> cpq:
+net.minecraft.world.level.newbiome.layer.RemoveTooMuchOceanLayer -> cyf:
     net.minecraft.world.level.newbiome.layer.RemoveTooMuchOceanLayer INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.RemoveTooMuchOceanLayer[] $VALUES -> b
     6:6:net.minecraft.world.level.newbiome.layer.RemoveTooMuchOceanLayer[] values() -> values
@@ -63358,7 +69651,7 @@ net.minecraft.world.level.newbiome.layer.RemoveTooMuchOceanLayer -> cpq:
     6:6:void <init>(java.lang.String,int) -> <init>
     11:14:int apply(net.minecraft.world.level.newbiome.context.Context,int,int,int,int,int) -> a
     6:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.RiverInitLayer -> cpr:
+net.minecraft.world.level.newbiome.layer.RiverInitLayer -> cyg:
     net.minecraft.world.level.newbiome.layer.RiverInitLayer INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.RiverInitLayer[] $VALUES -> b
     6:6:net.minecraft.world.level.newbiome.layer.RiverInitLayer[] values() -> values
@@ -63366,7 +69659,7 @@ net.minecraft.world.level.newbiome.layer.RiverInitLayer -> cpr:
     6:6:void <init>(java.lang.String,int) -> <init>
     11:11:int apply(net.minecraft.world.level.newbiome.context.Context,int) -> a
     6:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.RiverLayer -> cps:
+net.minecraft.world.level.newbiome.layer.RiverLayer -> cyh:
     net.minecraft.world.level.newbiome.layer.RiverLayer INSTANCE -> a
     int RIVER -> b
     net.minecraft.world.level.newbiome.layer.RiverLayer[] $VALUES -> c
@@ -63376,7 +69669,7 @@ net.minecraft.world.level.newbiome.layer.RiverLayer -> cps:
     15:23:int apply(net.minecraft.world.level.newbiome.context.Context,int,int,int,int,int) -> a
     27:30:int riverFilter(int) -> c
     8:11:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.RiverMixerLayer -> cpt:
+net.minecraft.world.level.newbiome.layer.RiverMixerLayer -> cyi:
     net.minecraft.world.level.newbiome.layer.RiverMixerLayer INSTANCE -> a
     int FROZEN_RIVER -> b
     int SNOWY_TUNDRA -> c
@@ -63389,7 +69682,7 @@ net.minecraft.world.level.newbiome.layer.RiverMixerLayer -> cpt:
     10:10:void <init>(java.lang.String,int) -> <init>
     21:36:int applyPixel(net.minecraft.world.level.newbiome.context.Context,net.minecraft.world.level.newbiome.area.Area,net.minecraft.world.level.newbiome.area.Area,int,int) -> a
     10:17:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.ShoreLayer -> cpu:
+net.minecraft.world.level.newbiome.layer.ShoreLayer -> cyj:
     net.minecraft.world.level.newbiome.layer.ShoreLayer INSTANCE -> a
     int BEACH -> b
     int SNOWY_BEACH -> c
@@ -63421,7 +69714,7 @@ net.minecraft.world.level.newbiome.layer.ShoreLayer -> cpu:
     69:73:boolean isJungleCompatible(int) -> c
     77:77:boolean isMesa(int) -> d
     9:33:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.SmoothLayer -> cpv:
+net.minecraft.world.level.newbiome.layer.SmoothLayer -> cyk:
     net.minecraft.world.level.newbiome.layer.SmoothLayer INSTANCE -> a
     net.minecraft.world.level.newbiome.layer.SmoothLayer[] $VALUES -> b
     6:6:net.minecraft.world.level.newbiome.layer.SmoothLayer[] values() -> values
@@ -63429,7 +69722,7 @@ net.minecraft.world.level.newbiome.layer.SmoothLayer -> cpv:
     6:6:void <init>(java.lang.String,int) -> <init>
     11:20:int apply(net.minecraft.world.level.newbiome.context.Context,int,int,int,int,int) -> a
     6:7:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.ZoomLayer -> cpw:
+net.minecraft.world.level.newbiome.layer.ZoomLayer -> cyl:
     net.minecraft.world.level.newbiome.layer.ZoomLayer NORMAL -> a
     net.minecraft.world.level.newbiome.layer.ZoomLayer FUZZY -> b
     net.minecraft.world.level.newbiome.layer.ZoomLayer[] $VALUES -> c
@@ -63442,51 +69735,51 @@ net.minecraft.world.level.newbiome.layer.ZoomLayer -> cpw:
     58:89:int modeOrRandom(net.minecraft.world.level.newbiome.context.BigContext,int,int,int,int) -> a
     7:7:void <init>(java.lang.String,int,net.minecraft.world.level.newbiome.layer.ZoomLayer$1) -> <init>
     7:9:void <clinit>() -> <clinit>
-net.minecraft.world.level.newbiome.layer.ZoomLayer$1 -> cpw$1:
+net.minecraft.world.level.newbiome.layer.ZoomLayer$1 -> cyl$1:
     9:9:void <init>(java.lang.String,int) -> <init>
     12:12:int modeOrRandom(net.minecraft.world.level.newbiome.context.BigContext,int,int,int,int) -> a
-net.minecraft.world.level.newbiome.layer.package-info -> cpx:
-net.minecraft.world.level.newbiome.layer.traits.AreaTransformer0 -> cpy:
+net.minecraft.world.level.newbiome.layer.package-info -> cym:
+net.minecraft.world.level.newbiome.layer.traits.AreaTransformer0 -> cyn:
     10:10:net.minecraft.world.level.newbiome.area.AreaFactory run(net.minecraft.world.level.newbiome.context.BigContext) -> a
     int applyPixel(net.minecraft.world.level.newbiome.context.Context,int,int) -> a
     10:10:net.minecraft.world.level.newbiome.area.Area lambda$run$1(net.minecraft.world.level.newbiome.context.BigContext) -> b
     11:12:int lambda$null$0(net.minecraft.world.level.newbiome.context.BigContext,int,int) -> a
-net.minecraft.world.level.newbiome.layer.traits.AreaTransformer1 -> cpz:
+net.minecraft.world.level.newbiome.layer.traits.AreaTransformer1 -> cyo:
     9:9:net.minecraft.world.level.newbiome.area.AreaFactory run(net.minecraft.world.level.newbiome.context.BigContext,net.minecraft.world.level.newbiome.area.AreaFactory) -> a
     int applyPixel(net.minecraft.world.level.newbiome.context.BigContext,net.minecraft.world.level.newbiome.area.Area,int,int) -> a
     10:11:net.minecraft.world.level.newbiome.area.Area lambda$run$1(net.minecraft.world.level.newbiome.area.AreaFactory,net.minecraft.world.level.newbiome.context.BigContext) -> a
     12:13:int lambda$null$0(net.minecraft.world.level.newbiome.context.BigContext,net.minecraft.world.level.newbiome.area.Area,int,int) -> b
-net.minecraft.world.level.newbiome.layer.traits.AreaTransformer2 -> cqa:
+net.minecraft.world.level.newbiome.layer.traits.AreaTransformer2 -> cyp:
     10:10:net.minecraft.world.level.newbiome.area.AreaFactory run(net.minecraft.world.level.newbiome.context.BigContext,net.minecraft.world.level.newbiome.area.AreaFactory,net.minecraft.world.level.newbiome.area.AreaFactory) -> a
     int applyPixel(net.minecraft.world.level.newbiome.context.Context,net.minecraft.world.level.newbiome.area.Area,net.minecraft.world.level.newbiome.area.Area,int,int) -> a
     11:13:net.minecraft.world.level.newbiome.area.Area lambda$run$1(net.minecraft.world.level.newbiome.area.AreaFactory,net.minecraft.world.level.newbiome.area.AreaFactory,net.minecraft.world.level.newbiome.context.BigContext) -> a
     14:15:int lambda$null$0(net.minecraft.world.level.newbiome.context.BigContext,net.minecraft.world.level.newbiome.area.Area,net.minecraft.world.level.newbiome.area.Area,int,int) -> a
-net.minecraft.world.level.newbiome.layer.traits.BishopTransformer -> cqb:
+net.minecraft.world.level.newbiome.layer.traits.BishopTransformer -> cyq:
     int apply(net.minecraft.world.level.newbiome.context.Context,int,int,int,int,int) -> a
     12:18:int applyPixel(net.minecraft.world.level.newbiome.context.BigContext,net.minecraft.world.level.newbiome.area.Area,int,int) -> a
-net.minecraft.world.level.newbiome.layer.traits.C0Transformer -> cqc:
+net.minecraft.world.level.newbiome.layer.traits.C0Transformer -> cyr:
     int apply(net.minecraft.world.level.newbiome.context.Context,int) -> a
     12:12:int applyPixel(net.minecraft.world.level.newbiome.context.BigContext,net.minecraft.world.level.newbiome.area.Area,int,int) -> a
-net.minecraft.world.level.newbiome.layer.traits.C1Transformer -> cqd:
+net.minecraft.world.level.newbiome.layer.traits.C1Transformer -> cys:
     int apply(net.minecraft.world.level.newbiome.context.Context,int) -> a
     12:13:int applyPixel(net.minecraft.world.level.newbiome.context.BigContext,net.minecraft.world.level.newbiome.area.Area,int,int) -> a
-net.minecraft.world.level.newbiome.layer.traits.CastleTransformer -> cqe:
+net.minecraft.world.level.newbiome.layer.traits.CastleTransformer -> cyt:
     int apply(net.minecraft.world.level.newbiome.context.Context,int,int,int,int,int) -> a
     12:18:int applyPixel(net.minecraft.world.level.newbiome.context.BigContext,net.minecraft.world.level.newbiome.area.Area,int,int) -> a
-net.minecraft.world.level.newbiome.layer.traits.DimensionOffset0Transformer -> cqf:
+net.minecraft.world.level.newbiome.layer.traits.DimensionOffset0Transformer -> cyu:
     6:6:int getParentX(int) -> a
     11:11:int getParentY(int) -> b
-net.minecraft.world.level.newbiome.layer.traits.DimensionOffset1Transformer -> cqg:
+net.minecraft.world.level.newbiome.layer.traits.DimensionOffset1Transformer -> cyv:
     6:6:int getParentX(int) -> a
     11:11:int getParentY(int) -> b
-net.minecraft.world.level.newbiome.layer.traits.DimensionTransformer -> cqh:
+net.minecraft.world.level.newbiome.layer.traits.DimensionTransformer -> cyw:
     int getParentX(int) -> a
     int getParentY(int) -> b
-net.minecraft.world.level.newbiome.layer.traits.PixelTransformer -> cqi:
+net.minecraft.world.level.newbiome.layer.traits.PixelTransformer -> cyx:
     int apply(int,int) -> apply
-net.minecraft.world.level.newbiome.layer.traits.package-info -> cqj:
-net.minecraft.world.level.package-info -> cqk:
-net.minecraft.world.level.pathfinder.BinaryHeap -> cql:
+net.minecraft.world.level.newbiome.layer.traits.package-info -> cyy:
+net.minecraft.world.level.package-info -> cyz:
+net.minecraft.world.level.pathfinder.BinaryHeap -> cza:
     net.minecraft.world.level.pathfinder.Node[] heap -> a
     int size -> b
     3:4:void <init>() -> <init>
@@ -63501,7 +69794,7 @@ net.minecraft.world.level.pathfinder.BinaryHeap -> cql:
     94:144:void downHeap(int) -> b
     147:147:boolean isEmpty() -> e
     151:153:net.minecraft.world.level.pathfinder.Node[] getHeap() -> f
-net.minecraft.world.level.pathfinder.BlockPathTypes -> cqm:
+net.minecraft.world.level.pathfinder.BlockPathTypes -> czb:
     net.minecraft.world.level.pathfinder.BlockPathTypes BLOCKED -> a
     net.minecraft.world.level.pathfinder.BlockPathTypes OPEN -> b
     net.minecraft.world.level.pathfinder.BlockPathTypes WALKABLE -> c
@@ -63511,41 +69804,42 @@ net.minecraft.world.level.pathfinder.BlockPathTypes -> cqm:
     net.minecraft.world.level.pathfinder.BlockPathTypes WATER -> g
     net.minecraft.world.level.pathfinder.BlockPathTypes WATER_BORDER -> h
     net.minecraft.world.level.pathfinder.BlockPathTypes RAIL -> i
-    net.minecraft.world.level.pathfinder.BlockPathTypes DANGER_FIRE -> j
-    net.minecraft.world.level.pathfinder.BlockPathTypes DAMAGE_FIRE -> k
-    net.minecraft.world.level.pathfinder.BlockPathTypes DANGER_CACTUS -> l
-    net.minecraft.world.level.pathfinder.BlockPathTypes DAMAGE_CACTUS -> m
-    net.minecraft.world.level.pathfinder.BlockPathTypes DANGER_OTHER -> n
-    net.minecraft.world.level.pathfinder.BlockPathTypes DAMAGE_OTHER -> o
-    net.minecraft.world.level.pathfinder.BlockPathTypes DOOR_OPEN -> p
-    net.minecraft.world.level.pathfinder.BlockPathTypes DOOR_WOOD_CLOSED -> q
-    net.minecraft.world.level.pathfinder.BlockPathTypes DOOR_IRON_CLOSED -> r
-    net.minecraft.world.level.pathfinder.BlockPathTypes BREACH -> s
-    net.minecraft.world.level.pathfinder.BlockPathTypes LEAVES -> t
-    net.minecraft.world.level.pathfinder.BlockPathTypes STICKY_HONEY -> u
-    net.minecraft.world.level.pathfinder.BlockPathTypes COCOA -> v
-    float malus -> w
-    net.minecraft.world.level.pathfinder.BlockPathTypes[] $VALUES -> x
+    net.minecraft.world.level.pathfinder.BlockPathTypes UNPASSABLE_RAIL -> j
+    net.minecraft.world.level.pathfinder.BlockPathTypes DANGER_FIRE -> k
+    net.minecraft.world.level.pathfinder.BlockPathTypes DAMAGE_FIRE -> l
+    net.minecraft.world.level.pathfinder.BlockPathTypes DANGER_CACTUS -> m
+    net.minecraft.world.level.pathfinder.BlockPathTypes DAMAGE_CACTUS -> n
+    net.minecraft.world.level.pathfinder.BlockPathTypes DANGER_OTHER -> o
+    net.minecraft.world.level.pathfinder.BlockPathTypes DAMAGE_OTHER -> p
+    net.minecraft.world.level.pathfinder.BlockPathTypes DOOR_OPEN -> q
+    net.minecraft.world.level.pathfinder.BlockPathTypes DOOR_WOOD_CLOSED -> r
+    net.minecraft.world.level.pathfinder.BlockPathTypes DOOR_IRON_CLOSED -> s
+    net.minecraft.world.level.pathfinder.BlockPathTypes BREACH -> t
+    net.minecraft.world.level.pathfinder.BlockPathTypes LEAVES -> u
+    net.minecraft.world.level.pathfinder.BlockPathTypes STICKY_HONEY -> v
+    net.minecraft.world.level.pathfinder.BlockPathTypes COCOA -> w
+    float malus -> x
+    net.minecraft.world.level.pathfinder.BlockPathTypes[] $VALUES -> y
     3:3:net.minecraft.world.level.pathfinder.BlockPathTypes[] values() -> values
     3:3:net.minecraft.world.level.pathfinder.BlockPathTypes valueOf(java.lang.String) -> valueOf
-    30:32:void <init>(java.lang.String,int,float) -> <init>
-    35:35:float getMalus() -> a
-    3:25:void <clinit>() -> <clinit>
-net.minecraft.world.level.pathfinder.FlyNodeEvaluator -> cqn:
-    17:17:void <init>() -> <init>
-    20:22:void prepare(net.minecraft.world.level.PathNavigationRegion,net.minecraft.world.entity.Mob) -> a
-    26:28:void done() -> a
-    34:65:net.minecraft.world.level.pathfinder.Node getStart() -> b
-    70:70:net.minecraft.world.level.pathfinder.Target getGoal(double,double,double) -> a
-    75:210:int getNeighbors(net.minecraft.world.level.pathfinder.Node[],net.minecraft.world.level.pathfinder.Node) -> a
-    214:214:boolean hasMalus(net.minecraft.world.level.pathfinder.Node) -> a
-    218:218:boolean isOpen(net.minecraft.world.level.pathfinder.Node) -> b
-    224:244:net.minecraft.world.level.pathfinder.Node getNode(int,int,int) -> a
-    250:279:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int,net.minecraft.world.entity.Mob,int,int,int,boolean,boolean) -> a
-    284:310:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int) -> a
-    314:314:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.entity.Mob,net.minecraft.core.BlockPos) -> a
-    318:318:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.entity.Mob,int,int,int) -> a
-net.minecraft.world.level.pathfinder.Node -> cqo:
+    31:33:void <init>(java.lang.String,int,float) -> <init>
+    36:36:float getMalus() -> a
+    3:26:void <clinit>() -> <clinit>
+net.minecraft.world.level.pathfinder.FlyNodeEvaluator -> czc:
+    19:19:void <init>() -> <init>
+    22:24:void prepare(net.minecraft.world.level.PathNavigationRegion,net.minecraft.world.entity.Mob) -> a
+    28:30:void done() -> a
+    36:67:net.minecraft.world.level.pathfinder.Node getStart() -> b
+    72:72:net.minecraft.world.level.pathfinder.Target getGoal(double,double,double) -> a
+    77:212:int getNeighbors(net.minecraft.world.level.pathfinder.Node[],net.minecraft.world.level.pathfinder.Node) -> a
+    216:216:boolean hasMalus(net.minecraft.world.level.pathfinder.Node) -> a
+    220:220:boolean isOpen(net.minecraft.world.level.pathfinder.Node) -> b
+    226:246:net.minecraft.world.level.pathfinder.Node getNode(int,int,int) -> a
+    252:281:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int,net.minecraft.world.entity.Mob,int,int,int,boolean,boolean) -> a
+    286:313:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int) -> a
+    317:317:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.entity.Mob,net.minecraft.core.BlockPos) -> a
+    321:321:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.entity.Mob,int,int,int) -> a
+net.minecraft.world.level.pathfinder.Node -> czd:
     int x -> a
     int y -> b
     int z -> c
@@ -63576,7 +69870,7 @@ net.minecraft.world.level.pathfinder.Node -> cqo:
     122:122:java.lang.String toString() -> toString
     126:134:void writeToStream(net.minecraft.network.FriendlyByteBuf) -> a
     137:143:net.minecraft.world.level.pathfinder.Node createFromStream(net.minecraft.network.FriendlyByteBuf) -> b
-net.minecraft.world.level.pathfinder.NodeEvaluator -> cqp:
+net.minecraft.world.level.pathfinder.NodeEvaluator -> cze:
     net.minecraft.world.level.PathNavigationRegion level -> a
     net.minecraft.world.entity.Mob mob -> b
     it.unimi.dsi.fastutil.ints.Int2ObjectMap nodes -> c
@@ -63586,23 +69880,24 @@ net.minecraft.world.level.pathfinder.NodeEvaluator -> cqp:
     boolean canPassDoors -> g
     boolean canOpenDoors -> h
     boolean canFloat -> i
-    18:28:void <init>() -> <init>
-    31:38:void prepare(net.minecraft.world.level.PathNavigationRegion,net.minecraft.world.entity.Mob) -> a
-    41:43:void done() -> a
-    46:46:net.minecraft.world.level.pathfinder.Node getNode(int,int,int) -> a
+    19:29:void <init>() -> <init>
+    32:39:void prepare(net.minecraft.world.level.PathNavigationRegion,net.minecraft.world.entity.Mob) -> a
+    42:44:void done() -> a
+    47:47:net.minecraft.world.level.pathfinder.Node getNode(net.minecraft.core.BlockPos) -> a
+    51:51:net.minecraft.world.level.pathfinder.Node getNode(int,int,int) -> a
     net.minecraft.world.level.pathfinder.Node getStart() -> b
     net.minecraft.world.level.pathfinder.Target getGoal(double,double,double) -> a
     int getNeighbors(net.minecraft.world.level.pathfinder.Node[],net.minecraft.world.level.pathfinder.Node) -> a
     net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int,net.minecraft.world.entity.Mob,int,int,int,boolean,boolean) -> a
     net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int) -> a
-    60:61:void setCanPassDoors(boolean) -> a
-    64:65:void setCanOpenDoors(boolean) -> b
-    68:69:void setCanFloat(boolean) -> c
-    72:72:boolean canPassDoors() -> c
-    76:76:boolean canOpenDoors() -> d
-    80:80:boolean canFloat() -> e
-    46:46:net.minecraft.world.level.pathfinder.Node lambda$getNode$0(int,int,int,int) -> a
-net.minecraft.world.level.pathfinder.Path -> cqq:
+    65:66:void setCanPassDoors(boolean) -> a
+    69:70:void setCanOpenDoors(boolean) -> b
+    73:74:void setCanFloat(boolean) -> c
+    77:77:boolean canPassDoors() -> c
+    81:81:boolean canOpenDoors() -> d
+    85:85:boolean canFloat() -> e
+    51:51:net.minecraft.world.level.pathfinder.Node lambda$getNode$0(int,int,int,int) -> a
+net.minecraft.world.level.pathfinder.Path -> czf:
     java.util.List nodes -> a
     net.minecraft.world.level.pathfinder.Node[] openSet -> b
     net.minecraft.world.level.pathfinder.Node[] closedSet -> c
@@ -63611,32 +69906,34 @@ net.minecraft.world.level.pathfinder.Path -> cqq:
     net.minecraft.core.BlockPos target -> f
     float distToTarget -> g
     boolean reached -> h
-    27:43:void <init>(java.util.List,net.minecraft.core.BlockPos,boolean) -> <init>
-    46:47:void next() -> a
-    50:50:boolean isDone() -> b
-    55:58:net.minecraft.world.level.pathfinder.Node last() -> c
-    62:62:net.minecraft.world.level.pathfinder.Node get(int) -> a
-    66:66:java.util.List getNodes() -> d
-    70:73:void truncate(int) -> b
-    76:77:void set(int,net.minecraft.world.level.pathfinder.Node) -> a
-    80:80:int getSize() -> e
-    84:84:int getIndex() -> f
-    88:89:void setIndex(int) -> c
-    92:96:net.minecraft.world.phys.Vec3 getPos(net.minecraft.world.entity.Entity,int) -> a
-    100:100:net.minecraft.world.phys.Vec3 currentPos(net.minecraft.world.entity.Entity) -> a
-    104:105:net.minecraft.world.phys.Vec3 currentPos() -> g
-    109:124:boolean sameAs(net.minecraft.world.level.pathfinder.Path) -> a
-    131:131:boolean canReach() -> h
-    135:138:void setDebug(net.minecraft.world.level.pathfinder.Node[],net.minecraft.world.level.pathfinder.Node[],java.util.Set) -> a
-    142:142:net.minecraft.world.level.pathfinder.Node[] getOpenSet() -> i
-    147:147:net.minecraft.world.level.pathfinder.Node[] getClosedSet() -> j
-    151:178:void writeToStream(net.minecraft.network.FriendlyByteBuf) -> a
-    181:213:net.minecraft.world.level.pathfinder.Path createFromStream(net.minecraft.network.FriendlyByteBuf) -> b
-    218:218:java.lang.String toString() -> toString
-    222:222:net.minecraft.core.BlockPos getTarget() -> k
-    226:226:float getDistToTarget() -> l
-    158:158:void lambda$writeToStream$0(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.level.pathfinder.Target) -> a
-net.minecraft.world.level.pathfinder.PathComputationType -> cqr:
+    28:44:void <init>(java.util.List,net.minecraft.core.BlockPos,boolean) -> <init>
+    47:48:void next() -> a
+    51:51:boolean isDone() -> b
+    56:59:net.minecraft.world.level.pathfinder.Node last() -> c
+    63:63:net.minecraft.world.level.pathfinder.Node get(int) -> a
+    67:67:java.util.List getNodes() -> d
+    71:74:void truncate(int) -> b
+    77:78:void set(int,net.minecraft.world.level.pathfinder.Node) -> a
+    81:81:int getSize() -> e
+    85:85:int getIndex() -> f
+    89:90:void setIndex(int) -> c
+    93:97:net.minecraft.world.phys.Vec3 getPos(net.minecraft.world.entity.Entity,int) -> a
+    101:101:net.minecraft.world.phys.Vec3 currentPos(net.minecraft.world.entity.Entity) -> a
+    105:106:net.minecraft.core.Vec3i currentPos() -> g
+    110:110:net.minecraft.world.level.pathfinder.Node currentNode() -> h
+    114:129:boolean sameAs(net.minecraft.world.level.pathfinder.Path) -> a
+    136:136:boolean canReach() -> i
+    141:144:void setDebug(net.minecraft.world.level.pathfinder.Node[],net.minecraft.world.level.pathfinder.Node[],java.util.Set) -> a
+    148:148:net.minecraft.world.level.pathfinder.Node[] getOpenSet() -> j
+    153:153:net.minecraft.world.level.pathfinder.Node[] getClosedSet() -> k
+    157:184:void writeToStream(net.minecraft.network.FriendlyByteBuf) -> a
+    187:219:net.minecraft.world.level.pathfinder.Path createFromStream(net.minecraft.network.FriendlyByteBuf) -> b
+    224:224:java.lang.String toString() -> toString
+    229:242:java.lang.String toDetailedString() -> l
+    246:246:net.minecraft.core.BlockPos getTarget() -> m
+    250:250:float getDistToTarget() -> n
+    164:164:void lambda$writeToStream$0(net.minecraft.network.FriendlyByteBuf,net.minecraft.world.level.pathfinder.Target) -> a
+net.minecraft.world.level.pathfinder.PathComputationType -> czg:
     net.minecraft.world.level.pathfinder.PathComputationType LAND -> a
     net.minecraft.world.level.pathfinder.PathComputationType WATER -> b
     net.minecraft.world.level.pathfinder.PathComputationType AIR -> c
@@ -63645,22 +69942,20 @@ net.minecraft.world.level.pathfinder.PathComputationType -> cqr:
     3:3:net.minecraft.world.level.pathfinder.PathComputationType valueOf(java.lang.String) -> valueOf
     3:3:void <init>(java.lang.String,int) -> <init>
     3:4:void <clinit>() -> <clinit>
-net.minecraft.world.level.pathfinder.PathFinder -> cqs:
-    net.minecraft.world.level.pathfinder.BinaryHeap openSet -> a
-    java.util.Set closedSet -> b
-    net.minecraft.world.level.pathfinder.Node[] neighbors -> c
-    int maxVisitedNodes -> d
-    net.minecraft.world.level.pathfinder.NodeEvaluator nodeEvaluator -> e
-    25:34:void <init>(net.minecraft.world.level.pathfinder.NodeEvaluator,int) -> <init>
-    38:47:net.minecraft.world.level.pathfinder.Path findPath(net.minecraft.world.level.PathNavigationRegion,net.minecraft.world.entity.Mob,java.util.Set,float,int,float) -> a
-    56:135:net.minecraft.world.level.pathfinder.Path findPath(net.minecraft.world.level.pathfinder.Node,java.util.Map,float,int,float) -> a
-    140:146:float getBestH(net.minecraft.world.level.pathfinder.Node,java.util.Set) -> a
-    150:157:net.minecraft.world.level.pathfinder.Path reconstructPath(net.minecraft.world.level.pathfinder.Node,net.minecraft.core.BlockPos,boolean) -> a
-    122:122:net.minecraft.world.level.pathfinder.Path lambda$findPath$3(java.util.Map,net.minecraft.world.level.pathfinder.Target) -> a
-    118:118:net.minecraft.world.level.pathfinder.Path lambda$findPath$2(java.util.Map,net.minecraft.world.level.pathfinder.Target) -> b
-    76:76:boolean lambda$findPath$1(net.minecraft.world.level.pathfinder.Node,int,net.minecraft.world.level.pathfinder.Target) -> a
-    43:43:net.minecraft.world.level.pathfinder.Target lambda$findPath$0(net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.pathfinder.SwimNodeEvaluator -> cqt:
+net.minecraft.world.level.pathfinder.PathFinder -> czh:
+    net.minecraft.world.level.pathfinder.Node[] neighbors -> a
+    int maxVisitedNodes -> b
+    net.minecraft.world.level.pathfinder.NodeEvaluator nodeEvaluator -> c
+    net.minecraft.world.level.pathfinder.BinaryHeap openSet -> d
+    25:35:void <init>(net.minecraft.world.level.pathfinder.NodeEvaluator,int) -> <init>
+    39:48:net.minecraft.world.level.pathfinder.Path findPath(net.minecraft.world.level.PathNavigationRegion,net.minecraft.world.entity.Mob,java.util.Set,float,int,float) -> a
+    57:136:net.minecraft.world.level.pathfinder.Path findPath(net.minecraft.world.level.pathfinder.Node,java.util.Map,float,int,float) -> a
+    141:147:float getBestH(net.minecraft.world.level.pathfinder.Node,java.util.Set) -> a
+    151:158:net.minecraft.world.level.pathfinder.Path reconstructPath(net.minecraft.world.level.pathfinder.Node,net.minecraft.core.BlockPos,boolean) -> a
+    125:125:net.minecraft.world.level.pathfinder.Path lambda$findPath$2(java.util.Map,net.minecraft.world.level.pathfinder.Target) -> a
+    122:122:net.minecraft.world.level.pathfinder.Path lambda$findPath$1(java.util.Map,net.minecraft.world.level.pathfinder.Target) -> b
+    44:44:net.minecraft.world.level.pathfinder.Target lambda$findPath$0(net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.pathfinder.SwimNodeEvaluator -> czi:
     boolean allowBreaching -> j
     17:19:void <init>(boolean) -> <init>
     23:23:net.minecraft.world.level.pathfinder.Node getStart() -> b
@@ -63671,7 +69966,7 @@ net.minecraft.world.level.pathfinder.SwimNodeEvaluator -> cqt:
     67:72:net.minecraft.world.level.pathfinder.Node getWaterNode(int,int,int) -> b
     78:98:net.minecraft.world.level.pathfinder.Node getNode(int,int,int) -> a
     102:125:net.minecraft.world.level.pathfinder.BlockPathTypes isFree(int,int,int) -> c
-net.minecraft.world.level.pathfinder.Target -> cqu:
+net.minecraft.world.level.pathfinder.Target -> czj:
     float bestHeuristic -> m
     net.minecraft.world.level.pathfinder.Node bestNode -> n
     boolean reached -> o
@@ -63682,48 +69977,57 @@ net.minecraft.world.level.pathfinder.Target -> cqu:
     30:31:void setReached() -> e
     34:34:boolean isReached() -> f
     38:44:net.minecraft.world.level.pathfinder.Target createFromStream(net.minecraft.network.FriendlyByteBuf) -> c
-net.minecraft.world.level.pathfinder.TurtleNodeEvaluator -> cqv:
+net.minecraft.world.level.pathfinder.TurtleNodeEvaluator -> czk:
     float oldWalkableCost -> k
     float oldWaterBorderCost -> l
-    17:17:void <init>() -> <init>
-    23:29:void prepare(net.minecraft.world.level.PathNavigationRegion,net.minecraft.world.entity.Mob) -> a
-    33:36:void done() -> a
-    40:40:net.minecraft.world.level.pathfinder.Node getStart() -> b
-    46:46:net.minecraft.world.level.pathfinder.Target getGoal(double,double,double) -> a
-    52:114:int getNeighbors(net.minecraft.world.level.pathfinder.Node[],net.minecraft.world.level.pathfinder.Node) -> a
-    118:123:double inWaterDependentPosHeight(net.minecraft.core.BlockPos) -> a
-    128:208:net.minecraft.world.level.pathfinder.Node getAcceptedNode(int,int,int,int,double) -> a
-    213:222:net.minecraft.world.level.pathfinder.BlockPathTypes evaluateBlockPathType(net.minecraft.world.level.BlockGetter,boolean,boolean,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
-    227:267:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int) -> a
-net.minecraft.world.level.pathfinder.WalkNodeEvaluator -> cqw:
+    18:18:void <init>() -> <init>
+    24:30:void prepare(net.minecraft.world.level.PathNavigationRegion,net.minecraft.world.entity.Mob) -> a
+    34:37:void done() -> a
+    41:41:net.minecraft.world.level.pathfinder.Node getStart() -> b
+    47:47:net.minecraft.world.level.pathfinder.Target getGoal(double,double,double) -> a
+    53:115:int getNeighbors(net.minecraft.world.level.pathfinder.Node[],net.minecraft.world.level.pathfinder.Node) -> a
+    119:124:double inWaterDependentPosHeight(net.minecraft.core.BlockPos) -> b
+    129:209:net.minecraft.world.level.pathfinder.Node getAcceptedNode(int,int,int,int,double) -> a
+    214:223:net.minecraft.world.level.pathfinder.BlockPathTypes evaluateBlockPathType(net.minecraft.world.level.BlockGetter,boolean,boolean,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
+    228:269:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int) -> a
+net.minecraft.world.level.pathfinder.WalkNodeEvaluator -> czl:
     float oldWaterCost -> j
-    33:34:void <init>() -> <init>
-    38:40:void prepare(net.minecraft.world.level.PathNavigationRegion,net.minecraft.world.entity.Mob) -> a
-    44:46:void done() -> a
-    52:92:net.minecraft.world.level.pathfinder.Node getStart() -> b
-    97:97:net.minecraft.world.level.pathfinder.Target getGoal(double,double,double) -> a
-    102:157:int getNeighbors(net.minecraft.world.level.pathfinder.Node[],net.minecraft.world.level.pathfinder.Node) -> a
-    161:173:boolean isDiagonalValid(net.minecraft.world.level.pathfinder.Node,net.minecraft.world.level.pathfinder.Node,net.minecraft.world.level.pathfinder.Node,net.minecraft.world.level.pathfinder.Node) -> a
-    179:181:double getFloorLevel(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
-    186:311:net.minecraft.world.level.pathfinder.Node getLandNode(int,int,int,int,double,net.minecraft.core.Direction) -> a
-    317:347:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int,net.minecraft.world.entity.Mob,int,int,int,boolean,boolean) -> a
-    351:387:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathTypes(net.minecraft.world.level.BlockGetter,int,int,int,int,int,int,boolean,boolean,java.util.EnumSet,net.minecraft.world.level.pathfinder.BlockPathTypes,net.minecraft.core.BlockPos) -> a
-    391:403:net.minecraft.world.level.pathfinder.BlockPathTypes evaluateBlockPathType(net.minecraft.world.level.BlockGetter,boolean,boolean,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
-    407:407:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.entity.Mob,net.minecraft.core.BlockPos) -> a
-    411:411:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.entity.Mob,int,int,int) -> a
-    416:416:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int) -> a
-    424:453:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathTypeStatic(net.minecraft.world.level.BlockGetter,int,int,int) -> b
-    458:477:net.minecraft.world.level.pathfinder.BlockPathTypes checkNeighbourBlocks(net.minecraft.world.level.BlockGetter,int,int,int,net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
-    481:546:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathTypeRaw(net.minecraft.world.level.BlockGetter,int,int,int) -> c
-net.minecraft.world.level.pathfinder.package-info -> cqx:
-net.minecraft.world.level.redstone.Redstone -> cqy:
+    it.unimi.dsi.fastutil.longs.Long2ObjectMap pathTypesByPosCache -> k
+    it.unimi.dsi.fastutil.objects.Object2BooleanMap collisionCache -> l
+    37:41:void <init>() -> <init>
+    45:47:void prepare(net.minecraft.world.level.PathNavigationRegion,net.minecraft.world.entity.Mob) -> a
+    51:55:void done() -> a
+    60:110:net.minecraft.world.level.pathfinder.Node getStart() -> b
+    114:115:boolean hasPositiveMalus(net.minecraft.core.BlockPos) -> b
+    120:120:net.minecraft.world.level.pathfinder.Target getGoal(double,double,double) -> a
+    125:176:int getNeighbors(net.minecraft.world.level.pathfinder.Node[],net.minecraft.world.level.pathfinder.Node) -> a
+    180:180:boolean isNeighborValid(net.minecraft.world.level.pathfinder.Node,net.minecraft.world.level.pathfinder.Node) -> a
+    184:199:boolean isDiagonalValid(net.minecraft.world.level.pathfinder.Node,net.minecraft.world.level.pathfinder.Node,net.minecraft.world.level.pathfinder.Node,net.minecraft.world.level.pathfinder.Node) -> a
+    205:219:boolean canReachWithoutCollision(net.minecraft.world.level.pathfinder.Node) -> a
+    223:225:double getFloorLevel(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> a
+    230:371:net.minecraft.world.level.pathfinder.Node getLandNode(int,int,int,int,double,net.minecraft.core.Direction,net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
+    375:375:boolean hasCollisions(net.minecraft.world.phys.AABB) -> a
+    381:414:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int,net.minecraft.world.entity.Mob,int,int,int,boolean,boolean) -> a
+    418:454:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathTypes(net.minecraft.world.level.BlockGetter,int,int,int,int,int,int,boolean,boolean,java.util.EnumSet,net.minecraft.world.level.pathfinder.BlockPathTypes,net.minecraft.core.BlockPos) -> a
+    458:470:net.minecraft.world.level.pathfinder.BlockPathTypes evaluateBlockPathType(net.minecraft.world.level.BlockGetter,boolean,boolean,net.minecraft.core.BlockPos,net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
+    474:474:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.entity.Mob,net.minecraft.core.BlockPos) -> a
+    478:478:net.minecraft.world.level.pathfinder.BlockPathTypes getCachedBlockType(net.minecraft.world.entity.Mob,int,int,int) -> a
+    483:483:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathType(net.minecraft.world.level.BlockGetter,int,int,int) -> a
+    494:526:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathTypeStatic(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos$MutableBlockPos) -> a
+    530:558:net.minecraft.world.level.pathfinder.BlockPathTypes checkNeighbourBlocks(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos$MutableBlockPos,net.minecraft.world.level.pathfinder.BlockPathTypes) -> a
+    562:626:net.minecraft.world.level.pathfinder.BlockPathTypes getBlockPathTypeRaw(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
+    630:632:boolean isBurningBlock(net.minecraft.world.level.block.state.BlockState) -> a
+    478:478:net.minecraft.world.level.pathfinder.BlockPathTypes lambda$getCachedBlockType$1(int,int,int,net.minecraft.world.entity.Mob,long) -> a
+    375:375:java.lang.Boolean lambda$hasCollisions$0(net.minecraft.world.phys.AABB,net.minecraft.world.phys.AABB) -> a
+net.minecraft.world.level.pathfinder.package-info -> czm:
+net.minecraft.world.level.redstone.Redstone -> czn:
     3:3:void <init>() -> <init>
-net.minecraft.world.level.redstone.package-info -> cqz:
-net.minecraft.world.level.saveddata.SaveDataDirtyRunnable -> cra:
+net.minecraft.world.level.redstone.package-info -> czo:
+net.minecraft.world.level.saveddata.SaveDataDirtyRunnable -> czp:
     net.minecraft.world.level.saveddata.SavedData savedData -> a
     6:8:void <init>(net.minecraft.world.level.saveddata.SavedData) -> <init>
     12:13:void run() -> run
-net.minecraft.world.level.saveddata.SavedData -> crb:
+net.minecraft.world.level.saveddata.SavedData -> czq:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.lang.String id -> b
     boolean dirty -> c
@@ -63736,7 +70040,7 @@ net.minecraft.world.level.saveddata.SavedData -> crb:
     39:39:java.lang.String getId() -> d
     43:57:void save(java.io.File) -> a
     14:14:void <clinit>() -> <clinit>
-net.minecraft.world.level.saveddata.maps.MapBanner -> crc:
+net.minecraft.world.level.saveddata.maps.MapBanner -> czr:
     net.minecraft.core.BlockPos pos -> a
     net.minecraft.world.item.DyeColor color -> b
     net.minecraft.network.chat.Component name -> c
@@ -63752,10 +70056,10 @@ net.minecraft.world.level.saveddata.maps.MapBanner -> crc:
     116:125:net.minecraft.nbt.CompoundTag save() -> e
     129:129:java.lang.String getId() -> f
     39:39:net.minecraft.world.level.block.state.BlockState lambda$fromWorld$0(net.minecraft.world.level.BlockGetter,net.minecraft.core.BlockPos) -> b
-net.minecraft.world.level.saveddata.maps.MapBanner$1 -> crc$1:
+net.minecraft.world.level.saveddata.maps.MapBanner$1 -> czr$1:
     int[] $SwitchMap$net$minecraft$world$item$DyeColor -> a
     56:56:void <clinit>() -> <clinit>
-net.minecraft.world.level.saveddata.maps.MapDecoration -> crd:
+net.minecraft.world.level.saveddata.maps.MapDecoration -> czs:
     net.minecraft.world.level.saveddata.maps.MapDecoration$Type type -> a
     byte x -> b
     byte y -> c
@@ -63774,7 +70078,7 @@ net.minecraft.world.level.saveddata.maps.MapDecoration -> crd:
     127:127:net.minecraft.network.chat.Component getName() -> g
     132:157:boolean equals(java.lang.Object) -> equals
     162:167:int hashCode() -> hashCode
-net.minecraft.world.level.saveddata.maps.MapDecoration$Type -> crd$a:
+net.minecraft.world.level.saveddata.maps.MapDecoration$Type -> czs$a:
     net.minecraft.world.level.saveddata.maps.MapDecoration$Type PLAYER -> a
     net.minecraft.world.level.saveddata.maps.MapDecoration$Type FRAME -> b
     net.minecraft.world.level.saveddata.maps.MapDecoration$Type RED_MARKER -> c
@@ -63816,7 +70120,7 @@ net.minecraft.world.level.saveddata.maps.MapDecoration$Type -> crd$a:
     67:67:int getMapColor() -> d
     71:71:net.minecraft.world.level.saveddata.maps.MapDecoration$Type byIcon(byte) -> a
     10:37:void <clinit>() -> <clinit>
-net.minecraft.world.level.saveddata.maps.MapFrame -> cre:
+net.minecraft.world.level.saveddata.maps.MapFrame -> czt:
     net.minecraft.core.BlockPos pos -> a
     int rotation -> b
     int entityId -> c
@@ -63828,43 +70132,47 @@ net.minecraft.world.level.saveddata.maps.MapFrame -> cre:
     42:42:int getEntityId() -> d
     46:46:java.lang.String getId() -> e
     50:50:java.lang.String frameId(net.minecraft.core.BlockPos) -> a
-net.minecraft.world.level.saveddata.maps.MapIndex -> crf:
+net.minecraft.world.level.saveddata.maps.MapIndex -> czu:
     it.unimi.dsi.fastutil.objects.Object2IntMap usedAuxIds -> a
     12:17:void <init>() -> <init>
     21:28:void load(net.minecraft.nbt.CompoundTag) -> a
     32:35:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
     39:42:int getFreeAuxValueForMap() -> a
-net.minecraft.world.level.saveddata.maps.MapItemSavedData -> crg:
+net.minecraft.world.level.saveddata.maps.MapItemSavedData -> czv:
+    org.apache.logging.log4j.Logger LOGGER -> k
     int x -> a
     int z -> b
-    net.minecraft.world.level.dimension.DimensionType dimension -> c
+    net.minecraft.resources.ResourceKey dimension -> c
     boolean trackingPosition -> d
     boolean unlimitedTracking -> e
     byte scale -> f
     byte[] colors -> g
     boolean locked -> h
     java.util.List carriedBy -> i
-    java.util.Map carriedByPlayers -> k
-    java.util.Map bannerMarkers -> l
+    java.util.Map carriedByPlayers -> l
+    java.util.Map bannerMarkers -> m
     java.util.Map decorations -> j
-    java.util.Map frameMarkers -> m
-    82:92:void <init>(java.lang.String) -> <init>
-    95:102:void setProperties(int,int,int,boolean,boolean,net.minecraft.world.level.dimension.DimensionType) -> a
-    105:112:void setOrigin(double,double,int) -> a
-    116:149:void load(net.minecraft.nbt.CompoundTag) -> a
-    153:174:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
-    178:185:void lockData(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
-    188:235:void tickCarriedBy(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
-    240:259:void addTargetDecoration(net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos,java.lang.String,net.minecraft.world.level.saveddata.maps.MapDecoration$Type) -> a
-    262:307:void addDecoration(net.minecraft.world.level.saveddata.maps.MapDecoration$Type,net.minecraft.world.level.LevelAccessor,java.lang.String,double,double,double,net.minecraft.network.chat.Component) -> a
-    311:317:net.minecraft.network.protocol.Packet getUpdatePacket(net.minecraft.world.item.ItemStack,net.minecraft.world.level.BlockGetter,net.minecraft.world.entity.player.Player) -> a
-    321:325:void setDirty(int,int) -> a
-    328:336:net.minecraft.world.level.saveddata.maps.MapItemSavedData$HoldingPlayer getHoldingPlayer(net.minecraft.world.entity.player.Player) -> a
-    340:373:void toggleBanner(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
-    376:386:void checkBanners(net.minecraft.world.level.BlockGetter,int,int) -> a
-    389:389:java.util.Collection getBanners() -> a
-    393:395:void removedFromFrame(net.minecraft.core.BlockPos,int) -> a
-net.minecraft.world.level.saveddata.maps.MapItemSavedData$HoldingPlayer -> crg$a:
+    java.util.Map frameMarkers -> n
+    91:101:void <init>(java.lang.String) -> <init>
+    104:111:void setProperties(int,int,int,boolean,boolean,net.minecraft.resources.ResourceKey) -> a
+    114:121:void setOrigin(double,double,int) -> a
+    125:156:void load(net.minecraft.nbt.CompoundTag) -> a
+    160:181:net.minecraft.nbt.CompoundTag save(net.minecraft.nbt.CompoundTag) -> b
+    185:192:void lockData(net.minecraft.world.level.saveddata.maps.MapItemSavedData) -> a
+    195:242:void tickCarriedBy(net.minecraft.world.entity.player.Player,net.minecraft.world.item.ItemStack) -> a
+    247:266:void addTargetDecoration(net.minecraft.world.item.ItemStack,net.minecraft.core.BlockPos,java.lang.String,net.minecraft.world.level.saveddata.maps.MapDecoration$Type) -> a
+    269:314:void addDecoration(net.minecraft.world.level.saveddata.maps.MapDecoration$Type,net.minecraft.world.level.LevelAccessor,java.lang.String,double,double,double,net.minecraft.network.chat.Component) -> a
+    318:324:net.minecraft.network.protocol.Packet getUpdatePacket(net.minecraft.world.item.ItemStack,net.minecraft.world.level.BlockGetter,net.minecraft.world.entity.player.Player) -> a
+    328:332:void setDirty(int,int) -> a
+    335:343:net.minecraft.world.level.saveddata.maps.MapItemSavedData$HoldingPlayer getHoldingPlayer(net.minecraft.world.entity.player.Player) -> a
+    347:380:void toggleBanner(net.minecraft.world.level.LevelAccessor,net.minecraft.core.BlockPos) -> a
+    383:393:void checkBanners(net.minecraft.world.level.BlockGetter,int,int) -> a
+    396:396:java.util.Collection getBanners() -> a
+    400:402:void removedFromFrame(net.minecraft.core.BlockPos,int) -> a
+    160:160:void lambda$save$1(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> a
+    127:127:java.lang.IllegalArgumentException lambda$load$0(net.minecraft.nbt.CompoundTag) -> c
+    36:36:void <clinit>() -> <clinit>
+net.minecraft.world.level.saveddata.maps.MapItemSavedData$HoldingPlayer -> czv$a:
     net.minecraft.world.entity.player.Player player -> a
     boolean dirtyData -> d
     int minDirtyX -> e
@@ -63874,12 +70182,12 @@ net.minecraft.world.level.saveddata.maps.MapItemSavedData$HoldingPlayer -> crg$a
     int tick -> i
     int step -> b
     net.minecraft.world.level.saveddata.maps.MapItemSavedData this$0 -> c
-    35:45:void <init>(net.minecraft.world.level.saveddata.maps.MapItemSavedData,net.minecraft.world.entity.player.Player) -> <init>
-    49:56:net.minecraft.network.protocol.Packet nextUpdatePacket(net.minecraft.world.item.ItemStack) -> a
-    60:72:void markDirty(int,int) -> a
-net.minecraft.world.level.saveddata.maps.package-info -> crh:
-net.minecraft.world.level.saveddata.package-info -> cri:
-net.minecraft.world.level.storage.CommandStorage -> crj:
+    44:54:void <init>(net.minecraft.world.level.saveddata.maps.MapItemSavedData,net.minecraft.world.entity.player.Player) -> <init>
+    58:65:net.minecraft.network.protocol.Packet nextUpdatePacket(net.minecraft.world.item.ItemStack) -> a
+    69:81:void markDirty(int,int) -> a
+net.minecraft.world.level.saveddata.maps.package-info -> czw:
+net.minecraft.world.level.saveddata.package-info -> czx:
+net.minecraft.world.level.storage.CommandStorage -> czy:
     java.util.Map namespaces -> a
     net.minecraft.world.level.storage.DimensionDataStorage storage -> b
     56:61:void <init>(net.minecraft.world.level.storage.DimensionDataStorage) -> <init>
@@ -63891,7 +70199,7 @@ net.minecraft.world.level.storage.CommandStorage -> crj:
     83:83:java.util.stream.Stream lambda$keys$2(java.util.Map$Entry) -> a
     79:79:net.minecraft.world.level.storage.CommandStorage$Container lambda$set$1(java.lang.String,java.lang.String) -> b
     72:72:net.minecraft.world.level.storage.CommandStorage$Container lambda$get$0(java.lang.String,java.lang.String) -> c
-net.minecraft.world.level.storage.CommandStorage$Container -> crj$a:
+net.minecraft.world.level.storage.CommandStorage$Container -> czy$a:
     java.util.Map storage -> a
     14:18:void <init>(java.lang.String) -> <init>
     22:26:void load(net.minecraft.nbt.CompoundTag) -> a
@@ -63901,56 +70209,52 @@ net.minecraft.world.level.storage.CommandStorage$Container -> crj$a:
     51:51:java.util.stream.Stream getKeys(java.lang.String) -> b
     51:51:net.minecraft.resources.ResourceLocation lambda$getKeys$1(java.lang.String,java.lang.String) -> a
     31:31:void lambda$save$0(net.minecraft.nbt.CompoundTag,java.lang.String,net.minecraft.nbt.CompoundTag) -> a
-net.minecraft.world.level.storage.DerivedLevelData -> crk:
-    net.minecraft.world.level.storage.LevelData wrapped -> b
-    25:27:void <init>(net.minecraft.world.level.storage.LevelData) -> <init>
-    31:31:net.minecraft.nbt.CompoundTag createTag(net.minecraft.nbt.CompoundTag) -> a
-    36:36:long getSeed() -> a
-    41:41:int getXSpawn() -> b
-    46:46:int getYSpawn() -> c
-    51:51:int getZSpawn() -> d
-    56:56:long getGameTime() -> e
-    61:61:long getDayTime() -> f
-    66:66:long getSizeOnDisk() -> g
-    71:71:net.minecraft.nbt.CompoundTag getLoadedPlayerTag() -> h
-    76:76:java.lang.String getLevelName() -> i
-    81:81:int getVersion() -> j
-    86:86:long getLastPlayed() -> k
-    91:91:boolean isThundering() -> l
-    96:96:int getThunderTime() -> m
-    101:101:boolean isRaining() -> n
-    106:106:int getRainTime() -> o
-    111:111:net.minecraft.world.level.GameType getGameType() -> p
-    116:116:void setXSpawn(int) -> a
-    120:120:void setYSpawn(int) -> b
-    124:124:void setZSpawn(int) -> c
-    128:128:void setGameTime(long) -> a
-    132:132:void setDayTime(long) -> b
-    136:136:void setSpawn(net.minecraft.core.BlockPos) -> a
-    140:140:void setLevelName(java.lang.String) -> a
-    144:144:void setVersion(int) -> d
-    148:148:void setThundering(boolean) -> a
-    152:152:void setThunderTime(int) -> e
-    156:156:void setRaining(boolean) -> b
-    160:160:void setRainTime(int) -> f
-    164:164:boolean isGenerateMapFeatures() -> q
-    169:169:boolean isHardcore() -> r
-    174:174:net.minecraft.world.level.LevelType getGeneratorType() -> s
-    179:179:void setGenerator(net.minecraft.world.level.LevelType) -> a
-    183:183:boolean getAllowCommands() -> t
-    188:188:void setAllowCommands(boolean) -> c
-    192:192:boolean isInitialized() -> u
-    197:197:void setInitialized(boolean) -> d
-    201:201:net.minecraft.world.level.GameRules getGameRules() -> v
-    206:206:net.minecraft.world.Difficulty getDifficulty() -> w
-    211:211:void setDifficulty(net.minecraft.world.Difficulty) -> a
-    215:215:boolean isDifficultyLocked() -> x
-    220:220:void setDifficultyLocked(boolean) -> e
-    224:224:net.minecraft.world.level.timers.TimerQueue getScheduledEvents() -> y
-    229:230:void setDimensionData(net.minecraft.world.level.dimension.DimensionType,net.minecraft.nbt.CompoundTag) -> a
-    234:234:net.minecraft.nbt.CompoundTag getDimensionData(net.minecraft.world.level.dimension.DimensionType) -> a
-    239:241:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
-net.minecraft.world.level.storage.DimensionDataStorage -> crl:
+net.minecraft.world.level.storage.DerivedLevelData -> czz:
+    net.minecraft.world.level.storage.WorldData worldData -> a
+    net.minecraft.world.level.storage.ServerLevelData wrapped -> b
+    24:27:void <init>(net.minecraft.world.level.storage.WorldData,net.minecraft.world.level.storage.ServerLevelData) -> <init>
+    31:31:int getXSpawn() -> a
+    36:36:int getYSpawn() -> b
+    41:41:int getZSpawn() -> c
+    46:46:long getGameTime() -> d
+    51:51:long getDayTime() -> e
+    56:56:java.lang.String getLevelName() -> f
+    61:61:int getClearWeatherTime() -> g
+    66:66:void setClearWeatherTime(int) -> a
+    70:70:boolean isThundering() -> h
+    75:75:int getThunderTime() -> i
+    80:80:boolean isRaining() -> j
+    85:85:int getRainTime() -> k
+    90:90:net.minecraft.world.level.GameType getGameType() -> l
+    95:95:void setXSpawn(int) -> b
+    99:99:void setYSpawn(int) -> c
+    103:103:void setZSpawn(int) -> d
+    107:107:void setGameTime(long) -> a
+    111:111:void setDayTime(long) -> b
+    115:115:void setSpawn(net.minecraft.core.BlockPos) -> a
+    119:119:void setThundering(boolean) -> a
+    123:123:void setThunderTime(int) -> e
+    127:127:void setRaining(boolean) -> b
+    131:131:void setRainTime(int) -> f
+    135:135:void setGameType(net.minecraft.world.level.GameType) -> a
+    139:139:boolean isHardcore() -> m
+    144:144:boolean getAllowCommands() -> n
+    149:149:boolean isInitialized() -> o
+    154:154:void setInitialized(boolean) -> c
+    158:158:net.minecraft.world.level.GameRules getGameRules() -> p
+    163:163:net.minecraft.world.level.border.WorldBorder$Settings getWorldBorder() -> q
+    168:168:void setWorldBorder(net.minecraft.world.level.border.WorldBorder$Settings) -> a
+    172:172:net.minecraft.world.Difficulty getDifficulty() -> r
+    177:177:boolean isDifficultyLocked() -> s
+    182:182:net.minecraft.world.level.timers.TimerQueue getScheduledEvents() -> t
+    187:187:int getWanderingTraderSpawnDelay() -> u
+    193:193:void setWanderingTraderSpawnDelay(int) -> g
+    197:197:int getWanderingTraderSpawnChance() -> v
+    203:203:void setWanderingTraderSpawnChance(int) -> h
+    207:207:java.util.UUID getWanderingTraderId() -> w
+    212:212:void setWanderingTraderId(java.util.UUID) -> a
+    216:218:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
+net.minecraft.world.level.storage.DimensionDataStorage -> daa:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.util.Map cache -> b
     com.mojang.datafixers.DataFixer fixerUpper -> c
@@ -63965,269 +70269,343 @@ net.minecraft.world.level.storage.DimensionDataStorage -> crl:
     103:115:boolean isGzip(java.io.PushbackInputStream) -> a
     119:124:void save() -> a
     26:26:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.LevelData -> crm:
-    java.lang.String minecraftVersionName -> b
-    int minecraftVersion -> c
-    boolean snapshot -> d
-    net.minecraft.world.Difficulty DEFAULT_DIFFICULTY -> a
-    long seed -> e
-    net.minecraft.world.level.LevelType generator -> f
-    net.minecraft.nbt.CompoundTag generatorOptions -> g
-    java.lang.String legacyCustomOptions -> h
-    int xSpawn -> i
-    int ySpawn -> j
-    int zSpawn -> k
-    long gameTime -> l
-    long dayTime -> m
-    long lastPlayed -> n
-    long sizeOnDisk -> o
-    com.mojang.datafixers.DataFixer fixerUpper -> p
-    int playerDataVersion -> q
-    boolean upgradedPlayerTag -> r
-    net.minecraft.nbt.CompoundTag loadedPlayerTag -> s
-    java.lang.String levelName -> t
-    int version -> u
-    int clearWeatherTime -> v
-    boolean raining -> w
-    int rainTime -> x
-    boolean thundering -> y
-    int thunderTime -> z
-    net.minecraft.world.level.GameType gameType -> A
-    boolean generateMapFeatures -> B
-    boolean hardcore -> C
-    boolean allowCommands -> D
-    boolean initialized -> E
-    net.minecraft.world.Difficulty difficulty -> F
-    boolean difficultyLocked -> G
-    double borderX -> H
-    double borderZ -> I
-    double borderSize -> J
-    long borderSizeLerpTime -> K
-    double borderSizeLerpTarget -> L
-    double borderSafeZone -> M
-    double borderDamagePerBlock -> N
-    int borderWarningBlocks -> O
-    int borderWarningTime -> P
-    java.util.Set disabledDataPacks -> Q
-    java.util.Set enabledDataPacks -> R
-    java.util.Map dimensionData -> S
-    net.minecraft.nbt.CompoundTag customBossEvents -> T
-    int wanderingTraderSpawnDelay -> U
-    int wanderingTraderSpawnChance -> V
-    java.util.UUID wanderingTraderId -> W
-    java.util.Set knownServerBrands -> X
-    boolean wasModded -> Y
-    net.minecraft.world.level.GameRules gameRules -> Z
-    net.minecraft.world.level.timers.TimerQueue scheduledEvents -> aa
-    42:105:void <init>() -> <init>
-    42:272:void <init>(net.minecraft.nbt.CompoundTag,com.mojang.datafixers.DataFixer,int,net.minecraft.nbt.CompoundTag) -> <init>
-    42:281:void <init>(net.minecraft.world.level.LevelSettings,java.lang.String) -> <init>
-    284:291:void setLevelSettings(net.minecraft.world.level.LevelSettings) -> a
-    294:300:net.minecraft.nbt.CompoundTag createTag(net.minecraft.nbt.CompoundTag) -> a
-    304:397:void setTagData(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag) -> a
-    400:400:long getSeed() -> a
-    404:404:long obfuscateSeed(long) -> c
-    408:408:int getXSpawn() -> b
-    412:412:int getYSpawn() -> c
-    416:416:int getZSpawn() -> d
-    420:420:long getGameTime() -> e
-    424:424:long getDayTime() -> f
-    428:428:long getSizeOnDisk() -> g
-    432:442:void updatePlayerTag() -> T
-    445:446:net.minecraft.nbt.CompoundTag getLoadedPlayerTag() -> h
-    450:451:void setXSpawn(int) -> a
-    454:455:void setYSpawn(int) -> b
-    458:459:void setZSpawn(int) -> c
-    462:463:void setGameTime(long) -> a
-    466:467:void setDayTime(long) -> b
-    470:473:void setSpawn(net.minecraft.core.BlockPos) -> a
-    476:476:java.lang.String getLevelName() -> i
-    480:481:void setLevelName(java.lang.String) -> a
-    484:484:int getVersion() -> j
-    488:489:void setVersion(int) -> d
-    492:492:long getLastPlayed() -> k
-    496:496:int getClearWeatherTime() -> z
-    500:501:void setClearWeatherTime(int) -> g
-    504:504:boolean isThundering() -> l
-    508:509:void setThundering(boolean) -> a
-    512:512:int getThunderTime() -> m
-    516:517:void setThunderTime(int) -> e
-    520:520:boolean isRaining() -> n
-    524:525:void setRaining(boolean) -> b
-    528:528:int getRainTime() -> o
-    532:533:void setRainTime(int) -> f
-    536:536:net.minecraft.world.level.GameType getGameType() -> p
-    540:540:boolean isGenerateMapFeatures() -> q
-    544:545:void setGenerateMapFeatures(boolean) -> f
-    548:549:void setGameType(net.minecraft.world.level.GameType) -> a
-    552:552:boolean isHardcore() -> r
-    556:557:void setHardcore(boolean) -> g
-    560:560:net.minecraft.world.level.LevelType getGeneratorType() -> s
-    564:565:void setGenerator(net.minecraft.world.level.LevelType) -> a
-    568:568:net.minecraft.nbt.CompoundTag getGeneratorOptions() -> A
-    572:573:void setGeneratorOptions(net.minecraft.nbt.CompoundTag) -> b
-    576:576:boolean getAllowCommands() -> t
-    580:581:void setAllowCommands(boolean) -> c
-    584:584:boolean isInitialized() -> u
-    588:589:void setInitialized(boolean) -> d
-    592:592:net.minecraft.world.level.GameRules getGameRules() -> v
-    596:596:double getBorderX() -> B
-    600:600:double getBorderZ() -> C
-    604:604:double getBorderSize() -> D
-    608:609:void setBorderSize(double) -> a
-    612:612:long getBorderSizeLerpTime() -> E
-    616:617:void setBorderSizeLerpTime(long) -> d
-    620:620:double getBorderSizeLerpTarget() -> F
-    624:625:void setBorderSizeLerpTarget(double) -> b
-    628:629:void setBorderZ(double) -> c
-    632:633:void setBorderX(double) -> d
-    636:636:double getBorderSafeZone() -> G
-    640:641:void setBorderSafeZone(double) -> e
-    644:644:double getBorderDamagePerBlock() -> H
-    648:649:void setBorderDamagePerBlock(double) -> f
-    652:652:int getBorderWarningBlocks() -> I
-    656:656:int getBorderWarningTime() -> J
-    660:661:void setBorderWarningBlocks(int) -> h
-    664:665:void setBorderWarningTime(int) -> i
-    668:668:net.minecraft.world.Difficulty getDifficulty() -> w
-    672:673:void setDifficulty(net.minecraft.world.Difficulty) -> a
-    676:676:boolean isDifficultyLocked() -> x
-    680:681:void setDifficultyLocked(boolean) -> e
-    684:684:net.minecraft.world.level.timers.TimerQueue getScheduledEvents() -> y
-    688:716:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
-    719:723:net.minecraft.nbt.CompoundTag getDimensionData(net.minecraft.world.level.dimension.DimensionType) -> a
-    727:728:void setDimensionData(net.minecraft.world.level.dimension.DimensionType,net.minecraft.nbt.CompoundTag) -> a
-    731:731:int getMinecraftVersion() -> K
-    735:735:boolean isSnapshot() -> L
-    739:739:java.lang.String getMinecraftVersionName() -> M
-    743:743:java.util.Set getDisabledDataPacks() -> N
-    747:747:java.util.Set getEnabledDataPacks() -> O
-    752:752:net.minecraft.nbt.CompoundTag getCustomBossEvents() -> P
-    756:757:void setCustomBossEvents(net.minecraft.nbt.CompoundTag) -> c
-    760:760:int getWanderingTraderSpawnDelay() -> Q
-    764:765:void setWanderingTraderSpawnDelay(int) -> j
-    768:768:int getWanderingTraderSpawnChance() -> R
-    772:773:void setWanderingTraderSpawnChance(int) -> k
-    777:777:java.util.UUID getWanderingTraderId() -> S
-    781:782:void setWanderingTraderId(java.util.UUID) -> a
-    785:787:void setModdedInfo(java.lang.String,boolean) -> a
-    715:715:java.lang.String lambda$fillCrashReportCategory$10() -> U
-    714:714:java.lang.String lambda$fillCrashReportCategory$9() -> V
-    697:711:java.lang.String lambda$fillCrashReportCategory$8() -> W
-    695:695:java.lang.String lambda$fillCrashReportCategory$7() -> X
-    694:694:java.lang.String lambda$fillCrashReportCategory$6() -> Y
-    693:693:java.lang.String lambda$fillCrashReportCategory$5() -> Z
-    692:692:java.lang.String lambda$fillCrashReportCategory$4() -> aa
-    691:691:java.lang.String lambda$fillCrashReportCategory$3() -> ab
-    690:690:java.lang.String lambda$fillCrashReportCategory$2() -> ac
-    689:689:java.lang.String lambda$fillCrashReportCategory$1() -> ad
-    688:688:java.lang.String lambda$fillCrashReportCategory$0() -> ae
-    40:40:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.LevelStorage -> crn:
-    org.apache.logging.log4j.Logger LOGGER -> b
-    java.io.File worldDir -> c
-    java.io.File playerDir -> d
-    long sessionId -> e
-    java.lang.String levelId -> f
-    net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager structureManager -> g
-    com.mojang.datafixers.DataFixer fixerUpper -> a
-    32:52:void <init>(java.io.File,java.lang.String,net.minecraft.server.MinecraftServer,com.mojang.datafixers.DataFixer) -> <init>
-    55:82:void saveLevelData(net.minecraft.world.level.storage.LevelData,net.minecraft.nbt.CompoundTag) -> a
-    86:97:void initiateSession() -> h
-    100:100:java.io.File getFolder() -> a
-    105:117:void checkSession() -> b
-    121:132:net.minecraft.world.level.storage.LevelData prepareLevel() -> c
-    136:137:void saveLevelData(net.minecraft.world.level.storage.LevelData) -> a
-    142:153:void save(net.minecraft.world.entity.player.Player) -> a
-    158:171:net.minecraft.nbt.CompoundTag load(net.minecraft.world.entity.player.Player) -> b
-    175:186:java.lang.String[] getSeenPlayers() -> d
-    190:190:java.lang.String getLevelId() -> e
-    194:194:net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager getStructureManager() -> f
-    198:198:com.mojang.datafixers.DataFixer getFixerUpper() -> g
-    29:29:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.LevelStorageException -> cro:
+net.minecraft.world.level.storage.LevelData -> dab:
+    int getXSpawn() -> a
+    int getYSpawn() -> b
+    int getZSpawn() -> c
+    long getGameTime() -> d
+    long getDayTime() -> e
+    boolean isThundering() -> h
+    boolean isRaining() -> j
+    void setRaining(boolean) -> b
+    boolean isHardcore() -> m
+    net.minecraft.world.level.GameRules getGameRules() -> p
+    net.minecraft.world.Difficulty getDifficulty() -> r
+    boolean isDifficultyLocked() -> s
+    34:36:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
+    35:35:java.lang.String lambda$fillCrashReportCategory$1() -> f
+    34:34:java.lang.String lambda$fillCrashReportCategory$0() -> g
+net.minecraft.world.level.storage.LevelResource -> dac:
+    net.minecraft.world.level.storage.LevelResource PLAYER_ADVANCEMENTS_DIR -> a
+    net.minecraft.world.level.storage.LevelResource PLAYER_STATS_DIR -> b
+    net.minecraft.world.level.storage.LevelResource PLAYER_DATA_DIR -> c
+    net.minecraft.world.level.storage.LevelResource PLAYER_OLD_DATA_DIR -> d
+    net.minecraft.world.level.storage.LevelResource LEVEL_DATA_FILE -> e
+    net.minecraft.world.level.storage.LevelResource GENERATED_DIR -> f
+    net.minecraft.world.level.storage.LevelResource DATAPACK_DIR -> g
+    net.minecraft.world.level.storage.LevelResource MAP_RESOURCE_FILE -> h
+    net.minecraft.world.level.storage.LevelResource ROOT -> i
+    java.lang.String id -> j
+    16:18:void <init>(java.lang.String) -> <init>
+    21:21:java.lang.String getId() -> a
+    26:26:java.lang.String toString() -> toString
+    4:12:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.LevelStorageException -> dad:
     5:6:void <init>(java.lang.String) -> <init>
-net.minecraft.world.level.storage.LevelStorageSource -> crp:
+net.minecraft.world.level.storage.LevelStorageSource -> dae:
     org.apache.logging.log4j.Logger LOGGER -> a
     java.time.format.DateTimeFormatter FORMATTER -> b
-    java.nio.file.Path baseDir -> c
-    java.nio.file.Path backupDir -> d
-    com.mojang.datafixers.DataFixer fixerUpper -> e
-    59:68:void <init>(java.nio.file.Path,java.nio.file.Path,com.mojang.datafixers.DataFixer) -> <init>
-    71:71:java.lang.String getName() -> a
-    75:101:java.util.List getLevelList() -> b
-    105:105:int getStorageVersion() -> e
-    109:109:net.minecraft.world.level.storage.LevelStorage selectLevel(java.lang.String,net.minecraft.server.MinecraftServer) -> a
-    113:113:net.minecraft.world.level.storage.LevelStorage selectLevel(java.nio.file.Path,com.mojang.datafixers.DataFixer,java.lang.String,net.minecraft.server.MinecraftServer) -> a
-    117:118:boolean requiresConversion(java.lang.String) -> a
-    122:122:boolean convertLevel(java.lang.String,net.minecraft.util.ProgressListener) -> a
-    127:127:net.minecraft.world.level.storage.LevelData getDataTagFor(java.lang.String) -> b
-    132:149:net.minecraft.world.level.storage.LevelData getDataTagFor(java.nio.file.Path,com.mojang.datafixers.DataFixer,java.lang.String) -> a
-    155:164:net.minecraft.world.level.storage.LevelData getLevelData(java.io.File,com.mojang.datafixers.DataFixer) -> a
-    168:185:void renameLevel(java.lang.String,java.lang.String) -> a
-    189:194:boolean isNewLevelIdAcceptable(java.lang.String) -> c
-    199:223:boolean deleteLevel(java.lang.String) -> d
-    227:243:boolean deleteRecursive(java.io.File[]) -> a
-    247:247:boolean levelExists(java.lang.String) -> e
-    251:251:java.nio.file.Path getBaseDir() -> c
-    255:255:java.io.File getFile(java.lang.String,java.lang.String) -> b
-    259:259:java.nio.file.Path getLevelPath(java.lang.String) -> g
-    263:263:java.nio.file.Path getBackupPath() -> d
-    267:295:long makeWorldBackup(java.lang.String) -> f
-    41:54:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.LevelStorageSource$1 -> crp$1:
+    com.google.common.collect.ImmutableList OLD_SETTINGS_KEYS -> c
+    java.nio.file.Path baseDir -> d
+    java.nio.file.Path backupDir -> e
+    com.mojang.datafixers.DataFixer fixerUpper -> f
+    91:100:void <init>(java.nio.file.Path,java.nio.file.Path,com.mojang.datafixers.DataFixer) -> <init>
+    103:103:net.minecraft.world.level.storage.LevelStorageSource createDefault(java.nio.file.Path) -> a
+    107:118:com.mojang.datafixers.util.Pair readWorldGenSettings(com.mojang.serialization.Dynamic,com.mojang.datafixers.DataFixer,int) -> a
+    122:122:net.minecraft.world.level.DataPackConfig readDataPackConfig(com.mojang.serialization.Dynamic) -> a
+    126:126:java.lang.String getName() -> a
+    130:156:java.util.List getLevelList() -> b
+    160:160:int getStorageVersion() -> g
+    165:181:java.lang.Object readLevelData(java.io.File,java.util.function.BiFunction) -> a
+    187:196:net.minecraft.world.level.DataPackConfig getDataPacks(java.io.File,com.mojang.datafixers.DataFixer) -> b
+    200:200:java.util.function.BiFunction getLevelData(com.mojang.serialization.DynamicOps,net.minecraft.world.level.DataPackConfig) -> b
+    220:220:java.util.function.BiFunction levelSummaryReader(java.io.File,boolean) -> a
+    246:251:boolean isNewLevelIdAcceptable(java.lang.String) -> a
+    256:256:boolean levelExists(java.lang.String) -> b
+    260:260:java.nio.file.Path getBaseDir() -> c
+    264:264:java.nio.file.Path getBackupPath() -> d
+    268:268:net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess createAccess(java.lang.String) -> c
+    222:240:net.minecraft.world.level.storage.LevelSummary lambda$levelSummaryReader$1(java.io.File,boolean,java.io.File,com.mojang.datafixers.DataFixer) -> a
+    202:215:net.minecraft.world.level.storage.PrimaryLevelData lambda$getLevelData$0(com.mojang.serialization.DynamicOps,net.minecraft.world.level.DataPackConfig,java.io.File,com.mojang.datafixers.DataFixer) -> a
+    59:59:java.nio.file.Path access$000(net.minecraft.world.level.storage.LevelStorageSource) -> a
+    59:59:com.mojang.datafixers.DataFixer access$100(net.minecraft.world.level.storage.LevelStorageSource) -> b
+    59:59:int access$200(net.minecraft.world.level.storage.LevelStorageSource) -> c
+    59:59:java.util.function.BiFunction access$300(net.minecraft.world.level.storage.LevelStorageSource,java.io.File,boolean) -> a
+    59:59:java.lang.Object access$400(net.minecraft.world.level.storage.LevelStorageSource,java.io.File,java.util.function.BiFunction) -> a
+    59:59:java.util.function.BiFunction access$500(com.mojang.serialization.DynamicOps,net.minecraft.world.level.DataPackConfig) -> a
+    59:59:org.apache.logging.log4j.Logger access$600() -> e
+    59:59:java.time.format.DateTimeFormatter access$900() -> f
+    59:59:net.minecraft.world.level.DataPackConfig access$1000(java.io.File,com.mojang.datafixers.DataFixer) -> a
+    60:77:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess -> dae$a:
+    net.minecraft.util.DirectoryLock lock -> b
+    java.nio.file.Path levelPath -> c
+    java.lang.String levelId -> d
+    java.util.Map resources -> e
+    net.minecraft.world.level.storage.LevelStorageSource this$0 -> a
+    275:281:void <init>(net.minecraft.world.level.storage.LevelStorageSource,java.lang.String) -> <init>
+    284:284:java.lang.String getLevelId() -> a
+    288:288:java.nio.file.Path getLevelPath(net.minecraft.world.level.storage.LevelResource) -> a
+    292:292:java.io.File getDimensionPath(net.minecraft.resources.ResourceKey) -> a
+    296:299:void checkLock() -> i
+    302:303:net.minecraft.world.level.storage.PlayerDataStorage createPlayerStorage() -> b
+    307:308:boolean requiresConversion() -> c
+    312:313:boolean convertLevel(net.minecraft.util.ProgressListener) -> a
+    318:319:net.minecraft.world.level.storage.LevelSummary getSummary() -> d
+    324:325:net.minecraft.world.level.storage.WorldData getDataTag(com.mojang.serialization.DynamicOps,net.minecraft.world.level.DataPackConfig) -> a
+    330:331:net.minecraft.world.level.DataPackConfig getDataPacks() -> e
+    335:336:void saveDataTag(net.minecraft.core.RegistryAccess,net.minecraft.world.level.storage.WorldData) -> a
+    339:356:void saveDataTag(net.minecraft.core.RegistryAccess,net.minecraft.world.level.storage.WorldData,net.minecraft.nbt.CompoundTag) -> a
+    359:360:java.io.File getIconFile() -> f
+    364:410:void deleteLevel() -> g
+    413:428:void renameLevel(java.lang.String) -> a
+    431:461:long makeWorldBackup() -> h
+    466:467:void close() -> close
+    331:331:net.minecraft.world.level.DataPackConfig lambda$getDataPacks$1(java.io.File,com.mojang.datafixers.DataFixer) -> a
+    288:288:java.nio.file.Path lambda$getLevelPath$0(net.minecraft.world.level.storage.LevelResource) -> b
+    271:271:java.nio.file.Path access$700(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess) -> a
+    271:271:net.minecraft.util.DirectoryLock access$800(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess) -> b
+net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess$1 -> dae$a$1:
+    java.nio.file.Path val$lockPath -> a
+    net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess this$1 -> b
+    372:372:void <init>(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,java.nio.file.Path) -> <init>
+    375:379:java.nio.file.FileVisitResult visitFile(java.nio.file.Path,java.nio.file.attribute.BasicFileAttributes) -> a
+    384:394:java.nio.file.FileVisitResult postVisitDirectory(java.nio.file.Path,java.io.IOException) -> a
+    372:372:java.nio.file.FileVisitResult postVisitDirectory(java.lang.Object,java.io.IOException) -> postVisitDirectory
+    372:372:java.nio.file.FileVisitResult visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes) -> visitFile
+net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess$2 -> dae$a$2:
     java.nio.file.Path val$rootPath -> a
-    java.nio.file.Path val$levelPath -> b
-    java.util.zip.ZipOutputStream val$stream -> c
-    net.minecraft.world.level.storage.LevelStorageSource this$0 -> d
-    282:282:void <init>(net.minecraft.world.level.storage.LevelStorageSource,java.nio.file.Path,java.nio.file.Path,java.util.zip.ZipOutputStream) -> <init>
-    285:290:java.nio.file.FileVisitResult visitFile(java.nio.file.Path,java.nio.file.attribute.BasicFileAttributes) -> a
-    282:282:java.nio.file.FileVisitResult visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes) -> visitFile
-net.minecraft.world.level.storage.LevelSummary -> crq:
-    java.lang.String levelId -> a
-    java.lang.String levelName -> b
-    long lastPlayed -> c
-    long sizeOnDisk -> d
-    boolean requiresConversion -> e
-    net.minecraft.world.level.GameType gameMode -> f
-    boolean hardcore -> g
-    boolean hasCheats -> h
-    java.lang.String worldVersionName -> i
-    int worldVersion -> j
-    boolean snapshot -> k
-    net.minecraft.world.level.LevelType generatorType -> l
-    28:41:void <init>(net.minecraft.world.level.storage.LevelData,java.lang.String,java.lang.String,long,boolean) -> <init>
-    44:44:java.lang.String getLevelId() -> a
-    48:48:java.lang.String getLevelName() -> b
-    52:52:long getSizeOnDisk() -> c
-    56:56:boolean isRequiresConversion() -> d
-    60:60:long getLastPlayed() -> e
-    65:71:int compareTo(net.minecraft.world.level.storage.LevelSummary) -> a
-    75:75:net.minecraft.world.level.GameType getGameMode() -> f
-    79:79:boolean isHardcore() -> g
-    83:83:boolean hasCheats() -> h
-    87:90:net.minecraft.network.chat.Component getWorldVersionName() -> i
-    94:94:int getWorldVersion() -> j
-    98:98:boolean isSnapshot() -> k
-    103:103:boolean markVersionInList() -> l
-    107:107:boolean askToOpenWorld() -> m
-    111:111:boolean isOldCustomizedWorld() -> n
-    117:117:boolean shouldBackup() -> o
-    11:11:int compareTo(java.lang.Object) -> compareTo
-net.minecraft.world.level.storage.McRegionUpgrader -> crr:
+    java.util.zip.ZipOutputStream val$stream -> b
+    net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess this$1 -> c
+    445:445:void <init>(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,java.nio.file.Path,java.util.zip.ZipOutputStream) -> <init>
+    448:456:java.nio.file.FileVisitResult visitFile(java.nio.file.Path,java.nio.file.attribute.BasicFileAttributes) -> a
+    445:445:java.nio.file.FileVisitResult visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes) -> visitFile
+net.minecraft.world.level.storage.LevelSummary -> daf:
+    net.minecraft.world.level.LevelSettings settings -> a
+    net.minecraft.world.level.storage.LevelVersion levelVersion -> b
+    java.lang.String levelId -> c
+    boolean requiresConversion -> d
+    boolean locked -> e
+    java.io.File icon -> f
+    net.minecraft.network.chat.Component info -> g
+    27:34:void <init>(net.minecraft.world.level.LevelSettings,net.minecraft.world.level.storage.LevelVersion,java.lang.String,boolean,boolean,java.io.File) -> <init>
+    37:37:java.lang.String getLevelId() -> a
+    41:41:java.lang.String getLevelName() -> b
+    45:45:java.io.File getIcon() -> c
+    49:49:boolean isRequiresConversion() -> d
+    53:53:long getLastPlayed() -> e
+    58:64:int compareTo(net.minecraft.world.level.storage.LevelSummary) -> a
+    68:68:net.minecraft.world.level.LevelSettings getSettings() -> f
+    72:72:net.minecraft.world.level.GameType getGameMode() -> g
+    76:76:boolean isHardcore() -> h
+    80:80:boolean hasCheats() -> i
+    84:87:net.minecraft.network.chat.MutableComponent getWorldVersionName() -> j
+    91:91:net.minecraft.world.level.storage.LevelVersion levelVersion() -> k
+    95:95:boolean markVersionInList() -> l
+    99:99:boolean askToOpenWorld() -> m
+    104:104:boolean shouldBackup() -> n
+    109:109:boolean isLocked() -> o
+    113:117:net.minecraft.network.chat.Component getInfo() -> p
+    121:145:net.minecraft.network.chat.Component createInfo() -> q
+    17:17:int compareTo(java.lang.Object) -> compareTo
+net.minecraft.world.level.storage.LevelVersion -> dag:
+    int levelDataVersion -> a
+    long lastPlayed -> b
+    java.lang.String minecraftVersionName -> c
+    int minecraftVersion -> d
+    boolean snapshot -> e
+    14:20:void <init>(int,long,java.lang.String,int,boolean) -> <init>
+    23:36:net.minecraft.world.level.storage.LevelVersion parse(com.mojang.serialization.Dynamic) -> a
+    40:40:int levelDataVersion() -> a
+    44:44:long lastPlayed() -> b
+    48:48:java.lang.String minecraftVersionName() -> c
+    52:52:int minecraftVersion() -> d
+    56:56:boolean snapshot() -> e
+net.minecraft.world.level.storage.McRegionUpgrader -> dah:
     org.apache.logging.log4j.Logger LOGGER -> a
     33:33:void <init>() -> <init>
-    38:92:boolean convertLevel(java.nio.file.Path,com.mojang.datafixers.DataFixer,java.lang.String,net.minecraft.util.ProgressListener) -> a
-    96:112:void makeMcrLevelDatBackup(java.nio.file.Path,java.lang.String) -> a
-    115:122:void convertRegions(java.io.File,java.lang.Iterable,net.minecraft.world.level.biome.BiomeSource,int,int,net.minecraft.util.ProgressListener) -> a
-    125:169:void convertRegion(java.io.File,java.io.File,net.minecraft.world.level.biome.BiomeSource,int,int,net.minecraft.util.ProgressListener) -> a
-    172:178:void addRegionFiles(java.io.File,java.util.Collection) -> a
-    173:173:boolean lambda$addRegionFiles$0(java.io.File,java.lang.String) -> a
+    38:87:boolean convertLevel(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,net.minecraft.util.ProgressListener) -> a
+    91:101:void makeMcrLevelDatBackup(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess) -> a
+    104:111:void convertRegions(java.io.File,java.lang.Iterable,net.minecraft.world.level.biome.BiomeSource,int,int,net.minecraft.util.ProgressListener) -> a
+    114:158:void convertRegion(java.io.File,java.io.File,net.minecraft.world.level.biome.BiomeSource,int,int,net.minecraft.util.ProgressListener) -> a
+    161:167:void addRegionFiles(java.io.File,java.util.Collection) -> a
+    162:162:boolean lambda$addRegionFiles$0(java.io.File,java.lang.String) -> a
     34:34:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.PlayerIO -> crs:
-    void save(net.minecraft.world.entity.player.Player) -> a
-    net.minecraft.nbt.CompoundTag load(net.minecraft.world.entity.player.Player) -> b
-net.minecraft.world.level.storage.loot.BinomialDistributionGenerator -> crt:
+net.minecraft.world.level.storage.PlayerDataStorage -> dai:
+    org.apache.logging.log4j.Logger LOGGER -> b
+    java.io.File playerDir -> c
+    com.mojang.datafixers.DataFixer fixerUpper -> a
+    25:29:void <init>(net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess,com.mojang.datafixers.DataFixer) -> <init>
+    33:43:void save(net.minecraft.world.entity.player.Player) -> a
+    47:60:net.minecraft.nbt.CompoundTag load(net.minecraft.world.entity.player.Player) -> b
+    64:75:java.lang.String[] getSeenPlayers() -> a
+    21:21:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.PrimaryLevelData -> daj:
+    org.apache.logging.log4j.Logger LOGGER -> a
+    net.minecraft.world.level.LevelSettings settings -> b
+    net.minecraft.world.level.levelgen.WorldGenSettings worldGenSettings -> c
+    com.mojang.serialization.Lifecycle worldGenSettingsLifecycle -> d
+    int xSpawn -> e
+    int ySpawn -> f
+    int zSpawn -> g
+    long gameTime -> h
+    long dayTime -> i
+    com.mojang.datafixers.DataFixer fixerUpper -> j
+    int playerDataVersion -> k
+    boolean upgradedPlayerTag -> l
+    net.minecraft.nbt.CompoundTag loadedPlayerTag -> m
+    int version -> n
+    int clearWeatherTime -> o
+    boolean raining -> p
+    int rainTime -> q
+    boolean thundering -> r
+    int thunderTime -> s
+    boolean initialized -> t
+    boolean difficultyLocked -> u
+    net.minecraft.world.level.border.WorldBorder$Settings worldBorder -> v
+    net.minecraft.nbt.CompoundTag endDragonFightData -> w
+    net.minecraft.nbt.CompoundTag customBossEvents -> x
+    int wanderingTraderSpawnDelay -> y
+    int wanderingTraderSpawnChance -> z
+    java.util.UUID wanderingTraderId -> A
+    java.util.Set knownServerBrands -> B
+    boolean wasModded -> C
+    net.minecraft.world.level.timers.TimerQueue scheduledEvents -> D
+    116:145:void <init>(com.mojang.datafixers.DataFixer,int,net.minecraft.nbt.CompoundTag,boolean,int,int,int,long,long,int,int,int,boolean,int,boolean,boolean,boolean,net.minecraft.world.level.border.WorldBorder$Settings,int,int,java.util.UUID,java.util.LinkedHashSet,net.minecraft.world.level.timers.TimerQueue,net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag,net.minecraft.world.level.LevelSettings,net.minecraft.world.level.levelgen.WorldGenSettings,com.mojang.serialization.Lifecycle) -> <init>
+    148:177:void <init>(net.minecraft.world.level.LevelSettings,net.minecraft.world.level.levelgen.WorldGenSettings,com.mojang.serialization.Lifecycle) -> <init>
+    180:211:net.minecraft.world.level.storage.PrimaryLevelData parse(com.mojang.serialization.Dynamic,com.mojang.datafixers.DataFixer,int,net.minecraft.nbt.CompoundTag,net.minecraft.world.level.LevelSettings,net.minecraft.world.level.storage.LevelVersion,net.minecraft.world.level.levelgen.WorldGenSettings,com.mojang.serialization.Lifecycle) -> a
+    221:227:net.minecraft.nbt.CompoundTag createTag(net.minecraft.core.RegistryAccess,net.minecraft.nbt.CompoundTag) -> a
+    231:290:void setTagData(net.minecraft.core.RegistryAccess,net.minecraft.nbt.CompoundTag,net.minecraft.nbt.CompoundTag) -> a
+    294:294:int getXSpawn() -> a
+    299:299:int getYSpawn() -> b
+    304:304:int getZSpawn() -> c
+    309:309:long getGameTime() -> d
+    314:314:long getDayTime() -> e
+    318:328:void updatePlayerTag() -> I
+    332:333:net.minecraft.nbt.CompoundTag getLoadedPlayerTag() -> x
+    338:339:void setXSpawn(int) -> b
+    343:344:void setYSpawn(int) -> c
+    348:349:void setZSpawn(int) -> d
+    353:354:void setGameTime(long) -> a
+    358:359:void setDayTime(long) -> b
+    363:366:void setSpawn(net.minecraft.core.BlockPos) -> a
+    370:370:java.lang.String getLevelName() -> f
+    375:375:int getVersion() -> y
+    380:380:int getClearWeatherTime() -> g
+    385:386:void setClearWeatherTime(int) -> a
+    390:390:boolean isThundering() -> h
+    395:396:void setThundering(boolean) -> a
+    400:400:int getThunderTime() -> i
+    405:406:void setThunderTime(int) -> e
+    410:410:boolean isRaining() -> j
+    415:416:void setRaining(boolean) -> b
+    420:420:int getRainTime() -> k
+    425:426:void setRainTime(int) -> f
+    430:430:net.minecraft.world.level.GameType getGameType() -> l
+    435:436:void setGameType(net.minecraft.world.level.GameType) -> a
+    440:440:boolean isHardcore() -> m
+    445:445:boolean getAllowCommands() -> n
+    450:450:boolean isInitialized() -> o
+    455:456:void setInitialized(boolean) -> c
+    460:460:net.minecraft.world.level.GameRules getGameRules() -> p
+    465:465:net.minecraft.world.level.border.WorldBorder$Settings getWorldBorder() -> q
+    470:471:void setWorldBorder(net.minecraft.world.level.border.WorldBorder$Settings) -> a
+    475:475:net.minecraft.world.Difficulty getDifficulty() -> r
+    480:481:void setDifficulty(net.minecraft.world.Difficulty) -> a
+    485:485:boolean isDifficultyLocked() -> s
+    490:491:void setDifficultyLocked(boolean) -> d
+    495:495:net.minecraft.world.level.timers.TimerQueue getScheduledEvents() -> t
+    500:502:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
+    506:506:net.minecraft.world.level.levelgen.WorldGenSettings worldGenSettings() -> z
+    511:511:com.mojang.serialization.Lifecycle worldGenSettingsLifecycle() -> A
+    516:516:net.minecraft.nbt.CompoundTag endDragonFightData() -> B
+    521:522:void setEndDragonFightData(net.minecraft.nbt.CompoundTag) -> a
+    526:526:net.minecraft.world.level.DataPackConfig getDataPackConfig() -> C
+    531:532:void setDataPackConfig(net.minecraft.world.level.DataPackConfig) -> a
+    537:537:net.minecraft.nbt.CompoundTag getCustomBossEvents() -> D
+    542:543:void setCustomBossEvents(net.minecraft.nbt.CompoundTag) -> b
+    547:547:int getWanderingTraderSpawnDelay() -> u
+    552:553:void setWanderingTraderSpawnDelay(int) -> g
+    557:557:int getWanderingTraderSpawnChance() -> v
+    562:563:void setWanderingTraderSpawnChance(int) -> h
+    569:569:java.util.UUID getWanderingTraderId() -> w
+    574:575:void setWanderingTraderId(java.util.UUID) -> a
+    579:581:void setModdedInfo(java.lang.String,boolean) -> a
+    585:585:boolean wasModded() -> E
+    590:590:java.util.Set getKnownServerBrands() -> F
+    595:595:net.minecraft.world.level.storage.ServerLevelData overworldData() -> G
+    600:600:net.minecraft.world.level.LevelSettings getLevelSettings() -> H
+    277:277:void lambda$setTagData$3(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> a
+    247:247:void lambda$setTagData$2(net.minecraft.nbt.CompoundTag,net.minecraft.nbt.Tag) -> b
+    209:209:java.util.stream.Stream lambda$parse$1(com.mojang.serialization.Dynamic) -> a
+    184:184:net.minecraft.nbt.Tag lambda$parse$0(com.mojang.serialization.Dynamic) -> b
+    42:42:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.ServerLevelData -> dak:
+    java.lang.String getLevelName() -> f
+    void setThundering(boolean) -> a
+    int getRainTime() -> k
+    void setRainTime(int) -> f
+    void setThunderTime(int) -> e
+    int getThunderTime() -> i
+    28:32:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
+    int getClearWeatherTime() -> g
+    void setClearWeatherTime(int) -> a
+    int getWanderingTraderSpawnDelay() -> u
+    void setWanderingTraderSpawnDelay(int) -> g
+    int getWanderingTraderSpawnChance() -> v
+    void setWanderingTraderSpawnChance(int) -> h
+    java.util.UUID getWanderingTraderId() -> w
+    void setWanderingTraderId(java.util.UUID) -> a
+    net.minecraft.world.level.GameType getGameType() -> l
+    void setWorldBorder(net.minecraft.world.level.border.WorldBorder$Settings) -> a
+    net.minecraft.world.level.border.WorldBorder$Settings getWorldBorder() -> q
+    boolean isInitialized() -> o
+    void setInitialized(boolean) -> c
+    boolean getAllowCommands() -> n
+    void setGameType(net.minecraft.world.level.GameType) -> a
+    net.minecraft.world.level.timers.TimerQueue getScheduledEvents() -> t
+    void setGameTime(long) -> a
+    void setDayTime(long) -> b
+    31:31:java.lang.String lambda$fillCrashReportCategory$1() -> x
+    30:30:java.lang.String lambda$fillCrashReportCategory$0() -> y
+net.minecraft.world.level.storage.WorldData -> dal:
+    net.minecraft.world.level.DataPackConfig getDataPackConfig() -> C
+    void setDataPackConfig(net.minecraft.world.level.DataPackConfig) -> a
+    boolean wasModded() -> E
+    java.util.Set getKnownServerBrands() -> F
+    void setModdedInfo(java.lang.String,boolean) -> a
+    33:39:void fillCrashReportCategory(net.minecraft.CrashReportCategory) -> a
+    42:48:java.lang.String getStorageVersionName(int) -> i
+    net.minecraft.nbt.CompoundTag getCustomBossEvents() -> D
+    void setCustomBossEvents(net.minecraft.nbt.CompoundTag) -> b
+    net.minecraft.world.level.storage.ServerLevelData overworldData() -> G
+    net.minecraft.world.level.LevelSettings getLevelSettings() -> H
+    net.minecraft.nbt.CompoundTag createTag(net.minecraft.core.RegistryAccess,net.minecraft.nbt.CompoundTag) -> a
+    boolean isHardcore() -> m
+    int getVersion() -> y
+    java.lang.String getLevelName() -> f
+    net.minecraft.world.level.GameType getGameType() -> l
+    void setGameType(net.minecraft.world.level.GameType) -> a
+    boolean getAllowCommands() -> n
+    net.minecraft.world.Difficulty getDifficulty() -> r
+    void setDifficulty(net.minecraft.world.Difficulty) -> a
+    boolean isDifficultyLocked() -> s
+    void setDifficultyLocked(boolean) -> d
+    net.minecraft.world.level.GameRules getGameRules() -> p
+    net.minecraft.nbt.CompoundTag getLoadedPlayerTag() -> x
+    net.minecraft.nbt.CompoundTag endDragonFightData() -> B
+    void setEndDragonFightData(net.minecraft.nbt.CompoundTag) -> a
+    net.minecraft.world.level.levelgen.WorldGenSettings worldGenSettings() -> z
+    com.mojang.serialization.Lifecycle worldGenSettingsLifecycle() -> A
+    36:37:java.lang.String lambda$fillCrashReportCategory$2() -> a
+    34:34:java.lang.String lambda$fillCrashReportCategory$1() -> b
+    33:33:java.lang.String lambda$fillCrashReportCategory$0() -> c
+net.minecraft.world.level.storage.WritableLevelData -> dam:
+    void setXSpawn(int) -> b
+    void setYSpawn(int) -> c
+    void setZSpawn(int) -> d
+    13:16:void setSpawn(net.minecraft.core.BlockPos) -> a
+net.minecraft.world.level.storage.loot.BinomialDistributionGenerator -> dan:
     int n -> d
     float p -> e
     21:24:void <init>(int,float) -> <init>
@@ -64236,15 +70614,15 @@ net.minecraft.world.level.storage.loot.BinomialDistributionGenerator -> crt:
     46:46:net.minecraft.resources.ResourceLocation getType() -> a
     16:16:int access$000(net.minecraft.world.level.storage.loot.BinomialDistributionGenerator) -> a
     16:16:float access$100(net.minecraft.world.level.storage.loot.BinomialDistributionGenerator) -> b
-net.minecraft.world.level.storage.loot.BinomialDistributionGenerator$Serializer -> crt$a:
+net.minecraft.world.level.storage.loot.BinomialDistributionGenerator$Serializer -> dan$a:
     49:49:void <init>() -> <init>
     52:55:net.minecraft.world.level.storage.loot.BinomialDistributionGenerator deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     60:63:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.BinomialDistributionGenerator,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
     49:49:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
     49:49:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.world.level.storage.loot.BuiltInLootTables -> cru:
-    java.util.Set LOCATIONS -> at
-    java.util.Set IMMUTABLE_LOCATIONS -> au
+net.minecraft.world.level.storage.loot.BuiltInLootTables -> dao:
+    java.util.Set LOCATIONS -> az
+    java.util.Set IMMUTABLE_LOCATIONS -> aA
     net.minecraft.resources.ResourceLocation EMPTY -> a
     net.minecraft.resources.ResourceLocation SPAWN_BONUS_CHEST -> b
     net.minecraft.resources.ResourceLocation END_CITY_TREASURE -> c
@@ -64282,59 +70660,97 @@ net.minecraft.world.level.storage.loot.BuiltInLootTables -> cru:
     net.minecraft.resources.ResourceLocation SHIPWRECK_SUPPLY -> I
     net.minecraft.resources.ResourceLocation SHIPWRECK_TREASURE -> J
     net.minecraft.resources.ResourceLocation PILLAGER_OUTPOST -> K
-    net.minecraft.resources.ResourceLocation SHEEP_WHITE -> L
-    net.minecraft.resources.ResourceLocation SHEEP_ORANGE -> M
-    net.minecraft.resources.ResourceLocation SHEEP_MAGENTA -> N
-    net.minecraft.resources.ResourceLocation SHEEP_LIGHT_BLUE -> O
-    net.minecraft.resources.ResourceLocation SHEEP_YELLOW -> P
-    net.minecraft.resources.ResourceLocation SHEEP_LIME -> Q
-    net.minecraft.resources.ResourceLocation SHEEP_PINK -> R
-    net.minecraft.resources.ResourceLocation SHEEP_GRAY -> S
-    net.minecraft.resources.ResourceLocation SHEEP_LIGHT_GRAY -> T
-    net.minecraft.resources.ResourceLocation SHEEP_CYAN -> U
-    net.minecraft.resources.ResourceLocation SHEEP_PURPLE -> V
-    net.minecraft.resources.ResourceLocation SHEEP_BLUE -> W
-    net.minecraft.resources.ResourceLocation SHEEP_BROWN -> X
-    net.minecraft.resources.ResourceLocation SHEEP_GREEN -> Y
-    net.minecraft.resources.ResourceLocation SHEEP_RED -> Z
-    net.minecraft.resources.ResourceLocation SHEEP_BLACK -> aa
-    net.minecraft.resources.ResourceLocation FISHING -> ab
-    net.minecraft.resources.ResourceLocation FISHING_JUNK -> ac
-    net.minecraft.resources.ResourceLocation FISHING_TREASURE -> ad
-    net.minecraft.resources.ResourceLocation FISHING_FISH -> ae
-    net.minecraft.resources.ResourceLocation CAT_MORNING_GIFT -> af
-    net.minecraft.resources.ResourceLocation ARMORER_GIFT -> ag
-    net.minecraft.resources.ResourceLocation BUTCHER_GIFT -> ah
-    net.minecraft.resources.ResourceLocation CARTOGRAPHER_GIFT -> ai
-    net.minecraft.resources.ResourceLocation CLERIC_GIFT -> aj
-    net.minecraft.resources.ResourceLocation FARMER_GIFT -> ak
-    net.minecraft.resources.ResourceLocation FISHERMAN_GIFT -> al
-    net.minecraft.resources.ResourceLocation FLETCHER_GIFT -> am
-    net.minecraft.resources.ResourceLocation LEATHERWORKER_GIFT -> an
-    net.minecraft.resources.ResourceLocation LIBRARIAN_GIFT -> ao
-    net.minecraft.resources.ResourceLocation MASON_GIFT -> ap
-    net.minecraft.resources.ResourceLocation SHEPHERD_GIFT -> aq
-    net.minecraft.resources.ResourceLocation TOOLSMITH_GIFT -> ar
-    net.minecraft.resources.ResourceLocation WEAPONSMITH_GIFT -> as
+    net.minecraft.resources.ResourceLocation BASTION_TREASURE -> L
+    net.minecraft.resources.ResourceLocation BASTION_OTHER -> M
+    net.minecraft.resources.ResourceLocation BASTION_BRIDGE -> N
+    net.minecraft.resources.ResourceLocation BASTION_HOGLIN_STABLE -> O
+    net.minecraft.resources.ResourceLocation RUINED_PORTAL -> P
+    net.minecraft.resources.ResourceLocation SHEEP_WHITE -> Q
+    net.minecraft.resources.ResourceLocation SHEEP_ORANGE -> R
+    net.minecraft.resources.ResourceLocation SHEEP_MAGENTA -> S
+    net.minecraft.resources.ResourceLocation SHEEP_LIGHT_BLUE -> T
+    net.minecraft.resources.ResourceLocation SHEEP_YELLOW -> U
+    net.minecraft.resources.ResourceLocation SHEEP_LIME -> V
+    net.minecraft.resources.ResourceLocation SHEEP_PINK -> W
+    net.minecraft.resources.ResourceLocation SHEEP_GRAY -> X
+    net.minecraft.resources.ResourceLocation SHEEP_LIGHT_GRAY -> Y
+    net.minecraft.resources.ResourceLocation SHEEP_CYAN -> Z
+    net.minecraft.resources.ResourceLocation SHEEP_PURPLE -> aa
+    net.minecraft.resources.ResourceLocation SHEEP_BLUE -> ab
+    net.minecraft.resources.ResourceLocation SHEEP_BROWN -> ac
+    net.minecraft.resources.ResourceLocation SHEEP_GREEN -> ad
+    net.minecraft.resources.ResourceLocation SHEEP_RED -> ae
+    net.minecraft.resources.ResourceLocation SHEEP_BLACK -> af
+    net.minecraft.resources.ResourceLocation FISHING -> ag
+    net.minecraft.resources.ResourceLocation FISHING_JUNK -> ah
+    net.minecraft.resources.ResourceLocation FISHING_TREASURE -> ai
+    net.minecraft.resources.ResourceLocation FISHING_FISH -> aj
+    net.minecraft.resources.ResourceLocation CAT_MORNING_GIFT -> ak
+    net.minecraft.resources.ResourceLocation ARMORER_GIFT -> al
+    net.minecraft.resources.ResourceLocation BUTCHER_GIFT -> am
+    net.minecraft.resources.ResourceLocation CARTOGRAPHER_GIFT -> an
+    net.minecraft.resources.ResourceLocation CLERIC_GIFT -> ao
+    net.minecraft.resources.ResourceLocation FARMER_GIFT -> ap
+    net.minecraft.resources.ResourceLocation FISHERMAN_GIFT -> aq
+    net.minecraft.resources.ResourceLocation FLETCHER_GIFT -> ar
+    net.minecraft.resources.ResourceLocation LEATHERWORKER_GIFT -> as
+    net.minecraft.resources.ResourceLocation LIBRARIAN_GIFT -> at
+    net.minecraft.resources.ResourceLocation MASON_GIFT -> au
+    net.minecraft.resources.ResourceLocation SHEPHERD_GIFT -> av
+    net.minecraft.resources.ResourceLocation TOOLSMITH_GIFT -> aw
+    net.minecraft.resources.ResourceLocation WEAPONSMITH_GIFT -> ax
+    net.minecraft.resources.ResourceLocation PIGLIN_BARTERING -> ay
     9:9:void <init>() -> <init>
-    94:94:net.minecraft.resources.ResourceLocation register(java.lang.String) -> a
-    98:102:net.minecraft.resources.ResourceLocation register(net.minecraft.resources.ResourceLocation) -> a
-    106:106:java.util.Set all() -> a
-    10:91:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.ConstantIntValue -> crv:
+    102:102:net.minecraft.resources.ResourceLocation register(java.lang.String) -> a
+    106:110:net.minecraft.resources.ResourceLocation register(net.minecraft.resources.ResourceLocation) -> a
+    114:114:java.util.Set all() -> a
+    10:99:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.ConstantIntValue -> dap:
     int value -> d
     19:21:void <init>(int) -> <init>
     25:25:int getInt(java.util.Random) -> a
     30:30:net.minecraft.resources.ResourceLocation getType() -> a
     34:34:net.minecraft.world.level.storage.loot.ConstantIntValue exactly(int) -> a
     16:16:int access$000(net.minecraft.world.level.storage.loot.ConstantIntValue) -> a
-net.minecraft.world.level.storage.loot.ConstantIntValue$Serializer -> crv$a:
+net.minecraft.world.level.storage.loot.ConstantIntValue$Serializer -> dap$a:
     37:37:void <init>() -> <init>
     40:40:net.minecraft.world.level.storage.loot.ConstantIntValue deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     45:45:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.ConstantIntValue,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
     37:37:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
     37:37:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.world.level.storage.loot.IntLimiter -> crw:
+net.minecraft.world.level.storage.loot.Deserializers -> daq:
+    11:11:void <init>() -> <init>
+    13:18:com.google.gson.GsonBuilder createConditionSerializer() -> a
+    22:25:com.google.gson.GsonBuilder createFunctionSerializer() -> b
+    29:31:com.google.gson.GsonBuilder createLootTableSerializer() -> c
+net.minecraft.world.level.storage.loot.GsonAdapterFactory -> dar:
+    20:20:void <init>() -> <init>
+    50:50:net.minecraft.world.level.storage.loot.GsonAdapterFactory$Builder builder(net.minecraft.core.Registry,java.lang.String,java.lang.String,java.util.function.Function) -> a
+net.minecraft.world.level.storage.loot.GsonAdapterFactory$1 -> dar$1:
+net.minecraft.world.level.storage.loot.GsonAdapterFactory$Builder -> dar$a:
+    net.minecraft.core.Registry registry -> a
+    java.lang.String elementName -> b
+    java.lang.String typeKey -> c
+    java.util.function.Function typeGetter -> d
+    com.mojang.datafixers.util.Pair defaultType -> e
+    32:37:void <init>(net.minecraft.core.Registry,java.lang.String,java.lang.String,java.util.function.Function) -> <init>
+    40:41:net.minecraft.world.level.storage.loot.GsonAdapterFactory$Builder withDefaultSerializer(net.minecraft.world.level.storage.loot.SerializerType,net.minecraft.world.level.storage.loot.GsonAdapterFactory$DefaultSerializer) -> a
+    45:45:java.lang.Object build() -> a
+    21:21:void <init>(net.minecraft.core.Registry,java.lang.String,java.lang.String,java.util.function.Function,net.minecraft.world.level.storage.loot.GsonAdapterFactory$1) -> <init>
+net.minecraft.world.level.storage.loot.GsonAdapterFactory$DefaultSerializer -> dar$b:
+    com.google.gson.JsonElement serialize(java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+    java.lang.Object deserialize(com.google.gson.JsonElement,com.google.gson.JsonDeserializationContext) -> a
+net.minecraft.world.level.storage.loot.GsonAdapterFactory$JsonAdapter -> dar$c:
+    net.minecraft.core.Registry registry -> a
+    java.lang.String elementName -> b
+    java.lang.String typeKey -> c
+    java.util.function.Function typeGetter -> d
+    com.mojang.datafixers.util.Pair defaultType -> e
+    64:70:void <init>(net.minecraft.core.Registry,java.lang.String,java.lang.String,java.util.function.Function,com.mojang.datafixers.util.Pair) -> <init>
+    74:89:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
+    95:107:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
+    53:53:void <init>(net.minecraft.core.Registry,java.lang.String,java.lang.String,java.util.function.Function,com.mojang.datafixers.util.Pair,net.minecraft.world.level.storage.loot.GsonAdapterFactory$1) -> <init>
+net.minecraft.world.level.storage.loot.IntLimiter -> das:
     java.lang.Integer min -> a
     java.lang.Integer max -> b
     java.util.function.IntUnaryOperator op -> c
@@ -64350,14 +70766,14 @@ net.minecraft.world.level.storage.loot.IntLimiter -> crw:
     17:17:void <init>(java.lang.Integer,java.lang.Integer,net.minecraft.world.level.storage.loot.IntLimiter$1) -> <init>
     17:17:java.lang.Integer access$100(net.minecraft.world.level.storage.loot.IntLimiter) -> a
     17:17:java.lang.Integer access$200(net.minecraft.world.level.storage.loot.IntLimiter) -> b
-net.minecraft.world.level.storage.loot.IntLimiter$1 -> crw$1:
-net.minecraft.world.level.storage.loot.IntLimiter$Serializer -> crw$a:
+net.minecraft.world.level.storage.loot.IntLimiter$1 -> das$1:
+net.minecraft.world.level.storage.loot.IntLimiter$Serializer -> das$a:
     62:62:void <init>() -> <init>
     65:68:net.minecraft.world.level.storage.loot.IntLimiter deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     73:82:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.IntLimiter,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
     62:62:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
     62:62:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.world.level.storage.loot.LootContext -> crx:
+net.minecraft.world.level.storage.loot.LootContext -> dat:
     java.util.Random random -> a
     float luck -> b
     net.minecraft.server.level.ServerLevel level -> c
@@ -64382,8 +70798,8 @@ net.minecraft.world.level.storage.loot.LootContext -> crx:
     113:113:float getLuck() -> b
     117:117:net.minecraft.server.level.ServerLevel getLevel() -> c
     28:28:void <init>(java.util.Random,float,net.minecraft.server.level.ServerLevel,java.util.function.Function,java.util.function.Function,java.util.Map,java.util.Map,net.minecraft.world.level.storage.loot.LootContext$1) -> <init>
-net.minecraft.world.level.storage.loot.LootContext$1 -> crx$1:
-net.minecraft.world.level.storage.loot.LootContext$Builder -> crx$a:
+net.minecraft.world.level.storage.loot.LootContext$1 -> dat$1:
+net.minecraft.world.level.storage.loot.LootContext$Builder -> dat$a:
     net.minecraft.server.level.ServerLevel level -> a
     java.util.Map params -> b
     java.util.Map dynamicDrops -> c
@@ -64401,9 +70817,9 @@ net.minecraft.world.level.storage.loot.LootContext$Builder -> crx$a:
     187:191:java.lang.Object getParameter(net.minecraft.world.level.storage.loot.parameters.LootContextParam) -> a
     197:197:java.lang.Object getOptionalParameter(net.minecraft.world.level.storage.loot.parameters.LootContextParam) -> b
     201:217:net.minecraft.world.level.storage.loot.LootContext create(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet) -> a
-net.minecraft.world.level.storage.loot.LootContext$DynamicDrop -> crx$b:
+net.minecraft.world.level.storage.loot.LootContext$DynamicDrop -> dat$b:
     void add(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> add
-net.minecraft.world.level.storage.loot.LootContext$EntityTarget -> crx$c:
+net.minecraft.world.level.storage.loot.LootContext$EntityTarget -> dat$c:
     net.minecraft.world.level.storage.loot.LootContext$EntityTarget THIS -> a
     net.minecraft.world.level.storage.loot.LootContext$EntityTarget KILLER -> b
     net.minecraft.world.level.storage.loot.LootContext$EntityTarget DIRECT_KILLER -> c
@@ -64418,16 +70834,16 @@ net.minecraft.world.level.storage.loot.LootContext$EntityTarget -> crx$c:
     242:247:net.minecraft.world.level.storage.loot.LootContext$EntityTarget getByName(java.lang.String) -> a
     221:221:java.lang.String access$100(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
     221:225:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.LootContext$EntityTarget$Serializer -> crx$c$a:
+net.minecraft.world.level.storage.loot.LootContext$EntityTarget$Serializer -> dat$c$a:
     250:250:void <init>() -> <init>
     253:254:void write(com.google.gson.stream.JsonWriter,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
     258:258:net.minecraft.world.level.storage.loot.LootContext$EntityTarget read(com.google.gson.stream.JsonReader) -> a
     250:250:java.lang.Object read(com.google.gson.stream.JsonReader) -> read
     250:250:void write(com.google.gson.stream.JsonWriter,java.lang.Object) -> write
-net.minecraft.world.level.storage.loot.LootContextUser -> cry:
+net.minecraft.world.level.storage.loot.LootContextUser -> dau:
     10:10:java.util.Set getReferencedContextParams() -> a
     14:15:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
-net.minecraft.world.level.storage.loot.LootPool -> crz:
+net.minecraft.world.level.storage.loot.LootPool -> dav:
     net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer[] entries -> a
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] conditions -> b
     java.util.function.Predicate compositeCondition -> c
@@ -64447,8 +70863,8 @@ net.minecraft.world.level.storage.loot.LootPool -> crz:
     32:32:net.minecraft.world.level.storage.loot.RandomValueBounds access$300(net.minecraft.world.level.storage.loot.LootPool) -> c
     32:32:net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] access$400(net.minecraft.world.level.storage.loot.LootPool) -> d
     32:32:net.minecraft.world.level.storage.loot.functions.LootItemFunction[] access$500(net.minecraft.world.level.storage.loot.LootPool) -> e
-net.minecraft.world.level.storage.loot.LootPool$1 -> crz$1:
-net.minecraft.world.level.storage.loot.LootPool$Builder -> crz$a:
+net.minecraft.world.level.storage.loot.LootPool$1 -> dav$1:
+net.minecraft.world.level.storage.loot.LootPool$Builder -> dav$a:
     java.util.List entries -> a
     java.util.List conditions -> b
     java.util.List functions -> c
@@ -64465,13 +70881,13 @@ net.minecraft.world.level.storage.loot.LootPool$Builder -> crz$a:
     113:113:java.lang.Object unwrap() -> c
     113:113:java.lang.Object apply(net.minecraft.world.level.storage.loot.functions.LootItemFunction$Builder) -> b
     113:113:java.lang.Object when(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> b
-net.minecraft.world.level.storage.loot.LootPool$Serializer -> crz$b:
+net.minecraft.world.level.storage.loot.LootPool$Serializer -> dav$b:
     165:165:void <init>() -> <init>
     168:174:net.minecraft.world.level.storage.loot.LootPool deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     179:191:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.LootPool,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
     165:165:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
     165:165:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.world.level.storage.loot.LootTable -> csa:
+net.minecraft.world.level.storage.loot.LootTable -> daw:
     org.apache.logging.log4j.Logger LOGGER -> c
     net.minecraft.world.level.storage.loot.LootTable EMPTY -> a
     net.minecraft.world.level.storage.loot.parameters.LootContextParamSet DEFAULT_PARAM_SET -> b
@@ -64497,8 +70913,8 @@ net.minecraft.world.level.storage.loot.LootTable -> csa:
     33:33:net.minecraft.world.level.storage.loot.LootPool[] access$300(net.minecraft.world.level.storage.loot.LootTable) -> b
     33:33:net.minecraft.world.level.storage.loot.functions.LootItemFunction[] access$400(net.minecraft.world.level.storage.loot.LootTable) -> c
     34:37:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.LootTable$1 -> csa$1:
-net.minecraft.world.level.storage.loot.LootTable$Builder -> csa$a:
+net.minecraft.world.level.storage.loot.LootTable$1 -> daw$1:
+net.minecraft.world.level.storage.loot.LootTable$Builder -> daw$a:
     java.util.List pools -> a
     java.util.List functions -> b
     net.minecraft.world.level.storage.loot.parameters.LootContextParamSet paramSet -> c
@@ -64510,56 +70926,66 @@ net.minecraft.world.level.storage.loot.LootTable$Builder -> csa$a:
     201:201:net.minecraft.world.level.storage.loot.LootTable build() -> b
     172:172:java.lang.Object unwrap() -> c
     172:172:java.lang.Object apply(net.minecraft.world.level.storage.loot.functions.LootItemFunction$Builder) -> b
-net.minecraft.world.level.storage.loot.LootTable$Serializer -> csa$b:
+net.minecraft.world.level.storage.loot.LootTable$Serializer -> daw$b:
     209:209:void <init>() -> <init>
     212:223:net.minecraft.world.level.storage.loot.LootTable deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     228:246:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.LootTable,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
     209:209:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
     209:209:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.world.level.storage.loot.LootTables -> csb:
+net.minecraft.world.level.storage.loot.LootTables -> dax:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.google.gson.Gson GSON -> b
     java.util.Map tables -> c
     net.minecraft.world.level.storage.loot.PredicateManager predicateManager -> d
-    40:46:void <init>(net.minecraft.world.level.storage.loot.PredicateManager) -> <init>
-    49:49:net.minecraft.world.level.storage.loot.LootTable get(net.minecraft.resources.ResourceLocation) -> a
-    54:78:void apply(java.util.Map,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    81:82:void validate(net.minecraft.world.level.storage.loot.ValidationContext,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable) -> a
-    85:85:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.LootTable) -> a
-    89:89:java.util.Set getIds() -> a
-    25:25:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
-    75:75:void lambda$apply$2(java.lang.String,java.lang.String) -> a
-    74:74:void lambda$apply$1(net.minecraft.world.level.storage.loot.ValidationContext,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable) -> b
-    63:68:void lambda$apply$0(com.google.common.collect.ImmutableMap$Builder,net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
-    26:38:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.PredicateManager -> csc:
+    21:27:void <init>(net.minecraft.world.level.storage.loot.PredicateManager) -> <init>
+    30:30:net.minecraft.world.level.storage.loot.LootTable get(net.minecraft.resources.ResourceLocation) -> a
+    35:59:void apply(java.util.Map,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    62:63:void validate(net.minecraft.world.level.storage.loot.ValidationContext,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable) -> a
+    66:66:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.LootTable) -> a
+    70:70:java.util.Set getIds() -> a
+    17:17:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    56:56:void lambda$apply$2(java.lang.String,java.lang.String) -> a
+    55:55:void lambda$apply$1(net.minecraft.world.level.storage.loot.ValidationContext,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.LootTable) -> b
+    44:49:void lambda$apply$0(com.google.common.collect.ImmutableMap$Builder,net.minecraft.resources.ResourceLocation,com.google.gson.JsonElement) -> a
+    18:19:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.PredicateManager -> day:
     org.apache.logging.log4j.Logger LOGGER -> a
     com.google.gson.Gson GSON -> b
     java.util.Map conditions -> c
-    33:36:void <init>() -> <init>
-    40:40:net.minecraft.world.level.storage.loot.predicates.LootItemCondition get(net.minecraft.resources.ResourceLocation) -> a
-    45:61:void apply(java.util.Map,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    28:31:void <init>() -> <init>
+    35:35:net.minecraft.world.level.storage.loot.predicates.LootItemCondition get(net.minecraft.resources.ResourceLocation) -> a
+    40:61:void apply(java.util.Map,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
     64:64:java.util.Set getKeys() -> a
-    22:22:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
+    23:23:void apply(java.lang.Object,net.minecraft.server.packs.resources.ResourceManager,net.minecraft.util.profiling.ProfilerFiller) -> a
     58:58:void lambda$apply$3(java.lang.String,java.lang.String) -> a
     57:57:void lambda$apply$2(net.minecraft.world.level.storage.loot.ValidationContext,net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.predicates.LootItemCondition) -> a
     56:56:net.minecraft.world.level.storage.loot.LootTable lambda$apply$1(net.minecraft.resources.ResourceLocation) -> b
-    48:53:void lambda$apply$0(com.google.common.collect.ImmutableMap$Builder,net.minecraft.resources.ResourceLocation,com.google.gson.JsonObject) -> a
-    23:30:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.RandomIntGenerator -> csd:
+    43:53:void lambda$apply$0(com.google.common.collect.ImmutableMap$Builder,net.minecraft.resources.ResourceLocation,com.google.gson.JsonElement) -> a
+    24:25:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.PredicateManager$1 -> day$1:
+net.minecraft.world.level.storage.loot.PredicateManager$CompositePredicate -> day$a:
+    net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] terms -> a
+    java.util.function.Predicate composedPredicate -> b
+    71:74:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
+    78:78:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    83:88:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    92:92:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    67:67:boolean test(java.lang.Object) -> test
+    67:67:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.PredicateManager$1) -> <init>
+net.minecraft.world.level.storage.loot.RandomIntGenerator -> daz:
     net.minecraft.resources.ResourceLocation CONSTANT -> a
     net.minecraft.resources.ResourceLocation UNIFORM -> b
     net.minecraft.resources.ResourceLocation BINOMIAL -> c
     int getInt(java.util.Random) -> a
     net.minecraft.resources.ResourceLocation getType() -> a
     8:10:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.RandomIntGenerators -> cse:
+net.minecraft.world.level.storage.loot.RandomIntGenerators -> dba:
     java.util.Map GENERATORS -> a
     14:14:void <init>() -> <init>
     24:36:net.minecraft.world.level.storage.loot.RandomIntGenerator deserialize(com.google.gson.JsonElement,com.google.gson.JsonDeserializationContext) -> a
     40:45:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.RandomIntGenerator,com.google.gson.JsonSerializationContext) -> a
     15:21:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.RandomValueBounds -> csf:
+net.minecraft.world.level.storage.loot.RandomValueBounds -> dbb:
     float min -> d
     float max -> e
     22:25:void <init>(float,float) -> <init>
@@ -64574,13 +71000,20 @@ net.minecraft.world.level.storage.loot.RandomValueBounds -> csf:
     63:63:net.minecraft.resources.ResourceLocation getType() -> a
     18:18:float access$000(net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
     18:18:float access$100(net.minecraft.world.level.storage.loot.RandomValueBounds) -> b
-net.minecraft.world.level.storage.loot.RandomValueBounds$Serializer -> csf$a:
+net.minecraft.world.level.storage.loot.RandomValueBounds$Serializer -> dbb$a:
     66:66:void <init>() -> <init>
     69:75:net.minecraft.world.level.storage.loot.RandomValueBounds deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
     81:87:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.RandomValueBounds,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
     66:66:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
     66:66:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.world.level.storage.loot.ValidationContext -> csg:
+net.minecraft.world.level.storage.loot.Serializer -> dbc:
+    void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+    java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+net.minecraft.world.level.storage.loot.SerializerType -> dbd:
+    net.minecraft.world.level.storage.loot.Serializer serializer -> a
+    6:8:void <init>(net.minecraft.world.level.storage.loot.Serializer) -> <init>
+    11:11:net.minecraft.world.level.storage.loot.Serializer getSerializer() -> a
+net.minecraft.world.level.storage.loot.ValidationContext -> dbe:
     com.google.common.collect.Multimap problems -> a
     java.util.function.Supplier context -> b
     net.minecraft.world.level.storage.loot.parameters.LootContextParamSet params -> c
@@ -64607,20 +71040,21 @@ net.minecraft.world.level.storage.loot.ValidationContext -> csg:
     62:62:java.lang.String lambda$enterTable$2(java.lang.String) -> d
     57:57:java.lang.String lambda$forChild$1(java.lang.String) -> e
     31:31:java.lang.String lambda$new$0() -> c
-net.minecraft.world.level.storage.loot.entries.AlternativesEntry -> csh:
+net.minecraft.world.level.storage.loot.entries.AlternativesEntry -> dbf:
     12:13:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer[],net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
-    17:25:net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer compose(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[]) -> a
-    38:45:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
-    74:74:net.minecraft.world.level.storage.loot.entries.AlternativesEntry$Builder alternatives(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> a
-    26:31:boolean lambda$compose$0(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[],net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
-net.minecraft.world.level.storage.loot.entries.AlternativesEntry$Builder -> csh$a:
+    17:17:net.minecraft.world.level.storage.loot.entries.LootPoolEntryType getType() -> a
+    22:30:net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer compose(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[]) -> a
+    43:50:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    79:79:net.minecraft.world.level.storage.loot.entries.AlternativesEntry$Builder alternatives(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> a
+    31:36:boolean lambda$compose$0(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[],net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
+net.minecraft.world.level.storage.loot.entries.AlternativesEntry$Builder -> dbf$a:
     java.util.List entries -> a
-    48:54:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> <init>
-    58:58:net.minecraft.world.level.storage.loot.entries.AlternativesEntry$Builder getThis() -> a
-    63:64:net.minecraft.world.level.storage.loot.entries.AlternativesEntry$Builder otherwise(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> a
-    69:69:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer build() -> b
-    47:47:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer -> csi:
+    53:59:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> <init>
+    63:63:net.minecraft.world.level.storage.loot.entries.AlternativesEntry$Builder getThis() -> a
+    68:69:net.minecraft.world.level.storage.loot.entries.AlternativesEntry$Builder otherwise(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> a
+    74:74:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer build() -> b
+    52:52:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer -> dbg:
     net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer ALWAYS_FALSE -> a
     net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer ALWAYS_TRUE -> b
     boolean expand(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> expand
@@ -64631,253 +71065,256 @@ net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer -> csi:
     11:11:boolean lambda$static$1(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
     10:10:boolean lambda$static$0(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> b
     10:11:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.entries.CompositeEntryBase -> csj:
+net.minecraft.world.level.storage.loot.entries.CompositeEntryBase -> dbh:
     net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer[] children -> c
     net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer composedChildren -> e
-    19:22:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer[],net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
-    26:35:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    18:21:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer[],net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
+    25:34:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
     net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer compose(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[]) -> a
-    41:45:boolean expand(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> expand
-    73:73:net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$Serializer createSerializer(net.minecraft.resources.ResourceLocation,java.lang.Class,net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$CompositeEntryConstructor) -> a
-net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$1 -> csj$1:
+    40:44:boolean expand(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> expand
+    53:53:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Serializer createSerializer(net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$CompositeEntryConstructor) -> a
+net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$1 -> dbh$1:
     net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$CompositeEntryConstructor val$constructor -> a
-    73:73:void <init>(net.minecraft.resources.ResourceLocation,java.lang.Class,net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$CompositeEntryConstructor) -> <init>
-    76:76:net.minecraft.world.level.storage.loot.entries.CompositeEntryBase deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer[],net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$CompositeEntryConstructor -> csj$a:
+    53:53:void <init>(net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$CompositeEntryConstructor) -> <init>
+    56:57:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.CompositeEntryBase,com.google.gson.JsonSerializationContext) -> a
+    61:62:net.minecraft.world.level.storage.loot.entries.CompositeEntryBase deserializeCustom(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    53:53:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer deserializeCustom(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    53:53:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$CompositeEntryConstructor -> dbh$a:
     net.minecraft.world.level.storage.loot.entries.CompositeEntryBase create(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer[],net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> create
-net.minecraft.world.level.storage.loot.entries.CompositeEntryBase$Serializer -> csj$b:
-    55:56:void <init>(net.minecraft.resources.ResourceLocation,java.lang.Class) -> <init>
-    60:61:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.CompositeEntryBase,com.google.gson.JsonSerializationContext) -> a
-    65:66:net.minecraft.world.level.storage.loot.entries.CompositeEntryBase deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    net.minecraft.world.level.storage.loot.entries.CompositeEntryBase deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer[],net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    53:53:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    53:53:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.entries.DynamicLoot -> csk:
-    net.minecraft.resources.ResourceLocation TYPE -> c
-    net.minecraft.resources.ResourceLocation name -> h
-    21:23:void <init>(net.minecraft.resources.ResourceLocation,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> <init>
-    27:28:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
-    31:31:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder dynamicEntry(net.minecraft.resources.ResourceLocation) -> a
-    31:31:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer lambda$dynamicEntry$0(net.minecraft.resources.ResourceLocation,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
+net.minecraft.world.level.storage.loot.entries.DynamicLoot -> dbi:
+    net.minecraft.resources.ResourceLocation name -> g
+    19:21:void <init>(net.minecraft.resources.ResourceLocation,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> <init>
+    25:25:net.minecraft.world.level.storage.loot.entries.LootPoolEntryType getType() -> a
+    30:31:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
+    34:34:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder dynamicEntry(net.minecraft.resources.ResourceLocation) -> a
+    34:34:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer lambda$dynamicEntry$0(net.minecraft.resources.ResourceLocation,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
     15:15:net.minecraft.resources.ResourceLocation access$000(net.minecraft.world.level.storage.loot.entries.DynamicLoot) -> a
     15:15:void <init>(net.minecraft.resources.ResourceLocation,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[],net.minecraft.world.level.storage.loot.entries.DynamicLoot$1) -> <init>
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.entries.DynamicLoot$1 -> csk$1:
-net.minecraft.world.level.storage.loot.entries.DynamicLoot$Serializer -> csk$a:
-    36:37:void <init>() -> <init>
-    41:43:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.DynamicLoot,com.google.gson.JsonSerializationContext) -> a
-    47:48:net.minecraft.world.level.storage.loot.entries.DynamicLoot deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
-    34:34:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
-    34:34:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer,com.google.gson.JsonSerializationContext) -> a
-    34:34:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.entries.EmptyLootItem -> csl:
-    15:16:void <init>(int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> <init>
-    20:20:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
-    23:23:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder emptyItem() -> a
-    13:13:void <init>(int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[],net.minecraft.world.level.storage.loot.entries.EmptyLootItem$1) -> <init>
-net.minecraft.world.level.storage.loot.entries.EmptyLootItem$1 -> csl$1:
-net.minecraft.world.level.storage.loot.entries.EmptyLootItem$Serializer -> csl$a:
-    28:29:void <init>() -> <init>
+net.minecraft.world.level.storage.loot.entries.DynamicLoot$1 -> dbi$1:
+net.minecraft.world.level.storage.loot.entries.DynamicLoot$Serializer -> dbi$a:
+    37:37:void <init>() -> <init>
+    40:42:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.DynamicLoot,com.google.gson.JsonSerializationContext) -> a
+    46:47:net.minecraft.world.level.storage.loot.entries.DynamicLoot deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
+    37:37:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
+    37:37:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer,com.google.gson.JsonSerializationContext) -> a
+    37:37:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.entries.EmptyLootItem -> dbj:
+    14:15:void <init>(int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> <init>
+    19:19:net.minecraft.world.level.storage.loot.entries.LootPoolEntryType getType() -> a
+    24:24:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
+    27:27:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder emptyItem() -> b
+    12:12:void <init>(int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[],net.minecraft.world.level.storage.loot.entries.EmptyLootItem$1) -> <init>
+net.minecraft.world.level.storage.loot.entries.EmptyLootItem$1 -> dbj$1:
+net.minecraft.world.level.storage.loot.entries.EmptyLootItem$Serializer -> dbj$a:
+    30:30:void <init>() -> <init>
     33:33:net.minecraft.world.level.storage.loot.entries.EmptyLootItem deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
-    26:26:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
-net.minecraft.world.level.storage.loot.entries.EntryGroup -> csm:
+    30:30:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
+net.minecraft.world.level.storage.loot.entries.EntryGroup -> dbk:
     10:11:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer[],net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
-    15:30:net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer compose(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[]) -> a
-    66:66:net.minecraft.world.level.storage.loot.entries.EntryGroup$Builder list(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> a
-    31:34:boolean lambda$compose$1(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[],net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
-    24:26:boolean lambda$compose$0(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer,net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer,net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
-net.minecraft.world.level.storage.loot.entries.EntryGroup$Builder -> csm$a:
+    15:15:net.minecraft.world.level.storage.loot.entries.LootPoolEntryType getType() -> a
+    20:35:net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer compose(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[]) -> a
+    71:71:net.minecraft.world.level.storage.loot.entries.EntryGroup$Builder list(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> a
+    36:39:boolean lambda$compose$1(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[],net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
+    29:31:boolean lambda$compose$0(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer,net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer,net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
+net.minecraft.world.level.storage.loot.entries.EntryGroup$Builder -> dbk$a:
     java.util.List entries -> a
-    40:46:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> <init>
-    50:50:net.minecraft.world.level.storage.loot.entries.EntryGroup$Builder getThis() -> a
-    55:56:net.minecraft.world.level.storage.loot.entries.EntryGroup$Builder append(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> b
-    61:61:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer build() -> b
-    39:39:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.entries.LootItem -> csn:
-    net.minecraft.world.item.Item item -> c
+    45:51:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> <init>
+    55:55:net.minecraft.world.level.storage.loot.entries.EntryGroup$Builder getThis() -> a
+    60:61:net.minecraft.world.level.storage.loot.entries.EntryGroup$Builder append(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> b
+    66:66:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer build() -> b
+    44:44:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.entries.LootItem -> dbl:
+    net.minecraft.world.item.Item item -> g
     22:24:void <init>(net.minecraft.world.item.Item,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> <init>
-    28:29:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
-    32:32:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder lootTableItem(net.minecraft.world.level.ItemLike) -> a
-    32:32:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer lambda$lootTableItem$0(net.minecraft.world.level.ItemLike,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
+    28:28:net.minecraft.world.level.storage.loot.entries.LootPoolEntryType getType() -> a
+    33:34:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
+    37:37:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder lootTableItem(net.minecraft.world.level.ItemLike) -> a
+    37:37:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer lambda$lootTableItem$0(net.minecraft.world.level.ItemLike,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
     18:18:net.minecraft.world.item.Item access$000(net.minecraft.world.level.storage.loot.entries.LootItem) -> a
     18:18:void <init>(net.minecraft.world.item.Item,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[],net.minecraft.world.level.storage.loot.entries.LootItem$1) -> <init>
-net.minecraft.world.level.storage.loot.entries.LootItem$1 -> csn$1:
-net.minecraft.world.level.storage.loot.entries.LootItem$Serializer -> csn$a:
-    37:38:void <init>() -> <init>
-    42:50:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootItem,com.google.gson.JsonSerializationContext) -> a
-    54:55:net.minecraft.world.level.storage.loot.entries.LootItem deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
-    35:35:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
-    35:35:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer,com.google.gson.JsonSerializationContext) -> a
-    35:35:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.entries.LootPoolEntries -> cso:
-    java.util.Map ID_TO_SERIALIZER -> a
-    java.util.Map CLASS_TO_SERIALIZER -> b
-    19:19:void <init>() -> <init>
-    37:39:void register(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Serializer) -> a
-    19:19:java.util.Map access$000() -> a
-    19:19:java.util.Map access$100() -> b
-    20:34:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.entries.LootPoolEntries$Serializer -> cso$a:
-    41:41:void <init>() -> <init>
-    44:53:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    58:69:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
-    74:78:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Serializer getSerializer(java.lang.Class) -> a
-    41:41:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
-    41:41:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.world.level.storage.loot.entries.LootPoolEntry -> csp:
+net.minecraft.world.level.storage.loot.entries.LootItem$1 -> dbl$1:
+net.minecraft.world.level.storage.loot.entries.LootItem$Serializer -> dbl$a:
+    40:40:void <init>() -> <init>
+    43:51:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootItem,com.google.gson.JsonSerializationContext) -> a
+    55:56:net.minecraft.world.level.storage.loot.entries.LootItem deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
+    40:40:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
+    40:40:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer,com.google.gson.JsonSerializationContext) -> a
+    40:40:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.entries.LootPoolEntries -> dbm:
+    net.minecraft.world.level.storage.loot.entries.LootPoolEntryType EMPTY -> a
+    net.minecraft.world.level.storage.loot.entries.LootPoolEntryType ITEM -> b
+    net.minecraft.world.level.storage.loot.entries.LootPoolEntryType REFERENCE -> c
+    net.minecraft.world.level.storage.loot.entries.LootPoolEntryType DYNAMIC -> d
+    net.minecraft.world.level.storage.loot.entries.LootPoolEntryType TAG -> e
+    net.minecraft.world.level.storage.loot.entries.LootPoolEntryType ALTERNATIVES -> f
+    net.minecraft.world.level.storage.loot.entries.LootPoolEntryType SEQUENCE -> g
+    net.minecraft.world.level.storage.loot.entries.LootPoolEntryType GROUP -> h
+    8:8:void <init>() -> <init>
+    20:20:net.minecraft.world.level.storage.loot.entries.LootPoolEntryType register(java.lang.String,net.minecraft.world.level.storage.loot.Serializer) -> a
+    24:24:java.lang.Object createGsonAdapter() -> a
+    9:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.entries.LootPoolEntry -> dbn:
     int getWeight(float) -> a
     void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
-net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer -> csq:
+net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer -> dbo:
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] conditions -> d
     java.util.function.Predicate compositeCondition -> c
-    21:24:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
-    27:30:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
-    33:33:boolean canRun(net.minecraft.world.level.storage.loot.LootContext) -> a
-net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder -> csq$a:
+    22:25:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
+    28:31:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    34:34:boolean canRun(net.minecraft.world.level.storage.loot.LootContext) -> a
+    net.minecraft.world.level.storage.loot.entries.LootPoolEntryType getType() -> a
+net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder -> dbo$a:
     java.util.List conditions -> a
-    36:37:void <init>() -> <init>
+    39:40:void <init>() -> <init>
     net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder getThis() -> d
-    43:44:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder when(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
-    49:49:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder unwrap() -> e
-    53:53:net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] getConditions() -> f
-    57:57:net.minecraft.world.level.storage.loot.entries.AlternativesEntry$Builder otherwise(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> a
-    61:61:net.minecraft.world.level.storage.loot.entries.EntryGroup$Builder append(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> b
-    65:65:net.minecraft.world.level.storage.loot.entries.SequentialEntry$Builder then(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> c
+    46:47:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder when(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
+    52:52:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder unwrap() -> e
+    56:56:net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] getConditions() -> f
+    60:60:net.minecraft.world.level.storage.loot.entries.AlternativesEntry$Builder otherwise(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> a
+    64:64:net.minecraft.world.level.storage.loot.entries.EntryGroup$Builder append(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> b
+    68:68:net.minecraft.world.level.storage.loot.entries.SequentialEntry$Builder then(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> c
     net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer build() -> b
-    36:36:java.lang.Object unwrap() -> c
-    36:36:java.lang.Object when(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> b
-net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Serializer -> csq$b:
-    net.minecraft.resources.ResourceLocation name -> a
-    java.lang.Class clazz -> b
-    75:78:void <init>(net.minecraft.resources.ResourceLocation,java.lang.Class) -> <init>
-    81:81:net.minecraft.resources.ResourceLocation getName() -> a
-    85:85:java.lang.Class getContainerClass() -> b
-    void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
-    net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer -> csr:
-    int weight -> e
-    int quality -> f
-    net.minecraft.world.level.storage.loot.functions.LootItemFunction[] functions -> g
-    java.util.function.BiFunction compositeFunction -> c
+    39:39:java.lang.Object unwrap() -> c
+    39:39:java.lang.Object when(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> b
+net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Serializer -> dbo$b:
+    74:74:void <init>() -> <init>
+    77:81:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> b
+    85:86:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
+    net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer deserializeCustom(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    74:74:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    74:74:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.entries.LootPoolEntryType -> dbp:
+    8:9:void <init>(net.minecraft.world.level.storage.loot.Serializer) -> <init>
+net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer -> dbq:
+    int weight -> c
+    int quality -> e
+    net.minecraft.world.level.storage.loot.functions.LootItemFunction[] functions -> f
+    java.util.function.BiFunction compositeFunction -> g
     net.minecraft.world.level.storage.loot.entries.LootPoolEntry entry -> h
-    34:57:void <init>(int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> <init>
-    43:48:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    33:56:void <init>(int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> <init>
+    42:47:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
     void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
-    68:73:boolean expand(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> expand
-    127:127:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder simpleBuilder(net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$EntryConstructor) -> a
-    23:23:java.util.function.BiFunction access$000(net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer) -> a
-net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$1 -> csr$1:
+    67:72:boolean expand(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> expand
+    126:126:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder simpleBuilder(net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$EntryConstructor) -> a
+    22:22:java.util.function.BiFunction access$000(net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer) -> a
+net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$1 -> dbq$1:
     net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer this$0 -> a
-    57:57:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer) -> <init>
-    60:61:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
-net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder -> csr$a:
+    56:56:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer) -> <init>
+    59:60:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
+net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder -> dbq$a:
     int weight -> a
     int quality -> b
     java.util.List functions -> c
-    76:80:void <init>() -> <init>
-    84:85:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder apply(net.minecraft.world.level.storage.loot.functions.LootItemFunction$Builder) -> a
-    89:89:net.minecraft.world.level.storage.loot.functions.LootItemFunction[] getFunctions() -> a
-    93:94:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder setWeight(int) -> a
-    98:99:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder setQuality(int) -> b
-    76:76:java.lang.Object apply(net.minecraft.world.level.storage.loot.functions.LootItemFunction$Builder) -> b
-net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$DummyBuilder -> csr$b:
+    75:79:void <init>() -> <init>
+    83:84:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder apply(net.minecraft.world.level.storage.loot.functions.LootItemFunction$Builder) -> a
+    88:88:net.minecraft.world.level.storage.loot.functions.LootItemFunction[] getFunctions() -> a
+    92:93:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder setWeight(int) -> a
+    97:98:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder setQuality(int) -> b
+    75:75:java.lang.Object apply(net.minecraft.world.level.storage.loot.functions.LootItemFunction$Builder) -> b
+net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$DummyBuilder -> dbq$b:
     net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$EntryConstructor constructor -> c
-    111:113:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$EntryConstructor) -> <init>
-    117:117:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$DummyBuilder getThis() -> g
-    122:122:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer build() -> b
-    108:108:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$EntryBase -> csr$c:
+    110:112:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$EntryConstructor) -> <init>
+    116:116:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$DummyBuilder getThis() -> g
+    121:121:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer build() -> b
+    107:107:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$EntryBase -> dbq$c:
     net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer this$0 -> b
-    50:50:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer) -> <init>
-    53:53:int getWeight(float) -> a
-net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$EntryConstructor -> csr$d:
+    49:49:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer) -> <init>
+    52:52:int getWeight(float) -> a
+net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$EntryConstructor -> dbq$d:
     net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer build(int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> build
-net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Serializer -> csr$e:
-    132:133:void <init>(net.minecraft.resources.ResourceLocation,java.lang.Class) -> <init>
-    137:148:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer,com.google.gson.JsonSerializationContext) -> a
-    152:156:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Serializer -> dbq$e:
+    129:129:void <init>() -> <init>
+    132:143:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer,com.google.gson.JsonSerializationContext) -> a
+    147:151:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserializeCustom(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
     net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
-    130:130:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    130:130:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.entries.LootTableReference -> css:
-    net.minecraft.resources.ResourceLocation name -> c
+    129:129:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer deserializeCustom(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    129:129:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.entries.LootTableReference -> dbr:
+    net.minecraft.resources.ResourceLocation name -> g
     21:23:void <init>(net.minecraft.resources.ResourceLocation,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> <init>
-    27:29:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
-    33:46:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
-    49:49:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder lootTableReference(net.minecraft.resources.ResourceLocation) -> a
-    49:49:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer lambda$lootTableReference$0(net.minecraft.resources.ResourceLocation,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
+    27:27:net.minecraft.world.level.storage.loot.entries.LootPoolEntryType getType() -> a
+    32:34:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
+    38:51:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    54:54:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder lootTableReference(net.minecraft.resources.ResourceLocation) -> a
+    54:54:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer lambda$lootTableReference$0(net.minecraft.resources.ResourceLocation,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
     17:17:net.minecraft.resources.ResourceLocation access$000(net.minecraft.world.level.storage.loot.entries.LootTableReference) -> a
     17:17:void <init>(net.minecraft.resources.ResourceLocation,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[],net.minecraft.world.level.storage.loot.entries.LootTableReference$1) -> <init>
-net.minecraft.world.level.storage.loot.entries.LootTableReference$1 -> css$1:
-net.minecraft.world.level.storage.loot.entries.LootTableReference$Serializer -> css$a:
-    54:55:void <init>() -> <init>
-    59:61:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootTableReference,com.google.gson.JsonSerializationContext) -> a
-    65:66:net.minecraft.world.level.storage.loot.entries.LootTableReference deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
-    52:52:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
-    52:52:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer,com.google.gson.JsonSerializationContext) -> a
-    52:52:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.entries.SequentialEntry -> cst:
+net.minecraft.world.level.storage.loot.entries.LootTableReference$1 -> dbr$1:
+net.minecraft.world.level.storage.loot.entries.LootTableReference$Serializer -> dbr$a:
+    57:57:void <init>() -> <init>
+    60:62:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootTableReference,com.google.gson.JsonSerializationContext) -> a
+    66:67:net.minecraft.world.level.storage.loot.entries.LootTableReference deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
+    57:57:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
+    57:57:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer,com.google.gson.JsonSerializationContext) -> a
+    57:57:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.entries.SequentialEntry -> dbs:
     10:11:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer[],net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
-    15:23:net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer compose(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[]) -> a
-    61:61:net.minecraft.world.level.storage.loot.entries.SequentialEntry$Builder sequential(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> a
-    24:29:boolean lambda$compose$0(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[],net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
-net.minecraft.world.level.storage.loot.entries.SequentialEntry$Builder -> cst$a:
+    15:15:net.minecraft.world.level.storage.loot.entries.LootPoolEntryType getType() -> a
+    20:28:net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer compose(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[]) -> a
+    66:66:net.minecraft.world.level.storage.loot.entries.SequentialEntry$Builder sequential(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> a
+    29:34:boolean lambda$compose$0(net.minecraft.world.level.storage.loot.entries.ComposableEntryContainer[],net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
+net.minecraft.world.level.storage.loot.entries.SequentialEntry$Builder -> dbs$a:
     java.util.List entries -> a
-    35:41:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> <init>
-    45:45:net.minecraft.world.level.storage.loot.entries.SequentialEntry$Builder getThis() -> a
-    50:51:net.minecraft.world.level.storage.loot.entries.SequentialEntry$Builder then(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> c
-    56:56:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer build() -> b
-    34:34:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.entries.TagEntry -> csu:
-    net.minecraft.tags.Tag tag -> c
+    40:46:void <init>(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder[]) -> <init>
+    50:50:net.minecraft.world.level.storage.loot.entries.SequentialEntry$Builder getThis() -> a
+    55:56:net.minecraft.world.level.storage.loot.entries.SequentialEntry$Builder then(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> c
+    61:61:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer build() -> b
+    39:39:net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.entries.TagEntry -> dbt:
+    net.minecraft.tags.Tag tag -> g
     boolean expand -> h
     24:27:void <init>(net.minecraft.tags.Tag,boolean,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> <init>
-    31:32:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
-    35:46:boolean expandTag(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
-    51:54:boolean expand(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> expand
-    59:59:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder tagContents(net.minecraft.tags.Tag) -> a
-    63:63:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder expandTag(net.minecraft.tags.Tag) -> b
-    63:63:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer lambda$expandTag$2(net.minecraft.tags.Tag,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
-    59:59:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer lambda$tagContents$1(net.minecraft.tags.Tag,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
-    31:31:void lambda$createItemStack$0(java.util.function.Consumer,net.minecraft.world.item.Item) -> a
+    31:31:net.minecraft.world.level.storage.loot.entries.LootPoolEntryType getType() -> a
+    36:37:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
+    40:51:boolean expandTag(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> a
+    56:59:boolean expand(net.minecraft.world.level.storage.loot.LootContext,java.util.function.Consumer) -> expand
+    64:64:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder tagContents(net.minecraft.tags.Tag) -> a
+    68:68:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer$Builder expandTag(net.minecraft.tags.Tag) -> b
+    68:68:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer lambda$expandTag$2(net.minecraft.tags.Tag,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
+    64:64:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer lambda$tagContents$1(net.minecraft.tags.Tag,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
+    36:36:void lambda$createItemStack$0(java.util.function.Consumer,net.minecraft.world.item.Item) -> a
     19:19:net.minecraft.tags.Tag access$000(net.minecraft.world.level.storage.loot.entries.TagEntry) -> a
     19:19:boolean access$100(net.minecraft.world.level.storage.loot.entries.TagEntry) -> b
     19:19:void <init>(net.minecraft.tags.Tag,boolean,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[],net.minecraft.world.level.storage.loot.entries.TagEntry$1) -> <init>
-net.minecraft.world.level.storage.loot.entries.TagEntry$1 -> csu$1:
+net.minecraft.world.level.storage.loot.entries.TagEntry$1 -> dbt$1:
     net.minecraft.world.item.Item val$item -> a
     net.minecraft.world.level.storage.loot.entries.TagEntry this$0 -> c
-    37:37:void <init>(net.minecraft.world.level.storage.loot.entries.TagEntry,net.minecraft.world.item.Item) -> <init>
-    40:41:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
-net.minecraft.world.level.storage.loot.entries.TagEntry$Serializer -> csu$a:
-    68:69:void <init>() -> <init>
-    73:77:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.TagEntry,com.google.gson.JsonSerializationContext) -> a
-    81:90:net.minecraft.world.level.storage.loot.entries.TagEntry deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
-    66:66:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
-    66:66:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer,com.google.gson.JsonSerializationContext) -> a
-    66:66:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.entries.package-info -> csv:
-net.minecraft.world.level.storage.loot.functions.ApplyBonusCount -> csw:
+    42:42:void <init>(net.minecraft.world.level.storage.loot.entries.TagEntry,net.minecraft.world.item.Item) -> <init>
+    45:46:void createItemStack(java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
+net.minecraft.world.level.storage.loot.entries.TagEntry$Serializer -> dbt$a:
+    71:71:void <init>() -> <init>
+    74:78:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.TagEntry,com.google.gson.JsonSerializationContext) -> a
+    82:91:net.minecraft.world.level.storage.loot.entries.TagEntry deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> a
+    71:71:net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,int,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.LootItemFunction[]) -> b
+    71:71:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer,com.google.gson.JsonSerializationContext) -> a
+    71:71:void serializeCustom(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.entries.package-info -> dbu:
+net.minecraft.world.level.storage.loot.functions.ApplyBonusCount -> dbv:
     java.util.Map FORMULAS -> a
-    net.minecraft.world.item.enchantment.Enchantment enchantment -> c
+    net.minecraft.world.item.enchantment.Enchantment enchantment -> b
     net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Formula formula -> d
     149:152:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Formula) -> <init>
-    156:156:java.util.Set getReferencedContextParams() -> a
-    161:168:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    172:172:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder addBonusBinomialDistributionCount(net.minecraft.world.item.enchantment.Enchantment,float,int) -> a
-    176:176:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder addOreBonusCount(net.minecraft.world.item.enchantment.Enchantment) -> a
-    180:180:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder addUniformBonusCount(net.minecraft.world.item.enchantment.Enchantment) -> b
-    184:184:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder addUniformBonusCount(net.minecraft.world.item.enchantment.Enchantment,int) -> a
-    184:184:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$addUniformBonusCount$3(net.minecraft.world.item.enchantment.Enchantment,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    180:180:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$addUniformBonusCount$2(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    176:176:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$addOreBonusCount$1(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    172:172:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$addBonusBinomialDistributionCount$0(net.minecraft.world.item.enchantment.Enchantment,int,float,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    156:156:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    161:161:java.util.Set getReferencedContextParams() -> a
+    166:173:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    177:177:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder addBonusBinomialDistributionCount(net.minecraft.world.item.enchantment.Enchantment,float,int) -> a
+    181:181:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder addOreBonusCount(net.minecraft.world.item.enchantment.Enchantment) -> a
+    185:185:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder addUniformBonusCount(net.minecraft.world.item.enchantment.Enchantment) -> b
+    189:189:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder addUniformBonusCount(net.minecraft.world.item.enchantment.Enchantment,int) -> a
+    189:189:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$addUniformBonusCount$3(net.minecraft.world.item.enchantment.Enchantment,int,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    185:185:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$addUniformBonusCount$2(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    181:181:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$addOreBonusCount$1(net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    177:177:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$addBonusBinomialDistributionCount$0(net.minecraft.world.item.enchantment.Enchantment,int,float,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
     24:24:net.minecraft.world.item.enchantment.Enchantment access$000(net.minecraft.world.level.storage.loot.functions.ApplyBonusCount) -> a
     24:24:net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Formula access$100(net.minecraft.world.level.storage.loot.functions.ApplyBonusCount) -> b
-    24:24:java.util.Map access$200() -> b
+    24:24:java.util.Map access$200() -> c
     24:24:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.item.enchantment.Enchantment,net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Formula,net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$1) -> <init>
     136:142:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$1 -> csw$1:
-net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$BinomialWithBonusCount -> csw$a:
+net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$1 -> dbv$1:
+net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$BinomialWithBonusCount -> dbv$a:
     net.minecraft.resources.ResourceLocation TYPE -> a
     int extraRounds -> b
     float probability -> c
@@ -64887,13 +71324,13 @@ net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$BinomialWithBon
     65:67:net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Formula deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
     72:72:net.minecraft.resources.ResourceLocation getType() -> a
     38:38:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Formula -> csw$b:
+net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Formula -> dbv$b:
     int calculateNewCount(java.util.Random,int,int) -> a
     void serializeParams(com.google.gson.JsonObject,com.google.gson.JsonSerializationContext) -> a
     net.minecraft.resources.ResourceLocation getType() -> a
-net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$FormulaDeserializer -> csw$c:
+net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$FormulaDeserializer -> dbv$c:
     net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Formula deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$OreDrops -> csw$d:
+net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$OreDrops -> dbv$d:
     net.minecraft.resources.ResourceLocation TYPE -> a
     106:106:void <init>() -> <init>
     111:119:int calculateNewCount(java.util.Random,int,int) -> a
@@ -64902,15 +71339,15 @@ net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$OreDrops -> csw
     132:132:net.minecraft.resources.ResourceLocation getType() -> a
     106:106:void <init>(net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$1) -> <init>
     107:107:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Serializer -> csw$e:
-    189:190:void <init>() -> <init>
-    194:204:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.ApplyBonusCount,com.google.gson.JsonSerializationContext) -> a
-    208:223:net.minecraft.world.level.storage.loot.functions.ApplyBonusCount deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    187:187:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    187:187:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    187:187:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-    209:209:com.google.gson.JsonParseException lambda$deserialize$0(net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$UniformBonusCount -> csw$f:
+net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Serializer -> dbv$e:
+    192:192:void <init>() -> <init>
+    195:205:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.ApplyBonusCount,com.google.gson.JsonSerializationContext) -> a
+    209:224:net.minecraft.world.level.storage.loot.functions.ApplyBonusCount deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    192:192:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    192:192:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    192:192:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+    210:210:com.google.gson.JsonParseException lambda$deserialize$0(net.minecraft.resources.ResourceLocation) -> a
+net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$UniformBonusCount -> dbv$f:
     net.minecraft.resources.ResourceLocation TYPE -> a
     int bonusMultiplier -> b
     81:83:void <init>(int) -> <init>
@@ -64919,59 +71356,62 @@ net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$UniformBonusCou
     96:97:net.minecraft.world.level.storage.loot.functions.ApplyBonusCount$Formula deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
     102:102:net.minecraft.resources.ResourceLocation getType() -> a
     77:77:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay -> csx:
-    15:16:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
-    20:36:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    40:40:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder explosionDecay() -> b
-    13:13:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay$1) -> <init>
-net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay$1 -> csx$1:
-net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay$Serializer -> csx$a:
-    45:46:void <init>() -> <init>
+net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay -> dbw:
+    14:15:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
+    19:19:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    24:40:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    44:44:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder explosionDecay() -> c
+    12:12:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay$1) -> <init>
+net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay$1 -> dbw$1:
+net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay$Serializer -> dbw$a:
+    47:47:void <init>() -> <init>
     50:50:net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    43:43:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-net.minecraft.world.level.storage.loot.functions.CopyBlockState -> csy:
+    47:47:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+net.minecraft.world.level.storage.loot.functions.CopyBlockState -> dbx:
     net.minecraft.world.level.block.Block block -> a
-    java.util.Set properties -> c
+    java.util.Set properties -> b
     32:35:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.block.Block,java.util.Set) -> <init>
-    39:39:java.util.Set getReferencedContextParams() -> a
-    44:58:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    89:89:net.minecraft.world.level.storage.loot.functions.CopyBlockState$Builder copyState(net.minecraft.world.level.block.Block) -> a
-    93:94:java.lang.String serialize(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.properties.Property) -> a
-    55:55:void lambda$run$0(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.properties.Property) -> a
+    39:39:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    44:44:java.util.Set getReferencedContextParams() -> a
+    49:63:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    94:94:net.minecraft.world.level.storage.loot.functions.CopyBlockState$Builder copyState(net.minecraft.world.level.block.Block) -> a
+    98:99:java.lang.String serialize(net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.properties.Property) -> a
+    60:60:void lambda$run$0(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.block.state.BlockState,net.minecraft.world.level.block.state.properties.Property) -> a
     27:27:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.block.Block,java.util.Set,net.minecraft.world.level.storage.loot.functions.CopyBlockState$1) -> <init>
     27:27:net.minecraft.world.level.block.Block access$200(net.minecraft.world.level.storage.loot.functions.CopyBlockState) -> a
     27:27:java.util.Set access$300(net.minecraft.world.level.storage.loot.functions.CopyBlockState) -> b
-net.minecraft.world.level.storage.loot.functions.CopyBlockState$1 -> csy$1:
-net.minecraft.world.level.storage.loot.functions.CopyBlockState$Builder -> csy$a:
+net.minecraft.world.level.storage.loot.functions.CopyBlockState$1 -> dbx$1:
+net.minecraft.world.level.storage.loot.functions.CopyBlockState$Builder -> dbx$a:
     net.minecraft.world.level.block.Block block -> a
     java.util.Set properties -> b
-    63:67:void <init>(net.minecraft.world.level.block.Block) -> <init>
-    70:74:net.minecraft.world.level.storage.loot.functions.CopyBlockState$Builder copy(net.minecraft.world.level.block.state.properties.Property) -> a
-    79:79:net.minecraft.world.level.storage.loot.functions.CopyBlockState$Builder getThis() -> a
-    84:84:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    61:61:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-    61:61:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.functions.CopyBlockState$1) -> <init>
-net.minecraft.world.level.storage.loot.functions.CopyBlockState$Serializer -> csy$b:
-    99:100:void <init>() -> <init>
-    104:109:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.CopyBlockState,com.google.gson.JsonSerializationContext) -> a
-    113:123:net.minecraft.world.level.storage.loot.functions.CopyBlockState deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    97:97:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    97:97:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    97:97:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-    121:121:void lambda$deserialize$2(java.util.Set,net.minecraft.world.level.block.state.StateDefinition,com.google.gson.JsonElement) -> a
-    115:115:java.lang.IllegalArgumentException lambda$deserialize$1(net.minecraft.resources.ResourceLocation) -> a
-    107:107:void lambda$serialize$0(com.google.gson.JsonArray,net.minecraft.world.level.block.state.properties.Property) -> a
-net.minecraft.world.level.storage.loot.functions.CopyNameFunction -> csz:
+    68:72:void <init>(net.minecraft.world.level.block.Block) -> <init>
+    75:79:net.minecraft.world.level.storage.loot.functions.CopyBlockState$Builder copy(net.minecraft.world.level.block.state.properties.Property) -> a
+    84:84:net.minecraft.world.level.storage.loot.functions.CopyBlockState$Builder getThis() -> a
+    89:89:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    66:66:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+    66:66:void <init>(net.minecraft.world.level.block.Block,net.minecraft.world.level.storage.loot.functions.CopyBlockState$1) -> <init>
+net.minecraft.world.level.storage.loot.functions.CopyBlockState$Serializer -> dbx$b:
+    102:102:void <init>() -> <init>
+    105:110:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.CopyBlockState,com.google.gson.JsonSerializationContext) -> a
+    114:124:net.minecraft.world.level.storage.loot.functions.CopyBlockState deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    102:102:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    102:102:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    102:102:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+    122:122:void lambda$deserialize$2(java.util.Set,net.minecraft.world.level.block.state.StateDefinition,com.google.gson.JsonElement) -> a
+    116:116:java.lang.IllegalArgumentException lambda$deserialize$1(net.minecraft.resources.ResourceLocation) -> a
+    108:108:void lambda$serialize$0(com.google.gson.JsonArray,net.minecraft.world.level.block.state.properties.Property) -> a
+net.minecraft.world.level.storage.loot.functions.CopyNameFunction -> dby:
     net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource source -> a
-    22:24:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource) -> <init>
-    28:28:java.util.Set getReferencedContextParams() -> a
-    33:40:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    44:44:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder copyName(net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource) -> a
-    44:44:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$copyName$0(net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    18:18:net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource access$000(net.minecraft.world.level.storage.loot.functions.CopyNameFunction) -> a
-    18:18:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource,net.minecraft.world.level.storage.loot.functions.CopyNameFunction$1) -> <init>
-net.minecraft.world.level.storage.loot.functions.CopyNameFunction$1 -> csz$1:
-net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource -> csz$a:
+    21:23:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource) -> <init>
+    28:28:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    33:33:java.util.Set getReferencedContextParams() -> a
+    38:45:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    49:49:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder copyName(net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource) -> a
+    49:49:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$copyName$0(net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    17:17:net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource access$000(net.minecraft.world.level.storage.loot.functions.CopyNameFunction) -> a
+    17:17:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource,net.minecraft.world.level.storage.loot.functions.CopyNameFunction$1) -> <init>
+net.minecraft.world.level.storage.loot.functions.CopyNameFunction$1 -> dby$1:
+net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource -> dby$a:
     net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource THIS -> a
     net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource KILLER -> b
     net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource KILLER_PLAYER -> c
@@ -64979,60 +71419,61 @@ net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource ->
     java.lang.String name -> e
     net.minecraft.world.level.storage.loot.parameters.LootContextParam param -> f
     net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource[] $VALUES -> g
-    47:47:net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource[] values() -> values
-    47:47:net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource valueOf(java.lang.String) -> valueOf
-    56:59:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.storage.loot.parameters.LootContextParam) -> <init>
-    62:67:net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource getByName(java.lang.String) -> a
-    47:51:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.CopyNameFunction$Serializer -> csz$b:
-    73:74:void <init>() -> <init>
-    78:81:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.CopyNameFunction,com.google.gson.JsonSerializationContext) -> a
-    85:86:net.minecraft.world.level.storage.loot.functions.CopyNameFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    71:71:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    71:71:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    71:71:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.CopyNbtFunction -> cta:
+    52:52:net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource[] values() -> values
+    52:52:net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource valueOf(java.lang.String) -> valueOf
+    61:64:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.storage.loot.parameters.LootContextParam) -> <init>
+    67:72:net.minecraft.world.level.storage.loot.functions.CopyNameFunction$NameSource getByName(java.lang.String) -> a
+    52:56:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.CopyNameFunction$Serializer -> dby$b:
+    76:76:void <init>() -> <init>
+    79:82:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.CopyNameFunction,com.google.gson.JsonSerializationContext) -> a
+    86:87:net.minecraft.world.level.storage.loot.functions.CopyNameFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    76:76:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    76:76:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    76:76:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.CopyNbtFunction -> dbz:
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource source -> a
-    java.util.List operations -> c
+    java.util.List operations -> b
     java.util.function.Function ENTITY_GETTER -> d
     java.util.function.Function BLOCK_ENTITY_GETTER -> e
-    81:84:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource,java.util.List) -> <init>
-    88:90:net.minecraft.commands.arguments.NbtPathArgument$NbtPath compileNbtPath(java.lang.String) -> b
-    96:96:java.util.Set getReferencedContextParams() -> a
-    101:106:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    138:138:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder copyData(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource) -> a
-    142:142:net.minecraft.nbt.Tag lambda$static$1(net.minecraft.world.level.block.entity.BlockEntity) -> a
-    103:103:void lambda$run$0(net.minecraft.world.item.ItemStack,net.minecraft.nbt.Tag,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$CopyOperation) -> a
-    34:34:net.minecraft.commands.arguments.NbtPathArgument$NbtPath access$000(java.lang.String) -> a
-    34:34:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource,java.util.List,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$1) -> <init>
-    34:34:java.util.function.Function access$600() -> b
-    34:34:java.util.function.Function access$700() -> c
-    34:34:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource access$800(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction) -> a
-    34:34:java.util.List access$900(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction) -> b
-    141:142:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$1 -> cta$1:
-net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder -> cta$a:
+    80:83:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource,java.util.List) -> <init>
+    87:87:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    92:94:net.minecraft.commands.arguments.NbtPathArgument$NbtPath compileNbtPath(java.lang.String) -> b
+    100:100:java.util.Set getReferencedContextParams() -> a
+    105:110:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    142:142:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder copyData(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource) -> a
+    146:146:net.minecraft.nbt.Tag lambda$static$1(net.minecraft.world.level.block.entity.BlockEntity) -> a
+    107:107:void lambda$run$0(net.minecraft.world.item.ItemStack,net.minecraft.nbt.Tag,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$CopyOperation) -> a
+    33:33:net.minecraft.commands.arguments.NbtPathArgument$NbtPath access$000(java.lang.String) -> a
+    33:33:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource,java.util.List,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$1) -> <init>
+    33:33:java.util.function.Function access$600() -> c
+    33:33:java.util.function.Function access$700() -> d
+    33:33:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource access$800(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction) -> a
+    33:33:java.util.List access$900(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction) -> b
+    145:146:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$1 -> dbz$1:
+net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder -> dbz$a:
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource source -> a
     java.util.List ops -> b
-    111:115:void <init>(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource) -> <init>
-    118:119:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder copy(java.lang.String,java.lang.String,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy) -> a
-    123:123:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder copy(java.lang.String,java.lang.String) -> a
-    128:128:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder getThis() -> a
-    133:133:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    109:109:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-    109:109:void <init>(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$1) -> <init>
-net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$CopyOperation -> cta$b:
+    115:119:void <init>(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource) -> <init>
+    122:123:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder copy(java.lang.String,java.lang.String,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy) -> a
+    127:127:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder copy(java.lang.String,java.lang.String) -> a
+    132:132:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder getThis() -> a
+    137:137:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    113:113:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+    113:113:void <init>(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$1) -> <init>
+net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$CopyOperation -> dbz$b:
     java.lang.String sourcePathText -> a
     net.minecraft.commands.arguments.NbtPathArgument$NbtPath sourcePath -> b
     java.lang.String targetPathText -> c
     net.minecraft.commands.arguments.NbtPathArgument$NbtPath targetPath -> d
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy op -> e
-    42:48:void <init>(java.lang.String,java.lang.String,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy) -> <init>
-    52:59:void apply(java.util.function.Supplier,net.minecraft.nbt.Tag) -> a
-    62:66:com.google.gson.JsonObject toJson() -> a
-    70:73:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$CopyOperation fromJson(com.google.gson.JsonObject) -> a
-    35:35:void <init>(java.lang.String,java.lang.String,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$1) -> <init>
-net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource -> cta$c:
+    41:47:void <init>(java.lang.String,java.lang.String,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy) -> <init>
+    51:58:void apply(java.util.function.Supplier,net.minecraft.nbt.Tag) -> a
+    61:65:com.google.gson.JsonObject toJson() -> a
+    69:72:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$CopyOperation fromJson(com.google.gson.JsonObject) -> a
+    34:34:void <init>(java.lang.String,java.lang.String,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$1) -> <init>
+net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource -> dbz$c:
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource THIS -> a
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource KILLER -> b
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource KILLER_PLAYER -> c
@@ -65041,516 +71482,543 @@ net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource -> c
     net.minecraft.world.level.storage.loot.parameters.LootContextParam param -> f
     java.util.function.Function getter -> g
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource[] $VALUES -> h
-    198:198:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource[] values() -> values
-    198:198:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource valueOf(java.lang.String) -> valueOf
-    208:215:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.storage.loot.parameters.LootContextParam,java.util.function.Function) -> <init>
-    218:223:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource getByName(java.lang.String) -> a
-    212:213:net.minecraft.nbt.Tag lambda$new$0(net.minecraft.world.level.storage.loot.parameters.LootContextParam,java.util.function.Function,net.minecraft.world.level.storage.loot.LootContext) -> a
-    198:202:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy -> cta$d:
+    202:202:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource[] values() -> values
+    202:202:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource valueOf(java.lang.String) -> valueOf
+    212:219:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.storage.loot.parameters.LootContextParam,java.util.function.Function) -> <init>
+    222:227:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$DataSource getByName(java.lang.String) -> a
+    216:217:net.minecraft.nbt.Tag lambda$new$0(net.minecraft.world.level.storage.loot.parameters.LootContextParam,java.util.function.Function,net.minecraft.world.level.storage.loot.LootContext) -> a
+    202:206:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy -> dbz$d:
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy REPLACE -> a
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy APPEND -> b
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy MERGE -> c
     java.lang.String name -> d
     net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy[] $VALUES -> e
-    144:144:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy[] values() -> values
-    144:144:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy valueOf(java.lang.String) -> valueOf
+    148:148:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy[] values() -> values
+    148:148:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy valueOf(java.lang.String) -> valueOf
     void merge(net.minecraft.nbt.Tag,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,java.util.List) -> a
-    184:186:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    189:194:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy getByName(java.lang.String) -> a
-    144:144:java.lang.String access$100(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy) -> a
-    144:144:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$1) -> <init>
-    144:163:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy$1 -> cta$d$1:
-    145:145:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    148:149:void merge(net.minecraft.nbt.Tag,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,java.util.List) -> a
-net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy$2 -> cta$d$2:
-    151:151:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    154:161:void merge(net.minecraft.nbt.Tag,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,java.util.List) -> a
-    156:159:void lambda$merge$1(java.util.List,net.minecraft.nbt.Tag) -> a
-    157:157:void lambda$null$0(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag) -> a
-net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy$3 -> cta$d$3:
-    163:163:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    166:177:void merge(net.minecraft.nbt.Tag,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,java.util.List) -> a
-    168:175:void lambda$merge$1(java.util.List,net.minecraft.nbt.Tag) -> a
-    170:173:void lambda$null$0(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag) -> a
-net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Serializer -> cta$e:
-    229:230:void <init>() -> <init>
+    188:190:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    193:198:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy getByName(java.lang.String) -> a
+    148:148:java.lang.String access$100(net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy) -> a
+    148:148:void <init>(java.lang.String,int,java.lang.String,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$1) -> <init>
+    148:167:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy$1 -> dbz$d$1:
+    149:149:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    152:153:void merge(net.minecraft.nbt.Tag,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,java.util.List) -> a
+net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy$2 -> dbz$d$2:
+    155:155:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    158:165:void merge(net.minecraft.nbt.Tag,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,java.util.List) -> a
+    160:163:void lambda$merge$1(java.util.List,net.minecraft.nbt.Tag) -> a
+    161:161:void lambda$null$0(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag) -> a
+net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$MergeStrategy$3 -> dbz$d$3:
+    167:167:void <init>(java.lang.String,int,java.lang.String) -> <init>
+    170:181:void merge(net.minecraft.nbt.Tag,net.minecraft.commands.arguments.NbtPathArgument$NbtPath,java.util.List) -> a
+    172:179:void lambda$merge$1(java.util.List,net.minecraft.nbt.Tag) -> a
+    174:177:void lambda$null$0(net.minecraft.nbt.Tag,net.minecraft.nbt.Tag) -> a
+net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Serializer -> dbz$e:
+    231:231:void <init>() -> <init>
     234:239:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.CopyNbtFunction,com.google.gson.JsonSerializationContext) -> a
     243:250:net.minecraft.world.level.storage.loot.functions.CopyNbtFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    227:227:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    227:227:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    227:227:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction -> ctb:
+    231:231:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    231:231:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    231:231:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction -> dca:
     org.apache.logging.log4j.Logger LOGGER -> a
-    java.util.List enchantments -> c
-    38:40:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.Collection) -> <init>
-    46:70:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    93:93:net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$Builder randomEnchantment() -> b
-    97:97:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder randomApplicableEnchantment() -> c
-    97:97:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$randomApplicableEnchantment$0(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    32:32:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.Collection,net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$1) -> <init>
-    32:32:java.util.List access$100(net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction) -> a
-    33:33:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$1 -> ctb$1:
-net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$Builder -> ctb$a:
+    java.util.List enchantments -> b
+    39:41:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.Collection) -> <init>
+    45:45:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    52:69:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    73:81:net.minecraft.world.item.ItemStack enchantItem(net.minecraft.world.item.ItemStack,net.minecraft.world.item.enchantment.Enchantment,java.util.Random) -> a
+    104:104:net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$Builder randomEnchantment() -> c
+    108:108:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder randomApplicableEnchantment() -> d
+    108:108:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$randomApplicableEnchantment$1(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    57:57:boolean lambda$run$0(boolean,net.minecraft.world.item.ItemStack,net.minecraft.world.item.enchantment.Enchantment) -> a
+    33:33:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.Collection,net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$1) -> <init>
+    33:33:java.util.List access$100(net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction) -> a
+    34:34:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$1 -> dca$1:
+net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$Builder -> dca$a:
     java.util.Set enchantments -> a
-    73:74:void <init>() -> <init>
-    78:78:net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$Builder getThis() -> a
-    82:83:net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$Builder withEnchantment(net.minecraft.world.item.enchantment.Enchantment) -> a
-    88:88:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    73:73:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$Serializer -> ctb$b:
-    102:103:void <init>() -> <init>
-    107:120:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction,com.google.gson.JsonSerializationContext) -> a
-    124:134:net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    100:100:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    100:100:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    100:100:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-    130:130:com.google.gson.JsonSyntaxException lambda$deserialize$0(java.lang.String) -> a
-net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction -> ctc:
-    net.minecraft.world.level.storage.loot.RandomIntGenerator levels -> a
-    boolean treasure -> c
-    22:25:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomIntGenerator,boolean) -> <init>
-    29:30:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    58:58:net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$Builder enchantWithLevels(net.minecraft.world.level.storage.loot.RandomIntGenerator) -> a
-    17:17:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomIntGenerator,boolean,net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$1) -> <init>
-    17:17:net.minecraft.world.level.storage.loot.RandomIntGenerator access$100(net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction) -> a
-    17:17:boolean access$200(net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction) -> b
-net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$1 -> ctc$1:
-net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$Builder -> ctc$a:
+    84:85:void <init>() -> <init>
+    89:89:net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$Builder getThis() -> a
+    93:94:net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$Builder withEnchantment(net.minecraft.world.item.enchantment.Enchantment) -> a
+    99:99:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    84:84:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction$Serializer -> dca$b:
+    111:111:void <init>() -> <init>
+    114:127:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction,com.google.gson.JsonSerializationContext) -> a
+    131:141:net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    111:111:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    111:111:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    111:111:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+    137:137:com.google.gson.JsonSyntaxException lambda$deserialize$0(java.lang.String) -> a
+net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction -> dcb:
     net.minecraft.world.level.storage.loot.RandomIntGenerator levels -> a
     boolean treasure -> b
-    37:39:void <init>(net.minecraft.world.level.storage.loot.RandomIntGenerator) -> <init>
-    43:43:net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$Builder getThis() -> a
-    47:48:net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$Builder allowTreasure() -> e
-    53:53:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    33:33:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$Serializer -> ctc$b:
-    63:64:void <init>() -> <init>
+    21:24:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomIntGenerator,boolean) -> <init>
+    28:28:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    33:34:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    62:62:net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$Builder enchantWithLevels(net.minecraft.world.level.storage.loot.RandomIntGenerator) -> a
+    16:16:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomIntGenerator,boolean,net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$1) -> <init>
+    16:16:net.minecraft.world.level.storage.loot.RandomIntGenerator access$100(net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction) -> a
+    16:16:boolean access$200(net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction) -> b
+net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$1 -> dcb$1:
+net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$Builder -> dcb$a:
+    net.minecraft.world.level.storage.loot.RandomIntGenerator levels -> a
+    boolean treasure -> b
+    41:43:void <init>(net.minecraft.world.level.storage.loot.RandomIntGenerator) -> <init>
+    47:47:net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$Builder getThis() -> a
+    51:52:net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$Builder allowTreasure() -> e
+    57:57:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    37:37:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction$Serializer -> dcb$b:
+    65:65:void <init>() -> <init>
     68:72:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction,com.google.gson.JsonSerializationContext) -> a
     76:78:net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    61:61:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    61:61:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    61:61:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction -> ctd:
-    org.apache.logging.log4j.Logger LOGGER -> c
-    net.minecraft.world.level.saveddata.maps.MapDecoration$Type DEFAULT_DECORATION -> a
-    java.lang.String destination -> d
-    net.minecraft.world.level.saveddata.maps.MapDecoration$Type mapDecoration -> e
-    byte zoom -> f
-    int searchRadius -> g
-    boolean skipKnownStructures -> h
-    45:51:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.lang.String,net.minecraft.world.level.saveddata.maps.MapDecoration$Type,byte,int,boolean) -> <init>
-    55:55:java.util.Set getReferencedContextParams() -> a
-    60:78:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    125:125:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder makeExplorationMap() -> b
-    29:29:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.lang.String,net.minecraft.world.level.saveddata.maps.MapDecoration$Type,byte,int,boolean,net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$1) -> <init>
-    29:29:java.lang.String access$100(net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction) -> a
-    29:29:net.minecraft.world.level.saveddata.maps.MapDecoration$Type access$200(net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction) -> b
-    29:29:byte access$300(net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction) -> c
-    29:29:int access$400(net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction) -> d
-    29:29:boolean access$500(net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction) -> e
-    29:29:org.apache.logging.log4j.Logger access$600() -> c
-    30:33:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$1 -> ctd$1:
-net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder -> ctd$a:
-    java.lang.String destination -> a
+    65:65:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    65:65:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    65:65:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction -> dcc:
+    org.apache.logging.log4j.Logger LOGGER -> d
+    net.minecraft.world.level.levelgen.feature.StructureFeature DEFAULT_FEATURE -> a
+    net.minecraft.world.level.saveddata.maps.MapDecoration$Type DEFAULT_DECORATION -> b
+    net.minecraft.world.level.levelgen.feature.StructureFeature destination -> e
+    net.minecraft.world.level.saveddata.maps.MapDecoration$Type mapDecoration -> f
+    byte zoom -> g
+    int searchRadius -> h
+    boolean skipKnownStructures -> i
+    43:49:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.saveddata.maps.MapDecoration$Type,byte,int,boolean) -> <init>
+    53:53:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    58:58:java.util.Set getReferencedContextParams() -> a
+    63:81:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    128:128:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder makeExplorationMap() -> c
+    27:27:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.levelgen.feature.StructureFeature,net.minecraft.world.level.saveddata.maps.MapDecoration$Type,byte,int,boolean,net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$1) -> <init>
+    27:27:net.minecraft.world.level.levelgen.feature.StructureFeature access$100(net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction) -> a
+    27:27:net.minecraft.world.level.saveddata.maps.MapDecoration$Type access$200(net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction) -> b
+    27:27:byte access$300(net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction) -> c
+    27:27:int access$400(net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction) -> d
+    27:27:boolean access$500(net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction) -> e
+    27:27:org.apache.logging.log4j.Logger access$600() -> d
+    28:31:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$1 -> dcc$1:
+net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder -> dcc$a:
+    net.minecraft.world.level.levelgen.feature.StructureFeature destination -> a
     net.minecraft.world.level.saveddata.maps.MapDecoration$Type mapDecoration -> b
     byte zoom -> c
     int searchRadius -> d
     boolean skipKnownStructures -> e
-    81:86:void <init>() -> <init>
-    90:90:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder getThis() -> a
-    94:95:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder setDestination(java.lang.String) -> a
-    99:100:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder setMapDecoration(net.minecraft.world.level.saveddata.maps.MapDecoration$Type) -> a
-    104:105:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder setZoom(byte) -> a
-    109:110:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder setSearchRadius(int) -> a
-    114:115:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder setSkipKnownStructures(boolean) -> a
-    120:120:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    81:81:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Serializer -> ctd$b:
-    130:131:void <init>() -> <init>
-    135:156:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction,com.google.gson.JsonSerializationContext) -> a
-    160:177:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    128:128:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    128:128:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    128:128:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.FillPlayerHead -> cte:
+    84:89:void <init>() -> <init>
+    93:93:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder getThis() -> a
+    97:98:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder setDestination(net.minecraft.world.level.levelgen.feature.StructureFeature) -> a
+    102:103:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder setMapDecoration(net.minecraft.world.level.saveddata.maps.MapDecoration$Type) -> a
+    107:108:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder setZoom(byte) -> a
+    112:113:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder setSearchRadius(int) -> a
+    117:118:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Builder setSkipKnownStructures(boolean) -> a
+    123:123:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    84:84:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction$Serializer -> dcc$b:
+    131:131:void <init>() -> <init>
+    134:155:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction,com.google.gson.JsonSerializationContext) -> a
+    159:175:net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    179:186:net.minecraft.world.level.levelgen.feature.StructureFeature readStructure(com.google.gson.JsonObject) -> a
+    131:131:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    131:131:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    131:131:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.FillPlayerHead -> dcd:
     net.minecraft.world.level.storage.loot.LootContext$EntityTarget entityTarget -> a
-    27:29:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
-    33:33:java.util.Set getReferencedContextParams() -> a
-    38:45:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    49:49:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder fillPlayerHead(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
-    49:49:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$fillPlayerHead$0(net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    23:23:net.minecraft.world.level.storage.loot.LootContext$EntityTarget access$000(net.minecraft.world.level.storage.loot.functions.FillPlayerHead) -> a
-net.minecraft.world.level.storage.loot.functions.FillPlayerHead$Serializer -> cte$a:
-    54:55:void <init>() -> <init>
+    26:28:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
+    32:32:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    37:37:java.util.Set getReferencedContextParams() -> a
+    42:49:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    53:53:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder fillPlayerHead(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
+    53:53:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$fillPlayerHead$0(net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    22:22:net.minecraft.world.level.storage.loot.LootContext$EntityTarget access$000(net.minecraft.world.level.storage.loot.functions.FillPlayerHead) -> a
+net.minecraft.world.level.storage.loot.functions.FillPlayerHead$Serializer -> dcd$a:
+    56:56:void <init>() -> <init>
     59:61:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.FillPlayerHead,com.google.gson.JsonSerializationContext) -> a
     65:66:net.minecraft.world.level.storage.loot.functions.FillPlayerHead deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    52:52:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    52:52:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    52:52:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.FunctionUserBuilder -> ctf:
+    56:56:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    56:56:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    56:56:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.FunctionUserBuilder -> dce:
     java.lang.Object apply(net.minecraft.world.level.storage.loot.functions.LootItemFunction$Builder) -> b
     java.lang.Object unwrap() -> c
-net.minecraft.world.level.storage.loot.functions.LimitCount -> ctg:
+net.minecraft.world.level.storage.loot.functions.LimitCount -> dcf:
     net.minecraft.world.level.storage.loot.IntLimiter limiter -> a
-    17:19:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.IntLimiter) -> <init>
-    23:25:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    29:29:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder limitCount(net.minecraft.world.level.storage.loot.IntLimiter) -> a
-    29:29:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$limitCount$0(net.minecraft.world.level.storage.loot.IntLimiter,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    13:13:net.minecraft.world.level.storage.loot.IntLimiter access$000(net.minecraft.world.level.storage.loot.functions.LimitCount) -> a
-    13:13:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.IntLimiter,net.minecraft.world.level.storage.loot.functions.LimitCount$1) -> <init>
-net.minecraft.world.level.storage.loot.functions.LimitCount$1 -> ctg$1:
-net.minecraft.world.level.storage.loot.functions.LimitCount$Serializer -> ctg$a:
-    34:35:void <init>() -> <init>
+    16:18:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.IntLimiter) -> <init>
+    22:22:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    27:29:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    33:33:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder limitCount(net.minecraft.world.level.storage.loot.IntLimiter) -> a
+    33:33:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$limitCount$0(net.minecraft.world.level.storage.loot.IntLimiter,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    12:12:net.minecraft.world.level.storage.loot.IntLimiter access$000(net.minecraft.world.level.storage.loot.functions.LimitCount) -> a
+    12:12:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.IntLimiter,net.minecraft.world.level.storage.loot.functions.LimitCount$1) -> <init>
+net.minecraft.world.level.storage.loot.functions.LimitCount$1 -> dcf$1:
+net.minecraft.world.level.storage.loot.functions.LimitCount$Serializer -> dcf$a:
+    36:36:void <init>() -> <init>
     39:42:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LimitCount,com.google.gson.JsonSerializationContext) -> a
     46:47:net.minecraft.world.level.storage.loot.functions.LimitCount deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    32:32:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    32:32:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    32:32:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction -> cth:
-    net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] predicates -> b
+    36:36:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    36:36:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    36:36:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction -> dcg:
+    net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] predicates -> c
     java.util.function.Predicate compositePredicates -> a
-    25:28:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
-    32:32:net.minecraft.world.item.ItemStack apply(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> b
+    24:27:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
+    31:31:net.minecraft.world.item.ItemStack apply(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> b
     net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    39:44:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
-    86:86:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder simpleBuilder(java.util.function.Function) -> a
-    21:21:java.lang.Object apply(java.lang.Object,java.lang.Object) -> apply
-net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder -> cth$a:
+    38:43:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    85:85:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder simpleBuilder(java.util.function.Function) -> a
+    20:20:java.lang.Object apply(java.lang.Object,java.lang.Object) -> apply
+net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder -> dcg$a:
     java.util.List conditions -> a
-    46:47:void <init>() -> <init>
-    51:52:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder when(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
-    57:57:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder unwrap() -> f
+    45:46:void <init>() -> <init>
+    50:51:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder when(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
+    56:56:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder unwrap() -> f
     net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-    63:63:net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] getConditions() -> g
-    46:46:java.lang.Object unwrap() -> c
-    46:46:java.lang.Object when(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> b
-net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$DummyBuilder -> cth$b:
+    62:62:net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] getConditions() -> g
+    45:45:java.lang.Object unwrap() -> c
+    45:45:java.lang.Object when(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> b
+net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$DummyBuilder -> dcg$b:
     java.util.function.Function constructor -> a
-    70:72:void <init>(java.util.function.Function) -> <init>
-    76:76:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$DummyBuilder getThis() -> a
-    81:81:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    67:67:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Serializer -> cth$c:
-    91:92:void <init>(net.minecraft.resources.ResourceLocation,java.lang.Class) -> <init>
-    96:99:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    103:104:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    69:71:void <init>(java.util.function.Function) -> <init>
+    75:75:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$DummyBuilder getThis() -> a
+    80:80:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    66:66:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Serializer -> dcg$c:
+    88:88:void <init>() -> <init>
+    91:94:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    98:99:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
     net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    89:89:net.minecraft.world.level.storage.loot.functions.LootItemFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    89:89:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.LootItemFunction -> cti:
-    16:16:java.util.function.Consumer decorate(java.util.function.BiFunction,java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
-    16:16:void lambda$decorate$0(java.util.function.Consumer,java.util.function.BiFunction,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.item.ItemStack) -> a
-net.minecraft.world.level.storage.loot.functions.LootItemFunction$Builder -> cti$a:
+    88:88:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    88:88:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.LootItemFunction -> dch:
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    14:14:java.util.function.Consumer decorate(java.util.function.BiFunction,java.util.function.Consumer,net.minecraft.world.level.storage.loot.LootContext) -> a
+    14:14:void lambda$decorate$0(java.util.function.Consumer,java.util.function.BiFunction,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.item.ItemStack) -> a
+net.minecraft.world.level.storage.loot.functions.LootItemFunction$Builder -> dch$a:
     net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-net.minecraft.world.level.storage.loot.functions.LootItemFunction$Serializer -> cti$b:
-    net.minecraft.resources.ResourceLocation name -> a
-    java.lang.Class clazz -> b
-    27:30:void <init>(net.minecraft.resources.ResourceLocation,java.lang.Class) -> <init>
-    33:33:net.minecraft.resources.ResourceLocation getName() -> a
-    37:37:java.lang.Class getFunctionClass() -> b
-    void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-    net.minecraft.world.level.storage.loot.functions.LootItemFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-net.minecraft.world.level.storage.loot.functions.LootItemFunctions -> ctj:
-    java.util.Map FUNCTIONS_BY_NAME -> b
-    java.util.Map FUNCTIONS_BY_CLASS -> c
+net.minecraft.world.level.storage.loot.functions.LootItemFunctionType -> dci:
+    8:9:void <init>(net.minecraft.world.level.storage.loot.Serializer) -> <init>
+net.minecraft.world.level.storage.loot.functions.LootItemFunctions -> dcj:
     java.util.function.BiFunction IDENTITY -> a
-    21:21:void <init>() -> <init>
-    52:62:void register(net.minecraft.world.level.storage.loot.functions.LootItemFunction$Serializer) -> a
-    65:69:net.minecraft.world.level.storage.loot.functions.LootItemFunction$Serializer getSerializer(net.minecraft.resources.ResourceLocation) -> a
-    74:78:net.minecraft.world.level.storage.loot.functions.LootItemFunction$Serializer getSerializer(net.minecraft.world.level.storage.loot.functions.LootItemFunction) -> a
-    107:118:java.util.function.BiFunction compose(java.util.function.BiFunction[]) -> a
-    119:122:net.minecraft.world.item.ItemStack lambda$compose$2(java.util.function.BiFunction[],net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    115:115:net.minecraft.world.item.ItemStack lambda$compose$1(java.util.function.BiFunction,java.util.function.BiFunction,net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    24:24:net.minecraft.world.item.ItemStack lambda$static$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    22:48:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.LootItemFunctions$Serializer -> ctj$a:
-    81:81:void <init>() -> <init>
-    84:93:net.minecraft.world.level.storage.loot.functions.LootItemFunction deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    98:102:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.functions.LootItemFunction,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
-    81:81:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
-    81:81:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction -> ctk:
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType SET_COUNT -> b
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType ENCHANT_WITH_LEVELS -> c
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType ENCHANT_RANDOMLY -> d
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType SET_NBT -> e
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType FURNACE_SMELT -> f
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType LOOTING_ENCHANT -> g
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType SET_DAMAGE -> h
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType SET_ATTRIBUTES -> i
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType SET_NAME -> j
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType EXPLORATION_MAP -> k
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType SET_STEW_EFFECT -> l
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType COPY_NAME -> m
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType SET_CONTENTS -> n
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType LIMIT_COUNT -> o
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType APPLY_BONUS -> p
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType SET_LOOT_TABLE -> q
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType EXPLOSION_DECAY -> r
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType SET_LORE -> s
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType FILL_PLAYER_HEAD -> t
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType COPY_NBT -> u
+    net.minecraft.world.level.storage.loot.functions.LootItemFunctionType COPY_STATE -> v
+    12:12:void <init>() -> <init>
+    38:38:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType register(java.lang.String,net.minecraft.world.level.storage.loot.Serializer) -> a
+    42:42:java.lang.Object createGsonAdapter() -> a
+    46:57:java.util.function.BiFunction compose(java.util.function.BiFunction[]) -> a
+    58:61:net.minecraft.world.item.ItemStack lambda$compose$2(java.util.function.BiFunction[],net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    54:54:net.minecraft.world.item.ItemStack lambda$compose$1(java.util.function.BiFunction,java.util.function.BiFunction,net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    13:13:net.minecraft.world.item.ItemStack lambda$static$0(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    13:35:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction -> dck:
     net.minecraft.world.level.storage.loot.RandomValueBounds value -> a
-    int limit -> c
-    27:30:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomValueBounds,int) -> <init>
-    34:34:java.util.Set getReferencedContextParams() -> a
-    38:38:boolean hasLimit() -> b
-    43:58:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    86:86:net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$Builder lootingMultiplier(net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
-    21:21:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomValueBounds,int,net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$1) -> <init>
-    21:21:net.minecraft.world.level.storage.loot.RandomValueBounds access$100(net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction) -> a
-    21:21:boolean access$200(net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction) -> b
-    21:21:int access$300(net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction) -> c
-net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$1 -> ctk$1:
-net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$Builder -> ctk$a:
+    int limit -> b
+    26:29:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomValueBounds,int) -> <init>
+    33:33:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    38:38:java.util.Set getReferencedContextParams() -> a
+    42:42:boolean hasLimit() -> c
+    47:62:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    90:90:net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$Builder lootingMultiplier(net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
+    20:20:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomValueBounds,int,net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$1) -> <init>
+    20:20:net.minecraft.world.level.storage.loot.RandomValueBounds access$100(net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction) -> a
+    20:20:boolean access$200(net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction) -> b
+    20:20:int access$300(net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction) -> c
+net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$1 -> dck$1:
+net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$Builder -> dck$a:
     net.minecraft.world.level.storage.loot.RandomValueBounds count -> a
     int limit -> b
-    63:67:void <init>(net.minecraft.world.level.storage.loot.RandomValueBounds) -> <init>
-    71:71:net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$Builder getThis() -> a
-    75:76:net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$Builder setLimit(int) -> a
-    81:81:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    61:61:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$Serializer -> ctk$b:
-    91:92:void <init>() -> <init>
+    67:71:void <init>(net.minecraft.world.level.storage.loot.RandomValueBounds) -> <init>
+    75:75:net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$Builder getThis() -> a
+    79:80:net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$Builder setLimit(int) -> a
+    85:85:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    65:65:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction$Serializer -> dck$b:
+    93:93:void <init>() -> <init>
     96:102:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction,com.google.gson.JsonSerializationContext) -> a
     106:107:net.minecraft.world.level.storage.loot.functions.LootingEnchantFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    89:89:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    89:89:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    89:89:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.SetAttributesFunction -> ctl:
+    93:93:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    93:93:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    93:93:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.SetAttributesFunction -> dcl:
     java.util.List modifiers -> a
-    32:34:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.List) -> <init>
-    38:47:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    102:102:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$ModifierBuilder modifier(java.lang.String,java.lang.String,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation,net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
-    106:106:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Builder setAttributes() -> b
-    28:28:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.List,net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$1) -> <init>
-    28:28:java.util.List access$800(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction) -> a
-net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$1 -> ctl$1:
+    35:37:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.List) -> <init>
+    41:41:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    46:55:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    110:110:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$ModifierBuilder modifier(java.lang.String,net.minecraft.world.entity.ai.attributes.Attribute,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation,net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
+    114:114:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Builder setAttributes() -> c
+    31:31:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.List,net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$1) -> <init>
+    31:31:java.util.List access$800(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction) -> a
+net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$1 -> dcl$1:
     int[] $SwitchMap$net$minecraft$world$entity$ai$attributes$AttributeModifier$Operation -> a
-    217:217:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Builder -> ctl$a:
+    225:225:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Builder -> dcl$a:
     java.util.List modifiers -> a
-    82:83:void <init>() -> <init>
-    87:87:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Builder getThis() -> a
-    91:92:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Builder withModifier(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$ModifierBuilder) -> a
-    97:97:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    82:82:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier -> ctl$b:
+    90:91:void <init>() -> <init>
+    95:95:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Builder getThis() -> a
+    99:100:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Builder withModifier(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$ModifierBuilder) -> a
+    105:105:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    90:90:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier -> dcl$b:
     java.lang.String name -> a
-    java.lang.String attribute -> b
+    net.minecraft.world.entity.ai.attributes.Attribute attribute -> b
     net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation operation -> c
     net.minecraft.world.level.storage.loot.RandomValueBounds amount -> d
     java.util.UUID id -> e
     net.minecraft.world.entity.EquipmentSlot[] slots -> f
-    150:157:void <init>(java.lang.String,java.lang.String,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation,net.minecraft.world.level.storage.loot.RandomValueBounds,net.minecraft.world.entity.EquipmentSlot[],java.util.UUID) -> <init>
-    160:177:com.google.gson.JsonObject serialize(com.google.gson.JsonSerializationContext) -> a
-    181:213:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    217:225:java.lang.String operationToString(net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> a
-    229:237:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation operationFromString(java.lang.String) -> a
-    141:141:java.util.UUID access$000(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> a
-    141:141:net.minecraft.world.entity.EquipmentSlot[] access$100(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> b
-    141:141:java.lang.String access$200(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> c
-    141:141:java.lang.String access$300(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> d
-    141:141:net.minecraft.world.level.storage.loot.RandomValueBounds access$400(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> e
-    141:141:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation access$500(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> f
-    141:141:void <init>(java.lang.String,java.lang.String,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation,net.minecraft.world.level.storage.loot.RandomValueBounds,net.minecraft.world.entity.EquipmentSlot[],java.util.UUID,net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$1) -> <init>
-net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$ModifierBuilder -> ctl$c:
+    154:161:void <init>(java.lang.String,net.minecraft.world.entity.ai.attributes.Attribute,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation,net.minecraft.world.level.storage.loot.RandomValueBounds,net.minecraft.world.entity.EquipmentSlot[],java.util.UUID) -> <init>
+    164:181:com.google.gson.JsonObject serialize(com.google.gson.JsonSerializationContext) -> a
+    185:221:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    225:233:java.lang.String operationToString(net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation) -> a
+    237:245:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation operationFromString(java.lang.String) -> a
+    145:145:java.util.UUID access$000(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> a
+    145:145:net.minecraft.world.entity.EquipmentSlot[] access$100(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> b
+    145:145:net.minecraft.world.entity.ai.attributes.Attribute access$200(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> c
+    145:145:java.lang.String access$300(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> d
+    145:145:net.minecraft.world.level.storage.loot.RandomValueBounds access$400(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> e
+    145:145:net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation access$500(net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier) -> f
+    145:145:void <init>(java.lang.String,net.minecraft.world.entity.ai.attributes.Attribute,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation,net.minecraft.world.level.storage.loot.RandomValueBounds,net.minecraft.world.entity.EquipmentSlot[],java.util.UUID,net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$1) -> <init>
+net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$ModifierBuilder -> dcl$c:
     java.lang.String name -> a
-    java.lang.String attribute -> b
+    net.minecraft.world.entity.ai.attributes.Attribute attribute -> b
     net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation operation -> c
     net.minecraft.world.level.storage.loot.RandomValueBounds amount -> d
     java.util.UUID id -> e
     java.util.Set slots -> f
-    58:65:void <init>(java.lang.String,java.lang.String,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation,net.minecraft.world.level.storage.loot.RandomValueBounds) -> <init>
-    68:69:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$ModifierBuilder forSlot(net.minecraft.world.entity.EquipmentSlot) -> a
-    73:74:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$ModifierBuilder withUuid(java.util.UUID) -> a
-    78:78:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier build() -> a
-net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Serializer -> ctl$d:
-    111:112:void <init>() -> <init>
-    116:123:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetAttributesFunction,com.google.gson.JsonSerializationContext) -> a
-    127:137:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    109:109:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    109:109:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    109:109:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.SetContainerContents -> ctm:
+    66:73:void <init>(java.lang.String,net.minecraft.world.entity.ai.attributes.Attribute,net.minecraft.world.entity.ai.attributes.AttributeModifier$Operation,net.minecraft.world.level.storage.loot.RandomValueBounds) -> <init>
+    76:77:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$ModifierBuilder forSlot(net.minecraft.world.entity.EquipmentSlot) -> a
+    81:82:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$ModifierBuilder withUuid(java.util.UUID) -> a
+    86:86:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Modifier build() -> a
+net.minecraft.world.level.storage.loot.functions.SetAttributesFunction$Serializer -> dcl$d:
+    117:117:void <init>() -> <init>
+    120:127:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetAttributesFunction,com.google.gson.JsonSerializationContext) -> a
+    131:141:net.minecraft.world.level.storage.loot.functions.SetAttributesFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    117:117:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    117:117:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    117:117:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.SetContainerContents -> dcm:
     java.util.List entries -> a
-    28:30:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.List) -> <init>
-    34:45:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    50:55:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
-    77:77:net.minecraft.world.level.storage.loot.functions.SetContainerContents$Builder setContents() -> b
-    39:39:void lambda$run$1(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.core.NonNullList,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer) -> a
-    39:39:void lambda$null$0(net.minecraft.core.NonNullList,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.level.storage.loot.entries.LootPoolEntry) -> a
-    24:24:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.List,net.minecraft.world.level.storage.loot.functions.SetContainerContents$1) -> <init>
-    24:24:java.util.List access$100(net.minecraft.world.level.storage.loot.functions.SetContainerContents) -> a
-net.minecraft.world.level.storage.loot.functions.SetContainerContents$1 -> ctm$1:
-net.minecraft.world.level.storage.loot.functions.SetContainerContents$Builder -> ctm$a:
+    27:29:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.List) -> <init>
+    33:33:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    38:49:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    54:59:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    81:81:net.minecraft.world.level.storage.loot.functions.SetContainerContents$Builder setContents() -> c
+    43:43:void lambda$run$1(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.core.NonNullList,net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer) -> a
+    43:43:void lambda$null$0(net.minecraft.core.NonNullList,net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.level.storage.loot.entries.LootPoolEntry) -> a
+    23:23:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.List,net.minecraft.world.level.storage.loot.functions.SetContainerContents$1) -> <init>
+    23:23:java.util.List access$100(net.minecraft.world.level.storage.loot.functions.SetContainerContents) -> a
+net.minecraft.world.level.storage.loot.functions.SetContainerContents$1 -> dcm$1:
+net.minecraft.world.level.storage.loot.functions.SetContainerContents$Builder -> dcm$a:
     java.util.List entries -> a
-    57:58:void <init>() -> <init>
-    62:62:net.minecraft.world.level.storage.loot.functions.SetContainerContents$Builder getThis() -> a
-    66:67:net.minecraft.world.level.storage.loot.functions.SetContainerContents$Builder withEntry(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> a
-    72:72:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    57:57:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.functions.SetContainerContents$Serializer -> ctm$b:
-    82:83:void <init>() -> <init>
+    61:62:void <init>() -> <init>
+    66:66:net.minecraft.world.level.storage.loot.functions.SetContainerContents$Builder getThis() -> a
+    70:71:net.minecraft.world.level.storage.loot.functions.SetContainerContents$Builder withEntry(net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer$Builder) -> a
+    76:76:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    61:61:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.functions.SetContainerContents$Serializer -> dcm$b:
+    84:84:void <init>() -> <init>
     87:90:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetContainerContents,com.google.gson.JsonSerializationContext) -> a
     94:95:net.minecraft.world.level.storage.loot.functions.SetContainerContents deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    80:80:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    80:80:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    80:80:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.SetContainerLootTable -> ctn:
+    84:84:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    84:84:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    84:84:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.SetContainerLootTable -> dcn:
     net.minecraft.resources.ResourceLocation name -> a
-    long seed -> c
+    long seed -> b
     22:25:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.resources.ResourceLocation,long) -> <init>
-    29:39:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    44:57:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
-    60:60:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder withLootTable(net.minecraft.resources.ResourceLocation) -> a
-    64:64:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder withLootTable(net.minecraft.resources.ResourceLocation,long) -> a
-    64:64:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$withLootTable$1(net.minecraft.resources.ResourceLocation,long,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    60:60:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$withLootTable$0(net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    29:29:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    34:44:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    49:62:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    65:65:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder withLootTable(net.minecraft.resources.ResourceLocation) -> a
+    69:69:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder withLootTable(net.minecraft.resources.ResourceLocation,long) -> a
+    69:69:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$withLootTable$1(net.minecraft.resources.ResourceLocation,long,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    65:65:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$withLootTable$0(net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
     17:17:net.minecraft.resources.ResourceLocation access$000(net.minecraft.world.level.storage.loot.functions.SetContainerLootTable) -> a
     17:17:long access$100(net.minecraft.world.level.storage.loot.functions.SetContainerLootTable) -> b
     17:17:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.resources.ResourceLocation,long,net.minecraft.world.level.storage.loot.functions.SetContainerLootTable$1) -> <init>
-net.minecraft.world.level.storage.loot.functions.SetContainerLootTable$1 -> ctn$1:
-net.minecraft.world.level.storage.loot.functions.SetContainerLootTable$Serializer -> ctn$a:
-    69:70:void <init>() -> <init>
-    74:80:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetContainerLootTable,com.google.gson.JsonSerializationContext) -> a
-    84:86:net.minecraft.world.level.storage.loot.functions.SetContainerLootTable deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    67:67:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    67:67:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    67:67:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.SetItemCountFunction -> cto:
+net.minecraft.world.level.storage.loot.functions.SetContainerLootTable$1 -> dcn$1:
+net.minecraft.world.level.storage.loot.functions.SetContainerLootTable$Serializer -> dcn$a:
+    72:72:void <init>() -> <init>
+    75:81:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetContainerLootTable,com.google.gson.JsonSerializationContext) -> a
+    85:87:net.minecraft.world.level.storage.loot.functions.SetContainerLootTable deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    72:72:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    72:72:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    72:72:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.SetItemCountFunction -> dco:
     net.minecraft.world.level.storage.loot.RandomIntGenerator value -> a
-    17:19:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomIntGenerator) -> <init>
-    23:24:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    28:28:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder setCount(net.minecraft.world.level.storage.loot.RandomIntGenerator) -> a
-    28:28:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$setCount$0(net.minecraft.world.level.storage.loot.RandomIntGenerator,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    13:13:net.minecraft.world.level.storage.loot.RandomIntGenerator access$000(net.minecraft.world.level.storage.loot.functions.SetItemCountFunction) -> a
-    13:13:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomIntGenerator,net.minecraft.world.level.storage.loot.functions.SetItemCountFunction$1) -> <init>
-net.minecraft.world.level.storage.loot.functions.SetItemCountFunction$1 -> cto$1:
-net.minecraft.world.level.storage.loot.functions.SetItemCountFunction$Serializer -> cto$a:
-    33:34:void <init>() -> <init>
+    16:18:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomIntGenerator) -> <init>
+    22:22:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    27:28:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    32:32:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder setCount(net.minecraft.world.level.storage.loot.RandomIntGenerator) -> a
+    32:32:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$setCount$0(net.minecraft.world.level.storage.loot.RandomIntGenerator,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    12:12:net.minecraft.world.level.storage.loot.RandomIntGenerator access$000(net.minecraft.world.level.storage.loot.functions.SetItemCountFunction) -> a
+    12:12:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomIntGenerator,net.minecraft.world.level.storage.loot.functions.SetItemCountFunction$1) -> <init>
+net.minecraft.world.level.storage.loot.functions.SetItemCountFunction$1 -> dco$1:
+net.minecraft.world.level.storage.loot.functions.SetItemCountFunction$Serializer -> dco$a:
+    35:35:void <init>() -> <init>
     38:41:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetItemCountFunction,com.google.gson.JsonSerializationContext) -> a
     45:46:net.minecraft.world.level.storage.loot.functions.SetItemCountFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    31:31:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    31:31:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    31:31:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction -> ctp:
+    35:35:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    35:35:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    35:35:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction -> dcp:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.world.level.storage.loot.RandomValueBounds damage -> c
-    22:24:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomValueBounds) -> <init>
-    28:34:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    38:38:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder setDamage(net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
-    38:38:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$setDamage$0(net.minecraft.world.level.storage.loot.RandomValueBounds,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    16:16:net.minecraft.world.level.storage.loot.RandomValueBounds access$000(net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction) -> a
-    16:16:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomValueBounds,net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction$1) -> <init>
-    17:17:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction$1 -> ctp$1:
-net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction$Serializer -> ctp$a:
-    43:44:void <init>() -> <init>
+    net.minecraft.world.level.storage.loot.RandomValueBounds damage -> b
+    21:23:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomValueBounds) -> <init>
+    27:27:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    32:38:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    42:42:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder setDamage(net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
+    42:42:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$setDamage$0(net.minecraft.world.level.storage.loot.RandomValueBounds,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    15:15:net.minecraft.world.level.storage.loot.RandomValueBounds access$000(net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction) -> a
+    15:15:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.RandomValueBounds,net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction$1) -> <init>
+    16:16:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction$1 -> dcp$1:
+net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction$Serializer -> dcp$a:
+    45:45:void <init>() -> <init>
     48:51:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction,com.google.gson.JsonSerializationContext) -> a
     55:55:net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    41:41:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    41:41:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    41:41:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.SetLoreFunction -> ctq:
+    45:45:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    45:45:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    45:45:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.SetLoreFunction -> dcq:
     boolean replace -> a
-    java.util.List lore -> c
+    java.util.List lore -> b
     net.minecraft.world.level.storage.loot.LootContext$EntityTarget resolutionContext -> d
-    37:41:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],boolean,java.util.List,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
-    45:45:java.util.Set getReferencedContextParams() -> a
-    50:61:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    67:94:net.minecraft.nbt.ListTag getLoreTag(net.minecraft.world.item.ItemStack,boolean) -> a
-    130:130:net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder setLore() -> b
-    28:28:boolean access$000(net.minecraft.world.level.storage.loot.functions.SetLoreFunction) -> a
-    28:28:java.util.List access$100(net.minecraft.world.level.storage.loot.functions.SetLoreFunction) -> b
-    28:28:net.minecraft.world.level.storage.loot.LootContext$EntityTarget access$200(net.minecraft.world.level.storage.loot.functions.SetLoreFunction) -> c
-net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder -> ctq$a:
+    36:40:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],boolean,java.util.List,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
+    44:44:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    49:49:java.util.Set getReferencedContextParams() -> a
+    54:65:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    71:98:net.minecraft.nbt.ListTag getLoreTag(net.minecraft.world.item.ItemStack,boolean) -> a
+    134:134:net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder setLore() -> c
+    27:27:boolean access$000(net.minecraft.world.level.storage.loot.functions.SetLoreFunction) -> a
+    27:27:java.util.List access$100(net.minecraft.world.level.storage.loot.functions.SetLoreFunction) -> b
+    27:27:net.minecraft.world.level.storage.loot.LootContext$EntityTarget access$200(net.minecraft.world.level.storage.loot.functions.SetLoreFunction) -> c
+net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder -> dcq$a:
     boolean replace -> a
     net.minecraft.world.level.storage.loot.LootContext$EntityTarget resolutionContext -> b
     java.util.List lore -> c
-    98:101:void <init>() -> <init>
-    104:105:net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder setReplace(boolean) -> a
-    109:110:net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder setResolutionContext(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
-    114:115:net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder addLine(net.minecraft.network.chat.Component) -> a
-    120:120:net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder getThis() -> a
-    125:125:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    98:98:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Serializer -> ctq$b:
-    135:136:void <init>() -> <init>
+    102:105:void <init>() -> <init>
+    108:109:net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder setReplace(boolean) -> a
+    113:114:net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder setResolutionContext(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
+    118:119:net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder addLine(net.minecraft.network.chat.Component) -> a
+    124:124:net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Builder getThis() -> a
+    129:129:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    102:102:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.functions.SetLoreFunction$Serializer -> dcq$b:
+    137:137:void <init>() -> <init>
     140:153:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetLoreFunction,com.google.gson.JsonSerializationContext) -> a
     157:160:net.minecraft.world.level.storage.loot.functions.SetLoreFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    133:133:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    133:133:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    133:133:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.SetNameFunction -> ctr:
+    137:137:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    137:137:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    137:137:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.SetNameFunction -> dcr:
     org.apache.logging.log4j.Logger LOGGER -> a
-    net.minecraft.network.chat.Component name -> c
+    net.minecraft.network.chat.Component name -> b
     net.minecraft.world.level.storage.loot.LootContext$EntityTarget resolutionContext -> d
-    35:38:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.network.chat.Component,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
-    42:42:java.util.Set getReferencedContextParams() -> a
-    46:62:java.util.function.UnaryOperator createResolver(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
-    67:70:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    74:74:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder setName(net.minecraft.network.chat.Component) -> a
-    78:78:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder setName(net.minecraft.network.chat.Component,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
-    78:78:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$setName$3(net.minecraft.network.chat.Component,net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    74:74:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$setName$2(net.minecraft.network.chat.Component,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    62:62:net.minecraft.network.chat.Component lambda$createResolver$1(net.minecraft.network.chat.Component) -> b
-    54:57:net.minecraft.network.chat.Component lambda$createResolver$0(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,net.minecraft.network.chat.Component) -> a
-    26:26:net.minecraft.network.chat.Component access$000(net.minecraft.world.level.storage.loot.functions.SetNameFunction) -> a
-    26:26:net.minecraft.world.level.storage.loot.LootContext$EntityTarget access$100(net.minecraft.world.level.storage.loot.functions.SetNameFunction) -> b
-    26:26:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.network.chat.Component,net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.world.level.storage.loot.functions.SetNameFunction$1) -> <init>
-    27:27:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.SetNameFunction$1 -> ctr$1:
-net.minecraft.world.level.storage.loot.functions.SetNameFunction$Serializer -> ctr$a:
-    83:84:void <init>() -> <init>
+    34:37:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.network.chat.Component,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
+    41:41:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    46:46:java.util.Set getReferencedContextParams() -> a
+    50:66:java.util.function.UnaryOperator createResolver(net.minecraft.world.level.storage.loot.LootContext,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
+    71:74:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    78:78:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder setName(net.minecraft.network.chat.Component) -> a
+    82:82:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder setName(net.minecraft.network.chat.Component,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
+    82:82:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$setName$3(net.minecraft.network.chat.Component,net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    78:78:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$setName$2(net.minecraft.network.chat.Component,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    66:66:net.minecraft.network.chat.Component lambda$createResolver$1(net.minecraft.network.chat.Component) -> b
+    58:61:net.minecraft.network.chat.Component lambda$createResolver$0(net.minecraft.commands.CommandSourceStack,net.minecraft.world.entity.Entity,net.minecraft.network.chat.Component) -> a
+    25:25:net.minecraft.network.chat.Component access$000(net.minecraft.world.level.storage.loot.functions.SetNameFunction) -> a
+    25:25:net.minecraft.world.level.storage.loot.LootContext$EntityTarget access$100(net.minecraft.world.level.storage.loot.functions.SetNameFunction) -> b
+    25:25:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.network.chat.Component,net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.world.level.storage.loot.functions.SetNameFunction$1) -> <init>
+    26:26:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.SetNameFunction$1 -> dcr$1:
+net.minecraft.world.level.storage.loot.functions.SetNameFunction$Serializer -> dcr$a:
+    85:85:void <init>() -> <init>
     88:97:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetNameFunction,com.google.gson.JsonSerializationContext) -> a
     101:103:net.minecraft.world.level.storage.loot.functions.SetNameFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    81:81:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    81:81:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    81:81:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.SetNbtFunction -> cts:
+    85:85:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    85:85:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    85:85:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.SetNbtFunction -> dcs:
     net.minecraft.nbt.CompoundTag tag -> a
-    20:22:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.nbt.CompoundTag) -> <init>
-    26:27:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    31:31:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder setTag(net.minecraft.nbt.CompoundTag) -> a
-    31:31:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$setTag$0(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    16:16:net.minecraft.nbt.CompoundTag access$000(net.minecraft.world.level.storage.loot.functions.SetNbtFunction) -> a
-    16:16:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.nbt.CompoundTag,net.minecraft.world.level.storage.loot.functions.SetNbtFunction$1) -> <init>
-net.minecraft.world.level.storage.loot.functions.SetNbtFunction$1 -> cts$1:
-net.minecraft.world.level.storage.loot.functions.SetNbtFunction$Serializer -> cts$a:
-    36:37:void <init>() -> <init>
+    19:21:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.nbt.CompoundTag) -> <init>
+    25:25:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    30:31:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    35:35:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder setTag(net.minecraft.nbt.CompoundTag) -> a
+    35:35:net.minecraft.world.level.storage.loot.functions.LootItemFunction lambda$setTag$0(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    15:15:net.minecraft.nbt.CompoundTag access$000(net.minecraft.world.level.storage.loot.functions.SetNbtFunction) -> a
+    15:15:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.nbt.CompoundTag,net.minecraft.world.level.storage.loot.functions.SetNbtFunction$1) -> <init>
+net.minecraft.world.level.storage.loot.functions.SetNbtFunction$1 -> dcs$1:
+net.minecraft.world.level.storage.loot.functions.SetNbtFunction$Serializer -> dcs$a:
+    38:38:void <init>() -> <init>
     41:44:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetNbtFunction,com.google.gson.JsonSerializationContext) -> a
     49:52:net.minecraft.world.level.storage.loot.functions.SetNbtFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    34:34:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    34:34:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    34:34:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction -> ctt:
+    38:38:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    38:38:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    38:38:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction -> dct:
     java.util.Map effectDurationMap -> a
     32:34:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.Map) -> <init>
-    38:53:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    76:76:net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$Builder stewEffect() -> b
+    38:38:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    43:58:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    81:81:net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$Builder stewEffect() -> c
     28:28:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],java.util.Map,net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$1) -> <init>
     28:28:java.util.Map access$100(net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction) -> a
-net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$1 -> ctt$1:
-net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$Builder -> ctt$a:
+net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$1 -> dct$1:
+net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$Builder -> dct$a:
     java.util.Map effectDurationMap -> a
-    56:57:void <init>() -> <init>
-    61:61:net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$Builder getThis() -> a
-    65:66:net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$Builder withEffect(net.minecraft.world.effect.MobEffect,net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
-    71:71:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
-    56:56:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
-net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$Serializer -> ctt$b:
-    81:82:void <init>() -> <init>
-    86:102:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction,com.google.gson.JsonSerializationContext) -> a
-    106:118:net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    79:79:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-    79:79:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
-    79:79:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemFunction,com.google.gson.JsonSerializationContext) -> a
-    112:112:com.google.gson.JsonSyntaxException lambda$deserialize$0(java.lang.String) -> a
-net.minecraft.world.level.storage.loot.functions.SmeltItemFunction -> ctu:
+    61:62:void <init>() -> <init>
+    66:66:net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$Builder getThis() -> a
+    70:71:net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$Builder withEffect(net.minecraft.world.effect.MobEffect,net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
+    76:76:net.minecraft.world.level.storage.loot.functions.LootItemFunction build() -> b
+    61:61:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder getThis() -> d
+net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction$Serializer -> dct$b:
+    84:84:void <init>() -> <init>
+    87:103:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction,com.google.gson.JsonSerializationContext) -> a
+    107:119:net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
+    84:84:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+    84:84:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction,com.google.gson.JsonSerializationContext) -> a
+    84:84:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+    113:113:com.google.gson.JsonSyntaxException lambda$deserialize$0(java.lang.String) -> a
+net.minecraft.world.level.storage.loot.functions.SmeltItemFunction -> dcu:
     org.apache.logging.log4j.Logger LOGGER -> a
-    21:22:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
-    26:42:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
-    46:46:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder smelted() -> b
-    17:17:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.SmeltItemFunction$1) -> <init>
-    18:18:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.functions.SmeltItemFunction$1 -> ctu$1:
-net.minecraft.world.level.storage.loot.functions.SmeltItemFunction$Serializer -> ctu$a:
-    51:52:void <init>() -> <init>
+    20:21:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
+    25:25:net.minecraft.world.level.storage.loot.functions.LootItemFunctionType getType() -> b
+    30:46:net.minecraft.world.item.ItemStack run(net.minecraft.world.item.ItemStack,net.minecraft.world.level.storage.loot.LootContext) -> a
+    50:50:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder smelted() -> c
+    16:16:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.functions.SmeltItemFunction$1) -> <init>
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.functions.SmeltItemFunction$1 -> dcu$1:
+net.minecraft.world.level.storage.loot.functions.SmeltItemFunction$Serializer -> dcu$a:
+    53:53:void <init>() -> <init>
     56:56:net.minecraft.world.level.storage.loot.functions.SmeltItemFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> a
-    49:49:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
-net.minecraft.world.level.storage.loot.functions.package-info -> ctv:
-net.minecraft.world.level.storage.loot.package-info -> ctw:
-net.minecraft.world.level.storage.loot.parameters.LootContextParam -> ctx:
+    53:53:net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext,net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> b
+net.minecraft.world.level.storage.loot.functions.package-info -> dcv:
+net.minecraft.world.level.storage.loot.package-info -> dcw:
+net.minecraft.world.level.storage.loot.parameters.LootContextParam -> dcx:
     net.minecraft.resources.ResourceLocation name -> a
     8:10:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     13:13:net.minecraft.resources.ResourceLocation getName() -> a
     18:18:java.lang.String toString() -> toString
-net.minecraft.world.level.storage.loot.parameters.LootContextParamSet -> cty:
+net.minecraft.world.level.storage.loot.parameters.LootContextParamSet -> dcy:
     java.util.Set required -> a
     java.util.Set all -> b
     16:19:void <init>(java.util.Set,java.util.Set) -> <init>
@@ -65562,16 +72030,16 @@ net.minecraft.world.level.storage.loot.parameters.LootContextParamSet -> cty:
     47:47:net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder builder() -> c
     35:35:java.lang.String lambda$toString$0(net.minecraft.world.level.storage.loot.parameters.LootContextParam) -> b
     11:11:void <init>(java.util.Set,java.util.Set,net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$1) -> <init>
-net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$1 -> cty$1:
-net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder -> cty$a:
+net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$1 -> dcy$1:
+net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder -> dcy$a:
     java.util.Set required -> a
     java.util.Set optional -> b
     50:52:void <init>() -> <init>
     55:59:net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder required(net.minecraft.world.level.storage.loot.parameters.LootContextParam) -> a
     63:67:net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder optional(net.minecraft.world.level.storage.loot.parameters.LootContextParam) -> b
     71:71:net.minecraft.world.level.storage.loot.parameters.LootContextParamSet build() -> a
-net.minecraft.world.level.storage.loot.parameters.LootContextParamSets -> ctz:
-    com.google.common.collect.BiMap REGISTRY -> k
+net.minecraft.world.level.storage.loot.parameters.LootContextParamSets -> dcz:
+    com.google.common.collect.BiMap REGISTRY -> m
     net.minecraft.world.level.storage.loot.parameters.LootContextParamSet EMPTY -> a
     net.minecraft.world.level.storage.loot.parameters.LootContextParamSet CHEST -> b
     net.minecraft.world.level.storage.loot.parameters.LootContextParamSet COMMAND -> c
@@ -65579,421 +72047,449 @@ net.minecraft.world.level.storage.loot.parameters.LootContextParamSets -> ctz:
     net.minecraft.world.level.storage.loot.parameters.LootContextParamSet FISHING -> e
     net.minecraft.world.level.storage.loot.parameters.LootContextParamSet ENTITY -> f
     net.minecraft.world.level.storage.loot.parameters.LootContextParamSet GIFT -> g
-    net.minecraft.world.level.storage.loot.parameters.LootContextParamSet ADVANCEMENT_REWARD -> h
-    net.minecraft.world.level.storage.loot.parameters.LootContextParamSet ALL_PARAMS -> i
-    net.minecraft.world.level.storage.loot.parameters.LootContextParamSet BLOCK -> j
+    net.minecraft.world.level.storage.loot.parameters.LootContextParamSet PIGLIN_BARTER -> h
+    net.minecraft.world.level.storage.loot.parameters.LootContextParamSet ADVANCEMENT_REWARD -> i
+    net.minecraft.world.level.storage.loot.parameters.LootContextParamSet ADVANCEMENT_ENTITY -> j
+    net.minecraft.world.level.storage.loot.parameters.LootContextParamSet ALL_PARAMS -> k
+    net.minecraft.world.level.storage.loot.parameters.LootContextParamSet BLOCK -> l
     10:10:void <init>() -> <init>
-    77:85:net.minecraft.world.level.storage.loot.parameters.LootContextParamSet register(java.lang.String,java.util.function.Consumer) -> a
-    90:90:net.minecraft.world.level.storage.loot.parameters.LootContextParamSet get(net.minecraft.resources.ResourceLocation) -> a
-    95:95:net.minecraft.resources.ResourceLocation getKey(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet) -> a
-    67:73:void lambda$static$9(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> a
-    54:64:void lambda$static$8(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> b
-    49:51:void lambda$static$7(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> c
-    44:46:void lambda$static$6(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> d
-    35:41:void lambda$static$5(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> e
-    30:32:void lambda$static$4(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> f
-    25:27:void lambda$static$3(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> g
-    20:22:void lambda$static$2(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> h
-    15:17:void lambda$static$1(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> i
-    13:13:void lambda$static$0(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> j
-    11:67:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.parameters.LootContextParams -> cua:
+    88:96:net.minecraft.world.level.storage.loot.parameters.LootContextParamSet register(java.lang.String,java.util.function.Consumer) -> a
+    101:101:net.minecraft.world.level.storage.loot.parameters.LootContextParamSet get(net.minecraft.resources.ResourceLocation) -> a
+    106:106:net.minecraft.resources.ResourceLocation getKey(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet) -> a
+    78:84:void lambda$static$11(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> a
+    65:75:void lambda$static$10(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> b
+    59:62:void lambda$static$9(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> c
+    54:56:void lambda$static$8(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> d
+    50:51:void lambda$static$7(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> e
+    45:47:void lambda$static$6(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> f
+    36:42:void lambda$static$5(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> g
+    30:33:void lambda$static$4(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> h
+    25:27:void lambda$static$3(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> i
+    20:22:void lambda$static$2(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> j
+    15:17:void lambda$static$1(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> k
+    13:13:void lambda$static$0(net.minecraft.world.level.storage.loot.parameters.LootContextParamSet$Builder) -> l
+    11:78:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.parameters.LootContextParams -> dda:
     net.minecraft.world.level.storage.loot.parameters.LootContextParam THIS_ENTITY -> a
     net.minecraft.world.level.storage.loot.parameters.LootContextParam LAST_DAMAGE_PLAYER -> b
     net.minecraft.world.level.storage.loot.parameters.LootContextParam DAMAGE_SOURCE -> c
     net.minecraft.world.level.storage.loot.parameters.LootContextParam KILLER_ENTITY -> d
     net.minecraft.world.level.storage.loot.parameters.LootContextParam DIRECT_KILLER_ENTITY -> e
     net.minecraft.world.level.storage.loot.parameters.LootContextParam BLOCK_POS -> f
-    net.minecraft.world.level.storage.loot.parameters.LootContextParam BLOCK_STATE -> g
-    net.minecraft.world.level.storage.loot.parameters.LootContextParam BLOCK_ENTITY -> h
-    net.minecraft.world.level.storage.loot.parameters.LootContextParam TOOL -> i
-    net.minecraft.world.level.storage.loot.parameters.LootContextParam EXPLOSION_RADIUS -> j
-    12:12:void <init>() -> <init>
-    34:34:net.minecraft.world.level.storage.loot.parameters.LootContextParam create(java.lang.String) -> a
-    13:31:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.parameters.package-info -> cub:
-net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition -> cuc:
+    net.minecraft.world.level.storage.loot.parameters.LootContextParam ORIGIN -> g
+    net.minecraft.world.level.storage.loot.parameters.LootContextParam BLOCK_STATE -> h
+    net.minecraft.world.level.storage.loot.parameters.LootContextParam BLOCK_ENTITY -> i
+    net.minecraft.world.level.storage.loot.parameters.LootContextParam TOOL -> j
+    net.minecraft.world.level.storage.loot.parameters.LootContextParam EXPLOSION_RADIUS -> k
+    13:13:void <init>() -> <init>
+    37:37:net.minecraft.world.level.storage.loot.parameters.LootContextParam create(java.lang.String) -> a
+    14:34:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.parameters.package-info -> ddb:
+net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition -> ddc:
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] terms -> a
     java.util.function.Predicate composedPredicate -> b
-    20:23:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
-    27:27:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    32:37:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
-    61:61:net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$Builder alternative(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder[]) -> a
-    15:15:boolean test(java.lang.Object) -> test
-    15:15:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$1) -> <init>
-    15:15:net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] access$100(net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition) -> a
-net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$1 -> cuc$1:
-net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$Builder -> cuc$a:
+    19:22:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[]) -> <init>
+    26:26:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    31:31:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    36:41:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    65:65:net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$Builder alternative(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder[]) -> a
+    14:14:boolean test(java.lang.Object) -> test
+    14:14:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition[],net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$1) -> <init>
+    14:14:net.minecraft.world.level.storage.loot.predicates.LootItemCondition[] access$100(net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition) -> a
+net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$1 -> ddc$1:
+net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$Builder -> ddc$a:
     java.util.List terms -> a
-    40:46:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder[]) -> <init>
-    50:51:net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$Builder or(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
-    56:56:net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
-net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$Serializer -> cuc$b:
-    66:67:void <init>() -> <init>
+    44:50:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder[]) -> <init>
+    54:55:net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$Builder or(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
+    60:60:net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
+net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$Serializer -> ddc$b:
+    68:68:void <init>() -> <init>
     71:72:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition,com.google.gson.JsonSerializationContext) -> a
-    76:77:net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    64:64:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    64:64:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition -> cud:
+    76:77:net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    68:68:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    68:68:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition -> ddd:
     net.minecraft.world.item.enchantment.Enchantment enchantment -> a
     float[] values -> b
     25:28:void <init>(net.minecraft.world.item.enchantment.Enchantment,float[]) -> <init>
-    32:32:java.util.Set getReferencedContextParams() -> a
-    37:41:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    45:45:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder bonusLevelFlatChance(net.minecraft.world.item.enchantment.Enchantment,float[]) -> a
+    32:32:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    37:37:java.util.Set getReferencedContextParams() -> a
+    42:46:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    50:50:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder bonusLevelFlatChance(net.minecraft.world.item.enchantment.Enchantment,float[]) -> a
     20:20:boolean test(java.lang.Object) -> test
-    45:45:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$bonusLevelFlatChance$0(net.minecraft.world.item.enchantment.Enchantment,float[]) -> b
+    50:50:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$bonusLevelFlatChance$0(net.minecraft.world.item.enchantment.Enchantment,float[]) -> b
     20:20:net.minecraft.world.item.enchantment.Enchantment access$000(net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition) -> a
     20:20:float[] access$100(net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition) -> b
     20:20:void <init>(net.minecraft.world.item.enchantment.Enchantment,float[],net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition$1) -> <init>
-net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition$1 -> cud$1:
-net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition$Serializer -> cud$a:
-    50:51:void <init>() -> <init>
-    55:57:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition,com.google.gson.JsonSerializationContext) -> a
-    61:65:net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    48:48:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    48:48:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-    63:63:com.google.gson.JsonParseException lambda$deserialize$0(net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.world.level.storage.loot.predicates.ConditionReference -> cue:
+net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition$1 -> ddd$1:
+net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition$Serializer -> ddd$a:
+    53:53:void <init>() -> <init>
+    56:58:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition,com.google.gson.JsonSerializationContext) -> a
+    62:66:net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    53:53:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    53:53:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+    64:64:com.google.gson.JsonParseException lambda$deserialize$0(net.minecraft.resources.ResourceLocation) -> a
+net.minecraft.world.level.storage.loot.predicates.ConditionReference -> dde:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.resources.ResourceLocation name -> b
     18:20:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
-    24:37:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
-    41:50:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    55:55:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder conditionReference(net.minecraft.resources.ResourceLocation) -> a
+    24:24:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    29:42:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    46:55:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    60:60:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder conditionReference(net.minecraft.resources.ResourceLocation) -> a
     13:13:boolean test(java.lang.Object) -> test
-    55:55:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$conditionReference$0(net.minecraft.resources.ResourceLocation) -> b
+    60:60:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$conditionReference$0(net.minecraft.resources.ResourceLocation) -> b
     13:13:net.minecraft.resources.ResourceLocation access$000(net.minecraft.world.level.storage.loot.predicates.ConditionReference) -> a
+    13:13:void <init>(net.minecraft.resources.ResourceLocation,net.minecraft.world.level.storage.loot.predicates.ConditionReference$1) -> <init>
     14:14:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.predicates.ConditionReference$Serializer -> cue$a:
-    60:61:void <init>() -> <init>
-    65:66:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.ConditionReference,com.google.gson.JsonSerializationContext) -> a
-    70:71:net.minecraft.world.level.storage.loot.predicates.ConditionReference deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    58:58:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    58:58:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder -> cuf:
+net.minecraft.world.level.storage.loot.predicates.ConditionReference$1 -> dde$1:
+net.minecraft.world.level.storage.loot.predicates.ConditionReference$Serializer -> dde$a:
+    63:63:void <init>() -> <init>
+    66:67:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.ConditionReference,com.google.gson.JsonSerializationContext) -> a
+    71:72:net.minecraft.world.level.storage.loot.predicates.ConditionReference deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    63:63:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    63:63:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder -> ddf:
     java.lang.Object when(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> b
     java.lang.Object unwrap() -> c
-net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition -> cug:
+net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition -> ddg:
     net.minecraft.advancements.critereon.DamageSourcePredicate predicate -> a
-    21:23:void <init>(net.minecraft.advancements.critereon.DamageSourcePredicate) -> <init>
-    27:27:java.util.Set getReferencedContextParams() -> a
-    32:35:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    39:39:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder hasDamageSource(net.minecraft.advancements.critereon.DamageSourcePredicate$Builder) -> a
-    18:18:boolean test(java.lang.Object) -> test
-    39:39:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$hasDamageSource$0(net.minecraft.advancements.critereon.DamageSourcePredicate$Builder) -> b
-    18:18:net.minecraft.advancements.critereon.DamageSourcePredicate access$000(net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition) -> a
-    18:18:void <init>(net.minecraft.advancements.critereon.DamageSourcePredicate,net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition$1) -> <init>
-net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition$1 -> cug$1:
-net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition$Serializer -> cug$a:
-    44:45:void <init>() -> <init>
+    20:22:void <init>(net.minecraft.advancements.critereon.DamageSourcePredicate) -> <init>
+    26:26:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    31:31:java.util.Set getReferencedContextParams() -> a
+    36:39:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    43:43:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder hasDamageSource(net.minecraft.advancements.critereon.DamageSourcePredicate$Builder) -> a
+    17:17:boolean test(java.lang.Object) -> test
+    43:43:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$hasDamageSource$0(net.minecraft.advancements.critereon.DamageSourcePredicate$Builder) -> b
+    17:17:net.minecraft.advancements.critereon.DamageSourcePredicate access$000(net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition) -> a
+    17:17:void <init>(net.minecraft.advancements.critereon.DamageSourcePredicate,net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition$1) -> <init>
+net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition$1 -> ddg$1:
+net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition$Serializer -> ddg$a:
+    46:46:void <init>() -> <init>
     49:50:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition,com.google.gson.JsonSerializationContext) -> a
-    54:55:net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    42:42:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    42:42:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition -> cuh:
+    54:55:net.minecraft.world.level.storage.loot.predicates.DamageSourceCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    46:46:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    46:46:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition -> ddh:
     java.util.Map scores -> a
     net.minecraft.world.level.storage.loot.LootContext$EntityTarget entityTarget -> b
-    26:29:void <init>(java.util.Map,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
-    33:33:java.util.Set getReferencedContextParams() -> a
-    38:50:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    54:62:boolean hasScore(net.minecraft.world.entity.Entity,net.minecraft.world.scores.Scoreboard,java.lang.String,net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
-    85:85:net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$Builder hasScores(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
-    22:22:boolean test(java.lang.Object) -> test
-    22:22:void <init>(java.util.Map,net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$1) -> <init>
-    22:22:java.util.Map access$100(net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition) -> a
-    22:22:net.minecraft.world.level.storage.loot.LootContext$EntityTarget access$200(net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition) -> b
-net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$1 -> cuh$1:
-net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$Builder -> cuh$a:
+    25:28:void <init>(java.util.Map,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
+    32:32:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    37:37:java.util.Set getReferencedContextParams() -> a
+    42:54:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    58:66:boolean hasScore(net.minecraft.world.entity.Entity,net.minecraft.world.scores.Scoreboard,java.lang.String,net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
+    89:89:net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$Builder hasScores(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
+    21:21:boolean test(java.lang.Object) -> test
+    21:21:void <init>(java.util.Map,net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$1) -> <init>
+    21:21:java.util.Map access$100(net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition) -> a
+    21:21:net.minecraft.world.level.storage.loot.LootContext$EntityTarget access$200(net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition) -> b
+net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$1 -> ddh$1:
+net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$Builder -> ddh$a:
     java.util.Map scores -> a
     net.minecraft.world.level.storage.loot.LootContext$EntityTarget entityTarget -> b
-    66:71:void <init>(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
-    74:75:net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$Builder withScore(java.lang.String,net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
-    80:80:net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
-net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$Serializer -> cuh$b:
-    90:91:void <init>() -> <init>
+    70:75:void <init>(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
+    78:79:net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$Builder withScore(java.lang.String,net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
+    84:84:net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
+net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition$Serializer -> ddh$b:
+    92:92:void <init>() -> <init>
     95:101:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition,com.google.gson.JsonSerializationContext) -> a
-    105:110:net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    88:88:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    88:88:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.ExplosionCondition -> cui:
+    105:110:net.minecraft.world.level.storage.loot.predicates.EntityHasScoreCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    92:92:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    92:92:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.ExplosionCondition -> ddi:
     net.minecraft.world.level.storage.loot.predicates.ExplosionCondition INSTANCE -> a
-    18:19:void <init>() -> <init>
-    23:23:java.util.Set getReferencedContextParams() -> a
-    28:35:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    39:39:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder survivesExplosion() -> b
-    15:15:boolean test(java.lang.Object) -> test
-    39:39:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$survivesExplosion$0() -> d
-    15:15:net.minecraft.world.level.storage.loot.predicates.ExplosionCondition access$000() -> c
-    16:16:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.predicates.ExplosionCondition$Serializer -> cui$a:
-    44:45:void <init>() -> <init>
-    49:49:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.ExplosionCondition,com.google.gson.JsonSerializationContext) -> a
-    53:53:net.minecraft.world.level.storage.loot.predicates.ExplosionCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    42:42:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    42:42:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition -> cuj:
-    net.minecraft.world.level.storage.loot.predicates.LootItemCondition term -> a
-    17:19:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition) -> <init>
-    23:23:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    28:28:java.util.Set getReferencedContextParams() -> a
-    33:35:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
-    38:39:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder invert(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
+    17:18:void <init>() -> <init>
+    22:22:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    27:27:java.util.Set getReferencedContextParams() -> a
+    32:39:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    43:43:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder survivesExplosion() -> c
     14:14:boolean test(java.lang.Object) -> test
-    39:39:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$invert$0(net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition) -> b
-    14:14:net.minecraft.world.level.storage.loot.predicates.LootItemCondition access$000(net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition) -> a
-    14:14:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition,net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition$1) -> <init>
-net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition$1 -> cuj$1:
-net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition$Serializer -> cuj$a:
-    44:45:void <init>() -> <init>
+    43:43:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$survivesExplosion$0() -> e
+    14:14:net.minecraft.world.level.storage.loot.predicates.ExplosionCondition access$000() -> d
+    15:15:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.predicates.ExplosionCondition$Serializer -> ddi$a:
+    46:46:void <init>() -> <init>
+    49:49:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.ExplosionCondition,com.google.gson.JsonSerializationContext) -> a
+    53:53:net.minecraft.world.level.storage.loot.predicates.ExplosionCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    46:46:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    46:46:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition -> ddj:
+    net.minecraft.world.level.storage.loot.predicates.LootItemCondition term -> a
+    16:18:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition) -> <init>
+    22:22:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    27:27:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    32:32:java.util.Set getReferencedContextParams() -> a
+    37:39:void validate(net.minecraft.world.level.storage.loot.ValidationContext) -> a
+    42:43:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder invert(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
+    13:13:boolean test(java.lang.Object) -> test
+    43:43:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$invert$0(net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition) -> b
+    13:13:net.minecraft.world.level.storage.loot.predicates.LootItemCondition access$000(net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition) -> a
+    13:13:void <init>(net.minecraft.world.level.storage.loot.predicates.LootItemCondition,net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition$1) -> <init>
+net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition$1 -> ddj$1:
+net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition$Serializer -> ddj$a:
+    46:46:void <init>() -> <init>
     49:50:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition,com.google.gson.JsonSerializationContext) -> a
-    54:55:net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    42:42:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    42:42:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.LocationCheck -> cuk:
+    54:55:net.minecraft.world.level.storage.loot.predicates.InvertedLootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    46:46:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    46:46:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.LocationCheck -> ddk:
     net.minecraft.advancements.critereon.LocationPredicate predicate -> a
     net.minecraft.core.BlockPos offset -> b
-    18:21:void <init>(net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.core.BlockPos) -> <init>
-    25:26:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    30:30:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder checkLocation(net.minecraft.advancements.critereon.LocationPredicate$Builder) -> a
-    34:34:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder checkLocation(net.minecraft.advancements.critereon.LocationPredicate$Builder,net.minecraft.core.BlockPos) -> a
-    13:13:boolean test(java.lang.Object) -> test
-    34:34:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$checkLocation$1(net.minecraft.advancements.critereon.LocationPredicate$Builder,net.minecraft.core.BlockPos) -> b
-    30:30:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$checkLocation$0(net.minecraft.advancements.critereon.LocationPredicate$Builder) -> b
-    13:13:net.minecraft.advancements.critereon.LocationPredicate access$000(net.minecraft.world.level.storage.loot.predicates.LocationCheck) -> a
-    13:13:net.minecraft.core.BlockPos access$100(net.minecraft.world.level.storage.loot.predicates.LocationCheck) -> b
-net.minecraft.world.level.storage.loot.predicates.LocationCheck$Serializer -> cuk$a:
-    39:40:void <init>() -> <init>
+    17:20:void <init>(net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.core.BlockPos) -> <init>
+    24:24:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    29:30:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    34:34:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder checkLocation(net.minecraft.advancements.critereon.LocationPredicate$Builder) -> a
+    38:38:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder checkLocation(net.minecraft.advancements.critereon.LocationPredicate$Builder,net.minecraft.core.BlockPos) -> a
+    12:12:boolean test(java.lang.Object) -> test
+    38:38:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$checkLocation$1(net.minecraft.advancements.critereon.LocationPredicate$Builder,net.minecraft.core.BlockPos) -> b
+    34:34:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$checkLocation$0(net.minecraft.advancements.critereon.LocationPredicate$Builder) -> b
+    12:12:net.minecraft.advancements.critereon.LocationPredicate access$000(net.minecraft.world.level.storage.loot.predicates.LocationCheck) -> a
+    12:12:net.minecraft.core.BlockPos access$100(net.minecraft.world.level.storage.loot.predicates.LocationCheck) -> b
+    12:12:void <init>(net.minecraft.advancements.critereon.LocationPredicate,net.minecraft.core.BlockPos,net.minecraft.world.level.storage.loot.predicates.LocationCheck$1) -> <init>
+net.minecraft.world.level.storage.loot.predicates.LocationCheck$1 -> ddk$1:
+net.minecraft.world.level.storage.loot.predicates.LocationCheck$Serializer -> ddk$a:
+    41:41:void <init>() -> <init>
     44:54:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LocationCheck,com.google.gson.JsonSerializationContext) -> a
-    58:62:net.minecraft.world.level.storage.loot.predicates.LocationCheck deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    37:37:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    37:37:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition -> cul:
+    58:62:net.minecraft.world.level.storage.loot.predicates.LocationCheck deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    41:41:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    41:41:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition -> ddl:
     net.minecraft.world.level.block.Block block -> a
     net.minecraft.advancements.critereon.StatePropertiesPredicate properties -> b
-    25:28:void <init>(net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.StatePropertiesPredicate) -> <init>
-    32:32:java.util.Set getReferencedContextParams() -> a
-    37:38:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    61:61:net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$Builder hasBlockStateProperties(net.minecraft.world.level.block.Block) -> a
-    21:21:boolean test(java.lang.Object) -> test
-    21:21:void <init>(net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.StatePropertiesPredicate,net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$1) -> <init>
-    21:21:net.minecraft.world.level.block.Block access$100(net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition) -> a
-    21:21:net.minecraft.advancements.critereon.StatePropertiesPredicate access$200(net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition) -> b
-net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$1 -> cul$1:
-net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$Builder -> cul$a:
+    24:27:void <init>(net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.StatePropertiesPredicate) -> <init>
+    31:31:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    36:36:java.util.Set getReferencedContextParams() -> a
+    41:42:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    65:65:net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$Builder hasBlockStateProperties(net.minecraft.world.level.block.Block) -> a
+    20:20:boolean test(java.lang.Object) -> test
+    20:20:void <init>(net.minecraft.world.level.block.Block,net.minecraft.advancements.critereon.StatePropertiesPredicate,net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$1) -> <init>
+    20:20:net.minecraft.world.level.block.Block access$100(net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition) -> a
+    20:20:net.minecraft.advancements.critereon.StatePropertiesPredicate access$200(net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition) -> b
+net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$1 -> ddl$1:
+net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$Builder -> ddl$a:
     net.minecraft.world.level.block.Block block -> a
     net.minecraft.advancements.critereon.StatePropertiesPredicate properties -> b
-    43:47:void <init>(net.minecraft.world.level.block.Block) -> <init>
-    50:51:net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$Builder setProperties(net.minecraft.advancements.critereon.StatePropertiesPredicate$Builder) -> a
-    56:56:net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
-net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$Serializer -> cul$b:
-    67:67:java.lang.String valueToString(net.minecraft.world.level.block.state.properties.Property,java.lang.Object) -> a
-    71:72:void <init>() -> <init>
-    76:78:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition,com.google.gson.JsonSerializationContext) -> a
-    82:90:net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    64:64:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    64:64:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-    87:87:void lambda$deserialize$1(net.minecraft.world.level.block.Block,java.lang.String) -> a
-    84:84:java.lang.IllegalArgumentException lambda$deserialize$0(net.minecraft.resources.ResourceLocation) -> a
-net.minecraft.world.level.storage.loot.predicates.LootItemCondition -> cum:
-net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder -> cum$a:
+    47:51:void <init>(net.minecraft.world.level.block.Block) -> <init>
+    54:55:net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$Builder setProperties(net.minecraft.advancements.critereon.StatePropertiesPredicate$Builder) -> a
+    60:60:net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
+net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition$Serializer -> ddl$b:
+    68:68:void <init>() -> <init>
+    71:73:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition,com.google.gson.JsonSerializationContext) -> a
+    77:85:net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    68:68:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    68:68:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+    82:82:void lambda$deserialize$1(net.minecraft.world.level.block.Block,java.lang.String) -> a
+    79:79:java.lang.IllegalArgumentException lambda$deserialize$0(net.minecraft.resources.ResourceLocation) -> a
+net.minecraft.world.level.storage.loot.predicates.LootItemCondition -> ddm:
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder -> ddm$a:
     net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
-    19:19:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder invert() -> a
-    23:23:net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$Builder or(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
-net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Serializer -> cum$b:
-    net.minecraft.resources.ResourceLocation name -> a
-    java.lang.Class clazz -> b
-    31:34:void <init>(net.minecraft.resources.ResourceLocation,java.lang.Class) -> <init>
-    37:37:net.minecraft.resources.ResourceLocation getName() -> a
-    41:41:java.lang.Class getPredicateClass() -> b
-    void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-    net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-net.minecraft.world.level.storage.loot.predicates.LootItemConditions -> cun:
-    java.util.Map CONDITIONS_BY_NAME -> a
-    java.util.Map CONDITIONS_BY_CLASS -> b
-    19:19:void <init>() -> <init>
-    44:54:void register(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Serializer) -> a
-    57:61:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Serializer getSerializer(net.minecraft.resources.ResourceLocation) -> a
-    66:70:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Serializer getSerializer(net.minecraft.world.level.storage.loot.predicates.LootItemCondition) -> a
-    99:107:java.util.function.Predicate andConditions(java.util.function.Predicate[]) -> a
-    119:128:java.util.function.Predicate orConditions(java.util.function.Predicate[]) -> b
-    129:134:boolean lambda$orConditions$3(java.util.function.Predicate[],java.lang.Object) -> a
-    121:121:boolean lambda$orConditions$2(java.lang.Object) -> a
-    108:113:boolean lambda$andConditions$1(java.util.function.Predicate[],java.lang.Object) -> b
-    101:101:boolean lambda$andConditions$0(java.lang.Object) -> b
-    20:40:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.predicates.LootItemConditions$Serializer -> cun$a:
-    73:73:void <init>() -> <init>
-    76:85:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> a
-    90:94:com.google.gson.JsonElement serialize(net.minecraft.world.level.storage.loot.predicates.LootItemCondition,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> a
-    73:73:com.google.gson.JsonElement serialize(java.lang.Object,java.lang.reflect.Type,com.google.gson.JsonSerializationContext) -> serialize
-    73:73:java.lang.Object deserialize(com.google.gson.JsonElement,java.lang.reflect.Type,com.google.gson.JsonDeserializationContext) -> deserialize
-net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition -> cuo:
+    17:17:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder invert() -> a
+    21:21:net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition$Builder or(net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder) -> a
+net.minecraft.world.level.storage.loot.predicates.LootItemConditionType -> ddn:
+    8:9:void <init>(net.minecraft.world.level.storage.loot.Serializer) -> <init>
+net.minecraft.world.level.storage.loot.predicates.LootItemConditions -> ddo:
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType INVERTED -> a
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType ALTERNATIVE -> b
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType RANDOM_CHANCE -> c
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType RANDOM_CHANCE_WITH_LOOTING -> d
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType ENTITY_PROPERTIES -> e
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType KILLED_BY_PLAYER -> f
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType ENTITY_SCORES -> g
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType BLOCK_STATE_PROPERTY -> h
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType MATCH_TOOL -> i
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType TABLE_BONUS -> j
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType SURVIVES_EXPLOSION -> k
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType DAMAGE_SOURCE_PROPERTIES -> l
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType LOCATION_CHECK -> m
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType WEATHER_CHECK -> n
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType REFERENCE -> o
+    net.minecraft.world.level.storage.loot.predicates.LootItemConditionType TIME_CHECK -> p
+    10:10:void <init>() -> <init>
+    29:29:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType register(java.lang.String,net.minecraft.world.level.storage.loot.Serializer) -> a
+    33:33:java.lang.Object createGsonAdapter() -> a
+    37:45:java.util.function.Predicate andConditions(java.util.function.Predicate[]) -> a
+    57:66:java.util.function.Predicate orConditions(java.util.function.Predicate[]) -> b
+    67:72:boolean lambda$orConditions$3(java.util.function.Predicate[],java.lang.Object) -> a
+    59:59:boolean lambda$orConditions$2(java.lang.Object) -> a
+    46:51:boolean lambda$andConditions$1(java.util.function.Predicate[],java.lang.Object) -> b
+    39:39:boolean lambda$andConditions$0(java.lang.Object) -> b
+    11:26:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition -> ddp:
     net.minecraft.advancements.critereon.EntityPredicate predicate -> a
     net.minecraft.world.level.storage.loot.LootContext$EntityTarget entityTarget -> b
-    23:26:void <init>(net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
-    30:30:java.util.Set getReferencedContextParams() -> a
-    35:37:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    41:41:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder entityPresent(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
-    45:45:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder hasProperties(net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.advancements.critereon.EntityPredicate$Builder) -> a
-    19:19:boolean test(java.lang.Object) -> test
-    45:45:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$hasProperties$0(net.minecraft.advancements.critereon.EntityPredicate$Builder,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
-    19:19:net.minecraft.advancements.critereon.EntityPredicate access$000(net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition) -> a
-    19:19:net.minecraft.world.level.storage.loot.LootContext$EntityTarget access$100(net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition) -> b
-    19:19:void <init>(net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition$1) -> <init>
-net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition$1 -> cuo$1:
-net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition$Serializer -> cuo$a:
-    50:51:void <init>() -> <init>
-    55:57:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition,com.google.gson.JsonSerializationContext) -> a
-    61:62:net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    48:48:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    48:48:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.LootItemKilledByPlayerCondition -> cup:
+    21:24:void <init>(net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> <init>
+    28:28:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    33:33:java.util.Set getReferencedContextParams() -> a
+    38:40:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    44:44:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder entityPresent(net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
+    48:48:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder hasProperties(net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.advancements.critereon.EntityPredicate$Builder) -> a
+    52:52:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder hasProperties(net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.advancements.critereon.EntityPredicate) -> a
+    17:17:boolean test(java.lang.Object) -> test
+    52:52:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$hasProperties$1(net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
+    48:48:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$hasProperties$0(net.minecraft.advancements.critereon.EntityPredicate$Builder,net.minecraft.world.level.storage.loot.LootContext$EntityTarget) -> a
+    17:17:net.minecraft.advancements.critereon.EntityPredicate access$000(net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition) -> a
+    17:17:net.minecraft.world.level.storage.loot.LootContext$EntityTarget access$100(net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition) -> b
+    17:17:void <init>(net.minecraft.advancements.critereon.EntityPredicate,net.minecraft.world.level.storage.loot.LootContext$EntityTarget,net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition$1) -> <init>
+net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition$1 -> ddp$1:
+net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition$Serializer -> ddp$a:
+    55:55:void <init>() -> <init>
+    58:60:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition,com.google.gson.JsonSerializationContext) -> a
+    64:65:net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    55:55:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    55:55:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.LootItemKilledByPlayerCondition -> ddq:
     net.minecraft.world.level.storage.loot.predicates.LootItemKilledByPlayerCondition INSTANCE -> a
-    17:18:void <init>() -> <init>
-    22:22:java.util.Set getReferencedContextParams() -> a
-    27:27:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    31:31:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder killedByPlayer() -> b
-    14:14:boolean test(java.lang.Object) -> test
-    31:31:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$killedByPlayer$0() -> d
-    14:14:net.minecraft.world.level.storage.loot.predicates.LootItemKilledByPlayerCondition access$000() -> c
-    15:15:void <clinit>() -> <clinit>
-net.minecraft.world.level.storage.loot.predicates.LootItemKilledByPlayerCondition$Serializer -> cup$a:
-    36:37:void <init>() -> <init>
+    16:17:void <init>() -> <init>
+    21:21:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    26:26:java.util.Set getReferencedContextParams() -> a
+    31:31:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    35:35:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder killedByPlayer() -> c
+    13:13:boolean test(java.lang.Object) -> test
+    35:35:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$killedByPlayer$0() -> e
+    13:13:net.minecraft.world.level.storage.loot.predicates.LootItemKilledByPlayerCondition access$000() -> d
+    14:14:void <clinit>() -> <clinit>
+net.minecraft.world.level.storage.loot.predicates.LootItemKilledByPlayerCondition$Serializer -> ddq$a:
+    38:38:void <init>() -> <init>
     41:41:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemKilledByPlayerCondition,com.google.gson.JsonSerializationContext) -> a
-    45:45:net.minecraft.world.level.storage.loot.predicates.LootItemKilledByPlayerCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    34:34:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    34:34:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition -> cuq:
+    45:45:net.minecraft.world.level.storage.loot.predicates.LootItemKilledByPlayerCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    38:38:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    38:38:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition -> ddr:
     float probability -> a
-    13:15:void <init>(float) -> <init>
-    19:19:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    23:23:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder randomChance(float) -> a
-    10:10:boolean test(java.lang.Object) -> test
-    23:23:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$randomChance$0(float) -> b
-    10:10:float access$000(net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition) -> a
-    10:10:void <init>(float,net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition$1) -> <init>
-net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition$1 -> cuq$1:
-net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition$Serializer -> cuq$a:
-    28:29:void <init>() -> <init>
+    12:14:void <init>(float) -> <init>
+    18:18:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    23:23:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    27:27:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder randomChance(float) -> a
+    9:9:boolean test(java.lang.Object) -> test
+    27:27:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$randomChance$0(float) -> b
+    9:9:float access$000(net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition) -> a
+    9:9:void <init>(float,net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition$1) -> <init>
+net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition$1 -> ddr$1:
+net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition$Serializer -> ddr$a:
+    30:30:void <init>() -> <init>
     33:34:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition,com.google.gson.JsonSerializationContext) -> a
-    38:38:net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    26:26:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    26:26:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition -> cur:
+    38:38:net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    30:30:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    30:30:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition -> dds:
     float percent -> a
     float lootingMultiplier -> b
-    22:25:void <init>(float,float) -> <init>
-    29:29:java.util.Set getReferencedContextParams() -> a
-    34:40:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    44:44:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder randomChanceAndLootingBoost(float,float) -> a
-    18:18:boolean test(java.lang.Object) -> test
-    44:44:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$randomChanceAndLootingBoost$0(float,float) -> b
-    18:18:float access$000(net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition) -> a
-    18:18:float access$100(net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition) -> b
-    18:18:void <init>(float,float,net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition$1) -> <init>
-net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition$1 -> cur$1:
-net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition$Serializer -> cur$a:
-    49:50:void <init>() -> <init>
+    21:24:void <init>(float,float) -> <init>
+    28:28:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    33:33:java.util.Set getReferencedContextParams() -> a
+    38:44:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    48:48:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder randomChanceAndLootingBoost(float,float) -> a
+    17:17:boolean test(java.lang.Object) -> test
+    48:48:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$randomChanceAndLootingBoost$0(float,float) -> b
+    17:17:float access$000(net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition) -> a
+    17:17:float access$100(net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition) -> b
+    17:17:void <init>(float,float,net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition$1) -> <init>
+net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition$1 -> dds$1:
+net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition$Serializer -> dds$a:
+    51:51:void <init>() -> <init>
     54:56:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition,com.google.gson.JsonSerializationContext) -> a
-    60:60:net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    47:47:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    47:47:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.MatchTool -> cus:
+    60:60:net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceWithLootingCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    51:51:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    51:51:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.MatchTool -> ddt:
     net.minecraft.advancements.critereon.ItemPredicate predicate -> a
-    19:21:void <init>(net.minecraft.advancements.critereon.ItemPredicate) -> <init>
-    25:25:java.util.Set getReferencedContextParams() -> a
-    30:31:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    35:35:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder toolMatches(net.minecraft.advancements.critereon.ItemPredicate$Builder) -> a
-    16:16:boolean test(java.lang.Object) -> test
-    35:35:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$toolMatches$0(net.minecraft.advancements.critereon.ItemPredicate$Builder) -> b
-    16:16:net.minecraft.advancements.critereon.ItemPredicate access$000(net.minecraft.world.level.storage.loot.predicates.MatchTool) -> a
-net.minecraft.world.level.storage.loot.predicates.MatchTool$Serializer -> cus$a:
-    40:41:void <init>() -> <init>
+    18:20:void <init>(net.minecraft.advancements.critereon.ItemPredicate) -> <init>
+    24:24:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    29:29:java.util.Set getReferencedContextParams() -> a
+    34:35:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    39:39:net.minecraft.world.level.storage.loot.predicates.LootItemCondition$Builder toolMatches(net.minecraft.advancements.critereon.ItemPredicate$Builder) -> a
+    15:15:boolean test(java.lang.Object) -> test
+    39:39:net.minecraft.world.level.storage.loot.predicates.LootItemCondition lambda$toolMatches$0(net.minecraft.advancements.critereon.ItemPredicate$Builder) -> b
+    15:15:net.minecraft.advancements.critereon.ItemPredicate access$000(net.minecraft.world.level.storage.loot.predicates.MatchTool) -> a
+net.minecraft.world.level.storage.loot.predicates.MatchTool$Serializer -> ddt$a:
+    42:42:void <init>() -> <init>
     45:46:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.MatchTool,com.google.gson.JsonSerializationContext) -> a
-    50:51:net.minecraft.world.level.storage.loot.predicates.MatchTool deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    38:38:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    38:38:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.TimeCheck -> cut:
+    50:51:net.minecraft.world.level.storage.loot.predicates.MatchTool deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    42:42:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    42:42:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.TimeCheck -> ddu:
     java.lang.Long period -> a
     net.minecraft.world.level.storage.loot.RandomValueBounds value -> b
-    21:24:void <init>(java.lang.Long,net.minecraft.world.level.storage.loot.RandomValueBounds) -> <init>
-    28:36:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    61:61:net.minecraft.world.level.storage.loot.predicates.TimeCheck$Builder time(net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
-    14:14:boolean test(java.lang.Object) -> test
-    14:14:void <init>(java.lang.Long,net.minecraft.world.level.storage.loot.RandomValueBounds,net.minecraft.world.level.storage.loot.predicates.TimeCheck$1) -> <init>
-    14:14:java.lang.Long access$100(net.minecraft.world.level.storage.loot.predicates.TimeCheck) -> a
-    14:14:net.minecraft.world.level.storage.loot.RandomValueBounds access$200(net.minecraft.world.level.storage.loot.predicates.TimeCheck) -> b
-net.minecraft.world.level.storage.loot.predicates.TimeCheck$1 -> cut$1:
-net.minecraft.world.level.storage.loot.predicates.TimeCheck$Builder -> cut$a:
-    java.lang.Long period -> a
-    net.minecraft.world.level.storage.loot.RandomValueBounds value -> b
-    45:47:void <init>(net.minecraft.world.level.storage.loot.RandomValueBounds) -> <init>
-    50:51:net.minecraft.world.level.storage.loot.predicates.TimeCheck$Builder setPeriod(long) -> a
-    56:56:net.minecraft.world.level.storage.loot.predicates.TimeCheck build() -> b
-    39:39:net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
-net.minecraft.world.level.storage.loot.predicates.TimeCheck$Serializer -> cut$b:
-    66:67:void <init>() -> <init>
-    71:73:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.TimeCheck,com.google.gson.JsonSerializationContext) -> a
-    77:79:net.minecraft.world.level.storage.loot.predicates.TimeCheck deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    64:64:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    64:64:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.WeatherCheck -> cuu:
-    java.lang.Boolean isRaining -> a
-    java.lang.Boolean isThundering -> b
-    20:23:void <init>(java.lang.Boolean,java.lang.Boolean) -> <init>
-    27:37:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
-    64:64:net.minecraft.world.level.storage.loot.predicates.WeatherCheck$Builder weather() -> b
+    20:23:void <init>(java.lang.Long,net.minecraft.world.level.storage.loot.RandomValueBounds) -> <init>
+    27:27:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    32:40:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    65:65:net.minecraft.world.level.storage.loot.predicates.TimeCheck$Builder time(net.minecraft.world.level.storage.loot.RandomValueBounds) -> a
     13:13:boolean test(java.lang.Object) -> test
-    13:13:void <init>(java.lang.Boolean,java.lang.Boolean,net.minecraft.world.level.storage.loot.predicates.WeatherCheck$1) -> <init>
-    13:13:java.lang.Boolean access$100(net.minecraft.world.level.storage.loot.predicates.WeatherCheck) -> a
-    13:13:java.lang.Boolean access$200(net.minecraft.world.level.storage.loot.predicates.WeatherCheck) -> b
-net.minecraft.world.level.storage.loot.predicates.WeatherCheck$1 -> cuu$1:
-net.minecraft.world.level.storage.loot.predicates.WeatherCheck$Builder -> cuu$a:
+    13:13:void <init>(java.lang.Long,net.minecraft.world.level.storage.loot.RandomValueBounds,net.minecraft.world.level.storage.loot.predicates.TimeCheck$1) -> <init>
+    13:13:java.lang.Long access$100(net.minecraft.world.level.storage.loot.predicates.TimeCheck) -> a
+    13:13:net.minecraft.world.level.storage.loot.RandomValueBounds access$200(net.minecraft.world.level.storage.loot.predicates.TimeCheck) -> b
+net.minecraft.world.level.storage.loot.predicates.TimeCheck$1 -> ddu$1:
+net.minecraft.world.level.storage.loot.predicates.TimeCheck$Builder -> ddu$a:
+    java.lang.Long period -> a
+    net.minecraft.world.level.storage.loot.RandomValueBounds value -> b
+    49:51:void <init>(net.minecraft.world.level.storage.loot.RandomValueBounds) -> <init>
+    54:55:net.minecraft.world.level.storage.loot.predicates.TimeCheck$Builder setPeriod(long) -> a
+    60:60:net.minecraft.world.level.storage.loot.predicates.TimeCheck build() -> b
+    43:43:net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
+net.minecraft.world.level.storage.loot.predicates.TimeCheck$Serializer -> ddu$b:
+    68:68:void <init>() -> <init>
+    71:73:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.TimeCheck,com.google.gson.JsonSerializationContext) -> a
+    77:79:net.minecraft.world.level.storage.loot.predicates.TimeCheck deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    68:68:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    68:68:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.WeatherCheck -> ddv:
     java.lang.Boolean isRaining -> a
     java.lang.Boolean isThundering -> b
-    40:40:void <init>() -> <init>
-    48:49:net.minecraft.world.level.storage.loot.predicates.WeatherCheck$Builder setRaining(java.lang.Boolean) -> a
-    53:54:net.minecraft.world.level.storage.loot.predicates.WeatherCheck$Builder setThundering(java.lang.Boolean) -> b
-    59:59:net.minecraft.world.level.storage.loot.predicates.WeatherCheck build() -> b
-    40:40:net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
-net.minecraft.world.level.storage.loot.predicates.WeatherCheck$Serializer -> cuu$b:
-    69:70:void <init>() -> <init>
+    19:22:void <init>(java.lang.Boolean,java.lang.Boolean) -> <init>
+    26:26:net.minecraft.world.level.storage.loot.predicates.LootItemConditionType getType() -> b
+    31:41:boolean test(net.minecraft.world.level.storage.loot.LootContext) -> a
+    68:68:net.minecraft.world.level.storage.loot.predicates.WeatherCheck$Builder weather() -> c
+    12:12:boolean test(java.lang.Object) -> test
+    12:12:void <init>(java.lang.Boolean,java.lang.Boolean,net.minecraft.world.level.storage.loot.predicates.WeatherCheck$1) -> <init>
+    12:12:java.lang.Boolean access$100(net.minecraft.world.level.storage.loot.predicates.WeatherCheck) -> a
+    12:12:java.lang.Boolean access$200(net.minecraft.world.level.storage.loot.predicates.WeatherCheck) -> b
+net.minecraft.world.level.storage.loot.predicates.WeatherCheck$1 -> ddv$1:
+net.minecraft.world.level.storage.loot.predicates.WeatherCheck$Builder -> ddv$a:
+    java.lang.Boolean isRaining -> a
+    java.lang.Boolean isThundering -> b
+    44:44:void <init>() -> <init>
+    52:53:net.minecraft.world.level.storage.loot.predicates.WeatherCheck$Builder setRaining(java.lang.Boolean) -> a
+    57:58:net.minecraft.world.level.storage.loot.predicates.WeatherCheck$Builder setThundering(java.lang.Boolean) -> b
+    63:63:net.minecraft.world.level.storage.loot.predicates.WeatherCheck build() -> b
+    44:44:net.minecraft.world.level.storage.loot.predicates.LootItemCondition build() -> build
+net.minecraft.world.level.storage.loot.predicates.WeatherCheck$Serializer -> ddv$b:
+    71:71:void <init>() -> <init>
     74:76:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.WeatherCheck,com.google.gson.JsonSerializationContext) -> a
-    80:82:net.minecraft.world.level.storage.loot.predicates.WeatherCheck deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
-    67:67:net.minecraft.world.level.storage.loot.predicates.LootItemCondition deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
-    67:67:void serialize(com.google.gson.JsonObject,net.minecraft.world.level.storage.loot.predicates.LootItemCondition,com.google.gson.JsonSerializationContext) -> a
-net.minecraft.world.level.storage.loot.predicates.package-info -> cuv:
-net.minecraft.world.level.storage.package-info -> cuw:
-net.minecraft.world.level.storage.threaded.package-info -> cux:
-net.minecraft.world.level.timers.FunctionCallback -> cuy:
+    80:82:net.minecraft.world.level.storage.loot.predicates.WeatherCheck deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> b
+    71:71:java.lang.Object deserialize(com.google.gson.JsonObject,com.google.gson.JsonDeserializationContext) -> a
+    71:71:void serialize(com.google.gson.JsonObject,java.lang.Object,com.google.gson.JsonSerializationContext) -> a
+net.minecraft.world.level.storage.loot.predicates.package-info -> ddw:
+net.minecraft.world.level.storage.package-info -> ddx:
+net.minecraft.world.level.storage.threaded.package-info -> ddy:
+net.minecraft.world.level.timers.FunctionCallback -> ddz:
     net.minecraft.resources.ResourceLocation functionId -> a
     11:13:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     17:19:void handle(net.minecraft.server.MinecraftServer,net.minecraft.world.level.timers.TimerQueue,long) -> a
     8:8:void handle(java.lang.Object,net.minecraft.world.level.timers.TimerQueue,long) -> a
     18:18:void lambda$handle$0(net.minecraft.server.ServerFunctionManager,net.minecraft.commands.CommandFunction) -> a
     8:8:net.minecraft.resources.ResourceLocation access$000(net.minecraft.world.level.timers.FunctionCallback) -> a
-net.minecraft.world.level.timers.FunctionCallback$Serializer -> cuy$a:
+net.minecraft.world.level.timers.FunctionCallback$Serializer -> ddz$a:
     23:24:void <init>() -> <init>
     28:29:void serialize(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.timers.FunctionCallback) -> a
     33:34:net.minecraft.world.level.timers.FunctionCallback deserialize(net.minecraft.nbt.CompoundTag) -> a
     21:21:net.minecraft.world.level.timers.TimerCallback deserialize(net.minecraft.nbt.CompoundTag) -> b
     21:21:void serialize(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.timers.TimerCallback) -> a
-net.minecraft.world.level.timers.FunctionTagCallback -> cuz:
+net.minecraft.world.level.timers.FunctionTagCallback -> dea:
     net.minecraft.resources.ResourceLocation tagId -> a
     13:15:void <init>(net.minecraft.resources.ResourceLocation) -> <init>
     19:24:void handle(net.minecraft.server.MinecraftServer,net.minecraft.world.level.timers.TimerQueue,long) -> a
     10:10:void handle(java.lang.Object,net.minecraft.world.level.timers.TimerQueue,long) -> a
     10:10:net.minecraft.resources.ResourceLocation access$000(net.minecraft.world.level.timers.FunctionTagCallback) -> a
-net.minecraft.world.level.timers.FunctionTagCallback$Serializer -> cuz$a:
+net.minecraft.world.level.timers.FunctionTagCallback$Serializer -> dea$a:
     28:29:void <init>() -> <init>
     33:34:void serialize(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.timers.FunctionTagCallback) -> a
     38:39:net.minecraft.world.level.timers.FunctionTagCallback deserialize(net.minecraft.nbt.CompoundTag) -> a
     26:26:net.minecraft.world.level.timers.TimerCallback deserialize(net.minecraft.nbt.CompoundTag) -> b
     26:26:void serialize(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.timers.TimerCallback) -> a
-net.minecraft.world.level.timers.TimerCallback -> cva:
+net.minecraft.world.level.timers.TimerCallback -> deb:
     void handle(java.lang.Object,net.minecraft.world.level.timers.TimerQueue,long) -> a
-net.minecraft.world.level.timers.TimerCallback$Serializer -> cva$a:
+net.minecraft.world.level.timers.TimerCallback$Serializer -> deb$a:
     net.minecraft.resources.ResourceLocation id -> a
     java.lang.Class cls -> b
     14:17:void <init>(net.minecraft.resources.ResourceLocation,java.lang.Class) -> <init>
@@ -66001,7 +72497,7 @@ net.minecraft.world.level.timers.TimerCallback$Serializer -> cva$a:
     24:24:java.lang.Class getCls() -> b
     void serialize(net.minecraft.nbt.CompoundTag,net.minecraft.world.level.timers.TimerCallback) -> a
     net.minecraft.world.level.timers.TimerCallback deserialize(net.minecraft.nbt.CompoundTag) -> b
-net.minecraft.world.level.timers.TimerCallbacks -> cvb:
+net.minecraft.world.level.timers.TimerCallbacks -> dec:
     org.apache.logging.log4j.Logger LOGGER -> b
     net.minecraft.world.level.timers.TimerCallbacks SERVER_CALLBACKS -> a
     java.util.Map idToSerializer -> c
@@ -66012,36 +72508,37 @@ net.minecraft.world.level.timers.TimerCallbacks -> cvb:
     41:45:net.minecraft.nbt.CompoundTag serialize(net.minecraft.world.level.timers.TimerCallback) -> a
     50:60:net.minecraft.world.level.timers.TimerCallback deserialize(net.minecraft.nbt.CompoundTag) -> a
     15:19:void <clinit>() -> <clinit>
-net.minecraft.world.level.timers.TimerQueue -> cvc:
+net.minecraft.world.level.timers.TimerQueue -> ded:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.level.timers.TimerCallbacks callbacksRegistry -> b
     java.util.Queue queue -> c
     com.google.common.primitives.UnsignedLong sequentialId -> d
     com.google.common.collect.Table events -> e
-    40:40:java.util.Comparator createComparator() -> c
-    45:53:void <init>(net.minecraft.world.level.timers.TimerCallbacks) -> <init>
-    57:67:void tick(java.lang.Object,long) -> a
-    70:77:void schedule(java.lang.String,long,net.minecraft.world.level.timers.TimerCallback) -> a
-    80:84:int remove(java.lang.String) -> a
-    88:88:java.util.Set getEventsIds() -> a
-    92:99:void loadEvent(net.minecraft.nbt.CompoundTag) -> a
-    102:118:void load(net.minecraft.nbt.ListTag) -> a
-    121:125:net.minecraft.nbt.CompoundTag storeEvent(net.minecraft.world.level.timers.TimerQueue$Event) -> a
-    129:131:net.minecraft.nbt.ListTag store() -> b
-    40:40:com.google.common.primitives.UnsignedLong lambda$createComparator$1(net.minecraft.world.level.timers.TimerQueue$Event) -> b
-    40:40:long lambda$createComparator$0(net.minecraft.world.level.timers.TimerQueue$Event) -> c
-    20:20:void <clinit>() -> <clinit>
-net.minecraft.world.level.timers.TimerQueue$1 -> cvc$1:
-net.minecraft.world.level.timers.TimerQueue$Event -> cvc$a:
+    42:42:java.util.Comparator createComparator() -> c
+    54:66:void <init>(net.minecraft.world.level.timers.TimerCallbacks,java.util.stream.Stream) -> <init>
+    47:70:void <init>(net.minecraft.world.level.timers.TimerCallbacks) -> <init>
+    74:84:void tick(java.lang.Object,long) -> a
+    87:94:void schedule(java.lang.String,long,net.minecraft.world.level.timers.TimerCallback) -> a
+    97:101:int remove(java.lang.String) -> a
+    105:105:java.util.Set getEventsIds() -> a
+    109:116:void loadEvent(net.minecraft.nbt.CompoundTag) -> a
+    119:123:net.minecraft.nbt.CompoundTag storeEvent(net.minecraft.world.level.timers.TimerQueue$Event) -> a
+    127:129:net.minecraft.nbt.ListTag store() -> b
+    60:65:void lambda$new$2(com.mojang.serialization.Dynamic) -> a
+    42:42:com.google.common.primitives.UnsignedLong lambda$createComparator$1(net.minecraft.world.level.timers.TimerQueue$Event) -> b
+    42:42:long lambda$createComparator$0(net.minecraft.world.level.timers.TimerQueue$Event) -> c
+    22:22:void <clinit>() -> <clinit>
+net.minecraft.world.level.timers.TimerQueue$1 -> ded$1:
+net.minecraft.world.level.timers.TimerQueue$Event -> ded$a:
     long triggerTime -> a
     com.google.common.primitives.UnsignedLong sequentialId -> b
     java.lang.String id -> c
     net.minecraft.world.level.timers.TimerCallback callback -> d
-    31:36:void <init>(long,com.google.common.primitives.UnsignedLong,java.lang.String,net.minecraft.world.level.timers.TimerCallback) -> <init>
-    25:25:void <init>(long,com.google.common.primitives.UnsignedLong,java.lang.String,net.minecraft.world.level.timers.TimerCallback,net.minecraft.world.level.timers.TimerQueue$1) -> <init>
-net.minecraft.world.level.timers.package-info -> cvd:
-net.minecraft.world.package-info -> cve:
-net.minecraft.world.phys.AABB -> cvf:
+    33:38:void <init>(long,com.google.common.primitives.UnsignedLong,java.lang.String,net.minecraft.world.level.timers.TimerCallback) -> <init>
+    27:27:void <init>(long,com.google.common.primitives.UnsignedLong,java.lang.String,net.minecraft.world.level.timers.TimerCallback,net.minecraft.world.level.timers.TimerQueue$1) -> <init>
+net.minecraft.world.level.timers.package-info -> dee:
+net.minecraft.world.package-info -> def:
+net.minecraft.world.phys.AABB -> deg:
     double minX -> a
     double minY -> b
     double minZ -> c
@@ -66053,49 +72550,51 @@ net.minecraft.world.phys.AABB -> cvf:
     39:40:void <init>(net.minecraft.core.BlockPos,net.minecraft.core.BlockPos) -> <init>
     43:44:void <init>(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3) -> <init>
     47:47:net.minecraft.world.phys.AABB of(net.minecraft.world.level.levelgen.structure.BoundingBox) -> a
-    51:51:net.minecraft.world.phys.AABB setMinX(double) -> a
-    55:55:net.minecraft.world.phys.AABB setMinY(double) -> b
-    59:59:net.minecraft.world.phys.AABB setMinZ(double) -> c
-    63:63:net.minecraft.world.phys.AABB setMaxX(double) -> d
-    67:67:net.minecraft.world.phys.AABB setMaxY(double) -> e
-    71:71:net.minecraft.world.phys.AABB setMaxZ(double) -> f
-    75:75:double min(net.minecraft.core.Direction$Axis) -> a
-    79:79:double max(net.minecraft.core.Direction$Axis) -> b
-    84:108:boolean equals(java.lang.Object) -> equals
-    113:125:int hashCode() -> hashCode
-    135:160:net.minecraft.world.phys.AABB contract(double,double,double) -> a
-    164:164:net.minecraft.world.phys.AABB expandTowards(net.minecraft.world.phys.Vec3) -> a
-    174:199:net.minecraft.world.phys.AABB expandTowards(double,double,double) -> b
-    209:216:net.minecraft.world.phys.AABB inflate(double,double,double) -> c
-    220:220:net.minecraft.world.phys.AABB inflate(double) -> g
-    224:231:net.minecraft.world.phys.AABB intersect(net.minecraft.world.phys.AABB) -> a
-    235:242:net.minecraft.world.phys.AABB minmax(net.minecraft.world.phys.AABB) -> b
-    246:274:net.minecraft.world.phys.AABB minmax(java.lang.Iterable) -> a
-    278:278:net.minecraft.world.phys.AABB move(double,double,double) -> d
-    282:282:net.minecraft.world.phys.AABB move(net.minecraft.core.BlockPos) -> a
-    286:286:net.minecraft.world.phys.AABB move(net.minecraft.world.phys.Vec3) -> b
-    291:308:double clipXCollide(net.minecraft.world.phys.AABB,double) -> a
-    313:330:double clipYCollide(net.minecraft.world.phys.AABB,double) -> b
-    335:352:double clipZCollide(net.minecraft.world.phys.AABB,double) -> c
-    356:356:boolean intersects(net.minecraft.world.phys.AABB) -> c
-    361:361:boolean intersects(double,double,double,double,double,double) -> a
-    370:370:boolean intersects(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3) -> a
-    374:374:boolean contains(net.minecraft.world.phys.Vec3) -> c
-    378:378:boolean contains(double,double,double) -> e
-    382:385:double getSize() -> a
-    389:389:double getXsize() -> b
-    393:393:double getYsize() -> c
-    397:397:double getZsize() -> d
-    409:409:net.minecraft.world.phys.AABB deflate(double,double,double) -> f
-    413:413:net.minecraft.world.phys.AABB deflate(double) -> h
-    417:428:java.util.Optional clip(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3) -> b
-    433:449:net.minecraft.world.phys.BlockHitResult clip(java.lang.Iterable,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,net.minecraft.core.BlockPos) -> a
-    454:471:net.minecraft.core.Direction getDirection(net.minecraft.world.phys.AABB,net.minecraft.world.phys.Vec3,double[],net.minecraft.core.Direction,double,double,double) -> a
-    476:486:net.minecraft.core.Direction clipPoint(double[],net.minecraft.core.Direction,double,double,double,double,double,double,double,double,net.minecraft.core.Direction,double,double,double) -> a
-    491:491:java.lang.String toString() -> toString
-    495:495:boolean hasNaN() -> e
-    499:499:net.minecraft.world.phys.Vec3 getCenter() -> f
-net.minecraft.world.phys.BlockHitResult -> cvg:
+    51:51:net.minecraft.world.phys.AABB unitCubeFromLowerCorner(net.minecraft.world.phys.Vec3) -> a
+    55:55:net.minecraft.world.phys.AABB setMinX(double) -> a
+    59:59:net.minecraft.world.phys.AABB setMinY(double) -> b
+    63:63:net.minecraft.world.phys.AABB setMinZ(double) -> c
+    67:67:net.minecraft.world.phys.AABB setMaxX(double) -> d
+    71:71:net.minecraft.world.phys.AABB setMaxY(double) -> e
+    75:75:net.minecraft.world.phys.AABB setMaxZ(double) -> f
+    79:79:double min(net.minecraft.core.Direction$Axis) -> a
+    83:83:double max(net.minecraft.core.Direction$Axis) -> b
+    88:112:boolean equals(java.lang.Object) -> equals
+    117:129:int hashCode() -> hashCode
+    139:164:net.minecraft.world.phys.AABB contract(double,double,double) -> a
+    168:168:net.minecraft.world.phys.AABB expandTowards(net.minecraft.world.phys.Vec3) -> b
+    178:203:net.minecraft.world.phys.AABB expandTowards(double,double,double) -> b
+    213:220:net.minecraft.world.phys.AABB inflate(double,double,double) -> c
+    224:224:net.minecraft.world.phys.AABB inflate(double) -> g
+    228:235:net.minecraft.world.phys.AABB intersect(net.minecraft.world.phys.AABB) -> a
+    239:246:net.minecraft.world.phys.AABB minmax(net.minecraft.world.phys.AABB) -> b
+    250:278:net.minecraft.world.phys.AABB minmax(java.lang.Iterable) -> a
+    282:282:net.minecraft.world.phys.AABB move(double,double,double) -> d
+    286:286:net.minecraft.world.phys.AABB move(net.minecraft.core.BlockPos) -> a
+    290:290:net.minecraft.world.phys.AABB move(net.minecraft.world.phys.Vec3) -> c
+    295:312:double clipXCollide(net.minecraft.world.phys.AABB,double) -> a
+    317:334:double clipYCollide(net.minecraft.world.phys.AABB,double) -> b
+    339:356:double clipZCollide(net.minecraft.world.phys.AABB,double) -> c
+    360:360:boolean intersects(net.minecraft.world.phys.AABB) -> c
+    365:365:boolean intersects(double,double,double,double,double,double) -> a
+    374:374:boolean intersects(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3) -> a
+    378:378:boolean contains(net.minecraft.world.phys.Vec3) -> d
+    382:382:boolean contains(double,double,double) -> e
+    386:389:double getSize() -> a
+    393:393:double getXsize() -> b
+    397:397:double getYsize() -> c
+    401:401:double getZsize() -> d
+    413:413:net.minecraft.world.phys.AABB deflate(double,double,double) -> f
+    417:417:net.minecraft.world.phys.AABB deflate(double) -> h
+    421:432:java.util.Optional clip(net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3) -> b
+    437:453:net.minecraft.world.phys.BlockHitResult clip(java.lang.Iterable,net.minecraft.world.phys.Vec3,net.minecraft.world.phys.Vec3,net.minecraft.core.BlockPos) -> a
+    458:475:net.minecraft.core.Direction getDirection(net.minecraft.world.phys.AABB,net.minecraft.world.phys.Vec3,double[],net.minecraft.core.Direction,double,double,double) -> a
+    480:490:net.minecraft.core.Direction clipPoint(double[],net.minecraft.core.Direction,double,double,double,double,double,double,double,double,net.minecraft.core.Direction,double,double,double) -> a
+    495:495:java.lang.String toString() -> toString
+    499:499:boolean hasNaN() -> e
+    503:503:net.minecraft.world.phys.Vec3 getCenter() -> f
+    507:507:net.minecraft.world.phys.AABB ofSize(double,double,double) -> g
+net.minecraft.world.phys.BlockHitResult -> deh:
     net.minecraft.core.Direction direction -> b
     net.minecraft.core.BlockPos blockPos -> c
     boolean miss -> d
@@ -66104,23 +72603,24 @@ net.minecraft.world.phys.BlockHitResult -> cvg:
     17:18:void <init>(net.minecraft.world.phys.Vec3,net.minecraft.core.Direction,net.minecraft.core.BlockPos,boolean) -> <init>
     21:27:void <init>(boolean,net.minecraft.world.phys.Vec3,net.minecraft.core.Direction,net.minecraft.core.BlockPos,boolean) -> <init>
     30:30:net.minecraft.world.phys.BlockHitResult withDirection(net.minecraft.core.Direction) -> a
-    34:34:net.minecraft.core.BlockPos getBlockPos() -> a
-    38:38:net.minecraft.core.Direction getDirection() -> b
-    43:43:net.minecraft.world.phys.HitResult$Type getType() -> c
-    47:47:boolean isInside() -> d
-net.minecraft.world.phys.EntityHitResult -> cvh:
+    34:34:net.minecraft.world.phys.BlockHitResult withPosition(net.minecraft.core.BlockPos) -> a
+    38:38:net.minecraft.core.BlockPos getBlockPos() -> a
+    42:42:net.minecraft.core.Direction getDirection() -> b
+    47:47:net.minecraft.world.phys.HitResult$Type getType() -> c
+    51:51:boolean isInside() -> d
+net.minecraft.world.phys.EntityHitResult -> dei:
     net.minecraft.world.entity.Entity entity -> b
     9:10:void <init>(net.minecraft.world.entity.Entity) -> <init>
     13:16:void <init>(net.minecraft.world.entity.Entity,net.minecraft.world.phys.Vec3) -> <init>
     19:19:net.minecraft.world.entity.Entity getEntity() -> a
     24:24:net.minecraft.world.phys.HitResult$Type getType() -> c
-net.minecraft.world.phys.HitResult -> cvi:
+net.minecraft.world.phys.HitResult -> dej:
     net.minecraft.world.phys.Vec3 location -> a
     12:14:void <init>(net.minecraft.world.phys.Vec3) -> <init>
     17:20:double distanceTo(net.minecraft.world.entity.Entity) -> a
     net.minecraft.world.phys.HitResult$Type getType() -> c
     26:26:net.minecraft.world.phys.Vec3 getLocation() -> e
-net.minecraft.world.phys.HitResult$Type -> cvi$a:
+net.minecraft.world.phys.HitResult$Type -> dej$a:
     net.minecraft.world.phys.HitResult$Type MISS -> a
     net.minecraft.world.phys.HitResult$Type BLOCK -> b
     net.minecraft.world.phys.HitResult$Type ENTITY -> c
@@ -66129,7 +72629,7 @@ net.minecraft.world.phys.HitResult$Type -> cvi$a:
     6:6:net.minecraft.world.phys.HitResult$Type valueOf(java.lang.String) -> valueOf
     6:6:void <init>(java.lang.String,int) -> <init>
     6:7:void <clinit>() -> <clinit>
-net.minecraft.world.phys.PosAndRot -> cvj:
+net.minecraft.world.phys.PosAndRot -> dek:
     net.minecraft.world.phys.Vec3 pos -> a
     float xRot -> b
     float yRot -> c
@@ -66140,7 +72640,7 @@ net.minecraft.world.phys.PosAndRot -> cvj:
     30:39:boolean equals(java.lang.Object) -> equals
     44:44:int hashCode() -> hashCode
     49:49:java.lang.String toString() -> toString
-net.minecraft.world.phys.Vec2 -> cvk:
+net.minecraft.world.phys.Vec2 -> del:
     net.minecraft.world.phys.Vec2 ZERO -> a
     net.minecraft.world.phys.Vec2 ONE -> b
     net.minecraft.world.phys.Vec2 UNIT_X -> c
@@ -66163,58 +72663,63 @@ net.minecraft.world.phys.Vec2 -> cvk:
     58:60:float distanceToSqr(net.minecraft.world.phys.Vec2) -> d
     64:64:net.minecraft.world.phys.Vec2 negated() -> d
     7:14:void <clinit>() -> <clinit>
-net.minecraft.world.phys.Vec3 -> cvl:
+net.minecraft.world.phys.Vec3 -> dem:
     net.minecraft.world.phys.Vec3 ZERO -> a
     double x -> b
     double y -> c
     double z -> d
-    17:21:void <init>(double,double,double) -> <init>
-    24:25:void <init>(com.mojang.math.Vector3f) -> <init>
-    28:29:void <init>(net.minecraft.core.Vec3i) -> <init>
-    32:32:net.minecraft.world.phys.Vec3 vectorTo(net.minecraft.world.phys.Vec3) -> a
-    36:40:net.minecraft.world.phys.Vec3 normalize() -> d
-    44:44:double dot(net.minecraft.world.phys.Vec3) -> b
-    48:48:net.minecraft.world.phys.Vec3 cross(net.minecraft.world.phys.Vec3) -> c
-    52:52:net.minecraft.world.phys.Vec3 subtract(net.minecraft.world.phys.Vec3) -> d
-    56:56:net.minecraft.world.phys.Vec3 subtract(double,double,double) -> a
-    60:60:net.minecraft.world.phys.Vec3 add(net.minecraft.world.phys.Vec3) -> e
-    64:64:net.minecraft.world.phys.Vec3 add(double,double,double) -> b
-    68:71:double distanceTo(net.minecraft.world.phys.Vec3) -> f
-    75:78:double distanceToSqr(net.minecraft.world.phys.Vec3) -> g
-    82:85:double distanceToSqr(double,double,double) -> c
-    89:89:net.minecraft.world.phys.Vec3 scale(double) -> a
-    93:93:net.minecraft.world.phys.Vec3 reverse() -> e
-    97:97:net.minecraft.world.phys.Vec3 multiply(net.minecraft.world.phys.Vec3) -> h
-    101:101:net.minecraft.world.phys.Vec3 multiply(double,double,double) -> d
-    105:105:double length() -> f
-    109:109:double lengthSqr() -> g
-    114:129:boolean equals(java.lang.Object) -> equals
-    136:142:int hashCode() -> hashCode
-    147:147:java.lang.String toString() -> toString
-    151:151:net.minecraft.world.phys.Vec3 lerp(net.minecraft.world.phys.Vec3,double) -> a
-    155:162:net.minecraft.world.phys.Vec3 xRot(float) -> a
-    166:173:net.minecraft.world.phys.Vec3 yRot(float) -> b
-    177:184:net.minecraft.world.phys.Vec3 zRot(float) -> c
-    188:188:net.minecraft.world.phys.Vec3 directionFromRotation(net.minecraft.world.phys.Vec2) -> a
-    193:198:net.minecraft.world.phys.Vec3 directionFromRotation(float,float) -> a
-    202:205:net.minecraft.world.phys.Vec3 align(java.util.EnumSet) -> a
-    209:209:double get(net.minecraft.core.Direction$Axis) -> a
-    214:214:double x() -> a
-    219:219:double y() -> b
-    224:224:double z() -> c
+    18:21:net.minecraft.world.phys.Vec3 fromRGB24(int) -> a
+    25:25:net.minecraft.world.phys.Vec3 atCenterOf(net.minecraft.core.Vec3i) -> a
+    29:29:net.minecraft.world.phys.Vec3 atLowerCornerOf(net.minecraft.core.Vec3i) -> b
+    33:33:net.minecraft.world.phys.Vec3 atBottomCenterOf(net.minecraft.core.Vec3i) -> c
+    37:37:net.minecraft.world.phys.Vec3 upFromBottomCenterOf(net.minecraft.core.Vec3i,double) -> a
+    40:44:void <init>(double,double,double) -> <init>
+    47:48:void <init>(com.mojang.math.Vector3f) -> <init>
+    51:51:net.minecraft.world.phys.Vec3 vectorTo(net.minecraft.world.phys.Vec3) -> a
+    55:59:net.minecraft.world.phys.Vec3 normalize() -> d
+    63:63:double dot(net.minecraft.world.phys.Vec3) -> b
+    67:67:net.minecraft.world.phys.Vec3 cross(net.minecraft.world.phys.Vec3) -> c
+    71:71:net.minecraft.world.phys.Vec3 subtract(net.minecraft.world.phys.Vec3) -> d
+    75:75:net.minecraft.world.phys.Vec3 subtract(double,double,double) -> a
+    79:79:net.minecraft.world.phys.Vec3 add(net.minecraft.world.phys.Vec3) -> e
+    83:83:net.minecraft.world.phys.Vec3 add(double,double,double) -> b
+    87:87:boolean closerThan(net.minecraft.core.Position,double) -> a
+    91:94:double distanceTo(net.minecraft.world.phys.Vec3) -> f
+    98:101:double distanceToSqr(net.minecraft.world.phys.Vec3) -> g
+    105:108:double distanceToSqr(double,double,double) -> c
+    112:112:net.minecraft.world.phys.Vec3 scale(double) -> a
+    116:116:net.minecraft.world.phys.Vec3 reverse() -> e
+    120:120:net.minecraft.world.phys.Vec3 multiply(net.minecraft.world.phys.Vec3) -> h
+    124:124:net.minecraft.world.phys.Vec3 multiply(double,double,double) -> d
+    128:128:double length() -> f
+    132:132:double lengthSqr() -> g
+    137:152:boolean equals(java.lang.Object) -> equals
+    159:165:int hashCode() -> hashCode
+    170:170:java.lang.String toString() -> toString
+    174:174:net.minecraft.world.phys.Vec3 lerp(net.minecraft.world.phys.Vec3,double) -> a
+    178:185:net.minecraft.world.phys.Vec3 xRot(float) -> a
+    189:196:net.minecraft.world.phys.Vec3 yRot(float) -> b
+    200:207:net.minecraft.world.phys.Vec3 zRot(float) -> c
+    211:211:net.minecraft.world.phys.Vec3 directionFromRotation(net.minecraft.world.phys.Vec2) -> a
+    216:221:net.minecraft.world.phys.Vec3 directionFromRotation(float,float) -> a
+    225:228:net.minecraft.world.phys.Vec3 align(java.util.EnumSet) -> a
+    232:232:double get(net.minecraft.core.Direction$Axis) -> a
+    237:237:double x() -> a
+    242:242:double y() -> b
+    247:247:double z() -> c
     12:12:void <clinit>() -> <clinit>
-net.minecraft.world.phys.package-info -> cvm:
-net.minecraft.world.phys.shapes.ArrayVoxelShape -> cvn:
+net.minecraft.world.phys.package-info -> den:
+net.minecraft.world.phys.shapes.ArrayVoxelShape -> deo:
     it.unimi.dsi.fastutil.doubles.DoubleList xs -> b
     it.unimi.dsi.fastutil.doubles.DoubleList ys -> c
     it.unimi.dsi.fastutil.doubles.DoubleList zs -> d
     16:22:void <init>(net.minecraft.world.phys.shapes.DiscreteVoxelShape,double[],double[],double[]) -> <init>
     25:35:void <init>(net.minecraft.world.phys.shapes.DiscreteVoxelShape,it.unimi.dsi.fastutil.doubles.DoubleList,it.unimi.dsi.fastutil.doubles.DoubleList,it.unimi.dsi.fastutil.doubles.DoubleList) -> <init>
     39:47:it.unimi.dsi.fastutil.doubles.DoubleList getCoords(net.minecraft.core.Direction$Axis) -> a
-net.minecraft.world.phys.shapes.ArrayVoxelShape$1 -> cvn$1:
+net.minecraft.world.phys.shapes.ArrayVoxelShape$1 -> deo$1:
     int[] $SwitchMap$net$minecraft$core$Direction$Axis -> a
     39:39:void <clinit>() -> <clinit>
-net.minecraft.world.phys.shapes.BitSetDiscreteVoxelShape -> cvo:
+net.minecraft.world.phys.shapes.BitSetDiscreteVoxelShape -> dep:
     java.util.BitSet storage -> d
     int xMin -> e
     int yMin -> f
@@ -66237,7 +72742,7 @@ net.minecraft.world.phys.shapes.BitSetDiscreteVoxelShape -> cvo:
     127:151:boolean lambda$join$2(net.minecraft.world.phys.shapes.IndexMerger,net.minecraft.world.phys.shapes.IndexMerger,net.minecraft.world.phys.shapes.BooleanOp,net.minecraft.world.phys.shapes.DiscreteVoxelShape,net.minecraft.world.phys.shapes.DiscreteVoxelShape,net.minecraft.world.phys.shapes.BitSetDiscreteVoxelShape,int[],int,int,int) -> a
     129:145:boolean lambda$null$1(net.minecraft.world.phys.shapes.IndexMerger,net.minecraft.world.phys.shapes.BooleanOp,net.minecraft.world.phys.shapes.DiscreteVoxelShape,int,net.minecraft.world.phys.shapes.DiscreteVoxelShape,int,net.minecraft.world.phys.shapes.BitSetDiscreteVoxelShape,int,int[],boolean[],int,int,int) -> a
     131:138:boolean lambda$null$0(net.minecraft.world.phys.shapes.BooleanOp,net.minecraft.world.phys.shapes.DiscreteVoxelShape,int,int,net.minecraft.world.phys.shapes.DiscreteVoxelShape,int,int,net.minecraft.world.phys.shapes.BitSetDiscreteVoxelShape,int,int,int[],boolean[],int,int,int) -> a
-net.minecraft.world.phys.shapes.BooleanOp -> cvp:
+net.minecraft.world.phys.shapes.BooleanOp -> deq:
     net.minecraft.world.phys.shapes.BooleanOp FALSE -> a
     net.minecraft.world.phys.shapes.BooleanOp NOT_OR -> b
     net.minecraft.world.phys.shapes.BooleanOp ONLY_SECOND -> c
@@ -66272,22 +72777,23 @@ net.minecraft.world.phys.shapes.BooleanOp -> cvp:
     5:5:boolean lambda$static$1(boolean,boolean) -> o
     4:4:boolean lambda$static$0(boolean,boolean) -> p
     4:19:void <clinit>() -> <clinit>
-net.minecraft.world.phys.shapes.CollisionContext -> cvq:
-    9:9:net.minecraft.world.phys.shapes.CollisionContext empty() -> a
-    14:14:net.minecraft.world.phys.shapes.CollisionContext of(net.minecraft.world.entity.Entity) -> a
+net.minecraft.world.phys.shapes.CollisionContext -> der:
+    11:11:net.minecraft.world.phys.shapes.CollisionContext empty() -> a
+    16:16:net.minecraft.world.phys.shapes.CollisionContext of(net.minecraft.world.entity.Entity) -> a
     boolean isDescending() -> b
     boolean isAbove(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.core.BlockPos,boolean) -> a
     boolean isHoldingItem(net.minecraft.world.item.Item) -> a
-net.minecraft.world.phys.shapes.CubePointRange -> cvr:
+    boolean canStandOnFluid(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.material.FlowingFluid) -> a
+net.minecraft.world.phys.shapes.CubePointRange -> des:
     int parts -> a
     8:10:void <init>(int) -> <init>
     14:14:double getDouble(int) -> getDouble
     19:19:int size() -> size
-net.minecraft.world.phys.shapes.CubeVoxelShape -> cvs:
+net.minecraft.world.phys.shapes.CubeVoxelShape -> det:
     9:10:void <init>(net.minecraft.world.phys.shapes.DiscreteVoxelShape) -> <init>
     14:14:it.unimi.dsi.fastutil.doubles.DoubleList getCoords(net.minecraft.core.Direction$Axis) -> a
     19:20:int findIndex(net.minecraft.core.Direction$Axis,double) -> a
-net.minecraft.world.phys.shapes.DiscreteCubeMerger -> cvt:
+net.minecraft.world.phys.shapes.DiscreteCubeMerger -> deu:
     net.minecraft.world.phys.shapes.CubePointRange result -> a
     int firstSize -> b
     int secondSize -> c
@@ -66295,7 +72801,7 @@ net.minecraft.world.phys.shapes.DiscreteCubeMerger -> cvt:
     12:17:void <init>(int,int) -> <init>
     21:28:boolean forMergedIndexes(net.minecraft.world.phys.shapes.IndexMerger$IndexConsumer) -> a
     33:33:it.unimi.dsi.fastutil.doubles.DoubleList getList() -> a
-net.minecraft.world.phys.shapes.DiscreteVoxelShape -> cvu:
+net.minecraft.world.phys.shapes.DiscreteVoxelShape -> dev:
     net.minecraft.core.Direction$Axis[] AXIS_VALUES -> d
     int xSize -> a
     int ySize -> b
@@ -66324,48 +72830,52 @@ net.minecraft.world.phys.shapes.DiscreteVoxelShape -> cvu:
     282:285:void forAllFaces(net.minecraft.world.phys.shapes.DiscreteVoxelShape$IntFaceConsumer) -> a
     288:324:void forAllAxisFaces(net.minecraft.world.phys.shapes.DiscreteVoxelShape$IntFaceConsumer,net.minecraft.core.AxisCycle) -> a
     7:7:void <clinit>() -> <clinit>
-net.minecraft.world.phys.shapes.DiscreteVoxelShape$IntFaceConsumer -> cvu$a:
+net.minecraft.world.phys.shapes.DiscreteVoxelShape$IntFaceConsumer -> dev$a:
     void consume(net.minecraft.core.Direction,int,int,int) -> consume
-net.minecraft.world.phys.shapes.DiscreteVoxelShape$IntLineConsumer -> cvu$b:
+net.minecraft.world.phys.shapes.DiscreteVoxelShape$IntLineConsumer -> dev$b:
     void consume(int,int,int,int,int,int) -> consume
-net.minecraft.world.phys.shapes.EntityCollisionContext -> cvv:
+net.minecraft.world.phys.shapes.EntityCollisionContext -> dew:
     net.minecraft.world.phys.shapes.CollisionContext EMPTY -> a
     boolean descending -> b
     double entityBottom -> c
     net.minecraft.world.item.Item heldItem -> d
-    23:27:void <init>(boolean,double,net.minecraft.world.item.Item) -> <init>
-    32:37:void <init>(net.minecraft.world.entity.Entity) -> <init>
-    41:41:boolean isHoldingItem(net.minecraft.world.item.Item) -> a
-    46:46:boolean isDescending() -> b
-    51:51:boolean isAbove(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.core.BlockPos,boolean) -> a
-    12:12:void <clinit>() -> <clinit>
-net.minecraft.world.phys.shapes.EntityCollisionContext$1 -> cvv$1:
-    12:12:void <init>(boolean,double,net.minecraft.world.item.Item) -> <init>
-    15:15:boolean isAbove(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.core.BlockPos,boolean) -> a
-net.minecraft.world.phys.shapes.IdenticalMerger -> cvw:
+    java.util.function.Predicate canStandOnFluid -> e
+    29:34:void <init>(boolean,double,net.minecraft.world.item.Item,java.util.function.Predicate) -> <init>
+    39:45:void <init>(net.minecraft.world.entity.Entity) -> <init>
+    49:49:boolean isHoldingItem(net.minecraft.world.item.Item) -> a
+    54:54:boolean canStandOnFluid(net.minecraft.world.level.material.FluidState,net.minecraft.world.level.material.FlowingFluid) -> a
+    59:59:boolean isDescending() -> b
+    64:64:boolean isAbove(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.core.BlockPos,boolean) -> a
+    43:43:boolean lambda$new$1(net.minecraft.world.level.material.Fluid) -> a
+    17:17:boolean lambda$static$0(net.minecraft.world.level.material.Fluid) -> b
+    17:17:void <clinit>() -> <clinit>
+net.minecraft.world.phys.shapes.EntityCollisionContext$1 -> dew$1:
+    17:17:void <init>(boolean,double,net.minecraft.world.item.Item,java.util.function.Predicate) -> <init>
+    20:20:boolean isAbove(net.minecraft.world.phys.shapes.VoxelShape,net.minecraft.core.BlockPos,boolean) -> a
+net.minecraft.world.phys.shapes.IdenticalMerger -> dex:
     it.unimi.dsi.fastutil.doubles.DoubleList coords -> a
     8:10:void <init>(it.unimi.dsi.fastutil.doubles.DoubleList) -> <init>
     14:19:boolean forMergedIndexes(net.minecraft.world.phys.shapes.IndexMerger$IndexConsumer) -> a
     24:24:it.unimi.dsi.fastutil.doubles.DoubleList getList() -> a
-net.minecraft.world.phys.shapes.IndexMerger -> cvx:
+net.minecraft.world.phys.shapes.IndexMerger -> dey:
     it.unimi.dsi.fastutil.doubles.DoubleList getList() -> a
     boolean forMergedIndexes(net.minecraft.world.phys.shapes.IndexMerger$IndexConsumer) -> a
-net.minecraft.world.phys.shapes.IndexMerger$IndexConsumer -> cvx$a:
+net.minecraft.world.phys.shapes.IndexMerger$IndexConsumer -> dey$a:
     boolean merge(int,int,int) -> merge
-net.minecraft.world.phys.shapes.IndirectMerger -> cvy:
+net.minecraft.world.phys.shapes.IndirectMerger -> dez:
     it.unimi.dsi.fastutil.doubles.DoubleArrayList result -> a
     it.unimi.dsi.fastutil.ints.IntArrayList firstIndices -> b
     it.unimi.dsi.fastutil.ints.IntArrayList secondIndices -> c
     12:52:void <init>(it.unimi.dsi.fastutil.doubles.DoubleList,it.unimi.dsi.fastutil.doubles.DoubleList,boolean,boolean) -> <init>
     56:61:boolean forMergedIndexes(net.minecraft.world.phys.shapes.IndexMerger$IndexConsumer) -> a
     66:66:it.unimi.dsi.fastutil.doubles.DoubleList getList() -> a
-net.minecraft.world.phys.shapes.IntPointRange -> cvz:
+net.minecraft.world.phys.shapes.IntPointRange -> dfa:
     int parts -> a
     int origin -> b
     9:12:void <init>(int,int) -> <init>
     16:16:double getDouble(int) -> getDouble
     21:21:int size() -> size
-net.minecraft.world.phys.shapes.NonOverlappingMerger -> cwa:
+net.minecraft.world.phys.shapes.NonOverlappingMerger -> dfb:
     it.unimi.dsi.fastutil.doubles.DoubleList lower -> a
     it.unimi.dsi.fastutil.doubles.DoubleList upper -> b
     boolean swap -> c
@@ -66376,13 +72886,13 @@ net.minecraft.world.phys.shapes.NonOverlappingMerger -> cwa:
     52:55:double getDouble(int) -> getDouble
     61:61:it.unimi.dsi.fastutil.doubles.DoubleList getList() -> a
     25:25:boolean lambda$forMergedIndexes$0(net.minecraft.world.phys.shapes.IndexMerger$IndexConsumer,int,int,int) -> a
-net.minecraft.world.phys.shapes.OffsetDoubleList -> cwb:
+net.minecraft.world.phys.shapes.OffsetDoubleList -> dfc:
     it.unimi.dsi.fastutil.doubles.DoubleList delegate -> a
     double offset -> b
     10:13:void <init>(it.unimi.dsi.fastutil.doubles.DoubleList,double) -> <init>
     17:17:double getDouble(int) -> getDouble
     22:22:int size() -> size
-net.minecraft.world.phys.shapes.Shapes -> cwc:
+net.minecraft.world.phys.shapes.Shapes -> dfd:
     net.minecraft.world.phys.shapes.VoxelShape BLOCK -> b
     net.minecraft.world.phys.shapes.VoxelShape INFINITY -> a
     net.minecraft.world.phys.shapes.VoxelShape EMPTY -> c
@@ -66414,9 +72924,9 @@ net.minecraft.world.phys.shapes.Shapes -> cwc:
     189:189:boolean lambda$null$1(net.minecraft.world.phys.shapes.BooleanOp,net.minecraft.world.phys.shapes.DiscreteVoxelShape,int,int,net.minecraft.world.phys.shapes.DiscreteVoxelShape,int,int,int,int,int) -> a
     27:29:net.minecraft.world.phys.shapes.CubeVoxelShape lambda$static$0() -> c
     26:37:void <clinit>() -> <clinit>
-net.minecraft.world.phys.shapes.Shapes$DoubleLineConsumer -> cwc$a:
+net.minecraft.world.phys.shapes.Shapes$DoubleLineConsumer -> dfd$a:
     void consume(double,double,double,double,double,double) -> consume
-net.minecraft.world.phys.shapes.SliceShape -> cwd:
+net.minecraft.world.phys.shapes.SliceShape -> dfe:
     net.minecraft.world.phys.shapes.VoxelShape delegate -> b
     net.minecraft.core.Direction$Axis axis -> c
     it.unimi.dsi.fastutil.doubles.DoubleList SLICE_COORDS -> d
@@ -66424,7 +72934,7 @@ net.minecraft.world.phys.shapes.SliceShape -> cwd:
     18:24:net.minecraft.world.phys.shapes.DiscreteVoxelShape makeSlice(net.minecraft.world.phys.shapes.DiscreteVoxelShape,net.minecraft.core.Direction$Axis,int) -> a
     30:33:it.unimi.dsi.fastutil.doubles.DoubleList getCoords(net.minecraft.core.Direction$Axis) -> a
     9:9:void <clinit>() -> <clinit>
-net.minecraft.world.phys.shapes.SubShape -> cwe:
+net.minecraft.world.phys.shapes.SubShape -> dff:
     net.minecraft.world.phys.shapes.DiscreteVoxelShape parent -> d
     int startX -> e
     int startY -> f
@@ -66437,7 +72947,7 @@ net.minecraft.world.phys.shapes.SubShape -> cwe:
     32:33:void setFull(int,int,int,boolean,boolean) -> a
     37:37:int firstFull(net.minecraft.core.Direction$Axis) -> a
     42:42:int lastFull(net.minecraft.core.Direction$Axis) -> b
-net.minecraft.world.phys.shapes.VoxelShape -> cwf:
+net.minecraft.world.phys.shapes.VoxelShape -> dfg:
     net.minecraft.world.phys.shapes.DiscreteVoxelShape shape -> a
     net.minecraft.world.phys.shapes.VoxelShape[] faces -> b
     24:26:void <init>(net.minecraft.world.phys.shapes.DiscreteVoxelShape) -> <init>
@@ -66467,30 +72977,32 @@ net.minecraft.world.phys.shapes.VoxelShape -> cwf:
     92:92:void lambda$forAllBoxes$2(net.minecraft.world.phys.shapes.Shapes$DoubleLineConsumer,it.unimi.dsi.fastutil.doubles.DoubleList,it.unimi.dsi.fastutil.doubles.DoubleList,it.unimi.dsi.fastutil.doubles.DoubleList,int,int,int,int,int,int) -> a
     84:84:void lambda$forAllEdges$1(net.minecraft.world.phys.shapes.Shapes$DoubleLineConsumer,int,int,int,int,int,int) -> a
     78:79:void lambda$optimize$0(net.minecraft.world.phys.shapes.VoxelShape[],double,double,double,double,double,double) -> a
-net.minecraft.world.phys.shapes.WorldRegionIndirectVoxelShape -> cwg:
+net.minecraft.world.phys.shapes.WorldRegionIndirectVoxelShape -> dfh:
     int x -> b
     int y -> c
     int z -> d
     12:16:void <init>(net.minecraft.world.phys.shapes.DiscreteVoxelShape,int,int,int) -> <init>
     20:20:it.unimi.dsi.fastutil.doubles.DoubleList getCoords(net.minecraft.core.Direction$Axis) -> a
-net.minecraft.world.phys.shapes.package-info -> cwh:
-net.minecraft.world.scores.Objective -> cwi:
+net.minecraft.world.phys.shapes.package-info -> dfi:
+net.minecraft.world.scores.Objective -> dfj:
     net.minecraft.world.scores.Scoreboard scoreboard -> a
     java.lang.String name -> b
     net.minecraft.world.scores.criteria.ObjectiveCriteria criteria -> c
     net.minecraft.network.chat.Component displayName -> d
-    net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType renderType -> e
-    18:24:void <init>(net.minecraft.world.scores.Scoreboard,java.lang.String,net.minecraft.world.scores.criteria.ObjectiveCriteria,net.minecraft.network.chat.Component,net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType) -> <init>
-    27:27:net.minecraft.world.scores.Scoreboard getScoreboard() -> a
-    31:31:java.lang.String getName() -> b
-    35:35:net.minecraft.world.scores.criteria.ObjectiveCriteria getCriteria() -> c
-    39:39:net.minecraft.network.chat.Component getDisplayName() -> d
-    43:44:net.minecraft.network.chat.Component getFormattedDisplayName() -> e
-    49:51:void setDisplayName(net.minecraft.network.chat.Component) -> a
-    54:54:net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType getRenderType() -> f
-    58:60:void setRenderType(net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType) -> a
-    44:44:void lambda$getFormattedDisplayName$0(net.minecraft.network.chat.Style) -> a
-net.minecraft.world.scores.PlayerTeam -> cwj:
+    net.minecraft.network.chat.Component formattedDisplayName -> e
+    net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType renderType -> f
+    19:26:void <init>(net.minecraft.world.scores.Scoreboard,java.lang.String,net.minecraft.world.scores.criteria.ObjectiveCriteria,net.minecraft.network.chat.Component,net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType) -> <init>
+    29:29:net.minecraft.world.scores.Scoreboard getScoreboard() -> a
+    33:33:java.lang.String getName() -> b
+    37:37:net.minecraft.world.scores.criteria.ObjectiveCriteria getCriteria() -> c
+    41:41:net.minecraft.network.chat.Component getDisplayName() -> d
+    45:46:net.minecraft.network.chat.Component createFormattedDisplayName() -> g
+    51:51:net.minecraft.network.chat.Component getFormattedDisplayName() -> e
+    55:58:void setDisplayName(net.minecraft.network.chat.Component) -> a
+    61:61:net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType getRenderType() -> f
+    65:67:void setRenderType(net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType) -> a
+    46:46:net.minecraft.network.chat.Style lambda$createFormattedDisplayName$0(net.minecraft.network.chat.Style) -> a
+net.minecraft.world.scores.PlayerTeam -> dfk:
     net.minecraft.world.scores.Scoreboard scoreboard -> a
     java.lang.String name -> b
     java.util.Set players -> c
@@ -66503,35 +73015,35 @@ net.minecraft.world.scores.PlayerTeam -> cwj:
     net.minecraft.world.scores.Team$Visibility deathMessageVisibility -> j
     net.minecraft.ChatFormatting color -> k
     net.minecraft.world.scores.Team$CollisionRule collisionRule -> l
-    22:37:void <init>(net.minecraft.world.scores.Scoreboard,java.lang.String) -> <init>
-    40:40:net.minecraft.world.scores.Scoreboard getScoreboard() -> a
-    45:45:java.lang.String getName() -> b
-    49:49:net.minecraft.network.chat.Component getDisplayName() -> c
-    53:63:net.minecraft.network.chat.Component getFormattedDisplayName() -> d
-    67:72:void setDisplayName(net.minecraft.network.chat.Component) -> a
-    75:77:void setPlayerPrefix(net.minecraft.network.chat.Component) -> b
-    80:80:net.minecraft.network.chat.Component getPlayerPrefix() -> e
-    84:86:void setPlayerSuffix(net.minecraft.network.chat.Component) -> c
-    89:89:net.minecraft.network.chat.Component getPlayerSuffix() -> f
-    94:94:java.util.Collection getPlayers() -> g
-    99:106:net.minecraft.network.chat.Component getFormattedName(net.minecraft.network.chat.Component) -> d
-    110:113:net.minecraft.network.chat.Component formatNameForTeam(net.minecraft.world.scores.Team,net.minecraft.network.chat.Component) -> a
-    118:118:boolean isAllowFriendlyFire() -> h
-    122:124:void setAllowFriendlyFire(boolean) -> a
-    128:128:boolean canSeeFriendlyInvisibles() -> i
-    132:134:void setSeeFriendlyInvisibles(boolean) -> b
-    138:138:net.minecraft.world.scores.Team$Visibility getNameTagVisibility() -> j
-    143:143:net.minecraft.world.scores.Team$Visibility getDeathMessageVisibility() -> k
-    147:149:void setNameTagVisibility(net.minecraft.world.scores.Team$Visibility) -> a
-    152:154:void setDeathMessageVisibility(net.minecraft.world.scores.Team$Visibility) -> b
-    158:158:net.minecraft.world.scores.Team$CollisionRule getCollisionRule() -> l
-    162:164:void setCollisionRule(net.minecraft.world.scores.Team$CollisionRule) -> a
-    167:176:int packOptions() -> m
-    180:182:void unpackOptions(int) -> a
-    185:187:void setColor(net.minecraft.ChatFormatting) -> a
-    191:191:net.minecraft.ChatFormatting getColor() -> n
-    53:55:void lambda$getFormattedDisplayName$0(net.minecraft.network.chat.Style) -> a
-net.minecraft.world.scores.Score -> cwk:
+    net.minecraft.network.chat.Style displayNameStyle -> m
+    24:44:void <init>(net.minecraft.world.scores.Scoreboard,java.lang.String) -> <init>
+    47:47:net.minecraft.world.scores.Scoreboard getScoreboard() -> a
+    52:52:java.lang.String getName() -> b
+    56:56:net.minecraft.network.chat.Component getDisplayName() -> c
+    60:67:net.minecraft.network.chat.MutableComponent getFormattedDisplayName() -> d
+    71:76:void setDisplayName(net.minecraft.network.chat.Component) -> a
+    79:81:void setPlayerPrefix(net.minecraft.network.chat.Component) -> b
+    84:84:net.minecraft.network.chat.Component getPlayerPrefix() -> e
+    88:90:void setPlayerSuffix(net.minecraft.network.chat.Component) -> c
+    93:93:net.minecraft.network.chat.Component getPlayerSuffix() -> f
+    98:98:java.util.Collection getPlayers() -> g
+    103:110:net.minecraft.network.chat.MutableComponent getFormattedName(net.minecraft.network.chat.Component) -> d
+    114:117:net.minecraft.network.chat.MutableComponent formatNameForTeam(net.minecraft.world.scores.Team,net.minecraft.network.chat.Component) -> a
+    122:122:boolean isAllowFriendlyFire() -> h
+    126:128:void setAllowFriendlyFire(boolean) -> a
+    132:132:boolean canSeeFriendlyInvisibles() -> i
+    136:138:void setSeeFriendlyInvisibles(boolean) -> b
+    142:142:net.minecraft.world.scores.Team$Visibility getNameTagVisibility() -> j
+    147:147:net.minecraft.world.scores.Team$Visibility getDeathMessageVisibility() -> k
+    151:153:void setNameTagVisibility(net.minecraft.world.scores.Team$Visibility) -> a
+    156:158:void setDeathMessageVisibility(net.minecraft.world.scores.Team$Visibility) -> b
+    162:162:net.minecraft.world.scores.Team$CollisionRule getCollisionRule() -> l
+    166:168:void setCollisionRule(net.minecraft.world.scores.Team$CollisionRule) -> a
+    171:180:int packOptions() -> m
+    184:186:void unpackOptions(int) -> a
+    189:191:void setColor(net.minecraft.ChatFormatting) -> a
+    195:195:net.minecraft.ChatFormatting getColor() -> n
+net.minecraft.world.scores.Score -> dfl:
     java.util.Comparator SCORE_COMPARATOR -> a
     net.minecraft.world.scores.Scoreboard scoreboard -> b
     net.minecraft.world.scores.Objective objective -> c
@@ -66553,7 +73065,7 @@ net.minecraft.world.scores.Score -> cwk:
     83:84:void setLocked(boolean) -> a
     8:13:int lambda$static$0(net.minecraft.world.scores.Score,net.minecraft.world.scores.Score) -> a
     7:7:void <clinit>() -> <clinit>
-net.minecraft.world.scores.Scoreboard -> cwl:
+net.minecraft.world.scores.Scoreboard -> dfm:
     java.util.Map objectivesByName -> a
     java.util.Map objectivesByCriteria -> b
     java.util.Map playerScores -> c
@@ -66609,7 +73121,7 @@ net.minecraft.world.scores.Scoreboard -> cwl:
     82:82:java.util.Map lambda$getOrCreatePlayerScore$2(java.lang.String) -> k
     66:66:void lambda$forAllObjectives$1(java.util.function.Consumer,java.lang.String,net.minecraft.world.scores.Objective) -> a
     59:59:java.util.List lambda$addObjective$0(net.minecraft.world.scores.criteria.ObjectiveCriteria) -> a
-net.minecraft.world.scores.ScoreboardSaveData -> cwm:
+net.minecraft.world.scores.ScoreboardSaveData -> dfn:
     org.apache.logging.log4j.Logger LOGGER -> a
     net.minecraft.world.scores.Scoreboard scoreboard -> b
     net.minecraft.nbt.CompoundTag delayLoad -> c
@@ -66626,11 +73138,11 @@ net.minecraft.world.scores.ScoreboardSaveData -> cwm:
     213:229:net.minecraft.nbt.ListTag saveObjectives() -> e
     132:140:void lambda$loadObjectives$0(net.minecraft.nbt.CompoundTag,net.minecraft.world.scores.criteria.ObjectiveCriteria) -> a
     17:17:void <clinit>() -> <clinit>
-net.minecraft.world.scores.Team -> cwn:
-    13:13:void <init>() -> <init>
-    15:21:boolean isAlliedTo(net.minecraft.world.scores.Team) -> a
+net.minecraft.world.scores.Team -> dfo:
+    14:14:void <init>() -> <init>
+    16:22:boolean isAlliedTo(net.minecraft.world.scores.Team) -> a
     java.lang.String getName() -> b
-    net.minecraft.network.chat.Component getFormattedName(net.minecraft.network.chat.Component) -> d
+    net.minecraft.network.chat.MutableComponent getFormattedName(net.minecraft.network.chat.Component) -> d
     boolean canSeeFriendlyInvisibles() -> i
     boolean isAllowFriendlyFire() -> h
     net.minecraft.world.scores.Team$Visibility getNameTagVisibility() -> j
@@ -66638,7 +73150,7 @@ net.minecraft.world.scores.Team -> cwn:
     java.util.Collection getPlayers() -> g
     net.minecraft.world.scores.Team$Visibility getDeathMessageVisibility() -> k
     net.minecraft.world.scores.Team$CollisionRule getCollisionRule() -> l
-net.minecraft.world.scores.Team$CollisionRule -> cwn$a:
+net.minecraft.world.scores.Team$CollisionRule -> dfo$a:
     net.minecraft.world.scores.Team$CollisionRule ALWAYS -> a
     net.minecraft.world.scores.Team$CollisionRule NEVER -> b
     net.minecraft.world.scores.Team$CollisionRule PUSH_OTHER_TEAMS -> c
@@ -66647,16 +73159,16 @@ net.minecraft.world.scores.Team$CollisionRule -> cwn$a:
     java.lang.String name -> e
     int id -> f
     net.minecraft.world.scores.Team$CollisionRule[] $VALUES -> h
-    72:72:net.minecraft.world.scores.Team$CollisionRule[] values() -> values
-    72:72:net.minecraft.world.scores.Team$CollisionRule valueOf(java.lang.String) -> valueOf
-    81:81:java.lang.String[] getAllNames() -> a
-    86:86:net.minecraft.world.scores.Team$CollisionRule byName(java.lang.String) -> a
-    92:95:void <init>(java.lang.String,int,java.lang.String,int) -> <init>
-    98:98:net.minecraft.network.chat.Component getDisplayName() -> b
-    78:78:net.minecraft.world.scores.Team$CollisionRule lambda$static$1(net.minecraft.world.scores.Team$CollisionRule) -> a
-    78:78:java.lang.String lambda$static$0(net.minecraft.world.scores.Team$CollisionRule) -> b
-    72:78:void <clinit>() -> <clinit>
-net.minecraft.world.scores.Team$Visibility -> cwn$b:
+    73:73:net.minecraft.world.scores.Team$CollisionRule[] values() -> values
+    73:73:net.minecraft.world.scores.Team$CollisionRule valueOf(java.lang.String) -> valueOf
+    82:82:java.lang.String[] getAllNames() -> a
+    87:87:net.minecraft.world.scores.Team$CollisionRule byName(java.lang.String) -> a
+    93:96:void <init>(java.lang.String,int,java.lang.String,int) -> <init>
+    99:99:net.minecraft.network.chat.Component getDisplayName() -> b
+    79:79:net.minecraft.world.scores.Team$CollisionRule lambda$static$1(net.minecraft.world.scores.Team$CollisionRule) -> a
+    79:79:java.lang.String lambda$static$0(net.minecraft.world.scores.Team$CollisionRule) -> b
+    73:79:void <clinit>() -> <clinit>
+net.minecraft.world.scores.Team$Visibility -> dfo$b:
     net.minecraft.world.scores.Team$Visibility ALWAYS -> a
     net.minecraft.world.scores.Team$Visibility NEVER -> b
     net.minecraft.world.scores.Team$Visibility HIDE_FOR_OTHER_TEAMS -> c
@@ -66665,16 +73177,16 @@ net.minecraft.world.scores.Team$Visibility -> cwn$b:
     java.lang.String name -> e
     int id -> f
     net.minecraft.world.scores.Team$Visibility[] $VALUES -> h
-    42:42:net.minecraft.world.scores.Team$Visibility[] values() -> values
-    42:42:net.minecraft.world.scores.Team$Visibility valueOf(java.lang.String) -> valueOf
-    51:51:java.lang.String[] getAllNames() -> a
-    56:56:net.minecraft.world.scores.Team$Visibility byName(java.lang.String) -> a
-    62:65:void <init>(java.lang.String,int,java.lang.String,int) -> <init>
-    68:68:net.minecraft.network.chat.Component getDisplayName() -> b
-    48:48:net.minecraft.world.scores.Team$Visibility lambda$static$1(net.minecraft.world.scores.Team$Visibility) -> a
-    48:48:java.lang.String lambda$static$0(net.minecraft.world.scores.Team$Visibility) -> b
-    42:48:void <clinit>() -> <clinit>
-net.minecraft.world.scores.criteria.ObjectiveCriteria -> cwo:
+    43:43:net.minecraft.world.scores.Team$Visibility[] values() -> values
+    43:43:net.minecraft.world.scores.Team$Visibility valueOf(java.lang.String) -> valueOf
+    52:52:java.lang.String[] getAllNames() -> a
+    57:57:net.minecraft.world.scores.Team$Visibility byName(java.lang.String) -> a
+    63:66:void <init>(java.lang.String,int,java.lang.String,int) -> <init>
+    69:69:net.minecraft.network.chat.Component getDisplayName() -> b
+    49:49:net.minecraft.world.scores.Team$Visibility lambda$static$1(net.minecraft.world.scores.Team$Visibility) -> a
+    49:49:java.lang.String lambda$static$0(net.minecraft.world.scores.Team$Visibility) -> b
+    43:49:void <clinit>() -> <clinit>
+net.minecraft.world.scores.criteria.ObjectiveCriteria -> dfp:
     java.util.Map CRITERIA_BY_NAME -> a
     net.minecraft.world.scores.criteria.ObjectiveCriteria DUMMY -> b
     net.minecraft.world.scores.criteria.ObjectiveCriteria TRIGGER -> c
@@ -66701,7 +73213,7 @@ net.minecraft.world.scores.criteria.ObjectiveCriteria -> cwo:
     87:87:net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType getDefaultRenderType() -> e
     71:71:java.util.Optional lambda$byName$0(java.lang.String,int,net.minecraft.stats.StatType) -> a
     14:44:void <clinit>() -> <clinit>
-net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType -> cwo$a:
+net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType -> dfp$a:
     net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType INTEGER -> a
     net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType HEARTS -> b
     java.lang.String id -> c
@@ -66713,5 +73225,5 @@ net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType -> cwo$a:
     102:102:java.lang.String getId() -> a
     116:116:net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType byId(java.lang.String) -> a
     90:113:void <clinit>() -> <clinit>
-net.minecraft.world.scores.criteria.package-info -> cwp:
-net.minecraft.world.scores.package-info -> cwq:
+net.minecraft.world.scores.criteria.package-info -> dfq:
+net.minecraft.world.scores.package-info -> dfr:
diff --git a/src/com/mojang/blaze3d/audio/Channel.java b/src/com/mojang/blaze3d/audio/Channel.java
index f5224c1..fdf1ba2 100644
--- a/src/com/mojang/blaze3d/audio/Channel.java
+++ b/src/com/mojang/blaze3d/audio/Channel.java
@@ -88,8 +88,8 @@ public class Channel {
         return this.getState() == 4116;
     }
     
-    public void setSelfPosition(final Vec3 cvl) {
-        AL10.alSourcefv(this.source, 4100, new float[] { (float)cvl.x, (float)cvl.y, (float)cvl.z });
+    public void setSelfPosition(final Vec3 dem) {
+        AL10.alSourcefv(this.source, 4100, new float[] { (float)dem.x, (float)dem.y, (float)dem.z });
     }
     
     public void setPitch(final float float1) {
@@ -119,13 +119,13 @@ public class Channel {
         AL10.alSourcei(this.source, 514, (int)(boolean1 ? 1 : 0));
     }
     
-    public void attachStaticBuffer(final SoundBuffer cwx) {
-        cwx.getAlBuffer().ifPresent(integer -> AL10.alSourcei(this.source, 4105, integer));
+    public void attachStaticBuffer(final SoundBuffer dfy) {
+        dfy.getAlBuffer().ifPresent(integer -> AL10.alSourcei(this.source, 4105, integer));
     }
     
-    public void attachBufferStream(final AudioStream eds) {
-        this.stream = eds;
-        final AudioFormat audioFormat3 = eds.getFormat();
+    public void attachBufferStream(final AudioStream epf) {
+        this.stream = epf;
+        final AudioFormat audioFormat3 = epf.getFormat();
         this.streamingBufferSize = calculateBufferSize(audioFormat3, 1);
         this.pumpBuffers(4);
     }
diff --git a/src/com/mojang/blaze3d/audio/Library.java b/src/com/mojang/blaze3d/audio/Library.java
index 0e0fec8..315f096 100644
--- a/src/com/mojang/blaze3d/audio/Library.java
+++ b/src/com/mojang/blaze3d/audio/Library.java
@@ -113,8 +113,8 @@ public class Library {
         return ((c == Pool.STREAMING) ? this.streamingChannels : this.staticChannels).acquire();
     }
     
-    public void releaseChannel(final Channel cws) {
-        if (!this.staticChannels.release(cws) && !this.streamingChannels.release(cws)) {
+    public void releaseChannel(final Channel dft) {
+        if (!this.staticChannels.release(dft) && !this.streamingChannels.release(dft)) {
             throw new IllegalStateException("Tried to release unknown channel");
         }
     }
@@ -133,7 +133,7 @@ public class Library {
             }
             
             @Override
-            public boolean release(final Channel cws) {
+            public boolean release(final Channel dft) {
                 return false;
             }
             
@@ -171,21 +171,22 @@ public class Library {
         @Override
         public Channel acquire() {
             if (this.activeChannels.size() >= this.limit) {
+                Library.LOGGER.warn("Maximum sound pool size {} reached", this.limit);
                 return null;
             }
-            final Channel cws2 = Channel.create();
-            if (cws2 != null) {
-                this.activeChannels.add(cws2);
+            final Channel dft2 = Channel.create();
+            if (dft2 != null) {
+                this.activeChannels.add(dft2);
             }
-            return cws2;
+            return dft2;
         }
         
         @Override
-        public boolean release(final Channel cws) {
-            if (!this.activeChannels.remove(cws)) {
+        public boolean release(final Channel dft) {
+            if (!this.activeChannels.remove(dft)) {
                 return false;
             }
-            cws.destroy();
+            dft.destroy();
             return true;
         }
         
@@ -210,7 +211,7 @@ public class Library {
         @Nullable
         Channel acquire();
         
-        boolean release(final Channel cws);
+        boolean release(final Channel dft);
         
         void cleanup();
         
diff --git a/src/com/mojang/blaze3d/audio/Listener.java b/src/com/mojang/blaze3d/audio/Listener.java
index 24e86a4..6778293 100644
--- a/src/com/mojang/blaze3d/audio/Listener.java
+++ b/src/com/mojang/blaze3d/audio/Listener.java
@@ -6,17 +6,24 @@ import net.minecraft.world.phys.Vec3;
 
 public class Listener {
     private float gain;
+    private Vec3 position;
     
     public Listener() {
         this.gain = 1.0f;
+        this.position = Vec3.ZERO;
     }
     
-    public void setListenerPosition(final Vec3 cvl) {
-        AL10.alListener3f(4100, (float)cvl.x, (float)cvl.y, (float)cvl.z);
+    public void setListenerPosition(final Vec3 dem) {
+        this.position = dem;
+        AL10.alListener3f(4100, (float)dem.x, (float)dem.y, (float)dem.z);
     }
     
-    public void setListenerOrientation(final Vector3f e1, final Vector3f e2) {
-        AL10.alListenerfv(4111, new float[] { e1.x(), e1.y(), e1.z(), e2.x(), e2.y(), e2.z() });
+    public Vec3 getListenerPosition() {
+        return this.position;
+    }
+    
+    public void setListenerOrientation(final Vector3f g1, final Vector3f g2) {
+        AL10.alListenerfv(4111, new float[] { g1.x(), g1.y(), g1.z(), g2.x(), g2.y(), g2.z() });
     }
     
     public void setGain(final float float1) {
diff --git a/src/com/mojang/blaze3d/audio/OggAudioStream.java b/src/com/mojang/blaze3d/audio/OggAudioStream.java
index 4ba4e87..478e0b5 100644
--- a/src/com/mojang/blaze3d/audio/OggAudioStream.java
+++ b/src/com/mojang/blaze3d/audio/OggAudioStream.java
@@ -5,7 +5,6 @@ import net.minecraft.util.Mth;
 import org.lwjgl.BufferUtils;
 import com.google.common.collect.Lists;
 import java.util.List;
-import javax.annotation.Nullable;
 import java.nio.FloatBuffer;
 import org.lwjgl.PointerBuffer;
 import java.nio.Buffer;
@@ -166,7 +165,6 @@ public class OggAudioStream implements AudioStream {
         return this.audioFormat;
     }
     
-    @Nullable
     @Override
     public ByteBuffer read(final int integer) throws IOException {
         final OutputConcat a3 = new OutputConcat(integer + 8192);
@@ -174,7 +172,6 @@ public class OggAudioStream implements AudioStream {
         return a3.get();
     }
     
-    @Override
     public ByteBuffer readAll() throws IOException {
         final OutputConcat a2 = new OutputConcat(16384);
         while (this.readFrame(a2)) {}
diff --git a/src/com/mojang/blaze3d/font/GlyphProvider.java b/src/com/mojang/blaze3d/font/GlyphProvider.java
index 35632a6..51b1e96 100644
--- a/src/com/mojang/blaze3d/font/GlyphProvider.java
+++ b/src/com/mojang/blaze3d/font/GlyphProvider.java
@@ -1,5 +1,6 @@
 package com.mojang.blaze3d.font;
 
+import it.unimi.dsi.fastutil.ints.IntSet;
 import javax.annotation.Nullable;
 import java.io.Closeable;
 
@@ -8,7 +9,9 @@ public interface GlyphProvider extends Closeable {
     }
     
     @Nullable
-    default RawGlyph getGlyph(final char character) {
+    default RawGlyph getGlyph(final int integer) {
         return null;
     }
+    
+    IntSet getSupportedGlyphs();
 }
diff --git a/src/com/mojang/blaze3d/font/TrueTypeGlyphProvider.java b/src/com/mojang/blaze3d/font/TrueTypeGlyphProvider.java
index bc957c4..8388ae1 100644
--- a/src/com/mojang/blaze3d/font/TrueTypeGlyphProvider.java
+++ b/src/com/mojang/blaze3d/font/TrueTypeGlyphProvider.java
@@ -1,14 +1,18 @@
 package com.mojang.blaze3d.font;
 
 import com.mojang.blaze3d.platform.NativeImage;
+import java.util.function.Supplier;
+import it.unimi.dsi.fastutil.ints.IntCollection;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import java.util.stream.IntStream;
 import java.nio.Buffer;
 import org.lwjgl.system.MemoryUtil;
 import javax.annotation.Nullable;
 import java.nio.IntBuffer;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.stb.STBTruetype;
-import it.unimi.dsi.fastutil.chars.CharArraySet;
-import it.unimi.dsi.fastutil.chars.CharSet;
+import it.unimi.dsi.fastutil.ints.IntArraySet;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import org.lwjgl.stb.STBTTFontinfo;
 import java.nio.ByteBuffer;
 
@@ -16,18 +20,18 @@ public class TrueTypeGlyphProvider implements GlyphProvider {
     private final ByteBuffer fontMemory;
     private final STBTTFontinfo font;
     private final float oversample;
-    private final CharSet skip;
+    private final IntSet skip;
     private final float shiftX;
     private final float shiftY;
     private final float pointScale;
     private final float ascent;
     
     public TrueTypeGlyphProvider(final ByteBuffer byteBuffer, final STBTTFontinfo sTBTTFontinfo, final float float3, final float float4, final float float5, final float float6, final String string) {
-        this.skip = (CharSet)new CharArraySet();
+        this.skip = (IntSet)new IntArraySet();
         this.fontMemory = byteBuffer;
         this.font = sTBTTFontinfo;
         this.oversample = float4;
-        string.chars().forEach(integer -> this.skip.add((char)(integer & 0xFFFF)));
+        string.codePoints().forEach(this.skip::add);
         this.shiftX = float5 * float4;
         this.shiftY = float6 * float4;
         this.pointScale = STBTruetype.stbtt_ScaleForPixelHeight(sTBTTFontinfo, float3 * float4);
@@ -42,8 +46,8 @@ public class TrueTypeGlyphProvider implements GlyphProvider {
     
     @Nullable
     @Override
-    public Glyph getGlyph(final char character) {
-        if (this.skip.contains(character)) {
+    public Glyph getGlyph(final int integer) {
+        if (this.skip.contains(integer)) {
             return null;
         }
         try (final MemoryStack memoryStack3 = MemoryStack.stackPush()) {
@@ -51,20 +55,20 @@ public class TrueTypeGlyphProvider implements GlyphProvider {
             final IntBuffer intBuffer6 = memoryStack3.mallocInt(1);
             final IntBuffer intBuffer7 = memoryStack3.mallocInt(1);
             final IntBuffer intBuffer8 = memoryStack3.mallocInt(1);
-            final int integer9 = STBTruetype.stbtt_FindGlyphIndex(this.font, (int)character);
-            if (integer9 == 0) {
+            final int integer2 = STBTruetype.stbtt_FindGlyphIndex(this.font, integer);
+            if (integer2 == 0) {
                 return null;
             }
-            STBTruetype.stbtt_GetGlyphBitmapBoxSubpixel(this.font, integer9, this.pointScale, this.pointScale, this.shiftX, this.shiftY, intBuffer5, intBuffer6, intBuffer7, intBuffer8);
-            final int integer10 = intBuffer7.get(0) - intBuffer5.get(0);
-            final int integer11 = intBuffer8.get(0) - intBuffer6.get(0);
-            if (integer10 == 0 || integer11 == 0) {
+            STBTruetype.stbtt_GetGlyphBitmapBoxSubpixel(this.font, integer2, this.pointScale, this.pointScale, this.shiftX, this.shiftY, intBuffer5, intBuffer6, intBuffer7, intBuffer8);
+            final int integer3 = intBuffer7.get(0) - intBuffer5.get(0);
+            final int integer4 = intBuffer8.get(0) - intBuffer6.get(0);
+            if (integer3 == 0 || integer4 == 0) {
                 return null;
             }
             final IntBuffer intBuffer9 = memoryStack3.mallocInt(1);
             final IntBuffer intBuffer10 = memoryStack3.mallocInt(1);
-            STBTruetype.stbtt_GetGlyphHMetrics(this.font, integer9, intBuffer9, intBuffer10);
-            return new Glyph(intBuffer5.get(0), intBuffer7.get(0), -intBuffer6.get(0), -intBuffer8.get(0), intBuffer9.get(0) * this.pointScale, intBuffer10.get(0) * this.pointScale, integer9);
+            STBTruetype.stbtt_GetGlyphHMetrics(this.font, integer2, intBuffer9, intBuffer10);
+            return new Glyph(intBuffer5.get(0), intBuffer7.get(0), -intBuffer6.get(0), -intBuffer8.get(0), intBuffer9.get(0) * this.pointScale, intBuffer10.get(0) * this.pointScale, integer2);
         }
     }
     
@@ -74,6 +78,11 @@ public class TrueTypeGlyphProvider implements GlyphProvider {
         MemoryUtil.memFree((Buffer)this.fontMemory);
     }
     
+    @Override
+    public IntSet getSupportedGlyphs() {
+        return IntStream.range(0, 65535).filter(integer -> !this.skip.contains(integer)).<IntSet>collect((Supplier<IntSet>)IntOpenHashSet::new, IntCollection::add, IntCollection::addAll);
+    }
+    
     class Glyph implements RawGlyph {
         private final int width;
         private final int height;
@@ -123,9 +132,9 @@ public class TrueTypeGlyphProvider implements GlyphProvider {
         
         @Override
         public void upload(final int integer1, final int integer2) {
-            final NativeImage cxr4 = new NativeImage(NativeImage.Format.LUMINANCE, this.width, this.height, false);
-            cxr4.copyFromFont(TrueTypeGlyphProvider.this.font, this.index, this.width, this.height, TrueTypeGlyphProvider.this.pointScale, TrueTypeGlyphProvider.this.pointScale, TrueTypeGlyphProvider.this.shiftX, TrueTypeGlyphProvider.this.shiftY, 0, 0);
-            cxr4.upload(0, integer1, integer2, 0, 0, this.width, this.height, false, true);
+            final NativeImage dgs4 = new NativeImage(NativeImage.Format.LUMINANCE, this.width, this.height, false);
+            dgs4.copyFromFont(TrueTypeGlyphProvider.this.font, this.index, this.width, this.height, TrueTypeGlyphProvider.this.pointScale, TrueTypeGlyphProvider.this.pointScale, TrueTypeGlyphProvider.this.shiftX, TrueTypeGlyphProvider.this.shiftY, 0, 0);
+            dgs4.upload(0, integer1, integer2, 0, 0, this.width, this.height, false, true);
         }
         
         @Override
diff --git a/src/com/mojang/blaze3d/pipeline/RenderTarget.java b/src/com/mojang/blaze3d/pipeline/RenderTarget.java
index e1e135d..1a35e80 100644
--- a/src/com/mojang/blaze3d/pipeline/RenderTarget.java
+++ b/src/com/mojang/blaze3d/pipeline/RenderTarget.java
@@ -58,7 +58,7 @@ public class RenderTarget {
         this.unbindRead();
         this.unbindWrite();
         if (this.depthBufferId > -1) {
-            GlStateManager._glDeleteRenderbuffers(this.depthBufferId);
+            TextureUtil.releaseTextureId(this.depthBufferId);
             this.depthBufferId = -1;
         }
         if (this.colorTextureId > -1) {
@@ -72,6 +72,27 @@ public class RenderTarget {
         }
     }
     
+    public void copyDepthFrom(final RenderTarget dgf) {
+        RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
+        if (GlStateManager.supportsFramebufferBlit()) {
+            GlStateManager._glBindFramebuffer(36008, dgf.frameBufferId);
+            GlStateManager._glBindFramebuffer(36009, this.frameBufferId);
+            GlStateManager._glBlitFrameBuffer(0, 0, dgf.width, dgf.height, 0, 0, this.width, this.height, 256, 9728);
+        }
+        else {
+            GlStateManager._glBindFramebuffer(GlConst.GL_FRAMEBUFFER, this.frameBufferId);
+            final int integer3 = GlStateManager.getFramebufferDepthTexture();
+            if (integer3 != 0) {
+                final int integer4 = GlStateManager.getActiveTextureName();
+                GlStateManager._bindTexture(integer3);
+                GlStateManager._glBindFramebuffer(GlConst.GL_FRAMEBUFFER, dgf.frameBufferId);
+                GlStateManager._glCopyTexSubImage2D(3553, 0, 0, 0, 0, 0, Math.min(this.width, dgf.width), Math.min(this.height, dgf.height));
+                GlStateManager._bindTexture(integer4);
+            }
+        }
+        GlStateManager._glBindFramebuffer(GlConst.GL_FRAMEBUFFER, 0);
+    }
+    
     public void createBuffers(final int integer1, final int integer2, final boolean boolean3) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
         this.viewWidth = integer1;
@@ -81,7 +102,13 @@ public class RenderTarget {
         this.frameBufferId = GlStateManager.glGenFramebuffers();
         this.colorTextureId = TextureUtil.generateTextureId();
         if (this.useDepth) {
-            this.depthBufferId = GlStateManager.glGenRenderbuffers();
+            GlStateManager._bindTexture(this.depthBufferId = TextureUtil.generateTextureId());
+            GlStateManager._texParameter(3553, 10241, 9728);
+            GlStateManager._texParameter(3553, 10240, 9728);
+            GlStateManager._texParameter(3553, 10242, 10496);
+            GlStateManager._texParameter(3553, 10243, 10496);
+            GlStateManager._texParameter(3553, 34892, 0);
+            GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, null);
         }
         this.setFilterMode(9728);
         GlStateManager._bindTexture(this.colorTextureId);
@@ -89,9 +116,7 @@ public class RenderTarget {
         GlStateManager._glBindFramebuffer(GlConst.GL_FRAMEBUFFER, this.frameBufferId);
         GlStateManager._glFramebufferTexture2D(GlConst.GL_FRAMEBUFFER, GlConst.GL_COLOR_ATTACHMENT0, 3553, this.colorTextureId, 0);
         if (this.useDepth) {
-            GlStateManager._glBindRenderbuffer(GlConst.GL_RENDERBUFFER, this.depthBufferId);
-            GlStateManager._glRenderbufferStorage(GlConst.GL_RENDERBUFFER, 33190, this.width, this.height);
-            GlStateManager._glFramebufferRenderbuffer(GlConst.GL_FRAMEBUFFER, GlConst.GL_DEPTH_ATTACHMENT, GlConst.GL_RENDERBUFFER, this.depthBufferId);
+            GlStateManager._glFramebufferTexture2D(GlConst.GL_FRAMEBUFFER, GlConst.GL_DEPTH_ATTACHMENT, 3553, this.depthBufferId, 0);
         }
         this.checkStatus();
         this.clear(boolean3);
@@ -212,14 +237,14 @@ public class RenderTarget {
         final float float6 = (float)integer2;
         final float float7 = this.viewWidth / (float)this.width;
         final float float8 = this.viewHeight / (float)this.height;
-        final Tesselator cym9 = RenderSystem.renderThreadTesselator();
-        final BufferBuilder cyg10 = cym9.getBuilder();
-        cyg10.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg10.vertex(0.0, float6, 0.0).uv(0.0f, 0.0f).color(255, 255, 255, 255).endVertex();
-        cyg10.vertex(float5, float6, 0.0).uv(float7, 0.0f).color(255, 255, 255, 255).endVertex();
-        cyg10.vertex(float5, 0.0, 0.0).uv(float7, float8).color(255, 255, 255, 255).endVertex();
-        cyg10.vertex(0.0, 0.0, 0.0).uv(0.0f, float8).color(255, 255, 255, 255).endVertex();
-        cym9.end();
+        final Tesselator dhn9 = RenderSystem.renderThreadTesselator();
+        final BufferBuilder dhg10 = dhn9.getBuilder();
+        dhg10.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+        dhg10.vertex(0.0, float6, 0.0).uv(0.0f, 0.0f).color(255, 255, 255, 255).endVertex();
+        dhg10.vertex(float5, float6, 0.0).uv(float7, 0.0f).color(255, 255, 255, 255).endVertex();
+        dhg10.vertex(float5, 0.0, 0.0).uv(float7, float8).color(255, 255, 255, 255).endVertex();
+        dhg10.vertex(0.0, 0.0, 0.0).uv(0.0f, float8).color(255, 255, 255, 255).endVertex();
+        dhn9.end();
         this.unbindRead();
         GlStateManager._depthMask(true);
         GlStateManager._colorMask(true, true, true, true);
diff --git a/src/com/mojang/blaze3d/platform/ClipboardManager.java b/src/com/mojang/blaze3d/platform/ClipboardManager.java
index 44d464a..e4c5e68 100644
--- a/src/com/mojang/blaze3d/platform/ClipboardManager.java
+++ b/src/com/mojang/blaze3d/platform/ClipboardManager.java
@@ -4,7 +4,7 @@ import java.nio.Buffer;
 import org.lwjgl.system.MemoryUtil;
 import com.google.common.base.Charsets;
 import org.lwjgl.glfw.GLFWErrorCallback;
-import net.minecraft.SharedConstants;
+import net.minecraft.client.StringDecomposer;
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.glfw.GLFWErrorCallbackI;
 import org.lwjgl.BufferUtils;
@@ -20,7 +20,7 @@ public class ClipboardManager {
     public String getClipboard(final long long1, final GLFWErrorCallbackI gLFWErrorCallbackI) {
         final GLFWErrorCallback gLFWErrorCallback5 = GLFW.glfwSetErrorCallback(gLFWErrorCallbackI);
         String string6 = GLFW.glfwGetClipboardString(long1);
-        string6 = ((string6 != null) ? SharedConstants.filterUnicodeSupplementary(string6) : "");
+        string6 = ((string6 != null) ? StringDecomposer.filterBrokenSurrogates(string6) : "");
         final GLFWErrorCallback gLFWErrorCallback6 = GLFW.glfwSetErrorCallback((GLFWErrorCallbackI)gLFWErrorCallback5);
         if (gLFWErrorCallback6 != null) {
             gLFWErrorCallback6.free();
diff --git a/src/com/mojang/blaze3d/platform/GLX.java b/src/com/mojang/blaze3d/platform/GLX.java
index 4a0befb..5920114 100644
--- a/src/com/mojang/blaze3d/platform/GLX.java
+++ b/src/com/mojang/blaze3d/platform/GLX.java
@@ -41,9 +41,9 @@ public class GLX {
         return GlStateManager._getString(7937) + " GL version " + GlStateManager._getString(7938) + ", " + GlStateManager._getString(7936);
     }
     
-    public static int _getRefreshRate(final Window cxx) {
+    public static int _getRefreshRate(final Window dgy) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
-        long long2 = GLFW.glfwGetWindowMonitor(cxx.getWindow());
+        long long2 = GLFW.glfwGetWindowMonitor(dgy.getWindow());
         if (long2 == 0L) {
             long2 = GLFW.glfwGetPrimaryMonitor();
         }
@@ -84,8 +84,8 @@ public class GLX {
         }
     }
     
-    public static boolean _shouldClose(final Window cxx) {
-        return GLFW.glfwWindowShouldClose(cxx.getWindow());
+    public static boolean _shouldClose(final Window dgy) {
+        return GLFW.glfwWindowShouldClose(dgy.getWindow());
     }
     
     public static void _setupNvFogDistance() {
@@ -119,38 +119,38 @@ public class GLX {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
         GlStateManager._disableTexture();
         GlStateManager._depthMask(false);
-        final Tesselator cym5 = RenderSystem.renderThreadTesselator();
-        final BufferBuilder cyg6 = cym5.getBuilder();
+        final Tesselator dhn5 = RenderSystem.renderThreadTesselator();
+        final BufferBuilder dhg6 = dhn5.getBuilder();
         GL11.glLineWidth(4.0f);
-        cyg6.begin(1, DefaultVertexFormat.POSITION_COLOR);
+        dhg6.begin(1, DefaultVertexFormat.POSITION_COLOR);
         if (boolean2) {
-            cyg6.vertex(0.0, 0.0, 0.0).color(0, 0, 0, 255).endVertex();
-            cyg6.vertex(integer, 0.0, 0.0).color(0, 0, 0, 255).endVertex();
+            dhg6.vertex(0.0, 0.0, 0.0).color(0, 0, 0, 255).endVertex();
+            dhg6.vertex(integer, 0.0, 0.0).color(0, 0, 0, 255).endVertex();
         }
         if (boolean3) {
-            cyg6.vertex(0.0, 0.0, 0.0).color(0, 0, 0, 255).endVertex();
-            cyg6.vertex(0.0, integer, 0.0).color(0, 0, 0, 255).endVertex();
+            dhg6.vertex(0.0, 0.0, 0.0).color(0, 0, 0, 255).endVertex();
+            dhg6.vertex(0.0, integer, 0.0).color(0, 0, 0, 255).endVertex();
         }
         if (boolean4) {
-            cyg6.vertex(0.0, 0.0, 0.0).color(0, 0, 0, 255).endVertex();
-            cyg6.vertex(0.0, 0.0, integer).color(0, 0, 0, 255).endVertex();
+            dhg6.vertex(0.0, 0.0, 0.0).color(0, 0, 0, 255).endVertex();
+            dhg6.vertex(0.0, 0.0, integer).color(0, 0, 0, 255).endVertex();
         }
-        cym5.end();
+        dhn5.end();
         GL11.glLineWidth(2.0f);
-        cyg6.begin(1, DefaultVertexFormat.POSITION_COLOR);
+        dhg6.begin(1, DefaultVertexFormat.POSITION_COLOR);
         if (boolean2) {
-            cyg6.vertex(0.0, 0.0, 0.0).color(255, 0, 0, 255).endVertex();
-            cyg6.vertex(integer, 0.0, 0.0).color(255, 0, 0, 255).endVertex();
+            dhg6.vertex(0.0, 0.0, 0.0).color(255, 0, 0, 255).endVertex();
+            dhg6.vertex(integer, 0.0, 0.0).color(255, 0, 0, 255).endVertex();
         }
         if (boolean3) {
-            cyg6.vertex(0.0, 0.0, 0.0).color(0, 255, 0, 255).endVertex();
-            cyg6.vertex(0.0, integer, 0.0).color(0, 255, 0, 255).endVertex();
+            dhg6.vertex(0.0, 0.0, 0.0).color(0, 255, 0, 255).endVertex();
+            dhg6.vertex(0.0, integer, 0.0).color(0, 255, 0, 255).endVertex();
         }
         if (boolean4) {
-            cyg6.vertex(0.0, 0.0, 0.0).color(127, 127, 255, 255).endVertex();
-            cyg6.vertex(0.0, 0.0, integer).color(127, 127, 255, 255).endVertex();
+            dhg6.vertex(0.0, 0.0, 0.0).color(127, 127, 255, 255).endVertex();
+            dhg6.vertex(0.0, 0.0, integer).color(127, 127, 255, 255).endVertex();
         }
-        cym5.end();
+        dhn5.end();
         GL11.glLineWidth(1.0f);
         GlStateManager._depthMask(true);
         GlStateManager._enableTexture();
diff --git a/src/com/mojang/blaze3d/platform/GlStateManager.java b/src/com/mojang/blaze3d/platform/GlStateManager.java
index fa5220b..40a2230 100644
--- a/src/com/mojang/blaze3d/platform/GlStateManager.java
+++ b/src/com/mojang/blaze3d/platform/GlStateManager.java
@@ -1,12 +1,13 @@
 package com.mojang.blaze3d.platform;
 
-import net.minecraft.Util;
 import java.util.stream.IntStream;
 import org.lwjgl.system.MemoryUtil;
 import javax.annotation.Nullable;
 import com.mojang.math.Vector4f;
 import com.mojang.math.Matrix4f;
+import com.mojang.math.Vector3f;
 import org.lwjgl.opengl.GL13;
+import org.lwjgl.opengl.EXTFramebufferBlit;
 import org.lwjgl.opengl.EXTFramebufferObject;
 import org.lwjgl.opengl.ARBFramebufferObject;
 import org.lwjgl.opengl.GL30;
@@ -18,7 +19,6 @@ import org.lwjgl.opengl.GLCapabilities;
 import org.lwjgl.opengl.GL14;
 import org.lwjgl.opengl.GL11;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.math.Vector3f;
 import java.nio.FloatBuffer;
 
 public class GlStateManager {
@@ -34,11 +34,8 @@ public class GlStateManager {
     private static final PolygonOffsetState POLY_OFFSET;
     private static final ColorLogicState COLOR_LOGIC;
     private static final TexGenState TEX_GEN;
-    private static final ClearState CLEAR;
     private static final StencilState STENCIL;
     private static final FloatBuffer FLOAT_ARG_BUFFER;
-    private static final Vector3f DIFFUSE_LIGHT_0;
-    private static final Vector3f DIFFUSE_LIGHT_1;
     private static int activeTexture;
     private static final TextureState[] TEXTURES;
     private static int shadeModel;
@@ -46,6 +43,7 @@ public class GlStateManager {
     private static final ColorMask COLOR_MASK;
     private static final Color COLOR;
     private static FboMode fboMode;
+    private static FboBlitMode fboBlitMode;
     
     @Deprecated
     public static void _pushLightingAttributes() {
@@ -200,6 +198,15 @@ public class GlStateManager {
     
     public static String _init_fbo(final GLCapabilities gLCapabilities) {
         RenderSystem.assertThread(RenderSystem::isInInitPhase);
+        if (gLCapabilities.OpenGL30) {
+            GlStateManager.fboBlitMode = FboBlitMode.BASE;
+        }
+        else if (gLCapabilities.GL_EXT_framebuffer_blit) {
+            GlStateManager.fboBlitMode = FboBlitMode.EXT;
+        }
+        else {
+            GlStateManager.fboBlitMode = FboBlitMode.NONE;
+        }
         if (gLCapabilities.OpenGL30) {
             GlStateManager.fboMode = FboMode.BASE;
             GlConst.GL_FRAMEBUFFER = 36160;
@@ -387,6 +394,11 @@ public class GlStateManager {
         GL15.glDeleteBuffers(integer);
     }
     
+    public static void _glCopyTexSubImage2D(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
+        RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
+        GL20.glCopyTexSubImage2D(integer1, integer2, integer3, integer4, integer5, integer6, integer7, integer8);
+    }
+    
     public static void _glBindFramebuffer(final int integer1, final int integer2) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
         switch (GlStateManager.fboMode) {
@@ -405,37 +417,40 @@ public class GlStateManager {
         }
     }
     
-    public static void _glBindRenderbuffer(final int integer1, final int integer2) {
+    public static int getFramebufferDepthTexture() {
         RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
         switch (GlStateManager.fboMode) {
             case BASE: {
-                GL30.glBindRenderbuffer(integer1, integer2);
+                if (GL30.glGetFramebufferAttachmentParameteri(36160, 36096, 36048) == 5890) {
+                    return GL30.glGetFramebufferAttachmentParameteri(36160, 36096, 36049);
+                }
                 break;
             }
             case ARB: {
-                ARBFramebufferObject.glBindRenderbuffer(integer1, integer2);
+                if (ARBFramebufferObject.glGetFramebufferAttachmentParameteri(36160, 36096, 36048) == 5890) {
+                    return ARBFramebufferObject.glGetFramebufferAttachmentParameteri(36160, 36096, 36049);
+                }
                 break;
             }
             case EXT: {
-                EXTFramebufferObject.glBindRenderbufferEXT(integer1, integer2);
+                if (EXTFramebufferObject.glGetFramebufferAttachmentParameteriEXT(36160, 36096, 36048) == 5890) {
+                    return EXTFramebufferObject.glGetFramebufferAttachmentParameteriEXT(36160, 36096, 36049);
+                }
                 break;
             }
         }
+        return 0;
     }
     
-    public static void _glDeleteRenderbuffers(final int integer) {
+    public static void _glBlitFrameBuffer(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final int integer10) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
-        switch (GlStateManager.fboMode) {
+        switch (GlStateManager.fboBlitMode) {
             case BASE: {
-                GL30.glDeleteRenderbuffers(integer);
-                break;
-            }
-            case ARB: {
-                ARBFramebufferObject.glDeleteRenderbuffers(integer);
+                GL30.glBlitFramebuffer(integer1, integer2, integer3, integer4, integer5, integer6, integer7, integer8, integer9, integer10);
                 break;
             }
             case EXT: {
-                EXTFramebufferObject.glDeleteRenderbuffersEXT(integer);
+                EXTFramebufferBlit.glBlitFramebufferEXT(integer1, integer2, integer3, integer4, integer5, integer6, integer7, integer8, integer9, integer10);
                 break;
             }
         }
@@ -477,60 +492,6 @@ public class GlStateManager {
         }
     }
     
-    public static int glGenRenderbuffers() {
-        RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
-        switch (GlStateManager.fboMode) {
-            case BASE: {
-                return GL30.glGenRenderbuffers();
-            }
-            case ARB: {
-                return ARBFramebufferObject.glGenRenderbuffers();
-            }
-            case EXT: {
-                return EXTFramebufferObject.glGenRenderbuffersEXT();
-            }
-            default: {
-                return -1;
-            }
-        }
-    }
-    
-    public static void _glRenderbufferStorage(final int integer1, final int integer2, final int integer3, final int integer4) {
-        RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
-        switch (GlStateManager.fboMode) {
-            case BASE: {
-                GL30.glRenderbufferStorage(integer1, integer2, integer3, integer4);
-                break;
-            }
-            case ARB: {
-                ARBFramebufferObject.glRenderbufferStorage(integer1, integer2, integer3, integer4);
-                break;
-            }
-            case EXT: {
-                EXTFramebufferObject.glRenderbufferStorageEXT(integer1, integer2, integer3, integer4);
-                break;
-            }
-        }
-    }
-    
-    public static void _glFramebufferRenderbuffer(final int integer1, final int integer2, final int integer3, final int integer4) {
-        RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
-        switch (GlStateManager.fboMode) {
-            case BASE: {
-                GL30.glFramebufferRenderbuffer(integer1, integer2, integer3, integer4);
-                break;
-            }
-            case ARB: {
-                ARBFramebufferObject.glFramebufferRenderbuffer(integer1, integer2, integer3, integer4);
-                break;
-            }
-            case EXT: {
-                EXTFramebufferObject.glFramebufferRenderbufferEXT(integer1, integer2, integer3, integer4);
-                break;
-            }
-        }
-    }
-    
     public static int glCheckFramebufferStatus(final int integer) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
         switch (GlStateManager.fboMode) {
@@ -567,6 +528,11 @@ public class GlStateManager {
         }
     }
     
+    @Deprecated
+    public static int getActiveTextureName() {
+        return GlStateManager.TEXTURES[GlStateManager.activeTexture].binding;
+    }
+    
     public static void glActiveTexture(final int integer) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
         GL13.glActiveTexture(integer);
@@ -660,51 +626,51 @@ public class GlStateManager {
         _texEnv(8960, 34200, 770);
     }
     
-    public static void setupLevelDiffuseLighting(final Matrix4f b) {
+    public static void setupLevelDiffuseLighting(final Vector3f g1, final Vector3f g2, final Matrix4f b) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
         _pushMatrix();
         _loadIdentity();
         _enableLight(0);
         _enableLight(1);
-        final Vector4f f2 = new Vector4f(GlStateManager.DIFFUSE_LIGHT_0);
-        f2.transform(b);
-        _light(16384, 4611, getBuffer(f2.x(), f2.y(), f2.z(), 0.0f));
-        final float float3 = 0.6f;
+        final Vector4f h4 = new Vector4f(g1);
+        h4.transform(b);
+        _light(16384, 4611, getBuffer(h4.x(), h4.y(), h4.z(), 0.0f));
+        final float float5 = 0.6f;
         _light(16384, 4609, getBuffer(0.6f, 0.6f, 0.6f, 1.0f));
         _light(16384, 4608, getBuffer(0.0f, 0.0f, 0.0f, 1.0f));
         _light(16384, 4610, getBuffer(0.0f, 0.0f, 0.0f, 1.0f));
-        final Vector4f f3 = new Vector4f(GlStateManager.DIFFUSE_LIGHT_1);
-        f3.transform(b);
-        _light(16385, 4611, getBuffer(f3.x(), f3.y(), f3.z(), 0.0f));
+        final Vector4f h5 = new Vector4f(g2);
+        h5.transform(b);
+        _light(16385, 4611, getBuffer(h5.x(), h5.y(), h5.z(), 0.0f));
         _light(16385, 4609, getBuffer(0.6f, 0.6f, 0.6f, 1.0f));
         _light(16385, 4608, getBuffer(0.0f, 0.0f, 0.0f, 1.0f));
         _light(16385, 4610, getBuffer(0.0f, 0.0f, 0.0f, 1.0f));
         _shadeModel(7424);
-        final float float4 = 0.4f;
+        final float float6 = 0.4f;
         _lightModel(2899, getBuffer(0.4f, 0.4f, 0.4f, 1.0f));
         _popMatrix();
     }
     
-    public static void setupGuiFlatDiffuseLighting() {
+    public static void setupGuiFlatDiffuseLighting(final Vector3f g1, final Vector3f g2) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
-        final Matrix4f b1 = new Matrix4f();
-        b1.setIdentity();
-        b1.multiply(Matrix4f.createScaleMatrix(1.0f, -1.0f, 1.0f));
-        b1.multiply(Vector3f.YP.rotationDegrees(-22.5f));
-        b1.multiply(Vector3f.XP.rotationDegrees(135.0f));
-        setupLevelDiffuseLighting(b1);
+        final Matrix4f b3 = new Matrix4f();
+        b3.setIdentity();
+        b3.multiply(Matrix4f.createScaleMatrix(1.0f, -1.0f, 1.0f));
+        b3.multiply(Vector3f.YP.rotationDegrees(-22.5f));
+        b3.multiply(Vector3f.XP.rotationDegrees(135.0f));
+        setupLevelDiffuseLighting(g1, g2, b3);
     }
     
-    public static void setupGui3DDiffuseLighting() {
+    public static void setupGui3DDiffuseLighting(final Vector3f g1, final Vector3f g2) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
-        final Matrix4f b1 = new Matrix4f();
-        b1.setIdentity();
-        b1.multiply(Vector3f.YP.rotationDegrees(62.0f));
-        b1.multiply(Vector3f.XP.rotationDegrees(185.5f));
-        b1.multiply(Matrix4f.createScaleMatrix(1.0f, -1.0f, 1.0f));
-        b1.multiply(Vector3f.YP.rotationDegrees(-22.5f));
-        b1.multiply(Vector3f.XP.rotationDegrees(135.0f));
-        setupLevelDiffuseLighting(b1);
+        final Matrix4f b3 = new Matrix4f();
+        b3.setIdentity();
+        b3.multiply(Vector3f.YP.rotationDegrees(62.0f));
+        b3.multiply(Vector3f.XP.rotationDegrees(185.5f));
+        b3.multiply(Matrix4f.createScaleMatrix(1.0f, -1.0f, 1.0f));
+        b3.multiply(Vector3f.YP.rotationDegrees(-22.5f));
+        b3.multiply(Vector3f.XP.rotationDegrees(135.0f));
+        setupLevelDiffuseLighting(g1, g2, b3);
     }
     
     private static FloatBuffer getBuffer(final float float1, final float float2, final float float3, final float float4) {
@@ -1035,23 +1001,17 @@ public class GlStateManager {
     
     public static void _clearDepth(final double double1) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
-        if (double1 != GlStateManager.CLEAR.depth) {
-            GL11.glClearDepth(GlStateManager.CLEAR.depth = double1);
-        }
+        GL11.glClearDepth(double1);
     }
     
     public static void _clearColor(final float float1, final float float2, final float float3, final float float4) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThreadOrInit);
-        if (float1 != GlStateManager.CLEAR.color.r || float2 != GlStateManager.CLEAR.color.g || float3 != GlStateManager.CLEAR.color.b || float4 != GlStateManager.CLEAR.color.a) {
-            GL11.glClearColor(GlStateManager.CLEAR.color.r = float1, GlStateManager.CLEAR.color.g = float2, GlStateManager.CLEAR.color.b = float3, GlStateManager.CLEAR.color.a = float4);
-        }
+        GL11.glClearColor(float1, float2, float3, float4);
     }
     
     public static void _clearStencil(final int integer) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
-        if (integer != GlStateManager.CLEAR.stencil) {
-            GL11.glClearStencil(GlStateManager.CLEAR.stencil = integer);
-        }
+        GL11.glClearStencil(integer);
     }
     
     public static void _clear(final int integer, final boolean boolean2) {
@@ -1250,6 +1210,10 @@ public class GlStateManager {
         return GL11.glGetInteger(integer);
     }
     
+    public static boolean supportsFramebufferBlit() {
+        return GlStateManager.fboBlitMode != FboBlitMode.NONE;
+    }
+    
     static {
         MATRIX_BUFFER = GLX.<FloatBuffer>make(MemoryUtil.memAllocFloat(16), floatBuffer -> DebugMemoryUntracker.untrack(MemoryUtil.memAddress(floatBuffer)));
         ALPHA_TEST = new AlphaState();
@@ -1263,12 +1227,9 @@ public class GlStateManager {
         POLY_OFFSET = new PolygonOffsetState();
         COLOR_LOGIC = new ColorLogicState();
         TEX_GEN = new TexGenState();
-        CLEAR = new ClearState();
         STENCIL = new StencilState();
         FLOAT_ARG_BUFFER = MemoryTracker.createFloatBuffer(4);
-        DIFFUSE_LIGHT_0 = Util.<Vector3f>make(new Vector3f(0.2f, 1.0f, -0.7f), Vector3f::normalize);
-        DIFFUSE_LIGHT_1 = Util.<Vector3f>make(new Vector3f(-0.2f, 1.0f, 0.7f), Vector3f::normalize);
-        TEXTURES = IntStream.range(0, 8).mapToObj(integer -> new TextureState()).<TextureState>toArray(TextureState[]::new);
+        TEXTURES = IntStream.range(0, 12).mapToObj(integer -> new TextureState()).<TextureState>toArray(TextureState[]::new);
         GlStateManager.shadeModel = 7425;
         RESCALE_NORMAL = new BooleanState(32826);
         COLOR_MASK = new ColorMask();
@@ -1328,6 +1289,12 @@ public class GlStateManager {
         EXT;
     }
     
+    public enum FboBlitMode {
+        BASE, 
+        EXT, 
+        NONE;
+    }
+    
     static class TextureState {
         public final BooleanState enable;
         public int binding;
@@ -1439,17 +1406,6 @@ public class GlStateManager {
         }
     }
     
-    static class ClearState {
-        public double depth;
-        public final Color color;
-        public int stencil;
-        
-        private ClearState() {
-            this.depth = 1.0;
-            this.color = new Color(0.0f, 0.0f, 0.0f, 0.0f);
-        }
-    }
-    
     static class StencilFunc {
         public int func;
         public int ref;
diff --git a/src/com/mojang/blaze3d/platform/InputConstants.java b/src/com/mojang/blaze3d/platform/InputConstants.java
index 9b83c09..245c69e 100644
--- a/src/com/mojang/blaze3d/platform/InputConstants.java
+++ b/src/com/mojang/blaze3d/platform/InputConstants.java
@@ -2,11 +2,19 @@ package com.mojang.blaze3d.platform;
 
 import com.google.common.collect.Maps;
 import java.util.Objects;
+import java.util.OptionalInt;
 import java.util.Map;
+import net.minecraft.util.LazyLoadedValue;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.locale.Language;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import net.minecraft.network.chat.Component;
+import java.util.function.BiFunction;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.MethodHandles;
+import org.lwjgl.glfw.GLFWDropCallbackI;
 import org.lwjgl.glfw.GLFWScrollCallbackI;
 import org.lwjgl.glfw.GLFWMouseButtonCallbackI;
 import org.lwjgl.glfw.GLFWCursorPosCallbackI;
@@ -51,10 +59,11 @@ public class InputConstants {
         GLFW.glfwSetCharModsCallback(long1, gLFWCharModsCallbackI);
     }
     
-    public static void setupMouseCallbacks(final long long1, final GLFWCursorPosCallbackI gLFWCursorPosCallbackI, final GLFWMouseButtonCallbackI gLFWMouseButtonCallbackI, final GLFWScrollCallbackI gLFWScrollCallbackI) {
+    public static void setupMouseCallbacks(final long long1, final GLFWCursorPosCallbackI gLFWCursorPosCallbackI, final GLFWMouseButtonCallbackI gLFWMouseButtonCallbackI, final GLFWScrollCallbackI gLFWScrollCallbackI, final GLFWDropCallbackI gLFWDropCallbackI) {
         GLFW.glfwSetCursorPosCallback(long1, gLFWCursorPosCallbackI);
         GLFW.glfwSetMouseButtonCallback(long1, gLFWMouseButtonCallbackI);
         GLFW.glfwSetScrollCallback(long1, gLFWScrollCallbackI);
+        GLFW.glfwSetDropCallback(long1, gLFWDropCallbackI);
     }
     
     public static void grabOrReleaseMouse(final long long1, final int integer, final double double3, final double double4) {
@@ -77,16 +86,6 @@ public class InputConstants {
         }
     }
     
-    @Nullable
-    public static String translateKeyCode(final int integer) {
-        return GLFW.glfwGetKeyName(integer, -1);
-    }
-    
-    @Nullable
-    public static String translateScanCode(final int integer) {
-        return GLFW.glfwGetKeyName(-1, integer);
-    }
-    
     static {
         final MethodHandles.Lookup lookup1 = MethodHandles.lookup();
         final MethodType methodType2 = MethodType.methodType(Boolean.TYPE);
@@ -107,47 +106,68 @@ public class InputConstants {
     }
     
     public enum Type {
-        KEYSYM("key.keyboard"), 
-        SCANCODE("scancode"), 
-        MOUSE("key.mouse");
+        KEYSYM("key.keyboard", (integer, string) -> {
+            string2 = GLFW.glfwGetKeyName((int)integer, -1);
+            if (string2 != null) {
+                // new(net.minecraft.network.chat.TextComponent.class)
+                new TextComponent(string2);
+            }
+            else {
+                // new(net.minecraft.network.chat.TranslatableComponent.class)
+                new TranslatableComponent(string);
+            }
+            return o3;
+        }), 
+        SCANCODE("scancode", (integer, string) -> {
+            string3 = GLFW.glfwGetKeyName(-1, (int)integer);
+            if (string3 != null) {
+                // new(net.minecraft.network.chat.TextComponent.class)
+                new TextComponent(string3);
+            }
+            else {
+                // new(net.minecraft.network.chat.TranslatableComponent.class)
+                new TranslatableComponent(string);
+            }
+            return o6;
+        }), 
+        MOUSE("key.mouse", (integer, string) -> {
+            if (Language.getInstance().has(string)) {
+                // new(net.minecraft.network.chat.TranslatableComponent.class)
+                new TranslatableComponent(string);
+            }
+            else {
+                // new(net.minecraft.network.chat.TranslatableComponent.class)
+                new TranslatableComponent("key.mouse", new Object[] { integer + 1 });
+            }
+            return o9;
+        });
         
-        private static final String[] MOUSE_BUTTON_NAMES;
         private final Int2ObjectMap<Key> map;
         private final String defaultPrefix;
+        private final BiFunction<Integer, String, Component> displayTextSupplier;
         
         private static void addKey(final Type b, final String string, final int integer) {
             final Key a4 = new Key(string, b, integer);
             b.map.put(integer, a4);
         }
         
-        private Type(final String string3) {
+        private Type(final String string3, final BiFunction<Integer, String, Component> biFunction) {
             this.map = (Int2ObjectMap<Key>)new Int2ObjectOpenHashMap();
             this.defaultPrefix = string3;
+            this.displayTextSupplier = biFunction;
         }
         
         public Key getOrCreate(final int integer) {
-            if (this.map.containsKey(integer)) {
-                return (Key)this.map.get(integer);
-            }
-            String string3;
-            if (this == Type.MOUSE) {
-                if (integer <= 2) {
-                    string3 = "." + Type.MOUSE_BUTTON_NAMES[integer];
+            int integer2;
+            final String string4;
+            return (Key)this.map.computeIfAbsent(integer, integer -> {
+                integer2 = integer;
+                if (this == Type.MOUSE) {
+                    ++integer2;
                 }
-                else {
-                    string3 = "." + (integer + 1);
-                }
-            }
-            else {
-                string3 = "." + integer;
-            }
-            final Key a4 = new Key(this.defaultPrefix + string3, this, integer);
-            this.map.put(integer, a4);
-            return a4;
-        }
-        
-        public String getDefaultPrefix() {
-            return this.defaultPrefix;
+                string4 = this.defaultPrefix + "." + integer2;
+                return new Key(string4, this, integer);
+            });
         }
         
         static {
@@ -280,7 +300,6 @@ public class InputConstants {
             addKey(Type.KEYSYM, "key.keyboard.print.screen", 283);
             addKey(Type.KEYSYM, "key.keyboard.world.1", 161);
             addKey(Type.KEYSYM, "key.keyboard.world.2", 162);
-            MOUSE_BUTTON_NAMES = new String[] { "left", "middle", "right" };
         }
     }
     
@@ -288,12 +307,14 @@ public class InputConstants {
         private final String name;
         private final Type type;
         private final int value;
+        private final LazyLoadedValue<Component> displayName;
         private static final Map<String, Key> NAME_MAP;
         
         private Key(final String string, final Type b, final int integer) {
             this.name = string;
             this.type = b;
             this.value = integer;
+            this.displayName = new LazyLoadedValue<Component>(() -> b.displayTextSupplier.apply(integer, string));
             Key.NAME_MAP.put(string, this);
         }
         
@@ -309,6 +330,20 @@ public class InputConstants {
             return this.name;
         }
         
+        public Component getDisplayName() {
+            return this.displayName.get();
+        }
+        
+        public OptionalInt getNumericKeyValue() {
+            if (this.value >= 48 && this.value <= 57) {
+                return OptionalInt.of(this.value - 48);
+            }
+            if (this.value >= 320 && this.value <= 329) {
+                return OptionalInt.of(this.value - 320);
+            }
+            return OptionalInt.empty();
+        }
+        
         @Override
         public boolean equals(final Object object) {
             if (this == object) {
diff --git a/src/com/mojang/blaze3d/platform/Lighting.java b/src/com/mojang/blaze3d/platform/Lighting.java
index f449d3d..61ef40a 100644
--- a/src/com/mojang/blaze3d/platform/Lighting.java
+++ b/src/com/mojang/blaze3d/platform/Lighting.java
@@ -1,9 +1,16 @@
 package com.mojang.blaze3d.platform;
 
+import net.minecraft.Util;
 import com.mojang.math.Matrix4f;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.math.Vector3f;
 
 public class Lighting {
+    private static final Vector3f DIFFUSE_LIGHT_0;
+    private static final Vector3f DIFFUSE_LIGHT_1;
+    private static final Vector3f NETHER_DIFFUSE_LIGHT_0;
+    private static final Vector3f NETHER_DIFFUSE_LIGHT_1;
+    
     public static void turnBackOn() {
         RenderSystem.enableLighting();
         RenderSystem.enableColorMaterial();
@@ -15,15 +22,26 @@ public class Lighting {
         RenderSystem.disableColorMaterial();
     }
     
+    public static void setupNetherLevel(final Matrix4f b) {
+        RenderSystem.setupLevelDiffuseLighting(Lighting.NETHER_DIFFUSE_LIGHT_0, Lighting.NETHER_DIFFUSE_LIGHT_1, b);
+    }
+    
     public static void setupLevel(final Matrix4f b) {
-        RenderSystem.setupLevelDiffuseLighting(b);
+        RenderSystem.setupLevelDiffuseLighting(Lighting.DIFFUSE_LIGHT_0, Lighting.DIFFUSE_LIGHT_1, b);
     }
     
     public static void setupForFlatItems() {
-        RenderSystem.setupGuiFlatDiffuseLighting();
+        RenderSystem.setupGuiFlatDiffuseLighting(Lighting.DIFFUSE_LIGHT_0, Lighting.DIFFUSE_LIGHT_1);
     }
     
     public static void setupFor3DItems() {
-        RenderSystem.setupGui3DDiffuseLighting();
+        RenderSystem.setupGui3DDiffuseLighting(Lighting.DIFFUSE_LIGHT_0, Lighting.DIFFUSE_LIGHT_1);
+    }
+    
+    static {
+        DIFFUSE_LIGHT_0 = Util.<Vector3f>make(new Vector3f(0.2f, 1.0f, -0.7f), Vector3f::normalize);
+        DIFFUSE_LIGHT_1 = Util.<Vector3f>make(new Vector3f(-0.2f, 1.0f, 0.7f), Vector3f::normalize);
+        NETHER_DIFFUSE_LIGHT_0 = Util.<Vector3f>make(new Vector3f(0.2f, 1.0f, -0.7f), Vector3f::normalize);
+        NETHER_DIFFUSE_LIGHT_1 = Util.<Vector3f>make(new Vector3f(-0.2f, -1.0f, 0.7f), Vector3f::normalize);
     }
 }
diff --git a/src/com/mojang/blaze3d/platform/Monitor.java b/src/com/mojang/blaze3d/platform/Monitor.java
index 13f75f1..3fe747e 100644
--- a/src/com/mojang/blaze3d/platform/Monitor.java
+++ b/src/com/mojang/blaze3d/platform/Monitor.java
@@ -27,9 +27,9 @@ public final class Monitor {
         final GLFWVidMode.Buffer buffer2 = GLFW.glfwGetVideoModes(this.monitor);
         for (int integer3 = buffer2.limit() - 1; integer3 >= 0; --integer3) {
             buffer2.position(integer3);
-            final VideoMode cxw4 = new VideoMode(buffer2);
-            if (cxw4.getRedBits() >= 8 && cxw4.getGreenBits() >= 8 && cxw4.getBlueBits() >= 8) {
-                this.videoModes.add(cxw4);
+            final VideoMode dgx4 = new VideoMode(buffer2);
+            if (dgx4.getRedBits() >= 8 && dgx4.getGreenBits() >= 8 && dgx4.getBlueBits() >= 8) {
+                this.videoModes.add(dgx4);
             }
         }
         final int[] arr3 = { 0 };
@@ -44,19 +44,19 @@ public final class Monitor {
     public VideoMode getPreferredVidMode(final Optional<VideoMode> optional) {
         RenderSystem.assertThread(RenderSystem::isInInitPhase);
         if (optional.isPresent()) {
-            final VideoMode cxw3 = optional.get();
-            for (final VideoMode cxw4 : this.videoModes) {
-                if (cxw4.equals(cxw3)) {
-                    return cxw4;
+            final VideoMode dgx3 = optional.get();
+            for (final VideoMode dgx4 : this.videoModes) {
+                if (dgx4.equals(dgx3)) {
+                    return dgx4;
                 }
             }
         }
         return this.getCurrentMode();
     }
     
-    public int getVideoModeIndex(final VideoMode cxw) {
+    public int getVideoModeIndex(final VideoMode dgx) {
         RenderSystem.assertThread(RenderSystem::isInInitPhase);
-        return this.videoModes.indexOf(cxw);
+        return this.videoModes.indexOf(dgx);
     }
     
     public VideoMode getCurrentMode() {
diff --git a/src/com/mojang/blaze3d/platform/NativeImage.java b/src/com/mojang/blaze3d/platform/NativeImage.java
index 0653f5c..8fe6580 100644
--- a/src/com/mojang/blaze3d/platform/NativeImage.java
+++ b/src/com/mojang/blaze3d/platform/NativeImage.java
@@ -205,44 +205,6 @@ public final class NativeImage implements AutoCloseable {
         return MemoryUtil.memGetByte(this.pixels + integer3);
     }
     
-    public void blendPixel(final int integer1, final int integer2, final int integer3) {
-        if (this.format != Format.RGBA) {
-            throw new UnsupportedOperationException("Can only call blendPixel with RGBA format");
-        }
-        final int integer4 = this.getPixelRGBA(integer1, integer2);
-        final float float6 = getA(integer3) / 255.0f;
-        final float float7 = getB(integer3) / 255.0f;
-        final float float8 = getG(integer3) / 255.0f;
-        final float float9 = getR(integer3) / 255.0f;
-        final float float10 = getA(integer4) / 255.0f;
-        final float float11 = getB(integer4) / 255.0f;
-        final float float12 = getG(integer4) / 255.0f;
-        final float float13 = getR(integer4) / 255.0f;
-        final float float14 = float6;
-        final float float15 = 1.0f - float6;
-        float float16 = float6 * float14 + float10 * float15;
-        float float17 = float7 * float14 + float11 * float15;
-        float float18 = float8 * float14 + float12 * float15;
-        float float19 = float9 * float14 + float13 * float15;
-        if (float16 > 1.0f) {
-            float16 = 1.0f;
-        }
-        if (float17 > 1.0f) {
-            float17 = 1.0f;
-        }
-        if (float18 > 1.0f) {
-            float18 = 1.0f;
-        }
-        if (float19 > 1.0f) {
-            float19 = 1.0f;
-        }
-        final int integer5 = (int)(float16 * 255.0f);
-        final int integer6 = (int)(float17 * 255.0f);
-        final int integer7 = (int)(float18 * 255.0f);
-        final int integer8 = (int)(float19 * 255.0f);
-        this.setPixelRGBA(integer1, integer2, combine(integer5, integer6, integer7, integer8));
-    }
-    
     @Deprecated
     public int[] makePixelArray() {
         if (this.format != Format.RGBA) {
@@ -369,22 +331,22 @@ public final class NativeImage implements AutoCloseable {
         }
     }
     
-    public void copyFrom(final NativeImage cxr) {
-        if (cxr.format() != this.format) {
+    public void copyFrom(final NativeImage dgs) {
+        if (dgs.format() != this.format) {
             throw new UnsupportedOperationException("Image formats don't match.");
         }
         final int integer3 = this.format.components();
         this.checkAllocated();
-        cxr.checkAllocated();
-        if (this.width == cxr.width) {
-            MemoryUtil.memCopy(cxr.pixels, this.pixels, Math.min(this.size, cxr.size));
+        dgs.checkAllocated();
+        if (this.width == dgs.width) {
+            MemoryUtil.memCopy(dgs.pixels, this.pixels, Math.min(this.size, dgs.size));
         }
         else {
-            final int integer4 = Math.min(this.getWidth(), cxr.getWidth());
-            for (int integer5 = Math.min(this.getHeight(), cxr.getHeight()), integer6 = 0; integer6 < integer5; ++integer6) {
-                final int integer7 = integer6 * cxr.getWidth() * integer3;
+            final int integer4 = Math.min(this.getWidth(), dgs.getWidth());
+            for (int integer5 = Math.min(this.getHeight(), dgs.getHeight()), integer6 = 0; integer6 < integer5; ++integer6) {
+                final int integer7 = integer6 * dgs.getWidth() * integer3;
                 final int integer8 = integer6 * this.getWidth() * integer3;
-                MemoryUtil.memCopy(cxr.pixels + integer7, this.pixels + integer8, (long)integer4);
+                MemoryUtil.memCopy(dgs.pixels + integer7, this.pixels + integer8, (long)integer4);
             }
         }
     }
@@ -424,13 +386,13 @@ public final class NativeImage implements AutoCloseable {
         }
     }
     
-    public void resizeSubRectTo(final int integer1, final int integer2, final int integer3, final int integer4, final NativeImage cxr) {
+    public void resizeSubRectTo(final int integer1, final int integer2, final int integer3, final int integer4, final NativeImage dgs) {
         this.checkAllocated();
-        if (cxr.format() != this.format) {
+        if (dgs.format() != this.format) {
             throw new UnsupportedOperationException("resizeSubRectTo only works for images of the same format.");
         }
         final int integer5 = this.format.components();
-        STBImageResize.nstbir_resize_uint8(this.pixels + (integer1 + integer2 * this.getWidth()) * integer5, integer3, integer4, this.getWidth() * integer5, cxr.pixels, cxr.getWidth(), cxr.getHeight(), 0, integer5);
+        STBImageResize.nstbir_resize_uint8(this.pixels + (integer1 + integer2 * this.getWidth()) * integer5, integer3, integer4, this.getWidth() * integer5, dgs.pixels, dgs.getWidth(), dgs.getHeight(), 0, integer5);
     }
     
     public void untrack() {
diff --git a/src/com/mojang/blaze3d/platform/ScreenManager.java b/src/com/mojang/blaze3d/platform/ScreenManager.java
index 37cd364..1bb7b60 100644
--- a/src/com/mojang/blaze3d/platform/ScreenManager.java
+++ b/src/com/mojang/blaze3d/platform/ScreenManager.java
@@ -14,16 +14,16 @@ public class ScreenManager {
     private final Long2ObjectMap<Monitor> monitors;
     private final MonitorCreator monitorCreator;
     
-    public ScreenManager(final MonitorCreator cxq) {
+    public ScreenManager(final MonitorCreator dgr) {
         this.monitors = (Long2ObjectMap<Monitor>)new Long2ObjectOpenHashMap();
         RenderSystem.assertThread(RenderSystem::isInInitPhase);
-        this.monitorCreator = cxq;
+        this.monitorCreator = dgr;
         GLFW.glfwSetMonitorCallback(this::onMonitorChange);
         final PointerBuffer pointerBuffer3 = GLFW.glfwGetMonitors();
         if (pointerBuffer3 != null) {
             for (int integer4 = 0; integer4 < pointerBuffer3.limit(); ++integer4) {
                 final long long5 = pointerBuffer3.get(integer4);
-                this.monitors.put(long5, cxq.createMonitor(long5));
+                this.monitors.put(long5, dgr.createMonitor(long5));
             }
         }
     }
@@ -45,22 +45,22 @@ public class ScreenManager {
     }
     
     @Nullable
-    public Monitor findBestMonitor(final Window cxx) {
-        final long long3 = GLFW.glfwGetWindowMonitor(cxx.getWindow());
+    public Monitor findBestMonitor(final Window dgy) {
+        final long long3 = GLFW.glfwGetWindowMonitor(dgy.getWindow());
         if (long3 != 0L) {
             return this.getMonitor(long3);
         }
-        final int integer5 = cxx.getX();
-        final int integer6 = integer5 + cxx.getScreenWidth();
-        final int integer7 = cxx.getY();
-        final int integer8 = integer7 + cxx.getScreenHeight();
+        final int integer5 = dgy.getX();
+        final int integer6 = integer5 + dgy.getScreenWidth();
+        final int integer7 = dgy.getY();
+        final int integer8 = integer7 + dgy.getScreenHeight();
         int integer9 = -1;
-        Monitor cxp10 = null;
-        for (final Monitor cxp11 : this.monitors.values()) {
-            final int integer10 = cxp11.getX();
-            final int integer11 = integer10 + cxp11.getCurrentMode().getWidth();
-            final int integer12 = cxp11.getY();
-            final int integer13 = integer12 + cxp11.getCurrentMode().getHeight();
+        Monitor dgq10 = null;
+        for (final Monitor dgq11 : this.monitors.values()) {
+            final int integer10 = dgq11.getX();
+            final int integer11 = integer10 + dgq11.getCurrentMode().getWidth();
+            final int integer12 = dgq11.getY();
+            final int integer13 = integer12 + dgq11.getCurrentMode().getHeight();
             final int integer14 = clamp(integer5, integer10, integer11);
             final int integer15 = clamp(integer6, integer10, integer11);
             final int integer16 = clamp(integer7, integer12, integer13);
@@ -69,11 +69,11 @@ public class ScreenManager {
             final int integer19 = Math.max(0, integer17 - integer16);
             final int integer20 = integer18 * integer19;
             if (integer20 > integer9) {
-                cxp10 = cxp11;
+                dgq10 = dgq11;
                 integer9 = integer20;
             }
         }
-        return cxp10;
+        return dgq10;
     }
     
     public static int clamp(final int integer1, final int integer2, final int integer3) {
diff --git a/src/com/mojang/blaze3d/platform/VideoMode.java b/src/com/mojang/blaze3d/platform/VideoMode.java
index 817e1e8..4563a51 100644
--- a/src/com/mojang/blaze3d/platform/VideoMode.java
+++ b/src/com/mojang/blaze3d/platform/VideoMode.java
@@ -75,8 +75,8 @@ public final class VideoMode {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final VideoMode cxw3 = (VideoMode)object;
-        return this.width == cxw3.width && this.height == cxw3.height && this.redBits == cxw3.redBits && this.greenBits == cxw3.greenBits && this.blueBits == cxw3.blueBits && this.refreshRate == cxw3.refreshRate;
+        final VideoMode dgx3 = (VideoMode)object;
+        return this.width == dgx3.width && this.height == dgx3.height && this.redBits == dgx3.redBits && this.greenBits == dgx3.greenBits && this.blueBits == dgx3.blueBits && this.refreshRate == dgx3.refreshRate;
     }
     
     @Override
diff --git a/src/com/mojang/blaze3d/platform/Window.java b/src/com/mojang/blaze3d/platform/Window.java
index 9c06688..5200f5e 100644
--- a/src/com/mojang/blaze3d/platform/Window.java
+++ b/src/com/mojang/blaze3d/platform/Window.java
@@ -52,32 +52,32 @@ public final class Window implements AutoCloseable {
     private int framerateLimit;
     private boolean vsync;
     
-    public Window(final WindowEventHandler cxy, final ScreenManager cxt, final DisplayData cxh, @Nullable final String string4, final String string5) {
+    public Window(final WindowEventHandler dgz, final ScreenManager dgu, final DisplayData dgi, @Nullable final String string4, final String string5) {
         this.defaultErrorCallback = GLFWErrorCallback.create(this::defaultErrorCallback);
         this.errorSection = "";
         RenderSystem.assertThread(RenderSystem::isInInitPhase);
-        this.screenManager = cxt;
+        this.screenManager = dgu;
         this.setBootErrorCallback();
         this.setErrorSection("Pre startup");
-        this.eventHandler = cxy;
+        this.eventHandler = dgz;
         final Optional<VideoMode> optional7 = VideoMode.read(string4);
         if (optional7.isPresent()) {
             this.preferredFullscreenVideoMode = optional7;
         }
-        else if (cxh.fullscreenWidth.isPresent() && cxh.fullscreenHeight.isPresent()) {
-            this.preferredFullscreenVideoMode = Optional.<VideoMode>of(new VideoMode(cxh.fullscreenWidth.getAsInt(), cxh.fullscreenHeight.getAsInt(), 8, 8, 8, 60));
+        else if (dgi.fullscreenWidth.isPresent() && dgi.fullscreenHeight.isPresent()) {
+            this.preferredFullscreenVideoMode = Optional.<VideoMode>of(new VideoMode(dgi.fullscreenWidth.getAsInt(), dgi.fullscreenHeight.getAsInt(), 8, 8, 8, 60));
         }
         else {
             this.preferredFullscreenVideoMode = Optional.<VideoMode>empty();
         }
-        final boolean isFullscreen = cxh.isFullscreen;
+        final boolean isFullscreen = dgi.isFullscreen;
         this.fullscreen = isFullscreen;
         this.actuallyFullscreen = isFullscreen;
-        final Monitor cxp8 = cxt.getMonitor(GLFW.glfwGetPrimaryMonitor());
-        final int n = (cxh.width > 0) ? cxh.width : 1;
+        final Monitor dgq8 = dgu.getMonitor(GLFW.glfwGetPrimaryMonitor());
+        final int n = (dgi.width > 0) ? dgi.width : 1;
         this.width = n;
         this.windowedWidth = n;
-        final int n2 = (cxh.height > 0) ? cxh.height : 1;
+        final int n2 = (dgi.height > 0) ? dgi.height : 1;
         this.height = n2;
         this.windowedHeight = n2;
         GLFW.glfwDefaultWindowHints();
@@ -86,13 +86,13 @@ public final class Window implements AutoCloseable {
         GLFW.glfwWindowHint(139266, 2);
         GLFW.glfwWindowHint(139267, 0);
         GLFW.glfwWindowHint(139272, 0);
-        this.window = GLFW.glfwCreateWindow(this.width, this.height, (CharSequence)string5, (this.fullscreen && cxp8 != null) ? cxp8.getMonitor() : 0L, 0L);
-        if (cxp8 != null) {
-            final VideoMode cxw9 = cxp8.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.<VideoMode>empty());
-            final int n3 = cxp8.getX() + cxw9.getWidth() / 2 - this.width / 2;
+        this.window = GLFW.glfwCreateWindow(this.width, this.height, (CharSequence)string5, (this.fullscreen && dgq8 != null) ? dgq8.getMonitor() : 0L, 0L);
+        if (dgq8 != null) {
+            final VideoMode dgx9 = dgq8.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.<VideoMode>empty());
+            final int n3 = dgq8.getX() + dgx9.getWidth() / 2 - this.width / 2;
             this.x = n3;
             this.windowedX = n3;
-            final int n4 = cxp8.getY() + cxw9.getHeight() / 2 - this.height / 2;
+            final int n4 = dgq8.getY() + dgx9.getHeight() / 2 - this.height / 2;
             this.y = n4;
             this.windowedY = n4;
         }
@@ -115,6 +115,7 @@ public final class Window implements AutoCloseable {
         GLFW.glfwSetWindowPosCallback(this.window, this::onMove);
         GLFW.glfwSetWindowSizeCallback(this.window, this::onResize);
         GLFW.glfwSetWindowFocusCallback(this.window, this::onFocus);
+        GLFW.glfwSetCursorEnterCallback(this.window, this::onEnter);
     }
     
     public int getRefreshRate() {
@@ -280,6 +281,12 @@ public final class Window implements AutoCloseable {
         }
     }
     
+    private void onEnter(final long long1, final boolean boolean2) {
+        if (boolean2) {
+            this.eventHandler.cursorEntered();
+        }
+    }
+    
     public void setFramerateLimit(final int integer) {
         this.framerateLimit = integer;
     }
@@ -320,13 +327,13 @@ public final class Window implements AutoCloseable {
         RenderSystem.assertThread(RenderSystem::isInInitPhase);
         final boolean boolean2 = GLFW.glfwGetWindowMonitor(this.window) != 0L;
         if (this.fullscreen) {
-            final Monitor cxp3 = this.screenManager.findBestMonitor(this);
-            if (cxp3 == null) {
+            final Monitor dgq3 = this.screenManager.findBestMonitor(this);
+            if (dgq3 == null) {
                 Window.LOGGER.warn("Failed to find suitable monitor for fullscreen mode");
                 this.fullscreen = false;
             }
             else {
-                final VideoMode cxw4 = cxp3.getPreferredVidMode(this.preferredFullscreenVideoMode);
+                final VideoMode dgx4 = dgq3.getPreferredVidMode(this.preferredFullscreenVideoMode);
                 if (!boolean2) {
                     this.windowedX = this.x;
                     this.windowedY = this.y;
@@ -335,9 +342,9 @@ public final class Window implements AutoCloseable {
                 }
                 this.x = 0;
                 this.y = 0;
-                this.width = cxw4.getWidth();
-                this.height = cxw4.getHeight();
-                GLFW.glfwSetWindowMonitor(this.window, cxp3.getMonitor(), this.x, this.y, this.width, this.height, cxw4.getRefreshRate());
+                this.width = dgx4.getWidth();
+                this.height = dgx4.getHeight();
+                GLFW.glfwSetWindowMonitor(this.window, dgq3.getMonitor(), this.x, this.y, this.width, this.height, dgx4.getRefreshRate());
             }
         }
         else {
diff --git a/src/com/mojang/blaze3d/platform/WindowEventHandler.java b/src/com/mojang/blaze3d/platform/WindowEventHandler.java
index a07c13f..393d984 100644
--- a/src/com/mojang/blaze3d/platform/WindowEventHandler.java
+++ b/src/com/mojang/blaze3d/platform/WindowEventHandler.java
@@ -4,4 +4,6 @@ public interface WindowEventHandler {
     void setWindowActive(final boolean boolean1);
     
     void resizeDisplay();
+    
+    void cursorEntered();
 }
diff --git a/src/com/mojang/blaze3d/shaders/BlendMode.java b/src/com/mojang/blaze3d/shaders/BlendMode.java
index 38d6ad5..76de60d 100644
--- a/src/com/mojang/blaze3d/shaders/BlendMode.java
+++ b/src/com/mojang/blaze3d/shaders/BlendMode.java
@@ -64,8 +64,8 @@ public class BlendMode {
         if (!(object instanceof BlendMode)) {
             return false;
         }
-        final BlendMode cya3 = (BlendMode)object;
-        return this.blendFunc == cya3.blendFunc && this.dstAlphaFactor == cya3.dstAlphaFactor && this.dstColorFactor == cya3.dstColorFactor && this.opaque == cya3.opaque && this.separateBlend == cya3.separateBlend && this.srcAlphaFactor == cya3.srcAlphaFactor && this.srcColorFactor == cya3.srcColorFactor;
+        final BlendMode dhb3 = (BlendMode)object;
+        return this.blendFunc == dhb3.blendFunc && this.dstAlphaFactor == dhb3.dstAlphaFactor && this.dstColorFactor == dhb3.dstColorFactor && this.opaque == dhb3.opaque && this.separateBlend == dhb3.separateBlend && this.srcAlphaFactor == dhb3.srcAlphaFactor && this.srcColorFactor == dhb3.srcColorFactor;
     }
     
     @Override
diff --git a/src/com/mojang/blaze3d/shaders/Program.java b/src/com/mojang/blaze3d/shaders/Program.java
index df3239c..518a469 100644
--- a/src/com/mojang/blaze3d/shaders/Program.java
+++ b/src/com/mojang/blaze3d/shaders/Program.java
@@ -21,10 +21,10 @@ public class Program {
         this.name = string;
     }
     
-    public void attachToEffect(final Effect cyb) {
+    public void attachToEffect(final Effect dhc) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
         ++this.references;
-        GlStateManager.glAttachShader(cyb.getId(), this.id);
+        GlStateManager.glAttachShader(dhc.getId(), this.id);
     }
     
     public void close() {
@@ -53,9 +53,9 @@ public class Program {
             final String string3 = StringUtils.trim(GlStateManager.glGetShaderInfoLog(integer5, 32768));
             throw new IOException("Couldn't compile " + a.getName() + " program: " + string3);
         }
-        final Program cyc6 = new Program(a, integer5, string);
-        a.getPrograms().put(string, cyc6);
-        return cyc6;
+        final Program dhd6 = new Program(a, integer5, string);
+        a.getPrograms().put(string, dhd6);
+        return dhd6;
     }
     
     public enum Type {
diff --git a/src/com/mojang/blaze3d/shaders/ProgramManager.java b/src/com/mojang/blaze3d/shaders/ProgramManager.java
index 071f708..7216c12 100644
--- a/src/com/mojang/blaze3d/shaders/ProgramManager.java
+++ b/src/com/mojang/blaze3d/shaders/ProgramManager.java
@@ -14,11 +14,11 @@ public class ProgramManager {
         GlStateManager._glUseProgram(integer);
     }
     
-    public static void releaseProgram(final Effect cyb) {
+    public static void releaseProgram(final Effect dhc) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
-        cyb.getFragmentProgram().close();
-        cyb.getVertexProgram().close();
-        GlStateManager.glDeleteProgram(cyb.getId());
+        dhc.getFragmentProgram().close();
+        dhc.getVertexProgram().close();
+        GlStateManager.glDeleteProgram(dhc.getId());
     }
     
     public static int createProgram() throws IOException {
@@ -30,15 +30,15 @@ public class ProgramManager {
         return integer1;
     }
     
-    public static void linkProgram(final Effect cyb) throws IOException {
+    public static void linkProgram(final Effect dhc) throws IOException {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
-        cyb.getFragmentProgram().attachToEffect(cyb);
-        cyb.getVertexProgram().attachToEffect(cyb);
-        GlStateManager.glLinkProgram(cyb.getId());
-        final int integer2 = GlStateManager.glGetProgrami(cyb.getId(), 35714);
+        dhc.getFragmentProgram().attachToEffect(dhc);
+        dhc.getVertexProgram().attachToEffect(dhc);
+        GlStateManager.glLinkProgram(dhc.getId());
+        final int integer2 = GlStateManager.glGetProgrami(dhc.getId(), 35714);
         if (integer2 == 0) {
-            ProgramManager.LOGGER.warn("Error encountered when linking program containing VS {} and FS {}. Log output:", cyb.getVertexProgram().getName(), cyb.getFragmentProgram().getName());
-            ProgramManager.LOGGER.warn(GlStateManager.glGetProgramInfoLog(cyb.getId(), 32768));
+            ProgramManager.LOGGER.warn("Error encountered when linking program containing VS {} and FS {}. Log output:", dhc.getVertexProgram().getName(), dhc.getFragmentProgram().getName());
+            ProgramManager.LOGGER.warn(GlStateManager.glGetProgramInfoLog(dhc.getId(), 32768));
         }
     }
     
diff --git a/src/com/mojang/blaze3d/shaders/Uniform.java b/src/com/mojang/blaze3d/shaders/Uniform.java
index a683707..f7536b2 100644
--- a/src/com/mojang/blaze3d/shaders/Uniform.java
+++ b/src/com/mojang/blaze3d/shaders/Uniform.java
@@ -21,11 +21,11 @@ public class Uniform extends AbstractUniform implements AutoCloseable {
     private boolean dirty;
     private final Effect parent;
     
-    public Uniform(final String string, final int integer2, final int integer3, final Effect cyb) {
+    public Uniform(final String string, final int integer2, final int integer3, final Effect dhc) {
         this.name = string;
         this.count = integer3;
         this.type = integer2;
-        this.parent = cyb;
+        this.parent = dhc;
         if (integer2 <= 3) {
             this.intValues = MemoryUtil.memAllocInt(integer3);
             this.floatValues = null;
diff --git a/src/com/mojang/blaze3d/systems/RenderSystem.java b/src/com/mojang/blaze3d/systems/RenderSystem.java
index f5578a0..c4d8f4d 100644
--- a/src/com/mojang/blaze3d/systems/RenderSystem.java
+++ b/src/com/mojang/blaze3d/systems/RenderSystem.java
@@ -2,6 +2,10 @@ package com.mojang.blaze3d.systems;
 
 import com.google.common.collect.Queues;
 import org.apache.logging.log4j.LogManager;
+import net.minecraft.client.Options;
+import net.minecraft.client.GraphicsStatus;
+import net.minecraft.client.Minecraft;
+import com.mojang.math.Vector3f;
 import java.util.function.IntSupplier;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
@@ -73,8 +77,8 @@ public class RenderSystem {
         return true;
     }
     
-    public static void recordRenderCall(final RenderCall cxc) {
-        RenderSystem.recordingQueue.add(cxc);
+    public static void recordRenderCall(final RenderCall dgd) {
+        RenderSystem.recordingQueue.add(dgd);
     }
     
     public static void flipFrame(final long long1) {
@@ -88,8 +92,8 @@ public class RenderSystem {
     public static void replayQueue() {
         RenderSystem.isReplayingQueue = true;
         while (!RenderSystem.recordingQueue.isEmpty()) {
-            final RenderCall cxc1 = RenderSystem.recordingQueue.poll();
-            cxc1.execute();
+            final RenderCall dgd1 = RenderSystem.recordingQueue.poll();
+            dgd1.execute();
         }
         RenderSystem.isReplayingQueue = false;
     }
@@ -103,61 +107,73 @@ public class RenderSystem {
         RenderSystem.lastDrawTime = double3;
     }
     
+    @Deprecated
     public static void pushLightingAttributes() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._pushLightingAttributes();
     }
     
+    @Deprecated
     public static void pushTextureAttributes() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._pushTextureAttributes();
     }
     
+    @Deprecated
     public static void popAttributes() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._popAttributes();
     }
     
+    @Deprecated
     public static void disableAlphaTest() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._disableAlphaTest();
     }
     
+    @Deprecated
     public static void enableAlphaTest() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._enableAlphaTest();
     }
     
+    @Deprecated
     public static void alphaFunc(final int integer, final float float2) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._alphaFunc(integer, float2);
     }
     
+    @Deprecated
     public static void enableLighting() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._enableLighting();
     }
     
+    @Deprecated
     public static void disableLighting() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._disableLighting();
     }
     
+    @Deprecated
     public static void enableColorMaterial() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._enableColorMaterial();
     }
     
+    @Deprecated
     public static void disableColorMaterial() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._disableColorMaterial();
     }
     
+    @Deprecated
     public static void colorMaterial(final int integer1, final int integer2) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._colorMaterial(integer1, integer2);
     }
     
+    @Deprecated
     public static void normal3f(final float float1, final float float2, final float float3) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._normal3f(float1, float2, float3);
@@ -193,9 +209,9 @@ public class RenderSystem {
         GlStateManager._disableBlend();
     }
     
-    public static void blendFunc(final GlStateManager.SourceFactor q, final GlStateManager.DestFactor k) {
+    public static void blendFunc(final GlStateManager.SourceFactor q, final GlStateManager.DestFactor j) {
         assertThread(RenderSystem::isOnGameThread);
-        GlStateManager._blendFunc(q.value, k.value);
+        GlStateManager._blendFunc(q.value, j.value);
     }
     
     public static void blendFunc(final int integer1, final int integer2) {
@@ -203,9 +219,9 @@ public class RenderSystem {
         GlStateManager._blendFunc(integer1, integer2);
     }
     
-    public static void blendFuncSeparate(final GlStateManager.SourceFactor q1, final GlStateManager.DestFactor k2, final GlStateManager.SourceFactor q3, final GlStateManager.DestFactor k4) {
+    public static void blendFuncSeparate(final GlStateManager.SourceFactor q1, final GlStateManager.DestFactor j2, final GlStateManager.SourceFactor q3, final GlStateManager.DestFactor j4) {
         assertThread(RenderSystem::isOnGameThread);
-        GlStateManager._blendFuncSeparate(q1.value, k2.value, q3.value, k4.value);
+        GlStateManager._blendFuncSeparate(q1.value, j2.value, q3.value, j4.value);
     }
     
     public static void blendFuncSeparate(final int integer1, final int integer2, final int integer3, final int integer4) {
@@ -223,46 +239,55 @@ public class RenderSystem {
         GlStateManager._blendColor(float1, float2, float3, float4);
     }
     
+    @Deprecated
     public static void enableFog() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._enableFog();
     }
     
+    @Deprecated
     public static void disableFog() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._disableFog();
     }
     
+    @Deprecated
     public static void fogMode(final GlStateManager.FogMode m) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._fogMode(m.value);
     }
     
+    @Deprecated
     public static void fogMode(final int integer) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._fogMode(integer);
     }
     
+    @Deprecated
     public static void fogDensity(final float float1) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._fogDensity(float1);
     }
     
+    @Deprecated
     public static void fogStart(final float float1) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._fogStart(float1);
     }
     
+    @Deprecated
     public static void fogEnd(final float float1) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._fogEnd(float1);
     }
     
+    @Deprecated
     public static void fog(final int integer, final float float2, final float float3, final float float4, final float float5) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._fog(integer, new float[] { float2, float3, float4, float5 });
     }
     
+    @Deprecated
     public static void fogi(final int integer1, final int integer2) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._fogi(integer1, integer2);
@@ -351,16 +376,19 @@ public class RenderSystem {
         GlStateManager._bindTexture(integer);
     }
     
+    @Deprecated
     public static void shadeModel(final int integer) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._shadeModel(integer);
     }
     
+    @Deprecated
     public static void enableRescaleNormal() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._enableRescaleNormal();
     }
     
+    @Deprecated
     public static void disableRescaleNormal() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._disableRescaleNormal();
@@ -411,71 +439,85 @@ public class RenderSystem {
         GlStateManager._clear(integer, boolean2);
     }
     
+    @Deprecated
     public static void matrixMode(final int integer) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._matrixMode(integer);
     }
     
+    @Deprecated
     public static void loadIdentity() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._loadIdentity();
     }
     
+    @Deprecated
     public static void pushMatrix() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._pushMatrix();
     }
     
+    @Deprecated
     public static void popMatrix() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._popMatrix();
     }
     
+    @Deprecated
     public static void ortho(final double double1, final double double2, final double double3, final double double4, final double double5, final double double6) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._ortho(double1, double2, double3, double4, double5, double6);
     }
     
+    @Deprecated
     public static void rotatef(final float float1, final float float2, final float float3, final float float4) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._rotatef(float1, float2, float3, float4);
     }
     
+    @Deprecated
     public static void scalef(final float float1, final float float2, final float float3) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._scalef(float1, float2, float3);
     }
     
+    @Deprecated
     public static void scaled(final double double1, final double double2, final double double3) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._scaled(double1, double2, double3);
     }
     
+    @Deprecated
     public static void translatef(final float float1, final float float2, final float float3) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._translatef(float1, float2, float3);
     }
     
+    @Deprecated
     public static void translated(final double double1, final double double2, final double double3) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._translated(double1, double2, double3);
     }
     
+    @Deprecated
     public static void multMatrix(final Matrix4f b) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._multMatrix(b);
     }
     
+    @Deprecated
     public static void color4f(final float float1, final float float2, final float float3, final float float4) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._color4f(float1, float2, float3, float4);
     }
     
+    @Deprecated
     public static void color3f(final float float1, final float float2, final float float3) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._color4f(float1, float2, float3, 1.0f);
     }
     
+    @Deprecated
     public static void clearCurrentColor() {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._clearCurrentColor();
@@ -545,6 +587,7 @@ public class RenderSystem {
         GLX._setupNvFogDistance();
     }
     
+    @Deprecated
     public static void glMultiTexCoord2f(final int integer, final float float2, final float float3) {
         assertThread(RenderSystem::isOnGameThread);
         GlStateManager._glMultiTexCoord2f(integer, float2, float3);
@@ -681,19 +724,19 @@ public class RenderSystem {
         GlStateManager.teardownOverlayColor();
     }
     
-    public static void setupLevelDiffuseLighting(final Matrix4f b) {
+    public static void setupLevelDiffuseLighting(final Vector3f g1, final Vector3f g2, final Matrix4f b) {
         assertThread(RenderSystem::isOnGameThread);
-        GlStateManager.setupLevelDiffuseLighting(b);
+        GlStateManager.setupLevelDiffuseLighting(g1, g2, b);
     }
     
-    public static void setupGuiFlatDiffuseLighting() {
+    public static void setupGuiFlatDiffuseLighting(final Vector3f g1, final Vector3f g2) {
         assertThread(RenderSystem::isOnGameThread);
-        GlStateManager.setupGuiFlatDiffuseLighting();
+        GlStateManager.setupGuiFlatDiffuseLighting(g1, g2);
     }
     
-    public static void setupGui3DDiffuseLighting() {
+    public static void setupGui3DDiffuseLighting(final Vector3f g1, final Vector3f g2) {
         assertThread(RenderSystem::isOnGameThread);
-        GlStateManager.setupGui3DDiffuseLighting();
+        GlStateManager.setupGui3DDiffuseLighting(g1, g2);
     }
     
     public static void mulTextureByProjModelView() {
@@ -747,6 +790,20 @@ public class RenderSystem {
         alphaFunc(516, 0.1f);
     }
     
+    @Deprecated
+    public static void runAsFancy(final Runnable runnable) {
+        final boolean boolean2 = Minecraft.useShaderTransparency();
+        if (!boolean2) {
+            runnable.run();
+            return;
+        }
+        final Options dmb3 = Minecraft.getInstance().options;
+        final GraphicsStatus dlr4 = dmb3.graphicsMode;
+        dmb3.graphicsMode = GraphicsStatus.FANCY;
+        runnable.run();
+        dmb3.graphicsMode = dlr4;
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
         recordingQueue = Queues.<RenderCall>newConcurrentLinkedQueue();
diff --git a/src/com/mojang/blaze3d/vertex/BufferBuilder.java b/src/com/mojang/blaze3d/vertex/BufferBuilder.java
index d48047d..7c55ab8 100644
--- a/src/com/mojang/blaze3d/vertex/BufferBuilder.java
+++ b/src/com/mojang/blaze3d/vertex/BufferBuilder.java
@@ -152,31 +152,31 @@ public class BufferBuilder extends DefaultedVertexConsumer implements BufferVert
         this.buffer.position(this.totalRenderedBytes);
         this.buffer.put(b.data);
         this.buffer.clear();
-        final VertexFormat cyp4 = b.format;
-        this.switchFormat(cyp4);
-        this.vertices = integer3 / cyp4.getVertexSize();
-        this.nextElementByte = this.totalRenderedBytes + this.vertices * cyp4.getVertexSize();
+        final VertexFormat dhq4 = b.format;
+        this.switchFormat(dhq4);
+        this.vertices = integer3 / dhq4.getVertexSize();
+        this.nextElementByte = this.totalRenderedBytes + this.vertices * dhq4.getVertexSize();
     }
     
-    public void begin(final int integer, final VertexFormat cyp) {
+    public void begin(final int integer, final VertexFormat dhq) {
         if (this.building) {
             throw new IllegalStateException("Already building!");
         }
         this.building = true;
         this.mode = integer;
-        this.switchFormat(cyp);
-        this.currentElement = cyp.getElements().get(0);
+        this.switchFormat(dhq);
+        this.currentElement = dhq.getElements().get(0);
         this.elementIndex = 0;
         this.buffer.clear();
     }
     
-    private void switchFormat(final VertexFormat cyp) {
-        if (this.format == cyp) {
+    private void switchFormat(final VertexFormat dhq) {
+        if (this.format == dhq) {
             return;
         }
-        this.format = cyp;
-        final boolean boolean3 = cyp == DefaultVertexFormat.NEW_ENTITY;
-        final boolean boolean4 = cyp == DefaultVertexFormat.BLOCK;
+        this.format = dhq;
+        final boolean boolean3 = dhq == DefaultVertexFormat.NEW_ENTITY;
+        final boolean boolean4 = dhq == DefaultVertexFormat.BLOCK;
         this.fastFormat = (boolean3 || boolean4);
         this.fullFormat = boolean3;
     }
@@ -222,9 +222,9 @@ public class BufferBuilder extends DefaultedVertexConsumer implements BufferVert
         final ImmutableList<VertexFormatElement> immutableList2 = this.format.getElements();
         this.elementIndex = (this.elementIndex + 1) % immutableList2.size();
         this.nextElementByte += this.currentElement.getByteSize();
-        final VertexFormatElement cyq3 = immutableList2.get(this.elementIndex);
-        this.currentElement = cyq3;
-        if (cyq3.getUsage() == VertexFormatElement.Usage.PADDING) {
+        final VertexFormatElement dhr3 = immutableList2.get(this.elementIndex);
+        this.currentElement = dhr3;
+        if (dhr3.getUsage() == VertexFormatElement.Usage.PADDING) {
             this.nextElement();
         }
         if (this.defaultColorSet && this.currentElement.getUsage() == VertexFormatElement.Usage.COLOR) {
@@ -324,9 +324,9 @@ public class BufferBuilder extends DefaultedVertexConsumer implements BufferVert
         private final ByteBuffer data;
         private final VertexFormat format;
         
-        private State(final ByteBuffer byteBuffer, final VertexFormat cyp) {
+        private State(final ByteBuffer byteBuffer, final VertexFormat dhq) {
             this.data = byteBuffer;
-            this.format = cyp;
+            this.format = dhq;
         }
     }
     
@@ -335,8 +335,8 @@ public class BufferBuilder extends DefaultedVertexConsumer implements BufferVert
         private final int vertexCount;
         private final int mode;
         
-        private DrawState(final VertexFormat cyp, final int integer2, final int integer3) {
-            this.format = cyp;
+        private DrawState(final VertexFormat dhq, final int integer2, final int integer3) {
+            this.format = dhq;
             this.vertexCount = integer2;
             this.mode = integer3;
         }
diff --git a/src/com/mojang/blaze3d/vertex/BufferUploader.java b/src/com/mojang/blaze3d/vertex/BufferUploader.java
index f2b329c..14bd4e5 100644
--- a/src/com/mojang/blaze3d/vertex/BufferUploader.java
+++ b/src/com/mojang/blaze3d/vertex/BufferUploader.java
@@ -7,31 +7,31 @@ import java.nio.ByteBuffer;
 import com.mojang.blaze3d.systems.RenderSystem;
 
 public class BufferUploader {
-    public static void end(final BufferBuilder cyg) {
+    public static void end(final BufferBuilder dhg) {
         if (!RenderSystem.isOnRenderThread()) {
             final Pair<BufferBuilder.DrawState, ByteBuffer> pair2;
             final BufferBuilder.DrawState a3;
             RenderSystem.recordRenderCall(() -> {
-                pair2 = cyg.popNextBuffer();
+                pair2 = dhg.popNextBuffer();
                 a3 = (BufferBuilder.DrawState)pair2.getFirst();
                 _end((ByteBuffer)pair2.getSecond(), a3.mode(), a3.format(), a3.vertexCount());
             });
         }
         else {
-            final Pair<BufferBuilder.DrawState, ByteBuffer> pair3 = cyg.popNextBuffer();
+            final Pair<BufferBuilder.DrawState, ByteBuffer> pair3 = dhg.popNextBuffer();
             final BufferBuilder.DrawState a4 = (BufferBuilder.DrawState)pair3.getFirst();
             _end((ByteBuffer)pair3.getSecond(), a4.mode(), a4.format(), a4.vertexCount());
         }
     }
     
-    private static void _end(final ByteBuffer byteBuffer, final int integer2, final VertexFormat cyp, final int integer4) {
+    private static void _end(final ByteBuffer byteBuffer, final int integer2, final VertexFormat dhq, final int integer4) {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
         byteBuffer.clear();
         if (integer4 <= 0) {
             return;
         }
-        cyp.setupBufferState(MemoryUtil.memAddress(byteBuffer));
+        dhq.setupBufferState(MemoryUtil.memAddress(byteBuffer));
         GlStateManager._drawArrays(integer2, 0, integer4);
-        cyp.clearBufferState();
+        dhq.clearBufferState();
     }
 }
diff --git a/src/com/mojang/blaze3d/vertex/BufferVertexConsumer.java b/src/com/mojang/blaze3d/vertex/BufferVertexConsumer.java
index fc6ac63..3f9801e 100644
--- a/src/com/mojang/blaze3d/vertex/BufferVertexConsumer.java
+++ b/src/com/mojang/blaze3d/vertex/BufferVertexConsumer.java
@@ -25,11 +25,11 @@ public interface BufferVertexConsumer extends VertexConsumer {
     }
     
     default VertexConsumer color(final int integer1, final int integer2, final int integer3, final int integer4) {
-        final VertexFormatElement cyq6 = this.currentElement();
-        if (cyq6.getUsage() != VertexFormatElement.Usage.COLOR) {
+        final VertexFormatElement dhr6 = this.currentElement();
+        if (dhr6.getUsage() != VertexFormatElement.Usage.COLOR) {
             return this;
         }
-        if (cyq6.getType() != VertexFormatElement.Type.UBYTE) {
+        if (dhr6.getType() != VertexFormatElement.Type.UBYTE) {
             throw new IllegalStateException();
         }
         this.putByte(0, (byte)integer1);
@@ -41,11 +41,11 @@ public interface BufferVertexConsumer extends VertexConsumer {
     }
     
     default VertexConsumer uv(final float float1, final float float2) {
-        final VertexFormatElement cyq4 = this.currentElement();
-        if (cyq4.getUsage() != VertexFormatElement.Usage.UV || cyq4.getIndex() != 0) {
+        final VertexFormatElement dhr4 = this.currentElement();
+        if (dhr4.getUsage() != VertexFormatElement.Usage.UV || dhr4.getIndex() != 0) {
             return this;
         }
-        if (cyq4.getType() != VertexFormatElement.Type.FLOAT) {
+        if (dhr4.getType() != VertexFormatElement.Type.FLOAT) {
             throw new IllegalStateException();
         }
         this.putFloat(0, float1);
@@ -63,11 +63,11 @@ public interface BufferVertexConsumer extends VertexConsumer {
     }
     
     default VertexConsumer uvShort(final short short1, final short short2, final int integer) {
-        final VertexFormatElement cyq5 = this.currentElement();
-        if (cyq5.getUsage() != VertexFormatElement.Usage.UV || cyq5.getIndex() != integer) {
+        final VertexFormatElement dhr5 = this.currentElement();
+        if (dhr5.getUsage() != VertexFormatElement.Usage.UV || dhr5.getIndex() != integer) {
             return this;
         }
-        if (cyq5.getType() != VertexFormatElement.Type.SHORT) {
+        if (dhr5.getType() != VertexFormatElement.Type.SHORT) {
             throw new IllegalStateException();
         }
         this.putShort(0, short1);
@@ -77,11 +77,11 @@ public interface BufferVertexConsumer extends VertexConsumer {
     }
     
     default VertexConsumer normal(final float float1, final float float2, final float float3) {
-        final VertexFormatElement cyq5 = this.currentElement();
-        if (cyq5.getUsage() != VertexFormatElement.Usage.NORMAL) {
+        final VertexFormatElement dhr5 = this.currentElement();
+        if (dhr5.getUsage() != VertexFormatElement.Usage.NORMAL) {
             return this;
         }
-        if (cyq5.getType() != VertexFormatElement.Type.BYTE) {
+        if (dhr5.getType() != VertexFormatElement.Type.BYTE) {
             throw new IllegalStateException();
         }
         this.putByte(0, normalIntValue(float1));
diff --git a/src/com/mojang/blaze3d/vertex/PoseStack.java b/src/com/mojang/blaze3d/vertex/PoseStack.java
index bea6a31..4b85390 100644
--- a/src/com/mojang/blaze3d/vertex/PoseStack.java
+++ b/src/com/mojang/blaze3d/vertex/PoseStack.java
@@ -45,10 +45,10 @@ public class PoseStack {
         a5.normal.mul(Matrix3f.createScaleMatrix(float7 * float4, float7 * float5, float7 * float6));
     }
     
-    public void mulPose(final Quaternion c) {
+    public void mulPose(final Quaternion d) {
         final Pose a3 = this.poseStack.getLast();
-        a3.pose.multiply(c);
-        a3.normal.mul(c);
+        a3.pose.multiply(d);
+        a3.normal.mul(d);
     }
     
     public void pushPose() {
diff --git a/src/com/mojang/blaze3d/vertex/BreakingTextureGenerator.java b/src/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
similarity index 71%
rename from src/com/mojang/blaze3d/vertex/BreakingTextureGenerator.java
rename to src/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
index ec45a67..1dee6a3 100644
--- a/src/com/mojang/blaze3d/vertex/BreakingTextureGenerator.java
+++ b/src/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
@@ -6,10 +6,10 @@ import com.mojang.math.Vector3f;
 import com.mojang.math.Matrix3f;
 import com.mojang.math.Matrix4f;
 
-public class BreakingTextureGenerator extends DefaultedVertexConsumer {
+public class SheetedDecalTextureGenerator extends DefaultedVertexConsumer {
     private final VertexConsumer delegate;
     private final Matrix4f cameraInversePose;
-    private final Matrix3f normalPose;
+    private final Matrix3f normalInversePose;
     private float x;
     private float y;
     private float z;
@@ -20,10 +20,10 @@ public class BreakingTextureGenerator extends DefaultedVertexConsumer {
     private float ny;
     private float nz;
     
-    public BreakingTextureGenerator(final VertexConsumer cyo, final PoseStack.Pose a) {
-        this.delegate = cyo;
-        (this.cameraInversePose = a.pose().copy()).invert();
-        (this.normalPose = a.normal().copy()).invert();
+    public SheetedDecalTextureGenerator(final VertexConsumer dhp, final Matrix4f b, final Matrix3f a) {
+        this.delegate = dhp;
+        (this.cameraInversePose = b.copy()).invert();
+        (this.normalInversePose = a.copy()).invert();
         this.resetState();
     }
     
@@ -41,16 +41,16 @@ public class BreakingTextureGenerator extends DefaultedVertexConsumer {
     
     @Override
     public void endVertex() {
-        final Vector3f e2 = new Vector3f(this.nx, this.ny, this.nz);
-        e2.transform(this.normalPose);
-        final Direction fp3 = Direction.getNearest(e2.x(), e2.y(), e2.z());
-        final Vector4f f4 = new Vector4f(this.x, this.y, this.z, 1.0f);
-        f4.transform(this.cameraInversePose);
-        f4.transform(Vector3f.YP.rotationDegrees(180.0f));
-        f4.transform(Vector3f.XP.rotationDegrees(-90.0f));
-        f4.transform(fp3.getRotation());
-        final float float5 = -f4.x();
-        final float float6 = -f4.y();
+        final Vector3f g2 = new Vector3f(this.nx, this.ny, this.nz);
+        g2.transform(this.normalInversePose);
+        final Direction fz3 = Direction.getNearest(g2.x(), g2.y(), g2.z());
+        final Vector4f h4 = new Vector4f(this.x, this.y, this.z, 1.0f);
+        h4.transform(this.cameraInversePose);
+        h4.transform(Vector3f.YP.rotationDegrees(180.0f));
+        h4.transform(Vector3f.XP.rotationDegrees(-90.0f));
+        h4.transform(fz3.getRotation());
+        final float float5 = -h4.x();
+        final float float6 = -h4.y();
         this.delegate.vertex(this.x, this.y, this.z).color(1.0f, 1.0f, 1.0f, 1.0f).uv(float5, float6).overlayCoords(this.overlayU, this.overlayV).uv2(this.lightCoords).normal(this.nx, this.ny, this.nz).endVertex();
         this.resetState();
     }
diff --git a/src/com/mojang/blaze3d/vertex/VertexBuffer.java b/src/com/mojang/blaze3d/vertex/VertexBuffer.java
index 0adbcfd..a215dcf 100644
--- a/src/com/mojang/blaze3d/vertex/VertexBuffer.java
+++ b/src/com/mojang/blaze3d/vertex/VertexBuffer.java
@@ -11,8 +11,8 @@ public class VertexBuffer implements AutoCloseable {
     private final VertexFormat format;
     private int vertexCount;
     
-    public VertexBuffer(final VertexFormat cyp) {
-        this.format = cyp;
+    public VertexBuffer(final VertexFormat dhq) {
+        this.format = dhq;
         RenderSystem.glGenBuffers(integer -> this.id = integer);
     }
     
@@ -20,25 +20,25 @@ public class VertexBuffer implements AutoCloseable {
         RenderSystem.glBindBuffer(34962, () -> this.id);
     }
     
-    public void upload(final BufferBuilder cyg) {
+    public void upload(final BufferBuilder dhg) {
         if (!RenderSystem.isOnRenderThread()) {
-            RenderSystem.recordRenderCall(() -> this.upload_(cyg));
+            RenderSystem.recordRenderCall(() -> this.upload_(dhg));
         }
         else {
-            this.upload_(cyg);
+            this.upload_(dhg);
         }
     }
     
-    public CompletableFuture<Void> uploadLater(final BufferBuilder cyg) {
+    public CompletableFuture<Void> uploadLater(final BufferBuilder dhg) {
         if (!RenderSystem.isOnRenderThread()) {
-            return CompletableFuture.runAsync(() -> this.upload_(cyg), runnable -> RenderSystem.recordRenderCall(runnable::run));
+            return CompletableFuture.runAsync(() -> this.upload_(dhg), runnable -> RenderSystem.recordRenderCall(runnable::run));
         }
-        this.upload_(cyg);
+        this.upload_(dhg);
         return CompletableFuture.<Void>completedFuture((Void)null);
     }
     
-    private void upload_(final BufferBuilder cyg) {
-        final Pair<BufferBuilder.DrawState, ByteBuffer> pair3 = cyg.popNextBuffer();
+    private void upload_(final BufferBuilder dhg) {
+        final Pair<BufferBuilder.DrawState, ByteBuffer> pair3 = dhg.popNextBuffer();
         if (this.id == -1) {
             return;
         }
diff --git a/src/com/mojang/blaze3d/vertex/VertexConsumer.java b/src/com/mojang/blaze3d/vertex/VertexConsumer.java
index c7223f3..886bfc2 100644
--- a/src/com/mojang/blaze3d/vertex/VertexConsumer.java
+++ b/src/com/mojang/blaze3d/vertex/VertexConsumer.java
@@ -51,16 +51,16 @@ public interface VertexConsumer {
         return this.overlayCoords(integer & 0xFFFF, integer >> 16 & 0xFFFF);
     }
     
-    default void putBulkData(final PoseStack.Pose a, final BakedQuad drn, final float float3, final float float4, final float float5, final int integer6, final int integer7) {
-        this.putBulkData(a, drn, new float[] { 1.0f, 1.0f, 1.0f, 1.0f }, float3, float4, float5, new int[] { integer6, integer6, integer6, integer6 }, integer7, false);
+    default void putBulkData(final PoseStack.Pose a, final BakedQuad ect, final float float3, final float float4, final float float5, final int integer6, final int integer7) {
+        this.putBulkData(a, ect, new float[] { 1.0f, 1.0f, 1.0f, 1.0f }, float3, float4, float5, new int[] { integer6, integer6, integer6, integer6 }, integer7, false);
     }
     
-    default void putBulkData(final PoseStack.Pose a, final BakedQuad drn, final float[] arr, final float float4, final float float5, final float float6, final int[] arr, final int integer, final boolean boolean9) {
-        final int[] arr2 = drn.getVertices();
-        final Vec3i gg12 = drn.getDirection().getNormal();
-        final Vector3f e13 = new Vector3f((float)gg12.getX(), (float)gg12.getY(), (float)gg12.getZ());
+    default void putBulkData(final PoseStack.Pose a, final BakedQuad ect, final float[] arr, final float float4, final float float5, final float float6, final int[] arr, final int integer, final boolean boolean9) {
+        final int[] arr2 = ect.getVertices();
+        final Vec3i gr12 = ect.getDirection().getNormal();
+        final Vector3f g13 = new Vector3f((float)gr12.getX(), (float)gr12.getY(), (float)gr12.getZ());
         final Matrix4f b14 = a.pose();
-        e13.transform(a.normal());
+        g13.transform(a.normal());
         final int integer2 = 8;
         final int integer3 = arr2.length / 8;
         try (final MemoryStack memoryStack17 = MemoryStack.stackPush()) {
@@ -91,22 +91,22 @@ public interface VertexConsumer {
                 final int integer5 = arr[integer4];
                 final float float11 = byteBuffer19.getFloat(16);
                 final float float12 = byteBuffer19.getFloat(20);
-                final Vector4f f31 = new Vector4f(float7, float8, float9, 1.0f);
-                f31.transform(b14);
-                this.vertex(f31.x(), f31.y(), f31.z(), float13, float14, float15, 1.0f, float11, float12, integer, integer5, e13.x(), e13.y(), e13.z());
+                final Vector4f h31 = new Vector4f(float7, float8, float9, 1.0f);
+                h31.transform(b14);
+                this.vertex(h31.x(), h31.y(), h31.z(), float13, float14, float15, 1.0f, float11, float12, integer, integer5, g13.x(), g13.y(), g13.z());
             }
         }
     }
     
     default VertexConsumer vertex(final Matrix4f b, final float float2, final float float3, final float float4) {
-        final Vector4f f6 = new Vector4f(float2, float3, float4, 1.0f);
-        f6.transform(b);
-        return this.vertex(f6.x(), f6.y(), f6.z());
+        final Vector4f h6 = new Vector4f(float2, float3, float4, 1.0f);
+        h6.transform(b);
+        return this.vertex(h6.x(), h6.y(), h6.z());
     }
     
     default VertexConsumer normal(final Matrix3f a, final float float2, final float float3, final float float4) {
-        final Vector3f e6 = new Vector3f(float2, float3, float4);
-        e6.transform(a);
-        return this.normal(e6.x(), e6.y(), e6.z());
+        final Vector3f g6 = new Vector3f(float2, float3, float4);
+        g6.transform(a);
+        return this.normal(g6.x(), g6.y(), g6.z());
     }
 }
diff --git a/src/com/mojang/blaze3d/vertex/VertexFormat.java b/src/com/mojang/blaze3d/vertex/VertexFormat.java
index b892ba9..23cd7ae 100644
--- a/src/com/mojang/blaze3d/vertex/VertexFormat.java
+++ b/src/com/mojang/blaze3d/vertex/VertexFormat.java
@@ -19,9 +19,9 @@ public class VertexFormat {
         this.offsets = (IntList)new IntArrayList();
         this.elements = immutableList;
         int integer3 = 0;
-        for (final VertexFormatElement cyq5 : immutableList) {
+        for (final VertexFormatElement dhr5 : immutableList) {
             this.offsets.add(integer3);
-            integer3 += cyq5.getByteSize();
+            integer3 += dhr5.getByteSize();
         }
         this.vertexSize = integer3;
     }
@@ -51,8 +51,8 @@ public class VertexFormat {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final VertexFormat cyp3 = (VertexFormat)object;
-        return this.vertexSize == cyp3.vertexSize && this.elements.equals(cyp3.elements);
+        final VertexFormat dhq3 = (VertexFormat)object;
+        return this.vertexSize == dhq3.vertexSize && this.elements.equals(dhq3.elements);
     }
     
     @Override
@@ -77,8 +77,8 @@ public class VertexFormat {
             RenderSystem.recordRenderCall(this::clearBufferState);
             return;
         }
-        for (final VertexFormatElement cyq3 : this.getElements()) {
-            cyq3.clearBufferState();
+        for (final VertexFormatElement dhr3 : this.getElements()) {
+            dhr3.clearBufferState();
         }
     }
 }
diff --git a/src/com/mojang/blaze3d/vertex/VertexFormatElement.java b/src/com/mojang/blaze3d/vertex/VertexFormatElement.java
index 7dc8906..1743321 100644
--- a/src/com/mojang/blaze3d/vertex/VertexFormatElement.java
+++ b/src/com/mojang/blaze3d/vertex/VertexFormatElement.java
@@ -39,10 +39,6 @@ public class VertexFormatElement {
         return this.usage;
     }
     
-    public final int getCount() {
-        return this.count;
-    }
-    
     public final int getIndex() {
         return this.index;
     }
@@ -56,10 +52,6 @@ public class VertexFormatElement {
         return this.byteSize;
     }
     
-    public final boolean isPosition() {
-        return this.usage == Usage.POSITION;
-    }
-    
     @Override
     public boolean equals(final Object object) {
         if (this == object) {
@@ -68,8 +60,8 @@ public class VertexFormatElement {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final VertexFormatElement cyq3 = (VertexFormatElement)object;
-        return this.count == cyq3.count && this.index == cyq3.index && this.type == cyq3.type && this.usage == cyq3.usage;
+        final VertexFormatElement dhr3 = (VertexFormatElement)object;
+        return this.count == dhr3.count && this.index == dhr3.index && this.type == dhr3.type && this.usage == dhr3.usage;
     }
     
     @Override
diff --git a/src/com/mojang/blaze3d/vertex/VertexMultiConsumer.java b/src/com/mojang/blaze3d/vertex/VertexMultiConsumer.java
index 888bf88..3366c85 100644
--- a/src/com/mojang/blaze3d/vertex/VertexMultiConsumer.java
+++ b/src/com/mojang/blaze3d/vertex/VertexMultiConsumer.java
@@ -1,20 +1,20 @@
 package com.mojang.blaze3d.vertex;
 
 public class VertexMultiConsumer {
-    public static VertexConsumer create(final VertexConsumer cyo1, final VertexConsumer cyo2) {
-        return new Double(cyo1, cyo2);
+    public static VertexConsumer create(final VertexConsumer dhp1, final VertexConsumer dhp2) {
+        return new Double(dhp1, dhp2);
     }
     
     static class Double implements VertexConsumer {
         private final VertexConsumer first;
         private final VertexConsumer second;
         
-        public Double(final VertexConsumer cyo1, final VertexConsumer cyo2) {
-            if (cyo1 == cyo2) {
+        public Double(final VertexConsumer dhp1, final VertexConsumer dhp2) {
+            if (dhp1 == dhp2) {
                 throw new IllegalArgumentException("Duplicate delegates");
             }
-            this.first = cyo1;
-            this.second = cyo2;
+            this.first = dhp1;
+            this.second = dhp2;
         }
         
         @Override
diff --git a/src/com/mojang/math/Matrix3f.java b/src/com/mojang/math/Matrix3f.java
index 1fbd734..bfc9ba0 100644
--- a/src/com/mojang/math/Matrix3f.java
+++ b/src/com/mojang/math/Matrix3f.java
@@ -22,11 +22,11 @@ public final class Matrix3f {
     public Matrix3f() {
     }
     
-    public Matrix3f(final Quaternion c) {
-        final float float3 = c.i();
-        final float float4 = c.j();
-        final float float5 = c.k();
-        final float float6 = c.r();
+    public Matrix3f(final Quaternion d) {
+        final float float3 = d.i();
+        final float float4 = d.j();
+        final float float5 = d.k();
+        final float float6 = d.r();
         final float float7 = 2.0f * float3 * float3;
         final float float8 = 2.0f * float4 * float4;
         final float float9 = 2.0f * float5 * float5;
@@ -106,16 +106,16 @@ public final class Matrix3f {
     
     private static Quaternion stepJacobi(final Matrix3f a) {
         final Matrix3f a2 = new Matrix3f();
-        final Quaternion c3 = Quaternion.ONE.copy();
+        final Quaternion d3 = Quaternion.ONE.copy();
         if (a.m01 * a.m01 + a.m10 * a.m10 > 1.0E-6f) {
             final Pair<Float, Float> pair4 = approxGivensQuat(a.m00, 0.5f * (a.m01 + a.m10), a.m11);
             final Float float5 = (Float)pair4.getFirst();
             final Float float6 = (Float)pair4.getSecond();
-            final Quaternion c4 = new Quaternion(0.0f, 0.0f, float5, float6);
+            final Quaternion d4 = new Quaternion(0.0f, 0.0f, float5, float6);
             final float float7 = float6 * float6 - float5 * float5;
             final float float8 = -2.0f * float5 * float6;
             final float float9 = float6 * float6 + float5 * float5;
-            c3.mul(c4);
+            d3.mul(d4);
             a2.setIdentity();
             a2.m00 = float7;
             a2.m11 = float7;
@@ -131,11 +131,11 @@ public final class Matrix3f {
             final Pair<Float, Float> pair4 = approxGivensQuat(a.m00, 0.5f * (a.m02 + a.m20), a.m22);
             final float float10 = -(float)pair4.getFirst();
             final Float float6 = (Float)pair4.getSecond();
-            final Quaternion c4 = new Quaternion(0.0f, float10, 0.0f, float6);
+            final Quaternion d4 = new Quaternion(0.0f, float10, 0.0f, float6);
             final float float7 = float6 * float6 - float10 * float10;
             final float float8 = -2.0f * float10 * float6;
             final float float9 = float6 * float6 + float10 * float10;
-            c3.mul(c4);
+            d3.mul(d4);
             a2.setIdentity();
             a2.m00 = float7;
             a2.m22 = float7;
@@ -151,11 +151,11 @@ public final class Matrix3f {
             final Pair<Float, Float> pair4 = approxGivensQuat(a.m11, 0.5f * (a.m12 + a.m21), a.m22);
             final Float float5 = (Float)pair4.getFirst();
             final Float float6 = (Float)pair4.getSecond();
-            final Quaternion c4 = new Quaternion(float5, 0.0f, 0.0f, float6);
+            final Quaternion d4 = new Quaternion(float5, 0.0f, 0.0f, float6);
             final float float7 = float6 * float6 - float5 * float5;
             final float float8 = -2.0f * float5 * float6;
             final float float9 = float6 * float6 + float5 * float5;
-            c3.mul(c4);
+            d3.mul(d4);
             a2.setIdentity();
             a2.m11 = float7;
             a2.m22 = float7;
@@ -167,7 +167,7 @@ public final class Matrix3f {
             a2.mul(a);
             a.load(a2);
         }
-        return c3;
+        return d3;
     }
     
     public void transpose() {
@@ -183,17 +183,17 @@ public final class Matrix3f {
     }
     
     public Triple<Quaternion, Vector3f, Quaternion> svdDecompose() {
-        final Quaternion c2 = Quaternion.ONE.copy();
-        final Quaternion c3 = Quaternion.ONE.copy();
+        final Quaternion d2 = Quaternion.ONE.copy();
+        final Quaternion d3 = Quaternion.ONE.copy();
         final Matrix3f a4 = this.copy();
         a4.transpose();
         a4.mul(this);
         for (int integer5 = 0; integer5 < 5; ++integer5) {
-            c3.mul(stepJacobi(a4));
+            d3.mul(stepJacobi(a4));
         }
-        c3.normalize();
+        d3.normalize();
         final Matrix3f a5 = new Matrix3f(this);
-        a5.mul(new Matrix3f(c3));
+        a5.mul(new Matrix3f(d3));
         float float7 = 1.0f;
         Pair<Float, Float> pair6 = qrGivensQuat(a5.m00, a5.m10);
         final Float float8 = (Float)pair6.getFirst();
@@ -201,8 +201,8 @@ public final class Matrix3f {
         final float float10 = float9 * float9 - float8 * float8;
         final float float11 = -2.0f * float8 * float9;
         final float float12 = float9 * float9 + float8 * float8;
-        final Quaternion c4 = new Quaternion(0.0f, 0.0f, float8, float9);
-        c2.mul(c4);
+        final Quaternion d4 = new Quaternion(0.0f, 0.0f, float8, float9);
+        d2.mul(d4);
         final Matrix3f a6 = new Matrix3f();
         a6.setIdentity();
         a6.m00 = float10;
@@ -218,8 +218,8 @@ public final class Matrix3f {
         final float float15 = float14 * float14 - float13 * float13;
         final float float16 = -2.0f * float13 * float14;
         final float float17 = float14 * float14 + float13 * float13;
-        final Quaternion c5 = new Quaternion(0.0f, float13, 0.0f, float14);
-        c2.mul(c5);
+        final Quaternion d5 = new Quaternion(0.0f, float13, 0.0f, float14);
+        d2.mul(d5);
         final Matrix3f a7 = new Matrix3f();
         a7.setIdentity();
         a7.m00 = float15;
@@ -235,8 +235,8 @@ public final class Matrix3f {
         final float float20 = float19 * float19 - float18 * float18;
         final float float21 = -2.0f * float18 * float19;
         final float float22 = float19 * float19 + float18 * float18;
-        final Quaternion c6 = new Quaternion(float18, 0.0f, 0.0f, float19);
-        c2.mul(c6);
+        final Quaternion d6 = new Quaternion(float18, 0.0f, 0.0f, float19);
+        d2.mul(d6);
         final Matrix3f a8 = new Matrix3f();
         a8.setIdentity();
         a8.m11 = float20;
@@ -247,9 +247,9 @@ public final class Matrix3f {
         float7 *= float22;
         a8.mul(a7);
         float7 = 1.0f / float7;
-        c2.mul((float)Math.sqrt(float7));
-        final Vector3f e29 = new Vector3f(a8.m00 * float7, a8.m11 * float7, a8.m22 * float7);
-        return (Triple<Quaternion, Vector3f, Quaternion>)Triple.of(c2, e29, c3);
+        d2.mul((float)Math.sqrt(float7));
+        final Vector3f g29 = new Vector3f(a8.m00 * float7, a8.m11 * float7, a8.m22 * float7);
+        return (Triple<Quaternion, Vector3f, Quaternion>)Triple.of(d2, g29, d3);
     }
     
     @Override
@@ -359,6 +359,40 @@ public final class Matrix3f {
         return false;
     }
     
+    public void set(final int integer1, final int integer2, final float float3) {
+        if (integer1 == 0) {
+            if (integer2 == 0) {
+                this.m00 = float3;
+            }
+            else if (integer2 == 1) {
+                this.m01 = float3;
+            }
+            else {
+                this.m02 = float3;
+            }
+        }
+        else if (integer1 == 1) {
+            if (integer2 == 0) {
+                this.m10 = float3;
+            }
+            else if (integer2 == 1) {
+                this.m11 = float3;
+            }
+            else {
+                this.m12 = float3;
+            }
+        }
+        else if (integer2 == 0) {
+            this.m20 = float3;
+        }
+        else if (integer2 == 1) {
+            this.m21 = float3;
+        }
+        else {
+            this.m22 = float3;
+        }
+    }
+    
     public void mul(final Matrix3f a) {
         final float float3 = this.m00 * a.m00 + this.m01 * a.m10 + this.m02 * a.m20;
         final float float4 = this.m00 * a.m01 + this.m01 * a.m11 + this.m02 * a.m21;
@@ -380,8 +414,8 @@ public final class Matrix3f {
         this.m22 = float11;
     }
     
-    public void mul(final Quaternion c) {
-        this.mul(new Matrix3f(c));
+    public void mul(final Quaternion d) {
+        this.mul(new Matrix3f(d));
     }
     
     public void mul(final float float1) {
diff --git a/src/com/mojang/math/Matrix4f.java b/src/com/mojang/math/Matrix4f.java
index e2a5fb8..4658f31 100644
--- a/src/com/mojang/math/Matrix4f.java
+++ b/src/com/mojang/math/Matrix4f.java
@@ -42,11 +42,11 @@ public final class Matrix4f {
         this.m33 = b.m33;
     }
     
-    public Matrix4f(final Quaternion c) {
-        final float float3 = c.i();
-        final float float4 = c.j();
-        final float float5 = c.k();
-        final float float6 = c.r();
+    public Matrix4f(final Quaternion d) {
+        final float float3 = d.i();
+        final float float4 = d.j();
+        final float float5 = d.k();
+        final float float6 = d.r();
         final float float7 = 2.0f * float3 * float3;
         final float float8 = 2.0f * float4 * float4;
         final float float9 = 2.0f * float5 * float5;
@@ -295,8 +295,8 @@ public final class Matrix4f {
         this.m33 = float18;
     }
     
-    public void multiply(final Quaternion c) {
-        this.multiply(new Matrix4f(c));
+    public void multiply(final Quaternion d) {
+        this.multiply(new Matrix4f(d));
     }
     
     public void multiply(final float float1) {
@@ -342,10 +342,10 @@ public final class Matrix4f {
         return b5;
     }
     
-    public void translate(final Vector3f e) {
-        this.m03 += e.x();
-        this.m13 += e.y();
-        this.m23 += e.z();
+    public void translate(final Vector3f g) {
+        this.m03 += g.x();
+        this.m13 += g.y();
+        this.m23 += g.z();
     }
     
     public Matrix4f copy() {
diff --git a/src/com/mojang/math/OctahedralGroup.java b/src/com/mojang/math/OctahedralGroup.java
new file mode 100644
index 0000000..320242b
--- /dev/null
+++ b/src/com/mojang/math/OctahedralGroup.java
@@ -0,0 +1,178 @@
+package com.mojang.math;
+
+import net.minecraft.Util;
+import java.util.stream.Collectors;
+import com.mojang.datafixers.util.Pair;
+import java.util.Arrays;
+import net.minecraft.core.FrontAndTop;
+import com.google.common.collect.Maps;
+import it.unimi.dsi.fastutil.booleans.BooleanArrayList;
+import it.unimi.dsi.fastutil.booleans.BooleanList;
+import javax.annotation.Nullable;
+import net.minecraft.core.Direction;
+import java.util.Map;
+import net.minecraft.util.StringRepresentable;
+
+public enum OctahedralGroup implements StringRepresentable {
+    IDENTITY("identity", SymmetricGroup3.P123, false, false, false), 
+    ROT_180_FACE_XY("rot_180_face_xy", SymmetricGroup3.P123, true, true, false), 
+    ROT_180_FACE_XZ("rot_180_face_xz", SymmetricGroup3.P123, true, false, true), 
+    ROT_180_FACE_YZ("rot_180_face_yz", SymmetricGroup3.P123, false, true, true), 
+    ROT_120_NNN("rot_120_nnn", SymmetricGroup3.P231, false, false, false), 
+    ROT_120_NNP("rot_120_nnp", SymmetricGroup3.P312, true, false, true), 
+    ROT_120_NPN("rot_120_npn", SymmetricGroup3.P312, false, true, true), 
+    ROT_120_NPP("rot_120_npp", SymmetricGroup3.P231, true, false, true), 
+    ROT_120_PNN("rot_120_pnn", SymmetricGroup3.P312, true, true, false), 
+    ROT_120_PNP("rot_120_pnp", SymmetricGroup3.P231, true, true, false), 
+    ROT_120_PPN("rot_120_ppn", SymmetricGroup3.P231, false, true, true), 
+    ROT_120_PPP("rot_120_ppp", SymmetricGroup3.P312, false, false, false), 
+    ROT_180_EDGE_XY_NEG("rot_180_edge_xy_neg", SymmetricGroup3.P213, true, true, true), 
+    ROT_180_EDGE_XY_POS("rot_180_edge_xy_pos", SymmetricGroup3.P213, false, false, true), 
+    ROT_180_EDGE_XZ_NEG("rot_180_edge_xz_neg", SymmetricGroup3.P321, true, true, true), 
+    ROT_180_EDGE_XZ_POS("rot_180_edge_xz_pos", SymmetricGroup3.P321, false, true, false), 
+    ROT_180_EDGE_YZ_NEG("rot_180_edge_yz_neg", SymmetricGroup3.P132, true, true, true), 
+    ROT_180_EDGE_YZ_POS("rot_180_edge_yz_pos", SymmetricGroup3.P132, true, false, false), 
+    ROT_90_X_NEG("rot_90_x_neg", SymmetricGroup3.P132, false, false, true), 
+    ROT_90_X_POS("rot_90_x_pos", SymmetricGroup3.P132, false, true, false), 
+    ROT_90_Y_NEG("rot_90_y_neg", SymmetricGroup3.P321, true, false, false), 
+    ROT_90_Y_POS("rot_90_y_pos", SymmetricGroup3.P321, false, false, true), 
+    ROT_90_Z_NEG("rot_90_z_neg", SymmetricGroup3.P213, false, true, false), 
+    ROT_90_Z_POS("rot_90_z_pos", SymmetricGroup3.P213, true, false, false), 
+    INVERSION("inversion", SymmetricGroup3.P123, true, true, true), 
+    INVERT_X("invert_x", SymmetricGroup3.P123, true, false, false), 
+    INVERT_Y("invert_y", SymmetricGroup3.P123, false, true, false), 
+    INVERT_Z("invert_z", SymmetricGroup3.P123, false, false, true), 
+    ROT_60_REF_NNN("rot_60_ref_nnn", SymmetricGroup3.P312, true, true, true), 
+    ROT_60_REF_NNP("rot_60_ref_nnp", SymmetricGroup3.P231, true, false, false), 
+    ROT_60_REF_NPN("rot_60_ref_npn", SymmetricGroup3.P231, false, false, true), 
+    ROT_60_REF_NPP("rot_60_ref_npp", SymmetricGroup3.P312, false, false, true), 
+    ROT_60_REF_PNN("rot_60_ref_pnn", SymmetricGroup3.P231, false, true, false), 
+    ROT_60_REF_PNP("rot_60_ref_pnp", SymmetricGroup3.P312, true, false, false), 
+    ROT_60_REF_PPN("rot_60_ref_ppn", SymmetricGroup3.P312, false, true, false), 
+    ROT_60_REF_PPP("rot_60_ref_ppp", SymmetricGroup3.P231, true, true, true), 
+    SWAP_XY("swap_xy", SymmetricGroup3.P213, false, false, false), 
+    SWAP_YZ("swap_yz", SymmetricGroup3.P132, false, false, false), 
+    SWAP_XZ("swap_xz", SymmetricGroup3.P321, false, false, false), 
+    SWAP_NEG_XY("swap_neg_xy", SymmetricGroup3.P213, true, true, false), 
+    SWAP_NEG_YZ("swap_neg_yz", SymmetricGroup3.P132, false, true, true), 
+    SWAP_NEG_XZ("swap_neg_xz", SymmetricGroup3.P321, true, false, true), 
+    ROT_90_REF_X_NEG("rot_90_ref_x_neg", SymmetricGroup3.P132, true, false, true), 
+    ROT_90_REF_X_POS("rot_90_ref_x_pos", SymmetricGroup3.P132, true, true, false), 
+    ROT_90_REF_Y_NEG("rot_90_ref_y_neg", SymmetricGroup3.P321, true, true, false), 
+    ROT_90_REF_Y_POS("rot_90_ref_y_pos", SymmetricGroup3.P321, false, true, true), 
+    ROT_90_REF_Z_NEG("rot_90_ref_z_neg", SymmetricGroup3.P213, false, true, true), 
+    ROT_90_REF_Z_POS("rot_90_ref_z_pos", SymmetricGroup3.P213, true, false, true);
+    
+    private final Matrix3f transformation;
+    private final String name;
+    @Nullable
+    private Map<Direction, Direction> rotatedDirections;
+    private final boolean invertX;
+    private final boolean invertY;
+    private final boolean invertZ;
+    private final SymmetricGroup3 permutation;
+    private static final OctahedralGroup[][] cayleyTable;
+    private static final OctahedralGroup[] inverseTable;
+    
+    private OctahedralGroup(final String string3, final SymmetricGroup3 e, final boolean boolean5, final boolean boolean6, final boolean boolean7) {
+        this.name = string3;
+        this.invertX = boolean5;
+        this.invertY = boolean6;
+        this.invertZ = boolean7;
+        this.permutation = e;
+        this.transformation = new Matrix3f();
+        this.transformation.m00 = (boolean5 ? -1.0f : 1.0f);
+        this.transformation.m11 = (boolean6 ? -1.0f : 1.0f);
+        this.transformation.m22 = (boolean7 ? -1.0f : 1.0f);
+        this.transformation.mul(e.transformation());
+    }
+    
+    private BooleanList packInversions() {
+        return (BooleanList)new BooleanArrayList(new boolean[] { this.invertX, this.invertY, this.invertZ });
+    }
+    
+    public OctahedralGroup compose(final OctahedralGroup c) {
+        return OctahedralGroup.cayleyTable[this.ordinal()][c.ordinal()];
+    }
+    
+    @Override
+    public String toString() {
+        return this.name;
+    }
+    
+    @Override
+    public String getSerializedName() {
+        return this.name;
+    }
+    
+    public Direction rotate(final Direction fz) {
+        if (this.rotatedDirections == null) {
+            this.rotatedDirections = Maps.newEnumMap(Direction.class);
+            for (final Direction fz2 : Direction.values()) {
+                final Direction.Axis a7 = fz2.getAxis();
+                final Direction.AxisDirection b8 = fz2.getAxisDirection();
+                final Direction.Axis a8 = Direction.Axis.values()[this.permutation.permutation(a7.ordinal())];
+                final Direction.AxisDirection b9 = this.inverts(a8) ? b8.opposite() : b8;
+                final Direction fz3 = Direction.fromAxisAndDirection(a8, b9);
+                this.rotatedDirections.put(fz2, fz3);
+            }
+        }
+        return this.rotatedDirections.get(fz);
+    }
+    
+    public boolean inverts(final Direction.Axis a) {
+        switch (a) {
+            case X: {
+                return this.invertX;
+            }
+            case Y: {
+                return this.invertY;
+            }
+            default: {
+                return this.invertZ;
+            }
+        }
+    }
+    
+    public FrontAndTop rotate(final FrontAndTop gb) {
+        return FrontAndTop.fromFrontAndTop(this.rotate(gb.front()), this.rotate(gb.top()));
+    }
+    
+    static {
+        final Map<Pair<SymmetricGroup3, BooleanList>, OctahedralGroup> map2;
+        final OctahedralGroup[] array;
+        int length;
+        int i = 0;
+        OctahedralGroup c3;
+        final OctahedralGroup[] array2;
+        int length2;
+        int j = 0;
+        OctahedralGroup c4;
+        BooleanList booleanList11;
+        BooleanList booleanList12;
+        SymmetricGroup3 e13;
+        BooleanArrayList booleanArrayList14;
+        int integer2;
+        cayleyTable = Util.<OctahedralGroup[][]>make(new OctahedralGroup[values().length][values().length], arr -> {
+            map2 = Arrays.<OctahedralGroup>stream(values()).collect(Collectors.toMap(c -> Pair.of(c.permutation, c.packInversions()), c -> c));
+            values();
+            for (length = array.length; i < length; ++i) {
+                c3 = array[i];
+                values();
+                for (length2 = array2.length; j < length2; ++j) {
+                    c4 = array2[j];
+                    booleanList11 = c3.packInversions();
+                    booleanList12 = c4.packInversions();
+                    e13 = c4.permutation.compose(c3.permutation);
+                    booleanArrayList14 = new BooleanArrayList(3);
+                    for (integer2 = 0; integer2 < 3; ++integer2) {
+                        booleanArrayList14.add(booleanList11.getBoolean(integer2) ^ booleanList12.getBoolean(c3.permutation.permutation(integer2)));
+                    }
+                    arr[c3.ordinal()][c4.ordinal()] = map2.get(Pair.of(e13, booleanArrayList14));
+                }
+            }
+            return;
+        });
+        inverseTable = Arrays.<OctahedralGroup>stream(values()).map(c -> Arrays.<OctahedralGroup>stream(values()).filter(c2 -> c.compose(c2) == OctahedralGroup.IDENTITY).findAny().get()).<OctahedralGroup>toArray(OctahedralGroup[]::new);
+    }
+}
diff --git a/src/com/mojang/math/Quaternion.java b/src/com/mojang/math/Quaternion.java
index 0bfd77e..dc41e0a 100644
--- a/src/com/mojang/math/Quaternion.java
+++ b/src/com/mojang/math/Quaternion.java
@@ -16,14 +16,14 @@ public final class Quaternion {
         this.r = float4;
     }
     
-    public Quaternion(final Vector3f e, float float2, final boolean boolean3) {
+    public Quaternion(final Vector3f g, float float2, final boolean boolean3) {
         if (boolean3) {
             float2 *= 0.017453292f;
         }
         final float float3 = sin(float2 / 2.0f);
-        this.i = e.x() * float3;
-        this.j = e.y() * float3;
-        this.k = e.z() * float3;
+        this.i = g.x() * float3;
+        this.j = g.y() * float3;
+        this.k = g.z() * float3;
         this.r = cos(float2 / 2.0f);
     }
     
@@ -45,11 +45,11 @@ public final class Quaternion {
         this.r = float5 * float7 * float9 - float4 * float6 * float8;
     }
     
-    public Quaternion(final Quaternion c) {
-        this.i = c.i;
-        this.j = c.j;
-        this.k = c.k;
-        this.r = c.r;
+    public Quaternion(final Quaternion d) {
+        this.i = d.i;
+        this.j = d.j;
+        this.k = d.k;
+        this.r = d.r;
     }
     
     @Override
@@ -60,8 +60,8 @@ public final class Quaternion {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final Quaternion c3 = (Quaternion)object;
-        return Float.compare(c3.i, this.i) == 0 && Float.compare(c3.j, this.j) == 0 && Float.compare(c3.k, this.k) == 0 && Float.compare(c3.r, this.r) == 0;
+        final Quaternion d3 = (Quaternion)object;
+        return Float.compare(d3.i, this.i) == 0 && Float.compare(d3.j, this.j) == 0 && Float.compare(d3.k, this.k) == 0 && Float.compare(d3.r, this.r) == 0;
     }
     
     @Override
@@ -99,15 +99,15 @@ public final class Quaternion {
         return this.r;
     }
     
-    public void mul(final Quaternion c) {
+    public void mul(final Quaternion d) {
         final float float3 = this.i();
         final float float4 = this.j();
         final float float5 = this.k();
         final float float6 = this.r();
-        final float float7 = c.i();
-        final float float8 = c.j();
-        final float float9 = c.k();
-        final float float10 = c.r();
+        final float float7 = d.i();
+        final float float8 = d.j();
+        final float float9 = d.k();
+        final float float10 = d.r();
         this.i = float6 * float7 + float3 * float10 + float4 * float9 - float5 * float8;
         this.j = float6 * float8 - float3 * float9 + float4 * float10 + float5 * float7;
         this.k = float6 * float9 + float3 * float8 - float4 * float7 + float5 * float10;
diff --git a/src/com/mojang/math/SymmetricGroup3.java b/src/com/mojang/math/SymmetricGroup3.java
new file mode 100644
index 0000000..0be2620
--- /dev/null
+++ b/src/com/mojang/math/SymmetricGroup3.java
@@ -0,0 +1,66 @@
+package com.mojang.math;
+
+import net.minecraft.Util;
+import java.util.Arrays;
+
+public enum SymmetricGroup3 {
+    P123(0, 1, 2), 
+    P213(1, 0, 2), 
+    P132(0, 2, 1), 
+    P231(1, 2, 0), 
+    P312(2, 0, 1), 
+    P321(2, 1, 0);
+    
+    private final int[] permutation;
+    private final Matrix3f transformation;
+    private static final SymmetricGroup3[][] cayleyTable;
+    
+    private SymmetricGroup3(final int integer3, final int integer4, final int integer5) {
+        this.permutation = new int[] { integer3, integer4, integer5 };
+        (this.transformation = new Matrix3f()).set(0, this.permutation(0), 1.0f);
+        this.transformation.set(1, this.permutation(1), 1.0f);
+        this.transformation.set(2, this.permutation(2), 1.0f);
+    }
+    
+    public SymmetricGroup3 compose(final SymmetricGroup3 e) {
+        return SymmetricGroup3.cayleyTable[this.ordinal()][e.ordinal()];
+    }
+    
+    public int permutation(final int integer) {
+        return this.permutation[integer];
+    }
+    
+    public Matrix3f transformation() {
+        return this.transformation;
+    }
+    
+    static {
+        final SymmetricGroup3[] array;
+        int length;
+        int i = 0;
+        SymmetricGroup3 e2;
+        final SymmetricGroup3[] array2;
+        int length2;
+        int j = 0;
+        SymmetricGroup3 e3;
+        int[] arr2;
+        int integer11;
+        SymmetricGroup3 e4;
+        cayleyTable = Util.<SymmetricGroup3[][]>make(new SymmetricGroup3[values().length][values().length], arr -> {
+            values();
+            for (length = array.length; i < length; ++i) {
+                e2 = array[i];
+                values();
+                for (length2 = array2.length; j < length2; ++j) {
+                    e3 = array2[j];
+                    arr2 = new int[3];
+                    for (integer11 = 0; integer11 < 3; ++integer11) {
+                        arr2[integer11] = e2.permutation[e3.permutation[integer11]];
+                    }
+                    e4 = Arrays.<SymmetricGroup3>stream(values()).filter(e -> Arrays.equals(e.permutation, arr2)).findFirst().get();
+                    arr[e2.ordinal()][e3.ordinal()] = e4;
+                }
+            }
+        });
+    }
+}
diff --git a/src/com/mojang/math/Transformation.java b/src/com/mojang/math/Transformation.java
index 897c30d..4f53577 100644
--- a/src/com/mojang/math/Transformation.java
+++ b/src/com/mojang/math/Transformation.java
@@ -28,12 +28,12 @@ public final class Transformation {
         }
     }
     
-    public Transformation(@Nullable final Vector3f e1, @Nullable final Quaternion c2, @Nullable final Vector3f e3, @Nullable final Quaternion c4) {
-        this.matrix = compose(e1, c2, e3, c4);
-        this.translation = ((e1 != null) ? e1 : new Vector3f());
-        this.leftRotation = ((c2 != null) ? c2 : Quaternion.ONE.copy());
-        this.scale = ((e3 != null) ? e3 : new Vector3f(1.0f, 1.0f, 1.0f));
-        this.rightRotation = ((c4 != null) ? c4 : Quaternion.ONE.copy());
+    public Transformation(@Nullable final Vector3f g1, @Nullable final Quaternion d2, @Nullable final Vector3f g3, @Nullable final Quaternion d4) {
+        this.matrix = compose(g1, d2, g3, d4);
+        this.translation = ((g1 != null) ? g1 : new Vector3f());
+        this.leftRotation = ((d2 != null) ? d2 : Quaternion.ONE.copy());
+        this.scale = ((g3 != null) ? g3 : new Vector3f(1.0f, 1.0f, 1.0f));
+        this.rightRotation = ((d4 != null) ? d4 : Quaternion.ONE.copy());
         this.decomposed = true;
     }
     
@@ -41,9 +41,9 @@ public final class Transformation {
         return Transformation.IDENTITY;
     }
     
-    public Transformation compose(final Transformation d) {
+    public Transformation compose(final Transformation f) {
         final Matrix4f b3 = this.getMatrix();
-        b3.multiply(d.getMatrix());
+        b3.multiply(f.getMatrix());
         return new Transformation(b3);
     }
     
@@ -71,31 +71,31 @@ public final class Transformation {
         }
     }
     
-    private static Matrix4f compose(@Nullable final Vector3f e1, @Nullable final Quaternion c2, @Nullable final Vector3f e3, @Nullable final Quaternion c4) {
+    private static Matrix4f compose(@Nullable final Vector3f g1, @Nullable final Quaternion d2, @Nullable final Vector3f g3, @Nullable final Quaternion d4) {
         final Matrix4f b5 = new Matrix4f();
         b5.setIdentity();
-        if (c2 != null) {
-            b5.multiply(new Matrix4f(c2));
+        if (d2 != null) {
+            b5.multiply(new Matrix4f(d2));
         }
-        if (e3 != null) {
-            b5.multiply(Matrix4f.createScaleMatrix(e3.x(), e3.y(), e3.z()));
+        if (g3 != null) {
+            b5.multiply(Matrix4f.createScaleMatrix(g3.x(), g3.y(), g3.z()));
         }
-        if (c4 != null) {
-            b5.multiply(new Matrix4f(c4));
+        if (d4 != null) {
+            b5.multiply(new Matrix4f(d4));
         }
-        if (e1 != null) {
-            b5.m03 = e1.x();
-            b5.m13 = e1.y();
-            b5.m23 = e1.z();
+        if (g1 != null) {
+            b5.m03 = g1.x();
+            b5.m13 = g1.y();
+            b5.m23 = g1.z();
         }
         return b5;
     }
     
     public static Pair<Matrix3f, Vector3f> toAffine(final Matrix4f b) {
         b.multiply(1.0f / b.m33);
-        final Vector3f e2 = new Vector3f(b.m03, b.m13, b.m23);
+        final Vector3f g2 = new Vector3f(b.m03, b.m13, b.m23);
         final Matrix3f a3 = new Matrix3f(b);
-        return (Pair<Matrix3f, Vector3f>)Pair.of(a3, e2);
+        return (Pair<Matrix3f, Vector3f>)Pair.of(a3, g2);
     }
     
     public Matrix4f getMatrix() {
@@ -115,8 +115,8 @@ public final class Transformation {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final Transformation d3 = (Transformation)object;
-        return Objects.equals(this.matrix, d3.matrix);
+        final Transformation f3 = (Transformation)object;
+        return Objects.equals(this.matrix, f3.matrix);
     }
     
     @Override
@@ -126,13 +126,13 @@ public final class Transformation {
     
     static {
         final Matrix4f b1;
-        final Transformation d2;
+        final Transformation f2;
         IDENTITY = Util.<Transformation>make(() -> {
             b1 = new Matrix4f();
             b1.setIdentity();
-            d2 = new Transformation(b1);
-            d2.getLeftRotation();
-            return d2;
+            f2 = new Transformation(b1);
+            f2.getLeftRotation();
+            return f2;
         });
     }
 }
diff --git a/src/com/mojang/math/Vector3f.java b/src/com/mojang/math/Vector3f.java
index 8fe6ecc..e6c07b7 100644
--- a/src/com/mojang/math/Vector3f.java
+++ b/src/com/mojang/math/Vector3f.java
@@ -24,8 +24,8 @@ public final class Vector3f {
         this.z = float3;
     }
     
-    public Vector3f(final Vec3 cvl) {
-        this((float)cvl.x, (float)cvl.y, (float)cvl.z);
+    public Vector3f(final Vec3 dem) {
+        this((float)dem.x, (float)dem.y, (float)dem.z);
     }
     
     @Override
@@ -36,8 +36,8 @@ public final class Vector3f {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final Vector3f e3 = (Vector3f)object;
-        return Float.compare(e3.x, this.x) == 0 && Float.compare(e3.y, this.y) == 0 && Float.compare(e3.z, this.z) == 0;
+        final Vector3f g3 = (Vector3f)object;
+        return Float.compare(g3.x, this.x) == 0 && Float.compare(g3.y, this.y) == 0 && Float.compare(g3.z, this.z) == 0;
     }
     
     @Override
@@ -90,20 +90,20 @@ public final class Vector3f {
         this.z += float3;
     }
     
-    public void add(final Vector3f e) {
-        this.x += e.x;
-        this.y += e.y;
-        this.z += e.z;
+    public void add(final Vector3f g) {
+        this.x += g.x;
+        this.y += g.y;
+        this.z += g.z;
     }
     
-    public void sub(final Vector3f e) {
-        this.x -= e.x;
-        this.y -= e.y;
-        this.z -= e.z;
+    public void sub(final Vector3f g) {
+        this.x -= g.x;
+        this.y -= g.y;
+        this.z -= g.z;
     }
     
-    public float dot(final Vector3f e) {
-        return this.x * e.x + this.y * e.y + this.z * e.z;
+    public float dot(final Vector3f g) {
+        return this.x * g.x + this.y * g.y + this.z * g.z;
     }
     
     public boolean normalize() {
@@ -118,13 +118,13 @@ public final class Vector3f {
         return true;
     }
     
-    public void cross(final Vector3f e) {
+    public void cross(final Vector3f g) {
         final float float3 = this.x;
         final float float4 = this.y;
         final float float5 = this.z;
-        final float float6 = e.x();
-        final float float7 = e.y();
-        final float float8 = e.z();
+        final float float6 = g.x();
+        final float float7 = g.y();
+        final float float8 = g.z();
         this.x = float4 * float8 - float5 * float7;
         this.y = float5 * float6 - float3 * float8;
         this.z = float3 * float7 - float4 * float6;
@@ -139,20 +139,20 @@ public final class Vector3f {
         this.z = a.m20 * float3 + a.m21 * float4 + a.m22 * float5;
     }
     
-    public void transform(final Quaternion c) {
-        final Quaternion c2 = new Quaternion(c);
-        c2.mul(new Quaternion(this.x(), this.y(), this.z(), 0.0f));
-        final Quaternion c3 = new Quaternion(c);
-        c3.conj();
-        c2.mul(c3);
-        this.set(c2.i(), c2.j(), c2.k());
+    public void transform(final Quaternion d) {
+        final Quaternion d2 = new Quaternion(d);
+        d2.mul(new Quaternion(this.x(), this.y(), this.z(), 0.0f));
+        final Quaternion d3 = new Quaternion(d);
+        d3.conj();
+        d2.mul(d3);
+        this.set(d2.i(), d2.j(), d2.k());
     }
     
-    public void lerp(final Vector3f e, final float float2) {
+    public void lerp(final Vector3f g, final float float2) {
         final float float3 = 1.0f - float2;
-        this.x = this.x * float3 + e.x * float2;
-        this.y = this.y * float3 + e.y * float2;
-        this.z = this.z * float3 + e.z * float2;
+        this.x = this.x * float3 + g.x * float2;
+        this.y = this.y * float3 + g.y * float2;
+        this.z = this.z * float3 + g.z * float2;
     }
     
     public Quaternion rotation(final float float1) {
diff --git a/src/com/mojang/math/Vector4f.java b/src/com/mojang/math/Vector4f.java
index 601b170..0fd245c 100644
--- a/src/com/mojang/math/Vector4f.java
+++ b/src/com/mojang/math/Vector4f.java
@@ -18,8 +18,8 @@ public class Vector4f {
         this.w = float4;
     }
     
-    public Vector4f(final Vector3f e) {
-        this(e.x(), e.y(), e.z(), 1.0f);
+    public Vector4f(final Vector3f g) {
+        this(g.x(), g.y(), g.z(), 1.0f);
     }
     
     @Override
@@ -30,8 +30,8 @@ public class Vector4f {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final Vector4f f3 = (Vector4f)object;
-        return Float.compare(f3.x, this.x) == 0 && Float.compare(f3.y, this.y) == 0 && Float.compare(f3.z, this.z) == 0 && Float.compare(f3.w, this.w) == 0;
+        final Vector4f h3 = (Vector4f)object;
+        return Float.compare(h3.x, this.x) == 0 && Float.compare(h3.y, this.y) == 0 && Float.compare(h3.z, this.z) == 0 && Float.compare(h3.w, this.w) == 0;
     }
     
     @Override
@@ -59,10 +59,10 @@ public class Vector4f {
         return this.w;
     }
     
-    public void mul(final Vector3f e) {
-        this.x *= e.x();
-        this.y *= e.y();
-        this.z *= e.z();
+    public void mul(final Vector3f g) {
+        this.x *= g.x();
+        this.y *= g.y();
+        this.z *= g.z();
     }
     
     public void set(final float float1, final float float2, final float float3, final float float4) {
@@ -72,8 +72,8 @@ public class Vector4f {
         this.w = float4;
     }
     
-    public float dot(final Vector4f f) {
-        return this.x * f.x + this.y * f.y + this.z * f.z + this.w * f.w;
+    public float dot(final Vector4f h) {
+        return this.x * h.x + this.y * h.y + this.z * h.z + this.w * h.w;
     }
     
     public boolean normalize() {
@@ -100,13 +100,13 @@ public class Vector4f {
         this.w = b.m30 * float3 + b.m31 * float4 + b.m32 * float5 + b.m33 * float6;
     }
     
-    public void transform(final Quaternion c) {
-        final Quaternion c2 = new Quaternion(c);
-        c2.mul(new Quaternion(this.x(), this.y(), this.z(), 0.0f));
-        final Quaternion c3 = new Quaternion(c);
-        c3.conj();
-        c2.mul(c3);
-        this.set(c2.i(), c2.j(), c2.k(), this.w());
+    public void transform(final Quaternion d) {
+        final Quaternion d2 = new Quaternion(d);
+        d2.mul(new Quaternion(this.x(), this.y(), this.z(), 0.0f));
+        final Quaternion d3 = new Quaternion(d);
+        d3.conj();
+        d2.mul(d3);
+        this.set(d2.i(), d2.j(), d2.k(), this.w());
     }
     
     public void perspectiveDivide() {
diff --git a/src/com/mojang/realmsclient/KeyCombo.java b/src/com/mojang/realmsclient/KeyCombo.java
index 7916e97..2767fc6 100644
--- a/src/com/mojang/realmsclient/KeyCombo.java
+++ b/src/com/mojang/realmsclient/KeyCombo.java
@@ -13,19 +13,18 @@ public class KeyCombo {
             throw new IllegalArgumentException("Must have at least one char");
         }
         this.chars = arr;
-        this.matchIndex = 0;
     }
     
     public boolean keyPressed(final char character) {
-        if (character != this.chars[this.matchIndex]) {
-            this.reset();
-            return false;
+        if (character == this.chars[this.matchIndex++]) {
+            if (this.matchIndex == this.chars.length) {
+                this.reset();
+                this.onCompletion.run();
+                return true;
+            }
         }
-        ++this.matchIndex;
-        if (this.matchIndex == this.chars.length) {
+        else {
             this.reset();
-            this.onCompletion.run();
-            return true;
         }
         return false;
     }
diff --git a/src/com/mojang/realmsclient/RealmsMainScreen.java b/src/com/mojang/realmsclient/RealmsMainScreen.java
index 7678d26..d42226e 100644
--- a/src/com/mojang/realmsclient/RealmsMainScreen.java
+++ b/src/com/mojang/realmsclient/RealmsMainScreen.java
@@ -1,32 +1,36 @@
 package com.mojang.realmsclient;
 
 import com.mojang.realmsclient.util.RealmsPersistence;
-import com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen;
+import net.minecraft.client.gui.components.TickableWidget;
 import com.mojang.realmsclient.util.RealmsTextureManager;
 import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.realmsclient.gui.ChatFormatting;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.components.AbstractSelectionList;
 import com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen;
+import net.minecraft.client.gui.components.ObjectSelectionList;
 import net.minecraft.realms.RealmsObjectSelectionList;
 import org.apache.logging.log4j.LogManager;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.Minecraft;
+import com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Collector;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.server.packs.resources.ResourceManager;
-import com.mojang.realmsclient.gui.LongRunningTask;
+import com.mojang.realmsclient.util.task.LongRunningTask;
 import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen;
-import com.mojang.realmsclient.util.RealmsTasks;
+import com.mojang.realmsclient.util.task.GetServerDetailsTask;
 import java.util.concurrent.TimeUnit;
-import net.minecraft.realms.RealmsMth;
+import net.minecraft.util.Mth;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.realms.RealmListEntry;
-import net.minecraft.realms.RealmsConfirmResultListener;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen;
-import javax.annotation.Nullable;
-import net.minecraft.client.gui.screens.Screen;
 import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen;
-import net.minecraft.client.Minecraft;
 import com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen;
-import java.io.IOException;
 import com.mojang.realmsclient.exception.RealmsServiceException;
 import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen;
 import com.mojang.realmsclient.gui.screens.RealmsClientOutdatedScreen;
@@ -35,46 +39,70 @@ import com.mojang.realmsclient.dto.PingResult;
 import com.mojang.realmsclient.client.Ping;
 import com.mojang.realmsclient.dto.RealmsServerPlayerLists;
 import com.mojang.realmsclient.dto.RealmsServerPlayerList;
-import net.minecraft.realms.RealmsGuiEventListener;
-import com.mojang.realmsclient.util.RealmsUtil;
-import net.minecraft.realms.AbstractRealmsButton;
+import net.minecraft.realms.NarrationHelper;
+import net.minecraft.client.resources.language.I18n;
+import javax.annotation.Nullable;
+import net.minecraft.Util;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.client.gui.components.events.GuiEventListener;
 import com.mojang.realmsclient.client.RealmsClient;
 import java.util.Iterator;
-import net.minecraft.realms.Realms;
 import com.google.common.collect.Lists;
 import java.util.concurrent.locks.ReentrantLock;
 import com.mojang.realmsclient.dto.RealmsServer;
-import net.minecraft.realms.RealmsButton;
-import com.mojang.realmsclient.gui.RealmsDataFetcher;
-import net.minecraft.resources.ResourceLocation;
-import java.util.List;
+import net.minecraft.network.chat.Component;
+import net.minecraft.client.gui.components.Button;
 import com.google.common.util.concurrent.RateLimiter;
+import net.minecraft.client.gui.screens.Screen;
+import com.mojang.realmsclient.gui.RealmsDataFetcher;
+import java.util.List;
+import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsMainScreen extends RealmsScreen {
     private static final Logger LOGGER;
-    private static boolean overrideConfigure;
-    private final RateLimiter inviteNarrationLimiter;
-    private boolean dontSetConnectedToRealms;
+    private static final ResourceLocation ON_ICON_LOCATION;
+    private static final ResourceLocation OFF_ICON_LOCATION;
+    private static final ResourceLocation EXPIRED_ICON_LOCATION;
+    private static final ResourceLocation EXPIRES_SOON_ICON_LOCATION;
+    private static final ResourceLocation LEAVE_ICON_LOCATION;
+    private static final ResourceLocation INVITATION_ICONS_LOCATION;
+    private static final ResourceLocation INVITE_ICON_LOCATION;
+    private static final ResourceLocation WORLDICON_LOCATION;
+    private static final ResourceLocation LOGO_LOCATION;
+    private static final ResourceLocation CONFIGURE_LOCATION;
+    private static final ResourceLocation QUESTIONMARK_LOCATION;
+    private static final ResourceLocation NEWS_LOCATION;
+    private static final ResourceLocation POPUP_LOCATION;
+    private static final ResourceLocation DARKEN_LOCATION;
+    private static final ResourceLocation CROSS_ICON_LOCATION;
+    private static final ResourceLocation TRIAL_ICON_LOCATION;
+    private static final ResourceLocation BUTTON_LOCATION;
     private static List<ResourceLocation> teaserImages;
-    private static final RealmsDataFetcher realmsDataFetcher;
+    private static final RealmsDataFetcher REALMS_DATA_FETCHER;
+    private static boolean overrideConfigure;
     private static int lastScrollYPosition;
-    private final RealmsScreen lastScreen;
-    private volatile RealmSelectionList realmSelectionList;
-    private long selectedServerId;
-    private RealmsButton playButton;
-    private RealmsButton backButton;
-    private RealmsButton renewButton;
-    private RealmsButton configureButton;
-    private RealmsButton leaveButton;
-    private String toolTip;
-    private List<RealmsServer> realmsServers;
-    private volatile int numberOfPendingInvites;
-    private int animTick;
     private static volatile boolean hasParentalConsent;
     private static volatile boolean checkedParentalConsent;
     private static volatile boolean checkedClientCompatability;
+    private static Screen realmsGenericErrorScreen;
+    private static boolean regionsPinged;
+    private final RateLimiter inviteNarrationLimiter;
+    private boolean dontSetConnectedToRealms;
+    private final Screen lastScreen;
+    private volatile RealmSelectionList realmSelectionList;
+    private long selectedServerId;
+    private Button playButton;
+    private Button backButton;
+    private Button renewButton;
+    private Button configureButton;
+    private Button leaveButton;
+    private List<Component> toolTip;
+    private List<RealmsServer> realmsServers;
+    private volatile int numberOfPendingInvites;
+    private int animTick;
     private boolean hasFetchedServers;
     private boolean popupOpenedByUser;
     private boolean justClosedPopup;
@@ -86,36 +114,34 @@ public class RealmsMainScreen extends RealmsScreen {
     private int carouselIndex;
     private int carouselTick;
     private boolean hasSwitchedCarouselImage;
-    private static RealmsScreen realmsGenericErrorScreen;
-    private static boolean regionsPinged;
     private List<KeyCombo> keyCombos;
     private int clicks;
     private ReentrantLock connectLock;
-    private boolean expiredHover;
-    private ShowPopupButton showPopupButton;
-    private PendingInvitesButton pendingInvitesButton;
-    private NewsButton newsButton;
-    private RealmsButton createTrialButton;
-    private RealmsButton buyARealmButton;
-    private RealmsButton closeButton;
+    private HoveredElement hoveredElement;
+    private Button showPopupButton;
+    private Button pendingInvitesButton;
+    private Button newsButton;
+    private Button createTrialButton;
+    private Button buyARealmButton;
+    private Button closeButton;
     
-    public RealmsMainScreen(final RealmsScreen realmsScreen) {
+    public RealmsMainScreen(final Screen dqs) {
         this.selectedServerId = -1L;
         this.realmsServers = Lists.newArrayList();
         this.connectLock = new ReentrantLock();
-        this.lastScreen = realmsScreen;
+        this.lastScreen = dqs;
         this.inviteNarrationLimiter = RateLimiter.create(0.01666666753590107);
     }
     
-    public boolean shouldShowMessageInList() {
-        if (!this.hasParentalConsent() || !this.hasFetchedServers) {
+    private boolean shouldShowMessageInList() {
+        if (!hasParentalConsent() || !this.hasFetchedServers) {
             return false;
         }
         if (this.trialsAvailable && !this.createdTrial) {
             return true;
         }
-        for (final RealmsServer realmsServer3 : this.realmsServers) {
-            if (realmsServer3.ownerUUID.equals(Realms.getUUID())) {
+        for (final RealmsServer dip3 : this.realmsServers) {
+            if (dip3.ownerUUID.equals(this.minecraft.getUser().getUuid())) {
                 return false;
             }
         }
@@ -123,13 +149,12 @@ public class RealmsMainScreen extends RealmsScreen {
     }
     
     public boolean shouldShowPopup() {
-        return this.hasParentalConsent() && this.hasFetchedServers && (this.popupOpenedByUser || (this.trialsAvailable && !this.createdTrial && this.realmsServers.isEmpty()) || this.realmsServers.isEmpty());
+        return hasParentalConsent() && this.hasFetchedServers && (this.popupOpenedByUser || (this.trialsAvailable && !this.createdTrial && this.realmsServers.isEmpty()) || this.realmsServers.isEmpty());
     }
     
-    @Override
     public void init() {
         this.keyCombos = Lists.<KeyCombo>newArrayList(new KeyCombo(new char[] { '3', '2', '1', '4', '5', '6' }, () -> RealmsMainScreen.overrideConfigure = !RealmsMainScreen.overrideConfigure), new KeyCombo(new char[] { '9', '8', '7', '1', '2', '3' }, () -> {
-            if (RealmsClient.currentEnvironment.equals(RealmsClient.Environment.STAGE)) {
+            if (RealmsClient.currentEnvironment == RealmsClient.Environment.STAGE) {
                 this.switchToProd();
             }
             else {
@@ -137,7 +162,7 @@ public class RealmsMainScreen extends RealmsScreen {
             }
             return;
         }), new KeyCombo(new char[] { '9', '8', '7', '4', '5', '6' }, () -> {
-            if (RealmsClient.currentEnvironment.equals(RealmsClient.Environment.LOCAL)) {
+            if (RealmsClient.currentEnvironment == RealmsClient.Environment.LOCAL) {
                 this.switchToProd();
             }
             else {
@@ -146,147 +171,130 @@ public class RealmsMainScreen extends RealmsScreen {
             return;
         }));
         if (RealmsMainScreen.realmsGenericErrorScreen != null) {
-            Realms.setScreen(RealmsMainScreen.realmsGenericErrorScreen);
+            this.minecraft.setScreen(RealmsMainScreen.realmsGenericErrorScreen);
             return;
         }
         this.connectLock = new ReentrantLock();
-        if (RealmsMainScreen.checkedClientCompatability && !this.hasParentalConsent()) {
+        if (RealmsMainScreen.checkedClientCompatability && !hasParentalConsent()) {
             this.checkParentalConsent();
         }
         this.checkClientCompatability();
         this.checkUnreadNews();
         if (!this.dontSetConnectedToRealms) {
-            Realms.setConnectedToRealms(false);
+            this.minecraft.setConnectedToRealms(false);
         }
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        if (this.hasParentalConsent()) {
-            RealmsMainScreen.realmsDataFetcher.forceUpdate();
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        if (hasParentalConsent()) {
+            RealmsMainScreen.REALMS_DATA_FETCHER.forceUpdate();
         }
         this.showingPopup = false;
-        this.postInit();
-    }
-    
-    private boolean hasParentalConsent() {
-        return RealmsMainScreen.checkedParentalConsent && RealmsMainScreen.hasParentalConsent;
-    }
-    
-    public void addButtons() {
-        this.buttonsAdd(this.configureButton = new RealmsButton(1, this.width() / 2 - 190, this.height() - 32, 90, 20, RealmsScreen.getLocalizedString("mco.selectServer.configure")) {
-            @Override
-            public void onPress() {
-                RealmsMainScreen.this.configureClicked(RealmsMainScreen.this.findServer(RealmsMainScreen.this.selectedServerId));
-            }
-        });
-        this.buttonsAdd(this.playButton = new RealmsButton(3, this.width() / 2 - 93, this.height() - 32, 90, 20, RealmsScreen.getLocalizedString("mco.selectServer.play")) {
-            @Override
-            public void onPress() {
-                RealmsMainScreen.this.onPlay();
-            }
-        });
-        this.buttonsAdd(this.backButton = new RealmsButton(2, this.width() / 2 + 4, this.height() - 32, 90, 20, RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                if (!RealmsMainScreen.this.justClosedPopup) {
-                    Realms.setScreen(RealmsMainScreen.this.lastScreen);
-                }
-            }
-        });
-        this.buttonsAdd(this.renewButton = new RealmsButton(0, this.width() / 2 + 100, this.height() - 32, 90, 20, RealmsScreen.getLocalizedString("mco.selectServer.expiredRenew")) {
-            @Override
-            public void onPress() {
-                RealmsMainScreen.this.onRenew();
-            }
-        });
-        this.buttonsAdd(this.leaveButton = new RealmsButton(7, this.width() / 2 - 202, this.height() - 32, 90, 20, RealmsScreen.getLocalizedString("mco.selectServer.leave")) {
-            @Override
-            public void onPress() {
-                RealmsMainScreen.this.leaveClicked(RealmsMainScreen.this.findServer(RealmsMainScreen.this.selectedServerId));
-            }
-        });
-        this.buttonsAdd(this.pendingInvitesButton = new PendingInvitesButton());
-        this.buttonsAdd(this.newsButton = new NewsButton());
-        this.buttonsAdd(this.showPopupButton = new ShowPopupButton());
-        this.buttonsAdd(this.closeButton = new CloseButton());
-        this.buttonsAdd(this.createTrialButton = new RealmsButton(6, this.width() / 2 + 52, this.popupY0() + 137 - 20, 98, 20, RealmsScreen.getLocalizedString("mco.selectServer.trial")) {
-            @Override
-            public void onPress() {
-                RealmsMainScreen.this.createTrial();
-            }
-        });
-        this.buttonsAdd(this.buyARealmButton = new RealmsButton(5, this.width() / 2 + 52, this.popupY0() + 160 - 20, 98, 20, RealmsScreen.getLocalizedString("mco.selectServer.buy")) {
-            @Override
-            public void onPress() {
-                RealmsUtil.browseTo("https://aka.ms/BuyJavaRealms");
-            }
-        });
-        final RealmsServer realmsServer2 = this.findServer(this.selectedServerId);
-        this.updateButtonStates(realmsServer2);
-    }
-    
-    private void updateButtonStates(final RealmsServer realmsServer) {
-        this.playButton.active(this.shouldPlayButtonBeActive(realmsServer) && !this.shouldShowPopup());
-        this.renewButton.setVisible(this.shouldRenewButtonBeActive(realmsServer));
-        this.configureButton.setVisible(this.shouldConfigureButtonBeVisible(realmsServer));
-        this.leaveButton.setVisible(this.shouldLeaveButtonBeVisible(realmsServer));
-        final boolean boolean3 = this.shouldShowPopup() && this.trialsAvailable && !this.createdTrial;
-        this.createTrialButton.setVisible(boolean3);
-        this.createTrialButton.active(boolean3);
-        this.buyARealmButton.setVisible(this.shouldShowPopup());
-        this.closeButton.setVisible(this.shouldShowPopup() && this.popupOpenedByUser);
-        this.renewButton.active(!this.shouldShowPopup());
-        this.configureButton.active(!this.shouldShowPopup());
-        this.leaveButton.active(!this.shouldShowPopup());
-        this.newsButton.active(true);
-        this.pendingInvitesButton.active(true);
-        this.backButton.active(true);
-        this.showPopupButton.active(!this.shouldShowPopup());
-    }
-    
-    private boolean shouldShowPopupButton() {
-        return (!this.shouldShowPopup() || this.popupOpenedByUser) && this.hasParentalConsent() && this.hasFetchedServers;
-    }
-    
-    private boolean shouldPlayButtonBeActive(final RealmsServer realmsServer) {
-        return realmsServer != null && !realmsServer.expired && realmsServer.state == RealmsServer.State.OPEN;
-    }
-    
-    private boolean shouldRenewButtonBeActive(final RealmsServer realmsServer) {
-        return realmsServer != null && realmsServer.expired && this.isSelfOwnedServer(realmsServer);
-    }
-    
-    private boolean shouldConfigureButtonBeVisible(final RealmsServer realmsServer) {
-        return realmsServer != null && this.isSelfOwnedServer(realmsServer);
-    }
-    
-    private boolean shouldLeaveButtonBeVisible(final RealmsServer realmsServer) {
-        return realmsServer != null && !this.isSelfOwnedServer(realmsServer);
-    }
-    
-    public void postInit() {
-        if (this.hasParentalConsent() && this.hasFetchedServers) {
+        if (hasParentalConsent() && this.hasFetchedServers) {
             this.addButtons();
         }
         this.realmSelectionList = new RealmSelectionList();
         if (RealmsMainScreen.lastScrollYPosition != -1) {
-            this.realmSelectionList.scroll(RealmsMainScreen.lastScrollYPosition);
+            this.realmSelectionList.setScrollAmount(RealmsMainScreen.lastScrollYPosition);
         }
-        this.addWidget(this.realmSelectionList);
-        this.focusOn(this.realmSelectionList);
+        this.<RealmSelectionList>addWidget(this.realmSelectionList);
+        this.magicalSpecialHackyFocus(this.realmSelectionList);
+    }
+    
+    private static boolean hasParentalConsent() {
+        return RealmsMainScreen.checkedParentalConsent && RealmsMainScreen.hasParentalConsent;
+    }
+    
+    public void addButtons() {
+        this.configureButton = this.<Button>addButton(new Button(this.width / 2 - 190, this.height - 32, 90, 20, new TranslatableComponent("mco.selectServer.configure"), dni -> this.configureClicked(this.findServer(this.selectedServerId))));
+        final RealmsServer dip3;
+        this.playButton = this.<Button>addButton(new Button(this.width / 2 - 93, this.height - 32, 90, 20, new TranslatableComponent("mco.selectServer.play"), dni -> {
+            dip3 = this.findServer(this.selectedServerId);
+            if (dip3 == null) {
+                return;
+            }
+            else {
+                this.play(dip3, this);
+                return;
+            }
+        }));
+        this.backButton = this.<Button>addButton(new Button(this.width / 2 + 4, this.height - 32, 90, 20, CommonComponents.GUI_BACK, dni -> {
+            if (!this.justClosedPopup) {
+                this.minecraft.setScreen(this.lastScreen);
+            }
+            return;
+        }));
+        this.renewButton = this.<Button>addButton(new Button(this.width / 2 + 100, this.height - 32, 90, 20, new TranslatableComponent("mco.selectServer.expiredRenew"), dni -> this.onRenew()));
+        this.leaveButton = this.<Button>addButton(new Button(this.width / 2 - 202, this.height - 32, 90, 20, new TranslatableComponent("mco.selectServer.leave"), dni -> this.leaveClicked(this.findServer(this.selectedServerId))));
+        this.pendingInvitesButton = this.<PendingInvitesButton>addButton(new PendingInvitesButton());
+        this.newsButton = this.<NewsButton>addButton(new NewsButton());
+        this.showPopupButton = this.<ShowPopupButton>addButton(new ShowPopupButton());
+        this.closeButton = this.<CloseButton>addButton(new CloseButton());
+        this.createTrialButton = this.<Button>addButton(new Button(this.width / 2 + 52, this.popupY0() + 137 - 20, 98, 20, new TranslatableComponent("mco.selectServer.trial"), dni -> {
+            if (!this.trialsAvailable || this.createdTrial) {
+                return;
+            }
+            else {
+                Util.getPlatform().openUri("https://aka.ms/startjavarealmstrial");
+                this.minecraft.setScreen(this.lastScreen);
+                return;
+            }
+        }));
+        this.buyARealmButton = this.<Button>addButton(new Button(this.width / 2 + 52, this.popupY0() + 160 - 20, 98, 20, new TranslatableComponent("mco.selectServer.buy"), dni -> Util.getPlatform().openUri("https://aka.ms/BuyJavaRealms")));
+        final RealmsServer dip4 = this.findServer(this.selectedServerId);
+        this.updateButtonStates(dip4);
+    }
+    
+    private void updateButtonStates(@Nullable final RealmsServer dip) {
+        this.playButton.active = (this.shouldPlayButtonBeActive(dip) && !this.shouldShowPopup());
+        this.renewButton.visible = this.shouldRenewButtonBeActive(dip);
+        this.configureButton.visible = this.shouldConfigureButtonBeVisible(dip);
+        this.leaveButton.visible = this.shouldLeaveButtonBeVisible(dip);
+        final boolean boolean3 = this.shouldShowPopup() && this.trialsAvailable && !this.createdTrial;
+        this.createTrialButton.visible = boolean3;
+        this.createTrialButton.active = boolean3;
+        this.buyARealmButton.visible = this.shouldShowPopup();
+        this.closeButton.visible = (this.shouldShowPopup() && this.popupOpenedByUser);
+        this.renewButton.active = !this.shouldShowPopup();
+        this.configureButton.active = !this.shouldShowPopup();
+        this.leaveButton.active = !this.shouldShowPopup();
+        this.newsButton.active = true;
+        this.pendingInvitesButton.active = true;
+        this.backButton.active = true;
+        this.showPopupButton.active = !this.shouldShowPopup();
+    }
+    
+    private boolean shouldShowPopupButton() {
+        return (!this.shouldShowPopup() || this.popupOpenedByUser) && hasParentalConsent() && this.hasFetchedServers;
+    }
+    
+    private boolean shouldPlayButtonBeActive(@Nullable final RealmsServer dip) {
+        return dip != null && !dip.expired && dip.state == RealmsServer.State.OPEN;
+    }
+    
+    private boolean shouldRenewButtonBeActive(@Nullable final RealmsServer dip) {
+        return dip != null && dip.expired && this.isSelfOwnedServer(dip);
+    }
+    
+    private boolean shouldConfigureButtonBeVisible(@Nullable final RealmsServer dip) {
+        return dip != null && this.isSelfOwnedServer(dip);
+    }
+    
+    private boolean shouldLeaveButtonBeVisible(@Nullable final RealmsServer dip) {
+        return dip != null && !this.isSelfOwnedServer(dip);
     }
     
     @Override
     public void tick() {
-        this.tickButtons();
+        super.tick();
         this.justClosedPopup = false;
         ++this.animTick;
         --this.clicks;
         if (this.clicks < 0) {
             this.clicks = 0;
         }
-        if (this.hasParentalConsent()) {
-            RealmsMainScreen.realmsDataFetcher.init();
-            if (RealmsMainScreen.realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.SERVER_LIST)) {
-                final List<RealmsServer> list2 = RealmsMainScreen.realmsDataFetcher.getServers();
+        if (hasParentalConsent()) {
+            RealmsMainScreen.REALMS_DATA_FETCHER.init();
+            if (RealmsMainScreen.REALMS_DATA_FETCHER.isFetchedSinceLastTry(RealmsDataFetcher.Task.SERVER_LIST)) {
+                final List<RealmsServer> list2 = RealmsMainScreen.REALMS_DATA_FETCHER.getServers();
                 this.realmSelectionList.clear();
                 final boolean boolean3 = !this.hasFetchedServers;
                 if (boolean3) {
@@ -294,17 +302,17 @@ public class RealmsMainScreen extends RealmsScreen {
                 }
                 if (list2 != null) {
                     boolean boolean4 = false;
-                    for (final RealmsServer realmsServer6 : list2) {
-                        if (this.isSelfOwnedNonExpiredServer(realmsServer6)) {
+                    for (final RealmsServer dip6 : list2) {
+                        if (this.isSelfOwnedNonExpiredServer(dip6)) {
                             boolean4 = true;
                         }
                     }
                     this.realmsServers = list2;
                     if (this.shouldShowMessageInList()) {
-                        ((RealmsObjectSelectionList<RealmSelectionListTrialEntry>)this.realmSelectionList).addEntry(new RealmSelectionListTrialEntry());
+                        this.realmSelectionList.addMessageEntry(new TrialEntry());
                     }
-                    for (final RealmsServer realmsServer6 : this.realmsServers) {
-                        ((RealmsObjectSelectionList<RealmSelectionListEntry>)this.realmSelectionList).addEntry(new RealmSelectionListEntry(realmsServer6));
+                    for (final RealmsServer dip6 : this.realmsServers) {
+                        ((RealmsObjectSelectionList<ServerEntry>)this.realmSelectionList).addEntry(new ServerEntry(dip6));
                     }
                     if (!RealmsMainScreen.regionsPinged && boolean4) {
                         RealmsMainScreen.regionsPinged = true;
@@ -315,14 +323,14 @@ public class RealmsMainScreen extends RealmsScreen {
                     this.addButtons();
                 }
             }
-            if (RealmsMainScreen.realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.PENDING_INVITE)) {
-                this.numberOfPendingInvites = RealmsMainScreen.realmsDataFetcher.getPendingInvitesCount();
+            if (RealmsMainScreen.REALMS_DATA_FETCHER.isFetchedSinceLastTry(RealmsDataFetcher.Task.PENDING_INVITE)) {
+                this.numberOfPendingInvites = RealmsMainScreen.REALMS_DATA_FETCHER.getPendingInvitesCount();
                 if (this.numberOfPendingInvites > 0 && this.inviteNarrationLimiter.tryAcquire(1)) {
-                    Realms.narrateNow(RealmsScreen.getLocalizedString("mco.configure.world.invite.narration", this.numberOfPendingInvites));
+                    NarrationHelper.now(I18n.get("mco.configure.world.invite.narration", this.numberOfPendingInvites));
                 }
             }
-            if (RealmsMainScreen.realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.TRIAL_AVAILABLE) && !this.createdTrial) {
-                final boolean boolean5 = RealmsMainScreen.realmsDataFetcher.isTrialAvailable();
+            if (RealmsMainScreen.REALMS_DATA_FETCHER.isFetchedSinceLastTry(RealmsDataFetcher.Task.TRIAL_AVAILABLE) && !this.createdTrial) {
+                final boolean boolean5 = RealmsMainScreen.REALMS_DATA_FETCHER.isTrialAvailable();
                 if (boolean5 != this.trialsAvailable && this.shouldShowPopup()) {
                     this.trialsAvailable = boolean5;
                     this.showingPopup = false;
@@ -331,48 +339,43 @@ public class RealmsMainScreen extends RealmsScreen {
                     this.trialsAvailable = boolean5;
                 }
             }
-            if (RealmsMainScreen.realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.LIVE_STATS)) {
-                final RealmsServerPlayerLists realmsServerPlayerLists2 = RealmsMainScreen.realmsDataFetcher.getLivestats();
-                for (final RealmsServerPlayerList realmsServerPlayerList4 : realmsServerPlayerLists2.servers) {
-                    for (final RealmsServer realmsServer6 : this.realmsServers) {
-                        if (realmsServer6.id == realmsServerPlayerList4.serverId) {
-                            realmsServer6.updateServerPing(realmsServerPlayerList4);
+            if (RealmsMainScreen.REALMS_DATA_FETCHER.isFetchedSinceLastTry(RealmsDataFetcher.Task.LIVE_STATS)) {
+                final RealmsServerPlayerLists diu2 = RealmsMainScreen.REALMS_DATA_FETCHER.getLivestats();
+                for (final RealmsServerPlayerList dit4 : diu2.servers) {
+                    for (final RealmsServer dip6 : this.realmsServers) {
+                        if (dip6.id == dit4.serverId) {
+                            dip6.updateServerPing(dit4);
                             break;
                         }
                     }
                 }
             }
-            if (RealmsMainScreen.realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.UNREAD_NEWS)) {
-                this.hasUnreadNews = RealmsMainScreen.realmsDataFetcher.hasUnreadNews();
-                this.newsLink = RealmsMainScreen.realmsDataFetcher.newsLink();
+            if (RealmsMainScreen.REALMS_DATA_FETCHER.isFetchedSinceLastTry(RealmsDataFetcher.Task.UNREAD_NEWS)) {
+                this.hasUnreadNews = RealmsMainScreen.REALMS_DATA_FETCHER.hasUnreadNews();
+                this.newsLink = RealmsMainScreen.REALMS_DATA_FETCHER.newsLink();
             }
-            RealmsMainScreen.realmsDataFetcher.markClean();
+            RealmsMainScreen.REALMS_DATA_FETCHER.markClean();
             if (this.shouldShowPopup()) {
                 ++this.carouselTick;
             }
             if (this.showPopupButton != null) {
-                this.showPopupButton.setVisible(this.shouldShowPopupButton());
+                this.showPopupButton.visible = this.shouldShowPopupButton();
             }
         }
     }
     
-    private void browseURL(final String string) {
-        Realms.setClipboard(string);
-        RealmsUtil.browseTo(string);
-    }
-    
     private void pingRegions() {
         final List<RegionPingResult> list2;
-        final RealmsClient cyy3;
-        final PingResult pingResult4;
+        final RealmsClient dia3;
+        final PingResult dil4;
         new Thread(() -> {
             list2 = Ping.pingAllRegions();
-            cyy3 = RealmsClient.createRealmsClient();
-            pingResult4 = new PingResult();
-            pingResult4.pingResults = list2;
-            pingResult4.worldIds = this.getOwnedNonExpiredWorldIds();
+            dia3 = RealmsClient.create();
+            dil4 = new PingResult();
+            dil4.pingResults = list2;
+            dil4.worldIds = this.getOwnedNonExpiredWorldIds();
             try {
-                cyy3.sendPingResults(pingResult4);
+                dia3.sendPingResults(dil4);
             }
             catch (Throwable throwable5) {
                 RealmsMainScreen.LOGGER.warn("Could not send ping result to Realms: ", throwable5);
@@ -382,9 +385,9 @@ public class RealmsMainScreen extends RealmsScreen {
     
     private List<Long> getOwnedNonExpiredWorldIds() {
         final List<Long> list2 = Lists.newArrayList();
-        for (final RealmsServer realmsServer4 : this.realmsServers) {
-            if (this.isSelfOwnedNonExpiredServer(realmsServer4)) {
-                list2.add(realmsServer4.id);
+        for (final RealmsServer dip4 : this.realmsServers) {
+            if (this.isSelfOwnedNonExpiredServer(dip4)) {
+                list2.add(dip4.id);
             }
         }
         return list2;
@@ -392,33 +395,18 @@ public class RealmsMainScreen extends RealmsScreen {
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
         this.stopRealmsFetcher();
     }
     
-    private void onPlay() {
-        final RealmsServer realmsServer2 = this.findServer(this.selectedServerId);
-        if (realmsServer2 == null) {
-            return;
-        }
-        this.play(realmsServer2, this);
-    }
-    
     private void onRenew() {
-        final RealmsServer realmsServer2 = this.findServer(this.selectedServerId);
-        if (realmsServer2 == null) {
+        final RealmsServer dip2 = this.findServer(this.selectedServerId);
+        if (dip2 == null) {
             return;
         }
-        final String string3 = "https://aka.ms/ExtendJavaRealms?subscriptionId=" + realmsServer2.remoteSubscriptionId + "&profileId=" + Realms.getUUID() + "&ref=" + (realmsServer2.expiredTrial ? "expiredTrial" : "expiredRealm");
-        this.browseURL(string3);
-    }
-    
-    private void createTrial() {
-        if (!this.trialsAvailable || this.createdTrial) {
-            return;
-        }
-        RealmsUtil.browseTo("https://aka.ms/startjavarealmstrial");
-        Realms.setScreen(this.lastScreen);
+        final String string3 = "https://aka.ms/ExtendJavaRealms?subscriptionId=" + dip2.remoteSubscriptionId + "&profileId=" + this.minecraft.getUser().getUuid() + "&ref=" + (dip2.expiredTrial ? "expiredTrial" : "expiredRealm");
+        this.minecraft.keyboardHandler.setClipboard(string3);
+        Util.getPlatform().openUri(string3);
     }
     
     private void checkClientCompatability() {
@@ -427,35 +415,31 @@ public class RealmsMainScreen extends RealmsScreen {
             new Thread("MCO Compatability Checker #1") {
                 @Override
                 public void run() {
-                    final RealmsClient cyy2 = RealmsClient.createRealmsClient();
+                    final RealmsClient dia2 = RealmsClient.create();
                     try {
-                        final RealmsClient.CompatibleVersionResponse a3 = cyy2.clientCompatible();
-                        if (a3.equals(RealmsClient.CompatibleVersionResponse.OUTDATED)) {
+                        final RealmsClient.CompatibleVersionResponse a3 = dia2.clientCompatible();
+                        if (a3 == RealmsClient.CompatibleVersionResponse.OUTDATED) {
                             RealmsMainScreen.realmsGenericErrorScreen = new RealmsClientOutdatedScreen(RealmsMainScreen.this.lastScreen, true);
-                            Realms.setScreen(RealmsMainScreen.realmsGenericErrorScreen);
+                            RealmsMainScreen.this.minecraft.execute(() -> RealmsMainScreen.this.minecraft.setScreen(RealmsMainScreen.realmsGenericErrorScreen));
                             return;
                         }
-                        if (a3.equals(RealmsClient.CompatibleVersionResponse.OTHER)) {
+                        if (a3 == RealmsClient.CompatibleVersionResponse.OTHER) {
                             RealmsMainScreen.realmsGenericErrorScreen = new RealmsClientOutdatedScreen(RealmsMainScreen.this.lastScreen, false);
-                            Realms.setScreen(RealmsMainScreen.realmsGenericErrorScreen);
+                            RealmsMainScreen.this.minecraft.execute(() -> RealmsMainScreen.this.minecraft.setScreen(RealmsMainScreen.realmsGenericErrorScreen));
                             return;
                         }
                         RealmsMainScreen.this.checkParentalConsent();
                     }
-                    catch (RealmsServiceException czg3) {
+                    catch (RealmsServiceException djh3) {
                         RealmsMainScreen.checkedClientCompatability = false;
-                        RealmsMainScreen.LOGGER.error("Couldn't connect to realms: ", czg3.toString());
-                        if (czg3.httpResultCode == 401) {
-                            RealmsMainScreen.realmsGenericErrorScreen = new RealmsGenericErrorScreen(RealmsScreen.getLocalizedString("mco.error.invalid.session.title"), RealmsScreen.getLocalizedString("mco.error.invalid.session.message"), RealmsMainScreen.this.lastScreen);
-                            Realms.setScreen(RealmsMainScreen.realmsGenericErrorScreen);
-                            return;
+                        RealmsMainScreen.LOGGER.error("Couldn't connect to realms", (Throwable)djh3);
+                        if (djh3.httpResultCode == 401) {
+                            RealmsMainScreen.realmsGenericErrorScreen = new RealmsGenericErrorScreen(new TranslatableComponent("mco.error.invalid.session.title"), new TranslatableComponent("mco.error.invalid.session.message"), RealmsMainScreen.this.lastScreen);
+                            RealmsMainScreen.this.minecraft.execute(() -> RealmsMainScreen.this.minecraft.setScreen(RealmsMainScreen.realmsGenericErrorScreen));
+                        }
+                        else {
+                            RealmsMainScreen.this.minecraft.execute(() -> RealmsMainScreen.this.minecraft.setScreen(new RealmsGenericErrorScreen(djh3, RealmsMainScreen.this.lastScreen)));
                         }
-                        Realms.setScreen(new RealmsGenericErrorScreen(czg3, RealmsMainScreen.this.lastScreen));
-                    }
-                    catch (IOException iOException3) {
-                        RealmsMainScreen.checkedClientCompatability = false;
-                        RealmsMainScreen.LOGGER.error("Couldn't connect to realms: ", iOException3.getMessage());
-                        Realms.setScreen(new RealmsGenericErrorScreen(iOException3.getMessage(), RealmsMainScreen.this.lastScreen));
                     }
                 }
             }.start();
@@ -469,9 +453,9 @@ public class RealmsMainScreen extends RealmsScreen {
         new Thread("MCO Compatability Checker #1") {
             @Override
             public void run() {
-                final RealmsClient cyy2 = RealmsClient.createRealmsClient();
+                final RealmsClient dia2 = RealmsClient.create();
                 try {
-                    final Boolean boolean3 = cyy2.mcoEnabled();
+                    final Boolean boolean3 = dia2.mcoEnabled();
                     if (boolean3) {
                         RealmsMainScreen.LOGGER.info("Realms is available for this user");
                         RealmsMainScreen.hasParentalConsent = true;
@@ -479,41 +463,34 @@ public class RealmsMainScreen extends RealmsScreen {
                     else {
                         RealmsMainScreen.LOGGER.info("Realms is not available for this user");
                         RealmsMainScreen.hasParentalConsent = false;
-                        Realms.setScreen(new RealmsParentalConsentScreen(RealmsMainScreen.this.lastScreen));
+                        RealmsMainScreen.this.minecraft.execute(() -> RealmsMainScreen.this.minecraft.setScreen(new RealmsParentalConsentScreen(RealmsMainScreen.this.lastScreen)));
                     }
                     RealmsMainScreen.checkedParentalConsent = true;
                 }
-                catch (RealmsServiceException czg3) {
-                    RealmsMainScreen.LOGGER.error("Couldn't connect to realms: ", czg3.toString());
-                    Realms.setScreen(new RealmsGenericErrorScreen(czg3, RealmsMainScreen.this.lastScreen));
-                }
-                catch (IOException iOException3) {
-                    RealmsMainScreen.LOGGER.error("Couldn't connect to realms: ", iOException3.getMessage());
-                    Realms.setScreen(new RealmsGenericErrorScreen(iOException3.getMessage(), RealmsMainScreen.this.lastScreen));
+                catch (RealmsServiceException djh3) {
+                    RealmsMainScreen.LOGGER.error("Couldn't connect to realms", (Throwable)djh3);
+                    RealmsMainScreen.this.minecraft.execute(() -> RealmsMainScreen.this.minecraft.setScreen(new RealmsGenericErrorScreen(djh3, RealmsMainScreen.this.lastScreen)));
                 }
             }
         }.start();
     }
     
     private void switchToStage() {
-        if (!RealmsClient.currentEnvironment.equals(RealmsClient.Environment.STAGE)) {
+        if (RealmsClient.currentEnvironment != RealmsClient.Environment.STAGE) {
             new Thread("MCO Stage Availability Checker #1") {
                 @Override
                 public void run() {
-                    final RealmsClient cyy2 = RealmsClient.createRealmsClient();
+                    final RealmsClient dia2 = RealmsClient.create();
                     try {
-                        final Boolean boolean3 = cyy2.stageAvailable();
+                        final Boolean boolean3 = dia2.stageAvailable();
                         if (boolean3) {
                             RealmsClient.switchToStage();
                             RealmsMainScreen.LOGGER.info("Switched to stage");
-                            RealmsMainScreen.realmsDataFetcher.forceUpdate();
+                            RealmsMainScreen.REALMS_DATA_FETCHER.forceUpdate();
                         }
                     }
-                    catch (RealmsServiceException czg3) {
-                        RealmsMainScreen.LOGGER.error("Couldn't connect to Realms: " + czg3);
-                    }
-                    catch (IOException iOException3) {
-                        RealmsMainScreen.LOGGER.error("Couldn't parse response connecting to Realms: " + iOException3.getMessage());
+                    catch (RealmsServiceException djh3) {
+                        RealmsMainScreen.LOGGER.error("Couldn't connect to Realms: " + djh3);
                     }
                 }
             }.start();
@@ -521,24 +498,21 @@ public class RealmsMainScreen extends RealmsScreen {
     }
     
     private void switchToLocal() {
-        if (!RealmsClient.currentEnvironment.equals(RealmsClient.Environment.LOCAL)) {
+        if (RealmsClient.currentEnvironment != RealmsClient.Environment.LOCAL) {
             new Thread("MCO Local Availability Checker #1") {
                 @Override
                 public void run() {
-                    final RealmsClient cyy2 = RealmsClient.createRealmsClient();
+                    final RealmsClient dia2 = RealmsClient.create();
                     try {
-                        final Boolean boolean3 = cyy2.stageAvailable();
+                        final Boolean boolean3 = dia2.stageAvailable();
                         if (boolean3) {
                             RealmsClient.switchToLocal();
                             RealmsMainScreen.LOGGER.info("Switched to local");
-                            RealmsMainScreen.realmsDataFetcher.forceUpdate();
+                            RealmsMainScreen.REALMS_DATA_FETCHER.forceUpdate();
                         }
                     }
-                    catch (RealmsServiceException czg3) {
-                        RealmsMainScreen.LOGGER.error("Couldn't connect to Realms: " + czg3);
-                    }
-                    catch (IOException iOException3) {
-                        RealmsMainScreen.LOGGER.error("Couldn't parse response connecting to Realms: " + iOException3.getMessage());
+                    catch (RealmsServiceException djh3) {
+                        RealmsMainScreen.LOGGER.error("Couldn't connect to Realms: " + djh3);
                     }
                 }
             }.start();
@@ -547,73 +521,70 @@ public class RealmsMainScreen extends RealmsScreen {
     
     private void switchToProd() {
         RealmsClient.switchToProd();
-        RealmsMainScreen.realmsDataFetcher.forceUpdate();
+        RealmsMainScreen.REALMS_DATA_FETCHER.forceUpdate();
     }
     
     private void stopRealmsFetcher() {
-        RealmsMainScreen.realmsDataFetcher.stop();
+        RealmsMainScreen.REALMS_DATA_FETCHER.stop();
     }
     
-    private void configureClicked(final RealmsServer realmsServer) {
-        if (Realms.getUUID().equals(realmsServer.ownerUUID) || RealmsMainScreen.overrideConfigure) {
+    private void configureClicked(final RealmsServer dip) {
+        if (this.minecraft.getUser().getUuid().equals(dip.ownerUUID) || RealmsMainScreen.overrideConfigure) {
             this.saveListScrollPosition();
-            final Minecraft dbn3 = Minecraft.getInstance();
-            dbn3.execute(() -> dbn3.setScreen(new RealmsConfigureWorldScreen(this, realmsServer.id).getProxy()));
+            this.minecraft.setScreen(new RealmsConfigureWorldScreen(this, dip.id));
         }
     }
     
-    private void leaveClicked(@Nullable final RealmsServer realmsServer) {
-        if (realmsServer != null && !Realms.getUUID().equals(realmsServer.ownerUUID)) {
+    private void leaveClicked(@Nullable final RealmsServer dip) {
+        if (dip != null && !this.minecraft.getUser().getUuid().equals(dip.ownerUUID)) {
             this.saveListScrollPosition();
-            final String string3 = RealmsScreen.getLocalizedString("mco.configure.world.leave.question.line1");
-            final String string4 = RealmsScreen.getLocalizedString("mco.configure.world.leave.question.line2");
-            Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Info, string3, string4, true, 4));
+            final Component mr3 = new TranslatableComponent("mco.configure.world.leave.question.line1");
+            final Component mr4 = new TranslatableComponent("mco.configure.world.leave.question.line2");
+            this.minecraft.setScreen(new RealmsLongConfirmationScreen(this::leaveServer, RealmsLongConfirmationScreen.Type.Info, mr3, mr4, true));
         }
     }
     
     private void saveListScrollPosition() {
-        RealmsMainScreen.lastScrollYPosition = this.realmSelectionList.getScroll();
+        RealmsMainScreen.lastScrollYPosition = (int)this.realmSelectionList.getScrollAmount();
     }
     
+    @Nullable
     private RealmsServer findServer(final long long1) {
-        for (final RealmsServer realmsServer5 : this.realmsServers) {
-            if (realmsServer5.id == long1) {
-                return realmsServer5;
+        for (final RealmsServer dip5 : this.realmsServers) {
+            if (dip5.id == long1) {
+                return dip5;
             }
         }
         return null;
     }
     
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-        if (integer == 4) {
-            if (boolean1) {
-                new Thread("Realms-leave-server") {
-                    @Override
-                    public void run() {
-                        try {
-                            final RealmsServer realmsServer2 = RealmsMainScreen.this.findServer(RealmsMainScreen.this.selectedServerId);
-                            if (realmsServer2 != null) {
-                                final RealmsClient cyy3 = RealmsClient.createRealmsClient();
-                                cyy3.uninviteMyselfFrom(realmsServer2.id);
-                                RealmsMainScreen.realmsDataFetcher.removeItem(realmsServer2);
-                                RealmsMainScreen.this.realmsServers.remove(realmsServer2);
-                                RealmsMainScreen.this.realmSelectionList.children().removeIf(realmListEntry -> realmListEntry instanceof RealmSelectionListEntry && realmListEntry.mServerData.id == RealmsMainScreen.this.selectedServerId);
-                                RealmsMainScreen.this.realmSelectionList.setSelected(-1);
-                                RealmsMainScreen.this.updateButtonStates(null);
-                                RealmsMainScreen.this.selectedServerId = -1L;
-                                RealmsMainScreen.this.playButton.active(false);
-                            }
-                        }
-                        catch (RealmsServiceException czg2) {
-                            RealmsMainScreen.LOGGER.error("Couldn't configure world");
-                            Realms.setScreen(new RealmsGenericErrorScreen(czg2, RealmsMainScreen.this));
+    private void leaveServer(final boolean boolean1) {
+        if (boolean1) {
+            new Thread("Realms-leave-server") {
+                @Override
+                public void run() {
+                    try {
+                        final RealmsServer dip2 = RealmsMainScreen.this.findServer(RealmsMainScreen.this.selectedServerId);
+                        if (dip2 != null) {
+                            final RealmsClient dia3 = RealmsClient.create();
+                            dia3.uninviteMyselfFrom(dip2.id);
+                            RealmsMainScreen.REALMS_DATA_FETCHER.removeItem(dip2);
+                            RealmsMainScreen.this.realmsServers.remove(dip2);
+                            RealmsMainScreen.this.realmSelectionList.children().removeIf(b -> b instanceof ServerEntry && b.serverData.id == RealmsMainScreen.this.selectedServerId);
+                            RealmsMainScreen.this.realmSelectionList.setSelected(null);
+                            RealmsMainScreen.this.updateButtonStates(null);
+                            RealmsMainScreen.this.selectedServerId = -1L;
+                            RealmsMainScreen.this.playButton.active = false;
                         }
                     }
-                }.start();
-            }
-            Realms.setScreen(this);
+                    catch (RealmsServiceException djh2) {
+                        RealmsMainScreen.LOGGER.error("Couldn't configure world");
+                        RealmsMainScreen.this.minecraft.execute(() -> RealmsMainScreen.this.minecraft.setScreen(new RealmsGenericErrorScreen(djh2, RealmsMainScreen.this)));
+                    }
+                }
+            }.start();
         }
+        this.minecraft.setScreen(this);
     }
     
     public void removeSelection() {
@@ -622,16 +593,12 @@ public class RealmsMainScreen extends RealmsScreen {
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
-        switch (integer1) {
-            case 256: {
-                this.keyCombos.forEach(KeyCombo::reset);
-                this.onClosePopup();
-                return true;
-            }
-            default: {
-                return super.keyPressed(integer1, integer2, integer3);
-            }
+        if (integer1 == 256) {
+            this.keyCombos.forEach(KeyCombo::reset);
+            this.onClosePopup();
+            return true;
         }
+        return super.keyPressed(integer1, integer2, integer3);
     }
     
     private void onClosePopup() {
@@ -639,68 +606,66 @@ public class RealmsMainScreen extends RealmsScreen {
             this.popupOpenedByUser = false;
         }
         else {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
         }
     }
     
     @Override
     public boolean charTyped(final char character, final int integer) {
-        this.keyCombos.forEach(cyt -> cyt.keyPressed(character));
+        this.keyCombos.forEach(dhu -> dhu.keyPressed(character));
         return true;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.expiredHover = false;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.hoveredElement = HoveredElement.NONE;
         this.toolTip = null;
-        this.renderBackground();
-        this.realmSelectionList.render(integer1, integer2, float3);
-        this.drawRealmsLogo(this.width() / 2 - 50, 7);
-        if (RealmsClient.currentEnvironment.equals(RealmsClient.Environment.STAGE)) {
-            this.renderStage();
+        this.renderBackground(dhl);
+        this.realmSelectionList.render(dhl, integer2, integer3, float4);
+        this.drawRealmsLogo(dhl, this.width / 2 - 50, 7);
+        if (RealmsClient.currentEnvironment == RealmsClient.Environment.STAGE) {
+            this.renderStage(dhl);
         }
-        if (RealmsClient.currentEnvironment.equals(RealmsClient.Environment.LOCAL)) {
-            this.renderLocal();
+        if (RealmsClient.currentEnvironment == RealmsClient.Environment.LOCAL) {
+            this.renderLocal(dhl);
         }
         if (this.shouldShowPopup()) {
-            this.drawPopup(integer1, integer2);
+            this.drawPopup(dhl, integer2, integer3);
         }
         else {
             if (this.showingPopup) {
                 this.updateButtonStates(null);
-                if (!this.hasWidget(this.realmSelectionList)) {
-                    this.addWidget(this.realmSelectionList);
+                if (!this.children.contains(this.realmSelectionList)) {
+                    this.children.add(this.realmSelectionList);
                 }
-                final RealmsServer realmsServer5 = this.findServer(this.selectedServerId);
-                this.playButton.active(this.shouldPlayButtonBeActive(realmsServer5));
+                final RealmsServer dip6 = this.findServer(this.selectedServerId);
+                this.playButton.active = this.shouldPlayButtonBeActive(dip6);
             }
             this.showingPopup = false;
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
         if (this.toolTip != null) {
-            this.renderMousehoverTooltip(this.toolTip, integer1, integer2);
+            this.renderMousehoverTooltip(dhl, this.toolTip, integer2, integer3);
         }
         if (this.trialsAvailable && !this.createdTrial && this.shouldShowPopup()) {
-            RealmsScreen.bind("realms:textures/gui/realms/trial_icon.png");
+            this.minecraft.getTextureManager().bind(RealmsMainScreen.TRIAL_ICON_LOCATION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            RenderSystem.pushMatrix();
-            final int integer3 = 8;
             final int integer4 = 8;
-            int integer5 = 0;
-            if ((System.currentTimeMillis() / 800L & 0x1L) == 0x1L) {
-                integer5 = 8;
+            final int integer5 = 8;
+            int integer6 = 0;
+            if ((Util.getMillis() / 800L & 0x1L) == 0x1L) {
+                integer6 = 8;
             }
-            RealmsScreen.blit(this.createTrialButton.x() + this.createTrialButton.getWidth() - 8 - 4, this.createTrialButton.y() + this.createTrialButton.getHeight() / 2 - 4, 0.0f, (float)integer5, 8, 8, 8, 16);
-            RenderSystem.popMatrix();
+            GuiComponent.blit(dhl, this.createTrialButton.x + this.createTrialButton.getWidth() - 8 - 4, this.createTrialButton.y + this.createTrialButton.getHeight() / 2 - 4, 0.0f, (float)integer6, 8, 8, 8, 16);
         }
     }
     
-    private void drawRealmsLogo(final int integer1, final int integer2) {
-        RealmsScreen.bind("realms:textures/gui/title/realms.png");
+    private void drawRealmsLogo(final PoseStack dhl, final int integer2, final int integer3) {
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.LOGO_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.pushMatrix();
         RenderSystem.scalef(0.5f, 0.5f, 0.5f);
-        RealmsScreen.blit(integer1 * 2, integer2 * 2 - 5, 0.0f, 0.0f, 200, 50, 200, 50);
+        GuiComponent.blit(dhl, integer2 * 2, integer3 * 2 - 5, 0.0f, 0.0f, 200, 50, 200, 50);
         RenderSystem.popMatrix();
     }
     
@@ -719,44 +684,41 @@ public class RealmsMainScreen extends RealmsScreen {
         return double1 < integer6 - 5 || double1 > integer6 + 315 || double2 < integer7 - 5 || double2 > integer7 + 171;
     }
     
-    private void drawPopup(final int integer1, final int integer2) {
-        final int integer3 = this.popupX0();
-        final int integer4 = this.popupY0();
-        final String string6 = RealmsScreen.getLocalizedString("mco.selectServer.popup");
-        final List<String> list7 = this.fontSplit(string6, 100);
+    private void drawPopup(final PoseStack dhl, final int integer2, final int integer3) {
+        final int integer4 = this.popupX0();
+        final int integer5 = this.popupY0();
+        final Component mr7 = new TranslatableComponent("mco.selectServer.popup");
+        final List<FormattedText> list8 = this.font.split(mr7, 100);
         if (!this.showingPopup) {
             this.carouselIndex = 0;
             this.carouselTick = 0;
             this.hasSwitchedCarouselImage = true;
             this.updateButtonStates(null);
-            if (this.hasWidget(this.realmSelectionList)) {
-                this.removeWidget(this.realmSelectionList);
+            if (this.children.contains(this.realmSelectionList)) {
+                final GuiEventListener dof9 = this.realmSelectionList;
+                if (!this.children.remove(dof9)) {
+                    RealmsMainScreen.LOGGER.error("Unable to remove widget: " + dof9);
+                }
             }
-            Realms.narrateNow(string6);
+            NarrationHelper.now(mr7.getString());
         }
         if (this.hasFetchedServers) {
             this.showingPopup = true;
         }
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 0.7f);
         RenderSystem.enableBlend();
-        RealmsScreen.bind("realms:textures/gui/realms/darken.png");
-        RenderSystem.pushMatrix();
-        final int integer5 = 0;
-        final int integer6 = 32;
-        RealmsScreen.blit(0, 32, 0.0f, 0.0f, this.width(), this.height() - 40 - 32, 310, 166);
-        RenderSystem.popMatrix();
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.DARKEN_LOCATION);
+        final int integer6 = 0;
+        final int integer7 = 32;
+        GuiComponent.blit(dhl, 0, 32, 0.0f, 0.0f, this.width, this.height - 40 - 32, 310, 166);
         RenderSystem.disableBlend();
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RealmsScreen.bind("realms:textures/gui/realms/popup.png");
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer3, integer4, 0.0f, 0.0f, 310, 166, 310, 166);
-        RenderSystem.popMatrix();
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.POPUP_LOCATION);
+        GuiComponent.blit(dhl, integer4, integer5, 0.0f, 0.0f, 310, 166, 310, 166);
         if (!RealmsMainScreen.teaserImages.isEmpty()) {
-            RealmsScreen.bind(RealmsMainScreen.teaserImages.get(this.carouselIndex).toString());
+            this.minecraft.getTextureManager().bind(RealmsMainScreen.teaserImages.get(this.carouselIndex));
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            RenderSystem.pushMatrix();
-            RealmsScreen.blit(integer3 + 7, integer4 + 7, 0.0f, 0.0f, 195, 152, 195, 152);
-            RenderSystem.popMatrix();
+            GuiComponent.blit(dhl, integer4 + 7, integer5 + 7, 0.0f, 0.0f, 195, 152, 195, 152);
             if (this.carouselTick % 95 < 5) {
                 if (!this.hasSwitchedCarouselImage) {
                     this.carouselIndex = (this.carouselIndex + 1) % RealmsMainScreen.teaserImages.size();
@@ -767,64 +729,64 @@ public class RealmsMainScreen extends RealmsScreen {
                 this.hasSwitchedCarouselImage = false;
             }
         }
-        int integer7 = 0;
-        for (final String string7 : list7) {
-            this.drawString(string7, this.width() / 2 + 52, integer4 + 10 * ++integer7 - 3, 8421504, false);
+        int integer8 = 0;
+        for (final FormattedText mu13 : list8) {
+            final int integer9 = integer5 + 10 * ++integer8 - 3;
+            this.font.draw(dhl, mu13, (float)(this.width / 2 + 52), (float)integer9, 5000268);
         }
     }
     
     private int popupX0() {
-        return (this.width() - 310) / 2;
+        return (this.width - 310) / 2;
     }
     
     private int popupY0() {
-        return this.height() / 2 - 80;
+        return this.height / 2 - 80;
     }
     
-    private void drawInvitationPendingIcon(final int integer1, final int integer2, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6) {
-        final int integer5 = this.numberOfPendingInvites;
-        final boolean boolean7 = this.inPendingInvitationArea(integer1, integer2);
-        final boolean boolean8 = boolean6 && boolean5;
-        if (boolean8) {
-            final float float11 = 0.25f + (1.0f + RealmsMth.sin(this.animTick * 0.5f)) * 0.25f;
-            int integer6 = 0xFF000000 | (int)(float11 * 64.0f) << 16 | (int)(float11 * 64.0f) << 8 | (int)(float11 * 64.0f) << 0;
-            this.fillGradient(integer3 - 2, integer4 - 2, integer3 + 18, integer4 + 18, integer6, integer6);
-            integer6 = (0xFF000000 | (int)(float11 * 255.0f) << 16 | (int)(float11 * 255.0f) << 8 | (int)(float11 * 255.0f) << 0);
-            this.fillGradient(integer3 - 2, integer4 - 2, integer3 + 18, integer4 - 1, integer6, integer6);
-            this.fillGradient(integer3 - 2, integer4 - 2, integer3 - 1, integer4 + 18, integer6, integer6);
-            this.fillGradient(integer3 + 17, integer4 - 2, integer3 + 18, integer4 + 18, integer6, integer6);
-            this.fillGradient(integer3 - 2, integer4 + 17, integer3 + 18, integer4 + 18, integer6, integer6);
+    private void drawInvitationPendingIcon(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6, final boolean boolean7) {
+        final int integer6 = this.numberOfPendingInvites;
+        final boolean boolean8 = this.inPendingInvitationArea(integer2, integer3);
+        final boolean boolean9 = boolean7 && boolean6;
+        if (boolean9) {
+            final float float12 = 0.25f + (1.0f + Mth.sin(this.animTick * 0.5f)) * 0.25f;
+            int integer7 = 0xFF000000 | (int)(float12 * 64.0f) << 16 | (int)(float12 * 64.0f) << 8 | (int)(float12 * 64.0f) << 0;
+            this.fillGradient(dhl, integer4 - 2, integer5 - 2, integer4 + 18, integer5 + 18, integer7, integer7);
+            integer7 = (0xFF000000 | (int)(float12 * 255.0f) << 16 | (int)(float12 * 255.0f) << 8 | (int)(float12 * 255.0f) << 0);
+            this.fillGradient(dhl, integer4 - 2, integer5 - 2, integer4 + 18, integer5 - 1, integer7, integer7);
+            this.fillGradient(dhl, integer4 - 2, integer5 - 2, integer4 - 1, integer5 + 18, integer7, integer7);
+            this.fillGradient(dhl, integer4 + 17, integer5 - 2, integer4 + 18, integer5 + 18, integer7, integer7);
+            this.fillGradient(dhl, integer4 - 2, integer5 + 17, integer4 + 18, integer5 + 18, integer7, integer7);
         }
-        RealmsScreen.bind("realms:textures/gui/realms/invite_icon.png");
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.INVITE_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        final boolean boolean9 = boolean6 && boolean5;
-        RealmsScreen.blit(integer3, integer4 - 6, boolean9 ? 16.0f : 0.0f, 0.0f, 15, 25, 31, 25);
-        RenderSystem.popMatrix();
-        final boolean boolean10 = boolean6 && integer5 != 0;
-        if (boolean10) {
-            final int integer7 = (Math.min(integer5, 6) - 1) * 8;
-            final int integer8 = (int)(Math.max(0.0f, Math.max(RealmsMth.sin((10 + this.animTick) * 0.57f), RealmsMth.cos(this.animTick * 0.35f))) * -6.0f);
-            RealmsScreen.bind("realms:textures/gui/realms/invitation_icons.png");
-            RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            RenderSystem.pushMatrix();
-            RealmsScreen.blit(integer3 + 4, integer4 + 4 + integer8, (float)integer7, boolean7 ? 8.0f : 0.0f, 8, 8, 48, 16);
-            RenderSystem.popMatrix();
-        }
-        final int integer7 = integer1 + 12;
-        final int integer8 = integer2;
-        final boolean boolean11 = boolean6 && boolean7;
+        final boolean boolean10 = boolean7 && boolean6;
+        final float float13 = boolean10 ? 16.0f : 0.0f;
+        GuiComponent.blit(dhl, integer4, integer5 - 6, float13, 0.0f, 15, 25, 31, 25);
+        final boolean boolean11 = boolean7 && integer6 != 0;
         if (boolean11) {
-            final String string16 = RealmsScreen.getLocalizedString((integer5 == 0) ? "mco.invites.nopending" : "mco.invites.pending");
-            final int integer9 = this.fontWidth(string16);
-            this.fillGradient(integer7 - 3, integer8 - 3, integer7 + integer9 + 3, integer8 + 8 + 3, -1073741824, -1073741824);
-            this.fontDrawShadow(string16, integer7, integer8, -1);
+            final int integer8 = (Math.min(integer6, 6) - 1) * 8;
+            final int integer9 = (int)(Math.max(0.0f, Math.max(Mth.sin((10 + this.animTick) * 0.57f), Mth.cos(this.animTick * 0.35f))) * -6.0f);
+            this.minecraft.getTextureManager().bind(RealmsMainScreen.INVITATION_ICONS_LOCATION);
+            RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
+            final float float14 = boolean8 ? 8.0f : 0.0f;
+            GuiComponent.blit(dhl, integer4 + 4, integer5 + 4 + integer9, (float)integer8, float14, 8, 8, 48, 16);
+        }
+        final int integer8 = integer2 + 12;
+        final int integer9 = integer3;
+        final boolean boolean12 = boolean7 && boolean8;
+        if (boolean12) {
+            final String string18 = (integer6 == 0) ? "mco.invites.nopending" : "mco.invites.pending";
+            final String string19 = I18n.get(string18);
+            final int integer10 = this.font.width(string19);
+            this.fillGradient(dhl, integer8 - 3, integer9 - 3, integer8 + integer10 + 3, integer9 + 8 + 3, -1073741824, -1073741824);
+            this.font.drawShadow(dhl, string19, (float)integer8, (float)integer9, -1);
         }
     }
     
     private boolean inPendingInvitationArea(final double double1, final double double2) {
-        int integer6 = this.width() / 2 + 50;
-        int integer7 = this.width() / 2 + 66;
+        int integer6 = this.width / 2 + 50;
+        int integer7 = this.width / 2 + 66;
         int integer8 = 11;
         int integer9 = 23;
         if (this.numberOfPendingInvites != 0) {
@@ -836,8 +798,8 @@ public class RealmsMainScreen extends RealmsScreen {
         return integer6 <= double1 && double1 <= integer7 && integer8 <= double2 && double2 <= integer9;
     }
     
-    public void play(final RealmsServer realmsServer, final RealmsScreen realmsScreen) {
-        if (realmsServer != null) {
+    public void play(final RealmsServer dip, final Screen dqs) {
+        if (dip != null) {
             try {
                 if (!this.connectLock.tryLock(1L, TimeUnit.SECONDS)) {
                     return;
@@ -850,248 +812,277 @@ public class RealmsMainScreen extends RealmsScreen {
                 return;
             }
             this.dontSetConnectedToRealms = true;
-            this.connectToServer(realmsServer, realmsScreen);
+            this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(dqs, new GetServerDetailsTask(this, dqs, dip, this.connectLock)));
         }
     }
     
-    private void connectToServer(final RealmsServer realmsServer, final RealmsScreen realmsScreen) {
-        final RealmsLongRunningMcoTaskScreen czz4 = new RealmsLongRunningMcoTaskScreen(realmsScreen, new RealmsTasks.RealmsGetServerDetailsTask(this, realmsScreen, realmsServer, this.connectLock));
-        czz4.start();
-        Realms.setScreen(czz4);
+    private boolean isSelfOwnedServer(final RealmsServer dip) {
+        return dip.ownerUUID != null && dip.ownerUUID.equals(this.minecraft.getUser().getUuid());
     }
     
-    private boolean isSelfOwnedServer(final RealmsServer realmsServer) {
-        return realmsServer.ownerUUID != null && realmsServer.ownerUUID.equals(Realms.getUUID());
+    private boolean isSelfOwnedNonExpiredServer(final RealmsServer dip) {
+        return this.isSelfOwnedServer(dip) && !dip.expired;
     }
     
-    private boolean isSelfOwnedNonExpiredServer(final RealmsServer realmsServer) {
-        return realmsServer.ownerUUID != null && realmsServer.ownerUUID.equals(Realms.getUUID()) && !realmsServer.expired;
-    }
-    
-    private void drawExpired(final int integer1, final int integer2, final int integer3, final int integer4) {
-        RealmsScreen.bind("realms:textures/gui/realms/expired_icon.png");
+    private void drawExpired(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.EXPIRED_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 10, 28, 10, 28);
-        RenderSystem.popMatrix();
-        if (integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 27 && integer4 < this.height() - 40 && integer4 > 32 && !this.shouldShowPopup()) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.expired");
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 10, 28, 10, 28);
+        if (integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 27 && integer5 < this.height - 40 && integer5 > 32 && !this.shouldShowPopup()) {
+            this.setTooltip(new TranslatableComponent("mco.selectServer.expired"));
         }
     }
     
-    private void drawExpiring(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-        RealmsScreen.bind("realms:textures/gui/realms/expires_soon_icon.png");
+    private void drawExpiring(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.EXPIRES_SOON_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
         if (this.animTick % 20 < 10) {
-            RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 10, 28, 20, 28);
+            GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 10, 28, 20, 28);
         }
         else {
-            RealmsScreen.blit(integer1, integer2, 10.0f, 0.0f, 10, 28, 20, 28);
+            GuiComponent.blit(dhl, integer2, integer3, 10.0f, 0.0f, 10, 28, 20, 28);
         }
-        RenderSystem.popMatrix();
-        if (integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 27 && integer4 < this.height() - 40 && integer4 > 32 && !this.shouldShowPopup()) {
-            if (integer5 <= 0) {
-                this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.expires.soon");
+        if (integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 27 && integer5 < this.height - 40 && integer5 > 32 && !this.shouldShowPopup()) {
+            if (integer6 <= 0) {
+                this.setTooltip(new TranslatableComponent("mco.selectServer.expires.soon"));
             }
-            else if (integer5 == 1) {
-                this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.expires.day");
+            else if (integer6 == 1) {
+                this.setTooltip(new TranslatableComponent("mco.selectServer.expires.day"));
             }
             else {
-                this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.expires.days", integer5);
+                this.setTooltip(new TranslatableComponent("mco.selectServer.expires.days", new Object[] { integer6 }));
             }
         }
     }
     
-    private void drawOpen(final int integer1, final int integer2, final int integer3, final int integer4) {
-        RealmsScreen.bind("realms:textures/gui/realms/on_icon.png");
+    private void drawOpen(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.ON_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 10, 28, 10, 28);
-        RenderSystem.popMatrix();
-        if (integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 27 && integer4 < this.height() - 40 && integer4 > 32 && !this.shouldShowPopup()) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.open");
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 10, 28, 10, 28);
+        if (integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 27 && integer5 < this.height - 40 && integer5 > 32 && !this.shouldShowPopup()) {
+            this.setTooltip(new TranslatableComponent("mco.selectServer.open"));
         }
     }
     
-    private void drawClose(final int integer1, final int integer2, final int integer3, final int integer4) {
-        RealmsScreen.bind("realms:textures/gui/realms/off_icon.png");
+    private void drawClose(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.OFF_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 10, 28, 10, 28);
-        RenderSystem.popMatrix();
-        if (integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 27 && integer4 < this.height() - 40 && integer4 > 32 && !this.shouldShowPopup()) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.closed");
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 10, 28, 10, 28);
+        if (integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 27 && integer5 < this.height - 40 && integer5 > 32 && !this.shouldShowPopup()) {
+            this.setTooltip(new TranslatableComponent("mco.selectServer.closed"));
         }
     }
     
-    private void drawLeave(final int integer1, final int integer2, final int integer3, final int integer4) {
-        boolean boolean6 = false;
-        if (integer3 >= integer1 && integer3 <= integer1 + 28 && integer4 >= integer2 && integer4 <= integer2 + 28 && integer4 < this.height() - 40 && integer4 > 32 && !this.shouldShowPopup()) {
-            boolean6 = true;
+    private void drawLeave(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        boolean boolean7 = false;
+        if (integer4 >= integer2 && integer4 <= integer2 + 28 && integer5 >= integer3 && integer5 <= integer3 + 28 && integer5 < this.height - 40 && integer5 > 32 && !this.shouldShowPopup()) {
+            boolean7 = true;
         }
-        RealmsScreen.bind("realms:textures/gui/realms/leave_icon.png");
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.LEAVE_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, boolean6 ? 28.0f : 0.0f, 0.0f, 28, 28, 56, 28);
-        RenderSystem.popMatrix();
-        if (boolean6) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.leave");
+        final float float8 = boolean7 ? 28.0f : 0.0f;
+        GuiComponent.blit(dhl, integer2, integer3, float8, 0.0f, 28, 28, 56, 28);
+        if (boolean7) {
+            this.setTooltip(new TranslatableComponent("mco.selectServer.leave"));
+            this.hoveredElement = HoveredElement.LEAVE;
         }
     }
     
-    private void drawConfigure(final int integer1, final int integer2, final int integer3, final int integer4) {
-        boolean boolean6 = false;
-        if (integer3 >= integer1 && integer3 <= integer1 + 28 && integer4 >= integer2 && integer4 <= integer2 + 28 && integer4 < this.height() - 40 && integer4 > 32 && !this.shouldShowPopup()) {
-            boolean6 = true;
+    private void drawConfigure(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        boolean boolean7 = false;
+        if (integer4 >= integer2 && integer4 <= integer2 + 28 && integer5 >= integer3 && integer5 <= integer3 + 28 && integer5 < this.height - 40 && integer5 > 32 && !this.shouldShowPopup()) {
+            boolean7 = true;
         }
-        RealmsScreen.bind("realms:textures/gui/realms/configure_icon.png");
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.CONFIGURE_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, boolean6 ? 28.0f : 0.0f, 0.0f, 28, 28, 56, 28);
-        RenderSystem.popMatrix();
-        if (boolean6) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.configure");
+        final float float8 = boolean7 ? 28.0f : 0.0f;
+        GuiComponent.blit(dhl, integer2, integer3, float8, 0.0f, 28, 28, 56, 28);
+        if (boolean7) {
+            this.setTooltip(new TranslatableComponent("mco.selectServer.configure"));
+            this.hoveredElement = HoveredElement.CONFIGURE;
         }
     }
     
-    protected void renderMousehoverTooltip(final String string, final int integer2, final int integer3) {
-        if (string == null) {
+    protected void renderMousehoverTooltip(final PoseStack dhl, final List<Component> list, final int integer3, final int integer4) {
+        if (list.isEmpty()) {
             return;
         }
-        int integer4 = 0;
         int integer5 = 0;
-        for (final String string2 : string.split("\n")) {
-            final int integer6 = this.fontWidth(string2);
-            if (integer6 > integer5) {
-                integer5 = integer6;
+        int integer6 = 0;
+        for (final Component mr9 : list) {
+            final int integer7 = this.font.width(mr9);
+            if (integer7 > integer6) {
+                integer6 = integer7;
             }
         }
-        int integer7 = integer2 - integer5 - 5;
-        final int integer8 = integer3;
-        if (integer7 < 0) {
-            integer7 = integer2 + 12;
+        int integer8 = integer3 - integer6 - 5;
+        final int integer9 = integer4;
+        if (integer8 < 0) {
+            integer8 = integer3 + 12;
         }
-        for (final String string3 : string.split("\n")) {
-            this.fillGradient(integer7 - 3, integer8 - ((integer4 == 0) ? 3 : 0) + integer4, integer7 + integer5 + 3, integer8 + 8 + 3 + integer4, -1073741824, -1073741824);
-            this.fontDrawShadow(string3, integer7, integer8 + integer4, 16777215);
-            integer4 += 10;
+        for (final Component mr10 : list) {
+            final int integer10 = integer9 - ((integer5 == 0) ? 3 : 0) + integer5;
+            this.fillGradient(dhl, integer8 - 3, integer10, integer8 + integer6 + 3, integer9 + 8 + 3 + integer5, -1073741824, -1073741824);
+            this.font.drawShadow(dhl, mr10, (float)integer8, (float)(integer9 + integer5), 16777215);
+            integer5 += 10;
         }
     }
     
-    private void renderMoreInfo(final int integer1, final int integer2, final int integer3, final int integer4, final boolean boolean5) {
-        boolean boolean6 = false;
-        if (integer1 >= integer3 && integer1 <= integer3 + 20 && integer2 >= integer4 && integer2 <= integer4 + 20) {
-            boolean6 = true;
+    private void renderMoreInfo(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        boolean boolean7 = false;
+        if (integer2 >= integer4 && integer2 <= integer4 + 20 && integer3 >= integer5 && integer3 <= integer5 + 20) {
+            boolean7 = true;
         }
-        RealmsScreen.bind("realms:textures/gui/realms/questionmark.png");
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.QUESTIONMARK_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer3, integer4, boolean5 ? 20.0f : 0.0f, 0.0f, 20, 20, 40, 20);
-        RenderSystem.popMatrix();
-        if (boolean6) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.info");
+        final float float9 = boolean6 ? 20.0f : 0.0f;
+        GuiComponent.blit(dhl, integer4, integer5, float9, 0.0f, 20, 20, 40, 20);
+        if (boolean7) {
+            this.setTooltip(new TranslatableComponent("mco.selectServer.info"));
         }
     }
     
-    private void renderNews(final int integer1, final int integer2, final boolean boolean3, final int integer4, final int integer5, final boolean boolean6, final boolean boolean7) {
-        boolean boolean8 = false;
-        if (integer1 >= integer4 && integer1 <= integer4 + 20 && integer2 >= integer5 && integer2 <= integer5 + 20) {
-            boolean8 = true;
+    private void renderNews(final PoseStack dhl, final int integer2, final int integer3, final boolean boolean4, final int integer5, final int integer6, final boolean boolean7, final boolean boolean8) {
+        boolean boolean9 = false;
+        if (integer2 >= integer5 && integer2 <= integer5 + 20 && integer3 >= integer6 && integer3 <= integer6 + 20) {
+            boolean9 = true;
         }
-        RealmsScreen.bind("realms:textures/gui/realms/news_icon.png");
-        if (boolean7) {
+        this.minecraft.getTextureManager().bind(RealmsMainScreen.NEWS_LOCATION);
+        if (boolean8) {
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         }
         else {
             RenderSystem.color4f(0.5f, 0.5f, 0.5f, 1.0f);
         }
-        RenderSystem.pushMatrix();
-        final boolean boolean9 = boolean7 && boolean6;
-        RealmsScreen.blit(integer4, integer5, boolean9 ? 20.0f : 0.0f, 0.0f, 20, 20, 40, 20);
-        RenderSystem.popMatrix();
-        if (boolean8 && boolean7) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.news");
+        final boolean boolean10 = boolean8 && boolean7;
+        final float float12 = boolean10 ? 20.0f : 0.0f;
+        GuiComponent.blit(dhl, integer5, integer6, float12, 0.0f, 20, 20, 40, 20);
+        if (boolean9 && boolean8) {
+            this.setTooltip(new TranslatableComponent("mco.news"));
         }
-        if (boolean3 && boolean7) {
-            final int integer6 = boolean8 ? 0 : ((int)(Math.max(0.0f, Math.max(RealmsMth.sin((10 + this.animTick) * 0.57f), RealmsMth.cos(this.animTick * 0.35f))) * -6.0f));
-            RealmsScreen.bind("realms:textures/gui/realms/invitation_icons.png");
+        if (boolean4 && boolean8) {
+            final int integer7 = boolean9 ? 0 : ((int)(Math.max(0.0f, Math.max(Mth.sin((10 + this.animTick) * 0.57f), Mth.cos(this.animTick * 0.35f))) * -6.0f));
+            this.minecraft.getTextureManager().bind(RealmsMainScreen.INVITATION_ICONS_LOCATION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            RenderSystem.pushMatrix();
-            RealmsScreen.blit(integer4 + 10, integer5 + 2 + integer6, 40.0f, 0.0f, 8, 8, 48, 16);
-            RenderSystem.popMatrix();
+            GuiComponent.blit(dhl, integer5 + 10, integer6 + 2 + integer7, 40.0f, 0.0f, 8, 8, 48, 16);
         }
     }
     
-    private void renderLocal() {
-        final String string2 = "LOCAL!";
+    private void renderLocal(final PoseStack dhl) {
+        final String string3 = "LOCAL!";
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.pushMatrix();
-        RenderSystem.translatef((float)(this.width() / 2 - 25), 20.0f, 0.0f);
+        RenderSystem.translatef((float)(this.width / 2 - 25), 20.0f, 0.0f);
         RenderSystem.rotatef(-20.0f, 0.0f, 0.0f, 1.0f);
         RenderSystem.scalef(1.5f, 1.5f, 1.5f);
-        this.drawString("LOCAL!", 0, 0, 8388479);
+        this.font.draw(dhl, "LOCAL!", 0.0f, 0.0f, 8388479);
         RenderSystem.popMatrix();
     }
     
-    private void renderStage() {
-        final String string2 = "STAGE!";
+    private void renderStage(final PoseStack dhl) {
+        final String string3 = "STAGE!";
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.pushMatrix();
-        RenderSystem.translatef((float)(this.width() / 2 - 25), 20.0f, 0.0f);
+        RenderSystem.translatef((float)(this.width / 2 - 25), 20.0f, 0.0f);
         RenderSystem.rotatef(-20.0f, 0.0f, 0.0f, 1.0f);
         RenderSystem.scalef(1.5f, 1.5f, 1.5f);
-        this.drawString("STAGE!", 0, 0, -256);
+        this.font.draw(dhl, "STAGE!", 0.0f, 0.0f, -256);
         RenderSystem.popMatrix();
     }
     
     public RealmsMainScreen newScreen() {
-        return new RealmsMainScreen(this.lastScreen);
+        final RealmsMainScreen dhv2 = new RealmsMainScreen(this.lastScreen);
+        dhv2.init(this.minecraft, this.width, this.height);
+        return dhv2;
     }
     
-    public static void updateTeaserImages(final ResourceManager zb) {
-        final Collection<ResourceLocation> collection2 = zb.listResources("textures/gui/images", string -> string.endsWith(".png"));
-        RealmsMainScreen.teaserImages = collection2.stream().filter(sm -> sm.getNamespace().equals("realms")).collect(ImmutableList.toImmutableList());
+    public static void updateTeaserImages(final ResourceManager abc) {
+        final Collection<ResourceLocation> collection2 = abc.listResources("textures/gui/images", string -> string.endsWith(".png"));
+        RealmsMainScreen.teaserImages = collection2.stream().filter(uh -> uh.getNamespace().equals("realms")).collect(ImmutableList.toImmutableList());
+    }
+    
+    private void setTooltip(final Component... arr) {
+        this.toolTip = Arrays.<Component>asList(arr);
+    }
+    
+    private void pendingButtonPress(final Button dni) {
+        this.minecraft.setScreen(new RealmsPendingInvitesScreen(this.lastScreen));
     }
     
     static {
         LOGGER = LogManager.getLogger();
+        ON_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/on_icon.png");
+        OFF_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/off_icon.png");
+        EXPIRED_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/expired_icon.png");
+        EXPIRES_SOON_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/expires_soon_icon.png");
+        LEAVE_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/leave_icon.png");
+        INVITATION_ICONS_LOCATION = new ResourceLocation("realms", "textures/gui/realms/invitation_icons.png");
+        INVITE_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/invite_icon.png");
+        WORLDICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/world_icon.png");
+        LOGO_LOCATION = new ResourceLocation("realms", "textures/gui/title/realms.png");
+        CONFIGURE_LOCATION = new ResourceLocation("realms", "textures/gui/realms/configure_icon.png");
+        QUESTIONMARK_LOCATION = new ResourceLocation("realms", "textures/gui/realms/questionmark.png");
+        NEWS_LOCATION = new ResourceLocation("realms", "textures/gui/realms/news_icon.png");
+        POPUP_LOCATION = new ResourceLocation("realms", "textures/gui/realms/popup.png");
+        DARKEN_LOCATION = new ResourceLocation("realms", "textures/gui/realms/darken.png");
+        CROSS_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/cross_icon.png");
+        TRIAL_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/trial_icon.png");
+        BUTTON_LOCATION = new ResourceLocation("minecraft", "textures/gui/widgets.png");
         RealmsMainScreen.teaserImages = ImmutableList.of();
-        realmsDataFetcher = new RealmsDataFetcher();
+        REALMS_DATA_FETCHER = new RealmsDataFetcher();
         RealmsMainScreen.lastScrollYPosition = -1;
     }
     
-    class RealmSelectionList extends RealmsObjectSelectionList<RealmListEntry> {
+    enum HoveredElement {
+        NONE, 
+        EXPIRED, 
+        LEAVE, 
+        CONFIGURE;
+    }
+    
+    class RealmSelectionList extends RealmsObjectSelectionList<RealmsMainScreen.Entry> {
+        private boolean showingMessage;
+        
         public RealmSelectionList() {
-            super(RealmsMainScreen.this.width(), RealmsMainScreen.this.height(), 32, RealmsMainScreen.this.height() - 40, 36);
+            super(RealmsMainScreen.this.width, RealmsMainScreen.this.height, 32, RealmsMainScreen.this.height - 40, 36);
         }
         
         @Override
+        public void clear() {
+            super.clear();
+            this.showingMessage = false;
+        }
+        
+        public int addMessageEntry(final RealmsMainScreen.Entry b) {
+            this.showingMessage = true;
+            return this.addEntry(b);
+        }
+        
         public boolean isFocused() {
-            return RealmsMainScreen.this.isFocused(this);
+            return RealmsMainScreen.this.getFocused() == this;
         }
         
         @Override
         public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
             if (integer1 != 257 && integer1 != 32 && integer1 != 335) {
-                return false;
-            }
-            final RealmListEntry realmListEntry5 = this.getSelected();
-            if (realmListEntry5 == null) {
                 return super.keyPressed(integer1, integer2, integer3);
             }
-            return realmListEntry5.mouseClicked(0.0, 0.0, 0);
+            final ObjectSelectionList.Entry a5 = ((AbstractSelectionList<ObjectSelectionList.Entry>)this).getSelected();
+            if (a5 == null) {
+                return super.keyPressed(integer1, integer2, integer3);
+            }
+            return a5.mouseClicked(0.0, 0.0, 0);
         }
         
         @Override
         public boolean mouseClicked(final double double1, final double double2, final int integer) {
-            if (integer == 0 && double1 < this.getScrollbarPosition() && double2 >= this.y0() && double2 <= this.y1()) {
+            if (integer == 0 && double1 < this.getScrollbarPosition() && double2 >= this.y0 && double2 <= this.y1) {
                 final int integer2 = RealmsMainScreen.this.realmSelectionList.getRowLeft();
                 final int integer3 = this.getScrollbarPosition();
-                final int integer4 = (int)Math.floor(double2 - this.y0()) - this.headerHeight() + this.getScroll() - 4;
-                final int integer5 = integer4 / this.itemHeight();
+                final int integer4 = (int)Math.floor(double2 - this.y0) - this.headerHeight + (int)this.getScrollAmount() - 4;
+                final int integer5 = integer4 / this.itemHeight;
                 if (double1 >= integer2 && double1 <= integer3 && integer5 >= 0 && integer4 >= 0 && integer5 < this.getItemCount()) {
-                    this.itemClicked(integer4, integer5, double1, double2, this.width());
+                    this.itemClicked(integer4, integer5, double1, double2, this.width);
                     RealmsMainScreen.this.clicks += 7;
                     this.selectItem(integer5);
                 }
@@ -1102,22 +1093,22 @@ public class RealmsMainScreen extends RealmsScreen {
         
         @Override
         public void selectItem(final int integer) {
-            this.setSelected(integer);
+            this.setSelectedItem(integer);
             if (integer == -1) {
                 return;
             }
-            RealmsServer realmsServer3;
-            if (RealmsMainScreen.this.shouldShowMessageInList()) {
+            RealmsServer dip3;
+            if (this.showingMessage) {
                 if (integer == 0) {
-                    Realms.narrateNow(RealmsScreen.getLocalizedString("mco.trial.message.line1"), RealmsScreen.getLocalizedString("mco.trial.message.line2"));
-                    realmsServer3 = null;
+                    NarrationHelper.now(I18n.get("mco.trial.message.line1"), I18n.get("mco.trial.message.line2"));
+                    dip3 = null;
                 }
                 else {
                     if (integer - 1 >= RealmsMainScreen.this.realmsServers.size()) {
                         RealmsMainScreen.this.selectedServerId = -1L;
                         return;
                     }
-                    realmsServer3 = RealmsMainScreen.this.realmsServers.get(integer - 1);
+                    dip3 = RealmsMainScreen.this.realmsServers.get(integer - 1);
                 }
             }
             else {
@@ -1125,28 +1116,36 @@ public class RealmsMainScreen extends RealmsScreen {
                     RealmsMainScreen.this.selectedServerId = -1L;
                     return;
                 }
-                realmsServer3 = RealmsMainScreen.this.realmsServers.get(integer);
+                dip3 = RealmsMainScreen.this.realmsServers.get(integer);
             }
-            RealmsMainScreen.this.updateButtonStates(realmsServer3);
-            if (realmsServer3 == null) {
+            RealmsMainScreen.this.updateButtonStates(dip3);
+            if (dip3 == null) {
                 RealmsMainScreen.this.selectedServerId = -1L;
                 return;
             }
-            if (realmsServer3.state == RealmsServer.State.UNINITIALIZED) {
-                Realms.narrateNow(RealmsScreen.getLocalizedString("mco.selectServer.uninitialized") + RealmsScreen.getLocalizedString("mco.gui.button"));
+            if (dip3.state == RealmsServer.State.UNINITIALIZED) {
+                NarrationHelper.now(I18n.get("mco.selectServer.uninitialized") + I18n.get("mco.gui.button"));
                 RealmsMainScreen.this.selectedServerId = -1L;
                 return;
             }
-            RealmsMainScreen.this.selectedServerId = realmsServer3.id;
-            if (RealmsMainScreen.this.clicks >= 10 && RealmsMainScreen.this.playButton.active()) {
+            RealmsMainScreen.this.selectedServerId = dip3.id;
+            if (RealmsMainScreen.this.clicks >= 10 && RealmsMainScreen.this.playButton.active) {
                 RealmsMainScreen.this.play(RealmsMainScreen.this.findServer(RealmsMainScreen.this.selectedServerId), RealmsMainScreen.this);
             }
-            Realms.narrateNow(RealmsScreen.getLocalizedString("narrator.select", realmsServer3.name));
+            NarrationHelper.now(I18n.get("narrator.select", dip3.name));
+        }
+        
+        @Override
+        public void setSelected(@Nullable final RealmsMainScreen.Entry b) {
+            super.setSelected(b);
+            final RealmsServer dip3 = RealmsMainScreen.this.realmsServers.get(this.children().indexOf(b) - (this.showingMessage ? 1 : 0));
+            RealmsMainScreen.this.selectedServerId = dip3.id;
+            RealmsMainScreen.this.updateButtonStates(dip3);
         }
         
         @Override
         public void itemClicked(final int integer1, int integer2, final double double3, final double double4, final int integer5) {
-            if (RealmsMainScreen.this.shouldShowMessageInList()) {
+            if (this.showingMessage) {
                 if (integer2 == 0) {
                     RealmsMainScreen.this.popupOpenedByUser = true;
                     return;
@@ -1156,26 +1155,26 @@ public class RealmsMainScreen extends RealmsScreen {
             if (integer2 >= RealmsMainScreen.this.realmsServers.size()) {
                 return;
             }
-            final RealmsServer realmsServer9 = RealmsMainScreen.this.realmsServers.get(integer2);
-            if (realmsServer9 == null) {
+            final RealmsServer dip9 = RealmsMainScreen.this.realmsServers.get(integer2);
+            if (dip9 == null) {
                 return;
             }
-            if (realmsServer9.state == RealmsServer.State.UNINITIALIZED) {
+            if (dip9.state == RealmsServer.State.UNINITIALIZED) {
                 RealmsMainScreen.this.selectedServerId = -1L;
-                Realms.setScreen(new RealmsCreateRealmScreen(realmsServer9, RealmsMainScreen.this));
+                Minecraft.getInstance().setScreen(new RealmsCreateRealmScreen(dip9, RealmsMainScreen.this));
             }
             else {
-                RealmsMainScreen.this.selectedServerId = realmsServer9.id;
+                RealmsMainScreen.this.selectedServerId = dip9.id;
             }
-            if (RealmsMainScreen.this.toolTip != null && RealmsMainScreen.this.toolTip.equals(RealmsScreen.getLocalizedString("mco.selectServer.configure"))) {
-                RealmsMainScreen.this.selectedServerId = realmsServer9.id;
-                RealmsMainScreen.this.configureClicked(realmsServer9);
+            if (RealmsMainScreen.this.hoveredElement == HoveredElement.CONFIGURE) {
+                RealmsMainScreen.this.selectedServerId = dip9.id;
+                RealmsMainScreen.this.configureClicked(dip9);
             }
-            else if (RealmsMainScreen.this.toolTip != null && RealmsMainScreen.this.toolTip.equals(RealmsScreen.getLocalizedString("mco.selectServer.leave"))) {
-                RealmsMainScreen.this.selectedServerId = realmsServer9.id;
-                RealmsMainScreen.this.leaveClicked(realmsServer9);
+            else if (RealmsMainScreen.this.hoveredElement == HoveredElement.LEAVE) {
+                RealmsMainScreen.this.selectedServerId = dip9.id;
+                RealmsMainScreen.this.leaveClicked(dip9);
             }
-            else if (RealmsMainScreen.this.isSelfOwnedServer(realmsServer9) && realmsServer9.expired && RealmsMainScreen.this.expiredHover) {
+            else if (RealmsMainScreen.this.hoveredElement == HoveredElement.EXPIRED) {
                 RealmsMainScreen.this.onRenew();
             }
         }
@@ -1191,13 +1190,18 @@ public class RealmsMainScreen extends RealmsScreen {
         }
     }
     
-    class RealmSelectionListTrialEntry extends RealmListEntry {
-        public RealmSelectionListTrialEntry() {
+    abstract class Entry extends ObjectSelectionList.Entry<Entry> {
+        private Entry() {
+        }
+    }
+    
+    class TrialEntry extends Entry {
+        private TrialEntry() {
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            this.renderTrialItem(integer1, integer3, integer2, integer6, integer7);
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.renderTrialItem(dhl, integer2, integer4, integer3, integer7, integer8);
         }
         
         @Override
@@ -1206,268 +1210,213 @@ public class RealmsMainScreen extends RealmsScreen {
             return true;
         }
         
-        private void renderTrialItem(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-            final int integer6 = integer3 + 8;
-            int integer7 = 0;
-            final String string9 = RealmsScreen.getLocalizedString("mco.trial.message.line1") + "\\n" + RealmsScreen.getLocalizedString("mco.trial.message.line2");
-            boolean boolean10 = false;
-            if (integer2 <= integer4 && integer4 <= RealmsMainScreen.this.realmSelectionList.getScroll() && integer3 <= integer5 && integer5 <= integer3 + 32) {
-                boolean10 = true;
+        private void renderTrialItem(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+            final int integer7 = integer4 + 8;
+            int integer8 = 0;
+            final String string10 = I18n.get("mco.trial.message.line1") + "\\n" + I18n.get("mco.trial.message.line2");
+            boolean boolean11 = false;
+            if (integer3 <= integer5 && integer5 <= (int)RealmsMainScreen.this.realmSelectionList.getScrollAmount() && integer4 <= integer6 && integer6 <= integer4 + 32) {
+                boolean11 = true;
             }
-            int integer8 = 8388479;
-            if (boolean10 && !RealmsMainScreen.this.shouldShowPopup()) {
-                integer8 = 6077788;
+            int integer9 = 8388479;
+            if (boolean11 && !RealmsMainScreen.this.shouldShowPopup()) {
+                integer9 = 6077788;
             }
-            for (final String string10 : string9.split("\\\\n")) {
-                RealmsMainScreen.this.drawCenteredString(string10, RealmsMainScreen.this.width() / 2, integer6 + integer7, integer8);
-                integer7 += 10;
+            for (final String string11 : string10.split("\\\\n")) {
+                RealmsMainScreen.this.drawCenteredString(dhl, RealmsMainScreen.this.font, string11, RealmsMainScreen.this.width / 2, integer7 + integer8, integer9);
+                integer8 += 10;
             }
         }
     }
     
-    class RealmSelectionListEntry extends RealmListEntry {
-        final RealmsServer mServerData;
+    class ServerEntry extends Entry {
+        private final RealmsServer serverData;
         
-        public RealmSelectionListEntry(final RealmsServer realmsServer) {
-            this.mServerData = realmsServer;
+        public ServerEntry(final RealmsServer dip) {
+            this.serverData = dip;
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            this.renderMcoServerItem(this.mServerData, integer3, integer2, integer6, integer7);
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.renderMcoServerItem(this.serverData, dhl, integer4, integer3, integer7, integer8);
         }
         
         @Override
         public boolean mouseClicked(final double double1, final double double2, final int integer) {
-            if (this.mServerData.state == RealmsServer.State.UNINITIALIZED) {
+            if (this.serverData.state == RealmsServer.State.UNINITIALIZED) {
                 RealmsMainScreen.this.selectedServerId = -1L;
-                Realms.setScreen(new RealmsCreateRealmScreen(this.mServerData, RealmsMainScreen.this));
+                RealmsMainScreen.this.minecraft.setScreen(new RealmsCreateRealmScreen(this.serverData, RealmsMainScreen.this));
             }
             else {
-                RealmsMainScreen.this.selectedServerId = this.mServerData.id;
+                RealmsMainScreen.this.selectedServerId = this.serverData.id;
             }
             return true;
         }
         
-        private void renderMcoServerItem(final RealmsServer realmsServer, final int integer2, final int integer3, final int integer4, final int integer5) {
-            this.renderLegacy(realmsServer, integer2 + 36, integer3, integer4, integer5);
+        private void renderMcoServerItem(final RealmsServer dip, final PoseStack dhl, final int integer3, final int integer4, final int integer5, final int integer6) {
+            this.renderLegacy(dip, dhl, integer3 + 36, integer4, integer5, integer6);
         }
         
-        private void renderLegacy(final RealmsServer realmsServer, final int integer2, final int integer3, final int integer4, final int integer5) {
-            if (realmsServer.state == RealmsServer.State.UNINITIALIZED) {
-                RealmsScreen.bind("realms:textures/gui/realms/world_icon.png");
+        private void renderLegacy(final RealmsServer dip, final PoseStack dhl, final int integer3, final int integer4, final int integer5, final int integer6) {
+            if (dip.state == RealmsServer.State.UNINITIALIZED) {
+                RealmsMainScreen.this.minecraft.getTextureManager().bind(RealmsMainScreen.WORLDICON_LOCATION);
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
                 RenderSystem.enableAlphaTest();
-                RenderSystem.pushMatrix();
-                RealmsScreen.blit(integer2 + 10, integer3 + 6, 0.0f, 0.0f, 40, 20, 40, 20);
-                RenderSystem.popMatrix();
-                final float float7 = 0.5f + (1.0f + RealmsMth.sin(RealmsMainScreen.this.animTick * 0.25f)) * 0.25f;
-                final int integer6 = 0xFF000000 | (int)(127.0f * float7) << 16 | (int)(255.0f * float7) << 8 | (int)(127.0f * float7);
-                RealmsMainScreen.this.drawCenteredString(RealmsScreen.getLocalizedString("mco.selectServer.uninitialized"), integer2 + 10 + 40 + 75, integer3 + 12, integer6);
+                GuiComponent.blit(dhl, integer3 + 10, integer4 + 6, 0.0f, 0.0f, 40, 20, 40, 20);
+                final float float8 = 0.5f + (1.0f + Mth.sin(RealmsMainScreen.this.animTick * 0.25f)) * 0.25f;
+                final int integer7 = 0xFF000000 | (int)(127.0f * float8) << 16 | (int)(255.0f * float8) << 8 | (int)(127.0f * float8);
+                RealmsMainScreen.this.drawCenteredString(dhl, RealmsMainScreen.this.font, I18n.get("mco.selectServer.uninitialized"), integer3 + 10 + 40 + 75, integer4 + 12, integer7);
                 return;
             }
-            final int integer7 = 225;
-            final int integer6 = 2;
-            if (realmsServer.expired) {
-                RealmsMainScreen.this.drawExpired(integer2 + 225 - 14, integer3 + 2, integer4, integer5);
+            final int integer8 = 225;
+            final int integer7 = 2;
+            if (dip.expired) {
+                RealmsMainScreen.this.drawExpired(dhl, integer3 + 225 - 14, integer4 + 2, integer5, integer6);
             }
-            else if (realmsServer.state == RealmsServer.State.CLOSED) {
-                RealmsMainScreen.this.drawClose(integer2 + 225 - 14, integer3 + 2, integer4, integer5);
+            else if (dip.state == RealmsServer.State.CLOSED) {
+                RealmsMainScreen.this.drawClose(dhl, integer3 + 225 - 14, integer4 + 2, integer5, integer6);
             }
-            else if (RealmsMainScreen.this.isSelfOwnedServer(realmsServer) && realmsServer.daysLeft < 7) {
-                RealmsMainScreen.this.drawExpiring(integer2 + 225 - 14, integer3 + 2, integer4, integer5, realmsServer.daysLeft);
+            else if (RealmsMainScreen.this.isSelfOwnedServer(dip) && dip.daysLeft < 7) {
+                RealmsMainScreen.this.drawExpiring(dhl, integer3 + 225 - 14, integer4 + 2, integer5, integer6, dip.daysLeft);
             }
-            else if (realmsServer.state == RealmsServer.State.OPEN) {
-                RealmsMainScreen.this.drawOpen(integer2 + 225 - 14, integer3 + 2, integer4, integer5);
+            else if (dip.state == RealmsServer.State.OPEN) {
+                RealmsMainScreen.this.drawOpen(dhl, integer3 + 225 - 14, integer4 + 2, integer5, integer6);
             }
-            if (!RealmsMainScreen.this.isSelfOwnedServer(realmsServer) && !RealmsMainScreen.overrideConfigure) {
-                RealmsMainScreen.this.drawLeave(integer2 + 225, integer3 + 2, integer4, integer5);
+            if (!RealmsMainScreen.this.isSelfOwnedServer(dip) && !RealmsMainScreen.overrideConfigure) {
+                RealmsMainScreen.this.drawLeave(dhl, integer3 + 225, integer4 + 2, integer5, integer6);
             }
             else {
-                RealmsMainScreen.this.drawConfigure(integer2 + 225, integer3 + 2, integer4, integer5);
+                RealmsMainScreen.this.drawConfigure(dhl, integer3 + 225, integer4 + 2, integer5, integer6);
             }
-            if (!"0".equals(realmsServer.serverPing.nrOfPlayers)) {
-                final String string9 = ChatFormatting.GRAY + "" + realmsServer.serverPing.nrOfPlayers;
-                RealmsMainScreen.this.drawString(string9, integer2 + 207 - RealmsMainScreen.this.fontWidth(string9), integer3 + 3, 8421504);
-                if (integer4 >= integer2 + 207 - RealmsMainScreen.this.fontWidth(string9) && integer4 <= integer2 + 207 && integer5 >= integer3 + 1 && integer5 <= integer3 + 10 && integer5 < RealmsMainScreen.this.height() - 40 && integer5 > 32 && !RealmsMainScreen.this.shouldShowPopup()) {
-                    RealmsMainScreen.this.toolTip = realmsServer.serverPing.playerList;
+            if (!"0".equals(dip.serverPing.nrOfPlayers)) {
+                final String string10 = ChatFormatting.GRAY + "" + dip.serverPing.nrOfPlayers;
+                RealmsMainScreen.this.font.draw(dhl, string10, (float)(integer3 + 207 - RealmsMainScreen.this.font.width(string10)), (float)(integer4 + 3), 8421504);
+                if (integer5 >= integer3 + 207 - RealmsMainScreen.this.font.width(string10) && integer5 <= integer3 + 207 && integer6 >= integer4 + 1 && integer6 <= integer4 + 10 && integer6 < RealmsMainScreen.this.height - 40 && integer6 > 32 && !RealmsMainScreen.this.shouldShowPopup()) {
+                    RealmsMainScreen.this.setTooltip(new TextComponent(dip.serverPing.playerList));
                 }
             }
-            if (RealmsMainScreen.this.isSelfOwnedServer(realmsServer) && realmsServer.expired) {
-                boolean boolean9 = false;
+            if (RealmsMainScreen.this.isSelfOwnedServer(dip) && dip.expired) {
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
                 RenderSystem.enableBlend();
-                RealmsScreen.bind("minecraft:textures/gui/widgets.png");
-                RenderSystem.pushMatrix();
+                RealmsMainScreen.this.minecraft.getTextureManager().bind(RealmsMainScreen.BUTTON_LOCATION);
                 RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
-                String string10 = RealmsScreen.getLocalizedString("mco.selectServer.expiredList");
-                String string11 = RealmsScreen.getLocalizedString("mco.selectServer.expiredRenew");
-                if (realmsServer.expiredTrial) {
-                    string10 = RealmsScreen.getLocalizedString("mco.selectServer.expiredTrial");
-                    string11 = RealmsScreen.getLocalizedString("mco.selectServer.expiredSubscribe");
+                String string10 = I18n.get("mco.selectServer.expiredList");
+                String string11 = I18n.get("mco.selectServer.expiredRenew");
+                if (dip.expiredTrial) {
+                    string10 = I18n.get("mco.selectServer.expiredTrial");
+                    string11 = I18n.get("mco.selectServer.expiredSubscribe");
                 }
-                final int integer8 = RealmsMainScreen.this.fontWidth(string11) + 17;
-                final int integer9 = 16;
-                final int integer10 = integer2 + RealmsMainScreen.this.fontWidth(string10) + 8;
-                final int integer11 = integer3 + 13;
-                if (integer4 >= integer10 && integer4 < integer10 + integer8 && integer5 > integer11 && (integer5 <= integer11 + 16 & integer5 < RealmsMainScreen.this.height() - 40) && integer5 > 32 && !RealmsMainScreen.this.shouldShowPopup()) {
-                    boolean9 = true;
-                    RealmsMainScreen.this.expiredHover = true;
+                final int integer9 = RealmsMainScreen.this.font.width(string11) + 17;
+                final int integer10 = 16;
+                final int integer11 = integer3 + RealmsMainScreen.this.font.width(string10) + 8;
+                final int integer12 = integer4 + 13;
+                boolean boolean16 = false;
+                if (integer5 >= integer11 && integer5 < integer11 + integer9 && integer6 > integer12 && (integer6 <= integer12 + 16 & integer6 < RealmsMainScreen.this.height - 40) && integer6 > 32 && !RealmsMainScreen.this.shouldShowPopup()) {
+                    boolean16 = true;
+                    RealmsMainScreen.this.hoveredElement = HoveredElement.EXPIRED;
                 }
-                final int integer12 = boolean9 ? 2 : 1;
-                RealmsScreen.blit(integer10, integer11, 0.0f, (float)(46 + integer12 * 20), integer8 / 2, 8, 256, 256);
-                RealmsScreen.blit(integer10 + integer8 / 2, integer11, (float)(200 - integer8 / 2), (float)(46 + integer12 * 20), integer8 / 2, 8, 256, 256);
-                RealmsScreen.blit(integer10, integer11 + 8, 0.0f, (float)(46 + integer12 * 20 + 12), integer8 / 2, 8, 256, 256);
-                RealmsScreen.blit(integer10 + integer8 / 2, integer11 + 8, (float)(200 - integer8 / 2), (float)(46 + integer12 * 20 + 12), integer8 / 2, 8, 256, 256);
-                RenderSystem.popMatrix();
+                final int integer13 = boolean16 ? 2 : 1;
+                GuiComponent.blit(dhl, integer11, integer12, 0.0f, (float)(46 + integer13 * 20), integer9 / 2, 8, 256, 256);
+                GuiComponent.blit(dhl, integer11 + integer9 / 2, integer12, (float)(200 - integer9 / 2), (float)(46 + integer13 * 20), integer9 / 2, 8, 256, 256);
+                GuiComponent.blit(dhl, integer11, integer12 + 8, 0.0f, (float)(46 + integer13 * 20 + 12), integer9 / 2, 8, 256, 256);
+                GuiComponent.blit(dhl, integer11 + integer9 / 2, integer12 + 8, (float)(200 - integer9 / 2), (float)(46 + integer13 * 20 + 12), integer9 / 2, 8, 256, 256);
                 RenderSystem.disableBlend();
-                final int integer13 = integer3 + 11 + 5;
-                final int integer14 = boolean9 ? 16777120 : 16777215;
-                RealmsMainScreen.this.drawString(string10, integer2 + 2, integer13 + 1, 15553363);
-                RealmsMainScreen.this.drawCenteredString(string11, integer10 + integer8 / 2, integer13 + 1, integer14);
+                final int integer14 = integer4 + 11 + 5;
+                final int integer15 = boolean16 ? 16777120 : 16777215;
+                RealmsMainScreen.this.font.draw(dhl, string10, (float)(integer3 + 2), (float)(integer14 + 1), 15553363);
+                RealmsMainScreen.this.drawCenteredString(dhl, RealmsMainScreen.this.font, string11, integer11 + integer9 / 2, integer14 + 1, integer15);
             }
             else {
-                if (realmsServer.worldType.equals(RealmsServer.WorldType.MINIGAME)) {
-                    final int integer15 = 13413468;
-                    final String string10 = RealmsScreen.getLocalizedString("mco.selectServer.minigame") + " ";
-                    final int integer16 = RealmsMainScreen.this.fontWidth(string10);
-                    RealmsMainScreen.this.drawString(string10, integer2 + 2, integer3 + 12, 13413468);
-                    RealmsMainScreen.this.drawString(realmsServer.getMinigameName(), integer2 + 2 + integer16, integer3 + 12, 8421504);
+                if (dip.worldType == RealmsServer.WorldType.MINIGAME) {
+                    final int integer16 = 13413468;
+                    final String string11 = I18n.get("mco.selectServer.minigame") + " ";
+                    final int integer9 = RealmsMainScreen.this.font.width(string11);
+                    RealmsMainScreen.this.font.draw(dhl, string11, (float)(integer3 + 2), (float)(integer4 + 12), 13413468);
+                    RealmsMainScreen.this.font.draw(dhl, dip.getMinigameName(), (float)(integer3 + 2 + integer9), (float)(integer4 + 12), 7105644);
                 }
                 else {
-                    RealmsMainScreen.this.drawString(realmsServer.getDescription(), integer2 + 2, integer3 + 12, 8421504);
+                    RealmsMainScreen.this.font.draw(dhl, dip.getDescription(), (float)(integer3 + 2), (float)(integer4 + 12), 7105644);
                 }
-                if (!RealmsMainScreen.this.isSelfOwnedServer(realmsServer)) {
-                    RealmsMainScreen.this.drawString(realmsServer.owner, integer2 + 2, integer3 + 12 + 11, 8421504);
+                if (!RealmsMainScreen.this.isSelfOwnedServer(dip)) {
+                    RealmsMainScreen.this.font.draw(dhl, dip.owner, (float)(integer3 + 2), (float)(integer4 + 12 + 11), 5000268);
                 }
             }
-            RealmsMainScreen.this.drawString(realmsServer.getName(), integer2 + 2, integer3 + 1, 16777215);
-            RealmsTextureManager.withBoundFace(realmsServer.ownerUUID, () -> {
+            RealmsMainScreen.this.font.draw(dhl, dip.getName(), (float)(integer3 + 2), (float)(integer4 + 1), 16777215);
+            RealmsTextureManager.withBoundFace(dip.ownerUUID, () -> {
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                RealmsScreen.blit(integer2 - 36, integer3, 8.0f, 8.0f, 8, 8, 32, 32, 64, 64);
-                RealmsScreen.blit(integer2 - 36, integer3, 40.0f, 8.0f, 8, 8, 32, 32, 64, 64);
+                GuiComponent.blit(dhl, integer3 - 36, integer4, 32, 32, 8.0f, 8.0f, 8, 8, 64, 64);
+                GuiComponent.blit(dhl, integer3 - 36, integer4, 32, 32, 40.0f, 8.0f, 8, 8, 64, 64);
             });
         }
     }
     
-    class PendingInvitesButton extends RealmsButton {
+    class PendingInvitesButton extends Button implements TickableWidget {
         public PendingInvitesButton() {
-            super(8, RealmsMainScreen.this.width() / 2 + 47, 6, 22, 22, "");
+            super(RealmsMainScreen.this.width / 2 + 47, 6, 22, 22, TextComponent.EMPTY, dni -> RealmsMainScreen.this.pendingButtonPress(dni));
         }
         
         @Override
         public void tick() {
-            this.setMessage(Realms.getLocalizedString((RealmsMainScreen.this.numberOfPendingInvites == 0) ? "mco.invites.nopending" : "mco.invites.pending"));
+            this.setMessage(new TranslatableComponent((RealmsMainScreen.this.numberOfPendingInvites == 0) ? "mco.invites.nopending" : "mco.invites.pending"));
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final float float3) {
-            super.render(integer1, integer2, float3);
-        }
-        
-        @Override
-        public void onPress() {
-            final RealmsPendingInvitesScreen dac2 = new RealmsPendingInvitesScreen(RealmsMainScreen.this.lastScreen);
-            Realms.setScreen(dac2);
-        }
-        
-        @Override
-        public void renderButton(final int integer1, final int integer2, final float float3) {
-            RealmsMainScreen.this.drawInvitationPendingIcon(integer1, integer2, this.x(), this.y(), this.getProxy().isHovered(), this.active());
+        public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+            RealmsMainScreen.this.drawInvitationPendingIcon(dhl, integer2, integer3, this.x, this.y, this.isHovered(), this.active);
         }
     }
     
-    class NewsButton extends RealmsButton {
+    class NewsButton extends Button {
         public NewsButton() {
-            super(9, RealmsMainScreen.this.width() - 62, 6, 20, 20, "");
+            RealmsPersistence.RealmsPersistenceData a3;
+            super(RealmsMainScreen.this.width - 62, 6, 20, 20, TextComponent.EMPTY, dni -> {
+                if (RealmsMainScreen.this.newsLink == null) {
+                    return;
+                }
+                else {
+                    Util.getPlatform().openUri(RealmsMainScreen.this.newsLink);
+                    if (RealmsMainScreen.this.hasUnreadNews) {
+                        a3 = RealmsPersistence.readFile();
+                        RealmsMainScreen.this.hasUnreadNews = (a3.hasUnreadNews = false);
+                        RealmsPersistence.writeFile(a3);
+                    }
+                    return;
+                }
+            });
+            this.setMessage(new TranslatableComponent("mco.news"));
         }
         
         @Override
-        public void tick() {
-            this.setMessage(Realms.getLocalizedString("mco.news"));
-        }
-        
-        @Override
-        public void render(final int integer1, final int integer2, final float float3) {
-            super.render(integer1, integer2, float3);
-        }
-        
-        @Override
-        public void onPress() {
-            if (RealmsMainScreen.this.newsLink == null) {
-                return;
-            }
-            RealmsUtil.browseTo(RealmsMainScreen.this.newsLink);
-            if (RealmsMainScreen.this.hasUnreadNews) {
-                final RealmsPersistence.RealmsPersistenceData a2 = RealmsPersistence.readFile();
-                a2.hasUnreadNews = false;
-                RealmsMainScreen.this.hasUnreadNews = false;
-                RealmsPersistence.writeFile(a2);
-            }
-        }
-        
-        @Override
-        public void renderButton(final int integer1, final int integer2, final float float3) {
-            RealmsMainScreen.this.renderNews(integer1, integer2, RealmsMainScreen.this.hasUnreadNews, this.x(), this.y(), this.getProxy().isHovered(), this.active());
+        public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+            RealmsMainScreen.this.renderNews(dhl, integer2, integer3, RealmsMainScreen.this.hasUnreadNews, this.x, this.y, this.isHovered(), this.active);
         }
     }
     
-    class ShowPopupButton extends RealmsButton {
+    class ShowPopupButton extends Button {
         public ShowPopupButton() {
-            super(10, RealmsMainScreen.this.width() - 37, 6, 20, 20, RealmsScreen.getLocalizedString("mco.selectServer.info"));
+            super(RealmsMainScreen.this.width - 37, 6, 20, 20, new TranslatableComponent("mco.selectServer.info"), dni -> RealmsMainScreen.this.popupOpenedByUser = !RealmsMainScreen.this.popupOpenedByUser);
         }
         
         @Override
-        public void tick() {
-            super.tick();
-        }
-        
-        @Override
-        public void render(final int integer1, final int integer2, final float float3) {
-            super.render(integer1, integer2, float3);
-        }
-        
-        @Override
-        public void renderButton(final int integer1, final int integer2, final float float3) {
-            RealmsMainScreen.this.renderMoreInfo(integer1, integer2, this.x(), this.y(), this.getProxy().isHovered());
-        }
-        
-        @Override
-        public void onPress() {
-            RealmsMainScreen.this.popupOpenedByUser = !RealmsMainScreen.this.popupOpenedByUser;
+        public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+            RealmsMainScreen.this.renderMoreInfo(dhl, integer2, integer3, this.x, this.y, this.isHovered());
         }
     }
     
-    class CloseButton extends RealmsButton {
+    class CloseButton extends Button {
         public CloseButton() {
-            super(11, RealmsMainScreen.this.popupX0() + 4, RealmsMainScreen.this.popupY0() + 4, 12, 12, RealmsScreen.getLocalizedString("mco.selectServer.close"));
+            super(RealmsMainScreen.this.popupX0() + 4, RealmsMainScreen.this.popupY0() + 4, 12, 12, new TranslatableComponent("mco.selectServer.close"), dni -> RealmsMainScreen.this.onClosePopup());
         }
         
         @Override
-        public void tick() {
-            super.tick();
-        }
-        
-        @Override
-        public void render(final int integer1, final int integer2, final float float3) {
-            super.render(integer1, integer2, float3);
-        }
-        
-        @Override
-        public void renderButton(final int integer1, final int integer2, final float float3) {
-            RealmsScreen.bind("realms:textures/gui/realms/cross_icon.png");
+        public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+            RealmsMainScreen.this.minecraft.getTextureManager().bind(RealmsMainScreen.CROSS_ICON_LOCATION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            RenderSystem.pushMatrix();
-            RealmsScreen.blit(this.x(), this.y(), 0.0f, this.getProxy().isHovered() ? 12.0f : 0.0f, 12, 12, 12, 24);
-            RenderSystem.popMatrix();
-            if (this.getProxy().isMouseOver(integer1, integer2)) {
-                RealmsMainScreen.this.toolTip = this.getProxy().getMessage();
+            final float float5 = this.isHovered() ? 12.0f : 0.0f;
+            GuiComponent.blit(dhl, this.x, this.y, 0.0f, float5, 12, 12, 12, 24);
+            if (this.isMouseOver(integer2, integer3)) {
+                RealmsMainScreen.this.setTooltip(this.getMessage());
             }
         }
-        
-        @Override
-        public void onPress() {
-            RealmsMainScreen.this.onClosePopup();
-        }
     }
 }
diff --git a/src/com/mojang/realmsclient/Unit.java b/src/com/mojang/realmsclient/Unit.java
new file mode 100644
index 0000000..f86eb6b
--- /dev/null
+++ b/src/com/mojang/realmsclient/Unit.java
@@ -0,0 +1,45 @@
+package com.mojang.realmsclient;
+
+import java.util.Locale;
+
+public enum Unit {
+    B, 
+    KB, 
+    MB, 
+    GB;
+    
+    public static Unit getLargest(final long long1) {
+        if (long1 < 1024L) {
+            return Unit.B;
+        }
+        try {
+            final int integer3 = (int)(Math.log((double)long1) / Math.log(1024.0));
+            final String string4 = String.valueOf("KMGTPE".charAt(integer3 - 1));
+            return valueOf(string4 + "B");
+        }
+        catch (Exception exception3) {
+            return Unit.GB;
+        }
+    }
+    
+    public static double convertTo(final long long1, final Unit dhw) {
+        if (dhw == Unit.B) {
+            return (double)long1;
+        }
+        return long1 / Math.pow(1024.0, dhw.ordinal());
+    }
+    
+    public static String humanReadable(final long long1) {
+        final int integer3 = 1024;
+        if (long1 < 1024L) {
+            return long1 + " B";
+        }
+        final int integer4 = (int)(Math.log((double)long1) / Math.log(1024.0));
+        final String string5 = "KMGTPE".charAt(integer4 - 1) + "";
+        return String.format(Locale.ROOT, "%.1f %sB", long1 / Math.pow(1024.0, integer4), string5);
+    }
+    
+    public static String humanReadable(final long long1, final Unit dhw) {
+        return String.format("%." + ((dhw == Unit.GB) ? "1" : "0") + "f %s", convertTo(long1, dhw), dhw.name());
+    }
+}
diff --git a/src/com/mojang/realmsclient/client/FileDownload.java b/src/com/mojang/realmsclient/client/FileDownload.java
index 88af7d8..1b1a4f3 100644
--- a/src/com/mojang/realmsclient/client/FileDownload.java
+++ b/src/com/mojang/realmsclient/client/FileDownload.java
@@ -6,20 +6,23 @@ import com.google.common.io.Files;
 import com.google.common.hash.Hashing;
 import java.awt.event.ActionEvent;
 import org.apache.logging.log4j.LogManager;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtIo;
+import java.nio.file.Path;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import java.util.regex.Matcher;
 import java.util.Iterator;
-import java.io.BufferedOutputStream;
+import net.minecraft.world.level.storage.LevelResource;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import java.io.InputStream;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
-import net.minecraft.realms.Realms;
+import net.minecraft.client.Minecraft;
 import java.util.Locale;
-import net.minecraft.realms.RealmsLevelSummary;
+import net.minecraft.world.level.storage.LevelSummary;
 import org.apache.commons.lang3.StringUtils;
-import net.minecraft.realms.RealmsSharedConstants;
+import net.minecraft.SharedConstants;
 import java.util.regex.Pattern;
 import org.apache.http.HttpResponse;
 import com.mojang.realmsclient.exception.RealmsDefaultUncaughtExceptionHandler;
@@ -27,7 +30,7 @@ import java.io.OutputStream;
 import org.apache.commons.io.IOUtils;
 import java.awt.event.ActionListener;
 import java.io.FileOutputStream;
-import net.minecraft.realms.RealmsAnvilLevelStorageSource;
+import net.minecraft.world.level.storage.LevelStorageSource;
 import com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen;
 import com.mojang.realmsclient.dto.WorldDownload;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -85,7 +88,7 @@ public class FileDownload {
         }
     }
     
-    public void download(final WorldDownload worldDownload, final String string, final RealmsDownloadLatestWorldScreen.DownloadStatus a, final RealmsAnvilLevelStorageSource realmsAnvilLevelStorageSource) {
+    public void download(final WorldDownload djc, final String string, final RealmsDownloadLatestWorldScreen.DownloadStatus a, final LevelStorageSource dae) {
         if (this.currentThread != null) {
             return;
         }
@@ -106,7 +109,7 @@ public class FileDownload {
             closeableHttpClient6 = null;
             try {
                 this.tempFile = File.createTempFile("backup", ".tar.gz");
-                this.request = new HttpGet(worldDownload.downloadLink);
+                this.request = new HttpGet(djc.downloadLink);
                 closeableHttpClient6 = HttpClientBuilder.create().setDefaultRequestConfig(this.requestConfig).build();
                 httpResponse7 = (HttpResponse)closeableHttpClient6.execute((HttpUriRequest)this.request);
                 a.totalBytes = Long.parseLong(httpResponse7.getFirstHeader("Content-Length").getValue());
@@ -116,7 +119,7 @@ public class FileDownload {
                 }
                 else {
                     outputStream8 = new FileOutputStream(this.tempFile);
-                    b9 = new ProgressListener(string.trim(), this.tempFile, realmsAnvilLevelStorageSource, a, worldDownload);
+                    b9 = new ProgressListener(string.trim(), this.tempFile, dae, a);
                     a2 = new DownloadCountingOutputStream(outputStream8);
                     a2.setListener(b9);
                     IOUtils.copy(httpResponse7.getEntity().getContent(), (OutputStream)a2);
@@ -130,10 +133,10 @@ public class FileDownload {
                     this.tempFile.delete();
                 }
                 if (!this.error) {
-                    if (!worldDownload.resourcePackUrl.isEmpty() && !worldDownload.resourcePackHash.isEmpty()) {
+                    if (!djc.resourcePackUrl.isEmpty() && !djc.resourcePackHash.isEmpty()) {
                         try {
                             this.tempFile = File.createTempFile("resources", ".tar.gz");
-                            this.request = new HttpGet(worldDownload.resourcePackUrl);
+                            this.request = new HttpGet(djc.resourcePackUrl);
                             httpResponse8 = (HttpResponse)closeableHttpClient6.execute((HttpUriRequest)this.request);
                             a.totalBytes = Long.parseLong(httpResponse8.getFirstHeader("Content-Length").getValue());
                             if (httpResponse8.getStatusLine().getStatusCode() != 200) {
@@ -143,7 +146,7 @@ public class FileDownload {
                             }
                             else {
                                 outputStream9 = new FileOutputStream(this.tempFile);
-                                c9 = new ResourcePackProgressListener(this.tempFile, a, worldDownload);
+                                c9 = new ResourcePackProgressListener(this.tempFile, a, djc);
                                 a3 = new DownloadCountingOutputStream(outputStream9);
                                 a3.setListener(c9);
                                 IOUtils.copy(httpResponse8.getEntity().getContent(), (OutputStream)a3);
@@ -179,10 +182,10 @@ public class FileDownload {
                     this.tempFile.delete();
                 }
                 if (!this.error) {
-                    if (!worldDownload.resourcePackUrl.isEmpty() && !worldDownload.resourcePackHash.isEmpty()) {
+                    if (!djc.resourcePackUrl.isEmpty() && !djc.resourcePackHash.isEmpty()) {
                         try {
                             this.tempFile = File.createTempFile("resources", ".tar.gz");
-                            this.request = new HttpGet(worldDownload.resourcePackUrl);
+                            this.request = new HttpGet(djc.resourcePackUrl);
                             httpResponse9 = (HttpResponse)closeableHttpClient6.execute((HttpUriRequest)this.request);
                             a.totalBytes = Long.parseLong(httpResponse9.getFirstHeader("Content-Length").getValue());
                             if (httpResponse9.getStatusLine().getStatusCode() != 200) {
@@ -192,7 +195,7 @@ public class FileDownload {
                             }
                             else {
                                 outputStream10 = new FileOutputStream(this.tempFile);
-                                c10 = new ResourcePackProgressListener(this.tempFile, a, worldDownload);
+                                c10 = new ResourcePackProgressListener(this.tempFile, a, djc);
                                 a4 = new DownloadCountingOutputStream(outputStream10);
                                 a4.setListener(c10);
                                 IOUtils.copy(httpResponse9.getEntity().getContent(), (OutputStream)a4);
@@ -263,10 +266,10 @@ public class FileDownload {
         return string;
     }
     
-    private void untarGzipArchive(String string, final File file, final RealmsAnvilLevelStorageSource realmsAnvilLevelStorageSource) throws IOException {
+    private void untarGzipArchive(String string, final File file, final LevelStorageSource dae) throws IOException {
         final Pattern pattern5 = Pattern.compile(".*-([0-9]+)$");
         int integer7 = 1;
-        for (final char character11 : RealmsSharedConstants.ILLEGAL_FILE_CHARACTERS) {
+        for (final char character11 : SharedConstants.ILLEGAL_FILE_CHARACTERS) {
             string = string.replace(character11, '_');
         }
         if (StringUtils.isEmpty((CharSequence)string)) {
@@ -274,9 +277,9 @@ public class FileDownload {
         }
         string = findAvailableFolderName(string);
         try {
-            for (final RealmsLevelSummary realmsLevelSummary9 : realmsAnvilLevelStorageSource.getLevelList()) {
-                if (realmsLevelSummary9.getLevelId().toLowerCase(Locale.ROOT).startsWith(string.toLowerCase(Locale.ROOT))) {
-                    final Matcher matcher10 = pattern5.matcher(realmsLevelSummary9.getLevelId());
+            for (final LevelSummary daf9 : dae.getLevelList()) {
+                if (daf9.getLevelId().toLowerCase(Locale.ROOT).startsWith(string.toLowerCase(Locale.ROOT))) {
+                    final Matcher matcher10 = pattern5.matcher(daf9.getLevelId());
                     if (matcher10.matches()) {
                         if (Integer.valueOf(matcher10.group(1)) <= integer7) {
                             continue;
@@ -295,13 +298,13 @@ public class FileDownload {
             return;
         }
         String string2;
-        if (!realmsAnvilLevelStorageSource.isNewLevelIdAcceptable(string) || integer7 > 1) {
+        if (!dae.isNewLevelIdAcceptable(string) || integer7 > 1) {
             string2 = string + ((integer7 == 1) ? "" : ("-" + integer7));
-            if (!realmsAnvilLevelStorageSource.isNewLevelIdAcceptable(string2)) {
+            if (!dae.isNewLevelIdAcceptable(string2)) {
                 for (boolean boolean8 = false; !boolean8; boolean8 = true) {
                     ++integer7;
                     string2 = string + ((integer7 == 1) ? "" : ("-" + integer7));
-                    if (realmsAnvilLevelStorageSource.isNewLevelIdAcceptable(string2)) {}
+                    if (dae.isNewLevelIdAcceptable(string2)) {}
                 }
             }
         }
@@ -309,7 +312,7 @@ public class FileDownload {
             string2 = string;
         }
         TarArchiveInputStream tarArchiveInputStream8 = null;
-        final File file2 = new File(Realms.getGameDirectoryPath(), "saves");
+        final File file2 = new File(Minecraft.getInstance().gameDirectory.getAbsolutePath(), "saves");
         try {
             file2.mkdir();
             tarArchiveInputStream8 = new TarArchiveInputStream((InputStream)new GzipCompressorInputStream((InputStream)new BufferedInputStream(new FileInputStream(file))));
@@ -320,14 +323,9 @@ public class FileDownload {
                 }
                 else {
                     file3.createNewFile();
-                    byte[] arr12 = new byte[1024];
-                    final BufferedOutputStream bufferedOutputStream13 = new BufferedOutputStream(new FileOutputStream(file3));
-                    int integer8 = 0;
-                    while ((integer8 = tarArchiveInputStream8.read(arr12)) != -1) {
-                        bufferedOutputStream13.write(arr12, 0, integer8);
+                    try (final FileOutputStream fileOutputStream12 = new FileOutputStream(file3)) {
+                        IOUtils.copy((InputStream)tarArchiveInputStream8, (OutputStream)fileOutputStream12);
                     }
-                    bufferedOutputStream13.close();
-                    arr12 = null;
                 }
             }
         }
@@ -342,14 +340,32 @@ public class FileDownload {
             if (file != null) {
                 file.delete();
             }
-            final RealmsAnvilLevelStorageSource realmsAnvilLevelStorageSource2 = realmsAnvilLevelStorageSource;
-            realmsAnvilLevelStorageSource2.renameLevel(string2, string2.trim());
-            final File file4 = new File(file2, string2 + File.separator + "level.dat");
-            Realms.deletePlayerTag(file4);
+            try (final LevelStorageSource.LevelStorageAccess a22 = dae.createAccess(string2)) {
+                a22.renameLevel(string2.trim());
+                final Path path24 = a22.getLevelPath(LevelResource.LEVEL_DATA_FILE);
+                deletePlayerTag(path24.toFile());
+            }
+            catch (IOException iOException22) {
+                FileDownload.LOGGER.error("Failed to rename unpacked realms level {}", string2, iOException22);
+            }
             this.resourcePackPath = new File(file2, string2 + File.separator + "resources.zip");
         }
     }
     
+    private static void deletePlayerTag(final File file) {
+        if (file.exists()) {
+            try {
+                final CompoundTag le2 = NbtIo.readCompressed(new FileInputStream(file));
+                final CompoundTag le3 = le2.getCompound("Data");
+                le3.remove("Player");
+                NbtIo.writeCompressed(le2, new FileOutputStream(file));
+            }
+            catch (Exception exception2) {
+                exception2.printStackTrace();
+            }
+        }
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
         INVALID_FILE_NAMES = new String[] { "CON", "COM", "PRN", "AUX", "CLOCK$", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" };
@@ -358,16 +374,14 @@ public class FileDownload {
     class ProgressListener implements ActionListener {
         private final String worldName;
         private final File tempFile;
-        private final RealmsAnvilLevelStorageSource levelStorageSource;
+        private final LevelStorageSource levelStorageSource;
         private final RealmsDownloadLatestWorldScreen.DownloadStatus downloadStatus;
-        private final WorldDownload worldDownload;
         
-        private ProgressListener(final String string, final File file, final RealmsAnvilLevelStorageSource realmsAnvilLevelStorageSource, final RealmsDownloadLatestWorldScreen.DownloadStatus a, final WorldDownload worldDownload) {
+        private ProgressListener(final String string, final File file, final LevelStorageSource dae, final RealmsDownloadLatestWorldScreen.DownloadStatus a) {
             this.worldName = string;
             this.tempFile = file;
-            this.levelStorageSource = realmsAnvilLevelStorageSource;
+            this.levelStorageSource = dae;
             this.downloadStatus = a;
-            this.worldDownload = worldDownload;
         }
         
         @Override
@@ -391,10 +405,10 @@ public class FileDownload {
         private final RealmsDownloadLatestWorldScreen.DownloadStatus downloadStatus;
         private final WorldDownload worldDownload;
         
-        private ResourcePackProgressListener(final File file, final RealmsDownloadLatestWorldScreen.DownloadStatus a, final WorldDownload worldDownload) {
+        private ResourcePackProgressListener(final File file, final RealmsDownloadLatestWorldScreen.DownloadStatus a, final WorldDownload djc) {
             this.tempFile = file;
             this.downloadStatus = a;
-            this.worldDownload = worldDownload;
+            this.worldDownload = djc;
         }
         
         @Override
diff --git a/src/com/mojang/realmsclient/client/FileUpload.java b/src/com/mojang/realmsclient/client/FileUpload.java
index a372e6f..2bc3c03 100644
--- a/src/com/mojang/realmsclient/client/FileUpload.java
+++ b/src/com/mojang/realmsclient/client/FileUpload.java
@@ -23,6 +23,7 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.client.methods.HttpPost;
 import java.util.function.Consumer;
 import java.util.concurrent.TimeUnit;
+import net.minecraft.client.User;
 import org.apache.http.client.config.RequestConfig;
 import com.mojang.realmsclient.gui.screens.UploadResult;
 import java.util.concurrent.CompletableFuture;
@@ -45,17 +46,17 @@ public class FileUpload {
     private CompletableFuture<UploadResult> uploadTask;
     private final RequestConfig requestConfig;
     
-    public FileUpload(final File file, final long long2, final int integer, final UploadInfo uploadInfo, final String string5, final String string6, final String string7, final UploadStatus czc) {
+    public FileUpload(final File file, final long long2, final int integer, final UploadInfo dja, final User dml, final String string, final UploadStatus die) {
         this.cancelled = new AtomicBoolean(false);
         this.requestConfig = RequestConfig.custom().setSocketTimeout((int)TimeUnit.MINUTES.toMillis(10L)).setConnectTimeout((int)TimeUnit.SECONDS.toMillis(15L)).build();
         this.file = file;
         this.worldId = long2;
         this.slotId = integer;
-        this.uploadInfo = uploadInfo;
-        this.sessionId = string5;
-        this.username = string6;
-        this.clientVersion = string7;
-        this.uploadStatus = czc;
+        this.uploadInfo = dja;
+        this.sessionId = dml.getSessionId();
+        this.username = dml.getName();
+        this.clientVersion = string;
+        this.uploadStatus = die;
     }
     
     public void upload(final Consumer<UploadResult> consumer) {
@@ -166,11 +167,11 @@ public class FileUpload {
         private final InputStream content;
         private final UploadStatus uploadStatus;
         
-        public CustomInputStreamEntity(final InputStream inputStream, final long long2, final UploadStatus czc) {
+        public CustomInputStreamEntity(final InputStream inputStream, final long long2, final UploadStatus die) {
             super(inputStream);
             this.content = inputStream;
             this.length = long2;
-            this.uploadStatus = czc;
+            this.uploadStatus = die;
         }
         
         public void writeTo(final OutputStream outputStream) throws IOException {
diff --git a/src/com/mojang/realmsclient/client/Ping.java b/src/com/mojang/realmsclient/client/Ping.java
index a7e2c7a..c018d7c 100644
--- a/src/com/mojang/realmsclient/client/Ping.java
+++ b/src/com/mojang/realmsclient/client/Ping.java
@@ -1,5 +1,6 @@
 package com.mojang.realmsclient.client;
 
+import net.minecraft.Util;
 import java.net.SocketAddress;
 import java.net.Socket;
 import java.net.InetSocketAddress;
@@ -53,7 +54,7 @@ public class Ping {
     }
     
     private static long now() {
-        return System.currentTimeMillis();
+        return Util.getMillis();
     }
     
     public static List<RegionPingResult> pingAllRegions() {
diff --git a/src/com/mojang/realmsclient/client/RealmsClient.java b/src/com/mojang/realmsclient/client/RealmsClient.java
index 4a2d739..8766e3f 100644
--- a/src/com/mojang/realmsclient/client/RealmsClient.java
+++ b/src/com/mojang/realmsclient/client/RealmsClient.java
@@ -3,10 +3,13 @@ package com.mojang.realmsclient.client;
 import org.apache.logging.log4j.LogManager;
 import com.mojang.realmsclient.exception.RealmsHttpException;
 import com.mojang.realmsclient.exception.RetryCallException;
+import net.minecraft.SharedConstants;
 import java.net.URISyntaxException;
 import java.net.URI;
+import javax.annotation.Nullable;
 import com.mojang.realmsclient.dto.PingResult;
 import com.mojang.realmsclient.dto.RealmsNews;
+import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.mojang.realmsclient.dto.UploadInfo;
 import com.mojang.realmsclient.dto.WorldDownload;
@@ -16,19 +19,18 @@ import com.mojang.realmsclient.dto.RealmsWorldResetDto;
 import com.mojang.realmsclient.dto.Ops;
 import com.mojang.realmsclient.dto.WorldTemplatePaginatedList;
 import com.mojang.realmsclient.dto.RealmsWorldOptions;
-import java.io.UnsupportedEncodingException;
 import com.mojang.realmsclient.dto.BackupList;
 import com.mojang.realmsclient.dto.PlayerInfo;
+import com.mojang.realmsclient.dto.ReflectionBasedSerialization;
 import com.mojang.realmsclient.dto.RealmsDescriptionDto;
 import com.mojang.realmsclient.dto.RealmsServerAddress;
 import com.mojang.realmsclient.dto.RealmsServerPlayerLists;
 import com.mojang.realmsclient.dto.RealmsServer;
-import java.io.IOException;
 import com.mojang.realmsclient.exception.RealmsServiceException;
 import com.mojang.realmsclient.dto.RealmsServerList;
 import java.net.Proxy;
-import net.minecraft.realms.Realms;
-import com.google.gson.Gson;
+import net.minecraft.client.Minecraft;
+import com.mojang.realmsclient.dto.GuardedSerializer;
 import org.apache.logging.log4j.Logger;
 
 public class RealmsClient {
@@ -37,30 +39,28 @@ public class RealmsClient {
     private static final Logger LOGGER;
     private final String sessionId;
     private final String username;
-    private static final Gson gson;
+    private static final GuardedSerializer GSON;
     
-    public static RealmsClient createRealmsClient() {
-        final String string1 = Realms.userName();
-        final String string2 = Realms.sessionId();
-        if (string1 == null || string2 == null) {
-            return null;
-        }
+    public static RealmsClient create() {
+        final Minecraft dlx1 = Minecraft.getInstance();
+        final String string2 = dlx1.getUser().getName();
+        final String string3 = dlx1.getUser().getSessionId();
         if (!RealmsClient.initialized) {
             RealmsClient.initialized = true;
-            String string3 = System.getenv("realms.environment");
-            if (string3 == null) {
-                string3 = System.getProperty("realms.environment");
+            String string4 = System.getenv("realms.environment");
+            if (string4 == null) {
+                string4 = System.getProperty("realms.environment");
             }
-            if (string3 != null) {
-                if ("LOCAL".equals(string3)) {
+            if (string4 != null) {
+                if ("LOCAL".equals(string4)) {
                     switchToLocal();
                 }
-                else if ("STAGE".equals(string3)) {
+                else if ("STAGE".equals(string4)) {
                     switchToStage();
                 }
             }
         }
-        return new RealmsClient(string2, string1, Realms.getProxy());
+        return new RealmsClient(string3, string2, dlx1.getProxy());
     }
     
     public static void switchToStage() {
@@ -81,13 +81,13 @@ public class RealmsClient {
         RealmsClientConfig.setProxy(proxy);
     }
     
-    public RealmsServerList listWorlds() throws RealmsServiceException, IOException {
+    public RealmsServerList listWorlds() throws RealmsServiceException {
         final String string2 = this.url("worlds");
         final String string3 = this.execute(Request.get(string2));
         return RealmsServerList.parse(string3);
     }
     
-    public RealmsServer getOwnWorld(final long long1) throws RealmsServiceException, IOException {
+    public RealmsServer getOwnWorld(final long long1) throws RealmsServiceException {
         final String string4 = this.url("worlds" + "/$ID".replace("$ID", String.valueOf(long1)));
         final String string5 = this.execute(Request.get(string4));
         return RealmsServer.parse(string5);
@@ -99,32 +99,32 @@ public class RealmsClient {
         return RealmsServerPlayerLists.parse(string3);
     }
     
-    public RealmsServerAddress join(final long long1) throws RealmsServiceException, IOException {
+    public RealmsServerAddress join(final long long1) throws RealmsServiceException {
         final String string4 = this.url("worlds" + "/v1/$ID/join/pc".replace("$ID", "" + long1));
         final String string5 = this.execute(Request.get(string4, 5000, 30000));
         return RealmsServerAddress.parse(string5);
     }
     
-    public void initializeWorld(final long long1, final String string2, final String string3) throws RealmsServiceException, IOException {
-        final RealmsDescriptionDto realmsDescriptionDto6 = new RealmsDescriptionDto(string2, string3);
+    public void initializeWorld(final long long1, final String string2, final String string3) throws RealmsServiceException {
+        final RealmsDescriptionDto din6 = new RealmsDescriptionDto(string2, string3);
         final String string4 = this.url("worlds" + "/$WORLD_ID/initialize".replace("$WORLD_ID", String.valueOf(long1)));
-        final String string5 = RealmsClient.gson.toJson(realmsDescriptionDto6);
+        final String string5 = RealmsClient.GSON.toJson(din6);
         this.execute(Request.post(string4, string5, 5000, 10000));
     }
     
-    public Boolean mcoEnabled() throws RealmsServiceException, IOException {
+    public Boolean mcoEnabled() throws RealmsServiceException {
         final String string2 = this.url("mco/available");
         final String string3 = this.execute(Request.get(string2));
         return Boolean.valueOf(string3);
     }
     
-    public Boolean stageAvailable() throws RealmsServiceException, IOException {
+    public Boolean stageAvailable() throws RealmsServiceException {
         final String string2 = this.url("mco/stageAvailable");
         final String string3 = this.execute(Request.get(string2));
         return Boolean.valueOf(string3);
     }
     
-    public CompatibleVersionResponse clientCompatible() throws RealmsServiceException, IOException {
+    public CompatibleVersionResponse clientCompatible() throws RealmsServiceException {
         final String string2 = this.url("mco/client/compatible");
         final String string3 = this.execute(Request.get(string2));
         CompatibleVersionResponse a4;
@@ -147,11 +147,11 @@ public class RealmsClient {
         this.execute(Request.delete(string4));
     }
     
-    public RealmsServer invite(final long long1, final String string) throws RealmsServiceException, IOException {
-        final PlayerInfo playerInfo5 = new PlayerInfo();
-        playerInfo5.setName(string);
+    public RealmsServer invite(final long long1, final String string) throws RealmsServiceException {
+        final PlayerInfo dim5 = new PlayerInfo();
+        dim5.setName(string);
         final String string2 = this.url("invites" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(long1)));
-        final String string3 = this.execute(Request.post(string2, RealmsClient.gson.toJson(playerInfo5)));
+        final String string3 = this.execute(Request.post(string2, RealmsClient.GSON.toJson(dim5)));
         return RealmsServer.parse(string3);
     }
     
@@ -161,15 +161,15 @@ public class RealmsClient {
         return BackupList.parse(string5);
     }
     
-    public void update(final long long1, final String string2, final String string3) throws RealmsServiceException, UnsupportedEncodingException {
-        final RealmsDescriptionDto realmsDescriptionDto6 = new RealmsDescriptionDto(string2, string3);
+    public void update(final long long1, final String string2, final String string3) throws RealmsServiceException {
+        final RealmsDescriptionDto din6 = new RealmsDescriptionDto(string2, string3);
         final String string4 = this.url("worlds" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(long1)));
-        this.execute(Request.post(string4, RealmsClient.gson.toJson(realmsDescriptionDto6)));
+        this.execute(Request.post(string4, RealmsClient.GSON.toJson(din6)));
     }
     
-    public void updateSlot(final long long1, final int integer, final RealmsWorldOptions realmsWorldOptions) throws RealmsServiceException, UnsupportedEncodingException {
+    public void updateSlot(final long long1, final int integer, final RealmsWorldOptions div) throws RealmsServiceException {
         final String string6 = this.url("worlds" + "/$WORLD_ID/slot/$SLOT_ID".replace("$WORLD_ID", String.valueOf(long1)).replace("$SLOT_ID", String.valueOf(integer)));
-        final String string7 = realmsWorldOptions.toJson();
+        final String string7 = div.toJson();
         this.execute(Request.post(string6, string7));
     }
     
@@ -208,33 +208,33 @@ public class RealmsClient {
         return Ops.parse(this.execute(Request.delete(string3)));
     }
     
-    public Boolean open(final long long1) throws RealmsServiceException, IOException {
+    public Boolean open(final long long1) throws RealmsServiceException {
         final String string4 = this.url("worlds" + "/$WORLD_ID/open".replace("$WORLD_ID", String.valueOf(long1)));
         final String string5 = this.execute(Request.put(string4, ""));
         return Boolean.valueOf(string5);
     }
     
-    public Boolean close(final long long1) throws RealmsServiceException, IOException {
+    public Boolean close(final long long1) throws RealmsServiceException {
         final String string4 = this.url("worlds" + "/$WORLD_ID/close".replace("$WORLD_ID", String.valueOf(long1)));
         final String string5 = this.execute(Request.put(string4, ""));
         return Boolean.valueOf(string5);
     }
     
-    public Boolean resetWorldWithSeed(final long long1, final String string, final Integer integer, final boolean boolean4) throws RealmsServiceException, IOException {
-        final RealmsWorldResetDto realmsWorldResetDto7 = new RealmsWorldResetDto(string, -1L, integer, boolean4);
+    public Boolean resetWorldWithSeed(final long long1, final String string, final Integer integer, final boolean boolean4) throws RealmsServiceException {
+        final RealmsWorldResetDto diw7 = new RealmsWorldResetDto(string, -1L, integer, boolean4);
         final String string2 = this.url("worlds" + "/$WORLD_ID/reset".replace("$WORLD_ID", String.valueOf(long1)));
-        final String string3 = this.execute(Request.post(string2, RealmsClient.gson.toJson(realmsWorldResetDto7), 30000, 80000));
+        final String string3 = this.execute(Request.post(string2, RealmsClient.GSON.toJson(diw7), 30000, 80000));
         return Boolean.valueOf(string3);
     }
     
-    public Boolean resetWorldWithTemplate(final long long1, final String string) throws RealmsServiceException, IOException {
-        final RealmsWorldResetDto realmsWorldResetDto5 = new RealmsWorldResetDto(null, Long.valueOf(string), -1, false);
+    public Boolean resetWorldWithTemplate(final long long1, final String string) throws RealmsServiceException {
+        final RealmsWorldResetDto diw5 = new RealmsWorldResetDto(null, Long.valueOf(string), -1, false);
         final String string2 = this.url("worlds" + "/$WORLD_ID/reset".replace("$WORLD_ID", String.valueOf(long1)));
-        final String string3 = this.execute(Request.post(string2, RealmsClient.gson.toJson(realmsWorldResetDto5), 30000, 80000));
+        final String string3 = this.execute(Request.post(string2, RealmsClient.GSON.toJson(diw5), 30000, 80000));
         return Boolean.valueOf(string3);
     }
     
-    public Subscription subscriptionFor(final long long1) throws RealmsServiceException, IOException {
+    public Subscription subscriptionFor(final long long1) throws RealmsServiceException {
         final String string4 = this.url("subscriptions" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(long1)));
         final String string5 = this.execute(Request.get(string4));
         return Subscription.parse(string5);
@@ -265,14 +265,14 @@ public class RealmsClient {
     
     public UploadInfo upload(final long long1, final String string) throws RealmsServiceException {
         final String string2 = this.url("worlds" + "/$WORLD_ID/backups/upload".replace("$WORLD_ID", String.valueOf(long1)));
-        final UploadInfo uploadInfo6 = new UploadInfo();
+        final UploadInfo dja6 = new UploadInfo();
         if (string != null) {
-            uploadInfo6.setToken(string);
+            dja6.setToken(string);
         }
         final GsonBuilder gsonBuilder7 = new GsonBuilder();
         gsonBuilder7.excludeFieldsWithoutExposeAnnotation();
         final Gson gson8 = gsonBuilder7.create();
-        final String string3 = gson8.toJson(uploadInfo6);
+        final String string3 = gson8.toJson(dja6);
         return UploadInfo.parse(this.execute(Request.put(string2, string3)));
     }
     
@@ -286,36 +286,37 @@ public class RealmsClient {
         this.execute(Request.post(string2, ""));
     }
     
-    public RealmsNews getNews() throws RealmsServiceException, IOException {
+    public RealmsNews getNews() throws RealmsServiceException {
         final String string2 = this.url("mco/v1/news");
         final String string3 = this.execute(Request.get(string2, 5000, 10000));
         return RealmsNews.parse(string3);
     }
     
-    public void sendPingResults(final PingResult pingResult) throws RealmsServiceException {
+    public void sendPingResults(final PingResult dil) throws RealmsServiceException {
         final String string3 = this.url("regions/ping/stat");
-        this.execute(Request.post(string3, RealmsClient.gson.toJson(pingResult)));
+        this.execute(Request.post(string3, RealmsClient.GSON.toJson(dil)));
     }
     
-    public Boolean trialAvailable() throws RealmsServiceException, IOException {
+    public Boolean trialAvailable() throws RealmsServiceException {
         final String string2 = this.url("trial");
         final String string3 = this.execute(Request.get(string2));
         return Boolean.valueOf(string3);
     }
     
-    public void deleteWorld(final long long1) throws RealmsServiceException, IOException {
+    public void deleteWorld(final long long1) throws RealmsServiceException {
         final String string4 = this.url("worlds" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(long1)));
         this.execute(Request.delete(string4));
     }
     
+    @Nullable
     private String url(final String string) {
         return this.url(string, null);
     }
     
-    private String url(final String string1, final String string2) {
+    @Nullable
+    private String url(final String string1, @Nullable final String string2) {
         try {
-            final URI uRI4 = new URI(RealmsClient.currentEnvironment.protocol, RealmsClient.currentEnvironment.baseUrl, "/" + string1, string2, null);
-            return uRI4.toASCIIString();
+            return new URI(RealmsClient.currentEnvironment.protocol, RealmsClient.currentEnvironment.baseUrl, "/" + string1, string2, null).toASCIIString();
         }
         catch (URISyntaxException uRISyntaxException4) {
             uRISyntaxException4.printStackTrace();
@@ -323,22 +324,22 @@ public class RealmsClient {
         }
     }
     
-    private String execute(final Request<?> czb) throws RealmsServiceException {
-        czb.cookie("sid", this.sessionId);
-        czb.cookie("user", this.username);
-        czb.cookie("version", Realms.getMinecraftVersionString());
+    private String execute(final Request<?> did) throws RealmsServiceException {
+        did.cookie("sid", this.sessionId);
+        did.cookie("user", this.username);
+        did.cookie("version", SharedConstants.getCurrentVersion().getName());
         try {
-            final int integer3 = czb.responseCode();
+            final int integer3 = did.responseCode();
             if (integer3 == 503) {
-                final int integer4 = czb.getRetryAfterHeader();
+                final int integer4 = did.getRetryAfterHeader();
                 throw new RetryCallException(integer4);
             }
-            final String string4 = czb.text();
+            final String string4 = did.text();
             if (integer3 >= 200 && integer3 < 300) {
                 return string4;
             }
             if (integer3 == 401) {
-                final String string5 = czb.getHeader("WWW-Authenticate");
+                final String string5 = did.getHeader("WWW-Authenticate");
                 RealmsClient.LOGGER.info("Could not authorize you against Realms server: " + string5);
                 throw new RealmsServiceException(integer3, string5, -1, string5);
             }
@@ -346,19 +347,19 @@ public class RealmsClient {
                 RealmsClient.LOGGER.error("Realms error code: " + integer3 + " message: " + string4);
                 throw new RealmsServiceException(integer3, string4, integer3, "");
             }
-            final RealmsError cza5 = new RealmsError(string4);
-            RealmsClient.LOGGER.error("Realms http code: " + integer3 + " -  error code: " + cza5.getErrorCode() + " -  message: " + cza5.getErrorMessage() + " - raw body: " + string4);
-            throw new RealmsServiceException(integer3, string4, cza5);
+            final RealmsError dic5 = RealmsError.create(string4);
+            RealmsClient.LOGGER.error("Realms http code: " + integer3 + " -  error code: " + dic5.getErrorCode() + " -  message: " + dic5.getErrorMessage() + " - raw body: " + string4);
+            throw new RealmsServiceException(integer3, string4, dic5);
         }
-        catch (RealmsHttpException czf3) {
-            throw new RealmsServiceException(500, "Could not connect to Realms: " + czf3.getMessage(), -1, "");
+        catch (RealmsHttpException djg3) {
+            throw new RealmsServiceException(500, "Could not connect to Realms: " + djg3.getMessage(), -1, "");
         }
     }
     
     static {
         RealmsClient.currentEnvironment = Environment.PRODUCTION;
         LOGGER = LogManager.getLogger();
-        gson = new Gson();
+        GSON = new GuardedSerializer();
     }
     
     public enum Environment {
diff --git a/src/com/mojang/realmsclient/client/RealmsError.java b/src/com/mojang/realmsclient/client/RealmsError.java
index 11da6a1..4dbf20c 100644
--- a/src/com/mojang/realmsclient/client/RealmsError.java
+++ b/src/com/mojang/realmsclient/client/RealmsError.java
@@ -8,19 +8,26 @@ import org.apache.logging.log4j.Logger;
 
 public class RealmsError {
     private static final Logger LOGGER;
-    private String errorMessage;
-    private int errorCode;
+    private final String errorMessage;
+    private final int errorCode;
     
-    public RealmsError(final String string) {
+    private RealmsError(final String string, final int integer) {
+        this.errorMessage = string;
+        this.errorCode = integer;
+    }
+    
+    public static RealmsError create(final String string) {
         try {
-            final JsonParser jsonParser3 = new JsonParser();
-            final JsonObject jsonObject4 = jsonParser3.parse(string).getAsJsonObject();
-            this.errorMessage = JsonUtils.getStringOr("errorMsg", jsonObject4, "");
-            this.errorCode = JsonUtils.getIntOr("errorCode", jsonObject4, -1);
+            final JsonParser jsonParser2 = new JsonParser();
+            final JsonObject jsonObject3 = jsonParser2.parse(string).getAsJsonObject();
+            final String string2 = JsonUtils.getStringOr("errorMsg", jsonObject3, "");
+            final int integer5 = JsonUtils.getIntOr("errorCode", jsonObject3, -1);
+            return new RealmsError(string2, integer5);
         }
-        catch (Exception exception3) {
-            RealmsError.LOGGER.error("Could not parse RealmsError: " + exception3.getMessage());
+        catch (Exception exception2) {
+            RealmsError.LOGGER.error("Could not parse RealmsError: " + exception2.getMessage());
             RealmsError.LOGGER.error("The error was: " + string);
+            return new RealmsError("Failed to parse response from server", -1);
         }
     }
     
diff --git a/src/com/mojang/realmsclient/client/Request.java b/src/com/mojang/realmsclient/client/Request.java
index a8139e1..e2fa299 100644
--- a/src/com/mojang/realmsclient/client/Request.java
+++ b/src/com/mojang/realmsclient/client/Request.java
@@ -108,19 +108,17 @@ public abstract class Request<T extends Request<T>> {
     private void dispose() {
         final byte[] arr2 = new byte[1024];
         try {
-            int integer3 = 0;
-            final InputStream inputStream4 = this.connection.getInputStream();
-            while ((integer3 = inputStream4.read(arr2)) > 0) {}
-            inputStream4.close();
+            final InputStream inputStream3 = this.connection.getInputStream();
+            while (inputStream3.read(arr2) > 0) {}
+            inputStream3.close();
         }
         catch (Exception exception3) {
             try {
                 final InputStream inputStream4 = this.connection.getErrorStream();
-                int integer4 = 0;
                 if (inputStream4 == null) {
                     return;
                 }
-                while ((integer4 = inputStream4.read(arr2)) > 0) {}
+                while (inputStream4.read(arr2) > 0) {}
                 inputStream4.close();
             }
             catch (IOException ex) {}
@@ -136,9 +134,9 @@ public abstract class Request<T extends Request<T>> {
         if (this.connected) {
             return (T)this;
         }
-        final T czb2 = this.doConnect();
+        final T did2 = this.doConnect();
         this.connected = true;
-        return czb2;
+        return did2;
     }
     
     protected abstract T doConnect();
diff --git a/src/com/mojang/realmsclient/dto/Backup.java b/src/com/mojang/realmsclient/dto/Backup.java
index 7013cf1..6842087 100644
--- a/src/com/mojang/realmsclient/dto/Backup.java
+++ b/src/com/mojang/realmsclient/dto/Backup.java
@@ -27,17 +27,17 @@ public class Backup extends ValueObject {
     
     public static Backup parse(final JsonElement jsonElement) {
         final JsonObject jsonObject2 = jsonElement.getAsJsonObject();
-        final Backup backup3 = new Backup();
+        final Backup dif3 = new Backup();
         try {
-            backup3.backupId = JsonUtils.getStringOr("backupId", jsonObject2, "");
-            backup3.lastModifiedDate = JsonUtils.getDateOr("lastModifiedDate", jsonObject2);
-            backup3.size = JsonUtils.getLongOr("size", jsonObject2, 0L);
+            dif3.backupId = JsonUtils.getStringOr("backupId", jsonObject2, "");
+            dif3.lastModifiedDate = JsonUtils.getDateOr("lastModifiedDate", jsonObject2);
+            dif3.size = JsonUtils.getLongOr("size", jsonObject2, 0L);
             if (jsonObject2.has("metadata")) {
                 final JsonObject jsonObject3 = jsonObject2.getAsJsonObject("metadata");
                 final Set<Map.Entry<String, JsonElement>> set5 = jsonObject3.entrySet();
                 for (final Map.Entry<String, JsonElement> entry7 : set5) {
                     if (!entry7.getValue().isJsonNull()) {
-                        backup3.metadata.put(format(entry7.getKey()), entry7.getValue().getAsString());
+                        dif3.metadata.put(format(entry7.getKey()), entry7.getValue().getAsString());
                     }
                 }
             }
@@ -45,7 +45,7 @@ public class Backup extends ValueObject {
         catch (Exception exception4) {
             Backup.LOGGER.error("Could not parse Backup: " + exception4.getMessage());
         }
-        return backup3;
+        return dif3;
     }
     
     private static String format(final String string) {
@@ -58,7 +58,7 @@ public class Backup extends ValueObject {
                 }
                 else {
                     final char character8 = Character.toUpperCase(string2.charAt(0));
-                    stringBuilder3.append(character8).append(string2.substring(1, string2.length())).append(" ");
+                    stringBuilder3.append(character8).append(string2.substring(1)).append(" ");
                 }
             }
         }
diff --git a/src/com/mojang/realmsclient/dto/BackupList.java b/src/com/mojang/realmsclient/dto/BackupList.java
index 12e8701..a157548 100644
--- a/src/com/mojang/realmsclient/dto/BackupList.java
+++ b/src/com/mojang/realmsclient/dto/BackupList.java
@@ -14,21 +14,21 @@ public class BackupList extends ValueObject {
     
     public static BackupList parse(final String string) {
         final JsonParser jsonParser2 = new JsonParser();
-        final BackupList backupList3 = new BackupList();
-        backupList3.backups = Lists.newArrayList();
+        final BackupList dig3 = new BackupList();
+        dig3.backups = Lists.newArrayList();
         try {
             final JsonElement jsonElement4 = jsonParser2.parse(string).getAsJsonObject().get("backups");
             if (jsonElement4.isJsonArray()) {
                 final Iterator<JsonElement> iterator5 = jsonElement4.getAsJsonArray().iterator();
                 while (iterator5.hasNext()) {
-                    backupList3.backups.add(Backup.parse(iterator5.next()));
+                    dig3.backups.add(Backup.parse(iterator5.next()));
                 }
             }
         }
         catch (Exception exception4) {
             BackupList.LOGGER.error("Could not parse BackupList: " + exception4.getMessage());
         }
-        return backupList3;
+        return dig3;
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/dto/GuardedSerializer.java b/src/com/mojang/realmsclient/dto/GuardedSerializer.java
new file mode 100644
index 0000000..0b7eabc
--- /dev/null
+++ b/src/com/mojang/realmsclient/dto/GuardedSerializer.java
@@ -0,0 +1,19 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.Gson;
+
+public class GuardedSerializer {
+    private final Gson gson;
+    
+    public GuardedSerializer() {
+        this.gson = new Gson();
+    }
+    
+    public String toJson(final ReflectionBasedSerialization dix) {
+        return this.gson.toJson(dix);
+    }
+    
+    public <T extends ReflectionBasedSerialization> T fromJson(final String string, final Class<T> class2) {
+        return this.gson.<T>fromJson(string, class2);
+    }
+}
diff --git a/src/com/mojang/realmsclient/dto/Ops.java b/src/com/mojang/realmsclient/dto/Ops.java
index 4dec2e7..8a1206e 100644
--- a/src/com/mojang/realmsclient/dto/Ops.java
+++ b/src/com/mojang/realmsclient/dto/Ops.java
@@ -15,7 +15,7 @@ public class Ops extends ValueObject {
     }
     
     public static Ops parse(final String string) {
-        final Ops ops2 = new Ops();
+        final Ops dii2 = new Ops();
         final JsonParser jsonParser3 = new JsonParser();
         try {
             final JsonElement jsonElement4 = jsonParser3.parse(string);
@@ -23,11 +23,11 @@ public class Ops extends ValueObject {
             final JsonElement jsonElement5 = jsonObject5.get("ops");
             if (jsonElement5.isJsonArray()) {
                 for (final JsonElement jsonElement6 : jsonElement5.getAsJsonArray()) {
-                    ops2.ops.add(jsonElement6.getAsString());
+                    dii2.ops.add(jsonElement6.getAsString());
                 }
             }
         }
         catch (Exception ex) {}
-        return ops2;
+        return dii2;
     }
 }
diff --git a/src/com/mojang/realmsclient/dto/PendingInvite.java b/src/com/mojang/realmsclient/dto/PendingInvite.java
index 1c2b388..3ad176e 100644
--- a/src/com/mojang/realmsclient/dto/PendingInvite.java
+++ b/src/com/mojang/realmsclient/dto/PendingInvite.java
@@ -15,18 +15,18 @@ public class PendingInvite extends ValueObject {
     public Date date;
     
     public static PendingInvite parse(final JsonObject jsonObject) {
-        final PendingInvite pendingInvite2 = new PendingInvite();
+        final PendingInvite dij2 = new PendingInvite();
         try {
-            pendingInvite2.invitationId = JsonUtils.getStringOr("invitationId", jsonObject, "");
-            pendingInvite2.worldName = JsonUtils.getStringOr("worldName", jsonObject, "");
-            pendingInvite2.worldOwnerName = JsonUtils.getStringOr("worldOwnerName", jsonObject, "");
-            pendingInvite2.worldOwnerUuid = JsonUtils.getStringOr("worldOwnerUuid", jsonObject, "");
-            pendingInvite2.date = JsonUtils.getDateOr("date", jsonObject);
+            dij2.invitationId = JsonUtils.getStringOr("invitationId", jsonObject, "");
+            dij2.worldName = JsonUtils.getStringOr("worldName", jsonObject, "");
+            dij2.worldOwnerName = JsonUtils.getStringOr("worldOwnerName", jsonObject, "");
+            dij2.worldOwnerUuid = JsonUtils.getStringOr("worldOwnerUuid", jsonObject, "");
+            dij2.date = JsonUtils.getDateOr("date", jsonObject);
         }
         catch (Exception exception3) {
             PendingInvite.LOGGER.error("Could not parse PendingInvite: " + exception3.getMessage());
         }
-        return pendingInvite2;
+        return dij2;
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/dto/PendingInvitesList.java b/src/com/mojang/realmsclient/dto/PendingInvitesList.java
index b7bcc73..3b25bb6 100644
--- a/src/com/mojang/realmsclient/dto/PendingInvitesList.java
+++ b/src/com/mojang/realmsclient/dto/PendingInvitesList.java
@@ -18,21 +18,21 @@ public class PendingInvitesList extends ValueObject {
     }
     
     public static PendingInvitesList parse(final String string) {
-        final PendingInvitesList pendingInvitesList2 = new PendingInvitesList();
+        final PendingInvitesList dik2 = new PendingInvitesList();
         try {
             final JsonParser jsonParser3 = new JsonParser();
             final JsonObject jsonObject4 = jsonParser3.parse(string).getAsJsonObject();
             if (jsonObject4.get("invites").isJsonArray()) {
                 final Iterator<JsonElement> iterator5 = jsonObject4.get("invites").getAsJsonArray().iterator();
                 while (iterator5.hasNext()) {
-                    pendingInvitesList2.pendingInvites.add(PendingInvite.parse(iterator5.next().getAsJsonObject()));
+                    dik2.pendingInvites.add(PendingInvite.parse(iterator5.next().getAsJsonObject()));
                 }
             }
         }
         catch (Exception exception3) {
             PendingInvitesList.LOGGER.error("Could not parse PendingInvitesList: " + exception3.getMessage());
         }
-        return pendingInvitesList2;
+        return dik2;
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/dto/PingResult.java b/src/com/mojang/realmsclient/dto/PingResult.java
index 9fa801c..3383bd7 100644
--- a/src/com/mojang/realmsclient/dto/PingResult.java
+++ b/src/com/mojang/realmsclient/dto/PingResult.java
@@ -1,10 +1,13 @@
 package com.mojang.realmsclient.dto;
 
 import com.google.common.collect.Lists;
+import com.google.gson.annotations.SerializedName;
 import java.util.List;
 
-public class PingResult extends ValueObject {
+public class PingResult extends ValueObject implements ReflectionBasedSerialization {
+    @SerializedName("pingResults")
     public List<RegionPingResult> pingResults;
+    @SerializedName("worldIds")
     public List<Long> worldIds;
     
     public PingResult() {
diff --git a/src/com/mojang/realmsclient/dto/PlayerInfo.java b/src/com/mojang/realmsclient/dto/PlayerInfo.java
index b43749c..8ebb421 100644
--- a/src/com/mojang/realmsclient/dto/PlayerInfo.java
+++ b/src/com/mojang/realmsclient/dto/PlayerInfo.java
@@ -1,10 +1,17 @@
 package com.mojang.realmsclient.dto;
 
-public class PlayerInfo extends ValueObject {
+import com.google.gson.annotations.SerializedName;
+
+public class PlayerInfo extends ValueObject implements ReflectionBasedSerialization {
+    @SerializedName("name")
     private String name;
+    @SerializedName("uuid")
     private String uuid;
+    @SerializedName("operator")
     private boolean operator;
+    @SerializedName("accepted")
     private boolean accepted;
+    @SerializedName("online")
     private boolean online;
     
     public String getName() {
diff --git a/src/com/mojang/realmsclient/dto/RealmsDescriptionDto.java b/src/com/mojang/realmsclient/dto/RealmsDescriptionDto.java
index 219309f..cfa8fc9 100644
--- a/src/com/mojang/realmsclient/dto/RealmsDescriptionDto.java
+++ b/src/com/mojang/realmsclient/dto/RealmsDescriptionDto.java
@@ -1,7 +1,11 @@
 package com.mojang.realmsclient.dto;
 
-public class RealmsDescriptionDto extends ValueObject {
+import com.google.gson.annotations.SerializedName;
+
+public class RealmsDescriptionDto extends ValueObject implements ReflectionBasedSerialization {
+    @SerializedName("name")
     public String name;
+    @SerializedName("description")
     public String description;
     
     public RealmsDescriptionDto(final String string1, final String string2) {
diff --git a/src/com/mojang/realmsclient/dto/RealmsNews.java b/src/com/mojang/realmsclient/dto/RealmsNews.java
index 71c7d24..e26a3be 100644
--- a/src/com/mojang/realmsclient/dto/RealmsNews.java
+++ b/src/com/mojang/realmsclient/dto/RealmsNews.java
@@ -11,16 +11,16 @@ public class RealmsNews extends ValueObject {
     public String newsLink;
     
     public static RealmsNews parse(final String string) {
-        final RealmsNews realmsNews2 = new RealmsNews();
+        final RealmsNews dio2 = new RealmsNews();
         try {
             final JsonParser jsonParser3 = new JsonParser();
             final JsonObject jsonObject4 = jsonParser3.parse(string).getAsJsonObject();
-            realmsNews2.newsLink = JsonUtils.getStringOr("newsLink", jsonObject4, null);
+            dio2.newsLink = JsonUtils.getStringOr("newsLink", jsonObject4, null);
         }
         catch (Exception exception3) {
             RealmsNews.LOGGER.error("Could not parse RealmsNews: " + exception3.getMessage());
         }
-        return realmsNews2;
+        return dio2;
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/dto/RealmsServer.java b/src/com/mojang/realmsclient/dto/RealmsServer.java
index feb3613..65fa50b 100644
--- a/src/com/mojang/realmsclient/dto/RealmsServer.java
+++ b/src/com/mojang/realmsclient/dto/RealmsServer.java
@@ -3,19 +3,20 @@ package com.mojang.realmsclient.dto;
 import java.util.Comparator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
+import java.util.Objects;
 import com.google.gson.JsonParser;
 import com.google.common.collect.Maps;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonArray;
 import java.util.Locale;
 import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.Lists;
 import com.mojang.realmsclient.util.JsonUtils;
 import com.google.gson.JsonObject;
 import java.util.Iterator;
+import com.google.common.base.Joiner;
 import com.mojang.realmsclient.util.RealmsUtil;
-import net.minecraft.realms.Realms;
+import net.minecraft.client.Minecraft;
+import com.google.common.collect.Lists;
 import java.util.Map;
 import java.util.List;
 import org.apache.logging.log4j.Logger;
@@ -65,11 +66,11 @@ public class RealmsServer extends ValueObject {
         this.motd = string;
     }
     
-    public void updateServerPing(final RealmsServerPlayerList realmsServerPlayerList) {
-        final StringBuilder stringBuilder3 = new StringBuilder();
+    public void updateServerPing(final RealmsServerPlayerList dit) {
+        final List<String> list3 = Lists.newArrayList();
         int integer4 = 0;
-        for (final String string6 : realmsServerPlayerList.players) {
-            if (string6.equals(Realms.getUUID())) {
+        for (final String string6 : dit.players) {
+            if (string6.equals(Minecraft.getInstance().getUser().getUuid())) {
                 continue;
             }
             String string7 = "";
@@ -80,56 +81,53 @@ public class RealmsServer extends ValueObject {
                 RealmsServer.LOGGER.error("Could not get name for " + string6, (Throwable)exception8);
                 continue;
             }
-            if (stringBuilder3.length() > 0) {
-                stringBuilder3.append("\n");
-            }
-            stringBuilder3.append(string7);
+            list3.add(string7);
             ++integer4;
         }
         this.serverPing.nrOfPlayers = String.valueOf(integer4);
-        this.serverPing.playerList = stringBuilder3.toString();
+        this.serverPing.playerList = Joiner.on('\n').join(list3);
     }
     
     public static RealmsServer parse(final JsonObject jsonObject) {
-        final RealmsServer realmsServer2 = new RealmsServer();
+        final RealmsServer dip2 = new RealmsServer();
         try {
-            realmsServer2.id = JsonUtils.getLongOr("id", jsonObject, -1L);
-            realmsServer2.remoteSubscriptionId = JsonUtils.getStringOr("remoteSubscriptionId", jsonObject, null);
-            realmsServer2.name = JsonUtils.getStringOr("name", jsonObject, null);
-            realmsServer2.motd = JsonUtils.getStringOr("motd", jsonObject, null);
-            realmsServer2.state = getState(JsonUtils.getStringOr("state", jsonObject, State.CLOSED.name()));
-            realmsServer2.owner = JsonUtils.getStringOr("owner", jsonObject, null);
+            dip2.id = JsonUtils.getLongOr("id", jsonObject, -1L);
+            dip2.remoteSubscriptionId = JsonUtils.getStringOr("remoteSubscriptionId", jsonObject, null);
+            dip2.name = JsonUtils.getStringOr("name", jsonObject, null);
+            dip2.motd = JsonUtils.getStringOr("motd", jsonObject, null);
+            dip2.state = getState(JsonUtils.getStringOr("state", jsonObject, State.CLOSED.name()));
+            dip2.owner = JsonUtils.getStringOr("owner", jsonObject, null);
             if (jsonObject.get("players") != null && jsonObject.get("players").isJsonArray()) {
-                realmsServer2.players = parseInvited(jsonObject.get("players").getAsJsonArray());
-                sortInvited(realmsServer2);
+                dip2.players = parseInvited(jsonObject.get("players").getAsJsonArray());
+                sortInvited(dip2);
             }
             else {
-                realmsServer2.players = Lists.newArrayList();
+                dip2.players = Lists.newArrayList();
             }
-            realmsServer2.daysLeft = JsonUtils.getIntOr("daysLeft", jsonObject, 0);
-            realmsServer2.expired = JsonUtils.getBooleanOr("expired", jsonObject, false);
-            realmsServer2.expiredTrial = JsonUtils.getBooleanOr("expiredTrial", jsonObject, false);
-            realmsServer2.worldType = getWorldType(JsonUtils.getStringOr("worldType", jsonObject, WorldType.NORMAL.name()));
-            realmsServer2.ownerUUID = JsonUtils.getStringOr("ownerUUID", jsonObject, "");
+            dip2.daysLeft = JsonUtils.getIntOr("daysLeft", jsonObject, 0);
+            dip2.expired = JsonUtils.getBooleanOr("expired", jsonObject, false);
+            dip2.expiredTrial = JsonUtils.getBooleanOr("expiredTrial", jsonObject, false);
+            dip2.worldType = getWorldType(JsonUtils.getStringOr("worldType", jsonObject, WorldType.NORMAL.name()));
+            dip2.ownerUUID = JsonUtils.getStringOr("ownerUUID", jsonObject, "");
             if (jsonObject.get("slots") != null && jsonObject.get("slots").isJsonArray()) {
-                realmsServer2.slots = parseSlots(jsonObject.get("slots").getAsJsonArray());
+                dip2.slots = parseSlots(jsonObject.get("slots").getAsJsonArray());
             }
             else {
-                realmsServer2.slots = getEmptySlots();
+                dip2.slots = createEmptySlots();
             }
-            realmsServer2.minigameName = JsonUtils.getStringOr("minigameName", jsonObject, null);
-            realmsServer2.activeSlot = JsonUtils.getIntOr("activeSlot", jsonObject, -1);
-            realmsServer2.minigameId = JsonUtils.getIntOr("minigameId", jsonObject, -1);
-            realmsServer2.minigameImage = JsonUtils.getStringOr("minigameImage", jsonObject, null);
+            dip2.minigameName = JsonUtils.getStringOr("minigameName", jsonObject, null);
+            dip2.activeSlot = JsonUtils.getIntOr("activeSlot", jsonObject, -1);
+            dip2.minigameId = JsonUtils.getIntOr("minigameId", jsonObject, -1);
+            dip2.minigameImage = JsonUtils.getStringOr("minigameImage", jsonObject, null);
         }
         catch (Exception exception3) {
             RealmsServer.LOGGER.error("Could not parse McoServer: " + exception3.getMessage());
         }
-        return realmsServer2;
+        return dip2;
     }
     
-    private static void sortInvited(final RealmsServer realmsServer) {
-        realmsServer.players.sort((playerInfo1, playerInfo2) -> ComparisonChain.start().compareFalseFirst(playerInfo2.getAccepted(), playerInfo1.getAccepted()).compare(playerInfo1.getName().toLowerCase(Locale.ROOT), playerInfo2.getName().toLowerCase(Locale.ROOT)).result());
+    private static void sortInvited(final RealmsServer dip) {
+        dip.players.sort((dim1, dim2) -> ComparisonChain.start().compareFalseFirst(dim2.getAccepted(), dim1.getAccepted()).compare(dim1.getName().toLowerCase(Locale.ROOT), dim2.getName().toLowerCase(Locale.ROOT)).result());
     }
     
     private static List<PlayerInfo> parseInvited(final JsonArray jsonArray) {
@@ -137,13 +135,13 @@ public class RealmsServer extends ValueObject {
         for (final JsonElement jsonElement4 : jsonArray) {
             try {
                 final JsonObject jsonObject5 = jsonElement4.getAsJsonObject();
-                final PlayerInfo playerInfo6 = new PlayerInfo();
-                playerInfo6.setName(JsonUtils.getStringOr("name", jsonObject5, null));
-                playerInfo6.setUuid(JsonUtils.getStringOr("uuid", jsonObject5, null));
-                playerInfo6.setOperator(JsonUtils.getBooleanOr("operator", jsonObject5, false));
-                playerInfo6.setAccepted(JsonUtils.getBooleanOr("accepted", jsonObject5, false));
-                playerInfo6.setOnline(JsonUtils.getBooleanOr("online", jsonObject5, false));
-                list2.add(playerInfo6);
+                final PlayerInfo dim6 = new PlayerInfo();
+                dim6.setName(JsonUtils.getStringOr("name", jsonObject5, null));
+                dim6.setUuid(JsonUtils.getStringOr("uuid", jsonObject5, null));
+                dim6.setOperator(JsonUtils.getBooleanOr("operator", jsonObject5, false));
+                dim6.setAccepted(JsonUtils.getBooleanOr("accepted", jsonObject5, false));
+                dim6.setOnline(JsonUtils.getBooleanOr("online", jsonObject5, false));
+                list2.add(dim6);
             }
             catch (Exception ex) {}
         }
@@ -157,45 +155,42 @@ public class RealmsServer extends ValueObject {
                 final JsonObject jsonObject6 = jsonElement4.getAsJsonObject();
                 final JsonParser jsonParser7 = new JsonParser();
                 final JsonElement jsonElement5 = jsonParser7.parse(jsonObject6.get("options").getAsString());
-                RealmsWorldOptions realmsWorldOptions5;
+                RealmsWorldOptions div5;
                 if (jsonElement5 == null) {
-                    realmsWorldOptions5 = RealmsWorldOptions.getDefaults();
+                    div5 = RealmsWorldOptions.createDefaults();
                 }
                 else {
-                    realmsWorldOptions5 = RealmsWorldOptions.parse(jsonElement5.getAsJsonObject());
+                    div5 = RealmsWorldOptions.parse(jsonElement5.getAsJsonObject());
                 }
                 final int integer9 = JsonUtils.getIntOr("slotId", jsonObject6, -1);
-                map2.put(integer9, realmsWorldOptions5);
+                map2.put(integer9, div5);
             }
             catch (Exception ex) {}
         }
         for (int integer10 = 1; integer10 <= 3; ++integer10) {
             if (!map2.containsKey(integer10)) {
-                map2.put(integer10, RealmsWorldOptions.getEmptyDefaults());
+                map2.put(integer10, RealmsWorldOptions.createEmptyDefaults());
             }
         }
         return map2;
     }
     
-    private static Map<Integer, RealmsWorldOptions> getEmptySlots() {
+    private static Map<Integer, RealmsWorldOptions> createEmptySlots() {
         final Map<Integer, RealmsWorldOptions> map1 = Maps.newHashMap();
-        map1.put(1, RealmsWorldOptions.getEmptyDefaults());
-        map1.put(2, RealmsWorldOptions.getEmptyDefaults());
-        map1.put(3, RealmsWorldOptions.getEmptyDefaults());
+        map1.put(1, RealmsWorldOptions.createEmptyDefaults());
+        map1.put(2, RealmsWorldOptions.createEmptyDefaults());
+        map1.put(3, RealmsWorldOptions.createEmptyDefaults());
         return map1;
     }
     
     public static RealmsServer parse(final String string) {
-        RealmsServer realmsServer2 = new RealmsServer();
         try {
-            final JsonParser jsonParser3 = new JsonParser();
-            final JsonObject jsonObject4 = jsonParser3.parse(string).getAsJsonObject();
-            realmsServer2 = parse(jsonObject4);
+            return parse(new JsonParser().parse(string).getAsJsonObject());
         }
-        catch (Exception exception3) {
-            RealmsServer.LOGGER.error("Could not parse McoServer: " + exception3.getMessage());
+        catch (Exception exception2) {
+            RealmsServer.LOGGER.error("Could not parse McoServer: " + exception2.getMessage());
+            return new RealmsServer();
         }
-        return realmsServer2;
     }
     
     private static State getState(final String string) {
@@ -218,7 +213,7 @@ public class RealmsServer extends ValueObject {
     
     @Override
     public int hashCode() {
-        return new HashCodeBuilder(17, 37).append(this.id).append(this.name).append(this.motd).append(this.state).append(this.owner).append(this.expired).toHashCode();
+        return Objects.hash(this.id, this.name, this.motd, this.state, this.owner, this.expired);
     }
     
     @Override
@@ -232,33 +227,33 @@ public class RealmsServer extends ValueObject {
         if (object.getClass() != this.getClass()) {
             return false;
         }
-        final RealmsServer realmsServer3 = (RealmsServer)object;
-        return new EqualsBuilder().append(this.id, realmsServer3.id).append(this.name, realmsServer3.name).append(this.motd, realmsServer3.motd).append(this.state, realmsServer3.state).append(this.owner, realmsServer3.owner).append(this.expired, realmsServer3.expired).append(this.worldType, this.worldType).isEquals();
+        final RealmsServer dip3 = (RealmsServer)object;
+        return new EqualsBuilder().append(this.id, dip3.id).append(this.name, dip3.name).append(this.motd, dip3.motd).append(this.state, dip3.state).append(this.owner, dip3.owner).append(this.expired, dip3.expired).append(this.worldType, this.worldType).isEquals();
     }
     
     public RealmsServer clone() {
-        final RealmsServer realmsServer2 = new RealmsServer();
-        realmsServer2.id = this.id;
-        realmsServer2.remoteSubscriptionId = this.remoteSubscriptionId;
-        realmsServer2.name = this.name;
-        realmsServer2.motd = this.motd;
-        realmsServer2.state = this.state;
-        realmsServer2.owner = this.owner;
-        realmsServer2.players = this.players;
-        realmsServer2.slots = this.cloneSlots(this.slots);
-        realmsServer2.expired = this.expired;
-        realmsServer2.expiredTrial = this.expiredTrial;
-        realmsServer2.daysLeft = this.daysLeft;
-        realmsServer2.serverPing = new RealmsServerPing();
-        realmsServer2.serverPing.nrOfPlayers = this.serverPing.nrOfPlayers;
-        realmsServer2.serverPing.playerList = this.serverPing.playerList;
-        realmsServer2.worldType = this.worldType;
-        realmsServer2.ownerUUID = this.ownerUUID;
-        realmsServer2.minigameName = this.minigameName;
-        realmsServer2.activeSlot = this.activeSlot;
-        realmsServer2.minigameId = this.minigameId;
-        realmsServer2.minigameImage = this.minigameImage;
-        return realmsServer2;
+        final RealmsServer dip2 = new RealmsServer();
+        dip2.id = this.id;
+        dip2.remoteSubscriptionId = this.remoteSubscriptionId;
+        dip2.name = this.name;
+        dip2.motd = this.motd;
+        dip2.state = this.state;
+        dip2.owner = this.owner;
+        dip2.players = this.players;
+        dip2.slots = this.cloneSlots(this.slots);
+        dip2.expired = this.expired;
+        dip2.expiredTrial = this.expiredTrial;
+        dip2.daysLeft = this.daysLeft;
+        dip2.serverPing = new RealmsServerPing();
+        dip2.serverPing.nrOfPlayers = this.serverPing.nrOfPlayers;
+        dip2.serverPing.playerList = this.serverPing.playerList;
+        dip2.worldType = this.worldType;
+        dip2.ownerUUID = this.ownerUUID;
+        dip2.minigameName = this.minigameName;
+        dip2.activeSlot = this.activeSlot;
+        dip2.minigameId = this.minigameId;
+        dip2.minigameImage = this.minigameImage;
+        return dip2;
     }
     
     public Map<Integer, RealmsWorldOptions> cloneSlots(final Map<Integer, RealmsWorldOptions> map) {
@@ -269,6 +264,10 @@ public class RealmsServer extends ValueObject {
         return map2;
     }
     
+    public String getWorldName(final int integer) {
+        return this.name + " (" + this.slots.get(integer).getSlotName(integer) + ")";
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
     }
@@ -281,8 +280,8 @@ public class RealmsServer extends ValueObject {
         }
         
         @Override
-        public int compare(final RealmsServer realmsServer1, final RealmsServer realmsServer2) {
-            return ComparisonChain.start().compareTrueFirst(realmsServer1.state.equals(State.UNINITIALIZED), realmsServer2.state.equals(State.UNINITIALIZED)).compareTrueFirst(realmsServer1.expiredTrial, realmsServer2.expiredTrial).compareTrueFirst(realmsServer1.owner.equals(this.refOwner), realmsServer2.owner.equals(this.refOwner)).compareFalseFirst(realmsServer1.expired, realmsServer2.expired).compareTrueFirst(realmsServer1.state.equals(State.OPEN), realmsServer2.state.equals(State.OPEN)).compare(realmsServer1.id, realmsServer2.id).result();
+        public int compare(final RealmsServer dip1, final RealmsServer dip2) {
+            return ComparisonChain.start().compareTrueFirst(dip1.state == State.UNINITIALIZED, dip2.state == State.UNINITIALIZED).compareTrueFirst(dip1.expiredTrial, dip2.expiredTrial).compareTrueFirst(dip1.owner.equals(this.refOwner), dip2.owner.equals(this.refOwner)).compareFalseFirst(dip1.expired, dip2.expired).compareTrueFirst(dip1.state == State.OPEN, dip2.state == State.OPEN).compare(dip1.id, dip2.id).result();
         }
     }
     
diff --git a/src/com/mojang/realmsclient/dto/RealmsServerAddress.java b/src/com/mojang/realmsclient/dto/RealmsServerAddress.java
index 2f64fbd..e79a5e9 100644
--- a/src/com/mojang/realmsclient/dto/RealmsServerAddress.java
+++ b/src/com/mojang/realmsclient/dto/RealmsServerAddress.java
@@ -14,17 +14,17 @@ public class RealmsServerAddress extends ValueObject {
     
     public static RealmsServerAddress parse(final String string) {
         final JsonParser jsonParser2 = new JsonParser();
-        final RealmsServerAddress realmsServerAddress3 = new RealmsServerAddress();
+        final RealmsServerAddress diq3 = new RealmsServerAddress();
         try {
             final JsonObject jsonObject4 = jsonParser2.parse(string).getAsJsonObject();
-            realmsServerAddress3.address = JsonUtils.getStringOr("address", jsonObject4, null);
-            realmsServerAddress3.resourcePackUrl = JsonUtils.getStringOr("resourcePackUrl", jsonObject4, null);
-            realmsServerAddress3.resourcePackHash = JsonUtils.getStringOr("resourcePackHash", jsonObject4, null);
+            diq3.address = JsonUtils.getStringOr("address", jsonObject4, null);
+            diq3.resourcePackUrl = JsonUtils.getStringOr("resourcePackUrl", jsonObject4, null);
+            diq3.resourcePackHash = JsonUtils.getStringOr("resourcePackHash", jsonObject4, null);
         }
         catch (Exception exception4) {
             RealmsServerAddress.LOGGER.error("Could not parse RealmsServerAddress: " + exception4.getMessage());
         }
-        return realmsServerAddress3;
+        return diq3;
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/dto/RealmsServerList.java b/src/com/mojang/realmsclient/dto/RealmsServerList.java
index 819aabd..0d87a76 100644
--- a/src/com/mojang/realmsclient/dto/RealmsServerList.java
+++ b/src/com/mojang/realmsclient/dto/RealmsServerList.java
@@ -15,8 +15,8 @@ public class RealmsServerList extends ValueObject {
     public List<RealmsServer> servers;
     
     public static RealmsServerList parse(final String string) {
-        final RealmsServerList realmsServerList2 = new RealmsServerList();
-        realmsServerList2.servers = Lists.newArrayList();
+        final RealmsServerList dir2 = new RealmsServerList();
+        dir2.servers = Lists.newArrayList();
         try {
             final JsonParser jsonParser3 = new JsonParser();
             final JsonObject jsonObject4 = jsonParser3.parse(string).getAsJsonObject();
@@ -24,14 +24,14 @@ public class RealmsServerList extends ValueObject {
                 final JsonArray jsonArray5 = jsonObject4.get("servers").getAsJsonArray();
                 final Iterator<JsonElement> iterator6 = jsonArray5.iterator();
                 while (iterator6.hasNext()) {
-                    realmsServerList2.servers.add(RealmsServer.parse(iterator6.next().getAsJsonObject()));
+                    dir2.servers.add(RealmsServer.parse(iterator6.next().getAsJsonObject()));
                 }
             }
         }
         catch (Exception exception3) {
             RealmsServerList.LOGGER.error("Could not parse McoServerList: " + exception3.getMessage());
         }
-        return realmsServerList2;
+        return dir2;
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/dto/RealmsServerPlayerList.java b/src/com/mojang/realmsclient/dto/RealmsServerPlayerList.java
index 33664ef..8b6cd87 100644
--- a/src/com/mojang/realmsclient/dto/RealmsServerPlayerList.java
+++ b/src/com/mojang/realmsclient/dto/RealmsServerPlayerList.java
@@ -13,32 +13,32 @@ import org.apache.logging.log4j.Logger;
 
 public class RealmsServerPlayerList extends ValueObject {
     private static final Logger LOGGER;
-    private static final JsonParser jsonParser;
+    private static final JsonParser JSON_PARSER;
     public long serverId;
     public List<String> players;
     
     public static RealmsServerPlayerList parse(final JsonObject jsonObject) {
-        final RealmsServerPlayerList realmsServerPlayerList2 = new RealmsServerPlayerList();
+        final RealmsServerPlayerList dit2 = new RealmsServerPlayerList();
         try {
-            realmsServerPlayerList2.serverId = JsonUtils.getLongOr("serverId", jsonObject, -1L);
+            dit2.serverId = JsonUtils.getLongOr("serverId", jsonObject, -1L);
             final String string3 = JsonUtils.getStringOr("playerList", jsonObject, null);
             if (string3 != null) {
-                final JsonElement jsonElement4 = RealmsServerPlayerList.jsonParser.parse(string3);
+                final JsonElement jsonElement4 = RealmsServerPlayerList.JSON_PARSER.parse(string3);
                 if (jsonElement4.isJsonArray()) {
-                    realmsServerPlayerList2.players = parsePlayers(jsonElement4.getAsJsonArray());
+                    dit2.players = parsePlayers(jsonElement4.getAsJsonArray());
                 }
                 else {
-                    realmsServerPlayerList2.players = Lists.newArrayList();
+                    dit2.players = Lists.newArrayList();
                 }
             }
             else {
-                realmsServerPlayerList2.players = Lists.newArrayList();
+                dit2.players = Lists.newArrayList();
             }
         }
         catch (Exception exception3) {
             RealmsServerPlayerList.LOGGER.error("Could not parse RealmsServerPlayerList: " + exception3.getMessage());
         }
-        return realmsServerPlayerList2;
+        return dit2;
     }
     
     private static List<String> parsePlayers(final JsonArray jsonArray) {
@@ -54,6 +54,6 @@ public class RealmsServerPlayerList extends ValueObject {
     
     static {
         LOGGER = LogManager.getLogger();
-        jsonParser = new JsonParser();
+        JSON_PARSER = new JsonParser();
     }
 }
diff --git a/src/com/mojang/realmsclient/dto/RealmsServerPlayerLists.java b/src/com/mojang/realmsclient/dto/RealmsServerPlayerLists.java
index c2ee240..f51cbf0 100644
--- a/src/com/mojang/realmsclient/dto/RealmsServerPlayerLists.java
+++ b/src/com/mojang/realmsclient/dto/RealmsServerPlayerLists.java
@@ -15,8 +15,8 @@ public class RealmsServerPlayerLists extends ValueObject {
     public List<RealmsServerPlayerList> servers;
     
     public static RealmsServerPlayerLists parse(final String string) {
-        final RealmsServerPlayerLists realmsServerPlayerLists2 = new RealmsServerPlayerLists();
-        realmsServerPlayerLists2.servers = Lists.newArrayList();
+        final RealmsServerPlayerLists diu2 = new RealmsServerPlayerLists();
+        diu2.servers = Lists.newArrayList();
         try {
             final JsonParser jsonParser3 = new JsonParser();
             final JsonObject jsonObject4 = jsonParser3.parse(string).getAsJsonObject();
@@ -24,14 +24,14 @@ public class RealmsServerPlayerLists extends ValueObject {
                 final JsonArray jsonArray5 = jsonObject4.get("lists").getAsJsonArray();
                 final Iterator<JsonElement> iterator6 = jsonArray5.iterator();
                 while (iterator6.hasNext()) {
-                    realmsServerPlayerLists2.servers.add(RealmsServerPlayerList.parse(iterator6.next().getAsJsonObject()));
+                    diu2.servers.add(RealmsServerPlayerList.parse(iterator6.next().getAsJsonObject()));
                 }
             }
         }
         catch (Exception exception3) {
             RealmsServerPlayerLists.LOGGER.error("Could not parse RealmsServerPlayerLists: " + exception3.getMessage());
         }
-        return realmsServerPlayerLists2;
+        return diu2;
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/dto/RealmsWorldOptions.java b/src/com/mojang/realmsclient/dto/RealmsWorldOptions.java
index f108aea..f37ac8e 100644
--- a/src/com/mojang/realmsclient/dto/RealmsWorldOptions.java
+++ b/src/com/mojang/realmsclient/dto/RealmsWorldOptions.java
@@ -1,6 +1,7 @@
 package com.mojang.realmsclient.dto;
 
-import net.minecraft.realms.RealmsScreen;
+import java.util.Objects;
+import net.minecraft.client.resources.language.I18n;
 import com.mojang.realmsclient.util.JsonUtils;
 import com.google.gson.JsonObject;
 
@@ -19,19 +20,7 @@ public class RealmsWorldOptions extends ValueObject {
     public String templateImage;
     public boolean adventureMap;
     public boolean empty;
-    private static final boolean forceGameModeDefault = false;
-    private static final boolean pvpDefault = true;
-    private static final boolean spawnAnimalsDefault = true;
-    private static final boolean spawnMonstersDefault = true;
-    private static final boolean spawnNPCsDefault = true;
-    private static final int spawnProtectionDefault = 0;
-    private static final boolean commandBlocksDefault = false;
-    private static final int difficultyDefault = 2;
-    private static final int gameModeDefault = 0;
-    private static final String slotNameDefault = "";
-    private static final long templateIdDefault = -1L;
-    private static final String templateImageDefault;
-    private static final boolean adventureMapDefault = false;
+    private static final String DEFAULT_TEMPLATE_IMAGE;
     
     public RealmsWorldOptions(final Boolean boolean1, final Boolean boolean2, final Boolean boolean3, final Boolean boolean4, final Integer integer5, final Boolean boolean6, final Integer integer7, final Integer integer8, final Boolean boolean9, final String string) {
         this.pvp = boolean1;
@@ -46,14 +35,14 @@ public class RealmsWorldOptions extends ValueObject {
         this.slotName = string;
     }
     
-    public static RealmsWorldOptions getDefaults() {
+    public static RealmsWorldOptions createDefaults() {
         return new RealmsWorldOptions(true, true, true, true, 0, false, 2, 0, false, "");
     }
     
-    public static RealmsWorldOptions getEmptyDefaults() {
-        final RealmsWorldOptions realmsWorldOptions1 = new RealmsWorldOptions(true, true, true, true, 0, false, 2, 0, false, "");
-        realmsWorldOptions1.setEmpty(true);
-        return realmsWorldOptions1;
+    public static RealmsWorldOptions createEmptyDefaults() {
+        final RealmsWorldOptions div1 = createDefaults();
+        div1.setEmpty(true);
+        return div1;
     }
     
     public void setEmpty(final boolean boolean1) {
@@ -61,11 +50,11 @@ public class RealmsWorldOptions extends ValueObject {
     }
     
     public static RealmsWorldOptions parse(final JsonObject jsonObject) {
-        final RealmsWorldOptions realmsWorldOptions2 = new RealmsWorldOptions(JsonUtils.getBooleanOr("pvp", jsonObject, true), JsonUtils.getBooleanOr("spawnAnimals", jsonObject, true), JsonUtils.getBooleanOr("spawnMonsters", jsonObject, true), JsonUtils.getBooleanOr("spawnNPCs", jsonObject, true), JsonUtils.getIntOr("spawnProtection", jsonObject, 0), JsonUtils.getBooleanOr("commandBlocks", jsonObject, false), JsonUtils.getIntOr("difficulty", jsonObject, 2), JsonUtils.getIntOr("gameMode", jsonObject, 0), JsonUtils.getBooleanOr("forceGameMode", jsonObject, false), JsonUtils.getStringOr("slotName", jsonObject, ""));
-        realmsWorldOptions2.templateId = JsonUtils.getLongOr("worldTemplateId", jsonObject, -1L);
-        realmsWorldOptions2.templateImage = JsonUtils.getStringOr("worldTemplateImage", jsonObject, RealmsWorldOptions.templateImageDefault);
-        realmsWorldOptions2.adventureMap = JsonUtils.getBooleanOr("adventureMap", jsonObject, false);
-        return realmsWorldOptions2;
+        final RealmsWorldOptions div2 = new RealmsWorldOptions(JsonUtils.getBooleanOr("pvp", jsonObject, true), JsonUtils.getBooleanOr("spawnAnimals", jsonObject, true), JsonUtils.getBooleanOr("spawnMonsters", jsonObject, true), JsonUtils.getBooleanOr("spawnNPCs", jsonObject, true), JsonUtils.getIntOr("spawnProtection", jsonObject, 0), JsonUtils.getBooleanOr("commandBlocks", jsonObject, false), JsonUtils.getIntOr("difficulty", jsonObject, 2), JsonUtils.getIntOr("gameMode", jsonObject, 0), JsonUtils.getBooleanOr("forceGameMode", jsonObject, false), JsonUtils.getStringOr("slotName", jsonObject, ""));
+        div2.templateId = JsonUtils.getLongOr("worldTemplateId", jsonObject, -1L);
+        div2.templateImage = JsonUtils.getStringOr("worldTemplateImage", jsonObject, RealmsWorldOptions.DEFAULT_TEMPLATE_IMAGE);
+        div2.adventureMap = JsonUtils.getBooleanOr("adventureMap", jsonObject, false);
+        return div2;
     }
     
     public String getSlotName(final int integer) {
@@ -73,13 +62,13 @@ public class RealmsWorldOptions extends ValueObject {
             return this.slotName;
         }
         if (this.empty) {
-            return RealmsScreen.getLocalizedString("mco.configure.world.slot.empty");
+            return I18n.get("mco.configure.world.slot.empty");
         }
         return this.getDefaultSlotName(integer);
     }
     
     public String getDefaultSlotName(final int integer) {
-        return RealmsScreen.getLocalizedString("mco.configure.world.slot", integer);
+        return I18n.get("mco.configure.world.slot", integer);
     }
     
     public String toJson() {
@@ -111,7 +100,7 @@ public class RealmsWorldOptions extends ValueObject {
         if (this.forceGameMode) {
             jsonObject2.addProperty("forceGameMode", this.forceGameMode);
         }
-        if (this.slotName != null && !this.slotName.equals("")) {
+        if (!Objects.equals(this.slotName, "")) {
             jsonObject2.addProperty("slotName", this.slotName);
         }
         return jsonObject2.toString();
@@ -122,6 +111,6 @@ public class RealmsWorldOptions extends ValueObject {
     }
     
     static {
-        templateImageDefault = null;
+        DEFAULT_TEMPLATE_IMAGE = null;
     }
 }
diff --git a/src/com/mojang/realmsclient/dto/RealmsWorldResetDto.java b/src/com/mojang/realmsclient/dto/RealmsWorldResetDto.java
index 0cf9797..80213c3 100644
--- a/src/com/mojang/realmsclient/dto/RealmsWorldResetDto.java
+++ b/src/com/mojang/realmsclient/dto/RealmsWorldResetDto.java
@@ -1,9 +1,15 @@
 package com.mojang.realmsclient.dto;
 
-public class RealmsWorldResetDto extends ValueObject {
+import com.google.gson.annotations.SerializedName;
+
+public class RealmsWorldResetDto extends ValueObject implements ReflectionBasedSerialization {
+    @SerializedName("seed")
     private final String seed;
+    @SerializedName("worldTemplateId")
     private final long worldTemplateId;
+    @SerializedName("levelType")
     private final int levelType;
+    @SerializedName("generateStructures")
     private final boolean generateStructures;
     
     public RealmsWorldResetDto(final String string, final long long2, final int integer, final boolean boolean4) {
diff --git a/src/com/mojang/realmsclient/dto/ReflectionBasedSerialization.java b/src/com/mojang/realmsclient/dto/ReflectionBasedSerialization.java
new file mode 100644
index 0000000..22ffdba
--- /dev/null
+++ b/src/com/mojang/realmsclient/dto/ReflectionBasedSerialization.java
@@ -0,0 +1,4 @@
+package com.mojang.realmsclient.dto;
+
+public interface ReflectionBasedSerialization {
+}
diff --git a/src/com/mojang/realmsclient/dto/RegionPingResult.java b/src/com/mojang/realmsclient/dto/RegionPingResult.java
index b08aa02..132b627 100644
--- a/src/com/mojang/realmsclient/dto/RegionPingResult.java
+++ b/src/com/mojang/realmsclient/dto/RegionPingResult.java
@@ -1,9 +1,12 @@
 package com.mojang.realmsclient.dto;
 
 import java.util.Locale;
+import com.google.gson.annotations.SerializedName;
 
-public class RegionPingResult extends ValueObject {
+public class RegionPingResult extends ValueObject implements ReflectionBasedSerialization {
+    @SerializedName("regionName")
     private final String regionName;
+    @SerializedName("ping")
     private final int ping;
     
     public RegionPingResult(final String string, final int integer) {
diff --git a/src/com/mojang/realmsclient/dto/ServerActivity.java b/src/com/mojang/realmsclient/dto/ServerActivity.java
deleted file mode 100644
index 4341cf5..0000000
--- a/src/com/mojang/realmsclient/dto/ServerActivity.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mojang.realmsclient.dto;
-
-import com.mojang.realmsclient.util.JsonUtils;
-import com.google.gson.JsonObject;
-
-public class ServerActivity extends ValueObject {
-    public String profileUuid;
-    public long joinTime;
-    public long leaveTime;
-    
-    public static ServerActivity parse(final JsonObject jsonObject) {
-        final ServerActivity serverActivity2 = new ServerActivity();
-        try {
-            serverActivity2.profileUuid = JsonUtils.getStringOr("profileUuid", jsonObject, null);
-            serverActivity2.joinTime = JsonUtils.getLongOr("joinTime", jsonObject, Long.MIN_VALUE);
-            serverActivity2.leaveTime = JsonUtils.getLongOr("leaveTime", jsonObject, Long.MIN_VALUE);
-        }
-        catch (Exception ex) {}
-        return serverActivity2;
-    }
-}
diff --git a/src/com/mojang/realmsclient/dto/ServerActivityList.java b/src/com/mojang/realmsclient/dto/ServerActivityList.java
deleted file mode 100644
index 0ee4d98..0000000
--- a/src/com/mojang/realmsclient/dto/ServerActivityList.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mojang.realmsclient.dto;
-
-import java.util.Iterator;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
-import com.mojang.realmsclient.util.JsonUtils;
-import com.google.gson.JsonParser;
-import com.google.common.collect.Lists;
-import java.util.List;
-
-public class ServerActivityList extends ValueObject {
-    public long periodInMillis;
-    public List<ServerActivity> serverActivities;
-    
-    public ServerActivityList() {
-        this.serverActivities = Lists.newArrayList();
-    }
-    
-    public static ServerActivityList parse(final String string) {
-        final ServerActivityList serverActivityList2 = new ServerActivityList();
-        final JsonParser jsonParser3 = new JsonParser();
-        try {
-            final JsonElement jsonElement4 = jsonParser3.parse(string);
-            final JsonObject jsonObject5 = jsonElement4.getAsJsonObject();
-            serverActivityList2.periodInMillis = JsonUtils.getLongOr("periodInMillis", jsonObject5, -1L);
-            final JsonElement jsonElement5 = jsonObject5.get("playerActivityDto");
-            if (jsonElement5 != null && jsonElement5.isJsonArray()) {
-                final JsonArray jsonArray7 = jsonElement5.getAsJsonArray();
-                for (final JsonElement jsonElement6 : jsonArray7) {
-                    final ServerActivity serverActivity10 = ServerActivity.parse(jsonElement6.getAsJsonObject());
-                    serverActivityList2.serverActivities.add(serverActivity10);
-                }
-            }
-        }
-        catch (Exception ex) {}
-        return serverActivityList2;
-    }
-}
diff --git a/src/com/mojang/realmsclient/dto/Subscription.java b/src/com/mojang/realmsclient/dto/Subscription.java
index ebfabbe..f3022a4 100644
--- a/src/com/mojang/realmsclient/dto/Subscription.java
+++ b/src/com/mojang/realmsclient/dto/Subscription.java
@@ -17,18 +17,18 @@ public class Subscription extends ValueObject {
     }
     
     public static Subscription parse(final String string) {
-        final Subscription subscription2 = new Subscription();
+        final Subscription diz2 = new Subscription();
         try {
             final JsonParser jsonParser3 = new JsonParser();
             final JsonObject jsonObject4 = jsonParser3.parse(string).getAsJsonObject();
-            subscription2.startDate = JsonUtils.getLongOr("startDate", jsonObject4, 0L);
-            subscription2.daysLeft = JsonUtils.getIntOr("daysLeft", jsonObject4, 0);
-            subscription2.type = typeFrom(JsonUtils.getStringOr("subscriptionType", jsonObject4, SubscriptionType.NORMAL.name()));
+            diz2.startDate = JsonUtils.getLongOr("startDate", jsonObject4, 0L);
+            diz2.daysLeft = JsonUtils.getIntOr("daysLeft", jsonObject4, 0);
+            diz2.type = typeFrom(JsonUtils.getStringOr("subscriptionType", jsonObject4, SubscriptionType.NORMAL.name()));
         }
         catch (Exception exception3) {
             Subscription.LOGGER.error("Could not parse Subscription: " + exception3.getMessage());
         }
-        return subscription2;
+        return diz2;
     }
     
     private static SubscriptionType typeFrom(final String string) {
diff --git a/src/com/mojang/realmsclient/dto/UploadInfo.java b/src/com/mojang/realmsclient/dto/UploadInfo.java
index 30fd506..50b7478 100644
--- a/src/com/mojang/realmsclient/dto/UploadInfo.java
+++ b/src/com/mojang/realmsclient/dto/UploadInfo.java
@@ -4,16 +4,12 @@ import org.apache.logging.log4j.LogManager;
 import com.google.gson.JsonObject;
 import com.mojang.realmsclient.util.JsonUtils;
 import com.google.gson.JsonParser;
-import com.google.gson.annotations.Expose;
 import org.apache.logging.log4j.Logger;
 
 public class UploadInfo extends ValueObject {
     private static final Logger LOGGER;
-    @Expose
     private boolean worldClosed;
-    @Expose
     private String token;
-    @Expose
     private String uploadEndpoint;
     private int port;
     
@@ -23,19 +19,19 @@ public class UploadInfo extends ValueObject {
     }
     
     public static UploadInfo parse(final String string) {
-        final UploadInfo uploadInfo2 = new UploadInfo();
+        final UploadInfo dja2 = new UploadInfo();
         try {
             final JsonParser jsonParser3 = new JsonParser();
             final JsonObject jsonObject4 = jsonParser3.parse(string).getAsJsonObject();
-            uploadInfo2.worldClosed = JsonUtils.getBooleanOr("worldClosed", jsonObject4, false);
-            uploadInfo2.token = JsonUtils.getStringOr("token", jsonObject4, null);
-            uploadInfo2.uploadEndpoint = JsonUtils.getStringOr("uploadEndpoint", jsonObject4, null);
-            uploadInfo2.port = JsonUtils.getIntOr("port", jsonObject4, 8080);
+            dja2.worldClosed = JsonUtils.getBooleanOr("worldClosed", jsonObject4, false);
+            dja2.token = JsonUtils.getStringOr("token", jsonObject4, null);
+            dja2.uploadEndpoint = JsonUtils.getStringOr("uploadEndpoint", jsonObject4, null);
+            dja2.port = JsonUtils.getIntOr("port", jsonObject4, 8080);
         }
         catch (Exception exception3) {
             UploadInfo.LOGGER.error("Could not parse UploadInfo: " + exception3.getMessage());
         }
-        return uploadInfo2;
+        return dja2;
     }
     
     public String getToken() {
diff --git a/src/com/mojang/realmsclient/dto/ValueObject.java b/src/com/mojang/realmsclient/dto/ValueObject.java
index f1062d4..84ac20d 100644
--- a/src/com/mojang/realmsclient/dto/ValueObject.java
+++ b/src/com/mojang/realmsclient/dto/ValueObject.java
@@ -1,6 +1,7 @@
 package com.mojang.realmsclient.dto;
 
 import java.lang.reflect.Modifier;
+import com.google.gson.annotations.SerializedName;
 import java.lang.reflect.Field;
 
 public abstract class ValueObject {
@@ -10,9 +11,9 @@ public abstract class ValueObject {
         for (final Field field6 : this.getClass().getFields()) {
             if (!isStatic(field6)) {
                 try {
-                    stringBuilder2.append(field6.getName()).append("=").append(field6.get(this)).append(" ");
+                    stringBuilder2.append(getName(field6)).append("=").append(field6.get(this)).append(" ");
                 }
-                catch (IllegalAccessException illegalAccessException7) {}
+                catch (IllegalAccessException ex) {}
             }
         }
         stringBuilder2.deleteCharAt(stringBuilder2.length() - 1);
@@ -20,6 +21,11 @@ public abstract class ValueObject {
         return stringBuilder2.toString();
     }
     
+    private static String getName(final Field field) {
+        final SerializedName serializedName2 = field.<SerializedName>getAnnotation(SerializedName.class);
+        return (serializedName2 != null) ? serializedName2.value() : field.getName();
+    }
+    
     private static boolean isStatic(final Field field) {
         return Modifier.isStatic(field.getModifiers());
     }
diff --git a/src/com/mojang/realmsclient/dto/WorldDownload.java b/src/com/mojang/realmsclient/dto/WorldDownload.java
index 46c1562..68e3f88 100644
--- a/src/com/mojang/realmsclient/dto/WorldDownload.java
+++ b/src/com/mojang/realmsclient/dto/WorldDownload.java
@@ -15,16 +15,16 @@ public class WorldDownload extends ValueObject {
     public static WorldDownload parse(final String string) {
         final JsonParser jsonParser2 = new JsonParser();
         final JsonObject jsonObject3 = jsonParser2.parse(string).getAsJsonObject();
-        final WorldDownload worldDownload4 = new WorldDownload();
+        final WorldDownload djc4 = new WorldDownload();
         try {
-            worldDownload4.downloadLink = JsonUtils.getStringOr("downloadLink", jsonObject3, "");
-            worldDownload4.resourcePackUrl = JsonUtils.getStringOr("resourcePackUrl", jsonObject3, "");
-            worldDownload4.resourcePackHash = JsonUtils.getStringOr("resourcePackHash", jsonObject3, "");
+            djc4.downloadLink = JsonUtils.getStringOr("downloadLink", jsonObject3, "");
+            djc4.resourcePackUrl = JsonUtils.getStringOr("resourcePackUrl", jsonObject3, "");
+            djc4.resourcePackHash = JsonUtils.getStringOr("resourcePackHash", jsonObject3, "");
         }
         catch (Exception exception5) {
             WorldDownload.LOGGER.error("Could not parse WorldDownload: " + exception5.getMessage());
         }
-        return worldDownload4;
+        return djc4;
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/dto/WorldTemplate.java b/src/com/mojang/realmsclient/dto/WorldTemplate.java
index ad8ba1f..8deee23 100644
--- a/src/com/mojang/realmsclient/dto/WorldTemplate.java
+++ b/src/com/mojang/realmsclient/dto/WorldTemplate.java
@@ -3,6 +3,7 @@ package com.mojang.realmsclient.dto;
 import org.apache.logging.log4j.LogManager;
 import com.mojang.realmsclient.util.JsonUtils;
 import com.google.gson.JsonObject;
+import javax.annotation.Nullable;
 import org.apache.logging.log4j.Logger;
 
 public class WorldTemplate extends ValueObject {
@@ -12,28 +13,40 @@ public class WorldTemplate extends ValueObject {
     public String version;
     public String author;
     public String link;
+    @Nullable
     public String image;
     public String trailer;
     public String recommendedPlayers;
     public WorldTemplateType type;
     
+    public WorldTemplate() {
+        this.id = "";
+        this.name = "";
+        this.version = "";
+        this.author = "";
+        this.link = "";
+        this.trailer = "";
+        this.recommendedPlayers = "";
+        this.type = WorldTemplateType.WORLD_TEMPLATE;
+    }
+    
     public static WorldTemplate parse(final JsonObject jsonObject) {
-        final WorldTemplate worldTemplate2 = new WorldTemplate();
+        final WorldTemplate djd2 = new WorldTemplate();
         try {
-            worldTemplate2.id = JsonUtils.getStringOr("id", jsonObject, "");
-            worldTemplate2.name = JsonUtils.getStringOr("name", jsonObject, "");
-            worldTemplate2.version = JsonUtils.getStringOr("version", jsonObject, "");
-            worldTemplate2.author = JsonUtils.getStringOr("author", jsonObject, "");
-            worldTemplate2.link = JsonUtils.getStringOr("link", jsonObject, "");
-            worldTemplate2.image = JsonUtils.getStringOr("image", jsonObject, null);
-            worldTemplate2.trailer = JsonUtils.getStringOr("trailer", jsonObject, "");
-            worldTemplate2.recommendedPlayers = JsonUtils.getStringOr("recommendedPlayers", jsonObject, "");
-            worldTemplate2.type = WorldTemplateType.valueOf(JsonUtils.getStringOr("type", jsonObject, WorldTemplateType.WORLD_TEMPLATE.name()));
+            djd2.id = JsonUtils.getStringOr("id", jsonObject, "");
+            djd2.name = JsonUtils.getStringOr("name", jsonObject, "");
+            djd2.version = JsonUtils.getStringOr("version", jsonObject, "");
+            djd2.author = JsonUtils.getStringOr("author", jsonObject, "");
+            djd2.link = JsonUtils.getStringOr("link", jsonObject, "");
+            djd2.image = JsonUtils.getStringOr("image", jsonObject, null);
+            djd2.trailer = JsonUtils.getStringOr("trailer", jsonObject, "");
+            djd2.recommendedPlayers = JsonUtils.getStringOr("recommendedPlayers", jsonObject, "");
+            djd2.type = WorldTemplateType.valueOf(JsonUtils.getStringOr("type", jsonObject, WorldTemplateType.WORLD_TEMPLATE.name()));
         }
         catch (Exception exception3) {
             WorldTemplate.LOGGER.error("Could not parse WorldTemplate: " + exception3.getMessage());
         }
-        return worldTemplate2;
+        return djd2;
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/dto/WorldTemplatePaginatedList.java b/src/com/mojang/realmsclient/dto/WorldTemplatePaginatedList.java
index 8571e44..38819f3 100644
--- a/src/com/mojang/realmsclient/dto/WorldTemplatePaginatedList.java
+++ b/src/com/mojang/realmsclient/dto/WorldTemplatePaginatedList.java
@@ -28,30 +28,26 @@ public class WorldTemplatePaginatedList extends ValueObject {
         this.total = -1;
     }
     
-    public boolean isLastPage() {
-        return this.page * this.size >= this.total && this.page > 0 && this.total > 0 && this.size > 0;
-    }
-    
     public static WorldTemplatePaginatedList parse(final String string) {
-        final WorldTemplatePaginatedList worldTemplatePaginatedList2 = new WorldTemplatePaginatedList();
-        worldTemplatePaginatedList2.templates = Lists.newArrayList();
+        final WorldTemplatePaginatedList dje2 = new WorldTemplatePaginatedList();
+        dje2.templates = Lists.newArrayList();
         try {
             final JsonParser jsonParser3 = new JsonParser();
             final JsonObject jsonObject4 = jsonParser3.parse(string).getAsJsonObject();
             if (jsonObject4.get("templates").isJsonArray()) {
                 final Iterator<JsonElement> iterator5 = jsonObject4.get("templates").getAsJsonArray().iterator();
                 while (iterator5.hasNext()) {
-                    worldTemplatePaginatedList2.templates.add(WorldTemplate.parse(iterator5.next().getAsJsonObject()));
+                    dje2.templates.add(WorldTemplate.parse(iterator5.next().getAsJsonObject()));
                 }
             }
-            worldTemplatePaginatedList2.page = JsonUtils.getIntOr("page", jsonObject4, 0);
-            worldTemplatePaginatedList2.size = JsonUtils.getIntOr("size", jsonObject4, 0);
-            worldTemplatePaginatedList2.total = JsonUtils.getIntOr("total", jsonObject4, 0);
+            dje2.page = JsonUtils.getIntOr("page", jsonObject4, 0);
+            dje2.size = JsonUtils.getIntOr("size", jsonObject4, 0);
+            dje2.total = JsonUtils.getIntOr("total", jsonObject4, 0);
         }
         catch (Exception exception3) {
             WorldTemplatePaginatedList.LOGGER.error("Could not parse WorldTemplatePaginatedList: " + exception3.getMessage());
         }
-        return worldTemplatePaginatedList2;
+        return dje2;
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/exception/RealmsServiceException.java b/src/com/mojang/realmsclient/exception/RealmsServiceException.java
index 587b7e5..ff0ea73 100644
--- a/src/com/mojang/realmsclient/exception/RealmsServiceException.java
+++ b/src/com/mojang/realmsclient/exception/RealmsServiceException.java
@@ -1,6 +1,6 @@
 package com.mojang.realmsclient.exception;
 
-import net.minecraft.realms.RealmsScreen;
+import net.minecraft.client.resources.language.I18n;
 import com.mojang.realmsclient.client.RealmsError;
 
 public class RealmsServiceException extends Exception {
@@ -9,12 +9,12 @@ public class RealmsServiceException extends Exception {
     public final int errorCode;
     public final String errorMsg;
     
-    public RealmsServiceException(final int integer, final String string, final RealmsError cza) {
+    public RealmsServiceException(final int integer, final String string, final RealmsError dic) {
         super(string);
         this.httpResultCode = integer;
         this.httpResponseContent = string;
-        this.errorCode = cza.getErrorCode();
-        this.errorMsg = cza.getErrorMessage();
+        this.errorCode = dic.getErrorCode();
+        this.errorMsg = dic.getErrorMessage();
     }
     
     public RealmsServiceException(final int integer1, final String string2, final int integer3, final String string4) {
@@ -31,7 +31,7 @@ public class RealmsServiceException extends Exception {
             return "Realms (" + this.httpResultCode + ") " + this.httpResponseContent;
         }
         final String string2 = "mco.errorMessage." + this.errorCode;
-        final String string3 = RealmsScreen.getLocalizedString(string2);
+        final String string3 = I18n.get(string2);
         return (string3.equals(string2) ? this.errorMsg : string3) + " - " + this.errorCode;
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/ChatFormatting.java b/src/com/mojang/realmsclient/gui/ChatFormatting.java
deleted file mode 100644
index b2fa69e..0000000
--- a/src/com/mojang/realmsclient/gui/ChatFormatting.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.mojang.realmsclient.gui;
-
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.regex.Pattern;
-import java.util.Map;
-
-public enum ChatFormatting {
-    BLACK('0'), 
-    DARK_BLUE('1'), 
-    DARK_GREEN('2'), 
-    DARK_AQUA('3'), 
-    DARK_RED('4'), 
-    DARK_PURPLE('5'), 
-    GOLD('6'), 
-    GRAY('7'), 
-    DARK_GRAY('8'), 
-    BLUE('9'), 
-    GREEN('a'), 
-    AQUA('b'), 
-    RED('c'), 
-    LIGHT_PURPLE('d'), 
-    YELLOW('e'), 
-    WHITE('f'), 
-    OBFUSCATED('k', true), 
-    BOLD('l', true), 
-    STRIKETHROUGH('m', true), 
-    UNDERLINE('n', true), 
-    ITALIC('o', true), 
-    RESET('r');
-    
-    private static final Map<Character, ChatFormatting> FORMATTING_BY_CHAR;
-    private static final Map<String, ChatFormatting> FORMATTING_BY_NAME;
-    private static final Pattern STRIP_FORMATTING_PATTERN;
-    private final char code;
-    private final boolean isFormat;
-    private final String toString;
-    
-    private ChatFormatting(final char character) {
-        this(character, false);
-    }
-    
-    private ChatFormatting(final char character, final boolean boolean4) {
-        this.code = character;
-        this.isFormat = boolean4;
-        this.toString = "§" + character;
-    }
-    
-    public char getChar() {
-        return this.code;
-    }
-    
-    public String getName() {
-        return this.name().toLowerCase(Locale.ROOT);
-    }
-    
-    @Override
-    public String toString() {
-        return this.toString;
-    }
-    
-    static {
-        FORMATTING_BY_CHAR = Arrays.<ChatFormatting>stream(values()).collect(Collectors.toMap(ChatFormatting::getChar, czi -> czi));
-        FORMATTING_BY_NAME = Arrays.<ChatFormatting>stream(values()).collect(Collectors.toMap(ChatFormatting::getName, czi -> czi));
-        STRIP_FORMATTING_PATTERN = Pattern.compile("(?i)§[0-9A-FK-OR]");
-    }
-}
diff --git a/src/com/mojang/realmsclient/gui/ErrorCallback.java b/src/com/mojang/realmsclient/gui/ErrorCallback.java
new file mode 100644
index 0000000..9478c0d
--- /dev/null
+++ b/src/com/mojang/realmsclient/gui/ErrorCallback.java
@@ -0,0 +1,12 @@
+package com.mojang.realmsclient.gui;
+
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.Component;
+
+public interface ErrorCallback {
+    void error(final Component mr);
+    
+    default void error(final String string) {
+        this.error(new TextComponent(string));
+    }
+}
diff --git a/src/com/mojang/realmsclient/gui/LongRunningTask.java b/src/com/mojang/realmsclient/gui/LongRunningTask.java
deleted file mode 100644
index 318e5b1..0000000
--- a/src/com/mojang/realmsclient/gui/LongRunningTask.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mojang.realmsclient.gui;
-
-import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen;
-
-public abstract class LongRunningTask implements Runnable {
-    protected RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen;
-    
-    public void setScreen(final RealmsLongRunningMcoTaskScreen czz) {
-        this.longRunningMcoTaskScreen = czz;
-    }
-    
-    public void error(final String string) {
-        this.longRunningMcoTaskScreen.error(string);
-    }
-    
-    public void setTitle(final String string) {
-        this.longRunningMcoTaskScreen.setTitle(string);
-    }
-    
-    public boolean aborted() {
-        return this.longRunningMcoTaskScreen.aborted();
-    }
-    
-    public void tick() {
-    }
-    
-    public void init() {
-    }
-    
-    public void abortTask() {
-    }
-}
diff --git a/src/com/mojang/realmsclient/gui/RealmsConstants.java b/src/com/mojang/realmsclient/gui/RealmsConstants.java
deleted file mode 100644
index 8c424b6..0000000
--- a/src/com/mojang/realmsclient/gui/RealmsConstants.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mojang.realmsclient.gui;
-
-public class RealmsConstants {
-    public static int row(final int integer) {
-        return 40 + integer * 13;
-    }
-}
diff --git a/src/com/mojang/realmsclient/gui/RealmsDataFetcher.java b/src/com/mojang/realmsclient/gui/RealmsDataFetcher.java
index db0dae0..a7a253f 100644
--- a/src/com/mojang/realmsclient/gui/RealmsDataFetcher.java
+++ b/src/com/mojang/realmsclient/gui/RealmsDataFetcher.java
@@ -2,10 +2,10 @@ package com.mojang.realmsclient.gui;
 
 import com.mojang.realmsclient.dto.RealmsNews;
 import com.mojang.realmsclient.util.RealmsPersistence;
+import java.util.Comparator;
+import net.minecraft.client.Minecraft;
 import com.mojang.realmsclient.client.RealmsClient;
 import org.apache.logging.log4j.LogManager;
-import java.util.Comparator;
-import net.minecraft.realms.Realms;
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ConcurrentHashMap;
@@ -25,11 +25,11 @@ public class RealmsDataFetcher {
     private static final Logger LOGGER;
     private final ScheduledExecutorService scheduler;
     private volatile boolean stopped;
-    private final ServerListUpdateTask serverListUpdateTask;
-    private final PendingInviteUpdateTask pendingInviteUpdateTask;
-    private final TrialAvailabilityTask trialAvailabilityTask;
-    private final LiveStatsTask liveStatsTask;
-    private final UnreadNewsTask unreadNewsTask;
+    private final Runnable serverListUpdateTask;
+    private final Runnable pendingInviteUpdateTask;
+    private final Runnable trialAvailabilityTask;
+    private final Runnable liveStatsTask;
+    private final Runnable unreadNewsTask;
     private final Set<RealmsServer> removedServers;
     private List<RealmsServer> servers;
     private RealmsServerPlayerLists livestats;
@@ -69,35 +69,16 @@ public class RealmsDataFetcher {
         }
     }
     
-    public synchronized void initWithSpecificTaskList(final List<Task> list) {
+    public synchronized void initWithSpecificTaskList() {
         if (this.stopped) {
             this.stopped = false;
             this.cancelTasks();
-            for (final Task d4 : list) {
-                this.fetchStatus.put(d4, false);
-                switch (d4) {
-                    case SERVER_LIST: {
-                        this.serverListScheduledFuture = this.scheduler.scheduleAtFixedRate(this.serverListUpdateTask, 0L, 60L, TimeUnit.SECONDS);
-                        continue;
-                    }
-                    case PENDING_INVITE: {
-                        this.pendingInviteScheduledFuture = this.scheduler.scheduleAtFixedRate(this.pendingInviteUpdateTask, 0L, 10L, TimeUnit.SECONDS);
-                        continue;
-                    }
-                    case TRIAL_AVAILABLE: {
-                        this.trialAvailableScheduledFuture = this.scheduler.scheduleAtFixedRate(this.trialAvailabilityTask, 0L, 60L, TimeUnit.SECONDS);
-                        continue;
-                    }
-                    case LIVE_STATS: {
-                        this.liveStatsScheduledFuture = this.scheduler.scheduleAtFixedRate(this.liveStatsTask, 0L, 10L, TimeUnit.SECONDS);
-                        continue;
-                    }
-                    case UNREAD_NEWS: {
-                        this.unreadNewsScheduledFuture = this.scheduler.scheduleAtFixedRate(this.unreadNewsTask, 0L, 300L, TimeUnit.SECONDS);
-                        continue;
-                    }
-                }
-            }
+            this.fetchStatus.put(Task.PENDING_INVITE, false);
+            this.pendingInviteScheduledFuture = this.scheduler.scheduleAtFixedRate(this.pendingInviteUpdateTask, 0L, 10L, TimeUnit.SECONDS);
+            this.fetchStatus.put(Task.TRIAL_AVAILABLE, false);
+            this.trialAvailableScheduledFuture = this.scheduler.scheduleAtFixedRate(this.trialAvailabilityTask, 0L, 60L, TimeUnit.SECONDS);
+            this.fetchStatus.put(Task.UNREAD_NEWS, false);
+            this.unreadNewsScheduledFuture = this.scheduler.scheduleAtFixedRate(this.unreadNewsTask, 0L, 300L, TimeUnit.SECONDS);
         }
     }
     
@@ -182,8 +163,8 @@ public class RealmsDataFetcher {
     
     private synchronized void setServers(final List<RealmsServer> list) {
         int integer3 = 0;
-        for (final RealmsServer realmsServer5 : this.removedServers) {
-            if (list.remove(realmsServer5)) {
+        for (final RealmsServer dip5 : this.removedServers) {
+            if (list.remove(dip5)) {
                 ++integer3;
             }
         }
@@ -193,13 +174,9 @@ public class RealmsDataFetcher {
         this.servers = list;
     }
     
-    public synchronized void removeItem(final RealmsServer realmsServer) {
-        this.servers.remove(realmsServer);
-        this.removedServers.add(realmsServer);
-    }
-    
-    private void sort(final List<RealmsServer> list) {
-        list.sort(new RealmsServer.McoServerComparator(Realms.getName()));
+    public synchronized void removeItem(final RealmsServer dip) {
+        this.servers.remove(dip);
+        this.removedServers.add(dip);
     }
     
     private boolean isActive() {
@@ -223,17 +200,15 @@ public class RealmsDataFetcher {
         
         private void updateServersList() {
             try {
-                final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-                if (cyy2 != null) {
-                    final List<RealmsServer> list3 = cyy2.listWorlds().servers;
-                    if (list3 != null) {
-                        RealmsDataFetcher.this.sort(list3);
-                        RealmsDataFetcher.this.setServers(list3);
-                        RealmsDataFetcher.this.fetchStatus.put(Task.SERVER_LIST, true);
-                    }
-                    else {
-                        RealmsDataFetcher.LOGGER.warn("Realms server list was null or empty");
-                    }
+                final RealmsClient dia2 = RealmsClient.create();
+                final List<RealmsServer> list3 = dia2.listWorlds().servers;
+                if (list3 != null) {
+                    list3.sort(new RealmsServer.McoServerComparator(Minecraft.getInstance().getUser().getName()));
+                    RealmsDataFetcher.this.setServers(list3);
+                    RealmsDataFetcher.this.fetchStatus.put(Task.SERVER_LIST, true);
+                }
+                else {
+                    RealmsDataFetcher.LOGGER.warn("Realms server list was null or empty");
                 }
             }
             catch (Exception exception2) {
@@ -256,11 +231,9 @@ public class RealmsDataFetcher {
         
         private void updatePendingInvites() {
             try {
-                final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-                if (cyy2 != null) {
-                    RealmsDataFetcher.this.pendingInvitesCount = cyy2.pendingInvitesCount();
-                    RealmsDataFetcher.this.fetchStatus.put(Task.PENDING_INVITE, true);
-                }
+                final RealmsClient dia2 = RealmsClient.create();
+                RealmsDataFetcher.this.pendingInvitesCount = dia2.pendingInvitesCount();
+                RealmsDataFetcher.this.fetchStatus.put(Task.PENDING_INVITE, true);
             }
             catch (Exception exception2) {
                 RealmsDataFetcher.LOGGER.error("Couldn't get pending invite count", (Throwable)exception2);
@@ -281,11 +254,9 @@ public class RealmsDataFetcher {
         
         private void getTrialAvailable() {
             try {
-                final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-                if (cyy2 != null) {
-                    RealmsDataFetcher.this.trialAvailable = cyy2.trialAvailable();
-                    RealmsDataFetcher.this.fetchStatus.put(Task.TRIAL_AVAILABLE, true);
-                }
+                final RealmsClient dia2 = RealmsClient.create();
+                RealmsDataFetcher.this.trialAvailable = dia2.trialAvailable();
+                RealmsDataFetcher.this.fetchStatus.put(Task.TRIAL_AVAILABLE, true);
             }
             catch (Exception exception2) {
                 RealmsDataFetcher.LOGGER.error("Couldn't get trial availability", (Throwable)exception2);
@@ -306,11 +277,9 @@ public class RealmsDataFetcher {
         
         private void getLiveStats() {
             try {
-                final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-                if (cyy2 != null) {
-                    RealmsDataFetcher.this.livestats = cyy2.getLiveStats();
-                    RealmsDataFetcher.this.fetchStatus.put(Task.LIVE_STATS, true);
-                }
+                final RealmsClient dia2 = RealmsClient.create();
+                RealmsDataFetcher.this.livestats = dia2.getLiveStats();
+                RealmsDataFetcher.this.fetchStatus.put(Task.LIVE_STATS, true);
             }
             catch (Exception exception2) {
                 RealmsDataFetcher.LOGGER.error("Couldn't get live stats", (Throwable)exception2);
@@ -331,26 +300,24 @@ public class RealmsDataFetcher {
         
         private void getUnreadNews() {
             try {
-                final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-                if (cyy2 != null) {
-                    RealmsNews realmsNews3 = null;
-                    try {
-                        realmsNews3 = cyy2.getNews();
-                    }
-                    catch (Exception ex) {}
-                    final RealmsPersistence.RealmsPersistenceData a4 = RealmsPersistence.readFile();
-                    if (realmsNews3 != null) {
-                        final String string5 = realmsNews3.newsLink;
-                        if (string5 != null && !string5.equals(a4.newsLink)) {
-                            a4.hasUnreadNews = true;
-                            a4.newsLink = string5;
-                            RealmsPersistence.writeFile(a4);
-                        }
-                    }
-                    RealmsDataFetcher.this.hasUnreadNews = a4.hasUnreadNews;
-                    RealmsDataFetcher.this.newsLink = a4.newsLink;
-                    RealmsDataFetcher.this.fetchStatus.put(Task.UNREAD_NEWS, true);
+                final RealmsClient dia2 = RealmsClient.create();
+                RealmsNews dio3 = null;
+                try {
+                    dio3 = dia2.getNews();
                 }
+                catch (Exception ex) {}
+                final RealmsPersistence.RealmsPersistenceData a4 = RealmsPersistence.readFile();
+                if (dio3 != null) {
+                    final String string5 = dio3.newsLink;
+                    if (string5 != null && !string5.equals(a4.newsLink)) {
+                        a4.hasUnreadNews = true;
+                        a4.newsLink = string5;
+                        RealmsPersistence.writeFile(a4);
+                    }
+                }
+                RealmsDataFetcher.this.hasUnreadNews = a4.hasUnreadNews;
+                RealmsDataFetcher.this.newsLink = a4.newsLink;
+                RealmsDataFetcher.this.fetchStatus.put(Task.UNREAD_NEWS, true);
             }
             catch (Exception exception2) {
                 RealmsDataFetcher.LOGGER.error("Couldn't get unread news", (Throwable)exception2);
diff --git a/src/com/mojang/realmsclient/gui/RealmsWorldSlotButton.java b/src/com/mojang/realmsclient/gui/RealmsWorldSlotButton.java
index 69395b3..a5e3a83 100644
--- a/src/com/mojang/realmsclient/gui/RealmsWorldSlotButton.java
+++ b/src/com/mojang/realmsclient/gui/RealmsWorldSlotButton.java
@@ -1,48 +1,58 @@
 package com.mojang.realmsclient.gui;
 
-import net.minecraft.realms.RealmsScreen;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.realms.RealmsMth;
+import net.minecraft.util.Mth;
 import com.mojang.realmsclient.util.RealmsTextureManager;
-import net.minecraft.realms.RealmsButtonProxy;
-import net.minecraft.realms.Realms;
+import net.minecraft.client.Minecraft;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.datafixers.util.Pair;
 import com.mojang.realmsclient.dto.RealmsWorldOptions;
+import net.minecraft.network.chat.TextComponent;
 import javax.annotation.Nullable;
+import net.minecraft.network.chat.Component;
 import java.util.function.Consumer;
 import com.mojang.realmsclient.dto.RealmsServer;
 import java.util.function.Supplier;
-import net.minecraft.realms.RealmsButton;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.gui.components.TickableWidget;
+import net.minecraft.client.gui.components.Button;
 
-public class RealmsWorldSlotButton extends RealmsButton {
+public class RealmsWorldSlotButton extends Button implements TickableWidget {
+    public static final ResourceLocation SLOT_FRAME_LOCATION;
+    public static final ResourceLocation EMPTY_SLOT_LOCATION;
+    public static final ResourceLocation DEFAULT_WORLD_SLOT_1;
+    public static final ResourceLocation DEFAULT_WORLD_SLOT_2;
+    public static final ResourceLocation DEFAULT_WORLD_SLOT_3;
     private final Supplier<RealmsServer> serverDataProvider;
-    private final Consumer<String> toolTipSetter;
-    private final Listener listener;
+    private final Consumer<Component> toolTipSetter;
     private final int slotIndex;
     private int animTick;
     @Nullable
     private State state;
     
-    public RealmsWorldSlotButton(final int integer1, final int integer2, final int integer3, final int integer4, final Supplier<RealmsServer> supplier, final Consumer<String> consumer, final int integer7, final int integer8, final Listener b) {
-        super(integer7, integer1, integer2, integer3, integer4, "");
+    public RealmsWorldSlotButton(final int integer1, final int integer2, final int integer3, final int integer4, final Supplier<RealmsServer> supplier, final Consumer<Component> consumer, final int integer7, final OnPress a) {
+        super(integer1, integer2, integer3, integer4, TextComponent.EMPTY, a);
         this.serverDataProvider = supplier;
-        this.slotIndex = integer8;
+        this.slotIndex = integer7;
         this.toolTipSetter = consumer;
-        this.listener = b;
     }
     
-    @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        super.render(integer1, integer2, float3);
+    @Nullable
+    public State getState() {
+        return this.state;
     }
     
     @Override
     public void tick() {
         ++this.animTick;
-        final RealmsServer realmsServer2 = this.serverDataProvider.get();
-        if (realmsServer2 == null) {
+        final RealmsServer dip2 = this.serverDataProvider.get();
+        if (dip2 == null) {
             return;
         }
-        final RealmsWorldOptions realmsWorldOptions5 = realmsServer2.slots.get(this.slotIndex);
+        final RealmsWorldOptions div5 = dip2.slots.get(this.slotIndex);
         final boolean boolean10 = this.slotIndex == 4;
         boolean boolean11;
         String string4;
@@ -50,123 +60,131 @@ public class RealmsWorldSlotButton extends RealmsButton {
         String string5;
         boolean boolean12;
         if (boolean10) {
-            boolean11 = realmsServer2.worldType.equals(RealmsServer.WorldType.MINIGAME);
+            boolean11 = (dip2.worldType == RealmsServer.WorldType.MINIGAME);
             string4 = "Minigame";
-            long6 = realmsServer2.minigameId;
-            string5 = realmsServer2.minigameImage;
-            boolean12 = (realmsServer2.minigameId == -1);
+            long6 = dip2.minigameId;
+            string5 = dip2.minigameImage;
+            boolean12 = (dip2.minigameId == -1);
         }
         else {
-            boolean11 = (realmsServer2.activeSlot == this.slotIndex && !realmsServer2.worldType.equals(RealmsServer.WorldType.MINIGAME));
-            string4 = realmsWorldOptions5.getSlotName(this.slotIndex);
-            long6 = realmsWorldOptions5.templateId;
-            string5 = realmsWorldOptions5.templateImage;
-            boolean12 = realmsWorldOptions5.empty;
+            boolean11 = (dip2.activeSlot == this.slotIndex && dip2.worldType != RealmsServer.WorldType.MINIGAME);
+            string4 = div5.getSlotName(this.slotIndex);
+            long6 = div5.templateId;
+            string5 = div5.templateImage;
+            boolean12 = div5.empty;
         }
-        String string6 = null;
-        Action a11;
-        if (boolean11) {
-            final boolean boolean13 = realmsServer2.state == RealmsServer.State.OPEN || realmsServer2.state == RealmsServer.State.CLOSED;
-            if (realmsServer2.expired || !boolean13) {
-                a11 = Action.NOTHING;
-            }
-            else {
-                a11 = Action.JOIN;
-                string6 = Realms.getLocalizedString("mco.configure.world.slot.tooltip.active");
-            }
-        }
-        else if (boolean10) {
-            if (realmsServer2.expired) {
-                a11 = Action.NOTHING;
-            }
-            else {
-                a11 = Action.SWITCH_SLOT;
-                string6 = Realms.getLocalizedString("mco.configure.world.slot.tooltip.minigame");
+        final Action a11 = getAction(dip2, boolean11, boolean10);
+        final Pair<Component, Component> pair12 = this.getTooltipAndNarration(dip2, string4, boolean12, boolean10, a11);
+        this.state = new State(boolean11, string4, long6, string5, boolean12, boolean10, a11, (Component)pair12.getFirst());
+        this.setMessage((Component)pair12.getSecond());
+    }
+    
+    private static Action getAction(final RealmsServer dip, final boolean boolean2, final boolean boolean3) {
+        if (boolean2) {
+            if (!dip.expired && dip.state != RealmsServer.State.UNINITIALIZED) {
+                return Action.JOIN;
             }
         }
         else {
-            a11 = Action.SWITCH_SLOT;
-            string6 = Realms.getLocalizedString("mco.configure.world.slot.tooltip");
+            if (!boolean3) {
+                return Action.SWITCH_SLOT;
+            }
+            if (!dip.expired) {
+                return Action.SWITCH_SLOT;
+            }
         }
-        this.state = new State(boolean11, string4, long6, string5, boolean12, boolean10, a11, string6);
-        String string7;
-        if (a11 == Action.NOTHING) {
-            string7 = string4;
+        return Action.NOTHING;
+    }
+    
+    private Pair<Component, Component> getTooltipAndNarration(final RealmsServer dip, final String string, final boolean boolean3, final boolean boolean4, final Action a) {
+        if (a == Action.NOTHING) {
+            return (Pair<Component, Component>)Pair.of(null, new TextComponent(string));
         }
-        else if (boolean10) {
-            if (boolean12) {
-                string7 = string6;
+        Component mr7;
+        if (boolean4) {
+            if (boolean3) {
+                mr7 = TextComponent.EMPTY;
             }
             else {
-                string7 = string6 + " " + string4 + " " + realmsServer2.minigameName;
+                mr7 = new TextComponent(" ").append(string).append(" ").append(dip.minigameName);
             }
         }
         else {
-            string7 = string6 + " " + string4;
+            mr7 = new TextComponent(" ").append(string);
         }
-        this.setMessage(string7);
+        Component mr8;
+        if (a == Action.JOIN) {
+            mr8 = new TranslatableComponent("mco.configure.world.slot.tooltip.active");
+        }
+        else {
+            mr8 = (boolean4 ? new TranslatableComponent("mco.configure.world.slot.tooltip.minigame") : new TranslatableComponent("mco.configure.world.slot.tooltip"));
+        }
+        final Component mr9 = mr8.copy().append(mr7);
+        return (Pair<Component, Component>)Pair.of(mr8, mr9);
     }
     
     @Override
-    public void renderButton(final int integer1, final int integer2, final float float3) {
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (this.state == null) {
             return;
         }
-        final RealmsButtonProxy realmsButtonProxy5 = this.getProxy();
-        this.drawSlotFrame(realmsButtonProxy5.x, realmsButtonProxy5.y, integer1, integer2, this.state.isCurrentlyActiveSlot, this.state.slotName, this.slotIndex, this.state.imageId, this.state.image, this.state.empty, this.state.minigame, this.state.action, this.state.actionPrompt);
+        this.drawSlotFrame(dhl, this.x, this.y, integer2, integer3, this.state.isCurrentlyActiveSlot, this.state.slotName, this.slotIndex, this.state.imageId, this.state.image, this.state.empty, this.state.minigame, this.state.action, this.state.actionPrompt);
     }
     
-    private void drawSlotFrame(final int integer1, final int integer2, final int integer3, final int integer4, final boolean boolean5, final String string6, final int integer7, final long long8, @Nullable final String string9, final boolean boolean10, final boolean boolean11, final Action a, @Nullable final String string13) {
-        final boolean boolean12 = this.getProxy().isHovered();
-        if (this.getProxy().isMouseOver(integer3, integer4) && string13 != null) {
-            this.toolTipSetter.accept(string13);
+    private void drawSlotFrame(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6, final String string7, final int integer8, final long long9, @Nullable final String string10, final boolean boolean11, final boolean boolean12, final Action a, @Nullable final Component mr) {
+        final boolean boolean13 = this.isHovered();
+        if (this.isMouseOver(integer4, integer5) && mr != null) {
+            this.toolTipSetter.accept(mr);
         }
-        if (boolean11) {
-            RealmsTextureManager.bindWorldTemplate(String.valueOf(long8), string9);
+        final Minecraft dlx18 = Minecraft.getInstance();
+        final TextureManager elw19 = dlx18.getTextureManager();
+        if (boolean12) {
+            RealmsTextureManager.bindWorldTemplate(String.valueOf(long9), string10);
         }
-        else if (boolean10) {
-            Realms.bind("realms:textures/gui/realms/empty_frame.png");
+        else if (boolean11) {
+            elw19.bind(RealmsWorldSlotButton.EMPTY_SLOT_LOCATION);
         }
-        else if (string9 != null && long8 != -1L) {
-            RealmsTextureManager.bindWorldTemplate(String.valueOf(long8), string9);
+        else if (string10 != null && long9 != -1L) {
+            RealmsTextureManager.bindWorldTemplate(String.valueOf(long9), string10);
         }
-        else if (integer7 == 1) {
-            Realms.bind("textures/gui/title/background/panorama_0.png");
+        else if (integer8 == 1) {
+            elw19.bind(RealmsWorldSlotButton.DEFAULT_WORLD_SLOT_1);
         }
-        else if (integer7 == 2) {
-            Realms.bind("textures/gui/title/background/panorama_2.png");
+        else if (integer8 == 2) {
+            elw19.bind(RealmsWorldSlotButton.DEFAULT_WORLD_SLOT_2);
         }
-        else if (integer7 == 3) {
-            Realms.bind("textures/gui/title/background/panorama_3.png");
+        else if (integer8 == 3) {
+            elw19.bind(RealmsWorldSlotButton.DEFAULT_WORLD_SLOT_3);
         }
-        if (boolean5) {
-            final float float17 = 0.85f + 0.15f * RealmsMth.cos(this.animTick * 0.2f);
-            RenderSystem.color4f(float17, float17, float17, 1.0f);
+        if (boolean6) {
+            final float float20 = 0.85f + 0.15f * Mth.cos(this.animTick * 0.2f);
+            RenderSystem.color4f(float20, float20, float20, 1.0f);
         }
         else {
             RenderSystem.color4f(0.56f, 0.56f, 0.56f, 1.0f);
         }
-        RealmsScreen.blit(integer1 + 3, integer2 + 3, 0.0f, 0.0f, 74, 74, 74, 74);
-        Realms.bind("realms:textures/gui/realms/slot_frame.png");
-        final boolean boolean13 = boolean12 && a != Action.NOTHING;
-        if (boolean13) {
+        GuiComponent.blit(dhl, integer2 + 3, integer3 + 3, 0.0f, 0.0f, 74, 74, 74, 74);
+        elw19.bind(RealmsWorldSlotButton.SLOT_FRAME_LOCATION);
+        final boolean boolean14 = boolean13 && a != Action.NOTHING;
+        if (boolean14) {
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         }
-        else if (boolean5) {
+        else if (boolean6) {
             RenderSystem.color4f(0.8f, 0.8f, 0.8f, 1.0f);
         }
         else {
             RenderSystem.color4f(0.56f, 0.56f, 0.56f, 1.0f);
         }
-        RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 80, 80, 80, 80);
-        this.drawCenteredString(string6, integer1 + 40, integer2 + 66, 16777215);
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 80, 80, 80, 80);
+        this.drawCenteredString(dhl, dlx18.font, string7, integer2 + 40, integer3 + 66, 16777215);
     }
     
-    @Override
-    public void onPress() {
-        if (this.state != null) {
-            this.listener.onSlotClick(this.slotIndex, this.state.action, this.state.minigame, this.state.empty);
-        }
+    static {
+        SLOT_FRAME_LOCATION = new ResourceLocation("realms", "textures/gui/realms/slot_frame.png");
+        EMPTY_SLOT_LOCATION = new ResourceLocation("realms", "textures/gui/realms/empty_frame.png");
+        DEFAULT_WORLD_SLOT_1 = new ResourceLocation("minecraft", "textures/gui/title/background/panorama_0.png");
+        DEFAULT_WORLD_SLOT_2 = new ResourceLocation("minecraft", "textures/gui/title/background/panorama_2.png");
+        DEFAULT_WORLD_SLOT_3 = new ResourceLocation("minecraft", "textures/gui/title/background/panorama_3.png");
     }
     
     public enum Action {
@@ -176,16 +194,17 @@ public class RealmsWorldSlotButton extends RealmsButton {
     }
     
     public static class State {
-        final boolean isCurrentlyActiveSlot;
-        final String slotName;
-        final long imageId;
-        public final String image;
+        private final boolean isCurrentlyActiveSlot;
+        private final String slotName;
+        private final long imageId;
+        private final String image;
         public final boolean empty;
-        final boolean minigame;
+        public final boolean minigame;
         public final Action action;
-        final String actionPrompt;
+        @Nullable
+        private final Component actionPrompt;
         
-        State(final boolean boolean1, final String string2, final long long3, @Nullable final String string4, final boolean boolean5, final boolean boolean6, final Action a, @Nullable final String string8) {
+        State(final boolean boolean1, final String string2, final long long3, @Nullable final String string4, final boolean boolean5, final boolean boolean6, final Action a, @Nullable final Component mr) {
             this.isCurrentlyActiveSlot = boolean1;
             this.slotName = string2;
             this.imageId = long3;
@@ -193,11 +212,7 @@ public class RealmsWorldSlotButton extends RealmsButton {
             this.empty = boolean5;
             this.minigame = boolean6;
             this.action = a;
-            this.actionPrompt = string8;
+            this.actionPrompt = mr;
         }
     }
-    
-    public interface Listener {
-        void onSlotClick(final int integer, final Action a, final boolean boolean3, final boolean boolean4);
-    }
 }
diff --git a/src/com/mojang/realmsclient/gui/RowButton.java b/src/com/mojang/realmsclient/gui/RowButton.java
index c672bba..395c222 100644
--- a/src/com/mojang/realmsclient/gui/RowButton.java
+++ b/src/com/mojang/realmsclient/gui/RowButton.java
@@ -1,9 +1,10 @@
 package com.mojang.realmsclient.gui;
 
-import net.minecraft.realms.RealmListEntry;
+import net.minecraft.client.gui.components.ObjectSelectionList;
 import java.util.Iterator;
 import net.minecraft.realms.RealmsObjectSelectionList;
 import java.util.List;
+import com.mojang.blaze3d.vertex.PoseStack;
 
 public abstract class RowButton {
     public final int width;
@@ -18,17 +19,17 @@ public abstract class RowButton {
         this.yOffset = integer4;
     }
     
-    public void drawForRowAt(final int integer1, final int integer2, final int integer3, final int integer4) {
-        final int integer5 = integer1 + this.xOffset;
-        final int integer6 = integer2 + this.yOffset;
-        boolean boolean8 = false;
-        if (integer3 >= integer5 && integer3 <= integer5 + this.width && integer4 >= integer6 && integer4 <= integer6 + this.height) {
-            boolean8 = true;
+    public void drawForRowAt(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        final int integer6 = integer2 + this.xOffset;
+        final int integer7 = integer3 + this.yOffset;
+        boolean boolean9 = false;
+        if (integer4 >= integer6 && integer4 <= integer6 + this.width && integer5 >= integer7 && integer5 <= integer7 + this.height) {
+            boolean9 = true;
         }
-        this.draw(integer5, integer6, boolean8);
+        this.draw(dhl, integer6, integer7, boolean9);
     }
     
-    protected abstract void draw(final int integer1, final int integer2, final boolean boolean3);
+    protected abstract void draw(final PoseStack dhl, final int integer2, final int integer3, final boolean boolean4);
     
     public int getRight() {
         return this.xOffset + this.width;
@@ -40,26 +41,26 @@ public abstract class RowButton {
     
     public abstract void onClick(final int integer);
     
-    public static void drawButtonsInRow(final List<RowButton> list, final RealmsObjectSelectionList realmsObjectSelectionList, final int integer3, final int integer4, final int integer5, final int integer6) {
-        for (final RowButton czn8 : list) {
-            if (realmsObjectSelectionList.getRowWidth() > czn8.getRight()) {
-                czn8.drawForRowAt(integer3, integer4, integer5, integer6);
+    public static void drawButtonsInRow(final PoseStack dhl, final List<RowButton> list, final RealmsObjectSelectionList<?> eqg, final int integer4, final int integer5, final int integer6, final int integer7) {
+        for (final RowButton djm9 : list) {
+            if (eqg.getRowWidth() > djm9.getRight()) {
+                djm9.drawForRowAt(dhl, integer4, integer5, integer6, integer7);
             }
         }
     }
     
-    public static void rowButtonMouseClicked(final RealmsObjectSelectionList realmsObjectSelectionList, final RealmListEntry realmListEntry, final List<RowButton> list, final int integer, final double double5, final double double6) {
+    public static void rowButtonMouseClicked(final RealmsObjectSelectionList<?> eqg, final ObjectSelectionList.Entry<?> a, final List<RowButton> list, final int integer, final double double5, final double double6) {
         if (integer == 0) {
-            final int integer2 = realmsObjectSelectionList.children().indexOf(realmListEntry);
+            final int integer2 = eqg.children().indexOf(a);
             if (integer2 > -1) {
-                realmsObjectSelectionList.selectItem(integer2);
-                final int integer3 = realmsObjectSelectionList.getRowLeft();
-                final int integer4 = realmsObjectSelectionList.getRowTop(integer2);
+                eqg.selectItem(integer2);
+                final int integer3 = eqg.getRowLeft();
+                final int integer4 = eqg.getRowTop(integer2);
                 final int integer5 = (int)(double5 - integer3);
                 final int integer6 = (int)(double6 - integer4);
-                for (final RowButton czn15 : list) {
-                    if (integer5 >= czn15.xOffset && integer5 <= czn15.getRight() && integer6 >= czn15.yOffset && integer6 <= czn15.getBottom()) {
-                        czn15.onClick(integer2);
+                for (final RowButton djm15 : list) {
+                    if (integer5 >= djm15.xOffset && integer5 <= djm15.getRight() && integer6 >= djm15.yOffset && integer6 <= djm15.getBottom()) {
+                        djm15.onClick(integer2);
                     }
                 }
             }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.java
index 417fc90..9cee2dc 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.java
@@ -1,81 +1,64 @@
 package com.mojang.realmsclient.gui.screens;
 
-import net.minecraft.realms.Tezzelator;
-import net.minecraft.realms.RealmsSimpleScrolledSelectionList;
+import net.minecraft.client.gui.Font;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.client.gui.components.ObjectSelectionList;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.TextComponent;
 import java.util.Locale;
-import net.minecraft.realms.RealmsGuiEventListener;
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.Realms;
-import net.minecraft.realms.RealmsButton;
-import java.util.Iterator;
-import java.util.Map;
-import com.google.common.collect.Lists;
-import java.util.List;
+import net.minecraft.network.chat.Component;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
 import com.mojang.realmsclient.dto.Backup;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsBackupInfoScreen extends RealmsScreen {
-    private final RealmsScreen lastScreen;
-    private final int BUTTON_BACK_ID = 0;
+    private final Screen lastScreen;
     private final Backup backup;
-    private final List<String> keys;
     private BackupInfoList backupInfoList;
-    String[] difficulties;
-    String[] gameModes;
     
-    public RealmsBackupInfoScreen(final RealmsScreen realmsScreen, final Backup backup) {
-        this.keys = Lists.newArrayList();
-        this.difficulties = new String[] { RealmsScreen.getLocalizedString("options.difficulty.peaceful"), RealmsScreen.getLocalizedString("options.difficulty.easy"), RealmsScreen.getLocalizedString("options.difficulty.normal"), RealmsScreen.getLocalizedString("options.difficulty.hard") };
-        this.gameModes = new String[] { RealmsScreen.getLocalizedString("selectWorld.gameMode.survival"), RealmsScreen.getLocalizedString("selectWorld.gameMode.creative"), RealmsScreen.getLocalizedString("selectWorld.gameMode.adventure") };
-        this.lastScreen = realmsScreen;
-        this.backup = backup;
-        if (backup.changeList != null) {
-            for (final Map.Entry<String, String> entry5 : backup.changeList.entrySet()) {
-                this.keys.add(entry5.getKey());
-            }
-        }
+    public RealmsBackupInfoScreen(final Screen dqs, final Backup dif) {
+        this.lastScreen = dqs;
+        this.backup = dif;
     }
     
     @Override
     public void tick() {
     }
     
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 - 100, this.height() / 4 + 120 + 24, RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsBackupInfoScreen.this.lastScreen);
-            }
-        });
-        this.addWidget(this.backupInfoList = new BackupInfoList());
-        this.focusOn(this.backupInfoList);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120 + 24, 200, 20, CommonComponents.GUI_BACK, dni -> this.minecraft.setScreen(this.lastScreen)));
+        this.<BackupInfoList>addWidget(this.backupInfoList = new BackupInfoList(this.minecraft));
+        this.magicalSpecialHackyFocus(this.backupInfoList);
     }
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString("Changes from last backup", this.width() / 2, 10, 16777215);
-        this.backupInfoList.render(integer1, integer2, float3);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, "Changes from last backup", this.width / 2, 10, 16777215);
+        this.backupInfoList.render(dhl, integer2, integer3, float4);
+        super.render(dhl, integer2, integer3, float4);
     }
     
-    private String checkForSpecificMetadata(final String string1, final String string2) {
+    private Component checkForSpecificMetadata(final String string1, final String string2) {
         final String string3 = string1.toLowerCase(Locale.ROOT);
         if (string3.contains("game") && string3.contains("mode")) {
             return this.gameModeMetadata(string2);
@@ -83,56 +66,51 @@ public class RealmsBackupInfoScreen extends RealmsScreen {
         if (string3.contains("game") && string3.contains("difficulty")) {
             return this.gameDifficultyMetadata(string2);
         }
-        return string2;
+        return new TextComponent(string2);
     }
     
-    private String gameDifficultyMetadata(final String string) {
+    private Component gameDifficultyMetadata(final String string) {
         try {
-            return this.difficulties[Integer.parseInt(string)];
+            return RealmsSlotOptionsScreen.DIFFICULTIES[Integer.parseInt(string)];
         }
         catch (Exception exception3) {
-            return "UNKNOWN";
+            return new TextComponent("UNKNOWN");
         }
     }
     
-    private String gameModeMetadata(final String string) {
+    private Component gameModeMetadata(final String string) {
         try {
-            return this.gameModes[Integer.parseInt(string)];
+            return RealmsSlotOptionsScreen.GAME_MODES[Integer.parseInt(string)];
         }
         catch (Exception exception3) {
-            return "UNKNOWN";
+            return new TextComponent("UNKNOWN");
         }
     }
     
-    class BackupInfoList extends RealmsSimpleScrolledSelectionList {
-        public BackupInfoList() {
-            super(RealmsBackupInfoScreen.this.width(), RealmsBackupInfoScreen.this.height(), 32, RealmsBackupInfoScreen.this.height() - 64, 36);
+    class BackupInfoListEntry extends ObjectSelectionList.Entry<BackupInfoListEntry> {
+        private final String key;
+        private final String value;
+        
+        public BackupInfoListEntry(final String string2, final String string3) {
+            this.key = string2;
+            this.value = string3;
         }
         
         @Override
-        public int getItemCount() {
-            return RealmsBackupInfoScreen.this.backup.changeList.size();
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            final Font dmt12 = RealmsBackupInfoScreen.this.minecraft.font;
+            RealmsBackupInfoScreen.this.drawString(dhl, dmt12, this.key, integer4, integer3, 10526880);
+            RealmsBackupInfoScreen.this.drawString(dhl, dmt12, RealmsBackupInfoScreen.this.checkForSpecificMetadata(this.key, this.value), integer4, integer3 + 12, 16777215);
         }
-        
-        @Override
-        public boolean isSelectedItem(final int integer) {
-            return false;
-        }
-        
-        @Override
-        public int getMaxPosition() {
-            return this.getItemCount() * 36;
-        }
-        
-        @Override
-        public void renderBackground() {
-        }
-        
-        public void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final Tezzelator tezzelator, final int integer6, final int integer7) {
-            final String string9 = RealmsBackupInfoScreen.this.keys.get(integer1);
-            RealmsBackupInfoScreen.this.drawString(string9, this.width() / 2 - 40, integer3, 10526880);
-            final String string10 = RealmsBackupInfoScreen.this.backup.changeList.get(string9);
-            RealmsBackupInfoScreen.this.drawString(RealmsBackupInfoScreen.this.checkForSpecificMetadata(string9, string10), this.width() / 2 - 40, integer3 + 12, 16777215);
+    }
+    
+    class BackupInfoList extends ObjectSelectionList<BackupInfoListEntry> {
+        public BackupInfoList(final Minecraft dlx) {
+            super(dlx, RealmsBackupInfoScreen.this.width, RealmsBackupInfoScreen.this.height, 32, RealmsBackupInfoScreen.this.height - 64, 36);
+            this.setRenderSelection(false);
+            if (RealmsBackupInfoScreen.this.backup.changeList != null) {
+                RealmsBackupInfoScreen.this.backup.changeList.forEach((string1, string2) -> this.addEntry(new BackupInfoListEntry(string1, string2)));
+            }
         }
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.java
index 5f7d75d..cdd35b7 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.java
@@ -1,34 +1,46 @@
 package com.mojang.realmsclient.gui.screens;
 
+import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.realms.RealmListEntry;
+import net.minecraft.client.gui.components.ObjectSelectionList;
+import net.minecraft.client.gui.components.AbstractSelectionList;
+import javax.annotation.Nullable;
+import net.minecraft.realms.NarrationHelper;
 import net.minecraft.realms.RealmsObjectSelectionList;
 import org.apache.logging.log4j.LogManager;
-import com.mojang.realmsclient.gui.LongRunningTask;
-import com.mojang.realmsclient.util.RealmsTasks;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.realmsclient.util.task.RestoreTask;
+import com.mojang.realmsclient.util.task.LongRunningTask;
+import com.mojang.realmsclient.util.task.DownloadTask;
 import com.mojang.realmsclient.dto.RealmsWorldOptions;
 import java.util.Date;
-import net.minecraft.realms.RealmsConfirmResultListener;
 import com.mojang.realmsclient.util.RealmsUtil;
-import net.minecraft.realms.RealmsGuiEventListener;
-import net.minecraft.realms.AbstractRealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
 import java.text.DateFormat;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import java.util.Iterator;
 import com.mojang.realmsclient.exception.RealmsServiceException;
-import net.minecraft.realms.Realms;
 import com.mojang.realmsclient.client.RealmsClient;
 import java.util.Collections;
 import net.minecraft.realms.RealmsLabel;
 import com.mojang.realmsclient.dto.RealmsServer;
-import net.minecraft.realms.RealmsButton;
+import net.minecraft.client.gui.components.Button;
 import com.mojang.realmsclient.dto.Backup;
 import java.util.List;
+import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsBackupScreen extends RealmsScreen {
     private static final Logger LOGGER;
+    private static final ResourceLocation PLUS_ICON_LOCATION;
+    private static final ResourceLocation RESTORE_ICON_LOCATION;
     private static int lastScrollPosition;
     private final RealmsConfigureWorldScreen lastScreen;
     private List<Backup> backups;
@@ -36,55 +48,66 @@ public class RealmsBackupScreen extends RealmsScreen {
     private BackupObjectSelectionList backupObjectSelectionList;
     private int selectedBackup;
     private final int slotId;
-    private RealmsButton downloadButton;
-    private RealmsButton restoreButton;
-    private RealmsButton changesButton;
+    private Button downloadButton;
+    private Button restoreButton;
+    private Button changesButton;
     private Boolean noBackups;
     private final RealmsServer serverData;
     private RealmsLabel titleLabel;
     
-    public RealmsBackupScreen(final RealmsConfigureWorldScreen czs, final RealmsServer realmsServer, final int integer) {
+    public RealmsBackupScreen(final RealmsConfigureWorldScreen djr, final RealmsServer dip, final int integer) {
         this.backups = Collections.<Backup>emptyList();
         this.selectedBackup = -1;
         this.noBackups = false;
-        this.lastScreen = czs;
-        this.serverData = realmsServer;
+        this.lastScreen = djr;
+        this.serverData = dip;
         this.slotId = integer;
     }
     
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
         this.backupObjectSelectionList = new BackupObjectSelectionList();
         if (RealmsBackupScreen.lastScrollPosition != -1) {
-            this.backupObjectSelectionList.scroll(RealmsBackupScreen.lastScrollPosition);
+            this.backupObjectSelectionList.setScrollAmount(RealmsBackupScreen.lastScrollPosition);
         }
         new Thread("Realms-fetch-backups") {
             @Override
             public void run() {
-                final RealmsClient cyy2 = RealmsClient.createRealmsClient();
+                final RealmsClient dia2 = RealmsClient.create();
                 try {
-                    final List<Backup> list3 = cyy2.backupsFor(RealmsBackupScreen.this.serverData.id).backups;
+                    final List<Backup> list3 = dia2.backupsFor(RealmsBackupScreen.this.serverData.id).backups;
                     final Iterator<Backup> iterator;
-                    Backup backup4;
-                    Realms.execute(() -> {
+                    Backup dif4;
+                    RealmsBackupScreen.this.minecraft.execute(() -> {
                         RealmsBackupScreen.this.backups = list3;
                         RealmsBackupScreen.this.noBackups = RealmsBackupScreen.this.backups.isEmpty();
                         RealmsBackupScreen.this.backupObjectSelectionList.clear();
                         RealmsBackupScreen.this.backups.iterator();
                         while (iterator.hasNext()) {
-                            backup4 = iterator.next();
-                            RealmsBackupScreen.this.backupObjectSelectionList.addEntry(backup4);
+                            dif4 = iterator.next();
+                            RealmsBackupScreen.this.backupObjectSelectionList.addEntry(dif4);
                         }
                         RealmsBackupScreen.this.generateChangeList();
                     });
                 }
-                catch (RealmsServiceException czg3) {
-                    RealmsBackupScreen.LOGGER.error("Couldn't request backups", (Throwable)czg3);
+                catch (RealmsServiceException djh3) {
+                    RealmsBackupScreen.LOGGER.error("Couldn't request backups", (Throwable)djh3);
                 }
             }
         }.start();
-        this.postInit();
+        this.downloadButton = this.<Button>addButton(new Button(this.width - 135, RealmsScreen.row(1), 120, 20, new TranslatableComponent("mco.backup.button.download"), dni -> this.downloadClicked()));
+        this.restoreButton = this.<Button>addButton(new Button(this.width - 135, RealmsScreen.row(3), 120, 20, new TranslatableComponent("mco.backup.button.restore"), dni -> this.restoreClicked(this.selectedBackup)));
+        this.changesButton = this.<Button>addButton(new Button(this.width - 135, RealmsScreen.row(5), 120, 20, new TranslatableComponent("mco.backup.changes.tooltip"), dni -> {
+            this.minecraft.setScreen(new RealmsBackupInfoScreen(this, this.backups.get(this.selectedBackup)));
+            this.selectedBackup = -1;
+            return;
+        }));
+        this.<Button>addButton(new Button(this.width - 100, this.height - 35, 85, 20, CommonComponents.GUI_BACK, dni -> this.minecraft.setScreen(this.lastScreen)));
+        this.<BackupObjectSelectionList>addWidget(this.backupObjectSelectionList);
+        this.titleLabel = this.<RealmsLabel>addWidget(new RealmsLabel(new TranslatableComponent("mco.configure.world.backup"), this.width / 2, 12, 16777215));
+        this.magicalSpecialHackyFocus(this.backupObjectSelectionList);
+        this.updateButtonStates();
+        this.narrateLabels();
     }
     
     private void generateChangeList() {
@@ -92,19 +115,19 @@ public class RealmsBackupScreen extends RealmsScreen {
             return;
         }
         for (int integer2 = 0; integer2 < this.backups.size() - 1; ++integer2) {
-            final Backup backup3 = this.backups.get(integer2);
-            final Backup backup4 = this.backups.get(integer2 + 1);
-            if (!backup3.metadata.isEmpty()) {
-                if (!backup4.metadata.isEmpty()) {
-                    for (final String string6 : backup3.metadata.keySet()) {
-                        if (!string6.contains("Uploaded") && backup4.metadata.containsKey(string6)) {
-                            if (backup3.metadata.get(string6).equals(backup4.metadata.get(string6))) {
+            final Backup dif3 = this.backups.get(integer2);
+            final Backup dif4 = this.backups.get(integer2 + 1);
+            if (!dif3.metadata.isEmpty()) {
+                if (!dif4.metadata.isEmpty()) {
+                    for (final String string6 : dif3.metadata.keySet()) {
+                        if (!string6.contains("Uploaded") && dif4.metadata.containsKey(string6)) {
+                            if (dif3.metadata.get(string6).equals(dif4.metadata.get(string6))) {
                                 continue;
                             }
-                            this.addToChangeList(backup3, string6);
+                            this.addToChangeList(dif3, string6);
                         }
                         else {
-                            this.addToChangeList(backup3, string6);
+                            this.addToChangeList(dif3, string6);
                         }
                     }
                 }
@@ -112,53 +135,20 @@ public class RealmsBackupScreen extends RealmsScreen {
         }
     }
     
-    private void addToChangeList(final Backup backup, final String string) {
+    private void addToChangeList(final Backup dif, final String string) {
         if (string.contains("Uploaded")) {
-            final String string2 = DateFormat.getDateTimeInstance(3, 3).format(backup.lastModifiedDate);
-            backup.changeList.put(string, string2);
-            backup.setUploadedVersion(true);
+            final String string2 = DateFormat.getDateTimeInstance(3, 3).format(dif.lastModifiedDate);
+            dif.changeList.put(string, string2);
+            dif.setUploadedVersion(true);
         }
         else {
-            backup.changeList.put(string, backup.metadata.get(string));
+            dif.changeList.put(string, dif.metadata.get(string));
         }
     }
     
-    private void postInit() {
-        this.buttonsAdd(this.downloadButton = new RealmsButton(2, this.width() - 135, RealmsConstants.row(1), 120, 20, RealmsScreen.getLocalizedString("mco.backup.button.download")) {
-            @Override
-            public void onPress() {
-                RealmsBackupScreen.this.downloadClicked();
-            }
-        });
-        this.buttonsAdd(this.restoreButton = new RealmsButton(3, this.width() - 135, RealmsConstants.row(3), 120, 20, RealmsScreen.getLocalizedString("mco.backup.button.restore")) {
-            @Override
-            public void onPress() {
-                RealmsBackupScreen.this.restoreClicked(RealmsBackupScreen.this.selectedBackup);
-            }
-        });
-        this.buttonsAdd(this.changesButton = new RealmsButton(4, this.width() - 135, RealmsConstants.row(5), 120, 20, RealmsScreen.getLocalizedString("mco.backup.changes.tooltip")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsBackupInfoScreen(RealmsBackupScreen.this, RealmsBackupScreen.this.backups.get(RealmsBackupScreen.this.selectedBackup)));
-                RealmsBackupScreen.this.selectedBackup = -1;
-            }
-        });
-        this.buttonsAdd(new RealmsButton(0, this.width() - 100, this.height() - 35, 85, 20, RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsBackupScreen.this.lastScreen);
-            }
-        });
-        this.addWidget(this.backupObjectSelectionList);
-        this.addWidget(this.titleLabel = new RealmsLabel(RealmsScreen.getLocalizedString("mco.configure.world.backup"), this.width() / 2, 12, 16777215));
-        this.focusOn(this.backupObjectSelectionList);
-        this.updateButtonStates();
-        this.narrateLabels();
-    }
-    
     private void updateButtonStates() {
-        this.restoreButton.setVisible(this.shouldRestoreButtonBeVisible());
-        this.changesButton.setVisible(this.shouldChangesButtonBeVisible());
+        this.restoreButton.visible = this.shouldRestoreButtonBeVisible();
+        this.changesButton.visible = this.shouldChangesButtonBeVisible();
     }
     
     private boolean shouldChangesButtonBeVisible() {
@@ -169,15 +159,10 @@ public class RealmsBackupScreen extends RealmsScreen {
         return this.selectedBackup != -1 && !this.serverData.expired;
     }
     
-    @Override
-    public void tick() {
-        super.tick();
-    }
-    
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
@@ -188,107 +173,95 @@ public class RealmsBackupScreen extends RealmsScreen {
             this.selectedBackup = integer;
             final Date date3 = this.backups.get(integer).lastModifiedDate;
             final String string4 = DateFormat.getDateTimeInstance(3, 3).format(date3);
-            final String string5 = RealmsUtil.convertToAgePresentation(System.currentTimeMillis() - date3.getTime());
-            final String string6 = RealmsScreen.getLocalizedString("mco.configure.world.restore.question.line1", string4, string5);
-            final String string7 = RealmsScreen.getLocalizedString("mco.configure.world.restore.question.line2");
-            Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Warning, string6, string7, true, 1));
+            final String string5 = RealmsUtil.convertToAgePresentationFromInstant(date3);
+            final Component mr6 = new TranslatableComponent("mco.configure.world.restore.question.line1", new Object[] { string4, string5 });
+            final Component mr7 = new TranslatableComponent("mco.configure.world.restore.question.line2");
+            this.minecraft.setScreen(new RealmsLongConfirmationScreen(boolean1 -> {
+                if (boolean1) {
+                    this.restore();
+                }
+                else {
+                    this.selectedBackup = -1;
+                    this.minecraft.setScreen(this);
+                }
+            }, RealmsLongConfirmationScreen.Type.Warning, mr6, mr7, true));
         }
     }
     
     private void downloadClicked() {
-        final String string2 = RealmsScreen.getLocalizedString("mco.configure.world.restore.download.question.line1");
-        final String string3 = RealmsScreen.getLocalizedString("mco.configure.world.restore.download.question.line2");
-        Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Info, string2, string3, true, 2));
+        final Component mr2 = new TranslatableComponent("mco.configure.world.restore.download.question.line1");
+        final Component mr3 = new TranslatableComponent("mco.configure.world.restore.download.question.line2");
+        this.minecraft.setScreen(new RealmsLongConfirmationScreen(boolean1 -> {
+            if (boolean1) {
+                this.downloadWorldData();
+            }
+            else {
+                this.minecraft.setScreen(this);
+            }
+        }, RealmsLongConfirmationScreen.Type.Info, mr2, mr3, true));
     }
     
     private void downloadWorldData() {
-        final RealmsTasks.DownloadTask b2 = new RealmsTasks.DownloadTask(this.serverData.id, this.slotId, this.serverData.name + " (" + this.serverData.slots.get(this.serverData.activeSlot).getSlotName(this.serverData.activeSlot) + ")", this);
-        final RealmsLongRunningMcoTaskScreen czz3 = new RealmsLongRunningMcoTaskScreen(this.lastScreen.getNewScreen(), b2);
-        czz3.start();
-        Realms.setScreen(czz3);
-    }
-    
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-        if (boolean1 && integer == 1) {
-            this.restore();
-        }
-        else if (integer == 1) {
-            this.selectedBackup = -1;
-            Realms.setScreen(this);
-        }
-        else if (boolean1 && integer == 2) {
-            this.downloadWorldData();
-        }
-        else {
-            Realms.setScreen(this);
-        }
+        this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(this.lastScreen.getNewScreen(), new DownloadTask(this.serverData.id, this.slotId, this.serverData.name + " (" + this.serverData.slots.get(this.serverData.activeSlot).getSlotName(this.serverData.activeSlot) + ")", this)));
     }
     
     private void restore() {
-        final Backup backup2 = this.backups.get(this.selectedBackup);
+        final Backup dif2 = this.backups.get(this.selectedBackup);
         this.selectedBackup = -1;
-        final RealmsTasks.RestoreTask g3 = new RealmsTasks.RestoreTask(backup2, this.serverData.id, this.lastScreen);
-        final RealmsLongRunningMcoTaskScreen czz4 = new RealmsLongRunningMcoTaskScreen(this.lastScreen.getNewScreen(), g3);
-        czz4.start();
-        Realms.setScreen(czz4);
+        this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(this.lastScreen.getNewScreen(), new RestoreTask(dif2, this.serverData.id, this.lastScreen)));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.toolTip = null;
-        this.renderBackground();
-        this.backupObjectSelectionList.render(integer1, integer2, float3);
-        this.titleLabel.render(this);
-        this.drawString(RealmsScreen.getLocalizedString("mco.configure.world.backup"), (this.width() - 150) / 2 - 90, 20, 10526880);
+        this.renderBackground(dhl);
+        this.backupObjectSelectionList.render(dhl, integer2, integer3, float4);
+        this.titleLabel.render(this, dhl);
+        this.font.draw(dhl, I18n.get("mco.configure.world.backup"), (float)((this.width - 150) / 2 - 90), 20.0f, 10526880);
         if (this.noBackups) {
-            this.drawString(RealmsScreen.getLocalizedString("mco.backup.nobackups"), 20, this.height() / 2 - 10, 16777215);
+            this.font.draw(dhl, I18n.get("mco.backup.nobackups"), 20.0f, (float)(this.height / 2 - 10), 16777215);
         }
-        this.downloadButton.active(!this.noBackups);
-        super.render(integer1, integer2, float3);
+        this.downloadButton.active = !this.noBackups;
+        super.render(dhl, integer2, integer3, float4);
         if (this.toolTip != null) {
-            this.renderMousehoverTooltip(this.toolTip, integer1, integer2);
+            this.renderMousehoverTooltip(dhl, this.toolTip, integer2, integer3);
         }
     }
     
-    protected void renderMousehoverTooltip(final String string, final int integer2, final int integer3) {
+    protected void renderMousehoverTooltip(final PoseStack dhl, final String string, final int integer3, final int integer4) {
         if (string == null) {
             return;
         }
-        final int integer4 = integer2 + 12;
-        final int integer5 = integer3 - 12;
-        final int integer6 = this.fontWidth(string);
-        this.fillGradient(integer4 - 3, integer5 - 3, integer4 + integer6 + 3, integer5 + 8 + 3, -1073741824, -1073741824);
-        this.fontDrawShadow(string, integer4, integer5, 16777215);
+        final int integer5 = integer3 + 12;
+        final int integer6 = integer4 - 12;
+        final int integer7 = this.font.width(string);
+        this.fillGradient(dhl, integer5 - 3, integer6 - 3, integer5 + integer7 + 3, integer6 + 8 + 3, -1073741824, -1073741824);
+        this.font.drawShadow(dhl, string, (float)integer5, (float)integer6, 16777215);
     }
     
     static {
         LOGGER = LogManager.getLogger();
+        PLUS_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/plus_icon.png");
+        RESTORE_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/restore_icon.png");
         RealmsBackupScreen.lastScrollPosition = -1;
     }
     
-    class BackupObjectSelectionList extends RealmsObjectSelectionList {
+    class BackupObjectSelectionList extends RealmsObjectSelectionList<RealmsBackupScreen.Entry> {
         public BackupObjectSelectionList() {
-            super(RealmsBackupScreen.this.width() - 150, RealmsBackupScreen.this.height(), 32, RealmsBackupScreen.this.height() - 15, 36);
+            super(RealmsBackupScreen.this.width - 150, RealmsBackupScreen.this.height, 32, RealmsBackupScreen.this.height - 15, 36);
         }
         
-        public void addEntry(final Backup backup) {
-            this.addEntry(new BackupObjectSelectionListEntry(backup));
+        public void addEntry(final Backup dif) {
+            this.addEntry(new RealmsBackupScreen.Entry(dif));
         }
         
         @Override
         public int getRowWidth() {
-            return (int)(this.width() * 0.93);
+            return (int)(this.width * 0.93);
         }
         
-        @Override
         public boolean isFocused() {
-            return RealmsBackupScreen.this.isFocused(this);
-        }
-        
-        @Override
-        public int getItemCount() {
-            return RealmsBackupScreen.this.backups.size();
+            return RealmsBackupScreen.this.getFocused() == this;
         }
         
         @Override
@@ -296,9 +269,8 @@ public class RealmsBackupScreen extends RealmsScreen {
             return this.getItemCount() * 36;
         }
         
-        @Override
-        public void renderBackground() {
-            RealmsBackupScreen.this.renderBackground();
+        public void renderBackground(final PoseStack dhl) {
+            RealmsBackupScreen.this.renderBackground(dhl);
         }
         
         @Override
@@ -306,14 +278,14 @@ public class RealmsBackupScreen extends RealmsScreen {
             if (integer != 0) {
                 return false;
             }
-            if (double1 < this.getScrollbarPosition() && double2 >= this.y0() && double2 <= this.y1()) {
-                final int integer2 = this.width() / 2 - 92;
-                final int integer3 = this.width();
-                final int integer4 = (int)Math.floor(double2 - this.y0()) - this.headerHeight() + this.getScroll();
-                final int integer5 = integer4 / this.itemHeight();
+            if (double1 < this.getScrollbarPosition() && double2 >= this.y0 && double2 <= this.y1) {
+                final int integer2 = this.width / 2 - 92;
+                final int integer3 = this.width;
+                final int integer4 = (int)Math.floor(double2 - this.y0) - this.headerHeight + (int)this.getScrollAmount();
+                final int integer5 = integer4 / this.itemHeight;
                 if (double1 >= integer2 && double1 <= integer3 && integer5 >= 0 && integer4 >= 0 && integer5 < this.getItemCount()) {
                     this.selectItem(integer5);
-                    this.itemClicked(integer4, integer5, double1, double2, this.width());
+                    this.itemClicked(integer4, integer5, double1, double2, this.width);
                 }
                 return true;
             }
@@ -322,33 +294,33 @@ public class RealmsBackupScreen extends RealmsScreen {
         
         @Override
         public int getScrollbarPosition() {
-            return this.width() - 5;
+            return this.width - 5;
         }
         
         @Override
         public void itemClicked(final int integer1, final int integer2, final double double3, final double double4, final int integer5) {
-            final int integer6 = this.width() - 35;
-            final int integer7 = integer2 * this.itemHeight() + 36 - this.getScroll();
+            final int integer6 = this.width - 35;
+            final int integer7 = integer2 * this.itemHeight + 36 - (int)this.getScrollAmount();
             final int integer8 = integer6 + 10;
             final int integer9 = integer7 - 3;
             if (double3 >= integer6 && double3 <= integer6 + 9 && double4 >= integer7 && double4 <= integer7 + 9) {
                 if (!RealmsBackupScreen.this.backups.get(integer2).changeList.isEmpty()) {
                     RealmsBackupScreen.this.selectedBackup = -1;
-                    RealmsBackupScreen.lastScrollPosition = this.getScroll();
-                    Realms.setScreen(new RealmsBackupInfoScreen(RealmsBackupScreen.this, RealmsBackupScreen.this.backups.get(integer2)));
+                    RealmsBackupScreen.lastScrollPosition = (int)this.getScrollAmount();
+                    this.minecraft.setScreen(new RealmsBackupInfoScreen(RealmsBackupScreen.this, RealmsBackupScreen.this.backups.get(integer2)));
                 }
             }
             else if (double3 >= integer8 && double3 < integer8 + 13 && double4 >= integer9 && double4 < integer9 + 15) {
-                RealmsBackupScreen.lastScrollPosition = this.getScroll();
+                RealmsBackupScreen.lastScrollPosition = (int)this.getScrollAmount();
                 RealmsBackupScreen.this.restoreClicked(integer2);
             }
         }
         
         @Override
         public void selectItem(final int integer) {
-            this.setSelected(integer);
+            this.setSelectedItem(integer);
             if (integer != -1) {
-                Realms.narrateNow(RealmsScreen.getLocalizedString("narrator.select", RealmsBackupScreen.this.backups.get(integer).lastModifiedDate.toString()));
+                NarrationHelper.now(I18n.get("narrator.select", RealmsBackupScreen.this.backups.get(integer).lastModifiedDate.toString()));
             }
             this.selectInviteListItem(integer);
         }
@@ -357,33 +329,40 @@ public class RealmsBackupScreen extends RealmsScreen {
             RealmsBackupScreen.this.selectedBackup = integer;
             RealmsBackupScreen.this.updateButtonStates();
         }
+        
+        @Override
+        public void setSelected(@Nullable final RealmsBackupScreen.Entry b) {
+            super.setSelected(b);
+            RealmsBackupScreen.this.selectedBackup = this.children().indexOf(b);
+            RealmsBackupScreen.this.updateButtonStates();
+        }
     }
     
-    class BackupObjectSelectionListEntry extends RealmListEntry {
-        final Backup mBackup;
+    class Entry extends ObjectSelectionList.Entry<Entry> {
+        private final Backup backup;
         
-        public BackupObjectSelectionListEntry(final Backup backup) {
-            this.mBackup = backup;
+        public Entry(final Backup dif) {
+            this.backup = dif;
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            this.renderBackupItem(this.mBackup, integer3 - 40, integer2, integer6, integer7);
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.renderBackupItem(dhl, this.backup, integer4 - 40, integer3, integer7, integer8);
         }
         
-        private void renderBackupItem(final Backup backup, final int integer2, final int integer3, final int integer4, final int integer5) {
-            final int integer6 = backup.isUploadedVersion() ? -8388737 : 16777215;
-            RealmsBackupScreen.this.drawString("Backup (" + RealmsUtil.convertToAgePresentation(System.currentTimeMillis() - backup.lastModifiedDate.getTime()) + ")", integer2 + 40, integer3 + 1, integer6);
-            RealmsBackupScreen.this.drawString(this.getMediumDatePresentation(backup.lastModifiedDate), integer2 + 40, integer3 + 12, 8421504);
-            final int integer7 = RealmsBackupScreen.this.width() - 175;
-            final int integer8 = -3;
-            final int integer9 = integer7 - 10;
-            final int integer10 = 0;
+        private void renderBackupItem(final PoseStack dhl, final Backup dif, final int integer3, final int integer4, final int integer5, final int integer6) {
+            final int integer7 = dif.isUploadedVersion() ? -8388737 : 16777215;
+            RealmsBackupScreen.this.font.draw(dhl, "Backup (" + RealmsUtil.convertToAgePresentationFromInstant(dif.lastModifiedDate) + ")", (float)(integer3 + 40), (float)(integer4 + 1), integer7);
+            RealmsBackupScreen.this.font.draw(dhl, this.getMediumDatePresentation(dif.lastModifiedDate), (float)(integer3 + 40), (float)(integer4 + 12), 5000268);
+            final int integer8 = RealmsBackupScreen.this.width - 175;
+            final int integer9 = -3;
+            final int integer10 = integer8 - 10;
+            final int integer11 = 0;
             if (!RealmsBackupScreen.this.serverData.expired) {
-                this.drawRestore(integer7, integer3 - 3, integer4, integer5);
+                this.drawRestore(dhl, integer8, integer4 - 3, integer5, integer6);
             }
-            if (!backup.changeList.isEmpty()) {
-                this.drawInfo(integer9, integer3 + 0, integer4, integer5);
+            if (!dif.changeList.isEmpty()) {
+                this.drawInfo(dhl, integer10, integer4 + 0, integer5, integer6);
             }
         }
         
@@ -391,29 +370,31 @@ public class RealmsBackupScreen extends RealmsScreen {
             return DateFormat.getDateTimeInstance(3, 3).format(date);
         }
         
-        private void drawRestore(final int integer1, final int integer2, final int integer3, final int integer4) {
-            final boolean boolean6 = integer3 >= integer1 && integer3 <= integer1 + 12 && integer4 >= integer2 && integer4 <= integer2 + 14 && integer4 < RealmsBackupScreen.this.height() - 15 && integer4 > 32;
-            RealmsScreen.bind("realms:textures/gui/realms/restore_icon.png");
+        private void drawRestore(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+            final boolean boolean7 = integer4 >= integer2 && integer4 <= integer2 + 12 && integer5 >= integer3 && integer5 <= integer3 + 14 && integer5 < RealmsBackupScreen.this.height - 15 && integer5 > 32;
+            RealmsBackupScreen.this.minecraft.getTextureManager().bind(RealmsBackupScreen.RESTORE_ICON_LOCATION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
             RenderSystem.pushMatrix();
             RenderSystem.scalef(0.5f, 0.5f, 0.5f);
-            RealmsScreen.blit(integer1 * 2, integer2 * 2, 0.0f, boolean6 ? 28.0f : 0.0f, 23, 28, 23, 56);
+            final float float8 = boolean7 ? 28.0f : 0.0f;
+            GuiComponent.blit(dhl, integer2 * 2, integer3 * 2, 0.0f, float8, 23, 28, 23, 56);
             RenderSystem.popMatrix();
-            if (boolean6) {
-                RealmsBackupScreen.this.toolTip = RealmsScreen.getLocalizedString("mco.backup.button.restore");
+            if (boolean7) {
+                RealmsBackupScreen.this.toolTip = I18n.get("mco.backup.button.restore");
             }
         }
         
-        private void drawInfo(final int integer1, final int integer2, final int integer3, final int integer4) {
-            final boolean boolean6 = integer3 >= integer1 && integer3 <= integer1 + 8 && integer4 >= integer2 && integer4 <= integer2 + 8 && integer4 < RealmsBackupScreen.this.height() - 15 && integer4 > 32;
-            RealmsScreen.bind("realms:textures/gui/realms/plus_icon.png");
+        private void drawInfo(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+            final boolean boolean7 = integer4 >= integer2 && integer4 <= integer2 + 8 && integer5 >= integer3 && integer5 <= integer3 + 8 && integer5 < RealmsBackupScreen.this.height - 15 && integer5 > 32;
+            RealmsBackupScreen.this.minecraft.getTextureManager().bind(RealmsBackupScreen.PLUS_ICON_LOCATION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
             RenderSystem.pushMatrix();
             RenderSystem.scalef(0.5f, 0.5f, 0.5f);
-            RealmsScreen.blit(integer1 * 2, integer2 * 2, 0.0f, boolean6 ? 15.0f : 0.0f, 15, 15, 15, 30);
+            final float float8 = boolean7 ? 15.0f : 0.0f;
+            GuiComponent.blit(dhl, integer2 * 2, integer3 * 2, 0.0f, float8, 15, 15, 15, 30);
             RenderSystem.popMatrix();
-            if (boolean6) {
-                RealmsBackupScreen.this.toolTip = RealmsScreen.getLocalizedString("mco.backup.changes.tooltip");
+            if (boolean7) {
+                RealmsBackupScreen.this.toolTip = I18n.get("mco.backup.changes.tooltip");
             }
         }
     }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.java
index 81465a1..577fa2c 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsBrokenWorldScreen.java
@@ -1,110 +1,144 @@
 package com.mojang.realmsclient.gui.screens;
 
-import java.util.Arrays;
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.realms.RealmsConfirmResultListener;
-import net.minecraft.realms.RealmsMth;
+import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.util.Mth;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.realmsclient.util.RealmsTextureManager;
+import com.mojang.realmsclient.gui.RealmsWorldSlotButton;
 import com.mojang.realmsclient.dto.WorldDownload;
-import com.mojang.realmsclient.gui.LongRunningTask;
-import com.mojang.realmsclient.util.RealmsTasks;
-import java.io.IOException;
+import com.mojang.realmsclient.util.task.OpenServerTask;
 import com.mojang.realmsclient.exception.RealmsServiceException;
 import com.mojang.realmsclient.client.RealmsClient;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
 import java.util.Iterator;
-import net.minecraft.realms.Realms;
+import com.mojang.realmsclient.util.task.LongRunningTask;
+import com.mojang.realmsclient.util.task.SwitchSlotTask;
+import net.minecraft.client.resources.language.I18n;
 import com.mojang.realmsclient.dto.RealmsWorldOptions;
 import java.util.Map;
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.RealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.realms.NarrationHelper;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
 import com.google.common.collect.Lists;
+import net.minecraft.network.chat.TranslatableComponent;
 import java.util.List;
+import net.minecraft.network.chat.Component;
 import com.mojang.realmsclient.dto.RealmsServer;
 import com.mojang.realmsclient.RealmsMainScreen;
+import net.minecraft.client.gui.screens.Screen;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsBrokenWorldScreen extends RealmsScreen {
     private static final Logger LOGGER;
-    private final RealmsScreen lastScreen;
+    private final Screen lastScreen;
     private final RealmsMainScreen mainScreen;
     private RealmsServer serverData;
     private final long serverId;
-    private String title;
-    private final String message;
-    private int left_x;
-    private int right_x;
-    private final int default_button_width = 80;
-    private final int default_button_offset = 5;
-    private static final List<Integer> playButtonIds;
-    private static final List<Integer> resetButtonIds;
-    private static final List<Integer> downloadButtonIds;
-    private static final List<Integer> downloadConfirmationIds;
+    private final Component header;
+    private final Component[] message;
+    private int leftX;
+    private int rightX;
     private final List<Integer> slotsThatHasBeenDownloaded;
     private int animTick;
     
-    public RealmsBrokenWorldScreen(final RealmsScreen realmsScreen, final RealmsMainScreen cyu, final long long3) {
-        this.title = RealmsScreen.getLocalizedString("mco.brokenworld.title");
-        this.message = RealmsScreen.getLocalizedString("mco.brokenworld.message.line1") + "\\n" + RealmsScreen.getLocalizedString("mco.brokenworld.message.line2");
+    public RealmsBrokenWorldScreen(final Screen dqs, final RealmsMainScreen dhv, final long long3, final boolean boolean4) {
+        this.message = new Component[] { new TranslatableComponent("mco.brokenworld.message.line1"), new TranslatableComponent("mco.brokenworld.message.line2") };
         this.slotsThatHasBeenDownloaded = Lists.newArrayList();
-        this.lastScreen = realmsScreen;
-        this.mainScreen = cyu;
+        this.lastScreen = dqs;
+        this.mainScreen = dhv;
         this.serverId = long3;
+        this.header = (boolean4 ? new TranslatableComponent("mco.brokenworld.minigame.title") : new TranslatableComponent("mco.brokenworld.title"));
     }
     
-    public void setTitle(final String string) {
-        this.title = string;
-    }
-    
-    @Override
     public void init() {
-        this.left_x = this.width() / 2 - 150;
-        this.right_x = this.width() / 2 + 190;
-        this.buttonsAdd(new RealmsButton(0, this.right_x - 80 + 8, RealmsConstants.row(13) - 5, 70, 20, RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                RealmsBrokenWorldScreen.this.backButtonClicked();
-            }
-        });
+        this.leftX = this.width / 2 - 150;
+        this.rightX = this.width / 2 + 190;
+        this.<Button>addButton(new Button(this.rightX - 80 + 8, RealmsScreen.row(13) - 5, 70, 20, CommonComponents.GUI_BACK, dni -> this.backButtonClicked()));
         if (this.serverData == null) {
             this.fetchServerData(this.serverId);
         }
         else {
             this.addButtons();
         }
-        this.setKeyboardHandlerSendRepeatsToGui(true);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        NarrationHelper.now(Stream.concat(Stream.of((T)this.header), Stream.of((T[])this.message)).map(Component::getString).collect(Collectors.joining(" ")));
     }
     
-    public void addButtons() {
+    private void addButtons() {
         for (final Map.Entry<Integer, RealmsWorldOptions> entry3 : this.serverData.slots.entrySet()) {
-            final RealmsWorldOptions realmsWorldOptions4 = entry3.getValue();
-            final boolean boolean5 = entry3.getKey() != this.serverData.activeSlot || this.serverData.worldType.equals(RealmsServer.WorldType.MINIGAME);
-            RealmsButton realmsButton6;
+            final int integer4 = entry3.getKey();
+            final boolean boolean5 = integer4 != this.serverData.activeSlot || this.serverData.worldType == RealmsServer.WorldType.MINIGAME;
+            Button dni6;
             if (boolean5) {
-                realmsButton6 = new PlayButton(RealmsBrokenWorldScreen.playButtonIds.get(entry3.getKey() - 1), this.getFramePositionX(entry3.getKey()), RealmsScreen.getLocalizedString("mco.brokenworld.play"));
+                final int integer5;
+                final RealmsResetWorldScreen realmsResetWorldScreen;
+                RealmsResetWorldScreen dke4;
+                Minecraft minecraft;
+                final Screen screen;
+                dni6 = new Button(this.getFramePositionX(integer4), RealmsScreen.row(8), 80, 20, new TranslatableComponent("mco.brokenworld.play"), dni -> {
+                    if (this.serverData.slots.get(integer5).empty) {
+                        new RealmsResetWorldScreen(this, this.serverData, new TranslatableComponent("mco.configure.world.switch.slot"), new TranslatableComponent("mco.configure.world.switch.slot.subtitle"), 10526880, CommonComponents.GUI_CANCEL, this::doSwitchOrReset, () -> {
+                            this.minecraft.setScreen(this);
+                            this.doSwitchOrReset();
+                            return;
+                        });
+                        dke4 = realmsResetWorldScreen;
+                        dke4.setSlot(integer5);
+                        dke4.setResetTitle(I18n.get("mco.create.world.reset.title"));
+                        this.minecraft.setScreen(dke4);
+                    }
+                    else {
+                        minecraft = this.minecraft;
+                        new RealmsLongRunningMcoTaskScreen(this.lastScreen, new SwitchSlotTask(this.serverData.id, integer5, this::doSwitchOrReset));
+                        minecraft.setScreen(screen);
+                    }
+                    return;
+                });
             }
             else {
-                realmsButton6 = new DownloadButton(RealmsBrokenWorldScreen.downloadButtonIds.get(entry3.getKey() - 1), this.getFramePositionX(entry3.getKey()), RealmsScreen.getLocalizedString("mco.brokenworld.download"));
+                final Component mr4;
+                final Component mr5;
+                final Object o;
+                dni6 = new Button(this.getFramePositionX(integer4), RealmsScreen.row(8), 80, 20, new TranslatableComponent("mco.brokenworld.download"), dni -> {
+                    mr4 = new TranslatableComponent("mco.configure.world.restore.download.question.line1");
+                    mr5 = new TranslatableComponent("mco.configure.world.restore.download.question.line2");
+                    this.minecraft.setScreen(new RealmsLongConfirmationScreen(boolean2 -> {
+                        if (boolean2) {
+                            this.downloadWorld(o);
+                        }
+                        else {
+                            this.minecraft.setScreen(this);
+                        }
+                    }, RealmsLongConfirmationScreen.Type.Info, mr4, mr5, true));
+                    return;
+                });
             }
-            if (this.slotsThatHasBeenDownloaded.contains(entry3.getKey())) {
-                realmsButton6.active(false);
-                realmsButton6.setMessage(RealmsScreen.getLocalizedString("mco.brokenworld.downloaded"));
+            if (this.slotsThatHasBeenDownloaded.contains(integer4)) {
+                dni6.active = false;
+                dni6.setMessage(new TranslatableComponent("mco.brokenworld.downloaded"));
             }
-            this.buttonsAdd(realmsButton6);
-            this.buttonsAdd(new RealmsButton((int)RealmsBrokenWorldScreen.resetButtonIds.get(entry3.getKey() - 1), this.getFramePositionX(entry3.getKey()), RealmsConstants.row(10), 80, 20, RealmsScreen.getLocalizedString("mco.brokenworld.reset")) {
-                @Override
-                public void onPress() {
-                    final int integer2 = RealmsBrokenWorldScreen.resetButtonIds.indexOf(this.id()) + 1;
-                    final RealmsResetWorldScreen daf3 = new RealmsResetWorldScreen(RealmsBrokenWorldScreen.this, RealmsBrokenWorldScreen.this.serverData, RealmsBrokenWorldScreen.this);
-                    if (integer2 != RealmsBrokenWorldScreen.this.serverData.activeSlot || RealmsBrokenWorldScreen.this.serverData.worldType.equals(RealmsServer.WorldType.MINIGAME)) {
-                        daf3.setSlot(integer2);
-                    }
-                    daf3.setConfirmationId(14);
-                    Realms.setScreen(daf3);
+            this.<Button>addButton(dni6);
+            final RealmsResetWorldScreen dke5;
+            final int slot;
+            this.<Button>addButton(new Button(this.getFramePositionX(integer4), RealmsScreen.row(10), 80, 20, new TranslatableComponent("mco.brokenworld.reset"), dni -> {
+                dke5 = new RealmsResetWorldScreen(this, this.serverData, this::doSwitchOrReset, () -> {
+                    this.minecraft.setScreen(this);
+                    this.doSwitchOrReset();
+                    return;
+                });
+                if (slot != this.serverData.activeSlot || this.serverData.worldType == RealmsServer.WorldType.MINIGAME) {
+                    dke5.setSlot(slot);
                 }
-            });
+                this.minecraft.setScreen(dke5);
+            }));
         }
     }
     
@@ -114,34 +148,33 @@ public class RealmsBrokenWorldScreen extends RealmsScreen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
-        this.drawCenteredString(this.title, this.width() / 2, 17, 16777215);
-        final String[] arr5 = this.message.split("\\\\n");
-        for (int integer3 = 0; integer3 < arr5.length; ++integer3) {
-            this.drawCenteredString(arr5[integer3], this.width() / 2, RealmsConstants.row(-1) + 3 + integer3 * 12, 10526880);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.header, this.width / 2, 17, 16777215);
+        for (int integer4 = 0; integer4 < this.message.length; ++integer4) {
+            this.drawCenteredString(dhl, this.font, this.message[integer4], this.width / 2, RealmsScreen.row(-1) + 3 + integer4 * 12, 10526880);
         }
         if (this.serverData == null) {
             return;
         }
         for (final Map.Entry<Integer, RealmsWorldOptions> entry7 : this.serverData.slots.entrySet()) {
             if (entry7.getValue().templateImage != null && entry7.getValue().templateId != -1L) {
-                this.drawSlotFrame(this.getFramePositionX(entry7.getKey()), RealmsConstants.row(1) + 5, integer1, integer2, this.serverData.activeSlot == entry7.getKey() && !this.isMinigame(), entry7.getValue().getSlotName(entry7.getKey()), entry7.getKey(), entry7.getValue().templateId, entry7.getValue().templateImage, entry7.getValue().empty);
+                this.drawSlotFrame(dhl, this.getFramePositionX(entry7.getKey()), RealmsScreen.row(1) + 5, integer2, integer3, this.serverData.activeSlot == entry7.getKey() && !this.isMinigame(), entry7.getValue().getSlotName(entry7.getKey()), entry7.getKey(), entry7.getValue().templateId, entry7.getValue().templateImage, entry7.getValue().empty);
             }
             else {
-                this.drawSlotFrame(this.getFramePositionX(entry7.getKey()), RealmsConstants.row(1) + 5, integer1, integer2, this.serverData.activeSlot == entry7.getKey() && !this.isMinigame(), entry7.getValue().getSlotName(entry7.getKey()), entry7.getKey(), -1L, null, entry7.getValue().empty);
+                this.drawSlotFrame(dhl, this.getFramePositionX(entry7.getKey()), RealmsScreen.row(1) + 5, integer2, integer3, this.serverData.activeSlot == entry7.getKey() && !this.isMinigame(), entry7.getValue().getSlotName(entry7.getKey()), entry7.getKey(), -1L, null, entry7.getValue().empty);
             }
         }
     }
     
     private int getFramePositionX(final int integer) {
-        return this.left_x + (integer - 1) * 110;
+        return this.leftX + (integer - 1) * 110;
     }
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
@@ -154,172 +187,114 @@ public class RealmsBrokenWorldScreen extends RealmsScreen {
     }
     
     private void backButtonClicked() {
-        Realms.setScreen(this.lastScreen);
+        this.minecraft.setScreen(this.lastScreen);
     }
     
     private void fetchServerData(final long long1) {
-        final RealmsClient cyy4;
+        final RealmsClient dia4;
         new Thread(() -> {
-            cyy4 = RealmsClient.createRealmsClient();
+            dia4 = RealmsClient.create();
             try {
-                this.serverData = cyy4.getOwnWorld(long1);
+                this.serverData = dia4.getOwnWorld(long1);
                 this.addButtons();
             }
-            catch (RealmsServiceException czg5) {
+            catch (RealmsServiceException djh5) {
                 RealmsBrokenWorldScreen.LOGGER.error("Couldn't get own world");
-                Realms.setScreen(new RealmsGenericErrorScreen(czg5.getMessage(), this.lastScreen));
-            }
-            catch (IOException iOException5) {
-                RealmsBrokenWorldScreen.LOGGER.error("Couldn't parse response getting own world");
+                this.minecraft.setScreen(new RealmsGenericErrorScreen(Component.nullToEmpty(djh5.getMessage()), this.lastScreen));
             }
         }).start();
     }
     
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-        if (!boolean1) {
-            Realms.setScreen(this);
-            return;
-        }
-        if (integer == 13 || integer == 14) {
-            final RealmsClient cyy2;
-            RealmsTasks.OpenServerTask c3;
-            RealmsLongRunningMcoTaskScreen czz4;
-            new Thread(() -> {
-                cyy2 = RealmsClient.createRealmsClient();
-                if (this.serverData.state.equals(RealmsServer.State.CLOSED)) {
-                    c3 = new RealmsTasks.OpenServerTask(this.serverData, this, this.lastScreen, true);
-                    czz4 = new RealmsLongRunningMcoTaskScreen(this, c3);
-                    czz4.start();
-                    Realms.setScreen(czz4);
+    public void doSwitchOrReset() {
+        final RealmsClient dia2;
+        Minecraft minecraft;
+        final RealmsLongRunningMcoTaskScreen screen;
+        new Thread(() -> {
+            dia2 = RealmsClient.create();
+            if (this.serverData.state == RealmsServer.State.CLOSED) {
+                this.minecraft.execute(() -> {
+                    minecraft = this.minecraft;
+                    new RealmsLongRunningMcoTaskScreen(this, new OpenServerTask(this.serverData, this, this.mainScreen, true));
+                    minecraft.setScreen(screen);
+                });
+            }
+            else {
+                try {
+                    this.mainScreen.newScreen().play(dia2.getOwnWorld(this.serverId), this);
                 }
-                else {
-                    try {
-                        this.mainScreen.newScreen().play(cyy2.getOwnWorld(this.serverId), this);
-                    }
-                    catch (RealmsServiceException czg3) {
-                        RealmsBrokenWorldScreen.LOGGER.error("Couldn't get own world");
-                        Realms.setScreen(this.lastScreen);
-                    }
-                    catch (IOException iOException3) {
-                        RealmsBrokenWorldScreen.LOGGER.error("Couldn't parse response getting own world");
-                        Realms.setScreen(this.lastScreen);
-                    }
+                catch (RealmsServiceException djh3) {
+                    RealmsBrokenWorldScreen.LOGGER.error("Couldn't get own world");
+                    this.minecraft.execute(() -> this.minecraft.setScreen(this.lastScreen));
                 }
-            }).start();
-        }
-        else if (RealmsBrokenWorldScreen.downloadButtonIds.contains(integer)) {
-            this.downloadWorld(RealmsBrokenWorldScreen.downloadButtonIds.indexOf(integer) + 1);
-        }
-        else if (RealmsBrokenWorldScreen.downloadConfirmationIds.contains(integer)) {
-            this.slotsThatHasBeenDownloaded.add(RealmsBrokenWorldScreen.downloadConfirmationIds.indexOf(integer) + 1);
-            this.childrenClear();
-            this.addButtons();
-        }
+            }
+        }).start();
     }
     
     private void downloadWorld(final int integer) {
-        final RealmsClient cyy3 = RealmsClient.createRealmsClient();
+        final RealmsClient dia3 = RealmsClient.create();
         try {
-            final WorldDownload worldDownload4 = cyy3.download(this.serverData.id, integer);
-            final RealmsDownloadLatestWorldScreen czv5 = new RealmsDownloadLatestWorldScreen(this, worldDownload4, this.serverData.name + " (" + this.serverData.slots.get(integer).getSlotName(integer) + ")");
-            czv5.setConfirmationId(RealmsBrokenWorldScreen.downloadConfirmationIds.get(integer - 1));
-            Realms.setScreen(czv5);
+            final WorldDownload djc4 = dia3.download(this.serverData.id, integer);
+            final RealmsDownloadLatestWorldScreen dju5 = new RealmsDownloadLatestWorldScreen(this, djc4, this.serverData.getWorldName(integer), boolean2 -> {
+                if (boolean2) {
+                    this.slotsThatHasBeenDownloaded.add(integer);
+                    this.children.clear();
+                    this.addButtons();
+                }
+                else {
+                    this.minecraft.setScreen(this);
+                }
+            });
+            this.minecraft.setScreen(dju5);
         }
-        catch (RealmsServiceException czg4) {
+        catch (RealmsServiceException djh4) {
             RealmsBrokenWorldScreen.LOGGER.error("Couldn't download world data");
-            Realms.setScreen(new RealmsGenericErrorScreen(czg4, this));
+            this.minecraft.setScreen(new RealmsGenericErrorScreen(djh4, this));
         }
     }
     
     private boolean isMinigame() {
-        return this.serverData != null && this.serverData.worldType.equals(RealmsServer.WorldType.MINIGAME);
+        return this.serverData != null && this.serverData.worldType == RealmsServer.WorldType.MINIGAME;
     }
     
-    private void drawSlotFrame(final int integer1, final int integer2, final int integer3, final int integer4, final boolean boolean5, final String string6, final int integer7, final long long8, final String string9, final boolean boolean10) {
-        if (boolean10) {
-            RealmsScreen.bind("realms:textures/gui/realms/empty_frame.png");
+    private void drawSlotFrame(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6, final String string7, final int integer8, final long long9, final String string10, final boolean boolean11) {
+        if (boolean11) {
+            this.minecraft.getTextureManager().bind(RealmsWorldSlotButton.EMPTY_SLOT_LOCATION);
         }
-        else if (string9 != null && long8 != -1L) {
-            RealmsTextureManager.bindWorldTemplate(String.valueOf(long8), string9);
+        else if (string10 != null && long9 != -1L) {
+            RealmsTextureManager.bindWorldTemplate(String.valueOf(long9), string10);
         }
-        else if (integer7 == 1) {
-            RealmsScreen.bind("textures/gui/title/background/panorama_0.png");
+        else if (integer8 == 1) {
+            this.minecraft.getTextureManager().bind(RealmsWorldSlotButton.DEFAULT_WORLD_SLOT_1);
         }
-        else if (integer7 == 2) {
-            RealmsScreen.bind("textures/gui/title/background/panorama_2.png");
+        else if (integer8 == 2) {
+            this.minecraft.getTextureManager().bind(RealmsWorldSlotButton.DEFAULT_WORLD_SLOT_2);
         }
-        else if (integer7 == 3) {
-            RealmsScreen.bind("textures/gui/title/background/panorama_3.png");
+        else if (integer8 == 3) {
+            this.minecraft.getTextureManager().bind(RealmsWorldSlotButton.DEFAULT_WORLD_SLOT_3);
         }
         else {
             RealmsTextureManager.bindWorldTemplate(String.valueOf(this.serverData.minigameId), this.serverData.minigameImage);
         }
-        if (!boolean5) {
+        if (!boolean6) {
             RenderSystem.color4f(0.56f, 0.56f, 0.56f, 1.0f);
         }
-        else if (boolean5) {
-            final float float13 = 0.9f + 0.1f * RealmsMth.cos(this.animTick * 0.2f);
-            RenderSystem.color4f(float13, float13, float13, 1.0f);
+        else if (boolean6) {
+            final float float14 = 0.9f + 0.1f * Mth.cos(this.animTick * 0.2f);
+            RenderSystem.color4f(float14, float14, float14, 1.0f);
         }
-        RealmsScreen.blit(integer1 + 3, integer2 + 3, 0.0f, 0.0f, 74, 74, 74, 74);
-        RealmsScreen.bind("realms:textures/gui/realms/slot_frame.png");
-        if (boolean5) {
+        GuiComponent.blit(dhl, integer2 + 3, integer3 + 3, 0.0f, 0.0f, 74, 74, 74, 74);
+        this.minecraft.getTextureManager().bind(RealmsWorldSlotButton.SLOT_FRAME_LOCATION);
+        if (boolean6) {
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         }
         else {
             RenderSystem.color4f(0.56f, 0.56f, 0.56f, 1.0f);
         }
-        RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 80, 80, 80, 80);
-        this.drawCenteredString(string6, integer1 + 40, integer2 + 66, 16777215);
-    }
-    
-    private void switchSlot(final int integer) {
-        final RealmsTasks.SwitchSlotTask i3 = new RealmsTasks.SwitchSlotTask(this.serverData.id, integer, this, 13);
-        final RealmsLongRunningMcoTaskScreen czz4 = new RealmsLongRunningMcoTaskScreen(this.lastScreen, i3);
-        czz4.start();
-        Realms.setScreen(czz4);
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 80, 80, 80, 80);
+        this.drawCenteredString(dhl, this.font, string7, integer2 + 40, integer3 + 66, 16777215);
     }
     
     static {
         LOGGER = LogManager.getLogger();
-        playButtonIds = Arrays.<Integer>asList(1, 2, 3);
-        resetButtonIds = Arrays.<Integer>asList(4, 5, 6);
-        downloadButtonIds = Arrays.<Integer>asList(7, 8, 9);
-        downloadConfirmationIds = Arrays.<Integer>asList(10, 11, 12);
-    }
-    
-    class PlayButton extends RealmsButton {
-        public PlayButton(final int integer2, final int integer3, final String string) {
-            super(integer2, integer3, RealmsConstants.row(8), 80, 20, string);
-        }
-        
-        @Override
-        public void onPress() {
-            final int integer2 = RealmsBrokenWorldScreen.playButtonIds.indexOf(this.id()) + 1;
-            if (RealmsBrokenWorldScreen.this.serverData.slots.get(integer2).empty) {
-                final RealmsResetWorldScreen daf3 = new RealmsResetWorldScreen(RealmsBrokenWorldScreen.this, RealmsBrokenWorldScreen.this.serverData, RealmsBrokenWorldScreen.this, RealmsScreen.getLocalizedString("mco.configure.world.switch.slot"), RealmsScreen.getLocalizedString("mco.configure.world.switch.slot.subtitle"), 10526880, RealmsScreen.getLocalizedString("gui.cancel"));
-                daf3.setSlot(integer2);
-                daf3.setResetTitle(RealmsScreen.getLocalizedString("mco.create.world.reset.title"));
-                daf3.setConfirmationId(14);
-                Realms.setScreen(daf3);
-            }
-            else {
-                RealmsBrokenWorldScreen.this.switchSlot(integer2);
-            }
-        }
-    }
-    
-    class DownloadButton extends RealmsButton {
-        public DownloadButton(final int integer2, final int integer3, final String string) {
-            super(integer2, integer3, RealmsConstants.row(8), 80, 20, string);
-        }
-        
-        @Override
-        public void onPress() {
-            final String string2 = RealmsScreen.getLocalizedString("mco.configure.world.restore.download.question.line1");
-            final String string3 = RealmsScreen.getLocalizedString("mco.configure.world.restore.download.question.line2");
-            Realms.setScreen(new RealmsLongConfirmationScreen(RealmsBrokenWorldScreen.this, RealmsLongConfirmationScreen.Type.Info, string2, string3, true, this.id()));
-        }
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java
index ed022b7..2842877 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java
@@ -1,46 +1,43 @@
 package com.mojang.realmsclient.gui.screens;
 
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.Realms;
-import net.minecraft.realms.RealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsClientOutdatedScreen extends RealmsScreen {
-    private final RealmsScreen lastScreen;
+    private final Screen lastScreen;
     private final boolean outdated;
     
-    public RealmsClientOutdatedScreen(final RealmsScreen realmsScreen, final boolean boolean2) {
-        this.lastScreen = realmsScreen;
+    public RealmsClientOutdatedScreen(final Screen dqs, final boolean boolean2) {
+        this.lastScreen = dqs;
         this.outdated = boolean2;
     }
     
-    @Override
     public void init() {
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 - 100, RealmsConstants.row(12), RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsClientOutdatedScreen.this.lastScreen);
-            }
-        });
+        this.<Button>addButton(new Button(this.width / 2 - 100, RealmsScreen.row(12), 200, 20, CommonComponents.GUI_BACK, dni -> this.minecraft.setScreen(this.lastScreen)));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        final String string5 = RealmsScreen.getLocalizedString(this.outdated ? "mco.client.outdated.title" : "mco.client.incompatible.title");
-        this.drawCenteredString(string5, this.width() / 2, RealmsConstants.row(3), 16711680);
-        for (int integer3 = this.outdated ? 2 : 3, integer4 = 0; integer4 < integer3; ++integer4) {
-            final String string6 = RealmsScreen.getLocalizedString((this.outdated ? "mco.client.outdated.msg.line" : "mco.client.incompatible.msg.line") + (integer4 + 1));
-            this.drawCenteredString(string6, this.width() / 2, RealmsConstants.row(5) + integer4 * 12, 16777215);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        final Component mr6 = new TranslatableComponent(this.outdated ? "mco.client.outdated.title" : "mco.client.incompatible.title");
+        this.drawCenteredString(dhl, this.font, mr6, this.width / 2, RealmsScreen.row(3), 16711680);
+        for (int integer4 = this.outdated ? 2 : 3, integer5 = 0; integer5 < integer4; ++integer5) {
+            final String string9 = (this.outdated ? "mco.client.outdated.msg.line" : "mco.client.incompatible.msg.line") + (integer5 + 1);
+            this.drawCenteredString(dhl, this.font, new TranslatableComponent(string9), this.width / 2, RealmsScreen.row(5) + integer5 * 12, 16777215);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 257 || integer1 == 335 || integer1 == 256) {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java
index 397e7b2..7654fbe 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java
@@ -1,121 +1,93 @@
 package com.mojang.realmsclient.gui.screens;
 
 import org.apache.logging.log4j.LogManager;
-import com.mojang.realmsclient.gui.LongRunningTask;
-import com.mojang.realmsclient.util.RealmsTasks;
-import java.io.UnsupportedEncodingException;
+import com.mojang.realmsclient.util.task.SwitchSlotTask;
+import com.mojang.realmsclient.util.task.SwitchMinigameTask;
+import com.mojang.realmsclient.dto.WorldTemplate;
+import com.mojang.realmsclient.util.task.CloseServerTask;
+import com.mojang.realmsclient.util.task.LongRunningTask;
+import com.mojang.realmsclient.util.task.OpenServerTask;
+import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
-import java.io.IOException;
+import net.minecraft.network.chat.FormattedText;
 import com.mojang.realmsclient.exception.RealmsServiceException;
 import com.mojang.realmsclient.client.RealmsClient;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.realmsclient.gui.RealmsWorldSlotButton;
+import net.minecraft.network.chat.CommonComponents;
 import com.mojang.realmsclient.dto.RealmsWorldOptions;
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.Realms;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.realms.RealmsScreen;
-import com.mojang.realmsclient.gui.RealmsConstants;
-import net.minecraft.realms.RealmsButton;
+import net.minecraft.client.gui.components.Button;
 import javax.annotation.Nullable;
 import com.mojang.realmsclient.dto.RealmsServer;
 import com.mojang.realmsclient.RealmsMainScreen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
-import com.mojang.realmsclient.gui.RealmsWorldSlotButton;
-import com.mojang.realmsclient.dto.WorldTemplate;
 
-public class RealmsConfigureWorldScreen extends RealmsScreenWithCallback<WorldTemplate> implements RealmsWorldSlotButton.Listener {
+public class RealmsConfigureWorldScreen extends RealmsScreenWithCallback {
     private static final Logger LOGGER;
-    private String toolTip;
+    private static final ResourceLocation ON_ICON_LOCATION;
+    private static final ResourceLocation OFF_ICON_LOCATION;
+    private static final ResourceLocation EXPIRED_ICON_LOCATION;
+    private static final ResourceLocation EXPIRES_SOON_ICON_LOCATION;
+    private Component toolTip;
     private final RealmsMainScreen lastScreen;
     @Nullable
     private RealmsServer serverData;
     private final long serverId;
-    private int left_x;
-    private int right_x;
-    private final int default_button_width = 80;
-    private final int default_button_offset = 5;
-    private RealmsButton playersButton;
-    private RealmsButton settingsButton;
-    private RealmsButton subscriptionButton;
-    private RealmsButton optionsButton;
-    private RealmsButton backupButton;
-    private RealmsButton resetWorldButton;
-    private RealmsButton switchMinigameButton;
+    private int leftX;
+    private int rightX;
+    private Button playersButton;
+    private Button settingsButton;
+    private Button subscriptionButton;
+    private Button optionsButton;
+    private Button backupButton;
+    private Button resetWorldButton;
+    private Button switchMinigameButton;
     private boolean stateChanged;
     private int animTick;
     private int clicks;
     
-    public RealmsConfigureWorldScreen(final RealmsMainScreen cyu, final long long2) {
-        this.lastScreen = cyu;
+    public RealmsConfigureWorldScreen(final RealmsMainScreen dhv, final long long2) {
+        this.lastScreen = dhv;
         this.serverId = long2;
     }
     
-    @Override
     public void init() {
         if (this.serverData == null) {
             this.fetchServerData(this.serverId);
         }
-        this.left_x = this.width() / 2 - 187;
-        this.right_x = this.width() / 2 + 190;
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        this.buttonsAdd(this.playersButton = new RealmsButton(2, this.centerButton(0, 3), RealmsConstants.row(0), 100, 20, RealmsScreen.getLocalizedString("mco.configure.world.buttons.players")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsPlayerScreen(RealmsConfigureWorldScreen.this, RealmsConfigureWorldScreen.this.serverData));
-            }
-        });
-        this.buttonsAdd(this.settingsButton = new RealmsButton(3, this.centerButton(1, 3), RealmsConstants.row(0), 100, 20, RealmsScreen.getLocalizedString("mco.configure.world.buttons.settings")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsSettingsScreen(RealmsConfigureWorldScreen.this, RealmsConfigureWorldScreen.this.serverData.clone()));
-            }
-        });
-        this.buttonsAdd(this.subscriptionButton = new RealmsButton(4, this.centerButton(2, 3), RealmsConstants.row(0), 100, 20, RealmsScreen.getLocalizedString("mco.configure.world.buttons.subscription")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsSubscriptionInfoScreen(RealmsConfigureWorldScreen.this, RealmsConfigureWorldScreen.this.serverData.clone(), RealmsConfigureWorldScreen.this.lastScreen));
-            }
-        });
+        this.leftX = this.width / 2 - 187;
+        this.rightX = this.width / 2 + 190;
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        this.playersButton = this.<Button>addButton(new Button(this.centerButton(0, 3), RealmsScreen.row(0), 100, 20, new TranslatableComponent("mco.configure.world.buttons.players"), dni -> this.minecraft.setScreen(new RealmsPlayerScreen(this, this.serverData))));
+        this.settingsButton = this.<Button>addButton(new Button(this.centerButton(1, 3), RealmsScreen.row(0), 100, 20, new TranslatableComponent("mco.configure.world.buttons.settings"), dni -> this.minecraft.setScreen(new RealmsSettingsScreen(this, this.serverData.clone()))));
+        this.subscriptionButton = this.<Button>addButton(new Button(this.centerButton(2, 3), RealmsScreen.row(0), 100, 20, new TranslatableComponent("mco.configure.world.buttons.subscription"), dni -> this.minecraft.setScreen(new RealmsSubscriptionInfoScreen(this, this.serverData.clone(), this.lastScreen))));
         for (int integer2 = 1; integer2 < 5; ++integer2) {
             this.addSlotButton(integer2);
         }
-        this.buttonsAdd(this.switchMinigameButton = new RealmsButton(8, this.leftButton(0), RealmsConstants.row(13) - 5, 100, 20, RealmsScreen.getLocalizedString("mco.configure.world.buttons.switchminigame")) {
-            @Override
-            public void onPress() {
-                final RealmsSelectWorldTemplateScreen daj2 = new RealmsSelectWorldTemplateScreen(RealmsConfigureWorldScreen.this, RealmsServer.WorldType.MINIGAME);
-                daj2.setTitle(RealmsScreen.getLocalizedString("mco.template.title.minigame"));
-                Realms.setScreen(daj2);
-            }
-        });
-        this.buttonsAdd(this.optionsButton = new RealmsButton(5, this.leftButton(0), RealmsConstants.row(13) - 5, 90, 20, RealmsScreen.getLocalizedString("mco.configure.world.buttons.options")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsSlotOptionsScreen(RealmsConfigureWorldScreen.this, RealmsConfigureWorldScreen.this.serverData.slots.get(RealmsConfigureWorldScreen.this.serverData.activeSlot).clone(), RealmsConfigureWorldScreen.this.serverData.worldType, RealmsConfigureWorldScreen.this.serverData.activeSlot));
-            }
-        });
-        this.buttonsAdd(this.backupButton = new RealmsButton(6, this.leftButton(1), RealmsConstants.row(13) - 5, 90, 20, RealmsScreen.getLocalizedString("mco.configure.world.backup")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsBackupScreen(RealmsConfigureWorldScreen.this, RealmsConfigureWorldScreen.this.serverData.clone(), RealmsConfigureWorldScreen.this.serverData.activeSlot));
-            }
-        });
-        this.buttonsAdd(this.resetWorldButton = new RealmsButton(7, this.leftButton(2), RealmsConstants.row(13) - 5, 90, 20, RealmsScreen.getLocalizedString("mco.configure.world.buttons.resetworld")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsResetWorldScreen(RealmsConfigureWorldScreen.this, RealmsConfigureWorldScreen.this.serverData.clone(), RealmsConfigureWorldScreen.this.getNewScreen()));
-            }
-        });
-        this.buttonsAdd(new RealmsButton(0, this.right_x - 80 + 8, RealmsConstants.row(13) - 5, 70, 20, RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                RealmsConfigureWorldScreen.this.backButtonClicked();
-            }
-        });
-        this.backupButton.active(true);
+        final RealmsSelectWorldTemplateScreen dkh3;
+        this.switchMinigameButton = this.<Button>addButton(new Button(this.leftButton(0), RealmsScreen.row(13) - 5, 100, 20, new TranslatableComponent("mco.configure.world.buttons.switchminigame"), dni -> {
+            dkh3 = new RealmsSelectWorldTemplateScreen(this, RealmsServer.WorldType.MINIGAME);
+            dkh3.setTitle(new TranslatableComponent("mco.template.title.minigame"));
+            this.minecraft.setScreen(dkh3);
+            return;
+        }));
+        this.optionsButton = this.<Button>addButton(new Button(this.leftButton(0), RealmsScreen.row(13) - 5, 90, 20, new TranslatableComponent("mco.configure.world.buttons.options"), dni -> this.minecraft.setScreen(new RealmsSlotOptionsScreen(this, this.serverData.slots.get(this.serverData.activeSlot).clone(), this.serverData.worldType, this.serverData.activeSlot))));
+        this.backupButton = this.<Button>addButton(new Button(this.leftButton(1), RealmsScreen.row(13) - 5, 90, 20, new TranslatableComponent("mco.configure.world.backup"), dni -> this.minecraft.setScreen(new RealmsBackupScreen(this, this.serverData.clone(), this.serverData.activeSlot))));
+        this.resetWorldButton = this.<Button>addButton(new Button(this.leftButton(2), RealmsScreen.row(13) - 5, 90, 20, new TranslatableComponent("mco.configure.world.buttons.resetworld"), dni -> this.minecraft.setScreen(new RealmsResetWorldScreen(this, this.serverData.clone(), () -> this.minecraft.setScreen(this.getNewScreen()), () -> this.minecraft.setScreen(this.getNewScreen())))));
+        this.<Button>addButton(new Button(this.rightX - 80 + 8, RealmsScreen.row(13) - 5, 70, 20, CommonComponents.GUI_BACK, dni -> this.backButtonClicked()));
+        this.backupButton.active = true;
         if (this.serverData == null) {
             this.hideMinigameButtons();
             this.hideRegularButtons();
-            this.playersButton.active(false);
-            this.settingsButton.active(false);
-            this.subscriptionButton.active(false);
+            this.playersButton.active = false;
+            this.settingsButton.active = false;
+            this.subscriptionButton.active = false;
         }
         else {
             this.disableButtons();
@@ -130,23 +102,57 @@ public class RealmsConfigureWorldScreen extends RealmsScreenWithCallback<WorldTe
     
     private void addSlotButton(final int integer) {
         final int integer2 = this.frame(integer);
-        final int integer3 = RealmsConstants.row(5) + 5;
-        final int integer4 = 100 + integer;
-        final RealmsWorldSlotButton czm6 = new RealmsWorldSlotButton(integer2, integer3, 80, 80, () -> this.serverData, string -> this.toolTip = string, integer4, integer, this);
-        this.getProxy().buttonsAdd(czm6);
+        final int integer3 = RealmsScreen.row(5) + 5;
+        final RealmsWorldSlotButton.State b4;
+        final IllegalStateException ex;
+        final RealmsWorldSlotButton djl5 = new RealmsWorldSlotButton(integer2, integer3, 80, 80, () -> this.serverData, mr -> this.toolTip = mr, integer, dni -> {
+            b4 = dni.getState();
+            if (b4 != null) {
+                switch (b4.action) {
+                    case NOTHING: {
+                        break;
+                    }
+                    case JOIN: {
+                        this.joinRealm(this.serverData);
+                        break;
+                    }
+                    case SWITCH_SLOT: {
+                        if (b4.minigame) {
+                            this.switchToMinigame();
+                            break;
+                        }
+                        else if (b4.empty) {
+                            this.switchToEmptySlot(integer, this.serverData);
+                            break;
+                        }
+                        else {
+                            this.switchToFullSlot(integer, this.serverData);
+                            break;
+                        }
+                        break;
+                    }
+                    default: {
+                        new IllegalStateException("Unknown action " + b4.action);
+                        throw ex;
+                    }
+                }
+            }
+            return;
+        });
+        this.<RealmsWorldSlotButton>addButton(djl5);
     }
     
     private int leftButton(final int integer) {
-        return this.left_x + integer * 95;
+        return this.leftX + integer * 95;
     }
     
     private int centerButton(final int integer1, final int integer2) {
-        return this.width() / 2 - (integer2 * 105 - 5) / 2 + integer1 * 105;
+        return this.width / 2 - (integer2 * 105 - 5) / 2 + integer1 * 105;
     }
     
     @Override
     public void tick() {
-        this.tickButtons();
+        super.tick();
         ++this.animTick;
         --this.clicks;
         if (this.clicks < 0) {
@@ -155,38 +161,38 @@ public class RealmsConfigureWorldScreen extends RealmsScreenWithCallback<WorldTe
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.toolTip = null;
-        this.renderBackground();
-        this.drawCenteredString(RealmsScreen.getLocalizedString("mco.configure.worlds.title"), this.width() / 2, RealmsConstants.row(4), 16777215);
-        super.render(integer1, integer2, float3);
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, I18n.get("mco.configure.worlds.title"), this.width / 2, RealmsScreen.row(4), 16777215);
+        super.render(dhl, integer2, integer3, float4);
         if (this.serverData == null) {
-            this.drawCenteredString(RealmsScreen.getLocalizedString("mco.configure.world.title"), this.width() / 2, 17, 16777215);
+            this.drawCenteredString(dhl, this.font, I18n.get("mco.configure.world.title"), this.width / 2, 17, 16777215);
             return;
         }
-        final String string5 = this.serverData.getName();
-        final int integer3 = this.fontWidth(string5);
-        final int integer4 = (this.serverData.state == RealmsServer.State.CLOSED) ? 10526880 : 8388479;
-        final int integer5 = this.fontWidth(RealmsScreen.getLocalizedString("mco.configure.world.title"));
-        this.drawCenteredString(RealmsScreen.getLocalizedString("mco.configure.world.title"), this.width() / 2, 12, 16777215);
-        this.drawCenteredString(string5, this.width() / 2, 24, integer4);
-        final int integer6 = Math.min(this.centerButton(2, 3) + 80 - 11, this.width() / 2 + integer3 / 2 + integer5 / 2 + 10);
-        this.drawServerStatus(integer6, 7, integer1, integer2);
+        final String string6 = this.serverData.getName();
+        final int integer4 = this.font.width(string6);
+        final int integer5 = (this.serverData.state == RealmsServer.State.CLOSED) ? 10526880 : 8388479;
+        final int integer6 = this.font.width(I18n.get("mco.configure.world.title"));
+        this.drawCenteredString(dhl, this.font, I18n.get("mco.configure.world.title"), this.width / 2, 12, 16777215);
+        this.drawCenteredString(dhl, this.font, string6, this.width / 2, 24, integer5);
+        final int integer7 = Math.min(this.centerButton(2, 3) + 80 - 11, this.width / 2 + integer4 / 2 + integer6 / 2 + 10);
+        this.drawServerStatus(dhl, integer7, 7, integer2, integer3);
         if (this.isMinigame()) {
-            this.drawString(RealmsScreen.getLocalizedString("mco.configure.current.minigame") + ": " + this.serverData.getMinigameName(), this.left_x + 80 + 20 + 10, RealmsConstants.row(13), 16777215);
+            this.font.draw(dhl, I18n.get("mco.configure.current.minigame") + ": " + this.serverData.getMinigameName(), (float)(this.leftX + 80 + 20 + 10), (float)RealmsScreen.row(13), 16777215);
         }
         if (this.toolTip != null) {
-            this.renderMousehoverTooltip(this.toolTip, integer1, integer2);
+            this.renderMousehoverTooltip(dhl, this.toolTip, integer2, integer3);
         }
     }
     
     private int frame(final int integer) {
-        return this.left_x + (integer - 1) * 98;
+        return this.leftX + (integer - 1) * 98;
     }
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
@@ -202,211 +208,165 @@ public class RealmsConfigureWorldScreen extends RealmsScreenWithCallback<WorldTe
         if (this.stateChanged) {
             this.lastScreen.removeSelection();
         }
-        Realms.setScreen(this.lastScreen);
+        this.minecraft.setScreen(this.lastScreen);
     }
     
     private void fetchServerData(final long long1) {
-        final RealmsClient cyy4;
+        final RealmsClient dia4;
         new Thread(() -> {
-            cyy4 = RealmsClient.createRealmsClient();
+            dia4 = RealmsClient.create();
             try {
-                this.serverData = cyy4.getOwnWorld(long1);
+                this.serverData = dia4.getOwnWorld(long1);
                 this.disableButtons();
                 if (this.isMinigame()) {
-                    this.showMinigameButtons();
+                    this.show(this.switchMinigameButton);
                 }
                 else {
-                    this.showRegularButtons();
+                    this.show(this.optionsButton);
+                    this.show(this.backupButton);
+                    this.show(this.resetWorldButton);
                 }
             }
-            catch (RealmsServiceException czg5) {
+            catch (RealmsServiceException djh5) {
                 RealmsConfigureWorldScreen.LOGGER.error("Couldn't get own world");
-                Realms.setScreen(new RealmsGenericErrorScreen(czg5.getMessage(), this.lastScreen));
-            }
-            catch (IOException iOException5) {
-                RealmsConfigureWorldScreen.LOGGER.error("Couldn't parse response getting own world");
+                this.minecraft.execute(() -> this.minecraft.setScreen(new RealmsGenericErrorScreen(Component.nullToEmpty(djh5.getMessage()), this.lastScreen)));
             }
         }).start();
     }
     
     private void disableButtons() {
-        this.playersButton.active(!this.serverData.expired);
-        this.settingsButton.active(!this.serverData.expired);
-        this.subscriptionButton.active(true);
-        this.switchMinigameButton.active(!this.serverData.expired);
-        this.optionsButton.active(!this.serverData.expired);
-        this.resetWorldButton.active(!this.serverData.expired);
+        this.playersButton.active = !this.serverData.expired;
+        this.settingsButton.active = !this.serverData.expired;
+        this.subscriptionButton.active = true;
+        this.switchMinigameButton.active = !this.serverData.expired;
+        this.optionsButton.active = !this.serverData.expired;
+        this.resetWorldButton.active = !this.serverData.expired;
     }
     
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return super.mouseClicked(double1, double2, integer);
-    }
-    
-    private void joinRealm(final RealmsServer realmsServer) {
+    private void joinRealm(final RealmsServer dip) {
         if (this.serverData.state == RealmsServer.State.OPEN) {
-            this.lastScreen.play(realmsServer, new RealmsConfigureWorldScreen(this.lastScreen.newScreen(), this.serverId));
+            this.lastScreen.play(dip, new RealmsConfigureWorldScreen(this.lastScreen.newScreen(), this.serverId));
         }
         else {
             this.openTheWorld(true, new RealmsConfigureWorldScreen(this.lastScreen.newScreen(), this.serverId));
         }
     }
     
-    @Override
-    public void onSlotClick(final int integer, final RealmsWorldSlotButton.Action a, final boolean boolean3, final boolean boolean4) {
-        switch (a) {
-            case NOTHING: {
-                break;
-            }
-            case JOIN: {
-                this.joinRealm(this.serverData);
-                break;
-            }
-            case SWITCH_SLOT: {
-                if (boolean3) {
-                    this.switchToMinigame();
-                    break;
-                }
-                if (boolean4) {
-                    this.switchToEmptySlot(integer, this.serverData);
-                    break;
-                }
-                this.switchToFullSlot(integer, this.serverData);
-                break;
-            }
-            default: {
-                throw new IllegalStateException("Unknown action " + a);
-            }
-        }
-    }
-    
     private void switchToMinigame() {
-        final RealmsSelectWorldTemplateScreen daj2 = new RealmsSelectWorldTemplateScreen(this, RealmsServer.WorldType.MINIGAME);
-        daj2.setTitle(RealmsScreen.getLocalizedString("mco.template.title.minigame"));
-        daj2.setWarning(RealmsScreen.getLocalizedString("mco.minigame.world.info.line1") + "\\n" + RealmsScreen.getLocalizedString("mco.minigame.world.info.line2"));
-        Realms.setScreen(daj2);
+        final RealmsSelectWorldTemplateScreen dkh2 = new RealmsSelectWorldTemplateScreen(this, RealmsServer.WorldType.MINIGAME);
+        dkh2.setTitle(new TranslatableComponent("mco.template.title.minigame"));
+        dkh2.setWarning(new TranslatableComponent("mco.minigame.world.info.line1"), new TranslatableComponent("mco.minigame.world.info.line2"));
+        this.minecraft.setScreen(dkh2);
     }
     
-    private void switchToFullSlot(final int integer, final RealmsServer realmsServer) {
-        final String string4 = RealmsScreen.getLocalizedString("mco.configure.world.slot.switch.question.line1");
-        final String string5 = RealmsScreen.getLocalizedString("mco.configure.world.slot.switch.question.line2");
-        Realms.setScreen(new RealmsLongConfirmationScreen((boolean3, integer4) -> {
+    private void switchToFullSlot(final int integer, final RealmsServer dip) {
+        final Component mr4 = new TranslatableComponent("mco.configure.world.slot.switch.question.line1");
+        final Component mr5 = new TranslatableComponent("mco.configure.world.slot.switch.question.line2");
+        this.minecraft.setScreen(new RealmsLongConfirmationScreen(boolean3 -> {
             if (boolean3) {
-                this.switchSlot(realmsServer.id, integer);
+                this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(this.lastScreen, new SwitchSlotTask(dip.id, integer, () -> this.minecraft.setScreen(this.getNewScreen()))));
             }
             else {
-                Realms.setScreen(this);
+                this.minecraft.setScreen(this);
             }
-        }, RealmsLongConfirmationScreen.Type.Info, string4, string5, true, 9));
+        }, RealmsLongConfirmationScreen.Type.Info, mr4, mr5, true));
     }
     
-    private void switchToEmptySlot(final int integer, final RealmsServer realmsServer) {
-        final String string4 = RealmsScreen.getLocalizedString("mco.configure.world.slot.switch.question.line1");
-        final String string5 = RealmsScreen.getLocalizedString("mco.configure.world.slot.switch.question.line2");
-        RealmsResetWorldScreen daf6;
-        Realms.setScreen(new RealmsLongConfirmationScreen((boolean3, integer4) -> {
+    private void switchToEmptySlot(final int integer, final RealmsServer dip) {
+        final Component mr4 = new TranslatableComponent("mco.configure.world.slot.switch.question.line1");
+        final Component mr5 = new TranslatableComponent("mco.configure.world.slot.switch.question.line2");
+        this.minecraft.setScreen(new RealmsLongConfirmationScreen(boolean3 -> {
             if (boolean3) {
-                daf6 = new RealmsResetWorldScreen(this, realmsServer, this.getNewScreen(), RealmsScreen.getLocalizedString("mco.configure.world.switch.slot"), RealmsScreen.getLocalizedString("mco.configure.world.switch.slot.subtitle"), 10526880, RealmsScreen.getLocalizedString("gui.cancel"));
-                daf6.setSlot(integer);
-                daf6.setResetTitle(RealmsScreen.getLocalizedString("mco.create.world.reset.title"));
-                Realms.setScreen(daf6);
+                final RealmsResetWorldScreen dke5 = new RealmsResetWorldScreen(this, dip, new TranslatableComponent("mco.configure.world.switch.slot"), new TranslatableComponent("mco.configure.world.switch.slot.subtitle"), 10526880, CommonComponents.GUI_CANCEL, () -> this.minecraft.setScreen(this.getNewScreen()), () -> this.minecraft.setScreen(this.getNewScreen()));
+                dke5.setSlot(integer);
+                dke5.setResetTitle(I18n.get("mco.create.world.reset.title"));
+                this.minecraft.setScreen(dke5);
             }
             else {
-                Realms.setScreen(this);
+                this.minecraft.setScreen(this);
             }
-        }, RealmsLongConfirmationScreen.Type.Info, string4, string5, true, 10));
+        }, RealmsLongConfirmationScreen.Type.Info, mr4, mr5, true));
     }
     
-    protected void renderMousehoverTooltip(final String string, final int integer2, final int integer3) {
-        if (string == null) {
-            return;
+    protected void renderMousehoverTooltip(final PoseStack dhl, final Component mr, final int integer3, final int integer4) {
+        int integer5 = integer3 + 12;
+        final int integer6 = integer4 - 12;
+        final int integer7 = this.font.width(mr);
+        if (integer5 + integer7 + 3 > this.rightX) {
+            integer5 = integer5 - integer7 - 20;
         }
-        int integer4 = integer2 + 12;
-        final int integer5 = integer3 - 12;
-        final int integer6 = this.fontWidth(string);
-        if (integer4 + integer6 + 3 > this.right_x) {
-            integer4 = integer4 - integer6 - 20;
-        }
-        this.fillGradient(integer4 - 3, integer5 - 3, integer4 + integer6 + 3, integer5 + 8 + 3, -1073741824, -1073741824);
-        this.fontDrawShadow(string, integer4, integer5, 16777215);
+        this.fillGradient(dhl, integer5 - 3, integer6 - 3, integer5 + integer7 + 3, integer6 + 8 + 3, -1073741824, -1073741824);
+        this.font.drawShadow(dhl, mr, (float)integer5, (float)integer6, 16777215);
     }
     
-    private void drawServerStatus(final int integer1, final int integer2, final int integer3, final int integer4) {
+    private void drawServerStatus(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
         if (this.serverData.expired) {
-            this.drawExpired(integer1, integer2, integer3, integer4);
+            this.drawExpired(dhl, integer2, integer3, integer4, integer5);
         }
         else if (this.serverData.state == RealmsServer.State.CLOSED) {
-            this.drawClose(integer1, integer2, integer3, integer4);
+            this.drawClose(dhl, integer2, integer3, integer4, integer5);
         }
         else if (this.serverData.state == RealmsServer.State.OPEN) {
             if (this.serverData.daysLeft < 7) {
-                this.drawExpiring(integer1, integer2, integer3, integer4, this.serverData.daysLeft);
+                this.drawExpiring(dhl, integer2, integer3, integer4, integer5, this.serverData.daysLeft);
             }
             else {
-                this.drawOpen(integer1, integer2, integer3, integer4);
+                this.drawOpen(dhl, integer2, integer3, integer4, integer5);
             }
         }
     }
     
-    private void drawExpired(final int integer1, final int integer2, final int integer3, final int integer4) {
-        RealmsScreen.bind("realms:textures/gui/realms/expired_icon.png");
+    private void drawExpired(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        this.minecraft.getTextureManager().bind(RealmsConfigureWorldScreen.EXPIRED_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 10, 28, 10, 28);
-        RenderSystem.popMatrix();
-        if (integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 27) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.expired");
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 10, 28, 10, 28);
+        if (integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 27) {
+            this.toolTip = new TranslatableComponent("mco.selectServer.expired");
         }
     }
     
-    private void drawExpiring(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-        RealmsScreen.bind("realms:textures/gui/realms/expires_soon_icon.png");
+    private void drawExpiring(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        this.minecraft.getTextureManager().bind(RealmsConfigureWorldScreen.EXPIRES_SOON_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
         if (this.animTick % 20 < 10) {
-            RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 10, 28, 20, 28);
+            GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 10, 28, 20, 28);
         }
         else {
-            RealmsScreen.blit(integer1, integer2, 10.0f, 0.0f, 10, 28, 20, 28);
+            GuiComponent.blit(dhl, integer2, integer3, 10.0f, 0.0f, 10, 28, 20, 28);
         }
-        RenderSystem.popMatrix();
-        if (integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 27) {
-            if (integer5 <= 0) {
-                this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.expires.soon");
+        if (integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 27) {
+            if (integer6 <= 0) {
+                this.toolTip = new TranslatableComponent("mco.selectServer.expires.soon");
             }
-            else if (integer5 == 1) {
-                this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.expires.day");
+            else if (integer6 == 1) {
+                this.toolTip = new TranslatableComponent("mco.selectServer.expires.day");
             }
             else {
-                this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.expires.days", integer5);
+                this.toolTip = new TranslatableComponent("mco.selectServer.expires.days", new Object[] { integer6 });
             }
         }
     }
     
-    private void drawOpen(final int integer1, final int integer2, final int integer3, final int integer4) {
-        RealmsScreen.bind("realms:textures/gui/realms/on_icon.png");
+    private void drawOpen(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        this.minecraft.getTextureManager().bind(RealmsConfigureWorldScreen.ON_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 10, 28, 10, 28);
-        RenderSystem.popMatrix();
-        if (integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 27) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.open");
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 10, 28, 10, 28);
+        if (integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 27) {
+            this.toolTip = new TranslatableComponent("mco.selectServer.open");
         }
     }
     
-    private void drawClose(final int integer1, final int integer2, final int integer3, final int integer4) {
-        RealmsScreen.bind("realms:textures/gui/realms/off_icon.png");
+    private void drawClose(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        this.minecraft.getTextureManager().bind(RealmsConfigureWorldScreen.OFF_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 10, 28, 10, 28);
-        RenderSystem.popMatrix();
-        if (integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 27) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.selectServer.closed");
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 10, 28, 10, 28);
+        if (integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 27) {
+            this.toolTip = new TranslatableComponent("mco.selectServer.closed");
         }
     }
     
     private boolean isMinigame() {
-        return this.serverData != null && this.serverData.worldType.equals(RealmsServer.WorldType.MINIGAME);
+        return this.serverData != null && this.serverData.worldType == RealmsServer.WorldType.MINIGAME;
     }
     
     private void hideRegularButtons() {
@@ -415,81 +375,60 @@ public class RealmsConfigureWorldScreen extends RealmsScreenWithCallback<WorldTe
         this.hide(this.resetWorldButton);
     }
     
-    private void hide(final RealmsButton realmsButton) {
-        realmsButton.setVisible(false);
-        this.removeButton(realmsButton);
+    private void hide(final Button dni) {
+        dni.visible = false;
+        this.children.remove(dni);
+        this.buttons.remove(dni);
     }
     
-    private void showRegularButtons() {
-        this.show(this.optionsButton);
-        this.show(this.backupButton);
-        this.show(this.resetWorldButton);
-    }
-    
-    private void show(final RealmsButton realmsButton) {
-        realmsButton.setVisible(true);
-        this.buttonsAdd(realmsButton);
+    private void show(final Button dni) {
+        dni.visible = true;
+        this.<Button>addButton(dni);
     }
     
     private void hideMinigameButtons() {
         this.hide(this.switchMinigameButton);
     }
     
-    private void showMinigameButtons() {
-        this.show(this.switchMinigameButton);
-    }
-    
-    public void saveSlotSettings(final RealmsWorldOptions realmsWorldOptions) {
-        final RealmsWorldOptions realmsWorldOptions2 = this.serverData.slots.get(this.serverData.activeSlot);
-        realmsWorldOptions.templateId = realmsWorldOptions2.templateId;
-        realmsWorldOptions.templateImage = realmsWorldOptions2.templateImage;
-        final RealmsClient cyy4 = RealmsClient.createRealmsClient();
+    public void saveSlotSettings(final RealmsWorldOptions div) {
+        final RealmsWorldOptions div2 = this.serverData.slots.get(this.serverData.activeSlot);
+        div.templateId = div2.templateId;
+        div.templateImage = div2.templateImage;
+        final RealmsClient dia4 = RealmsClient.create();
         try {
-            cyy4.updateSlot(this.serverData.id, this.serverData.activeSlot, realmsWorldOptions);
-            this.serverData.slots.put(this.serverData.activeSlot, realmsWorldOptions);
+            dia4.updateSlot(this.serverData.id, this.serverData.activeSlot, div);
+            this.serverData.slots.put(this.serverData.activeSlot, div);
         }
-        catch (RealmsServiceException czg5) {
+        catch (RealmsServiceException djh5) {
             RealmsConfigureWorldScreen.LOGGER.error("Couldn't save slot settings");
-            Realms.setScreen(new RealmsGenericErrorScreen(czg5, this));
+            this.minecraft.setScreen(new RealmsGenericErrorScreen(djh5, this));
             return;
         }
-        catch (UnsupportedEncodingException unsupportedEncodingException5) {
-            RealmsConfigureWorldScreen.LOGGER.error("Couldn't save slot settings");
-        }
-        Realms.setScreen(this);
+        this.minecraft.setScreen(this);
     }
     
     public void saveSettings(final String string1, final String string2) {
-        final String string3 = (string2 == null || string2.trim().isEmpty()) ? null : string2;
-        final RealmsClient cyy5 = RealmsClient.createRealmsClient();
+        final String string3 = string2.trim().isEmpty() ? null : string2;
+        final RealmsClient dia5 = RealmsClient.create();
         try {
-            cyy5.update(this.serverData.id, string1, string3);
+            dia5.update(this.serverData.id, string1, string3);
             this.serverData.setName(string1);
             this.serverData.setDescription(string3);
         }
-        catch (RealmsServiceException czg6) {
+        catch (RealmsServiceException djh6) {
             RealmsConfigureWorldScreen.LOGGER.error("Couldn't save settings");
-            Realms.setScreen(new RealmsGenericErrorScreen(czg6, this));
+            this.minecraft.setScreen(new RealmsGenericErrorScreen(djh6, this));
             return;
         }
-        catch (UnsupportedEncodingException unsupportedEncodingException6) {
-            RealmsConfigureWorldScreen.LOGGER.error("Couldn't save settings");
-        }
-        Realms.setScreen(this);
+        this.minecraft.setScreen(this);
     }
     
-    public void openTheWorld(final boolean boolean1, final RealmsScreen realmsScreen) {
-        final RealmsTasks.OpenServerTask c4 = new RealmsTasks.OpenServerTask(this.serverData, this, this.lastScreen, boolean1);
-        final RealmsLongRunningMcoTaskScreen czz5 = new RealmsLongRunningMcoTaskScreen(realmsScreen, c4);
-        czz5.start();
-        Realms.setScreen(czz5);
+    public void openTheWorld(final boolean boolean1, final Screen dqs) {
+        this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(dqs, new OpenServerTask(this.serverData, this, this.lastScreen, boolean1)));
     }
     
-    public void closeTheWorld(final RealmsScreen realmsScreen) {
-        final RealmsTasks.CloseServerTask a3 = new RealmsTasks.CloseServerTask(this.serverData, this);
-        final RealmsLongRunningMcoTaskScreen czz4 = new RealmsLongRunningMcoTaskScreen(realmsScreen, a3);
-        czz4.start();
-        Realms.setScreen(czz4);
+    public void closeTheWorld(final Screen dqs) {
+        this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(dqs, new CloseServerTask(this.serverData, this)));
     }
     
     public void stateChanged() {
@@ -497,35 +436,24 @@ public class RealmsConfigureWorldScreen extends RealmsScreenWithCallback<WorldTe
     }
     
     @Override
-    void callback(final WorldTemplate worldTemplate) {
-        if (worldTemplate == null) {
+    protected void callback(@Nullable final WorldTemplate djd) {
+        if (djd == null) {
             return;
         }
-        if (WorldTemplate.WorldTemplateType.MINIGAME.equals(worldTemplate.type)) {
-            this.switchMinigame(worldTemplate);
+        if (WorldTemplate.WorldTemplateType.MINIGAME == djd.type) {
+            this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(this.lastScreen, new SwitchMinigameTask(this.serverData.id, djd, this.getNewScreen())));
         }
     }
     
-    private void switchSlot(final long long1, final int integer) {
-        final RealmsConfigureWorldScreen czs5 = this.getNewScreen();
-        final RealmsTasks.SwitchSlotTask i6 = new RealmsTasks.SwitchSlotTask(long1, integer, (boolean2, integer) -> Realms.setScreen(czs5), 11);
-        final RealmsLongRunningMcoTaskScreen czz7 = new RealmsLongRunningMcoTaskScreen(this.lastScreen, i6);
-        czz7.start();
-        Realms.setScreen(czz7);
-    }
-    
-    private void switchMinigame(final WorldTemplate worldTemplate) {
-        final RealmsTasks.SwitchMinigameTask h3 = new RealmsTasks.SwitchMinigameTask(this.serverData.id, worldTemplate, this.getNewScreen());
-        final RealmsLongRunningMcoTaskScreen czz4 = new RealmsLongRunningMcoTaskScreen(this.lastScreen, h3);
-        czz4.start();
-        Realms.setScreen(czz4);
-    }
-    
     public RealmsConfigureWorldScreen getNewScreen() {
         return new RealmsConfigureWorldScreen(this.lastScreen, this.serverId);
     }
     
     static {
         LOGGER = LogManager.getLogger();
+        ON_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/on_icon.png");
+        OFF_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/off_icon.png");
+        EXPIRED_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/expired_icon.png");
+        EXPIRES_SOON_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/expires_soon_icon.png");
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.java
index 4ff8732..296036a 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.java
@@ -1,51 +1,38 @@
 package com.mojang.realmsclient.gui.screens;
 
 import java.util.Iterator;
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.RealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsConfirmScreen extends RealmsScreen {
-    protected RealmsScreen parent;
-    protected String title1;
-    private final String title2;
-    protected String yesButton;
-    protected String noButton;
-    protected int id;
+    protected BooleanConsumer callback;
+    private final Component title1;
+    private final Component title2;
     private int delayTicker;
     
-    public RealmsConfirmScreen(final RealmsScreen realmsScreen, final String string2, final String string3, final int integer) {
-        this.parent = realmsScreen;
-        this.title1 = string2;
-        this.title2 = string3;
-        this.id = integer;
-        this.yesButton = RealmsScreen.getLocalizedString("gui.yes");
-        this.noButton = RealmsScreen.getLocalizedString("gui.no");
+    public RealmsConfirmScreen(final BooleanConsumer booleanConsumer, final Component mr2, final Component mr3) {
+        this.callback = booleanConsumer;
+        this.title1 = mr2;
+        this.title2 = mr3;
     }
     
-    @Override
     public void init() {
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 - 105, RealmsConstants.row(9), 100, 20, this.yesButton) {
-            @Override
-            public void onPress() {
-                RealmsConfirmScreen.this.parent.confirmResult(true, RealmsConfirmScreen.this.id);
-            }
-        });
-        this.buttonsAdd(new RealmsButton(1, this.width() / 2 + 5, RealmsConstants.row(9), 100, 20, this.noButton) {
-            @Override
-            public void onPress() {
-                RealmsConfirmScreen.this.parent.confirmResult(false, RealmsConfirmScreen.this.id);
-            }
-        });
+        this.<Button>addButton(new Button(this.width / 2 - 105, RealmsScreen.row(9), 100, 20, CommonComponents.GUI_YES, dni -> this.callback.accept(true)));
+        this.<Button>addButton(new Button(this.width / 2 + 5, RealmsScreen.row(9), 100, 20, CommonComponents.GUI_NO, dni -> this.callback.accept(false)));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.title1, this.width() / 2, RealmsConstants.row(3), 16777215);
-        this.drawCenteredString(this.title2, this.width() / 2, RealmsConstants.row(5), 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title1, this.width / 2, RealmsScreen.row(3), 16777215);
+        this.drawCenteredString(dhl, this.font, this.title2, this.width / 2, RealmsScreen.row(5), 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Override
@@ -54,8 +41,8 @@ public class RealmsConfirmScreen extends RealmsScreen {
         final int delayTicker = this.delayTicker - 1;
         this.delayTicker = delayTicker;
         if (delayTicker == 0) {
-            for (final AbstractRealmsButton<?> abstractRealmsButton3 : this.buttons()) {
-                abstractRealmsButton3.active(true);
+            for (final AbstractWidget dng3 : this.buttons) {
+                dng3.active = true;
             }
         }
     }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java
index 49d11ca..d5076db 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java
@@ -1,13 +1,17 @@
 package com.mojang.realmsclient.gui.screens;
 
-import com.mojang.realmsclient.gui.LongRunningTask;
-import com.mojang.realmsclient.util.RealmsTasks;
-import net.minecraft.realms.RealmsGuiEventListener;
-import net.minecraft.realms.Realms;
-import net.minecraft.realms.AbstractRealmsButton;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.realmsclient.util.task.LongRunningTask;
+import com.mojang.realmsclient.util.task.WorldCreationTask;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.realms.RealmsLabel;
-import net.minecraft.realms.RealmsButton;
-import net.minecraft.realms.RealmsEditBox;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
 import com.mojang.realmsclient.RealmsMainScreen;
 import com.mojang.realmsclient.dto.RealmsServer;
 import net.minecraft.realms.RealmsScreen;
@@ -15,14 +19,14 @@ import net.minecraft.realms.RealmsScreen;
 public class RealmsCreateRealmScreen extends RealmsScreen {
     private final RealmsServer server;
     private final RealmsMainScreen lastScreen;
-    private RealmsEditBox nameBox;
-    private RealmsEditBox descriptionBox;
-    private RealmsButton createButton;
+    private EditBox nameBox;
+    private EditBox descriptionBox;
+    private Button createButton;
     private RealmsLabel createRealmLabel;
     
-    public RealmsCreateRealmScreen(final RealmsServer realmsServer, final RealmsMainScreen cyu) {
-        this.server = realmsServer;
-        this.lastScreen = cyu;
+    public RealmsCreateRealmScreen(final RealmsServer dip, final RealmsMainScreen dhv) {
+        this.server = dip;
+        this.lastScreen = dhv;
     }
     
     @Override
@@ -35,81 +39,65 @@ public class RealmsCreateRealmScreen extends RealmsScreen {
         }
     }
     
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        this.buttonsAdd(this.createButton = new RealmsButton(0, this.width() / 2 - 100, this.height() / 4 + 120 + 17, 97, 20, RealmsScreen.getLocalizedString("mco.create.world")) {
-            @Override
-            public void onPress() {
-                RealmsCreateRealmScreen.this.createWorld();
-            }
-        });
-        this.buttonsAdd(new RealmsButton(1, this.width() / 2 + 5, this.height() / 4 + 120 + 17, 95, 20, RealmsScreen.getLocalizedString("gui.cancel")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsCreateRealmScreen.this.lastScreen);
-            }
-        });
-        this.createButton.active(false);
-        this.addWidget(this.nameBox = this.newEditBox(3, this.width() / 2 - 100, 65, 200, 20, RealmsScreen.getLocalizedString("mco.configure.world.name")));
-        this.focusOn(this.nameBox);
-        this.addWidget(this.descriptionBox = this.newEditBox(4, this.width() / 2 - 100, 115, 200, 20, RealmsScreen.getLocalizedString("mco.configure.world.description")));
-        this.addWidget(this.createRealmLabel = new RealmsLabel(RealmsScreen.getLocalizedString("mco.selectServer.create"), this.width() / 2, 11, 16777215));
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        this.createButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120 + 17, 97, 20, new TranslatableComponent("mco.create.world"), dni -> this.createWorld()));
+        this.<Button>addButton(new Button(this.width / 2 + 5, this.height / 4 + 120 + 17, 95, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(this.lastScreen)));
+        this.createButton.active = false;
+        this.<EditBox>addWidget(this.nameBox = new EditBox(this.minecraft.font, this.width / 2 - 100, 65, 200, 20, null, new TranslatableComponent("mco.configure.world.name")));
+        this.setInitialFocus(this.nameBox);
+        this.<EditBox>addWidget(this.descriptionBox = new EditBox(this.minecraft.font, this.width / 2 - 100, 115, 200, 20, null, new TranslatableComponent("mco.configure.world.description")));
+        this.<RealmsLabel>addWidget(this.createRealmLabel = new RealmsLabel(new TranslatableComponent("mco.selectServer.create"), this.width / 2, 11, 16777215));
         this.narrateLabels();
     }
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
     public boolean charTyped(final char character, final int integer) {
-        this.createButton.active(this.valid());
-        return false;
+        final boolean boolean4 = super.charTyped(character, integer);
+        this.createButton.active = this.valid();
+        return boolean4;
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
-        switch (integer1) {
-            case 256: {
-                Realms.setScreen(this.lastScreen);
-                return true;
-            }
-            default: {
-                this.createButton.active(this.valid());
-                return false;
-            }
+        if (integer1 == 256) {
+            this.minecraft.setScreen(this.lastScreen);
+            return true;
         }
+        final boolean boolean5 = super.keyPressed(integer1, integer2, integer3);
+        this.createButton.active = this.valid();
+        return boolean5;
     }
     
     private void createWorld() {
         if (this.valid()) {
-            final RealmsResetWorldScreen daf2 = new RealmsResetWorldScreen(this.lastScreen, this.server, this.lastScreen.newScreen(), RealmsScreen.getLocalizedString("mco.selectServer.create"), RealmsScreen.getLocalizedString("mco.create.world.subtitle"), 10526880, RealmsScreen.getLocalizedString("mco.create.world.skip"));
-            daf2.setResetTitle(RealmsScreen.getLocalizedString("mco.create.world.reset.title"));
-            final RealmsTasks.WorldCreationTask j3 = new RealmsTasks.WorldCreationTask(this.server.id, this.nameBox.getValue(), this.descriptionBox.getValue(), daf2);
-            final RealmsLongRunningMcoTaskScreen czz4 = new RealmsLongRunningMcoTaskScreen(this.lastScreen, j3);
-            czz4.start();
-            Realms.setScreen(czz4);
+            final RealmsResetWorldScreen dke2 = new RealmsResetWorldScreen(this.lastScreen, this.server, new TranslatableComponent("mco.selectServer.create"), new TranslatableComponent("mco.create.world.subtitle"), 10526880, new TranslatableComponent("mco.create.world.skip"), () -> this.minecraft.setScreen(this.lastScreen.newScreen()), () -> this.minecraft.setScreen(this.lastScreen.newScreen()));
+            dke2.setResetTitle(I18n.get("mco.create.world.reset.title"));
+            this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(this.lastScreen, new WorldCreationTask(this.server.id, this.nameBox.getValue(), this.descriptionBox.getValue(), dke2)));
         }
     }
     
     private boolean valid() {
-        return this.nameBox.getValue() != null && !this.nameBox.getValue().trim().isEmpty();
+        return !this.nameBox.getValue().trim().isEmpty();
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.createRealmLabel.render(this);
-        this.drawString(RealmsScreen.getLocalizedString("mco.configure.world.name"), this.width() / 2 - 100, 52, 10526880);
-        this.drawString(RealmsScreen.getLocalizedString("mco.configure.world.description"), this.width() / 2 - 100, 102, 10526880);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.createRealmLabel.render(this, dhl);
+        this.font.draw(dhl, I18n.get("mco.configure.world.name"), (float)(this.width / 2 - 100), 52.0f, 10526880);
+        this.font.draw(dhl, I18n.get("mco.configure.world.description"), (float)(this.width / 2 - 100), 102.0f, 10526880);
         if (this.nameBox != null) {
-            this.nameBox.render(integer1, integer2, float3);
+            this.nameBox.render(dhl, integer2, integer3, float4);
         }
         if (this.descriptionBox != null) {
-            this.descriptionBox.render(integer1, integer2, float3);
+            this.descriptionBox.render(dhl, integer2, integer3, float4);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java
index f31f923..c671850 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java
@@ -2,34 +2,47 @@ package com.mojang.realmsclient.gui.screens;
 
 import org.apache.logging.log4j.LogManager;
 import java.util.concurrent.TimeUnit;
-import net.minecraft.realms.RealmsDefaultVertexFormat;
-import net.minecraft.realms.Tezzelator;
+import net.minecraft.Util;
+import com.mojang.blaze3d.vertex.BufferBuilder;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.systems.RenderSystem;
 import java.util.Locale;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.List;
+import net.minecraft.realms.NarrationHelper;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.function.Function;
+import net.minecraft.network.chat.TextComponent;
 import com.google.common.collect.Lists;
 import com.mojang.realmsclient.client.FileDownload;
-import net.minecraft.realms.Realms;
-import net.minecraft.realms.RealmsConfirmResultListener;
-import net.minecraft.realms.AbstractRealmsButton;
-import java.util.concurrent.locks.ReentrantLock;
-import net.minecraft.realms.RealmsButton;
+import com.mojang.realmsclient.Unit;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.TranslatableComponent;
+import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
+import net.minecraft.client.gui.components.Button;
 import com.google.common.util.concurrent.RateLimiter;
+import net.minecraft.network.chat.Component;
 import com.mojang.realmsclient.dto.WorldDownload;
+import net.minecraft.client.gui.screens.Screen;
+import java.util.concurrent.locks.ReentrantLock;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsDownloadLatestWorldScreen extends RealmsScreen {
     private static final Logger LOGGER;
-    private final RealmsScreen lastScreen;
+    private static final ReentrantLock DOWNLOAD_LOCK;
+    private final Screen lastScreen;
     private final WorldDownload worldDownload;
-    private final String downloadTitle;
+    private final Component downloadTitle;
     private final RateLimiter narrationRateLimiter;
-    private RealmsButton cancelButton;
+    private Button cancelButton;
     private final String worldName;
     private final DownloadStatus downloadStatus;
-    private volatile String errorMessage;
-    private volatile String status;
+    private volatile Component errorMessage;
+    private volatile Component status;
     private volatile String progress;
     private volatile boolean cancelled;
     private volatile boolean showDots;
@@ -41,36 +54,28 @@ public class RealmsDownloadLatestWorldScreen extends RealmsScreen {
     private int animTick;
     private static final String[] DOTS;
     private int dotIndex;
-    private final int WARNING_ID = 100;
-    private int confirmationId;
     private boolean checked;
-    private static final ReentrantLock downloadLock;
+    private final BooleanConsumer callback;
     
-    public RealmsDownloadLatestWorldScreen(final RealmsScreen realmsScreen, final WorldDownload worldDownload, final String string) {
+    public RealmsDownloadLatestWorldScreen(final Screen dqs, final WorldDownload djc, final String string, final BooleanConsumer booleanConsumer) {
+        this.status = new TranslatableComponent("mco.download.preparing");
         this.showDots = true;
-        this.confirmationId = -1;
-        this.lastScreen = realmsScreen;
+        this.callback = booleanConsumer;
+        this.lastScreen = dqs;
         this.worldName = string;
-        this.worldDownload = worldDownload;
+        this.worldDownload = djc;
         this.downloadStatus = new DownloadStatus();
-        this.downloadTitle = RealmsScreen.getLocalizedString("mco.download.title");
+        this.downloadTitle = new TranslatableComponent("mco.download.title");
         this.narrationRateLimiter = RateLimiter.create(0.10000000149011612);
     }
     
-    public void setConfirmationId(final int integer) {
-        this.confirmationId = integer;
-    }
-    
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        this.buttonsAdd(this.cancelButton = new RealmsButton(0, this.width() / 2 - 100, this.height() - 42, 200, 20, RealmsScreen.getLocalizedString("gui.cancel")) {
-            @Override
-            public void onPress() {
-                RealmsDownloadLatestWorldScreen.this.cancelled = true;
-                RealmsDownloadLatestWorldScreen.this.backButtonClicked();
-            }
-        });
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        this.cancelButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 42, 200, 20, CommonComponents.GUI_CANCEL, dni -> {
+            this.cancelled = true;
+            this.backButtonClicked();
+            return;
+        }));
         this.checkDownloadSize();
     }
     
@@ -79,25 +84,22 @@ public class RealmsDownloadLatestWorldScreen extends RealmsScreen {
             return;
         }
         if (!this.checked && this.getContentLength(this.worldDownload.downloadLink) >= 5368709120L) {
-            final String string2 = RealmsScreen.getLocalizedString("mco.download.confirmation.line1", humanReadableSize(5368709120L));
-            final String string3 = RealmsScreen.getLocalizedString("mco.download.confirmation.line2");
-            Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Warning, string2, string3, false, 100));
+            final Component mr2 = new TranslatableComponent("mco.download.confirmation.line1", new Object[] { Unit.humanReadable(5368709120L) });
+            final Component mr3 = new TranslatableComponent("mco.download.confirmation.line2");
+            this.minecraft.setScreen(new RealmsLongConfirmationScreen(boolean1 -> {
+                this.checked = true;
+                this.minecraft.setScreen(this);
+                this.downloadSave();
+            }, RealmsLongConfirmationScreen.Type.Warning, mr2, mr3, false));
         }
         else {
             this.downloadSave();
         }
     }
     
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-        this.checked = true;
-        Realms.setScreen(this);
-        this.downloadSave();
-    }
-    
     private long getContentLength(final String string) {
-        final FileDownload cyv3 = new FileDownload();
-        return cyv3.contentLength(string);
+        final FileDownload dhx3 = new FileDownload();
+        return dhx3.contentLength(string);
     }
     
     @Override
@@ -105,18 +107,18 @@ public class RealmsDownloadLatestWorldScreen extends RealmsScreen {
         super.tick();
         ++this.animTick;
         if (this.status != null && this.narrationRateLimiter.tryAcquire(1)) {
-            final List<String> list2 = Lists.newArrayList();
+            final List<Component> list2 = Lists.newArrayList();
             list2.add(this.downloadTitle);
             list2.add(this.status);
             if (this.progress != null) {
-                list2.add(this.progress + "%");
-                list2.add(humanReadableSpeed(this.bytesPersSecond));
+                list2.add(new TextComponent(this.progress + "%"));
+                list2.add(new TextComponent(Unit.humanReadable(this.bytesPersSecond) + "/s"));
             }
             if (this.errorMessage != null) {
                 list2.add(this.errorMessage);
             }
-            final String string3 = String.join(System.lineSeparator(), list2);
-            Realms.narrateNow(string3);
+            final String string3 = list2.stream().map(Component::getString).collect(Collectors.joining("\n"));
+            NarrationHelper.now(string3);
         }
     }
     
@@ -131,164 +133,147 @@ public class RealmsDownloadLatestWorldScreen extends RealmsScreen {
     }
     
     private void backButtonClicked() {
-        if (this.finished && this.confirmationId != -1 && this.errorMessage == null) {
-            this.lastScreen.confirmResult(true, this.confirmationId);
+        if (this.finished && this.callback != null && this.errorMessage == null) {
+            this.callback.accept(true);
         }
-        Realms.setScreen(this.lastScreen);
+        this.minecraft.setScreen(this.lastScreen);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
         if (this.extracting && !this.finished) {
-            this.status = RealmsScreen.getLocalizedString("mco.download.extracting");
+            this.status = new TranslatableComponent("mco.download.extracting");
         }
-        this.drawCenteredString(this.downloadTitle, this.width() / 2, 20, 16777215);
-        this.drawCenteredString(this.status, this.width() / 2, 50, 16777215);
+        this.drawCenteredString(dhl, this.font, this.downloadTitle, this.width / 2, 20, 16777215);
+        this.drawCenteredString(dhl, this.font, this.status, this.width / 2, 50, 16777215);
         if (this.showDots) {
-            this.drawDots();
+            this.drawDots(dhl);
         }
         if (this.downloadStatus.bytesWritten != 0L && !this.cancelled) {
-            this.drawProgressBar();
-            this.drawDownloadSpeed();
+            this.drawProgressBar(dhl);
+            this.drawDownloadSpeed(dhl);
         }
         if (this.errorMessage != null) {
-            this.drawCenteredString(this.errorMessage, this.width() / 2, 110, 16711680);
+            this.drawCenteredString(dhl, this.font, this.errorMessage, this.width / 2, 110, 16711680);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
-    private void drawDots() {
-        final int integer2 = this.fontWidth(this.status);
+    private void drawDots(final PoseStack dhl) {
+        final int integer3 = this.font.width(this.status);
         if (this.animTick % 10 == 0) {
             ++this.dotIndex;
         }
-        this.drawString(RealmsDownloadLatestWorldScreen.DOTS[this.dotIndex % RealmsDownloadLatestWorldScreen.DOTS.length], this.width() / 2 + integer2 / 2 + 5, 50, 16777215);
+        this.font.draw(dhl, RealmsDownloadLatestWorldScreen.DOTS[this.dotIndex % RealmsDownloadLatestWorldScreen.DOTS.length], (float)(this.width / 2 + integer3 / 2 + 5), 50.0f, 16777215);
     }
     
-    private void drawProgressBar() {
-        final double double2 = this.downloadStatus.bytesWritten / (double)this.downloadStatus.totalBytes * 100.0;
-        this.progress = String.format(Locale.ROOT, "%.1f", double2);
+    private void drawProgressBar(final PoseStack dhl) {
+        final double double3 = this.downloadStatus.bytesWritten / (double)this.downloadStatus.totalBytes * 100.0;
+        this.progress = String.format(Locale.ROOT, "%.1f", double3);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.disableTexture();
-        final Tezzelator tezzelator4 = Tezzelator.instance;
-        tezzelator4.begin(7, RealmsDefaultVertexFormat.POSITION_COLOR);
-        final double double3 = this.width() / 2 - 100;
-        final double double4 = 0.5;
-        tezzelator4.vertex(double3 - 0.5, 95.5, 0.0).color(217, 210, 210, 255).endVertex();
-        tezzelator4.vertex(double3 + 200.0 * double2 / 100.0 + 0.5, 95.5, 0.0).color(217, 210, 210, 255).endVertex();
-        tezzelator4.vertex(double3 + 200.0 * double2 / 100.0 + 0.5, 79.5, 0.0).color(217, 210, 210, 255).endVertex();
-        tezzelator4.vertex(double3 - 0.5, 79.5, 0.0).color(217, 210, 210, 255).endVertex();
-        tezzelator4.vertex(double3, 95.0, 0.0).color(128, 128, 128, 255).endVertex();
-        tezzelator4.vertex(double3 + 200.0 * double2 / 100.0, 95.0, 0.0).color(128, 128, 128, 255).endVertex();
-        tezzelator4.vertex(double3 + 200.0 * double2 / 100.0, 80.0, 0.0).color(128, 128, 128, 255).endVertex();
-        tezzelator4.vertex(double3, 80.0, 0.0).color(128, 128, 128, 255).endVertex();
-        tezzelator4.end();
+        final Tesselator dhn5 = Tesselator.getInstance();
+        final BufferBuilder dhg6 = dhn5.getBuilder();
+        dhg6.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        final double double4 = this.width / 2 - 100;
+        final double double5 = 0.5;
+        dhg6.vertex(double4 - 0.5, 95.5, 0.0).color(217, 210, 210, 255).endVertex();
+        dhg6.vertex(double4 + 200.0 * double3 / 100.0 + 0.5, 95.5, 0.0).color(217, 210, 210, 255).endVertex();
+        dhg6.vertex(double4 + 200.0 * double3 / 100.0 + 0.5, 79.5, 0.0).color(217, 210, 210, 255).endVertex();
+        dhg6.vertex(double4 - 0.5, 79.5, 0.0).color(217, 210, 210, 255).endVertex();
+        dhg6.vertex(double4, 95.0, 0.0).color(128, 128, 128, 255).endVertex();
+        dhg6.vertex(double4 + 200.0 * double3 / 100.0, 95.0, 0.0).color(128, 128, 128, 255).endVertex();
+        dhg6.vertex(double4 + 200.0 * double3 / 100.0, 80.0, 0.0).color(128, 128, 128, 255).endVertex();
+        dhg6.vertex(double4, 80.0, 0.0).color(128, 128, 128, 255).endVertex();
+        dhn5.end();
         RenderSystem.enableTexture();
-        this.drawCenteredString(this.progress + " %", this.width() / 2, 84, 16777215);
+        this.drawCenteredString(dhl, this.font, this.progress + " %", this.width / 2, 84, 16777215);
     }
     
-    private void drawDownloadSpeed() {
+    private void drawDownloadSpeed(final PoseStack dhl) {
         if (this.animTick % 20 == 0) {
             if (this.previousWrittenBytes != null) {
-                long long2 = System.currentTimeMillis() - this.previousTimeSnapshot;
-                if (long2 == 0L) {
-                    long2 = 1L;
+                long long3 = Util.getMillis() - this.previousTimeSnapshot;
+                if (long3 == 0L) {
+                    long3 = 1L;
                 }
-                this.drawDownloadSpeed0(this.bytesPersSecond = 1000L * (this.downloadStatus.bytesWritten - this.previousWrittenBytes) / long2);
+                this.drawDownloadSpeed0(dhl, this.bytesPersSecond = 1000L * (this.downloadStatus.bytesWritten - this.previousWrittenBytes) / long3);
             }
             this.previousWrittenBytes = this.downloadStatus.bytesWritten;
-            this.previousTimeSnapshot = System.currentTimeMillis();
+            this.previousTimeSnapshot = Util.getMillis();
         }
         else {
-            this.drawDownloadSpeed0(this.bytesPersSecond);
+            this.drawDownloadSpeed0(dhl, this.bytesPersSecond);
         }
     }
     
-    private void drawDownloadSpeed0(final long long1) {
-        if (long1 > 0L) {
-            final int integer4 = this.fontWidth(this.progress);
-            final String string5 = "(" + humanReadableSpeed(long1) + ")";
-            this.drawString(string5, this.width() / 2 + integer4 / 2 + 15, 84, 16777215);
+    private void drawDownloadSpeed0(final PoseStack dhl, final long long2) {
+        if (long2 > 0L) {
+            final int integer5 = this.font.width(this.progress);
+            final String string6 = "(" + Unit.humanReadable(long2) + "/s)";
+            this.font.draw(dhl, string6, (float)(this.width / 2 + integer5 / 2 + 15), 84.0f, 16777215);
         }
     }
     
-    public static String humanReadableSpeed(final long long1) {
-        final int integer3 = 1024;
-        if (long1 < 1024L) {
-            return long1 + " B/s";
-        }
-        final int integer4 = (int)(Math.log((double)long1) / Math.log(1024.0));
-        final String string5 = "KMGTPE".charAt(integer4 - 1) + "";
-        return String.format(Locale.ROOT, "%.1f %sB/s", long1 / Math.pow(1024.0, integer4), string5);
-    }
-    
-    public static String humanReadableSize(final long long1) {
-        final int integer3 = 1024;
-        if (long1 < 1024L) {
-            return long1 + " B";
-        }
-        final int integer4 = (int)(Math.log((double)long1) / Math.log(1024.0));
-        final String string5 = "KMGTPE".charAt(integer4 - 1) + "";
-        return String.format(Locale.ROOT, "%.0f %sB", long1 / Math.pow(1024.0, integer4), string5);
-    }
-    
     private void downloadSave() {
-        FileDownload cyv2;
+        final TranslatableComponent status;
+        FileDownload dhx2;
         new Thread(() -> {
             try {
-                if (!(!RealmsDownloadLatestWorldScreen.downloadLock.tryLock(1L, TimeUnit.SECONDS))) {
-                    this.status = RealmsScreen.getLocalizedString("mco.download.preparing");
-                    if (this.cancelled) {
-                        this.downloadCancelled();
-                    }
-                    else {
-                        this.status = RealmsScreen.getLocalizedString("mco.download.downloading", this.worldName);
-                        cyv2 = new FileDownload();
-                        cyv2.contentLength(this.worldDownload.downloadLink);
-                        cyv2.download(this.worldDownload, this.worldName, this.downloadStatus, this.getLevelStorageSource());
-                        while (!cyv2.isFinished()) {
-                            if (cyv2.isError()) {
-                                cyv2.cancel();
-                                this.errorMessage = RealmsScreen.getLocalizedString("mco.download.failed");
-                                this.cancelButton.setMessage(RealmsScreen.getLocalizedString("gui.done"));
+                if (!RealmsDownloadLatestWorldScreen.DOWNLOAD_LOCK.tryLock(1L, TimeUnit.SECONDS)) {
+                    this.status = new TranslatableComponent("mco.download.failed");
+                }
+                else if (this.cancelled) {
+                    this.downloadCancelled();
+                }
+                else {
+                    new TranslatableComponent("mco.download.downloading", new Object[] { this.worldName });
+                    this.status = status;
+                    dhx2 = new FileDownload();
+                    dhx2.contentLength(this.worldDownload.downloadLink);
+                    dhx2.download(this.worldDownload, this.worldName, this.downloadStatus, this.minecraft.getLevelSource());
+                    while (!dhx2.isFinished()) {
+                        if (dhx2.isError()) {
+                            dhx2.cancel();
+                            this.errorMessage = new TranslatableComponent("mco.download.failed");
+                            this.cancelButton.setMessage(CommonComponents.GUI_DONE);
+                            return;
+                        }
+                        else {
+                            if (dhx2.isExtracting()) {
+                                this.extracting = true;
+                            }
+                            if (this.cancelled) {
+                                dhx2.cancel();
+                                this.downloadCancelled();
                                 return;
                             }
                             else {
-                                if (cyv2.isExtracting()) {
-                                    this.extracting = true;
+                                try {
+                                    Thread.sleep(500L);
                                 }
-                                if (this.cancelled) {
-                                    cyv2.cancel();
-                                    this.downloadCancelled();
-                                    return;
-                                }
-                                else {
-                                    try {
-                                        Thread.sleep(500L);
-                                    }
-                                    catch (InterruptedException interruptedException3) {
-                                        RealmsDownloadLatestWorldScreen.LOGGER.error("Failed to check Realms backup download status");
-                                    }
+                                catch (InterruptedException interruptedException3) {
+                                    RealmsDownloadLatestWorldScreen.LOGGER.error("Failed to check Realms backup download status");
                                 }
                             }
                         }
-                        this.finished = true;
-                        this.status = RealmsScreen.getLocalizedString("mco.download.done");
-                        this.cancelButton.setMessage(RealmsScreen.getLocalizedString("gui.done"));
                     }
+                    this.finished = true;
+                    this.status = new TranslatableComponent("mco.download.done");
+                    this.cancelButton.setMessage(CommonComponents.GUI_DONE);
                 }
             }
             catch (InterruptedException interruptedException4) {
                 RealmsDownloadLatestWorldScreen.LOGGER.error("Could not acquire upload lock");
             }
             catch (Exception exception2) {
-                this.errorMessage = RealmsScreen.getLocalizedString("mco.download.failed");
+                this.errorMessage = new TranslatableComponent("mco.download.failed");
                 exception2.printStackTrace();
             }
             finally {
-                if (RealmsDownloadLatestWorldScreen.downloadLock.isHeldByCurrentThread()) {
-                    RealmsDownloadLatestWorldScreen.downloadLock.unlock();
+                if (RealmsDownloadLatestWorldScreen.DOWNLOAD_LOCK.isHeldByCurrentThread()) {
+                    RealmsDownloadLatestWorldScreen.DOWNLOAD_LOCK.unlock();
                     this.showDots = false;
                     this.finished = true;
                 }
@@ -297,13 +282,13 @@ public class RealmsDownloadLatestWorldScreen extends RealmsScreen {
     }
     
     private void downloadCancelled() {
-        this.status = RealmsScreen.getLocalizedString("mco.download.cancelled");
+        this.status = new TranslatableComponent("mco.download.cancelled");
     }
     
     static {
         LOGGER = LogManager.getLogger();
+        DOWNLOAD_LOCK = new ReentrantLock();
         DOTS = new String[] { "", ".", ". .", ". . ." };
-        downloadLock = new ReentrantLock();
     }
     
     public class DownloadStatus {
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
index d214251..aaf0a0d 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
@@ -1,75 +1,69 @@
 package com.mojang.realmsclient.gui.screens;
 
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.RealmsButton;
-import net.minecraft.realms.Realms;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.realms.NarrationHelper;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TextComponent;
 import com.mojang.realmsclient.exception.RealmsServiceException;
+import net.minecraft.network.chat.Component;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsGenericErrorScreen extends RealmsScreen {
-    private final RealmsScreen nextScreen;
-    private String line1;
-    private String line2;
+    private final Screen nextScreen;
+    private Component line1;
+    private Component line2;
     
-    public RealmsGenericErrorScreen(final RealmsServiceException czg, final RealmsScreen realmsScreen) {
-        this.nextScreen = realmsScreen;
-        this.errorMessage(czg);
+    public RealmsGenericErrorScreen(final RealmsServiceException djh, final Screen dqs) {
+        this.nextScreen = dqs;
+        this.errorMessage(djh);
     }
     
-    public RealmsGenericErrorScreen(final String string, final RealmsScreen realmsScreen) {
-        this.nextScreen = realmsScreen;
-        this.errorMessage(string);
+    public RealmsGenericErrorScreen(final Component mr, final Screen dqs) {
+        this.nextScreen = dqs;
+        this.errorMessage(mr);
     }
     
-    public RealmsGenericErrorScreen(final String string1, final String string2, final RealmsScreen realmsScreen) {
-        this.nextScreen = realmsScreen;
-        this.errorMessage(string1, string2);
+    public RealmsGenericErrorScreen(final Component mr1, final Component mr2, final Screen dqs) {
+        this.nextScreen = dqs;
+        this.errorMessage(mr1, mr2);
     }
     
-    private void errorMessage(final RealmsServiceException czg) {
-        if (czg.errorCode == -1) {
-            this.line1 = "An error occurred (" + czg.httpResultCode + "):";
-            this.line2 = czg.httpResponseContent;
+    private void errorMessage(final RealmsServiceException djh) {
+        if (djh.errorCode == -1) {
+            this.line1 = new TextComponent("An error occurred (" + djh.httpResultCode + "):");
+            this.line2 = new TextComponent(djh.httpResponseContent);
         }
         else {
-            this.line1 = "Realms (" + czg.errorCode + "):";
-            final String string3 = "mco.errorMessage." + czg.errorCode;
-            final String string4 = RealmsScreen.getLocalizedString(string3);
-            this.line2 = (string4.equals(string3) ? czg.errorMsg : string4);
+            this.line1 = new TextComponent("Realms (" + djh.errorCode + "):");
+            final String string3 = "mco.errorMessage." + djh.errorCode;
+            this.line2 = (I18n.exists(string3) ? new TranslatableComponent(string3) : Component.nullToEmpty(djh.errorMsg));
         }
     }
     
-    private void errorMessage(final String string) {
-        this.line1 = "An error occurred: ";
-        this.line2 = string;
+    private void errorMessage(final Component mr) {
+        this.line1 = new TextComponent("An error occurred: ");
+        this.line2 = mr;
     }
     
-    private void errorMessage(final String string1, final String string2) {
-        this.line1 = string1;
-        this.line2 = string2;
+    private void errorMessage(final Component mr1, final Component mr2) {
+        this.line1 = mr1;
+        this.line2 = mr2;
     }
     
-    @Override
     public void init() {
-        Realms.narrateNow(this.line1 + ": " + this.line2);
-        this.buttonsAdd(new RealmsButton(10, this.width() / 2 - 100, this.height() - 52, 200, 20, "Ok") {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsGenericErrorScreen.this.nextScreen);
-            }
-        });
+        NarrationHelper.now(this.line1.getString() + ": " + this.line2.getString());
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 52, 200, 20, new TextComponent("Ok"), dni -> this.minecraft.setScreen(this.nextScreen)));
     }
     
     @Override
-    public void tick() {
-        super.tick();
-    }
-    
-    @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.line1, this.width() / 2, 80, 16777215);
-        this.drawCenteredString(this.line2, this.width() / 2, 100, 16711680);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.line1, this.width / 2, 80, 16777215);
+        this.drawCenteredString(dhl, this.font, this.line2, this.width / 2, 100, 16711680);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsInviteScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsInviteScreen.java
index ef6b808..19237c5 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsInviteScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsInviteScreen.java
@@ -1,34 +1,34 @@
 package com.mojang.realmsclient.gui.screens;
 
 import org.apache.logging.log4j.LogManager;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.realms.NarrationHelper;
+import net.minecraft.client.resources.language.I18n;
 import com.mojang.realmsclient.client.RealmsClient;
-import net.minecraft.realms.RealmsGuiEventListener;
-import net.minecraft.realms.Realms;
-import net.minecraft.realms.AbstractRealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
-import net.minecraft.realms.RealmsButton;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.client.gui.screens.Screen;
 import com.mojang.realmsclient.dto.RealmsServer;
-import net.minecraft.realms.RealmsEditBox;
+import net.minecraft.client.gui.components.EditBox;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsInviteScreen extends RealmsScreen {
     private static final Logger LOGGER;
-    private RealmsEditBox profileName;
+    private EditBox profileName;
     private final RealmsServer serverData;
     private final RealmsConfigureWorldScreen configureScreen;
-    private final RealmsScreen lastScreen;
-    private final int BUTTON_INVITE_ID = 0;
-    private final int BUTTON_CANCEL_ID = 1;
-    private RealmsButton inviteButton;
-    private final int PROFILENAME_EDIT_BOX = 2;
+    private final Screen lastScreen;
     private String errorMsg;
     private boolean showError;
     
-    public RealmsInviteScreen(final RealmsConfigureWorldScreen czs, final RealmsScreen realmsScreen, final RealmsServer realmsServer) {
-        this.configureScreen = czs;
-        this.lastScreen = realmsScreen;
-        this.serverData = realmsServer;
+    public RealmsInviteScreen(final RealmsConfigureWorldScreen djr, final Screen dqs, final RealmsServer dip) {
+        this.configureScreen = djr;
+        this.lastScreen = dqs;
+        this.serverData = dip;
     }
     
     @Override
@@ -36,75 +36,64 @@ public class RealmsInviteScreen extends RealmsScreen {
         this.profileName.tick();
     }
     
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        this.buttonsAdd(this.inviteButton = new RealmsButton(0, this.width() / 2 - 100, RealmsConstants.row(10), RealmsScreen.getLocalizedString("mco.configure.world.buttons.invite")) {
-            @Override
-            public void onPress() {
-                RealmsInviteScreen.this.onInvite();
-            }
-        });
-        this.buttonsAdd(new RealmsButton(1, this.width() / 2 - 100, RealmsConstants.row(12), RealmsScreen.getLocalizedString("gui.cancel")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsInviteScreen.this.lastScreen);
-            }
-        });
-        this.focusOn(this.profileName = this.newEditBox(2, this.width() / 2 - 100, RealmsConstants.row(2), 200, 20, RealmsScreen.getLocalizedString("mco.configure.world.invite.profile.name")));
-        this.addWidget(this.profileName);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        this.<EditBox>addWidget(this.profileName = new EditBox(this.minecraft.font, this.width / 2 - 100, RealmsScreen.row(2), 200, 20, null, new TranslatableComponent("mco.configure.world.invite.profile.name")));
+        this.setInitialFocus(this.profileName);
+        this.<Button>addButton(new Button(this.width / 2 - 100, RealmsScreen.row(10), 200, 20, new TranslatableComponent("mco.configure.world.buttons.invite"), dni -> this.onInvite()));
+        this.<Button>addButton(new Button(this.width / 2 - 100, RealmsScreen.row(12), 200, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(this.lastScreen)));
     }
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     private void onInvite() {
-        final RealmsClient cyy2 = RealmsClient.createRealmsClient();
+        final RealmsClient dia2 = RealmsClient.create();
         if (this.profileName.getValue() == null || this.profileName.getValue().isEmpty()) {
-            this.showError(RealmsScreen.getLocalizedString("mco.configure.world.players.error"));
+            this.showError(I18n.get("mco.configure.world.players.error"));
             return;
         }
         try {
-            final RealmsServer realmsServer3 = cyy2.invite(this.serverData.id, this.profileName.getValue().trim());
-            if (realmsServer3 != null) {
-                this.serverData.players = realmsServer3.players;
-                Realms.setScreen(new RealmsPlayerScreen(this.configureScreen, this.serverData));
+            final RealmsServer dip3 = dia2.invite(this.serverData.id, this.profileName.getValue().trim());
+            if (dip3 != null) {
+                this.serverData.players = dip3.players;
+                this.minecraft.setScreen(new RealmsPlayerScreen(this.configureScreen, this.serverData));
             }
             else {
-                this.showError(RealmsScreen.getLocalizedString("mco.configure.world.players.error"));
+                this.showError(I18n.get("mco.configure.world.players.error"));
             }
         }
         catch (Exception exception3) {
             RealmsInviteScreen.LOGGER.error("Couldn't invite user");
-            this.showError(RealmsScreen.getLocalizedString("mco.configure.world.players.error"));
+            this.showError(I18n.get("mco.configure.world.players.error"));
         }
     }
     
     private void showError(final String string) {
         this.showError = true;
-        Realms.narrateNow(this.errorMsg = string);
+        NarrationHelper.now(this.errorMsg = string);
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawString(RealmsScreen.getLocalizedString("mco.configure.world.invite.profile.name"), this.width() / 2 - 100, RealmsConstants.row(1), 10526880);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.font.draw(dhl, I18n.get("mco.configure.world.invite.profile.name"), (float)(this.width / 2 - 100), (float)RealmsScreen.row(1), 10526880);
         if (this.showError) {
-            this.drawCenteredString(this.errorMsg, this.width() / 2, RealmsConstants.row(5), 16711680);
+            this.drawCenteredString(dhl, this.font, this.errorMsg, this.width / 2, RealmsScreen.row(5), 16711680);
         }
-        this.profileName.render(integer1, integer2, float3);
-        super.render(integer1, integer2, float3);
+        this.profileName.render(dhl, integer2, integer3, float4);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.java
index 7c200e9..df7ad2b 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.java
@@ -1,78 +1,57 @@
 package com.mojang.realmsclient.gui.screens;
 
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.RealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
-import net.minecraft.realms.Realms;
-import net.minecraft.realms.RealmsConfirmResultListener;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.realms.NarrationHelper;
+import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
+import net.minecraft.network.chat.Component;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsLongConfirmationScreen extends RealmsScreen {
     private final Type type;
-    private final String line2;
-    private final String line3;
-    protected final RealmsConfirmResultListener listener;
-    protected final String yesButton;
-    protected final String noButton;
-    private final String okButton;
-    protected final int id;
+    private final Component line2;
+    private final Component line3;
+    protected final BooleanConsumer callback;
     private final boolean yesNoQuestion;
     
-    public RealmsLongConfirmationScreen(final RealmsConfirmResultListener realmsConfirmResultListener, final Type a, final String string3, final String string4, final boolean boolean5, final int integer) {
-        this.listener = realmsConfirmResultListener;
-        this.id = integer;
+    public RealmsLongConfirmationScreen(final BooleanConsumer booleanConsumer, final Type a, final Component mr3, final Component mr4, final boolean boolean5) {
+        this.callback = booleanConsumer;
         this.type = a;
-        this.line2 = string3;
-        this.line3 = string4;
+        this.line2 = mr3;
+        this.line3 = mr4;
         this.yesNoQuestion = boolean5;
-        this.yesButton = RealmsScreen.getLocalizedString("gui.yes");
-        this.noButton = RealmsScreen.getLocalizedString("gui.no");
-        this.okButton = RealmsScreen.getLocalizedString("mco.gui.ok");
     }
     
-    @Override
     public void init() {
-        Realms.narrateNow(this.type.text, this.line2, this.line3);
+        NarrationHelper.now(this.type.text, this.line2.getString(), this.line3.getString());
         if (this.yesNoQuestion) {
-            this.buttonsAdd(new RealmsButton(0, this.width() / 2 - 105, RealmsConstants.row(8), 100, 20, this.yesButton) {
-                @Override
-                public void onPress() {
-                    RealmsLongConfirmationScreen.this.listener.confirmResult(true, RealmsLongConfirmationScreen.this.id);
-                }
-            });
-            this.buttonsAdd(new RealmsButton(1, this.width() / 2 + 5, RealmsConstants.row(8), 100, 20, this.noButton) {
-                @Override
-                public void onPress() {
-                    RealmsLongConfirmationScreen.this.listener.confirmResult(false, RealmsLongConfirmationScreen.this.id);
-                }
-            });
+            this.<Button>addButton(new Button(this.width / 2 - 105, RealmsScreen.row(8), 100, 20, CommonComponents.GUI_YES, dni -> this.callback.accept(true)));
+            this.<Button>addButton(new Button(this.width / 2 + 5, RealmsScreen.row(8), 100, 20, CommonComponents.GUI_NO, dni -> this.callback.accept(false)));
         }
         else {
-            this.buttonsAdd(new RealmsButton(0, this.width() / 2 - 50, RealmsConstants.row(8), 100, 20, this.okButton) {
-                @Override
-                public void onPress() {
-                    RealmsLongConfirmationScreen.this.listener.confirmResult(true, RealmsLongConfirmationScreen.this.id);
-                }
-            });
+            this.<Button>addButton(new Button(this.width / 2 - 50, RealmsScreen.row(8), 100, 20, new TranslatableComponent("mco.gui.ok"), dni -> this.callback.accept(true)));
         }
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            this.listener.confirmResult(false, this.id);
+            this.callback.accept(false);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.type.text, this.width() / 2, RealmsConstants.row(2), this.type.colorCode);
-        this.drawCenteredString(this.line2, this.width() / 2, RealmsConstants.row(4), 16777215);
-        this.drawCenteredString(this.line3, this.width() / 2, RealmsConstants.row(6), 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.type.text, this.width / 2, RealmsScreen.row(2), this.type.colorCode);
+        this.drawCenteredString(dhl, this.font, this.line2, this.width / 2, RealmsScreen.row(4), 16777215);
+        this.drawCenteredString(dhl, this.font, this.line3, this.width / 2, RealmsScreen.row(6), 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     public enum Type {
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java
index 6af7dd8..e984ee8 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java
@@ -1,47 +1,48 @@
 package com.mojang.realmsclient.gui.screens;
 
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.RealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
-import net.minecraft.realms.Realms;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import java.util.Set;
+import java.util.function.Predicate;
+import com.google.common.collect.Sets;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.realms.NarrationHelper;
 import com.mojang.realmsclient.exception.RealmsDefaultUncaughtExceptionHandler;
-import com.mojang.realmsclient.gui.LongRunningTask;
+import com.mojang.realmsclient.util.task.LongRunningTask;
+import net.minecraft.network.chat.Component;
+import net.minecraft.client.gui.screens.Screen;
 import org.apache.logging.log4j.Logger;
+import com.mojang.realmsclient.gui.ErrorCallback;
 import net.minecraft.realms.RealmsScreen;
 
-public class RealmsLongRunningMcoTaskScreen extends RealmsScreen {
+public class RealmsLongRunningMcoTaskScreen extends RealmsScreen implements ErrorCallback {
     private static final Logger LOGGER;
-    private final int BUTTON_CANCEL_ID = 666;
-    private final int BUTTON_BACK_ID = 667;
-    private final RealmsScreen lastScreen;
-    private final LongRunningTask taskThread;
+    private final Screen lastScreen;
     private volatile String title;
     private volatile boolean error;
-    private volatile String errorMessage;
+    private volatile Component errorMessage;
     private volatile boolean aborted;
     private int animTicks;
     private final LongRunningTask task;
     private final int buttonLength = 212;
-    public static final String[] symbols;
+    public static final String[] SYMBOLS;
     
-    public RealmsLongRunningMcoTaskScreen(final RealmsScreen realmsScreen, final LongRunningTask czj) {
+    public RealmsLongRunningMcoTaskScreen(final Screen dqs, final LongRunningTask dkz) {
         this.title = "";
-        this.lastScreen = realmsScreen;
-        (this.task = czj).setScreen(this);
-        this.taskThread = czj;
-    }
-    
-    public void start() {
-        final Thread thread2 = new Thread(this.taskThread, "Realms-long-running-task");
-        thread2.setUncaughtExceptionHandler(new RealmsDefaultUncaughtExceptionHandler(RealmsLongRunningMcoTaskScreen.LOGGER));
-        thread2.start();
+        this.lastScreen = dqs;
+        (this.task = dkz).setScreen(this);
+        final Thread thread4 = new Thread(dkz, "Realms-long-running-task");
+        thread4.setUncaughtExceptionHandler(new RealmsDefaultUncaughtExceptionHandler(RealmsLongRunningMcoTaskScreen.LOGGER));
+        thread4.start();
     }
     
     @Override
     public void tick() {
         super.tick();
-        Realms.narrateRepeatedly(this.title);
+        NarrationHelper.repeatedly(this.title);
         ++this.animTicks;
         this.task.tick();
     }
@@ -55,46 +56,43 @@ public class RealmsLongRunningMcoTaskScreen extends RealmsScreen {
         return super.keyPressed(integer1, integer2, integer3);
     }
     
-    @Override
     public void init() {
         this.task.init();
-        this.buttonsAdd(new RealmsButton(666, this.width() / 2 - 106, RealmsConstants.row(12), 212, 20, RealmsScreen.getLocalizedString("gui.cancel")) {
-            @Override
-            public void onPress() {
-                RealmsLongRunningMcoTaskScreen.this.cancelOrBackButtonClicked();
-            }
-        });
+        this.<Button>addButton(new Button(this.width / 2 - 106, RealmsScreen.row(12), 212, 20, CommonComponents.GUI_CANCEL, dni -> this.cancelOrBackButtonClicked()));
     }
     
     private void cancelOrBackButtonClicked() {
         this.aborted = true;
         this.task.abortTask();
-        Realms.setScreen(this.lastScreen);
+        this.minecraft.setScreen(this.lastScreen);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.title, this.width() / 2, RealmsConstants.row(3), 16777215);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, RealmsScreen.row(3), 16777215);
         if (!this.error) {
-            this.drawCenteredString(RealmsLongRunningMcoTaskScreen.symbols[this.animTicks % RealmsLongRunningMcoTaskScreen.symbols.length], this.width() / 2, RealmsConstants.row(8), 8421504);
+            this.drawCenteredString(dhl, this.font, RealmsLongRunningMcoTaskScreen.SYMBOLS[this.animTicks % RealmsLongRunningMcoTaskScreen.SYMBOLS.length], this.width / 2, RealmsScreen.row(8), 8421504);
         }
         if (this.error) {
-            this.drawCenteredString(this.errorMessage, this.width() / 2, RealmsConstants.row(8), 16711680);
+            this.drawCenteredString(dhl, this.font, this.errorMessage, this.width / 2, RealmsScreen.row(8), 16711680);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
-    public void error(final String string) {
+    @Override
+    public void error(final Component mr) {
         this.error = true;
-        Realms.narrateNow(this.errorMessage = string);
+        this.errorMessage = mr;
+        NarrationHelper.now(mr.getString());
         this.buttonsClear();
-        this.buttonsAdd(new RealmsButton(667, this.width() / 2 - 106, this.height() / 4 + 120 + 12, RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                RealmsLongRunningMcoTaskScreen.this.cancelOrBackButtonClicked();
-            }
-        });
+        this.<Button>addButton(new Button(this.width / 2 - 106, this.height / 4 + 120 + 12, 200, 20, CommonComponents.GUI_BACK, dni -> this.cancelOrBackButtonClicked()));
+    }
+    
+    public void buttonsClear() {
+        final Set<GuiEventListener> set2 = Sets.newHashSet(this.buttons);
+        this.children.removeIf(set2::contains);
+        this.buttons.clear();
     }
     
     public void setTitle(final String string) {
@@ -107,6 +105,6 @@ public class RealmsLongRunningMcoTaskScreen extends RealmsScreen {
     
     static {
         LOGGER = LogManager.getLogger();
-        symbols = new String[] { "\u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583", "_ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584", "_ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585", "_ _ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586", "_ _ _ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587", "_ _ _ _ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588", "_ _ _ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587", "_ _ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586", "_ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585", "_ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584", "\u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583", "\u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _", "\u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _", "\u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _ _", "\u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _ _ _", "\u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _ _ _ _", "\u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _ _ _", "\u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _ _", "\u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _", "\u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _" };
+        SYMBOLS = new String[] { "\u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583", "_ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584", "_ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585", "_ _ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586", "_ _ _ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587", "_ _ _ _ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588", "_ _ _ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587", "_ _ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586", "_ _ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585", "_ \u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584", "\u2583 \u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583", "\u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _", "\u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _", "\u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _ _", "\u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _ _ _", "\u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _ _ _ _", "\u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _ _ _", "\u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _ _", "\u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _ _", "\u2584 \u2585 \u2586 \u2587 \u2588 \u2587 \u2586 \u2585 \u2584 \u2583 _" };
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java
index 3a37683..6b73599 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsNotificationsScreen.java
@@ -1,77 +1,80 @@
 package com.mojang.realmsclient.gui.screens;
 
-import java.util.Arrays;
+import net.minecraft.Util;
+import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
-import java.io.IOException;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.realmsclient.exception.RealmsServiceException;
 import com.mojang.realmsclient.client.RealmsClient;
-import net.minecraft.realms.Realms;
-import java.util.List;
+import net.minecraft.client.gui.screens.TitleScreen;
 import com.mojang.realmsclient.gui.RealmsDataFetcher;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsNotificationsScreen extends RealmsScreen {
-    private static final RealmsDataFetcher realmsDataFetcher;
+    private static final ResourceLocation INVITE_ICON_LOCATION;
+    private static final ResourceLocation TRIAL_ICON_LOCATION;
+    private static final ResourceLocation NEWS_ICON_LOCATION;
+    private static final RealmsDataFetcher REALMS_DATA_FETCHER;
     private volatile int numberOfPendingInvites;
     private static boolean checkedMcoAvailability;
     private static boolean trialAvailable;
     private static boolean validClient;
     private static boolean hasUnreadNews;
-    private static final List<RealmsDataFetcher.Task> tasks;
     
-    public RealmsNotificationsScreen(final RealmsScreen realmsScreen) {
-    }
-    
-    @Override
     public void init() {
         this.checkIfMcoEnabled();
-        this.setKeyboardHandlerSendRepeatsToGui(true);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
     }
     
     @Override
     public void tick() {
-        if ((!Realms.getRealmsNotificationsEnabled() || !Realms.inTitleScreen() || !RealmsNotificationsScreen.validClient) && !RealmsNotificationsScreen.realmsDataFetcher.isStopped()) {
-            RealmsNotificationsScreen.realmsDataFetcher.stop();
+        if ((!this.getRealmsNotificationsEnabled() || !this.inTitleScreen() || !RealmsNotificationsScreen.validClient) && !RealmsNotificationsScreen.REALMS_DATA_FETCHER.isStopped()) {
+            RealmsNotificationsScreen.REALMS_DATA_FETCHER.stop();
             return;
         }
-        if (RealmsNotificationsScreen.validClient && Realms.getRealmsNotificationsEnabled()) {
-            RealmsNotificationsScreen.realmsDataFetcher.initWithSpecificTaskList(RealmsNotificationsScreen.tasks);
-            if (RealmsNotificationsScreen.realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.PENDING_INVITE)) {
-                this.numberOfPendingInvites = RealmsNotificationsScreen.realmsDataFetcher.getPendingInvitesCount();
+        if (RealmsNotificationsScreen.validClient && this.getRealmsNotificationsEnabled()) {
+            RealmsNotificationsScreen.REALMS_DATA_FETCHER.initWithSpecificTaskList();
+            if (RealmsNotificationsScreen.REALMS_DATA_FETCHER.isFetchedSinceLastTry(RealmsDataFetcher.Task.PENDING_INVITE)) {
+                this.numberOfPendingInvites = RealmsNotificationsScreen.REALMS_DATA_FETCHER.getPendingInvitesCount();
             }
-            if (RealmsNotificationsScreen.realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.TRIAL_AVAILABLE)) {
-                RealmsNotificationsScreen.trialAvailable = RealmsNotificationsScreen.realmsDataFetcher.isTrialAvailable();
+            if (RealmsNotificationsScreen.REALMS_DATA_FETCHER.isFetchedSinceLastTry(RealmsDataFetcher.Task.TRIAL_AVAILABLE)) {
+                RealmsNotificationsScreen.trialAvailable = RealmsNotificationsScreen.REALMS_DATA_FETCHER.isTrialAvailable();
             }
-            if (RealmsNotificationsScreen.realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.UNREAD_NEWS)) {
-                RealmsNotificationsScreen.hasUnreadNews = RealmsNotificationsScreen.realmsDataFetcher.hasUnreadNews();
+            if (RealmsNotificationsScreen.REALMS_DATA_FETCHER.isFetchedSinceLastTry(RealmsDataFetcher.Task.UNREAD_NEWS)) {
+                RealmsNotificationsScreen.hasUnreadNews = RealmsNotificationsScreen.REALMS_DATA_FETCHER.hasUnreadNews();
             }
-            RealmsNotificationsScreen.realmsDataFetcher.markClean();
+            RealmsNotificationsScreen.REALMS_DATA_FETCHER.markClean();
         }
     }
     
+    private boolean getRealmsNotificationsEnabled() {
+        return this.minecraft.options.realmsNotifications;
+    }
+    
+    private boolean inTitleScreen() {
+        return this.minecraft.screen instanceof TitleScreen;
+    }
+    
     private void checkIfMcoEnabled() {
         if (!RealmsNotificationsScreen.checkedMcoAvailability) {
             RealmsNotificationsScreen.checkedMcoAvailability = true;
             new Thread("Realms Notification Availability checker #1") {
                 @Override
                 public void run() {
-                    final RealmsClient cyy2 = RealmsClient.createRealmsClient();
+                    final RealmsClient dia2 = RealmsClient.create();
                     try {
-                        final RealmsClient.CompatibleVersionResponse a3 = cyy2.clientCompatible();
-                        if (!a3.equals(RealmsClient.CompatibleVersionResponse.COMPATIBLE)) {
+                        final RealmsClient.CompatibleVersionResponse a3 = dia2.clientCompatible();
+                        if (a3 != RealmsClient.CompatibleVersionResponse.COMPATIBLE) {
                             return;
                         }
                     }
-                    catch (RealmsServiceException czg3) {
-                        if (czg3.httpResultCode != 401) {
+                    catch (RealmsServiceException djh3) {
+                        if (djh3.httpResultCode != 401) {
                             RealmsNotificationsScreen.checkedMcoAvailability = false;
                         }
                         return;
                     }
-                    catch (IOException iOException3) {
-                        RealmsNotificationsScreen.checkedMcoAvailability = false;
-                        return;
-                    }
                     RealmsNotificationsScreen.validClient = true;
                 }
             }.start();
@@ -79,62 +82,55 @@ public class RealmsNotificationsScreen extends RealmsScreen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (RealmsNotificationsScreen.validClient) {
-            this.drawIcons(integer1, integer2);
+            this.drawIcons(dhl, integer2, integer3);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return super.mouseClicked(double1, double2, integer);
-    }
-    
-    private void drawIcons(final int integer1, final int integer2) {
-        final int integer3 = this.numberOfPendingInvites;
-        final int integer4 = 24;
-        final int integer5 = this.height() / 4 + 48;
-        final int integer6 = this.width() / 2 + 80;
-        final int integer7 = integer5 + 48 + 2;
-        int integer8 = 0;
+    private void drawIcons(final PoseStack dhl, final int integer2, final int integer3) {
+        final int integer4 = this.numberOfPendingInvites;
+        final int integer5 = 24;
+        final int integer6 = this.height / 4 + 48;
+        final int integer7 = this.width / 2 + 80;
+        final int integer8 = integer6 + 48 + 2;
+        int integer9 = 0;
         if (RealmsNotificationsScreen.hasUnreadNews) {
-            RealmsScreen.bind("realms:textures/gui/realms/news_notification_mainscreen.png");
+            this.minecraft.getTextureManager().bind(RealmsNotificationsScreen.NEWS_ICON_LOCATION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
             RenderSystem.pushMatrix();
             RenderSystem.scalef(0.4f, 0.4f, 0.4f);
-            RealmsScreen.blit((int)((integer6 + 2 - integer8) * 2.5), (int)(integer7 * 2.5), 0.0f, 0.0f, 40, 40, 40, 40);
+            GuiComponent.blit(dhl, (int)((integer7 + 2 - integer9) * 2.5), (int)(integer8 * 2.5), 0.0f, 0.0f, 40, 40, 40, 40);
             RenderSystem.popMatrix();
-            integer8 += 14;
+            integer9 += 14;
         }
-        if (integer3 != 0) {
-            RealmsScreen.bind("realms:textures/gui/realms/invite_icon.png");
+        if (integer4 != 0) {
+            this.minecraft.getTextureManager().bind(RealmsNotificationsScreen.INVITE_ICON_LOCATION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            RenderSystem.pushMatrix();
-            RealmsScreen.blit(integer6 - integer8, integer7 - 6, 0.0f, 0.0f, 15, 25, 31, 25);
-            RenderSystem.popMatrix();
-            integer8 += 16;
+            GuiComponent.blit(dhl, integer7 - integer9, integer8 - 6, 0.0f, 0.0f, 15, 25, 31, 25);
+            integer9 += 16;
         }
         if (RealmsNotificationsScreen.trialAvailable) {
-            RealmsScreen.bind("realms:textures/gui/realms/trial_icon.png");
+            this.minecraft.getTextureManager().bind(RealmsNotificationsScreen.TRIAL_ICON_LOCATION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            RenderSystem.pushMatrix();
-            int integer9 = 0;
-            if ((System.currentTimeMillis() / 800L & 0x1L) == 0x1L) {
-                integer9 = 8;
+            int integer10 = 0;
+            if ((Util.getMillis() / 800L & 0x1L) == 0x1L) {
+                integer10 = 8;
             }
-            RealmsScreen.blit(integer6 + 4 - integer8, integer7 + 4, 0.0f, (float)integer9, 8, 8, 8, 16);
-            RenderSystem.popMatrix();
+            GuiComponent.blit(dhl, integer7 + 4 - integer9, integer8 + 4, 0.0f, (float)integer10, 8, 8, 8, 16);
         }
     }
     
     @Override
     public void removed() {
-        RealmsNotificationsScreen.realmsDataFetcher.stop();
+        RealmsNotificationsScreen.REALMS_DATA_FETCHER.stop();
     }
     
     static {
-        realmsDataFetcher = new RealmsDataFetcher();
-        tasks = Arrays.<RealmsDataFetcher.Task>asList(RealmsDataFetcher.Task.PENDING_INVITE, RealmsDataFetcher.Task.TRIAL_AVAILABLE, RealmsDataFetcher.Task.UNREAD_NEWS);
+        INVITE_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/invite_icon.png");
+        TRIAL_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/trial_icon.png");
+        NEWS_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/news_notification_mainscreen.png");
+        REALMS_DATA_FETCHER = new RealmsDataFetcher();
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsParentalConsentScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsParentalConsentScreen.java
index 6f2288d..5fa49f9 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsParentalConsentScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsParentalConsentScreen.java
@@ -2,67 +2,46 @@ package com.mojang.realmsclient.gui.screens;
 
 import java.util.Iterator;
 import java.util.List;
-import net.minecraft.realms.AbstractRealmsButton;
-import com.mojang.realmsclient.util.RealmsUtil;
-import net.minecraft.realms.RealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
-import net.minecraft.realms.Realms;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.Util;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.realms.NarrationHelper;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsParentalConsentScreen extends RealmsScreen {
-    private final RealmsScreen nextScreen;
+    private final Screen nextScreen;
     
-    public RealmsParentalConsentScreen(final RealmsScreen realmsScreen) {
-        this.nextScreen = realmsScreen;
+    public RealmsParentalConsentScreen(final Screen dqs) {
+        this.nextScreen = dqs;
     }
     
-    @Override
     public void init() {
-        Realms.narrateNow(RealmsScreen.getLocalizedString("mco.account.privacyinfo"));
-        final String string2 = RealmsScreen.getLocalizedString("mco.account.update");
-        final String string3 = RealmsScreen.getLocalizedString("gui.back");
-        final int integer4 = Math.max(this.fontWidth(string2), this.fontWidth(string3)) + 30;
-        final String string4 = RealmsScreen.getLocalizedString("mco.account.privacy.info");
-        final int integer5 = (int)(this.fontWidth(string4) * 1.2);
-        this.buttonsAdd(new RealmsButton(1, this.width() / 2 - integer5 / 2, RealmsConstants.row(11), integer5, 20, string4) {
-            @Override
-            public void onPress() {
-                RealmsUtil.browseTo("https://minecraft.net/privacy/gdpr/");
-            }
-        });
-        this.buttonsAdd(new RealmsButton(1, this.width() / 2 - (integer4 + 5), RealmsConstants.row(13), integer4, 20, string2) {
-            @Override
-            public void onPress() {
-                RealmsUtil.browseTo("https://minecraft.net/update-account");
-            }
-        });
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 + 5, RealmsConstants.row(13), integer4, 20, string3) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsParentalConsentScreen.this.nextScreen);
-            }
-        });
+        NarrationHelper.now(I18n.get("mco.account.privacyinfo"));
+        final Component mr2 = new TranslatableComponent("mco.account.update");
+        final Component mr3 = CommonComponents.GUI_BACK;
+        final int integer4 = Math.max(this.font.width(mr2), this.font.width(mr3)) + 30;
+        final Component mr4 = new TranslatableComponent("mco.account.privacy.info");
+        final int integer5 = (int)(this.font.width(mr4) * 1.2);
+        this.<Button>addButton(new Button(this.width / 2 - integer5 / 2, RealmsScreen.row(11), integer5, 20, mr4, dni -> Util.getPlatform().openUri("https://minecraft.net/privacy/gdpr/")));
+        this.<Button>addButton(new Button(this.width / 2 - (integer4 + 5), RealmsScreen.row(13), integer4, 20, mr2, dni -> Util.getPlatform().openUri("https://minecraft.net/update-account")));
+        this.<Button>addButton(new Button(this.width / 2 + 5, RealmsScreen.row(13), integer4, 20, mr3, dni -> this.minecraft.setScreen(this.nextScreen)));
     }
     
     @Override
-    public void tick() {
-        super.tick();
-    }
-    
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return super.mouseClicked(double1, double2, integer);
-    }
-    
-    @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        final List<String> list5 = this.getLocalizedStringWithLineWidth("mco.account.privacyinfo", (int)Math.round(this.width() * 0.9));
-        int integer3 = 15;
-        for (final String string8 : list5) {
-            this.drawCenteredString(string8, this.width() / 2, integer3, 16777215);
-            integer3 += 15;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        final List<FormattedText> list6 = this.minecraft.font.split(new TranslatableComponent("mco.account.privacyinfo"), (int)Math.round(this.width * 0.9));
+        int integer4 = 15;
+        for (final FormattedText mu9 : list6) {
+            this.drawCenteredString(dhl, this.font, mu9, this.width / 2, integer4, 16777215);
+            integer4 += 15;
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java
index 43036e5..8a3613d 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java
@@ -1,59 +1,70 @@
 package com.mojang.realmsclient.gui.screens;
 
 import com.mojang.realmsclient.util.RealmsTextureManager;
+import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.realmsclient.gui.RowButton;
-import net.minecraft.realms.RealmListEntry;
+import net.minecraft.client.gui.components.ObjectSelectionList;
+import net.minecraft.client.gui.components.AbstractSelectionList;
+import javax.annotation.Nullable;
+import net.minecraft.realms.NarrationHelper;
 import java.util.Arrays;
+import com.mojang.realmsclient.util.RealmsUtil;
 import net.minecraft.realms.RealmsObjectSelectionList;
 import org.apache.logging.log4j.LogManager;
-import com.mojang.realmsclient.util.RealmsUtil;
-import net.minecraft.realms.RealmsGuiEventListener;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.realmsclient.RealmsMainScreen;
-import net.minecraft.realms.AbstractRealmsButton;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.realmsclient.dto.PendingInvite;
 import com.mojang.realmsclient.exception.RealmsServiceException;
-import net.minecraft.realms.Realms;
 import java.util.Collection;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.List;
 import com.mojang.realmsclient.client.RealmsClient;
-import net.minecraft.realms.RealmsButton;
+import net.minecraft.client.gui.components.Button;
 import net.minecraft.realms.RealmsLabel;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsPendingInvitesScreen extends RealmsScreen {
     private static final Logger LOGGER;
-    private final RealmsScreen lastScreen;
+    private static final ResourceLocation ACCEPT_ICON_LOCATION;
+    private static final ResourceLocation REJECT_ICON_LOCATION;
+    private final Screen lastScreen;
     private String toolTip;
     private boolean loaded;
     private PendingInvitationSelectionList pendingInvitationSelectionList;
     private RealmsLabel titleLabel;
     private int selectedInvite;
-    private RealmsButton acceptButton;
-    private RealmsButton rejectButton;
+    private Button acceptButton;
+    private Button rejectButton;
     
-    public RealmsPendingInvitesScreen(final RealmsScreen realmsScreen) {
+    public RealmsPendingInvitesScreen(final Screen dqs) {
         this.selectedInvite = -1;
-        this.lastScreen = realmsScreen;
+        this.lastScreen = dqs;
     }
     
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
         this.pendingInvitationSelectionList = new PendingInvitationSelectionList();
         new Thread("Realms-pending-invitations-fetcher") {
             @Override
             public void run() {
-                final RealmsClient cyy2 = RealmsClient.createRealmsClient();
+                final RealmsClient dia2 = RealmsClient.create();
                 try {
-                    final List<PendingInvite> list3 = cyy2.pendingInvites().pendingInvites;
-                    final List<PendingInvitationSelectionListEntry> list4 = list3.stream().map(pendingInvite -> new PendingInvitationSelectionListEntry(pendingInvite)).collect(Collectors.toList());
-                    Realms.execute(() -> RealmsPendingInvitesScreen.this.pendingInvitationSelectionList.replaceEntries(list4));
+                    final List<PendingInvite> list3 = dia2.pendingInvites().pendingInvites;
+                    final List<Entry> list4 = list3.stream().map(dij -> new Entry(dij)).collect(Collectors.toList());
+                    RealmsPendingInvitesScreen.this.minecraft.execute(() -> RealmsPendingInvitesScreen.this.pendingInvitationSelectionList.replaceEntries(list4));
                 }
-                catch (RealmsServiceException czg3) {
+                catch (RealmsServiceException djh3) {
                     RealmsPendingInvitesScreen.LOGGER.error("Couldn't list invites");
                 }
                 finally {
@@ -61,43 +72,29 @@ public class RealmsPendingInvitesScreen extends RealmsScreen {
                 }
             }
         }.start();
-        this.buttonsAdd(this.acceptButton = new RealmsButton(1, this.width() / 2 - 174, this.height() - 32, 100, 20, RealmsScreen.getLocalizedString("mco.invites.button.accept")) {
-            @Override
-            public void onPress() {
-                RealmsPendingInvitesScreen.this.accept(RealmsPendingInvitesScreen.this.selectedInvite);
-                RealmsPendingInvitesScreen.this.selectedInvite = -1;
-                RealmsPendingInvitesScreen.this.updateButtonStates();
-            }
-        });
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 - 50, this.height() - 32, 100, 20, RealmsScreen.getLocalizedString("gui.done")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsMainScreen(RealmsPendingInvitesScreen.this.lastScreen));
-            }
-        });
-        this.buttonsAdd(this.rejectButton = new RealmsButton(2, this.width() / 2 + 74, this.height() - 32, 100, 20, RealmsScreen.getLocalizedString("mco.invites.button.reject")) {
-            @Override
-            public void onPress() {
-                RealmsPendingInvitesScreen.this.reject(RealmsPendingInvitesScreen.this.selectedInvite);
-                RealmsPendingInvitesScreen.this.selectedInvite = -1;
-                RealmsPendingInvitesScreen.this.updateButtonStates();
-            }
-        });
-        this.addWidget(this.titleLabel = new RealmsLabel(RealmsScreen.getLocalizedString("mco.invites.title"), this.width() / 2, 12, 16777215));
-        this.addWidget(this.pendingInvitationSelectionList);
+        this.<PendingInvitationSelectionList>addWidget(this.pendingInvitationSelectionList);
+        this.acceptButton = this.<Button>addButton(new Button(this.width / 2 - 174, this.height - 32, 100, 20, new TranslatableComponent("mco.invites.button.accept"), dni -> {
+            this.accept(this.selectedInvite);
+            this.selectedInvite = -1;
+            this.updateButtonStates();
+            return;
+        }));
+        this.<Button>addButton(new Button(this.width / 2 - 50, this.height - 32, 100, 20, CommonComponents.GUI_DONE, dni -> this.minecraft.setScreen(new RealmsMainScreen(this.lastScreen))));
+        this.rejectButton = this.<Button>addButton(new Button(this.width / 2 + 74, this.height - 32, 100, 20, new TranslatableComponent("mco.invites.button.reject"), dni -> {
+            this.reject(this.selectedInvite);
+            this.selectedInvite = -1;
+            this.updateButtonStates();
+            return;
+        }));
+        this.<RealmsLabel>addWidget(this.titleLabel = new RealmsLabel(new TranslatableComponent("mco.invites.title"), this.width / 2, 12, 16777215));
         this.narrateLabels();
         this.updateButtonStates();
     }
     
-    @Override
-    public void tick() {
-        super.tick();
-    }
-    
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            Realms.setScreen(new RealmsMainScreen(this.lastScreen));
+            this.minecraft.setScreen(new RealmsMainScreen(this.lastScreen));
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
@@ -113,11 +110,11 @@ public class RealmsPendingInvitesScreen extends RealmsScreen {
                 @Override
                 public void run() {
                     try {
-                        final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-                        cyy2.rejectInvitation(RealmsPendingInvitesScreen.this.pendingInvitationSelectionList.children().get(integer).pendingInvite.invitationId);
-                        Realms.execute(() -> RealmsPendingInvitesScreen.this.updateList(integer));
+                        final RealmsClient dia2 = RealmsClient.create();
+                        dia2.rejectInvitation(RealmsPendingInvitesScreen.this.pendingInvitationSelectionList.children().get(integer).pendingInvite.invitationId);
+                        RealmsPendingInvitesScreen.this.minecraft.execute(() -> RealmsPendingInvitesScreen.this.updateList(integer));
                     }
-                    catch (RealmsServiceException czg2) {
+                    catch (RealmsServiceException djh2) {
                         RealmsPendingInvitesScreen.LOGGER.error("Couldn't reject invite");
                     }
                 }
@@ -131,11 +128,11 @@ public class RealmsPendingInvitesScreen extends RealmsScreen {
                 @Override
                 public void run() {
                     try {
-                        final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-                        cyy2.acceptInvitation(RealmsPendingInvitesScreen.this.pendingInvitationSelectionList.children().get(integer).pendingInvite.invitationId);
-                        Realms.execute(() -> RealmsPendingInvitesScreen.this.updateList(integer));
+                        final RealmsClient dia2 = RealmsClient.create();
+                        dia2.acceptInvitation(RealmsPendingInvitesScreen.this.pendingInvitationSelectionList.children().get(integer).pendingInvite.invitationId);
+                        RealmsPendingInvitesScreen.this.minecraft.execute(() -> RealmsPendingInvitesScreen.this.updateList(integer));
                     }
-                    catch (RealmsServiceException czg2) {
+                    catch (RealmsServiceException djh2) {
                         RealmsPendingInvitesScreen.LOGGER.error("Couldn't accept invite");
                     }
                 }
@@ -144,51 +141,49 @@ public class RealmsPendingInvitesScreen extends RealmsScreen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.toolTip = null;
-        this.renderBackground();
-        this.pendingInvitationSelectionList.render(integer1, integer2, float3);
-        this.titleLabel.render(this);
+        this.renderBackground(dhl);
+        this.pendingInvitationSelectionList.render(dhl, integer2, integer3, float4);
+        this.titleLabel.render(this, dhl);
         if (this.toolTip != null) {
-            this.renderMousehoverTooltip(this.toolTip, integer1, integer2);
+            this.renderMousehoverTooltip(dhl, this.toolTip, integer2, integer3);
         }
         if (this.pendingInvitationSelectionList.getItemCount() == 0 && this.loaded) {
-            this.drawCenteredString(RealmsScreen.getLocalizedString("mco.invites.nopending"), this.width() / 2, this.height() / 2 - 20, 16777215);
+            this.drawCenteredString(dhl, this.font, I18n.get("mco.invites.nopending"), this.width / 2, this.height / 2 - 20, 16777215);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
-    protected void renderMousehoverTooltip(final String string, final int integer2, final int integer3) {
+    protected void renderMousehoverTooltip(final PoseStack dhl, final String string, final int integer3, final int integer4) {
         if (string == null) {
             return;
         }
-        final int integer4 = integer2 + 12;
-        final int integer5 = integer3 - 12;
-        final int integer6 = this.fontWidth(string);
-        this.fillGradient(integer4 - 3, integer5 - 3, integer4 + integer6 + 3, integer5 + 8 + 3, -1073741824, -1073741824);
-        this.fontDrawShadow(string, integer4, integer5, 16777215);
+        final int integer5 = integer3 + 12;
+        final int integer6 = integer4 - 12;
+        final int integer7 = this.font.width(string);
+        this.fillGradient(dhl, integer5 - 3, integer6 - 3, integer5 + integer7 + 3, integer6 + 8 + 3, -1073741824, -1073741824);
+        this.font.drawShadow(dhl, string, (float)integer5, (float)integer6, 16777215);
     }
     
     private void updateButtonStates() {
-        this.acceptButton.setVisible(this.shouldAcceptAndRejectButtonBeVisible(this.selectedInvite));
-        this.rejectButton.setVisible(this.shouldAcceptAndRejectButtonBeVisible(this.selectedInvite));
+        this.acceptButton.visible = this.shouldAcceptAndRejectButtonBeVisible(this.selectedInvite);
+        this.rejectButton.visible = this.shouldAcceptAndRejectButtonBeVisible(this.selectedInvite);
     }
     
     private boolean shouldAcceptAndRejectButtonBeVisible(final int integer) {
         return integer != -1;
     }
     
-    public static String getAge(final PendingInvite pendingInvite) {
-        return RealmsUtil.convertToAgePresentation(System.currentTimeMillis() - pendingInvite.date.getTime());
-    }
-    
     static {
         LOGGER = LogManager.getLogger();
+        ACCEPT_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/accept_icon.png");
+        REJECT_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/reject_icon.png");
     }
     
-    class PendingInvitationSelectionList extends RealmsObjectSelectionList<PendingInvitationSelectionListEntry> {
+    class PendingInvitationSelectionList extends RealmsObjectSelectionList<RealmsPendingInvitesScreen.Entry> {
         public PendingInvitationSelectionList() {
-            super(RealmsPendingInvitesScreen.this.width(), RealmsPendingInvitesScreen.this.height(), 32, RealmsPendingInvitesScreen.this.height() - 40, 36);
+            super(RealmsPendingInvitesScreen.this.width, RealmsPendingInvitesScreen.this.height, 32, RealmsPendingInvitesScreen.this.height - 40, 36);
         }
         
         public void removeAtIndex(final int integer) {
@@ -205,25 +200,23 @@ public class RealmsPendingInvitesScreen extends RealmsScreen {
             return 260;
         }
         
-        @Override
         public boolean isFocused() {
-            return RealmsPendingInvitesScreen.this.isFocused(this);
+            return RealmsPendingInvitesScreen.this.getFocused() == this;
         }
         
-        @Override
-        public void renderBackground() {
-            RealmsPendingInvitesScreen.this.renderBackground();
+        public void renderBackground(final PoseStack dhl) {
+            RealmsPendingInvitesScreen.this.renderBackground(dhl);
         }
         
         @Override
         public void selectItem(final int integer) {
-            this.setSelected(integer);
+            this.setSelectedItem(integer);
             if (integer != -1) {
-                final List<PendingInvitationSelectionListEntry> list3 = RealmsPendingInvitesScreen.this.pendingInvitationSelectionList.children();
-                final PendingInvite pendingInvite4 = list3.get(integer).pendingInvite;
-                final String string5 = RealmsScreen.getLocalizedString("narrator.select.list.position", integer + 1, list3.size());
-                final String string6 = Realms.joinNarrations(Arrays.<String>asList(pendingInvite4.worldName, pendingInvite4.worldOwnerName, RealmsPendingInvitesScreen.getAge(pendingInvite4), string5));
-                Realms.narrateNow(RealmsScreen.getLocalizedString("narrator.select", string6));
+                final List<RealmsPendingInvitesScreen.Entry> list3 = RealmsPendingInvitesScreen.this.pendingInvitationSelectionList.children();
+                final PendingInvite dij4 = list3.get(integer).pendingInvite;
+                final String string5 = I18n.get("narrator.select.list.position", integer + 1, list3.size());
+                final String string6 = NarrationHelper.join(Arrays.<String>asList(dij4.worldName, dij4.worldOwnerName, RealmsUtil.convertToAgePresentationFromInstant(dij4.date), string5));
+                NarrationHelper.now(I18n.get("narrator.select", string6));
             }
             this.selectInviteListItem(integer);
         }
@@ -232,20 +225,27 @@ public class RealmsPendingInvitesScreen extends RealmsScreen {
             RealmsPendingInvitesScreen.this.selectedInvite = integer;
             RealmsPendingInvitesScreen.this.updateButtonStates();
         }
+        
+        @Override
+        public void setSelected(@Nullable final RealmsPendingInvitesScreen.Entry a) {
+            super.setSelected(a);
+            RealmsPendingInvitesScreen.this.selectedInvite = this.children().indexOf(a);
+            RealmsPendingInvitesScreen.this.updateButtonStates();
+        }
     }
     
-    class PendingInvitationSelectionListEntry extends RealmListEntry {
-        final PendingInvite pendingInvite;
+    class Entry extends ObjectSelectionList.Entry<Entry> {
+        private final PendingInvite pendingInvite;
         private final List<RowButton> rowButtons;
         
-        PendingInvitationSelectionListEntry(final PendingInvite pendingInvite) {
-            this.pendingInvite = pendingInvite;
+        Entry(final PendingInvite dij) {
+            this.pendingInvite = dij;
             this.rowButtons = Arrays.<RowButton>asList(new AcceptRowButton(), new RejectRowButton());
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            this.renderPendingInvitationItem(this.pendingInvite, integer3, integer2, integer6, integer7);
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.renderPendingInvitationItem(dhl, this.pendingInvite, integer4, integer3, integer7, integer8);
         }
         
         @Override
@@ -254,15 +254,15 @@ public class RealmsPendingInvitesScreen extends RealmsScreen {
             return true;
         }
         
-        private void renderPendingInvitationItem(final PendingInvite pendingInvite, final int integer2, final int integer3, final int integer4, final int integer5) {
-            RealmsPendingInvitesScreen.this.drawString(pendingInvite.worldName, integer2 + 38, integer3 + 1, 16777215);
-            RealmsPendingInvitesScreen.this.drawString(pendingInvite.worldOwnerName, integer2 + 38, integer3 + 12, 8421504);
-            RealmsPendingInvitesScreen.this.drawString(RealmsPendingInvitesScreen.getAge(pendingInvite), integer2 + 38, integer3 + 24, 8421504);
-            RowButton.drawButtonsInRow(this.rowButtons, RealmsPendingInvitesScreen.this.pendingInvitationSelectionList, integer2, integer3, integer4, integer5);
-            RealmsTextureManager.withBoundFace(pendingInvite.worldOwnerUuid, () -> {
+        private void renderPendingInvitationItem(final PoseStack dhl, final PendingInvite dij, final int integer3, final int integer4, final int integer5, final int integer6) {
+            RealmsPendingInvitesScreen.this.font.draw(dhl, dij.worldName, (float)(integer3 + 38), (float)(integer4 + 1), 16777215);
+            RealmsPendingInvitesScreen.this.font.draw(dhl, dij.worldOwnerName, (float)(integer3 + 38), (float)(integer4 + 12), 7105644);
+            RealmsPendingInvitesScreen.this.font.draw(dhl, RealmsUtil.convertToAgePresentationFromInstant(dij.date), (float)(integer3 + 38), (float)(integer4 + 24), 7105644);
+            RowButton.drawButtonsInRow(dhl, this.rowButtons, RealmsPendingInvitesScreen.this.pendingInvitationSelectionList, integer3, integer4, integer5, integer6);
+            RealmsTextureManager.withBoundFace(dij.worldOwnerUuid, () -> {
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                RealmsScreen.blit(integer2, integer3, 8.0f, 8.0f, 8, 8, 32, 32, 64, 64);
-                RealmsScreen.blit(integer2, integer3, 40.0f, 8.0f, 8, 8, 32, 32, 64, 64);
+                GuiComponent.blit(dhl, integer3, integer4, 32, 32, 8.0f, 8.0f, 8, 8, 64, 64);
+                GuiComponent.blit(dhl, integer3, integer4, 32, 32, 40.0f, 8.0f, 8, 8, 64, 64);
             });
         }
         
@@ -272,14 +272,13 @@ public class RealmsPendingInvitesScreen extends RealmsScreen {
             }
             
             @Override
-            protected void draw(final int integer1, final int integer2, final boolean boolean3) {
-                RealmsScreen.bind("realms:textures/gui/realms/accept_icon.png");
+            protected void draw(final PoseStack dhl, final int integer2, final int integer3, final boolean boolean4) {
+                RealmsPendingInvitesScreen.this.minecraft.getTextureManager().bind(RealmsPendingInvitesScreen.ACCEPT_ICON_LOCATION);
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                RenderSystem.pushMatrix();
-                RealmsScreen.blit(integer1, integer2, boolean3 ? 19.0f : 0.0f, 0.0f, 18, 18, 37, 18);
-                RenderSystem.popMatrix();
-                if (boolean3) {
-                    RealmsPendingInvitesScreen.this.toolTip = RealmsScreen.getLocalizedString("mco.invites.button.accept");
+                final float float6 = boolean4 ? 19.0f : 0.0f;
+                GuiComponent.blit(dhl, integer2, integer3, float6, 0.0f, 18, 18, 37, 18);
+                if (boolean4) {
+                    RealmsPendingInvitesScreen.this.toolTip = I18n.get("mco.invites.button.accept");
                 }
             }
             
@@ -295,14 +294,13 @@ public class RealmsPendingInvitesScreen extends RealmsScreen {
             }
             
             @Override
-            protected void draw(final int integer1, final int integer2, final boolean boolean3) {
-                RealmsScreen.bind("realms:textures/gui/realms/reject_icon.png");
+            protected void draw(final PoseStack dhl, final int integer2, final int integer3, final boolean boolean4) {
+                RealmsPendingInvitesScreen.this.minecraft.getTextureManager().bind(RealmsPendingInvitesScreen.REJECT_ICON_LOCATION);
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                RenderSystem.pushMatrix();
-                RealmsScreen.blit(integer1, integer2, boolean3 ? 19.0f : 0.0f, 0.0f, 18, 18, 37, 18);
-                RenderSystem.popMatrix();
-                if (boolean3) {
-                    RealmsPendingInvitesScreen.this.toolTip = RealmsScreen.getLocalizedString("mco.invites.button.reject");
+                final float float6 = boolean4 ? 19.0f : 0.0f;
+                GuiComponent.blit(dhl, integer2, integer3, float6, 0.0f, 18, 18, 37, 18);
+                if (boolean4) {
+                    RealmsPendingInvitesScreen.this.toolTip = I18n.get("mco.invites.button.reject");
                 }
             }
             
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.java
index 7deeb04..6d097fa 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.java
@@ -1,104 +1,95 @@
 package com.mojang.realmsclient.gui.screens;
 
 import com.mojang.realmsclient.util.RealmsTextureManager;
-import net.minecraft.realms.RealmListEntry;
+import net.minecraft.client.gui.components.ObjectSelectionList;
+import net.minecraft.client.gui.components.AbstractSelectionList;
+import javax.annotation.Nullable;
+import net.minecraft.realms.NarrationHelper;
 import net.minecraft.realms.RealmsObjectSelectionList;
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.realms.RealmsDefaultVertexFormat;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiComponent;
+import com.mojang.blaze3d.vertex.BufferBuilder;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.realms.Tezzelator;
+import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.TextComponent;
 import com.mojang.realmsclient.dto.Ops;
 import com.mojang.realmsclient.exception.RealmsServiceException;
 import com.mojang.realmsclient.client.RealmsClient;
 import java.util.Iterator;
-import net.minecraft.realms.RealmsGuiEventListener;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.realmsclient.dto.PlayerInfo;
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.Realms;
-import com.mojang.realmsclient.gui.RealmsConstants;
 import net.minecraft.realms.RealmsLabel;
-import net.minecraft.realms.RealmsButton;
+import net.minecraft.client.gui.components.Button;
 import com.mojang.realmsclient.dto.RealmsServer;
+import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsPlayerScreen extends RealmsScreen {
     private static final Logger LOGGER;
+    private static final ResourceLocation OP_ICON_LOCATION;
+    private static final ResourceLocation USER_ICON_LOCATION;
+    private static final ResourceLocation CROSS_ICON_LOCATION;
+    private static final ResourceLocation OPTIONS_BACKGROUND;
     private String toolTip;
     private final RealmsConfigureWorldScreen lastScreen;
     private final RealmsServer serverData;
     private InvitedObjectSelectionList invitedObjectSelectionList;
-    private int column1_x;
-    private int column_width;
-    private int column2_x;
-    private RealmsButton removeButton;
-    private RealmsButton opdeopButton;
+    private int column1X;
+    private int columnWidth;
+    private int column2X;
+    private Button removeButton;
+    private Button opdeopButton;
     private int selectedInvitedIndex;
     private String selectedInvited;
     private int player;
     private boolean stateChanged;
     private RealmsLabel titleLabel;
     
-    public RealmsPlayerScreen(final RealmsConfigureWorldScreen czs, final RealmsServer realmsServer) {
+    public RealmsPlayerScreen(final RealmsConfigureWorldScreen djr, final RealmsServer dip) {
         this.selectedInvitedIndex = -1;
         this.player = -1;
-        this.lastScreen = czs;
-        this.serverData = realmsServer;
+        this.lastScreen = djr;
+        this.serverData = dip;
     }
     
-    @Override
-    public void tick() {
-        super.tick();
-    }
-    
-    @Override
     public void init() {
-        this.column1_x = this.width() / 2 - 160;
-        this.column_width = 150;
-        this.column2_x = this.width() / 2 + 12;
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        this.buttonsAdd(new RealmsButton(1, this.column2_x, RealmsConstants.row(1), this.column_width + 10, 20, RealmsScreen.getLocalizedString("mco.configure.world.buttons.invite")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsInviteScreen(RealmsPlayerScreen.this.lastScreen, RealmsPlayerScreen.this, RealmsPlayerScreen.this.serverData));
-            }
-        });
-        this.buttonsAdd(this.removeButton = new RealmsButton(4, this.column2_x, RealmsConstants.row(7), this.column_width + 10, 20, RealmsScreen.getLocalizedString("mco.configure.world.invites.remove.tooltip")) {
-            @Override
-            public void onPress() {
-                RealmsPlayerScreen.this.uninvite(RealmsPlayerScreen.this.player);
-            }
-        });
-        this.buttonsAdd(this.opdeopButton = new RealmsButton(5, this.column2_x, RealmsConstants.row(9), this.column_width + 10, 20, RealmsScreen.getLocalizedString("mco.configure.world.invites.ops.tooltip")) {
-            @Override
-            public void onPress() {
-                if (RealmsPlayerScreen.this.serverData.players.get(RealmsPlayerScreen.this.player).isOperator()) {
-                    RealmsPlayerScreen.this.deop(RealmsPlayerScreen.this.player);
-                }
-                else {
-                    RealmsPlayerScreen.this.op(RealmsPlayerScreen.this.player);
-                }
-            }
-        });
-        this.buttonsAdd(new RealmsButton(0, this.column2_x + this.column_width / 2 + 2, RealmsConstants.row(12), this.column_width / 2 + 10 - 2, 20, RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                RealmsPlayerScreen.this.backButtonClicked();
-            }
-        });
-        (this.invitedObjectSelectionList = new InvitedObjectSelectionList()).setLeftPos(this.column1_x);
-        this.addWidget(this.invitedObjectSelectionList);
-        for (final PlayerInfo playerInfo3 : this.serverData.players) {
-            this.invitedObjectSelectionList.addEntry(playerInfo3);
+        this.column1X = this.width / 2 - 160;
+        this.columnWidth = 150;
+        this.column2X = this.width / 2 + 12;
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        (this.invitedObjectSelectionList = new InvitedObjectSelectionList()).setLeftPos(this.column1X);
+        this.<InvitedObjectSelectionList>addWidget(this.invitedObjectSelectionList);
+        for (final PlayerInfo dim3 : this.serverData.players) {
+            this.invitedObjectSelectionList.addEntry(dim3);
         }
-        this.addWidget(this.titleLabel = new RealmsLabel(RealmsScreen.getLocalizedString("mco.configure.world.players.title"), this.width() / 2, 17, 16777215));
+        this.<Button>addButton(new Button(this.column2X, RealmsScreen.row(1), this.columnWidth + 10, 20, new TranslatableComponent("mco.configure.world.buttons.invite"), dni -> this.minecraft.setScreen(new RealmsInviteScreen(this.lastScreen, this, this.serverData))));
+        this.removeButton = this.<Button>addButton(new Button(this.column2X, RealmsScreen.row(7), this.columnWidth + 10, 20, new TranslatableComponent("mco.configure.world.invites.remove.tooltip"), dni -> this.uninvite(this.player)));
+        this.opdeopButton = this.<Button>addButton(new Button(this.column2X, RealmsScreen.row(9), this.columnWidth + 10, 20, new TranslatableComponent("mco.configure.world.invites.ops.tooltip"), dni -> {
+            if (this.serverData.players.get(this.player).isOperator()) {
+                this.deop(this.player);
+            }
+            else {
+                this.op(this.player);
+            }
+            return;
+        }));
+        this.<Button>addButton(new Button(this.column2X + this.columnWidth / 2 + 2, RealmsScreen.row(12), this.columnWidth / 2 + 10 - 2, 20, CommonComponents.GUI_BACK, dni -> this.backButtonClicked()));
+        this.titleLabel = this.<RealmsLabel>addWidget(new RealmsLabel(new TranslatableComponent("mco.configure.world.players.title"), this.width / 2, 17, 16777215));
         this.narrateLabels();
         this.updateButtonStates();
     }
     
     private void updateButtonStates() {
-        this.removeButton.setVisible(this.shouldRemoveAndOpdeopButtonBeVisible(this.player));
-        this.opdeopButton.setVisible(this.shouldRemoveAndOpdeopButtonBeVisible(this.player));
+        this.removeButton.visible = this.shouldRemoveAndOpdeopButtonBeVisible(this.player);
+        this.opdeopButton.visible = this.shouldRemoveAndOpdeopButtonBeVisible(this.player);
     }
     
     private boolean shouldRemoveAndOpdeopButtonBeVisible(final int integer) {
@@ -107,7 +98,7 @@ public class RealmsPlayerScreen extends RealmsScreen {
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
@@ -121,71 +112,66 @@ public class RealmsPlayerScreen extends RealmsScreen {
     
     private void backButtonClicked() {
         if (this.stateChanged) {
-            Realms.setScreen(this.lastScreen.getNewScreen());
+            this.minecraft.setScreen(this.lastScreen.getNewScreen());
         }
         else {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
         }
     }
     
     private void op(final int integer) {
         this.updateButtonStates();
-        final RealmsClient cyy3 = RealmsClient.createRealmsClient();
+        final RealmsClient dia3 = RealmsClient.create();
         final String string4 = this.serverData.players.get(integer).getUuid();
         try {
-            this.updateOps(cyy3.op(this.serverData.id, string4));
+            this.updateOps(dia3.op(this.serverData.id, string4));
         }
-        catch (RealmsServiceException czg5) {
+        catch (RealmsServiceException djh5) {
             RealmsPlayerScreen.LOGGER.error("Couldn't op the user");
         }
     }
     
     private void deop(final int integer) {
         this.updateButtonStates();
-        final RealmsClient cyy3 = RealmsClient.createRealmsClient();
+        final RealmsClient dia3 = RealmsClient.create();
         final String string4 = this.serverData.players.get(integer).getUuid();
         try {
-            this.updateOps(cyy3.deop(this.serverData.id, string4));
+            this.updateOps(dia3.deop(this.serverData.id, string4));
         }
-        catch (RealmsServiceException czg5) {
+        catch (RealmsServiceException djh5) {
             RealmsPlayerScreen.LOGGER.error("Couldn't deop the user");
         }
     }
     
-    private void updateOps(final Ops ops) {
-        for (final PlayerInfo playerInfo4 : this.serverData.players) {
-            playerInfo4.setOperator(ops.ops.contains(playerInfo4.getName()));
+    private void updateOps(final Ops dii) {
+        for (final PlayerInfo dim4 : this.serverData.players) {
+            dim4.setOperator(dii.ops.contains(dim4.getName()));
         }
     }
     
     private void uninvite(final int integer) {
         this.updateButtonStates();
         if (integer >= 0 && integer < this.serverData.players.size()) {
-            final PlayerInfo playerInfo3 = this.serverData.players.get(integer);
-            this.selectedInvited = playerInfo3.getUuid();
+            final PlayerInfo dim3 = this.serverData.players.get(integer);
+            this.selectedInvited = dim3.getUuid();
             this.selectedInvitedIndex = integer;
-            final RealmsConfirmScreen czt4 = new RealmsConfirmScreen(this, "Question", RealmsScreen.getLocalizedString("mco.configure.world.uninvite.question") + " '" + playerInfo3.getName() + "' ?", 2);
-            Realms.setScreen(czt4);
-        }
-    }
-    
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-        if (integer == 2) {
-            if (boolean1) {
-                final RealmsClient cyy4 = RealmsClient.createRealmsClient();
-                try {
-                    cyy4.uninvite(this.serverData.id, this.selectedInvited);
+            final RealmsConfirmScreen djs4 = new RealmsConfirmScreen(boolean1 -> {
+                if (boolean1) {
+                    final RealmsClient dia3 = RealmsClient.create();
+                    try {
+                        dia3.uninvite(this.serverData.id, this.selectedInvited);
+                    }
+                    catch (RealmsServiceException djh4) {
+                        RealmsPlayerScreen.LOGGER.error("Couldn't uninvite user");
+                    }
+                    this.deleteFromInvitedList(this.selectedInvitedIndex);
+                    this.player = -1;
+                    this.updateButtonStates();
                 }
-                catch (RealmsServiceException czg5) {
-                    RealmsPlayerScreen.LOGGER.error("Couldn't uninvite user");
-                }
-                this.deleteFromInvitedList(this.selectedInvitedIndex);
-                this.player = -1;
-                this.updateButtonStates();
-            }
-            this.stateChanged = true;
-            Realms.setScreen(this);
+                this.stateChanged = true;
+                this.minecraft.setScreen(this);
+            }, new TextComponent("Question"), new TranslatableComponent("mco.configure.world.uninvite.question").append(" '").append(dim3.getName()).append("' ?"));
+            this.minecraft.setScreen(djs4);
         }
     }
     
@@ -194,119 +180,120 @@ public class RealmsPlayerScreen extends RealmsScreen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.toolTip = null;
-        this.renderBackground();
+        this.renderBackground(dhl);
         if (this.invitedObjectSelectionList != null) {
-            this.invitedObjectSelectionList.render(integer1, integer2, float3);
+            this.invitedObjectSelectionList.render(dhl, integer2, integer3, float4);
         }
-        final int integer3 = RealmsConstants.row(12) + 20;
-        final Tezzelator tezzelator6 = Tezzelator.instance;
-        RealmsScreen.bind("textures/gui/options_background.png");
+        final int integer4 = RealmsScreen.row(12) + 20;
+        final Tesselator dhn7 = Tesselator.getInstance();
+        final BufferBuilder dhg8 = dhn7.getBuilder();
+        this.minecraft.getTextureManager().bind(RealmsPlayerScreen.OPTIONS_BACKGROUND);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        final float float4 = 32.0f;
-        tezzelator6.begin(7, RealmsDefaultVertexFormat.POSITION_TEX_COLOR);
-        tezzelator6.vertex(0.0, this.height(), 0.0).tex(0.0f, (this.height() - integer3) / 32.0f + 0.0f).color(64, 64, 64, 255).endVertex();
-        tezzelator6.vertex(this.width(), this.height(), 0.0).tex(this.width() / 32.0f, (this.height() - integer3) / 32.0f + 0.0f).color(64, 64, 64, 255).endVertex();
-        tezzelator6.vertex(this.width(), integer3, 0.0).tex(this.width() / 32.0f, 0.0f).color(64, 64, 64, 255).endVertex();
-        tezzelator6.vertex(0.0, integer3, 0.0).tex(0.0f, 0.0f).color(64, 64, 64, 255).endVertex();
-        tezzelator6.end();
-        this.titleLabel.render(this);
+        final float float5 = 32.0f;
+        dhg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+        dhg8.vertex(0.0, this.height, 0.0).uv(0.0f, (this.height - integer4) / 32.0f + 0.0f).color(64, 64, 64, 255).endVertex();
+        dhg8.vertex(this.width, this.height, 0.0).uv(this.width / 32.0f, (this.height - integer4) / 32.0f + 0.0f).color(64, 64, 64, 255).endVertex();
+        dhg8.vertex(this.width, integer4, 0.0).uv(this.width / 32.0f, 0.0f).color(64, 64, 64, 255).endVertex();
+        dhg8.vertex(0.0, integer4, 0.0).uv(0.0f, 0.0f).color(64, 64, 64, 255).endVertex();
+        dhn7.end();
+        this.titleLabel.render(this, dhl);
         if (this.serverData != null && this.serverData.players != null) {
-            this.drawString(RealmsScreen.getLocalizedString("mco.configure.world.invited") + " (" + this.serverData.players.size() + ")", this.column1_x, RealmsConstants.row(0), 10526880);
+            this.font.draw(dhl, I18n.get("mco.configure.world.invited") + " (" + this.serverData.players.size() + ")", (float)this.column1X, (float)RealmsScreen.row(0), 10526880);
         }
         else {
-            this.drawString(RealmsScreen.getLocalizedString("mco.configure.world.invited"), this.column1_x, RealmsConstants.row(0), 10526880);
+            this.font.draw(dhl, I18n.get("mco.configure.world.invited"), (float)this.column1X, (float)RealmsScreen.row(0), 10526880);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
         if (this.serverData == null) {
             return;
         }
         if (this.toolTip != null) {
-            this.renderMousehoverTooltip(this.toolTip, integer1, integer2);
+            this.renderMousehoverTooltip(dhl, this.toolTip, integer2, integer3);
         }
     }
     
-    protected void renderMousehoverTooltip(final String string, final int integer2, final int integer3) {
+    protected void renderMousehoverTooltip(final PoseStack dhl, final String string, final int integer3, final int integer4) {
         if (string == null) {
             return;
         }
-        final int integer4 = integer2 + 12;
-        final int integer5 = integer3 - 12;
-        final int integer6 = this.fontWidth(string);
-        this.fillGradient(integer4 - 3, integer5 - 3, integer4 + integer6 + 3, integer5 + 8 + 3, -1073741824, -1073741824);
-        this.fontDrawShadow(string, integer4, integer5, 16777215);
+        final int integer5 = integer3 + 12;
+        final int integer6 = integer4 - 12;
+        final int integer7 = this.font.width(string);
+        this.fillGradient(dhl, integer5 - 3, integer6 - 3, integer5 + integer7 + 3, integer6 + 8 + 3, -1073741824, -1073741824);
+        this.font.drawShadow(dhl, string, (float)integer5, (float)integer6, 16777215);
     }
     
-    private void drawRemoveIcon(final int integer1, final int integer2, final int integer3, final int integer4) {
-        final boolean boolean6 = integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 9 && integer4 < RealmsConstants.row(12) + 20 && integer4 > RealmsConstants.row(1);
-        RealmsScreen.bind("realms:textures/gui/realms/cross_player_icon.png");
+    private void drawRemoveIcon(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        final boolean boolean7 = integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 9 && integer5 < RealmsScreen.row(12) + 20 && integer5 > RealmsScreen.row(1);
+        this.minecraft.getTextureManager().bind(RealmsPlayerScreen.CROSS_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, 0.0f, boolean6 ? 7.0f : 0.0f, 8, 7, 8, 14);
-        RenderSystem.popMatrix();
-        if (boolean6) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.configure.world.invites.remove.tooltip");
+        final float float8 = boolean7 ? 7.0f : 0.0f;
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, float8, 8, 7, 8, 14);
+        if (boolean7) {
+            this.toolTip = I18n.get("mco.configure.world.invites.remove.tooltip");
         }
     }
     
-    private void drawOpped(final int integer1, final int integer2, final int integer3, final int integer4) {
-        final boolean boolean6 = integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 9 && integer4 < RealmsConstants.row(12) + 20 && integer4 > RealmsConstants.row(1);
-        RealmsScreen.bind("realms:textures/gui/realms/op_icon.png");
+    private void drawOpped(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        final boolean boolean7 = integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 9 && integer5 < RealmsScreen.row(12) + 20 && integer5 > RealmsScreen.row(1);
+        this.minecraft.getTextureManager().bind(RealmsPlayerScreen.OP_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, 0.0f, boolean6 ? 8.0f : 0.0f, 8, 8, 8, 16);
-        RenderSystem.popMatrix();
-        if (boolean6) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.configure.world.invites.ops.tooltip");
+        final float float8 = boolean7 ? 8.0f : 0.0f;
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, float8, 8, 8, 8, 16);
+        if (boolean7) {
+            this.toolTip = I18n.get("mco.configure.world.invites.ops.tooltip");
         }
     }
     
-    private void drawNormal(final int integer1, final int integer2, final int integer3, final int integer4) {
-        final boolean boolean6 = integer3 >= integer1 && integer3 <= integer1 + 9 && integer4 >= integer2 && integer4 <= integer2 + 9 && integer4 < RealmsConstants.row(12) + 20 && integer4 > RealmsConstants.row(1);
-        RealmsScreen.bind("realms:textures/gui/realms/user_icon.png");
+    private void drawNormal(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        final boolean boolean7 = integer4 >= integer2 && integer4 <= integer2 + 9 && integer5 >= integer3 && integer5 <= integer3 + 9 && integer5 < RealmsScreen.row(12) + 20 && integer5 > RealmsScreen.row(1);
+        this.minecraft.getTextureManager().bind(RealmsPlayerScreen.USER_ICON_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.pushMatrix();
-        RealmsScreen.blit(integer1, integer2, 0.0f, boolean6 ? 8.0f : 0.0f, 8, 8, 8, 16);
-        RenderSystem.popMatrix();
-        if (boolean6) {
-            this.toolTip = RealmsScreen.getLocalizedString("mco.configure.world.invites.normal.tooltip");
+        final float float8 = boolean7 ? 8.0f : 0.0f;
+        GuiComponent.blit(dhl, integer2, integer3, 0.0f, float8, 8, 8, 8, 16);
+        if (boolean7) {
+            this.toolTip = I18n.get("mco.configure.world.invites.normal.tooltip");
         }
     }
     
     static {
         LOGGER = LogManager.getLogger();
+        OP_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/op_icon.png");
+        USER_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/user_icon.png");
+        CROSS_ICON_LOCATION = new ResourceLocation("realms", "textures/gui/realms/cross_player_icon.png");
+        OPTIONS_BACKGROUND = new ResourceLocation("minecraft", "textures/gui/options_background.png");
     }
     
-    class InvitedObjectSelectionList extends RealmsObjectSelectionList {
+    class InvitedObjectSelectionList extends RealmsObjectSelectionList<RealmsPlayerScreen.Entry> {
         public InvitedObjectSelectionList() {
-            super(RealmsPlayerScreen.this.column_width + 10, RealmsConstants.row(12) + 20, RealmsConstants.row(1), RealmsConstants.row(12) + 20, 13);
+            super(RealmsPlayerScreen.this.columnWidth + 10, RealmsScreen.row(12) + 20, RealmsScreen.row(1), RealmsScreen.row(12) + 20, 13);
         }
         
-        public void addEntry(final PlayerInfo playerInfo) {
-            this.addEntry(new InvitedObjectSelectionListEntry(playerInfo));
+        public void addEntry(final PlayerInfo dim) {
+            this.addEntry(new RealmsPlayerScreen.Entry(dim));
         }
         
         @Override
         public int getRowWidth() {
-            return (int)(this.width() * 1.0);
+            return (int)(this.width * 1.0);
         }
         
-        @Override
         public boolean isFocused() {
-            return RealmsPlayerScreen.this.isFocused(this);
+            return RealmsPlayerScreen.this.getFocused() == this;
         }
         
         @Override
         public boolean mouseClicked(final double double1, final double double2, final int integer) {
-            if (integer == 0 && double1 < this.getScrollbarPosition() && double2 >= this.y0() && double2 <= this.y1()) {
-                final int integer2 = RealmsPlayerScreen.this.column1_x;
-                final int integer3 = RealmsPlayerScreen.this.column1_x + RealmsPlayerScreen.this.column_width;
-                final int integer4 = (int)Math.floor(double2 - this.y0()) - this.headerHeight() + this.getScroll() - 4;
-                final int integer5 = integer4 / this.itemHeight();
+            if (integer == 0 && double1 < this.getScrollbarPosition() && double2 >= this.y0 && double2 <= this.y1) {
+                final int integer2 = RealmsPlayerScreen.this.column1X;
+                final int integer3 = RealmsPlayerScreen.this.column1X + RealmsPlayerScreen.this.columnWidth;
+                final int integer4 = (int)Math.floor(double2 - this.y0) - this.headerHeight + (int)this.getScrollAmount() - 4;
+                final int integer5 = integer4 / this.itemHeight;
                 if (double1 >= integer2 && double1 <= integer3 && integer5 >= 0 && integer4 >= 0 && integer5 < this.getItemCount()) {
                     this.selectItem(integer5);
-                    this.itemClicked(integer4, integer5, double1, double2, this.width());
+                    this.itemClicked(integer4, integer5, double1, double2, this.width);
                 }
                 return true;
             }
@@ -318,7 +305,7 @@ public class RealmsPlayerScreen extends RealmsScreen {
             if (integer2 < 0 || integer2 > RealmsPlayerScreen.this.serverData.players.size() || RealmsPlayerScreen.this.toolTip == null) {
                 return;
             }
-            if (RealmsPlayerScreen.this.toolTip.equals(RealmsScreen.getLocalizedString("mco.configure.world.invites.ops.tooltip")) || RealmsPlayerScreen.this.toolTip.equals(RealmsScreen.getLocalizedString("mco.configure.world.invites.normal.tooltip"))) {
+            if (RealmsPlayerScreen.this.toolTip.equals(I18n.get("mco.configure.world.invites.ops.tooltip")) || RealmsPlayerScreen.this.toolTip.equals(I18n.get("mco.configure.world.invites.normal.tooltip"))) {
                 if (RealmsPlayerScreen.this.serverData.players.get(integer2).isOperator()) {
                     RealmsPlayerScreen.this.deop(integer2);
                 }
@@ -326,16 +313,16 @@ public class RealmsPlayerScreen extends RealmsScreen {
                     RealmsPlayerScreen.this.op(integer2);
                 }
             }
-            else if (RealmsPlayerScreen.this.toolTip.equals(RealmsScreen.getLocalizedString("mco.configure.world.invites.remove.tooltip"))) {
+            else if (RealmsPlayerScreen.this.toolTip.equals(I18n.get("mco.configure.world.invites.remove.tooltip"))) {
                 RealmsPlayerScreen.this.uninvite(integer2);
             }
         }
         
         @Override
         public void selectItem(final int integer) {
-            this.setSelected(integer);
+            this.setSelectedItem(integer);
             if (integer != -1) {
-                Realms.narrateNow(RealmsScreen.getLocalizedString("narrator.select", RealmsPlayerScreen.this.serverData.players.get(integer).getName()));
+                NarrationHelper.now(I18n.get("narrator.select", RealmsPlayerScreen.this.serverData.players.get(integer).getName()));
             }
             this.selectInviteListItem(integer);
         }
@@ -346,18 +333,19 @@ public class RealmsPlayerScreen extends RealmsScreen {
         }
         
         @Override
-        public void renderBackground() {
-            RealmsPlayerScreen.this.renderBackground();
+        public void setSelected(@Nullable final RealmsPlayerScreen.Entry a) {
+            super.setSelected(a);
+            RealmsPlayerScreen.this.player = this.children().indexOf(a);
+            RealmsPlayerScreen.this.updateButtonStates();
+        }
+        
+        public void renderBackground(final PoseStack dhl) {
+            RealmsPlayerScreen.this.renderBackground(dhl);
         }
         
         @Override
         public int getScrollbarPosition() {
-            return RealmsPlayerScreen.this.column1_x + this.width() - 5;
-        }
-        
-        @Override
-        public int getItemCount() {
-            return (RealmsPlayerScreen.this.serverData == null) ? 1 : RealmsPlayerScreen.this.serverData.players.size();
+            return RealmsPlayerScreen.this.column1X + this.width - 5;
         }
         
         @Override
@@ -366,42 +354,42 @@ public class RealmsPlayerScreen extends RealmsScreen {
         }
     }
     
-    class InvitedObjectSelectionListEntry extends RealmListEntry {
-        final PlayerInfo mPlayerInfo;
+    class Entry extends ObjectSelectionList.Entry<Entry> {
+        private final PlayerInfo playerInfo;
         
-        public InvitedObjectSelectionListEntry(final PlayerInfo playerInfo) {
-            this.mPlayerInfo = playerInfo;
+        public Entry(final PlayerInfo dim) {
+            this.playerInfo = dim;
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            this.renderInvitedItem(this.mPlayerInfo, integer3, integer2, integer6, integer7);
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.renderInvitedItem(dhl, this.playerInfo, integer4, integer3, integer7, integer8);
         }
         
-        private void renderInvitedItem(final PlayerInfo playerInfo, final int integer2, final int integer3, final int integer4, final int integer5) {
-            int integer6;
-            if (!playerInfo.getAccepted()) {
-                integer6 = 10526880;
+        private void renderInvitedItem(final PoseStack dhl, final PlayerInfo dim, final int integer3, final int integer4, final int integer5, final int integer6) {
+            int integer7;
+            if (!dim.getAccepted()) {
+                integer7 = 10526880;
             }
-            else if (playerInfo.getOnline()) {
-                integer6 = 8388479;
+            else if (dim.getOnline()) {
+                integer7 = 8388479;
             }
             else {
-                integer6 = 16777215;
+                integer7 = 16777215;
             }
-            RealmsPlayerScreen.this.drawString(playerInfo.getName(), RealmsPlayerScreen.this.column1_x + 3 + 12, integer3 + 1, integer6);
-            if (playerInfo.isOperator()) {
-                RealmsPlayerScreen.this.drawOpped(RealmsPlayerScreen.this.column1_x + RealmsPlayerScreen.this.column_width - 10, integer3 + 1, integer4, integer5);
+            RealmsPlayerScreen.this.font.draw(dhl, dim.getName(), (float)(RealmsPlayerScreen.this.column1X + 3 + 12), (float)(integer4 + 1), integer7);
+            if (dim.isOperator()) {
+                RealmsPlayerScreen.this.drawOpped(dhl, RealmsPlayerScreen.this.column1X + RealmsPlayerScreen.this.columnWidth - 10, integer4 + 1, integer5, integer6);
             }
             else {
-                RealmsPlayerScreen.this.drawNormal(RealmsPlayerScreen.this.column1_x + RealmsPlayerScreen.this.column_width - 10, integer3 + 1, integer4, integer5);
+                RealmsPlayerScreen.this.drawNormal(dhl, RealmsPlayerScreen.this.column1X + RealmsPlayerScreen.this.columnWidth - 10, integer4 + 1, integer5, integer6);
             }
-            RealmsPlayerScreen.this.drawRemoveIcon(RealmsPlayerScreen.this.column1_x + RealmsPlayerScreen.this.column_width - 22, integer3 + 2, integer4, integer5);
-            RealmsPlayerScreen.this.drawString(RealmsScreen.getLocalizedString("mco.configure.world.activityfeed.disabled"), RealmsPlayerScreen.this.column2_x, RealmsConstants.row(5), 10526880);
-            RealmsTextureManager.withBoundFace(playerInfo.getUuid(), () -> {
+            RealmsPlayerScreen.this.drawRemoveIcon(dhl, RealmsPlayerScreen.this.column1X + RealmsPlayerScreen.this.columnWidth - 22, integer4 + 2, integer5, integer6);
+            RealmsPlayerScreen.this.font.draw(dhl, I18n.get("mco.configure.world.activityfeed.disabled"), (float)RealmsPlayerScreen.this.column2X, (float)RealmsScreen.row(5), 10526880);
+            RealmsTextureManager.withBoundFace(dim.getUuid(), () -> {
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                RealmsScreen.blit(RealmsPlayerScreen.this.column1_x + 2 + 2, integer3 + 1, 8.0f, 8.0f, 8, 8, 8, 8, 64, 64);
-                RealmsScreen.blit(RealmsPlayerScreen.this.column1_x + 2 + 2, integer3 + 1, 40.0f, 8.0f, 8, 8, 8, 8, 64, 64);
+                GuiComponent.blit(dhl, RealmsPlayerScreen.this.column1X + 2 + 2, integer4 + 1, 8, 8, 8.0f, 8.0f, 8, 8, 64, 64);
+                GuiComponent.blit(dhl, RealmsPlayerScreen.this.column1X + 2 + 2, integer4 + 1, 8, 8, 40.0f, 8.0f, 8, 8, 64, 64);
             });
         }
     }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.java
index a74c1dd..22a84e6 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.java
@@ -1,39 +1,32 @@
 package com.mojang.realmsclient.gui.screens;
 
-import net.minecraft.realms.RealmsGuiEventListener;
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.Realms;
-import com.mojang.realmsclient.gui.RealmsConstants;
-import net.minecraft.realms.RealmsButton;
-import net.minecraft.realms.RealmsEditBox;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.realms.RealmsLabel;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsResetNormalWorldScreen extends RealmsScreen {
     private final RealmsResetWorldScreen lastScreen;
     private RealmsLabel titleLabel;
-    private RealmsEditBox seedEdit;
+    private EditBox seedEdit;
     private Boolean generateStructures;
     private Integer levelTypeIndex;
-    String[] levelTypes;
-    private final int BUTTON_CANCEL_ID = 0;
-    private final int BUTTON_RESET_ID = 1;
-    private final int SEED_EDIT_BOX = 4;
-    private RealmsButton resetButton;
-    private RealmsButton levelTypeButton;
-    private RealmsButton generateStructuresButton;
-    private String buttonTitle;
+    private Component[] levelTypes;
+    private Component buttonTitle;
     
-    public RealmsResetNormalWorldScreen(final RealmsResetWorldScreen daf) {
+    public RealmsResetNormalWorldScreen(final RealmsResetWorldScreen dke, final Component mr) {
         this.generateStructures = true;
         this.levelTypeIndex = 0;
-        this.buttonTitle = RealmsScreen.getLocalizedString("mco.backup.button.reset");
-        this.lastScreen = daf;
-    }
-    
-    public RealmsResetNormalWorldScreen(final RealmsResetWorldScreen daf, final String string) {
-        this(daf);
-        this.buttonTitle = string;
+        this.levelTypes = new Component[] { new TranslatableComponent("generator.default"), new TranslatableComponent("generator.flat"), new TranslatableComponent("generator.large_biomes"), new TranslatableComponent("generator.amplified") };
+        this.lastScreen = dke;
+        this.buttonTitle = mr;
     }
     
     @Override
@@ -42,77 +35,56 @@ public class RealmsResetNormalWorldScreen extends RealmsScreen {
         super.tick();
     }
     
-    @Override
     public void init() {
-        this.levelTypes = new String[] { RealmsScreen.getLocalizedString("generator.default"), RealmsScreen.getLocalizedString("generator.flat"), RealmsScreen.getLocalizedString("generator.largeBiomes"), RealmsScreen.getLocalizedString("generator.amplified") };
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 + 8, RealmsConstants.row(12), 97, 20, RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsResetNormalWorldScreen.this.lastScreen);
-            }
-        });
-        this.buttonsAdd(this.resetButton = new RealmsButton(1, this.width() / 2 - 102, RealmsConstants.row(12), 97, 20, this.buttonTitle) {
-            @Override
-            public void onPress() {
-                RealmsResetNormalWorldScreen.this.onReset();
-            }
-        });
-        (this.seedEdit = this.newEditBox(4, this.width() / 2 - 100, RealmsConstants.row(2), 200, 20, RealmsScreen.getLocalizedString("mco.reset.world.seed"))).setMaxLength(32);
-        this.seedEdit.setValue("");
-        this.addWidget(this.seedEdit);
-        this.focusOn(this.seedEdit);
-        this.buttonsAdd(this.levelTypeButton = new RealmsButton(2, this.width() / 2 - 102, RealmsConstants.row(4), 205, 20, this.levelTypeTitle()) {
-            @Override
-            public void onPress() {
-                RealmsResetNormalWorldScreen.this.levelTypeIndex = (RealmsResetNormalWorldScreen.this.levelTypeIndex + 1) % RealmsResetNormalWorldScreen.this.levelTypes.length;
-                this.setMessage(RealmsResetNormalWorldScreen.this.levelTypeTitle());
-            }
-        });
-        this.buttonsAdd(this.generateStructuresButton = new RealmsButton(3, this.width() / 2 - 102, RealmsConstants.row(6) - 2, 205, 20, this.generateStructuresTitle()) {
-            @Override
-            public void onPress() {
-                RealmsResetNormalWorldScreen.this.generateStructures = !RealmsResetNormalWorldScreen.this.generateStructures;
-                this.setMessage(RealmsResetNormalWorldScreen.this.generateStructuresTitle());
-            }
-        });
-        this.addWidget(this.titleLabel = new RealmsLabel(RealmsScreen.getLocalizedString("mco.reset.world.generate"), this.width() / 2, 17, 16777215));
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        this.<RealmsLabel>addWidget(this.titleLabel = new RealmsLabel(new TranslatableComponent("mco.reset.world.generate"), this.width / 2, 17, 16777215));
+        (this.seedEdit = new EditBox(this.minecraft.font, this.width / 2 - 100, RealmsScreen.row(2), 200, 20, null, new TranslatableComponent("mco.reset.world.seed"))).setMaxLength(32);
+        this.<EditBox>addWidget(this.seedEdit);
+        this.setInitialFocus(this.seedEdit);
+        this.<Button>addButton(new Button(this.width / 2 - 102, RealmsScreen.row(4), 205, 20, this.levelTypeTitle(), dni -> {
+            this.levelTypeIndex = (this.levelTypeIndex + 1) % this.levelTypes.length;
+            dni.setMessage(this.levelTypeTitle());
+            return;
+        }));
+        this.<Button>addButton(new Button(this.width / 2 - 102, RealmsScreen.row(6) - 2, 205, 20, this.generateStructuresTitle(), dni -> {
+            this.generateStructures = !this.generateStructures;
+            dni.setMessage(this.generateStructuresTitle());
+            return;
+        }));
+        this.<Button>addButton(new Button(this.width / 2 - 102, RealmsScreen.row(12), 97, 20, this.buttonTitle, dni -> this.lastScreen.resetWorld(new RealmsResetWorldScreen.ResetWorldInfo(this.seedEdit.getValue(), this.levelTypeIndex, this.generateStructures))));
+        this.<Button>addButton(new Button(this.width / 2 + 8, RealmsScreen.row(12), 97, 20, CommonComponents.GUI_BACK, dni -> this.minecraft.setScreen(this.lastScreen)));
         this.narrateLabels();
     }
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
     }
     
-    private void onReset() {
-        this.lastScreen.resetWorld(new RealmsResetWorldScreen.ResetWorldInfo(this.seedEdit.getValue(), this.levelTypeIndex, this.generateStructures));
-    }
-    
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.titleLabel.render(this);
-        this.drawString(RealmsScreen.getLocalizedString("mco.reset.world.seed"), this.width() / 2 - 100, RealmsConstants.row(1), 10526880);
-        this.seedEdit.render(integer1, integer2, float3);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.titleLabel.render(this, dhl);
+        this.font.draw(dhl, I18n.get("mco.reset.world.seed"), (float)(this.width / 2 - 100), (float)RealmsScreen.row(1), 10526880);
+        this.seedEdit.render(dhl, integer2, integer3, float4);
+        super.render(dhl, integer2, integer3, float4);
     }
     
-    private String levelTypeTitle() {
-        final String string2 = RealmsScreen.getLocalizedString("selectWorld.mapType");
-        return string2 + " " + this.levelTypes[this.levelTypeIndex];
+    private Component levelTypeTitle() {
+        return new TranslatableComponent("selectWorld.mapType").append(" ").append(this.levelTypes[this.levelTypeIndex]);
     }
     
-    private String generateStructuresTitle() {
-        return RealmsScreen.getLocalizedString("selectWorld.mapFeatures") + " " + RealmsScreen.getLocalizedString(((boolean)this.generateStructures) ? "mco.configure.world.on" : "mco.configure.world.off");
+    private Component generateStructuresTitle() {
+        final String string2 = this.generateStructures ? "mco.configure.world.on" : "mco.configure.world.off";
+        return new TranslatableComponent("selectWorld.mapFeatures").append(" ").append(new TranslatableComponent(string2));
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java
index 1400afa..d540009 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java
@@ -1,38 +1,47 @@
 package com.mojang.realmsclient.gui.screens;
 
 import org.apache.logging.log4j.LogManager;
-import com.mojang.realmsclient.gui.LongRunningTask;
-import net.minecraft.realms.RealmsConfirmResultListener;
-import com.mojang.realmsclient.util.RealmsTasks;
+import net.minecraft.client.Minecraft;
+import com.mojang.realmsclient.util.task.ResettingWorldTask;
+import com.mojang.realmsclient.util.task.LongRunningTask;
+import com.mojang.realmsclient.util.task.SwitchSlotTask;
+import javax.annotation.Nullable;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.realmsclient.util.RealmsTextureManager;
-import net.minecraft.realms.RealmsGuiEventListener;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.realmsclient.exception.RealmsServiceException;
 import com.mojang.realmsclient.client.RealmsClient;
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.Realms;
-import net.minecraft.realms.RealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.realmsclient.dto.WorldTemplate;
 import com.mojang.realmsclient.dto.WorldTemplatePaginatedList;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.network.chat.Component;
 import net.minecraft.realms.RealmsLabel;
 import com.mojang.realmsclient.dto.RealmsServer;
-import net.minecraft.realms.RealmsScreen;
+import net.minecraft.client.gui.screens.Screen;
 import org.apache.logging.log4j.Logger;
-import com.mojang.realmsclient.dto.WorldTemplate;
 
-public class RealmsResetWorldScreen extends RealmsScreenWithCallback<WorldTemplate> {
+public class RealmsResetWorldScreen extends RealmsScreenWithCallback {
     private static final Logger LOGGER;
-    private final RealmsScreen lastScreen;
+    private final Screen lastScreen;
     private final RealmsServer serverData;
-    private final RealmsScreen returnScreen;
     private RealmsLabel titleLabel;
     private RealmsLabel subtitleLabel;
-    private String title;
-    private String subtitle;
-    private String buttonTitle;
+    private Component title;
+    private Component subtitle;
+    private Component buttonTitle;
     private int subtitleColor;
-    private final int BUTTON_CANCEL_ID = 0;
-    private final int BUTTON_FRAME_START = 100;
+    private static final ResourceLocation SLOT_FRAME_LOCATION;
+    private static final ResourceLocation UPLOAD_LOCATION;
+    private static final ResourceLocation ADVENTURE_MAP_LOCATION;
+    private static final ResourceLocation SURVIVAL_SPAWN_LOCATION;
+    private static final ResourceLocation NEW_WORLD_LOCATION;
+    private static final ResourceLocation EXPERIENCE_LOCATION;
+    private static final ResourceLocation INSPIRATION_LOCATION;
     private WorldTemplatePaginatedList templates;
     private WorldTemplatePaginatedList adventuremaps;
     private WorldTemplatePaginatedList experiences;
@@ -42,31 +51,28 @@ public class RealmsResetWorldScreen extends RealmsScreenWithCallback<WorldTempla
     private ResetWorldInfo worldInfoToReset;
     private WorldTemplate worldTemplateToReset;
     private String resetTitle;
-    private int confirmationId;
+    private final Runnable resetWorldRunnable;
+    private final Runnable callback;
     
-    public RealmsResetWorldScreen(final RealmsScreen realmsScreen1, final RealmsServer realmsServer, final RealmsScreen realmsScreen3) {
-        this.title = RealmsScreen.getLocalizedString("mco.reset.world.title");
-        this.subtitle = RealmsScreen.getLocalizedString("mco.reset.world.warning");
-        this.buttonTitle = RealmsScreen.getLocalizedString("gui.cancel");
+    public RealmsResetWorldScreen(final Screen dqs, final RealmsServer dip, final Runnable runnable3, final Runnable runnable4) {
+        this.title = new TranslatableComponent("mco.reset.world.title");
+        this.subtitle = new TranslatableComponent("mco.reset.world.warning");
+        this.buttonTitle = CommonComponents.GUI_CANCEL;
         this.subtitleColor = 16711680;
         this.slot = -1;
         this.typeToReset = ResetType.NONE;
-        this.confirmationId = -1;
-        this.lastScreen = realmsScreen1;
-        this.serverData = realmsServer;
-        this.returnScreen = realmsScreen3;
+        this.lastScreen = dqs;
+        this.serverData = dip;
+        this.resetWorldRunnable = runnable3;
+        this.callback = runnable4;
     }
     
-    public RealmsResetWorldScreen(final RealmsScreen realmsScreen1, final RealmsServer realmsServer, final RealmsScreen realmsScreen3, final String string4, final String string5, final int integer, final String string7) {
-        this(realmsScreen1, realmsServer, realmsScreen3);
-        this.title = string4;
-        this.subtitle = string5;
+    public RealmsResetWorldScreen(final Screen dqs, final RealmsServer dip, final Component mr3, final Component mr4, final int integer, final Component mr6, final Runnable runnable7, final Runnable runnable8) {
+        this(dqs, dip, runnable7, runnable8);
+        this.title = mr3;
+        this.subtitle = mr4;
         this.subtitleColor = integer;
-        this.buttonTitle = string7;
-    }
-    
-    public void setConfirmationId(final int integer) {
-        this.confirmationId = integer;
+        this.buttonTitle = mr6;
     }
     
     public void setSlot(final int integer) {
@@ -77,189 +83,156 @@ public class RealmsResetWorldScreen extends RealmsScreenWithCallback<WorldTempla
         this.resetTitle = string;
     }
     
-    @Override
     public void init() {
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 - 40, RealmsConstants.row(14) - 10, 80, 20, this.buttonTitle) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsResetWorldScreen.this.lastScreen);
-            }
-        });
+        this.<Button>addButton(new Button(this.width / 2 - 40, RealmsScreen.row(14) - 10, 80, 20, this.buttonTitle, dni -> this.minecraft.setScreen(this.lastScreen)));
         new Thread("Realms-reset-world-fetcher") {
             @Override
             public void run() {
-                final RealmsClient cyy2 = RealmsClient.createRealmsClient();
+                final RealmsClient dia2 = RealmsClient.create();
                 try {
-                    final WorldTemplatePaginatedList worldTemplatePaginatedList3 = cyy2.fetchWorldTemplates(1, 10, RealmsServer.WorldType.NORMAL);
-                    final WorldTemplatePaginatedList worldTemplatePaginatedList4 = cyy2.fetchWorldTemplates(1, 10, RealmsServer.WorldType.ADVENTUREMAP);
-                    final WorldTemplatePaginatedList worldTemplatePaginatedList5 = cyy2.fetchWorldTemplates(1, 10, RealmsServer.WorldType.EXPERIENCE);
-                    final WorldTemplatePaginatedList worldTemplatePaginatedList6 = cyy2.fetchWorldTemplates(1, 10, RealmsServer.WorldType.INSPIRATION);
-                    final WorldTemplatePaginatedList worldTemplatePaginatedList7;
-                    final WorldTemplatePaginatedList worldTemplatePaginatedList8;
-                    final WorldTemplatePaginatedList worldTemplatePaginatedList9;
-                    final WorldTemplatePaginatedList worldTemplatePaginatedList10;
-                    Realms.execute(() -> {
-                        RealmsResetWorldScreen.this.templates = worldTemplatePaginatedList7;
-                        RealmsResetWorldScreen.this.adventuremaps = worldTemplatePaginatedList8;
-                        RealmsResetWorldScreen.this.experiences = worldTemplatePaginatedList9;
-                        RealmsResetWorldScreen.this.inspirations = worldTemplatePaginatedList10;
+                    final WorldTemplatePaginatedList dje3 = dia2.fetchWorldTemplates(1, 10, RealmsServer.WorldType.NORMAL);
+                    final WorldTemplatePaginatedList dje4 = dia2.fetchWorldTemplates(1, 10, RealmsServer.WorldType.ADVENTUREMAP);
+                    final WorldTemplatePaginatedList dje5 = dia2.fetchWorldTemplates(1, 10, RealmsServer.WorldType.EXPERIENCE);
+                    final WorldTemplatePaginatedList dje6 = dia2.fetchWorldTemplates(1, 10, RealmsServer.WorldType.INSPIRATION);
+                    final WorldTemplatePaginatedList dje7;
+                    final WorldTemplatePaginatedList dje8;
+                    final WorldTemplatePaginatedList dje9;
+                    final WorldTemplatePaginatedList dje10;
+                    RealmsResetWorldScreen.this.minecraft.execute(() -> {
+                        RealmsResetWorldScreen.this.templates = dje7;
+                        RealmsResetWorldScreen.this.adventuremaps = dje8;
+                        RealmsResetWorldScreen.this.experiences = dje9;
+                        RealmsResetWorldScreen.this.inspirations = dje10;
                     });
                 }
-                catch (RealmsServiceException czg3) {
-                    RealmsResetWorldScreen.LOGGER.error("Couldn't fetch templates in reset world", (Throwable)czg3);
+                catch (RealmsServiceException djh3) {
+                    RealmsResetWorldScreen.LOGGER.error("Couldn't fetch templates in reset world", (Throwable)djh3);
                 }
             }
         }.start();
-        this.addWidget(this.titleLabel = new RealmsLabel(this.title, this.width() / 2, 7, 16777215));
-        this.addWidget(this.subtitleLabel = new RealmsLabel(this.subtitle, this.width() / 2, 22, this.subtitleColor));
-        this.buttonsAdd(new FrameButton(this.frame(1), RealmsConstants.row(0) + 10, RealmsScreen.getLocalizedString("mco.reset.world.generate"), -1L, "realms:textures/gui/realms/new_world.png", ResetType.GENERATE) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsResetNormalWorldScreen(RealmsResetWorldScreen.this, RealmsResetWorldScreen.this.title));
-            }
-        });
-        this.buttonsAdd(new FrameButton(this.frame(2), RealmsConstants.row(0) + 10, RealmsScreen.getLocalizedString("mco.reset.world.upload"), -1L, "realms:textures/gui/realms/upload.png", ResetType.UPLOAD) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(new RealmsSelectFileToUploadScreen(RealmsResetWorldScreen.this.serverData.id, (RealmsResetWorldScreen.this.slot != -1) ? RealmsResetWorldScreen.this.slot : RealmsResetWorldScreen.this.serverData.activeSlot, RealmsResetWorldScreen.this));
-            }
-        });
-        this.buttonsAdd(new FrameButton(this.frame(3), RealmsConstants.row(0) + 10, RealmsScreen.getLocalizedString("mco.reset.world.template"), -1L, "realms:textures/gui/realms/survival_spawn.png", ResetType.SURVIVAL_SPAWN) {
-            @Override
-            public void onPress() {
-                final RealmsSelectWorldTemplateScreen daj2 = new RealmsSelectWorldTemplateScreen(RealmsResetWorldScreen.this, RealmsServer.WorldType.NORMAL, RealmsResetWorldScreen.this.templates);
-                daj2.setTitle(RealmsScreen.getLocalizedString("mco.reset.world.template"));
-                Realms.setScreen(daj2);
-            }
-        });
-        this.buttonsAdd(new FrameButton(this.frame(1), RealmsConstants.row(6) + 20, RealmsScreen.getLocalizedString("mco.reset.world.adventure"), -1L, "realms:textures/gui/realms/adventure.png", ResetType.ADVENTURE) {
-            @Override
-            public void onPress() {
-                final RealmsSelectWorldTemplateScreen daj2 = new RealmsSelectWorldTemplateScreen(RealmsResetWorldScreen.this, RealmsServer.WorldType.ADVENTUREMAP, RealmsResetWorldScreen.this.adventuremaps);
-                daj2.setTitle(RealmsScreen.getLocalizedString("mco.reset.world.adventure"));
-                Realms.setScreen(daj2);
-            }
-        });
-        this.buttonsAdd(new FrameButton(this.frame(2), RealmsConstants.row(6) + 20, RealmsScreen.getLocalizedString("mco.reset.world.experience"), -1L, "realms:textures/gui/realms/experience.png", ResetType.EXPERIENCE) {
-            @Override
-            public void onPress() {
-                final RealmsSelectWorldTemplateScreen daj2 = new RealmsSelectWorldTemplateScreen(RealmsResetWorldScreen.this, RealmsServer.WorldType.EXPERIENCE, RealmsResetWorldScreen.this.experiences);
-                daj2.setTitle(RealmsScreen.getLocalizedString("mco.reset.world.experience"));
-                Realms.setScreen(daj2);
-            }
-        });
-        this.buttonsAdd(new FrameButton(this.frame(3), RealmsConstants.row(6) + 20, RealmsScreen.getLocalizedString("mco.reset.world.inspiration"), -1L, "realms:textures/gui/realms/inspiration.png", ResetType.INSPIRATION) {
-            @Override
-            public void onPress() {
-                final RealmsSelectWorldTemplateScreen daj2 = new RealmsSelectWorldTemplateScreen(RealmsResetWorldScreen.this, RealmsServer.WorldType.INSPIRATION, RealmsResetWorldScreen.this.inspirations);
-                daj2.setTitle(RealmsScreen.getLocalizedString("mco.reset.world.inspiration"));
-                Realms.setScreen(daj2);
-            }
-        });
+        this.titleLabel = this.<RealmsLabel>addWidget(new RealmsLabel(this.title, this.width / 2, 7, 16777215));
+        this.subtitleLabel = this.<RealmsLabel>addWidget(new RealmsLabel(this.subtitle, this.width / 2, 22, this.subtitleColor));
+        this.<FrameButton>addButton(new FrameButton(this.frame(1), RealmsScreen.row(0) + 10, new TranslatableComponent("mco.reset.world.generate"), RealmsResetWorldScreen.NEW_WORLD_LOCATION, dni -> this.minecraft.setScreen(new RealmsResetNormalWorldScreen(this, this.title))));
+        final RealmsSelectFileToUploadScreen realmsSelectFileToUploadScreen;
+        final Screen dqs3;
+        this.<FrameButton>addButton(new FrameButton(this.frame(2), RealmsScreen.row(0) + 10, new TranslatableComponent("mco.reset.world.upload"), RealmsResetWorldScreen.UPLOAD_LOCATION, dni -> {
+            new RealmsSelectFileToUploadScreen(this.serverData.id, (this.slot != -1) ? this.slot : this.serverData.activeSlot, this, this.callback);
+            dqs3 = realmsSelectFileToUploadScreen;
+            this.minecraft.setScreen(dqs3);
+            return;
+        }));
+        final RealmsSelectWorldTemplateScreen dkh3;
+        this.<FrameButton>addButton(new FrameButton(this.frame(3), RealmsScreen.row(0) + 10, new TranslatableComponent("mco.reset.world.template"), RealmsResetWorldScreen.SURVIVAL_SPAWN_LOCATION, dni -> {
+            dkh3 = new RealmsSelectWorldTemplateScreen(this, RealmsServer.WorldType.NORMAL, this.templates);
+            dkh3.setTitle(new TranslatableComponent("mco.reset.world.template"));
+            this.minecraft.setScreen(dkh3);
+            return;
+        }));
+        final RealmsSelectWorldTemplateScreen dkh4;
+        this.<FrameButton>addButton(new FrameButton(this.frame(1), RealmsScreen.row(6) + 20, new TranslatableComponent("mco.reset.world.adventure"), RealmsResetWorldScreen.ADVENTURE_MAP_LOCATION, dni -> {
+            dkh4 = new RealmsSelectWorldTemplateScreen(this, RealmsServer.WorldType.ADVENTUREMAP, this.adventuremaps);
+            dkh4.setTitle(new TranslatableComponent("mco.reset.world.adventure"));
+            this.minecraft.setScreen(dkh4);
+            return;
+        }));
+        final RealmsSelectWorldTemplateScreen dkh5;
+        this.<FrameButton>addButton(new FrameButton(this.frame(2), RealmsScreen.row(6) + 20, new TranslatableComponent("mco.reset.world.experience"), RealmsResetWorldScreen.EXPERIENCE_LOCATION, dni -> {
+            dkh5 = new RealmsSelectWorldTemplateScreen(this, RealmsServer.WorldType.EXPERIENCE, this.experiences);
+            dkh5.setTitle(new TranslatableComponent("mco.reset.world.experience"));
+            this.minecraft.setScreen(dkh5);
+            return;
+        }));
+        final RealmsSelectWorldTemplateScreen dkh6;
+        this.<FrameButton>addButton(new FrameButton(this.frame(3), RealmsScreen.row(6) + 20, new TranslatableComponent("mco.reset.world.inspiration"), RealmsResetWorldScreen.INSPIRATION_LOCATION, dni -> {
+            dkh6 = new RealmsSelectWorldTemplateScreen(this, RealmsServer.WorldType.INSPIRATION, this.inspirations);
+            dkh6.setTitle(new TranslatableComponent("mco.reset.world.inspiration"));
+            this.minecraft.setScreen(dkh6);
+            return;
+        }));
         this.narrateLabels();
     }
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
     }
     
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return super.mouseClicked(double1, double2, integer);
-    }
-    
     private int frame(final int integer) {
-        return this.width() / 2 - 130 + (integer - 1) * 100;
+        return this.width / 2 - 130 + (integer - 1) * 100;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.titleLabel.render(this);
-        this.subtitleLabel.render(this);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.titleLabel.render(this, dhl);
+        this.subtitleLabel.render(this, dhl);
+        super.render(dhl, integer2, integer3, float4);
     }
     
-    private void drawFrame(final int integer1, final int integer2, final String string3, final long long4, final String string5, final ResetType b, final boolean boolean7, final boolean boolean8) {
-        if (long4 == -1L) {
-            RealmsScreen.bind(string5);
-        }
-        else {
-            RealmsTextureManager.bindWorldTemplate(String.valueOf(long4), string5);
-        }
-        if (boolean7) {
+    private void drawFrame(final PoseStack dhl, final int integer2, final int integer3, final Component mr, final ResourceLocation uh, final boolean boolean6, final boolean boolean7) {
+        this.minecraft.getTextureManager().bind(uh);
+        if (boolean6) {
             RenderSystem.color4f(0.56f, 0.56f, 0.56f, 1.0f);
         }
         else {
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         }
-        RealmsScreen.blit(integer1 + 2, integer2 + 14, 0.0f, 0.0f, 56, 56, 56, 56);
-        RealmsScreen.bind("realms:textures/gui/realms/slot_frame.png");
-        if (boolean7) {
+        GuiComponent.blit(dhl, integer2 + 2, integer3 + 14, 0.0f, 0.0f, 56, 56, 56, 56);
+        this.minecraft.getTextureManager().bind(RealmsResetWorldScreen.SLOT_FRAME_LOCATION);
+        if (boolean6) {
             RenderSystem.color4f(0.56f, 0.56f, 0.56f, 1.0f);
         }
         else {
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         }
-        RealmsScreen.blit(integer1, integer2 + 12, 0.0f, 0.0f, 60, 60, 60, 60);
-        this.drawCenteredString(string3, integer1 + 30, integer2, boolean7 ? 10526880 : 16777215);
+        GuiComponent.blit(dhl, integer2, integer3 + 12, 0.0f, 0.0f, 60, 60, 60, 60);
+        final int integer4 = boolean6 ? 10526880 : 16777215;
+        this.drawCenteredString(dhl, this.font, mr, integer2 + 30, integer3, integer4);
     }
     
     @Override
-    void callback(final WorldTemplate worldTemplate) {
-        if (worldTemplate != null) {
-            if (this.slot == -1) {
-                this.resetWorldWithTemplate(worldTemplate);
-            }
-            else {
-                switch (worldTemplate.type) {
-                    case WORLD_TEMPLATE: {
-                        this.typeToReset = ResetType.SURVIVAL_SPAWN;
-                        break;
-                    }
-                    case ADVENTUREMAP: {
-                        this.typeToReset = ResetType.ADVENTURE;
-                        break;
-                    }
-                    case EXPERIENCE: {
-                        this.typeToReset = ResetType.EXPERIENCE;
-                        break;
-                    }
-                    case INSPIRATION: {
-                        this.typeToReset = ResetType.INSPIRATION;
-                        break;
-                    }
+    protected void callback(@Nullable final WorldTemplate djd) {
+        if (djd == null) {
+            return;
+        }
+        if (this.slot == -1) {
+            this.resetWorldWithTemplate(djd);
+        }
+        else {
+            switch (djd.type) {
+                case WORLD_TEMPLATE: {
+                    this.typeToReset = ResetType.SURVIVAL_SPAWN;
+                    break;
+                }
+                case ADVENTUREMAP: {
+                    this.typeToReset = ResetType.ADVENTURE;
+                    break;
+                }
+                case EXPERIENCE: {
+                    this.typeToReset = ResetType.EXPERIENCE;
+                    break;
+                }
+                case INSPIRATION: {
+                    this.typeToReset = ResetType.INSPIRATION;
+                    break;
                 }
-                this.worldTemplateToReset = worldTemplate;
-                this.switchSlot();
             }
+            this.worldTemplateToReset = djd;
+            this.switchSlot();
         }
     }
     
     private void switchSlot() {
-        this.switchSlot(this);
-    }
-    
-    public void switchSlot(final RealmsScreen realmsScreen) {
-        final RealmsTasks.SwitchSlotTask i3 = new RealmsTasks.SwitchSlotTask(this.serverData.id, this.slot, realmsScreen, 100);
-        final RealmsLongRunningMcoTaskScreen czz4 = new RealmsLongRunningMcoTaskScreen(this.lastScreen, i3);
-        czz4.start();
-        Realms.setScreen(czz4);
-    }
-    
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-        if (integer == 100 && boolean1) {
+        this.switchSlot(() -> {
             switch (this.typeToReset) {
                 case ADVENTURE:
                 case SURVIVAL_SPAWN:
@@ -269,6 +242,9 @@ public class RealmsResetWorldScreen extends RealmsScreenWithCallback<WorldTempla
                         this.resetWorldWithTemplate(this.worldTemplateToReset);
                         break;
                     }
+                    else {
+                        break;
+                    }
                     break;
                 }
                 case GENERATE: {
@@ -276,31 +252,29 @@ public class RealmsResetWorldScreen extends RealmsScreenWithCallback<WorldTempla
                         this.triggerResetWorld(this.worldInfoToReset);
                         break;
                     }
+                    else {
+                        break;
+                    }
                     break;
                 }
-                default: {}
             }
-            return;
-        }
-        if (boolean1) {
-            Realms.setScreen(this.returnScreen);
-            if (this.confirmationId != -1) {
-                this.returnScreen.confirmResult(true, this.confirmationId);
-            }
-        }
+        });
     }
     
-    public void resetWorldWithTemplate(final WorldTemplate worldTemplate) {
-        final RealmsTasks.ResettingWorldTask f3 = new RealmsTasks.ResettingWorldTask(this.serverData.id, this.returnScreen, worldTemplate);
-        if (this.resetTitle != null) {
-            f3.setResetTitle(this.resetTitle);
-        }
-        if (this.confirmationId != -1) {
-            f3.setConfirmationId(this.confirmationId);
-        }
-        final RealmsLongRunningMcoTaskScreen czz4 = new RealmsLongRunningMcoTaskScreen(this.lastScreen, f3);
-        czz4.start();
-        Realms.setScreen(czz4);
+    public void switchSlot(final Runnable runnable) {
+        this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(this.lastScreen, new SwitchSlotTask(this.serverData.id, this.slot, runnable)));
+    }
+    
+    public void resetWorldWithTemplate(final WorldTemplate djd) {
+        this.resetWorld(null, djd, -1, true);
+    }
+    
+    private void triggerResetWorld(final ResetWorldInfo c) {
+        this.resetWorld(c.seed, null, c.levelType, c.generateStructures);
+    }
+    
+    private void resetWorld(@Nullable final String string, @Nullable final WorldTemplate djd, final int integer, final boolean boolean4) {
+        this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(this.lastScreen, new ResettingWorldTask(string, djd, integer, boolean4, this.serverData.id, this.resetTitle, this.resetWorldRunnable)));
     }
     
     public void resetWorld(final ResetWorldInfo c) {
@@ -314,21 +288,15 @@ public class RealmsResetWorldScreen extends RealmsScreenWithCallback<WorldTempla
         }
     }
     
-    private void triggerResetWorld(final ResetWorldInfo c) {
-        final RealmsTasks.ResettingWorldTask f3 = new RealmsTasks.ResettingWorldTask(this.serverData.id, this.returnScreen, c.seed, c.levelType, c.generateStructures);
-        if (this.resetTitle != null) {
-            f3.setResetTitle(this.resetTitle);
-        }
-        if (this.confirmationId != -1) {
-            f3.setConfirmationId(this.confirmationId);
-        }
-        final RealmsLongRunningMcoTaskScreen czz4 = new RealmsLongRunningMcoTaskScreen(this.lastScreen, f3);
-        czz4.start();
-        Realms.setScreen(czz4);
-    }
-    
     static {
         LOGGER = LogManager.getLogger();
+        SLOT_FRAME_LOCATION = new ResourceLocation("realms", "textures/gui/realms/slot_frame.png");
+        UPLOAD_LOCATION = new ResourceLocation("realms", "textures/gui/realms/upload.png");
+        ADVENTURE_MAP_LOCATION = new ResourceLocation("realms", "textures/gui/realms/adventure.png");
+        SURVIVAL_SPAWN_LOCATION = new ResourceLocation("realms", "textures/gui/realms/survival_spawn.png");
+        NEW_WORLD_LOCATION = new ResourceLocation("realms", "textures/gui/realms/new_world.png");
+        EXPERIENCE_LOCATION = new ResourceLocation("realms", "textures/gui/realms/experience.png");
+        INSPIRATION_LOCATION = new ResourceLocation("realms", "textures/gui/realms/inspiration.png");
     }
     
     enum ResetType {
@@ -342,9 +310,9 @@ public class RealmsResetWorldScreen extends RealmsScreenWithCallback<WorldTempla
     }
     
     public static class ResetWorldInfo {
-        String seed;
-        int levelType;
-        boolean generateStructures;
+        private final String seed;
+        private final int levelType;
+        private final boolean generateStructures;
         
         public ResetWorldInfo(final String string, final int integer, final boolean boolean3) {
             this.seed = string;
@@ -353,31 +321,17 @@ public class RealmsResetWorldScreen extends RealmsScreenWithCallback<WorldTempla
         }
     }
     
-    abstract class FrameButton extends RealmsButton {
-        private final long imageId;
-        private final String image;
-        private final ResetType resetType;
+    class FrameButton extends Button {
+        private final ResourceLocation image;
         
-        public FrameButton(final int integer2, final int integer3, final String string4, final long long5, final String string6, final ResetType b) {
-            super(100 + b.ordinal(), integer2, integer3, 60, 72, string4);
-            this.imageId = long5;
-            this.image = string6;
-            this.resetType = b;
+        public FrameButton(final int integer2, final int integer3, final Component mr, final ResourceLocation uh, final OnPress a) {
+            super(integer2, integer3, 60, 72, mr, a);
+            this.image = uh;
         }
         
         @Override
-        public void tick() {
-            super.tick();
-        }
-        
-        @Override
-        public void render(final int integer1, final int integer2, final float float3) {
-            super.render(integer1, integer2, float3);
-        }
-        
-        @Override
-        public void renderButton(final int integer1, final int integer2, final float float3) {
-            RealmsResetWorldScreen.this.drawFrame(this.x(), this.y(), this.getProxy().getMessage(), this.imageId, this.image, this.resetType, this.getProxy().isHovered(), this.getProxy().isMouseOver(integer1, integer2));
+        public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+            RealmsResetWorldScreen.this.drawFrame(dhl, this.x, this.y, this.getMessage(), this.image, this.isHovered(), this.isMouseOver(integer2, integer3));
         }
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsResourcePackScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsResourcePackScreen.java
deleted file mode 100644
index b09b282..0000000
--- a/src/com/mojang/realmsclient/gui/screens/RealmsResourcePackScreen.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.mojang.realmsclient.gui.screens;
-
-import org.apache.logging.log4j.LogManager;
-import com.mojang.realmsclient.gui.LongRunningTask;
-import com.mojang.realmsclient.util.RealmsTasks;
-import net.minecraft.realms.Realms;
-import java.util.concurrent.locks.ReentrantLock;
-import com.mojang.realmsclient.dto.RealmsServerAddress;
-import org.apache.logging.log4j.Logger;
-import net.minecraft.realms.RealmsScreen;
-
-public class RealmsResourcePackScreen extends RealmsScreen {
-    private static final Logger LOGGER;
-    private final RealmsScreen lastScreen;
-    private final RealmsServerAddress serverAddress;
-    private final ReentrantLock connectLock;
-    
-    public RealmsResourcePackScreen(final RealmsScreen realmsScreen, final RealmsServerAddress realmsServerAddress, final ReentrantLock reentrantLock) {
-        this.lastScreen = realmsScreen;
-        this.serverAddress = realmsServerAddress;
-        this.connectLock = reentrantLock;
-    }
-    
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-        try {
-            if (!boolean1) {
-                Realms.setScreen(this.lastScreen);
-            }
-            else {
-                try {
-                    final RealmsLongRunningMcoTaskScreen realmsLongRunningMcoTaskScreen;
-                    final RealmsLongRunningMcoTaskScreen czz2;
-                    Realms.downloadResourcePack(this.serverAddress.resourcePackUrl, this.serverAddress.resourcePackHash).thenRun(() -> {
-                        new RealmsLongRunningMcoTaskScreen(this.lastScreen, new RealmsTasks.RealmsConnectTask(this.lastScreen, this.serverAddress));
-                        czz2 = realmsLongRunningMcoTaskScreen;
-                        czz2.start();
-                        Realms.setScreen(czz2);
-                    }).exceptionally(throwable -> {
-                        Realms.clearResourcePack();
-                        RealmsResourcePackScreen.LOGGER.error(throwable);
-                        Realms.setScreen(new RealmsGenericErrorScreen("Failed to download resource pack!", this.lastScreen));
-                        return null;
-                    });
-                }
-                catch (Exception exception4) {
-                    Realms.clearResourcePack();
-                    RealmsResourcePackScreen.LOGGER.error(exception4);
-                    Realms.setScreen(new RealmsGenericErrorScreen("Failed to download resource pack!", this.lastScreen));
-                }
-            }
-        }
-        finally {
-            if (this.connectLock != null && this.connectLock.isHeldByCurrentThread()) {
-                this.connectLock.unlock();
-            }
-        }
-    }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-    }
-}
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.java b/src/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.java
index f192e18..159ade9 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.java
@@ -1,7 +1,9 @@
 package com.mojang.realmsclient.gui.screens;
 
+import javax.annotation.Nullable;
+import com.mojang.realmsclient.dto.WorldTemplate;
 import net.minecraft.realms.RealmsScreen;
 
-public abstract class RealmsScreenWithCallback<T> extends RealmsScreen {
-    abstract void callback(final T object);
+public abstract class RealmsScreenWithCallback extends RealmsScreen {
+    protected abstract void callback(@Nullable final WorldTemplate djd);
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java
index 3a7aafc..264d2c3 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java
@@ -1,100 +1,99 @@
 package com.mojang.realmsclient.gui.screens;
 
-import com.mojang.realmsclient.gui.ChatFormatting;
-import net.minecraft.realms.Tezzelator;
-import net.minecraft.realms.RealmListEntry;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.components.ObjectSelectionList;
+import net.minecraft.client.gui.components.AbstractSelectionList;
+import javax.annotation.Nullable;
+import net.minecraft.realms.NarrationHelper;
 import java.util.Arrays;
 import net.minecraft.realms.RealmsObjectSelectionList;
-import org.apache.logging.log4j.LogManager;
-import java.util.Date;
-import com.mojang.realmsclient.gui.RealmsConstants;
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.RealmsGuiEventListener;
-import net.minecraft.realms.Realms;
-import java.util.Iterator;
-import net.minecraft.realms.RealmsAnvilLevelStorageSource;
-import java.util.Collections;
-import com.google.common.collect.Lists;
 import java.text.SimpleDateFormat;
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.client.gui.Font;
+import java.util.Date;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import java.util.Iterator;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import com.google.common.collect.Lists;
 import net.minecraft.realms.RealmsLabel;
-import net.minecraft.realms.RealmsLevelSummary;
+import net.minecraft.world.level.storage.LevelSummary;
 import java.util.List;
+import net.minecraft.client.gui.components.Button;
 import java.text.DateFormat;
-import net.minecraft.realms.RealmsButton;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsSelectFileToUploadScreen extends RealmsScreen {
     private static final Logger LOGGER;
+    private static final DateFormat DATE_FORMAT;
     private final RealmsResetWorldScreen lastScreen;
     private final long worldId;
     private final int slotId;
-    private RealmsButton uploadButton;
-    private final DateFormat DATE_FORMAT;
-    private List<RealmsLevelSummary> levelList;
+    private Button uploadButton;
+    private List<LevelSummary> levelList;
     private int selectedWorld;
     private WorldSelectionList worldSelectionList;
     private String worldLang;
     private String conversionLang;
-    private final String[] gameModesLang;
     private RealmsLabel titleLabel;
     private RealmsLabel subtitleLabel;
     private RealmsLabel noWorldsLabel;
+    private final Runnable callback;
     
-    public RealmsSelectFileToUploadScreen(final long long1, final int integer, final RealmsResetWorldScreen daf) {
-        this.DATE_FORMAT = new SimpleDateFormat();
+    public RealmsSelectFileToUploadScreen(final long long1, final int integer, final RealmsResetWorldScreen dke, final Runnable runnable) {
         this.levelList = Lists.newArrayList();
         this.selectedWorld = -1;
-        this.gameModesLang = new String[4];
-        this.lastScreen = daf;
+        this.lastScreen = dke;
         this.worldId = long1;
         this.slotId = integer;
+        this.callback = runnable;
     }
     
     private void loadLevelList() throws Exception {
-        final RealmsAnvilLevelStorageSource realmsAnvilLevelStorageSource2 = this.getLevelStorageSource();
-        Collections.<RealmsLevelSummary>sort(this.levelList = realmsAnvilLevelStorageSource2.getLevelList());
-        for (final RealmsLevelSummary realmsLevelSummary4 : this.levelList) {
-            this.worldSelectionList.addEntry(realmsLevelSummary4);
+        this.levelList = this.minecraft.getLevelSource().getLevelList().stream().sorted((daf1, daf2) -> {
+            if (daf1.getLastPlayed() < daf2.getLastPlayed()) {
+                return 1;
+            }
+            else if (daf1.getLastPlayed() > daf2.getLastPlayed()) {
+                return -1;
+            }
+            else {
+                return daf1.getLevelId().compareTo(daf2.getLevelId());
+            }
+        }).collect(Collectors.toList());
+        for (final LevelSummary daf3 : this.levelList) {
+            this.worldSelectionList.addEntry(daf3);
         }
     }
     
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
         this.worldSelectionList = new WorldSelectionList();
         try {
             this.loadLevelList();
         }
         catch (Exception exception2) {
             RealmsSelectFileToUploadScreen.LOGGER.error("Couldn't load level list", (Throwable)exception2);
-            Realms.setScreen(new RealmsGenericErrorScreen("Unable to load worlds", exception2.getMessage(), this.lastScreen));
+            this.minecraft.setScreen(new RealmsGenericErrorScreen(new TextComponent("Unable to load worlds"), Component.nullToEmpty(exception2.getMessage()), this.lastScreen));
             return;
         }
-        this.worldLang = RealmsScreen.getLocalizedString("selectWorld.world");
-        this.conversionLang = RealmsScreen.getLocalizedString("selectWorld.conversion");
-        this.gameModesLang[Realms.survivalId()] = RealmsScreen.getLocalizedString("gameMode.survival");
-        this.gameModesLang[Realms.creativeId()] = RealmsScreen.getLocalizedString("gameMode.creative");
-        this.gameModesLang[Realms.adventureId()] = RealmsScreen.getLocalizedString("gameMode.adventure");
-        this.gameModesLang[Realms.spectatorId()] = RealmsScreen.getLocalizedString("gameMode.spectator");
-        this.addWidget(this.worldSelectionList);
-        this.buttonsAdd(new RealmsButton(1, this.width() / 2 + 6, this.height() - 32, 153, 20, RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsSelectFileToUploadScreen.this.lastScreen);
-            }
-        });
-        this.buttonsAdd(this.uploadButton = new RealmsButton(2, this.width() / 2 - 154, this.height() - 32, 153, 20, RealmsScreen.getLocalizedString("mco.upload.button.name")) {
-            @Override
-            public void onPress() {
-                RealmsSelectFileToUploadScreen.this.upload();
-            }
-        });
-        this.uploadButton.active(this.selectedWorld >= 0 && this.selectedWorld < this.levelList.size());
-        this.addWidget(this.titleLabel = new RealmsLabel(RealmsScreen.getLocalizedString("mco.upload.select.world.title"), this.width() / 2, 13, 16777215));
-        this.addWidget(this.subtitleLabel = new RealmsLabel(RealmsScreen.getLocalizedString("mco.upload.select.world.subtitle"), this.width() / 2, RealmsConstants.row(-1), 10526880));
+        this.worldLang = I18n.get("selectWorld.world");
+        this.conversionLang = I18n.get("selectWorld.conversion");
+        this.<WorldSelectionList>addWidget(this.worldSelectionList);
+        this.uploadButton = this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 32, 153, 20, new TranslatableComponent("mco.upload.button.name"), dni -> this.upload()));
+        this.uploadButton.active = (this.selectedWorld >= 0 && this.selectedWorld < this.levelList.size());
+        this.<Button>addButton(new Button(this.width / 2 + 6, this.height - 32, 153, 20, CommonComponents.GUI_BACK, dni -> this.minecraft.setScreen(this.lastScreen)));
+        this.titleLabel = this.<RealmsLabel>addWidget(new RealmsLabel(new TranslatableComponent("mco.upload.select.world.title"), this.width / 2, 13, 16777215));
+        this.subtitleLabel = this.<RealmsLabel>addWidget(new RealmsLabel(new TranslatableComponent("mco.upload.select.world.subtitle"), this.width / 2, RealmsScreen.row(-1), 10526880));
         if (this.levelList.isEmpty()) {
-            this.addWidget(this.noWorldsLabel = new RealmsLabel(RealmsScreen.getLocalizedString("mco.upload.select.world.none"), this.width() / 2, this.height() / 2 - 20, 16777215));
+            this.noWorldsLabel = this.<RealmsLabel>addWidget(new RealmsLabel(new TranslatableComponent("mco.upload.select.world.none"), this.width / 2, this.height / 2 - 20, 16777215));
         }
         else {
             this.noWorldsLabel = null;
@@ -104,66 +103,57 @@ public class RealmsSelectFileToUploadScreen extends RealmsScreen {
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     private void upload() {
         if (this.selectedWorld != -1 && !this.levelList.get(this.selectedWorld).isHardcore()) {
-            final RealmsLevelSummary realmsLevelSummary2 = this.levelList.get(this.selectedWorld);
-            Realms.setScreen(new RealmsUploadScreen(this.worldId, this.slotId, this.lastScreen, realmsLevelSummary2));
+            final LevelSummary daf2 = this.levelList.get(this.selectedWorld);
+            this.minecraft.setScreen(new RealmsUploadScreen(this.worldId, this.slotId, this.lastScreen, daf2, this.callback));
         }
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.worldSelectionList.render(integer1, integer2, float3);
-        this.titleLabel.render(this);
-        this.subtitleLabel.render(this);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.worldSelectionList.render(dhl, integer2, integer3, float4);
+        this.titleLabel.render(this, dhl);
+        this.subtitleLabel.render(this, dhl);
         if (this.noWorldsLabel != null) {
-            this.noWorldsLabel.render(this);
+            this.noWorldsLabel.render(this, dhl);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
     }
     
-    @Override
-    public void tick() {
-        super.tick();
+    private static String gameModeName(final LevelSummary daf) {
+        return daf.getGameMode().getDisplayName().getString();
     }
     
-    private String gameModeName(final RealmsLevelSummary realmsLevelSummary) {
-        return this.gameModesLang[realmsLevelSummary.getGameMode()];
-    }
-    
-    private String formatLastPlayed(final RealmsLevelSummary realmsLevelSummary) {
-        return this.DATE_FORMAT.format(new Date(realmsLevelSummary.getLastPlayed()));
+    private static String formatLastPlayed(final LevelSummary daf) {
+        return RealmsSelectFileToUploadScreen.DATE_FORMAT.format(new Date(daf.getLastPlayed()));
     }
     
     static {
         LOGGER = LogManager.getLogger();
+        DATE_FORMAT = new SimpleDateFormat();
     }
     
-    class WorldSelectionList extends RealmsObjectSelectionList {
+    class WorldSelectionList extends RealmsObjectSelectionList<RealmsSelectFileToUploadScreen.Entry> {
         public WorldSelectionList() {
-            super(RealmsSelectFileToUploadScreen.this.width(), RealmsSelectFileToUploadScreen.this.height(), RealmsConstants.row(0), RealmsSelectFileToUploadScreen.this.height() - 40, 36);
+            super(RealmsSelectFileToUploadScreen.this.width, RealmsSelectFileToUploadScreen.this.height, RealmsScreen.row(0), RealmsSelectFileToUploadScreen.this.height - 40, 36);
         }
         
-        public void addEntry(final RealmsLevelSummary realmsLevelSummary) {
-            this.addEntry(new WorldListEntry(realmsLevelSummary));
-        }
-        
-        @Override
-        public int getItemCount() {
-            return RealmsSelectFileToUploadScreen.this.levelList.size();
+        public void addEntry(final LevelSummary daf) {
+            this.addEntry(new RealmsSelectFileToUploadScreen.Entry(daf));
         }
         
         @Override
@@ -171,40 +161,43 @@ public class RealmsSelectFileToUploadScreen extends RealmsScreen {
             return RealmsSelectFileToUploadScreen.this.levelList.size() * 36;
         }
         
-        @Override
         public boolean isFocused() {
-            return RealmsSelectFileToUploadScreen.this.isFocused(this);
+            return RealmsSelectFileToUploadScreen.this.getFocused() == this;
         }
         
-        @Override
-        public void renderBackground() {
-            RealmsSelectFileToUploadScreen.this.renderBackground();
+        public void renderBackground(final PoseStack dhl) {
+            RealmsSelectFileToUploadScreen.this.renderBackground(dhl);
         }
         
         @Override
         public void selectItem(final int integer) {
-            this.setSelected(integer);
+            this.setSelectedItem(integer);
             if (integer != -1) {
-                final RealmsLevelSummary realmsLevelSummary3 = RealmsSelectFileToUploadScreen.this.levelList.get(integer);
-                final String string4 = RealmsScreen.getLocalizedString("narrator.select.list.position", integer + 1, RealmsSelectFileToUploadScreen.this.levelList.size());
-                final String string5 = Realms.joinNarrations(Arrays.<String>asList(realmsLevelSummary3.getLevelName(), RealmsSelectFileToUploadScreen.this.formatLastPlayed(realmsLevelSummary3), RealmsSelectFileToUploadScreen.this.gameModeName(realmsLevelSummary3), string4));
-                Realms.narrateNow(RealmsScreen.getLocalizedString("narrator.select", string5));
+                final LevelSummary daf3 = RealmsSelectFileToUploadScreen.this.levelList.get(integer);
+                final String string4 = I18n.get("narrator.select.list.position", integer + 1, RealmsSelectFileToUploadScreen.this.levelList.size());
+                final String string5 = NarrationHelper.join(Arrays.<String>asList(daf3.getLevelName(), formatLastPlayed(daf3), gameModeName(daf3), string4));
+                NarrationHelper.now(I18n.get("narrator.select", string5));
             }
-            RealmsSelectFileToUploadScreen.this.selectedWorld = integer;
-            RealmsSelectFileToUploadScreen.this.uploadButton.active(RealmsSelectFileToUploadScreen.this.selectedWorld >= 0 && RealmsSelectFileToUploadScreen.this.selectedWorld < this.getItemCount() && !RealmsSelectFileToUploadScreen.this.levelList.get(RealmsSelectFileToUploadScreen.this.selectedWorld).isHardcore());
-        }
-    }
-    
-    class WorldListEntry extends RealmListEntry {
-        final RealmsLevelSummary levelSummary;
-        
-        public WorldListEntry(final RealmsLevelSummary realmsLevelSummary) {
-            this.levelSummary = realmsLevelSummary;
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            this.renderItem(this.levelSummary, integer1, integer3, integer2, integer5, Tezzelator.instance, integer6, integer7);
+        public void setSelected(@Nullable final RealmsSelectFileToUploadScreen.Entry a) {
+            super.setSelected(a);
+            RealmsSelectFileToUploadScreen.this.selectedWorld = this.children().indexOf(a);
+            RealmsSelectFileToUploadScreen.this.uploadButton.active = (RealmsSelectFileToUploadScreen.this.selectedWorld >= 0 && RealmsSelectFileToUploadScreen.this.selectedWorld < this.getItemCount() && !RealmsSelectFileToUploadScreen.this.levelList.get(RealmsSelectFileToUploadScreen.this.selectedWorld).isHardcore());
+        }
+    }
+    
+    class Entry extends ObjectSelectionList.Entry<Entry> {
+        private final LevelSummary levelSummary;
+        
+        public Entry(final LevelSummary daf) {
+            this.levelSummary = daf;
+        }
+        
+        @Override
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.renderItem(dhl, this.levelSummary, integer2, integer4, integer3);
         }
         
         @Override
@@ -213,30 +206,30 @@ public class RealmsSelectFileToUploadScreen extends RealmsScreen {
             return true;
         }
         
-        protected void renderItem(final RealmsLevelSummary realmsLevelSummary, final int integer2, final int integer3, final int integer4, final int integer5, final Tezzelator tezzelator, final int integer7, final int integer8) {
-            String string10 = realmsLevelSummary.getLevelName();
-            if (string10 == null || string10.isEmpty()) {
-                string10 = RealmsSelectFileToUploadScreen.this.worldLang + " " + (integer2 + 1);
+        protected void renderItem(final PoseStack dhl, final LevelSummary daf, final int integer3, final int integer4, final int integer5) {
+            String string7 = daf.getLevelName();
+            if (string7 == null || string7.isEmpty()) {
+                string7 = RealmsSelectFileToUploadScreen.this.worldLang + " " + (integer3 + 1);
             }
-            String string11 = realmsLevelSummary.getLevelId();
-            string11 = string11 + " (" + RealmsSelectFileToUploadScreen.this.formatLastPlayed(realmsLevelSummary);
-            string11 += ")";
-            String string12 = "";
-            if (realmsLevelSummary.isRequiresConversion()) {
-                string12 = RealmsSelectFileToUploadScreen.this.conversionLang + " " + string12;
+            String string8 = daf.getLevelId();
+            string8 = string8 + " (" + formatLastPlayed(daf);
+            string8 += ")";
+            String string9 = "";
+            if (daf.isRequiresConversion()) {
+                string9 = RealmsSelectFileToUploadScreen.this.conversionLang + " " + string9;
             }
             else {
-                string12 = RealmsSelectFileToUploadScreen.this.gameModeName(realmsLevelSummary);
-                if (realmsLevelSummary.isHardcore()) {
-                    string12 = ChatFormatting.DARK_RED + RealmsScreen.getLocalizedString("mco.upload.hardcore") + ChatFormatting.RESET;
+                string9 = gameModeName(daf);
+                if (daf.isHardcore()) {
+                    string9 = ChatFormatting.DARK_RED + I18n.get("mco.upload.hardcore") + ChatFormatting.RESET;
                 }
-                if (realmsLevelSummary.hasCheats()) {
-                    string12 = string12 + ", " + RealmsScreen.getLocalizedString("selectWorld.cheats");
+                if (daf.hasCheats()) {
+                    string9 = string9 + ", " + I18n.get("selectWorld.cheats");
                 }
             }
-            RealmsSelectFileToUploadScreen.this.drawString(string10, integer3 + 2, integer4 + 1, 16777215);
-            RealmsSelectFileToUploadScreen.this.drawString(string11, integer3 + 2, integer4 + 12, 8421504);
-            RealmsSelectFileToUploadScreen.this.drawString(string12, integer3 + 2, integer4 + 12 + 10, 8421504);
+            RealmsSelectFileToUploadScreen.this.font.draw(dhl, string7, (float)(integer4 + 2), (float)(integer5 + 1), 16777215);
+            RealmsSelectFileToUploadScreen.this.font.draw(dhl, string8, (float)(integer4 + 2), (float)(integer5 + 12), 8421504);
+            RealmsSelectFileToUploadScreen.this.font.draw(dhl, string9, (float)(integer4 + 2), (float)(integer5 + 12 + 10), 8421504);
         }
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java
index 753e7a8..cbfecfe 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java
@@ -1,134 +1,135 @@
 package com.mojang.realmsclient.gui.screens;
 
+import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.realmsclient.util.RealmsTextureManager;
-import net.minecraft.realms.RealmListEntry;
+import net.minecraft.client.gui.components.ObjectSelectionList;
+import net.minecraft.client.gui.components.AbstractSelectionList;
 import java.util.Arrays;
 import java.util.function.Consumer;
 import java.util.Collections;
 import net.minecraft.realms.RealmsObjectSelectionList;
 import org.apache.logging.log4j.LogManager;
-import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.Minecraft;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.realmsclient.exception.RealmsServiceException;
 import java.util.Iterator;
 import com.mojang.datafixers.util.Either;
+import net.minecraft.client.resources.language.I18n;
 import com.mojang.realmsclient.client.RealmsClient;
-import net.minecraft.realms.Realms;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.realms.NarrationHelper;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.Objects;
 import java.util.stream.Stream;
-import net.minecraft.realms.RealmsGuiEventListener;
-import net.minecraft.realms.AbstractRealmsButton;
-import com.mojang.realmsclient.util.RealmsUtil;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.Util;
+import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.realmsclient.dto.WorldTemplate;
 import com.google.common.collect.Lists;
-import javax.annotation.Nullable;
 import com.mojang.realmsclient.dto.WorldTemplatePaginatedList;
 import com.mojang.realmsclient.util.TextRenderingUtils;
 import java.util.List;
+import javax.annotation.Nullable;
 import com.mojang.realmsclient.dto.RealmsServer;
-import net.minecraft.realms.RealmsButton;
-import com.mojang.realmsclient.dto.WorldTemplate;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsSelectWorldTemplateScreen extends RealmsScreen {
     private static final Logger LOGGER;
-    private final RealmsScreenWithCallback<WorldTemplate> lastScreen;
+    private static final ResourceLocation LINK_ICON;
+    private static final ResourceLocation TRAILER_ICON;
+    private static final ResourceLocation SLOT_FRAME_LOCATION;
+    private final RealmsScreenWithCallback lastScreen;
     private WorldTemplateObjectSelectionList worldTemplateObjectSelectionList;
     private int selectedTemplate;
-    private String title;
-    private RealmsButton selectButton;
-    private RealmsButton trailerButton;
-    private RealmsButton publisherButton;
+    private Component title;
+    private Button selectButton;
+    private Button trailerButton;
+    private Button publisherButton;
     private String toolTip;
     private String currentLink;
     private final RealmsServer.WorldType worldType;
     private int clicks;
-    private String warning;
+    @Nullable
+    private Component[] warning;
     private String warningURL;
     private boolean displayWarning;
     private boolean hoverWarning;
     private List<TextRenderingUtils.Line> noTemplatesMessage;
     
-    public RealmsSelectWorldTemplateScreen(final RealmsScreenWithCallback<WorldTemplate> dah, final RealmsServer.WorldType c) {
-        this(dah, c, null);
+    public RealmsSelectWorldTemplateScreen(final RealmsScreenWithCallback dkf, final RealmsServer.WorldType c) {
+        this(dkf, c, null);
     }
     
-    public RealmsSelectWorldTemplateScreen(final RealmsScreenWithCallback<WorldTemplate> dah, final RealmsServer.WorldType c, @Nullable final WorldTemplatePaginatedList worldTemplatePaginatedList) {
+    public RealmsSelectWorldTemplateScreen(final RealmsScreenWithCallback dkf, final RealmsServer.WorldType c, @Nullable final WorldTemplatePaginatedList dje) {
         this.selectedTemplate = -1;
-        this.lastScreen = dah;
+        this.lastScreen = dkf;
         this.worldType = c;
-        if (worldTemplatePaginatedList == null) {
+        if (dje == null) {
             this.worldTemplateObjectSelectionList = new WorldTemplateObjectSelectionList();
             this.fetchTemplatesAsync(new WorldTemplatePaginatedList(10));
         }
         else {
-            this.worldTemplateObjectSelectionList = new WorldTemplateObjectSelectionList(Lists.newArrayList(worldTemplatePaginatedList.templates));
-            this.fetchTemplatesAsync(worldTemplatePaginatedList);
+            this.worldTemplateObjectSelectionList = new WorldTemplateObjectSelectionList(Lists.newArrayList(dje.templates));
+            this.fetchTemplatesAsync(dje);
         }
-        this.title = RealmsScreen.getLocalizedString("mco.template.title");
+        this.title = new TranslatableComponent("mco.template.title");
     }
     
-    public void setTitle(final String string) {
-        this.title = string;
+    public void setTitle(final Component mr) {
+        this.title = mr;
     }
     
-    public void setWarning(final String string) {
-        this.warning = string;
+    public void setWarning(final Component... arr) {
+        this.warning = arr;
         this.displayWarning = true;
     }
     
     @Override
     public boolean mouseClicked(final double double1, final double double2, final int integer) {
         if (this.hoverWarning && this.warningURL != null) {
-            RealmsUtil.browseTo("https://beta.minecraft.net/realms/adventure-maps-in-1-9");
+            Util.getPlatform().openUri("https://beta.minecraft.net/realms/adventure-maps-in-1-9");
             return true;
         }
         return super.mouseClicked(double1, double2, integer);
     }
     
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
         this.worldTemplateObjectSelectionList = new WorldTemplateObjectSelectionList(this.worldTemplateObjectSelectionList.getTemplates());
-        this.buttonsAdd(this.trailerButton = new RealmsButton(2, this.width() / 2 - 206, this.height() - 32, 100, 20, RealmsScreen.getLocalizedString("mco.template.button.trailer")) {
-            @Override
-            public void onPress() {
-                RealmsSelectWorldTemplateScreen.this.onTrailer();
-            }
-        });
-        this.buttonsAdd(this.selectButton = new RealmsButton(1, this.width() / 2 - 100, this.height() - 32, 100, 20, RealmsScreen.getLocalizedString("mco.template.button.select")) {
-            @Override
-            public void onPress() {
-                RealmsSelectWorldTemplateScreen.this.selectTemplate();
-            }
-        });
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 + 6, this.height() - 32, 100, 20, RealmsScreen.getLocalizedString((this.worldType == RealmsServer.WorldType.MINIGAME) ? "gui.cancel" : "gui.back")) {
-            @Override
-            public void onPress() {
-                RealmsSelectWorldTemplateScreen.this.backButtonClicked();
-            }
-        });
-        this.buttonsAdd(this.publisherButton = new RealmsButton(3, this.width() / 2 + 112, this.height() - 32, 100, 20, RealmsScreen.getLocalizedString("mco.template.button.publisher")) {
-            @Override
-            public void onPress() {
-                RealmsSelectWorldTemplateScreen.this.onPublish();
-            }
-        });
-        this.selectButton.active(false);
-        this.trailerButton.setVisible(false);
-        this.publisherButton.setVisible(false);
-        this.addWidget(this.worldTemplateObjectSelectionList);
-        this.focusOn(this.worldTemplateObjectSelectionList);
-        Realms.narrateNow(Stream.<String>of(new String[] { this.title, this.warning }).filter(Objects::nonNull).collect(Collectors.<String>toList()));
+        this.trailerButton = this.<Button>addButton(new Button(this.width / 2 - 206, this.height - 32, 100, 20, new TranslatableComponent("mco.template.button.trailer"), dni -> this.onTrailer()));
+        this.selectButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 32, 100, 20, new TranslatableComponent("mco.template.button.select"), dni -> this.selectTemplate()));
+        final Component mr2 = (this.worldType == RealmsServer.WorldType.MINIGAME) ? CommonComponents.GUI_CANCEL : CommonComponents.GUI_BACK;
+        final Button dni3 = new Button(this.width / 2 + 6, this.height - 32, 100, 20, mr2, dni -> this.backButtonClicked());
+        this.<Button>addButton(dni3);
+        this.publisherButton = this.<Button>addButton(new Button(this.width / 2 + 112, this.height - 32, 100, 20, new TranslatableComponent("mco.template.button.publisher"), dni -> this.onPublish()));
+        this.selectButton.active = false;
+        this.trailerButton.visible = false;
+        this.publisherButton.visible = false;
+        this.<WorldTemplateObjectSelectionList>addWidget(this.worldTemplateObjectSelectionList);
+        this.magicalSpecialHackyFocus(this.worldTemplateObjectSelectionList);
+        Stream<Component> stream4 = Stream.<Component>of(this.title);
+        if (this.warning != null) {
+            stream4 = Stream.<Component>concat(Stream.of((T[])this.warning), stream4);
+        }
+        NarrationHelper.now(stream4.filter(Objects::nonNull).map(Component::getString).collect(Collectors.toList()));
     }
     
     private void updateButtonStates() {
-        this.publisherButton.setVisible(this.shouldPublisherBeVisible());
-        this.trailerButton.setVisible(this.shouldTrailerBeVisible());
-        this.selectButton.active(this.shouldSelectButtonBeActive());
+        this.publisherButton.visible = this.shouldPublisherBeVisible();
+        this.trailerButton.visible = this.shouldTrailerBeVisible();
+        this.selectButton.active = this.shouldSelectButtonBeActive();
     }
     
     private boolean shouldSelectButtonBeActive() {
@@ -158,91 +159,85 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen {
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
-        switch (integer1) {
-            case 256: {
-                this.backButtonClicked();
-                return true;
-            }
-            default: {
-                return super.keyPressed(integer1, integer2, integer3);
-            }
+        if (integer1 == 256) {
+            this.backButtonClicked();
+            return true;
         }
+        return super.keyPressed(integer1, integer2, integer3);
     }
     
     private void backButtonClicked() {
         this.lastScreen.callback(null);
-        Realms.setScreen(this.lastScreen);
+        this.minecraft.setScreen(this.lastScreen);
     }
     
     private void selectTemplate() {
-        if (this.selectedTemplate >= 0 && this.selectedTemplate < this.worldTemplateObjectSelectionList.getItemCount()) {
-            final WorldTemplate worldTemplate2 = this.getSelectedTemplate();
-            this.lastScreen.callback(worldTemplate2);
+        if (this.hasValidTemplate()) {
+            this.lastScreen.callback(this.getSelectedTemplate());
         }
     }
     
+    private boolean hasValidTemplate() {
+        return this.selectedTemplate >= 0 && this.selectedTemplate < this.worldTemplateObjectSelectionList.getItemCount();
+    }
+    
     private void onTrailer() {
-        if (this.selectedTemplate >= 0 && this.selectedTemplate < this.worldTemplateObjectSelectionList.getItemCount()) {
-            final WorldTemplate worldTemplate2 = this.getSelectedTemplate();
-            if (!"".equals(worldTemplate2.trailer)) {
-                RealmsUtil.browseTo(worldTemplate2.trailer);
+        if (this.hasValidTemplate()) {
+            final WorldTemplate djd2 = this.getSelectedTemplate();
+            if (!"".equals(djd2.trailer)) {
+                Util.getPlatform().openUri(djd2.trailer);
             }
         }
     }
     
     private void onPublish() {
-        if (this.selectedTemplate >= 0 && this.selectedTemplate < this.worldTemplateObjectSelectionList.getItemCount()) {
-            final WorldTemplate worldTemplate2 = this.getSelectedTemplate();
-            if (!"".equals(worldTemplate2.link)) {
-                RealmsUtil.browseTo(worldTemplate2.link);
+        if (this.hasValidTemplate()) {
+            final WorldTemplate djd2 = this.getSelectedTemplate();
+            if (!"".equals(djd2.link)) {
+                Util.getPlatform().openUri(djd2.link);
             }
         }
     }
     
-    private void fetchTemplatesAsync(final WorldTemplatePaginatedList worldTemplatePaginatedList) {
+    private void fetchTemplatesAsync(final WorldTemplatePaginatedList dje) {
         new Thread("realms-template-fetcher") {
-            static final /* synthetic */ boolean $assertionsDisabled;
-            
             @Override
             public void run() {
-                WorldTemplatePaginatedList worldTemplatePaginatedList2 = worldTemplatePaginatedList;
-                final RealmsClient cyy3 = RealmsClient.createRealmsClient();
-                while (worldTemplatePaginatedList2 != null) {
-                    final Either<WorldTemplatePaginatedList, String> either4 = RealmsSelectWorldTemplateScreen.this.fetchTemplates(worldTemplatePaginatedList2, cyy3);
+                WorldTemplatePaginatedList dje2 = dje;
+                final RealmsClient dia3 = RealmsClient.create();
+                while (dje2 != null) {
+                    final Either<WorldTemplatePaginatedList, String> either4 = RealmsSelectWorldTemplateScreen.this.fetchTemplates(dje2, dia3);
                     final Either either5;
-                    WorldTemplatePaginatedList worldTemplatePaginatedList3;
+                    WorldTemplatePaginatedList dje3;
                     final Iterator<WorldTemplate> iterator;
-                    WorldTemplate worldTemplate5;
+                    WorldTemplate djd5;
                     String string4;
                     TextRenderingUtils.LineSegment b5;
-                    worldTemplatePaginatedList2 = Realms.<WorldTemplatePaginatedList>execute(() -> {
+                    dje2 = RealmsSelectWorldTemplateScreen.this.minecraft.<WorldTemplatePaginatedList>submit(() -> {
                         if (either5.right().isPresent()) {
                             RealmsSelectWorldTemplateScreen.LOGGER.error("Couldn't fetch templates: {}", either5.right().get());
                             if (RealmsSelectWorldTemplateScreen.this.worldTemplateObjectSelectionList.isEmpty()) {
-                                RealmsSelectWorldTemplateScreen.this.noTemplatesMessage = TextRenderingUtils.decompose(RealmsScreen.getLocalizedString("mco.template.select.failure"));
+                                RealmsSelectWorldTemplateScreen.this.noTemplatesMessage = TextRenderingUtils.decompose(I18n.get("mco.template.select.failure"));
                             }
                             return null;
                         }
-                        else if (!RealmsSelectWorldTemplateScreen$5.$assertionsDisabled && !either5.left().isPresent()) {
-                            throw new AssertionError();
-                        }
                         else {
-                            worldTemplatePaginatedList3 = (WorldTemplatePaginatedList)either5.left().get();
-                            worldTemplatePaginatedList3.templates.iterator();
+                            dje3 = (WorldTemplatePaginatedList)either5.left().get();
+                            dje3.templates.iterator();
                             while (iterator.hasNext()) {
-                                worldTemplate5 = iterator.next();
-                                RealmsSelectWorldTemplateScreen.this.worldTemplateObjectSelectionList.addEntry(worldTemplate5);
+                                djd5 = iterator.next();
+                                RealmsSelectWorldTemplateScreen.this.worldTemplateObjectSelectionList.addEntry(djd5);
                             }
-                            if (worldTemplatePaginatedList3.templates.isEmpty()) {
+                            if (dje3.templates.isEmpty()) {
                                 if (RealmsSelectWorldTemplateScreen.this.worldTemplateObjectSelectionList.isEmpty()) {
-                                    string4 = RealmsScreen.getLocalizedString("mco.template.select.none", "%link");
-                                    b5 = TextRenderingUtils.LineSegment.link(RealmsScreen.getLocalizedString("mco.template.select.none.linkTitle"), "https://minecraft.net/realms/content-creator/");
+                                    string4 = I18n.get("mco.template.select.none", "%link");
+                                    b5 = TextRenderingUtils.LineSegment.link(I18n.get("mco.template.select.none.linkTitle"), "https://minecraft.net/realms/content-creator/");
                                     RealmsSelectWorldTemplateScreen.this.noTemplatesMessage = TextRenderingUtils.decompose(string4, b5);
                                 }
                                 return null;
                             }
                             else {
-                                return worldTemplatePaginatedList3;
+                                return dje3;
                             }
                         }
                     }).join();
@@ -251,121 +246,126 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen {
         }.start();
     }
     
-    private Either<WorldTemplatePaginatedList, String> fetchTemplates(final WorldTemplatePaginatedList worldTemplatePaginatedList, final RealmsClient cyy) {
+    private Either<WorldTemplatePaginatedList, String> fetchTemplates(final WorldTemplatePaginatedList dje, final RealmsClient dia) {
         try {
-            return (Either<WorldTemplatePaginatedList, String>)Either.left(cyy.fetchWorldTemplates(worldTemplatePaginatedList.page + 1, worldTemplatePaginatedList.size, this.worldType));
+            return (Either<WorldTemplatePaginatedList, String>)Either.left(dia.fetchWorldTemplates(dje.page + 1, dje.size, this.worldType));
         }
-        catch (RealmsServiceException czg4) {
-            return (Either<WorldTemplatePaginatedList, String>)Either.right(czg4.getMessage());
+        catch (RealmsServiceException djh4) {
+            return (Either<WorldTemplatePaginatedList, String>)Either.right(djh4.getMessage());
         }
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.toolTip = null;
         this.currentLink = null;
         this.hoverWarning = false;
-        this.renderBackground();
-        this.worldTemplateObjectSelectionList.render(integer1, integer2, float3);
+        this.renderBackground(dhl);
+        this.worldTemplateObjectSelectionList.render(dhl, integer2, integer3, float4);
         if (this.noTemplatesMessage != null) {
-            this.renderMultilineMessage(integer1, integer2, this.noTemplatesMessage);
+            this.renderMultilineMessage(dhl, integer2, integer3, this.noTemplatesMessage);
         }
-        this.drawCenteredString(this.title, this.width() / 2, 13, 16777215);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 13, 16777215);
         if (this.displayWarning) {
-            final String[] arr5 = this.warning.split("\\\\n");
-            for (int integer3 = 0; integer3 < arr5.length; ++integer3) {
-                final int integer4 = this.fontWidth(arr5[integer3]);
-                final int integer5 = this.width() / 2 - integer4 / 2;
-                final int integer6 = RealmsConstants.row(-1 + integer3);
-                if (integer1 >= integer5 && integer1 <= integer5 + integer4 && integer2 >= integer6 && integer2 <= integer6 + this.fontLineHeight()) {
-                    this.hoverWarning = true;
+            final Component[] arr6 = this.warning;
+            for (int integer4 = 0; integer4 < arr6.length; ++integer4) {
+                final int integer5 = this.font.width(arr6[integer4]);
+                final int integer6 = this.width / 2 - integer5 / 2;
+                final int integer7 = RealmsScreen.row(-1 + integer4);
+                if (integer2 >= integer6 && integer2 <= integer6 + integer5 && integer3 >= integer7) {
+                    final int n = integer7;
+                    this.font.getClass();
+                    if (integer3 <= n + 9) {
+                        this.hoverWarning = true;
+                    }
                 }
             }
-            for (int integer3 = 0; integer3 < arr5.length; ++integer3) {
-                String string7 = arr5[integer3];
-                int integer5 = 10526880;
+            for (int integer4 = 0; integer4 < arr6.length; ++integer4) {
+                Component mr8 = arr6[integer4];
+                int integer6 = 10526880;
                 if (this.warningURL != null) {
                     if (this.hoverWarning) {
-                        integer5 = 7107012;
-                        string7 = "§n" + string7;
+                        integer6 = 7107012;
+                        mr8 = mr8.copy().withStyle(ChatFormatting.STRIKETHROUGH);
                     }
                     else {
-                        integer5 = 3368635;
+                        integer6 = 3368635;
                     }
                 }
-                this.drawCenteredString(string7, this.width() / 2, RealmsConstants.row(-1 + integer3), integer5);
+                this.drawCenteredString(dhl, this.font, mr8, this.width / 2, RealmsScreen.row(-1 + integer4), integer6);
             }
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
         if (this.toolTip != null) {
-            this.renderMousehoverTooltip(this.toolTip, integer1, integer2);
+            this.renderMousehoverTooltip(dhl, this.toolTip, integer2, integer3);
         }
     }
     
-    private void renderMultilineMessage(final int integer1, final int integer2, final List<TextRenderingUtils.Line> list) {
-        for (int integer3 = 0; integer3 < list.size(); ++integer3) {
-            final TextRenderingUtils.Line a6 = list.get(integer3);
-            final int integer4 = RealmsConstants.row(4 + integer3);
-            final int integer5 = a6.segments.stream().mapToInt(b -> this.fontWidth(b.renderedText())).sum();
-            int integer6 = this.width() / 2 - integer5 / 2;
-            for (final TextRenderingUtils.LineSegment b2 : a6.segments) {
-                final int integer7 = b2.isLink() ? 3368635 : 16777215;
-                final int integer8 = this.draw(b2.renderedText(), integer6, integer4, integer7, true);
-                if (b2.isLink() && integer1 > integer6 && integer1 < integer8 && integer2 > integer4 - 3 && integer2 < integer4 + 8) {
+    private void renderMultilineMessage(final PoseStack dhl, final int integer2, final int integer3, final List<TextRenderingUtils.Line> list) {
+        for (int integer4 = 0; integer4 < list.size(); ++integer4) {
+            final TextRenderingUtils.Line a7 = list.get(integer4);
+            final int integer5 = RealmsScreen.row(4 + integer4);
+            final int integer6 = a7.segments.stream().mapToInt(b -> this.font.width(b.renderedText())).sum();
+            int integer7 = this.width / 2 - integer6 / 2;
+            for (final TextRenderingUtils.LineSegment b2 : a7.segments) {
+                final int integer8 = b2.isLink() ? 3368635 : 16777215;
+                final int integer9 = this.font.drawShadow(dhl, b2.renderedText(), (float)integer7, (float)integer5, integer8);
+                if (b2.isLink() && integer2 > integer7 && integer2 < integer9 && integer3 > integer5 - 3 && integer3 < integer5 + 8) {
                     this.toolTip = b2.getLinkUrl();
                     this.currentLink = b2.getLinkUrl();
                 }
-                integer6 = integer8;
+                integer7 = integer9;
             }
         }
     }
     
-    protected void renderMousehoverTooltip(final String string, final int integer2, final int integer3) {
+    protected void renderMousehoverTooltip(final PoseStack dhl, final String string, final int integer3, final int integer4) {
         if (string == null) {
             return;
         }
-        final int integer4 = integer2 + 12;
-        final int integer5 = integer3 - 12;
-        final int integer6 = this.fontWidth(string);
-        this.fillGradient(integer4 - 3, integer5 - 3, integer4 + integer6 + 3, integer5 + 8 + 3, -1073741824, -1073741824);
-        this.fontDrawShadow(string, integer4, integer5, 16777215);
+        final int integer5 = integer3 + 12;
+        final int integer6 = integer4 - 12;
+        final int integer7 = this.font.width(string);
+        this.fillGradient(dhl, integer5 - 3, integer6 - 3, integer5 + integer7 + 3, integer6 + 8 + 3, -1073741824, -1073741824);
+        this.font.drawShadow(dhl, string, (float)integer5, (float)integer6, 16777215);
     }
     
     static {
         LOGGER = LogManager.getLogger();
+        LINK_ICON = new ResourceLocation("realms", "textures/gui/realms/link_icons.png");
+        TRAILER_ICON = new ResourceLocation("realms", "textures/gui/realms/trailer_icons.png");
+        SLOT_FRAME_LOCATION = new ResourceLocation("realms", "textures/gui/realms/slot_frame.png");
     }
     
-    class WorldTemplateObjectSelectionList extends RealmsObjectSelectionList<WorldTemplateObjectSelectionListEntry> {
-        public WorldTemplateObjectSelectionList(final RealmsSelectWorldTemplateScreen daj) {
-            this(daj, Collections.emptyList());
+    class WorldTemplateObjectSelectionList extends RealmsObjectSelectionList<RealmsSelectWorldTemplateScreen.Entry> {
+        public WorldTemplateObjectSelectionList(final RealmsSelectWorldTemplateScreen dkh) {
+            this(dkh, Collections.emptyList());
         }
         
         public WorldTemplateObjectSelectionList(final Iterable<WorldTemplate> iterable) {
-            super(RealmsSelectWorldTemplateScreen.this.width(), RealmsSelectWorldTemplateScreen.this.height(), RealmsSelectWorldTemplateScreen.this.displayWarning ? RealmsConstants.row(1) : 32, RealmsSelectWorldTemplateScreen.this.height() - 40, 46);
+            super(RealmsSelectWorldTemplateScreen.this.width, RealmsSelectWorldTemplateScreen.this.height, RealmsSelectWorldTemplateScreen.this.displayWarning ? RealmsScreen.row(1) : 32, RealmsSelectWorldTemplateScreen.this.height - 40, 46);
             iterable.forEach(this::addEntry);
         }
         
-        public void addEntry(final WorldTemplate worldTemplate) {
-            this.addEntry(new WorldTemplateObjectSelectionListEntry(worldTemplate));
+        public void addEntry(final WorldTemplate djd) {
+            this.addEntry(new RealmsSelectWorldTemplateScreen.Entry(djd));
         }
         
         @Override
         public boolean mouseClicked(final double double1, final double double2, final int integer) {
-            if (integer == 0 && double2 >= this.y0() && double2 <= this.y1()) {
-                final int integer2 = this.width() / 2 - 150;
+            if (integer == 0 && double2 >= this.y0 && double2 <= this.y1) {
+                final int integer2 = this.width / 2 - 150;
                 if (RealmsSelectWorldTemplateScreen.this.currentLink != null) {
-                    RealmsUtil.browseTo(RealmsSelectWorldTemplateScreen.this.currentLink);
+                    Util.getPlatform().openUri(RealmsSelectWorldTemplateScreen.this.currentLink);
                 }
-                final int integer3 = (int)Math.floor(double2 - this.y0()) - this.headerHeight() + this.getScroll() - 4;
-                final int integer4 = integer3 / this.itemHeight();
+                final int integer3 = (int)Math.floor(double2 - this.y0) - this.headerHeight + (int)this.getScrollAmount() - 4;
+                final int integer4 = integer3 / this.itemHeight;
                 if (double1 >= integer2 && double1 < this.getScrollbarPosition() && integer4 >= 0 && integer3 >= 0 && integer4 < this.getItemCount()) {
                     this.selectItem(integer4);
-                    this.itemClicked(integer3, integer4, double1, double2, this.width());
+                    this.itemClicked(integer3, integer4, double1, double2, this.width);
                     if (integer4 >= RealmsSelectWorldTemplateScreen.this.worldTemplateObjectSelectionList.getItemCount()) {
                         return super.mouseClicked(double1, double2, integer);
                     }
-                    RealmsSelectWorldTemplateScreen.this.selectedTemplate = integer4;
-                    RealmsSelectWorldTemplateScreen.this.updateButtonStates();
                     RealmsSelectWorldTemplateScreen.this.clicks += 7;
                     if (RealmsSelectWorldTemplateScreen.this.clicks >= 10) {
                         RealmsSelectWorldTemplateScreen.this.selectTemplate();
@@ -378,24 +378,22 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen {
         
         @Override
         public void selectItem(final int integer) {
-            RealmsSelectWorldTemplateScreen.this.selectedTemplate = integer;
-            this.setSelected(integer);
+            this.setSelectedItem(integer);
             if (integer != -1) {
-                final WorldTemplate worldTemplate3 = RealmsSelectWorldTemplateScreen.this.worldTemplateObjectSelectionList.get(integer);
-                final String string4 = RealmsScreen.getLocalizedString("narrator.select.list.position", integer + 1, RealmsSelectWorldTemplateScreen.this.worldTemplateObjectSelectionList.getItemCount());
-                final String string5 = RealmsScreen.getLocalizedString("mco.template.select.narrate.version", worldTemplate3.version);
-                final String string6 = RealmsScreen.getLocalizedString("mco.template.select.narrate.authors", worldTemplate3.author);
-                final String string7 = Realms.joinNarrations(Arrays.<String>asList(worldTemplate3.name, string6, worldTemplate3.recommendedPlayers, string5, string4));
-                Realms.narrateNow(RealmsScreen.getLocalizedString("narrator.select", string7));
+                final WorldTemplate djd3 = RealmsSelectWorldTemplateScreen.this.worldTemplateObjectSelectionList.get(integer);
+                final String string4 = I18n.get("narrator.select.list.position", integer + 1, RealmsSelectWorldTemplateScreen.this.worldTemplateObjectSelectionList.getItemCount());
+                final String string5 = I18n.get("mco.template.select.narrate.version", djd3.version);
+                final String string6 = I18n.get("mco.template.select.narrate.authors", djd3.author);
+                final String string7 = NarrationHelper.join(Arrays.<String>asList(djd3.name, string6, djd3.recommendedPlayers, string5, string4));
+                NarrationHelper.now(I18n.get("narrator.select", string7));
             }
-            RealmsSelectWorldTemplateScreen.this.updateButtonStates();
         }
         
         @Override
-        public void itemClicked(final int integer1, final int integer2, final double double3, final double double4, final int integer5) {
-            if (integer2 >= RealmsSelectWorldTemplateScreen.this.worldTemplateObjectSelectionList.getItemCount()) {
-                return;
-            }
+        public void setSelected(@Nullable final RealmsSelectWorldTemplateScreen.Entry a) {
+            super.setSelected(a);
+            RealmsSelectWorldTemplateScreen.this.selectedTemplate = this.children().indexOf(a);
+            RealmsSelectWorldTemplateScreen.this.updateButtonStates();
         }
         
         @Override
@@ -408,14 +406,12 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen {
             return 300;
         }
         
-        @Override
-        public void renderBackground() {
-            RealmsSelectWorldTemplateScreen.this.renderBackground();
+        public void renderBackground(final PoseStack dhl) {
+            RealmsSelectWorldTemplateScreen.this.renderBackground(dhl);
         }
         
-        @Override
         public boolean isFocused() {
-            return RealmsSelectWorldTemplateScreen.this.isFocused(this);
+            return RealmsSelectWorldTemplateScreen.this.getFocused() == this;
         }
         
         public boolean isEmpty() {
@@ -427,86 +423,89 @@ public class RealmsSelectWorldTemplateScreen extends RealmsScreen {
         }
         
         public List<WorldTemplate> getTemplates() {
-            return this.children().stream().map(b -> b.template).collect(Collectors.toList());
+            return this.children().stream().map(a -> a.template).collect(Collectors.toList());
         }
     }
     
-    class WorldTemplateObjectSelectionListEntry extends RealmListEntry {
-        final WorldTemplate template;
+    class Entry extends ObjectSelectionList.Entry<Entry> {
+        private final WorldTemplate template;
         
-        public WorldTemplateObjectSelectionListEntry(final WorldTemplate worldTemplate) {
-            this.template = worldTemplate;
+        public Entry(final WorldTemplate djd) {
+            this.template = djd;
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            this.renderWorldTemplateItem(this.template, integer3, integer2, integer6, integer7);
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.renderWorldTemplateItem(dhl, this.template, integer4, integer3, integer7, integer8);
         }
         
-        private void renderWorldTemplateItem(final WorldTemplate worldTemplate, final int integer2, final int integer3, final int integer4, final int integer5) {
-            final int integer6 = integer2 + 45 + 20;
-            RealmsSelectWorldTemplateScreen.this.drawString(worldTemplate.name, integer6, integer3 + 2, 16777215);
-            RealmsSelectWorldTemplateScreen.this.drawString(worldTemplate.author, integer6, integer3 + 15, 8421504);
-            RealmsSelectWorldTemplateScreen.this.drawString(worldTemplate.version, integer6 + 227 - RealmsSelectWorldTemplateScreen.this.fontWidth(worldTemplate.version), integer3 + 1, 8421504);
-            if (!"".equals(worldTemplate.link) || !"".equals(worldTemplate.trailer) || !"".equals(worldTemplate.recommendedPlayers)) {
-                this.drawIcons(integer6 - 1, integer3 + 25, integer4, integer5, worldTemplate.link, worldTemplate.trailer, worldTemplate.recommendedPlayers);
+        private void renderWorldTemplateItem(final PoseStack dhl, final WorldTemplate djd, final int integer3, final int integer4, final int integer5, final int integer6) {
+            final int integer7 = integer3 + 45 + 20;
+            RealmsSelectWorldTemplateScreen.this.font.draw(dhl, djd.name, (float)integer7, (float)(integer4 + 2), 16777215);
+            RealmsSelectWorldTemplateScreen.this.font.draw(dhl, djd.author, (float)integer7, (float)(integer4 + 15), 7105644);
+            RealmsSelectWorldTemplateScreen.this.font.draw(dhl, djd.version, (float)(integer7 + 227 - RealmsSelectWorldTemplateScreen.this.font.width(djd.version)), (float)(integer4 + 1), 7105644);
+            if (!"".equals(djd.link) || !"".equals(djd.trailer) || !"".equals(djd.recommendedPlayers)) {
+                this.drawIcons(dhl, integer7 - 1, integer4 + 25, integer5, integer6, djd.link, djd.trailer, djd.recommendedPlayers);
             }
-            this.drawImage(integer2, integer3 + 1, integer4, integer5, worldTemplate);
+            this.drawImage(dhl, integer3, integer4 + 1, integer5, integer6, djd);
         }
         
-        private void drawImage(final int integer1, final int integer2, final int integer3, final int integer4, final WorldTemplate worldTemplate) {
-            RealmsTextureManager.bindWorldTemplate(worldTemplate.id, worldTemplate.image);
+        private void drawImage(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final WorldTemplate djd) {
+            RealmsTextureManager.bindWorldTemplate(djd.id, djd.image);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            RealmsScreen.blit(integer1 + 1, integer2 + 1, 0.0f, 0.0f, 38, 38, 38, 38);
-            RealmsScreen.bind("realms:textures/gui/realms/slot_frame.png");
+            GuiComponent.blit(dhl, integer2 + 1, integer3 + 1, 0.0f, 0.0f, 38, 38, 38, 38);
+            RealmsSelectWorldTemplateScreen.this.minecraft.getTextureManager().bind(RealmsSelectWorldTemplateScreen.SLOT_FRAME_LOCATION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            RealmsScreen.blit(integer1, integer2, 0.0f, 0.0f, 40, 40, 40, 40);
+            GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 40, 40, 40, 40);
         }
         
-        private void drawIcons(final int integer1, final int integer2, final int integer3, final int integer4, final String string5, final String string6, final String string7) {
-            if (!"".equals(string7)) {
-                RealmsSelectWorldTemplateScreen.this.drawString(string7, integer1, integer2 + 4, 8421504);
+        private void drawIcons(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final String string6, final String string7, final String string8) {
+            if (!"".equals(string8)) {
+                RealmsSelectWorldTemplateScreen.this.font.draw(dhl, string8, (float)integer2, (float)(integer3 + 4), 5000268);
             }
-            final int integer5 = "".equals(string7) ? 0 : (RealmsSelectWorldTemplateScreen.this.fontWidth(string7) + 2);
-            boolean boolean10 = false;
+            final int integer6 = "".equals(string8) ? 0 : (RealmsSelectWorldTemplateScreen.this.font.width(string8) + 2);
             boolean boolean11 = false;
-            if (integer3 >= integer1 + integer5 && integer3 <= integer1 + integer5 + 32 && integer4 >= integer2 && integer4 <= integer2 + 15 && integer4 < RealmsSelectWorldTemplateScreen.this.height() - 15 && integer4 > 32) {
-                if (integer3 <= integer1 + 15 + integer5 && integer3 > integer5) {
-                    if ("".equals(string5)) {
-                        boolean11 = true;
+            boolean boolean12 = false;
+            if (integer4 >= integer2 + integer6 && integer4 <= integer2 + integer6 + 32 && integer5 >= integer3 && integer5 <= integer3 + 15 && integer5 < RealmsSelectWorldTemplateScreen.this.height - 15 && integer5 > 32) {
+                if (integer4 <= integer2 + 15 + integer6 && integer4 > integer6) {
+                    if ("".equals(string6)) {
+                        boolean12 = true;
                     }
                     else {
-                        boolean10 = true;
+                        boolean11 = true;
                     }
                 }
-                else if (!"".equals(string5)) {
-                    boolean11 = true;
+                else if (!"".equals(string6)) {
+                    boolean12 = true;
                 }
             }
-            if (!"".equals(string5)) {
-                RealmsScreen.bind("realms:textures/gui/realms/link_icons.png");
-                RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                RenderSystem.pushMatrix();
-                RenderSystem.scalef(1.0f, 1.0f, 1.0f);
-                RealmsScreen.blit(integer1 + integer5, integer2, boolean10 ? 15.0f : 0.0f, 0.0f, 15, 15, 30, 15);
-                RenderSystem.popMatrix();
-            }
             if (!"".equals(string6)) {
-                RealmsScreen.bind("realms:textures/gui/realms/trailer_icons.png");
+                RealmsSelectWorldTemplateScreen.this.minecraft.getTextureManager().bind(RealmsSelectWorldTemplateScreen.LINK_ICON);
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
                 RenderSystem.pushMatrix();
                 RenderSystem.scalef(1.0f, 1.0f, 1.0f);
-                RealmsScreen.blit(integer1 + integer5 + ("".equals(string5) ? 0 : 17), integer2, boolean11 ? 15.0f : 0.0f, 0.0f, 15, 15, 30, 15);
+                final float float13 = boolean11 ? 15.0f : 0.0f;
+                GuiComponent.blit(dhl, integer2 + integer6, integer3, float13, 0.0f, 15, 15, 30, 15);
                 RenderSystem.popMatrix();
             }
-            if (boolean10 && !"".equals(string5)) {
-                RealmsSelectWorldTemplateScreen.this.toolTip = RealmsScreen.getLocalizedString("mco.template.info.tooltip");
-                RealmsSelectWorldTemplateScreen.this.currentLink = string5;
+            if (!"".equals(string7)) {
+                RealmsSelectWorldTemplateScreen.this.minecraft.getTextureManager().bind(RealmsSelectWorldTemplateScreen.TRAILER_ICON);
+                RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
+                RenderSystem.pushMatrix();
+                RenderSystem.scalef(1.0f, 1.0f, 1.0f);
+                final int integer7 = integer2 + integer6 + ("".equals(string6) ? 0 : 17);
+                final float float14 = boolean12 ? 15.0f : 0.0f;
+                GuiComponent.blit(dhl, integer7, integer3, float14, 0.0f, 15, 15, 30, 15);
+                RenderSystem.popMatrix();
             }
-            else if (boolean11 && !"".equals(string6)) {
-                RealmsSelectWorldTemplateScreen.this.toolTip = RealmsScreen.getLocalizedString("mco.template.trailer.tooltip");
+            if (boolean11 && !"".equals(string6)) {
+                RealmsSelectWorldTemplateScreen.this.toolTip = I18n.get("mco.template.info.tooltip");
                 RealmsSelectWorldTemplateScreen.this.currentLink = string6;
             }
+            else if (boolean12 && !"".equals(string7)) {
+                RealmsSelectWorldTemplateScreen.this.toolTip = I18n.get("mco.template.trailer.tooltip");
+                RealmsSelectWorldTemplateScreen.this.currentLink = string7;
+            }
         }
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java
index e093b4b..09f2564 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java
@@ -1,122 +1,99 @@
 package com.mojang.realmsclient.gui.screens;
 
-import net.minecraft.realms.RealmsGuiEventListener;
-import net.minecraft.realms.RealmsConfirmResultListener;
-import net.minecraft.realms.Realms;
-import net.minecraft.realms.AbstractRealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.realms.RealmsLabel;
-import net.minecraft.realms.RealmsEditBox;
-import net.minecraft.realms.RealmsButton;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.components.Button;
 import com.mojang.realmsclient.dto.RealmsServer;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsSettingsScreen extends RealmsScreen {
     private final RealmsConfigureWorldScreen configureWorldScreen;
     private final RealmsServer serverData;
-    private final int COMPONENT_WIDTH = 212;
-    private RealmsButton doneButton;
-    private RealmsEditBox descEdit;
-    private RealmsEditBox nameEdit;
+    private Button doneButton;
+    private EditBox descEdit;
+    private EditBox nameEdit;
     private RealmsLabel titleLabel;
     
-    public RealmsSettingsScreen(final RealmsConfigureWorldScreen czs, final RealmsServer realmsServer) {
-        this.configureWorldScreen = czs;
-        this.serverData = realmsServer;
+    public RealmsSettingsScreen(final RealmsConfigureWorldScreen djr, final RealmsServer dip) {
+        this.configureWorldScreen = djr;
+        this.serverData = dip;
     }
     
     @Override
     public void tick() {
         this.nameEdit.tick();
         this.descEdit.tick();
-        this.doneButton.active(this.nameEdit.getValue() != null && !this.nameEdit.getValue().trim().isEmpty());
+        this.doneButton.active = !this.nameEdit.getValue().trim().isEmpty();
     }
     
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        final int integer2 = this.width() / 2 - 106;
-        this.buttonsAdd(this.doneButton = new RealmsButton(1, integer2 - 2, RealmsConstants.row(12), 106, 20, RealmsScreen.getLocalizedString("mco.configure.world.buttons.done")) {
-            @Override
-            public void onPress() {
-                RealmsSettingsScreen.this.save();
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        final int integer2 = this.width / 2 - 106;
+        this.doneButton = this.<Button>addButton(new Button(integer2 - 2, RealmsScreen.row(12), 106, 20, new TranslatableComponent("mco.configure.world.buttons.done"), dni -> this.save()));
+        this.<Button>addButton(new Button(this.width / 2 + 2, RealmsScreen.row(12), 106, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(this.configureWorldScreen)));
+        final String string3 = (this.serverData.state == RealmsServer.State.OPEN) ? "mco.configure.world.buttons.close" : "mco.configure.world.buttons.open";
+        Component mr3;
+        Component mr4;
+        final Button dni4 = new Button(this.width / 2 - 53, RealmsScreen.row(0), 106, 20, new TranslatableComponent(string3), dni -> {
+            if (this.serverData.state == RealmsServer.State.OPEN) {
+                mr3 = new TranslatableComponent("mco.configure.world.close.question.line1");
+                mr4 = new TranslatableComponent("mco.configure.world.close.question.line2");
+                this.minecraft.setScreen(new RealmsLongConfirmationScreen(boolean1 -> {
+                    if (boolean1) {
+                        this.configureWorldScreen.closeTheWorld(this);
+                    }
+                    else {
+                        this.minecraft.setScreen(this);
+                    }
+                }, RealmsLongConfirmationScreen.Type.Info, mr3, mr4, true));
             }
-        });
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 + 2, RealmsConstants.row(12), 106, 20, RealmsScreen.getLocalizedString("gui.cancel")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsSettingsScreen.this.configureWorldScreen);
+            else {
+                this.configureWorldScreen.openTheWorld(false, this);
             }
+            return;
         });
-        this.buttonsAdd(new RealmsButton(5, this.width() / 2 - 53, RealmsConstants.row(0), 106, 20, RealmsScreen.getLocalizedString(this.serverData.state.equals(RealmsServer.State.OPEN) ? "mco.configure.world.buttons.close" : "mco.configure.world.buttons.open")) {
-            @Override
-            public void onPress() {
-                if (RealmsSettingsScreen.this.serverData.state.equals(RealmsServer.State.OPEN)) {
-                    final String string2 = RealmsScreen.getLocalizedString("mco.configure.world.close.question.line1");
-                    final String string3 = RealmsScreen.getLocalizedString("mco.configure.world.close.question.line2");
-                    Realms.setScreen(new RealmsLongConfirmationScreen(RealmsSettingsScreen.this, RealmsLongConfirmationScreen.Type.Info, string2, string3, true, 5));
-                }
-                else {
-                    RealmsSettingsScreen.this.configureWorldScreen.openTheWorld(false, RealmsSettingsScreen.this);
-                }
-            }
-        });
-        (this.nameEdit = this.newEditBox(2, integer2, RealmsConstants.row(4), 212, 20, RealmsScreen.getLocalizedString("mco.configure.world.name"))).setMaxLength(32);
-        if (this.serverData.getName() != null) {
-            this.nameEdit.setValue(this.serverData.getName());
-        }
-        this.addWidget(this.nameEdit);
-        this.focusOn(this.nameEdit);
-        (this.descEdit = this.newEditBox(3, integer2, RealmsConstants.row(8), 212, 20, RealmsScreen.getLocalizedString("mco.configure.world.description"))).setMaxLength(32);
-        if (this.serverData.getDescription() != null) {
-            this.descEdit.setValue(this.serverData.getDescription());
-        }
-        this.addWidget(this.descEdit);
-        this.addWidget(this.titleLabel = new RealmsLabel(RealmsScreen.getLocalizedString("mco.configure.world.settings.title"), this.width() / 2, 17, 16777215));
+        this.<Button>addButton(dni4);
+        (this.nameEdit = new EditBox(this.minecraft.font, integer2, RealmsScreen.row(4), 212, 20, null, new TranslatableComponent("mco.configure.world.name"))).setMaxLength(32);
+        this.nameEdit.setValue(this.serverData.getName());
+        this.<EditBox>addWidget(this.nameEdit);
+        this.magicalSpecialHackyFocus(this.nameEdit);
+        (this.descEdit = new EditBox(this.minecraft.font, integer2, RealmsScreen.row(8), 212, 20, null, new TranslatableComponent("mco.configure.world.description"))).setMaxLength(32);
+        this.descEdit.setValue(this.serverData.getDescription());
+        this.<EditBox>addWidget(this.descEdit);
+        this.titleLabel = this.<RealmsLabel>addWidget(new RealmsLabel(new TranslatableComponent("mco.configure.world.settings.title"), this.width / 2, 17, 16777215));
         this.narrateLabels();
     }
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
-    }
-    
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-        switch (integer) {
-            case 5: {
-                if (boolean1) {
-                    this.configureWorldScreen.closeTheWorld(this);
-                    break;
-                }
-                Realms.setScreen(this);
-                break;
-            }
-        }
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
-        switch (integer1) {
-            case 256: {
-                Realms.setScreen(this.configureWorldScreen);
-                return true;
-            }
-            default: {
-                return super.keyPressed(integer1, integer2, integer3);
-            }
+        if (integer1 == 256) {
+            this.minecraft.setScreen(this.configureWorldScreen);
+            return true;
         }
+        return super.keyPressed(integer1, integer2, integer3);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.titleLabel.render(this);
-        this.drawString(RealmsScreen.getLocalizedString("mco.configure.world.name"), this.width() / 2 - 106, RealmsConstants.row(3), 10526880);
-        this.drawString(RealmsScreen.getLocalizedString("mco.configure.world.description"), this.width() / 2 - 106, RealmsConstants.row(7), 10526880);
-        this.nameEdit.render(integer1, integer2, float3);
-        this.descEdit.render(integer1, integer2, float3);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.titleLabel.render(this, dhl);
+        this.font.draw(dhl, I18n.get("mco.configure.world.name"), (float)(this.width / 2 - 106), (float)RealmsScreen.row(3), 10526880);
+        this.font.draw(dhl, I18n.get("mco.configure.world.description"), (float)(this.width / 2 - 106), (float)RealmsScreen.row(7), 10526880);
+        this.nameEdit.render(dhl, integer2, integer3, float4);
+        this.descEdit.render(dhl, integer2, integer3, float4);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     public void save() {
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.java
index 72cac02..14bdb3a 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.java
@@ -1,28 +1,37 @@
 package com.mojang.realmsclient.gui.screens;
 
-import net.minecraft.realms.AbstractRealmsButton;
-import net.minecraft.realms.RealmsGuiEventListener;
-import com.mojang.realmsclient.gui.RealmsConstants;
-import net.minecraft.realms.Realms;
+import net.minecraft.util.Mth;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.client.gui.components.AbstractSliderButton;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.realms.RealmsLabel;
-import net.minecraft.realms.RealmsSliderButton;
-import net.minecraft.realms.RealmsButton;
+import net.minecraft.client.gui.components.Button;
 import com.mojang.realmsclient.dto.RealmsServer;
 import com.mojang.realmsclient.dto.RealmsWorldOptions;
-import net.minecraft.realms.RealmsEditBox;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsSlotOptionsScreen extends RealmsScreen {
-    private RealmsEditBox nameEdit;
+    public static final Component[] DIFFICULTIES;
+    public static final Component[] GAME_MODES;
+    private static final TranslatableComponent TEXT_ON;
+    private static final TranslatableComponent TEXT_OFF;
+    private EditBox nameEdit;
     protected final RealmsConfigureWorldScreen parent;
-    private int column1_x;
-    private int column_width;
-    private int column2_x;
+    private int column1X;
+    private int columnWidth;
+    private int column2X;
     private final RealmsWorldOptions options;
     private final RealmsServer.WorldType worldType;
     private final int activeSlot;
-    private int difficultyIndex;
-    private int gameModeIndex;
+    private int difficulty;
+    private int gameMode;
     private Boolean pvp;
     private Boolean spawnNPCs;
     private Boolean spawnAnimals;
@@ -30,29 +39,26 @@ public class RealmsSlotOptionsScreen extends RealmsScreen {
     private Integer spawnProtection;
     private Boolean commandBlocks;
     private Boolean forceGameMode;
-    private RealmsButton pvpButton;
-    private RealmsButton spawnAnimalsButton;
-    private RealmsButton spawnMonstersButton;
-    private RealmsButton spawnNPCsButton;
-    private RealmsSliderButton spawnProtectionButton;
-    private RealmsButton commandBlocksButton;
-    private RealmsButton forceGameModeButton;
-    String[] difficulties;
-    String[] gameModes;
-    String[][] gameModeHints;
+    private Button pvpButton;
+    private Button spawnAnimalsButton;
+    private Button spawnMonstersButton;
+    private Button spawnNPCsButton;
+    private SettingsSlider spawnProtectionButton;
+    private Button commandBlocksButton;
+    private Button forceGameModeButton;
     private RealmsLabel titleLabel;
     private RealmsLabel warningLabel;
     
-    public RealmsSlotOptionsScreen(final RealmsConfigureWorldScreen czs, final RealmsWorldOptions realmsWorldOptions, final RealmsServer.WorldType c, final int integer) {
-        this.parent = czs;
-        this.options = realmsWorldOptions;
+    public RealmsSlotOptionsScreen(final RealmsConfigureWorldScreen djr, final RealmsWorldOptions div, final RealmsServer.WorldType c, final int integer) {
+        this.parent = djr;
+        this.options = div;
         this.worldType = c;
         this.activeSlot = integer;
     }
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
@@ -62,26 +68,20 @@ public class RealmsSlotOptionsScreen extends RealmsScreen {
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
-        switch (integer1) {
-            case 256: {
-                Realms.setScreen(this.parent);
-                return true;
-            }
-            default: {
-                return super.keyPressed(integer1, integer2, integer3);
-            }
+        if (integer1 == 256) {
+            this.minecraft.setScreen(this.parent);
+            return true;
         }
+        return super.keyPressed(integer1, integer2, integer3);
     }
     
-    @Override
     public void init() {
-        this.column_width = 170;
-        this.column1_x = this.width() / 2 - this.column_width * 2 / 2;
-        this.column2_x = this.width() / 2 + 10;
-        this.createDifficultyAndGameMode();
-        this.difficultyIndex = this.options.difficulty;
-        this.gameModeIndex = this.options.gameMode;
-        if (this.worldType.equals(RealmsServer.WorldType.NORMAL)) {
+        this.columnWidth = 170;
+        this.column1X = this.width / 2 - this.columnWidth;
+        this.column2X = this.width / 2 + 10;
+        this.difficulty = this.options.difficulty;
+        this.gameMode = this.options.gameMode;
+        if (this.worldType == RealmsServer.WorldType.NORMAL) {
             this.pvp = this.options.pvp;
             this.spawnProtection = this.options.spawnProtection;
             this.forceGameMode = this.options.forceGameMode;
@@ -91,17 +91,17 @@ public class RealmsSlotOptionsScreen extends RealmsScreen {
             this.commandBlocks = this.options.commandBlocks;
         }
         else {
-            String string2;
-            if (this.worldType.equals(RealmsServer.WorldType.ADVENTUREMAP)) {
-                string2 = RealmsScreen.getLocalizedString("mco.configure.world.edit.subscreen.adventuremap");
+            Component mr2;
+            if (this.worldType == RealmsServer.WorldType.ADVENTUREMAP) {
+                mr2 = new TranslatableComponent("mco.configure.world.edit.subscreen.adventuremap");
             }
-            else if (this.worldType.equals(RealmsServer.WorldType.INSPIRATION)) {
-                string2 = RealmsScreen.getLocalizedString("mco.configure.world.edit.subscreen.inspiration");
+            else if (this.worldType == RealmsServer.WorldType.INSPIRATION) {
+                mr2 = new TranslatableComponent("mco.configure.world.edit.subscreen.inspiration");
             }
             else {
-                string2 = RealmsScreen.getLocalizedString("mco.configure.world.edit.subscreen.experience");
+                mr2 = new TranslatableComponent("mco.configure.world.edit.subscreen.experience");
             }
-            this.warningLabel = new RealmsLabel(string2, this.width() / 2, 26, 16711680);
+            this.warningLabel = new RealmsLabel(mr2, this.width / 2, 26, 16711680);
             this.pvp = true;
             this.spawnProtection = 0;
             this.forceGameMode = false;
@@ -110,157 +110,126 @@ public class RealmsSlotOptionsScreen extends RealmsScreen {
             this.spawnNPCs = true;
             this.commandBlocks = true;
         }
-        (this.nameEdit = this.newEditBox(11, this.column1_x + 2, RealmsConstants.row(1), this.column_width - 4, 20, RealmsScreen.getLocalizedString("mco.configure.world.edit.slot.name"))).setMaxLength(10);
+        (this.nameEdit = new EditBox(this.minecraft.font, this.column1X + 2, RealmsScreen.row(1), this.columnWidth - 4, 20, null, new TranslatableComponent("mco.configure.world.edit.slot.name"))).setMaxLength(10);
         this.nameEdit.setValue(this.options.getSlotName(this.activeSlot));
-        this.focusOn(this.nameEdit);
-        this.buttonsAdd(this.pvpButton = new RealmsButton(4, this.column2_x, RealmsConstants.row(1), this.column_width, 20, this.pvpTitle()) {
-            @Override
-            public void onPress() {
-                RealmsSlotOptionsScreen.this.pvp = !RealmsSlotOptionsScreen.this.pvp;
-                this.setMessage(RealmsSlotOptionsScreen.this.pvpTitle());
+        this.magicalSpecialHackyFocus(this.nameEdit);
+        this.pvpButton = this.<Button>addButton(new Button(this.column2X, RealmsScreen.row(1), this.columnWidth, 20, this.pvpTitle(), dni -> {
+            this.pvp = !this.pvp;
+            dni.setMessage(this.pvpTitle());
+            return;
+        }));
+        this.<Button>addButton(new Button(this.column1X, RealmsScreen.row(3), this.columnWidth, 20, this.gameModeTitle(), dni -> {
+            this.gameMode = (this.gameMode + 1) % RealmsSlotOptionsScreen.GAME_MODES.length;
+            dni.setMessage(this.gameModeTitle());
+            return;
+        }));
+        this.spawnAnimalsButton = this.<Button>addButton(new Button(this.column2X, RealmsScreen.row(3), this.columnWidth, 20, this.spawnAnimalsTitle(), dni -> {
+            this.spawnAnimals = !this.spawnAnimals;
+            dni.setMessage(this.spawnAnimalsTitle());
+            return;
+        }));
+        this.<Button>addButton(new Button(this.column1X, RealmsScreen.row(5), this.columnWidth, 20, this.difficultyTitle(), dni -> {
+            this.difficulty = (this.difficulty + 1) % RealmsSlotOptionsScreen.DIFFICULTIES.length;
+            dni.setMessage(this.difficultyTitle());
+            if (this.worldType == RealmsServer.WorldType.NORMAL) {
+                this.spawnMonstersButton.active = (this.difficulty != 0);
+                this.spawnMonstersButton.setMessage(this.spawnMonstersTitle());
             }
-        });
-        this.buttonsAdd(new RealmsButton(3, this.column1_x, RealmsConstants.row(3), this.column_width, 20, this.gameModeTitle()) {
-            @Override
-            public void onPress() {
-                RealmsSlotOptionsScreen.this.gameModeIndex = (RealmsSlotOptionsScreen.this.gameModeIndex + 1) % RealmsSlotOptionsScreen.this.gameModes.length;
-                this.setMessage(RealmsSlotOptionsScreen.this.gameModeTitle());
-            }
-        });
-        this.buttonsAdd(this.spawnAnimalsButton = new RealmsButton(5, this.column2_x, RealmsConstants.row(3), this.column_width, 20, this.spawnAnimalsTitle()) {
-            @Override
-            public void onPress() {
-                RealmsSlotOptionsScreen.this.spawnAnimals = !RealmsSlotOptionsScreen.this.spawnAnimals;
-                this.setMessage(RealmsSlotOptionsScreen.this.spawnAnimalsTitle());
-            }
-        });
-        this.buttonsAdd(new RealmsButton(2, this.column1_x, RealmsConstants.row(5), this.column_width, 20, this.difficultyTitle()) {
-            @Override
-            public void onPress() {
-                RealmsSlotOptionsScreen.this.difficultyIndex = (RealmsSlotOptionsScreen.this.difficultyIndex + 1) % RealmsSlotOptionsScreen.this.difficulties.length;
-                this.setMessage(RealmsSlotOptionsScreen.this.difficultyTitle());
-                if (RealmsSlotOptionsScreen.this.worldType.equals(RealmsServer.WorldType.NORMAL)) {
-                    RealmsSlotOptionsScreen.this.spawnMonstersButton.active(RealmsSlotOptionsScreen.this.difficultyIndex != 0);
-                    RealmsSlotOptionsScreen.this.spawnMonstersButton.setMessage(RealmsSlotOptionsScreen.this.spawnMonstersTitle());
-                }
-            }
-        });
-        this.buttonsAdd(this.spawnMonstersButton = new RealmsButton(6, this.column2_x, RealmsConstants.row(5), this.column_width, 20, this.spawnMonstersTitle()) {
-            @Override
-            public void onPress() {
-                RealmsSlotOptionsScreen.this.spawnMonsters = !RealmsSlotOptionsScreen.this.spawnMonsters;
-                this.setMessage(RealmsSlotOptionsScreen.this.spawnMonstersTitle());
-            }
-        });
-        this.buttonsAdd(this.spawnProtectionButton = new SettingsSlider(8, this.column1_x, RealmsConstants.row(7), this.column_width, this.spawnProtection, 0.0f, 16.0f));
-        this.buttonsAdd(this.spawnNPCsButton = new RealmsButton(7, this.column2_x, RealmsConstants.row(7), this.column_width, 20, this.spawnNPCsTitle()) {
-            @Override
-            public void onPress() {
-                RealmsSlotOptionsScreen.this.spawnNPCs = !RealmsSlotOptionsScreen.this.spawnNPCs;
-                this.setMessage(RealmsSlotOptionsScreen.this.spawnNPCsTitle());
-            }
-        });
-        this.buttonsAdd(this.forceGameModeButton = new RealmsButton(10, this.column1_x, RealmsConstants.row(9), this.column_width, 20, this.forceGameModeTitle()) {
-            @Override
-            public void onPress() {
-                RealmsSlotOptionsScreen.this.forceGameMode = !RealmsSlotOptionsScreen.this.forceGameMode;
-                this.setMessage(RealmsSlotOptionsScreen.this.forceGameModeTitle());
-            }
-        });
-        this.buttonsAdd(this.commandBlocksButton = new RealmsButton(9, this.column2_x, RealmsConstants.row(9), this.column_width, 20, this.commandBlocksTitle()) {
-            @Override
-            public void onPress() {
-                RealmsSlotOptionsScreen.this.commandBlocks = !RealmsSlotOptionsScreen.this.commandBlocks;
-                this.setMessage(RealmsSlotOptionsScreen.this.commandBlocksTitle());
-            }
-        });
-        if (!this.worldType.equals(RealmsServer.WorldType.NORMAL)) {
-            this.pvpButton.active(false);
-            this.spawnAnimalsButton.active(false);
-            this.spawnNPCsButton.active(false);
-            this.spawnMonstersButton.active(false);
-            this.spawnProtectionButton.active(false);
-            this.commandBlocksButton.active(false);
-            this.spawnProtectionButton.active(false);
-            this.forceGameModeButton.active(false);
+            return;
+        }));
+        this.spawnMonstersButton = this.<Button>addButton(new Button(this.column2X, RealmsScreen.row(5), this.columnWidth, 20, this.spawnMonstersTitle(), dni -> {
+            this.spawnMonsters = !this.spawnMonsters;
+            dni.setMessage(this.spawnMonstersTitle());
+            return;
+        }));
+        this.spawnProtectionButton = this.<SettingsSlider>addButton(new SettingsSlider(this.column1X, RealmsScreen.row(7), this.columnWidth, this.spawnProtection, 0.0f, 16.0f));
+        this.spawnNPCsButton = this.<Button>addButton(new Button(this.column2X, RealmsScreen.row(7), this.columnWidth, 20, this.spawnNPCsTitle(), dni -> {
+            this.spawnNPCs = !this.spawnNPCs;
+            dni.setMessage(this.spawnNPCsTitle());
+            return;
+        }));
+        this.forceGameModeButton = this.<Button>addButton(new Button(this.column1X, RealmsScreen.row(9), this.columnWidth, 20, this.forceGameModeTitle(), dni -> {
+            this.forceGameMode = !this.forceGameMode;
+            dni.setMessage(this.forceGameModeTitle());
+            return;
+        }));
+        this.commandBlocksButton = this.<Button>addButton(new Button(this.column2X, RealmsScreen.row(9), this.columnWidth, 20, this.commandBlocksTitle(), dni -> {
+            this.commandBlocks = !this.commandBlocks;
+            dni.setMessage(this.commandBlocksTitle());
+            return;
+        }));
+        if (this.worldType != RealmsServer.WorldType.NORMAL) {
+            this.pvpButton.active = false;
+            this.spawnAnimalsButton.active = false;
+            this.spawnNPCsButton.active = false;
+            this.spawnMonstersButton.active = false;
+            this.spawnProtectionButton.active = false;
+            this.commandBlocksButton.active = false;
+            this.forceGameModeButton.active = false;
         }
-        if (this.difficultyIndex == 0) {
-            this.spawnMonstersButton.active(false);
+        if (this.difficulty == 0) {
+            this.spawnMonstersButton.active = false;
         }
-        this.buttonsAdd(new RealmsButton(1, this.column1_x, RealmsConstants.row(13), this.column_width, 20, RealmsScreen.getLocalizedString("mco.configure.world.buttons.done")) {
-            @Override
-            public void onPress() {
-                RealmsSlotOptionsScreen.this.saveSettings();
-            }
-        });
-        this.buttonsAdd(new RealmsButton(0, this.column2_x, RealmsConstants.row(13), this.column_width, 20, RealmsScreen.getLocalizedString("gui.cancel")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsSlotOptionsScreen.this.parent);
-            }
-        });
-        this.addWidget(this.nameEdit);
-        this.addWidget(this.titleLabel = new RealmsLabel(RealmsScreen.getLocalizedString("mco.configure.world.buttons.options"), this.width() / 2, 17, 16777215));
+        this.<Button>addButton(new Button(this.column1X, RealmsScreen.row(13), this.columnWidth, 20, new TranslatableComponent("mco.configure.world.buttons.done"), dni -> this.saveSettings()));
+        this.<Button>addButton(new Button(this.column2X, RealmsScreen.row(13), this.columnWidth, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(this.parent)));
+        this.<EditBox>addWidget(this.nameEdit);
+        this.titleLabel = this.<RealmsLabel>addWidget(new RealmsLabel(new TranslatableComponent("mco.configure.world.buttons.options"), this.width / 2, 17, 16777215));
         if (this.warningLabel != null) {
-            this.addWidget(this.warningLabel);
+            this.<RealmsLabel>addWidget(this.warningLabel);
         }
         this.narrateLabels();
     }
     
-    private void createDifficultyAndGameMode() {
-        this.difficulties = new String[] { RealmsScreen.getLocalizedString("options.difficulty.peaceful"), RealmsScreen.getLocalizedString("options.difficulty.easy"), RealmsScreen.getLocalizedString("options.difficulty.normal"), RealmsScreen.getLocalizedString("options.difficulty.hard") };
-        this.gameModes = new String[] { RealmsScreen.getLocalizedString("selectWorld.gameMode.survival"), RealmsScreen.getLocalizedString("selectWorld.gameMode.creative"), RealmsScreen.getLocalizedString("selectWorld.gameMode.adventure") };
-        this.gameModeHints = new String[][] { { RealmsScreen.getLocalizedString("selectWorld.gameMode.survival.line1"), RealmsScreen.getLocalizedString("selectWorld.gameMode.survival.line2") }, { RealmsScreen.getLocalizedString("selectWorld.gameMode.creative.line1"), RealmsScreen.getLocalizedString("selectWorld.gameMode.creative.line2") }, { RealmsScreen.getLocalizedString("selectWorld.gameMode.adventure.line1"), RealmsScreen.getLocalizedString("selectWorld.gameMode.adventure.line2") } };
+    private Component difficultyTitle() {
+        return new TranslatableComponent("options.difficulty").append(": ").append(RealmsSlotOptionsScreen.DIFFICULTIES[this.difficulty]);
     }
     
-    private String difficultyTitle() {
-        final String string2 = RealmsScreen.getLocalizedString("options.difficulty");
-        return string2 + ": " + this.difficulties[this.difficultyIndex];
+    private Component gameModeTitle() {
+        return new TranslatableComponent("selectWorld.gameMode").append(": ").append(RealmsSlotOptionsScreen.GAME_MODES[this.gameMode]);
     }
     
-    private String gameModeTitle() {
-        final String string2 = RealmsScreen.getLocalizedString("selectWorld.gameMode");
-        return string2 + ": " + this.gameModes[this.gameModeIndex];
+    private Component pvpTitle() {
+        return new TranslatableComponent("mco.configure.world.pvp").append(": ").append(getOnOff(this.pvp));
     }
     
-    private String pvpTitle() {
-        return RealmsScreen.getLocalizedString("mco.configure.world.pvp") + ": " + RealmsScreen.getLocalizedString(((boolean)this.pvp) ? "mco.configure.world.on" : "mco.configure.world.off");
+    private Component spawnAnimalsTitle() {
+        return new TranslatableComponent("mco.configure.world.spawnAnimals").append(": ").append(getOnOff(this.spawnAnimals));
     }
     
-    private String spawnAnimalsTitle() {
-        return RealmsScreen.getLocalizedString("mco.configure.world.spawnAnimals") + ": " + RealmsScreen.getLocalizedString(((boolean)this.spawnAnimals) ? "mco.configure.world.on" : "mco.configure.world.off");
-    }
-    
-    private String spawnMonstersTitle() {
-        if (this.difficultyIndex == 0) {
-            return RealmsScreen.getLocalizedString("mco.configure.world.spawnMonsters") + ": " + RealmsScreen.getLocalizedString("mco.configure.world.off");
+    private Component spawnMonstersTitle() {
+        if (this.difficulty == 0) {
+            return new TranslatableComponent("mco.configure.world.spawnMonsters").append(": ").append(new TranslatableComponent("mco.configure.world.off"));
         }
-        return RealmsScreen.getLocalizedString("mco.configure.world.spawnMonsters") + ": " + RealmsScreen.getLocalizedString(((boolean)this.spawnMonsters) ? "mco.configure.world.on" : "mco.configure.world.off");
+        return new TranslatableComponent("mco.configure.world.spawnMonsters").append(": ").append(getOnOff(this.spawnMonsters));
     }
     
-    private String spawnNPCsTitle() {
-        return RealmsScreen.getLocalizedString("mco.configure.world.spawnNPCs") + ": " + RealmsScreen.getLocalizedString(((boolean)this.spawnNPCs) ? "mco.configure.world.on" : "mco.configure.world.off");
+    private Component spawnNPCsTitle() {
+        return new TranslatableComponent("mco.configure.world.spawnNPCs").append(": ").append(getOnOff(this.spawnNPCs));
     }
     
-    private String commandBlocksTitle() {
-        return RealmsScreen.getLocalizedString("mco.configure.world.commandBlocks") + ": " + RealmsScreen.getLocalizedString(((boolean)this.commandBlocks) ? "mco.configure.world.on" : "mco.configure.world.off");
+    private Component commandBlocksTitle() {
+        return new TranslatableComponent("mco.configure.world.commandBlocks").append(": ").append(getOnOff(this.commandBlocks));
     }
     
-    private String forceGameModeTitle() {
-        return RealmsScreen.getLocalizedString("mco.configure.world.forceGameMode") + ": " + RealmsScreen.getLocalizedString(((boolean)this.forceGameMode) ? "mco.configure.world.on" : "mco.configure.world.off");
+    private Component forceGameModeTitle() {
+        return new TranslatableComponent("mco.configure.world.forceGameMode").append(": ").append(getOnOff(this.forceGameMode));
+    }
+    
+    private static Component getOnOff(final boolean boolean1) {
+        return boolean1 ? RealmsSlotOptionsScreen.TEXT_ON : RealmsSlotOptionsScreen.TEXT_OFF;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        final String string5 = RealmsScreen.getLocalizedString("mco.configure.world.edit.slot.name");
-        this.drawString(string5, this.column1_x + this.column_width / 2 - this.fontWidth(string5) / 2, RealmsConstants.row(0) - 5, 16777215);
-        this.titleLabel.render(this);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        final String string6 = I18n.get("mco.configure.world.edit.slot.name");
+        this.font.draw(dhl, string6, (float)(this.column1X + this.columnWidth / 2 - this.font.width(string6) / 2), (float)(RealmsScreen.row(0) - 5), 16777215);
+        this.titleLabel.render(this, dhl);
         if (this.warningLabel != null) {
-            this.warningLabel.render(this);
+            this.warningLabel.render(this, dhl);
         }
-        this.nameEdit.render(integer1, integer2, float3);
-        super.render(integer1, integer2, float3);
+        this.nameEdit.render(dhl, integer2, integer3, float4);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     private String getSlotName() {
@@ -271,30 +240,51 @@ public class RealmsSlotOptionsScreen extends RealmsScreen {
     }
     
     private void saveSettings() {
-        if (this.worldType.equals(RealmsServer.WorldType.ADVENTUREMAP) || this.worldType.equals(RealmsServer.WorldType.EXPERIENCE) || this.worldType.equals(RealmsServer.WorldType.INSPIRATION)) {
-            this.parent.saveSlotSettings(new RealmsWorldOptions(this.options.pvp, this.options.spawnAnimals, this.options.spawnMonsters, this.options.spawnNPCs, this.options.spawnProtection, this.options.commandBlocks, this.difficultyIndex, this.gameModeIndex, this.options.forceGameMode, this.getSlotName()));
+        if (this.worldType == RealmsServer.WorldType.ADVENTUREMAP || this.worldType == RealmsServer.WorldType.EXPERIENCE || this.worldType == RealmsServer.WorldType.INSPIRATION) {
+            this.parent.saveSlotSettings(new RealmsWorldOptions(this.options.pvp, this.options.spawnAnimals, this.options.spawnMonsters, this.options.spawnNPCs, this.options.spawnProtection, this.options.commandBlocks, this.difficulty, this.gameMode, this.options.forceGameMode, this.getSlotName()));
         }
         else {
-            this.parent.saveSlotSettings(new RealmsWorldOptions(this.pvp, this.spawnAnimals, this.spawnMonsters, this.spawnNPCs, this.spawnProtection, this.commandBlocks, this.difficultyIndex, this.gameModeIndex, this.forceGameMode, this.getSlotName()));
+            this.parent.saveSlotSettings(new RealmsWorldOptions(this.pvp, this.spawnAnimals, this.spawnMonsters, this.spawnNPCs, this.spawnProtection, this.commandBlocks, this.difficulty, this.gameMode, this.forceGameMode, this.getSlotName()));
         }
     }
     
-    class SettingsSlider extends RealmsSliderButton {
-        public SettingsSlider(final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final float float7, final float float8) {
-            super(integer2, integer3, integer4, integer5, integer6, float7, float8);
+    static {
+        DIFFICULTIES = new Component[] { new TranslatableComponent("options.difficulty.peaceful"), new TranslatableComponent("options.difficulty.easy"), new TranslatableComponent("options.difficulty.normal"), new TranslatableComponent("options.difficulty.hard") };
+        GAME_MODES = new Component[] { new TranslatableComponent("selectWorld.gameMode.survival"), new TranslatableComponent("selectWorld.gameMode.creative"), new TranslatableComponent("selectWorld.gameMode.adventure") };
+        TEXT_ON = new TranslatableComponent("mco.configure.world.on");
+        TEXT_OFF = new TranslatableComponent("mco.configure.world.off");
+    }
+    
+    class SettingsSlider extends AbstractSliderButton {
+        private final double minValue;
+        private final double maxValue;
+        
+        public SettingsSlider(final int integer2, final int integer3, final int integer4, final int integer5, final float float6, final float float7) {
+            super(integer2, integer3, integer4, 20, TextComponent.EMPTY, 0.0);
+            this.minValue = float6;
+            this.maxValue = float7;
+            this.value = (Mth.clamp((float)integer5, float6, float7) - float6) / (float7 - float6);
+            this.updateMessage();
         }
         
-        @Override
         public void applyValue() {
-            if (!RealmsSlotOptionsScreen.this.spawnProtectionButton.active()) {
+            if (!RealmsSlotOptionsScreen.this.spawnProtectionButton.active) {
                 return;
             }
-            RealmsSlotOptionsScreen.this.spawnProtection = (int)this.toValue(this.getValue());
+            RealmsSlotOptionsScreen.this.spawnProtection = (int)Mth.lerp(Mth.clamp(this.value, 0.0, 1.0), this.minValue, this.maxValue);
         }
         
         @Override
-        public String getMessage() {
-            return RealmsScreen.getLocalizedString("mco.configure.world.spawnProtection") + ": " + ((RealmsSlotOptionsScreen.this.spawnProtection == 0) ? RealmsScreen.getLocalizedString("mco.configure.world.off") : RealmsSlotOptionsScreen.this.spawnProtection);
+        protected void updateMessage() {
+            this.setMessage(new TranslatableComponent("mco.configure.world.spawnProtection").append(": ").append((RealmsSlotOptionsScreen.this.spawnProtection == 0) ? new TranslatableComponent("mco.configure.world.off") : new TextComponent(String.valueOf(RealmsSlotOptionsScreen.this.spawnProtection))));
+        }
+        
+        @Override
+        public void onClick(final double double1, final double double2) {
+        }
+        
+        @Override
+        public void onRelease(final double double1, final double double2) {
         }
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java
index 80bac98..adb0d44 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java
@@ -1,33 +1,33 @@
 package com.mojang.realmsclient.gui.screens;
 
 import org.apache.logging.log4j.LogManager;
+import net.minecraft.client.Minecraft;
 import java.util.Locale;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.Calendar;
 import java.text.DateFormat;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
-import java.io.IOException;
 import com.mojang.realmsclient.exception.RealmsServiceException;
 import com.mojang.realmsclient.client.RealmsClient;
-import net.minecraft.realms.RealmsConfirmResultListener;
-import net.minecraft.realms.AbstractRealmsButton;
-import com.mojang.realmsclient.util.RealmsUtil;
-import net.minecraft.realms.RealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
-import net.minecraft.realms.Realms;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.Util;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.realms.NarrationHelper;
+import net.minecraft.client.resources.language.I18n;
 import com.mojang.realmsclient.dto.Subscription;
 import com.mojang.realmsclient.dto.RealmsServer;
+import net.minecraft.client.gui.screens.Screen;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsSubscriptionInfoScreen extends RealmsScreen {
     private static final Logger LOGGER;
-    private final RealmsScreen lastScreen;
+    private final Screen lastScreen;
     private final RealmsServer serverData;
-    private final RealmsScreen mainScreen;
-    private final int BUTTON_BACK_ID = 0;
-    private final int BUTTON_DELETE_ID = 1;
-    private final int BUTTON_SUBSCRIPTION_ID = 2;
+    private final Screen mainScreen;
     private final String subscriptionTitle;
     private final String subscriptionStartLabelText;
     private final String timeLeftLabelText;
@@ -35,89 +35,72 @@ public class RealmsSubscriptionInfoScreen extends RealmsScreen {
     private int daysLeft;
     private String startDate;
     private Subscription.SubscriptionType type;
-    private final String PURCHASE_LINK = "https://aka.ms/ExtendJavaRealms";
     
-    public RealmsSubscriptionInfoScreen(final RealmsScreen realmsScreen1, final RealmsServer realmsServer, final RealmsScreen realmsScreen3) {
-        this.lastScreen = realmsScreen1;
-        this.serverData = realmsServer;
-        this.mainScreen = realmsScreen3;
-        this.subscriptionTitle = RealmsScreen.getLocalizedString("mco.configure.world.subscription.title");
-        this.subscriptionStartLabelText = RealmsScreen.getLocalizedString("mco.configure.world.subscription.start");
-        this.timeLeftLabelText = RealmsScreen.getLocalizedString("mco.configure.world.subscription.timeleft");
-        this.daysLeftLabelText = RealmsScreen.getLocalizedString("mco.configure.world.subscription.recurring.daysleft");
+    public RealmsSubscriptionInfoScreen(final Screen dqs1, final RealmsServer dip, final Screen dqs3) {
+        this.lastScreen = dqs1;
+        this.serverData = dip;
+        this.mainScreen = dqs3;
+        this.subscriptionTitle = I18n.get("mco.configure.world.subscription.title");
+        this.subscriptionStartLabelText = I18n.get("mco.configure.world.subscription.start");
+        this.timeLeftLabelText = I18n.get("mco.configure.world.subscription.timeleft");
+        this.daysLeftLabelText = I18n.get("mco.configure.world.subscription.recurring.daysleft");
     }
     
-    @Override
     public void init() {
         this.getSubscription(this.serverData.id);
-        Realms.narrateNow(this.subscriptionTitle, this.subscriptionStartLabelText, this.startDate, this.timeLeftLabelText, this.daysLeftPresentation(this.daysLeft));
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        this.buttonsAdd(new RealmsButton(2, this.width() / 2 - 100, RealmsConstants.row(6), RealmsScreen.getLocalizedString("mco.configure.world.subscription.extend")) {
-            @Override
-            public void onPress() {
-                final String string2 = "https://aka.ms/ExtendJavaRealms?subscriptionId=" + RealmsSubscriptionInfoScreen.this.serverData.remoteSubscriptionId + "&profileId=" + Realms.getUUID();
-                Realms.setClipboard(string2);
-                RealmsUtil.browseTo(string2);
-            }
-        });
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 - 100, RealmsConstants.row(12), RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsSubscriptionInfoScreen.this.lastScreen);
-            }
-        });
+        NarrationHelper.now(this.subscriptionTitle, this.subscriptionStartLabelText, this.startDate, this.timeLeftLabelText, this.daysLeftPresentation(this.daysLeft));
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        final String string3;
+        this.<Button>addButton(new Button(this.width / 2 - 100, RealmsScreen.row(6), 200, 20, new TranslatableComponent("mco.configure.world.subscription.extend"), dni -> {
+            string3 = "https://aka.ms/ExtendJavaRealms?subscriptionId=" + this.serverData.remoteSubscriptionId + "&profileId=" + this.minecraft.getUser().getUuid();
+            this.minecraft.keyboardHandler.setClipboard(string3);
+            Util.getPlatform().openUri(string3);
+            return;
+        }));
+        this.<Button>addButton(new Button(this.width / 2 - 100, RealmsScreen.row(12), 200, 20, CommonComponents.GUI_BACK, dni -> this.minecraft.setScreen(this.lastScreen)));
         if (this.serverData.expired) {
-            this.buttonsAdd(new RealmsButton(1, this.width() / 2 - 100, RealmsConstants.row(10), RealmsScreen.getLocalizedString("mco.configure.world.delete.button")) {
-                @Override
-                public void onPress() {
-                    final String string2 = RealmsScreen.getLocalizedString("mco.configure.world.delete.question.line1");
-                    final String string3 = RealmsScreen.getLocalizedString("mco.configure.world.delete.question.line2");
-                    Realms.setScreen(new RealmsLongConfirmationScreen(RealmsSubscriptionInfoScreen.this, RealmsLongConfirmationScreen.Type.Warning, string2, string3, true, 1));
-                }
-            });
+            final Component mr3;
+            final Component mr4;
+            this.<Button>addButton(new Button(this.width / 2 - 100, RealmsScreen.row(10), 200, 20, new TranslatableComponent("mco.configure.world.delete.button"), dni -> {
+                mr3 = new TranslatableComponent("mco.configure.world.delete.question.line1");
+                mr4 = new TranslatableComponent("mco.configure.world.delete.question.line2");
+                this.minecraft.setScreen(new RealmsLongConfirmationScreen(this::deleteRealm, RealmsLongConfirmationScreen.Type.Warning, mr3, mr4, true));
+            }));
         }
     }
     
-    private void getSubscription(final long long1) {
-        final RealmsClient cyy4 = RealmsClient.createRealmsClient();
-        try {
-            final Subscription subscription5 = cyy4.subscriptionFor(long1);
-            this.daysLeft = subscription5.daysLeft;
-            this.startDate = this.localPresentation(subscription5.startDate);
-            this.type = subscription5.type;
-        }
-        catch (RealmsServiceException czg5) {
-            RealmsSubscriptionInfoScreen.LOGGER.error("Couldn't get subscription");
-            Realms.setScreen(new RealmsGenericErrorScreen(czg5, this.lastScreen));
-        }
-        catch (IOException iOException5) {
-            RealmsSubscriptionInfoScreen.LOGGER.error("Couldn't parse response subscribing");
-        }
-    }
-    
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-        if (integer == 1 && boolean1) {
+    private void deleteRealm(final boolean boolean1) {
+        if (boolean1) {
             new Thread("Realms-delete-realm") {
                 @Override
                 public void run() {
                     try {
-                        final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-                        cyy2.deleteWorld(RealmsSubscriptionInfoScreen.this.serverData.id);
+                        final RealmsClient dia2 = RealmsClient.create();
+                        dia2.deleteWorld(RealmsSubscriptionInfoScreen.this.serverData.id);
                     }
-                    catch (RealmsServiceException czg2) {
+                    catch (RealmsServiceException djh2) {
                         RealmsSubscriptionInfoScreen.LOGGER.error("Couldn't delete world");
-                        RealmsSubscriptionInfoScreen.LOGGER.error(czg2);
+                        RealmsSubscriptionInfoScreen.LOGGER.error(djh2);
                     }
-                    catch (IOException iOException2) {
-                        RealmsSubscriptionInfoScreen.LOGGER.error("Couldn't delete world");
-                        iOException2.printStackTrace();
-                    }
-                    Realms.setScreen(RealmsSubscriptionInfoScreen.this.mainScreen);
+                    RealmsSubscriptionInfoScreen.this.minecraft.execute(() -> RealmsSubscriptionInfoScreen.this.minecraft.setScreen(RealmsSubscriptionInfoScreen.this.mainScreen));
                 }
             }.start();
         }
-        Realms.setScreen(this);
+        this.minecraft.setScreen(this);
+    }
+    
+    private void getSubscription(final long long1) {
+        final RealmsClient dia4 = RealmsClient.create();
+        try {
+            final Subscription diz5 = dia4.subscriptionFor(long1);
+            this.daysLeft = diz5.daysLeft;
+            this.startDate = this.localPresentation(diz5.startDate);
+            this.type = diz5.type;
+        }
+        catch (RealmsServiceException djh5) {
+            RealmsSubscriptionInfoScreen.LOGGER.error("Couldn't get subscription");
+            this.minecraft.setScreen(new RealmsGenericErrorScreen(djh5, this.lastScreen));
+        }
     }
     
     private String localPresentation(final long long1) {
@@ -128,41 +111,41 @@ public class RealmsSubscriptionInfoScreen extends RealmsScreen {
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        final int integer3 = this.width() / 2 - 100;
-        this.drawCenteredString(this.subscriptionTitle, this.width() / 2, 17, 16777215);
-        this.drawString(this.subscriptionStartLabelText, integer3, RealmsConstants.row(0), 10526880);
-        this.drawString(this.startDate, integer3, RealmsConstants.row(1), 16777215);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        final int integer4 = this.width / 2 - 100;
+        this.drawCenteredString(dhl, this.font, this.subscriptionTitle, this.width / 2, 17, 16777215);
+        this.font.draw(dhl, this.subscriptionStartLabelText, (float)integer4, (float)RealmsScreen.row(0), 10526880);
+        this.font.draw(dhl, this.startDate, (float)integer4, (float)RealmsScreen.row(1), 16777215);
         if (this.type == Subscription.SubscriptionType.NORMAL) {
-            this.drawString(this.timeLeftLabelText, integer3, RealmsConstants.row(3), 10526880);
+            this.font.draw(dhl, this.timeLeftLabelText, (float)integer4, (float)RealmsScreen.row(3), 10526880);
         }
         else if (this.type == Subscription.SubscriptionType.RECURRING) {
-            this.drawString(this.daysLeftLabelText, integer3, RealmsConstants.row(3), 10526880);
+            this.font.draw(dhl, this.daysLeftLabelText, (float)integer4, (float)RealmsScreen.row(3), 10526880);
         }
-        this.drawString(this.daysLeftPresentation(this.daysLeft), integer3, RealmsConstants.row(4), 16777215);
-        super.render(integer1, integer2, float3);
+        this.font.draw(dhl, this.daysLeftPresentation(this.daysLeft), (float)integer4, (float)RealmsScreen.row(4), 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     private String daysLeftPresentation(final int integer) {
         if (integer == -1 && this.serverData.expired) {
-            return RealmsScreen.getLocalizedString("mco.configure.world.subscription.expired");
+            return I18n.get("mco.configure.world.subscription.expired");
         }
         if (integer <= 1) {
-            return RealmsScreen.getLocalizedString("mco.configure.world.subscription.less_than_a_day");
+            return I18n.get("mco.configure.world.subscription.less_than_a_day");
         }
         final int integer2 = integer / 30;
         final int integer3 = integer % 30;
@@ -170,10 +153,10 @@ public class RealmsSubscriptionInfoScreen extends RealmsScreen {
         if (integer2 > 0) {
             stringBuilder5.append(integer2).append(" ");
             if (integer2 == 1) {
-                stringBuilder5.append(RealmsScreen.getLocalizedString("mco.configure.world.subscription.month").toLowerCase(Locale.ROOT));
+                stringBuilder5.append(I18n.get("mco.configure.world.subscription.month").toLowerCase(Locale.ROOT));
             }
             else {
-                stringBuilder5.append(RealmsScreen.getLocalizedString("mco.configure.world.subscription.months").toLowerCase(Locale.ROOT));
+                stringBuilder5.append(I18n.get("mco.configure.world.subscription.months").toLowerCase(Locale.ROOT));
             }
         }
         if (integer3 > 0) {
@@ -182,10 +165,10 @@ public class RealmsSubscriptionInfoScreen extends RealmsScreen {
             }
             stringBuilder5.append(integer3).append(" ");
             if (integer3 == 1) {
-                stringBuilder5.append(RealmsScreen.getLocalizedString("mco.configure.world.subscription.day").toLowerCase(Locale.ROOT));
+                stringBuilder5.append(I18n.get("mco.configure.world.subscription.day").toLowerCase(Locale.ROOT));
             }
             else {
-                stringBuilder5.append(RealmsScreen.getLocalizedString("mco.configure.world.subscription.days").toLowerCase(Locale.ROOT));
+                stringBuilder5.append(I18n.get("mco.configure.world.subscription.days").toLowerCase(Locale.ROOT));
             }
         }
         return stringBuilder5.toString();
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java
index 0a1c657..68607c9 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java
@@ -1,79 +1,65 @@
 package com.mojang.realmsclient.gui.screens;
 
 import org.apache.logging.log4j.LogManager;
-import com.mojang.realmsclient.util.RealmsUtil;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.Util;
 import com.mojang.realmsclient.exception.RealmsServiceException;
-import com.mojang.realmsclient.gui.LongRunningTask;
-import com.mojang.realmsclient.util.RealmsTasks;
+import com.mojang.realmsclient.util.task.LongRunningTask;
+import com.mojang.realmsclient.util.task.GetServerDetailsTask;
 import java.util.concurrent.locks.ReentrantLock;
 import com.mojang.realmsclient.client.RealmsClient;
-import net.minecraft.realms.Realms;
-import net.minecraft.realms.AbstractRealmsButton;
-import com.mojang.realmsclient.gui.RealmsConstants;
-import net.minecraft.realms.RealmsButton;
+import net.minecraft.network.chat.Component;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.realmsclient.dto.RealmsServer;
 import com.mojang.realmsclient.RealmsMainScreen;
+import net.minecraft.client.gui.screens.Screen;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsTermsScreen extends RealmsScreen {
     private static final Logger LOGGER;
-    private final RealmsScreen lastScreen;
+    private final Screen lastScreen;
     private final RealmsMainScreen mainScreen;
     private final RealmsServer realmsServer;
-    private RealmsButton agreeButton;
     private boolean onLink;
     private final String realmsToSUrl = "https://minecraft.net/realms/terms";
     
-    public RealmsTermsScreen(final RealmsScreen realmsScreen, final RealmsMainScreen cyu, final RealmsServer realmsServer) {
-        this.lastScreen = realmsScreen;
-        this.mainScreen = cyu;
-        this.realmsServer = realmsServer;
+    public RealmsTermsScreen(final Screen dqs, final RealmsMainScreen dhv, final RealmsServer dip) {
+        this.lastScreen = dqs;
+        this.mainScreen = dhv;
+        this.realmsServer = dip;
     }
     
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        final int integer2 = this.width() / 4;
-        final int integer3 = this.width() / 4 - 2;
-        final int integer4 = this.width() / 2 + 4;
-        this.buttonsAdd(this.agreeButton = new RealmsButton(1, integer2, RealmsConstants.row(12), integer3, 20, RealmsScreen.getLocalizedString("mco.terms.buttons.agree")) {
-            @Override
-            public void onPress() {
-                RealmsTermsScreen.this.agreedToTos();
-            }
-        });
-        this.buttonsAdd(new RealmsButton(2, integer4, RealmsConstants.row(12), integer3, 20, RealmsScreen.getLocalizedString("mco.terms.buttons.disagree")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(RealmsTermsScreen.this.lastScreen);
-            }
-        });
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        final int integer2 = this.width / 4 - 2;
+        this.<Button>addButton(new Button(this.width / 4, RealmsScreen.row(12), integer2, 20, new TranslatableComponent("mco.terms.buttons.agree"), dni -> this.agreedToTos()));
+        this.<Button>addButton(new Button(this.width / 2 + 4, RealmsScreen.row(12), integer2, 20, new TranslatableComponent("mco.terms.buttons.disagree"), dni -> this.minecraft.setScreen(this.lastScreen)));
     }
     
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            Realms.setScreen(this.lastScreen);
+            this.minecraft.setScreen(this.lastScreen);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
     }
     
     private void agreedToTos() {
-        final RealmsClient cyy2 = RealmsClient.createRealmsClient();
+        final RealmsClient dia2 = RealmsClient.create();
         try {
-            cyy2.agreeToTos();
-            final RealmsLongRunningMcoTaskScreen czz3 = new RealmsLongRunningMcoTaskScreen(this.lastScreen, new RealmsTasks.RealmsGetServerDetailsTask(this.mainScreen, this.lastScreen, this.realmsServer, new ReentrantLock()));
-            czz3.start();
-            Realms.setScreen(czz3);
+            dia2.agreeToTos();
+            this.minecraft.setScreen(new RealmsLongRunningMcoTaskScreen(this.lastScreen, new GetServerDetailsTask(this.mainScreen, this.lastScreen, this.realmsServer, new ReentrantLock())));
         }
-        catch (RealmsServiceException czg3) {
+        catch (RealmsServiceException djh3) {
             RealmsTermsScreen.LOGGER.error("Couldn't agree to TOS");
         }
     }
@@ -81,32 +67,34 @@ public class RealmsTermsScreen extends RealmsScreen {
     @Override
     public boolean mouseClicked(final double double1, final double double2, final int integer) {
         if (this.onLink) {
-            Realms.setClipboard("https://minecraft.net/realms/terms");
-            RealmsUtil.browseTo("https://minecraft.net/realms/terms");
+            this.minecraft.keyboardHandler.setClipboard("https://minecraft.net/realms/terms");
+            Util.getPlatform().openUri("https://minecraft.net/realms/terms");
             return true;
         }
         return super.mouseClicked(double1, double2, integer);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(RealmsScreen.getLocalizedString("mco.terms.title"), this.width() / 2, 17, 16777215);
-        this.drawString(RealmsScreen.getLocalizedString("mco.terms.sentence.1"), this.width() / 2 - 120, RealmsConstants.row(5), 16777215);
-        final int integer3 = this.fontWidth(RealmsScreen.getLocalizedString("mco.terms.sentence.1"));
-        final int integer4 = this.width() / 2 - 121 + integer3;
-        final int integer5 = RealmsConstants.row(5);
-        final int integer6 = integer4 + this.fontWidth("mco.terms.sentence.2") + 1;
-        final int integer7 = integer5 + 1 + this.fontLineHeight();
-        if (integer4 <= integer1 && integer1 <= integer6 && integer5 <= integer2 && integer2 <= integer7) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, I18n.get("mco.terms.title"), this.width / 2, 17, 16777215);
+        this.font.draw(dhl, I18n.get("mco.terms.sentence.1"), (float)(this.width / 2 - 120), (float)RealmsScreen.row(5), 16777215);
+        final int integer4 = this.font.width(I18n.get("mco.terms.sentence.1"));
+        final int integer5 = this.width / 2 - 121 + integer4;
+        final int integer6 = RealmsScreen.row(5);
+        final int integer7 = integer5 + this.font.width("mco.terms.sentence.2") + 1;
+        final int n = integer6 + 1;
+        this.font.getClass();
+        final int integer8 = n + 9;
+        if (integer5 <= integer2 && integer2 <= integer7 && integer6 <= integer3 && integer3 <= integer8) {
             this.onLink = true;
-            this.drawString(" " + RealmsScreen.getLocalizedString("mco.terms.sentence.2"), this.width() / 2 - 120 + integer3, RealmsConstants.row(5), 7107012);
+            this.font.draw(dhl, " " + I18n.get("mco.terms.sentence.2"), (float)(this.width / 2 - 120 + integer4), (float)RealmsScreen.row(5), 7107012);
         }
         else {
             this.onLink = false;
-            this.drawString(" " + RealmsScreen.getLocalizedString("mco.terms.sentence.2"), this.width() / 2 - 120 + integer3, RealmsConstants.row(5), 3368635);
+            this.font.draw(dhl, " " + I18n.get("mco.terms.sentence.2"), (float)(this.width / 2 - 120 + integer4), (float)RealmsScreen.row(5), 3368635);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     static {
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java
index e3bed0d..e61bd0a 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java
@@ -14,108 +14,107 @@ import com.mojang.realmsclient.dto.UploadInfo;
 import com.mojang.realmsclient.exception.RealmsServiceException;
 import java.io.IOException;
 import com.mojang.realmsclient.client.FileUpload;
+import net.minecraft.SharedConstants;
 import java.io.File;
 import com.mojang.realmsclient.exception.RetryCallException;
 import com.mojang.realmsclient.util.UploadTokenCache;
 import java.util.concurrent.TimeUnit;
 import com.mojang.realmsclient.client.RealmsClient;
 import java.util.List;
+import net.minecraft.realms.NarrationHelper;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Stream;
 import com.google.common.collect.Lists;
-import net.minecraft.realms.RealmsDefaultVertexFormat;
-import net.minecraft.realms.Tezzelator;
+import com.mojang.realmsclient.Unit;
+import net.minecraft.Util;
+import com.mojang.blaze3d.vertex.BufferBuilder;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.systems.RenderSystem;
 import java.util.Locale;
-import net.minecraft.realms.Realms;
-import net.minecraft.realms.AbstractRealmsButton;
-import java.util.concurrent.locks.ReentrantLock;
-import net.minecraft.realms.RealmsButton;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.Component;
 import com.google.common.util.concurrent.RateLimiter;
 import com.mojang.realmsclient.client.UploadStatus;
-import net.minecraft.realms.RealmsLevelSummary;
+import net.minecraft.world.level.storage.LevelSummary;
+import java.util.concurrent.locks.ReentrantLock;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.realms.RealmsScreen;
 
 public class RealmsUploadScreen extends RealmsScreen {
     private static final Logger LOGGER;
+    private static final ReentrantLock UPLOAD_LOCK;
+    private static final String[] DOTS;
     private final RealmsResetWorldScreen lastScreen;
-    private final RealmsLevelSummary selectedLevel;
+    private final LevelSummary selectedLevel;
     private final long worldId;
     private final int slotId;
     private final UploadStatus uploadStatus;
     private final RateLimiter narrationRateLimiter;
-    private volatile String errorMessage;
-    private volatile String status;
+    private volatile Component[] errorMessage;
+    private volatile Component status;
     private volatile String progress;
     private volatile boolean cancelled;
     private volatile boolean uploadFinished;
     private volatile boolean showDots;
     private volatile boolean uploadStarted;
-    private RealmsButton backButton;
-    private RealmsButton cancelButton;
-    private int animTick;
-    private static final String[] DOTS;
-    private int dotIndex;
+    private Button backButton;
+    private Button cancelButton;
+    private int tickCount;
     private Long previousWrittenBytes;
     private Long previousTimeSnapshot;
     private long bytesPersSecond;
-    private static final ReentrantLock uploadLock;
+    private final Runnable callback;
     
-    public RealmsUploadScreen(final long long1, final int integer, final RealmsResetWorldScreen daf, final RealmsLevelSummary realmsLevelSummary) {
+    public RealmsUploadScreen(final long long1, final int integer, final RealmsResetWorldScreen dke, final LevelSummary daf, final Runnable runnable) {
         this.showDots = true;
         this.worldId = long1;
         this.slotId = integer;
-        this.lastScreen = daf;
-        this.selectedLevel = realmsLevelSummary;
+        this.lastScreen = dke;
+        this.selectedLevel = daf;
         this.uploadStatus = new UploadStatus();
         this.narrationRateLimiter = RateLimiter.create(0.10000000149011612);
+        this.callback = runnable;
     }
     
-    @Override
     public void init() {
-        this.setKeyboardHandlerSendRepeatsToGui(true);
-        this.backButton = new RealmsButton(1, this.width() / 2 - 100, this.height() - 42, 200, 20, RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                RealmsUploadScreen.this.onBack();
-            }
-        };
-        this.buttonsAdd(this.cancelButton = new RealmsButton(0, this.width() / 2 - 100, this.height() - 42, 200, 20, RealmsScreen.getLocalizedString("gui.cancel")) {
-            @Override
-            public void onPress() {
-                RealmsUploadScreen.this.onCancel();
-            }
-        });
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        this.backButton = new Button(this.width / 2 - 100, this.height - 42, 200, 20, CommonComponents.GUI_BACK, dni -> this.onBack());
+        this.cancelButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 42, 200, 20, CommonComponents.GUI_CANCEL, dni -> this.onCancel()));
         if (!this.uploadStarted) {
             if (this.lastScreen.slot == -1) {
                 this.upload();
             }
             else {
-                this.lastScreen.switchSlot(this);
+                this.lastScreen.switchSlot(() -> {
+                    if (!this.uploadStarted) {
+                        this.uploadStarted = true;
+                        this.minecraft.setScreen(this);
+                        this.upload();
+                    }
+                });
             }
         }
     }
     
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-        if (boolean1 && !this.uploadStarted) {
-            this.uploadStarted = true;
-            Realms.setScreen(this);
-            this.upload();
-        }
-    }
-    
     @Override
     public void removed() {
-        this.setKeyboardHandlerSendRepeatsToGui(false);
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     private void onBack() {
-        this.lastScreen.confirmResult(true, 0);
+        this.callback.run();
     }
     
     private void onCancel() {
         this.cancelled = true;
-        Realms.setScreen(this.lastScreen);
+        this.minecraft.setScreen(this.lastScreen);
     }
     
     @Override
@@ -133,161 +132,146 @@ public class RealmsUploadScreen extends RealmsScreen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
         if (!this.uploadFinished && this.uploadStatus.bytesWritten != 0L && this.uploadStatus.bytesWritten == (long)this.uploadStatus.totalBytes) {
-            this.status = RealmsScreen.getLocalizedString("mco.upload.verifying");
-            this.cancelButton.active(false);
+            this.status = new TranslatableComponent("mco.upload.verifying");
+            this.cancelButton.active = false;
         }
-        this.drawCenteredString(this.status, this.width() / 2, 50, 16777215);
+        this.drawCenteredString(dhl, this.font, this.status, this.width / 2, 50, 16777215);
         if (this.showDots) {
-            this.drawDots();
+            this.drawDots(dhl);
         }
         if (this.uploadStatus.bytesWritten != 0L && !this.cancelled) {
-            this.drawProgressBar();
-            this.drawUploadSpeed();
+            this.drawProgressBar(dhl);
+            this.drawUploadSpeed(dhl);
         }
         if (this.errorMessage != null) {
-            final String[] arr5 = this.errorMessage.split("\\\\n");
-            for (int integer3 = 0; integer3 < arr5.length; ++integer3) {
-                this.drawCenteredString(arr5[integer3], this.width() / 2, 110 + 12 * integer3, 16711680);
+            for (int integer4 = 0; integer4 < this.errorMessage.length; ++integer4) {
+                this.drawCenteredString(dhl, this.font, this.errorMessage[integer4], this.width / 2, 110 + 12 * integer4, 16711680);
             }
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
-    private void drawDots() {
-        final int integer2 = this.fontWidth(this.status);
-        if (this.animTick % 10 == 0) {
-            ++this.dotIndex;
-        }
-        this.drawString(RealmsUploadScreen.DOTS[this.dotIndex % RealmsUploadScreen.DOTS.length], this.width() / 2 + integer2 / 2 + 5, 50, 16777215);
+    private void drawDots(final PoseStack dhl) {
+        final int integer3 = this.font.width(this.status);
+        this.font.draw(dhl, RealmsUploadScreen.DOTS[this.tickCount / 10 % RealmsUploadScreen.DOTS.length], (float)(this.width / 2 + integer3 / 2 + 5), 50.0f, 16777215);
     }
     
-    private void drawProgressBar() {
-        double double2 = this.uploadStatus.bytesWritten / (double)this.uploadStatus.totalBytes * 100.0;
-        if (double2 > 100.0) {
-            double2 = 100.0;
+    private void drawProgressBar(final PoseStack dhl) {
+        double double3 = this.uploadStatus.bytesWritten / (double)this.uploadStatus.totalBytes * 100.0;
+        if (double3 > 100.0) {
+            double3 = 100.0;
         }
-        this.progress = String.format(Locale.ROOT, "%.1f", double2);
+        this.progress = String.format(Locale.ROOT, "%.1f", double3);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.disableTexture();
-        final double double3 = this.width() / 2 - 100;
-        final double double4 = 0.5;
-        final Tezzelator tezzelator8 = Tezzelator.instance;
-        tezzelator8.begin(7, RealmsDefaultVertexFormat.POSITION_COLOR);
-        tezzelator8.vertex(double3 - 0.5, 95.5, 0.0).color(217, 210, 210, 255).endVertex();
-        tezzelator8.vertex(double3 + 200.0 * double2 / 100.0 + 0.5, 95.5, 0.0).color(217, 210, 210, 255).endVertex();
-        tezzelator8.vertex(double3 + 200.0 * double2 / 100.0 + 0.5, 79.5, 0.0).color(217, 210, 210, 255).endVertex();
-        tezzelator8.vertex(double3 - 0.5, 79.5, 0.0).color(217, 210, 210, 255).endVertex();
-        tezzelator8.vertex(double3, 95.0, 0.0).color(128, 128, 128, 255).endVertex();
-        tezzelator8.vertex(double3 + 200.0 * double2 / 100.0, 95.0, 0.0).color(128, 128, 128, 255).endVertex();
-        tezzelator8.vertex(double3 + 200.0 * double2 / 100.0, 80.0, 0.0).color(128, 128, 128, 255).endVertex();
-        tezzelator8.vertex(double3, 80.0, 0.0).color(128, 128, 128, 255).endVertex();
-        tezzelator8.end();
+        final double double4 = this.width / 2 - 100;
+        final double double5 = 0.5;
+        final Tesselator dhn9 = Tesselator.getInstance();
+        final BufferBuilder dhg10 = dhn9.getBuilder();
+        dhg10.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        dhg10.vertex(double4 - 0.5, 95.5, 0.0).color(217, 210, 210, 255).endVertex();
+        dhg10.vertex(double4 + 200.0 * double3 / 100.0 + 0.5, 95.5, 0.0).color(217, 210, 210, 255).endVertex();
+        dhg10.vertex(double4 + 200.0 * double3 / 100.0 + 0.5, 79.5, 0.0).color(217, 210, 210, 255).endVertex();
+        dhg10.vertex(double4 - 0.5, 79.5, 0.0).color(217, 210, 210, 255).endVertex();
+        dhg10.vertex(double4, 95.0, 0.0).color(128, 128, 128, 255).endVertex();
+        dhg10.vertex(double4 + 200.0 * double3 / 100.0, 95.0, 0.0).color(128, 128, 128, 255).endVertex();
+        dhg10.vertex(double4 + 200.0 * double3 / 100.0, 80.0, 0.0).color(128, 128, 128, 255).endVertex();
+        dhg10.vertex(double4, 80.0, 0.0).color(128, 128, 128, 255).endVertex();
+        dhn9.end();
         RenderSystem.enableTexture();
-        this.drawCenteredString(this.progress + " %", this.width() / 2, 84, 16777215);
+        this.drawCenteredString(dhl, this.font, this.progress + " %", this.width / 2, 84, 16777215);
     }
     
-    private void drawUploadSpeed() {
-        if (this.animTick % 20 == 0) {
+    private void drawUploadSpeed(final PoseStack dhl) {
+        if (this.tickCount % 20 == 0) {
             if (this.previousWrittenBytes != null) {
-                long long2 = System.currentTimeMillis() - this.previousTimeSnapshot;
-                if (long2 == 0L) {
-                    long2 = 1L;
+                long long3 = Util.getMillis() - this.previousTimeSnapshot;
+                if (long3 == 0L) {
+                    long3 = 1L;
                 }
-                this.drawUploadSpeed0(this.bytesPersSecond = 1000L * (this.uploadStatus.bytesWritten - this.previousWrittenBytes) / long2);
+                this.drawUploadSpeed0(dhl, this.bytesPersSecond = 1000L * (this.uploadStatus.bytesWritten - this.previousWrittenBytes) / long3);
             }
             this.previousWrittenBytes = this.uploadStatus.bytesWritten;
-            this.previousTimeSnapshot = System.currentTimeMillis();
+            this.previousTimeSnapshot = Util.getMillis();
         }
         else {
-            this.drawUploadSpeed0(this.bytesPersSecond);
+            this.drawUploadSpeed0(dhl, this.bytesPersSecond);
         }
     }
     
-    private void drawUploadSpeed0(final long long1) {
-        if (long1 > 0L) {
-            final int integer4 = this.fontWidth(this.progress);
-            final String string5 = "(" + humanReadableByteCount(long1) + ")";
-            this.drawString(string5, this.width() / 2 + integer4 / 2 + 15, 84, 16777215);
+    private void drawUploadSpeed0(final PoseStack dhl, final long long2) {
+        if (long2 > 0L) {
+            final int integer5 = this.font.width(this.progress);
+            final String string6 = "(" + Unit.humanReadable(long2) + "/s)";
+            this.font.draw(dhl, string6, (float)(this.width / 2 + integer5 / 2 + 15), 84.0f, 16777215);
         }
     }
     
-    public static String humanReadableByteCount(final long long1) {
-        final int integer3 = 1024;
-        if (long1 < 1024L) {
-            return long1 + " B";
-        }
-        final int integer4 = (int)(Math.log((double)long1) / Math.log(1024.0));
-        final String string5 = "KMGTPE".charAt(integer4 - 1) + "";
-        return String.format(Locale.ROOT, "%.1f %sB/s", long1 / Math.pow(1024.0, integer4), string5);
-    }
-    
     @Override
     public void tick() {
         super.tick();
-        ++this.animTick;
+        ++this.tickCount;
         if (this.status != null && this.narrationRateLimiter.tryAcquire(1)) {
             final List<String> list2 = Lists.newArrayList();
-            list2.add(this.status);
+            list2.add(this.status.getString());
             if (this.progress != null) {
                 list2.add(this.progress + "%");
             }
             if (this.errorMessage != null) {
-                list2.add(this.errorMessage);
+                Stream.<Component>of(this.errorMessage).map(Component::getString).forEach(list2::add);
             }
-            Realms.narrateNow(String.join(System.lineSeparator(), list2));
+            NarrationHelper.now(String.join(System.lineSeparator(), list2));
         }
     }
     
-    public static Unit getLargestUnit(final long long1) {
-        if (long1 < 1024L) {
-            return Unit.B;
-        }
-        final int integer3 = (int)(Math.log((double)long1) / Math.log(1024.0));
-        final String string4 = "KMGTPE".charAt(integer3 - 1) + "";
-        try {
-            return Unit.valueOf(string4 + "B");
-        }
-        catch (Exception exception5) {
-            return Unit.GB;
-        }
-    }
-    
-    public static double convertToUnit(final long long1, final Unit a) {
-        if (a.equals(Unit.B)) {
-            return (double)long1;
-        }
-        return long1 / Math.pow(1024.0, a.ordinal());
-    }
-    
-    public static String humanReadableSize(final long long1, final Unit a) {
-        return String.format("%." + (a.equals(Unit.GB) ? "1" : "0") + "f %s", convertToUnit(long1, a), a.name());
-    }
-    
     private void upload() {
         this.uploadStarted = true;
         File file2;
-        final RealmsClient cyy3;
+        final RealmsClient dia3;
         final long long4;
-        UploadInfo uploadInfo6;
+        UploadInfo dja6;
         int integer7;
         File file3;
         long long5;
-        Unit a10;
-        Unit a11;
-        Unit a12;
-        FileUpload cyw8;
+        Unit dhw10;
+        Unit dhw11;
+        Unit dhw12;
+        Component[] errorMessage;
+        final TranslatableComponent translatableComponent;
+        final Object o;
+        final TranslatableComponent translatableComponent2;
+        final Object o2;
+        Component[] errorMessage2;
+        final TranslatableComponent translatableComponent3;
+        final Object o3;
+        final TranslatableComponent translatableComponent4;
+        final Object o4;
+        final TranslatableComponent status;
+        FileUpload dhy8;
         final long long6;
+        Component[] errorMessage3;
+        final Component component;
+        final Object o5;
+        Component[] errorMessage4;
+        final Component component2;
+        final Object o6;
+        Component[] errorMessage5;
+        final TranslatableComponent translatableComponent5;
+        final Object o7;
+        Component[] errorMessage6;
+        final TranslatableComponent translatableComponent6;
+        final Object o8;
         new Thread(() -> {
             file2 = null;
-            cyy3 = RealmsClient.createRealmsClient();
+            dia3 = RealmsClient.create();
             long4 = this.worldId;
             try {
-                if (!(!RealmsUploadScreen.uploadLock.tryLock(1L, TimeUnit.SECONDS))) {
-                    this.status = RealmsScreen.getLocalizedString("mco.upload.preparing");
-                    uploadInfo6 = null;
+                if (!(!RealmsUploadScreen.UPLOAD_LOCK.tryLock(1L, TimeUnit.SECONDS))) {
+                    this.status = new TranslatableComponent("mco.upload.preparing");
+                    dja6 = null;
                     integer7 = 0;
                     while (integer7 < 20) {
                         try {
@@ -296,66 +280,83 @@ public class RealmsUploadScreen extends RealmsScreen {
                                 return;
                             }
                             else {
-                                uploadInfo6 = cyy3.upload(long4, UploadTokenCache.get(long4));
+                                dja6 = dia3.upload(long4, UploadTokenCache.get(long4));
                             }
                         }
-                        catch (RetryCallException czh8) {
-                            Thread.sleep(czh8.delaySeconds * 1000);
+                        catch (RetryCallException dji8) {
+                            Thread.sleep(dji8.delaySeconds * 1000);
                             ++integer7;
                             continue;
                         }
                         break;
                     }
-                    if (uploadInfo6 == null) {
-                        this.status = RealmsScreen.getLocalizedString("mco.upload.close.failure");
+                    if (dja6 == null) {
+                        this.status = new TranslatableComponent("mco.upload.close.failure");
                     }
                     else {
-                        UploadTokenCache.put(long4, uploadInfo6.getToken());
-                        if (!uploadInfo6.isWorldClosed()) {
-                            this.status = RealmsScreen.getLocalizedString("mco.upload.close.failure");
+                        UploadTokenCache.put(long4, dja6.getToken());
+                        if (!dja6.isWorldClosed()) {
+                            this.status = new TranslatableComponent("mco.upload.close.failure");
                         }
                         else if (this.cancelled) {
                             this.uploadCancelled();
                         }
                         else {
-                            file3 = new File(Realms.getGameDirectoryPath(), "saves");
+                            file3 = new File(this.minecraft.gameDirectory.getAbsolutePath(), "saves");
                             file2 = this.tarGzipArchive(new File(file3, this.selectedLevel.getLevelId()));
                             if (this.cancelled) {
                                 this.uploadCancelled();
                             }
                             else if (!this.verify(file2)) {
                                 long5 = file2.length();
-                                a10 = getLargestUnit(long5);
-                                a11 = getLargestUnit(5368709120L);
-                                if (humanReadableSize(long5, a10).equals(humanReadableSize(5368709120L, a11)) && a10 != Unit.B) {
-                                    a12 = Unit.values()[a10.ordinal() - 1];
-                                    this.errorMessage = RealmsScreen.getLocalizedString("mco.upload.size.failure.line1", this.selectedLevel.getLevelName()) + "\\n" + RealmsScreen.getLocalizedString("mco.upload.size.failure.line2", humanReadableSize(long5, a12), humanReadableSize(5368709120L, a12));
+                                dhw10 = Unit.getLargest(long5);
+                                dhw11 = Unit.getLargest(5368709120L);
+                                if (Unit.humanReadable(long5, dhw10).equals(Unit.humanReadable(5368709120L, dhw11)) && dhw10 != Unit.B) {
+                                    dhw12 = Unit.values()[dhw10.ordinal() - 1];
+                                    errorMessage = new Component[2];
+                                    new TranslatableComponent("mco.upload.size.failure.line1", new Object[] { this.selectedLevel.getLevelName() });
+                                    errorMessage[o] = translatableComponent;
+                                    new TranslatableComponent("mco.upload.size.failure.line2", new Object[] { Unit.humanReadable(long5, dhw12), Unit.humanReadable(5368709120L, dhw12) });
+                                    errorMessage[o2] = translatableComponent2;
+                                    this.setErrorMessage(errorMessage);
                                 }
                                 else {
-                                    this.errorMessage = RealmsScreen.getLocalizedString("mco.upload.size.failure.line1", this.selectedLevel.getLevelName()) + "\\n" + RealmsScreen.getLocalizedString("mco.upload.size.failure.line2", humanReadableSize(long5, a10), humanReadableSize(5368709120L, a11));
+                                    errorMessage2 = new Component[2];
+                                    new TranslatableComponent("mco.upload.size.failure.line1", new Object[] { this.selectedLevel.getLevelName() });
+                                    errorMessage2[o3] = translatableComponent3;
+                                    new TranslatableComponent("mco.upload.size.failure.line2", new Object[] { Unit.humanReadable(long5, dhw10), Unit.humanReadable(5368709120L, dhw11) });
+                                    errorMessage2[o4] = translatableComponent4;
+                                    this.setErrorMessage(errorMessage2);
                                 }
                             }
                             else {
-                                this.status = RealmsScreen.getLocalizedString("mco.upload.uploading", this.selectedLevel.getLevelName());
-                                cyw8 = new FileUpload(file2, this.worldId, this.slotId, uploadInfo6, Realms.getSessionId(), Realms.getName(), Realms.getMinecraftVersionString(), this.uploadStatus);
-                                cyw8.upload(dap -> {
-                                    if (dap.statusCode >= 200 && dap.statusCode < 300) {
+                                new TranslatableComponent("mco.upload.uploading", new Object[] { this.selectedLevel.getLevelName() });
+                                this.status = status;
+                                dhy8 = new FileUpload(file2, this.worldId, this.slotId, dja6, this.minecraft.getUser(), SharedConstants.getCurrentVersion().getName(), this.uploadStatus);
+                                dhy8.upload(dkn -> {
+                                    if (dkn.statusCode >= 200 && dkn.statusCode < 300) {
                                         this.uploadFinished = true;
-                                        this.status = RealmsScreen.getLocalizedString("mco.upload.done");
-                                        this.backButton.setMessage(RealmsScreen.getLocalizedString("gui.done"));
+                                        this.status = new TranslatableComponent("mco.upload.done");
+                                        this.backButton.setMessage(CommonComponents.GUI_DONE);
                                         UploadTokenCache.invalidate(long6);
                                     }
-                                    else if (dap.statusCode == 400 && dap.errorMessage != null) {
-                                        this.errorMessage = RealmsScreen.getLocalizedString("mco.upload.failed", dap.errorMessage);
+                                    else if (dkn.statusCode == 400 && dkn.errorMessage != null) {
+                                        errorMessage3 = new Component[] { null };
+                                        new TranslatableComponent("mco.upload.failed", new Object[] { dkn.errorMessage });
+                                        errorMessage3[o5] = component;
+                                        this.setErrorMessage(errorMessage3);
                                     }
                                     else {
-                                        this.errorMessage = RealmsScreen.getLocalizedString("mco.upload.failed", dap.statusCode);
+                                        errorMessage4 = new Component[] { null };
+                                        new TranslatableComponent("mco.upload.failed", new Object[] { dkn.statusCode });
+                                        errorMessage4[o6] = component2;
+                                        this.setErrorMessage(errorMessage4);
                                     }
                                     return;
                                 });
-                                while (!cyw8.isFinished()) {
+                                while (!dhy8.isFinished()) {
                                     if (this.cancelled) {
-                                        cyw8.cancel();
+                                        dhy8.cancel();
                                         this.uploadCancelled();
                                     }
                                     else {
@@ -373,21 +374,27 @@ public class RealmsUploadScreen extends RealmsScreen {
                 }
             }
             catch (IOException iOException6) {
-                this.errorMessage = RealmsScreen.getLocalizedString("mco.upload.failed", iOException6.getMessage());
+                errorMessage5 = new Component[] { null };
+                new TranslatableComponent("mco.upload.failed", new Object[] { iOException6.getMessage() });
+                errorMessage5[o7] = translatableComponent5;
+                this.setErrorMessage(errorMessage5);
             }
-            catch (RealmsServiceException czg6) {
-                this.errorMessage = RealmsScreen.getLocalizedString("mco.upload.failed", czg6.toString());
+            catch (RealmsServiceException djh6) {
+                errorMessage6 = new Component[] { null };
+                new TranslatableComponent("mco.upload.failed", new Object[] { djh6.toString() });
+                errorMessage6[o8] = translatableComponent6;
+                this.setErrorMessage(errorMessage6);
             }
             catch (InterruptedException interruptedException10) {
                 RealmsUploadScreen.LOGGER.error("Could not acquire upload lock");
             }
             finally {
                 this.uploadFinished = true;
-                if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
-                    RealmsUploadScreen.uploadLock.unlock();
+                if (RealmsUploadScreen.UPLOAD_LOCK.isHeldByCurrentThread()) {
+                    RealmsUploadScreen.UPLOAD_LOCK.unlock();
                     this.showDots = false;
-                    this.childrenClear();
-                    this.buttonsAdd(this.backButton);
+                    this.children.clear();
+                    this.<Button>addButton(this.backButton);
                     if (file2 != null) {
                         RealmsUploadScreen.LOGGER.debug("Deleting file " + file2.getAbsolutePath());
                         file2.delete();
@@ -397,8 +404,12 @@ public class RealmsUploadScreen extends RealmsScreen {
         }).start();
     }
     
+    private void setErrorMessage(final Component... arr) {
+        this.errorMessage = arr;
+    }
+    
     private void uploadCancelled() {
-        this.status = RealmsScreen.getLocalizedString("mco.upload.cancelled");
+        this.status = new TranslatableComponent("mco.upload.cancelled");
         RealmsUploadScreen.LOGGER.debug("Upload was cancelled");
     }
     
@@ -448,14 +459,7 @@ public class RealmsUploadScreen extends RealmsScreen {
     
     static {
         LOGGER = LogManager.getLogger();
+        UPLOAD_LOCK = new ReentrantLock();
         DOTS = new String[] { "", ".", ". .", ". . ." };
-        uploadLock = new ReentrantLock();
-    }
-    
-    enum Unit {
-        B, 
-        KB, 
-        MB, 
-        GB;
     }
 }
diff --git a/src/com/mojang/realmsclient/gui/screens/UploadResult.java b/src/com/mojang/realmsclient/gui/screens/UploadResult.java
index a877a69..cb48579 100644
--- a/src/com/mojang/realmsclient/gui/screens/UploadResult.java
+++ b/src/com/mojang/realmsclient/gui/screens/UploadResult.java
@@ -4,7 +4,7 @@ public class UploadResult {
     public final int statusCode;
     public final String errorMessage;
     
-    public UploadResult(final int integer, final String string) {
+    private UploadResult(final int integer, final String string) {
         this.statusCode = integer;
         this.errorMessage = string;
     }
@@ -28,7 +28,7 @@ public class UploadResult {
         }
         
         public UploadResult build() {
-            return new UploadResult(this.statusCode, this.errorMessage);
+            return new UploadResult(this.statusCode, this.errorMessage, null);
         }
     }
 }
diff --git a/src/com/mojang/realmsclient/util/RealmsPersistence.java b/src/com/mojang/realmsclient/util/RealmsPersistence.java
index f164d05..bdece05 100644
--- a/src/com/mojang/realmsclient/util/RealmsPersistence.java
+++ b/src/com/mojang/realmsclient/util/RealmsPersistence.java
@@ -1,38 +1,47 @@
 package com.mojang.realmsclient.util;
 
+import com.google.gson.annotations.SerializedName;
+import net.minecraft.client.Minecraft;
+import com.mojang.realmsclient.dto.ReflectionBasedSerialization;
+import java.io.File;
 import java.io.IOException;
 import org.apache.commons.io.FileUtils;
-import com.google.gson.Gson;
-import java.io.File;
-import net.minecraft.realms.Realms;
+import java.nio.charset.StandardCharsets;
+import com.mojang.realmsclient.dto.GuardedSerializer;
 
 public class RealmsPersistence {
+    private static final GuardedSerializer GSON;
+    
     public static RealmsPersistenceData readFile() {
-        final File file1 = new File(Realms.getGameDirectoryPath(), "realms_persistence.json");
-        final Gson gson2 = new Gson();
+        final File file1 = getPathToData();
         try {
-            return gson2.<RealmsPersistenceData>fromJson(FileUtils.readFileToString(file1), RealmsPersistenceData.class);
+            return RealmsPersistence.GSON.<RealmsPersistenceData>fromJson(FileUtils.readFileToString(file1, StandardCharsets.UTF_8), RealmsPersistenceData.class);
         }
-        catch (IOException iOException3) {
+        catch (IOException iOException2) {
             return new RealmsPersistenceData();
         }
     }
     
     public static void writeFile(final RealmsPersistenceData a) {
-        final File file2 = new File(Realms.getGameDirectoryPath(), "realms_persistence.json");
-        final Gson gson3 = new Gson();
-        final String string4 = gson3.toJson(a);
+        final File file2 = getPathToData();
         try {
-            FileUtils.writeStringToFile(file2, string4);
+            FileUtils.writeStringToFile(file2, RealmsPersistence.GSON.toJson(a), StandardCharsets.UTF_8);
         }
         catch (IOException ex) {}
     }
     
-    public static class RealmsPersistenceData {
+    private static File getPathToData() {
+        return new File(Minecraft.getInstance().gameDirectory, "realms_persistence.json");
+    }
+    
+    static {
+        GSON = new GuardedSerializer();
+    }
+    
+    public static class RealmsPersistenceData implements ReflectionBasedSerialization {
+        @SerializedName("newsLink")
         public String newsLink;
+        @SerializedName("hasUnreadNews")
         public boolean hasUnreadNews;
-        
-        private RealmsPersistenceData() {
-        }
     }
 }
diff --git a/src/com/mojang/realmsclient/util/RealmsTasks.java b/src/com/mojang/realmsclient/util/RealmsTasks.java
deleted file mode 100644
index 173d3f3..0000000
--- a/src/com/mojang/realmsclient/util/RealmsTasks.java
+++ /dev/null
@@ -1,599 +0,0 @@
-package com.mojang.realmsclient.util;
-
-import com.mojang.realmsclient.dto.WorldDownload;
-import com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen;
-import com.mojang.realmsclient.dto.Backup;
-import java.io.UnsupportedEncodingException;
-import net.minecraft.realms.RealmsConnect;
-import com.mojang.realmsclient.dto.RealmsServerAddress;
-import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen;
-import com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen;
-import com.mojang.realmsclient.gui.screens.RealmsResourcePackScreen;
-import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen;
-import com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen;
-import com.mojang.realmsclient.gui.screens.RealmsTermsScreen;
-import java.io.IOException;
-import com.mojang.realmsclient.exception.RealmsServiceException;
-import java.util.concurrent.locks.ReentrantLock;
-import com.mojang.realmsclient.dto.WorldTemplate;
-import net.minecraft.realms.RealmsConfirmResultListener;
-import com.mojang.realmsclient.exception.RetryCallException;
-import net.minecraft.realms.Realms;
-import com.mojang.realmsclient.RealmsMainScreen;
-import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen;
-import com.mojang.realmsclient.client.RealmsClient;
-import net.minecraft.realms.RealmsScreen;
-import com.mojang.realmsclient.dto.RealmsServer;
-import com.mojang.realmsclient.gui.LongRunningTask;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class RealmsTasks {
-    private static final Logger LOGGER;
-    
-    private static void pause(final int integer) {
-        try {
-            Thread.sleep(integer * 1000);
-        }
-        catch (InterruptedException interruptedException2) {
-            RealmsTasks.LOGGER.error("", (Throwable)interruptedException2);
-        }
-    }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-    }
-    
-    public static class OpenServerTask extends LongRunningTask {
-        private final RealmsServer serverData;
-        private final RealmsScreen returnScreen;
-        private final boolean join;
-        private final RealmsScreen mainScreen;
-        
-        public OpenServerTask(final RealmsServer realmsServer, final RealmsScreen realmsScreen2, final RealmsScreen realmsScreen3, final boolean boolean4) {
-            this.serverData = realmsServer;
-            this.returnScreen = realmsScreen2;
-            this.join = boolean4;
-            this.mainScreen = realmsScreen3;
-        }
-        
-        @Override
-        public void run() {
-            this.setTitle(RealmsScreen.getLocalizedString("mco.configure.world.opening"));
-            final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-            for (int integer3 = 0; integer3 < 25; ++integer3) {
-                if (this.aborted()) {
-                    return;
-                }
-                try {
-                    final boolean boolean4 = cyy2.open(this.serverData.id);
-                    if (boolean4) {
-                        if (this.returnScreen instanceof RealmsConfigureWorldScreen) {
-                            ((RealmsConfigureWorldScreen)this.returnScreen).stateChanged();
-                        }
-                        this.serverData.state = RealmsServer.State.OPEN;
-                        if (this.join) {
-                            ((RealmsMainScreen)this.mainScreen).play(this.serverData, this.returnScreen);
-                            break;
-                        }
-                        Realms.setScreen(this.returnScreen);
-                        break;
-                    }
-                }
-                catch (RetryCallException czh4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    pause(czh4.delaySeconds);
-                }
-                catch (Exception exception4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    RealmsTasks.LOGGER.error("Failed to open server", (Throwable)exception4);
-                    this.error("Failed to open the server");
-                }
-            }
-        }
-    }
-    
-    public static class CloseServerTask extends LongRunningTask {
-        private final RealmsServer serverData;
-        private final RealmsConfigureWorldScreen configureScreen;
-        
-        public CloseServerTask(final RealmsServer realmsServer, final RealmsConfigureWorldScreen czs) {
-            this.serverData = realmsServer;
-            this.configureScreen = czs;
-        }
-        
-        @Override
-        public void run() {
-            this.setTitle(RealmsScreen.getLocalizedString("mco.configure.world.closing"));
-            final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-            for (int integer3 = 0; integer3 < 25; ++integer3) {
-                if (this.aborted()) {
-                    return;
-                }
-                try {
-                    final boolean boolean4 = cyy2.close(this.serverData.id);
-                    if (boolean4) {
-                        this.configureScreen.stateChanged();
-                        this.serverData.state = RealmsServer.State.CLOSED;
-                        Realms.setScreen(this.configureScreen);
-                        break;
-                    }
-                }
-                catch (RetryCallException czh4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    pause(czh4.delaySeconds);
-                }
-                catch (Exception exception4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    RealmsTasks.LOGGER.error("Failed to close server", (Throwable)exception4);
-                    this.error("Failed to close the server");
-                }
-            }
-        }
-    }
-    
-    public static class SwitchSlotTask extends LongRunningTask {
-        private final long worldId;
-        private final int slot;
-        private final RealmsConfirmResultListener listener;
-        private final int confirmId;
-        
-        public SwitchSlotTask(final long long1, final int integer2, final RealmsConfirmResultListener realmsConfirmResultListener, final int integer4) {
-            this.worldId = long1;
-            this.slot = integer2;
-            this.listener = realmsConfirmResultListener;
-            this.confirmId = integer4;
-        }
-        
-        @Override
-        public void run() {
-            final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-            final String string3 = RealmsScreen.getLocalizedString("mco.minigame.world.slot.screen.title");
-            this.setTitle(string3);
-            for (int integer4 = 0; integer4 < 25; ++integer4) {
-                try {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    if (cyy2.switchSlot(this.worldId, this.slot)) {
-                        this.listener.confirmResult(true, this.confirmId);
-                        break;
-                    }
-                }
-                catch (RetryCallException czh5) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    pause(czh5.delaySeconds);
-                }
-                catch (Exception exception5) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    RealmsTasks.LOGGER.error("Couldn't switch world!");
-                    this.error(exception5.toString());
-                }
-            }
-        }
-    }
-    
-    public static class SwitchMinigameTask extends LongRunningTask {
-        private final long worldId;
-        private final WorldTemplate worldTemplate;
-        private final RealmsConfigureWorldScreen lastScreen;
-        
-        public SwitchMinigameTask(final long long1, final WorldTemplate worldTemplate, final RealmsConfigureWorldScreen czs) {
-            this.worldId = long1;
-            this.worldTemplate = worldTemplate;
-            this.lastScreen = czs;
-        }
-        
-        @Override
-        public void run() {
-            final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-            final String string3 = RealmsScreen.getLocalizedString("mco.minigame.world.starting.screen.title");
-            this.setTitle(string3);
-            for (int integer4 = 0; integer4 < 25; ++integer4) {
-                try {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    if (cyy2.putIntoMinigameMode(this.worldId, this.worldTemplate.id)) {
-                        Realms.setScreen(this.lastScreen);
-                        break;
-                    }
-                }
-                catch (RetryCallException czh5) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    pause(czh5.delaySeconds);
-                }
-                catch (Exception exception5) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    RealmsTasks.LOGGER.error("Couldn't start mini game!");
-                    this.error(exception5.toString());
-                }
-            }
-        }
-    }
-    
-    public static class ResettingWorldTask extends LongRunningTask {
-        private final String seed;
-        private final WorldTemplate worldTemplate;
-        private final int levelType;
-        private final boolean generateStructures;
-        private final long serverId;
-        private final RealmsScreen lastScreen;
-        private int confirmationId;
-        private String title;
-        
-        public ResettingWorldTask(final long long1, final RealmsScreen realmsScreen, final WorldTemplate worldTemplate) {
-            this.confirmationId = -1;
-            this.title = RealmsScreen.getLocalizedString("mco.reset.world.resetting.screen.title");
-            this.seed = null;
-            this.worldTemplate = worldTemplate;
-            this.levelType = -1;
-            this.generateStructures = true;
-            this.serverId = long1;
-            this.lastScreen = realmsScreen;
-        }
-        
-        public ResettingWorldTask(final long long1, final RealmsScreen realmsScreen, final String string, final int integer, final boolean boolean5) {
-            this.confirmationId = -1;
-            this.title = RealmsScreen.getLocalizedString("mco.reset.world.resetting.screen.title");
-            this.seed = string;
-            this.worldTemplate = null;
-            this.levelType = integer;
-            this.generateStructures = boolean5;
-            this.serverId = long1;
-            this.lastScreen = realmsScreen;
-        }
-        
-        public void setConfirmationId(final int integer) {
-            this.confirmationId = integer;
-        }
-        
-        public void setResetTitle(final String string) {
-            this.title = string;
-        }
-        
-        @Override
-        public void run() {
-            final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-            this.setTitle(this.title);
-            for (int integer3 = 0; integer3 < 25; ++integer3) {
-                try {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    if (this.worldTemplate != null) {
-                        cyy2.resetWorldWithTemplate(this.serverId, this.worldTemplate.id);
-                    }
-                    else {
-                        cyy2.resetWorldWithSeed(this.serverId, this.seed, this.levelType, this.generateStructures);
-                    }
-                    if (this.aborted()) {
-                        return;
-                    }
-                    if (this.confirmationId == -1) {
-                        Realms.setScreen(this.lastScreen);
-                    }
-                    else {
-                        this.lastScreen.confirmResult(true, this.confirmationId);
-                    }
-                    return;
-                }
-                catch (RetryCallException czh4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    pause(czh4.delaySeconds);
-                }
-                catch (Exception exception4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    RealmsTasks.LOGGER.error("Couldn't reset world");
-                    this.error(exception4.toString());
-                    return;
-                }
-            }
-        }
-    }
-    
-    public static class RealmsGetServerDetailsTask extends LongRunningTask {
-        private final RealmsServer server;
-        private final RealmsScreen lastScreen;
-        private final RealmsMainScreen mainScreen;
-        private final ReentrantLock connectLock;
-        
-        public RealmsGetServerDetailsTask(final RealmsMainScreen cyu, final RealmsScreen realmsScreen, final RealmsServer realmsServer, final ReentrantLock reentrantLock) {
-            this.lastScreen = realmsScreen;
-            this.mainScreen = cyu;
-            this.server = realmsServer;
-            this.connectLock = reentrantLock;
-        }
-        
-        @Override
-        public void run() {
-            this.setTitle(RealmsScreen.getLocalizedString("mco.connect.connecting"));
-            final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-            boolean boolean3 = false;
-            boolean boolean4 = false;
-            int integer5 = 5;
-            RealmsServerAddress realmsServerAddress6 = null;
-            boolean boolean5 = false;
-            boolean boolean6 = false;
-            for (int integer6 = 0; integer6 < 40; ++integer6) {
-                if (this.aborted()) {
-                    break;
-                }
-                try {
-                    realmsServerAddress6 = cyy2.join(this.server.id);
-                    boolean3 = true;
-                }
-                catch (RetryCallException czh10) {
-                    integer5 = czh10.delaySeconds;
-                }
-                catch (RealmsServiceException czg10) {
-                    if (czg10.errorCode == 6002) {
-                        boolean5 = true;
-                        break;
-                    }
-                    if (czg10.errorCode == 6006) {
-                        boolean6 = true;
-                        break;
-                    }
-                    boolean4 = true;
-                    this.error(czg10.toString());
-                    RealmsTasks.LOGGER.error("Couldn't connect to world", (Throwable)czg10);
-                    break;
-                }
-                catch (IOException iOException10) {
-                    RealmsTasks.LOGGER.error("Couldn't parse response connecting to world", (Throwable)iOException10);
-                }
-                catch (Exception exception10) {
-                    boolean4 = true;
-                    RealmsTasks.LOGGER.error("Couldn't connect to world", (Throwable)exception10);
-                    this.error(exception10.getLocalizedMessage());
-                    break;
-                }
-                if (boolean3) {
-                    break;
-                }
-                this.sleep(integer5);
-            }
-            if (boolean5) {
-                Realms.setScreen(new RealmsTermsScreen(this.lastScreen, this.mainScreen, this.server));
-            }
-            else if (boolean6) {
-                if (this.server.ownerUUID.equals(Realms.getUUID())) {
-                    final RealmsBrokenWorldScreen czq9 = new RealmsBrokenWorldScreen(this.lastScreen, this.mainScreen, this.server.id);
-                    if (this.server.worldType.equals(RealmsServer.WorldType.MINIGAME)) {
-                        czq9.setTitle(RealmsScreen.getLocalizedString("mco.brokenworld.minigame.title"));
-                    }
-                    Realms.setScreen(czq9);
-                }
-                else {
-                    Realms.setScreen(new RealmsGenericErrorScreen(RealmsScreen.getLocalizedString("mco.brokenworld.nonowner.title"), RealmsScreen.getLocalizedString("mco.brokenworld.nonowner.error"), this.lastScreen));
-                }
-            }
-            else if (!this.aborted() && !boolean4) {
-                if (boolean3) {
-                    if (realmsServerAddress6.resourcePackUrl != null && realmsServerAddress6.resourcePackHash != null) {
-                        final String string9 = RealmsScreen.getLocalizedString("mco.configure.world.resourcepack.question.line1");
-                        final String string10 = RealmsScreen.getLocalizedString("mco.configure.world.resourcepack.question.line2");
-                        Realms.setScreen(new RealmsLongConfirmationScreen(new RealmsResourcePackScreen(this.lastScreen, realmsServerAddress6, this.connectLock), RealmsLongConfirmationScreen.Type.Info, string9, string10, true, 100));
-                    }
-                    else {
-                        final RealmsLongRunningMcoTaskScreen czz9 = new RealmsLongRunningMcoTaskScreen(this.lastScreen, new RealmsConnectTask(this.lastScreen, realmsServerAddress6));
-                        czz9.start();
-                        Realms.setScreen(czz9);
-                    }
-                }
-                else {
-                    this.error(RealmsScreen.getLocalizedString("mco.errorMessage.connectionFailure"));
-                }
-            }
-        }
-        
-        private void sleep(final int integer) {
-            try {
-                Thread.sleep(integer * 1000);
-            }
-            catch (InterruptedException interruptedException3) {
-                RealmsTasks.LOGGER.warn(interruptedException3.getLocalizedMessage());
-            }
-        }
-    }
-    
-    public static class RealmsConnectTask extends LongRunningTask {
-        private final RealmsConnect realmsConnect;
-        private final RealmsServerAddress a;
-        
-        public RealmsConnectTask(final RealmsScreen realmsScreen, final RealmsServerAddress realmsServerAddress) {
-            this.a = realmsServerAddress;
-            this.realmsConnect = new RealmsConnect(realmsScreen);
-        }
-        
-        @Override
-        public void run() {
-            this.setTitle(RealmsScreen.getLocalizedString("mco.connect.connecting"));
-            final net.minecraft.realms.RealmsServerAddress realmsServerAddress2 = net.minecraft.realms.RealmsServerAddress.parseString(this.a.address);
-            this.realmsConnect.connect(realmsServerAddress2.getHost(), realmsServerAddress2.getPort());
-        }
-        
-        @Override
-        public void abortTask() {
-            this.realmsConnect.abort();
-            Realms.clearResourcePack();
-        }
-        
-        @Override
-        public void tick() {
-            this.realmsConnect.tick();
-        }
-    }
-    
-    public static class WorldCreationTask extends LongRunningTask {
-        private final String name;
-        private final String motd;
-        private final long worldId;
-        private final RealmsScreen lastScreen;
-        
-        public WorldCreationTask(final long long1, final String string2, final String string3, final RealmsScreen realmsScreen) {
-            this.worldId = long1;
-            this.name = string2;
-            this.motd = string3;
-            this.lastScreen = realmsScreen;
-        }
-        
-        @Override
-        public void run() {
-            final String string2 = RealmsScreen.getLocalizedString("mco.create.world.wait");
-            this.setTitle(string2);
-            final RealmsClient cyy3 = RealmsClient.createRealmsClient();
-            try {
-                cyy3.initializeWorld(this.worldId, this.name, this.motd);
-                Realms.setScreen(this.lastScreen);
-            }
-            catch (RealmsServiceException czg4) {
-                RealmsTasks.LOGGER.error("Couldn't create world");
-                this.error(czg4.toString());
-            }
-            catch (UnsupportedEncodingException unsupportedEncodingException4) {
-                RealmsTasks.LOGGER.error("Couldn't create world");
-                this.error(unsupportedEncodingException4.getLocalizedMessage());
-            }
-            catch (IOException iOException4) {
-                RealmsTasks.LOGGER.error("Could not parse response creating world");
-                this.error(iOException4.getLocalizedMessage());
-            }
-            catch (Exception exception4) {
-                RealmsTasks.LOGGER.error("Could not create world");
-                this.error(exception4.getLocalizedMessage());
-            }
-        }
-    }
-    
-    public static class RestoreTask extends LongRunningTask {
-        private final Backup backup;
-        private final long worldId;
-        private final RealmsConfigureWorldScreen lastScreen;
-        
-        public RestoreTask(final Backup backup, final long long2, final RealmsConfigureWorldScreen czs) {
-            this.backup = backup;
-            this.worldId = long2;
-            this.lastScreen = czs;
-        }
-        
-        @Override
-        public void run() {
-            this.setTitle(RealmsScreen.getLocalizedString("mco.backup.restoring"));
-            final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-            for (int integer3 = 0; integer3 < 25; ++integer3) {
-                try {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    cyy2.restoreWorld(this.worldId, this.backup.backupId);
-                    pause(1);
-                    if (this.aborted()) {
-                        return;
-                    }
-                    Realms.setScreen(this.lastScreen.getNewScreen());
-                    return;
-                }
-                catch (RetryCallException czh4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    pause(czh4.delaySeconds);
-                }
-                catch (RealmsServiceException czg4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    RealmsTasks.LOGGER.error("Couldn't restore backup", (Throwable)czg4);
-                    Realms.setScreen(new RealmsGenericErrorScreen(czg4, this.lastScreen));
-                    return;
-                }
-                catch (Exception exception4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    RealmsTasks.LOGGER.error("Couldn't restore backup", (Throwable)exception4);
-                    this.error(exception4.getLocalizedMessage());
-                    return;
-                }
-            }
-        }
-    }
-    
-    public static class DownloadTask extends LongRunningTask {
-        private final long worldId;
-        private final int slot;
-        private final RealmsScreen lastScreen;
-        private final String downloadName;
-        
-        public DownloadTask(final long long1, final int integer, final String string, final RealmsScreen realmsScreen) {
-            this.worldId = long1;
-            this.slot = integer;
-            this.lastScreen = realmsScreen;
-            this.downloadName = string;
-        }
-        
-        @Override
-        public void run() {
-            this.setTitle(RealmsScreen.getLocalizedString("mco.download.preparing"));
-            final RealmsClient cyy2 = RealmsClient.createRealmsClient();
-            for (int integer3 = 0; integer3 < 25; ++integer3) {
-                try {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    final WorldDownload worldDownload4 = cyy2.download(this.worldId, this.slot);
-                    pause(1);
-                    if (this.aborted()) {
-                        return;
-                    }
-                    Realms.setScreen(new RealmsDownloadLatestWorldScreen(this.lastScreen, worldDownload4, this.downloadName));
-                    return;
-                }
-                catch (RetryCallException czh4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    pause(czh4.delaySeconds);
-                }
-                catch (RealmsServiceException czg4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    RealmsTasks.LOGGER.error("Couldn't download world data");
-                    Realms.setScreen(new RealmsGenericErrorScreen(czg4, this.lastScreen));
-                    return;
-                }
-                catch (Exception exception4) {
-                    if (this.aborted()) {
-                        return;
-                    }
-                    RealmsTasks.LOGGER.error("Couldn't download world data", (Throwable)exception4);
-                    this.error(exception4.getLocalizedMessage());
-                    return;
-                }
-            }
-        }
-    }
-}
diff --git a/src/com/mojang/realmsclient/util/RealmsTextureManager.java b/src/com/mojang/realmsclient/util/RealmsTextureManager.java
index d777fb1..568d7fe 100644
--- a/src/com/mojang/realmsclient/util/RealmsTextureManager.java
+++ b/src/com/mojang/realmsclient/util/RealmsTextureManager.java
@@ -17,26 +17,29 @@ import java.awt.image.RenderedImage;
 import java.io.ByteArrayOutputStream;
 import org.apache.commons.io.IOUtils;
 import javax.imageio.ImageIO;
-import net.minecraft.realms.Realms;
 import java.net.URL;
 import java.net.HttpURLConnection;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.util.UUIDTypeAdapter;
+import net.minecraft.client.resources.DefaultPlayerSkin;
 import java.util.UUID;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.realms.RealmsScreen;
+import net.minecraft.client.Minecraft;
+import javax.annotation.Nullable;
+import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
 import java.util.Map;
 
 public class RealmsTextureManager {
-    private static final Map<String, RealmsTexture> textures;
-    private static final Map<String, Boolean> skinFetchStatus;
-    private static final Map<String, String> fetchedSkins;
+    private static final Map<String, RealmsTexture> TEXTURES;
+    private static final Map<String, Boolean> SKIN_FETCH_STATUS;
+    private static final Map<String, String> FETCHED_SKINS;
     private static final Logger LOGGER;
+    private static final ResourceLocation TEMPLATE_ICON_LOCATION;
     
-    public static void bindWorldTemplate(final String string1, final String string2) {
+    public static void bindWorldTemplate(final String string1, @Nullable final String string2) {
         if (string2 == null) {
-            RealmsScreen.bind("textures/gui/presets/isles.png");
+            Minecraft.getInstance().getTextureManager().bind(RealmsTextureManager.TEMPLATE_ICON_LOCATION);
             return;
         }
         final int integer3 = getTextureId(string1, string2);
@@ -55,21 +58,21 @@ public class RealmsTextureManager {
     }
     
     private static void bindDefaultFace(final UUID uUID) {
-        RealmsScreen.bind(((uUID.hashCode() & 0x1) == 0x1) ? "minecraft:textures/entity/alex.png" : "minecraft:textures/entity/steve.png");
+        Minecraft.getInstance().getTextureManager().bind(DefaultPlayerSkin.getDefaultSkin(uUID));
     }
     
     private static void bindFace(final String string) {
         final UUID uUID2 = UUIDTypeAdapter.fromString(string);
-        if (RealmsTextureManager.textures.containsKey(string)) {
-            RenderSystem.bindTexture(RealmsTextureManager.textures.get(string).textureId);
+        if (RealmsTextureManager.TEXTURES.containsKey(string)) {
+            RenderSystem.bindTexture(RealmsTextureManager.TEXTURES.get(string).textureId);
             return;
         }
-        if (RealmsTextureManager.skinFetchStatus.containsKey(string)) {
-            if (!RealmsTextureManager.skinFetchStatus.get(string)) {
+        if (RealmsTextureManager.SKIN_FETCH_STATUS.containsKey(string)) {
+            if (!RealmsTextureManager.SKIN_FETCH_STATUS.get(string)) {
                 bindDefaultFace(uUID2);
             }
-            else if (RealmsTextureManager.fetchedSkins.containsKey(string)) {
-                final int integer3 = getTextureId(string, RealmsTextureManager.fetchedSkins.get(string));
+            else if (RealmsTextureManager.FETCHED_SKINS.containsKey(string)) {
+                final int integer3 = getTextureId(string, RealmsTextureManager.FETCHED_SKINS.get(string));
                 RenderSystem.bindTexture(integer3);
             }
             else {
@@ -77,7 +80,7 @@ public class RealmsTextureManager {
             }
             return;
         }
-        RealmsTextureManager.skinFetchStatus.put(string, false);
+        RealmsTextureManager.SKIN_FETCH_STATUS.put(string, false);
         bindDefaultFace(uUID2);
         final Thread thread3 = new Thread("Realms Texture Downloader") {
             @Override
@@ -89,12 +92,12 @@ public class RealmsTextureManager {
                     HttpURLConnection httpURLConnection5 = null;
                     RealmsTextureManager.LOGGER.debug("Downloading http texture from {}", string4);
                     try {
-                        httpURLConnection5 = (HttpURLConnection)new URL(string4).openConnection(Realms.getProxy());
+                        httpURLConnection5 = (HttpURLConnection)new URL(string4).openConnection(Minecraft.getInstance().getProxy());
                         httpURLConnection5.setDoInput(true);
                         httpURLConnection5.setDoOutput(false);
                         httpURLConnection5.connect();
                         if (httpURLConnection5.getResponseCode() / 100 != 2) {
-                            RealmsTextureManager.skinFetchStatus.remove(string);
+                            RealmsTextureManager.SKIN_FETCH_STATUS.remove(string);
                             return;
                         }
                         BufferedImage bufferedImage6;
@@ -102,7 +105,7 @@ public class RealmsTextureManager {
                             bufferedImage6 = ImageIO.read(httpURLConnection5.getInputStream());
                         }
                         catch (Exception exception7) {
-                            RealmsTextureManager.skinFetchStatus.remove(string);
+                            RealmsTextureManager.SKIN_FETCH_STATUS.remove(string);
                             return;
                         }
                         finally {
@@ -111,21 +114,22 @@ public class RealmsTextureManager {
                         bufferedImage6 = new SkinProcessor().process(bufferedImage6);
                         final ByteArrayOutputStream byteArrayOutputStream7 = new ByteArrayOutputStream();
                         ImageIO.write(bufferedImage6, "png", byteArrayOutputStream7);
-                        RealmsTextureManager.fetchedSkins.put(string, new Base64().encodeToString(byteArrayOutputStream7.toByteArray()));
-                        RealmsTextureManager.skinFetchStatus.put(string, true);
+                        RealmsTextureManager.FETCHED_SKINS.put(string, new Base64().encodeToString(byteArrayOutputStream7.toByteArray()));
+                        RealmsTextureManager.SKIN_FETCH_STATUS.put(string, true);
                     }
                     catch (Exception exception6) {
                         RealmsTextureManager.LOGGER.error("Couldn't download http texture", (Throwable)exception6);
-                        RealmsTextureManager.skinFetchStatus.remove(string);
+                        RealmsTextureManager.SKIN_FETCH_STATUS.remove(string);
                     }
                     finally {
                         if (httpURLConnection5 != null) {
                             httpURLConnection5.disconnect();
                         }
                     }
-                    return;
                 }
-                RealmsTextureManager.skinFetchStatus.put(string, true);
+                else {
+                    RealmsTextureManager.SKIN_FETCH_STATUS.put(string, true);
+                }
             }
         };
         thread3.setDaemon(true);
@@ -134,8 +138,8 @@ public class RealmsTextureManager {
     
     private static int getTextureId(final String string1, final String string2) {
         int integer3;
-        if (RealmsTextureManager.textures.containsKey(string1)) {
-            final RealmsTexture a4 = RealmsTextureManager.textures.get(string1);
+        if (RealmsTextureManager.TEXTURES.containsKey(string1)) {
+            final RealmsTexture a4 = RealmsTextureManager.TEXTURES.get(string1);
             if (a4.image.equals(string2)) {
                 return a4.textureId;
             }
@@ -171,20 +175,21 @@ public class RealmsTextureManager {
         RenderSystem.activeTexture(33984);
         RenderSystem.bindTexture(integer3);
         TextureUtil.initTexture(intBuffer4, integer4, integer5);
-        RealmsTextureManager.textures.put(string1, new RealmsTexture(string2, integer3));
+        RealmsTextureManager.TEXTURES.put(string1, new RealmsTexture(string2, integer3));
         return integer3;
     }
     
     static {
-        textures = Maps.newHashMap();
-        skinFetchStatus = Maps.newHashMap();
-        fetchedSkins = Maps.newHashMap();
+        TEXTURES = Maps.newHashMap();
+        SKIN_FETCH_STATUS = Maps.newHashMap();
+        FETCHED_SKINS = Maps.newHashMap();
         LOGGER = LogManager.getLogger();
+        TEMPLATE_ICON_LOCATION = new ResourceLocation("textures/gui/presets/isles.png");
     }
     
     public static class RealmsTexture {
-        String image;
-        int textureId;
+        private final String image;
+        private final int textureId;
         
         public RealmsTexture(final String string, final int integer) {
             this.image = string;
diff --git a/src/com/mojang/realmsclient/util/RealmsUtil.java b/src/com/mojang/realmsclient/util/RealmsUtil.java
index dc348ad..d7175fd 100644
--- a/src/com/mojang/realmsclient/util/RealmsUtil.java
+++ b/src/com/mojang/realmsclient/util/RealmsUtil.java
@@ -5,7 +5,8 @@ import com.google.common.cache.CacheLoader;
 import java.util.concurrent.TimeUnit;
 import com.google.common.cache.CacheBuilder;
 import java.util.UUID;
-import net.minecraft.realms.Realms;
+import net.minecraft.client.Minecraft;
+import java.util.Date;
 import com.google.common.collect.Maps;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import java.util.Map;
@@ -15,8 +16,8 @@ import com.mojang.authlib.minecraft.MinecraftSessionService;
 import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
 
 public class RealmsUtil {
-    private static final YggdrasilAuthenticationService authenticationService;
-    private static final MinecraftSessionService sessionService;
+    private static final YggdrasilAuthenticationService AUTHENTICATION_SERVICE;
+    private static final MinecraftSessionService SESSION_SERVICE;
     public static LoadingCache<String, GameProfile> gameProfileCache;
     
     public static String uuidToName(final String string) throws Exception {
@@ -27,18 +28,14 @@ public class RealmsUtil {
     public static Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> getTextures(final String string) {
         try {
             final GameProfile gameProfile2 = RealmsUtil.gameProfileCache.get(string);
-            return (Map<MinecraftProfileTexture.Type, MinecraftProfileTexture>)RealmsUtil.sessionService.getTextures(gameProfile2, false);
+            return (Map<MinecraftProfileTexture.Type, MinecraftProfileTexture>)RealmsUtil.SESSION_SERVICE.getTextures(gameProfile2, false);
         }
         catch (Exception exception2) {
             return Maps.newHashMap();
         }
     }
     
-    public static void browseTo(final String string) {
-        Realms.openUri(string);
-    }
-    
-    public static String convertToAgePresentation(final Long long1) {
+    public static String convertToAgePresentation(final long long1) {
         if (long1 < 0L) {
             return "right now";
         }
@@ -58,13 +55,17 @@ public class RealmsUtil {
         return ((long3 == 1L) ? "1 day" : (long3 + " days")) + " ago";
     }
     
+    public static String convertToAgePresentationFromInstant(final Date date) {
+        return convertToAgePresentation(System.currentTimeMillis() - date.getTime());
+    }
+    
     static {
-        authenticationService = new YggdrasilAuthenticationService(Realms.getProxy(), UUID.randomUUID().toString());
-        sessionService = RealmsUtil.authenticationService.createMinecraftSessionService();
+        AUTHENTICATION_SERVICE = new YggdrasilAuthenticationService(Minecraft.getInstance().getProxy(), UUID.randomUUID().toString());
+        SESSION_SERVICE = RealmsUtil.AUTHENTICATION_SERVICE.createMinecraftSessionService();
         RealmsUtil.gameProfileCache = CacheBuilder.newBuilder().expireAfterWrite(60L, TimeUnit.MINUTES).<String, GameProfile>build(new CacheLoader<String, GameProfile>() {
             @Override
             public GameProfile load(final String string) throws Exception {
-                final GameProfile gameProfile3 = RealmsUtil.sessionService.fillProfileProperties(new GameProfile(UUIDTypeAdapter.fromString(string), (String)null), false);
+                final GameProfile gameProfile3 = RealmsUtil.SESSION_SERVICE.fillProfileProperties(new GameProfile(UUIDTypeAdapter.fromString(string), (String)null), false);
                 if (gameProfile3 == null) {
                     throw new Exception("Couldn't get profile");
                 }
diff --git a/src/com/mojang/realmsclient/util/TextRenderingUtils.java b/src/com/mojang/realmsclient/util/TextRenderingUtils.java
index 687bbcb..e00c2c5 100644
--- a/src/com/mojang/realmsclient/util/TextRenderingUtils.java
+++ b/src/com/mojang/realmsclient/util/TextRenderingUtils.java
@@ -3,11 +3,13 @@ package com.mojang.realmsclient.util;
 import java.util.Objects;
 import java.util.Iterator;
 import com.google.common.collect.Lists;
+import com.google.common.annotations.VisibleForTesting;
 import java.util.Arrays;
 import java.util.List;
 
 public class TextRenderingUtils {
-    static List<String> lineBreak(final String string) {
+    @VisibleForTesting
+    protected static List<String> lineBreak(final String string) {
         return Arrays.<String>asList(string.split("\\n"));
     }
     
@@ -27,7 +29,7 @@ public class TextRenderingUtils {
             final List<LineSegment> list4 = Lists.newArrayList();
             final List<String> list5 = split(string6, "%link");
             for (final String string7 : list5) {
-                if (string7.equals("%link")) {
+                if ("%link".equals(string7)) {
                     list4.add(list2.get(integer3++));
                 }
                 else {
@@ -89,9 +91,9 @@ public class TextRenderingUtils {
     }
     
     public static class LineSegment {
-        final String fullText;
-        final String linkTitle;
-        final String linkUrl;
+        private final String fullText;
+        private final String linkTitle;
+        private final String linkUrl;
         
         private LineSegment(final String string) {
             this.fullText = string;
@@ -146,7 +148,8 @@ public class TextRenderingUtils {
             return new LineSegment(null, string1, string2);
         }
         
-        static LineSegment text(final String string) {
+        @VisibleForTesting
+        protected static LineSegment text(final String string) {
             return new LineSegment(string);
         }
     }
diff --git a/src/com/mojang/realmsclient/util/UploadTokenCache.java b/src/com/mojang/realmsclient/util/UploadTokenCache.java
index 95cd612..1e5502d 100644
--- a/src/com/mojang/realmsclient/util/UploadTokenCache.java
+++ b/src/com/mojang/realmsclient/util/UploadTokenCache.java
@@ -1,24 +1,24 @@
 package com.mojang.realmsclient.util;
 
-import com.google.common.collect.Maps;
-import java.util.Map;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 
 public class UploadTokenCache {
-    private static final Map<Long, String> tokenCache;
+    private static final Long2ObjectMap<String> TOKEN_CACHE;
     
     public static String get(final long long1) {
-        return UploadTokenCache.tokenCache.get(long1);
+        return (String)UploadTokenCache.TOKEN_CACHE.get(long1);
     }
     
     public static void invalidate(final long long1) {
-        UploadTokenCache.tokenCache.remove(long1);
+        UploadTokenCache.TOKEN_CACHE.remove(long1);
     }
     
     public static void put(final long long1, final String string) {
-        UploadTokenCache.tokenCache.put(long1, string);
+        UploadTokenCache.TOKEN_CACHE.put(long1, string);
     }
     
     static {
-        tokenCache = Maps.newHashMap();
+        TOKEN_CACHE = (Long2ObjectMap)new Long2ObjectOpenHashMap();
     }
 }
diff --git a/src/com/mojang/realmsclient/util/task/CloseServerTask.java b/src/com/mojang/realmsclient/util/task/CloseServerTask.java
new file mode 100644
index 0000000..0a1890b
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/CloseServerTask.java
@@ -0,0 +1,51 @@
+package com.mojang.realmsclient.util.task;
+
+import com.mojang.realmsclient.exception.RetryCallException;
+import net.minecraft.client.gui.screens.Screen;
+import com.mojang.realmsclient.client.RealmsClient;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen;
+import com.mojang.realmsclient.dto.RealmsServer;
+
+public class CloseServerTask extends LongRunningTask {
+    private final RealmsServer serverData;
+    private final RealmsConfigureWorldScreen configureScreen;
+    
+    public CloseServerTask(final RealmsServer dip, final RealmsConfigureWorldScreen djr) {
+        this.serverData = dip;
+        this.configureScreen = djr;
+    }
+    
+    @Override
+    public void run() {
+        this.setTitle(I18n.get("mco.configure.world.closing"));
+        final RealmsClient dia2 = RealmsClient.create();
+        for (int integer3 = 0; integer3 < 25; ++integer3) {
+            if (this.aborted()) {
+                return;
+            }
+            try {
+                final boolean boolean4 = dia2.close(this.serverData.id);
+                if (boolean4) {
+                    this.configureScreen.stateChanged();
+                    this.serverData.state = RealmsServer.State.CLOSED;
+                    LongRunningTask.setScreen(this.configureScreen);
+                    break;
+                }
+            }
+            catch (RetryCallException dji4) {
+                if (this.aborted()) {
+                    return;
+                }
+                LongRunningTask.pause(dji4.delaySeconds);
+            }
+            catch (Exception exception4) {
+                if (this.aborted()) {
+                    return;
+                }
+                CloseServerTask.LOGGER.error("Failed to close server", (Throwable)exception4);
+                this.error("Failed to close the server");
+            }
+        }
+    }
+}
diff --git a/src/com/mojang/realmsclient/util/task/ConnectTask.java b/src/com/mojang/realmsclient/util/task/ConnectTask.java
new file mode 100644
index 0000000..48c3b2c
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/ConnectTask.java
@@ -0,0 +1,35 @@
+package com.mojang.realmsclient.util.task;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.gui.screens.Screen;
+import com.mojang.realmsclient.dto.RealmsServerAddress;
+import net.minecraft.realms.RealmsConnect;
+
+public class ConnectTask extends LongRunningTask {
+    private final RealmsConnect realmsConnect;
+    private final RealmsServerAddress address;
+    
+    public ConnectTask(final Screen dqs, final RealmsServerAddress diq) {
+        this.address = diq;
+        this.realmsConnect = new RealmsConnect(dqs);
+    }
+    
+    @Override
+    public void run() {
+        this.setTitle(I18n.get("mco.connect.connecting"));
+        final net.minecraft.realms.RealmsServerAddress eqi2 = net.minecraft.realms.RealmsServerAddress.parseString(this.address.address);
+        this.realmsConnect.connect(eqi2.getHost(), eqi2.getPort());
+    }
+    
+    @Override
+    public void abortTask() {
+        this.realmsConnect.abort();
+        Minecraft.getInstance().getClientPackSource().clearServerPack();
+    }
+    
+    @Override
+    public void tick() {
+        this.realmsConnect.tick();
+    }
+}
diff --git a/src/com/mojang/realmsclient/util/task/DownloadTask.java b/src/com/mojang/realmsclient/util/task/DownloadTask.java
new file mode 100644
index 0000000..82e30a9
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/DownloadTask.java
@@ -0,0 +1,66 @@
+package com.mojang.realmsclient.util.task;
+
+import com.mojang.realmsclient.dto.WorldDownload;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen;
+import com.mojang.realmsclient.exception.RetryCallException;
+import com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen;
+import com.mojang.realmsclient.client.RealmsClient;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.gui.screens.Screen;
+
+public class DownloadTask extends LongRunningTask {
+    private final long worldId;
+    private final int slot;
+    private final Screen lastScreen;
+    private final String downloadName;
+    
+    public DownloadTask(final long long1, final int integer, final String string, final Screen dqs) {
+        this.worldId = long1;
+        this.slot = integer;
+        this.lastScreen = dqs;
+        this.downloadName = string;
+    }
+    
+    @Override
+    public void run() {
+        this.setTitle(I18n.get("mco.download.preparing"));
+        final RealmsClient dia2 = RealmsClient.create();
+        for (int integer3 = 0; integer3 < 25; ++integer3) {
+            try {
+                if (this.aborted()) {
+                    return;
+                }
+                final WorldDownload djc4 = dia2.download(this.worldId, this.slot);
+                LongRunningTask.pause(1);
+                if (this.aborted()) {
+                    return;
+                }
+                LongRunningTask.setScreen(new RealmsDownloadLatestWorldScreen(this.lastScreen, djc4, this.downloadName, boolean1 -> {}));
+                return;
+            }
+            catch (RetryCallException dji4) {
+                if (this.aborted()) {
+                    return;
+                }
+                LongRunningTask.pause(dji4.delaySeconds);
+            }
+            catch (RealmsServiceException djh4) {
+                if (this.aborted()) {
+                    return;
+                }
+                DownloadTask.LOGGER.error("Couldn't download world data");
+                LongRunningTask.setScreen(new RealmsGenericErrorScreen(djh4, this.lastScreen));
+                return;
+            }
+            catch (Exception exception4) {
+                if (this.aborted()) {
+                    return;
+                }
+                DownloadTask.LOGGER.error("Couldn't download world data", (Throwable)exception4);
+                this.error(exception4.getLocalizedMessage());
+                return;
+            }
+        }
+    }
+}
diff --git a/src/com/mojang/realmsclient/util/task/GetServerDetailsTask.java b/src/com/mojang/realmsclient/util/task/GetServerDetailsTask.java
new file mode 100644
index 0000000..5a2fcec
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/GetServerDetailsTask.java
@@ -0,0 +1,150 @@
+package com.mojang.realmsclient.util.task;
+
+import java.util.function.Function;
+import net.minecraft.network.chat.TextComponent;
+import com.mojang.realmsclient.dto.RealmsServerAddress;
+import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen;
+import com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen;
+import net.minecraft.network.chat.Component;
+import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen;
+import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.realmsclient.gui.screens.RealmsBrokenWorldScreen;
+import net.minecraft.client.Minecraft;
+import com.mojang.realmsclient.gui.screens.RealmsTermsScreen;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.exception.RetryCallException;
+import com.mojang.realmsclient.client.RealmsClient;
+import net.minecraft.client.resources.language.I18n;
+import java.util.concurrent.locks.ReentrantLock;
+import com.mojang.realmsclient.RealmsMainScreen;
+import net.minecraft.client.gui.screens.Screen;
+import com.mojang.realmsclient.dto.RealmsServer;
+
+public class GetServerDetailsTask extends LongRunningTask {
+    private final RealmsServer server;
+    private final Screen lastScreen;
+    private final RealmsMainScreen mainScreen;
+    private final ReentrantLock connectLock;
+    
+    public GetServerDetailsTask(final RealmsMainScreen dhv, final Screen dqs, final RealmsServer dip, final ReentrantLock reentrantLock) {
+        this.lastScreen = dqs;
+        this.mainScreen = dhv;
+        this.server = dip;
+        this.connectLock = reentrantLock;
+    }
+    
+    @Override
+    public void run() {
+        this.setTitle(I18n.get("mco.connect.connecting"));
+        final RealmsClient dia2 = RealmsClient.create();
+        boolean boolean3 = false;
+        boolean boolean4 = false;
+        int integer5 = 5;
+        RealmsServerAddress diq6 = null;
+        boolean boolean5 = false;
+        boolean boolean6 = false;
+        for (int integer6 = 0; integer6 < 40; ++integer6) {
+            if (this.aborted()) {
+                break;
+            }
+            try {
+                diq6 = dia2.join(this.server.id);
+                boolean3 = true;
+            }
+            catch (RetryCallException dji10) {
+                integer5 = dji10.delaySeconds;
+            }
+            catch (RealmsServiceException djh10) {
+                if (djh10.errorCode == 6002) {
+                    boolean5 = true;
+                    break;
+                }
+                if (djh10.errorCode == 6006) {
+                    boolean6 = true;
+                    break;
+                }
+                boolean4 = true;
+                this.error(djh10.toString());
+                GetServerDetailsTask.LOGGER.error("Couldn't connect to world", (Throwable)djh10);
+                break;
+            }
+            catch (Exception exception10) {
+                boolean4 = true;
+                GetServerDetailsTask.LOGGER.error("Couldn't connect to world", (Throwable)exception10);
+                this.error(exception10.getLocalizedMessage());
+                break;
+            }
+            if (boolean3) {
+                break;
+            }
+            this.sleep(integer5);
+        }
+        if (boolean5) {
+            LongRunningTask.setScreen(new RealmsTermsScreen(this.lastScreen, this.mainScreen, this.server));
+        }
+        else if (boolean6) {
+            if (this.server.ownerUUID.equals(Minecraft.getInstance().getUser().getUuid())) {
+                LongRunningTask.setScreen(new RealmsBrokenWorldScreen(this.lastScreen, this.mainScreen, this.server.id, this.server.worldType == RealmsServer.WorldType.MINIGAME));
+            }
+            else {
+                LongRunningTask.setScreen(new RealmsGenericErrorScreen(new TranslatableComponent("mco.brokenworld.nonowner.title"), new TranslatableComponent("mco.brokenworld.nonowner.error"), this.lastScreen));
+            }
+        }
+        else if (!this.aborted() && !boolean4) {
+            if (boolean3) {
+                final RealmsServerAddress diq7 = diq6;
+                if (diq7.resourcePackUrl != null && diq7.resourcePackHash != null) {
+                    final Component mr10 = new TranslatableComponent("mco.configure.world.resourcepack.question.line1");
+                    final Component mr11 = new TranslatableComponent("mco.configure.world.resourcepack.question.line2");
+                    LongRunningTask.setScreen(new RealmsLongConfirmationScreen(boolean2 -> {
+                        try {
+                            if (boolean2) {
+                                final RealmsGenericErrorScreen screen;
+                                final Function<Throwable, Void> function4 = (Function<Throwable, Void>)(throwable -> {
+                                    Minecraft.getInstance().getClientPackSource().clearServerPack();
+                                    GetServerDetailsTask.LOGGER.error(throwable);
+                                    new RealmsGenericErrorScreen(new TextComponent("Failed to download resource pack!"), this.lastScreen);
+                                    LongRunningTask.setScreen(screen);
+                                    return null;
+                                });
+                                try {
+                                    final RealmsLongRunningMcoTaskScreen screen2;
+                                    Minecraft.getInstance().getClientPackSource().downloadAndSelectResourcePack(diq7.resourcePackUrl, diq7.resourcePackHash).thenRun(() -> {
+                                        new RealmsLongRunningMcoTaskScreen(this.lastScreen, new ConnectTask(this.lastScreen, diq7));
+                                        this.setScreen(screen2);
+                                    }).exceptionally(function4);
+                                }
+                                catch (Exception exception5) {
+                                    function4.apply(exception5);
+                                }
+                            }
+                            else {
+                                LongRunningTask.setScreen(this.lastScreen);
+                            }
+                        }
+                        finally {
+                            if (this.connectLock != null && this.connectLock.isHeldByCurrentThread()) {
+                                this.connectLock.unlock();
+                            }
+                        }
+                    }, RealmsLongConfirmationScreen.Type.Info, mr10, mr11, true));
+                }
+                else {
+                    this.setScreen(new RealmsLongRunningMcoTaskScreen(this.lastScreen, new ConnectTask(this.lastScreen, diq7)));
+                }
+            }
+            else {
+                this.error(new TranslatableComponent("mco.errorMessage.connectionFailure"));
+            }
+        }
+    }
+    
+    private void sleep(final int integer) {
+        try {
+            Thread.sleep(integer * 1000);
+        }
+        catch (InterruptedException interruptedException3) {
+            GetServerDetailsTask.LOGGER.warn(interruptedException3.getLocalizedMessage());
+        }
+    }
+}
diff --git a/src/com/mojang/realmsclient/util/task/LongRunningTask.java b/src/com/mojang/realmsclient/util/task/LongRunningTask.java
new file mode 100644
index 0000000..9d44e55
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/LongRunningTask.java
@@ -0,0 +1,58 @@
+package com.mojang.realmsclient.util.task;
+
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.network.chat.Component;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
+import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen;
+import org.apache.logging.log4j.Logger;
+import com.mojang.realmsclient.gui.ErrorCallback;
+
+public abstract class LongRunningTask implements ErrorCallback, Runnable {
+    public static final Logger LOGGER;
+    protected RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen;
+    
+    protected static void pause(final int integer) {
+        try {
+            Thread.sleep(integer * 1000);
+        }
+        catch (InterruptedException interruptedException2) {
+            LongRunningTask.LOGGER.error("", (Throwable)interruptedException2);
+        }
+    }
+    
+    public static void setScreen(final Screen dqs) {
+        final Minecraft dlx2 = Minecraft.getInstance();
+        dlx2.execute(() -> dlx2.setScreen(dqs));
+    }
+    
+    public void setScreen(final RealmsLongRunningMcoTaskScreen djy) {
+        this.longRunningMcoTaskScreen = djy;
+    }
+    
+    @Override
+    public void error(final Component mr) {
+        this.longRunningMcoTaskScreen.error(mr);
+    }
+    
+    public void setTitle(final String string) {
+        this.longRunningMcoTaskScreen.setTitle(string);
+    }
+    
+    public boolean aborted() {
+        return this.longRunningMcoTaskScreen.aborted();
+    }
+    
+    public void tick() {
+    }
+    
+    public void init() {
+    }
+    
+    public void abortTask() {
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+}
diff --git a/src/com/mojang/realmsclient/util/task/OpenServerTask.java b/src/com/mojang/realmsclient/util/task/OpenServerTask.java
new file mode 100644
index 0000000..fb90d3a
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/OpenServerTask.java
@@ -0,0 +1,62 @@
+package com.mojang.realmsclient.util.task;
+
+import com.mojang.realmsclient.exception.RetryCallException;
+import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen;
+import com.mojang.realmsclient.client.RealmsClient;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.realmsclient.RealmsMainScreen;
+import net.minecraft.client.gui.screens.Screen;
+import com.mojang.realmsclient.dto.RealmsServer;
+
+public class OpenServerTask extends LongRunningTask {
+    private final RealmsServer serverData;
+    private final Screen returnScreen;
+    private final boolean join;
+    private final RealmsMainScreen mainScreen;
+    
+    public OpenServerTask(final RealmsServer dip, final Screen dqs, final RealmsMainScreen dhv, final boolean boolean4) {
+        this.serverData = dip;
+        this.returnScreen = dqs;
+        this.join = boolean4;
+        this.mainScreen = dhv;
+    }
+    
+    @Override
+    public void run() {
+        this.setTitle(I18n.get("mco.configure.world.opening"));
+        final RealmsClient dia2 = RealmsClient.create();
+        for (int integer3 = 0; integer3 < 25; ++integer3) {
+            if (this.aborted()) {
+                return;
+            }
+            try {
+                final boolean boolean4 = dia2.open(this.serverData.id);
+                if (boolean4) {
+                    if (this.returnScreen instanceof RealmsConfigureWorldScreen) {
+                        ((RealmsConfigureWorldScreen)this.returnScreen).stateChanged();
+                    }
+                    this.serverData.state = RealmsServer.State.OPEN;
+                    if (this.join) {
+                        this.mainScreen.play(this.serverData, this.returnScreen);
+                        break;
+                    }
+                    LongRunningTask.setScreen(this.returnScreen);
+                    break;
+                }
+            }
+            catch (RetryCallException dji4) {
+                if (this.aborted()) {
+                    return;
+                }
+                LongRunningTask.pause(dji4.delaySeconds);
+            }
+            catch (Exception exception4) {
+                if (this.aborted()) {
+                    return;
+                }
+                OpenServerTask.LOGGER.error("Failed to open server", (Throwable)exception4);
+                this.error("Failed to open the server");
+            }
+        }
+    }
+}
diff --git a/src/com/mojang/realmsclient/util/task/ResettingWorldTask.java b/src/com/mojang/realmsclient/util/task/ResettingWorldTask.java
new file mode 100644
index 0000000..79b1920
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/ResettingWorldTask.java
@@ -0,0 +1,68 @@
+package com.mojang.realmsclient.util.task;
+
+import com.mojang.realmsclient.exception.RetryCallException;
+import com.mojang.realmsclient.client.RealmsClient;
+import net.minecraft.client.resources.language.I18n;
+import javax.annotation.Nullable;
+import com.mojang.realmsclient.dto.WorldTemplate;
+
+public class ResettingWorldTask extends LongRunningTask {
+    private final String seed;
+    private final WorldTemplate worldTemplate;
+    private final int levelType;
+    private final boolean generateStructures;
+    private final long serverId;
+    private String title;
+    private final Runnable callback;
+    
+    public ResettingWorldTask(@Nullable final String string1, @Nullable final WorldTemplate djd, final int integer, final boolean boolean4, final long long5, @Nullable final String string6, final Runnable runnable) {
+        this.title = I18n.get("mco.reset.world.resetting.screen.title");
+        this.seed = string1;
+        this.worldTemplate = djd;
+        this.levelType = integer;
+        this.generateStructures = boolean4;
+        this.serverId = long5;
+        if (string6 != null) {
+            this.title = string6;
+        }
+        this.callback = runnable;
+    }
+    
+    @Override
+    public void run() {
+        final RealmsClient dia2 = RealmsClient.create();
+        this.setTitle(this.title);
+        for (int integer3 = 0; integer3 < 25; ++integer3) {
+            try {
+                if (this.aborted()) {
+                    return;
+                }
+                if (this.worldTemplate != null) {
+                    dia2.resetWorldWithTemplate(this.serverId, this.worldTemplate.id);
+                }
+                else {
+                    dia2.resetWorldWithSeed(this.serverId, this.seed, this.levelType, this.generateStructures);
+                }
+                if (this.aborted()) {
+                    return;
+                }
+                this.callback.run();
+                return;
+            }
+            catch (RetryCallException dji4) {
+                if (this.aborted()) {
+                    return;
+                }
+                LongRunningTask.pause(dji4.delaySeconds);
+            }
+            catch (Exception exception4) {
+                if (this.aborted()) {
+                    return;
+                }
+                ResettingWorldTask.LOGGER.error("Couldn't reset world");
+                this.error(exception4.toString());
+                return;
+            }
+        }
+    }
+}
diff --git a/src/com/mojang/realmsclient/util/task/RestoreTask.java b/src/com/mojang/realmsclient/util/task/RestoreTask.java
new file mode 100644
index 0000000..7b0ead5
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/RestoreTask.java
@@ -0,0 +1,64 @@
+package com.mojang.realmsclient.util.task;
+
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen;
+import com.mojang.realmsclient.exception.RetryCallException;
+import net.minecraft.client.gui.screens.Screen;
+import com.mojang.realmsclient.client.RealmsClient;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen;
+import com.mojang.realmsclient.dto.Backup;
+
+public class RestoreTask extends LongRunningTask {
+    private final Backup backup;
+    private final long worldId;
+    private final RealmsConfigureWorldScreen lastScreen;
+    
+    public RestoreTask(final Backup dif, final long long2, final RealmsConfigureWorldScreen djr) {
+        this.backup = dif;
+        this.worldId = long2;
+        this.lastScreen = djr;
+    }
+    
+    @Override
+    public void run() {
+        this.setTitle(I18n.get("mco.backup.restoring"));
+        final RealmsClient dia2 = RealmsClient.create();
+        for (int integer3 = 0; integer3 < 25; ++integer3) {
+            try {
+                if (this.aborted()) {
+                    return;
+                }
+                dia2.restoreWorld(this.worldId, this.backup.backupId);
+                LongRunningTask.pause(1);
+                if (this.aborted()) {
+                    return;
+                }
+                LongRunningTask.setScreen(this.lastScreen.getNewScreen());
+                return;
+            }
+            catch (RetryCallException dji4) {
+                if (this.aborted()) {
+                    return;
+                }
+                LongRunningTask.pause(dji4.delaySeconds);
+            }
+            catch (RealmsServiceException djh4) {
+                if (this.aborted()) {
+                    return;
+                }
+                RestoreTask.LOGGER.error("Couldn't restore backup", (Throwable)djh4);
+                LongRunningTask.setScreen(new RealmsGenericErrorScreen(djh4, this.lastScreen));
+                return;
+            }
+            catch (Exception exception4) {
+                if (this.aborted()) {
+                    return;
+                }
+                RestoreTask.LOGGER.error("Couldn't restore backup", (Throwable)exception4);
+                this.error(exception4.getLocalizedMessage());
+                return;
+            }
+        }
+    }
+}
diff --git a/src/com/mojang/realmsclient/util/task/SwitchMinigameTask.java b/src/com/mojang/realmsclient/util/task/SwitchMinigameTask.java
new file mode 100644
index 0000000..99fe8b8
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/SwitchMinigameTask.java
@@ -0,0 +1,51 @@
+package com.mojang.realmsclient.util.task;
+
+import com.mojang.realmsclient.exception.RetryCallException;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen;
+import com.mojang.realmsclient.dto.WorldTemplate;
+
+public class SwitchMinigameTask extends LongRunningTask {
+    private final long worldId;
+    private final WorldTemplate worldTemplate;
+    private final RealmsConfigureWorldScreen lastScreen;
+    
+    public SwitchMinigameTask(final long long1, final WorldTemplate djd, final RealmsConfigureWorldScreen djr) {
+        this.worldId = long1;
+        this.worldTemplate = djd;
+        this.lastScreen = djr;
+    }
+    
+    @Override
+    public void run() {
+        final RealmsClient dia2 = RealmsClient.create();
+        final String string3 = I18n.get("mco.minigame.world.starting.screen.title");
+        this.setTitle(string3);
+        for (int integer4 = 0; integer4 < 25; ++integer4) {
+            try {
+                if (this.aborted()) {
+                    return;
+                }
+                if (dia2.putIntoMinigameMode(this.worldId, this.worldTemplate.id)) {
+                    LongRunningTask.setScreen(this.lastScreen);
+                    break;
+                }
+            }
+            catch (RetryCallException dji5) {
+                if (this.aborted()) {
+                    return;
+                }
+                LongRunningTask.pause(dji5.delaySeconds);
+            }
+            catch (Exception exception5) {
+                if (this.aborted()) {
+                    return;
+                }
+                SwitchMinigameTask.LOGGER.error("Couldn't start mini game!");
+                this.error(exception5.toString());
+            }
+        }
+    }
+}
diff --git a/src/com/mojang/realmsclient/util/task/SwitchSlotTask.java b/src/com/mojang/realmsclient/util/task/SwitchSlotTask.java
new file mode 100644
index 0000000..14c16ae
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/SwitchSlotTask.java
@@ -0,0 +1,48 @@
+package com.mojang.realmsclient.util.task;
+
+import com.mojang.realmsclient.exception.RetryCallException;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.realmsclient.client.RealmsClient;
+
+public class SwitchSlotTask extends LongRunningTask {
+    private final long worldId;
+    private final int slot;
+    private final Runnable callback;
+    
+    public SwitchSlotTask(final long long1, final int integer, final Runnable runnable) {
+        this.worldId = long1;
+        this.slot = integer;
+        this.callback = runnable;
+    }
+    
+    @Override
+    public void run() {
+        final RealmsClient dia2 = RealmsClient.create();
+        final String string3 = I18n.get("mco.minigame.world.slot.screen.title");
+        this.setTitle(string3);
+        for (int integer4 = 0; integer4 < 25; ++integer4) {
+            try {
+                if (this.aborted()) {
+                    return;
+                }
+                if (dia2.switchSlot(this.worldId, this.slot)) {
+                    this.callback.run();
+                    break;
+                }
+            }
+            catch (RetryCallException dji5) {
+                if (this.aborted()) {
+                    return;
+                }
+                LongRunningTask.pause(dji5.delaySeconds);
+            }
+            catch (Exception exception5) {
+                if (this.aborted()) {
+                    return;
+                }
+                SwitchSlotTask.LOGGER.error("Couldn't switch world!");
+                this.error(exception5.toString());
+            }
+        }
+    }
+}
diff --git a/src/com/mojang/realmsclient/util/task/WorldCreationTask.java b/src/com/mojang/realmsclient/util/task/WorldCreationTask.java
new file mode 100644
index 0000000..b6b089c
--- /dev/null
+++ b/src/com/mojang/realmsclient/util/task/WorldCreationTask.java
@@ -0,0 +1,39 @@
+package com.mojang.realmsclient.util.task;
+
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.client.RealmsClient;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.gui.screens.Screen;
+
+public class WorldCreationTask extends LongRunningTask {
+    private final String name;
+    private final String motd;
+    private final long worldId;
+    private final Screen lastScreen;
+    
+    public WorldCreationTask(final long long1, final String string2, final String string3, final Screen dqs) {
+        this.worldId = long1;
+        this.name = string2;
+        this.motd = string3;
+        this.lastScreen = dqs;
+    }
+    
+    @Override
+    public void run() {
+        final String string2 = I18n.get("mco.create.world.wait");
+        this.setTitle(string2);
+        final RealmsClient dia3 = RealmsClient.create();
+        try {
+            dia3.initializeWorld(this.worldId, this.name, this.motd);
+            LongRunningTask.setScreen(this.lastScreen);
+        }
+        catch (RealmsServiceException djh4) {
+            WorldCreationTask.LOGGER.error("Couldn't create world");
+            this.error(djh4.toString());
+        }
+        catch (Exception exception4) {
+            WorldCreationTask.LOGGER.error("Could not create world");
+            this.error(exception4.getLocalizedMessage());
+        }
+    }
+}
diff --git a/src/net/minecraft/ChatFormatting.java b/src/net/minecraft/ChatFormatting.java
index 7135290..daf8dd6 100644
--- a/src/net/minecraft/ChatFormatting.java
+++ b/src/net/minecraft/ChatFormatting.java
@@ -65,28 +65,6 @@ public enum ChatFormatting {
         this.toString = "§" + character;
     }
     
-    public static String getLastColors(final String string) {
-        final StringBuilder stringBuilder2 = new StringBuilder();
-        int integer3 = -1;
-        final int integer4 = string.length();
-        while ((integer3 = string.indexOf(167, integer3 + 1)) != -1) {
-            if (integer3 < integer4 - 1) {
-                final ChatFormatting g5 = getByCode(string.charAt(integer3 + 1));
-                if (g5 == null) {
-                    continue;
-                }
-                if (g5.shouldReset()) {
-                    stringBuilder2.setLength(0);
-                }
-                if (g5 == ChatFormatting.RESET) {
-                    continue;
-                }
-                stringBuilder2.append(g5);
-            }
-        }
-        return stringBuilder2.toString();
-    }
-    
     public int getId() {
         return this.id;
     }
@@ -104,10 +82,6 @@ public enum ChatFormatting {
         return this.color;
     }
     
-    public boolean shouldReset() {
-        return !this.isFormat;
-    }
-    
     public String getName() {
         return this.name().toLowerCase(Locale.ROOT);
     }
@@ -135,9 +109,9 @@ public enum ChatFormatting {
         if (integer < 0) {
             return ChatFormatting.RESET;
         }
-        for (final ChatFormatting g5 : values()) {
-            if (g5.getId() == integer) {
-                return g5;
+        for (final ChatFormatting i5 : values()) {
+            if (i5.getId() == integer) {
+                return i5;
             }
         }
         return null;
@@ -146,9 +120,9 @@ public enum ChatFormatting {
     @Nullable
     public static ChatFormatting getByCode(final char character) {
         final char character2 = Character.toString(character).toLowerCase(Locale.ROOT).charAt(0);
-        for (final ChatFormatting g6 : values()) {
-            if (g6.code == character2) {
-                return g6;
+        for (final ChatFormatting i6 : values()) {
+            if (i6.code == character2) {
+                return i6;
             }
         }
         return null;
@@ -156,10 +130,10 @@ public enum ChatFormatting {
     
     public static Collection<String> getNames(final boolean boolean1, final boolean boolean2) {
         final List<String> list3 = Lists.newArrayList();
-        for (final ChatFormatting g7 : values()) {
-            if (!g7.isColor() || boolean1) {
-                if (!g7.isFormat() || boolean2) {
-                    list3.add(g7.getName());
+        for (final ChatFormatting i7 : values()) {
+            if (!i7.isColor() || boolean1) {
+                if (!i7.isFormat() || boolean2) {
+                    list3.add(i7.getName());
                 }
             }
         }
@@ -167,7 +141,7 @@ public enum ChatFormatting {
     }
     
     static {
-        FORMATTING_BY_NAME = Arrays.<ChatFormatting>stream(values()).collect(Collectors.toMap(g -> cleanName(g.name), g -> g));
+        FORMATTING_BY_NAME = Arrays.<ChatFormatting>stream(values()).collect(Collectors.toMap(i -> cleanName(i.name), i -> i));
         STRIP_FORMATTING_PATTERN = Pattern.compile("(?i)§[0-9A-FK-OR]");
     }
 }
diff --git a/src/net/minecraft/CrashReport.java b/src/net/minecraft/CrashReport.java
index d8ad7ea..f989d37 100644
--- a/src/net/minecraft/CrashReport.java
+++ b/src/net/minecraft/CrashReport.java
@@ -94,8 +94,8 @@ public class CrashReport {
             }
             stringBuilder.append("\n");
         }
-        for (final CrashReportCategory i4 : this.details) {
-            i4.getDetails(stringBuilder);
+        for (final CrashReportCategory k4 : this.details) {
+            k4.getDetails(stringBuilder);
             stringBuilder.append("\n\n");
         }
         this.systemDetails.getDetails(stringBuilder);
@@ -187,9 +187,9 @@ public class CrashReport {
     }
     
     public CrashReportCategory addCategory(final String string, final int integer) {
-        final CrashReportCategory i4 = new CrashReportCategory(this, string);
+        final CrashReportCategory k4 = new CrashReportCategory(this, string);
         if (this.trackingStackTrace) {
-            final int integer2 = i4.fillInStackTrace(integer);
+            final int integer2 = k4.fillInStackTrace(integer);
             final StackTraceElement[] arr6 = this.exception.getStackTrace();
             StackTraceElement stackTraceElement7 = null;
             StackTraceElement stackTraceElement8 = null;
@@ -203,10 +203,10 @@ public class CrashReport {
                     stackTraceElement8 = arr6[arr6.length + 1 - integer2];
                 }
             }
-            this.trackingStackTrace = i4.validateStackTrace(stackTraceElement7, stackTraceElement8);
+            this.trackingStackTrace = k4.validateStackTrace(stackTraceElement7, stackTraceElement8);
             if (integer2 > 0 && !this.details.isEmpty()) {
-                final CrashReportCategory i5 = this.details.get(this.details.size() - 1);
-                i5.trimStacktrace(integer2);
+                final CrashReportCategory k5 = this.details.get(this.details.size() - 1);
+                k5.trimStacktrace(integer2);
             }
             else if (arr6 != null && arr6.length >= integer2 && 0 <= integer3 && integer3 < arr6.length) {
                 System.arraycopy(arr6, 0, this.uncategorizedStackTrace = new StackTraceElement[integer3], 0, this.uncategorizedStackTrace.length);
@@ -215,8 +215,8 @@ public class CrashReport {
                 this.trackingStackTrace = false;
             }
         }
-        this.details.add(i4);
-        return i4;
+        this.details.add(k4);
+        return k4;
     }
     
     private static String getErrorComment() {
@@ -233,14 +233,14 @@ public class CrashReport {
         while (throwable instanceof CompletionException && throwable.getCause() != null) {
             throwable = throwable.getCause();
         }
-        CrashReport h3;
+        CrashReport j3;
         if (throwable instanceof ReportedException) {
-            h3 = ((ReportedException)throwable).getReport();
+            j3 = ((ReportedException)throwable).getReport();
         }
         else {
-            h3 = new CrashReport(string, throwable);
+            j3 = new CrashReport(string, throwable);
         }
-        return h3;
+        return j3;
     }
     
     public static void preload() {
diff --git a/src/net/minecraft/CrashReportCategory.java b/src/net/minecraft/CrashReportCategory.java
index 3cb29aa..15a7126 100644
--- a/src/net/minecraft/CrashReportCategory.java
+++ b/src/net/minecraft/CrashReportCategory.java
@@ -14,10 +14,10 @@ public class CrashReportCategory {
     private final List<Entry> entries;
     private StackTraceElement[] stackTrace;
     
-    public CrashReportCategory(final CrashReport h, final String string) {
+    public CrashReportCategory(final CrashReport j, final String string) {
         this.entries = Lists.newArrayList();
         this.stackTrace = new StackTraceElement[0];
-        this.report = h;
+        this.report = j;
         this.title = string;
     }
     
@@ -25,8 +25,8 @@ public class CrashReportCategory {
         return String.format(Locale.ROOT, "%.2f,%.2f,%.2f - %s", double1, double2, double3, formatLocation(new BlockPos(double1, double2, double3)));
     }
     
-    public static String formatLocation(final BlockPos fk) {
-        return formatLocation(fk.getX(), fk.getY(), fk.getZ());
+    public static String formatLocation(final BlockPos fu) {
+        return formatLocation(fu.getX(), fu.getY(), fu.getZ());
     }
     
     public static String formatLocation(final int integer1, final int integer2, final int integer3) {
@@ -73,9 +73,9 @@ public class CrashReportCategory {
         return stringBuilder4.toString();
     }
     
-    public CrashReportCategory setDetail(final String string, final CrashReportDetail<String> j) {
+    public CrashReportCategory setDetail(final String string, final CrashReportDetail<String> l) {
         try {
-            this.setDetail(string, j.call());
+            this.setDetail(string, l.call());
         }
         catch (Throwable throwable4) {
             this.setDetailError(string, throwable4);
@@ -147,11 +147,11 @@ public class CrashReportCategory {
         return this.stackTrace;
     }
     
-    public static void populateBlockDetails(final CrashReportCategory i, final BlockPos fk, @Nullable final BlockState byj) {
-        if (byj != null) {
-            i.setDetail("Block", byj::toString);
+    public static void populateBlockDetails(final CrashReportCategory k, final BlockPos fu, @Nullable final BlockState cfj) {
+        if (cfj != null) {
+            k.setDetail("Block", cfj::toString);
         }
-        i.setDetail("Block location", () -> formatLocation(fk));
+        k.setDetail("Block location", () -> formatLocation(fu));
     }
     
     static class Entry {
diff --git a/src/net/minecraft/DetectedVersion.java b/src/net/minecraft/DetectedVersion.java
index 4f1fb70..cd8d9a8 100644
--- a/src/net/minecraft/DetectedVersion.java
+++ b/src/net/minecraft/DetectedVersion.java
@@ -16,6 +16,7 @@ import com.mojang.bridge.game.GameVersion;
 
 public class DetectedVersion implements GameVersion {
     private static final Logger LOGGER;
+    public static final GameVersion BUILT_IN;
     private final String id;
     private final String name;
     private final boolean stable;
@@ -25,18 +26,18 @@ public class DetectedVersion implements GameVersion {
     private final Date buildTime;
     private final String releaseTarget;
     
-    public DetectedVersion() {
+    private DetectedVersion() {
         this.id = UUID.randomUUID().toString().replaceAll("-", "");
-        this.name = "1.15.2";
+        this.name = "1.16";
         this.stable = true;
-        this.worldVersion = 2230;
-        this.protocolVersion = 578;
+        this.worldVersion = 2566;
+        this.protocolVersion = 735;
         this.packVersion = 5;
         this.buildTime = new Date();
-        this.releaseTarget = "1.15.2";
+        this.releaseTarget = "1.16";
     }
     
-    protected DetectedVersion(final JsonObject jsonObject) {
+    private DetectedVersion(final JsonObject jsonObject) {
         this.id = GsonHelper.getAsString(jsonObject, "id");
         this.name = GsonHelper.getAsString(jsonObject, "name");
         this.releaseTarget = GsonHelper.getAsString(jsonObject, "release_target");
@@ -51,7 +52,7 @@ public class DetectedVersion implements GameVersion {
         try (final InputStream inputStream1 = DetectedVersion.class.getResourceAsStream("/version.json")) {
             if (inputStream1 == null) {
                 DetectedVersion.LOGGER.warn("Missing version information!");
-                return (GameVersion)new DetectedVersion();
+                return DetectedVersion.BUILT_IN;
             }
             try (final InputStreamReader inputStreamReader3 = new InputStreamReader(inputStream1)) {
                 return (GameVersion)new DetectedVersion(GsonHelper.parse(inputStreamReader3));
@@ -98,5 +99,6 @@ public class DetectedVersion implements GameVersion {
     
     static {
         LOGGER = LogManager.getLogger();
+        BUILT_IN = (GameVersion)new DetectedVersion();
     }
 }
diff --git a/src/net/minecraft/ReportedException.java b/src/net/minecraft/ReportedException.java
index 49d21f0..6a365dd 100644
--- a/src/net/minecraft/ReportedException.java
+++ b/src/net/minecraft/ReportedException.java
@@ -3,8 +3,8 @@ package net.minecraft;
 public class ReportedException extends RuntimeException {
     private final CrashReport report;
     
-    public ReportedException(final CrashReport h) {
-        this.report = h;
+    public ReportedException(final CrashReport j) {
+        this.report = j;
     }
     
     public CrashReport getReport() {
diff --git a/src/net/minecraft/SharedConstants.java b/src/net/minecraft/SharedConstants.java
index a4fea4f..ff8092b 100644
--- a/src/net/minecraft/SharedConstants.java
+++ b/src/net/minecraft/SharedConstants.java
@@ -1,15 +1,16 @@
 package net.minecraft;
 
 import com.mojang.brigadier.exceptions.BuiltInExceptionProvider;
-import com.mojang.datafixers.types.constant.NamespacedStringType;
-import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import net.minecraft.commands.BrigadierExceptions;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import java.time.Duration;
 import com.mojang.bridge.game.GameVersion;
 import io.netty.util.ResourceLeakDetector;
 
 public class SharedConstants {
     public static final ResourceLeakDetector.Level NETTY_LEAK_DETECTION;
+    public static final long MAXIMUM_TICK_TIME_NANOS;
+    public static boolean CHECK_DATA_FIXER_SCHEMA;
     public static boolean IS_RUNNING_IN_IDE;
     public static final char[] ILLEGAL_FILE_CHARACTERS;
     private static GameVersion CURRENT_VERSION;
@@ -28,20 +29,6 @@ public class SharedConstants {
         return stringBuilder2.toString();
     }
     
-    public static String filterUnicodeSupplementary(final String string) {
-        final StringBuilder stringBuilder2 = new StringBuilder();
-        for (int integer3 = 0; integer3 < string.length(); integer3 = string.offsetByCodePoints(integer3, 1)) {
-            final int integer4 = string.codePointAt(integer3);
-            if (!Character.isSupplementaryCodePoint(integer4)) {
-                stringBuilder2.appendCodePoint(integer4);
-            }
-            else {
-                stringBuilder2.append('\ufffd');
-            }
-        }
-        return stringBuilder2.toString();
-    }
-    
     public static GameVersion getCurrentVersion() {
         if (SharedConstants.CURRENT_VERSION == null) {
             SharedConstants.CURRENT_VERSION = DetectedVersion.tryDetectVersion();
@@ -51,10 +38,11 @@ public class SharedConstants {
     
     static {
         NETTY_LEAK_DETECTION = ResourceLeakDetector.Level.DISABLED;
+        MAXIMUM_TICK_TIME_NANOS = Duration.ofMillis(300L).toNanos();
+        SharedConstants.CHECK_DATA_FIXER_SCHEMA = true;
         ILLEGAL_FILE_CHARACTERS = new char[] { '/', '\n', '\r', '\t', '\0', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':' };
         ResourceLeakDetector.setLevel(SharedConstants.NETTY_LEAK_DETECTION);
         CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES = false;
         CommandSyntaxException.BUILT_IN_EXCEPTIONS = (BuiltInExceptionProvider)new BrigadierExceptions();
-        NamespacedStringType.ENSURE_NAMESPACE = NamespacedSchema::ensureNamespaced;
     }
 }
diff --git a/src/net/minecraft/Util.java b/src/net/minecraft/Util.java
index a259749..0a922ab 100644
--- a/src/net/minecraft/Util.java
+++ b/src/net/minecraft/Util.java
@@ -1,18 +1,22 @@
 package net.minecraft;
 
 import java.net.URISyntaxException;
-import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URI;
-import java.io.IOException;
 import java.security.PrivilegedActionException;
 import org.apache.commons.io.IOUtils;
 import java.security.AccessController;
 import java.net.URL;
 import org.apache.logging.log4j.LogManager;
-import java.util.UUID;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.DataFixUtils;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.CopyOption;
+import java.nio.file.Path;
+import java.util.Arrays;
+import com.mojang.serialization.DataResult;
+import java.util.stream.IntStream;
+import java.io.File;
+import java.util.Random;
 import java.util.Optional;
 import java.util.concurrent.CompletionStage;
 import com.google.common.collect.Lists;
@@ -26,11 +30,16 @@ import java.lang.management.RuntimeMXBean;
 import java.lang.management.ManagementFactory;
 import java.util.stream.Stream;
 import java.util.Locale;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.Executor;
+import com.mojang.datafixers.DataFixUtils;
+import net.minecraft.util.datafix.DataFixers;
+import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.DSL;
 import net.minecraft.server.Bootstrap;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinWorkerThread;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -44,29 +53,33 @@ import java.util.stream.Collectors;
 import java.util.Map;
 import java.util.stream.Collector;
 import org.apache.logging.log4j.Logger;
+import java.util.UUID;
 import java.util.function.LongSupplier;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class Util {
     private static final AtomicInteger WORKER_COUNT;
+    private static final ExecutorService BOOTSTRAP_EXECUTOR;
     private static final ExecutorService BACKGROUND_EXECUTOR;
+    private static final ExecutorService IO_POOL;
     public static LongSupplier timeSource;
+    public static final UUID NIL_UUID;
     private static final Logger LOGGER;
     
     public static <K, V> Collector<Map.Entry<? extends K, ? extends V>, ?, Map<K, V>> toMap() {
         return Collectors.<Map.Entry<? extends K, ? extends V>, K, V>toMap(Map.Entry::getKey, Map.Entry::getValue);
     }
     
-    public static <T extends Comparable<T>> String getPropertyName(final Property<T> bzm, final Object object) {
-        return bzm.getName((T)object);
+    public static <T extends Comparable<T>> String getPropertyName(final Property<T> cgl, final Object object) {
+        return cgl.getName((T)object);
     }
     
-    public static String makeDescriptionId(final String string, @Nullable final ResourceLocation sm) {
-        if (sm == null) {
+    public static String makeDescriptionId(final String string, @Nullable final ResourceLocation uh) {
+        if (uh == null) {
             return string + ".unregistered_sadface";
         }
-        return string + '.' + sm.getNamespace() + '.' + sm.getPath().replace('/', '.');
+        return string + '.' + uh.getNamespace() + '.' + uh.getPath().replace('/', '.');
     }
     
     public static long getMillis() {
@@ -81,16 +94,16 @@ public class Util {
         return Instant.now().toEpochMilli();
     }
     
-    private static ExecutorService makeBackgroundExecutor() {
-        final int integer1 = Mth.clamp(Runtime.getRuntime().availableProcessors() - 1, 1, 7);
-        ExecutorService executorService2;
-        if (integer1 <= 0) {
-            executorService2 = MoreExecutors.newDirectExecutorService();
+    private static ExecutorService makeExecutor(final String string) {
+        final int integer2 = Mth.clamp(Runtime.getRuntime().availableProcessors() - 1, 1, 7);
+        ExecutorService executorService3;
+        if (integer2 <= 0) {
+            executorService3 = MoreExecutors.newDirectExecutorService();
         }
         else {
-            final ForkJoinWorkerThread forkJoinWorkerThread2;
-            executorService2 = new ForkJoinPool(integer1, forkJoinPool -> {
-                forkJoinWorkerThread2 = new ForkJoinWorkerThread(forkJoinPool) {
+            final ForkJoinWorkerThread forkJoinWorkerThread3;
+            executorService3 = new ForkJoinPool(integer2, forkJoinPool -> {
+                forkJoinWorkerThread3 = new ForkJoinWorkerThread(forkJoinPool) {
                     @Override
                     protected void onTermination(final Throwable throwable) {
                         if (throwable != null) {
@@ -102,42 +115,54 @@ public class Util {
                         super.onTermination(throwable);
                     }
                 };
-                forkJoinWorkerThread2.setName("Server-Worker-" + Util.WORKER_COUNT.getAndIncrement());
-                return forkJoinWorkerThread2;
-            }, (thread, throwable) -> {
-                Util.<ReportedException>pauseInIde(throwable);
-                if (throwable instanceof CompletionException) {
-                    throwable = (ReportedException)throwable.getCause();
-                }
-                if (throwable instanceof ReportedException) {
-                    Bootstrap.realStdoutPrintln(throwable.getReport().getFriendlyReport());
-                    System.exit(-1);
-                }
-                Util.LOGGER.error(String.format("Caught exception in thread %s", thread), (Throwable)throwable);
-                return;
-            }, true);
+                forkJoinWorkerThread3.setName("Worker-" + string + "-" + Util.WORKER_COUNT.getAndIncrement());
+                return forkJoinWorkerThread3;
+            }, Util::onThreadException, true);
         }
-        return executorService2;
+        return executorService3;
+    }
+    
+    public static Executor bootstrapExecutor() {
+        return Util.BOOTSTRAP_EXECUTOR;
     }
     
     public static Executor backgroundExecutor() {
         return Util.BACKGROUND_EXECUTOR;
     }
     
-    public static void shutdownBackgroundExecutor() {
-        Util.BACKGROUND_EXECUTOR.shutdown();
-        boolean boolean1;
+    public static Executor ioPool() {
+        return Util.IO_POOL;
+    }
+    
+    public static void shutdownExecutors() {
+        shutdownExecutor(Util.BACKGROUND_EXECUTOR);
+        shutdownExecutor(Util.IO_POOL);
+    }
+    
+    private static void shutdownExecutor(final ExecutorService executorService) {
+        executorService.shutdown();
+        boolean boolean2;
         try {
-            boolean1 = Util.BACKGROUND_EXECUTOR.awaitTermination(3L, TimeUnit.SECONDS);
+            boolean2 = executorService.awaitTermination(3L, TimeUnit.SECONDS);
         }
-        catch (InterruptedException interruptedException2) {
-            boolean1 = false;
+        catch (InterruptedException interruptedException3) {
+            boolean2 = false;
         }
-        if (!boolean1) {
-            Util.BACKGROUND_EXECUTOR.shutdownNow();
+        if (!boolean2) {
+            executorService.shutdownNow();
         }
     }
     
+    private static ExecutorService makeIoExecutor() {
+        final Thread thread2;
+        return Executors.newCachedThreadPool(runnable -> {
+            thread2 = new Thread(runnable);
+            thread2.setName("IO-Worker-" + Util.WORKER_COUNT.getAndIncrement());
+            thread2.setUncaughtExceptionHandler(Util::onThreadException);
+            return thread2;
+        });
+    }
+    
     public static <T> CompletableFuture<T> failedFuture(final Throwable throwable) {
         final CompletableFuture<T> completableFuture2 = new CompletableFuture<T>();
         completableFuture2.completeExceptionally(throwable);
@@ -148,6 +173,41 @@ public class Util {
         throw (throwable instanceof RuntimeException) ? throwable : new RuntimeException(throwable);
     }
     
+    private static void onThreadException(final Thread thread, Throwable throwable) {
+        Util.<Throwable>pauseInIde(throwable);
+        if (throwable instanceof CompletionException) {
+            throwable = throwable.getCause();
+        }
+        if (throwable instanceof ReportedException) {
+            Bootstrap.realStdoutPrintln(((ReportedException)throwable).getReport().getFriendlyReport());
+            System.exit(-1);
+        }
+        Util.LOGGER.error(String.format("Caught exception in thread %s", thread), throwable);
+    }
+    
+    @Nullable
+    public static Type<?> fetchChoiceType(final DSL.TypeReference typeReference, final String string) {
+        if (!SharedConstants.CHECK_DATA_FIXER_SCHEMA) {
+            return null;
+        }
+        return doFetchChoiceType(typeReference, string);
+    }
+    
+    @Nullable
+    private static Type<?> doFetchChoiceType(final DSL.TypeReference typeReference, final String string) {
+        Type<?> type3 = null;
+        try {
+            type3 = DataFixers.getDataFixer().getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getWorldVersion())).getChoiceType(typeReference, string);
+        }
+        catch (IllegalArgumentException illegalArgumentException4) {
+            Util.LOGGER.error("No data fixer registered for {}", string);
+            if (SharedConstants.IS_RUNNING_IN_IDE) {
+                throw illegalArgumentException4;
+            }
+        }
+        return type3;
+    }
+    
     public static OS getPlatform() {
         final String string1 = System.getProperty("os.name").toLowerCase(Locale.ROOT);
         if (string1.contains("win")) {
@@ -270,14 +330,6 @@ public class Util {
         return runnable;
     }
     
-    public static Optional<UUID> readUUID(final String string, final Dynamic<?> dynamic) {
-        return dynamic.get(string + "Most").asNumber().<UUID>flatMap(number -> dynamic.get(string + "Least").asNumber().map(number2 -> new UUID(number.longValue(), number2.longValue())));
-    }
-    
-    public static <T> Dynamic<T> writeUUID(final String string, final UUID uUID, final Dynamic<T> dynamic) {
-        return (Dynamic<T>)dynamic.set(string + "Most", dynamic.createLong(uUID.getMostSignificantBits())).set(string + "Least", dynamic.createLong(uUID.getLeastSignificantBits()));
-    }
-    
     public static <T extends Throwable> T pauseInIde(final T throwable) {
         if (SharedConstants.IS_RUNNING_IN_IDE) {
             Util.LOGGER.error("Trying to throw a fatal exception, pausing in IDE", (Throwable)throwable);
@@ -304,10 +356,95 @@ public class Util {
         return throwable.toString();
     }
     
+    public static <T> T getRandom(final T[] arr, final Random random) {
+        return arr[random.nextInt(arr.length)];
+    }
+    
+    public static int getRandom(final int[] arr, final Random random) {
+        return arr[random.nextInt(arr.length)];
+    }
+    
+    public static void safeReplaceFile(final File file1, final File file2, final File file3) {
+        if (file3.exists()) {
+            file3.delete();
+        }
+        file1.renameTo(file3);
+        if (file1.exists()) {
+            file1.delete();
+        }
+        file2.renameTo(file1);
+        if (file2.exists()) {
+            file2.delete();
+        }
+    }
+    
+    public static int offsetByCodepoints(final String string, int integer2, final int integer3) {
+        final int integer4 = string.length();
+        if (integer3 >= 0) {
+            for (int integer5 = 0; integer2 < integer4 && integer5 < integer3; ++integer5) {
+                if (Character.isHighSurrogate(string.charAt(integer2++)) && integer2 < integer4 && Character.isLowSurrogate(string.charAt(integer2))) {
+                    ++integer2;
+                }
+            }
+        }
+        else {
+            for (int integer5 = integer3; integer2 > 0 && integer5 < 0; ++integer5) {
+                if (Character.isLowSurrogate(string.charAt(--integer2)) && integer2 > 0 && Character.isHighSurrogate(string.charAt(integer2 - 1))) {
+                    --integer2;
+                }
+            }
+        }
+        return integer2;
+    }
+    
+    public static Consumer<String> prefix(final String string, final Consumer<String> consumer) {
+        return string3 -> consumer.accept(string + string3);
+    }
+    
+    public static DataResult<int[]> fixedSize(final IntStream intStream, final int integer) {
+        final int[] arr3 = intStream.limit(integer + 1).toArray();
+        if (arr3.length == integer) {
+            return (DataResult<int[]>)DataResult.success(arr3);
+        }
+        final String string4 = "Input is not a list of " + integer + " ints";
+        if (arr3.length >= integer) {
+            return (DataResult<int[]>)DataResult.error(string4, Arrays.copyOf(arr3, integer));
+        }
+        return (DataResult<int[]>)DataResult.error(string4);
+    }
+    
+    public static void startTimerHackThread() {
+        final Thread thread1 = new Thread("Timer hack thread") {
+            @Override
+            public void run() {
+                try {
+                    while (true) {
+                        Thread.sleep(2147483647L);
+                    }
+                }
+                catch (InterruptedException interruptedException2) {
+                    Util.LOGGER.warn("Timer hack thread interrupted, that really should not happen");
+                }
+            }
+        };
+        thread1.setDaemon(true);
+        thread1.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(Util.LOGGER));
+        thread1.start();
+    }
+    
+    public static void copyBetweenDirs(final Path path1, final Path path2, final Path path3) throws IOException {
+        final Path path4 = path1.relativize(path3);
+        final Path path5 = path2.resolve(path4);
+        Files.copy(path3, path5);
+    }
+    
     static {
         WORKER_COUNT = new AtomicInteger(1);
-        BACKGROUND_EXECUTOR = makeBackgroundExecutor();
+        BOOTSTRAP_EXECUTOR = makeExecutor("Bootstrap");
+        BACKGROUND_EXECUTOR = makeExecutor("Main");
+        IO_POOL = makeIoExecutor();
         Util.timeSource = System::nanoTime;
+        NIL_UUID = new UUID(0L, 0L);
         LOGGER = LogManager.getLogger();
     }
     
diff --git a/src/net/minecraft/advancements/Advancement.java b/src/net/minecraft/advancements/Advancement.java
index b998a0d..edb494b 100644
--- a/src/net/minecraft/advancements/Advancement.java
+++ b/src/net/minecraft/advancements/Advancement.java
@@ -3,7 +3,7 @@ package net.minecraft.advancements;
 import org.apache.commons.lang3.ArrayUtils;
 import com.google.gson.JsonSyntaxException;
 import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
+import net.minecraft.advancements.critereon.DeserializationContext;
 import net.minecraft.network.FriendlyByteBuf;
 import java.util.Iterator;
 import com.google.gson.JsonArray;
@@ -15,10 +15,11 @@ import java.util.function.Function;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.ItemStack;
 import com.google.common.collect.Maps;
-import net.minecraft.network.chat.Style;
 import java.util.Arrays;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.HoverEvent;
+import net.minecraft.network.chat.ComponentUtils;
+import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextComponent;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
@@ -38,26 +39,26 @@ public class Advancement {
     private final Set<Advancement> children;
     private final Component chatComponent;
     
-    public Advancement(final ResourceLocation sm, @Nullable final Advancement u, @Nullable final DisplayInfo ad, final AdvancementRewards x, final Map<String, Criterion> map, final String[][] arr) {
+    public Advancement(final ResourceLocation uh, @Nullable final Advancement w, @Nullable final DisplayInfo af, final AdvancementRewards z, final Map<String, Criterion> map, final String[][] arr) {
         this.children = Sets.newLinkedHashSet();
-        this.id = sm;
-        this.display = ad;
+        this.id = uh;
+        this.display = af;
         this.criteria = ImmutableMap.copyOf(map);
-        this.parent = u;
-        this.rewards = x;
+        this.parent = w;
+        this.rewards = z;
         this.requirements = arr;
-        if (u != null) {
-            u.addChild(this);
+        if (w != null) {
+            w.addChild(this);
         }
-        if (ad == null) {
-            this.chatComponent = new TextComponent(sm.toString());
+        if (af == null) {
+            this.chatComponent = new TextComponent(uh.toString());
         }
         else {
-            final Component lf8 = ad.getTitle();
-            final ChatFormatting g9 = ad.getFrame().getChatColor();
-            final Component lf9 = lf8.deepCopy().withStyle(g9).append("\n").append(ad.getDescription());
-            final Component lf10 = lf8.deepCopy().withStyle(ln -> ln.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, lf9)));
-            this.chatComponent = new TextComponent("[").append(lf10).append("]").withStyle(g9);
+            final Component mr8 = af.getTitle();
+            final ChatFormatting i9 = af.getFrame().getChatColor();
+            final Component mr9 = ComponentUtils.mergeStyles(mr8.copy(), Style.EMPTY.withColor(i9)).append("\n").append(af.getDescription());
+            final Component mr10 = mr8.copy().withStyle(nb -> nb.withHoverEvent(new HoverEvent((HoverEvent.Action<T>)HoverEvent.Action.SHOW_TEXT, (T)mr9)));
+            this.chatComponent = new TextComponent("[").append(mr10).append("]").withStyle(i9);
         }
     }
     
@@ -96,8 +97,8 @@ public class Advancement {
         return this.requirements.length;
     }
     
-    public void addChild(final Advancement u) {
-        this.children.add(u);
+    public void addChild(final Advancement w) {
+        this.children.add(w);
     }
     
     public ResourceLocation getId() {
@@ -112,8 +113,8 @@ public class Advancement {
         if (!(object instanceof Advancement)) {
             return false;
         }
-        final Advancement u3 = (Advancement)object;
-        return this.id.equals(u3.id);
+        final Advancement w3 = (Advancement)object;
+        return this.id.equals(w3.id);
     }
     
     @Override
@@ -138,13 +139,13 @@ public class Advancement {
         private String[][] requirements;
         private RequirementsStrategy requirementsStrategy;
         
-        private Builder(@Nullable final ResourceLocation sm, @Nullable final DisplayInfo ad, final AdvancementRewards x, final Map<String, Criterion> map, final String[][] arr) {
+        private Builder(@Nullable final ResourceLocation uh, @Nullable final DisplayInfo af, final AdvancementRewards z, final Map<String, Criterion> map, final String[][] arr) {
             this.rewards = AdvancementRewards.EMPTY;
             this.criteria = Maps.newLinkedHashMap();
             this.requirementsStrategy = RequirementsStrategy.AND;
-            this.parentId = sm;
-            this.display = ad;
-            this.rewards = x;
+            this.parentId = uh;
+            this.display = af;
+            this.rewards = z;
             this.criteria = map;
             this.requirements = arr;
         }
@@ -159,26 +160,26 @@ public class Advancement {
             return new Builder();
         }
         
-        public Builder parent(final Advancement u) {
-            this.parent = u;
+        public Builder parent(final Advancement w) {
+            this.parent = w;
             return this;
         }
         
-        public Builder parent(final ResourceLocation sm) {
-            this.parentId = sm;
+        public Builder parent(final ResourceLocation uh) {
+            this.parentId = uh;
             return this;
         }
         
-        public Builder display(final ItemStack ben, final Component lf2, final Component lf3, @Nullable final ResourceLocation sm, final FrameType ae, final boolean boolean6, final boolean boolean7, final boolean boolean8) {
-            return this.display(new DisplayInfo(ben, lf2, lf3, sm, ae, boolean6, boolean7, boolean8));
+        public Builder display(final ItemStack bki, final Component mr2, final Component mr3, @Nullable final ResourceLocation uh, final FrameType ag, final boolean boolean6, final boolean boolean7, final boolean boolean8) {
+            return this.display(new DisplayInfo(bki, mr2, mr3, uh, ag, boolean6, boolean7, boolean8));
         }
         
-        public Builder display(final ItemLike bjv, final Component lf2, final Component lf3, @Nullable final ResourceLocation sm, final FrameType ae, final boolean boolean6, final boolean boolean7, final boolean boolean8) {
-            return this.display(new DisplayInfo(new ItemStack(bjv.asItem()), lf2, lf3, sm, ae, boolean6, boolean7, boolean8));
+        public Builder display(final ItemLike bqa, final Component mr2, final Component mr3, @Nullable final ResourceLocation uh, final FrameType ag, final boolean boolean6, final boolean boolean7, final boolean boolean8) {
+            return this.display(new DisplayInfo(new ItemStack(bqa.asItem()), mr2, mr3, uh, ag, boolean6, boolean7, boolean8));
         }
         
-        public Builder display(final DisplayInfo ad) {
-            this.display = ad;
+        public Builder display(final DisplayInfo af) {
+            this.display = af;
             return this;
         }
         
@@ -186,25 +187,25 @@ public class Advancement {
             return this.rewards(a.build());
         }
         
-        public Builder rewards(final AdvancementRewards x) {
-            this.rewards = x;
+        public Builder rewards(final AdvancementRewards z) {
+            this.rewards = z;
             return this;
         }
         
-        public Builder addCriterion(final String string, final CriterionTriggerInstance ac) {
-            return this.addCriterion(string, new Criterion(ac));
+        public Builder addCriterion(final String string, final CriterionTriggerInstance ae) {
+            return this.addCriterion(string, new Criterion(ae));
         }
         
-        public Builder addCriterion(final String string, final Criterion z) {
+        public Builder addCriterion(final String string, final Criterion ab) {
             if (this.criteria.containsKey(string)) {
                 throw new IllegalArgumentException("Duplicate criterion " + string);
             }
-            this.criteria.put(string, z);
+            this.criteria.put(string, ab);
             return this;
         }
         
-        public Builder requirements(final RequirementsStrategy af) {
-            this.requirementsStrategy = af;
+        public Builder requirements(final RequirementsStrategy ah) {
+            this.requirementsStrategy = ah;
             return this;
         }
         
@@ -218,20 +219,20 @@ public class Advancement {
             return this.parent != null;
         }
         
-        public Advancement build(final ResourceLocation sm) {
-            if (!this.canBuild(sm -> null)) {
+        public Advancement build(final ResourceLocation uh) {
+            if (!this.canBuild(uh -> null)) {
                 throw new IllegalStateException("Tried to build incomplete advancement!");
             }
             if (this.requirements == null) {
                 this.requirements = this.requirementsStrategy.createRequirements(this.criteria.keySet());
             }
-            return new Advancement(sm, this.parent, this.display, this.rewards, this.criteria, this.requirements);
+            return new Advancement(uh, this.parent, this.display, this.rewards, this.criteria, this.requirements);
         }
         
         public Advancement save(final Consumer<Advancement> consumer, final String string) {
-            final Advancement u4 = this.build(new ResourceLocation(string));
-            consumer.accept(u4);
-            return u4;
+            final Advancement w4 = this.build(new ResourceLocation(string));
+            consumer.accept(w4);
+            return w4;
         }
         
         public JsonObject serializeToJson() {
@@ -266,27 +267,27 @@ public class Advancement {
             return jsonObject2;
         }
         
-        public void serializeToNetwork(final FriendlyByteBuf kv) {
+        public void serializeToNetwork(final FriendlyByteBuf mg) {
             if (this.parentId == null) {
-                kv.writeBoolean(false);
+                mg.writeBoolean(false);
             }
             else {
-                kv.writeBoolean(true);
-                kv.writeResourceLocation(this.parentId);
+                mg.writeBoolean(true);
+                mg.writeResourceLocation(this.parentId);
             }
             if (this.display == null) {
-                kv.writeBoolean(false);
+                mg.writeBoolean(false);
             }
             else {
-                kv.writeBoolean(true);
-                this.display.serializeToNetwork(kv);
+                mg.writeBoolean(true);
+                this.display.serializeToNetwork(mg);
             }
-            Criterion.serializeToNetwork(this.criteria, kv);
-            kv.writeVarInt(this.requirements.length);
+            Criterion.serializeToNetwork(this.criteria, mg);
+            mg.writeVarInt(this.requirements.length);
             for (final String[] arr6 : this.requirements) {
-                kv.writeVarInt(arr6.length);
+                mg.writeVarInt(arr6.length);
                 for (final String string10 : arr6) {
-                    kv.writeUtf(string10);
+                    mg.writeUtf(string10);
                 }
             }
         }
@@ -296,11 +297,11 @@ public class Advancement {
             return "Task Advancement{parentId=" + this.parentId + ", display=" + this.display + ", rewards=" + this.rewards + ", criteria=" + this.criteria + ", requirements=" + Arrays.deepToString(this.requirements) + '}';
         }
         
-        public static Builder fromJson(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-            final ResourceLocation sm3 = jsonObject.has("parent") ? new ResourceLocation(GsonHelper.getAsString(jsonObject, "parent")) : null;
-            final DisplayInfo ad4 = jsonObject.has("display") ? DisplayInfo.fromJson(GsonHelper.getAsJsonObject(jsonObject, "display"), jsonDeserializationContext) : null;
-            final AdvancementRewards x5 = GsonHelper.<AdvancementRewards>getAsObject(jsonObject, "rewards", AdvancementRewards.EMPTY, jsonDeserializationContext, AdvancementRewards.class);
-            final Map<String, Criterion> map6 = Criterion.criteriaFromJson(GsonHelper.getAsJsonObject(jsonObject, "criteria"), jsonDeserializationContext);
+        public static Builder fromJson(final JsonObject jsonObject, final DeserializationContext av) {
+            final ResourceLocation uh3 = jsonObject.has("parent") ? new ResourceLocation(GsonHelper.getAsString(jsonObject, "parent")) : null;
+            final DisplayInfo af4 = jsonObject.has("display") ? DisplayInfo.fromJson(GsonHelper.getAsJsonObject(jsonObject, "display")) : null;
+            final AdvancementRewards z5 = jsonObject.has("rewards") ? AdvancementRewards.deserialize(GsonHelper.getAsJsonObject(jsonObject, "rewards")) : AdvancementRewards.EMPTY;
+            final Map<String, Criterion> map6 = Criterion.criteriaFromJson(GsonHelper.getAsJsonObject(jsonObject, "criteria"), av);
             if (map6.isEmpty()) {
                 throw new JsonSyntaxException("Advancement criteria cannot be empty");
             }
@@ -342,21 +343,21 @@ public class Advancement {
                     throw new JsonSyntaxException("Criterion '" + string13 + "' isn't a requirement for completion. This isn't supported behaviour, all criteria must be required.");
                 }
             }
-            return new Builder(sm3, ad4, x5, map6, arr8);
+            return new Builder(uh3, af4, z5, map6, arr8);
         }
         
-        public static Builder fromNetwork(final FriendlyByteBuf kv) {
-            final ResourceLocation sm2 = kv.readBoolean() ? kv.readResourceLocation() : null;
-            final DisplayInfo ad3 = kv.readBoolean() ? DisplayInfo.fromNetwork(kv) : null;
-            final Map<String, Criterion> map4 = Criterion.criteriaFromNetwork(kv);
-            final String[][] arr5 = new String[kv.readVarInt()][];
+        public static Builder fromNetwork(final FriendlyByteBuf mg) {
+            final ResourceLocation uh2 = mg.readBoolean() ? mg.readResourceLocation() : null;
+            final DisplayInfo af3 = mg.readBoolean() ? DisplayInfo.fromNetwork(mg) : null;
+            final Map<String, Criterion> map4 = Criterion.criteriaFromNetwork(mg);
+            final String[][] arr5 = new String[mg.readVarInt()][];
             for (int integer6 = 0; integer6 < arr5.length; ++integer6) {
-                arr5[integer6] = new String[kv.readVarInt()];
+                arr5[integer6] = new String[mg.readVarInt()];
                 for (int integer7 = 0; integer7 < arr5[integer6].length; ++integer7) {
-                    arr5[integer6][integer7] = kv.readUtf(32767);
+                    arr5[integer6][integer7] = mg.readUtf(32767);
                 }
             }
-            return new Builder(sm2, ad3, AdvancementRewards.EMPTY, map4, arr5);
+            return new Builder(uh2, af3, AdvancementRewards.EMPTY, map4, arr5);
         }
         
         public Map<String, Criterion> getCriteria() {
diff --git a/src/net/minecraft/advancements/AdvancementList.java b/src/net/minecraft/advancements/AdvancementList.java
index 81ca5e4..b2a5a98 100644
--- a/src/net/minecraft/advancements/AdvancementList.java
+++ b/src/net/minecraft/advancements/AdvancementList.java
@@ -26,34 +26,34 @@ public class AdvancementList {
         this.tasks = Sets.newLinkedHashSet();
     }
     
-    private void remove(final Advancement u) {
-        for (final Advancement u2 : u.getChildren()) {
-            this.remove(u2);
+    private void remove(final Advancement w) {
+        for (final Advancement w2 : w.getChildren()) {
+            this.remove(w2);
         }
-        AdvancementList.LOGGER.info("Forgot about advancement {}", u.getId());
-        this.advancements.remove(u.getId());
-        if (u.getParent() == null) {
-            this.roots.remove(u);
+        AdvancementList.LOGGER.info("Forgot about advancement {}", w.getId());
+        this.advancements.remove(w.getId());
+        if (w.getParent() == null) {
+            this.roots.remove(w);
             if (this.listener != null) {
-                this.listener.onRemoveAdvancementRoot(u);
+                this.listener.onRemoveAdvancementRoot(w);
             }
         }
         else {
-            this.tasks.remove(u);
+            this.tasks.remove(w);
             if (this.listener != null) {
-                this.listener.onRemoveAdvancementTask(u);
+                this.listener.onRemoveAdvancementTask(w);
             }
         }
     }
     
     public void remove(final Set<ResourceLocation> set) {
-        for (final ResourceLocation sm4 : set) {
-            final Advancement u5 = this.advancements.get(sm4);
-            if (u5 == null) {
-                AdvancementList.LOGGER.warn("Told to remove advancement {} but I don't know what that is", sm4);
+        for (final ResourceLocation uh4 : set) {
+            final Advancement w5 = this.advancements.get(uh4);
+            if (w5 == null) {
+                AdvancementList.LOGGER.warn("Told to remove advancement {} but I don't know what that is", uh4);
             }
             else {
-                this.remove(u5);
+                this.remove(w5);
             }
         }
     }
@@ -65,26 +65,26 @@ public class AdvancementList {
             final Iterator<Map.Entry<ResourceLocation, Advancement.Builder>> iterator5 = map.entrySet().iterator();
             while (iterator5.hasNext()) {
                 final Map.Entry<ResourceLocation, Advancement.Builder> entry6 = iterator5.next();
-                final ResourceLocation sm7 = entry6.getKey();
+                final ResourceLocation uh7 = entry6.getKey();
                 final Advancement.Builder a8 = entry6.getValue();
                 if (a8.canBuild(function3)) {
-                    final Advancement u9 = a8.build(sm7);
-                    this.advancements.put(sm7, u9);
+                    final Advancement w9 = a8.build(uh7);
+                    this.advancements.put(uh7, w9);
                     boolean4 = true;
                     iterator5.remove();
-                    if (u9.getParent() == null) {
-                        this.roots.add(u9);
+                    if (w9.getParent() == null) {
+                        this.roots.add(w9);
                         if (this.listener == null) {
                             continue;
                         }
-                        this.listener.onAddAdvancementRoot(u9);
+                        this.listener.onAddAdvancementRoot(w9);
                     }
                     else {
-                        this.tasks.add(u9);
+                        this.tasks.add(w9);
                         if (this.listener == null) {
                             continue;
                         }
-                        this.listener.onAddAdvancementTask(u9);
+                        this.listener.onAddAdvancementTask(w9);
                     }
                 }
             }
@@ -116,18 +116,18 @@ public class AdvancementList {
     }
     
     @Nullable
-    public Advancement get(final ResourceLocation sm) {
-        return this.advancements.get(sm);
+    public Advancement get(final ResourceLocation uh) {
+        return this.advancements.get(uh);
     }
     
     public void setListener(@Nullable final Listener a) {
         this.listener = a;
         if (a != null) {
-            for (final Advancement u4 : this.roots) {
-                a.onAddAdvancementRoot(u4);
+            for (final Advancement w4 : this.roots) {
+                a.onAddAdvancementRoot(w4);
             }
-            for (final Advancement u4 : this.tasks) {
-                a.onAddAdvancementTask(u4);
+            for (final Advancement w4 : this.tasks) {
+                a.onAddAdvancementTask(w4);
             }
         }
     }
@@ -137,13 +137,13 @@ public class AdvancementList {
     }
     
     public interface Listener {
-        void onAddAdvancementRoot(final Advancement u);
+        void onAddAdvancementRoot(final Advancement w);
         
-        void onRemoveAdvancementRoot(final Advancement u);
+        void onRemoveAdvancementRoot(final Advancement w);
         
-        void onAddAdvancementTask(final Advancement u);
+        void onAddAdvancementTask(final Advancement w);
         
-        void onRemoveAdvancementTask(final Advancement u);
+        void onRemoveAdvancementTask(final Advancement w);
         
         void onAdvancementsCleared();
     }
diff --git a/src/net/minecraft/advancements/AdvancementProgress.java b/src/net/minecraft/advancements/AdvancementProgress.java
index ac0cc71..c331909 100644
--- a/src/net/minecraft/advancements/AdvancementProgress.java
+++ b/src/net/minecraft/advancements/AdvancementProgress.java
@@ -47,8 +47,8 @@ public class AdvancementProgress implements Comparable<AdvancementProgress> {
         for (final String[] arr5 : this.requirements) {
             boolean boolean6 = false;
             for (final String string10 : arr5) {
-                final CriterionProgress aa11 = this.getCriterion(string10);
-                if (aa11 != null && aa11.isDone()) {
+                final CriterionProgress ac11 = this.getCriterion(string10);
+                if (ac11 != null && ac11.isDone()) {
                     boolean6 = true;
                     break;
                 }
@@ -61,8 +61,8 @@ public class AdvancementProgress implements Comparable<AdvancementProgress> {
     }
     
     public boolean hasProgress() {
-        for (final CriterionProgress aa3 : this.criteria.values()) {
-            if (aa3.isDone()) {
+        for (final CriterionProgress ac3 : this.criteria.values()) {
+            if (ac3.isDone()) {
                 return true;
             }
         }
@@ -70,18 +70,18 @@ public class AdvancementProgress implements Comparable<AdvancementProgress> {
     }
     
     public boolean grantProgress(final String string) {
-        final CriterionProgress aa3 = this.criteria.get(string);
-        if (aa3 != null && !aa3.isDone()) {
-            aa3.grant();
+        final CriterionProgress ac3 = this.criteria.get(string);
+        if (ac3 != null && !ac3.isDone()) {
+            ac3.grant();
             return true;
         }
         return false;
     }
     
     public boolean revokeProgress(final String string) {
-        final CriterionProgress aa3 = this.criteria.get(string);
-        if (aa3 != null && aa3.isDone()) {
-            aa3.revoke();
+        final CriterionProgress ac3 = this.criteria.get(string);
+        if (ac3 != null && ac3.isDone()) {
+            ac3.revoke();
             return true;
         }
         return false;
@@ -92,20 +92,20 @@ public class AdvancementProgress implements Comparable<AdvancementProgress> {
         return "AdvancementProgress{criteria=" + this.criteria + ", requirements=" + Arrays.deepToString(this.requirements) + '}';
     }
     
-    public void serializeToNetwork(final FriendlyByteBuf kv) {
-        kv.writeVarInt(this.criteria.size());
+    public void serializeToNetwork(final FriendlyByteBuf mg) {
+        mg.writeVarInt(this.criteria.size());
         for (final Map.Entry<String, CriterionProgress> entry4 : this.criteria.entrySet()) {
-            kv.writeUtf(entry4.getKey());
-            entry4.getValue().serializeToNetwork(kv);
+            mg.writeUtf(entry4.getKey());
+            entry4.getValue().serializeToNetwork(mg);
         }
     }
     
-    public static AdvancementProgress fromNetwork(final FriendlyByteBuf kv) {
-        final AdvancementProgress w2 = new AdvancementProgress();
-        for (int integer3 = kv.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
-            w2.criteria.put(kv.readUtf(32767), CriterionProgress.fromNetwork(kv));
+    public static AdvancementProgress fromNetwork(final FriendlyByteBuf mg) {
+        final AdvancementProgress y2 = new AdvancementProgress();
+        for (int integer3 = mg.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
+            y2.criteria.put(mg.readUtf(32767), CriterionProgress.fromNetwork(mg));
         }
-        return w2;
+        return y2;
     }
     
     @Nullable
@@ -140,8 +140,8 @@ public class AdvancementProgress implements Comparable<AdvancementProgress> {
         for (final String[] arr6 : this.requirements) {
             boolean boolean7 = false;
             for (final String string11 : arr6) {
-                final CriterionProgress aa12 = this.getCriterion(string11);
-                if (aa12 != null && aa12.isDone()) {
+                final CriterionProgress ac12 = this.getCriterion(string11);
+                if (ac12 != null && ac12.isDone()) {
                     boolean7 = true;
                     break;
                 }
@@ -176,18 +176,18 @@ public class AdvancementProgress implements Comparable<AdvancementProgress> {
     @Nullable
     public Date getFirstProgressDate() {
         Date date2 = null;
-        for (final CriterionProgress aa4 : this.criteria.values()) {
-            if (aa4.isDone() && (date2 == null || aa4.getObtained().before(date2))) {
-                date2 = aa4.getObtained();
+        for (final CriterionProgress ac4 : this.criteria.values()) {
+            if (ac4.isDone() && (date2 == null || ac4.getObtained().before(date2))) {
+                date2 = ac4.getObtained();
             }
         }
         return date2;
     }
     
     @Override
-    public int compareTo(final AdvancementProgress w) {
+    public int compareTo(final AdvancementProgress y) {
         final Date date3 = this.getFirstProgressDate();
-        final Date date4 = w.getFirstProgressDate();
+        final Date date4 = y.getFirstProgressDate();
         if (date3 == null && date4 != null) {
             return 1;
         }
@@ -202,19 +202,19 @@ public class AdvancementProgress implements Comparable<AdvancementProgress> {
     
     public static class Serializer implements JsonDeserializer<AdvancementProgress>, JsonSerializer<AdvancementProgress> {
         @Override
-        public JsonElement serialize(final AdvancementProgress w, final Type type, final JsonSerializationContext jsonSerializationContext) {
+        public JsonElement serialize(final AdvancementProgress y, final Type type, final JsonSerializationContext jsonSerializationContext) {
             final JsonObject jsonObject5 = new JsonObject();
             final JsonObject jsonObject6 = new JsonObject();
-            for (final Map.Entry<String, CriterionProgress> entry8 : w.criteria.entrySet()) {
-                final CriterionProgress aa9 = entry8.getValue();
-                if (aa9.isDone()) {
-                    jsonObject6.add(entry8.getKey(), aa9.serializeToJson());
+            for (final Map.Entry<String, CriterionProgress> entry8 : y.criteria.entrySet()) {
+                final CriterionProgress ac9 = entry8.getValue();
+                if (ac9.isDone()) {
+                    jsonObject6.add(entry8.getKey(), ac9.serializeToJson());
                 }
             }
             if (!jsonObject6.entrySet().isEmpty()) {
                 jsonObject5.add("criteria", jsonObject6);
             }
-            jsonObject5.addProperty("done", w.isDone());
+            jsonObject5.addProperty("done", y.isDone());
             return jsonObject5;
         }
         
@@ -222,12 +222,12 @@ public class AdvancementProgress implements Comparable<AdvancementProgress> {
         public AdvancementProgress deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             final JsonObject jsonObject5 = GsonHelper.convertToJsonObject(jsonElement, "advancement");
             final JsonObject jsonObject6 = GsonHelper.getAsJsonObject(jsonObject5, "criteria", new JsonObject());
-            final AdvancementProgress w7 = new AdvancementProgress();
+            final AdvancementProgress y7 = new AdvancementProgress();
             for (final Map.Entry<String, JsonElement> entry9 : jsonObject6.entrySet()) {
                 final String string10 = entry9.getKey();
-                w7.criteria.put(string10, CriterionProgress.fromJson(GsonHelper.convertToString(entry9.getValue(), string10)));
+                y7.criteria.put(string10, CriterionProgress.fromJson(GsonHelper.convertToString(entry9.getValue(), string10)));
             }
-            return w7;
+            return y7;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/AdvancementRewards.java b/src/net/minecraft/advancements/AdvancementRewards.java
index c9a2745..9fcfb0b 100644
--- a/src/net/minecraft/advancements/AdvancementRewards.java
+++ b/src/net/minecraft/advancements/AdvancementRewards.java
@@ -5,9 +5,6 @@ import javax.annotation.Nullable;
 import java.util.List;
 import com.google.gson.JsonParseException;
 import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
-import java.lang.reflect.Type;
-import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonNull;
@@ -43,34 +40,34 @@ public class AdvancementRewards {
         this.function = a;
     }
     
-    public void grant(final ServerPlayer xe) {
-        xe.giveExperiencePoints(this.experience);
-        final LootContext crx3 = new LootContext.Builder(xe.getLevel()).<Entity>withParameter(LootContextParams.THIS_ENTITY, xe).<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(xe)).withRandom(xe.getRandom()).create(LootContextParamSets.ADVANCEMENT_REWARD);
+    public void grant(final ServerPlayer ze) {
+        ze.giveExperiencePoints(this.experience);
+        final LootContext dat3 = new LootContext.Builder(ze.getLevel()).<Entity>withParameter(LootContextParams.THIS_ENTITY, ze).<BlockPos>withParameter(LootContextParams.BLOCK_POS, ze.blockPosition()).withRandom(ze.getRandom()).create(LootContextParamSets.ADVANCEMENT_REWARD);
         boolean boolean4 = false;
-        for (final ResourceLocation sm8 : this.loot) {
-            for (final ItemStack ben10 : xe.server.getLootTables().get(sm8).getRandomItems(crx3)) {
-                if (xe.addItem(ben10)) {
-                    xe.level.playSound(null, xe.getX(), xe.getY(), xe.getZ(), SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2f, ((xe.getRandom().nextFloat() - xe.getRandom().nextFloat()) * 0.7f + 1.0f) * 2.0f);
+        for (final ResourceLocation uh8 : this.loot) {
+            for (final ItemStack bki10 : ze.server.getLootTables().get(uh8).getRandomItems(dat3)) {
+                if (ze.addItem(bki10)) {
+                    ze.level.playSound(null, ze.getX(), ze.getY(), ze.getZ(), SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2f, ((ze.getRandom().nextFloat() - ze.getRandom().nextFloat()) * 0.7f + 1.0f) * 2.0f);
                     boolean4 = true;
                 }
                 else {
-                    final ItemEntity awb11 = xe.drop(ben10, false);
-                    if (awb11 == null) {
+                    final ItemEntity bbg11 = ze.drop(bki10, false);
+                    if (bbg11 == null) {
                         continue;
                     }
-                    awb11.setNoPickUpDelay();
-                    awb11.setOwner(xe.getUUID());
+                    bbg11.setNoPickUpDelay();
+                    bbg11.setOwner(ze.getUUID());
                 }
             }
         }
         if (boolean4) {
-            xe.inventoryMenu.broadcastChanges();
+            ze.inventoryMenu.broadcastChanges();
         }
         if (this.recipes.length > 0) {
-            xe.awardRecipesByKey(this.recipes);
+            ze.awardRecipesByKey(this.recipes);
         }
-        final MinecraftServer minecraftServer5 = xe.server;
-        this.function.get(minecraftServer5.getFunctions()).ifPresent(cn -> minecraftServer5.getFunctions().execute(cn, xe.createCommandSourceStack().withSuppressedOutput().withPermission(2)));
+        final MinecraftServer minecraftServer5 = ze.server;
+        this.function.get(minecraftServer5.getFunctions()).ifPresent(cw -> minecraftServer5.getFunctions().execute(cw, ze.createCommandSourceStack().withSuppressedOutput().withPermission(2)));
     }
     
     @Override
@@ -88,15 +85,15 @@ public class AdvancementRewards {
         }
         if (this.loot.length > 0) {
             final JsonArray jsonArray3 = new JsonArray();
-            for (final ResourceLocation sm7 : this.loot) {
-                jsonArray3.add(sm7.toString());
+            for (final ResourceLocation uh7 : this.loot) {
+                jsonArray3.add(uh7.toString());
             }
             jsonObject2.add("loot", jsonArray3);
         }
         if (this.recipes.length > 0) {
             final JsonArray jsonArray3 = new JsonArray();
-            for (final ResourceLocation sm7 : this.recipes) {
-                jsonArray3.add(sm7.toString());
+            for (final ResourceLocation uh7 : this.recipes) {
+                jsonArray3.add(uh7.toString());
             }
             jsonObject2.add("recipes", jsonArray3);
         }
@@ -106,34 +103,30 @@ public class AdvancementRewards {
         return jsonObject2;
     }
     
-    static {
-        EMPTY = new AdvancementRewards(0, new ResourceLocation[0], new ResourceLocation[0], CommandFunction.CacheableFunction.NONE);
+    public static AdvancementRewards deserialize(final JsonObject jsonObject) throws JsonParseException {
+        final int integer2 = GsonHelper.getAsInt(jsonObject, "experience", 0);
+        final JsonArray jsonArray3 = GsonHelper.getAsJsonArray(jsonObject, "loot", new JsonArray());
+        final ResourceLocation[] arr4 = new ResourceLocation[jsonArray3.size()];
+        for (int integer3 = 0; integer3 < arr4.length; ++integer3) {
+            arr4[integer3] = new ResourceLocation(GsonHelper.convertToString(jsonArray3.get(integer3), "loot[" + integer3 + "]"));
+        }
+        final JsonArray jsonArray4 = GsonHelper.getAsJsonArray(jsonObject, "recipes", new JsonArray());
+        final ResourceLocation[] arr5 = new ResourceLocation[jsonArray4.size()];
+        for (int integer4 = 0; integer4 < arr5.length; ++integer4) {
+            arr5[integer4] = new ResourceLocation(GsonHelper.convertToString(jsonArray4.get(integer4), "recipes[" + integer4 + "]"));
+        }
+        CommandFunction.CacheableFunction a7;
+        if (jsonObject.has("function")) {
+            a7 = new CommandFunction.CacheableFunction(new ResourceLocation(GsonHelper.getAsString(jsonObject, "function")));
+        }
+        else {
+            a7 = CommandFunction.CacheableFunction.NONE;
+        }
+        return new AdvancementRewards(integer2, arr4, arr5, a7);
     }
     
-    public static class Deserializer implements JsonDeserializer<AdvancementRewards> {
-        @Override
-        public AdvancementRewards deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
-            final JsonObject jsonObject5 = GsonHelper.convertToJsonObject(jsonElement, "rewards");
-            final int integer6 = GsonHelper.getAsInt(jsonObject5, "experience", 0);
-            final JsonArray jsonArray7 = GsonHelper.getAsJsonArray(jsonObject5, "loot", new JsonArray());
-            final ResourceLocation[] arr8 = new ResourceLocation[jsonArray7.size()];
-            for (int integer7 = 0; integer7 < arr8.length; ++integer7) {
-                arr8[integer7] = new ResourceLocation(GsonHelper.convertToString(jsonArray7.get(integer7), "loot[" + integer7 + "]"));
-            }
-            final JsonArray jsonArray8 = GsonHelper.getAsJsonArray(jsonObject5, "recipes", new JsonArray());
-            final ResourceLocation[] arr9 = new ResourceLocation[jsonArray8.size()];
-            for (int integer8 = 0; integer8 < arr9.length; ++integer8) {
-                arr9[integer8] = new ResourceLocation(GsonHelper.convertToString(jsonArray8.get(integer8), "recipes[" + integer8 + "]"));
-            }
-            CommandFunction.CacheableFunction a11;
-            if (jsonObject5.has("function")) {
-                a11 = new CommandFunction.CacheableFunction(new ResourceLocation(GsonHelper.getAsString(jsonObject5, "function")));
-            }
-            else {
-                a11 = CommandFunction.CacheableFunction.NONE;
-            }
-            return new AdvancementRewards(integer6, arr8, arr9, a11);
-        }
+    static {
+        EMPTY = new AdvancementRewards(0, new ResourceLocation[0], new ResourceLocation[0], CommandFunction.CacheableFunction.NONE);
     }
     
     public static class Builder {
@@ -157,12 +150,12 @@ public class AdvancementRewards {
             return this;
         }
         
-        public static Builder recipe(final ResourceLocation sm) {
-            return new Builder().addRecipe(sm);
+        public static Builder recipe(final ResourceLocation uh) {
+            return new Builder().addRecipe(uh);
         }
         
-        public Builder addRecipe(final ResourceLocation sm) {
-            this.recipes.add(sm);
+        public Builder addRecipe(final ResourceLocation uh) {
+            this.recipes.add(uh);
             return this;
         }
         
diff --git a/src/net/minecraft/advancements/CriteriaTriggers.java b/src/net/minecraft/advancements/CriteriaTriggers.java
index 506d3ce..2413c10 100644
--- a/src/net/minecraft/advancements/CriteriaTriggers.java
+++ b/src/net/minecraft/advancements/CriteriaTriggers.java
@@ -2,9 +2,13 @@ package net.minecraft.advancements;
 
 import com.google.common.collect.Maps;
 import javax.annotation.Nullable;
+import net.minecraft.advancements.critereon.PlayerInteractTrigger;
+import net.minecraft.advancements.critereon.ItemPickedUpByEntityTrigger;
+import net.minecraft.advancements.critereon.LootTableTrigger;
+import net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger;
+import net.minecraft.advancements.critereon.TargetBlockTrigger;
 import net.minecraft.advancements.critereon.BeeNestDestroyedTrigger;
 import net.minecraft.advancements.critereon.SlideDownBlockTrigger;
-import net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger;
 import net.minecraft.advancements.critereon.KilledByCrossbowTrigger;
 import net.minecraft.advancements.critereon.ShotCrossbowTrigger;
 import net.minecraft.advancements.critereon.ChanneledLightningTrigger;
@@ -76,21 +80,25 @@ public class CriteriaTriggers {
     public static final KilledByCrossbowTrigger KILLED_BY_CROSSBOW;
     public static final LocationTrigger RAID_WIN;
     public static final LocationTrigger BAD_OMEN;
-    public static final ItemUsedOnBlockTrigger SAFELY_HARVEST_HONEY;
     public static final SlideDownBlockTrigger HONEY_BLOCK_SLIDE;
     public static final BeeNestDestroyedTrigger BEE_NEST_DESTROYED;
+    public static final TargetBlockTrigger TARGET_BLOCK_HIT;
+    public static final ItemUsedOnBlockTrigger ITEM_USED_ON_BLOCK;
+    public static final LootTableTrigger GENERATE_LOOT;
+    public static final ItemPickedUpByEntityTrigger ITEM_PICKED_UP_BY_ENTITY;
+    public static final PlayerInteractTrigger PLAYER_INTERACTED_WITH_ENTITY;
     
-    private static <T extends CriterionTrigger<?>> T register(final T ab) {
-        if (CriteriaTriggers.CRITERIA.containsKey(ab.getId())) {
-            throw new IllegalArgumentException("Duplicate criterion id " + ab.getId());
+    private static <T extends CriterionTrigger<?>> T register(final T ad) {
+        if (CriteriaTriggers.CRITERIA.containsKey(ad.getId())) {
+            throw new IllegalArgumentException("Duplicate criterion id " + ad.getId());
         }
-        CriteriaTriggers.CRITERIA.put(ab.getId(), ab);
-        return ab;
+        CriteriaTriggers.CRITERIA.put(ad.getId(), ad);
+        return ad;
     }
     
     @Nullable
-    public static <T extends CriterionTriggerInstance> CriterionTrigger<T> getCriterion(final ResourceLocation sm) {
-        return (CriterionTrigger<T>)CriteriaTriggers.CRITERIA.get(sm);
+    public static <T extends CriterionTriggerInstance> CriterionTrigger<T> getCriterion(final ResourceLocation uh) {
+        return (CriterionTrigger<T>)CriteriaTriggers.CRITERIA.get(uh);
     }
     
     public static Iterable<? extends CriterionTrigger<?>> all() {
@@ -134,8 +142,12 @@ public class CriteriaTriggers {
         KILLED_BY_CROSSBOW = CriteriaTriggers.<KilledByCrossbowTrigger>register(new KilledByCrossbowTrigger());
         RAID_WIN = CriteriaTriggers.<LocationTrigger>register(new LocationTrigger(new ResourceLocation("hero_of_the_village")));
         BAD_OMEN = CriteriaTriggers.<LocationTrigger>register(new LocationTrigger(new ResourceLocation("voluntary_exile")));
-        SAFELY_HARVEST_HONEY = CriteriaTriggers.<ItemUsedOnBlockTrigger>register(new ItemUsedOnBlockTrigger(new ResourceLocation("safely_harvest_honey")));
         HONEY_BLOCK_SLIDE = CriteriaTriggers.<SlideDownBlockTrigger>register(new SlideDownBlockTrigger());
         BEE_NEST_DESTROYED = CriteriaTriggers.<BeeNestDestroyedTrigger>register(new BeeNestDestroyedTrigger());
+        TARGET_BLOCK_HIT = CriteriaTriggers.<TargetBlockTrigger>register(new TargetBlockTrigger());
+        ITEM_USED_ON_BLOCK = CriteriaTriggers.<ItemUsedOnBlockTrigger>register(new ItemUsedOnBlockTrigger());
+        GENERATE_LOOT = CriteriaTriggers.<LootTableTrigger>register(new LootTableTrigger());
+        ITEM_PICKED_UP_BY_ENTITY = CriteriaTriggers.<ItemPickedUpByEntityTrigger>register(new ItemPickedUpByEntityTrigger());
+        PLAYER_INTERACTED_WITH_ENTITY = CriteriaTriggers.<PlayerInteractTrigger>register(new PlayerInteractTrigger());
     }
 }
diff --git a/src/net/minecraft/advancements/Criterion.java b/src/net/minecraft/advancements/Criterion.java
index b8fe972..6595b5b 100644
--- a/src/net/minecraft/advancements/Criterion.java
+++ b/src/net/minecraft/advancements/Criterion.java
@@ -1,5 +1,6 @@
 package net.minecraft.advancements;
 
+import net.minecraft.advancements.critereon.SerializationContext;
 import javax.annotation.Nullable;
 import java.util.Iterator;
 import com.google.gson.JsonElement;
@@ -8,59 +9,59 @@ import java.util.Map;
 import com.google.gson.JsonSyntaxException;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
+import net.minecraft.advancements.critereon.DeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.network.FriendlyByteBuf;
 
 public class Criterion {
     private final CriterionTriggerInstance trigger;
     
-    public Criterion(final CriterionTriggerInstance ac) {
-        this.trigger = ac;
+    public Criterion(final CriterionTriggerInstance ae) {
+        this.trigger = ae;
     }
     
     public Criterion() {
         this.trigger = null;
     }
     
-    public void serializeToNetwork(final FriendlyByteBuf kv) {
+    public void serializeToNetwork(final FriendlyByteBuf mg) {
     }
     
-    public static Criterion criterionFromJson(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final ResourceLocation sm3 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "trigger"));
-        final CriterionTrigger<?> ab4 = CriteriaTriggers.getCriterion(sm3);
-        if (ab4 == null) {
-            throw new JsonSyntaxException("Invalid criterion trigger: " + sm3);
+    public static Criterion criterionFromJson(final JsonObject jsonObject, final DeserializationContext av) {
+        final ResourceLocation uh3 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "trigger"));
+        final CriterionTrigger<?> ad4 = CriteriaTriggers.getCriterion(uh3);
+        if (ad4 == null) {
+            throw new JsonSyntaxException("Invalid criterion trigger: " + uh3);
         }
-        final CriterionTriggerInstance ac5 = (CriterionTriggerInstance)ab4.createInstance(GsonHelper.getAsJsonObject(jsonObject, "conditions", new JsonObject()), jsonDeserializationContext);
-        return new Criterion(ac5);
+        final CriterionTriggerInstance ae5 = (CriterionTriggerInstance)ad4.createInstance(GsonHelper.getAsJsonObject(jsonObject, "conditions", new JsonObject()), av);
+        return new Criterion(ae5);
     }
     
-    public static Criterion criterionFromNetwork(final FriendlyByteBuf kv) {
+    public static Criterion criterionFromNetwork(final FriendlyByteBuf mg) {
         return new Criterion();
     }
     
-    public static Map<String, Criterion> criteriaFromJson(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
+    public static Map<String, Criterion> criteriaFromJson(final JsonObject jsonObject, final DeserializationContext av) {
         final Map<String, Criterion> map3 = Maps.newHashMap();
         for (final Map.Entry<String, JsonElement> entry5 : jsonObject.entrySet()) {
-            map3.put(entry5.getKey(), criterionFromJson(GsonHelper.convertToJsonObject(entry5.getValue(), "criterion"), jsonDeserializationContext));
+            map3.put(entry5.getKey(), criterionFromJson(GsonHelper.convertToJsonObject(entry5.getValue(), "criterion"), av));
         }
         return map3;
     }
     
-    public static Map<String, Criterion> criteriaFromNetwork(final FriendlyByteBuf kv) {
+    public static Map<String, Criterion> criteriaFromNetwork(final FriendlyByteBuf mg) {
         final Map<String, Criterion> map2 = Maps.newHashMap();
-        for (int integer3 = kv.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
-            map2.put(kv.readUtf(32767), criterionFromNetwork(kv));
+        for (int integer3 = mg.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
+            map2.put(mg.readUtf(32767), criterionFromNetwork(mg));
         }
         return map2;
     }
     
-    public static void serializeToNetwork(final Map<String, Criterion> map, final FriendlyByteBuf kv) {
-        kv.writeVarInt(map.size());
+    public static void serializeToNetwork(final Map<String, Criterion> map, final FriendlyByteBuf mg) {
+        mg.writeVarInt(map.size());
         for (final Map.Entry<String, Criterion> entry4 : map.entrySet()) {
-            kv.writeUtf(entry4.getKey());
-            entry4.getValue().serializeToNetwork(kv);
+            mg.writeUtf(entry4.getKey());
+            entry4.getValue().serializeToNetwork(mg);
         }
     }
     
@@ -72,7 +73,10 @@ public class Criterion {
     public JsonElement serializeToJson() {
         final JsonObject jsonObject2 = new JsonObject();
         jsonObject2.addProperty("trigger", this.trigger.getCriterion().toString());
-        jsonObject2.add("conditions", this.trigger.serializeToJson());
+        final JsonObject jsonObject3 = this.trigger.serializeToJson(SerializationContext.INSTANCE);
+        if (jsonObject3.size() != 0) {
+            jsonObject2.add("conditions", jsonObject3);
+        }
         return jsonObject2;
     }
 }
diff --git a/src/net/minecraft/advancements/CriterionProgress.java b/src/net/minecraft/advancements/CriterionProgress.java
index 7e9945b..63cc700 100644
--- a/src/net/minecraft/advancements/CriterionProgress.java
+++ b/src/net/minecraft/advancements/CriterionProgress.java
@@ -34,10 +34,10 @@ public class CriterionProgress {
         return "CriterionProgress{obtained=" + ((this.obtained == null) ? "false" : this.obtained) + '}';
     }
     
-    public void serializeToNetwork(final FriendlyByteBuf kv) {
-        kv.writeBoolean(this.obtained != null);
+    public void serializeToNetwork(final FriendlyByteBuf mg) {
+        mg.writeBoolean(this.obtained != null);
         if (this.obtained != null) {
-            kv.writeDate(this.obtained);
+            mg.writeDate(this.obtained);
         }
     }
     
@@ -48,23 +48,23 @@ public class CriterionProgress {
         return JsonNull.INSTANCE;
     }
     
-    public static CriterionProgress fromNetwork(final FriendlyByteBuf kv) {
-        final CriterionProgress aa2 = new CriterionProgress();
-        if (kv.readBoolean()) {
-            aa2.obtained = kv.readDate();
+    public static CriterionProgress fromNetwork(final FriendlyByteBuf mg) {
+        final CriterionProgress ac2 = new CriterionProgress();
+        if (mg.readBoolean()) {
+            ac2.obtained = mg.readDate();
         }
-        return aa2;
+        return ac2;
     }
     
     public static CriterionProgress fromJson(final String string) {
-        final CriterionProgress aa2 = new CriterionProgress();
+        final CriterionProgress ac2 = new CriterionProgress();
         try {
-            aa2.obtained = CriterionProgress.DATE_FORMAT.parse(string);
+            ac2.obtained = CriterionProgress.DATE_FORMAT.parse(string);
         }
         catch (ParseException parseException3) {
             throw new JsonSyntaxException("Invalid datetime: " + string, parseException3);
         }
-        return aa2;
+        return ac2;
     }
     
     static {
diff --git a/src/net/minecraft/advancements/CriterionTrigger.java b/src/net/minecraft/advancements/CriterionTrigger.java
index 3cf6830..44c2c9b 100644
--- a/src/net/minecraft/advancements/CriterionTrigger.java
+++ b/src/net/minecraft/advancements/CriterionTrigger.java
@@ -1,6 +1,6 @@
 package net.minecraft.advancements;
 
-import com.google.gson.JsonDeserializationContext;
+import net.minecraft.advancements.critereon.DeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.server.PlayerAdvancements;
 import net.minecraft.resources.ResourceLocation;
@@ -8,22 +8,22 @@ import net.minecraft.resources.ResourceLocation;
 public interface CriterionTrigger<T extends CriterionTriggerInstance> {
     ResourceLocation getId();
     
-    void addPlayerListener(final PlayerAdvancements sv, final Listener<T> a);
+    void addPlayerListener(final PlayerAdvancements uq, final Listener<T> a);
     
-    void removePlayerListener(final PlayerAdvancements sv, final Listener<T> a);
+    void removePlayerListener(final PlayerAdvancements uq, final Listener<T> a);
     
-    void removePlayerListeners(final PlayerAdvancements sv);
+    void removePlayerListeners(final PlayerAdvancements uq);
     
-    T createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext);
+    T createInstance(final JsonObject jsonObject, final DeserializationContext av);
     
     public static class Listener<T extends CriterionTriggerInstance> {
         private final T trigger;
         private final Advancement advancement;
         private final String criterion;
         
-        public Listener(final T ac, final Advancement u, final String string) {
-            this.trigger = ac;
-            this.advancement = u;
+        public Listener(final T ae, final Advancement w, final String string) {
+            this.trigger = ae;
+            this.advancement = w;
             this.criterion = string;
         }
         
@@ -31,8 +31,8 @@ public interface CriterionTrigger<T extends CriterionTriggerInstance> {
             return this.trigger;
         }
         
-        public void run(final PlayerAdvancements sv) {
-            sv.award(this.advancement, this.criterion);
+        public void run(final PlayerAdvancements uq) {
+            uq.award(this.advancement, this.criterion);
         }
         
         @Override
diff --git a/src/net/minecraft/advancements/CriterionTriggerInstance.java b/src/net/minecraft/advancements/CriterionTriggerInstance.java
index c540d56..29287e8 100644
--- a/src/net/minecraft/advancements/CriterionTriggerInstance.java
+++ b/src/net/minecraft/advancements/CriterionTriggerInstance.java
@@ -1,13 +1,11 @@
 package net.minecraft.advancements;
 
-import com.google.gson.JsonNull;
-import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import net.minecraft.advancements.critereon.SerializationContext;
 import net.minecraft.resources.ResourceLocation;
 
 public interface CriterionTriggerInstance {
     ResourceLocation getCriterion();
     
-    default JsonElement serializeToJson() {
-        return JsonNull.INSTANCE;
-    }
+    JsonObject serializeToJson(final SerializationContext cg);
 }
diff --git a/src/net/minecraft/advancements/DisplayInfo.java b/src/net/minecraft/advancements/DisplayInfo.java
index 992f524..f6d95eb 100644
--- a/src/net/minecraft/advancements/DisplayInfo.java
+++ b/src/net/minecraft/advancements/DisplayInfo.java
@@ -9,9 +9,8 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.nbt.TagParser;
 import net.minecraft.world.level.ItemLike;
 import com.google.gson.JsonParseException;
-import com.google.gson.JsonSyntaxException;
 import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonSyntaxException;
 import com.google.gson.JsonObject;
 import javax.annotation.Nullable;
 import net.minecraft.resources.ResourceLocation;
@@ -30,12 +29,12 @@ public class DisplayInfo {
     private float x;
     private float y;
     
-    public DisplayInfo(final ItemStack ben, final Component lf2, final Component lf3, @Nullable final ResourceLocation sm, final FrameType ae, final boolean boolean6, final boolean boolean7, final boolean boolean8) {
-        this.title = lf2;
-        this.description = lf3;
-        this.icon = ben;
-        this.background = sm;
-        this.frame = ae;
+    public DisplayInfo(final ItemStack bki, final Component mr2, final Component mr3, @Nullable final ResourceLocation uh, final FrameType ag, final boolean boolean6, final boolean boolean7, final boolean boolean8) {
+        this.title = mr2;
+        this.description = mr3;
+        this.icon = bki;
+        this.background = uh;
+        this.frame = ag;
         this.showToast = boolean6;
         this.announceChat = boolean7;
         this.hidden = boolean8;
@@ -87,47 +86,47 @@ public class DisplayInfo {
         return this.hidden;
     }
     
-    public static DisplayInfo fromJson(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final Component lf3 = GsonHelper.<Component>getAsObject(jsonObject, "title", jsonDeserializationContext, Component.class);
-        final Component lf4 = GsonHelper.<Component>getAsObject(jsonObject, "description", jsonDeserializationContext, Component.class);
-        if (lf3 == null || lf4 == null) {
+    public static DisplayInfo fromJson(final JsonObject jsonObject) {
+        final Component mr2 = Component.Serializer.fromJson(jsonObject.get("title"));
+        final Component mr3 = Component.Serializer.fromJson(jsonObject.get("description"));
+        if (mr2 == null || mr3 == null) {
             throw new JsonSyntaxException("Both title and description must be set");
         }
-        final ItemStack ben5 = getIcon(GsonHelper.getAsJsonObject(jsonObject, "icon"));
-        final ResourceLocation sm6 = jsonObject.has("background") ? new ResourceLocation(GsonHelper.getAsString(jsonObject, "background")) : null;
-        final FrameType ae7 = jsonObject.has("frame") ? FrameType.byName(GsonHelper.getAsString(jsonObject, "frame")) : FrameType.TASK;
-        final boolean boolean8 = GsonHelper.getAsBoolean(jsonObject, "show_toast", true);
-        final boolean boolean9 = GsonHelper.getAsBoolean(jsonObject, "announce_to_chat", true);
-        final boolean boolean10 = GsonHelper.getAsBoolean(jsonObject, "hidden", false);
-        return new DisplayInfo(ben5, lf3, lf4, sm6, ae7, boolean8, boolean9, boolean10);
+        final ItemStack bki4 = getIcon(GsonHelper.getAsJsonObject(jsonObject, "icon"));
+        final ResourceLocation uh5 = jsonObject.has("background") ? new ResourceLocation(GsonHelper.getAsString(jsonObject, "background")) : null;
+        final FrameType ag6 = jsonObject.has("frame") ? FrameType.byName(GsonHelper.getAsString(jsonObject, "frame")) : FrameType.TASK;
+        final boolean boolean7 = GsonHelper.getAsBoolean(jsonObject, "show_toast", true);
+        final boolean boolean8 = GsonHelper.getAsBoolean(jsonObject, "announce_to_chat", true);
+        final boolean boolean9 = GsonHelper.getAsBoolean(jsonObject, "hidden", false);
+        return new DisplayInfo(bki4, mr2, mr3, uh5, ag6, boolean7, boolean8, boolean9);
     }
     
     private static ItemStack getIcon(final JsonObject jsonObject) {
         if (!jsonObject.has("item")) {
             throw new JsonSyntaxException("Unsupported icon type, currently only items are supported (add 'item' key)");
         }
-        final Item bei2 = GsonHelper.getAsItem(jsonObject, "item");
+        final Item bke2 = GsonHelper.getAsItem(jsonObject, "item");
         if (jsonObject.has("data")) {
             throw new JsonParseException("Disallowed data tag found");
         }
-        final ItemStack ben3 = new ItemStack(bei2);
+        final ItemStack bki3 = new ItemStack(bke2);
         if (jsonObject.has("nbt")) {
             try {
-                final CompoundTag jt4 = TagParser.parseTag(GsonHelper.convertToString(jsonObject.get("nbt"), "nbt"));
-                ben3.setTag(jt4);
+                final CompoundTag le4 = TagParser.parseTag(GsonHelper.convertToString(jsonObject.get("nbt"), "nbt"));
+                bki3.setTag(le4);
             }
             catch (CommandSyntaxException commandSyntaxException4) {
                 throw new JsonSyntaxException("Invalid nbt tag: " + commandSyntaxException4.getMessage());
             }
         }
-        return ben3;
+        return bki3;
     }
     
-    public void serializeToNetwork(final FriendlyByteBuf kv) {
-        kv.writeComponent(this.title);
-        kv.writeComponent(this.description);
-        kv.writeItem(this.icon);
-        kv.writeEnum(this.frame);
+    public void serializeToNetwork(final FriendlyByteBuf mg) {
+        mg.writeComponent(this.title);
+        mg.writeComponent(this.description);
+        mg.writeItem(this.icon);
+        mg.writeEnum(this.frame);
         int integer3 = 0;
         if (this.background != null) {
             integer3 |= 0x1;
@@ -138,26 +137,26 @@ public class DisplayInfo {
         if (this.hidden) {
             integer3 |= 0x4;
         }
-        kv.writeInt(integer3);
+        mg.writeInt(integer3);
         if (this.background != null) {
-            kv.writeResourceLocation(this.background);
+            mg.writeResourceLocation(this.background);
         }
-        kv.writeFloat(this.x);
-        kv.writeFloat(this.y);
+        mg.writeFloat(this.x);
+        mg.writeFloat(this.y);
     }
     
-    public static DisplayInfo fromNetwork(final FriendlyByteBuf kv) {
-        final Component lf2 = kv.readComponent();
-        final Component lf3 = kv.readComponent();
-        final ItemStack ben4 = kv.readItem();
-        final FrameType ae5 = kv.<FrameType>readEnum(FrameType.class);
-        final int integer6 = kv.readInt();
-        final ResourceLocation sm7 = ((integer6 & 0x1) != 0x0) ? kv.readResourceLocation() : null;
+    public static DisplayInfo fromNetwork(final FriendlyByteBuf mg) {
+        final Component mr2 = mg.readComponent();
+        final Component mr3 = mg.readComponent();
+        final ItemStack bki4 = mg.readItem();
+        final FrameType ag5 = mg.<FrameType>readEnum(FrameType.class);
+        final int integer6 = mg.readInt();
+        final ResourceLocation uh7 = ((integer6 & 0x1) != 0x0) ? mg.readResourceLocation() : null;
         final boolean boolean8 = (integer6 & 0x2) != 0x0;
         final boolean boolean9 = (integer6 & 0x4) != 0x0;
-        final DisplayInfo ad10 = new DisplayInfo(ben4, lf2, lf3, sm7, ae5, boolean8, false, boolean9);
-        ad10.setLocation(kv.readFloat(), kv.readFloat());
-        return ad10;
+        final DisplayInfo af10 = new DisplayInfo(bki4, mr2, mr3, uh7, ag5, boolean8, false, boolean9);
+        af10.setLocation(mg.readFloat(), mg.readFloat());
+        return af10;
     }
     
     public JsonElement serializeToJson() {
diff --git a/src/net/minecraft/advancements/FrameType.java b/src/net/minecraft/advancements/FrameType.java
index 4280da9..a265458 100644
--- a/src/net/minecraft/advancements/FrameType.java
+++ b/src/net/minecraft/advancements/FrameType.java
@@ -11,10 +11,10 @@ public enum FrameType {
     private final int texture;
     private final ChatFormatting chatColor;
     
-    private FrameType(final String string3, final int integer4, final ChatFormatting g) {
+    private FrameType(final String string3, final int integer4, final ChatFormatting i) {
         this.name = string3;
         this.texture = integer4;
-        this.chatColor = g;
+        this.chatColor = i;
     }
     
     public String getName() {
@@ -26,9 +26,9 @@ public enum FrameType {
     }
     
     public static FrameType byName(final String string) {
-        for (final FrameType ae5 : values()) {
-            if (ae5.name.equals(string)) {
-                return ae5;
+        for (final FrameType ag5 : values()) {
+            if (ag5.name.equals(string)) {
+                return ag5;
             }
         }
         throw new IllegalArgumentException("Unknown frame type '" + string + "'");
diff --git a/src/net/minecraft/advancements/TreeNodePosition.java b/src/net/minecraft/advancements/TreeNodePosition.java
index 4322c67..03c0f0f 100644
--- a/src/net/minecraft/advancements/TreeNodePosition.java
+++ b/src/net/minecraft/advancements/TreeNodePosition.java
@@ -19,36 +19,36 @@ public class TreeNodePosition {
     private float change;
     private float shift;
     
-    public TreeNodePosition(final Advancement u, @Nullable final TreeNodePosition ag2, @Nullable final TreeNodePosition ag3, final int integer4, final int integer5) {
+    public TreeNodePosition(final Advancement w, @Nullable final TreeNodePosition ai2, @Nullable final TreeNodePosition ai3, final int integer4, final int integer5) {
         this.children = Lists.newArrayList();
-        if (u.getDisplay() == null) {
+        if (w.getDisplay() == null) {
             throw new IllegalArgumentException("Can't position an invisible advancement!");
         }
-        this.advancement = u;
-        this.parent = ag2;
-        this.previousSibling = ag3;
+        this.advancement = w;
+        this.parent = ai2;
+        this.previousSibling = ai3;
         this.childIndex = integer4;
         this.ancestor = this;
         this.x = integer5;
         this.y = -1.0f;
-        TreeNodePosition ag4 = null;
-        for (final Advancement u2 : u.getChildren()) {
-            ag4 = this.addChild(u2, ag4);
+        TreeNodePosition ai4 = null;
+        for (final Advancement w2 : w.getChildren()) {
+            ai4 = this.addChild(w2, ai4);
         }
     }
     
     @Nullable
-    private TreeNodePosition addChild(final Advancement u, @Nullable TreeNodePosition ag) {
-        if (u.getDisplay() != null) {
-            ag = new TreeNodePosition(u, this, ag, this.children.size() + 1, this.x + 1);
-            this.children.add(ag);
+    private TreeNodePosition addChild(final Advancement w, @Nullable TreeNodePosition ai) {
+        if (w.getDisplay() != null) {
+            ai = new TreeNodePosition(w, this, ai, this.children.size() + 1, this.x + 1);
+            this.children.add(ai);
         }
         else {
-            for (final Advancement u2 : u.getChildren()) {
-                ag = this.addChild(u2, ag);
+            for (final Advancement w2 : w.getChildren()) {
+                ai = this.addChild(w2, ai);
             }
         }
-        return ag;
+        return ai;
     }
     
     private void firstWalk() {
@@ -61,10 +61,10 @@ public class TreeNodePosition {
             }
             return;
         }
-        TreeNodePosition ag2 = null;
-        for (final TreeNodePosition ag3 : this.children) {
-            ag3.firstWalk();
-            ag2 = ag3.apportion((ag2 == null) ? ag3 : ag2);
+        TreeNodePosition ai2 = null;
+        for (final TreeNodePosition ai3 : this.children) {
+            ai3.firstWalk();
+            ai2 = ai3.apportion((ai2 == null) ? ai3 : ai2);
         }
         this.executeShifts();
         final float float3 = (this.children.get(0).y + this.children.get(this.children.size() - 1).y) / 2.0f;
@@ -83,16 +83,16 @@ public class TreeNodePosition {
         if (this.y < float3) {
             float3 = this.y;
         }
-        for (final TreeNodePosition ag6 : this.children) {
-            float3 = ag6.secondWalk(float1 + this.mod, integer + 1, float3);
+        for (final TreeNodePosition ai6 : this.children) {
+            float3 = ai6.secondWalk(float1 + this.mod, integer + 1, float3);
         }
         return float3;
     }
     
     private void thirdWalk(final float float1) {
         this.y += float1;
-        for (final TreeNodePosition ag4 : this.children) {
-            ag4.thirdWalk(float1);
+        for (final TreeNodePosition ai4 : this.children) {
+            ai4.thirdWalk(float1);
         }
     }
     
@@ -101,12 +101,12 @@ public class TreeNodePosition {
         float float3 = 0.0f;
         for (int integer4 = this.children.size() - 1; integer4 >= 0; --integer4) {
             final TreeNodePosition treeNodePosition;
-            final TreeNodePosition ag5 = treeNodePosition = this.children.get(integer4);
+            final TreeNodePosition ai5 = treeNodePosition = this.children.get(integer4);
             treeNodePosition.y += float2;
-            final TreeNodePosition treeNodePosition2 = ag5;
+            final TreeNodePosition treeNodePosition2 = ai5;
             treeNodePosition2.mod += float2;
-            float3 += ag5.change;
-            float2 += ag5.shift + float3;
+            float3 += ai5.change;
+            float2 += ai5.shift + float3;
         }
     }
     
@@ -132,67 +132,67 @@ public class TreeNodePosition {
         return null;
     }
     
-    private TreeNodePosition apportion(TreeNodePosition ag) {
+    private TreeNodePosition apportion(TreeNodePosition ai) {
         if (this.previousSibling == null) {
-            return ag;
+            return ai;
         }
-        TreeNodePosition ag2 = this;
-        TreeNodePosition ag3 = this;
-        TreeNodePosition ag4 = this.previousSibling;
-        TreeNodePosition ag5 = this.parent.children.get(0);
+        TreeNodePosition ai2 = this;
+        TreeNodePosition ai3 = this;
+        TreeNodePosition ai4 = this.previousSibling;
+        TreeNodePosition ai5 = this.parent.children.get(0);
         float float7 = this.mod;
         float float8 = this.mod;
-        float float9 = ag4.mod;
-        float float10 = ag5.mod;
-        while (ag4.nextOrThread() != null && ag2.previousOrThread() != null) {
-            ag4 = ag4.nextOrThread();
-            ag2 = ag2.previousOrThread();
-            ag5 = ag5.previousOrThread();
-            ag3 = ag3.nextOrThread();
-            ag3.ancestor = this;
-            final float float11 = ag4.y + float9 - (ag2.y + float7) + 1.0f;
+        float float9 = ai4.mod;
+        float float10 = ai5.mod;
+        while (ai4.nextOrThread() != null && ai2.previousOrThread() != null) {
+            ai4 = ai4.nextOrThread();
+            ai2 = ai2.previousOrThread();
+            ai5 = ai5.previousOrThread();
+            ai3 = ai3.nextOrThread();
+            ai3.ancestor = this;
+            final float float11 = ai4.y + float9 - (ai2.y + float7) + 1.0f;
             if (float11 > 0.0f) {
-                ag4.getAncestor(this, ag).moveSubtree(this, float11);
+                ai4.getAncestor(this, ai).moveSubtree(this, float11);
                 float7 += float11;
                 float8 += float11;
             }
-            float9 += ag4.mod;
-            float7 += ag2.mod;
-            float10 += ag5.mod;
-            float8 += ag3.mod;
+            float9 += ai4.mod;
+            float7 += ai2.mod;
+            float10 += ai5.mod;
+            float8 += ai3.mod;
         }
-        if (ag4.nextOrThread() != null && ag3.nextOrThread() == null) {
-            ag3.thread = ag4.nextOrThread();
-            final TreeNodePosition treeNodePosition = ag3;
+        if (ai4.nextOrThread() != null && ai3.nextOrThread() == null) {
+            ai3.thread = ai4.nextOrThread();
+            final TreeNodePosition treeNodePosition = ai3;
             treeNodePosition.mod += float9 - float8;
         }
         else {
-            if (ag2.previousOrThread() != null && ag5.previousOrThread() == null) {
-                ag5.thread = ag2.previousOrThread();
-                final TreeNodePosition treeNodePosition2 = ag5;
+            if (ai2.previousOrThread() != null && ai5.previousOrThread() == null) {
+                ai5.thread = ai2.previousOrThread();
+                final TreeNodePosition treeNodePosition2 = ai5;
                 treeNodePosition2.mod += float7 - float10;
             }
-            ag = this;
+            ai = this;
         }
-        return ag;
+        return ai;
     }
     
-    private void moveSubtree(final TreeNodePosition ag, final float float2) {
-        final float float3 = (float)(ag.childIndex - this.childIndex);
+    private void moveSubtree(final TreeNodePosition ai, final float float2) {
+        final float float3 = (float)(ai.childIndex - this.childIndex);
         if (float3 != 0.0f) {
-            ag.change -= float2 / float3;
+            ai.change -= float2 / float3;
             this.change += float2 / float3;
         }
-        ag.shift += float2;
-        ag.y += float2;
-        ag.mod += float2;
+        ai.shift += float2;
+        ai.y += float2;
+        ai.mod += float2;
     }
     
-    private TreeNodePosition getAncestor(final TreeNodePosition ag1, final TreeNodePosition ag2) {
-        if (this.ancestor != null && ag1.parent.children.contains(this.ancestor)) {
+    private TreeNodePosition getAncestor(final TreeNodePosition ai1, final TreeNodePosition ai2) {
+        if (this.ancestor != null && ai1.parent.children.contains(this.ancestor)) {
             return this.ancestor;
         }
-        return ag2;
+        return ai2;
     }
     
     private void finalizePosition() {
@@ -200,22 +200,22 @@ public class TreeNodePosition {
             this.advancement.getDisplay().setLocation((float)this.x, this.y);
         }
         if (!this.children.isEmpty()) {
-            for (final TreeNodePosition ag3 : this.children) {
-                ag3.finalizePosition();
+            for (final TreeNodePosition ai3 : this.children) {
+                ai3.finalizePosition();
             }
         }
     }
     
-    public static void run(final Advancement u) {
-        if (u.getDisplay() == null) {
+    public static void run(final Advancement w) {
+        if (w.getDisplay() == null) {
             throw new IllegalArgumentException("Can't position children of an invisible root!");
         }
-        final TreeNodePosition ag2 = new TreeNodePosition(u, null, null, 1, 0);
-        ag2.firstWalk();
-        final float float3 = ag2.secondWalk(0.0f, 0, ag2.y);
+        final TreeNodePosition ai2 = new TreeNodePosition(w, null, null, 1, 0);
+        ai2.firstWalk();
+        final float float3 = ai2.secondWalk(0.0f, 0, ai2.y);
         if (float3 < 0.0f) {
-            ag2.thirdWalk(-float3);
+            ai2.thirdWalk(-float3);
         }
-        ag2.finalizePosition();
+        ai2.finalizePosition();
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/AbstractCriterionTriggerInstance.java b/src/net/minecraft/advancements/critereon/AbstractCriterionTriggerInstance.java
index 23d119d..69daf0b 100644
--- a/src/net/minecraft/advancements/critereon/AbstractCriterionTriggerInstance.java
+++ b/src/net/minecraft/advancements/critereon/AbstractCriterionTriggerInstance.java
@@ -1,13 +1,16 @@
 package net.minecraft.advancements.critereon;
 
+import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.advancements.CriterionTriggerInstance;
 
-public class AbstractCriterionTriggerInstance implements CriterionTriggerInstance {
+public abstract class AbstractCriterionTriggerInstance implements CriterionTriggerInstance {
     private final ResourceLocation criterion;
+    private final EntityPredicate.Composite player;
     
-    public AbstractCriterionTriggerInstance(final ResourceLocation sm) {
-        this.criterion = sm;
+    public AbstractCriterionTriggerInstance(final ResourceLocation uh, final EntityPredicate.Composite b) {
+        this.criterion = uh;
+        this.player = b;
     }
     
     @Override
@@ -15,6 +18,17 @@ public class AbstractCriterionTriggerInstance implements CriterionTriggerInstanc
         return this.criterion;
     }
     
+    protected EntityPredicate.Composite getPlayerPredicate() {
+        return this.player;
+    }
+    
+    @Override
+    public JsonObject serializeToJson(final SerializationContext cg) {
+        final JsonObject jsonObject3 = new JsonObject();
+        jsonObject3.add("player", this.player.toJson(cg));
+        return jsonObject3;
+    }
+    
     @Override
     public String toString() {
         return "AbstractCriterionInstance{criterion=" + this.criterion + '}';
diff --git a/src/net/minecraft/advancements/critereon/BeeNestDestroyedTrigger.java b/src/net/minecraft/advancements/critereon/BeeNestDestroyedTrigger.java
index 76363c6..1e0c350 100644
--- a/src/net/minecraft/advancements/critereon/BeeNestDestroyedTrigger.java
+++ b/src/net/minecraft/advancements/critereon/BeeNestDestroyedTrigger.java
@@ -1,7 +1,5 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.server.level.ServerPlayer;
 import javax.annotation.Nullable;
@@ -9,7 +7,6 @@ import com.google.gson.JsonSyntaxException;
 import net.minecraft.core.Registry;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.level.block.Block;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -21,21 +18,20 @@ public class BeeNestDestroyedTrigger extends SimpleCriterionTrigger<TriggerInsta
         return BeeNestDestroyedTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final Block bph4 = deserializeBlock(jsonObject);
-        final ItemPredicate bj5 = ItemPredicate.fromJson(jsonObject.get("item"));
-        final MinMaxBounds.Ints d6 = MinMaxBounds.Ints.fromJson(jsonObject.get("num_bees_inside"));
-        return new TriggerInstance(bph4, bj5, d6);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final Block bvr5 = deserializeBlock(jsonObject);
+        final ItemPredicate bo6 = ItemPredicate.fromJson(jsonObject.get("item"));
+        final MinMaxBounds.Ints d7 = MinMaxBounds.Ints.fromJson(jsonObject.get("num_bees_inside"));
+        return new TriggerInstance(b, bvr5, bo6, d7);
     }
     
     @Nullable
     private static Block deserializeBlock(final JsonObject jsonObject) {
         if (jsonObject.has("block")) {
-            final ResourceLocation sm2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
+            final ResourceLocation uh2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
             final Object o;
             final Object obj;
-            return Registry.BLOCK.getOptional(sm2).<Throwable>orElseThrow(() -> {
+            return Registry.BLOCK.getOptional(uh2).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown block type '" + obj + "'");
                 return o;
             });
@@ -43,8 +39,8 @@ public class BeeNestDestroyedTrigger extends SimpleCriterionTrigger<TriggerInsta
         return null;
     }
     
-    public void trigger(final ServerPlayer xe, final Block bph, final ItemStack ben, final int integer) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(bph, ben, integer));
+    public void trigger(final ServerPlayer ze, final Block bvr, final ItemStack bki, final int integer) {
+        this.trigger(ze, a -> a.matches(bvr, bki, integer));
     }
     
     static {
@@ -52,34 +48,35 @@ public class BeeNestDestroyedTrigger extends SimpleCriterionTrigger<TriggerInsta
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
+        @Nullable
         private final Block block;
         private final ItemPredicate item;
         private final MinMaxBounds.Ints numBees;
         
-        public TriggerInstance(final Block bph, final ItemPredicate bj, final MinMaxBounds.Ints d) {
-            super(BeeNestDestroyedTrigger.ID);
-            this.block = bph;
-            this.item = bj;
+        public TriggerInstance(final EntityPredicate.Composite b, @Nullable final Block bvr, final ItemPredicate bo, final MinMaxBounds.Ints d) {
+            super(BeeNestDestroyedTrigger.ID, b);
+            this.block = bvr;
+            this.item = bo;
             this.numBees = d;
         }
         
-        public static TriggerInstance destroyedBeeNest(final Block bph, final ItemPredicate.Builder a, final MinMaxBounds.Ints d) {
-            return new TriggerInstance(bph, a.build(), d);
+        public static TriggerInstance destroyedBeeNest(final Block bvr, final ItemPredicate.Builder a, final MinMaxBounds.Ints d) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, bvr, a.build(), d);
         }
         
-        public boolean matches(final Block bph, final ItemStack ben, final int integer) {
-            return (this.block == null || bph == this.block) && this.item.matches(ben) && this.numBees.matches(integer);
+        public boolean matches(final Block bvr, final ItemStack bki, final int integer) {
+            return (this.block == null || bvr == this.block) && this.item.matches(bki) && this.numBees.matches(integer);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
             if (this.block != null) {
-                jsonObject2.addProperty("block", Registry.BLOCK.getKey(this.block).toString());
+                jsonObject3.addProperty("block", Registry.BLOCK.getKey(this.block).toString());
             }
-            jsonObject2.add("item", this.item.serializeToJson());
-            jsonObject2.add("num_bees_inside", this.numBees.serializeToJson());
-            return jsonObject2;
+            jsonObject3.add("item", this.item.serializeToJson());
+            jsonObject3.add("num_bees_inside", this.numBees.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/BlockPredicate.java b/src/net/minecraft/advancements/critereon/BlockPredicate.java
index 4f0b169..f5b27f1 100644
--- a/src/net/minecraft/advancements/critereon/BlockPredicate.java
+++ b/src/net/minecraft/advancements/critereon/BlockPredicate.java
@@ -3,7 +3,7 @@ package net.minecraft.advancements.critereon;
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
-import net.minecraft.tags.BlockTags;
+import net.minecraft.tags.SerializationTags;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
@@ -26,34 +26,34 @@ public class BlockPredicate {
     private final StatePropertiesPredicate properties;
     private final NbtPredicate nbt;
     
-    public BlockPredicate(@Nullable final Tag<Block> aaz, @Nullable final Block bph, final StatePropertiesPredicate cc, final NbtPredicate bt) {
-        this.tag = aaz;
-        this.block = bph;
-        this.properties = cc;
-        this.nbt = bt;
+    public BlockPredicate(@Nullable final Tag<Block> adf, @Nullable final Block bvr, final StatePropertiesPredicate ck, final NbtPredicate bz) {
+        this.tag = adf;
+        this.block = bvr;
+        this.properties = ck;
+        this.nbt = bz;
     }
     
-    public boolean matches(final ServerLevel xd, final BlockPos fk) {
+    public boolean matches(final ServerLevel zd, final BlockPos fu) {
         if (this == BlockPredicate.ANY) {
             return true;
         }
-        if (!xd.isLoaded(fk)) {
+        if (!zd.isLoaded(fu)) {
             return false;
         }
-        final BlockState byj4 = xd.getBlockState(fk);
-        final Block bph5 = byj4.getBlock();
-        if (this.tag != null && !this.tag.contains(bph5)) {
+        final BlockState cfj4 = zd.getBlockState(fu);
+        final Block bvr5 = cfj4.getBlock();
+        if (this.tag != null && !this.tag.contains(bvr5)) {
             return false;
         }
-        if (this.block != null && bph5 != this.block) {
+        if (this.block != null && bvr5 != this.block) {
             return false;
         }
-        if (!this.properties.matches(byj4)) {
+        if (!this.properties.matches(cfj4)) {
             return false;
         }
         if (this.nbt != NbtPredicate.ANY) {
-            final BlockEntity bwl6 = xd.getBlockEntity(fk);
-            if (bwl6 == null || !this.nbt.matches(bwl6.save(new CompoundTag()))) {
+            final BlockEntity cdl6 = zd.getBlockEntity(fu);
+            if (cdl6 == null || !this.nbt.matches(cdl6.save(new CompoundTag()))) {
                 return false;
             }
         }
@@ -65,22 +65,22 @@ public class BlockPredicate {
             return BlockPredicate.ANY;
         }
         final JsonObject jsonObject2 = GsonHelper.convertToJsonObject(jsonElement, "block");
-        final NbtPredicate bt3 = NbtPredicate.fromJson(jsonObject2.get("nbt"));
-        Block bph4 = null;
+        final NbtPredicate bz3 = NbtPredicate.fromJson(jsonObject2.get("nbt"));
+        Block bvr4 = null;
         if (jsonObject2.has("block")) {
-            final ResourceLocation sm5 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "block"));
-            bph4 = Registry.BLOCK.get(sm5);
+            final ResourceLocation uh5 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "block"));
+            bvr4 = Registry.BLOCK.get(uh5);
         }
-        Tag<Block> aaz5 = null;
+        Tag<Block> adf5 = null;
         if (jsonObject2.has("tag")) {
-            final ResourceLocation sm6 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "tag"));
-            aaz5 = BlockTags.getAllTags().getTag(sm6);
-            if (aaz5 == null) {
-                throw new JsonSyntaxException("Unknown block tag '" + sm6 + "'");
+            final ResourceLocation uh6 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "tag"));
+            adf5 = SerializationTags.getInstance().getBlocks().getTag(uh6);
+            if (adf5 == null) {
+                throw new JsonSyntaxException("Unknown block tag '" + uh6 + "'");
             }
         }
-        final StatePropertiesPredicate cc6 = StatePropertiesPredicate.fromJson(jsonObject2.get("state"));
-        return new BlockPredicate(aaz5, bph4, cc6, bt3);
+        final StatePropertiesPredicate ck6 = StatePropertiesPredicate.fromJson(jsonObject2.get("state"));
+        return new BlockPredicate(adf5, bvr4, ck6, bz3);
     }
     
     public JsonElement serializeToJson() {
@@ -92,7 +92,7 @@ public class BlockPredicate {
             jsonObject2.addProperty("block", Registry.BLOCK.getKey(this.block).toString());
         }
         if (this.tag != null) {
-            jsonObject2.addProperty("tag", this.tag.getId().toString());
+            jsonObject2.addProperty("tag", SerializationTags.getInstance().getBlocks().getIdOrThrow(this.tag).toString());
         }
         jsonObject2.add("nbt", this.nbt.serializeToJson());
         jsonObject2.add("state", this.properties.serializeToJson());
@@ -120,8 +120,18 @@ public class BlockPredicate {
             return new Builder();
         }
         
-        public Builder of(final Tag<Block> aaz) {
-            this.blocks = aaz;
+        public Builder of(final Block bvr) {
+            this.block = bvr;
+            return this;
+        }
+        
+        public Builder of(final Tag<Block> adf) {
+            this.blocks = adf;
+            return this;
+        }
+        
+        public Builder setProperties(final StatePropertiesPredicate ck) {
+            this.properties = ck;
             return this;
         }
         
diff --git a/src/net/minecraft/advancements/critereon/BredAnimalsTrigger.java b/src/net/minecraft/advancements/critereon/BredAnimalsTrigger.java
index b0b2ffd..186aa15 100644
--- a/src/net/minecraft/advancements/critereon/BredAnimalsTrigger.java
+++ b/src/net/minecraft/advancements/critereon/BredAnimalsTrigger.java
@@ -1,13 +1,11 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
+import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.advancements.CriterionTriggerInstance;
-import net.minecraft.world.entity.AgableMob;
 import javax.annotation.Nullable;
+import net.minecraft.world.entity.AgableMob;
 import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -19,16 +17,18 @@ public class BredAnimalsTrigger extends SimpleCriterionTrigger<TriggerInstance>
         return BredAnimalsTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final EntityPredicate bb4 = EntityPredicate.fromJson(jsonObject.get("parent"));
-        final EntityPredicate bb5 = EntityPredicate.fromJson(jsonObject.get("partner"));
-        final EntityPredicate bb6 = EntityPredicate.fromJson(jsonObject.get("child"));
-        return new TriggerInstance(bb4, bb5, bb6);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final EntityPredicate.Composite b2 = EntityPredicate.Composite.fromJson(jsonObject, "parent", av);
+        final EntityPredicate.Composite b3 = EntityPredicate.Composite.fromJson(jsonObject, "partner", av);
+        final EntityPredicate.Composite b4 = EntityPredicate.Composite.fromJson(jsonObject, "child", av);
+        return new TriggerInstance(b, b2, b3, b4);
     }
     
-    public void trigger(final ServerPlayer xe, final Animal atc2, @Nullable final Animal atc3, @Nullable final AgableMob ako) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, atc2, atc3, ako));
+    public void trigger(final ServerPlayer ze, final Animal ayk2, final Animal ayk3, @Nullable final AgableMob aok) {
+        final LootContext dat6 = EntityPredicate.createContext(ze, ayk2);
+        final LootContext dat7 = EntityPredicate.createContext(ze, ayk3);
+        final LootContext dat8 = (aok != null) ? EntityPredicate.createContext(ze, aok) : null;
+        this.trigger(ze, a -> a.matches(dat6, dat7, dat8));
     }
     
     static {
@@ -36,36 +36,40 @@ public class BredAnimalsTrigger extends SimpleCriterionTrigger<TriggerInstance>
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        private final EntityPredicate parent;
-        private final EntityPredicate partner;
-        private final EntityPredicate child;
+        private final EntityPredicate.Composite parent;
+        private final EntityPredicate.Composite partner;
+        private final EntityPredicate.Composite child;
         
-        public TriggerInstance(final EntityPredicate bb1, final EntityPredicate bb2, final EntityPredicate bb3) {
-            super(BredAnimalsTrigger.ID);
-            this.parent = bb1;
-            this.partner = bb2;
-            this.child = bb3;
+        public TriggerInstance(final EntityPredicate.Composite b1, final EntityPredicate.Composite b2, final EntityPredicate.Composite b3, final EntityPredicate.Composite b4) {
+            super(BredAnimalsTrigger.ID, b1);
+            this.parent = b2;
+            this.partner = b3;
+            this.child = b4;
         }
         
         public static TriggerInstance bredAnimals() {
-            return new TriggerInstance(EntityPredicate.ANY, EntityPredicate.ANY, EntityPredicate.ANY);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY);
         }
         
         public static TriggerInstance bredAnimals(final EntityPredicate.Builder a) {
-            return new TriggerInstance(a.build(), EntityPredicate.ANY, EntityPredicate.ANY);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY, EntityPredicate.Composite.wrap(a.build()));
         }
         
-        public boolean matches(final ServerPlayer xe, final Animal atc2, @Nullable final Animal atc3, @Nullable final AgableMob ako) {
-            return this.child.matches(xe, ako) && ((this.parent.matches(xe, atc2) && this.partner.matches(xe, atc3)) || (this.parent.matches(xe, atc3) && this.partner.matches(xe, atc2)));
+        public static TriggerInstance bredAnimals(final EntityPredicate be1, final EntityPredicate be2, final EntityPredicate be3) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, EntityPredicate.Composite.wrap(be1), EntityPredicate.Composite.wrap(be2), EntityPredicate.Composite.wrap(be3));
+        }
+        
+        public boolean matches(final LootContext dat1, final LootContext dat2, @Nullable final LootContext dat3) {
+            return (this.child == EntityPredicate.Composite.ANY || (dat3 != null && this.child.matches(dat3))) && ((this.parent.matches(dat1) && this.partner.matches(dat2)) || (this.parent.matches(dat2) && this.partner.matches(dat1)));
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("parent", this.parent.serializeToJson());
-            jsonObject2.add("partner", this.partner.serializeToJson());
-            jsonObject2.add("child", this.child.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("parent", this.parent.toJson(cg));
+            jsonObject3.add("partner", this.partner.toJson(cg));
+            jsonObject3.add("child", this.child.toJson(cg));
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/BrewedPotionTrigger.java b/src/net/minecraft/advancements/critereon/BrewedPotionTrigger.java
index 6b82087..5a668f6 100644
--- a/src/net/minecraft/advancements/critereon/BrewedPotionTrigger.java
+++ b/src/net/minecraft/advancements/critereon/BrewedPotionTrigger.java
@@ -1,14 +1,11 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import javax.annotation.Nullable;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.server.level.ServerPlayer;
 import com.google.gson.JsonSyntaxException;
 import net.minecraft.core.Registry;
 import net.minecraft.world.item.alchemy.Potion;
 import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -20,23 +17,22 @@ public class BrewedPotionTrigger extends SimpleCriterionTrigger<TriggerInstance>
         return BrewedPotionTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        Potion bgd4 = null;
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        Potion bmb5 = null;
         if (jsonObject.has("potion")) {
-            final ResourceLocation sm5 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "potion"));
+            final ResourceLocation uh6 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "potion"));
             final Object o;
             final Object obj;
-            bgd4 = Registry.POTION.getOptional(sm5).<Throwable>orElseThrow(() -> {
+            bmb5 = Registry.POTION.getOptional(uh6).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown potion '" + obj + "'");
                 return o;
             });
         }
-        return new TriggerInstance(bgd4);
+        return new TriggerInstance(b, bmb5);
     }
     
-    public void trigger(final ServerPlayer xe, final Potion bgd) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(bgd));
+    public void trigger(final ServerPlayer ze, final Potion bmb) {
+        this.trigger(ze, a -> a.matches(bmb));
     }
     
     static {
@@ -46,26 +42,26 @@ public class BrewedPotionTrigger extends SimpleCriterionTrigger<TriggerInstance>
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final Potion potion;
         
-        public TriggerInstance(@Nullable final Potion bgd) {
-            super(BrewedPotionTrigger.ID);
-            this.potion = bgd;
+        public TriggerInstance(final EntityPredicate.Composite b, @Nullable final Potion bmb) {
+            super(BrewedPotionTrigger.ID, b);
+            this.potion = bmb;
         }
         
         public static TriggerInstance brewedPotion() {
-            return new TriggerInstance((Potion)null);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, null);
         }
         
-        public boolean matches(final Potion bgd) {
-            return this.potion == null || this.potion == bgd;
+        public boolean matches(final Potion bmb) {
+            return this.potion == null || this.potion == bmb;
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
             if (this.potion != null) {
-                jsonObject2.addProperty("potion", Registry.POTION.getKey(this.potion).toString());
+                jsonObject3.addProperty("potion", Registry.POTION.getKey(this.potion).toString());
             }
-            return jsonObject2;
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/ChangeDimensionTrigger.java b/src/net/minecraft/advancements/critereon/ChangeDimensionTrigger.java
index 5d2dbc1..95be781 100644
--- a/src/net/minecraft/advancements/critereon/ChangeDimensionTrigger.java
+++ b/src/net/minecraft/advancements/critereon/ChangeDimensionTrigger.java
@@ -1,12 +1,11 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import javax.annotation.Nullable;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
+import net.minecraft.core.Registry;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -18,15 +17,14 @@ public class ChangeDimensionTrigger extends SimpleCriterionTrigger<TriggerInstan
         return ChangeDimensionTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final DimensionType cbi4 = jsonObject.has("from") ? DimensionType.getByName(new ResourceLocation(GsonHelper.getAsString(jsonObject, "from"))) : null;
-        final DimensionType cbi5 = jsonObject.has("to") ? DimensionType.getByName(new ResourceLocation(GsonHelper.getAsString(jsonObject, "to"))) : null;
-        return new TriggerInstance(cbi4, cbi5);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ResourceKey<Level> ug5 = jsonObject.has("from") ? ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, new ResourceLocation(GsonHelper.getAsString(jsonObject, "from"))) : null;
+        final ResourceKey<Level> ug6 = jsonObject.has("to") ? ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, new ResourceLocation(GsonHelper.getAsString(jsonObject, "to"))) : null;
+        return new TriggerInstance(b, ug5, ug6);
     }
     
-    public void trigger(final ServerPlayer xe, final DimensionType cbi2, final DimensionType cbi3) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(cbi2, cbi3));
+    public void trigger(final ServerPlayer ze, final ResourceKey<Level> ug2, final ResourceKey<Level> ug3) {
+        this.trigger(ze, a -> a.matches(ug2, ug3));
     }
     
     static {
@@ -35,34 +33,34 @@ public class ChangeDimensionTrigger extends SimpleCriterionTrigger<TriggerInstan
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         @Nullable
-        private final DimensionType from;
+        private final ResourceKey<Level> from;
         @Nullable
-        private final DimensionType to;
+        private final ResourceKey<Level> to;
         
-        public TriggerInstance(@Nullable final DimensionType cbi1, @Nullable final DimensionType cbi2) {
-            super(ChangeDimensionTrigger.ID);
-            this.from = cbi1;
-            this.to = cbi2;
+        public TriggerInstance(final EntityPredicate.Composite b, @Nullable final ResourceKey<Level> ug2, @Nullable final ResourceKey<Level> ug3) {
+            super(ChangeDimensionTrigger.ID, b);
+            this.from = ug2;
+            this.to = ug3;
         }
         
-        public static TriggerInstance changedDimensionTo(final DimensionType cbi) {
-            return new TriggerInstance(null, cbi);
+        public static TriggerInstance changedDimensionTo(final ResourceKey<Level> ug) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, null, ug);
         }
         
-        public boolean matches(final DimensionType cbi1, final DimensionType cbi2) {
-            return (this.from == null || this.from == cbi1) && (this.to == null || this.to == cbi2);
+        public boolean matches(final ResourceKey<Level> ug1, final ResourceKey<Level> ug2) {
+            return (this.from == null || this.from == ug1) && (this.to == null || this.to == ug2);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
             if (this.from != null) {
-                jsonObject2.addProperty("from", DimensionType.getName(this.from).toString());
+                jsonObject3.addProperty("from", this.from.location().toString());
             }
             if (this.to != null) {
-                jsonObject2.addProperty("to", DimensionType.getName(this.to).toString());
+                jsonObject3.addProperty("to", this.to.location().toString());
             }
-            return jsonObject2;
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/ChanneledLightningTrigger.java b/src/net/minecraft/advancements/critereon/ChanneledLightningTrigger.java
index b501676..7913f91 100644
--- a/src/net/minecraft/advancements/critereon/ChanneledLightningTrigger.java
+++ b/src/net/minecraft/advancements/critereon/ChanneledLightningTrigger.java
@@ -1,12 +1,15 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import java.util.Iterator;
-import net.minecraft.advancements.CriterionTriggerInstance;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import net.minecraft.world.level.storage.loot.LootContext;
+import java.util.List;
 import net.minecraft.world.entity.Entity;
 import java.util.Collection;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -18,14 +21,14 @@ public class ChanneledLightningTrigger extends SimpleCriterionTrigger<TriggerIns
         return ChanneledLightningTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final EntityPredicate[] arr4 = EntityPredicate.fromJsonArray(jsonObject.get("victims"));
-        return new TriggerInstance(arr4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final EntityPredicate.Composite[] arr5 = EntityPredicate.Composite.fromJsonArray(jsonObject, "victims", av);
+        return new TriggerInstance(b, arr5);
     }
     
-    public void trigger(final ServerPlayer xe, final Collection<? extends Entity> collection) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, collection));
+    public void trigger(final ServerPlayer ze, final Collection<? extends Entity> collection) {
+        final List<LootContext> list4 = collection.stream().map(aom -> EntityPredicate.createContext(ze, aom)).collect(Collectors.toList());
+        this.trigger(ze, a -> a.matches(list4));
     }
     
     static {
@@ -33,27 +36,27 @@ public class ChanneledLightningTrigger extends SimpleCriterionTrigger<TriggerIns
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        private final EntityPredicate[] victims;
+        private final EntityPredicate.Composite[] victims;
         
-        public TriggerInstance(final EntityPredicate[] arr) {
-            super(ChanneledLightningTrigger.ID);
+        public TriggerInstance(final EntityPredicate.Composite b, final EntityPredicate.Composite[] arr) {
+            super(ChanneledLightningTrigger.ID, b);
             this.victims = arr;
         }
         
         public static TriggerInstance channeledLightning(final EntityPredicate... arr) {
-            return new TriggerInstance(arr);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, Stream.<EntityPredicate>of(arr).map(EntityPredicate.Composite::wrap).<EntityPredicate.Composite>toArray(EntityPredicate.Composite[]::new));
         }
         
-        public boolean matches(final ServerPlayer xe, final Collection<? extends Entity> collection) {
-            for (final EntityPredicate bb7 : this.victims) {
-                boolean boolean8 = false;
-                for (final Entity akq10 : collection) {
-                    if (bb7.matches(xe, akq10)) {
-                        boolean8 = true;
+        public boolean matches(final Collection<? extends LootContext> collection) {
+            for (final EntityPredicate.Composite b6 : this.victims) {
+                boolean boolean7 = false;
+                for (final LootContext dat9 : collection) {
+                    if (b6.matches(dat9)) {
+                        boolean7 = true;
                         break;
                     }
                 }
-                if (!boolean8) {
+                if (!boolean7) {
                     return false;
                 }
             }
@@ -61,10 +64,10 @@ public class ChanneledLightningTrigger extends SimpleCriterionTrigger<TriggerIns
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("victims", EntityPredicate.serializeArrayToJson(this.victims));
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("victims", EntityPredicate.Composite.toJson(this.victims, cg));
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/ConstructBeaconTrigger.java b/src/net/minecraft/advancements/critereon/ConstructBeaconTrigger.java
index 566763b..947320c 100644
--- a/src/net/minecraft/advancements/critereon/ConstructBeaconTrigger.java
+++ b/src/net/minecraft/advancements/critereon/ConstructBeaconTrigger.java
@@ -1,10 +1,7 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.level.block.entity.BeaconBlockEntity;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -16,14 +13,13 @@ public class ConstructBeaconTrigger extends SimpleCriterionTrigger<TriggerInstan
         return ConstructBeaconTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final MinMaxBounds.Ints d4 = MinMaxBounds.Ints.fromJson(jsonObject.get("level"));
-        return new TriggerInstance(d4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final MinMaxBounds.Ints d5 = MinMaxBounds.Ints.fromJson(jsonObject.get("level"));
+        return new TriggerInstance(b, d5);
     }
     
-    public void trigger(final ServerPlayer xe, final BeaconBlockEntity bwg) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(bwg));
+    public void trigger(final ServerPlayer ze, final BeaconBlockEntity cdg) {
+        this.trigger(ze, a -> a.matches(cdg));
     }
     
     static {
@@ -33,24 +29,24 @@ public class ConstructBeaconTrigger extends SimpleCriterionTrigger<TriggerInstan
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final MinMaxBounds.Ints level;
         
-        public TriggerInstance(final MinMaxBounds.Ints d) {
-            super(ConstructBeaconTrigger.ID);
+        public TriggerInstance(final EntityPredicate.Composite b, final MinMaxBounds.Ints d) {
+            super(ConstructBeaconTrigger.ID, b);
             this.level = d;
         }
         
         public static TriggerInstance constructedBeacon(final MinMaxBounds.Ints d) {
-            return new TriggerInstance(d);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, d);
         }
         
-        public boolean matches(final BeaconBlockEntity bwg) {
-            return this.level.matches(bwg.getLevels());
+        public boolean matches(final BeaconBlockEntity cdg) {
+            return this.level.matches(cdg.getLevels());
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("level", this.level.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("level", this.level.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/ConsumeItemTrigger.java b/src/net/minecraft/advancements/critereon/ConsumeItemTrigger.java
index a2801b9..d1d4165 100644
--- a/src/net/minecraft/advancements/critereon/ConsumeItemTrigger.java
+++ b/src/net/minecraft/advancements/critereon/ConsumeItemTrigger.java
@@ -1,14 +1,11 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import net.minecraft.world.item.alchemy.Potion;
 import net.minecraft.world.item.Item;
 import net.minecraft.tags.Tag;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -20,13 +17,12 @@ public class ConsumeItemTrigger extends SimpleCriterionTrigger<TriggerInstance>
         return ConsumeItemTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        return new TriggerInstance(ItemPredicate.fromJson(jsonObject.get("item")));
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        return new TriggerInstance(b, ItemPredicate.fromJson(jsonObject.get("item")));
     }
     
-    public void trigger(final ServerPlayer xe, final ItemStack ben) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(ben));
+    public void trigger(final ServerPlayer ze, final ItemStack bki) {
+        this.trigger(ze, a -> a.matches(bki));
     }
     
     static {
@@ -36,28 +32,28 @@ public class ConsumeItemTrigger extends SimpleCriterionTrigger<TriggerInstance>
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final ItemPredicate item;
         
-        public TriggerInstance(final ItemPredicate bj) {
-            super(ConsumeItemTrigger.ID);
-            this.item = bj;
+        public TriggerInstance(final EntityPredicate.Composite b, final ItemPredicate bo) {
+            super(ConsumeItemTrigger.ID, b);
+            this.item = bo;
         }
         
         public static TriggerInstance usedItem() {
-            return new TriggerInstance(ItemPredicate.ANY);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, ItemPredicate.ANY);
         }
         
-        public static TriggerInstance usedItem(final ItemLike bjv) {
-            return new TriggerInstance(new ItemPredicate(null, bjv.asItem(), MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, EnchantmentPredicate.NONE, EnchantmentPredicate.NONE, null, NbtPredicate.ANY));
+        public static TriggerInstance usedItem(final ItemLike bqa) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, new ItemPredicate(null, bqa.asItem(), MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, EnchantmentPredicate.NONE, EnchantmentPredicate.NONE, null, NbtPredicate.ANY));
         }
         
-        public boolean matches(final ItemStack ben) {
-            return this.item.matches(ben);
+        public boolean matches(final ItemStack bki) {
+            return this.item.matches(bki);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("item", this.item.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("item", this.item.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/CuredZombieVillagerTrigger.java b/src/net/minecraft/advancements/critereon/CuredZombieVillagerTrigger.java
index 6382430..b326abc 100644
--- a/src/net/minecraft/advancements/critereon/CuredZombieVillagerTrigger.java
+++ b/src/net/minecraft/advancements/critereon/CuredZombieVillagerTrigger.java
@@ -1,12 +1,10 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
+import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.entity.npc.Villager;
 import net.minecraft.world.entity.monster.Zombie;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -18,15 +16,16 @@ public class CuredZombieVillagerTrigger extends SimpleCriterionTrigger<TriggerIn
         return CuredZombieVillagerTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final EntityPredicate bb4 = EntityPredicate.fromJson(jsonObject.get("zombie"));
-        final EntityPredicate bb5 = EntityPredicate.fromJson(jsonObject.get("villager"));
-        return new TriggerInstance(bb4, bb5);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final EntityPredicate.Composite b2 = EntityPredicate.Composite.fromJson(jsonObject, "zombie", av);
+        final EntityPredicate.Composite b3 = EntityPredicate.Composite.fromJson(jsonObject, "villager", av);
+        return new TriggerInstance(b, b2, b3);
     }
     
-    public void trigger(final ServerPlayer xe, final Zombie axp, final Villager axw) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, axp, axw));
+    public void trigger(final ServerPlayer ze, final Zombie bcu, final Villager bdp) {
+        final LootContext dat5 = EntityPredicate.createContext(ze, bcu);
+        final LootContext dat6 = EntityPredicate.createContext(ze, bdp);
+        this.trigger(ze, a -> a.matches(dat5, dat6));
     }
     
     static {
@@ -34,29 +33,29 @@ public class CuredZombieVillagerTrigger extends SimpleCriterionTrigger<TriggerIn
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        private final EntityPredicate zombie;
-        private final EntityPredicate villager;
+        private final EntityPredicate.Composite zombie;
+        private final EntityPredicate.Composite villager;
         
-        public TriggerInstance(final EntityPredicate bb1, final EntityPredicate bb2) {
-            super(CuredZombieVillagerTrigger.ID);
-            this.zombie = bb1;
-            this.villager = bb2;
+        public TriggerInstance(final EntityPredicate.Composite b1, final EntityPredicate.Composite b2, final EntityPredicate.Composite b3) {
+            super(CuredZombieVillagerTrigger.ID, b1);
+            this.zombie = b2;
+            this.villager = b3;
         }
         
         public static TriggerInstance curedZombieVillager() {
-            return new TriggerInstance(EntityPredicate.ANY, EntityPredicate.ANY);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY);
         }
         
-        public boolean matches(final ServerPlayer xe, final Zombie axp, final Villager axw) {
-            return this.zombie.matches(xe, axp) && this.villager.matches(xe, axw);
+        public boolean matches(final LootContext dat1, final LootContext dat2) {
+            return this.zombie.matches(dat1) && this.villager.matches(dat2);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("zombie", this.zombie.serializeToJson());
-            jsonObject2.add("villager", this.villager.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("zombie", this.zombie.toJson(cg));
+            jsonObject3.add("villager", this.villager.toJson(cg));
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/DamagePredicate.java b/src/net/minecraft/advancements/critereon/DamagePredicate.java
index 5115fbf..a2d07cf 100644
--- a/src/net/minecraft/advancements/critereon/DamagePredicate.java
+++ b/src/net/minecraft/advancements/critereon/DamagePredicate.java
@@ -24,16 +24,16 @@ public class DamagePredicate {
         this.type = DamageSourcePredicate.ANY;
     }
     
-    public DamagePredicate(final MinMaxBounds.Floats c1, final MinMaxBounds.Floats c2, final EntityPredicate bb, @Nullable final Boolean boolean4, final DamageSourcePredicate as) {
+    public DamagePredicate(final MinMaxBounds.Floats c1, final MinMaxBounds.Floats c2, final EntityPredicate be, @Nullable final Boolean boolean4, final DamageSourcePredicate au) {
         this.dealtDamage = c1;
         this.takenDamage = c2;
-        this.sourceEntity = bb;
+        this.sourceEntity = be;
         this.blocked = boolean4;
-        this.type = as;
+        this.type = au;
     }
     
-    public boolean matches(final ServerPlayer xe, final DamageSource ajz, final float float3, final float float4, final boolean boolean5) {
-        return this == DamagePredicate.ANY || (this.dealtDamage.matches(float3) && this.takenDamage.matches(float4) && this.sourceEntity.matches(xe, ajz.getEntity()) && (this.blocked == null || this.blocked == boolean5) && this.type.matches(xe, ajz));
+    public boolean matches(final ServerPlayer ze, final DamageSource anw, final float float3, final float float4, final boolean boolean5) {
+        return this == DamagePredicate.ANY || (this.dealtDamage.matches(float3) && this.takenDamage.matches(float4) && this.sourceEntity.matches(ze, anw.getEntity()) && (this.blocked == null || this.blocked == boolean5) && this.type.matches(ze, anw));
     }
     
     public static DamagePredicate fromJson(@Nullable final JsonElement jsonElement) {
@@ -44,9 +44,9 @@ public class DamagePredicate {
         final MinMaxBounds.Floats c3 = MinMaxBounds.Floats.fromJson(jsonObject2.get("dealt"));
         final MinMaxBounds.Floats c4 = MinMaxBounds.Floats.fromJson(jsonObject2.get("taken"));
         final Boolean boolean5 = jsonObject2.has("blocked") ? Boolean.valueOf(GsonHelper.getAsBoolean(jsonObject2, "blocked")) : null;
-        final EntityPredicate bb6 = EntityPredicate.fromJson(jsonObject2.get("source_entity"));
-        final DamageSourcePredicate as7 = DamageSourcePredicate.fromJson(jsonObject2.get("type"));
-        return new DamagePredicate(c3, c4, bb6, boolean5, as7);
+        final EntityPredicate be6 = EntityPredicate.fromJson(jsonObject2.get("source_entity"));
+        final DamageSourcePredicate au7 = DamageSourcePredicate.fromJson(jsonObject2.get("type"));
+        return new DamagePredicate(c3, c4, be6, boolean5, au7);
     }
     
     public JsonElement serializeToJson() {
diff --git a/src/net/minecraft/advancements/critereon/DamageSourcePredicate.java b/src/net/minecraft/advancements/critereon/DamageSourcePredicate.java
index cbd6d35..9775efd 100644
--- a/src/net/minecraft/advancements/critereon/DamageSourcePredicate.java
+++ b/src/net/minecraft/advancements/critereon/DamageSourcePredicate.java
@@ -23,7 +23,7 @@ public class DamageSourcePredicate {
     private final EntityPredicate directEntity;
     private final EntityPredicate sourceEntity;
     
-    public DamageSourcePredicate(@Nullable final Boolean boolean1, @Nullable final Boolean boolean2, @Nullable final Boolean boolean3, @Nullable final Boolean boolean4, @Nullable final Boolean boolean5, @Nullable final Boolean boolean6, @Nullable final Boolean boolean7, @Nullable final Boolean boolean8, final EntityPredicate bb9, final EntityPredicate bb10) {
+    public DamageSourcePredicate(@Nullable final Boolean boolean1, @Nullable final Boolean boolean2, @Nullable final Boolean boolean3, @Nullable final Boolean boolean4, @Nullable final Boolean boolean5, @Nullable final Boolean boolean6, @Nullable final Boolean boolean7, @Nullable final Boolean boolean8, final EntityPredicate be9, final EntityPredicate be10) {
         this.isProjectile = boolean1;
         this.isExplosion = boolean2;
         this.bypassesArmor = boolean3;
@@ -32,16 +32,16 @@ public class DamageSourcePredicate {
         this.isFire = boolean6;
         this.isMagic = boolean7;
         this.isLightning = boolean8;
-        this.directEntity = bb9;
-        this.sourceEntity = bb10;
+        this.directEntity = be9;
+        this.sourceEntity = be10;
     }
     
-    public boolean matches(final ServerPlayer xe, final DamageSource ajz) {
-        return this.matches(xe.getLevel(), xe.position(), ajz);
+    public boolean matches(final ServerPlayer ze, final DamageSource anw) {
+        return this.matches(ze.getLevel(), ze.position(), anw);
     }
     
-    public boolean matches(final ServerLevel xd, final Vec3 cvl, final DamageSource ajz) {
-        return this == DamageSourcePredicate.ANY || ((this.isProjectile == null || this.isProjectile == ajz.isProjectile()) && (this.isExplosion == null || this.isExplosion == ajz.isExplosion()) && (this.bypassesArmor == null || this.bypassesArmor == ajz.isBypassArmor()) && (this.bypassesInvulnerability == null || this.bypassesInvulnerability == ajz.isBypassInvul()) && (this.bypassesMagic == null || this.bypassesMagic == ajz.isBypassMagic()) && (this.isFire == null || this.isFire == ajz.isFire()) && (this.isMagic == null || this.isMagic == ajz.isMagic()) && (this.isLightning == null || this.isLightning == (ajz == DamageSource.LIGHTNING_BOLT)) && this.directEntity.matches(xd, cvl, ajz.getDirectEntity()) && this.sourceEntity.matches(xd, cvl, ajz.getEntity()));
+    public boolean matches(final ServerLevel zd, final Vec3 dem, final DamageSource anw) {
+        return this == DamageSourcePredicate.ANY || ((this.isProjectile == null || this.isProjectile == anw.isProjectile()) && (this.isExplosion == null || this.isExplosion == anw.isExplosion()) && (this.bypassesArmor == null || this.bypassesArmor == anw.isBypassArmor()) && (this.bypassesInvulnerability == null || this.bypassesInvulnerability == anw.isBypassInvul()) && (this.bypassesMagic == null || this.bypassesMagic == anw.isBypassMagic()) && (this.isFire == null || this.isFire == anw.isFire()) && (this.isMagic == null || this.isMagic == anw.isMagic()) && (this.isLightning == null || this.isLightning == (anw == DamageSource.LIGHTNING_BOLT)) && this.directEntity.matches(zd, dem, anw.getDirectEntity()) && this.sourceEntity.matches(zd, dem, anw.getEntity()));
     }
     
     public static DamageSourcePredicate fromJson(@Nullable final JsonElement jsonElement) {
@@ -57,9 +57,9 @@ public class DamageSourcePredicate {
         final Boolean boolean8 = getOptionalBoolean(jsonObject2, "is_fire");
         final Boolean boolean9 = getOptionalBoolean(jsonObject2, "is_magic");
         final Boolean boolean10 = getOptionalBoolean(jsonObject2, "is_lightning");
-        final EntityPredicate bb11 = EntityPredicate.fromJson(jsonObject2.get("direct_entity"));
-        final EntityPredicate bb12 = EntityPredicate.fromJson(jsonObject2.get("source_entity"));
-        return new DamageSourcePredicate(boolean3, boolean4, boolean5, boolean6, boolean7, boolean8, boolean9, boolean10, bb11, bb12);
+        final EntityPredicate be11 = EntityPredicate.fromJson(jsonObject2.get("direct_entity"));
+        final EntityPredicate be12 = EntityPredicate.fromJson(jsonObject2.get("source_entity"));
+        return new DamageSourcePredicate(boolean3, boolean4, boolean5, boolean6, boolean7, boolean8, boolean9, boolean10, be11, be12);
     }
     
     @Nullable
diff --git a/src/net/minecraft/advancements/critereon/DeserializationContext.java b/src/net/minecraft/advancements/critereon/DeserializationContext.java
new file mode 100644
index 0000000..6485d3e
--- /dev/null
+++ b/src/net/minecraft/advancements/critereon/DeserializationContext.java
@@ -0,0 +1,45 @@
+package net.minecraft.advancements.critereon;
+
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.world.level.storage.loot.LootTable;
+import net.minecraft.world.level.storage.loot.ValidationContext;
+import com.google.gson.JsonElement;
+import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet;
+import com.google.gson.JsonArray;
+import net.minecraft.world.level.storage.loot.Deserializers;
+import com.google.gson.Gson;
+import net.minecraft.world.level.storage.loot.PredicateManager;
+import net.minecraft.resources.ResourceLocation;
+import org.apache.logging.log4j.Logger;
+
+public class DeserializationContext {
+    private static final Logger LOGGER;
+    private final ResourceLocation id;
+    private final PredicateManager predicateManager;
+    private final Gson predicateGson;
+    
+    public DeserializationContext(final ResourceLocation uh, final PredicateManager day) {
+        this.predicateGson = Deserializers.createConditionSerializer().create();
+        this.id = uh;
+        this.predicateManager = day;
+    }
+    
+    public final LootItemCondition[] deserializeConditions(final JsonArray jsonArray, final String string, final LootContextParamSet dcy) {
+        final LootItemCondition[] arr5 = this.predicateGson.<LootItemCondition[]>fromJson(jsonArray, LootItemCondition[].class);
+        final ValidationContext dbe6 = new ValidationContext(dcy, this.predicateManager::get, uh -> null);
+        for (final LootItemCondition ddm10 : arr5) {
+            ddm10.validate(dbe6);
+            dbe6.getProblems().forEach((string2, string3) -> DeserializationContext.LOGGER.warn("Found validation problem in advancement trigger {}/{}: {}", string, string2, string3));
+        }
+        return arr5;
+    }
+    
+    public ResourceLocation getAdvancementId() {
+        return this.id;
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+}
diff --git a/src/net/minecraft/advancements/critereon/EffectsChangedTrigger.java b/src/net/minecraft/advancements/critereon/EffectsChangedTrigger.java
index 7bd238b..55418f0 100644
--- a/src/net/minecraft/advancements/critereon/EffectsChangedTrigger.java
+++ b/src/net/minecraft/advancements/critereon/EffectsChangedTrigger.java
@@ -1,10 +1,7 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -16,14 +13,13 @@ public class EffectsChangedTrigger extends SimpleCriterionTrigger<TriggerInstanc
         return EffectsChangedTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final MobEffectsPredicate bs4 = MobEffectsPredicate.fromJson(jsonObject.get("effects"));
-        return new TriggerInstance(bs4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final MobEffectsPredicate by5 = MobEffectsPredicate.fromJson(jsonObject.get("effects"));
+        return new TriggerInstance(b, by5);
     }
     
-    public void trigger(final ServerPlayer xe) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe));
+    public void trigger(final ServerPlayer ze) {
+        this.trigger(ze, a -> a.matches(ze));
     }
     
     static {
@@ -33,24 +29,24 @@ public class EffectsChangedTrigger extends SimpleCriterionTrigger<TriggerInstanc
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final MobEffectsPredicate effects;
         
-        public TriggerInstance(final MobEffectsPredicate bs) {
-            super(EffectsChangedTrigger.ID);
-            this.effects = bs;
+        public TriggerInstance(final EntityPredicate.Composite b, final MobEffectsPredicate by) {
+            super(EffectsChangedTrigger.ID, b);
+            this.effects = by;
         }
         
-        public static TriggerInstance hasEffects(final MobEffectsPredicate bs) {
-            return new TriggerInstance(bs);
+        public static TriggerInstance hasEffects(final MobEffectsPredicate by) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, by);
         }
         
-        public boolean matches(final ServerPlayer xe) {
-            return this.effects.matches(xe);
+        public boolean matches(final ServerPlayer ze) {
+            return this.effects.matches(ze);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("effects", this.effects.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("effects", this.effects.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/EnchantedItemTrigger.java b/src/net/minecraft/advancements/critereon/EnchantedItemTrigger.java
index 076c1d2..400e03b 100644
--- a/src/net/minecraft/advancements/critereon/EnchantedItemTrigger.java
+++ b/src/net/minecraft/advancements/critereon/EnchantedItemTrigger.java
@@ -1,10 +1,7 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -16,15 +13,14 @@ public class EnchantedItemTrigger extends SimpleCriterionTrigger<TriggerInstance
         return EnchantedItemTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final ItemPredicate bj4 = ItemPredicate.fromJson(jsonObject.get("item"));
-        final MinMaxBounds.Ints d5 = MinMaxBounds.Ints.fromJson(jsonObject.get("levels"));
-        return new TriggerInstance(bj4, d5);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ItemPredicate bo5 = ItemPredicate.fromJson(jsonObject.get("item"));
+        final MinMaxBounds.Ints d6 = MinMaxBounds.Ints.fromJson(jsonObject.get("levels"));
+        return new TriggerInstance(b, bo5, d6);
     }
     
-    public void trigger(final ServerPlayer xe, final ItemStack ben, final int integer) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(ben, integer));
+    public void trigger(final ServerPlayer ze, final ItemStack bki, final int integer) {
+        this.trigger(ze, a -> a.matches(bki, integer));
     }
     
     static {
@@ -35,26 +31,26 @@ public class EnchantedItemTrigger extends SimpleCriterionTrigger<TriggerInstance
         private final ItemPredicate item;
         private final MinMaxBounds.Ints levels;
         
-        public TriggerInstance(final ItemPredicate bj, final MinMaxBounds.Ints d) {
-            super(EnchantedItemTrigger.ID);
-            this.item = bj;
+        public TriggerInstance(final EntityPredicate.Composite b, final ItemPredicate bo, final MinMaxBounds.Ints d) {
+            super(EnchantedItemTrigger.ID, b);
+            this.item = bo;
             this.levels = d;
         }
         
         public static TriggerInstance enchantedItem() {
-            return new TriggerInstance(ItemPredicate.ANY, MinMaxBounds.Ints.ANY);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, ItemPredicate.ANY, MinMaxBounds.Ints.ANY);
         }
         
-        public boolean matches(final ItemStack ben, final int integer) {
-            return this.item.matches(ben) && this.levels.matches(integer);
+        public boolean matches(final ItemStack bki, final int integer) {
+            return this.item.matches(bki) && this.levels.matches(integer);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("item", this.item.serializeToJson());
-            jsonObject2.add("levels", this.levels.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("item", this.item.serializeToJson());
+            jsonObject3.add("levels", this.levels.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/EnchantmentPredicate.java b/src/net/minecraft/advancements/critereon/EnchantmentPredicate.java
index 9bf4065..8b6d1ef 100644
--- a/src/net/minecraft/advancements/critereon/EnchantmentPredicate.java
+++ b/src/net/minecraft/advancements/critereon/EnchantmentPredicate.java
@@ -24,8 +24,8 @@ public class EnchantmentPredicate {
         this.level = MinMaxBounds.Ints.ANY;
     }
     
-    public EnchantmentPredicate(@Nullable final Enchantment bhx, final MinMaxBounds.Ints d) {
-        this.enchantment = bhx;
+    public EnchantmentPredicate(@Nullable final Enchantment bnw, final MinMaxBounds.Ints d) {
+        this.enchantment = bnw;
         this.level = d;
     }
     
@@ -67,18 +67,18 @@ public class EnchantmentPredicate {
             return EnchantmentPredicate.ANY;
         }
         final JsonObject jsonObject2 = GsonHelper.convertToJsonObject(jsonElement, "enchantment");
-        Enchantment bhx3 = null;
+        Enchantment bnw3 = null;
         if (jsonObject2.has("enchantment")) {
-            final ResourceLocation sm4 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "enchantment"));
+            final ResourceLocation uh4 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "enchantment"));
             final Object o;
             final Object obj;
-            bhx3 = Registry.ENCHANTMENT.getOptional(sm4).<Throwable>orElseThrow(() -> {
+            bnw3 = Registry.ENCHANTMENT.getOptional(uh4).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown enchantment '" + obj + "'");
                 return o;
             });
         }
         final MinMaxBounds.Ints d4 = MinMaxBounds.Ints.fromJson(jsonObject2.get("levels"));
-        return new EnchantmentPredicate(bhx3, d4);
+        return new EnchantmentPredicate(bnw3, d4);
     }
     
     public static EnchantmentPredicate[] fromJsonArray(@Nullable final JsonElement jsonElement) {
diff --git a/src/net/minecraft/advancements/critereon/EnterBlockTrigger.java b/src/net/minecraft/advancements/critereon/EnterBlockTrigger.java
index 303d2b9..ec9dff3 100644
--- a/src/net/minecraft/advancements/critereon/EnterBlockTrigger.java
+++ b/src/net/minecraft/advancements/critereon/EnterBlockTrigger.java
@@ -1,7 +1,5 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.server.level.ServerPlayer;
 import javax.annotation.Nullable;
@@ -10,7 +8,6 @@ import net.minecraft.util.GsonHelper;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.StateDefinition;
 import com.google.gson.JsonSyntaxException;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -22,28 +19,27 @@ public class EnterBlockTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         return EnterBlockTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final Block bph4 = deserializeBlock(jsonObject);
-        final StatePropertiesPredicate cc5 = StatePropertiesPredicate.fromJson(jsonObject.get("state"));
-        if (bph4 != null) {
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final Block bvr5 = deserializeBlock(jsonObject);
+        final StatePropertiesPredicate ck6 = StatePropertiesPredicate.fromJson(jsonObject.get("state"));
+        if (bvr5 != null) {
             final JsonSyntaxException ex;
             final Object obj;
-            cc5.checkState(bph4.getStateDefinition(), string -> {
+            ck6.checkState(bvr5.getStateDefinition(), string -> {
                 new JsonSyntaxException("Block " + obj + " has no property " + string);
                 throw ex;
             });
         }
-        return new TriggerInstance(bph4, cc5);
+        return new TriggerInstance(b, bvr5, ck6);
     }
     
     @Nullable
     private static Block deserializeBlock(final JsonObject jsonObject) {
         if (jsonObject.has("block")) {
-            final ResourceLocation sm2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
+            final ResourceLocation uh2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
             final Object o;
             final Object obj;
-            return Registry.BLOCK.getOptional(sm2).<Throwable>orElseThrow(() -> {
+            return Registry.BLOCK.getOptional(uh2).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown block type '" + obj + "'");
                 return o;
             });
@@ -51,8 +47,8 @@ public class EnterBlockTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         return null;
     }
     
-    public void trigger(final ServerPlayer xe, final BlockState byj) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(byj));
+    public void trigger(final ServerPlayer ze, final BlockState cfj) {
+        this.trigger(ze, a -> a.matches(cfj));
     }
     
     static {
@@ -63,28 +59,28 @@ public class EnterBlockTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         private final Block block;
         private final StatePropertiesPredicate state;
         
-        public TriggerInstance(@Nullable final Block bph, final StatePropertiesPredicate cc) {
-            super(EnterBlockTrigger.ID);
-            this.block = bph;
-            this.state = cc;
+        public TriggerInstance(final EntityPredicate.Composite b, @Nullable final Block bvr, final StatePropertiesPredicate ck) {
+            super(EnterBlockTrigger.ID, b);
+            this.block = bvr;
+            this.state = ck;
         }
         
-        public static TriggerInstance entersBlock(final Block bph) {
-            return new TriggerInstance(bph, StatePropertiesPredicate.ANY);
+        public static TriggerInstance entersBlock(final Block bvr) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, bvr, StatePropertiesPredicate.ANY);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
             if (this.block != null) {
-                jsonObject2.addProperty("block", Registry.BLOCK.getKey(this.block).toString());
+                jsonObject3.addProperty("block", Registry.BLOCK.getKey(this.block).toString());
             }
-            jsonObject2.add("state", this.state.serializeToJson());
-            return jsonObject2;
+            jsonObject3.add("state", this.state.serializeToJson());
+            return jsonObject3;
         }
         
-        public boolean matches(final BlockState byj) {
-            return (this.block == null || byj.getBlock() == this.block) && this.state.matches(byj);
+        public boolean matches(final BlockState cfj) {
+            return (this.block == null || cfj.is(this.block)) && this.state.matches(cfj);
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java b/src/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java
index b2a364f..2b58895 100644
--- a/src/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java
+++ b/src/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java
@@ -22,24 +22,24 @@ public class EntityEquipmentPredicate {
     private final ItemPredicate mainhand;
     private final ItemPredicate offhand;
     
-    public EntityEquipmentPredicate(final ItemPredicate bj1, final ItemPredicate bj2, final ItemPredicate bj3, final ItemPredicate bj4, final ItemPredicate bj5, final ItemPredicate bj6) {
-        this.head = bj1;
-        this.chest = bj2;
-        this.legs = bj3;
-        this.feet = bj4;
-        this.mainhand = bj5;
-        this.offhand = bj6;
+    public EntityEquipmentPredicate(final ItemPredicate bo1, final ItemPredicate bo2, final ItemPredicate bo3, final ItemPredicate bo4, final ItemPredicate bo5, final ItemPredicate bo6) {
+        this.head = bo1;
+        this.chest = bo2;
+        this.legs = bo3;
+        this.feet = bo4;
+        this.mainhand = bo5;
+        this.offhand = bo6;
     }
     
-    public boolean matches(@Nullable final Entity akq) {
+    public boolean matches(@Nullable final Entity aom) {
         if (this == EntityEquipmentPredicate.ANY) {
             return true;
         }
-        if (!(akq instanceof LivingEntity)) {
+        if (!(aom instanceof LivingEntity)) {
             return false;
         }
-        final LivingEntity akz3 = (LivingEntity)akq;
-        return this.head.matches(akz3.getItemBySlot(EquipmentSlot.HEAD)) && this.chest.matches(akz3.getItemBySlot(EquipmentSlot.CHEST)) && this.legs.matches(akz3.getItemBySlot(EquipmentSlot.LEGS)) && this.feet.matches(akz3.getItemBySlot(EquipmentSlot.FEET)) && this.mainhand.matches(akz3.getItemBySlot(EquipmentSlot.MAINHAND)) && this.offhand.matches(akz3.getItemBySlot(EquipmentSlot.OFFHAND));
+        final LivingEntity aoy3 = (LivingEntity)aom;
+        return this.head.matches(aoy3.getItemBySlot(EquipmentSlot.HEAD)) && this.chest.matches(aoy3.getItemBySlot(EquipmentSlot.CHEST)) && this.legs.matches(aoy3.getItemBySlot(EquipmentSlot.LEGS)) && this.feet.matches(aoy3.getItemBySlot(EquipmentSlot.FEET)) && this.mainhand.matches(aoy3.getItemBySlot(EquipmentSlot.MAINHAND)) && this.offhand.matches(aoy3.getItemBySlot(EquipmentSlot.OFFHAND));
     }
     
     public static EntityEquipmentPredicate fromJson(@Nullable final JsonElement jsonElement) {
@@ -47,13 +47,13 @@ public class EntityEquipmentPredicate {
             return EntityEquipmentPredicate.ANY;
         }
         final JsonObject jsonObject2 = GsonHelper.convertToJsonObject(jsonElement, "equipment");
-        final ItemPredicate bj3 = ItemPredicate.fromJson(jsonObject2.get("head"));
-        final ItemPredicate bj4 = ItemPredicate.fromJson(jsonObject2.get("chest"));
-        final ItemPredicate bj5 = ItemPredicate.fromJson(jsonObject2.get("legs"));
-        final ItemPredicate bj6 = ItemPredicate.fromJson(jsonObject2.get("feet"));
-        final ItemPredicate bj7 = ItemPredicate.fromJson(jsonObject2.get("mainhand"));
-        final ItemPredicate bj8 = ItemPredicate.fromJson(jsonObject2.get("offhand"));
-        return new EntityEquipmentPredicate(bj3, bj4, bj5, bj6, bj7, bj8);
+        final ItemPredicate bo3 = ItemPredicate.fromJson(jsonObject2.get("head"));
+        final ItemPredicate bo4 = ItemPredicate.fromJson(jsonObject2.get("chest"));
+        final ItemPredicate bo5 = ItemPredicate.fromJson(jsonObject2.get("legs"));
+        final ItemPredicate bo6 = ItemPredicate.fromJson(jsonObject2.get("feet"));
+        final ItemPredicate bo7 = ItemPredicate.fromJson(jsonObject2.get("mainhand"));
+        final ItemPredicate bo8 = ItemPredicate.fromJson(jsonObject2.get("offhand"));
+        return new EntityEquipmentPredicate(bo3, bo4, bo5, bo6, bo7, bo8);
     }
     
     public JsonElement serializeToJson() {
@@ -74,4 +74,50 @@ public class EntityEquipmentPredicate {
         ANY = new EntityEquipmentPredicate(ItemPredicate.ANY, ItemPredicate.ANY, ItemPredicate.ANY, ItemPredicate.ANY, ItemPredicate.ANY, ItemPredicate.ANY);
         CAPTAIN = new EntityEquipmentPredicate(ItemPredicate.Builder.item().of(Items.WHITE_BANNER).hasNbt(Raid.getLeaderBannerInstance().getTag()).build(), ItemPredicate.ANY, ItemPredicate.ANY, ItemPredicate.ANY, ItemPredicate.ANY, ItemPredicate.ANY);
     }
+    
+    public static class Builder {
+        private ItemPredicate head;
+        private ItemPredicate chest;
+        private ItemPredicate legs;
+        private ItemPredicate feet;
+        private ItemPredicate mainhand;
+        private ItemPredicate offhand;
+        
+        public Builder() {
+            this.head = ItemPredicate.ANY;
+            this.chest = ItemPredicate.ANY;
+            this.legs = ItemPredicate.ANY;
+            this.feet = ItemPredicate.ANY;
+            this.mainhand = ItemPredicate.ANY;
+            this.offhand = ItemPredicate.ANY;
+        }
+        
+        public static Builder equipment() {
+            return new Builder();
+        }
+        
+        public Builder head(final ItemPredicate bo) {
+            this.head = bo;
+            return this;
+        }
+        
+        public Builder chest(final ItemPredicate bo) {
+            this.chest = bo;
+            return this;
+        }
+        
+        public Builder legs(final ItemPredicate bo) {
+            this.legs = bo;
+            return this;
+        }
+        
+        public Builder feet(final ItemPredicate bo) {
+            this.feet = bo;
+            return this;
+        }
+        
+        public EntityEquipmentPredicate build() {
+            return new EntityEquipmentPredicate(this.head, this.chest, this.legs, this.feet, this.mainhand, this.offhand);
+        }
+    }
 }
diff --git a/src/net/minecraft/advancements/critereon/EntityFlagsPredicate.java b/src/net/minecraft/advancements/critereon/EntityFlagsPredicate.java
index f4d6821..48737a8 100644
--- a/src/net/minecraft/advancements/critereon/EntityFlagsPredicate.java
+++ b/src/net/minecraft/advancements/critereon/EntityFlagsPredicate.java
@@ -29,8 +29,8 @@ public class EntityFlagsPredicate {
         this.isBaby = boolean5;
     }
     
-    public boolean matches(final Entity akq) {
-        return (this.isOnFire == null || akq.isOnFire() == this.isOnFire) && (this.isCrouching == null || akq.isCrouching() == this.isCrouching) && (this.isSprinting == null || akq.isSprinting() == this.isSprinting) && (this.isSwimming == null || akq.isSwimming() == this.isSwimming) && (this.isBaby == null || !(akq instanceof LivingEntity) || ((LivingEntity)akq).isBaby() == this.isBaby);
+    public boolean matches(final Entity aom) {
+        return (this.isOnFire == null || aom.isOnFire() == this.isOnFire) && (this.isCrouching == null || aom.isCrouching() == this.isCrouching) && (this.isSprinting == null || aom.isSprinting() == this.isSprinting) && (this.isSwimming == null || aom.isSwimming() == this.isSwimming) && (this.isBaby == null || !(aom instanceof LivingEntity) || ((LivingEntity)aom).isBaby() == this.isBaby);
     }
     
     @Nullable
@@ -95,6 +95,11 @@ public class EntityFlagsPredicate {
             return this;
         }
         
+        public Builder setIsBaby(@Nullable final Boolean boolean1) {
+            this.isBaby = boolean1;
+            return this;
+        }
+        
         public EntityFlagsPredicate build() {
             return new EntityFlagsPredicate(this.isOnFire, this.isCrouching, this.isSprinting, this.isSwimming, this.isBaby);
         }
diff --git a/src/net/minecraft/advancements/critereon/EntityHurtPlayerTrigger.java b/src/net/minecraft/advancements/critereon/EntityHurtPlayerTrigger.java
index 7d36b9d..8315582 100644
--- a/src/net/minecraft/advancements/critereon/EntityHurtPlayerTrigger.java
+++ b/src/net/minecraft/advancements/critereon/EntityHurtPlayerTrigger.java
@@ -1,10 +1,7 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -16,14 +13,13 @@ public class EntityHurtPlayerTrigger extends SimpleCriterionTrigger<TriggerInsta
         return EntityHurtPlayerTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final DamagePredicate ar4 = DamagePredicate.fromJson(jsonObject.get("damage"));
-        return new TriggerInstance(ar4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final DamagePredicate at5 = DamagePredicate.fromJson(jsonObject.get("damage"));
+        return new TriggerInstance(b, at5);
     }
     
-    public void trigger(final ServerPlayer xe, final DamageSource ajz, final float float3, final float float4, final boolean boolean5) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, ajz, float3, float4, boolean5));
+    public void trigger(final ServerPlayer ze, final DamageSource anw, final float float3, final float float4, final boolean boolean5) {
+        this.trigger(ze, a -> a.matches(ze, anw, float3, float4, boolean5));
     }
     
     static {
@@ -33,24 +29,24 @@ public class EntityHurtPlayerTrigger extends SimpleCriterionTrigger<TriggerInsta
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final DamagePredicate damage;
         
-        public TriggerInstance(final DamagePredicate ar) {
-            super(EntityHurtPlayerTrigger.ID);
-            this.damage = ar;
+        public TriggerInstance(final EntityPredicate.Composite b, final DamagePredicate at) {
+            super(EntityHurtPlayerTrigger.ID, b);
+            this.damage = at;
         }
         
         public static TriggerInstance entityHurtPlayer(final DamagePredicate.Builder a) {
-            return new TriggerInstance(a.build());
+            return new TriggerInstance(EntityPredicate.Composite.ANY, a.build());
         }
         
-        public boolean matches(final ServerPlayer xe, final DamageSource ajz, final float float3, final float float4, final boolean boolean5) {
-            return this.damage.matches(xe, ajz, float3, float4, boolean5);
+        public boolean matches(final ServerPlayer ze, final DamageSource anw, final float float3, final float float4, final boolean boolean5) {
+            return this.damage.matches(ze, anw, float3, float4, boolean5);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("damage", this.damage.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("damage", this.damage.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/EntityPredicate.java b/src/net/minecraft/advancements/critereon/EntityPredicate.java
index 11c983b..eb5c2f5 100644
--- a/src/net/minecraft/advancements/critereon/EntityPredicate.java
+++ b/src/net/minecraft/advancements/critereon/EntityPredicate.java
@@ -1,14 +1,23 @@
 package net.minecraft.advancements.critereon;
 
+import net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition;
+import com.google.gson.JsonArray;
+import net.minecraft.world.level.storage.loot.predicates.LootItemConditions;
+import java.util.function.Predicate;
+import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 import net.minecraft.tags.Tag;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import net.minecraft.world.level.storage.loot.LootContext;
 import com.google.gson.JsonNull;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonElement;
 import net.minecraft.world.scores.Team;
 import net.minecraft.world.entity.animal.Cat;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
@@ -18,7 +27,6 @@ import javax.annotation.Nullable;
 
 public class EntityPredicate {
     public static final EntityPredicate ANY;
-    public static final EntityPredicate[] ANY_ARRAY;
     private final EntityTypePredicate entityType;
     private final DistancePredicate distanceToPlayer;
     private final LocationPredicate location;
@@ -27,71 +35,102 @@ public class EntityPredicate {
     private final EntityFlagsPredicate flags;
     private final EntityEquipmentPredicate equipment;
     private final PlayerPredicate player;
+    private final FishingHookPredicate fishingHook;
+    private final EntityPredicate vehicle;
+    private final EntityPredicate targetedEntity;
     @Nullable
     private final String team;
     @Nullable
     private final ResourceLocation catType;
     
-    private EntityPredicate(final EntityTypePredicate bc, final DistancePredicate at, final LocationPredicate bp, final MobEffectsPredicate bs, final NbtPredicate bt, final EntityFlagsPredicate az, final EntityEquipmentPredicate ay, final PlayerPredicate bx, @Nullable final String string, @Nullable final ResourceLocation sm) {
-        this.entityType = bc;
-        this.distanceToPlayer = at;
-        this.location = bp;
-        this.effects = bs;
-        this.nbt = bt;
-        this.flags = az;
-        this.equipment = ay;
-        this.player = bx;
+    private EntityPredicate(final EntityTypePredicate bf, final DistancePredicate aw, final LocationPredicate bu, final MobEffectsPredicate by, final NbtPredicate bz, final EntityFlagsPredicate bc, final EntityEquipmentPredicate bb, final PlayerPredicate ce, final FishingHookPredicate bh, @Nullable final String string, @Nullable final ResourceLocation uh) {
+        this.entityType = bf;
+        this.distanceToPlayer = aw;
+        this.location = bu;
+        this.effects = by;
+        this.nbt = bz;
+        this.flags = bc;
+        this.equipment = bb;
+        this.player = ce;
+        this.fishingHook = bh;
+        this.vehicle = this;
+        this.targetedEntity = this;
         this.team = string;
-        this.catType = sm;
+        this.catType = uh;
     }
     
-    public boolean matches(final ServerPlayer xe, @Nullable final Entity akq) {
-        return this.matches(xe.getLevel(), xe.position(), akq);
+    private EntityPredicate(final EntityTypePredicate bf, final DistancePredicate aw, final LocationPredicate bu, final MobEffectsPredicate by, final NbtPredicate bz, final EntityFlagsPredicate bc, final EntityEquipmentPredicate bb, final PlayerPredicate ce, final FishingHookPredicate bh, final EntityPredicate be10, final EntityPredicate be11, @Nullable final String string, @Nullable final ResourceLocation uh) {
+        this.entityType = bf;
+        this.distanceToPlayer = aw;
+        this.location = bu;
+        this.effects = by;
+        this.nbt = bz;
+        this.flags = bc;
+        this.equipment = bb;
+        this.player = ce;
+        this.fishingHook = bh;
+        this.vehicle = be10;
+        this.targetedEntity = be11;
+        this.team = string;
+        this.catType = uh;
     }
     
-    public boolean matches(final ServerLevel xd, @Nullable final Vec3 cvl, @Nullable final Entity akq) {
+    public boolean matches(final ServerPlayer ze, @Nullable final Entity aom) {
+        return this.matches(ze.getLevel(), ze.position(), aom);
+    }
+    
+    public boolean matches(final ServerLevel zd, @Nullable final Vec3 dem, @Nullable final Entity aom) {
         if (this == EntityPredicate.ANY) {
             return true;
         }
-        if (akq == null) {
+        if (aom == null) {
             return false;
         }
-        if (!this.entityType.matches(akq.getType())) {
+        if (!this.entityType.matches(aom.getType())) {
             return false;
         }
-        if (cvl == null) {
+        if (dem == null) {
             if (this.distanceToPlayer != DistancePredicate.ANY) {
                 return false;
             }
         }
-        else if (!this.distanceToPlayer.matches(cvl.x, cvl.y, cvl.z, akq.getX(), akq.getY(), akq.getZ())) {
+        else if (!this.distanceToPlayer.matches(dem.x, dem.y, dem.z, aom.getX(), aom.getY(), aom.getZ())) {
             return false;
         }
-        if (!this.location.matches(xd, akq.getX(), akq.getY(), akq.getZ())) {
+        if (!this.location.matches(zd, aom.getX(), aom.getY(), aom.getZ())) {
             return false;
         }
-        if (!this.effects.matches(akq)) {
+        if (!this.effects.matches(aom)) {
             return false;
         }
-        if (!this.nbt.matches(akq)) {
+        if (!this.nbt.matches(aom)) {
             return false;
         }
-        if (!this.flags.matches(akq)) {
+        if (!this.flags.matches(aom)) {
             return false;
         }
-        if (!this.equipment.matches(akq)) {
+        if (!this.equipment.matches(aom)) {
             return false;
         }
-        if (!this.player.matches(akq)) {
+        if (!this.player.matches(aom)) {
+            return false;
+        }
+        if (!this.fishingHook.matches(aom)) {
+            return false;
+        }
+        if (!this.vehicle.matches(zd, dem, aom.getVehicle())) {
+            return false;
+        }
+        if (!this.targetedEntity.matches(zd, dem, (aom instanceof Mob) ? ((Mob)aom).getTarget() : null)) {
             return false;
         }
         if (this.team != null) {
-            final Team cwn5 = akq.getTeam();
-            if (cwn5 == null || !this.team.equals(cwn5.getName())) {
+            final Team dfo5 = aom.getTeam();
+            if (dfo5 == null || !this.team.equals(dfo5.getName())) {
                 return false;
             }
         }
-        return this.catType == null || (akq instanceof Cat && ((Cat)akq).getResourceLocation().equals(this.catType));
+        return this.catType == null || (aom instanceof Cat && ((Cat)aom).getResourceLocation().equals(this.catType));
     }
     
     public static EntityPredicate fromJson(@Nullable final JsonElement jsonElement) {
@@ -99,29 +138,20 @@ public class EntityPredicate {
             return EntityPredicate.ANY;
         }
         final JsonObject jsonObject2 = GsonHelper.convertToJsonObject(jsonElement, "entity");
-        final EntityTypePredicate bc3 = EntityTypePredicate.fromJson(jsonObject2.get("type"));
-        final DistancePredicate at4 = DistancePredicate.fromJson(jsonObject2.get("distance"));
-        final LocationPredicate bp5 = LocationPredicate.fromJson(jsonObject2.get("location"));
-        final MobEffectsPredicate bs6 = MobEffectsPredicate.fromJson(jsonObject2.get("effects"));
-        final NbtPredicate bt7 = NbtPredicate.fromJson(jsonObject2.get("nbt"));
-        final EntityFlagsPredicate az8 = EntityFlagsPredicate.fromJson(jsonObject2.get("flags"));
-        final EntityEquipmentPredicate ay9 = EntityEquipmentPredicate.fromJson(jsonObject2.get("equipment"));
-        final PlayerPredicate bx10 = PlayerPredicate.fromJson(jsonObject2.get("player"));
-        final String string11 = GsonHelper.getAsString(jsonObject2, "team", null);
-        final ResourceLocation sm12 = jsonObject2.has("catType") ? new ResourceLocation(GsonHelper.getAsString(jsonObject2, "catType")) : null;
-        return new Builder().entityType(bc3).distance(at4).located(bp5).effects(bs6).nbt(bt7).flags(az8).equipment(ay9).player(bx10).team(string11).catType(sm12).build();
-    }
-    
-    public static EntityPredicate[] fromJsonArray(@Nullable final JsonElement jsonElement) {
-        if (jsonElement == null || jsonElement.isJsonNull()) {
-            return EntityPredicate.ANY_ARRAY;
-        }
-        final JsonArray jsonArray2 = GsonHelper.convertToJsonArray(jsonElement, "entities");
-        final EntityPredicate[] arr3 = new EntityPredicate[jsonArray2.size()];
-        for (int integer4 = 0; integer4 < jsonArray2.size(); ++integer4) {
-            arr3[integer4] = fromJson(jsonArray2.get(integer4));
-        }
-        return arr3;
+        final EntityTypePredicate bf3 = EntityTypePredicate.fromJson(jsonObject2.get("type"));
+        final DistancePredicate aw4 = DistancePredicate.fromJson(jsonObject2.get("distance"));
+        final LocationPredicate bu5 = LocationPredicate.fromJson(jsonObject2.get("location"));
+        final MobEffectsPredicate by6 = MobEffectsPredicate.fromJson(jsonObject2.get("effects"));
+        final NbtPredicate bz7 = NbtPredicate.fromJson(jsonObject2.get("nbt"));
+        final EntityFlagsPredicate bc8 = EntityFlagsPredicate.fromJson(jsonObject2.get("flags"));
+        final EntityEquipmentPredicate bb9 = EntityEquipmentPredicate.fromJson(jsonObject2.get("equipment"));
+        final PlayerPredicate ce10 = PlayerPredicate.fromJson(jsonObject2.get("player"));
+        final FishingHookPredicate bh11 = FishingHookPredicate.fromJson(jsonObject2.get("fishing_hook"));
+        final EntityPredicate be12 = fromJson(jsonObject2.get("vehicle"));
+        final EntityPredicate be13 = fromJson(jsonObject2.get("targeted_entity"));
+        final String string14 = GsonHelper.getAsString(jsonObject2, "team", null);
+        final ResourceLocation uh15 = jsonObject2.has("catType") ? new ResourceLocation(GsonHelper.getAsString(jsonObject2, "catType")) : null;
+        return new Builder().entityType(bf3).distance(aw4).located(bu5).effects(by6).nbt(bz7).flags(bc8).equipment(bb9).player(ce10).fishingHook(bh11).team(string14).vehicle(be12).targetedEntity(be13).catType(uh15).build();
     }
     
     public JsonElement serializeToJson() {
@@ -137,6 +167,9 @@ public class EntityPredicate {
         jsonObject2.add("flags", this.flags.serializeToJson());
         jsonObject2.add("equipment", this.equipment.serializeToJson());
         jsonObject2.add("player", this.player.serializeToJson());
+        jsonObject2.add("fishing_hook", this.fishingHook.serializeToJson());
+        jsonObject2.add("vehicle", this.vehicle.serializeToJson());
+        jsonObject2.add("targeted_entity", this.targetedEntity.serializeToJson());
         jsonObject2.addProperty("team", this.team);
         if (this.catType != null) {
             jsonObject2.addProperty("catType", this.catType.toString());
@@ -144,23 +177,12 @@ public class EntityPredicate {
         return jsonObject2;
     }
     
-    public static JsonElement serializeArrayToJson(final EntityPredicate[] arr) {
-        if (arr == EntityPredicate.ANY_ARRAY) {
-            return JsonNull.INSTANCE;
-        }
-        final JsonArray jsonArray2 = new JsonArray();
-        for (final EntityPredicate bb6 : arr) {
-            final JsonElement jsonElement7 = bb6.serializeToJson();
-            if (!jsonElement7.isJsonNull()) {
-                jsonArray2.add(jsonElement7);
-            }
-        }
-        return jsonArray2;
+    public static LootContext createContext(final ServerPlayer ze, final Entity aom) {
+        return new LootContext.Builder(ze.getLevel()).<Entity>withParameter(LootContextParams.THIS_ENTITY, aom).<BlockPos>withParameter(LootContextParams.BLOCK_POS, aom.blockPosition()).<Vec3>withParameter(LootContextParams.ORIGIN, ze.position()).withRandom(ze.getRandom()).create(LootContextParamSets.ADVANCEMENT_ENTITY);
     }
     
     static {
-        ANY = new EntityPredicate(EntityTypePredicate.ANY, DistancePredicate.ANY, LocationPredicate.ANY, MobEffectsPredicate.ANY, NbtPredicate.ANY, EntityFlagsPredicate.ANY, EntityEquipmentPredicate.ANY, PlayerPredicate.ANY, null, null);
-        ANY_ARRAY = new EntityPredicate[0];
+        ANY = new EntityPredicate(EntityTypePredicate.ANY, DistancePredicate.ANY, LocationPredicate.ANY, MobEffectsPredicate.ANY, NbtPredicate.ANY, EntityFlagsPredicate.ANY, EntityEquipmentPredicate.ANY, PlayerPredicate.ANY, FishingHookPredicate.ANY, null, null);
     }
     
     public static class Builder {
@@ -172,6 +194,9 @@ public class EntityPredicate {
         private EntityFlagsPredicate flags;
         private EntityEquipmentPredicate equipment;
         private PlayerPredicate player;
+        private FishingHookPredicate fishingHook;
+        private EntityPredicate vehicle;
+        private EntityPredicate targetedEntity;
         private String team;
         private ResourceLocation catType;
         
@@ -184,64 +209,82 @@ public class EntityPredicate {
             this.flags = EntityFlagsPredicate.ANY;
             this.equipment = EntityEquipmentPredicate.ANY;
             this.player = PlayerPredicate.ANY;
+            this.fishingHook = FishingHookPredicate.ANY;
+            this.vehicle = EntityPredicate.ANY;
+            this.targetedEntity = EntityPredicate.ANY;
         }
         
         public static Builder entity() {
             return new Builder();
         }
         
-        public Builder of(final EntityType<?> aku) {
-            this.entityType = EntityTypePredicate.of(aku);
+        public Builder of(final EntityType<?> aoq) {
+            this.entityType = EntityTypePredicate.of(aoq);
             return this;
         }
         
-        public Builder of(final Tag<EntityType<?>> aaz) {
-            this.entityType = EntityTypePredicate.of(aaz);
+        public Builder of(final Tag<EntityType<?>> adf) {
+            this.entityType = EntityTypePredicate.of(adf);
             return this;
         }
         
-        public Builder of(final ResourceLocation sm) {
-            this.catType = sm;
+        public Builder of(final ResourceLocation uh) {
+            this.catType = uh;
             return this;
         }
         
-        public Builder entityType(final EntityTypePredicate bc) {
-            this.entityType = bc;
+        public Builder entityType(final EntityTypePredicate bf) {
+            this.entityType = bf;
             return this;
         }
         
-        public Builder distance(final DistancePredicate at) {
-            this.distanceToPlayer = at;
+        public Builder distance(final DistancePredicate aw) {
+            this.distanceToPlayer = aw;
             return this;
         }
         
-        public Builder located(final LocationPredicate bp) {
-            this.location = bp;
+        public Builder located(final LocationPredicate bu) {
+            this.location = bu;
             return this;
         }
         
-        public Builder effects(final MobEffectsPredicate bs) {
-            this.effects = bs;
+        public Builder effects(final MobEffectsPredicate by) {
+            this.effects = by;
             return this;
         }
         
-        public Builder nbt(final NbtPredicate bt) {
-            this.nbt = bt;
+        public Builder nbt(final NbtPredicate bz) {
+            this.nbt = bz;
             return this;
         }
         
-        public Builder flags(final EntityFlagsPredicate az) {
-            this.flags = az;
+        public Builder flags(final EntityFlagsPredicate bc) {
+            this.flags = bc;
             return this;
         }
         
-        public Builder equipment(final EntityEquipmentPredicate ay) {
-            this.equipment = ay;
+        public Builder equipment(final EntityEquipmentPredicate bb) {
+            this.equipment = bb;
             return this;
         }
         
-        public Builder player(final PlayerPredicate bx) {
-            this.player = bx;
+        public Builder player(final PlayerPredicate ce) {
+            this.player = ce;
+            return this;
+        }
+        
+        public Builder fishingHook(final FishingHookPredicate bh) {
+            this.fishingHook = bh;
+            return this;
+        }
+        
+        public Builder vehicle(final EntityPredicate be) {
+            this.vehicle = be;
+            return this;
+        }
+        
+        public Builder targetedEntity(final EntityPredicate be) {
+            this.targetedEntity = be;
             return this;
         }
         
@@ -250,13 +293,89 @@ public class EntityPredicate {
             return this;
         }
         
-        public Builder catType(@Nullable final ResourceLocation sm) {
-            this.catType = sm;
+        public Builder catType(@Nullable final ResourceLocation uh) {
+            this.catType = uh;
             return this;
         }
         
         public EntityPredicate build() {
-            return new EntityPredicate(this.entityType, this.distanceToPlayer, this.location, this.effects, this.nbt, this.flags, this.equipment, this.player, this.team, this.catType, null);
+            return new EntityPredicate(this.entityType, this.distanceToPlayer, this.location, this.effects, this.nbt, this.flags, this.equipment, this.player, this.fishingHook, this.vehicle, this.targetedEntity, this.team, this.catType, null);
+        }
+    }
+    
+    public static class Composite {
+        public static final Composite ANY;
+        private final LootItemCondition[] conditions;
+        private final Predicate<LootContext> compositePredicates;
+        
+        private Composite(final LootItemCondition[] arr) {
+            this.conditions = arr;
+            this.compositePredicates = LootItemConditions.<LootContext>andConditions(arr);
+        }
+        
+        public static Composite create(final LootItemCondition... arr) {
+            return new Composite(arr);
+        }
+        
+        public static Composite fromJson(final JsonObject jsonObject, final String string, final DeserializationContext av) {
+            final JsonElement jsonElement4 = jsonObject.get(string);
+            return fromElement(string, av, jsonElement4);
+        }
+        
+        public static Composite[] fromJsonArray(final JsonObject jsonObject, final String string, final DeserializationContext av) {
+            final JsonElement jsonElement4 = jsonObject.get(string);
+            if (jsonElement4 == null || jsonElement4.isJsonNull()) {
+                return new Composite[0];
+            }
+            final JsonArray jsonArray5 = GsonHelper.convertToJsonArray(jsonElement4, string);
+            final Composite[] arr6 = new Composite[jsonArray5.size()];
+            for (int integer7 = 0; integer7 < jsonArray5.size(); ++integer7) {
+                arr6[integer7] = fromElement(string + "[" + integer7 + "]", av, jsonArray5.get(integer7));
+            }
+            return arr6;
+        }
+        
+        private static Composite fromElement(final String string, final DeserializationContext av, @Nullable final JsonElement jsonElement) {
+            if (jsonElement != null && jsonElement.isJsonArray()) {
+                final LootItemCondition[] arr4 = av.deserializeConditions(jsonElement.getAsJsonArray(), av.getAdvancementId().toString() + "/" + string, LootContextParamSets.ADVANCEMENT_ENTITY);
+                return new Composite(arr4);
+            }
+            final EntityPredicate be4 = EntityPredicate.fromJson(jsonElement);
+            return wrap(be4);
+        }
+        
+        public static Composite wrap(final EntityPredicate be) {
+            if (be == EntityPredicate.ANY) {
+                return Composite.ANY;
+            }
+            final LootItemCondition ddm2 = LootItemEntityPropertyCondition.hasProperties(LootContext.EntityTarget.THIS, be).build();
+            return new Composite(new LootItemCondition[] { ddm2 });
+        }
+        
+        public boolean matches(final LootContext dat) {
+            return this.compositePredicates.test(dat);
+        }
+        
+        public JsonElement toJson(final SerializationContext cg) {
+            if (this.conditions.length == 0) {
+                return JsonNull.INSTANCE;
+            }
+            return cg.serializeConditions(this.conditions);
+        }
+        
+        public static JsonElement toJson(final Composite[] arr, final SerializationContext cg) {
+            if (arr.length == 0) {
+                return JsonNull.INSTANCE;
+            }
+            final JsonArray jsonArray3 = new JsonArray();
+            for (final Composite b7 : arr) {
+                jsonArray3.add(b7.toJson(cg));
+            }
+            return jsonArray3;
+        }
+        
+        static {
+            ANY = new Composite(new LootItemCondition[0]);
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/EntityTypePredicate.java b/src/net/minecraft/advancements/critereon/EntityTypePredicate.java
index 939302d..3ca91aa 100644
--- a/src/net/minecraft/advancements/critereon/EntityTypePredicate.java
+++ b/src/net/minecraft/advancements/critereon/EntityTypePredicate.java
@@ -5,7 +5,7 @@ import com.google.gson.JsonNull;
 import net.minecraft.tags.Tag;
 import com.google.gson.JsonSyntaxException;
 import net.minecraft.core.Registry;
-import net.minecraft.tags.EntityTypeTags;
+import net.minecraft.tags.SerializationTags;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import javax.annotation.Nullable;
@@ -17,7 +17,7 @@ public abstract class EntityTypePredicate {
     public static final EntityTypePredicate ANY;
     private static final Joiner COMMA_JOINER;
     
-    public abstract boolean matches(final EntityType<?> aku);
+    public abstract boolean matches(final EntityType<?> aoq);
     
     public abstract JsonElement serializeToJson();
     
@@ -27,32 +27,31 @@ public abstract class EntityTypePredicate {
         }
         final String string2 = GsonHelper.convertToString(jsonElement, "type");
         if (string2.startsWith("#")) {
-            final ResourceLocation sm3 = new ResourceLocation(string2.substring(1));
-            final Tag<EntityType<?>> aaz4 = EntityTypeTags.getAllTags().getTagOrEmpty(sm3);
-            return new TagPredicate(aaz4);
+            final ResourceLocation uh3 = new ResourceLocation(string2.substring(1));
+            return new TagPredicate(SerializationTags.getInstance().getEntityTypes().getTagOrEmpty(uh3));
         }
-        final ResourceLocation sm3 = new ResourceLocation(string2);
+        final ResourceLocation uh3 = new ResourceLocation(string2);
         final Object o;
         final Object obj;
-        final EntityType<?> aku4 = Registry.ENTITY_TYPE.getOptional(sm3).<Throwable>orElseThrow(() -> {
+        final EntityType<?> aoq4 = Registry.ENTITY_TYPE.getOptional(uh3).<Throwable>orElseThrow(() -> {
             new JsonSyntaxException("Unknown entity type '" + obj + "', valid types are: " + EntityTypePredicate.COMMA_JOINER.join(Registry.ENTITY_TYPE.keySet()));
             return o;
         });
-        return new TypePredicate(aku4);
+        return new TypePredicate(aoq4);
     }
     
-    public static EntityTypePredicate of(final EntityType<?> aku) {
-        return new TypePredicate(aku);
+    public static EntityTypePredicate of(final EntityType<?> aoq) {
+        return new TypePredicate(aoq);
     }
     
-    public static EntityTypePredicate of(final Tag<EntityType<?>> aaz) {
-        return new TagPredicate(aaz);
+    public static EntityTypePredicate of(final Tag<EntityType<?>> adf) {
+        return new TagPredicate(adf);
     }
     
     static {
         ANY = new EntityTypePredicate() {
             @Override
-            public boolean matches(final EntityType<?> aku) {
+            public boolean matches(final EntityType<?> aoq) {
                 return true;
             }
             
@@ -67,13 +66,13 @@ public abstract class EntityTypePredicate {
     static class TypePredicate extends EntityTypePredicate {
         private final EntityType<?> type;
         
-        public TypePredicate(final EntityType<?> aku) {
-            this.type = aku;
+        public TypePredicate(final EntityType<?> aoq) {
+            this.type = aoq;
         }
         
         @Override
-        public boolean matches(final EntityType<?> aku) {
-            return this.type == aku;
+        public boolean matches(final EntityType<?> aoq) {
+            return this.type == aoq;
         }
         
         @Override
@@ -85,18 +84,18 @@ public abstract class EntityTypePredicate {
     static class TagPredicate extends EntityTypePredicate {
         private final Tag<EntityType<?>> tag;
         
-        public TagPredicate(final Tag<EntityType<?>> aaz) {
-            this.tag = aaz;
+        public TagPredicate(final Tag<EntityType<?>> adf) {
+            this.tag = adf;
         }
         
         @Override
-        public boolean matches(final EntityType<?> aku) {
-            return this.tag.contains(aku);
+        public boolean matches(final EntityType<?> aoq) {
+            return this.tag.contains(aoq);
         }
         
         @Override
         public JsonElement serializeToJson() {
-            return new JsonPrimitive("#" + this.tag.getId().toString());
+            return new JsonPrimitive("#" + SerializationTags.getInstance().getEntityTypes().getIdOrThrow(this.tag));
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/FilledBucketTrigger.java b/src/net/minecraft/advancements/critereon/FilledBucketTrigger.java
index ff4c642..eccbdd9 100644
--- a/src/net/minecraft/advancements/critereon/FilledBucketTrigger.java
+++ b/src/net/minecraft/advancements/critereon/FilledBucketTrigger.java
@@ -1,10 +1,7 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -16,14 +13,13 @@ public class FilledBucketTrigger extends SimpleCriterionTrigger<TriggerInstance>
         return FilledBucketTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final ItemPredicate bj4 = ItemPredicate.fromJson(jsonObject.get("item"));
-        return new TriggerInstance(bj4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ItemPredicate bo5 = ItemPredicate.fromJson(jsonObject.get("item"));
+        return new TriggerInstance(b, bo5);
     }
     
-    public void trigger(final ServerPlayer xe, final ItemStack ben) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(ben));
+    public void trigger(final ServerPlayer ze, final ItemStack bki) {
+        this.trigger(ze, a -> a.matches(bki));
     }
     
     static {
@@ -33,24 +29,24 @@ public class FilledBucketTrigger extends SimpleCriterionTrigger<TriggerInstance>
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final ItemPredicate item;
         
-        public TriggerInstance(final ItemPredicate bj) {
-            super(FilledBucketTrigger.ID);
-            this.item = bj;
+        public TriggerInstance(final EntityPredicate.Composite b, final ItemPredicate bo) {
+            super(FilledBucketTrigger.ID, b);
+            this.item = bo;
         }
         
-        public static TriggerInstance filledBucket(final ItemPredicate bj) {
-            return new TriggerInstance(bj);
+        public static TriggerInstance filledBucket(final ItemPredicate bo) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, bo);
         }
         
-        public boolean matches(final ItemStack ben) {
-            return this.item.matches(ben);
+        public boolean matches(final ItemStack bki) {
+            return this.item.matches(bki);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("item", this.item.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("item", this.item.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/FishingHookPredicate.java b/src/net/minecraft/advancements/critereon/FishingHookPredicate.java
new file mode 100644
index 0000000..4a8c8d4
--- /dev/null
+++ b/src/net/minecraft/advancements/critereon/FishingHookPredicate.java
@@ -0,0 +1,59 @@
+package net.minecraft.advancements.critereon;
+
+import net.minecraft.world.entity.projectile.FishingHook;
+import net.minecraft.world.entity.Entity;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+import net.minecraft.util.GsonHelper;
+import javax.annotation.Nullable;
+import com.google.gson.JsonElement;
+
+public class FishingHookPredicate {
+    public static final FishingHookPredicate ANY;
+    private boolean inOpenWater;
+    
+    private FishingHookPredicate(final boolean boolean1) {
+        this.inOpenWater = boolean1;
+    }
+    
+    public static FishingHookPredicate inOpenWater(final boolean boolean1) {
+        return new FishingHookPredicate(boolean1);
+    }
+    
+    public static FishingHookPredicate fromJson(@Nullable final JsonElement jsonElement) {
+        if (jsonElement == null || jsonElement.isJsonNull()) {
+            return FishingHookPredicate.ANY;
+        }
+        final JsonObject jsonObject2 = GsonHelper.convertToJsonObject(jsonElement, "fishing_hook");
+        final JsonElement jsonElement2 = jsonObject2.get("in_open_water");
+        if (jsonElement2 != null) {
+            return new FishingHookPredicate(GsonHelper.convertToBoolean(jsonElement2, "in_open_water"));
+        }
+        return FishingHookPredicate.ANY;
+    }
+    
+    public JsonElement serializeToJson() {
+        if (this == FishingHookPredicate.ANY) {
+            return JsonNull.INSTANCE;
+        }
+        final JsonObject jsonObject2 = new JsonObject();
+        jsonObject2.add("in_open_water", new JsonPrimitive(this.inOpenWater));
+        return jsonObject2;
+    }
+    
+    public boolean matches(final Entity aom) {
+        if (this == FishingHookPredicate.ANY) {
+            return true;
+        }
+        if (!(aom instanceof FishingHook)) {
+            return false;
+        }
+        final FishingHook beo3 = (FishingHook)aom;
+        return this.inOpenWater == beo3.isOpenWaterFishing();
+    }
+    
+    static {
+        ANY = new FishingHookPredicate(false);
+    }
+}
diff --git a/src/net/minecraft/advancements/critereon/FishingRodHookedTrigger.java b/src/net/minecraft/advancements/critereon/FishingRodHookedTrigger.java
index dd4e8c5..9b03b91 100644
--- a/src/net/minecraft/advancements/critereon/FishingRodHookedTrigger.java
+++ b/src/net/minecraft/advancements/critereon/FishingRodHookedTrigger.java
@@ -1,14 +1,14 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import java.util.Iterator;
 import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.advancements.CriterionTriggerInstance;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.storage.loot.LootContext;
 import java.util.Collection;
-import net.minecraft.world.entity.fishing.FishingHook;
+import net.minecraft.world.entity.projectile.FishingHook;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -20,16 +20,16 @@ public class FishingRodHookedTrigger extends SimpleCriterionTrigger<TriggerInsta
         return FishingRodHookedTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final ItemPredicate bj4 = ItemPredicate.fromJson(jsonObject.get("rod"));
-        final EntityPredicate bb5 = EntityPredicate.fromJson(jsonObject.get("entity"));
-        final ItemPredicate bj5 = ItemPredicate.fromJson(jsonObject.get("item"));
-        return new TriggerInstance(bj4, bb5, bj5);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ItemPredicate bo5 = ItemPredicate.fromJson(jsonObject.get("rod"));
+        final EntityPredicate.Composite b2 = EntityPredicate.Composite.fromJson(jsonObject, "entity", av);
+        final ItemPredicate bo6 = ItemPredicate.fromJson(jsonObject.get("item"));
+        return new TriggerInstance(b, bo5, b2, bo6);
     }
     
-    public void trigger(final ServerPlayer xe, final ItemStack ben, final FishingHook avw, final Collection<ItemStack> collection) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, ben, avw, collection));
+    public void trigger(final ServerPlayer ze, final ItemStack bki, final FishingHook beo, final Collection<ItemStack> collection) {
+        final LootContext dat6 = EntityPredicate.createContext(ze, (beo.getHookedIn() != null) ? beo.getHookedIn() : beo);
+        this.trigger(ze, a -> a.matches(bki, dat6, collection));
     }
     
     static {
@@ -38,42 +38,43 @@ public class FishingRodHookedTrigger extends SimpleCriterionTrigger<TriggerInsta
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final ItemPredicate rod;
-        private final EntityPredicate entity;
+        private final EntityPredicate.Composite entity;
         private final ItemPredicate item;
         
-        public TriggerInstance(final ItemPredicate bj1, final EntityPredicate bb, final ItemPredicate bj3) {
-            super(FishingRodHookedTrigger.ID);
-            this.rod = bj1;
-            this.entity = bb;
-            this.item = bj3;
+        public TriggerInstance(final EntityPredicate.Composite b1, final ItemPredicate bo2, final EntityPredicate.Composite b3, final ItemPredicate bo4) {
+            super(FishingRodHookedTrigger.ID, b1);
+            this.rod = bo2;
+            this.entity = b3;
+            this.item = bo4;
         }
         
-        public static TriggerInstance fishedItem(final ItemPredicate bj1, final EntityPredicate bb, final ItemPredicate bj3) {
-            return new TriggerInstance(bj1, bb, bj3);
+        public static TriggerInstance fishedItem(final ItemPredicate bo1, final EntityPredicate be, final ItemPredicate bo3) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, bo1, EntityPredicate.Composite.wrap(be), bo3);
         }
         
-        public boolean matches(final ServerPlayer xe, final ItemStack ben, final FishingHook avw, final Collection<ItemStack> collection) {
-            if (!this.rod.matches(ben)) {
+        public boolean matches(final ItemStack bki, final LootContext dat, final Collection<ItemStack> collection) {
+            if (!this.rod.matches(bki)) {
                 return false;
             }
-            if (!this.entity.matches(xe, avw.hookedIn)) {
+            if (!this.entity.matches(dat)) {
                 return false;
             }
             if (this.item != ItemPredicate.ANY) {
-                boolean boolean6 = false;
-                if (avw.hookedIn instanceof ItemEntity) {
-                    final ItemEntity awb7 = (ItemEntity)avw.hookedIn;
-                    if (this.item.matches(awb7.getItem())) {
-                        boolean6 = true;
+                boolean boolean5 = false;
+                final Entity aom6 = dat.<Entity>getParamOrNull(LootContextParams.THIS_ENTITY);
+                if (aom6 instanceof ItemEntity) {
+                    final ItemEntity bbg7 = (ItemEntity)aom6;
+                    if (this.item.matches(bbg7.getItem())) {
+                        boolean5 = true;
                     }
                 }
-                for (final ItemStack ben2 : collection) {
-                    if (this.item.matches(ben2)) {
-                        boolean6 = true;
+                for (final ItemStack bki2 : collection) {
+                    if (this.item.matches(bki2)) {
+                        boolean5 = true;
                         break;
                     }
                 }
-                if (!boolean6) {
+                if (!boolean5) {
                     return false;
                 }
             }
@@ -81,12 +82,12 @@ public class FishingRodHookedTrigger extends SimpleCriterionTrigger<TriggerInsta
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("rod", this.rod.serializeToJson());
-            jsonObject2.add("entity", this.entity.serializeToJson());
-            jsonObject2.add("item", this.item.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("rod", this.rod.serializeToJson());
+            jsonObject3.add("entity", this.entity.toJson(cg));
+            jsonObject3.add("item", this.item.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/FluidPredicate.java b/src/net/minecraft/advancements/critereon/FluidPredicate.java
index 0cc1702..073d289 100644
--- a/src/net/minecraft/advancements/critereon/FluidPredicate.java
+++ b/src/net/minecraft/advancements/critereon/FluidPredicate.java
@@ -3,7 +3,7 @@ package net.minecraft.advancements.critereon;
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
-import net.minecraft.tags.FluidTags;
+import net.minecraft.tags.SerializationTags;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
@@ -23,22 +23,22 @@ public class FluidPredicate {
     private final Fluid fluid;
     private final StatePropertiesPredicate properties;
     
-    public FluidPredicate(@Nullable final Tag<Fluid> aaz, @Nullable final Fluid coi, final StatePropertiesPredicate cc) {
-        this.tag = aaz;
-        this.fluid = coi;
-        this.properties = cc;
+    public FluidPredicate(@Nullable final Tag<Fluid> adf, @Nullable final Fluid cwz, final StatePropertiesPredicate ck) {
+        this.tag = adf;
+        this.fluid = cwz;
+        this.properties = ck;
     }
     
-    public boolean matches(final ServerLevel xd, final BlockPos fk) {
+    public boolean matches(final ServerLevel zd, final BlockPos fu) {
         if (this == FluidPredicate.ANY) {
             return true;
         }
-        if (!xd.isLoaded(fk)) {
+        if (!zd.isLoaded(fu)) {
             return false;
         }
-        final FluidState coj4 = xd.getFluidState(fk);
-        final Fluid coi5 = coj4.getType();
-        return (this.tag == null || this.tag.contains(coi5)) && (this.fluid == null || coi5 == this.fluid) && this.properties.matches(coj4);
+        final FluidState cxa4 = zd.getFluidState(fu);
+        final Fluid cwz5 = cxa4.getType();
+        return (this.tag == null || this.tag.contains(cwz5)) && (this.fluid == null || cwz5 == this.fluid) && this.properties.matches(cxa4);
     }
     
     public static FluidPredicate fromJson(@Nullable final JsonElement jsonElement) {
@@ -46,21 +46,21 @@ public class FluidPredicate {
             return FluidPredicate.ANY;
         }
         final JsonObject jsonObject2 = GsonHelper.convertToJsonObject(jsonElement, "fluid");
-        Fluid coi3 = null;
+        Fluid cwz3 = null;
         if (jsonObject2.has("fluid")) {
-            final ResourceLocation sm4 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "fluid"));
-            coi3 = Registry.FLUID.get(sm4);
+            final ResourceLocation uh4 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "fluid"));
+            cwz3 = Registry.FLUID.get(uh4);
         }
-        Tag<Fluid> aaz4 = null;
+        Tag<Fluid> adf4 = null;
         if (jsonObject2.has("tag")) {
-            final ResourceLocation sm5 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "tag"));
-            aaz4 = FluidTags.getAllTags().getTag(sm5);
-            if (aaz4 == null) {
-                throw new JsonSyntaxException("Unknown fluid tag '" + sm5 + "'");
+            final ResourceLocation uh5 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "tag"));
+            adf4 = SerializationTags.getInstance().getFluids().getTag(uh5);
+            if (adf4 == null) {
+                throw new JsonSyntaxException("Unknown fluid tag '" + uh5 + "'");
             }
         }
-        final StatePropertiesPredicate cc5 = StatePropertiesPredicate.fromJson(jsonObject2.get("state"));
-        return new FluidPredicate(aaz4, coi3, cc5);
+        final StatePropertiesPredicate ck5 = StatePropertiesPredicate.fromJson(jsonObject2.get("state"));
+        return new FluidPredicate(adf4, cwz3, ck5);
     }
     
     public JsonElement serializeToJson() {
@@ -72,7 +72,7 @@ public class FluidPredicate {
             jsonObject2.addProperty("fluid", Registry.FLUID.getKey(this.fluid).toString());
         }
         if (this.tag != null) {
-            jsonObject2.addProperty("tag", this.tag.getId().toString());
+            jsonObject2.addProperty("tag", SerializationTags.getInstance().getFluids().getIdOrThrow(this.tag).toString());
         }
         jsonObject2.add("state", this.properties.serializeToJson());
         return jsonObject2;
diff --git a/src/net/minecraft/advancements/critereon/ImpossibleTrigger.java b/src/net/minecraft/advancements/critereon/ImpossibleTrigger.java
index 80ca359..659e8cc 100644
--- a/src/net/minecraft/advancements/critereon/ImpossibleTrigger.java
+++ b/src/net/minecraft/advancements/critereon/ImpossibleTrigger.java
@@ -1,7 +1,6 @@
 package net.minecraft.advancements.critereon;
 
 import net.minecraft.advancements.CriterionTriggerInstance;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.server.PlayerAdvancements;
 import net.minecraft.resources.ResourceLocation;
@@ -16,19 +15,19 @@ public class ImpossibleTrigger implements CriterionTrigger<TriggerInstance> {
     }
     
     @Override
-    public void addPlayerListener(final PlayerAdvancements sv, final Listener<TriggerInstance> a) {
+    public void addPlayerListener(final PlayerAdvancements uq, final Listener<TriggerInstance> a) {
     }
     
     @Override
-    public void removePlayerListener(final PlayerAdvancements sv, final Listener<TriggerInstance> a) {
+    public void removePlayerListener(final PlayerAdvancements uq, final Listener<TriggerInstance> a) {
     }
     
     @Override
-    public void removePlayerListeners(final PlayerAdvancements sv) {
+    public void removePlayerListeners(final PlayerAdvancements uq) {
     }
     
     @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
+    public TriggerInstance createInstance(final JsonObject jsonObject, final DeserializationContext av) {
         return new TriggerInstance();
     }
     
@@ -36,9 +35,15 @@ public class ImpossibleTrigger implements CriterionTrigger<TriggerInstance> {
         ID = new ResourceLocation("impossible");
     }
     
-    public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        public TriggerInstance() {
-            super(ImpossibleTrigger.ID);
+    public static class TriggerInstance implements CriterionTriggerInstance {
+        @Override
+        public ResourceLocation getCriterion() {
+            return ImpossibleTrigger.ID;
+        }
+        
+        @Override
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            return new JsonObject();
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/InventoryChangeTrigger.java b/src/net/minecraft/advancements/critereon/InventoryChangeTrigger.java
index 9503726..422f5ea 100644
--- a/src/net/minecraft/advancements/critereon/InventoryChangeTrigger.java
+++ b/src/net/minecraft/advancements/critereon/InventoryChangeTrigger.java
@@ -1,20 +1,17 @@
 package net.minecraft.advancements.critereon;
 
-import java.util.Iterator;
-import net.minecraft.world.item.ItemStack;
 import java.util.List;
-import com.google.common.collect.Lists;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import net.minecraft.world.item.alchemy.Potion;
 import net.minecraft.world.item.Item;
 import net.minecraft.tags.Tag;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.advancements.CriterionTriggerInstance;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -26,18 +23,36 @@ public class InventoryChangeTrigger extends SimpleCriterionTrigger<TriggerInstan
         return InventoryChangeTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
         final JsonObject jsonObject2 = GsonHelper.getAsJsonObject(jsonObject, "slots", new JsonObject());
-        final MinMaxBounds.Ints d5 = MinMaxBounds.Ints.fromJson(jsonObject2.get("occupied"));
-        final MinMaxBounds.Ints d6 = MinMaxBounds.Ints.fromJson(jsonObject2.get("full"));
-        final MinMaxBounds.Ints d7 = MinMaxBounds.Ints.fromJson(jsonObject2.get("empty"));
-        final ItemPredicate[] arr8 = ItemPredicate.fromJsonArray(jsonObject.get("items"));
-        return new TriggerInstance(d5, d6, d7, arr8);
+        final MinMaxBounds.Ints d6 = MinMaxBounds.Ints.fromJson(jsonObject2.get("occupied"));
+        final MinMaxBounds.Ints d7 = MinMaxBounds.Ints.fromJson(jsonObject2.get("full"));
+        final MinMaxBounds.Ints d8 = MinMaxBounds.Ints.fromJson(jsonObject2.get("empty"));
+        final ItemPredicate[] arr9 = ItemPredicate.fromJsonArray(jsonObject.get("items"));
+        return new TriggerInstance(b, d6, d7, d8, arr9);
     }
     
-    public void trigger(final ServerPlayer xe, final Inventory ayi) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(ayi));
+    public void trigger(final ServerPlayer ze, final Inventory beb, final ItemStack bki) {
+        int integer5 = 0;
+        int integer6 = 0;
+        int integer7 = 0;
+        for (int integer8 = 0; integer8 < beb.getContainerSize(); ++integer8) {
+            final ItemStack bki2 = beb.getItem(integer8);
+            if (bki2.isEmpty()) {
+                ++integer6;
+            }
+            else {
+                ++integer7;
+                if (bki2.getCount() >= bki2.getMaxStackSize()) {
+                    ++integer5;
+                }
+            }
+        }
+        this.trigger(ze, beb, bki, integer5, integer6, integer7);
+    }
+    
+    private void trigger(final ServerPlayer ze, final Inventory beb, final ItemStack bki, final int integer4, final int integer5, final int integer6) {
+        this.trigger(ze, a -> a.matches(beb, bki, integer4, integer5, integer6));
     }
     
     static {
@@ -50,71 +65,74 @@ public class InventoryChangeTrigger extends SimpleCriterionTrigger<TriggerInstan
         private final MinMaxBounds.Ints slotsEmpty;
         private final ItemPredicate[] predicates;
         
-        public TriggerInstance(final MinMaxBounds.Ints d1, final MinMaxBounds.Ints d2, final MinMaxBounds.Ints d3, final ItemPredicate[] arr) {
-            super(InventoryChangeTrigger.ID);
-            this.slotsOccupied = d1;
-            this.slotsFull = d2;
-            this.slotsEmpty = d3;
+        public TriggerInstance(final EntityPredicate.Composite b, final MinMaxBounds.Ints d2, final MinMaxBounds.Ints d3, final MinMaxBounds.Ints d4, final ItemPredicate[] arr) {
+            super(InventoryChangeTrigger.ID, b);
+            this.slotsOccupied = d2;
+            this.slotsFull = d3;
+            this.slotsEmpty = d4;
             this.predicates = arr;
         }
         
-        public static TriggerInstance hasItem(final ItemPredicate... arr) {
-            return new TriggerInstance(MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, arr);
+        public static TriggerInstance hasItems(final ItemPredicate... arr) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, arr);
         }
         
-        public static TriggerInstance hasItem(final ItemLike... arr) {
+        public static TriggerInstance hasItems(final ItemLike... arr) {
             final ItemPredicate[] arr2 = new ItemPredicate[arr.length];
             for (int integer3 = 0; integer3 < arr.length; ++integer3) {
                 arr2[integer3] = new ItemPredicate(null, arr[integer3].asItem(), MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, EnchantmentPredicate.NONE, EnchantmentPredicate.NONE, null, NbtPredicate.ANY);
             }
-            return hasItem(arr2);
+            return hasItems(arr2);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
             if (!this.slotsOccupied.isAny() || !this.slotsFull.isAny() || !this.slotsEmpty.isAny()) {
-                final JsonObject jsonObject3 = new JsonObject();
-                jsonObject3.add("occupied", this.slotsOccupied.serializeToJson());
-                jsonObject3.add("full", this.slotsFull.serializeToJson());
-                jsonObject3.add("empty", this.slotsEmpty.serializeToJson());
-                jsonObject2.add("slots", jsonObject3);
+                final JsonObject jsonObject4 = new JsonObject();
+                jsonObject4.add("occupied", this.slotsOccupied.serializeToJson());
+                jsonObject4.add("full", this.slotsFull.serializeToJson());
+                jsonObject4.add("empty", this.slotsEmpty.serializeToJson());
+                jsonObject3.add("slots", jsonObject4);
             }
             if (this.predicates.length > 0) {
-                final JsonArray jsonArray3 = new JsonArray();
-                for (final ItemPredicate bj7 : this.predicates) {
-                    jsonArray3.add(bj7.serializeToJson());
+                final JsonArray jsonArray4 = new JsonArray();
+                for (final ItemPredicate bo8 : this.predicates) {
+                    jsonArray4.add(bo8.serializeToJson());
                 }
-                jsonObject2.add("items", jsonArray3);
+                jsonObject3.add("items", jsonArray4);
             }
-            return jsonObject2;
+            return jsonObject3;
         }
         
-        public boolean matches(final Inventory ayi) {
-            int integer3 = 0;
-            int integer4 = 0;
-            int integer5 = 0;
-            final List<ItemPredicate> list6 = Lists.<ItemPredicate>newArrayList(this.predicates);
-            for (int integer6 = 0; integer6 < ayi.getContainerSize(); ++integer6) {
-                final ItemStack ben8 = ayi.getItem(integer6);
-                if (ben8.isEmpty()) {
-                    ++integer4;
+        public boolean matches(final Inventory beb, final ItemStack bki, final int integer3, final int integer4, final int integer5) {
+            if (!this.slotsFull.matches(integer3)) {
+                return false;
+            }
+            if (!this.slotsEmpty.matches(integer4)) {
+                return false;
+            }
+            if (!this.slotsOccupied.matches(integer5)) {
+                return false;
+            }
+            final int integer6 = this.predicates.length;
+            if (integer6 == 0) {
+                return true;
+            }
+            if (integer6 == 1) {
+                return !bki.isEmpty() && this.predicates[0].matches(bki);
+            }
+            final List<ItemPredicate> list8 = (List<ItemPredicate>)new ObjectArrayList((Object[])this.predicates);
+            for (int integer7 = beb.getContainerSize(), integer8 = 0; integer8 < integer7; ++integer8) {
+                if (list8.isEmpty()) {
+                    return true;
                 }
-                else {
-                    ++integer5;
-                    if (ben8.getCount() >= ben8.getMaxStackSize()) {
-                        ++integer3;
-                    }
-                    final Iterator<ItemPredicate> iterator9 = list6.iterator();
-                    while (iterator9.hasNext()) {
-                        final ItemPredicate bj10 = iterator9.next();
-                        if (bj10.matches(ben8)) {
-                            iterator9.remove();
-                        }
-                    }
+                final ItemStack bki2 = beb.getItem(integer8);
+                if (!bki2.isEmpty()) {
+                    list8.removeIf(bo -> bo.matches(bki2));
                 }
             }
-            return this.slotsFull.matches(integer3) && this.slotsEmpty.matches(integer4) && this.slotsOccupied.matches(integer5) && list6.isEmpty();
+            return list8.isEmpty();
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/ItemDurabilityTrigger.java b/src/net/minecraft/advancements/critereon/ItemDurabilityTrigger.java
index 1a64584..7363dbf 100644
--- a/src/net/minecraft/advancements/critereon/ItemDurabilityTrigger.java
+++ b/src/net/minecraft/advancements/critereon/ItemDurabilityTrigger.java
@@ -1,10 +1,7 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -16,16 +13,15 @@ public class ItemDurabilityTrigger extends SimpleCriterionTrigger<TriggerInstanc
         return ItemDurabilityTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final ItemPredicate bj4 = ItemPredicate.fromJson(jsonObject.get("item"));
-        final MinMaxBounds.Ints d5 = MinMaxBounds.Ints.fromJson(jsonObject.get("durability"));
-        final MinMaxBounds.Ints d6 = MinMaxBounds.Ints.fromJson(jsonObject.get("delta"));
-        return new TriggerInstance(bj4, d5, d6);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ItemPredicate bo5 = ItemPredicate.fromJson(jsonObject.get("item"));
+        final MinMaxBounds.Ints d6 = MinMaxBounds.Ints.fromJson(jsonObject.get("durability"));
+        final MinMaxBounds.Ints d7 = MinMaxBounds.Ints.fromJson(jsonObject.get("delta"));
+        return new TriggerInstance(b, bo5, d6, d7);
     }
     
-    public void trigger(final ServerPlayer xe, final ItemStack ben, final int integer) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(ben, integer));
+    public void trigger(final ServerPlayer ze, final ItemStack bki, final int integer) {
+        this.trigger(ze, a -> a.matches(bki, integer));
     }
     
     static {
@@ -37,28 +33,28 @@ public class ItemDurabilityTrigger extends SimpleCriterionTrigger<TriggerInstanc
         private final MinMaxBounds.Ints durability;
         private final MinMaxBounds.Ints delta;
         
-        public TriggerInstance(final ItemPredicate bj, final MinMaxBounds.Ints d2, final MinMaxBounds.Ints d3) {
-            super(ItemDurabilityTrigger.ID);
-            this.item = bj;
-            this.durability = d2;
-            this.delta = d3;
+        public TriggerInstance(final EntityPredicate.Composite b, final ItemPredicate bo, final MinMaxBounds.Ints d3, final MinMaxBounds.Ints d4) {
+            super(ItemDurabilityTrigger.ID, b);
+            this.item = bo;
+            this.durability = d3;
+            this.delta = d4;
         }
         
-        public static TriggerInstance changedDurability(final ItemPredicate bj, final MinMaxBounds.Ints d) {
-            return new TriggerInstance(bj, d, MinMaxBounds.Ints.ANY);
+        public static TriggerInstance changedDurability(final EntityPredicate.Composite b, final ItemPredicate bo, final MinMaxBounds.Ints d) {
+            return new TriggerInstance(b, bo, d, MinMaxBounds.Ints.ANY);
         }
         
-        public boolean matches(final ItemStack ben, final int integer) {
-            return this.item.matches(ben) && this.durability.matches(ben.getMaxDamage() - integer) && this.delta.matches(ben.getDamageValue() - integer);
+        public boolean matches(final ItemStack bki, final int integer) {
+            return this.item.matches(bki) && this.durability.matches(bki.getMaxDamage() - integer) && this.delta.matches(bki.getDamageValue() - integer);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("item", this.item.serializeToJson());
-            jsonObject2.add("durability", this.durability.serializeToJson());
-            jsonObject2.add("delta", this.delta.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("item", this.item.serializeToJson());
+            jsonObject3.add("durability", this.durability.serializeToJson());
+            jsonObject3.add("delta", this.delta.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/ItemPickedUpByEntityTrigger.java b/src/net/minecraft/advancements/critereon/ItemPickedUpByEntityTrigger.java
new file mode 100644
index 0000000..f20b0bf
--- /dev/null
+++ b/src/net/minecraft/advancements/critereon/ItemPickedUpByEntityTrigger.java
@@ -0,0 +1,60 @@
+package net.minecraft.advancements.critereon;
+
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.server.level.ServerPlayer;
+import com.google.gson.JsonObject;
+import net.minecraft.resources.ResourceLocation;
+
+public class ItemPickedUpByEntityTrigger extends SimpleCriterionTrigger<TriggerInstance> {
+    private static final ResourceLocation ID;
+    
+    @Override
+    public ResourceLocation getId() {
+        return ItemPickedUpByEntityTrigger.ID;
+    }
+    
+    @Override
+    protected TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ItemPredicate bo5 = ItemPredicate.fromJson(jsonObject.get("item"));
+        final EntityPredicate.Composite b2 = EntityPredicate.Composite.fromJson(jsonObject, "entity", av);
+        return new TriggerInstance(b, bo5, b2);
+    }
+    
+    public void trigger(final ServerPlayer ze, final ItemStack bki, final Entity aom) {
+        final LootContext dat5 = EntityPredicate.createContext(ze, aom);
+        this.trigger(ze, a -> a.matches(ze, bki, dat5));
+    }
+    
+    static {
+        ID = new ResourceLocation("thrown_item_picked_up_by_entity");
+    }
+    
+    public static class TriggerInstance extends AbstractCriterionTriggerInstance {
+        private final ItemPredicate item;
+        private final EntityPredicate.Composite entity;
+        
+        public TriggerInstance(final EntityPredicate.Composite b1, final ItemPredicate bo, final EntityPredicate.Composite b3) {
+            super(ItemPickedUpByEntityTrigger.ID, b1);
+            this.item = bo;
+            this.entity = b3;
+        }
+        
+        public static TriggerInstance itemPickedUpByEntity(final EntityPredicate.Composite b1, final ItemPredicate.Builder a, final EntityPredicate.Composite b3) {
+            return new TriggerInstance(b1, a.build(), b3);
+        }
+        
+        public boolean matches(final ServerPlayer ze, final ItemStack bki, final LootContext dat) {
+            return this.item.matches(bki) && this.entity.matches(dat);
+        }
+        
+        @Override
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("item", this.item.serializeToJson());
+            jsonObject3.add("entity", this.entity.toJson(cg));
+            return jsonObject3;
+        }
+    }
+}
diff --git a/src/net/minecraft/advancements/critereon/ItemPredicate.java b/src/net/minecraft/advancements/critereon/ItemPredicate.java
index 5153efe..98294e5 100644
--- a/src/net/minecraft/advancements/critereon/ItemPredicate.java
+++ b/src/net/minecraft/advancements/critereon/ItemPredicate.java
@@ -7,7 +7,7 @@ import java.util.List;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
-import net.minecraft.tags.ItemTags;
+import net.minecraft.tags.SerializationTags;
 import com.google.gson.JsonSyntaxException;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
@@ -50,57 +50,57 @@ public class ItemPredicate {
         this.nbt = NbtPredicate.ANY;
     }
     
-    public ItemPredicate(@Nullable final Tag<Item> aaz, @Nullable final Item bei, final MinMaxBounds.Ints d3, final MinMaxBounds.Ints d4, final EnchantmentPredicate[] arr5, final EnchantmentPredicate[] arr6, @Nullable final Potion bgd, final NbtPredicate bt) {
-        this.tag = aaz;
-        this.item = bei;
+    public ItemPredicate(@Nullable final Tag<Item> adf, @Nullable final Item bke, final MinMaxBounds.Ints d3, final MinMaxBounds.Ints d4, final EnchantmentPredicate[] arr5, final EnchantmentPredicate[] arr6, @Nullable final Potion bmb, final NbtPredicate bz) {
+        this.tag = adf;
+        this.item = bke;
         this.count = d3;
         this.durability = d4;
         this.enchantments = arr5;
         this.storedEnchantments = arr6;
-        this.potion = bgd;
-        this.nbt = bt;
+        this.potion = bmb;
+        this.nbt = bz;
     }
     
-    public boolean matches(final ItemStack ben) {
+    public boolean matches(final ItemStack bki) {
         if (this == ItemPredicate.ANY) {
             return true;
         }
-        if (this.tag != null && !this.tag.contains(ben.getItem())) {
+        if (this.tag != null && !this.tag.contains(bki.getItem())) {
             return false;
         }
-        if (this.item != null && ben.getItem() != this.item) {
+        if (this.item != null && bki.getItem() != this.item) {
             return false;
         }
-        if (!this.count.matches(ben.getCount())) {
+        if (!this.count.matches(bki.getCount())) {
             return false;
         }
-        if (!this.durability.isAny() && !ben.isDamageableItem()) {
+        if (!this.durability.isAny() && !bki.isDamageableItem()) {
             return false;
         }
-        if (!this.durability.matches(ben.getMaxDamage() - ben.getDamageValue())) {
+        if (!this.durability.matches(bki.getMaxDamage() - bki.getDamageValue())) {
             return false;
         }
-        if (!this.nbt.matches(ben)) {
+        if (!this.nbt.matches(bki)) {
             return false;
         }
         if (this.enchantments.length > 0) {
-            final Map<Enchantment, Integer> map3 = EnchantmentHelper.deserializeEnchantments(ben.getEnchantmentTags());
-            for (final EnchantmentPredicate aw7 : this.enchantments) {
-                if (!aw7.containedIn(map3)) {
+            final Map<Enchantment, Integer> map3 = EnchantmentHelper.deserializeEnchantments(bki.getEnchantmentTags());
+            for (final EnchantmentPredicate az7 : this.enchantments) {
+                if (!az7.containedIn(map3)) {
                     return false;
                 }
             }
         }
         if (this.storedEnchantments.length > 0) {
-            final Map<Enchantment, Integer> map3 = EnchantmentHelper.deserializeEnchantments(EnchantedBookItem.getEnchantments(ben));
-            for (final EnchantmentPredicate aw7 : this.storedEnchantments) {
-                if (!aw7.containedIn(map3)) {
+            final Map<Enchantment, Integer> map3 = EnchantmentHelper.deserializeEnchantments(EnchantedBookItem.getEnchantments(bki));
+            for (final EnchantmentPredicate az7 : this.storedEnchantments) {
+                if (!az7.containedIn(map3)) {
                     return false;
                 }
             }
         }
-        final Potion bgd3 = PotionUtils.getPotion(ben);
-        return this.potion == null || this.potion == bgd3;
+        final Potion bmb3 = PotionUtils.getPotion(bki);
+        return this.potion == null || this.potion == bmb3;
     }
     
     public static ItemPredicate fromJson(@Nullable final JsonElement jsonElement) {
@@ -113,38 +113,38 @@ public class ItemPredicate {
         if (jsonObject2.has("data")) {
             throw new JsonParseException("Disallowed data tag found");
         }
-        final NbtPredicate bt5 = NbtPredicate.fromJson(jsonObject2.get("nbt"));
-        Item bei6 = null;
+        final NbtPredicate bz5 = NbtPredicate.fromJson(jsonObject2.get("nbt"));
+        Item bke6 = null;
         if (jsonObject2.has("item")) {
-            final ResourceLocation sm7 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "item"));
+            final ResourceLocation uh7 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "item"));
             final Object o;
             final Object obj;
-            bei6 = Registry.ITEM.getOptional(sm7).<Throwable>orElseThrow(() -> {
+            bke6 = Registry.ITEM.getOptional(uh7).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown item id '" + obj + "'");
                 return o;
             });
         }
-        Tag<Item> aaz7 = null;
+        Tag<Item> adf7 = null;
         if (jsonObject2.has("tag")) {
-            final ResourceLocation sm8 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "tag"));
-            aaz7 = ItemTags.getAllTags().getTag(sm8);
-            if (aaz7 == null) {
-                throw new JsonSyntaxException("Unknown item tag '" + sm8 + "'");
+            final ResourceLocation uh8 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "tag"));
+            adf7 = SerializationTags.getInstance().getItems().getTag(uh8);
+            if (adf7 == null) {
+                throw new JsonSyntaxException("Unknown item tag '" + uh8 + "'");
             }
         }
-        Potion bgd8 = null;
+        Potion bmb8 = null;
         if (jsonObject2.has("potion")) {
-            final ResourceLocation sm9 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "potion"));
+            final ResourceLocation uh9 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "potion"));
             final Object o2;
             final Object obj2;
-            bgd8 = Registry.POTION.getOptional(sm9).<Throwable>orElseThrow(() -> {
+            bmb8 = Registry.POTION.getOptional(uh9).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown potion '" + obj2 + "'");
                 return o2;
             });
         }
         final EnchantmentPredicate[] arr9 = EnchantmentPredicate.fromJsonArray(jsonObject2.get("enchantments"));
         final EnchantmentPredicate[] arr10 = EnchantmentPredicate.fromJsonArray(jsonObject2.get("stored_enchantments"));
-        return new ItemPredicate(aaz7, bei6, d3, d4, arr9, arr10, bgd8, bt5);
+        return new ItemPredicate(adf7, bke6, d3, d4, arr9, arr10, bmb8, bz5);
     }
     
     public JsonElement serializeToJson() {
@@ -156,22 +156,22 @@ public class ItemPredicate {
             jsonObject2.addProperty("item", Registry.ITEM.getKey(this.item).toString());
         }
         if (this.tag != null) {
-            jsonObject2.addProperty("tag", this.tag.getId().toString());
+            jsonObject2.addProperty("tag", SerializationTags.getInstance().getItems().getIdOrThrow(this.tag).toString());
         }
         jsonObject2.add("count", this.count.serializeToJson());
         jsonObject2.add("durability", this.durability.serializeToJson());
         jsonObject2.add("nbt", this.nbt.serializeToJson());
         if (this.enchantments.length > 0) {
             final JsonArray jsonArray3 = new JsonArray();
-            for (final EnchantmentPredicate aw7 : this.enchantments) {
-                jsonArray3.add(aw7.serializeToJson());
+            for (final EnchantmentPredicate az7 : this.enchantments) {
+                jsonArray3.add(az7.serializeToJson());
             }
             jsonObject2.add("enchantments", jsonArray3);
         }
         if (this.storedEnchantments.length > 0) {
             final JsonArray jsonArray3 = new JsonArray();
-            for (final EnchantmentPredicate aw7 : this.storedEnchantments) {
-                jsonArray3.add(aw7.serializeToJson());
+            for (final EnchantmentPredicate az7 : this.storedEnchantments) {
+                jsonArray3.add(az7.serializeToJson());
             }
             jsonObject2.add("stored_enchantments", jsonArray3);
         }
@@ -222,23 +222,23 @@ public class ItemPredicate {
             return new Builder();
         }
         
-        public Builder of(final ItemLike bjv) {
-            this.item = bjv.asItem();
+        public Builder of(final ItemLike bqa) {
+            this.item = bqa.asItem();
             return this;
         }
         
-        public Builder of(final Tag<Item> aaz) {
-            this.tag = aaz;
+        public Builder of(final Tag<Item> adf) {
+            this.tag = adf;
             return this;
         }
         
-        public Builder hasNbt(final CompoundTag jt) {
-            this.nbt = new NbtPredicate(jt);
+        public Builder hasNbt(final CompoundTag le) {
+            this.nbt = new NbtPredicate(le);
             return this;
         }
         
-        public Builder hasEnchantment(final EnchantmentPredicate aw) {
-            this.enchantments.add(aw);
+        public Builder hasEnchantment(final EnchantmentPredicate az) {
+            this.enchantments.add(az);
             return this;
         }
         
diff --git a/src/net/minecraft/advancements/critereon/ItemUsedOnBlockTrigger.java b/src/net/minecraft/advancements/critereon/ItemUsedOnBlockTrigger.java
index 493a4a8..46c1694 100644
--- a/src/net/minecraft/advancements/critereon/ItemUsedOnBlockTrigger.java
+++ b/src/net/minecraft/advancements/critereon/ItemUsedOnBlockTrigger.java
@@ -1,69 +1,60 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
 public class ItemUsedOnBlockTrigger extends SimpleCriterionTrigger<TriggerInstance> {
-    private final ResourceLocation id;
-    
-    public ItemUsedOnBlockTrigger(final ResourceLocation sm) {
-        this.id = sm;
-    }
+    private static final ResourceLocation ID;
     
     @Override
     public ResourceLocation getId() {
-        return this.id;
+        return ItemUsedOnBlockTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final BlockPredicate aj4 = BlockPredicate.fromJson(jsonObject.get("block"));
-        final StatePropertiesPredicate cc5 = StatePropertiesPredicate.fromJson(jsonObject.get("state"));
-        final ItemPredicate bj6 = ItemPredicate.fromJson(jsonObject.get("item"));
-        return new TriggerInstance(this.id, aj4, cc5, bj6);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final LocationPredicate bu5 = LocationPredicate.fromJson(jsonObject.get("location"));
+        final ItemPredicate bo6 = ItemPredicate.fromJson(jsonObject.get("item"));
+        return new TriggerInstance(b, bu5, bo6);
     }
     
-    public void trigger(final ServerPlayer xe, final BlockPos fk, final ItemStack ben) {
-        final BlockState byj5 = xe.getLevel().getBlockState(fk);
-        this.trigger(xe.getAdvancements(), a -> a.matches(byj5, xe.getLevel(), fk, ben));
+    public void trigger(final ServerPlayer ze, final BlockPos fu, final ItemStack bki) {
+        final BlockState cfj5 = ze.getLevel().getBlockState(fu);
+        this.trigger(ze, a -> a.matches(cfj5, ze.getLevel(), fu, bki));
+    }
+    
+    static {
+        ID = new ResourceLocation("item_used_on_block");
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        private final BlockPredicate block;
-        private final StatePropertiesPredicate state;
+        private final LocationPredicate location;
         private final ItemPredicate item;
         
-        public TriggerInstance(final ResourceLocation sm, final BlockPredicate aj, final StatePropertiesPredicate cc, final ItemPredicate bj) {
-            super(sm);
-            this.block = aj;
-            this.state = cc;
-            this.item = bj;
+        public TriggerInstance(final EntityPredicate.Composite b, final LocationPredicate bu, final ItemPredicate bo) {
+            super(ItemUsedOnBlockTrigger.ID, b);
+            this.location = bu;
+            this.item = bo;
         }
         
-        public static TriggerInstance safelyHarvestedHoney(final BlockPredicate.Builder a, final ItemPredicate.Builder a) {
-            return new TriggerInstance(CriteriaTriggers.SAFELY_HARVEST_HONEY.id, a.build(), StatePropertiesPredicate.ANY, a.build());
+        public static TriggerInstance itemUsedOnBlock(final LocationPredicate.Builder a, final ItemPredicate.Builder a) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, a.build(), a.build());
         }
         
-        public boolean matches(final BlockState byj, final ServerLevel xd, final BlockPos fk, final ItemStack ben) {
-            return this.block.matches(xd, fk) && this.state.matches(byj) && this.item.matches(ben);
+        public boolean matches(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final ItemStack bki) {
+            return this.location.matches(zd, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5) && this.item.matches(bki);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("block", this.block.serializeToJson());
-            jsonObject2.add("state", this.state.serializeToJson());
-            jsonObject2.add("item", this.item.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("location", this.location.serializeToJson());
+            jsonObject3.add("item", this.item.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/KilledByCrossbowTrigger.java b/src/net/minecraft/advancements/critereon/KilledByCrossbowTrigger.java
index 87af9d9..1c6778d 100644
--- a/src/net/minecraft/advancements/critereon/KilledByCrossbowTrigger.java
+++ b/src/net/minecraft/advancements/critereon/KilledByCrossbowTrigger.java
@@ -1,17 +1,15 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
+import java.util.Iterator;
 import net.minecraft.world.entity.EntityType;
 import java.util.Set;
-import java.util.Iterator;
 import java.util.List;
+import net.minecraft.world.level.storage.loot.LootContext;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Lists;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.entity.Entity;
 import java.util.Collection;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -23,15 +21,20 @@ public class KilledByCrossbowTrigger extends SimpleCriterionTrigger<TriggerInsta
         return KilledByCrossbowTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final EntityPredicate[] arr4 = EntityPredicate.fromJsonArray(jsonObject.get("victims"));
-        final MinMaxBounds.Ints d5 = MinMaxBounds.Ints.fromJson(jsonObject.get("unique_entity_types"));
-        return new TriggerInstance(arr4, d5);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final EntityPredicate.Composite[] arr5 = EntityPredicate.Composite.fromJsonArray(jsonObject, "victims", av);
+        final MinMaxBounds.Ints d6 = MinMaxBounds.Ints.fromJson(jsonObject.get("unique_entity_types"));
+        return new TriggerInstance(b, arr5, d6);
     }
     
-    public void trigger(final ServerPlayer xe, final Collection<Entity> collection, final int integer) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, collection, integer));
+    public void trigger(final ServerPlayer ze, final Collection<Entity> collection) {
+        final List<LootContext> list4 = Lists.newArrayList();
+        final Set<EntityType<?>> set5 = Sets.newHashSet();
+        for (final Entity aom7 : collection) {
+            set5.add(aom7.getType());
+            list4.add(EntityPredicate.createContext(ze, aom7));
+        }
+        this.trigger(ze, a -> a.matches(list4, set5.size()));
     }
     
     static {
@@ -39,64 +42,57 @@ public class KilledByCrossbowTrigger extends SimpleCriterionTrigger<TriggerInsta
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        private final EntityPredicate[] victims;
+        private final EntityPredicate.Composite[] victims;
         private final MinMaxBounds.Ints uniqueEntityTypes;
         
-        public TriggerInstance(final EntityPredicate[] arr, final MinMaxBounds.Ints d) {
-            super(KilledByCrossbowTrigger.ID);
+        public TriggerInstance(final EntityPredicate.Composite b, final EntityPredicate.Composite[] arr, final MinMaxBounds.Ints d) {
+            super(KilledByCrossbowTrigger.ID, b);
             this.victims = arr;
             this.uniqueEntityTypes = d;
         }
         
         public static TriggerInstance crossbowKilled(final EntityPredicate.Builder... arr) {
-            final EntityPredicate[] arr2 = new EntityPredicate[arr.length];
+            final EntityPredicate.Composite[] arr2 = new EntityPredicate.Composite[arr.length];
             for (int integer3 = 0; integer3 < arr.length; ++integer3) {
                 final EntityPredicate.Builder a4 = arr[integer3];
-                arr2[integer3] = a4.build();
+                arr2[integer3] = EntityPredicate.Composite.wrap(a4.build());
             }
-            return new TriggerInstance(arr2, MinMaxBounds.Ints.ANY);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, arr2, MinMaxBounds.Ints.ANY);
         }
         
         public static TriggerInstance crossbowKilled(final MinMaxBounds.Ints d) {
-            final EntityPredicate[] arr2 = new EntityPredicate[0];
-            return new TriggerInstance(arr2, d);
+            final EntityPredicate.Composite[] arr2 = new EntityPredicate.Composite[0];
+            return new TriggerInstance(EntityPredicate.Composite.ANY, arr2, d);
         }
         
-        public boolean matches(final ServerPlayer xe, final Collection<Entity> collection, final int integer) {
+        public boolean matches(final Collection<LootContext> collection, final int integer) {
             if (this.victims.length > 0) {
-                final List<Entity> list5 = Lists.newArrayList(collection);
-                for (final EntityPredicate bb9 : this.victims) {
-                    boolean boolean10 = false;
-                    final Iterator<Entity> iterator11 = list5.iterator();
-                    while (iterator11.hasNext()) {
-                        final Entity akq12 = iterator11.next();
-                        if (bb9.matches(xe, akq12)) {
-                            iterator11.remove();
-                            boolean10 = true;
+                final List<LootContext> list4 = Lists.newArrayList(collection);
+                for (final EntityPredicate.Composite b8 : this.victims) {
+                    boolean boolean9 = false;
+                    final Iterator<LootContext> iterator10 = list4.iterator();
+                    while (iterator10.hasNext()) {
+                        final LootContext dat11 = iterator10.next();
+                        if (b8.matches(dat11)) {
+                            iterator10.remove();
+                            boolean9 = true;
                             break;
                         }
                     }
-                    if (!boolean10) {
+                    if (!boolean9) {
                         return false;
                     }
                 }
             }
-            if (this.uniqueEntityTypes != MinMaxBounds.Ints.ANY) {
-                final Set<EntityType<?>> set5 = Sets.newHashSet();
-                for (final Entity akq13 : collection) {
-                    set5.add(akq13.getType());
-                }
-                return this.uniqueEntityTypes.matches(set5.size()) && this.uniqueEntityTypes.matches(integer);
-            }
-            return true;
+            return this.uniqueEntityTypes.matches(integer);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("victims", EntityPredicate.serializeArrayToJson(this.victims));
-            jsonObject2.add("unique_entity_types", this.uniqueEntityTypes.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("victims", EntityPredicate.Composite.toJson(this.victims, cg));
+            jsonObject3.add("unique_entity_types", this.uniqueEntityTypes.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/KilledTrigger.java b/src/net/minecraft/advancements/critereon/KilledTrigger.java
index 9796f81..b143080 100644
--- a/src/net/minecraft/advancements/critereon/KilledTrigger.java
+++ b/src/net/minecraft/advancements/critereon/KilledTrigger.java
@@ -1,20 +1,18 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.advancements.CriterionTriggerInstance;
+import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
 public class KilledTrigger extends SimpleCriterionTrigger<TriggerInstance> {
     private final ResourceLocation id;
     
-    public KilledTrigger(final ResourceLocation sm) {
-        this.id = sm;
+    public KilledTrigger(final ResourceLocation uh) {
+        this.id = uh;
     }
     
     @Override
@@ -22,51 +20,51 @@ public class KilledTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         return this.id;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        return new TriggerInstance(this.id, EntityPredicate.fromJson(jsonObject.get("entity")), DamageSourcePredicate.fromJson(jsonObject.get("killing_blow")));
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        return new TriggerInstance(this.id, b, EntityPredicate.Composite.fromJson(jsonObject, "entity", av), DamageSourcePredicate.fromJson(jsonObject.get("killing_blow")));
     }
     
-    public void trigger(final ServerPlayer xe, final Entity akq, final DamageSource ajz) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, akq, ajz));
+    public void trigger(final ServerPlayer ze, final Entity aom, final DamageSource anw) {
+        final LootContext dat5 = EntityPredicate.createContext(ze, aom);
+        this.trigger(ze, a -> a.matches(ze, dat5, anw));
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        private final EntityPredicate entityPredicate;
+        private final EntityPredicate.Composite entityPredicate;
         private final DamageSourcePredicate killingBlow;
         
-        public TriggerInstance(final ResourceLocation sm, final EntityPredicate bb, final DamageSourcePredicate as) {
-            super(sm);
-            this.entityPredicate = bb;
-            this.killingBlow = as;
+        public TriggerInstance(final ResourceLocation uh, final EntityPredicate.Composite b2, final EntityPredicate.Composite b3, final DamageSourcePredicate au) {
+            super(uh, b2);
+            this.entityPredicate = b3;
+            this.killingBlow = au;
         }
         
         public static TriggerInstance playerKilledEntity(final EntityPredicate.Builder a) {
-            return new TriggerInstance(CriteriaTriggers.PLAYER_KILLED_ENTITY.id, a.build(), DamageSourcePredicate.ANY);
+            return new TriggerInstance(CriteriaTriggers.PLAYER_KILLED_ENTITY.id, EntityPredicate.Composite.ANY, EntityPredicate.Composite.wrap(a.build()), DamageSourcePredicate.ANY);
         }
         
         public static TriggerInstance playerKilledEntity() {
-            return new TriggerInstance(CriteriaTriggers.PLAYER_KILLED_ENTITY.id, EntityPredicate.ANY, DamageSourcePredicate.ANY);
+            return new TriggerInstance(CriteriaTriggers.PLAYER_KILLED_ENTITY.id, EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY, DamageSourcePredicate.ANY);
         }
         
         public static TriggerInstance playerKilledEntity(final EntityPredicate.Builder a, final DamageSourcePredicate.Builder a) {
-            return new TriggerInstance(CriteriaTriggers.PLAYER_KILLED_ENTITY.id, a.build(), a.build());
+            return new TriggerInstance(CriteriaTriggers.PLAYER_KILLED_ENTITY.id, EntityPredicate.Composite.ANY, EntityPredicate.Composite.wrap(a.build()), a.build());
         }
         
         public static TriggerInstance entityKilledPlayer() {
-            return new TriggerInstance(CriteriaTriggers.ENTITY_KILLED_PLAYER.id, EntityPredicate.ANY, DamageSourcePredicate.ANY);
+            return new TriggerInstance(CriteriaTriggers.ENTITY_KILLED_PLAYER.id, EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY, DamageSourcePredicate.ANY);
         }
         
-        public boolean matches(final ServerPlayer xe, final Entity akq, final DamageSource ajz) {
-            return this.killingBlow.matches(xe, ajz) && this.entityPredicate.matches(xe, akq);
+        public boolean matches(final ServerPlayer ze, final LootContext dat, final DamageSource anw) {
+            return this.killingBlow.matches(ze, anw) && this.entityPredicate.matches(dat);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("entity", this.entityPredicate.serializeToJson());
-            jsonObject2.add("killing_blow", this.killingBlow.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("entity", this.entityPredicate.toJson(cg));
+            jsonObject3.add("killing_blow", this.killingBlow.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/LevitationTrigger.java b/src/net/minecraft/advancements/critereon/LevitationTrigger.java
index 40008d4..d32f704 100644
--- a/src/net/minecraft/advancements/critereon/LevitationTrigger.java
+++ b/src/net/minecraft/advancements/critereon/LevitationTrigger.java
@@ -1,10 +1,7 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -16,15 +13,14 @@ public class LevitationTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         return LevitationTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final DistancePredicate at4 = DistancePredicate.fromJson(jsonObject.get("distance"));
-        final MinMaxBounds.Ints d5 = MinMaxBounds.Ints.fromJson(jsonObject.get("duration"));
-        return new TriggerInstance(at4, d5);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final DistancePredicate aw5 = DistancePredicate.fromJson(jsonObject.get("distance"));
+        final MinMaxBounds.Ints d6 = MinMaxBounds.Ints.fromJson(jsonObject.get("duration"));
+        return new TriggerInstance(b, aw5, d6);
     }
     
-    public void trigger(final ServerPlayer xe, final Vec3 cvl, final int integer) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, cvl, integer));
+    public void trigger(final ServerPlayer ze, final Vec3 dem, final int integer) {
+        this.trigger(ze, a -> a.matches(ze, dem, integer));
     }
     
     static {
@@ -35,26 +31,26 @@ public class LevitationTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         private final DistancePredicate distance;
         private final MinMaxBounds.Ints duration;
         
-        public TriggerInstance(final DistancePredicate at, final MinMaxBounds.Ints d) {
-            super(LevitationTrigger.ID);
-            this.distance = at;
+        public TriggerInstance(final EntityPredicate.Composite b, final DistancePredicate aw, final MinMaxBounds.Ints d) {
+            super(LevitationTrigger.ID, b);
+            this.distance = aw;
             this.duration = d;
         }
         
-        public static TriggerInstance levitated(final DistancePredicate at) {
-            return new TriggerInstance(at, MinMaxBounds.Ints.ANY);
+        public static TriggerInstance levitated(final DistancePredicate aw) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, aw, MinMaxBounds.Ints.ANY);
         }
         
-        public boolean matches(final ServerPlayer xe, final Vec3 cvl, final int integer) {
-            return this.distance.matches(cvl.x, cvl.y, cvl.z, xe.getX(), xe.getY(), xe.getZ()) && this.duration.matches(integer);
+        public boolean matches(final ServerPlayer ze, final Vec3 dem, final int integer) {
+            return this.distance.matches(dem.x, dem.y, dem.z, ze.getX(), ze.getY(), ze.getZ()) && this.duration.matches(integer);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("distance", this.distance.serializeToJson());
-            jsonObject2.add("duration", this.duration.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("distance", this.distance.serializeToJson());
+            jsonObject3.add("duration", this.duration.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/LightPredicate.java b/src/net/minecraft/advancements/critereon/LightPredicate.java
index 09a0c62..335b85a 100644
--- a/src/net/minecraft/advancements/critereon/LightPredicate.java
+++ b/src/net/minecraft/advancements/critereon/LightPredicate.java
@@ -16,8 +16,8 @@ public class LightPredicate {
         this.composite = d;
     }
     
-    public boolean matches(final ServerLevel xd, final BlockPos fk) {
-        return this == LightPredicate.ANY || (xd.isLoaded(fk) && this.composite.matches(xd.getMaxLocalRawBrightness(fk)));
+    public boolean matches(final ServerLevel zd, final BlockPos fu) {
+        return this == LightPredicate.ANY || (zd.isLoaded(fu) && this.composite.matches(zd.getMaxLocalRawBrightness(fu)));
     }
     
     public JsonElement serializeToJson() {
diff --git a/src/net/minecraft/advancements/critereon/LocationPredicate.java b/src/net/minecraft/advancements/critereon/LocationPredicate.java
index 0146fa6..d61cca7 100644
--- a/src/net/minecraft/advancements/critereon/LocationPredicate.java
+++ b/src/net/minecraft/advancements/critereon/LocationPredicate.java
@@ -1,22 +1,28 @@
 package net.minecraft.advancements.critereon;
 
+import org.apache.logging.log4j.LogManager;
 import com.google.gson.JsonSyntaxException;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.core.Registry;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import java.util.function.Consumer;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.JsonOps;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonNull;
 import com.google.gson.JsonElement;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.CampfireBlock;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.biome.Biome;
+import org.apache.logging.log4j.Logger;
 
 public class LocationPredicate {
+    private static final Logger LOGGER;
     public static final LocationPredicate ANY;
     private final MinMaxBounds.Floats x;
     private final MinMaxBounds.Floats y;
@@ -26,40 +32,43 @@ public class LocationPredicate {
     @Nullable
     private final StructureFeature<?> feature;
     @Nullable
-    private final DimensionType dimension;
+    private final ResourceKey<Level> dimension;
+    @Nullable
+    private final Boolean smokey;
     private final LightPredicate light;
     private final BlockPredicate block;
     private final FluidPredicate fluid;
     
-    public LocationPredicate(final MinMaxBounds.Floats c1, final MinMaxBounds.Floats c2, final MinMaxBounds.Floats c3, @Nullable final Biome bkt, @Nullable final StructureFeature<?> cfl, @Nullable final DimensionType cbi, final LightPredicate bo, final BlockPredicate aj, final FluidPredicate bf) {
+    public LocationPredicate(final MinMaxBounds.Floats c1, final MinMaxBounds.Floats c2, final MinMaxBounds.Floats c3, @Nullable final Biome bre, @Nullable final StructureFeature<?> cml, @Nullable final ResourceKey<Level> ug, @Nullable final Boolean boolean7, final LightPredicate bt, final BlockPredicate al, final FluidPredicate bj) {
         this.x = c1;
         this.y = c2;
         this.z = c3;
-        this.biome = bkt;
-        this.feature = cfl;
-        this.dimension = cbi;
-        this.light = bo;
-        this.block = aj;
-        this.fluid = bf;
+        this.biome = bre;
+        this.feature = cml;
+        this.dimension = ug;
+        this.smokey = boolean7;
+        this.light = bt;
+        this.block = al;
+        this.fluid = bj;
     }
     
-    public static LocationPredicate inBiome(final Biome bkt) {
-        return new LocationPredicate(MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, bkt, null, null, LightPredicate.ANY, BlockPredicate.ANY, FluidPredicate.ANY);
+    public static LocationPredicate inBiome(final Biome bre) {
+        return new LocationPredicate(MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, bre, null, null, null, LightPredicate.ANY, BlockPredicate.ANY, FluidPredicate.ANY);
     }
     
-    public static LocationPredicate inDimension(final DimensionType cbi) {
-        return new LocationPredicate(MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, null, null, cbi, LightPredicate.ANY, BlockPredicate.ANY, FluidPredicate.ANY);
+    public static LocationPredicate inDimension(final ResourceKey<Level> ug) {
+        return new LocationPredicate(MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, null, null, ug, null, LightPredicate.ANY, BlockPredicate.ANY, FluidPredicate.ANY);
     }
     
-    public static LocationPredicate inFeature(final StructureFeature<?> cfl) {
-        return new LocationPredicate(MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, null, cfl, null, LightPredicate.ANY, BlockPredicate.ANY, FluidPredicate.ANY);
+    public static LocationPredicate inFeature(final StructureFeature<?> cml) {
+        return new LocationPredicate(MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, null, cml, null, null, LightPredicate.ANY, BlockPredicate.ANY, FluidPredicate.ANY);
     }
     
-    public boolean matches(final ServerLevel xd, final double double2, final double double3, final double double4) {
-        return this.matches(xd, (float)double2, (float)double3, (float)double4);
+    public boolean matches(final ServerLevel zd, final double double2, final double double3, final double double4) {
+        return this.matches(zd, (float)double2, (float)double3, (float)double4);
     }
     
-    public boolean matches(final ServerLevel xd, final float float2, final float float3, final float float4) {
+    public boolean matches(final ServerLevel zd, final float float2, final float float3, final float float4) {
         if (!this.x.matches(float2)) {
             return false;
         }
@@ -69,12 +78,12 @@ public class LocationPredicate {
         if (!this.z.matches(float4)) {
             return false;
         }
-        if (this.dimension != null && this.dimension != xd.dimension.getType()) {
+        if (this.dimension != null && this.dimension != zd.dimension()) {
             return false;
         }
-        final BlockPos fk6 = new BlockPos(float2, float3, float4);
-        final boolean boolean7 = xd.isLoaded(fk6);
-        return (this.biome == null || (boolean7 && this.biome == xd.getBiome(fk6))) && (this.feature == null || (boolean7 && this.feature.isInsideFeature(xd, fk6))) && this.light.matches(xd, fk6) && this.block.matches(xd, fk6) && this.fluid.matches(xd, fk6);
+        final BlockPos fu6 = new BlockPos(float2, float3, float4);
+        final boolean boolean7 = zd.isLoaded(fu6);
+        return (this.biome == null || (boolean7 && this.biome == zd.getBiome(fu6))) && (this.feature == null || (boolean7 && zd.structureFeatureManager().getStructureAt(fu6, true, this.feature).isValid())) && (this.smokey == null || (boolean7 && this.smokey == CampfireBlock.isSmokeyPos(zd, fu6))) && this.light.matches(zd, fu6) && this.block.matches(zd, fu6) && this.fluid.matches(zd, fu6);
     }
     
     public JsonElement serializeToJson() {
@@ -90,14 +99,17 @@ public class LocationPredicate {
             jsonObject2.add("position", jsonObject3);
         }
         if (this.dimension != null) {
-            jsonObject2.addProperty("dimension", DimensionType.getName(this.dimension).toString());
+            Level.RESOURCE_KEY_CODEC.encodeStart((DynamicOps)JsonOps.INSTANCE, this.dimension).resultOrPartial((Consumer)LocationPredicate.LOGGER::error).ifPresent(jsonElement -> jsonObject2.add("dimension", jsonElement));
         }
         if (this.feature != null) {
-            jsonObject2.addProperty("feature", Feature.STRUCTURES_REGISTRY.inverse().get(this.feature));
+            jsonObject2.addProperty("feature", this.feature.getFeatureName());
         }
         if (this.biome != null) {
             jsonObject2.addProperty("biome", Registry.BIOME.getKey(this.biome).toString());
         }
+        if (this.smokey != null) {
+            jsonObject2.addProperty("smokey", this.smokey);
+        }
         jsonObject2.add("light", this.light.serializeToJson());
         jsonObject2.add("block", this.block.serializeToJson());
         jsonObject2.add("fluid", this.fluid.serializeToJson());
@@ -113,26 +125,28 @@ public class LocationPredicate {
         final MinMaxBounds.Floats c4 = MinMaxBounds.Floats.fromJson(jsonObject3.get("x"));
         final MinMaxBounds.Floats c5 = MinMaxBounds.Floats.fromJson(jsonObject3.get("y"));
         final MinMaxBounds.Floats c6 = MinMaxBounds.Floats.fromJson(jsonObject3.get("z"));
-        final DimensionType cbi7 = jsonObject2.has("dimension") ? DimensionType.getByName(new ResourceLocation(GsonHelper.getAsString(jsonObject2, "dimension"))) : null;
-        final StructureFeature<?> cfl8 = jsonObject2.has("feature") ? Feature.STRUCTURES_REGISTRY.get(GsonHelper.getAsString(jsonObject2, "feature")) : null;
-        Biome bkt9 = null;
+        final ResourceKey<Level> ug7 = jsonObject2.has("dimension") ? ResourceLocation.CODEC.parse((DynamicOps)JsonOps.INSTANCE, jsonObject2.get("dimension")).resultOrPartial((Consumer)LocationPredicate.LOGGER::error).<ResourceKey<Level>>map(uh -> ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, uh)).orElse(null) : null;
+        final StructureFeature<?> cml8 = jsonObject2.has("feature") ? StructureFeature.STRUCTURES_REGISTRY.get(GsonHelper.getAsString(jsonObject2, "feature")) : null;
+        Biome bre9 = null;
         if (jsonObject2.has("biome")) {
-            final ResourceLocation sm10 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "biome"));
+            final ResourceLocation uh2 = new ResourceLocation(GsonHelper.getAsString(jsonObject2, "biome"));
             final Object o;
             final Object obj;
-            bkt9 = Registry.BIOME.getOptional(sm10).<Throwable>orElseThrow(() -> {
+            bre9 = Registry.BIOME.getOptional(uh2).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown biome '" + obj + "'");
                 return o;
             });
         }
-        final LightPredicate bo10 = LightPredicate.fromJson(jsonObject2.get("light"));
-        final BlockPredicate aj11 = BlockPredicate.fromJson(jsonObject2.get("block"));
-        final FluidPredicate bf12 = FluidPredicate.fromJson(jsonObject2.get("fluid"));
-        return new LocationPredicate(c4, c5, c6, bkt9, cfl8, cbi7, bo10, aj11, bf12);
+        final Boolean boolean10 = jsonObject2.has("smokey") ? Boolean.valueOf(jsonObject2.get("smokey").getAsBoolean()) : null;
+        final LightPredicate bt11 = LightPredicate.fromJson(jsonObject2.get("light"));
+        final BlockPredicate al12 = BlockPredicate.fromJson(jsonObject2.get("block"));
+        final FluidPredicate bj13 = FluidPredicate.fromJson(jsonObject2.get("fluid"));
+        return new LocationPredicate(c4, c5, c6, bre9, cml8, ug7, boolean10, bt11, al12, bj13);
     }
     
     static {
-        ANY = new LocationPredicate(MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, null, null, null, LightPredicate.ANY, BlockPredicate.ANY, FluidPredicate.ANY);
+        LOGGER = LogManager.getLogger();
+        ANY = new LocationPredicate(MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, MinMaxBounds.Floats.ANY, null, null, null, null, LightPredicate.ANY, BlockPredicate.ANY, FluidPredicate.ANY);
     }
     
     public static class Builder {
@@ -144,7 +158,9 @@ public class LocationPredicate {
         @Nullable
         private StructureFeature<?> feature;
         @Nullable
-        private DimensionType dimension;
+        private ResourceKey<Level> dimension;
+        @Nullable
+        private Boolean smokey;
         private LightPredicate light;
         private BlockPredicate block;
         private FluidPredicate fluid;
@@ -162,13 +178,23 @@ public class LocationPredicate {
             return new Builder();
         }
         
-        public Builder setBiome(@Nullable final Biome bkt) {
-            this.biome = bkt;
+        public Builder setBiome(@Nullable final Biome bre) {
+            this.biome = bre;
+            return this;
+        }
+        
+        public Builder setBlock(final BlockPredicate al) {
+            this.block = al;
+            return this;
+        }
+        
+        public Builder setSmokey(final Boolean boolean1) {
+            this.smokey = boolean1;
             return this;
         }
         
         public LocationPredicate build() {
-            return new LocationPredicate(this.x, this.y, this.z, this.biome, this.feature, this.dimension, this.light, this.block, this.fluid);
+            return new LocationPredicate(this.x, this.y, this.z, this.biome, this.feature, this.dimension, this.smokey, this.light, this.block, this.fluid);
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/LocationTrigger.java b/src/net/minecraft/advancements/critereon/LocationTrigger.java
index a93ad0f..68f0247 100644
--- a/src/net/minecraft/advancements/critereon/LocationTrigger.java
+++ b/src/net/minecraft/advancements/critereon/LocationTrigger.java
@@ -2,18 +2,17 @@ package net.minecraft.advancements.critereon;
 
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.server.level.ServerPlayer;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonDeserializationContext;
+import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
 public class LocationTrigger extends SimpleCriterionTrigger<TriggerInstance> {
     private final ResourceLocation id;
     
-    public LocationTrigger(final ResourceLocation sm) {
-        this.id = sm;
+    public LocationTrigger(final ResourceLocation uh) {
+        this.id = uh;
     }
     
     @Override
@@ -21,43 +20,45 @@ public class LocationTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         return this.id;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final LocationPredicate bp4 = LocationPredicate.fromJson(jsonObject);
-        return new TriggerInstance(this.id, bp4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final JsonObject jsonObject2 = GsonHelper.getAsJsonObject(jsonObject, "location", jsonObject);
+        final LocationPredicate bu6 = LocationPredicate.fromJson(jsonObject2);
+        return new TriggerInstance(this.id, b, bu6);
     }
     
-    public void trigger(final ServerPlayer xe) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe.getLevel(), xe.getX(), xe.getY(), xe.getZ()));
+    public void trigger(final ServerPlayer ze) {
+        this.trigger(ze, a -> a.matches(ze.getLevel(), ze.getX(), ze.getY(), ze.getZ()));
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final LocationPredicate location;
         
-        public TriggerInstance(final ResourceLocation sm, final LocationPredicate bp) {
-            super(sm);
-            this.location = bp;
+        public TriggerInstance(final ResourceLocation uh, final EntityPredicate.Composite b, final LocationPredicate bu) {
+            super(uh, b);
+            this.location = bu;
         }
         
-        public static TriggerInstance located(final LocationPredicate bp) {
-            return new TriggerInstance(CriteriaTriggers.LOCATION.id, bp);
+        public static TriggerInstance located(final LocationPredicate bu) {
+            return new TriggerInstance(CriteriaTriggers.LOCATION.id, EntityPredicate.Composite.ANY, bu);
         }
         
         public static TriggerInstance sleptInBed() {
-            return new TriggerInstance(CriteriaTriggers.SLEPT_IN_BED.id, LocationPredicate.ANY);
+            return new TriggerInstance(CriteriaTriggers.SLEPT_IN_BED.id, EntityPredicate.Composite.ANY, LocationPredicate.ANY);
         }
         
         public static TriggerInstance raidWon() {
-            return new TriggerInstance(CriteriaTriggers.RAID_WIN.id, LocationPredicate.ANY);
+            return new TriggerInstance(CriteriaTriggers.RAID_WIN.id, EntityPredicate.Composite.ANY, LocationPredicate.ANY);
         }
         
-        public boolean matches(final ServerLevel xd, final double double2, final double double3, final double double4) {
-            return this.location.matches(xd, double2, double3, double4);
+        public boolean matches(final ServerLevel zd, final double double2, final double double3, final double double4) {
+            return this.location.matches(zd, double2, double3, double4);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            return this.location.serializeToJson();
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("location", this.location.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/LootTableTrigger.java b/src/net/minecraft/advancements/critereon/LootTableTrigger.java
new file mode 100644
index 0000000..2db3906
--- /dev/null
+++ b/src/net/minecraft/advancements/critereon/LootTableTrigger.java
@@ -0,0 +1,53 @@
+package net.minecraft.advancements.critereon;
+
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.GsonHelper;
+import com.google.gson.JsonObject;
+import net.minecraft.resources.ResourceLocation;
+
+public class LootTableTrigger extends SimpleCriterionTrigger<TriggerInstance> {
+    private static final ResourceLocation ID;
+    
+    @Override
+    public ResourceLocation getId() {
+        return LootTableTrigger.ID;
+    }
+    
+    @Override
+    protected TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ResourceLocation uh5 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "loot_table"));
+        return new TriggerInstance(b, uh5);
+    }
+    
+    public void trigger(final ServerPlayer ze, final ResourceLocation uh) {
+        this.trigger(ze, a -> a.matches(uh));
+    }
+    
+    static {
+        ID = new ResourceLocation("player_generates_container_loot");
+    }
+    
+    public static class TriggerInstance extends AbstractCriterionTriggerInstance {
+        private final ResourceLocation lootTable;
+        
+        public TriggerInstance(final EntityPredicate.Composite b, final ResourceLocation uh) {
+            super(LootTableTrigger.ID, b);
+            this.lootTable = uh;
+        }
+        
+        public static TriggerInstance lootTableUsed(final ResourceLocation uh) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, uh);
+        }
+        
+        public boolean matches(final ResourceLocation uh) {
+            return this.lootTable.equals(uh);
+        }
+        
+        @Override
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.addProperty("loot_table", this.lootTable.toString());
+            return jsonObject3;
+        }
+    }
+}
diff --git a/src/net/minecraft/advancements/critereon/MinMaxBounds.java b/src/net/minecraft/advancements/critereon/MinMaxBounds.java
index fc7ae2b..b9eebfd 100644
--- a/src/net/minecraft/advancements/critereon/MinMaxBounds.java
+++ b/src/net/minecraft/advancements/critereon/MinMaxBounds.java
@@ -59,9 +59,9 @@ public abstract class MinMaxBounds<T extends Number> {
         return jsonObject2;
     }
     
-    protected static <T extends Number, R extends MinMaxBounds<T>> R fromJson(@Nullable final JsonElement jsonElement, final R br, final BiFunction<JsonElement, String, T> biFunction, final BoundsFactory<T, R> a) {
+    protected static <T extends Number, R extends MinMaxBounds<T>> R fromJson(@Nullable final JsonElement jsonElement, final R bx, final BiFunction<JsonElement, String, T> biFunction, final BoundsFactory<T, R> a) {
         if (jsonElement == null || jsonElement.isJsonNull()) {
-            return br;
+            return bx;
         }
         if (GsonHelper.isNumberValue(jsonElement)) {
             final T number5 = biFunction.apply(jsonElement, "value");
@@ -132,8 +132,8 @@ public abstract class MinMaxBounds<T extends Number> {
     }
     
     static {
-        ERROR_EMPTY = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.range.empty", new Object[0]));
-        ERROR_SWAPPED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.range.swapped", new Object[0]));
+        ERROR_EMPTY = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.range.empty"));
+        ERROR_SWAPPED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.range.swapped"));
     }
     
     public static class Ints extends MinMaxBounds<Integer> {
diff --git a/src/net/minecraft/advancements/critereon/MobEffectsPredicate.java b/src/net/minecraft/advancements/critereon/MobEffectsPredicate.java
index cda5484..58717b9 100644
--- a/src/net/minecraft/advancements/critereon/MobEffectsPredicate.java
+++ b/src/net/minecraft/advancements/critereon/MobEffectsPredicate.java
@@ -26,20 +26,20 @@ public class MobEffectsPredicate {
     }
     
     public static MobEffectsPredicate effects() {
-        return new MobEffectsPredicate(Maps.newHashMap());
+        return new MobEffectsPredicate(Maps.newLinkedHashMap());
     }
     
-    public MobEffectsPredicate and(final MobEffect aki) {
-        this.effects.put(aki, new MobEffectInstancePredicate());
+    public MobEffectsPredicate and(final MobEffect aoe) {
+        this.effects.put(aoe, new MobEffectInstancePredicate());
         return this;
     }
     
-    public boolean matches(final Entity akq) {
-        return this == MobEffectsPredicate.ANY || (akq instanceof LivingEntity && this.matches(((LivingEntity)akq).getActiveEffectsMap()));
+    public boolean matches(final Entity aom) {
+        return this == MobEffectsPredicate.ANY || (aom instanceof LivingEntity && this.matches(((LivingEntity)aom).getActiveEffectsMap()));
     }
     
-    public boolean matches(final LivingEntity akz) {
-        return this == MobEffectsPredicate.ANY || this.matches(akz.getActiveEffectsMap());
+    public boolean matches(final LivingEntity aoy) {
+        return this == MobEffectsPredicate.ANY || this.matches(aoy.getActiveEffectsMap());
     }
     
     public boolean matches(final Map<MobEffect, MobEffectInstance> map) {
@@ -47,8 +47,8 @@ public class MobEffectsPredicate {
             return true;
         }
         for (final Map.Entry<MobEffect, MobEffectInstancePredicate> entry4 : this.effects.entrySet()) {
-            final MobEffectInstance akk5 = map.get(entry4.getKey());
-            if (!entry4.getValue().matches(akk5)) {
+            final MobEffectInstance aog5 = map.get(entry4.getKey());
+            if (!entry4.getValue().matches(aog5)) {
                 return false;
             }
         }
@@ -60,17 +60,17 @@ public class MobEffectsPredicate {
             return MobEffectsPredicate.ANY;
         }
         final JsonObject jsonObject2 = GsonHelper.convertToJsonObject(jsonElement, "effects");
-        final Map<MobEffect, MobEffectInstancePredicate> map3 = Maps.newHashMap();
+        final Map<MobEffect, MobEffectInstancePredicate> map3 = Maps.newLinkedHashMap();
         for (final Map.Entry<String, JsonElement> entry5 : jsonObject2.entrySet()) {
-            final ResourceLocation sm6 = new ResourceLocation(entry5.getKey());
+            final ResourceLocation uh6 = new ResourceLocation(entry5.getKey());
             final Object o;
             final Object obj;
-            final MobEffect aki7 = Registry.MOB_EFFECT.getOptional(sm6).<Throwable>orElseThrow(() -> {
+            final MobEffect aoe7 = Registry.MOB_EFFECT.getOptional(uh6).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown effect '" + obj + "'");
                 return o;
             });
             final MobEffectInstancePredicate a8 = MobEffectInstancePredicate.fromJson(GsonHelper.convertToJsonObject(entry5.getValue(), entry5.getKey()));
-            map3.put(aki7, a8);
+            map3.put(aoe7, a8);
         }
         return new MobEffectsPredicate(map3);
     }
@@ -109,8 +109,8 @@ public class MobEffectsPredicate {
             this(MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, null, null);
         }
         
-        public boolean matches(@Nullable final MobEffectInstance akk) {
-            return akk != null && this.amplifier.matches(akk.getAmplifier()) && this.duration.matches(akk.getDuration()) && (this.ambient == null || this.ambient == akk.isAmbient()) && (this.visible == null || this.visible == akk.isVisible());
+        public boolean matches(@Nullable final MobEffectInstance aog) {
+            return aog != null && this.amplifier.matches(aog.getAmplifier()) && this.duration.matches(aog.getDuration()) && (this.ambient == null || this.ambient == aog.isAmbient()) && (this.visible == null || this.visible == aog.isVisible());
         }
         
         public JsonElement serializeToJson() {
diff --git a/src/net/minecraft/advancements/critereon/NbtPredicate.java b/src/net/minecraft/advancements/critereon/NbtPredicate.java
index 582faeb..78a8a46 100644
--- a/src/net/minecraft/advancements/critereon/NbtPredicate.java
+++ b/src/net/minecraft/advancements/critereon/NbtPredicate.java
@@ -20,23 +20,23 @@ public class NbtPredicate {
     @Nullable
     private final CompoundTag tag;
     
-    public NbtPredicate(@Nullable final CompoundTag jt) {
-        this.tag = jt;
+    public NbtPredicate(@Nullable final CompoundTag le) {
+        this.tag = le;
     }
     
-    public boolean matches(final ItemStack ben) {
-        return this == NbtPredicate.ANY || this.matches(ben.getTag());
+    public boolean matches(final ItemStack bki) {
+        return this == NbtPredicate.ANY || this.matches(bki.getTag());
     }
     
-    public boolean matches(final Entity akq) {
-        return this == NbtPredicate.ANY || this.matches(getEntityTagToCompare(akq));
+    public boolean matches(final Entity aom) {
+        return this == NbtPredicate.ANY || this.matches(getEntityTagToCompare(aom));
     }
     
-    public boolean matches(@Nullable final Tag kj) {
-        if (kj == null) {
+    public boolean matches(@Nullable final Tag lu) {
+        if (lu == null) {
             return this == NbtPredicate.ANY;
         }
-        return this.tag == null || NbtUtils.compareNbt(this.tag, kj, true);
+        return this.tag == null || NbtUtils.compareNbt(this.tag, lu, true);
     }
     
     public JsonElement serializeToJson() {
@@ -50,25 +50,25 @@ public class NbtPredicate {
         if (jsonElement == null || jsonElement.isJsonNull()) {
             return NbtPredicate.ANY;
         }
-        CompoundTag jt2;
+        CompoundTag le2;
         try {
-            jt2 = TagParser.parseTag(GsonHelper.convertToString(jsonElement, "nbt"));
+            le2 = TagParser.parseTag(GsonHelper.convertToString(jsonElement, "nbt"));
         }
         catch (CommandSyntaxException commandSyntaxException3) {
             throw new JsonSyntaxException("Invalid nbt tag: " + commandSyntaxException3.getMessage());
         }
-        return new NbtPredicate(jt2);
+        return new NbtPredicate(le2);
     }
     
-    public static CompoundTag getEntityTagToCompare(final Entity akq) {
-        final CompoundTag jt2 = akq.saveWithoutId(new CompoundTag());
-        if (akq instanceof Player) {
-            final ItemStack ben3 = ((Player)akq).inventory.getSelected();
-            if (!ben3.isEmpty()) {
-                jt2.put("SelectedItem", ben3.save(new CompoundTag()));
+    public static CompoundTag getEntityTagToCompare(final Entity aom) {
+        final CompoundTag le2 = aom.saveWithoutId(new CompoundTag());
+        if (aom instanceof Player) {
+            final ItemStack bki3 = ((Player)aom).inventory.getSelected();
+            if (!bki3.isEmpty()) {
+                le2.put("SelectedItem", bki3.save(new CompoundTag()));
             }
         }
-        return jt2;
+        return le2;
     }
     
     static {
diff --git a/src/net/minecraft/advancements/critereon/NetherTravelTrigger.java b/src/net/minecraft/advancements/critereon/NetherTravelTrigger.java
index 1a5a3ef..65b2d00 100644
--- a/src/net/minecraft/advancements/critereon/NetherTravelTrigger.java
+++ b/src/net/minecraft/advancements/critereon/NetherTravelTrigger.java
@@ -1,11 +1,8 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -17,16 +14,15 @@ public class NetherTravelTrigger extends SimpleCriterionTrigger<TriggerInstance>
         return NetherTravelTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final LocationPredicate bp4 = LocationPredicate.fromJson(jsonObject.get("entered"));
-        final LocationPredicate bp5 = LocationPredicate.fromJson(jsonObject.get("exited"));
-        final DistancePredicate at6 = DistancePredicate.fromJson(jsonObject.get("distance"));
-        return new TriggerInstance(bp4, bp5, at6);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final LocationPredicate bu5 = LocationPredicate.fromJson(jsonObject.get("entered"));
+        final LocationPredicate bu6 = LocationPredicate.fromJson(jsonObject.get("exited"));
+        final DistancePredicate aw7 = DistancePredicate.fromJson(jsonObject.get("distance"));
+        return new TriggerInstance(b, bu5, bu6, aw7);
     }
     
-    public void trigger(final ServerPlayer xe, final Vec3 cvl) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe.getLevel(), cvl, xe.getX(), xe.getY(), xe.getZ()));
+    public void trigger(final ServerPlayer ze, final Vec3 dem) {
+        this.trigger(ze, a -> a.matches(ze.getLevel(), dem, ze.getX(), ze.getY(), ze.getZ()));
     }
     
     static {
@@ -38,28 +34,28 @@ public class NetherTravelTrigger extends SimpleCriterionTrigger<TriggerInstance>
         private final LocationPredicate exited;
         private final DistancePredicate distance;
         
-        public TriggerInstance(final LocationPredicate bp1, final LocationPredicate bp2, final DistancePredicate at) {
-            super(NetherTravelTrigger.ID);
-            this.entered = bp1;
-            this.exited = bp2;
-            this.distance = at;
+        public TriggerInstance(final EntityPredicate.Composite b, final LocationPredicate bu2, final LocationPredicate bu3, final DistancePredicate aw) {
+            super(NetherTravelTrigger.ID, b);
+            this.entered = bu2;
+            this.exited = bu3;
+            this.distance = aw;
         }
         
-        public static TriggerInstance travelledThroughNether(final DistancePredicate at) {
-            return new TriggerInstance(LocationPredicate.ANY, LocationPredicate.ANY, at);
+        public static TriggerInstance travelledThroughNether(final DistancePredicate aw) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, LocationPredicate.ANY, LocationPredicate.ANY, aw);
         }
         
-        public boolean matches(final ServerLevel xd, final Vec3 cvl, final double double3, final double double4, final double double5) {
-            return this.entered.matches(xd, cvl.x, cvl.y, cvl.z) && this.exited.matches(xd, double3, double4, double5) && this.distance.matches(cvl.x, cvl.y, cvl.z, double3, double4, double5);
+        public boolean matches(final ServerLevel zd, final Vec3 dem, final double double3, final double double4, final double double5) {
+            return this.entered.matches(zd, dem.x, dem.y, dem.z) && this.exited.matches(zd, double3, double4, double5) && this.distance.matches(dem.x, dem.y, dem.z, double3, double4, double5);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("entered", this.entered.serializeToJson());
-            jsonObject2.add("exited", this.exited.serializeToJson());
-            jsonObject2.add("distance", this.distance.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("entered", this.entered.serializeToJson());
+            jsonObject3.add("exited", this.exited.serializeToJson());
+            jsonObject3.add("distance", this.distance.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/PlacedBlockTrigger.java b/src/net/minecraft/advancements/critereon/PlacedBlockTrigger.java
index 8822c6c..95169ec 100644
--- a/src/net/minecraft/advancements/critereon/PlacedBlockTrigger.java
+++ b/src/net/minecraft/advancements/critereon/PlacedBlockTrigger.java
@@ -1,8 +1,6 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.BlockPos;
@@ -13,7 +11,6 @@ import net.minecraft.util.GsonHelper;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.StateDefinition;
 import com.google.gson.JsonSyntaxException;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -25,30 +22,29 @@ public class PlacedBlockTrigger extends SimpleCriterionTrigger<TriggerInstance>
         return PlacedBlockTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final Block bph4 = deserializeBlock(jsonObject);
-        final StatePropertiesPredicate cc5 = StatePropertiesPredicate.fromJson(jsonObject.get("state"));
-        if (bph4 != null) {
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final Block bvr5 = deserializeBlock(jsonObject);
+        final StatePropertiesPredicate ck6 = StatePropertiesPredicate.fromJson(jsonObject.get("state"));
+        if (bvr5 != null) {
             final JsonSyntaxException ex;
             final Object obj;
-            cc5.checkState(bph4.getStateDefinition(), string -> {
+            ck6.checkState(bvr5.getStateDefinition(), string -> {
                 new JsonSyntaxException("Block " + obj + " has no property " + string + ":");
                 throw ex;
             });
         }
-        final LocationPredicate bp6 = LocationPredicate.fromJson(jsonObject.get("location"));
-        final ItemPredicate bj7 = ItemPredicate.fromJson(jsonObject.get("item"));
-        return new TriggerInstance(bph4, cc5, bp6, bj7);
+        final LocationPredicate bu7 = LocationPredicate.fromJson(jsonObject.get("location"));
+        final ItemPredicate bo8 = ItemPredicate.fromJson(jsonObject.get("item"));
+        return new TriggerInstance(b, bvr5, ck6, bu7, bo8);
     }
     
     @Nullable
     private static Block deserializeBlock(final JsonObject jsonObject) {
         if (jsonObject.has("block")) {
-            final ResourceLocation sm2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
+            final ResourceLocation uh2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
             final Object o;
             final Object obj;
-            return Registry.BLOCK.getOptional(sm2).<Throwable>orElseThrow(() -> {
+            return Registry.BLOCK.getOptional(uh2).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown block type '" + obj + "'");
                 return o;
             });
@@ -56,9 +52,9 @@ public class PlacedBlockTrigger extends SimpleCriterionTrigger<TriggerInstance>
         return null;
     }
     
-    public void trigger(final ServerPlayer xe, final BlockPos fk, final ItemStack ben) {
-        final BlockState byj5 = xe.getLevel().getBlockState(fk);
-        this.trigger(xe.getAdvancements(), a -> a.matches(byj5, fk, xe.getLevel(), ben));
+    public void trigger(final ServerPlayer ze, final BlockPos fu, final ItemStack bki) {
+        final BlockState cfj5 = ze.getLevel().getBlockState(fu);
+        this.trigger(ze, a -> a.matches(cfj5, fu, ze.getLevel(), bki));
     }
     
     static {
@@ -71,32 +67,32 @@ public class PlacedBlockTrigger extends SimpleCriterionTrigger<TriggerInstance>
         private final LocationPredicate location;
         private final ItemPredicate item;
         
-        public TriggerInstance(@Nullable final Block bph, final StatePropertiesPredicate cc, final LocationPredicate bp, final ItemPredicate bj) {
-            super(PlacedBlockTrigger.ID);
-            this.block = bph;
-            this.state = cc;
-            this.location = bp;
-            this.item = bj;
+        public TriggerInstance(final EntityPredicate.Composite b, @Nullable final Block bvr, final StatePropertiesPredicate ck, final LocationPredicate bu, final ItemPredicate bo) {
+            super(PlacedBlockTrigger.ID, b);
+            this.block = bvr;
+            this.state = ck;
+            this.location = bu;
+            this.item = bo;
         }
         
-        public static TriggerInstance placedBlock(final Block bph) {
-            return new TriggerInstance(bph, StatePropertiesPredicate.ANY, LocationPredicate.ANY, ItemPredicate.ANY);
+        public static TriggerInstance placedBlock(final Block bvr) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, bvr, StatePropertiesPredicate.ANY, LocationPredicate.ANY, ItemPredicate.ANY);
         }
         
-        public boolean matches(final BlockState byj, final BlockPos fk, final ServerLevel xd, final ItemStack ben) {
-            return (this.block == null || byj.getBlock() == this.block) && this.state.matches(byj) && this.location.matches(xd, (float)fk.getX(), (float)fk.getY(), (float)fk.getZ()) && this.item.matches(ben);
+        public boolean matches(final BlockState cfj, final BlockPos fu, final ServerLevel zd, final ItemStack bki) {
+            return (this.block == null || cfj.is(this.block)) && this.state.matches(cfj) && this.location.matches(zd, (float)fu.getX(), (float)fu.getY(), (float)fu.getZ()) && this.item.matches(bki);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
             if (this.block != null) {
-                jsonObject2.addProperty("block", Registry.BLOCK.getKey(this.block).toString());
+                jsonObject3.addProperty("block", Registry.BLOCK.getKey(this.block).toString());
             }
-            jsonObject2.add("state", this.state.serializeToJson());
-            jsonObject2.add("location", this.location.serializeToJson());
-            jsonObject2.add("item", this.item.serializeToJson());
-            return jsonObject2;
+            jsonObject3.add("state", this.state.serializeToJson());
+            jsonObject3.add("location", this.location.serializeToJson());
+            jsonObject3.add("item", this.item.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/PlayerHurtEntityTrigger.java b/src/net/minecraft/advancements/critereon/PlayerHurtEntityTrigger.java
index 2608618..9d4f55f 100644
--- a/src/net/minecraft/advancements/critereon/PlayerHurtEntityTrigger.java
+++ b/src/net/minecraft/advancements/critereon/PlayerHurtEntityTrigger.java
@@ -1,11 +1,9 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
+import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -17,15 +15,15 @@ public class PlayerHurtEntityTrigger extends SimpleCriterionTrigger<TriggerInsta
         return PlayerHurtEntityTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final DamagePredicate ar4 = DamagePredicate.fromJson(jsonObject.get("damage"));
-        final EntityPredicate bb5 = EntityPredicate.fromJson(jsonObject.get("entity"));
-        return new TriggerInstance(ar4, bb5);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final DamagePredicate at5 = DamagePredicate.fromJson(jsonObject.get("damage"));
+        final EntityPredicate.Composite b2 = EntityPredicate.Composite.fromJson(jsonObject, "entity", av);
+        return new TriggerInstance(b, at5, b2);
     }
     
-    public void trigger(final ServerPlayer xe, final Entity akq, final DamageSource ajz, final float float4, final float float5, final boolean boolean6) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, akq, ajz, float4, float5, boolean6));
+    public void trigger(final ServerPlayer ze, final Entity aom, final DamageSource anw, final float float4, final float float5, final boolean boolean6) {
+        final LootContext dat8 = EntityPredicate.createContext(ze, aom);
+        this.trigger(ze, a -> a.matches(ze, dat8, anw, float4, float5, boolean6));
     }
     
     static {
@@ -34,28 +32,28 @@ public class PlayerHurtEntityTrigger extends SimpleCriterionTrigger<TriggerInsta
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final DamagePredicate damage;
-        private final EntityPredicate entity;
+        private final EntityPredicate.Composite entity;
         
-        public TriggerInstance(final DamagePredicate ar, final EntityPredicate bb) {
-            super(PlayerHurtEntityTrigger.ID);
-            this.damage = ar;
-            this.entity = bb;
+        public TriggerInstance(final EntityPredicate.Composite b1, final DamagePredicate at, final EntityPredicate.Composite b3) {
+            super(PlayerHurtEntityTrigger.ID, b1);
+            this.damage = at;
+            this.entity = b3;
         }
         
         public static TriggerInstance playerHurtEntity(final DamagePredicate.Builder a) {
-            return new TriggerInstance(a.build(), EntityPredicate.ANY);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, a.build(), EntityPredicate.Composite.ANY);
         }
         
-        public boolean matches(final ServerPlayer xe, final Entity akq, final DamageSource ajz, final float float4, final float float5, final boolean boolean6) {
-            return this.damage.matches(xe, ajz, float4, float5, boolean6) && this.entity.matches(xe, akq);
+        public boolean matches(final ServerPlayer ze, final LootContext dat, final DamageSource anw, final float float4, final float float5, final boolean boolean6) {
+            return this.damage.matches(ze, anw, float4, float5, boolean6) && this.entity.matches(dat);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("damage", this.damage.serializeToJson());
-            jsonObject2.add("entity", this.entity.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("damage", this.damage.serializeToJson());
+            jsonObject3.add("entity", this.entity.toJson(cg));
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/PlayerInteractTrigger.java b/src/net/minecraft/advancements/critereon/PlayerInteractTrigger.java
new file mode 100644
index 0000000..b3b6a8a
--- /dev/null
+++ b/src/net/minecraft/advancements/critereon/PlayerInteractTrigger.java
@@ -0,0 +1,60 @@
+package net.minecraft.advancements.critereon;
+
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.server.level.ServerPlayer;
+import com.google.gson.JsonObject;
+import net.minecraft.resources.ResourceLocation;
+
+public class PlayerInteractTrigger extends SimpleCriterionTrigger<TriggerInstance> {
+    private static final ResourceLocation ID;
+    
+    @Override
+    public ResourceLocation getId() {
+        return PlayerInteractTrigger.ID;
+    }
+    
+    @Override
+    protected TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ItemPredicate bo5 = ItemPredicate.fromJson(jsonObject.get("item"));
+        final EntityPredicate.Composite b2 = EntityPredicate.Composite.fromJson(jsonObject, "entity", av);
+        return new TriggerInstance(b, bo5, b2);
+    }
+    
+    public void trigger(final ServerPlayer ze, final ItemStack bki, final Entity aom) {
+        final LootContext dat5 = EntityPredicate.createContext(ze, aom);
+        this.trigger(ze, a -> a.matches(bki, dat5));
+    }
+    
+    static {
+        ID = new ResourceLocation("player_interacted_with_entity");
+    }
+    
+    public static class TriggerInstance extends AbstractCriterionTriggerInstance {
+        private final ItemPredicate item;
+        private final EntityPredicate.Composite entity;
+        
+        public TriggerInstance(final EntityPredicate.Composite b1, final ItemPredicate bo, final EntityPredicate.Composite b3) {
+            super(PlayerInteractTrigger.ID, b1);
+            this.item = bo;
+            this.entity = b3;
+        }
+        
+        public static TriggerInstance itemUsedOnEntity(final EntityPredicate.Composite b1, final ItemPredicate.Builder a, final EntityPredicate.Composite b3) {
+            return new TriggerInstance(b1, a.build(), b3);
+        }
+        
+        public boolean matches(final ItemStack bki, final LootContext dat) {
+            return this.item.matches(bki) && this.entity.matches(dat);
+        }
+        
+        @Override
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("item", this.item.serializeToJson());
+            jsonObject3.add("entity", this.entity.toJson(cg));
+            return jsonObject3;
+        }
+    }
+}
diff --git a/src/net/minecraft/advancements/critereon/PlayerPredicate.java b/src/net/minecraft/advancements/critereon/PlayerPredicate.java
index fda00bb..511352d 100644
--- a/src/net/minecraft/advancements/critereon/PlayerPredicate.java
+++ b/src/net/minecraft/advancements/critereon/PlayerPredicate.java
@@ -56,47 +56,47 @@ public class PlayerPredicate {
         return new AdvancementCriterionsPredicate(object2BooleanMap2);
     }
     
-    private PlayerPredicate(final MinMaxBounds.Ints d, final GameType bjt, final Map<Stat<?>, MinMaxBounds.Ints> map3, final Object2BooleanMap<ResourceLocation> object2BooleanMap, final Map<ResourceLocation, AdvancementPredicate> map5) {
+    private PlayerPredicate(final MinMaxBounds.Ints d, final GameType bpy, final Map<Stat<?>, MinMaxBounds.Ints> map3, final Object2BooleanMap<ResourceLocation> object2BooleanMap, final Map<ResourceLocation, AdvancementPredicate> map5) {
         this.level = d;
-        this.gameType = bjt;
+        this.gameType = bpy;
         this.stats = map3;
         this.recipes = object2BooleanMap;
         this.advancements = map5;
     }
     
-    public boolean matches(final Entity akq) {
+    public boolean matches(final Entity aom) {
         if (this == PlayerPredicate.ANY) {
             return true;
         }
-        if (!(akq instanceof ServerPlayer)) {
+        if (!(aom instanceof ServerPlayer)) {
             return false;
         }
-        final ServerPlayer xe3 = (ServerPlayer)akq;
-        if (!this.level.matches(xe3.experienceLevel)) {
+        final ServerPlayer ze3 = (ServerPlayer)aom;
+        if (!this.level.matches(ze3.experienceLevel)) {
             return false;
         }
-        if (this.gameType != GameType.NOT_SET && this.gameType != xe3.gameMode.getGameModeForPlayer()) {
+        if (this.gameType != GameType.NOT_SET && this.gameType != ze3.gameMode.getGameModeForPlayer()) {
             return false;
         }
-        final StatsCounter aas4 = xe3.getStats();
+        final StatsCounter acv4 = ze3.getStats();
         for (final Map.Entry<Stat<?>, MinMaxBounds.Ints> entry6 : this.stats.entrySet()) {
-            final int integer7 = aas4.getValue(entry6.getKey());
+            final int integer7 = acv4.getValue(entry6.getKey());
             if (!entry6.getValue().matches(integer7)) {
                 return false;
             }
         }
-        final RecipeBook aal5 = xe3.getRecipeBook();
+        final RecipeBook aco5 = ze3.getRecipeBook();
         for (final Object2BooleanMap.Entry<ResourceLocation> entry7 : this.recipes.object2BooleanEntrySet()) {
-            if (aal5.contains((ResourceLocation)entry7.getKey()) != entry7.getBooleanValue()) {
+            if (aco5.contains((ResourceLocation)entry7.getKey()) != entry7.getBooleanValue()) {
                 return false;
             }
         }
         if (!this.advancements.isEmpty()) {
-            final PlayerAdvancements sv6 = xe3.getAdvancements();
-            final ServerAdvancementManager sx7 = xe3.getServer().getAdvancements();
+            final PlayerAdvancements uq6 = ze3.getAdvancements();
+            final ServerAdvancementManager us7 = ze3.getServer().getAdvancements();
             for (final Map.Entry<ResourceLocation, AdvancementPredicate> entry8 : this.advancements.entrySet()) {
-                final Advancement u10 = sx7.getAdvancement(entry8.getKey());
-                if (u10 == null || !entry8.getValue().test(sv6.getOrStartProgress(u10))) {
+                final Advancement w10 = us7.getAdvancement(entry8.getKey());
+                if (w10 == null || !entry8.getValue().test(uq6.getOrStartProgress(w10))) {
                     return false;
                 }
             }
@@ -111,51 +111,51 @@ public class PlayerPredicate {
         final JsonObject jsonObject2 = GsonHelper.convertToJsonObject(jsonElement, "player");
         final MinMaxBounds.Ints d3 = MinMaxBounds.Ints.fromJson(jsonObject2.get("level"));
         final String string4 = GsonHelper.getAsString(jsonObject2, "gamemode", "");
-        final GameType bjt5 = GameType.byName(string4, GameType.NOT_SET);
+        final GameType bpy5 = GameType.byName(string4, GameType.NOT_SET);
         final Map<Stat<?>, MinMaxBounds.Ints> map6 = Maps.newHashMap();
         final JsonArray jsonArray7 = GsonHelper.getAsJsonArray(jsonObject2, "stats", null);
         if (jsonArray7 != null) {
             for (final JsonElement jsonElement2 : jsonArray7) {
                 final JsonObject jsonObject3 = GsonHelper.convertToJsonObject(jsonElement2, "stats entry");
-                final ResourceLocation sm11 = new ResourceLocation(GsonHelper.getAsString(jsonObject3, "type"));
-                final StatType<?> aaq12 = Registry.STAT_TYPE.get(sm11);
-                if (aaq12 == null) {
-                    throw new JsonParseException("Invalid stat type: " + sm11);
+                final ResourceLocation uh11 = new ResourceLocation(GsonHelper.getAsString(jsonObject3, "type"));
+                final StatType<?> act12 = Registry.STAT_TYPE.get(uh11);
+                if (act12 == null) {
+                    throw new JsonParseException("Invalid stat type: " + uh11);
                 }
-                final ResourceLocation sm12 = new ResourceLocation(GsonHelper.getAsString(jsonObject3, "stat"));
-                final Stat<?> aao14 = PlayerPredicate.getStat(aaq12, sm12);
+                final ResourceLocation uh12 = new ResourceLocation(GsonHelper.getAsString(jsonObject3, "stat"));
+                final Stat<?> acr14 = PlayerPredicate.getStat(act12, uh12);
                 final MinMaxBounds.Ints d4 = MinMaxBounds.Ints.fromJson(jsonObject3.get("value"));
-                map6.put(aao14, d4);
+                map6.put(acr14, d4);
             }
         }
         final Object2BooleanMap<ResourceLocation> object2BooleanMap8 = (Object2BooleanMap<ResourceLocation>)new Object2BooleanOpenHashMap();
         final JsonObject jsonObject4 = GsonHelper.getAsJsonObject(jsonObject2, "recipes", new JsonObject());
         for (final Map.Entry<String, JsonElement> entry11 : jsonObject4.entrySet()) {
-            final ResourceLocation sm13 = new ResourceLocation(entry11.getKey());
+            final ResourceLocation uh13 = new ResourceLocation(entry11.getKey());
             final boolean boolean13 = GsonHelper.convertToBoolean(entry11.getValue(), "recipe present");
-            object2BooleanMap8.put(sm13, boolean13);
+            object2BooleanMap8.put(uh13, boolean13);
         }
         final Map<ResourceLocation, AdvancementPredicate> map7 = Maps.newHashMap();
         final JsonObject jsonObject5 = GsonHelper.getAsJsonObject(jsonObject2, "advancements", new JsonObject());
         for (final Map.Entry<String, JsonElement> entry12 : jsonObject5.entrySet()) {
-            final ResourceLocation sm14 = new ResourceLocation(entry12.getKey());
+            final ResourceLocation uh14 = new ResourceLocation(entry12.getKey());
             final AdvancementPredicate c15 = advancementPredicateFromJson(entry12.getValue());
-            map7.put(sm14, c15);
+            map7.put(uh14, c15);
         }
-        return new PlayerPredicate(d3, bjt5, map6, object2BooleanMap8, map7);
+        return new PlayerPredicate(d3, bpy5, map6, object2BooleanMap8, map7);
     }
     
-    private static <T> Stat<T> getStat(final StatType<T> aaq, final ResourceLocation sm) {
-        final Registry<T> gb3 = aaq.getRegistry();
-        final T object4 = gb3.get(sm);
+    private static <T> Stat<T> getStat(final StatType<T> act, final ResourceLocation uh) {
+        final Registry<T> gl3 = act.getRegistry();
+        final T object4 = gl3.get(uh);
         if (object4 == null) {
-            throw new JsonParseException("Unknown object " + sm + " for stat type " + Registry.STAT_TYPE.getKey(aaq));
+            throw new JsonParseException("Unknown object " + uh + " for stat type " + Registry.STAT_TYPE.getKey(act));
         }
-        return aaq.get(object4);
+        return act.get(object4);
     }
     
-    private static <T> ResourceLocation getStatValueId(final Stat<T> aao) {
-        return aao.getType().getRegistry().getKey(aao.getValue());
+    private static <T> ResourceLocation getStatValueId(final Stat<T> acr) {
+        return acr.getType().getRegistry().getKey(acr.getValue());
     }
     
     public JsonElement serializeToJson() {
@@ -171,10 +171,10 @@ public class PlayerPredicate {
             final JsonArray jsonArray3 = new JsonArray();
             final JsonObject jsonObject3;
             final JsonArray jsonArray4;
-            this.stats.forEach((aao, d) -> {
+            this.stats.forEach((acr, d) -> {
                 jsonObject3 = new JsonObject();
-                jsonObject3.addProperty("type", Registry.STAT_TYPE.getKey(aao.getType()).toString());
-                jsonObject3.addProperty("stat", PlayerPredicate.getStatValueId(aao).toString());
+                jsonObject3.addProperty("type", Registry.STAT_TYPE.getKey(acr.getType()).toString());
+                jsonObject3.addProperty("stat", PlayerPredicate.getStatValueId(acr).toString());
                 jsonObject3.add("value", d.serializeToJson());
                 jsonArray4.add(jsonObject3);
                 return;
@@ -183,13 +183,13 @@ public class PlayerPredicate {
         }
         if (!this.recipes.isEmpty()) {
             final JsonObject jsonObject4 = new JsonObject();
-            this.recipes.forEach((sm, boolean3) -> jsonObject4.addProperty(sm.toString(), boolean3));
+            this.recipes.forEach((uh, boolean3) -> jsonObject4.addProperty(uh.toString(), boolean3));
             jsonObject2.add("recipes", jsonObject4);
         }
         if (!this.advancements.isEmpty()) {
             final JsonObject jsonObject4 = new JsonObject();
             final JsonObject jsonObject5;
-            this.advancements.forEach((sm, c) -> jsonObject5.add(sm.toString(), c.toJson()));
+            this.advancements.forEach((uh, c) -> jsonObject5.add(uh.toString(), c.toJson()));
             jsonObject2.add("advancements", jsonObject4);
         }
         return jsonObject2;
@@ -212,8 +212,8 @@ public class PlayerPredicate {
         }
         
         @Override
-        public boolean test(final AdvancementProgress w) {
-            return w.isDone() == this.state;
+        public boolean test(final AdvancementProgress y) {
+            return y.isDone() == this.state;
         }
     }
     
@@ -232,10 +232,10 @@ public class PlayerPredicate {
         }
         
         @Override
-        public boolean test(final AdvancementProgress w) {
+        public boolean test(final AdvancementProgress y) {
             for (final Object2BooleanMap.Entry<String> entry4 : this.criterions.object2BooleanEntrySet()) {
-                final CriterionProgress aa5 = w.getCriterion((String)entry4.getKey());
-                if (aa5 == null || aa5.isDone() != entry4.getBooleanValue()) {
+                final CriterionProgress ac5 = y.getCriterion((String)entry4.getKey());
+                if (ac5 == null || ac5.isDone() != entry4.getBooleanValue()) {
                     return false;
                 }
             }
diff --git a/src/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.java b/src/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.java
index 36fced4..8a1f60a 100644
--- a/src/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.java
+++ b/src/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.java
@@ -1,11 +1,8 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -17,14 +14,17 @@ public class RecipeUnlockedTrigger extends SimpleCriterionTrigger<TriggerInstanc
         return RecipeUnlockedTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final ResourceLocation sm4 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "recipe"));
-        return new TriggerInstance(sm4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ResourceLocation uh5 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "recipe"));
+        return new TriggerInstance(b, uh5);
     }
     
-    public void trigger(final ServerPlayer xe, final Recipe<?> bgw) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(bgw));
+    public void trigger(final ServerPlayer ze, final Recipe<?> bmu) {
+        this.trigger(ze, a -> a.matches(bmu));
+    }
+    
+    public static TriggerInstance unlocked(final ResourceLocation uh) {
+        return new TriggerInstance(EntityPredicate.Composite.ANY, uh);
     }
     
     static {
@@ -34,20 +34,20 @@ public class RecipeUnlockedTrigger extends SimpleCriterionTrigger<TriggerInstanc
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final ResourceLocation recipe;
         
-        public TriggerInstance(final ResourceLocation sm) {
-            super(RecipeUnlockedTrigger.ID);
-            this.recipe = sm;
+        public TriggerInstance(final EntityPredicate.Composite b, final ResourceLocation uh) {
+            super(RecipeUnlockedTrigger.ID, b);
+            this.recipe = uh;
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.addProperty("recipe", this.recipe.toString());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.addProperty("recipe", this.recipe.toString());
+            return jsonObject3;
         }
         
-        public boolean matches(final Recipe<?> bgw) {
-            return this.recipe.equals(bgw.getId());
+        public boolean matches(final Recipe<?> bmu) {
+            return this.recipe.equals(bmu.getId());
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/SerializationContext.java b/src/net/minecraft/advancements/critereon/SerializationContext.java
new file mode 100644
index 0000000..190400b
--- /dev/null
+++ b/src/net/minecraft/advancements/critereon/SerializationContext.java
@@ -0,0 +1,23 @@
+package net.minecraft.advancements.critereon;
+
+import com.google.gson.JsonElement;
+import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+import net.minecraft.world.level.storage.loot.Deserializers;
+import com.google.gson.Gson;
+
+public class SerializationContext {
+    public static final SerializationContext INSTANCE;
+    private final Gson predicateGson;
+    
+    public SerializationContext() {
+        this.predicateGson = Deserializers.createConditionSerializer().create();
+    }
+    
+    public final JsonElement serializeConditions(final LootItemCondition[] arr) {
+        return this.predicateGson.toJsonTree(arr);
+    }
+    
+    static {
+        INSTANCE = new SerializationContext();
+    }
+}
diff --git a/src/net/minecraft/advancements/critereon/ShotCrossbowTrigger.java b/src/net/minecraft/advancements/critereon/ShotCrossbowTrigger.java
index b05e5de..8468253 100644
--- a/src/net/minecraft/advancements/critereon/ShotCrossbowTrigger.java
+++ b/src/net/minecraft/advancements/critereon/ShotCrossbowTrigger.java
@@ -1,11 +1,8 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -17,14 +14,13 @@ public class ShotCrossbowTrigger extends SimpleCriterionTrigger<TriggerInstance>
         return ShotCrossbowTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final ItemPredicate bj4 = ItemPredicate.fromJson(jsonObject.get("item"));
-        return new TriggerInstance(bj4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ItemPredicate bo5 = ItemPredicate.fromJson(jsonObject.get("item"));
+        return new TriggerInstance(b, bo5);
     }
     
-    public void trigger(final ServerPlayer xe, final ItemStack ben) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(ben));
+    public void trigger(final ServerPlayer ze, final ItemStack bki) {
+        this.trigger(ze, a -> a.matches(bki));
     }
     
     static {
@@ -34,24 +30,24 @@ public class ShotCrossbowTrigger extends SimpleCriterionTrigger<TriggerInstance>
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final ItemPredicate item;
         
-        public TriggerInstance(final ItemPredicate bj) {
-            super(ShotCrossbowTrigger.ID);
-            this.item = bj;
+        public TriggerInstance(final EntityPredicate.Composite b, final ItemPredicate bo) {
+            super(ShotCrossbowTrigger.ID, b);
+            this.item = bo;
         }
         
-        public static TriggerInstance shotCrossbow(final ItemLike bjv) {
-            return new TriggerInstance(ItemPredicate.Builder.item().of(bjv).build());
+        public static TriggerInstance shotCrossbow(final ItemLike bqa) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, ItemPredicate.Builder.item().of(bqa).build());
         }
         
-        public boolean matches(final ItemStack ben) {
-            return this.item.matches(ben);
+        public boolean matches(final ItemStack bki) {
+            return this.item.matches(bki);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("item", this.item.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("item", this.item.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java b/src/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
index e86431e..90dd951 100644
--- a/src/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
+++ b/src/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
@@ -1,21 +1,22 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.common.collect.UnmodifiableIterator;
-import java.util.Collection;
-import com.google.common.collect.ImmutableSet;
+import net.minecraft.advancements.CriterionTriggerInstance;
 import java.util.Iterator;
 import java.util.List;
+import net.minecraft.world.level.storage.loot.LootContext;
 import com.google.common.collect.Lists;
+import net.minecraft.world.entity.Entity;
 import java.util.function.Predicate;
+import net.minecraft.server.level.ServerPlayer;
+import com.google.gson.JsonObject;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Maps;
 import java.util.Set;
 import net.minecraft.server.PlayerAdvancements;
 import java.util.Map;
 import net.minecraft.advancements.CriterionTrigger;
-import net.minecraft.advancements.CriterionTriggerInstance;
 
-public abstract class SimpleCriterionTrigger<T extends CriterionTriggerInstance> implements CriterionTrigger<T> {
+public abstract class SimpleCriterionTrigger<T extends AbstractCriterionTriggerInstance> implements CriterionTrigger<T> {
     private final Map<PlayerAdvancements, Set<Listener<T>>> players;
     
     public SimpleCriterionTrigger() {
@@ -23,52 +24,54 @@ public abstract class SimpleCriterionTrigger<T extends CriterionTriggerInstance>
     }
     
     @Override
-    public final void addPlayerListener(final PlayerAdvancements sv, final Listener<T> a) {
-        this.players.computeIfAbsent(sv, sv -> Sets.newHashSet()).add(a);
+    public final void addPlayerListener(final PlayerAdvancements uq, final Listener<T> a) {
+        this.players.computeIfAbsent(uq, uq -> Sets.newHashSet()).add(a);
     }
     
     @Override
-    public final void removePlayerListener(final PlayerAdvancements sv, final Listener<T> a) {
-        final Set<Listener<T>> set4 = this.players.get(sv);
+    public final void removePlayerListener(final PlayerAdvancements uq, final Listener<T> a) {
+        final Set<Listener<T>> set4 = this.players.get(uq);
         if (set4 != null) {
             set4.remove(a);
             if (set4.isEmpty()) {
-                this.players.remove(sv);
+                this.players.remove(uq);
             }
         }
     }
     
     @Override
-    public final void removePlayerListeners(final PlayerAdvancements sv) {
-        this.players.remove(sv);
+    public final void removePlayerListeners(final PlayerAdvancements uq) {
+        this.players.remove(uq);
     }
     
-    protected void trigger(final PlayerAdvancements sv, final Predicate<T> predicate) {
-        final Set<Listener<T>> set4 = this.players.get(sv);
-        if (set4 == null) {
+    protected abstract T createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av);
+    
+    @Override
+    public final T createInstance(final JsonObject jsonObject, final DeserializationContext av) {
+        final EntityPredicate.Composite b4 = EntityPredicate.Composite.fromJson(jsonObject, "player", av);
+        return this.createInstance(jsonObject, b4, av);
+    }
+    
+    protected void trigger(final ServerPlayer ze, final Predicate<T> predicate) {
+        final PlayerAdvancements uq4 = ze.getAdvancements();
+        final Set<Listener<T>> set5 = this.players.get(uq4);
+        if (set5 == null || set5.isEmpty()) {
             return;
         }
-        List<Listener<T>> list5 = null;
-        for (final Listener<T> a7 : set4) {
-            if (predicate.test(a7.getTriggerInstance())) {
-                if (list5 == null) {
-                    list5 = Lists.newArrayList();
+        final LootContext dat6 = EntityPredicate.createContext(ze, ze);
+        List<Listener<T>> list7 = null;
+        for (final Listener<T> a9 : set5) {
+            final T aj10 = a9.getTriggerInstance();
+            if (aj10.getPlayerPredicate().matches(dat6) && predicate.test(aj10)) {
+                if (list7 == null) {
+                    list7 = Lists.newArrayList();
                 }
-                list5.add(a7);
+                list7.add(a9);
             }
         }
-        if (list5 != null) {
-            for (final Listener<T> a7 : list5) {
-                a7.run(sv);
-            }
-        }
-    }
-    
-    protected void trigger(final PlayerAdvancements sv) {
-        final Set<Listener<T>> set3 = this.players.get(sv);
-        if (set3 != null && !set3.isEmpty()) {
-            for (final Listener<T> a5 : ImmutableSet.<Listener<T>>copyOf(set3)) {
-                a5.run(sv);
+        if (list7 != null) {
+            for (final Listener<T> a9 : list7) {
+                a9.run(uq4);
             }
         }
     }
diff --git a/src/net/minecraft/advancements/critereon/SlideDownBlockTrigger.java b/src/net/minecraft/advancements/critereon/SlideDownBlockTrigger.java
index 76f10a5..22272e4 100644
--- a/src/net/minecraft/advancements/critereon/SlideDownBlockTrigger.java
+++ b/src/net/minecraft/advancements/critereon/SlideDownBlockTrigger.java
@@ -1,7 +1,5 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.server.level.ServerPlayer;
 import javax.annotation.Nullable;
@@ -10,7 +8,6 @@ import net.minecraft.util.GsonHelper;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.StateDefinition;
 import com.google.gson.JsonSyntaxException;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -22,28 +19,27 @@ public class SlideDownBlockTrigger extends SimpleCriterionTrigger<TriggerInstanc
         return SlideDownBlockTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final Block bph4 = deserializeBlock(jsonObject);
-        final StatePropertiesPredicate cc5 = StatePropertiesPredicate.fromJson(jsonObject.get("state"));
-        if (bph4 != null) {
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final Block bvr5 = deserializeBlock(jsonObject);
+        final StatePropertiesPredicate ck6 = StatePropertiesPredicate.fromJson(jsonObject.get("state"));
+        if (bvr5 != null) {
             final JsonSyntaxException ex;
             final Object obj;
-            cc5.checkState(bph4.getStateDefinition(), string -> {
+            ck6.checkState(bvr5.getStateDefinition(), string -> {
                 new JsonSyntaxException("Block " + obj + " has no property " + string);
                 throw ex;
             });
         }
-        return new TriggerInstance(bph4, cc5);
+        return new TriggerInstance(b, bvr5, ck6);
     }
     
     @Nullable
     private static Block deserializeBlock(final JsonObject jsonObject) {
         if (jsonObject.has("block")) {
-            final ResourceLocation sm2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
+            final ResourceLocation uh2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
             final Object o;
             final Object obj;
-            return Registry.BLOCK.getOptional(sm2).<Throwable>orElseThrow(() -> {
+            return Registry.BLOCK.getOptional(uh2).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown block type '" + obj + "'");
                 return o;
             });
@@ -51,8 +47,8 @@ public class SlideDownBlockTrigger extends SimpleCriterionTrigger<TriggerInstanc
         return null;
     }
     
-    public void trigger(final ServerPlayer xe, final BlockState byj) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(byj));
+    public void trigger(final ServerPlayer ze, final BlockState cfj) {
+        this.trigger(ze, a -> a.matches(cfj));
     }
     
     static {
@@ -63,28 +59,28 @@ public class SlideDownBlockTrigger extends SimpleCriterionTrigger<TriggerInstanc
         private final Block block;
         private final StatePropertiesPredicate state;
         
-        public TriggerInstance(@Nullable final Block bph, final StatePropertiesPredicate cc) {
-            super(SlideDownBlockTrigger.ID);
-            this.block = bph;
-            this.state = cc;
+        public TriggerInstance(final EntityPredicate.Composite b, @Nullable final Block bvr, final StatePropertiesPredicate ck) {
+            super(SlideDownBlockTrigger.ID, b);
+            this.block = bvr;
+            this.state = ck;
         }
         
-        public static TriggerInstance slidesDownBlock(final Block bph) {
-            return new TriggerInstance(bph, StatePropertiesPredicate.ANY);
+        public static TriggerInstance slidesDownBlock(final Block bvr) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, bvr, StatePropertiesPredicate.ANY);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
             if (this.block != null) {
-                jsonObject2.addProperty("block", Registry.BLOCK.getKey(this.block).toString());
+                jsonObject3.addProperty("block", Registry.BLOCK.getKey(this.block).toString());
             }
-            jsonObject2.add("state", this.state.serializeToJson());
-            return jsonObject2;
+            jsonObject3.add("state", this.state.serializeToJson());
+            return jsonObject3;
         }
         
-        public boolean matches(final BlockState byj) {
-            return (this.block == null || byj.getBlock() == this.block) && this.state.matches(byj);
+        public boolean matches(final BlockState cfj) {
+            return (this.block == null || cfj.is(this.block)) && this.state.matches(cfj);
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/StatePropertiesPredicate.java b/src/net/minecraft/advancements/critereon/StatePropertiesPredicate.java
index 314d5bd..d2e3dba 100644
--- a/src/net/minecraft/advancements/critereon/StatePropertiesPredicate.java
+++ b/src/net/minecraft/advancements/critereon/StatePropertiesPredicate.java
@@ -48,25 +48,25 @@ public class StatePropertiesPredicate {
         this.properties = ImmutableList.copyOf(list);
     }
     
-    public <S extends StateHolder<S>> boolean matches(final StateDefinition<?, S> byk, final S byl) {
+    public <S extends StateHolder<?, S>> boolean matches(final StateDefinition<?, S> cfk, final S cfl) {
         for (final PropertyMatcher c5 : this.properties) {
-            if (!c5.<S>match(byk, byl)) {
+            if (!c5.<S>match(cfk, cfl)) {
                 return false;
             }
         }
         return true;
     }
     
-    public boolean matches(final BlockState byj) {
-        return this.<BlockState>matches(byj.getBlock().getStateDefinition(), byj);
+    public boolean matches(final BlockState cfj) {
+        return this.<BlockState>matches(cfj.getBlock().getStateDefinition(), cfj);
     }
     
-    public boolean matches(final FluidState coj) {
-        return this.<FluidState>matches(coj.getType().getStateDefinition(), coj);
+    public boolean matches(final FluidState cxa) {
+        return this.<FluidState>matches(cxa.getType().getStateDefinition(), cxa);
     }
     
-    public void checkState(final StateDefinition<?, ?> byk, final Consumer<String> consumer) {
-        this.properties.forEach(c -> c.checkState(byk, consumer));
+    public void checkState(final StateDefinition<?, ?> cfk, final Consumer<String> consumer) {
+        this.properties.forEach(c -> c.checkState(cfk, consumer));
     }
     
     public static StatePropertiesPredicate fromJson(@Nullable final JsonElement jsonElement) {
@@ -103,12 +103,12 @@ public class StatePropertiesPredicate {
             this.name = string;
         }
         
-        public <S extends StateHolder<S>> boolean match(final StateDefinition<?, S> byk, final S byl) {
-            final Property<?> bzm4 = byk.getProperty(this.name);
-            return bzm4 != null && this.match(byl, bzm4);
+        public <S extends StateHolder<?, S>> boolean match(final StateDefinition<?, S> cfk, final S cfl) {
+            final Property<?> cgl4 = cfk.getProperty(this.name);
+            return cgl4 != null && this.match(cfl, cgl4);
         }
         
-        protected abstract <T extends Comparable<T>> boolean match(final StateHolder<?> byl, final Property<T> bzm);
+        protected abstract <T extends Comparable<T>> boolean match(final StateHolder<?, ?> cfl, final Property<T> cgl);
         
         public abstract JsonElement toJson();
         
@@ -116,9 +116,9 @@ public class StatePropertiesPredicate {
             return this.name;
         }
         
-        public void checkState(final StateDefinition<?, ?> byk, final Consumer<String> consumer) {
-            final Property<?> bzm4 = byk.getProperty(this.name);
-            if (bzm4 == null) {
+        public void checkState(final StateDefinition<?, ?> cfk, final Consumer<String> consumer) {
+            final Property<?> cgl4 = cfk.getProperty(this.name);
+            if (cgl4 == null) {
                 consumer.accept(this.name);
             }
         }
@@ -133,9 +133,9 @@ public class StatePropertiesPredicate {
         }
         
         @Override
-        protected <T extends Comparable<T>> boolean match(final StateHolder<?> byl, final Property<T> bzm) {
-            final T comparable4 = byl.<T>getValue(bzm);
-            final Optional<T> optional5 = bzm.getValue(this.value);
+        protected <T extends Comparable<T>> boolean match(final StateHolder<?, ?> cfl, final Property<T> cgl) {
+            final T comparable4 = cfl.<T>getValue(cgl);
+            final Optional<T> optional5 = cgl.getValue(this.value);
             return optional5.isPresent() && comparable4.compareTo(optional5.get()) == 0;
         }
         
@@ -158,16 +158,16 @@ public class StatePropertiesPredicate {
         }
         
         @Override
-        protected <T extends Comparable<T>> boolean match(final StateHolder<?> byl, final Property<T> bzm) {
-            final T comparable4 = byl.<T>getValue(bzm);
+        protected <T extends Comparable<T>> boolean match(final StateHolder<?, ?> cfl, final Property<T> cgl) {
+            final T comparable4 = cfl.<T>getValue(cgl);
             if (this.minValue != null) {
-                final Optional<T> optional5 = bzm.getValue(this.minValue);
+                final Optional<T> optional5 = cgl.getValue(this.minValue);
                 if (!optional5.isPresent() || comparable4.compareTo(optional5.get()) < 0) {
                     return false;
                 }
             }
             if (this.maxValue != null) {
-                final Optional<T> optional5 = bzm.getValue(this.maxValue);
+                final Optional<T> optional5 = cgl.getValue(this.maxValue);
                 if (!optional5.isPresent() || comparable4.compareTo(optional5.get()) > 0) {
                     return false;
                 }
@@ -199,21 +199,21 @@ public class StatePropertiesPredicate {
             return new Builder();
         }
         
-        public Builder hasProperty(final Property<?> bzm, final String string) {
-            this.matchers.add(new ExactPropertyMatcher(bzm.getName(), string));
+        public Builder hasProperty(final Property<?> cgl, final String string) {
+            this.matchers.add(new ExactPropertyMatcher(cgl.getName(), string));
             return this;
         }
         
-        public Builder hasProperty(final Property<Integer> bzm, final int integer) {
-            return this.hasProperty(bzm, Integer.toString(integer));
+        public Builder hasProperty(final Property<Integer> cgl, final int integer) {
+            return this.hasProperty(cgl, Integer.toString(integer));
         }
         
-        public Builder hasProperty(final Property<Boolean> bzm, final boolean boolean2) {
-            return this.hasProperty(bzm, Boolean.toString(boolean2));
+        public Builder hasProperty(final Property<Boolean> cgl, final boolean boolean2) {
+            return this.hasProperty(cgl, Boolean.toString(boolean2));
         }
         
-        public <T extends java.lang.Comparable> Builder hasProperty(final Property<T> bzm, final T comparable) {
-            return this.hasProperty(bzm, ((StringRepresentable)comparable).getSerializedName());
+        public <T extends java.lang.Comparable> Builder hasProperty(final Property<T> cgl, final T comparable) {
+            return this.hasProperty(cgl, ((StringRepresentable)comparable).getSerializedName());
         }
         
         public StatePropertiesPredicate build() {
diff --git a/src/net/minecraft/advancements/critereon/SummonedEntityTrigger.java b/src/net/minecraft/advancements/critereon/SummonedEntityTrigger.java
index a52e7b2..24ec39f 100644
--- a/src/net/minecraft/advancements/critereon/SummonedEntityTrigger.java
+++ b/src/net/minecraft/advancements/critereon/SummonedEntityTrigger.java
@@ -1,10 +1,8 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
-import net.minecraft.advancements.CriterionTriggerInstance;
+import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -16,14 +14,14 @@ public class SummonedEntityTrigger extends SimpleCriterionTrigger<TriggerInstanc
         return SummonedEntityTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final EntityPredicate bb4 = EntityPredicate.fromJson(jsonObject.get("entity"));
-        return new TriggerInstance(bb4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final EntityPredicate.Composite b2 = EntityPredicate.Composite.fromJson(jsonObject, "entity", av);
+        return new TriggerInstance(b, b2);
     }
     
-    public void trigger(final ServerPlayer xe, final Entity akq) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, akq));
+    public void trigger(final ServerPlayer ze, final Entity aom) {
+        final LootContext dat4 = EntityPredicate.createContext(ze, aom);
+        this.trigger(ze, a -> a.matches(dat4));
     }
     
     static {
@@ -31,26 +29,26 @@ public class SummonedEntityTrigger extends SimpleCriterionTrigger<TriggerInstanc
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        private final EntityPredicate entity;
+        private final EntityPredicate.Composite entity;
         
-        public TriggerInstance(final EntityPredicate bb) {
-            super(SummonedEntityTrigger.ID);
-            this.entity = bb;
+        public TriggerInstance(final EntityPredicate.Composite b1, final EntityPredicate.Composite b2) {
+            super(SummonedEntityTrigger.ID, b1);
+            this.entity = b2;
         }
         
         public static TriggerInstance summonedEntity(final EntityPredicate.Builder a) {
-            return new TriggerInstance(a.build());
+            return new TriggerInstance(EntityPredicate.Composite.ANY, EntityPredicate.Composite.wrap(a.build()));
         }
         
-        public boolean matches(final ServerPlayer xe, final Entity akq) {
-            return this.entity.matches(xe, akq);
+        public boolean matches(final LootContext dat) {
+            return this.entity.matches(dat);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("entity", this.entity.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("entity", this.entity.toJson(cg));
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/TameAnimalTrigger.java b/src/net/minecraft/advancements/critereon/TameAnimalTrigger.java
index b27e752..119487b 100644
--- a/src/net/minecraft/advancements/critereon/TameAnimalTrigger.java
+++ b/src/net/minecraft/advancements/critereon/TameAnimalTrigger.java
@@ -1,11 +1,9 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
+import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -17,14 +15,14 @@ public class TameAnimalTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         return TameAnimalTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final EntityPredicate bb4 = EntityPredicate.fromJson(jsonObject.get("entity"));
-        return new TriggerInstance(bb4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final EntityPredicate.Composite b2 = EntityPredicate.Composite.fromJson(jsonObject, "entity", av);
+        return new TriggerInstance(b, b2);
     }
     
-    public void trigger(final ServerPlayer xe, final Animal atc) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, atc));
+    public void trigger(final ServerPlayer ze, final Animal ayk) {
+        final LootContext dat4 = EntityPredicate.createContext(ze, ayk);
+        this.trigger(ze, a -> a.matches(dat4));
     }
     
     static {
@@ -32,30 +30,30 @@ public class TameAnimalTrigger extends SimpleCriterionTrigger<TriggerInstance> {
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        private final EntityPredicate entity;
+        private final EntityPredicate.Composite entity;
         
-        public TriggerInstance(final EntityPredicate bb) {
-            super(TameAnimalTrigger.ID);
-            this.entity = bb;
+        public TriggerInstance(final EntityPredicate.Composite b1, final EntityPredicate.Composite b2) {
+            super(TameAnimalTrigger.ID, b1);
+            this.entity = b2;
         }
         
         public static TriggerInstance tamedAnimal() {
-            return new TriggerInstance(EntityPredicate.ANY);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY);
         }
         
-        public static TriggerInstance tamedAnimal(final EntityPredicate bb) {
-            return new TriggerInstance(bb);
+        public static TriggerInstance tamedAnimal(final EntityPredicate be) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, EntityPredicate.Composite.wrap(be));
         }
         
-        public boolean matches(final ServerPlayer xe, final Animal atc) {
-            return this.entity.matches(xe, atc);
+        public boolean matches(final LootContext dat) {
+            return this.entity.matches(dat);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("entity", this.entity.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("entity", this.entity.toJson(cg));
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/TargetBlockTrigger.java b/src/net/minecraft/advancements/critereon/TargetBlockTrigger.java
new file mode 100644
index 0000000..1b70d13
--- /dev/null
+++ b/src/net/minecraft/advancements/critereon/TargetBlockTrigger.java
@@ -0,0 +1,59 @@
+package net.minecraft.advancements.critereon;
+
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.server.level.ServerPlayer;
+import com.google.gson.JsonObject;
+import net.minecraft.resources.ResourceLocation;
+
+public class TargetBlockTrigger extends SimpleCriterionTrigger<TriggerInstance> {
+    private static final ResourceLocation ID;
+    
+    @Override
+    public ResourceLocation getId() {
+        return TargetBlockTrigger.ID;
+    }
+    
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final MinMaxBounds.Ints d5 = MinMaxBounds.Ints.fromJson(jsonObject.get("signal_strength"));
+        final EntityPredicate.Composite b2 = EntityPredicate.Composite.fromJson(jsonObject, "projectile", av);
+        return new TriggerInstance(b, d5, b2);
+    }
+    
+    public void trigger(final ServerPlayer ze, final Entity aom, final Vec3 dem, final int integer) {
+        final LootContext dat6 = EntityPredicate.createContext(ze, aom);
+        this.trigger(ze, a -> a.matches(dat6, dem, integer));
+    }
+    
+    static {
+        ID = new ResourceLocation("target_hit");
+    }
+    
+    public static class TriggerInstance extends AbstractCriterionTriggerInstance {
+        private final MinMaxBounds.Ints signalStrength;
+        private final EntityPredicate.Composite projectile;
+        
+        public TriggerInstance(final EntityPredicate.Composite b1, final MinMaxBounds.Ints d, final EntityPredicate.Composite b3) {
+            super(TargetBlockTrigger.ID, b1);
+            this.signalStrength = d;
+            this.projectile = b3;
+        }
+        
+        public static TriggerInstance targetHit(final MinMaxBounds.Ints d, final EntityPredicate.Composite b) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, d, b);
+        }
+        
+        @Override
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("signal_strength", this.signalStrength.serializeToJson());
+            jsonObject3.add("projectile", this.projectile.toJson(cg));
+            return jsonObject3;
+        }
+        
+        public boolean matches(final LootContext dat, final Vec3 dem, final int integer) {
+            return this.signalStrength.matches(integer) && this.projectile.matches(dat);
+        }
+    }
+}
diff --git a/src/net/minecraft/advancements/critereon/TickTrigger.java b/src/net/minecraft/advancements/critereon/TickTrigger.java
index ee61d11..89bdf39 100644
--- a/src/net/minecraft/advancements/critereon/TickTrigger.java
+++ b/src/net/minecraft/advancements/critereon/TickTrigger.java
@@ -1,8 +1,6 @@
 package net.minecraft.advancements.critereon;
 
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -14,13 +12,12 @@ public class TickTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         return TickTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        return new TriggerInstance();
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        return new TriggerInstance(b);
     }
     
-    public void trigger(final ServerPlayer xe) {
-        this.trigger(xe.getAdvancements());
+    public void trigger(final ServerPlayer ze) {
+        this.trigger(ze, a -> true);
     }
     
     static {
@@ -28,8 +25,8 @@ public class TickTrigger extends SimpleCriterionTrigger<TriggerInstance> {
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        public TriggerInstance() {
-            super(TickTrigger.ID);
+        public TriggerInstance(final EntityPredicate.Composite b) {
+            super(TickTrigger.ID, b);
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/TradeTrigger.java b/src/net/minecraft/advancements/critereon/TradeTrigger.java
index ab7c4ba..2862026 100644
--- a/src/net/minecraft/advancements/critereon/TradeTrigger.java
+++ b/src/net/minecraft/advancements/critereon/TradeTrigger.java
@@ -1,12 +1,10 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
+import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.npc.AbstractVillager;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -18,15 +16,15 @@ public class TradeTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         return TradeTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final EntityPredicate bb4 = EntityPredicate.fromJson(jsonObject.get("villager"));
-        final ItemPredicate bj5 = ItemPredicate.fromJson(jsonObject.get("item"));
-        return new TriggerInstance(bb4, bj5);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final EntityPredicate.Composite b2 = EntityPredicate.Composite.fromJson(jsonObject, "villager", av);
+        final ItemPredicate bo6 = ItemPredicate.fromJson(jsonObject.get("item"));
+        return new TriggerInstance(b, b2, bo6);
     }
     
-    public void trigger(final ServerPlayer xe, final AbstractVillager axs, final ItemStack ben) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(xe, axs, ben));
+    public void trigger(final ServerPlayer ze, final AbstractVillager bdk, final ItemStack bki) {
+        final LootContext dat5 = EntityPredicate.createContext(ze, bdk);
+        this.trigger(ze, a -> a.matches(dat5, bki));
     }
     
     static {
@@ -34,29 +32,29 @@ public class TradeTrigger extends SimpleCriterionTrigger<TriggerInstance> {
     }
     
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
-        private final EntityPredicate villager;
+        private final EntityPredicate.Composite villager;
         private final ItemPredicate item;
         
-        public TriggerInstance(final EntityPredicate bb, final ItemPredicate bj) {
-            super(TradeTrigger.ID);
-            this.villager = bb;
-            this.item = bj;
+        public TriggerInstance(final EntityPredicate.Composite b1, final EntityPredicate.Composite b2, final ItemPredicate bo) {
+            super(TradeTrigger.ID, b1);
+            this.villager = b2;
+            this.item = bo;
         }
         
         public static TriggerInstance tradedWithVillager() {
-            return new TriggerInstance(EntityPredicate.ANY, ItemPredicate.ANY);
+            return new TriggerInstance(EntityPredicate.Composite.ANY, EntityPredicate.Composite.ANY, ItemPredicate.ANY);
         }
         
-        public boolean matches(final ServerPlayer xe, final AbstractVillager axs, final ItemStack ben) {
-            return this.villager.matches(xe, axs) && this.item.matches(ben);
+        public boolean matches(final LootContext dat, final ItemStack bki) {
+            return this.villager.matches(dat) && this.item.matches(bki);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("item", this.item.serializeToJson());
-            jsonObject2.add("villager", this.villager.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("item", this.item.serializeToJson());
+            jsonObject3.add("villager", this.villager.toJson(cg));
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/UsedEnderEyeTrigger.java b/src/net/minecraft/advancements/critereon/UsedEnderEyeTrigger.java
index d8c8b18..1ded945 100644
--- a/src/net/minecraft/advancements/critereon/UsedEnderEyeTrigger.java
+++ b/src/net/minecraft/advancements/critereon/UsedEnderEyeTrigger.java
@@ -1,9 +1,7 @@
 package net.minecraft.advancements.critereon;
 
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -15,17 +13,16 @@ public class UsedEnderEyeTrigger extends SimpleCriterionTrigger<TriggerInstance>
         return UsedEnderEyeTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final MinMaxBounds.Floats c4 = MinMaxBounds.Floats.fromJson(jsonObject.get("distance"));
-        return new TriggerInstance(c4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final MinMaxBounds.Floats c5 = MinMaxBounds.Floats.fromJson(jsonObject.get("distance"));
+        return new TriggerInstance(b, c5);
     }
     
-    public void trigger(final ServerPlayer xe, final BlockPos fk) {
-        final double double4 = xe.getX() - fk.getX();
-        final double double5 = xe.getZ() - fk.getZ();
+    public void trigger(final ServerPlayer ze, final BlockPos fu) {
+        final double double4 = ze.getX() - fu.getX();
+        final double double5 = ze.getZ() - fu.getZ();
         final double double6 = double4 * double4 + double5 * double5;
-        this.trigger(xe.getAdvancements(), a -> a.matches(double6));
+        this.trigger(ze, a -> a.matches(double6));
     }
     
     static {
@@ -35,8 +32,8 @@ public class UsedEnderEyeTrigger extends SimpleCriterionTrigger<TriggerInstance>
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final MinMaxBounds.Floats level;
         
-        public TriggerInstance(final MinMaxBounds.Floats c) {
-            super(UsedEnderEyeTrigger.ID);
+        public TriggerInstance(final EntityPredicate.Composite b, final MinMaxBounds.Floats c) {
+            super(UsedEnderEyeTrigger.ID, b);
             this.level = c;
         }
         
diff --git a/src/net/minecraft/advancements/critereon/UsedTotemTrigger.java b/src/net/minecraft/advancements/critereon/UsedTotemTrigger.java
index 4b0589d..5ed8d15 100644
--- a/src/net/minecraft/advancements/critereon/UsedTotemTrigger.java
+++ b/src/net/minecraft/advancements/critereon/UsedTotemTrigger.java
@@ -1,11 +1,8 @@
 package net.minecraft.advancements.critereon;
 
-import com.google.gson.JsonElement;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.server.level.ServerPlayer;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import net.minecraft.resources.ResourceLocation;
 
@@ -17,14 +14,13 @@ public class UsedTotemTrigger extends SimpleCriterionTrigger<TriggerInstance> {
         return UsedTotemTrigger.ID;
     }
     
-    @Override
-    public TriggerInstance createInstance(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-        final ItemPredicate bj4 = ItemPredicate.fromJson(jsonObject.get("item"));
-        return new TriggerInstance(bj4);
+    public TriggerInstance createInstance(final JsonObject jsonObject, final EntityPredicate.Composite b, final DeserializationContext av) {
+        final ItemPredicate bo5 = ItemPredicate.fromJson(jsonObject.get("item"));
+        return new TriggerInstance(b, bo5);
     }
     
-    public void trigger(final ServerPlayer xe, final ItemStack ben) {
-        this.trigger(xe.getAdvancements(), a -> a.matches(ben));
+    public void trigger(final ServerPlayer ze, final ItemStack bki) {
+        this.trigger(ze, a -> a.matches(bki));
     }
     
     static {
@@ -34,24 +30,24 @@ public class UsedTotemTrigger extends SimpleCriterionTrigger<TriggerInstance> {
     public static class TriggerInstance extends AbstractCriterionTriggerInstance {
         private final ItemPredicate item;
         
-        public TriggerInstance(final ItemPredicate bj) {
-            super(UsedTotemTrigger.ID);
-            this.item = bj;
+        public TriggerInstance(final EntityPredicate.Composite b, final ItemPredicate bo) {
+            super(UsedTotemTrigger.ID, b);
+            this.item = bo;
         }
         
-        public static TriggerInstance usedTotem(final ItemLike bjv) {
-            return new TriggerInstance(ItemPredicate.Builder.item().of(bjv).build());
+        public static TriggerInstance usedTotem(final ItemLike bqa) {
+            return new TriggerInstance(EntityPredicate.Composite.ANY, ItemPredicate.Builder.item().of(bqa).build());
         }
         
-        public boolean matches(final ItemStack ben) {
-            return this.item.matches(ben);
+        public boolean matches(final ItemStack bki) {
+            return this.item.matches(bki);
         }
         
         @Override
-        public JsonElement serializeToJson() {
-            final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.add("item", this.item.serializeToJson());
-            return jsonObject2;
+        public JsonObject serializeToJson(final SerializationContext cg) {
+            final JsonObject jsonObject3 = super.serializeToJson(cg);
+            jsonObject3.add("item", this.item.serializeToJson());
+            return jsonObject3;
         }
     }
 }
diff --git a/src/net/minecraft/advancements/critereon/WrappedMinMaxBounds.java b/src/net/minecraft/advancements/critereon/WrappedMinMaxBounds.java
index ee8be8d..0e695aa 100644
--- a/src/net/minecraft/advancements/critereon/WrappedMinMaxBounds.java
+++ b/src/net/minecraft/advancements/critereon/WrappedMinMaxBounds.java
@@ -93,6 +93,6 @@ public class WrappedMinMaxBounds {
     
     static {
         ANY = new WrappedMinMaxBounds(null, null);
-        ERROR_INTS_ONLY = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.range.ints", new Object[0]));
+        ERROR_INTS_ONLY = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.range.ints"));
     }
 }
diff --git a/src/net/minecraft/client/BooleanOption.java b/src/net/minecraft/client/BooleanOption.java
index 3dd824e..a864f56 100644
--- a/src/net/minecraft/client/BooleanOption.java
+++ b/src/net/minecraft/client/BooleanOption.java
@@ -1,7 +1,8 @@
 package net.minecraft.client;
 
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
 import net.minecraft.client.gui.components.OptionButton;
 import net.minecraft.client.gui.components.AbstractWidget;
 import java.util.function.BiConsumer;
@@ -17,32 +18,32 @@ public class BooleanOption extends Option {
         this.setter = biConsumer;
     }
     
-    public void set(final Options dbr, final String string) {
-        this.set(dbr, "true".equals(string));
+    public void set(final Options dmb, final String string) {
+        this.set(dmb, "true".equals(string));
     }
     
-    public void toggle(final Options dbr) {
-        this.set(dbr, !this.get(dbr));
-        dbr.save();
+    public void toggle(final Options dmb) {
+        this.set(dmb, !this.get(dmb));
+        dmb.save();
     }
     
-    private void set(final Options dbr, final boolean boolean2) {
-        this.setter.accept(dbr, boolean2);
+    private void set(final Options dmb, final boolean boolean2) {
+        this.setter.accept(dmb, boolean2);
     }
     
-    public boolean get(final Options dbr) {
-        return this.getter.test(dbr);
+    public boolean get(final Options dmb) {
+        return this.getter.test(dmb);
     }
     
     @Override
-    public AbstractWidget createButton(final Options dbr, final int integer2, final int integer3, final int integer4) {
-        return new OptionButton(integer2, integer3, integer4, 20, this, this.getMessage(dbr), dcv -> {
-            this.toggle(dbr);
-            dcv.setMessage(this.getMessage(dbr));
+    public AbstractWidget createButton(final Options dmb, final int integer2, final int integer3, final int integer4) {
+        return new OptionButton(integer2, integer3, integer4, 20, this, this.getMessage(dmb), dni -> {
+            this.toggle(dmb);
+            dni.setMessage(this.getMessage(dmb));
         });
     }
     
-    public String getMessage(final Options dbr) {
-        return this.getCaption() + I18n.get(this.get(dbr) ? "options.on" : "options.off");
+    public Component getMessage(final Options dmb) {
+        return this.createCaption().append(CommonComponents.optionStatus(this.get(dmb)));
     }
 }
diff --git a/src/net/minecraft/client/Camera.java b/src/net/minecraft/client/Camera.java
index 02099ab..f779436 100644
--- a/src/net/minecraft/client/Camera.java
+++ b/src/net/minecraft/client/Camera.java
@@ -40,23 +40,23 @@ public class Camera {
         this.rotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
     }
     
-    public void setup(final BlockGetter bjg, final Entity akq, final boolean boolean3, final boolean boolean4, final float float5) {
+    public void setup(final BlockGetter bpg, final Entity aom, final boolean boolean3, final boolean boolean4, final float float5) {
         this.initialized = true;
-        this.level = bjg;
-        this.entity = akq;
+        this.level = bpg;
+        this.entity = aom;
         this.detached = boolean3;
         this.mirror = boolean4;
-        this.setRotation(akq.getViewYRot(float5), akq.getViewXRot(float5));
-        this.setPosition(Mth.lerp(float5, akq.xo, akq.getX()), Mth.lerp(float5, akq.yo, akq.getY()) + Mth.lerp(float5, this.eyeHeightOld, this.eyeHeight), Mth.lerp(float5, akq.zo, akq.getZ()));
+        this.setRotation(aom.getViewYRot(float5), aom.getViewXRot(float5));
+        this.setPosition(Mth.lerp(float5, aom.xo, aom.getX()), Mth.lerp(float5, aom.yo, aom.getY()) + Mth.lerp(float5, this.eyeHeightOld, this.eyeHeight), Mth.lerp(float5, aom.zo, aom.getZ()));
         if (boolean3) {
             if (boolean4) {
                 this.setRotation(this.yRot + 180.0f, -this.xRot);
             }
             this.move(-this.getMaxZoom(4.0), 0.0, 0.0);
         }
-        else if (akq instanceof LivingEntity && ((LivingEntity)akq).isSleeping()) {
-            final Direction fp7 = ((LivingEntity)akq).getBedOrientation();
-            this.setRotation((fp7 != null) ? (fp7.toYRot() - 180.0f) : 0.0f, 0.0f);
+        else if (aom instanceof LivingEntity && ((LivingEntity)aom).isSleeping()) {
+            final Direction fz7 = ((LivingEntity)aom).getBedOrientation();
+            this.setRotation((fz7 != null) ? (fz7.toYRot() - 180.0f) : 0.0f, 0.0f);
             this.move(0.0, 0.3, 0.0);
         }
     }
@@ -76,11 +76,11 @@ public class Camera {
             float5 *= 0.1f;
             float6 *= 0.1f;
             float7 *= 0.1f;
-            final Vec3 cvl8 = this.position.add(float5, float6, float7);
-            final Vec3 cvl9 = new Vec3(this.position.x - this.forwards.x() * double1 + float5 + float7, this.position.y - this.forwards.y() * double1 + float6, this.position.z - this.forwards.z() * double1 + float7);
-            final HitResult cvi10 = this.level.clip(new ClipContext(cvl8, cvl9, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this.entity));
-            if (cvi10.getType() != HitResult.Type.MISS) {
-                final double double2 = cvi10.getLocation().distanceTo(this.position);
+            final Vec3 dem8 = this.position.add(float5, float6, float7);
+            final Vec3 dem9 = new Vec3(this.position.x - this.forwards.x() * double1 + float5 + float7, this.position.y - this.forwards.y() * double1 + float6, this.position.z - this.forwards.z() * double1 + float7);
+            final HitResult dej10 = this.level.clip(new ClipContext(dem8, dem9, ClipContext.Block.VISUAL, ClipContext.Fluid.NONE, this.entity));
+            if (dej10.getType() != HitResult.Type.MISS) {
+                final double double2 = dej10.getLocation().distanceTo(this.position);
                 if (double2 < double1) {
                     double1 = double2;
                 }
@@ -114,9 +114,9 @@ public class Camera {
         this.setPosition(new Vec3(double1, double2, double3));
     }
     
-    protected void setPosition(final Vec3 cvl) {
-        this.position = cvl;
-        this.blockPosition.set(cvl.x, cvl.y, cvl.z);
+    protected void setPosition(final Vec3 dem) {
+        this.position = dem;
+        this.blockPosition.set(dem.x, dem.y, dem.z);
     }
     
     public Vec3 getPosition() {
@@ -155,11 +155,11 @@ public class Camera {
         if (!this.initialized) {
             return Fluids.EMPTY.defaultFluidState();
         }
-        final FluidState coj2 = this.level.getFluidState(this.blockPosition);
-        if (!coj2.isEmpty() && this.position.y >= this.blockPosition.getY() + coj2.getHeight(this.level, this.blockPosition)) {
+        final FluidState cxa2 = this.level.getFluidState(this.blockPosition);
+        if (!cxa2.isEmpty() && this.position.y >= this.blockPosition.getY() + cxa2.getHeight(this.level, this.blockPosition)) {
             return Fluids.EMPTY.defaultFluidState();
         }
-        return coj2;
+        return cxa2;
     }
     
     public final Vector3f getLookVector() {
diff --git a/src/net/minecraft/client/ClientRecipeBook.java b/src/net/minecraft/client/ClientRecipeBook.java
index 588bc0a..fe7a3bf 100644
--- a/src/net/minecraft/client/ClientRecipeBook.java
+++ b/src/net/minecraft/client/ClientRecipeBook.java
@@ -1,5 +1,7 @@
 package net.minecraft.client;
 
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.core.Registry;
 import java.util.Collections;
 import net.minecraft.world.inventory.SmokerMenu;
 import net.minecraft.world.inventory.BlastFurnaceMenu;
@@ -8,8 +10,9 @@ import net.minecraft.world.inventory.InventoryMenu;
 import net.minecraft.world.inventory.CraftingMenu;
 import net.minecraft.world.inventory.RecipeBookMenu;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.CreativeModeTab;
+import org.apache.logging.log4j.util.Supplier;
 import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.crafting.RecipeType;
 import java.util.Iterator;
 import com.google.common.collect.Table;
@@ -21,126 +24,129 @@ import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
 import java.util.List;
 import java.util.Map;
 import net.minecraft.world.item.crafting.RecipeManager;
+import org.apache.logging.log4j.Logger;
 import net.minecraft.stats.RecipeBook;
 
 public class ClientRecipeBook extends RecipeBook {
+    private static final Logger LOGGER;
     private final RecipeManager recipes;
     private final Map<RecipeBookCategories, List<RecipeCollection>> collectionsByTab;
     private final List<RecipeCollection> collections;
     
-    public ClientRecipeBook(final RecipeManager bgx) {
+    public ClientRecipeBook(final RecipeManager bmv) {
         this.collectionsByTab = Maps.newHashMap();
         this.collections = Lists.newArrayList();
-        this.recipes = bgx;
+        this.recipes = bmv;
     }
     
     public void setupCollections() {
         this.collections.clear();
         this.collectionsByTab.clear();
         final Table<RecipeBookCategories, String, RecipeCollection> table2 = HashBasedTable.create();
-        for (final Recipe<?> bgw4 : this.recipes.getRecipes()) {
-            if (bgw4.isSpecial()) {
+        for (final Recipe<?> bmu4 : this.recipes.getRecipes()) {
+            if (bmu4.isSpecial()) {
                 continue;
             }
-            final RecipeBookCategories dbu5 = getCategory(bgw4);
-            final String string6 = bgw4.getGroup();
-            RecipeCollection dit7;
+            final RecipeBookCategories dme5 = getCategory(bmu4);
+            final String string6 = bmu4.getGroup();
+            RecipeCollection dtr7;
             if (string6.isEmpty()) {
-                dit7 = this.createCollection(dbu5);
+                dtr7 = this.createCollection(dme5);
             }
             else {
-                dit7 = table2.get(dbu5, string6);
-                if (dit7 == null) {
-                    dit7 = this.createCollection(dbu5);
-                    table2.put(dbu5, string6, dit7);
+                dtr7 = table2.get(dme5, string6);
+                if (dtr7 == null) {
+                    dtr7 = this.createCollection(dme5);
+                    table2.put(dme5, string6, dtr7);
                 }
             }
-            dit7.add(bgw4);
+            dtr7.add(bmu4);
         }
     }
     
-    private RecipeCollection createCollection(final RecipeBookCategories dbu) {
-        final RecipeCollection dit3 = new RecipeCollection();
-        this.collections.add(dit3);
-        this.collectionsByTab.computeIfAbsent(dbu, dbu -> Lists.newArrayList()).add(dit3);
-        if (dbu == RecipeBookCategories.FURNACE_BLOCKS || dbu == RecipeBookCategories.FURNACE_FOOD || dbu == RecipeBookCategories.FURNACE_MISC) {
-            this.addToCollection(RecipeBookCategories.FURNACE_SEARCH, dit3);
+    private RecipeCollection createCollection(final RecipeBookCategories dme) {
+        final RecipeCollection dtr3 = new RecipeCollection();
+        this.collections.add(dtr3);
+        this.collectionsByTab.computeIfAbsent(dme, dme -> Lists.newArrayList()).add(dtr3);
+        if (dme == RecipeBookCategories.FURNACE_BLOCKS || dme == RecipeBookCategories.FURNACE_FOOD || dme == RecipeBookCategories.FURNACE_MISC) {
+            this.addToCollection(RecipeBookCategories.FURNACE_SEARCH, dtr3);
         }
-        else if (dbu == RecipeBookCategories.BLAST_FURNACE_BLOCKS || dbu == RecipeBookCategories.BLAST_FURNACE_MISC) {
-            this.addToCollection(RecipeBookCategories.BLAST_FURNACE_SEARCH, dit3);
+        else if (dme == RecipeBookCategories.BLAST_FURNACE_BLOCKS || dme == RecipeBookCategories.BLAST_FURNACE_MISC) {
+            this.addToCollection(RecipeBookCategories.BLAST_FURNACE_SEARCH, dtr3);
         }
-        else if (dbu == RecipeBookCategories.SMOKER_FOOD) {
-            this.addToCollection(RecipeBookCategories.SMOKER_SEARCH, dit3);
+        else if (dme == RecipeBookCategories.SMOKER_FOOD) {
+            this.addToCollection(RecipeBookCategories.SMOKER_SEARCH, dtr3);
         }
-        else if (dbu == RecipeBookCategories.STONECUTTER) {
-            this.addToCollection(RecipeBookCategories.STONECUTTER, dit3);
+        else if (dme == RecipeBookCategories.CRAFTING_BUILDING_BLOCKS || dme == RecipeBookCategories.CRAFTING_REDSTONE || dme == RecipeBookCategories.CRAFTING_EQUIPMENT || dme == RecipeBookCategories.CRAFTING_MISC) {
+            this.addToCollection(RecipeBookCategories.SEARCH, dtr3);
         }
-        else if (dbu == RecipeBookCategories.CAMPFIRE) {
-            this.addToCollection(RecipeBookCategories.CAMPFIRE, dit3);
-        }
-        else {
-            this.addToCollection(RecipeBookCategories.SEARCH, dit3);
-        }
-        return dit3;
+        return dtr3;
     }
     
-    private void addToCollection(final RecipeBookCategories dbu, final RecipeCollection dit) {
-        this.collectionsByTab.computeIfAbsent(dbu, dbu -> Lists.newArrayList()).add(dit);
+    private void addToCollection(final RecipeBookCategories dme, final RecipeCollection dtr) {
+        this.collectionsByTab.computeIfAbsent(dme, dme -> Lists.newArrayList()).add(dtr);
     }
     
-    private static RecipeBookCategories getCategory(final Recipe<?> bgw) {
-        final RecipeType<?> bgz2 = bgw.getType();
-        if (bgz2 == RecipeType.SMELTING) {
-            if (bgw.getResultItem().getItem().isEdible()) {
+    private static RecipeBookCategories getCategory(final Recipe<?> bmu) {
+        final RecipeType<?> bmx2 = bmu.getType();
+        if (bmx2 == RecipeType.CRAFTING) {
+            final ItemStack bki3 = bmu.getResultItem();
+            final CreativeModeTab biy4 = bki3.getItem().getItemCategory();
+            if (biy4 == CreativeModeTab.TAB_BUILDING_BLOCKS) {
+                return RecipeBookCategories.CRAFTING_BUILDING_BLOCKS;
+            }
+            if (biy4 == CreativeModeTab.TAB_TOOLS || biy4 == CreativeModeTab.TAB_COMBAT) {
+                return RecipeBookCategories.CRAFTING_EQUIPMENT;
+            }
+            if (biy4 == CreativeModeTab.TAB_REDSTONE) {
+                return RecipeBookCategories.CRAFTING_REDSTONE;
+            }
+            return RecipeBookCategories.CRAFTING_MISC;
+        }
+        else if (bmx2 == RecipeType.SMELTING) {
+            if (bmu.getResultItem().getItem().isEdible()) {
                 return RecipeBookCategories.FURNACE_FOOD;
             }
-            if (bgw.getResultItem().getItem() instanceof BlockItem) {
+            if (bmu.getResultItem().getItem() instanceof BlockItem) {
                 return RecipeBookCategories.FURNACE_BLOCKS;
             }
             return RecipeBookCategories.FURNACE_MISC;
         }
-        else if (bgz2 == RecipeType.BLASTING) {
-            if (bgw.getResultItem().getItem() instanceof BlockItem) {
+        else if (bmx2 == RecipeType.BLASTING) {
+            if (bmu.getResultItem().getItem() instanceof BlockItem) {
                 return RecipeBookCategories.BLAST_FURNACE_BLOCKS;
             }
             return RecipeBookCategories.BLAST_FURNACE_MISC;
         }
         else {
-            if (bgz2 == RecipeType.SMOKING) {
+            if (bmx2 == RecipeType.SMOKING) {
                 return RecipeBookCategories.SMOKER_FOOD;
             }
-            if (bgz2 == RecipeType.STONECUTTING) {
+            if (bmx2 == RecipeType.STONECUTTING) {
                 return RecipeBookCategories.STONECUTTER;
             }
-            if (bgz2 == RecipeType.CAMPFIRE_COOKING) {
+            if (bmx2 == RecipeType.CAMPFIRE_COOKING) {
                 return RecipeBookCategories.CAMPFIRE;
             }
-            final ItemStack ben3 = bgw.getResultItem();
-            final CreativeModeTab bdd4 = ben3.getItem().getItemCategory();
-            if (bdd4 == CreativeModeTab.TAB_BUILDING_BLOCKS) {
-                return RecipeBookCategories.BUILDING_BLOCKS;
+            if (bmx2 == RecipeType.SMITHING) {
+                return RecipeBookCategories.SMITHING;
             }
-            if (bdd4 == CreativeModeTab.TAB_TOOLS || bdd4 == CreativeModeTab.TAB_COMBAT) {
-                return RecipeBookCategories.EQUIPMENT;
-            }
-            if (bdd4 == CreativeModeTab.TAB_REDSTONE) {
-                return RecipeBookCategories.REDSTONE;
-            }
-            return RecipeBookCategories.MISC;
+            ClientRecipeBook.LOGGER.warn("Unknown recipe category: {}/{}", new Supplier[] { () -> Registry.RECIPE_TYPE.getKey(bmu.getType()), bmu::getId });
+            return RecipeBookCategories.UNKNOWN;
         }
     }
     
-    public static List<RecipeBookCategories> getCategories(final RecipeBookMenu<?> bbt) {
-        if (bbt instanceof CraftingMenu || bbt instanceof InventoryMenu) {
-            return Lists.<RecipeBookCategories>newArrayList(RecipeBookCategories.SEARCH, RecipeBookCategories.EQUIPMENT, RecipeBookCategories.BUILDING_BLOCKS, RecipeBookCategories.MISC, RecipeBookCategories.REDSTONE);
+    public static List<RecipeBookCategories> getCategories(final RecipeBookMenu<?> bhp) {
+        if (bhp instanceof CraftingMenu || bhp instanceof InventoryMenu) {
+            return Lists.<RecipeBookCategories>newArrayList(RecipeBookCategories.SEARCH, RecipeBookCategories.CRAFTING_EQUIPMENT, RecipeBookCategories.CRAFTING_BUILDING_BLOCKS, RecipeBookCategories.CRAFTING_MISC, RecipeBookCategories.CRAFTING_REDSTONE);
         }
-        if (bbt instanceof FurnaceMenu) {
+        if (bhp instanceof FurnaceMenu) {
             return Lists.<RecipeBookCategories>newArrayList(RecipeBookCategories.FURNACE_SEARCH, RecipeBookCategories.FURNACE_FOOD, RecipeBookCategories.FURNACE_BLOCKS, RecipeBookCategories.FURNACE_MISC);
         }
-        if (bbt instanceof BlastFurnaceMenu) {
+        if (bhp instanceof BlastFurnaceMenu) {
             return Lists.<RecipeBookCategories>newArrayList(RecipeBookCategories.BLAST_FURNACE_SEARCH, RecipeBookCategories.BLAST_FURNACE_BLOCKS, RecipeBookCategories.BLAST_FURNACE_MISC);
         }
-        if (bbt instanceof SmokerMenu) {
+        if (bhp instanceof SmokerMenu) {
             return Lists.<RecipeBookCategories>newArrayList(RecipeBookCategories.SMOKER_SEARCH, RecipeBookCategories.SMOKER_FOOD);
         }
         return Lists.newArrayList();
@@ -150,7 +156,11 @@ public class ClientRecipeBook extends RecipeBook {
         return this.collections;
     }
     
-    public List<RecipeCollection> getCollection(final RecipeBookCategories dbu) {
-        return this.collectionsByTab.getOrDefault(dbu, Collections.<RecipeCollection>emptyList());
+    public List<RecipeCollection> getCollection(final RecipeBookCategories dme) {
+        return this.collectionsByTab.getOrDefault(dme, Collections.<RecipeCollection>emptyList());
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
     }
 }
diff --git a/src/net/minecraft/client/ComponentCollector.java b/src/net/minecraft/client/ComponentCollector.java
new file mode 100644
index 0000000..2c4a6f0
--- /dev/null
+++ b/src/net/minecraft/client/ComponentCollector.java
@@ -0,0 +1,34 @@
+package net.minecraft.client;
+
+import javax.annotation.Nullable;
+import com.google.common.collect.Lists;
+import net.minecraft.network.chat.FormattedText;
+import java.util.List;
+
+public class ComponentCollector {
+    private final List<FormattedText> parts;
+    
+    public ComponentCollector() {
+        this.parts = Lists.newArrayList();
+    }
+    
+    public void append(final FormattedText mu) {
+        this.parts.add(mu);
+    }
+    
+    @Nullable
+    public FormattedText getResult() {
+        if (this.parts.isEmpty()) {
+            return null;
+        }
+        if (this.parts.size() == 1) {
+            return this.parts.get(0);
+        }
+        return FormattedText.composite(this.parts);
+    }
+    
+    public FormattedText getResultOrEmpty() {
+        final FormattedText mu2 = this.getResult();
+        return (mu2 != null) ? mu2 : FormattedText.EMPTY;
+    }
+}
diff --git a/src/net/minecraft/client/CycleOption.java b/src/net/minecraft/client/CycleOption.java
index 8babe7b..473c43c 100644
--- a/src/net/minecraft/client/CycleOption.java
+++ b/src/net/minecraft/client/CycleOption.java
@@ -3,33 +3,34 @@ package net.minecraft.client;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.OptionButton;
 import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.network.chat.Component;
 import java.util.function.BiFunction;
 import java.util.function.BiConsumer;
 
 public class CycleOption extends Option {
     private final BiConsumer<Options, Integer> setter;
-    private final BiFunction<Options, CycleOption, String> toString;
+    private final BiFunction<Options, CycleOption, Component> toString;
     
-    public CycleOption(final String string, final BiConsumer<Options, Integer> biConsumer, final BiFunction<Options, CycleOption, String> biFunction) {
+    public CycleOption(final String string, final BiConsumer<Options, Integer> biConsumer, final BiFunction<Options, CycleOption, Component> biFunction) {
         super(string);
         this.setter = biConsumer;
         this.toString = biFunction;
     }
     
-    public void toggle(final Options dbr, final int integer) {
-        this.setter.accept(dbr, integer);
-        dbr.save();
+    public void toggle(final Options dmb, final int integer) {
+        this.setter.accept(dmb, integer);
+        dmb.save();
     }
     
     @Override
-    public AbstractWidget createButton(final Options dbr, final int integer2, final int integer3, final int integer4) {
-        return new OptionButton(integer2, integer3, integer4, 20, this, this.getMessage(dbr), dcv -> {
-            this.toggle(dbr, 1);
-            dcv.setMessage(this.getMessage(dbr));
+    public AbstractWidget createButton(final Options dmb, final int integer2, final int integer3, final int integer4) {
+        return new OptionButton(integer2, integer3, integer4, 20, this, this.getMessage(dmb), dni -> {
+            this.toggle(dmb, 1);
+            dni.setMessage(this.getMessage(dmb));
         });
     }
     
-    public String getMessage(final Options dbr) {
-        return this.toString.apply(dbr, this);
+    public Component getMessage(final Options dmb) {
+        return this.toString.apply(dmb, this);
     }
 }
diff --git a/src/net/minecraft/client/DebugQueryHandler.java b/src/net/minecraft/client/DebugQueryHandler.java
index 7b8dc36..9f97372 100644
--- a/src/net/minecraft/client/DebugQueryHandler.java
+++ b/src/net/minecraft/client/DebugQueryHandler.java
@@ -15,14 +15,14 @@ public class DebugQueryHandler {
     @Nullable
     private Consumer<CompoundTag> callback;
     
-    public DebugQueryHandler(final ClientPacketListener dnp) {
+    public DebugQueryHandler(final ClientPacketListener dyn) {
         this.transactionId = -1;
-        this.connection = dnp;
+        this.connection = dyn;
     }
     
-    public boolean handleResponse(final int integer, @Nullable final CompoundTag jt) {
+    public boolean handleResponse(final int integer, @Nullable final CompoundTag le) {
         if (this.transactionId == integer && this.callback != null) {
-            this.callback.accept(jt);
+            this.callback.accept(le);
             this.callback = null;
             return true;
         }
@@ -39,8 +39,8 @@ public class DebugQueryHandler {
         this.connection.send(new ServerboundEntityTagQuery(integer2, integer));
     }
     
-    public void queryBlockEntityTag(final BlockPos fk, final Consumer<CompoundTag> consumer) {
+    public void queryBlockEntityTag(final BlockPos fu, final Consumer<CompoundTag> consumer) {
         final int integer4 = this.startTransaction(consumer);
-        this.connection.send(new ServerboundBlockEntityTagQuery(integer4, fk));
+        this.connection.send(new ServerboundBlockEntityTagQuery(integer4, fu));
     }
 }
diff --git a/src/net/minecraft/client/FullscreenResolutionProgressOption.java b/src/net/minecraft/client/FullscreenResolutionProgressOption.java
index 225b766..51a7ead 100644
--- a/src/net/minecraft/client/FullscreenResolutionProgressOption.java
+++ b/src/net/minecraft/client/FullscreenResolutionProgressOption.java
@@ -1,6 +1,8 @@
 package net.minecraft.client;
 
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.blaze3d.platform.VideoMode;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -8,43 +10,43 @@ import com.mojang.blaze3d.platform.Monitor;
 import com.mojang.blaze3d.platform.Window;
 
 public class FullscreenResolutionProgressOption extends ProgressOption {
-    public FullscreenResolutionProgressOption(final Window cxx) {
-        this(cxx, cxx.findBestMonitor());
+    public FullscreenResolutionProgressOption(final Window dgy) {
+        this(dgy, dgy.findBestMonitor());
     }
     
-    private FullscreenResolutionProgressOption(final Window cxx, @Nullable final Monitor cxp) {
+    private FullscreenResolutionProgressOption(final Window dgy, @Nullable final Monitor dgq) {
         Optional<VideoMode> optional4;
         double double5;
-        String string6;
-        super("options.fullscreen.resolution", -1.0, (cxp != null) ? ((double)(cxp.getModeCount() - 1)) : -1.0, 1.0f, dbr -> {
-            if (cxp == null) {
+        MutableComponent mx6;
+        super("options.fullscreen.resolution", -1.0, (dgq != null) ? ((double)(dgq.getModeCount() - 1)) : -1.0, 1.0f, dmb -> {
+            if (dgq == null) {
                 return Double.valueOf(-1.0);
             }
             else {
-                optional4 = cxx.getPreferredFullscreenVideoMode();
-                return Double.valueOf(optional4.map(cxw -> Double.valueOf(cxp.getVideoModeIndex(cxw))).orElse(-1.0));
+                optional4 = dgy.getPreferredFullscreenVideoMode();
+                return Double.valueOf(optional4.map(dgx -> Double.valueOf(dgq.getVideoModeIndex(dgx))).orElse(-1.0));
             }
-        }, (dbr, double4) -> {
-            if (cxp != null) {
+        }, (dmb, double4) -> {
+            if (dgq != null) {
                 if (double4 == -1.0) {
-                    cxx.setPreferredFullscreenVideoMode(Optional.<VideoMode>empty());
+                    dgy.setPreferredFullscreenVideoMode(Optional.<VideoMode>empty());
                 }
                 else {
-                    cxx.setPreferredFullscreenVideoMode(Optional.<VideoMode>of(cxp.getMode(double4.intValue())));
+                    dgy.setPreferredFullscreenVideoMode(Optional.<VideoMode>of(dgq.getMode(double4.intValue())));
                 }
             }
-        }, (dbr, dbt) -> {
-            if (cxp == null) {
-                return I18n.get("options.fullscreen.unavailable");
+        }, (dmb, dmd) -> {
+            if (dgq == null) {
+                return new TranslatableComponent("options.fullscreen.unavailable");
             }
             else {
-                double5 = dbt.get(dbr);
-                string6 = dbt.getCaption();
+                double5 = dmd.get(dmb);
+                mx6 = dmd.createCaption();
                 if (double5 == -1.0) {
-                    return string6 + I18n.get("options.fullscreen.current");
+                    return mx6.append(new TranslatableComponent("options.fullscreen.current"));
                 }
                 else {
-                    return cxp.getMode((int)double5).toString();
+                    return mx6.append(dgq.getMode((int)double5).toString());
                 }
             }
         });
diff --git a/src/net/minecraft/client/Game.java b/src/net/minecraft/client/Game.java
index 10c3e80..314a1ea 100644
--- a/src/net/minecraft/client/Game.java
+++ b/src/net/minecraft/client/Game.java
@@ -19,9 +19,9 @@ public class Game implements RunningGame {
     private final Launcher launcher;
     private SessionEventListener listener;
     
-    public Game(final Minecraft dbn) {
+    public Game(final Minecraft dlx) {
         this.listener = SessionEventListener.NONE;
-        this.minecraft = dbn;
+        this.minecraft = dlx;
         this.launcher = Bridge.getLauncher();
         if (this.launcher != null) {
             this.launcher.registerGame((RunningGame)this);
@@ -38,21 +38,21 @@ public class Game implements RunningGame {
     
     @Nullable
     public GameSession getCurrentSession() {
-        final ClientLevel dno2 = this.minecraft.level;
-        return (GameSession)((dno2 == null) ? null : new Session(dno2, this.minecraft.player, this.minecraft.player.connection));
+        final ClientLevel dym2 = this.minecraft.level;
+        return (GameSession)((dym2 == null) ? null : new Session(dym2, this.minecraft.player, this.minecraft.player.connection));
     }
     
     public PerformanceMetrics getPerformanceMetrics() {
-        final FrameTimer abj2 = this.minecraft.getFrameTimer();
+        final FrameTimer ads2 = this.minecraft.getFrameTimer();
         long long3 = 2147483647L;
         long long4 = -2147483648L;
         long long5 = 0L;
-        for (final long long6 : abj2.getLog()) {
+        for (final long long6 : ads2.getLog()) {
             long3 = Math.min(long3, long6);
             long4 = Math.max(long4, long6);
             long5 += long6;
         }
-        return (PerformanceMetrics)new Metrics((int)long3, (int)long4, (int)(long5 / abj2.getLog().length), abj2.getLog().length);
+        return (PerformanceMetrics)new Metrics((int)long3, (int)long4, (int)(long5 / ads2.getLog().length), ads2.getLog().length);
     }
     
     public void setSessionEventListener(final SessionEventListener sessionEventListener) {
diff --git a/src/net/minecraft/client/GraphicsStatus.java b/src/net/minecraft/client/GraphicsStatus.java
new file mode 100644
index 0000000..ed56a07
--- /dev/null
+++ b/src/net/minecraft/client/GraphicsStatus.java
@@ -0,0 +1,58 @@
+package net.minecraft.client;
+
+import java.util.Comparator;
+import java.util.Arrays;
+import net.minecraft.util.Mth;
+
+public enum GraphicsStatus {
+    FAST(0, "options.graphics.fast"), 
+    FANCY(1, "options.graphics.fancy"), 
+    FABULOUS(2, "options.graphics.fabulous");
+    
+    private static final GraphicsStatus[] BY_ID;
+    private final int id;
+    private final String key;
+    
+    private GraphicsStatus(final int integer3, final String string4) {
+        this.id = integer3;
+        this.key = string4;
+    }
+    
+    public int getId() {
+        return this.id;
+    }
+    
+    public String getKey() {
+        return this.key;
+    }
+    
+    public GraphicsStatus cycleNext() {
+        return byId(this.getId() + 1);
+    }
+    
+    @Override
+    public String toString() {
+        switch (this) {
+            case FAST: {
+                return "fast";
+            }
+            case FANCY: {
+                return "fancy";
+            }
+            case FABULOUS: {
+                return "fabulous";
+            }
+            default: {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+    
+    public static GraphicsStatus byId(final int integer) {
+        return GraphicsStatus.BY_ID[Mth.positiveModulo(integer, GraphicsStatus.BY_ID.length)];
+    }
+    
+    static {
+        BY_ID = Arrays.<GraphicsStatus>stream(values()).sorted(Comparator.comparingInt(GraphicsStatus::getId)).<GraphicsStatus>toArray(GraphicsStatus[]::new);
+    }
+}
diff --git a/src/net/minecraft/client/GuiMessage.java b/src/net/minecraft/client/GuiMessage.java
index 37da298..77a623f 100644
--- a/src/net/minecraft/client/GuiMessage.java
+++ b/src/net/minecraft/client/GuiMessage.java
@@ -1,19 +1,19 @@
 package net.minecraft.client;
 
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.FormattedText;
 
 public class GuiMessage {
     private final int addedTime;
-    private final Component message;
+    private final FormattedText message;
     private final int id;
     
-    public GuiMessage(final int integer1, final Component lf, final int integer3) {
-        this.message = lf;
+    public GuiMessage(final int integer1, final FormattedText mu, final int integer3) {
+        this.message = mu;
         this.addedTime = integer1;
         this.id = integer3;
     }
     
-    public Component getMessage() {
+    public FormattedText getMessage() {
         return this.message;
     }
     
diff --git a/src/net/minecraft/client/HotbarManager.java b/src/net/minecraft/client/HotbarManager.java
index 45998a6..92cde7b 100644
--- a/src/net/minecraft/client/HotbarManager.java
+++ b/src/net/minecraft/client/HotbarManager.java
@@ -30,16 +30,16 @@ public class HotbarManager {
     
     private void load() {
         try {
-            CompoundTag jt2 = NbtIo.read(this.optionsFile);
-            if (jt2 == null) {
+            CompoundTag le2 = NbtIo.read(this.optionsFile);
+            if (le2 == null) {
                 return;
             }
-            if (!jt2.contains("DataVersion", 99)) {
-                jt2.putInt("DataVersion", 1343);
+            if (!le2.contains("DataVersion", 99)) {
+                le2.putInt("DataVersion", 1343);
             }
-            jt2 = NbtUtils.update(this.fixerUpper, DataFixTypes.HOTBAR, jt2, jt2.getInt("DataVersion"));
+            le2 = NbtUtils.update(this.fixerUpper, DataFixTypes.HOTBAR, le2, le2.getInt("DataVersion"));
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.hotbars[integer3].fromTag(jt2.getList(String.valueOf(integer3), 10));
+                this.hotbars[integer3].fromTag(le2.getList(String.valueOf(integer3), 10));
             }
         }
         catch (Exception exception2) {
@@ -49,12 +49,12 @@ public class HotbarManager {
     
     public void save() {
         try {
-            final CompoundTag jt2 = new CompoundTag();
-            jt2.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
+            final CompoundTag le2 = new CompoundTag();
+            le2.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                jt2.put(String.valueOf(integer3), this.get(integer3).createTag());
+                le2.put(String.valueOf(integer3), this.get(integer3).createTag());
             }
-            NbtIo.write(jt2, this.optionsFile);
+            NbtIo.write(le2, this.optionsFile);
         }
         catch (Exception exception2) {
             HotbarManager.LOGGER.error("Failed to save creative mode options", (Throwable)exception2);
diff --git a/src/net/minecraft/client/KeyMapping.java b/src/net/minecraft/client/KeyMapping.java
index 5d656c7..6c5b330 100644
--- a/src/net/minecraft/client/KeyMapping.java
+++ b/src/net/minecraft/client/KeyMapping.java
@@ -4,7 +4,8 @@ import net.minecraft.Util;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Maps;
 import java.util.HashMap;
-import java.util.Objects;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import java.util.function.Supplier;
 import net.minecraft.client.resources.language.I18n;
 import java.util.Iterator;
@@ -25,38 +26,38 @@ public class KeyMapping implements Comparable<KeyMapping> {
     private int clickCount;
     
     public static void click(final InputConstants.Key a) {
-        final KeyMapping dbk2 = KeyMapping.MAP.get(a);
-        if (dbk2 != null) {
-            final KeyMapping keyMapping = dbk2;
+        final KeyMapping dlu2 = KeyMapping.MAP.get(a);
+        if (dlu2 != null) {
+            final KeyMapping keyMapping = dlu2;
             ++keyMapping.clickCount;
         }
     }
     
     public static void set(final InputConstants.Key a, final boolean boolean2) {
-        final KeyMapping dbk3 = KeyMapping.MAP.get(a);
-        if (dbk3 != null) {
-            dbk3.setDown(boolean2);
+        final KeyMapping dlu3 = KeyMapping.MAP.get(a);
+        if (dlu3 != null) {
+            dlu3.setDown(boolean2);
         }
     }
     
     public static void setAll() {
-        for (final KeyMapping dbk2 : KeyMapping.ALL.values()) {
-            if (dbk2.key.getType() == InputConstants.Type.KEYSYM && dbk2.key.getValue() != InputConstants.UNKNOWN.getValue()) {
-                dbk2.setDown(InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), dbk2.key.getValue()));
+        for (final KeyMapping dlu2 : KeyMapping.ALL.values()) {
+            if (dlu2.key.getType() == InputConstants.Type.KEYSYM && dlu2.key.getValue() != InputConstants.UNKNOWN.getValue()) {
+                dlu2.setDown(InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), dlu2.key.getValue()));
             }
         }
     }
     
     public static void releaseAll() {
-        for (final KeyMapping dbk2 : KeyMapping.ALL.values()) {
-            dbk2.release();
+        for (final KeyMapping dlu2 : KeyMapping.ALL.values()) {
+            dlu2.release();
         }
     }
     
     public static void resetMapping() {
         KeyMapping.MAP.clear();
-        for (final KeyMapping dbk2 : KeyMapping.ALL.values()) {
-            KeyMapping.MAP.put(dbk2.key, dbk2);
+        for (final KeyMapping dlu2 : KeyMapping.ALL.values()) {
+            KeyMapping.MAP.put(dlu2.key, dlu2);
         }
     }
     
@@ -108,23 +109,23 @@ public class KeyMapping implements Comparable<KeyMapping> {
     }
     
     @Override
-    public int compareTo(final KeyMapping dbk) {
-        if (this.category.equals(dbk.category)) {
-            return I18n.get(this.name).compareTo(I18n.get(dbk.name));
+    public int compareTo(final KeyMapping dlu) {
+        if (this.category.equals(dlu.category)) {
+            return I18n.get(this.name).compareTo(I18n.get(dlu.name));
         }
-        return KeyMapping.CATEGORY_SORT_ORDER.get(this.category).compareTo(KeyMapping.CATEGORY_SORT_ORDER.get(dbk.category));
+        return KeyMapping.CATEGORY_SORT_ORDER.get(this.category).compareTo(KeyMapping.CATEGORY_SORT_ORDER.get(dlu.category));
     }
     
-    public static Supplier<String> createNameSupplier(final String string) {
-        final KeyMapping dbk2 = KeyMapping.ALL.get(string);
-        if (dbk2 == null) {
-            return () -> string;
+    public static Supplier<Component> createNameSupplier(final String string) {
+        final KeyMapping dlu2 = KeyMapping.ALL.get(string);
+        if (dlu2 == null) {
+            return (Supplier<Component>)(() -> new TranslatableComponent(string));
         }
-        return dbk2::getTranslatedKeyMessage;
+        return dlu2::getTranslatedKeyMessage;
     }
     
-    public boolean same(final KeyMapping dbk) {
-        return this.key.equals(dbk.key);
+    public boolean same(final KeyMapping dlu) {
+        return this.key.equals(dlu.key);
     }
     
     public boolean isUnbound() {
@@ -142,26 +143,8 @@ public class KeyMapping implements Comparable<KeyMapping> {
         return this.key.getType() == InputConstants.Type.MOUSE && this.key.getValue() == integer;
     }
     
-    public String getTranslatedKeyMessage() {
-        final String string2 = this.key.getName();
-        final int integer3 = this.key.getValue();
-        String string3 = null;
-        switch (this.key.getType()) {
-            case KEYSYM: {
-                string3 = InputConstants.translateKeyCode(integer3);
-                break;
-            }
-            case SCANCODE: {
-                string3 = InputConstants.translateScanCode(integer3);
-                break;
-            }
-            case MOUSE: {
-                final String string4 = I18n.get(string2);
-                string3 = (Objects.equals(string4, string2) ? I18n.get(InputConstants.Type.MOUSE.getDefaultPrefix(), integer3 + 1) : string4);
-                break;
-            }
-        }
-        return (string3 == null) ? I18n.get(string2) : string3;
+    public Component getTranslatedKeyMessage() {
+        return this.key.getDisplayName();
     }
     
     public boolean isDefault() {
diff --git a/src/net/minecraft/client/KeyboardHandler.java b/src/net/minecraft/client/KeyboardHandler.java
index 6c69493..3ad2a45 100644
--- a/src/net/minecraft/client/KeyboardHandler.java
+++ b/src/net/minecraft/client/KeyboardHandler.java
@@ -23,9 +23,10 @@ import net.minecraft.core.Registry;
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.gui.components.ChatComponent;
-import net.minecraft.world.level.dimension.DimensionType;
 import java.util.Locale;
+import net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen;
 import net.minecraft.util.Mth;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.Util;
@@ -44,20 +45,20 @@ public class KeyboardHandler {
     private long debugCrashKeyReportedCount;
     private boolean handledDebugKey;
     
-    public KeyboardHandler(final Minecraft dbn) {
+    public KeyboardHandler(final Minecraft dlx) {
         this.clipboardManager = new ClipboardManager();
         this.debugCrashKeyTime = -1L;
         this.debugCrashKeyReportedTime = -1L;
         this.debugCrashKeyReportedCount = -1L;
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
     private void debugFeedbackTranslated(final String string, final Object... arr) {
-        this.minecraft.gui.getChat().addMessage(new TextComponent("").append(new TranslatableComponent("debug.prefix", new Object[0]).withStyle(ChatFormatting.YELLOW, ChatFormatting.BOLD)).append(" ").append(new TranslatableComponent(string, arr)));
+        this.minecraft.gui.getChat().addMessage(new TextComponent("").append(new TranslatableComponent("debug.prefix").withStyle(ChatFormatting.YELLOW, ChatFormatting.BOLD)).append(" ").append(new TranslatableComponent(string, arr)));
     }
     
     private void debugWarningTranslated(final String string, final Object... arr) {
-        this.minecraft.gui.getChat().addMessage(new TextComponent("").append(new TranslatableComponent("debug.prefix", new Object[0]).withStyle(ChatFormatting.RED, ChatFormatting.BOLD)).append(" ").append(new TranslatableComponent(string, arr)));
+        this.minecraft.gui.getChat().addMessage(new TextComponent("").append(new TranslatableComponent("debug.prefix").withStyle(ChatFormatting.RED, ChatFormatting.BOLD)).append(" ").append(new TranslatableComponent(string, arr)));
     }
     
     private boolean handleDebugKeys(final int integer) {
@@ -108,11 +109,20 @@ public class KeyboardHandler {
                 if (!this.minecraft.player.hasPermissions(2)) {
                     this.debugFeedbackTranslated("debug.creative_spectator.error");
                 }
-                else if (this.minecraft.player.isCreative()) {
+                else if (!this.minecraft.player.isSpectator()) {
                     this.minecraft.player.chat("/gamemode spectator");
                 }
                 else {
-                    this.minecraft.player.chat("/gamemode creative");
+                    this.minecraft.player.chat("/gamemode " + this.minecraft.gameMode.getPreviousPlayerMode().getName());
+                }
+                return true;
+            }
+            case 293: {
+                if (!this.minecraft.player.hasPermissions(2)) {
+                    this.debugFeedbackTranslated("debug.gamemodes.error");
+                }
+                else {
+                    this.minecraft.setScreen(new GameModeSwitcherScreen());
                 }
                 return true;
             }
@@ -124,20 +134,21 @@ public class KeyboardHandler {
             }
             case 81: {
                 this.debugFeedbackTranslated("debug.help.message");
-                final ChatComponent dcw5 = this.minecraft.gui.getChat();
-                dcw5.addMessage(new TranslatableComponent("debug.reload_chunks.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.show_hitboxes.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.copy_location.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.clear_chat.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.cycle_renderdistance.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.chunk_boundaries.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.advanced_tooltips.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.inspect.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.creative_spectator.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.pause_focus.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.help.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.reload_resourcepacks.help", new Object[0]));
-                dcw5.addMessage(new TranslatableComponent("debug.pause.help", new Object[0]));
+                final ChatComponent dnj5 = this.minecraft.gui.getChat();
+                dnj5.addMessage(new TranslatableComponent("debug.reload_chunks.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.show_hitboxes.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.copy_location.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.clear_chat.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.cycle_renderdistance.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.chunk_boundaries.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.advanced_tooltips.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.inspect.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.creative_spectator.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.pause_focus.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.help.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.reload_resourcepacks.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.pause.help"));
+                dnj5.addMessage(new TranslatableComponent("debug.gamemodes.help"));
                 return true;
             }
             case 84: {
@@ -149,8 +160,12 @@ public class KeyboardHandler {
                 if (this.minecraft.player.isReducedDebugInfo()) {
                     return false;
                 }
+                final ClientPacketListener dyn6 = this.minecraft.player.connection;
+                if (dyn6 == null) {
+                    return false;
+                }
                 this.debugFeedbackTranslated("debug.copy_location.message");
-                this.setClipboard(String.format(Locale.ROOT, "/execute in %s run tp @s %.2f %.2f %.2f %.2f %.2f", DimensionType.getName(this.minecraft.player.level.dimension.getType()), this.minecraft.player.getX(), this.minecraft.player.getY(), this.minecraft.player.getZ(), this.minecraft.player.yRot, this.minecraft.player.xRot));
+                this.setClipboard(String.format(Locale.ROOT, "/execute in %s run tp @s %.2f %.2f %.2f %.2f %.2f", this.minecraft.player.level.dimension().location(), this.minecraft.player.getX(), this.minecraft.player.getY(), this.minecraft.player.getZ(), this.minecraft.player.yRot, this.minecraft.player.xRot));
                 return true;
             }
             default: {
@@ -160,84 +175,83 @@ public class KeyboardHandler {
     }
     
     private void copyRecreateCommand(final boolean boolean1, final boolean boolean2) {
-        final HitResult cvi4 = this.minecraft.hitResult;
-        if (cvi4 == null) {
+        final HitResult dej4 = this.minecraft.hitResult;
+        if (dej4 == null) {
             return;
         }
-        switch (cvi4.getType()) {
+        switch (dej4.getType()) {
             case BLOCK: {
-                final BlockPos fk5 = ((BlockHitResult)cvi4).getBlockPos();
-                final BlockState byj6 = this.minecraft.player.level.getBlockState(fk5);
+                final BlockPos fu5 = ((BlockHitResult)dej4).getBlockPos();
+                final BlockState cfj6 = this.minecraft.player.level.getBlockState(fu5);
                 if (!boolean1) {
-                    this.copyCreateBlockCommand(byj6, fk5, null);
+                    this.copyCreateBlockCommand(cfj6, fu5, null);
                     this.debugFeedbackTranslated("debug.inspect.client.block");
                     break;
                 }
                 if (boolean2) {
-                    this.minecraft.player.connection.getDebugQueryHandler().queryBlockEntityTag(fk5, jt -> {
-                        this.copyCreateBlockCommand(byj6, fk5, jt);
+                    this.minecraft.player.connection.getDebugQueryHandler().queryBlockEntityTag(fu5, le -> {
+                        this.copyCreateBlockCommand(cfj6, fu5, le);
                         this.debugFeedbackTranslated("debug.inspect.server.block");
                         return;
                     });
                     break;
                 }
-                final BlockEntity bwl7 = this.minecraft.player.level.getBlockEntity(fk5);
-                final CompoundTag jt2 = (bwl7 != null) ? bwl7.save(new CompoundTag()) : null;
-                this.copyCreateBlockCommand(byj6, fk5, jt2);
+                final BlockEntity cdl7 = this.minecraft.player.level.getBlockEntity(fu5);
+                final CompoundTag le2 = (cdl7 != null) ? cdl7.save(new CompoundTag()) : null;
+                this.copyCreateBlockCommand(cfj6, fu5, le2);
                 this.debugFeedbackTranslated("debug.inspect.client.block");
                 break;
             }
             case ENTITY: {
-                final Entity akq5 = ((EntityHitResult)cvi4).getEntity();
-                final ResourceLocation sm6 = Registry.ENTITY_TYPE.getKey(akq5.getType());
+                final Entity aom5 = ((EntityHitResult)dej4).getEntity();
+                final ResourceLocation uh6 = Registry.ENTITY_TYPE.getKey(aom5.getType());
                 if (!boolean1) {
-                    this.copyCreateEntityCommand(sm6, akq5.position(), null);
+                    this.copyCreateEntityCommand(uh6, aom5.position(), null);
                     this.debugFeedbackTranslated("debug.inspect.client.entity");
                     break;
                 }
                 if (boolean2) {
-                    this.minecraft.player.connection.getDebugQueryHandler().queryEntityTag(akq5.getId(), jt -> {
-                        this.copyCreateEntityCommand(sm6, akq5.position(), jt);
+                    this.minecraft.player.connection.getDebugQueryHandler().queryEntityTag(aom5.getId(), le -> {
+                        this.copyCreateEntityCommand(uh6, aom5.position(), le);
                         this.debugFeedbackTranslated("debug.inspect.server.entity");
                         return;
                     });
                     break;
                 }
-                final CompoundTag jt3 = akq5.saveWithoutId(new CompoundTag());
-                this.copyCreateEntityCommand(sm6, akq5.position(), jt3);
+                final CompoundTag le3 = aom5.saveWithoutId(new CompoundTag());
+                this.copyCreateEntityCommand(uh6, aom5.position(), le3);
                 this.debugFeedbackTranslated("debug.inspect.client.entity");
                 break;
             }
         }
     }
     
-    private void copyCreateBlockCommand(final BlockState byj, final BlockPos fk, @Nullable final CompoundTag jt) {
-        if (jt != null) {
-            jt.remove("x");
-            jt.remove("y");
-            jt.remove("z");
-            jt.remove("id");
+    private void copyCreateBlockCommand(final BlockState cfj, final BlockPos fu, @Nullable final CompoundTag le) {
+        if (le != null) {
+            le.remove("x");
+            le.remove("y");
+            le.remove("z");
+            le.remove("id");
         }
-        final StringBuilder stringBuilder5 = new StringBuilder(BlockStateParser.serialize(byj));
-        if (jt != null) {
-            stringBuilder5.append(jt);
+        final StringBuilder stringBuilder5 = new StringBuilder(BlockStateParser.serialize(cfj));
+        if (le != null) {
+            stringBuilder5.append(le);
         }
-        final String string6 = String.format(Locale.ROOT, "/setblock %d %d %d %s", fk.getX(), fk.getY(), fk.getZ(), stringBuilder5);
+        final String string6 = String.format(Locale.ROOT, "/setblock %d %d %d %s", fu.getX(), fu.getY(), fu.getZ(), stringBuilder5);
         this.setClipboard(string6);
     }
     
-    private void copyCreateEntityCommand(final ResourceLocation sm, final Vec3 cvl, @Nullable final CompoundTag jt) {
+    private void copyCreateEntityCommand(final ResourceLocation uh, final Vec3 dem, @Nullable final CompoundTag le) {
         String string7;
-        if (jt != null) {
-            jt.remove("UUIDMost");
-            jt.remove("UUIDLeast");
-            jt.remove("Pos");
-            jt.remove("Dimension");
-            final String string6 = jt.getPrettyDisplay().getString();
-            string7 = String.format(Locale.ROOT, "/summon %s %.2f %.2f %.2f %s", sm.toString(), cvl.x, cvl.y, cvl.z, string6);
+        if (le != null) {
+            le.remove("UUID");
+            le.remove("Pos");
+            le.remove("Dimension");
+            final String string6 = le.getPrettyDisplay().getString();
+            string7 = String.format(Locale.ROOT, "/summon %s %.2f %.2f %.2f %s", uh.toString(), dem.x, dem.y, dem.z, string6);
         }
         else {
-            string7 = String.format(Locale.ROOT, "/summon %s %.2f %.2f %.2f", sm.toString(), cvl.x, cvl.y, cvl.z);
+            string7 = String.format(Locale.ROOT, "/summon %s %.2f %.2f %.2f", uh.toString(), dem.x, dem.y, dem.z);
         }
         this.setClipboard(string7);
     }
@@ -257,30 +271,31 @@ public class KeyboardHandler {
             this.debugCrashKeyReportedTime = Util.getMillis();
             this.debugCrashKeyReportedCount = 0L;
         }
-        final ContainerEventHandler ddr8 = this.minecraft.screen;
-        if (integer4 == 1 && (!(this.minecraft.screen instanceof ControlsScreen) || ((ControlsScreen)ddr8).lastKeySelection <= Util.getMillis() - 20L)) {
+        final ContainerEventHandler doe8 = this.minecraft.screen;
+        if (integer4 == 1 && (!(this.minecraft.screen instanceof ControlsScreen) || ((ControlsScreen)doe8).lastKeySelection <= Util.getMillis() - 20L)) {
             if (this.minecraft.options.keyFullscreen.matches(integer2, integer3)) {
                 this.minecraft.getWindow().toggleFullScreen();
                 this.minecraft.options.fullscreen = this.minecraft.getWindow().isFullscreen();
+                this.minecraft.options.save();
                 return;
             }
             if (this.minecraft.options.keyScreenshot.matches(integer2, integer3)) {
                 if (Screen.hasControlDown()) {}
-                Screenshot.grab(this.minecraft.gameDirectory, this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight(), this.minecraft.getMainRenderTarget(), lf -> this.minecraft.execute(() -> this.minecraft.gui.getChat().addMessage(lf)));
+                Screenshot.grab(this.minecraft.gameDirectory, this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight(), this.minecraft.getMainRenderTarget(), mr -> this.minecraft.execute(() -> this.minecraft.gui.getChat().addMessage(mr)));
                 return;
             }
         }
-        final boolean boolean9 = ddr8 == null || !(ddr8.getFocused() instanceof EditBox) || !((EditBox)ddr8.getFocused()).canConsumeInput();
+        final boolean boolean9 = doe8 == null || !(doe8.getFocused() instanceof EditBox) || !((EditBox)doe8.getFocused()).canConsumeInput();
         if (integer4 != 0 && integer2 == 66 && Screen.hasControlDown() && boolean9) {
             Option.NARRATOR.toggle(this.minecraft.options, 1);
-            if (ddr8 instanceof ChatOptionsScreen) {
-                ((ChatOptionsScreen)ddr8).updateNarratorButton();
+            if (doe8 instanceof ChatOptionsScreen) {
+                ((ChatOptionsScreen)doe8).updateNarratorButton();
             }
-            if (ddr8 instanceof AccessibilityOptionsScreen) {
-                ((AccessibilityOptionsScreen)ddr8).updateNarratorButton();
+            if (doe8 instanceof AccessibilityOptionsScreen) {
+                ((AccessibilityOptionsScreen)doe8).updateNarratorButton();
             }
         }
-        if (ddr8 != null) {
+        if (doe8 != null) {
             final boolean[] arr10 = { false };
             final Object o;
             final ContainerEventHandler containerEventHandler;
@@ -292,7 +307,7 @@ public class KeyboardHandler {
                     o[0] = containerEventHandler.keyReleased(integer2, integer3, integer5);
                 }
                 return;
-            }, "keyPressed event handler", ddr8.getClass().getCanonicalName());
+            }, "keyPressed event handler", doe8.getClass().getCanonicalName());
             if (arr10[0]) {
                 return;
             }
@@ -335,15 +350,8 @@ public class KeyboardHandler {
                     KeyMapping.set(a10, true);
                     KeyMapping.click(a10);
                 }
-                if (this.minecraft.options.renderDebugCharts) {
-                    if (integer2 == 48) {
-                        this.minecraft.debugFpsMeterKeyPress(0);
-                    }
-                    for (int integer6 = 0; integer6 < 9; ++integer6) {
-                        if (integer2 == 49 + integer6) {
-                            this.minecraft.debugFpsMeterKeyPress(integer6 + 1);
-                        }
-                    }
+                if (this.minecraft.options.renderDebugCharts && integer2 >= 48 && integer2 <= 57) {
+                    this.minecraft.debugFpsMeterKeyPress(integer2 - 48);
                 }
             }
         }
@@ -353,16 +361,16 @@ public class KeyboardHandler {
         if (long1 != this.minecraft.getWindow().getWindow()) {
             return;
         }
-        final GuiEventListener dds6 = this.minecraft.screen;
-        if (dds6 == null || this.minecraft.getOverlay() != null) {
+        final GuiEventListener dof6 = this.minecraft.screen;
+        if (dof6 == null || this.minecraft.getOverlay() != null) {
             return;
         }
         if (Character.charCount(integer2) == 1) {
-            Screen.wrapScreenError(() -> dds6.charTyped((char)integer2, integer3), "charTyped event handler", dds6.getClass().getCanonicalName());
+            Screen.wrapScreenError(() -> dof6.charTyped((char)integer2, integer3), "charTyped event handler", dof6.getClass().getCanonicalName());
         }
         else {
             for (final char character10 : Character.toChars(integer2)) {
-                Screen.wrapScreenError(() -> dds6.charTyped(character10, integer3), "charTyped event handler", dds6.getClass().getCanonicalName());
+                Screen.wrapScreenError(() -> dof6.charTyped(character10, integer3), "charTyped event handler", dof6.getClass().getCanonicalName());
             }
         }
     }
diff --git a/src/net/minecraft/client/LogaritmicProgressOption.java b/src/net/minecraft/client/LogaritmicProgressOption.java
index 8953a9b..78deb00 100644
--- a/src/net/minecraft/client/LogaritmicProgressOption.java
+++ b/src/net/minecraft/client/LogaritmicProgressOption.java
@@ -1,11 +1,12 @@
 package net.minecraft.client;
 
+import net.minecraft.network.chat.Component;
 import java.util.function.BiFunction;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
 public class LogaritmicProgressOption extends ProgressOption {
-    public LogaritmicProgressOption(final String string, final double double2, final double double3, final float float4, final Function<Options, Double> function, final BiConsumer<Options, Double> biConsumer, final BiFunction<Options, ProgressOption, String> biFunction) {
+    public LogaritmicProgressOption(final String string, final double double2, final double double3, final float float4, final Function<Options, Double> function, final BiConsumer<Options, Double> biConsumer, final BiFunction<Options, ProgressOption, Component> biFunction) {
         super(string, double2, double3, float4, function, biConsumer, biFunction);
     }
     
diff --git a/src/net/minecraft/client/Minecraft.java b/src/net/minecraft/client/Minecraft.java
index 7f3e095..6b06691 100644
--- a/src/net/minecraft/client/Minecraft.java
+++ b/src/net/minecraft/client/Minecraft.java
@@ -4,23 +4,29 @@ import java.util.AbstractList;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.item.crafting.Recipe;
 import java.util.Optional;
+import com.mojang.serialization.DataResult;
+import net.minecraft.world.level.storage.PrimaryLevelData;
+import java.util.function.Consumer;
+import net.minecraft.core.MappedRegistry;
+import net.minecraft.world.level.dimension.LevelStem;
+import com.google.gson.JsonElement;
+import com.mojang.serialization.JsonOps;
 import java.util.concurrent.CompletionStage;
-import net.minecraft.client.resources.PackAdapterV4;
-import net.minecraft.client.resources.LegacyResourcePackAdapter;
+import net.minecraft.client.resources.PackResourcesAdapterV4;
+import net.minecraft.client.resources.LegacyPackResourcesAdapter;
 import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
 import java.util.function.Supplier;
-import net.minecraft.util.profiling.ProfilerFiller;
+import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.dimension.end.TheEndDimension;
-import net.minecraft.world.level.dimension.NetherDimension;
+import net.minecraft.sounds.Musics;
 import net.minecraft.client.gui.screens.WinScreen;
+import net.minecraft.sounds.Music;
 import com.mojang.authlib.GameProfile;
 import com.google.common.collect.Multimap;
 import java.nio.ByteOrder;
 import com.mojang.blaze3d.platform.GlUtil;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.Tag;
 import net.minecraft.world.item.PlayerHeadItem;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -39,9 +45,18 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
 import com.mojang.authlib.AuthenticationService;
 import net.minecraft.client.gui.screens.ProgressScreen;
+import java.util.concurrent.ExecutionException;
+import net.minecraft.server.ServerResources;
+import net.minecraft.commands.Commands;
+import net.minecraft.world.level.storage.LevelResource;
+import net.minecraft.server.packs.repository.ServerPacksSource;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.client.gui.screens.ConfirmScreen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.screens.BackupConfirmScreen;
+import net.minecraft.client.gui.screens.worldselection.EditWorldScreen;
 import java.net.SocketAddress;
 import com.mojang.authlib.GameProfileRepository;
-import net.minecraft.world.level.storage.LevelStorage;
 import net.minecraft.network.protocol.login.ServerboundHelloPacket;
 import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
 import net.minecraft.network.ConnectionProtocol;
@@ -52,10 +67,20 @@ import net.minecraft.server.level.progress.ChunkProgressListener;
 import net.minecraft.server.level.progress.ProcessorChunkProgressListener;
 import net.minecraft.world.level.block.entity.SkullBlockEntity;
 import net.minecraft.server.players.GameProfileCache;
-import net.minecraft.world.level.storage.LevelData;
-import net.minecraft.server.MinecraftServer;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.client.gui.screens.DatapackLoadFailureScreen;
+import java.util.function.Function;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
 import net.minecraft.world.level.LevelSettings;
-import net.minecraft.client.gui.screens.ChatScreen;
+import com.mojang.datafixers.util.Function4;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.nbt.Tag;
+import net.minecraft.resources.RegistryReadOps;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.world.level.storage.WorldData;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.DataPackConfig;
 import net.minecraft.world.entity.player.ChatVisiblity;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
@@ -63,8 +88,8 @@ import net.minecraft.client.gui.screens.advancements.AdvancementsScreen;
 import net.minecraft.client.gui.screens.inventory.InventoryScreen;
 import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
 import net.minecraft.CrashReportCategory;
-import net.minecraft.world.Difficulty;
 import net.minecraft.client.gui.screens.InBedChatScreen;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.core.Direction;
@@ -78,13 +103,14 @@ import java.text.DecimalFormat;
 import net.minecraft.util.Mth;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.Tesselator;
-import net.minecraft.util.profiling.ProfileResults;
 import net.minecraft.util.profiling.ResultField;
 import net.minecraft.client.gui.screens.GenericDirtMessageScreen;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.FogRenderer;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
 import net.minecraft.client.gui.screens.DeathScreen;
+import net.minecraft.client.gui.screens.ChatScreen;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import com.google.common.collect.UnmodifiableIterator;
 import net.minecraft.client.resources.model.BakedModel;
@@ -94,9 +120,9 @@ import java.util.Locale;
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.server.Bootstrap;
 import java.util.Date;
 import java.text.SimpleDateFormat;
-import net.minecraft.DefaultUncaughtExceptionHandler;
 import java.util.Iterator;
 import net.minecraft.client.searchtree.MutableSearchTree;
 import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
@@ -112,8 +138,11 @@ import net.minecraft.core.Registry;
 import net.minecraft.ChatFormatting;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.TooltipFlag;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
 import net.minecraft.ReportedException;
 import net.minecraft.client.gui.screens.OutOfMemoryScreen;
+import net.minecraft.util.profiling.SingleTickProfiler;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.gui.components.toasts.SystemToast;
@@ -122,19 +151,14 @@ import java.util.Collections;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.server.packs.PackResources;
+import java.util.List;
 import java.io.InputStream;
 import net.minecraft.SharedConstants;
 import java.util.concurrent.Executor;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-import java.util.function.Function;
-import net.minecraft.server.packs.repository.UnopenedPack;
-import net.minecraft.server.packs.Pack;
-import java.util.List;
 import net.minecraft.client.gui.screens.LoadingOverlay;
 import net.minecraft.client.gui.screens.ConnectScreen;
 import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.world.level.Level;
 import net.minecraft.client.resources.FoliageColorReloadListener;
 import net.minecraft.client.resources.GrassColorReloadListener;
 import net.minecraft.server.packs.resources.ResourceManager;
@@ -146,14 +170,18 @@ import com.mojang.blaze3d.platform.DisplayData;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.util.datafix.DataFixers;
 import net.minecraft.network.chat.KeybindComponent;
-import net.minecraft.server.Bootstrap;
 import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
 import java.util.UUID;
 import net.minecraft.server.packs.repository.FolderRepositorySource;
+import net.minecraft.server.packs.repository.PackSource;
 import net.minecraft.server.packs.repository.RepositorySource;
+import net.minecraft.util.profiling.InactiveProfiler;
 import com.google.common.collect.Queues;
 import net.minecraft.Util;
 import net.minecraft.client.main.GameConfig;
+import net.minecraft.util.profiling.ProfileResults;
+import net.minecraft.util.profiling.ContinuousProfiler;
+import net.minecraft.util.profiling.ProfilerFiller;
 import java.util.Queue;
 import net.minecraft.CrashReport;
 import net.minecraft.client.gui.screens.Overlay;
@@ -175,6 +203,7 @@ import net.minecraft.client.renderer.block.BlockRenderDispatcher;
 import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.client.resources.SkinManager;
 import com.mojang.authlib.minecraft.MinecraftSessionService;
+import net.minecraft.client.renderer.GpuWarnlistManager;
 import net.minecraft.client.resources.SplashManager;
 import net.minecraft.client.gui.font.FontManager;
 import net.minecraft.client.sounds.MusicManager;
@@ -183,11 +212,10 @@ import com.mojang.blaze3d.pipeline.RenderTarget;
 import net.minecraft.client.color.item.ItemColors;
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.resources.language.LanguageManager;
-import net.minecraft.client.resources.UnopenedResourcePack;
+import net.minecraft.client.resources.ResourcePack;
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.client.resources.ClientPackSource;
 import net.minecraft.server.packs.resources.ReloadableResourceManager;
-import net.minecraft.util.profiling.GameProfiler;
 import net.minecraft.util.FrameTimer;
 import net.minecraft.world.level.storage.LevelStorageSource;
 import java.net.Proxy;
@@ -224,6 +252,7 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
     private static final Logger LOGGER;
     public static final boolean ON_OSX;
     public static final ResourceLocation DEFAULT_FONT;
+    public static final ResourceLocation UNIFORM_FONT;
     public static final ResourceLocation ALT_FONT;
     private static final CompletableFuture<Unit> RESOURCE_RELOAD_INITIAL_TASK;
     private final File resourcePackDirectory;
@@ -259,10 +288,11 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
     public final FrameTimer frameTimer;
     private final boolean is64bit;
     private final boolean demo;
-    private final GameProfiler profiler;
+    private final boolean allowsMultiplayer;
+    private final boolean allowsChat;
     private final ReloadableResourceManager resourceManager;
     private final ClientPackSource clientPackSource;
-    private final PackRepository<UnopenedResourcePack> resourcePackRepository;
+    private final PackRepository<ResourcePack> resourcePackRepository;
     private final LanguageManager languageManager;
     private final BlockColors blockColors;
     private final ItemColors itemColors;
@@ -271,6 +301,7 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
     private final MusicManager musicManager;
     private final FontManager fontManager;
     private final SplashManager splashManager;
+    private final GpuWarnlistManager gpuWarnlistManager;
     private final MinecraftSessionService minecraftSessionService;
     private final SkinManager skinManager;
     private final ModelManager modelManager;
@@ -326,72 +357,76 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
     private final Queue<Runnable> progressTasks;
     @Nullable
     private CompletableFuture<Void> pendingReload;
+    private ProfilerFiller profiler;
+    private int fpsPieRenderTicks;
+    private final ContinuousProfiler fpsPieProfiler;
+    @Nullable
+    private ProfileResults fpsPieResults;
     private String debugPath;
     
-    public Minecraft(final GameConfig djy) {
+    public Minecraft(final GameConfig dus) {
         super("Client");
         this.timer = new Timer(20.0f, 0L);
         this.snooper = new Snooper("client", this, Util.getMillis());
         this.searchRegistry = new SearchRegistry();
         this.progressListener = new AtomicReference<StoringChunkProgressListener>();
         this.frameTimer = new FrameTimer();
-        this.profiler = new GameProfiler(() -> this.timer.ticks);
         this.game = new Game(this);
         this.lastNanoTime = Util.getNanos();
         this.running = true;
         this.fpsString = "";
         this.smartCull = true;
         this.progressTasks = Queues.newConcurrentLinkedQueue();
+        this.profiler = InactiveProfiler.INSTANCE;
+        this.fpsPieProfiler = new ContinuousProfiler(Util.timeSource, () -> this.fpsPieRenderTicks);
         this.debugPath = "root";
         Minecraft.instance = this;
-        this.gameDirectory = djy.location.gameDirectory;
-        final File file3 = djy.location.assetDirectory;
-        this.resourcePackDirectory = djy.location.resourcePackDirectory;
-        this.launchedVersion = djy.game.launchVersion;
-        this.versionType = djy.game.versionType;
-        this.profileProperties = djy.user.profileProperties;
-        this.clientPackSource = new ClientPackSource(new File(this.gameDirectory, "server-resource-packs"), djy.location.getAssetIndex());
-        (this.resourcePackRepository = new PackRepository<UnopenedResourcePack>(Minecraft::createClientPackAdapter)).addSource(this.clientPackSource);
-        this.resourcePackRepository.addSource(new FolderRepositorySource(this.resourcePackDirectory));
-        this.proxy = djy.user.proxy;
+        this.gameDirectory = dus.location.gameDirectory;
+        final File file3 = dus.location.assetDirectory;
+        this.resourcePackDirectory = dus.location.resourcePackDirectory;
+        this.launchedVersion = dus.game.launchVersion;
+        this.versionType = dus.game.versionType;
+        this.profileProperties = dus.user.profileProperties;
+        this.clientPackSource = new ClientPackSource(new File(this.gameDirectory, "server-resource-packs"), dus.location.getAssetIndex());
+        this.resourcePackRepository = new PackRepository<ResourcePack>(Minecraft::createClientPackAdapter, new RepositorySource[] { this.clientPackSource, new FolderRepositorySource(this.resourcePackDirectory, PackSource.DEFAULT) });
+        this.proxy = dus.user.proxy;
         this.minecraftSessionService = new YggdrasilAuthenticationService(this.proxy, UUID.randomUUID().toString()).createMinecraftSessionService();
-        this.user = djy.user.user;
+        this.user = dus.user.user;
         Minecraft.LOGGER.info("Setting user: {}", this.user.getName());
         Minecraft.LOGGER.debug("(Session ID is {})", this.user.getSessionId());
-        this.demo = djy.game.demo;
+        this.demo = dus.game.demo;
+        this.allowsMultiplayer = !dus.game.disableMultiplayer;
+        this.allowsChat = !dus.game.disableChat;
         this.is64bit = checkIs64Bit();
         this.singleplayerServer = null;
         String string4;
         int integer5;
-        if (djy.server.hostname != null) {
-            string4 = djy.server.hostname;
-            integer5 = djy.server.port;
+        if (this.allowsMultiplayer && dus.server.hostname != null) {
+            string4 = dus.server.hostname;
+            integer5 = dus.server.port;
         }
         else {
             string4 = null;
             integer5 = 0;
         }
-        Bootstrap.bootStrap();
-        Bootstrap.validate();
-        KeybindComponent.keyResolver = KeyMapping::createNameSupplier;
+        KeybindComponent.setKeyResolver(KeyMapping::createNameSupplier);
         this.fixerUpper = DataFixers.getDataFixer();
         this.toast = new ToastComponent(this);
         this.tutorial = new Tutorial(this);
         this.gameThread = Thread.currentThread();
         this.options = new Options(this, this.gameDirectory);
         this.hotbarManager = new HotbarManager(this.gameDirectory, this.fixerUpper);
-        this.startTimerHackThread();
         Minecraft.LOGGER.info("Backend library: {}", RenderSystem.getBackendDescription());
-        DisplayData cxh6;
+        DisplayData dgi6;
         if (this.options.overrideHeight > 0 && this.options.overrideWidth > 0) {
-            cxh6 = new DisplayData(this.options.overrideWidth, this.options.overrideHeight, djy.display.fullscreenWidth, djy.display.fullscreenHeight, djy.display.isFullscreen);
+            dgi6 = new DisplayData(this.options.overrideWidth, this.options.overrideHeight, dus.display.fullscreenWidth, dus.display.fullscreenHeight, dus.display.isFullscreen);
         }
         else {
-            cxh6 = djy.display;
+            dgi6 = dus.display;
         }
         Util.timeSource = RenderSystem.initBackendSystem();
         this.virtualScreen = new VirtualScreen(this);
-        this.window = this.virtualScreen.newWindow(cxh6, this.options.fullscreenVideoModeString, this.createTitle());
+        this.window = this.virtualScreen.newWindow(dgi6, this.options.fullscreenVideoModeString, this.createTitle());
         this.setWindowActive(true);
         try {
             final InputStream inputStream7 = this.getClientPackSource().getVanillaPack().getResource(PackType.CLIENT_RESOURCES, new ResourceLocation("icons/icon_16x16.png"));
@@ -406,9 +441,9 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         (this.keyboardHandler = new KeyboardHandler(this)).setup(this.window.getWindow());
         RenderSystem.initRenderer(this.options.glDebugVerbosity, false);
         (this.mainRenderTarget = new RenderTarget(this.window.getWidth(), this.window.getHeight(), true, Minecraft.ON_OSX)).setClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-        this.resourceManager = new SimpleReloadableResourceManager(PackType.CLIENT_RESOURCES, this.gameThread);
-        this.options.loadResourcePacks(this.resourcePackRepository);
+        this.resourceManager = new SimpleReloadableResourceManager(PackType.CLIENT_RESOURCES);
         this.resourcePackRepository.reload();
+        this.options.loadSelectedResourcePacks(this.resourcePackRepository);
         this.languageManager = new LanguageManager(this.options.languageCode);
         this.resourceManager.registerReloadListener(this.languageManager);
         this.textureManager = new TextureManager(this.resourceManager);
@@ -420,13 +455,10 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         this.splashManager = new SplashManager(this.user);
         this.resourceManager.registerReloadListener(this.splashManager);
         this.musicManager = new MusicManager(this);
-        this.fontManager = new FontManager(this.textureManager, this.isEnforceUnicode());
+        this.fontManager = new FontManager(this.textureManager);
+        this.font = this.fontManager.createFont();
         this.resourceManager.registerReloadListener(this.fontManager.getReloadListener());
-        final Font dch7 = this.fontManager.get(Minecraft.DEFAULT_FONT);
-        if (dch7 == null) {
-            throw new IllegalStateException("Default font is null");
-        }
-        (this.font = dch7).setBidirectional(this.languageManager.isBidirectional());
+        this.selectMainFont(this.isEnforceUnicode());
         this.resourceManager.registerReloadListener(new GrassColorReloadListener());
         this.resourceManager.registerReloadListener(new FoliageColorReloadListener());
         this.window.setErrorSection("Startup");
@@ -455,6 +487,8 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         this.resourceManager.registerReloadListener(this.paintingTextures);
         this.mobEffectTextures = new MobEffectTextureManager(this.textureManager);
         this.resourceManager.registerReloadListener(this.mobEffectTextures);
+        this.gpuWarnlistManager = new GpuWarnlistManager();
+        this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
         this.gui = new Gui(this);
         this.debugRenderer = new DebugRenderer(this);
         RenderSystem.setErrorCallback(this::onFullscreenError);
@@ -473,9 +507,8 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
             this.setScreen(new TitleScreen(true));
         }
         LoadingOverlay.registerTextures(this);
-        final List<Pack> list8 = this.resourcePackRepository.getSelected().stream().map(UnopenedPack::open).collect(Collectors.toList());
-        this.setOverlay(new LoadingOverlay(this, this.resourceManager.createFullReload(Util.backgroundExecutor(), this, Minecraft.RESOURCE_RELOAD_INITIAL_TASK, list8), optional -> Util.<Throwable>ifElse(optional, this::rollbackResourcePacks, () -> {
-            this.languageManager.reload(list8);
+        final List<PackResources> list7 = this.resourcePackRepository.openAllSelected();
+        this.setOverlay(new LoadingOverlay(this, this.resourceManager.createFullReload(Util.backgroundExecutor(), this, Minecraft.RESOURCE_RELOAD_INITIAL_TASK, list7), optional -> Util.<Throwable>ifElse(optional, this::rollbackResourcePacks, () -> {
             if (SharedConstants.IS_RUNNING_IN_IDE) {
                 this.selfTest();
             }
@@ -493,8 +526,8 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         }
         stringBuilder2.append(" ");
         stringBuilder2.append(SharedConstants.getCurrentVersion().getName());
-        final ClientPacketListener dnp3 = this.getConnection();
-        if (dnp3 != null && dnp3.getConnection().isConnected()) {
+        final ClientPacketListener dyn3 = this.getConnection();
+        if (dyn3 != null && dyn3.getConnection().isConnected()) {
             stringBuilder2.append(" - ");
             if (this.singleplayerServer != null && !this.singleplayerServer.isPublished()) {
                 stringBuilder2.append(I18n.get("title.singleplayer"));
@@ -517,23 +550,23 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
     }
     
     private void rollbackResourcePacks(final Throwable throwable) {
-        if (this.resourcePackRepository.getSelected().size() > 1) {
+        if (this.resourcePackRepository.getSelectedIds().size() > 1) {
             if (throwable instanceof SimpleReloadableResourceManager.ResourcePackLoadingFailure) {
-                final Component lf3 = new TextComponent(((SimpleReloadableResourceManager.ResourcePackLoadingFailure)throwable).getPack().getName());
+                final Component mr3 = new TextComponent(((SimpleReloadableResourceManager.ResourcePackLoadingFailure)throwable).getPack().getName());
             }
             else {
-                final Component lf3 = null;
+                final Component mr3 = null;
             }
             Minecraft.LOGGER.info("Caught error loading resourcepacks, removing all selected resourcepacks", throwable);
             this.resourcePackRepository.setSelected(Collections.emptyList());
             this.options.resourcePacks.clear();
             this.options.incompatibleResourcePacks.clear();
             this.options.save();
-            final ToastComponent deb3;
-            final Component lf4;
+            final ToastComponent doo3;
+            final Component mr4;
             this.reloadResourcePacks().thenRun(() -> {
-                deb3 = this.getToasts();
-                SystemToast.addOrUpdate(deb3, SystemToast.SystemToastIds.PACK_LOAD_FAILURE, new TranslatableComponent("resourcePack.load_fail", new Object[0]), lf4);
+                doo3 = this.getToasts();
+                SystemToast.addOrUpdate(doo3, SystemToast.SystemToastIds.PACK_LOAD_FAILURE, new TranslatableComponent("resourcePack.load_fail"), mr4);
             });
         }
         else {
@@ -551,7 +584,13 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
                     return;
                 }
                 try {
+                    final SingleTickProfiler aml3 = SingleTickProfiler.createTickProfiler("Renderer");
+                    final boolean boolean3 = this.shouldRenderFpsPie();
+                    this.startProfilers(boolean3, aml3);
+                    this.profiler.startTick();
                     this.runTick(!boolean2);
+                    this.profiler.endTick();
+                    this.finishProfilers(boolean3, aml3);
                 }
                 catch (OutOfMemoryError outOfMemoryError3) {
                     if (boolean2) {
@@ -565,38 +604,42 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
                 }
             }
         }
-        catch (ReportedException q2) {
-            this.fillReport(q2.getReport());
+        catch (ReportedException s2) {
+            this.fillReport(s2.getReport());
             this.emergencySave();
-            Minecraft.LOGGER.fatal("Reported exception thrown!", (Throwable)q2);
-            crash(q2.getReport());
+            Minecraft.LOGGER.fatal("Reported exception thrown!", (Throwable)s2);
+            crash(s2.getReport());
         }
         catch (Throwable throwable2) {
-            final CrashReport h3 = this.fillReport(new CrashReport("Unexpected error", throwable2));
+            final CrashReport j3 = this.fillReport(new CrashReport("Unexpected error", throwable2));
             Minecraft.LOGGER.fatal("Unreported exception thrown!", throwable2);
             this.emergencySave();
-            crash(h3);
+            crash(j3);
         }
     }
     
+    void selectMainFont(final boolean boolean1) {
+        this.fontManager.setRenames(boolean1 ? ImmutableMap.<ResourceLocation, ResourceLocation>of(Minecraft.DEFAULT_FONT, Minecraft.UNIFORM_FONT) : ImmutableMap.<ResourceLocation, ResourceLocation>of());
+    }
+    
     private void createSearchTrees() {
-        final ReloadableSearchTree<ItemStack> edg2 = new ReloadableSearchTree<ItemStack>(ben -> ben.getTooltipLines(null, TooltipFlag.Default.NORMAL).stream().map(lf -> ChatFormatting.stripFormatting(lf.getString()).trim()).filter(string -> !string.isEmpty()), ben -> Stream.<ResourceLocation>of(Registry.ITEM.getKey(ben.getItem())));
-        final ReloadableIdSearchTree<ItemStack> edf3 = new ReloadableIdSearchTree<ItemStack>(ben -> ItemTags.getAllTags().getMatchingTags(ben.getItem()).stream());
-        final NonNullList<ItemStack> fy4 = NonNullList.<ItemStack>create();
-        for (final Item bei6 : Registry.ITEM) {
-            bei6.fillItemCategory(CreativeModeTab.TAB_SEARCH, fy4);
+        final ReloadableSearchTree<ItemStack> eot2 = new ReloadableSearchTree<ItemStack>(bki -> bki.getTooltipLines(null, TooltipFlag.Default.NORMAL).stream().map(mr -> ChatFormatting.stripFormatting(mr.getString()).trim()).filter(string -> !string.isEmpty()), bki -> Stream.<ResourceLocation>of(Registry.ITEM.getKey(bki.getItem())));
+        final ReloadableIdSearchTree<ItemStack> eos3 = new ReloadableIdSearchTree<ItemStack>(bki -> ItemTags.getAllTags().getMatchingTags(bki.getItem()).stream());
+        final NonNullList<ItemStack> gi4 = NonNullList.<ItemStack>create();
+        for (final Item bke6 : Registry.ITEM) {
+            bke6.fillItemCategory(CreativeModeTab.TAB_SEARCH, gi4);
         }
         final ReloadableIdSearchTree<ItemStack> reloadableIdSearchTree;
         final ReloadableIdSearchTree<ItemStack> reloadableIdSearchTree2;
-        fy4.forEach(ben -> {
-            reloadableIdSearchTree.add(ben);
-            reloadableIdSearchTree2.add(ben);
+        gi4.forEach(bki -> {
+            reloadableIdSearchTree.add(bki);
+            reloadableIdSearchTree2.add(bki);
             return;
         });
-        final ReloadableSearchTree<RecipeCollection> edg3 = new ReloadableSearchTree<RecipeCollection>(dit -> dit.getRecipes().stream().flatMap(bgw -> bgw.getResultItem().getTooltipLines(null, TooltipFlag.Default.NORMAL).stream()).map(lf -> ChatFormatting.stripFormatting(lf.getString()).trim()).filter(string -> !string.isEmpty()), dit -> dit.getRecipes().stream().map(bgw -> Registry.ITEM.getKey(bgw.getResultItem().getItem())));
-        this.searchRegistry.<ItemStack>register(SearchRegistry.CREATIVE_NAMES, edg2);
-        this.searchRegistry.<ItemStack>register(SearchRegistry.CREATIVE_TAGS, edf3);
-        this.searchRegistry.<RecipeCollection>register(SearchRegistry.RECIPE_COLLECTIONS, edg3);
+        final ReloadableSearchTree<RecipeCollection> eot3 = new ReloadableSearchTree<RecipeCollection>(dtr -> dtr.getRecipes().stream().flatMap(bmu -> bmu.getResultItem().getTooltipLines(null, TooltipFlag.Default.NORMAL).stream()).map(mr -> ChatFormatting.stripFormatting(mr.getString()).trim()).filter(string -> !string.isEmpty()), dtr -> dtr.getRecipes().stream().map(bmu -> Registry.ITEM.getKey(bmu.getResultItem().getItem())));
+        this.searchRegistry.<ItemStack>register(SearchRegistry.CREATIVE_NAMES, eot2);
+        this.searchRegistry.<ItemStack>register(SearchRegistry.CREATIVE_TAGS, eos3);
+        this.searchRegistry.<RecipeCollection>register(SearchRegistry.RECIPE_COLLECTIONS, eot3);
     }
     
     private void onFullscreenError(final int integer, final long long2) {
@@ -628,36 +671,19 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         return this.versionType;
     }
     
-    private void startTimerHackThread() {
-        final Thread thread2 = new Thread("Timer hack thread") {
-            @Override
-            public void run() {
-                while (Minecraft.this.running) {
-                    try {
-                        Thread.sleep(2147483647L);
-                    }
-                    catch (InterruptedException ex) {}
-                }
-            }
-        };
-        thread2.setDaemon(true);
-        thread2.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(Minecraft.LOGGER));
-        thread2.start();
+    public void delayCrash(final CrashReport j) {
+        this.delayedCrash = j;
     }
     
-    public void delayCrash(final CrashReport h) {
-        this.delayedCrash = h;
-    }
-    
-    public static void crash(final CrashReport h) {
+    public static void crash(final CrashReport j) {
         final File file2 = new File(getInstance().gameDirectory, "crash-reports");
         final File file3 = new File(file2, "crash-" + new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new Date()) + "-client.txt");
-        Bootstrap.realStdoutPrintln(h.getFriendlyReport());
-        if (h.getSaveFile() != null) {
-            Bootstrap.realStdoutPrintln("#@!@# Game crashed! Crash report saved to: #@!@# " + h.getSaveFile());
+        Bootstrap.realStdoutPrintln(j.getFriendlyReport());
+        if (j.getSaveFile() != null) {
+            Bootstrap.realStdoutPrintln("#@!@# Game crashed! Crash report saved to: #@!@# " + j.getSaveFile());
             System.exit(-1);
         }
-        else if (h.saveToFile(file3)) {
+        else if (j.saveToFile(file3)) {
             Bootstrap.realStdoutPrintln("#@!@# Game crashed! Crash report saved to: #@!@# " + file3.getAbsolutePath());
             System.exit(-1);
         }
@@ -680,11 +706,9 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
             return this.pendingReload = completableFuture2;
         }
         this.resourcePackRepository.reload();
-        final List<Pack> list3 = this.resourcePackRepository.getSelected().stream().map(UnopenedPack::open).collect(Collectors.toList());
-        final List<Pack> list4;
+        final List<PackResources> list3 = this.resourcePackRepository.openAllSelected();
         final CompletableFuture<Object> completableFuture3;
         this.setOverlay(new LoadingOverlay(this, this.resourceManager.createFullReload(Util.backgroundExecutor(), this, Minecraft.RESOURCE_RELOAD_INITIAL_TASK, list3), optional -> Util.<Throwable>ifElse(optional, this::rollbackResourcePacks, () -> {
-            this.languageManager.reload(list4);
             this.levelRenderer.allChanged();
             completableFuture3.complete(null);
         }), true));
@@ -693,39 +717,39 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
     
     private void selfTest() {
         boolean boolean2 = false;
-        final BlockModelShaper drj3 = this.getBlockRenderer().getBlockModelShaper();
-        final BakedModel ebv4 = drj3.getModelManager().getMissingModel();
-        for (final Block bph6 : Registry.BLOCK) {
-            for (final BlockState byj8 : bph6.getStateDefinition().getPossibleStates()) {
-                if (byj8.getRenderShape() == RenderShape.MODEL) {
-                    final BakedModel ebv5 = drj3.getBlockModel(byj8);
-                    if (ebv5 != ebv4) {
+        final BlockModelShaper ecp3 = this.getBlockRenderer().getBlockModelShaper();
+        final BakedModel enh4 = ecp3.getModelManager().getMissingModel();
+        for (final Block bvr6 : Registry.BLOCK) {
+            for (final BlockState cfj8 : bvr6.getStateDefinition().getPossibleStates()) {
+                if (cfj8.getRenderShape() == RenderShape.MODEL) {
+                    final BakedModel enh5 = ecp3.getBlockModel(cfj8);
+                    if (enh5 != enh4) {
                         continue;
                     }
-                    Minecraft.LOGGER.debug("Missing model for: {}", byj8);
+                    Minecraft.LOGGER.debug("Missing model for: {}", cfj8);
                     boolean2 = true;
                 }
             }
         }
-        final TextureAtlasSprite eaj5 = ebv4.getParticleIcon();
-        for (final Block bph7 : Registry.BLOCK) {
-            for (final BlockState byj9 : bph7.getStateDefinition().getPossibleStates()) {
-                final TextureAtlasSprite eaj6 = drj3.getParticleIcon(byj9);
-                if (!byj9.isAir() && eaj6 == eaj5) {
-                    Minecraft.LOGGER.debug("Missing particle icon for: {}", byj9);
+        final TextureAtlasSprite elv5 = enh4.getParticleIcon();
+        for (final Block bvr7 : Registry.BLOCK) {
+            for (final BlockState cfj9 : bvr7.getStateDefinition().getPossibleStates()) {
+                final TextureAtlasSprite elv6 = ecp3.getParticleIcon(cfj9);
+                if (!cfj9.isAir() && elv6 == elv5) {
+                    Minecraft.LOGGER.debug("Missing particle icon for: {}", cfj9);
                     boolean2 = true;
                 }
             }
         }
-        final NonNullList<ItemStack> fy6 = NonNullList.<ItemStack>create();
-        for (final Item bei8 : Registry.ITEM) {
-            fy6.clear();
-            bei8.fillItemCategory(CreativeModeTab.TAB_SEARCH, fy6);
-            for (final ItemStack ben10 : fy6) {
-                final String string11 = ben10.getDescriptionId();
-                final String string12 = new TranslatableComponent(string11, new Object[0]).getString();
-                if (string12.toLowerCase(Locale.ROOT).equals(bei8.getDescriptionId())) {
-                    Minecraft.LOGGER.debug("Missing translation for: {} {} {}", ben10, string11, ben10.getItem());
+        final NonNullList<ItemStack> gi6 = NonNullList.<ItemStack>create();
+        for (final Item bke8 : Registry.ITEM) {
+            gi6.clear();
+            bke8.fillItemCategory(CreativeModeTab.TAB_SEARCH, gi6);
+            for (final ItemStack bki10 : gi6) {
+                final String string11 = bki10.getDescriptionId();
+                final String string12 = new TranslatableComponent(string11).getString();
+                if (string12.toLowerCase(Locale.ROOT).equals(bke8.getDescriptionId())) {
+                    Minecraft.LOGGER.debug("Missing translation for: {} {} {}", bki10, string11, bki10.getItem());
                 }
             }
         }
@@ -739,31 +763,42 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         return this.levelSource;
     }
     
-    public void setScreen(@Nullable Screen dgb) {
+    private void openChatScreen(final String string) {
+        if (!this.isLocalServer() && !this.allowsChat()) {
+            if (this.player != null) {
+                this.player.sendMessage(new TranslatableComponent("chat.cannotSend").withStyle(ChatFormatting.RED), Util.NIL_UUID);
+            }
+        }
+        else {
+            this.setScreen(new ChatScreen(string));
+        }
+    }
+    
+    public void setScreen(@Nullable Screen dqs) {
         if (this.screen != null) {
             this.screen.removed();
         }
-        if (dgb == null && this.level == null) {
-            dgb = new TitleScreen();
+        if (dqs == null && this.level == null) {
+            dqs = new TitleScreen();
         }
-        else if (dgb == null && this.player.getHealth() <= 0.0f) {
+        else if (dqs == null && this.player.isDeadOrDying()) {
             if (this.player.shouldShowDeathScreen()) {
-                dgb = new DeathScreen(null, this.level.getLevelData().isHardcore());
+                dqs = new DeathScreen(null, this.level.getLevelData().isHardcore());
             }
             else {
                 this.player.respawn();
             }
         }
-        if (dgb instanceof TitleScreen || dgb instanceof JoinMultiplayerScreen) {
+        if (dqs instanceof TitleScreen || dqs instanceof JoinMultiplayerScreen) {
             this.options.renderDebug = false;
             this.gui.getChat().clearMessages(true);
         }
-        if ((this.screen = dgb) != null) {
+        if ((this.screen = dqs) != null) {
             this.mouseHandler.releaseMouse();
             KeyMapping.releaseAll();
-            dgb.init(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
+            dqs.init(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
             this.noRender = false;
-            NarratorChatListener.INSTANCE.sayNow(dgb.getNarrationMessage());
+            NarratorChatListener.INSTANCE.sayNow(dqs.getNarrationMessage());
         }
         else {
             this.soundManager.resume();
@@ -772,8 +807,8 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         this.updateTitle();
     }
     
-    public void setOverlay(@Nullable final Overlay dfw) {
-        this.overlay = dfw;
+    public void setOverlay(@Nullable final Overlay dql) {
+        this.overlay = dql;
     }
     
     public void destroy() {
@@ -816,7 +851,8 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
             this.mobEffectTextures.close();
             this.paintingTextures.close();
             this.textureManager.close();
-            Util.shutdownBackgroundExecutor();
+            this.resourceManager.close();
+            Util.shutdownExecutors();
         }
         catch (Throwable throwable2) {
             Minecraft.LOGGER.error("Shutdown failure!", throwable2);
@@ -831,7 +867,6 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
     private void runTick(final boolean boolean1) {
         this.window.setErrorSection("Pre render");
         final long long3 = Util.getNanos();
-        this.profiler.startTick();
         if (this.window.shouldClose()) {
             this.stop();
         }
@@ -845,20 +880,20 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
             runnable5.run();
         }
         if (boolean1) {
-            this.timer.advanceTime(Util.getMillis());
+            final int integer6 = this.timer.advanceTime(Util.getMillis());
             this.profiler.push("scheduledExecutables");
             this.runAllTasks();
             this.profiler.pop();
-        }
-        this.profiler.push("tick");
-        if (boolean1) {
-            for (int integer6 = 0; integer6 < Math.min(10, this.timer.ticks); ++integer6) {
+            this.profiler.push("tick");
+            for (int integer7 = 0; integer7 < Math.min(10, integer6); ++integer7) {
+                this.profiler.incrementCounter("clientTick");
                 this.tick();
             }
+            this.profiler.pop();
         }
         this.mouseHandler.turnPlayer();
         this.window.setErrorSection("Render");
-        this.profiler.popPush("sound");
+        this.profiler.push("sound");
         this.soundManager.updateSource(this.gameRenderer.getMainCamera());
         this.profiler.pop();
         this.profiler.push("render");
@@ -868,31 +903,29 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         FogRenderer.setupNoFog();
         this.profiler.push("display");
         RenderSystem.enableTexture();
+        RenderSystem.enableCull();
         this.profiler.pop();
         if (!this.noRender) {
             this.profiler.popPush("gameRenderer");
             this.gameRenderer.render(this.pause ? this.pausePartialTick : this.timer.partialTick, long3, boolean1);
             this.profiler.popPush("toasts");
-            this.toast.render();
+            this.toast.render(new PoseStack());
             this.profiler.pop();
         }
-        this.profiler.endTick();
-        if (this.options.renderDebug && this.options.renderDebugCharts && !this.options.hideGui) {
-            this.profiler.continuous().enable();
-            this.renderFpsMeter();
-        }
-        else {
-            this.profiler.continuous().disable();
+        if (this.fpsPieResults != null) {
+            this.profiler.push("fpsPie");
+            this.renderFpsMeter(new PoseStack(), this.fpsPieResults);
+            this.profiler.pop();
         }
+        this.profiler.push("blit");
         this.mainRenderTarget.unbindWrite();
         RenderSystem.popMatrix();
         RenderSystem.pushMatrix();
         this.mainRenderTarget.blitToScreen(this.window.getWidth(), this.window.getHeight());
         RenderSystem.popMatrix();
-        this.profiler.startTick();
-        this.profiler.push("updateDisplay");
+        this.profiler.popPush("updateDisplay");
         this.window.updateDisplay();
-        int integer6 = this.getFramerateLimit();
+        final int integer6 = this.getFramerateLimit();
         if (integer6 < Option.FRAMERATE_LIMIT.getMaxValue()) {
             RenderSystem.limitDisplayFPS(integer6);
         }
@@ -914,9 +947,10 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         final long long4 = Util.getNanos();
         this.frameTimer.logFrameDuration(long4 - this.lastNanoTime);
         this.lastNanoTime = long4;
+        this.profiler.push("fpsUpdate");
         while (Util.getMillis() >= this.lastTime + 1000L) {
             Minecraft.fps = this.frames;
-            this.fpsString = String.format("%d fps T: %s%s%s%s B: %d", Minecraft.fps, (this.options.framerateLimit == Option.FRAMERATE_LIMIT.getMaxValue()) ? "inf" : Integer.valueOf(this.options.framerateLimit), this.options.enableVsync ? " vsync" : "", this.options.fancyGraphics ? "" : " fast", (this.options.renderClouds == CloudStatus.OFF) ? "" : ((this.options.renderClouds == CloudStatus.FAST) ? " fast-clouds" : " fancy-clouds"), this.options.biomeBlendRadius);
+            this.fpsString = String.format("%d fps T: %s%s%s%s B: %d", Minecraft.fps, (this.options.framerateLimit == Option.FRAMERATE_LIMIT.getMaxValue()) ? "inf" : Integer.valueOf(this.options.framerateLimit), this.options.enableVsync ? " vsync" : "", this.options.graphicsMode.toString(), (this.options.renderClouds == CloudStatus.OFF) ? "" : ((this.options.renderClouds == CloudStatus.FAST) ? " fast-clouds" : " fancy-clouds"), this.options.biomeBlendRadius);
             this.lastTime += 1000L;
             this.frames = 0;
             this.snooper.prepare();
@@ -924,7 +958,38 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
                 this.snooper.start();
             }
         }
-        this.profiler.endTick();
+        this.profiler.pop();
+    }
+    
+    private boolean shouldRenderFpsPie() {
+        return this.options.renderDebug && this.options.renderDebugCharts && !this.options.hideGui;
+    }
+    
+    private void startProfilers(final boolean boolean1, @Nullable final SingleTickProfiler aml) {
+        if (boolean1) {
+            if (!this.fpsPieProfiler.isEnabled()) {
+                this.fpsPieRenderTicks = 0;
+                this.fpsPieProfiler.enable();
+            }
+            ++this.fpsPieRenderTicks;
+        }
+        else {
+            this.fpsPieProfiler.disable();
+        }
+        this.profiler = SingleTickProfiler.decorateFiller(this.fpsPieProfiler.getFiller(), aml);
+    }
+    
+    private void finishProfilers(final boolean boolean1, @Nullable final SingleTickProfiler aml) {
+        if (aml != null) {
+            aml.endTick();
+        }
+        if (boolean1) {
+            this.fpsPieResults = this.fpsPieProfiler.getResults();
+        }
+        else {
+            this.fpsPieResults = null;
+        }
+        this.profiler = this.fpsPieProfiler.getFiller();
     }
     
     @Override
@@ -934,12 +999,17 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         if (this.screen != null) {
             this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
         }
-        final RenderTarget cxe3 = this.getMainRenderTarget();
-        cxe3.resize(this.window.getWidth(), this.window.getHeight(), Minecraft.ON_OSX);
+        final RenderTarget dgf3 = this.getMainRenderTarget();
+        dgf3.resize(this.window.getWidth(), this.window.getHeight(), Minecraft.ON_OSX);
         this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
         this.mouseHandler.setIgnoreFirstMove();
     }
     
+    @Override
+    public void cursorEntered() {
+        this.mouseHandler.cursorEntered();
+    }
+    
     private int getFramerateLimit() {
         if (this.level == null && (this.screen != null || this.overlay != null)) {
             return 60;
@@ -958,42 +1028,40 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
             if (this.isLocalServer && this.singleplayerServer != null) {
                 this.singleplayerServer.halt(true);
             }
-            this.clearLevel(new GenericDirtMessageScreen(new TranslatableComponent("menu.savingLevel", new Object[0])));
+            this.clearLevel(new GenericDirtMessageScreen(new TranslatableComponent("menu.savingLevel")));
         }
         catch (Throwable t2) {}
         System.gc();
     }
     
     void debugFpsMeterKeyPress(int integer) {
-        final ProfileResults ain3 = this.profiler.continuous().getResults();
-        final List<ResultField> list4 = ain3.getTimes(this.debugPath);
-        if (list4.isEmpty()) {
+        if (this.fpsPieResults == null) {
             return;
         }
-        final ResultField aiq5 = list4.remove(0);
+        final List<ResultField> list3 = this.fpsPieResults.getTimes(this.debugPath);
+        if (list3.isEmpty()) {
+            return;
+        }
+        final ResultField amk4 = list3.remove(0);
         if (integer == 0) {
-            if (!aiq5.name.isEmpty()) {
+            if (!amk4.name.isEmpty()) {
                 final int integer2 = this.debugPath.lastIndexOf(30);
                 if (integer2 >= 0) {
                     this.debugPath = this.debugPath.substring(0, integer2);
                 }
             }
         }
-        else if (--integer < list4.size() && !"unspecified".equals(list4.get(integer).name)) {
+        else if (--integer < list3.size() && !"unspecified".equals(list3.get(integer).name)) {
             if (!this.debugPath.isEmpty()) {
                 this.debugPath += '\u001e';
             }
-            this.debugPath += list4.get(integer).name;
+            this.debugPath += list3.get(integer).name;
         }
     }
     
-    private void renderFpsMeter() {
-        if (!this.profiler.continuous().isEnabled()) {
-            return;
-        }
-        final ProfileResults ain2 = this.profiler.continuous().getResults();
-        final List<ResultField> list3 = ain2.getTimes(this.debugPath);
-        final ResultField aiq4 = list3.remove(0);
+    private void renderFpsMeter(final PoseStack dhl, final ProfileResults amh) {
+        final List<ResultField> list4 = amh.getTimes(this.debugPath);
+        final ResultField amk5 = list4.remove(0);
         RenderSystem.clear(256, Minecraft.ON_OSX);
         RenderSystem.matrixMode(5889);
         RenderSystem.loadIdentity();
@@ -1003,81 +1071,81 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         RenderSystem.translatef(0.0f, 0.0f, -2000.0f);
         RenderSystem.lineWidth(1.0f);
         RenderSystem.disableTexture();
-        final Tesselator cym5 = Tesselator.getInstance();
-        final BufferBuilder cyg6 = cym5.getBuilder();
-        final int integer7 = 160;
-        final int integer8 = this.window.getWidth() - 160 - 10;
-        final int integer9 = this.window.getHeight() - 320;
+        final Tesselator dhn6 = Tesselator.getInstance();
+        final BufferBuilder dhg7 = dhn6.getBuilder();
+        final int integer8 = 160;
+        final int integer9 = this.window.getWidth() - 160 - 10;
+        final int integer10 = this.window.getHeight() - 320;
         RenderSystem.enableBlend();
-        cyg6.begin(7, DefaultVertexFormat.POSITION_COLOR);
-        cyg6.vertex(integer8 - 176.0f, integer9 - 96.0f - 16.0f, 0.0).color(200, 0, 0, 0).endVertex();
-        cyg6.vertex(integer8 - 176.0f, integer9 + 320, 0.0).color(200, 0, 0, 0).endVertex();
-        cyg6.vertex(integer8 + 176.0f, integer9 + 320, 0.0).color(200, 0, 0, 0).endVertex();
-        cyg6.vertex(integer8 + 176.0f, integer9 - 96.0f - 16.0f, 0.0).color(200, 0, 0, 0).endVertex();
-        cym5.end();
+        dhg7.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        dhg7.vertex(integer9 - 176.0f, integer10 - 96.0f - 16.0f, 0.0).color(200, 0, 0, 0).endVertex();
+        dhg7.vertex(integer9 - 176.0f, integer10 + 320, 0.0).color(200, 0, 0, 0).endVertex();
+        dhg7.vertex(integer9 + 176.0f, integer10 + 320, 0.0).color(200, 0, 0, 0).endVertex();
+        dhg7.vertex(integer9 + 176.0f, integer10 - 96.0f - 16.0f, 0.0).color(200, 0, 0, 0).endVertex();
+        dhn6.end();
         RenderSystem.disableBlend();
-        double double10 = 0.0;
-        for (final ResultField aiq5 : list3) {
-            final int integer10 = Mth.floor(aiq5.percentage / 4.0) + 1;
-            cyg6.begin(6, DefaultVertexFormat.POSITION_COLOR);
-            final int integer11 = aiq5.getColor();
-            final int integer12 = integer11 >> 16 & 0xFF;
-            final int integer13 = integer11 >> 8 & 0xFF;
-            final int integer14 = integer11 & 0xFF;
-            cyg6.vertex(integer8, integer9, 0.0).color(integer12, integer13, integer14, 255).endVertex();
-            for (int integer15 = integer10; integer15 >= 0; --integer15) {
-                final float float20 = (float)((double10 + aiq5.percentage * integer15 / integer10) * 6.2831854820251465 / 100.0);
-                final float float21 = Mth.sin(float20) * 160.0f;
-                final float float22 = Mth.cos(float20) * 160.0f * 0.5f;
-                cyg6.vertex(integer8 + float21, integer9 - float22, 0.0).color(integer12, integer13, integer14, 255).endVertex();
+        double double11 = 0.0;
+        for (final ResultField amk6 : list4) {
+            final int integer11 = Mth.floor(amk6.percentage / 4.0) + 1;
+            dhg7.begin(6, DefaultVertexFormat.POSITION_COLOR);
+            final int integer12 = amk6.getColor();
+            final int integer13 = integer12 >> 16 & 0xFF;
+            final int integer14 = integer12 >> 8 & 0xFF;
+            final int integer15 = integer12 & 0xFF;
+            dhg7.vertex(integer9, integer10, 0.0).color(integer13, integer14, integer15, 255).endVertex();
+            for (int integer16 = integer11; integer16 >= 0; --integer16) {
+                final float float21 = (float)((double11 + amk6.percentage * integer16 / integer11) * 6.2831854820251465 / 100.0);
+                final float float22 = Mth.sin(float21) * 160.0f;
+                final float float23 = Mth.cos(float21) * 160.0f * 0.5f;
+                dhg7.vertex(integer9 + float22, integer10 - float23, 0.0).color(integer13, integer14, integer15, 255).endVertex();
             }
-            cym5.end();
-            cyg6.begin(5, DefaultVertexFormat.POSITION_COLOR);
-            for (int integer15 = integer10; integer15 >= 0; --integer15) {
-                final float float20 = (float)((double10 + aiq5.percentage * integer15 / integer10) * 6.2831854820251465 / 100.0);
-                final float float21 = Mth.sin(float20) * 160.0f;
-                final float float22 = Mth.cos(float20) * 160.0f * 0.5f;
-                if (float22 <= 0.0f) {
-                    cyg6.vertex(integer8 + float21, integer9 - float22, 0.0).color(integer12 >> 1, integer13 >> 1, integer14 >> 1, 255).endVertex();
-                    cyg6.vertex(integer8 + float21, integer9 - float22 + 10.0f, 0.0).color(integer12 >> 1, integer13 >> 1, integer14 >> 1, 255).endVertex();
+            dhn6.end();
+            dhg7.begin(5, DefaultVertexFormat.POSITION_COLOR);
+            for (int integer16 = integer11; integer16 >= 0; --integer16) {
+                final float float21 = (float)((double11 + amk6.percentage * integer16 / integer11) * 6.2831854820251465 / 100.0);
+                final float float22 = Mth.sin(float21) * 160.0f;
+                final float float23 = Mth.cos(float21) * 160.0f * 0.5f;
+                if (float23 <= 0.0f) {
+                    dhg7.vertex(integer9 + float22, integer10 - float23, 0.0).color(integer13 >> 1, integer14 >> 1, integer15 >> 1, 255).endVertex();
+                    dhg7.vertex(integer9 + float22, integer10 - float23 + 10.0f, 0.0).color(integer13 >> 1, integer14 >> 1, integer15 >> 1, 255).endVertex();
                 }
             }
-            cym5.end();
-            double10 += aiq5.percentage;
+            dhn6.end();
+            double11 += amk6.percentage;
         }
-        final DecimalFormat decimalFormat12 = new DecimalFormat("##0.00");
-        decimalFormat12.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT));
+        final DecimalFormat decimalFormat13 = new DecimalFormat("##0.00");
+        decimalFormat13.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT));
         RenderSystem.enableTexture();
-        final String string13 = ProfileResults.demanglePath(aiq4.name);
-        String string14 = "";
-        if (!"unspecified".equals(string13)) {
-            string14 += "[0] ";
+        final String string14 = ProfileResults.demanglePath(amk5.name);
+        String string15 = "";
+        if (!"unspecified".equals(string14)) {
+            string15 += "[0] ";
         }
-        if (string13.isEmpty()) {
-            string14 += "ROOT ";
+        if (string14.isEmpty()) {
+            string15 += "ROOT ";
         }
         else {
-            string14 = string14 + string13 + ' ';
+            string15 = string15 + string14 + ' ';
         }
-        final int integer11 = 16777215;
-        this.font.drawShadow(string14, (float)(integer8 - 160), (float)(integer9 - 80 - 16), 16777215);
-        string14 = decimalFormat12.format(aiq4.globalPercentage) + "%";
-        this.font.drawShadow(string14, (float)(integer8 + 160 - this.font.width(string14)), (float)(integer9 - 80 - 16), 16777215);
-        for (int integer16 = 0; integer16 < list3.size(); ++integer16) {
-            final ResultField aiq6 = list3.get(integer16);
-            final StringBuilder stringBuilder15 = new StringBuilder();
-            if ("unspecified".equals(aiq6.name)) {
-                stringBuilder15.append("[?] ");
+        final int integer12 = 16777215;
+        this.font.drawShadow(dhl, string15, (float)(integer9 - 160), (float)(integer10 - 80 - 16), 16777215);
+        string15 = decimalFormat13.format(amk5.globalPercentage) + "%";
+        this.font.drawShadow(dhl, string15, (float)(integer9 + 160 - this.font.width(string15)), (float)(integer10 - 80 - 16), 16777215);
+        for (int integer17 = 0; integer17 < list4.size(); ++integer17) {
+            final ResultField amk7 = list4.get(integer17);
+            final StringBuilder stringBuilder16 = new StringBuilder();
+            if ("unspecified".equals(amk7.name)) {
+                stringBuilder16.append("[?] ");
             }
             else {
-                stringBuilder15.append("[").append(integer16 + 1).append("] ");
+                stringBuilder16.append("[").append(integer17 + 1).append("] ");
             }
-            String string15 = stringBuilder15.append(aiq6.name).toString();
-            this.font.drawShadow(string15, (float)(integer8 - 160), (float)(integer9 + 80 + integer16 * 8 + 20), aiq6.getColor());
-            string15 = decimalFormat12.format(aiq6.percentage) + "%";
-            this.font.drawShadow(string15, (float)(integer8 + 160 - 50 - this.font.width(string15)), (float)(integer9 + 80 + integer16 * 8 + 20), aiq6.getColor());
-            string15 = decimalFormat12.format(aiq6.globalPercentage) + "%";
-            this.font.drawShadow(string15, (float)(integer8 + 160 - this.font.width(string15)), (float)(integer9 + 80 + integer16 * 8 + 20), aiq6.getColor());
+            String string16 = stringBuilder16.append(amk7.name).toString();
+            this.font.drawShadow(dhl, string16, (float)(integer9 - 160), (float)(integer10 + 80 + integer17 * 8 + 20), amk7.getColor());
+            string16 = decimalFormat13.format(amk7.percentage) + "%";
+            this.font.drawShadow(dhl, string16, (float)(integer9 + 160 - 50 - this.font.width(string16)), (float)(integer10 + 80 + integer17 * 8 + 20), amk7.getColor());
+            string16 = decimalFormat13.format(amk7.globalPercentage) + "%";
+            this.font.drawShadow(dhl, string16, (float)(integer9 + 160 - this.font.width(string16)), (float)(integer10 + 80 + integer17 * 8 + 20), amk7.getColor());
         }
     }
     
@@ -1111,12 +1179,12 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
             return;
         }
         if (boolean1 && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
-            final BlockHitResult cvg3 = (BlockHitResult)this.hitResult;
-            final BlockPos fk4 = cvg3.getBlockPos();
-            if (!this.level.getBlockState(fk4).isAir()) {
-                final Direction fp5 = cvg3.getDirection();
-                if (this.gameMode.continueDestroyBlock(fk4, fp5)) {
-                    this.particleEngine.crack(fk4, fp5);
+            final BlockHitResult deh3 = (BlockHitResult)this.hitResult;
+            final BlockPos fu4 = deh3.getBlockPos();
+            if (!this.level.getBlockState(fu4).isAir()) {
+                final Direction fz5 = deh3.getDirection();
+                if (this.gameMode.continueDestroyBlock(fu4, fz5)) {
+                    this.particleEngine.crack(fu4, fz5);
                     this.player.swing(InteractionHand.MAIN_HAND);
                 }
             }
@@ -1145,10 +1213,10 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
                 break;
             }
             case BLOCK: {
-                final BlockHitResult cvg2 = (BlockHitResult)this.hitResult;
-                final BlockPos fk3 = cvg2.getBlockPos();
-                if (!this.level.getBlockState(fk3).isAir()) {
-                    this.gameMode.startDestroyBlock(fk3, cvg2.getDirection());
+                final BlockHitResult deh2 = (BlockHitResult)this.hitResult;
+                final BlockPos fu3 = deh2.getBlockPos();
+                if (!this.level.getBlockState(fu3).isAir()) {
+                    this.gameMode.startDestroyBlock(fu3, deh2.getDirection());
                     break;
                 }
             }
@@ -1174,52 +1242,52 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         if (this.hitResult == null) {
             Minecraft.LOGGER.warn("Null returned as 'hitResult', this shouldn't happen!");
         }
-        for (final InteractionHand ajk5 : InteractionHand.values()) {
-            final ItemStack ben6 = this.player.getItemInHand(ajk5);
+        for (final InteractionHand anf5 : InteractionHand.values()) {
+            final ItemStack bki6 = this.player.getItemInHand(anf5);
             if (this.hitResult != null) {
                 switch (this.hitResult.getType()) {
                     case ENTITY: {
-                        final EntityHitResult cvh7 = (EntityHitResult)this.hitResult;
-                        final Entity akq8 = cvh7.getEntity();
-                        InteractionResult ajl9 = this.gameMode.interactAt(this.player, akq8, cvh7, ajk5);
-                        if (!ajl9.consumesAction()) {
-                            ajl9 = this.gameMode.interact(this.player, akq8, ajk5);
+                        final EntityHitResult dei7 = (EntityHitResult)this.hitResult;
+                        final Entity aom8 = dei7.getEntity();
+                        InteractionResult ang9 = this.gameMode.interactAt(this.player, aom8, dei7, anf5);
+                        if (!ang9.consumesAction()) {
+                            ang9 = this.gameMode.interact(this.player, aom8, anf5);
                         }
-                        if (ajl9.consumesAction()) {
-                            if (ajl9.shouldSwing()) {
-                                this.player.swing(ajk5);
+                        if (ang9.consumesAction()) {
+                            if (ang9.shouldSwing()) {
+                                this.player.swing(anf5);
                             }
                             return;
                         }
                         break;
                     }
                     case BLOCK: {
-                        final BlockHitResult cvg10 = (BlockHitResult)this.hitResult;
-                        final int integer11 = ben6.getCount();
-                        final InteractionResult ajl10 = this.gameMode.useItemOn(this.player, this.level, ajk5, cvg10);
-                        if (ajl10.consumesAction()) {
-                            if (ajl10.shouldSwing()) {
-                                this.player.swing(ajk5);
-                                if (!ben6.isEmpty() && (ben6.getCount() != integer11 || this.gameMode.hasInfiniteItems())) {
-                                    this.gameRenderer.itemInHandRenderer.itemUsed(ajk5);
+                        final BlockHitResult deh10 = (BlockHitResult)this.hitResult;
+                        final int integer11 = bki6.getCount();
+                        final InteractionResult ang10 = this.gameMode.useItemOn(this.player, this.level, anf5, deh10);
+                        if (ang10.consumesAction()) {
+                            if (ang10.shouldSwing()) {
+                                this.player.swing(anf5);
+                                if (!bki6.isEmpty() && (bki6.getCount() != integer11 || this.gameMode.hasInfiniteItems())) {
+                                    this.gameRenderer.itemInHandRenderer.itemUsed(anf5);
                                 }
                             }
                             return;
                         }
-                        if (ajl10 == InteractionResult.FAIL) {
+                        if (ang10 == InteractionResult.FAIL) {
                             return;
                         }
                         break;
                     }
                 }
             }
-            if (!ben6.isEmpty()) {
-                final InteractionResult ajl11 = this.gameMode.useItem(this.player, this.level, ajk5);
-                if (ajl11.consumesAction()) {
-                    if (ajl11.shouldSwing()) {
-                        this.player.swing(ajk5);
+            if (!bki6.isEmpty()) {
+                final InteractionResult ang11 = this.gameMode.useItem(this.player, this.level, anf5);
+                if (ang11.consumesAction()) {
+                    if (ang11.shouldSwing()) {
+                        this.player.swing(anf5);
                     }
-                    this.gameRenderer.itemInHandRenderer.itemUsed(ajk5);
+                    this.gameRenderer.itemInHandRenderer.itemUsed(anf5);
                     return;
                 }
             }
@@ -1250,7 +1318,7 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
             this.textureManager.tick();
         }
         if (this.screen == null && this.player != null) {
-            if (this.player.getHealth() <= 0.0f && !(this.screen instanceof DeathScreen)) {
+            if (this.player.isDeadOrDying() && !(this.screen instanceof DeathScreen)) {
                 this.setScreen(null);
             }
             else if (this.player.isSleeping() && this.level != null) {
@@ -1302,21 +1370,20 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         this.soundManager.tick(this.pause);
         if (this.level != null) {
             if (!this.pause) {
-                this.level.setSpawnSettings(this.level.getDifficulty() != Difficulty.PEACEFUL, true);
                 this.tutorial.tick();
                 try {
                     this.level.tick(() -> true);
                 }
                 catch (Throwable throwable2) {
-                    final CrashReport h3 = CrashReport.forThrowable(throwable2, "Exception in world tick");
+                    final CrashReport j3 = CrashReport.forThrowable(throwable2, "Exception in world tick");
                     if (this.level == null) {
-                        final CrashReportCategory i4 = h3.addCategory("Affected level");
-                        i4.setDetail("Problem", "Level is null!");
+                        final CrashReportCategory k4 = j3.addCategory("Affected level");
+                        k4.setDetail("Problem", "Level is null!");
                     }
                     else {
-                        this.level.fillReportDetails(h3);
+                        this.level.fillReportDetails(j3);
                     }
-                    throw new ReportedException(h3);
+                    throw new ReportedException(j3);
                 }
             }
             this.profiler.popPush("animateTick");
@@ -1382,9 +1449,9 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         while (this.options.keyAdvancements.consumeClick()) {
             this.setScreen(new AdvancementsScreen(this.player.connection.getAdvancements()));
         }
-        while (this.options.keySwapHands.consumeClick()) {
+        while (this.options.keySwapOffhand.consumeClick()) {
             if (!this.player.isSpectator()) {
-                this.getConnection().send(new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.SWAP_HELD_ITEMS, BlockPos.ZERO, Direction.DOWN));
+                this.getConnection().send(new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.SWAP_ITEM_WITH_OFFHAND, BlockPos.ZERO, Direction.DOWN));
             }
         }
         while (this.options.keyDrop.consumeClick()) {
@@ -1395,10 +1462,10 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         final boolean boolean5 = this.options.chatVisibility != ChatVisiblity.HIDDEN;
         if (boolean5) {
             while (this.options.keyChat.consumeClick()) {
-                this.setScreen(new ChatScreen(""));
+                this.openChatScreen("");
             }
             if (this.screen == null && this.overlay == null && this.options.keyCommand.consumeClick()) {
-                this.setScreen(new ChatScreen("/"));
+                this.openChatScreen("/");
             }
         }
         if (this.player.isUsingItem()) {
@@ -1426,49 +1493,115 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         this.continueAttack(this.screen == null && this.options.keyAttack.isDown() && this.mouseHandler.isMouseGrabbed());
     }
     
-    public void selectLevel(final String string1, final String string2, @Nullable LevelSettings bka) {
+    public static DataPackConfig loadDataPacks(final LevelStorageSource.LevelStorageAccess a) {
+        MinecraftServer.convertFromRegionFormatIfNeeded(a);
+        final DataPackConfig bpn2 = a.getDataPacks();
+        if (bpn2 == null) {
+            throw new IllegalStateException("Failed to load data pack config");
+        }
+        return bpn2;
+    }
+    
+    public static WorldData loadWorldData(final LevelStorageSource.LevelStorageAccess a, final RegistryAccess.RegistryHolder a, final ResourceManager abc, final DataPackConfig bpn) {
+        final RegistryReadOps<Tag> ue5 = RegistryReadOps.<Tag>create((com.mojang.serialization.DynamicOps<Tag>)NbtOps.INSTANCE, abc, a);
+        final WorldData dal6 = a.getDataTag((DynamicOps<Tag>)ue5, bpn);
+        if (dal6 == null) {
+            throw new IllegalStateException("Failed to load world");
+        }
+        return dal6;
+    }
+    
+    public void loadLevel(final String string) {
+        this.doLoadLevel(string, RegistryAccess.builtin(), Minecraft::loadDataPacks, (Function4<LevelStorageSource.LevelStorageAccess, RegistryAccess.RegistryHolder, ResourceManager, DataPackConfig, WorldData>)Minecraft::loadWorldData, false, ExperimentalDialogType.BACKUP);
+    }
+    
+    public void createLevel(final String string, final LevelSettings bqe, final RegistryAccess.RegistryHolder a, final WorldGenSettings cix) {
+        this.doLoadLevel(string, a, a -> bqe.getDataPackConfig(), (Function4<LevelStorageSource.LevelStorageAccess, RegistryAccess.RegistryHolder, ResourceManager, DataPackConfig, WorldData>)((a, a5, abc, bpn) -> {
+            final RegistryReadOps<JsonElement> ue8 = RegistryReadOps.<JsonElement>create((com.mojang.serialization.DynamicOps<JsonElement>)JsonOps.INSTANCE, abc, a);
+            final DataResult<MappedRegistry<LevelStem>> dataResult9 = ue8.<LevelStem>decodeElements(cix.dimensions(), Registry.LEVEL_STEM_REGISTRY, LevelStem.CODEC);
+            final MappedRegistry<LevelStem> gh10 = dataResult9.resultOrPartial((Consumer)Minecraft.LOGGER::error).orElse(cix.dimensions());
+            return new PrimaryLevelData(bqe, cix.withDimensions(gh10), dataResult9.lifecycle());
+        }), false, ExperimentalDialogType.CREATE);
+    }
+    
+    private void doLoadLevel(final String string, final RegistryAccess.RegistryHolder a, final Function<LevelStorageSource.LevelStorageAccess, DataPackConfig> function, final Function4<LevelStorageSource.LevelStorageAccess, RegistryAccess.RegistryHolder, ResourceManager, DataPackConfig, WorldData> function4, final boolean boolean5, final ExperimentalDialogType a) {
+        LevelStorageSource.LevelStorageAccess a2;
+        try {
+            a2 = this.levelSource.createAccess(string);
+        }
+        catch (IOException iOException9) {
+            Minecraft.LOGGER.warn("Failed to read level {} data", string, iOException9);
+            SystemToast.onWorldAccessFailure(this, string);
+            this.setScreen(null);
+            return;
+        }
+        ServerStem b9;
+        try {
+            b9 = this.makeServerStem(a, function, function4, boolean5, a2);
+        }
+        catch (Exception exception10) {
+            Minecraft.LOGGER.warn("Failed to load datapacks, can't proceed with server load", (Throwable)exception10);
+            this.setScreen(new DatapackLoadFailureScreen(() -> this.doLoadLevel(string, a, function, function4, true, a)));
+            try {
+                a2.close();
+            }
+            catch (IOException iOException10) {
+                Minecraft.LOGGER.warn("Failed to unlock access to level {}", string, iOException10);
+            }
+            return;
+        }
+        final WorldData dal10 = b9.worldData();
+        final boolean boolean6 = dal10.worldGenSettings().isOldCustomizedWorld();
+        final boolean boolean7 = dal10.worldGenSettingsLifecycle() != Lifecycle.stable();
+        if (a != ExperimentalDialogType.NONE && (boolean6 || boolean7)) {
+            this.displayExperimentalConfirmationDialog(a, string, boolean6, () -> this.doLoadLevel(string, a, function, function4, boolean5, ExperimentalDialogType.NONE));
+            b9.close();
+            try {
+                a2.close();
+            }
+            catch (IOException iOException11) {
+                Minecraft.LOGGER.warn("Failed to unlock access to level {}", string, iOException11);
+            }
+            return;
+        }
         this.clearLevel();
-        final LevelStorage crn5 = this.levelSource.selectLevel(string1, null);
-        LevelData crm6 = crn5.prepareLevel();
-        if (crm6 == null && bka != null) {
-            crm6 = new LevelData(bka, string1);
-            crn5.saveLevelData(crm6);
-        }
-        if (bka == null) {
-            bka = new LevelSettings(crm6);
-        }
         this.progressListener.set(null);
         try {
-            final YggdrasilAuthenticationService yggdrasilAuthenticationService7 = new YggdrasilAuthenticationService(this.proxy, UUID.randomUUID().toString());
-            final MinecraftSessionService minecraftSessionService8 = yggdrasilAuthenticationService7.createMinecraftSessionService();
-            final GameProfileRepository gameProfileRepository9 = yggdrasilAuthenticationService7.createProfileRepository();
-            final GameProfileCache zk10 = new GameProfileCache(gameProfileRepository9, new File(this.gameDirectory, MinecraftServer.USERID_CACHE_FILE.getName()));
-            SkullBlockEntity.setProfileCache(zk10);
-            SkullBlockEntity.setSessionService(minecraftSessionService8);
+            a2.saveDataTag(a, dal10);
+            b9.serverResources().updateGlobals();
+            final YggdrasilAuthenticationService yggdrasilAuthenticationService13 = new YggdrasilAuthenticationService(this.proxy, UUID.randomUUID().toString());
+            final MinecraftSessionService minecraftSessionService14 = yggdrasilAuthenticationService13.createMinecraftSessionService();
+            final GameProfileRepository gameProfileRepository15 = yggdrasilAuthenticationService13.createProfileRepository();
+            final GameProfileCache abl16 = new GameProfileCache(gameProfileRepository15, new File(this.gameDirectory, MinecraftServer.USERID_CACHE_FILE.getName()));
+            SkullBlockEntity.setProfileCache(abl16);
+            SkullBlockEntity.setSessionService(minecraftSessionService14);
             GameProfileCache.setUsesAuthentication(false);
-            final StoringChunkProgressListener xq3;
-            (this.singleplayerServer = new IntegratedServer(this, string1, string2, bka, yggdrasilAuthenticationService7, minecraftSessionService8, gameProfileRepository9, zk10, integer -> {
-                xq3 = new StoringChunkProgressListener(integer + 0);
-                xq3.start();
-                this.progressListener.set(xq3);
-                return new ProcessorChunkProgressListener(xq3, this.progressTasks::add);
-            })).forkAndRun();
+            final LevelStorageSource.LevelStorageAccess a3;
+            final ServerStem serverStem;
+            final StoringChunkProgressListener zq3;
+            this.singleplayerServer = MinecraftServer.<IntegratedServer>spin(thread -> new IntegratedServer(thread, this, a, a3, serverStem.packRepository(), serverStem.serverResources(), dal10, minecraftSessionService14, gameProfileRepository15, abl16, integer -> {
+                zq3 = new StoringChunkProgressListener(integer + 0);
+                zq3.start();
+                this.progressListener.set(zq3);
+                return new ProcessorChunkProgressListener(zq3, this.progressTasks::add);
+            }));
             this.isLocalServer = true;
         }
-        catch (Throwable throwable7) {
-            final CrashReport h8 = CrashReport.forThrowable(throwable7, "Starting integrated server");
-            final CrashReportCategory i9 = h8.addCategory("Starting integrated server");
-            i9.setDetail("Level ID", string1);
-            i9.setDetail("Level Name", string2);
-            throw new ReportedException(h8);
+        catch (Throwable throwable13) {
+            final CrashReport j14 = CrashReport.forThrowable(throwable13, "Starting integrated server");
+            final CrashReportCategory k15 = j14.addCategory("Starting integrated server");
+            k15.setDetail("Level ID", string);
+            k15.setDetail("Level Name", dal10.getLevelName());
+            throw new ReportedException(j14);
         }
         while (this.progressListener.get() == null) {
             Thread.yield();
         }
-        final LevelLoadingScreen dfp7 = new LevelLoadingScreen(this.progressListener.get());
-        this.setScreen(dfp7);
+        final LevelLoadingScreen dqe13 = new LevelLoadingScreen(this.progressListener.get());
+        this.setScreen(dqe13);
+        this.profiler.push("waitForServer");
         while (!this.singleplayerServer.isReady()) {
-            dfp7.tick();
+            dqe13.tick();
             this.runTick(false);
             try {
                 Thread.sleep(16L);
@@ -1479,25 +1612,83 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
                 return;
             }
         }
-        final SocketAddress socketAddress8 = this.singleplayerServer.getConnection().startMemoryChannel();
-        final Connection kt9 = Connection.connectToLocalServer(socketAddress8);
-        kt9.setListener(new ClientHandshakePacketListenerImpl(kt9, this, null, lf -> {}));
-        kt9.send(new ClientIntentionPacket(socketAddress8.toString(), 0, ConnectionProtocol.LOGIN));
-        kt9.send(new ServerboundHelloPacket(this.getUser().getGameProfile()));
-        this.pendingConnection = kt9;
+        this.profiler.pop();
+        final SocketAddress socketAddress14 = this.singleplayerServer.getConnection().startMemoryChannel();
+        final Connection me15 = Connection.connectToLocalServer(socketAddress14);
+        me15.setListener(new ClientHandshakePacketListenerImpl(me15, this, null, mr -> {}));
+        me15.send(new ClientIntentionPacket(socketAddress14.toString(), 0, ConnectionProtocol.LOGIN));
+        me15.send(new ServerboundHelloPacket(this.getUser().getGameProfile()));
+        this.pendingConnection = me15;
     }
     
-    public void setLevel(final ClientLevel dno) {
-        final ProgressScreen dfz3 = new ProgressScreen();
-        dfz3.progressStartNoAbort(new TranslatableComponent("connect.joining", new Object[0]));
-        this.updateScreenAndTick(dfz3);
-        this.updateLevelInEngines(this.level = dno);
+    private void displayExperimentalConfirmationDialog(final ExperimentalDialogType a, final String string, final boolean boolean3, final Runnable runnable) {
+        if (a == ExperimentalDialogType.BACKUP) {
+            Component mr6;
+            Component mr7;
+            if (boolean3) {
+                mr6 = new TranslatableComponent("selectWorld.backupQuestion.customized");
+                mr7 = new TranslatableComponent("selectWorld.backupWarning.customized");
+            }
+            else {
+                mr6 = new TranslatableComponent("selectWorld.backupQuestion.experimental");
+                mr7 = new TranslatableComponent("selectWorld.backupWarning.experimental");
+            }
+            this.setScreen(new BackupConfirmScreen(null, (boolean3, boolean4) -> {
+                if (boolean3) {
+                    EditWorldScreen.makeBackupAndShowToast(this.levelSource, string);
+                }
+                runnable.run();
+            }, mr6, mr7, false));
+        }
+        else {
+            this.setScreen(new ConfirmScreen(boolean3 -> {
+                if (boolean3) {
+                    runnable.run();
+                }
+                else {
+                    this.setScreen(null);
+                    try (final LevelStorageSource.LevelStorageAccess a5 = this.levelSource.createAccess(string)) {
+                        a5.deleteLevel();
+                    }
+                    catch (IOException iOException5) {
+                        SystemToast.onWorldDeleteFailure(this, string);
+                        Minecraft.LOGGER.error("Failed to delete world {}", string, iOException5);
+                    }
+                }
+            }, new TranslatableComponent("selectWorld.backupQuestion.experimental"), new TranslatableComponent("selectWorld.backupWarning.experimental"), CommonComponents.GUI_PROCEED, CommonComponents.GUI_CANCEL));
+        }
+    }
+    
+    public ServerStem makeServerStem(final RegistryAccess.RegistryHolder a, final Function<LevelStorageSource.LevelStorageAccess, DataPackConfig> function, final Function4<LevelStorageSource.LevelStorageAccess, RegistryAccess.RegistryHolder, ResourceManager, DataPackConfig, WorldData> function4, final boolean boolean4, final LevelStorageSource.LevelStorageAccess a) throws InterruptedException, ExecutionException {
+        final DataPackConfig bpn7 = function.apply(a);
+        final PackRepository<Pack> aar8 = new PackRepository<Pack>(Pack::new, new RepositorySource[] { new ServerPacksSource(), new FolderRepositorySource(a.getLevelPath(LevelResource.DATAPACK_DIR).toFile(), PackSource.WORLD) });
+        try {
+            final DataPackConfig bpn8 = MinecraftServer.configurePackRepository(aar8, bpn7, boolean4);
+            final CompletableFuture<ServerResources> completableFuture10 = ServerResources.loadResources(aar8.openAllSelected(), Commands.CommandSelection.INTEGRATED, 2, Util.backgroundExecutor(), this);
+            this.managedBlock(completableFuture10::isDone);
+            final ServerResources uw11 = completableFuture10.get();
+            final WorldData dal12 = (WorldData)function4.apply(a, a, uw11.getResourceManager(), bpn8);
+            return new ServerStem((PackRepository)aar8, uw11, dal12);
+        }
+        catch (InterruptedException | ExecutionException ex2) {
+            final Exception ex;
+            final Exception exception9 = ex;
+            aar8.close();
+            throw exception9;
+        }
+    }
+    
+    public void setLevel(final ClientLevel dym) {
+        final ProgressScreen dqp3 = new ProgressScreen();
+        dqp3.progressStartNoAbort(new TranslatableComponent("connect.joining"));
+        this.updateScreenAndTick(dqp3);
+        this.updateLevelInEngines(this.level = dym);
         if (!this.isLocalServer) {
             final AuthenticationService authenticationService4 = (AuthenticationService)new YggdrasilAuthenticationService(this.proxy, UUID.randomUUID().toString());
             final MinecraftSessionService minecraftSessionService5 = authenticationService4.createMinecraftSessionService();
             final GameProfileRepository gameProfileRepository6 = authenticationService4.createProfileRepository();
-            final GameProfileCache zk7 = new GameProfileCache(gameProfileRepository6, new File(this.gameDirectory, MinecraftServer.USERID_CACHE_FILE.getName()));
-            SkullBlockEntity.setProfileCache(zk7);
+            final GameProfileCache abl7 = new GameProfileCache(gameProfileRepository6, new File(this.gameDirectory, MinecraftServer.USERID_CACHE_FILE.getName()));
+            SkullBlockEntity.setProfileCache(abl7);
             SkullBlockEntity.setSessionService(minecraftSessionService5);
             GameProfileCache.setUsesAuthentication(false);
         }
@@ -1507,23 +1698,25 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         this.clearLevel(new ProgressScreen());
     }
     
-    public void clearLevel(final Screen dgb) {
-        final ClientPacketListener dnp3 = this.getConnection();
-        if (dnp3 != null) {
+    public void clearLevel(final Screen dqs) {
+        final ClientPacketListener dyn3 = this.getConnection();
+        if (dyn3 != null) {
             this.dropAllTasks();
-            dnp3.cleanup();
+            dyn3.cleanup();
         }
-        final IntegratedServer edm4 = this.singleplayerServer;
+        final IntegratedServer eoz4 = this.singleplayerServer;
         this.singleplayerServer = null;
         this.gameRenderer.resetData();
         this.gameMode = null;
         NarratorChatListener.INSTANCE.clear();
-        this.updateScreenAndTick(dgb);
+        this.updateScreenAndTick(dqs);
         if (this.level != null) {
-            if (edm4 != null) {
-                while (!edm4.isShutdown()) {
+            if (eoz4 != null) {
+                this.profiler.push("waitForServer");
+                while (!eoz4.isShutdown()) {
                     this.runTick(false);
                 }
+                this.profiler.pop();
             }
             this.clientPackSource.clearServerPack();
             this.gui.onDisconnected();
@@ -1535,22 +1728,42 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         this.player = null;
     }
     
-    private void updateScreenAndTick(final Screen dgb) {
-        this.musicManager.stopPlaying();
+    private void updateScreenAndTick(final Screen dqs) {
+        this.profiler.push("forcedTick");
         this.soundManager.stop();
         this.cameraEntity = null;
         this.pendingConnection = null;
-        this.setScreen(dgb);
+        this.setScreen(dqs);
         this.runTick(false);
+        this.profiler.pop();
     }
     
-    private void updateLevelInEngines(@Nullable final ClientLevel dno) {
-        this.levelRenderer.setLevel(dno);
-        this.particleEngine.setLevel(dno);
-        BlockEntityRenderDispatcher.instance.setLevel(dno);
+    public void forceSetScreen(final Screen dqs) {
+        this.profiler.push("forcedTick");
+        this.setScreen(dqs);
+        this.runTick(false);
+        this.profiler.pop();
+    }
+    
+    private void updateLevelInEngines(@Nullable final ClientLevel dym) {
+        this.levelRenderer.setLevel(dym);
+        this.particleEngine.setLevel(dym);
+        BlockEntityRenderDispatcher.instance.setLevel(dym);
         this.updateTitle();
     }
     
+    public boolean allowsMultiplayer() {
+        return this.allowsMultiplayer;
+    }
+    
+    public boolean isBlocked(final UUID uUID) {
+        return !this.allowsChat() && (this.player == null || !uUID.equals(this.player.getUUID())) && !uUID.equals(Util.NIL_UUID);
+    }
+    
+    public boolean allowsChat() {
+        return this.allowsChat;
+    }
+    
     public final boolean isDemo() {
         return this.demo;
     }
@@ -1565,7 +1778,11 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
     }
     
     public static boolean useFancyGraphics() {
-        return Minecraft.instance.options.fancyGraphics;
+        return Minecraft.instance.options.graphicsMode.getId() >= GraphicsStatus.FANCY.getId();
+    }
+    
+    public static boolean useShaderTransparency() {
+        return Minecraft.instance.options.graphicsMode.getId() >= GraphicsStatus.FABULOUS.getId();
     }
     
     public static boolean useAmbientOcclusion() {
@@ -1577,94 +1794,94 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
             return;
         }
         final boolean boolean2 = this.player.abilities.instabuild;
-        BlockEntity bwl3 = null;
+        BlockEntity cdl3 = null;
         final HitResult.Type a5 = this.hitResult.getType();
-        ItemStack ben4;
+        ItemStack bki4;
         if (a5 == HitResult.Type.BLOCK) {
-            final BlockPos fk6 = ((BlockHitResult)this.hitResult).getBlockPos();
-            final BlockState byj7 = this.level.getBlockState(fk6);
-            final Block bph8 = byj7.getBlock();
-            if (byj7.isAir()) {
+            final BlockPos fu6 = ((BlockHitResult)this.hitResult).getBlockPos();
+            final BlockState cfj7 = this.level.getBlockState(fu6);
+            final Block bvr8 = cfj7.getBlock();
+            if (cfj7.isAir()) {
                 return;
             }
-            ben4 = bph8.getCloneItemStack(this.level, fk6, byj7);
-            if (ben4.isEmpty()) {
+            bki4 = bvr8.getCloneItemStack(this.level, fu6, cfj7);
+            if (bki4.isEmpty()) {
                 return;
             }
-            if (boolean2 && Screen.hasControlDown() && bph8.isEntityBlock()) {
-                bwl3 = this.level.getBlockEntity(fk6);
+            if (boolean2 && Screen.hasControlDown() && bvr8.isEntityBlock()) {
+                cdl3 = this.level.getBlockEntity(fu6);
             }
         }
         else {
             if (a5 != HitResult.Type.ENTITY || !boolean2) {
                 return;
             }
-            final Entity akq6 = ((EntityHitResult)this.hitResult).getEntity();
-            if (akq6 instanceof Painting) {
-                ben4 = new ItemStack(Items.PAINTING);
+            final Entity aom6 = ((EntityHitResult)this.hitResult).getEntity();
+            if (aom6 instanceof Painting) {
+                bki4 = new ItemStack(Items.PAINTING);
             }
-            else if (akq6 instanceof LeashFenceKnotEntity) {
-                ben4 = new ItemStack(Items.LEAD);
+            else if (aom6 instanceof LeashFenceKnotEntity) {
+                bki4 = new ItemStack(Items.LEAD);
             }
-            else if (akq6 instanceof ItemFrame) {
-                final ItemFrame avr7 = (ItemFrame)akq6;
-                final ItemStack ben5 = avr7.getItem();
-                if (ben5.isEmpty()) {
-                    ben4 = new ItemStack(Items.ITEM_FRAME);
+            else if (aom6 instanceof ItemFrame) {
+                final ItemFrame bba7 = (ItemFrame)aom6;
+                final ItemStack bki5 = bba7.getItem();
+                if (bki5.isEmpty()) {
+                    bki4 = new ItemStack(Items.ITEM_FRAME);
                 }
                 else {
-                    ben4 = ben5.copy();
+                    bki4 = bki5.copy();
                 }
             }
-            else if (akq6 instanceof AbstractMinecart) {
-                final AbstractMinecart azx7 = (AbstractMinecart)akq6;
-                Item bei8 = null;
-                switch (azx7.getMinecartType()) {
+            else if (aom6 instanceof AbstractMinecart) {
+                final AbstractMinecart bfr7 = (AbstractMinecart)aom6;
+                Item bke8 = null;
+                switch (bfr7.getMinecartType()) {
                     case FURNACE: {
-                        bei8 = Items.FURNACE_MINECART;
+                        bke8 = Items.FURNACE_MINECART;
                         break;
                     }
                     case CHEST: {
-                        bei8 = Items.CHEST_MINECART;
+                        bke8 = Items.CHEST_MINECART;
                         break;
                     }
                     case TNT: {
-                        bei8 = Items.TNT_MINECART;
+                        bke8 = Items.TNT_MINECART;
                         break;
                     }
                     case HOPPER: {
-                        bei8 = Items.HOPPER_MINECART;
+                        bke8 = Items.HOPPER_MINECART;
                         break;
                     }
                     case COMMAND_BLOCK: {
-                        bei8 = Items.COMMAND_BLOCK_MINECART;
+                        bke8 = Items.COMMAND_BLOCK_MINECART;
                         break;
                     }
                     default: {
-                        bei8 = Items.MINECART;
+                        bke8 = Items.MINECART;
                         break;
                     }
                 }
-                ben4 = new ItemStack(bei8);
+                bki4 = new ItemStack(bke8);
             }
-            else if (akq6 instanceof Boat) {
-                ben4 = new ItemStack(((Boat)akq6).getDropItem());
+            else if (aom6 instanceof Boat) {
+                bki4 = new ItemStack(((Boat)aom6).getDropItem());
             }
-            else if (akq6 instanceof ArmorStand) {
-                ben4 = new ItemStack(Items.ARMOR_STAND);
+            else if (aom6 instanceof ArmorStand) {
+                bki4 = new ItemStack(Items.ARMOR_STAND);
             }
-            else if (akq6 instanceof EndCrystal) {
-                ben4 = new ItemStack(Items.END_CRYSTAL);
+            else if (aom6 instanceof EndCrystal) {
+                bki4 = new ItemStack(Items.END_CRYSTAL);
             }
             else {
-                final SpawnEggItem bfl7 = SpawnEggItem.byId(akq6.getType());
-                if (bfl7 == null) {
+                final SpawnEggItem blh7 = SpawnEggItem.byId(aom6.getType());
+                if (blh7 == null) {
                     return;
                 }
-                ben4 = new ItemStack(bfl7);
+                bki4 = new ItemStack(blh7);
             }
         }
-        if (ben4.isEmpty()) {
+        if (bki4.isEmpty()) {
             String string6 = "";
             if (a5 == HitResult.Type.BLOCK) {
                 string6 = Registry.BLOCK.getKey(this.level.getBlockState(((BlockHitResult)this.hitResult).getBlockPos()).getBlock()).toString();
@@ -1675,18 +1892,18 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
             Minecraft.LOGGER.warn("Picking on: [{}] {} gave null item", a5, string6);
             return;
         }
-        final Inventory ayi6 = this.player.inventory;
-        if (bwl3 != null) {
-            this.addCustomNbtData(ben4, bwl3);
+        final Inventory beb6 = this.player.inventory;
+        if (cdl3 != null) {
+            this.addCustomNbtData(bki4, cdl3);
         }
-        final int integer7 = ayi6.findSlotMatchingItem(ben4);
+        final int integer7 = beb6.findSlotMatchingItem(bki4);
         if (boolean2) {
-            ayi6.setPickedItem(ben4);
-            this.gameMode.handleCreativeModeItemAdd(this.player.getItemInHand(InteractionHand.MAIN_HAND), 36 + ayi6.selected);
+            beb6.setPickedItem(bki4);
+            this.gameMode.handleCreativeModeItemAdd(this.player.getItemInHand(InteractionHand.MAIN_HAND), 36 + beb6.selected);
         }
         else if (integer7 != -1) {
             if (Inventory.isHotbarSlot(integer7)) {
-                ayi6.selected = integer7;
+                beb6.selected = integer7;
             }
             else {
                 this.gameMode.handlePickItem(integer7);
@@ -1694,39 +1911,39 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         }
     }
     
-    private ItemStack addCustomNbtData(final ItemStack ben, final BlockEntity bwl) {
-        final CompoundTag jt4 = bwl.save(new CompoundTag());
-        if (ben.getItem() instanceof PlayerHeadItem && jt4.contains("Owner")) {
-            final CompoundTag jt5 = jt4.getCompound("Owner");
-            ben.getOrCreateTag().put("SkullOwner", jt5);
-            return ben;
+    private ItemStack addCustomNbtData(final ItemStack bki, final BlockEntity cdl) {
+        final CompoundTag le4 = cdl.save(new CompoundTag());
+        if (bki.getItem() instanceof PlayerHeadItem && le4.contains("SkullOwner")) {
+            final CompoundTag le5 = le4.getCompound("SkullOwner");
+            bki.getOrCreateTag().put("SkullOwner", le5);
+            return bki;
         }
-        ben.addTagElement("BlockEntityTag", jt4);
-        final CompoundTag jt5 = new CompoundTag();
-        final ListTag jz6 = new ListTag();
-        ((AbstractList<StringTag>)jz6).add(StringTag.valueOf("\"(+NBT)\""));
-        jt5.put("Lore", jz6);
-        ben.addTagElement("display", jt5);
-        return ben;
+        bki.addTagElement("BlockEntityTag", le4);
+        final CompoundTag le5 = new CompoundTag();
+        final ListTag lk6 = new ListTag();
+        ((AbstractList<StringTag>)lk6).add(StringTag.valueOf("\"(+NBT)\""));
+        le5.put("Lore", lk6);
+        bki.addTagElement("display", le5);
+        return bki;
     }
     
-    public CrashReport fillReport(final CrashReport h) {
-        fillReport(this.languageManager, this.launchedVersion, this.options, h);
+    public CrashReport fillReport(final CrashReport j) {
+        fillReport(this.languageManager, this.launchedVersion, this.options, j);
         if (this.level != null) {
-            this.level.fillReportDetails(h);
+            this.level.fillReportDetails(j);
         }
-        return h;
+        return j;
     }
     
-    public static void fillReport(@Nullable final LanguageManager ebf, final String string, @Nullable final Options dbr, final CrashReport h) {
-        final CrashReportCategory i5 = h.getSystemDetails();
-        i5.setDetail("Launched Version", () -> string);
-        i5.setDetail("Backend library", RenderSystem::getBackendDescription);
-        i5.setDetail("Backend API", RenderSystem::getApiDescription);
-        i5.setDetail("GL Caps", RenderSystem::getCapsString);
-        i5.setDetail("Using VBOs", () -> "Yes");
+    public static void fillReport(@Nullable final LanguageManager ems, final String string, @Nullable final Options dmb, final CrashReport j) {
+        final CrashReportCategory k5 = j.getSystemDetails();
+        k5.setDetail("Launched Version", () -> string);
+        k5.setDetail("Backend library", RenderSystem::getBackendDescription);
+        k5.setDetail("Backend API", RenderSystem::getApiDescription);
+        k5.setDetail("GL Caps", RenderSystem::getCapsString);
+        k5.setDetail("Using VBOs", () -> "Yes");
         final String string2;
-        i5.setDetail("Is Modded", () -> {
+        k5.setDetail("Is Modded", () -> {
             string2 = ClientBrandRetriever.getClientModName();
             if (!"vanilla".equals(string2)) {
                 return "Definitely; Client brand changed to '" + string2 + "'";
@@ -1738,31 +1955,31 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
                 return "Probably not. Jar signature remains and client brand is untouched.";
             }
         });
-        i5.setDetail("Type", "Client (map_client.txt)");
-        if (dbr != null) {
+        k5.setDetail("Type", "Client (map_client.txt)");
+        if (dmb != null) {
             final StringBuilder stringBuilder2;
             final Iterator<String> iterator;
             String string3;
-            i5.setDetail("Resource Packs", () -> {
+            k5.setDetail("Resource Packs", () -> {
                 stringBuilder2 = new StringBuilder();
-                dbr.resourcePacks.iterator();
+                dmb.resourcePacks.iterator();
                 while (iterator.hasNext()) {
                     string3 = iterator.next();
                     if (stringBuilder2.length() > 0) {
                         stringBuilder2.append(", ");
                     }
                     stringBuilder2.append(string3);
-                    if (dbr.incompatibleResourcePacks.contains(string3)) {
+                    if (dmb.incompatibleResourcePacks.contains(string3)) {
                         stringBuilder2.append(" (incompatible)");
                     }
                 }
                 return stringBuilder2.toString();
             });
         }
-        if (ebf != null) {
-            i5.setDetail("Current Language", () -> ebf.getSelected().toString());
+        if (ems != null) {
+            k5.setDetail("Current Language", () -> ems.getSelected().toString());
         }
-        i5.setDetail("CPU", GlUtil::getCpuInfo);
+        k5.setDetail("CPU", GlUtil::getCpuInfo);
     }
     
     public static Minecraft getInstance() {
@@ -1774,27 +1991,27 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
     }
     
     @Override
-    public void populateSnooper(final Snooper ajs) {
-        ajs.setDynamicData("fps", Minecraft.fps);
-        ajs.setDynamicData("vsync_enabled", this.options.enableVsync);
-        ajs.setDynamicData("display_frequency", this.window.getRefreshRate());
-        ajs.setDynamicData("display_type", this.window.isFullscreen() ? "fullscreen" : "windowed");
-        ajs.setDynamicData("run_time", (Util.getMillis() - ajs.getStartupTime()) / 60L * 1000L);
-        ajs.setDynamicData("current_action", this.getCurrentSnooperAction());
-        ajs.setDynamicData("language", (this.options.languageCode == null) ? "en_us" : this.options.languageCode);
+    public void populateSnooper(final Snooper ano) {
+        ano.setDynamicData("fps", Minecraft.fps);
+        ano.setDynamicData("vsync_enabled", this.options.enableVsync);
+        ano.setDynamicData("display_frequency", this.window.getRefreshRate());
+        ano.setDynamicData("display_type", this.window.isFullscreen() ? "fullscreen" : "windowed");
+        ano.setDynamicData("run_time", (Util.getMillis() - ano.getStartupTime()) / 60L * 1000L);
+        ano.setDynamicData("current_action", this.getCurrentSnooperAction());
+        ano.setDynamicData("language", (this.options.languageCode == null) ? "en_us" : this.options.languageCode);
         final String string3 = (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) ? "little" : "big";
-        ajs.setDynamicData("endianness", string3);
-        ajs.setDynamicData("subtitles", this.options.showSubtitles);
-        ajs.setDynamicData("touch", this.options.touchscreen ? "touch" : "mouse");
+        ano.setDynamicData("endianness", string3);
+        ano.setDynamicData("subtitles", this.options.showSubtitles);
+        ano.setDynamicData("touch", this.options.touchscreen ? "touch" : "mouse");
         int integer4 = 0;
-        for (final UnopenedResourcePack ebc6 : this.resourcePackRepository.getSelected()) {
-            if (!ebc6.isRequired() && !ebc6.isFixedPosition()) {
-                ajs.setDynamicData("resource_pack[" + integer4++ + "]", ebc6.getId());
+        for (final ResourcePack eml6 : this.resourcePackRepository.getSelectedPacks()) {
+            if (!eml6.isRequired() && !eml6.isFixedPosition()) {
+                ano.setDynamicData("resource_pack[" + integer4++ + "]", eml6.getId());
             }
         }
-        ajs.setDynamicData("resource_packs", integer4);
+        ano.setDynamicData("resource_packs", integer4);
         if (this.singleplayerServer != null) {
-            ajs.setDynamicData("snooper_partner", this.singleplayerServer.getSnooper().getToken());
+            ano.setDynamicData("snooper_partner", this.singleplayerServer.getSnooper().getToken());
         }
     }
     
@@ -1816,8 +2033,8 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         }
     }
     
-    public void setCurrentServer(@Nullable final ServerData dnu) {
-        this.currentServer = dnu;
+    public void setCurrentServer(@Nullable final ServerData dys) {
+        this.currentServer = dys;
     }
     
     @Nullable
@@ -1866,7 +2083,7 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         return this.resourceManager;
     }
     
-    public PackRepository<UnopenedResourcePack> getResourcePackRepository() {
+    public PackRepository<ResourcePack> getResourcePackRepository() {
         return this.resourcePackRepository;
     }
     
@@ -1882,8 +2099,8 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         return this.languageManager;
     }
     
-    public Function<ResourceLocation, TextureAtlasSprite> getTextureAtlas(final ResourceLocation sm) {
-        return this.modelManager.getAtlas(sm)::getSprite;
+    public Function<ResourceLocation, TextureAtlasSprite> getTextureAtlas(final ResourceLocation uh) {
+        return this.modelManager.getAtlas(uh)::getSprite;
     }
     
     public boolean is64Bit() {
@@ -1894,35 +2111,36 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         return this.pause;
     }
     
+    public GpuWarnlistManager getGpuWarnlistManager() {
+        return this.gpuWarnlistManager;
+    }
+    
     public SoundManager getSoundManager() {
         return this.soundManager;
     }
     
-    public MusicManager.Music getSituationalMusic() {
+    public Music getSituationalMusic() {
         if (this.screen instanceof WinScreen) {
-            return MusicManager.Music.CREDITS;
+            return Musics.CREDITS;
         }
         if (this.player == null) {
-            return MusicManager.Music.MENU;
+            return Musics.MENU;
         }
-        if (this.player.level.dimension instanceof NetherDimension) {
-            return MusicManager.Music.NETHER;
-        }
-        if (this.player.level.dimension instanceof TheEndDimension) {
+        if (this.player.level.dimension() == Level.END) {
             if (this.gui.getBossOverlay().shouldPlayMusic()) {
-                return MusicManager.Music.END_BOSS;
+                return Musics.END_BOSS;
             }
-            return MusicManager.Music.END;
+            return Musics.END;
         }
         else {
-            final Biome.BiomeCategory b2 = this.player.level.getBiome(new BlockPos(this.player)).getBiomeCategory();
-            if (this.musicManager.isPlayingMusic(MusicManager.Music.UNDER_WATER) || (this.player.isUnderWater() && !this.musicManager.isPlayingMusic(MusicManager.Music.GAME) && (b2 == Biome.BiomeCategory.OCEAN || b2 == Biome.BiomeCategory.RIVER))) {
-                return MusicManager.Music.UNDER_WATER;
+            final Biome.BiomeCategory b2 = this.player.level.getBiome(this.player.blockPosition()).getBiomeCategory();
+            if (this.musicManager.isPlayingMusic(Musics.UNDER_WATER) || (this.player.isUnderWater() && (b2 == Biome.BiomeCategory.OCEAN || b2 == Biome.BiomeCategory.RIVER))) {
+                return Musics.UNDER_WATER;
             }
-            if (this.player.abilities.instabuild && this.player.abilities.mayfly) {
-                return MusicManager.Music.CREATIVE;
+            if (this.player.level.dimension() != Level.NETHER && this.player.abilities.instabuild && this.player.abilities.mayfly) {
+                return Musics.CREATIVE;
             }
-            return MusicManager.Music.GAME;
+            return this.level.getBiomeManager().getNoiseBiomeAtPosition(this.player.blockPosition()).getBackgroundMusic().orElse(Musics.GAME);
         }
     }
     
@@ -1939,9 +2157,13 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         return this.cameraEntity;
     }
     
-    public void setCameraEntity(final Entity akq) {
-        this.cameraEntity = akq;
-        this.gameRenderer.checkEntityPostEffect(akq);
+    public void setCameraEntity(final Entity aom) {
+        this.cameraEntity = aom;
+        this.gameRenderer.checkEntityPostEffect(aom);
+    }
+    
+    public boolean shouldEntityAppearGlowing(final Entity aom) {
+        return aom.isGlowing() || (this.player != null && this.player.isSpectator() && this.options.keySpectatorOutlines.isDown() && aom.getType() == EntityType.PLAYER);
     }
     
     @Override
@@ -2031,10 +2253,6 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         return this.modelManager;
     }
     
-    public FontManager getFontManager() {
-        return this.fontManager;
-    }
-    
     public PaintingTextureManager getPaintingTextures() {
         return this.paintingTextures;
     }
@@ -2077,24 +2295,24 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         return this.renderBuffers;
     }
     
-    private static UnopenedResourcePack createClientPackAdapter(final String string, final boolean boolean2, final Supplier<Pack> supplier, final Pack ye, final PackMetadataSection yj, final UnopenedPack.Position a) {
-        final int integer7 = yj.getPackFormat();
-        Supplier<Pack> supplier2 = supplier;
-        if (integer7 <= 3) {
+    private static ResourcePack createClientPackAdapter(final String string, final boolean boolean2, final Supplier<PackResources> supplier, final PackResources aae, final PackMetadataSection aaj, final Pack.Position b, final PackSource aas) {
+        final int integer8 = aaj.getPackFormat();
+        Supplier<PackResources> supplier2 = supplier;
+        if (integer8 <= 3) {
             supplier2 = adaptV3(supplier2);
         }
-        if (integer7 <= 4) {
+        if (integer8 <= 4) {
             supplier2 = adaptV4(supplier2);
         }
-        return new UnopenedResourcePack(string, boolean2, supplier2, ye, yj, a);
+        return new ResourcePack(string, boolean2, supplier2, aae, aaj, b, aas);
     }
     
-    private static Supplier<Pack> adaptV3(final Supplier<Pack> supplier) {
-        return (Supplier<Pack>)(() -> new LegacyResourcePackAdapter(supplier.get(), LegacyResourcePackAdapter.V3));
+    private static Supplier<PackResources> adaptV3(final Supplier<PackResources> supplier) {
+        return (Supplier<PackResources>)(() -> new LegacyPackResourcesAdapter(supplier.get(), LegacyPackResourcesAdapter.V3));
     }
     
-    private static Supplier<Pack> adaptV4(final Supplier<Pack> supplier) {
-        return (Supplier<Pack>)(() -> new PackAdapterV4(supplier.get()));
+    private static Supplier<PackResources> adaptV4(final Supplier<PackResources> supplier) {
+        return (Supplier<PackResources>)(() -> new PackResourcesAdapterV4(supplier.get()));
     }
     
     public void updateMaxMipLevel(final int integer) {
@@ -2105,8 +2323,45 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
         LOGGER = LogManager.getLogger();
         ON_OSX = (Util.getPlatform() == Util.OS.OSX);
         DEFAULT_FONT = new ResourceLocation("default");
+        UNIFORM_FONT = new ResourceLocation("uniform");
         ALT_FONT = new ResourceLocation("alt");
         RESOURCE_RELOAD_INITIAL_TASK = CompletableFuture.<Unit>completedFuture(Unit.INSTANCE);
         Minecraft.reserve = new byte[10485760];
     }
+    
+    enum ExperimentalDialogType {
+        NONE, 
+        CREATE, 
+        BACKUP;
+    }
+    
+    public static final class ServerStem implements AutoCloseable {
+        private final PackRepository<Pack> packRepository;
+        private final ServerResources serverResources;
+        private final WorldData worldData;
+        
+        private ServerStem(final PackRepository<Pack> aar, final ServerResources uw, final WorldData dal) {
+            this.packRepository = aar;
+            this.serverResources = uw;
+            this.worldData = dal;
+        }
+        
+        public PackRepository<Pack> packRepository() {
+            return this.packRepository;
+        }
+        
+        public ServerResources serverResources() {
+            return this.serverResources;
+        }
+        
+        public WorldData worldData() {
+            return this.worldData;
+        }
+        
+        @Override
+        public void close() {
+            this.packRepository.close();
+            this.serverResources.close();
+        }
+    }
 }
diff --git a/src/net/minecraft/client/MouseHandler.java b/src/net/minecraft/client/MouseHandler.java
index ffa3ffb..f9c540b 100644
--- a/src/net/minecraft/client/MouseHandler.java
+++ b/src/net/minecraft/client/MouseHandler.java
@@ -1,6 +1,11 @@
 package net.minecraft.client;
 
+import java.util.Arrays;
+import java.nio.file.Paths;
+import org.lwjgl.glfw.GLFWDropCallback;
 import net.minecraft.client.gui.components.events.GuiEventListener;
+import java.nio.file.Path;
+import java.util.List;
 import net.minecraft.util.Mth;
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.gui.screens.Screen;
@@ -27,13 +32,13 @@ public class MouseHandler {
     private double lastMouseEventTime;
     private boolean mouseGrabbed;
     
-    public MouseHandler(final Minecraft dbn) {
+    public MouseHandler(final Minecraft dlx) {
         this.activeButton = -1;
         this.ignoreFirstMove = true;
         this.smoothTurnX = new SmoothDouble();
         this.smoothTurnY = new SmoothDouble();
         this.lastMouseEventTime = Double.MIN_VALUE;
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
     private void onPress(final long long1, int integer2, final int integer3, final int integer4) {
@@ -143,8 +148,20 @@ public class MouseHandler {
         }
     }
     
+    private void onDrop(final long long1, final List<Path> list) {
+        if (this.minecraft.screen != null) {
+            this.minecraft.screen.onFilesDrop(list);
+        }
+    }
+    
     public void setup(final long long1) {
-        InputConstants.setupMouseCallbacks(long1, (long1, double2, double3) -> this.minecraft.execute(() -> this.onMove(long1, double2, double3)), (long1, integer2, integer3, integer4) -> this.minecraft.execute(() -> this.onPress(long1, integer2, integer3, integer4)), (long1, double2, double3) -> this.minecraft.execute(() -> this.onScroll(long1, double2, double3)));
+        InputConstants.setupMouseCallbacks(long1, (long1, double2, double3) -> this.minecraft.execute(() -> this.onMove(long1, double2, double3)), (long1, integer2, integer3, integer4) -> this.minecraft.execute(() -> this.onPress(long1, integer2, integer3, integer4)), (long1, double2, double3) -> this.minecraft.execute(() -> this.onScroll(long1, double2, double3)), (long1, integer, long3) -> {
+            final Path[] arr7 = new Path[integer];
+            for (int integer2 = 0; integer2 < integer; ++integer2) {
+                arr7[integer2] = Paths.get(GLFWDropCallback.getName(long3, integer2));
+            }
+            this.minecraft.execute(() -> this.onDrop(long1, Arrays.<Path>asList(arr7)));
+        });
     }
     
     private void onMove(final long long1, final double double2, final double double3) {
@@ -156,15 +173,15 @@ public class MouseHandler {
             this.ypos = double3;
             this.ignoreFirstMove = false;
         }
-        final GuiEventListener dds8 = this.minecraft.screen;
-        if (dds8 != null && this.minecraft.overlay == null) {
+        final GuiEventListener dof8 = this.minecraft.screen;
+        if (dof8 != null && this.minecraft.overlay == null) {
             final double double4 = double2 * this.minecraft.getWindow().getGuiScaledWidth() / this.minecraft.getWindow().getScreenWidth();
             final double double5 = double3 * this.minecraft.getWindow().getGuiScaledHeight() / this.minecraft.getWindow().getScreenHeight();
-            Screen.wrapScreenError(() -> dds8.mouseMoved(double4, double5), "mouseMoved event handler", dds8.getClass().getCanonicalName());
+            Screen.wrapScreenError(() -> dof8.mouseMoved(double4, double5), "mouseMoved event handler", dof8.getClass().getCanonicalName());
             if (this.activeButton != -1 && this.mousePressedTime > 0.0) {
                 final double double6 = (double2 - this.xpos) * this.minecraft.getWindow().getGuiScaledWidth() / this.minecraft.getWindow().getScreenWidth();
                 final double double7 = (double3 - this.ypos) * this.minecraft.getWindow().getGuiScaledHeight() / this.minecraft.getWindow().getScreenHeight();
-                Screen.wrapScreenError(() -> dds8.mouseDragged(double4, double5, this.activeButton, double6, double7), "mouseDragged event handler", dds8.getClass().getCanonicalName());
+                Screen.wrapScreenError(() -> dof8.mouseDragged(double4, double5, this.activeButton, double6, double7), "mouseDragged event handler", dof8.getClass().getCanonicalName());
             }
         }
         this.minecraft.getProfiler().push("mouse");
@@ -267,4 +284,8 @@ public class MouseHandler {
         this.ypos = this.minecraft.getWindow().getScreenHeight() / 2;
         InputConstants.grabOrReleaseMouse(this.minecraft.getWindow().getWindow(), 212993, this.xpos, this.ypos);
     }
+    
+    public void cursorEntered() {
+        this.ignoreFirstMove = true;
+    }
 }
diff --git a/src/net/minecraft/client/NarratorStatus.java b/src/net/minecraft/client/NarratorStatus.java
index fd1d3d1..a5d6a27 100644
--- a/src/net/minecraft/client/NarratorStatus.java
+++ b/src/net/minecraft/client/NarratorStatus.java
@@ -3,6 +3,8 @@ package net.minecraft.client;
 import java.util.Comparator;
 import java.util.Arrays;
 import net.minecraft.util.Mth;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 
 public enum NarratorStatus {
     OFF(0, "options.narrator.off"), 
@@ -12,19 +14,19 @@ public enum NarratorStatus {
     
     private static final NarratorStatus[] BY_ID;
     private final int id;
-    private final String key;
+    private final Component name;
     
     private NarratorStatus(final int integer3, final String string4) {
         this.id = integer3;
-        this.key = string4;
+        this.name = new TranslatableComponent(string4);
     }
     
     public int getId() {
         return this.id;
     }
     
-    public String getKey() {
-        return this.key;
+    public Component getName() {
+        return this.name;
     }
     
     public static NarratorStatus byId(final int integer) {
diff --git a/src/net/minecraft/client/Option.java b/src/net/minecraft/client/Option.java
index 76af121..60f6a80 100644
--- a/src/net/minecraft/client/Option.java
+++ b/src/net/minecraft/client/Option.java
@@ -2,13 +2,22 @@ package net.minecraft.client;
 
 import net.minecraft.util.Mth;
 import net.minecraft.client.gui.components.ChatComponent;
+import net.minecraft.network.chat.CommonComponents;
 import com.mojang.blaze3d.platform.Window;
 import net.minecraft.world.entity.player.ChatVisiblity;
+import net.minecraft.client.renderer.GpuWarnlistManager;
+import com.mojang.blaze3d.platform.GlStateManager;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.client.gui.chat.NarratorChatListener;
-import java.util.concurrent.Executor;
-import net.minecraft.Util;
-import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.pipeline.RenderTarget;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.network.chat.FormattedText;
+import java.util.List;
+import java.util.Optional;
+import net.minecraft.network.chat.Component;
 
 public abstract class Option {
     public static final ProgressOption BIOME_BLEND_RADIUS;
@@ -17,6 +26,8 @@ public abstract class Option {
     public static final ProgressOption CHAT_OPACITY;
     public static final ProgressOption CHAT_SCALE;
     public static final ProgressOption CHAT_WIDTH;
+    public static final ProgressOption CHAT_LINE_SPACING;
+    public static final ProgressOption CHAT_DELAY;
     public static final ProgressOption FOV;
     public static final ProgressOption FRAMERATE_LIMIT;
     public static final ProgressOption GAMMA;
@@ -24,11 +35,15 @@ public abstract class Option {
     public static final ProgressOption MOUSE_WHEEL_SENSITIVITY;
     public static final BooleanOption RAW_MOUSE_INPUT;
     public static final ProgressOption RENDER_DISTANCE;
+    public static final ProgressOption ENTITY_DISTANCE_SCALING;
     public static final ProgressOption SENSITIVITY;
     public static final ProgressOption TEXT_BACKGROUND_OPACITY;
     public static final CycleOption AMBIENT_OCCLUSION;
     public static final CycleOption ATTACK_INDICATOR;
     public static final CycleOption CHAT_VISIBILITY;
+    private static final Component GRAPHICS_TOOLTIP_FAST;
+    private static final Component GRAPHICS_TOOLTIP_FABULOUS;
+    private static final Component GRAPHICS_TOOLTIP_FANCY;
     public static final CycleOption GRAPHICS;
     public static final CycleOption GUI_SCALE;
     public static final CycleOption MAIN_HAND;
@@ -56,269 +71,380 @@ public abstract class Option {
     public static final BooleanOption USE_FULLSCREEN;
     public static final BooleanOption VIEW_BOBBING;
     private final String captionId;
+    private Optional<List<FormattedText>> toolTip;
     
     public Option(final String string) {
         this.captionId = string;
+        this.toolTip = Optional.<List<FormattedText>>empty();
     }
     
-    public abstract AbstractWidget createButton(final Options dbr, final int integer2, final int integer3, final int integer4);
+    public abstract AbstractWidget createButton(final Options dmb, final int integer2, final int integer3, final int integer4);
     
-    public String getCaption() {
-        return I18n.get(this.captionId) + ": ";
+    public MutableComponent createCaption() {
+        return new TranslatableComponent(this.captionId).append(": ");
+    }
+    
+    public void setTooltip(final List<FormattedText> list) {
+        this.toolTip = Optional.<List<FormattedText>>of(list);
+    }
+    
+    public Optional<List<FormattedText>> getTooltip() {
+        return this.toolTip;
     }
     
     static {
         final double double3;
-        final String string5;
+        final MutableComponent mx5;
         final int integer2;
-        BIOME_BLEND_RADIUS = new ProgressOption("options.biomeBlendRadius", 0.0, 7.0, 1.0f, dbr -> Double.valueOf(dbr.biomeBlendRadius), (dbr, double2) -> {
-            dbr.biomeBlendRadius = Mth.clamp((int)(double)double2, 0, 7);
+        final Component mr;
+        final MutableComponent mutableComponent;
+        BIOME_BLEND_RADIUS = new ProgressOption("options.biomeBlendRadius", 0.0, 7.0, 1.0f, dmb -> Double.valueOf(dmb.biomeBlendRadius), (dmb, double2) -> {
+            dmb.biomeBlendRadius = Mth.clamp((int)(double)double2, 0, 7);
             Minecraft.getInstance().levelRenderer.allChanged();
             return;
-        }, (dbr, dbt) -> {
-            double3 = dbt.get(dbr);
-            string5 = dbt.getCaption();
+        }, (dmb, dmd) -> {
+            double3 = dmd.get(dmb);
+            mx5 = dmd.createCaption();
             integer2 = (int)double3 * 2 + 1;
-            return string5 + I18n.get("options.biomeBlendRadius." + integer2);
+            new TranslatableComponent("options.biomeBlendRadius." + integer2);
+            return mutableComponent.append(mr);
         });
         final double double4;
-        CHAT_HEIGHT_FOCUSED = new ProgressOption("options.chat.height.focused", 0.0, 1.0, 0.0f, dbr -> dbr.chatHeightFocused, (dbr, double2) -> {
-            dbr.chatHeightFocused = double2;
+        CHAT_HEIGHT_FOCUSED = new ProgressOption("options.chat.height.focused", 0.0, 1.0, 0.0f, dmb -> dmb.chatHeightFocused, (dmb, double2) -> {
+            dmb.chatHeightFocused = double2;
             Minecraft.getInstance().gui.getChat().rescaleChat();
             return;
-        }, (dbr, dbt) -> {
-            double4 = dbt.toPct(dbt.get(dbr));
-            return dbt.getCaption() + ChatComponent.getHeight(double4) + "px";
+        }, (dmb, dmd) -> {
+            double4 = dmd.toPct(dmd.get(dmb));
+            return dmd.createCaption().append(ChatComponent.getHeight(double4) + "px");
         });
         final double double5;
-        CHAT_HEIGHT_UNFOCUSED = new ProgressOption("options.chat.height.unfocused", 0.0, 1.0, 0.0f, dbr -> dbr.chatHeightUnfocused, (dbr, double2) -> {
-            dbr.chatHeightUnfocused = double2;
+        CHAT_HEIGHT_UNFOCUSED = new ProgressOption("options.chat.height.unfocused", 0.0, 1.0, 0.0f, dmb -> dmb.chatHeightUnfocused, (dmb, double2) -> {
+            dmb.chatHeightUnfocused = double2;
             Minecraft.getInstance().gui.getChat().rescaleChat();
             return;
-        }, (dbr, dbt) -> {
-            double5 = dbt.toPct(dbt.get(dbr));
-            return dbt.getCaption() + ChatComponent.getHeight(double5) + "px";
+        }, (dmb, dmd) -> {
+            double5 = dmd.toPct(dmd.get(dmb));
+            return dmd.createCaption().append(ChatComponent.getHeight(double5) + "px");
         });
         final double double6;
-        CHAT_OPACITY = new ProgressOption("options.chat.opacity", 0.0, 1.0, 0.0f, dbr -> dbr.chatOpacity, (dbr, double2) -> {
-            dbr.chatOpacity = double2;
+        CHAT_OPACITY = new ProgressOption("options.chat.opacity", 0.0, 1.0, 0.0f, dmb -> dmb.chatOpacity, (dmb, double2) -> {
+            dmb.chatOpacity = double2;
             Minecraft.getInstance().gui.getChat().rescaleChat();
             return;
-        }, (dbr, dbt) -> {
-            double6 = dbt.toPct(dbt.get(dbr));
-            return dbt.getCaption() + (int)(double6 * 90.0 + 10.0) + "%";
+        }, (dmb, dmd) -> {
+            double6 = dmd.toPct(dmd.get(dmb));
+            return dmd.createCaption().append((int)(double6 * 90.0 + 10.0) + "%");
         });
         final double double7;
-        final String string6;
-        CHAT_SCALE = new ProgressOption("options.chat.scale", 0.0, 1.0, 0.0f, dbr -> dbr.chatScale, (dbr, double2) -> {
-            dbr.chatScale = double2;
+        final MutableComponent mx6;
+        CHAT_SCALE = new ProgressOption("options.chat.scale", 0.0, 1.0, 0.0f, dmb -> dmb.chatScale, (dmb, double2) -> {
+            dmb.chatScale = double2;
             Minecraft.getInstance().gui.getChat().rescaleChat();
             return;
-        }, (dbr, dbt) -> {
-            double7 = dbt.toPct(dbt.get(dbr));
-            string6 = dbt.getCaption();
+        }, (dmb, dmd) -> {
+            double7 = dmd.toPct(dmd.get(dmb));
+            mx6 = dmd.createCaption();
             if (double7 == 0.0) {
-                return string6 + I18n.get("options.off");
+                return mx6.append(CommonComponents.OPTION_OFF);
             }
             else {
-                return string6 + (int)(double7 * 100.0) + "%";
+                return mx6.append((int)(double7 * 100.0) + "%");
             }
         });
         final double double8;
-        CHAT_WIDTH = new ProgressOption("options.chat.width", 0.0, 1.0, 0.0f, dbr -> dbr.chatWidth, (dbr, double2) -> {
-            dbr.chatWidth = double2;
+        CHAT_WIDTH = new ProgressOption("options.chat.width", 0.0, 1.0, 0.0f, dmb -> dmb.chatWidth, (dmb, double2) -> {
+            dmb.chatWidth = double2;
             Minecraft.getInstance().gui.getChat().rescaleChat();
             return;
-        }, (dbr, dbt) -> {
-            double8 = dbt.toPct(dbt.get(dbr));
-            return dbt.getCaption() + ChatComponent.getWidth(double8) + "px";
+        }, (dmb, dmd) -> {
+            double8 = dmd.toPct(dmd.get(dmb));
+            return dmd.createCaption().append(ChatComponent.getWidth(double8) + "px");
         });
+        CHAT_LINE_SPACING = new ProgressOption("options.chat.line_spacing", 0.0, 1.0, 0.0f, dmb -> dmb.chatLineSpacing, (dmb, double2) -> dmb.chatLineSpacing = double2, (dmb, dmd) -> dmd.createCaption().append((int)(dmd.toPct(dmd.get(dmb)) * 100.0) + "%"));
         final double double9;
-        final String string7;
-        FOV = new ProgressOption("options.fov", 30.0, 110.0, 1.0f, dbr -> dbr.fov, (dbr, double2) -> dbr.fov = double2, (dbr, dbt) -> {
-            double9 = dbt.get(dbr);
-            string7 = dbt.getCaption();
-            if (double9 == 70.0) {
-                return string7 + I18n.get("options.fov.min");
-            }
-            else if (double9 == dbt.getMaxValue()) {
-                return string7 + I18n.get("options.fov.max");
+        final TranslatableComponent translatableComponent;
+        CHAT_DELAY = new ProgressOption("options.chat.delay_instant", 0.0, 6.0, 0.1f, dmb -> dmb.chatDelay, (dmb, double2) -> dmb.chatDelay = double2, (dmb, dmd) -> {
+            double9 = dmd.get(dmb);
+            if (double9 <= 0.0) {
+                return new TranslatableComponent("options.chat.delay_none");
             }
             else {
-                return string7 + (int)double9;
+                new TranslatableComponent("options.chat.delay", new Object[] { String.format("%.1f", double9) });
+                return translatableComponent;
             }
         });
         final double double10;
-        final String string8;
-        FRAMERATE_LIMIT = new ProgressOption("options.framerateLimit", 10.0, 260.0, 10.0f, dbr -> Double.valueOf(dbr.framerateLimit), (dbr, double2) -> {
-            dbr.framerateLimit = (int)(double)double2;
-            Minecraft.getInstance().getWindow().setFramerateLimit(dbr.framerateLimit);
-            return;
-        }, (dbr, dbt) -> {
-            double10 = dbt.get(dbr);
-            string8 = dbt.getCaption();
-            if (double10 == dbt.getMaxValue()) {
-                return string8 + I18n.get("options.framerateLimit.max");
+        final MutableComponent mx7;
+        FOV = new ProgressOption("options.fov", 30.0, 110.0, 1.0f, dmb -> dmb.fov, (dmb, double2) -> dmb.fov = double2, (dmb, dmd) -> {
+            double10 = dmd.get(dmb);
+            mx7 = dmd.createCaption();
+            if (double10 == 70.0) {
+                return mx7.append(new TranslatableComponent("options.fov.min"));
+            }
+            else if (double10 == dmd.getMaxValue()) {
+                return mx7.append(new TranslatableComponent("options.fov.max"));
             }
             else {
-                return string8 + I18n.get("options.framerate", (int)double10);
+                return mx7.append(Integer.toString((int)double10));
             }
         });
         final double double11;
-        final String string9;
-        GAMMA = new ProgressOption("options.gamma", 0.0, 1.0, 0.0f, dbr -> dbr.gamma, (dbr, double2) -> dbr.gamma = double2, (dbr, dbt) -> {
-            double11 = dbt.toPct(dbt.get(dbr));
-            string9 = dbt.getCaption();
-            if (double11 == 0.0) {
-                return string9 + I18n.get("options.gamma.min");
-            }
-            else if (double11 == 1.0) {
-                return string9 + I18n.get("options.gamma.max");
+        final MutableComponent mx8;
+        final Component mr2;
+        final MutableComponent mutableComponent2;
+        FRAMERATE_LIMIT = new ProgressOption("options.framerateLimit", 10.0, 260.0, 10.0f, dmb -> Double.valueOf(dmb.framerateLimit), (dmb, double2) -> {
+            dmb.framerateLimit = (int)(double)double2;
+            Minecraft.getInstance().getWindow().setFramerateLimit(dmb.framerateLimit);
+            return;
+        }, (dmb, dmd) -> {
+            double11 = dmd.get(dmb);
+            mx8 = dmd.createCaption();
+            if (double11 == dmd.getMaxValue()) {
+                return mx8.append(new TranslatableComponent("options.framerateLimit.max"));
             }
             else {
-                return string9 + "+" + (int)(double11 * 100.0) + "%";
+                new TranslatableComponent("options.framerate", new Object[] { (int)double11 });
+                return mutableComponent2.append(mr2);
             }
         });
         final double double12;
-        final String string10;
-        MIPMAP_LEVELS = new ProgressOption("options.mipmapLevels", 0.0, 4.0, 1.0f, dbr -> Double.valueOf(dbr.mipmapLevels), (dbr, double2) -> dbr.mipmapLevels = (int)(double)double2, (dbr, dbt) -> {
-            double12 = dbt.get(dbr);
-            string10 = dbt.getCaption();
+        final MutableComponent mx9;
+        GAMMA = new ProgressOption("options.gamma", 0.0, 1.0, 0.0f, dmb -> dmb.gamma, (dmb, double2) -> dmb.gamma = double2, (dmb, dmd) -> {
+            double12 = dmd.toPct(dmd.get(dmb));
+            mx9 = dmd.createCaption();
             if (double12 == 0.0) {
-                return string10 + I18n.get("options.off");
+                return mx9.append(new TranslatableComponent("options.gamma.min"));
+            }
+            else if (double12 == 1.0) {
+                return mx9.append(new TranslatableComponent("options.gamma.max"));
             }
             else {
-                return string10 + (int)double12;
+                return mx9.append("+" + (int)(double12 * 100.0) + "%");
             }
         });
         final double double13;
-        MOUSE_WHEEL_SENSITIVITY = new LogaritmicProgressOption("options.mouseWheelSensitivity", 0.01, 10.0, 0.01f, dbr -> dbr.mouseWheelSensitivity, (dbr, double2) -> dbr.mouseWheelSensitivity = double2, (dbr, dbt) -> {
-            double13 = dbt.toPct(dbt.get(dbr));
-            return dbt.getCaption() + String.format("%.2f", dbt.toValue(double13));
-        });
-        final Window cxx3;
-        RAW_MOUSE_INPUT = new BooleanOption("options.rawMouseInput", dbr -> dbr.rawMouseInput, (dbr, boolean2) -> {
-            dbr.rawMouseInput = boolean2;
-            cxx3 = Minecraft.getInstance().getWindow();
-            if (cxx3 != null) {
-                cxx3.updateRawMouseInput(boolean2);
+        final MutableComponent mx10;
+        MIPMAP_LEVELS = new ProgressOption("options.mipmapLevels", 0.0, 4.0, 1.0f, dmb -> Double.valueOf(dmb.mipmapLevels), (dmb, double2) -> dmb.mipmapLevels = (int)(double)double2, (dmb, dmd) -> {
+            double13 = dmd.get(dmb);
+            mx10 = dmd.createCaption();
+            if (double13 == 0.0) {
+                return mx10.append(CommonComponents.OPTION_OFF);
+            }
+            else {
+                return mx10.append(Integer.toString((int)double13));
             }
-            return;
         });
         final double double14;
-        RENDER_DISTANCE = new ProgressOption("options.renderDistance", 2.0, 16.0, 1.0f, dbr -> Double.valueOf(dbr.renderDistance), (dbr, double2) -> {
-            dbr.renderDistance = (int)(double)double2;
+        MOUSE_WHEEL_SENSITIVITY = new LogaritmicProgressOption("options.mouseWheelSensitivity", 0.01, 10.0, 0.01f, dmb -> dmb.mouseWheelSensitivity, (dmb, double2) -> dmb.mouseWheelSensitivity = double2, (dmb, dmd) -> {
+            double14 = dmd.toPct(dmd.get(dmb));
+            return dmd.createCaption().append(String.format("%.2f", dmd.toValue(double14)));
+        });
+        final Window dgy3;
+        RAW_MOUSE_INPUT = new BooleanOption("options.rawMouseInput", dmb -> dmb.rawMouseInput, (dmb, boolean2) -> {
+            dmb.rawMouseInput = boolean2;
+            dgy3 = Minecraft.getInstance().getWindow();
+            if (dgy3 != null) {
+                dgy3.updateRawMouseInput(boolean2);
+            }
+            return;
+        });
+        final double double15;
+        final Component mr3;
+        final MutableComponent mutableComponent3;
+        RENDER_DISTANCE = new ProgressOption("options.renderDistance", 2.0, 16.0, 1.0f, dmb -> Double.valueOf(dmb.renderDistance), (dmb, double2) -> {
+            dmb.renderDistance = (int)(double)double2;
             Minecraft.getInstance().levelRenderer.needsUpdate();
             return;
-        }, (dbr, dbt) -> {
-            double14 = dbt.get(dbr);
-            return dbt.getCaption() + I18n.get("options.chunks", (int)double14);
+        }, (dmb, dmd) -> {
+            double15 = dmd.get(dmb);
+            dmd.createCaption();
+            new TranslatableComponent("options.chunks", new Object[] { (int)double15 });
+            return mutableComponent3.append(mr3);
         });
-        final double double15;
-        final String string11;
-        SENSITIVITY = new ProgressOption("options.sensitivity", 0.0, 1.0, 0.0f, dbr -> dbr.sensitivity, (dbr, double2) -> dbr.sensitivity = double2, (dbr, dbt) -> {
-            double15 = dbt.toPct(dbt.get(dbr));
-            string11 = dbt.getCaption();
-            if (double15 == 0.0) {
-                return string11 + I18n.get("options.sensitivity.min");
+        final double double16;
+        final Component mr4;
+        final MutableComponent mutableComponent4;
+        ENTITY_DISTANCE_SCALING = new ProgressOption("options.entityDistanceScaling", 0.5, 5.0, 0.25f, dmb -> Double.valueOf(dmb.entityDistanceScaling), (dmb, double2) -> dmb.entityDistanceScaling = (float)(double)double2, (dmb, dmd) -> {
+            double16 = dmd.get(dmb);
+            dmd.createCaption();
+            new TranslatableComponent("options.entityDistancePercent", new Object[] { (int)(double16 * 100.0) });
+            return mutableComponent4.append(mr4);
+        });
+        final double double17;
+        final MutableComponent mx11;
+        SENSITIVITY = new ProgressOption("options.sensitivity", 0.0, 1.0, 0.0f, dmb -> dmb.sensitivity, (dmb, double2) -> dmb.sensitivity = double2, (dmb, dmd) -> {
+            double17 = dmd.toPct(dmd.get(dmb));
+            mx11 = dmd.createCaption();
+            if (double17 == 0.0) {
+                return mx11.append(new TranslatableComponent("options.sensitivity.min"));
             }
-            else if (double15 == 1.0) {
-                return string11 + I18n.get("options.sensitivity.max");
+            else if (double17 == 1.0) {
+                return mx11.append(new TranslatableComponent("options.sensitivity.max"));
             }
             else {
-                return string11 + (int)(double15 * 200.0) + "%";
+                return mx11.append((int)(double17 * 200.0) + "%");
             }
         });
-        TEXT_BACKGROUND_OPACITY = new ProgressOption("options.accessibility.text_background_opacity", 0.0, 1.0, 0.0f, dbr -> dbr.textBackgroundOpacity, (dbr, double2) -> {
-            dbr.textBackgroundOpacity = double2;
+        TEXT_BACKGROUND_OPACITY = new ProgressOption("options.accessibility.text_background_opacity", 0.0, 1.0, 0.0f, dmb -> dmb.textBackgroundOpacity, (dmb, double2) -> {
+            dmb.textBackgroundOpacity = double2;
             Minecraft.getInstance().gui.getChat().rescaleChat();
             return;
-        }, (dbr, dbt) -> dbt.getCaption() + (int)(dbt.toPct(dbt.get(dbr)) * 100.0) + "%");
-        AMBIENT_OCCLUSION = new CycleOption("options.ao", (dbr, integer) -> {
-            dbr.ambientOcclusion = AmbientOcclusionStatus.byId(dbr.ambientOcclusion.getId() + integer);
+        }, (dmb, dmd) -> dmd.createCaption().append((int)(dmd.toPct(dmd.get(dmb)) * 100.0) + "%"));
+        AMBIENT_OCCLUSION = new CycleOption("options.ao", (dmb, integer) -> {
+            dmb.ambientOcclusion = AmbientOcclusionStatus.byId(dmb.ambientOcclusion.getId() + integer);
             Minecraft.getInstance().levelRenderer.allChanged();
             return;
-        }, (dbr, dbe) -> dbe.getCaption() + I18n.get(dbr.ambientOcclusion.getKey()));
-        ATTACK_INDICATOR = new CycleOption("options.attackIndicator", (dbr, integer) -> dbr.attackIndicator = AttackIndicatorStatus.byId(dbr.attackIndicator.getId() + integer), (dbr, dbe) -> dbe.getCaption() + I18n.get(dbr.attackIndicator.getKey()));
-        CHAT_VISIBILITY = new CycleOption("options.chat.visibility", (dbr, integer) -> dbr.chatVisibility = ChatVisiblity.byId((dbr.chatVisibility.getId() + integer) % 3), (dbr, dbe) -> dbe.getCaption() + I18n.get(dbr.chatVisibility.getKey()));
-        GRAPHICS = new CycleOption("options.graphics", (dbr, integer) -> {
-            dbr.fancyGraphics = !dbr.fancyGraphics;
-            Minecraft.getInstance().levelRenderer.allChanged();
-            return;
-        }, (dbr, dbe) -> {
-            if (dbr.fancyGraphics) {
-                return dbe.getCaption() + I18n.get("options.graphics.fancy");
+        }, (dmb, dln) -> dln.createCaption().append(new TranslatableComponent(dmb.ambientOcclusion.getKey())));
+        ATTACK_INDICATOR = new CycleOption("options.attackIndicator", (dmb, integer) -> dmb.attackIndicator = AttackIndicatorStatus.byId(dmb.attackIndicator.getId() + integer), (dmb, dln) -> dln.createCaption().append(new TranslatableComponent(dmb.attackIndicator.getKey())));
+        CHAT_VISIBILITY = new CycleOption("options.chat.visibility", (dmb, integer) -> dmb.chatVisibility = ChatVisiblity.byId((dmb.chatVisibility.getId() + integer) % 3), (dmb, dln) -> dln.createCaption().append(new TranslatableComponent(dmb.chatVisibility.getKey())));
+        GRAPHICS_TOOLTIP_FAST = new TranslatableComponent("options.graphics.fast.tooltip");
+        GRAPHICS_TOOLTIP_FABULOUS = new TranslatableComponent("options.graphics.fabulous.tooltip", new Object[] { new TranslatableComponent("options.graphics.fabulous").withStyle(ChatFormatting.ITALIC) });
+        GRAPHICS_TOOLTIP_FANCY = new TranslatableComponent("options.graphics.fancy.tooltip");
+        final Minecraft dlx3;
+        final GpuWarnlistManager ebt4;
+        final TranslatableComponent ne3;
+        GRAPHICS = new CycleOption("options.graphics", (dmb, integer) -> {
+            dlx3 = Minecraft.getInstance();
+            ebt4 = dlx3.getGpuWarnlistManager();
+            if (dmb.graphicsMode == GraphicsStatus.FANCY && ebt4.willShowWarning()) {
+                ebt4.showWarning();
+                return;
             }
             else {
-                return dbe.getCaption() + I18n.get("options.graphics.fast");
+                dmb.graphicsMode = dmb.graphicsMode.cycleNext();
+                if (dmb.graphicsMode == GraphicsStatus.FABULOUS && (!GlStateManager.supportsFramebufferBlit() || ebt4.isSkippingFabulous())) {
+                    dmb.graphicsMode = GraphicsStatus.FAST;
+                }
+                dlx3.levelRenderer.allChanged();
+                return;
+            }
+        }, (dmb, dln) -> {
+            switch (dmb.graphicsMode) {
+                case FAST: {
+                    dln.setTooltip(Minecraft.getInstance().font.split(Option.GRAPHICS_TOOLTIP_FAST, 200));
+                    break;
+                }
+                case FANCY: {
+                    dln.setTooltip(Minecraft.getInstance().font.split(Option.GRAPHICS_TOOLTIP_FANCY, 200));
+                    break;
+                }
+                case FABULOUS: {
+                    dln.setTooltip(Minecraft.getInstance().font.split(Option.GRAPHICS_TOOLTIP_FABULOUS, 200));
+                    break;
+                }
+            }
+            ne3 = new TranslatableComponent(dmb.graphicsMode.getKey());
+            if (dmb.graphicsMode == GraphicsStatus.FABULOUS) {
+                return dln.createCaption().append(new TextComponent("").append(ne3).withStyle(ChatFormatting.ITALIC));
+            }
+            else {
+                return dln.createCaption().append(ne3);
             }
         });
-        GUI_SCALE = new CycleOption("options.guiScale", (dbr, integer) -> dbr.guiScale = Integer.remainderUnsigned(dbr.guiScale + integer, Minecraft.getInstance().getWindow().calculateScale(0, Minecraft.getInstance().isEnforceUnicode()) + 1), (dbr, dbe) -> dbe.getCaption() + ((dbr.guiScale == 0) ? I18n.get("options.guiScale.auto") : Integer.valueOf(dbr.guiScale)));
-        MAIN_HAND = new CycleOption("options.mainHand", (dbr, integer) -> dbr.mainHand = dbr.mainHand.getOpposite(), (dbr, dbe) -> dbe.getCaption() + dbr.mainHand);
-        NARRATOR = new CycleOption("options.narrator", (dbr, integer) -> {
-            if (NarratorChatListener.INSTANCE.isActive()) {
-                dbr.narratorStatus = NarratorStatus.byId(dbr.narratorStatus.getId() + integer);
+        final MutableComponent mx12;
+        GUI_SCALE = new CycleOption("options.guiScale", (dmb, integer) -> dmb.guiScale = Integer.remainderUnsigned(dmb.guiScale + integer, Minecraft.getInstance().getWindow().calculateScale(0, Minecraft.getInstance().isEnforceUnicode()) + 1), (dmb, dln) -> {
+            mx12 = dln.createCaption();
+            if (dmb.guiScale == 0) {
+                return mx12.append(new TranslatableComponent("options.guiScale.auto"));
             }
             else {
-                dbr.narratorStatus = NarratorStatus.OFF;
-            }
-            NarratorChatListener.INSTANCE.updateNarratorStatus(dbr.narratorStatus);
-            return;
-        }, (dbr, dbe) -> {
-            if (NarratorChatListener.INSTANCE.isActive()) {
-                return dbe.getCaption() + I18n.get(dbr.narratorStatus.getKey());
-            }
-            else {
-                return dbe.getCaption() + I18n.get("options.narrator.notavailable");
+                return mx12.append(Integer.toString(dmb.guiScale));
             }
         });
-        PARTICLES = new CycleOption("options.particles", (dbr, integer) -> dbr.particles = ParticleStatus.byId(dbr.particles.getId() + integer), (dbr, dbe) -> dbe.getCaption() + I18n.get(dbr.particles.getKey()));
-        RENDER_CLOUDS = new CycleOption("options.renderClouds", (dbr, integer) -> dbr.renderClouds = CloudStatus.byId(dbr.renderClouds.getId() + integer), (dbr, dbe) -> dbe.getCaption() + I18n.get(dbr.renderClouds.getKey()));
-        TEXT_BACKGROUND = new CycleOption("options.accessibility.text_background", (dbr, integer) -> dbr.backgroundForChatOnly = !dbr.backgroundForChatOnly, (dbr, dbe) -> dbe.getCaption() + I18n.get(dbr.backgroundForChatOnly ? "options.accessibility.text_background.chat" : "options.accessibility.text_background.everywhere"));
-        AUTO_JUMP = new BooleanOption("options.autoJump", dbr -> dbr.autoJump, (dbr, boolean2) -> dbr.autoJump = boolean2);
-        AUTO_SUGGESTIONS = new BooleanOption("options.autoSuggestCommands", dbr -> dbr.autoSuggestions, (dbr, boolean2) -> dbr.autoSuggestions = boolean2);
-        CHAT_COLOR = new BooleanOption("options.chat.color", dbr -> dbr.chatColors, (dbr, boolean2) -> dbr.chatColors = boolean2);
-        CHAT_LINKS = new BooleanOption("options.chat.links", dbr -> dbr.chatLinks, (dbr, boolean2) -> dbr.chatLinks = boolean2);
-        CHAT_LINKS_PROMPT = new BooleanOption("options.chat.links.prompt", dbr -> dbr.chatLinksPrompt, (dbr, boolean2) -> dbr.chatLinksPrompt = boolean2);
-        DISCRETE_MOUSE_SCROLL = new BooleanOption("options.discrete_mouse_scroll", dbr -> dbr.discreteMouseScroll, (dbr, boolean2) -> dbr.discreteMouseScroll = boolean2);
-        ENABLE_VSYNC = new BooleanOption("options.vsync", dbr -> dbr.enableVsync, (dbr, boolean2) -> {
-            dbr.enableVsync = boolean2;
+        MAIN_HAND = new CycleOption("options.mainHand", (dmb, integer) -> dmb.mainHand = dmb.mainHand.getOpposite(), (dmb, dln) -> dln.createCaption().append(dmb.mainHand.getName()));
+        NARRATOR = new CycleOption("options.narrator", (dmb, integer) -> {
+            if (NarratorChatListener.INSTANCE.isActive()) {
+                dmb.narratorStatus = NarratorStatus.byId(dmb.narratorStatus.getId() + integer);
+            }
+            else {
+                dmb.narratorStatus = NarratorStatus.OFF;
+            }
+            NarratorChatListener.INSTANCE.updateNarratorStatus(dmb.narratorStatus);
+            return;
+        }, (dmb, dln) -> {
+            if (NarratorChatListener.INSTANCE.isActive()) {
+                return dln.createCaption().append(dmb.narratorStatus.getName());
+            }
+            else {
+                return dln.createCaption().append(new TranslatableComponent("options.narrator.notavailable"));
+            }
+        });
+        PARTICLES = new CycleOption("options.particles", (dmb, integer) -> dmb.particles = ParticleStatus.byId(dmb.particles.getId() + integer), (dmb, dln) -> dln.createCaption().append(new TranslatableComponent(dmb.particles.getKey())));
+        RenderTarget dgf3;
+        RENDER_CLOUDS = new CycleOption("options.renderClouds", (dmb, integer) -> {
+            dmb.renderClouds = CloudStatus.byId(dmb.renderClouds.getId() + integer);
+            if (Minecraft.useShaderTransparency()) {
+                dgf3 = Minecraft.getInstance().levelRenderer.getCloudsTarget();
+                if (dgf3 != null) {
+                    dgf3.clear(Minecraft.ON_OSX);
+                }
+            }
+            return;
+        }, (dmb, dln) -> dln.createCaption().append(new TranslatableComponent(dmb.renderClouds.getKey())));
+        final TranslatableComponent mr5;
+        final MutableComponent mutableComponent5;
+        TEXT_BACKGROUND = new CycleOption("options.accessibility.text_background", (dmb, integer) -> dmb.backgroundForChatOnly = !dmb.backgroundForChatOnly, (dmb, dln) -> {
+            dln.createCaption();
+            new TranslatableComponent(dmb.backgroundForChatOnly ? "options.accessibility.text_background.chat" : "options.accessibility.text_background.everywhere");
+            return mutableComponent5.append(mr5);
+        });
+        AUTO_JUMP = new BooleanOption("options.autoJump", dmb -> dmb.autoJump, (dmb, boolean2) -> dmb.autoJump = boolean2);
+        AUTO_SUGGESTIONS = new BooleanOption("options.autoSuggestCommands", dmb -> dmb.autoSuggestions, (dmb, boolean2) -> dmb.autoSuggestions = boolean2);
+        CHAT_COLOR = new BooleanOption("options.chat.color", dmb -> dmb.chatColors, (dmb, boolean2) -> dmb.chatColors = boolean2);
+        CHAT_LINKS = new BooleanOption("options.chat.links", dmb -> dmb.chatLinks, (dmb, boolean2) -> dmb.chatLinks = boolean2);
+        CHAT_LINKS_PROMPT = new BooleanOption("options.chat.links.prompt", dmb -> dmb.chatLinksPrompt, (dmb, boolean2) -> dmb.chatLinksPrompt = boolean2);
+        DISCRETE_MOUSE_SCROLL = new BooleanOption("options.discrete_mouse_scroll", dmb -> dmb.discreteMouseScroll, (dmb, boolean2) -> dmb.discreteMouseScroll = boolean2);
+        ENABLE_VSYNC = new BooleanOption("options.vsync", dmb -> dmb.enableVsync, (dmb, boolean2) -> {
+            dmb.enableVsync = boolean2;
             if (Minecraft.getInstance().getWindow() != null) {
-                Minecraft.getInstance().getWindow().updateVsync(dbr.enableVsync);
+                Minecraft.getInstance().getWindow().updateVsync(dmb.enableVsync);
             }
             return;
         });
-        ENTITY_SHADOWS = new BooleanOption("options.entityShadows", dbr -> dbr.entityShadows, (dbr, boolean2) -> dbr.entityShadows = boolean2);
-        final Minecraft dbn3;
-        FORCE_UNICODE_FONT = new BooleanOption("options.forceUnicodeFont", dbr -> dbr.forceUnicodeFont, (dbr, boolean2) -> {
-            dbr.forceUnicodeFont = boolean2;
-            dbn3 = Minecraft.getInstance();
-            if (dbn3.getFontManager() != null) {
-                dbn3.getFontManager().setForceUnicode(dbr.forceUnicodeFont, Util.backgroundExecutor(), dbn3);
+        ENTITY_SHADOWS = new BooleanOption("options.entityShadows", dmb -> dmb.entityShadows, (dmb, boolean2) -> dmb.entityShadows = boolean2);
+        final Minecraft dlx4;
+        FORCE_UNICODE_FONT = new BooleanOption("options.forceUnicodeFont", dmb -> dmb.forceUnicodeFont, (dmb, boolean2) -> {
+            dmb.forceUnicodeFont = boolean2;
+            dlx4 = Minecraft.getInstance();
+            if (dlx4.getWindow() != null) {
+                dlx4.selectMainFont(boolean2);
             }
             return;
         });
-        INVERT_MOUSE = new BooleanOption("options.invertMouse", dbr -> dbr.invertYMouse, (dbr, boolean2) -> dbr.invertYMouse = boolean2);
-        REALMS_NOTIFICATIONS = new BooleanOption("options.realmsNotifications", dbr -> dbr.realmsNotifications, (dbr, boolean2) -> dbr.realmsNotifications = boolean2);
-        REDUCED_DEBUG_INFO = new BooleanOption("options.reducedDebugInfo", dbr -> dbr.reducedDebugInfo, (dbr, boolean2) -> dbr.reducedDebugInfo = boolean2);
-        SHOW_SUBTITLES = new BooleanOption("options.showSubtitles", dbr -> dbr.showSubtitles, (dbr, boolean2) -> dbr.showSubtitles = boolean2);
-        SNOOPER_ENABLED = new BooleanOption("options.snooper", dbr -> {
-            if (dbr.snooperEnabled) {}
+        INVERT_MOUSE = new BooleanOption("options.invertMouse", dmb -> dmb.invertYMouse, (dmb, boolean2) -> dmb.invertYMouse = boolean2);
+        REALMS_NOTIFICATIONS = new BooleanOption("options.realmsNotifications", dmb -> dmb.realmsNotifications, (dmb, boolean2) -> dmb.realmsNotifications = boolean2);
+        REDUCED_DEBUG_INFO = new BooleanOption("options.reducedDebugInfo", dmb -> dmb.reducedDebugInfo, (dmb, boolean2) -> dmb.reducedDebugInfo = boolean2);
+        SHOW_SUBTITLES = new BooleanOption("options.showSubtitles", dmb -> dmb.showSubtitles, (dmb, boolean2) -> dmb.showSubtitles = boolean2);
+        SNOOPER_ENABLED = new BooleanOption("options.snooper", dmb -> {
+            if (dmb.snooperEnabled) {}
             return false;
-        }, (dbr, boolean2) -> dbr.snooperEnabled = boolean2);
-        TOGGLE_CROUCH = new CycleOption("key.sneak", (dbr, integer) -> dbr.toggleCrouch = !dbr.toggleCrouch, (dbr, dbe) -> dbe.getCaption() + I18n.get(dbr.toggleCrouch ? "options.key.toggle" : "options.key.hold"));
-        TOGGLE_SPRINT = new CycleOption("key.sprint", (dbr, integer) -> dbr.toggleSprint = !dbr.toggleSprint, (dbr, dbe) -> dbe.getCaption() + I18n.get(dbr.toggleSprint ? "options.key.toggle" : "options.key.hold"));
-        TOUCHSCREEN = new BooleanOption("options.touchscreen", dbr -> dbr.touchscreen, (dbr, boolean2) -> dbr.touchscreen = boolean2);
-        final Minecraft dbn4;
-        USE_FULLSCREEN = new BooleanOption("options.fullscreen", dbr -> dbr.fullscreen, (dbr, boolean2) -> {
-            dbr.fullscreen = boolean2;
-            dbn4 = Minecraft.getInstance();
-            if (dbn4.getWindow() != null && dbn4.getWindow().isFullscreen() != dbr.fullscreen) {
-                dbn4.getWindow().toggleFullScreen();
-                dbr.fullscreen = dbn4.getWindow().isFullscreen();
+        }, (dmb, boolean2) -> dmb.snooperEnabled = boolean2);
+        final TranslatableComponent mr6;
+        final MutableComponent mutableComponent6;
+        TOGGLE_CROUCH = new CycleOption("key.sneak", (dmb, integer) -> dmb.toggleCrouch = !dmb.toggleCrouch, (dmb, dln) -> {
+            dln.createCaption();
+            new TranslatableComponent(dmb.toggleCrouch ? "options.key.toggle" : "options.key.hold");
+            return mutableComponent6.append(mr6);
+        });
+        final TranslatableComponent mr7;
+        final MutableComponent mutableComponent7;
+        TOGGLE_SPRINT = new CycleOption("key.sprint", (dmb, integer) -> dmb.toggleSprint = !dmb.toggleSprint, (dmb, dln) -> {
+            dln.createCaption();
+            new TranslatableComponent(dmb.toggleSprint ? "options.key.toggle" : "options.key.hold");
+            return mutableComponent7.append(mr7);
+        });
+        TOUCHSCREEN = new BooleanOption("options.touchscreen", dmb -> dmb.touchscreen, (dmb, boolean2) -> dmb.touchscreen = boolean2);
+        final Minecraft dlx5;
+        USE_FULLSCREEN = new BooleanOption("options.fullscreen", dmb -> dmb.fullscreen, (dmb, boolean2) -> {
+            dmb.fullscreen = boolean2;
+            dlx5 = Minecraft.getInstance();
+            if (dlx5.getWindow() != null && dlx5.getWindow().isFullscreen() != dmb.fullscreen) {
+                dlx5.getWindow().toggleFullScreen();
+                dmb.fullscreen = dlx5.getWindow().isFullscreen();
             }
             return;
         });
-        VIEW_BOBBING = new BooleanOption("options.viewBobbing", dbr -> dbr.bobView, (dbr, boolean2) -> dbr.bobView = boolean2);
+        VIEW_BOBBING = new BooleanOption("options.viewBobbing", dmb -> dmb.bobView, (dmb, boolean2) -> dmb.bobView = boolean2);
     }
 }
diff --git a/src/net/minecraft/client/Options.java b/src/net/minecraft/client/Options.java
index de71027..78eb0f6 100644
--- a/src/net/minecraft/client/Options.java
+++ b/src/net/minecraft/client/Options.java
@@ -1,8 +1,7 @@
 package net.minecraft.client;
 
-import java.lang.reflect.ParameterizedType;
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.client.resources.UnopenedResourcePack;
+import net.minecraft.client.resources.ResourcePack;
 import net.minecraft.server.packs.repository.PackRepository;
 import java.util.Collection;
 import com.google.common.collect.ImmutableSet;
@@ -24,6 +23,7 @@ import net.minecraft.util.GsonHelper;
 import com.google.common.io.Files;
 import com.google.common.base.Charsets;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.Util;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mojang.blaze3d.platform.InputConstants;
 import com.google.common.collect.Maps;
@@ -39,27 +39,29 @@ import net.minecraft.world.entity.player.PlayerModelPart;
 import java.util.Set;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.player.ChatVisiblity;
-import java.util.List;
 import com.google.common.base.Splitter;
-import java.lang.reflect.Type;
+import java.util.List;
+import com.google.gson.reflect.TypeToken;
 import com.google.gson.Gson;
 import org.apache.logging.log4j.Logger;
 
 public class Options {
     private static final Logger LOGGER;
     private static final Gson GSON;
-    private static final Type RESOURCE_PACK_TYPE;
+    private static final TypeToken<List<String>> RESOURCE_PACK_TYPE;
     private static final Splitter OPTION_SPLITTER;
     public double sensitivity;
     public int renderDistance;
+    public float entityDistanceScaling;
     public int framerateLimit;
     public CloudStatus renderClouds;
-    public boolean fancyGraphics;
+    public GraphicsStatus graphicsMode;
     public AmbientOcclusionStatus ambientOcclusion;
     public List<String> resourcePacks;
     public List<String> incompatibleResourcePacks;
     public ChatVisiblity chatVisibility;
     public double chatOpacity;
+    public double chatLineSpacing;
     public double textBackgroundOpacity;
     @Nullable
     public String fullscreenVideoModeString;
@@ -75,6 +77,7 @@ public class Options {
     public double chatWidth;
     public double chatHeightUnfocused;
     public double chatHeightFocused;
+    public double chatDelay;
     public int mipmapLevels;
     private final Map<SoundSource, Float> sourceVolumes;
     public boolean useNativeTransport;
@@ -113,7 +116,7 @@ public class Options {
     public final KeyMapping keyShift;
     public final KeyMapping keySprint;
     public final KeyMapping keyInventory;
-    public final KeyMapping keySwapHands;
+    public final KeyMapping keySwapOffhand;
     public final KeyMapping keyDrop;
     public final KeyMapping keyUse;
     public final KeyMapping keyAttack;
@@ -147,18 +150,21 @@ public class Options {
     public ParticleStatus particles;
     public NarratorStatus narratorStatus;
     public String languageCode;
+    public boolean syncWrites;
     
-    public Options(final Minecraft dbn, final File file) {
+    public Options(final Minecraft dlx, final File file) {
         this.sensitivity = 0.5;
         this.renderDistance = -1;
+        this.entityDistanceScaling = 1.0f;
         this.framerateLimit = 120;
         this.renderClouds = CloudStatus.FANCY;
-        this.fancyGraphics = true;
+        this.graphicsMode = GraphicsStatus.FANCY;
         this.ambientOcclusion = AmbientOcclusionStatus.MAX;
         this.resourcePacks = Lists.newArrayList();
         this.incompatibleResourcePacks = Lists.newArrayList();
         this.chatVisibility = ChatVisiblity.FULL;
         this.chatOpacity = 1.0;
+        this.chatLineSpacing = 0.0;
         this.textBackgroundOpacity = 0.5;
         this.pauseOnLostFocus = true;
         this.modelParts = Sets.<PlayerModelPart>newHashSet(PlayerModelPart.values());
@@ -168,6 +174,7 @@ public class Options {
         this.chatWidth = 1.0;
         this.chatHeightUnfocused = 0.44366195797920227;
         this.chatHeightFocused = 1.0;
+        this.chatDelay = 0.0;
         this.mipmapLevels = 4;
         this.sourceVolumes = Maps.newEnumMap(SoundSource.class);
         this.useNativeTransport = true;
@@ -196,7 +203,7 @@ public class Options {
         this.keyShift = new ToggleKeyMapping("key.sneak", 340, "key.categories.movement", () -> this.toggleCrouch);
         this.keySprint = new ToggleKeyMapping("key.sprint", 341, "key.categories.movement", () -> this.toggleSprint);
         this.keyInventory = new KeyMapping("key.inventory", 69, "key.categories.inventory");
-        this.keySwapHands = new KeyMapping("key.swapHands", 70, "key.categories.inventory");
+        this.keySwapOffhand = new KeyMapping("key.swapOffhand", 70, "key.categories.inventory");
         this.keyDrop = new KeyMapping("key.drop", 81, "key.categories.inventory");
         this.keyUse = new KeyMapping("key.use", InputConstants.Type.MOUSE, 1, "key.categories.gameplay");
         this.keyAttack = new KeyMapping("key.attack", InputConstants.Type.MOUSE, 0, "key.categories.gameplay");
@@ -213,22 +220,23 @@ public class Options {
         this.keyHotbarSlots = new KeyMapping[] { new KeyMapping("key.hotbar.1", 49, "key.categories.inventory"), new KeyMapping("key.hotbar.2", 50, "key.categories.inventory"), new KeyMapping("key.hotbar.3", 51, "key.categories.inventory"), new KeyMapping("key.hotbar.4", 52, "key.categories.inventory"), new KeyMapping("key.hotbar.5", 53, "key.categories.inventory"), new KeyMapping("key.hotbar.6", 54, "key.categories.inventory"), new KeyMapping("key.hotbar.7", 55, "key.categories.inventory"), new KeyMapping("key.hotbar.8", 56, "key.categories.inventory"), new KeyMapping("key.hotbar.9", 57, "key.categories.inventory") };
         this.keySaveHotbarActivator = new KeyMapping("key.saveToolbarActivator", 67, "key.categories.creative");
         this.keyLoadHotbarActivator = new KeyMapping("key.loadToolbarActivator", 88, "key.categories.creative");
-        this.keyMappings = (KeyMapping[])ArrayUtils.addAll((Object[])new KeyMapping[] { this.keyAttack, this.keyUse, this.keyUp, this.keyLeft, this.keyDown, this.keyRight, this.keyJump, this.keyShift, this.keySprint, this.keyDrop, this.keyInventory, this.keyChat, this.keyPlayerList, this.keyPickItem, this.keyCommand, this.keyScreenshot, this.keyTogglePerspective, this.keySmoothCamera, this.keyFullscreen, this.keySpectatorOutlines, this.keySwapHands, this.keySaveHotbarActivator, this.keyLoadHotbarActivator, this.keyAdvancements }, (Object[])this.keyHotbarSlots);
+        this.keyMappings = (KeyMapping[])ArrayUtils.addAll((Object[])new KeyMapping[] { this.keyAttack, this.keyUse, this.keyUp, this.keyLeft, this.keyDown, this.keyRight, this.keyJump, this.keyShift, this.keySprint, this.keyDrop, this.keyInventory, this.keyChat, this.keyPlayerList, this.keyPickItem, this.keyCommand, this.keyScreenshot, this.keyTogglePerspective, this.keySmoothCamera, this.keyFullscreen, this.keySpectatorOutlines, this.keySwapOffhand, this.keySaveHotbarActivator, this.keyLoadHotbarActivator, this.keyAdvancements }, (Object[])this.keyHotbarSlots);
         this.difficulty = Difficulty.NORMAL;
         this.lastMpIp = "";
         this.fov = 70.0;
         this.particles = ParticleStatus.ALL;
         this.narratorStatus = NarratorStatus.OFF;
         this.languageCode = "en_us";
-        this.minecraft = dbn;
+        this.minecraft = dlx;
         this.optionsFile = new File(file, "options.txt");
-        if (dbn.is64Bit() && Runtime.getRuntime().maxMemory() >= 1000000000L) {
+        if (dlx.is64Bit() && Runtime.getRuntime().maxMemory() >= 1000000000L) {
             Option.RENDER_DISTANCE.setMaxValue(32.0f);
         }
         else {
             Option.RENDER_DISTANCE.setMaxValue(16.0f);
         }
-        this.renderDistance = (dbn.is64Bit() ? 12 : 8);
+        this.renderDistance = (dlx.is64Bit() ? 12 : 8);
+        this.syncWrites = (Util.getPlatform() == Util.OS.WINDOWS);
         this.load();
     }
     
@@ -244,8 +252,8 @@ public class Options {
         return this.backgroundForChatOnly ? integer : ((int)(this.textBackgroundOpacity * 255.0) << 24 & 0xFF000000);
     }
     
-    public void setKey(final KeyMapping dbk, final InputConstants.Key a) {
-        dbk.setKey(a);
+    public void setKey(final KeyMapping dlu, final InputConstants.Key a) {
+        dlu.setKey(a);
         this.save();
     }
     
@@ -255,7 +263,7 @@ public class Options {
                 return;
             }
             this.sourceVolumes.clear();
-            final CompoundTag jt2 = new CompoundTag();
+            final CompoundTag le2 = new CompoundTag();
             try (final BufferedReader bufferedReader3 = Files.newReader(this.optionsFile, Charsets.UTF_8)) {
                 Iterator<String> iterator3;
                 final CompoundTag compoundTag;
@@ -270,9 +278,17 @@ public class Options {
                     return;
                 });
             }
-            final CompoundTag jt3 = this.dataFix(jt2);
-            for (final String string2 : jt3.getAllKeys()) {
-                final String string3 = jt3.getString(string2);
+            final CompoundTag le3 = this.dataFix(le2);
+            if (!le3.contains("graphicsMode") && le3.contains("fancyGraphics")) {
+                if ("true".equals(le3.getString("fancyGraphics"))) {
+                    this.graphicsMode = GraphicsStatus.FANCY;
+                }
+                else {
+                    this.graphicsMode = GraphicsStatus.FAST;
+                }
+            }
+            for (final String string2 : le3.getAllKeys()) {
+                final String string3 = le3.getString(string2);
                 try {
                     if ("autoJump".equals(string2)) {
                         Option.AUTO_JUMP.set(this, string3);
@@ -343,6 +359,9 @@ public class Options {
                     if ("renderDistance".equals(string2)) {
                         this.renderDistance = Integer.parseInt(string3);
                     }
+                    if ("entityDistanceScaling".equals(string2)) {
+                        this.entityDistanceScaling = Float.parseFloat(string3);
+                    }
                     if ("guiScale".equals(string2)) {
                         this.guiScale = Integer.parseInt(string3);
                     }
@@ -358,8 +377,8 @@ public class Options {
                     if ("difficulty".equals(string2)) {
                         this.difficulty = Difficulty.byId(Integer.parseInt(string3));
                     }
-                    if ("fancyGraphics".equals(string2)) {
-                        this.fancyGraphics = "true".equals(string3);
+                    if ("graphicsMode".equals(string2)) {
+                        this.graphicsMode = GraphicsStatus.byId(Integer.parseInt(string3));
                     }
                     if ("tutorialStep".equals(string2)) {
                         this.tutorialStep = TutorialSteps.getByName(string3);
@@ -413,6 +432,9 @@ public class Options {
                     if ("chatOpacity".equals(string2)) {
                         this.chatOpacity = readFloat(string3);
                     }
+                    if ("chatLineSpacing".equals(string2)) {
+                        this.chatLineSpacing = readFloat(string3);
+                    }
                     if ("textBackgroundOpacity".equals(string2)) {
                         this.textBackgroundOpacity = readFloat(string3);
                     }
@@ -443,6 +465,9 @@ public class Options {
                     if ("chatHeightFocused".equals(string2)) {
                         this.chatHeightFocused = readFloat(string3);
                     }
+                    if ("chatDelay".equals(string2)) {
+                        this.chatDelay = readFloat(string3);
+                    }
                     if ("chatHeightUnfocused".equals(string2)) {
                         this.chatHeightUnfocused = readFloat(string3);
                     }
@@ -479,19 +504,22 @@ public class Options {
                     if ("skipMultiplayerWarning".equals(string2)) {
                         this.skipMultiplayerWarning = "true".equals(string3);
                     }
-                    for (final KeyMapping dbk10 : this.keyMappings) {
-                        if (string2.equals("key_" + dbk10.getName())) {
-                            dbk10.setKey(InputConstants.getKey(string3));
+                    if ("syncChunkWrites".equals(string2)) {
+                        this.syncWrites = "true".equals(string3);
+                    }
+                    for (final KeyMapping dlu10 : this.keyMappings) {
+                        if (string2.equals("key_" + dlu10.getName())) {
+                            dlu10.setKey(InputConstants.getKey(string3));
                         }
                     }
-                    for (final SoundSource aaj10 : SoundSource.values()) {
-                        if (string2.equals("soundCategory_" + aaj10.getName())) {
-                            this.sourceVolumes.put(aaj10, readFloat(string3));
+                    for (final SoundSource acm10 : SoundSource.values()) {
+                        if (string2.equals("soundCategory_" + acm10.getName())) {
+                            this.sourceVolumes.put(acm10, readFloat(string3));
                         }
                     }
-                    for (final PlayerModelPart ayk10 : PlayerModelPart.values()) {
-                        if (string2.equals("modelPart_" + ayk10.getId())) {
-                            this.setModelPart(ayk10, "true".equals(string3));
+                    for (final PlayerModelPart bed10 : PlayerModelPart.values()) {
+                        if (string2.equals("modelPart_" + bed10.getId())) {
+                            this.setModelPart(bed10, "true".equals(string3));
                         }
                     }
                 }
@@ -506,13 +534,13 @@ public class Options {
         }
     }
     
-    private CompoundTag dataFix(final CompoundTag jt) {
+    private CompoundTag dataFix(final CompoundTag le) {
         int integer3 = 0;
         try {
-            integer3 = Integer.parseInt(jt.getString("version"));
+            integer3 = Integer.parseInt(le.getString("version"));
         }
         catch (RuntimeException ex) {}
-        return NbtUtils.update(this.minecraft.getFixerUpper(), DataFixTypes.OPTIONS, jt, integer3);
+        return NbtUtils.update(this.minecraft.getFixerUpper(), DataFixTypes.OPTIONS, le, integer3);
     }
     
     private static float readFloat(final String string) {
@@ -551,11 +579,12 @@ public class Options {
             printWriter2.println("fov:" + (this.fov - 70.0) / 40.0);
             printWriter2.println("gamma:" + this.gamma);
             printWriter2.println("renderDistance:" + this.renderDistance);
+            printWriter2.println("entityDistanceScaling:" + this.entityDistanceScaling);
             printWriter2.println("guiScale:" + this.guiScale);
             printWriter2.println("particles:" + this.particles.getId());
             printWriter2.println("maxFps:" + this.framerateLimit);
             printWriter2.println("difficulty:" + this.difficulty.getId());
-            printWriter2.println("fancyGraphics:" + this.fancyGraphics);
+            printWriter2.println("graphicsMode:" + this.graphicsMode.getId());
             printWriter2.println("ao:" + this.ambientOcclusion.getId());
             printWriter2.println("biomeBlendRadius:" + this.biomeBlendRadius);
             switch (this.renderClouds) {
@@ -578,6 +607,7 @@ public class Options {
             printWriter2.println("lang:" + this.languageCode);
             printWriter2.println("chatVisibility:" + this.chatVisibility.getId());
             printWriter2.println("chatOpacity:" + this.chatOpacity);
+            printWriter2.println("chatLineSpacing:" + this.chatLineSpacing);
             printWriter2.println("textBackgroundOpacity:" + this.textBackgroundOpacity);
             printWriter2.println("backgroundForChatOnly:" + this.backgroundForChatOnly);
             if (this.minecraft.getWindow().getPreferredFullscreenVideoMode().isPresent()) {
@@ -590,6 +620,7 @@ public class Options {
             printWriter2.println("overrideHeight:" + this.overrideHeight);
             printWriter2.println("heldItemTooltips:" + this.heldItemTooltips);
             printWriter2.println("chatHeightFocused:" + this.chatHeightFocused);
+            printWriter2.println("chatDelay: " + this.chatDelay);
             printWriter2.println("chatHeightUnfocused:" + this.chatHeightUnfocused);
             printWriter2.println("chatScale:" + this.chatScale);
             printWriter2.println("chatWidth:" + this.chatWidth);
@@ -603,14 +634,15 @@ public class Options {
             printWriter2.println("rawMouseInput:" + Option.RAW_MOUSE_INPUT.get(this));
             printWriter2.println("glDebugVerbosity:" + this.glDebugVerbosity);
             printWriter2.println("skipMultiplayerWarning:" + this.skipMultiplayerWarning);
-            for (final KeyMapping dbk7 : this.keyMappings) {
-                printWriter2.println("key_" + dbk7.getName() + ":" + dbk7.saveString());
+            printWriter2.println("syncChunkWrites:" + this.syncWrites);
+            for (final KeyMapping dlu7 : this.keyMappings) {
+                printWriter2.println("key_" + dlu7.getName() + ":" + dlu7.saveString());
             }
-            for (final SoundSource aaj7 : SoundSource.values()) {
-                printWriter2.println("soundCategory_" + aaj7.getName() + ":" + this.getSoundSourceVolume(aaj7));
+            for (final SoundSource acm7 : SoundSource.values()) {
+                printWriter2.println("soundCategory_" + acm7.getName() + ":" + this.getSoundSourceVolume(acm7));
             }
-            for (final PlayerModelPart ayk7 : PlayerModelPart.values()) {
-                printWriter2.println("modelPart_" + ayk7.getId() + ":" + this.modelParts.contains(ayk7));
+            for (final PlayerModelPart bed7 : PlayerModelPart.values()) {
+                printWriter2.println("modelPart_" + bed7.getId() + ":" + this.modelParts.contains(bed7));
             }
         }
         catch (Exception exception2) {
@@ -619,23 +651,23 @@ public class Options {
         this.broadcastOptions();
     }
     
-    public float getSoundSourceVolume(final SoundSource aaj) {
-        if (this.sourceVolumes.containsKey(aaj)) {
-            return this.sourceVolumes.get(aaj);
+    public float getSoundSourceVolume(final SoundSource acm) {
+        if (this.sourceVolumes.containsKey(acm)) {
+            return this.sourceVolumes.get(acm);
         }
         return 1.0f;
     }
     
-    public void setSoundCategoryVolume(final SoundSource aaj, final float float2) {
-        this.sourceVolumes.put(aaj, float2);
-        this.minecraft.getSoundManager().updateSourceVolume(aaj, float2);
+    public void setSoundCategoryVolume(final SoundSource acm, final float float2) {
+        this.sourceVolumes.put(acm, float2);
+        this.minecraft.getSoundManager().updateSourceVolume(acm, float2);
     }
     
     public void broadcastOptions() {
         if (this.minecraft.player != null) {
             int integer2 = 0;
-            for (final PlayerModelPart ayk4 : this.modelParts) {
-                integer2 |= ayk4.getMask();
+            for (final PlayerModelPart bed4 : this.modelParts) {
+                integer2 |= bed4.getMask();
             }
             this.minecraft.player.connection.send(new ServerboundClientInformationPacket(this.languageCode, this.renderDistance, this.chatVisibility, this.chatColors, integer2, this.mainHand));
         }
@@ -645,22 +677,22 @@ public class Options {
         return ImmutableSet.copyOf(this.modelParts);
     }
     
-    public void setModelPart(final PlayerModelPart ayk, final boolean boolean2) {
+    public void setModelPart(final PlayerModelPart bed, final boolean boolean2) {
         if (boolean2) {
-            this.modelParts.add(ayk);
+            this.modelParts.add(bed);
         }
         else {
-            this.modelParts.remove(ayk);
+            this.modelParts.remove(bed);
         }
         this.broadcastOptions();
     }
     
-    public void toggleModelPart(final PlayerModelPart ayk) {
-        if (this.getModelParts().contains(ayk)) {
-            this.modelParts.remove(ayk);
+    public void toggleModelPart(final PlayerModelPart bed) {
+        if (this.getModelParts().contains(bed)) {
+            this.modelParts.remove(bed);
         }
         else {
-            this.modelParts.add(ayk);
+            this.modelParts.add(bed);
         }
         this.broadcastOptions();
     }
@@ -676,54 +708,38 @@ public class Options {
         return this.useNativeTransport;
     }
     
-    public void loadResourcePacks(final PackRepository<UnopenedResourcePack> yq) {
-        yq.reload();
-        final Set<UnopenedResourcePack> set3 = Sets.newLinkedHashSet();
+    public void loadSelectedResourcePacks(final PackRepository<ResourcePack> aar) {
+        final Set<String> set3 = Sets.newLinkedHashSet();
         final Iterator<String> iterator4 = this.resourcePacks.iterator();
         while (iterator4.hasNext()) {
             final String string5 = iterator4.next();
-            UnopenedResourcePack ebc6 = yq.getPack(string5);
-            if (ebc6 == null && !string5.startsWith("file/")) {
-                ebc6 = yq.getPack("file/" + string5);
+            ResourcePack eml6 = aar.getPack(string5);
+            if (eml6 == null && !string5.startsWith("file/")) {
+                eml6 = aar.getPack("file/" + string5);
             }
-            if (ebc6 == null) {
+            if (eml6 == null) {
                 Options.LOGGER.warn("Removed resource pack {} from options because it doesn't seem to exist anymore", string5);
                 iterator4.remove();
             }
-            else if (!ebc6.getCompatibility().isCompatible() && !this.incompatibleResourcePacks.contains(string5)) {
+            else if (!eml6.getCompatibility().isCompatible() && !this.incompatibleResourcePacks.contains(string5)) {
                 Options.LOGGER.warn("Removed resource pack {} from options because it is no longer compatible", string5);
                 iterator4.remove();
             }
-            else if (ebc6.getCompatibility().isCompatible() && this.incompatibleResourcePacks.contains(string5)) {
+            else if (eml6.getCompatibility().isCompatible() && this.incompatibleResourcePacks.contains(string5)) {
                 Options.LOGGER.info("Removed resource pack {} from incompatibility list because it's now compatible", string5);
                 this.incompatibleResourcePacks.remove(string5);
             }
             else {
-                set3.add(ebc6);
+                set3.add(eml6.getId());
             }
         }
-        yq.setSelected(set3);
+        aar.setSelected(set3);
     }
     
     static {
         LOGGER = LogManager.getLogger();
         GSON = new Gson();
-        RESOURCE_PACK_TYPE = new ParameterizedType() {
-            @Override
-            public Type[] getActualTypeArguments() {
-                return new Type[] { String.class };
-            }
-            
-            @Override
-            public Type getRawType() {
-                return List.class;
-            }
-            
-            @Override
-            public Type getOwnerType() {
-                return null;
-            }
-        };
+        RESOURCE_PACK_TYPE = new TypeToken<List<String>>() {};
         OPTION_SPLITTER = Splitter.on(':').limit(2);
     }
 }
diff --git a/src/net/minecraft/client/ProgressOption.java b/src/net/minecraft/client/ProgressOption.java
index f618078..6f9f880 100644
--- a/src/net/minecraft/client/ProgressOption.java
+++ b/src/net/minecraft/client/ProgressOption.java
@@ -3,6 +3,7 @@ package net.minecraft.client;
 import net.minecraft.util.Mth;
 import net.minecraft.client.gui.components.SliderButton;
 import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.network.chat.Component;
 import java.util.function.BiFunction;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -13,9 +14,9 @@ public class ProgressOption extends Option {
     protected double maxValue;
     private final Function<Options, Double> getter;
     private final BiConsumer<Options, Double> setter;
-    private final BiFunction<Options, ProgressOption, String> toString;
+    private final BiFunction<Options, ProgressOption, Component> toString;
     
-    public ProgressOption(final String string, final double double2, final double double3, final float float4, final Function<Options, Double> function, final BiConsumer<Options, Double> biConsumer, final BiFunction<Options, ProgressOption, String> biFunction) {
+    public ProgressOption(final String string, final double double2, final double double3, final float float4, final Function<Options, Double> function, final BiConsumer<Options, Double> biConsumer, final BiFunction<Options, ProgressOption, Component> biFunction) {
         super(string);
         this.minValue = double2;
         this.maxValue = double3;
@@ -26,8 +27,8 @@ public class ProgressOption extends Option {
     }
     
     @Override
-    public AbstractWidget createButton(final Options dbr, final int integer2, final int integer3, final int integer4) {
-        return new SliderButton(dbr, integer2, integer3, integer4, 20, this);
+    public AbstractWidget createButton(final Options dmb, final int integer2, final int integer3, final int integer4) {
+        return new SliderButton(dmb, integer2, integer3, integer4, 20, this);
     }
     
     public double toPct(final double double1) {
@@ -57,15 +58,15 @@ public class ProgressOption extends Option {
         this.maxValue = float1;
     }
     
-    public void set(final Options dbr, final double double2) {
-        this.setter.accept(dbr, double2);
+    public void set(final Options dmb, final double double2) {
+        this.setter.accept(dmb, double2);
     }
     
-    public double get(final Options dbr) {
-        return this.getter.apply(dbr);
+    public double get(final Options dmb) {
+        return this.getter.apply(dmb);
     }
     
-    public String getMessage(final Options dbr) {
-        return this.toString.apply(dbr, this);
+    public Component getMessage(final Options dmb) {
+        return this.toString.apply(dmb, this);
     }
 }
diff --git a/src/net/minecraft/client/RecipeBookCategories.java b/src/net/minecraft/client/RecipeBookCategories.java
index f11b5e2..20f11f7 100644
--- a/src/net/minecraft/client/RecipeBookCategories.java
+++ b/src/net/minecraft/client/RecipeBookCategories.java
@@ -9,10 +9,10 @@ import java.util.List;
 
 public enum RecipeBookCategories {
     SEARCH(new ItemStack[] { new ItemStack(Items.COMPASS) }), 
-    BUILDING_BLOCKS(new ItemStack[] { new ItemStack(Blocks.BRICKS) }), 
-    REDSTONE(new ItemStack[] { new ItemStack(Items.REDSTONE) }), 
-    EQUIPMENT(new ItemStack[] { new ItemStack(Items.IRON_AXE), new ItemStack(Items.GOLDEN_SWORD) }), 
-    MISC(new ItemStack[] { new ItemStack(Items.LAVA_BUCKET), new ItemStack(Items.APPLE) }), 
+    CRAFTING_BUILDING_BLOCKS(new ItemStack[] { new ItemStack(Blocks.BRICKS) }), 
+    CRAFTING_REDSTONE(new ItemStack[] { new ItemStack(Items.REDSTONE) }), 
+    CRAFTING_EQUIPMENT(new ItemStack[] { new ItemStack(Items.IRON_AXE), new ItemStack(Items.GOLDEN_SWORD) }), 
+    CRAFTING_MISC(new ItemStack[] { new ItemStack(Items.LAVA_BUCKET), new ItemStack(Items.APPLE) }), 
     FURNACE_SEARCH(new ItemStack[] { new ItemStack(Items.COMPASS) }), 
     FURNACE_FOOD(new ItemStack[] { new ItemStack(Items.PORKCHOP) }), 
     FURNACE_BLOCKS(new ItemStack[] { new ItemStack(Blocks.STONE) }), 
@@ -23,7 +23,9 @@ public enum RecipeBookCategories {
     SMOKER_SEARCH(new ItemStack[] { new ItemStack(Items.COMPASS) }), 
     SMOKER_FOOD(new ItemStack[] { new ItemStack(Items.PORKCHOP) }), 
     STONECUTTER(new ItemStack[] { new ItemStack(Items.CHISELED_STONE_BRICKS) }), 
-    CAMPFIRE(new ItemStack[] { new ItemStack(Items.PORKCHOP) });
+    SMITHING(new ItemStack[] { new ItemStack(Items.NETHERITE_CHESTPLATE) }), 
+    CAMPFIRE(new ItemStack[] { new ItemStack(Items.PORKCHOP) }), 
+    UNKNOWN(new ItemStack[] { new ItemStack(Items.BARRIER) });
     
     private final List<ItemStack> itemIcons;
     
diff --git a/src/net/minecraft/client/Screenshot.java b/src/net/minecraft/client/Screenshot.java
index cbc3f51..6f29e06 100644
--- a/src/net/minecraft/client/Screenshot.java
+++ b/src/net/minecraft/client/Screenshot.java
@@ -9,7 +9,7 @@ import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TextComponent;
-import net.minecraft.server.packs.resources.SimpleResource;
+import net.minecraft.Util;
 import com.mojang.blaze3d.systems.RenderSystem;
 import javax.annotation.Nullable;
 import net.minecraft.network.chat.Component;
@@ -23,21 +23,21 @@ public class Screenshot {
     private static final Logger LOGGER;
     private static final DateFormat DATE_FORMAT;
     
-    public static void grab(final File file, final int integer2, final int integer3, final RenderTarget cxe, final Consumer<Component> consumer) {
-        grab(file, null, integer2, integer3, cxe, consumer);
+    public static void grab(final File file, final int integer2, final int integer3, final RenderTarget dgf, final Consumer<Component> consumer) {
+        grab(file, null, integer2, integer3, dgf, consumer);
     }
     
-    public static void grab(final File file, @Nullable final String string, final int integer3, final int integer4, final RenderTarget cxe, final Consumer<Component> consumer) {
+    public static void grab(final File file, @Nullable final String string, final int integer3, final int integer4, final RenderTarget dgf, final Consumer<Component> consumer) {
         if (!RenderSystem.isOnRenderThread()) {
-            RenderSystem.recordRenderCall(() -> _grab(file, string, integer3, integer4, cxe, consumer));
+            RenderSystem.recordRenderCall(() -> _grab(file, string, integer3, integer4, dgf, consumer));
         }
         else {
-            _grab(file, string, integer3, integer4, cxe, consumer);
+            _grab(file, string, integer3, integer4, dgf, consumer);
         }
     }
     
-    private static void _grab(final File file, @Nullable final String string, final int integer3, final int integer4, final RenderTarget cxe, final Consumer<Component> consumer) {
-        final NativeImage cxr7 = takeScreenshot(integer3, integer4, cxe);
+    private static void _grab(final File file, @Nullable final String string, final int integer3, final int integer4, final RenderTarget dgf, final Consumer<Component> consumer) {
+        final NativeImage dgs7 = takeScreenshot(integer3, integer4, dgf);
         final File file2 = new File(file, "screenshots");
         file2.mkdir();
         if (string == null) {
@@ -48,14 +48,14 @@ public class Screenshot {
         }
         final NativeImage nativeImage;
         final File file4;
-        Component lf4;
+        Component mr4;
         final TranslatableComponent translatableComponent;
         final TranslatableComponent translatableComponent2;
-        SimpleResource.IO_EXECUTOR.execute(() -> {
+        Util.ioPool().execute(() -> {
             try {
                 nativeImage.writeToFile(file4);
-                lf4 = new TextComponent(file4.getName()).withStyle(ChatFormatting.UNDERLINE).withStyle(ln -> ln.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file4.getAbsolutePath())));
-                new TranslatableComponent("screenshot.success", new Object[] { lf4 });
+                mr4 = new TextComponent(file4.getName()).withStyle(ChatFormatting.UNDERLINE).withStyle(nb -> nb.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file4.getAbsolutePath())));
+                new TranslatableComponent("screenshot.success", new Object[] { mr4 });
                 consumer.accept(translatableComponent);
             }
             catch (Exception exception4) {
@@ -69,14 +69,14 @@ public class Screenshot {
         });
     }
     
-    public static NativeImage takeScreenshot(int integer1, int integer2, final RenderTarget cxe) {
-        integer1 = cxe.width;
-        integer2 = cxe.height;
-        final NativeImage cxr4 = new NativeImage(integer1, integer2, false);
-        RenderSystem.bindTexture(cxe.colorTextureId);
-        cxr4.downloadTexture(0, true);
-        cxr4.flipY();
-        return cxr4;
+    public static NativeImage takeScreenshot(int integer1, int integer2, final RenderTarget dgf) {
+        integer1 = dgf.width;
+        integer2 = dgf.height;
+        final NativeImage dgs4 = new NativeImage(integer1, integer2, false);
+        RenderSystem.bindTexture(dgf.colorTextureId);
+        dgs4.downloadTexture(0, true);
+        dgs4.flipY();
+        return dgs4;
     }
     
     private static File getFile(final File file) {
diff --git a/src/net/minecraft/client/Session.java b/src/net/minecraft/client/Session.java
index 20716aa..67e4c72 100644
--- a/src/net/minecraft/client/Session.java
+++ b/src/net/minecraft/client/Session.java
@@ -14,18 +14,18 @@ public class Session implements GameSession {
     private final String gameMode;
     private final UUID id;
     
-    public Session(final ClientLevel dno, final LocalPlayer dqb, final ClientPacketListener dnp) {
-        this.players = dnp.getOnlinePlayers().size();
-        this.isRemoteServer = !dnp.getConnection().isMemoryConnection();
-        this.difficulty = dno.getDifficulty().getKey();
-        final PlayerInfo dns5 = dnp.getPlayerInfo(dqb.getUUID());
-        if (dns5 != null) {
-            this.gameMode = dns5.getGameMode().getName();
+    public Session(final ClientLevel dym, final LocalPlayer ebf, final ClientPacketListener dyn) {
+        this.players = dyn.getOnlinePlayers().size();
+        this.isRemoteServer = !dyn.getConnection().isMemoryConnection();
+        this.difficulty = dym.getDifficulty().getKey();
+        final PlayerInfo dyq5 = dyn.getPlayerInfo(ebf.getUUID());
+        if (dyq5 != null) {
+            this.gameMode = dyq5.getGameMode().getName();
         }
         else {
             this.gameMode = "unknown";
         }
-        this.id = dnp.getId();
+        this.id = dyn.getId();
     }
     
     public int getPlayerCount() {
diff --git a/src/net/minecraft/client/StringDecomposer.java b/src/net/minecraft/client/StringDecomposer.java
new file mode 100644
index 0000000..7ac478a
--- /dev/null
+++ b/src/net/minecraft/client/StringDecomposer.java
@@ -0,0 +1,152 @@
+package net.minecraft.client;
+
+import net.minecraft.util.Unit;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Style;
+import java.util.Optional;
+
+public class StringDecomposer {
+    private static final Optional<Object> STOP_ITERATION;
+    
+    private static boolean feedChar(final Style nb, final Output a, final int integer, final char character) {
+        if (Character.isSurrogate(character)) {
+            return a.onChar(integer, nb, 65533);
+        }
+        return a.onChar(integer, nb, character);
+    }
+    
+    public static boolean iterate(final String string, final Style nb, final Output a) {
+        for (int integer4 = string.length(), integer5 = 0; integer5 < integer4; ++integer5) {
+            final char character6 = string.charAt(integer5);
+            if (Character.isHighSurrogate(character6)) {
+                if (integer5 + 1 >= integer4) {
+                    if (!a.onChar(integer5, nb, 65533)) {
+                        return false;
+                    }
+                    break;
+                }
+                else {
+                    final char character7 = string.charAt(integer5 + 1);
+                    if (Character.isLowSurrogate(character7)) {
+                        if (!a.onChar(integer5, nb, Character.toCodePoint(character6, character7))) {
+                            return false;
+                        }
+                        ++integer5;
+                    }
+                    else if (!a.onChar(integer5, nb, 65533)) {
+                        return false;
+                    }
+                }
+            }
+            else if (!feedChar(nb, a, integer5, character6)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    public static boolean iterateBackwards(final String string, final Style nb, final Output a) {
+        final int integer4 = string.length();
+        for (int integer5 = integer4 - 1; integer5 >= 0; --integer5) {
+            final char character6 = string.charAt(integer5);
+            if (Character.isLowSurrogate(character6)) {
+                if (integer5 - 1 < 0) {
+                    if (!a.onChar(0, nb, 65533)) {
+                        return false;
+                    }
+                    break;
+                }
+                else {
+                    final char character7 = string.charAt(integer5 - 1);
+                    if (Character.isHighSurrogate(character7)) {
+                        --integer5;
+                        if (!a.onChar(integer5, nb, Character.toCodePoint(character7, character6))) {
+                            return false;
+                        }
+                    }
+                    else if (!a.onChar(integer5, nb, 65533)) {
+                        return false;
+                    }
+                }
+            }
+            else if (!feedChar(nb, a, integer5, character6)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    public static boolean iterateFormatted(final String string, final Style nb, final Output a) {
+        return iterateFormatted(string, 0, nb, a);
+    }
+    
+    public static boolean iterateFormatted(final String string, final int integer, final Style nb, final Output a) {
+        return iterateFormatted(string, integer, nb, nb, a);
+    }
+    
+    public static boolean iterateFormatted(final String string, final int integer, final Style nb3, final Style nb4, final Output a) {
+        final int integer2 = string.length();
+        Style nb5 = nb3;
+        for (int integer3 = integer; integer3 < integer2; ++integer3) {
+            final char character9 = string.charAt(integer3);
+            if (character9 == '§') {
+                if (integer3 + 1 >= integer2) {
+                    break;
+                }
+                final char character10 = string.charAt(integer3 + 1);
+                final ChatFormatting i11 = ChatFormatting.getByCode(character10);
+                if (i11 != null) {
+                    nb5 = ((i11 == ChatFormatting.RESET) ? nb4 : nb5.applyLegacyFormat(i11));
+                }
+                ++integer3;
+            }
+            else if (Character.isHighSurrogate(character9)) {
+                if (integer3 + 1 >= integer2) {
+                    if (!a.onChar(integer3, nb5, 65533)) {
+                        return false;
+                    }
+                    break;
+                }
+                else {
+                    final char character10 = string.charAt(integer3 + 1);
+                    if (Character.isLowSurrogate(character10)) {
+                        if (!a.onChar(integer3, nb5, Character.toCodePoint(character9, character10))) {
+                            return false;
+                        }
+                        ++integer3;
+                    }
+                    else if (!a.onChar(integer3, nb5, 65533)) {
+                        return false;
+                    }
+                }
+            }
+            else if (!feedChar(nb5, a, integer3, character9)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    public static boolean iterateFormatted(final FormattedText mu, final Style nb, final Output a) {
+        return !mu.visit((nb, string) -> iterateFormatted(string, 0, nb, a) ? Optional.empty() : StringDecomposer.STOP_ITERATION, nb).isPresent();
+    }
+    
+    public static String filterBrokenSurrogates(final String string) {
+        final StringBuilder stringBuilder2 = new StringBuilder();
+        iterate(string, Style.EMPTY, (integer2, nb, integer4) -> {
+            stringBuilder2.appendCodePoint(integer4);
+            return true;
+        });
+        return stringBuilder2.toString();
+    }
+    
+    static {
+        STOP_ITERATION = Optional.<Unit>of(Unit.INSTANCE);
+    }
+    
+    @FunctionalInterface
+    public interface Output {
+        boolean onChar(final int integer1, final Style nb, final int integer3);
+    }
+}
diff --git a/src/net/minecraft/client/StringSplitter.java b/src/net/minecraft/client/StringSplitter.java
new file mode 100644
index 0000000..954aa8a
--- /dev/null
+++ b/src/net/minecraft/client/StringSplitter.java
@@ -0,0 +1,416 @@
+package net.minecraft.client;
+
+import java.util.function.Consumer;
+import java.util.ListIterator;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.Iterator;
+import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.Optional;
+import org.apache.commons.lang3.mutable.MutableInt;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.Style;
+import org.apache.commons.lang3.mutable.MutableFloat;
+import javax.annotation.Nullable;
+
+public class StringSplitter {
+    private final WidthProvider widthProvider;
+    
+    public StringSplitter(final WidthProvider f) {
+        this.widthProvider = f;
+    }
+    
+    public float stringWidth(@Nullable final String string) {
+        if (string == null) {
+            return 0.0f;
+        }
+        final MutableFloat mutableFloat3 = new MutableFloat();
+        StringDecomposer.iterateFormatted(string, Style.EMPTY, (integer2, nb, integer4) -> {
+            mutableFloat3.add(this.widthProvider.getWidth(integer4, nb));
+            return true;
+        });
+        return mutableFloat3.floatValue();
+    }
+    
+    public float stringWidth(final FormattedText mu) {
+        final MutableFloat mutableFloat3 = new MutableFloat();
+        StringDecomposer.iterateFormatted(mu, Style.EMPTY, (integer2, nb, integer4) -> {
+            mutableFloat3.add(this.widthProvider.getWidth(integer4, nb));
+            return true;
+        });
+        return mutableFloat3.floatValue();
+    }
+    
+    public int plainIndexAtWidth(final String string, final int integer, final Style nb) {
+        final WidthLimitedCharSink e5 = new WidthLimitedCharSink((float)integer);
+        StringDecomposer.iterate(string, nb, e5);
+        return e5.getPosition();
+    }
+    
+    public String plainHeadByWidth(final String string, final int integer, final Style nb) {
+        return string.substring(0, this.plainIndexAtWidth(string, integer, nb));
+    }
+    
+    public String plainTailByWidth(final String string, final int integer, final Style nb) {
+        final MutableFloat mutableFloat5 = new MutableFloat();
+        final MutableInt mutableInt6 = new MutableInt(string.length());
+        final MutableFloat mutableFloat6;
+        final float float8;
+        final MutableInt mutableInt7;
+        StringDecomposer.iterateBackwards(string, nb, (integer4, nb, integer6) -> {
+            float8 = mutableFloat6.addAndGet(this.widthProvider.getWidth(integer6, nb));
+            if (float8 > integer) {
+                return false;
+            }
+            else {
+                mutableInt7.setValue(integer4);
+                return true;
+            }
+        });
+        return string.substring(mutableInt6.intValue());
+    }
+    
+    @Nullable
+    public Style componentStyleAtWidth(final FormattedText mu, final int integer) {
+        final WidthLimitedCharSink e4 = new WidthLimitedCharSink((float)integer);
+        return mu.<Style>visit((nb, string) -> StringDecomposer.iterateFormatted(string, nb, e4) ? Optional.<Style>empty() : Optional.<Style>of(nb), Style.EMPTY).orElse(null);
+    }
+    
+    public FormattedText headByWidth(final FormattedText mu, final int integer, final Style nb) {
+        final WidthLimitedCharSink e5 = new WidthLimitedCharSink((float)integer);
+        return mu.<FormattedText>visit((FormattedText.StyledContentConsumer<FormattedText>)new FormattedText.StyledContentConsumer<FormattedText>() {
+            private final ComponentCollector collector = new ComponentCollector();
+            
+            @Override
+            public Optional<FormattedText> accept(final Style nb, final String string) {
+                e5.resetPosition();
+                if (!StringDecomposer.iterateFormatted(string, nb, e5)) {
+                    final String string2 = string.substring(0, e5.getPosition());
+                    if (!string2.isEmpty()) {
+                        this.collector.append(FormattedText.of(string2, nb));
+                    }
+                    return Optional.<FormattedText>of(this.collector.getResultOrEmpty());
+                }
+                if (!string.isEmpty()) {
+                    this.collector.append(FormattedText.of(string, nb));
+                }
+                return Optional.<FormattedText>empty();
+            }
+        }, nb).orElse(mu);
+    }
+    
+    public static int getWordPosition(final String string, final int integer2, final int integer3, final boolean boolean4) {
+        int integer4 = integer3;
+        final boolean boolean5 = integer2 < 0;
+        for (int integer5 = Math.abs(integer2), integer6 = 0; integer6 < integer5; ++integer6) {
+            if (boolean5) {
+                while (boolean4 && integer4 > 0 && (string.charAt(integer4 - 1) == ' ' || string.charAt(integer4 - 1) == '\n')) {
+                    --integer4;
+                }
+                while (integer4 > 0 && string.charAt(integer4 - 1) != ' ' && string.charAt(integer4 - 1) != '\n') {
+                    --integer4;
+                }
+            }
+            else {
+                final int integer7 = string.length();
+                final int integer8 = string.indexOf(32, integer4);
+                final int integer9 = string.indexOf(10, integer4);
+                if (integer8 == -1 && integer9 == -1) {
+                    integer4 = -1;
+                }
+                else if (integer8 != -1 && integer9 != -1) {
+                    integer4 = Math.min(integer8, integer9);
+                }
+                else if (integer8 != -1) {
+                    integer4 = integer8;
+                }
+                else {
+                    integer4 = integer9;
+                }
+                if (integer4 == -1) {
+                    integer4 = integer7;
+                }
+                else {
+                    while (boolean4 && integer4 < integer7 && (string.charAt(integer4) == ' ' || string.charAt(integer4) == '\n')) {
+                        ++integer4;
+                    }
+                }
+            }
+        }
+        return integer4;
+    }
+    
+    public void splitLines(final String string, final int integer, final Style nb, final boolean boolean4, final LinePosConsumer d) {
+        int integer2 = 0;
+        final int integer3 = string.length();
+        Style nb2 = nb;
+        while (integer2 < integer3) {
+            final LineBreakFinder b10 = new LineBreakFinder((float)integer);
+            final boolean boolean5 = StringDecomposer.iterateFormatted(string, integer2, nb2, nb, b10);
+            if (boolean5) {
+                d.accept(nb2, integer2, integer3);
+                break;
+            }
+            final int integer4 = b10.getSplitPosition();
+            final char character13 = string.charAt(integer4);
+            final int integer5 = (character13 == '\n' || character13 == ' ') ? (integer4 + 1) : integer4;
+            d.accept(nb2, integer2, boolean4 ? integer5 : integer4);
+            integer2 = integer5;
+            nb2 = b10.getSplitStyle();
+        }
+    }
+    
+    public List<FormattedText> splitLines(final String string, final int integer, final Style nb) {
+        final List<FormattedText> list5 = Lists.newArrayList();
+        this.splitLines(string, integer, nb, false, (nb, integer4, integer5) -> list5.add(FormattedText.of(string.substring(integer4, integer5), nb)));
+        return list5;
+    }
+    
+    public List<FormattedText> splitLines(final FormattedText mu, final int integer, final Style nb) {
+        return this.splitLines(mu, integer, nb, null);
+    }
+    
+    public List<FormattedText> splitLines(final FormattedText mu1, final int integer, final Style nb, @Nullable final FormattedText mu4) {
+        final List<FormattedText> list6 = Lists.newArrayList();
+        final List<LineComponent> list7 = Lists.newArrayList();
+        final List<LineComponent> list8;
+        mu1.visit((nb, string) -> {
+            if (!string.isEmpty()) {
+                list8.add(new LineComponent(string, nb));
+            }
+            return Optional.empty();
+        }, nb);
+        final FlatComponents a8 = new FlatComponents(list7);
+        boolean boolean9 = true;
+        boolean boolean10 = false;
+        boolean boolean11 = false;
+        while (boolean9) {
+            boolean9 = false;
+            final LineBreakFinder b12 = new LineBreakFinder((float)integer);
+            for (final LineComponent c14 : a8.parts) {
+                final boolean boolean12 = StringDecomposer.iterateFormatted(c14.contents, 0, c14.style, nb, b12);
+                if (!boolean12) {
+                    final int integer2 = b12.getSplitPosition();
+                    final Style nb2 = b12.getSplitStyle();
+                    final char character18 = a8.charAt(integer2);
+                    final boolean boolean13 = character18 == '\n';
+                    final boolean boolean14 = boolean13 || character18 == ' ';
+                    boolean10 = boolean13;
+                    final FormattedText mu5 = a8.splitAt(integer2, boolean14 ? 1 : 0, nb2);
+                    list6.add(this.formattedLine(mu5, boolean11, mu4));
+                    boolean11 = !boolean13;
+                    boolean9 = true;
+                    break;
+                }
+                b12.addToOffset(c14.contents.length());
+            }
+        }
+        final FormattedText mu6 = a8.getRemainder();
+        if (mu6 != null) {
+            list6.add(this.formattedLine(mu6, boolean11, mu4));
+        }
+        else if (boolean10) {
+            list6.add(FormattedText.EMPTY);
+        }
+        return list6;
+    }
+    
+    private FormattedText formattedLine(final FormattedText mu1, final boolean boolean2, final FormattedText mu3) {
+        if (boolean2 && mu3 != null) {
+            return FormattedText.composite(mu3, mu1);
+        }
+        return mu1;
+    }
+    
+    class WidthLimitedCharSink implements StringDecomposer.Output {
+        private float maxWidth;
+        private int position;
+        
+        public WidthLimitedCharSink(final float float2) {
+            this.maxWidth = float2;
+        }
+        
+        @Override
+        public boolean onChar(final int integer1, final Style nb, final int integer3) {
+            this.maxWidth -= StringSplitter.this.widthProvider.getWidth(integer3, nb);
+            if (this.maxWidth >= 0.0f) {
+                this.position = integer1 + Character.charCount(integer3);
+                return true;
+            }
+            return false;
+        }
+        
+        public int getPosition() {
+            return this.position;
+        }
+        
+        public void resetPosition() {
+            this.position = 0;
+        }
+    }
+    
+    class LineBreakFinder implements StringDecomposer.Output {
+        private final float maxWidth;
+        private int lineBreak;
+        private Style lineBreakStyle;
+        private boolean hadNonZeroWidthChar;
+        private float width;
+        private int lastSpace;
+        private Style lastSpaceStyle;
+        private int nextChar;
+        private int offset;
+        
+        public LineBreakFinder(final float float2) {
+            this.lineBreak = -1;
+            this.lineBreakStyle = Style.EMPTY;
+            this.lastSpace = -1;
+            this.lastSpaceStyle = Style.EMPTY;
+            this.maxWidth = Math.max(float2, 1.0f);
+        }
+        
+        @Override
+        public boolean onChar(final int integer1, final Style nb, final int integer3) {
+            final int integer4 = integer1 + this.offset;
+            switch (integer3) {
+                case 10: {
+                    return this.finishIteration(integer4, nb);
+                }
+                case 32: {
+                    this.lastSpace = integer4;
+                    this.lastSpaceStyle = nb;
+                    break;
+                }
+            }
+            final float float6 = StringSplitter.this.widthProvider.getWidth(integer3, nb);
+            this.width += float6;
+            if (!this.hadNonZeroWidthChar || this.width <= this.maxWidth) {
+                this.hadNonZeroWidthChar |= (float6 != 0.0f);
+                this.nextChar = integer4 + Character.charCount(integer3);
+                return true;
+            }
+            if (this.lastSpace != -1) {
+                return this.finishIteration(this.lastSpace, this.lastSpaceStyle);
+            }
+            return this.finishIteration(integer4, nb);
+        }
+        
+        private boolean finishIteration(final int integer, final Style nb) {
+            this.lineBreak = integer;
+            this.lineBreakStyle = nb;
+            return false;
+        }
+        
+        private boolean lineBreakFound() {
+            return this.lineBreak != -1;
+        }
+        
+        public int getSplitPosition() {
+            return this.lineBreakFound() ? this.lineBreak : this.nextChar;
+        }
+        
+        public Style getSplitStyle() {
+            return this.lineBreakStyle;
+        }
+        
+        public void addToOffset(final int integer) {
+            this.offset += integer;
+        }
+    }
+    
+    static class LineComponent implements FormattedText {
+        private final String contents;
+        private final Style style;
+        
+        public LineComponent(final String string, final Style nb) {
+            this.contents = string;
+            this.style = nb;
+        }
+        
+        @Override
+        public <T> Optional<T> visit(final ContentConsumer<T> a) {
+            return a.accept(this.contents);
+        }
+        
+        @Override
+        public <T> Optional<T> visit(final StyledContentConsumer<T> b, final Style nb) {
+            return b.accept(this.style.applyTo(nb), this.contents);
+        }
+    }
+    
+    static class FlatComponents {
+        private final List<LineComponent> parts;
+        private String flatParts;
+        
+        public FlatComponents(final List<LineComponent> list) {
+            this.parts = list;
+            this.flatParts = list.stream().map(c -> c.contents).collect(Collectors.joining());
+        }
+        
+        public char charAt(final int integer) {
+            return this.flatParts.charAt(integer);
+        }
+        
+        public FormattedText splitAt(final int integer1, final int integer2, final Style nb) {
+            final ComponentCollector dlm5 = new ComponentCollector();
+            final ListIterator<LineComponent> listIterator6 = this.parts.listIterator();
+            int integer3 = integer1;
+            boolean boolean8 = false;
+            while (listIterator6.hasNext()) {
+                final LineComponent c9 = listIterator6.next();
+                final String string10 = c9.contents;
+                final int integer4 = string10.length();
+                if (!boolean8) {
+                    if (integer3 > integer4) {
+                        dlm5.append(c9);
+                        listIterator6.remove();
+                        integer3 -= integer4;
+                    }
+                    else {
+                        final String string11 = string10.substring(0, integer3);
+                        if (!string11.isEmpty()) {
+                            dlm5.append(FormattedText.of(string11, c9.style));
+                        }
+                        integer3 += integer2;
+                        boolean8 = true;
+                    }
+                }
+                if (boolean8) {
+                    if (integer3 > integer4) {
+                        listIterator6.remove();
+                        integer3 -= integer4;
+                    }
+                    else {
+                        final String string11 = string10.substring(integer3);
+                        if (string11.isEmpty()) {
+                            listIterator6.remove();
+                            break;
+                        }
+                        listIterator6.set(new LineComponent(string11, nb));
+                        break;
+                    }
+                }
+            }
+            this.flatParts = this.flatParts.substring(integer1 + integer2);
+            return dlm5.getResultOrEmpty();
+        }
+        
+        @Nullable
+        public FormattedText getRemainder() {
+            final ComponentCollector dlm2 = new ComponentCollector();
+            this.parts.forEach(dlm2::append);
+            this.parts.clear();
+            return dlm2.getResult();
+        }
+    }
+    
+    @FunctionalInterface
+    public interface LinePosConsumer {
+        void accept(final Style nb, final int integer2, final int integer3);
+    }
+    
+    @FunctionalInterface
+    public interface WidthProvider {
+        float getWidth(final int integer, final Style nb);
+    }
+}
diff --git a/src/net/minecraft/client/Timer.java b/src/net/minecraft/client/Timer.java
index 044ba9c..39adb95 100644
--- a/src/net/minecraft/client/Timer.java
+++ b/src/net/minecraft/client/Timer.java
@@ -1,7 +1,6 @@
 package net.minecraft.client;
 
 public class Timer {
-    public int ticks;
     public float partialTick;
     public float tickDelta;
     private long lastMs;
@@ -12,11 +11,12 @@ public class Timer {
         this.lastMs = long2;
     }
     
-    public void advanceTime(final long long1) {
+    public int advanceTime(final long long1) {
         this.tickDelta = (long1 - this.lastMs) / this.msPerTick;
         this.lastMs = long1;
         this.partialTick += this.tickDelta;
-        this.ticks = (int)this.partialTick;
-        this.partialTick -= this.ticks;
+        final int integer4 = (int)this.partialTick;
+        this.partialTick -= integer4;
+        return integer4;
     }
 }
diff --git a/src/net/minecraft/client/color/block/BlockColor.java b/src/net/minecraft/client/color/block/BlockColor.java
index 7d47358..5a172d2 100644
--- a/src/net/minecraft/client/color/block/BlockColor.java
+++ b/src/net/minecraft/client/color/block/BlockColor.java
@@ -6,5 +6,5 @@ import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
 
 public interface BlockColor {
-    int getColor(final BlockState byj, @Nullable final BlockAndTintGetter bje, @Nullable final BlockPos fk, final int integer);
+    int getColor(final BlockState cfj, @Nullable final BlockAndTintGetter bpe, @Nullable final BlockPos fu, final int integer);
 }
diff --git a/src/net/minecraft/client/color/block/BlockColors.java b/src/net/minecraft/client/color/block/BlockColors.java
index 5378dbf..87a6a1f 100644
--- a/src/net/minecraft/client/color/block/BlockColors.java
+++ b/src/net/minecraft/client/color/block/BlockColors.java
@@ -16,7 +16,7 @@ import net.minecraft.world.level.GrassColor;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.client.renderer.BiomeColors;
 import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
-import net.minecraft.world.level.block.ShearableDoublePlantBlock;
+import net.minecraft.world.level.block.DoublePlantBlock;
 import com.google.common.collect.Maps;
 import net.minecraft.world.level.block.state.properties.Property;
 import java.util.Set;
@@ -34,107 +34,107 @@ public class BlockColors {
     }
     
     public static BlockColors createDefault() {
-        final BlockColors dcb1 = new BlockColors();
-        dcb1.register((byj, bje, fk, integer) -> {
-            if (bje == null || fk == null) {
+        final BlockColors dmn1 = new BlockColors();
+        dmn1.register((cfj, bpe, fu, integer) -> {
+            if (bpe == null || fu == null) {
                 return -1;
             }
             else {
-                return BiomeColors.getAverageGrassColor(bje, (byj.<DoubleBlockHalf>getValue(ShearableDoublePlantBlock.HALF) == DoubleBlockHalf.UPPER) ? fk.below() : fk);
+                return BiomeColors.getAverageGrassColor(bpe, (cfj.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.UPPER) ? fu.below() : fu);
             }
         }, Blocks.LARGE_FERN, Blocks.TALL_GRASS);
-        dcb1.addColoringState(ShearableDoublePlantBlock.HALF, Blocks.LARGE_FERN, Blocks.TALL_GRASS);
-        dcb1.register((byj, bje, fk, integer) -> {
-            if (bje == null || fk == null) {
+        dmn1.addColoringState(DoublePlantBlock.HALF, Blocks.LARGE_FERN, Blocks.TALL_GRASS);
+        dmn1.register((cfj, bpe, fu, integer) -> {
+            if (bpe == null || fu == null) {
                 return GrassColor.get(0.5, 1.0);
             }
             else {
-                return BiomeColors.getAverageGrassColor(bje, fk);
+                return BiomeColors.getAverageGrassColor(bpe, fu);
             }
         }, Blocks.GRASS_BLOCK, Blocks.FERN, Blocks.GRASS, Blocks.POTTED_FERN);
-        dcb1.register((byj, bje, fk, integer) -> FoliageColor.getEvergreenColor(), Blocks.SPRUCE_LEAVES);
-        dcb1.register((byj, bje, fk, integer) -> FoliageColor.getBirchColor(), Blocks.BIRCH_LEAVES);
-        dcb1.register((byj, bje, fk, integer) -> {
-            if (bje == null || fk == null) {
+        dmn1.register((cfj, bpe, fu, integer) -> FoliageColor.getEvergreenColor(), Blocks.SPRUCE_LEAVES);
+        dmn1.register((cfj, bpe, fu, integer) -> FoliageColor.getBirchColor(), Blocks.BIRCH_LEAVES);
+        dmn1.register((cfj, bpe, fu, integer) -> {
+            if (bpe == null || fu == null) {
                 return FoliageColor.getDefaultColor();
             }
             else {
-                return BiomeColors.getAverageFoliageColor(bje, fk);
+                return BiomeColors.getAverageFoliageColor(bpe, fu);
             }
         }, Blocks.OAK_LEAVES, Blocks.JUNGLE_LEAVES, Blocks.ACACIA_LEAVES, Blocks.DARK_OAK_LEAVES, Blocks.VINE);
-        dcb1.register((byj, bje, fk, integer) -> {
-            if (bje == null || fk == null) {
+        dmn1.register((cfj, bpe, fu, integer) -> {
+            if (bpe == null || fu == null) {
                 return -1;
             }
             else {
-                return BiomeColors.getAverageWaterColor(bje, fk);
+                return BiomeColors.getAverageWaterColor(bpe, fu);
             }
         }, Blocks.WATER, Blocks.BUBBLE_COLUMN, Blocks.CAULDRON);
-        dcb1.register((byj, bje, fk, integer) -> RedStoneWireBlock.getColorForData(byj.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
-        dcb1.addColoringState(RedStoneWireBlock.POWER, Blocks.REDSTONE_WIRE);
-        dcb1.register((byj, bje, fk, integer) -> {
-            if (bje == null || fk == null) {
+        dmn1.register((cfj, bpe, fu, integer) -> RedStoneWireBlock.getColorForPower(cfj.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
+        dmn1.addColoringState(RedStoneWireBlock.POWER, Blocks.REDSTONE_WIRE);
+        dmn1.register((cfj, bpe, fu, integer) -> {
+            if (bpe == null || fu == null) {
                 return -1;
             }
             else {
-                return BiomeColors.getAverageGrassColor(bje, fk);
+                return BiomeColors.getAverageGrassColor(bpe, fu);
             }
         }, Blocks.SUGAR_CANE);
-        dcb1.register((byj, bje, fk, integer) -> 14731036, Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM);
+        dmn1.register((cfj, bpe, fu, integer) -> 14731036, Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM);
         final int integer5;
         final int integer6;
         final int integer7;
         final int integer8;
-        dcb1.register((byj, bje, fk, integer) -> {
-            integer5 = byj.<Integer>getValue((Property<Integer>)StemBlock.AGE);
+        dmn1.register((cfj, bpe, fu, integer) -> {
+            integer5 = cfj.<Integer>getValue((Property<Integer>)StemBlock.AGE);
             integer6 = integer5 * 32;
             integer7 = 255 - integer5 * 8;
             integer8 = integer5 * 4;
             return integer6 << 16 | integer7 << 8 | integer8;
         }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
-        dcb1.addColoringState(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
-        dcb1.register((byj, bje, fk, integer) -> {
-            if (bje == null || fk == null) {
+        dmn1.addColoringState(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
+        dmn1.register((cfj, bpe, fu, integer) -> {
+            if (bpe == null || fu == null) {
                 return 7455580;
             }
             else {
                 return 2129968;
             }
         }, Blocks.LILY_PAD);
-        return dcb1;
+        return dmn1;
     }
     
-    public int getColor(final BlockState byj, final Level bjw, final BlockPos fk) {
-        final BlockColor dca5 = this.blockColors.byId(Registry.BLOCK.getId(byj.getBlock()));
-        if (dca5 != null) {
-            return dca5.getColor(byj, null, null, 0);
+    public int getColor(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        final BlockColor dmm5 = this.blockColors.byId(Registry.BLOCK.getId(cfj.getBlock()));
+        if (dmm5 != null) {
+            return dmm5.getColor(cfj, null, null, 0);
         }
-        final MaterialColor cop6 = byj.getMapColor(bjw, fk);
-        return (cop6 != null) ? cop6.col : -1;
+        final MaterialColor cxe6 = cfj.getMapColor(bqb, fu);
+        return (cxe6 != null) ? cxe6.col : -1;
     }
     
-    public int getColor(final BlockState byj, @Nullable final BlockAndTintGetter bje, @Nullable final BlockPos fk, final int integer) {
-        final BlockColor dca6 = this.blockColors.byId(Registry.BLOCK.getId(byj.getBlock()));
-        return (dca6 == null) ? -1 : dca6.getColor(byj, bje, fk, integer);
+    public int getColor(final BlockState cfj, @Nullable final BlockAndTintGetter bpe, @Nullable final BlockPos fu, final int integer) {
+        final BlockColor dmm6 = this.blockColors.byId(Registry.BLOCK.getId(cfj.getBlock()));
+        return (dmm6 == null) ? -1 : dmm6.getColor(cfj, bpe, fu, integer);
     }
     
-    public void register(final BlockColor dca, final Block... arr) {
-        for (final Block bph7 : arr) {
-            this.blockColors.addMapping(dca, Registry.BLOCK.getId(bph7));
+    public void register(final BlockColor dmm, final Block... arr) {
+        for (final Block bvr7 : arr) {
+            this.blockColors.addMapping(dmm, Registry.BLOCK.getId(bvr7));
         }
     }
     
     private void addColoringStates(final Set<Property<?>> set, final Block... arr) {
-        for (final Block bph7 : arr) {
-            this.coloringStates.put(bph7, set);
+        for (final Block bvr7 : arr) {
+            this.coloringStates.put(bvr7, set);
         }
     }
     
-    private void addColoringState(final Property<?> bzm, final Block... arr) {
-        this.addColoringStates(ImmutableSet.<Property<?>>of(bzm), arr);
+    private void addColoringState(final Property<?> cgl, final Block... arr) {
+        this.addColoringStates(ImmutableSet.<Property<?>>of(cgl), arr);
     }
     
-    public Set<Property<?>> getColoringProperties(final Block bph) {
-        return this.coloringStates.getOrDefault(bph, ImmutableSet.of());
+    public Set<Property<?>> getColoringProperties(final Block bvr) {
+        return this.coloringStates.getOrDefault(bvr, ImmutableSet.of());
     }
 }
diff --git a/src/net/minecraft/client/color/block/BlockTintCache.java b/src/net/minecraft/client/color/block/BlockTintCache.java
index 4b3fccd..c21a1a1 100644
--- a/src/net/minecraft/client/color/block/BlockTintCache.java
+++ b/src/net/minecraft/client/color/block/BlockTintCache.java
@@ -18,17 +18,17 @@ public class BlockTintCache {
         this.lock = new ReentrantReadWriteLock();
     }
     
-    public int getColor(final BlockPos fk, final IntSupplier intSupplier) {
-        final int integer4 = fk.getX() >> 4;
-        final int integer5 = fk.getZ() >> 4;
+    public int getColor(final BlockPos fu, final IntSupplier intSupplier) {
+        final int integer4 = fu.getX() >> 4;
+        final int integer5 = fu.getZ() >> 4;
         final LatestCacheInfo a6 = this.latestChunkOnThread.get();
         if (a6.x != integer4 || a6.z != integer5) {
             a6.x = integer4;
             a6.z = integer5;
             a6.cache = this.findOrCreateChunkCache(integer4, integer5);
         }
-        final int integer6 = fk.getX() & 0xF;
-        final int integer7 = fk.getZ() & 0xF;
+        final int integer6 = fu.getX() & 0xF;
+        final int integer7 = fu.getZ() & 0xF;
         final int integer8 = integer7 << 4 | integer6;
         final int integer9 = a6.cache[integer8];
         if (integer9 != -1) {
diff --git a/src/net/minecraft/client/color/item/ItemColor.java b/src/net/minecraft/client/color/item/ItemColor.java
index bb96ac3..b386e5e 100644
--- a/src/net/minecraft/client/color/item/ItemColor.java
+++ b/src/net/minecraft/client/color/item/ItemColor.java
@@ -3,5 +3,5 @@ package net.minecraft.client.color.item;
 import net.minecraft.world.item.ItemStack;
 
 public interface ItemColor {
-    int getColor(final ItemStack ben, final int integer);
+    int getColor(final ItemStack bki, final int integer);
 }
diff --git a/src/net/minecraft/client/color/item/ItemColors.java b/src/net/minecraft/client/color/item/ItemColors.java
index 71b630e..2cf255f 100644
--- a/src/net/minecraft/client/color/item/ItemColors.java
+++ b/src/net/minecraft/client/color/item/ItemColors.java
@@ -27,11 +27,11 @@ public class ItemColors {
         this.itemColors = new IdMapper<ItemColor>(32);
     }
     
-    public static ItemColors createDefault(final BlockColors dcb) {
-        final ItemColors dcf2 = new ItemColors();
-        dcf2.register((ben, integer) -> (integer > 0) ? -1 : ((DyeableLeatherItem)ben.getItem()).getColor(ben), Items.LEATHER_HELMET, Items.LEATHER_CHESTPLATE, Items.LEATHER_LEGGINGS, Items.LEATHER_BOOTS, Items.LEATHER_HORSE_ARMOR);
-        dcf2.register((ben, integer) -> GrassColor.get(0.5, 1.0), Blocks.TALL_GRASS, Blocks.LARGE_FERN);
-        CompoundTag jt3;
+    public static ItemColors createDefault(final BlockColors dmn) {
+        final ItemColors dmr2 = new ItemColors();
+        dmr2.register((bki, integer) -> (integer > 0) ? -1 : ((DyeableLeatherItem)bki.getItem()).getColor(bki), Items.LEATHER_HELMET, Items.LEATHER_CHESTPLATE, Items.LEATHER_LEGGINGS, Items.LEATHER_BOOTS, Items.LEATHER_HORSE_ARMOR);
+        dmr2.register((bki, integer) -> GrassColor.get(0.5, 1.0), Blocks.TALL_GRASS, Blocks.LARGE_FERN);
+        CompoundTag le3;
         int[] arr4;
         int integer2;
         int integer3;
@@ -43,14 +43,14 @@ public class ItemColors {
         int integer6;
         int integer7;
         int integer8;
-        dcf2.register((ben, integer) -> {
+        dmr2.register((bki, integer) -> {
             if (integer != 1) {
                 return -1;
             }
             else {
-                jt3 = ben.getTagElement("Explosion");
-                arr4 = (int[])((jt3 != null && jt3.contains("Colors", 11)) ? jt3.getIntArray("Colors") : null);
-                if (arr4 == null) {
+                le3 = bki.getTagElement("Explosion");
+                arr4 = (int[])((le3 != null && le3.contains("Colors", 11)) ? le3.getIntArray("Colors") : null);
+                if (arr4 == null || arr4.length == 0) {
                     return 9079434;
                 }
                 else if (arr4.length == 1) {
@@ -73,28 +73,28 @@ public class ItemColors {
                 }
             }
         }, Items.FIREWORK_STAR);
-        dcf2.register((ben, integer) -> (integer > 0) ? -1 : PotionUtils.getColor(ben), Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION);
-        for (final SpawnEggItem bfl4 : SpawnEggItem.eggs()) {
-            dcf2.register((ben, integer) -> bfl4.getColor(integer), bfl4);
+        dmr2.register((bki, integer) -> (integer > 0) ? -1 : PotionUtils.getColor(bki), Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION);
+        for (final SpawnEggItem blh4 : SpawnEggItem.eggs()) {
+            dmr2.register((bki, integer) -> blh4.getColor(integer), blh4);
         }
-        final BlockState byj4;
-        dcf2.register((ben, integer) -> {
-            byj4 = ((BlockItem)ben.getItem()).getBlock().defaultBlockState();
-            return dcb.getColor(byj4, null, null, integer);
+        final BlockState cfj4;
+        dmr2.register((bki, integer) -> {
+            cfj4 = ((BlockItem)bki.getItem()).getBlock().defaultBlockState();
+            return dmn.getColor(cfj4, null, null, integer);
         }, Blocks.GRASS_BLOCK, Blocks.GRASS, Blocks.FERN, Blocks.VINE, Blocks.OAK_LEAVES, Blocks.SPRUCE_LEAVES, Blocks.BIRCH_LEAVES, Blocks.JUNGLE_LEAVES, Blocks.ACACIA_LEAVES, Blocks.DARK_OAK_LEAVES, Blocks.LILY_PAD);
-        dcf2.register((ben, integer) -> (integer == 0) ? PotionUtils.getColor(ben) : -1, Items.TIPPED_ARROW);
-        dcf2.register((ben, integer) -> (integer == 0) ? -1 : MapItem.getColor(ben), Items.FILLED_MAP);
-        return dcf2;
+        dmr2.register((bki, integer) -> (integer == 0) ? PotionUtils.getColor(bki) : -1, Items.TIPPED_ARROW);
+        dmr2.register((bki, integer) -> (integer == 0) ? -1 : MapItem.getColor(bki), Items.FILLED_MAP);
+        return dmr2;
     }
     
-    public int getColor(final ItemStack ben, final int integer) {
-        final ItemColor dce4 = this.itemColors.byId(Registry.ITEM.getId(ben.getItem()));
-        return (dce4 == null) ? -1 : dce4.getColor(ben, integer);
+    public int getColor(final ItemStack bki, final int integer) {
+        final ItemColor dmq4 = this.itemColors.byId(Registry.ITEM.getId(bki.getItem()));
+        return (dmq4 == null) ? -1 : dmq4.getColor(bki, integer);
     }
     
-    public void register(final ItemColor dce, final ItemLike... arr) {
-        for (final ItemLike bjv7 : arr) {
-            this.itemColors.addMapping(dce, Item.getId(bjv7.asItem()));
+    public void register(final ItemColor dmq, final ItemLike... arr) {
+        for (final ItemLike bqa7 : arr) {
+            this.itemColors.addMapping(dmq, Item.getId(bqa7.asItem()));
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/Font.java b/src/net/minecraft/client/gui/Font.java
index 7e8e764..03a4854 100644
--- a/src/net/minecraft/client/gui/Font.java
+++ b/src/net/minecraft/client/gui/Font.java
@@ -1,59 +1,74 @@
 package net.minecraft.client.gui;
 
-import java.util.Arrays;
-import net.minecraft.util.Mth;
-import java.util.Iterator;
-import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.network.chat.TextColor;
 import com.mojang.blaze3d.font.GlyphInfo;
-import net.minecraft.client.gui.font.glyphs.BakedGlyph;
 import net.minecraft.client.gui.font.glyphs.EmptyGlyph;
-import net.minecraft.ChatFormatting;
 import com.google.common.collect.Lists;
-import com.mojang.math.Vector3f;
+import javax.annotation.Nullable;
+import net.minecraft.locale.Language;
+import java.util.List;
+import java.util.Iterator;
+import com.mojang.math.Transformation;
+import net.minecraft.util.Mth;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.client.gui.font.glyphs.BakedGlyph;
+import net.minecraft.client.StringDecomposer;
+import net.minecraft.network.chat.Style;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.math.Matrix4f;
 import com.ibm.icu.text.ArabicShapingException;
 import com.ibm.icu.text.Bidi;
 import com.ibm.icu.text.ArabicShaping;
-import com.mojang.math.Transformation;
+import net.minecraft.network.chat.FormattedText;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.font.GlyphProvider;
-import java.util.List;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.StringSplitter;
 import net.minecraft.client.gui.font.FontSet;
-import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.resources.ResourceLocation;
+import java.util.function.Function;
 import java.util.Random;
+import com.mojang.math.Vector3f;
 
-public class Font implements AutoCloseable {
+public class Font {
+    private static final Vector3f SHADOW_OFFSET;
     public final int lineHeight = 9;
     public final Random random;
-    private final TextureManager textureManager;
-    private final FontSet fonts;
-    private boolean bidirectional;
+    private final Function<ResourceLocation, FontSet> fonts;
+    private final StringSplitter splitter;
     
-    public Font(final TextureManager eak, final FontSet deg) {
+    public Font(final Function<ResourceLocation, FontSet> function) {
         this.random = new Random();
-        this.textureManager = eak;
-        this.fonts = deg;
+        this.fonts = function;
+        this.splitter = new StringSplitter((integer, nb) -> this.getFontSet(nb.getFont()).getGlyphInfo(integer).getAdvance(nb.isBold()));
     }
     
-    public void reload(final List<GlyphProvider> list) {
-        this.fonts.reload(list);
+    private FontSet getFontSet(final ResourceLocation uh) {
+        return this.fonts.apply(uh);
     }
     
-    @Override
-    public void close() {
-        this.fonts.close();
+    public int drawShadow(final PoseStack dhl, final String string, final float float3, final float float4, final int integer) {
+        return this.drawInternal(string, float3, float4, integer, dhl.last().pose(), true, this.isBidirectional());
     }
     
-    public int drawShadow(final String string, final float float2, final float float3, final int integer) {
+    public int drawShadow(final PoseStack dhl, final String string, final float float3, final float float4, final int integer, final boolean boolean6) {
         RenderSystem.enableAlphaTest();
-        return this.drawInternal(string, float2, float3, integer, Transformation.identity().getMatrix(), true);
+        return this.drawInternal(string, float3, float4, integer, dhl.last().pose(), true, boolean6);
     }
     
-    public int draw(final String string, final float float2, final float float3, final int integer) {
+    public int draw(final PoseStack dhl, final String string, final float float3, final float float4, final int integer) {
         RenderSystem.enableAlphaTest();
-        return this.drawInternal(string, float2, float3, integer, Transformation.identity().getMatrix(), false);
+        return this.drawInternal(string, float3, float4, integer, dhl.last().pose(), false, this.isBidirectional());
+    }
+    
+    public int drawShadow(final PoseStack dhl, final FormattedText mu, final float float3, final float float4, final int integer) {
+        RenderSystem.enableAlphaTest();
+        return this.drawInternal(mu, float3, float4, integer, dhl.last().pose(), true);
+    }
+    
+    public int draw(final PoseStack dhl, final FormattedText mu, final float float3, final float float4, final int integer) {
+        RenderSystem.enableAlphaTest();
+        return this.drawInternal(mu, float3, float4, integer, dhl.last().pose(), false);
     }
     
     public String bidirectionalShaping(final String string) {
@@ -67,370 +82,228 @@ public class Font implements AutoCloseable {
         }
     }
     
-    private int drawInternal(final String string, final float float2, final float float3, final int integer, final Matrix4f b, final boolean boolean6) {
+    private int drawInternal(final String string, final float float2, final float float3, final int integer, final Matrix4f b, final boolean boolean6, final boolean boolean7) {
         if (string == null) {
             return 0;
         }
+        final MultiBufferSource.BufferSource a9 = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
+        final int integer2 = this.drawInBatch(string, float2, float3, integer, boolean6, b, a9, false, 0, 15728880, boolean7);
+        a9.endBatch();
+        return integer2;
+    }
+    
+    private int drawInternal(final FormattedText mu, final float float2, final float float3, final int integer, final Matrix4f b, final boolean boolean6) {
         final MultiBufferSource.BufferSource a8 = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        final int integer2 = this.drawInBatch(string, float2, float3, integer, boolean6, b, a8, false, 0, 15728880);
+        final int integer2 = this.drawInBatch(mu, float2, float3, integer, boolean6, b, a8, false, 0, 15728880);
         a8.endBatch();
         return integer2;
     }
     
-    public int drawInBatch(final String string, final float float2, final float float3, final int integer4, final boolean boolean5, final Matrix4f b, final MultiBufferSource dqt, final boolean boolean8, final int integer9, final int integer10) {
-        return this.drawInternal(string, float2, float3, integer4, boolean5, b, dqt, boolean8, integer9, integer10);
+    public int drawInBatch(final String string, final float float2, final float float3, final int integer4, final boolean boolean5, final Matrix4f b, final MultiBufferSource ebz, final boolean boolean8, final int integer9, final int integer10) {
+        return this.drawInBatch(string, float2, float3, integer4, boolean5, b, ebz, boolean8, integer9, integer10, this.isBidirectional());
     }
     
-    private int drawInternal(String string, float float2, final float float3, int integer4, final boolean boolean5, final Matrix4f b, final MultiBufferSource dqt, final boolean boolean8, final int integer9, final int integer10) {
-        if (this.bidirectional) {
+    public int drawInBatch(final String string, final float float2, final float float3, final int integer4, final boolean boolean5, final Matrix4f b, final MultiBufferSource ebz, final boolean boolean8, final int integer9, final int integer10, final boolean boolean11) {
+        return this.drawInternal(string, float2, float3, integer4, boolean5, b, ebz, boolean8, integer9, integer10, boolean11);
+    }
+    
+    public int drawInBatch(final FormattedText mu, final float float2, final float float3, final int integer4, final boolean boolean5, final Matrix4f b, final MultiBufferSource ebz, final boolean boolean8, final int integer9, final int integer10) {
+        return this.drawInternal(mu, float2, float3, integer4, boolean5, b, ebz, boolean8, integer9, integer10);
+    }
+    
+    private static int adjustColor(final int integer) {
+        if ((integer & 0xFC000000) == 0x0) {
+            return integer | 0xFF000000;
+        }
+        return integer;
+    }
+    
+    private int drawInternal(String string, float float2, final float float3, int integer4, final boolean boolean5, final Matrix4f b, final MultiBufferSource ebz, final boolean boolean8, final int integer9, final int integer10, final boolean boolean11) {
+        if (boolean11) {
             string = this.bidirectionalShaping(string);
         }
-        if ((integer4 & 0xFC000000) == 0x0) {
-            integer4 |= 0xFF000000;
-        }
-        if (boolean5) {
-            this.renderText(string, float2, float3, integer4, true, b, dqt, boolean8, integer9, integer10);
-        }
+        integer4 = adjustColor(integer4);
         final Matrix4f b2 = b.copy();
-        b2.translate(new Vector3f(0.0f, 0.0f, 0.001f));
-        float2 = this.renderText(string, float2, float3, integer4, false, b2, dqt, boolean8, integer9, integer10);
+        if (boolean5) {
+            this.renderText(string, float2, float3, integer4, true, b, ebz, boolean8, integer9, integer10);
+            b2.translate(Font.SHADOW_OFFSET);
+        }
+        float2 = this.renderText(string, float2, float3, integer4, false, b2, ebz, boolean8, integer9, integer10);
         return (int)float2 + (boolean5 ? 1 : 0);
     }
     
-    private float renderText(final String string, final float float2, final float float3, final int integer4, final boolean boolean5, final Matrix4f b, final MultiBufferSource dqt, final boolean boolean8, final int integer9, final int integer10) {
-        final float float4 = boolean5 ? 0.25f : 1.0f;
-        final float float5 = (integer4 >> 16 & 0xFF) / 255.0f * float4;
-        final float float6 = (integer4 >> 8 & 0xFF) / 255.0f * float4;
-        final float float7 = (integer4 & 0xFF) / 255.0f * float4;
-        float float8 = float2;
-        float float9 = float5;
-        float float10 = float6;
-        float float11 = float7;
-        final float float12 = (integer4 >> 24 & 0xFF) / 255.0f;
-        boolean boolean9 = false;
-        boolean boolean10 = false;
-        boolean boolean11 = false;
-        boolean boolean12 = false;
-        boolean boolean13 = false;
-        final List<BakedGlyph.Effect> list26 = Lists.newArrayList();
-        for (int integer11 = 0; integer11 < string.length(); ++integer11) {
-            final char character28 = string.charAt(integer11);
-            if (character28 == '§' && integer11 + 1 < string.length()) {
-                final ChatFormatting g29 = ChatFormatting.getByCode(string.charAt(integer11 + 1));
-                if (g29 != null) {
-                    if (g29.shouldReset()) {
-                        boolean9 = false;
-                        boolean10 = false;
-                        boolean13 = false;
-                        boolean12 = false;
-                        boolean11 = false;
-                        float9 = float5;
-                        float10 = float6;
-                        float11 = float7;
-                    }
-                    if (g29.getColor() != null) {
-                        final int integer12 = g29.getColor();
-                        float9 = (integer12 >> 16 & 0xFF) / 255.0f * float4;
-                        float10 = (integer12 >> 8 & 0xFF) / 255.0f * float4;
-                        float11 = (integer12 & 0xFF) / 255.0f * float4;
-                    }
-                    else if (g29 == ChatFormatting.OBFUSCATED) {
-                        boolean9 = true;
-                    }
-                    else if (g29 == ChatFormatting.BOLD) {
-                        boolean10 = true;
-                    }
-                    else if (g29 == ChatFormatting.STRIKETHROUGH) {
-                        boolean13 = true;
-                    }
-                    else if (g29 == ChatFormatting.UNDERLINE) {
-                        boolean12 = true;
-                    }
-                    else if (g29 == ChatFormatting.ITALIC) {
-                        boolean11 = true;
-                    }
-                }
-                ++integer11;
-            }
-            else {
-                final GlyphInfo cwy29 = this.fonts.getGlyphInfo(character28);
-                final BakedGlyph dej30 = (boolean9 && character28 != ' ') ? this.fonts.getRandomGlyph(cwy29) : this.fonts.getGlyph(character28);
-                if (!(dej30 instanceof EmptyGlyph)) {
-                    final float float13 = boolean10 ? cwy29.getBoldOffset() : 0.0f;
-                    final float float14 = boolean5 ? cwy29.getShadowOffset() : 0.0f;
-                    final VertexConsumer cyo33 = dqt.getBuffer(dej30.renderType(boolean8));
-                    this.renderChar(dej30, boolean10, boolean11, float13, float8 + float14, float3 + float14, b, cyo33, float9, float10, float11, float12, integer10);
-                }
-                final float float13 = cwy29.getAdvance(boolean10);
-                final float float14 = boolean5 ? 1.0f : 0.0f;
-                if (boolean13) {
-                    list26.add(new BakedGlyph.Effect(float8 + float14 - 1.0f, float3 + float14 + 4.5f, float8 + float14 + float13, float3 + float14 + 4.5f - 1.0f, -0.01f, float9, float10, float11, float12));
-                }
-                if (boolean12) {
-                    list26.add(new BakedGlyph.Effect(float8 + float14 - 1.0f, float3 + float14 + 9.0f, float8 + float14 + float13, float3 + float14 + 9.0f - 1.0f, -0.01f, float9, float10, float11, float12));
-                }
-                float8 += float13;
-            }
+    private int drawInternal(final FormattedText mu, float float2, final float float3, int integer4, final boolean boolean5, final Matrix4f b, final MultiBufferSource ebz, final boolean boolean8, final int integer9, final int integer10) {
+        integer4 = adjustColor(integer4);
+        final Matrix4f b2 = b.copy();
+        if (boolean5) {
+            this.renderText(mu, float2, float3, integer4, true, b, ebz, boolean8, integer9, integer10);
+            b2.translate(Font.SHADOW_OFFSET);
         }
-        if (integer9 != 0) {
-            final float float15 = (integer9 >> 24 & 0xFF) / 255.0f;
-            final float float16 = (integer9 >> 16 & 0xFF) / 255.0f;
-            final float float17 = (integer9 >> 8 & 0xFF) / 255.0f;
-            final float float18 = (integer9 & 0xFF) / 255.0f;
-            list26.add(new BakedGlyph.Effect(float2 - 1.0f, float3 + 9.0f, float8 + 1.0f, float3 - 1.0f, 0.01f, float16, float17, float18, float15));
-        }
-        if (!list26.isEmpty()) {
-            final BakedGlyph dej31 = this.fonts.whiteGlyph();
-            final VertexConsumer cyo34 = dqt.getBuffer(dej31.renderType(boolean8));
-            for (final BakedGlyph.Effect a30 : list26) {
-                dej31.renderEffect(a30, b, cyo34, integer10);
-            }
-        }
-        return float8;
+        float2 = this.renderText(mu, float2, float3, integer4, false, b2, ebz, boolean8, integer9, integer10);
+        return (int)float2 + (boolean5 ? 1 : 0);
     }
     
-    private void renderChar(final BakedGlyph dej, final boolean boolean2, final boolean boolean3, final float float4, final float float5, final float float6, final Matrix4f b, final VertexConsumer cyo, final float float9, final float float10, final float float11, final float float12, final int integer) {
-        dej.render(boolean3, float5, float6, b, cyo, float9, float10, float11, float12, integer);
+    private float renderText(final String string, final float float2, final float float3, final int integer4, final boolean boolean5, final Matrix4f b, final MultiBufferSource ebz, final boolean boolean8, final int integer9, final int integer10) {
+        final StringRenderOutput a12 = new StringRenderOutput(ebz, float2, float3, integer4, boolean5, b, boolean8, integer10);
+        StringDecomposer.iterateFormatted(string, Style.EMPTY, a12);
+        return a12.finish(integer9, float2);
+    }
+    
+    private float renderText(final FormattedText mu, final float float2, final float float3, final int integer4, final boolean boolean5, final Matrix4f b, final MultiBufferSource ebz, final boolean boolean8, final int integer9, final int integer10) {
+        final StringRenderOutput a12 = new StringRenderOutput(ebz, float2, float3, integer4, boolean5, b, boolean8, integer10);
+        StringDecomposer.iterateFormatted(mu, Style.EMPTY, a12);
+        return a12.finish(integer9, float2);
+    }
+    
+    private void renderChar(final BakedGlyph dow, final boolean boolean2, final boolean boolean3, final float float4, final float float5, final float float6, final Matrix4f b, final VertexConsumer dhp, final float float9, final float float10, final float float11, final float float12, final int integer) {
+        dow.render(boolean3, float5, float6, b, dhp, float9, float10, float11, float12, integer);
         if (boolean2) {
-            dej.render(boolean3, float5 + float4, float6, b, cyo, float9, float10, float11, float12, integer);
+            dow.render(boolean3, float5 + float4, float6, b, dhp, float9, float10, float11, float12, integer);
         }
     }
     
     public int width(final String string) {
-        if (string == null) {
-            return 0;
-        }
-        float float3 = 0.0f;
-        boolean boolean4 = false;
-        for (int integer5 = 0; integer5 < string.length(); ++integer5) {
-            final char character6 = string.charAt(integer5);
-            if (character6 == '§' && integer5 < string.length() - 1) {
-                final ChatFormatting g7 = ChatFormatting.getByCode(string.charAt(++integer5));
-                if (g7 == ChatFormatting.BOLD) {
-                    boolean4 = true;
-                }
-                else if (g7 != null && g7.shouldReset()) {
-                    boolean4 = false;
-                }
-            }
-            else {
-                float3 += this.fonts.getGlyphInfo(character6).getAdvance(boolean4);
-            }
-        }
-        return Mth.ceil(float3);
+        return Mth.ceil(this.splitter.stringWidth(string));
     }
     
-    public float charWidth(final char character) {
-        if (character == '§') {
-            return 0.0f;
-        }
-        return this.fonts.getGlyphInfo(character).getAdvance(false);
+    public int width(final FormattedText mu) {
+        return Mth.ceil(this.splitter.stringWidth(mu));
     }
     
-    public String substrByWidth(final String string, final int integer) {
-        return this.substrByWidth(string, integer, false);
+    public String plainSubstrByWidth(final String string, final int integer, final boolean boolean3) {
+        return boolean3 ? this.splitter.plainTailByWidth(string, integer, Style.EMPTY) : this.splitter.plainHeadByWidth(string, integer, Style.EMPTY);
     }
     
-    public String substrByWidth(final String string, final int integer, final boolean boolean3) {
-        final StringBuilder stringBuilder5 = new StringBuilder();
-        float float6 = 0.0f;
-        final int integer2 = boolean3 ? (string.length() - 1) : 0;
-        final int integer3 = boolean3 ? -1 : 1;
-        boolean boolean4 = false;
-        boolean boolean5 = false;
-        for (int integer4 = integer2; integer4 >= 0 && integer4 < string.length() && float6 < integer; integer4 += integer3) {
-            final char character12 = string.charAt(integer4);
-            if (boolean4) {
-                boolean4 = false;
-                final ChatFormatting g13 = ChatFormatting.getByCode(character12);
-                if (g13 == ChatFormatting.BOLD) {
-                    boolean5 = true;
-                }
-                else if (g13 != null && g13.shouldReset()) {
-                    boolean5 = false;
-                }
-            }
-            else if (character12 == '§') {
-                boolean4 = true;
-            }
-            else {
-                float6 += this.charWidth(character12);
-                if (boolean5) {
-                    ++float6;
-                }
-            }
-            if (float6 > integer) {
-                break;
-            }
-            if (boolean3) {
-                stringBuilder5.insert(0, character12);
-            }
-            else {
-                stringBuilder5.append(character12);
-            }
-        }
-        return stringBuilder5.toString();
+    public String plainSubstrByWidth(final String string, final int integer) {
+        return this.splitter.plainHeadByWidth(string, integer, Style.EMPTY);
     }
     
-    private String eraseTrailingNewLines(String string) {
-        while (string != null && string.endsWith("\n")) {
-            string = string.substring(0, string.length() - 1);
-        }
-        return string;
+    public FormattedText substrByWidth(final FormattedText mu, final int integer) {
+        return this.splitter.headByWidth(mu, integer, Style.EMPTY);
     }
     
-    public void drawWordWrap(String string, final int integer2, final int integer3, final int integer4, final int integer5) {
-        string = this.eraseTrailingNewLines(string);
-        this.drawWordWrapInternal(string, integer2, integer3, integer4, integer5);
-    }
-    
-    private void drawWordWrapInternal(final String string, final int integer2, int integer3, final int integer4, final int integer5) {
-        final List<String> list7 = this.split(string, integer4);
-        final Matrix4f b8 = Transformation.identity().getMatrix();
-        for (final String string2 : list7) {
-            float float11 = (float)integer2;
-            if (this.bidirectional) {
-                final int integer6 = this.width(this.bidirectionalShaping(string2));
-                float11 += integer4 - integer6;
-            }
-            this.drawInternal(string2, float11, (float)integer3, integer5, b8, false);
+    public void drawWordWrap(final FormattedText mu, final int integer2, int integer3, final int integer4, final int integer5) {
+        final Matrix4f b7 = Transformation.identity().getMatrix();
+        for (final FormattedText mu2 : this.split(mu, integer4)) {
+            this.drawInternal(mu2, (float)integer2, (float)integer3, integer5, b7, false);
             integer3 += 9;
         }
     }
     
     public int wordWrapHeight(final String string, final int integer) {
-        return 9 * this.split(string, integer).size();
+        return 9 * this.splitter.splitLines(string, integer, Style.EMPTY).size();
     }
     
-    public void setBidirectional(final boolean boolean1) {
-        this.bidirectional = boolean1;
-    }
-    
-    public List<String> split(final String string, final int integer) {
-        return Arrays.<String>asList(this.insertLineBreaks(string, integer).split("\n"));
-    }
-    
-    public String insertLineBreaks(String string, final int integer) {
-        String string2;
-        int integer2;
-        String string3;
-        boolean boolean8;
-        for (string2 = ""; !string.isEmpty(); string = ChatFormatting.getLastColors(string3) + string.substring(integer2 + (boolean8 ? 1 : 0)), string2 = string2 + string3 + "\n") {
-            integer2 = this.indexAtWidth(string, integer);
-            if (string.length() <= integer2) {
-                return string2 + string;
-            }
-            string3 = string.substring(0, integer2);
-            final char character7 = string.charAt(integer2);
-            boolean8 = (character7 == ' ' || character7 == '\n');
-        }
-        return string2;
-    }
-    
-    public int indexAtWidth(final String string, final int integer) {
-        final int integer2 = Math.max(1, integer);
-        final int integer3 = string.length();
-        float float6 = 0.0f;
-        int integer4 = 0;
-        int integer5 = -1;
-        boolean boolean9 = false;
-        boolean boolean10 = true;
-        while (integer4 < integer3) {
-            final char character11 = string.charAt(integer4);
-            Label_0178: {
-                switch (character11) {
-                    case '§': {
-                        if (integer4 < integer3 - 1) {
-                            final ChatFormatting g12 = ChatFormatting.getByCode(string.charAt(++integer4));
-                            if (g12 == ChatFormatting.BOLD) {
-                                boolean9 = true;
-                            }
-                            else if (g12 != null && g12.shouldReset()) {
-                                boolean9 = false;
-                            }
-                        }
-                        break Label_0178;
-                    }
-                    case '\n': {
-                        --integer4;
-                        break Label_0178;
-                    }
-                    case ' ': {
-                        integer5 = integer4;
-                        break;
-                    }
-                }
-                if (float6 != 0.0f) {
-                    boolean10 = false;
-                }
-                float6 += this.charWidth(character11);
-                if (boolean9) {
-                    ++float6;
-                }
-            }
-            if (character11 == '\n') {
-                integer5 = ++integer4;
-                break;
-            }
-            if (float6 > integer2) {
-                if (boolean10) {
-                    ++integer4;
-                    break;
-                }
-                break;
-            }
-            else {
-                ++integer4;
-            }
-        }
-        if (integer4 != integer3 && integer5 != -1 && integer5 < integer4) {
-            return integer5;
-        }
-        return integer4;
-    }
-    
-    public int getWordPosition(final String string, final int integer2, final int integer3, final boolean boolean4) {
-        int integer4 = integer3;
-        final boolean boolean5 = integer2 < 0;
-        for (int integer5 = Math.abs(integer2), integer6 = 0; integer6 < integer5; ++integer6) {
-            if (boolean5) {
-                while (boolean4 && integer4 > 0 && (string.charAt(integer4 - 1) == ' ' || string.charAt(integer4 - 1) == '\n')) {
-                    --integer4;
-                }
-                while (integer4 > 0 && string.charAt(integer4 - 1) != ' ' && string.charAt(integer4 - 1) != '\n') {
-                    --integer4;
-                }
-            }
-            else {
-                final int integer7 = string.length();
-                final int integer8 = string.indexOf(32, integer4);
-                final int integer9 = string.indexOf(10, integer4);
-                if (integer8 == -1 && integer9 == -1) {
-                    integer4 = -1;
-                }
-                else if (integer8 != -1 && integer9 != -1) {
-                    integer4 = Math.min(integer8, integer9);
-                }
-                else if (integer8 != -1) {
-                    integer4 = integer8;
-                }
-                else {
-                    integer4 = integer9;
-                }
-                if (integer4 == -1) {
-                    integer4 = integer7;
-                }
-                else {
-                    while (boolean4 && integer4 < integer7 && (string.charAt(integer4) == ' ' || string.charAt(integer4) == '\n')) {
-                        ++integer4;
-                    }
-                }
-            }
-        }
-        return integer4;
+    public List<FormattedText> split(final FormattedText mu, final int integer) {
+        return this.splitter.splitLines(mu, integer, Style.EMPTY);
     }
     
     public boolean isBidirectional() {
-        return this.bidirectional;
+        return Language.getInstance().requiresReordering();
+    }
+    
+    public StringSplitter getSplitter() {
+        return this.splitter;
+    }
+    
+    static {
+        SHADOW_OFFSET = new Vector3f(0.0f, 0.0f, 0.03f);
+    }
+    
+    class StringRenderOutput implements StringDecomposer.Output {
+        final MultiBufferSource bufferSource;
+        private final boolean dropShadow;
+        private final float dimFactor;
+        private final float r;
+        private final float g;
+        private final float b;
+        private final float a;
+        private final Matrix4f pose;
+        private final boolean seeThrough;
+        private final int packedLightCoords;
+        private float x;
+        private float y;
+        @Nullable
+        private List<BakedGlyph.Effect> effects;
+        
+        private void addEffect(final BakedGlyph.Effect a) {
+            if (this.effects == null) {
+                this.effects = Lists.newArrayList();
+            }
+            this.effects.add(a);
+        }
+        
+        public StringRenderOutput(final MultiBufferSource ebz, final float float3, final float float4, final int integer5, final boolean boolean6, final Matrix4f b, final boolean boolean8, final int integer9) {
+            this.bufferSource = ebz;
+            this.x = float3;
+            this.y = float4;
+            this.dropShadow = boolean6;
+            this.dimFactor = (boolean6 ? 0.25f : 1.0f);
+            this.r = (integer5 >> 16 & 0xFF) / 255.0f * this.dimFactor;
+            this.g = (integer5 >> 8 & 0xFF) / 255.0f * this.dimFactor;
+            this.b = (integer5 & 0xFF) / 255.0f * this.dimFactor;
+            this.a = (integer5 >> 24 & 0xFF) / 255.0f;
+            this.pose = b;
+            this.seeThrough = boolean8;
+            this.packedLightCoords = integer9;
+        }
+        
+        @Override
+        public boolean onChar(final int integer1, final Style nb, final int integer3) {
+            final FontSet dot5 = Font.this.getFontSet(nb.getFont());
+            final GlyphInfo dfz6 = dot5.getGlyphInfo(integer3);
+            final BakedGlyph dow7 = (nb.isObfuscated() && integer3 != 32) ? dot5.getRandomGlyph(dfz6) : dot5.getGlyph(integer3);
+            final boolean boolean8 = nb.isBold();
+            final float float12 = this.a;
+            final TextColor nc13 = nb.getColor();
+            float float13;
+            float float14;
+            float float15;
+            if (nc13 != null) {
+                final int integer4 = nc13.getValue();
+                float13 = (integer4 >> 16 & 0xFF) / 255.0f * this.dimFactor;
+                float14 = (integer4 >> 8 & 0xFF) / 255.0f * this.dimFactor;
+                float15 = (integer4 & 0xFF) / 255.0f * this.dimFactor;
+            }
+            else {
+                float13 = this.r;
+                float14 = this.g;
+                float15 = this.b;
+            }
+            if (!(dow7 instanceof EmptyGlyph)) {
+                final float float16 = boolean8 ? dfz6.getBoldOffset() : 0.0f;
+                final float float17 = this.dropShadow ? dfz6.getShadowOffset() : 0.0f;
+                final VertexConsumer dhp16 = this.bufferSource.getBuffer(dow7.renderType(this.seeThrough));
+                Font.this.renderChar(dow7, boolean8, nb.isItalic(), float16, this.x + float17, this.y + float17, this.pose, dhp16, float13, float14, float15, float12, this.packedLightCoords);
+            }
+            final float float16 = dfz6.getAdvance(boolean8);
+            final float float17 = this.dropShadow ? 1.0f : 0.0f;
+            if (nb.isStrikethrough()) {
+                this.addEffect(new BakedGlyph.Effect(this.x + float17 - 1.0f, this.y + float17 + 4.5f, this.x + float17 + float16, this.y + float17 + 4.5f - 1.0f, 0.01f, float13, float14, float15, float12));
+            }
+            if (nb.isUnderlined()) {
+                this.addEffect(new BakedGlyph.Effect(this.x + float17 - 1.0f, this.y + float17 + 9.0f, this.x + float17 + float16, this.y + float17 + 9.0f - 1.0f, 0.01f, float13, float14, float15, float12));
+            }
+            this.x += float16;
+            return true;
+        }
+        
+        public float finish(final int integer, final float float2) {
+            if (integer != 0) {
+                final float float3 = (integer >> 24 & 0xFF) / 255.0f;
+                final float float4 = (integer >> 16 & 0xFF) / 255.0f;
+                final float float5 = (integer >> 8 & 0xFF) / 255.0f;
+                final float float6 = (integer & 0xFF) / 255.0f;
+                this.addEffect(new BakedGlyph.Effect(float2 - 1.0f, this.y + 9.0f, this.x + 1.0f, this.y - 1.0f, 0.01f, float4, float5, float6, float3));
+            }
+            if (this.effects != null) {
+                final BakedGlyph dow4 = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
+                final VertexConsumer dhp5 = this.bufferSource.getBuffer(dow4.renderType(this.seeThrough));
+                for (final BakedGlyph.Effect a7 : this.effects) {
+                    dow4.renderEffect(a7, this.pose, dhp5, this.packedLightCoords);
+                }
+            }
+            return this.x;
+        }
     }
 }
diff --git a/src/net/minecraft/client/gui/Gui.java b/src/net/minecraft/client/gui/Gui.java
index a7cbc4b..e751354 100644
--- a/src/net/minecraft/client/gui/Gui.java
+++ b/src/net/minecraft/client/gui/Gui.java
@@ -1,16 +1,20 @@
 package net.minecraft.client.gui;
 
+import java.util.UUID;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.world.level.border.WorldBorder;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.Tesselator;
-import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import net.minecraft.world.food.FoodData;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.Util;
 import net.minecraft.world.entity.Entity;
+import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.scores.Team;
 import com.google.common.collect.Iterables;
 import java.util.stream.Collector;
@@ -18,7 +22,7 @@ import java.util.stream.Collectors;
 import net.minecraft.world.scores.Score;
 import net.minecraft.util.StringUtil;
 import net.minecraft.client.resources.language.I18n;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.world.entity.player.Player;
@@ -42,14 +46,17 @@ import net.minecraft.client.Options;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.client.AttackIndicatorStatus;
 import com.mojang.blaze3d.platform.GlStateManager;
+import net.minecraft.util.FastColor;
 import net.minecraft.world.scores.PlayerTeam;
 import net.minecraft.world.scores.Objective;
 import net.minecraft.world.scores.Scoreboard;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.world.level.GameType;
 import net.minecraft.util.Mth;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.level.block.Blocks;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.chat.OverlayChatListener;
 import net.minecraft.client.gui.chat.StandardChatListener;
 import net.minecraft.client.gui.chat.NarratorChatListener;
@@ -65,6 +72,8 @@ import net.minecraft.client.gui.components.spectator.SpectatorGui;
 import net.minecraft.client.gui.components.SubtitleOverlay;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
 import net.minecraft.world.item.ItemStack;
+import javax.annotation.Nullable;
+import net.minecraft.network.chat.Component;
 import net.minecraft.client.gui.components.ChatComponent;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.Minecraft;
@@ -80,7 +89,8 @@ public class Gui extends GuiComponent {
     private final ItemRenderer itemRenderer;
     private final ChatComponent chat;
     private int tickCount;
-    private String overlayMessageString;
+    @Nullable
+    private Component overlayMessageString;
     private int overlayMessageTime;
     private boolean animateOverlayMessageColor;
     public float vignetteBrightness;
@@ -92,8 +102,10 @@ public class Gui extends GuiComponent {
     private final PlayerTabOverlay tabList;
     private final BossHealthOverlay bossOverlay;
     private int titleTime;
-    private String title;
-    private String subtitle;
+    @Nullable
+    private Component title;
+    @Nullable
+    private Component subtitle;
     private int titleFadeInTime;
     private int titleStayTime;
     private int titleFadeOutTime;
@@ -105,31 +117,28 @@ public class Gui extends GuiComponent {
     private int screenHeight;
     private final Map<ChatType, List<ChatListener>> chatListeners;
     
-    public Gui(final Minecraft dbn) {
+    public Gui(final Minecraft dlx) {
         this.random = new Random();
-        this.overlayMessageString = "";
         this.vignetteBrightness = 1.0f;
         this.lastToolHighlight = ItemStack.EMPTY;
-        this.title = "";
-        this.subtitle = "";
         this.chatListeners = Maps.newHashMap();
-        this.minecraft = dbn;
-        this.itemRenderer = dbn.getItemRenderer();
-        this.debugScreen = new DebugScreenOverlay(dbn);
-        this.spectatorGui = new SpectatorGui(dbn);
-        this.chat = new ChatComponent(dbn);
-        this.tabList = new PlayerTabOverlay(dbn, this);
-        this.bossOverlay = new BossHealthOverlay(dbn);
-        this.subtitleOverlay = new SubtitleOverlay(dbn);
-        for (final ChatType ld6 : ChatType.values()) {
-            this.chatListeners.put(ld6, Lists.newArrayList());
+        this.minecraft = dlx;
+        this.itemRenderer = dlx.getItemRenderer();
+        this.debugScreen = new DebugScreenOverlay(dlx);
+        this.spectatorGui = new SpectatorGui(dlx);
+        this.chat = new ChatComponent(dlx);
+        this.tabList = new PlayerTabOverlay(dlx, this);
+        this.bossOverlay = new BossHealthOverlay(dlx);
+        this.subtitleOverlay = new SubtitleOverlay(dlx);
+        for (final ChatType mo6 : ChatType.values()) {
+            this.chatListeners.put(mo6, Lists.newArrayList());
         }
-        final ChatListener dcl3 = NarratorChatListener.INSTANCE;
-        this.chatListeners.get(ChatType.CHAT).add(new StandardChatListener(dbn));
-        this.chatListeners.get(ChatType.CHAT).add(dcl3);
-        this.chatListeners.get(ChatType.SYSTEM).add(new StandardChatListener(dbn));
-        this.chatListeners.get(ChatType.SYSTEM).add(dcl3);
-        this.chatListeners.get(ChatType.GAME_INFO).add(new OverlayChatListener(dbn));
+        final ChatListener dmx3 = NarratorChatListener.INSTANCE;
+        this.chatListeners.get(ChatType.CHAT).add(new StandardChatListener(dlx));
+        this.chatListeners.get(ChatType.CHAT).add(dmx3);
+        this.chatListeners.get(ChatType.SYSTEM).add(new StandardChatListener(dlx));
+        this.chatListeners.get(ChatType.SYSTEM).add(dmx3);
+        this.chatListeners.get(ChatType.GAME_INFO).add(new OverlayChatListener(dlx));
         this.resetTitleTimes();
     }
     
@@ -139,10 +148,10 @@ public class Gui extends GuiComponent {
         this.titleFadeOutTime = 20;
     }
     
-    public void render(final float float1) {
+    public void render(final PoseStack dhl, final float float2) {
         this.screenWidth = this.minecraft.getWindow().getGuiScaledWidth();
         this.screenHeight = this.minecraft.getWindow().getGuiScaledHeight();
-        final Font dch3 = this.getFont();
+        final Font dmt4 = this.getFont();
         RenderSystem.enableBlend();
         if (Minecraft.useFancyGraphics()) {
             this.renderVignette(this.minecraft.getCameraEntity());
@@ -151,131 +160,132 @@ public class Gui extends GuiComponent {
             RenderSystem.enableDepthTest();
             RenderSystem.defaultBlendFunc();
         }
-        final ItemStack ben4 = this.minecraft.player.inventory.getArmor(3);
-        if (this.minecraft.options.thirdPersonView == 0 && ben4.getItem() == Blocks.CARVED_PUMPKIN.asItem()) {
+        final ItemStack bki5 = this.minecraft.player.inventory.getArmor(3);
+        if (this.minecraft.options.thirdPersonView == 0 && bki5.getItem() == Blocks.CARVED_PUMPKIN.asItem()) {
             this.renderPumpkin();
         }
         if (!this.minecraft.player.hasEffect(MobEffects.CONFUSION)) {
-            final float float2 = Mth.lerp(float1, this.minecraft.player.oPortalTime, this.minecraft.player.portalTime);
-            if (float2 > 0.0f) {
-                this.renderPortalOverlay(float2);
+            final float float3 = Mth.lerp(float2, this.minecraft.player.oPortalTime, this.minecraft.player.portalTime);
+            if (float3 > 0.0f) {
+                this.renderPortalOverlay(float3);
             }
         }
         if (this.minecraft.gameMode.getPlayerMode() == GameType.SPECTATOR) {
-            this.spectatorGui.renderHotbar(float1);
+            this.spectatorGui.renderHotbar(dhl, float2);
         }
         else if (!this.minecraft.options.hideGui) {
-            this.renderHotbar(float1);
+            this.renderHotbar(float2, dhl);
         }
         if (!this.minecraft.options.hideGui) {
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
             this.minecraft.getTextureManager().bind(Gui.GUI_ICONS_LOCATION);
             RenderSystem.enableBlend();
             RenderSystem.enableAlphaTest();
-            this.renderCrosshair();
+            this.renderCrosshair(dhl);
             RenderSystem.defaultBlendFunc();
             this.minecraft.getProfiler().push("bossHealth");
-            this.bossOverlay.render();
+            this.bossOverlay.render(dhl);
             this.minecraft.getProfiler().pop();
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
             this.minecraft.getTextureManager().bind(Gui.GUI_ICONS_LOCATION);
             if (this.minecraft.gameMode.canHurtPlayer()) {
-                this.renderPlayerHealth();
+                this.renderPlayerHealth(dhl);
             }
-            this.renderVehicleHealth();
+            this.renderVehicleHealth(dhl);
             RenderSystem.disableBlend();
-            final int integer5 = this.screenWidth / 2 - 91;
+            final int integer6 = this.screenWidth / 2 - 91;
             if (this.minecraft.player.isRidingJumpable()) {
-                this.renderJumpMeter(integer5);
+                this.renderJumpMeter(dhl, integer6);
             }
             else if (this.minecraft.gameMode.hasExperience()) {
-                this.renderExperienceBar(integer5);
+                this.renderExperienceBar(dhl, integer6);
             }
             if (this.minecraft.options.heldItemTooltips && this.minecraft.gameMode.getPlayerMode() != GameType.SPECTATOR) {
-                this.renderSelectedItemName();
+                this.renderSelectedItemName(dhl);
             }
             else if (this.minecraft.player.isSpectator()) {
-                this.spectatorGui.renderTooltip();
+                this.spectatorGui.renderTooltip(dhl);
             }
         }
         if (this.minecraft.player.getSleepTimer() > 0) {
             this.minecraft.getProfiler().push("sleep");
             RenderSystem.disableDepthTest();
             RenderSystem.disableAlphaTest();
-            final float float2 = (float)this.minecraft.player.getSleepTimer();
-            float float3 = float2 / 100.0f;
-            if (float3 > 1.0f) {
-                float3 = 1.0f - (float2 - 100.0f) / 10.0f;
+            final float float3 = (float)this.minecraft.player.getSleepTimer();
+            float float4 = float3 / 100.0f;
+            if (float4 > 1.0f) {
+                float4 = 1.0f - (float3 - 100.0f) / 10.0f;
             }
-            final int integer6 = (int)(220.0f * float3) << 24 | 0x101020;
-            GuiComponent.fill(0, 0, this.screenWidth, this.screenHeight, integer6);
+            final int integer7 = (int)(220.0f * float4) << 24 | 0x101020;
+            GuiComponent.fill(dhl, 0, 0, this.screenWidth, this.screenHeight, integer7);
             RenderSystem.enableAlphaTest();
             RenderSystem.enableDepthTest();
             this.minecraft.getProfiler().pop();
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         }
         if (this.minecraft.isDemo()) {
-            this.renderDemoOverlay();
+            this.renderDemoOverlay(dhl);
         }
-        this.renderEffects();
+        this.renderEffects(dhl);
         if (this.minecraft.options.renderDebug) {
-            this.debugScreen.render();
+            this.debugScreen.render(dhl);
         }
         if (!this.minecraft.options.hideGui) {
-            if (this.overlayMessageTime > 0) {
+            if (this.overlayMessageString != null && this.overlayMessageTime > 0) {
                 this.minecraft.getProfiler().push("overlayMessage");
-                final float float2 = this.overlayMessageTime - float1;
-                int integer7 = (int)(float2 * 255.0f / 20.0f);
-                if (integer7 > 255) {
-                    integer7 = 255;
+                final float float3 = this.overlayMessageTime - float2;
+                int integer8 = (int)(float3 * 255.0f / 20.0f);
+                if (integer8 > 255) {
+                    integer8 = 255;
                 }
-                if (integer7 > 8) {
+                if (integer8 > 8) {
                     RenderSystem.pushMatrix();
                     RenderSystem.translatef((float)(this.screenWidth / 2), (float)(this.screenHeight - 68), 0.0f);
                     RenderSystem.enableBlend();
                     RenderSystem.defaultBlendFunc();
-                    int integer6 = 16777215;
+                    int integer7 = 16777215;
                     if (this.animateOverlayMessageColor) {
-                        integer6 = (Mth.hsvToRgb(float2 / 50.0f, 0.7f, 0.6f) & 0xFFFFFF);
+                        integer7 = (Mth.hsvToRgb(float3 / 50.0f, 0.7f, 0.6f) & 0xFFFFFF);
                     }
-                    final int integer8 = integer7 << 24 & 0xFF000000;
-                    this.drawBackdrop(dch3, -4, dch3.width(this.overlayMessageString));
-                    dch3.draw(this.overlayMessageString, (float)(-dch3.width(this.overlayMessageString) / 2), -4.0f, integer6 | integer8);
+                    final int integer9 = integer8 << 24 & 0xFF000000;
+                    final int integer10 = dmt4.width(this.overlayMessageString);
+                    this.drawBackdrop(dhl, dmt4, -4, integer10, 0xFFFFFF | integer9);
+                    dmt4.draw(dhl, this.overlayMessageString, (float)(-integer10 / 2), -4.0f, integer7 | integer9);
                     RenderSystem.disableBlend();
                     RenderSystem.popMatrix();
                 }
                 this.minecraft.getProfiler().pop();
             }
-            if (this.titleTime > 0) {
+            if (this.title != null && this.titleTime > 0) {
                 this.minecraft.getProfiler().push("titleAndSubtitle");
-                final float float2 = this.titleTime - float1;
-                int integer7 = 255;
+                final float float3 = this.titleTime - float2;
+                int integer8 = 255;
                 if (this.titleTime > this.titleFadeOutTime + this.titleStayTime) {
-                    final float float4 = this.titleFadeInTime + this.titleStayTime + this.titleFadeOutTime - float2;
-                    integer7 = (int)(float4 * 255.0f / this.titleFadeInTime);
+                    final float float5 = this.titleFadeInTime + this.titleStayTime + this.titleFadeOutTime - float3;
+                    integer8 = (int)(float5 * 255.0f / this.titleFadeInTime);
                 }
                 if (this.titleTime <= this.titleFadeOutTime) {
-                    integer7 = (int)(float2 * 255.0f / this.titleFadeOutTime);
+                    integer8 = (int)(float3 * 255.0f / this.titleFadeOutTime);
                 }
-                integer7 = Mth.clamp(integer7, 0, 255);
-                if (integer7 > 8) {
+                integer8 = Mth.clamp(integer8, 0, 255);
+                if (integer8 > 8) {
                     RenderSystem.pushMatrix();
                     RenderSystem.translatef((float)(this.screenWidth / 2), (float)(this.screenHeight / 2), 0.0f);
                     RenderSystem.enableBlend();
                     RenderSystem.defaultBlendFunc();
                     RenderSystem.pushMatrix();
                     RenderSystem.scalef(4.0f, 4.0f, 4.0f);
-                    final int integer6 = integer7 << 24 & 0xFF000000;
-                    final int integer8 = dch3.width(this.title);
-                    this.drawBackdrop(dch3, -10, integer8);
-                    dch3.drawShadow(this.title, (float)(-integer8 / 2), -10.0f, 0xFFFFFF | integer6);
+                    final int integer7 = integer8 << 24 & 0xFF000000;
+                    final int integer9 = dmt4.width(this.title);
+                    this.drawBackdrop(dhl, dmt4, -10, integer9, 0xFFFFFF | integer7);
+                    dmt4.drawShadow(dhl, this.title, (float)(-integer9 / 2), -10.0f, 0xFFFFFF | integer7);
                     RenderSystem.popMatrix();
-                    if (!this.subtitle.isEmpty()) {
+                    if (this.subtitle != null) {
                         RenderSystem.pushMatrix();
                         RenderSystem.scalef(2.0f, 2.0f, 2.0f);
-                        final int integer9 = dch3.width(this.subtitle);
-                        this.drawBackdrop(dch3, 5, integer9);
-                        dch3.drawShadow(this.subtitle, (float)(-integer9 / 2), 5.0f, 0xFFFFFF | integer6);
+                        final int integer10 = dmt4.width(this.subtitle);
+                        this.drawBackdrop(dhl, dmt4, 5, integer10, 0xFFFFFF | integer7);
+                        dmt4.drawShadow(dhl, this.subtitle, (float)(-integer10 / 2), 5.0f, 0xFFFFFF | integer7);
                         RenderSystem.popMatrix();
                     }
                     RenderSystem.disableBlend();
@@ -283,19 +293,19 @@ public class Gui extends GuiComponent {
                 }
                 this.minecraft.getProfiler().pop();
             }
-            this.subtitleOverlay.render();
-            final Scoreboard cwl5 = this.minecraft.level.getScoreboard();
-            Objective cwi6 = null;
-            final PlayerTeam cwj7 = cwl5.getPlayersTeam(this.minecraft.player.getScoreboardName());
-            if (cwj7 != null) {
-                final int integer8 = cwj7.getColor().getId();
-                if (integer8 >= 0) {
-                    cwi6 = cwl5.getDisplayObjective(3 + integer8);
+            this.subtitleOverlay.render(dhl);
+            final Scoreboard dfm6 = this.minecraft.level.getScoreboard();
+            Objective dfj7 = null;
+            final PlayerTeam dfk8 = dfm6.getPlayersTeam(this.minecraft.player.getScoreboardName());
+            if (dfk8 != null) {
+                final int integer9 = dfk8.getColor().getId();
+                if (integer9 >= 0) {
+                    dfj7 = dfm6.getDisplayObjective(3 + integer9);
                 }
             }
-            Objective cwi7 = (cwi6 != null) ? cwi6 : cwl5.getDisplayObjective(1);
-            if (cwi7 != null) {
-                this.displayScoreboardSidebar(cwi7);
+            Objective dfj8 = (dfj7 != null) ? dfj7 : dfm6.getDisplayObjective(1);
+            if (dfj8 != null) {
+                this.displayScoreboardSidebar(dhl, dfj8);
             }
             RenderSystem.enableBlend();
             RenderSystem.defaultBlendFunc();
@@ -303,13 +313,13 @@ public class Gui extends GuiComponent {
             RenderSystem.pushMatrix();
             RenderSystem.translatef(0.0f, (float)(this.screenHeight - 48), 0.0f);
             this.minecraft.getProfiler().push("chat");
-            this.chat.render(this.tickCount);
+            this.chat.render(dhl, this.tickCount);
             this.minecraft.getProfiler().pop();
             RenderSystem.popMatrix();
-            cwi7 = cwl5.getDisplayObjective(0);
-            if (this.minecraft.options.keyPlayerList.isDown() && (!this.minecraft.isLocalServer() || this.minecraft.player.connection.getOnlinePlayers().size() > 1 || cwi7 != null)) {
+            dfj8 = dfm6.getDisplayObjective(0);
+            if (this.minecraft.options.keyPlayerList.isDown() && (!this.minecraft.isLocalServer() || this.minecraft.player.connection.getOnlinePlayers().size() > 1 || dfj8 != null)) {
                 this.tabList.setVisible(true);
-                this.tabList.render(this.screenWidth, cwl5, cwi7);
+                this.tabList.render(dhl, this.screenWidth, dfm6, dfj8);
             }
             else {
                 this.tabList.setVisible(false);
@@ -319,211 +329,211 @@ public class Gui extends GuiComponent {
         RenderSystem.enableAlphaTest();
     }
     
-    private void drawBackdrop(final Font dch, final int integer2, final int integer3) {
-        final int integer4 = this.minecraft.options.getBackgroundColor(0.0f);
-        if (integer4 != 0) {
-            final int integer5 = -integer3 / 2;
-            final int integer6 = integer5 - 2;
-            final int integer7 = integer2 - 2;
-            final int integer8 = integer5 + integer3 + 2;
-            dch.getClass();
-            GuiComponent.fill(integer6, integer7, integer8, integer2 + 9 + 2, integer4);
+    private void drawBackdrop(final PoseStack dhl, final Font dmt, final int integer3, final int integer4, final int integer5) {
+        final int integer6 = this.minecraft.options.getBackgroundColor(0.0f);
+        if (integer6 != 0) {
+            final int integer7 = -integer4 / 2;
+            final int integer8 = integer7 - 2;
+            final int integer9 = integer3 - 2;
+            final int integer10 = integer7 + integer4 + 2;
+            dmt.getClass();
+            GuiComponent.fill(dhl, integer8, integer9, integer10, integer3 + 9 + 2, FastColor.ARGB32.multiply(integer6, integer5));
         }
     }
     
-    private void renderCrosshair() {
-        final Options dbr2 = this.minecraft.options;
-        if (dbr2.thirdPersonView != 0) {
+    private void renderCrosshair(final PoseStack dhl) {
+        final Options dmb3 = this.minecraft.options;
+        if (dmb3.thirdPersonView != 0) {
             return;
         }
         if (this.minecraft.gameMode.getPlayerMode() == GameType.SPECTATOR && !this.canRenderCrosshairForSpectator(this.minecraft.hitResult)) {
             return;
         }
-        if (dbr2.renderDebug && !dbr2.hideGui && !this.minecraft.player.isReducedDebugInfo() && !dbr2.reducedDebugInfo) {
+        if (dmb3.renderDebug && !dmb3.hideGui && !this.minecraft.player.isReducedDebugInfo() && !dmb3.reducedDebugInfo) {
             RenderSystem.pushMatrix();
             RenderSystem.translatef((float)(this.screenWidth / 2), (float)(this.screenHeight / 2), (float)this.getBlitOffset());
-            final Camera dbb3 = this.minecraft.gameRenderer.getMainCamera();
-            RenderSystem.rotatef(dbb3.getXRot(), -1.0f, 0.0f, 0.0f);
-            RenderSystem.rotatef(dbb3.getYRot(), 0.0f, 1.0f, 0.0f);
+            final Camera dlj4 = this.minecraft.gameRenderer.getMainCamera();
+            RenderSystem.rotatef(dlj4.getXRot(), -1.0f, 0.0f, 0.0f);
+            RenderSystem.rotatef(dlj4.getYRot(), 0.0f, 1.0f, 0.0f);
             RenderSystem.scalef(-1.0f, -1.0f, -1.0f);
             RenderSystem.renderCrosshair(10);
             RenderSystem.popMatrix();
         }
         else {
             RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.ONE_MINUS_DST_COLOR, GlStateManager.DestFactor.ONE_MINUS_SRC_COLOR, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
-            final int integer3 = 15;
-            this.blit((this.screenWidth - 15) / 2, (this.screenHeight - 15) / 2, 0, 0, 15, 15);
+            final int integer4 = 15;
+            this.blit(dhl, (this.screenWidth - 15) / 2, (this.screenHeight - 15) / 2, 0, 0, 15, 15);
             if (this.minecraft.options.attackIndicator == AttackIndicatorStatus.CROSSHAIR) {
-                final float float4 = this.minecraft.player.getAttackStrengthScale(0.0f);
-                boolean boolean5 = false;
-                if (this.minecraft.crosshairPickEntity != null && this.minecraft.crosshairPickEntity instanceof LivingEntity && float4 >= 1.0f) {
-                    boolean5 = (this.minecraft.player.getCurrentItemAttackStrengthDelay() > 5.0f);
-                    boolean5 &= this.minecraft.crosshairPickEntity.isAlive();
+                final float float5 = this.minecraft.player.getAttackStrengthScale(0.0f);
+                boolean boolean6 = false;
+                if (this.minecraft.crosshairPickEntity != null && this.minecraft.crosshairPickEntity instanceof LivingEntity && float5 >= 1.0f) {
+                    boolean6 = (this.minecraft.player.getCurrentItemAttackStrengthDelay() > 5.0f);
+                    boolean6 &= this.minecraft.crosshairPickEntity.isAlive();
                 }
-                final int integer4 = this.screenHeight / 2 - 7 + 16;
-                final int integer5 = this.screenWidth / 2 - 8;
-                if (boolean5) {
-                    this.blit(integer5, integer4, 68, 94, 16, 16);
+                final int integer5 = this.screenHeight / 2 - 7 + 16;
+                final int integer6 = this.screenWidth / 2 - 8;
+                if (boolean6) {
+                    this.blit(dhl, integer6, integer5, 68, 94, 16, 16);
                 }
-                else if (float4 < 1.0f) {
-                    final int integer6 = (int)(float4 * 17.0f);
-                    this.blit(integer5, integer4, 36, 94, 16, 4);
-                    this.blit(integer5, integer4, 52, 94, integer6, 4);
+                else if (float5 < 1.0f) {
+                    final int integer7 = (int)(float5 * 17.0f);
+                    this.blit(dhl, integer6, integer5, 36, 94, 16, 4);
+                    this.blit(dhl, integer6, integer5, 52, 94, integer7, 4);
                 }
             }
         }
     }
     
-    private boolean canRenderCrosshairForSpectator(final HitResult cvi) {
-        if (cvi == null) {
+    private boolean canRenderCrosshairForSpectator(final HitResult dej) {
+        if (dej == null) {
             return false;
         }
-        if (cvi.getType() == HitResult.Type.ENTITY) {
-            return ((EntityHitResult)cvi).getEntity() instanceof MenuProvider;
+        if (dej.getType() == HitResult.Type.ENTITY) {
+            return ((EntityHitResult)dej).getEntity() instanceof MenuProvider;
         }
-        if (cvi.getType() == HitResult.Type.BLOCK) {
-            final BlockPos fk3 = ((BlockHitResult)cvi).getBlockPos();
-            final Level bjw4 = this.minecraft.level;
-            return bjw4.getBlockState(fk3).getMenuProvider(bjw4, fk3) != null;
+        if (dej.getType() == HitResult.Type.BLOCK) {
+            final BlockPos fu3 = ((BlockHitResult)dej).getBlockPos();
+            final Level bqb4 = this.minecraft.level;
+            return bqb4.getBlockState(fu3).getMenuProvider(bqb4, fu3) != null;
         }
         return false;
     }
     
-    protected void renderEffects() {
-        final Collection<MobEffectInstance> collection2 = this.minecraft.player.getActiveEffects();
-        if (collection2.isEmpty()) {
+    protected void renderEffects(final PoseStack dhl) {
+        final Collection<MobEffectInstance> collection3 = this.minecraft.player.getActiveEffects();
+        if (collection3.isEmpty()) {
             return;
         }
         RenderSystem.enableBlend();
-        int integer3 = 0;
         int integer4 = 0;
-        final MobEffectTextureManager eaw5 = this.minecraft.getMobEffectTextures();
-        final List<Runnable> list6 = Lists.newArrayListWithExpectedSize(collection2.size());
+        int integer5 = 0;
+        final MobEffectTextureManager emi6 = this.minecraft.getMobEffectTextures();
+        final List<Runnable> list7 = Lists.newArrayListWithExpectedSize(collection3.size());
         this.minecraft.getTextureManager().bind(AbstractContainerScreen.INVENTORY_LOCATION);
-        for (final MobEffectInstance akk8 : Ordering.<Comparable>natural().reverse().<MobEffectInstance>sortedCopy(collection2)) {
-            final MobEffect aki9 = akk8.getEffect();
-            if (akk8.showIcon()) {
-                int integer5 = this.screenWidth;
-                int integer6 = 1;
+        for (final MobEffectInstance aog9 : Ordering.<Comparable>natural().reverse().<MobEffectInstance>sortedCopy(collection3)) {
+            final MobEffect aoe10 = aog9.getEffect();
+            if (aog9.showIcon()) {
+                int integer6 = this.screenWidth;
+                int integer7 = 1;
                 if (this.minecraft.isDemo()) {
-                    integer6 += 15;
+                    integer7 += 15;
                 }
-                if (aki9.isBeneficial()) {
-                    ++integer3;
-                    integer5 -= 25 * integer3;
+                if (aoe10.isBeneficial()) {
+                    ++integer4;
+                    integer6 -= 25 * integer4;
                 }
                 else {
-                    ++integer4;
-                    integer5 -= 25 * integer4;
-                    integer6 += 26;
+                    ++integer5;
+                    integer6 -= 25 * integer5;
+                    integer7 += 26;
                 }
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                float float12 = 1.0f;
-                if (akk8.isAmbient()) {
-                    this.blit(integer5, integer6, 165, 166, 24, 24);
+                float float13 = 1.0f;
+                if (aog9.isAmbient()) {
+                    this.blit(dhl, integer6, integer7, 165, 166, 24, 24);
                 }
                 else {
-                    this.blit(integer5, integer6, 141, 166, 24, 24);
-                    if (akk8.getDuration() <= 200) {
-                        final int integer7 = 10 - akk8.getDuration() / 20;
-                        float12 = Mth.clamp(akk8.getDuration() / 10.0f / 5.0f * 0.5f, 0.0f, 0.5f) + Mth.cos(akk8.getDuration() * 3.1415927f / 5.0f) * Mth.clamp(integer7 / 10.0f * 0.25f, 0.0f, 0.25f);
+                    this.blit(dhl, integer6, integer7, 141, 166, 24, 24);
+                    if (aog9.getDuration() <= 200) {
+                        final int integer8 = 10 - aog9.getDuration() / 20;
+                        float13 = Mth.clamp(aog9.getDuration() / 10.0f / 5.0f * 0.5f, 0.0f, 0.5f) + Mth.cos(aog9.getDuration() * 3.1415927f / 5.0f) * Mth.clamp(integer8 / 10.0f * 0.25f, 0.0f, 0.25f);
                     }
                 }
-                final TextureAtlasSprite eaj13 = eaw5.get(aki9);
-                final int integer8 = integer5;
+                final TextureAtlasSprite elv14 = emi6.get(aoe10);
                 final int integer9 = integer6;
-                final float float13 = float12;
-                final TextureAtlasSprite eaj14;
-                final float float14;
+                final int integer10 = integer7;
+                final float float14 = float13;
+                final TextureAtlasSprite elv15;
+                final float float15;
                 final int n;
                 final int n2;
-                list6.add(() -> {
-                    this.minecraft.getTextureManager().bind(eaj14.atlas().location());
-                    RenderSystem.color4f(1.0f, 1.0f, 1.0f, float14);
-                    GuiComponent.blit(n + 3, n2 + 3, this.getBlitOffset(), 18, 18, eaj14);
+                list7.add(() -> {
+                    this.minecraft.getTextureManager().bind(elv15.atlas().location());
+                    RenderSystem.color4f(1.0f, 1.0f, 1.0f, float15);
+                    GuiComponent.blit(dhl, n + 3, n2 + 3, this.getBlitOffset(), 18, 18, elv15);
                     return;
                 });
             }
         }
-        list6.forEach(Runnable::run);
+        list7.forEach(Runnable::run);
     }
     
-    protected void renderHotbar(final float float1) {
-        final Player ayj3 = this.getCameraPlayer();
-        if (ayj3 == null) {
+    protected void renderHotbar(final float float1, final PoseStack dhl) {
+        final Player bec4 = this.getCameraPlayer();
+        if (bec4 == null) {
             return;
         }
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(Gui.WIDGETS_LOCATION);
-        final ItemStack ben4 = ayj3.getOffhandItem();
-        final HumanoidArm aky5 = ayj3.getMainArm().getOpposite();
-        final int integer6 = this.screenWidth / 2;
-        final int integer7 = this.getBlitOffset();
-        final int integer8 = 182;
-        final int integer9 = 91;
+        final ItemStack bki5 = bec4.getOffhandItem();
+        final HumanoidArm aou6 = bec4.getMainArm().getOpposite();
+        final int integer7 = this.screenWidth / 2;
+        final int integer8 = this.getBlitOffset();
+        final int integer9 = 182;
+        final int integer10 = 91;
         this.setBlitOffset(-90);
-        this.blit(integer6 - 91, this.screenHeight - 22, 0, 0, 182, 22);
-        this.blit(integer6 - 91 - 1 + ayj3.inventory.selected * 20, this.screenHeight - 22 - 1, 0, 22, 24, 22);
-        if (!ben4.isEmpty()) {
-            if (aky5 == HumanoidArm.LEFT) {
-                this.blit(integer6 - 91 - 29, this.screenHeight - 23, 24, 22, 29, 24);
+        this.blit(dhl, integer7 - 91, this.screenHeight - 22, 0, 0, 182, 22);
+        this.blit(dhl, integer7 - 91 - 1 + bec4.inventory.selected * 20, this.screenHeight - 22 - 1, 0, 22, 24, 22);
+        if (!bki5.isEmpty()) {
+            if (aou6 == HumanoidArm.LEFT) {
+                this.blit(dhl, integer7 - 91 - 29, this.screenHeight - 23, 24, 22, 29, 24);
             }
             else {
-                this.blit(integer6 + 91, this.screenHeight - 23, 53, 22, 29, 24);
+                this.blit(dhl, integer7 + 91, this.screenHeight - 23, 53, 22, 29, 24);
             }
         }
-        this.setBlitOffset(integer7);
+        this.setBlitOffset(integer8);
         RenderSystem.enableRescaleNormal();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        for (int integer10 = 0; integer10 < 9; ++integer10) {
-            final int integer11 = integer6 - 90 + integer10 * 20 + 2;
-            final int integer12 = this.screenHeight - 16 - 3;
-            this.renderSlot(integer11, integer12, float1, ayj3, ayj3.inventory.items.get(integer10));
+        for (int integer11 = 0; integer11 < 9; ++integer11) {
+            final int integer12 = integer7 - 90 + integer11 * 20 + 2;
+            final int integer13 = this.screenHeight - 16 - 3;
+            this.renderSlot(integer12, integer13, float1, bec4, bec4.inventory.items.get(integer11));
         }
-        if (!ben4.isEmpty()) {
-            final int integer10 = this.screenHeight - 16 - 3;
-            if (aky5 == HumanoidArm.LEFT) {
-                this.renderSlot(integer6 - 91 - 26, integer10, float1, ayj3, ben4);
+        if (!bki5.isEmpty()) {
+            final int integer11 = this.screenHeight - 16 - 3;
+            if (aou6 == HumanoidArm.LEFT) {
+                this.renderSlot(integer7 - 91 - 26, integer11, float1, bec4, bki5);
             }
             else {
-                this.renderSlot(integer6 + 91 + 10, integer10, float1, ayj3, ben4);
+                this.renderSlot(integer7 + 91 + 10, integer11, float1, bec4, bki5);
             }
         }
         if (this.minecraft.options.attackIndicator == AttackIndicatorStatus.HOTBAR) {
             final float float2 = this.minecraft.player.getAttackStrengthScale(0.0f);
             if (float2 < 1.0f) {
-                final int integer11 = this.screenHeight - 20;
-                int integer12 = integer6 + 91 + 6;
-                if (aky5 == HumanoidArm.RIGHT) {
-                    integer12 = integer6 - 91 - 22;
+                final int integer12 = this.screenHeight - 20;
+                int integer13 = integer7 + 91 + 6;
+                if (aou6 == HumanoidArm.RIGHT) {
+                    integer13 = integer7 - 91 - 22;
                 }
                 this.minecraft.getTextureManager().bind(GuiComponent.GUI_ICONS_LOCATION);
-                final int integer13 = (int)(float2 * 19.0f);
+                final int integer14 = (int)(float2 * 19.0f);
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                this.blit(integer12, integer11, 0, 94, 18, 18);
-                this.blit(integer12, integer11 + 18 - integer13, 18, 112 - integer13, 18, integer13);
+                this.blit(dhl, integer13, integer12, 0, 94, 18, 18);
+                this.blit(dhl, integer13, integer12 + 18 - integer14, 18, 112 - integer14, 18, integer14);
             }
         }
         RenderSystem.disableRescaleNormal();
         RenderSystem.disableBlend();
     }
     
-    public void renderJumpMeter(final int integer) {
+    public void renderJumpMeter(final PoseStack dhl, final int integer) {
         this.minecraft.getProfiler().push("jumpBar");
         this.minecraft.getTextureManager().bind(GuiComponent.GUI_ICONS_LOCATION);
-        final float float3 = this.minecraft.player.getJumpRidingScale();
+        final float float4 = this.minecraft.player.getJumpRidingScale();
         final int integer2 = 182;
-        final int integer3 = (int)(float3 * 183.0f);
+        final int integer3 = (int)(float4 * 183.0f);
         final int integer4 = this.screenHeight - 32 + 3;
-        this.blit(integer, integer4, 0, 84, 182, 5);
+        this.blit(dhl, integer, integer4, 0, 84, 182, 5);
         if (integer3 > 0) {
-            this.blit(integer, integer4, 0, 89, integer3, 5);
+            this.blit(dhl, integer, integer4, 0, 89, integer3, 5);
         }
         this.minecraft.getProfiler().pop();
     }
     
-    public void renderExperienceBar(final int integer) {
+    public void renderExperienceBar(final PoseStack dhl, final int integer) {
         this.minecraft.getProfiler().push("expBar");
         this.minecraft.getTextureManager().bind(GuiComponent.GUI_ICONS_LOCATION);
         final int integer2 = this.minecraft.player.getXpNeededForNextLevel();
@@ -531,54 +541,54 @@ public class Gui extends GuiComponent {
             final int integer3 = 182;
             final int integer4 = (int)(this.minecraft.player.experienceProgress * 183.0f);
             final int integer5 = this.screenHeight - 32 + 3;
-            this.blit(integer, integer5, 0, 64, 182, 5);
+            this.blit(dhl, integer, integer5, 0, 64, 182, 5);
             if (integer4 > 0) {
-                this.blit(integer, integer5, 0, 69, integer4, 5);
+                this.blit(dhl, integer, integer5, 0, 69, integer4, 5);
             }
         }
         this.minecraft.getProfiler().pop();
         if (this.minecraft.player.experienceLevel > 0) {
             this.minecraft.getProfiler().push("expLevel");
-            final String string4 = "" + this.minecraft.player.experienceLevel;
-            final int integer4 = (this.screenWidth - this.getFont().width(string4)) / 2;
+            final String string5 = "" + this.minecraft.player.experienceLevel;
+            final int integer4 = (this.screenWidth - this.getFont().width(string5)) / 2;
             final int integer5 = this.screenHeight - 31 - 4;
-            this.getFont().draw(string4, (float)(integer4 + 1), (float)integer5, 0);
-            this.getFont().draw(string4, (float)(integer4 - 1), (float)integer5, 0);
-            this.getFont().draw(string4, (float)integer4, (float)(integer5 + 1), 0);
-            this.getFont().draw(string4, (float)integer4, (float)(integer5 - 1), 0);
-            this.getFont().draw(string4, (float)integer4, (float)integer5, 8453920);
+            this.getFont().draw(dhl, string5, (float)(integer4 + 1), (float)integer5, 0);
+            this.getFont().draw(dhl, string5, (float)(integer4 - 1), (float)integer5, 0);
+            this.getFont().draw(dhl, string5, (float)integer4, (float)(integer5 + 1), 0);
+            this.getFont().draw(dhl, string5, (float)integer4, (float)(integer5 - 1), 0);
+            this.getFont().draw(dhl, string5, (float)integer4, (float)integer5, 8453920);
             this.minecraft.getProfiler().pop();
         }
     }
     
-    public void renderSelectedItemName() {
+    public void renderSelectedItemName(final PoseStack dhl) {
         this.minecraft.getProfiler().push("selectedItemName");
         if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
-            final Component lf2 = new TextComponent("").append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color);
+            final MutableComponent mx3 = new TextComponent("").append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color);
             if (this.lastToolHighlight.hasCustomHoverName()) {
-                lf2.withStyle(ChatFormatting.ITALIC);
+                mx3.withStyle(ChatFormatting.ITALIC);
             }
-            final String string3 = lf2.getColoredString();
-            final int integer4 = (this.screenWidth - this.getFont().width(string3)) / 2;
-            int integer5 = this.screenHeight - 59;
+            final int integer4 = this.getFont().width(mx3);
+            final int integer5 = (this.screenWidth - integer4) / 2;
+            int integer6 = this.screenHeight - 59;
             if (!this.minecraft.gameMode.canHurtPlayer()) {
-                integer5 += 14;
+                integer6 += 14;
             }
-            int integer6 = (int)(this.toolHighlightTimer * 256.0f / 10.0f);
-            if (integer6 > 255) {
-                integer6 = 255;
+            int integer7 = (int)(this.toolHighlightTimer * 256.0f / 10.0f);
+            if (integer7 > 255) {
+                integer7 = 255;
             }
-            if (integer6 > 0) {
+            if (integer7 > 0) {
                 RenderSystem.pushMatrix();
                 RenderSystem.enableBlend();
                 RenderSystem.defaultBlendFunc();
-                final int integer7 = integer4 - 2;
                 final int integer8 = integer5 - 2;
-                final int integer9 = integer4 + this.getFont().width(string3) + 2;
-                final int n = integer5;
+                final int integer9 = integer6 - 2;
+                final int integer10 = integer5 + integer4 + 2;
+                final int n = integer6;
                 this.getFont().getClass();
-                GuiComponent.fill(integer7, integer8, integer9, n + 9 + 2, this.minecraft.options.getBackgroundColor(0));
-                this.getFont().drawShadow(string3, (float)integer4, (float)integer5, 16777215 + (integer6 << 24));
+                GuiComponent.fill(dhl, integer8, integer9, integer10, n + 9 + 2, this.minecraft.options.getBackgroundColor(0));
+                this.getFont().drawShadow(dhl, mx3, (float)integer5, (float)integer6, 16777215 + (integer7 << 24));
                 RenderSystem.disableBlend();
                 RenderSystem.popMatrix();
             }
@@ -586,78 +596,81 @@ public class Gui extends GuiComponent {
         this.minecraft.getProfiler().pop();
     }
     
-    public void renderDemoOverlay() {
+    public void renderDemoOverlay(final PoseStack dhl) {
         this.minecraft.getProfiler().push("demo");
-        String string2;
+        String string3;
         if (this.minecraft.level.getGameTime() >= 120500L) {
-            string2 = I18n.get("demo.demoExpired");
+            string3 = I18n.get("demo.demoExpired");
         }
         else {
-            string2 = I18n.get("demo.remainingTime", StringUtil.formatTickDuration((int)(120500L - this.minecraft.level.getGameTime())));
+            string3 = I18n.get("demo.remainingTime", StringUtil.formatTickDuration((int)(120500L - this.minecraft.level.getGameTime())));
         }
-        final int integer3 = this.getFont().width(string2);
-        this.getFont().drawShadow(string2, (float)(this.screenWidth - integer3 - 10), 5.0f, 16777215);
+        final int integer4 = this.getFont().width(string3);
+        this.getFont().drawShadow(dhl, string3, (float)(this.screenWidth - integer4 - 10), 5.0f, 16777215);
         this.minecraft.getProfiler().pop();
     }
     
-    private void displayScoreboardSidebar(final Objective cwi) {
-        final Scoreboard cwl3 = cwi.getScoreboard();
-        Collection<Score> collection4 = cwl3.getPlayerScores(cwi);
-        final List<Score> list5 = collection4.stream().filter(cwk -> cwk.getOwner() != null && !cwk.getOwner().startsWith("#")).collect(Collectors.toList());
-        if (list5.size() > 15) {
-            collection4 = Lists.newArrayList(Iterables.skip(list5, collection4.size() - 15));
+    private void displayScoreboardSidebar(final PoseStack dhl, final Objective dfj) {
+        final Scoreboard dfm4 = dfj.getScoreboard();
+        Collection<Score> collection5 = dfm4.getPlayerScores(dfj);
+        final List<Score> list6 = collection5.stream().filter(dfl -> dfl.getOwner() != null && !dfl.getOwner().startsWith("#")).collect(Collectors.toList());
+        if (list6.size() > 15) {
+            collection5 = Lists.newArrayList(Iterables.skip(list6, collection5.size() - 15));
         }
         else {
-            collection4 = list5;
+            collection5 = list6;
         }
-        final String string6 = cwi.getDisplayName().getColoredString();
-        int integer8;
-        final int integer7 = integer8 = this.getFont().width(string6);
-        for (final Score cwk2 : collection4) {
-            final PlayerTeam cwj11 = cwl3.getPlayersTeam(cwk2.getOwner());
-            final String string7 = PlayerTeam.formatNameForTeam(cwj11, new TextComponent(cwk2.getOwner())).getColoredString() + ": " + ChatFormatting.RED + cwk2.getScore();
-            integer8 = Math.max(integer8, this.getFont().width(string7));
+        final List<Pair<Score, Component>> list7 = Lists.newArrayListWithCapacity(collection5.size());
+        final Component mr8 = dfj.getDisplayName();
+        int integer10;
+        final int integer9 = integer10 = this.getFont().width(mr8);
+        final int integer11 = this.getFont().width(": ");
+        for (final Score dfl2 : collection5) {
+            final PlayerTeam dfk14 = dfm4.getPlayersTeam(dfl2.getOwner());
+            final Component mr9 = PlayerTeam.formatNameForTeam(dfk14, new TextComponent(dfl2.getOwner()));
+            list7.add((Pair<Score, Component>)Pair.of(dfl2, mr9));
+            integer10 = Math.max(integer10, this.getFont().width(mr9) + integer11 + this.getFont().width(Integer.toString(dfl2.getScore())));
         }
-        final int size = collection4.size();
+        final int size = collection5.size();
         this.getFont().getClass();
-        final int integer9 = size * 9;
-        final int integer10 = this.screenHeight / 2 + integer9 / 3;
-        final int integer11 = 3;
-        final int integer12 = this.screenWidth - integer8 - 3;
-        int integer13 = 0;
-        final int integer14 = this.minecraft.options.getBackgroundColor(0.3f);
-        final int integer15 = this.minecraft.options.getBackgroundColor(0.4f);
-        for (final Score cwk3 : collection4) {
-            ++integer13;
-            final PlayerTeam cwj12 = cwl3.getPlayersTeam(cwk3.getOwner());
-            final String string8 = PlayerTeam.formatNameForTeam(cwj12, new TextComponent(cwk3.getOwner())).getColoredString();
-            final String string9 = ChatFormatting.RED + "" + cwk3.getScore();
-            final int integer16 = integer12;
-            final int n = integer10;
-            final int n2 = integer13;
+        final int integer12 = size * 9;
+        final int integer13 = this.screenHeight / 2 + integer12 / 3;
+        final int integer14 = 3;
+        final int integer15 = this.screenWidth - integer10 - 3;
+        int integer16 = 0;
+        final int integer17 = this.minecraft.options.getBackgroundColor(0.3f);
+        final int integer18 = this.minecraft.options.getBackgroundColor(0.4f);
+        for (final Pair<Score, Component> pair20 : list7) {
+            ++integer16;
+            final Score dfl3 = (Score)pair20.getFirst();
+            final Component mr10 = (Component)pair20.getSecond();
+            final String string23 = ChatFormatting.RED + "" + dfl3.getScore();
+            final int integer19 = integer15;
+            final int n = integer13;
+            final int n2 = integer16;
             this.getFont().getClass();
-            final int integer17 = n - n2 * 9;
-            final int integer18 = this.screenWidth - 3 + 2;
-            final int integer19 = integer16 - 2;
-            final int integer20 = integer17;
-            final int integer21 = integer18;
-            final int n3 = integer17;
+            final int integer20 = n - n2 * 9;
+            final int integer21 = this.screenWidth - 3 + 2;
+            final int integer22 = integer19 - 2;
+            final int integer23 = integer20;
+            final int integer24 = integer21;
+            final int n3 = integer20;
             this.getFont().getClass();
-            GuiComponent.fill(integer19, integer20, integer21, n3 + 9, integer14);
-            this.getFont().draw(string8, (float)integer16, (float)integer17, -1);
-            this.getFont().draw(string9, (float)(integer18 - this.getFont().width(string9)), (float)integer17, -1);
-            if (integer13 == collection4.size()) {
-                final int integer22 = integer16 - 2;
-                final int n4 = integer17;
+            GuiComponent.fill(dhl, integer22, integer23, integer24, n3 + 9, integer17);
+            this.getFont().draw(dhl, mr10, (float)integer19, (float)integer20, -1);
+            this.getFont().draw(dhl, string23, (float)(integer21 - this.getFont().width(string23)), (float)integer20, -1);
+            if (integer16 == collection5.size()) {
+                final int integer25 = integer19 - 2;
+                final int n4 = integer20;
                 this.getFont().getClass();
-                GuiComponent.fill(integer22, n4 - 9 - 1, integer18, integer17 - 1, integer15);
-                GuiComponent.fill(integer16 - 2, integer17 - 1, integer18, integer17, integer14);
+                GuiComponent.fill(dhl, integer25, n4 - 9 - 1, integer21, integer20 - 1, integer18);
+                GuiComponent.fill(dhl, integer19 - 2, integer20 - 1, integer21, integer20, integer17);
                 final Font font = this.getFont();
-                final String string10 = string6;
-                final float float2 = (float)(integer16 + integer8 / 2 - integer7 / 2);
-                final int n5 = integer17;
+                final Component mu = mr8;
+                final float float3 = (float)(integer19 + integer10 / 2 - integer9 / 2);
+                final int n5 = integer20;
                 this.getFont().getClass();
-                font.draw(string10, float2, (float)(n5 - 9), -1);
+                font.draw(dhl, mu, float3, (float)(n5 - 9), -1);
             }
         }
     }
@@ -670,24 +683,24 @@ public class Gui extends GuiComponent {
     }
     
     private LivingEntity getPlayerVehicleWithHealth() {
-        final Player ayj2 = this.getCameraPlayer();
-        if (ayj2 != null) {
-            final Entity akq3 = ayj2.getVehicle();
-            if (akq3 == null) {
+        final Player bec2 = this.getCameraPlayer();
+        if (bec2 != null) {
+            final Entity aom3 = bec2.getVehicle();
+            if (aom3 == null) {
                 return null;
             }
-            if (akq3 instanceof LivingEntity) {
-                return (LivingEntity)akq3;
+            if (aom3 instanceof LivingEntity) {
+                return (LivingEntity)aom3;
             }
         }
         return null;
     }
     
-    private int getVehicleMaxHearts(final LivingEntity akz) {
-        if (akz == null || !akz.showVehicleHealth()) {
+    private int getVehicleMaxHearts(final LivingEntity aoy) {
+        if (aoy == null || !aoy.showVehicleHealth()) {
             return 0;
         }
-        final float float3 = akz.getMaxHealth();
+        final float float3 = aoy.getMaxHealth();
         int integer4 = (int)(float3 + 0.5f) / 2;
         if (integer4 > 30) {
             integer4 = 30;
@@ -699,194 +712,193 @@ public class Gui extends GuiComponent {
         return (int)Math.ceil(integer / 10.0);
     }
     
-    private void renderPlayerHealth() {
-        final Player ayj2 = this.getCameraPlayer();
-        if (ayj2 == null) {
+    private void renderPlayerHealth(final PoseStack dhl) {
+        final Player bec3 = this.getCameraPlayer();
+        if (bec3 == null) {
             return;
         }
-        final int integer3 = Mth.ceil(ayj2.getHealth());
-        final boolean boolean4 = this.healthBlinkTime > this.tickCount && (this.healthBlinkTime - this.tickCount) / 3L % 2L == 1L;
-        final long long5 = Util.getMillis();
-        if (integer3 < this.lastHealth && ayj2.invulnerableTime > 0) {
-            this.lastHealthTime = long5;
+        final int integer4 = Mth.ceil(bec3.getHealth());
+        final boolean boolean5 = this.healthBlinkTime > this.tickCount && (this.healthBlinkTime - this.tickCount) / 3L % 2L == 1L;
+        final long long6 = Util.getMillis();
+        if (integer4 < this.lastHealth && bec3.invulnerableTime > 0) {
+            this.lastHealthTime = long6;
             this.healthBlinkTime = this.tickCount + 20;
         }
-        else if (integer3 > this.lastHealth && ayj2.invulnerableTime > 0) {
-            this.lastHealthTime = long5;
+        else if (integer4 > this.lastHealth && bec3.invulnerableTime > 0) {
+            this.lastHealthTime = long6;
             this.healthBlinkTime = this.tickCount + 10;
         }
-        if (long5 - this.lastHealthTime > 1000L) {
-            this.lastHealth = integer3;
-            this.displayHealth = integer3;
-            this.lastHealthTime = long5;
+        if (long6 - this.lastHealthTime > 1000L) {
+            this.lastHealth = integer4;
+            this.displayHealth = integer4;
+            this.lastHealthTime = long6;
         }
-        this.lastHealth = integer3;
-        final int integer4 = this.displayHealth;
+        this.lastHealth = integer4;
+        final int integer5 = this.displayHealth;
         this.random.setSeed(this.tickCount * 312871);
-        final FoodData baj8 = ayj2.getFoodData();
-        final int integer5 = baj8.getFoodLevel();
-        final AttributeInstance alr10 = ayj2.getAttribute(SharedMonsterAttributes.MAX_HEALTH);
-        final int integer6 = this.screenWidth / 2 - 91;
-        final int integer7 = this.screenWidth / 2 + 91;
-        final int integer8 = this.screenHeight - 39;
-        final float float14 = (float)alr10.getValue();
-        final int integer9 = Mth.ceil(ayj2.getAbsorptionAmount());
-        final int integer10 = Mth.ceil((float14 + integer9) / 2.0f / 10.0f);
-        final int integer11 = Math.max(10 - (integer10 - 2), 3);
-        final int integer12 = integer8 - (integer10 - 1) * integer11 - 10;
-        int integer13 = integer8 - 10;
-        int integer14 = integer9;
-        final int integer15 = ayj2.getArmorValue();
-        int integer16 = -1;
-        if (ayj2.hasEffect(MobEffects.REGENERATION)) {
-            integer16 = this.tickCount % Mth.ceil(float14 + 5.0f);
+        final FoodData bge9 = bec3.getFoodData();
+        final int integer6 = bge9.getFoodLevel();
+        final int integer7 = this.screenWidth / 2 - 91;
+        final int integer8 = this.screenWidth / 2 + 91;
+        final int integer9 = this.screenHeight - 39;
+        final float float14 = (float)bec3.getAttributeValue(Attributes.MAX_HEALTH);
+        final int integer10 = Mth.ceil(bec3.getAbsorptionAmount());
+        final int integer11 = Mth.ceil((float14 + integer10) / 2.0f / 10.0f);
+        final int integer12 = Math.max(10 - (integer11 - 2), 3);
+        final int integer13 = integer9 - (integer11 - 1) * integer12 - 10;
+        int integer14 = integer9 - 10;
+        int integer15 = integer10;
+        final int integer16 = bec3.getArmorValue();
+        int integer17 = -1;
+        if (bec3.hasEffect(MobEffects.REGENERATION)) {
+            integer17 = this.tickCount % Mth.ceil(float14 + 5.0f);
         }
         this.minecraft.getProfiler().push("armor");
-        for (int integer17 = 0; integer17 < 10; ++integer17) {
-            if (integer15 > 0) {
-                final int integer18 = integer6 + integer17 * 8;
-                if (integer17 * 2 + 1 < integer15) {
-                    this.blit(integer18, integer12, 34, 9, 9, 9);
+        for (int integer18 = 0; integer18 < 10; ++integer18) {
+            if (integer16 > 0) {
+                final int integer19 = integer7 + integer18 * 8;
+                if (integer18 * 2 + 1 < integer16) {
+                    this.blit(dhl, integer19, integer13, 34, 9, 9, 9);
                 }
-                if (integer17 * 2 + 1 == integer15) {
-                    this.blit(integer18, integer12, 25, 9, 9, 9);
+                if (integer18 * 2 + 1 == integer16) {
+                    this.blit(dhl, integer19, integer13, 25, 9, 9, 9);
                 }
-                if (integer17 * 2 + 1 > integer15) {
-                    this.blit(integer18, integer12, 16, 9, 9, 9);
+                if (integer18 * 2 + 1 > integer16) {
+                    this.blit(dhl, integer19, integer13, 16, 9, 9, 9);
                 }
             }
         }
         this.minecraft.getProfiler().popPush("health");
-        for (int integer17 = Mth.ceil((float14 + integer9) / 2.0f) - 1; integer17 >= 0; --integer17) {
-            int integer18 = 16;
-            if (ayj2.hasEffect(MobEffects.POISON)) {
-                integer18 += 36;
+        for (int integer18 = Mth.ceil((float14 + integer10) / 2.0f) - 1; integer18 >= 0; --integer18) {
+            int integer19 = 16;
+            if (bec3.hasEffect(MobEffects.POISON)) {
+                integer19 += 36;
             }
-            else if (ayj2.hasEffect(MobEffects.WITHER)) {
-                integer18 += 72;
+            else if (bec3.hasEffect(MobEffects.WITHER)) {
+                integer19 += 72;
             }
-            int integer19 = 0;
-            if (boolean4) {
-                integer19 = 1;
+            int integer20 = 0;
+            if (boolean5) {
+                integer20 = 1;
             }
-            final int integer20 = Mth.ceil((integer17 + 1) / 10.0f) - 1;
-            final int integer21 = integer6 + integer17 % 10 * 8;
-            int integer22 = integer8 - integer20 * integer11;
-            if (integer3 <= 4) {
-                integer22 += this.random.nextInt(2);
+            final int integer21 = Mth.ceil((integer18 + 1) / 10.0f) - 1;
+            final int integer22 = integer7 + integer18 % 10 * 8;
+            int integer23 = integer9 - integer21 * integer12;
+            if (integer4 <= 4) {
+                integer23 += this.random.nextInt(2);
             }
-            if (integer14 <= 0 && integer17 == integer16) {
-                integer22 -= 2;
+            if (integer15 <= 0 && integer18 == integer17) {
+                integer23 -= 2;
             }
-            int integer23 = 0;
-            if (ayj2.level.getLevelData().isHardcore()) {
-                integer23 = 5;
+            int integer24 = 0;
+            if (bec3.level.getLevelData().isHardcore()) {
+                integer24 = 5;
             }
-            this.blit(integer21, integer22, 16 + integer19 * 9, 9 * integer23, 9, 9);
-            if (boolean4) {
-                if (integer17 * 2 + 1 < integer4) {
-                    this.blit(integer21, integer22, integer18 + 54, 9 * integer23, 9, 9);
+            this.blit(dhl, integer22, integer23, 16 + integer20 * 9, 9 * integer24, 9, 9);
+            if (boolean5) {
+                if (integer18 * 2 + 1 < integer5) {
+                    this.blit(dhl, integer22, integer23, integer19 + 54, 9 * integer24, 9, 9);
                 }
-                if (integer17 * 2 + 1 == integer4) {
-                    this.blit(integer21, integer22, integer18 + 63, 9 * integer23, 9, 9);
+                if (integer18 * 2 + 1 == integer5) {
+                    this.blit(dhl, integer22, integer23, integer19 + 63, 9 * integer24, 9, 9);
                 }
             }
-            if (integer14 > 0) {
-                if (integer14 == integer9 && integer9 % 2 == 1) {
-                    this.blit(integer21, integer22, integer18 + 153, 9 * integer23, 9, 9);
-                    --integer14;
+            if (integer15 > 0) {
+                if (integer15 == integer10 && integer10 % 2 == 1) {
+                    this.blit(dhl, integer22, integer23, integer19 + 153, 9 * integer24, 9, 9);
+                    --integer15;
                 }
                 else {
-                    this.blit(integer21, integer22, integer18 + 144, 9 * integer23, 9, 9);
-                    integer14 -= 2;
+                    this.blit(dhl, integer22, integer23, integer19 + 144, 9 * integer24, 9, 9);
+                    integer15 -= 2;
                 }
             }
             else {
-                if (integer17 * 2 + 1 < integer3) {
-                    this.blit(integer21, integer22, integer18 + 36, 9 * integer23, 9, 9);
+                if (integer18 * 2 + 1 < integer4) {
+                    this.blit(dhl, integer22, integer23, integer19 + 36, 9 * integer24, 9, 9);
                 }
-                if (integer17 * 2 + 1 == integer3) {
-                    this.blit(integer21, integer22, integer18 + 45, 9 * integer23, 9, 9);
+                if (integer18 * 2 + 1 == integer4) {
+                    this.blit(dhl, integer22, integer23, integer19 + 45, 9 * integer24, 9, 9);
                 }
             }
         }
-        final LivingEntity akz23 = this.getPlayerVehicleWithHealth();
-        int integer18 = this.getVehicleMaxHearts(akz23);
-        if (integer18 == 0) {
+        final LivingEntity aoy23 = this.getPlayerVehicleWithHealth();
+        int integer19 = this.getVehicleMaxHearts(aoy23);
+        if (integer19 == 0) {
             this.minecraft.getProfiler().popPush("food");
-            for (int integer19 = 0; integer19 < 10; ++integer19) {
-                int integer20 = integer8;
-                int integer21 = 16;
-                int integer22 = 0;
-                if (ayj2.hasEffect(MobEffects.HUNGER)) {
-                    integer21 += 36;
-                    integer22 = 13;
+            for (int integer20 = 0; integer20 < 10; ++integer20) {
+                int integer21 = integer9;
+                int integer22 = 16;
+                int integer23 = 0;
+                if (bec3.hasEffect(MobEffects.HUNGER)) {
+                    integer22 += 36;
+                    integer23 = 13;
                 }
-                if (ayj2.getFoodData().getSaturationLevel() <= 0.0f && this.tickCount % (integer5 * 3 + 1) == 0) {
-                    integer20 += this.random.nextInt(3) - 1;
+                if (bec3.getFoodData().getSaturationLevel() <= 0.0f && this.tickCount % (integer6 * 3 + 1) == 0) {
+                    integer21 += this.random.nextInt(3) - 1;
                 }
-                final int integer23 = integer7 - integer19 * 8 - 9;
-                this.blit(integer23, integer20, 16 + integer22 * 9, 27, 9, 9);
-                if (integer19 * 2 + 1 < integer5) {
-                    this.blit(integer23, integer20, integer21 + 36, 27, 9, 9);
+                final int integer24 = integer8 - integer20 * 8 - 9;
+                this.blit(dhl, integer24, integer21, 16 + integer23 * 9, 27, 9, 9);
+                if (integer20 * 2 + 1 < integer6) {
+                    this.blit(dhl, integer24, integer21, integer22 + 36, 27, 9, 9);
                 }
-                if (integer19 * 2 + 1 == integer5) {
-                    this.blit(integer23, integer20, integer21 + 45, 27, 9, 9);
+                if (integer20 * 2 + 1 == integer6) {
+                    this.blit(dhl, integer24, integer21, integer22 + 45, 27, 9, 9);
                 }
             }
-            integer13 -= 10;
+            integer14 -= 10;
         }
         this.minecraft.getProfiler().popPush("air");
-        int integer19 = ayj2.getAirSupply();
-        int integer20 = ayj2.getMaxAirSupply();
-        if (ayj2.isUnderLiquid(FluidTags.WATER) || integer19 < integer20) {
-            final int integer21 = this.getVisibleVehicleHeartRows(integer18) - 1;
-            integer13 -= integer21 * 10;
-            for (int integer22 = Mth.ceil((integer19 - 2) * 10.0 / integer20), integer23 = Mth.ceil(integer19 * 10.0 / integer20) - integer22, integer24 = 0; integer24 < integer22 + integer23; ++integer24) {
-                if (integer24 < integer22) {
-                    this.blit(integer7 - integer24 * 8 - 9, integer13, 16, 18, 9, 9);
+        int integer20 = bec3.getAirSupply();
+        int integer21 = bec3.getMaxAirSupply();
+        if (bec3.isEyeInFluid(FluidTags.WATER) || integer20 < integer21) {
+            final int integer22 = this.getVisibleVehicleHeartRows(integer19) - 1;
+            integer14 -= integer22 * 10;
+            for (int integer23 = Mth.ceil((integer20 - 2) * 10.0 / integer21), integer24 = Mth.ceil(integer20 * 10.0 / integer21) - integer23, integer25 = 0; integer25 < integer23 + integer24; ++integer25) {
+                if (integer25 < integer23) {
+                    this.blit(dhl, integer8 - integer25 * 8 - 9, integer14, 16, 18, 9, 9);
                 }
                 else {
-                    this.blit(integer7 - integer24 * 8 - 9, integer13, 25, 18, 9, 9);
+                    this.blit(dhl, integer8 - integer25 * 8 - 9, integer14, 25, 18, 9, 9);
                 }
             }
         }
         this.minecraft.getProfiler().pop();
     }
     
-    private void renderVehicleHealth() {
-        final LivingEntity akz2 = this.getPlayerVehicleWithHealth();
-        if (akz2 == null) {
+    private void renderVehicleHealth(final PoseStack dhl) {
+        final LivingEntity aoy3 = this.getPlayerVehicleWithHealth();
+        if (aoy3 == null) {
             return;
         }
-        int integer3 = this.getVehicleMaxHearts(akz2);
-        if (integer3 == 0) {
+        int integer4 = this.getVehicleMaxHearts(aoy3);
+        if (integer4 == 0) {
             return;
         }
-        final int integer4 = (int)Math.ceil(akz2.getHealth());
+        final int integer5 = (int)Math.ceil(aoy3.getHealth());
         this.minecraft.getProfiler().popPush("mountHealth");
-        final int integer5 = this.screenHeight - 39;
-        final int integer6 = this.screenWidth / 2 + 91;
-        int integer7 = integer5;
-        int integer8 = 0;
-        final boolean boolean9 = false;
-        while (integer3 > 0) {
-            final int integer9 = Math.min(integer3, 10);
-            integer3 -= integer9;
-            for (int integer10 = 0; integer10 < integer9; ++integer10) {
-                final int integer11 = 52;
-                final int integer12 = 0;
-                final int integer13 = integer6 - integer10 * 8 - 9;
-                this.blit(integer13, integer7, 52 + integer12 * 9, 9, 9, 9);
-                if (integer10 * 2 + 1 + integer8 < integer4) {
-                    this.blit(integer13, integer7, 88, 9, 9, 9);
+        final int integer6 = this.screenHeight - 39;
+        final int integer7 = this.screenWidth / 2 + 91;
+        int integer8 = integer6;
+        int integer9 = 0;
+        final boolean boolean10 = false;
+        while (integer4 > 0) {
+            final int integer10 = Math.min(integer4, 10);
+            integer4 -= integer10;
+            for (int integer11 = 0; integer11 < integer10; ++integer11) {
+                final int integer12 = 52;
+                final int integer13 = 0;
+                final int integer14 = integer7 - integer11 * 8 - 9;
+                this.blit(dhl, integer14, integer8, 52 + integer13 * 9, 9, 9, 9);
+                if (integer11 * 2 + 1 + integer9 < integer5) {
+                    this.blit(dhl, integer14, integer8, 88, 9, 9, 9);
                 }
-                if (integer10 * 2 + 1 + integer8 == integer4) {
-                    this.blit(integer13, integer7, 97, 9, 9, 9);
+                if (integer11 * 2 + 1 + integer9 == integer5) {
+                    this.blit(dhl, integer14, integer8, 97, 9, 9, 9);
                 }
             }
-            integer7 -= 10;
-            integer8 += 20;
+            integer8 -= 10;
+            integer9 += 20;
         }
     }
     
@@ -897,33 +909,33 @@ public class Gui extends GuiComponent {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.disableAlphaTest();
         this.minecraft.getTextureManager().bind(Gui.PUMPKIN_BLUR_LOCATION);
-        final Tesselator cym2 = Tesselator.getInstance();
-        final BufferBuilder cyg3 = cym2.getBuilder();
-        cyg3.begin(7, DefaultVertexFormat.POSITION_TEX);
-        cyg3.vertex(0.0, this.screenHeight, -90.0).uv(0.0f, 1.0f).endVertex();
-        cyg3.vertex(this.screenWidth, this.screenHeight, -90.0).uv(1.0f, 1.0f).endVertex();
-        cyg3.vertex(this.screenWidth, 0.0, -90.0).uv(1.0f, 0.0f).endVertex();
-        cyg3.vertex(0.0, 0.0, -90.0).uv(0.0f, 0.0f).endVertex();
-        cym2.end();
+        final Tesselator dhn2 = Tesselator.getInstance();
+        final BufferBuilder dhg3 = dhn2.getBuilder();
+        dhg3.begin(7, DefaultVertexFormat.POSITION_TEX);
+        dhg3.vertex(0.0, this.screenHeight, -90.0).uv(0.0f, 1.0f).endVertex();
+        dhg3.vertex(this.screenWidth, this.screenHeight, -90.0).uv(1.0f, 1.0f).endVertex();
+        dhg3.vertex(this.screenWidth, 0.0, -90.0).uv(1.0f, 0.0f).endVertex();
+        dhg3.vertex(0.0, 0.0, -90.0).uv(0.0f, 0.0f).endVertex();
+        dhn2.end();
         RenderSystem.depthMask(true);
         RenderSystem.enableDepthTest();
         RenderSystem.enableAlphaTest();
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
     
-    private void updateVignetteBrightness(final Entity akq) {
-        if (akq == null) {
+    private void updateVignetteBrightness(final Entity aom) {
+        if (aom == null) {
             return;
         }
-        final float float3 = Mth.clamp(1.0f - akq.getBrightness(), 0.0f, 1.0f);
+        final float float3 = Mth.clamp(1.0f - aom.getBrightness(), 0.0f, 1.0f);
         this.vignetteBrightness += (float)((float3 - this.vignetteBrightness) * 0.01);
     }
     
-    private void renderVignette(final Entity akq) {
-        final WorldBorder bzw3 = this.minecraft.level.getWorldBorder();
-        float float4 = (float)bzw3.getDistanceToBorder(akq);
-        final double double5 = Math.min(bzw3.getLerpSpeed() * bzw3.getWarningTime() * 1000.0, Math.abs(bzw3.getLerpTarget() - bzw3.getSize()));
-        final double double6 = Math.max(bzw3.getWarningBlocks(), double5);
+    private void renderVignette(final Entity aom) {
+        final WorldBorder cgw3 = this.minecraft.level.getWorldBorder();
+        float float4 = (float)cgw3.getDistanceToBorder(aom);
+        final double double5 = Math.min(cgw3.getLerpSpeed() * cgw3.getWarningTime() * 1000.0, Math.abs(cgw3.getLerpTarget() - cgw3.getSize()));
+        final double double6 = Math.max(cgw3.getWarningBlocks(), double5);
         if (float4 < double6) {
             float4 = 1.0f - (float)(float4 / double6);
         }
@@ -940,14 +952,14 @@ public class Gui extends GuiComponent {
             RenderSystem.color4f(this.vignetteBrightness, this.vignetteBrightness, this.vignetteBrightness, 1.0f);
         }
         this.minecraft.getTextureManager().bind(Gui.VIGNETTE_LOCATION);
-        final Tesselator cym9 = Tesselator.getInstance();
-        final BufferBuilder cyg10 = cym9.getBuilder();
-        cyg10.begin(7, DefaultVertexFormat.POSITION_TEX);
-        cyg10.vertex(0.0, this.screenHeight, -90.0).uv(0.0f, 1.0f).endVertex();
-        cyg10.vertex(this.screenWidth, this.screenHeight, -90.0).uv(1.0f, 1.0f).endVertex();
-        cyg10.vertex(this.screenWidth, 0.0, -90.0).uv(1.0f, 0.0f).endVertex();
-        cyg10.vertex(0.0, 0.0, -90.0).uv(0.0f, 0.0f).endVertex();
-        cym9.end();
+        final Tesselator dhn9 = Tesselator.getInstance();
+        final BufferBuilder dhg10 = dhn9.getBuilder();
+        dhg10.begin(7, DefaultVertexFormat.POSITION_TEX);
+        dhg10.vertex(0.0, this.screenHeight, -90.0).uv(0.0f, 1.0f).endVertex();
+        dhg10.vertex(this.screenWidth, this.screenHeight, -90.0).uv(1.0f, 1.0f).endVertex();
+        dhg10.vertex(this.screenWidth, 0.0, -90.0).uv(1.0f, 0.0f).endVertex();
+        dhg10.vertex(0.0, 0.0, -90.0).uv(0.0f, 0.0f).endVertex();
+        dhn9.end();
         RenderSystem.depthMask(true);
         RenderSystem.enableDepthTest();
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
@@ -966,30 +978,30 @@ public class Gui extends GuiComponent {
         RenderSystem.defaultBlendFunc();
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, float1);
         this.minecraft.getTextureManager().bind(TextureAtlas.LOCATION_BLOCKS);
-        final TextureAtlasSprite eaj3 = this.minecraft.getBlockRenderer().getBlockModelShaper().getParticleIcon(Blocks.NETHER_PORTAL.defaultBlockState());
-        final float float2 = eaj3.getU0();
-        final float float3 = eaj3.getV0();
-        final float float4 = eaj3.getU1();
-        final float float5 = eaj3.getV1();
-        final Tesselator cym8 = Tesselator.getInstance();
-        final BufferBuilder cyg9 = cym8.getBuilder();
-        cyg9.begin(7, DefaultVertexFormat.POSITION_TEX);
-        cyg9.vertex(0.0, this.screenHeight, -90.0).uv(float2, float5).endVertex();
-        cyg9.vertex(this.screenWidth, this.screenHeight, -90.0).uv(float4, float5).endVertex();
-        cyg9.vertex(this.screenWidth, 0.0, -90.0).uv(float4, float3).endVertex();
-        cyg9.vertex(0.0, 0.0, -90.0).uv(float2, float3).endVertex();
-        cym8.end();
+        final TextureAtlasSprite elv3 = this.minecraft.getBlockRenderer().getBlockModelShaper().getParticleIcon(Blocks.NETHER_PORTAL.defaultBlockState());
+        final float float2 = elv3.getU0();
+        final float float3 = elv3.getV0();
+        final float float4 = elv3.getU1();
+        final float float5 = elv3.getV1();
+        final Tesselator dhn8 = Tesselator.getInstance();
+        final BufferBuilder dhg9 = dhn8.getBuilder();
+        dhg9.begin(7, DefaultVertexFormat.POSITION_TEX);
+        dhg9.vertex(0.0, this.screenHeight, -90.0).uv(float2, float5).endVertex();
+        dhg9.vertex(this.screenWidth, this.screenHeight, -90.0).uv(float4, float5).endVertex();
+        dhg9.vertex(this.screenWidth, 0.0, -90.0).uv(float4, float3).endVertex();
+        dhg9.vertex(0.0, 0.0, -90.0).uv(float2, float3).endVertex();
+        dhn8.end();
         RenderSystem.depthMask(true);
         RenderSystem.enableDepthTest();
         RenderSystem.enableAlphaTest();
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
     
-    private void renderSlot(final int integer1, final int integer2, final float float3, final Player ayj, final ItemStack ben) {
-        if (ben.isEmpty()) {
+    private void renderSlot(final int integer1, final int integer2, final float float3, final Player bec, final ItemStack bki) {
+        if (bki.isEmpty()) {
             return;
         }
-        final float float4 = ben.getPopTime() - float3;
+        final float float4 = bki.getPopTime() - float3;
         if (float4 > 0.0f) {
             RenderSystem.pushMatrix();
             final float float5 = 1.0f + float4 / 5.0f;
@@ -997,11 +1009,11 @@ public class Gui extends GuiComponent {
             RenderSystem.scalef(1.0f / float5, (float5 + 1.0f) / 2.0f, 1.0f);
             RenderSystem.translatef((float)(-(integer1 + 8)), (float)(-(integer2 + 12)), 0.0f);
         }
-        this.itemRenderer.renderAndDecorateItem(ayj, ben, integer1, integer2);
+        this.itemRenderer.renderAndDecorateItem(bec, bki, integer1, integer2);
         if (float4 > 0.0f) {
             RenderSystem.popMatrix();
         }
-        this.itemRenderer.renderGuiItemDecorations(this.minecraft.font, ben, integer1, integer2);
+        this.itemRenderer.renderGuiItemDecorations(this.minecraft.font, bki, integer1, integer2);
     }
     
     public void tick() {
@@ -1011,54 +1023,54 @@ public class Gui extends GuiComponent {
         if (this.titleTime > 0) {
             --this.titleTime;
             if (this.titleTime <= 0) {
-                this.title = "";
-                this.subtitle = "";
+                this.title = null;
+                this.subtitle = null;
             }
         }
         ++this.tickCount;
-        final Entity akq2 = this.minecraft.getCameraEntity();
-        if (akq2 != null) {
-            this.updateVignetteBrightness(akq2);
+        final Entity aom2 = this.minecraft.getCameraEntity();
+        if (aom2 != null) {
+            this.updateVignetteBrightness(aom2);
         }
         if (this.minecraft.player != null) {
-            final ItemStack ben3 = this.minecraft.player.inventory.getSelected();
-            if (ben3.isEmpty()) {
+            final ItemStack bki3 = this.minecraft.player.inventory.getSelected();
+            if (bki3.isEmpty()) {
                 this.toolHighlightTimer = 0;
             }
-            else if (this.lastToolHighlight.isEmpty() || ben3.getItem() != this.lastToolHighlight.getItem() || !ben3.getHoverName().equals(this.lastToolHighlight.getHoverName())) {
+            else if (this.lastToolHighlight.isEmpty() || bki3.getItem() != this.lastToolHighlight.getItem() || !bki3.getHoverName().equals(this.lastToolHighlight.getHoverName())) {
                 this.toolHighlightTimer = 40;
             }
             else if (this.toolHighlightTimer > 0) {
                 --this.toolHighlightTimer;
             }
-            this.lastToolHighlight = ben3;
+            this.lastToolHighlight = bki3;
         }
     }
     
-    public void setNowPlaying(final String string) {
-        this.setOverlayMessage(I18n.get("record.nowPlaying", string), true);
+    public void setNowPlaying(final Component mr) {
+        this.setOverlayMessage(new TranslatableComponent("record.nowPlaying", new Object[] { mr }), true);
     }
     
-    public void setOverlayMessage(final String string, final boolean boolean2) {
-        this.overlayMessageString = string;
+    public void setOverlayMessage(final Component mr, final boolean boolean2) {
+        this.overlayMessageString = mr;
         this.overlayMessageTime = 60;
         this.animateOverlayMessageColor = boolean2;
     }
     
-    public void setTitles(final String string1, final String string2, final int integer3, final int integer4, final int integer5) {
-        if (string1 == null && string2 == null && integer3 < 0 && integer4 < 0 && integer5 < 0) {
-            this.title = "";
-            this.subtitle = "";
+    public void setTitles(@Nullable final Component mr1, @Nullable final Component mr2, final int integer3, final int integer4, final int integer5) {
+        if (mr1 == null && mr2 == null && integer3 < 0 && integer4 < 0 && integer5 < 0) {
+            this.title = null;
+            this.subtitle = null;
             this.titleTime = 0;
             return;
         }
-        if (string1 != null) {
-            this.title = string1;
+        if (mr1 != null) {
+            this.title = mr1;
             this.titleTime = this.titleFadeInTime + this.titleStayTime + this.titleFadeOutTime;
             return;
         }
-        if (string2 != null) {
-            this.subtitle = string2;
+        if (mr2 != null) {
+            this.subtitle = mr2;
             return;
         }
         if (integer3 >= 0) {
@@ -1075,13 +1087,9 @@ public class Gui extends GuiComponent {
         }
     }
     
-    public void setOverlayMessage(final Component lf, final boolean boolean2) {
-        this.setOverlayMessage(lf.getString(), boolean2);
-    }
-    
-    public void handleChat(final ChatType ld, final Component lf) {
-        for (final ChatListener dcl5 : this.chatListeners.get(ld)) {
-            dcl5.handle(ld, lf);
+    public void handleChat(final ChatType mo, final Component mr, final UUID uUID) {
+        for (final ChatListener dmx6 : this.chatListeners.get(mo)) {
+            dmx6.handle(mo, mr, uUID);
         }
     }
     
diff --git a/src/net/minecraft/client/gui/GuiComponent.java b/src/net/minecraft/client/gui/GuiComponent.java
index 8a1a4b1..df2090e 100644
--- a/src/net/minecraft/client/gui/GuiComponent.java
+++ b/src/net/minecraft/client/gui/GuiComponent.java
@@ -1,13 +1,16 @@
 package net.minecraft.client.gui;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import com.mojang.blaze3d.platform.GlStateManager;
+import java.util.function.BiConsumer;
+import net.minecraft.network.chat.FormattedText;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.BufferUploader;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.math.Matrix4f;
-import com.mojang.math.Transformation;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.resources.ResourceLocation;
 
 public abstract class GuiComponent {
@@ -16,29 +19,29 @@ public abstract class GuiComponent {
     public static final ResourceLocation GUI_ICONS_LOCATION;
     private int blitOffset;
     
-    protected void hLine(int integer1, int integer2, final int integer3, final int integer4) {
-        if (integer2 < integer1) {
-            final int integer5 = integer1;
-            integer1 = integer2;
-            integer2 = integer5;
-        }
-        fill(integer1, integer3, integer2 + 1, integer3 + 1, integer4);
-    }
-    
-    protected void vLine(final int integer1, int integer2, int integer3, final int integer4) {
+    protected void hLine(final PoseStack dhl, int integer2, int integer3, final int integer4, final int integer5) {
         if (integer3 < integer2) {
-            final int integer5 = integer2;
+            final int integer6 = integer2;
             integer2 = integer3;
-            integer3 = integer5;
+            integer3 = integer6;
         }
-        fill(integer1, integer2 + 1, integer1 + 1, integer3, integer4);
+        fill(dhl, integer2, integer4, integer3 + 1, integer4 + 1, integer5);
     }
     
-    public static void fill(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-        fill(Transformation.identity().getMatrix(), integer1, integer2, integer3, integer4, integer5);
+    protected void vLine(final PoseStack dhl, final int integer2, int integer3, int integer4, final int integer5) {
+        if (integer4 < integer3) {
+            final int integer6 = integer3;
+            integer3 = integer4;
+            integer4 = integer6;
+        }
+        fill(dhl, integer2, integer3 + 1, integer2 + 1, integer4, integer5);
     }
     
-    public static void fill(final Matrix4f b, int integer2, int integer3, int integer4, int integer5, final int integer6) {
+    public static void fill(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        innerFill(dhl.last().pose(), integer2, integer3, integer4, integer5, integer6);
+    }
+    
+    private static void innerFill(final Matrix4f b, int integer2, int integer3, int integer4, int integer5, final int integer6) {
         if (integer2 < integer4) {
             final int integer7 = integer2;
             integer2 = integer4;
@@ -53,95 +56,113 @@ public abstract class GuiComponent {
         final float float8 = (integer6 >> 16 & 0xFF) / 255.0f;
         final float float9 = (integer6 >> 8 & 0xFF) / 255.0f;
         final float float10 = (integer6 & 0xFF) / 255.0f;
-        final BufferBuilder cyg11 = Tesselator.getInstance().getBuilder();
+        final BufferBuilder dhg11 = Tesselator.getInstance().getBuilder();
         RenderSystem.enableBlend();
         RenderSystem.disableTexture();
         RenderSystem.defaultBlendFunc();
-        cyg11.begin(7, DefaultVertexFormat.POSITION_COLOR);
-        cyg11.vertex(b, (float)integer2, (float)integer5, 0.0f).color(float8, float9, float10, float7).endVertex();
-        cyg11.vertex(b, (float)integer4, (float)integer5, 0.0f).color(float8, float9, float10, float7).endVertex();
-        cyg11.vertex(b, (float)integer4, (float)integer3, 0.0f).color(float8, float9, float10, float7).endVertex();
-        cyg11.vertex(b, (float)integer2, (float)integer3, 0.0f).color(float8, float9, float10, float7).endVertex();
-        cyg11.end();
-        BufferUploader.end(cyg11);
+        dhg11.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        dhg11.vertex(b, (float)integer2, (float)integer5, 0.0f).color(float8, float9, float10, float7).endVertex();
+        dhg11.vertex(b, (float)integer4, (float)integer5, 0.0f).color(float8, float9, float10, float7).endVertex();
+        dhg11.vertex(b, (float)integer4, (float)integer3, 0.0f).color(float8, float9, float10, float7).endVertex();
+        dhg11.vertex(b, (float)integer2, (float)integer3, 0.0f).color(float8, float9, float10, float7).endVertex();
+        dhg11.end();
+        BufferUploader.end(dhg11);
         RenderSystem.enableTexture();
         RenderSystem.disableBlend();
     }
     
-    protected void fillGradient(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        final float float8 = (integer5 >> 24 & 0xFF) / 255.0f;
-        final float float9 = (integer5 >> 16 & 0xFF) / 255.0f;
-        final float float10 = (integer5 >> 8 & 0xFF) / 255.0f;
-        final float float11 = (integer5 & 0xFF) / 255.0f;
-        final float float12 = (integer6 >> 24 & 0xFF) / 255.0f;
-        final float float13 = (integer6 >> 16 & 0xFF) / 255.0f;
-        final float float14 = (integer6 >> 8 & 0xFF) / 255.0f;
-        final float float15 = (integer6 & 0xFF) / 255.0f;
+    protected void fillGradient(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7) {
         RenderSystem.disableTexture();
         RenderSystem.enableBlend();
         RenderSystem.disableAlphaTest();
         RenderSystem.defaultBlendFunc();
         RenderSystem.shadeModel(7425);
-        final Tesselator cym16 = Tesselator.getInstance();
-        final BufferBuilder cyg17 = cym16.getBuilder();
-        cyg17.begin(7, DefaultVertexFormat.POSITION_COLOR);
-        cyg17.vertex(integer3, integer2, this.blitOffset).color(float9, float10, float11, float8).endVertex();
-        cyg17.vertex(integer1, integer2, this.blitOffset).color(float9, float10, float11, float8).endVertex();
-        cyg17.vertex(integer1, integer4, this.blitOffset).color(float13, float14, float15, float12).endVertex();
-        cyg17.vertex(integer3, integer4, this.blitOffset).color(float13, float14, float15, float12).endVertex();
-        cym16.end();
+        final Tesselator dhn9 = Tesselator.getInstance();
+        final BufferBuilder dhg10 = dhn9.getBuilder();
+        dhg10.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        fillGradient(dhl.last().pose(), dhg10, integer2, integer3, integer4, integer5, this.blitOffset, integer6, integer7);
+        dhn9.end();
         RenderSystem.shadeModel(7424);
         RenderSystem.disableBlend();
         RenderSystem.enableAlphaTest();
         RenderSystem.enableTexture();
     }
     
-    public void drawCenteredString(final Font dch, final String string, final int integer3, final int integer4, final int integer5) {
-        dch.drawShadow(string, (float)(integer3 - dch.width(string) / 2), (float)integer4, integer5);
+    protected static void fillGradient(final Matrix4f b, final BufferBuilder dhg, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
+        final float float10 = (integer8 >> 24 & 0xFF) / 255.0f;
+        final float float11 = (integer8 >> 16 & 0xFF) / 255.0f;
+        final float float12 = (integer8 >> 8 & 0xFF) / 255.0f;
+        final float float13 = (integer8 & 0xFF) / 255.0f;
+        final float float14 = (integer9 >> 24 & 0xFF) / 255.0f;
+        final float float15 = (integer9 >> 16 & 0xFF) / 255.0f;
+        final float float16 = (integer9 >> 8 & 0xFF) / 255.0f;
+        final float float17 = (integer9 & 0xFF) / 255.0f;
+        dhg.vertex(b, (float)integer5, (float)integer4, (float)integer7).color(float11, float12, float13, float10).endVertex();
+        dhg.vertex(b, (float)integer3, (float)integer4, (float)integer7).color(float11, float12, float13, float10).endVertex();
+        dhg.vertex(b, (float)integer3, (float)integer6, (float)integer7).color(float15, float16, float17, float14).endVertex();
+        dhg.vertex(b, (float)integer5, (float)integer6, (float)integer7).color(float15, float16, float17, float14).endVertex();
     }
     
-    public void drawRightAlignedString(final Font dch, final String string, final int integer3, final int integer4, final int integer5) {
-        dch.drawShadow(string, (float)(integer3 - dch.width(string)), (float)integer4, integer5);
+    public void drawCenteredString(final PoseStack dhl, final Font dmt, final String string, final int integer4, final int integer5, final int integer6) {
+        dmt.drawShadow(dhl, string, (float)(integer4 - dmt.width(string) / 2), (float)integer5, integer6);
     }
     
-    public void drawString(final Font dch, final String string, final int integer3, final int integer4, final int integer5) {
-        dch.drawShadow(string, (float)integer3, (float)integer4, integer5);
+    public void drawCenteredString(final PoseStack dhl, final Font dmt, final FormattedText mu, final int integer4, final int integer5, final int integer6) {
+        dmt.drawShadow(dhl, mu, (float)(integer4 - dmt.width(mu) / 2), (float)integer5, integer6);
     }
     
-    public static void blit(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final TextureAtlasSprite eaj) {
-        innerBlit(integer1, integer1 + integer4, integer2, integer2 + integer5, integer3, eaj.getU0(), eaj.getU1(), eaj.getV0(), eaj.getV1());
+    public void drawString(final PoseStack dhl, final Font dmt, final String string, final int integer4, final int integer5, final int integer6) {
+        dmt.drawShadow(dhl, string, (float)integer4, (float)integer5, integer6);
     }
     
-    public void blit(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        blit(integer1, integer2, this.blitOffset, (float)integer3, (float)integer4, integer5, integer6, 256, 256);
+    public void drawString(final PoseStack dhl, final Font dmt, final FormattedText mu, final int integer4, final int integer5, final int integer6) {
+        dmt.drawShadow(dhl, mu, (float)integer4, (float)integer5, integer6);
     }
     
-    public static void blit(final int integer1, final int integer2, final int integer3, final float float4, final float float5, final int integer6, final int integer7, final int integer8, final int integer9) {
-        innerBlit(integer1, integer1 + integer6, integer2, integer2 + integer7, integer3, integer6, integer7, float4, float5, integer9, integer8);
+    public void blitOutlineBlack(final int integer1, final int integer2, final BiConsumer<Integer, Integer> biConsumer) {
+        RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
+        biConsumer.accept(integer1 + 1, integer2);
+        biConsumer.accept(integer1 - 1, integer2);
+        biConsumer.accept(integer1, integer2 + 1);
+        biConsumer.accept(integer1, integer2 - 1);
+        RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
+        biConsumer.accept(integer1, integer2);
     }
     
-    public static void blit(final int integer1, final int integer2, final int integer3, final int integer4, final float float5, final float float6, final int integer7, final int integer8, final int integer9, final int integer10) {
-        innerBlit(integer1, integer1 + integer3, integer2, integer2 + integer4, 0, integer7, integer8, float5, float6, integer9, integer10);
+    public static void blit(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final TextureAtlasSprite elv) {
+        innerBlit(dhl.last().pose(), integer2, integer2 + integer5, integer3, integer3 + integer6, integer4, elv.getU0(), elv.getU1(), elv.getV0(), elv.getV1());
     }
     
-    public static void blit(final int integer1, final int integer2, final float float3, final float float4, final int integer5, final int integer6, final int integer7, final int integer8) {
-        blit(integer1, integer2, integer5, integer6, float3, float4, integer5, integer6, integer7, integer8);
+    public void blit(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7) {
+        blit(dhl, integer2, integer3, this.blitOffset, (float)integer4, (float)integer5, integer6, integer7, 256, 256);
     }
     
-    private static void innerBlit(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final float float8, final float float9, final int integer10, final int integer11) {
-        innerBlit(integer1, integer2, integer3, integer4, integer5, (float8 + 0.0f) / integer10, (float8 + integer6) / integer10, (float9 + 0.0f) / integer11, (float9 + integer7) / integer11);
+    public static void blit(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final float float5, final float float6, final int integer7, final int integer8, final int integer9, final int integer10) {
+        innerBlit(dhl, integer2, integer2 + integer7, integer3, integer3 + integer8, integer4, integer7, integer8, float5, float6, integer10, integer9);
     }
     
-    protected static void innerBlit(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final float float6, final float float7, final float float8, final float float9) {
-        final BufferBuilder cyg10 = Tesselator.getInstance().getBuilder();
-        cyg10.begin(7, DefaultVertexFormat.POSITION_TEX);
-        cyg10.vertex(integer1, integer4, integer5).uv(float6, float9).endVertex();
-        cyg10.vertex(integer2, integer4, integer5).uv(float7, float9).endVertex();
-        cyg10.vertex(integer2, integer3, integer5).uv(float7, float8).endVertex();
-        cyg10.vertex(integer1, integer3, integer5).uv(float6, float8).endVertex();
-        cyg10.end();
+    public static void blit(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final float float6, final float float7, final int integer8, final int integer9, final int integer10, final int integer11) {
+        innerBlit(dhl, integer2, integer2 + integer4, integer3, integer3 + integer5, 0, integer8, integer9, float6, float7, integer10, integer11);
+    }
+    
+    public static void blit(final PoseStack dhl, final int integer2, final int integer3, final float float4, final float float5, final int integer6, final int integer7, final int integer8, final int integer9) {
+        blit(dhl, integer2, integer3, integer6, integer7, float4, float5, integer6, integer7, integer8, integer9);
+    }
+    
+    private static void innerBlit(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final float float9, final float float10, final int integer11, final int integer12) {
+        innerBlit(dhl.last().pose(), integer2, integer3, integer4, integer5, integer6, (float9 + 0.0f) / integer11, (float9 + integer7) / integer11, (float10 + 0.0f) / integer12, (float10 + integer8) / integer12);
+    }
+    
+    private static void innerBlit(final Matrix4f b, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final float float7, final float float8, final float float9, final float float10) {
+        final BufferBuilder dhg11 = Tesselator.getInstance().getBuilder();
+        dhg11.begin(7, DefaultVertexFormat.POSITION_TEX);
+        dhg11.vertex(b, (float)integer2, (float)integer5, (float)integer6).uv(float7, float10).endVertex();
+        dhg11.vertex(b, (float)integer3, (float)integer5, (float)integer6).uv(float8, float10).endVertex();
+        dhg11.vertex(b, (float)integer3, (float)integer4, (float)integer6).uv(float8, float9).endVertex();
+        dhg11.vertex(b, (float)integer2, (float)integer4, (float)integer6).uv(float7, float9).endVertex();
+        dhg11.end();
         RenderSystem.enableAlphaTest();
-        BufferUploader.end(cyg10);
+        BufferUploader.end(dhg11);
     }
     
     public int getBlitOffset() {
diff --git a/src/net/minecraft/client/gui/MapRenderer.java b/src/net/minecraft/client/gui/MapRenderer.java
index de858c7..b08157b 100644
--- a/src/net/minecraft/client/gui/MapRenderer.java
+++ b/src/net/minecraft/client/gui/MapRenderer.java
@@ -1,8 +1,10 @@
 package net.minecraft.client.gui;
 
+import net.minecraft.network.chat.Component;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Matrix4f;
 import net.minecraft.util.Mth;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.client.Minecraft;
 import com.mojang.math.Vector3f;
 import net.minecraft.world.level.saveddata.maps.MapDecoration;
@@ -25,24 +27,24 @@ public class MapRenderer implements AutoCloseable {
     private final TextureManager textureManager;
     private final Map<String, MapInstance> maps;
     
-    public MapRenderer(final TextureManager eak) {
+    public MapRenderer(final TextureManager elw) {
         this.maps = Maps.newHashMap();
-        this.textureManager = eak;
+        this.textureManager = elw;
     }
     
-    public void update(final MapItemSavedData crg) {
-        this.getMapInstance(crg).updateTexture();
+    public void update(final MapItemSavedData czv) {
+        this.getMapInstance(czv).updateTexture();
     }
     
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final MapItemSavedData crg, final boolean boolean4, final int integer) {
-        this.getMapInstance(crg).draw(cyl, dqt, boolean4, integer);
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final MapItemSavedData czv, final boolean boolean4, final int integer) {
+        this.getMapInstance(czv).draw(dhl, ebz, boolean4, integer);
     }
     
-    private MapInstance getMapInstance(final MapItemSavedData crg) {
-        MapInstance a3 = this.maps.get(crg.getId());
+    private MapInstance getMapInstance(final MapItemSavedData czv) {
+        MapInstance a3 = this.maps.get(czv.getId());
         if (a3 == null) {
-            a3 = new MapInstance(crg);
-            this.maps.put(crg.getId(), a3);
+            a3 = new MapInstance(czv);
+            this.maps.put(czv.getId(), a3);
         }
         return a3;
     }
@@ -82,11 +84,11 @@ public class MapRenderer implements AutoCloseable {
         private final DynamicTexture texture;
         private final RenderType renderType;
         
-        private MapInstance(final MapItemSavedData crg) {
-            this.data = crg;
+        private MapInstance(final MapItemSavedData czv) {
+            this.data = czv;
             this.texture = new DynamicTexture(128, 128, true);
-            final ResourceLocation sm4 = MapRenderer.this.textureManager.register("map/" + crg.getId(), this.texture);
-            this.renderType = RenderType.text(sm4);
+            final ResourceLocation uh4 = MapRenderer.this.textureManager.register("map/" + czv.getId(), this.texture);
+            this.renderType = RenderType.text(uh4);
         }
         
         private void updateTexture() {
@@ -105,54 +107,54 @@ public class MapRenderer implements AutoCloseable {
             this.texture.upload();
         }
         
-        private void draw(final PoseStack cyl, final MultiBufferSource dqt, final boolean boolean3, final int integer) {
+        private void draw(final PoseStack dhl, final MultiBufferSource ebz, final boolean boolean3, final int integer) {
             final int integer2 = 0;
             final int integer3 = 0;
             final float float8 = 0.0f;
-            final Matrix4f b9 = cyl.last().pose();
-            final VertexConsumer cyo10 = dqt.getBuffer(this.renderType);
-            cyo10.vertex(b9, 0.0f, 128.0f, -0.01f).color(255, 255, 255, 255).uv(0.0f, 1.0f).uv2(integer).endVertex();
-            cyo10.vertex(b9, 128.0f, 128.0f, -0.01f).color(255, 255, 255, 255).uv(1.0f, 1.0f).uv2(integer).endVertex();
-            cyo10.vertex(b9, 128.0f, 0.0f, -0.01f).color(255, 255, 255, 255).uv(1.0f, 0.0f).uv2(integer).endVertex();
-            cyo10.vertex(b9, 0.0f, 0.0f, -0.01f).color(255, 255, 255, 255).uv(0.0f, 0.0f).uv2(integer).endVertex();
+            final Matrix4f b9 = dhl.last().pose();
+            final VertexConsumer dhp10 = ebz.getBuffer(this.renderType);
+            dhp10.vertex(b9, 0.0f, 128.0f, -0.01f).color(255, 255, 255, 255).uv(0.0f, 1.0f).uv2(integer).endVertex();
+            dhp10.vertex(b9, 128.0f, 128.0f, -0.01f).color(255, 255, 255, 255).uv(1.0f, 1.0f).uv2(integer).endVertex();
+            dhp10.vertex(b9, 128.0f, 0.0f, -0.01f).color(255, 255, 255, 255).uv(1.0f, 0.0f).uv2(integer).endVertex();
+            dhp10.vertex(b9, 0.0f, 0.0f, -0.01f).color(255, 255, 255, 255).uv(0.0f, 0.0f).uv2(integer).endVertex();
             int integer4 = 0;
-            for (final MapDecoration crd13 : this.data.decorations.values()) {
-                if (boolean3 && !crd13.renderOnFrame()) {
+            for (final MapDecoration czs13 : this.data.decorations.values()) {
+                if (boolean3 && !czs13.renderOnFrame()) {
                     continue;
                 }
-                cyl.pushPose();
-                cyl.translate(0.0f + crd13.getX() / 2.0f + 64.0f, 0.0f + crd13.getY() / 2.0f + 64.0f, -0.019999999552965164);
-                cyl.mulPose(Vector3f.ZP.rotationDegrees(crd13.getRot() * 360 / 16.0f));
-                cyl.scale(4.0f, 4.0f, 3.0f);
-                cyl.translate(-0.125, 0.125, 0.0);
-                final byte byte14 = crd13.getImage();
+                dhl.pushPose();
+                dhl.translate(0.0f + czs13.getX() / 2.0f + 64.0f, 0.0f + czs13.getY() / 2.0f + 64.0f, -0.019999999552965164);
+                dhl.mulPose(Vector3f.ZP.rotationDegrees(czs13.getRot() * 360 / 16.0f));
+                dhl.scale(4.0f, 4.0f, 3.0f);
+                dhl.translate(-0.125, 0.125, 0.0);
+                final byte byte14 = czs13.getImage();
                 final float float9 = (byte14 % 16 + 0) / 16.0f;
                 final float float10 = (byte14 / 16 + 0) / 16.0f;
                 final float float11 = (byte14 % 16 + 1) / 16.0f;
                 final float float12 = (byte14 / 16 + 1) / 16.0f;
-                final Matrix4f b10 = cyl.last().pose();
+                final Matrix4f b10 = dhl.last().pose();
                 final float float13 = -0.001f;
-                final VertexConsumer cyo11 = dqt.getBuffer(MapRenderer.MAP_ICONS);
-                cyo11.vertex(b10, -1.0f, 1.0f, integer4 * -0.001f).color(255, 255, 255, 255).uv(float9, float10).uv2(integer).endVertex();
-                cyo11.vertex(b10, 1.0f, 1.0f, integer4 * -0.001f).color(255, 255, 255, 255).uv(float11, float10).uv2(integer).endVertex();
-                cyo11.vertex(b10, 1.0f, -1.0f, integer4 * -0.001f).color(255, 255, 255, 255).uv(float11, float12).uv2(integer).endVertex();
-                cyo11.vertex(b10, -1.0f, -1.0f, integer4 * -0.001f).color(255, 255, 255, 255).uv(float9, float12).uv2(integer).endVertex();
-                cyl.popPose();
-                if (crd13.getName() != null) {
-                    final Font dch22 = Minecraft.getInstance().font;
-                    final String string23 = crd13.getName().getColoredString();
-                    final float float14 = (float)dch22.width(string23);
+                final VertexConsumer dhp11 = ebz.getBuffer(MapRenderer.MAP_ICONS);
+                dhp11.vertex(b10, -1.0f, 1.0f, integer4 * -0.001f).color(255, 255, 255, 255).uv(float9, float10).uv2(integer).endVertex();
+                dhp11.vertex(b10, 1.0f, 1.0f, integer4 * -0.001f).color(255, 255, 255, 255).uv(float11, float10).uv2(integer).endVertex();
+                dhp11.vertex(b10, 1.0f, -1.0f, integer4 * -0.001f).color(255, 255, 255, 255).uv(float11, float12).uv2(integer).endVertex();
+                dhp11.vertex(b10, -1.0f, -1.0f, integer4 * -0.001f).color(255, 255, 255, 255).uv(float9, float12).uv2(integer).endVertex();
+                dhl.popPose();
+                if (czs13.getName() != null) {
+                    final Font dmt22 = Minecraft.getInstance().font;
+                    final Component mr23 = czs13.getName();
+                    final float float14 = (float)dmt22.width(mr23);
                     final float float16 = 25.0f / float14;
                     final float float17 = 0.0f;
                     final float n = 6.0f;
-                    dch22.getClass();
+                    dmt22.getClass();
                     final float float15 = Mth.clamp(float16, float17, n / 9.0f);
-                    cyl.pushPose();
-                    cyl.translate(0.0f + crd13.getX() / 2.0f + 64.0f - float14 * float15 / 2.0f, 0.0f + crd13.getY() / 2.0f + 64.0f + 4.0f, -0.02500000037252903);
-                    cyl.scale(float15, float15, 1.0f);
-                    cyl.translate(0.0, 0.0, -0.10000000149011612);
-                    dch22.drawInBatch(string23, 0.0f, 0.0f, -1, false, cyl.last().pose(), dqt, false, Integer.MIN_VALUE, integer);
-                    cyl.popPose();
+                    dhl.pushPose();
+                    dhl.translate(0.0f + czs13.getX() / 2.0f + 64.0f - float14 * float15 / 2.0f, 0.0f + czs13.getY() / 2.0f + 64.0f + 4.0f, -0.02500000037252903);
+                    dhl.scale(float15, float15, 1.0f);
+                    dhl.translate(0.0, 0.0, -0.10000000149011612);
+                    dmt22.drawInBatch(mr23, 0.0f, 0.0f, -1, false, dhl.last().pose(), ebz, false, Integer.MIN_VALUE, integer);
+                    dhl.popPose();
                 }
                 ++integer4;
             }
diff --git a/src/net/minecraft/client/gui/chat/ChatListener.java b/src/net/minecraft/client/gui/chat/ChatListener.java
index 8dec6ab..cbba436 100644
--- a/src/net/minecraft/client/gui/chat/ChatListener.java
+++ b/src/net/minecraft/client/gui/chat/ChatListener.java
@@ -1,8 +1,9 @@
 package net.minecraft.client.gui.chat;
 
+import java.util.UUID;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ChatType;
 
 public interface ChatListener {
-    void handle(final ChatType ld, final Component lf);
+    void handle(final ChatType mo, final Component mr, final UUID uUID);
 }
diff --git a/src/net/minecraft/client/gui/chat/NarratorChatListener.java b/src/net/minecraft/client/gui/chat/NarratorChatListener.java
index 88cd34d..6e77e48 100644
--- a/src/net/minecraft/client/gui/chat/NarratorChatListener.java
+++ b/src/net/minecraft/client/gui/chat/NarratorChatListener.java
@@ -5,9 +5,10 @@ import net.minecraft.network.chat.TextComponent;
 import net.minecraft.client.gui.components.toasts.ToastComponent;
 import net.minecraft.client.gui.components.toasts.SystemToast;
 import net.minecraft.SharedConstants;
-import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.NarratorStatus;
+import net.minecraft.client.Minecraft;
+import java.util.UUID;
 import net.minecraft.network.chat.ChatType;
 import com.mojang.text2speech.Narrator;
 import org.apache.logging.log4j.Logger;
@@ -24,26 +25,29 @@ public class NarratorChatListener implements ChatListener {
     }
     
     @Override
-    public void handle(final ChatType ld, final Component lf) {
-        final NarratorStatus dbp4 = getStatus();
-        if (dbp4 == NarratorStatus.OFF || !this.narrator.active()) {
+    public void handle(final ChatType mo, final Component mr, final UUID uUID) {
+        if (Minecraft.getInstance().isBlocked(uUID)) {
             return;
         }
-        if (dbp4 == NarratorStatus.ALL || (dbp4 == NarratorStatus.CHAT && ld == ChatType.CHAT) || (dbp4 == NarratorStatus.SYSTEM && ld == ChatType.SYSTEM)) {
-            Component lf2;
-            if (lf instanceof TranslatableComponent && "chat.type.text".equals(((TranslatableComponent)lf).getKey())) {
-                lf2 = new TranslatableComponent("chat.type.text.narrate", ((TranslatableComponent)lf).getArgs());
+        final NarratorStatus dlz5 = getStatus();
+        if (dlz5 == NarratorStatus.OFF || !this.narrator.active()) {
+            return;
+        }
+        if (dlz5 == NarratorStatus.ALL || (dlz5 == NarratorStatus.CHAT && mo == ChatType.CHAT) || (dlz5 == NarratorStatus.SYSTEM && mo == ChatType.SYSTEM)) {
+            Component mr2;
+            if (mr instanceof TranslatableComponent && "chat.type.text".equals(((TranslatableComponent)mr).getKey())) {
+                mr2 = new TranslatableComponent("chat.type.text.narrate", ((TranslatableComponent)mr).getArgs());
             }
             else {
-                lf2 = lf;
+                mr2 = mr;
             }
-            this.doSay(ld.shouldInterrupt(), lf2.getString());
+            this.doSay(mo.shouldInterrupt(), mr2.getString());
         }
     }
     
     public void sayNow(final String string) {
-        final NarratorStatus dbp3 = getStatus();
-        if (this.narrator.active() && dbp3 != NarratorStatus.OFF && dbp3 != NarratorStatus.CHAT && !string.isEmpty()) {
+        final NarratorStatus dlz3 = getStatus();
+        if (this.narrator.active() && dlz3 != NarratorStatus.OFF && dlz3 != NarratorStatus.CHAT && !string.isEmpty()) {
             this.narrator.clear();
             this.doSay(true, string);
         }
@@ -55,25 +59,25 @@ public class NarratorChatListener implements ChatListener {
     
     private void doSay(final boolean boolean1, final String string) {
         if (SharedConstants.IS_RUNNING_IN_IDE) {
-            NarratorChatListener.LOGGER.debug("Narrating: {}", string);
+            NarratorChatListener.LOGGER.debug("Narrating: {}", string.replaceAll("\n", "\\\\n"));
         }
         this.narrator.say(string, boolean1);
     }
     
-    public void updateNarratorStatus(final NarratorStatus dbp) {
+    public void updateNarratorStatus(final NarratorStatus dlz) {
         this.clear();
-        this.narrator.say(new TranslatableComponent("options.narrator", new Object[0]).getString() + " : " + new TranslatableComponent(dbp.getKey(), new Object[0]).getString(), true);
-        final ToastComponent deb3 = Minecraft.getInstance().getToasts();
+        this.narrator.say(new TranslatableComponent("options.narrator").append(" : ").append(dlz.getName()).getString(), true);
+        final ToastComponent doo3 = Minecraft.getInstance().getToasts();
         if (this.narrator.active()) {
-            if (dbp == NarratorStatus.OFF) {
-                SystemToast.addOrUpdate(deb3, SystemToast.SystemToastIds.NARRATOR_TOGGLE, new TranslatableComponent("narrator.toast.disabled", new Object[0]), null);
+            if (dlz == NarratorStatus.OFF) {
+                SystemToast.addOrUpdate(doo3, SystemToast.SystemToastIds.NARRATOR_TOGGLE, new TranslatableComponent("narrator.toast.disabled"), null);
             }
             else {
-                SystemToast.addOrUpdate(deb3, SystemToast.SystemToastIds.NARRATOR_TOGGLE, new TranslatableComponent("narrator.toast.enabled", new Object[0]), new TranslatableComponent(dbp.getKey(), new Object[0]));
+                SystemToast.addOrUpdate(doo3, SystemToast.SystemToastIds.NARRATOR_TOGGLE, new TranslatableComponent("narrator.toast.enabled"), dlz.getName());
             }
         }
         else {
-            SystemToast.addOrUpdate(deb3, SystemToast.SystemToastIds.NARRATOR_TOGGLE, new TranslatableComponent("narrator.toast.disabled", new Object[0]), new TranslatableComponent("options.narrator.notavailable", new Object[0]));
+            SystemToast.addOrUpdate(doo3, SystemToast.SystemToastIds.NARRATOR_TOGGLE, new TranslatableComponent("narrator.toast.disabled"), new TranslatableComponent("options.narrator.notavailable"));
         }
     }
     
@@ -93,7 +97,7 @@ public class NarratorChatListener implements ChatListener {
     }
     
     static {
-        NO_TITLE = new TextComponent("");
+        NO_TITLE = TextComponent.EMPTY;
         LOGGER = LogManager.getLogger();
         INSTANCE = new NarratorChatListener();
     }
diff --git a/src/net/minecraft/client/gui/chat/OverlayChatListener.java b/src/net/minecraft/client/gui/chat/OverlayChatListener.java
index cbda8c5..ba52815 100644
--- a/src/net/minecraft/client/gui/chat/OverlayChatListener.java
+++ b/src/net/minecraft/client/gui/chat/OverlayChatListener.java
@@ -1,5 +1,6 @@
 package net.minecraft.client.gui.chat;
 
+import java.util.UUID;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.client.Minecraft;
@@ -7,12 +8,15 @@ import net.minecraft.client.Minecraft;
 public class OverlayChatListener implements ChatListener {
     private final Minecraft minecraft;
     
-    public OverlayChatListener(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public OverlayChatListener(final Minecraft dlx) {
+        this.minecraft = dlx;
     }
     
     @Override
-    public void handle(final ChatType ld, final Component lf) {
-        this.minecraft.gui.setOverlayMessage(lf, false);
+    public void handle(final ChatType mo, final Component mr, final UUID uUID) {
+        if (this.minecraft.isBlocked(uUID)) {
+            return;
+        }
+        this.minecraft.gui.setOverlayMessage(mr, false);
     }
 }
diff --git a/src/net/minecraft/client/gui/chat/StandardChatListener.java b/src/net/minecraft/client/gui/chat/StandardChatListener.java
index 79f2863..7eecd61 100644
--- a/src/net/minecraft/client/gui/chat/StandardChatListener.java
+++ b/src/net/minecraft/client/gui/chat/StandardChatListener.java
@@ -1,5 +1,6 @@
 package net.minecraft.client.gui.chat;
 
+import java.util.UUID;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.client.Minecraft;
@@ -7,12 +8,20 @@ import net.minecraft.client.Minecraft;
 public class StandardChatListener implements ChatListener {
     private final Minecraft minecraft;
     
-    public StandardChatListener(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public StandardChatListener(final Minecraft dlx) {
+        this.minecraft = dlx;
     }
     
     @Override
-    public void handle(final ChatType ld, final Component lf) {
-        this.minecraft.gui.getChat().addMessage(lf);
+    public void handle(final ChatType mo, final Component mr, final UUID uUID) {
+        if (this.minecraft.isBlocked(uUID)) {
+            return;
+        }
+        if (mo != ChatType.CHAT) {
+            this.minecraft.gui.getChat().addMessage(mr);
+        }
+        else {
+            this.minecraft.gui.getChat().enqueueMessage(mr);
+        }
     }
 }
diff --git a/src/net/minecraft/client/gui/components/AbstractButton.java b/src/net/minecraft/client/gui/components/AbstractButton.java
index 5759f41..8609ef7 100644
--- a/src/net/minecraft/client/gui/components/AbstractButton.java
+++ b/src/net/minecraft/client/gui/components/AbstractButton.java
@@ -1,10 +1,11 @@
 package net.minecraft.client.gui.components;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
 
 public abstract class AbstractButton extends AbstractWidget {
-    public AbstractButton(final int integer1, final int integer2, final int integer3, final int integer4, final String string) {
-        super(integer1, integer2, integer3, integer4, string);
+    public AbstractButton(final int integer1, final int integer2, final int integer3, final int integer4, final Component mr) {
+        super(integer1, integer2, integer3, integer4, mr);
     }
     
     public abstract void onPress();
diff --git a/src/net/minecraft/client/gui/components/AbstractOptionSliderButton.java b/src/net/minecraft/client/gui/components/AbstractOptionSliderButton.java
new file mode 100644
index 0000000..52163e1
--- /dev/null
+++ b/src/net/minecraft/client/gui/components/AbstractOptionSliderButton.java
@@ -0,0 +1,13 @@
+package net.minecraft.client.gui.components;
+
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.client.Options;
+
+public abstract class AbstractOptionSliderButton extends AbstractSliderButton {
+    protected final Options options;
+    
+    protected AbstractOptionSliderButton(final Options dmb, final int integer2, final int integer3, final int integer4, final int integer5, final double double6) {
+        super(integer2, integer3, integer4, integer5, TextComponent.EMPTY, double6);
+        this.options = dmb;
+    }
+}
diff --git a/src/net/minecraft/client/gui/components/AbstractSelectionList.java b/src/net/minecraft/client/gui/components/AbstractSelectionList.java
index a6d405b..73632b0 100644
--- a/src/net/minecraft/client/gui/components/AbstractSelectionList.java
+++ b/src/net/minecraft/client/gui/components/AbstractSelectionList.java
@@ -2,6 +2,7 @@ package net.minecraft.client.gui.components;
 
 import com.google.common.collect.Lists;
 import java.util.AbstractList;
+import java.util.function.Predicate;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.platform.GlStateManager;
@@ -9,6 +10,7 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.util.Mth;
 import java.util.Objects;
 import java.util.Collection;
@@ -18,7 +20,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
 
 public abstract class AbstractSelectionList<E extends Entry<E>> extends AbstractContainerEventHandler implements Widget {
-    protected static final int DRAG_OUTSIDE = -2;
     protected final Minecraft minecraft;
     protected final int itemHeight;
     private final List<E> children;
@@ -29,20 +30,18 @@ public abstract class AbstractSelectionList<E extends Entry<E>> extends Abstract
     protected int x1;
     protected int x0;
     protected boolean centerListVertically;
-    protected int yDrag;
     private double scrollAmount;
-    protected boolean renderSelection;
-    protected boolean renderHeader;
+    private boolean renderSelection;
+    private boolean renderHeader;
     protected int headerHeight;
     private boolean scrolling;
     private E selected;
     
-    public AbstractSelectionList(final Minecraft dbn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+    public AbstractSelectionList(final Minecraft dlx, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
         this.children = new TrackedList();
         this.centerListVertically = true;
-        this.yDrag = -2;
         this.renderSelection = true;
-        this.minecraft = dbn;
+        this.minecraft = dlx;
         this.width = integer2;
         this.height = integer3;
         this.y0 = integer4;
@@ -149,86 +148,94 @@ public abstract class AbstractSelectionList<E extends Entry<E>> extends Abstract
     protected void clickedHeader(final int integer1, final int integer2) {
     }
     
-    protected void renderHeader(final int integer1, final int integer2, final Tesselator cym) {
+    protected void renderHeader(final PoseStack dhl, final int integer2, final int integer3, final Tesselator dhn) {
     }
     
-    protected void renderBackground() {
+    protected void renderBackground(final PoseStack dhl) {
     }
     
-    protected void renderDecorations(final int integer1, final int integer2) {
+    protected void renderDecorations(final PoseStack dhl, final int integer2, final int integer3) {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        final int integer3 = this.getScrollbarPosition();
-        final int integer4 = integer3 + 6;
-        final Tesselator cym7 = Tesselator.getInstance();
-        final BufferBuilder cyg8 = cym7.getBuilder();
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        final int integer4 = this.getScrollbarPosition();
+        final int integer5 = integer4 + 6;
+        final Tesselator dhn8 = Tesselator.getInstance();
+        final BufferBuilder dhg9 = dhn8.getBuilder();
         this.minecraft.getTextureManager().bind(GuiComponent.BACKGROUND_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        final float float4 = 32.0f;
-        cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg8.vertex(this.x0, this.y1, 0.0).uv(this.x0 / 32.0f, (this.y1 + (int)this.getScrollAmount()) / 32.0f).color(32, 32, 32, 255).endVertex();
-        cyg8.vertex(this.x1, this.y1, 0.0).uv(this.x1 / 32.0f, (this.y1 + (int)this.getScrollAmount()) / 32.0f).color(32, 32, 32, 255).endVertex();
-        cyg8.vertex(this.x1, this.y0, 0.0).uv(this.x1 / 32.0f, (this.y0 + (int)this.getScrollAmount()) / 32.0f).color(32, 32, 32, 255).endVertex();
-        cyg8.vertex(this.x0, this.y0, 0.0).uv(this.x0 / 32.0f, (this.y0 + (int)this.getScrollAmount()) / 32.0f).color(32, 32, 32, 255).endVertex();
-        cym7.end();
-        final int integer5 = this.getRowLeft();
-        final int integer6 = this.y0 + 4 - (int)this.getScrollAmount();
+        final float float5 = 32.0f;
+        dhg9.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+        dhg9.vertex(this.x0, this.y1, 0.0).uv(this.x0 / 32.0f, (this.y1 + (int)this.getScrollAmount()) / 32.0f).color(32, 32, 32, 255).endVertex();
+        dhg9.vertex(this.x1, this.y1, 0.0).uv(this.x1 / 32.0f, (this.y1 + (int)this.getScrollAmount()) / 32.0f).color(32, 32, 32, 255).endVertex();
+        dhg9.vertex(this.x1, this.y0, 0.0).uv(this.x1 / 32.0f, (this.y0 + (int)this.getScrollAmount()) / 32.0f).color(32, 32, 32, 255).endVertex();
+        dhg9.vertex(this.x0, this.y0, 0.0).uv(this.x0 / 32.0f, (this.y0 + (int)this.getScrollAmount()) / 32.0f).color(32, 32, 32, 255).endVertex();
+        dhn8.end();
+        final int integer6 = this.getRowLeft();
+        final int integer7 = this.y0 + 4 - (int)this.getScrollAmount();
         if (this.renderHeader) {
-            this.renderHeader(integer5, integer6, cym7);
+            this.renderHeader(dhl, integer6, integer7, dhn8);
         }
-        this.renderList(integer5, integer6, integer1, integer2, float3);
+        this.renderList(dhl, integer6, integer7, integer2, integer3, float4);
+        this.minecraft.getTextureManager().bind(GuiComponent.BACKGROUND_LOCATION);
+        RenderSystem.enableDepthTest();
+        RenderSystem.depthFunc(519);
+        final float float6 = 32.0f;
+        final int integer8 = -100;
+        dhg9.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+        dhg9.vertex(this.x0, this.y0, -100.0).uv(0.0f, this.y0 / 32.0f).color(64, 64, 64, 255).endVertex();
+        dhg9.vertex(this.x0 + this.width, this.y0, -100.0).uv(this.width / 32.0f, this.y0 / 32.0f).color(64, 64, 64, 255).endVertex();
+        dhg9.vertex(this.x0 + this.width, 0.0, -100.0).uv(this.width / 32.0f, 0.0f).color(64, 64, 64, 255).endVertex();
+        dhg9.vertex(this.x0, 0.0, -100.0).uv(0.0f, 0.0f).color(64, 64, 64, 255).endVertex();
+        dhg9.vertex(this.x0, this.height, -100.0).uv(0.0f, this.height / 32.0f).color(64, 64, 64, 255).endVertex();
+        dhg9.vertex(this.x0 + this.width, this.height, -100.0).uv(this.width / 32.0f, this.height / 32.0f).color(64, 64, 64, 255).endVertex();
+        dhg9.vertex(this.x0 + this.width, this.y1, -100.0).uv(this.width / 32.0f, this.y1 / 32.0f).color(64, 64, 64, 255).endVertex();
+        dhg9.vertex(this.x0, this.y1, -100.0).uv(0.0f, this.y1 / 32.0f).color(64, 64, 64, 255).endVertex();
+        dhn8.end();
+        RenderSystem.depthFunc(515);
         RenderSystem.disableDepthTest();
-        this.renderHoleBackground(0, this.y0, 255, 255);
-        this.renderHoleBackground(this.y1, this.height, 255, 255);
         RenderSystem.enableBlend();
         RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
         RenderSystem.disableAlphaTest();
         RenderSystem.shadeModel(7425);
         RenderSystem.disableTexture();
-        final int integer7 = 4;
-        cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg8.vertex(this.x0, this.y0 + 4, 0.0).uv(0.0f, 1.0f).color(0, 0, 0, 0).endVertex();
-        cyg8.vertex(this.x1, this.y0 + 4, 0.0).uv(1.0f, 1.0f).color(0, 0, 0, 0).endVertex();
-        cyg8.vertex(this.x1, this.y0, 0.0).uv(1.0f, 0.0f).color(0, 0, 0, 255).endVertex();
-        cyg8.vertex(this.x0, this.y0, 0.0).uv(0.0f, 0.0f).color(0, 0, 0, 255).endVertex();
-        cym7.end();
-        cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg8.vertex(this.x0, this.y1, 0.0).uv(0.0f, 1.0f).color(0, 0, 0, 255).endVertex();
-        cyg8.vertex(this.x1, this.y1, 0.0).uv(1.0f, 1.0f).color(0, 0, 0, 255).endVertex();
-        cyg8.vertex(this.x1, this.y1 - 4, 0.0).uv(1.0f, 0.0f).color(0, 0, 0, 0).endVertex();
-        cyg8.vertex(this.x0, this.y1 - 4, 0.0).uv(0.0f, 0.0f).color(0, 0, 0, 0).endVertex();
-        cym7.end();
-        final int integer8 = this.getMaxScroll();
-        if (integer8 > 0) {
-            int integer9 = (int)((this.y1 - this.y0) * (this.y1 - this.y0) / (float)this.getMaxPosition());
-            integer9 = Mth.clamp(integer9, 32, this.y1 - this.y0 - 8);
-            int integer10 = (int)this.getScrollAmount() * (this.y1 - this.y0 - integer9) / integer8 + this.y0;
-            if (integer10 < this.y0) {
-                integer10 = this.y0;
+        final int integer9 = 4;
+        dhg9.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+        dhg9.vertex(this.x0, this.y0 + 4, 0.0).uv(0.0f, 1.0f).color(0, 0, 0, 0).endVertex();
+        dhg9.vertex(this.x1, this.y0 + 4, 0.0).uv(1.0f, 1.0f).color(0, 0, 0, 0).endVertex();
+        dhg9.vertex(this.x1, this.y0, 0.0).uv(1.0f, 0.0f).color(0, 0, 0, 255).endVertex();
+        dhg9.vertex(this.x0, this.y0, 0.0).uv(0.0f, 0.0f).color(0, 0, 0, 255).endVertex();
+        dhg9.vertex(this.x0, this.y1, 0.0).uv(0.0f, 1.0f).color(0, 0, 0, 255).endVertex();
+        dhg9.vertex(this.x1, this.y1, 0.0).uv(1.0f, 1.0f).color(0, 0, 0, 255).endVertex();
+        dhg9.vertex(this.x1, this.y1 - 4, 0.0).uv(1.0f, 0.0f).color(0, 0, 0, 0).endVertex();
+        dhg9.vertex(this.x0, this.y1 - 4, 0.0).uv(0.0f, 0.0f).color(0, 0, 0, 0).endVertex();
+        dhn8.end();
+        final int integer10 = this.getMaxScroll();
+        if (integer10 > 0) {
+            int integer11 = (int)((this.y1 - this.y0) * (this.y1 - this.y0) / (float)this.getMaxPosition());
+            integer11 = Mth.clamp(integer11, 32, this.y1 - this.y0 - 8);
+            int integer12 = (int)this.getScrollAmount() * (this.y1 - this.y0 - integer11) / integer10 + this.y0;
+            if (integer12 < this.y0) {
+                integer12 = this.y0;
             }
-            cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-            cyg8.vertex(integer3, this.y1, 0.0).uv(0.0f, 1.0f).color(0, 0, 0, 255).endVertex();
-            cyg8.vertex(integer4, this.y1, 0.0).uv(1.0f, 1.0f).color(0, 0, 0, 255).endVertex();
-            cyg8.vertex(integer4, this.y0, 0.0).uv(1.0f, 0.0f).color(0, 0, 0, 255).endVertex();
-            cyg8.vertex(integer3, this.y0, 0.0).uv(0.0f, 0.0f).color(0, 0, 0, 255).endVertex();
-            cym7.end();
-            cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-            cyg8.vertex(integer3, integer10 + integer9, 0.0).uv(0.0f, 1.0f).color(128, 128, 128, 255).endVertex();
-            cyg8.vertex(integer4, integer10 + integer9, 0.0).uv(1.0f, 1.0f).color(128, 128, 128, 255).endVertex();
-            cyg8.vertex(integer4, integer10, 0.0).uv(1.0f, 0.0f).color(128, 128, 128, 255).endVertex();
-            cyg8.vertex(integer3, integer10, 0.0).uv(0.0f, 0.0f).color(128, 128, 128, 255).endVertex();
-            cym7.end();
-            cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-            cyg8.vertex(integer3, integer10 + integer9 - 1, 0.0).uv(0.0f, 1.0f).color(192, 192, 192, 255).endVertex();
-            cyg8.vertex(integer4 - 1, integer10 + integer9 - 1, 0.0).uv(1.0f, 1.0f).color(192, 192, 192, 255).endVertex();
-            cyg8.vertex(integer4 - 1, integer10, 0.0).uv(1.0f, 0.0f).color(192, 192, 192, 255).endVertex();
-            cyg8.vertex(integer3, integer10, 0.0).uv(0.0f, 0.0f).color(192, 192, 192, 255).endVertex();
-            cym7.end();
+            dhg9.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+            dhg9.vertex(integer4, this.y1, 0.0).uv(0.0f, 1.0f).color(0, 0, 0, 255).endVertex();
+            dhg9.vertex(integer5, this.y1, 0.0).uv(1.0f, 1.0f).color(0, 0, 0, 255).endVertex();
+            dhg9.vertex(integer5, this.y0, 0.0).uv(1.0f, 0.0f).color(0, 0, 0, 255).endVertex();
+            dhg9.vertex(integer4, this.y0, 0.0).uv(0.0f, 0.0f).color(0, 0, 0, 255).endVertex();
+            dhg9.vertex(integer4, integer12 + integer11, 0.0).uv(0.0f, 1.0f).color(128, 128, 128, 255).endVertex();
+            dhg9.vertex(integer5, integer12 + integer11, 0.0).uv(1.0f, 1.0f).color(128, 128, 128, 255).endVertex();
+            dhg9.vertex(integer5, integer12, 0.0).uv(1.0f, 0.0f).color(128, 128, 128, 255).endVertex();
+            dhg9.vertex(integer4, integer12, 0.0).uv(0.0f, 0.0f).color(128, 128, 128, 255).endVertex();
+            dhg9.vertex(integer4, integer12 + integer11 - 1, 0.0).uv(0.0f, 1.0f).color(192, 192, 192, 255).endVertex();
+            dhg9.vertex(integer5 - 1, integer12 + integer11 - 1, 0.0).uv(1.0f, 1.0f).color(192, 192, 192, 255).endVertex();
+            dhg9.vertex(integer5 - 1, integer12, 0.0).uv(1.0f, 0.0f).color(192, 192, 192, 255).endVertex();
+            dhg9.vertex(integer4, integer12, 0.0).uv(0.0f, 0.0f).color(192, 192, 192, 255).endVertex();
+            dhn8.end();
         }
-        this.renderDecorations(integer1, integer2);
+        this.renderDecorations(dhl, integer2, integer3);
         RenderSystem.enableTexture();
         RenderSystem.shadeModel(7424);
         RenderSystem.enableAlphaTest();
@@ -253,7 +260,6 @@ public abstract class AbstractSelectionList<E extends Entry<E>> extends Abstract
     
     private void scroll(final int integer) {
         this.setScrollAmount(this.getScrollAmount() + integer);
-        this.yDrag = -2;
     }
     
     public double getScrollAmount() {
@@ -268,10 +274,6 @@ public abstract class AbstractSelectionList<E extends Entry<E>> extends Abstract
         return Math.max(0, this.getMaxPosition() - (this.y1 - this.y0 - 4));
     }
     
-    public int getScrollBottom() {
-        return (int)this.getScrollAmount() - this.height - this.headerHeight;
-    }
-    
     protected void updateScrollingState(final double double1, final double double2, final int integer) {
         this.scrolling = (integer == 0 && double1 >= this.getScrollbarPosition() && double1 < this.getScrollbarPosition() + 6);
     }
@@ -345,23 +347,45 @@ public abstract class AbstractSelectionList<E extends Entry<E>> extends Abstract
             return true;
         }
         if (integer1 == 264) {
-            this.moveSelection(1);
+            this.moveSelection(SelectionDirection.DOWN);
             return true;
         }
         if (integer1 == 265) {
-            this.moveSelection(-1);
+            this.moveSelection(SelectionDirection.UP);
             return true;
         }
         return false;
     }
     
-    protected void moveSelection(final int integer) {
+    protected void moveSelection(final SelectionDirection b) {
+        this.moveSelection(b, a -> true);
+    }
+    
+    protected void refreshSelection() {
+        final E a2 = this.getSelected();
+        if (a2 != null) {
+            this.setSelected(a2);
+            this.ensureVisible(a2);
+        }
+    }
+    
+    protected void moveSelection(final SelectionDirection b, final Predicate<E> predicate) {
+        final int integer4 = (b == SelectionDirection.UP) ? -1 : 1;
         if (!this.children().isEmpty()) {
-            final int integer2 = this.children().indexOf(this.getSelected());
-            final int integer3 = Mth.clamp(integer2 + integer, 0, this.getItemCount() - 1);
-            final E a5 = this.children().get(integer3);
-            this.setSelected(a5);
-            this.ensureVisible(a5);
+            int integer5 = this.children().indexOf(this.getSelected());
+            while (true) {
+                final int integer6 = Mth.clamp(integer5 + integer4, 0, this.getItemCount() - 1);
+                if (integer5 == integer6) {
+                    break;
+                }
+                final E a7 = this.children().get(integer6);
+                if (predicate.test(a7)) {
+                    this.setSelected(a7);
+                    this.ensureVisible(a7);
+                    break;
+                }
+                integer5 = integer6;
+            }
         }
     }
     
@@ -370,42 +394,42 @@ public abstract class AbstractSelectionList<E extends Entry<E>> extends Abstract
         return double2 >= this.y0 && double2 <= this.y1 && double1 >= this.x0 && double1 <= this.x1;
     }
     
-    protected void renderList(final int integer1, final int integer2, final int integer3, final int integer4, final float float5) {
-        final int integer5 = this.getItemCount();
-        final Tesselator cym8 = Tesselator.getInstance();
-        final BufferBuilder cyg9 = cym8.getBuilder();
-        for (int integer6 = 0; integer6 < integer5; ++integer6) {
-            final int integer7 = this.getRowTop(integer6);
-            final int integer8 = this.getRowBottom(integer6);
-            if (integer8 >= this.y0) {
-                if (integer7 <= this.y1) {
-                    final int integer9 = integer2 + integer6 * this.itemHeight + this.headerHeight;
-                    final int integer10 = this.itemHeight - 4;
-                    final E a15 = this.getEntry(integer6);
-                    final int integer11 = this.getRowWidth();
-                    if (this.renderSelection && this.isSelectedItem(integer6)) {
-                        final int integer12 = this.x0 + this.width / 2 - integer11 / 2;
-                        final int integer13 = this.x0 + this.width / 2 + integer11 / 2;
+    protected void renderList(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final float float6) {
+        final int integer6 = this.getItemCount();
+        final Tesselator dhn9 = Tesselator.getInstance();
+        final BufferBuilder dhg10 = dhn9.getBuilder();
+        for (int integer7 = 0; integer7 < integer6; ++integer7) {
+            final int integer8 = this.getRowTop(integer7);
+            final int integer9 = this.getRowBottom(integer7);
+            if (integer9 >= this.y0) {
+                if (integer8 <= this.y1) {
+                    final int integer10 = integer3 + integer7 * this.itemHeight + this.headerHeight;
+                    final int integer11 = this.itemHeight - 4;
+                    final E a16 = this.getEntry(integer7);
+                    final int integer12 = this.getRowWidth();
+                    if (this.renderSelection && this.isSelectedItem(integer7)) {
+                        final int integer13 = this.x0 + this.width / 2 - integer12 / 2;
+                        final int integer14 = this.x0 + this.width / 2 + integer12 / 2;
                         RenderSystem.disableTexture();
-                        final float float6 = this.isFocused() ? 1.0f : 0.5f;
-                        RenderSystem.color4f(float6, float6, float6, 1.0f);
-                        cyg9.begin(7, DefaultVertexFormat.POSITION);
-                        cyg9.vertex(integer12, integer9 + integer10 + 2, 0.0).endVertex();
-                        cyg9.vertex(integer13, integer9 + integer10 + 2, 0.0).endVertex();
-                        cyg9.vertex(integer13, integer9 - 2, 0.0).endVertex();
-                        cyg9.vertex(integer12, integer9 - 2, 0.0).endVertex();
-                        cym8.end();
+                        final float float7 = this.isFocused() ? 1.0f : 0.5f;
+                        RenderSystem.color4f(float7, float7, float7, 1.0f);
+                        dhg10.begin(7, DefaultVertexFormat.POSITION);
+                        dhg10.vertex(integer13, integer10 + integer11 + 2, 0.0).endVertex();
+                        dhg10.vertex(integer14, integer10 + integer11 + 2, 0.0).endVertex();
+                        dhg10.vertex(integer14, integer10 - 2, 0.0).endVertex();
+                        dhg10.vertex(integer13, integer10 - 2, 0.0).endVertex();
+                        dhn9.end();
                         RenderSystem.color4f(0.0f, 0.0f, 0.0f, 1.0f);
-                        cyg9.begin(7, DefaultVertexFormat.POSITION);
-                        cyg9.vertex(integer12 + 1, integer9 + integer10 + 1, 0.0).endVertex();
-                        cyg9.vertex(integer13 - 1, integer9 + integer10 + 1, 0.0).endVertex();
-                        cyg9.vertex(integer13 - 1, integer9 - 1, 0.0).endVertex();
-                        cyg9.vertex(integer12 + 1, integer9 - 1, 0.0).endVertex();
-                        cym8.end();
+                        dhg10.begin(7, DefaultVertexFormat.POSITION);
+                        dhg10.vertex(integer13 + 1, integer10 + integer11 + 1, 0.0).endVertex();
+                        dhg10.vertex(integer14 - 1, integer10 + integer11 + 1, 0.0).endVertex();
+                        dhg10.vertex(integer14 - 1, integer10 - 1, 0.0).endVertex();
+                        dhg10.vertex(integer13 + 1, integer10 - 1, 0.0).endVertex();
+                        dhn9.end();
                         RenderSystem.enableTexture();
                     }
-                    final int integer12 = this.getRowLeft();
-                    a15.render(integer6, integer7, integer12, integer11, integer10, integer3, integer4, this.isMouseOver(integer3, integer4) && Objects.equals(this.getEntryAtPosition(integer3, integer4), a15), float5);
+                    final int integer13 = this.getRowLeft();
+                    a16.render(dhl, integer7, integer8, integer13, integer12, integer11, integer4, integer5, this.isMouseOver(integer4, integer5) && Objects.equals(this.getEntryAtPosition(integer4, integer5), a16), float6);
                 }
             }
         }
@@ -427,20 +451,6 @@ public abstract class AbstractSelectionList<E extends Entry<E>> extends Abstract
         return false;
     }
     
-    protected void renderHoleBackground(final int integer1, final int integer2, final int integer3, final int integer4) {
-        final Tesselator cym6 = Tesselator.getInstance();
-        final BufferBuilder cyg7 = cym6.getBuilder();
-        this.minecraft.getTextureManager().bind(GuiComponent.BACKGROUND_LOCATION);
-        RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        final float float8 = 32.0f;
-        cyg7.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg7.vertex(this.x0, integer2, 0.0).uv(0.0f, integer2 / 32.0f).color(64, 64, 64, integer4).endVertex();
-        cyg7.vertex(this.x0 + this.width, integer2, 0.0).uv(this.width / 32.0f, integer2 / 32.0f).color(64, 64, 64, integer4).endVertex();
-        cyg7.vertex(this.x0 + this.width, integer1, 0.0).uv(this.width / 32.0f, integer1 / 32.0f).color(64, 64, 64, integer3).endVertex();
-        cyg7.vertex(this.x0, integer1, 0.0).uv(0.0f, integer1 / 32.0f).color(64, 64, 64, integer3).endVertex();
-        cym6.end();
-    }
-    
     protected E remove(final int integer) {
         final E a3 = this.children.get(integer);
         if (this.removeEntry(this.children.get(integer))) {
@@ -457,11 +467,20 @@ public abstract class AbstractSelectionList<E extends Entry<E>> extends Abstract
         return boolean3;
     }
     
+    private void bindEntryToSelf(final Entry<E> a) {
+        ((Entry<Entry>)a).list = (AbstractSelectionList<Entry>)this;
+    }
+    
+    public enum SelectionDirection {
+        UP, 
+        DOWN;
+    }
+    
     public abstract static class Entry<E extends Entry<E>> implements GuiEventListener {
         @Deprecated
-        AbstractSelectionList<E> list;
+        private AbstractSelectionList<E> list;
         
-        public abstract void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9);
+        public abstract void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10);
         
         @Override
         public boolean isMouseOver(final double double1, final double double2) {
@@ -489,14 +508,14 @@ public abstract class AbstractSelectionList<E extends Entry<E>> extends Abstract
         @Override
         public E set(final int integer, final E a) {
             final E a2 = this.delegate.set(integer, a);
-            a.list = (AbstractSelectionList<E>)AbstractSelectionList.this;
+            AbstractSelectionList.this.bindEntryToSelf(a);
             return a2;
         }
         
         @Override
         public void add(final int integer, final E a) {
             this.delegate.add(integer, a);
-            a.list = (AbstractSelectionList<E>)AbstractSelectionList.this;
+            AbstractSelectionList.this.bindEntryToSelf(a);
         }
         
         @Override
diff --git a/src/net/minecraft/client/gui/components/AbstractSliderButton.java b/src/net/minecraft/client/gui/components/AbstractSliderButton.java
index 2b02b24..cd4ba1d 100644
--- a/src/net/minecraft/client/gui/components/AbstractSliderButton.java
+++ b/src/net/minecraft/client/gui/components/AbstractSliderButton.java
@@ -3,21 +3,17 @@ package net.minecraft.client.gui.components;
 import net.minecraft.client.sounds.SoundManager;
 import net.minecraft.util.Mth;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.Options;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Component;
 
 public abstract class AbstractSliderButton extends AbstractWidget {
-    protected final Options options;
     protected double value;
     
-    protected AbstractSliderButton(final int integer1, final int integer2, final int integer3, final int integer4, final double double5) {
-        this(Minecraft.getInstance().options, integer1, integer2, integer3, integer4, double5);
-    }
-    
-    protected AbstractSliderButton(final Options dbr, final int integer2, final int integer3, final int integer4, final int integer5, final double double6) {
-        super(integer2, integer3, integer4, integer5, "");
-        this.options = dbr;
+    public AbstractSliderButton(final int integer1, final int integer2, final int integer3, final int integer4, final Component mr, final double double6) {
+        super(integer1, integer2, integer3, integer4, mr);
         this.value = double6;
     }
     
@@ -27,17 +23,17 @@ public abstract class AbstractSliderButton extends AbstractWidget {
     }
     
     @Override
-    protected String getNarrationMessage() {
-        return I18n.get("gui.narrate.slider", this.getMessage());
+    protected MutableComponent createNarrationMessage() {
+        return new TranslatableComponent("gui.narrate.slider", new Object[] { this.getMessage() });
     }
     
     @Override
-    protected void renderBg(final Minecraft dbn, final int integer2, final int integer3) {
-        dbn.getTextureManager().bind(AbstractSliderButton.WIDGETS_LOCATION);
+    protected void renderBg(final PoseStack dhl, final Minecraft dlx, final int integer3, final int integer4) {
+        dlx.getTextureManager().bind(AbstractSliderButton.WIDGETS_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        final int integer4 = (this.isHovered() ? 2 : 1) * 20;
-        this.blit(this.x + (int)(this.value * (this.width - 8)), this.y, 0, 46 + integer4, 4, 20);
-        this.blit(this.x + (int)(this.value * (this.width - 8)) + 4, this.y, 196, 46 + integer4, 4, 20);
+        final int integer5 = (this.isHovered() ? 2 : 1) * 20;
+        this.blit(dhl, this.x + (int)(this.value * (this.width - 8)), this.y, 0, 46 + integer5, 4, 20);
+        this.blit(dhl, this.x + (int)(this.value * (this.width - 8)) + 4, this.y, 196, 46 + integer5, 4, 20);
     }
     
     @Override
@@ -75,7 +71,7 @@ public abstract class AbstractSliderButton extends AbstractWidget {
     }
     
     @Override
-    public void playDownSound(final SoundManager edz) {
+    public void playDownSound(final SoundManager epn) {
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/components/AbstractWidget.java b/src/net/minecraft/client/gui/components/AbstractWidget.java
index 1e34a61..a66af48 100644
--- a/src/net/minecraft/client/gui/components/AbstractWidget.java
+++ b/src/net/minecraft/client/gui/components/AbstractWidget.java
@@ -6,26 +6,27 @@ import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.client.sounds.SoundManager;
 import net.minecraft.client.gui.Font;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.util.Mth;
-import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.Util;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.GuiComponent;
 
 public abstract class AbstractWidget extends GuiComponent implements Widget, GuiEventListener {
     public static final ResourceLocation WIDGETS_LOCATION;
-    private static final int NARRATE_DELAY_MOUSE = 750;
-    private static final int NARRATE_DELAY_FOCUS = 200;
     protected int width;
     protected int height;
     public int x;
     public int y;
-    private String message;
+    private Component message;
     private boolean wasHovered;
     protected boolean isHovered;
     public boolean active;
@@ -34,11 +35,7 @@ public abstract class AbstractWidget extends GuiComponent implements Widget, Gui
     protected long nextNarration;
     private boolean focused;
     
-    public AbstractWidget(final int integer1, final int integer2, final String string) {
-        this(integer1, integer2, 200, 20, string);
-    }
-    
-    public AbstractWidget(final int integer1, final int integer2, final int integer3, final int integer4, final String string) {
+    public AbstractWidget(final int integer1, final int integer2, final int integer3, final int integer4, final Component mr) {
         this.active = true;
         this.visible = true;
         this.alpha = 1.0f;
@@ -47,7 +44,11 @@ public abstract class AbstractWidget extends GuiComponent implements Widget, Gui
         this.y = integer2;
         this.width = integer3;
         this.height = integer4;
-        this.message = string;
+        this.message = mr;
+    }
+    
+    public int getHeight() {
+        return this.height;
     }
     
     protected int getYImage(final boolean boolean1) {
@@ -62,11 +63,11 @@ public abstract class AbstractWidget extends GuiComponent implements Widget, Gui
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (!this.visible) {
             return;
         }
-        this.isHovered = (integer1 >= this.x && integer2 >= this.y && integer1 < this.x + this.width && integer2 < this.y + this.height);
+        this.isHovered = (integer2 >= this.x && integer3 >= this.y && integer2 < this.x + this.width && integer3 < this.y + this.height);
         if (this.wasHovered != this.isHovered()) {
             if (this.isHovered()) {
                 if (this.focused) {
@@ -81,7 +82,7 @@ public abstract class AbstractWidget extends GuiComponent implements Widget, Gui
             }
         }
         if (this.visible) {
-            this.renderButton(integer1, integer2, float3);
+            this.renderButton(dhl, integer2, integer3, float4);
         }
         this.narrate();
         this.wasHovered = this.isHovered();
@@ -89,7 +90,7 @@ public abstract class AbstractWidget extends GuiComponent implements Widget, Gui
     
     protected void narrate() {
         if (this.active && this.isHovered() && Util.getMillis() > this.nextNarration) {
-            final String string2 = this.getNarrationMessage();
+            final String string2 = this.createNarrationMessage().getString();
             if (!string2.isEmpty()) {
                 NarratorChatListener.INSTANCE.sayNow(string2);
                 this.nextNarration = Long.MAX_VALUE;
@@ -97,30 +98,27 @@ public abstract class AbstractWidget extends GuiComponent implements Widget, Gui
         }
     }
     
-    protected String getNarrationMessage() {
-        if (this.getMessage().isEmpty()) {
-            return "";
-        }
-        return I18n.get("gui.narrate.button", this.getMessage());
+    protected MutableComponent createNarrationMessage() {
+        return new TranslatableComponent("gui.narrate.button", new Object[] { this.getMessage() });
     }
     
-    public void renderButton(final int integer1, final int integer2, final float float3) {
-        final Minecraft dbn5 = Minecraft.getInstance();
-        final Font dch6 = dbn5.font;
-        dbn5.getTextureManager().bind(AbstractWidget.WIDGETS_LOCATION);
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        final Minecraft dlx6 = Minecraft.getInstance();
+        final Font dmt7 = dlx6.font;
+        dlx6.getTextureManager().bind(AbstractWidget.WIDGETS_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, this.alpha);
-        final int integer3 = this.getYImage(this.isHovered());
+        final int integer4 = this.getYImage(this.isHovered());
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
-        this.blit(this.x, this.y, 0, 46 + integer3 * 20, this.width / 2, this.height);
-        this.blit(this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + integer3 * 20, this.width / 2, this.height);
-        this.renderBg(dbn5, integer1, integer2);
-        final int integer4 = this.active ? 16777215 : 10526880;
-        this.drawCenteredString(dch6, this.getMessage(), this.x + this.width / 2, this.y + (this.height - 8) / 2, integer4 | Mth.ceil(this.alpha * 255.0f) << 24);
+        RenderSystem.enableDepthTest();
+        this.blit(dhl, this.x, this.y, 0, 46 + integer4 * 20, this.width / 2, this.height);
+        this.blit(dhl, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + integer4 * 20, this.width / 2, this.height);
+        this.renderBg(dhl, dlx6, integer2, integer3);
+        final int integer5 = this.active ? 16777215 : 10526880;
+        this.drawCenteredString(dhl, dmt7, this.getMessage(), this.x + this.width / 2, this.y + (this.height - 8) / 2, integer5 | Mth.ceil(this.alpha * 255.0f) << 24);
     }
     
-    protected void renderBg(final Minecraft dbn, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final Minecraft dlx, final int integer3, final int integer4) {
     }
     
     public void onClick(final double double1, final double double2) {
@@ -195,11 +193,11 @@ public abstract class AbstractWidget extends GuiComponent implements Widget, Gui
         return this.active && this.visible && double1 >= this.x && double2 >= this.y && double1 < this.x + this.width && double2 < this.y + this.height;
     }
     
-    public void renderToolTip(final int integer1, final int integer2) {
+    public void renderToolTip(final PoseStack dhl, final int integer2, final int integer3) {
     }
     
-    public void playDownSound(final SoundManager edz) {
-        edz.play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0f));
+    public void playDownSound(final SoundManager epn) {
+        epn.play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0f));
     }
     
     public int getWidth() {
@@ -214,18 +212,18 @@ public abstract class AbstractWidget extends GuiComponent implements Widget, Gui
         this.alpha = float1;
     }
     
-    public void setMessage(final String string) {
-        if (!Objects.equals(string, this.message)) {
+    public void setMessage(final Component mr) {
+        if (!Objects.equals(mr, this.message)) {
             this.queueNarration(250);
         }
-        this.message = string;
+        this.message = mr;
     }
     
     public void queueNarration(final int integer) {
         this.nextNarration = Util.getMillis() + integer;
     }
     
-    public String getMessage() {
+    public Component getMessage() {
         return this.message;
     }
     
diff --git a/src/net/minecraft/client/gui/components/BossHealthOverlay.java b/src/net/minecraft/client/gui/components/BossHealthOverlay.java
index dfb300e..a65eb1a 100644
--- a/src/net/minecraft/client/gui/components/BossHealthOverlay.java
+++ b/src/net/minecraft/client/gui/components/BossHealthOverlay.java
@@ -1,9 +1,12 @@
 package net.minecraft.client.gui.components;
 
 import net.minecraft.network.protocol.game.ClientboundBossEventPacket;
+import net.minecraft.network.chat.Component;
 import java.util.Iterator;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.world.BossEvent;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.collect.Maps;
 import java.util.UUID;
 import java.util.Map;
@@ -16,61 +19,61 @@ public class BossHealthOverlay extends GuiComponent {
     private final Minecraft minecraft;
     private final Map<UUID, LerpingBossEvent> events;
     
-    public BossHealthOverlay(final Minecraft dbn) {
+    public BossHealthOverlay(final Minecraft dlx) {
         this.events = Maps.newLinkedHashMap();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
-    public void render() {
+    public void render(final PoseStack dhl) {
         if (this.events.isEmpty()) {
             return;
         }
-        final int integer2 = this.minecraft.getWindow().getGuiScaledWidth();
-        int integer3 = 12;
-        for (final LerpingBossEvent dde5 : this.events.values()) {
-            final int integer4 = integer2 / 2 - 91;
-            final int integer5 = integer3;
+        final int integer3 = this.minecraft.getWindow().getGuiScaledWidth();
+        int integer4 = 12;
+        for (final LerpingBossEvent dnr6 : this.events.values()) {
+            final int integer5 = integer3 / 2 - 91;
+            final int integer6 = integer4;
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
             this.minecraft.getTextureManager().bind(BossHealthOverlay.GUI_BARS_LOCATION);
-            this.drawBar(integer4, integer5, dde5);
-            final String string8 = dde5.getName().getColoredString();
-            final int integer6 = this.minecraft.font.width(string8);
-            final int integer7 = integer2 / 2 - integer6 / 2;
-            final int integer8 = integer5 - 9;
-            this.minecraft.font.drawShadow(string8, (float)integer7, (float)integer8, 16777215);
-            final int n = integer3;
+            this.drawBar(dhl, integer5, integer6, dnr6);
+            final Component mr9 = dnr6.getName();
+            final int integer7 = this.minecraft.font.width(mr9);
+            final int integer8 = integer3 / 2 - integer7 / 2;
+            final int integer9 = integer6 - 9;
+            this.minecraft.font.drawShadow(dhl, mr9, (float)integer8, (float)integer9, 16777215);
+            final int n = integer4;
             final int n2 = 10;
             this.minecraft.font.getClass();
-            integer3 = n + (n2 + 9);
-            if (integer3 >= this.minecraft.getWindow().getGuiScaledHeight() / 3) {
+            integer4 = n + (n2 + 9);
+            if (integer4 >= this.minecraft.getWindow().getGuiScaledHeight() / 3) {
                 break;
             }
         }
     }
     
-    private void drawBar(final int integer1, final int integer2, final BossEvent ajb) {
-        this.blit(integer1, integer2, 0, ajb.getColor().ordinal() * 5 * 2, 182, 5);
-        if (ajb.getOverlay() != BossEvent.BossBarOverlay.PROGRESS) {
-            this.blit(integer1, integer2, 0, 80 + (ajb.getOverlay().ordinal() - 1) * 5 * 2, 182, 5);
+    private void drawBar(final PoseStack dhl, final int integer2, final int integer3, final BossEvent amw) {
+        this.blit(dhl, integer2, integer3, 0, amw.getColor().ordinal() * 5 * 2, 182, 5);
+        if (amw.getOverlay() != BossEvent.BossBarOverlay.PROGRESS) {
+            this.blit(dhl, integer2, integer3, 0, 80 + (amw.getOverlay().ordinal() - 1) * 5 * 2, 182, 5);
         }
-        final int integer3 = (int)(ajb.getPercent() * 183.0f);
-        if (integer3 > 0) {
-            this.blit(integer1, integer2, 0, ajb.getColor().ordinal() * 5 * 2 + 5, integer3, 5);
-            if (ajb.getOverlay() != BossEvent.BossBarOverlay.PROGRESS) {
-                this.blit(integer1, integer2, 0, 80 + (ajb.getOverlay().ordinal() - 1) * 5 * 2 + 5, integer3, 5);
+        final int integer4 = (int)(amw.getPercent() * 183.0f);
+        if (integer4 > 0) {
+            this.blit(dhl, integer2, integer3, 0, amw.getColor().ordinal() * 5 * 2 + 5, integer4, 5);
+            if (amw.getOverlay() != BossEvent.BossBarOverlay.PROGRESS) {
+                this.blit(dhl, integer2, integer3, 0, 80 + (amw.getOverlay().ordinal() - 1) * 5 * 2 + 5, integer4, 5);
             }
         }
     }
     
-    public void update(final ClientboundBossEventPacket mk) {
-        if (mk.getOperation() == ClientboundBossEventPacket.Operation.ADD) {
-            this.events.put(mk.getId(), new LerpingBossEvent(mk));
+    public void update(final ClientboundBossEventPacket ny) {
+        if (ny.getOperation() == ClientboundBossEventPacket.Operation.ADD) {
+            this.events.put(ny.getId(), new LerpingBossEvent(ny));
         }
-        else if (mk.getOperation() == ClientboundBossEventPacket.Operation.REMOVE) {
-            this.events.remove(mk.getId());
+        else if (ny.getOperation() == ClientboundBossEventPacket.Operation.REMOVE) {
+            this.events.remove(ny.getId());
         }
         else {
-            this.events.get(mk.getId()).update(mk);
+            this.events.get(ny.getId()).update(ny);
         }
     }
     
@@ -80,8 +83,8 @@ public class BossHealthOverlay extends GuiComponent {
     
     public boolean shouldPlayMusic() {
         if (!this.events.isEmpty()) {
-            for (final BossEvent ajb3 : this.events.values()) {
-                if (ajb3.shouldPlayBossMusic()) {
+            for (final BossEvent amw3 : this.events.values()) {
+                if (amw3.shouldPlayBossMusic()) {
                     return true;
                 }
             }
@@ -91,8 +94,8 @@ public class BossHealthOverlay extends GuiComponent {
     
     public boolean shouldDarkenScreen() {
         if (!this.events.isEmpty()) {
-            for (final BossEvent ajb3 : this.events.values()) {
-                if (ajb3.shouldDarkenScreen()) {
+            for (final BossEvent amw3 : this.events.values()) {
+                if (amw3.shouldDarkenScreen()) {
                     return true;
                 }
             }
@@ -102,8 +105,8 @@ public class BossHealthOverlay extends GuiComponent {
     
     public boolean shouldCreateWorldFog() {
         if (!this.events.isEmpty()) {
-            for (final BossEvent ajb3 : this.events.values()) {
-                if (ajb3.shouldCreateWorldFog()) {
+            for (final BossEvent amw3 : this.events.values()) {
+                if (amw3.shouldCreateWorldFog()) {
                     return true;
                 }
             }
diff --git a/src/net/minecraft/client/gui/components/Button.java b/src/net/minecraft/client/gui/components/Button.java
index 328e900..55d88eb 100644
--- a/src/net/minecraft/client/gui/components/Button.java
+++ b/src/net/minecraft/client/gui/components/Button.java
@@ -1,11 +1,21 @@
 package net.minecraft.client.gui.components;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.Component;
+
 public class Button extends AbstractButton {
+    public static final OnTooltip NO_TOOLTIP;
     protected final OnPress onPress;
+    protected final OnTooltip onTooltip;
     
-    public Button(final int integer1, final int integer2, final int integer3, final int integer4, final String string, final OnPress a) {
-        super(integer1, integer2, integer3, integer4, string);
+    public Button(final int integer1, final int integer2, final int integer3, final int integer4, final Component mr, final OnPress a) {
+        this(integer1, integer2, integer3, integer4, mr, a, Button.NO_TOOLTIP);
+    }
+    
+    public Button(final int integer1, final int integer2, final int integer3, final int integer4, final Component mr, final OnPress a, final OnTooltip b) {
+        super(integer1, integer2, integer3, integer4, mr);
         this.onPress = a;
+        this.onTooltip = b;
     }
     
     @Override
@@ -13,7 +23,28 @@ public class Button extends AbstractButton {
         this.onPress.onPress(this);
     }
     
+    @Override
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        super.renderButton(dhl, integer2, integer3, float4);
+        if (this.isHovered()) {
+            this.renderToolTip(dhl, integer2, integer3);
+        }
+    }
+    
+    @Override
+    public void renderToolTip(final PoseStack dhl, final int integer2, final int integer3) {
+        this.onTooltip.onTooltip(this, dhl, integer2, integer3);
+    }
+    
+    static {
+        NO_TOOLTIP = ((dni, dhl, integer3, integer4) -> {});
+    }
+    
+    public interface OnTooltip {
+        void onTooltip(final Button dni, final PoseStack dhl, final int integer3, final int integer4);
+    }
+    
     public interface OnPress {
-        void onPress(final Button dcv);
+        void onPress(final Button dni);
     }
 }
diff --git a/src/net/minecraft/client/gui/components/ChatComponent.java b/src/net/minecraft/client/gui/components/ChatComponent.java
index 5041b2b..e74a284 100644
--- a/src/net/minecraft/client/gui/components/ChatComponent.java
+++ b/src/net/minecraft/client/gui/components/ChatComponent.java
@@ -3,14 +3,18 @@ package net.minecraft.client.gui.components;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.client.gui.screens.ChatScreen;
 import javax.annotation.Nullable;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.Style;
 import java.util.Iterator;
-import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.ChatVisiblity;
-import com.mojang.math.Matrix4f;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.util.Mth;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.google.common.collect.Queues;
 import com.google.common.collect.Lists;
+import net.minecraft.network.chat.Component;
+import java.util.Deque;
 import net.minecraft.client.GuiMessage;
 import java.util.List;
 import net.minecraft.client.Minecraft;
@@ -23,80 +27,102 @@ public class ChatComponent extends GuiComponent {
     private final List<String> recentChat;
     private final List<GuiMessage> allMessages;
     private final List<GuiMessage> trimmedMessages;
+    private final Deque<Component> chatQueue;
     private int chatScrollbarPos;
     private boolean newMessageSinceScroll;
+    private long lastMessage;
     
-    public ChatComponent(final Minecraft dbn) {
+    public ChatComponent(final Minecraft dlx) {
         this.recentChat = Lists.newArrayList();
         this.allMessages = Lists.newArrayList();
         this.trimmedMessages = Lists.newArrayList();
-        this.minecraft = dbn;
+        this.chatQueue = Queues.newArrayDeque();
+        this.lastMessage = 0L;
+        this.minecraft = dlx;
     }
     
-    public void render(final int integer) {
-        if (!this.isChatVisible()) {
+    public void render(final PoseStack dhl, final int integer) {
+        if (this.isChatHidden()) {
             return;
         }
+        this.processPendingMessages();
         final int integer2 = this.getLinesPerPage();
         final int integer3 = this.trimmedMessages.size();
         if (integer3 <= 0) {
             return;
         }
-        boolean boolean5 = false;
+        boolean boolean6 = false;
         if (this.isChatFocused()) {
-            boolean5 = true;
+            boolean6 = true;
         }
-        final double double6 = this.getScale();
-        final int integer4 = Mth.ceil(this.getWidth() / double6);
+        final double double7 = this.getScale();
+        final int integer4 = Mth.ceil(this.getWidth() / double7);
         RenderSystem.pushMatrix();
         RenderSystem.translatef(2.0f, 8.0f, 0.0f);
-        RenderSystem.scaled(double6, double6, 1.0);
-        final double double7 = this.minecraft.options.chatOpacity * 0.8999999761581421 + 0.10000000149011612;
-        final double double8 = this.minecraft.options.textBackgroundOpacity;
+        RenderSystem.scaled(double7, double7, 1.0);
+        final double double8 = this.minecraft.options.chatOpacity * 0.8999999761581421 + 0.10000000149011612;
+        final double double9 = this.minecraft.options.textBackgroundOpacity;
+        final double double10 = 9.0 * (this.minecraft.options.chatLineSpacing + 1.0);
+        final double double11 = -8.0 * (this.minecraft.options.chatLineSpacing + 1.0) + 4.0 * this.minecraft.options.chatLineSpacing;
         int integer5 = 0;
-        final Matrix4f b14 = Matrix4f.createTranslateMatrix(0.0f, 0.0f, -100.0f);
         for (int integer6 = 0; integer6 + this.chatScrollbarPos < this.trimmedMessages.size() && integer6 < integer2; ++integer6) {
-            final GuiMessage dbi16 = this.trimmedMessages.get(integer6 + this.chatScrollbarPos);
-            if (dbi16 != null) {
-                final int integer7 = integer - dbi16.getAddedTime();
-                if (integer7 < 200 || boolean5) {
-                    final double double9 = boolean5 ? 1.0 : getTimeFactor(integer7);
-                    final int integer8 = (int)(255.0 * double9 * double7);
-                    final int integer9 = (int)(255.0 * double9 * double8);
+            final GuiMessage dls20 = this.trimmedMessages.get(integer6 + this.chatScrollbarPos);
+            if (dls20 != null) {
+                final int integer7 = integer - dls20.getAddedTime();
+                if (integer7 < 200 || boolean6) {
+                    final double double12 = boolean6 ? 1.0 : getTimeFactor(integer7);
+                    final int integer8 = (int)(255.0 * double12 * double8);
+                    final int integer9 = (int)(255.0 * double12 * double9);
                     ++integer5;
                     if (integer8 > 3) {
                         final int integer10 = 0;
-                        final int integer11 = -integer6 * 9;
-                        GuiComponent.fill(b14, -2, integer11 - 9, 0 + integer4 + 4, integer11, integer9 << 24);
-                        final String string24 = dbi16.getMessage().getColoredString();
+                        final double double13 = -integer6 * double10;
+                        dhl.pushPose();
+                        dhl.translate(0.0, 0.0, 50.0);
+                        GuiComponent.fill(dhl, -2, (int)(double13 - double10), 0 + integer4 + 4, (int)double13, integer9 << 24);
                         RenderSystem.enableBlend();
-                        this.minecraft.font.drawShadow(string24, 0.0f, (float)(integer11 - 8), 16777215 + (integer8 << 24));
+                        dhl.translate(0.0, 0.0, 50.0);
+                        this.minecraft.font.drawShadow(dhl, dls20.getMessage(), 0.0f, (float)(int)(double13 + double11), 16777215 + (integer8 << 24));
                         RenderSystem.disableAlphaTest();
                         RenderSystem.disableBlend();
+                        dhl.popPose();
                     }
                 }
             }
         }
-        if (boolean5) {
+        if (!this.chatQueue.isEmpty()) {
+            final int integer6 = (int)(128.0 * double8);
+            final int integer11 = (int)(255.0 * double9);
+            dhl.pushPose();
+            dhl.translate(0.0, 0.0, 50.0);
+            GuiComponent.fill(dhl, -2, 0, integer4 + 4, 9, integer11 << 24);
+            RenderSystem.enableBlend();
+            dhl.translate(0.0, 0.0, 50.0);
+            this.minecraft.font.drawShadow(dhl, new TranslatableComponent("chat.queue", new Object[] { this.chatQueue.size() }), 0.0f, 1.0f, 16777215 + (integer6 << 24));
+            dhl.popPose();
+            RenderSystem.disableAlphaTest();
+            RenderSystem.disableBlend();
+        }
+        if (boolean6) {
             this.minecraft.font.getClass();
             final int integer6 = 9;
             RenderSystem.translatef(-3.0f, 0.0f, 0.0f);
-            final int integer12 = integer3 * integer6 + integer3;
+            final int integer11 = integer3 * integer6 + integer3;
             final int integer7 = integer5 * integer6 + integer5;
-            final int integer13 = this.chatScrollbarPos * integer7 / integer3;
-            final int integer14 = integer7 * integer7 / integer12;
-            if (integer12 != integer7) {
-                final int integer8 = (integer13 > 0) ? 170 : 96;
+            final int integer12 = this.chatScrollbarPos * integer7 / integer3;
+            final int integer13 = integer7 * integer7 / integer11;
+            if (integer11 != integer7) {
+                final int integer8 = (integer12 > 0) ? 170 : 96;
                 final int integer9 = this.newMessageSinceScroll ? 13382451 : 3355562;
-                GuiComponent.fill(0, -integer13, 2, -integer13 - integer14, integer9 + (integer8 << 24));
-                GuiComponent.fill(2, -integer13, 1, -integer13 - integer14, 13421772 + (integer8 << 24));
+                GuiComponent.fill(dhl, 0, -integer12, 2, -integer12 - integer13, integer9 + (integer8 << 24));
+                GuiComponent.fill(dhl, 2, -integer12, 1, -integer12 - integer13, 13421772 + (integer8 << 24));
             }
         }
         RenderSystem.popMatrix();
     }
     
-    private boolean isChatVisible() {
-        return this.minecraft.options.chatVisibility != ChatVisiblity.HIDDEN;
+    private boolean isChatHidden() {
+        return this.minecraft.options.chatVisibility == ChatVisiblity.HIDDEN;
     }
     
     private static double getTimeFactor(final int integer) {
@@ -116,34 +142,34 @@ public class ChatComponent extends GuiComponent {
         }
     }
     
-    public void addMessage(final Component lf) {
-        this.addMessage(lf, 0);
+    public void addMessage(final Component mr) {
+        this.addMessage(mr, 0);
     }
     
-    public void addMessage(final Component lf, final int integer) {
-        this.addMessage(lf, integer, this.minecraft.gui.getGuiTicks(), false);
-        ChatComponent.LOGGER.info("[CHAT] {}", lf.getString().replaceAll("\r", "\\\\r").replaceAll("\n", "\\\\n"));
+    public void addMessage(final Component mr, final int integer) {
+        this.addMessage(mr, integer, this.minecraft.gui.getGuiTicks(), false);
+        ChatComponent.LOGGER.info("[CHAT] {}", mr.getString().replaceAll("\r", "\\\\r").replaceAll("\n", "\\\\n"));
     }
     
-    private void addMessage(final Component lf, final int integer2, final int integer3, final boolean boolean4) {
+    private void addMessage(final FormattedText mu, final int integer2, final int integer3, final boolean boolean4) {
         if (integer2 != 0) {
             this.removeById(integer2);
         }
         final int integer4 = Mth.floor(this.getWidth() / this.getScale());
-        final List<Component> list7 = ComponentRenderUtils.wrapComponents(lf, integer4, this.minecraft.font, false, false);
+        final List<FormattedText> list7 = ComponentRenderUtils.wrapComponents(mu, integer4, this.minecraft.font);
         final boolean boolean5 = this.isChatFocused();
-        for (final Component lf2 : list7) {
+        for (final FormattedText mu2 : list7) {
             if (boolean5 && this.chatScrollbarPos > 0) {
                 this.newMessageSinceScroll = true;
                 this.scrollChat(1.0);
             }
-            this.trimmedMessages.add(0, new GuiMessage(integer3, lf2, integer2));
+            this.trimmedMessages.add(0, new GuiMessage(integer3, mu2, integer2));
         }
         while (this.trimmedMessages.size() > 100) {
             this.trimmedMessages.remove(this.trimmedMessages.size() - 1);
         }
         if (!boolean4) {
-            this.allMessages.add(0, new GuiMessage(integer3, lf, integer2));
+            this.allMessages.add(0, new GuiMessage(integer3, mu, integer2));
             while (this.allMessages.size() > 100) {
                 this.allMessages.remove(this.allMessages.size() - 1);
             }
@@ -154,8 +180,8 @@ public class ChatComponent extends GuiComponent {
         this.trimmedMessages.clear();
         this.resetChatScroll();
         for (int integer2 = this.allMessages.size() - 1; integer2 >= 0; --integer2) {
-            final GuiMessage dbi3 = this.allMessages.get(integer2);
-            this.addMessage(dbi3.getMessage(), dbi3.getId(), dbi3.getAddedTime(), true);
+            final GuiMessage dls3 = this.allMessages.get(integer2);
+            this.addMessage(dls3.getMessage(), dls3.getId(), dls3.getAddedTime(), true);
         }
     }
     
@@ -186,41 +212,44 @@ public class ChatComponent extends GuiComponent {
         }
     }
     
+    public boolean handleChatQueueClicked(final double double1, final double double2) {
+        if (!this.isChatFocused() || this.minecraft.options.hideGui || this.isChatHidden() || this.chatQueue.isEmpty()) {
+            return false;
+        }
+        final double double3 = double1 - 2.0;
+        final double double4 = this.minecraft.getWindow().getGuiScaledHeight() - double2 - 40.0;
+        if (double3 <= Mth.floor(this.getWidth() / this.getScale()) && double4 < 0.0 && double4 > Mth.floor(-9.0 * this.getScale())) {
+            this.addMessage(this.chatQueue.remove());
+            this.lastMessage = System.currentTimeMillis();
+            return true;
+        }
+        return false;
+    }
+    
     @Nullable
-    public Component getClickedComponentAt(final double double1, final double double2) {
-        if (!this.isChatFocused() || this.minecraft.options.hideGui || !this.isChatVisible()) {
+    public Style getClickedComponentStyleAt(final double double1, final double double2) {
+        if (!this.isChatFocused() || this.minecraft.options.hideGui || this.isChatHidden()) {
             return null;
         }
-        final double double3 = this.getScale();
-        double double4 = double1 - 2.0;
-        double double5 = this.minecraft.getWindow().getGuiScaledHeight() - double2 - 40.0;
-        double4 = Mth.floor(double4 / double3);
-        double5 = Mth.floor(double5 / double3);
-        if (double4 < 0.0 || double5 < 0.0) {
+        double double3 = double1 - 2.0;
+        double double4 = this.minecraft.getWindow().getGuiScaledHeight() - double2 - 40.0;
+        double3 = Mth.floor(double3 / this.getScale());
+        double4 = Mth.floor(double4 / (this.getScale() * (this.minecraft.options.chatLineSpacing + 1.0)));
+        if (double3 < 0.0 || double4 < 0.0) {
             return null;
         }
-        final int integer12 = Math.min(this.getLinesPerPage(), this.trimmedMessages.size());
-        if (double4 <= Mth.floor(this.getWidth() / this.getScale())) {
-            final double n = double5;
+        final int integer10 = Math.min(this.getLinesPerPage(), this.trimmedMessages.size());
+        if (double3 <= Mth.floor(this.getWidth() / this.getScale())) {
+            final double n = double4;
             this.minecraft.font.getClass();
-            if (n < 9 * integer12 + integer12) {
-                final double n2 = double5;
+            if (n < 9 * integer10 + integer10) {
+                final double n2 = double4;
                 this.minecraft.font.getClass();
-                final int integer13 = (int)(n2 / 9.0 + this.chatScrollbarPos);
-                if (integer13 >= 0 && integer13 < this.trimmedMessages.size()) {
-                    final GuiMessage dbi14 = this.trimmedMessages.get(integer13);
-                    int integer14 = 0;
-                    for (final Component lf17 : dbi14.getMessage()) {
-                        if (lf17 instanceof TextComponent) {
-                            integer14 += this.minecraft.font.width(ComponentRenderUtils.stripColor(((TextComponent)lf17).getText(), false));
-                            if (integer14 > double4) {
-                                return lf17;
-                            }
-                            continue;
-                        }
-                    }
+                final int integer11 = (int)(n2 / 9.0 + this.chatScrollbarPos);
+                if (integer11 >= 0 && integer11 < this.trimmedMessages.size()) {
+                    final GuiMessage dls12 = this.trimmedMessages.get(integer11);
+                    return this.minecraft.font.getSplitter().componentStyleAtWidth(dls12.getMessage(), (int)double3);
                 }
-                return null;
             }
         }
         return null;
@@ -233,15 +262,15 @@ public class ChatComponent extends GuiComponent {
     public void removeById(final int integer) {
         Iterator<GuiMessage> iterator3 = this.trimmedMessages.iterator();
         while (iterator3.hasNext()) {
-            final GuiMessage dbi4 = iterator3.next();
-            if (dbi4.getId() == integer) {
+            final GuiMessage dls4 = iterator3.next();
+            if (dls4.getId() == integer) {
                 iterator3.remove();
             }
         }
         iterator3 = this.allMessages.iterator();
         while (iterator3.hasNext()) {
-            final GuiMessage dbi4 = iterator3.next();
-            if (dbi4.getId() == integer) {
+            final GuiMessage dls4 = iterator3.next();
+            if (dls4.getId() == integer) {
                 iterator3.remove();
                 break;
             }
@@ -253,7 +282,7 @@ public class ChatComponent extends GuiComponent {
     }
     
     public int getHeight() {
-        return getHeight(this.isChatFocused() ? this.minecraft.options.chatHeightFocused : this.minecraft.options.chatHeightUnfocused);
+        return getHeight((this.isChatFocused() ? this.minecraft.options.chatHeightFocused : this.minecraft.options.chatHeightUnfocused) / (this.minecraft.options.chatLineSpacing + 1.0));
     }
     
     public double getScale() {
@@ -276,6 +305,37 @@ public class ChatComponent extends GuiComponent {
         return this.getHeight() / 9;
     }
     
+    private long getChatRateMillis() {
+        return (long)(this.minecraft.options.chatDelay * 1000.0);
+    }
+    
+    private void processPendingMessages() {
+        if (this.chatQueue.isEmpty()) {
+            return;
+        }
+        final long long2 = System.currentTimeMillis();
+        if (long2 - this.lastMessage >= this.getChatRateMillis()) {
+            this.addMessage(this.chatQueue.remove());
+            this.lastMessage = long2;
+        }
+    }
+    
+    public void enqueueMessage(final Component mr) {
+        if (this.minecraft.options.chatDelay <= 0.0) {
+            this.addMessage(mr);
+        }
+        else {
+            final long long3 = System.currentTimeMillis();
+            if (long3 - this.lastMessage >= this.getChatRateMillis()) {
+                this.addMessage(mr);
+                this.lastMessage = long3;
+            }
+            else {
+                this.chatQueue.add(mr);
+            }
+        }
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
     }
diff --git a/src/net/minecraft/client/gui/components/Checkbox.java b/src/net/minecraft/client/gui/components/Checkbox.java
index 13e9003..25b353d 100644
--- a/src/net/minecraft/client/gui/components/Checkbox.java
+++ b/src/net/minecraft/client/gui/components/Checkbox.java
@@ -1,20 +1,29 @@
 package net.minecraft.client.gui.components;
 
 import net.minecraft.client.gui.Font;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.util.Mth;
 import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 
 public class Checkbox extends AbstractButton {
     private static final ResourceLocation TEXTURE;
-    boolean selected;
+    private boolean selected;
+    private final boolean showLabel;
     
-    public Checkbox(final int integer1, final int integer2, final int integer3, final int integer4, final String string, final boolean boolean6) {
-        super(integer1, integer2, integer3, integer4, string);
+    public Checkbox(final int integer1, final int integer2, final int integer3, final int integer4, final Component mr, final boolean boolean6) {
+        this(integer1, integer2, integer3, integer4, mr, boolean6, true);
+    }
+    
+    public Checkbox(final int integer1, final int integer2, final int integer3, final int integer4, final Component mr, final boolean boolean6, final boolean boolean7) {
+        super(integer1, integer2, integer3, integer4, mr);
         this.selected = boolean6;
+        this.showLabel = boolean7;
     }
     
     @Override
@@ -27,19 +36,20 @@ public class Checkbox extends AbstractButton {
     }
     
     @Override
-    public void renderButton(final int integer1, final int integer2, final float float3) {
-        final Minecraft dbn5 = Minecraft.getInstance();
-        dbn5.getTextureManager().bind(Checkbox.TEXTURE);
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        final Minecraft dlx6 = Minecraft.getInstance();
+        dlx6.getTextureManager().bind(Checkbox.TEXTURE);
         RenderSystem.enableDepthTest();
-        final Font dch6 = dbn5.font;
+        final Font dmt7 = dlx6.font;
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, this.alpha);
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
-        GuiComponent.blit(this.x, this.y, 0.0f, this.selected ? 20.0f : 0.0f, 20, this.height, 32, 64);
-        this.renderBg(dbn5, integer1, integer2);
-        final int integer3 = 14737632;
-        this.drawString(dch6, this.getMessage(), this.x + 24, this.y + (this.height - 8) / 2, 0xE0E0E0 | Mth.ceil(this.alpha * 255.0f) << 24);
+        GuiComponent.blit(dhl, this.x, this.y, this.isFocused() ? 20.0f : 0.0f, this.selected ? 20.0f : 0.0f, 20, this.height, 64, 64);
+        this.renderBg(dhl, dlx6, integer2, integer3);
+        if (this.showLabel) {
+            this.drawString(dhl, dmt7, this.getMessage(), this.x + 24, this.y + (this.height - 8) / 2, 0xE0E0E0 | Mth.ceil(this.alpha * 255.0f) << 24);
+        }
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/components/CommandSuggestions.java b/src/net/minecraft/client/gui/components/CommandSuggestions.java
index b984942..8b2cb4a 100644
--- a/src/net/minecraft/client/gui/components/CommandSuggestions.java
+++ b/src/net/minecraft/client/gui/components/CommandSuggestions.java
@@ -3,10 +3,12 @@ package net.minecraft.client.gui.components;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import com.mojang.brigadier.Message;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.network.chat.ComponentUtils;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.client.gui.GuiComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.brigadier.context.ParsedArgument;
 import javax.annotation.Nullable;
 import com.mojang.brigadier.context.SuggestionContext;
@@ -19,10 +21,11 @@ import com.mojang.brigadier.tree.CommandNode;
 import java.util.Map;
 import java.util.regex.Matcher;
 import com.google.common.base.Strings;
-import java.util.Collection;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import com.mojang.brigadier.StringReader;
+import java.util.Collection;
+import java.util.Locale;
 import java.util.Iterator;
 import com.mojang.brigadier.suggestion.Suggestion;
 import net.minecraft.util.Mth;
@@ -58,19 +61,19 @@ public class CommandSuggestions {
     private boolean allowSuggestions;
     private boolean keepSuggestions;
     
-    public CommandSuggestions(final Minecraft dbn, final Screen dgb, final EditBox ddc, final Font dch, final boolean boolean5, final boolean boolean6, final int integer7, final int integer8, final boolean boolean9, final int integer10) {
+    public CommandSuggestions(final Minecraft dlx, final Screen dqs, final EditBox dnp, final Font dmt, final boolean boolean5, final boolean boolean6, final int integer7, final int integer8, final boolean boolean9, final int integer10) {
         this.commandUsage = Lists.newArrayList();
-        this.minecraft = dbn;
-        this.screen = dgb;
-        this.input = ddc;
-        this.font = dch;
+        this.minecraft = dlx;
+        this.screen = dqs;
+        this.input = dnp;
+        this.font = dmt;
         this.commandsOnly = boolean5;
         this.onlyShowIfCursorPastError = boolean6;
         this.lineStartOffset = integer7;
         this.suggestionLineLimit = integer8;
         this.anchorToBottom = boolean9;
         this.fillColor = integer10;
-        ddc.setFormatter(this::formatChat);
+        dnp.setFormatter(this::formatChat);
     }
     
     public void setAllowSuggestions(final boolean boolean1) {
@@ -108,11 +111,29 @@ public class CommandSuggestions {
                 }
                 final int integer5 = Mth.clamp(this.input.getScreenX(suggestions3.getRange().getStart()), 0, this.input.getScreenX(0) + this.input.getInnerWidth() - integer4);
                 final int integer6 = this.anchorToBottom ? (this.screen.height - 12) : 72;
-                this.suggestions = new SuggestionsList(integer5, integer6, integer4, suggestions3, boolean1);
+                this.suggestions = new SuggestionsList(integer5, integer6, integer4, (List)this.sortSuggestions(suggestions3), boolean1);
             }
         }
     }
     
+    private List<Suggestion> sortSuggestions(final Suggestions suggestions) {
+        final String string3 = this.input.getValue().substring(0, this.input.getCursorPosition());
+        final int integer4 = getLastWordIndex(string3);
+        final String string4 = string3.substring(integer4).toLowerCase(Locale.ROOT);
+        final List<Suggestion> list6 = Lists.newArrayList();
+        final List<Suggestion> list7 = Lists.newArrayList();
+        for (final Suggestion suggestion9 : suggestions.getList()) {
+            if (suggestion9.getText().startsWith(string4) || suggestion9.getText().startsWith("minecraft:" + string4)) {
+                list6.add(suggestion9);
+            }
+            else {
+                list7.add(suggestion9);
+            }
+        }
+        list6.addAll(list7);
+        return list6;
+    }
+    
     public void updateCommandInfo() {
         final String string2 = this.input.getValue();
         if (this.currentParse != null && !this.currentParse.getReader().getString().equals(string2)) {
@@ -196,7 +217,7 @@ public class CommandSuggestions {
         }
     }
     
-    private void fillNodeUsage(final ChatFormatting g) {
+    private void fillNodeUsage(final ChatFormatting i) {
         final CommandContextBuilder<SharedSuggestionProvider> commandContextBuilder3 = (CommandContextBuilder<SharedSuggestionProvider>)this.currentParse.getContext();
         final SuggestionContext<SharedSuggestionProvider> suggestionContext4 = (SuggestionContext<SharedSuggestionProvider>)commandContextBuilder3.findSuggestionContext(this.input.getCursorPosition());
         final Map<CommandNode<SharedSuggestionProvider>, String> map5 = (Map<CommandNode<SharedSuggestionProvider>, String>)this.minecraft.player.connection.getCommands().getSmartUsage(suggestionContext4.parent, this.minecraft.player.connection.getSuggestionsProvider());
@@ -204,7 +225,7 @@ public class CommandSuggestions {
         int integer7 = 0;
         for (final Map.Entry<CommandNode<SharedSuggestionProvider>, String> entry9 : map5.entrySet()) {
             if (!(entry9.getKey() instanceof LiteralCommandNode)) {
-                list6.add(g + entry9.getValue());
+                list6.add(i + entry9.getValue());
                 integer7 = Math.max(integer7, this.font.width(entry9.getValue()));
             }
         }
@@ -269,17 +290,17 @@ public class CommandSuggestions {
         return stringBuilder6.toString();
     }
     
-    public void render(final int integer1, final int integer2) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3) {
         if (this.suggestions != null) {
-            this.suggestions.render(integer1, integer2);
+            this.suggestions.render(dhl, integer2, integer3);
         }
         else {
-            int integer3 = 0;
-            for (final String string6 : this.commandUsage) {
-                final int integer4 = this.anchorToBottom ? (this.screen.height - 14 - 13 - 12 * integer3) : (72 + 12 * integer3);
-                GuiComponent.fill(this.commandUsagePosition - 1, integer4, this.commandUsagePosition + this.commandUsageWidth + 1, integer4 + 12, this.fillColor);
-                this.font.drawShadow(string6, (float)this.commandUsagePosition, (float)(integer4 + 2), -1);
-                ++integer3;
+            int integer4 = 0;
+            for (final String string7 : this.commandUsage) {
+                final int integer5 = this.anchorToBottom ? (this.screen.height - 14 - 13 - 12 * integer4) : (72 + 12 * integer4);
+                GuiComponent.fill(dhl, this.commandUsagePosition - 1, integer5, this.commandUsagePosition + this.commandUsageWidth + 1, integer5 + 12, this.fillColor);
+                this.font.drawShadow(dhl, string7, (float)this.commandUsagePosition, (float)(integer5 + 2), -1);
+                ++integer4;
             }
         }
     }
@@ -297,69 +318,69 @@ public class CommandSuggestions {
     
     public class SuggestionsList {
         private final Rect2i rect;
-        private final Suggestions suggestions;
         private final String originalContents;
+        private final List<Suggestion> suggestionList;
         private int offset;
         private int current;
         private Vec2 lastMouse;
         private boolean tabCycles;
         private int lastNarratedEntry;
         
-        private SuggestionsList(final int integer2, final int integer3, final int integer4, final Suggestions suggestions, final boolean boolean6) {
+        private SuggestionsList(final int integer2, final int integer3, final int integer4, final List<Suggestion> list, final boolean boolean6) {
             this.lastMouse = Vec2.ZERO;
             final int integer5 = integer2 - 1;
-            final int integer6 = CommandSuggestions.this.anchorToBottom ? (integer3 - 3 - Math.min(suggestions.getList().size(), CommandSuggestions.this.suggestionLineLimit) * 12) : integer3;
-            this.rect = new Rect2i(integer5, integer6, integer4 + 1, Math.min(suggestions.getList().size(), CommandSuggestions.this.suggestionLineLimit) * 12);
-            this.suggestions = suggestions;
+            final int integer6 = CommandSuggestions.this.anchorToBottom ? (integer3 - 3 - Math.min(list.size(), CommandSuggestions.this.suggestionLineLimit) * 12) : integer3;
+            this.rect = new Rect2i(integer5, integer6, integer4 + 1, Math.min(list.size(), CommandSuggestions.this.suggestionLineLimit) * 12);
             this.originalContents = CommandSuggestions.this.input.getValue();
             this.lastNarratedEntry = (boolean6 ? -1 : 0);
+            this.suggestionList = list;
             this.select(0);
         }
         
-        public void render(final int integer1, final int integer2) {
-            final int integer3 = Math.min(this.suggestions.getList().size(), CommandSuggestions.this.suggestionLineLimit);
-            final int integer4 = -5592406;
-            final boolean boolean6 = this.offset > 0;
-            final boolean boolean7 = this.suggestions.getList().size() > this.offset + integer3;
-            final boolean boolean8 = boolean6 || boolean7;
-            final boolean boolean9 = this.lastMouse.x != integer1 || this.lastMouse.y != integer2;
-            if (boolean9) {
-                this.lastMouse = new Vec2((float)integer1, (float)integer2);
-            }
-            if (boolean8) {
-                GuiComponent.fill(this.rect.getX(), this.rect.getY() - 1, this.rect.getX() + this.rect.getWidth(), this.rect.getY(), CommandSuggestions.this.fillColor);
-                GuiComponent.fill(this.rect.getX(), this.rect.getY() + this.rect.getHeight(), this.rect.getX() + this.rect.getWidth(), this.rect.getY() + this.rect.getHeight() + 1, CommandSuggestions.this.fillColor);
-                if (boolean6) {
-                    for (int integer5 = 0; integer5 < this.rect.getWidth(); ++integer5) {
-                        if (integer5 % 2 == 0) {
-                            GuiComponent.fill(this.rect.getX() + integer5, this.rect.getY() - 1, this.rect.getX() + integer5 + 1, this.rect.getY(), -1);
-                        }
-                    }
-                }
-                if (boolean7) {
-                    for (int integer5 = 0; integer5 < this.rect.getWidth(); ++integer5) {
-                        if (integer5 % 2 == 0) {
-                            GuiComponent.fill(this.rect.getX() + integer5, this.rect.getY() + this.rect.getHeight(), this.rect.getX() + integer5 + 1, this.rect.getY() + this.rect.getHeight() + 1, -1);
-                        }
-                    }
-                }
-            }
-            boolean boolean10 = false;
-            for (int integer6 = 0; integer6 < integer3; ++integer6) {
-                final Suggestion suggestion12 = this.suggestions.getList().get(integer6 + this.offset);
-                GuiComponent.fill(this.rect.getX(), this.rect.getY() + 12 * integer6, this.rect.getX() + this.rect.getWidth(), this.rect.getY() + 12 * integer6 + 12, CommandSuggestions.this.fillColor);
-                if (integer1 > this.rect.getX() && integer1 < this.rect.getX() + this.rect.getWidth() && integer2 > this.rect.getY() + 12 * integer6 && integer2 < this.rect.getY() + 12 * integer6 + 12) {
-                    if (boolean9) {
-                        this.select(integer6 + this.offset);
-                    }
-                    boolean10 = true;
-                }
-                CommandSuggestions.this.font.drawShadow(suggestion12.getText(), (float)(this.rect.getX() + 1), (float)(this.rect.getY() + 2 + 12 * integer6), (integer6 + this.offset == this.current) ? -256 : -5592406);
-            }
+        public void render(final PoseStack dhl, final int integer2, final int integer3) {
+            final int integer4 = Math.min(this.suggestionList.size(), CommandSuggestions.this.suggestionLineLimit);
+            final int integer5 = -5592406;
+            final boolean boolean7 = this.offset > 0;
+            final boolean boolean8 = this.suggestionList.size() > this.offset + integer4;
+            final boolean boolean9 = boolean7 || boolean8;
+            final boolean boolean10 = this.lastMouse.x != integer2 || this.lastMouse.y != integer3;
             if (boolean10) {
-                final Message message11 = this.suggestions.getList().get(this.current).getTooltip();
-                if (message11 != null) {
-                    CommandSuggestions.this.screen.renderTooltip(ComponentUtils.fromMessage(message11).getColoredString(), integer1, integer2);
+                this.lastMouse = new Vec2((float)integer2, (float)integer3);
+            }
+            if (boolean9) {
+                GuiComponent.fill(dhl, this.rect.getX(), this.rect.getY() - 1, this.rect.getX() + this.rect.getWidth(), this.rect.getY(), CommandSuggestions.this.fillColor);
+                GuiComponent.fill(dhl, this.rect.getX(), this.rect.getY() + this.rect.getHeight(), this.rect.getX() + this.rect.getWidth(), this.rect.getY() + this.rect.getHeight() + 1, CommandSuggestions.this.fillColor);
+                if (boolean7) {
+                    for (int integer6 = 0; integer6 < this.rect.getWidth(); ++integer6) {
+                        if (integer6 % 2 == 0) {
+                            GuiComponent.fill(dhl, this.rect.getX() + integer6, this.rect.getY() - 1, this.rect.getX() + integer6 + 1, this.rect.getY(), -1);
+                        }
+                    }
+                }
+                if (boolean8) {
+                    for (int integer6 = 0; integer6 < this.rect.getWidth(); ++integer6) {
+                        if (integer6 % 2 == 0) {
+                            GuiComponent.fill(dhl, this.rect.getX() + integer6, this.rect.getY() + this.rect.getHeight(), this.rect.getX() + integer6 + 1, this.rect.getY() + this.rect.getHeight() + 1, -1);
+                        }
+                    }
+                }
+            }
+            boolean boolean11 = false;
+            for (int integer7 = 0; integer7 < integer4; ++integer7) {
+                final Suggestion suggestion13 = this.suggestionList.get(integer7 + this.offset);
+                GuiComponent.fill(dhl, this.rect.getX(), this.rect.getY() + 12 * integer7, this.rect.getX() + this.rect.getWidth(), this.rect.getY() + 12 * integer7 + 12, CommandSuggestions.this.fillColor);
+                if (integer2 > this.rect.getX() && integer2 < this.rect.getX() + this.rect.getWidth() && integer3 > this.rect.getY() + 12 * integer7 && integer3 < this.rect.getY() + 12 * integer7 + 12) {
+                    if (boolean10) {
+                        this.select(integer7 + this.offset);
+                    }
+                    boolean11 = true;
+                }
+                CommandSuggestions.this.font.drawShadow(dhl, suggestion13.getText(), (float)(this.rect.getX() + 1), (float)(this.rect.getY() + 2 + 12 * integer7), (integer7 + this.offset == this.current) ? -256 : -5592406);
+            }
+            if (boolean11) {
+                final Message message12 = this.suggestionList.get(this.current).getTooltip();
+                if (message12 != null) {
+                    CommandSuggestions.this.screen.renderTooltip(dhl, ComponentUtils.fromMessage(message12), integer2, integer3);
                 }
             }
         }
@@ -369,7 +390,7 @@ public class CommandSuggestions {
                 return false;
             }
             final int integer4 = (integer2 - this.rect.getY()) / 12 + this.offset;
-            if (integer4 >= 0 && integer4 < this.suggestions.getList().size()) {
+            if (integer4 >= 0 && integer4 < this.suggestionList.size()) {
                 this.select(integer4);
                 this.useSuggestion();
             }
@@ -380,7 +401,7 @@ public class CommandSuggestions {
             final int integer4 = (int)(CommandSuggestions.this.minecraft.mouseHandler.xpos() * CommandSuggestions.this.minecraft.getWindow().getGuiScaledWidth() / CommandSuggestions.this.minecraft.getWindow().getScreenWidth());
             final int integer5 = (int)(CommandSuggestions.this.minecraft.mouseHandler.ypos() * CommandSuggestions.this.minecraft.getWindow().getGuiScaledHeight() / CommandSuggestions.this.minecraft.getWindow().getScreenHeight());
             if (this.rect.contains(integer4, integer5)) {
-                this.offset = Mth.clamp((int)(this.offset - double1), 0, Math.max(this.suggestions.getList().size() - CommandSuggestions.this.suggestionLineLimit, 0));
+                this.offset = Mth.clamp((int)(this.offset - double1), 0, Math.max(this.suggestionList.size() - CommandSuggestions.this.suggestionLineLimit, 0));
                 return true;
             }
             return false;
@@ -416,22 +437,22 @@ public class CommandSuggestions {
             final int integer2 = this.offset;
             final int integer3 = this.offset + CommandSuggestions.this.suggestionLineLimit - 1;
             if (this.current < integer2) {
-                this.offset = Mth.clamp(this.current, 0, Math.max(this.suggestions.getList().size() - CommandSuggestions.this.suggestionLineLimit, 0));
+                this.offset = Mth.clamp(this.current, 0, Math.max(this.suggestionList.size() - CommandSuggestions.this.suggestionLineLimit, 0));
             }
             else if (this.current > integer3) {
-                this.offset = Mth.clamp(this.current + CommandSuggestions.this.lineStartOffset - CommandSuggestions.this.suggestionLineLimit, 0, Math.max(this.suggestions.getList().size() - CommandSuggestions.this.suggestionLineLimit, 0));
+                this.offset = Mth.clamp(this.current + CommandSuggestions.this.lineStartOffset - CommandSuggestions.this.suggestionLineLimit, 0, Math.max(this.suggestionList.size() - CommandSuggestions.this.suggestionLineLimit, 0));
             }
         }
         
         public void select(final int integer) {
             this.current = integer;
             if (this.current < 0) {
-                this.current += this.suggestions.getList().size();
+                this.current += this.suggestionList.size();
             }
-            if (this.current >= this.suggestions.getList().size()) {
-                this.current -= this.suggestions.getList().size();
+            if (this.current >= this.suggestionList.size()) {
+                this.current -= this.suggestionList.size();
             }
-            final Suggestion suggestion3 = this.suggestions.getList().get(this.current);
+            final Suggestion suggestion3 = this.suggestionList.get(this.current);
             CommandSuggestions.this.input.setSuggestion(calculateSuggestionSuffix(CommandSuggestions.this.input.getValue(), suggestion3.apply(this.originalContents)));
             if (NarratorChatListener.INSTANCE.isActive() && this.lastNarratedEntry != this.current) {
                 NarratorChatListener.INSTANCE.sayNow(this.getNarrationMessage());
@@ -439,7 +460,7 @@ public class CommandSuggestions {
         }
         
         public void useSuggestion() {
-            final Suggestion suggestion2 = this.suggestions.getList().get(this.current);
+            final Suggestion suggestion2 = this.suggestionList.get(this.current);
             CommandSuggestions.this.keepSuggestions = true;
             CommandSuggestions.this.input.setValue(suggestion2.apply(this.originalContents));
             final int integer3 = suggestion2.getRange().getStart() + suggestion2.getText().length();
@@ -452,13 +473,12 @@ public class CommandSuggestions {
         
         private String getNarrationMessage() {
             this.lastNarratedEntry = this.current;
-            final List<Suggestion> list2 = (List<Suggestion>)this.suggestions.getList();
-            final Suggestion suggestion3 = list2.get(this.current);
-            final Message message4 = suggestion3.getTooltip();
-            if (message4 != null) {
-                return I18n.get("narration.suggestion.tooltip", this.current + 1, list2.size(), suggestion3.getText(), message4.getString());
+            final Suggestion suggestion2 = this.suggestionList.get(this.current);
+            final Message message3 = suggestion2.getTooltip();
+            if (message3 != null) {
+                return I18n.get("narration.suggestion.tooltip", this.current + 1, this.suggestionList.size(), suggestion2.getText(), message3.getString());
             }
-            return I18n.get("narration.suggestion", this.current + 1, list2.size(), suggestion3.getText());
+            return I18n.get("narration.suggestion", this.current + 1, this.suggestionList.size(), suggestion2.getText());
         }
         
         public void hide() {
diff --git a/src/net/minecraft/client/gui/components/ComponentRenderUtils.java b/src/net/minecraft/client/gui/components/ComponentRenderUtils.java
index c6fd3e8..a490714 100644
--- a/src/net/minecraft/client/gui/components/ComponentRenderUtils.java
+++ b/src/net/minecraft/client/gui/components/ComponentRenderUtils.java
@@ -1,81 +1,36 @@
 package net.minecraft.client.gui.components;
 
 import com.google.common.collect.Lists;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.Style;
+import java.util.Optional;
+import net.minecraft.client.ComponentCollector;
 import java.util.List;
 import net.minecraft.client.gui.Font;
-import net.minecraft.network.chat.Component;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.FormattedText;
 
 public class ComponentRenderUtils {
-    public static String stripColor(final String string, final boolean boolean2) {
-        if (boolean2 || Minecraft.getInstance().options.chatColors) {
-            return string;
-        }
-        return ChatFormatting.stripFormatting(string);
+    private static final FormattedText INDENT;
+    
+    private static String stripColor(final String string) {
+        return Minecraft.getInstance().options.chatColors ? string : ChatFormatting.stripFormatting(string);
     }
     
-    public static List<Component> wrapComponents(final Component lf, final int integer, final Font dch, final boolean boolean4, final boolean boolean5) {
-        int integer2 = 0;
-        Component lf2 = new TextComponent("");
-        final List<Component> list8 = Lists.newArrayList();
-        final List<Component> list9 = Lists.newArrayList(lf);
-        for (int integer3 = 0; integer3 < list9.size(); ++integer3) {
-            final Component lf3 = list9.get(integer3);
-            String string12 = lf3.getContents();
-            boolean boolean6 = false;
-            if (string12.contains("\n")) {
-                final int integer4 = string12.indexOf(10);
-                final String string13 = string12.substring(integer4 + 1);
-                string12 = string12.substring(0, integer4 + 1);
-                final Component lf4 = new TextComponent(string13).setStyle(lf3.getStyle().copy());
-                list9.add(integer3 + 1, lf4);
-                boolean6 = true;
-            }
-            String string14 = stripColor(lf3.getStyle().getLegacyFormatCodes() + string12, boolean5);
-            final String string13 = string14.endsWith("\n") ? string14.substring(0, string14.length() - 1) : string14;
-            int integer5 = dch.width(string13);
-            Component lf5 = new TextComponent(string13).setStyle(lf3.getStyle().copy());
-            if (integer2 + integer5 > integer) {
-                String string15 = dch.substrByWidth(string14, integer - integer2, false);
-                String string16 = (string15.length() < string14.length()) ? string14.substring(string15.length()) : null;
-                if (string16 != null && !string16.isEmpty()) {
-                    int integer6 = (string16.charAt(0) != ' ') ? string15.lastIndexOf(32) : string15.length();
-                    if (integer6 >= 0 && dch.width(string14.substring(0, integer6)) > 0) {
-                        string15 = string14.substring(0, integer6);
-                        if (boolean4) {
-                            ++integer6;
-                        }
-                        string16 = string14.substring(integer6);
-                    }
-                    else if (integer2 > 0 && !string14.contains(" ")) {
-                        string15 = "";
-                        string16 = string14;
-                    }
-                    final Component lf6 = new TextComponent(string16).setStyle(lf3.getStyle().copy());
-                    list9.add(integer3 + 1, lf6);
-                }
-                string14 = string15;
-                integer5 = dch.width(string14);
-                lf5 = new TextComponent(string14);
-                lf5.setStyle(lf3.getStyle().copy());
-                boolean6 = true;
-            }
-            if (integer2 + integer5 <= integer) {
-                integer2 += integer5;
-                lf2.append(lf5);
-            }
-            else {
-                boolean6 = true;
-            }
-            if (boolean6) {
-                list8.add(lf2);
-                integer2 = 0;
-                lf2 = new TextComponent("");
-            }
+    public static List<FormattedText> wrapComponents(final FormattedText mu, final int integer, final Font dmt) {
+        final ComponentCollector dlm4 = new ComponentCollector();
+        mu.visit((nb, string) -> {
+            dlm4.append(FormattedText.of(stripColor(string), nb));
+            return Optional.empty();
+        }, Style.EMPTY);
+        final List<FormattedText> list5 = dmt.getSplitter().splitLines(dlm4.getResultOrEmpty(), integer, Style.EMPTY, ComponentRenderUtils.INDENT);
+        if (list5.isEmpty()) {
+            return Lists.<FormattedText>newArrayList(FormattedText.EMPTY);
         }
-        list8.add(lf2);
-        return list8;
+        return list5;
+    }
+    
+    static {
+        INDENT = FormattedText.of(" ");
     }
 }
diff --git a/src/net/minecraft/client/gui/components/ContainerObjectSelectionList.java b/src/net/minecraft/client/gui/components/ContainerObjectSelectionList.java
index b40aa66..7035168 100644
--- a/src/net/minecraft/client/gui/components/ContainerObjectSelectionList.java
+++ b/src/net/minecraft/client/gui/components/ContainerObjectSelectionList.java
@@ -6,8 +6,8 @@ import net.minecraft.client.gui.components.events.ContainerEventHandler;
 import net.minecraft.client.Minecraft;
 
 public abstract class ContainerObjectSelectionList<E extends Entry<E>> extends AbstractSelectionList<E> {
-    public ContainerObjectSelectionList(final Minecraft dbn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        super(dbn, integer2, integer3, integer4, integer5, integer6);
+    public ContainerObjectSelectionList(final Minecraft dlx, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        super(dlx, integer2, integer3, integer4, integer5, integer6);
     }
     
     @Override
@@ -40,8 +40,8 @@ public abstract class ContainerObjectSelectionList<E extends Entry<E>> extends A
         }
         
         @Override
-        public void setFocused(@Nullable final GuiEventListener dds) {
-            this.focused = dds;
+        public void setFocused(@Nullable final GuiEventListener dof) {
+            this.focused = dof;
         }
         
         @Nullable
diff --git a/src/net/minecraft/client/gui/components/DebugScreenOverlay.java b/src/net/minecraft/client/gui/components/DebugScreenOverlay.java
index 5e2ee5c..3229174 100644
--- a/src/net/minecraft/client/gui/components/DebugScreenOverlay.java
+++ b/src/net/minecraft/client/gui/components/DebugScreenOverlay.java
@@ -19,35 +19,41 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.ChatFormatting;
+import net.minecraft.world.phys.BlockHitResult;
 import com.mojang.blaze3d.platform.GlUtil;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import com.mojang.datafixers.DataFixUtils;
 import java.util.Optional;
 import net.minecraft.client.renderer.PostChain;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import net.minecraft.world.level.NaturalSpawner;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import net.minecraft.world.level.Level;
 import net.minecraft.core.Direction;
+import net.minecraft.core.BlockPos;
 import net.minecraft.network.Connection;
-import net.minecraft.world.phys.BlockHitResult;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.DifficultyInstance;
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.LightLayer;
 import net.minecraft.util.Mth;
 import java.util.Locale;
-import net.minecraft.world.level.dimension.DimensionType;
 import it.unimi.dsi.fastutil.longs.LongSets;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Objects;
 import com.google.common.collect.Lists;
 import net.minecraft.client.ClientBrandRetriever;
 import net.minecraft.SharedConstants;
-import net.minecraft.core.BlockPos;
 import java.util.List;
 import com.google.common.base.Strings;
 import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.world.entity.Entity;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.concurrent.CompletableFuture;
 import net.minecraft.world.level.chunk.LevelChunk;
 import javax.annotation.Nullable;
@@ -72,9 +78,9 @@ public class DebugScreenOverlay extends GuiComponent {
     @Nullable
     private CompletableFuture<LevelChunk> serverChunk;
     
-    public DebugScreenOverlay(final Minecraft dbn) {
-        this.minecraft = dbn;
-        this.font = dbn.font;
+    public DebugScreenOverlay(final Minecraft dlx) {
+        this.minecraft = dlx;
+        this.font = dlx.font;
     }
     
     public void clearChunkCache() {
@@ -82,82 +88,82 @@ public class DebugScreenOverlay extends GuiComponent {
         this.clientChunk = null;
     }
     
-    public void render() {
+    public void render(final PoseStack dhl) {
         this.minecraft.getProfiler().push("debug");
         RenderSystem.pushMatrix();
-        final Entity akq2 = this.minecraft.getCameraEntity();
-        this.block = akq2.pick(20.0, 0.0f, false);
-        this.liquid = akq2.pick(20.0, 0.0f, true);
-        this.drawGameInformation();
-        this.drawSystemInformation();
+        final Entity aom3 = this.minecraft.getCameraEntity();
+        this.block = aom3.pick(20.0, 0.0f, false);
+        this.liquid = aom3.pick(20.0, 0.0f, true);
+        this.drawGameInformation(dhl);
+        this.drawSystemInformation(dhl);
         RenderSystem.popMatrix();
         if (this.minecraft.options.renderFpsChart) {
-            final int integer3 = this.minecraft.getWindow().getGuiScaledWidth();
-            this.drawChart(this.minecraft.getFrameTimer(), 0, integer3 / 2, true);
-            final IntegratedServer edm4 = this.minecraft.getSingleplayerServer();
-            if (edm4 != null) {
-                this.drawChart(edm4.getFrameTimer(), integer3 - Math.min(integer3 / 2, 240), integer3 / 2, false);
+            final int integer4 = this.minecraft.getWindow().getGuiScaledWidth();
+            this.drawChart(dhl, this.minecraft.getFrameTimer(), 0, integer4 / 2, true);
+            final IntegratedServer eoz5 = this.minecraft.getSingleplayerServer();
+            if (eoz5 != null) {
+                this.drawChart(dhl, eoz5.getFrameTimer(), integer4 - Math.min(integer4 / 2, 240), integer4 / 2, false);
             }
         }
         this.minecraft.getProfiler().pop();
     }
     
-    protected void drawGameInformation() {
-        final List<String> list2 = this.getGameInformation();
-        list2.add("");
-        final boolean boolean3 = this.minecraft.getSingleplayerServer() != null;
-        list2.add("Debug: Pie [shift]: " + (this.minecraft.options.renderDebugCharts ? "visible" : "hidden") + (boolean3 ? " FPS + TPS" : " FPS") + " [alt]: " + (this.minecraft.options.renderFpsChart ? "visible" : "hidden"));
-        list2.add("For help: press F3 + Q");
-        for (int integer4 = 0; integer4 < list2.size(); ++integer4) {
-            final String string5 = list2.get(integer4);
-            if (!Strings.isNullOrEmpty(string5)) {
+    protected void drawGameInformation(final PoseStack dhl) {
+        final List<String> list3 = this.getGameInformation();
+        list3.add("");
+        final boolean boolean4 = this.minecraft.getSingleplayerServer() != null;
+        list3.add("Debug: Pie [shift]: " + (this.minecraft.options.renderDebugCharts ? "visible" : "hidden") + (boolean4 ? " FPS + TPS" : " FPS") + " [alt]: " + (this.minecraft.options.renderFpsChart ? "visible" : "hidden"));
+        list3.add("For help: press F3 + Q");
+        for (int integer5 = 0; integer5 < list3.size(); ++integer5) {
+            final String string6 = list3.get(integer5);
+            if (!Strings.isNullOrEmpty(string6)) {
                 this.font.getClass();
-                final int integer5 = 9;
-                final int integer6 = this.font.width(string5);
-                final int integer7 = 2;
-                final int integer8 = 2 + integer5 * integer4;
-                GuiComponent.fill(1, integer8 - 1, 2 + integer6 + 1, integer8 + integer5 - 1, -1873784752);
-                this.font.draw(string5, 2.0f, (float)integer8, 14737632);
+                final int integer6 = 9;
+                final int integer7 = this.font.width(string6);
+                final int integer8 = 2;
+                final int integer9 = 2 + integer6 * integer5;
+                GuiComponent.fill(dhl, 1, integer9 - 1, 2 + integer7 + 1, integer9 + integer6 - 1, -1873784752);
+                this.font.draw(dhl, string6, 2.0f, (float)integer9, 14737632);
             }
         }
     }
     
-    protected void drawSystemInformation() {
-        final List<String> list2 = this.getSystemInformation();
-        for (int integer3 = 0; integer3 < list2.size(); ++integer3) {
-            final String string4 = list2.get(integer3);
-            if (!Strings.isNullOrEmpty(string4)) {
+    protected void drawSystemInformation(final PoseStack dhl) {
+        final List<String> list3 = this.getSystemInformation();
+        for (int integer4 = 0; integer4 < list3.size(); ++integer4) {
+            final String string5 = list3.get(integer4);
+            if (!Strings.isNullOrEmpty(string5)) {
                 this.font.getClass();
-                final int integer4 = 9;
-                final int integer5 = this.font.width(string4);
-                final int integer6 = this.minecraft.getWindow().getGuiScaledWidth() - 2 - integer5;
-                final int integer7 = 2 + integer4 * integer3;
-                GuiComponent.fill(integer6 - 1, integer7 - 1, integer6 + integer5 + 1, integer7 + integer4 - 1, -1873784752);
-                this.font.draw(string4, (float)integer6, (float)integer7, 14737632);
+                final int integer5 = 9;
+                final int integer6 = this.font.width(string5);
+                final int integer7 = this.minecraft.getWindow().getGuiScaledWidth() - 2 - integer6;
+                final int integer8 = 2 + integer5 * integer4;
+                GuiComponent.fill(dhl, integer7 - 1, integer8 - 1, integer7 + integer6 + 1, integer8 + integer5 - 1, -1873784752);
+                this.font.draw(dhl, string5, (float)integer7, (float)integer8, 14737632);
             }
         }
     }
     
     protected List<String> getGameInformation() {
-        final IntegratedServer edm3 = this.minecraft.getSingleplayerServer();
-        final Connection kt4 = this.minecraft.getConnection().getConnection();
-        final float float5 = kt4.getAverageSentPackets();
-        final float float6 = kt4.getAverageReceivedPackets();
+        final IntegratedServer eoz3 = this.minecraft.getSingleplayerServer();
+        final Connection me4 = this.minecraft.getConnection().getConnection();
+        final float float5 = me4.getAverageSentPackets();
+        final float float6 = me4.getAverageReceivedPackets();
         String string2;
-        if (edm3 != null) {
-            string2 = String.format("Integrated server @ %.0f ms ticks, %.0f tx, %.0f rx", edm3.getAverageTickTime(), float5, float6);
+        if (eoz3 != null) {
+            string2 = String.format("Integrated server @ %.0f ms ticks, %.0f tx, %.0f rx", eoz3.getAverageTickTime(), float5, float6);
         }
         else {
             string2 = String.format("\"%s\" server, %.0f tx, %.0f rx", this.minecraft.player.getServerBrand(), float5, float6);
         }
-        final BlockPos fk7 = new BlockPos(this.minecraft.getCameraEntity());
+        final BlockPos fu7 = this.minecraft.getCameraEntity().blockPosition();
         if (this.minecraft.showOnlyReducedInfo()) {
-            return Lists.<String>newArrayList("Minecraft " + SharedConstants.getCurrentVersion().getName() + " (" + this.minecraft.getLaunchedVersion() + "/" + ClientBrandRetriever.getClientModName() + ")", this.minecraft.fpsString, string2, this.minecraft.levelRenderer.getChunkStatistics(), this.minecraft.levelRenderer.getEntityStatistics(), "P: " + this.minecraft.particleEngine.countParticles() + ". T: " + this.minecraft.level.getEntityCount(), this.minecraft.level.gatherChunkSourceStats(), "", String.format("Chunk-relative: %d %d %d", fk7.getX() & 0xF, fk7.getY() & 0xF, fk7.getZ() & 0xF));
+            return Lists.<String>newArrayList("Minecraft " + SharedConstants.getCurrentVersion().getName() + " (" + this.minecraft.getLaunchedVersion() + "/" + ClientBrandRetriever.getClientModName() + ")", this.minecraft.fpsString, string2, this.minecraft.levelRenderer.getChunkStatistics(), this.minecraft.levelRenderer.getEntityStatistics(), "P: " + this.minecraft.particleEngine.countParticles() + ". T: " + this.minecraft.level.getEntityCount(), this.minecraft.level.gatherChunkSourceStats(), "", String.format("Chunk-relative: %d %d %d", fu7.getX() & 0xF, fu7.getY() & 0xF, fu7.getZ() & 0xF));
         }
-        final Entity akq8 = this.minecraft.getCameraEntity();
-        final Direction fp9 = akq8.getDirection();
+        final Entity aom8 = this.minecraft.getCameraEntity();
+        final Direction fz9 = aom8.getDirection();
         String string3 = null;
-        switch (fp9) {
+        switch (fz9) {
             case NORTH: {
                 string3 = "Towards negative Z";
                 break;
@@ -179,39 +185,39 @@ public class DebugScreenOverlay extends GuiComponent {
                 break;
             }
         }
-        final ChunkPos bjh11 = new ChunkPos(fk7);
-        if (!Objects.equals(this.lastPos, bjh11)) {
-            this.lastPos = bjh11;
+        final ChunkPos bph11 = new ChunkPos(fu7);
+        if (!Objects.equals(this.lastPos, bph11)) {
+            this.lastPos = bph11;
             this.clearChunkCache();
         }
-        final Level bjw12 = this.getLevel();
-        final LongSet longSet13 = (bjw12 instanceof ServerLevel) ? ((ServerLevel)bjw12).getForcedChunks() : LongSets.EMPTY_SET;
+        final Level bqb12 = this.getLevel();
+        final LongSet longSet13 = (bqb12 instanceof ServerLevel) ? ((ServerLevel)bqb12).getForcedChunks() : LongSets.EMPTY_SET;
         final List<String> list14 = Lists.<String>newArrayList("Minecraft " + SharedConstants.getCurrentVersion().getName() + " (" + this.minecraft.getLaunchedVersion() + "/" + ClientBrandRetriever.getClientModName() + ("release".equalsIgnoreCase(this.minecraft.getVersionType()) ? "" : ("/" + this.minecraft.getVersionType())) + ")", this.minecraft.fpsString, string2, this.minecraft.levelRenderer.getChunkStatistics(), this.minecraft.levelRenderer.getEntityStatistics(), "P: " + this.minecraft.particleEngine.countParticles() + ". T: " + this.minecraft.level.getEntityCount(), this.minecraft.level.gatherChunkSourceStats());
         final String string4 = this.getServerChunkStats();
         if (string4 != null) {
             list14.add(string4);
         }
-        list14.add(DimensionType.getName(this.minecraft.level.dimension.getType()).toString() + " FC: " + Integer.toString(longSet13.size()));
+        list14.add(this.minecraft.level.dimension().location() + " FC: " + longSet13.size());
         list14.add("");
         list14.add(String.format(Locale.ROOT, "XYZ: %.3f / %.5f / %.3f", this.minecraft.getCameraEntity().getX(), this.minecraft.getCameraEntity().getY(), this.minecraft.getCameraEntity().getZ()));
-        list14.add(String.format("Block: %d %d %d", fk7.getX(), fk7.getY(), fk7.getZ()));
-        list14.add(String.format("Chunk: %d %d %d in %d %d %d", fk7.getX() & 0xF, fk7.getY() & 0xF, fk7.getZ() & 0xF, fk7.getX() >> 4, fk7.getY() >> 4, fk7.getZ() >> 4));
-        list14.add(String.format(Locale.ROOT, "Facing: %s (%s) (%.1f / %.1f)", fp9, string3, Mth.wrapDegrees(akq8.yRot), Mth.wrapDegrees(akq8.xRot)));
+        list14.add(String.format("Block: %d %d %d", fu7.getX(), fu7.getY(), fu7.getZ()));
+        list14.add(String.format("Chunk: %d %d %d in %d %d %d", fu7.getX() & 0xF, fu7.getY() & 0xF, fu7.getZ() & 0xF, fu7.getX() >> 4, fu7.getY() >> 4, fu7.getZ() >> 4));
+        list14.add(String.format(Locale.ROOT, "Facing: %s (%s) (%.1f / %.1f)", fz9, string3, Mth.wrapDegrees(aom8.yRot), Mth.wrapDegrees(aom8.xRot)));
         if (this.minecraft.level != null) {
-            if (this.minecraft.level.hasChunkAt(fk7)) {
-                final LevelChunk cal16 = this.getClientChunk();
-                if (cal16.isEmpty()) {
+            if (this.minecraft.level.hasChunkAt(fu7)) {
+                final LevelChunk chj16 = this.getClientChunk();
+                if (chj16.isEmpty()) {
                     list14.add("Waiting for chunk...");
                 }
                 else {
-                    final int integer17 = this.minecraft.level.getChunkSource().getLightEngine().getRawBrightness(fk7, 0);
-                    final int integer18 = this.minecraft.level.getBrightness(LightLayer.SKY, fk7);
-                    final int integer19 = this.minecraft.level.getBrightness(LightLayer.BLOCK, fk7);
+                    final int integer17 = this.minecraft.level.getChunkSource().getLightEngine().getRawBrightness(fu7, 0);
+                    final int integer18 = this.minecraft.level.getBrightness(LightLayer.SKY, fu7);
+                    final int integer19 = this.minecraft.level.getBrightness(LightLayer.BLOCK, fu7);
                     list14.add("Client Light: " + integer17 + " (" + integer18 + " sky, " + integer19 + " block)");
-                    final LevelChunk cal17 = this.getServerChunk();
-                    if (cal17 != null) {
-                        final LevelLightEngine coa21 = bjw12.getChunkSource().getLightEngine();
-                        list14.add("Server Light: (" + coa21.getLayerListener(LightLayer.SKY).getLightValue(fk7) + " sky, " + coa21.getLayerListener(LightLayer.BLOCK).getLightValue(fk7) + " block)");
+                    final LevelChunk chj17 = this.getServerChunk();
+                    if (chj17 != null) {
+                        final LevelLightEngine cwr21 = bqb12.getChunkSource().getLightEngine();
+                        list14.add("Server Light: (" + cwr21.getLayerListener(LightLayer.SKY).getLightValue(fu7) + " sky, " + cwr21.getLayerListener(LightLayer.BLOCK).getLightValue(fu7) + " block)");
                     }
                     else {
                         list14.add("Server Light: (?? sky, ?? block)");
@@ -219,7 +225,7 @@ public class DebugScreenOverlay extends GuiComponent {
                     final StringBuilder stringBuilder21 = new StringBuilder("CH");
                     for (final Heightmap.Types a25 : Heightmap.Types.values()) {
                         if (a25.sendToClient()) {
-                            stringBuilder21.append(" ").append(DebugScreenOverlay.HEIGHTMAP_NAMES.get(a25)).append(": ").append(cal16.getHeight(a25, fk7.getX(), fk7.getZ()));
+                            stringBuilder21.append(" ").append(DebugScreenOverlay.HEIGHTMAP_NAMES.get(a25)).append(": ").append(chj16.getHeight(a25, fu7.getX(), fu7.getZ()));
                         }
                     }
                     list14.add(stringBuilder21.toString());
@@ -228,8 +234,8 @@ public class DebugScreenOverlay extends GuiComponent {
                     for (final Heightmap.Types a25 : Heightmap.Types.values()) {
                         if (a25.keepAfterWorldgen()) {
                             stringBuilder21.append(" ").append(DebugScreenOverlay.HEIGHTMAP_NAMES.get(a25)).append(": ");
-                            if (cal17 != null) {
-                                stringBuilder21.append(cal17.getHeight(a25, fk7.getX(), fk7.getZ()));
+                            if (chj17 != null) {
+                                stringBuilder21.append(chj17.getHeight(a25, fu7.getX(), fu7.getZ()));
                             }
                             else {
                                 stringBuilder21.append("??");
@@ -237,16 +243,16 @@ public class DebugScreenOverlay extends GuiComponent {
                         }
                     }
                     list14.add(stringBuilder21.toString());
-                    if (fk7.getY() >= 0 && fk7.getY() < 256) {
-                        list14.add("Biome: " + Registry.BIOME.getKey(this.minecraft.level.getBiome(fk7)));
+                    if (fu7.getY() >= 0 && fu7.getY() < 256) {
+                        list14.add("Biome: " + Registry.BIOME.getKey(this.minecraft.level.getBiome(fu7)));
                         long long22 = 0L;
                         float float7 = 0.0f;
-                        if (cal17 != null) {
-                            float7 = bjw12.getMoonBrightness();
-                            long22 = cal17.getInhabitedTime();
+                        if (chj17 != null) {
+                            float7 = bqb12.getMoonBrightness();
+                            long22 = chj17.getInhabitedTime();
                         }
-                        final DifficultyInstance ajj25 = new DifficultyInstance(bjw12.getDifficulty(), bjw12.getDayTime(), long22, float7);
-                        list14.add(String.format(Locale.ROOT, "Local Difficulty: %.2f // %.2f (Day %d)", ajj25.getEffectiveDifficulty(), ajj25.getSpecialMultiplier(), this.minecraft.level.getDayTime() / 24000L));
+                        final DifficultyInstance ane25 = new DifficultyInstance(bqb12.getDifficulty(), bqb12.getDayTime(), long22, float7);
+                        list14.add(String.format(Locale.ROOT, "Local Difficulty: %.2f // %.2f (Day %d)", ane25.getEffectiveDifficulty(), ane25.getSpecialMultiplier(), this.minecraft.level.getDayTime() / 24000L));
                     }
                 }
             }
@@ -257,47 +263,54 @@ public class DebugScreenOverlay extends GuiComponent {
         else {
             list14.add("Outside of world...");
         }
-        final PostChain dqw16 = this.minecraft.gameRenderer.currentEffect();
-        if (dqw16 != null) {
-            list14.add("Shader: " + dqw16.getName());
+        final ServerLevel zd16 = this.getServerLevel();
+        if (zd16 != null) {
+            final NaturalSpawner.SpawnState d17 = zd16.getChunkSource().getLastSpawnState();
+            if (d17 != null) {
+                final Object2IntMap<MobCategory> object2IntMap18 = d17.getMobCategoryCounts();
+                final int integer19 = d17.getSpawnableChunkCount();
+                list14.add("SC: " + integer19 + ", " + Stream.<MobCategory>of(MobCategory.values()).map(apa -> Character.toUpperCase(apa.getName().charAt(0)) + ": " + object2IntMap18.getInt(apa)).collect(Collectors.joining(", ")));
+            }
+            else {
+                list14.add("SC: N/A");
+            }
         }
-        if (this.block.getType() == HitResult.Type.BLOCK) {
-            final BlockPos fk8 = ((BlockHitResult)this.block).getBlockPos();
-            list14.add(String.format("Looking at block: %d %d %d", fk8.getX(), fk8.getY(), fk8.getZ()));
+        final PostChain ecc17 = this.minecraft.gameRenderer.currentEffect();
+        if (ecc17 != null) {
+            list14.add("Shader: " + ecc17.getName());
         }
-        if (this.liquid.getType() == HitResult.Type.BLOCK) {
-            final BlockPos fk8 = ((BlockHitResult)this.liquid).getBlockPos();
-            list14.add(String.format("Looking at liquid: %d %d %d", fk8.getX(), fk8.getY(), fk8.getZ()));
-        }
-        list14.add(this.minecraft.getSoundManager().getDebugString());
+        list14.add(this.minecraft.getSoundManager().getDebugString() + String.format(" (Mood %d%%)", Math.round(this.minecraft.player.getCurrentMood() * 100.0f)));
         return list14;
     }
     
+    @Nullable
+    private ServerLevel getServerLevel() {
+        final IntegratedServer eoz2 = this.minecraft.getSingleplayerServer();
+        if (eoz2 != null) {
+            return eoz2.getLevel(this.minecraft.level.dimension());
+        }
+        return null;
+    }
+    
     @Nullable
     private String getServerChunkStats() {
-        final IntegratedServer edm2 = this.minecraft.getSingleplayerServer();
-        if (edm2 != null) {
-            final ServerLevel xd3 = edm2.getLevel(this.minecraft.level.getDimension().getType());
-            if (xd3 != null) {
-                return xd3.gatherChunkSourceStats();
-            }
+        final ServerLevel zd2 = this.getServerLevel();
+        if (zd2 != null) {
+            return zd2.gatherChunkSourceStats();
         }
         return null;
     }
     
     private Level getLevel() {
-        return (Level)DataFixUtils.orElse((Optional)Optional.<IntegratedServer>ofNullable(this.minecraft.getSingleplayerServer()).map(edm -> edm.getLevel(this.minecraft.level.dimension.getType())), this.minecraft.level);
+        return (Level)DataFixUtils.orElse((Optional)Optional.<IntegratedServer>ofNullable(this.minecraft.getSingleplayerServer()).flatMap(eoz -> Optional.<ServerLevel>ofNullable(eoz.getLevel(this.minecraft.level.dimension()))), this.minecraft.level);
     }
     
     @Nullable
     private LevelChunk getServerChunk() {
         if (this.serverChunk == null) {
-            final IntegratedServer edm2 = this.minecraft.getSingleplayerServer();
-            if (edm2 != null) {
-                final ServerLevel xd3 = edm2.getLevel(this.minecraft.level.dimension.getType());
-                if (xd3 != null) {
-                    this.serverChunk = xd3.getChunkSource().getChunkFuture(this.lastPos.x, this.lastPos.z, ChunkStatus.FULL, false).<LevelChunk>thenApply(either -> (LevelChunk)either.map(bzy -> bzy, a -> null));
-                }
+            final ServerLevel zd2 = this.getServerLevel();
+            if (zd2 != null) {
+                this.serverChunk = zd2.getChunkSource().getChunkFuture(this.lastPos.x, this.lastPos.z, ChunkStatus.FULL, false).<LevelChunk>thenApply(either -> (LevelChunk)either.map(cgy -> cgy, a -> null));
             }
             if (this.serverChunk == null) {
                 this.serverChunk = CompletableFuture.<LevelChunk>completedFuture(this.getClientChunk());
@@ -323,139 +336,139 @@ public class DebugScreenOverlay extends GuiComponent {
             return list10;
         }
         if (this.block.getType() == HitResult.Type.BLOCK) {
-            final BlockPos fk11 = ((BlockHitResult)this.block).getBlockPos();
-            final BlockState byj12 = this.minecraft.level.getBlockState(fk11);
+            final BlockPos fu11 = ((BlockHitResult)this.block).getBlockPos();
+            final BlockState cfj12 = this.minecraft.level.getBlockState(fu11);
             list10.add("");
-            list10.add(ChatFormatting.UNDERLINE + "Targeted Block");
-            list10.add(String.valueOf(Registry.BLOCK.getKey(byj12.getBlock())));
-            for (final Map.Entry<Property<?>, Comparable<?>> entry14 : byj12.getValues().entrySet()) {
+            list10.add(ChatFormatting.UNDERLINE + "Targeted Block: " + fu11.getX() + ", " + fu11.getY() + ", " + fu11.getZ());
+            list10.add(String.valueOf(Registry.BLOCK.getKey(cfj12.getBlock())));
+            for (final Map.Entry<Property<?>, Comparable<?>> entry14 : cfj12.getValues().entrySet()) {
                 list10.add(this.getPropertyValueString(entry14));
             }
-            for (final ResourceLocation sm14 : this.minecraft.getConnection().getTags().getBlocks().getMatchingTags(byj12.getBlock())) {
-                list10.add("#" + sm14);
+            for (final ResourceLocation uh14 : this.minecraft.getConnection().getTags().getBlocks().getMatchingTags(cfj12.getBlock())) {
+                list10.add("#" + uh14);
             }
         }
         if (this.liquid.getType() == HitResult.Type.BLOCK) {
-            final BlockPos fk11 = ((BlockHitResult)this.liquid).getBlockPos();
-            final FluidState coj12 = this.minecraft.level.getFluidState(fk11);
+            final BlockPos fu11 = ((BlockHitResult)this.liquid).getBlockPos();
+            final FluidState cxa12 = this.minecraft.level.getFluidState(fu11);
             list10.add("");
-            list10.add(ChatFormatting.UNDERLINE + "Targeted Fluid");
-            list10.add(String.valueOf(Registry.FLUID.getKey(coj12.getType())));
-            for (final Map.Entry<Property<?>, Comparable<?>> entry14 : coj12.getValues().entrySet()) {
+            list10.add(ChatFormatting.UNDERLINE + "Targeted Fluid: " + fu11.getX() + ", " + fu11.getY() + ", " + fu11.getZ());
+            list10.add(String.valueOf(Registry.FLUID.getKey(cxa12.getType())));
+            for (final Map.Entry<Property<?>, Comparable<?>> entry14 : cxa12.getValues().entrySet()) {
                 list10.add(this.getPropertyValueString(entry14));
             }
-            for (final ResourceLocation sm14 : this.minecraft.getConnection().getTags().getFluids().getMatchingTags(coj12.getType())) {
-                list10.add("#" + sm14);
+            for (final ResourceLocation uh14 : this.minecraft.getConnection().getTags().getFluids().getMatchingTags(cxa12.getType())) {
+                list10.add("#" + uh14);
             }
         }
-        final Entity akq11 = this.minecraft.crosshairPickEntity;
-        if (akq11 != null) {
+        final Entity aom11 = this.minecraft.crosshairPickEntity;
+        if (aom11 != null) {
             list10.add("");
             list10.add(ChatFormatting.UNDERLINE + "Targeted Entity");
-            list10.add(String.valueOf(Registry.ENTITY_TYPE.getKey(akq11.getType())));
+            list10.add(String.valueOf(Registry.ENTITY_TYPE.getKey(aom11.getType())));
         }
         return list10;
     }
     
     private String getPropertyValueString(final Map.Entry<Property<?>, Comparable<?>> entry) {
-        final Property<?> bzm3 = entry.getKey();
+        final Property<?> cgl3 = entry.getKey();
         final Comparable<?> comparable4 = entry.getValue();
-        String string5 = Util.getPropertyName(bzm3, comparable4);
+        String string5 = Util.getPropertyName(cgl3, comparable4);
         if (Boolean.TRUE.equals(comparable4)) {
             string5 = ChatFormatting.GREEN + string5;
         }
         else if (Boolean.FALSE.equals(comparable4)) {
             string5 = ChatFormatting.RED + string5;
         }
-        return bzm3.getName() + ": " + string5;
+        return cgl3.getName() + ": " + string5;
     }
     
-    private void drawChart(final FrameTimer abj, final int integer2, final int integer3, final boolean boolean4) {
+    private void drawChart(final PoseStack dhl, final FrameTimer ads, final int integer3, final int integer4, final boolean boolean5) {
         RenderSystem.disableDepthTest();
-        final int integer4 = abj.getLogStart();
-        final int integer5 = abj.getLogEnd();
-        final long[] arr8 = abj.getLog();
-        int integer6 = integer4;
-        int integer7 = integer2;
-        final int integer8 = Math.max(0, arr8.length - integer3);
-        final int integer9 = arr8.length - integer8;
-        integer6 = abj.wrapIndex(integer6 + integer8);
-        long long13 = 0L;
-        int integer10 = Integer.MAX_VALUE;
-        int integer11 = Integer.MIN_VALUE;
-        for (int integer12 = 0; integer12 < integer9; ++integer12) {
-            final int integer13 = (int)(arr8[abj.wrapIndex(integer6 + integer12)] / 1000000L);
-            integer10 = Math.min(integer10, integer13);
-            integer11 = Math.max(integer11, integer13);
-            long13 += integer13;
+        final int integer5 = ads.getLogStart();
+        final int integer6 = ads.getLogEnd();
+        final long[] arr9 = ads.getLog();
+        int integer7 = integer5;
+        int integer8 = integer3;
+        final int integer9 = Math.max(0, arr9.length - integer4);
+        final int integer10 = arr9.length - integer9;
+        integer7 = ads.wrapIndex(integer7 + integer9);
+        long long14 = 0L;
+        int integer11 = Integer.MAX_VALUE;
+        int integer12 = Integer.MIN_VALUE;
+        for (int integer13 = 0; integer13 < integer10; ++integer13) {
+            final int integer14 = (int)(arr9[ads.wrapIndex(integer7 + integer13)] / 1000000L);
+            integer11 = Math.min(integer11, integer14);
+            integer12 = Math.max(integer12, integer14);
+            long14 += integer14;
         }
-        int integer12 = this.minecraft.getWindow().getGuiScaledHeight();
-        GuiComponent.fill(integer2, integer12 - 60, integer2 + integer9, integer12, -1873784752);
-        final BufferBuilder cyg18 = Tesselator.getInstance().getBuilder();
+        int integer13 = this.minecraft.getWindow().getGuiScaledHeight();
+        GuiComponent.fill(dhl, integer3, integer13 - 60, integer3 + integer10, integer13, -1873784752);
+        final BufferBuilder dhg19 = Tesselator.getInstance().getBuilder();
         RenderSystem.enableBlend();
         RenderSystem.disableTexture();
         RenderSystem.defaultBlendFunc();
-        cyg18.begin(7, DefaultVertexFormat.POSITION_COLOR);
-        final Matrix4f b19 = Transformation.identity().getMatrix();
-        while (integer6 != integer5) {
-            final int integer14 = abj.scaleSampleTo(arr8[integer6], boolean4 ? 30 : 60, boolean4 ? 60 : 20);
-            final int integer15 = boolean4 ? 100 : 60;
-            final int integer16 = this.getSampleColor(Mth.clamp(integer14, 0, integer15), 0, integer15 / 2, integer15);
-            final int integer17 = integer16 >> 24 & 0xFF;
-            final int integer18 = integer16 >> 16 & 0xFF;
-            final int integer19 = integer16 >> 8 & 0xFF;
-            final int integer20 = integer16 & 0xFF;
-            cyg18.vertex(b19, (float)(integer7 + 1), (float)integer12, 0.0f).color(integer18, integer19, integer20, integer17).endVertex();
-            cyg18.vertex(b19, (float)integer7, (float)integer12, 0.0f).color(integer18, integer19, integer20, integer17).endVertex();
-            cyg18.vertex(b19, (float)integer7, (float)(integer12 - integer14 + 1), 0.0f).color(integer18, integer19, integer20, integer17).endVertex();
-            cyg18.vertex(b19, (float)(integer7 + 1), (float)(integer12 - integer14 + 1), 0.0f).color(integer18, integer19, integer20, integer17).endVertex();
-            ++integer7;
-            integer6 = abj.wrapIndex(integer6 + 1);
+        dhg19.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        final Matrix4f b20 = Transformation.identity().getMatrix();
+        while (integer7 != integer6) {
+            final int integer15 = ads.scaleSampleTo(arr9[integer7], boolean5 ? 30 : 60, boolean5 ? 60 : 20);
+            final int integer16 = boolean5 ? 100 : 60;
+            final int integer17 = this.getSampleColor(Mth.clamp(integer15, 0, integer16), 0, integer16 / 2, integer16);
+            final int integer18 = integer17 >> 24 & 0xFF;
+            final int integer19 = integer17 >> 16 & 0xFF;
+            final int integer20 = integer17 >> 8 & 0xFF;
+            final int integer21 = integer17 & 0xFF;
+            dhg19.vertex(b20, (float)(integer8 + 1), (float)integer13, 0.0f).color(integer19, integer20, integer21, integer18).endVertex();
+            dhg19.vertex(b20, (float)(integer8 + 1), (float)(integer13 - integer15 + 1), 0.0f).color(integer19, integer20, integer21, integer18).endVertex();
+            dhg19.vertex(b20, (float)integer8, (float)(integer13 - integer15 + 1), 0.0f).color(integer19, integer20, integer21, integer18).endVertex();
+            dhg19.vertex(b20, (float)integer8, (float)integer13, 0.0f).color(integer19, integer20, integer21, integer18).endVertex();
+            ++integer8;
+            integer7 = ads.wrapIndex(integer7 + 1);
         }
-        cyg18.end();
-        BufferUploader.end(cyg18);
+        dhg19.end();
+        BufferUploader.end(dhg19);
         RenderSystem.enableTexture();
         RenderSystem.disableBlend();
-        if (boolean4) {
-            GuiComponent.fill(integer2 + 1, integer12 - 30 + 1, integer2 + 14, integer12 - 30 + 10, -1873784752);
-            this.font.draw("60 FPS", (float)(integer2 + 2), (float)(integer12 - 30 + 2), 14737632);
-            this.hLine(integer2, integer2 + integer9 - 1, integer12 - 30, -1);
-            GuiComponent.fill(integer2 + 1, integer12 - 60 + 1, integer2 + 14, integer12 - 60 + 10, -1873784752);
-            this.font.draw("30 FPS", (float)(integer2 + 2), (float)(integer12 - 60 + 2), 14737632);
-            this.hLine(integer2, integer2 + integer9 - 1, integer12 - 60, -1);
+        if (boolean5) {
+            GuiComponent.fill(dhl, integer3 + 1, integer13 - 30 + 1, integer3 + 14, integer13 - 30 + 10, -1873784752);
+            this.font.draw(dhl, "60 FPS", (float)(integer3 + 2), (float)(integer13 - 30 + 2), 14737632);
+            this.hLine(dhl, integer3, integer3 + integer10 - 1, integer13 - 30, -1);
+            GuiComponent.fill(dhl, integer3 + 1, integer13 - 60 + 1, integer3 + 14, integer13 - 60 + 10, -1873784752);
+            this.font.draw(dhl, "30 FPS", (float)(integer3 + 2), (float)(integer13 - 60 + 2), 14737632);
+            this.hLine(dhl, integer3, integer3 + integer10 - 1, integer13 - 60, -1);
         }
         else {
-            GuiComponent.fill(integer2 + 1, integer12 - 60 + 1, integer2 + 14, integer12 - 60 + 10, -1873784752);
-            this.font.draw("20 TPS", (float)(integer2 + 2), (float)(integer12 - 60 + 2), 14737632);
-            this.hLine(integer2, integer2 + integer9 - 1, integer12 - 60, -1);
+            GuiComponent.fill(dhl, integer3 + 1, integer13 - 60 + 1, integer3 + 14, integer13 - 60 + 10, -1873784752);
+            this.font.draw(dhl, "20 TPS", (float)(integer3 + 2), (float)(integer13 - 60 + 2), 14737632);
+            this.hLine(dhl, integer3, integer3 + integer10 - 1, integer13 - 60, -1);
         }
-        this.hLine(integer2, integer2 + integer9 - 1, integer12 - 1, -1);
-        this.vLine(integer2, integer12 - 60, integer12, -1);
-        this.vLine(integer2 + integer9 - 1, integer12 - 60, integer12, -1);
-        if (boolean4 && this.minecraft.options.framerateLimit > 0 && this.minecraft.options.framerateLimit <= 250) {
-            this.hLine(integer2, integer2 + integer9 - 1, integer12 - 1 - (int)(1800.0 / this.minecraft.options.framerateLimit), -16711681);
+        this.hLine(dhl, integer3, integer3 + integer10 - 1, integer13 - 1, -1);
+        this.vLine(dhl, integer3, integer13 - 60, integer13, -1);
+        this.vLine(dhl, integer3 + integer10 - 1, integer13 - 60, integer13, -1);
+        if (boolean5 && this.minecraft.options.framerateLimit > 0 && this.minecraft.options.framerateLimit <= 250) {
+            this.hLine(dhl, integer3, integer3 + integer10 - 1, integer13 - 1 - (int)(1800.0 / this.minecraft.options.framerateLimit), -16711681);
         }
-        final String string20 = integer10 + " ms min";
-        final String string21 = long13 / integer9 + " ms avg";
-        final String string22 = integer11 + " ms max";
+        final String string21 = integer11 + " ms min";
+        final String string22 = long14 / integer10 + " ms avg";
+        final String string23 = integer12 + " ms max";
         final Font font = this.font;
-        final String string23 = string20;
-        final float float2 = (float)(integer2 + 2);
-        final int n = integer12 - 60;
-        this.font.getClass();
-        font.drawShadow(string23, float2, (float)(n - 9), 14737632);
-        final Font font2 = this.font;
         final String string24 = string21;
-        final float float3 = (float)(integer2 + integer9 / 2 - this.font.width(string21) / 2);
-        final int n2 = integer12 - 60;
+        final float float3 = (float)(integer3 + 2);
+        final int n = integer13 - 60;
         this.font.getClass();
-        font2.drawShadow(string24, float3, (float)(n2 - 9), 14737632);
-        final Font font3 = this.font;
+        font.drawShadow(dhl, string24, float3, (float)(n - 9), 14737632);
+        final Font font2 = this.font;
         final String string25 = string22;
-        final float float4 = (float)(integer2 + integer9 - this.font.width(string22));
-        final int n3 = integer12 - 60;
+        final float float4 = (float)(integer3 + integer10 / 2 - this.font.width(string22) / 2);
+        final int n2 = integer13 - 60;
         this.font.getClass();
-        font3.drawShadow(string25, float4, (float)(n3 - 9), 14737632);
+        font2.drawShadow(dhl, string25, float4, (float)(n2 - 9), 14737632);
+        final Font font3 = this.font;
+        final String string26 = string23;
+        final float float5 = (float)(integer3 + integer10 - this.font.width(string23));
+        final int n3 = integer13 - 60;
+        this.font.getClass();
+        font3.drawShadow(dhl, string26, float5, (float)(n3 - 9), 14737632);
         RenderSystem.enableDepthTest();
     }
     
diff --git a/src/net/minecraft/client/gui/components/EditBox.java b/src/net/minecraft/client/gui/components/EditBox.java
index 3fac9c9..21ad4ec 100644
--- a/src/net/minecraft/client/gui/components/EditBox.java
+++ b/src/net/minecraft/client/gui/components/EditBox.java
@@ -6,14 +6,17 @@ import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.Tesselator;
 import net.minecraft.client.gui.GuiComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Mth;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.Util;
 import net.minecraft.SharedConstants;
-import net.minecraft.client.resources.language.I18n;
-import com.google.common.base.Predicates;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.MutableComponent;
+import java.util.Objects;
 import javax.annotation.Nullable;
+import net.minecraft.network.chat.Component;
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
 import java.util.function.Consumer;
@@ -39,12 +42,12 @@ public class EditBox extends AbstractWidget implements Widget, GuiEventListener
     private Predicate<String> filter;
     private BiFunction<String, Integer, String> formatter;
     
-    public EditBox(final Font dch, final int integer2, final int integer3, final int integer4, final int integer5, final String string) {
-        this(dch, integer2, integer3, integer4, integer5, null, string);
+    public EditBox(final Font dmt, final int integer2, final int integer3, final int integer4, final int integer5, final Component mr) {
+        this(dmt, integer2, integer3, integer4, integer5, null, mr);
     }
     
-    public EditBox(final Font dch, final int integer2, final int integer3, final int integer4, final int integer5, @Nullable final EditBox ddc, final String string) {
-        super(integer2, integer3, integer4, integer5, string);
+    public EditBox(final Font dmt, final int integer2, final int integer3, final int integer4, final int integer5, @Nullable final EditBox dnp, final Component mr) {
+        super(integer2, integer3, integer4, integer5, mr);
         this.value = "";
         this.maxLength = 32;
         this.bordered = true;
@@ -52,11 +55,11 @@ public class EditBox extends AbstractWidget implements Widget, GuiEventListener
         this.isEditable = true;
         this.textColor = 14737632;
         this.textColorUneditable = 7368816;
-        this.filter = Predicates.alwaysTrue();
+        this.filter = Objects::nonNull;
         this.formatter = (BiFunction<String, Integer, String>)((string, integer) -> string);
-        this.font = dch;
-        if (ddc != null) {
-            this.setValue(ddc.getValue());
+        this.font = dmt;
+        if (dnp != null) {
+            this.setValue(dnp.getValue());
         }
     }
     
@@ -73,12 +76,9 @@ public class EditBox extends AbstractWidget implements Widget, GuiEventListener
     }
     
     @Override
-    protected String getNarrationMessage() {
-        final String string2 = this.getMessage();
-        if (string2.isEmpty()) {
-            return "";
-        }
-        return I18n.get("gui.narrate.editBox", string2, this.value);
+    protected MutableComponent createNarrationMessage() {
+        final Component mr2 = this.getMessage();
+        return new TranslatableComponent("gui.narrate.editBox", new Object[] { mr2, this.value });
     }
     
     public void setValue(final String string) {
@@ -111,31 +111,21 @@ public class EditBox extends AbstractWidget implements Widget, GuiEventListener
     }
     
     public void insertText(final String string) {
-        String string2 = "";
-        final String string3 = SharedConstants.filterText(string);
-        final int integer5 = (this.cursorPos < this.highlightPos) ? this.cursorPos : this.highlightPos;
-        final int integer6 = (this.cursorPos < this.highlightPos) ? this.highlightPos : this.cursorPos;
-        final int integer7 = this.maxLength - this.value.length() - (integer5 - integer6);
-        if (!this.value.isEmpty()) {
-            string2 += this.value.substring(0, integer5);
+        final int integer3 = (this.cursorPos < this.highlightPos) ? this.cursorPos : this.highlightPos;
+        final int integer4 = (this.cursorPos < this.highlightPos) ? this.highlightPos : this.cursorPos;
+        final int integer5 = this.maxLength - this.value.length() - (integer3 - integer4);
+        String string2 = SharedConstants.filterText(string);
+        int integer6 = string2.length();
+        if (integer5 < integer6) {
+            string2 = string2.substring(0, integer5);
+            integer6 = integer5;
         }
-        int integer8;
-        if (integer7 < string3.length()) {
-            string2 += string3.substring(0, integer7);
-            integer8 = integer7;
-        }
-        else {
-            string2 += string3;
-            integer8 = string3.length();
-        }
-        if (!this.value.isEmpty() && integer6 < this.value.length()) {
-            string2 += this.value.substring(integer6);
-        }
-        if (!this.filter.test(string2)) {
+        final String string3 = new StringBuilder(this.value).replace(integer3, integer4, string2).toString();
+        if (!this.filter.test(string3)) {
             return;
         }
-        this.value = string2;
-        this.setCursorPosition(integer5 + integer8);
+        this.value = string3;
+        this.setCursorPosition(integer3 + integer6);
         this.setHighlightPos(this.cursorPos);
         this.onValueChange(this.value);
     }
@@ -175,24 +165,18 @@ public class EditBox extends AbstractWidget implements Widget, GuiEventListener
             this.insertText("");
             return;
         }
-        final boolean boolean3 = integer < 0;
-        final int integer2 = boolean3 ? (this.cursorPos + integer) : this.cursorPos;
-        final int integer3 = boolean3 ? this.cursorPos : (this.cursorPos + integer);
-        String string6 = "";
-        if (integer2 >= 0) {
-            string6 = this.value.substring(0, integer2);
-        }
-        if (integer3 < this.value.length()) {
-            string6 += this.value.substring(integer3);
+        final int integer2 = this.getCursorPos(integer);
+        final int integer3 = Math.min(integer2, this.cursorPos);
+        final int integer4 = Math.max(integer2, this.cursorPos);
+        if (integer3 == integer4) {
+            return;
         }
+        final String string6 = new StringBuilder(this.value).delete(integer3, integer4).toString();
         if (!this.filter.test(string6)) {
             return;
         }
         this.value = string6;
-        if (boolean3) {
-            this.moveCursor(integer);
-        }
-        this.onValueChange(this.value);
+        this.moveCursorTo(integer3);
     }
     
     public int getWordPosition(final int integer) {
@@ -232,7 +216,11 @@ public class EditBox extends AbstractWidget implements Widget, GuiEventListener
     }
     
     public void moveCursor(final int integer) {
-        this.moveCursorTo(this.cursorPos + integer);
+        this.moveCursorTo(this.getCursorPos(integer));
+    }
+    
+    private int getCursorPos(final int integer) {
+        return Util.offsetByCodepoints(this.value, this.cursorPos, integer);
     }
     
     public void moveCursorTo(final int integer) {
@@ -364,8 +352,8 @@ public class EditBox extends AbstractWidget implements Widget, GuiEventListener
             if (this.bordered) {
                 integer2 -= 4;
             }
-            final String string9 = this.font.substrByWidth(this.value.substring(this.displayPos), this.getInnerWidth());
-            this.moveCursorTo(this.font.substrByWidth(string9, integer2).length() + this.displayPos);
+            final String string9 = this.font.plainSubstrByWidth(this.value.substring(this.displayPos), this.getInnerWidth());
+            this.moveCursorTo(this.font.plainSubstrByWidth(string9, integer2).length() + this.displayPos);
             return true;
         }
         return false;
@@ -376,66 +364,67 @@ public class EditBox extends AbstractWidget implements Widget, GuiEventListener
     }
     
     @Override
-    public void renderButton(final int integer1, final int integer2, final float float3) {
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (!this.isVisible()) {
             return;
         }
         if (this.isBordered()) {
-            GuiComponent.fill(this.x - 1, this.y - 1, this.x + this.width + 1, this.y + this.height + 1, -6250336);
-            GuiComponent.fill(this.x, this.y, this.x + this.width, this.y + this.height, -16777216);
+            final int integer4 = this.isFocused() ? -1 : -6250336;
+            GuiComponent.fill(dhl, this.x - 1, this.y - 1, this.x + this.width + 1, this.y + this.height + 1, integer4);
+            GuiComponent.fill(dhl, this.x, this.y, this.x + this.width, this.y + this.height, -16777216);
         }
-        final int integer3 = this.isEditable ? this.textColor : this.textColorUneditable;
-        final int integer4 = this.cursorPos - this.displayPos;
-        int integer5 = this.highlightPos - this.displayPos;
-        final String string8 = this.font.substrByWidth(this.value.substring(this.displayPos), this.getInnerWidth());
-        final boolean boolean9 = integer4 >= 0 && integer4 <= string8.length();
-        final boolean boolean10 = this.isFocused() && this.frame / 6 % 2 == 0 && boolean9;
-        final int integer6 = this.bordered ? (this.x + 4) : this.x;
-        final int integer7 = this.bordered ? (this.y + (this.height - 8) / 2) : this.y;
-        int integer8 = integer6;
-        if (integer5 > string8.length()) {
-            integer5 = string8.length();
+        final int integer4 = this.isEditable ? this.textColor : this.textColorUneditable;
+        final int integer5 = this.cursorPos - this.displayPos;
+        int integer6 = this.highlightPos - this.displayPos;
+        final String string9 = this.font.plainSubstrByWidth(this.value.substring(this.displayPos), this.getInnerWidth());
+        final boolean boolean10 = integer5 >= 0 && integer5 <= string9.length();
+        final boolean boolean11 = this.isFocused() && this.frame / 6 % 2 == 0 && boolean10;
+        final int integer7 = this.bordered ? (this.x + 4) : this.x;
+        final int integer8 = this.bordered ? (this.y + (this.height - 8) / 2) : this.y;
+        int integer9 = integer7;
+        if (integer6 > string9.length()) {
+            integer6 = string9.length();
         }
-        if (!string8.isEmpty()) {
-            final String string9 = boolean9 ? string8.substring(0, integer4) : string8;
-            integer8 = this.font.drawShadow(this.formatter.apply(string9, this.displayPos), (float)integer8, (float)integer7, integer3);
+        if (!string9.isEmpty()) {
+            final String string10 = boolean10 ? string9.substring(0, integer5) : string9;
+            integer9 = this.font.drawShadow(dhl, this.formatter.apply(string10, this.displayPos), (float)integer9, (float)integer8, integer4);
         }
-        final boolean boolean11 = this.cursorPos < this.value.length() || this.value.length() >= this.getMaxLength();
-        int integer9 = integer8;
-        if (!boolean9) {
-            integer9 = ((integer4 > 0) ? (integer6 + this.width) : integer6);
+        final boolean boolean12 = this.cursorPos < this.value.length() || this.value.length() >= this.getMaxLength();
+        int integer10 = integer9;
+        if (!boolean10) {
+            integer10 = ((integer5 > 0) ? (integer7 + this.width) : integer7);
         }
-        else if (boolean11) {
+        else if (boolean12) {
+            --integer10;
             --integer9;
-            --integer8;
         }
-        if (!string8.isEmpty() && boolean9 && integer4 < string8.length()) {
-            this.font.drawShadow(this.formatter.apply(string8.substring(integer4), this.cursorPos), (float)integer8, (float)integer7, integer3);
+        if (!string9.isEmpty() && boolean10 && integer5 < string9.length()) {
+            this.font.drawShadow(dhl, this.formatter.apply(string9.substring(integer5), this.cursorPos), (float)integer9, (float)integer8, integer4);
         }
-        if (!boolean11 && this.suggestion != null) {
-            this.font.drawShadow(this.suggestion, (float)(integer9 - 1), (float)integer7, -8355712);
+        if (!boolean12 && this.suggestion != null) {
+            this.font.drawShadow(dhl, this.suggestion, (float)(integer10 - 1), (float)integer8, -8355712);
         }
-        if (boolean10) {
-            if (boolean11) {
-                final int integer11 = integer9;
-                final int integer12 = integer7 - 1;
-                final int integer13 = integer9 + 1;
-                final int n = integer7 + 1;
+        if (boolean11) {
+            if (boolean12) {
+                final int integer12 = integer10;
+                final int integer13 = integer8 - 1;
+                final int integer14 = integer10 + 1;
+                final int n = integer8 + 1;
                 this.font.getClass();
-                GuiComponent.fill(integer11, integer12, integer13, n + 9, -3092272);
+                GuiComponent.fill(dhl, integer12, integer13, integer14, n + 9, -3092272);
             }
             else {
-                this.font.drawShadow("_", (float)integer9, (float)integer7, integer3);
+                this.font.drawShadow(dhl, "_", (float)integer10, (float)integer8, integer4);
             }
         }
-        if (integer5 != integer4) {
-            final int integer10 = integer6 + this.font.width(string8.substring(0, integer5));
-            final int integer14 = integer9;
-            final int integer15 = integer7 - 1;
-            final int integer16 = integer10 - 1;
-            final int n2 = integer7 + 1;
+        if (integer6 != integer5) {
+            final int integer11 = integer7 + this.font.width(string9.substring(0, integer6));
+            final int integer15 = integer10;
+            final int integer16 = integer8 - 1;
+            final int integer17 = integer11 - 1;
+            final int n2 = integer8 + 1;
             this.font.getClass();
-            this.renderHighlight(integer14, integer15, integer16, n2 + 9);
+            this.renderHighlight(integer15, integer16, integer17, n2 + 9);
         }
     }
     
@@ -456,18 +445,18 @@ public class EditBox extends AbstractWidget implements Widget, GuiEventListener
         if (integer1 > this.x + this.width) {
             integer1 = this.x + this.width;
         }
-        final Tesselator cym6 = Tesselator.getInstance();
-        final BufferBuilder cyg7 = cym6.getBuilder();
+        final Tesselator dhn6 = Tesselator.getInstance();
+        final BufferBuilder dhg7 = dhn6.getBuilder();
         RenderSystem.color4f(0.0f, 0.0f, 255.0f, 255.0f);
         RenderSystem.disableTexture();
         RenderSystem.enableColorLogicOp();
         RenderSystem.logicOp(GlStateManager.LogicOp.OR_REVERSE);
-        cyg7.begin(7, DefaultVertexFormat.POSITION);
-        cyg7.vertex(integer1, integer4, 0.0).endVertex();
-        cyg7.vertex(integer3, integer4, 0.0).endVertex();
-        cyg7.vertex(integer3, integer2, 0.0).endVertex();
-        cyg7.vertex(integer1, integer2, 0.0).endVertex();
-        cym6.end();
+        dhg7.begin(7, DefaultVertexFormat.POSITION);
+        dhg7.vertex(integer1, integer4, 0.0).endVertex();
+        dhg7.vertex(integer3, integer4, 0.0).endVertex();
+        dhg7.vertex(integer3, integer2, 0.0).endVertex();
+        dhg7.vertex(integer1, integer2, 0.0).endVertex();
+        dhn6.end();
         RenderSystem.disableColorLogicOp();
         RenderSystem.enableTexture();
     }
@@ -540,10 +529,10 @@ public class EditBox extends AbstractWidget implements Widget, GuiEventListener
                 this.displayPos = integer2;
             }
             final int integer3 = this.getInnerWidth();
-            final String string5 = this.font.substrByWidth(this.value.substring(this.displayPos), integer3);
+            final String string5 = this.font.plainSubstrByWidth(this.value.substring(this.displayPos), integer3);
             final int integer4 = string5.length() + this.displayPos;
             if (this.highlightPos == this.displayPos) {
-                this.displayPos -= this.font.substrByWidth(this.value, integer3, true).length();
+                this.displayPos -= this.font.plainSubstrByWidth(this.value, integer3, true).length();
             }
             if (this.highlightPos > integer4) {
                 this.displayPos += this.highlightPos - integer4;
diff --git a/src/net/minecraft/client/gui/components/ImageButton.java b/src/net/minecraft/client/gui/components/ImageButton.java
index 53b614a..f436211 100644
--- a/src/net/minecraft/client/gui/components/ImageButton.java
+++ b/src/net/minecraft/client/gui/components/ImageButton.java
@@ -3,6 +3,9 @@ package net.minecraft.client.gui.components;
 import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.resources.ResourceLocation;
 
 public class ImageButton extends Button {
@@ -13,22 +16,22 @@ public class ImageButton extends Button {
     private final int textureWidth;
     private final int textureHeight;
     
-    public ImageButton(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final ResourceLocation sm, final OnPress a) {
-        this(integer1, integer2, integer3, integer4, integer5, integer6, integer7, sm, 256, 256, a);
+    public ImageButton(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final ResourceLocation uh, final OnPress a) {
+        this(integer1, integer2, integer3, integer4, integer5, integer6, integer7, uh, 256, 256, a);
     }
     
-    public ImageButton(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final ResourceLocation sm, final int integer9, final int integer10, final OnPress a) {
-        this(integer1, integer2, integer3, integer4, integer5, integer6, integer7, sm, integer9, integer10, a, "");
+    public ImageButton(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final ResourceLocation uh, final int integer9, final int integer10, final OnPress a) {
+        this(integer1, integer2, integer3, integer4, integer5, integer6, integer7, uh, integer9, integer10, a, TextComponent.EMPTY);
     }
     
-    public ImageButton(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final ResourceLocation sm, final int integer9, final int integer10, final OnPress a, final String string) {
-        super(integer1, integer2, integer3, integer4, string, a);
+    public ImageButton(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final ResourceLocation uh, final int integer9, final int integer10, final OnPress a, final Component mr) {
+        super(integer1, integer2, integer3, integer4, mr, a);
         this.textureWidth = integer9;
         this.textureHeight = integer10;
         this.xTexStart = integer5;
         this.yTexStart = integer6;
         this.yDiffTex = integer7;
-        this.resourceLocation = sm;
+        this.resourceLocation = uh;
     }
     
     public void setPosition(final int integer1, final int integer2) {
@@ -37,15 +40,14 @@ public class ImageButton extends Button {
     }
     
     @Override
-    public void renderButton(final int integer1, final int integer2, final float float3) {
-        final Minecraft dbn5 = Minecraft.getInstance();
-        dbn5.getTextureManager().bind(this.resourceLocation);
-        RenderSystem.disableDepthTest();
-        int integer3 = this.yTexStart;
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        final Minecraft dlx6 = Minecraft.getInstance();
+        dlx6.getTextureManager().bind(this.resourceLocation);
+        int integer4 = this.yTexStart;
         if (this.isHovered()) {
-            integer3 += this.yDiffTex;
+            integer4 += this.yDiffTex;
         }
-        GuiComponent.blit(this.x, this.y, (float)this.xTexStart, (float)integer3, this.width, this.height, this.textureWidth, this.textureHeight);
         RenderSystem.enableDepthTest();
+        GuiComponent.blit(dhl, this.x, this.y, (float)this.xTexStart, (float)integer4, this.width, this.height, this.textureWidth, this.textureHeight);
     }
 }
diff --git a/src/net/minecraft/client/gui/components/LerpingBossEvent.java b/src/net/minecraft/client/gui/components/LerpingBossEvent.java
index 9864b6f..3054a07 100644
--- a/src/net/minecraft/client/gui/components/LerpingBossEvent.java
+++ b/src/net/minecraft/client/gui/components/LerpingBossEvent.java
@@ -9,14 +9,14 @@ public class LerpingBossEvent extends BossEvent {
     protected float targetPercent;
     protected long setTime;
     
-    public LerpingBossEvent(final ClientboundBossEventPacket mk) {
-        super(mk.getId(), mk.getName(), mk.getColor(), mk.getOverlay());
-        this.targetPercent = mk.getPercent();
-        this.percent = mk.getPercent();
+    public LerpingBossEvent(final ClientboundBossEventPacket ny) {
+        super(ny.getId(), ny.getName(), ny.getColor(), ny.getOverlay());
+        this.targetPercent = ny.getPercent();
+        this.percent = ny.getPercent();
         this.setTime = Util.getMillis();
-        this.setDarkenScreen(mk.shouldDarkenScreen());
-        this.setPlayBossMusic(mk.shouldPlayMusic());
-        this.setCreateWorldFog(mk.shouldCreateWorldFog());
+        this.setDarkenScreen(ny.shouldDarkenScreen());
+        this.setPlayBossMusic(ny.shouldPlayMusic());
+        this.setCreateWorldFog(ny.shouldCreateWorldFog());
     }
     
     @Override
@@ -33,24 +33,24 @@ public class LerpingBossEvent extends BossEvent {
         return Mth.lerp(float4, this.percent, this.targetPercent);
     }
     
-    public void update(final ClientboundBossEventPacket mk) {
-        switch (mk.getOperation()) {
+    public void update(final ClientboundBossEventPacket ny) {
+        switch (ny.getOperation()) {
             case UPDATE_NAME: {
-                this.setName(mk.getName());
+                this.setName(ny.getName());
                 break;
             }
             case UPDATE_PCT: {
-                this.setPercent(mk.getPercent());
+                this.setPercent(ny.getPercent());
                 break;
             }
             case UPDATE_STYLE: {
-                this.setColor(mk.getColor());
-                this.setOverlay(mk.getOverlay());
+                this.setColor(ny.getColor());
+                this.setOverlay(ny.getOverlay());
                 break;
             }
             case UPDATE_PROPERTIES: {
-                this.setDarkenScreen(mk.shouldDarkenScreen());
-                this.setPlayBossMusic(mk.shouldPlayMusic());
+                this.setDarkenScreen(ny.shouldDarkenScreen());
+                this.setPlayBossMusic(ny.shouldPlayMusic());
                 break;
             }
         }
diff --git a/src/net/minecraft/client/gui/components/LockIconButton.java b/src/net/minecraft/client/gui/components/LockIconButton.java
index 7108968..4a890ca 100644
--- a/src/net/minecraft/client/gui/components/LockIconButton.java
+++ b/src/net/minecraft/client/gui/components/LockIconButton.java
@@ -2,18 +2,21 @@ package net.minecraft.client.gui.components;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 
 public class LockIconButton extends Button {
     private boolean locked;
     
     public LockIconButton(final int integer1, final int integer2, final OnPress a) {
-        super(integer1, integer2, 20, 20, I18n.get("narrator.button.difficulty_lock"), a);
+        super(integer1, integer2, 20, 20, new TranslatableComponent("narrator.button.difficulty_lock"), a);
     }
     
     @Override
-    protected String getNarrationMessage() {
-        return super.getNarrationMessage() + ". " + (this.isLocked() ? I18n.get("narrator.button.difficulty_lock.locked") : I18n.get("narrator.button.difficulty_lock.unlocked"));
+    protected MutableComponent createNarrationMessage() {
+        return super.createNarrationMessage().append(". ").append(this.isLocked() ? new TranslatableComponent("narrator.button.difficulty_lock.locked") : new TranslatableComponent("narrator.button.difficulty_lock.unlocked"));
     }
     
     public boolean isLocked() {
@@ -25,20 +28,20 @@ public class LockIconButton extends Button {
     }
     
     @Override
-    public void renderButton(final int integer1, final int integer2, final float float3) {
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         Minecraft.getInstance().getTextureManager().bind(Button.WIDGETS_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        Icon a5;
+        Icon a6;
         if (!this.active) {
-            a5 = (this.locked ? Icon.LOCKED_DISABLED : Icon.UNLOCKED_DISABLED);
+            a6 = (this.locked ? Icon.LOCKED_DISABLED : Icon.UNLOCKED_DISABLED);
         }
         else if (this.isHovered()) {
-            a5 = (this.locked ? Icon.LOCKED_HOVER : Icon.UNLOCKED_HOVER);
+            a6 = (this.locked ? Icon.LOCKED_HOVER : Icon.UNLOCKED_HOVER);
         }
         else {
-            a5 = (this.locked ? Icon.LOCKED : Icon.UNLOCKED);
+            a6 = (this.locked ? Icon.LOCKED : Icon.UNLOCKED);
         }
-        this.blit(this.x, this.y, a5.getX(), a5.getY(), this.width, this.height);
+        this.blit(dhl, this.x, this.y, a6.getX(), a6.getY(), this.width, this.height);
     }
     
     enum Icon {
diff --git a/src/net/minecraft/client/gui/components/ObjectSelectionList.java b/src/net/minecraft/client/gui/components/ObjectSelectionList.java
index 017d6bd..76d114f 100644
--- a/src/net/minecraft/client/gui/components/ObjectSelectionList.java
+++ b/src/net/minecraft/client/gui/components/ObjectSelectionList.java
@@ -5,8 +5,8 @@ import net.minecraft.client.Minecraft;
 public abstract class ObjectSelectionList<E extends AbstractSelectionList.Entry<E>> extends AbstractSelectionList<E> {
     private boolean inFocus;
     
-    public ObjectSelectionList(final Minecraft dbn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        super(dbn, integer2, integer3, integer4, integer5, integer6);
+    public ObjectSelectionList(final Minecraft dlx, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        super(dlx, integer2, integer3, integer4, integer5, integer6);
     }
     
     @Override
@@ -16,10 +16,10 @@ public abstract class ObjectSelectionList<E extends AbstractSelectionList.Entry<
         }
         this.inFocus = !this.inFocus;
         if (this.inFocus && this.getSelected() == null && this.getItemCount() > 0) {
-            this.moveSelection(1);
+            this.moveSelection(SelectionDirection.DOWN);
         }
         else if (this.inFocus && this.getSelected() != null) {
-            this.moveSelection(0);
+            this.refreshSelection();
         }
         return this.inFocus;
     }
diff --git a/src/net/minecraft/client/gui/components/OptionButton.java b/src/net/minecraft/client/gui/components/OptionButton.java
index 4828590..11264d3 100644
--- a/src/net/minecraft/client/gui/components/OptionButton.java
+++ b/src/net/minecraft/client/gui/components/OptionButton.java
@@ -1,12 +1,17 @@
 package net.minecraft.client.gui.components;
 
+import net.minecraft.network.chat.Component;
 import net.minecraft.client.Option;
 
 public class OptionButton extends Button {
     private final Option option;
     
-    public OptionButton(final int integer1, final int integer2, final int integer3, final int integer4, final Option dbq, final String string, final OnPress a) {
-        super(integer1, integer2, integer3, integer4, string, a);
-        this.option = dbq;
+    public OptionButton(final int integer1, final int integer2, final int integer3, final int integer4, final Option dma, final Component mr, final OnPress a) {
+        super(integer1, integer2, integer3, integer4, mr, a);
+        this.option = dma;
+    }
+    
+    public Option getOption() {
+        return this.option;
     }
 }
diff --git a/src/net/minecraft/client/gui/components/OptionsList.java b/src/net/minecraft/client/gui/components/OptionsList.java
index 0a15266..94dae4f 100644
--- a/src/net/minecraft/client/gui/components/OptionsList.java
+++ b/src/net/minecraft/client/gui/components/OptionsList.java
@@ -1,25 +1,28 @@
 package net.minecraft.client.gui.components;
 
 import net.minecraft.client.gui.components.events.GuiEventListener;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.Options;
 import java.util.List;
+import java.util.Iterator;
+import java.util.Optional;
 import javax.annotation.Nullable;
 import net.minecraft.client.Option;
 import net.minecraft.client.Minecraft;
 
 public class OptionsList extends ContainerObjectSelectionList<Entry> {
-    public OptionsList(final Minecraft dbn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        super(dbn, integer2, integer3, integer4, integer5, integer6);
+    public OptionsList(final Minecraft dlx, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        super(dlx, integer2, integer3, integer4, integer5, integer6);
         this.centerListVertically = false;
     }
     
-    public int addBig(final Option dbq) {
-        return this.addEntry(Entry.big(this.minecraft.options, this.width, dbq));
+    public int addBig(final Option dma) {
+        return this.addEntry(Entry.big(this.minecraft.options, this.width, dma));
     }
     
-    public void addSmall(final Option dbq1, @Nullable final Option dbq2) {
-        this.addEntry(Entry.small(this.minecraft.options, this.width, dbq1, dbq2));
+    public void addSmall(final Option dma1, @Nullable final Option dma2) {
+        this.addEntry(Entry.small(this.minecraft.options, this.width, dma1, dma2));
     }
     
     public void addSmall(final Option[] arr) {
@@ -38,6 +41,17 @@ public class OptionsList extends ContainerObjectSelectionList<Entry> {
         return super.getScrollbarPosition() + 32;
     }
     
+    public Optional<AbstractWidget> getMouseOver(final double double1, final double double2) {
+        for (final Entry a7 : this.children()) {
+            for (final AbstractWidget dng9 : a7.children) {
+                if (dng9.isMouseOver(double1, double2)) {
+                    return Optional.<AbstractWidget>of(dng9);
+                }
+            }
+        }
+        return Optional.<AbstractWidget>empty();
+    }
+    
     public static class Entry extends ContainerObjectSelectionList.Entry<Entry> {
         private final List<AbstractWidget> children;
         
@@ -45,23 +59,23 @@ public class OptionsList extends ContainerObjectSelectionList<Entry> {
             this.children = list;
         }
         
-        public static Entry big(final Options dbr, final int integer, final Option dbq) {
-            return new Entry(ImmutableList.<AbstractWidget>of(dbq.createButton(dbr, integer / 2 - 155, 0, 310)));
+        public static Entry big(final Options dmb, final int integer, final Option dma) {
+            return new Entry(ImmutableList.<AbstractWidget>of(dma.createButton(dmb, integer / 2 - 155, 0, 310)));
         }
         
-        public static Entry small(final Options dbr, final int integer, final Option dbq3, @Nullable final Option dbq4) {
-            final AbstractWidget dct5 = dbq3.createButton(dbr, integer / 2 - 155, 0, 150);
-            if (dbq4 == null) {
-                return new Entry(ImmutableList.<AbstractWidget>of(dct5));
+        public static Entry small(final Options dmb, final int integer, final Option dma3, @Nullable final Option dma4) {
+            final AbstractWidget dng5 = dma3.createButton(dmb, integer / 2 - 155, 0, 150);
+            if (dma4 == null) {
+                return new Entry(ImmutableList.<AbstractWidget>of(dng5));
             }
-            return new Entry(ImmutableList.<AbstractWidget>of(dct5, dbq4.createButton(dbr, integer / 2 - 155 + 160, 0, 150)));
+            return new Entry(ImmutableList.<AbstractWidget>of(dng5, dma4.createButton(dmb, integer / 2 - 155 + 160, 0, 150)));
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            this.children.forEach(dct -> {
-                dct.y = integer2;
-                dct.render(integer6, integer7, float9);
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.children.forEach(dng -> {
+                dng.y = integer3;
+                dng.render(dhl, integer7, integer8, float10);
             });
         }
         
diff --git a/src/net/minecraft/client/gui/components/PlayerTabOverlay.java b/src/net/minecraft/client/gui/components/PlayerTabOverlay.java
index 877d1c8..07b3d51 100644
--- a/src/net/minecraft/client/gui/components/PlayerTabOverlay.java
+++ b/src/net/minecraft/client/gui/components/PlayerTabOverlay.java
@@ -8,15 +8,18 @@ import com.mojang.authlib.GameProfile;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.ChatFormatting;
-import net.minecraft.world.level.GameType;
 import net.minecraft.world.entity.player.PlayerModelPart;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.world.scores.criteria.ObjectiveCriteria;
+import net.minecraft.network.chat.FormattedText;
 import javax.annotation.Nullable;
 import net.minecraft.world.scores.Objective;
 import net.minecraft.world.scores.Scoreboard;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.Util;
+import net.minecraft.ChatFormatting;
+import net.minecraft.world.level.GameType;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.scores.Team;
 import net.minecraft.world.scores.PlayerTeam;
 import net.minecraft.network.chat.TextComponent;
@@ -36,16 +39,20 @@ public class PlayerTabOverlay extends GuiComponent {
     private long visibilityId;
     private boolean visible;
     
-    public PlayerTabOverlay(final Minecraft dbn, final Gui dci) {
-        this.minecraft = dbn;
-        this.gui = dci;
+    public PlayerTabOverlay(final Minecraft dlx, final Gui dmu) {
+        this.minecraft = dlx;
+        this.gui = dmu;
     }
     
-    public Component getNameForDisplay(final PlayerInfo dns) {
-        if (dns.getTabListDisplayName() != null) {
-            return dns.getTabListDisplayName();
+    public Component getNameForDisplay(final PlayerInfo dyq) {
+        if (dyq.getTabListDisplayName() != null) {
+            return this.decorateName(dyq, dyq.getTabListDisplayName().copy());
         }
-        return PlayerTeam.formatNameForTeam(dns.getTeam(), new TextComponent(dns.getProfile().getName()));
+        return this.decorateName(dyq, PlayerTeam.formatNameForTeam(dyq.getTeam(), new TextComponent(dyq.getProfile().getName())));
+    }
+    
+    private Component decorateName(final PlayerInfo dyq, final MutableComponent mx) {
+        return (dyq.getGameMode() == GameType.SPECTATOR) ? mx.withStyle(ChatFormatting.ITALIC) : mx;
     }
     
     public void setVisible(final boolean boolean1) {
@@ -55,30 +62,30 @@ public class PlayerTabOverlay extends GuiComponent {
         this.visible = boolean1;
     }
     
-    public void render(final int integer, final Scoreboard cwl, @Nullable final Objective cwi) {
-        final ClientPacketListener dnp5 = this.minecraft.player.connection;
-        List<PlayerInfo> list6 = PlayerTabOverlay.PLAYER_ORDERING.<PlayerInfo>sortedCopy(dnp5.getOnlinePlayers());
+    public void render(final PoseStack dhl, final int integer, final Scoreboard dfm, @Nullable final Objective dfj) {
+        final ClientPacketListener dyn6 = this.minecraft.player.connection;
+        List<PlayerInfo> list7 = PlayerTabOverlay.PLAYER_ORDERING.<PlayerInfo>sortedCopy(dyn6.getOnlinePlayers());
         int integer2 = 0;
         int integer3 = 0;
-        for (final PlayerInfo dns10 : list6) {
-            int integer4 = this.minecraft.font.width(this.getNameForDisplay(dns10).getColoredString());
+        for (final PlayerInfo dyq11 : list7) {
+            int integer4 = this.minecraft.font.width(this.getNameForDisplay(dyq11));
             integer2 = Math.max(integer2, integer4);
-            if (cwi != null && cwi.getRenderType() != ObjectiveCriteria.RenderType.HEARTS) {
-                integer4 = this.minecraft.font.width(" " + cwl.getOrCreatePlayerScore(dns10.getProfile().getName(), cwi).getScore());
+            if (dfj != null && dfj.getRenderType() != ObjectiveCriteria.RenderType.HEARTS) {
+                integer4 = this.minecraft.font.width(" " + dfm.getOrCreatePlayerScore(dyq11.getProfile().getName(), dfj).getScore());
                 integer3 = Math.max(integer3, integer4);
             }
         }
-        list6 = list6.subList(0, Math.min(list6.size(), 80));
+        list7 = list7.subList(0, Math.min(list7.size(), 80));
         int integer4;
         int integer6;
         int integer5;
-        for (integer5 = (integer6 = list6.size()), integer4 = 1; integer6 > 20; integer6 = (integer5 + integer4 - 1) / integer4) {
+        for (integer5 = (integer6 = list7.size()), integer4 = 1; integer6 > 20; integer6 = (integer5 + integer4 - 1) / integer4) {
             ++integer4;
         }
-        final boolean boolean12 = this.minecraft.isLocalServer() || this.minecraft.getConnection().getConnection().isEncrypted();
+        final boolean boolean13 = this.minecraft.isLocalServer() || this.minecraft.getConnection().getConnection().isEncrypted();
         int integer7;
-        if (cwi != null) {
-            if (cwi.getRenderType() == ObjectiveCriteria.RenderType.HEARTS) {
+        if (dfj != null) {
+            if (dfj.getRenderType() == ObjectiveCriteria.RenderType.HEARTS) {
                 integer7 = 90;
             }
             else {
@@ -88,99 +95,93 @@ public class PlayerTabOverlay extends GuiComponent {
         else {
             integer7 = 0;
         }
-        final int integer8 = Math.min(integer4 * ((boolean12 ? 9 : 0) + integer2 + integer7 + 13), integer - 50) / integer4;
+        final int integer8 = Math.min(integer4 * ((boolean13 ? 9 : 0) + integer2 + integer7 + 13), integer - 50) / integer4;
         final int integer9 = integer / 2 - (integer8 * integer4 + (integer4 - 1) * 5) / 2;
         int integer10 = 10;
         int integer11 = integer8 * integer4 + (integer4 - 1) * 5;
-        List<String> list7 = null;
+        List<FormattedText> list8 = null;
         if (this.header != null) {
-            list7 = this.minecraft.font.split(this.header.getColoredString(), integer - 50);
-            for (final String string20 : list7) {
-                integer11 = Math.max(integer11, this.minecraft.font.width(string20));
+            list8 = this.minecraft.font.split(this.header, integer - 50);
+            for (final FormattedText mu21 : list8) {
+                integer11 = Math.max(integer11, this.minecraft.font.width(mu21));
             }
         }
-        List<String> list8 = null;
+        List<FormattedText> list9 = null;
         if (this.footer != null) {
-            list8 = this.minecraft.font.split(this.footer.getColoredString(), integer - 50);
-            for (final String string21 : list8) {
-                integer11 = Math.max(integer11, this.minecraft.font.width(string21));
+            list9 = this.minecraft.font.split(this.footer, integer - 50);
+            for (final FormattedText mu22 : list9) {
+                integer11 = Math.max(integer11, this.minecraft.font.width(mu22));
             }
         }
-        if (list7 != null) {
-            final int integer23 = integer / 2 - integer11 / 2 - 1;
-            final int integer24 = integer10 - 1;
-            final int integer25 = integer / 2 + integer11 / 2 + 1;
+        if (list8 != null) {
+            final int integer24 = integer / 2 - integer11 / 2 - 1;
+            final int integer25 = integer10 - 1;
+            final int integer26 = integer / 2 + integer11 / 2 + 1;
             final int n = integer10;
-            final int size = list7.size();
+            final int size = list8.size();
             this.minecraft.font.getClass();
-            GuiComponent.fill(integer23, integer24, integer25, n + size * 9, Integer.MIN_VALUE);
-            for (final String string21 : list7) {
-                final int integer12 = this.minecraft.font.width(string21);
-                this.minecraft.font.drawShadow(string21, (float)(integer / 2 - integer12 / 2), (float)integer10, -1);
+            GuiComponent.fill(dhl, integer24, integer25, integer26, n + size * 9, Integer.MIN_VALUE);
+            for (final FormattedText mu22 : list8) {
+                final int integer12 = this.minecraft.font.width(mu22);
+                this.minecraft.font.drawShadow(dhl, mu22, (float)(integer / 2 - integer12 / 2), (float)integer10, -1);
                 final int n2 = integer10;
                 this.minecraft.font.getClass();
                 integer10 = n2 + 9;
             }
             ++integer10;
         }
-        GuiComponent.fill(integer / 2 - integer11 / 2 - 1, integer10 - 1, integer / 2 + integer11 / 2 + 1, integer10 + integer6 * 9, Integer.MIN_VALUE);
+        GuiComponent.fill(dhl, integer / 2 - integer11 / 2 - 1, integer10 - 1, integer / 2 + integer11 / 2 + 1, integer10 + integer6 * 9, Integer.MIN_VALUE);
         final int integer13 = this.minecraft.options.getBackgroundColor(553648127);
         for (int integer14 = 0; integer14 < integer5; ++integer14) {
             final int integer12 = integer14 / integer6;
             final int integer15 = integer14 % integer6;
             int integer16 = integer9 + integer12 * integer8 + integer12 * 5;
             final int integer17 = integer10 + integer15 * 9;
-            GuiComponent.fill(integer16, integer17, integer16 + integer8, integer17 + 8, integer13);
+            GuiComponent.fill(dhl, integer16, integer17, integer16 + integer8, integer17 + 8, integer13);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
             RenderSystem.enableAlphaTest();
             RenderSystem.enableBlend();
             RenderSystem.defaultBlendFunc();
-            if (integer14 < list6.size()) {
-                final PlayerInfo dns11 = list6.get(integer14);
-                final GameProfile gameProfile27 = dns11.getProfile();
-                if (boolean12) {
-                    final Player ayj28 = this.minecraft.level.getPlayerByUUID(gameProfile27.getId());
-                    final boolean boolean13 = ayj28 != null && ayj28.isModelPartShown(PlayerModelPart.CAPE) && ("Dinnerbone".equals(gameProfile27.getName()) || "Grumm".equals(gameProfile27.getName()));
-                    this.minecraft.getTextureManager().bind(dns11.getSkinLocation());
-                    final int integer18 = 8 + (boolean13 ? 8 : 0);
-                    final int integer19 = 8 * (boolean13 ? -1 : 1);
-                    GuiComponent.blit(integer16, integer17, 8, 8, 8.0f, (float)integer18, 8, integer19, 64, 64);
-                    if (ayj28 != null && ayj28.isModelPartShown(PlayerModelPart.HAT)) {
-                        final int integer20 = 8 + (boolean13 ? 8 : 0);
-                        final int integer21 = 8 * (boolean13 ? -1 : 1);
-                        GuiComponent.blit(integer16, integer17, 8, 8, 40.0f, (float)integer20, 8, integer21, 64, 64);
+            if (integer14 < list7.size()) {
+                final PlayerInfo dyq12 = list7.get(integer14);
+                final GameProfile gameProfile28 = dyq12.getProfile();
+                if (boolean13) {
+                    final Player bec29 = this.minecraft.level.getPlayerByUUID(gameProfile28.getId());
+                    final boolean boolean14 = bec29 != null && bec29.isModelPartShown(PlayerModelPart.CAPE) && ("Dinnerbone".equals(gameProfile28.getName()) || "Grumm".equals(gameProfile28.getName()));
+                    this.minecraft.getTextureManager().bind(dyq12.getSkinLocation());
+                    final int integer18 = 8 + (boolean14 ? 8 : 0);
+                    final int integer19 = 8 * (boolean14 ? -1 : 1);
+                    GuiComponent.blit(dhl, integer16, integer17, 8, 8, 8.0f, (float)integer18, 8, integer19, 64, 64);
+                    if (bec29 != null && bec29.isModelPartShown(PlayerModelPart.HAT)) {
+                        final int integer20 = 8 + (boolean14 ? 8 : 0);
+                        final int integer21 = 8 * (boolean14 ? -1 : 1);
+                        GuiComponent.blit(dhl, integer16, integer17, 8, 8, 40.0f, (float)integer20, 8, integer21, 64, 64);
                     }
                     integer16 += 9;
                 }
-                final String string22 = this.getNameForDisplay(dns11).getColoredString();
-                if (dns11.getGameMode() == GameType.SPECTATOR) {
-                    this.minecraft.font.drawShadow(ChatFormatting.ITALIC + string22, (float)integer16, (float)integer17, -1862270977);
-                }
-                else {
-                    this.minecraft.font.drawShadow(string22, (float)integer16, (float)integer17, -1);
-                }
-                if (cwi != null && dns11.getGameMode() != GameType.SPECTATOR) {
+                this.minecraft.font.drawShadow(dhl, this.getNameForDisplay(dyq12), (float)integer16, (float)integer17, (dyq12.getGameMode() == GameType.SPECTATOR) ? -1862270977 : -1);
+                if (dfj != null && dyq12.getGameMode() != GameType.SPECTATOR) {
                     final int integer22 = integer16 + integer2 + 1;
-                    final int integer18 = integer22 + integer7;
-                    if (integer18 - integer22 > 5) {
-                        this.renderTablistScore(cwi, integer17, gameProfile27.getName(), integer22, integer18, dns11);
+                    final int integer23 = integer22 + integer7;
+                    if (integer23 - integer22 > 5) {
+                        this.renderTablistScore(dfj, integer17, gameProfile28.getName(), integer22, integer23, dyq12, dhl);
                     }
                 }
-                this.renderPingIcon(integer8, integer16 - (boolean12 ? 9 : 0), integer17, dns11);
+                this.renderPingIcon(dhl, integer8, integer16 - (boolean13 ? 9 : 0), integer17, dyq12);
             }
         }
-        if (list8 != null) {
+        if (list9 != null) {
             integer10 += integer6 * 9 + 1;
-            final int integer26 = integer / 2 - integer11 / 2 - 1;
-            final int integer27 = integer10 - 1;
-            final int integer28 = integer / 2 + integer11 / 2 + 1;
+            final int integer27 = integer / 2 - integer11 / 2 - 1;
+            final int integer28 = integer10 - 1;
+            final int integer29 = integer / 2 + integer11 / 2 + 1;
             final int n3 = integer10;
-            final int size2 = list8.size();
+            final int size2 = list9.size();
             this.minecraft.font.getClass();
-            GuiComponent.fill(integer26, integer27, integer28, n3 + size2 * 9, Integer.MIN_VALUE);
-            for (final String string23 : list8) {
-                final int integer15 = this.minecraft.font.width(string23);
-                this.minecraft.font.drawShadow(string23, (float)(integer / 2 - integer15 / 2), (float)integer10, -1);
+            GuiComponent.fill(dhl, integer27, integer28, integer29, n3 + size2 * 9, Integer.MIN_VALUE);
+            for (final FormattedText mu23 : list9) {
+                final int integer15 = this.minecraft.font.width(mu23);
+                this.minecraft.font.drawShadow(dhl, mu23, (float)(integer / 2 - integer15 / 2), (float)integer10, -1);
                 final int n4 = integer10;
                 this.minecraft.font.getClass();
                 integer10 = n4 + 9;
@@ -188,106 +189,106 @@ public class PlayerTabOverlay extends GuiComponent {
         }
     }
     
-    protected void renderPingIcon(final int integer1, final int integer2, final int integer3, final PlayerInfo dns) {
+    protected void renderPingIcon(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final PlayerInfo dyq) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(PlayerTabOverlay.GUI_ICONS_LOCATION);
-        final int integer4 = 0;
-        int integer5;
-        if (dns.getLatency() < 0) {
-            integer5 = 5;
+        final int integer5 = 0;
+        int integer6;
+        if (dyq.getLatency() < 0) {
+            integer6 = 5;
         }
-        else if (dns.getLatency() < 150) {
-            integer5 = 0;
+        else if (dyq.getLatency() < 150) {
+            integer6 = 0;
         }
-        else if (dns.getLatency() < 300) {
-            integer5 = 1;
+        else if (dyq.getLatency() < 300) {
+            integer6 = 1;
         }
-        else if (dns.getLatency() < 600) {
-            integer5 = 2;
+        else if (dyq.getLatency() < 600) {
+            integer6 = 2;
         }
-        else if (dns.getLatency() < 1000) {
-            integer5 = 3;
+        else if (dyq.getLatency() < 1000) {
+            integer6 = 3;
         }
         else {
-            integer5 = 4;
+            integer6 = 4;
         }
         this.setBlitOffset(this.getBlitOffset() + 100);
-        this.blit(integer2 + integer1 - 11, integer3, 0, 176 + integer5 * 8, 10, 8);
+        this.blit(dhl, integer3 + integer2 - 11, integer4, 0, 176 + integer6 * 8, 10, 8);
         this.setBlitOffset(this.getBlitOffset() - 100);
     }
     
-    private void renderTablistScore(final Objective cwi, final int integer2, final String string, final int integer4, final int integer5, final PlayerInfo dns) {
-        final int integer6 = cwi.getScoreboard().getOrCreatePlayerScore(string, cwi).getScore();
-        if (cwi.getRenderType() == ObjectiveCriteria.RenderType.HEARTS) {
+    private void renderTablistScore(final Objective dfj, final int integer2, final String string, final int integer4, final int integer5, final PlayerInfo dyq, final PoseStack dhl) {
+        final int integer6 = dfj.getScoreboard().getOrCreatePlayerScore(string, dfj).getScore();
+        if (dfj.getRenderType() == ObjectiveCriteria.RenderType.HEARTS) {
             this.minecraft.getTextureManager().bind(PlayerTabOverlay.GUI_ICONS_LOCATION);
-            final long long9 = Util.getMillis();
-            if (this.visibilityId == dns.getRenderVisibilityId()) {
-                if (integer6 < dns.getLastHealth()) {
-                    dns.setLastHealthTime(long9);
-                    dns.setHealthBlinkTime(this.gui.getGuiTicks() + 20);
+            final long long10 = Util.getMillis();
+            if (this.visibilityId == dyq.getRenderVisibilityId()) {
+                if (integer6 < dyq.getLastHealth()) {
+                    dyq.setLastHealthTime(long10);
+                    dyq.setHealthBlinkTime(this.gui.getGuiTicks() + 20);
                 }
-                else if (integer6 > dns.getLastHealth()) {
-                    dns.setLastHealthTime(long9);
-                    dns.setHealthBlinkTime(this.gui.getGuiTicks() + 10);
+                else if (integer6 > dyq.getLastHealth()) {
+                    dyq.setLastHealthTime(long10);
+                    dyq.setHealthBlinkTime(this.gui.getGuiTicks() + 10);
                 }
             }
-            if (long9 - dns.getLastHealthTime() > 1000L || this.visibilityId != dns.getRenderVisibilityId()) {
-                dns.setLastHealth(integer6);
-                dns.setDisplayHealth(integer6);
-                dns.setLastHealthTime(long9);
+            if (long10 - dyq.getLastHealthTime() > 1000L || this.visibilityId != dyq.getRenderVisibilityId()) {
+                dyq.setLastHealth(integer6);
+                dyq.setDisplayHealth(integer6);
+                dyq.setLastHealthTime(long10);
             }
-            dns.setRenderVisibilityId(this.visibilityId);
-            dns.setLastHealth(integer6);
-            final int integer7 = Mth.ceil(Math.max(integer6, dns.getDisplayHealth()) / 2.0f);
-            final int integer8 = Math.max(Mth.ceil((float)(integer6 / 2)), Math.max(Mth.ceil((float)(dns.getDisplayHealth() / 2)), 10));
-            final boolean boolean13 = dns.getHealthBlinkTime() > this.gui.getGuiTicks() && (dns.getHealthBlinkTime() - this.gui.getGuiTicks()) / 3L % 2L == 1L;
+            dyq.setRenderVisibilityId(this.visibilityId);
+            dyq.setLastHealth(integer6);
+            final int integer7 = Mth.ceil(Math.max(integer6, dyq.getDisplayHealth()) / 2.0f);
+            final int integer8 = Math.max(Mth.ceil((float)(integer6 / 2)), Math.max(Mth.ceil((float)(dyq.getDisplayHealth() / 2)), 10));
+            final boolean boolean14 = dyq.getHealthBlinkTime() > this.gui.getGuiTicks() && (dyq.getHealthBlinkTime() - this.gui.getGuiTicks()) / 3L % 2L == 1L;
             if (integer7 > 0) {
                 final int integer9 = Mth.floor(Math.min((integer5 - integer4 - 4) / (float)integer8, 9.0f));
                 if (integer9 > 3) {
                     for (int integer10 = integer7; integer10 < integer8; ++integer10) {
-                        this.blit(integer4 + integer10 * integer9, integer2, boolean13 ? 25 : 16, 0, 9, 9);
+                        this.blit(dhl, integer4 + integer10 * integer9, integer2, boolean14 ? 25 : 16, 0, 9, 9);
                     }
                     for (int integer10 = 0; integer10 < integer7; ++integer10) {
-                        this.blit(integer4 + integer10 * integer9, integer2, boolean13 ? 25 : 16, 0, 9, 9);
-                        if (boolean13) {
-                            if (integer10 * 2 + 1 < dns.getDisplayHealth()) {
-                                this.blit(integer4 + integer10 * integer9, integer2, 70, 0, 9, 9);
+                        this.blit(dhl, integer4 + integer10 * integer9, integer2, boolean14 ? 25 : 16, 0, 9, 9);
+                        if (boolean14) {
+                            if (integer10 * 2 + 1 < dyq.getDisplayHealth()) {
+                                this.blit(dhl, integer4 + integer10 * integer9, integer2, 70, 0, 9, 9);
                             }
-                            if (integer10 * 2 + 1 == dns.getDisplayHealth()) {
-                                this.blit(integer4 + integer10 * integer9, integer2, 79, 0, 9, 9);
+                            if (integer10 * 2 + 1 == dyq.getDisplayHealth()) {
+                                this.blit(dhl, integer4 + integer10 * integer9, integer2, 79, 0, 9, 9);
                             }
                         }
                         if (integer10 * 2 + 1 < integer6) {
-                            this.blit(integer4 + integer10 * integer9, integer2, (integer10 >= 10) ? 160 : 52, 0, 9, 9);
+                            this.blit(dhl, integer4 + integer10 * integer9, integer2, (integer10 >= 10) ? 160 : 52, 0, 9, 9);
                         }
                         if (integer10 * 2 + 1 == integer6) {
-                            this.blit(integer4 + integer10 * integer9, integer2, (integer10 >= 10) ? 169 : 61, 0, 9, 9);
+                            this.blit(dhl, integer4 + integer10 * integer9, integer2, (integer10 >= 10) ? 169 : 61, 0, 9, 9);
                         }
                     }
                 }
                 else {
-                    final float float15 = Mth.clamp(integer6 / 20.0f, 0.0f, 1.0f);
-                    final int integer11 = (int)((1.0f - float15) * 255.0f) << 16 | (int)(float15 * 255.0f) << 8;
+                    final float float16 = Mth.clamp(integer6 / 20.0f, 0.0f, 1.0f);
+                    final int integer11 = (int)((1.0f - float16) * 255.0f) << 16 | (int)(float16 * 255.0f) << 8;
                     String string2 = "" + integer6 / 2.0f;
                     if (integer5 - this.minecraft.font.width(string2 + "hp") >= integer4) {
                         string2 += "hp";
                     }
-                    this.minecraft.font.drawShadow(string2, (float)((integer5 + integer4) / 2 - this.minecraft.font.width(string2) / 2), (float)integer2, integer11);
+                    this.minecraft.font.drawShadow(dhl, string2, (float)((integer5 + integer4) / 2 - this.minecraft.font.width(string2) / 2), (float)integer2, integer11);
                 }
             }
         }
         else {
             final String string3 = ChatFormatting.YELLOW + "" + integer6;
-            this.minecraft.font.drawShadow(string3, (float)(integer5 - this.minecraft.font.width(string3)), (float)integer2, 16777215);
+            this.minecraft.font.drawShadow(dhl, string3, (float)(integer5 - this.minecraft.font.width(string3)), (float)integer2, 16777215);
         }
     }
     
-    public void setFooter(@Nullable final Component lf) {
-        this.footer = lf;
+    public void setFooter(@Nullable final Component mr) {
+        this.footer = mr;
     }
     
-    public void setHeader(@Nullable final Component lf) {
-        this.header = lf;
+    public void setHeader(@Nullable final Component mr) {
+        this.header = mr;
     }
     
     public void reset() {
@@ -304,10 +305,10 @@ public class PlayerTabOverlay extends GuiComponent {
         }
         
         @Override
-        public int compare(final PlayerInfo dns1, final PlayerInfo dns2) {
-            final PlayerTeam cwj4 = dns1.getTeam();
-            final PlayerTeam cwj5 = dns2.getTeam();
-            return ComparisonChain.start().compareTrueFirst(dns1.getGameMode() != GameType.SPECTATOR, dns2.getGameMode() != GameType.SPECTATOR).compare((cwj4 != null) ? cwj4.getName() : "", (cwj5 != null) ? cwj5.getName() : "").<String>compare(dns1.getProfile().getName(), dns2.getProfile().getName(), String::compareToIgnoreCase).result();
+        public int compare(final PlayerInfo dyq1, final PlayerInfo dyq2) {
+            final PlayerTeam dfk4 = dyq1.getTeam();
+            final PlayerTeam dfk5 = dyq2.getTeam();
+            return ComparisonChain.start().compareTrueFirst(dyq1.getGameMode() != GameType.SPECTATOR, dyq2.getGameMode() != GameType.SPECTATOR).compare((dfk4 != null) ? dfk4.getName() : "", (dfk5 != null) ? dfk5.getName() : "").<String>compare(dyq1.getProfile().getName(), dyq2.getProfile().getName(), String::compareToIgnoreCase).result();
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/components/ScrolledSelectionList.java b/src/net/minecraft/client/gui/components/ScrolledSelectionList.java
deleted file mode 100644
index 3a2e0d8..0000000
--- a/src/net/minecraft/client/gui/components/ScrolledSelectionList.java
+++ /dev/null
@@ -1,410 +0,0 @@
-package net.minecraft.client.gui.components;
-
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.util.Mth;
-import com.mojang.blaze3d.vertex.Tesselator;
-import java.util.Collections;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import java.util.List;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
-
-public abstract class ScrolledSelectionList extends AbstractContainerEventHandler implements Widget {
-    protected static final int NO_DRAG = -1;
-    protected static final int DRAG_OUTSIDE = -2;
-    protected final Minecraft minecraft;
-    protected int width;
-    protected int height;
-    protected int y0;
-    protected int y1;
-    protected int x1;
-    protected int x0;
-    protected final int itemHeight;
-    protected boolean centerListVertically;
-    protected int yDrag;
-    protected double yo;
-    protected boolean visible;
-    protected boolean renderSelection;
-    protected boolean renderHeader;
-    protected int headerHeight;
-    private boolean scrolling;
-    
-    public ScrolledSelectionList(final Minecraft dbn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.centerListVertically = true;
-        this.yDrag = -2;
-        this.visible = true;
-        this.renderSelection = true;
-        this.minecraft = dbn;
-        this.width = integer2;
-        this.height = integer3;
-        this.y0 = integer4;
-        this.y1 = integer5;
-        this.itemHeight = integer6;
-        this.x0 = 0;
-        this.x1 = integer2;
-    }
-    
-    public void updateSize(final int integer1, final int integer2, final int integer3, final int integer4) {
-        this.width = integer1;
-        this.height = integer2;
-        this.y0 = integer3;
-        this.y1 = integer4;
-        this.x0 = 0;
-        this.x1 = integer1;
-    }
-    
-    public void setRenderSelection(final boolean boolean1) {
-        this.renderSelection = boolean1;
-    }
-    
-    protected void setRenderHeader(final boolean boolean1, final int integer) {
-        this.renderHeader = boolean1;
-        this.headerHeight = integer;
-        if (!boolean1) {
-            this.headerHeight = 0;
-        }
-    }
-    
-    public void setVisible(final boolean boolean1) {
-        this.visible = boolean1;
-    }
-    
-    public boolean isVisible() {
-        return this.visible;
-    }
-    
-    protected abstract int getItemCount();
-    
-    @Override
-    public List<? extends GuiEventListener> children() {
-        return Collections.emptyList();
-    }
-    
-    protected boolean selectItem(final int integer1, final int integer2, final double double3, final double double4) {
-        return true;
-    }
-    
-    protected abstract boolean isSelectedItem(final int integer);
-    
-    protected int getMaxPosition() {
-        return this.getItemCount() * this.itemHeight + this.headerHeight;
-    }
-    
-    protected abstract void renderBackground();
-    
-    protected void updateItemPosition(final int integer1, final int integer2, final int integer3, final float float4) {
-    }
-    
-    protected abstract void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final float float7);
-    
-    protected void renderHeader(final int integer1, final int integer2, final Tesselator cym) {
-    }
-    
-    protected void clickedHeader(final int integer1, final int integer2) {
-    }
-    
-    protected void renderDecorations(final int integer1, final int integer2) {
-    }
-    
-    public int getItemAtPosition(final double double1, final double double2) {
-        final int integer6 = this.x0 + this.width / 2 - this.getRowWidth() / 2;
-        final int integer7 = this.x0 + this.width / 2 + this.getRowWidth() / 2;
-        final int integer8 = Mth.floor(double2 - this.y0) - this.headerHeight + (int)this.yo - 4;
-        final int integer9 = integer8 / this.itemHeight;
-        if (double1 < this.getScrollbarPosition() && double1 >= integer6 && double1 <= integer7 && integer9 >= 0 && integer8 >= 0 && integer9 < this.getItemCount()) {
-            return integer9;
-        }
-        return -1;
-    }
-    
-    protected void capYPosition() {
-        this.yo = Mth.clamp(this.yo, 0.0, this.getMaxScroll());
-    }
-    
-    public int getMaxScroll() {
-        return Math.max(0, this.getMaxPosition() - (this.y1 - this.y0 - 4));
-    }
-    
-    public void centerScrollOn(final int integer) {
-        this.yo = integer * this.itemHeight + this.itemHeight / 2 - (this.y1 - this.y0) / 2;
-        this.capYPosition();
-    }
-    
-    public int getScroll() {
-        return (int)this.yo;
-    }
-    
-    public boolean isMouseInList(final double double1, final double double2) {
-        return double2 >= this.y0 && double2 <= this.y1 && double1 >= this.x0 && double1 <= this.x1;
-    }
-    
-    public int getScrollBottom() {
-        return (int)this.yo - this.height - this.headerHeight;
-    }
-    
-    public void scroll(final int integer) {
-        this.yo += integer;
-        this.capYPosition();
-        this.yDrag = -2;
-    }
-    
-    @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        if (!this.visible) {
-            return;
-        }
-        this.renderBackground();
-        final int integer3 = this.getScrollbarPosition();
-        final int integer4 = integer3 + 6;
-        this.capYPosition();
-        final Tesselator cym7 = Tesselator.getInstance();
-        final BufferBuilder cyg8 = cym7.getBuilder();
-        this.minecraft.getTextureManager().bind(GuiComponent.BACKGROUND_LOCATION);
-        RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        final float float4 = 32.0f;
-        cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg8.vertex(this.x0, this.y1, 0.0).uv(this.x0 / 32.0f, (this.y1 + (int)this.yo) / 32.0f).color(32, 32, 32, 255).endVertex();
-        cyg8.vertex(this.x1, this.y1, 0.0).uv(this.x1 / 32.0f, (this.y1 + (int)this.yo) / 32.0f).color(32, 32, 32, 255).endVertex();
-        cyg8.vertex(this.x1, this.y0, 0.0).uv(this.x1 / 32.0f, (this.y0 + (int)this.yo) / 32.0f).color(32, 32, 32, 255).endVertex();
-        cyg8.vertex(this.x0, this.y0, 0.0).uv(this.x0 / 32.0f, (this.y0 + (int)this.yo) / 32.0f).color(32, 32, 32, 255).endVertex();
-        cym7.end();
-        final int integer5 = this.x0 + this.width / 2 - this.getRowWidth() / 2 + 2;
-        final int integer6 = this.y0 + 4 - (int)this.yo;
-        if (this.renderHeader) {
-            this.renderHeader(integer5, integer6, cym7);
-        }
-        this.renderList(integer5, integer6, integer1, integer2, float3);
-        RenderSystem.disableDepthTest();
-        this.renderHoleBackground(0, this.y0, 255, 255);
-        this.renderHoleBackground(this.y1, this.height, 255, 255);
-        RenderSystem.enableBlend();
-        RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
-        RenderSystem.disableAlphaTest();
-        RenderSystem.shadeModel(7425);
-        RenderSystem.disableTexture();
-        final int integer7 = 4;
-        cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg8.vertex(this.x0, this.y0 + 4, 0.0).uv(0.0f, 1.0f).color(0, 0, 0, 0).endVertex();
-        cyg8.vertex(this.x1, this.y0 + 4, 0.0).uv(1.0f, 1.0f).color(0, 0, 0, 0).endVertex();
-        cyg8.vertex(this.x1, this.y0, 0.0).uv(1.0f, 0.0f).color(0, 0, 0, 255).endVertex();
-        cyg8.vertex(this.x0, this.y0, 0.0).uv(0.0f, 0.0f).color(0, 0, 0, 255).endVertex();
-        cym7.end();
-        cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg8.vertex(this.x0, this.y1, 0.0).uv(0.0f, 1.0f).color(0, 0, 0, 255).endVertex();
-        cyg8.vertex(this.x1, this.y1, 0.0).uv(1.0f, 1.0f).color(0, 0, 0, 255).endVertex();
-        cyg8.vertex(this.x1, this.y1 - 4, 0.0).uv(1.0f, 0.0f).color(0, 0, 0, 0).endVertex();
-        cyg8.vertex(this.x0, this.y1 - 4, 0.0).uv(0.0f, 0.0f).color(0, 0, 0, 0).endVertex();
-        cym7.end();
-        final int integer8 = this.getMaxScroll();
-        if (integer8 > 0) {
-            int integer9 = (int)((this.y1 - this.y0) * (this.y1 - this.y0) / (float)this.getMaxPosition());
-            integer9 = Mth.clamp(integer9, 32, this.y1 - this.y0 - 8);
-            int integer10 = (int)this.yo * (this.y1 - this.y0 - integer9) / integer8 + this.y0;
-            if (integer10 < this.y0) {
-                integer10 = this.y0;
-            }
-            cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-            cyg8.vertex(integer3, this.y1, 0.0).uv(0.0f, 1.0f).color(0, 0, 0, 255).endVertex();
-            cyg8.vertex(integer4, this.y1, 0.0).uv(1.0f, 1.0f).color(0, 0, 0, 255).endVertex();
-            cyg8.vertex(integer4, this.y0, 0.0).uv(1.0f, 0.0f).color(0, 0, 0, 255).endVertex();
-            cyg8.vertex(integer3, this.y0, 0.0).uv(0.0f, 0.0f).color(0, 0, 0, 255).endVertex();
-            cym7.end();
-            cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-            cyg8.vertex(integer3, integer10 + integer9, 0.0).uv(0.0f, 1.0f).color(128, 128, 128, 255).endVertex();
-            cyg8.vertex(integer4, integer10 + integer9, 0.0).uv(1.0f, 1.0f).color(128, 128, 128, 255).endVertex();
-            cyg8.vertex(integer4, integer10, 0.0).uv(1.0f, 0.0f).color(128, 128, 128, 255).endVertex();
-            cyg8.vertex(integer3, integer10, 0.0).uv(0.0f, 0.0f).color(128, 128, 128, 255).endVertex();
-            cym7.end();
-            cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-            cyg8.vertex(integer3, integer10 + integer9 - 1, 0.0).uv(0.0f, 1.0f).color(192, 192, 192, 255).endVertex();
-            cyg8.vertex(integer4 - 1, integer10 + integer9 - 1, 0.0).uv(1.0f, 1.0f).color(192, 192, 192, 255).endVertex();
-            cyg8.vertex(integer4 - 1, integer10, 0.0).uv(1.0f, 0.0f).color(192, 192, 192, 255).endVertex();
-            cyg8.vertex(integer3, integer10, 0.0).uv(0.0f, 0.0f).color(192, 192, 192, 255).endVertex();
-            cym7.end();
-        }
-        this.renderDecorations(integer1, integer2);
-        RenderSystem.enableTexture();
-        RenderSystem.shadeModel(7424);
-        RenderSystem.enableAlphaTest();
-        RenderSystem.disableBlend();
-    }
-    
-    protected void updateScrollingState(final double double1, final double double2, final int integer) {
-        this.scrolling = (integer == 0 && double1 >= this.getScrollbarPosition() && double1 < this.getScrollbarPosition() + 6);
-    }
-    
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        this.updateScrollingState(double1, double2, integer);
-        if (!this.isVisible() || !this.isMouseInList(double1, double2)) {
-            return false;
-        }
-        final int integer2 = this.getItemAtPosition(double1, double2);
-        if (integer2 == -1 && integer == 0) {
-            this.clickedHeader((int)(double1 - (this.x0 + this.width / 2 - this.getRowWidth() / 2)), (int)(double2 - this.y0) + (int)this.yo - 4);
-            return true;
-        }
-        if (integer2 != -1 && this.selectItem(integer2, integer, double1, double2)) {
-            if (this.children().size() > integer2) {
-                this.setFocused((GuiEventListener)this.children().get(integer2));
-            }
-            this.setDragging(true);
-            return true;
-        }
-        return this.scrolling;
-    }
-    
-    @Override
-    public boolean mouseReleased(final double double1, final double double2, final int integer) {
-        if (this.getFocused() != null) {
-            this.getFocused().mouseReleased(double1, double2, integer);
-        }
-        return false;
-    }
-    
-    @Override
-    public boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
-        if (super.mouseDragged(double1, double2, integer, double4, double5)) {
-            return true;
-        }
-        if (!this.isVisible() || integer != 0 || !this.scrolling) {
-            return false;
-        }
-        if (double2 < this.y0) {
-            this.yo = 0.0;
-        }
-        else if (double2 > this.y1) {
-            this.yo = this.getMaxScroll();
-        }
-        else {
-            double double6 = this.getMaxScroll();
-            if (double6 < 1.0) {
-                double6 = 1.0;
-            }
-            int integer2 = (int)((this.y1 - this.y0) * (this.y1 - this.y0) / (float)this.getMaxPosition());
-            integer2 = Mth.clamp(integer2, 32, this.y1 - this.y0 - 8);
-            double double7 = double6 / (this.y1 - this.y0 - integer2);
-            if (double7 < 1.0) {
-                double7 = 1.0;
-            }
-            this.yo += double5 * double7;
-            this.capYPosition();
-        }
-        return true;
-    }
-    
-    @Override
-    public boolean mouseScrolled(final double double1, final double double2, final double double3) {
-        if (!this.isVisible()) {
-            return false;
-        }
-        this.yo -= double3 * this.itemHeight / 2.0;
-        return true;
-    }
-    
-    @Override
-    public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
-        if (!this.isVisible()) {
-            return false;
-        }
-        if (super.keyPressed(integer1, integer2, integer3)) {
-            return true;
-        }
-        if (integer1 == 264) {
-            this.moveSelection(1);
-            return true;
-        }
-        if (integer1 == 265) {
-            this.moveSelection(-1);
-            return true;
-        }
-        return false;
-    }
-    
-    protected void moveSelection(final int integer) {
-    }
-    
-    @Override
-    public boolean charTyped(final char character, final int integer) {
-        return this.isVisible() && super.charTyped(character, integer);
-    }
-    
-    @Override
-    public boolean isMouseOver(final double double1, final double double2) {
-        return this.isMouseInList(double1, double2);
-    }
-    
-    public int getRowWidth() {
-        return 220;
-    }
-    
-    protected void renderList(final int integer1, final int integer2, final int integer3, final int integer4, final float float5) {
-        final int integer5 = this.getItemCount();
-        final Tesselator cym8 = Tesselator.getInstance();
-        final BufferBuilder cyg9 = cym8.getBuilder();
-        for (int integer6 = 0; integer6 < integer5; ++integer6) {
-            final int integer7 = integer2 + integer6 * this.itemHeight + this.headerHeight;
-            final int integer8 = this.itemHeight - 4;
-            if (integer7 > this.y1 || integer7 + integer8 < this.y0) {
-                this.updateItemPosition(integer6, integer1, integer7, float5);
-            }
-            if (this.renderSelection && this.isSelectedItem(integer6)) {
-                final int integer9 = this.x0 + this.width / 2 - this.getRowWidth() / 2;
-                final int integer10 = this.x0 + this.width / 2 + this.getRowWidth() / 2;
-                RenderSystem.disableTexture();
-                final float float6 = this.isFocused() ? 1.0f : 0.5f;
-                RenderSystem.color4f(float6, float6, float6, 1.0f);
-                cyg9.begin(7, DefaultVertexFormat.POSITION);
-                cyg9.vertex(integer9, integer7 + integer8 + 2, 0.0).endVertex();
-                cyg9.vertex(integer10, integer7 + integer8 + 2, 0.0).endVertex();
-                cyg9.vertex(integer10, integer7 - 2, 0.0).endVertex();
-                cyg9.vertex(integer9, integer7 - 2, 0.0).endVertex();
-                cym8.end();
-                RenderSystem.color4f(0.0f, 0.0f, 0.0f, 1.0f);
-                cyg9.begin(7, DefaultVertexFormat.POSITION);
-                cyg9.vertex(integer9 + 1, integer7 + integer8 + 1, 0.0).endVertex();
-                cyg9.vertex(integer10 - 1, integer7 + integer8 + 1, 0.0).endVertex();
-                cyg9.vertex(integer10 - 1, integer7 - 1, 0.0).endVertex();
-                cyg9.vertex(integer9 + 1, integer7 - 1, 0.0).endVertex();
-                cym8.end();
-                RenderSystem.enableTexture();
-            }
-            this.renderItem(integer6, integer1, integer7, integer8, integer3, integer4, float5);
-        }
-    }
-    
-    protected boolean isFocused() {
-        return false;
-    }
-    
-    protected int getScrollbarPosition() {
-        return this.width / 2 + 124;
-    }
-    
-    protected void renderHoleBackground(final int integer1, final int integer2, final int integer3, final int integer4) {
-        final Tesselator cym6 = Tesselator.getInstance();
-        final BufferBuilder cyg7 = cym6.getBuilder();
-        this.minecraft.getTextureManager().bind(GuiComponent.BACKGROUND_LOCATION);
-        RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        final float float8 = 32.0f;
-        cyg7.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg7.vertex(this.x0, integer2, 0.0).uv(0.0f, integer2 / 32.0f).color(64, 64, 64, integer4).endVertex();
-        cyg7.vertex(this.x0 + this.width, integer2, 0.0).uv(this.width / 32.0f, integer2 / 32.0f).color(64, 64, 64, integer4).endVertex();
-        cyg7.vertex(this.x0 + this.width, integer1, 0.0).uv(this.width / 32.0f, integer1 / 32.0f).color(64, 64, 64, integer3).endVertex();
-        cyg7.vertex(this.x0, integer1, 0.0).uv(0.0f, integer1 / 32.0f).color(64, 64, 64, integer3).endVertex();
-        cym6.end();
-    }
-    
-    public void setLeftPos(final int integer) {
-        this.x0 = integer;
-        this.x1 = integer + this.width;
-    }
-    
-    public int getItemHeight() {
-        return this.itemHeight;
-    }
-}
diff --git a/src/net/minecraft/client/gui/components/SliderButton.java b/src/net/minecraft/client/gui/components/SliderButton.java
index c734224..0253c32 100644
--- a/src/net/minecraft/client/gui/components/SliderButton.java
+++ b/src/net/minecraft/client/gui/components/SliderButton.java
@@ -3,12 +3,12 @@ package net.minecraft.client.gui.components;
 import net.minecraft.client.Options;
 import net.minecraft.client.ProgressOption;
 
-public class SliderButton extends AbstractSliderButton {
+public class SliderButton extends AbstractOptionSliderButton {
     private final ProgressOption option;
     
-    public SliderButton(final Options dbr, final int integer2, final int integer3, final int integer4, final int integer5, final ProgressOption dbt) {
-        super(dbr, integer2, integer3, integer4, integer5, (float)dbt.toPct(dbt.get(dbr)));
-        this.option = dbt;
+    public SliderButton(final Options dmb, final int integer2, final int integer3, final int integer4, final int integer5, final ProgressOption dmd) {
+        super(dmb, integer2, integer3, integer4, integer5, (float)dmd.toPct(dmd.get(dmb)));
+        this.option = dmd;
         this.updateMessage();
     }
     
diff --git a/src/net/minecraft/client/gui/components/StateSwitchingButton.java b/src/net/minecraft/client/gui/components/StateSwitchingButton.java
index a37d2aa..9db33d8 100644
--- a/src/net/minecraft/client/gui/components/StateSwitchingButton.java
+++ b/src/net/minecraft/client/gui/components/StateSwitchingButton.java
@@ -2,6 +2,8 @@ package net.minecraft.client.gui.components;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.resources.ResourceLocation;
 
 public class StateSwitchingButton extends AbstractWidget {
@@ -13,16 +15,16 @@ public class StateSwitchingButton extends AbstractWidget {
     protected int yDiffTex;
     
     public StateSwitchingButton(final int integer1, final int integer2, final int integer3, final int integer4, final boolean boolean5) {
-        super(integer1, integer2, integer3, integer4, "");
+        super(integer1, integer2, integer3, integer4, TextComponent.EMPTY);
         this.isStateTriggered = boolean5;
     }
     
-    public void initTextureValues(final int integer1, final int integer2, final int integer3, final int integer4, final ResourceLocation sm) {
+    public void initTextureValues(final int integer1, final int integer2, final int integer3, final int integer4, final ResourceLocation uh) {
         this.xTexStart = integer1;
         this.yTexStart = integer2;
         this.xDiffTex = integer3;
         this.yDiffTex = integer4;
-        this.resourceLocation = sm;
+        this.resourceLocation = uh;
     }
     
     public void setStateTriggered(final boolean boolean1) {
@@ -39,19 +41,19 @@ public class StateSwitchingButton extends AbstractWidget {
     }
     
     @Override
-    public void renderButton(final int integer1, final int integer2, final float float3) {
-        final Minecraft dbn5 = Minecraft.getInstance();
-        dbn5.getTextureManager().bind(this.resourceLocation);
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        final Minecraft dlx6 = Minecraft.getInstance();
+        dlx6.getTextureManager().bind(this.resourceLocation);
         RenderSystem.disableDepthTest();
-        int integer3 = this.xTexStart;
-        int integer4 = this.yTexStart;
+        int integer4 = this.xTexStart;
+        int integer5 = this.yTexStart;
         if (this.isStateTriggered) {
-            integer3 += this.xDiffTex;
+            integer4 += this.xDiffTex;
         }
         if (this.isHovered()) {
-            integer4 += this.yDiffTex;
+            integer5 += this.yDiffTex;
         }
-        this.blit(this.x, this.y, integer3, integer4, this.width, this.height);
+        this.blit(dhl, this.x, this.y, integer4, integer5, this.width, this.height);
         RenderSystem.enableDepthTest();
     }
 }
diff --git a/src/net/minecraft/client/gui/components/SubtitleOverlay.java b/src/net/minecraft/client/gui/components/SubtitleOverlay.java
index ca345db..333acb2 100644
--- a/src/net/minecraft/client/gui/components/SubtitleOverlay.java
+++ b/src/net/minecraft/client/gui/components/SubtitleOverlay.java
@@ -2,11 +2,14 @@ package net.minecraft.client.gui.components;
 
 import net.minecraft.client.sounds.WeighedSoundEvents;
 import net.minecraft.client.resources.sounds.SoundInstance;
+import net.minecraft.network.chat.Component;
 import java.util.Iterator;
 import net.minecraft.util.Mth;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.Util;
 import net.minecraft.world.phys.Vec3;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.collect.Lists;
 import java.util.List;
 import net.minecraft.client.Minecraft;
@@ -18,12 +21,12 @@ public class SubtitleOverlay extends GuiComponent implements SoundEventListener
     private final List<Subtitle> subtitles;
     private boolean isListening;
     
-    public SubtitleOverlay(final Minecraft dbn) {
+    public SubtitleOverlay(final Minecraft dlx) {
         this.subtitles = Lists.newArrayList();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
-    public void render() {
+    public void render(final PoseStack dhl) {
         if (!this.isListening && this.minecraft.options.showSubtitles) {
             this.minecraft.getSoundManager().addListener(this);
             this.isListening = true;
@@ -38,90 +41,90 @@ public class SubtitleOverlay extends GuiComponent implements SoundEventListener
         RenderSystem.pushMatrix();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        final Vec3 cvl2 = new Vec3(this.minecraft.player.getX(), this.minecraft.player.getEyeY(), this.minecraft.player.getZ());
-        final Vec3 cvl3 = new Vec3(0.0, 0.0, -1.0).xRot(-this.minecraft.player.xRot * 0.017453292f).yRot(-this.minecraft.player.yRot * 0.017453292f);
-        final Vec3 cvl4 = new Vec3(0.0, 1.0, 0.0).xRot(-this.minecraft.player.xRot * 0.017453292f).yRot(-this.minecraft.player.yRot * 0.017453292f);
-        final Vec3 cvl5 = cvl3.cross(cvl4);
-        int integer6 = 0;
+        final Vec3 dem3 = new Vec3(this.minecraft.player.getX(), this.minecraft.player.getEyeY(), this.minecraft.player.getZ());
+        final Vec3 dem4 = new Vec3(0.0, 0.0, -1.0).xRot(-this.minecraft.player.xRot * 0.017453292f).yRot(-this.minecraft.player.yRot * 0.017453292f);
+        final Vec3 dem5 = new Vec3(0.0, 1.0, 0.0).xRot(-this.minecraft.player.xRot * 0.017453292f).yRot(-this.minecraft.player.yRot * 0.017453292f);
+        final Vec3 dem6 = dem4.cross(dem5);
         int integer7 = 0;
-        final Iterator<Subtitle> iterator8 = this.subtitles.iterator();
-        while (iterator8.hasNext()) {
-            final Subtitle a9 = iterator8.next();
-            if (a9.getTime() + 3000L <= Util.getMillis()) {
-                iterator8.remove();
-            }
-            else {
-                integer7 = Math.max(integer7, this.minecraft.font.width(a9.getText()));
-            }
-        }
-        integer7 += this.minecraft.font.width("<") + this.minecraft.font.width(" ") + this.minecraft.font.width(">") + this.minecraft.font.width(" ");
+        int integer8 = 0;
         final Iterator<Subtitle> iterator9 = this.subtitles.iterator();
         while (iterator9.hasNext()) {
-            final Subtitle a9 = iterator9.next();
-            final int integer8 = 255;
-            final String string11 = a9.getText();
-            final Vec3 cvl6 = a9.getLocation().subtract(cvl2).normalize();
-            final double double13 = -cvl5.dot(cvl6);
-            final double double14 = -cvl3.dot(cvl6);
-            final boolean boolean17 = double14 > 0.5;
-            final int integer9 = integer7 / 2;
+            final Subtitle a10 = iterator9.next();
+            if (a10.getTime() + 3000L <= Util.getMillis()) {
+                iterator9.remove();
+            }
+            else {
+                integer8 = Math.max(integer8, this.minecraft.font.width(a10.getText()));
+            }
+        }
+        integer8 += this.minecraft.font.width("<") + this.minecraft.font.width(" ") + this.minecraft.font.width(">") + this.minecraft.font.width(" ");
+        final Iterator<Subtitle> iterator10 = this.subtitles.iterator();
+        while (iterator10.hasNext()) {
+            final Subtitle a10 = iterator10.next();
+            final int integer9 = 255;
+            final Component mr12 = a10.getText();
+            final Vec3 dem7 = a10.getLocation().subtract(dem3).normalize();
+            final double double14 = -dem6.dot(dem7);
+            final double double15 = -dem4.dot(dem7);
+            final boolean boolean18 = double15 > 0.5;
+            final int integer10 = integer8 / 2;
             this.minecraft.font.getClass();
-            final int integer10 = 9;
-            final int integer11 = integer10 / 2;
-            final float float21 = 1.0f;
-            final int integer12 = this.minecraft.font.width(string11);
-            final int integer13 = Mth.floor(Mth.clampedLerp(255.0, 75.0, (Util.getMillis() - a9.getTime()) / 3000.0f));
-            final int integer14 = integer13 << 16 | integer13 << 8 | integer13;
+            final int integer11 = 9;
+            final int integer12 = integer11 / 2;
+            final float float22 = 1.0f;
+            final int integer13 = this.minecraft.font.width(mr12);
+            final int integer14 = Mth.floor(Mth.clampedLerp(255.0, 75.0, (Util.getMillis() - a10.getTime()) / 3000.0f));
+            final int integer15 = integer14 << 16 | integer14 << 8 | integer14;
             RenderSystem.pushMatrix();
-            RenderSystem.translatef(this.minecraft.getWindow().getGuiScaledWidth() - integer9 * 1.0f - 2.0f, this.minecraft.getWindow().getGuiScaledHeight() - 30 - integer6 * (integer10 + 1) * 1.0f, 0.0f);
+            RenderSystem.translatef(this.minecraft.getWindow().getGuiScaledWidth() - integer10 * 1.0f - 2.0f, this.minecraft.getWindow().getGuiScaledHeight() - 30 - integer7 * (integer11 + 1) * 1.0f, 0.0f);
             RenderSystem.scalef(1.0f, 1.0f, 1.0f);
-            GuiComponent.fill(-integer9 - 1, -integer11 - 1, integer9 + 1, integer11 + 1, this.minecraft.options.getBackgroundColor(0.8f));
+            GuiComponent.fill(dhl, -integer10 - 1, -integer12 - 1, integer10 + 1, integer12 + 1, this.minecraft.options.getBackgroundColor(0.8f));
             RenderSystem.enableBlend();
-            if (!boolean17) {
-                if (double13 > 0.0) {
-                    this.minecraft.font.draw(">", (float)(integer9 - this.minecraft.font.width(">")), (float)(-integer11), integer14 - 16777216);
+            if (!boolean18) {
+                if (double14 > 0.0) {
+                    this.minecraft.font.draw(dhl, ">", (float)(integer10 - this.minecraft.font.width(">")), (float)(-integer12), integer15 - 16777216);
                 }
-                else if (double13 < 0.0) {
-                    this.minecraft.font.draw("<", (float)(-integer9), (float)(-integer11), integer14 - 16777216);
+                else if (double14 < 0.0) {
+                    this.minecraft.font.draw(dhl, "<", (float)(-integer10), (float)(-integer12), integer15 - 16777216);
                 }
             }
-            this.minecraft.font.draw(string11, (float)(-integer12 / 2), (float)(-integer11), integer14 - 16777216);
+            this.minecraft.font.draw(dhl, mr12, (float)(-integer13 / 2), (float)(-integer12), integer15 - 16777216);
             RenderSystem.popMatrix();
-            ++integer6;
+            ++integer7;
         }
         RenderSystem.disableBlend();
         RenderSystem.popMatrix();
     }
     
     @Override
-    public void onPlaySound(final SoundInstance ecz, final WeighedSoundEvents eea) {
-        if (eea.getSubtitle() == null) {
+    public void onPlaySound(final SoundInstance eom, final WeighedSoundEvents epo) {
+        if (epo.getSubtitle() == null) {
             return;
         }
-        final String string4 = eea.getSubtitle().getColoredString();
+        final Component mr4 = epo.getSubtitle();
         if (!this.subtitles.isEmpty()) {
             for (final Subtitle a6 : this.subtitles) {
-                if (a6.getText().equals(string4)) {
-                    a6.refresh(new Vec3(ecz.getX(), ecz.getY(), ecz.getZ()));
+                if (a6.getText().equals(mr4)) {
+                    a6.refresh(new Vec3(eom.getX(), eom.getY(), eom.getZ()));
                     return;
                 }
             }
         }
-        this.subtitles.add(new Subtitle(string4, new Vec3(ecz.getX(), ecz.getY(), ecz.getZ())));
+        this.subtitles.add(new Subtitle(mr4, new Vec3(eom.getX(), eom.getY(), eom.getZ())));
     }
     
     public class Subtitle {
-        private final String text;
+        private final Component text;
         private long time;
         private Vec3 location;
         
-        public Subtitle(final String string, final Vec3 cvl) {
-            this.text = string;
-            this.location = cvl;
+        public Subtitle(final Component mr, final Vec3 dem) {
+            this.text = mr;
+            this.location = dem;
             this.time = Util.getMillis();
         }
         
-        public String getText() {
+        public Component getText() {
             return this.text;
         }
         
@@ -133,8 +136,8 @@ public class SubtitleOverlay extends GuiComponent implements SoundEventListener
             return this.location;
         }
         
-        public void refresh(final Vec3 cvl) {
-            this.location = cvl;
+        public void refresh(final Vec3 dem) {
+            this.location = dem;
             this.time = Util.getMillis();
         }
     }
diff --git a/src/net/minecraft/client/gui/components/TickableWidget.java b/src/net/minecraft/client/gui/components/TickableWidget.java
new file mode 100644
index 0000000..309f686
--- /dev/null
+++ b/src/net/minecraft/client/gui/components/TickableWidget.java
@@ -0,0 +1,6 @@
+package net.minecraft.client.gui.components;
+
+@FunctionalInterface
+public interface TickableWidget {
+    void tick();
+}
diff --git a/src/net/minecraft/client/gui/components/VolumeSlider.java b/src/net/minecraft/client/gui/components/VolumeSlider.java
index c866dec..c2e8466 100644
--- a/src/net/minecraft/client/gui/components/VolumeSlider.java
+++ b/src/net/minecraft/client/gui/components/VolumeSlider.java
@@ -1,22 +1,25 @@
 package net.minecraft.client.gui.components;
 
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.sounds.SoundSource;
 
-public class VolumeSlider extends AbstractSliderButton {
+public class VolumeSlider extends AbstractOptionSliderButton {
     private final SoundSource source;
     
-    public VolumeSlider(final Minecraft dbn, final int integer2, final int integer3, final SoundSource aaj, final int integer5) {
-        super(dbn.options, integer2, integer3, integer5, 20, dbn.options.getSoundSourceVolume(aaj));
-        this.source = aaj;
+    public VolumeSlider(final Minecraft dlx, final int integer2, final int integer3, final SoundSource acm, final int integer5) {
+        super(dlx.options, integer2, integer3, integer5, 20, dlx.options.getSoundSourceVolume(acm));
+        this.source = acm;
         this.updateMessage();
     }
     
     @Override
     protected void updateMessage() {
-        final String string2 = ((float)this.value == this.getYImage(false)) ? I18n.get("options.off") : ((int)((float)this.value * 100.0f) + "%");
-        this.setMessage(I18n.get("soundCategory." + this.source.getName()) + ": " + string2);
+        final Component mr2 = ((float)this.value == this.getYImage(false)) ? CommonComponents.OPTION_OFF : new TextComponent((int)(this.value * 100.0) + "%");
+        this.setMessage(new TranslatableComponent("soundCategory." + this.source.getName()).append(": ").append(mr2));
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/components/Widget.java b/src/net/minecraft/client/gui/components/Widget.java
index abdf714..d3b516d 100644
--- a/src/net/minecraft/client/gui/components/Widget.java
+++ b/src/net/minecraft/client/gui/components/Widget.java
@@ -1,5 +1,7 @@
 package net.minecraft.client.gui.components;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+
 public interface Widget {
-    void render(final int integer1, final int integer2, final float float3);
+    void render(final PoseStack dhl, final int integer2, final int integer3, final float float4);
 }
diff --git a/src/net/minecraft/client/gui/components/events/AbstractContainerEventHandler.java b/src/net/minecraft/client/gui/components/events/AbstractContainerEventHandler.java
index b20f2d7..bfcb810 100644
--- a/src/net/minecraft/client/gui/components/events/AbstractContainerEventHandler.java
+++ b/src/net/minecraft/client/gui/components/events/AbstractContainerEventHandler.java
@@ -25,7 +25,7 @@ public abstract class AbstractContainerEventHandler extends GuiComponent impleme
     }
     
     @Override
-    public void setFocused(@Nullable final GuiEventListener dds) {
-        this.focused = dds;
+    public void setFocused(@Nullable final GuiEventListener dof) {
+        this.focused = dof;
     }
 }
diff --git a/src/net/minecraft/client/gui/components/events/ContainerEventHandler.java b/src/net/minecraft/client/gui/components/events/ContainerEventHandler.java
index 1408f10..adbb9e6 100644
--- a/src/net/minecraft/client/gui/components/events/ContainerEventHandler.java
+++ b/src/net/minecraft/client/gui/components/events/ContainerEventHandler.java
@@ -12,18 +12,18 @@ public interface ContainerEventHandler extends GuiEventListener {
     List<? extends GuiEventListener> children();
     
     default Optional<GuiEventListener> getChildAt(final double double1, final double double2) {
-        for (final GuiEventListener dds7 : this.children()) {
-            if (dds7.isMouseOver(double1, double2)) {
-                return Optional.<GuiEventListener>of(dds7);
+        for (final GuiEventListener dof7 : this.children()) {
+            if (dof7.isMouseOver(double1, double2)) {
+                return Optional.<GuiEventListener>of(dof7);
             }
         }
         return Optional.<GuiEventListener>empty();
     }
     
     default boolean mouseClicked(final double double1, final double double2, final int integer) {
-        for (final GuiEventListener dds8 : this.children()) {
-            if (dds8.mouseClicked(double1, double2, integer)) {
-                this.setFocused(dds8);
+        for (final GuiEventListener dof8 : this.children()) {
+            if (dof8.mouseClicked(double1, double2, integer)) {
+                this.setFocused(dof8);
                 if (integer == 0) {
                     this.setDragging(true);
                 }
@@ -35,7 +35,7 @@ public interface ContainerEventHandler extends GuiEventListener {
     
     default boolean mouseReleased(final double double1, final double double2, final int integer) {
         this.setDragging(false);
-        return this.getChildAt(double1, double2).filter(dds -> dds.mouseReleased(double1, double2, integer)).isPresent();
+        return this.getChildAt(double1, double2).filter(dof -> dof.mouseReleased(double1, double2, integer)).isPresent();
     }
     
     default boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
@@ -47,7 +47,7 @@ public interface ContainerEventHandler extends GuiEventListener {
     void setDragging(final boolean boolean1);
     
     default boolean mouseScrolled(final double double1, final double double2, final double double3) {
-        return this.getChildAt(double1, double2).filter(dds -> dds.mouseScrolled(double1, double2, double3)).isPresent();
+        return this.getChildAt(double1, double2).filter(dof -> dof.mouseScrolled(double1, double2, double3)).isPresent();
     }
     
     default boolean keyPressed(final int integer1, final int integer2, final int integer3) {
@@ -65,24 +65,25 @@ public interface ContainerEventHandler extends GuiEventListener {
     @Nullable
     GuiEventListener getFocused();
     
-    void setFocused(@Nullable final GuiEventListener dds);
+    void setFocused(@Nullable final GuiEventListener dof);
     
-    default void setInitialFocus(@Nullable final GuiEventListener dds) {
-        this.setFocused(dds);
+    default void setInitialFocus(@Nullable final GuiEventListener dof) {
+        this.setFocused(dof);
+        dof.changeFocus(true);
     }
     
-    default void magicalSpecialHackyFocus(@Nullable final GuiEventListener dds) {
-        this.setFocused(dds);
+    default void magicalSpecialHackyFocus(@Nullable final GuiEventListener dof) {
+        this.setFocused(dof);
     }
     
     default boolean changeFocus(final boolean boolean1) {
-        final GuiEventListener dds3 = this.getFocused();
-        final boolean boolean2 = dds3 != null;
-        if (boolean2 && dds3.changeFocus(boolean1)) {
+        final GuiEventListener dof3 = this.getFocused();
+        final boolean boolean2 = dof3 != null;
+        if (boolean2 && dof3.changeFocus(boolean1)) {
             return true;
         }
         final List<? extends GuiEventListener> list5 = this.children();
-        final int integer7 = list5.indexOf(dds3);
+        final int integer7 = list5.indexOf(dof3);
         int integer8;
         if (boolean2 && integer7 >= 0) {
             integer8 = integer7 + (boolean1 ? 1 : 0);
@@ -97,9 +98,9 @@ public interface ContainerEventHandler extends GuiEventListener {
         final BooleanSupplier booleanSupplier9 = boolean1 ? listIterator8::hasNext : listIterator8::hasPrevious;
         final Supplier<? extends GuiEventListener> supplier10 = (boolean1 ? listIterator8::next : listIterator8::previous);
         while (booleanSupplier9.getAsBoolean()) {
-            final GuiEventListener dds4 = (GuiEventListener)supplier10.get();
-            if (dds4.changeFocus(boolean1)) {
-                this.setFocused(dds4);
+            final GuiEventListener dof4 = (GuiEventListener)supplier10.get();
+            if (dof4.changeFocus(boolean1)) {
+                this.setFocused(dof4);
                 return true;
             }
         }
diff --git a/src/net/minecraft/client/gui/components/spectator/SpectatorGui.java b/src/net/minecraft/client/gui/components/spectator/SpectatorGui.java
index 003a68c..6de8400 100644
--- a/src/net/minecraft/client/gui/components/spectator/SpectatorGui.java
+++ b/src/net/minecraft/client/gui/components/spectator/SpectatorGui.java
@@ -1,8 +1,11 @@
 package net.minecraft.client.gui.components.spectator;
 
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.client.gui.spectator.SpectatorMenuItem;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.spectator.categories.SpectatorPage;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.util.Mth;
 import net.minecraft.Util;
 import net.minecraft.client.gui.spectator.SpectatorMenu;
@@ -18,8 +21,8 @@ public class SpectatorGui extends GuiComponent implements SpectatorMenuListener
     private long lastSelectionTime;
     private SpectatorMenu menu;
     
-    public SpectatorGui(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public SpectatorGui(final Minecraft dlx) {
+        this.minecraft = dlx;
     }
     
     public void onHotbarSelected(final int integer) {
@@ -37,70 +40,70 @@ public class SpectatorGui extends GuiComponent implements SpectatorMenuListener
         return Mth.clamp(long2 / 2000.0f, 0.0f, 1.0f);
     }
     
-    public void renderHotbar(final float float1) {
+    public void renderHotbar(final PoseStack dhl, final float float2) {
         if (this.menu == null) {
             return;
         }
-        final float float2 = this.getHotbarAlpha();
-        if (float2 <= 0.0f) {
+        final float float3 = this.getHotbarAlpha();
+        if (float3 <= 0.0f) {
             this.menu.exit();
             return;
         }
-        final int integer4 = this.minecraft.getWindow().getGuiScaledWidth() / 2;
-        final int integer5 = this.getBlitOffset();
+        final int integer5 = this.minecraft.getWindow().getGuiScaledWidth() / 2;
+        final int integer6 = this.getBlitOffset();
         this.setBlitOffset(-90);
-        final int integer6 = Mth.floor(this.minecraft.getWindow().getGuiScaledHeight() - 22.0f * float2);
-        final SpectatorPage djt7 = this.menu.getCurrentPage();
-        this.renderPage(float2, integer4, integer6, djt7);
-        this.setBlitOffset(integer5);
+        final int integer7 = Mth.floor(this.minecraft.getWindow().getGuiScaledHeight() - 22.0f * float3);
+        final SpectatorPage dun8 = this.menu.getCurrentPage();
+        this.renderPage(dhl, float3, integer5, integer7, dun8);
+        this.setBlitOffset(integer6);
     }
     
-    protected void renderPage(final float float1, final int integer2, final int integer3, final SpectatorPage djt) {
+    protected void renderPage(final PoseStack dhl, final float float2, final int integer3, final int integer4, final SpectatorPage dun) {
         RenderSystem.enableRescaleNormal();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        RenderSystem.color4f(1.0f, 1.0f, 1.0f, float1);
+        RenderSystem.color4f(1.0f, 1.0f, 1.0f, float2);
         this.minecraft.getTextureManager().bind(SpectatorGui.WIDGETS_LOCATION);
-        this.blit(integer2 - 91, integer3, 0, 0, 182, 22);
-        if (djt.getSelectedSlot() >= 0) {
-            this.blit(integer2 - 91 - 1 + djt.getSelectedSlot() * 20, integer3 - 1, 0, 22, 24, 22);
+        this.blit(dhl, integer3 - 91, integer4, 0, 0, 182, 22);
+        if (dun.getSelectedSlot() >= 0) {
+            this.blit(dhl, integer3 - 91 - 1 + dun.getSelectedSlot() * 20, integer4 - 1, 0, 22, 24, 22);
         }
-        for (int integer4 = 0; integer4 < 9; ++integer4) {
-            this.renderSlot(integer4, this.minecraft.getWindow().getGuiScaledWidth() / 2 - 90 + integer4 * 20 + 2, (float)(integer3 + 3), float1, djt.getItem(integer4));
+        for (int integer5 = 0; integer5 < 9; ++integer5) {
+            this.renderSlot(dhl, integer5, this.minecraft.getWindow().getGuiScaledWidth() / 2 - 90 + integer5 * 20 + 2, (float)(integer4 + 3), float2, dun.getItem(integer5));
         }
         RenderSystem.disableRescaleNormal();
         RenderSystem.disableBlend();
     }
     
-    private void renderSlot(final int integer1, final int integer2, final float float3, final float float4, final SpectatorMenuItem djr) {
+    private void renderSlot(final PoseStack dhl, final int integer2, final int integer3, final float float4, final float float5, final SpectatorMenuItem dul) {
         this.minecraft.getTextureManager().bind(SpectatorGui.SPECTATOR_LOCATION);
-        if (djr != SpectatorMenu.EMPTY_SLOT) {
-            final int integer3 = (int)(float4 * 255.0f);
+        if (dul != SpectatorMenu.EMPTY_SLOT) {
+            final int integer4 = (int)(float5 * 255.0f);
             RenderSystem.pushMatrix();
-            RenderSystem.translatef((float)integer2, float3, 0.0f);
-            final float float5 = djr.isEnabled() ? 1.0f : 0.25f;
-            RenderSystem.color4f(float5, float5, float5, float4);
-            djr.renderIcon(float5, integer3);
+            RenderSystem.translatef((float)integer3, float4, 0.0f);
+            final float float6 = dul.isEnabled() ? 1.0f : 0.25f;
+            RenderSystem.color4f(float6, float6, float6, float5);
+            dul.renderIcon(dhl, float6, integer4);
             RenderSystem.popMatrix();
-            final String string9 = String.valueOf(this.minecraft.options.keyHotbarSlots[integer1].getTranslatedKeyMessage());
-            if (integer3 > 3 && djr.isEnabled()) {
-                this.minecraft.font.drawShadow(string9, (float)(integer2 + 19 - 2 - this.minecraft.font.width(string9)), float3 + 6.0f + 3.0f, 16777215 + (integer3 << 24));
+            if (integer4 > 3 && dul.isEnabled()) {
+                final Component mr10 = this.minecraft.options.keyHotbarSlots[integer2].getTranslatedKeyMessage();
+                this.minecraft.font.drawShadow(dhl, mr10, (float)(integer3 + 19 - 2 - this.minecraft.font.width(mr10)), float4 + 6.0f + 3.0f, 16777215 + (integer4 << 24));
             }
         }
     }
     
-    public void renderTooltip() {
-        final int integer2 = (int)(this.getHotbarAlpha() * 255.0f);
-        if (integer2 > 3 && this.menu != null) {
-            final SpectatorMenuItem djr3 = this.menu.getSelectedItem();
-            final String string4 = (djr3 == SpectatorMenu.EMPTY_SLOT) ? this.menu.getSelectedCategory().getPrompt().getColoredString() : djr3.getName().getColoredString();
-            if (string4 != null) {
-                final int integer3 = (this.minecraft.getWindow().getGuiScaledWidth() - this.minecraft.font.width(string4)) / 2;
-                final int integer4 = this.minecraft.getWindow().getGuiScaledHeight() - 35;
+    public void renderTooltip(final PoseStack dhl) {
+        final int integer3 = (int)(this.getHotbarAlpha() * 255.0f);
+        if (integer3 > 3 && this.menu != null) {
+            final SpectatorMenuItem dul4 = this.menu.getSelectedItem();
+            final Component mr5 = (dul4 == SpectatorMenu.EMPTY_SLOT) ? this.menu.getSelectedCategory().getPrompt() : dul4.getName();
+            if (mr5 != null) {
+                final int integer4 = (this.minecraft.getWindow().getGuiScaledWidth() - this.minecraft.font.width(mr5)) / 2;
+                final int integer5 = this.minecraft.getWindow().getGuiScaledHeight() - 35;
                 RenderSystem.pushMatrix();
                 RenderSystem.enableBlend();
                 RenderSystem.defaultBlendFunc();
-                this.minecraft.font.drawShadow(string4, (float)integer3, (float)integer4, 16777215 + (integer2 << 24));
+                this.minecraft.font.drawShadow(dhl, mr5, (float)integer4, (float)integer5, 16777215 + (integer3 << 24));
                 RenderSystem.disableBlend();
                 RenderSystem.popMatrix();
             }
@@ -108,7 +111,7 @@ public class SpectatorGui extends GuiComponent implements SpectatorMenuListener
     }
     
     @Override
-    public void onSpectatorMenuClosed(final SpectatorMenu djp) {
+    public void onSpectatorMenuClosed(final SpectatorMenu duj) {
         this.menu = null;
         this.lastSelectionTime = 0L;
     }
diff --git a/src/net/minecraft/client/gui/components/toasts/AdvancementToast.java b/src/net/minecraft/client/gui/components/toasts/AdvancementToast.java
index 2204eaf..c0ecea2 100644
--- a/src/net/minecraft/client/gui/components/toasts/AdvancementToast.java
+++ b/src/net/minecraft/client/gui/components/toasts/AdvancementToast.java
@@ -3,66 +3,67 @@ package net.minecraft.client.gui.components.toasts;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.advancements.DisplayInfo;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.Mth;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.advancements.FrameType;
+import net.minecraft.network.chat.FormattedText;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.advancements.Advancement;
 
 public class AdvancementToast implements Toast {
     private final Advancement advancement;
     private boolean playedSound;
     
-    public AdvancementToast(final Advancement u) {
-        this.advancement = u;
+    public AdvancementToast(final Advancement w) {
+        this.advancement = w;
     }
     
     @Override
-    public Visibility render(final ToastComponent deb, final long long2) {
-        deb.getMinecraft().getTextureManager().bind(AdvancementToast.TEXTURE);
+    public Visibility render(final PoseStack dhl, final ToastComponent doo, final long long3) {
+        doo.getMinecraft().getTextureManager().bind(AdvancementToast.TEXTURE);
         RenderSystem.color3f(1.0f, 1.0f, 1.0f);
-        final DisplayInfo ad5 = this.advancement.getDisplay();
-        deb.blit(0, 0, 0, 0, 160, 32);
-        if (ad5 != null) {
-            final List<String> list6 = deb.getMinecraft().font.split(ad5.getTitle().getColoredString(), 125);
-            final int integer7 = (ad5.getFrame() == FrameType.CHALLENGE) ? 16746751 : 16776960;
-            if (list6.size() == 1) {
-                deb.getMinecraft().font.draw(I18n.get("advancements.toast." + ad5.getFrame().getName()), 30.0f, 7.0f, integer7 | 0xFF000000);
-                deb.getMinecraft().font.draw(ad5.getTitle().getColoredString(), 30.0f, 18.0f, -1);
+        final DisplayInfo af6 = this.advancement.getDisplay();
+        doo.blit(dhl, 0, 0, 0, 0, this.width(), this.height());
+        if (af6 != null) {
+            final List<FormattedText> list7 = doo.getMinecraft().font.split(af6.getTitle(), 125);
+            final int integer8 = (af6.getFrame() == FrameType.CHALLENGE) ? 16746751 : 16776960;
+            if (list7.size() == 1) {
+                doo.getMinecraft().font.draw(dhl, I18n.get("advancements.toast." + af6.getFrame().getName()), 30.0f, 7.0f, integer8 | 0xFF000000);
+                doo.getMinecraft().font.draw(dhl, list7.get(0), 30.0f, 18.0f, -1);
             }
             else {
-                final int integer8 = 1500;
-                final float float9 = 300.0f;
-                if (long2 < 1500L) {
-                    final int integer9 = Mth.floor(Mth.clamp((1500L - long2) / 300.0f, 0.0f, 1.0f) * 255.0f) << 24 | 0x4000000;
-                    deb.getMinecraft().font.draw(I18n.get("advancements.toast." + ad5.getFrame().getName()), 30.0f, 11.0f, integer7 | integer9);
+                final int integer9 = 1500;
+                final float float10 = 300.0f;
+                if (long3 < 1500L) {
+                    final int integer10 = Mth.floor(Mth.clamp((1500L - long3) / 300.0f, 0.0f, 1.0f) * 255.0f) << 24 | 0x4000000;
+                    doo.getMinecraft().font.draw(dhl, I18n.get("advancements.toast." + af6.getFrame().getName()), 30.0f, 11.0f, integer8 | integer10);
                 }
                 else {
-                    final int integer9 = Mth.floor(Mth.clamp((long2 - 1500L) / 300.0f, 0.0f, 1.0f) * 252.0f) << 24 | 0x4000000;
-                    final int n = 16;
-                    final int size = list6.size();
-                    deb.getMinecraft().font.getClass();
-                    int integer10 = n - size * 9 / 2;
-                    for (final String string13 : list6) {
-                        deb.getMinecraft().font.draw(string13, 30.0f, (float)integer10, 0xFFFFFF | integer9);
-                        final int n2 = integer10;
-                        deb.getMinecraft().font.getClass();
-                        integer10 = n2 + 9;
+                    final int integer10 = Mth.floor(Mth.clamp((long3 - 1500L) / 300.0f, 0.0f, 1.0f) * 252.0f) << 24 | 0x4000000;
+                    final int n = this.height() / 2;
+                    final int size = list7.size();
+                    doo.getMinecraft().font.getClass();
+                    int integer11 = n - size * 9 / 2;
+                    for (final FormattedText mu14 : list7) {
+                        doo.getMinecraft().font.draw(dhl, mu14, 30.0f, (float)integer11, 0xFFFFFF | integer10);
+                        final int n2 = integer11;
+                        doo.getMinecraft().font.getClass();
+                        integer11 = n2 + 9;
                     }
                 }
             }
-            if (!this.playedSound && long2 > 0L) {
+            if (!this.playedSound && long3 > 0L) {
                 this.playedSound = true;
-                if (ad5.getFrame() == FrameType.CHALLENGE) {
-                    deb.getMinecraft().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_TOAST_CHALLENGE_COMPLETE, 1.0f, 1.0f));
+                if (af6.getFrame() == FrameType.CHALLENGE) {
+                    doo.getMinecraft().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_TOAST_CHALLENGE_COMPLETE, 1.0f, 1.0f));
                 }
             }
-            deb.getMinecraft().getItemRenderer().renderAndDecorateItem(null, ad5.getIcon(), 8, 8);
-            return (long2 >= 5000L) ? Visibility.HIDE : Visibility.SHOW;
+            doo.getMinecraft().getItemRenderer().renderAndDecorateFakeItem(af6.getIcon(), 8, 8);
+            return (long3 >= 5000L) ? Visibility.HIDE : Visibility.SHOW;
         }
         return Visibility.HIDE;
     }
diff --git a/src/net/minecraft/client/gui/components/toasts/RecipeToast.java b/src/net/minecraft/client/gui/components/toasts/RecipeToast.java
index 3d2c728..58f2006 100644
--- a/src/net/minecraft/client/gui/components/toasts/RecipeToast.java
+++ b/src/net/minecraft/client/gui/components/toasts/RecipeToast.java
@@ -1,9 +1,9 @@
 package net.minecraft.client.gui.components.toasts;
 
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.client.resources.language.I18n;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.collect.Lists;
 import net.minecraft.world.item.crafting.Recipe;
 import java.util.List;
@@ -13,47 +13,47 @@ public class RecipeToast implements Toast {
     private long lastChanged;
     private boolean changed;
     
-    public RecipeToast(final Recipe<?> bgw) {
-        (this.recipes = Lists.newArrayList()).add(bgw);
+    public RecipeToast(final Recipe<?> bmu) {
+        (this.recipes = Lists.newArrayList()).add(bmu);
     }
     
     @Override
-    public Visibility render(final ToastComponent deb, final long long2) {
+    public Visibility render(final PoseStack dhl, final ToastComponent doo, final long long3) {
         if (this.changed) {
-            this.lastChanged = long2;
+            this.lastChanged = long3;
             this.changed = false;
         }
         if (this.recipes.isEmpty()) {
             return Visibility.HIDE;
         }
-        deb.getMinecraft().getTextureManager().bind(RecipeToast.TEXTURE);
+        doo.getMinecraft().getTextureManager().bind(RecipeToast.TEXTURE);
         RenderSystem.color3f(1.0f, 1.0f, 1.0f);
-        deb.blit(0, 0, 0, 32, 160, 32);
-        deb.getMinecraft().font.draw(I18n.get("recipe.toast.title"), 30.0f, 7.0f, -11534256);
-        deb.getMinecraft().font.draw(I18n.get("recipe.toast.description"), 30.0f, 18.0f, -16777216);
-        final Recipe<?> bgw5 = this.recipes.get((int)(long2 / (5000L / this.recipes.size()) % this.recipes.size()));
-        final ItemStack ben6 = bgw5.getToastSymbol();
+        doo.blit(dhl, 0, 0, 0, 32, this.width(), this.height());
+        doo.getMinecraft().font.draw(dhl, I18n.get("recipe.toast.title"), 30.0f, 7.0f, -11534256);
+        doo.getMinecraft().font.draw(dhl, I18n.get("recipe.toast.description"), 30.0f, 18.0f, -16777216);
+        final Recipe<?> bmu6 = this.recipes.get((int)(long3 / Math.max(1L, 5000L / this.recipes.size()) % this.recipes.size()));
+        final ItemStack bki7 = bmu6.getToastSymbol();
         RenderSystem.pushMatrix();
         RenderSystem.scalef(0.6f, 0.6f, 1.0f);
-        deb.getMinecraft().getItemRenderer().renderAndDecorateItem(null, ben6, 3, 3);
+        doo.getMinecraft().getItemRenderer().renderAndDecorateFakeItem(bki7, 3, 3);
         RenderSystem.popMatrix();
-        deb.getMinecraft().getItemRenderer().renderAndDecorateItem(null, bgw5.getResultItem(), 8, 8);
-        return (long2 - this.lastChanged >= 5000L) ? Visibility.HIDE : Visibility.SHOW;
+        doo.getMinecraft().getItemRenderer().renderAndDecorateFakeItem(bmu6.getResultItem(), 8, 8);
+        return (long3 - this.lastChanged >= 5000L) ? Visibility.HIDE : Visibility.SHOW;
     }
     
-    public void addItem(final Recipe<?> bgw) {
-        if (this.recipes.add(bgw)) {
+    public void addItem(final Recipe<?> bmu) {
+        if (this.recipes.add(bmu)) {
             this.changed = true;
         }
     }
     
-    public static void addOrUpdate(final ToastComponent deb, final Recipe<?> bgw) {
-        final RecipeToast ddy3 = deb.<RecipeToast>getToast(RecipeToast.class, RecipeToast.NO_TOKEN);
-        if (ddy3 == null) {
-            deb.addToast(new RecipeToast(bgw));
+    public static void addOrUpdate(final ToastComponent doo, final Recipe<?> bmu) {
+        final RecipeToast dol3 = doo.<RecipeToast>getToast(RecipeToast.class, RecipeToast.NO_TOKEN);
+        if (dol3 == null) {
+            doo.addToast(new RecipeToast(bmu));
         }
         else {
-            ddy3.addItem(bgw);
+            dol3.addItem(bmu);
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/components/toasts/SystemToast.java b/src/net/minecraft/client/gui/components/toasts/SystemToast.java
index 5ffd00c..691a106 100644
--- a/src/net/minecraft/client/gui/components/toasts/SystemToast.java
+++ b/src/net/minecraft/client/gui/components/toasts/SystemToast.java
@@ -1,44 +1,102 @@
 package net.minecraft.client.gui.components.toasts;
 
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.client.gui.Font;
+import java.util.function.ToIntFunction;
+import net.minecraft.network.chat.Style;
+import net.minecraft.client.Minecraft;
 import javax.annotation.Nullable;
 import net.minecraft.network.chat.Component;
+import java.util.List;
+import net.minecraft.network.chat.FormattedText;
 
 public class SystemToast implements Toast {
     private final SystemToastIds id;
-    private String title;
-    private String message;
+    private FormattedText title;
+    private List<FormattedText> messageLines;
     private long lastChanged;
     private boolean changed;
+    private final int width;
     
-    public SystemToast(final SystemToastIds a, final Component lf2, @Nullable final Component lf3) {
+    public SystemToast(final SystemToastIds a, final Component mr2, @Nullable final Component mr3) {
+        this(a, mr2, nullToEmpty(mr3), 160);
+    }
+    
+    public static SystemToast multiline(final Minecraft dlx, final SystemToastIds a, final Component mr3, final Component mr4) {
+        final Font dmt5 = dlx.font;
+        final List<FormattedText> list6 = dmt5.getSplitter().splitLines(mr4, 200, Style.EMPTY);
+        final int integer7 = Math.max(200, list6.stream().mapToInt(dmt5::width).max().orElse(200));
+        return new SystemToast(a, mr3, list6, integer7 + 30);
+    }
+    
+    private SystemToast(final SystemToastIds a, final Component mr, final List<FormattedText> list, final int integer) {
         this.id = a;
-        this.title = lf2.getString();
-        this.message = ((lf3 == null) ? null : lf3.getString());
+        this.title = mr;
+        this.messageLines = list;
+        this.width = integer;
+    }
+    
+    private static ImmutableList<FormattedText> nullToEmpty(@Nullable final Component mr) {
+        return (ImmutableList<FormattedText>)((mr == null) ? ImmutableList.<Component>of() : ImmutableList.<Component>of(mr));
     }
     
     @Override
-    public Visibility render(final ToastComponent deb, final long long2) {
-        if (this.changed) {
-            this.lastChanged = long2;
-            this.changed = false;
-        }
-        deb.getMinecraft().getTextureManager().bind(SystemToast.TEXTURE);
-        RenderSystem.color3f(1.0f, 1.0f, 1.0f);
-        deb.blit(0, 0, 0, 64, 160, 32);
-        if (this.message == null) {
-            deb.getMinecraft().font.draw(this.title, 18.0f, 12.0f, -256);
-        }
-        else {
-            deb.getMinecraft().font.draw(this.title, 18.0f, 7.0f, -256);
-            deb.getMinecraft().font.draw(this.message, 18.0f, 18.0f, -1);
-        }
-        return (long2 - this.lastChanged < 5000L) ? Visibility.SHOW : Visibility.HIDE;
+    public int width() {
+        return this.width;
     }
     
-    public void reset(final Component lf1, @Nullable final Component lf2) {
-        this.title = lf1.getString();
-        this.message = ((lf2 == null) ? null : lf2.getString());
+    @Override
+    public Visibility render(final PoseStack dhl, final ToastComponent doo, final long long3) {
+        if (this.changed) {
+            this.lastChanged = long3;
+            this.changed = false;
+        }
+        doo.getMinecraft().getTextureManager().bind(SystemToast.TEXTURE);
+        RenderSystem.color3f(1.0f, 1.0f, 1.0f);
+        final int integer6 = this.width();
+        final int integer7 = 12;
+        if (integer6 == 160 && this.messageLines.size() <= 1) {
+            doo.blit(dhl, 0, 0, 0, 64, integer6, this.height());
+        }
+        else {
+            final int integer8 = this.height() + Math.max(0, this.messageLines.size() - 1) * 12;
+            final int integer9 = 28;
+            final int integer10 = Math.min(4, integer8 - 28);
+            this.renderBackgroundRow(dhl, doo, integer6, 0, 0, 28);
+            for (int integer11 = 28; integer11 < integer8 - integer10; integer11 += 10) {
+                this.renderBackgroundRow(dhl, doo, integer6, 16, integer11, Math.min(16, integer8 - integer11 - integer10));
+            }
+            this.renderBackgroundRow(dhl, doo, integer6, 32 - integer10, integer8 - integer10, integer10);
+        }
+        if (this.messageLines == null) {
+            doo.getMinecraft().font.draw(dhl, this.title, 18.0f, 12.0f, -256);
+        }
+        else {
+            doo.getMinecraft().font.draw(dhl, this.title, 18.0f, 7.0f, -256);
+            for (int integer8 = 0; integer8 < this.messageLines.size(); ++integer8) {
+                doo.getMinecraft().font.draw(dhl, this.messageLines.get(integer8), 18.0f, (float)(18 + integer8 * 12), -1);
+            }
+        }
+        return (long3 - this.lastChanged < 5000L) ? Visibility.SHOW : Visibility.HIDE;
+    }
+    
+    private void renderBackgroundRow(final PoseStack dhl, final ToastComponent doo, final int integer3, final int integer4, final int integer5, final int integer6) {
+        final int integer7 = (integer4 == 0) ? 20 : 5;
+        final int integer8 = Math.min(60, integer3 - integer7);
+        doo.blit(dhl, 0, integer5, 0, 64 + integer4, integer7, integer6);
+        for (int integer9 = integer7; integer9 < integer3 - integer8; integer9 += 64) {
+            doo.blit(dhl, integer9, integer5, 32, 64 + integer4, Math.min(64, integer3 - integer9 - integer8), integer6);
+        }
+        doo.blit(dhl, integer3 - integer8, integer5, 160 - integer8, 64 + integer4, integer8, integer6);
+    }
+    
+    public void reset(final Component mr1, @Nullable final Component mr2) {
+        this.title = mr1;
+        this.messageLines = nullToEmpty(mr2);
         this.changed = true;
     }
     
@@ -47,20 +105,39 @@ public class SystemToast implements Toast {
         return this.id;
     }
     
-    public static void addOrUpdate(final ToastComponent deb, final SystemToastIds a, final Component lf3, @Nullable final Component lf4) {
-        final SystemToast ddz5 = deb.<SystemToast>getToast(SystemToast.class, a);
-        if (ddz5 == null) {
-            deb.addToast(new SystemToast(a, lf3, lf4));
+    public static void add(final ToastComponent doo, final SystemToastIds a, final Component mr3, @Nullable final Component mr4) {
+        doo.addToast(new SystemToast(a, mr3, mr4));
+    }
+    
+    public static void addOrUpdate(final ToastComponent doo, final SystemToastIds a, final Component mr3, @Nullable final Component mr4) {
+        final SystemToast dom5 = doo.<SystemToast>getToast(SystemToast.class, a);
+        if (dom5 == null) {
+            add(doo, a, mr3, mr4);
         }
         else {
-            ddz5.reset(lf3, lf4);
+            dom5.reset(mr3, mr4);
         }
     }
     
+    public static void onWorldAccessFailure(final Minecraft dlx, final String string) {
+        add(dlx.getToasts(), SystemToastIds.WORLD_ACCESS_FAILURE, new TranslatableComponent("selectWorld.access_failure"), new TextComponent(string));
+    }
+    
+    public static void onWorldDeleteFailure(final Minecraft dlx, final String string) {
+        add(dlx.getToasts(), SystemToastIds.WORLD_ACCESS_FAILURE, new TranslatableComponent("selectWorld.delete_failure"), new TextComponent(string));
+    }
+    
+    public static void onPackCopyFailure(final Minecraft dlx, final String string) {
+        add(dlx.getToasts(), SystemToastIds.PACK_COPY_FAILURE, new TranslatableComponent("pack.copyFailure"), new TextComponent(string));
+    }
+    
     public enum SystemToastIds {
         TUTORIAL_HINT, 
         NARRATOR_TOGGLE, 
         WORLD_BACKUP, 
-        PACK_LOAD_FAILURE;
+        WORLD_GEN_SETTINGS_TRANSFER, 
+        PACK_LOAD_FAILURE, 
+        WORLD_ACCESS_FAILURE, 
+        PACK_COPY_FAILURE;
     }
 }
diff --git a/src/net/minecraft/client/gui/components/toasts/Toast.java b/src/net/minecraft/client/gui/components/toasts/Toast.java
index 692bab4..d5c5b9e 100644
--- a/src/net/minecraft/client/gui/components/toasts/Toast.java
+++ b/src/net/minecraft/client/gui/components/toasts/Toast.java
@@ -5,30 +5,39 @@ import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.client.sounds.SoundManager;
 import net.minecraft.sounds.SoundEvent;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.resources.ResourceLocation;
 
 public interface Toast {
     public static final ResourceLocation TEXTURE = new ResourceLocation("textures/gui/toasts.png");
     public static final Object NO_TOKEN = new Object();
     
-    Visibility render(final ToastComponent deb, final long long2);
+    Visibility render(final PoseStack dhl, final ToastComponent doo, final long long3);
     
     default Object getToken() {
         return Toast.NO_TOKEN;
     }
     
+    default int width() {
+        return 160;
+    }
+    
+    default int height() {
+        return 32;
+    }
+    
     public enum Visibility {
         SHOW(SoundEvents.UI_TOAST_IN), 
         HIDE(SoundEvents.UI_TOAST_OUT);
         
         private final SoundEvent soundEvent;
         
-        private Visibility(final SoundEvent aah) {
-            this.soundEvent = aah;
+        private Visibility(final SoundEvent ack) {
+            this.soundEvent = ack;
         }
         
-        public void playSound(final SoundManager edz) {
-            edz.play(SimpleSoundInstance.forUI(this.soundEvent, 1.0f, 1.0f));
+        public void playSound(final SoundManager epn) {
+            epn.play(SimpleSoundInstance.forUI(this.soundEvent, 1.0f, 1.0f));
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/components/toasts/ToastComponent.java b/src/net/minecraft/client/gui/components/toasts/ToastComponent.java
index 0a6ccca..f35b122 100644
--- a/src/net/minecraft/client/gui/components/toasts/ToastComponent.java
+++ b/src/net/minecraft/client/gui/components/toasts/ToastComponent.java
@@ -6,6 +6,7 @@ import net.minecraft.util.Mth;
 import java.util.Arrays;
 import javax.annotation.Nullable;
 import java.util.Iterator;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.collect.Queues;
 import java.util.Deque;
 import net.minecraft.client.Minecraft;
@@ -16,23 +17,23 @@ public class ToastComponent extends GuiComponent {
     private final ToastInstance<?>[] visible;
     private final Deque<Toast> queued;
     
-    public ToastComponent(final Minecraft dbn) {
+    public ToastComponent(final Minecraft dlx) {
         this.visible = new ToastInstance[5];
         this.queued = Queues.newArrayDeque();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
-    public void render() {
+    public void render(final PoseStack dhl) {
         if (this.minecraft.options.hideGui) {
             return;
         }
-        for (int integer2 = 0; integer2 < this.visible.length; ++integer2) {
-            final ToastInstance<?> a3 = this.visible[integer2];
-            if (a3 != null && a3.render(this.minecraft.getWindow().getGuiScaledWidth(), integer2)) {
-                this.visible[integer2] = null;
+        for (int integer3 = 0; integer3 < this.visible.length; ++integer3) {
+            final ToastInstance<?> a4 = this.visible[integer3];
+            if (a4 != null && a4.render(this.minecraft.getWindow().getGuiScaledWidth(), integer3, dhl)) {
+                this.visible[integer3] = null;
             }
-            if (this.visible[integer2] == null && !this.queued.isEmpty()) {
-                this.visible[integer2] = new ToastInstance<>((Toast)this.queued.removeFirst());
+            if (this.visible[integer3] == null && !this.queued.isEmpty()) {
+                this.visible[integer3] = new ToastInstance<>((Toast)this.queued.removeFirst());
             }
         }
     }
@@ -44,9 +45,9 @@ public class ToastComponent extends GuiComponent {
                 return (T)a7.getToast();
             }
         }
-        for (final Toast dea5 : this.queued) {
-            if (class1.isAssignableFrom(dea5.getClass()) && dea5.getToken().equals(object)) {
-                return (T)dea5;
+        for (final Toast don5 : this.queued) {
+            if (class1.isAssignableFrom(don5.getClass()) && don5.getToken().equals(object)) {
+                return (T)don5;
             }
         }
         return null;
@@ -57,8 +58,8 @@ public class ToastComponent extends GuiComponent {
         this.queued.clear();
     }
     
-    public void addToast(final Toast dea) {
-        this.queued.add(dea);
+    public void addToast(final Toast don) {
+        this.queued.add(don);
     }
     
     public Minecraft getMinecraft() {
@@ -71,11 +72,11 @@ public class ToastComponent extends GuiComponent {
         private long visibleTime;
         private Toast.Visibility visibility;
         
-        private ToastInstance(final T dea) {
+        private ToastInstance(final T don) {
             this.animationTime = -1L;
             this.visibleTime = -1L;
             this.visibility = Toast.Visibility.SHOW;
-            this.toast = dea;
+            this.toast = don;
         }
         
         public T getToast() {
@@ -91,24 +92,24 @@ public class ToastComponent extends GuiComponent {
             return float4;
         }
         
-        public boolean render(final int integer1, final int integer2) {
-            final long long4 = Util.getMillis();
+        public boolean render(final int integer1, final int integer2, final PoseStack dhl) {
+            final long long5 = Util.getMillis();
             if (this.animationTime == -1L) {
-                this.animationTime = long4;
+                this.animationTime = long5;
                 this.visibility.playSound(ToastComponent.this.minecraft.getSoundManager());
             }
-            if (this.visibility == Toast.Visibility.SHOW && long4 - this.animationTime <= 600L) {
-                this.visibleTime = long4;
+            if (this.visibility == Toast.Visibility.SHOW && long5 - this.animationTime <= 600L) {
+                this.visibleTime = long5;
             }
             RenderSystem.pushMatrix();
-            RenderSystem.translatef(integer1 - 160.0f * this.getVisibility(long4), (float)(integer2 * 32), (float)(800 + integer2));
-            final Toast.Visibility a6 = this.toast.render(ToastComponent.this, long4 - this.visibleTime);
+            RenderSystem.translatef(integer1 - this.toast.width() * this.getVisibility(long5), (float)(integer2 * this.toast.height()), (float)(800 + integer2));
+            final Toast.Visibility a7 = this.toast.render(dhl, ToastComponent.this, long5 - this.visibleTime);
             RenderSystem.popMatrix();
-            if (a6 != this.visibility) {
-                this.animationTime = long4 - (int)((1.0f - this.getVisibility(long4)) * 600.0f);
-                (this.visibility = a6).playSound(ToastComponent.this.minecraft.getSoundManager());
+            if (a7 != this.visibility) {
+                this.animationTime = long5 - (int)((1.0f - this.getVisibility(long5)) * 600.0f);
+                (this.visibility = a7).playSound(ToastComponent.this.minecraft.getSoundManager());
             }
-            return this.visibility == Toast.Visibility.HIDE && long4 - this.animationTime > 600L;
+            return this.visibility == Toast.Visibility.HIDE && long5 - this.animationTime > 600L;
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/components/toasts/TutorialToast.java b/src/net/minecraft/client/gui/components/toasts/TutorialToast.java
index 0f53241..dbcebda 100644
--- a/src/net/minecraft/client/gui/components/toasts/TutorialToast.java
+++ b/src/net/minecraft/client/gui/components/toasts/TutorialToast.java
@@ -1,55 +1,57 @@
 package net.minecraft.client.gui.components.toasts;
 
 import net.minecraft.util.Mth;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import javax.annotation.Nullable;
 import net.minecraft.network.chat.Component;
 
 public class TutorialToast implements Toast {
     private final Icons icon;
-    private final String title;
-    private final String message;
+    private final Component title;
+    private final Component message;
     private Visibility visibility;
     private long lastProgressTime;
     private float lastProgress;
     private float progress;
     private final boolean progressable;
     
-    public TutorialToast(final Icons a, final Component lf2, @Nullable final Component lf3, final boolean boolean4) {
+    public TutorialToast(final Icons a, final Component mr2, @Nullable final Component mr3, final boolean boolean4) {
         this.visibility = Visibility.SHOW;
         this.icon = a;
-        this.title = lf2.getColoredString();
-        this.message = ((lf3 == null) ? null : lf3.getColoredString());
+        this.title = mr2;
+        this.message = mr3;
         this.progressable = boolean4;
     }
     
     @Override
-    public Visibility render(final ToastComponent deb, final long long2) {
-        deb.getMinecraft().getTextureManager().bind(TutorialToast.TEXTURE);
+    public Visibility render(final PoseStack dhl, final ToastComponent doo, final long long3) {
+        doo.getMinecraft().getTextureManager().bind(TutorialToast.TEXTURE);
         RenderSystem.color3f(1.0f, 1.0f, 1.0f);
-        deb.blit(0, 0, 0, 96, 160, 32);
-        this.icon.render(deb, 6, 6);
+        doo.blit(dhl, 0, 0, 0, 96, this.width(), this.height());
+        this.icon.render(dhl, doo, 6, 6);
         if (this.message == null) {
-            deb.getMinecraft().font.draw(this.title, 30.0f, 12.0f, -11534256);
+            doo.getMinecraft().font.draw(dhl, this.title, 30.0f, 12.0f, -11534256);
         }
         else {
-            deb.getMinecraft().font.draw(this.title, 30.0f, 7.0f, -11534256);
-            deb.getMinecraft().font.draw(this.message, 30.0f, 18.0f, -16777216);
+            doo.getMinecraft().font.draw(dhl, this.title, 30.0f, 7.0f, -11534256);
+            doo.getMinecraft().font.draw(dhl, this.message, 30.0f, 18.0f, -16777216);
         }
         if (this.progressable) {
-            GuiComponent.fill(3, 28, 157, 29, -1);
-            final float float5 = (float)Mth.clampedLerp(this.lastProgress, this.progress, (long2 - this.lastProgressTime) / 100.0f);
-            int integer6;
+            GuiComponent.fill(dhl, 3, 28, 157, 29, -1);
+            final float float6 = (float)Mth.clampedLerp(this.lastProgress, this.progress, (long3 - this.lastProgressTime) / 100.0f);
+            int integer7;
             if (this.progress >= this.lastProgress) {
-                integer6 = -16755456;
+                integer7 = -16755456;
             }
             else {
-                integer6 = -11206656;
+                integer7 = -11206656;
             }
-            GuiComponent.fill(3, 28, (int)(3.0f + 154.0f * float5), 29, integer6);
-            this.lastProgress = float5;
-            this.lastProgressTime = long2;
+            GuiComponent.fill(dhl, 3, 28, (int)(3.0f + 154.0f * float6), 29, integer7);
+            this.lastProgress = float6;
+            this.lastProgressTime = long3;
         }
         return this.visibility;
     }
@@ -77,9 +79,9 @@ public class TutorialToast implements Toast {
             this.y = integer4;
         }
         
-        public void render(final GuiComponent dcj, final int integer2, final int integer3) {
+        public void render(final PoseStack dhl, final GuiComponent dmv, final int integer3, final int integer4) {
             RenderSystem.enableBlend();
-            dcj.blit(integer2, integer3, 176 + this.x * 20, this.y * 20, 20, 20);
+            dmv.blit(dhl, integer3, integer4, 176 + this.x * 20, this.y * 20, 20, 20);
             RenderSystem.enableBlend();
         }
     }
diff --git a/src/net/minecraft/client/gui/font/AllMissingGlyphProvider.java b/src/net/minecraft/client/gui/font/AllMissingGlyphProvider.java
index e1c0228..2244341 100644
--- a/src/net/minecraft/client/gui/font/AllMissingGlyphProvider.java
+++ b/src/net/minecraft/client/gui/font/AllMissingGlyphProvider.java
@@ -1,5 +1,7 @@
 package net.minecraft.client.gui.font;
 
+import it.unimi.dsi.fastutil.ints.IntSets;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import javax.annotation.Nullable;
 import net.minecraft.client.gui.font.glyphs.MissingGlyph;
 import com.mojang.blaze3d.font.RawGlyph;
@@ -8,7 +10,12 @@ import com.mojang.blaze3d.font.GlyphProvider;
 public class AllMissingGlyphProvider implements GlyphProvider {
     @Nullable
     @Override
-    public RawGlyph getGlyph(final char character) {
+    public RawGlyph getGlyph(final int integer) {
         return MissingGlyph.INSTANCE;
     }
+    
+    @Override
+    public IntSet getSupportedGlyphs() {
+        return (IntSet)IntSets.EMPTY_SET;
+    }
 }
diff --git a/src/net/minecraft/client/gui/font/FontManager.java b/src/net/minecraft/client/gui/font/FontManager.java
index 81095bb..6f499ed 100644
--- a/src/net/minecraft/client/gui/font/FontManager.java
+++ b/src/net/minecraft/client/gui/font/FontManager.java
@@ -1,17 +1,17 @@
 package net.minecraft.client.gui.font;
 
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.util.profiling.InactiveProfiler;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import javax.annotation.Nullable;
-import java.util.Collections;
+import net.minecraft.client.gui.Font;
+import net.minecraft.Util;
+import java.util.function.Consumer;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import com.google.gson.JsonArray;
 import java.io.InputStream;
 import java.util.Iterator;
 import com.google.gson.Gson;
+import it.unimi.dsi.fastutil.ints.IntCollection;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import java.io.IOException;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.font.providers.GlyphProviderBuilderType;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonObject;
@@ -27,173 +27,118 @@ import net.minecraft.server.packs.resources.ResourceManager;
 import com.mojang.blaze3d.font.GlyphProvider;
 import java.util.List;
 import net.minecraft.server.packs.resources.SimplePreparableReloadListener;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.gui.Font;
-import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
+import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
 
 public class FontManager implements AutoCloseable {
     private static final Logger LOGGER;
-    private final Map<ResourceLocation, Font> fonts;
+    public static final ResourceLocation MISSING_FONT;
+    private final FontSet missingFontSet;
+    private final Map<ResourceLocation, FontSet> fontSets;
     private final TextureManager textureManager;
-    private boolean forceUnicode;
+    private Map<ResourceLocation, ResourceLocation> renames;
     private final PreparableReloadListener reloadListener;
     
-    public FontManager(final TextureManager eak, final boolean boolean2) {
-        this.fonts = Maps.newHashMap();
+    public FontManager(final TextureManager elw) {
+        this.fontSets = Maps.newHashMap();
+        this.renames = ImmutableMap.of();
         this.reloadListener = new SimplePreparableReloadListener<Map<ResourceLocation, List<GlyphProvider>>>() {
             @Override
-            protected Map<ResourceLocation, List<GlyphProvider>> prepare(final ResourceManager zb, final ProfilerFiller aio) {
-                aio.startTick();
+            protected Map<ResourceLocation, List<GlyphProvider>> prepare(final ResourceManager abc, final ProfilerFiller ami) {
+                ami.startTick();
                 final Gson gson4 = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
                 final Map<ResourceLocation, List<GlyphProvider>> map5 = Maps.newHashMap();
-                for (final ResourceLocation sm7 : zb.listResources("font", string -> string.endsWith(".json"))) {
-                    final String string2 = sm7.getPath();
-                    final ResourceLocation sm8 = new ResourceLocation(sm7.getNamespace(), string2.substring("font/".length(), string2.length() - ".json".length()));
-                    final List<GlyphProvider> list10 = map5.computeIfAbsent(sm8, sm -> Lists.<GlyphProvider>newArrayList(new AllMissingGlyphProvider()));
-                    aio.push(sm8::toString);
+                for (final ResourceLocation uh7 : abc.listResources("font", string -> string.endsWith(".json"))) {
+                    final String string2 = uh7.getPath();
+                    final ResourceLocation uh8 = new ResourceLocation(uh7.getNamespace(), string2.substring("font/".length(), string2.length() - ".json".length()));
+                    final List<GlyphProvider> list10 = map5.computeIfAbsent(uh8, uh -> Lists.<GlyphProvider>newArrayList(new AllMissingGlyphProvider()));
+                    ami.push(uh8::toString);
                     try {
-                        for (final Resource za12 : zb.getResources(sm7)) {
-                            aio.push(za12::getSourceName);
-                            try (final InputStream inputStream13 = za12.getInputStream();
+                        for (final Resource abb12 : abc.getResources(uh7)) {
+                            ami.push(abb12::getSourceName);
+                            try (final InputStream inputStream13 = abb12.getInputStream();
                                  final Reader reader15 = new BufferedReader(new InputStreamReader(inputStream13, StandardCharsets.UTF_8))) {
-                                aio.push("reading");
+                                ami.push("reading");
                                 final JsonArray jsonArray17 = GsonHelper.getAsJsonArray(GsonHelper.<JsonObject>fromJson(gson4, reader15, JsonObject.class), "providers");
-                                aio.popPush("parsing");
-                                for (int integer18 = jsonArray17.size() - 1; integer18 >= 0; --integer18) {
-                                    final JsonObject jsonObject19 = GsonHelper.convertToJsonObject(jsonArray17.get(integer18), "providers[" + integer18 + "]");
+                                ami.popPush("parsing");
+                                for (int integer2 = jsonArray17.size() - 1; integer2 >= 0; --integer2) {
+                                    final JsonObject jsonObject19 = GsonHelper.convertToJsonObject(jsonArray17.get(integer2), "providers[" + integer2 + "]");
                                     try {
                                         final String string3 = GsonHelper.getAsString(jsonObject19, "type");
-                                        final GlyphProviderBuilderType der21 = GlyphProviderBuilderType.byName(string3);
-                                        if (!FontManager.this.forceUnicode || der21 == GlyphProviderBuilderType.LEGACY_UNICODE || !sm8.equals(Minecraft.DEFAULT_FONT)) {
-                                            aio.push(string3);
-                                            list10.add(der21.create(jsonObject19).create(zb));
-                                            aio.pop();
+                                        final GlyphProviderBuilderType dpe21 = GlyphProviderBuilderType.byName(string3);
+                                        ami.push(string3);
+                                        final GlyphProvider dga22 = dpe21.create(jsonObject19).create(abc);
+                                        if (dga22 != null) {
+                                            list10.add(dga22);
                                         }
+                                        ami.pop();
                                     }
                                     catch (RuntimeException runtimeException20) {
-                                        FontManager.LOGGER.warn("Unable to read definition '{}' in fonts.json in resourcepack: '{}': {}", sm8, za12.getSourceName(), runtimeException20.getMessage());
+                                        FontManager.LOGGER.warn("Unable to read definition '{}' in fonts.json in resourcepack: '{}': {}", uh8, abb12.getSourceName(), runtimeException20.getMessage());
                                     }
                                 }
-                                aio.pop();
+                                ami.pop();
                             }
                             catch (RuntimeException runtimeException21) {
-                                FontManager.LOGGER.warn("Unable to load font '{}' in fonts.json in resourcepack: '{}': {}", sm8, za12.getSourceName(), runtimeException21.getMessage());
+                                FontManager.LOGGER.warn("Unable to load font '{}' in fonts.json in resourcepack: '{}': {}", uh8, abb12.getSourceName(), runtimeException21.getMessage());
                             }
-                            aio.pop();
+                            ami.pop();
                         }
                     }
                     catch (IOException iOException11) {
-                        FontManager.LOGGER.warn("Unable to load font '{}' in fonts.json: {}", sm8, iOException11.getMessage());
+                        FontManager.LOGGER.warn("Unable to load font '{}' in fonts.json: {}", uh8, iOException11.getMessage());
                     }
-                    aio.push("caching");
-                    for (char character11 = '\0'; character11 < '\uffff'; ++character11) {
-                        if (character11 != ' ') {
-                            for (final GlyphProvider cwz13 : Lists.<GlyphProvider>reverse(list10)) {
-                                if (cwz13.getGlyph(character11) != null) {
+                    ami.push("caching");
+                    final IntSet intSet11 = (IntSet)new IntOpenHashSet();
+                    for (final GlyphProvider dga23 : list10) {
+                        intSet11.addAll((IntCollection)dga23.getSupportedGlyphs());
+                    }
+                    final List<GlyphProvider> list11;
+                    final Iterator<GlyphProvider> iterator4;
+                    GlyphProvider dga24;
+                    intSet11.forEach(integer -> {
+                        if (integer == 32) {
+                            return;
+                        }
+                        else {
+                            Lists.<GlyphProvider>reverse(list11).iterator();
+                            while (iterator4.hasNext()) {
+                                dga24 = iterator4.next();
+                                if (dga24.getGlyph(integer) != null) {
                                     break;
                                 }
                             }
+                            return;
                         }
-                    }
-                    aio.pop();
-                    aio.pop();
+                    });
+                    ami.pop();
+                    ami.pop();
                 }
-                aio.endTick();
+                ami.endTick();
                 return map5;
             }
             
             @Override
-            protected void apply(final Map<ResourceLocation, List<GlyphProvider>> map, final ResourceManager zb, final ProfilerFiller aio) {
-                // 
-                // This method could not be decompiled.
-                // 
-                // Original Bytecode:
-                // 
-                //     1: invokeinterface net/minecraft/util/profiling/ProfilerFiller.startTick:()V
-                //     6: aload_3         /* aio */
-                //     7: ldc_w           "reloading"
-                //    10: invokeinterface net/minecraft/util/profiling/ProfilerFiller.push:(Ljava/lang/String;)V
-                //    15: aload_0         /* this */
-                //    16: getfield        net/minecraft/client/gui/font/FontManager$1.this$0:Lnet/minecraft/client/gui/font/FontManager;
-                //    19: invokestatic    net/minecraft/client/gui/font/FontManager.access$200:(Lnet/minecraft/client/gui/font/FontManager;)Ljava/util/Map;
-                //    22: invokeinterface java/util/Map.keySet:()Ljava/util/Set;
-                //    27: invokeinterface java/util/Set.stream:()Ljava/util/stream/Stream;
-                //    32: aload_1         /* map */
-                //    33: invokeinterface java/util/Map.keySet:()Ljava/util/Set;
-                //    38: invokeinterface java/util/Set.stream:()Ljava/util/stream/Stream;
-                //    43: invokestatic    java/util/stream/Stream.concat:(Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Ljava/util/stream/Stream;
-                //    46: invokeinterface java/util/stream/Stream.distinct:()Ljava/util/stream/Stream;
-                //    51: aload_0         /* this */
-                //    52: aload_1         /* map */
-                //    53: invokedynamic   BootstrapMethod #4, accept:(Lnet/minecraft/client/gui/font/FontManager$1;Ljava/util/Map;)Ljava/util/function/Consumer;
-                //    58: invokeinterface java/util/stream/Stream.forEach:(Ljava/util/function/Consumer;)V
-                //    63: aload_3         /* aio */
-                //    64: invokeinterface net/minecraft/util/profiling/ProfilerFiller.pop:()V
-                //    69: aload_3         /* aio */
-                //    70: invokeinterface net/minecraft/util/profiling/ProfilerFiller.endTick:()V
-                //    75: return         
-                //    Signature:
-                //  (Ljava/util/Map<Lnet/minecraft/resources/ResourceLocation;Ljava/util/List<Lcom/mojang/blaze3d/font/GlyphProvider;>;>;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V
-                //    MethodParameters:
-                //  Name  Flags  
-                //  ----  -----
-                //  map   
-                //  zb    
-                //  aio   
-                // 
-                // The error that occurred was:
-                // 
-                // java.lang.IllegalStateException: Could not infer any expression.
-                //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:374)
-                //     at com.strobel.decompiler.ast.TypeAnalysis.run(TypeAnalysis.java:96)
-                //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:344)
-                //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:42)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:214)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.transformCall(AstMethodBodyBuilder.java:1164)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.transformByteCode(AstMethodBodyBuilder.java:1009)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.transformExpression(AstMethodBodyBuilder.java:540)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.transformByteCode(AstMethodBodyBuilder.java:554)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.transformExpression(AstMethodBodyBuilder.java:540)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.transformNode(AstMethodBodyBuilder.java:392)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.transformBlock(AstMethodBodyBuilder.java:333)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:294)
-                //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createConstructor(AstBuilder.java:713)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:549)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
-                //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
-                //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
-                //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
-                //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
-                //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
-                //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
-                //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
-                //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
-                //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
-                //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
-                //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
-                //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
-                //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
-                //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
-                //     at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
-                //     at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
-                //     at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:177)
-                // 
-                throw new IllegalStateException("An error occurred while decompiling this method.");
+            protected void apply(final Map<ResourceLocation, List<GlyphProvider>> map, final ResourceManager abc, final ProfilerFiller ami) {
+                ami.startTick();
+                ami.push("closing");
+                FontManager.this.fontSets.values().forEach(FontSet::close);
+                FontManager.this.fontSets.clear();
+                ami.popPush("reloading");
+                final FontSet dot4;
+                map.forEach((uh, list) -> {
+                    dot4 = new FontSet(FontManager.this.textureManager, uh);
+                    dot4.reload(Lists.<GlyphProvider>reverse(list));
+                    FontManager.this.fontSets.put(uh, dot4);
+                    return;
+                });
+                ami.pop();
+                ami.endTick();
             }
             
             @Override
@@ -201,78 +146,16 @@ public class FontManager implements AutoCloseable {
                 return "FontManager";
             }
         };
-        this.textureManager = eak;
-        this.forceUnicode = boolean2;
+        this.textureManager = elw;
+        this.missingFontSet = Util.<FontSet>make(new FontSet(elw, FontManager.MISSING_FONT), dot -> dot.reload(Lists.<GlyphProvider>newArrayList(new AllMissingGlyphProvider())));
     }
     
-    @Nullable
-    public Font get(final ResourceLocation sm) {
-        // 
-        // This method could not be decompiled.
-        // 
-        // Original Bytecode:
-        // 
-        //     1: getfield        net/minecraft/client/gui/font/FontManager.fonts:Ljava/util/Map;
-        //     4: aload_1         /* sm */
-        //     5: aload_0         /* this */
-        //     6: invokedynamic   BootstrapMethod #0, apply:(Lnet/minecraft/client/gui/font/FontManager;)Ljava/util/function/Function;
-        //    11: invokeinterface java/util/Map.computeIfAbsent:(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;
-        //    16: checkcast       Lnet/minecraft/client/gui/Font;
-        //    19: areturn        
-        //    MethodParameters:
-        //  Name  Flags  
-        //  ----  -----
-        //  sm    
-        // 
-        // The error that occurred was:
-        // 
-        // java.lang.IllegalStateException: Could not infer any expression.
-        //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:374)
-        //     at com.strobel.decompiler.ast.TypeAnalysis.run(TypeAnalysis.java:96)
-        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:344)
-        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:42)
-        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:214)
-        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
-        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
-        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
-        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
-        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
-        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
-        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
-        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
-        //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
-        //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
-        //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
-        //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
-        //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
-        //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
-        //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
-        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
-        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
-        //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
-        //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
-        //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
-        //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
-        //     at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
-        //     at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
-        //     at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:177)
-        // 
-        throw new IllegalStateException("An error occurred while decompiling this method.");
+    public void setRenames(final Map<ResourceLocation, ResourceLocation> map) {
+        this.renames = map;
     }
     
-    public void setForceUnicode(final boolean boolean1, final Executor executor2, final Executor executor3) {
-        if (boolean1 == this.forceUnicode) {
-            return;
-        }
-        this.forceUnicode = boolean1;
-        final ResourceManager zb5 = Minecraft.getInstance().getResourceManager();
-        final PreparableReloadListener.PreparationBarrier a6 = new PreparableReloadListener.PreparationBarrier() {
-            @Override
-            public <T> CompletableFuture<T> wait(final T object) {
-                return CompletableFuture.<T>completedFuture(object);
-            }
-        };
-        this.reloadListener.reload(a6, zb5, InactiveProfiler.INACTIVE, InactiveProfiler.INACTIVE, executor2, executor3);
+    public Font createFont() {
+        return new Font(uh -> this.fontSets.getOrDefault(this.renames.getOrDefault(uh, uh), this.missingFontSet));
     }
     
     public PreparableReloadListener getReloadListener() {
@@ -281,10 +164,12 @@ public class FontManager implements AutoCloseable {
     
     @Override
     public void close() {
-        this.fonts.values().forEach(Font::close);
+        this.fontSets.values().forEach(FontSet::close);
+        this.missingFontSet.close();
     }
     
     static {
         LOGGER = LogManager.getLogger();
+        MISSING_FONT = new ResourceLocation("minecraft", "missing");
     }
 }
diff --git a/src/net/minecraft/client/gui/font/FontSet.java b/src/net/minecraft/client/gui/font/FontSet.java
index 937e186..b50c407 100644
--- a/src/net/minecraft/client/gui/font/FontSet.java
+++ b/src/net/minecraft/client/gui/font/FontSet.java
@@ -1,23 +1,23 @@
 package net.minecraft.client.gui.font;
 
-import org.apache.logging.log4j.LogManager;
 import net.minecraft.client.renderer.texture.AbstractTexture;
-import java.util.Iterator;
 import java.util.Set;
+import java.util.Iterator;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import it.unimi.dsi.fastutil.chars.CharArrayList;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
 import net.minecraft.util.Mth;
 import com.google.common.collect.Sets;
+import it.unimi.dsi.fastutil.ints.IntCollection;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import net.minecraft.client.gui.font.glyphs.WhiteGlyph;
 import com.mojang.blaze3d.font.RawGlyph;
 import net.minecraft.client.gui.font.glyphs.MissingGlyph;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.chars.Char2ObjectOpenHashMap;
 import com.google.common.collect.Lists;
-import it.unimi.dsi.fastutil.chars.CharList;
+import it.unimi.dsi.fastutil.ints.IntList;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.chars.Char2ObjectMap;
 import com.mojang.blaze3d.font.GlyphProvider;
 import java.util.List;
 import net.minecraft.client.gui.font.glyphs.BakedGlyph;
@@ -26,10 +26,8 @@ import net.minecraft.client.renderer.texture.TextureManager;
 import java.util.Random;
 import com.mojang.blaze3d.font.GlyphInfo;
 import net.minecraft.client.gui.font.glyphs.EmptyGlyph;
-import org.apache.logging.log4j.Logger;
 
 public class FontSet implements AutoCloseable {
-    private static final Logger LOGGER;
     private static final EmptyGlyph SPACE_GLYPH;
     private static final GlyphInfo SPACE_INFO;
     private static final Random RANDOM;
@@ -38,19 +36,19 @@ public class FontSet implements AutoCloseable {
     private BakedGlyph missingGlyph;
     private BakedGlyph whiteGlyph;
     private final List<GlyphProvider> providers;
-    private final Char2ObjectMap<BakedGlyph> glyphs;
-    private final Char2ObjectMap<GlyphInfo> glyphInfos;
-    private final Int2ObjectMap<CharList> glyphsByWidth;
+    private final Int2ObjectMap<BakedGlyph> glyphs;
+    private final Int2ObjectMap<GlyphInfo> glyphInfos;
+    private final Int2ObjectMap<IntList> glyphsByWidth;
     private final List<FontTexture> textures;
     
-    public FontSet(final TextureManager eak, final ResourceLocation sm) {
+    public FontSet(final TextureManager elw, final ResourceLocation uh) {
         this.providers = Lists.newArrayList();
-        this.glyphs = (Char2ObjectMap<BakedGlyph>)new Char2ObjectOpenHashMap();
-        this.glyphInfos = (Char2ObjectMap<GlyphInfo>)new Char2ObjectOpenHashMap();
-        this.glyphsByWidth = (Int2ObjectMap<CharList>)new Int2ObjectOpenHashMap();
+        this.glyphs = (Int2ObjectMap<BakedGlyph>)new Int2ObjectOpenHashMap();
+        this.glyphInfos = (Int2ObjectMap<GlyphInfo>)new Int2ObjectOpenHashMap();
+        this.glyphsByWidth = (Int2ObjectMap<IntList>)new Int2ObjectOpenHashMap();
         this.textures = Lists.newArrayList();
-        this.textureManager = eak;
-        this.name = sm;
+        this.textureManager = elw;
+        this.name = uh;
     }
     
     public void reload(final List<GlyphProvider> list) {
@@ -61,21 +59,34 @@ public class FontSet implements AutoCloseable {
         this.glyphsByWidth.clear();
         this.missingGlyph = this.stitch(MissingGlyph.INSTANCE);
         this.whiteGlyph = this.stitch(WhiteGlyph.INSTANCE);
-        final Set<GlyphProvider> set3 = Sets.newHashSet();
-        for (char character4 = '\0'; character4 < '\uffff'; ++character4) {
-            for (final GlyphProvider cwz6 : list) {
-                final GlyphInfo cwy7 = (character4 == ' ') ? FontSet.SPACE_INFO : cwz6.getGlyph(character4);
-                if (cwy7 != null) {
-                    set3.add(cwz6);
-                    if (cwy7 != MissingGlyph.INSTANCE) {
-                        ((CharList)this.glyphsByWidth.computeIfAbsent(Mth.ceil(cwy7.getAdvance(false)), integer -> new CharArrayList())).add(character4);
+        final IntSet intSet3 = (IntSet)new IntOpenHashSet();
+        for (final GlyphProvider dga5 : list) {
+            intSet3.addAll((IntCollection)dga5.getSupportedGlyphs());
+        }
+        final Set<GlyphProvider> set4 = Sets.newHashSet();
+        final Iterator<GlyphProvider> iterator2;
+        GlyphProvider dga6;
+        GlyphInfo dfz7;
+        final Set<GlyphProvider> set5;
+        intSet3.forEach(integer -> {
+            list.iterator();
+            while (iterator2.hasNext()) {
+                dga6 = iterator2.next();
+                dfz7 = ((integer == 32) ? FontSet.SPACE_INFO : dga6.getGlyph(integer));
+                if (dfz7 != null) {
+                    set5.add(dga6);
+                    if (dfz7 != MissingGlyph.INSTANCE) {
+                        ((IntList)this.glyphsByWidth.computeIfAbsent(Mth.ceil(dfz7.getAdvance(false)), integer -> new IntArrayList())).add(integer);
+                        break;
+                    }
+                    else {
                         break;
                     }
-                    break;
                 }
             }
-        }
-        list.stream().filter(set3::contains).forEach(this.providers::add);
+            return;
+        });
+        list.stream().filter(set4::contains).forEach(this.providers::add);
     }
     
     @Override
@@ -85,55 +96,55 @@ public class FontSet implements AutoCloseable {
     }
     
     private void closeProviders() {
-        for (final GlyphProvider cwz3 : this.providers) {
-            cwz3.close();
+        for (final GlyphProvider dga3 : this.providers) {
+            dga3.close();
         }
         this.providers.clear();
     }
     
     private void closeTextures() {
-        for (final FontTexture deh3 : this.textures) {
-            deh3.close();
+        for (final FontTexture dou3 : this.textures) {
+            dou3.close();
         }
         this.textures.clear();
     }
     
-    public GlyphInfo getGlyphInfo(final char character) {
-        return (GlyphInfo)this.glyphInfos.computeIfAbsent(character, integer -> (integer == 32) ? FontSet.SPACE_INFO : this.getRaw((char)integer));
+    public GlyphInfo getGlyphInfo(final int integer) {
+        return (GlyphInfo)this.glyphInfos.computeIfAbsent(integer, integer -> (integer == 32) ? FontSet.SPACE_INFO : this.getRaw(integer));
     }
     
-    private RawGlyph getRaw(final char character) {
-        for (final GlyphProvider cwz4 : this.providers) {
-            final RawGlyph cxa5 = cwz4.getGlyph(character);
-            if (cxa5 != null) {
-                return cxa5;
+    private RawGlyph getRaw(final int integer) {
+        for (final GlyphProvider dga4 : this.providers) {
+            final RawGlyph dgb5 = dga4.getGlyph(integer);
+            if (dgb5 != null) {
+                return dgb5;
             }
         }
         return MissingGlyph.INSTANCE;
     }
     
-    public BakedGlyph getGlyph(final char character) {
-        return (BakedGlyph)this.glyphs.computeIfAbsent(character, integer -> (integer == 32) ? FontSet.SPACE_GLYPH : this.stitch(this.getRaw((char)integer)));
+    public BakedGlyph getGlyph(final int integer) {
+        return (BakedGlyph)this.glyphs.computeIfAbsent(integer, integer -> (integer == 32) ? FontSet.SPACE_GLYPH : this.stitch(this.getRaw(integer)));
     }
     
-    private BakedGlyph stitch(final RawGlyph cxa) {
-        for (final FontTexture deh4 : this.textures) {
-            final BakedGlyph dej5 = deh4.add(cxa);
-            if (dej5 != null) {
-                return dej5;
+    private BakedGlyph stitch(final RawGlyph dgb) {
+        for (final FontTexture dou4 : this.textures) {
+            final BakedGlyph dow5 = dou4.add(dgb);
+            if (dow5 != null) {
+                return dow5;
             }
         }
-        final FontTexture deh5 = new FontTexture(new ResourceLocation(this.name.getNamespace(), this.name.getPath() + "/" + this.textures.size()), cxa.isColored());
-        this.textures.add(deh5);
-        this.textureManager.register(deh5.getName(), deh5);
-        final BakedGlyph dej6 = deh5.add(cxa);
-        return (dej6 == null) ? this.missingGlyph : dej6;
+        final FontTexture dou5 = new FontTexture(new ResourceLocation(this.name.getNamespace(), this.name.getPath() + "/" + this.textures.size()), dgb.isColored());
+        this.textures.add(dou5);
+        this.textureManager.register(dou5.getName(), dou5);
+        final BakedGlyph dow6 = dou5.add(dgb);
+        return (dow6 == null) ? this.missingGlyph : dow6;
     }
     
-    public BakedGlyph getRandomGlyph(final GlyphInfo cwy) {
-        final CharList charList3 = (CharList)this.glyphsByWidth.get(Mth.ceil(cwy.getAdvance(false)));
-        if (charList3 != null && !charList3.isEmpty()) {
-            return this.getGlyph(charList3.get(FontSet.RANDOM.nextInt(charList3.size())));
+    public BakedGlyph getRandomGlyph(final GlyphInfo dfz) {
+        final IntList intList3 = (IntList)this.glyphsByWidth.get(Mth.ceil(dfz.getAdvance(false)));
+        if (intList3 != null && !intList3.isEmpty()) {
+            return this.getGlyph(intList3.getInt(FontSet.RANDOM.nextInt(intList3.size())));
         }
         return this.missingGlyph;
     }
@@ -143,7 +154,6 @@ public class FontSet implements AutoCloseable {
     }
     
     static {
-        LOGGER = LogManager.getLogger();
         SPACE_GLYPH = new EmptyGlyph();
         SPACE_INFO = (() -> 4.0f);
         RANDOM = new Random();
diff --git a/src/net/minecraft/client/gui/font/FontTexture.java b/src/net/minecraft/client/gui/font/FontTexture.java
index 4a9a4db..467827f 100644
--- a/src/net/minecraft/client/gui/font/FontTexture.java
+++ b/src/net/minecraft/client/gui/font/FontTexture.java
@@ -18,17 +18,17 @@ public class FontTexture extends AbstractTexture implements Closeable {
     private final boolean colored;
     private final Node root;
     
-    public FontTexture(final ResourceLocation sm, final boolean boolean2) {
-        this.name = sm;
+    public FontTexture(final ResourceLocation uh, final boolean boolean2) {
+        this.name = uh;
         this.colored = boolean2;
         this.root = new Node(0, 0, 256, 256);
         TextureUtil.prepareImage(boolean2 ? NativeImage.InternalGlFormat.RGBA : NativeImage.InternalGlFormat.INTENSITY, this.getId(), 256, 256);
-        this.normalType = RenderType.text(sm);
-        this.seeThroughType = RenderType.textSeeThrough(sm);
+        this.normalType = RenderType.text(uh);
+        this.seeThroughType = RenderType.textSeeThrough(uh);
     }
     
     @Override
-    public void load(final ResourceManager zb) {
+    public void load(final ResourceManager abc) {
     }
     
     @Override
@@ -37,18 +37,18 @@ public class FontTexture extends AbstractTexture implements Closeable {
     }
     
     @Nullable
-    public BakedGlyph add(final RawGlyph cxa) {
-        if (cxa.isColored() != this.colored) {
+    public BakedGlyph add(final RawGlyph dgb) {
+        if (dgb.isColored() != this.colored) {
             return null;
         }
-        final Node a3 = this.root.insert(cxa);
+        final Node a3 = this.root.insert(dgb);
         if (a3 != null) {
             this.bind();
-            cxa.upload(a3.x, a3.y);
+            dgb.upload(a3.x, a3.y);
             final float float4 = 256.0f;
             final float float5 = 256.0f;
             final float float6 = 0.01f;
-            return new BakedGlyph(this.normalType, this.seeThroughType, (a3.x + 0.01f) / 256.0f, (a3.x - 0.01f + cxa.getPixelWidth()) / 256.0f, (a3.y + 0.01f) / 256.0f, (a3.y - 0.01f + cxa.getPixelHeight()) / 256.0f, cxa.getLeft(), cxa.getRight(), cxa.getUp(), cxa.getDown());
+            return new BakedGlyph(this.normalType, this.seeThroughType, (a3.x + 0.01f) / 256.0f, (a3.x - 0.01f + dgb.getPixelWidth()) / 256.0f, (a3.y + 0.01f) / 256.0f, (a3.y - 0.01f + dgb.getPixelHeight()) / 256.0f, dgb.getLeft(), dgb.getRight(), dgb.getUp(), dgb.getDown());
         }
         return null;
     }
@@ -74,19 +74,19 @@ public class FontTexture extends AbstractTexture implements Closeable {
         }
         
         @Nullable
-        Node insert(final RawGlyph cxa) {
+        Node insert(final RawGlyph dgb) {
             if (this.left != null && this.right != null) {
-                Node a3 = this.left.insert(cxa);
+                Node a3 = this.left.insert(dgb);
                 if (a3 == null) {
-                    a3 = this.right.insert(cxa);
+                    a3 = this.right.insert(dgb);
                 }
                 return a3;
             }
             if (this.occupied) {
                 return null;
             }
-            final int integer3 = cxa.getPixelWidth();
-            final int integer4 = cxa.getPixelHeight();
+            final int integer3 = dgb.getPixelWidth();
+            final int integer4 = dgb.getPixelHeight();
             if (integer3 > this.width || integer4 > this.height) {
                 return null;
             }
@@ -104,7 +104,7 @@ public class FontTexture extends AbstractTexture implements Closeable {
                 this.left = new Node(this.x, this.y, this.width, integer4);
                 this.right = new Node(this.x, this.y + integer4 + 1, this.width, this.height - integer4 - 1);
             }
-            return this.left.insert(cxa);
+            return this.left.insert(dgb);
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/font/TextFieldHelper.java b/src/net/minecraft/client/gui/font/TextFieldHelper.java
index 68c429a..42e3f97 100644
--- a/src/net/minecraft/client/gui/font/TextFieldHelper.java
+++ b/src/net/minecraft/client/gui/font/TextFieldHelper.java
@@ -1,176 +1,245 @@
 package net.minecraft.client.gui.font;
 
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.StringSplitter;
+import net.minecraft.Util;
 import net.minecraft.util.Mth;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.SharedConstants;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import java.util.function.Predicate;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.Minecraft;
 
 public class TextFieldHelper {
-    private final Minecraft minecraft;
-    private final Font font;
     private final Supplier<String> getMessageFn;
     private final Consumer<String> setMessageFn;
-    private final int maxWidth;
+    private final Supplier<String> getClipboardFn;
+    private final Consumer<String> setClipboardFn;
+    private final Predicate<String> stringValidator;
     private int cursorPos;
     private int selectionPos;
     
-    public TextFieldHelper(final Minecraft dbn, final Supplier<String> supplier, final Consumer<String> consumer, final int integer) {
-        this.minecraft = dbn;
-        this.font = dbn.font;
-        this.getMessageFn = supplier;
-        this.setMessageFn = consumer;
-        this.maxWidth = integer;
-        this.setEnd();
+    public TextFieldHelper(final Supplier<String> supplier1, final Consumer<String> consumer2, final Supplier<String> supplier3, final Consumer<String> consumer4, final Predicate<String> predicate) {
+        this.getMessageFn = supplier1;
+        this.setMessageFn = consumer2;
+        this.getClipboardFn = supplier3;
+        this.setClipboardFn = consumer4;
+        this.stringValidator = predicate;
+        this.setCursorToEnd();
+    }
+    
+    public static Supplier<String> createClipboardGetter(final Minecraft dlx) {
+        return () -> getClipboardContents(dlx);
+    }
+    
+    public static String getClipboardContents(final Minecraft dlx) {
+        return ChatFormatting.stripFormatting(dlx.keyboardHandler.getClipboard().replaceAll("\\r", ""));
+    }
+    
+    public static Consumer<String> createClipboardSetter(final Minecraft dlx) {
+        return string -> setClipboardContents(dlx, string);
+    }
+    
+    public static void setClipboardContents(final Minecraft dlx, final String string) {
+        dlx.keyboardHandler.setClipboard(string);
     }
     
     public boolean charTyped(final char character) {
         if (SharedConstants.isAllowedChatCharacter(character)) {
-            this.insertText(Character.toString(character));
+            this.insertText(this.getMessageFn.get(), Character.toString(character));
         }
         return true;
     }
     
-    private void insertText(final String string) {
-        if (this.selectionPos != this.cursorPos) {
-            this.deleteSelection();
+    public boolean keyPressed(final int integer) {
+        if (Screen.isSelectAll(integer)) {
+            this.selectAll();
+            return true;
         }
-        final String string2 = this.getMessageFn.get();
-        this.cursorPos = Mth.clamp(this.cursorPos, 0, string2.length());
-        final String string3 = new StringBuilder(string2).insert(this.cursorPos, string).toString();
-        if (this.font.width(string3) <= this.maxWidth) {
+        if (Screen.isCopy(integer)) {
+            this.copy();
+            return true;
+        }
+        if (Screen.isPaste(integer)) {
+            this.paste();
+            return true;
+        }
+        if (Screen.isCut(integer)) {
+            this.cut();
+            return true;
+        }
+        if (integer == 259) {
+            this.removeCharsFromCursor(-1);
+            return true;
+        }
+        if (integer == 261) {
+            this.removeCharsFromCursor(1);
+        }
+        else {
+            if (integer == 263) {
+                if (Screen.hasControlDown()) {
+                    this.moveByWords(-1, Screen.hasShiftDown());
+                }
+                else {
+                    this.moveByChars(-1, Screen.hasShiftDown());
+                }
+                return true;
+            }
+            if (integer == 262) {
+                if (Screen.hasControlDown()) {
+                    this.moveByWords(1, Screen.hasShiftDown());
+                }
+                else {
+                    this.moveByChars(1, Screen.hasShiftDown());
+                }
+                return true;
+            }
+            if (integer == 268) {
+                this.setCursorToStart(Screen.hasShiftDown());
+                return true;
+            }
+            if (integer == 269) {
+                this.setCursorToEnd(Screen.hasShiftDown());
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    private int clampToMsgLength(final int integer) {
+        return Mth.clamp(integer, 0, this.getMessageFn.get().length());
+    }
+    
+    private void insertText(String string1, final String string2) {
+        if (this.selectionPos != this.cursorPos) {
+            string1 = this.deleteSelection(string1);
+        }
+        this.cursorPos = Mth.clamp(this.cursorPos, 0, string1.length());
+        final String string3 = new StringBuilder(string1).insert(this.cursorPos, string2).toString();
+        if (this.stringValidator.test(string3)) {
             this.setMessageFn.accept(string3);
-            final int min = Math.min(string3.length(), this.cursorPos + string.length());
+            final int min = Math.min(string3.length(), this.cursorPos + string2.length());
             this.cursorPos = min;
             this.selectionPos = min;
         }
     }
     
-    public boolean keyPressed(final int integer) {
-        String string3 = this.getMessageFn.get();
-        if (Screen.isSelectAll(integer)) {
-            this.selectionPos = 0;
-            this.cursorPos = string3.length();
-            return true;
-        }
-        if (Screen.isCopy(integer)) {
-            this.minecraft.keyboardHandler.setClipboard(this.getSelected());
-            return true;
-        }
-        if (Screen.isPaste(integer)) {
-            this.insertText(SharedConstants.filterText(ChatFormatting.stripFormatting(this.minecraft.keyboardHandler.getClipboard().replaceAll("\\r", ""))));
+    public void insertText(final String string) {
+        this.insertText(this.getMessageFn.get(), string);
+    }
+    
+    private void resetSelectionIfNeeded(final boolean boolean1) {
+        if (!boolean1) {
             this.selectionPos = this.cursorPos;
-            return true;
         }
-        if (Screen.isCut(integer)) {
-            this.minecraft.keyboardHandler.setClipboard(this.getSelected());
-            this.deleteSelection();
-            return true;
-        }
-        if (integer == 259) {
-            if (!string3.isEmpty()) {
-                if (this.selectionPos != this.cursorPos) {
-                    this.deleteSelection();
-                }
-                else if (this.cursorPos > 0) {
-                    string3 = new StringBuilder(string3).deleteCharAt(Math.max(0, this.cursorPos - 1)).toString();
-                    final int max = Math.max(0, this.cursorPos - 1);
-                    this.cursorPos = max;
-                    this.selectionPos = max;
-                    this.setMessageFn.accept(string3);
-                }
-            }
-            return true;
-        }
-        if (integer == 261) {
-            if (!string3.isEmpty()) {
-                if (this.selectionPos != this.cursorPos) {
-                    this.deleteSelection();
-                }
-                else if (this.cursorPos < string3.length()) {
-                    string3 = new StringBuilder(string3).deleteCharAt(Math.max(0, this.cursorPos)).toString();
-                    this.setMessageFn.accept(string3);
-                }
-            }
-            return true;
-        }
-        if (integer == 263) {
-            final int integer2 = this.font.isBidirectional() ? 1 : -1;
-            if (Screen.hasControlDown()) {
-                this.cursorPos = this.font.getWordPosition(string3, integer2, this.cursorPos, true);
-            }
-            else {
-                this.cursorPos = Math.max(0, Math.min(string3.length(), this.cursorPos + integer2));
-            }
-            if (!Screen.hasShiftDown()) {
-                this.selectionPos = this.cursorPos;
-            }
-            return true;
-        }
-        if (integer == 262) {
-            final int integer2 = this.font.isBidirectional() ? -1 : 1;
-            if (Screen.hasControlDown()) {
-                this.cursorPos = this.font.getWordPosition(string3, integer2, this.cursorPos, true);
-            }
-            else {
-                this.cursorPos = Math.max(0, Math.min(string3.length(), this.cursorPos + integer2));
-            }
-            if (!Screen.hasShiftDown()) {
-                this.selectionPos = this.cursorPos;
-            }
-            return true;
-        }
-        if (integer == 268) {
-            this.cursorPos = 0;
-            if (!Screen.hasShiftDown()) {
-                this.selectionPos = this.cursorPos;
-            }
-            return true;
-        }
-        if (integer == 269) {
-            this.cursorPos = this.getMessageFn.get().length();
-            if (!Screen.hasShiftDown()) {
-                this.selectionPos = this.cursorPos;
-            }
-            return true;
-        }
-        return false;
     }
     
-    private String getSelected() {
-        final String string2 = this.getMessageFn.get();
-        final int integer3 = Math.min(this.cursorPos, this.selectionPos);
-        final int integer4 = Math.max(this.cursorPos, this.selectionPos);
-        return string2.substring(integer3, integer4);
+    public void moveByChars(final int integer, final boolean boolean2) {
+        this.cursorPos = Util.offsetByCodepoints(this.getMessageFn.get(), this.cursorPos, integer);
+        this.resetSelectionIfNeeded(boolean2);
     }
     
-    private void deleteSelection() {
-        if (this.selectionPos == this.cursorPos) {
-            return;
+    public void moveByWords(final int integer, final boolean boolean2) {
+        this.cursorPos = StringSplitter.getWordPosition(this.getMessageFn.get(), integer, this.cursorPos, true);
+        this.resetSelectionIfNeeded(boolean2);
+    }
+    
+    public void removeCharsFromCursor(final int integer) {
+        final String string3 = this.getMessageFn.get();
+        if (!string3.isEmpty()) {
+            String string4;
+            if (this.selectionPos != this.cursorPos) {
+                string4 = this.deleteSelection(string3);
+            }
+            else {
+                final int integer2 = Util.offsetByCodepoints(string3, this.cursorPos, integer);
+                final int integer3 = Math.min(integer2, this.cursorPos);
+                final int integer4 = Math.max(integer2, this.cursorPos);
+                string4 = new StringBuilder(string3).delete(integer3, integer4).toString();
+                if (integer < 0) {
+                    final int n = integer3;
+                    this.cursorPos = n;
+                    this.selectionPos = n;
+                }
+            }
+            this.setMessageFn.accept(string4);
         }
+    }
+    
+    public void cut() {
         final String string2 = this.getMessageFn.get();
-        final int integer3 = Math.min(this.cursorPos, this.selectionPos);
-        final int integer4 = Math.max(this.cursorPos, this.selectionPos);
-        final String string3 = string2.substring(0, integer3) + string2.substring(integer4);
-        this.cursorPos = integer3;
+        this.setClipboardFn.accept(this.getSelected(string2));
+        this.setMessageFn.accept(this.deleteSelection(string2));
+    }
+    
+    public void paste() {
+        this.insertText(this.getMessageFn.get(), this.getClipboardFn.get());
         this.selectionPos = this.cursorPos;
-        this.setMessageFn.accept(string3);
     }
     
-    public void setEnd() {
-        final int length = this.getMessageFn.get().length();
-        this.cursorPos = length;
-        this.selectionPos = length;
+    public void copy() {
+        this.setClipboardFn.accept(this.getSelected(this.getMessageFn.get()));
+    }
+    
+    public void selectAll() {
+        this.selectionPos = 0;
+        this.cursorPos = this.getMessageFn.get().length();
+    }
+    
+    private String getSelected(final String string) {
+        final int integer3 = Math.min(this.cursorPos, this.selectionPos);
+        final int integer4 = Math.max(this.cursorPos, this.selectionPos);
+        return string.substring(integer3, integer4);
+    }
+    
+    private String deleteSelection(final String string) {
+        if (this.selectionPos == this.cursorPos) {
+            return string;
+        }
+        final int integer3 = Math.min(this.cursorPos, this.selectionPos);
+        final int integer4 = Math.max(this.cursorPos, this.selectionPos);
+        final String string2 = string.substring(0, integer3) + string.substring(integer4);
+        final int n = integer3;
+        this.cursorPos = n;
+        this.selectionPos = n;
+        return string2;
+    }
+    
+    private void setCursorToStart(final boolean boolean1) {
+        this.cursorPos = 0;
+        this.resetSelectionIfNeeded(boolean1);
+    }
+    
+    public void setCursorToEnd() {
+        this.setCursorToEnd(false);
+    }
+    
+    private void setCursorToEnd(final boolean boolean1) {
+        this.cursorPos = this.getMessageFn.get().length();
+        this.resetSelectionIfNeeded(boolean1);
     }
     
     public int getCursorPos() {
         return this.cursorPos;
     }
     
+    public void setCursorPos(final int integer, final boolean boolean2) {
+        this.cursorPos = this.clampToMsgLength(integer);
+        this.resetSelectionIfNeeded(boolean2);
+    }
+    
     public int getSelectionPos() {
         return this.selectionPos;
     }
+    
+    public void setSelectionRange(final int integer1, final int integer2) {
+        final int integer3 = this.getMessageFn.get().length();
+        this.cursorPos = Mth.clamp(integer1, 0, integer3);
+        this.selectionPos = Mth.clamp(integer2, 0, integer3);
+    }
+    
+    public boolean isSelecting() {
+        return this.cursorPos != this.selectionPos;
+    }
 }
diff --git a/src/net/minecraft/client/gui/font/glyphs/BakedGlyph.java b/src/net/minecraft/client/gui/font/glyphs/BakedGlyph.java
index 94cda8c..80edae4 100644
--- a/src/net/minecraft/client/gui/font/glyphs/BakedGlyph.java
+++ b/src/net/minecraft/client/gui/font/glyphs/BakedGlyph.java
@@ -16,9 +16,9 @@ public class BakedGlyph {
     private final float up;
     private final float down;
     
-    public BakedGlyph(final RenderType drb1, final RenderType drb2, final float float3, final float float4, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        this.normalType = drb1;
-        this.seeThroughType = drb2;
+    public BakedGlyph(final RenderType ech1, final RenderType ech2, final float float3, final float float4, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        this.normalType = ech1;
+        this.seeThroughType = ech2;
         this.u0 = float3;
         this.u1 = float4;
         this.v0 = float5;
@@ -29,7 +29,7 @@ public class BakedGlyph {
         this.down = float10;
     }
     
-    public void render(final boolean boolean1, final float float2, final float float3, final Matrix4f b, final VertexConsumer cyo, final float float6, final float float7, final float float8, final float float9, final int integer) {
+    public void render(final boolean boolean1, final float float2, final float float3, final Matrix4f b, final VertexConsumer dhp, final float float6, final float float7, final float float8, final float float9, final int integer) {
         final int integer2 = 3;
         final float float10 = float2 + this.left;
         final float float11 = float2 + this.right;
@@ -39,17 +39,17 @@ public class BakedGlyph {
         final float float15 = float3 + float13;
         final float float16 = boolean1 ? (1.0f - 0.25f * float12) : 0.0f;
         final float float17 = boolean1 ? (1.0f - 0.25f * float13) : 0.0f;
-        cyo.vertex(b, float10 + float16, float14, 0.0f).color(float6, float7, float8, float9).uv(this.u0, this.v0).uv2(integer).endVertex();
-        cyo.vertex(b, float10 + float17, float15, 0.0f).color(float6, float7, float8, float9).uv(this.u0, this.v1).uv2(integer).endVertex();
-        cyo.vertex(b, float11 + float17, float15, 0.0f).color(float6, float7, float8, float9).uv(this.u1, this.v1).uv2(integer).endVertex();
-        cyo.vertex(b, float11 + float16, float14, 0.0f).color(float6, float7, float8, float9).uv(this.u1, this.v0).uv2(integer).endVertex();
+        dhp.vertex(b, float10 + float16, float14, 0.0f).color(float6, float7, float8, float9).uv(this.u0, this.v0).uv2(integer).endVertex();
+        dhp.vertex(b, float10 + float17, float15, 0.0f).color(float6, float7, float8, float9).uv(this.u0, this.v1).uv2(integer).endVertex();
+        dhp.vertex(b, float11 + float17, float15, 0.0f).color(float6, float7, float8, float9).uv(this.u1, this.v1).uv2(integer).endVertex();
+        dhp.vertex(b, float11 + float16, float14, 0.0f).color(float6, float7, float8, float9).uv(this.u1, this.v0).uv2(integer).endVertex();
     }
     
-    public void renderEffect(final Effect a, final Matrix4f b, final VertexConsumer cyo, final int integer) {
-        cyo.vertex(b, a.x0, a.y0, a.depth).color(a.r, a.g, a.b, a.a).uv(this.u0, this.v0).uv2(integer).endVertex();
-        cyo.vertex(b, a.x1, a.y0, a.depth).color(a.r, a.g, a.b, a.a).uv(this.u0, this.v1).uv2(integer).endVertex();
-        cyo.vertex(b, a.x1, a.y1, a.depth).color(a.r, a.g, a.b, a.a).uv(this.u1, this.v1).uv2(integer).endVertex();
-        cyo.vertex(b, a.x0, a.y1, a.depth).color(a.r, a.g, a.b, a.a).uv(this.u1, this.v0).uv2(integer).endVertex();
+    public void renderEffect(final Effect a, final Matrix4f b, final VertexConsumer dhp, final int integer) {
+        dhp.vertex(b, a.x0, a.y0, a.depth).color(a.r, a.g, a.b, a.a).uv(this.u0, this.v0).uv2(integer).endVertex();
+        dhp.vertex(b, a.x1, a.y0, a.depth).color(a.r, a.g, a.b, a.a).uv(this.u0, this.v1).uv2(integer).endVertex();
+        dhp.vertex(b, a.x1, a.y1, a.depth).color(a.r, a.g, a.b, a.a).uv(this.u1, this.v1).uv2(integer).endVertex();
+        dhp.vertex(b, a.x0, a.y1, a.depth).color(a.r, a.g, a.b, a.a).uv(this.u1, this.v0).uv2(integer).endVertex();
     }
     
     public RenderType renderType(final boolean boolean1) {
diff --git a/src/net/minecraft/client/gui/font/glyphs/EmptyGlyph.java b/src/net/minecraft/client/gui/font/glyphs/EmptyGlyph.java
index bf96d3c..c61dafe 100644
--- a/src/net/minecraft/client/gui/font/glyphs/EmptyGlyph.java
+++ b/src/net/minecraft/client/gui/font/glyphs/EmptyGlyph.java
@@ -11,6 +11,6 @@ public class EmptyGlyph extends BakedGlyph {
     }
     
     @Override
-    public void render(final boolean boolean1, final float float2, final float float3, final Matrix4f b, final VertexConsumer cyo, final float float6, final float float7, final float float8, final float float9, final int integer) {
+    public void render(final boolean boolean1, final float float2, final float float3, final Matrix4f b, final VertexConsumer dhp, final float float6, final float float7, final float float8, final float float9, final int integer) {
     }
 }
diff --git a/src/net/minecraft/client/gui/font/glyphs/MissingGlyph.java b/src/net/minecraft/client/gui/font/glyphs/MissingGlyph.java
index bfb061e..b08a31a 100644
--- a/src/net/minecraft/client/gui/font/glyphs/MissingGlyph.java
+++ b/src/net/minecraft/client/gui/font/glyphs/MissingGlyph.java
@@ -43,14 +43,14 @@ public enum MissingGlyph implements RawGlyph {
         int integer2;
         int integer3;
         boolean boolean4;
-        IMAGE_DATA = Util.<NativeImage>make(new NativeImage(NativeImage.Format.RGBA, 5, 8, false), cxr -> {
+        IMAGE_DATA = Util.<NativeImage>make(new NativeImage(NativeImage.Format.RGBA, 5, 8, false), dgs -> {
             for (integer2 = 0; integer2 < 8; ++integer2) {
                 for (integer3 = 0; integer3 < 5; ++integer3) {
                     boolean4 = (integer3 == 0 || integer3 + 1 == 5 || integer2 == 0 || integer2 + 1 == 8);
-                    cxr.setPixelRGBA(integer3, integer2, boolean4 ? -1 : 0);
+                    dgs.setPixelRGBA(integer3, integer2, boolean4 ? -1 : 0);
                 }
             }
-            cxr.untrack();
+            dgs.untrack();
         });
     }
 }
diff --git a/src/net/minecraft/client/gui/font/glyphs/WhiteGlyph.java b/src/net/minecraft/client/gui/font/glyphs/WhiteGlyph.java
index cf9d59d..e2a544f 100644
--- a/src/net/minecraft/client/gui/font/glyphs/WhiteGlyph.java
+++ b/src/net/minecraft/client/gui/font/glyphs/WhiteGlyph.java
@@ -43,14 +43,14 @@ public enum WhiteGlyph implements RawGlyph {
         int integer2;
         int integer3;
         boolean boolean4;
-        IMAGE_DATA = Util.<NativeImage>make(new NativeImage(NativeImage.Format.RGBA, 5, 8, false), cxr -> {
+        IMAGE_DATA = Util.<NativeImage>make(new NativeImage(NativeImage.Format.RGBA, 5, 8, false), dgs -> {
             for (integer2 = 0; integer2 < 8; ++integer2) {
                 for (integer3 = 0; integer3 < 5; ++integer3) {
                     boolean4 = (integer3 == 0 || integer3 + 1 == 5 || integer2 == 0 || integer2 + 1 == 8);
-                    cxr.setPixelRGBA(integer3, integer2, -1);
+                    dgs.setPixelRGBA(integer3, integer2, -1);
                 }
             }
-            cxr.untrack();
+            dgs.untrack();
         });
     }
 }
diff --git a/src/net/minecraft/client/gui/font/providers/BitmapProvider.java b/src/net/minecraft/client/gui/font/providers/BitmapProvider.java
index 56c7d74..7af8aed 100644
--- a/src/net/minecraft/client/gui/font/providers/BitmapProvider.java
+++ b/src/net/minecraft/client/gui/font/providers/BitmapProvider.java
@@ -2,7 +2,7 @@ package net.minecraft.client.gui.font.providers;
 
 import net.minecraft.server.packs.resources.Resource;
 import java.io.IOException;
-import it.unimi.dsi.fastutil.chars.Char2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import net.minecraft.server.packs.resources.ResourceManager;
 import com.google.gson.JsonArray;
 import com.google.common.collect.Lists;
@@ -12,9 +12,11 @@ import com.google.gson.JsonObject;
 import java.util.List;
 import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.LogManager;
+import it.unimi.dsi.fastutil.ints.IntSets;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import javax.annotation.Nullable;
 import com.mojang.blaze3d.font.RawGlyph;
-import it.unimi.dsi.fastutil.chars.Char2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import com.mojang.blaze3d.platform.NativeImage;
 import org.apache.logging.log4j.Logger;
 import com.mojang.blaze3d.font.GlyphProvider;
@@ -22,11 +24,11 @@ import com.mojang.blaze3d.font.GlyphProvider;
 public class BitmapProvider implements GlyphProvider {
     private static final Logger LOGGER;
     private final NativeImage image;
-    private final Char2ObjectMap<Glyph> glyphs;
+    private final Int2ObjectMap<Glyph> glyphs;
     
-    public BitmapProvider(final NativeImage cxr, final Char2ObjectMap<Glyph> char2ObjectMap) {
-        this.image = cxr;
-        this.glyphs = char2ObjectMap;
+    private BitmapProvider(final NativeImage dgs, final Int2ObjectMap<Glyph> int2ObjectMap) {
+        this.image = dgs;
+        this.glyphs = int2ObjectMap;
     }
     
     @Override
@@ -36,8 +38,13 @@ public class BitmapProvider implements GlyphProvider {
     
     @Nullable
     @Override
-    public RawGlyph getGlyph(final char character) {
-        return (RawGlyph)this.glyphs.get(character);
+    public RawGlyph getGlyph(final int integer) {
+        return (RawGlyph)this.glyphs.get(integer);
+    }
+    
+    @Override
+    public IntSet getSupportedGlyphs() {
+        return IntSets.unmodifiable(this.glyphs.keySet());
     }
     
     static {
@@ -46,12 +53,12 @@ public class BitmapProvider implements GlyphProvider {
     
     public static class Builder implements GlyphProviderBuilder {
         private final ResourceLocation texture;
-        private final List<String> chars;
+        private final List<int[]> chars;
         private final int height;
         private final int ascent;
         
-        public Builder(final ResourceLocation sm, final int integer2, final int integer3, final List<String> list) {
-            this.texture = new ResourceLocation(sm.getNamespace(), "textures/" + sm.getPath());
+        public Builder(final ResourceLocation uh, final int integer2, final int integer3, final List<int[]> list) {
+            this.texture = new ResourceLocation(uh.getNamespace(), "textures/" + uh.getPath());
             this.chars = list;
             this.height = integer2;
             this.ascent = integer3;
@@ -63,20 +70,20 @@ public class BitmapProvider implements GlyphProvider {
             if (integer3 > integer2) {
                 throw new JsonParseException("Ascent " + integer3 + " higher than height " + integer2);
             }
-            final List<String> list4 = Lists.newArrayList();
+            final List<int[]> list4 = Lists.newArrayList();
             final JsonArray jsonArray5 = GsonHelper.getAsJsonArray(jsonObject, "chars");
             for (int integer4 = 0; integer4 < jsonArray5.size(); ++integer4) {
                 final String string7 = GsonHelper.convertToString(jsonArray5.get(integer4), "chars[" + integer4 + "]");
+                final int[] arr8 = string7.codePoints().toArray();
                 if (integer4 > 0) {
-                    final int integer5 = string7.length();
-                    final int integer6 = list4.get(0).length();
-                    if (integer5 != integer6) {
-                        throw new JsonParseException("Elements of chars have to be the same length (found: " + integer5 + ", expected: " + integer6 + "), pad with space or \\u0000");
+                    final int integer5 = list4.get(0).length;
+                    if (arr8.length != integer5) {
+                        throw new JsonParseException("Elements of chars have to be the same length (found: " + arr8.length + ", expected: " + integer5 + "), pad with space or \\u0000");
                     }
                 }
-                list4.add(string7);
+                list4.add(arr8);
             }
-            if (list4.isEmpty() || list4.get(0).isEmpty()) {
+            if (list4.isEmpty() || list4.get(0).length == 0) {
                 throw new JsonParseException("Expected to find data in chars, found none.");
             }
             return new Builder(new ResourceLocation(GsonHelper.getAsString(jsonObject, "file")), integer2, integer3, list4);
@@ -84,44 +91,44 @@ public class BitmapProvider implements GlyphProvider {
         
         @Nullable
         @Override
-        public GlyphProvider create(final ResourceManager zb) {
-            try (final Resource za3 = zb.getResource(this.texture)) {
-                final NativeImage cxr5 = NativeImage.read(NativeImage.Format.RGBA, za3.getInputStream());
-                final int integer6 = cxr5.getWidth();
-                final int integer7 = cxr5.getHeight();
-                final int integer8 = integer6 / this.chars.get(0).length();
+        public GlyphProvider create(final ResourceManager abc) {
+            try (final Resource abb3 = abc.getResource(this.texture)) {
+                final NativeImage dgs5 = NativeImage.read(NativeImage.Format.RGBA, abb3.getInputStream());
+                final int integer6 = dgs5.getWidth();
+                final int integer7 = dgs5.getHeight();
+                final int integer8 = integer6 / this.chars.get(0).length;
                 final int integer9 = integer7 / this.chars.size();
                 final float float10 = this.height / (float)integer9;
-                final Char2ObjectMap<Glyph> char2ObjectMap11 = (Char2ObjectMap<Glyph>)new Char2ObjectOpenHashMap();
+                final Int2ObjectMap<Glyph> int2ObjectMap11 = (Int2ObjectMap<Glyph>)new Int2ObjectOpenHashMap();
                 for (int integer10 = 0; integer10 < this.chars.size(); ++integer10) {
-                    final String string13 = this.chars.get(integer10);
-                    for (int integer11 = 0; integer11 < string13.length(); ++integer11) {
-                        final char character15 = string13.charAt(integer11);
-                        if (character15 != '\0') {
-                            if (character15 != ' ') {
-                                final int integer12 = this.getActualGlyphWidth(cxr5, integer8, integer9, integer11, integer10);
-                                final Glyph b17 = (Glyph)char2ObjectMap11.put(character15, new Glyph(float10, cxr5, integer11 * integer8, integer10 * integer9, integer8, integer9, (int)(0.5 + integer12 * float10) + 1, this.ascent));
-                                if (b17 != null) {
-                                    BitmapProvider.LOGGER.warn("Codepoint '{}' declared multiple times in {}", Integer.toHexString(character15), this.texture);
+                    int integer11 = 0;
+                    for (final int integer12 : this.chars.get(integer10)) {
+                        final int integer13 = integer11++;
+                        if (integer12 != 0) {
+                            if (integer12 != 32) {
+                                final int integer14 = this.getActualGlyphWidth(dgs5, integer8, integer9, integer13, integer10);
+                                final Glyph b20 = (Glyph)int2ObjectMap11.put(integer12, new Glyph(float10, dgs5, integer13 * integer8, integer10 * integer9, integer8, integer9, (int)(0.5 + integer14 * float10) + 1, this.ascent));
+                                if (b20 != null) {
+                                    BitmapProvider.LOGGER.warn("Codepoint '{}' declared multiple times in {}", Integer.toHexString(integer12), this.texture);
                                 }
                             }
                         }
                     }
                 }
-                return new BitmapProvider(cxr5, char2ObjectMap11);
+                return new BitmapProvider(dgs5, int2ObjectMap11, null);
             }
             catch (IOException iOException3) {
                 throw new RuntimeException(iOException3.getMessage());
             }
         }
         
-        private int getActualGlyphWidth(final NativeImage cxr, final int integer2, final int integer3, final int integer4, final int integer5) {
+        private int getActualGlyphWidth(final NativeImage dgs, final int integer2, final int integer3, final int integer4, final int integer5) {
             int integer6;
             for (integer6 = integer2 - 1; integer6 >= 0; --integer6) {
                 final int integer7 = integer4 * integer2 + integer6;
                 for (int integer8 = 0; integer8 < integer3; ++integer8) {
                     final int integer9 = integer5 * integer3 + integer8;
-                    if (cxr.getLuminanceOrAlpha(integer7, integer9) != 0) {
+                    if (dgs.getLuminanceOrAlpha(integer7, integer9) != 0) {
                         return integer6 + 1;
                     }
                 }
@@ -140,9 +147,9 @@ public class BitmapProvider implements GlyphProvider {
         private final int advance;
         private final int ascent;
         
-        private Glyph(final float float1, final NativeImage cxr, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
+        private Glyph(final float float1, final NativeImage dgs, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
             this.scale = float1;
-            this.image = cxr;
+            this.image = dgs;
             this.offsetX = integer3;
             this.offsetY = integer4;
             this.width = integer5;
diff --git a/src/net/minecraft/client/gui/font/providers/GlyphProviderBuilder.java b/src/net/minecraft/client/gui/font/providers/GlyphProviderBuilder.java
index 21271e1..103527a 100644
--- a/src/net/minecraft/client/gui/font/providers/GlyphProviderBuilder.java
+++ b/src/net/minecraft/client/gui/font/providers/GlyphProviderBuilder.java
@@ -6,5 +6,5 @@ import net.minecraft.server.packs.resources.ResourceManager;
 
 public interface GlyphProviderBuilder {
     @Nullable
-    GlyphProvider create(final ResourceManager zb);
+    GlyphProvider create(final ResourceManager abc);
 }
diff --git a/src/net/minecraft/client/gui/font/providers/GlyphProviderBuilderType.java b/src/net/minecraft/client/gui/font/providers/GlyphProviderBuilderType.java
index 5bf64f7..d6723b3 100644
--- a/src/net/minecraft/client/gui/font/providers/GlyphProviderBuilderType.java
+++ b/src/net/minecraft/client/gui/font/providers/GlyphProviderBuilderType.java
@@ -22,11 +22,11 @@ public enum GlyphProviderBuilderType {
     }
     
     public static GlyphProviderBuilderType byName(final String string) {
-        final GlyphProviderBuilderType der2 = GlyphProviderBuilderType.BY_NAME.get(string);
-        if (der2 == null) {
+        final GlyphProviderBuilderType dpe2 = GlyphProviderBuilderType.BY_NAME.get(string);
+        if (dpe2 == null) {
             throw new IllegalArgumentException("Invalid type: " + string);
         }
-        return der2;
+        return dpe2;
     }
     
     public GlyphProviderBuilder create(final JsonObject jsonObject) {
@@ -37,12 +37,12 @@ public enum GlyphProviderBuilderType {
         final GlyphProviderBuilderType[] array;
         int length;
         int i = 0;
-        GlyphProviderBuilderType der5;
+        GlyphProviderBuilderType dpe5;
         BY_NAME = Util.<Map<String, GlyphProviderBuilderType>>make(Maps.newHashMap(), hashMap -> {
             values();
             for (length = array.length; i < length; ++i) {
-                der5 = array[i];
-                hashMap.put(der5.name, der5);
+                dpe5 = array[i];
+                hashMap.put(dpe5.name, dpe5);
             }
         });
     }
diff --git a/src/net/minecraft/client/gui/font/providers/LegacyUnicodeBitmapsProvider.java b/src/net/minecraft/client/gui/font/providers/LegacyUnicodeBitmapsProvider.java
index 60284e6..4f3ca8b 100644
--- a/src/net/minecraft/client/gui/font/providers/LegacyUnicodeBitmapsProvider.java
+++ b/src/net/minecraft/client/gui/font/providers/LegacyUnicodeBitmapsProvider.java
@@ -4,6 +4,8 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonObject;
 import org.apache.logging.log4j.LogManager;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import javax.annotation.Nullable;
 import java.util.function.Function;
 import com.mojang.blaze3d.font.RawGlyph;
@@ -25,28 +27,28 @@ public class LegacyUnicodeBitmapsProvider implements GlyphProvider {
     private final String texturePattern;
     private final Map<ResourceLocation, NativeImage> textures;
     
-    public LegacyUnicodeBitmapsProvider(final ResourceManager zb, final byte[] arr, final String string) {
+    public LegacyUnicodeBitmapsProvider(final ResourceManager abc, final byte[] arr, final String string) {
         this.textures = Maps.newHashMap();
-        this.resourceManager = zb;
+        this.resourceManager = abc;
         this.sizes = arr;
         this.texturePattern = string;
         for (int integer5 = 0; integer5 < 256; ++integer5) {
-            final char character6 = (char)(integer5 * 256);
-            final ResourceLocation sm7 = this.getSheetLocation(character6);
-            try (final Resource za8 = this.resourceManager.getResource(sm7);
-                 final NativeImage cxr10 = NativeImage.read(NativeImage.Format.RGBA, za8.getInputStream())) {
-                if (cxr10.getWidth() == 256 && cxr10.getHeight() == 256) {
-                    for (int integer6 = 0; integer6 < 256; ++integer6) {
-                        final byte byte13 = arr[character6 + integer6];
+            final int integer6 = integer5 * 256;
+            final ResourceLocation uh7 = this.getSheetLocation(integer6);
+            try (final Resource abb8 = this.resourceManager.getResource(uh7);
+                 final NativeImage dgs10 = NativeImage.read(NativeImage.Format.RGBA, abb8.getInputStream())) {
+                if (dgs10.getWidth() == 256 && dgs10.getHeight() == 256) {
+                    for (int integer7 = 0; integer7 < 256; ++integer7) {
+                        final byte byte13 = arr[integer6 + integer7];
                         if (byte13 != 0 && getLeft(byte13) > getRight(byte13)) {
-                            arr[character6 + integer6] = 0;
+                            arr[integer6 + integer7] = 0;
                         }
                     }
                     continue;
                 }
             }
             catch (IOException ex) {}
-            Arrays.fill(arr, character6, character6 + '\u0100', (byte)0);
+            Arrays.fill(arr, integer6, integer6 + 256, (byte)0);
         }
     }
     
@@ -55,32 +57,46 @@ public class LegacyUnicodeBitmapsProvider implements GlyphProvider {
         this.textures.values().forEach(NativeImage::close);
     }
     
-    private ResourceLocation getSheetLocation(final char character) {
-        final ResourceLocation sm3 = new ResourceLocation(String.format(this.texturePattern, String.format("%02x", character / '\u0100')));
-        return new ResourceLocation(sm3.getNamespace(), "textures/" + sm3.getPath());
+    private ResourceLocation getSheetLocation(final int integer) {
+        final ResourceLocation uh3 = new ResourceLocation(String.format(this.texturePattern, String.format("%02x", integer / 256)));
+        return new ResourceLocation(uh3.getNamespace(), "textures/" + uh3.getPath());
     }
     
     @Nullable
     @Override
-    public RawGlyph getGlyph(final char character) {
-        final byte byte3 = this.sizes[character];
+    public RawGlyph getGlyph(final int integer) {
+        if (integer < 0 || integer > 65535) {
+            return null;
+        }
+        final byte byte3 = this.sizes[integer];
         if (byte3 != 0) {
-            final NativeImage cxr4 = this.textures.computeIfAbsent(this.getSheetLocation(character), this::loadTexture);
-            if (cxr4 != null) {
-                final int integer5 = getLeft(byte3);
-                return new Glyph(character % '\u0010' * 16 + integer5, (character & '\u00ff') / 16 * 16, getRight(byte3) - integer5, 16, cxr4);
+            final NativeImage dgs4 = this.textures.computeIfAbsent(this.getSheetLocation(integer), this::loadTexture);
+            if (dgs4 != null) {
+                final int integer2 = getLeft(byte3);
+                return new Glyph(integer % 16 * 16 + integer2, (integer & 0xFF) / 16 * 16, getRight(byte3) - integer2, 16, dgs4);
             }
         }
         return null;
     }
     
+    @Override
+    public IntSet getSupportedGlyphs() {
+        final IntSet intSet2 = (IntSet)new IntOpenHashSet();
+        for (int integer3 = 0; integer3 < 65535; ++integer3) {
+            if (this.sizes[integer3] != 0) {
+                intSet2.add(integer3);
+            }
+        }
+        return intSet2;
+    }
+    
     @Nullable
-    private NativeImage loadTexture(final ResourceLocation sm) {
-        try (final Resource za3 = this.resourceManager.getResource(sm)) {
-            return NativeImage.read(NativeImage.Format.RGBA, za3.getInputStream());
+    private NativeImage loadTexture(final ResourceLocation uh) {
+        try (final Resource abb3 = this.resourceManager.getResource(uh)) {
+            return NativeImage.read(NativeImage.Format.RGBA, abb3.getInputStream());
         }
         catch (IOException iOException3) {
-            LegacyUnicodeBitmapsProvider.LOGGER.error("Couldn't load texture {}", sm, iOException3);
+            LegacyUnicodeBitmapsProvider.LOGGER.error("Couldn't load texture {}", uh, iOException3);
             return null;
         }
     }
@@ -101,8 +117,8 @@ public class LegacyUnicodeBitmapsProvider implements GlyphProvider {
         private final ResourceLocation metadata;
         private final String texturePattern;
         
-        public Builder(final ResourceLocation sm, final String string) {
-            this.metadata = sm;
+        public Builder(final ResourceLocation uh, final String string) {
+            this.metadata = uh;
             this.texturePattern = string;
         }
         
@@ -112,11 +128,11 @@ public class LegacyUnicodeBitmapsProvider implements GlyphProvider {
         
         @Nullable
         @Override
-        public GlyphProvider create(final ResourceManager zb) {
-            try (final Resource za3 = Minecraft.getInstance().getResourceManager().getResource(this.metadata)) {
+        public GlyphProvider create(final ResourceManager abc) {
+            try (final Resource abb3 = Minecraft.getInstance().getResourceManager().getResource(this.metadata)) {
                 final byte[] arr5 = new byte[65536];
-                za3.getInputStream().read(arr5);
-                return new LegacyUnicodeBitmapsProvider(zb, arr5, this.texturePattern);
+                abb3.getInputStream().read(arr5);
+                return new LegacyUnicodeBitmapsProvider(abc, arr5, this.texturePattern);
             }
             catch (IOException iOException3) {
                 LegacyUnicodeBitmapsProvider.LOGGER.error("Cannot load {}, unicode glyphs will not render correctly", this.metadata);
@@ -132,12 +148,12 @@ public class LegacyUnicodeBitmapsProvider implements GlyphProvider {
         private final int sourceY;
         private final NativeImage source;
         
-        private Glyph(final int integer1, final int integer2, final int integer3, final int integer4, final NativeImage cxr) {
+        private Glyph(final int integer1, final int integer2, final int integer3, final int integer4, final NativeImage dgs) {
             this.width = integer3;
             this.height = integer4;
             this.sourceX = integer1;
             this.sourceY = integer2;
-            this.source = cxr;
+            this.source = dgs;
         }
         
         @Override
diff --git a/src/net/minecraft/client/gui/font/providers/TrueTypeGlyphProviderBuilder.java b/src/net/minecraft/client/gui/font/providers/TrueTypeGlyphProviderBuilder.java
index d2196dc..ce4cbc1 100644
--- a/src/net/minecraft/client/gui/font/providers/TrueTypeGlyphProviderBuilder.java
+++ b/src/net/minecraft/client/gui/font/providers/TrueTypeGlyphProviderBuilder.java
@@ -30,8 +30,8 @@ public class TrueTypeGlyphProviderBuilder implements GlyphProviderBuilder {
     private final float shiftY;
     private final String skip;
     
-    public TrueTypeGlyphProviderBuilder(final ResourceLocation sm, final float float2, final float float3, final float float4, final float float5, final String string) {
-        this.location = sm;
+    public TrueTypeGlyphProviderBuilder(final ResourceLocation uh, final float float2, final float float3, final float float4, final float float5, final String string) {
+        this.location = uh;
         this.size = float2;
         this.oversample = float3;
         this.shiftX = float4;
@@ -68,13 +68,13 @@ public class TrueTypeGlyphProviderBuilder implements GlyphProviderBuilder {
     
     @Nullable
     @Override
-    public GlyphProvider create(final ResourceManager zb) {
+    public GlyphProvider create(final ResourceManager abc) {
         STBTTFontinfo sTBTTFontinfo3 = null;
         ByteBuffer byteBuffer4 = null;
-        try (final Resource za5 = zb.getResource(new ResourceLocation(this.location.getNamespace(), "font/" + this.location.getPath()))) {
+        try (final Resource abb5 = abc.getResource(new ResourceLocation(this.location.getNamespace(), "font/" + this.location.getPath()))) {
             TrueTypeGlyphProviderBuilder.LOGGER.debug("Loading font {}", this.location);
             sTBTTFontinfo3 = STBTTFontinfo.malloc();
-            byteBuffer4 = TextureUtil.readResource(za5.getInputStream());
+            byteBuffer4 = TextureUtil.readResource(abb5.getInputStream());
             byteBuffer4.flip();
             TrueTypeGlyphProviderBuilder.LOGGER.debug("Reading font {}", this.location);
             if (!STBTruetype.stbtt_InitFont(sTBTTFontinfo3, byteBuffer4)) {
diff --git a/src/net/minecraft/client/gui/screens/AccessibilityOptionsScreen.java b/src/net/minecraft/client/gui/screens/AccessibilityOptionsScreen.java
index eab5c60..f91a198 100644
--- a/src/net/minecraft/client/gui/screens/AccessibilityOptionsScreen.java
+++ b/src/net/minecraft/client/gui/screens/AccessibilityOptionsScreen.java
@@ -1,7 +1,9 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
@@ -13,31 +15,31 @@ public class AccessibilityOptionsScreen extends OptionsSubScreen {
     private static final Option[] OPTIONS;
     private AbstractWidget narratorButton;
     
-    public AccessibilityOptionsScreen(final Screen dgb, final Options dbr) {
-        super(dgb, dbr, new TranslatableComponent("options.accessibility.title", new Object[0]));
+    public AccessibilityOptionsScreen(final Screen dqs, final Options dmb) {
+        super(dqs, dmb, new TranslatableComponent("options.accessibility.title"));
     }
     
     @Override
     protected void init() {
         int integer2 = 0;
-        for (final Option dbq6 : AccessibilityOptionsScreen.OPTIONS) {
+        for (final Option dma6 : AccessibilityOptionsScreen.OPTIONS) {
             final int integer3 = this.width / 2 - 155 + integer2 % 2 * 160;
             final int integer4 = this.height / 6 + 24 * (integer2 >> 1);
-            final AbstractWidget dct9 = this.<AbstractWidget>addButton(dbq6.createButton(this.minecraft.options, integer3, integer4, 150));
-            if (dbq6 == Option.NARRATOR) {
-                this.narratorButton = dct9;
-                dct9.active = NarratorChatListener.INSTANCE.isActive();
+            final AbstractWidget dng9 = this.<AbstractWidget>addButton(dma6.createButton(this.minecraft.options, integer3, integer4, 150));
+            if (dma6 == Option.NARRATOR) {
+                this.narratorButton = dng9;
+                dng9.active = NarratorChatListener.INSTANCE.isActive();
             }
             ++integer2;
         }
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 144, 200, 20, I18n.get("gui.done"), dcv -> this.minecraft.setScreen(this.lastScreen)));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 144, 200, 20, CommonComponents.GUI_DONE, dni -> this.minecraft.setScreen(this.lastScreen)));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 20, 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 20, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     public void updateNarratorButton() {
@@ -45,6 +47,6 @@ public class AccessibilityOptionsScreen extends OptionsSubScreen {
     }
     
     static {
-        OPTIONS = new Option[] { Option.NARRATOR, Option.SHOW_SUBTITLES, Option.TEXT_BACKGROUND_OPACITY, Option.TEXT_BACKGROUND, Option.CHAT_OPACITY, Option.AUTO_JUMP, Option.TOGGLE_CROUCH, Option.TOGGLE_SPRINT };
+        OPTIONS = new Option[] { Option.NARRATOR, Option.SHOW_SUBTITLES, Option.TEXT_BACKGROUND_OPACITY, Option.TEXT_BACKGROUND, Option.CHAT_OPACITY, Option.CHAT_LINE_SPACING, Option.CHAT_DELAY, Option.AUTO_JUMP, Option.TOGGLE_CROUCH, Option.TOGGLE_SPRINT };
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/AlertScreen.java b/src/net/minecraft/client/gui/screens/AlertScreen.java
index 52d5376..5eb743e 100644
--- a/src/net/minecraft/client/gui/screens/AlertScreen.java
+++ b/src/net/minecraft/client/gui/screens/AlertScreen.java
@@ -2,52 +2,54 @@ package net.minecraft.client.gui.screens;
 
 import net.minecraft.client.gui.components.AbstractWidget;
 import java.util.Iterator;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.Collection;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
 import com.google.common.collect.Lists;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.FormattedText;
 import java.util.List;
 import net.minecraft.network.chat.Component;
 
 public class AlertScreen extends Screen {
     private final Runnable callback;
     protected final Component text;
-    private final List<String> lines;
-    protected final String okButton;
+    private final List<FormattedText> lines;
+    protected final Component okButton;
     private int delayTicker;
     
-    public AlertScreen(final Runnable runnable, final Component lf2, final Component lf3) {
-        this(runnable, lf2, lf3, "gui.back");
+    public AlertScreen(final Runnable runnable, final Component mr2, final Component mr3) {
+        this(runnable, mr2, mr3, CommonComponents.GUI_BACK);
     }
     
-    public AlertScreen(final Runnable runnable, final Component lf2, final Component lf3, final String string) {
-        super(lf2);
+    public AlertScreen(final Runnable runnable, final Component mr2, final Component mr3, final Component mr4) {
+        super(mr2);
         this.lines = Lists.newArrayList();
         this.callback = runnable;
-        this.text = lf3;
-        this.okButton = I18n.get(string);
+        this.text = mr3;
+        this.okButton = mr4;
     }
     
     @Override
     protected void init() {
         super.init();
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 168, 200, 20, this.okButton, dcv -> this.callback.run()));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 168, 200, 20, this.okButton, dni -> this.callback.run()));
         this.lines.clear();
-        this.lines.addAll(this.font.split(this.text.getColoredString(), this.width - 50));
+        this.lines.addAll(this.font.split(this.text, this.width - 50));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 70, 16777215);
-        int integer3 = 90;
-        for (final String string7 : this.lines) {
-            this.drawCenteredString(this.font, string7, this.width / 2, integer3, 16777215);
-            final int n = integer3;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 70, 16777215);
+        int integer4 = 90;
+        for (final FormattedText mu8 : this.lines) {
+            this.drawCenteredString(dhl, this.font, mu8, this.width / 2, integer4, 16777215);
+            final int n = integer4;
             this.font.getClass();
-            integer3 = n + 9;
+            integer4 = n + 9;
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Override
@@ -56,8 +58,8 @@ public class AlertScreen extends Screen {
         final int delayTicker = this.delayTicker - 1;
         this.delayTicker = delayTicker;
         if (delayTicker == 0) {
-            for (final AbstractWidget dct3 : this.buttons) {
-                dct3.active = true;
+            for (final AbstractWidget dng3 : this.buttons) {
+                dng3.active = true;
             }
         }
     }
diff --git a/src/net/minecraft/client/gui/screens/BackupConfirmScreen.java b/src/net/minecraft/client/gui/screens/BackupConfirmScreen.java
index 24e8ed2..abf1fcc 100644
--- a/src/net/minecraft/client/gui/screens/BackupConfirmScreen.java
+++ b/src/net/minecraft/client/gui/screens/BackupConfirmScreen.java
@@ -1,68 +1,65 @@
 package net.minecraft.client.gui.screens;
 
 import java.util.Iterator;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.TranslatableComponent;
 import java.util.Collection;
-import net.minecraft.client.resources.language.I18n;
 import com.google.common.collect.Lists;
 import net.minecraft.client.gui.components.Checkbox;
+import net.minecraft.network.chat.FormattedText;
 import java.util.List;
 import net.minecraft.network.chat.Component;
+import javax.annotation.Nullable;
 
 public class BackupConfirmScreen extends Screen {
+    @Nullable
     private final Screen lastScreen;
     protected final Listener listener;
     private final Component description;
     private final boolean promptForCacheErase;
-    private final List<String> lines;
-    private final String eraseCacheText;
-    private final String backupButton;
-    private final String continueButton;
-    private final String cancelButton;
+    private final List<FormattedText> lines;
     private Checkbox eraseCache;
     
-    public BackupConfirmScreen(final Screen dgb, final Listener a, final Component lf3, final Component lf4, final boolean boolean5) {
-        super(lf3);
+    public BackupConfirmScreen(@Nullable final Screen dqs, final Listener a, final Component mr3, final Component mr4, final boolean boolean5) {
+        super(mr3);
         this.lines = Lists.newArrayList();
-        this.lastScreen = dgb;
+        this.lastScreen = dqs;
         this.listener = a;
-        this.description = lf4;
+        this.description = mr4;
         this.promptForCacheErase = boolean5;
-        this.eraseCacheText = I18n.get("selectWorld.backupEraseCache");
-        this.backupButton = I18n.get("selectWorld.backupJoinConfirmButton");
-        this.continueButton = I18n.get("selectWorld.backupJoinSkipButton");
-        this.cancelButton = I18n.get("gui.cancel");
     }
     
     @Override
     protected void init() {
         super.init();
         this.lines.clear();
-        this.lines.addAll(this.font.split(this.description.getColoredString(), this.width - 50));
+        this.lines.addAll(this.font.split(this.description, this.width - 50));
         final int n = this.lines.size() + 1;
         this.font.getClass();
         final int integer2 = n * 9;
-        this.<Button>addButton(new Button(this.width / 2 - 155, 100 + integer2, 150, 20, this.backupButton, dcv -> this.listener.proceed(true, this.eraseCache.selected())));
-        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, 100 + integer2, 150, 20, this.continueButton, dcv -> this.listener.proceed(false, this.eraseCache.selected())));
-        this.<Button>addButton(new Button(this.width / 2 - 155 + 80, 124 + integer2, 150, 20, this.cancelButton, dcv -> this.minecraft.setScreen(this.lastScreen)));
-        this.eraseCache = new Checkbox(this.width / 2 - 155 + 80, 76 + integer2, 150, 20, this.eraseCacheText, false);
+        this.<Button>addButton(new Button(this.width / 2 - 155, 100 + integer2, 150, 20, new TranslatableComponent("selectWorld.backupJoinConfirmButton"), dni -> this.listener.proceed(true, this.eraseCache.selected())));
+        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, 100 + integer2, 150, 20, new TranslatableComponent("selectWorld.backupJoinSkipButton"), dni -> this.listener.proceed(false, this.eraseCache.selected())));
+        this.<Button>addButton(new Button(this.width / 2 - 155 + 80, 124 + integer2, 150, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(this.lastScreen)));
+        this.eraseCache = new Checkbox(this.width / 2 - 155 + 80, 76 + integer2, 150, 20, new TranslatableComponent("selectWorld.backupEraseCache"), false);
         if (this.promptForCacheErase) {
             this.<Checkbox>addButton(this.eraseCache);
         }
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 50, 16777215);
-        int integer3 = 70;
-        for (final String string7 : this.lines) {
-            this.drawCenteredString(this.font, string7, this.width / 2, integer3, 16777215);
-            final int n = integer3;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 50, 16777215);
+        int integer4 = 70;
+        for (final FormattedText mu8 : this.lines) {
+            this.drawCenteredString(dhl, this.font, mu8, this.width / 2, integer4, 16777215);
+            final int n = integer4;
             this.font.getClass();
-            integer3 = n + 9;
+            integer4 = n + 9;
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/ChatOptionsScreen.java b/src/net/minecraft/client/gui/screens/ChatOptionsScreen.java
index c653675..d9a7866 100644
--- a/src/net/minecraft/client/gui/screens/ChatOptionsScreen.java
+++ b/src/net/minecraft/client/gui/screens/ChatOptionsScreen.java
@@ -1,7 +1,9 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
@@ -13,31 +15,31 @@ public class ChatOptionsScreen extends OptionsSubScreen {
     private static final Option[] CHAT_OPTIONS;
     private AbstractWidget narratorButton;
     
-    public ChatOptionsScreen(final Screen dgb, final Options dbr) {
-        super(dgb, dbr, new TranslatableComponent("options.chat.title", new Object[0]));
+    public ChatOptionsScreen(final Screen dqs, final Options dmb) {
+        super(dqs, dmb, new TranslatableComponent("options.chat.title"));
     }
     
     @Override
     protected void init() {
         int integer2 = 0;
-        for (final Option dbq6 : ChatOptionsScreen.CHAT_OPTIONS) {
+        for (final Option dma6 : ChatOptionsScreen.CHAT_OPTIONS) {
             final int integer3 = this.width / 2 - 155 + integer2 % 2 * 160;
             final int integer4 = this.height / 6 + 24 * (integer2 >> 1);
-            final AbstractWidget dct9 = this.<AbstractWidget>addButton(dbq6.createButton(this.minecraft.options, integer3, integer4, 150));
-            if (dbq6 == Option.NARRATOR) {
-                this.narratorButton = dct9;
-                dct9.active = NarratorChatListener.INSTANCE.isActive();
+            final AbstractWidget dng9 = this.<AbstractWidget>addButton(dma6.createButton(this.minecraft.options, integer3, integer4, 150));
+            if (dma6 == Option.NARRATOR) {
+                this.narratorButton = dng9;
+                dng9.active = NarratorChatListener.INSTANCE.isActive();
             }
             ++integer2;
         }
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 24 * (integer2 + 1) / 2, 200, 20, I18n.get("gui.done"), dcv -> this.minecraft.setScreen(this.lastScreen)));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 24 * (integer2 + 1) / 2, 200, 20, CommonComponents.GUI_DONE, dni -> this.minecraft.setScreen(this.lastScreen)));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 20, 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 20, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     public void updateNarratorButton() {
@@ -45,6 +47,6 @@ public class ChatOptionsScreen extends OptionsSubScreen {
     }
     
     static {
-        CHAT_OPTIONS = new Option[] { Option.CHAT_VISIBILITY, Option.CHAT_COLOR, Option.CHAT_LINKS, Option.CHAT_LINKS_PROMPT, Option.CHAT_OPACITY, Option.TEXT_BACKGROUND_OPACITY, Option.CHAT_SCALE, Option.CHAT_WIDTH, Option.CHAT_HEIGHT_FOCUSED, Option.CHAT_HEIGHT_UNFOCUSED, Option.REDUCED_DEBUG_INFO, Option.AUTO_SUGGESTIONS, Option.NARRATOR };
+        CHAT_OPTIONS = new Option[] { Option.CHAT_VISIBILITY, Option.CHAT_COLOR, Option.CHAT_LINKS, Option.CHAT_LINKS_PROMPT, Option.CHAT_OPACITY, Option.TEXT_BACKGROUND_OPACITY, Option.CHAT_SCALE, Option.CHAT_LINE_SPACING, Option.CHAT_WIDTH, Option.CHAT_HEIGHT_FOCUSED, Option.CHAT_HEIGHT_UNFOCUSED, Option.NARRATOR, Option.AUTO_SUGGESTIONS, Option.REDUCED_DEBUG_INFO };
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/ChatScreen.java b/src/net/minecraft/client/gui/screens/ChatScreen.java
index a6e45c6..1224f69 100644
--- a/src/net/minecraft/client/gui/screens/ChatScreen.java
+++ b/src/net/minecraft/client/gui/screens/ChatScreen.java
@@ -1,12 +1,16 @@
 package net.minecraft.client.gui.screens;
 
 import net.minecraft.client.gui.GuiComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.util.Mth;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
+import net.minecraft.client.gui.components.ChatComponent;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.client.gui.components.CommandSuggestions;
 import net.minecraft.client.gui.components.EditBox;
@@ -30,10 +34,10 @@ public class ChatScreen extends Screen {
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
         this.historyPos = this.minecraft.gui.getChat().getRecentChat().size();
-        (this.input = new EditBox(this.font, 4, this.height - 12, this.width - 4, 12, I18n.get("chat.editBox")) {
+        (this.input = new EditBox(this.font, 4, this.height - 12, this.width - 4, 12, new TranslatableComponent("chat.editBox")) {
             @Override
-            protected String getNarrationMessage() {
-                return super.getNarrationMessage() + ChatScreen.this.commandSuggestions.getNarrationMessage();
+            protected MutableComponent createNarrationMessage() {
+                return super.createNarrationMessage().append(ChatScreen.this.commandSuggestions.getNarrationMessage());
             }
         }).setMaxLength(256);
         this.input.setBordered(false);
@@ -45,9 +49,9 @@ public class ChatScreen extends Screen {
     }
     
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
         final String string5 = this.input.getValue();
-        this.init(dbn, integer2, integer3);
+        this.init(dlx, integer2, integer3);
         this.setChatLine(string5);
         this.commandSuggestions.updateCommandInfo();
     }
@@ -132,8 +136,12 @@ public class ChatScreen extends Screen {
             return true;
         }
         if (integer == 0) {
-            final Component lf7 = this.minecraft.gui.getChat().getClickedComponentAt(double1, double2);
-            if (lf7 != null && this.handleComponentClicked(lf7)) {
+            final ChatComponent dnj7 = this.minecraft.gui.getChat();
+            if (dnj7.handleChatQueueClicked(double1, double2)) {
+                return true;
+            }
+            final Style nb8 = dnj7.getClickedComponentStyleAt(double1, double2);
+            if (nb8 != null && this.handleComponentClicked(nb8)) {
                 return true;
             }
         }
@@ -171,17 +179,17 @@ public class ChatScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.setFocused(this.input);
         this.input.setFocus(true);
-        GuiComponent.fill(2, this.height - 14, this.width - 2, this.height - 2, this.minecraft.options.getBackgroundColor(Integer.MIN_VALUE));
-        this.input.render(integer1, integer2, float3);
-        this.commandSuggestions.render(integer1, integer2);
-        final Component lf5 = this.minecraft.gui.getChat().getClickedComponentAt(integer1, integer2);
-        if (lf5 != null && lf5.getStyle().getHoverEvent() != null) {
-            this.renderComponentHoverEffect(lf5, integer1, integer2);
+        GuiComponent.fill(dhl, 2, this.height - 14, this.width - 2, this.height - 2, this.minecraft.options.getBackgroundColor(Integer.MIN_VALUE));
+        this.input.render(dhl, integer2, integer3, float4);
+        this.commandSuggestions.render(dhl, integer2, integer3);
+        final Style nb6 = this.minecraft.gui.getChat().getClickedComponentStyleAt(integer2, integer3);
+        if (nb6 != null && nb6.getHoverEvent() != null) {
+            this.renderComponentHoverEffect(dhl, nb6, integer2, integer3);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/ConfirmLinkScreen.java b/src/net/minecraft/client/gui/screens/ConfirmLinkScreen.java
index b7f0639..f5dc876 100644
--- a/src/net/minecraft/client/gui/screens/ConfirmLinkScreen.java
+++ b/src/net/minecraft/client/gui/screens/ConfirmLinkScreen.java
@@ -1,24 +1,26 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
+import net.minecraft.network.chat.Component;
 
 public class ConfirmLinkScreen extends ConfirmScreen {
-    private final String warning;
-    private final String copyButton;
+    private final Component warning;
+    private final Component copyButton;
     private final String url;
     private final boolean showWarning;
     
     public ConfirmLinkScreen(final BooleanConsumer booleanConsumer, final String string, final boolean boolean3) {
-        super(booleanConsumer, new TranslatableComponent(boolean3 ? "chat.link.confirmTrusted" : "chat.link.confirm", new Object[0]), new TextComponent(string));
-        this.yesButton = I18n.get(boolean3 ? "chat.link.open" : "gui.yes");
-        this.noButton = I18n.get(boolean3 ? "gui.cancel" : "gui.no");
-        this.copyButton = I18n.get("chat.copy");
-        this.warning = I18n.get("chat.link.warning");
+        super(booleanConsumer, new TranslatableComponent(boolean3 ? "chat.link.confirmTrusted" : "chat.link.confirm"), new TextComponent(string));
+        this.yesButton = (boolean3 ? new TranslatableComponent("chat.link.open") : CommonComponents.GUI_YES);
+        this.noButton = (boolean3 ? CommonComponents.GUI_CANCEL : CommonComponents.GUI_NO);
+        this.copyButton = new TranslatableComponent("chat.copy");
+        this.warning = new TranslatableComponent("chat.link.warning");
         this.showWarning = !boolean3;
         this.url = string;
     }
@@ -28,13 +30,13 @@ public class ConfirmLinkScreen extends ConfirmScreen {
         super.init();
         this.buttons.clear();
         this.children.clear();
-        this.<Button>addButton(new Button(this.width / 2 - 50 - 105, this.height / 6 + 96, 100, 20, this.yesButton, dcv -> this.callback.accept(true)));
-        this.<Button>addButton(new Button(this.width / 2 - 50, this.height / 6 + 96, 100, 20, this.copyButton, dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 - 50 - 105, this.height / 6 + 96, 100, 20, this.yesButton, dni -> this.callback.accept(true)));
+        this.<Button>addButton(new Button(this.width / 2 - 50, this.height / 6 + 96, 100, 20, this.copyButton, dni -> {
             this.copyToClipboard();
             this.callback.accept(false);
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 - 50 + 105, this.height / 6 + 96, 100, 20, this.noButton, dcv -> this.callback.accept(false)));
+        this.<Button>addButton(new Button(this.width / 2 - 50 + 105, this.height / 6 + 96, 100, 20, this.noButton, dni -> this.callback.accept(false)));
     }
     
     public void copyToClipboard() {
@@ -42,10 +44,10 @@ public class ConfirmLinkScreen extends ConfirmScreen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        super.render(dhl, integer2, integer3, float4);
         if (this.showWarning) {
-            this.drawCenteredString(this.font, this.warning, this.width / 2, 110, 16764108);
+            this.drawCenteredString(dhl, this.font, this.warning, this.width / 2, 110, 16764108);
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/ConfirmScreen.java b/src/net/minecraft/client/gui/screens/ConfirmScreen.java
index 1a6089a..1e8c885 100644
--- a/src/net/minecraft/client/gui/screens/ConfirmScreen.java
+++ b/src/net/minecraft/client/gui/screens/ConfirmScreen.java
@@ -2,33 +2,35 @@ package net.minecraft.client.gui.screens;
 
 import net.minecraft.client.gui.components.AbstractWidget;
 import java.util.Iterator;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.Collection;
 import net.minecraft.client.gui.components.Button;
 import com.google.common.collect.Lists;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
+import net.minecraft.network.chat.FormattedText;
 import java.util.List;
 import net.minecraft.network.chat.Component;
 
 public class ConfirmScreen extends Screen {
     private final Component title2;
-    private final List<String> lines;
-    protected String yesButton;
-    protected String noButton;
+    private final List<FormattedText> lines;
+    protected Component yesButton;
+    protected Component noButton;
     private int delayTicker;
     protected final BooleanConsumer callback;
     
-    public ConfirmScreen(final BooleanConsumer booleanConsumer, final Component lf2, final Component lf3) {
-        this(booleanConsumer, lf2, lf3, I18n.get("gui.yes"), I18n.get("gui.no"));
+    public ConfirmScreen(final BooleanConsumer booleanConsumer, final Component mr2, final Component mr3) {
+        this(booleanConsumer, mr2, mr3, CommonComponents.GUI_YES, CommonComponents.GUI_NO);
     }
     
-    public ConfirmScreen(final BooleanConsumer booleanConsumer, final Component lf2, final Component lf3, final String string4, final String string5) {
-        super(lf2);
+    public ConfirmScreen(final BooleanConsumer booleanConsumer, final Component mr2, final Component mr3, final Component mr4, final Component mr5) {
+        super(mr2);
         this.lines = Lists.newArrayList();
         this.callback = booleanConsumer;
-        this.title2 = lf3;
-        this.yesButton = string4;
-        this.noButton = string5;
+        this.title2 = mr3;
+        this.yesButton = mr4;
+        this.noButton = mr5;
     }
     
     @Override
@@ -39,30 +41,30 @@ public class ConfirmScreen extends Screen {
     @Override
     protected void init() {
         super.init();
-        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 96, 150, 20, this.yesButton, dcv -> this.callback.accept(true)));
-        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, this.height / 6 + 96, 150, 20, this.noButton, dcv -> this.callback.accept(false)));
+        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 96, 150, 20, this.yesButton, dni -> this.callback.accept(true)));
+        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, this.height / 6 + 96, 150, 20, this.noButton, dni -> this.callback.accept(false)));
         this.lines.clear();
-        this.lines.addAll(this.font.split(this.title2.getColoredString(), this.width - 50));
+        this.lines.addAll(this.font.split(this.title2, this.width - 50));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 70, 16777215);
-        int integer3 = 90;
-        for (final String string7 : this.lines) {
-            this.drawCenteredString(this.font, string7, this.width / 2, integer3, 16777215);
-            final int n = integer3;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 70, 16777215);
+        int integer4 = 90;
+        for (final FormattedText mu8 : this.lines) {
+            this.drawCenteredString(dhl, this.font, mu8, this.width / 2, integer4, 16777215);
+            final int n = integer4;
             this.font.getClass();
-            integer3 = n + 9;
+            integer4 = n + 9;
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     public void setDelay(final int integer) {
         this.delayTicker = integer;
-        for (final AbstractWidget dct4 : this.buttons) {
-            dct4.active = false;
+        for (final AbstractWidget dng4 : this.buttons) {
+            dng4.active = false;
         }
     }
     
@@ -72,8 +74,8 @@ public class ConfirmScreen extends Screen {
         final int delayTicker = this.delayTicker - 1;
         this.delayTicker = delayTicker;
         if (delayTicker == 0) {
-            for (final AbstractWidget dct3 : this.buttons) {
-                dct3.active = true;
+            for (final AbstractWidget dng3 : this.buttons) {
+                dng3.active = true;
             }
         }
     }
diff --git a/src/net/minecraft/client/gui/screens/ConnectScreen.java b/src/net/minecraft/client/gui/screens/ConnectScreen.java
index 8f3192d..764de82 100644
--- a/src/net/minecraft/client/gui/screens/ConnectScreen.java
+++ b/src/net/minecraft/client/gui/screens/ConnectScreen.java
@@ -1,9 +1,11 @@
 package net.minecraft.client.gui.screens;
 
 import org.apache.logging.log4j.LogManager;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.Util;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.DefaultUncaughtExceptionHandler;
 import java.net.UnknownHostException;
 import net.minecraft.network.protocol.login.ServerboundHelloPacket;
@@ -32,25 +34,25 @@ public class ConnectScreen extends Screen {
     private Component status;
     private long lastNarration;
     
-    public ConnectScreen(final Screen dgb, final Minecraft dbn, final ServerData dnu) {
+    public ConnectScreen(final Screen dqs, final Minecraft dlx, final ServerData dys) {
         super(NarratorChatListener.NO_TITLE);
-        this.status = new TranslatableComponent("connect.connecting", new Object[0]);
+        this.status = new TranslatableComponent("connect.connecting");
         this.lastNarration = -1L;
-        this.minecraft = dbn;
-        this.parent = dgb;
-        final ServerAddress dnt5 = ServerAddress.parseString(dnu.ip);
-        dbn.clearLevel();
-        dbn.setCurrentServer(dnu);
-        this.connect(dnt5.getHost(), dnt5.getPort());
+        this.minecraft = dlx;
+        this.parent = dqs;
+        final ServerAddress dyr5 = ServerAddress.parseString(dys.ip);
+        dlx.clearLevel();
+        dlx.setCurrentServer(dys);
+        this.connect(dyr5.getHost(), dyr5.getPort());
     }
     
-    public ConnectScreen(final Screen dgb, final Minecraft dbn, final String string, final int integer) {
+    public ConnectScreen(final Screen dqs, final Minecraft dlx, final String string, final int integer) {
         super(NarratorChatListener.NO_TITLE);
-        this.status = new TranslatableComponent("connect.connecting", new Object[0]);
+        this.status = new TranslatableComponent("connect.connecting");
         this.lastNarration = -1L;
-        this.minecraft = dbn;
-        this.parent = dgb;
-        dbn.clearLevel();
+        this.minecraft = dlx;
+        this.parent = dqs;
+        dlx.clearLevel();
         this.connect(string, integer);
     }
     
@@ -66,7 +68,7 @@ public class ConnectScreen extends Screen {
                     }
                     inetAddress2 = InetAddress.getByName(string);
                     ConnectScreen.this.connection = Connection.connectToServer(inetAddress2, integer, ConnectScreen.this.minecraft.options.useNativeTransport());
-                    ConnectScreen.this.connection.setListener(new ClientHandshakePacketListenerImpl(ConnectScreen.this.connection, ConnectScreen.this.minecraft, ConnectScreen.this.parent, lf -> ConnectScreen.this.updateStatus(lf)));
+                    ConnectScreen.this.connection.setListener(new ClientHandshakePacketListenerImpl(ConnectScreen.this.connection, ConnectScreen.this.minecraft, ConnectScreen.this.parent, mr -> ConnectScreen.this.updateStatus(mr)));
                     ConnectScreen.this.connection.send(new ClientIntentionPacket(string, integer, ConnectionProtocol.LOGIN));
                     ConnectScreen.this.connection.send(new ServerboundHelloPacket(ConnectScreen.this.minecraft.getUser().getGameProfile()));
                 }
@@ -76,16 +78,16 @@ public class ConnectScreen extends Screen {
                     }
                     ConnectScreen.LOGGER.error("Couldn't connect to server", (Throwable)unknownHostException3);
                     final Minecraft minecraft;
-                    final TranslatableComponent lf2;
+                    final TranslatableComponent mr2;
                     final Screen screen;
-                    final Screen dgb;
+                    final Screen dqs;
                     final String string5;
                     ConnectScreen.this.minecraft.execute(() -> {
                         minecraft = ConnectScreen.this.minecraft;
                         // new(net.minecraft.client.gui.screens.DisconnectedScreen.class)
                         ConnectScreen.this.parent;
                         new TranslatableComponent("disconnect.genericReason", new Object[] { "Unknown host" });
-                        new DisconnectedScreen(dgb, string5, lf2);
+                        new DisconnectedScreen(dqs, string5, mr2);
                         minecraft.setScreen(screen);
                     });
                 }
@@ -96,17 +98,17 @@ public class ConnectScreen extends Screen {
                     ConnectScreen.LOGGER.error("Couldn't connect to server", (Throwable)exception3);
                     final String string4 = (inetAddress2 == null) ? exception3.toString() : exception3.toString().replaceAll(inetAddress2 + ":" + integer, "");
                     final Minecraft minecraft2;
-                    final Component lf3;
+                    final Component mr3;
                     final Object o;
                     final Screen screen2;
-                    final Screen dgb2;
+                    final Screen dqs2;
                     final String string6;
                     ConnectScreen.this.minecraft.execute(() -> {
                         minecraft2 = ConnectScreen.this.minecraft;
                         // new(net.minecraft.client.gui.screens.DisconnectedScreen.class)
                         ConnectScreen.this.parent;
                         new TranslatableComponent("disconnect.genericReason", new Object[] { o });
-                        new DisconnectedScreen(dgb2, string6, lf3);
+                        new DisconnectedScreen(dqs2, string6, mr3);
                         minecraft2.setScreen(screen2);
                     });
                 }
@@ -116,8 +118,8 @@ public class ConnectScreen extends Screen {
         thread4.start();
     }
     
-    private void updateStatus(final Component lf) {
-        this.status = lf;
+    private void updateStatus(final Component mr) {
+        this.status = mr;
     }
     
     @Override
@@ -139,25 +141,25 @@ public class ConnectScreen extends Screen {
     
     @Override
     protected void init() {
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120 + 12, 200, 20, I18n.get("gui.cancel"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120 + 12, 200, 20, CommonComponents.GUI_CANCEL, dni -> {
             this.aborted = true;
             if (this.connection != null) {
-                this.connection.disconnect(new TranslatableComponent("connect.aborted", new Object[0]));
+                this.connection.disconnect(new TranslatableComponent("connect.aborted"));
             }
             this.minecraft.setScreen(this.parent);
         }));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        final long long5 = Util.getMillis();
-        if (long5 - this.lastNarration > 2000L) {
-            this.lastNarration = long5;
-            NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.joining", new Object[0]).getString());
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        final long long6 = Util.getMillis();
+        if (long6 - this.lastNarration > 2000L) {
+            this.lastNarration = long6;
+            NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.joining").getString());
         }
-        this.drawCenteredString(this.font, this.status.getColoredString(), this.width / 2, this.height / 2 - 50, 16777215);
-        super.render(integer1, integer2, float3);
+        this.drawCenteredString(dhl, this.font, this.status, this.width / 2, this.height / 2 - 50, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/CreateBuffetWorldScreen.java b/src/net/minecraft/client/gui/screens/CreateBuffetWorldScreen.java
index 1d3cf1a..09d6f47 100644
--- a/src/net/minecraft/client/gui/screens/CreateBuffetWorldScreen.java
+++ b/src/net/minecraft/client/gui/screens/CreateBuffetWorldScreen.java
@@ -1,131 +1,72 @@
 package net.minecraft.client.gui.screens;
 
-import java.util.AbstractList;
 import net.minecraft.client.gui.components.AbstractSelectionList;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import javax.annotation.Nullable;
 import java.util.Comparator;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.client.gui.components.ObjectSelectionList;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-import net.minecraft.world.level.chunk.ChunkGeneratorType;
-import net.minecraft.nbt.Tag;
-import net.minecraft.nbt.StringTag;
-import net.minecraft.world.level.biome.BiomeSourceType;
 import net.minecraft.core.Registry;
-import net.minecraft.nbt.ListTag;
-import java.util.Objects;
-import net.minecraft.Util;
+import net.minecraft.client.gui.components.ObjectSelectionList;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import java.util.Objects;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
-import net.minecraft.resources.ResourceLocation;
-import java.util.List;
+import net.minecraft.world.level.biome.Biome;
+import java.util.function.Consumer;
 
 public class CreateBuffetWorldScreen extends Screen {
-    private static final List<ResourceLocation> GENERATORS;
-    private final CreateWorldScreen parent;
-    private final CompoundTag optionsTag;
+    private final Screen parent;
+    private final Consumer<Biome> applySettings;
     private BiomeList list;
-    private int generatorIndex;
+    private Biome biome;
     private Button doneButton;
     
-    public CreateBuffetWorldScreen(final CreateWorldScreen djh, final CompoundTag jt) {
-        super(new TranslatableComponent("createWorld.customize.buffet.title", new Object[0]));
-        this.parent = djh;
-        this.optionsTag = jt;
+    public CreateBuffetWorldScreen(final Screen dqs, final Consumer<Biome> consumer, final Biome bre) {
+        super(new TranslatableComponent("createWorld.customize.buffet.title"));
+        this.parent = dqs;
+        this.applySettings = consumer;
+        this.biome = bre;
+    }
+    
+    @Override
+    public void onClose() {
+        this.minecraft.setScreen(this.parent);
     }
     
     @Override
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        this.<Button>addButton(new Button((this.width - 200) / 2, 40, 200, 20, I18n.get("createWorld.customize.buffet.generatortype") + " " + I18n.get(Util.makeDescriptionId("generator", CreateBuffetWorldScreen.GENERATORS.get(this.generatorIndex))), dcv -> {
-            ++this.generatorIndex;
-            if (this.generatorIndex >= CreateBuffetWorldScreen.GENERATORS.size()) {
-                this.generatorIndex = 0;
-            }
-            dcv.setMessage(I18n.get("createWorld.customize.buffet.generatortype") + " " + I18n.get(Util.makeDescriptionId("generator", CreateBuffetWorldScreen.GENERATORS.get(this.generatorIndex))));
-            return;
-        }));
         this.list = new BiomeList();
         this.children.add(this.list);
-        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 28, 150, 20, I18n.get("gui.done"), dcv -> {
-            this.parent.levelTypeOptions = this.saveOptions();
+        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 28, 150, 20, CommonComponents.GUI_DONE, dni -> {
+            this.applySettings.accept(this.biome);
             this.minecraft.setScreen(this.parent);
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 28, 150, 20, I18n.get("gui.cancel"), dcv -> this.minecraft.setScreen(this.parent)));
-        this.loadOptions();
-        this.updateButtonValidity();
+        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 28, 150, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(this.parent)));
+        this.list.setSelected(this.list.children().stream().filter(a -> Objects.equals(a.biome, this.biome)).findFirst().orElse(null));
     }
     
-    private void loadOptions() {
-        if (this.optionsTag.contains("chunk_generator", 10) && this.optionsTag.getCompound("chunk_generator").contains("type", 8)) {
-            final ResourceLocation sm2 = new ResourceLocation(this.optionsTag.getCompound("chunk_generator").getString("type"));
-            for (int integer3 = 0; integer3 < CreateBuffetWorldScreen.GENERATORS.size(); ++integer3) {
-                if (CreateBuffetWorldScreen.GENERATORS.get(integer3).equals(sm2)) {
-                    this.generatorIndex = integer3;
-                    break;
-                }
-            }
-        }
-        if (this.optionsTag.contains("biome_source", 10) && this.optionsTag.getCompound("biome_source").contains("biomes", 9)) {
-            final ListTag jz2 = this.optionsTag.getCompound("biome_source").getList("biomes", 8);
-            for (int integer3 = 0; integer3 < jz2.size(); ++integer3) {
-                final ResourceLocation sm3 = new ResourceLocation(jz2.getString(integer3));
-                this.list.setSelected(this.list.children().stream().filter(a -> Objects.equals(a.key, sm3)).findFirst().orElse(null));
-            }
-        }
-        this.optionsTag.remove("chunk_generator");
-        this.optionsTag.remove("biome_source");
-    }
-    
-    private CompoundTag saveOptions() {
-        final CompoundTag jt2 = new CompoundTag();
-        final CompoundTag jt3 = new CompoundTag();
-        jt3.putString("type", Registry.BIOME_SOURCE_TYPE.getKey(BiomeSourceType.FIXED).toString());
-        final CompoundTag jt4 = new CompoundTag();
-        final ListTag jz5 = new ListTag();
-        ((AbstractList<StringTag>)jz5).add(StringTag.valueOf(this.list.getSelected().key.toString()));
-        jt4.put("biomes", jz5);
-        jt3.put("options", jt4);
-        final CompoundTag jt5 = new CompoundTag();
-        final CompoundTag jt6 = new CompoundTag();
-        jt5.putString("type", CreateBuffetWorldScreen.GENERATORS.get(this.generatorIndex).toString());
-        jt6.putString("default_block", "minecraft:stone");
-        jt6.putString("default_fluid", "minecraft:water");
-        jt5.put("options", jt6);
-        jt2.put("biome_source", jt3);
-        jt2.put("chunk_generator", jt5);
-        return jt2;
-    }
-    
-    public void updateButtonValidity() {
+    private void updateButtonValidity() {
         this.doneButton.active = (this.list.getSelected() != null);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.renderDirtBackground(0);
-        this.list.render(integer1, integer2, float3);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 8, 16777215);
-        this.drawCenteredString(this.font, I18n.get("createWorld.customize.buffet.generator"), this.width / 2, 30, 10526880);
-        this.drawCenteredString(this.font, I18n.get("createWorld.customize.buffet.biome"), this.width / 2, 68, 10526880);
-        super.render(integer1, integer2, float3);
-    }
-    
-    static {
-        GENERATORS = Registry.CHUNK_GENERATOR_TYPE.keySet().stream().filter(sm -> Registry.CHUNK_GENERATOR_TYPE.get(sm).isPublic()).collect(Collectors.toList());
+        this.list.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 8, 16777215);
+        this.drawCenteredString(dhl, this.font, I18n.get("createWorld.customize.buffet.biome"), this.width / 2, 28, 10526880);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     class BiomeList extends ObjectSelectionList<Entry> {
         private BiomeList() {
-            super(CreateBuffetWorldScreen.this.minecraft, CreateBuffetWorldScreen.this.width, CreateBuffetWorldScreen.this.height, 80, CreateBuffetWorldScreen.this.height - 37, 16);
-            Registry.BIOME.keySet().stream().sorted(Comparator.comparing(sm -> Registry.BIOME.get(sm).getName().getString())).forEach(sm -> this.addEntry(new Entry(sm)));
+            super(CreateBuffetWorldScreen.this.minecraft, CreateBuffetWorldScreen.this.width, CreateBuffetWorldScreen.this.height, 40, CreateBuffetWorldScreen.this.height - 37, 16);
+            Registry.BIOME.stream().sorted(Comparator.comparing(bre -> bre.getName().getString())).forEach(bre -> this.addEntry(new Entry(bre)));
         }
         
         @Override
@@ -137,33 +78,28 @@ public class CreateBuffetWorldScreen extends Screen {
         public void setSelected(@Nullable final Entry a) {
             super.setSelected(a);
             if (a != null) {
-                NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.select", new Object[] { Registry.BIOME.get(a.key).getName().getString() }).getString());
+                CreateBuffetWorldScreen.this.biome = a.biome;
+                NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.select", new Object[] { a.biome.getName().getString() }).getString());
             }
-        }
-        
-        @Override
-        protected void moveSelection(final int integer) {
-            super.moveSelection(integer);
             CreateBuffetWorldScreen.this.updateButtonValidity();
         }
         
         class Entry extends ObjectSelectionList.Entry<Entry> {
-            private final ResourceLocation key;
+            private final Biome biome;
             
-            public Entry(final ResourceLocation sm) {
-                this.key = sm;
+            public Entry(final Biome bre) {
+                this.biome = bre;
             }
             
             @Override
-            public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-                BiomeList.this.drawString(CreateBuffetWorldScreen.this.font, Registry.BIOME.get(this.key).getName().getString(), integer3 + 5, integer2 + 2, 16777215);
+            public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+                BiomeList.this.drawString(dhl, CreateBuffetWorldScreen.this.font, this.biome.getName().getString(), integer4 + 5, integer3 + 2, 16777215);
             }
             
             @Override
             public boolean mouseClicked(final double double1, final double double2, final int integer) {
                 if (integer == 0) {
                     BiomeList.this.setSelected(this);
-                    CreateBuffetWorldScreen.this.updateButtonValidity();
                     return true;
                 }
                 return false;
diff --git a/src/net/minecraft/client/gui/screens/CreateFlatWorldScreen.java b/src/net/minecraft/client/gui/screens/CreateFlatWorldScreen.java
index 1163607..acdaeef 100644
--- a/src/net/minecraft/client/gui/screens/CreateFlatWorldScreen.java
+++ b/src/net/minecraft/client/gui/screens/CreateFlatWorldScreen.java
@@ -2,8 +2,8 @@ package net.minecraft.client.gui.screens;
 
 import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.client.resources.language.I18n;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.AbstractSelectionList;
@@ -14,60 +14,51 @@ import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.world.item.Items;
 import javax.annotation.Nullable;
 import net.minecraft.client.gui.components.ObjectSelectionList;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.level.levelgen.flat.FlatLayerInfo;
 import java.util.List;
-import net.minecraft.client.resources.language.I18n;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
-import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
+import java.util.function.Consumer;
 
 public class CreateFlatWorldScreen extends Screen {
-    private final CreateWorldScreen parent;
+    private final Screen parent;
+    private final Consumer<FlatLevelGeneratorSettings> applySettings;
     private FlatLevelGeneratorSettings generator;
-    private String columnType;
-    private String columnHeight;
+    private Component columnType;
+    private Component columnHeight;
     private DetailsList list;
     private Button deleteLayerButton;
     
-    public CreateFlatWorldScreen(final CreateWorldScreen djh, final CompoundTag jt) {
-        super(new TranslatableComponent("createWorld.customize.flat.title", new Object[0]));
-        this.generator = FlatLevelGeneratorSettings.getDefault();
-        this.parent = djh;
-        this.loadLayers(jt);
+    public CreateFlatWorldScreen(final Screen dqs, final Consumer<FlatLevelGeneratorSettings> consumer, final FlatLevelGeneratorSettings cra) {
+        super(new TranslatableComponent("createWorld.customize.flat.title"));
+        this.parent = dqs;
+        this.applySettings = consumer;
+        this.generator = cra;
     }
     
-    public String saveLayerString() {
-        return this.generator.toString();
+    public FlatLevelGeneratorSettings settings() {
+        return this.generator;
     }
     
-    public CompoundTag saveLayers() {
-        return (CompoundTag)this.generator.toObject((com.mojang.datafixers.types.DynamicOps<Object>)NbtOps.INSTANCE).getValue();
-    }
-    
-    public void loadLayers(final String string) {
-        this.generator = FlatLevelGeneratorSettings.fromString(string);
-    }
-    
-    public void loadLayers(final CompoundTag jt) {
-        this.generator = FlatLevelGeneratorSettings.fromObject(new Dynamic((DynamicOps)NbtOps.INSTANCE, jt));
+    public void setConfig(final FlatLevelGeneratorSettings cra) {
+        this.generator = cra;
     }
     
     @Override
     protected void init() {
-        this.columnType = I18n.get("createWorld.customize.flat.tile");
-        this.columnHeight = I18n.get("createWorld.customize.flat.height");
+        this.columnType = new TranslatableComponent("createWorld.customize.flat.tile");
+        this.columnHeight = new TranslatableComponent("createWorld.customize.flat.height");
         this.list = new DetailsList();
         this.children.add(this.list);
         List<FlatLayerInfo> list3;
         int integer4;
         int integer5;
-        this.deleteLayerButton = this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 52, 150, 20, I18n.get("createWorld.customize.flat.removeLayer"), dcv -> {
+        this.deleteLayerButton = this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 52, 150, 20, new TranslatableComponent("createWorld.customize.flat.removeLayer"), dni -> {
             if (!this.hasValidSelection()) {
                 return;
             }
@@ -78,36 +69,34 @@ public class CreateFlatWorldScreen extends Screen {
                 list3.remove(integer5);
                 this.list.setSelected(list3.isEmpty() ? null : this.list.children().get(Math.min(integer4, list3.size() - 1)));
                 this.generator.updateLayers();
+                this.list.resetRows();
                 this.updateButtonValidity();
                 return;
             }
         }));
-        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 52, 150, 20, I18n.get("createWorld.customize.presets"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 52, 150, 20, new TranslatableComponent("createWorld.customize.presets"), dni -> {
             this.minecraft.setScreen(new PresetFlatWorldScreen(this));
             this.generator.updateLayers();
             this.updateButtonValidity();
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 28, 150, 20, I18n.get("gui.done"), dcv -> {
-            this.parent.levelTypeOptions = this.saveLayers();
+        this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 28, 150, 20, CommonComponents.GUI_DONE, dni -> {
+            this.applySettings.accept(this.generator);
             this.minecraft.setScreen(this.parent);
             this.generator.updateLayers();
-            this.updateButtonValidity();
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 28, 150, 20, I18n.get("gui.cancel"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 28, 150, 20, CommonComponents.GUI_CANCEL, dni -> {
             this.minecraft.setScreen(this.parent);
             this.generator.updateLayers();
-            this.updateButtonValidity();
             return;
         }));
         this.generator.updateLayers();
         this.updateButtonValidity();
     }
     
-    public void updateButtonValidity() {
+    private void updateButtonValidity() {
         this.deleteLayerButton.active = this.hasValidSelection();
-        this.list.resetRows();
     }
     
     private boolean hasValidSelection() {
@@ -120,14 +109,14 @@ public class CreateFlatWorldScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.list.render(integer1, integer2, float3);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 8, 16777215);
-        final int integer3 = this.width / 2 - 92 - 16;
-        this.drawString(this.font, this.columnType, integer3, 32, 16777215);
-        this.drawString(this.font, this.columnHeight, integer3 + 2 + 213 - this.font.width(this.columnHeight), 32, 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.list.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 8, 16777215);
+        final int integer4 = this.width / 2 - 92 - 16;
+        this.drawString(dhl, this.font, this.columnType, integer4, 32, 16777215);
+        this.drawString(dhl, this.font, this.columnHeight, integer4 + 2 + 213 - this.font.width(this.columnHeight), 32, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     class DetailsList extends ObjectSelectionList<Entry> {
@@ -142,17 +131,12 @@ public class CreateFlatWorldScreen extends Screen {
         public void setSelected(@Nullable final Entry a) {
             super.setSelected(a);
             if (a != null) {
-                final FlatLayerInfo cix3 = CreateFlatWorldScreen.this.generator.getLayersInfo().get(CreateFlatWorldScreen.this.generator.getLayersInfo().size() - this.children().indexOf(a) - 1);
-                final Item bei4 = cix3.getBlockState().getBlock().asItem();
-                if (bei4 != Items.AIR) {
-                    NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.select", new Object[] { bei4.getName(new ItemStack(bei4)) }).getString());
+                final FlatLayerInfo cqz3 = CreateFlatWorldScreen.this.generator.getLayersInfo().get(CreateFlatWorldScreen.this.generator.getLayersInfo().size() - this.children().indexOf(a) - 1);
+                final Item bke4 = cqz3.getBlockState().getBlock().asItem();
+                if (bke4 != Items.AIR) {
+                    NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.select", new Object[] { bke4.getName(new ItemStack(bke4)) }).getString());
                 }
             }
-        }
-        
-        @Override
-        protected void moveSelection(final int integer) {
-            super.moveSelection(integer);
             CreateFlatWorldScreen.this.updateButtonValidity();
         }
         
@@ -183,59 +167,56 @@ public class CreateFlatWorldScreen extends Screen {
             }
             
             @Override
-            public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-                final FlatLayerInfo cix11 = CreateFlatWorldScreen.this.generator.getLayersInfo().get(CreateFlatWorldScreen.this.generator.getLayersInfo().size() - integer1 - 1);
-                final BlockState byj12 = cix11.getBlockState();
-                final Block bph13 = byj12.getBlock();
-                Item bei14 = bph13.asItem();
-                if (bei14 == Items.AIR) {
-                    if (bph13 == Blocks.WATER) {
-                        bei14 = Items.WATER_BUCKET;
+            public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+                final FlatLayerInfo cqz12 = CreateFlatWorldScreen.this.generator.getLayersInfo().get(CreateFlatWorldScreen.this.generator.getLayersInfo().size() - integer2 - 1);
+                final BlockState cfj13 = cqz12.getBlockState();
+                Item bke14 = cfj13.getBlock().asItem();
+                if (bke14 == Items.AIR) {
+                    if (cfj13.is(Blocks.WATER)) {
+                        bke14 = Items.WATER_BUCKET;
                     }
-                    else if (bph13 == Blocks.LAVA) {
-                        bei14 = Items.LAVA_BUCKET;
+                    else if (cfj13.is(Blocks.LAVA)) {
+                        bke14 = Items.LAVA_BUCKET;
                     }
                 }
-                final ItemStack ben15 = new ItemStack(bei14);
-                final String string16 = bei14.getName(ben15).getColoredString();
-                this.blitSlot(integer3, integer2, ben15);
-                CreateFlatWorldScreen.this.font.draw(string16, (float)(integer3 + 18 + 5), (float)(integer2 + 3), 16777215);
-                String string17;
-                if (integer1 == 0) {
-                    string17 = I18n.get("createWorld.customize.flat.layer.top", cix11.getHeight());
+                final ItemStack bki15 = new ItemStack(bke14);
+                this.blitSlot(dhl, integer4, integer3, bki15);
+                CreateFlatWorldScreen.this.font.draw(dhl, bke14.getName(bki15), (float)(integer4 + 18 + 5), (float)(integer3 + 3), 16777215);
+                String string16;
+                if (integer2 == 0) {
+                    string16 = I18n.get("createWorld.customize.flat.layer.top", cqz12.getHeight());
                 }
-                else if (integer1 == CreateFlatWorldScreen.this.generator.getLayersInfo().size() - 1) {
-                    string17 = I18n.get("createWorld.customize.flat.layer.bottom", cix11.getHeight());
+                else if (integer2 == CreateFlatWorldScreen.this.generator.getLayersInfo().size() - 1) {
+                    string16 = I18n.get("createWorld.customize.flat.layer.bottom", cqz12.getHeight());
                 }
                 else {
-                    string17 = I18n.get("createWorld.customize.flat.layer", cix11.getHeight());
+                    string16 = I18n.get("createWorld.customize.flat.layer", cqz12.getHeight());
                 }
-                CreateFlatWorldScreen.this.font.draw(string17, (float)(integer3 + 2 + 213 - CreateFlatWorldScreen.this.font.width(string17)), (float)(integer2 + 3), 16777215);
+                CreateFlatWorldScreen.this.font.draw(dhl, string16, (float)(integer4 + 2 + 213 - CreateFlatWorldScreen.this.font.width(string16)), (float)(integer3 + 3), 16777215);
             }
             
             @Override
             public boolean mouseClicked(final double double1, final double double2, final int integer) {
                 if (integer == 0) {
                     DetailsList.this.setSelected(this);
-                    CreateFlatWorldScreen.this.updateButtonValidity();
                     return true;
                 }
                 return false;
             }
             
-            private void blitSlot(final int integer1, final int integer2, final ItemStack ben) {
-                this.blitSlotBg(integer1 + 1, integer2 + 1);
+            private void blitSlot(final PoseStack dhl, final int integer2, final int integer3, final ItemStack bki) {
+                this.blitSlotBg(dhl, integer2 + 1, integer3 + 1);
                 RenderSystem.enableRescaleNormal();
-                if (!ben.isEmpty()) {
-                    CreateFlatWorldScreen.this.itemRenderer.renderGuiItem(ben, integer1 + 2, integer2 + 2);
+                if (!bki.isEmpty()) {
+                    CreateFlatWorldScreen.this.itemRenderer.renderGuiItem(bki, integer2 + 2, integer3 + 2);
                 }
                 RenderSystem.disableRescaleNormal();
             }
             
-            private void blitSlotBg(final int integer1, final int integer2) {
+            private void blitSlotBg(final PoseStack dhl, final int integer2, final int integer3) {
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
                 DetailsList.this.minecraft.getTextureManager().bind(GuiComponent.STATS_ICON_LOCATION);
-                GuiComponent.blit(integer1, integer2, CreateFlatWorldScreen.this.getBlitOffset(), 0.0f, 0.0f, 18, 18, 128, 128);
+                GuiComponent.blit(dhl, integer2, integer3, CreateFlatWorldScreen.this.getBlitOffset(), 0.0f, 0.0f, 18, 18, 128, 128);
             }
         }
     }
diff --git a/src/net/minecraft/client/gui/screens/DataPackSelectScreen.java b/src/net/minecraft/client/gui/screens/DataPackSelectScreen.java
new file mode 100644
index 0000000..b08ae51
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/DataPackSelectScreen.java
@@ -0,0 +1,23 @@
+package net.minecraft.client.gui.screens;
+
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.gui.screens.packs.PackSelectionModel;
+import net.minecraft.network.chat.TranslatableComponent;
+import java.io.File;
+import java.util.function.Consumer;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.gui.screens.packs.PackSelectionScreen;
+
+public class DataPackSelectScreen extends PackSelectionScreen {
+    private static final ResourceLocation DEFAULT_ICON;
+    
+    public DataPackSelectScreen(final Screen dqs, final PackRepository<Pack> aar, final Consumer<PackRepository<Pack>> consumer, final File file) {
+        super(dqs, new TranslatableComponent("dataPack.title"), runnable -> new PackSelectionModel<>(runnable, (aap, elw) -> elw.bind(DataPackSelectScreen.DEFAULT_ICON), aar, consumer), file);
+    }
+    
+    static {
+        DEFAULT_ICON = new ResourceLocation("textures/misc/unknown_pack.png");
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/DatapackLoadFailureScreen.java b/src/net/minecraft/client/gui/screens/DatapackLoadFailureScreen.java
new file mode 100644
index 0000000..d378f04
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/DatapackLoadFailureScreen.java
@@ -0,0 +1,49 @@
+package net.minecraft.client.gui.screens;
+
+import java.util.Iterator;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import java.util.Collection;
+import com.google.common.collect.Lists;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.FormattedText;
+import java.util.List;
+
+public class DatapackLoadFailureScreen extends Screen {
+    private final List<FormattedText> lines;
+    private final Runnable callback;
+    
+    public DatapackLoadFailureScreen(final Runnable runnable) {
+        super(new TranslatableComponent("datapackFailure.title"));
+        this.lines = Lists.newArrayList();
+        this.callback = runnable;
+    }
+    
+    @Override
+    protected void init() {
+        super.init();
+        this.lines.clear();
+        this.lines.addAll(this.font.split(this.getTitle(), this.width - 50));
+        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 96, 150, 20, new TranslatableComponent("datapackFailure.safeMode"), dni -> this.callback.run()));
+        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, this.height / 6 + 96, 150, 20, new TranslatableComponent("gui.toTitle"), dni -> this.minecraft.setScreen(null)));
+    }
+    
+    @Override
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        int integer4 = 70;
+        for (final FormattedText mu8 : this.lines) {
+            this.drawCenteredString(dhl, this.font, mu8, this.width / 2, integer4, 16777215);
+            final int n = integer4;
+            this.font.getClass();
+            integer4 = n + 9;
+        }
+        super.render(dhl, integer2, integer3, float4);
+    }
+    
+    @Override
+    public boolean shouldCloseOnEsc() {
+        return false;
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/DeathScreen.java b/src/net/minecraft/client/gui/screens/DeathScreen.java
index 5c14a15..330f473 100644
--- a/src/net/minecraft/client/gui/screens/DeathScreen.java
+++ b/src/net/minecraft/client/gui/screens/DeathScreen.java
@@ -1,14 +1,16 @@
 package net.minecraft.client.gui.screens;
 
 import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.client.gui.components.ComponentRenderUtils;
+import net.minecraft.network.chat.Style;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.FormattedText;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.Iterator;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.TranslatableComponent;
 import javax.annotation.Nullable;
 import net.minecraft.network.chat.Component;
@@ -18,40 +20,40 @@ public class DeathScreen extends Screen {
     private final Component causeOfDeath;
     private final boolean hardcore;
     
-    public DeathScreen(@Nullable final Component lf, final boolean boolean2) {
-        super(new TranslatableComponent(boolean2 ? "deathScreen.title.hardcore" : "deathScreen.title", new Object[0]));
-        this.causeOfDeath = lf;
+    public DeathScreen(@Nullable final Component mr, final boolean boolean2) {
+        super(new TranslatableComponent(boolean2 ? "deathScreen.title.hardcore" : "deathScreen.title"));
+        this.causeOfDeath = mr;
         this.hardcore = boolean2;
     }
     
     @Override
     protected void init() {
         this.delayTicker = 0;
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 72, 200, 20, this.hardcore ? I18n.get("deathScreen.spectate") : I18n.get("deathScreen.respawn"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 72, 200, 20, this.hardcore ? new TranslatableComponent("deathScreen.spectate") : new TranslatableComponent("deathScreen.respawn"), dni -> {
             this.minecraft.player.respawn();
             this.minecraft.setScreen(null);
             return;
         }));
         final ConfirmScreen confirmScreen;
-        ConfirmScreen dfc3;
-        final Button dcv2 = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 96, 200, 20, I18n.get("deathScreen.titleScreen"), dcv -> {
+        ConfirmScreen dpp3;
+        final Button dni2 = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 96, 200, 20, new TranslatableComponent("deathScreen.titleScreen"), dni -> {
             if (this.hardcore) {
                 this.exitToTitleScreen();
                 return;
             }
             else {
-                new ConfirmScreen(this::confirmResult, new TranslatableComponent("deathScreen.quit.confirm", new Object[0]), new TextComponent(""), I18n.get("deathScreen.titleScreen"), I18n.get("deathScreen.respawn"));
-                dfc3 = confirmScreen;
-                this.minecraft.setScreen(dfc3);
-                dfc3.setDelay(20);
+                new ConfirmScreen(this::confirmResult, new TranslatableComponent("deathScreen.quit.confirm"), TextComponent.EMPTY, new TranslatableComponent("deathScreen.titleScreen"), new TranslatableComponent("deathScreen.respawn"));
+                dpp3 = confirmScreen;
+                this.minecraft.setScreen(dpp3);
+                dpp3.setDelay(20);
                 return;
             }
         }));
         if (!this.hardcore && this.minecraft.getUser() == null) {
-            dcv2.active = false;
+            dni2.active = false;
         }
-        for (final AbstractWidget dct4 : this.buttons) {
-            dct4.active = false;
+        for (final AbstractWidget dng4 : this.buttons) {
+            dng4.active = false;
         }
     }
     
@@ -74,53 +76,44 @@ public class DeathScreen extends Screen {
         if (this.minecraft.level != null) {
             this.minecraft.level.disconnect();
         }
-        this.minecraft.clearLevel(new GenericDirtMessageScreen(new TranslatableComponent("menu.savingLevel", new Object[0])));
+        this.minecraft.clearLevel(new GenericDirtMessageScreen(new TranslatableComponent("menu.savingLevel")));
         this.minecraft.setScreen(new TitleScreen());
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.fillGradient(0, 0, this.width, this.height, 1615855616, -1602211792);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.fillGradient(dhl, 0, 0, this.width, this.height, 1615855616, -1602211792);
         RenderSystem.pushMatrix();
         RenderSystem.scalef(2.0f, 2.0f, 2.0f);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2 / 2, 30, 16777215);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2 / 2, 30, 16777215);
         RenderSystem.popMatrix();
         if (this.causeOfDeath != null) {
-            this.drawCenteredString(this.font, this.causeOfDeath.getColoredString(), this.width / 2, 85, 16777215);
+            this.drawCenteredString(dhl, this.font, this.causeOfDeath, this.width / 2, 85, 16777215);
         }
-        this.drawCenteredString(this.font, I18n.get("deathScreen.score") + ": " + ChatFormatting.YELLOW + this.minecraft.player.getScore(), this.width / 2, 100, 16777215);
-        if (this.causeOfDeath != null && integer2 > 85) {
+        this.drawCenteredString(dhl, this.font, I18n.get("deathScreen.score") + ": " + ChatFormatting.YELLOW + this.minecraft.player.getScore(), this.width / 2, 100, 16777215);
+        if (this.causeOfDeath != null && integer3 > 85) {
             final int n = 85;
             this.font.getClass();
-            if (integer2 < n + 9) {
-                final Component lf5 = this.getClickedComponentAt(integer1);
-                if (lf5 != null && lf5.getStyle().getHoverEvent() != null) {
-                    this.renderComponentHoverEffect(lf5, integer1, integer2);
-                }
+            if (integer3 < n + 9) {
+                final Style nb6 = this.getClickedComponentStyleAt(integer2);
+                this.renderComponentHoverEffect(dhl, nb6, integer2, integer3);
             }
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Nullable
-    public Component getClickedComponentAt(final int integer) {
+    private Style getClickedComponentStyleAt(final int integer) {
         if (this.causeOfDeath == null) {
             return null;
         }
-        final int integer2 = this.minecraft.font.width(this.causeOfDeath.getColoredString());
+        final int integer2 = this.minecraft.font.width(this.causeOfDeath);
         final int integer3 = this.width / 2 - integer2 / 2;
         final int integer4 = this.width / 2 + integer2 / 2;
-        int integer5 = integer3;
         if (integer < integer3 || integer > integer4) {
             return null;
         }
-        for (final Component lf8 : this.causeOfDeath) {
-            integer5 += this.minecraft.font.width(ComponentRenderUtils.stripColor(lf8.getContents(), false));
-            if (integer5 > integer) {
-                return lf8;
-            }
-        }
-        return null;
+        return this.minecraft.font.getSplitter().componentStyleAtWidth(this.causeOfDeath, integer - integer3);
     }
     
     @Override
@@ -129,9 +122,9 @@ public class DeathScreen extends Screen {
             final int n = 85;
             this.font.getClass();
             if (double2 < n + 9) {
-                final Component lf7 = this.getClickedComponentAt((int)double1);
-                if (lf7 != null && lf7.getStyle().getClickEvent() != null && lf7.getStyle().getClickEvent().getAction() == ClickEvent.Action.OPEN_URL) {
-                    this.handleComponentClicked(lf7);
+                final Style nb7 = this.getClickedComponentStyleAt((int)double1);
+                if (nb7 != null && nb7.getClickEvent() != null && nb7.getClickEvent().getAction() == ClickEvent.Action.OPEN_URL) {
+                    this.handleComponentClicked(nb7);
                     return false;
                 }
             }
@@ -149,8 +142,8 @@ public class DeathScreen extends Screen {
         super.tick();
         ++this.delayTicker;
         if (this.delayTicker == 20) {
-            for (final AbstractWidget dct3 : this.buttons) {
-                dct3.active = true;
+            for (final AbstractWidget dng3 : this.buttons) {
+                dng3.active = true;
             }
         }
     }
diff --git a/src/net/minecraft/client/gui/screens/DemoIntroScreen.java b/src/net/minecraft/client/gui/screens/DemoIntroScreen.java
index 40e2d2f..56e3b48 100644
--- a/src/net/minecraft/client/gui/screens/DemoIntroScreen.java
+++ b/src/net/minecraft/client/gui/screens/DemoIntroScreen.java
@@ -1,10 +1,11 @@
 package net.minecraft.client.gui.screens;
 
 import net.minecraft.client.Options;
+import net.minecraft.network.chat.FormattedText;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.Util;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceLocation;
@@ -13,47 +14,47 @@ public class DemoIntroScreen extends Screen {
     private static final ResourceLocation DEMO_BACKGROUND_LOCATION;
     
     public DemoIntroScreen() {
-        super(new TranslatableComponent("demo.help.title", new Object[0]));
+        super(new TranslatableComponent("demo.help.title"));
     }
     
     @Override
     protected void init() {
         final int integer2 = -16;
-        this.<Button>addButton(new Button(this.width / 2 - 116, this.height / 2 + 62 - 16, 114, 20, I18n.get("demo.help.buy"), dcv -> {
-            dcv.active = false;
+        this.<Button>addButton(new Button(this.width / 2 - 116, this.height / 2 + 62 - 16, 114, 20, new TranslatableComponent("demo.help.buy"), dni -> {
+            dni.active = false;
             Util.getPlatform().openUri("http://www.minecraft.net/store?source=demo");
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 + 2, this.height / 2 + 62 - 16, 114, 20, I18n.get("demo.help.later"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 + 2, this.height / 2 + 62 - 16, 114, 20, new TranslatableComponent("demo.help.later"), dni -> {
             this.minecraft.setScreen(null);
             this.minecraft.mouseHandler.grabMouse();
         }));
     }
     
     @Override
-    public void renderBackground() {
-        super.renderBackground();
+    public void renderBackground(final PoseStack dhl) {
+        super.renderBackground(dhl);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(DemoIntroScreen.DEMO_BACKGROUND_LOCATION);
-        final int integer2 = (this.width - 248) / 2;
-        final int integer3 = (this.height - 166) / 2;
-        this.blit(integer2, integer3, 0, 0, 248, 166);
+        final int integer3 = (this.width - 248) / 2;
+        final int integer4 = (this.height - 166) / 2;
+        this.blit(dhl, integer3, integer4, 0, 0, 248, 166);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        final int integer3 = (this.width - 248) / 2 + 10;
-        int integer4 = (this.height - 166) / 2 + 8;
-        this.font.draw(this.title.getColoredString(), (float)integer3, (float)integer4, 2039583);
-        integer4 += 12;
-        final Options dbr7 = this.minecraft.options;
-        this.font.draw(I18n.get("demo.help.movementShort", dbr7.keyUp.getTranslatedKeyMessage(), dbr7.keyLeft.getTranslatedKeyMessage(), dbr7.keyDown.getTranslatedKeyMessage(), dbr7.keyRight.getTranslatedKeyMessage()), (float)integer3, (float)integer4, 5197647);
-        this.font.draw(I18n.get("demo.help.movementMouse"), (float)integer3, (float)(integer4 + 12), 5197647);
-        this.font.draw(I18n.get("demo.help.jump", dbr7.keyJump.getTranslatedKeyMessage()), (float)integer3, (float)(integer4 + 24), 5197647);
-        this.font.draw(I18n.get("demo.help.inventory", dbr7.keyInventory.getTranslatedKeyMessage()), (float)integer3, (float)(integer4 + 36), 5197647);
-        this.font.drawWordWrap(I18n.get("demo.help.fullWrapped"), integer3, integer4 + 68, 218, 2039583);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        final int integer4 = (this.width - 248) / 2 + 10;
+        int integer5 = (this.height - 166) / 2 + 8;
+        this.font.draw(dhl, this.title, (float)integer4, (float)integer5, 2039583);
+        integer5 += 12;
+        final Options dmb8 = this.minecraft.options;
+        this.font.draw(dhl, new TranslatableComponent("demo.help.movementShort", new Object[] { dmb8.keyUp.getTranslatedKeyMessage(), dmb8.keyLeft.getTranslatedKeyMessage(), dmb8.keyDown.getTranslatedKeyMessage(), dmb8.keyRight.getTranslatedKeyMessage() }), (float)integer4, (float)integer5, 5197647);
+        this.font.draw(dhl, new TranslatableComponent("demo.help.movementMouse"), (float)integer4, (float)(integer5 + 12), 5197647);
+        this.font.draw(dhl, new TranslatableComponent("demo.help.jump", new Object[] { dmb8.keyJump.getTranslatedKeyMessage() }), (float)integer4, (float)(integer5 + 24), 5197647);
+        this.font.draw(dhl, new TranslatableComponent("demo.help.inventory", new Object[] { dmb8.keyInventory.getTranslatedKeyMessage() }), (float)integer4, (float)(integer5 + 36), 5197647);
+        this.font.drawWordWrap(new TranslatableComponent("demo.help.fullWrapped"), integer4, integer5 + 68, 218, 2039583);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/DirectJoinServerScreen.java b/src/net/minecraft/client/gui/screens/DirectJoinServerScreen.java
index 07e563d..4016506 100644
--- a/src/net/minecraft/client/gui/screens/DirectJoinServerScreen.java
+++ b/src/net/minecraft/client/gui/screens/DirectJoinServerScreen.java
@@ -1,8 +1,11 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
@@ -17,10 +20,10 @@ public class DirectJoinServerScreen extends Screen {
     private final BooleanConsumer callback;
     private final Screen lastScreen;
     
-    public DirectJoinServerScreen(final Screen dgb, final BooleanConsumer booleanConsumer, final ServerData dnu) {
-        super(new TranslatableComponent("selectServer.direct", new Object[0]));
-        this.lastScreen = dgb;
-        this.serverData = dnu;
+    public DirectJoinServerScreen(final Screen dqs, final BooleanConsumer booleanConsumer, final ServerData dys) {
+        super(new TranslatableComponent("selectServer.direct"));
+        this.lastScreen = dqs;
+        this.serverData = dys;
         this.callback = booleanConsumer;
     }
     
@@ -41,9 +44,9 @@ public class DirectJoinServerScreen extends Screen {
     @Override
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        this.selectButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 96 + 12, 200, 20, I18n.get("selectServer.select"), dcv -> this.onSelect()));
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120 + 12, 200, 20, I18n.get("gui.cancel"), dcv -> this.callback.accept(false)));
-        (this.ipEdit = new EditBox(this.font, this.width / 2 - 100, 116, 200, 20, I18n.get("addServer.enterIp"))).setMaxLength(128);
+        this.selectButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 96 + 12, 200, 20, new TranslatableComponent("selectServer.select"), dni -> this.onSelect()));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120 + 12, 200, 20, CommonComponents.GUI_CANCEL, dni -> this.callback.accept(false)));
+        (this.ipEdit = new EditBox(this.font, this.width / 2 - 100, 116, 200, 20, new TranslatableComponent("addServer.enterIp"))).setMaxLength(128);
         this.ipEdit.setFocus(true);
         this.ipEdit.setValue(this.minecraft.options.lastMpIp);
         this.ipEdit.setResponder(string -> this.updateSelectButtonStatus());
@@ -53,9 +56,9 @@ public class DirectJoinServerScreen extends Screen {
     }
     
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
         final String string5 = this.ipEdit.getValue();
-        this.init(dbn, integer2, integer3);
+        this.init(dlx, integer2, integer3);
         this.ipEdit.setValue(string5);
     }
     
@@ -82,11 +85,11 @@ public class DirectJoinServerScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 20, 16777215);
-        this.drawString(this.font, I18n.get("addServer.enterIp"), this.width / 2 - 100, 100, 10526880);
-        this.ipEdit.render(integer1, integer2, float3);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 20, 16777215);
+        this.drawString(dhl, this.font, I18n.get("addServer.enterIp"), this.width / 2 - 100, 100, 10526880);
+        this.ipEdit.render(dhl, integer2, integer3, float4);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/DisconnectedScreen.java b/src/net/minecraft/client/gui/screens/DisconnectedScreen.java
index 988a48b..1997463 100644
--- a/src/net/minecraft/client/gui/screens/DisconnectedScreen.java
+++ b/src/net/minecraft/client/gui/screens/DisconnectedScreen.java
@@ -2,22 +2,25 @@ package net.minecraft.client.gui.screens;
 
 import java.util.Iterator;
 import net.minecraft.client.gui.Font;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.TranslatableComponent;
+import javax.annotation.Nullable;
+import net.minecraft.network.chat.FormattedText;
 import java.util.List;
 import net.minecraft.network.chat.Component;
 
 public class DisconnectedScreen extends Screen {
     private final Component reason;
-    private List<String> lines;
+    @Nullable
+    private List<FormattedText> lines;
     private final Screen parent;
     private int textHeight;
     
-    public DisconnectedScreen(final Screen dgb, final String string, final Component lf) {
-        super(new TranslatableComponent(string, new Object[0]));
-        this.parent = dgb;
-        this.reason = lf;
+    public DisconnectedScreen(final Screen dqs, final String string, final Component mr) {
+        super(new TranslatableComponent(string));
+        this.parent = dqs;
+        this.reason = mr;
     }
     
     @Override
@@ -27,34 +30,34 @@ public class DisconnectedScreen extends Screen {
     
     @Override
     protected void init() {
-        this.lines = this.font.split(this.reason.getColoredString(), this.width - 50);
+        this.lines = this.font.split(this.reason, this.width - 50);
         final int size = this.lines.size();
         this.font.getClass();
         this.textHeight = size * 9;
         final int integer1 = this.width / 2 - 100;
         final int n = this.height / 2 + this.textHeight / 2;
         this.font.getClass();
-        this.<Button>addButton(new Button(integer1, Math.min(n + 9, this.height - 30), 200, 20, I18n.get("gui.toMenu"), dcv -> this.minecraft.setScreen(this.parent)));
+        this.<Button>addButton(new Button(integer1, Math.min(n + 9, this.height - 30), 200, 20, new TranslatableComponent("gui.toMenu"), dni -> this.minecraft.setScreen(this.parent)));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
         final Font font = this.font;
-        final String coloredString = this.title.getColoredString();
-        final int integer4 = this.width / 2;
+        final Component title = this.title;
+        final int integer5 = this.width / 2;
         final int n = this.height / 2 - this.textHeight / 2;
         this.font.getClass();
-        this.drawCenteredString(font, coloredString, integer4, n - 9 * 2, 11184810);
-        int integer3 = this.height / 2 - this.textHeight / 2;
+        this.drawCenteredString(dhl, font, title, integer5, n - 9 * 2, 11184810);
+        int integer4 = this.height / 2 - this.textHeight / 2;
         if (this.lines != null) {
-            for (final String string7 : this.lines) {
-                this.drawCenteredString(this.font, string7, this.width / 2, integer3, 16777215);
-                final int n2 = integer3;
+            for (final FormattedText mu8 : this.lines) {
+                this.drawCenteredString(dhl, this.font, mu8, this.width / 2, integer4, 16777215);
+                final int n2 = integer4;
                 this.font.getClass();
-                integer3 = n2 + 9;
+                integer4 = n2 + 9;
             }
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/EditServerScreen.java b/src/net/minecraft/client/gui/screens/EditServerScreen.java
index d3ec2d3..76af846 100644
--- a/src/net/minecraft/client/gui/screens/EditServerScreen.java
+++ b/src/net/minecraft/client/gui/screens/EditServerScreen.java
@@ -1,7 +1,10 @@
 package net.minecraft.client.gui.screens;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.CommonComponents;
 import java.net.IDN;
 import net.minecraft.util.StringUtil;
 import net.minecraft.network.chat.Component;
@@ -22,8 +25,8 @@ public class EditServerScreen extends Screen {
     private final Screen lastScreen;
     private final Predicate<String> addressFilter;
     
-    public EditServerScreen(final Screen dgb, final BooleanConsumer booleanConsumer, final ServerData dnu) {
-        super(new TranslatableComponent("addServer.title", new Object[0]));
+    public EditServerScreen(final Screen dqs, final BooleanConsumer booleanConsumer, final ServerData dys) {
+        super(new TranslatableComponent("addServer.title"));
         String[] arr2;
         String string2;
         this.addressFilter = (string -> {
@@ -46,9 +49,9 @@ public class EditServerScreen extends Screen {
                 }
             }
         });
-        this.lastScreen = dgb;
+        this.lastScreen = dqs;
         this.callback = booleanConsumer;
-        this.serverData = dnu;
+        this.serverData = dys;
     }
     
     @Override
@@ -60,30 +63,34 @@ public class EditServerScreen extends Screen {
     @Override
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        (this.nameEdit = new EditBox(this.font, this.width / 2 - 100, 66, 200, 20, I18n.get("addServer.enterName"))).setFocus(true);
+        (this.nameEdit = new EditBox(this.font, this.width / 2 - 100, 66, 200, 20, new TranslatableComponent("addServer.enterName"))).setFocus(true);
         this.nameEdit.setValue(this.serverData.name);
         this.nameEdit.setResponder(this::onEdited);
         this.children.add(this.nameEdit);
-        (this.ipEdit = new EditBox(this.font, this.width / 2 - 100, 106, 200, 20, I18n.get("addServer.enterIp"))).setMaxLength(128);
+        (this.ipEdit = new EditBox(this.font, this.width / 2 - 100, 106, 200, 20, new TranslatableComponent("addServer.enterIp"))).setMaxLength(128);
         this.ipEdit.setValue(this.serverData.ip);
         this.ipEdit.setFilter(this.addressFilter);
         this.ipEdit.setResponder(this::onEdited);
         this.children.add(this.ipEdit);
-        this.serverPackButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 72, 200, 20, I18n.get("addServer.resourcePack") + ": " + this.serverData.getResourcePackStatus().getName().getColoredString(), dcv -> {
+        this.serverPackButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 72, 200, 20, createServerButtonText(this.serverData.getResourcePackStatus()), dni -> {
             this.serverData.setResourcePackStatus(ServerData.ServerPackStatus.values()[(this.serverData.getResourcePackStatus().ordinal() + 1) % ServerData.ServerPackStatus.values().length]);
-            this.serverPackButton.setMessage(I18n.get("addServer.resourcePack") + ": " + this.serverData.getResourcePackStatus().getName().getColoredString());
+            this.serverPackButton.setMessage(createServerButtonText(this.serverData.getResourcePackStatus()));
             return;
         }));
-        this.addButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 96 + 18, 200, 20, I18n.get("addServer.add"), dcv -> this.onAdd()));
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120 + 18, 200, 20, I18n.get("gui.cancel"), dcv -> this.callback.accept(false)));
+        this.addButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 96 + 18, 200, 20, new TranslatableComponent("addServer.add"), dni -> this.onAdd()));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120 + 18, 200, 20, CommonComponents.GUI_CANCEL, dni -> this.callback.accept(false)));
         this.cleanUp();
     }
     
+    private static Component createServerButtonText(final ServerData.ServerPackStatus a) {
+        return new TranslatableComponent("addServer.resourcePack").append(": ").append(a.getName());
+    }
+    
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
         final String string5 = this.ipEdit.getValue();
         final String string6 = this.nameEdit.getValue();
-        this.init(dbn, integer2, integer3);
+        this.init(dlx, integer2, integer3);
         this.ipEdit.setValue(string5);
         this.nameEdit.setValue(string6);
     }
@@ -116,13 +123,13 @@ public class EditServerScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 17, 16777215);
-        this.drawString(this.font, I18n.get("addServer.enterName"), this.width / 2 - 100, 53, 10526880);
-        this.drawString(this.font, I18n.get("addServer.enterIp"), this.width / 2 - 100, 94, 10526880);
-        this.nameEdit.render(integer1, integer2, float3);
-        this.ipEdit.render(integer1, integer2, float3);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 17, 16777215);
+        this.drawString(dhl, this.font, I18n.get("addServer.enterName"), this.width / 2 - 100, 53, 10526880);
+        this.drawString(dhl, this.font, I18n.get("addServer.enterIp"), this.width / 2 - 100, 94, 10526880);
+        this.nameEdit.render(dhl, integer2, integer3, float4);
+        this.ipEdit.render(dhl, integer2, integer3, float4);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/ErrorScreen.java b/src/net/minecraft/client/gui/screens/ErrorScreen.java
index 8176782..57e6ca8 100644
--- a/src/net/minecraft/client/gui/screens/ErrorScreen.java
+++ b/src/net/minecraft/client/gui/screens/ErrorScreen.java
@@ -1,29 +1,31 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 
 public class ErrorScreen extends Screen {
-    private final String message;
+    private final Component message;
     
-    public ErrorScreen(final Component lf, final String string) {
-        super(lf);
-        this.message = string;
+    public ErrorScreen(final Component mr1, final Component mr2) {
+        super(mr1);
+        this.message = mr2;
     }
     
     @Override
     protected void init() {
         super.init();
-        this.<Button>addButton(new Button(this.width / 2 - 100, 140, 200, 20, I18n.get("gui.cancel"), dcv -> this.minecraft.setScreen(null)));
+        this.<Button>addButton(new Button(this.width / 2 - 100, 140, 200, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(null)));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.fillGradient(0, 0, this.width, this.height, -12574688, -11530224);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 90, 16777215);
-        this.drawCenteredString(this.font, this.message, this.width / 2, 110, 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.fillGradient(dhl, 0, 0, this.width, this.height, -12574688, -11530224);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 90, 16777215);
+        this.drawCenteredString(dhl, this.font, this.message, this.width / 2, 110, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/GenericDirtMessageScreen.java b/src/net/minecraft/client/gui/screens/GenericDirtMessageScreen.java
index 3284d22..4d29e2a 100644
--- a/src/net/minecraft/client/gui/screens/GenericDirtMessageScreen.java
+++ b/src/net/minecraft/client/gui/screens/GenericDirtMessageScreen.java
@@ -1,10 +1,12 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 
 public class GenericDirtMessageScreen extends Screen {
-    public GenericDirtMessageScreen(final Component lf) {
-        super(lf);
+    public GenericDirtMessageScreen(final Component mr) {
+        super(mr);
     }
     
     @Override
@@ -13,9 +15,9 @@ public class GenericDirtMessageScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.renderDirtBackground(0);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 70, 16777215);
-        super.render(integer1, integer2, float3);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 70, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/InBedChatScreen.java b/src/net/minecraft/client/gui/screens/InBedChatScreen.java
index ec75773..9040260 100644
--- a/src/net/minecraft/client/gui/screens/InBedChatScreen.java
+++ b/src/net/minecraft/client/gui/screens/InBedChatScreen.java
@@ -4,8 +4,9 @@ import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket;
+import net.minecraft.network.chat.Component;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
 
 public class InBedChatScreen extends ChatScreen {
     public InBedChatScreen() {
@@ -15,7 +16,7 @@ public class InBedChatScreen extends ChatScreen {
     @Override
     protected void init() {
         super.init();
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 40, 200, 20, I18n.get("multiplayer.stopSleeping"), dcv -> this.sendWakeUp()));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 40, 200, 20, new TranslatableComponent("multiplayer.stopSleeping"), dni -> this.sendWakeUp()));
     }
     
     @Override
@@ -31,7 +32,7 @@ public class InBedChatScreen extends ChatScreen {
         else if (integer1 == 257 || integer1 == 335) {
             final String string5 = this.input.getValue().trim();
             if (!string5.isEmpty()) {
-                this.minecraft.player.chat(string5);
+                this.sendMessage(string5);
             }
             this.input.setValue("");
             this.minecraft.gui.getChat().resetChatScroll();
@@ -41,7 +42,7 @@ public class InBedChatScreen extends ChatScreen {
     }
     
     private void sendWakeUp() {
-        final ClientPacketListener dnp2 = this.minecraft.player.connection;
-        dnp2.send(new ServerboundPlayerCommandPacket(this.minecraft.player, ServerboundPlayerCommandPacket.Action.STOP_SLEEPING));
+        final ClientPacketListener dyn2 = this.minecraft.player.connection;
+        dyn2.send(new ServerboundPlayerCommandPacket(this.minecraft.player, ServerboundPlayerCommandPacket.Action.STOP_SLEEPING));
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/LanguageSelectScreen.java b/src/net/minecraft/client/gui/screens/LanguageSelectScreen.java
index c5548cb..8a394ce 100644
--- a/src/net/minecraft/client/gui/screens/LanguageSelectScreen.java
+++ b/src/net/minecraft/client/gui/screens/LanguageSelectScreen.java
@@ -4,10 +4,13 @@ import net.minecraft.client.gui.components.AbstractSelectionList;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import javax.annotation.Nullable;
 import java.util.Iterator;
-import net.minecraft.client.resources.language.Language;
+import net.minecraft.client.resources.language.LanguageInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.ObjectSelectionList;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.Option;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
@@ -22,31 +25,30 @@ public class LanguageSelectScreen extends OptionsSubScreen {
     private OptionButton forceUnicodeButton;
     private Button doneButton;
     
-    public LanguageSelectScreen(final Screen dgb, final Options dbr, final LanguageManager ebf) {
-        super(dgb, dbr, new TranslatableComponent("options.language", new Object[0]));
-        this.languageManager = ebf;
+    public LanguageSelectScreen(final Screen dqs, final Options dmb, final LanguageManager ems) {
+        super(dqs, dmb, new TranslatableComponent("options.language"));
+        this.languageManager = ems;
     }
     
     @Override
     protected void init() {
         this.packSelectionList = new LanguageSelectionList(this.minecraft);
         this.children.add(this.packSelectionList);
-        this.forceUnicodeButton = this.<OptionButton>addButton(new OptionButton(this.width / 2 - 155, this.height - 38, 150, 20, Option.FORCE_UNICODE_FONT, Option.FORCE_UNICODE_FONT.getMessage(this.options), dcv -> {
+        this.forceUnicodeButton = this.<OptionButton>addButton(new OptionButton(this.width / 2 - 155, this.height - 38, 150, 20, Option.FORCE_UNICODE_FONT, Option.FORCE_UNICODE_FONT.getMessage(this.options), dni -> {
             Option.FORCE_UNICODE_FONT.toggle(this.options);
             this.options.save();
-            dcv.setMessage(Option.FORCE_UNICODE_FONT.getMessage(this.options));
+            dni.setMessage(Option.FORCE_UNICODE_FONT.getMessage(this.options));
             this.minecraft.resizeDisplay();
             return;
         }));
         final LanguageSelectionList.Entry a3;
-        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 155 + 160, this.height - 38, 150, 20, I18n.get("gui.done"), dcv -> {
+        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 155 + 160, this.height - 38, 150, 20, CommonComponents.GUI_DONE, dni -> {
             a3 = this.packSelectionList.getSelected();
             if (a3 != null && !a3.language.getCode().equals(this.languageManager.getSelected().getCode())) {
                 this.languageManager.setSelected(a3.language);
                 this.options.languageCode = a3.language.getCode();
                 this.minecraft.reloadResourcePacks();
-                this.font.setBidirectional(this.languageManager.isBidirectional());
-                this.doneButton.setMessage(I18n.get("gui.done"));
+                this.doneButton.setMessage(CommonComponents.GUI_DONE);
                 this.forceUnicodeButton.setMessage(Option.FORCE_UNICODE_FONT.getMessage(this.options));
                 this.options.save();
             }
@@ -57,20 +59,20 @@ public class LanguageSelectScreen extends OptionsSubScreen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.packSelectionList.render(integer1, integer2, float3);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 16, 16777215);
-        this.drawCenteredString(this.font, "(" + I18n.get("options.languageWarning") + ")", this.width / 2, this.height - 56, 8421504);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.packSelectionList.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 16, 16777215);
+        this.drawCenteredString(dhl, this.font, "(" + I18n.get("options.languageWarning") + ")", this.width / 2, this.height - 56, 8421504);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     class LanguageSelectionList extends ObjectSelectionList<Entry> {
-        public LanguageSelectionList(final Minecraft dbn) {
-            super(dbn, LanguageSelectScreen.this.width, LanguageSelectScreen.this.height, 32, LanguageSelectScreen.this.height - 65 + 4, 18);
-            for (final Language ebe5 : LanguageSelectScreen.this.languageManager.getLanguages()) {
-                final Entry a6 = new Entry(ebe5);
+        public LanguageSelectionList(final Minecraft dlx) {
+            super(dlx, LanguageSelectScreen.this.width, LanguageSelectScreen.this.height, 32, LanguageSelectScreen.this.height - 65 + 4, 18);
+            for (final LanguageInfo emr5 : LanguageSelectScreen.this.languageManager.getLanguages()) {
+                final Entry a6 = new Entry(emr5);
                 this.addEntry(a6);
-                if (LanguageSelectScreen.this.languageManager.getSelected().getCode().equals(ebe5.getCode())) {
+                if (LanguageSelectScreen.this.languageManager.getSelected().getCode().equals(emr5.getCode())) {
                     this.setSelected(a6);
                 }
             }
@@ -98,8 +100,8 @@ public class LanguageSelectScreen extends OptionsSubScreen {
         }
         
         @Override
-        protected void renderBackground() {
-            LanguageSelectScreen.this.renderBackground();
+        protected void renderBackground(final PoseStack dhl) {
+            LanguageSelectScreen.this.renderBackground(dhl);
         }
         
         @Override
@@ -108,17 +110,16 @@ public class LanguageSelectScreen extends OptionsSubScreen {
         }
         
         public class Entry extends ObjectSelectionList.Entry<Entry> {
-            private final Language language;
+            private final LanguageInfo language;
             
-            public Entry(final Language ebe) {
-                this.language = ebe;
+            public Entry(final LanguageInfo emr) {
+                this.language = emr;
             }
             
             @Override
-            public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-                LanguageSelectScreen.this.font.setBidirectional(true);
-                LanguageSelectionList.this.drawCenteredString(LanguageSelectScreen.this.font, this.language.toString(), LanguageSelectionList.this.width / 2, integer2 + 1, 16777215);
-                LanguageSelectScreen.this.font.setBidirectional(LanguageSelectScreen.this.languageManager.getSelected().isBidirectional());
+            public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+                final String string12 = this.language.toString();
+                LanguageSelectScreen.this.font.drawShadow(dhl, string12, (float)(LanguageSelectionList.this.width / 2 - LanguageSelectScreen.this.font.width(string12) / 2), (float)(integer3 + 1), 16777215, true);
             }
             
             @Override
diff --git a/src/net/minecraft/client/gui/screens/LevelLoadingScreen.java b/src/net/minecraft/client/gui/screens/LevelLoadingScreen.java
index 7c50f17..7a0c45c 100644
--- a/src/net/minecraft/client/gui/screens/LevelLoadingScreen.java
+++ b/src/net/minecraft/client/gui/screens/LevelLoadingScreen.java
@@ -3,10 +3,10 @@ package net.minecraft.client.gui.screens;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.Font;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.Util;
 import net.minecraft.util.Mth;
-import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
@@ -17,10 +17,10 @@ public class LevelLoadingScreen extends Screen {
     private long lastNarration;
     private static final Object2IntMap<ChunkStatus> COLORS;
     
-    public LevelLoadingScreen(final StoringChunkProgressListener xq) {
+    public LevelLoadingScreen(final StoringChunkProgressListener zq) {
         super(NarratorChatListener.NO_TITLE);
         this.lastNarration = -1L;
-        this.progressListener = xq;
+        this.progressListener = zq;
     }
     
     @Override
@@ -30,52 +30,52 @@ public class LevelLoadingScreen extends Screen {
     
     @Override
     public void removed() {
-        NarratorChatListener.INSTANCE.sayNow(I18n.get("narrator.loading.done"));
+        NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.loading.done").getString());
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        final String string5 = Mth.clamp(this.progressListener.getProgress(), 0, 100) + "%";
-        final long long6 = Util.getMillis();
-        if (long6 - this.lastNarration > 2000L) {
-            this.lastNarration = long6;
-            NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.loading", new Object[] { string5 }).getString());
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        final String string6 = Mth.clamp(this.progressListener.getProgress(), 0, 100) + "%";
+        final long long7 = Util.getMillis();
+        if (long7 - this.lastNarration > 2000L) {
+            this.lastNarration = long7;
+            NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.loading", new Object[] { string6 }).getString());
         }
-        final int integer3 = this.width / 2;
-        final int integer4 = this.height / 2;
-        final int integer5 = 30;
-        renderChunks(this.progressListener, integer3, integer4 + 30, 2, 0);
+        final int integer4 = this.width / 2;
+        final int integer5 = this.height / 2;
+        final int integer6 = 30;
+        renderChunks(dhl, this.progressListener, integer4, integer5 + 30, 2, 0);
         final Font font = this.font;
-        final String string6 = string5;
-        final int integer6 = integer3;
-        final int n = integer4;
+        final String string7 = string6;
+        final int integer7 = integer4;
+        final int n = integer5;
         this.font.getClass();
-        this.drawCenteredString(font, string6, integer6, n - 9 / 2 - 30, 16777215);
+        this.drawCenteredString(dhl, font, string7, integer7, n - 9 / 2 - 30, 16777215);
     }
     
-    public static void renderChunks(final StoringChunkProgressListener xq, final int integer2, final int integer3, final int integer4, final int integer5) {
-        final int integer6 = integer4 + integer5;
-        final int integer7 = xq.getFullDiameter();
-        final int integer8 = integer7 * integer6 - integer5;
-        final int integer9 = xq.getDiameter();
-        final int integer10 = integer9 * integer6 - integer5;
-        final int integer11 = integer2 - integer10 / 2;
-        final int integer12 = integer3 - integer10 / 2;
-        final int integer13 = integer8 / 2 + 1;
-        final int integer14 = -16772609;
-        if (integer5 != 0) {
-            GuiComponent.fill(integer2 - integer13, integer3 - integer13, integer2 - integer13 + 1, integer3 + integer13, -16772609);
-            GuiComponent.fill(integer2 + integer13 - 1, integer3 - integer13, integer2 + integer13, integer3 + integer13, -16772609);
-            GuiComponent.fill(integer2 - integer13, integer3 - integer13, integer2 + integer13, integer3 - integer13 + 1, -16772609);
-            GuiComponent.fill(integer2 - integer13, integer3 + integer13 - 1, integer2 + integer13, integer3 + integer13, -16772609);
+    public static void renderChunks(final PoseStack dhl, final StoringChunkProgressListener zq, final int integer3, final int integer4, final int integer5, final int integer6) {
+        final int integer7 = integer5 + integer6;
+        final int integer8 = zq.getFullDiameter();
+        final int integer9 = integer8 * integer7 - integer6;
+        final int integer10 = zq.getDiameter();
+        final int integer11 = integer10 * integer7 - integer6;
+        final int integer12 = integer3 - integer11 / 2;
+        final int integer13 = integer4 - integer11 / 2;
+        final int integer14 = integer9 / 2 + 1;
+        final int integer15 = -16772609;
+        if (integer6 != 0) {
+            GuiComponent.fill(dhl, integer3 - integer14, integer4 - integer14, integer3 - integer14 + 1, integer4 + integer14, -16772609);
+            GuiComponent.fill(dhl, integer3 + integer14 - 1, integer4 - integer14, integer3 + integer14, integer4 + integer14, -16772609);
+            GuiComponent.fill(dhl, integer3 - integer14, integer4 - integer14, integer3 + integer14, integer4 - integer14 + 1, -16772609);
+            GuiComponent.fill(dhl, integer3 - integer14, integer4 + integer14 - 1, integer3 + integer14, integer4 + integer14, -16772609);
         }
-        for (int integer15 = 0; integer15 < integer9; ++integer15) {
-            for (int integer16 = 0; integer16 < integer9; ++integer16) {
-                final ChunkStatus cae17 = xq.getStatus(integer15, integer16);
-                final int integer17 = integer11 + integer15 * integer6;
-                final int integer18 = integer12 + integer16 * integer6;
-                GuiComponent.fill(integer17, integer18, integer17 + integer4, integer18 + integer4, LevelLoadingScreen.COLORS.getInt(cae17) | 0xFF000000);
+        for (int integer16 = 0; integer16 < integer10; ++integer16) {
+            for (int integer17 = 0; integer17 < integer10; ++integer17) {
+                final ChunkStatus chc18 = zq.getStatus(integer16, integer17);
+                final int integer18 = integer12 + integer16 * integer7;
+                final int integer19 = integer13 + integer17 * integer7;
+                GuiComponent.fill(dhl, integer18, integer19, integer18 + integer5, integer19 + integer5, LevelLoadingScreen.COLORS.getInt(chc18) | 0xFF000000);
             }
         }
     }
diff --git a/src/net/minecraft/client/gui/screens/LoadingOverlay.java b/src/net/minecraft/client/gui/screens/LoadingOverlay.java
index 226532b..135b6c9 100644
--- a/src/net/minecraft/client/gui/screens/LoadingOverlay.java
+++ b/src/net/minecraft/client/gui/screens/LoadingOverlay.java
@@ -1,17 +1,19 @@
 package net.minecraft.client.gui.screens;
 
 import java.io.InputStream;
-import net.minecraft.server.packs.VanillaPack;
+import net.minecraft.server.packs.VanillaPackResources;
 import java.io.IOException;
-import net.minecraft.client.resources.metadata.texture.TextureMetadataSection;
 import com.mojang.blaze3d.platform.NativeImage;
+import net.minecraft.client.resources.metadata.texture.TextureMetadataSection;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.client.renderer.texture.SimpleTexture;
+import net.minecraft.util.FastColor;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.util.Mth;
 import net.minecraft.Util;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -20,7 +22,9 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
 
 public class LoadingOverlay extends Overlay {
-    private static final ResourceLocation MOJANG_LOGO_LOCATION;
+    private static final ResourceLocation MOJANG_STUDIOS_LOGO_LOCATION;
+    private static final int BRAND_BACKGROUND;
+    private static final int BRAND_BACKGROUND_NO_ALPHA;
     private final Minecraft minecraft;
     private final ReloadInstance reload;
     private final Consumer<Optional<Throwable>> onFinish;
@@ -29,67 +33,79 @@ public class LoadingOverlay extends Overlay {
     private long fadeOutStart;
     private long fadeInStart;
     
-    public LoadingOverlay(final Minecraft dbn, final ReloadInstance yy, final Consumer<Optional<Throwable>> consumer, final boolean boolean4) {
+    public LoadingOverlay(final Minecraft dlx, final ReloadInstance aaz, final Consumer<Optional<Throwable>> consumer, final boolean boolean4) {
         this.fadeOutStart = -1L;
         this.fadeInStart = -1L;
-        this.minecraft = dbn;
-        this.reload = yy;
+        this.minecraft = dlx;
+        this.reload = aaz;
         this.onFinish = consumer;
         this.fadeIn = boolean4;
     }
     
-    public static void registerTextures(final Minecraft dbn) {
-        dbn.getTextureManager().register(LoadingOverlay.MOJANG_LOGO_LOCATION, new LogoTexture());
+    public static void registerTextures(final Minecraft dlx) {
+        dlx.getTextureManager().register(LoadingOverlay.MOJANG_STUDIOS_LOGO_LOCATION, new LogoTexture());
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        final int integer3 = this.minecraft.getWindow().getGuiScaledWidth();
-        final int integer4 = this.minecraft.getWindow().getGuiScaledHeight();
-        final long long7 = Util.getMillis();
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        final int integer4 = this.minecraft.getWindow().getGuiScaledWidth();
+        final int integer5 = this.minecraft.getWindow().getGuiScaledHeight();
+        final long long8 = Util.getMillis();
         if (this.fadeIn && (this.reload.isApplying() || this.minecraft.screen != null) && this.fadeInStart == -1L) {
-            this.fadeInStart = long7;
+            this.fadeInStart = long8;
         }
-        final float float4 = (this.fadeOutStart > -1L) ? ((long7 - this.fadeOutStart) / 1000.0f) : -1.0f;
-        final float float5 = (this.fadeInStart > -1L) ? ((long7 - this.fadeInStart) / 500.0f) : -1.0f;
-        float float6;
-        if (float4 >= 1.0f) {
+        final float float5 = (this.fadeOutStart > -1L) ? ((long8 - this.fadeOutStart) / 1000.0f) : -1.0f;
+        final float float6 = (this.fadeInStart > -1L) ? ((long8 - this.fadeInStart) / 500.0f) : -1.0f;
+        float float7;
+        if (float5 >= 1.0f) {
             if (this.minecraft.screen != null) {
-                this.minecraft.screen.render(0, 0, float3);
+                this.minecraft.screen.render(dhl, 0, 0, float4);
             }
-            final int integer5 = Mth.ceil((1.0f - Mth.clamp(float4 - 1.0f, 0.0f, 1.0f)) * 255.0f);
-            GuiComponent.fill(0, 0, integer3, integer4, 0xFFFFFF | integer5 << 24);
-            float6 = 1.0f - Mth.clamp(float4 - 1.0f, 0.0f, 1.0f);
+            final int integer6 = Mth.ceil((1.0f - Mth.clamp(float5 - 1.0f, 0.0f, 1.0f)) * 255.0f);
+            GuiComponent.fill(dhl, 0, 0, integer4, integer5, LoadingOverlay.BRAND_BACKGROUND_NO_ALPHA | integer6 << 24);
+            float7 = 1.0f - Mth.clamp(float5 - 1.0f, 0.0f, 1.0f);
         }
         else if (this.fadeIn) {
-            if (this.minecraft.screen != null && float5 < 1.0f) {
-                this.minecraft.screen.render(integer1, integer2, float3);
+            if (this.minecraft.screen != null && float6 < 1.0f) {
+                this.minecraft.screen.render(dhl, integer2, integer3, float4);
             }
-            final int integer5 = Mth.ceil(Mth.clamp(float5, 0.15, 1.0) * 255.0);
-            GuiComponent.fill(0, 0, integer3, integer4, 0xFFFFFF | integer5 << 24);
-            float6 = Mth.clamp(float5, 0.0f, 1.0f);
+            final int integer6 = Mth.ceil(Mth.clamp(float6, 0.15, 1.0) * 255.0);
+            GuiComponent.fill(dhl, 0, 0, integer4, integer5, LoadingOverlay.BRAND_BACKGROUND_NO_ALPHA | integer6 << 24);
+            float7 = Mth.clamp(float6, 0.0f, 1.0f);
         }
         else {
-            GuiComponent.fill(0, 0, integer3, integer4, -1);
-            float6 = 1.0f;
+            GuiComponent.fill(dhl, 0, 0, integer4, integer5, LoadingOverlay.BRAND_BACKGROUND);
+            float7 = 1.0f;
         }
-        final int integer5 = (this.minecraft.getWindow().getGuiScaledWidth() - 256) / 2;
-        final int integer6 = (this.minecraft.getWindow().getGuiScaledHeight() - 256) / 2;
-        this.minecraft.getTextureManager().bind(LoadingOverlay.MOJANG_LOGO_LOCATION);
+        final int integer6 = (int)(this.minecraft.getWindow().getGuiScaledWidth() * 0.5);
+        final int integer7 = (int)(this.minecraft.getWindow().getGuiScaledHeight() * 0.5);
+        final double double15 = Math.min(this.minecraft.getWindow().getGuiScaledWidth() * 0.75, this.minecraft.getWindow().getGuiScaledHeight()) * 0.25;
+        final int integer8 = (int)(double15 * 0.5);
+        final double double16 = double15 * 4.0;
+        final int integer9 = (int)(double16 * 0.5);
+        this.minecraft.getTextureManager().bind(LoadingOverlay.MOJANG_STUDIOS_LOGO_LOCATION);
         RenderSystem.enableBlend();
-        RenderSystem.color4f(1.0f, 1.0f, 1.0f, float6);
-        this.blit(integer5, integer6, 0, 0, 256, 256);
-        final float float7 = this.reload.getActualProgress();
-        this.currentProgress = Mth.clamp(this.currentProgress * 0.95f + float7 * 0.050000012f, 0.0f, 1.0f);
-        if (float4 < 1.0f) {
-            this.drawProgressBar(integer3 / 2 - 150, integer4 / 4 * 3, integer3 / 2 + 150, integer4 / 4 * 3 + 10, 1.0f - Mth.clamp(float4, 0.0f, 1.0f));
+        RenderSystem.blendEquation(32774);
+        RenderSystem.blendFunc(770, 1);
+        RenderSystem.alphaFunc(516, 0.0f);
+        RenderSystem.color4f(1.0f, 1.0f, 1.0f, float7);
+        GuiComponent.blit(dhl, integer6 - integer9, integer7 - integer8, integer9, (int)double15, -0.0625f, 0.0f, 120, 60, 120, 120);
+        GuiComponent.blit(dhl, integer6, integer7 - integer8, integer9, (int)double15, 0.0625f, 60.0f, 120, 60, 120, 120);
+        RenderSystem.defaultBlendFunc();
+        RenderSystem.defaultAlphaFunc();
+        RenderSystem.disableBlend();
+        final int integer10 = (int)(this.minecraft.getWindow().getGuiScaledHeight() * 0.8325);
+        final float float8 = this.reload.getActualProgress();
+        this.currentProgress = Mth.clamp(this.currentProgress * 0.95f + float8 * 0.050000012f, 0.0f, 1.0f);
+        if (float5 < 1.0f) {
+            this.drawProgressBar(dhl, integer4 / 2 - integer9, integer10 - 5, integer4 / 2 + integer9, integer10 + 5, 1.0f - Mth.clamp(float5, 0.0f, 1.0f));
         }
-        if (float4 >= 2.0f) {
+        if (float5 >= 2.0f) {
             this.minecraft.setOverlay(null);
         }
         if (this.fadeOutStart == -1L && this.reload.isDone()) {
             if (this.fadeIn) {
-                if (float5 < 2.0f) {
+                if (float6 < 2.0f) {
                     return;
                 }
             }
@@ -97,8 +113,8 @@ public class LoadingOverlay extends Overlay {
                 this.reload.checkExceptions();
                 this.onFinish.accept(Optional.<Throwable>empty());
             }
-            catch (Throwable throwable15) {
-                this.onFinish.accept(Optional.<Throwable>of(throwable15));
+            catch (Throwable throwable23) {
+                this.onFinish.accept(Optional.<Throwable>of(throwable23));
             }
             this.fadeOutStart = Util.getMillis();
             if (this.minecraft.screen != null) {
@@ -107,11 +123,15 @@ public class LoadingOverlay extends Overlay {
         }
     }
     
-    private void drawProgressBar(final int integer1, final int integer2, final int integer3, final int integer4, final float float5) {
-        final int integer5 = Mth.ceil((integer3 - integer1 - 1) * this.currentProgress);
-        GuiComponent.fill(integer1 - 1, integer2 - 1, integer3 + 1, integer4 + 1, 0xFF000000 | Math.round((1.0f - float5) * 255.0f) << 16 | Math.round((1.0f - float5) * 255.0f) << 8 | Math.round((1.0f - float5) * 255.0f));
-        GuiComponent.fill(integer1, integer2, integer3, integer4, -1);
-        GuiComponent.fill(integer1 + 1, integer2 + 1, integer1 + integer5, integer4 - 1, 0xFF000000 | (int)Mth.lerp(1.0f - float5, 226.0f, 255.0f) << 16 | (int)Mth.lerp(1.0f - float5, 40.0f, 255.0f) << 8 | (int)Mth.lerp(1.0f - float5, 55.0f, 255.0f));
+    private void drawProgressBar(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final float float6) {
+        final int integer6 = Mth.ceil((integer4 - integer2 - 2) * this.currentProgress);
+        final int integer7 = Math.round(float6 * 255.0f);
+        final int integer8 = FastColor.ARGB32.color(integer7, 255, 255, 255);
+        GuiComponent.fill(dhl, integer2 + 1, integer3, integer4 - 1, integer3 + 1, integer8);
+        GuiComponent.fill(dhl, integer2 + 1, integer5, integer4 - 1, integer5 - 1, integer8);
+        GuiComponent.fill(dhl, integer2, integer3, integer2 + 1, integer5, integer8);
+        GuiComponent.fill(dhl, integer4, integer3, integer4 - 1, integer5, integer8);
+        GuiComponent.fill(dhl, integer2 + 2, integer3 + 2, integer2 + integer6, integer5 - 2, integer8);
     }
     
     @Override
@@ -120,20 +140,22 @@ public class LoadingOverlay extends Overlay {
     }
     
     static {
-        MOJANG_LOGO_LOCATION = new ResourceLocation("textures/gui/title/mojang.png");
+        MOJANG_STUDIOS_LOGO_LOCATION = new ResourceLocation("textures/gui/title/mojangstudios.png");
+        BRAND_BACKGROUND = FastColor.ARGB32.color(255, 239, 50, 61);
+        BRAND_BACKGROUND_NO_ALPHA = (LoadingOverlay.BRAND_BACKGROUND & 0xFFFFFF);
     }
     
     static class LogoTexture extends SimpleTexture {
         public LogoTexture() {
-            super(LoadingOverlay.MOJANG_LOGO_LOCATION);
+            super(LoadingOverlay.MOJANG_STUDIOS_LOGO_LOCATION);
         }
         
         @Override
-        protected TextureImage getTextureImage(final ResourceManager zb) {
-            final Minecraft dbn3 = Minecraft.getInstance();
-            final VanillaPack yh4 = dbn3.getClientPackSource().getVanillaPack();
-            try (final InputStream inputStream5 = yh4.getResource(PackType.CLIENT_RESOURCES, LoadingOverlay.MOJANG_LOGO_LOCATION)) {
-                return new TextureImage(null, NativeImage.read(inputStream5));
+        protected TextureImage getTextureImage(final ResourceManager abc) {
+            final Minecraft dlx3 = Minecraft.getInstance();
+            final VanillaPackResources aah4 = dlx3.getClientPackSource().getVanillaPack();
+            try (final InputStream inputStream5 = aah4.getResource(PackType.CLIENT_RESOURCES, LoadingOverlay.MOJANG_STUDIOS_LOGO_LOCATION)) {
+                return new TextureImage(new TextureMetadataSection(true, true), NativeImage.read(inputStream5));
             }
             catch (IOException iOException5) {
                 return new TextureImage(iOException5);
diff --git a/src/net/minecraft/client/gui/screens/MenuScreens.java b/src/net/minecraft/client/gui/screens/MenuScreens.java
index e8e1ba9..20258bb 100644
--- a/src/net/minecraft/client/gui/screens/MenuScreens.java
+++ b/src/net/minecraft/client/gui/screens/MenuScreens.java
@@ -8,6 +8,8 @@ import net.minecraft.world.inventory.CartographyTableMenu;
 import net.minecraft.client.gui.screens.inventory.CartographyTableScreen;
 import net.minecraft.world.inventory.SmokerMenu;
 import net.minecraft.client.gui.screens.inventory.SmokerScreen;
+import net.minecraft.world.inventory.SmithingMenu;
+import net.minecraft.client.gui.screens.inventory.SmithingScreen;
 import net.minecraft.world.inventory.ShulkerBoxMenu;
 import net.minecraft.client.gui.screens.inventory.ShulkerBoxScreen;
 import net.minecraft.world.inventory.MerchantMenu;
@@ -54,36 +56,36 @@ public class MenuScreens {
     private static final Logger LOGGER;
     private static final Map<MenuType<?>, ScreenConstructor<?, ?>> SCREENS;
     
-    public static <T extends AbstractContainerMenu> void create(@Nullable final MenuType<T> bbo, final Minecraft dbn, final int integer, final Component lf) {
-        if (bbo == null) {
-            MenuScreens.LOGGER.warn("Trying to open invalid screen with name: {}", lf.getString());
+    public static <T extends AbstractContainerMenu> void create(@Nullable final MenuType<T> bhk, final Minecraft dlx, final int integer, final Component mr) {
+        if (bhk == null) {
+            MenuScreens.LOGGER.warn("Trying to open invalid screen with name: {}", mr.getString());
             return;
         }
-        final ScreenConstructor<T, ?> a5 = MenuScreens.<T>getConstructor(bbo);
+        final ScreenConstructor<T, ?> a5 = MenuScreens.<T>getConstructor(bhk);
         if (a5 == null) {
-            MenuScreens.LOGGER.warn("Failed to create screen for menu type: {}", Registry.MENU.getKey(bbo));
+            MenuScreens.LOGGER.warn("Failed to create screen for menu type: {}", Registry.MENU.getKey(bhk));
             return;
         }
-        a5.fromPacket(lf, bbo, dbn, integer);
+        a5.fromPacket(mr, bhk, dlx, integer);
     }
     
     @Nullable
-    private static <T extends AbstractContainerMenu> ScreenConstructor<T, ?> getConstructor(final MenuType<T> bbo) {
-        return MenuScreens.SCREENS.get(bbo);
+    private static <T extends AbstractContainerMenu> ScreenConstructor<T, ?> getConstructor(final MenuType<T> bhk) {
+        return MenuScreens.SCREENS.get(bhk);
     }
     
-    private static <M extends AbstractContainerMenu, U extends Screen> void register(final MenuType<? extends M> bbo, final ScreenConstructor<M, U> a) {
-        final ScreenConstructor<?, ?> a2 = MenuScreens.SCREENS.put(bbo, a);
+    private static <M extends AbstractContainerMenu, U extends Screen> void register(final MenuType<? extends M> bhk, final ScreenConstructor<M, U> a) {
+        final ScreenConstructor<?, ?> a2 = MenuScreens.SCREENS.put(bhk, a);
         if (a2 != null) {
-            throw new IllegalStateException("Duplicate registration for " + Registry.MENU.getKey(bbo));
+            throw new IllegalStateException("Duplicate registration for " + Registry.MENU.getKey(bhk));
         }
     }
     
     public static boolean selfTest() {
         boolean boolean1 = false;
-        for (final MenuType<?> bbo3 : Registry.MENU) {
-            if (!MenuScreens.SCREENS.containsKey(bbo3)) {
-                MenuScreens.LOGGER.debug("Menu {} has no matching screen", Registry.MENU.getKey(bbo3));
+        for (final MenuType<?> bhk3 : Registry.MENU) {
+            if (!MenuScreens.SCREENS.containsKey(bhk3)) {
+                MenuScreens.LOGGER.debug("Menu {} has no matching screen", Registry.MENU.getKey(bhk3));
                 boolean1 = true;
             }
         }
@@ -113,18 +115,19 @@ public class MenuScreens {
         MenuScreens.<LoomMenu, LoomScreen>register(MenuType.LOOM, LoomScreen::new);
         MenuScreens.<MerchantMenu, MerchantScreen>register(MenuType.MERCHANT, MerchantScreen::new);
         MenuScreens.<ShulkerBoxMenu, ShulkerBoxScreen>register(MenuType.SHULKER_BOX, ShulkerBoxScreen::new);
+        MenuScreens.<SmithingMenu, SmithingScreen>register(MenuType.SMITHING, SmithingScreen::new);
         MenuScreens.<SmokerMenu, SmokerScreen>register(MenuType.SMOKER, SmokerScreen::new);
         MenuScreens.<CartographyTableMenu, CartographyTableScreen>register(MenuType.CARTOGRAPHY_TABLE, CartographyTableScreen::new);
         MenuScreens.<StonecutterMenu, StonecutterScreen>register(MenuType.STONECUTTER, StonecutterScreen::new);
     }
     
     interface ScreenConstructor<T extends AbstractContainerMenu, U extends net.minecraft.client.gui.screens.Screen> {
-        default void fromPacket(final Component lf, final MenuType<T> bbo, final Minecraft dbn, final int integer) {
-            final U dgb6 = this.create(bbo.create(integer, dbn.player.inventory), dbn.player.inventory, lf);
-            dbn.player.containerMenu = ((MenuAccess)dgb6).getMenu();
-            dbn.setScreen((Screen)dgb6);
+        default void fromPacket(final Component mr, final MenuType<T> bhk, final Minecraft dlx, final int integer) {
+            final U dqs6 = this.create(bhk.create(integer, dlx.player.inventory), dlx.player.inventory, mr);
+            dlx.player.containerMenu = ((MenuAccess)dqs6).getMenu();
+            dlx.setScreen((Screen)dqs6);
         }
         
-        U create(final T ban, final Inventory ayi, final Component lf);
+        U create(final T bgi, final Inventory beb, final Component mr);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/MouseSettingsScreen.java b/src/net/minecraft/client/gui/screens/MouseSettingsScreen.java
index 7f5ac70..0737a23 100644
--- a/src/net/minecraft/client/gui/screens/MouseSettingsScreen.java
+++ b/src/net/minecraft/client/gui/screens/MouseSettingsScreen.java
@@ -1,7 +1,9 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import java.util.stream.Stream;
 import java.util.Arrays;
 import com.mojang.blaze3d.platform.InputConstants;
@@ -15,8 +17,8 @@ public class MouseSettingsScreen extends OptionsSubScreen {
     private OptionsList list;
     private static final Option[] OPTIONS;
     
-    public MouseSettingsScreen(final Screen dgb, final Options dbr) {
-        super(dgb, dbr, new TranslatableComponent("options.mouse_settings.title", new Object[0]));
+    public MouseSettingsScreen(final Screen dqs, final Options dmb) {
+        super(dqs, dmb, new TranslatableComponent("options.mouse_settings.title"));
     }
     
     @Override
@@ -29,18 +31,18 @@ public class MouseSettingsScreen extends OptionsSubScreen {
             this.list.addSmall(MouseSettingsScreen.OPTIONS);
         }
         this.children.add(this.list);
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 27, 200, 20, I18n.get("gui.done"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 27, 200, 20, CommonComponents.GUI_DONE, dni -> {
             this.options.save();
             this.minecraft.setScreen(this.lastScreen);
         }));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.list.render(integer1, integer2, float3);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 5, 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.list.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 5, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/OptionsScreen.java b/src/net/minecraft/client/gui/screens/OptionsScreen.java
index 151ec55..c5b7995 100644
--- a/src/net/minecraft/client/gui/screens/OptionsScreen.java
+++ b/src/net/minecraft/client/gui/screens/OptionsScreen.java
@@ -1,11 +1,18 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Collection;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.client.resources.ResourcePack;
+import net.minecraft.server.packs.repository.PackRepository;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.resourcepacks.ResourcePackSelectScreen;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.gui.screens.controls.ControlsScreen;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.gui.components.OptionButton;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket;
@@ -26,24 +33,24 @@ public class OptionsScreen extends Screen {
     private LockIconButton lockButton;
     private Difficulty currentDifficulty;
     
-    public OptionsScreen(final Screen dgb, final Options dbr) {
-        super(new TranslatableComponent("options.title", new Object[0]));
-        this.lastScreen = dgb;
-        this.options = dbr;
+    public OptionsScreen(final Screen dqs, final Options dmb) {
+        super(new TranslatableComponent("options.title"));
+        this.lastScreen = dqs;
+        this.options = dmb;
     }
     
     @Override
     protected void init() {
         int integer2 = 0;
-        for (final Option dbq6 : OptionsScreen.OPTION_SCREEN_OPTIONS) {
+        for (final Option dma6 : OptionsScreen.OPTION_SCREEN_OPTIONS) {
             final int integer3 = this.width / 2 - 155 + integer2 % 2 * 160;
             final int integer4 = this.height / 6 - 12 + 24 * (integer2 >> 1);
-            this.<AbstractWidget>addButton(dbq6.createButton(this.minecraft.options, integer3, integer4, 150));
+            this.<AbstractWidget>addButton(dma6.createButton(this.minecraft.options, integer3, integer4, 150));
             ++integer2;
         }
         if (this.minecraft.level != null) {
             this.currentDifficulty = this.minecraft.level.getDifficulty();
-            this.difficultyButton = this.<Button>addButton(new Button(this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 - 12 + 24 * (integer2 >> 1), 150, 20, this.getDifficultyText(this.currentDifficulty), dcv -> {
+            this.difficultyButton = this.<Button>addButton(new Button(this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 - 12 + 24 * (integer2 >> 1), 150, 20, this.getDifficultyText(this.currentDifficulty), dni -> {
                 this.currentDifficulty = Difficulty.byId(this.currentDifficulty.getId() + 1);
                 this.minecraft.getConnection().send(new ServerboundChangeDifficultyPacket(this.currentDifficulty));
                 this.difficultyButton.setMessage(this.getDifficultyText(this.currentDifficulty));
@@ -52,25 +59,25 @@ public class OptionsScreen extends Screen {
             if (this.minecraft.hasSingleplayerServer() && !this.minecraft.level.getLevelData().isHardcore()) {
                 this.difficultyButton.setWidth(this.difficultyButton.getWidth() - 20);
                 final Minecraft minecraft;
-                final TranslatableComponent lf2;
+                final TranslatableComponent mr2;
                 final Object[] arr;
                 final TranslatableComponent translatableComponent;
                 final Object o;
-                final Component lf3;
+                final Component mr3;
                 final String string;
                 final Screen screen;
                 final BooleanConsumer booleanConsumer;
-                (this.lockButton = this.<LockIconButton>addButton(new LockIconButton(this.difficultyButton.x + this.difficultyButton.getWidth(), this.difficultyButton.y, dcv -> {
+                (this.lockButton = this.<LockIconButton>addButton(new LockIconButton(this.difficultyButton.x + this.difficultyButton.getWidth(), this.difficultyButton.y, dni -> {
                     minecraft = this.minecraft;
                     // new(net.minecraft.client.gui.screens.ConfirmScreen.class)
                     this::lockCallback;
-                    lf2 = new TranslatableComponent("difficulty.lock.title", new Object[0]);
+                    mr2 = new TranslatableComponent("difficulty.lock.title");
                     // new(net.minecraft.network.chat.TranslatableComponent.class)
                     arr = new Object[] { null };
-                    new TranslatableComponent("options.difficulty." + this.minecraft.level.getLevelData().getDifficulty().getKey(), new Object[0]);
+                    new TranslatableComponent("options.difficulty." + this.minecraft.level.getLevelData().getDifficulty().getKey());
                     arr[o] = translatableComponent;
                     new TranslatableComponent(string, arr);
-                    new ConfirmScreen(booleanConsumer, lf2, lf3);
+                    new ConfirmScreen(booleanConsumer, mr2, mr3);
                     minecraft.setScreen(screen);
                     return;
                 }))).setLocked(this.minecraft.level.getLevelData().isDifficultyLocked());
@@ -82,26 +89,46 @@ public class OptionsScreen extends Screen {
             }
         }
         else {
-            this.<OptionButton>addButton(new OptionButton(this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 - 12 + 24 * (integer2 >> 1), 150, 20, Option.REALMS_NOTIFICATIONS, Option.REALMS_NOTIFICATIONS.getMessage(this.options), dcv -> {
+            this.<OptionButton>addButton(new OptionButton(this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 - 12 + 24 * (integer2 >> 1), 150, 20, Option.REALMS_NOTIFICATIONS, Option.REALMS_NOTIFICATIONS.getMessage(this.options), dni -> {
                 Option.REALMS_NOTIFICATIONS.toggle(this.options);
                 this.options.save();
-                dcv.setMessage(Option.REALMS_NOTIFICATIONS.getMessage(this.options));
+                dni.setMessage(Option.REALMS_NOTIFICATIONS.getMessage(this.options));
                 return;
             }));
         }
-        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20, I18n.get("options.skinCustomisation"), dcv -> this.minecraft.setScreen(new SkinCustomizationScreen(this, this.options))));
-        this.<Button>addButton(new Button(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20, I18n.get("options.sounds"), dcv -> this.minecraft.setScreen(new SoundOptionsScreen(this, this.options))));
-        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20, I18n.get("options.video"), dcv -> this.minecraft.setScreen(new VideoSettingsScreen(this, this.options))));
-        this.<Button>addButton(new Button(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20, I18n.get("options.controls"), dcv -> this.minecraft.setScreen(new ControlsScreen(this, this.options))));
-        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 96 - 6, 150, 20, I18n.get("options.language"), dcv -> this.minecraft.setScreen(new LanguageSelectScreen(this, this.options, this.minecraft.getLanguageManager()))));
-        this.<Button>addButton(new Button(this.width / 2 + 5, this.height / 6 + 96 - 6, 150, 20, I18n.get("options.chat.title"), dcv -> this.minecraft.setScreen(new ChatOptionsScreen(this, this.options))));
-        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 120 - 6, 150, 20, I18n.get("options.resourcepack"), dcv -> this.minecraft.setScreen(new ResourcePackSelectScreen(this, this.options))));
-        this.<Button>addButton(new Button(this.width / 2 + 5, this.height / 6 + 120 - 6, 150, 20, I18n.get("options.accessibility.title"), dcv -> this.minecraft.setScreen(new AccessibilityOptionsScreen(this, this.options))));
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 168, 200, 20, I18n.get("gui.done"), dcv -> this.minecraft.setScreen(this.lastScreen)));
+        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20, new TranslatableComponent("options.skinCustomisation"), dni -> this.minecraft.setScreen(new SkinCustomizationScreen(this, this.options))));
+        this.<Button>addButton(new Button(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20, new TranslatableComponent("options.sounds"), dni -> this.minecraft.setScreen(new SoundOptionsScreen(this, this.options))));
+        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20, new TranslatableComponent("options.video"), dni -> this.minecraft.setScreen(new VideoSettingsScreen(this, this.options))));
+        this.<Button>addButton(new Button(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20, new TranslatableComponent("options.controls"), dni -> this.minecraft.setScreen(new ControlsScreen(this, this.options))));
+        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 96 - 6, 150, 20, new TranslatableComponent("options.language"), dni -> this.minecraft.setScreen(new LanguageSelectScreen(this, this.options, this.minecraft.getLanguageManager()))));
+        this.<Button>addButton(new Button(this.width / 2 + 5, this.height / 6 + 96 - 6, 150, 20, new TranslatableComponent("options.chat.title"), dni -> this.minecraft.setScreen(new ChatOptionsScreen(this, this.options))));
+        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 6 + 120 - 6, 150, 20, new TranslatableComponent("options.resourcepack"), dni -> this.minecraft.setScreen(new ResourcePackSelectScreen(this, this.minecraft.getResourcePackRepository(), this::updatePackList, this.minecraft.getResourcePackDirectory()))));
+        this.<Button>addButton(new Button(this.width / 2 + 5, this.height / 6 + 120 - 6, 150, 20, new TranslatableComponent("options.accessibility.title"), dni -> this.minecraft.setScreen(new AccessibilityOptionsScreen(this, this.options))));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 168, 200, 20, CommonComponents.GUI_DONE, dni -> this.minecraft.setScreen(this.lastScreen)));
     }
     
-    public String getDifficultyText(final Difficulty aji) {
-        return new TranslatableComponent("options.difficulty", new Object[0]).append(": ").append(aji.getDisplayName()).getColoredString();
+    private void updatePackList(final PackRepository<ResourcePack> aar) {
+        final List<String> list3 = ImmutableList.copyOf(this.options.resourcePacks);
+        this.options.resourcePacks.clear();
+        this.options.incompatibleResourcePacks.clear();
+        for (final ResourcePack eml5 : aar.getSelectedPacks()) {
+            if (!eml5.isFixedPosition()) {
+                this.options.resourcePacks.add(eml5.getId());
+                if (eml5.getCompatibility().isCompatible()) {
+                    continue;
+                }
+                this.options.incompatibleResourcePacks.add(eml5.getId());
+            }
+        }
+        this.options.save();
+        final List<String> list4 = ImmutableList.copyOf(this.options.resourcePacks);
+        if (!list4.equals(list3)) {
+            this.minecraft.reloadResourcePacks();
+        }
+    }
+    
+    private Component getDifficultyText(final Difficulty and) {
+        return new TranslatableComponent("options.difficulty").append(": ").append(and.getDisplayName());
     }
     
     private void lockCallback(final boolean boolean1) {
@@ -120,10 +147,10 @@ public class OptionsScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 15, 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 15, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/OptionsSubScreen.java b/src/net/minecraft/client/gui/screens/OptionsSubScreen.java
index 1990653..daa724b 100644
--- a/src/net/minecraft/client/gui/screens/OptionsSubScreen.java
+++ b/src/net/minecraft/client/gui/screens/OptionsSubScreen.java
@@ -7,10 +7,10 @@ public class OptionsSubScreen extends Screen {
     protected final Screen lastScreen;
     protected final Options options;
     
-    public OptionsSubScreen(final Screen dgb, final Options dbr, final Component lf) {
-        super(lf);
-        this.lastScreen = dgb;
-        this.options = dbr;
+    public OptionsSubScreen(final Screen dqs, final Options dmb, final Component mr) {
+        super(mr);
+        this.lastScreen = dqs;
+        this.options = dmb;
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/OutOfMemoryScreen.java b/src/net/minecraft/client/gui/screens/OutOfMemoryScreen.java
index 38eec06..fe478a6 100644
--- a/src/net/minecraft/client/gui/screens/OutOfMemoryScreen.java
+++ b/src/net/minecraft/client/gui/screens/OutOfMemoryScreen.java
@@ -1,7 +1,9 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
 
@@ -12,8 +14,8 @@ public class OutOfMemoryScreen extends Screen {
     
     @Override
     protected void init() {
-        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 4 + 120 + 12, 150, 20, I18n.get("gui.toTitle"), dcv -> this.minecraft.setScreen(new TitleScreen())));
-        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, this.height / 4 + 120 + 12, 150, 20, I18n.get("menu.quit"), dcv -> this.minecraft.stop()));
+        this.<Button>addButton(new Button(this.width / 2 - 155, this.height / 4 + 120 + 12, 150, 20, new TranslatableComponent("gui.toTitle"), dni -> this.minecraft.setScreen(new TitleScreen())));
+        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, this.height / 4 + 120 + 12, 150, 20, new TranslatableComponent("menu.quit"), dni -> this.minecraft.stop()));
     }
     
     @Override
@@ -22,17 +24,17 @@ public class OutOfMemoryScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, this.height / 4 - 60 + 20, 16777215);
-        this.drawString(this.font, "Minecraft has run out of memory.", this.width / 2 - 140, this.height / 4 - 60 + 60 + 0, 10526880);
-        this.drawString(this.font, "This could be caused by a bug in the game or by the", this.width / 2 - 140, this.height / 4 - 60 + 60 + 18, 10526880);
-        this.drawString(this.font, "Java Virtual Machine not being allocated enough", this.width / 2 - 140, this.height / 4 - 60 + 60 + 27, 10526880);
-        this.drawString(this.font, "memory.", this.width / 2 - 140, this.height / 4 - 60 + 60 + 36, 10526880);
-        this.drawString(this.font, "To prevent level corruption, the current game has quit.", this.width / 2 - 140, this.height / 4 - 60 + 60 + 54, 10526880);
-        this.drawString(this.font, "We've tried to free up enough memory to let you go back to", this.width / 2 - 140, this.height / 4 - 60 + 60 + 63, 10526880);
-        this.drawString(this.font, "the main menu and back to playing, but this may not have worked.", this.width / 2 - 140, this.height / 4 - 60 + 60 + 72, 10526880);
-        this.drawString(this.font, "Please restart the game if you see this message again.", this.width / 2 - 140, this.height / 4 - 60 + 60 + 81, 10526880);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, this.height / 4 - 60 + 20, 16777215);
+        this.drawString(dhl, this.font, "Minecraft has run out of memory.", this.width / 2 - 140, this.height / 4 - 60 + 60 + 0, 10526880);
+        this.drawString(dhl, this.font, "This could be caused by a bug in the game or by the", this.width / 2 - 140, this.height / 4 - 60 + 60 + 18, 10526880);
+        this.drawString(dhl, this.font, "Java Virtual Machine not being allocated enough", this.width / 2 - 140, this.height / 4 - 60 + 60 + 27, 10526880);
+        this.drawString(dhl, this.font, "memory.", this.width / 2 - 140, this.height / 4 - 60 + 60 + 36, 10526880);
+        this.drawString(dhl, this.font, "To prevent level corruption, the current game has quit.", this.width / 2 - 140, this.height / 4 - 60 + 60 + 54, 10526880);
+        this.drawString(dhl, this.font, "We've tried to free up enough memory to let you go back to", this.width / 2 - 140, this.height / 4 - 60 + 60 + 63, 10526880);
+        this.drawString(dhl, this.font, "the main menu and back to playing, but this may not have worked.", this.width / 2 - 140, this.height / 4 - 60 + 60 + 72, 10526880);
+        this.drawString(dhl, this.font, "Please restart the game if you see this message again.", this.width / 2 - 140, this.height / 4 - 60 + 60 + 81, 10526880);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/PauseScreen.java b/src/net/minecraft/client/gui/screens/PauseScreen.java
index 191693f..87f9c23 100644
--- a/src/net/minecraft/client/gui/screens/PauseScreen.java
+++ b/src/net/minecraft/client/gui/screens/PauseScreen.java
@@ -1,6 +1,8 @@
 package net.minecraft.client.gui.screens;
 
 import net.minecraft.Util;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
 import net.minecraft.realms.RealmsBridge;
@@ -8,7 +10,6 @@ import net.minecraft.SharedConstants;
 import net.minecraft.client.gui.screens.achievement.StatsScreen;
 import net.minecraft.client.gui.screens.advancements.AdvancementsScreen;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 
@@ -16,7 +17,7 @@ public class PauseScreen extends Screen {
     private final boolean showPauseMenu;
     
     public PauseScreen(final boolean boolean1) {
-        super(boolean1 ? new TranslatableComponent("menu.game", new Object[0]) : new TranslatableComponent("menu.paused", new Object[0]));
+        super(boolean1 ? new TranslatableComponent("menu.game") : new TranslatableComponent("menu.paused"));
         this.showPauseMenu = boolean1;
     }
     
@@ -30,46 +31,46 @@ public class PauseScreen extends Screen {
     private void createPauseMenu() {
         final int integer2 = -16;
         final int integer3 = 98;
-        this.<Button>addButton(new Button(this.width / 2 - 102, this.height / 4 + 24 - 16, 204, 20, I18n.get("menu.returnToGame"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 - 102, this.height / 4 + 24 - 16, 204, 20, new TranslatableComponent("menu.returnToGame"), dni -> {
             this.minecraft.setScreen(null);
             this.minecraft.mouseHandler.grabMouse();
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 - 102, this.height / 4 + 48 - 16, 98, 20, I18n.get("gui.advancements"), dcv -> this.minecraft.setScreen(new AdvancementsScreen(this.minecraft.player.connection.getAdvancements()))));
-        this.<Button>addButton(new Button(this.width / 2 + 4, this.height / 4 + 48 - 16, 98, 20, I18n.get("gui.stats"), dcv -> this.minecraft.setScreen(new StatsScreen(this, this.minecraft.player.getStats()))));
+        this.<Button>addButton(new Button(this.width / 2 - 102, this.height / 4 + 48 - 16, 98, 20, new TranslatableComponent("gui.advancements"), dni -> this.minecraft.setScreen(new AdvancementsScreen(this.minecraft.player.connection.getAdvancements()))));
+        this.<Button>addButton(new Button(this.width / 2 + 4, this.height / 4 + 48 - 16, 98, 20, new TranslatableComponent("gui.stats"), dni -> this.minecraft.setScreen(new StatsScreen(this, this.minecraft.player.getStats()))));
         final String string4 = SharedConstants.getCurrentVersion().isStable() ? "https://aka.ms/javafeedback?ref=game" : "https://aka.ms/snapshotfeedback?ref=game";
         final String string5;
-        this.<Button>addButton(new Button(this.width / 2 - 102, this.height / 4 + 72 - 16, 98, 20, I18n.get("menu.sendFeedback"), dcv -> this.minecraft.setScreen(new ConfirmLinkScreen(boolean2 -> {
+        this.<Button>addButton(new Button(this.width / 2 - 102, this.height / 4 + 72 - 16, 98, 20, new TranslatableComponent("menu.sendFeedback"), dni -> this.minecraft.setScreen(new ConfirmLinkScreen(boolean2 -> {
             if (boolean2) {
                 Util.getPlatform().openUri(string5);
             }
             this.minecraft.setScreen(this);
         }, string5, true))));
-        this.<Button>addButton(new Button(this.width / 2 + 4, this.height / 4 + 72 - 16, 98, 20, I18n.get("menu.reportBugs"), dcv -> this.minecraft.setScreen(new ConfirmLinkScreen(boolean1 -> {
+        this.<Button>addButton(new Button(this.width / 2 + 4, this.height / 4 + 72 - 16, 98, 20, new TranslatableComponent("menu.reportBugs"), dni -> this.minecraft.setScreen(new ConfirmLinkScreen(boolean1 -> {
             if (boolean1) {
                 Util.getPlatform().openUri("https://aka.ms/snapshotbugs?ref=game");
             }
             this.minecraft.setScreen(this);
         }, "https://aka.ms/snapshotbugs?ref=game", true))));
-        this.<Button>addButton(new Button(this.width / 2 - 102, this.height / 4 + 96 - 16, 98, 20, I18n.get("menu.options"), dcv -> this.minecraft.setScreen(new OptionsScreen(this, this.minecraft.options))));
-        final Button dcv2 = this.<Button>addButton(new Button(this.width / 2 + 4, this.height / 4 + 96 - 16, 98, 20, I18n.get("menu.shareToLan"), dcv -> this.minecraft.setScreen(new ShareToLanScreen(this))));
-        dcv2.active = (this.minecraft.hasSingleplayerServer() && !this.minecraft.getSingleplayerServer().isPublished());
+        this.<Button>addButton(new Button(this.width / 2 - 102, this.height / 4 + 96 - 16, 98, 20, new TranslatableComponent("menu.options"), dni -> this.minecraft.setScreen(new OptionsScreen(this, this.minecraft.options))));
+        final Button dni2 = this.<Button>addButton(new Button(this.width / 2 + 4, this.height / 4 + 96 - 16, 98, 20, new TranslatableComponent("menu.shareToLan"), dni -> this.minecraft.setScreen(new ShareToLanScreen(this))));
+        dni2.active = (this.minecraft.hasSingleplayerServer() && !this.minecraft.getSingleplayerServer().isPublished());
         final boolean boolean3;
         final boolean boolean4;
         Minecraft minecraft;
-        final GenericDirtMessageScreen dgb;
-        RealmsBridge realmsBridge5;
+        final GenericDirtMessageScreen dqs;
+        RealmsBridge eqd5;
         Minecraft minecraft2;
         final JoinMultiplayerScreen screen;
-        final Button dcv3 = this.<Button>addButton(new Button(this.width / 2 - 102, this.height / 4 + 120 - 16, 204, 20, I18n.get("menu.returnToMenu"), dcv -> {
+        final Button dni3 = this.<Button>addButton(new Button(this.width / 2 - 102, this.height / 4 + 120 - 16, 204, 20, new TranslatableComponent("menu.returnToMenu"), dni -> {
             boolean3 = this.minecraft.isLocalServer();
             boolean4 = this.minecraft.isConnectedToRealms();
-            dcv.active = false;
+            dni.active = false;
             this.minecraft.level.disconnect();
             if (boolean3) {
                 minecraft = this.minecraft;
-                new GenericDirtMessageScreen(new TranslatableComponent("menu.savingLevel", new Object[0]));
-                minecraft.clearLevel(dgb);
+                new GenericDirtMessageScreen(new TranslatableComponent("menu.savingLevel"));
+                minecraft.clearLevel(dqs);
             }
             else {
                 this.minecraft.clearLevel();
@@ -78,8 +79,8 @@ public class PauseScreen extends Screen {
                 this.minecraft.setScreen(new TitleScreen());
             }
             else if (boolean4) {
-                realmsBridge5 = new RealmsBridge();
-                realmsBridge5.switchToRealms(new TitleScreen());
+                eqd5 = new RealmsBridge();
+                eqd5.switchToRealms(new TitleScreen());
             }
             else {
                 minecraft2 = this.minecraft;
@@ -89,7 +90,7 @@ public class PauseScreen extends Screen {
             return;
         }));
         if (!this.minecraft.isLocalServer()) {
-            dcv3.setMessage(I18n.get("menu.disconnect"));
+            dni3.setMessage(new TranslatableComponent("menu.disconnect"));
         }
     }
     
@@ -99,14 +100,14 @@ public class PauseScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (this.showPauseMenu) {
-            this.renderBackground();
-            this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 40, 16777215);
+            this.renderBackground(dhl);
+            this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 40, 16777215);
         }
         else {
-            this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 10, 16777215);
+            this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 10, 16777215);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/PopupScreen.java b/src/net/minecraft/client/gui/screens/PopupScreen.java
new file mode 100644
index 0000000..10b4ef2
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/PopupScreen.java
@@ -0,0 +1,88 @@
+package net.minecraft.client.gui.screens;
+
+import java.util.Iterator;
+import net.minecraft.client.gui.Font;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.google.common.collect.UnmodifiableIterator;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.network.chat.FormattedText;
+
+public class PopupScreen extends Screen {
+    private final FormattedText message;
+    private final ImmutableList<ButtonOption> buttonOptions;
+    private List<FormattedText> messageLines;
+    private int contentTop;
+    private int buttonWidth;
+    
+    protected PopupScreen(final Component mr, final List<FormattedText> list, final ImmutableList<ButtonOption> immutableList) {
+        super(mr);
+        this.message = FormattedText.composite(list);
+        this.buttonOptions = immutableList;
+    }
+    
+    @Override
+    public String getNarrationMessage() {
+        return super.getNarrationMessage() + ". " + this.message.getString();
+    }
+    
+    @Override
+    public void init(final Minecraft dlx, final int integer2, final int integer3) {
+        super.init(dlx, integer2, integer3);
+        for (final ButtonOption a6 : this.buttonOptions) {
+            this.buttonWidth = Math.max(this.buttonWidth, 20 + this.font.width(a6.message) + 20);
+        }
+        final int integer4 = 5 + this.buttonWidth + 5;
+        final int integer5 = integer4 * this.buttonOptions.size();
+        this.messageLines = this.font.split(this.message, integer5);
+        final int size = this.messageLines.size();
+        this.font.getClass();
+        final int integer6 = size * 9;
+        this.contentTop = (int)(integer3 / 2.0 - integer6 / 2.0);
+        final int n = this.contentTop + integer6;
+        this.font.getClass();
+        final int integer7 = n + 9 * 2;
+        int integer8 = (int)(integer2 / 2.0 - integer5 / 2.0);
+        for (final ButtonOption a7 : this.buttonOptions) {
+            this.<Button>addButton(new Button(integer8, integer7, this.buttonWidth, 20, a7.message, a7.onPress));
+            integer8 += integer4;
+        }
+    }
+    
+    @Override
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderDirtBackground(0);
+        final Font font = this.font;
+        final Component title = this.title;
+        final int integer5 = this.width / 2;
+        final int contentTop = this.contentTop;
+        this.font.getClass();
+        this.drawCenteredString(dhl, font, title, integer5, contentTop - 9 * 2, -1);
+        int integer4 = this.contentTop;
+        for (final FormattedText mu8 : this.messageLines) {
+            this.drawCenteredString(dhl, this.font, mu8, this.width / 2, integer4, -1);
+            final int n = integer4;
+            this.font.getClass();
+            integer4 = n + 9;
+        }
+        super.render(dhl, integer2, integer3, float4);
+    }
+    
+    @Override
+    public boolean shouldCloseOnEsc() {
+        return false;
+    }
+    
+    public static final class ButtonOption {
+        private final Component message;
+        private final Button.OnPress onPress;
+        
+        public ButtonOption(final Component mr, final Button.OnPress a) {
+            this.message = mr;
+            this.onPress = a;
+        }
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/PresetFlatWorldScreen.java b/src/net/minecraft/client/gui/screens/PresetFlatWorldScreen.java
index a2495cb..578463a 100644
--- a/src/net/minecraft/client/gui/screens/PresetFlatWorldScreen.java
+++ b/src/net/minecraft/client/gui/screens/PresetFlatWorldScreen.java
@@ -5,61 +5,172 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Item;
 import net.minecraft.client.gui.components.AbstractSelectionList;
 import net.minecraft.client.gui.chat.NarratorChatListener;
-import javax.annotation.Nullable;
 import net.minecraft.client.gui.components.ObjectSelectionList;
-import java.util.Collections;
 import net.minecraft.world.item.Items;
 import java.util.Arrays;
-import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.block.Blocks;
-import com.google.common.collect.Lists;
-import java.util.Iterator;
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration;
 import java.util.Map;
+import net.minecraft.world.level.levelgen.feature.configurations.StrongholdConfiguration;
+import java.util.Optional;
+import net.minecraft.world.level.levelgen.StructureSettings;
 import com.google.common.collect.Maps;
-import net.minecraft.world.level.chunk.ChunkGeneratorType;
-import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
-import net.minecraft.world.level.levelgen.flat.FlatLayerInfo;
-import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.network.chat.FormattedText;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.language.I18n;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.CommonComponents;
+import java.util.Iterator;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.Biomes;
+import com.google.common.base.Splitter;
+import java.util.Collections;
+import com.google.common.collect.Lists;
+import javax.annotation.Nullable;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.levelgen.flat.FlatLayerInfo;
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.Component;
 import java.util.List;
+import org.apache.logging.log4j.Logger;
 
 public class PresetFlatWorldScreen extends Screen {
+    private static final Logger LOGGER;
     private static final List<PresetInfo> PRESETS;
     private final CreateFlatWorldScreen parent;
-    private String shareText;
-    private String listText;
+    private Component shareText;
+    private Component listText;
     private PresetsList list;
     private Button selectButton;
     private EditBox export;
+    private FlatLevelGeneratorSettings settings;
     
-    public PresetFlatWorldScreen(final CreateFlatWorldScreen dff) {
-        super(new TranslatableComponent("createWorld.customize.presets.title", new Object[0]));
-        this.parent = dff;
+    public PresetFlatWorldScreen(final CreateFlatWorldScreen dps) {
+        super(new TranslatableComponent("createWorld.customize.presets.title"));
+        this.parent = dps;
+    }
+    
+    @Nullable
+    private static FlatLayerInfo getLayerInfoFromString(final String string, final int integer) {
+        final String[] arr3 = string.split("\\*", 2);
+        int integer2 = 0;
+        Label_0049: {
+            if (arr3.length == 2) {
+                try {
+                    integer2 = Math.max(Integer.parseInt(arr3[0]), 0);
+                    break Label_0049;
+                }
+                catch (NumberFormatException numberFormatException5) {
+                    PresetFlatWorldScreen.LOGGER.error("Error while parsing flat world string => {}", numberFormatException5.getMessage());
+                    return null;
+                }
+            }
+            integer2 = 1;
+        }
+        final int integer3 = Math.min(integer + integer2, 256);
+        final int integer4 = integer3 - integer;
+        final String string2 = arr3[arr3.length - 1];
+        Block bvr7;
+        try {
+            bvr7 = Registry.BLOCK.getOptional(new ResourceLocation(string2)).orElse(null);
+        }
+        catch (Exception exception9) {
+            PresetFlatWorldScreen.LOGGER.error("Error while parsing flat world string => {}", exception9.getMessage());
+            return null;
+        }
+        if (bvr7 == null) {
+            PresetFlatWorldScreen.LOGGER.error("Error while parsing flat world string => Unknown block, {}", string2);
+            return null;
+        }
+        final FlatLayerInfo cqz9 = new FlatLayerInfo(integer4, bvr7);
+        cqz9.setStart(integer);
+        return cqz9;
+    }
+    
+    private static List<FlatLayerInfo> getLayersInfoFromString(final String string) {
+        final List<FlatLayerInfo> list2 = Lists.newArrayList();
+        final String[] arr3 = string.split(",");
+        int integer4 = 0;
+        for (final String string2 : arr3) {
+            final FlatLayerInfo cqz9 = getLayerInfoFromString(string2, integer4);
+            if (cqz9 == null) {
+                return Collections.<FlatLayerInfo>emptyList();
+            }
+            list2.add(cqz9);
+            integer4 += cqz9.getHeight();
+        }
+        return list2;
+    }
+    
+    public static FlatLevelGeneratorSettings fromString(final String string, final FlatLevelGeneratorSettings cra) {
+        final Iterator<String> iterator3 = Splitter.on(';').split(string).iterator();
+        if (!iterator3.hasNext()) {
+            return FlatLevelGeneratorSettings.getDefault();
+        }
+        final List<FlatLayerInfo> list4 = getLayersInfoFromString(iterator3.next());
+        if (list4.isEmpty()) {
+            return FlatLevelGeneratorSettings.getDefault();
+        }
+        final FlatLevelGeneratorSettings cra2 = cra.withLayers(list4, cra.structureSettings());
+        Biome bre6 = Biomes.PLAINS;
+        if (iterator3.hasNext()) {
+            try {
+                final ResourceLocation uh7 = new ResourceLocation(iterator3.next());
+                final Object o;
+                final Object obj;
+                bre6 = Registry.BIOME.getOptional(uh7).<Throwable>orElseThrow(() -> {
+                    new IllegalArgumentException("Invalid Biome: " + obj);
+                    return o;
+                });
+            }
+            catch (Exception exception7) {
+                PresetFlatWorldScreen.LOGGER.error("Error while parsing flat world string => {}", exception7.getMessage());
+            }
+        }
+        cra2.setBiome(bre6);
+        return cra2;
+    }
+    
+    private static String save(final FlatLevelGeneratorSettings cra) {
+        final StringBuilder stringBuilder2 = new StringBuilder();
+        for (int integer3 = 0; integer3 < cra.getLayersInfo().size(); ++integer3) {
+            if (integer3 > 0) {
+                stringBuilder2.append(",");
+            }
+            stringBuilder2.append(cra.getLayersInfo().get(integer3));
+        }
+        stringBuilder2.append(";");
+        stringBuilder2.append(Registry.BIOME.getKey(cra.getBiome()));
+        return stringBuilder2.toString();
     }
     
     @Override
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        this.shareText = I18n.get("createWorld.customize.presets.share");
-        this.listText = I18n.get("createWorld.customize.presets.list");
+        this.shareText = new TranslatableComponent("createWorld.customize.presets.share");
+        this.listText = new TranslatableComponent("createWorld.customize.presets.list");
         (this.export = new EditBox(this.font, 50, 40, this.width - 100, 20, this.shareText)).setMaxLength(1230);
-        this.export.setValue(this.parent.saveLayerString());
+        this.export.setValue(save(this.parent.settings()));
+        this.settings = this.parent.settings();
         this.children.add(this.export);
         this.list = new PresetsList();
         this.children.add(this.list);
-        this.selectButton = this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 28, 150, 20, I18n.get("createWorld.customize.presets.select"), dcv -> {
-            this.parent.loadLayers(this.export.getValue());
+        final FlatLevelGeneratorSettings cra3;
+        this.selectButton = this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 28, 150, 20, new TranslatableComponent("createWorld.customize.presets.select"), dni -> {
+            cra3 = fromString(this.export.getValue(), this.settings);
+            this.parent.setConfig(cra3);
             this.minecraft.setScreen(this.parent);
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 28, 150, 20, I18n.get("gui.cancel"), dcv -> this.minecraft.setScreen(this.parent)));
+        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 28, 150, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(this.parent)));
         this.updateButtonValidity(this.list.getSelected() != null);
     }
     
@@ -69,9 +180,9 @@ public class PresetFlatWorldScreen extends Screen {
     }
     
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
         final String string5 = this.export.getValue();
-        this.init(dbn, integer2, integer3);
+        this.init(dlx, integer2, integer3);
         this.export.setValue(string5);
     }
     
@@ -86,17 +197,17 @@ public class PresetFlatWorldScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.list.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.list.render(dhl, integer2, integer3, float4);
         RenderSystem.pushMatrix();
         RenderSystem.translatef(0.0f, 0.0f, 400.0f);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 8, 16777215);
-        this.drawString(this.font, this.shareText, 50, 30, 10526880);
-        this.drawString(this.font, this.listText, 50, 70, 10526880);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 8, 16777215);
+        this.drawString(dhl, this.font, this.shareText, 50, 30, 10526880);
+        this.drawString(dhl, this.font, this.listText, 50, 70, 10526880);
         RenderSystem.popMatrix();
-        this.export.render(integer1, integer2, float3);
-        super.render(integer1, integer2, float3);
+        this.export.render(dhl, integer2, integer3, float4);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Override
@@ -109,30 +220,39 @@ public class PresetFlatWorldScreen extends Screen {
         this.selectButton.active = (boolean1 || this.export.getValue().length() > 1);
     }
     
-    private static void preset(final String string, final ItemLike bjv, final Biome bkt, final List<String> list, final FlatLayerInfo... arr) {
-        final FlatLevelGeneratorSettings ciy6 = ChunkGeneratorType.FLAT.createSettings();
-        for (int integer7 = arr.length - 1; integer7 >= 0; --integer7) {
-            ciy6.getLayersInfo().add(arr[integer7]);
+    private static void preset(final Component mr, final ItemLike bqa, final Biome bre, final List<StructureFeature<?>> list, final boolean boolean5, final boolean boolean6, final boolean boolean7, final FlatLayerInfo... arr) {
+        final Map<StructureFeature<?>, StructureFeatureConfiguration> map9 = Maps.newHashMap();
+        for (final StructureFeature<?> cml11 : list) {
+            map9.put(cml11, StructureSettings.DEFAULTS.get(cml11));
         }
-        ciy6.setBiome(bkt);
-        ciy6.updateLayers();
-        for (final String string2 : list) {
-            ciy6.getStructuresOptions().put(string2, Maps.newHashMap());
+        final StructureSettings ciw10 = new StructureSettings(boolean5 ? Optional.<StrongholdConfiguration>of(StructureSettings.DEFAULT_STRONGHOLD) : Optional.<StrongholdConfiguration>empty(), map9);
+        final FlatLevelGeneratorSettings cra11 = new FlatLevelGeneratorSettings(ciw10);
+        if (boolean6) {
+            cra11.setDecoration();
         }
-        PresetFlatWorldScreen.PRESETS.add(new PresetInfo(bjv.asItem(), string, ciy6.toString()));
+        if (boolean7) {
+            cra11.setAddLakes();
+        }
+        for (int integer12 = arr.length - 1; integer12 >= 0; --integer12) {
+            cra11.getLayersInfo().add(arr[integer12]);
+        }
+        cra11.setBiome(bre);
+        cra11.updateLayers();
+        PresetFlatWorldScreen.PRESETS.add(new PresetInfo(bqa.asItem(), mr, cra11.withStructureSettings(ciw10)));
     }
     
     static {
+        LOGGER = LogManager.getLogger();
         PRESETS = Lists.newArrayList();
-        preset(I18n.get("createWorld.customize.preset.classic_flat"), Blocks.GRASS_BLOCK, Biomes.PLAINS, Arrays.<String>asList("village"), new FlatLayerInfo(1, Blocks.GRASS_BLOCK), new FlatLayerInfo(2, Blocks.DIRT), new FlatLayerInfo(1, Blocks.BEDROCK));
-        preset(I18n.get("createWorld.customize.preset.tunnelers_dream"), Blocks.STONE, Biomes.MOUNTAINS, Arrays.<String>asList("biome_1", "dungeon", "decoration", "stronghold", "mineshaft"), new FlatLayerInfo(1, Blocks.GRASS_BLOCK), new FlatLayerInfo(5, Blocks.DIRT), new FlatLayerInfo(230, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
-        preset(I18n.get("createWorld.customize.preset.water_world"), Items.WATER_BUCKET, Biomes.DEEP_OCEAN, Arrays.<String>asList("biome_1", "oceanmonument"), new FlatLayerInfo(90, Blocks.WATER), new FlatLayerInfo(5, Blocks.SAND), new FlatLayerInfo(5, Blocks.DIRT), new FlatLayerInfo(5, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
-        preset(I18n.get("createWorld.customize.preset.overworld"), Blocks.GRASS, Biomes.PLAINS, Arrays.<String>asList("village", "biome_1", "decoration", "stronghold", "mineshaft", "dungeon", "lake", "lava_lake", "pillager_outpost"), new FlatLayerInfo(1, Blocks.GRASS_BLOCK), new FlatLayerInfo(3, Blocks.DIRT), new FlatLayerInfo(59, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
-        preset(I18n.get("createWorld.customize.preset.snowy_kingdom"), Blocks.SNOW, Biomes.SNOWY_TUNDRA, Arrays.<String>asList("village", "biome_1"), new FlatLayerInfo(1, Blocks.SNOW), new FlatLayerInfo(1, Blocks.GRASS_BLOCK), new FlatLayerInfo(3, Blocks.DIRT), new FlatLayerInfo(59, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
-        preset(I18n.get("createWorld.customize.preset.bottomless_pit"), Items.FEATHER, Biomes.PLAINS, Arrays.<String>asList("village", "biome_1"), new FlatLayerInfo(1, Blocks.GRASS_BLOCK), new FlatLayerInfo(3, Blocks.DIRT), new FlatLayerInfo(2, Blocks.COBBLESTONE));
-        preset(I18n.get("createWorld.customize.preset.desert"), Blocks.SAND, Biomes.DESERT, Arrays.<String>asList("village", "biome_1", "decoration", "stronghold", "mineshaft", "dungeon"), new FlatLayerInfo(8, Blocks.SAND), new FlatLayerInfo(52, Blocks.SANDSTONE), new FlatLayerInfo(3, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
-        preset(I18n.get("createWorld.customize.preset.redstone_ready"), Items.REDSTONE, Biomes.DESERT, Collections.<String>emptyList(), new FlatLayerInfo(52, Blocks.SANDSTONE), new FlatLayerInfo(3, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
-        preset(I18n.get("createWorld.customize.preset.the_void"), Blocks.BARRIER, Biomes.THE_VOID, Arrays.<String>asList("decoration"), new FlatLayerInfo(1, Blocks.AIR));
+        preset(new TranslatableComponent("createWorld.customize.preset.classic_flat"), Blocks.GRASS_BLOCK, Biomes.PLAINS, Arrays.<StructureFeature<?>>asList(StructureFeature.VILLAGE), false, false, false, new FlatLayerInfo(1, Blocks.GRASS_BLOCK), new FlatLayerInfo(2, Blocks.DIRT), new FlatLayerInfo(1, Blocks.BEDROCK));
+        preset(new TranslatableComponent("createWorld.customize.preset.tunnelers_dream"), Blocks.STONE, Biomes.MOUNTAINS, Arrays.<StructureFeature<?>>asList(StructureFeature.MINESHAFT), true, true, false, new FlatLayerInfo(1, Blocks.GRASS_BLOCK), new FlatLayerInfo(5, Blocks.DIRT), new FlatLayerInfo(230, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
+        preset(new TranslatableComponent("createWorld.customize.preset.water_world"), Items.WATER_BUCKET, Biomes.DEEP_OCEAN, Arrays.<StructureFeature<?>>asList(StructureFeature.OCEAN_RUIN, StructureFeature.SHIPWRECK, StructureFeature.OCEAN_MONUMENT), false, false, false, new FlatLayerInfo(90, Blocks.WATER), new FlatLayerInfo(5, Blocks.SAND), new FlatLayerInfo(5, Blocks.DIRT), new FlatLayerInfo(5, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
+        preset(new TranslatableComponent("createWorld.customize.preset.overworld"), Blocks.GRASS, Biomes.PLAINS, Arrays.<StructureFeature<?>>asList(StructureFeature.VILLAGE, StructureFeature.MINESHAFT, StructureFeature.PILLAGER_OUTPOST, StructureFeature.RUINED_PORTAL), true, true, true, new FlatLayerInfo(1, Blocks.GRASS_BLOCK), new FlatLayerInfo(3, Blocks.DIRT), new FlatLayerInfo(59, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
+        preset(new TranslatableComponent("createWorld.customize.preset.snowy_kingdom"), Blocks.SNOW, Biomes.SNOWY_TUNDRA, Arrays.<StructureFeature<?>>asList(StructureFeature.VILLAGE, StructureFeature.IGLOO), false, false, false, new FlatLayerInfo(1, Blocks.SNOW), new FlatLayerInfo(1, Blocks.GRASS_BLOCK), new FlatLayerInfo(3, Blocks.DIRT), new FlatLayerInfo(59, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
+        preset(new TranslatableComponent("createWorld.customize.preset.bottomless_pit"), Items.FEATHER, Biomes.PLAINS, Arrays.<StructureFeature<?>>asList(StructureFeature.VILLAGE), false, false, false, new FlatLayerInfo(1, Blocks.GRASS_BLOCK), new FlatLayerInfo(3, Blocks.DIRT), new FlatLayerInfo(2, Blocks.COBBLESTONE));
+        preset(new TranslatableComponent("createWorld.customize.preset.desert"), Blocks.SAND, Biomes.DESERT, Arrays.<StructureFeature<?>>asList(StructureFeature.VILLAGE, StructureFeature.DESERT_PYRAMID, StructureFeature.MINESHAFT), true, true, false, new FlatLayerInfo(8, Blocks.SAND), new FlatLayerInfo(52, Blocks.SANDSTONE), new FlatLayerInfo(3, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
+        preset(new TranslatableComponent("createWorld.customize.preset.redstone_ready"), Items.REDSTONE, Biomes.DESERT, Collections.<StructureFeature<?>>emptyList(), false, false, false, new FlatLayerInfo(52, Blocks.SANDSTONE), new FlatLayerInfo(3, Blocks.STONE), new FlatLayerInfo(1, Blocks.BEDROCK));
+        preset(new TranslatableComponent("createWorld.customize.preset.the_void"), Blocks.BARRIER, Biomes.THE_VOID, Collections.<StructureFeature<?>>emptyList(), false, true, false, new FlatLayerInfo(1, Blocks.AIR));
     }
     
     class PresetsList extends ObjectSelectionList<Entry> {
@@ -147,14 +267,9 @@ public class PresetFlatWorldScreen extends Screen {
         public void setSelected(@Nullable final Entry a) {
             super.setSelected(a);
             if (a != null) {
-                NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.select", new Object[] { PresetFlatWorldScreen.PRESETS.get(this.children().indexOf(a)).name }).getString());
+                NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.select", new Object[] { PresetFlatWorldScreen.PRESETS.get(this.children().indexOf(a)).getName() }).getString());
             }
-        }
-        
-        @Override
-        protected void moveSelection(final int integer) {
-            super.moveSelection(integer);
-            PresetFlatWorldScreen.this.updateButtonValidity(true);
+            PresetFlatWorldScreen.this.updateButtonValidity(a != null);
         }
         
         @Override
@@ -175,10 +290,10 @@ public class PresetFlatWorldScreen extends Screen {
         
         public class Entry extends ObjectSelectionList.Entry<Entry> {
             @Override
-            public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-                final PresetInfo a11 = PresetFlatWorldScreen.PRESETS.get(integer1);
-                this.blitSlot(integer3, integer2, a11.icon);
-                PresetFlatWorldScreen.this.font.draw(a11.name, (float)(integer3 + 18 + 5), (float)(integer2 + 6), 16777215);
+            public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+                final PresetInfo a12 = PresetFlatWorldScreen.PRESETS.get(integer2);
+                this.blitSlot(dhl, integer4, integer3, a12.icon);
+                PresetFlatWorldScreen.this.font.draw(dhl, a12.name, (float)(integer4 + 18 + 5), (float)(integer3 + 6), 16777215);
             }
             
             @Override
@@ -191,35 +306,40 @@ public class PresetFlatWorldScreen extends Screen {
             
             private void select() {
                 PresetsList.this.setSelected(this);
-                PresetFlatWorldScreen.this.updateButtonValidity(true);
-                PresetFlatWorldScreen.this.export.setValue(PresetFlatWorldScreen.PRESETS.get(PresetsList.this.children().indexOf(this)).value);
+                final PresetInfo a2 = PresetFlatWorldScreen.PRESETS.get(PresetsList.this.children().indexOf(this));
+                PresetFlatWorldScreen.this.export.setValue(save(a2.settings));
                 PresetFlatWorldScreen.this.export.moveCursorToStart();
+                PresetFlatWorldScreen.this.settings = a2.settings;
             }
             
-            private void blitSlot(final int integer1, final int integer2, final Item bei) {
-                this.blitSlotBg(integer1 + 1, integer2 + 1);
+            private void blitSlot(final PoseStack dhl, final int integer2, final int integer3, final Item bke) {
+                this.blitSlotBg(dhl, integer2 + 1, integer3 + 1);
                 RenderSystem.enableRescaleNormal();
-                PresetFlatWorldScreen.this.itemRenderer.renderGuiItem(new ItemStack(bei), integer1 + 2, integer2 + 2);
+                PresetFlatWorldScreen.this.itemRenderer.renderGuiItem(new ItemStack(bke), integer2 + 2, integer3 + 2);
                 RenderSystem.disableRescaleNormal();
             }
             
-            private void blitSlotBg(final int integer1, final int integer2) {
+            private void blitSlotBg(final PoseStack dhl, final int integer2, final int integer3) {
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
                 PresetsList.this.minecraft.getTextureManager().bind(GuiComponent.STATS_ICON_LOCATION);
-                GuiComponent.blit(integer1, integer2, PresetFlatWorldScreen.this.getBlitOffset(), 0.0f, 0.0f, 18, 18, 128, 128);
+                GuiComponent.blit(dhl, integer2, integer3, PresetFlatWorldScreen.this.getBlitOffset(), 0.0f, 0.0f, 18, 18, 128, 128);
             }
         }
     }
     
     static class PresetInfo {
         public final Item icon;
-        public final String name;
-        public final String value;
+        public final Component name;
+        public final FlatLevelGeneratorSettings settings;
         
-        public PresetInfo(final Item bei, final String string2, final String string3) {
-            this.icon = bei;
-            this.name = string2;
-            this.value = string3;
+        public PresetInfo(final Item bke, final Component mr, final FlatLevelGeneratorSettings cra) {
+            this.icon = bke;
+            this.name = mr;
+            this.settings = cra;
+        }
+        
+        public Component getName() {
+            return this.name;
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/ProgressScreen.java b/src/net/minecraft/client/gui/screens/ProgressScreen.java
index b04f493..2a3a3ac 100644
--- a/src/net/minecraft/client/gui/screens/ProgressScreen.java
+++ b/src/net/minecraft/client/gui/screens/ProgressScreen.java
@@ -1,21 +1,24 @@
 package net.minecraft.client.gui.screens;
 
-import java.util.Objects;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.network.chat.Component;
 import net.minecraft.client.gui.chat.NarratorChatListener;
+import javax.annotation.Nullable;
+import net.minecraft.network.chat.Component;
 import net.minecraft.util.ProgressListener;
 
 public class ProgressScreen extends Screen implements ProgressListener {
-    private String title;
-    private String stage;
+    @Nullable
+    private Component header;
+    @Nullable
+    private Component stage;
     private int progress;
     private boolean stop;
     
     public ProgressScreen() {
         super(NarratorChatListener.NO_TITLE);
-        this.title = "";
-        this.stage = "";
     }
     
     @Override
@@ -24,19 +27,19 @@ public class ProgressScreen extends Screen implements ProgressListener {
     }
     
     @Override
-    public void progressStartNoAbort(final Component lf) {
-        this.progressStart(lf);
+    public void progressStartNoAbort(final Component mr) {
+        this.progressStart(mr);
     }
     
     @Override
-    public void progressStart(final Component lf) {
-        this.title = lf.getColoredString();
-        this.progressStage(new TranslatableComponent("progress.working", new Object[0]));
+    public void progressStart(final Component mr) {
+        this.header = mr;
+        this.progressStage(new TranslatableComponent("progress.working"));
     }
     
     @Override
-    public void progressStage(final Component lf) {
-        this.stage = lf.getColoredString();
+    public void progressStage(final Component mr) {
+        this.stage = mr;
         this.progressStagePercentage(0);
     }
     
@@ -51,18 +54,20 @@ public class ProgressScreen extends Screen implements ProgressListener {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (this.stop) {
             if (!this.minecraft.isConnectedToRealms()) {
                 this.minecraft.setScreen(null);
             }
             return;
         }
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title, this.width / 2, 70, 16777215);
-        if (!Objects.equals(this.stage, "") && this.progress != 0) {
-            this.drawCenteredString(this.font, this.stage + " " + this.progress + "%", this.width / 2, 90, 16777215);
+        this.renderBackground(dhl);
+        if (this.header != null) {
+            this.drawCenteredString(dhl, this.font, this.header, this.width / 2, 70, 16777215);
         }
-        super.render(integer1, integer2, float3);
+        if (this.stage != null && this.progress != 0) {
+            this.drawCenteredString(dhl, this.font, new TextComponent("").append(this.stage).append(" " + this.progress + "%"), this.width / 2, 90, 16777215);
+        }
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/ReceivingLevelScreen.java b/src/net/minecraft/client/gui/screens/ReceivingLevelScreen.java
index ed69547..e322ca1 100644
--- a/src/net/minecraft/client/gui/screens/ReceivingLevelScreen.java
+++ b/src/net/minecraft/client/gui/screens/ReceivingLevelScreen.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.gui.screens;
 
 import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 
 public class ReceivingLevelScreen extends Screen {
@@ -14,10 +15,10 @@ public class ReceivingLevelScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.renderDirtBackground(0);
-        this.drawCenteredString(this.font, I18n.get("multiplayer.downloadingTerrain"), this.width / 2, this.height / 2 - 50, 16777215);
-        super.render(integer1, integer2, float3);
+        this.drawCenteredString(dhl, this.font, I18n.get("multiplayer.downloadingTerrain"), this.width / 2, this.height / 2 - 50, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/ResourcePackSelectScreen.java b/src/net/minecraft/client/gui/screens/ResourcePackSelectScreen.java
new file mode 100644
index 0000000..b03ade0
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/ResourcePackSelectScreen.java
@@ -0,0 +1,16 @@
+package net.minecraft.client.gui.screens;
+
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.client.gui.screens.packs.PackSelectionModel;
+import net.minecraft.network.chat.TranslatableComponent;
+import java.io.File;
+import java.util.function.Consumer;
+import net.minecraft.client.resources.ResourcePack;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.client.gui.screens.packs.PackSelectionScreen;
+
+public class ResourcePackSelectScreen extends PackSelectionScreen {
+    public ResourcePackSelectScreen(final Screen dqs, final PackRepository<ResourcePack> aar, final Consumer<PackRepository<ResourcePack>> consumer, final File file) {
+        super(dqs, new TranslatableComponent("resourcePack.title"), runnable -> new PackSelectionModel<>(runnable, ResourcePack::bindIcon, (PackRepository<Pack>)aar, (Consumer<PackRepository<Pack>>)consumer), file);
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/Screen.java b/src/net/minecraft/client/gui/screens/Screen.java
index 63d9aa4..9407b6f 100644
--- a/src/net/minecraft/client/gui/screens/Screen.java
+++ b/src/net/minecraft/client/gui/screens/Screen.java
@@ -2,34 +2,33 @@ package net.minecraft.client.gui.screens;
 
 import com.google.common.collect.Sets;
 import org.apache.logging.log4j.LogManager;
+import java.nio.file.Path;
 import net.minecraft.CrashReportCategory;
 import net.minecraft.ReportedException;
 import net.minecraft.CrashReport;
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.Util;
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import java.io.File;
 import java.util.Locale;
 import java.net.URISyntaxException;
 import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.nbt.Tag;
-import com.google.gson.JsonSyntaxException;
-import net.minecraft.ChatFormatting;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.TagParser;
 import net.minecraft.network.chat.HoverEvent;
+import net.minecraft.network.chat.Style;
 import com.mojang.math.Matrix4f;
-import net.minecraft.client.renderer.MultiBufferSource;
-import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.systems.RenderSystem;
-import java.util.Arrays;
+import com.mojang.blaze3d.vertex.BufferBuilder;
 import java.util.Iterator;
+import net.minecraft.client.renderer.MultiBufferSource;
+import com.mojang.blaze3d.vertex.BufferUploader;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.gui.GuiComponent;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.Tesselator;
+import java.util.Arrays;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.world.item.ItemStack;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.collect.Lists;
 import java.net.URI;
 import net.minecraft.client.gui.Font;
@@ -43,9 +42,10 @@ import net.minecraft.network.chat.Component;
 import java.util.Set;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.TickableWidget;
 import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
 
-public abstract class Screen extends AbstractContainerEventHandler implements Widget {
+public abstract class Screen extends AbstractContainerEventHandler implements TickableWidget, Widget {
     private static final Logger LOGGER;
     private static final Set<String> ALLOWED_PROTOCOLS;
     protected final Component title;
@@ -60,10 +60,10 @@ public abstract class Screen extends AbstractContainerEventHandler implements Wi
     protected Font font;
     private URI clickedLink;
     
-    protected Screen(final Component lf) {
+    protected Screen(final Component mr) {
         this.children = Lists.newArrayList();
         this.buttons = Lists.newArrayList();
-        this.title = lf;
+        this.title = mr;
     }
     
     public Component getTitle() {
@@ -75,9 +75,9 @@ public abstract class Screen extends AbstractContainerEventHandler implements Wi
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        for (int integer3 = 0; integer3 < this.buttons.size(); ++integer3) {
-            this.buttons.get(integer3).render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        for (int integer4 = 0; integer4 < this.buttons.size(); ++integer4) {
+            this.buttons.get(integer4).render(dhl, integer2, integer3, float4);
         }
     }
     
@@ -105,193 +105,175 @@ public abstract class Screen extends AbstractContainerEventHandler implements Wi
         this.minecraft.setScreen(null);
     }
     
-    protected <T extends AbstractWidget> T addButton(final T dct) {
-        this.buttons.add(dct);
-        this.children.add(dct);
-        return dct;
+    protected <T extends AbstractWidget> T addButton(final T dng) {
+        this.buttons.add(dng);
+        return this.<T>addWidget(dng);
     }
     
-    protected void renderTooltip(final ItemStack ben, final int integer2, final int integer3) {
-        this.renderTooltip(this.getTooltipFromItem(ben), integer2, integer3);
+    protected <T extends GuiEventListener> T addWidget(final T dof) {
+        this.children.add(dof);
+        return dof;
     }
     
-    public List<String> getTooltipFromItem(final ItemStack ben) {
-        final List<Component> list3 = ben.getTooltipLines(this.minecraft.player, this.minecraft.options.advancedItemTooltips ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL);
-        final List<String> list4 = Lists.newArrayList();
-        for (final Component lf6 : list3) {
-            list4.add(lf6.getColoredString());
-        }
-        return list4;
+    protected void renderTooltip(final PoseStack dhl, final ItemStack bki, final int integer3, final int integer4) {
+        this.renderTooltip(dhl, this.getTooltipFromItem(bki), integer3, integer4);
     }
     
-    public void renderTooltip(final String string, final int integer2, final int integer3) {
-        this.renderTooltip(Arrays.<String>asList(string), integer2, integer3);
+    public List<Component> getTooltipFromItem(final ItemStack bki) {
+        return bki.getTooltipLines(this.minecraft.player, this.minecraft.options.advancedItemTooltips ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL);
     }
     
-    public void renderTooltip(final List<String> list, final int integer2, final int integer3) {
+    public void renderTooltip(final PoseStack dhl, final FormattedText mu, final int integer3, final int integer4) {
+        this.renderTooltip(dhl, Arrays.<FormattedText>asList(mu), integer3, integer4);
+    }
+    
+    public void renderTooltip(final PoseStack dhl, final List<? extends FormattedText> list, final int integer3, final int integer4) {
         if (list.isEmpty()) {
             return;
         }
-        RenderSystem.disableRescaleNormal();
-        RenderSystem.disableDepthTest();
-        int integer4 = 0;
-        for (final String string7 : list) {
-            final int integer5 = this.font.width(string7);
-            if (integer5 > integer4) {
-                integer4 = integer5;
+        int integer5 = 0;
+        for (final FormattedText mu8 : list) {
+            final int integer6 = this.font.width(mu8);
+            if (integer6 > integer5) {
+                integer5 = integer6;
             }
         }
-        int integer6 = integer2 + 12;
-        int integer7 = integer3 - 12;
-        final int integer5 = integer4;
-        int integer8 = 8;
+        int integer7 = integer3 + 12;
+        int integer8 = integer4 - 12;
+        final int integer6 = integer5;
+        int integer9 = 8;
         if (list.size() > 1) {
-            integer8 += 2 + (list.size() - 1) * 10;
+            integer9 += 2 + (list.size() - 1) * 10;
         }
-        if (integer6 + integer4 > this.width) {
-            integer6 -= 28 + integer4;
+        if (integer7 + integer5 > this.width) {
+            integer7 -= 28 + integer5;
         }
-        if (integer7 + integer8 + 6 > this.height) {
-            integer7 = this.height - integer8 - 6;
+        if (integer8 + integer9 + 6 > this.height) {
+            integer8 = this.height - integer9 - 6;
         }
-        this.setBlitOffset(300);
-        this.itemRenderer.blitOffset = 300.0f;
-        final int integer9 = -267386864;
-        this.fillGradient(integer6 - 3, integer7 - 4, integer6 + integer5 + 3, integer7 - 3, -267386864, -267386864);
-        this.fillGradient(integer6 - 3, integer7 + integer8 + 3, integer6 + integer5 + 3, integer7 + integer8 + 4, -267386864, -267386864);
-        this.fillGradient(integer6 - 3, integer7 - 3, integer6 + integer5 + 3, integer7 + integer8 + 3, -267386864, -267386864);
-        this.fillGradient(integer6 - 4, integer7 - 3, integer6 - 3, integer7 + integer8 + 3, -267386864, -267386864);
-        this.fillGradient(integer6 + integer5 + 3, integer7 - 3, integer6 + integer5 + 4, integer7 + integer8 + 3, -267386864, -267386864);
-        final int integer10 = 1347420415;
-        final int integer11 = 1344798847;
-        this.fillGradient(integer6 - 3, integer7 - 3 + 1, integer6 - 3 + 1, integer7 + integer8 + 3 - 1, 1347420415, 1344798847);
-        this.fillGradient(integer6 + integer5 + 2, integer7 - 3 + 1, integer6 + integer5 + 3, integer7 + integer8 + 3 - 1, 1347420415, 1344798847);
-        this.fillGradient(integer6 - 3, integer7 - 3, integer6 + integer5 + 3, integer7 - 3 + 1, 1347420415, 1347420415);
-        this.fillGradient(integer6 - 3, integer7 + integer8 + 2, integer6 + integer5 + 3, integer7 + integer8 + 3, 1344798847, 1344798847);
-        final PoseStack cyl13 = new PoseStack();
-        final MultiBufferSource.BufferSource a14 = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        cyl13.translate(0.0, 0.0, this.itemRenderer.blitOffset);
-        final Matrix4f b15 = cyl13.last().pose();
-        for (int integer12 = 0; integer12 < list.size(); ++integer12) {
-            final String string8 = list.get(integer12);
-            if (string8 != null) {
-                this.font.drawInBatch(string8, (float)integer6, (float)integer7, -1, true, b15, a14, false, 0, 15728880);
-            }
-            if (integer12 == 0) {
-                integer7 += 2;
-            }
-            integer7 += 10;
-        }
-        a14.endBatch();
-        this.setBlitOffset(0);
-        this.itemRenderer.blitOffset = 0.0f;
+        dhl.pushPose();
+        final int integer10 = -267386864;
+        final int integer11 = 1347420415;
+        final int integer12 = 1344798847;
+        final int integer13 = 400;
+        final Tesselator dhn15 = Tesselator.getInstance();
+        final BufferBuilder dhg16 = dhn15.getBuilder();
+        dhg16.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        final Matrix4f b17 = dhl.last().pose();
+        GuiComponent.fillGradient(b17, dhg16, integer7 - 3, integer8 - 4, integer7 + integer6 + 3, integer8 - 3, 400, -267386864, -267386864);
+        GuiComponent.fillGradient(b17, dhg16, integer7 - 3, integer8 + integer9 + 3, integer7 + integer6 + 3, integer8 + integer9 + 4, 400, -267386864, -267386864);
+        GuiComponent.fillGradient(b17, dhg16, integer7 - 3, integer8 - 3, integer7 + integer6 + 3, integer8 + integer9 + 3, 400, -267386864, -267386864);
+        GuiComponent.fillGradient(b17, dhg16, integer7 - 4, integer8 - 3, integer7 - 3, integer8 + integer9 + 3, 400, -267386864, -267386864);
+        GuiComponent.fillGradient(b17, dhg16, integer7 + integer6 + 3, integer8 - 3, integer7 + integer6 + 4, integer8 + integer9 + 3, 400, -267386864, -267386864);
+        GuiComponent.fillGradient(b17, dhg16, integer7 - 3, integer8 - 3 + 1, integer7 - 3 + 1, integer8 + integer9 + 3 - 1, 400, 1347420415, 1344798847);
+        GuiComponent.fillGradient(b17, dhg16, integer7 + integer6 + 2, integer8 - 3 + 1, integer7 + integer6 + 3, integer8 + integer9 + 3 - 1, 400, 1347420415, 1344798847);
+        GuiComponent.fillGradient(b17, dhg16, integer7 - 3, integer8 - 3, integer7 + integer6 + 3, integer8 - 3 + 1, 400, 1347420415, 1347420415);
+        GuiComponent.fillGradient(b17, dhg16, integer7 - 3, integer8 + integer9 + 2, integer7 + integer6 + 3, integer8 + integer9 + 3, 400, 1344798847, 1344798847);
         RenderSystem.enableDepthTest();
-        RenderSystem.enableRescaleNormal();
+        RenderSystem.disableTexture();
+        RenderSystem.enableBlend();
+        RenderSystem.defaultBlendFunc();
+        RenderSystem.shadeModel(7425);
+        dhg16.end();
+        BufferUploader.end(dhg16);
+        RenderSystem.shadeModel(7424);
+        RenderSystem.disableBlend();
+        RenderSystem.enableTexture();
+        final MultiBufferSource.BufferSource a18 = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
+        dhl.translate(0.0, 0.0, 400.0);
+        for (int integer14 = 0; integer14 < list.size(); ++integer14) {
+            final FormattedText mu9 = (FormattedText)list.get(integer14);
+            if (mu9 != null) {
+                this.font.drawInBatch(mu9, (float)integer7, (float)integer8, -1, true, b17, a18, false, 0, 15728880);
+            }
+            if (integer14 == 0) {
+                integer8 += 2;
+            }
+            integer8 += 10;
+        }
+        a18.endBatch();
+        dhl.popPose();
     }
     
-    protected void renderComponentHoverEffect(final Component lf, final int integer2, final int integer3) {
-        if (lf == null || lf.getStyle().getHoverEvent() == null) {
+    protected void renderComponentHoverEffect(final PoseStack dhl, @Nullable final Style nb, final int integer3, final int integer4) {
+        if (nb == null || nb.getHoverEvent() == null) {
             return;
         }
-        final HoverEvent li5 = lf.getStyle().getHoverEvent();
-        if (li5.getAction() == HoverEvent.Action.SHOW_ITEM) {
-            ItemStack ben6 = ItemStack.EMPTY;
-            try {
-                final Tag kj7 = TagParser.parseTag(li5.getValue().getString());
-                if (kj7 instanceof CompoundTag) {
-                    ben6 = ItemStack.of((CompoundTag)kj7);
+        final HoverEvent mv6 = nb.getHoverEvent();
+        final HoverEvent.ItemStackInfo c7 = mv6.<HoverEvent.ItemStackInfo>getValue(HoverEvent.Action.SHOW_ITEM);
+        if (c7 != null) {
+            this.renderTooltip(dhl, c7.getItemStack(), integer3, integer4);
+        }
+        else {
+            final HoverEvent.EntityTooltipInfo b8 = mv6.<HoverEvent.EntityTooltipInfo>getValue(HoverEvent.Action.SHOW_ENTITY);
+            if (b8 != null) {
+                if (this.minecraft.options.advancedItemTooltips) {
+                    this.renderTooltip(dhl, b8.getTooltipLines(), integer3, integer4);
                 }
             }
-            catch (CommandSyntaxException ex2) {}
-            if (ben6.isEmpty()) {
-                this.renderTooltip(ChatFormatting.RED + "Invalid Item!", integer2, integer3);
-            }
             else {
-                this.renderTooltip(ben6, integer2, integer3);
-            }
-        }
-        else if (li5.getAction() == HoverEvent.Action.SHOW_ENTITY) {
-            if (this.minecraft.options.advancedItemTooltips) {
-                try {
-                    final CompoundTag jt6 = TagParser.parseTag(li5.getValue().getString());
-                    final List<String> list7 = Lists.newArrayList();
-                    final Component lf2 = Component.Serializer.fromJson(jt6.getString("name"));
-                    if (lf2 != null) {
-                        list7.add(lf2.getColoredString());
-                    }
-                    if (jt6.contains("type", 8)) {
-                        final String string9 = jt6.getString("type");
-                        list7.add("Type: " + string9);
-                    }
-                    list7.add(jt6.getString("id"));
-                    this.renderTooltip(list7, integer2, integer3);
-                }
-                catch (JsonSyntaxException | CommandSyntaxException ex3) {
-                    final Exception ex;
-                    final Exception exception6 = ex;
-                    this.renderTooltip(ChatFormatting.RED + "Invalid Entity!", integer2, integer3);
+                final Component mr9 = mv6.<Component>getValue(HoverEvent.Action.SHOW_TEXT);
+                if (mr9 != null) {
+                    this.renderTooltip(dhl, this.minecraft.font.split(mr9, Math.max(this.width / 2, 200)), integer3, integer4);
                 }
             }
         }
-        else if (li5.getAction() == HoverEvent.Action.SHOW_TEXT) {
-            this.renderTooltip(this.minecraft.font.split(li5.getValue().getColoredString(), Math.max(this.width / 2, 200)), integer2, integer3);
-        }
     }
     
     protected void insertText(final String string, final boolean boolean2) {
     }
     
-    public boolean handleComponentClicked(final Component lf) {
-        if (lf == null) {
+    public boolean handleComponentClicked(@Nullable final Style nb) {
+        if (nb == null) {
             return false;
         }
-        final ClickEvent le3 = lf.getStyle().getClickEvent();
+        final ClickEvent mp3 = nb.getClickEvent();
         if (hasShiftDown()) {
-            if (lf.getStyle().getInsertion() != null) {
-                this.insertText(lf.getStyle().getInsertion(), false);
+            if (nb.getInsertion() != null) {
+                this.insertText(nb.getInsertion(), false);
             }
         }
-        else if (le3 != null) {
-            if (le3.getAction() == ClickEvent.Action.OPEN_URL) {
+        else if (mp3 != null) {
+            if (mp3.getAction() == ClickEvent.Action.OPEN_URL) {
                 if (!this.minecraft.options.chatLinks) {
                     return false;
                 }
                 try {
-                    final URI uRI4 = new URI(le3.getValue());
+                    final URI uRI4 = new URI(mp3.getValue());
                     final String string5 = uRI4.getScheme();
                     if (string5 == null) {
-                        throw new URISyntaxException(le3.getValue(), "Missing protocol");
+                        throw new URISyntaxException(mp3.getValue(), "Missing protocol");
                     }
                     if (!Screen.ALLOWED_PROTOCOLS.contains(string5.toLowerCase(Locale.ROOT))) {
-                        throw new URISyntaxException(le3.getValue(), "Unsupported protocol: " + string5.toLowerCase(Locale.ROOT));
+                        throw new URISyntaxException(mp3.getValue(), "Unsupported protocol: " + string5.toLowerCase(Locale.ROOT));
                     }
                     if (this.minecraft.options.chatLinksPrompt) {
                         this.clickedLink = uRI4;
-                        this.minecraft.setScreen(new ConfirmLinkScreen(this::confirmLink, le3.getValue(), false));
+                        this.minecraft.setScreen(new ConfirmLinkScreen(this::confirmLink, mp3.getValue(), false));
                     }
                     else {
                         this.openLink(uRI4);
                     }
                 }
                 catch (URISyntaxException uRISyntaxException4) {
-                    Screen.LOGGER.error("Can't open url for {}", le3, uRISyntaxException4);
+                    Screen.LOGGER.error("Can't open url for {}", mp3, uRISyntaxException4);
                 }
             }
-            else if (le3.getAction() == ClickEvent.Action.OPEN_FILE) {
-                final URI uRI4 = new File(le3.getValue()).toURI();
+            else if (mp3.getAction() == ClickEvent.Action.OPEN_FILE) {
+                final URI uRI4 = new File(mp3.getValue()).toURI();
                 this.openLink(uRI4);
             }
-            else if (le3.getAction() == ClickEvent.Action.SUGGEST_COMMAND) {
-                this.insertText(le3.getValue(), true);
+            else if (mp3.getAction() == ClickEvent.Action.SUGGEST_COMMAND) {
+                this.insertText(mp3.getValue(), true);
             }
-            else if (le3.getAction() == ClickEvent.Action.RUN_COMMAND) {
-                this.sendMessage(le3.getValue(), false);
+            else if (mp3.getAction() == ClickEvent.Action.RUN_COMMAND) {
+                this.sendMessage(mp3.getValue(), false);
             }
-            else if (le3.getAction() == ClickEvent.Action.COPY_TO_CLIPBOARD) {
-                this.minecraft.keyboardHandler.setClipboard(le3.getValue());
+            else if (mp3.getAction() == ClickEvent.Action.COPY_TO_CLIPBOARD) {
+                this.minecraft.keyboardHandler.setClipboard(mp3.getValue());
             }
             else {
-                Screen.LOGGER.error("Don't know how to handle {}", le3);
+                Screen.LOGGER.error("Don't know how to handle {}", mp3);
             }
             return true;
         }
@@ -309,10 +291,10 @@ public abstract class Screen extends AbstractContainerEventHandler implements Wi
         this.minecraft.player.chat(string);
     }
     
-    public void init(final Minecraft dbn, final int integer2, final int integer3) {
-        this.minecraft = dbn;
-        this.itemRenderer = dbn.getItemRenderer();
-        this.font = dbn.font;
+    public void init(final Minecraft dlx, final int integer2, final int integer3) {
+        this.minecraft = dlx;
+        this.itemRenderer = dlx.getItemRenderer();
+        this.font = dlx.font;
         this.width = integer2;
         this.height = integer3;
         this.buttons.clear();
@@ -321,11 +303,6 @@ public abstract class Screen extends AbstractContainerEventHandler implements Wi
         this.init();
     }
     
-    public void setSize(final int integer1, final int integer2) {
-        this.width = integer1;
-        this.height = integer2;
-    }
-    
     @Override
     public List<? extends GuiEventListener> children() {
         return this.children;
@@ -334,19 +311,20 @@ public abstract class Screen extends AbstractContainerEventHandler implements Wi
     protected void init() {
     }
     
+    @Override
     public void tick() {
     }
     
     public void removed() {
     }
     
-    public void renderBackground() {
-        this.renderBackground(0);
+    public void renderBackground(final PoseStack dhl) {
+        this.renderBackground(dhl, 0);
     }
     
-    public void renderBackground(final int integer) {
+    public void renderBackground(final PoseStack dhl, final int integer) {
         if (this.minecraft.level != null) {
-            this.fillGradient(0, 0, this.width, this.height, -1072689136, -804253680);
+            this.fillGradient(dhl, 0, 0, this.width, this.height, -1072689136, -804253680);
         }
         else {
             this.renderDirtBackground(integer);
@@ -354,17 +332,17 @@ public abstract class Screen extends AbstractContainerEventHandler implements Wi
     }
     
     public void renderDirtBackground(final int integer) {
-        final Tesselator cym3 = Tesselator.getInstance();
-        final BufferBuilder cyg4 = cym3.getBuilder();
+        final Tesselator dhn3 = Tesselator.getInstance();
+        final BufferBuilder dhg4 = dhn3.getBuilder();
         this.minecraft.getTextureManager().bind(Screen.BACKGROUND_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         final float float5 = 32.0f;
-        cyg4.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg4.vertex(0.0, this.height, 0.0).uv(0.0f, this.height / 32.0f + integer).color(64, 64, 64, 255).endVertex();
-        cyg4.vertex(this.width, this.height, 0.0).uv(this.width / 32.0f, this.height / 32.0f + integer).color(64, 64, 64, 255).endVertex();
-        cyg4.vertex(this.width, 0.0, 0.0).uv(this.width / 32.0f, (float)integer).color(64, 64, 64, 255).endVertex();
-        cyg4.vertex(0.0, 0.0, 0.0).uv(0.0f, (float)integer).color(64, 64, 64, 255).endVertex();
-        cym3.end();
+        dhg4.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+        dhg4.vertex(0.0, this.height, 0.0).uv(0.0f, this.height / 32.0f + integer).color(64, 64, 64, 255).endVertex();
+        dhg4.vertex(this.width, this.height, 0.0).uv(this.width / 32.0f, this.height / 32.0f + integer).color(64, 64, 64, 255).endVertex();
+        dhg4.vertex(this.width, 0.0, 0.0).uv(this.width / 32.0f, (float)integer).color(64, 64, 64, 255).endVertex();
+        dhg4.vertex(0.0, 0.0, 0.0).uv(0.0f, (float)integer).color(64, 64, 64, 255).endVertex();
+        dhn3.end();
     }
     
     public boolean isPauseScreen() {
@@ -414,8 +392,8 @@ public abstract class Screen extends AbstractContainerEventHandler implements Wi
         return integer == 65 && hasControlDown() && !hasShiftDown() && !hasAltDown();
     }
     
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
-        this.init(dbn, integer2, integer3);
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
+        this.init(dlx, integer2, integer3);
     }
     
     public static void wrapScreenError(final Runnable runnable, final String string2, final String string3) {
@@ -423,10 +401,10 @@ public abstract class Screen extends AbstractContainerEventHandler implements Wi
             runnable.run();
         }
         catch (Throwable throwable4) {
-            final CrashReport h5 = CrashReport.forThrowable(throwable4, string2);
-            final CrashReportCategory i6 = h5.addCategory("Affected screen");
-            i6.setDetail("Screen name", () -> string3);
-            throw new ReportedException(h5);
+            final CrashReport j5 = CrashReport.forThrowable(throwable4, string2);
+            final CrashReportCategory k6 = j5.addCategory("Affected screen");
+            k6.setDetail("Screen name", () -> string3);
+            throw new ReportedException(j5);
         }
     }
     
@@ -447,6 +425,9 @@ public abstract class Screen extends AbstractContainerEventHandler implements Wi
         return true;
     }
     
+    public void onFilesDrop(final List<Path> list) {
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
         ALLOWED_PROTOCOLS = Sets.<String>newHashSet("http", "https");
diff --git a/src/net/minecraft/client/gui/screens/ShareToLanScreen.java b/src/net/minecraft/client/gui/screens/ShareToLanScreen.java
index a90bbc7..033ba64 100644
--- a/src/net/minecraft/client/gui/screens/ShareToLanScreen.java
+++ b/src/net/minecraft/client/gui/screens/ShareToLanScreen.java
@@ -1,8 +1,11 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.world.level.GameType;
 import net.minecraft.util.HttpUtil;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.gui.components.Button;
@@ -14,33 +17,33 @@ public class ShareToLanScreen extends Screen {
     private String gameModeName;
     private boolean commands;
     
-    public ShareToLanScreen(final Screen dgb) {
-        super(new TranslatableComponent("lanServer.title", new Object[0]));
+    public ShareToLanScreen(final Screen dqs) {
+        super(new TranslatableComponent("lanServer.title"));
         this.gameModeName = "survival";
-        this.lastScreen = dgb;
+        this.lastScreen = dqs;
     }
     
     @Override
     protected void init() {
         final int integer3;
         final TranslatableComponent translatableComponent;
-        Component lf4;
-        this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 28, 150, 20, I18n.get("lanServer.start"), dcv -> {
+        Component mr4;
+        this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 28, 150, 20, new TranslatableComponent("lanServer.start"), dni -> {
             this.minecraft.setScreen(null);
             integer3 = HttpUtil.getAvailablePort();
             if (this.minecraft.getSingleplayerServer().publishServer(GameType.byName(this.gameModeName), this.commands, integer3)) {
                 new TranslatableComponent("commands.publish.started", new Object[] { integer3 });
-                lf4 = translatableComponent;
+                mr4 = translatableComponent;
             }
             else {
-                lf4 = new TranslatableComponent("commands.publish.failed", new Object[0]);
+                mr4 = new TranslatableComponent("commands.publish.failed");
             }
-            this.minecraft.gui.getChat().addMessage(lf4);
+            this.minecraft.gui.getChat().addMessage(mr4);
             this.minecraft.updateTitle();
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 28, 150, 20, I18n.get("gui.cancel"), dcv -> this.minecraft.setScreen(this.lastScreen)));
-        this.modeButton = this.<Button>addButton(new Button(this.width / 2 - 155, 100, 150, 20, I18n.get("selectWorld.gameMode"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 28, 150, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(this.lastScreen)));
+        this.modeButton = this.<Button>addButton(new Button(this.width / 2 - 155, 100, 150, 20, new TranslatableComponent("selectWorld.gameMode"), dni -> {
             if ("spectator".equals(this.gameModeName)) {
                 this.gameModeName = "creative";
             }
@@ -56,7 +59,7 @@ public class ShareToLanScreen extends Screen {
             this.updateSelectionStrings();
             return;
         }));
-        this.commandsButton = this.<Button>addButton(new Button(this.width / 2 + 5, 100, 150, 20, I18n.get("selectWorld.allowCommands"), dcv -> {
+        this.commandsButton = this.<Button>addButton(new Button(this.width / 2 + 5, 100, 150, 20, new TranslatableComponent("selectWorld.allowCommands"), dni -> {
             this.commands = !this.commands;
             this.updateSelectionStrings();
             return;
@@ -65,15 +68,15 @@ public class ShareToLanScreen extends Screen {
     }
     
     private void updateSelectionStrings() {
-        this.modeButton.setMessage(I18n.get("selectWorld.gameMode") + ": " + I18n.get("selectWorld.gameMode." + this.gameModeName));
-        this.commandsButton.setMessage(I18n.get("selectWorld.allowCommands") + ' ' + I18n.get(this.commands ? "options.on" : "options.off"));
+        this.modeButton.setMessage(new TranslatableComponent("selectWorld.gameMode").append(": ").append(new TranslatableComponent("selectWorld.gameMode." + this.gameModeName)));
+        this.commandsButton.setMessage(new TranslatableComponent("selectWorld.allowCommands").append(" ").append(CommonComponents.optionStatus(this.commands)));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 50, 16777215);
-        this.drawCenteredString(this.font, I18n.get("lanServer.otherPlayers"), this.width / 2, 82, 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 50, 16777215);
+        this.drawCenteredString(dhl, this.font, I18n.get("lanServer.otherPlayers"), this.width / 2, 82, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/SkinCustomizationScreen.java b/src/net/minecraft/client/gui/screens/SkinCustomizationScreen.java
index 9338df9..d2ca848 100644
--- a/src/net/minecraft/client/gui/screens/SkinCustomizationScreen.java
+++ b/src/net/minecraft/client/gui/screens/SkinCustomizationScreen.java
@@ -1,6 +1,8 @@
 package net.minecraft.client.gui.screens;
 
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.gui.components.OptionButton;
 import net.minecraft.client.Option;
 import net.minecraft.client.gui.components.Button;
@@ -10,50 +12,43 @@ import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.Options;
 
 public class SkinCustomizationScreen extends OptionsSubScreen {
-    public SkinCustomizationScreen(final Screen dgb, final Options dbr) {
-        super(dgb, dbr, new TranslatableComponent("options.skinCustomisation.title", new Object[0]));
+    public SkinCustomizationScreen(final Screen dqs, final Options dmb) {
+        super(dqs, dmb, new TranslatableComponent("options.skinCustomisation.title"));
     }
     
     @Override
     protected void init() {
         int integer2 = 0;
-        for (final PlayerModelPart ayk6 : PlayerModelPart.values()) {
+        for (final PlayerModelPart bed6 : PlayerModelPart.values()) {
             final PlayerModelPart playerModelPart;
-            this.<Button>addButton(new Button(this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 + 24 * (integer2 >> 1), 150, 20, this.getMessage(ayk6), dcv -> {
+            this.<Button>addButton(new Button(this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 + 24 * (integer2 >> 1), 150, 20, this.getMessage(bed6), dni -> {
                 this.options.toggleModelPart(playerModelPart);
-                dcv.setMessage(this.getMessage(playerModelPart));
+                dni.setMessage(this.getMessage(playerModelPart));
                 return;
             }));
             ++integer2;
         }
-        this.<OptionButton>addButton(new OptionButton(this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 + 24 * (integer2 >> 1), 150, 20, Option.MAIN_HAND, Option.MAIN_HAND.getMessage(this.options), dcv -> {
+        this.<OptionButton>addButton(new OptionButton(this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 + 24 * (integer2 >> 1), 150, 20, Option.MAIN_HAND, Option.MAIN_HAND.getMessage(this.options), dni -> {
             Option.MAIN_HAND.toggle(this.options, 1);
             this.options.save();
-            dcv.setMessage(Option.MAIN_HAND.getMessage(this.options));
+            dni.setMessage(Option.MAIN_HAND.getMessage(this.options));
             this.options.broadcastOptions();
             return;
         }));
         if (++integer2 % 2 == 1) {
             ++integer2;
         }
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 24 * (integer2 >> 1), 200, 20, I18n.get("gui.done"), dcv -> this.minecraft.setScreen(this.lastScreen)));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 24 * (integer2 >> 1), 200, 20, CommonComponents.GUI_DONE, dni -> this.minecraft.setScreen(this.lastScreen)));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 20, 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 20, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
     
-    private String getMessage(final PlayerModelPart ayk) {
-        String string3;
-        if (this.options.getModelParts().contains(ayk)) {
-            string3 = I18n.get("options.on");
-        }
-        else {
-            string3 = I18n.get("options.off");
-        }
-        return ayk.getName().getColoredString() + ": " + string3;
+    private Component getMessage(final PlayerModelPart bed) {
+        return bed.getName().copy().append(": ").append(CommonComponents.optionStatus(this.options.getModelParts().contains(bed)));
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/SoundOptionsScreen.java b/src/net/minecraft/client/gui/screens/SoundOptionsScreen.java
index e0698c5..face604 100644
--- a/src/net/minecraft/client/gui/screens/SoundOptionsScreen.java
+++ b/src/net/minecraft/client/gui/screens/SoundOptionsScreen.java
@@ -1,7 +1,9 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.gui.components.OptionButton;
 import net.minecraft.client.Option;
 import net.minecraft.client.gui.components.VolumeSlider;
@@ -11,8 +13,8 @@ import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.Options;
 
 public class SoundOptionsScreen extends OptionsSubScreen {
-    public SoundOptionsScreen(final Screen dgb, final Options dbr) {
-        super(dgb, dbr, new TranslatableComponent("options.sounds.title", new Object[0]));
+    public SoundOptionsScreen(final Screen dqs, final Options dmb) {
+        super(dqs, dmb, new TranslatableComponent("options.sounds.title"));
     }
     
     @Override
@@ -20,25 +22,25 @@ public class SoundOptionsScreen extends OptionsSubScreen {
         int integer2 = 0;
         this.<VolumeSlider>addButton(new VolumeSlider(this.minecraft, this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 - 12 + 24 * (integer2 >> 1), SoundSource.MASTER, 310));
         integer2 += 2;
-        for (final SoundSource aaj6 : SoundSource.values()) {
-            if (aaj6 != SoundSource.MASTER) {
-                this.<VolumeSlider>addButton(new VolumeSlider(this.minecraft, this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 - 12 + 24 * (integer2 >> 1), aaj6, 150));
+        for (final SoundSource acm6 : SoundSource.values()) {
+            if (acm6 != SoundSource.MASTER) {
+                this.<VolumeSlider>addButton(new VolumeSlider(this.minecraft, this.width / 2 - 155 + integer2 % 2 * 160, this.height / 6 - 12 + 24 * (integer2 >> 1), acm6, 150));
                 ++integer2;
             }
         }
-        this.<OptionButton>addButton(new OptionButton(this.width / 2 - 75, this.height / 6 - 12 + 24 * (++integer2 >> 1), 150, 20, Option.SHOW_SUBTITLES, Option.SHOW_SUBTITLES.getMessage(this.options), dcv -> {
+        this.<OptionButton>addButton(new OptionButton(this.width / 2 - 75, this.height / 6 - 12 + 24 * (++integer2 >> 1), 150, 20, Option.SHOW_SUBTITLES, Option.SHOW_SUBTITLES.getMessage(this.options), dni -> {
             Option.SHOW_SUBTITLES.toggle(this.minecraft.options);
-            dcv.setMessage(Option.SHOW_SUBTITLES.getMessage(this.minecraft.options));
+            dni.setMessage(Option.SHOW_SUBTITLES.getMessage(this.minecraft.options));
             this.minecraft.options.save();
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 168, 200, 20, I18n.get("gui.done"), dcv -> this.minecraft.setScreen(this.lastScreen)));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 6 + 168, 200, 20, CommonComponents.GUI_DONE, dni -> this.minecraft.setScreen(this.lastScreen)));
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 15, 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 15, 16777215);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/TitleScreen.java b/src/net/minecraft/client/gui/screens/TitleScreen.java
index 888a7ed..eae18ae 100644
--- a/src/net/minecraft/client/gui/screens/TitleScreen.java
+++ b/src/net/minecraft/client/gui/screens/TitleScreen.java
@@ -1,25 +1,34 @@
 package net.minecraft.client.gui.screens;
 
+import org.apache.logging.log4j.LogManager;
 import com.google.common.util.concurrent.Runnables;
 import java.util.Iterator;
 import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.resources.language.I18n;
 import net.minecraft.SharedConstants;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.util.Mth;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.Util;
+import com.mojang.blaze3d.vertex.PoseStack;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.minecraft.client.Minecraft;
-import net.minecraft.world.level.storage.LevelData;
+import net.minecraft.world.level.storage.LevelSummary;
 import net.minecraft.world.level.storage.LevelStorageSource;
+import java.io.IOException;
+import net.minecraft.client.gui.components.toasts.SystemToast;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.client.gui.screens.multiplayer.SafetyScreen;
 import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import java.util.List;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.client.gui.screens.worldselection.SelectWorldScreen;
 import net.minecraft.realms.RealmsBridge;
 import net.minecraft.client.gui.components.ImageButton;
-import net.minecraft.client.resources.language.I18n;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import net.minecraft.client.renderer.texture.TextureManager;
@@ -31,8 +40,10 @@ import net.minecraft.client.gui.components.Button;
 import javax.annotation.Nullable;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.renderer.CubeMap;
+import org.apache.logging.log4j.Logger;
 
 public class TitleScreen extends Screen {
+    private static final Logger LOGGER;
     public static final CubeMap CUBE_MAP;
     private static final ResourceLocation PANORAMA_OVERLAY;
     private static final ResourceLocation ACCESSIBILITY_TEXTURE;
@@ -55,7 +66,7 @@ public class TitleScreen extends Screen {
     }
     
     public TitleScreen(final boolean boolean1) {
-        super(new TranslatableComponent("narrator.screen.title", new Object[0]));
+        super(new TranslatableComponent("narrator.screen.title"));
         this.panorama = new PanoramaRenderer(TitleScreen.CUBE_MAP);
         this.fading = boolean1;
         this.minceraftEasterEgg = (new Random().nextFloat() < 1.0E-4);
@@ -72,8 +83,8 @@ public class TitleScreen extends Screen {
         }
     }
     
-    public static CompletableFuture<Void> preloadResources(final TextureManager eak, final Executor executor) {
-        return CompletableFuture.allOf(eak.preload(TitleScreen.MINECRAFT_LOGO, executor), eak.preload(TitleScreen.MINECRAFT_EDITION, executor), eak.preload(TitleScreen.PANORAMA_OVERLAY, executor), TitleScreen.CUBE_MAP.preload(eak, executor));
+    public static CompletableFuture<Void> preloadResources(final TextureManager elw, final Executor executor) {
+        return CompletableFuture.allOf(elw.preload(TitleScreen.MINECRAFT_LOGO, executor), elw.preload(TitleScreen.MINECRAFT_EDITION, executor), elw.preload(TitleScreen.PANORAMA_OVERLAY, executor), TitleScreen.CUBE_MAP.preload(elw, executor));
     }
     
     @Override
@@ -101,14 +112,14 @@ public class TitleScreen extends Screen {
         else {
             this.createNormalMenuOptions(integer3, 24);
         }
-        this.<ImageButton>addButton(new ImageButton(this.width / 2 - 124, integer3 + 72 + 12, 20, 20, 0, 106, 20, Button.WIDGETS_LOCATION, 256, 256, dcv -> this.minecraft.setScreen(new LanguageSelectScreen(this, this.minecraft.options, this.minecraft.getLanguageManager())), I18n.get("narrator.button.language")));
-        this.<Button>addButton(new Button(this.width / 2 - 100, integer3 + 72 + 12, 98, 20, I18n.get("menu.options"), dcv -> this.minecraft.setScreen(new OptionsScreen(this, this.minecraft.options))));
-        this.<Button>addButton(new Button(this.width / 2 + 2, integer3 + 72 + 12, 98, 20, I18n.get("menu.quit"), dcv -> this.minecraft.stop()));
-        this.<ImageButton>addButton(new ImageButton(this.width / 2 + 104, integer3 + 72 + 12, 20, 20, 0, 0, 20, TitleScreen.ACCESSIBILITY_TEXTURE, 32, 64, dcv -> this.minecraft.setScreen(new AccessibilityOptionsScreen(this, this.minecraft.options)), I18n.get("narrator.button.accessibility")));
+        this.<ImageButton>addButton(new ImageButton(this.width / 2 - 124, integer3 + 72 + 12, 20, 20, 0, 106, 20, Button.WIDGETS_LOCATION, 256, 256, dni -> this.minecraft.setScreen(new LanguageSelectScreen(this, this.minecraft.options, this.minecraft.getLanguageManager())), new TranslatableComponent("narrator.button.language")));
+        this.<Button>addButton(new Button(this.width / 2 - 100, integer3 + 72 + 12, 98, 20, new TranslatableComponent("menu.options"), dni -> this.minecraft.setScreen(new OptionsScreen(this, this.minecraft.options))));
+        this.<Button>addButton(new Button(this.width / 2 + 2, integer3 + 72 + 12, 98, 20, new TranslatableComponent("menu.quit"), dni -> this.minecraft.stop()));
+        this.<ImageButton>addButton(new ImageButton(this.width / 2 + 104, integer3 + 72 + 12, 20, 20, 0, 0, 20, TitleScreen.ACCESSIBILITY_TEXTURE, 32, 64, dni -> this.minecraft.setScreen(new AccessibilityOptionsScreen(this, this.minecraft.options)), new TranslatableComponent("narrator.button.accessibility")));
         this.minecraft.setConnectedToRealms(false);
         if (this.minecraft.options.realmsNotifications && !this.realmsNotificationsInitialized) {
-            final RealmsBridge realmsBridge4 = new RealmsBridge();
-            this.realmsNotificationsScreen = realmsBridge4.getNotificationScreen(this);
+            final RealmsBridge eqd4 = new RealmsBridge();
+            this.realmsNotificationsScreen = eqd4.getNotificationScreen(this);
             this.realmsNotificationsInitialized = true;
         }
         if (this.realmsNotificationsEnabled()) {
@@ -117,121 +128,174 @@ public class TitleScreen extends Screen {
     }
     
     private void createNormalMenuOptions(final int integer1, final int integer2) {
-        this.<Button>addButton(new Button(this.width / 2 - 100, integer1, 200, 20, I18n.get("menu.singleplayer"), dcv -> this.minecraft.setScreen(new SelectWorldScreen(this))));
-        this.<Button>addButton(new Button(this.width / 2 - 100, integer1 + integer2 * 1, 200, 20, I18n.get("menu.multiplayer"), dcv -> {
-            if (this.minecraft.options.skipMultiplayerWarning) {
-                this.minecraft.setScreen(new JoinMultiplayerScreen(this));
-            }
-            else {
-                this.minecraft.setScreen(new SafetyScreen(this));
+        this.<Button>addButton(new Button(this.width / 2 - 100, integer1, 200, 20, new TranslatableComponent("menu.singleplayer"), dni -> this.minecraft.setScreen(new SelectWorldScreen(this))));
+        final boolean boolean4 = this.minecraft.allowsMultiplayer();
+        final Button.OnTooltip b5 = boolean4 ? Button.NO_TOOLTIP : ((dni, dhl, integer3, integer4) -> {
+            if (!dni.active) {
+                this.renderTooltip(dhl, this.minecraft.font.split(new TranslatableComponent("title.multiplayer.disabled"), Math.max(this.width / 2 - 43, 170)), integer3, integer4);
             }
             return;
-        }));
-        this.<Button>addButton(new Button(this.width / 2 - 100, integer1 + integer2 * 2, 200, 20, I18n.get("menu.online"), dcv -> this.realmsButtonClicked()));
+        });
+        final Screen screen;
+        final Screen dqs3;
+        this.<Button>addButton(new Button(this.width / 2 - 100, integer1 + integer2 * 1, 200, 20, new TranslatableComponent("menu.multiplayer"), dni -> {
+            if (this.minecraft.options.skipMultiplayerWarning) {
+                // new(net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen.class)
+                new JoinMultiplayerScreen(this);
+            }
+            else {
+                // new(net.minecraft.client.gui.screens.multiplayer.SafetyScreen.class)
+                new SafetyScreen(this);
+            }
+            dqs3 = screen;
+            this.minecraft.setScreen(dqs3);
+            return;
+        }, b5)).active = boolean4;
+        this.<Button>addButton(new Button(this.width / 2 - 100, integer1 + integer2 * 2, 200, 20, new TranslatableComponent("menu.online"), dni -> this.realmsButtonClicked(), b5)).active = boolean4;
     }
     
     private void createDemoMenuOptions(final int integer1, final int integer2) {
-        this.<Button>addButton(new Button(this.width / 2 - 100, integer1, 200, 20, I18n.get("menu.playdemo"), dcv -> this.minecraft.selectLevel("Demo_World", "Demo_World", MinecraftServer.DEMO_SETTINGS)));
-        final LevelStorageSource crp3;
-        final LevelData crm4;
+        this.<Button>addButton(new Button(this.width / 2 - 100, integer1, 200, 20, new TranslatableComponent("menu.playdemo"), dni -> this.minecraft.createLevel("Demo_World", MinecraftServer.DEMO_SETTINGS, RegistryAccess.builtin(), WorldGenSettings.DEMO_SETTINGS)));
+        final LevelStorageSource dae3;
+        LevelStorageSource.LevelStorageAccess a4;
+        LevelSummary daf6;
         Minecraft minecraft;
-        TranslatableComponent lf2;
-        final TranslatableComponent lf3;
+        TranslatableComponent mr2;
+        final TranslatableComponent mr3;
         final Screen screen;
         final BooleanConsumer booleanConsumer;
-        this.resetDemoButton = this.<Button>addButton(new Button(this.width / 2 - 100, integer1 + integer2 * 1, 200, 20, I18n.get("menu.resetdemo"), dcv -> {
-            crp3 = this.minecraft.getLevelSource();
-            crm4 = crp3.getDataTagFor("Demo_World");
-            if (crm4 != null) {
-                minecraft = this.minecraft;
-                // new(net.minecraft.client.gui.screens.ConfirmScreen.class)
-                this::confirmDemo;
-                lf2 = new TranslatableComponent("selectWorld.deleteQuestion", new Object[0]);
-                new TranslatableComponent("selectWorld.deleteWarning", new Object[] { crm4.getLevelName() });
-                new ConfirmScreen(booleanConsumer, lf2, lf3, I18n.get("selectWorld.deleteButton"), I18n.get("gui.cancel"));
-                minecraft.setScreen(screen);
+        final Throwable t2;
+        this.resetDemoButton = this.<Button>addButton(new Button(this.width / 2 - 100, integer1 + integer2 * 1, 200, 20, new TranslatableComponent("menu.resetdemo"), dni -> {
+            dae3 = this.minecraft.getLevelSource();
+            try {
+                a4 = dae3.createAccess("Demo_World");
+                try {
+                    daf6 = a4.getSummary();
+                    if (daf6 != null) {
+                        minecraft = this.minecraft;
+                        // new(net.minecraft.client.gui.screens.ConfirmScreen.class)
+                        this::confirmDemo;
+                        mr2 = new TranslatableComponent("selectWorld.deleteQuestion");
+                        new TranslatableComponent("selectWorld.deleteWarning", new Object[] { daf6.getLevelName() });
+                        new ConfirmScreen(booleanConsumer, mr2, mr3, new TranslatableComponent("selectWorld.deleteButton"), CommonComponents.GUI_CANCEL);
+                        minecraft.setScreen(screen);
+                    }
+                }
+                catch (Throwable t) {
+                    throw t;
+                }
+                finally {
+                    if (a4 != null) {
+                        if (t2 != null) {
+                            try {
+                                a4.close();
+                            }
+                            catch (Throwable exception) {
+                                t2.addSuppressed(exception);
+                            }
+                        }
+                        else {
+                            a4.close();
+                        }
+                    }
+                }
+            }
+            catch (IOException iOException4) {
+                SystemToast.onWorldAccessFailure(this.minecraft, "Demo_World");
+                TitleScreen.LOGGER.warn("Failed to access demo world", (Throwable)iOException4);
             }
             return;
         }));
-        final LevelStorageSource crp4 = this.minecraft.getLevelSource();
-        final LevelData crm5 = crp4.getDataTagFor("Demo_World");
-        if (crm5 == null) {
-            this.resetDemoButton.active = false;
+        try (final LevelStorageSource.LevelStorageAccess a5 = this.minecraft.getLevelSource().createAccess("Demo_World")) {
+            final LevelSummary daf7 = a5.getSummary();
+            if (daf7 == null) {
+                this.resetDemoButton.active = false;
+            }
+        }
+        catch (IOException iOException5) {
+            SystemToast.onWorldAccessFailure(this.minecraft, "Demo_World");
+            TitleScreen.LOGGER.warn("Failed to read demo world data", (Throwable)iOException5);
         }
     }
     
     private void realmsButtonClicked() {
-        final RealmsBridge realmsBridge2 = new RealmsBridge();
-        realmsBridge2.switchToRealms(this);
+        final RealmsBridge eqd2 = new RealmsBridge();
+        eqd2.switchToRealms(this);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (this.fadeInStart == 0L && this.fading) {
             this.fadeInStart = Util.getMillis();
         }
-        final float float4 = this.fading ? ((Util.getMillis() - this.fadeInStart) / 1000.0f) : 1.0f;
-        GuiComponent.fill(0, 0, this.width, this.height, -1);
-        this.panorama.render(float3, Mth.clamp(float4, 0.0f, 1.0f));
-        final int integer3 = 274;
-        final int integer4 = this.width / 2 - 137;
-        final int integer5 = 30;
+        final float float5 = this.fading ? ((Util.getMillis() - this.fadeInStart) / 1000.0f) : 1.0f;
+        GuiComponent.fill(dhl, 0, 0, this.width, this.height, -1);
+        this.panorama.render(float4, Mth.clamp(float5, 0.0f, 1.0f));
+        final int integer4 = 274;
+        final int integer5 = this.width / 2 - 137;
+        final int integer6 = 30;
         this.minecraft.getTextureManager().bind(TitleScreen.PANORAMA_OVERLAY);
         RenderSystem.enableBlend();
         RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
-        RenderSystem.color4f(1.0f, 1.0f, 1.0f, this.fading ? ((float)Mth.ceil(Mth.clamp(float4, 0.0f, 1.0f))) : 1.0f);
-        GuiComponent.blit(0, 0, this.width, this.height, 0.0f, 0.0f, 16, 128, 16, 128);
-        final float float5 = this.fading ? Mth.clamp(float4 - 1.0f, 0.0f, 1.0f) : 1.0f;
-        final int integer6 = Mth.ceil(float5 * 255.0f) << 24;
-        if ((integer6 & 0xFC000000) == 0x0) {
+        RenderSystem.color4f(1.0f, 1.0f, 1.0f, this.fading ? ((float)Mth.ceil(Mth.clamp(float5, 0.0f, 1.0f))) : 1.0f);
+        GuiComponent.blit(dhl, 0, 0, this.width, this.height, 0.0f, 0.0f, 16, 128, 16, 128);
+        final float float6 = this.fading ? Mth.clamp(float5 - 1.0f, 0.0f, 1.0f) : 1.0f;
+        final int integer7 = Mth.ceil(float6 * 255.0f) << 24;
+        if ((integer7 & 0xFC000000) == 0x0) {
             return;
         }
         this.minecraft.getTextureManager().bind(TitleScreen.MINECRAFT_LOGO);
-        RenderSystem.color4f(1.0f, 1.0f, 1.0f, float5);
+        RenderSystem.color4f(1.0f, 1.0f, 1.0f, float6);
         if (this.minceraftEasterEgg) {
-            this.blit(integer4 + 0, 30, 0, 0, 99, 44);
-            this.blit(integer4 + 99, 30, 129, 0, 27, 44);
-            this.blit(integer4 + 99 + 26, 30, 126, 0, 3, 44);
-            this.blit(integer4 + 99 + 26 + 3, 30, 99, 0, 26, 44);
-            this.blit(integer4 + 155, 30, 0, 45, 155, 44);
+            this.blitOutlineBlack(integer5, 30, (integer2, integer3) -> {
+                this.blit(dhl, integer2 + 0, integer3, 0, 0, 99, 44);
+                this.blit(dhl, integer2 + 99, integer3, 129, 0, 27, 44);
+                this.blit(dhl, integer2 + 99 + 26, integer3, 126, 0, 3, 44);
+                this.blit(dhl, integer2 + 99 + 26 + 3, integer3, 99, 0, 26, 44);
+                this.blit(dhl, integer2 + 155, integer3, 0, 45, 155, 44);
+                return;
+            });
         }
         else {
-            this.blit(integer4 + 0, 30, 0, 0, 155, 44);
-            this.blit(integer4 + 155, 30, 0, 45, 155, 44);
+            this.blitOutlineBlack(integer5, 30, (integer2, integer3) -> {
+                this.blit(dhl, integer2 + 0, integer3, 0, 0, 155, 44);
+                this.blit(dhl, integer2 + 155, integer3, 0, 45, 155, 44);
+                return;
+            });
         }
         this.minecraft.getTextureManager().bind(TitleScreen.MINECRAFT_EDITION);
-        GuiComponent.blit(integer4 + 88, 67, 0.0f, 0.0f, 98, 14, 128, 16);
+        GuiComponent.blit(dhl, integer5 + 88, 67, 0.0f, 0.0f, 98, 14, 128, 16);
         if (this.splash != null) {
             RenderSystem.pushMatrix();
             RenderSystem.translatef((float)(this.width / 2 + 90), 70.0f, 0.0f);
             RenderSystem.rotatef(-20.0f, 0.0f, 0.0f, 1.0f);
-            float float6 = 1.8f - Mth.abs(Mth.sin(Util.getMillis() % 1000L / 1000.0f * 6.2831855f) * 0.1f);
-            float6 = float6 * 100.0f / (this.font.width(this.splash) + 32);
-            RenderSystem.scalef(float6, float6, float6);
-            this.drawCenteredString(this.font, this.splash, 0, -8, 0xFFFF00 | integer6);
+            float float7 = 1.8f - Mth.abs(Mth.sin(Util.getMillis() % 1000L / 1000.0f * 6.2831855f) * 0.1f);
+            float7 = float7 * 100.0f / (this.font.width(this.splash) + 32);
+            RenderSystem.scalef(float7, float7, float7);
+            this.drawCenteredString(dhl, this.font, this.splash, 0, -8, 0xFFFF00 | integer7);
             RenderSystem.popMatrix();
         }
-        String string11 = "Minecraft " + SharedConstants.getCurrentVersion().getName();
+        String string12 = "Minecraft " + SharedConstants.getCurrentVersion().getName();
         if (this.minecraft.isDemo()) {
-            string11 += " Demo";
+            string12 += " Demo";
         }
         else {
-            string11 += ("release".equalsIgnoreCase(this.minecraft.getVersionType()) ? "" : ("/" + this.minecraft.getVersionType()));
+            string12 += ("release".equalsIgnoreCase(this.minecraft.getVersionType()) ? "" : ("/" + this.minecraft.getVersionType()));
         }
         if (this.minecraft.isProbablyModded()) {
-            string11 += I18n.get("menu.modded");
+            string12 += I18n.get("menu.modded");
         }
-        this.drawString(this.font, string11, 2, this.height - 10, 0xFFFFFF | integer6);
-        this.drawString(this.font, "Copyright Mojang AB. Do not distribute!", this.copyrightX, this.height - 10, 0xFFFFFF | integer6);
-        if (integer1 > this.copyrightX && integer1 < this.copyrightX + this.copyrightWidth && integer2 > this.height - 10 && integer2 < this.height) {
-            GuiComponent.fill(this.copyrightX, this.height - 1, this.copyrightX + this.copyrightWidth, this.height, 0xFFFFFF | integer6);
+        this.drawString(dhl, this.font, string12, 2, this.height - 10, 0xFFFFFF | integer7);
+        this.drawString(dhl, this.font, "Copyright Mojang AB. Do not distribute!", this.copyrightX, this.height - 10, 0xFFFFFF | integer7);
+        if (integer2 > this.copyrightX && integer2 < this.copyrightX + this.copyrightWidth && integer3 > this.height - 10 && integer3 < this.height) {
+            GuiComponent.fill(dhl, this.copyrightX, this.height - 1, this.copyrightX + this.copyrightWidth, this.height, 0xFFFFFF | integer7);
         }
-        for (final AbstractWidget dct13 : this.buttons) {
-            dct13.setAlpha(float5);
+        for (final AbstractWidget dng14 : this.buttons) {
+            dng14.setAlpha(float6);
         }
-        super.render(integer1, integer2, float3);
-        if (this.realmsNotificationsEnabled() && float5 >= 1.0f) {
-            this.realmsNotificationsScreen.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
+        if (this.realmsNotificationsEnabled() && float6 >= 1.0f) {
+            this.realmsNotificationsScreen.render(dhl, integer2, integer3, float4);
         }
     }
     
@@ -258,13 +322,19 @@ public class TitleScreen extends Screen {
     
     private void confirmDemo(final boolean boolean1) {
         if (boolean1) {
-            final LevelStorageSource crp3 = this.minecraft.getLevelSource();
-            crp3.deleteLevel("Demo_World");
+            try (final LevelStorageSource.LevelStorageAccess a3 = this.minecraft.getLevelSource().createAccess("Demo_World")) {
+                a3.deleteLevel();
+            }
+            catch (IOException iOException3) {
+                SystemToast.onWorldDeleteFailure(this.minecraft, "Demo_World");
+                TitleScreen.LOGGER.warn("Failed to delete demo world", (Throwable)iOException3);
+            }
         }
         this.minecraft.setScreen(this);
     }
     
     static {
+        LOGGER = LogManager.getLogger();
         CUBE_MAP = new CubeMap(new ResourceLocation("textures/gui/title/background/panorama"));
         PANORAMA_OVERLAY = new ResourceLocation("textures/gui/title/background/panorama_overlay.png");
         ACCESSIBILITY_TEXTURE = new ResourceLocation("textures/gui/accessibility.png");
diff --git a/src/net/minecraft/client/gui/screens/VideoSettingsScreen.java b/src/net/minecraft/client/gui/screens/VideoSettingsScreen.java
index 55f02a6..e779865 100644
--- a/src/net/minecraft/client/gui/screens/VideoSettingsScreen.java
+++ b/src/net/minecraft/client/gui/screens/VideoSettingsScreen.java
@@ -1,31 +1,58 @@
 package net.minecraft.client.gui.screens;
 
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.client.gui.components.AbstractWidget;
+import java.util.Optional;
+import net.minecraft.client.gui.components.OptionButton;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.client.Minecraft;
+import net.minecraft.ChatFormatting;
+import com.google.common.collect.Lists;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.FullscreenResolutionProgressOption;
-import net.minecraft.network.chat.Component;
+import net.minecraft.client.GraphicsStatus;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.Options;
-import net.minecraft.client.Option;
+import net.minecraft.client.renderer.GpuWarnlistManager;
 import net.minecraft.client.gui.components.OptionsList;
+import javax.annotation.Nullable;
+import net.minecraft.network.chat.FormattedText;
+import java.util.List;
+import net.minecraft.client.Option;
+import net.minecraft.network.chat.Component;
 
 public class VideoSettingsScreen extends OptionsSubScreen {
-    private OptionsList list;
+    private static final Component FABULOUS;
+    private static final Component WARNING_MESSAGE;
+    private static final Component WARNING_TITLE;
+    private static final Component BUTTON_ACCEPT;
+    private static final Component BUTTON_CANCEL;
+    private static final Component NEW_LINE;
     private static final Option[] OPTIONS;
-    private int oldMipmaps;
+    @Nullable
+    private List<FormattedText> tooltip;
+    private OptionsList list;
+    private final GpuWarnlistManager gpuWarnlistManager;
+    private final int oldMipmaps;
     
-    public VideoSettingsScreen(final Screen dgb, final Options dbr) {
-        super(dgb, dbr, new TranslatableComponent("options.videoTitle", new Object[0]));
+    public VideoSettingsScreen(final Screen dqs, final Options dmb) {
+        super(dqs, dmb, new TranslatableComponent("options.videoTitle"));
+        (this.gpuWarnlistManager = dqs.minecraft.getGpuWarnlistManager()).resetWarnings();
+        if (dmb.graphicsMode == GraphicsStatus.FABULOUS) {
+            this.gpuWarnlistManager.dismissWarning();
+        }
+        this.oldMipmaps = dmb.mipmapLevels;
     }
     
     @Override
     protected void init() {
-        this.oldMipmaps = this.options.mipmapLevels;
         (this.list = new OptionsList(this.minecraft, this.width, this.height, 32, this.height - 32, 25)).addBig(new FullscreenResolutionProgressOption(this.minecraft.getWindow()));
         this.list.addBig(Option.BIOME_BLEND_RADIUS);
         this.list.addSmall(VideoSettingsScreen.OPTIONS);
         this.children.add(this.list);
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 27, 200, 20, I18n.get("gui.done"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 27, 200, 20, CommonComponents.GUI_DONE, dni -> {
             this.minecraft.options.save();
             this.minecraft.getWindow().changeFullscreenVideoMode();
             this.minecraft.setScreen(this.lastScreen);
@@ -44,10 +71,40 @@ public class VideoSettingsScreen extends OptionsSubScreen {
     @Override
     public boolean mouseClicked(final double double1, final double double2, final int integer) {
         final int integer2 = this.options.guiScale;
+        final GraphicsStatus dlr8 = this.options.graphicsMode;
         if (super.mouseClicked(double1, double2, integer)) {
             if (this.options.guiScale != integer2) {
                 this.minecraft.resizeDisplay();
             }
+            if (this.gpuWarnlistManager.isShowingWarning()) {
+                final List<FormattedText> list9 = Lists.<FormattedText>newArrayList(VideoSettingsScreen.WARNING_MESSAGE, VideoSettingsScreen.NEW_LINE);
+                final String string10 = this.gpuWarnlistManager.getRendererWarnings();
+                if (string10 != null) {
+                    list9.add(VideoSettingsScreen.NEW_LINE);
+                    list9.add(new TranslatableComponent("options.graphics.warning.renderer", new Object[] { string10 }).withStyle(ChatFormatting.GRAY));
+                }
+                final String string11 = this.gpuWarnlistManager.getVendorWarnings();
+                if (string11 != null) {
+                    list9.add(VideoSettingsScreen.NEW_LINE);
+                    list9.add(new TranslatableComponent("options.graphics.warning.vendor", new Object[] { string11 }).withStyle(ChatFormatting.GRAY));
+                }
+                final String string12 = this.gpuWarnlistManager.getVersionWarnings();
+                if (string12 != null) {
+                    list9.add(VideoSettingsScreen.NEW_LINE);
+                    list9.add(new TranslatableComponent("options.graphics.warning.version", new Object[] { string12 }).withStyle(ChatFormatting.GRAY));
+                }
+                this.minecraft.setScreen(new PopupScreen(VideoSettingsScreen.WARNING_TITLE, list9, ImmutableList.<PopupScreen.ButtonOption>of(new PopupScreen.ButtonOption(VideoSettingsScreen.BUTTON_ACCEPT, dni -> {
+                    this.options.graphicsMode = GraphicsStatus.FABULOUS;
+                    Minecraft.getInstance().levelRenderer.allChanged();
+                    this.gpuWarnlistManager.dismissWarning();
+                    this.minecraft.setScreen(this);
+                    return;
+                }), new PopupScreen.ButtonOption(VideoSettingsScreen.BUTTON_CANCEL, dni -> {
+                    this.gpuWarnlistManager.dismissWarningAndSkipFabulous();
+                    this.minecraft.setScreen(this);
+                    return;
+                }))));
+            }
             return true;
         }
         return false;
@@ -69,14 +126,29 @@ public class VideoSettingsScreen extends OptionsSubScreen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.list.render(integer1, integer2, float3);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 5, 16777215);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.tooltip = null;
+        final Optional<AbstractWidget> optional6 = this.list.getMouseOver(integer2, integer3);
+        if (optional6.isPresent() && optional6.get() instanceof OptionButton) {
+            final Optional<List<FormattedText>> optional7 = optional6.get().getOption().getTooltip();
+            optional7.ifPresent(list -> this.tooltip = list);
+        }
+        this.renderBackground(dhl);
+        this.list.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 5, 16777215);
+        super.render(dhl, integer2, integer3, float4);
+        if (this.tooltip != null) {
+            this.renderTooltip(dhl, this.tooltip, integer2, integer3);
+        }
     }
     
     static {
-        OPTIONS = new Option[] { Option.GRAPHICS, Option.RENDER_DISTANCE, Option.AMBIENT_OCCLUSION, Option.FRAMERATE_LIMIT, Option.ENABLE_VSYNC, Option.VIEW_BOBBING, Option.GUI_SCALE, Option.ATTACK_INDICATOR, Option.GAMMA, Option.RENDER_CLOUDS, Option.USE_FULLSCREEN, Option.PARTICLES, Option.MIPMAP_LEVELS, Option.ENTITY_SHADOWS };
+        FABULOUS = new TranslatableComponent("options.graphics.fabulous").withStyle(ChatFormatting.ITALIC);
+        WARNING_MESSAGE = new TranslatableComponent("options.graphics.warning.message", new Object[] { VideoSettingsScreen.FABULOUS, VideoSettingsScreen.FABULOUS });
+        WARNING_TITLE = new TranslatableComponent("options.graphics.warning.title").withStyle(ChatFormatting.RED);
+        BUTTON_ACCEPT = new TranslatableComponent("options.graphics.warning.accept");
+        BUTTON_CANCEL = new TranslatableComponent("options.graphics.warning.cancel");
+        NEW_LINE = new TextComponent("\n");
+        OPTIONS = new Option[] { Option.GRAPHICS, Option.RENDER_DISTANCE, Option.AMBIENT_OCCLUSION, Option.FRAMERATE_LIMIT, Option.ENABLE_VSYNC, Option.VIEW_BOBBING, Option.GUI_SCALE, Option.ATTACK_INDICATOR, Option.GAMMA, Option.RENDER_CLOUDS, Option.USE_FULLSCREEN, Option.PARTICLES, Option.MIPMAP_LEVELS, Option.ENTITY_SHADOWS, Option.ENTITY_DISTANCE_SCALING };
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/WinScreen.java b/src/net/minecraft/client/gui/screens/WinScreen.java
index 52abee2..b45bcb8 100644
--- a/src/net/minecraft/client/gui/screens/WinScreen.java
+++ b/src/net/minecraft/client/gui/screens/WinScreen.java
@@ -3,23 +3,29 @@ package net.minecraft.client.gui.screens;
 import org.apache.logging.log4j.LogManager;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.Tesselator;
 import net.minecraft.client.gui.GuiComponent;
+import java.util.Iterator;
 import java.io.InputStream;
 import net.minecraft.server.packs.resources.Resource;
 import java.io.Closeable;
 import org.apache.commons.io.IOUtils;
 import java.util.Collection;
+import net.minecraft.network.chat.Style;
+import net.minecraft.ChatFormatting;
 import java.util.Random;
 import java.io.Reader;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import net.minecraft.ChatFormatting;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import com.google.common.collect.Lists;
 import net.minecraft.client.gui.chat.NarratorChatListener;
+import it.unimi.dsi.fastutil.ints.IntSet;
+import net.minecraft.network.chat.FormattedText;
 import java.util.List;
 import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
@@ -29,10 +35,12 @@ public class WinScreen extends Screen {
     private static final ResourceLocation LOGO_LOCATION;
     private static final ResourceLocation EDITION_LOCATION;
     private static final ResourceLocation VIGNETTE_LOCATION;
+    private static final String OBFUSCATE_TOKEN;
     private final boolean poem;
     private final Runnable onFinished;
     private float time;
-    private List<String> lines;
+    private List<FormattedText> lines;
+    private IntSet centeredLines;
     private int totalScrollLength;
     private float scrollSpeed;
     
@@ -72,49 +80,63 @@ public class WinScreen extends Screen {
             return;
         }
         this.lines = Lists.newArrayList();
-        Resource za2 = null;
+        this.centeredLines = (IntSet)new IntOpenHashSet();
+        Resource abb2 = null;
         try {
-            final String string3 = "" + ChatFormatting.WHITE + ChatFormatting.OBFUSCATED + ChatFormatting.GREEN + ChatFormatting.AQUA;
-            final int integer4 = 274;
+            final int integer3 = 274;
             if (this.poem) {
-                za2 = this.minecraft.getResourceManager().getResource(new ResourceLocation("texts/end.txt"));
-                final InputStream inputStream5 = za2.getInputStream();
-                final BufferedReader bufferedReader6 = new BufferedReader(new InputStreamReader(inputStream5, StandardCharsets.UTF_8));
-                final Random random7 = new Random(8124371L);
-                String string4;
-                while ((string4 = bufferedReader6.readLine()) != null) {
-                    String string5;
-                    String string6;
-                    for (string4 = string4.replaceAll("PLAYERNAME", this.minecraft.getUser().getName()); string4.contains(string3); string4 = string5 + ChatFormatting.WHITE + ChatFormatting.OBFUSCATED + "XXXXXXXX".substring(0, random7.nextInt(4) + 3) + string6) {
-                        final int integer5 = string4.indexOf(string3);
-                        string5 = string4.substring(0, integer5);
-                        string6 = string4.substring(integer5 + string3.length());
+                abb2 = this.minecraft.getResourceManager().getResource(new ResourceLocation("texts/end.txt"));
+                final InputStream inputStream4 = abb2.getInputStream();
+                final BufferedReader bufferedReader5 = new BufferedReader(new InputStreamReader(inputStream4, StandardCharsets.UTF_8));
+                final Random random6 = new Random(8124371L);
+                String string7;
+                while ((string7 = bufferedReader5.readLine()) != null) {
+                    int integer4;
+                    String string8;
+                    String string9;
+                    for (string7 = string7.replaceAll("PLAYERNAME", this.minecraft.getUser().getName()); (integer4 = string7.indexOf(WinScreen.OBFUSCATE_TOKEN)) != -1; string7 = string8 + ChatFormatting.WHITE + ChatFormatting.OBFUSCATED + "XXXXXXXX".substring(0, random6.nextInt(4) + 3) + string9) {
+                        string8 = string7.substring(0, integer4);
+                        string9 = string7.substring(integer4 + WinScreen.OBFUSCATE_TOKEN.length());
                     }
-                    this.lines.addAll(this.minecraft.font.split(string4, 274));
-                    this.lines.add("");
+                    this.lines.addAll(this.minecraft.font.getSplitter().splitLines(string7, 274, Style.EMPTY));
+                    this.lines.add(FormattedText.EMPTY);
                 }
-                inputStream5.close();
-                for (int integer5 = 0; integer5 < 8; ++integer5) {
-                    this.lines.add("");
+                inputStream4.close();
+                for (int integer4 = 0; integer4 < 8; ++integer4) {
+                    this.lines.add(FormattedText.EMPTY);
                 }
             }
-            final InputStream inputStream5 = this.minecraft.getResourceManager().getResource(new ResourceLocation("texts/credits.txt")).getInputStream();
-            final BufferedReader bufferedReader6 = new BufferedReader(new InputStreamReader(inputStream5, StandardCharsets.UTF_8));
-            String string7;
-            while ((string7 = bufferedReader6.readLine()) != null) {
-                string7 = string7.replaceAll("PLAYERNAME", this.minecraft.getUser().getName());
-                string7 = string7.replaceAll("\t", "    ");
-                this.lines.addAll(this.minecraft.font.split(string7, 274));
-                this.lines.add("");
+            final InputStream inputStream4 = this.minecraft.getResourceManager().getResource(new ResourceLocation("texts/credits.txt")).getInputStream();
+            final BufferedReader bufferedReader5 = new BufferedReader(new InputStreamReader(inputStream4, StandardCharsets.UTF_8));
+            String string10;
+            while ((string10 = bufferedReader5.readLine()) != null) {
+                string10 = string10.replaceAll("PLAYERNAME", this.minecraft.getUser().getName());
+                string10 = string10.replaceAll("\t", "    ");
+                boolean boolean7;
+                if (string10.startsWith("[C]")) {
+                    string10 = string10.substring(3);
+                    boolean7 = true;
+                }
+                else {
+                    boolean7 = false;
+                }
+                final List<FormattedText> list8 = this.minecraft.font.getSplitter().splitLines(string10, 274, Style.EMPTY);
+                for (final FormattedText mu10 : list8) {
+                    if (boolean7) {
+                        this.centeredLines.add(this.lines.size());
+                    }
+                    this.lines.add(mu10);
+                }
+                this.lines.add(FormattedText.EMPTY);
             }
-            inputStream5.close();
+            inputStream4.close();
             this.totalScrollLength = this.lines.size() * 12;
         }
         catch (Exception exception3) {
             WinScreen.LOGGER.error("Couldn't load credits", (Throwable)exception3);
         }
         finally {
-            IOUtils.closeQuietly((Closeable)za2);
+            IOUtils.closeQuietly((Closeable)abb2);
         }
     }
     
@@ -135,70 +157,75 @@ public class WinScreen extends Screen {
         }
         float7 *= float7;
         float7 = float7 * 96.0f / 255.0f;
-        final Tesselator cym12 = Tesselator.getInstance();
-        final BufferBuilder cyg13 = cym12.getBuilder();
-        cyg13.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg13.vertex(0.0, this.height, this.getBlitOffset()).uv(0.0f, float4 * 0.015625f).color(float7, float7, float7, 1.0f).endVertex();
-        cyg13.vertex(integer3, this.height, this.getBlitOffset()).uv(integer3 * 0.015625f, float4 * 0.015625f).color(float7, float7, float7, 1.0f).endVertex();
-        cyg13.vertex(integer3, 0.0, this.getBlitOffset()).uv(integer3 * 0.015625f, float5 * 0.015625f).color(float7, float7, float7, 1.0f).endVertex();
-        cyg13.vertex(0.0, 0.0, this.getBlitOffset()).uv(0.0f, float5 * 0.015625f).color(float7, float7, float7, 1.0f).endVertex();
-        cym12.end();
+        final Tesselator dhn12 = Tesselator.getInstance();
+        final BufferBuilder dhg13 = dhn12.getBuilder();
+        dhg13.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+        dhg13.vertex(0.0, this.height, this.getBlitOffset()).uv(0.0f, float4 * 0.015625f).color(float7, float7, float7, 1.0f).endVertex();
+        dhg13.vertex(integer3, this.height, this.getBlitOffset()).uv(integer3 * 0.015625f, float4 * 0.015625f).color(float7, float7, float7, 1.0f).endVertex();
+        dhg13.vertex(integer3, 0.0, this.getBlitOffset()).uv(integer3 * 0.015625f, float5 * 0.015625f).color(float7, float7, float7, 1.0f).endVertex();
+        dhg13.vertex(0.0, 0.0, this.getBlitOffset()).uv(0.0f, float5 * 0.015625f).color(float7, float7, float7, 1.0f).endVertex();
+        dhn12.end();
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBg(integer1, integer2, float3);
-        final int integer3 = 274;
-        final int integer4 = this.width / 2 - 137;
-        final int integer5 = this.height + 50;
-        this.time += float3;
-        final float float4 = -this.time * this.scrollSpeed;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBg(integer2, integer3, float4);
+        final int integer4 = 274;
+        final int integer5 = this.width / 2 - 137;
+        final int integer6 = this.height + 50;
+        this.time += float4;
+        final float float5 = -this.time * this.scrollSpeed;
         RenderSystem.pushMatrix();
-        RenderSystem.translatef(0.0f, float4, 0.0f);
+        RenderSystem.translatef(0.0f, float5, 0.0f);
         this.minecraft.getTextureManager().bind(WinScreen.LOGO_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.enableAlphaTest();
-        this.blit(integer4, integer5, 0, 0, 155, 44);
-        this.blit(integer4 + 155, integer5, 0, 45, 155, 44);
+        RenderSystem.enableBlend();
+        this.blitOutlineBlack(integer5, integer6, (integer2, integer3) -> {
+            this.blit(dhl, integer2 + 0, integer3, 0, 0, 155, 44);
+            this.blit(dhl, integer2 + 155, integer3, 0, 45, 155, 44);
+            return;
+        });
+        RenderSystem.disableBlend();
         this.minecraft.getTextureManager().bind(WinScreen.EDITION_LOCATION);
-        GuiComponent.blit(integer4 + 88, integer5 + 37, 0.0f, 0.0f, 98, 14, 128, 16);
+        GuiComponent.blit(dhl, integer5 + 88, integer6 + 37, 0.0f, 0.0f, 98, 14, 128, 16);
         RenderSystem.disableAlphaTest();
-        int integer6 = integer5 + 100;
-        for (int integer7 = 0; integer7 < this.lines.size(); ++integer7) {
-            if (integer7 == this.lines.size() - 1) {
-                final float float5 = integer6 + float4 - (this.height / 2 - 6);
-                if (float5 < 0.0f) {
-                    RenderSystem.translatef(0.0f, -float5, 0.0f);
+        int integer7 = integer6 + 100;
+        for (int integer8 = 0; integer8 < this.lines.size(); ++integer8) {
+            if (integer8 == this.lines.size() - 1) {
+                final float float6 = integer7 + float5 - (this.height / 2 - 6);
+                if (float6 < 0.0f) {
+                    RenderSystem.translatef(0.0f, -float6, 0.0f);
                 }
             }
-            if (integer6 + float4 + 12.0f + 8.0f > 0.0f && integer6 + float4 < this.height) {
-                final String string11 = this.lines.get(integer7);
-                if (string11.startsWith("[C]")) {
-                    this.font.drawShadow(string11.substring(3), (float)(integer4 + (274 - this.font.width(string11.substring(3))) / 2), (float)integer6, 16777215);
+            if (integer7 + float5 + 12.0f + 8.0f > 0.0f && integer7 + float5 < this.height) {
+                final FormattedText mu12 = this.lines.get(integer8);
+                if (this.centeredLines.contains(integer8)) {
+                    this.font.drawShadow(dhl, mu12, (float)(integer5 + (274 - this.font.width(mu12)) / 2), (float)integer7, 16777215);
                 }
                 else {
-                    this.font.random.setSeed((long)(integer7 * 4238972211L + this.time / 4.0f));
-                    this.font.drawShadow(string11, (float)integer4, (float)integer6, 16777215);
+                    this.font.random.setSeed((long)(integer8 * 4238972211L + this.time / 4.0f));
+                    this.font.drawShadow(dhl, mu12, (float)integer5, (float)integer7, 16777215);
                 }
             }
-            integer6 += 12;
+            integer7 += 12;
         }
         RenderSystem.popMatrix();
         this.minecraft.getTextureManager().bind(WinScreen.VIGNETTE_LOCATION);
         RenderSystem.enableBlend();
         RenderSystem.blendFunc(GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE_MINUS_SRC_COLOR);
-        int integer7 = this.width;
-        final int integer8 = this.height;
-        final Tesselator cym12 = Tesselator.getInstance();
-        final BufferBuilder cyg13 = cym12.getBuilder();
-        cyg13.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-        cyg13.vertex(0.0, integer8, this.getBlitOffset()).uv(0.0f, 1.0f).color(1.0f, 1.0f, 1.0f, 1.0f).endVertex();
-        cyg13.vertex(integer7, integer8, this.getBlitOffset()).uv(1.0f, 1.0f).color(1.0f, 1.0f, 1.0f, 1.0f).endVertex();
-        cyg13.vertex(integer7, 0.0, this.getBlitOffset()).uv(1.0f, 0.0f).color(1.0f, 1.0f, 1.0f, 1.0f).endVertex();
-        cyg13.vertex(0.0, 0.0, this.getBlitOffset()).uv(0.0f, 0.0f).color(1.0f, 1.0f, 1.0f, 1.0f).endVertex();
-        cym12.end();
+        int integer8 = this.width;
+        final int integer9 = this.height;
+        final Tesselator dhn13 = Tesselator.getInstance();
+        final BufferBuilder dhg14 = dhn13.getBuilder();
+        dhg14.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+        dhg14.vertex(0.0, integer9, this.getBlitOffset()).uv(0.0f, 1.0f).color(1.0f, 1.0f, 1.0f, 1.0f).endVertex();
+        dhg14.vertex(integer8, integer9, this.getBlitOffset()).uv(1.0f, 1.0f).color(1.0f, 1.0f, 1.0f, 1.0f).endVertex();
+        dhg14.vertex(integer8, 0.0, this.getBlitOffset()).uv(1.0f, 0.0f).color(1.0f, 1.0f, 1.0f, 1.0f).endVertex();
+        dhg14.vertex(0.0, 0.0, this.getBlitOffset()).uv(0.0f, 0.0f).color(1.0f, 1.0f, 1.0f, 1.0f).endVertex();
+        dhn13.end();
         RenderSystem.disableBlend();
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     static {
@@ -206,5 +233,6 @@ public class WinScreen extends Screen {
         LOGO_LOCATION = new ResourceLocation("textures/gui/title/minecraft.png");
         EDITION_LOCATION = new ResourceLocation("textures/gui/title/edition.png");
         VIGNETTE_LOCATION = new ResourceLocation("textures/misc/vignette.png");
+        OBFUSCATE_TOKEN = "" + ChatFormatting.WHITE + ChatFormatting.OBFUSCATED + ChatFormatting.GREEN + ChatFormatting.AQUA;
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/achievement/StatsScreen.java b/src/net/minecraft/client/gui/screens/achievement/StatsScreen.java
index 36dddb4..7f4e41f 100644
--- a/src/net/minecraft/client/gui/screens/achievement/StatsScreen.java
+++ b/src/net/minecraft/client/gui/screens/achievement/StatsScreen.java
@@ -11,23 +11,28 @@ import net.minecraft.world.item.Items;
 import net.minecraft.core.Registry;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Lists;
-import java.util.Comparator;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.stats.StatType;
 import java.util.List;
 import net.minecraft.ChatFormatting;
+import it.unimi.dsi.fastutil.objects.ObjectListIterator;
+import java.util.Comparator;
 import java.util.Iterator;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.stats.Stat;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.stats.Stats;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.world.item.Item;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.stats.Stat;
 import net.minecraft.client.gui.Font;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.Util;
-import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
 import net.minecraft.network.chat.Component;
@@ -47,11 +52,11 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
     private ObjectSelectionList<?> activeList;
     private boolean isLoading;
     
-    public StatsScreen(final Screen dgb, final StatsCounter aas) {
-        super(new TranslatableComponent("gui.stats", new Object[0]));
+    public StatsScreen(final Screen dqs, final StatsCounter acv) {
+        super(new TranslatableComponent("gui.stats"));
         this.isLoading = true;
-        this.lastScreen = dgb;
-        this.stats = aas;
+        this.lastScreen = dqs;
+        this.stats = acv;
     }
     
     @Override
@@ -67,34 +72,34 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
     }
     
     public void initButtons() {
-        this.<Button>addButton(new Button(this.width / 2 - 120, this.height - 52, 80, 20, I18n.get("stat.generalButton"), dcv -> this.setActiveList(this.statsList)));
-        final Button dcv2 = this.<Button>addButton(new Button(this.width / 2 - 40, this.height - 52, 80, 20, I18n.get("stat.itemsButton"), dcv -> this.setActiveList(this.itemStatsList)));
-        final Button dcv3 = this.<Button>addButton(new Button(this.width / 2 + 40, this.height - 52, 80, 20, I18n.get("stat.mobsButton"), dcv -> this.setActiveList(this.mobsStatsList)));
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 28, 200, 20, I18n.get("gui.done"), dcv -> this.minecraft.setScreen(this.lastScreen)));
+        this.<Button>addButton(new Button(this.width / 2 - 120, this.height - 52, 80, 20, new TranslatableComponent("stat.generalButton"), dni -> this.setActiveList(this.statsList)));
+        final Button dni2 = this.<Button>addButton(new Button(this.width / 2 - 40, this.height - 52, 80, 20, new TranslatableComponent("stat.itemsButton"), dni -> this.setActiveList(this.itemStatsList)));
+        final Button dni3 = this.<Button>addButton(new Button(this.width / 2 + 40, this.height - 52, 80, 20, new TranslatableComponent("stat.mobsButton"), dni -> this.setActiveList(this.mobsStatsList)));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height - 28, 200, 20, CommonComponents.GUI_DONE, dni -> this.minecraft.setScreen(this.lastScreen)));
         if (this.itemStatsList.children().isEmpty()) {
-            dcv2.active = false;
+            dni2.active = false;
         }
         if (this.mobsStatsList.children().isEmpty()) {
-            dcv3.active = false;
+            dni3.active = false;
         }
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (this.isLoading) {
-            this.renderBackground();
-            this.drawCenteredString(this.font, I18n.get("multiplayer.downloadingStats"), this.width / 2, this.height / 2, 16777215);
+            this.renderBackground(dhl);
+            this.drawCenteredString(dhl, this.font, I18n.get("multiplayer.downloadingStats"), this.width / 2, this.height / 2, 16777215);
             final Font font = this.font;
             final String string = StatsScreen.LOADING_SYMBOLS[(int)(Util.getMillis() / 150L % StatsScreen.LOADING_SYMBOLS.length)];
-            final int integer3 = this.width / 2;
+            final int integer4 = this.width / 2;
             final int n = this.height / 2;
             this.font.getClass();
-            this.drawCenteredString(font, string, integer3, n + 9 * 2, 16777215);
+            this.drawCenteredString(dhl, font, string, integer4, n + 9 * 2, 16777215);
         }
         else {
-            this.getActiveList().render(integer1, integer2, float3);
-            this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 20, 16777215);
-            super.render(integer1, integer2, float3);
+            this.getActiveList().render(dhl, integer2, integer3, float4);
+            this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 20, 16777215);
+            super.render(dhl, integer2, integer3, float4);
         }
     }
     
@@ -118,59 +123,65 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
         return this.activeList;
     }
     
-    public void setActiveList(@Nullable final ObjectSelectionList<?> ddg) {
+    public void setActiveList(@Nullable final ObjectSelectionList<?> dnt) {
         this.children.remove(this.statsList);
         this.children.remove(this.itemStatsList);
         this.children.remove(this.mobsStatsList);
-        if (ddg != null) {
-            this.children.add(0, ddg);
-            this.activeList = ddg;
+        if (dnt != null) {
+            this.children.add(0, dnt);
+            this.activeList = dnt;
         }
     }
     
+    private static String getTranslationKey(final Stat<ResourceLocation> acr) {
+        return "stat." + acr.getValue().toString().replace(':', '.');
+    }
+    
     private int getColumnX(final int integer) {
         return 115 + 40 * integer;
     }
     
-    private void blitSlot(final int integer1, final int integer2, final Item bei) {
-        this.blitSlotIcon(integer1 + 1, integer2 + 1, 0, 0);
+    private void blitSlot(final PoseStack dhl, final int integer2, final int integer3, final Item bke) {
+        this.blitSlotIcon(dhl, integer2 + 1, integer3 + 1, 0, 0);
         RenderSystem.enableRescaleNormal();
-        this.itemRenderer.renderGuiItem(bei.getDefaultInstance(), integer1 + 2, integer2 + 2);
+        this.itemRenderer.renderGuiItem(bke.getDefaultInstance(), integer2 + 2, integer3 + 2);
         RenderSystem.disableRescaleNormal();
     }
     
-    private void blitSlotIcon(final int integer1, final int integer2, final int integer3, final int integer4) {
+    private void blitSlotIcon(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(StatsScreen.STATS_ICON_LOCATION);
-        GuiComponent.blit(integer1, integer2, this.getBlitOffset(), (float)integer3, (float)integer4, 18, 18, 128, 128);
+        GuiComponent.blit(dhl, integer2, integer3, this.getBlitOffset(), (float)integer4, (float)integer5, 18, 18, 128, 128);
     }
     
     class GeneralStatisticsList extends ObjectSelectionList<Entry> {
-        public GeneralStatisticsList(final Minecraft dbn) {
-            super(dbn, StatsScreen.this.width, StatsScreen.this.height, 32, StatsScreen.this.height - 64, 10);
-            for (final Stat<ResourceLocation> aao5 : Stats.CUSTOM) {
-                this.addEntry(new Entry((Stat)aao5));
+        public GeneralStatisticsList(final Minecraft dlx) {
+            super(dlx, StatsScreen.this.width, StatsScreen.this.height, 32, StatsScreen.this.height - 64, 10);
+            final ObjectArrayList<Stat<ResourceLocation>> objectArrayList4 = (ObjectArrayList<Stat<ResourceLocation>>)new ObjectArrayList((Iterator)Stats.CUSTOM.iterator());
+            objectArrayList4.sort((Comparator)Comparator.<Object, Comparable>comparing(acr -> I18n.get(getTranslationKey(acr))));
+            for (final Stat<ResourceLocation> acr2 : objectArrayList4) {
+                this.addEntry(new Entry((Stat)acr2));
             }
         }
         
         @Override
-        protected void renderBackground() {
-            StatsScreen.this.renderBackground();
+        protected void renderBackground(final PoseStack dhl) {
+            StatsScreen.this.renderBackground(dhl);
         }
         
         class Entry extends ObjectSelectionList.Entry<Entry> {
             private final Stat<ResourceLocation> stat;
             
-            private Entry(final Stat<ResourceLocation> aao) {
-                this.stat = aao;
+            private Entry(final Stat<ResourceLocation> acr) {
+                this.stat = acr;
             }
             
             @Override
-            public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-                final Component lf11 = new TranslatableComponent("stat." + this.stat.getValue().toString().replace(':', '.'), new Object[0]).withStyle(ChatFormatting.GRAY);
-                GeneralStatisticsList.this.drawString(StatsScreen.this.font, lf11.getString(), integer3 + 2, integer2 + 1, (integer1 % 2 == 0) ? 16777215 : 9474192);
-                final String string12 = this.stat.format(StatsScreen.this.stats.getValue(this.stat));
-                GeneralStatisticsList.this.drawString(StatsScreen.this.font, string12, integer3 + 2 + 213 - StatsScreen.this.font.width(string12), integer2 + 1, (integer1 % 2 == 0) ? 16777215 : 9474192);
+            public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+                final Component mr12 = new TranslatableComponent(getTranslationKey(this.stat)).withStyle(ChatFormatting.GRAY);
+                GeneralStatisticsList.this.drawString(dhl, StatsScreen.this.font, mr12.getString(), integer4 + 2, integer3 + 1, (integer2 % 2 == 0) ? 16777215 : 9474192);
+                final String string13 = this.stat.format(StatsScreen.this.stats.getValue(this.stat));
+                GeneralStatisticsList.this.drawString(dhl, StatsScreen.this.font, string13, integer4 + 2 + 213 - StatsScreen.this.font.width(string13), integer3 + 1, (integer2 % 2 == 0) ? 16777215 : 9474192);
             }
         }
     }
@@ -186,8 +197,8 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
         protected StatType<?> sortColumn;
         protected int sortOrder;
         
-        public ItemStatisticsList(final Minecraft dbn) {
-            super(dbn, StatsScreen.this.width, StatsScreen.this.height, 32, StatsScreen.this.height - 64, 20);
+        public ItemStatisticsList(final Minecraft dlx) {
+            super(dlx, StatsScreen.this.width, StatsScreen.this.height, 32, StatsScreen.this.height - 64, 20);
             this.iconOffsets = new int[] { 3, 4, 1, 2, 5, 6 };
             this.headerPressed = -1;
             this.itemStatSorter = new ItemComparator();
@@ -195,26 +206,26 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
             this.itemColumns = Lists.newArrayList(Stats.ITEM_BROKEN, Stats.ITEM_CRAFTED, Stats.ITEM_USED, Stats.ITEM_PICKED_UP, Stats.ITEM_DROPPED);
             this.setRenderHeader(true, 20);
             final Set<Item> set4 = Sets.<Item>newIdentityHashSet();
-            for (final Item bei6 : Registry.ITEM) {
+            for (final Item bke6 : Registry.ITEM) {
                 boolean boolean7 = false;
-                for (final StatType<Item> aaq9 : this.itemColumns) {
-                    if (aaq9.contains(bei6) && StatsScreen.this.stats.getValue(aaq9.get(bei6)) > 0) {
+                for (final StatType<Item> act9 : this.itemColumns) {
+                    if (act9.contains(bke6) && StatsScreen.this.stats.getValue(act9.get(bke6)) > 0) {
                         boolean7 = true;
                     }
                 }
                 if (boolean7) {
-                    set4.add(bei6);
+                    set4.add(bke6);
                 }
             }
-            for (final Block bph6 : Registry.BLOCK) {
+            for (final Block bvr6 : Registry.BLOCK) {
                 boolean boolean7 = false;
-                for (final StatType<Block> aaq10 : this.blockColumns) {
-                    if (aaq10.contains(bph6) && StatsScreen.this.stats.getValue(aaq10.get(bph6)) > 0) {
+                for (final StatType<Block> act10 : this.blockColumns) {
+                    if (act10.contains(bvr6) && StatsScreen.this.stats.getValue(act10.get(bvr6)) > 0) {
                         boolean7 = true;
                     }
                 }
                 if (boolean7) {
-                    set4.add(bph6.asItem());
+                    set4.add(bvr6.asItem());
                 }
             }
             set4.remove(Items.AIR);
@@ -225,21 +236,21 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
         }
         
         @Override
-        protected void renderHeader(final int integer1, final int integer2, final Tesselator cym) {
+        protected void renderHeader(final PoseStack dhl, final int integer2, final int integer3, final Tesselator dhn) {
             if (!this.minecraft.mouseHandler.isLeftPressed()) {
                 this.headerPressed = -1;
             }
-            for (int integer3 = 0; integer3 < this.iconOffsets.length; ++integer3) {
-                StatsScreen.this.blitSlotIcon(integer1 + StatsScreen.this.getColumnX(integer3) - 18, integer2 + 1, 0, (this.headerPressed == integer3) ? 0 : 18);
+            for (int integer4 = 0; integer4 < this.iconOffsets.length; ++integer4) {
+                StatsScreen.this.blitSlotIcon(dhl, integer2 + StatsScreen.this.getColumnX(integer4) - 18, integer3 + 1, 0, (this.headerPressed == integer4) ? 0 : 18);
             }
             if (this.sortColumn != null) {
-                final int integer3 = StatsScreen.this.getColumnX(this.getColumnIndex(this.sortColumn)) - 36;
-                final int integer4 = (this.sortOrder == 1) ? 2 : 1;
-                StatsScreen.this.blitSlotIcon(integer1 + integer3, integer2 + 1, 18 * integer4, 0);
+                final int integer4 = StatsScreen.this.getColumnX(this.getColumnIndex(this.sortColumn)) - 36;
+                final int integer5 = (this.sortOrder == 1) ? 2 : 1;
+                StatsScreen.this.blitSlotIcon(dhl, integer2 + integer4, integer3 + 1, 18 * integer5, 0);
             }
-            for (int integer3 = 0; integer3 < this.iconOffsets.length; ++integer3) {
-                final int integer4 = (this.headerPressed == integer3) ? 1 : 0;
-                StatsScreen.this.blitSlotIcon(integer1 + StatsScreen.this.getColumnX(integer3) - 18 + integer4, integer2 + 1 + integer4, 18 * this.iconOffsets[integer3], 18);
+            for (int integer4 = 0; integer4 < this.iconOffsets.length; ++integer4) {
+                final int integer5 = (this.headerPressed == integer4) ? 1 : 0;
+                StatsScreen.this.blitSlotIcon(dhl, integer2 + StatsScreen.this.getColumnX(integer4) - 18 + integer5, integer3 + 1 + integer5, 18 * this.iconOffsets[integer4], 18);
             }
         }
         
@@ -254,8 +265,8 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
         }
         
         @Override
-        protected void renderBackground() {
-            StatsScreen.this.renderBackground();
+        protected void renderBackground(final PoseStack dhl) {
+            StatsScreen.this.renderBackground(dhl);
         }
         
         @Override
@@ -278,12 +289,12 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
             return ((integer < this.blockColumns.size()) ? ((StatType<Block>)this.blockColumns.get(integer)) : ((StatType<Item>)this.itemColumns.get(integer - this.blockColumns.size())));
         }
         
-        private int getColumnIndex(final StatType<?> aaq) {
-            final int integer3 = this.blockColumns.indexOf(aaq);
+        private int getColumnIndex(final StatType<?> act) {
+            final int integer3 = this.blockColumns.indexOf(act);
             if (integer3 >= 0) {
                 return integer3;
             }
-            final int integer4 = this.itemColumns.indexOf(aaq);
+            final int integer4 = this.itemColumns.indexOf(act);
             if (integer4 >= 0) {
                 return integer4 + this.blockColumns.size();
             }
@@ -291,55 +302,54 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
         }
         
         @Override
-        protected void renderDecorations(final int integer1, final int integer2) {
-            if (integer2 < this.y0 || integer2 > this.y1) {
+        protected void renderDecorations(final PoseStack dhl, final int integer2, final int integer3) {
+            if (integer3 < this.y0 || integer3 > this.y1) {
                 return;
             }
-            final ItemRow b4 = this.getEntryAtPosition(integer1, integer2);
-            final int integer3 = (this.width - this.getRowWidth()) / 2;
-            if (b4 != null) {
-                if (integer1 < integer3 + 40 || integer1 > integer3 + 40 + 20) {
+            final ItemRow b5 = this.getEntryAtPosition(integer2, integer3);
+            final int integer4 = (this.width - this.getRowWidth()) / 2;
+            if (b5 != null) {
+                if (integer2 < integer4 + 40 || integer2 > integer4 + 40 + 20) {
                     return;
                 }
-                final Item bei6 = this.statItemList.get(this.children().indexOf(b4));
-                this.renderMousehoverTooltip(this.getString(bei6), integer1, integer2);
+                final Item bke7 = this.statItemList.get(this.children().indexOf(b5));
+                this.renderMousehoverTooltip(dhl, this.getString(bke7), integer2, integer3);
             }
             else {
-                Component lf6 = null;
-                final int integer4 = integer1 - integer3;
-                for (int integer5 = 0; integer5 < this.iconOffsets.length; ++integer5) {
-                    final int integer6 = StatsScreen.this.getColumnX(integer5);
-                    if (integer4 >= integer6 - 18 && integer4 <= integer6) {
-                        lf6 = new TranslatableComponent(this.getColumn(integer5).getTranslationKey(), new Object[0]);
+                Component mr7 = null;
+                final int integer5 = integer2 - integer4;
+                for (int integer6 = 0; integer6 < this.iconOffsets.length; ++integer6) {
+                    final int integer7 = StatsScreen.this.getColumnX(integer6);
+                    if (integer5 >= integer7 - 18 && integer5 <= integer7) {
+                        mr7 = new TranslatableComponent(this.getColumn(integer6).getTranslationKey());
                         break;
                     }
                 }
-                this.renderMousehoverTooltip(lf6, integer1, integer2);
+                this.renderMousehoverTooltip(dhl, mr7, integer2, integer3);
             }
         }
         
-        protected void renderMousehoverTooltip(@Nullable final Component lf, final int integer2, final int integer3) {
-            if (lf == null) {
+        protected void renderMousehoverTooltip(final PoseStack dhl, @Nullable final Component mr, final int integer3, final int integer4) {
+            if (mr == null) {
                 return;
             }
-            final String string5 = lf.getColoredString();
-            final int integer4 = integer2 + 12;
-            final int integer5 = integer3 - 12;
-            final int integer6 = StatsScreen.this.font.width(string5);
-            this.fillGradient(integer4 - 3, integer5 - 3, integer4 + integer6 + 3, integer5 + 8 + 3, -1073741824, -1073741824);
+            final int integer5 = integer3 + 12;
+            final int integer6 = integer4 - 12;
+            final int integer7 = StatsScreen.this.font.width(mr);
+            this.fillGradient(dhl, integer5 - 3, integer6 - 3, integer5 + integer7 + 3, integer6 + 8 + 3, -1073741824, -1073741824);
             RenderSystem.pushMatrix();
             RenderSystem.translatef(0.0f, 0.0f, 400.0f);
-            StatsScreen.this.font.drawShadow(string5, (float)integer4, (float)integer5, -1);
+            StatsScreen.this.font.drawShadow(dhl, mr, (float)integer5, (float)integer6, -1);
             RenderSystem.popMatrix();
         }
         
-        protected Component getString(final Item bei) {
-            return bei.getDescription();
+        protected Component getString(final Item bke) {
+            return bke.getDescription();
         }
         
-        protected void sortByColumn(final StatType<?> aaq) {
-            if (aaq != this.sortColumn) {
-                this.sortColumn = aaq;
+        protected void sortByColumn(final StatType<?> act) {
+            if (act != this.sortColumn) {
+                this.sortColumn = act;
                 this.sortOrder = -1;
             }
             else if (this.sortOrder == -1) {
@@ -357,7 +367,7 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
             }
             
             @Override
-            public int compare(final Item bei1, final Item bei2) {
+            public int compare(final Item bke1, final Item bke2) {
                 int integer4;
                 int integer5;
                 if (ItemStatisticsList.this.sortColumn == null) {
@@ -365,17 +375,17 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
                     integer5 = 0;
                 }
                 else if (ItemStatisticsList.this.blockColumns.contains(ItemStatisticsList.this.sortColumn)) {
-                    final StatType<Block> aaq6 = (StatType<Block>)ItemStatisticsList.this.sortColumn;
-                    integer4 = ((bei1 instanceof BlockItem) ? StatsScreen.this.stats.<Block>getValue(aaq6, ((BlockItem)bei1).getBlock()) : -1);
-                    integer5 = ((bei2 instanceof BlockItem) ? StatsScreen.this.stats.<Block>getValue(aaq6, ((BlockItem)bei2).getBlock()) : -1);
+                    final StatType<Block> act6 = (StatType<Block>)ItemStatisticsList.this.sortColumn;
+                    integer4 = ((bke1 instanceof BlockItem) ? StatsScreen.this.stats.<Block>getValue(act6, ((BlockItem)bke1).getBlock()) : -1);
+                    integer5 = ((bke2 instanceof BlockItem) ? StatsScreen.this.stats.<Block>getValue(act6, ((BlockItem)bke2).getBlock()) : -1);
                 }
                 else {
-                    final StatType<Item> aaq7 = (StatType<Item>)ItemStatisticsList.this.sortColumn;
-                    integer4 = StatsScreen.this.stats.<Item>getValue(aaq7, bei1);
-                    integer5 = StatsScreen.this.stats.<Item>getValue(aaq7, bei2);
+                    final StatType<Item> act7 = (StatType<Item>)ItemStatisticsList.this.sortColumn;
+                    integer4 = StatsScreen.this.stats.<Item>getValue(act7, bke1);
+                    integer5 = StatsScreen.this.stats.<Item>getValue(act7, bke2);
                 }
                 if (integer4 == integer5) {
-                    return ItemStatisticsList.this.sortOrder * Integer.compare(Item.getId(bei1), Item.getId(bei2));
+                    return ItemStatisticsList.this.sortOrder * Integer.compare(Item.getId(bke1), Item.getId(bke2));
                 }
                 return ItemStatisticsList.this.sortOrder * Integer.compare(integer4, integer5);
             }
@@ -386,78 +396,78 @@ public class StatsScreen extends Screen implements StatsUpdateListener {
             }
             
             @Override
-            public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-                final Item bei11 = StatsScreen.this.itemStatsList.statItemList.get(integer1);
-                StatsScreen.this.blitSlot(integer3 + 40, integer2, bei11);
-                for (int integer8 = 0; integer8 < StatsScreen.this.itemStatsList.blockColumns.size(); ++integer8) {
-                    Stat<Block> aao13;
-                    if (bei11 instanceof BlockItem) {
-                        aao13 = StatsScreen.this.itemStatsList.blockColumns.get(integer8).get(((BlockItem)bei11).getBlock());
+            public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+                final Item bke12 = StatsScreen.this.itemStatsList.statItemList.get(integer2);
+                StatsScreen.this.blitSlot(dhl, integer4 + 40, integer3, bke12);
+                for (int integer9 = 0; integer9 < StatsScreen.this.itemStatsList.blockColumns.size(); ++integer9) {
+                    Stat<Block> acr14;
+                    if (bke12 instanceof BlockItem) {
+                        acr14 = StatsScreen.this.itemStatsList.blockColumns.get(integer9).get(((BlockItem)bke12).getBlock());
                     }
                     else {
-                        aao13 = null;
+                        acr14 = null;
                     }
-                    this.renderStat(aao13, integer3 + StatsScreen.this.getColumnX(integer8), integer2, integer1 % 2 == 0);
+                    this.renderStat(dhl, acr14, integer4 + StatsScreen.this.getColumnX(integer9), integer3, integer2 % 2 == 0);
                 }
-                for (int integer8 = 0; integer8 < StatsScreen.this.itemStatsList.itemColumns.size(); ++integer8) {
-                    this.renderStat(StatsScreen.this.itemStatsList.itemColumns.get(integer8).get(bei11), integer3 + StatsScreen.this.getColumnX(integer8 + StatsScreen.this.itemStatsList.blockColumns.size()), integer2, integer1 % 2 == 0);
+                for (int integer9 = 0; integer9 < StatsScreen.this.itemStatsList.itemColumns.size(); ++integer9) {
+                    this.renderStat(dhl, StatsScreen.this.itemStatsList.itemColumns.get(integer9).get(bke12), integer4 + StatsScreen.this.getColumnX(integer9 + StatsScreen.this.itemStatsList.blockColumns.size()), integer3, integer2 % 2 == 0);
                 }
             }
             
-            protected void renderStat(@Nullable final Stat<?> aao, final int integer2, final int integer3, final boolean boolean4) {
-                final String string6 = (aao == null) ? "-" : aao.format(StatsScreen.this.stats.getValue(aao));
-                ItemStatisticsList.this.drawString(StatsScreen.this.font, string6, integer2 - StatsScreen.this.font.width(string6), integer3 + 5, boolean4 ? 16777215 : 9474192);
+            protected void renderStat(final PoseStack dhl, @Nullable final Stat<?> acr, final int integer3, final int integer4, final boolean boolean5) {
+                final String string7 = (acr == null) ? "-" : acr.format(StatsScreen.this.stats.getValue(acr));
+                ItemStatisticsList.this.drawString(dhl, StatsScreen.this.font, string7, integer3 - StatsScreen.this.font.width(string7), integer4 + 5, boolean5 ? 16777215 : 9474192);
             }
         }
     }
     
     class MobsStatisticsList extends ObjectSelectionList<MobRow> {
-        public MobsStatisticsList(final Minecraft dbn) {
+        public MobsStatisticsList(final Minecraft dlx) {
             final int width = StatsScreen.this.width;
             final int height = StatsScreen.this.height;
             final int integer4 = 32;
             final int integer5 = StatsScreen.this.height - 64;
             StatsScreen.this.font.getClass();
-            super(dbn, width, height, integer4, integer5, 9 * 4);
-            for (final EntityType<?> aku5 : Registry.ENTITY_TYPE) {
-                if (StatsScreen.this.stats.getValue(Stats.ENTITY_KILLED.get(aku5)) > 0 || StatsScreen.this.stats.getValue(Stats.ENTITY_KILLED_BY.get(aku5)) > 0) {
-                    this.addEntry(new MobRow(aku5));
+            super(dlx, width, height, integer4, integer5, 9 * 4);
+            for (final EntityType<?> aoq5 : Registry.ENTITY_TYPE) {
+                if (StatsScreen.this.stats.getValue(Stats.ENTITY_KILLED.get(aoq5)) > 0 || StatsScreen.this.stats.getValue(Stats.ENTITY_KILLED_BY.get(aoq5)) > 0) {
+                    this.addEntry(new MobRow(aoq5));
                 }
             }
         }
         
         @Override
-        protected void renderBackground() {
-            StatsScreen.this.renderBackground();
+        protected void renderBackground(final PoseStack dhl) {
+            StatsScreen.this.renderBackground(dhl);
         }
         
         class MobRow extends Entry<MobRow> {
             private final EntityType<?> type;
             
-            public MobRow(final EntityType<?> aku) {
-                this.type = aku;
+            public MobRow(final EntityType<?> aoq) {
+                this.type = aoq;
             }
             
             @Override
-            public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-                final String string11 = I18n.get(Util.makeDescriptionId("entity", EntityType.getKey(this.type)));
-                final int integer8 = StatsScreen.this.stats.getValue(Stats.ENTITY_KILLED.get(this.type));
-                final int integer9 = StatsScreen.this.stats.getValue(Stats.ENTITY_KILLED_BY.get(this.type));
-                MobsStatisticsList.this.drawString(StatsScreen.this.font, string11, integer3 + 2, integer2 + 1, 16777215);
+            public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+                final String string12 = I18n.get(Util.makeDescriptionId("entity", EntityType.getKey(this.type)));
+                final int integer9 = StatsScreen.this.stats.getValue(Stats.ENTITY_KILLED.get(this.type));
+                final int integer10 = StatsScreen.this.stats.getValue(Stats.ENTITY_KILLED_BY.get(this.type));
+                MobsStatisticsList.this.drawString(dhl, StatsScreen.this.font, string12, integer4 + 2, integer3 + 1, 16777215);
                 final MobsStatisticsList this$1 = MobsStatisticsList.this;
-                final Font access$1700 = StatsScreen.this.font;
-                final String killsMessage = this.killsMessage(string11, integer8);
-                final int integer10 = integer3 + 2 + 10;
-                final int n = integer2 + 1;
+                final Font access$1800 = StatsScreen.this.font;
+                final String killsMessage = this.killsMessage(string12, integer9);
+                final int integer11 = integer4 + 2 + 10;
+                final int n = integer3 + 1;
                 StatsScreen.this.font.getClass();
-                this$1.drawString(access$1700, killsMessage, integer10, n + 9, (integer8 == 0) ? 6316128 : 9474192);
+                this$1.drawString(dhl, access$1800, killsMessage, integer11, n + 9, (integer9 == 0) ? 6316128 : 9474192);
                 final MobsStatisticsList this$2 = MobsStatisticsList.this;
-                final Font access$1701 = StatsScreen.this.font;
-                final String killedByMessage = this.killedByMessage(string11, integer9);
-                final int integer11 = integer3 + 2 + 10;
-                final int n2 = integer2 + 1;
+                final Font access$1801 = StatsScreen.this.font;
+                final String killedByMessage = this.killedByMessage(string12, integer10);
+                final int integer12 = integer4 + 2 + 10;
+                final int n2 = integer3 + 1;
                 StatsScreen.this.font.getClass();
-                this$2.drawString(access$1701, killedByMessage, integer11, n2 + 9 * 2, (integer9 == 0) ? 6316128 : 9474192);
+                this$2.drawString(dhl, access$1801, killedByMessage, integer12, n2 + 9 * 2, (integer10 == 0) ? 6316128 : 9474192);
             }
             
             private String killsMessage(final String string, final int integer) {
diff --git a/src/net/minecraft/client/gui/screens/advancements/AdvancementTab.java b/src/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
index 33eceb0..f9798f8 100644
--- a/src/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
+++ b/src/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
@@ -7,8 +7,10 @@ import net.minecraft.util.Mth;
 import net.minecraft.client.renderer.texture.TextureManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.renderer.entity.ItemRenderer;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.collect.Maps;
 import java.util.Map;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.advancements.DisplayInfo;
 import net.minecraft.advancements.Advancement;
@@ -23,7 +25,7 @@ public class AdvancementTab extends GuiComponent {
     private final Advancement advancement;
     private final DisplayInfo display;
     private final ItemStack icon;
-    private final String title;
+    private final Component title;
     private final AdvancementWidget root;
     private final Map<Advancement, AdvancementWidget> widgets;
     private double scrollX;
@@ -35,40 +37,40 @@ public class AdvancementTab extends GuiComponent {
     private float fade;
     private boolean centered;
     
-    public AdvancementTab(final Minecraft dbn, final AdvancementsScreen dgp, final AdvancementTabType dgm, final int integer, final Advancement u, final DisplayInfo ad) {
+    public AdvancementTab(final Minecraft dlx, final AdvancementsScreen drg, final AdvancementTabType drd, final int integer, final Advancement w, final DisplayInfo af) {
         this.widgets = Maps.newLinkedHashMap();
         this.minX = Integer.MAX_VALUE;
         this.minY = Integer.MAX_VALUE;
         this.maxX = Integer.MIN_VALUE;
         this.maxY = Integer.MIN_VALUE;
-        this.minecraft = dbn;
-        this.screen = dgp;
-        this.type = dgm;
+        this.minecraft = dlx;
+        this.screen = drg;
+        this.type = drd;
         this.index = integer;
-        this.advancement = u;
-        this.display = ad;
-        this.icon = ad.getIcon();
-        this.title = ad.getTitle().getColoredString();
-        this.addWidget(this.root = new AdvancementWidget(this, dbn, u, ad), u);
+        this.advancement = w;
+        this.display = af;
+        this.icon = af.getIcon();
+        this.title = af.getTitle();
+        this.addWidget(this.root = new AdvancementWidget(this, dlx, w, af), w);
     }
     
     public Advancement getAdvancement() {
         return this.advancement;
     }
     
-    public String getTitle() {
+    public Component getTitle() {
         return this.title;
     }
     
-    public void drawTab(final int integer1, final int integer2, final boolean boolean3) {
-        this.type.draw(this, integer1, integer2, boolean3, this.index);
+    public void drawTab(final PoseStack dhl, final int integer2, final int integer3, final boolean boolean4) {
+        this.type.draw(dhl, this, integer2, integer3, boolean4, this.index);
     }
     
-    public void drawIcon(final int integer1, final int integer2, final ItemRenderer dvz) {
-        this.type.drawIcon(integer1, integer2, this.index, dvz, this.icon);
+    public void drawIcon(final int integer1, final int integer2, final ItemRenderer ehh) {
+        this.type.drawIcon(integer1, integer2, this.index, ehh, this.icon);
     }
     
-    public void drawContents() {
+    public void drawContents(final PoseStack dhl) {
         if (!this.centered) {
             this.scrollX = 117 - (this.maxX + this.minX) / 2;
             this.scrollY = 56 - (this.maxY + this.minY) / 2;
@@ -78,59 +80,59 @@ public class AdvancementTab extends GuiComponent {
         RenderSystem.enableDepthTest();
         RenderSystem.translatef(0.0f, 0.0f, 950.0f);
         RenderSystem.colorMask(false, false, false, false);
-        GuiComponent.fill(4680, 2260, -4680, -2260, -16777216);
+        GuiComponent.fill(dhl, 4680, 2260, -4680, -2260, -16777216);
         RenderSystem.colorMask(true, true, true, true);
         RenderSystem.translatef(0.0f, 0.0f, -950.0f);
         RenderSystem.depthFunc(518);
-        GuiComponent.fill(234, 113, 0, 0, -16777216);
+        GuiComponent.fill(dhl, 234, 113, 0, 0, -16777216);
         RenderSystem.depthFunc(515);
-        final ResourceLocation sm2 = this.display.getBackground();
-        if (sm2 != null) {
-            this.minecraft.getTextureManager().bind(sm2);
+        final ResourceLocation uh3 = this.display.getBackground();
+        if (uh3 != null) {
+            this.minecraft.getTextureManager().bind(uh3);
         }
         else {
             this.minecraft.getTextureManager().bind(TextureManager.INTENTIONAL_MISSING_TEXTURE);
         }
-        final int integer3 = Mth.floor(this.scrollX);
-        final int integer4 = Mth.floor(this.scrollY);
-        final int integer5 = integer3 % 16;
+        final int integer4 = Mth.floor(this.scrollX);
+        final int integer5 = Mth.floor(this.scrollY);
         final int integer6 = integer4 % 16;
-        for (int integer7 = -1; integer7 <= 15; ++integer7) {
-            for (int integer8 = -1; integer8 <= 8; ++integer8) {
-                GuiComponent.blit(integer5 + 16 * integer7, integer6 + 16 * integer8, 0.0f, 0.0f, 16, 16, 16, 16);
+        final int integer7 = integer5 % 16;
+        for (int integer8 = -1; integer8 <= 15; ++integer8) {
+            for (int integer9 = -1; integer9 <= 8; ++integer9) {
+                GuiComponent.blit(dhl, integer6 + 16 * integer8, integer7 + 16 * integer9, 0.0f, 0.0f, 16, 16, 16, 16);
             }
         }
-        this.root.drawConnectivity(integer3, integer4, true);
-        this.root.drawConnectivity(integer3, integer4, false);
-        this.root.draw(integer3, integer4);
+        this.root.drawConnectivity(dhl, integer4, integer5, true);
+        this.root.drawConnectivity(dhl, integer4, integer5, false);
+        this.root.draw(dhl, integer4, integer5);
         RenderSystem.depthFunc(518);
         RenderSystem.translatef(0.0f, 0.0f, -950.0f);
         RenderSystem.colorMask(false, false, false, false);
-        GuiComponent.fill(4680, 2260, -4680, -2260, -16777216);
+        GuiComponent.fill(dhl, 4680, 2260, -4680, -2260, -16777216);
         RenderSystem.colorMask(true, true, true, true);
         RenderSystem.translatef(0.0f, 0.0f, 950.0f);
         RenderSystem.depthFunc(515);
         RenderSystem.popMatrix();
     }
     
-    public void drawTooltips(final int integer1, final int integer2, final int integer3, final int integer4) {
+    public void drawTooltips(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
         RenderSystem.pushMatrix();
         RenderSystem.translatef(0.0f, 0.0f, 200.0f);
-        GuiComponent.fill(0, 0, 234, 113, Mth.floor(this.fade * 255.0f) << 24);
-        boolean boolean6 = false;
-        final int integer5 = Mth.floor(this.scrollX);
-        final int integer6 = Mth.floor(this.scrollY);
-        if (integer1 > 0 && integer1 < 234 && integer2 > 0 && integer2 < 113) {
-            for (final AdvancementWidget dgn10 : this.widgets.values()) {
-                if (dgn10.isMouseOver(integer5, integer6, integer1, integer2)) {
-                    boolean6 = true;
-                    dgn10.drawHover(integer5, integer6, this.fade, integer3, integer4);
+        GuiComponent.fill(dhl, 0, 0, 234, 113, Mth.floor(this.fade * 255.0f) << 24);
+        boolean boolean7 = false;
+        final int integer6 = Mth.floor(this.scrollX);
+        final int integer7 = Mth.floor(this.scrollY);
+        if (integer2 > 0 && integer2 < 234 && integer3 > 0 && integer3 < 113) {
+            for (final AdvancementWidget dre11 : this.widgets.values()) {
+                if (dre11.isMouseOver(integer6, integer7, integer2, integer3)) {
+                    boolean7 = true;
+                    dre11.drawHover(dhl, integer6, integer7, this.fade, integer4, integer5);
                     break;
                 }
             }
         }
         RenderSystem.popMatrix();
-        if (boolean6) {
+        if (boolean7) {
             this.fade = Mth.clamp(this.fade + 0.02f, 0.0f, 0.3f);
         }
         else {
@@ -143,15 +145,15 @@ public class AdvancementTab extends GuiComponent {
     }
     
     @Nullable
-    public static AdvancementTab create(final Minecraft dbn, final AdvancementsScreen dgp, int integer, final Advancement u) {
-        if (u.getDisplay() == null) {
+    public static AdvancementTab create(final Minecraft dlx, final AdvancementsScreen drg, int integer, final Advancement w) {
+        if (w.getDisplay() == null) {
             return null;
         }
-        for (final AdvancementTabType dgm8 : AdvancementTabType.values()) {
-            if (integer < dgm8.getMax()) {
-                return new AdvancementTab(dbn, dgp, dgm8, integer, u, u.getDisplay());
+        for (final AdvancementTabType drd8 : AdvancementTabType.values()) {
+            if (integer < drd8.getMax()) {
+                return new AdvancementTab(dlx, drg, drd8, integer, w, w.getDisplay());
             }
-            integer -= dgm8.getMax();
+            integer -= drd8.getMax();
         }
         return null;
     }
@@ -165,32 +167,32 @@ public class AdvancementTab extends GuiComponent {
         }
     }
     
-    public void addAdvancement(final Advancement u) {
-        if (u.getDisplay() == null) {
+    public void addAdvancement(final Advancement w) {
+        if (w.getDisplay() == null) {
             return;
         }
-        final AdvancementWidget dgn3 = new AdvancementWidget(this, this.minecraft, u, u.getDisplay());
-        this.addWidget(dgn3, u);
+        final AdvancementWidget dre3 = new AdvancementWidget(this, this.minecraft, w, w.getDisplay());
+        this.addWidget(dre3, w);
     }
     
-    private void addWidget(final AdvancementWidget dgn, final Advancement u) {
-        this.widgets.put(u, dgn);
-        final int integer4 = dgn.getX();
+    private void addWidget(final AdvancementWidget dre, final Advancement w) {
+        this.widgets.put(w, dre);
+        final int integer4 = dre.getX();
         final int integer5 = integer4 + 28;
-        final int integer6 = dgn.getY();
+        final int integer6 = dre.getY();
         final int integer7 = integer6 + 27;
         this.minX = Math.min(this.minX, integer4);
         this.maxX = Math.max(this.maxX, integer5);
         this.minY = Math.min(this.minY, integer6);
         this.maxY = Math.max(this.maxY, integer7);
-        for (final AdvancementWidget dgn2 : this.widgets.values()) {
-            dgn2.attachToParent();
+        for (final AdvancementWidget dre2 : this.widgets.values()) {
+            dre2.attachToParent();
         }
     }
     
     @Nullable
-    public AdvancementWidget getWidget(final Advancement u) {
-        return this.widgets.get(u);
+    public AdvancementWidget getWidget(final Advancement w) {
+        return this.widgets.get(w);
     }
     
     public AdvancementsScreen getScreen() {
diff --git a/src/net/minecraft/client/gui/screens/advancements/AdvancementTabType.java b/src/net/minecraft/client/gui/screens/advancements/AdvancementTabType.java
index 9d3439a..eaf318f 100644
--- a/src/net/minecraft/client/gui/screens/advancements/AdvancementTabType.java
+++ b/src/net/minecraft/client/gui/screens/advancements/AdvancementTabType.java
@@ -1,9 +1,9 @@
 package net.minecraft.client.gui.screens.advancements;
 
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.gui.GuiComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
 
 enum AdvancementTabType {
     ABOVE(0, 0, 28, 32, 8), 
@@ -29,19 +29,19 @@ enum AdvancementTabType {
         return this.max;
     }
     
-    public void draw(final GuiComponent dcj, final int integer2, final int integer3, final boolean boolean4, final int integer5) {
-        int integer6 = this.textureX;
-        if (integer5 > 0) {
-            integer6 += this.width;
+    public void draw(final PoseStack dhl, final GuiComponent dmv, final int integer3, final int integer4, final boolean boolean5, final int integer6) {
+        int integer7 = this.textureX;
+        if (integer6 > 0) {
+            integer7 += this.width;
         }
-        if (integer5 == this.max - 1) {
-            integer6 += this.width;
+        if (integer6 == this.max - 1) {
+            integer7 += this.width;
         }
-        final int integer7 = boolean4 ? (this.textureY + this.height) : this.textureY;
-        dcj.blit(integer2 + this.getX(integer5), integer3 + this.getY(integer5), integer6, integer7, this.width, this.height);
+        final int integer8 = boolean5 ? (this.textureY + this.height) : this.textureY;
+        dmv.blit(dhl, integer3 + this.getX(integer6), integer4 + this.getY(integer6), integer7, integer8, this.width, this.height);
     }
     
-    public void drawIcon(final int integer1, final int integer2, final int integer3, final ItemRenderer dvz, final ItemStack ben) {
+    public void drawIcon(final int integer1, final int integer2, final int integer3, final ItemRenderer ehh, final ItemStack bki) {
         int integer4 = integer1 + this.getX(integer3);
         int integer5 = integer2 + this.getY(integer3);
         switch (this) {
@@ -66,7 +66,7 @@ enum AdvancementTabType {
                 break;
             }
         }
-        dvz.renderAndDecorateItem(null, ben, integer4, integer5);
+        ehh.renderAndDecorateFakeItem(bki, integer4, integer5);
     }
     
     public int getX(final int integer) {
diff --git a/src/net/minecraft/client/gui/screens/advancements/AdvancementWidget.java b/src/net/minecraft/client/gui/screens/advancements/AdvancementWidget.java
index 032c26c..98c3de4 100644
--- a/src/net/minecraft/client/gui/screens/advancements/AdvancementWidget.java
+++ b/src/net/minecraft/client/gui/screens/advancements/AdvancementWidget.java
@@ -2,31 +2,34 @@ package net.minecraft.client.gui.screens.advancements;
 
 import net.minecraft.client.gui.Font;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.world.entity.LivingEntity;
+import com.mojang.blaze3d.vertex.PoseStack;
 import javax.annotation.Nullable;
-import java.util.regex.Matcher;
-import java.util.Collections;
+import java.util.function.ToDoubleFunction;
+import net.minecraft.client.StringSplitter;
 import java.util.Iterator;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentUtils;
+import net.minecraft.network.chat.Style;
 import net.minecraft.util.Mth;
 import com.google.common.collect.Lists;
 import net.minecraft.advancements.AdvancementProgress;
 import net.minecraft.client.Minecraft;
 import java.util.List;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.advancements.DisplayInfo;
 import net.minecraft.advancements.Advancement;
-import java.util.regex.Pattern;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.gui.GuiComponent;
 
 public class AdvancementWidget extends GuiComponent {
     private static final ResourceLocation WIDGETS_LOCATION;
-    private static final Pattern LAST_WORD;
+    private static final int[] TEST_SPLIT_OFFSETS;
     private final AdvancementTab tab;
     private final Advancement advancement;
     private final DisplayInfo display;
-    private final String title;
+    private final FormattedText title;
     private final int width;
-    private final List<String> description;
+    private final List<FormattedText> description;
     private final Minecraft minecraft;
     private AdvancementWidget parent;
     private final List<AdvancementWidget> children;
@@ -34,239 +37,236 @@ public class AdvancementWidget extends GuiComponent {
     private final int x;
     private final int y;
     
-    public AdvancementWidget(final AdvancementTab dgl, final Minecraft dbn, final Advancement u, final DisplayInfo ad) {
+    public AdvancementWidget(final AdvancementTab drc, final Minecraft dlx, final Advancement w, final DisplayInfo af) {
         this.children = Lists.newArrayList();
-        this.tab = dgl;
-        this.advancement = u;
-        this.display = ad;
-        this.minecraft = dbn;
-        this.title = dbn.font.substrByWidth(ad.getTitle().getColoredString(), 163);
-        this.x = Mth.floor(ad.getX() * 28.0f);
-        this.y = Mth.floor(ad.getY() * 27.0f);
-        final int integer6 = u.getMaxCriteraRequired();
+        this.tab = drc;
+        this.advancement = w;
+        this.display = af;
+        this.minecraft = dlx;
+        this.title = dlx.font.substrByWidth(af.getTitle(), 163);
+        this.x = Mth.floor(af.getX() * 28.0f);
+        this.y = Mth.floor(af.getY() * 27.0f);
+        final int integer6 = w.getMaxCriteraRequired();
         final int integer7 = String.valueOf(integer6).length();
-        final int integer8 = (integer6 > 1) ? (dbn.font.width("  ") + dbn.font.width("0") * integer7 * 2 + dbn.font.width("/")) : 0;
-        int integer9 = 29 + dbn.font.width(this.title) + integer8;
-        final String string10 = ad.getDescription().getColoredString();
-        this.description = this.findOptimalLines(string10, integer9);
-        for (final String string11 : this.description) {
-            integer9 = Math.max(integer9, dbn.font.width(string11));
+        final int integer8 = (integer6 > 1) ? (dlx.font.width("  ") + dlx.font.width("0") * integer7 * 2 + dlx.font.width("/")) : 0;
+        int integer9 = 29 + dlx.font.width(this.title) + integer8;
+        this.description = this.findOptimalLines(ComponentUtils.mergeStyles(af.getDescription().copy(), Style.EMPTY.withColor(af.getFrame().getChatColor())), integer9);
+        for (final FormattedText mu11 : this.description) {
+            integer9 = Math.max(integer9, dlx.font.width(mu11));
         }
         this.width = integer9 + 3 + 5;
     }
     
-    private List<String> findOptimalLines(final String string, final int integer) {
-        if (string.isEmpty()) {
-            return Collections.<String>emptyList();
-        }
-        final List<String> list4 = this.minecraft.font.split(string, integer);
-        if (list4.size() < 2) {
-            return list4;
-        }
-        final String string2 = list4.get(0);
-        final String string3 = list4.get(1);
-        final int integer2 = this.minecraft.font.width(string2 + ' ' + string3.split(" ")[0]);
-        if (integer2 - integer <= 10) {
-            return this.minecraft.font.split(string, integer2);
-        }
-        final Matcher matcher8 = AdvancementWidget.LAST_WORD.matcher(string2);
-        if (matcher8.matches()) {
-            final int integer3 = this.minecraft.font.width(matcher8.group(1));
-            if (integer - integer3 <= 10) {
-                return this.minecraft.font.split(string, integer3);
+    private static float getMaxWidth(final StringSplitter dmi, final List<FormattedText> list) {
+        return (float)list.stream().mapToDouble(dmi::stringWidth).max().orElse(0.0);
+    }
+    
+    private List<FormattedText> findOptimalLines(final Component mr, final int integer) {
+        final StringSplitter dmi4 = this.minecraft.font.getSplitter();
+        List<FormattedText> list5 = null;
+        float float6 = Float.MAX_VALUE;
+        for (final int integer2 : AdvancementWidget.TEST_SPLIT_OFFSETS) {
+            final List<FormattedText> list6 = dmi4.splitLines(mr, integer - integer2, Style.EMPTY);
+            final float float7 = Math.abs(getMaxWidth(dmi4, list6) - integer);
+            if (float7 <= 10.0f) {
+                return list6;
+            }
+            if (float7 < float6) {
+                float6 = float7;
+                list5 = list6;
             }
         }
-        return list4;
+        return list5;
     }
     
     @Nullable
-    private AdvancementWidget getFirstVisibleParent(Advancement u) {
+    private AdvancementWidget getFirstVisibleParent(Advancement w) {
         do {
-            u = u.getParent();
-        } while (u != null && u.getDisplay() == null);
-        if (u == null || u.getDisplay() == null) {
+            w = w.getParent();
+        } while (w != null && w.getDisplay() == null);
+        if (w == null || w.getDisplay() == null) {
             return null;
         }
-        return this.tab.getWidget(u);
+        return this.tab.getWidget(w);
     }
     
-    public void drawConnectivity(final int integer1, final int integer2, final boolean boolean3) {
+    public void drawConnectivity(final PoseStack dhl, final int integer2, final int integer3, final boolean boolean4) {
         if (this.parent != null) {
-            final int integer3 = integer1 + this.parent.x + 13;
-            final int integer4 = integer1 + this.parent.x + 26 + 4;
-            final int integer5 = integer2 + this.parent.y + 13;
-            final int integer6 = integer1 + this.x + 13;
-            final int integer7 = integer2 + this.y + 13;
-            final int integer8 = boolean3 ? -16777216 : -1;
-            if (boolean3) {
-                this.hLine(integer4, integer3, integer5 - 1, integer8);
-                this.hLine(integer4 + 1, integer3, integer5, integer8);
-                this.hLine(integer4, integer3, integer5 + 1, integer8);
-                this.hLine(integer6, integer4 - 1, integer7 - 1, integer8);
-                this.hLine(integer6, integer4 - 1, integer7, integer8);
-                this.hLine(integer6, integer4 - 1, integer7 + 1, integer8);
-                this.vLine(integer4 - 1, integer7, integer5, integer8);
-                this.vLine(integer4 + 1, integer7, integer5, integer8);
+            final int integer4 = integer2 + this.parent.x + 13;
+            final int integer5 = integer2 + this.parent.x + 26 + 4;
+            final int integer6 = integer3 + this.parent.y + 13;
+            final int integer7 = integer2 + this.x + 13;
+            final int integer8 = integer3 + this.y + 13;
+            final int integer9 = boolean4 ? -16777216 : -1;
+            if (boolean4) {
+                this.hLine(dhl, integer5, integer4, integer6 - 1, integer9);
+                this.hLine(dhl, integer5 + 1, integer4, integer6, integer9);
+                this.hLine(dhl, integer5, integer4, integer6 + 1, integer9);
+                this.hLine(dhl, integer7, integer5 - 1, integer8 - 1, integer9);
+                this.hLine(dhl, integer7, integer5 - 1, integer8, integer9);
+                this.hLine(dhl, integer7, integer5 - 1, integer8 + 1, integer9);
+                this.vLine(dhl, integer5 - 1, integer8, integer6, integer9);
+                this.vLine(dhl, integer5 + 1, integer8, integer6, integer9);
             }
             else {
-                this.hLine(integer4, integer3, integer5, integer8);
-                this.hLine(integer6, integer4, integer7, integer8);
-                this.vLine(integer4, integer7, integer5, integer8);
+                this.hLine(dhl, integer5, integer4, integer6, integer9);
+                this.hLine(dhl, integer7, integer5, integer8, integer9);
+                this.vLine(dhl, integer5, integer8, integer6, integer9);
             }
         }
-        for (final AdvancementWidget dgn6 : this.children) {
-            dgn6.drawConnectivity(integer1, integer2, boolean3);
+        for (final AdvancementWidget dre7 : this.children) {
+            dre7.drawConnectivity(dhl, integer2, integer3, boolean4);
         }
     }
     
-    public void draw(final int integer1, final int integer2) {
+    public void draw(final PoseStack dhl, final int integer2, final int integer3) {
         if (!this.display.isHidden() || (this.progress != null && this.progress.isDone())) {
-            final float float4 = (this.progress == null) ? 0.0f : this.progress.getPercent();
-            AdvancementWidgetType dgo5;
-            if (float4 >= 1.0f) {
-                dgo5 = AdvancementWidgetType.OBTAINED;
+            final float float5 = (this.progress == null) ? 0.0f : this.progress.getPercent();
+            AdvancementWidgetType drf6;
+            if (float5 >= 1.0f) {
+                drf6 = AdvancementWidgetType.OBTAINED;
             }
             else {
-                dgo5 = AdvancementWidgetType.UNOBTAINED;
+                drf6 = AdvancementWidgetType.UNOBTAINED;
             }
             this.minecraft.getTextureManager().bind(AdvancementWidget.WIDGETS_LOCATION);
-            this.blit(integer1 + this.x + 3, integer2 + this.y, this.display.getFrame().getTexture(), 128 + dgo5.getIndex() * 26, 26, 26);
-            this.minecraft.getItemRenderer().renderAndDecorateItem(null, this.display.getIcon(), integer1 + this.x + 8, integer2 + this.y + 5);
+            this.blit(dhl, integer2 + this.x + 3, integer3 + this.y, this.display.getFrame().getTexture(), 128 + drf6.getIndex() * 26, 26, 26);
+            this.minecraft.getItemRenderer().renderAndDecorateFakeItem(this.display.getIcon(), integer2 + this.x + 8, integer3 + this.y + 5);
         }
-        for (final AdvancementWidget dgn5 : this.children) {
-            dgn5.draw(integer1, integer2);
+        for (final AdvancementWidget dre6 : this.children) {
+            dre6.draw(dhl, integer2, integer3);
         }
     }
     
-    public void setProgress(final AdvancementProgress w) {
-        this.progress = w;
+    public void setProgress(final AdvancementProgress y) {
+        this.progress = y;
     }
     
-    public void addChild(final AdvancementWidget dgn) {
-        this.children.add(dgn);
+    public void addChild(final AdvancementWidget dre) {
+        this.children.add(dre);
     }
     
-    public void drawHover(final int integer1, final int integer2, final float float3, final int integer4, final int integer5) {
-        final boolean boolean7 = integer4 + integer1 + this.x + this.width + 26 >= this.tab.getScreen().width;
-        final String string8 = (this.progress == null) ? null : this.progress.getProgressText();
-        final int integer6 = (string8 == null) ? 0 : this.minecraft.font.width(string8);
-        final int n = 113 - integer2 - this.y - 26;
+    public void drawHover(final PoseStack dhl, final int integer2, final int integer3, final float float4, final int integer5, final int integer6) {
+        final boolean boolean8 = integer5 + integer2 + this.x + this.width + 26 >= this.tab.getScreen().width;
+        final String string9 = (this.progress == null) ? null : this.progress.getProgressText();
+        final int integer7 = (string9 == null) ? 0 : this.minecraft.font.width(string9);
+        final int n = 113 - integer3 - this.y - 26;
         final int n2 = 6;
         final int size = this.description.size();
         this.minecraft.font.getClass();
-        final boolean boolean8 = n <= n2 + size * 9;
-        final float float4 = (this.progress == null) ? 0.0f : this.progress.getPercent();
-        int integer7 = Mth.floor(float4 * this.width);
-        AdvancementWidgetType dgo12;
-        AdvancementWidgetType dgo13;
-        AdvancementWidgetType dgo14;
-        if (float4 >= 1.0f) {
-            integer7 = this.width / 2;
-            dgo12 = AdvancementWidgetType.OBTAINED;
-            dgo13 = AdvancementWidgetType.OBTAINED;
-            dgo14 = AdvancementWidgetType.OBTAINED;
+        final boolean boolean9 = n <= n2 + size * 9;
+        final float float5 = (this.progress == null) ? 0.0f : this.progress.getPercent();
+        int integer8 = Mth.floor(float5 * this.width);
+        AdvancementWidgetType drf13;
+        AdvancementWidgetType drf14;
+        AdvancementWidgetType drf15;
+        if (float5 >= 1.0f) {
+            integer8 = this.width / 2;
+            drf13 = AdvancementWidgetType.OBTAINED;
+            drf14 = AdvancementWidgetType.OBTAINED;
+            drf15 = AdvancementWidgetType.OBTAINED;
         }
-        else if (integer7 < 2) {
-            integer7 = this.width / 2;
-            dgo12 = AdvancementWidgetType.UNOBTAINED;
-            dgo13 = AdvancementWidgetType.UNOBTAINED;
-            dgo14 = AdvancementWidgetType.UNOBTAINED;
+        else if (integer8 < 2) {
+            integer8 = this.width / 2;
+            drf13 = AdvancementWidgetType.UNOBTAINED;
+            drf14 = AdvancementWidgetType.UNOBTAINED;
+            drf15 = AdvancementWidgetType.UNOBTAINED;
         }
-        else if (integer7 > this.width - 2) {
-            integer7 = this.width / 2;
-            dgo12 = AdvancementWidgetType.OBTAINED;
-            dgo13 = AdvancementWidgetType.OBTAINED;
-            dgo14 = AdvancementWidgetType.UNOBTAINED;
+        else if (integer8 > this.width - 2) {
+            integer8 = this.width / 2;
+            drf13 = AdvancementWidgetType.OBTAINED;
+            drf14 = AdvancementWidgetType.OBTAINED;
+            drf15 = AdvancementWidgetType.UNOBTAINED;
         }
         else {
-            dgo12 = AdvancementWidgetType.OBTAINED;
-            dgo13 = AdvancementWidgetType.UNOBTAINED;
-            dgo14 = AdvancementWidgetType.UNOBTAINED;
+            drf13 = AdvancementWidgetType.OBTAINED;
+            drf14 = AdvancementWidgetType.UNOBTAINED;
+            drf15 = AdvancementWidgetType.UNOBTAINED;
         }
-        final int integer8 = this.width - integer7;
+        final int integer9 = this.width - integer8;
         this.minecraft.getTextureManager().bind(AdvancementWidget.WIDGETS_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.enableBlend();
-        final int integer9 = integer2 + this.y;
-        int integer10;
-        if (boolean7) {
-            integer10 = integer1 + this.x - this.width + 26 + 6;
+        final int integer10 = integer3 + this.y;
+        int integer11;
+        if (boolean8) {
+            integer11 = integer2 + this.x - this.width + 26 + 6;
         }
         else {
-            integer10 = integer1 + this.x;
+            integer11 = integer2 + this.x;
         }
         final int n3 = 32;
         final int size2 = this.description.size();
         this.minecraft.font.getClass();
-        final int integer11 = n3 + size2 * 9;
+        final int integer12 = n3 + size2 * 9;
         if (!this.description.isEmpty()) {
-            if (boolean8) {
-                this.render9Sprite(integer10, integer9 + 26 - integer11, this.width, integer11, 10, 200, 26, 0, 52);
+            if (boolean9) {
+                this.render9Sprite(dhl, integer11, integer10 + 26 - integer12, this.width, integer12, 10, 200, 26, 0, 52);
             }
             else {
-                this.render9Sprite(integer10, integer9, this.width, integer11, 10, 200, 26, 0, 52);
-            }
-        }
-        this.blit(integer10, integer9, 0, dgo12.getIndex() * 26, integer7, 26);
-        this.blit(integer10 + integer7, integer9, 200 - integer8, dgo13.getIndex() * 26, integer8, 26);
-        this.blit(integer1 + this.x + 3, integer2 + this.y, this.display.getFrame().getTexture(), 128 + dgo14.getIndex() * 26, 26, 26);
-        if (boolean7) {
-            this.minecraft.font.drawShadow(this.title, (float)(integer10 + 5), (float)(integer2 + this.y + 9), -1);
-            if (string8 != null) {
-                this.minecraft.font.drawShadow(string8, (float)(integer1 + this.x - integer6), (float)(integer2 + this.y + 9), -1);
-            }
-        }
-        else {
-            this.minecraft.font.drawShadow(this.title, (float)(integer1 + this.x + 32), (float)(integer2 + this.y + 9), -1);
-            if (string8 != null) {
-                this.minecraft.font.drawShadow(string8, (float)(integer1 + this.x + this.width - integer6 - 5), (float)(integer2 + this.y + 9), -1);
+                this.render9Sprite(dhl, integer11, integer10, this.width, integer12, 10, 200, 26, 0, 52);
             }
         }
+        this.blit(dhl, integer11, integer10, 0, drf13.getIndex() * 26, integer8, 26);
+        this.blit(dhl, integer11 + integer8, integer10, 200 - integer9, drf14.getIndex() * 26, integer9, 26);
+        this.blit(dhl, integer2 + this.x + 3, integer3 + this.y, this.display.getFrame().getTexture(), 128 + drf15.getIndex() * 26, 26, 26);
         if (boolean8) {
-            for (int integer12 = 0; integer12 < this.description.size(); ++integer12) {
-                final Font font = this.minecraft.font;
-                final String string9 = this.description.get(integer12);
-                final float float5 = (float)(integer10 + 5);
-                final int n4 = integer9 + 26 - integer11 + 7;
-                final int n5 = integer12;
-                this.minecraft.font.getClass();
-                font.draw(string9, float5, (float)(n4 + n5 * 9), -5592406);
+            this.minecraft.font.drawShadow(dhl, this.title, (float)(integer11 + 5), (float)(integer3 + this.y + 9), -1);
+            if (string9 != null) {
+                this.minecraft.font.drawShadow(dhl, string9, (float)(integer2 + this.x - integer7), (float)(integer3 + this.y + 9), -1);
             }
         }
         else {
-            for (int integer12 = 0; integer12 < this.description.size(); ++integer12) {
-                final Font font2 = this.minecraft.font;
-                final String string10 = this.description.get(integer12);
-                final float float6 = (float)(integer10 + 5);
-                final int n6 = integer2 + this.y + 9 + 17;
-                final int n7 = integer12;
-                this.minecraft.font.getClass();
-                font2.draw(string10, float6, (float)(n6 + n7 * 9), -5592406);
+            this.minecraft.font.drawShadow(dhl, this.title, (float)(integer2 + this.x + 32), (float)(integer3 + this.y + 9), -1);
+            if (string9 != null) {
+                this.minecraft.font.drawShadow(dhl, string9, (float)(integer2 + this.x + this.width - integer7 - 5), (float)(integer3 + this.y + 9), -1);
             }
         }
-        this.minecraft.getItemRenderer().renderAndDecorateItem(null, this.display.getIcon(), integer1 + this.x + 8, integer2 + this.y + 5);
+        if (boolean9) {
+            for (int integer13 = 0; integer13 < this.description.size(); ++integer13) {
+                final Font font = this.minecraft.font;
+                final FormattedText mu = this.description.get(integer13);
+                final float float6 = (float)(integer11 + 5);
+                final int n4 = integer10 + 26 - integer12 + 7;
+                final int n5 = integer13;
+                this.minecraft.font.getClass();
+                font.draw(dhl, mu, float6, (float)(n4 + n5 * 9), -5592406);
+            }
+        }
+        else {
+            for (int integer13 = 0; integer13 < this.description.size(); ++integer13) {
+                final Font font2 = this.minecraft.font;
+                final FormattedText mu2 = this.description.get(integer13);
+                final float float7 = (float)(integer11 + 5);
+                final int n6 = integer3 + this.y + 9 + 17;
+                final int n7 = integer13;
+                this.minecraft.font.getClass();
+                font2.draw(dhl, mu2, float7, (float)(n6 + n7 * 9), -5592406);
+            }
+        }
+        this.minecraft.getItemRenderer().renderAndDecorateFakeItem(this.display.getIcon(), integer2 + this.x + 8, integer3 + this.y + 5);
     }
     
-    protected void render9Sprite(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
-        this.blit(integer1, integer2, integer8, integer9, integer5, integer5);
-        this.renderRepeating(integer1 + integer5, integer2, integer3 - integer5 - integer5, integer5, integer8 + integer5, integer9, integer6 - integer5 - integer5, integer7);
-        this.blit(integer1 + integer3 - integer5, integer2, integer8 + integer6 - integer5, integer9, integer5, integer5);
-        this.blit(integer1, integer2 + integer4 - integer5, integer8, integer9 + integer7 - integer5, integer5, integer5);
-        this.renderRepeating(integer1 + integer5, integer2 + integer4 - integer5, integer3 - integer5 - integer5, integer5, integer8 + integer5, integer9 + integer7 - integer5, integer6 - integer5 - integer5, integer7);
-        this.blit(integer1 + integer3 - integer5, integer2 + integer4 - integer5, integer8 + integer6 - integer5, integer9 + integer7 - integer5, integer5, integer5);
-        this.renderRepeating(integer1, integer2 + integer5, integer5, integer4 - integer5 - integer5, integer8, integer9 + integer5, integer6, integer7 - integer5 - integer5);
-        this.renderRepeating(integer1 + integer5, integer2 + integer5, integer3 - integer5 - integer5, integer4 - integer5 - integer5, integer8 + integer5, integer9 + integer5, integer6 - integer5 - integer5, integer7 - integer5 - integer5);
-        this.renderRepeating(integer1 + integer3 - integer5, integer2 + integer5, integer5, integer4 - integer5 - integer5, integer8 + integer6 - integer5, integer9 + integer5, integer6, integer7 - integer5 - integer5);
+    protected void render9Sprite(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final int integer10) {
+        this.blit(dhl, integer2, integer3, integer9, integer10, integer6, integer6);
+        this.renderRepeating(dhl, integer2 + integer6, integer3, integer4 - integer6 - integer6, integer6, integer9 + integer6, integer10, integer7 - integer6 - integer6, integer8);
+        this.blit(dhl, integer2 + integer4 - integer6, integer3, integer9 + integer7 - integer6, integer10, integer6, integer6);
+        this.blit(dhl, integer2, integer3 + integer5 - integer6, integer9, integer10 + integer8 - integer6, integer6, integer6);
+        this.renderRepeating(dhl, integer2 + integer6, integer3 + integer5 - integer6, integer4 - integer6 - integer6, integer6, integer9 + integer6, integer10 + integer8 - integer6, integer7 - integer6 - integer6, integer8);
+        this.blit(dhl, integer2 + integer4 - integer6, integer3 + integer5 - integer6, integer9 + integer7 - integer6, integer10 + integer8 - integer6, integer6, integer6);
+        this.renderRepeating(dhl, integer2, integer3 + integer6, integer6, integer5 - integer6 - integer6, integer9, integer10 + integer6, integer7, integer8 - integer6 - integer6);
+        this.renderRepeating(dhl, integer2 + integer6, integer3 + integer6, integer4 - integer6 - integer6, integer5 - integer6 - integer6, integer9 + integer6, integer10 + integer6, integer7 - integer6 - integer6, integer8 - integer6 - integer6);
+        this.renderRepeating(dhl, integer2 + integer4 - integer6, integer3 + integer6, integer6, integer5 - integer6 - integer6, integer9 + integer7 - integer6, integer10 + integer6, integer7, integer8 - integer6 - integer6);
     }
     
-    protected void renderRepeating(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
-        for (int integer9 = 0; integer9 < integer3; integer9 += integer7) {
-            final int integer10 = integer1 + integer9;
-            final int integer11 = Math.min(integer7, integer3 - integer9);
-            for (int integer12 = 0; integer12 < integer4; integer12 += integer8) {
-                final int integer13 = integer2 + integer12;
-                final int integer14 = Math.min(integer8, integer4 - integer12);
-                this.blit(integer10, integer13, integer5, integer6, integer11, integer14);
+    protected void renderRepeating(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
+        for (int integer10 = 0; integer10 < integer4; integer10 += integer8) {
+            final int integer11 = integer2 + integer10;
+            final int integer12 = Math.min(integer8, integer4 - integer10);
+            for (int integer13 = 0; integer13 < integer5; integer13 += integer9) {
+                final int integer14 = integer3 + integer13;
+                final int integer15 = Math.min(integer9, integer5 - integer13);
+                this.blit(dhl, integer11, integer14, integer6, integer7, integer12, integer15);
             }
         }
     }
@@ -301,6 +301,6 @@ public class AdvancementWidget extends GuiComponent {
     
     static {
         WIDGETS_LOCATION = new ResourceLocation("textures/gui/advancements/widgets.png");
-        LAST_WORD = Pattern.compile("(.+) \\S+");
+        TEST_SPLIT_OFFSETS = new int[] { 0, 10, -10, 25, -25 };
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java b/src/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
index 86de4e5..24b7454 100644
--- a/src/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
+++ b/src/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
@@ -2,10 +2,12 @@ package net.minecraft.client.gui.screens.advancements;
 
 import javax.annotation.Nullable;
 import net.minecraft.advancements.AdvancementProgress;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.client.gui.Font;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.gui.GuiComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.Iterator;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.network.protocol.Packet;
@@ -26,10 +28,10 @@ public class AdvancementsScreen extends Screen implements ClientAdvancements.Lis
     private AdvancementTab selectedTab;
     private boolean isScrolling;
     
-    public AdvancementsScreen(final ClientAdvancements dnl) {
+    public AdvancementsScreen(final ClientAdvancements dyj) {
         super(NarratorChatListener.NO_TITLE);
         this.tabs = Maps.newLinkedHashMap();
-        this.advancements = dnl;
+        this.advancements = dyj;
     }
     
     @Override
@@ -48,9 +50,9 @@ public class AdvancementsScreen extends Screen implements ClientAdvancements.Lis
     @Override
     public void removed() {
         this.advancements.setListener(null);
-        final ClientPacketListener dnp2 = this.minecraft.getConnection();
-        if (dnp2 != null) {
-            dnp2.send(ServerboundSeenAdvancementsPacket.closedScreen());
+        final ClientPacketListener dyn2 = this.minecraft.getConnection();
+        if (dyn2 != null) {
+            dyn2.send(ServerboundSeenAdvancementsPacket.closedScreen());
         }
     }
     
@@ -59,9 +61,9 @@ public class AdvancementsScreen extends Screen implements ClientAdvancements.Lis
         if (integer == 0) {
             final int integer2 = (this.width - 252) / 2;
             final int integer3 = (this.height - 140) / 2;
-            for (final AdvancementTab dgl10 : this.tabs.values()) {
-                if (dgl10.isMouseOver(integer2, integer3, double1, double2)) {
-                    this.advancements.setSelectedTab(dgl10.getAdvancement(), true);
+            for (final AdvancementTab drc10 : this.tabs.values()) {
+                if (drc10.isMouseOver(integer2, integer3, double1, double2)) {
+                    this.advancements.setSelectedTab(drc10.getAdvancement(), true);
                     break;
                 }
             }
@@ -80,13 +82,13 @@ public class AdvancementsScreen extends Screen implements ClientAdvancements.Lis
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        final int integer3 = (this.width - 252) / 2;
-        final int integer4 = (this.height - 140) / 2;
-        this.renderBackground();
-        this.renderInside(integer1, integer2, integer3, integer4);
-        this.renderWindow(integer3, integer4);
-        this.renderTooltips(integer1, integer2, integer3, integer4);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        final int integer4 = (this.width - 252) / 2;
+        final int integer5 = (this.height - 140) / 2;
+        this.renderBackground(dhl);
+        this.renderInside(dhl, integer2, integer3, integer4, integer5);
+        this.renderWindow(dhl, integer4, integer5);
+        this.renderTooltips(dhl, integer2, integer3, integer4, integer5);
     }
     
     @Override
@@ -103,109 +105,109 @@ public class AdvancementsScreen extends Screen implements ClientAdvancements.Lis
         return true;
     }
     
-    private void renderInside(final int integer1, final int integer2, final int integer3, final int integer4) {
-        final AdvancementTab dgl6 = this.selectedTab;
-        if (dgl6 == null) {
-            GuiComponent.fill(integer3 + 9, integer4 + 18, integer3 + 9 + 234, integer4 + 18 + 113, -16777216);
-            final String string7 = I18n.get("advancements.empty");
-            final int integer5 = this.font.width(string7);
+    private void renderInside(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        final AdvancementTab drc7 = this.selectedTab;
+        if (drc7 == null) {
+            GuiComponent.fill(dhl, integer4 + 9, integer5 + 18, integer4 + 9 + 234, integer5 + 18 + 113, -16777216);
+            final String string8 = I18n.get("advancements.empty");
+            final int integer6 = this.font.width(string8);
             final Font font = this.font;
-            final String string8 = string7;
-            final float float2 = (float)(integer3 + 9 + 117 - integer5 / 2);
-            final int n = integer4 + 18 + 56;
+            final String string9 = string8;
+            final float float3 = (float)(integer4 + 9 + 117 - integer6 / 2);
+            final int n = integer5 + 18 + 56;
             this.font.getClass();
-            font.draw(string8, float2, (float)(n - 9 / 2), -1);
+            font.draw(dhl, string9, float3, (float)(n - 9 / 2), -1);
             final Font font2 = this.font;
-            final String string9 = ":(";
-            final float float3 = (float)(integer3 + 9 + 117 - this.font.width(":(") / 2);
-            final int n2 = integer4 + 18 + 113;
+            final String string10 = ":(";
+            final float float4 = (float)(integer4 + 9 + 117 - this.font.width(":(") / 2);
+            final int n2 = integer5 + 18 + 113;
             this.font.getClass();
-            font2.draw(string9, float3, (float)(n2 - 9), -1);
+            font2.draw(dhl, string10, float4, (float)(n2 - 9), -1);
             return;
         }
         RenderSystem.pushMatrix();
-        RenderSystem.translatef((float)(integer3 + 9), (float)(integer4 + 18), 0.0f);
-        dgl6.drawContents();
+        RenderSystem.translatef((float)(integer4 + 9), (float)(integer5 + 18), 0.0f);
+        drc7.drawContents(dhl);
         RenderSystem.popMatrix();
         RenderSystem.depthFunc(515);
         RenderSystem.disableDepthTest();
     }
     
-    public void renderWindow(final int integer1, final int integer2) {
+    public void renderWindow(final PoseStack dhl, final int integer2, final int integer3) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.enableBlend();
         this.minecraft.getTextureManager().bind(AdvancementsScreen.WINDOW_LOCATION);
-        this.blit(integer1, integer2, 0, 0, 252, 140);
+        this.blit(dhl, integer2, integer3, 0, 0, 252, 140);
         if (this.tabs.size() > 1) {
             this.minecraft.getTextureManager().bind(AdvancementsScreen.TABS_LOCATION);
-            for (final AdvancementTab dgl5 : this.tabs.values()) {
-                dgl5.drawTab(integer1, integer2, dgl5 == this.selectedTab);
+            for (final AdvancementTab drc6 : this.tabs.values()) {
+                drc6.drawTab(dhl, integer2, integer3, drc6 == this.selectedTab);
             }
             RenderSystem.enableRescaleNormal();
             RenderSystem.defaultBlendFunc();
-            for (final AdvancementTab dgl5 : this.tabs.values()) {
-                dgl5.drawIcon(integer1, integer2, this.itemRenderer);
+            for (final AdvancementTab drc6 : this.tabs.values()) {
+                drc6.drawIcon(integer2, integer3, this.itemRenderer);
             }
             RenderSystem.disableBlend();
         }
-        this.font.draw(I18n.get("gui.advancements"), (float)(integer1 + 8), (float)(integer2 + 6), 4210752);
+        this.font.draw(dhl, I18n.get("gui.advancements"), (float)(integer2 + 8), (float)(integer3 + 6), 4210752);
     }
     
-    private void renderTooltips(final int integer1, final int integer2, final int integer3, final int integer4) {
+    private void renderTooltips(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         if (this.selectedTab != null) {
             RenderSystem.pushMatrix();
             RenderSystem.enableDepthTest();
-            RenderSystem.translatef((float)(integer3 + 9), (float)(integer4 + 18), 400.0f);
-            this.selectedTab.drawTooltips(integer1 - integer3 - 9, integer2 - integer4 - 18, integer3, integer4);
+            RenderSystem.translatef((float)(integer4 + 9), (float)(integer5 + 18), 400.0f);
+            this.selectedTab.drawTooltips(dhl, integer2 - integer4 - 9, integer3 - integer5 - 18, integer4, integer5);
             RenderSystem.disableDepthTest();
             RenderSystem.popMatrix();
         }
         if (this.tabs.size() > 1) {
-            for (final AdvancementTab dgl7 : this.tabs.values()) {
-                if (dgl7.isMouseOver(integer3, integer4, integer1, integer2)) {
-                    this.renderTooltip(dgl7.getTitle(), integer1, integer2);
+            for (final AdvancementTab drc8 : this.tabs.values()) {
+                if (drc8.isMouseOver(integer4, integer5, integer2, integer3)) {
+                    this.renderTooltip(dhl, drc8.getTitle(), integer2, integer3);
                 }
             }
         }
     }
     
     @Override
-    public void onAddAdvancementRoot(final Advancement u) {
-        final AdvancementTab dgl3 = AdvancementTab.create(this.minecraft, this, this.tabs.size(), u);
-        if (dgl3 == null) {
+    public void onAddAdvancementRoot(final Advancement w) {
+        final AdvancementTab drc3 = AdvancementTab.create(this.minecraft, this, this.tabs.size(), w);
+        if (drc3 == null) {
             return;
         }
-        this.tabs.put(u, dgl3);
+        this.tabs.put(w, drc3);
     }
     
     @Override
-    public void onRemoveAdvancementRoot(final Advancement u) {
+    public void onRemoveAdvancementRoot(final Advancement w) {
     }
     
     @Override
-    public void onAddAdvancementTask(final Advancement u) {
-        final AdvancementTab dgl3 = this.getTab(u);
-        if (dgl3 != null) {
-            dgl3.addAdvancement(u);
+    public void onAddAdvancementTask(final Advancement w) {
+        final AdvancementTab drc3 = this.getTab(w);
+        if (drc3 != null) {
+            drc3.addAdvancement(w);
         }
     }
     
     @Override
-    public void onRemoveAdvancementTask(final Advancement u) {
+    public void onRemoveAdvancementTask(final Advancement w) {
     }
     
     @Override
-    public void onUpdateAdvancementProgress(final Advancement u, final AdvancementProgress w) {
-        final AdvancementWidget dgn4 = this.getAdvancementWidget(u);
-        if (dgn4 != null) {
-            dgn4.setProgress(w);
+    public void onUpdateAdvancementProgress(final Advancement w, final AdvancementProgress y) {
+        final AdvancementWidget dre4 = this.getAdvancementWidget(w);
+        if (dre4 != null) {
+            dre4.setProgress(y);
         }
     }
     
     @Override
-    public void onSelectedTabChanged(@Nullable final Advancement u) {
-        this.selectedTab = this.tabs.get(u);
+    public void onSelectedTabChanged(@Nullable final Advancement w) {
+        this.selectedTab = this.tabs.get(w);
     }
     
     @Override
@@ -215,17 +217,17 @@ public class AdvancementsScreen extends Screen implements ClientAdvancements.Lis
     }
     
     @Nullable
-    public AdvancementWidget getAdvancementWidget(final Advancement u) {
-        final AdvancementTab dgl3 = this.getTab(u);
-        return (dgl3 == null) ? null : dgl3.getWidget(u);
+    public AdvancementWidget getAdvancementWidget(final Advancement w) {
+        final AdvancementTab drc3 = this.getTab(w);
+        return (drc3 == null) ? null : drc3.getWidget(w);
     }
     
     @Nullable
-    private AdvancementTab getTab(Advancement u) {
-        while (u.getParent() != null) {
-            u = u.getParent();
+    private AdvancementTab getTab(Advancement w) {
+        while (w.getParent() != null) {
+            w = w.getParent();
         }
-        return this.tabs.get(u);
+        return this.tabs.get(w);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/controls/ControlList.java b/src/net/minecraft/client/gui/screens/controls/ControlList.java
index dce104e..16f789c 100644
--- a/src/net/minecraft/client/gui/screens/controls/ControlList.java
+++ b/src/net/minecraft/client/gui/screens/controls/ControlList.java
@@ -3,12 +3,17 @@ package net.minecraft.client.gui.screens.controls;
 import net.minecraft.client.gui.components.AbstractSelectionList;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.client.gui.components.Button;
 import java.util.Collections;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import java.util.List;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import java.util.Arrays;
 import org.apache.commons.lang3.ArrayUtils;
 import net.minecraft.client.KeyMapping;
@@ -19,23 +24,24 @@ public class ControlList extends ContainerObjectSelectionList<Entry> {
     private final ControlsScreen controlsScreen;
     private int maxNameWidth;
     
-    public ControlList(final ControlsScreen dgs, final Minecraft dbn) {
-        super(dbn, dgs.width + 45, dgs.height, 43, dgs.height - 32, 20);
-        this.controlsScreen = dgs;
-        final KeyMapping[] arr4 = (KeyMapping[])ArrayUtils.clone((Object[])dbn.options.keyMappings);
+    public ControlList(final ControlsScreen drj, final Minecraft dlx) {
+        super(dlx, drj.width + 45, drj.height, 43, drj.height - 32, 20);
+        this.controlsScreen = drj;
+        final KeyMapping[] arr4 = (KeyMapping[])ArrayUtils.clone((Object[])dlx.options.keyMappings);
         Arrays.sort(arr4);
         String string5 = null;
-        for (final KeyMapping dbk9 : arr4) {
-            final String string6 = dbk9.getCategory();
+        for (final KeyMapping dlu9 : arr4) {
+            final String string6 = dlu9.getCategory();
             if (!string6.equals(string5)) {
                 string5 = string6;
-                ((AbstractSelectionList<CategoryEntry>)this).addEntry(new CategoryEntry(string6));
+                ((AbstractSelectionList<CategoryEntry>)this).addEntry(new CategoryEntry(new TranslatableComponent(string6)));
             }
-            final int integer11 = dbn.font.width(I18n.get(dbk9.getName()));
-            if (integer11 > this.maxNameWidth) {
-                this.maxNameWidth = integer11;
+            final Component mr11 = new TranslatableComponent(dlu9.getName());
+            final int integer12 = dlx.font.width(mr11);
+            if (integer12 > this.maxNameWidth) {
+                this.maxNameWidth = integer12;
             }
-            ((AbstractSelectionList<KeyEntry>)this).addEntry(new KeyEntry(dbk9));
+            ((AbstractSelectionList<KeyEntry>)this).addEntry(new KeyEntry(dlu9, mr11));
         }
     }
     
@@ -53,22 +59,22 @@ public class ControlList extends ContainerObjectSelectionList<Entry> {
     }
     
     public class CategoryEntry extends Entry {
-        private final String name;
+        private final Component name;
         private final int width;
         
-        public CategoryEntry(final String string) {
-            this.name = I18n.get(string);
+        public CategoryEntry(final Component mr) {
+            this.name = mr;
             this.width = ControlList.this.minecraft.font.width(this.name);
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
             final Font font = ControlList.this.minecraft.font;
-            final String name = this.name;
-            final float float10 = (float)(ControlList.this.minecraft.screen.width / 2 - this.width / 2);
-            final int n = integer2 + integer5;
+            final Component name = this.name;
+            final float float11 = (float)(ControlList.this.minecraft.screen.width / 2 - this.width / 2);
+            final int n = integer3 + integer6;
             ControlList.this.minecraft.font.getClass();
-            font.draw(name, float10, (float)(n - 9 - 1), 16777215);
+            font.draw(dhl, name, float11, (float)(n - 9 - 1), 16777215);
         }
         
         @Override
@@ -84,65 +90,65 @@ public class ControlList extends ContainerObjectSelectionList<Entry> {
     
     public class KeyEntry extends Entry {
         private final KeyMapping key;
-        private final String name;
+        private final Component name;
         private final Button changeButton;
         private final Button resetButton;
         
-        private KeyEntry(final KeyMapping dbk) {
-            this.key = dbk;
-            this.name = I18n.get(dbk.getName());
-            this.changeButton = new Button(0, 0, 75, 20, this.name, dcv -> ControlList.this.controlsScreen.selectedKey = dbk) {
+        private KeyEntry(final KeyMapping dlu, final Component mr) {
+            this.key = dlu;
+            this.name = mr;
+            this.changeButton = new Button(0, 0, 75, 20, mr, dni -> ControlList.this.controlsScreen.selectedKey = dlu) {
                 @Override
-                protected String getNarrationMessage() {
-                    if (dbk.isUnbound()) {
-                        return I18n.get("narrator.controls.unbound", KeyEntry.this.name);
+                protected MutableComponent createNarrationMessage() {
+                    if (dlu.isUnbound()) {
+                        return new TranslatableComponent("narrator.controls.unbound", new Object[] { mr });
                     }
-                    return I18n.get("narrator.controls.bound", KeyEntry.this.name, super.getNarrationMessage());
+                    return new TranslatableComponent("narrator.controls.bound", new Object[] { mr, super.createNarrationMessage() });
                 }
             };
-            this.resetButton = new Button(0, 0, 50, 20, I18n.get("controls.reset"), dcv -> {
-                ControlList.this.minecraft.options.setKey(dbk, dbk.getDefaultKey());
+            this.resetButton = new Button(0, 0, 50, 20, new TranslatableComponent("controls.reset"), dni -> {
+                ControlList.this.minecraft.options.setKey(dlu, dlu.getDefaultKey());
                 KeyMapping.resetMapping();
             }) {
                 @Override
-                protected String getNarrationMessage() {
-                    return I18n.get("narrator.controls.reset", KeyEntry.this.name);
+                protected MutableComponent createNarrationMessage() {
+                    return new TranslatableComponent("narrator.controls.reset", new Object[] { mr });
                 }
             };
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            final boolean boolean9 = ControlList.this.controlsScreen.selectedKey == this.key;
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            final boolean boolean10 = ControlList.this.controlsScreen.selectedKey == this.key;
             final Font font = ControlList.this.minecraft.font;
-            final String name = this.name;
-            final float float10 = (float)(integer3 + 90 - ControlList.this.maxNameWidth);
-            final int n = integer2 + integer5 / 2;
+            final Component name = this.name;
+            final float float11 = (float)(integer4 + 90 - ControlList.this.maxNameWidth);
+            final int n = integer3 + integer6 / 2;
             ControlList.this.minecraft.font.getClass();
-            font.draw(name, float10, (float)(n - 9 / 2), 16777215);
-            this.resetButton.x = integer3 + 190;
-            this.resetButton.y = integer2;
+            font.draw(dhl, name, float11, (float)(n - 9 / 2), 16777215);
+            this.resetButton.x = integer4 + 190;
+            this.resetButton.y = integer3;
             this.resetButton.active = !this.key.isDefault();
-            this.resetButton.render(integer6, integer7, float9);
-            this.changeButton.x = integer3 + 105;
-            this.changeButton.y = integer2;
+            this.resetButton.render(dhl, integer7, integer8, float10);
+            this.changeButton.x = integer4 + 105;
+            this.changeButton.y = integer3;
             this.changeButton.setMessage(this.key.getTranslatedKeyMessage());
-            boolean boolean10 = false;
+            boolean boolean11 = false;
             if (!this.key.isUnbound()) {
-                for (final KeyMapping dbk16 : ControlList.this.minecraft.options.keyMappings) {
-                    if (dbk16 != this.key && this.key.same(dbk16)) {
-                        boolean10 = true;
+                for (final KeyMapping dlu17 : ControlList.this.minecraft.options.keyMappings) {
+                    if (dlu17 != this.key && this.key.same(dlu17)) {
+                        boolean11 = true;
                         break;
                     }
                 }
             }
-            if (boolean9) {
-                this.changeButton.setMessage(ChatFormatting.WHITE + "> " + ChatFormatting.YELLOW + this.changeButton.getMessage() + ChatFormatting.WHITE + " <");
+            if (boolean10) {
+                this.changeButton.setMessage(new TextComponent("> ").append(this.changeButton.getMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
             }
-            else if (boolean10) {
-                this.changeButton.setMessage(ChatFormatting.RED + this.changeButton.getMessage());
+            else if (boolean11) {
+                this.changeButton.setMessage(this.changeButton.getMessage().copy().withStyle(ChatFormatting.RED));
             }
-            this.changeButton.render(integer6, integer7, float9);
+            this.changeButton.render(dhl, integer7, integer8, float10);
         }
         
         @Override
diff --git a/src/net/minecraft/client/gui/screens/controls/ControlsScreen.java b/src/net/minecraft/client/gui/screens/controls/ControlsScreen.java
index edb0519..b0c91c5 100644
--- a/src/net/minecraft/client/gui/screens/controls/ControlsScreen.java
+++ b/src/net/minecraft/client/gui/screens/controls/ControlsScreen.java
@@ -1,11 +1,13 @@
 package net.minecraft.client.gui.screens.controls;
 
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.Util;
 import com.mojang.blaze3d.platform.InputConstants;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.Option;
 import net.minecraft.client.gui.screens.MouseSettingsScreen;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.Options;
@@ -20,30 +22,30 @@ public class ControlsScreen extends OptionsSubScreen {
     private ControlList controlList;
     private Button resetButton;
     
-    public ControlsScreen(final Screen dgb, final Options dbr) {
-        super(dgb, dbr, new TranslatableComponent("controls.title", new Object[0]));
+    public ControlsScreen(final Screen dqs, final Options dmb) {
+        super(dqs, dmb, new TranslatableComponent("controls.title"));
     }
     
     @Override
     protected void init() {
-        this.<Button>addButton(new Button(this.width / 2 - 155, 18, 150, 20, I18n.get("options.mouse_settings"), dcv -> this.minecraft.setScreen(new MouseSettingsScreen(this, this.options))));
+        this.<Button>addButton(new Button(this.width / 2 - 155, 18, 150, 20, new TranslatableComponent("options.mouse_settings"), dni -> this.minecraft.setScreen(new MouseSettingsScreen(this, this.options))));
         this.<AbstractWidget>addButton(Option.AUTO_JUMP.createButton(this.options, this.width / 2 - 155 + 160, 18, 150));
         this.controlList = new ControlList(this, this.minecraft);
         this.children.add(this.controlList);
         final KeyMapping[] keyMappings;
         int length;
         int i = 0;
-        KeyMapping dbk6;
-        this.resetButton = this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 29, 150, 20, I18n.get("controls.resetAll"), dcv -> {
+        KeyMapping dlu6;
+        this.resetButton = this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 29, 150, 20, new TranslatableComponent("controls.resetAll"), dni -> {
             keyMappings = this.options.keyMappings;
             for (length = keyMappings.length; i < length; ++i) {
-                dbk6 = keyMappings[i];
-                dbk6.setKey(dbk6.getDefaultKey());
+                dlu6 = keyMappings[i];
+                dlu6.setKey(dlu6.getDefaultKey());
             }
             KeyMapping.resetMapping();
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, this.height - 29, 150, 20, I18n.get("gui.done"), dcv -> this.minecraft.setScreen(this.lastScreen)));
+        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, this.height - 29, 150, 20, CommonComponents.GUI_DONE, dni -> this.minecraft.setScreen(this.lastScreen)));
     }
     
     @Override
@@ -75,18 +77,18 @@ public class ControlsScreen extends OptionsSubScreen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.controlList.render(integer1, integer2, float3);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 8, 16777215);
-        boolean boolean5 = false;
-        for (final KeyMapping dbk9 : this.options.keyMappings) {
-            if (!dbk9.isDefault()) {
-                boolean5 = true;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.controlList.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 8, 16777215);
+        boolean boolean6 = false;
+        for (final KeyMapping dlu10 : this.options.keyMappings) {
+            if (!dlu10.isDefault()) {
+                boolean6 = true;
                 break;
             }
         }
-        this.resetButton.active = boolean5;
-        super.render(integer1, integer2, float3);
+        this.resetButton.active = boolean6;
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/debug/GameModeSwitcherScreen.java b/src/net/minecraft/client/gui/screens/debug/GameModeSwitcherScreen.java
new file mode 100644
index 0000000..6888edc
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/debug/GameModeSwitcherScreen.java
@@ -0,0 +1,262 @@
+package net.minecraft.client.gui.screens.debug;
+
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.client.renderer.entity.ItemRenderer;
+import com.mojang.blaze3d.platform.InputConstants;
+import java.util.Iterator;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.client.gui.GuiComponent;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.level.GameType;
+import com.google.common.collect.Lists;
+import net.minecraft.client.gui.chat.NarratorChatListener;
+import java.util.List;
+import java.util.Optional;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.gui.screens.Screen;
+
+public class GameModeSwitcherScreen extends Screen {
+    private static final ResourceLocation GAMEMODE_SWITCHER_LOCATION;
+    private static final int ALL_SLOTS_WIDTH;
+    private static final Component SELECT_KEY;
+    private final Optional<GameModeIcon> previousHovered;
+    private Optional<GameModeIcon> currentlyHovered;
+    private int firstMouseX;
+    private int firstMouseY;
+    private boolean setFirstMousePos;
+    private final List<GameModeSlot> slots;
+    
+    public GameModeSwitcherScreen() {
+        super(NarratorChatListener.NO_TITLE);
+        this.currentlyHovered = Optional.<GameModeIcon>empty();
+        this.slots = Lists.newArrayList();
+        this.previousHovered = getFromGameType(this.getDefaultSelected());
+    }
+    
+    private GameType getDefaultSelected() {
+        final GameType bpy2 = Minecraft.getInstance().gameMode.getPlayerMode();
+        GameType bpy3 = Minecraft.getInstance().gameMode.getPreviousPlayerMode();
+        if (bpy3 == GameType.NOT_SET) {
+            if (bpy2 == GameType.CREATIVE) {
+                bpy3 = GameType.SURVIVAL;
+            }
+            else {
+                bpy3 = GameType.CREATIVE;
+            }
+        }
+        return bpy3;
+    }
+    
+    @Override
+    protected void init() {
+        super.init();
+        this.currentlyHovered = (this.previousHovered.isPresent() ? this.previousHovered : getFromGameType(this.minecraft.gameMode.getPlayerMode()));
+        for (int integer2 = 0; integer2 < GameModeIcon.VALUES.length; ++integer2) {
+            final GameModeIcon a3 = GameModeIcon.VALUES[integer2];
+            this.slots.add(new GameModeSlot(a3, this.width / 2 - GameModeSwitcherScreen.ALL_SLOTS_WIDTH / 2 + integer2 * 30, this.height / 2 - 30));
+        }
+    }
+    
+    @Override
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        if (this.checkToClose()) {
+            return;
+        }
+        dhl.pushPose();
+        RenderSystem.enableBlend();
+        this.minecraft.getTextureManager().bind(GameModeSwitcherScreen.GAMEMODE_SWITCHER_LOCATION);
+        final int integer4 = this.width / 2 - 62;
+        final int integer5 = this.height / 2 - 30 - 27;
+        GuiComponent.blit(dhl, integer4, integer5, 0.0f, 0.0f, 125, 75, 128, 128);
+        dhl.popPose();
+        super.render(dhl, integer2, integer3, float4);
+        this.currentlyHovered.ifPresent(a -> this.drawCenteredString(dhl, this.font, a.getName(), this.width / 2, this.height / 2 - 30 - 20, -1));
+        this.drawCenteredString(dhl, this.font, GameModeSwitcherScreen.SELECT_KEY, this.width / 2, this.height / 2 + 5, 16777215);
+        if (!this.setFirstMousePos) {
+            this.firstMouseX = integer2;
+            this.firstMouseY = integer3;
+            this.setFirstMousePos = true;
+        }
+        final boolean boolean8 = this.firstMouseX == integer2 && this.firstMouseY == integer3;
+        for (final GameModeSlot b10 : this.slots) {
+            b10.render(dhl, integer2, integer3, float4);
+            final GameModeSlot b11;
+            this.currentlyHovered.ifPresent(a -> b11.setSelected(a == b11.icon));
+            if (!boolean8 && b10.isHovered()) {
+                this.currentlyHovered = Optional.<GameModeIcon>of(b10.icon);
+            }
+        }
+    }
+    
+    private void switchToHoveredGameMode() {
+        switchToHoveredGameMode(this.minecraft, this.currentlyHovered);
+    }
+    
+    private static void switchToHoveredGameMode(final Minecraft dlx, final Optional<GameModeIcon> optional) {
+        if (dlx.gameMode == null || dlx.player == null || !optional.isPresent()) {
+            return;
+        }
+        final Optional<GameModeIcon> optional2 = getFromGameType(dlx.gameMode.getPlayerMode());
+        final GameModeIcon a4 = optional.get();
+        if (optional2.isPresent() && dlx.player.hasPermissions(2) && a4 != optional2.get()) {
+            dlx.player.chat(a4.getCommand());
+        }
+    }
+    
+    private boolean checkToClose() {
+        if (!InputConstants.isKeyDown(this.minecraft.getWindow().getWindow(), 292)) {
+            this.switchToHoveredGameMode();
+            this.minecraft.setScreen(null);
+            return true;
+        }
+        return false;
+    }
+    
+    @Override
+    public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
+        if (integer1 == 293 && this.currentlyHovered.isPresent()) {
+            this.setFirstMousePos = false;
+            this.currentlyHovered = this.currentlyHovered.get().getNext();
+            return true;
+        }
+        return super.keyPressed(integer1, integer2, integer3);
+    }
+    
+    @Override
+    public boolean isPauseScreen() {
+        return false;
+    }
+    
+    static {
+        GAMEMODE_SWITCHER_LOCATION = new ResourceLocation("textures/gui/container/gamemode_switcher.png");
+        ALL_SLOTS_WIDTH = GameModeIcon.values().length * 30 - 5;
+        SELECT_KEY = new TranslatableComponent("debug.gamemodes.select_next", new Object[] { new TranslatableComponent("debug.gamemodes.press_f4").withStyle(ChatFormatting.AQUA) });
+    }
+    
+    enum GameModeIcon {
+        CREATIVE((Component)new TranslatableComponent("gameMode.creative"), "/gamemode creative", new ItemStack(Blocks.GRASS_BLOCK)), 
+        SURVIVAL((Component)new TranslatableComponent("gameMode.survival"), "/gamemode survival", new ItemStack(Items.IRON_SWORD)), 
+        ADVENTURE((Component)new TranslatableComponent("gameMode.adventure"), "/gamemode adventure", new ItemStack(Items.MAP)), 
+        SPECTATOR((Component)new TranslatableComponent("gameMode.spectator"), "/gamemode spectator", new ItemStack(Items.ENDER_EYE));
+        
+        protected static final GameModeIcon[] VALUES;
+        final Component name;
+        final String command;
+        final ItemStack renderStack;
+        
+        private GameModeIcon(final Component mr, final String string4, final ItemStack bki) {
+            this.name = mr;
+            this.command = string4;
+            this.renderStack = bki;
+        }
+        
+        private void drawIcon(final ItemRenderer ehh, final int integer2, final int integer3) {
+            ehh.renderAndDecorateItem(this.renderStack, integer2, integer3);
+        }
+        
+        private Component getName() {
+            return this.name;
+        }
+        
+        private String getCommand() {
+            return this.command;
+        }
+        
+        private Optional<GameModeIcon> getNext() {
+            switch (this) {
+                case CREATIVE: {
+                    return Optional.<GameModeIcon>of(GameModeIcon.SURVIVAL);
+                }
+                case SURVIVAL: {
+                    return Optional.<GameModeIcon>of(GameModeIcon.ADVENTURE);
+                }
+                case ADVENTURE: {
+                    return Optional.<GameModeIcon>of(GameModeIcon.SPECTATOR);
+                }
+                default: {
+                    return Optional.<GameModeIcon>of(GameModeIcon.CREATIVE);
+                }
+            }
+        }
+        
+        private static Optional<GameModeIcon> getFromGameType(final GameType bpy) {
+            switch (bpy) {
+                case SPECTATOR: {
+                    return Optional.<GameModeIcon>of(GameModeIcon.SPECTATOR);
+                }
+                case SURVIVAL: {
+                    return Optional.<GameModeIcon>of(GameModeIcon.SURVIVAL);
+                }
+                case CREATIVE: {
+                    return Optional.<GameModeIcon>of(GameModeIcon.CREATIVE);
+                }
+                case ADVENTURE: {
+                    return Optional.<GameModeIcon>of(GameModeIcon.ADVENTURE);
+                }
+                default: {
+                    return Optional.<GameModeIcon>empty();
+                }
+            }
+        }
+        
+        static {
+            VALUES = values();
+        }
+    }
+    
+    public class GameModeSlot extends AbstractWidget {
+        private final GameModeIcon icon;
+        private boolean isSelected;
+        
+        public GameModeSlot(final GameModeIcon a, final int integer3, final int integer4) {
+            super(integer3, integer4, 25, 25, a.getName());
+            this.icon = a;
+        }
+        
+        @Override
+        public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+            final Minecraft dlx6 = Minecraft.getInstance();
+            this.drawSlot(dhl, dlx6.getTextureManager());
+            this.icon.drawIcon(GameModeSwitcherScreen.this.itemRenderer, this.x + 5, this.y + 5);
+            if (this.isSelected) {
+                this.drawSelection(dhl, dlx6.getTextureManager());
+            }
+        }
+        
+        @Override
+        public boolean isHovered() {
+            return super.isHovered() || this.isSelected;
+        }
+        
+        public void setSelected(final boolean boolean1) {
+            this.isSelected = boolean1;
+            this.narrate();
+        }
+        
+        private void drawSlot(final PoseStack dhl, final TextureManager elw) {
+            elw.bind(GameModeSwitcherScreen.GAMEMODE_SWITCHER_LOCATION);
+            dhl.pushPose();
+            dhl.translate(this.x, this.y, 0.0);
+            GuiComponent.blit(dhl, 0, 0, 0.0f, 75.0f, 25, 25, 128, 128);
+            dhl.popPose();
+        }
+        
+        private void drawSelection(final PoseStack dhl, final TextureManager elw) {
+            elw.bind(GameModeSwitcherScreen.GAMEMODE_SWITCHER_LOCATION);
+            dhl.pushPose();
+            dhl.translate(this.x, this.y, 0.0);
+            GuiComponent.blit(dhl, 0, 0, 25.0f, 75.0f, 25, 25, 128, 128);
+            dhl.popPose();
+        }
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/inventory/AbstractCommandBlockEditScreen.java b/src/net/minecraft/client/gui/screens/inventory/AbstractCommandBlockEditScreen.java
index cd65940..7b90870 100644
--- a/src/net/minecraft/client/gui/screens/inventory/AbstractCommandBlockEditScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/AbstractCommandBlockEditScreen.java
@@ -1,10 +1,15 @@
 package net.minecraft.client.gui.screens.inventory;
 
-import net.minecraft.network.chat.Component;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.world.level.BaseCommandBlock;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.client.gui.components.CommandSuggestions;
@@ -37,24 +42,24 @@ public abstract class AbstractCommandBlockEditScreen extends Screen {
     @Override
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 4 - 150, this.height / 4 + 120 + 12, 150, 20, I18n.get("gui.done"), dcv -> this.onDone()));
-        this.cancelButton = this.<Button>addButton(new Button(this.width / 2 + 4, this.height / 4 + 120 + 12, 150, 20, I18n.get("gui.cancel"), dcv -> this.onClose()));
-        final BaseCommandBlock bjc3;
-        this.outputButton = this.<Button>addButton(new Button(this.width / 2 + 150 - 20, this.getPreviousY(), 20, 20, "O", dcv -> {
-            bjc3 = this.getCommandBlock();
-            bjc3.setTrackOutput(!bjc3.isTrackOutput());
+        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 4 - 150, this.height / 4 + 120 + 12, 150, 20, CommonComponents.GUI_DONE, dni -> this.onDone()));
+        this.cancelButton = this.<Button>addButton(new Button(this.width / 2 + 4, this.height / 4 + 120 + 12, 150, 20, CommonComponents.GUI_CANCEL, dni -> this.onClose()));
+        final BaseCommandBlock bpc3;
+        this.outputButton = this.<Button>addButton(new Button(this.width / 2 + 150 - 20, this.getPreviousY(), 20, 20, new TextComponent("O"), dni -> {
+            bpc3 = this.getCommandBlock();
+            bpc3.setTrackOutput(!bpc3.isTrackOutput());
             this.updateCommandOutput();
             return;
         }));
-        (this.commandEdit = new EditBox(this.font, this.width / 2 - 150, 50, 300, 20, I18n.get("advMode.command")) {
+        (this.commandEdit = new EditBox(this.font, this.width / 2 - 150, 50, 300, 20, new TranslatableComponent("advMode.command")) {
             @Override
-            protected String getNarrationMessage() {
-                return super.getNarrationMessage() + AbstractCommandBlockEditScreen.this.commandSuggestions.getNarrationMessage();
+            protected MutableComponent createNarrationMessage() {
+                return super.createNarrationMessage().append(AbstractCommandBlockEditScreen.this.commandSuggestions.getNarrationMessage());
             }
         }).setMaxLength(32500);
         this.commandEdit.setResponder(this::onEdited);
         this.children.add(this.commandEdit);
-        (this.previousEdit = new EditBox(this.font, this.width / 2 - 150, this.getPreviousY(), 276, 20, I18n.get("advMode.previousOutput"))).setMaxLength(32500);
+        (this.previousEdit = new EditBox(this.font, this.width / 2 - 150, this.getPreviousY(), 276, 20, new TranslatableComponent("advMode.previousOutput"))).setMaxLength(32500);
         this.previousEdit.setEditable(false);
         this.previousEdit.setValue("-");
         this.children.add(this.previousEdit);
@@ -65,29 +70,29 @@ public abstract class AbstractCommandBlockEditScreen extends Screen {
     }
     
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
         final String string5 = this.commandEdit.getValue();
-        this.init(dbn, integer2, integer3);
+        this.init(dlx, integer2, integer3);
         this.commandEdit.setValue(string5);
         this.commandSuggestions.updateCommandInfo();
     }
     
     protected void updateCommandOutput() {
         if (this.getCommandBlock().isTrackOutput()) {
-            this.outputButton.setMessage("O");
+            this.outputButton.setMessage(new TextComponent("O"));
             this.previousEdit.setValue(this.getCommandBlock().getLastOutput().getString());
         }
         else {
-            this.outputButton.setMessage("X");
+            this.outputButton.setMessage(new TextComponent("X"));
             this.previousEdit.setValue("-");
         }
     }
     
     protected void onDone() {
-        final BaseCommandBlock bjc2 = this.getCommandBlock();
-        this.populateAndSendPacket(bjc2);
-        if (!bjc2.isTrackOutput()) {
-            bjc2.setLastOutput(null);
+        final BaseCommandBlock bpc2 = this.getCommandBlock();
+        this.populateAndSendPacket(bpc2);
+        if (!bpc2.isTrackOutput()) {
+            bpc2.setLastOutput(null);
         }
         this.minecraft.setScreen(null);
     }
@@ -97,7 +102,7 @@ public abstract class AbstractCommandBlockEditScreen extends Screen {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
-    protected abstract void populateAndSendPacket(final BaseCommandBlock bjc);
+    protected abstract void populateAndSendPacket(final BaseCommandBlock bpc);
     
     @Override
     public void onClose() {
@@ -135,21 +140,21 @@ public abstract class AbstractCommandBlockEditScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, I18n.get("advMode.setCommand"), this.width / 2, 20, 16777215);
-        this.drawString(this.font, I18n.get("advMode.command"), this.width / 2 - 150, 40, 10526880);
-        this.commandEdit.render(integer1, integer2, float3);
-        int integer3 = 75;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, I18n.get("advMode.setCommand"), this.width / 2, 20, 16777215);
+        this.drawString(dhl, this.font, I18n.get("advMode.command"), this.width / 2 - 150, 40, 10526880);
+        this.commandEdit.render(dhl, integer2, integer3, float4);
+        int integer4 = 75;
         if (!this.previousEdit.getValue().isEmpty()) {
-            final int n = integer3;
+            final int n = integer4;
             final int n2 = 5;
             this.font.getClass();
-            integer3 = n + (n2 * 9 + 1 + this.getPreviousY() - 135);
-            this.drawString(this.font, I18n.get("advMode.previousOutput"), this.width / 2 - 150, integer3 + 4, 10526880);
-            this.previousEdit.render(integer1, integer2, float3);
+            integer4 = n + (n2 * 9 + 1 + this.getPreviousY() - 135);
+            this.drawString(dhl, this.font, I18n.get("advMode.previousOutput"), this.width / 2 - 150, integer4 + 4, 10526880);
+            this.previousEdit.render(dhl, integer2, integer3, float4);
         }
-        super.render(integer1, integer2, float3);
-        this.commandSuggestions.render(integer1, integer2);
+        super.render(dhl, integer2, integer3, float4);
+        this.commandSuggestions.render(dhl, integer2, integer3);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java b/src/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
index 2f0ec3b..7c8f378 100644
--- a/src/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
@@ -9,14 +9,17 @@ import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.Util;
 import net.minecraft.ChatFormatting;
 import net.minecraft.util.Mth;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.collect.Sets;
 import net.minecraft.network.chat.Component;
 import java.util.Set;
 import net.minecraft.world.item.ItemStack;
+import javax.annotation.Nullable;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.resources.ResourceLocation;
@@ -27,20 +30,30 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
     public static final ResourceLocation INVENTORY_LOCATION;
     protected int imageWidth;
     protected int imageHeight;
+    protected int titleLabelX;
+    protected int titleLabelY;
+    protected int inventoryLabelX;
+    protected int inventoryLabelY;
     protected final T menu;
     protected final Inventory inventory;
+    @Nullable
+    protected Slot hoveredSlot;
+    @Nullable
+    private Slot clickedSlot;
+    @Nullable
+    private Slot snapbackEnd;
+    @Nullable
+    private Slot quickdropSlot;
+    @Nullable
+    private Slot lastClickSlot;
     protected int leftPos;
     protected int topPos;
-    protected Slot hoveredSlot;
-    private Slot clickedSlot;
     private boolean isSplittingStack;
     private ItemStack draggingItem;
     private int snapbackStartX;
     private int snapbackStartY;
-    private Slot snapbackEnd;
     private long snapbackTime;
     private ItemStack snapbackItem;
-    private Slot quickdropSlot;
     private long quickdropTime;
     protected final Set<Slot> quickCraftSlots;
     protected boolean isQuickCrafting;
@@ -49,22 +62,25 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
     private boolean skipNextRelease;
     private int quickCraftingRemainder;
     private long lastClickTime;
-    private Slot lastClickSlot;
     private int lastClickButton;
     private boolean doubleclick;
     private ItemStack lastQuickMoved;
     
-    public AbstractContainerScreen(final T ban, final Inventory ayi, final Component lf) {
-        super(lf);
+    public AbstractContainerScreen(final T bgi, final Inventory beb, final Component mr) {
+        super(mr);
         this.imageWidth = 176;
         this.imageHeight = 166;
         this.draggingItem = ItemStack.EMPTY;
         this.snapbackItem = ItemStack.EMPTY;
         this.quickCraftSlots = Sets.newHashSet();
         this.lastQuickMoved = ItemStack.EMPTY;
-        this.menu = ban;
-        this.inventory = ayi;
+        this.menu = bgi;
+        this.inventory = beb;
         this.skipNextRelease = true;
+        this.titleLabelX = 8;
+        this.titleLabelY = 6;
+        this.inventoryLabelX = 8;
+        this.inventoryLabelY = this.imageHeight - 94;
     }
     
     @Override
@@ -75,177 +91,180 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        final int integer3 = this.leftPos;
-        final int integer4 = this.topPos;
-        this.renderBg(float3, integer1, integer2);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        final int integer4 = this.leftPos;
+        final int integer5 = this.topPos;
+        this.renderBg(dhl, float4, integer2, integer3);
         RenderSystem.disableRescaleNormal();
         RenderSystem.disableDepthTest();
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
         RenderSystem.pushMatrix();
-        RenderSystem.translatef((float)integer3, (float)integer4, 0.0f);
+        RenderSystem.translatef((float)integer4, (float)integer5, 0.0f);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.enableRescaleNormal();
         this.hoveredSlot = null;
-        final int integer5 = 240;
         final int integer6 = 240;
+        final int integer7 = 240;
         RenderSystem.glMultiTexCoord2f(33986, 240.0f, 240.0f);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        for (int integer7 = 0; integer7 < this.menu.slots.size(); ++integer7) {
-            final Slot bca10 = this.menu.slots.get(integer7);
-            if (bca10.isActive()) {
-                this.renderSlot(bca10);
+        for (int integer8 = 0; integer8 < this.menu.slots.size(); ++integer8) {
+            final Slot bhw11 = this.menu.slots.get(integer8);
+            if (bhw11.isActive()) {
+                this.renderSlot(dhl, bhw11);
             }
-            if (this.isHovering(bca10, integer1, integer2) && bca10.isActive()) {
-                this.hoveredSlot = bca10;
+            if (this.isHovering(bhw11, integer2, integer3) && bhw11.isActive()) {
+                this.hoveredSlot = bhw11;
                 RenderSystem.disableDepthTest();
-                final int integer8 = bca10.x;
-                final int integer9 = bca10.y;
+                final int integer9 = bhw11.x;
+                final int integer10 = bhw11.y;
                 RenderSystem.colorMask(true, true, true, false);
-                this.fillGradient(integer8, integer9, integer8 + 16, integer9 + 16, -2130706433, -2130706433);
+                this.fillGradient(dhl, integer9, integer10, integer9 + 16, integer10 + 16, -2130706433, -2130706433);
                 RenderSystem.colorMask(true, true, true, true);
                 RenderSystem.enableDepthTest();
             }
         }
-        this.renderLabels(integer1, integer2);
-        final Inventory ayi9 = this.minecraft.player.inventory;
-        ItemStack ben10 = this.draggingItem.isEmpty() ? ayi9.getCarried() : this.draggingItem;
-        if (!ben10.isEmpty()) {
-            final int integer8 = 8;
-            final int integer9 = this.draggingItem.isEmpty() ? 8 : 16;
-            String string13 = null;
+        this.renderLabels(dhl, integer2, integer3);
+        final Inventory beb10 = this.minecraft.player.inventory;
+        ItemStack bki11 = this.draggingItem.isEmpty() ? beb10.getCarried() : this.draggingItem;
+        if (!bki11.isEmpty()) {
+            final int integer9 = 8;
+            final int integer10 = this.draggingItem.isEmpty() ? 8 : 16;
+            String string14 = null;
             if (!this.draggingItem.isEmpty() && this.isSplittingStack) {
-                ben10 = ben10.copy();
-                ben10.setCount(Mth.ceil(ben10.getCount() / 2.0f));
+                bki11 = bki11.copy();
+                bki11.setCount(Mth.ceil(bki11.getCount() / 2.0f));
             }
             else if (this.isQuickCrafting && this.quickCraftSlots.size() > 1) {
-                ben10 = ben10.copy();
-                ben10.setCount(this.quickCraftingRemainder);
-                if (ben10.isEmpty()) {
-                    string13 = "" + ChatFormatting.YELLOW + "0";
+                bki11 = bki11.copy();
+                bki11.setCount(this.quickCraftingRemainder);
+                if (bki11.isEmpty()) {
+                    string14 = "" + ChatFormatting.YELLOW + "0";
                 }
             }
-            this.renderFloatingItem(ben10, integer1 - integer3 - 8, integer2 - integer4 - integer9, string13);
+            this.renderFloatingItem(bki11, integer2 - integer4 - 8, integer3 - integer5 - integer10, string14);
         }
         if (!this.snapbackItem.isEmpty()) {
-            float float4 = (Util.getMillis() - this.snapbackTime) / 100.0f;
-            if (float4 >= 1.0f) {
-                float4 = 1.0f;
+            float float5 = (Util.getMillis() - this.snapbackTime) / 100.0f;
+            if (float5 >= 1.0f) {
+                float5 = 1.0f;
                 this.snapbackItem = ItemStack.EMPTY;
             }
-            final int integer9 = this.snapbackEnd.x - this.snapbackStartX;
-            final int integer10 = this.snapbackEnd.y - this.snapbackStartY;
-            final int integer11 = this.snapbackStartX + (int)(integer9 * float4);
-            final int integer12 = this.snapbackStartY + (int)(integer10 * float4);
-            this.renderFloatingItem(this.snapbackItem, integer11, integer12, null);
+            final int integer10 = this.snapbackEnd.x - this.snapbackStartX;
+            final int integer11 = this.snapbackEnd.y - this.snapbackStartY;
+            final int integer12 = this.snapbackStartX + (int)(integer10 * float5);
+            final int integer13 = this.snapbackStartY + (int)(integer11 * float5);
+            this.renderFloatingItem(this.snapbackItem, integer12, integer13, null);
         }
         RenderSystem.popMatrix();
         RenderSystem.enableDepthTest();
     }
     
-    protected void renderTooltip(final int integer1, final int integer2) {
+    protected void renderTooltip(final PoseStack dhl, final int integer2, final int integer3) {
         if (this.minecraft.player.inventory.getCarried().isEmpty() && this.hoveredSlot != null && this.hoveredSlot.hasItem()) {
-            this.renderTooltip(this.hoveredSlot.getItem(), integer1, integer2);
+            this.renderTooltip(dhl, this.hoveredSlot.getItem(), integer2, integer3);
         }
     }
     
-    private void renderFloatingItem(final ItemStack ben, final int integer2, final int integer3, final String string) {
+    private void renderFloatingItem(final ItemStack bki, final int integer2, final int integer3, final String string) {
         RenderSystem.translatef(0.0f, 0.0f, 32.0f);
         this.setBlitOffset(200);
         this.itemRenderer.blitOffset = 200.0f;
-        this.itemRenderer.renderAndDecorateItem(ben, integer2, integer3);
-        this.itemRenderer.renderGuiItemDecorations(this.font, ben, integer2, integer3 - (this.draggingItem.isEmpty() ? 0 : 8), string);
+        this.itemRenderer.renderAndDecorateItem(bki, integer2, integer3);
+        this.itemRenderer.renderGuiItemDecorations(this.font, bki, integer2, integer3 - (this.draggingItem.isEmpty() ? 0 : 8), string);
         this.setBlitOffset(0);
         this.itemRenderer.blitOffset = 0.0f;
     }
     
-    protected void renderLabels(final int integer1, final int integer2) {
+    protected void renderLabels(final PoseStack dhl, final int integer2, final int integer3) {
+        this.font.draw(dhl, this.title, (float)this.titleLabelX, (float)this.titleLabelY, 4210752);
+        this.font.draw(dhl, this.inventory.getDisplayName(), (float)this.inventoryLabelX, (float)this.inventoryLabelY, 4210752);
     }
     
-    protected abstract void renderBg(final float float1, final int integer2, final int integer3);
+    protected abstract void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4);
     
-    private void renderSlot(final Slot bca) {
-        final int integer3 = bca.x;
-        final int integer4 = bca.y;
-        ItemStack ben5 = bca.getItem();
-        boolean boolean6 = false;
-        boolean boolean7 = bca == this.clickedSlot && !this.draggingItem.isEmpty() && !this.isSplittingStack;
-        final ItemStack ben6 = this.minecraft.player.inventory.getCarried();
-        String string9 = null;
-        if (bca == this.clickedSlot && !this.draggingItem.isEmpty() && this.isSplittingStack && !ben5.isEmpty()) {
-            ben5 = ben5.copy();
-            ben5.setCount(ben5.getCount() / 2);
+    private void renderSlot(final PoseStack dhl, final Slot bhw) {
+        final int integer4 = bhw.x;
+        final int integer5 = bhw.y;
+        ItemStack bki6 = bhw.getItem();
+        boolean boolean7 = false;
+        boolean boolean8 = bhw == this.clickedSlot && !this.draggingItem.isEmpty() && !this.isSplittingStack;
+        final ItemStack bki7 = this.minecraft.player.inventory.getCarried();
+        String string10 = null;
+        if (bhw == this.clickedSlot && !this.draggingItem.isEmpty() && this.isSplittingStack && !bki6.isEmpty()) {
+            bki6 = bki6.copy();
+            bki6.setCount(bki6.getCount() / 2);
         }
-        else if (this.isQuickCrafting && this.quickCraftSlots.contains(bca) && !ben6.isEmpty()) {
+        else if (this.isQuickCrafting && this.quickCraftSlots.contains(bhw) && !bki7.isEmpty()) {
             if (this.quickCraftSlots.size() == 1) {
                 return;
             }
-            if (AbstractContainerMenu.canItemQuickReplace(bca, ben6, true) && this.menu.canDragTo(bca)) {
-                ben5 = ben6.copy();
-                boolean6 = true;
-                AbstractContainerMenu.getQuickCraftSlotCount(this.quickCraftSlots, this.quickCraftingType, ben5, bca.getItem().isEmpty() ? 0 : bca.getItem().getCount());
-                final int integer5 = Math.min(ben5.getMaxStackSize(), bca.getMaxStackSize(ben5));
-                if (ben5.getCount() > integer5) {
-                    string9 = ChatFormatting.YELLOW.toString() + integer5;
-                    ben5.setCount(integer5);
+            if (AbstractContainerMenu.canItemQuickReplace(bhw, bki7, true) && this.menu.canDragTo(bhw)) {
+                bki6 = bki7.copy();
+                boolean7 = true;
+                AbstractContainerMenu.getQuickCraftSlotCount(this.quickCraftSlots, this.quickCraftingType, bki6, bhw.getItem().isEmpty() ? 0 : bhw.getItem().getCount());
+                final int integer6 = Math.min(bki6.getMaxStackSize(), bhw.getMaxStackSize(bki6));
+                if (bki6.getCount() > integer6) {
+                    string10 = ChatFormatting.YELLOW.toString() + integer6;
+                    bki6.setCount(integer6);
                 }
             }
             else {
-                this.quickCraftSlots.remove(bca);
+                this.quickCraftSlots.remove(bhw);
                 this.recalculateQuickCraftRemaining();
             }
         }
         this.setBlitOffset(100);
         this.itemRenderer.blitOffset = 100.0f;
-        if (ben5.isEmpty() && bca.isActive()) {
-            final Pair<ResourceLocation, ResourceLocation> pair10 = bca.getNoItemIcon();
-            if (pair10 != null) {
-                final TextureAtlasSprite eaj11 = this.minecraft.getTextureAtlas((ResourceLocation)pair10.getFirst()).apply((ResourceLocation)pair10.getSecond());
-                this.minecraft.getTextureManager().bind(eaj11.atlas().location());
-                GuiComponent.blit(integer3, integer4, this.getBlitOffset(), 16, 16, eaj11);
-                boolean7 = true;
+        if (bki6.isEmpty() && bhw.isActive()) {
+            final Pair<ResourceLocation, ResourceLocation> pair11 = bhw.getNoItemIcon();
+            if (pair11 != null) {
+                final TextureAtlasSprite elv12 = this.minecraft.getTextureAtlas((ResourceLocation)pair11.getFirst()).apply((ResourceLocation)pair11.getSecond());
+                this.minecraft.getTextureManager().bind(elv12.atlas().location());
+                GuiComponent.blit(dhl, integer4, integer5, this.getBlitOffset(), 16, 16, elv12);
+                boolean8 = true;
             }
         }
-        if (!boolean7) {
-            if (boolean6) {
-                GuiComponent.fill(integer3, integer4, integer3 + 16, integer4 + 16, -2130706433);
+        if (!boolean8) {
+            if (boolean7) {
+                GuiComponent.fill(dhl, integer4, integer5, integer4 + 16, integer5 + 16, -2130706433);
             }
             RenderSystem.enableDepthTest();
-            this.itemRenderer.renderAndDecorateItem(this.minecraft.player, ben5, integer3, integer4);
-            this.itemRenderer.renderGuiItemDecorations(this.font, ben5, integer3, integer4, string9);
+            this.itemRenderer.renderAndDecorateItem(this.minecraft.player, bki6, integer4, integer5);
+            this.itemRenderer.renderGuiItemDecorations(this.font, bki6, integer4, integer5, string10);
         }
         this.itemRenderer.blitOffset = 0.0f;
         this.setBlitOffset(0);
     }
     
     private void recalculateQuickCraftRemaining() {
-        final ItemStack ben2 = this.minecraft.player.inventory.getCarried();
-        if (ben2.isEmpty() || !this.isQuickCrafting) {
+        final ItemStack bki2 = this.minecraft.player.inventory.getCarried();
+        if (bki2.isEmpty() || !this.isQuickCrafting) {
             return;
         }
         if (this.quickCraftingType == 2) {
-            this.quickCraftingRemainder = ben2.getMaxStackSize();
+            this.quickCraftingRemainder = bki2.getMaxStackSize();
             return;
         }
-        this.quickCraftingRemainder = ben2.getCount();
-        for (final Slot bca4 : this.quickCraftSlots) {
-            final ItemStack ben3 = ben2.copy();
-            final ItemStack ben4 = bca4.getItem();
-            final int integer7 = ben4.isEmpty() ? 0 : ben4.getCount();
-            AbstractContainerMenu.getQuickCraftSlotCount(this.quickCraftSlots, this.quickCraftingType, ben3, integer7);
-            final int integer8 = Math.min(ben3.getMaxStackSize(), bca4.getMaxStackSize(ben3));
-            if (ben3.getCount() > integer8) {
-                ben3.setCount(integer8);
+        this.quickCraftingRemainder = bki2.getCount();
+        for (final Slot bhw4 : this.quickCraftSlots) {
+            final ItemStack bki3 = bki2.copy();
+            final ItemStack bki4 = bhw4.getItem();
+            final int integer7 = bki4.isEmpty() ? 0 : bki4.getCount();
+            AbstractContainerMenu.getQuickCraftSlotCount(this.quickCraftSlots, this.quickCraftingType, bki3, integer7);
+            final int integer8 = Math.min(bki3.getMaxStackSize(), bhw4.getMaxStackSize(bki3));
+            if (bki3.getCount() > integer8) {
+                bki3.setCount(integer8);
             }
-            this.quickCraftingRemainder -= ben3.getCount() - integer7;
+            this.quickCraftingRemainder -= bki3.getCount() - integer7;
         }
     }
     
+    @Nullable
     private Slot findSlot(final double double1, final double double2) {
         for (int integer6 = 0; integer6 < this.menu.slots.size(); ++integer6) {
-            final Slot bca7 = this.menu.slots.get(integer6);
-            if (this.isHovering(bca7, double1, double2) && bca7.isActive()) {
-                return bca7;
+            final Slot bhw7 = this.menu.slots.get(integer6);
+            if (this.isHovering(bhw7, double1, double2) && bhw7.isActive()) {
+                return bhw7;
             }
         }
         return null;
@@ -257,17 +276,17 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
             return true;
         }
         final boolean boolean7 = this.minecraft.options.keyPickItem.matchesMouse(integer);
-        final Slot bca8 = this.findSlot(double1, double2);
+        final Slot bhw8 = this.findSlot(double1, double2);
         final long long9 = Util.getMillis();
-        this.doubleclick = (this.lastClickSlot == bca8 && long9 - this.lastClickTime < 250L && this.lastClickButton == integer);
+        this.doubleclick = (this.lastClickSlot == bhw8 && long9 - this.lastClickTime < 250L && this.lastClickButton == integer);
         this.skipNextRelease = false;
         if (integer == 0 || integer == 1 || boolean7) {
             final int integer2 = this.leftPos;
             final int integer3 = this.topPos;
             final boolean boolean8 = this.hasClickedOutside(double1, double2, integer2, integer3, integer);
             int integer4 = -1;
-            if (bca8 != null) {
-                integer4 = bca8.index;
+            if (bhw8 != null) {
+                integer4 = bhw8.index;
             }
             if (boolean8) {
                 integer4 = -999;
@@ -278,8 +297,8 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
             }
             if (integer4 != -1) {
                 if (this.minecraft.options.touchscreen) {
-                    if (bca8 != null && bca8.hasItem()) {
-                        this.clickedSlot = bca8;
+                    if (bhw8 != null && bhw8.hasItem()) {
+                        this.clickedSlot = bhw8;
                         this.draggingItem = ItemStack.EMPTY;
                         this.isSplittingStack = (integer == 1);
                     }
@@ -290,19 +309,19 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
                 else if (!this.isQuickCrafting) {
                     if (this.minecraft.player.inventory.getCarried().isEmpty()) {
                         if (this.minecraft.options.keyPickItem.matchesMouse(integer)) {
-                            this.slotClicked(bca8, integer4, integer, ClickType.CLONE);
+                            this.slotClicked(bhw8, integer4, integer, ClickType.CLONE);
                         }
                         else {
                             final boolean boolean9 = integer4 != -999 && (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), 340) || InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), 344));
-                            ClickType bav16 = ClickType.PICKUP;
+                            ClickType bgq16 = ClickType.PICKUP;
                             if (boolean9) {
-                                this.lastQuickMoved = ((bca8 != null && bca8.hasItem()) ? bca8.getItem().copy() : ItemStack.EMPTY);
-                                bav16 = ClickType.QUICK_MOVE;
+                                this.lastQuickMoved = ((bhw8 != null && bhw8.hasItem()) ? bhw8.getItem().copy() : ItemStack.EMPTY);
+                                bgq16 = ClickType.QUICK_MOVE;
                             }
                             else if (integer4 == -999) {
-                                bav16 = ClickType.THROW;
+                                bgq16 = ClickType.THROW;
                             }
-                            this.slotClicked(bca8, integer4, integer, bav16);
+                            this.slotClicked(bhw8, integer4, integer, bgq16);
                         }
                         this.skipNextRelease = true;
                     }
@@ -323,47 +342,64 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
                 }
             }
         }
-        this.lastClickSlot = bca8;
+        else {
+            this.checkHotbarMouseClicked(integer);
+        }
+        this.lastClickSlot = bhw8;
         this.lastClickTime = long9;
         this.lastClickButton = integer;
         return true;
     }
     
+    private void checkHotbarMouseClicked(final int integer) {
+        if (this.hoveredSlot != null && this.minecraft.player.inventory.getCarried().isEmpty()) {
+            if (this.minecraft.options.keySwapOffhand.matchesMouse(integer)) {
+                this.slotClicked(this.hoveredSlot, this.hoveredSlot.index, 40, ClickType.SWAP);
+                return;
+            }
+            for (int integer2 = 0; integer2 < 9; ++integer2) {
+                if (this.minecraft.options.keyHotbarSlots[integer2].matchesMouse(integer)) {
+                    this.slotClicked(this.hoveredSlot, this.hoveredSlot.index, integer2, ClickType.SWAP);
+                }
+            }
+        }
+    }
+    
     protected boolean hasClickedOutside(final double double1, final double double2, final int integer3, final int integer4, final int integer5) {
         return double1 < integer3 || double2 < integer4 || double1 >= integer3 + this.imageWidth || double2 >= integer4 + this.imageHeight;
     }
     
     @Override
     public boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
-        final Slot bca11 = this.findSlot(double1, double2);
-        final ItemStack ben12 = this.minecraft.player.inventory.getCarried();
+        final Slot bhw11 = this.findSlot(double1, double2);
+        final ItemStack bki12 = this.minecraft.player.inventory.getCarried();
         if (this.clickedSlot != null && this.minecraft.options.touchscreen) {
             if (integer == 0 || integer == 1) {
                 if (this.draggingItem.isEmpty()) {
-                    if (bca11 != this.clickedSlot && !this.clickedSlot.getItem().isEmpty()) {
+                    if (bhw11 != this.clickedSlot && !this.clickedSlot.getItem().isEmpty()) {
                         this.draggingItem = this.clickedSlot.getItem().copy();
                     }
                 }
-                else if (this.draggingItem.getCount() > 1 && bca11 != null && AbstractContainerMenu.canItemQuickReplace(bca11, this.draggingItem, false)) {
+                else if (this.draggingItem.getCount() > 1 && bhw11 != null && AbstractContainerMenu.canItemQuickReplace(bhw11, this.draggingItem, false)) {
                     final long long13 = Util.getMillis();
-                    if (this.quickdropSlot == bca11) {
+                    if (this.quickdropSlot == bhw11) {
                         if (long13 - this.quickdropTime > 500L) {
                             this.slotClicked(this.clickedSlot, this.clickedSlot.index, 0, ClickType.PICKUP);
-                            this.slotClicked(bca11, bca11.index, 1, ClickType.PICKUP);
+                            this.slotClicked(bhw11, bhw11.index, 1, ClickType.PICKUP);
                             this.slotClicked(this.clickedSlot, this.clickedSlot.index, 0, ClickType.PICKUP);
                             this.quickdropTime = long13 + 750L;
                             this.draggingItem.shrink(1);
                         }
                     }
                     else {
-                        this.quickdropSlot = bca11;
+                        this.quickdropSlot = bhw11;
                         this.quickdropTime = long13;
                     }
                 }
             }
         }
-        else if (this.isQuickCrafting && bca11 != null && !ben12.isEmpty() && (ben12.getCount() > this.quickCraftSlots.size() || this.quickCraftingType == 2) && AbstractContainerMenu.canItemQuickReplace(bca11, ben12, true) && bca11.mayPlace(ben12) && this.menu.canDragTo(bca11)) {
-            this.quickCraftSlots.add(bca11);
+        else if (this.isQuickCrafting && bhw11 != null && !bki12.isEmpty() && (bki12.getCount() > this.quickCraftSlots.size() || this.quickCraftingType == 2) && AbstractContainerMenu.canItemQuickReplace(bhw11, bki12, true) && bhw11.mayPlace(bki12) && this.menu.canDragTo(bhw11)) {
+            this.quickCraftSlots.add(bhw11);
             this.recalculateQuickCraftRemaining();
         }
         return true;
@@ -371,29 +407,29 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
     
     @Override
     public boolean mouseReleased(final double double1, final double double2, final int integer) {
-        final Slot bca7 = this.findSlot(double1, double2);
+        final Slot bhw7 = this.findSlot(double1, double2);
         final int integer2 = this.leftPos;
         final int integer3 = this.topPos;
         final boolean boolean10 = this.hasClickedOutside(double1, double2, integer2, integer3, integer);
         int integer4 = -1;
-        if (bca7 != null) {
-            integer4 = bca7.index;
+        if (bhw7 != null) {
+            integer4 = bhw7.index;
         }
         if (boolean10) {
             integer4 = -999;
         }
-        if (this.doubleclick && bca7 != null && integer == 0 && this.menu.canTakeItemForPickAll(ItemStack.EMPTY, bca7)) {
+        if (this.doubleclick && bhw7 != null && integer == 0 && this.menu.canTakeItemForPickAll(ItemStack.EMPTY, bhw7)) {
             if (hasShiftDown()) {
                 if (!this.lastQuickMoved.isEmpty()) {
-                    for (final Slot bca8 : this.menu.slots) {
-                        if (bca8 != null && bca8.mayPickup(this.minecraft.player) && bca8.hasItem() && bca8.container == bca7.container && AbstractContainerMenu.canItemQuickReplace(bca8, this.lastQuickMoved, true)) {
-                            this.slotClicked(bca8, bca8.index, integer, ClickType.QUICK_MOVE);
+                    for (final Slot bhw8 : this.menu.slots) {
+                        if (bhw8 != null && bhw8.mayPickup(this.minecraft.player) && bhw8.hasItem() && bhw8.container == bhw7.container && AbstractContainerMenu.canItemQuickReplace(bhw8, this.lastQuickMoved, true)) {
+                            this.slotClicked(bhw8, bhw8.index, integer, ClickType.QUICK_MOVE);
                         }
                     }
                 }
             }
             else {
-                this.slotClicked(bca7, integer4, integer, ClickType.PICKUP_ALL);
+                this.slotClicked(bhw7, integer4, integer, ClickType.PICKUP_ALL);
             }
             this.doubleclick = false;
             this.lastClickTime = 0L;
@@ -410,13 +446,13 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
             }
             if (this.clickedSlot != null && this.minecraft.options.touchscreen) {
                 if (integer == 0 || integer == 1) {
-                    if (this.draggingItem.isEmpty() && bca7 != this.clickedSlot) {
+                    if (this.draggingItem.isEmpty() && bhw7 != this.clickedSlot) {
                         this.draggingItem = this.clickedSlot.getItem();
                     }
-                    final boolean boolean11 = AbstractContainerMenu.canItemQuickReplace(bca7, this.draggingItem, false);
+                    final boolean boolean11 = AbstractContainerMenu.canItemQuickReplace(bhw7, this.draggingItem, false);
                     if (integer4 != -1 && !this.draggingItem.isEmpty() && boolean11) {
                         this.slotClicked(this.clickedSlot, this.clickedSlot.index, integer, ClickType.PICKUP);
-                        this.slotClicked(bca7, integer4, 0, ClickType.PICKUP);
+                        this.slotClicked(bhw7, integer4, 0, ClickType.PICKUP);
                         if (this.minecraft.player.inventory.getCarried().isEmpty()) {
                             this.snapbackItem = ItemStack.EMPTY;
                         }
@@ -442,21 +478,21 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
             }
             else if (this.isQuickCrafting && !this.quickCraftSlots.isEmpty()) {
                 this.slotClicked(null, -999, AbstractContainerMenu.getQuickcraftMask(0, this.quickCraftingType), ClickType.QUICK_CRAFT);
-                for (final Slot bca8 : this.quickCraftSlots) {
-                    this.slotClicked(bca8, bca8.index, AbstractContainerMenu.getQuickcraftMask(1, this.quickCraftingType), ClickType.QUICK_CRAFT);
+                for (final Slot bhw8 : this.quickCraftSlots) {
+                    this.slotClicked(bhw8, bhw8.index, AbstractContainerMenu.getQuickcraftMask(1, this.quickCraftingType), ClickType.QUICK_CRAFT);
                 }
                 this.slotClicked(null, -999, AbstractContainerMenu.getQuickcraftMask(2, this.quickCraftingType), ClickType.QUICK_CRAFT);
             }
             else if (!this.minecraft.player.inventory.getCarried().isEmpty()) {
                 if (this.minecraft.options.keyPickItem.matchesMouse(integer)) {
-                    this.slotClicked(bca7, integer4, integer, ClickType.CLONE);
+                    this.slotClicked(bhw7, integer4, integer, ClickType.CLONE);
                 }
                 else {
                     final boolean boolean11 = integer4 != -999 && (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), 340) || InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), 344));
                     if (boolean11) {
-                        this.lastQuickMoved = ((bca7 != null && bca7.hasItem()) ? bca7.getItem().copy() : ItemStack.EMPTY);
+                        this.lastQuickMoved = ((bhw7 != null && bhw7.hasItem()) ? bhw7.getItem().copy() : ItemStack.EMPTY);
                     }
-                    this.slotClicked(bca7, integer4, integer, boolean11 ? ClickType.QUICK_MOVE : ClickType.PICKUP);
+                    this.slotClicked(bhw7, integer4, integer, boolean11 ? ClickType.QUICK_MOVE : ClickType.PICKUP);
                 }
             }
         }
@@ -467,8 +503,8 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
         return true;
     }
     
-    private boolean isHovering(final Slot bca, final double double2, final double double3) {
-        return this.isHovering(bca.x, bca.y, 16, 16, double2, double3);
+    private boolean isHovering(final Slot bhw, final double double2, final double double3) {
+        return this.isHovering(bhw.x, bhw.y, 16, 16, double2, double3);
     }
     
     protected boolean isHovering(final int integer1, final int integer2, final int integer3, final int integer4, double double5, double double6) {
@@ -479,11 +515,11 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
         return double5 >= integer1 - 1 && double5 < integer1 + integer3 + 1 && double6 >= integer2 - 1 && double6 < integer2 + integer4 + 1;
     }
     
-    protected void slotClicked(final Slot bca, int integer2, final int integer3, final ClickType bav) {
-        if (bca != null) {
-            integer2 = bca.index;
+    protected void slotClicked(final Slot bhw, int integer2, final int integer3, final ClickType bgq) {
+        if (bhw != null) {
+            integer2 = bhw.index;
         }
-        this.minecraft.gameMode.handleInventoryMouseClick(this.menu.containerId, integer2, integer3, bav, this.minecraft.player);
+        this.minecraft.gameMode.handleInventoryMouseClick(this.menu.containerId, integer2, integer3, bgq, this.minecraft.player);
     }
     
     @Override
@@ -498,8 +534,9 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
         }
         if (integer1 == 256 || this.minecraft.options.keyInventory.matches(integer1, integer2)) {
             this.minecraft.player.closeContainer();
+            return true;
         }
-        this.checkNumkeyPressed(integer1, integer2);
+        this.checkHotbarKeyPressed(integer1, integer2);
         if (this.hoveredSlot != null && this.hoveredSlot.hasItem()) {
             if (this.minecraft.options.keyPickItem.matches(integer1, integer2)) {
                 this.slotClicked(this.hoveredSlot, this.hoveredSlot.index, 0, ClickType.CLONE);
@@ -511,8 +548,12 @@ public abstract class AbstractContainerScreen<T extends AbstractContainerMenu> e
         return true;
     }
     
-    protected boolean checkNumkeyPressed(final int integer1, final int integer2) {
+    protected boolean checkHotbarKeyPressed(final int integer1, final int integer2) {
         if (this.minecraft.player.inventory.getCarried().isEmpty() && this.hoveredSlot != null) {
+            if (this.minecraft.options.keySwapOffhand.matches(integer1, integer2)) {
+                this.slotClicked(this.hoveredSlot, this.hoveredSlot.index, 40, ClickType.SWAP);
+                return true;
+            }
             for (int integer3 = 0; integer3 < 9; ++integer3) {
                 if (this.minecraft.options.keyHotbarSlots[integer3].matches(integer1, integer2)) {
                     this.slotClicked(this.hoveredSlot, this.hoveredSlot.index, integer3, ClickType.SWAP);
diff --git a/src/net/minecraft/client/gui/screens/inventory/AbstractFurnaceScreen.java b/src/net/minecraft/client/gui/screens/inventory/AbstractFurnaceScreen.java
index 190afeb..742915f 100644
--- a/src/net/minecraft/client/gui/screens/inventory/AbstractFurnaceScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/AbstractFurnaceScreen.java
@@ -5,6 +5,8 @@ import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
 import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.inventory.Slot;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.client.gui.components.ImageButton;
 import net.minecraft.world.inventory.RecipeBookMenu;
 import net.minecraft.network.chat.Component;
@@ -20,10 +22,10 @@ public abstract class AbstractFurnaceScreen<T extends AbstractFurnaceMenu> exten
     private boolean widthTooNarrow;
     private final ResourceLocation texture;
     
-    public AbstractFurnaceScreen(final T bao, final AbstractFurnaceRecipeBookComponent dil, final Inventory ayi, final Component lf, final ResourceLocation sm) {
-        super(bao, ayi, lf);
-        this.recipeBookComponent = dil;
-        this.texture = sm;
+    public AbstractFurnaceScreen(final T bgj, final AbstractFurnaceRecipeBookComponent dtj, final Inventory beb, final Component mr, final ResourceLocation uh) {
+        super(bgj, beb, mr);
+        this.recipeBookComponent = dtj;
+        this.texture = uh;
     }
     
     public void init() {
@@ -31,12 +33,14 @@ public abstract class AbstractFurnaceScreen<T extends AbstractFurnaceMenu> exten
         this.widthTooNarrow = (this.width < 379);
         this.recipeBookComponent.init(this.width, this.height, this.minecraft, this.widthTooNarrow, this.menu);
         this.leftPos = this.recipeBookComponent.updateScreenPosition(this.widthTooNarrow, this.width, this.imageWidth);
-        this.<ImageButton>addButton(new ImageButton(this.leftPos + 20, this.height / 2 - 49, 20, 18, 0, 0, 19, AbstractFurnaceScreen.RECIPE_BUTTON_LOCATION, dcv -> {
+        this.<ImageButton>addButton(new ImageButton(this.leftPos + 20, this.height / 2 - 49, 20, 18, 0, 0, 19, AbstractFurnaceScreen.RECIPE_BUTTON_LOCATION, dni -> {
             this.recipeBookComponent.initVisuals(this.widthTooNarrow);
             this.recipeBookComponent.toggleVisibility();
             this.leftPos = this.recipeBookComponent.updateScreenPosition(this.widthTooNarrow, this.width, this.imageWidth);
-            dcv.setPosition(this.leftPos + 20, this.height / 2 - 49);
+            dni.setPosition(this.leftPos + 20, this.height / 2 - 49);
+            return;
         }));
+        this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2;
     }
     
     @Override
@@ -46,41 +50,34 @@ public abstract class AbstractFurnaceScreen<T extends AbstractFurnaceMenu> exten
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
         if (this.recipeBookComponent.isVisible() && this.widthTooNarrow) {
-            this.renderBg(float3, integer1, integer2);
-            this.recipeBookComponent.render(integer1, integer2, float3);
+            this.renderBg(dhl, float4, integer2, integer3);
+            this.recipeBookComponent.render(dhl, integer2, integer3, float4);
         }
         else {
-            this.recipeBookComponent.render(integer1, integer2, float3);
-            super.render(integer1, integer2, float3);
-            this.recipeBookComponent.renderGhostRecipe(this.leftPos, this.topPos, true, float3);
+            this.recipeBookComponent.render(dhl, integer2, integer3, float4);
+            super.render(dhl, integer2, integer3, float4);
+            this.recipeBookComponent.renderGhostRecipe(dhl, this.leftPos, this.topPos, true, float4);
         }
-        this.renderTooltip(integer1, integer2);
-        this.recipeBookComponent.renderTooltip(this.leftPos, this.topPos, integer1, integer2);
+        this.renderTooltip(dhl, integer2, integer3);
+        this.recipeBookComponent.renderTooltip(dhl, this.leftPos, this.topPos, integer2, integer3);
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        final String string4 = this.title.getColoredString();
-        this.font.draw(string4, (float)(this.imageWidth / 2 - this.font.width(string4) / 2), 6.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(this.texture);
-        final int integer4 = this.leftPos;
-        final int integer5 = this.topPos;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer5 = this.leftPos;
+        final int integer6 = this.topPos;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
         if (this.menu.isLit()) {
-            final int integer6 = this.menu.getLitProgress();
-            this.blit(integer4 + 56, integer5 + 36 + 12 - integer6, 176, 12 - integer6, 14, integer6 + 1);
+            final int integer7 = this.menu.getLitProgress();
+            this.blit(dhl, integer5 + 56, integer6 + 36 + 12 - integer7, 176, 12 - integer7, 14, integer7 + 1);
         }
-        final int integer6 = this.menu.getBurnProgress();
-        this.blit(integer4 + 79, integer5 + 34, 176, 14, integer6 + 1, 16);
+        final int integer7 = this.menu.getBurnProgress();
+        this.blit(dhl, integer5 + 79, integer6 + 34, 176, 14, integer7 + 1, 16);
     }
     
     @Override
@@ -89,9 +86,9 @@ public abstract class AbstractFurnaceScreen<T extends AbstractFurnaceMenu> exten
     }
     
     @Override
-    protected void slotClicked(final Slot bca, final int integer2, final int integer3, final ClickType bav) {
-        super.slotClicked(bca, integer2, integer3, bav);
-        this.recipeBookComponent.slotClicked(bca);
+    protected void slotClicked(final Slot bhw, final int integer2, final int integer3, final ClickType bgq) {
+        super.slotClicked(bhw, integer2, integer3, bgq);
+        this.recipeBookComponent.slotClicked(bhw);
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/inventory/AnvilScreen.java b/src/net/minecraft/client/gui/screens/inventory/AnvilScreen.java
index 965d43d..a0ebe6c 100644
--- a/src/net/minecraft/client/gui/screens/inventory/AnvilScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/AnvilScreen.java
@@ -1,53 +1,51 @@
 package net.minecraft.client.gui.screens.inventory;
 
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.core.NonNullList;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundRenameItemPacket;
-import net.minecraft.client.gui.GuiComponent;
-import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.inventory.ContainerListener;
 import net.minecraft.world.inventory.AnvilMenu;
 
-public class AnvilScreen extends AbstractContainerScreen<AnvilMenu> implements ContainerListener {
+public class AnvilScreen extends ItemCombinerScreen<AnvilMenu> {
     private static final ResourceLocation ANVIL_LOCATION;
     private EditBox name;
     
-    public AnvilScreen(final AnvilMenu bap, final Inventory ayi, final Component lf) {
-        super(bap, ayi, lf);
+    public AnvilScreen(final AnvilMenu bgk, final Inventory beb, final Component mr) {
+        super(bgk, beb, mr, AnvilScreen.ANVIL_LOCATION);
+        this.titleLabelX = 60;
     }
     
     @Override
-    protected void init() {
-        super.init();
+    protected void subInit() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
         final int integer2 = (this.width - this.imageWidth) / 2;
         final int integer3 = (this.height - this.imageHeight) / 2;
-        (this.name = new EditBox(this.font, integer2 + 62, integer3 + 24, 103, 12, I18n.get("container.repair"))).setCanLoseFocus(false);
-        this.name.changeFocus(true);
+        (this.name = new EditBox(this.font, integer2 + 62, integer3 + 24, 103, 12, new TranslatableComponent("container.repair"))).setCanLoseFocus(false);
         this.name.setTextColor(-1);
         this.name.setTextColorUneditable(-1);
         this.name.setBordered(false);
         this.name.setMaxLength(35);
         this.name.setResponder(this::onNameChanged);
         this.children.add(this.name);
-        ((AnvilMenu)this.menu).addSlotListener(this);
         this.setInitialFocus(this.name);
     }
     
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
         final String string5 = this.name.getValue();
-        this.init(dbn, integer2, integer3);
+        this.init(dlx, integer2, integer3);
         this.name.setValue(string5);
     }
     
@@ -55,7 +53,6 @@ public class AnvilScreen extends AbstractContainerScreen<AnvilMenu> implements C
     public void removed() {
         super.removed();
         this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
-        ((AnvilMenu)this.menu).removeSlotListener(this);
     }
     
     @Override
@@ -66,41 +63,13 @@ public class AnvilScreen extends AbstractContainerScreen<AnvilMenu> implements C
         return this.name.keyPressed(integer1, integer2, integer3) || this.name.canConsumeInput() || super.keyPressed(integer1, integer2, integer3);
     }
     
-    @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        RenderSystem.disableBlend();
-        this.font.draw(this.title.getColoredString(), 60.0f, 6.0f, 4210752);
-        final int integer3 = ((AnvilMenu)this.menu).getCost();
-        if (integer3 > 0) {
-            int integer4 = 8453920;
-            boolean boolean6 = true;
-            String string7 = I18n.get("container.repair.cost", integer3);
-            if (integer3 >= 40 && !this.minecraft.player.abilities.instabuild) {
-                string7 = I18n.get("container.repair.expensive");
-                integer4 = 16736352;
-            }
-            else if (!((AnvilMenu)this.menu).getSlot(2).hasItem()) {
-                boolean6 = false;
-            }
-            else if (!((AnvilMenu)this.menu).getSlot(2).mayPickup(this.inventory.player)) {
-                integer4 = 16736352;
-            }
-            if (boolean6) {
-                final int integer5 = this.imageWidth - 8 - this.font.width(string7) - 2;
-                final int integer6 = 69;
-                GuiComponent.fill(integer5 - 2, 67, this.imageWidth - 8, 79, 1325400064);
-                this.font.drawShadow(string7, (float)integer5, 69.0f, integer4);
-            }
-        }
-    }
-    
     private void onNameChanged(final String string) {
         if (string.isEmpty()) {
             return;
         }
         String string2 = string;
-        final Slot bca4 = ((AnvilMenu)this.menu).getSlot(0);
-        if (bca4 != null && bca4.hasItem() && !bca4.getItem().hasCustomHoverName() && string2.equals(bca4.getItem().getHoverName().getString())) {
+        final Slot bhw4 = ((AnvilMenu)this.menu).getSlot(0);
+        if (bhw4 != null && bhw4.hasItem() && !bhw4.getItem().hasCustomHoverName() && string2.equals(bhw4.getItem().getHoverName().getString())) {
             string2 = "";
         }
         ((AnvilMenu)this.menu).setItemName(string2);
@@ -108,44 +77,46 @@ public class AnvilScreen extends AbstractContainerScreen<AnvilMenu> implements C
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
+    protected void renderLabels(final PoseStack dhl, final int integer2, final int integer3) {
         RenderSystem.disableBlend();
-        this.name.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
-        RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        this.minecraft.getTextureManager().bind(AnvilScreen.ANVIL_LOCATION);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
-        this.blit(integer4 + 59, integer5 + 20, 0, this.imageHeight + (((AnvilMenu)this.menu).getSlot(0).hasItem() ? 0 : 16), 110, 16);
-        if ((((AnvilMenu)this.menu).getSlot(0).hasItem() || ((AnvilMenu)this.menu).getSlot(1).hasItem()) && !((AnvilMenu)this.menu).getSlot(2).hasItem()) {
-            this.blit(integer4 + 99, integer5 + 45, this.imageWidth, 0, 28, 21);
+        super.renderLabels(dhl, integer2, integer3);
+        final int integer4 = ((AnvilMenu)this.menu).getCost();
+        if (integer4 > 0) {
+            int integer5 = 8453920;
+            boolean boolean7 = true;
+            String string8 = I18n.get("container.repair.cost", integer4);
+            if (integer4 >= 40 && !this.minecraft.player.abilities.instabuild) {
+                string8 = I18n.get("container.repair.expensive");
+                integer5 = 16736352;
+            }
+            else if (!((AnvilMenu)this.menu).getSlot(2).hasItem()) {
+                boolean7 = false;
+            }
+            else if (!((AnvilMenu)this.menu).getSlot(2).mayPickup(this.inventory.player)) {
+                integer5 = 16736352;
+            }
+            if (boolean7) {
+                final int integer6 = this.imageWidth - 8 - this.font.width(string8) - 2;
+                final int integer7 = 69;
+                GuiComponent.fill(dhl, integer6 - 2, 67, this.imageWidth - 8, 79, 1325400064);
+                this.font.drawShadow(dhl, string8, (float)integer6, 69.0f, integer5);
+            }
         }
     }
     
-    @Override
-    public void refreshContainer(final AbstractContainerMenu ban, final NonNullList<ItemStack> fy) {
-        this.slotChanged(ban, 0, ban.getSlot(0).getItem());
+    public void renderFg(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.name.render(dhl, integer2, integer3, float4);
     }
     
     @Override
-    public void slotChanged(final AbstractContainerMenu ban, final int integer, final ItemStack ben) {
+    public void slotChanged(final AbstractContainerMenu bgi, final int integer, final ItemStack bki) {
         if (integer == 0) {
-            this.name.setValue(ben.isEmpty() ? "" : ben.getHoverName().getString());
-            this.name.setEditable(!ben.isEmpty());
+            this.name.setValue(bki.isEmpty() ? "" : bki.getHoverName().getString());
+            this.name.setEditable(!bki.isEmpty());
+            this.setFocused(this.name);
         }
     }
     
-    @Override
-    public void setContainerData(final AbstractContainerMenu ban, final int integer2, final int integer3) {
-    }
-    
     static {
         ANVIL_LOCATION = new ResourceLocation("textures/gui/container/anvil.png");
     }
diff --git a/src/net/minecraft/client/gui/screens/inventory/BeaconScreen.java b/src/net/minecraft/client/gui/screens/inventory/BeaconScreen.java
index 38cb434..2a32b3a 100644
--- a/src/net/minecraft/client/gui/screens/inventory/BeaconScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/BeaconScreen.java
@@ -1,12 +1,17 @@
 package net.minecraft.client.gui.screens.inventory;
 
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundSetBeaconPacket;
 import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.world.effect.MobEffects;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.client.Minecraft;
 import java.util.List;
@@ -16,6 +21,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import java.util.Iterator;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.level.block.entity.BeaconBlockEntity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.NonNullList;
@@ -34,23 +40,23 @@ public class BeaconScreen extends AbstractContainerScreen<BeaconMenu> {
     private MobEffect primary;
     private MobEffect secondary;
     
-    public BeaconScreen(final BeaconMenu baq, final Inventory ayi, final Component lf) {
-        super(baq, ayi, lf);
+    public BeaconScreen(final BeaconMenu bgl, final Inventory beb, final Component mr) {
+        super(bgl, beb, mr);
         this.imageWidth = 230;
         this.imageHeight = 219;
-        baq.addSlotListener(new ContainerListener() {
+        bgl.addSlotListener(new ContainerListener() {
             @Override
-            public void refreshContainer(final AbstractContainerMenu ban, final NonNullList<ItemStack> fy) {
+            public void refreshContainer(final AbstractContainerMenu bgi, final NonNullList<ItemStack> gi) {
             }
             
             @Override
-            public void slotChanged(final AbstractContainerMenu ban, final int integer, final ItemStack ben) {
+            public void slotChanged(final AbstractContainerMenu bgi, final int integer, final ItemStack bki) {
             }
             
             @Override
-            public void setContainerData(final AbstractContainerMenu ban, final int integer2, final int integer3) {
-                BeaconScreen.this.primary = baq.getPrimaryEffect();
-                BeaconScreen.this.secondary = baq.getSecondaryEffect();
+            public void setContainerData(final AbstractContainerMenu bgi, final int integer2, final int integer3) {
+                BeaconScreen.this.primary = bgl.getPrimaryEffect();
+                BeaconScreen.this.secondary = bgl.getSecondaryEffect();
                 BeaconScreen.this.initPowerButtons = true;
             }
         });
@@ -75,13 +81,13 @@ public class BeaconScreen extends AbstractContainerScreen<BeaconMenu> {
                 final int integer4 = BeaconBlockEntity.BEACON_EFFECTS[integer3].length;
                 final int integer5 = integer4 * 22 + (integer4 - 1) * 2;
                 for (int integer6 = 0; integer6 < integer4; ++integer6) {
-                    final MobEffect aki7 = BeaconBlockEntity.BEACON_EFFECTS[integer3][integer6];
-                    final BeaconPowerButton c8 = new BeaconPowerButton(this.leftPos + 76 + integer6 * 24 - integer5 / 2, this.topPos + 22 + integer3 * 25, aki7, true);
+                    final MobEffect aoe7 = BeaconBlockEntity.BEACON_EFFECTS[integer3][integer6];
+                    final BeaconPowerButton c8 = new BeaconPowerButton(this.leftPos + 76 + integer6 * 24 - integer5 / 2, this.topPos + 22 + integer3 * 25, aoe7, true);
                     this.<BeaconPowerButton>addButton(c8);
                     if (integer3 >= integer2) {
                         c8.active = false;
                     }
-                    else if (aki7 == this.primary) {
+                    else if (aoe7 == this.primary) {
                         c8.setSelected(true);
                     }
                 }
@@ -90,13 +96,13 @@ public class BeaconScreen extends AbstractContainerScreen<BeaconMenu> {
             final int integer4 = BeaconBlockEntity.BEACON_EFFECTS[3].length + 1;
             final int integer5 = integer4 * 22 + (integer4 - 1) * 2;
             for (int integer6 = 0; integer6 < integer4 - 1; ++integer6) {
-                final MobEffect aki7 = BeaconBlockEntity.BEACON_EFFECTS[3][integer6];
-                final BeaconPowerButton c8 = new BeaconPowerButton(this.leftPos + 167 + integer6 * 24 - integer5 / 2, this.topPos + 47, aki7, false);
+                final MobEffect aoe7 = BeaconBlockEntity.BEACON_EFFECTS[3][integer6];
+                final BeaconPowerButton c8 = new BeaconPowerButton(this.leftPos + 167 + integer6 * 24 - integer5 / 2, this.topPos + 47, aoe7, false);
                 this.<BeaconPowerButton>addButton(c8);
                 if (3 >= integer2) {
                     c8.active = false;
                 }
-                else if (aki7 == this.secondary) {
+                else if (aoe7 == this.secondary) {
                     c8.setSelected(true);
                 }
             }
@@ -115,37 +121,38 @@ public class BeaconScreen extends AbstractContainerScreen<BeaconMenu> {
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.drawCenteredString(this.font, I18n.get("block.minecraft.beacon.primary"), 62, 10, 14737632);
-        this.drawCenteredString(this.font, I18n.get("block.minecraft.beacon.secondary"), 169, 10, 14737632);
-        for (final AbstractWidget dct5 : this.buttons) {
-            if (dct5.isHovered()) {
-                dct5.renderToolTip(integer1 - this.leftPos, integer2 - this.topPos);
+    protected void renderLabels(final PoseStack dhl, final int integer2, final int integer3) {
+        this.drawCenteredString(dhl, this.font, I18n.get("block.minecraft.beacon.primary"), 62, 10, 14737632);
+        this.drawCenteredString(dhl, this.font, I18n.get("block.minecraft.beacon.secondary"), 169, 10, 14737632);
+        for (final AbstractWidget dng6 : this.buttons) {
+            if (dng6.isHovered()) {
+                dng6.renderToolTip(dhl, integer2 - this.leftPos, integer3 - this.topPos);
                 break;
             }
         }
     }
     
     @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(BeaconScreen.BEACON_LOCATION);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
         this.itemRenderer.blitOffset = 100.0f;
-        this.itemRenderer.renderAndDecorateItem(new ItemStack(Items.EMERALD), integer4 + 42, integer5 + 109);
-        this.itemRenderer.renderAndDecorateItem(new ItemStack(Items.DIAMOND), integer4 + 42 + 22, integer5 + 109);
-        this.itemRenderer.renderAndDecorateItem(new ItemStack(Items.GOLD_INGOT), integer4 + 42 + 44, integer5 + 109);
-        this.itemRenderer.renderAndDecorateItem(new ItemStack(Items.IRON_INGOT), integer4 + 42 + 66, integer5 + 109);
+        this.itemRenderer.renderAndDecorateItem(new ItemStack(Items.NETHERITE_INGOT), integer5 + 20, integer6 + 109);
+        this.itemRenderer.renderAndDecorateItem(new ItemStack(Items.EMERALD), integer5 + 41, integer6 + 109);
+        this.itemRenderer.renderAndDecorateItem(new ItemStack(Items.DIAMOND), integer5 + 41 + 22, integer6 + 109);
+        this.itemRenderer.renderAndDecorateItem(new ItemStack(Items.GOLD_INGOT), integer5 + 42 + 44, integer6 + 109);
+        this.itemRenderer.renderAndDecorateItem(new ItemStack(Items.IRON_INGOT), integer5 + 42 + 66, integer6 + 109);
         this.itemRenderer.blitOffset = 0.0f;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     static {
@@ -156,29 +163,29 @@ public class BeaconScreen extends AbstractContainerScreen<BeaconMenu> {
         private boolean selected;
         
         protected BeaconScreenButton(final int integer1, final int integer2) {
-            super(integer1, integer2, 22, 22, "");
+            super(integer1, integer2, 22, 22, TextComponent.EMPTY);
         }
         
         @Override
-        public void renderButton(final int integer1, final int integer2, final float float3) {
+        public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
             Minecraft.getInstance().getTextureManager().bind(BeaconScreen.BEACON_LOCATION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            final int integer3 = 219;
-            int integer4 = 0;
+            final int integer4 = 219;
+            int integer5 = 0;
             if (!this.active) {
-                integer4 += this.width * 2;
+                integer5 += this.width * 2;
             }
             else if (this.selected) {
-                integer4 += this.width * 1;
+                integer5 += this.width * 1;
             }
             else if (this.isHovered()) {
-                integer4 += this.width * 3;
+                integer5 += this.width * 3;
             }
-            this.blit(this.x, this.y, integer4, 219, this.width, this.height);
-            this.renderIcon();
+            this.blit(dhl, this.x, this.y, integer5, 219, this.width, this.height);
+            this.renderIcon(dhl);
         }
         
-        protected abstract void renderIcon();
+        protected abstract void renderIcon(final PoseStack dhl);
         
         public boolean isSelected() {
             return this.selected;
@@ -194,10 +201,10 @@ public class BeaconScreen extends AbstractContainerScreen<BeaconMenu> {
         private final TextureAtlasSprite sprite;
         private final boolean isPrimary;
         
-        public BeaconPowerButton(final int integer2, final int integer3, final MobEffect aki, final boolean boolean5) {
+        public BeaconPowerButton(final int integer2, final int integer3, final MobEffect aoe, final boolean boolean5) {
             super(integer2, integer3);
-            this.effect = aki;
-            this.sprite = Minecraft.getInstance().getMobEffectTextures().get(aki);
+            this.effect = aoe;
+            this.sprite = Minecraft.getInstance().getMobEffectTextures().get(aoe);
             this.isPrimary = boolean5;
         }
         
@@ -219,18 +226,18 @@ public class BeaconScreen extends AbstractContainerScreen<BeaconMenu> {
         }
         
         @Override
-        public void renderToolTip(final int integer1, final int integer2) {
-            String string4 = I18n.get(this.effect.getDescriptionId());
+        public void renderToolTip(final PoseStack dhl, final int integer2, final int integer3) {
+            final MutableComponent mx5 = new TranslatableComponent(this.effect.getDescriptionId());
             if (!this.isPrimary && this.effect != MobEffects.REGENERATION) {
-                string4 += " II";
+                mx5.append(" II");
             }
-            BeaconScreen.this.renderTooltip(string4, integer1, integer2);
+            BeaconScreen.this.renderTooltip(dhl, mx5, integer2, integer3);
         }
         
         @Override
-        protected void renderIcon() {
+        protected void renderIcon(final PoseStack dhl) {
             Minecraft.getInstance().getTextureManager().bind(this.sprite.atlas().location());
-            GuiComponent.blit(this.x + 2, this.y + 2, this.getBlitOffset(), 18, 18, this.sprite);
+            GuiComponent.blit(dhl, this.x + 2, this.y + 2, this.getBlitOffset(), 18, 18, this.sprite);
         }
     }
     
@@ -245,8 +252,8 @@ public class BeaconScreen extends AbstractContainerScreen<BeaconMenu> {
         }
         
         @Override
-        protected void renderIcon() {
-            this.blit(this.x + 2, this.y + 2, this.iconX, this.iconY, 18, 18);
+        protected void renderIcon(final PoseStack dhl) {
+            this.blit(dhl, this.x + 2, this.y + 2, this.iconX, this.iconY, 18, 18);
         }
     }
     
@@ -263,8 +270,8 @@ public class BeaconScreen extends AbstractContainerScreen<BeaconMenu> {
         }
         
         @Override
-        public void renderToolTip(final int integer1, final int integer2) {
-            BeaconScreen.this.renderTooltip(I18n.get("gui.done"), integer1, integer2);
+        public void renderToolTip(final PoseStack dhl, final int integer2, final int integer3) {
+            BeaconScreen.this.renderTooltip(dhl, CommonComponents.GUI_DONE, integer2, integer3);
         }
     }
     
@@ -280,8 +287,8 @@ public class BeaconScreen extends AbstractContainerScreen<BeaconMenu> {
         }
         
         @Override
-        public void renderToolTip(final int integer1, final int integer2) {
-            BeaconScreen.this.renderTooltip(I18n.get("gui.cancel"), integer1, integer2);
+        public void renderToolTip(final PoseStack dhl, final int integer2, final int integer3) {
+            BeaconScreen.this.renderTooltip(dhl, CommonComponents.GUI_CANCEL, integer2, integer3);
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/BlastFurnaceScreen.java b/src/net/minecraft/client/gui/screens/inventory/BlastFurnaceScreen.java
index 6dc2616..fd07da4 100644
--- a/src/net/minecraft/client/gui/screens/inventory/BlastFurnaceScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/BlastFurnaceScreen.java
@@ -10,8 +10,8 @@ import net.minecraft.world.inventory.BlastFurnaceMenu;
 public class BlastFurnaceScreen extends AbstractFurnaceScreen<BlastFurnaceMenu> {
     private static final ResourceLocation TEXTURE;
     
-    public BlastFurnaceScreen(final BlastFurnaceMenu bar, final Inventory ayi, final Component lf) {
-        super(bar, new BlastingRecipeBookComponent(), ayi, lf, BlastFurnaceScreen.TEXTURE);
+    public BlastFurnaceScreen(final BlastFurnaceMenu bgm, final Inventory beb, final Component mr) {
+        super(bgm, new BlastingRecipeBookComponent(), beb, mr, BlastFurnaceScreen.TEXTURE);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/inventory/BookEditScreen.java b/src/net/minecraft/client/gui/screens/inventory/BookEditScreen.java
index c28c6ee..83f26fb 100644
--- a/src/net/minecraft/client/gui/screens/inventory/BookEditScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/BookEditScreen.java
@@ -1,15 +1,28 @@
 package net.minecraft.client.gui.screens.inventory;
 
+import net.minecraft.client.gui.Font;
+import net.minecraft.network.chat.TextComponent;
+import java.util.Arrays;
+import it.unimi.dsi.fastutil.ints.IntList;
+import org.apache.commons.lang3.StringUtils;
+import net.minecraft.network.chat.Style;
+import org.apache.commons.lang3.mutable.MutableBoolean;
+import org.apache.commons.lang3.mutable.MutableInt;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import net.minecraft.client.StringSplitter;
 import net.minecraft.Util;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.vertex.Tesselator;
+import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.ChatFormatting;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.util.Mth;
-import net.minecraft.ChatFormatting;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.SharedConstants;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundEditBookPacket;
@@ -18,13 +31,17 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import net.minecraft.nbt.StringTag;
 import java.util.ListIterator;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.CompoundTag;
 import com.google.common.collect.Lists;
 import net.minecraft.client.gui.chat.NarratorChatListener;
+import javax.annotation.Nullable;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.font.TextFieldHelper;
 import java.util.List;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.player.Player;
@@ -39,8 +56,8 @@ public class BookEditScreen extends Screen {
     private int currentPage;
     private final List<String> pages;
     private String title;
-    private int cursorPos;
-    private int selectionPos;
+    private final TextFieldHelper pageEdit;
+    private final TextFieldHelper titleEdit;
     private long lastClickTime;
     private int lastIndex;
     private PageButton forwardButton;
@@ -50,20 +67,25 @@ public class BookEditScreen extends Screen {
     private Button finalizeButton;
     private Button cancelButton;
     private final InteractionHand hand;
+    @Nullable
+    private DisplayCache displayCache;
     
-    public BookEditScreen(final Player ayj, final ItemStack ben, final InteractionHand ajk) {
+    public BookEditScreen(final Player bec, final ItemStack bki, final InteractionHand anf) {
         super(NarratorChatListener.NO_TITLE);
         this.pages = Lists.newArrayList();
         this.title = "";
+        this.pageEdit = new TextFieldHelper(this::getCurrentPageText, this::setCurrentPageText, this::getClipboard, this::setClipboard, string -> string.length() < 1024 && this.font.wordWrapHeight(string, 114) <= 128);
+        this.titleEdit = new TextFieldHelper(() -> this.title, string -> this.title = string, this::getClipboard, this::setClipboard, string -> string.length() < 16);
         this.lastIndex = -1;
-        this.owner = ayj;
-        this.book = ben;
-        this.hand = ajk;
-        final CompoundTag jt5 = ben.getTag();
-        if (jt5 != null) {
-            final ListTag jz6 = jt5.getList("pages", 8).copy();
-            for (int integer7 = 0; integer7 < jz6.size(); ++integer7) {
-                this.pages.add(jz6.getString(integer7));
+        this.displayCache = DisplayCache.EMPTY;
+        this.owner = bec;
+        this.book = bki;
+        this.hand = anf;
+        final CompoundTag le5 = bki.getTag();
+        if (le5 != null) {
+            final ListTag lk6 = le5.getList("pages", 8).copy();
+            for (int integer7 = 0; integer7 < lk6.size(); ++integer7) {
+                this.pages.add(lk6.getString(integer7));
             }
         }
         if (this.pages.isEmpty()) {
@@ -71,6 +93,16 @@ public class BookEditScreen extends Screen {
         }
     }
     
+    private void setClipboard(final String string) {
+        if (this.minecraft != null) {
+            TextFieldHelper.setClipboardContents(this.minecraft, string);
+        }
+    }
+    
+    private String getClipboard() {
+        return (this.minecraft != null) ? TextFieldHelper.getClipboardContents(this.minecraft) : "";
+    }
+    
     private int getNumPages() {
         return this.pages.size();
     }
@@ -83,25 +115,26 @@ public class BookEditScreen extends Screen {
     
     @Override
     protected void init() {
+        this.clearDisplayCache();
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        this.signButton = this.<Button>addButton(new Button(this.width / 2 - 100, 196, 98, 20, I18n.get("book.signButton"), dcv -> {
+        this.signButton = this.<Button>addButton(new Button(this.width / 2 - 100, 196, 98, 20, new TranslatableComponent("book.signButton"), dni -> {
             this.isSigning = true;
             this.updateButtonVisibility();
             return;
         }));
-        this.doneButton = this.<Button>addButton(new Button(this.width / 2 + 2, 196, 98, 20, I18n.get("gui.done"), dcv -> {
+        this.doneButton = this.<Button>addButton(new Button(this.width / 2 + 2, 196, 98, 20, CommonComponents.GUI_DONE, dni -> {
             this.minecraft.setScreen(null);
             this.saveChanges(false);
             return;
         }));
-        this.finalizeButton = this.<Button>addButton(new Button(this.width / 2 - 100, 196, 98, 20, I18n.get("book.finalizeButton"), dcv -> {
+        this.finalizeButton = this.<Button>addButton(new Button(this.width / 2 - 100, 196, 98, 20, new TranslatableComponent("book.finalizeButton"), dni -> {
             if (this.isSigning) {
                 this.saveChanges(true);
                 this.minecraft.setScreen(null);
             }
             return;
         }));
-        this.cancelButton = this.<Button>addButton(new Button(this.width / 2 + 2, 196, 98, 20, I18n.get("gui.cancel"), dcv -> {
+        this.cancelButton = this.<Button>addButton(new Button(this.width / 2 + 2, 196, 98, 20, CommonComponents.GUI_CANCEL, dni -> {
             if (this.isSigning) {
                 this.isSigning = false;
             }
@@ -110,45 +143,31 @@ public class BookEditScreen extends Screen {
         }));
         final int integer2 = (this.width - 192) / 2;
         final int integer3 = 2;
-        this.forwardButton = this.<PageButton>addButton(new PageButton(integer2 + 116, 159, true, dcv -> this.pageForward(), true));
-        this.backButton = this.<PageButton>addButton(new PageButton(integer2 + 43, 159, false, dcv -> this.pageBack(), true));
+        this.forwardButton = this.<PageButton>addButton(new PageButton(integer2 + 116, 159, true, dni -> this.pageForward(), true));
+        this.backButton = this.<PageButton>addButton(new PageButton(integer2 + 43, 159, false, dni -> this.pageBack(), true));
         this.updateButtonVisibility();
     }
     
-    private String filterText(final String string) {
-        final StringBuilder stringBuilder3 = new StringBuilder();
-        for (final char character7 : string.toCharArray()) {
-            if (character7 != '§' && character7 != '\u007f') {
-                stringBuilder3.append(character7);
-            }
-        }
-        return stringBuilder3.toString();
-    }
-    
     private void pageBack() {
         if (this.currentPage > 0) {
             --this.currentPage;
-            this.cursorPos = 0;
-            this.selectionPos = this.cursorPos;
         }
         this.updateButtonVisibility();
+        this.clearDisplayCacheAfterPageChange();
     }
     
     private void pageForward() {
         if (this.currentPage < this.getNumPages() - 1) {
             ++this.currentPage;
-            this.cursorPos = 0;
-            this.selectionPos = this.cursorPos;
         }
         else {
             this.appendPageToBook();
             if (this.currentPage < this.getNumPages() - 1) {
                 ++this.currentPage;
             }
-            this.cursorPos = 0;
-            this.selectionPos = this.cursorPos;
         }
         this.updateButtonVisibility();
+        this.clearDisplayCacheAfterPageChange();
     }
     
     @Override
@@ -178,10 +197,10 @@ public class BookEditScreen extends Screen {
             return;
         }
         this.eraseEmptyTrailingPages();
-        final ListTag jz3 = new ListTag();
-        this.pages.stream().map(StringTag::valueOf).forEach(jz3::add);
+        final ListTag lk3 = new ListTag();
+        this.pages.stream().map(StringTag::valueOf).forEach(lk3::add);
         if (!this.pages.isEmpty()) {
-            this.book.addTagElement("pages", jz3);
+            this.book.addTagElement("pages", lk3);
         }
         if (boolean1) {
             this.book.addTagElement("author", StringTag.valueOf(this.owner.getGameProfile().getName()));
@@ -206,7 +225,12 @@ public class BookEditScreen extends Screen {
         if (this.isSigning) {
             return this.titleKeyPressed(integer1, integer2, integer3);
         }
-        return this.bookKeyPressed(integer1, integer2, integer3);
+        final boolean boolean5 = this.bookKeyPressed(integer1, integer2, integer3);
+        if (boolean5) {
+            this.clearDisplayCache();
+            return true;
+        }
+        return false;
     }
     
     @Override
@@ -215,8 +239,8 @@ public class BookEditScreen extends Screen {
             return true;
         }
         if (this.isSigning) {
-            if (this.title.length() < 16 && SharedConstants.isAllowedChatCharacter(character)) {
-                this.title += Character.toString(character);
+            final boolean boolean4 = this.titleEdit.charTyped(character);
+            if (boolean4) {
                 this.updateButtonVisibility();
                 return this.isModified = true;
             }
@@ -224,7 +248,8 @@ public class BookEditScreen extends Screen {
         }
         else {
             if (SharedConstants.isAllowedChatCharacter(character)) {
-                this.insertText(Character.toString(character));
+                this.pageEdit.insertText(Character.toString(character));
+                this.clearDisplayCache();
                 return true;
             }
             return false;
@@ -232,54 +257,50 @@ public class BookEditScreen extends Screen {
     }
     
     private boolean bookKeyPressed(final int integer1, final int integer2, final int integer3) {
-        final String string5 = this.getCurrentPageText();
         if (Screen.isSelectAll(integer1)) {
-            this.selectionPos = 0;
-            this.cursorPos = string5.length();
+            this.pageEdit.selectAll();
             return true;
         }
         if (Screen.isCopy(integer1)) {
-            this.minecraft.keyboardHandler.setClipboard(this.getSelected());
+            this.pageEdit.copy();
             return true;
         }
         if (Screen.isPaste(integer1)) {
-            this.insertText(this.filterText(ChatFormatting.stripFormatting(this.minecraft.keyboardHandler.getClipboard().replaceAll("\\r", ""))));
-            this.selectionPos = this.cursorPos;
+            this.pageEdit.paste();
             return true;
         }
         if (Screen.isCut(integer1)) {
-            this.minecraft.keyboardHandler.setClipboard(this.getSelected());
-            this.deleteSelection();
+            this.pageEdit.cut();
             return true;
         }
         switch (integer1) {
             case 259: {
-                this.keyBackspace(string5);
+                this.pageEdit.removeCharsFromCursor(-1);
                 return true;
             }
             case 261: {
-                this.keyDelete(string5);
+                this.pageEdit.removeCharsFromCursor(1);
                 return true;
             }
             case 257:
             case 335: {
-                this.insertText("\n");
+                this.pageEdit.insertText("\n");
                 return true;
             }
             case 263: {
-                this.keyLeft(string5);
+                this.pageEdit.moveByChars(-1, Screen.hasShiftDown());
                 return true;
             }
             case 262: {
-                this.keyRight(string5);
+                this.pageEdit.moveByChars(1, Screen.hasShiftDown());
                 return true;
             }
             case 265: {
-                this.keyUp(string5);
+                this.keyUp();
                 return true;
             }
             case 264: {
-                this.keyDown(string5);
+                this.keyDown();
                 return true;
             }
             case 266: {
@@ -291,11 +312,11 @@ public class BookEditScreen extends Screen {
                 return true;
             }
             case 268: {
-                this.keyHome(string5);
+                this.keyHome();
                 return true;
             }
             case 269: {
-                this.keyEnd(string5);
+                this.keyEnd();
                 return true;
             }
             default: {
@@ -304,148 +325,39 @@ public class BookEditScreen extends Screen {
         }
     }
     
-    private void keyBackspace(final String string) {
-        if (!string.isEmpty()) {
-            if (this.selectionPos != this.cursorPos) {
-                this.deleteSelection();
-            }
-            else if (this.cursorPos > 0) {
-                final String string2 = new StringBuilder(string).deleteCharAt(Math.max(0, this.cursorPos - 1)).toString();
-                this.setCurrentPageText(string2);
-                this.cursorPos = Math.max(0, this.cursorPos - 1);
-                this.selectionPos = this.cursorPos;
-            }
-        }
+    private void keyUp() {
+        this.changeLine(-1);
     }
     
-    private void keyDelete(final String string) {
-        if (!string.isEmpty()) {
-            if (this.selectionPos != this.cursorPos) {
-                this.deleteSelection();
-            }
-            else if (this.cursorPos < string.length()) {
-                final String string2 = new StringBuilder(string).deleteCharAt(Math.max(0, this.cursorPos)).toString();
-                this.setCurrentPageText(string2);
-            }
-        }
+    private void keyDown() {
+        this.changeLine(1);
     }
     
-    private void keyLeft(final String string) {
-        final int integer3 = this.font.isBidirectional() ? 1 : -1;
-        if (Screen.hasControlDown()) {
-            this.cursorPos = this.font.getWordPosition(string, integer3, this.cursorPos, true);
-        }
-        else {
-            this.cursorPos = Math.max(0, this.cursorPos + integer3);
-        }
-        if (!Screen.hasShiftDown()) {
-            this.selectionPos = this.cursorPos;
-        }
+    private void changeLine(final int integer) {
+        final int integer2 = this.pageEdit.getCursorPos();
+        final int integer3 = this.getDisplayCache().changeLine(integer2, integer);
+        this.pageEdit.setCursorPos(integer3, Screen.hasShiftDown());
     }
     
-    private void keyRight(final String string) {
-        final int integer3 = this.font.isBidirectional() ? -1 : 1;
-        if (Screen.hasControlDown()) {
-            this.cursorPos = this.font.getWordPosition(string, integer3, this.cursorPos, true);
-        }
-        else {
-            this.cursorPos = Math.min(string.length(), this.cursorPos + integer3);
-        }
-        if (!Screen.hasShiftDown()) {
-            this.selectionPos = this.cursorPos;
-        }
+    private void keyHome() {
+        final int integer2 = this.pageEdit.getCursorPos();
+        final int integer3 = this.getDisplayCache().findLineStart(integer2);
+        this.pageEdit.setCursorPos(integer3, Screen.hasShiftDown());
     }
     
-    private void keyUp(final String string) {
-        if (!string.isEmpty()) {
-            final Pos2i a3 = this.getPositionAtIndex(string, this.cursorPos);
-            if (a3.y == 0) {
-                this.cursorPos = 0;
-                if (!Screen.hasShiftDown()) {
-                    this.selectionPos = this.cursorPos;
-                }
-            }
-            else {
-                final int integer5 = a3.x + this.getWidthAt(string, this.cursorPos) / 3;
-                final int access$000 = a3.y;
-                this.font.getClass();
-                final int integer4 = this.getIndexAtPosition(string, new Pos2i(integer5, access$000 - 9));
-                if (integer4 >= 0) {
-                    this.cursorPos = integer4;
-                    if (!Screen.hasShiftDown()) {
-                        this.selectionPos = this.cursorPos;
-                    }
-                }
-            }
-        }
-    }
-    
-    private void keyDown(final String string) {
-        if (!string.isEmpty()) {
-            final Pos2i a3 = this.getPositionAtIndex(string, this.cursorPos);
-            final int integer4 = this.font.wordWrapHeight(string + "" + ChatFormatting.BLACK + "_", 114);
-            final int access$000 = a3.y;
-            this.font.getClass();
-            if (access$000 + 9 == integer4) {
-                this.cursorPos = string.length();
-                if (!Screen.hasShiftDown()) {
-                    this.selectionPos = this.cursorPos;
-                }
-            }
-            else {
-                final int integer6 = a3.x + this.getWidthAt(string, this.cursorPos) / 3;
-                final int access$2 = a3.y;
-                this.font.getClass();
-                final int integer5 = this.getIndexAtPosition(string, new Pos2i(integer6, access$2 + 9));
-                if (integer5 >= 0) {
-                    this.cursorPos = integer5;
-                    if (!Screen.hasShiftDown()) {
-                        this.selectionPos = this.cursorPos;
-                    }
-                }
-            }
-        }
-    }
-    
-    private void keyHome(final String string) {
-        this.cursorPos = this.getIndexAtPosition(string, new Pos2i(0, this.getPositionAtIndex(string, this.cursorPos).y));
-        if (!Screen.hasShiftDown()) {
-            this.selectionPos = this.cursorPos;
-        }
-    }
-    
-    private void keyEnd(final String string) {
-        this.cursorPos = this.getIndexAtPosition(string, new Pos2i(113, this.getPositionAtIndex(string, this.cursorPos).y));
-        if (!Screen.hasShiftDown()) {
-            this.selectionPos = this.cursorPos;
-        }
-    }
-    
-    private void deleteSelection() {
-        if (this.selectionPos == this.cursorPos) {
-            return;
-        }
-        final String string2 = this.getCurrentPageText();
-        final int integer3 = Math.min(this.cursorPos, this.selectionPos);
-        final int integer4 = Math.max(this.cursorPos, this.selectionPos);
-        final String string3 = string2.substring(0, integer3) + string2.substring(integer4);
-        this.cursorPos = integer3;
-        this.selectionPos = this.cursorPos;
-        this.setCurrentPageText(string3);
-    }
-    
-    private int getWidthAt(final String string, final int integer) {
-        return (int)this.font.charWidth(string.charAt(Mth.clamp(integer, 0, string.length() - 1)));
+    private void keyEnd() {
+        final DisplayCache a2 = this.getDisplayCache();
+        final int integer3 = this.pageEdit.getCursorPos();
+        final int integer4 = a2.findLineEnd(integer3);
+        this.pageEdit.setCursorPos(integer4, Screen.hasShiftDown());
     }
     
     private boolean titleKeyPressed(final int integer1, final int integer2, final int integer3) {
         switch (integer1) {
             case 259: {
-                if (!this.title.isEmpty()) {
-                    this.title = this.title.substring(0, this.title.length() - 1);
-                    this.updateButtonVisibility();
-                }
-                return true;
+                this.titleEdit.removeCharsFromCursor(-1);
+                this.updateButtonVisibility();
+                return this.isModified = true;
             }
             case 257:
             case 335: {
@@ -472,346 +384,381 @@ public class BookEditScreen extends Screen {
         if (this.currentPage >= 0 && this.currentPage < this.pages.size()) {
             this.pages.set(this.currentPage, string);
             this.isModified = true;
-        }
-    }
-    
-    private void insertText(final String string) {
-        if (this.selectionPos != this.cursorPos) {
-            this.deleteSelection();
-        }
-        final String string2 = this.getCurrentPageText();
-        this.cursorPos = Mth.clamp(this.cursorPos, 0, string2.length());
-        final String string3 = new StringBuilder(string2).insert(this.cursorPos, string).toString();
-        final int integer5 = this.font.wordWrapHeight(string3 + "" + ChatFormatting.BLACK + "_", 114);
-        if (integer5 <= 128 && string3.length() < 1024) {
-            this.setCurrentPageText(string3);
-            final int min = Math.min(this.getCurrentPageText().length(), this.cursorPos + string.length());
-            this.cursorPos = min;
-            this.selectionPos = min;
+            this.clearDisplayCache();
         }
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
         this.setFocused(null);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(BookViewScreen.BOOK_LOCATION);
-        final int integer3 = (this.width - 192) / 2;
-        final int integer4 = 2;
-        this.blit(integer3, 2, 0, 0, 192, 192);
+        final int integer4 = (this.width - 192) / 2;
+        final int integer5 = 2;
+        this.blit(dhl, integer4, 2, 0, 0, 192, 192);
         if (this.isSigning) {
-            String string7 = this.title;
+            String string8 = this.title;
             if (this.frameTick / 6 % 2 == 0) {
-                string7 = string7 + "" + ChatFormatting.BLACK + "_";
+                string8 = string8 + "" + ChatFormatting.BLACK + "_";
             }
             else {
-                string7 = string7 + "" + ChatFormatting.GRAY + "_";
+                string8 = string8 + "" + ChatFormatting.GRAY + "_";
             }
-            final String string8 = I18n.get("book.editTitle");
-            final int integer5 = this.strWidth(string8);
-            this.font.draw(string8, (float)(integer3 + 36 + (114 - integer5) / 2), 34.0f, 0);
-            final int integer6 = this.strWidth(string7);
-            this.font.draw(string7, (float)(integer3 + 36 + (114 - integer6) / 2), 50.0f, 0);
-            final String string9 = I18n.get("book.byAuthor", this.owner.getName().getString());
-            final int integer7 = this.strWidth(string9);
-            this.font.draw(ChatFormatting.DARK_GRAY + string9, (float)(integer3 + 36 + (114 - integer7) / 2), 60.0f, 0);
-            final String string10 = I18n.get("book.finalizeWarning");
-            this.font.drawWordWrap(string10, integer3 + 36, 82, 114, 0);
+            final String string9 = I18n.get("book.editTitle");
+            final int integer6 = this.strWidth(string9);
+            this.font.draw(dhl, string9, (float)(integer4 + 36 + (114 - integer6) / 2), 34.0f, 0);
+            final int integer7 = this.strWidth(string8);
+            this.font.draw(dhl, string8, (float)(integer4 + 36 + (114 - integer7) / 2), 50.0f, 0);
+            final String string10 = I18n.get("book.byAuthor", this.owner.getName().getString());
+            final int integer8 = this.strWidth(string10);
+            this.font.draw(dhl, ChatFormatting.DARK_GRAY + string10, (float)(integer4 + 36 + (114 - integer8) / 2), 60.0f, 0);
+            this.font.drawWordWrap(new TranslatableComponent("book.finalizeWarning"), integer4 + 36, 82, 114, 0);
         }
         else {
-            final String string7 = I18n.get("book.pageIndicator", this.currentPage + 1, this.getNumPages());
-            final String string8 = this.getCurrentPageText();
-            final int integer5 = this.strWidth(string7);
-            this.font.draw(string7, (float)(integer3 - integer5 + 192 - 44), 18.0f, 0);
-            this.font.drawWordWrap(string8, integer3 + 36, 32, 114, 0);
-            this.renderSelection(string8);
-            if (this.frameTick / 6 % 2 == 0) {
-                final Pos2i a10 = this.getPositionAtIndex(string8, this.cursorPos);
-                if (this.font.isBidirectional()) {
-                    this.handleBidi(a10);
-                    a10.x -= 4;
-                }
-                this.convertLocalToScreen(a10);
-                if (this.cursorPos < string8.length()) {
-                    final int access$100 = a10.x;
-                    final int integer8 = a10.y - 1;
-                    final int integer9 = a10.x + 1;
-                    final int access$101 = a10.y;
-                    this.font.getClass();
-                    GuiComponent.fill(access$100, integer8, integer9, access$101 + 9, -16777216);
-                }
-                else {
-                    this.font.draw("_", (float)a10.x, (float)a10.y, 0);
-                }
+            final String string8 = I18n.get("book.pageIndicator", this.currentPage + 1, this.getNumPages());
+            final int integer9 = this.strWidth(string8);
+            this.font.draw(dhl, string8, (float)(integer4 - integer9 + 192 - 44), 18.0f, 0);
+            final DisplayCache a10 = this.getDisplayCache();
+            for (final LineInfo b14 : a10.lines) {
+                this.font.draw(dhl, b14.asComponent, (float)b14.x, (float)b14.y, -16777216);
+            }
+            this.renderHighlight(a10.selection);
+            this.renderCursor(dhl, a10.cursor, a10.cursorAtEnd);
+        }
+        super.render(dhl, integer2, integer3, float4);
+    }
+    
+    private void renderCursor(final PoseStack dhl, Pos2i c, final boolean boolean3) {
+        if (this.frameTick / 6 % 2 == 0) {
+            c = this.convertLocalToScreen(c);
+            if (!boolean3) {
+                final int x = c.x;
+                final int integer3 = c.y - 1;
+                final int integer4 = c.x + 1;
+                final int y = c.y;
+                this.font.getClass();
+                GuiComponent.fill(dhl, x, integer3, integer4, y + 9, -16777216);
+            }
+            else {
+                this.font.draw(dhl, "_", (float)c.x, (float)c.y, 0);
             }
         }
-        super.render(integer1, integer2, float3);
     }
     
     private int strWidth(final String string) {
         return this.font.width(this.font.isBidirectional() ? this.font.bidirectionalShaping(string) : string);
     }
     
-    private int strIndexAtWidth(final String string, final int integer) {
-        return this.font.indexAtWidth(string, integer);
-    }
-    
-    private String getSelected() {
-        final String string2 = this.getCurrentPageText();
-        final int integer3 = Math.min(this.cursorPos, this.selectionPos);
-        final int integer4 = Math.max(this.cursorPos, this.selectionPos);
-        return string2.substring(integer3, integer4);
-    }
-    
-    private void renderSelection(final String string) {
-        if (this.selectionPos == this.cursorPos) {
-            return;
-        }
-        final int integer3 = Math.min(this.cursorPos, this.selectionPos);
-        final int integer4 = Math.max(this.cursorPos, this.selectionPos);
-        String string2 = string.substring(integer3, integer4);
-        final int integer5 = this.font.getWordPosition(string, 1, integer4, true);
-        String string3 = string.substring(integer3, integer5);
-        final Pos2i a8 = this.getPositionAtIndex(string, integer3);
-        final int access$100 = a8.x;
-        final int access$101 = a8.y;
-        this.font.getClass();
-        final Pos2i a9 = new Pos2i(access$100, access$101 + 9);
-        while (!string2.isEmpty()) {
-            int integer6 = this.strIndexAtWidth(string3, 114 - a8.x);
-            if (string2.length() <= integer6) {
-                a9.x = a8.x + this.strWidth(string2);
-                this.renderHighlight(a8, a9);
-                break;
-            }
-            integer6 = Math.min(integer6, string2.length() - 1);
-            final String string4 = string2.substring(0, integer6);
-            final char character12 = string2.charAt(integer6);
-            final boolean boolean13 = character12 == ' ' || character12 == '\n';
-            string2 = ChatFormatting.getLastColors(string4) + string2.substring(integer6 + (boolean13 ? 1 : 0));
-            string3 = ChatFormatting.getLastColors(string4) + string3.substring(integer6 + (boolean13 ? 1 : 0));
-            a9.x = a8.x + this.strWidth(string4 + " ");
-            this.renderHighlight(a8, a9);
-            a8.x = 0;
-            final Pos2i a10 = a8;
-            final int access$102 = a8.y;
-            this.font.getClass();
-            a10.y = access$102 + 9;
-            final Pos2i a11 = a9;
-            final int access$103 = a9.y;
-            this.font.getClass();
-            a11.y = access$103 + 9;
-        }
-    }
-    
-    private void renderHighlight(final Pos2i a1, final Pos2i a2) {
-        final Pos2i a3 = new Pos2i(a1.x, a1.y);
-        final Pos2i a4 = new Pos2i(a2.x, a2.y);
-        if (this.font.isBidirectional()) {
-            this.handleBidi(a3);
-            this.handleBidi(a4);
-            final int integer6 = a4.x;
-            a4.x = a3.x;
-            a3.x = integer6;
-        }
-        this.convertLocalToScreen(a3);
-        this.convertLocalToScreen(a4);
-        final Tesselator cym6 = Tesselator.getInstance();
-        final BufferBuilder cyg7 = cym6.getBuilder();
+    private void renderHighlight(final Rect2i[] arr) {
+        final Tesselator dhn3 = Tesselator.getInstance();
+        final BufferBuilder dhg4 = dhn3.getBuilder();
         RenderSystem.color4f(0.0f, 0.0f, 255.0f, 255.0f);
         RenderSystem.disableTexture();
         RenderSystem.enableColorLogicOp();
         RenderSystem.logicOp(GlStateManager.LogicOp.OR_REVERSE);
-        cyg7.begin(7, DefaultVertexFormat.POSITION);
-        cyg7.vertex(a3.x, a4.y, 0.0).endVertex();
-        cyg7.vertex(a4.x, a4.y, 0.0).endVertex();
-        cyg7.vertex(a4.x, a3.y, 0.0).endVertex();
-        cyg7.vertex(a3.x, a3.y, 0.0).endVertex();
-        cym6.end();
+        dhg4.begin(7, DefaultVertexFormat.POSITION);
+        for (final Rect2i ece8 : arr) {
+            final int integer9 = ece8.getX();
+            final int integer10 = ece8.getY();
+            final int integer11 = integer9 + ece8.getWidth();
+            final int integer12 = integer10 + ece8.getHeight();
+            dhg4.vertex(integer9, integer12, 0.0).endVertex();
+            dhg4.vertex(integer11, integer12, 0.0).endVertex();
+            dhg4.vertex(integer11, integer10, 0.0).endVertex();
+            dhg4.vertex(integer9, integer10, 0.0).endVertex();
+        }
+        dhn3.end();
         RenderSystem.disableColorLogicOp();
         RenderSystem.enableTexture();
     }
     
-    private Pos2i getPositionAtIndex(final String string, final int integer) {
-        final Pos2i a4 = new Pos2i();
-        int integer2 = 0;
-        int integer3 = 0;
-        String string2 = string;
-        while (!string2.isEmpty()) {
-            final int integer4 = this.strIndexAtWidth(string2, 114);
-            if (string2.length() <= integer4) {
-                final String string3 = string2.substring(0, Math.min(Math.max(integer - integer3, 0), string2.length()));
-                a4.x += this.strWidth(string3);
-                break;
-            }
-            final String string3 = string2.substring(0, integer4);
-            final char character10 = string2.charAt(integer4);
-            final boolean boolean11 = character10 == ' ' || character10 == '\n';
-            string2 = ChatFormatting.getLastColors(string3) + string2.substring(integer4 + (boolean11 ? 1 : 0));
-            integer2 += string3.length() + (boolean11 ? 1 : 0);
-            if (integer2 - 1 >= integer) {
-                final String string4 = string3.substring(0, Math.min(Math.max(integer - integer3, 0), string3.length()));
-                a4.x += this.strWidth(string4);
-                break;
-            }
-            final Pos2i a5 = a4;
-            final int access$000 = a4.y;
-            this.font.getClass();
-            a5.y = access$000 + 9;
-            integer3 = integer2;
-        }
-        return a4;
+    private Pos2i convertScreenToLocal(final Pos2i c) {
+        return new Pos2i(c.x - (this.width - 192) / 2 - 36, c.y - 32);
     }
     
-    private void handleBidi(final Pos2i a) {
-        if (this.font.isBidirectional()) {
-            a.x = 114 - a.x;
-        }
-    }
-    
-    private void convertScreenToLocal(final Pos2i a) {
-        a.x = a.x - (this.width - 192) / 2 - 36;
-        a.y -= 32;
-    }
-    
-    private void convertLocalToScreen(final Pos2i a) {
-        a.x = a.x + (this.width - 192) / 2 + 36;
-        a.y += 32;
-    }
-    
-    private int indexInLine(final String string, final int integer) {
-        if (integer < 0) {
-            return 0;
-        }
-        float float5 = 0.0f;
-        boolean boolean6 = false;
-        final String string2 = string + " ";
-        for (int integer2 = 0; integer2 < string2.length(); ++integer2) {
-            char character9 = string2.charAt(integer2);
-            float float6 = this.font.charWidth(character9);
-            if (character9 == '§' && integer2 < string2.length() - 1) {
-                character9 = string2.charAt(++integer2);
-                if (character9 == 'l' || character9 == 'L') {
-                    boolean6 = true;
-                }
-                else if (character9 == 'r' || character9 == 'R') {
-                    boolean6 = false;
-                }
-                float6 = 0.0f;
-            }
-            final float float7 = float5;
-            float5 += float6;
-            if (boolean6 && float6 > 0.0f) {
-                ++float5;
-            }
-            if (integer >= float7 && integer < float5) {
-                return integer2;
-            }
-        }
-        if (integer >= float5) {
-            return string2.length() - 1;
-        }
-        return -1;
-    }
-    
-    private int getIndexAtPosition(final String string, final Pos2i a) {
-        final int n = 16;
-        this.font.getClass();
-        final int integer4 = n * 9;
-        if (a.y > integer4) {
-            return -1;
-        }
-        int integer5 = Integer.MIN_VALUE;
-        this.font.getClass();
-        int integer6 = 9;
-        int integer7 = 0;
-        String string2 = string;
-        while (!string2.isEmpty() && integer5 < integer4) {
-            final int integer8 = this.strIndexAtWidth(string2, 114);
-            if (integer8 < string2.length()) {
-                final String string3 = string2.substring(0, integer8);
-                if (a.y >= integer5 && a.y < integer6) {
-                    final int integer9 = this.indexInLine(string3, a.x);
-                    return (integer9 < 0) ? -1 : (integer7 + integer9);
-                }
-                final char character11 = string2.charAt(integer8);
-                final boolean boolean12 = character11 == ' ' || character11 == '\n';
-                string2 = ChatFormatting.getLastColors(string3) + string2.substring(integer8 + (boolean12 ? 1 : 0));
-                integer7 += string3.length() + (boolean12 ? 1 : 0);
-            }
-            else if (a.y >= integer5 && a.y < integer6) {
-                final int integer10 = this.indexInLine(string2, a.x);
-                return (integer10 < 0) ? -1 : (integer7 + integer10);
-            }
-            integer5 = integer6;
-            final int n2 = integer6;
-            this.font.getClass();
-            integer6 = n2 + 9;
-        }
-        return string.length();
+    private Pos2i convertLocalToScreen(final Pos2i c) {
+        return new Pos2i(c.x + (this.width - 192) / 2 + 36, c.y + 32);
     }
     
     @Override
     public boolean mouseClicked(final double double1, final double double2, final int integer) {
+        if (super.mouseClicked(double1, double2, integer)) {
+            return true;
+        }
         if (integer == 0) {
             final long long7 = Util.getMillis();
-            final String string9 = this.getCurrentPageText();
-            if (!string9.isEmpty()) {
-                final Pos2i a10 = new Pos2i((int)double1, (int)double2);
-                this.convertScreenToLocal(a10);
-                this.handleBidi(a10);
-                final int integer2 = this.getIndexAtPosition(string9, a10);
-                if (integer2 >= 0) {
-                    if (integer2 == this.lastIndex && long7 - this.lastClickTime < 250L) {
-                        if (this.selectionPos == this.cursorPos) {
-                            this.selectionPos = this.font.getWordPosition(string9, -1, integer2, false);
-                            this.cursorPos = this.font.getWordPosition(string9, 1, integer2, false);
-                        }
-                        else {
-                            this.selectionPos = 0;
-                            this.cursorPos = this.getCurrentPageText().length();
-                        }
+            final DisplayCache a9 = this.getDisplayCache();
+            final int integer2 = a9.getIndexAtPosition(this.font, this.convertScreenToLocal(new Pos2i((int)double1, (int)double2)));
+            if (integer2 >= 0) {
+                if (integer2 == this.lastIndex && long7 - this.lastClickTime < 250L) {
+                    if (!this.pageEdit.isSelecting()) {
+                        this.selectWord(integer2);
                     }
                     else {
-                        this.cursorPos = integer2;
-                        if (!Screen.hasShiftDown()) {
-                            this.selectionPos = this.cursorPos;
-                        }
+                        this.pageEdit.selectAll();
                     }
                 }
-                this.lastIndex = integer2;
+                else {
+                    this.pageEdit.setCursorPos(integer2, Screen.hasShiftDown());
+                }
+                this.clearDisplayCache();
             }
+            this.lastIndex = integer2;
             this.lastClickTime = long7;
         }
-        return super.mouseClicked(double1, double2, integer);
+        return true;
+    }
+    
+    private void selectWord(final int integer) {
+        final String string3 = this.getCurrentPageText();
+        this.pageEdit.setSelectionRange(StringSplitter.getWordPosition(string3, -1, integer, false), StringSplitter.getWordPosition(string3, 1, integer, false));
     }
     
     @Override
     public boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
-        if (integer == 0 && this.currentPage >= 0 && this.currentPage < this.pages.size()) {
-            final String string11 = this.pages.get(this.currentPage);
-            final Pos2i a12 = new Pos2i((int)double1, (int)double2);
-            this.convertScreenToLocal(a12);
-            this.handleBidi(a12);
-            final int integer2 = this.getIndexAtPosition(string11, a12);
-            if (integer2 >= 0) {
-                this.cursorPos = integer2;
-            }
+        if (super.mouseDragged(double1, double2, integer, double4, double5)) {
+            return true;
         }
-        return super.mouseDragged(double1, double2, integer, double4, double5);
+        if (integer == 0) {
+            final DisplayCache a11 = this.getDisplayCache();
+            final int integer2 = a11.getIndexAtPosition(this.font, this.convertScreenToLocal(new Pos2i((int)double1, (int)double2)));
+            this.pageEdit.setCursorPos(integer2, true);
+            this.clearDisplayCache();
+        }
+        return true;
     }
     
-    class Pos2i {
-        private int x;
-        private int y;
+    private DisplayCache getDisplayCache() {
+        if (this.displayCache == null) {
+            this.displayCache = this.rebuildDisplayCache();
+        }
+        return this.displayCache;
+    }
+    
+    private void clearDisplayCache() {
+        this.displayCache = null;
+    }
+    
+    private void clearDisplayCacheAfterPageChange() {
+        this.pageEdit.setCursorToEnd();
+        this.clearDisplayCache();
+    }
+    
+    private DisplayCache rebuildDisplayCache() {
+        final String string2 = this.getCurrentPageText();
+        if (string2.isEmpty()) {
+            return DisplayCache.EMPTY;
+        }
+        final int integer9 = this.pageEdit.getCursorPos();
+        final int integer10 = this.pageEdit.getSelectionPos();
+        final IntList intList5 = (IntList)new IntArrayList();
+        final List<LineInfo> list6 = Lists.newArrayList();
+        final MutableInt mutableInt7 = new MutableInt();
+        final MutableBoolean mutableBoolean8 = new MutableBoolean();
+        final StringSplitter dmi9 = this.font.getSplitter();
+        final MutableInt mutableInt8;
+        final int integer11;
+        final String s;
+        final String string3;
+        final MutableBoolean mutableBoolean9;
+        final String string4;
+        final int n;
+        final int integer12;
+        final Pos2i c14;
+        final IntList list8;
+        final List<LineInfo> list9;
+        dmi9.splitLines(string2, 114, Style.EMPTY, true, (nb, integer7, integer8) -> {
+            integer11 = mutableInt8.getAndIncrement();
+            string3 = s.substring(integer7, integer8);
+            mutableBoolean9.setValue(string3.endsWith("\n"));
+            string4 = StringUtils.stripEnd(string3, " \n");
+            this.font.getClass();
+            integer12 = n * 9;
+            c14 = this.convertLocalToScreen(new Pos2i(0, integer12));
+            list8.add(integer7);
+            list9.add(new LineInfo(nb, string4, c14.x, c14.y));
+            return;
+        });
+        final int[] arr10 = intList5.toIntArray();
+        final boolean boolean11 = integer9 == string2.length();
+        Pos2i c15;
+        if (boolean11 && mutableBoolean8.isTrue()) {
+            final int integer22 = 0;
+            final int size = list6.size();
+            this.font.getClass();
+            c15 = new Pos2i(integer22, size * 9);
+        }
+        else {
+            final int integer13 = findLineFromPos(arr10, integer9);
+            final int width;
+            final int integer14 = width = this.font.width(string2.substring(arr10[integer13], integer9));
+            final int n2 = integer13;
+            this.font.getClass();
+            c15 = new Pos2i(width, n2 * 9);
+        }
+        final List<Rect2i> list7 = Lists.newArrayList();
+        if (integer9 != integer10) {
+            final int integer14 = Math.min(integer9, integer10);
+            final int integer15 = Math.max(integer9, integer10);
+            final int integer16 = findLineFromPos(arr10, integer14);
+            final int integer17 = findLineFromPos(arr10, integer15);
+            if (integer16 == integer17) {
+                final int n3 = integer16;
+                this.font.getClass();
+                final int integer18 = n3 * 9;
+                final int integer19 = arr10[integer16];
+                list7.add(this.createPartialLineSelection(string2, dmi9, integer14, integer15, integer18, integer19));
+            }
+            else {
+                final int integer18 = (integer16 + 1 > arr10.length) ? string2.length() : arr10[integer16 + 1];
+                final List<Rect2i> list10 = list7;
+                final String string6 = string2;
+                final StringSplitter dmi10 = dmi9;
+                final int integer23 = integer14;
+                final int integer24 = integer18;
+                final int n4 = integer16;
+                this.font.getClass();
+                list10.add(this.createPartialLineSelection(string6, dmi10, integer23, integer24, n4 * 9, arr10[integer16]));
+                for (int integer19 = integer16 + 1; integer19 < integer17; ++integer19) {
+                    final int n5 = integer19;
+                    this.font.getClass();
+                    final int integer20 = n5 * 9;
+                    final String string5 = string2.substring(arr10[integer19], arr10[integer19 + 1]);
+                    final int integer21 = (int)dmi9.stringWidth(string5);
+                    final List<Rect2i> list11 = list7;
+                    final Pos2i c16 = new Pos2i(0, integer20);
+                    final int integer25 = integer21;
+                    final int n6 = integer20;
+                    this.font.getClass();
+                    list11.add(this.createSelection(c16, new Pos2i(integer25, n6 + 9)));
+                }
+                final List<Rect2i> list12 = list7;
+                final String string7 = string2;
+                final StringSplitter dmi11 = dmi9;
+                final int integer26 = arr10[integer17];
+                final int integer27 = integer15;
+                final int n7 = integer17;
+                this.font.getClass();
+                list12.add(this.createPartialLineSelection(string7, dmi11, integer26, integer27, n7 * 9, arr10[integer17]));
+            }
+        }
+        return new DisplayCache(string2, c15, boolean11, arr10, list6.<LineInfo>toArray(new LineInfo[0]), list7.<Rect2i>toArray(new Rect2i[0]));
+    }
+    
+    private static int findLineFromPos(final int[] arr, final int integer) {
+        final int integer2 = Arrays.binarySearch(arr, integer);
+        if (integer2 < 0) {
+            return -(integer2 + 2);
+        }
+        return integer2;
+    }
+    
+    private Rect2i createPartialLineSelection(final String string, final StringSplitter dmi, final int integer3, final int integer4, final int integer5, final int integer6) {
+        final String string2 = string.substring(integer6, integer3);
+        final String string3 = string.substring(integer6, integer4);
+        final Pos2i c10 = new Pos2i((int)dmi.stringWidth(string2), integer5);
+        final int integer7 = (int)dmi.stringWidth(string3);
+        this.font.getClass();
+        final Pos2i c11 = new Pos2i(integer7, integer5 + 9);
+        return this.createSelection(c10, c11);
+    }
+    
+    private Rect2i createSelection(final Pos2i c1, final Pos2i c2) {
+        final Pos2i c3 = this.convertLocalToScreen(c1);
+        final Pos2i c4 = this.convertLocalToScreen(c2);
+        final int integer6 = Math.min(c3.x, c4.x);
+        final int integer7 = Math.max(c3.x, c4.x);
+        final int integer8 = Math.min(c3.y, c4.y);
+        final int integer9 = Math.max(c3.y, c4.y);
+        return new Rect2i(integer6, integer8, integer7 - integer6, integer9 - integer8);
+    }
+    
+    static class Pos2i {
+        public final int x;
+        public final int y;
         
-        Pos2i() {
+        Pos2i(final int integer1, final int integer2) {
+            this.x = integer1;
+            this.y = integer2;
+        }
+    }
+    
+    static class LineInfo {
+        private final Style style;
+        private final String contents;
+        private final Component asComponent;
+        private final int x;
+        private final int y;
+        
+        public LineInfo(final Style nb, final String string, final int integer3, final int integer4) {
+            this.style = nb;
+            this.contents = string;
+            this.x = integer3;
+            this.y = integer4;
+            this.asComponent = new TextComponent(string).setStyle(nb);
+        }
+    }
+    
+    static class DisplayCache {
+        private static final DisplayCache EMPTY;
+        private final String fullText;
+        private final Pos2i cursor;
+        private final boolean cursorAtEnd;
+        private final int[] lineStarts;
+        private final LineInfo[] lines;
+        private final Rect2i[] selection;
+        
+        public DisplayCache(final String string, final Pos2i c, final boolean boolean3, final int[] arr, final LineInfo[] arr, final Rect2i[] arr) {
+            this.fullText = string;
+            this.cursor = c;
+            this.cursorAtEnd = boolean3;
+            this.lineStarts = arr;
+            this.lines = arr;
+            this.selection = arr;
         }
         
-        Pos2i(final int integer2, final int integer3) {
-            this.x = integer2;
-            this.y = integer3;
+        public int getIndexAtPosition(final Font dmt, final Pos2i c) {
+            final int y = c.y;
+            dmt.getClass();
+            final int integer4 = y / 9;
+            if (integer4 < 0) {
+                return 0;
+            }
+            if (integer4 >= this.lines.length) {
+                return this.fullText.length();
+            }
+            final LineInfo b5 = this.lines[integer4];
+            return this.lineStarts[integer4] + dmt.getSplitter().plainIndexAtWidth(b5.contents, c.x, b5.style);
+        }
+        
+        public int changeLine(final int integer1, final int integer2) {
+            final int integer3 = findLineFromPos(this.lineStarts, integer1);
+            final int integer4 = integer3 + integer2;
+            int integer7;
+            if (0 <= integer4 && integer4 < this.lineStarts.length) {
+                final int integer5 = integer1 - this.lineStarts[integer3];
+                final int integer6 = this.lines[integer4].contents.length();
+                integer7 = this.lineStarts[integer4] + Math.min(integer5, integer6);
+            }
+            else {
+                integer7 = integer1;
+            }
+            return integer7;
+        }
+        
+        public int findLineStart(final int integer) {
+            final int integer2 = findLineFromPos(this.lineStarts, integer);
+            return this.lineStarts[integer2];
+        }
+        
+        public int findLineEnd(final int integer) {
+            final int integer2 = findLineFromPos(this.lineStarts, integer);
+            return this.lineStarts[integer2] + this.lines[integer2].contents.length();
+        }
+        
+        static {
+            EMPTY = new DisplayCache("", new Pos2i(0, 0), true, new int[] { 0 }, new LineInfo[] { new LineInfo(Style.EMPTY, "", 0, 0) }, new Rect2i[0]);
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/BookViewScreen.java b/src/net/minecraft/client/gui/screens/inventory/BookViewScreen.java
index 06725d4..e650111 100644
--- a/src/net/minecraft/client/gui/screens/inventory/BookViewScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/BookViewScreen.java
@@ -1,5 +1,6 @@
 package net.minecraft.client.gui.screens.inventory;
 
+import net.minecraft.network.chat.Component;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.WrittenBookItem;
@@ -10,18 +11,18 @@ import net.minecraft.nbt.ListTag;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.nbt.CompoundTag;
 import javax.annotation.Nullable;
-import java.util.Iterator;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.ComponentRenderUtils;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.Style;
 import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.util.Mth;
 import java.util.Collections;
 import net.minecraft.client.gui.chat.NarratorChatListener;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.FormattedText;
 import java.util.List;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.gui.screens.Screen;
@@ -31,7 +32,7 @@ public class BookViewScreen extends Screen {
     public static final ResourceLocation BOOK_LOCATION;
     private BookAccess bookAccess;
     private int currentPage;
-    private List<Component> cachedPageComponents;
+    private List<FormattedText> cachedPageComponents;
     private int cachedPage;
     private PageButton forwardButton;
     private PageButton backButton;
@@ -47,7 +48,7 @@ public class BookViewScreen extends Screen {
     
     private BookViewScreen(final BookAccess a, final boolean boolean2) {
         super(NarratorChatListener.NO_TITLE);
-        this.cachedPageComponents = Collections.<Component>emptyList();
+        this.cachedPageComponents = Collections.<FormattedText>emptyList();
         this.cachedPage = -1;
         this.bookAccess = a;
         this.playTurnSound = boolean2;
@@ -82,14 +83,14 @@ public class BookViewScreen extends Screen {
     }
     
     protected void createMenuControls() {
-        this.<Button>addButton(new Button(this.width / 2 - 100, 196, 200, 20, I18n.get("gui.done"), dcv -> this.minecraft.setScreen(null)));
+        this.<Button>addButton(new Button(this.width / 2 - 100, 196, 200, 20, CommonComponents.GUI_DONE, dni -> this.minecraft.setScreen(null)));
     }
     
     protected void createPageControlButtons() {
         final int integer2 = (this.width - 192) / 2;
         final int integer3 = 2;
-        this.forwardButton = this.<PageButton>addButton(new PageButton(integer2 + 116, 159, true, dcv -> this.pageForward(), this.playTurnSound));
-        this.backButton = this.<PageButton>addButton(new PageButton(integer2 + 43, 159, false, dcv -> this.pageBack(), this.playTurnSound));
+        this.forwardButton = this.<PageButton>addButton(new PageButton(integer2 + 116, 159, true, dni -> this.pageForward(), this.playTurnSound));
+        this.backButton = this.<PageButton>addButton(new PageButton(integer2 + 43, 159, false, dni -> this.pageBack(), this.playTurnSound));
         this.updateButtonVisibility();
     }
     
@@ -137,38 +138,38 @@ public class BookViewScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(BookViewScreen.BOOK_LOCATION);
-        final int integer3 = (this.width - 192) / 2;
-        final int integer4 = 2;
-        this.blit(integer3, 2, 0, 0, 192, 192);
-        final String string7 = I18n.get("book.pageIndicator", this.currentPage + 1, Math.max(this.getNumPages(), 1));
+        final int integer4 = (this.width - 192) / 2;
+        final int integer5 = 2;
+        this.blit(dhl, integer4, 2, 0, 0, 192, 192);
+        final String string8 = I18n.get("book.pageIndicator", this.currentPage + 1, Math.max(this.getNumPages(), 1));
         if (this.cachedPage != this.currentPage) {
-            final Component lf8 = this.bookAccess.getPage(this.currentPage);
-            this.cachedPageComponents = ComponentRenderUtils.wrapComponents(lf8, 114, this.font, true, true);
+            final FormattedText mu9 = this.bookAccess.getPage(this.currentPage);
+            this.cachedPageComponents = this.font.getSplitter().splitLines(mu9, 114, Style.EMPTY);
         }
         this.cachedPage = this.currentPage;
-        final int integer5 = this.strWidth(string7);
-        this.font.draw(string7, (float)(integer3 - integer5 + 192 - 44), 18.0f, 0);
+        final int integer6 = this.strWidth(string8);
+        this.font.draw(dhl, string8, (float)(integer4 - integer6 + 192 - 44), 18.0f, 0);
         final int n = 128;
         this.font.getClass();
-        for (int integer6 = Math.min(n / 9, this.cachedPageComponents.size()), integer7 = 0; integer7 < integer6; ++integer7) {
-            final Component lf9 = this.cachedPageComponents.get(integer7);
+        for (int integer7 = Math.min(n / 9, this.cachedPageComponents.size()), integer8 = 0; integer8 < integer7; ++integer8) {
+            final FormattedText mu10 = this.cachedPageComponents.get(integer8);
             final Font font = this.font;
-            final String coloredString = lf9.getColoredString();
-            final float float4 = (float)(integer3 + 36);
+            final FormattedText mu11 = mu10;
+            final float float5 = (float)(integer4 + 36);
             final int n2 = 32;
-            final int n3 = integer7;
+            final int n3 = integer8;
             this.font.getClass();
-            font.draw(coloredString, float4, (float)(n2 + n3 * 9), 0);
+            font.draw(dhl, mu11, float5, (float)(n2 + n3 * 9), 0);
         }
-        final Component lf10 = this.getClickedComponentAt(integer1, integer2);
-        if (lf10 != null) {
-            this.renderComponentHoverEffect(lf10, integer1, integer2);
+        final Style nb11 = this.getClickedComponentStyleAt(integer2, integer3);
+        if (nb11 != null) {
+            this.renderComponentHoverEffect(dhl, nb11, integer2, integer3);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     private int strWidth(final String string) {
@@ -178,8 +179,8 @@ public class BookViewScreen extends Screen {
     @Override
     public boolean mouseClicked(final double double1, final double double2, final int integer) {
         if (integer == 0) {
-            final Component lf7 = this.getClickedComponentAt(double1, double2);
-            if (lf7 != null && this.handleComponentClicked(lf7)) {
+            final Style nb7 = this.getClickedComponentStyleAt(double1, double2);
+            if (nb7 != null && this.handleComponentClicked(nb7)) {
                 return true;
             }
         }
@@ -187,13 +188,13 @@ public class BookViewScreen extends Screen {
     }
     
     @Override
-    public boolean handleComponentClicked(final Component lf) {
-        final ClickEvent le3 = lf.getStyle().getClickEvent();
-        if (le3 == null) {
+    public boolean handleComponentClicked(final Style nb) {
+        final ClickEvent mp3 = nb.getClickEvent();
+        if (mp3 == null) {
             return false;
         }
-        if (le3.getAction() == ClickEvent.Action.CHANGE_PAGE) {
-            final String string4 = le3.getValue();
+        if (mp3.getAction() == ClickEvent.Action.CHANGE_PAGE) {
+            final String string4 = mp3.getValue();
             try {
                 final int integer5 = Integer.parseInt(string4) - 1;
                 return this.forcePage(integer5);
@@ -202,15 +203,15 @@ public class BookViewScreen extends Screen {
                 return false;
             }
         }
-        final boolean boolean4 = super.handleComponentClicked(lf);
-        if (boolean4 && le3.getAction() == ClickEvent.Action.RUN_COMMAND) {
+        final boolean boolean4 = super.handleComponentClicked(nb);
+        if (boolean4 && mp3.getAction() == ClickEvent.Action.RUN_COMMAND) {
             this.minecraft.setScreen(null);
         }
         return boolean4;
     }
     
     @Nullable
-    public Component getClickedComponentAt(final double double1, final double double2) {
+    public Style getClickedComponentStyleAt(final double double1, final double double2) {
         if (this.cachedPageComponents == null) {
             return null;
         }
@@ -230,17 +231,8 @@ public class BookViewScreen extends Screen {
                 this.minecraft.font.getClass();
                 final int integer9 = n3 / 9;
                 if (integer9 >= 0 && integer9 < this.cachedPageComponents.size()) {
-                    final Component lf10 = this.cachedPageComponents.get(integer9);
-                    int integer10 = 0;
-                    for (final Component lf11 : lf10) {
-                        if (lf11 instanceof TextComponent) {
-                            integer10 += this.minecraft.font.width(lf11.getColoredString());
-                            if (integer10 > integer6) {
-                                return lf11;
-                            }
-                            continue;
-                        }
-                    }
+                    final FormattedText mu10 = this.cachedPageComponents.get(integer9);
+                    return this.minecraft.font.getSplitter().componentStyleAtWidth(mu10, integer6);
                 }
                 return null;
             }
@@ -248,11 +240,11 @@ public class BookViewScreen extends Screen {
         return null;
     }
     
-    public static List<String> convertPages(final CompoundTag jt) {
-        final ListTag jz2 = jt.getList("pages", 8).copy();
+    public static List<String> convertPages(final CompoundTag le) {
+        final ListTag lk2 = le.getList("pages", 8).copy();
         final ImmutableList.Builder<String> builder3 = ImmutableList.<String>builder();
-        for (int integer4 = 0; integer4 < jz2.size(); ++integer4) {
-            builder3.add(jz2.getString(integer4));
+        for (int integer4 = 0; integer4 < lk2.size(); ++integer4) {
+            builder3.add(lk2.getString(integer4));
         }
         return builder3.build();
     }
@@ -265,8 +257,8 @@ public class BookViewScreen extends Screen {
             }
             
             @Override
-            public Component getPageRaw(final int integer) {
-                return new TextComponent("");
+            public FormattedText getPageRaw(final int integer) {
+                return FormattedText.EMPTY;
             }
         };
         BOOK_LOCATION = new ResourceLocation("textures/gui/book.png");
@@ -275,22 +267,22 @@ public class BookViewScreen extends Screen {
     public interface BookAccess {
         int getPageCount();
         
-        Component getPageRaw(final int integer);
+        FormattedText getPageRaw(final int integer);
         
-        default Component getPage(final int integer) {
+        default FormattedText getPage(final int integer) {
             if (integer >= 0 && integer < this.getPageCount()) {
                 return this.getPageRaw(integer);
             }
-            return new TextComponent("");
+            return FormattedText.EMPTY;
         }
         
-        default BookAccess fromItem(final ItemStack ben) {
-            final Item bei2 = ben.getItem();
-            if (bei2 == Items.WRITTEN_BOOK) {
-                return new WrittenBookAccess(ben);
+        default BookAccess fromItem(final ItemStack bki) {
+            final Item bke2 = bki.getItem();
+            if (bke2 == Items.WRITTEN_BOOK) {
+                return new WrittenBookAccess(bki);
             }
-            if (bei2 == Items.WRITABLE_BOOK) {
-                return new WritableBookAccess(ben);
+            if (bke2 == Items.WRITABLE_BOOK) {
+                return new WritableBookAccess(bki);
             }
             return BookViewScreen.EMPTY_ACCESS;
         }
@@ -299,16 +291,16 @@ public class BookViewScreen extends Screen {
     public static class WrittenBookAccess implements BookAccess {
         private final List<String> pages;
         
-        public WrittenBookAccess(final ItemStack ben) {
-            this.pages = readPages(ben);
+        public WrittenBookAccess(final ItemStack bki) {
+            this.pages = readPages(bki);
         }
         
-        private static List<String> readPages(final ItemStack ben) {
-            final CompoundTag jt2 = ben.getTag();
-            if (jt2 != null && WrittenBookItem.makeSureTagIsValid(jt2)) {
-                return BookViewScreen.convertPages(jt2);
+        private static List<String> readPages(final ItemStack bki) {
+            final CompoundTag le2 = bki.getTag();
+            if (le2 != null && WrittenBookItem.makeSureTagIsValid(le2)) {
+                return BookViewScreen.convertPages(le2);
             }
-            return ImmutableList.<String>of(new TranslatableComponent("book.invalid.tag", new Object[0]).withStyle(ChatFormatting.DARK_RED).getColoredString());
+            return ImmutableList.<String>of(Component.Serializer.toJson(new TranslatableComponent("book.invalid.tag").withStyle(ChatFormatting.DARK_RED)));
         }
         
         @Override
@@ -317,29 +309,29 @@ public class BookViewScreen extends Screen {
         }
         
         @Override
-        public Component getPageRaw(final int integer) {
+        public FormattedText getPageRaw(final int integer) {
             final String string3 = this.pages.get(integer);
             try {
-                final Component lf4 = Component.Serializer.fromJson(string3);
-                if (lf4 != null) {
-                    return lf4;
+                final FormattedText mu4 = Component.Serializer.fromJson(string3);
+                if (mu4 != null) {
+                    return mu4;
                 }
             }
             catch (Exception ex) {}
-            return new TextComponent(string3);
+            return FormattedText.of(string3);
         }
     }
     
     public static class WritableBookAccess implements BookAccess {
         private final List<String> pages;
         
-        public WritableBookAccess(final ItemStack ben) {
-            this.pages = readPages(ben);
+        public WritableBookAccess(final ItemStack bki) {
+            this.pages = readPages(bki);
         }
         
-        private static List<String> readPages(final ItemStack ben) {
-            final CompoundTag jt2 = ben.getTag();
-            return (List<String>)((jt2 != null) ? BookViewScreen.convertPages(jt2) : ImmutableList.of());
+        private static List<String> readPages(final ItemStack bki) {
+            final CompoundTag le2 = bki.getTag();
+            return (List<String>)((le2 != null) ? BookViewScreen.convertPages(le2) : ImmutableList.of());
         }
         
         @Override
@@ -348,8 +340,8 @@ public class BookViewScreen extends Screen {
         }
         
         @Override
-        public Component getPageRaw(final int integer) {
-            return new TextComponent(this.pages.get(integer));
+        public FormattedText getPageRaw(final int integer) {
+            return FormattedText.of(this.pages.get(integer));
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/BrewingStandScreen.java b/src/net/minecraft/client/gui/screens/inventory/BrewingStandScreen.java
index 9014fca..7398ad4 100644
--- a/src/net/minecraft/client/gui/screens/inventory/BrewingStandScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/BrewingStandScreen.java
@@ -2,6 +2,8 @@ package net.minecraft.client.gui.screens.inventory;
 
 import net.minecraft.util.Mth;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.resources.ResourceLocation;
@@ -11,44 +13,44 @@ public class BrewingStandScreen extends AbstractContainerScreen<BrewingStandMenu
     private static final ResourceLocation BREWING_STAND_LOCATION;
     private static final int[] BUBBLELENGTHS;
     
-    public BrewingStandScreen(final BrewingStandMenu bas, final Inventory ayi, final Component lf) {
-        super(bas, ayi, lf);
+    public BrewingStandScreen(final BrewingStandMenu bgn, final Inventory beb, final Component mr) {
+        super(bgn, beb, mr);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
+    protected void init() {
+        super.init();
+        this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2;
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), (float)(this.imageWidth / 2 - this.font.width(this.title.getColoredString()) / 2), 6.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(BrewingStandScreen.BREWING_STAND_LOCATION);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
-        final int integer6 = ((BrewingStandMenu)this.menu).getFuel();
-        final int integer7 = Mth.clamp((18 * integer6 + 20 - 1) / 20, 0, 18);
-        if (integer7 > 0) {
-            this.blit(integer4 + 60, integer5 + 44, 176, 29, integer7, 4);
-        }
-        final int integer8 = ((BrewingStandMenu)this.menu).getBrewingTicks();
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer7 = ((BrewingStandMenu)this.menu).getFuel();
+        final int integer8 = Mth.clamp((18 * integer7 + 20 - 1) / 20, 0, 18);
         if (integer8 > 0) {
-            int integer9 = (int)(28.0f * (1.0f - integer8 / 400.0f));
-            if (integer9 > 0) {
-                this.blit(integer4 + 97, integer5 + 16, 176, 0, 9, integer9);
+            this.blit(dhl, integer5 + 60, integer6 + 44, 176, 29, integer8, 4);
+        }
+        final int integer9 = ((BrewingStandMenu)this.menu).getBrewingTicks();
+        if (integer9 > 0) {
+            int integer10 = (int)(28.0f * (1.0f - integer9 / 400.0f));
+            if (integer10 > 0) {
+                this.blit(dhl, integer5 + 97, integer6 + 16, 176, 0, 9, integer10);
             }
-            integer9 = BrewingStandScreen.BUBBLELENGTHS[integer8 / 2 % 7];
-            if (integer9 > 0) {
-                this.blit(integer4 + 63, integer5 + 14 + 29 - integer9, 185, 29 - integer9, 12, integer9);
+            integer10 = BrewingStandScreen.BUBBLELENGTHS[integer9 / 2 % 7];
+            if (integer10 > 0) {
+                this.blit(dhl, integer5 + 63, integer6 + 14 + 29 - integer10, 185, 29 - integer10, 12, integer10);
             }
         }
     }
diff --git a/src/net/minecraft/client/gui/screens/inventory/CartographyTableScreen.java b/src/net/minecraft/client/gui/screens/inventory/CartographyTableScreen.java
index 10038b4..158f9b7 100644
--- a/src/net/minecraft/client/gui/screens/inventory/CartographyTableScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/CartographyTableScreen.java
@@ -1,6 +1,5 @@
 package net.minecraft.client.gui.screens.inventory;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.Tesselator;
 import javax.annotation.Nullable;
@@ -11,6 +10,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.item.MapItem;
 import net.minecraft.world.item.Items;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.resources.ResourceLocation;
@@ -19,97 +19,92 @@ import net.minecraft.world.inventory.CartographyTableMenu;
 public class CartographyTableScreen extends AbstractContainerScreen<CartographyTableMenu> {
     private static final ResourceLocation BG_LOCATION;
     
-    public CartographyTableScreen(final CartographyTableMenu bat, final Inventory ayi, final Component lf) {
-        super(bat, ayi, lf);
+    public CartographyTableScreen(final CartographyTableMenu bgo, final Inventory beb, final Component mr) {
+        super(bgo, beb, mr);
+        this.titleLabelY -= 2;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 8.0f, 4.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
-        this.renderBackground();
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
+        this.renderBackground(dhl);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(CartographyTableScreen.BG_LOCATION);
-        final int integer4 = this.leftPos;
-        final int integer5 = this.topPos;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
-        final Item bei7 = ((CartographyTableMenu)this.menu).getSlot(1).getItem().getItem();
-        final boolean boolean8 = bei7 == Items.MAP;
-        final boolean boolean9 = bei7 == Items.PAPER;
-        final boolean boolean10 = bei7 == Items.GLASS_PANE;
-        final ItemStack ben11 = ((CartographyTableMenu)this.menu).getSlot(0).getItem();
-        boolean boolean11 = false;
-        MapItemSavedData crg12;
-        if (ben11.getItem() == Items.FILLED_MAP) {
-            crg12 = MapItem.getSavedData(ben11, this.minecraft.level);
-            if (crg12 != null) {
-                if (crg12.locked) {
-                    boolean11 = true;
-                    if (boolean9 || boolean10) {
-                        this.blit(integer4 + 35, integer5 + 31, this.imageWidth + 50, 132, 28, 21);
+        final int integer5 = this.leftPos;
+        final int integer6 = this.topPos;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
+        final Item bke8 = ((CartographyTableMenu)this.menu).getSlot(1).getItem().getItem();
+        final boolean boolean9 = bke8 == Items.MAP;
+        final boolean boolean10 = bke8 == Items.PAPER;
+        final boolean boolean11 = bke8 == Items.GLASS_PANE;
+        final ItemStack bki12 = ((CartographyTableMenu)this.menu).getSlot(0).getItem();
+        boolean boolean12 = false;
+        MapItemSavedData czv13;
+        if (bki12.getItem() == Items.FILLED_MAP) {
+            czv13 = MapItem.getSavedData(bki12, this.minecraft.level);
+            if (czv13 != null) {
+                if (czv13.locked) {
+                    boolean12 = true;
+                    if (boolean10 || boolean11) {
+                        this.blit(dhl, integer5 + 35, integer6 + 31, this.imageWidth + 50, 132, 28, 21);
                     }
                 }
-                if (boolean9 && crg12.scale >= 4) {
-                    boolean11 = true;
-                    this.blit(integer4 + 35, integer5 + 31, this.imageWidth + 50, 132, 28, 21);
+                if (boolean10 && czv13.scale >= 4) {
+                    boolean12 = true;
+                    this.blit(dhl, integer5 + 35, integer6 + 31, this.imageWidth + 50, 132, 28, 21);
                 }
             }
         }
         else {
-            crg12 = null;
+            czv13 = null;
         }
-        this.renderResultingMap(crg12, boolean8, boolean9, boolean10, boolean11);
+        this.renderResultingMap(dhl, czv13, boolean9, boolean10, boolean11, boolean12);
     }
     
-    private void renderResultingMap(@Nullable final MapItemSavedData crg, final boolean boolean2, final boolean boolean3, final boolean boolean4, final boolean boolean5) {
-        final int integer7 = this.leftPos;
-        final int integer8 = this.topPos;
-        if (boolean3 && !boolean5) {
-            this.blit(integer7 + 67, integer8 + 13, this.imageWidth, 66, 66, 66);
-            this.renderMap(crg, integer7 + 85, integer8 + 31, 0.226f);
+    private void renderResultingMap(final PoseStack dhl, @Nullable final MapItemSavedData czv, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6) {
+        final int integer8 = this.leftPos;
+        final int integer9 = this.topPos;
+        if (boolean4 && !boolean6) {
+            this.blit(dhl, integer8 + 67, integer9 + 13, this.imageWidth, 66, 66, 66);
+            this.renderMap(czv, integer8 + 85, integer9 + 31, 0.226f);
         }
-        else if (boolean2) {
-            this.blit(integer7 + 67 + 16, integer8 + 13, this.imageWidth, 132, 50, 66);
-            this.renderMap(crg, integer7 + 86, integer8 + 16, 0.34f);
+        else if (boolean3) {
+            this.blit(dhl, integer8 + 67 + 16, integer9 + 13, this.imageWidth, 132, 50, 66);
+            this.renderMap(czv, integer8 + 86, integer9 + 16, 0.34f);
             this.minecraft.getTextureManager().bind(CartographyTableScreen.BG_LOCATION);
             RenderSystem.pushMatrix();
             RenderSystem.translatef(0.0f, 0.0f, 1.0f);
-            this.blit(integer7 + 67, integer8 + 13 + 16, this.imageWidth, 132, 50, 66);
-            this.renderMap(crg, integer7 + 70, integer8 + 32, 0.34f);
+            this.blit(dhl, integer8 + 67, integer9 + 13 + 16, this.imageWidth, 132, 50, 66);
+            this.renderMap(czv, integer8 + 70, integer9 + 32, 0.34f);
             RenderSystem.popMatrix();
         }
-        else if (boolean4) {
-            this.blit(integer7 + 67, integer8 + 13, this.imageWidth, 0, 66, 66);
-            this.renderMap(crg, integer7 + 71, integer8 + 17, 0.45f);
+        else if (boolean5) {
+            this.blit(dhl, integer8 + 67, integer9 + 13, this.imageWidth, 0, 66, 66);
+            this.renderMap(czv, integer8 + 71, integer9 + 17, 0.45f);
             this.minecraft.getTextureManager().bind(CartographyTableScreen.BG_LOCATION);
             RenderSystem.pushMatrix();
             RenderSystem.translatef(0.0f, 0.0f, 1.0f);
-            this.blit(integer7 + 66, integer8 + 12, 0, this.imageHeight, 66, 66);
+            this.blit(dhl, integer8 + 66, integer9 + 12, 0, this.imageHeight, 66, 66);
             RenderSystem.popMatrix();
         }
         else {
-            this.blit(integer7 + 67, integer8 + 13, this.imageWidth, 0, 66, 66);
-            this.renderMap(crg, integer7 + 71, integer8 + 17, 0.45f);
+            this.blit(dhl, integer8 + 67, integer9 + 13, this.imageWidth, 0, 66, 66);
+            this.renderMap(czv, integer8 + 71, integer9 + 17, 0.45f);
         }
     }
     
-    private void renderMap(@Nullable final MapItemSavedData crg, final int integer2, final int integer3, final float float4) {
-        if (crg != null) {
+    private void renderMap(@Nullable final MapItemSavedData czv, final int integer2, final int integer3, final float float4) {
+        if (czv != null) {
             RenderSystem.pushMatrix();
             RenderSystem.translatef((float)integer2, (float)integer3, 1.0f);
             RenderSystem.scalef(float4, float4, 1.0f);
             final MultiBufferSource.BufferSource a6 = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-            this.minecraft.gameRenderer.getMapRenderer().render(new PoseStack(), a6, crg, true, 15728880);
+            this.minecraft.gameRenderer.getMapRenderer().render(new PoseStack(), a6, czv, true, 15728880);
             a6.endBatch();
             RenderSystem.popMatrix();
         }
diff --git a/src/net/minecraft/client/gui/screens/inventory/CommandBlockEditScreen.java b/src/net/minecraft/client/gui/screens/inventory/CommandBlockEditScreen.java
index abda407..a2b2c27 100644
--- a/src/net/minecraft/client/gui/screens/inventory/CommandBlockEditScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/CommandBlockEditScreen.java
@@ -4,7 +4,8 @@ import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundSetCommandBlockPacket;
 import net.minecraft.core.BlockPos;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.BaseCommandBlock;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.world.level.block.entity.CommandBlockEntity;
@@ -18,9 +19,9 @@ public class CommandBlockEditScreen extends AbstractCommandBlockEditScreen {
     private boolean conditional;
     private boolean autoexec;
     
-    public CommandBlockEditScreen(final CommandBlockEntity bwq) {
+    public CommandBlockEditScreen(final CommandBlockEntity cdq) {
         this.mode = CommandBlockEntity.Mode.REDSTONE;
-        this.autoCommandBlock = bwq;
+        this.autoCommandBlock = cdq;
     }
     
     @Override
@@ -36,17 +37,17 @@ public class CommandBlockEditScreen extends AbstractCommandBlockEditScreen {
     @Override
     protected void init() {
         super.init();
-        this.modeButton = this.<Button>addButton(new Button(this.width / 2 - 50 - 100 - 4, 165, 100, 20, I18n.get("advMode.mode.sequence"), dcv -> {
+        this.modeButton = this.<Button>addButton(new Button(this.width / 2 - 50 - 100 - 4, 165, 100, 20, new TranslatableComponent("advMode.mode.sequence"), dni -> {
             this.nextMode();
             this.updateMode();
             return;
         }));
-        this.conditionalButton = this.<Button>addButton(new Button(this.width / 2 - 50, 165, 100, 20, I18n.get("advMode.mode.unconditional"), dcv -> {
+        this.conditionalButton = this.<Button>addButton(new Button(this.width / 2 - 50, 165, 100, 20, new TranslatableComponent("advMode.mode.unconditional"), dni -> {
             this.conditional = !this.conditional;
             this.updateConditional();
             return;
         }));
-        this.autoexecButton = this.<Button>addButton(new Button(this.width / 2 + 50 + 4, 165, 100, 20, I18n.get("advMode.mode.redstoneTriggered"), dcv -> {
+        this.autoexecButton = this.<Button>addButton(new Button(this.width / 2 + 50 + 4, 165, 100, 20, new TranslatableComponent("advMode.mode.redstoneTriggered"), dni -> {
             this.autoexec = !this.autoexec;
             this.updateAutoexec();
             return;
@@ -59,9 +60,9 @@ public class CommandBlockEditScreen extends AbstractCommandBlockEditScreen {
     }
     
     public void updateGui() {
-        final BaseCommandBlock bjc2 = this.autoCommandBlock.getCommandBlock();
-        this.commandEdit.setValue(bjc2.getCommand());
-        this.trackOutput = bjc2.isTrackOutput();
+        final BaseCommandBlock bpc2 = this.autoCommandBlock.getCommandBlock();
+        this.commandEdit.setValue(bpc2.getCommand());
+        this.trackOutput = bpc2.isTrackOutput();
         this.mode = this.autoCommandBlock.getMode();
         this.conditional = this.autoCommandBlock.isConditional();
         this.autoexec = this.autoCommandBlock.isAutomatic();
@@ -77,8 +78,8 @@ public class CommandBlockEditScreen extends AbstractCommandBlockEditScreen {
     }
     
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
-        super.resize(dbn, integer2, integer3);
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
+        super.resize(dlx, integer2, integer3);
         this.updateCommandOutput();
         this.updateMode();
         this.updateConditional();
@@ -91,22 +92,22 @@ public class CommandBlockEditScreen extends AbstractCommandBlockEditScreen {
     }
     
     @Override
-    protected void populateAndSendPacket(final BaseCommandBlock bjc) {
-        this.minecraft.getConnection().send(new ServerboundSetCommandBlockPacket(new BlockPos(bjc.getPosition()), this.commandEdit.getValue(), this.mode, bjc.isTrackOutput(), this.conditional, this.autoexec));
+    protected void populateAndSendPacket(final BaseCommandBlock bpc) {
+        this.minecraft.getConnection().send(new ServerboundSetCommandBlockPacket(new BlockPos(bpc.getPosition()), this.commandEdit.getValue(), this.mode, bpc.isTrackOutput(), this.conditional, this.autoexec));
     }
     
     private void updateMode() {
         switch (this.mode) {
             case SEQUENCE: {
-                this.modeButton.setMessage(I18n.get("advMode.mode.sequence"));
+                this.modeButton.setMessage(new TranslatableComponent("advMode.mode.sequence"));
                 break;
             }
             case AUTO: {
-                this.modeButton.setMessage(I18n.get("advMode.mode.auto"));
+                this.modeButton.setMessage(new TranslatableComponent("advMode.mode.auto"));
                 break;
             }
             case REDSTONE: {
-                this.modeButton.setMessage(I18n.get("advMode.mode.redstone"));
+                this.modeButton.setMessage(new TranslatableComponent("advMode.mode.redstone"));
                 break;
             }
         }
@@ -131,19 +132,19 @@ public class CommandBlockEditScreen extends AbstractCommandBlockEditScreen {
     
     private void updateConditional() {
         if (this.conditional) {
-            this.conditionalButton.setMessage(I18n.get("advMode.mode.conditional"));
+            this.conditionalButton.setMessage(new TranslatableComponent("advMode.mode.conditional"));
         }
         else {
-            this.conditionalButton.setMessage(I18n.get("advMode.mode.unconditional"));
+            this.conditionalButton.setMessage(new TranslatableComponent("advMode.mode.unconditional"));
         }
     }
     
     private void updateAutoexec() {
         if (this.autoexec) {
-            this.autoexecButton.setMessage(I18n.get("advMode.mode.autoexec.bat"));
+            this.autoexecButton.setMessage(new TranslatableComponent("advMode.mode.autoexec.bat"));
         }
         else {
-            this.autoexecButton.setMessage(I18n.get("advMode.mode.redstoneTriggered"));
+            this.autoexecButton.setMessage(new TranslatableComponent("advMode.mode.redstoneTriggered"));
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/ContainerScreen.java b/src/net/minecraft/client/gui/screens/inventory/ContainerScreen.java
index bc83707..a1e79df 100644
--- a/src/net/minecraft/client/gui/screens/inventory/ContainerScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/ContainerScreen.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.gui.screens.inventory;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.resources.ResourceLocation;
@@ -10,36 +11,31 @@ public class ContainerScreen extends AbstractContainerScreen<ChestMenu> implemen
     private static final ResourceLocation CONTAINER_BACKGROUND;
     private final int containerRows;
     
-    public ContainerScreen(final ChestMenu bau, final Inventory ayi, final Component lf) {
-        super(bau, ayi, lf);
+    public ContainerScreen(final ChestMenu bgp, final Inventory beb, final Component mr) {
+        super(bgp, beb, mr);
         this.passEvents = false;
         final int integer5 = 222;
         final int integer6 = 114;
-        this.containerRows = bau.getRowCount();
+        this.containerRows = bgp.getRowCount();
         this.imageHeight = 114 + this.containerRows * 18;
+        this.inventoryLabelY = this.imageHeight - 94;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 8.0f, 6.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(ContainerScreen.CONTAINER_BACKGROUND);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.containerRows * 18 + 17);
-        this.blit(integer4, integer5 + this.containerRows * 18 + 17, 0, 126, this.imageWidth, 96);
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.containerRows * 18 + 17);
+        this.blit(dhl, integer5, integer6 + this.containerRows * 18 + 17, 0, 126, this.imageWidth, 96);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/inventory/CraftingScreen.java b/src/net/minecraft/client/gui/screens/inventory/CraftingScreen.java
index 92abe17..a04246c 100644
--- a/src/net/minecraft/client/gui/screens/inventory/CraftingScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/CraftingScreen.java
@@ -4,6 +4,7 @@ import net.minecraft.client.gui.components.Button;
 import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.inventory.Slot;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.ImageButton;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.world.inventory.RecipeBookMenu;
@@ -20,8 +21,8 @@ public class CraftingScreen extends AbstractContainerScreen<CraftingMenu> implem
     private final RecipeBookComponent recipeBookComponent;
     private boolean widthTooNarrow;
     
-    public CraftingScreen(final CraftingMenu bba, final Inventory ayi, final Component lf) {
-        super(bba, ayi, lf);
+    public CraftingScreen(final CraftingMenu bgv, final Inventory beb, final Component mr) {
+        super(bgv, beb, mr);
         this.recipeBookComponent = new RecipeBookComponent();
     }
     
@@ -33,12 +34,14 @@ public class CraftingScreen extends AbstractContainerScreen<CraftingMenu> implem
         this.leftPos = this.recipeBookComponent.updateScreenPosition(this.widthTooNarrow, this.width, this.imageWidth);
         this.children.add(this.recipeBookComponent);
         this.setInitialFocus(this.recipeBookComponent);
-        this.<ImageButton>addButton(new ImageButton(this.leftPos + 5, this.height / 2 - 49, 20, 18, 0, 0, 19, CraftingScreen.RECIPE_BUTTON_LOCATION, dcv -> {
+        this.<ImageButton>addButton(new ImageButton(this.leftPos + 5, this.height / 2 - 49, 20, 18, 0, 0, 19, CraftingScreen.RECIPE_BUTTON_LOCATION, dni -> {
             this.recipeBookComponent.initVisuals(this.widthTooNarrow);
             this.recipeBookComponent.toggleVisibility();
             this.leftPos = this.recipeBookComponent.updateScreenPosition(this.widthTooNarrow, this.width, this.imageWidth);
-            dcv.setPosition(this.leftPos + 5, this.height / 2 - 49);
+            dni.setPosition(this.leftPos + 5, this.height / 2 - 49);
+            return;
         }));
+        this.titleLabelX = 29;
     }
     
     @Override
@@ -48,35 +51,28 @@ public class CraftingScreen extends AbstractContainerScreen<CraftingMenu> implem
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
         if (this.recipeBookComponent.isVisible() && this.widthTooNarrow) {
-            this.renderBg(float3, integer1, integer2);
-            this.recipeBookComponent.render(integer1, integer2, float3);
+            this.renderBg(dhl, float4, integer2, integer3);
+            this.recipeBookComponent.render(dhl, integer2, integer3, float4);
         }
         else {
-            this.recipeBookComponent.render(integer1, integer2, float3);
-            super.render(integer1, integer2, float3);
-            this.recipeBookComponent.renderGhostRecipe(this.leftPos, this.topPos, true, float3);
+            this.recipeBookComponent.render(dhl, integer2, integer3, float4);
+            super.render(dhl, integer2, integer3, float4);
+            this.recipeBookComponent.renderGhostRecipe(dhl, this.leftPos, this.topPos, true, float4);
         }
-        this.renderTooltip(integer1, integer2);
-        this.recipeBookComponent.renderTooltip(this.leftPos, this.topPos, integer1, integer2);
-        this.magicalSpecialHackyFocus(this.recipeBookComponent);
+        this.renderTooltip(dhl, integer2, integer3);
+        this.recipeBookComponent.renderTooltip(dhl, this.leftPos, this.topPos, integer2, integer3);
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 28.0f, 6.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(CraftingScreen.CRAFTING_TABLE_LOCATION);
-        final int integer4 = this.leftPos;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer5 = this.leftPos;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
     }
     
     @Override
@@ -86,7 +82,11 @@ public class CraftingScreen extends AbstractContainerScreen<CraftingMenu> implem
     
     @Override
     public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return this.recipeBookComponent.mouseClicked(double1, double2, integer) || (this.widthTooNarrow && this.recipeBookComponent.isVisible()) || super.mouseClicked(double1, double2, integer);
+        if (this.recipeBookComponent.mouseClicked(double1, double2, integer)) {
+            this.setFocused(this.recipeBookComponent);
+            return true;
+        }
+        return (this.widthTooNarrow && this.recipeBookComponent.isVisible()) || super.mouseClicked(double1, double2, integer);
     }
     
     @Override
@@ -96,9 +96,9 @@ public class CraftingScreen extends AbstractContainerScreen<CraftingMenu> implem
     }
     
     @Override
-    protected void slotClicked(final Slot bca, final int integer2, final int integer3, final ClickType bav) {
-        super.slotClicked(bca, integer2, integer3, bav);
-        this.recipeBookComponent.slotClicked(bca);
+    protected void slotClicked(final Slot bhw, final int integer2, final int integer3, final ClickType bgq) {
+        super.slotClicked(bhw, integer2, integer3, bgq);
+        this.recipeBookComponent.slotClicked(bhw);
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/inventory/CreativeInventoryListener.java b/src/net/minecraft/client/gui/screens/inventory/CreativeInventoryListener.java
index 3a3438b..2cbd4fe 100644
--- a/src/net/minecraft/client/gui/screens/inventory/CreativeInventoryListener.java
+++ b/src/net/minecraft/client/gui/screens/inventory/CreativeInventoryListener.java
@@ -9,20 +9,20 @@ import net.minecraft.world.inventory.ContainerListener;
 public class CreativeInventoryListener implements ContainerListener {
     private final Minecraft minecraft;
     
-    public CreativeInventoryListener(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public CreativeInventoryListener(final Minecraft dlx) {
+        this.minecraft = dlx;
     }
     
     @Override
-    public void refreshContainer(final AbstractContainerMenu ban, final NonNullList<ItemStack> fy) {
+    public void refreshContainer(final AbstractContainerMenu bgi, final NonNullList<ItemStack> gi) {
     }
     
     @Override
-    public void slotChanged(final AbstractContainerMenu ban, final int integer, final ItemStack ben) {
-        this.minecraft.gameMode.handleCreativeModeItemAdd(ben, integer);
+    public void slotChanged(final AbstractContainerMenu bgi, final int integer, final ItemStack bki) {
+        this.minecraft.gameMode.handleCreativeModeItemAdd(bki, integer);
     }
     
     @Override
-    public void setContainerData(final AbstractContainerMenu ban, final int integer2, final int integer3) {
+    public void setContainerData(final AbstractContainerMenu bgi, final int integer2, final int integer3) {
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java b/src/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
index 7297685..8a59215 100644
--- a/src/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
@@ -5,20 +5,23 @@ import net.minecraft.world.inventory.MenuType;
 import net.minecraft.core.NonNullList;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import com.google.common.collect.Lists;
 import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.util.Mth;
 import net.minecraft.client.player.inventory.Hotbar;
 import net.minecraft.client.HotbarManager;
 import net.minecraft.world.Container;
 import com.google.common.collect.ImmutableList;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.Items;
+import net.minecraft.client.resources.language.I18n;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.tags.TagCollection;
 import java.util.function.Predicate;
 import net.minecraft.tags.ItemTags;
@@ -28,11 +31,13 @@ import java.util.Collection;
 import java.util.Locale;
 import net.minecraft.client.searchtree.SearchRegistry;
 import net.minecraft.core.Registry;
+import com.mojang.blaze3d.platform.InputConstants;
 import java.util.Objects;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.world.inventory.ContainerListener;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
@@ -40,7 +45,6 @@ import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.inventory.ClickType;
 import net.minecraft.client.gui.screens.Screen;
 import com.google.common.collect.Maps;
-import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
@@ -69,10 +73,10 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
     private boolean hasClickedOutside;
     private final Map<ResourceLocation, Tag<Item>> visibleTags;
     
-    public CreativeModeInventoryScreen(final Player ayj) {
-        super(new ItemPickerMenu(ayj), ayj.inventory, new TextComponent(""));
+    public CreativeModeInventoryScreen(final Player bec) {
+        super(new ItemPickerMenu(bec), bec.inventory, TextComponent.EMPTY);
         this.visibleTags = Maps.newTreeMap();
-        ayj.containerMenu = this.menu;
+        bec.containerMenu = this.menu;
         this.passEvents = true;
         this.imageHeight = 136;
         this.imageWidth = 195;
@@ -89,146 +93,146 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
     }
     
     @Override
-    protected void slotClicked(@Nullable final Slot bca, final int integer2, final int integer3, ClickType bav) {
-        if (this.isCreativeSlot(bca)) {
+    protected void slotClicked(@Nullable final Slot bhw, final int integer2, final int integer3, ClickType bgq) {
+        if (this.isCreativeSlot(bhw)) {
             this.searchBox.moveCursorToEnd();
             this.searchBox.setHighlightPos(0);
         }
-        final boolean boolean6 = bav == ClickType.QUICK_MOVE;
-        bav = ((integer2 == -999 && bav == ClickType.PICKUP) ? ClickType.THROW : bav);
-        if (bca != null || CreativeModeInventoryScreen.selectedTab == CreativeModeTab.TAB_INVENTORY.getId() || bav == ClickType.QUICK_CRAFT) {
-            if (bca != null && !bca.mayPickup(this.minecraft.player)) {
+        final boolean boolean6 = bgq == ClickType.QUICK_MOVE;
+        bgq = ((integer2 == -999 && bgq == ClickType.PICKUP) ? ClickType.THROW : bgq);
+        if (bhw != null || CreativeModeInventoryScreen.selectedTab == CreativeModeTab.TAB_INVENTORY.getId() || bgq == ClickType.QUICK_CRAFT) {
+            if (bhw != null && !bhw.mayPickup(this.minecraft.player)) {
                 return;
             }
-            if (bca == this.destroyItemSlot && boolean6) {
+            if (bhw == this.destroyItemSlot && boolean6) {
                 for (int integer4 = 0; integer4 < this.minecraft.player.inventoryMenu.getItems().size(); ++integer4) {
                     this.minecraft.gameMode.handleCreativeModeItemAdd(ItemStack.EMPTY, integer4);
                 }
             }
             else if (CreativeModeInventoryScreen.selectedTab == CreativeModeTab.TAB_INVENTORY.getId()) {
-                if (bca == this.destroyItemSlot) {
+                if (bhw == this.destroyItemSlot) {
                     this.minecraft.player.inventory.setCarried(ItemStack.EMPTY);
                 }
-                else if (bav == ClickType.THROW && bca != null && bca.hasItem()) {
-                    final ItemStack ben7 = bca.remove((integer3 == 0) ? 1 : bca.getItem().getMaxStackSize());
-                    final ItemStack ben8 = bca.getItem();
-                    this.minecraft.player.drop(ben7, true);
-                    this.minecraft.gameMode.handleCreativeModeItemDrop(ben7);
-                    this.minecraft.gameMode.handleCreativeModeItemAdd(ben8, ((SlotWrapper)bca).target.index);
+                else if (bgq == ClickType.THROW && bhw != null && bhw.hasItem()) {
+                    final ItemStack bki7 = bhw.remove((integer3 == 0) ? 1 : bhw.getItem().getMaxStackSize());
+                    final ItemStack bki8 = bhw.getItem();
+                    this.minecraft.player.drop(bki7, true);
+                    this.minecraft.gameMode.handleCreativeModeItemDrop(bki7);
+                    this.minecraft.gameMode.handleCreativeModeItemAdd(bki8, ((SlotWrapper)bhw).target.index);
                 }
-                else if (bav == ClickType.THROW && !this.minecraft.player.inventory.getCarried().isEmpty()) {
+                else if (bgq == ClickType.THROW && !this.minecraft.player.inventory.getCarried().isEmpty()) {
                     this.minecraft.player.drop(this.minecraft.player.inventory.getCarried(), true);
                     this.minecraft.gameMode.handleCreativeModeItemDrop(this.minecraft.player.inventory.getCarried());
                     this.minecraft.player.inventory.setCarried(ItemStack.EMPTY);
                 }
                 else {
-                    this.minecraft.player.inventoryMenu.clicked((bca == null) ? integer2 : ((SlotWrapper)bca).target.index, integer3, bav, this.minecraft.player);
+                    this.minecraft.player.inventoryMenu.clicked((bhw == null) ? integer2 : ((SlotWrapper)bhw).target.index, integer3, bgq, this.minecraft.player);
                     this.minecraft.player.inventoryMenu.broadcastChanges();
                 }
             }
-            else if (bav != ClickType.QUICK_CRAFT && bca.container == CreativeModeInventoryScreen.CONTAINER) {
-                final Inventory ayi7 = this.minecraft.player.inventory;
-                ItemStack ben8 = ayi7.getCarried();
-                final ItemStack ben9 = bca.getItem();
-                if (bav == ClickType.SWAP) {
-                    if (!ben9.isEmpty() && integer3 >= 0 && integer3 < 9) {
-                        final ItemStack ben10 = ben9.copy();
-                        ben10.setCount(ben10.getMaxStackSize());
-                        this.minecraft.player.inventory.setItem(integer3, ben10);
+            else if (bgq != ClickType.QUICK_CRAFT && bhw.container == CreativeModeInventoryScreen.CONTAINER) {
+                final Inventory beb7 = this.minecraft.player.inventory;
+                ItemStack bki8 = beb7.getCarried();
+                final ItemStack bki9 = bhw.getItem();
+                if (bgq == ClickType.SWAP) {
+                    if (!bki9.isEmpty()) {
+                        final ItemStack bki10 = bki9.copy();
+                        bki10.setCount(bki10.getMaxStackSize());
+                        this.minecraft.player.inventory.setItem(integer3, bki10);
                         this.minecraft.player.inventoryMenu.broadcastChanges();
                     }
                     return;
                 }
-                if (bav == ClickType.CLONE) {
-                    if (ayi7.getCarried().isEmpty() && bca.hasItem()) {
-                        final ItemStack ben10 = bca.getItem().copy();
-                        ben10.setCount(ben10.getMaxStackSize());
-                        ayi7.setCarried(ben10);
+                if (bgq == ClickType.CLONE) {
+                    if (beb7.getCarried().isEmpty() && bhw.hasItem()) {
+                        final ItemStack bki10 = bhw.getItem().copy();
+                        bki10.setCount(bki10.getMaxStackSize());
+                        beb7.setCarried(bki10);
                     }
                     return;
                 }
-                if (bav == ClickType.THROW) {
-                    if (!ben9.isEmpty()) {
-                        final ItemStack ben10 = ben9.copy();
-                        ben10.setCount((integer3 == 0) ? 1 : ben10.getMaxStackSize());
-                        this.minecraft.player.drop(ben10, true);
-                        this.minecraft.gameMode.handleCreativeModeItemDrop(ben10);
+                if (bgq == ClickType.THROW) {
+                    if (!bki9.isEmpty()) {
+                        final ItemStack bki10 = bki9.copy();
+                        bki10.setCount((integer3 == 0) ? 1 : bki10.getMaxStackSize());
+                        this.minecraft.player.drop(bki10, true);
+                        this.minecraft.gameMode.handleCreativeModeItemDrop(bki10);
                     }
                     return;
                 }
-                if (!ben8.isEmpty() && !ben9.isEmpty() && ben8.sameItem(ben9) && ItemStack.tagMatches(ben8, ben9)) {
+                if (!bki8.isEmpty() && !bki9.isEmpty() && bki8.sameItem(bki9) && ItemStack.tagMatches(bki8, bki9)) {
                     if (integer3 == 0) {
                         if (boolean6) {
-                            ben8.setCount(ben8.getMaxStackSize());
+                            bki8.setCount(bki8.getMaxStackSize());
                         }
-                        else if (ben8.getCount() < ben8.getMaxStackSize()) {
-                            ben8.grow(1);
+                        else if (bki8.getCount() < bki8.getMaxStackSize()) {
+                            bki8.grow(1);
                         }
                     }
                     else {
-                        ben8.shrink(1);
+                        bki8.shrink(1);
                     }
                 }
-                else if (ben9.isEmpty() || !ben8.isEmpty()) {
+                else if (bki9.isEmpty() || !bki8.isEmpty()) {
                     if (integer3 == 0) {
-                        ayi7.setCarried(ItemStack.EMPTY);
+                        beb7.setCarried(ItemStack.EMPTY);
                     }
                     else {
-                        ayi7.getCarried().shrink(1);
+                        beb7.getCarried().shrink(1);
                     }
                 }
                 else {
-                    ayi7.setCarried(ben9.copy());
-                    ben8 = ayi7.getCarried();
+                    beb7.setCarried(bki9.copy());
+                    bki8 = beb7.getCarried();
                     if (boolean6) {
-                        ben8.setCount(ben8.getMaxStackSize());
+                        bki8.setCount(bki8.getMaxStackSize());
                     }
                 }
             }
             else if (this.menu != null) {
-                final ItemStack ben7 = (bca == null) ? ItemStack.EMPTY : ((ItemPickerMenu)this.menu).getSlot(bca.index).getItem();
-                ((ItemPickerMenu)this.menu).clicked((bca == null) ? integer2 : bca.index, integer3, bav, this.minecraft.player);
+                final ItemStack bki7 = (bhw == null) ? ItemStack.EMPTY : ((ItemPickerMenu)this.menu).getSlot(bhw.index).getItem();
+                ((ItemPickerMenu)this.menu).clicked((bhw == null) ? integer2 : bhw.index, integer3, bgq, this.minecraft.player);
                 if (AbstractContainerMenu.getQuickcraftHeader(integer3) == 2) {
                     for (int integer5 = 0; integer5 < 9; ++integer5) {
                         this.minecraft.gameMode.handleCreativeModeItemAdd(((ItemPickerMenu)this.menu).getSlot(45 + integer5).getItem(), 36 + integer5);
                     }
                 }
-                else if (bca != null) {
-                    final ItemStack ben8 = ((ItemPickerMenu)this.menu).getSlot(bca.index).getItem();
-                    this.minecraft.gameMode.handleCreativeModeItemAdd(ben8, bca.index - ((ItemPickerMenu)this.menu).slots.size() + 9 + 36);
+                else if (bhw != null) {
+                    final ItemStack bki8 = ((ItemPickerMenu)this.menu).getSlot(bhw.index).getItem();
+                    this.minecraft.gameMode.handleCreativeModeItemAdd(bki8, bhw.index - ((ItemPickerMenu)this.menu).slots.size() + 9 + 36);
                     final int integer6 = 45 + integer3;
-                    if (bav == ClickType.SWAP) {
-                        this.minecraft.gameMode.handleCreativeModeItemAdd(ben7, integer6 - ((ItemPickerMenu)this.menu).slots.size() + 9 + 36);
+                    if (bgq == ClickType.SWAP) {
+                        this.minecraft.gameMode.handleCreativeModeItemAdd(bki7, integer6 - ((ItemPickerMenu)this.menu).slots.size() + 9 + 36);
                     }
-                    else if (bav == ClickType.THROW && !ben7.isEmpty()) {
-                        final ItemStack ben10 = ben7.copy();
-                        ben10.setCount((integer3 == 0) ? 1 : ben10.getMaxStackSize());
-                        this.minecraft.player.drop(ben10, true);
-                        this.minecraft.gameMode.handleCreativeModeItemDrop(ben10);
+                    else if (bgq == ClickType.THROW && !bki7.isEmpty()) {
+                        final ItemStack bki10 = bki7.copy();
+                        bki10.setCount((integer3 == 0) ? 1 : bki10.getMaxStackSize());
+                        this.minecraft.player.drop(bki10, true);
+                        this.minecraft.gameMode.handleCreativeModeItemDrop(bki10);
                     }
                     this.minecraft.player.inventoryMenu.broadcastChanges();
                 }
             }
         }
         else {
-            final Inventory ayi7 = this.minecraft.player.inventory;
-            if (!ayi7.getCarried().isEmpty() && this.hasClickedOutside) {
+            final Inventory beb7 = this.minecraft.player.inventory;
+            if (!beb7.getCarried().isEmpty() && this.hasClickedOutside) {
                 if (integer3 == 0) {
-                    this.minecraft.player.drop(ayi7.getCarried(), true);
-                    this.minecraft.gameMode.handleCreativeModeItemDrop(ayi7.getCarried());
-                    ayi7.setCarried(ItemStack.EMPTY);
+                    this.minecraft.player.drop(beb7.getCarried(), true);
+                    this.minecraft.gameMode.handleCreativeModeItemDrop(beb7.getCarried());
+                    beb7.setCarried(ItemStack.EMPTY);
                 }
                 if (integer3 == 1) {
-                    final ItemStack ben8 = ayi7.getCarried().split(1);
-                    this.minecraft.player.drop(ben8, true);
-                    this.minecraft.gameMode.handleCreativeModeItemDrop(ben8);
+                    final ItemStack bki8 = beb7.getCarried().split(1);
+                    this.minecraft.player.drop(bki8, true);
+                    this.minecraft.gameMode.handleCreativeModeItemDrop(bki8);
                 }
             }
         }
     }
     
-    private boolean isCreativeSlot(@Nullable final Slot bca) {
-        return bca != null && bca.container == CreativeModeInventoryScreen.CONTAINER;
+    private boolean isCreativeSlot(@Nullable final Slot bhw) {
+        return bhw != null && bhw.container == CreativeModeInventoryScreen.CONTAINER;
     }
     
     @Override
@@ -250,7 +254,7 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
             final int integer4 = this.topPos + 6;
             final int integer5 = 80;
             this.font.getClass();
-            (this.searchBox = new EditBox(font, integer3, integer4, integer5, 9, I18n.get("itemGroup.search"))).setMaxLength(50);
+            (this.searchBox = new EditBox(font, integer3, integer4, integer5, 9, new TranslatableComponent("itemGroup.search"))).setMaxLength(50);
             this.searchBox.setBordered(false);
             this.searchBox.setVisible(false);
             this.searchBox.setTextColor(16777215);
@@ -268,9 +272,9 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
     }
     
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
         final String string5 = this.searchBox.getValue();
-        this.init(dbn, integer2, integer3);
+        this.init(dlx, integer2, integer3);
         this.searchBox.setValue(string5);
         if (!this.searchBox.getValue().isEmpty()) {
             this.refreshSearchResults();
@@ -316,13 +320,14 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
             return super.keyPressed(integer1, integer2, integer3);
         }
         else {
-            final boolean boolean5 = !this.isCreativeSlot(this.hoveredSlot) || (this.hoveredSlot != null && this.hoveredSlot.hasItem());
-            if (boolean5 && this.checkNumkeyPressed(integer1, integer2)) {
+            final boolean boolean5 = !this.isCreativeSlot(this.hoveredSlot) || this.hoveredSlot.hasItem();
+            final boolean boolean6 = InputConstants.getKey(integer1, integer2).getNumericKeyValue().isPresent();
+            if (boolean5 && boolean6 && this.checkHotbarKeyPressed(integer1, integer2)) {
                 return this.ignoreTextInput = true;
             }
-            final String string6 = this.searchBox.getValue();
+            final String string7 = this.searchBox.getValue();
             if (this.searchBox.keyPressed(integer1, integer2, integer3)) {
-                if (!Objects.equals(string6, this.searchBox.getValue())) {
+                if (!Objects.equals(string7, this.searchBox.getValue())) {
                     this.refreshSearchResults();
                 }
                 return true;
@@ -342,21 +347,21 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
         this.visibleTags.clear();
         String string2 = this.searchBox.getValue();
         if (string2.isEmpty()) {
-            for (final Item bei4 : Registry.ITEM) {
-                bei4.fillItemCategory(CreativeModeTab.TAB_SEARCH, ((ItemPickerMenu)this.menu).items);
+            for (final Item bke4 : Registry.ITEM) {
+                bke4.fillItemCategory(CreativeModeTab.TAB_SEARCH, ((ItemPickerMenu)this.menu).items);
             }
         }
         else {
-            SearchTree<ItemStack> edi3;
+            SearchTree<ItemStack> eov3;
             if (string2.startsWith("#")) {
                 string2 = string2.substring(1);
-                edi3 = this.minecraft.<ItemStack>getSearchTree(SearchRegistry.CREATIVE_TAGS);
+                eov3 = this.minecraft.<ItemStack>getSearchTree(SearchRegistry.CREATIVE_TAGS);
                 this.updateVisibleTags(string2);
             }
             else {
-                edi3 = this.minecraft.<ItemStack>getSearchTree(SearchRegistry.CREATIVE_NAMES);
+                eov3 = this.minecraft.<ItemStack>getSearchTree(SearchRegistry.CREATIVE_NAMES);
             }
-            ((ItemPickerMenu)this.menu).items.addAll(edi3.search(string2.toLowerCase(Locale.ROOT)));
+            ((ItemPickerMenu)this.menu).items.addAll(eov3.search(string2.toLowerCase(Locale.ROOT)));
         }
         this.scrollOffs = 0.0f;
         ((ItemPickerMenu)this.menu).scrollTo(0.0f);
@@ -366,26 +371,26 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
         final int integer3 = string.indexOf(58);
         Predicate<ResourceLocation> predicate4;
         if (integer3 == -1) {
-            predicate4 = (sm -> sm.getPath().contains(string));
+            predicate4 = (uh -> uh.getPath().contains(string));
         }
         else {
             final String string2 = string.substring(0, integer3).trim();
             final String string3 = string.substring(integer3 + 1).trim();
             final CharSequence s;
             final CharSequence s2;
-            predicate4 = (sm -> sm.getNamespace().contains(s) && sm.getPath().contains(s2));
+            predicate4 = (uh -> uh.getNamespace().contains(s) && uh.getPath().contains(s2));
         }
-        final TagCollection<Item> aba5 = ItemTags.getAllTags();
+        final TagCollection<Item> adg5 = ItemTags.getAllTags();
         final Tag<Item> tag;
-        aba5.getAvailableTags().stream().filter(predicate4).forEach(sm -> tag = this.visibleTags.put(sm, aba5.getTag(sm)));
+        adg5.getAvailableTags().stream().filter(predicate4).forEach(uh -> tag = this.visibleTags.put(uh, adg5.getTag(uh)));
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        final CreativeModeTab bdd4 = CreativeModeTab.TABS[CreativeModeInventoryScreen.selectedTab];
-        if (bdd4.showTitle()) {
+    protected void renderLabels(final PoseStack dhl, final int integer2, final int integer3) {
+        final CreativeModeTab biy5 = CreativeModeTab.TABS[CreativeModeInventoryScreen.selectedTab];
+        if (biy5.showTitle()) {
             RenderSystem.disableBlend();
-            this.font.draw(I18n.get(bdd4.getName()), 8.0f, 6.0f, 4210752);
+            this.font.draw(dhl, I18n.get(biy5.getName()), 8.0f, 6.0f, 4210752);
         }
     }
     
@@ -394,8 +399,8 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
         if (integer == 0) {
             final double double3 = double1 - this.leftPos;
             final double double4 = double2 - this.topPos;
-            for (final CreativeModeTab bdd14 : CreativeModeTab.TABS) {
-                if (this.checkTabClicked(bdd14, double3, double4)) {
+            for (final CreativeModeTab biy14 : CreativeModeTab.TABS) {
+                if (this.checkTabClicked(biy14, double3, double4)) {
                     return true;
                 }
             }
@@ -413,9 +418,9 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
             final double double3 = double1 - this.leftPos;
             final double double4 = double2 - this.topPos;
             this.scrolling = false;
-            for (final CreativeModeTab bdd14 : CreativeModeTab.TABS) {
-                if (this.checkTabClicked(bdd14, double3, double4)) {
-                    this.selectTab(bdd14);
+            for (final CreativeModeTab biy14 : CreativeModeTab.TABS) {
+                if (this.checkTabClicked(biy14, double3, double4)) {
+                    this.selectTab(biy14);
                     return true;
                 }
             }
@@ -427,24 +432,24 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
         return CreativeModeInventoryScreen.selectedTab != CreativeModeTab.TAB_INVENTORY.getId() && CreativeModeTab.TABS[CreativeModeInventoryScreen.selectedTab].canScroll() && ((ItemPickerMenu)this.menu).canScroll();
     }
     
-    private void selectTab(final CreativeModeTab bdd) {
+    private void selectTab(final CreativeModeTab biy) {
         final int integer3 = CreativeModeInventoryScreen.selectedTab;
-        CreativeModeInventoryScreen.selectedTab = bdd.getId();
+        CreativeModeInventoryScreen.selectedTab = biy.getId();
         this.quickCraftSlots.clear();
         ((ItemPickerMenu)this.menu).items.clear();
-        if (bdd == CreativeModeTab.TAB_HOTBAR) {
-            final HotbarManager dbj4 = this.minecraft.getHotbarManager();
+        if (biy == CreativeModeTab.TAB_HOTBAR) {
+            final HotbarManager dlt4 = this.minecraft.getHotbarManager();
             for (int integer4 = 0; integer4 < 9; ++integer4) {
-                final Hotbar dqd6 = dbj4.get(integer4);
-                if (dqd6.isEmpty()) {
+                final Hotbar ebh6 = dlt4.get(integer4);
+                if (ebh6.isEmpty()) {
                     for (int integer5 = 0; integer5 < 9; ++integer5) {
                         if (integer5 == integer4) {
-                            final ItemStack ben8 = new ItemStack(Items.PAPER);
-                            ben8.getOrCreateTagElement("CustomCreativeLock");
-                            final String string9 = this.minecraft.options.keyHotbarSlots[integer4].getTranslatedKeyMessage();
-                            final String string10 = this.minecraft.options.keySaveHotbarActivator.getTranslatedKeyMessage();
-                            ben8.setHoverName(new TranslatableComponent("inventory.hotbarInfo", new Object[] { string10, string9 }));
-                            ((ItemPickerMenu)this.menu).items.add(ben8);
+                            final ItemStack bki8 = new ItemStack(Items.PAPER);
+                            bki8.getOrCreateTagElement("CustomCreativeLock");
+                            final Component mr9 = this.minecraft.options.keyHotbarSlots[integer4].getTranslatedKeyMessage();
+                            final Component mr10 = this.minecraft.options.keySaveHotbarActivator.getTranslatedKeyMessage();
+                            bki8.setHoverName(new TranslatableComponent("inventory.hotbarInfo", new Object[] { mr10, mr9 }));
+                            ((ItemPickerMenu)this.menu).items.add(bki8);
                         }
                         else {
                             ((ItemPickerMenu)this.menu).items.add(ItemStack.EMPTY);
@@ -452,20 +457,20 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
                     }
                 }
                 else {
-                    ((ItemPickerMenu)this.menu).items.addAll(dqd6);
+                    ((ItemPickerMenu)this.menu).items.addAll(ebh6);
                 }
             }
         }
-        else if (bdd != CreativeModeTab.TAB_SEARCH) {
-            bdd.fillItemList(((ItemPickerMenu)this.menu).items);
+        else if (biy != CreativeModeTab.TAB_SEARCH) {
+            biy.fillItemList(((ItemPickerMenu)this.menu).items);
         }
-        if (bdd == CreativeModeTab.TAB_INVENTORY) {
-            final AbstractContainerMenu ban4 = this.minecraft.player.inventoryMenu;
+        if (biy == CreativeModeTab.TAB_INVENTORY) {
+            final AbstractContainerMenu bgi4 = this.minecraft.player.inventoryMenu;
             if (this.originalSlots == null) {
                 this.originalSlots = ImmutableList.copyOf(((ItemPickerMenu)this.menu).slots);
             }
             ((ItemPickerMenu)this.menu).slots.clear();
-            for (int integer4 = 0; integer4 < ban4.slots.size(); ++integer4) {
+            for (int integer4 = 0; integer4 < bgi4.slots.size(); ++integer4) {
                 int integer5;
                 int integer9;
                 if (integer4 >= 5 && integer4 < 9) {
@@ -495,8 +500,8 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
                         integer5 = 54 + integer8 * 18;
                     }
                 }
-                final Slot bca8 = new SlotWrapper(ban4.slots.get(integer4), integer4, integer9, integer5);
-                ((ItemPickerMenu)this.menu).slots.add(bca8);
+                final Slot bhw8 = new SlotWrapper(bgi4.slots.get(integer4), integer4, integer9, integer5);
+                ((ItemPickerMenu)this.menu).slots.add(bhw8);
             }
             this.destroyItemSlot = new Slot(CreativeModeInventoryScreen.CONTAINER, 0, 173, 112);
             ((ItemPickerMenu)this.menu).slots.add(this.destroyItemSlot);
@@ -507,11 +512,11 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
             this.originalSlots = null;
         }
         if (this.searchBox != null) {
-            if (bdd == CreativeModeTab.TAB_SEARCH) {
+            if (biy == CreativeModeTab.TAB_SEARCH) {
                 this.searchBox.setVisible(true);
                 this.searchBox.setCanLoseFocus(false);
                 this.searchBox.setFocus(true);
-                if (integer3 != bdd.getId()) {
+                if (integer3 != biy.getId()) {
                     this.searchBox.setValue("");
                 }
                 this.refreshSearchResults();
@@ -569,107 +574,99 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
-        for (final CreativeModeTab bdd8 : CreativeModeTab.TABS) {
-            if (this.checkTabHovering(bdd8, integer1, integer2)) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        for (final CreativeModeTab biy9 : CreativeModeTab.TABS) {
+            if (this.checkTabHovering(dhl, biy9, integer2, integer3)) {
                 break;
             }
         }
-        if (this.destroyItemSlot != null && CreativeModeInventoryScreen.selectedTab == CreativeModeTab.TAB_INVENTORY.getId() && this.isHovering(this.destroyItemSlot.x, this.destroyItemSlot.y, 16, 16, integer1, integer2)) {
-            this.renderTooltip(I18n.get("inventory.binSlot"), integer1, integer2);
+        if (this.destroyItemSlot != null && CreativeModeInventoryScreen.selectedTab == CreativeModeTab.TAB_INVENTORY.getId() && this.isHovering(this.destroyItemSlot.x, this.destroyItemSlot.y, 16, 16, integer2, integer3)) {
+            this.renderTooltip(dhl, new TranslatableComponent("inventory.binSlot"), integer2, integer3);
         }
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        this.renderTooltip(integer1, integer2);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     @Override
-    protected void renderTooltip(final ItemStack ben, final int integer2, final int integer3) {
+    protected void renderTooltip(final PoseStack dhl, final ItemStack bki, final int integer3, final int integer4) {
         if (CreativeModeInventoryScreen.selectedTab == CreativeModeTab.TAB_SEARCH.getId()) {
-            final List<Component> list5 = ben.getTooltipLines(this.minecraft.player, this.minecraft.options.advancedItemTooltips ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL);
-            final List<String> list6 = Lists.newArrayListWithCapacity(list5.size());
-            for (final Component lf8 : list5) {
-                list6.add(lf8.getColoredString());
-            }
-            final Item bei7 = ben.getItem();
-            CreativeModeTab bdd8 = bei7.getItemCategory();
-            if (bdd8 == null && bei7 == Items.ENCHANTED_BOOK) {
-                final Map<Enchantment, Integer> map9 = EnchantmentHelper.getEnchantments(ben);
-                if (map9.size() == 1) {
-                    final Enchantment bhx10 = map9.keySet().iterator().next();
-                    for (final CreativeModeTab bdd9 : CreativeModeTab.TABS) {
-                        if (bdd9.hasEnchantmentCategory(bhx10.category)) {
-                            bdd8 = bdd9;
+            final List<Component> list6 = bki.getTooltipLines(this.minecraft.player, this.minecraft.options.advancedItemTooltips ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL);
+            final List<Component> list7 = Lists.newArrayList(list6);
+            final Item bke8 = bki.getItem();
+            CreativeModeTab biy9 = bke8.getItemCategory();
+            if (biy9 == null && bke8 == Items.ENCHANTED_BOOK) {
+                final Map<Enchantment, Integer> map10 = EnchantmentHelper.getEnchantments(bki);
+                if (map10.size() == 1) {
+                    final Enchantment bnw11 = map10.keySet().iterator().next();
+                    for (final CreativeModeTab biy10 : CreativeModeTab.TABS) {
+                        if (biy10.hasEnchantmentCategory(bnw11.category)) {
+                            biy9 = biy10;
                             break;
                         }
                     }
                 }
             }
             final Item object;
-            final List<String> list7;
-            this.visibleTags.forEach((sm, aaz) -> {
-                if (aaz.contains(object)) {
-                    list7.add(1, "" + ChatFormatting.BOLD + ChatFormatting.DARK_PURPLE + "#" + sm);
+            final TextComponent textComponent;
+            final List<MutableComponent> list8;
+            final int n;
+            this.visibleTags.forEach((uh, adf) -> {
+                if (adf.contains(object)) {
+                    new TextComponent("#" + uh);
+                    list8.add(n, textComponent.withStyle(ChatFormatting.DARK_PURPLE));
                 }
                 return;
             });
-            if (bdd8 != null) {
-                list6.add(1, "" + ChatFormatting.BOLD + ChatFormatting.BLUE + I18n.get(bdd8.getName()));
+            if (biy9 != null) {
+                list7.add(1, new TranslatableComponent(biy9.getName()).withStyle(ChatFormatting.BLUE));
             }
-            for (int integer4 = 0; integer4 < list6.size(); ++integer4) {
-                if (integer4 == 0) {
-                    list6.set(integer4, ben.getRarity().color + list6.get(integer4));
-                }
-                else {
-                    list6.set(integer4, ChatFormatting.GRAY + list6.get(integer4));
-                }
-            }
-            this.renderTooltip(list6, integer2, integer3);
+            this.renderTooltip(dhl, list7, integer3, integer4);
         }
         else {
-            super.renderTooltip(ben, integer2, integer3);
+            super.renderTooltip(dhl, bki, integer3, integer4);
         }
     }
     
     @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        final CreativeModeTab bdd5 = CreativeModeTab.TABS[CreativeModeInventoryScreen.selectedTab];
-        for (final CreativeModeTab bdd6 : CreativeModeTab.TABS) {
+        final CreativeModeTab biy6 = CreativeModeTab.TABS[CreativeModeInventoryScreen.selectedTab];
+        for (final CreativeModeTab biy7 : CreativeModeTab.TABS) {
             this.minecraft.getTextureManager().bind(CreativeModeInventoryScreen.CREATIVE_TABS_LOCATION);
-            if (bdd6.getId() != CreativeModeInventoryScreen.selectedTab) {
-                this.renderTabButton(bdd6);
+            if (biy7.getId() != CreativeModeInventoryScreen.selectedTab) {
+                this.renderTabButton(dhl, biy7);
             }
         }
-        this.minecraft.getTextureManager().bind(new ResourceLocation("textures/gui/container/creative_inventory/tab_" + bdd5.getBackgroundSuffix()));
-        this.blit(this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
-        this.searchBox.render(integer2, integer3, float1);
+        this.minecraft.getTextureManager().bind(new ResourceLocation("textures/gui/container/creative_inventory/tab_" + biy6.getBackgroundSuffix()));
+        this.blit(dhl, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
+        this.searchBox.render(dhl, integer3, integer4, float2);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        final int integer4 = this.leftPos + 175;
-        final int integer5 = this.topPos + 18;
-        final int integer6 = integer5 + 112;
+        final int integer5 = this.leftPos + 175;
+        final int integer6 = this.topPos + 18;
+        final int integer7 = integer6 + 112;
         this.minecraft.getTextureManager().bind(CreativeModeInventoryScreen.CREATIVE_TABS_LOCATION);
-        if (bdd5.canScroll()) {
-            this.blit(integer4, integer5 + (int)((integer6 - integer5 - 17) * this.scrollOffs), 232 + (this.canScroll() ? 0 : 12), 0, 12, 15);
+        if (biy6.canScroll()) {
+            this.blit(dhl, integer5, integer6 + (int)((integer7 - integer6 - 17) * this.scrollOffs), 232 + (this.canScroll() ? 0 : 12), 0, 12, 15);
         }
-        this.renderTabButton(bdd5);
-        if (bdd5 == CreativeModeTab.TAB_INVENTORY) {
-            InventoryScreen.renderEntityInInventory(this.leftPos + 88, this.topPos + 45, 20, (float)(this.leftPos + 88 - integer2), (float)(this.topPos + 45 - 30 - integer3), this.minecraft.player);
+        this.renderTabButton(dhl, biy6);
+        if (biy6 == CreativeModeTab.TAB_INVENTORY) {
+            InventoryScreen.renderEntityInInventory(this.leftPos + 88, this.topPos + 45, 20, (float)(this.leftPos + 88 - integer3), (float)(this.topPos + 45 - 30 - integer4), this.minecraft.player);
         }
     }
     
-    protected boolean checkTabClicked(final CreativeModeTab bdd, final double double2, final double double3) {
-        final int integer7 = bdd.getColumn();
+    protected boolean checkTabClicked(final CreativeModeTab biy, final double double2, final double double3) {
+        final int integer7 = biy.getColumn();
         int integer8 = 28 * integer7;
         int integer9 = 0;
-        if (bdd.isAlignedRight()) {
+        if (biy.isAlignedRight()) {
             integer8 = this.imageWidth - 28 * (6 - integer7) + 2;
         }
         else if (integer7 > 0) {
             integer8 += integer7;
         }
-        if (bdd.isTopRow()) {
+        if (biy.isTopRow()) {
             integer9 -= 32;
         }
         else {
@@ -678,91 +675,89 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
         return double2 >= integer8 && double2 <= integer8 + 28 && double3 >= integer9 && double3 <= integer9 + 32;
     }
     
-    protected boolean checkTabHovering(final CreativeModeTab bdd, final int integer2, final int integer3) {
-        final int integer4 = bdd.getColumn();
-        int integer5 = 28 * integer4;
-        int integer6 = 0;
-        if (bdd.isAlignedRight()) {
-            integer5 = this.imageWidth - 28 * (6 - integer4) + 2;
+    protected boolean checkTabHovering(final PoseStack dhl, final CreativeModeTab biy, final int integer3, final int integer4) {
+        final int integer5 = biy.getColumn();
+        int integer6 = 28 * integer5;
+        int integer7 = 0;
+        if (biy.isAlignedRight()) {
+            integer6 = this.imageWidth - 28 * (6 - integer5) + 2;
         }
-        else if (integer4 > 0) {
-            integer5 += integer4;
+        else if (integer5 > 0) {
+            integer6 += integer5;
         }
-        if (bdd.isTopRow()) {
-            integer6 -= 32;
+        if (biy.isTopRow()) {
+            integer7 -= 32;
         }
         else {
-            integer6 += this.imageHeight;
+            integer7 += this.imageHeight;
         }
-        if (this.isHovering(integer5 + 3, integer6 + 3, 23, 27, integer2, integer3)) {
-            this.renderTooltip(I18n.get(bdd.getName()), integer2, integer3);
+        if (this.isHovering(integer6 + 3, integer7 + 3, 23, 27, integer3, integer4)) {
+            this.renderTooltip(dhl, new TranslatableComponent(biy.getName()), integer3, integer4);
             return true;
         }
         return false;
     }
     
-    protected void renderTabButton(final CreativeModeTab bdd) {
-        final boolean boolean3 = bdd.getId() == CreativeModeInventoryScreen.selectedTab;
-        final boolean boolean4 = bdd.isTopRow();
-        final int integer5 = bdd.getColumn();
-        final int integer6 = integer5 * 28;
-        int integer7 = 0;
-        int integer8 = this.leftPos + 28 * integer5;
-        int integer9 = this.topPos;
-        final int integer10 = 32;
-        if (boolean3) {
-            integer7 += 32;
-        }
-        if (bdd.isAlignedRight()) {
-            integer8 = this.leftPos + this.imageWidth - 28 * (6 - integer5);
-        }
-        else if (integer5 > 0) {
-            integer8 += integer5;
-        }
+    protected void renderTabButton(final PoseStack dhl, final CreativeModeTab biy) {
+        final boolean boolean4 = biy.getId() == CreativeModeInventoryScreen.selectedTab;
+        final boolean boolean5 = biy.isTopRow();
+        final int integer6 = biy.getColumn();
+        final int integer7 = integer6 * 28;
+        int integer8 = 0;
+        int integer9 = this.leftPos + 28 * integer6;
+        int integer10 = this.topPos;
+        final int integer11 = 32;
         if (boolean4) {
-            integer9 -= 28;
+            integer8 += 32;
+        }
+        if (biy.isAlignedRight()) {
+            integer9 = this.leftPos + this.imageWidth - 28 * (6 - integer6);
+        }
+        else if (integer6 > 0) {
+            integer9 += integer6;
+        }
+        if (boolean5) {
+            integer10 -= 28;
         }
         else {
-            integer7 += 64;
-            integer9 += this.imageHeight - 4;
+            integer8 += 64;
+            integer10 += this.imageHeight - 4;
         }
-        this.blit(integer8, integer9, integer6, integer7, 28, 32);
-        this.setBlitOffset(100);
+        this.blit(dhl, integer9, integer10, integer7, integer8, 28, 32);
         this.itemRenderer.blitOffset = 100.0f;
-        integer8 += 6;
-        integer9 += 8 + (boolean4 ? 1 : -1);
+        integer9 += 6;
+        integer10 += 8 + (boolean5 ? 1 : -1);
         RenderSystem.enableRescaleNormal();
-        final ItemStack ben11 = bdd.getIconItem();
-        this.itemRenderer.renderAndDecorateItem(ben11, integer8, integer9);
-        this.itemRenderer.renderGuiItemDecorations(this.font, ben11, integer8, integer9);
+        final ItemStack bki12 = biy.getIconItem();
+        this.itemRenderer.renderAndDecorateItem(bki12, integer9, integer10);
+        this.itemRenderer.renderGuiItemDecorations(this.font, bki12, integer9, integer10);
         this.itemRenderer.blitOffset = 0.0f;
-        this.setBlitOffset(0);
     }
     
     public int getSelectedTab() {
         return CreativeModeInventoryScreen.selectedTab;
     }
     
-    public static void handleHotbarLoadOrSave(final Minecraft dbn, final int integer, final boolean boolean3, final boolean boolean4) {
-        final LocalPlayer dqb5 = dbn.player;
-        final HotbarManager dbj6 = dbn.getHotbarManager();
-        final Hotbar dqd7 = dbj6.get(integer);
+    public static void handleHotbarLoadOrSave(final Minecraft dlx, final int integer, final boolean boolean3, final boolean boolean4) {
+        final LocalPlayer ebf5 = dlx.player;
+        final HotbarManager dlt6 = dlx.getHotbarManager();
+        final Hotbar ebh7 = dlt6.get(integer);
         if (boolean3) {
             for (int integer2 = 0; integer2 < Inventory.getSelectionSize(); ++integer2) {
-                final ItemStack ben9 = dqd7.get(integer2).copy();
-                dqb5.inventory.setItem(integer2, ben9);
-                dbn.gameMode.handleCreativeModeItemAdd(ben9, 36 + integer2);
+                final ItemStack bki9 = ebh7.get(integer2).copy();
+                ebf5.inventory.setItem(integer2, bki9);
+                dlx.gameMode.handleCreativeModeItemAdd(bki9, 36 + integer2);
             }
-            dqb5.inventoryMenu.broadcastChanges();
+            ebf5.inventoryMenu.broadcastChanges();
         }
         else if (boolean4) {
             for (int integer2 = 0; integer2 < Inventory.getSelectionSize(); ++integer2) {
-                dqd7.set(integer2, dqb5.inventory.getItem(integer2).copy());
+                ebh7.set(integer2, ebf5.inventory.getItem(integer2).copy());
             }
-            final String string8 = dbn.options.keyHotbarSlots[integer].getTranslatedKeyMessage();
-            final String string9 = dbn.options.keyLoadHotbarActivator.getTranslatedKeyMessage();
-            dbn.gui.setOverlayMessage(new TranslatableComponent("inventory.hotbarSaved", new Object[] { string9, string8 }), false);
-            dbj6.save();
+            final Component mr8 = dlx.options.keyHotbarSlots[integer].getTranslatedKeyMessage();
+            final Component mr9 = dlx.options.keyLoadHotbarActivator.getTranslatedKeyMessage();
+            dlx.gui.setOverlayMessage(new TranslatableComponent("inventory.hotbarSaved", new Object[] { mr9, mr8 }), false);
+            dlt6.save();
         }
     }
     
@@ -775,23 +770,23 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
     public static class ItemPickerMenu extends AbstractContainerMenu {
         public final NonNullList<ItemStack> items;
         
-        public ItemPickerMenu(final Player ayj) {
+        public ItemPickerMenu(final Player bec) {
             super(null, 0);
             this.items = NonNullList.<ItemStack>create();
-            final Inventory ayi3 = ayj.inventory;
+            final Inventory beb3 = bec.inventory;
             for (int integer4 = 0; integer4 < 5; ++integer4) {
                 for (int integer5 = 0; integer5 < 9; ++integer5) {
                     this.addSlot(new CustomCreativeSlot(CreativeModeInventoryScreen.CONTAINER, integer4 * 9 + integer5, 9 + integer5 * 18, 18 + integer4 * 18));
                 }
             }
             for (int integer4 = 0; integer4 < 9; ++integer4) {
-                this.addSlot(new Slot(ayi3, integer4, 9 + integer4 * 18, 112));
+                this.addSlot(new Slot(beb3, integer4, 9 + integer4 * 18, 112));
             }
             this.scrollTo(0.0f);
         }
         
         @Override
-        public boolean stillValid(final Player ayj) {
+        public boolean stillValid(final Player bec) {
             return true;
         }
         
@@ -819,43 +814,43 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
         }
         
         @Override
-        public ItemStack quickMoveStack(final Player ayj, final int integer) {
+        public ItemStack quickMoveStack(final Player bec, final int integer) {
             if (integer >= this.slots.size() - 9 && integer < this.slots.size()) {
-                final Slot bca4 = this.slots.get(integer);
-                if (bca4 != null && bca4.hasItem()) {
-                    bca4.set(ItemStack.EMPTY);
+                final Slot bhw4 = this.slots.get(integer);
+                if (bhw4 != null && bhw4.hasItem()) {
+                    bhw4.set(ItemStack.EMPTY);
                 }
             }
             return ItemStack.EMPTY;
         }
         
         @Override
-        public boolean canTakeItemForPickAll(final ItemStack ben, final Slot bca) {
-            return bca.container != CreativeModeInventoryScreen.CONTAINER;
+        public boolean canTakeItemForPickAll(final ItemStack bki, final Slot bhw) {
+            return bhw.container != CreativeModeInventoryScreen.CONTAINER;
         }
         
         @Override
-        public boolean canDragTo(final Slot bca) {
-            return bca.container != CreativeModeInventoryScreen.CONTAINER;
+        public boolean canDragTo(final Slot bhw) {
+            return bhw.container != CreativeModeInventoryScreen.CONTAINER;
         }
     }
     
     static class SlotWrapper extends Slot {
         private final Slot target;
         
-        public SlotWrapper(final Slot bca, final int integer2, final int integer3, final int integer4) {
-            super(bca.container, integer2, integer3, integer4);
-            this.target = bca;
+        public SlotWrapper(final Slot bhw, final int integer2, final int integer3, final int integer4) {
+            super(bhw.container, integer2, integer3, integer4);
+            this.target = bhw;
         }
         
         @Override
-        public ItemStack onTake(final Player ayj, final ItemStack ben) {
-            return this.target.onTake(ayj, ben);
+        public ItemStack onTake(final Player bec, final ItemStack bki) {
+            return this.target.onTake(bec, bki);
         }
         
         @Override
-        public boolean mayPlace(final ItemStack ben) {
-            return this.target.mayPlace(ben);
+        public boolean mayPlace(final ItemStack bki) {
+            return this.target.mayPlace(bki);
         }
         
         @Override
@@ -869,8 +864,8 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
         }
         
         @Override
-        public void set(final ItemStack ben) {
-            this.target.set(ben);
+        public void set(final ItemStack bki) {
+            this.target.set(bki);
         }
         
         @Override
@@ -884,8 +879,8 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
         }
         
         @Override
-        public int getMaxStackSize(final ItemStack ben) {
-            return this.target.getMaxStackSize(ben);
+        public int getMaxStackSize(final ItemStack bki) {
+            return this.target.getMaxStackSize(bki);
         }
         
         @Nullable
@@ -905,19 +900,19 @@ public class CreativeModeInventoryScreen extends EffectRenderingInventoryScreen<
         }
         
         @Override
-        public boolean mayPickup(final Player ayj) {
-            return this.target.mayPickup(ayj);
+        public boolean mayPickup(final Player bec) {
+            return this.target.mayPickup(bec);
         }
     }
     
     static class CustomCreativeSlot extends Slot {
-        public CustomCreativeSlot(final Container aje, final int integer2, final int integer3, final int integer4) {
-            super(aje, integer2, integer3, integer4);
+        public CustomCreativeSlot(final Container amz, final int integer2, final int integer3, final int integer4) {
+            super(amz, integer2, integer3, integer4);
         }
         
         @Override
-        public boolean mayPickup(final Player ayj) {
-            if (super.mayPickup(ayj) && this.hasItem()) {
+        public boolean mayPickup(final Player bec) {
+            if (super.mayPickup(bec) && this.hasItem()) {
                 return this.getItem().getTagElement("CustomCreativeLock") == null;
             }
             return !this.hasItem();
diff --git a/src/net/minecraft/client/gui/screens/inventory/DispenserScreen.java b/src/net/minecraft/client/gui/screens/inventory/DispenserScreen.java
index dc09f58..186d903 100644
--- a/src/net/minecraft/client/gui/screens/inventory/DispenserScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/DispenserScreen.java
@@ -1,6 +1,8 @@
 package net.minecraft.client.gui.screens.inventory;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.resources.ResourceLocation;
@@ -9,31 +11,30 @@ import net.minecraft.world.inventory.DispenserMenu;
 public class DispenserScreen extends AbstractContainerScreen<DispenserMenu> {
     private static final ResourceLocation CONTAINER_LOCATION;
     
-    public DispenserScreen(final DispenserMenu bbc, final Inventory ayi, final Component lf) {
-        super(bbc, ayi, lf);
+    public DispenserScreen(final DispenserMenu bgx, final Inventory beb, final Component mr) {
+        super(bgx, beb, mr);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
+    protected void init() {
+        super.init();
+        this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2;
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        final String string4 = this.title.getColoredString();
-        this.font.draw(string4, (float)(this.imageWidth / 2 - this.font.width(string4) / 2), 6.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(DispenserScreen.CONTAINER_LOCATION);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java b/src/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
index a45865d..446767f 100644
--- a/src/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
@@ -11,6 +11,7 @@ import java.util.Collection;
 import net.minecraft.world.effect.MobEffectInstance;
 import com.google.common.collect.Ordering;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -18,8 +19,8 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
 public abstract class EffectRenderingInventoryScreen<T extends AbstractContainerMenu> extends AbstractContainerScreen<T> {
     protected boolean doRenderEffects;
     
-    public EffectRenderingInventoryScreen(final T ban, final Inventory ayi, final Component lf) {
-        super(ban, ayi, lf);
+    public EffectRenderingInventoryScreen(final T bgi, final Inventory beb, final Component mr) {
+        super(bgi, beb, mr);
     }
     
     @Override
@@ -40,63 +41,63 @@ public abstract class EffectRenderingInventoryScreen<T extends AbstractContainer
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        super.render(dhl, integer2, integer3, float4);
         if (this.doRenderEffects) {
-            this.renderEffects();
+            this.renderEffects(dhl);
         }
     }
     
-    private void renderEffects() {
-        final int integer2 = this.leftPos - 124;
-        final Collection<MobEffectInstance> collection3 = this.minecraft.player.getActiveEffects();
-        if (collection3.isEmpty()) {
+    private void renderEffects(final PoseStack dhl) {
+        final int integer3 = this.leftPos - 124;
+        final Collection<MobEffectInstance> collection4 = this.minecraft.player.getActiveEffects();
+        if (collection4.isEmpty()) {
             return;
         }
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        int integer3 = 33;
-        if (collection3.size() > 5) {
-            integer3 = 132 / (collection3.size() - 1);
+        int integer4 = 33;
+        if (collection4.size() > 5) {
+            integer4 = 132 / (collection4.size() - 1);
         }
-        final Iterable<MobEffectInstance> iterable5 = Ordering.<Comparable>natural().<MobEffectInstance>sortedCopy(collection3);
-        this.renderBackgrounds(integer2, integer3, iterable5);
-        this.renderIcons(integer2, integer3, iterable5);
-        this.renderLabels(integer2, integer3, iterable5);
+        final Iterable<MobEffectInstance> iterable6 = Ordering.<Comparable>natural().<MobEffectInstance>sortedCopy(collection4);
+        this.renderBackgrounds(dhl, integer3, integer4, iterable6);
+        this.renderIcons(dhl, integer3, integer4, iterable6);
+        this.renderLabels(dhl, integer3, integer4, iterable6);
     }
     
-    private void renderBackgrounds(final int integer1, final int integer2, final Iterable<MobEffectInstance> iterable) {
+    private void renderBackgrounds(final PoseStack dhl, final int integer2, final int integer3, final Iterable<MobEffectInstance> iterable) {
         this.minecraft.getTextureManager().bind(EffectRenderingInventoryScreen.INVENTORY_LOCATION);
-        int integer3 = this.topPos;
-        for (final MobEffectInstance akk7 : iterable) {
+        int integer4 = this.topPos;
+        for (final MobEffectInstance aog8 : iterable) {
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            this.blit(integer1, integer3, 0, 166, 140, 32);
-            integer3 += integer2;
+            this.blit(dhl, integer2, integer4, 0, 166, 140, 32);
+            integer4 += integer3;
         }
     }
     
-    private void renderIcons(final int integer1, final int integer2, final Iterable<MobEffectInstance> iterable) {
-        final MobEffectTextureManager eaw5 = this.minecraft.getMobEffectTextures();
-        int integer3 = this.topPos;
-        for (final MobEffectInstance akk8 : iterable) {
-            final MobEffect aki9 = akk8.getEffect();
-            final TextureAtlasSprite eaj10 = eaw5.get(aki9);
-            this.minecraft.getTextureManager().bind(eaj10.atlas().location());
-            GuiComponent.blit(integer1 + 6, integer3 + 7, this.getBlitOffset(), 18, 18, eaj10);
-            integer3 += integer2;
+    private void renderIcons(final PoseStack dhl, final int integer2, final int integer3, final Iterable<MobEffectInstance> iterable) {
+        final MobEffectTextureManager emi6 = this.minecraft.getMobEffectTextures();
+        int integer4 = this.topPos;
+        for (final MobEffectInstance aog9 : iterable) {
+            final MobEffect aoe10 = aog9.getEffect();
+            final TextureAtlasSprite elv11 = emi6.get(aoe10);
+            this.minecraft.getTextureManager().bind(elv11.atlas().location());
+            GuiComponent.blit(dhl, integer2 + 6, integer4 + 7, this.getBlitOffset(), 18, 18, elv11);
+            integer4 += integer3;
         }
     }
     
-    private void renderLabels(final int integer1, final int integer2, final Iterable<MobEffectInstance> iterable) {
-        int integer3 = this.topPos;
-        for (final MobEffectInstance akk7 : iterable) {
-            String string8 = I18n.get(akk7.getEffect().getDescriptionId());
-            if (akk7.getAmplifier() >= 1 && akk7.getAmplifier() <= 9) {
-                string8 = string8 + ' ' + I18n.get("enchantment.level." + (akk7.getAmplifier() + 1));
+    private void renderLabels(final PoseStack dhl, final int integer2, final int integer3, final Iterable<MobEffectInstance> iterable) {
+        int integer4 = this.topPos;
+        for (final MobEffectInstance aog8 : iterable) {
+            String string9 = I18n.get(aog8.getEffect().getDescriptionId());
+            if (aog8.getAmplifier() >= 1 && aog8.getAmplifier() <= 9) {
+                string9 = string9 + ' ' + I18n.get("enchantment.level." + (aog8.getAmplifier() + 1));
             }
-            this.font.drawShadow(string8, (float)(integer1 + 10 + 18), (float)(integer3 + 6), 16777215);
-            final String string9 = MobEffectUtil.formatDuration(akk7, 1.0f);
-            this.font.drawShadow(string9, (float)(integer1 + 10 + 18), (float)(integer3 + 6 + 10), 8355711);
-            integer3 += integer2;
+            this.font.drawShadow(dhl, string9, (float)(integer2 + 10 + 18), (float)(integer4 + 6), 16777215);
+            final String string10 = MobEffectUtil.formatDuration(aog8, 1.0f);
+            this.font.drawShadow(dhl, string10, (float)(integer2 + 10 + 18), (float)(integer4 + 6 + 10), 8355711);
+            integer4 += integer3;
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/EnchantmentNames.java b/src/net/minecraft/client/gui/screens/inventory/EnchantmentNames.java
index 9aefd45..8536424 100644
--- a/src/net/minecraft/client/gui/screens/inventory/EnchantmentNames.java
+++ b/src/net/minecraft/client/gui/screens/inventory/EnchantmentNames.java
@@ -1,35 +1,38 @@
 package net.minecraft.client.gui.screens.inventory;
 
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.Util;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.client.gui.Font;
 import java.util.Random;
+import net.minecraft.network.chat.Style;
+import net.minecraft.resources.ResourceLocation;
 
 public class EnchantmentNames {
+    private static final ResourceLocation ALT_FONT;
+    private static final Style ROOT_STYLE;
     private static final EnchantmentNames INSTANCE;
     private final Random random;
     private final String[] words;
     
     private EnchantmentNames() {
         this.random = new Random();
-        this.words = "the elder scrolls klaatu berata niktu xyzzy bless curse light darkness fire air earth water hot dry cold wet ignite snuff embiggen twist shorten stretch fiddle destroy imbue galvanize enchant free limited range of towards inside sphere cube self other ball mental physical grow shrink demon elemental spirit animal creature beast humanoid undead fresh stale phnglui mglwnafh cthulhu rlyeh wgahnagl fhtagnbaguette".split(" ");
+        this.words = new String[] { "the", "elder", "scrolls", "klaatu", "berata", "niktu", "xyzzy", "bless", "curse", "light", "darkness", "fire", "air", "earth", "water", "hot", "dry", "cold", "wet", "ignite", "snuff", "embiggen", "twist", "shorten", "stretch", "fiddle", "destroy", "imbue", "galvanize", "enchant", "free", "limited", "range", "of", "towards", "inside", "sphere", "cube", "self", "other", "ball", "mental", "physical", "grow", "shrink", "demon", "elemental", "spirit", "animal", "creature", "beast", "humanoid", "undead", "fresh", "stale", "phnglui", "mglwnafh", "cthulhu", "rlyeh", "wgahnagl", "fhtagn", "baguette" };
     }
     
     public static EnchantmentNames getInstance() {
         return EnchantmentNames.INSTANCE;
     }
     
-    public String getRandomName(final Font dch, final int integer) {
-        final int integer2 = this.random.nextInt(2) + 3;
-        String string5 = "";
-        for (int integer3 = 0; integer3 < integer2; ++integer3) {
-            if (integer3 > 0) {
-                string5 += " ";
+    public FormattedText getRandomName(final Font dmt, final int integer) {
+        final StringBuilder stringBuilder4 = new StringBuilder();
+        for (int integer2 = this.random.nextInt(2) + 3, integer3 = 0; integer3 < integer2; ++integer3) {
+            if (integer3 != 0) {
+                stringBuilder4.append(" ");
             }
-            string5 += this.words[this.random.nextInt(this.words.length)];
+            stringBuilder4.append(Util.<String>getRandom(this.words, this.random));
         }
-        final List<String> list6 = dch.split(string5, integer);
-        return StringUtils.join((Iterable)((list6.size() >= 2) ? list6.subList(0, 2) : list6), " ");
+        return dmt.getSplitter().headByWidth(new TextComponent(stringBuilder4.toString()).withStyle(EnchantmentNames.ROOT_STYLE), integer, Style.EMPTY);
     }
     
     public void initSeed(final long long1) {
@@ -37,6 +40,8 @@ public class EnchantmentNames {
     }
     
     static {
+        ALT_FONT = new ResourceLocation("minecraft", "alt");
+        ROOT_STYLE = Style.EMPTY.withFont(EnchantmentNames.ALT_FONT);
         INSTANCE = new EnchantmentNames();
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java b/src/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
index 4c8fd7d..dd9c3f9 100644
--- a/src/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
@@ -1,22 +1,23 @@
 package net.minecraft.client.gui.screens.inventory;
 
+import net.minecraft.network.chat.MutableComponent;
 import java.util.List;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.TranslatableComponent;
 import com.google.common.collect.Lists;
 import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraft.client.gui.Font;
+import net.minecraft.network.chat.FormattedText;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.Tesselator;
 import net.minecraft.util.Mth;
 import com.mojang.math.Vector3f;
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.platform.Lighting;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
@@ -40,18 +41,12 @@ public class EnchantmentScreen extends AbstractContainerScreen<EnchantmentMenu>
     public float oOpen;
     private ItemStack last;
     
-    public EnchantmentScreen(final EnchantmentMenu bbd, final Inventory ayi, final Component lf) {
-        super(bbd, ayi, lf);
+    public EnchantmentScreen(final EnchantmentMenu bgy, final Inventory beb, final Component mr) {
+        super(bgy, beb, mr);
         this.random = new Random();
         this.last = ItemStack.EMPTY;
     }
     
-    @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 12.0f, 5.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
-    }
-    
     @Override
     public void tick() {
         super.tick();
@@ -74,59 +69,58 @@ public class EnchantmentScreen extends AbstractContainerScreen<EnchantmentMenu>
     }
     
     @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         Lighting.setupForFlatItems();
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(EnchantmentScreen.ENCHANTING_TABLE_LOCATION);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
         RenderSystem.matrixMode(5889);
         RenderSystem.pushMatrix();
         RenderSystem.loadIdentity();
-        final int integer6 = (int)this.minecraft.getWindow().getGuiScale();
-        RenderSystem.viewport((this.width - 320) / 2 * integer6, (this.height - 240) / 2 * integer6, 320 * integer6, 240 * integer6);
+        final int integer7 = (int)this.minecraft.getWindow().getGuiScale();
+        RenderSystem.viewport((this.width - 320) / 2 * integer7, (this.height - 240) / 2 * integer7, 320 * integer7, 240 * integer7);
         RenderSystem.translatef(-0.34f, 0.23f, 0.0f);
         RenderSystem.multMatrix(Matrix4f.perspective(90.0, 1.3333334f, 9.0f, 80.0f));
         RenderSystem.matrixMode(5888);
-        final PoseStack cyl8 = new PoseStack();
-        cyl8.pushPose();
-        final PoseStack.Pose a9 = cyl8.last();
+        dhl.pushPose();
+        final PoseStack.Pose a9 = dhl.last();
         a9.pose().setIdentity();
         a9.normal().setIdentity();
-        cyl8.translate(0.0, 3.299999952316284, 1984.0);
-        final float float2 = 5.0f;
-        cyl8.scale(5.0f, 5.0f, 5.0f);
-        cyl8.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
-        cyl8.mulPose(Vector3f.XP.rotationDegrees(20.0f));
-        final float float3 = Mth.lerp(float1, this.oOpen, this.open);
-        cyl8.translate((1.0f - float3) * 0.2f, (1.0f - float3) * 0.1f, (1.0f - float3) * 0.25f);
-        final float float4 = -(1.0f - float3) * 90.0f - 90.0f;
-        cyl8.mulPose(Vector3f.YP.rotationDegrees(float4));
-        cyl8.mulPose(Vector3f.XP.rotationDegrees(180.0f));
-        float float5 = Mth.lerp(float1, this.oFlip, this.flip) + 0.25f;
-        float float6 = Mth.lerp(float1, this.oFlip, this.flip) + 0.75f;
-        float5 = (float5 - Mth.fastFloor(float5)) * 1.6f - 0.3f;
+        dhl.translate(0.0, 3.299999952316284, 1984.0);
+        final float float3 = 5.0f;
+        dhl.scale(5.0f, 5.0f, 5.0f);
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(20.0f));
+        final float float4 = Mth.lerp(float2, this.oOpen, this.open);
+        dhl.translate((1.0f - float4) * 0.2f, (1.0f - float4) * 0.1f, (1.0f - float4) * 0.25f);
+        final float float5 = -(1.0f - float4) * 90.0f - 90.0f;
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float5));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(180.0f));
+        float float6 = Mth.lerp(float2, this.oFlip, this.flip) + 0.25f;
+        float float7 = Mth.lerp(float2, this.oFlip, this.flip) + 0.75f;
         float6 = (float6 - Mth.fastFloor(float6)) * 1.6f - 0.3f;
-        if (float5 < 0.0f) {
-            float5 = 0.0f;
-        }
+        float7 = (float7 - Mth.fastFloor(float7)) * 1.6f - 0.3f;
         if (float6 < 0.0f) {
             float6 = 0.0f;
         }
-        if (float5 > 1.0f) {
-            float5 = 1.0f;
+        if (float7 < 0.0f) {
+            float7 = 0.0f;
         }
         if (float6 > 1.0f) {
             float6 = 1.0f;
         }
+        if (float7 > 1.0f) {
+            float7 = 1.0f;
+        }
         RenderSystem.enableRescaleNormal();
-        EnchantmentScreen.BOOK_MODEL.setupAnim(0.0f, float5, float6, float3);
+        EnchantmentScreen.BOOK_MODEL.setupAnim(0.0f, float6, float7, float4);
         final MultiBufferSource.BufferSource a10 = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        final VertexConsumer cyo16 = a10.getBuffer(EnchantmentScreen.BOOK_MODEL.renderType(EnchantmentScreen.ENCHANTING_BOOK_LOCATION));
-        EnchantmentScreen.BOOK_MODEL.renderToBuffer(cyl8, cyo16, 15728880, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        final VertexConsumer dhp16 = a10.getBuffer(EnchantmentScreen.BOOK_MODEL.renderType(EnchantmentScreen.ENCHANTING_BOOK_LOCATION));
+        EnchantmentScreen.BOOK_MODEL.renderToBuffer(dhl, dhp16, 15728880, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
         a10.endBatch();
-        cyl8.popPose();
+        dhl.popPose();
         RenderSystem.matrixMode(5889);
         RenderSystem.viewport(0, 0, this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight());
         RenderSystem.popMatrix();
@@ -134,99 +128,97 @@ public class EnchantmentScreen extends AbstractContainerScreen<EnchantmentMenu>
         Lighting.setupFor3DItems();
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         EnchantmentNames.getInstance().initSeed(((EnchantmentMenu)this.menu).getEnchantmentSeed());
-        final int integer7 = ((EnchantmentMenu)this.menu).getGoldCount();
-        for (int integer8 = 0; integer8 < 3; ++integer8) {
-            final int integer9 = integer4 + 60;
-            final int integer10 = integer9 + 20;
+        final int integer8 = ((EnchantmentMenu)this.menu).getGoldCount();
+        for (int integer9 = 0; integer9 < 3; ++integer9) {
+            final int integer10 = integer5 + 60;
+            final int integer11 = integer10 + 20;
             this.setBlitOffset(0);
             this.minecraft.getTextureManager().bind(EnchantmentScreen.ENCHANTING_TABLE_LOCATION);
-            final int integer11 = ((EnchantmentMenu)this.menu).costs[integer8];
+            final int integer12 = ((EnchantmentMenu)this.menu).costs[integer9];
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            if (integer11 == 0) {
-                this.blit(integer9, integer5 + 14 + 19 * integer8, 0, 185, 108, 19);
+            if (integer12 == 0) {
+                this.blit(dhl, integer10, integer6 + 14 + 19 * integer9, 0, 185, 108, 19);
             }
             else {
-                final String string22 = "" + integer11;
-                final int integer12 = 86 - this.font.width(string22);
-                final String string23 = EnchantmentNames.getInstance().getRandomName(this.font, integer12);
-                Font dch25 = this.minecraft.getFontManager().get(Minecraft.ALT_FONT);
-                int integer13 = 6839882;
-                if ((integer7 < integer8 + 1 || this.minecraft.player.experienceLevel < integer11) && !this.minecraft.player.abilities.instabuild) {
-                    this.blit(integer9, integer5 + 14 + 19 * integer8, 0, 185, 108, 19);
-                    this.blit(integer9 + 1, integer5 + 15 + 19 * integer8, 16 * integer8, 239, 16, 16);
-                    dch25.drawWordWrap(string23, integer10, integer5 + 16 + 19 * integer8, integer12, (integer13 & 0xFEFEFE) >> 1);
-                    integer13 = 4226832;
+                final String string22 = "" + integer12;
+                final int integer13 = 86 - this.font.width(string22);
+                final FormattedText mu24 = EnchantmentNames.getInstance().getRandomName(this.font, integer13);
+                int integer14 = 6839882;
+                if ((integer8 < integer9 + 1 || this.minecraft.player.experienceLevel < integer12) && !this.minecraft.player.abilities.instabuild) {
+                    this.blit(dhl, integer10, integer6 + 14 + 19 * integer9, 0, 185, 108, 19);
+                    this.blit(dhl, integer10 + 1, integer6 + 15 + 19 * integer9, 16 * integer9, 239, 16, 16);
+                    this.font.drawWordWrap(mu24, integer11, integer6 + 16 + 19 * integer9, integer13, (integer14 & 0xFEFEFE) >> 1);
+                    integer14 = 4226832;
                 }
                 else {
-                    final int integer14 = integer2 - (integer4 + 60);
-                    final int integer15 = integer3 - (integer5 + 14 + 19 * integer8);
-                    if (integer14 >= 0 && integer15 >= 0 && integer14 < 108 && integer15 < 19) {
-                        this.blit(integer9, integer5 + 14 + 19 * integer8, 0, 204, 108, 19);
-                        integer13 = 16777088;
+                    final int integer15 = integer3 - (integer5 + 60);
+                    final int integer16 = integer4 - (integer6 + 14 + 19 * integer9);
+                    if (integer15 >= 0 && integer16 >= 0 && integer15 < 108 && integer16 < 19) {
+                        this.blit(dhl, integer10, integer6 + 14 + 19 * integer9, 0, 204, 108, 19);
+                        integer14 = 16777088;
                     }
                     else {
-                        this.blit(integer9, integer5 + 14 + 19 * integer8, 0, 166, 108, 19);
+                        this.blit(dhl, integer10, integer6 + 14 + 19 * integer9, 0, 166, 108, 19);
                     }
-                    this.blit(integer9 + 1, integer5 + 15 + 19 * integer8, 16 * integer8, 223, 16, 16);
-                    dch25.drawWordWrap(string23, integer10, integer5 + 16 + 19 * integer8, integer12, integer13);
-                    integer13 = 8453920;
+                    this.blit(dhl, integer10 + 1, integer6 + 15 + 19 * integer9, 16 * integer9, 223, 16, 16);
+                    this.font.drawWordWrap(mu24, integer11, integer6 + 16 + 19 * integer9, integer13, integer14);
+                    integer14 = 8453920;
                 }
-                dch25 = this.minecraft.font;
-                dch25.drawShadow(string22, (float)(integer10 + 86 - dch25.width(string22)), (float)(integer5 + 16 + 19 * integer8 + 7), integer13);
+                this.font.drawShadow(dhl, string22, (float)(integer11 + 86 - this.font.width(string22)), (float)(integer6 + 16 + 19 * integer9 + 7), integer14);
             }
         }
     }
     
     @Override
-    public void render(final int integer1, final int integer2, float float3) {
-        float3 = this.minecraft.getFrameTime();
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
-        final boolean boolean5 = this.minecraft.player.abilities.instabuild;
-        final int integer3 = ((EnchantmentMenu)this.menu).getGoldCount();
-        for (int integer4 = 0; integer4 < 3; ++integer4) {
-            final int integer5 = ((EnchantmentMenu)this.menu).costs[integer4];
-            final Enchantment bhx9 = Enchantment.byId(((EnchantmentMenu)this.menu).enchantClue[integer4]);
-            final int integer6 = ((EnchantmentMenu)this.menu).levelClue[integer4];
-            final int integer7 = integer4 + 1;
-            if (this.isHovering(60, 14 + 19 * integer4, 108, 17, integer1, integer2) && integer5 > 0 && integer6 >= 0 && bhx9 != null) {
-                final List<String> list12 = Lists.newArrayList();
-                list12.add("" + ChatFormatting.WHITE + ChatFormatting.ITALIC + I18n.get("container.enchant.clue", bhx9.getFullname(integer6).getColoredString()));
-                if (!boolean5) {
-                    list12.add("");
-                    if (this.minecraft.player.experienceLevel < integer5) {
-                        list12.add(ChatFormatting.RED + I18n.get("container.enchant.level.requirement", ((EnchantmentMenu)this.menu).costs[integer4]));
+    public void render(final PoseStack dhl, final int integer2, final int integer3, float float4) {
+        float4 = this.minecraft.getFrameTime();
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
+        final boolean boolean6 = this.minecraft.player.abilities.instabuild;
+        final int integer4 = ((EnchantmentMenu)this.menu).getGoldCount();
+        for (int integer5 = 0; integer5 < 3; ++integer5) {
+            final int integer6 = ((EnchantmentMenu)this.menu).costs[integer5];
+            final Enchantment bnw10 = Enchantment.byId(((EnchantmentMenu)this.menu).enchantClue[integer5]);
+            final int integer7 = ((EnchantmentMenu)this.menu).levelClue[integer5];
+            final int integer8 = integer5 + 1;
+            if (this.isHovering(60, 14 + 19 * integer5, 108, 17, integer2, integer3) && integer6 > 0 && integer7 >= 0 && bnw10 != null) {
+                final List<Component> list13 = Lists.newArrayList();
+                list13.add(new TranslatableComponent("container.enchant.clue", new Object[] { bnw10.getFullname(integer7) }).withStyle(ChatFormatting.WHITE));
+                if (!boolean6) {
+                    list13.add(TextComponent.EMPTY);
+                    if (this.minecraft.player.experienceLevel < integer6) {
+                        list13.add(new TranslatableComponent("container.enchant.level.requirement", new Object[] { ((EnchantmentMenu)this.menu).costs[integer5] }).withStyle(ChatFormatting.RED));
                     }
                     else {
-                        String string13;
-                        if (integer7 == 1) {
-                            string13 = I18n.get("container.enchant.lapis.one");
+                        MutableComponent mx14;
+                        if (integer8 == 1) {
+                            mx14 = new TranslatableComponent("container.enchant.lapis.one");
                         }
                         else {
-                            string13 = I18n.get("container.enchant.lapis.many", integer7);
+                            mx14 = new TranslatableComponent("container.enchant.lapis.many", new Object[] { integer8 });
                         }
-                        final ChatFormatting g14 = (integer3 >= integer7) ? ChatFormatting.GRAY : ChatFormatting.RED;
-                        list12.add(g14 + "" + string13);
-                        if (integer7 == 1) {
-                            string13 = I18n.get("container.enchant.level.one");
+                        list13.add(mx14.withStyle((integer4 >= integer8) ? ChatFormatting.GRAY : ChatFormatting.RED));
+                        MutableComponent mx15;
+                        if (integer8 == 1) {
+                            mx15 = new TranslatableComponent("container.enchant.level.one");
                         }
                         else {
-                            string13 = I18n.get("container.enchant.level.many", integer7);
+                            mx15 = new TranslatableComponent("container.enchant.level.many", new Object[] { integer8 });
                         }
-                        list12.add(ChatFormatting.GRAY + "" + string13);
+                        list13.add(mx15.withStyle(ChatFormatting.GRAY));
                     }
                 }
-                this.renderTooltip(list12, integer1, integer2);
+                this.renderTooltip(dhl, list13, integer2, integer3);
                 break;
             }
         }
     }
     
     public void tickBook() {
-        final ItemStack ben2 = ((EnchantmentMenu)this.menu).getSlot(0).getItem();
-        if (!ItemStack.matches(ben2, this.last)) {
-            this.last = ben2;
+        final ItemStack bki2 = ((EnchantmentMenu)this.menu).getSlot(0).getItem();
+        if (!ItemStack.matches(bki2, this.last)) {
+            this.last = bki2;
             do {
                 this.flipT += this.random.nextInt(4) - this.random.nextInt(4);
             } while (this.flip <= this.flipT + 1.0f && this.flip >= this.flipT - 1.0f);
diff --git a/src/net/minecraft/client/gui/screens/inventory/FurnaceScreen.java b/src/net/minecraft/client/gui/screens/inventory/FurnaceScreen.java
index 74f7d0f..0dbc71d 100644
--- a/src/net/minecraft/client/gui/screens/inventory/FurnaceScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/FurnaceScreen.java
@@ -10,8 +10,8 @@ import net.minecraft.world.inventory.FurnaceMenu;
 public class FurnaceScreen extends AbstractFurnaceScreen<FurnaceMenu> {
     private static final ResourceLocation TEXTURE;
     
-    public FurnaceScreen(final FurnaceMenu bbf, final Inventory ayi, final Component lf) {
-        super(bbf, new SmeltingRecipeBookComponent(), ayi, lf, FurnaceScreen.TEXTURE);
+    public FurnaceScreen(final FurnaceMenu bha, final Inventory beb, final Component mr) {
+        super(bha, new SmeltingRecipeBookComponent(), beb, mr, FurnaceScreen.TEXTURE);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/inventory/GrindstoneScreen.java b/src/net/minecraft/client/gui/screens/inventory/GrindstoneScreen.java
index 23db168..aea15e5 100644
--- a/src/net/minecraft/client/gui/screens/inventory/GrindstoneScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/GrindstoneScreen.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.gui.screens.inventory;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.resources.ResourceLocation;
@@ -9,33 +10,27 @@ import net.minecraft.world.inventory.GrindstoneMenu;
 public class GrindstoneScreen extends AbstractContainerScreen<GrindstoneMenu> {
     private static final ResourceLocation GRINDSTONE_LOCATION;
     
-    public GrindstoneScreen(final GrindstoneMenu bbh, final Inventory ayi, final Component lf) {
-        super(bbh, ayi, lf);
+    public GrindstoneScreen(final GrindstoneMenu bhc, final Inventory beb, final Component mr) {
+        super(bhc, beb, mr);
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 8.0f, 6.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.renderBg(dhl, float4, integer2, integer3);
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.renderBg(float3, integer1, integer2);
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(GrindstoneScreen.GRINDSTONE_LOCATION);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
         if ((((GrindstoneMenu)this.menu).getSlot(0).hasItem() || ((GrindstoneMenu)this.menu).getSlot(1).hasItem()) && !((GrindstoneMenu)this.menu).getSlot(2).hasItem()) {
-            this.blit(integer4 + 92, integer5 + 31, this.imageWidth, 0, 28, 21);
+            this.blit(dhl, integer5 + 92, integer6 + 31, this.imageWidth, 0, 28, 21);
         }
     }
     
diff --git a/src/net/minecraft/client/gui/screens/inventory/HopperScreen.java b/src/net/minecraft/client/gui/screens/inventory/HopperScreen.java
index 7c29596..1c5d4fb 100644
--- a/src/net/minecraft/client/gui/screens/inventory/HopperScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/HopperScreen.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.gui.screens.inventory;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.resources.ResourceLocation;
@@ -9,32 +10,27 @@ import net.minecraft.world.inventory.HopperMenu;
 public class HopperScreen extends AbstractContainerScreen<HopperMenu> {
     private static final ResourceLocation HOPPER_LOCATION;
     
-    public HopperScreen(final HopperMenu bbi, final Inventory ayi, final Component lf) {
-        super(bbi, ayi, lf);
+    public HopperScreen(final HopperMenu bhd, final Inventory beb, final Component mr) {
+        super(bhd, beb, mr);
         this.passEvents = false;
         this.imageHeight = 133;
+        this.inventoryLabelY = this.imageHeight - 94;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 8.0f, 6.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(HopperScreen.HOPPER_LOCATION);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/inventory/HorseInventoryScreen.java b/src/net/minecraft/client/gui/screens/inventory/HorseInventoryScreen.java
index 88b6fd3..91af751 100644
--- a/src/net/minecraft/client/gui/screens/inventory/HorseInventoryScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/HorseInventoryScreen.java
@@ -4,6 +4,7 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.animal.horse.Llama;
 import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.animal.horse.AbstractHorse;
 import net.minecraft.resources.ResourceLocation;
@@ -15,52 +16,46 @@ public class HorseInventoryScreen extends AbstractContainerScreen<HorseInventory
     private float xMouse;
     private float yMouse;
     
-    public HorseInventoryScreen(final HorseInventoryMenu bbj, final Inventory ayi, final AbstractHorse aue) {
-        super(bbj, ayi, aue.getDisplayName());
-        this.horse = aue;
+    public HorseInventoryScreen(final HorseInventoryMenu bhe, final Inventory beb, final AbstractHorse azm) {
+        super(bhe, beb, azm.getDisplayName());
+        this.horse = azm;
         this.passEvents = false;
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 8.0f, 6.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(HorseInventoryScreen.HORSE_INVENTORY_LOCATION);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
         if (this.horse instanceof AbstractChestedHorse) {
-            final AbstractChestedHorse aud7 = (AbstractChestedHorse)this.horse;
-            if (aud7.hasChest()) {
-                this.blit(integer4 + 79, integer5 + 17, 0, this.imageHeight, aud7.getInventoryColumns() * 18, 54);
+            final AbstractChestedHorse azl8 = (AbstractChestedHorse)this.horse;
+            if (azl8.hasChest()) {
+                this.blit(dhl, integer5 + 79, integer6 + 17, 0, this.imageHeight, azl8.getInventoryColumns() * 18, 54);
             }
         }
-        if (this.horse.canBeSaddled()) {
-            this.blit(integer4 + 7, integer5 + 35 - 18, 18, this.imageHeight + 54, 18, 18);
+        if (this.horse.isSaddleable()) {
+            this.blit(dhl, integer5 + 7, integer6 + 35 - 18, 18, this.imageHeight + 54, 18, 18);
         }
-        if (this.horse.wearsArmor()) {
+        if (this.horse.canWearArmor()) {
             if (this.horse instanceof Llama) {
-                this.blit(integer4 + 7, integer5 + 35, 36, this.imageHeight + 54, 18, 18);
+                this.blit(dhl, integer5 + 7, integer6 + 35, 36, this.imageHeight + 54, 18, 18);
             }
             else {
-                this.blit(integer4 + 7, integer5 + 35, 0, this.imageHeight + 54, 18, 18);
+                this.blit(dhl, integer5 + 7, integer6 + 35, 0, this.imageHeight + 54, 18, 18);
             }
         }
-        InventoryScreen.renderEntityInInventory(integer4 + 51, integer5 + 60, 17, integer4 + 51 - this.xMouse, integer5 + 75 - 50 - this.yMouse, this.horse);
+        InventoryScreen.renderEntityInInventory(integer5 + 51, integer6 + 60, 17, integer5 + 51 - this.xMouse, integer6 + 75 - 50 - this.yMouse, this.horse);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.xMouse = (float)integer1;
-        this.yMouse = (float)integer2;
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.xMouse = (float)integer2;
+        this.yMouse = (float)integer3;
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/inventory/InventoryScreen.java b/src/net/minecraft/client/gui/screens/inventory/InventoryScreen.java
index fdf2e7a..5994e1f 100644
--- a/src/net/minecraft/client/gui/screens/inventory/InventoryScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/InventoryScreen.java
@@ -8,9 +8,10 @@ import com.mojang.math.Quaternion;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.Minecraft;
 import com.mojang.math.Vector3f;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.entity.LivingEntity;
 import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.ImageButton;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.world.inventory.RecipeBookMenu;
@@ -32,10 +33,11 @@ public class InventoryScreen extends EffectRenderingInventoryScreen<InventoryMen
     private boolean widthTooNarrow;
     private boolean buttonClicked;
     
-    public InventoryScreen(final Player ayj) {
-        super(ayj.inventoryMenu, ayj.inventory, new TranslatableComponent("container.crafting", new Object[0]));
+    public InventoryScreen(final Player bec) {
+        super(bec.inventoryMenu, bec.inventory, new TranslatableComponent("container.crafting"));
         this.recipeBookComponent = new RecipeBookComponent();
         this.passEvents = true;
+        this.titleLabelX = 97;
     }
     
     @Override
@@ -60,86 +62,85 @@ public class InventoryScreen extends EffectRenderingInventoryScreen<InventoryMen
         this.leftPos = this.recipeBookComponent.updateScreenPosition(this.widthTooNarrow, this.width, this.imageWidth);
         this.children.add(this.recipeBookComponent);
         this.setInitialFocus(this.recipeBookComponent);
-        this.<ImageButton>addButton(new ImageButton(this.leftPos + 104, this.height / 2 - 22, 20, 18, 0, 0, 19, InventoryScreen.RECIPE_BUTTON_LOCATION, dcv -> {
+        this.<ImageButton>addButton(new ImageButton(this.leftPos + 104, this.height / 2 - 22, 20, 18, 0, 0, 19, InventoryScreen.RECIPE_BUTTON_LOCATION, dni -> {
             this.recipeBookComponent.initVisuals(this.widthTooNarrow);
             this.recipeBookComponent.toggleVisibility();
             this.leftPos = this.recipeBookComponent.updateScreenPosition(this.widthTooNarrow, this.width, this.imageWidth);
-            dcv.setPosition(this.leftPos + 104, this.height / 2 - 22);
+            dni.setPosition(this.leftPos + 104, this.height / 2 - 22);
             this.buttonClicked = true;
         }));
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 97.0f, 8.0f, 4210752);
+    protected void renderLabels(final PoseStack dhl, final int integer2, final int integer3) {
+        this.font.draw(dhl, this.title, (float)this.titleLabelX, (float)this.titleLabelY, 4210752);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
         this.doRenderEffects = !this.recipeBookComponent.isVisible();
         if (this.recipeBookComponent.isVisible() && this.widthTooNarrow) {
-            this.renderBg(float3, integer1, integer2);
-            this.recipeBookComponent.render(integer1, integer2, float3);
+            this.renderBg(dhl, float4, integer2, integer3);
+            this.recipeBookComponent.render(dhl, integer2, integer3, float4);
         }
         else {
-            this.recipeBookComponent.render(integer1, integer2, float3);
-            super.render(integer1, integer2, float3);
-            this.recipeBookComponent.renderGhostRecipe(this.leftPos, this.topPos, false, float3);
+            this.recipeBookComponent.render(dhl, integer2, integer3, float4);
+            super.render(dhl, integer2, integer3, float4);
+            this.recipeBookComponent.renderGhostRecipe(dhl, this.leftPos, this.topPos, false, float4);
         }
-        this.renderTooltip(integer1, integer2);
-        this.recipeBookComponent.renderTooltip(this.leftPos, this.topPos, integer1, integer2);
-        this.xMouse = (float)integer1;
-        this.yMouse = (float)integer2;
-        this.magicalSpecialHackyFocus(this.recipeBookComponent);
+        this.renderTooltip(dhl, integer2, integer3);
+        this.recipeBookComponent.renderTooltip(dhl, this.leftPos, this.topPos, integer2, integer3);
+        this.xMouse = (float)integer2;
+        this.yMouse = (float)integer3;
     }
     
     @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(InventoryScreen.INVENTORY_LOCATION);
-        final int integer4 = this.leftPos;
-        final int integer5 = this.topPos;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
-        renderEntityInInventory(integer4 + 51, integer5 + 75, 30, integer4 + 51 - this.xMouse, integer5 + 75 - 50 - this.yMouse, this.minecraft.player);
+        final int integer5 = this.leftPos;
+        final int integer6 = this.topPos;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
+        renderEntityInInventory(integer5 + 51, integer6 + 75, 30, integer5 + 51 - this.xMouse, integer6 + 75 - 50 - this.yMouse, this.minecraft.player);
     }
     
-    public static void renderEntityInInventory(final int integer1, final int integer2, final int integer3, final float float4, final float float5, final LivingEntity akz) {
+    public static void renderEntityInInventory(final int integer1, final int integer2, final int integer3, final float float4, final float float5, final LivingEntity aoy) {
         final float float6 = (float)Math.atan(float4 / 40.0f);
         final float float7 = (float)Math.atan(float5 / 40.0f);
         RenderSystem.pushMatrix();
         RenderSystem.translatef((float)integer1, (float)integer2, 1050.0f);
         RenderSystem.scalef(1.0f, 1.0f, -1.0f);
-        final PoseStack cyl9 = new PoseStack();
-        cyl9.translate(0.0, 0.0, 1000.0);
-        cyl9.scale((float)integer3, (float)integer3, (float)integer3);
-        final Quaternion c10 = Vector3f.ZP.rotationDegrees(180.0f);
-        final Quaternion c11 = Vector3f.XP.rotationDegrees(float7 * 20.0f);
-        c10.mul(c11);
-        cyl9.mulPose(c10);
-        final float float8 = akz.yBodyRot;
-        final float float9 = akz.yRot;
-        final float float10 = akz.xRot;
-        final float float11 = akz.yHeadRotO;
-        final float float12 = akz.yHeadRot;
-        akz.yBodyRot = 180.0f + float6 * 20.0f;
-        akz.yRot = 180.0f + float6 * 40.0f;
-        akz.xRot = -float7 * 20.0f;
-        akz.yHeadRot = akz.yRot;
-        akz.yHeadRotO = akz.yRot;
-        final EntityRenderDispatcher dvf17 = Minecraft.getInstance().getEntityRenderDispatcher();
-        c11.conj();
-        dvf17.overrideCameraOrientation(c11);
-        dvf17.setRenderShadow(false);
+        final PoseStack dhl9 = new PoseStack();
+        dhl9.translate(0.0, 0.0, 1000.0);
+        dhl9.scale((float)integer3, (float)integer3, (float)integer3);
+        final Quaternion d10 = Vector3f.ZP.rotationDegrees(180.0f);
+        final Quaternion d11 = Vector3f.XP.rotationDegrees(float7 * 20.0f);
+        d10.mul(d11);
+        dhl9.mulPose(d10);
+        final float float8 = aoy.yBodyRot;
+        final float float9 = aoy.yRot;
+        final float float10 = aoy.xRot;
+        final float float11 = aoy.yHeadRotO;
+        final float float12 = aoy.yHeadRot;
+        aoy.yBodyRot = 180.0f + float6 * 20.0f;
+        aoy.yRot = 180.0f + float6 * 40.0f;
+        aoy.xRot = -float7 * 20.0f;
+        aoy.yHeadRot = aoy.yRot;
+        aoy.yHeadRotO = aoy.yRot;
+        final EntityRenderDispatcher egm17 = Minecraft.getInstance().getEntityRenderDispatcher();
+        d11.conj();
+        egm17.overrideCameraOrientation(d11);
+        egm17.setRenderShadow(false);
         final MultiBufferSource.BufferSource a18 = Minecraft.getInstance().renderBuffers().bufferSource();
-        dvf17.<LivingEntity>render(akz, 0.0, 0.0, 0.0, 0.0f, 1.0f, cyl9, a18, 15728880);
+        RenderSystem.runAsFancy(() -> egm17.<LivingEntity>render(aoy, 0.0, 0.0, 0.0, 0.0f, 1.0f, dhl9, a18, 15728880));
         a18.endBatch();
-        dvf17.setRenderShadow(true);
-        akz.yBodyRot = float8;
-        akz.yRot = float9;
-        akz.xRot = float10;
-        akz.yHeadRotO = float11;
-        akz.yHeadRot = float12;
+        egm17.setRenderShadow(true);
+        aoy.yBodyRot = float8;
+        aoy.yRot = float9;
+        aoy.xRot = float10;
+        aoy.yHeadRotO = float11;
+        aoy.yHeadRot = float12;
         RenderSystem.popMatrix();
     }
     
@@ -150,7 +151,11 @@ public class InventoryScreen extends EffectRenderingInventoryScreen<InventoryMen
     
     @Override
     public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return this.recipeBookComponent.mouseClicked(double1, double2, integer) || ((!this.widthTooNarrow || !this.recipeBookComponent.isVisible()) && super.mouseClicked(double1, double2, integer));
+        if (this.recipeBookComponent.mouseClicked(double1, double2, integer)) {
+            this.setFocused(this.recipeBookComponent);
+            return true;
+        }
+        return (!this.widthTooNarrow || !this.recipeBookComponent.isVisible()) && super.mouseClicked(double1, double2, integer);
     }
     
     @Override
@@ -169,9 +174,9 @@ public class InventoryScreen extends EffectRenderingInventoryScreen<InventoryMen
     }
     
     @Override
-    protected void slotClicked(final Slot bca, final int integer2, final int integer3, final ClickType bav) {
-        super.slotClicked(bca, integer2, integer3, bav);
-        this.recipeBookComponent.slotClicked(bca);
+    protected void slotClicked(final Slot bhw, final int integer2, final int integer3, final ClickType bgq) {
+        super.slotClicked(bhw, integer2, integer3, bgq);
+        this.recipeBookComponent.slotClicked(bhw);
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/inventory/ItemCombinerScreen.java b/src/net/minecraft/client/gui/screens/inventory/ItemCombinerScreen.java
new file mode 100644
index 0000000..a956527
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/inventory/ItemCombinerScreen.java
@@ -0,0 +1,75 @@
+package net.minecraft.client.gui.screens.inventory;
+
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.core.NonNullList;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.inventory.ContainerListener;
+import net.minecraft.world.inventory.ItemCombinerMenu;
+
+public class ItemCombinerScreen<T extends ItemCombinerMenu> extends AbstractContainerScreen<T> implements ContainerListener {
+    private ResourceLocation menuResource;
+    
+    public ItemCombinerScreen(final T bhg, final Inventory beb, final Component mr, final ResourceLocation uh) {
+        super(bhg, beb, mr);
+        this.menuResource = uh;
+    }
+    
+    protected void subInit() {
+    }
+    
+    @Override
+    protected void init() {
+        super.init();
+        this.subInit();
+        this.menu.addSlotListener(this);
+    }
+    
+    @Override
+    public void removed() {
+        super.removed();
+        this.menu.removeSlotListener(this);
+    }
+    
+    @Override
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        RenderSystem.disableBlend();
+        this.renderFg(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
+    }
+    
+    protected void renderFg(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+    }
+    
+    @Override
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
+        RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
+        this.minecraft.getTextureManager().bind(this.menuResource);
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
+        this.blit(dhl, integer5 + 59, integer6 + 20, 0, this.imageHeight + (this.menu.getSlot(0).hasItem() ? 0 : 16), 110, 16);
+        if ((this.menu.getSlot(0).hasItem() || this.menu.getSlot(1).hasItem()) && !this.menu.getSlot(2).hasItem()) {
+            this.blit(dhl, integer5 + 99, integer6 + 45, this.imageWidth, 0, 28, 21);
+        }
+    }
+    
+    @Override
+    public void refreshContainer(final AbstractContainerMenu bgi, final NonNullList<ItemStack> gi) {
+        this.slotChanged(bgi, 0, bgi.getSlot(0).getItem());
+    }
+    
+    @Override
+    public void setContainerData(final AbstractContainerMenu bgi, final int integer2, final int integer3) {
+    }
+    
+    @Override
+    public void slotChanged(final AbstractContainerMenu bgi, final int integer, final ItemStack bki) {
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/inventory/JigsawBlockEditScreen.java b/src/net/minecraft/client/gui/screens/inventory/JigsawBlockEditScreen.java
index 8b0d63e..560d0eb 100644
--- a/src/net/minecraft/client/gui/screens/inventory/JigsawBlockEditScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/JigsawBlockEditScreen.java
@@ -1,8 +1,17 @@
 package net.minecraft.client.gui.screens.inventory;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.util.Mth;
+import net.minecraft.client.gui.components.AbstractSliderButton;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.world.level.block.JigsawBlock;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.protocol.game.ServerboundJigsawGeneratePacket;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundSetJigsawBlockPacket;
 import net.minecraft.resources.ResourceLocation;
@@ -14,20 +23,27 @@ import net.minecraft.client.gui.screens.Screen;
 
 public class JigsawBlockEditScreen extends Screen {
     private final JigsawBlockEntity jigsawEntity;
-    private EditBox attachementTypeEdit;
-    private EditBox targetPoolEdit;
+    private EditBox nameEdit;
+    private EditBox targetEdit;
+    private EditBox poolEdit;
     private EditBox finalStateEdit;
+    private int levels;
+    private boolean keepJigsaws;
+    private Button jointButton;
     private Button doneButton;
+    private JigsawBlockEntity.JointType joint;
     
-    public JigsawBlockEditScreen(final JigsawBlockEntity bxb) {
+    public JigsawBlockEditScreen(final JigsawBlockEntity ceb) {
         super(NarratorChatListener.NO_TITLE);
-        this.jigsawEntity = bxb;
+        this.keepJigsaws = true;
+        this.jigsawEntity = ceb;
     }
     
     @Override
     public void tick() {
-        this.attachementTypeEdit.tick();
-        this.targetPoolEdit.tick();
+        this.nameEdit.tick();
+        this.targetEdit.tick();
+        this.poolEdit.tick();
         this.finalStateEdit.tick();
     }
     
@@ -41,7 +57,11 @@ public class JigsawBlockEditScreen extends Screen {
     }
     
     private void sendToServer() {
-        this.minecraft.getConnection().send(new ServerboundSetJigsawBlockPacket(this.jigsawEntity.getBlockPos(), new ResourceLocation(this.attachementTypeEdit.getValue()), new ResourceLocation(this.targetPoolEdit.getValue()), this.finalStateEdit.getValue()));
+        this.minecraft.getConnection().send(new ServerboundSetJigsawBlockPacket(this.jigsawEntity.getBlockPos(), new ResourceLocation(this.nameEdit.getValue()), new ResourceLocation(this.targetEdit.getValue()), new ResourceLocation(this.poolEdit.getValue()), this.finalStateEdit.getValue(), this.joint));
+    }
+    
+    private void sendGenerate() {
+        this.minecraft.getConnection().send(new ServerboundJigsawGeneratePacket(this.jigsawEntity.getBlockPos(), this.levels, this.keepJigsaws));
     }
     
     @Override
@@ -52,36 +72,91 @@ public class JigsawBlockEditScreen extends Screen {
     @Override
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 4 - 150, 210, 150, 20, I18n.get("gui.done"), dcv -> this.onDone()));
-        this.<Button>addButton(new Button(this.width / 2 + 4, 210, 150, 20, I18n.get("gui.cancel"), dcv -> this.onCancel()));
-        (this.targetPoolEdit = new EditBox(this.font, this.width / 2 - 152, 40, 300, 20, I18n.get("jigsaw_block.target_pool"))).setMaxLength(128);
-        this.targetPoolEdit.setValue(this.jigsawEntity.getTargetPool().toString());
-        this.targetPoolEdit.setResponder(string -> this.updateValidity());
-        this.children.add(this.targetPoolEdit);
-        (this.attachementTypeEdit = new EditBox(this.font, this.width / 2 - 152, 80, 300, 20, I18n.get("jigsaw_block.attachement_type"))).setMaxLength(128);
-        this.attachementTypeEdit.setValue(this.jigsawEntity.getAttachementType().toString());
-        this.attachementTypeEdit.setResponder(string -> this.updateValidity());
-        this.children.add(this.attachementTypeEdit);
-        (this.finalStateEdit = new EditBox(this.font, this.width / 2 - 152, 120, 300, 20, I18n.get("jigsaw_block.final_state"))).setMaxLength(256);
+        (this.poolEdit = new EditBox(this.font, this.width / 2 - 152, 20, 300, 20, new TranslatableComponent("jigsaw_block.pool"))).setMaxLength(128);
+        this.poolEdit.setValue(this.jigsawEntity.getPool().toString());
+        this.poolEdit.setResponder(string -> this.updateValidity());
+        this.children.add(this.poolEdit);
+        (this.nameEdit = new EditBox(this.font, this.width / 2 - 152, 55, 300, 20, new TranslatableComponent("jigsaw_block.name"))).setMaxLength(128);
+        this.nameEdit.setValue(this.jigsawEntity.getName().toString());
+        this.nameEdit.setResponder(string -> this.updateValidity());
+        this.children.add(this.nameEdit);
+        (this.targetEdit = new EditBox(this.font, this.width / 2 - 152, 90, 300, 20, new TranslatableComponent("jigsaw_block.target"))).setMaxLength(128);
+        this.targetEdit.setValue(this.jigsawEntity.getTarget().toString());
+        this.targetEdit.setResponder(string -> this.updateValidity());
+        this.children.add(this.targetEdit);
+        (this.finalStateEdit = new EditBox(this.font, this.width / 2 - 152, 125, 300, 20, new TranslatableComponent("jigsaw_block.final_state"))).setMaxLength(256);
         this.finalStateEdit.setValue(this.jigsawEntity.getFinalState());
         this.children.add(this.finalStateEdit);
-        this.setInitialFocus(this.targetPoolEdit);
+        this.joint = this.jigsawEntity.getJoint();
+        final int integer2 = this.font.width(I18n.get("jigsaw_block.joint_label")) + 10;
+        final JigsawBlockEntity.JointType[] arr3;
+        final int integer3;
+        this.jointButton = this.<Button>addButton(new Button(this.width / 2 - 152 + integer2, 150, 300 - integer2, 20, this.getJointText(), dni -> {
+            arr3 = JigsawBlockEntity.JointType.values();
+            integer3 = (this.joint.ordinal() + 1) % arr3.length;
+            this.joint = arr3[integer3];
+            dni.setMessage(this.getJointText());
+            return;
+        }));
+        final boolean boolean3 = JigsawBlock.getFrontFacing(this.jigsawEntity.getBlockState()).getAxis().isVertical();
+        this.jointButton.active = boolean3;
+        this.jointButton.visible = boolean3;
+        this.addButton(new AbstractSliderButton(this.width / 2 - 154, 180, 100, 20, TextComponent.EMPTY, 0.0) {
+            {
+                this.updateMessage();
+            }
+            
+            @Override
+            protected void updateMessage() {
+                this.setMessage(new TranslatableComponent("jigsaw_block.levels", new Object[] { JigsawBlockEditScreen.this.levels }));
+            }
+            
+            @Override
+            protected void applyValue() {
+                JigsawBlockEditScreen.this.levels = Mth.floor(Mth.clampedLerp(0.0, 7.0, this.value));
+            }
+        });
+        this.addButton(new Button(this.width / 2 - 50, 180, 100, 20, new TranslatableComponent("jigsaw_block.keep_jigsaws"), dni -> {
+            this.keepJigsaws = !this.keepJigsaws;
+            dni.queueNarration(250);
+            return;
+        }) {
+            @Override
+            public Component getMessage() {
+                return super.getMessage().copy().append(" ").append(CommonComponents.optionStatus(JigsawBlockEditScreen.this.keepJigsaws));
+            }
+        });
+        this.<Button>addButton(new Button(this.width / 2 + 54, 180, 100, 20, new TranslatableComponent("jigsaw_block.generate"), dni -> this.sendGenerate()));
+        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 4 - 150, 210, 150, 20, CommonComponents.GUI_DONE, dni -> this.onDone()));
+        this.<Button>addButton(new Button(this.width / 2 + 4, 210, 150, 20, CommonComponents.GUI_CANCEL, dni -> this.onCancel()));
+        this.setInitialFocus(this.poolEdit);
         this.updateValidity();
     }
     
-    protected void updateValidity() {
-        this.doneButton.active = (ResourceLocation.isValidResourceLocation(this.attachementTypeEdit.getValue()) & ResourceLocation.isValidResourceLocation(this.targetPoolEdit.getValue()));
+    private void updateValidity() {
+        this.doneButton.active = (ResourceLocation.isValidResourceLocation(this.nameEdit.getValue()) && ResourceLocation.isValidResourceLocation(this.targetEdit.getValue()) && ResourceLocation.isValidResourceLocation(this.poolEdit.getValue()));
     }
     
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
-        final String string5 = this.attachementTypeEdit.getValue();
-        final String string6 = this.targetPoolEdit.getValue();
-        final String string7 = this.finalStateEdit.getValue();
-        this.init(dbn, integer2, integer3);
-        this.attachementTypeEdit.setValue(string5);
-        this.targetPoolEdit.setValue(string6);
-        this.finalStateEdit.setValue(string7);
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
+        final String string5 = this.nameEdit.getValue();
+        final String string6 = this.targetEdit.getValue();
+        final String string7 = this.poolEdit.getValue();
+        final String string8 = this.finalStateEdit.getValue();
+        final int integer4 = this.levels;
+        final JigsawBlockEntity.JointType a10 = this.joint;
+        this.init(dlx, integer2, integer3);
+        this.nameEdit.setValue(string5);
+        this.targetEdit.setValue(string6);
+        this.poolEdit.setValue(string7);
+        this.finalStateEdit.setValue(string8);
+        this.levels = integer4;
+        this.joint = a10;
+        this.jointButton.setMessage(this.getJointText());
+    }
+    
+    private Component getJointText() {
+        return new TranslatableComponent("jigsaw_block.joint." + this.joint.getSerializedName());
     }
     
     @Override
@@ -102,14 +177,19 @@ public class JigsawBlockEditScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawString(this.font, I18n.get("jigsaw_block.target_pool"), this.width / 2 - 153, 30, 10526880);
-        this.targetPoolEdit.render(integer1, integer2, float3);
-        this.drawString(this.font, I18n.get("jigsaw_block.attachement_type"), this.width / 2 - 153, 70, 10526880);
-        this.attachementTypeEdit.render(integer1, integer2, float3);
-        this.drawString(this.font, I18n.get("jigsaw_block.final_state"), this.width / 2 - 153, 110, 10526880);
-        this.finalStateEdit.render(integer1, integer2, float3);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawString(dhl, this.font, I18n.get("jigsaw_block.pool"), this.width / 2 - 153, 10, 10526880);
+        this.poolEdit.render(dhl, integer2, integer3, float4);
+        this.drawString(dhl, this.font, I18n.get("jigsaw_block.name"), this.width / 2 - 153, 45, 10526880);
+        this.nameEdit.render(dhl, integer2, integer3, float4);
+        this.drawString(dhl, this.font, I18n.get("jigsaw_block.target"), this.width / 2 - 153, 80, 10526880);
+        this.targetEdit.render(dhl, integer2, integer3, float4);
+        this.drawString(dhl, this.font, I18n.get("jigsaw_block.final_state"), this.width / 2 - 153, 115, 10526880);
+        this.finalStateEdit.render(dhl, integer2, integer3, float4);
+        if (JigsawBlock.getFrontFacing(this.jigsawEntity.getBlockState()).getAxis().isVertical()) {
+            this.drawString(dhl, this.font, I18n.get("jigsaw_block.joint_label"), this.width / 2 - 153, 156, 16777215);
+        }
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/LecternScreen.java b/src/net/minecraft/client/gui/screens/inventory/LecternScreen.java
index cb52395..461a4fd 100644
--- a/src/net/minecraft/client/gui/screens/inventory/LecternScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/LecternScreen.java
@@ -1,8 +1,9 @@
 package net.minecraft.client.gui.screens.inventory;
 
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -15,26 +16,26 @@ public class LecternScreen extends BookViewScreen implements MenuAccess<LecternM
     private final LecternMenu menu;
     private final ContainerListener listener;
     
-    public LecternScreen(final LecternMenu bbl, final Inventory ayi, final Component lf) {
+    public LecternScreen(final LecternMenu bhh, final Inventory beb, final Component mr) {
         this.listener = new ContainerListener() {
             @Override
-            public void refreshContainer(final AbstractContainerMenu ban, final NonNullList<ItemStack> fy) {
+            public void refreshContainer(final AbstractContainerMenu bgi, final NonNullList<ItemStack> gi) {
                 LecternScreen.this.bookChanged();
             }
             
             @Override
-            public void slotChanged(final AbstractContainerMenu ban, final int integer, final ItemStack ben) {
+            public void slotChanged(final AbstractContainerMenu bgi, final int integer, final ItemStack bki) {
                 LecternScreen.this.bookChanged();
             }
             
             @Override
-            public void setContainerData(final AbstractContainerMenu ban, final int integer2, final int integer3) {
+            public void setContainerData(final AbstractContainerMenu bgi, final int integer2, final int integer3) {
                 if (integer2 == 0) {
                     LecternScreen.this.pageChanged();
                 }
             }
         };
-        this.menu = bbl;
+        this.menu = bhh;
     }
     
     @Override
@@ -63,8 +64,8 @@ public class LecternScreen extends BookViewScreen implements MenuAccess<LecternM
     @Override
     protected void createMenuControls() {
         if (this.minecraft.player.mayBuild()) {
-            this.<Button>addButton(new Button(this.width / 2 - 100, 196, 98, 20, I18n.get("gui.done"), dcv -> this.minecraft.setScreen(null)));
-            this.<Button>addButton(new Button(this.width / 2 + 2, 196, 98, 20, I18n.get("lectern.take_book"), dcv -> this.sendButtonClick(3)));
+            this.<Button>addButton(new Button(this.width / 2 - 100, 196, 98, 20, CommonComponents.GUI_DONE, dni -> this.minecraft.setScreen(null)));
+            this.<Button>addButton(new Button(this.width / 2 + 2, 196, 98, 20, new TranslatableComponent("lectern.take_book"), dni -> this.sendButtonClick(3)));
         }
         else {
             super.createMenuControls();
@@ -100,8 +101,8 @@ public class LecternScreen extends BookViewScreen implements MenuAccess<LecternM
     }
     
     private void bookChanged() {
-        final ItemStack ben2 = this.menu.getBook();
-        this.setBookAccess(BookAccess.fromItem(ben2));
+        final ItemStack bki2 = this.menu.getBook();
+        this.setBookAccess(BookAccess.fromItem(bki2));
     }
     
     private void pageChanged() {
diff --git a/src/net/minecraft/client/gui/screens/inventory/LoomScreen.java b/src/net/minecraft/client/gui/screens/inventory/LoomScreen.java
index 8745413..a16d6bb 100644
--- a/src/net/minecraft/client/gui/screens/inventory/LoomScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/LoomScreen.java
@@ -17,8 +17,8 @@ import net.minecraft.world.inventory.Slot;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.renderer.texture.OverlayTexture;
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.platform.Lighting;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.blockentity.BannerRenderer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
@@ -48,116 +48,112 @@ public class LoomScreen extends AbstractContainerScreen<LoomMenu> {
     private boolean scrolling;
     private int startIndex;
     
-    public LoomScreen(final LoomMenu bbm, final Inventory ayi, final Component lf) {
-        super(bbm, ayi, lf);
+    public LoomScreen(final LoomMenu bhi, final Inventory beb, final Component mr) {
+        super(bhi, beb, mr);
         this.bannerStack = ItemStack.EMPTY;
         this.dyeStack = ItemStack.EMPTY;
         this.patternStack = ItemStack.EMPTY;
         this.startIndex = 1;
         this.flag = BannerRenderer.makeFlag();
-        bbm.registerUpdateListener(this::containerChanged);
+        bhi.registerUpdateListener(this::containerChanged);
+        this.titleLabelY -= 2;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 8.0f, 4.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
-        this.renderBackground();
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
+        this.renderBackground(dhl);
         this.minecraft.getTextureManager().bind(LoomScreen.BG_LOCATION);
-        final int integer4 = this.leftPos;
-        final int integer5 = this.topPos;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
-        final Slot bca7 = ((LoomMenu)this.menu).getBannerSlot();
-        final Slot bca8 = ((LoomMenu)this.menu).getDyeSlot();
-        final Slot bca9 = ((LoomMenu)this.menu).getPatternSlot();
-        final Slot bca10 = ((LoomMenu)this.menu).getResultSlot();
-        if (!bca7.hasItem()) {
-            this.blit(integer4 + bca7.x, integer5 + bca7.y, this.imageWidth, 0, 16, 16);
+        final int integer5 = this.leftPos;
+        final int integer6 = this.topPos;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
+        final Slot bhw8 = ((LoomMenu)this.menu).getBannerSlot();
+        final Slot bhw9 = ((LoomMenu)this.menu).getDyeSlot();
+        final Slot bhw10 = ((LoomMenu)this.menu).getPatternSlot();
+        final Slot bhw11 = ((LoomMenu)this.menu).getResultSlot();
+        if (!bhw8.hasItem()) {
+            this.blit(dhl, integer5 + bhw8.x, integer6 + bhw8.y, this.imageWidth, 0, 16, 16);
         }
-        if (!bca8.hasItem()) {
-            this.blit(integer4 + bca8.x, integer5 + bca8.y, this.imageWidth + 16, 0, 16, 16);
+        if (!bhw9.hasItem()) {
+            this.blit(dhl, integer5 + bhw9.x, integer6 + bhw9.y, this.imageWidth + 16, 0, 16, 16);
         }
-        if (!bca9.hasItem()) {
-            this.blit(integer4 + bca9.x, integer5 + bca9.y, this.imageWidth + 32, 0, 16, 16);
+        if (!bhw10.hasItem()) {
+            this.blit(dhl, integer5 + bhw10.x, integer6 + bhw10.y, this.imageWidth + 32, 0, 16, 16);
         }
-        final int integer6 = (int)(41.0f * this.scrollOffs);
-        this.blit(integer4 + 119, integer5 + 13 + integer6, 232 + (this.displayPatterns ? 0 : 12), 0, 12, 15);
+        final int integer7 = (int)(41.0f * this.scrollOffs);
+        this.blit(dhl, integer5 + 119, integer6 + 13 + integer7, 232 + (this.displayPatterns ? 0 : 12), 0, 12, 15);
         Lighting.setupForFlatItems();
         if (this.resultBannerPatterns != null && !this.hasMaxPatterns) {
-            final MultiBufferSource.BufferSource a12 = this.minecraft.renderBuffers().bufferSource();
-            final PoseStack cyl13 = new PoseStack();
-            cyl13.translate(integer4 + 139, integer5 + 52, 0.0);
-            cyl13.scale(24.0f, -24.0f, 1.0f);
-            cyl13.translate(0.5, 0.5, 0.5);
-            final float float2 = 0.6666667f;
-            cyl13.scale(0.6666667f, -0.6666667f, -0.6666667f);
+            final MultiBufferSource.BufferSource a13 = this.minecraft.renderBuffers().bufferSource();
+            dhl.pushPose();
+            dhl.translate(integer5 + 139, integer6 + 52, 0.0);
+            dhl.scale(24.0f, -24.0f, 1.0f);
+            dhl.translate(0.5, 0.5, 0.5);
+            final float float3 = 0.6666667f;
+            dhl.scale(0.6666667f, -0.6666667f, -0.6666667f);
             this.flag.xRot = 0.0f;
             this.flag.y = -32.0f;
-            BannerRenderer.renderPatterns(cyl13, a12, 15728880, OverlayTexture.NO_OVERLAY, this.flag, ModelBakery.BANNER_BASE, true, this.resultBannerPatterns);
-            a12.endBatch();
+            BannerRenderer.renderPatterns(dhl, a13, 15728880, OverlayTexture.NO_OVERLAY, this.flag, ModelBakery.BANNER_BASE, true, this.resultBannerPatterns);
+            dhl.popPose();
+            a13.endBatch();
         }
         else if (this.hasMaxPatterns) {
-            this.blit(integer4 + bca10.x - 2, integer5 + bca10.y - 2, this.imageWidth, 17, 17, 16);
+            this.blit(dhl, integer5 + bhw11.x - 2, integer6 + bhw11.y - 2, this.imageWidth, 17, 17, 16);
         }
         if (this.displayPatterns) {
-            final int integer7 = integer4 + 60;
-            final int integer8 = integer5 + 13;
-            for (int integer9 = this.startIndex + 16, integer10 = this.startIndex; integer10 < integer9 && integer10 < BannerPattern.COUNT - 5; ++integer10) {
-                final int integer11 = integer10 - this.startIndex;
-                final int integer12 = integer7 + integer11 % 4 * 14;
-                final int integer13 = integer8 + integer11 / 4 * 14;
+            final int integer8 = integer5 + 60;
+            final int integer9 = integer6 + 13;
+            for (int integer10 = this.startIndex + 16, integer11 = this.startIndex; integer11 < integer10 && integer11 < BannerPattern.COUNT - BannerPattern.PATTERN_ITEM_COUNT; ++integer11) {
+                final int integer12 = integer11 - this.startIndex;
+                final int integer13 = integer8 + integer12 % 4 * 14;
+                final int integer14 = integer9 + integer12 / 4 * 14;
                 this.minecraft.getTextureManager().bind(LoomScreen.BG_LOCATION);
-                int integer14 = this.imageHeight;
-                if (integer10 == ((LoomMenu)this.menu).getSelectedBannerPatternIndex()) {
-                    integer14 += 14;
+                int integer15 = this.imageHeight;
+                if (integer11 == ((LoomMenu)this.menu).getSelectedBannerPatternIndex()) {
+                    integer15 += 14;
                 }
-                else if (integer2 >= integer12 && integer3 >= integer13 && integer2 < integer12 + 14 && integer3 < integer13 + 14) {
-                    integer14 += 28;
+                else if (integer3 >= integer13 && integer4 >= integer14 && integer3 < integer13 + 14 && integer4 < integer14 + 14) {
+                    integer15 += 28;
                 }
-                this.blit(integer12, integer13, 0, integer14, 14, 14);
-                this.renderPattern(integer10, integer12, integer13);
+                this.blit(dhl, integer13, integer14, 0, integer15, 14, 14);
+                this.renderPattern(integer11, integer13, integer14);
             }
         }
         else if (this.displaySpecialPattern) {
-            final int integer7 = integer4 + 60;
-            final int integer8 = integer5 + 13;
+            final int integer8 = integer5 + 60;
+            final int integer9 = integer6 + 13;
             this.minecraft.getTextureManager().bind(LoomScreen.BG_LOCATION);
-            this.blit(integer7, integer8, 0, this.imageHeight, 14, 14);
-            final int integer9 = ((LoomMenu)this.menu).getSelectedBannerPatternIndex();
-            this.renderPattern(integer9, integer7, integer8);
+            this.blit(dhl, integer8, integer9, 0, this.imageHeight, 14, 14);
+            final int integer10 = ((LoomMenu)this.menu).getSelectedBannerPatternIndex();
+            this.renderPattern(integer10, integer8, integer9);
         }
         Lighting.setupFor3DItems();
     }
     
     private void renderPattern(final int integer1, final int integer2, final int integer3) {
-        final ItemStack ben5 = new ItemStack(Items.GRAY_BANNER);
-        final CompoundTag jt6 = ben5.getOrCreateTagElement("BlockEntityTag");
-        final ListTag jz7 = new BannerPattern.Builder().addPattern(BannerPattern.BASE, DyeColor.GRAY).addPattern(BannerPattern.values()[integer1], DyeColor.WHITE).toListTag();
-        jt6.put("Patterns", jz7);
-        final PoseStack cyl8 = new PoseStack();
-        cyl8.pushPose();
-        cyl8.translate(integer2 + 0.5f, integer3 + 16, 0.0);
-        cyl8.scale(6.0f, -6.0f, 1.0f);
-        cyl8.translate(0.5, 0.5, 0.0);
-        cyl8.translate(0.5, 0.5, 0.5);
+        final ItemStack bki5 = new ItemStack(Items.GRAY_BANNER);
+        final CompoundTag le6 = bki5.getOrCreateTagElement("BlockEntityTag");
+        final ListTag lk7 = new BannerPattern.Builder().addPattern(BannerPattern.BASE, DyeColor.GRAY).addPattern(BannerPattern.values()[integer1], DyeColor.WHITE).toListTag();
+        le6.put("Patterns", lk7);
+        final PoseStack dhl8 = new PoseStack();
+        dhl8.pushPose();
+        dhl8.translate(integer2 + 0.5f, integer3 + 16, 0.0);
+        dhl8.scale(6.0f, -6.0f, 1.0f);
+        dhl8.translate(0.5, 0.5, 0.0);
+        dhl8.translate(0.5, 0.5, 0.5);
         final float float9 = 0.6666667f;
-        cyl8.scale(0.6666667f, -0.6666667f, -0.6666667f);
+        dhl8.scale(0.6666667f, -0.6666667f, -0.6666667f);
         final MultiBufferSource.BufferSource a10 = this.minecraft.renderBuffers().bufferSource();
         this.flag.xRot = 0.0f;
         this.flag.y = -32.0f;
-        final List<Pair<BannerPattern, DyeColor>> list11 = BannerBlockEntity.createPatterns(DyeColor.GRAY, BannerBlockEntity.getItemPatterns(ben5));
-        BannerRenderer.renderPatterns(cyl8, a10, 15728880, OverlayTexture.NO_OVERLAY, this.flag, ModelBakery.BANNER_BASE, true, list11);
-        cyl8.popPose();
+        final List<Pair<BannerPattern, DyeColor>> list11 = BannerBlockEntity.createPatterns(DyeColor.GRAY, BannerBlockEntity.getItemPatterns(bki5));
+        BannerRenderer.renderPatterns(dhl8, a10, 15728880, OverlayTexture.NO_OVERLAY, this.flag, ModelBakery.BANNER_BASE, true, list11);
+        dhl8.popPose();
         a10.endBatch();
     }
     
@@ -221,32 +217,32 @@ public class LoomScreen extends AbstractContainerScreen<LoomMenu> {
     }
     
     private void containerChanged() {
-        final ItemStack ben2 = ((LoomMenu)this.menu).getResultSlot().getItem();
-        if (ben2.isEmpty()) {
+        final ItemStack bki2 = ((LoomMenu)this.menu).getResultSlot().getItem();
+        if (bki2.isEmpty()) {
             this.resultBannerPatterns = null;
         }
         else {
-            this.resultBannerPatterns = BannerBlockEntity.createPatterns(((BannerItem)ben2.getItem()).getColor(), BannerBlockEntity.getItemPatterns(ben2));
+            this.resultBannerPatterns = BannerBlockEntity.createPatterns(((BannerItem)bki2.getItem()).getColor(), BannerBlockEntity.getItemPatterns(bki2));
         }
-        final ItemStack ben3 = ((LoomMenu)this.menu).getBannerSlot().getItem();
-        final ItemStack ben4 = ((LoomMenu)this.menu).getDyeSlot().getItem();
-        final ItemStack ben5 = ((LoomMenu)this.menu).getPatternSlot().getItem();
-        final CompoundTag jt6 = ben3.getOrCreateTagElement("BlockEntityTag");
-        this.hasMaxPatterns = (jt6.contains("Patterns", 9) && !ben3.isEmpty() && jt6.getList("Patterns", 10).size() >= 6);
+        final ItemStack bki3 = ((LoomMenu)this.menu).getBannerSlot().getItem();
+        final ItemStack bki4 = ((LoomMenu)this.menu).getDyeSlot().getItem();
+        final ItemStack bki5 = ((LoomMenu)this.menu).getPatternSlot().getItem();
+        final CompoundTag le6 = bki3.getOrCreateTagElement("BlockEntityTag");
+        this.hasMaxPatterns = (le6.contains("Patterns", 9) && !bki3.isEmpty() && le6.getList("Patterns", 10).size() >= 6);
         if (this.hasMaxPatterns) {
             this.resultBannerPatterns = null;
         }
-        if (!ItemStack.matches(ben3, this.bannerStack) || !ItemStack.matches(ben4, this.dyeStack) || !ItemStack.matches(ben5, this.patternStack)) {
-            this.displayPatterns = (!ben3.isEmpty() && !ben4.isEmpty() && ben5.isEmpty() && !this.hasMaxPatterns);
-            this.displaySpecialPattern = (!this.hasMaxPatterns && !ben5.isEmpty() && !ben3.isEmpty() && !ben4.isEmpty());
+        if (!ItemStack.matches(bki3, this.bannerStack) || !ItemStack.matches(bki4, this.dyeStack) || !ItemStack.matches(bki5, this.patternStack)) {
+            this.displayPatterns = (!bki3.isEmpty() && !bki4.isEmpty() && bki5.isEmpty() && !this.hasMaxPatterns);
+            this.displaySpecialPattern = (!this.hasMaxPatterns && !bki5.isEmpty() && !bki3.isEmpty() && !bki4.isEmpty());
         }
-        this.bannerStack = ben3.copy();
-        this.dyeStack = ben4.copy();
-        this.patternStack = ben5.copy();
+        this.bannerStack = bki3.copy();
+        this.dyeStack = bki4.copy();
+        this.patternStack = bki5.copy();
     }
     
     static {
         BG_LOCATION = new ResourceLocation("textures/gui/container/loom.png");
-        TOTAL_PATTERN_ROWS = (BannerPattern.COUNT - 5 - 1 + 4 - 1) / 4;
+        TOTAL_PATTERN_ROWS = (BannerPattern.COUNT - BannerPattern.PATTERN_ITEM_COUNT - 1 + 4 - 1) / 4;
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/MerchantScreen.java b/src/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
index 865ca8c..c3a3a0c 100644
--- a/src/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
@@ -1,15 +1,19 @@
 package net.minecraft.client.gui.screens.inventory;
 
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.world.item.ItemStack;
 import java.util.Iterator;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.npc.VillagerData;
 import net.minecraft.world.item.trading.MerchantOffers;
 import net.minecraft.world.item.trading.MerchantOffer;
 import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundSelectTradePacket;
 import net.minecraft.network.chat.Component;
@@ -24,10 +28,11 @@ public class MerchantScreen extends AbstractContainerScreen<MerchantMenu> {
     private int scrollOff;
     private boolean isDragging;
     
-    public MerchantScreen(final MerchantMenu bbq, final Inventory ayi, final Component lf) {
-        super(bbq, ayi, lf);
+    public MerchantScreen(final MerchantMenu bhm, final Inventory beb, final Component mr) {
+        super(bhm, beb, mr);
         this.tradeOfferButtons = new TradeOfferButton[7];
         this.imageWidth = 276;
+        this.inventoryLabelX = 107;
     }
     
     private void postButtonClick() {
@@ -43,9 +48,9 @@ public class MerchantScreen extends AbstractContainerScreen<MerchantMenu> {
         final int integer3 = (this.height - this.imageHeight) / 2;
         int integer4 = integer3 + 16 + 2;
         for (int integer5 = 0; integer5 < 7; ++integer5) {
-            this.tradeOfferButtons[integer5] = this.<TradeOfferButton>addButton(new TradeOfferButton(integer2 + 5, integer4, integer5, dcv -> {
-                if (dcv instanceof TradeOfferButton) {
-                    this.shopItem = dcv.getIndex() + this.scrollOff;
+            this.tradeOfferButtons[integer5] = this.<TradeOfferButton>addButton(new TradeOfferButton(integer2 + 5, integer4, integer5, dni -> {
+                if (dni instanceof TradeOfferButton) {
+                    this.shopItem = dni.getIndex() + this.scrollOff;
                     this.postButtonClick();
                 }
                 return;
@@ -55,173 +60,169 @@ public class MerchantScreen extends AbstractContainerScreen<MerchantMenu> {
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        final int integer3 = ((MerchantMenu)this.menu).getTraderLevel();
-        final int integer4 = this.imageHeight - 94;
-        if (integer3 > 0 && integer3 <= 5 && ((MerchantMenu)this.menu).showProgressBar()) {
-            final String string6 = this.title.getColoredString();
-            final String string7 = "- " + I18n.get("merchant.level." + integer3);
-            final int integer5 = this.font.width(string6);
-            final int integer6 = this.font.width(string7);
+    protected void renderLabels(final PoseStack dhl, final int integer2, final int integer3) {
+        final int integer4 = ((MerchantMenu)this.menu).getTraderLevel();
+        if (integer4 > 0 && integer4 <= 5 && ((MerchantMenu)this.menu).showProgressBar()) {
+            final String string6 = "- " + I18n.get("merchant.level." + integer4);
+            final int integer5 = this.font.width(this.title);
+            final int integer6 = this.font.width(string6);
             final int integer7 = integer5 + integer6 + 3;
             final int integer8 = 49 + this.imageWidth / 2 - integer7 / 2;
-            this.font.draw(string6, (float)integer8, 6.0f, 4210752);
-            this.font.draw(this.inventory.getDisplayName().getColoredString(), 107.0f, (float)integer4, 4210752);
-            this.font.draw(string7, (float)(integer8 + integer5 + 3), 6.0f, 4210752);
+            this.font.draw(dhl, this.title, (float)integer8, 6.0f, 4210752);
+            this.font.draw(dhl, string6, (float)(integer8 + integer5 + 3), 6.0f, 4210752);
         }
         else {
-            final String string6 = this.title.getColoredString();
-            this.font.draw(string6, (float)(49 + this.imageWidth / 2 - this.font.width(string6) / 2), 6.0f, 4210752);
-            this.font.draw(this.inventory.getDisplayName().getColoredString(), 107.0f, (float)integer4, 4210752);
+            this.font.draw(dhl, this.title, (float)(49 + this.imageWidth / 2 - this.font.width(this.title) / 2), 6.0f, 4210752);
         }
+        this.font.draw(dhl, this.inventory.getDisplayName(), (float)this.inventoryLabelX, (float)this.inventoryLabelY, 4210752);
         final String string6 = I18n.get("merchant.trades");
-        final int integer9 = this.font.width(string6);
-        this.font.draw(string6, (float)(5 - integer9 / 2 + 48), 6.0f, 4210752);
+        final int integer5 = this.font.width(string6);
+        this.font.draw(dhl, string6, (float)(5 - integer5 / 2 + 48), 6.0f, 4210752);
     }
     
     @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(MerchantScreen.VILLAGER_LOCATION);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        GuiComponent.blit(integer4, integer5, this.getBlitOffset(), 0.0f, 0.0f, this.imageWidth, this.imageHeight, 256, 512);
-        final MerchantOffers bja7 = ((MerchantMenu)this.menu).getOffers();
-        if (!bja7.isEmpty()) {
-            final int integer6 = this.shopItem;
-            if (integer6 < 0 || integer6 >= bja7.size()) {
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        GuiComponent.blit(dhl, integer5, integer6, this.getBlitOffset(), 0.0f, 0.0f, this.imageWidth, this.imageHeight, 256, 512);
+        final MerchantOffers bpa8 = ((MerchantMenu)this.menu).getOffers();
+        if (!bpa8.isEmpty()) {
+            final int integer7 = this.shopItem;
+            if (integer7 < 0 || integer7 >= bpa8.size()) {
                 return;
             }
-            final MerchantOffer biz9 = bja7.get(integer6);
-            if (biz9.isOutOfStock()) {
+            final MerchantOffer boz10 = bpa8.get(integer7);
+            if (boz10.isOutOfStock()) {
                 this.minecraft.getTextureManager().bind(MerchantScreen.VILLAGER_LOCATION);
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                GuiComponent.blit(this.leftPos + 83 + 99, this.topPos + 35, this.getBlitOffset(), 311.0f, 0.0f, 28, 21, 256, 512);
+                GuiComponent.blit(dhl, this.leftPos + 83 + 99, this.topPos + 35, this.getBlitOffset(), 311.0f, 0.0f, 28, 21, 256, 512);
             }
         }
     }
     
-    private void renderProgressBar(final int integer1, final int integer2, final MerchantOffer biz) {
+    private void renderProgressBar(final PoseStack dhl, final int integer2, final int integer3, final MerchantOffer boz) {
         this.minecraft.getTextureManager().bind(MerchantScreen.VILLAGER_LOCATION);
-        final int integer3 = ((MerchantMenu)this.menu).getTraderLevel();
-        final int integer4 = ((MerchantMenu)this.menu).getTraderXp();
-        if (integer3 >= 5) {
+        final int integer4 = ((MerchantMenu)this.menu).getTraderLevel();
+        final int integer5 = ((MerchantMenu)this.menu).getTraderXp();
+        if (integer4 >= 5) {
             return;
         }
-        GuiComponent.blit(integer1 + 136, integer2 + 16, this.getBlitOffset(), 0.0f, 186.0f, 102, 5, 256, 512);
-        final int integer5 = VillagerData.getMinXpPerLevel(integer3);
-        if (integer4 < integer5 || !VillagerData.canLevelUp(integer3)) {
+        GuiComponent.blit(dhl, integer2 + 136, integer3 + 16, this.getBlitOffset(), 0.0f, 186.0f, 102, 5, 256, 512);
+        final int integer6 = VillagerData.getMinXpPerLevel(integer4);
+        if (integer5 < integer6 || !VillagerData.canLevelUp(integer4)) {
             return;
         }
-        final int integer6 = 100;
-        final float float9 = (float)(100 / (VillagerData.getMaxXpPerLevel(integer3) - integer5));
-        final int integer7 = Math.min(Mth.floor(float9 * (integer4 - integer5)), 100);
-        GuiComponent.blit(integer1 + 136, integer2 + 16, this.getBlitOffset(), 0.0f, 191.0f, integer7 + 1, 5, 256, 512);
-        final int integer8 = ((MerchantMenu)this.menu).getFutureTraderXp();
-        if (integer8 > 0) {
-            final int integer9 = Math.min(Mth.floor(integer8 * float9), 100 - integer7);
-            GuiComponent.blit(integer1 + 136 + integer7 + 1, integer2 + 16 + 1, this.getBlitOffset(), 2.0f, 182.0f, integer9, 3, 256, 512);
+        final int integer7 = 100;
+        final float float10 = 100.0f / (VillagerData.getMaxXpPerLevel(integer4) - integer6);
+        final int integer8 = Math.min(Mth.floor(float10 * (integer5 - integer6)), 100);
+        GuiComponent.blit(dhl, integer2 + 136, integer3 + 16, this.getBlitOffset(), 0.0f, 191.0f, integer8 + 1, 5, 256, 512);
+        final int integer9 = ((MerchantMenu)this.menu).getFutureTraderXp();
+        if (integer9 > 0) {
+            final int integer10 = Math.min(Mth.floor(integer9 * float10), 100 - integer8);
+            GuiComponent.blit(dhl, integer2 + 136 + integer8 + 1, integer3 + 16 + 1, this.getBlitOffset(), 2.0f, 182.0f, integer10, 3, 256, 512);
         }
     }
     
-    private void renderScroller(final int integer1, final int integer2, final MerchantOffers bja) {
-        final int integer3 = bja.size() + 1 - 7;
-        if (integer3 > 1) {
-            final int integer4 = 139 - (27 + (integer3 - 1) * 139 / integer3);
-            final int integer5 = 1 + integer4 / integer3 + 139 / integer3;
-            final int integer6 = 113;
-            int integer7 = Math.min(113, this.scrollOff * integer5);
-            if (this.scrollOff == integer3 - 1) {
-                integer7 = 113;
+    private void renderScroller(final PoseStack dhl, final int integer2, final int integer3, final MerchantOffers bpa) {
+        final int integer4 = bpa.size() + 1 - 7;
+        if (integer4 > 1) {
+            final int integer5 = 139 - (27 + (integer4 - 1) * 139 / integer4);
+            final int integer6 = 1 + integer5 / integer4 + 139 / integer4;
+            final int integer7 = 113;
+            int integer8 = Math.min(113, this.scrollOff * integer6);
+            if (this.scrollOff == integer4 - 1) {
+                integer8 = 113;
             }
-            GuiComponent.blit(integer1 + 94, integer2 + 18 + integer7, this.getBlitOffset(), 0.0f, 199.0f, 6, 27, 256, 512);
+            GuiComponent.blit(dhl, integer2 + 94, integer3 + 18 + integer8, this.getBlitOffset(), 0.0f, 199.0f, 6, 27, 256, 512);
         }
         else {
-            GuiComponent.blit(integer1 + 94, integer2 + 18, this.getBlitOffset(), 6.0f, 199.0f, 6, 27, 256, 512);
+            GuiComponent.blit(dhl, integer2 + 94, integer3 + 18, this.getBlitOffset(), 6.0f, 199.0f, 6, 27, 256, 512);
         }
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
-        final MerchantOffers bja5 = ((MerchantMenu)this.menu).getOffers();
-        if (!bja5.isEmpty()) {
-            final int integer3 = (this.width - this.imageWidth) / 2;
-            final int integer4 = (this.height - this.imageHeight) / 2;
-            int integer5 = integer4 + 16 + 1;
-            final int integer6 = integer3 + 5 + 5;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        final MerchantOffers bpa6 = ((MerchantMenu)this.menu).getOffers();
+        if (!bpa6.isEmpty()) {
+            final int integer4 = (this.width - this.imageWidth) / 2;
+            final int integer5 = (this.height - this.imageHeight) / 2;
+            int integer6 = integer5 + 16 + 1;
+            final int integer7 = integer4 + 5 + 5;
             RenderSystem.pushMatrix();
             RenderSystem.enableRescaleNormal();
             this.minecraft.getTextureManager().bind(MerchantScreen.VILLAGER_LOCATION);
-            this.renderScroller(integer3, integer4, bja5);
-            int integer7 = 0;
-            for (final MerchantOffer biz12 : bja5) {
-                if (this.canScroll(bja5.size()) && (integer7 < this.scrollOff || integer7 >= 7 + this.scrollOff)) {
-                    ++integer7;
+            this.renderScroller(dhl, integer4, integer5, bpa6);
+            int integer8 = 0;
+            for (final MerchantOffer boz13 : bpa6) {
+                if (this.canScroll(bpa6.size()) && (integer8 < this.scrollOff || integer8 >= 7 + this.scrollOff)) {
+                    ++integer8;
                 }
                 else {
-                    final ItemStack ben13 = biz12.getBaseCostA();
-                    final ItemStack ben14 = biz12.getCostA();
-                    final ItemStack ben15 = biz12.getCostB();
-                    final ItemStack ben16 = biz12.getResult();
+                    final ItemStack bki14 = boz13.getBaseCostA();
+                    final ItemStack bki15 = boz13.getCostA();
+                    final ItemStack bki16 = boz13.getCostB();
+                    final ItemStack bki17 = boz13.getResult();
                     this.itemRenderer.blitOffset = 100.0f;
-                    final int integer8 = integer5 + 2;
-                    this.renderAndDecorateCostA(ben14, ben13, integer6, integer8);
-                    if (!ben15.isEmpty()) {
-                        this.itemRenderer.renderAndDecorateItem(ben15, integer3 + 5 + 35, integer8);
-                        this.itemRenderer.renderGuiItemDecorations(this.font, ben15, integer3 + 5 + 35, integer8);
+                    final int integer9 = integer6 + 2;
+                    this.renderAndDecorateCostA(dhl, bki15, bki14, integer7, integer9);
+                    if (!bki16.isEmpty()) {
+                        this.itemRenderer.renderAndDecorateFakeItem(bki16, integer4 + 5 + 35, integer9);
+                        this.itemRenderer.renderGuiItemDecorations(this.font, bki16, integer4 + 5 + 35, integer9);
                     }
-                    this.renderButtonArrows(biz12, integer3, integer8);
-                    this.itemRenderer.renderAndDecorateItem(ben16, integer3 + 5 + 68, integer8);
-                    this.itemRenderer.renderGuiItemDecorations(this.font, ben16, integer3 + 5 + 68, integer8);
+                    this.renderButtonArrows(dhl, boz13, integer4, integer9);
+                    this.itemRenderer.renderAndDecorateFakeItem(bki17, integer4 + 5 + 68, integer9);
+                    this.itemRenderer.renderGuiItemDecorations(this.font, bki17, integer4 + 5 + 68, integer9);
                     this.itemRenderer.blitOffset = 0.0f;
-                    integer5 += 20;
-                    ++integer7;
+                    integer6 += 20;
+                    ++integer8;
                 }
             }
-            final int integer9 = this.shopItem;
-            MerchantOffer biz12 = bja5.get(integer9);
+            final int integer10 = this.shopItem;
+            MerchantOffer boz13 = bpa6.get(integer10);
             if (((MerchantMenu)this.menu).showProgressBar()) {
-                this.renderProgressBar(integer3, integer4, biz12);
+                this.renderProgressBar(dhl, integer4, integer5, boz13);
             }
-            if (biz12.isOutOfStock() && this.isHovering(186, 35, 22, 21, integer1, integer2) && ((MerchantMenu)this.menu).canRestock()) {
-                this.renderTooltip(I18n.get("merchant.deprecated"), integer1, integer2);
+            if (boz13.isOutOfStock() && this.isHovering(186, 35, 22, 21, integer2, integer3) && ((MerchantMenu)this.menu).canRestock()) {
+                this.renderTooltip(dhl, new TranslatableComponent("merchant.deprecated"), integer2, integer3);
             }
-            for (final TradeOfferButton a16 : this.tradeOfferButtons) {
-                if (a16.isHovered()) {
-                    a16.renderToolTip(integer1, integer2);
+            for (final TradeOfferButton a17 : this.tradeOfferButtons) {
+                if (a17.isHovered()) {
+                    a17.renderToolTip(dhl, integer2, integer3);
                 }
-                a16.visible = (a16.index < ((MerchantMenu)this.menu).getOffers().size());
+                a17.visible = (a17.index < ((MerchantMenu)this.menu).getOffers().size());
             }
             RenderSystem.popMatrix();
             RenderSystem.enableDepthTest();
         }
-        this.renderTooltip(integer1, integer2);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
-    private void renderButtonArrows(final MerchantOffer biz, final int integer2, final int integer3) {
+    private void renderButtonArrows(final PoseStack dhl, final MerchantOffer boz, final int integer3, final int integer4) {
         RenderSystem.enableBlend();
         this.minecraft.getTextureManager().bind(MerchantScreen.VILLAGER_LOCATION);
-        if (biz.isOutOfStock()) {
-            GuiComponent.blit(integer2 + 5 + 35 + 20, integer3 + 3, this.getBlitOffset(), 25.0f, 171.0f, 10, 9, 256, 512);
+        if (boz.isOutOfStock()) {
+            GuiComponent.blit(dhl, integer3 + 5 + 35 + 20, integer4 + 3, this.getBlitOffset(), 25.0f, 171.0f, 10, 9, 256, 512);
         }
         else {
-            GuiComponent.blit(integer2 + 5 + 35 + 20, integer3 + 3, this.getBlitOffset(), 15.0f, 171.0f, 10, 9, 256, 512);
+            GuiComponent.blit(dhl, integer3 + 5 + 35 + 20, integer4 + 3, this.getBlitOffset(), 15.0f, 171.0f, 10, 9, 256, 512);
         }
     }
     
-    private void renderAndDecorateCostA(final ItemStack ben1, final ItemStack ben2, final int integer3, final int integer4) {
-        this.itemRenderer.renderAndDecorateItem(ben1, integer3, integer4);
-        if (ben2.getCount() == ben1.getCount()) {
-            this.itemRenderer.renderGuiItemDecorations(this.font, ben1, integer3, integer4);
+    private void renderAndDecorateCostA(final PoseStack dhl, final ItemStack bki2, final ItemStack bki3, final int integer4, final int integer5) {
+        this.itemRenderer.renderAndDecorateFakeItem(bki2, integer4, integer5);
+        if (bki3.getCount() == bki2.getCount()) {
+            this.itemRenderer.renderGuiItemDecorations(this.font, bki2, integer4, integer5);
         }
         else {
-            this.itemRenderer.renderGuiItemDecorations(this.font, ben2, integer3, integer4, (ben2.getCount() == 1) ? "1" : null);
-            this.itemRenderer.renderGuiItemDecorations(this.font, ben1, integer3 + 14, integer4, (ben1.getCount() == 1) ? "1" : null);
+            this.itemRenderer.renderGuiItemDecorations(this.font, bki3, integer4, integer5, (bki3.getCount() == 1) ? "1" : null);
+            this.itemRenderer.renderGuiItemDecorations(this.font, bki2, integer4 + 14, integer5, (bki2.getCount() == 1) ? "1" : null);
             this.minecraft.getTextureManager().bind(MerchantScreen.VILLAGER_LOCATION);
             this.setBlitOffset(this.getBlitOffset() + 300);
-            GuiComponent.blit(integer3 + 7, integer4 + 12, this.getBlitOffset(), 0.0f, 176.0f, 9, 2, 256, 512);
+            GuiComponent.blit(dhl, integer4 + 7, integer5 + 12, this.getBlitOffset(), 0.0f, 176.0f, 9, 2, 256, 512);
             this.setBlitOffset(this.getBlitOffset() - 300);
         }
     }
@@ -275,7 +276,7 @@ public class MerchantScreen extends AbstractContainerScreen<MerchantMenu> {
         final int index;
         
         public TradeOfferButton(final int integer2, final int integer3, final int integer4, final OnPress a) {
-            super(integer2, integer3, 89, 20, "", a);
+            super(integer2, integer3, 89, 20, TextComponent.EMPTY, a);
             this.index = integer4;
             this.visible = false;
         }
@@ -285,21 +286,21 @@ public class MerchantScreen extends AbstractContainerScreen<MerchantMenu> {
         }
         
         @Override
-        public void renderToolTip(final int integer1, final int integer2) {
+        public void renderToolTip(final PoseStack dhl, final int integer2, final int integer3) {
             if (this.isHovered && ((MerchantMenu)MerchantScreen.this.menu).getOffers().size() > this.index + MerchantScreen.this.scrollOff) {
-                if (integer1 < this.x + 20) {
-                    final ItemStack ben4 = ((MerchantMenu)MerchantScreen.this.menu).getOffers().get(this.index + MerchantScreen.this.scrollOff).getCostA();
-                    Screen.this.renderTooltip(ben4, integer1, integer2);
+                if (integer2 < this.x + 20) {
+                    final ItemStack bki5 = ((MerchantMenu)MerchantScreen.this.menu).getOffers().get(this.index + MerchantScreen.this.scrollOff).getCostA();
+                    Screen.this.renderTooltip(dhl, bki5, integer2, integer3);
                 }
-                else if (integer1 < this.x + 50 && integer1 > this.x + 30) {
-                    final ItemStack ben4 = ((MerchantMenu)MerchantScreen.this.menu).getOffers().get(this.index + MerchantScreen.this.scrollOff).getCostB();
-                    if (!ben4.isEmpty()) {
-                        Screen.this.renderTooltip(ben4, integer1, integer2);
+                else if (integer2 < this.x + 50 && integer2 > this.x + 30) {
+                    final ItemStack bki5 = ((MerchantMenu)MerchantScreen.this.menu).getOffers().get(this.index + MerchantScreen.this.scrollOff).getCostB();
+                    if (!bki5.isEmpty()) {
+                        Screen.this.renderTooltip(dhl, bki5, integer2, integer3);
                     }
                 }
-                else if (integer1 > this.x + 65) {
-                    final ItemStack ben4 = ((MerchantMenu)MerchantScreen.this.menu).getOffers().get(this.index + MerchantScreen.this.scrollOff).getResult();
-                    Screen.this.renderTooltip(ben4, integer1, integer2);
+                else if (integer2 > this.x + 65) {
+                    final ItemStack bki5 = ((MerchantMenu)MerchantScreen.this.menu).getOffers().get(this.index + MerchantScreen.this.scrollOff).getResult();
+                    Screen.this.renderTooltip(dhl, bki5, integer2, integer3);
                 }
             }
         }
diff --git a/src/net/minecraft/client/gui/screens/inventory/MinecartCommandBlockEditScreen.java b/src/net/minecraft/client/gui/screens/inventory/MinecartCommandBlockEditScreen.java
index b562cc2..b68c52b 100644
--- a/src/net/minecraft/client/gui/screens/inventory/MinecartCommandBlockEditScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/MinecartCommandBlockEditScreen.java
@@ -8,8 +8,8 @@ import net.minecraft.world.level.BaseCommandBlock;
 public class MinecartCommandBlockEditScreen extends AbstractCommandBlockEditScreen {
     private final BaseCommandBlock commandBlock;
     
-    public MinecartCommandBlockEditScreen(final BaseCommandBlock bjc) {
-        this.commandBlock = bjc;
+    public MinecartCommandBlockEditScreen(final BaseCommandBlock bpc) {
+        this.commandBlock = bpc;
     }
     
     public BaseCommandBlock getCommandBlock() {
@@ -30,10 +30,10 @@ public class MinecartCommandBlockEditScreen extends AbstractCommandBlockEditScre
     }
     
     @Override
-    protected void populateAndSendPacket(final BaseCommandBlock bjc) {
-        if (bjc instanceof MinecartCommandBlock.MinecartCommandBase) {
-            final MinecartCommandBlock.MinecartCommandBase a3 = (MinecartCommandBlock.MinecartCommandBase)bjc;
-            this.minecraft.getConnection().send(new ServerboundSetCommandMinecartPacket(a3.getMinecart().getId(), this.commandEdit.getValue(), bjc.isTrackOutput()));
+    protected void populateAndSendPacket(final BaseCommandBlock bpc) {
+        if (bpc instanceof MinecartCommandBlock.MinecartCommandBase) {
+            final MinecartCommandBlock.MinecartCommandBase a3 = (MinecartCommandBlock.MinecartCommandBase)bpc;
+            this.minecraft.getConnection().send(new ServerboundSetCommandMinecartPacket(a3.getMinecart().getId(), this.commandEdit.getValue(), bpc.isTrackOutput()));
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/PageButton.java b/src/net/minecraft/client/gui/screens/inventory/PageButton.java
index 5f82a34..9602e80 100644
--- a/src/net/minecraft/client/gui/screens/inventory/PageButton.java
+++ b/src/net/minecraft/client/gui/screens/inventory/PageButton.java
@@ -6,6 +6,8 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.client.sounds.SoundManager;
 import net.minecraft.client.Minecraft;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.client.gui.components.Button;
 
 public class PageButton extends Button {
@@ -13,30 +15,30 @@ public class PageButton extends Button {
     private final boolean playTurnSound;
     
     public PageButton(final int integer1, final int integer2, final boolean boolean3, final OnPress a, final boolean boolean5) {
-        super(integer1, integer2, 23, 13, "", a);
+        super(integer1, integer2, 23, 13, TextComponent.EMPTY, a);
         this.isForward = boolean3;
         this.playTurnSound = boolean5;
     }
     
     @Override
-    public void renderButton(final int integer1, final int integer2, final float float3) {
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         Minecraft.getInstance().getTextureManager().bind(BookViewScreen.BOOK_LOCATION);
-        int integer3 = 0;
-        int integer4 = 192;
+        int integer4 = 0;
+        int integer5 = 192;
         if (this.isHovered()) {
-            integer3 += 23;
+            integer4 += 23;
         }
         if (!this.isForward) {
-            integer4 += 13;
+            integer5 += 13;
         }
-        this.blit(this.x, this.y, integer3, integer4, 23, 13);
+        this.blit(dhl, this.x, this.y, integer4, integer5, 23, 13);
     }
     
     @Override
-    public void playDownSound(final SoundManager edz) {
+    public void playDownSound(final SoundManager epn) {
         if (this.playTurnSound) {
-            edz.play(SimpleSoundInstance.forUI(SoundEvents.BOOK_PAGE_TURN, 1.0f));
+            epn.play(SimpleSoundInstance.forUI(SoundEvents.BOOK_PAGE_TURN, 1.0f));
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/ShulkerBoxScreen.java b/src/net/minecraft/client/gui/screens/inventory/ShulkerBoxScreen.java
index f432102..8c877e6 100644
--- a/src/net/minecraft/client/gui/screens/inventory/ShulkerBoxScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/ShulkerBoxScreen.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.gui.screens.inventory;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.resources.ResourceLocation;
@@ -9,31 +10,25 @@ import net.minecraft.world.inventory.ShulkerBoxMenu;
 public class ShulkerBoxScreen extends AbstractContainerScreen<ShulkerBoxMenu> {
     private static final ResourceLocation CONTAINER_TEXTURE;
     
-    public ShulkerBoxScreen(final ShulkerBoxMenu bbx, final Inventory ayi, final Component lf) {
-        super(bbx, ayi, lf);
+    public ShulkerBoxScreen(final ShulkerBoxMenu bht, final Inventory beb, final Component mr) {
+        super(bht, beb, mr);
         ++this.imageHeight;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 8.0f, 6.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 96 + 2), 4210752);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(ShulkerBoxScreen.CONTAINER_TEXTURE);
-        final int integer4 = (this.width - this.imageWidth) / 2;
-        final int integer5 = (this.height - this.imageHeight) / 2;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer5 = (this.width - this.imageWidth) / 2;
+        final int integer6 = (this.height - this.imageHeight) / 2;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/inventory/SignEditScreen.java b/src/net/minecraft/client/gui/screens/inventory/SignEditScreen.java
index 481f69c..e7d3be0 100644
--- a/src/net/minecraft/client/gui/screens/inventory/SignEditScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/SignEditScreen.java
@@ -2,7 +2,6 @@ package net.minecraft.client.gui.screens.inventory;
 
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.math.Matrix4f;
-import java.util.List;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.resources.model.Material;
 import net.minecraft.world.level.block.state.BlockState;
@@ -12,18 +11,20 @@ import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.Tesselator;
 import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.client.gui.components.ComponentRenderUtils;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.world.level.block.StandingSignBlock;
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.FormattedText;
 import com.mojang.blaze3d.platform.Lighting;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.Util;
+import java.util.Arrays;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.gui.font.TextFieldHelper;
@@ -37,27 +38,32 @@ public class SignEditScreen extends Screen {
     private int frame;
     private int line;
     private TextFieldHelper signField;
+    private final String[] messages;
     
-    public SignEditScreen(final SignBlockEntity bxh) {
-        super(new TranslatableComponent("sign.edit", new Object[0]));
+    public SignEditScreen(final SignBlockEntity ceh) {
+        super(new TranslatableComponent("sign.edit"));
         this.signModel = new SignRenderer.SignModel();
-        this.sign = bxh;
+        this.messages = Util.<String[]>make(new String[4], arr -> Arrays.fill(arr, ""));
+        this.sign = ceh;
     }
     
     @Override
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120, 200, 20, I18n.get("gui.done"), dcv -> this.onDone()));
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120, 200, 20, CommonComponents.GUI_DONE, dni -> this.onDone()));
         this.sign.setEditable(false);
-        this.signField = new TextFieldHelper(this.minecraft, () -> this.sign.getMessage(this.line).getString(), string -> this.sign.setMessage(this.line, new TextComponent(string)), 90);
+        this.signField = new TextFieldHelper(() -> this.messages[this.line], string -> {
+            this.messages[this.line] = string;
+            this.sign.setMessage(this.line, new TextComponent(string));
+        }, TextFieldHelper.createClipboardGetter(this.minecraft), TextFieldHelper.createClipboardSetter(this.minecraft), string -> this.minecraft.font.width(string) <= 90);
     }
     
     @Override
     public void removed() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
-        final ClientPacketListener dnp2 = this.minecraft.getConnection();
-        if (dnp2 != null) {
-            dnp2.send(new ServerboundSignUpdatePacket(this.sign.getBlockPos(), this.sign.getMessage(0), this.sign.getMessage(1), this.sign.getMessage(2), this.sign.getMessage(3)));
+        final ClientPacketListener dyn2 = this.minecraft.getConnection();
+        if (dyn2 != null) {
+            dyn2.send(new ServerboundSignUpdatePacket(this.sign.getBlockPos(), this.messages[0], this.messages[1], this.messages[2], this.messages[3]));
         }
         this.sign.setEditable(true);
     }
@@ -90,131 +96,123 @@ public class SignEditScreen extends Screen {
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 265) {
             this.line = (this.line - 1 & 0x3);
-            this.signField.setEnd();
+            this.signField.setCursorToEnd();
             return true;
         }
         if (integer1 == 264 || integer1 == 257 || integer1 == 335) {
             this.line = (this.line + 1 & 0x3);
-            this.signField.setEnd();
+            this.signField.setCursorToEnd();
             return true;
         }
         return this.signField.keyPressed(integer1) || super.keyPressed(integer1, integer2, integer3);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         Lighting.setupForFlatItems();
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 40, 16777215);
-        final PoseStack cyl5 = new PoseStack();
-        cyl5.pushPose();
-        cyl5.translate(this.width / 2, 0.0, 50.0);
-        final float float4 = 93.75f;
-        cyl5.scale(93.75f, -93.75f, 93.75f);
-        cyl5.translate(0.0, -1.3125, 0.0);
-        final BlockState byj7 = this.sign.getBlockState();
-        final boolean boolean8 = byj7.getBlock() instanceof StandingSignBlock;
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 40, 16777215);
+        dhl.pushPose();
+        dhl.translate(this.width / 2, 0.0, 50.0);
+        final float float5 = 93.75f;
+        dhl.scale(93.75f, -93.75f, 93.75f);
+        dhl.translate(0.0, -1.3125, 0.0);
+        final BlockState cfj7 = this.sign.getBlockState();
+        final boolean boolean8 = cfj7.getBlock() instanceof StandingSignBlock;
         if (!boolean8) {
-            cyl5.translate(0.0, -0.3125, 0.0);
+            dhl.translate(0.0, -0.3125, 0.0);
         }
         final boolean boolean9 = this.frame / 6 % 2 == 0;
-        final float float5 = 0.6666667f;
-        cyl5.pushPose();
-        cyl5.scale(0.6666667f, -0.6666667f, -0.6666667f);
+        final float float6 = 0.6666667f;
+        dhl.pushPose();
+        dhl.scale(0.6666667f, -0.6666667f, -0.6666667f);
         final MultiBufferSource.BufferSource a11 = this.minecraft.renderBuffers().bufferSource();
-        final Material eby12 = SignRenderer.getMaterial(byj7.getBlock());
-        final VertexConsumer cyo13 = eby12.buffer(a11, this.signModel::renderType);
-        this.signModel.sign.render(cyl5, cyo13, 15728880, OverlayTexture.NO_OVERLAY);
+        final Material enk12 = SignRenderer.getMaterial(cfj7.getBlock());
+        final VertexConsumer dhp13 = enk12.buffer(a11, this.signModel::renderType);
+        this.signModel.sign.render(dhl, dhp13, 15728880, OverlayTexture.NO_OVERLAY);
         if (boolean8) {
-            this.signModel.stick.render(cyl5, cyo13, 15728880, OverlayTexture.NO_OVERLAY);
+            this.signModel.stick.render(dhl, dhp13, 15728880, OverlayTexture.NO_OVERLAY);
         }
-        cyl5.popPose();
-        final float float6 = 0.010416667f;
-        cyl5.translate(0.0, 0.3333333432674408, 0.046666666865348816);
-        cyl5.scale(0.010416667f, -0.010416667f, 0.010416667f);
-        final int integer3 = this.sign.getColor().getTextColor();
-        final String[] arr16 = new String[4];
-        for (int integer4 = 0; integer4 < arr16.length; ++integer4) {
-            final List<Component> list3;
-            arr16[integer4] = this.sign.getRenderMessage(integer4, lf -> {
-                list3 = ComponentRenderUtils.wrapComponents(lf, 90, this.minecraft.font, false, true);
-                return list3.isEmpty() ? "" : list3.get(0).getColoredString();
-            });
-        }
-        final Matrix4f b17 = cyl5.last().pose();
+        dhl.popPose();
+        final float float7 = 0.010416667f;
+        dhl.translate(0.0, 0.3333333432674408, 0.046666666865348816);
+        dhl.scale(0.010416667f, -0.010416667f, 0.010416667f);
+        final int integer4 = this.sign.getColor().getTextColor();
         final int integer5 = this.signField.getCursorPos();
         final int integer6 = this.signField.getSelectionPos();
-        final int integer7 = this.minecraft.font.isBidirectional() ? -1 : 1;
-        final int integer8 = this.line * 10 - this.sign.messages.length * 5;
-        for (int integer9 = 0; integer9 < arr16.length; ++integer9) {
-            final String string23 = arr16[integer9];
-            if (string23 != null) {
-                final float float7 = (float)(-this.minecraft.font.width(string23) / 2);
-                this.minecraft.font.drawInBatch(string23, float7, (float)(integer9 * 10 - this.sign.messages.length * 5), integer3, false, b17, a11, false, 0, 15728880);
-                if (integer9 == this.line && integer5 >= 0) {
+        final int integer7 = this.line * 10 - this.messages.length * 5;
+        final Matrix4f b19 = dhl.last().pose();
+        for (int integer8 = 0; integer8 < this.messages.length; ++integer8) {
+            String string21 = this.messages[integer8];
+            if (string21 != null) {
+                if (this.font.isBidirectional()) {
+                    string21 = this.font.bidirectionalShaping(string21);
+                }
+                final float float8 = (float)(-this.minecraft.font.width(string21) / 2);
+                this.minecraft.font.drawInBatch(string21, float8, (float)(integer8 * 10 - this.messages.length * 5), integer4, false, b19, a11, false, 0, 15728880, false);
+                if (integer8 == this.line && integer5 >= 0) {
                     if (boolean9) {
-                        final int integer10 = this.minecraft.font.width(string23.substring(0, Math.max(Math.min(integer5, string23.length()), 0)));
-                        final int integer11 = (integer10 - this.minecraft.font.width(string23) / 2) * integer7;
-                        if (integer5 >= string23.length()) {
-                            this.minecraft.font.drawInBatch("_", (float)integer11, (float)integer8, integer3, false, b17, a11, false, 0, 15728880);
+                        final int integer9 = this.minecraft.font.width(string21.substring(0, Math.max(Math.min(integer5, string21.length()), 0)));
+                        final int integer10 = integer9 - this.minecraft.font.width(string21) / 2;
+                        if (integer5 >= string21.length()) {
+                            this.minecraft.font.drawInBatch("_", (float)integer10, (float)integer7, integer4, false, b19, a11, false, 0, 15728880, false);
                         }
                     }
                 }
             }
         }
         a11.endBatch();
-        for (int integer9 = 0; integer9 < arr16.length; ++integer9) {
-            final String string23 = arr16[integer9];
-            if (string23 != null && integer9 == this.line) {
+        for (int integer8 = 0; integer8 < this.messages.length; ++integer8) {
+            final String string21 = this.messages[integer8];
+            if (string21 != null && integer8 == this.line) {
                 if (integer5 >= 0) {
-                    final int integer12 = this.minecraft.font.width(string23.substring(0, Math.max(Math.min(integer5, string23.length()), 0)));
-                    final int integer10 = (integer12 - this.minecraft.font.width(string23) / 2) * integer7;
-                    if (boolean9 && integer5 < string23.length()) {
-                        final Matrix4f b18 = b17;
-                        final int integer18 = integer10;
-                        final int integer19 = integer8 - 1;
-                        final int integer20 = integer10 + 1;
-                        final int n = integer8;
+                    final int integer11 = this.minecraft.font.width(string21.substring(0, Math.max(Math.min(integer5, string21.length()), 0)));
+                    final int integer9 = integer11 - this.minecraft.font.width(string21) / 2;
+                    if (boolean9 && integer5 < string21.length()) {
+                        final int integer17 = integer9;
+                        final int integer18 = integer7 - 1;
+                        final int integer19 = integer9 + 1;
+                        final int n = integer7;
                         this.minecraft.font.getClass();
-                        GuiComponent.fill(b18, integer18, integer19, integer20, n + 9, 0xFF000000 | integer3);
+                        GuiComponent.fill(dhl, integer17, integer18, integer19, n + 9, 0xFF000000 | integer4);
                     }
                     if (integer6 != integer5) {
-                        final int integer11 = Math.min(integer5, integer6);
-                        final int integer13 = Math.max(integer5, integer6);
-                        final int integer14 = (this.minecraft.font.width(string23.substring(0, integer11)) - this.minecraft.font.width(string23) / 2) * integer7;
-                        final int integer15 = (this.minecraft.font.width(string23.substring(0, integer13)) - this.minecraft.font.width(string23) / 2) * integer7;
-                        final int integer16 = Math.min(integer14, integer15);
-                        final int integer17 = Math.max(integer14, integer15);
-                        final Tesselator cym32 = Tesselator.getInstance();
-                        final BufferBuilder cyg33 = cym32.getBuilder();
+                        final int integer10 = Math.min(integer5, integer6);
+                        final int integer12 = Math.max(integer5, integer6);
+                        final int integer13 = this.minecraft.font.width(string21.substring(0, integer10)) - this.minecraft.font.width(string21) / 2;
+                        final int integer14 = this.minecraft.font.width(string21.substring(0, integer12)) - this.minecraft.font.width(string21) / 2;
+                        final int integer15 = Math.min(integer13, integer14);
+                        final int integer16 = Math.max(integer13, integer14);
+                        final Tesselator dhn30 = Tesselator.getInstance();
+                        final BufferBuilder dhg31 = dhn30.getBuilder();
                         RenderSystem.disableTexture();
                         RenderSystem.enableColorLogicOp();
                         RenderSystem.logicOp(GlStateManager.LogicOp.OR_REVERSE);
-                        cyg33.begin(7, DefaultVertexFormat.POSITION_COLOR);
-                        final BufferBuilder bufferBuilder = cyg33;
-                        final Matrix4f b19 = b17;
-                        final float float8 = (float)integer16;
-                        final int n2 = integer8;
+                        dhg31.begin(7, DefaultVertexFormat.POSITION_COLOR);
+                        final BufferBuilder bufferBuilder = dhg31;
+                        final Matrix4f b20 = b19;
+                        final float float9 = (float)integer15;
+                        final int n2 = integer7;
                         this.minecraft.font.getClass();
-                        bufferBuilder.vertex(b19, float8, (float)(n2 + 9), 0.0f).color(0, 0, 255, 255).endVertex();
-                        final BufferBuilder bufferBuilder2 = cyg33;
-                        final Matrix4f b20 = b17;
-                        final float float9 = (float)integer17;
-                        final int n3 = integer8;
+                        bufferBuilder.vertex(b20, float9, (float)(n2 + 9), 0.0f).color(0, 0, 255, 255).endVertex();
+                        final BufferBuilder bufferBuilder2 = dhg31;
+                        final Matrix4f b21 = b19;
+                        final float float10 = (float)integer16;
+                        final int n3 = integer7;
                         this.minecraft.font.getClass();
-                        bufferBuilder2.vertex(b20, float9, (float)(n3 + 9), 0.0f).color(0, 0, 255, 255).endVertex();
-                        cyg33.vertex(b17, (float)integer17, (float)integer8, 0.0f).color(0, 0, 255, 255).endVertex();
-                        cyg33.vertex(b17, (float)integer16, (float)integer8, 0.0f).color(0, 0, 255, 255).endVertex();
-                        cyg33.end();
-                        BufferUploader.end(cyg33);
+                        bufferBuilder2.vertex(b21, float10, (float)(n3 + 9), 0.0f).color(0, 0, 255, 255).endVertex();
+                        dhg31.vertex(b19, (float)integer16, (float)integer7, 0.0f).color(0, 0, 255, 255).endVertex();
+                        dhg31.vertex(b19, (float)integer15, (float)integer7, 0.0f).color(0, 0, 255, 255).endVertex();
+                        dhg31.end();
+                        BufferUploader.end(dhg31);
                         RenderSystem.disableColorLogicOp();
                         RenderSystem.enableTexture();
                     }
                 }
             }
         }
-        cyl5.popPose();
+        dhl.popPose();
         Lighting.setupFor3DItems();
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/inventory/SmithingScreen.java b/src/net/minecraft/client/gui/screens/inventory/SmithingScreen.java
new file mode 100644
index 0000000..2fa27ad
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/inventory/SmithingScreen.java
@@ -0,0 +1,28 @@
+package net.minecraft.client.gui.screens.inventory;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.inventory.SmithingMenu;
+
+public class SmithingScreen extends ItemCombinerScreen<SmithingMenu> {
+    private static final ResourceLocation SMITHING_LOCATION;
+    
+    public SmithingScreen(final SmithingMenu bhx, final Inventory beb, final Component mr) {
+        super(bhx, beb, mr, SmithingScreen.SMITHING_LOCATION);
+        this.titleLabelX = 60;
+        this.titleLabelY = 18;
+    }
+    
+    @Override
+    protected void renderLabels(final PoseStack dhl, final int integer2, final int integer3) {
+        RenderSystem.disableBlend();
+        super.renderLabels(dhl, integer2, integer3);
+    }
+    
+    static {
+        SMITHING_LOCATION = new ResourceLocation("textures/gui/container/smithing.png");
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/inventory/SmokerScreen.java b/src/net/minecraft/client/gui/screens/inventory/SmokerScreen.java
index feadd76..6618546 100644
--- a/src/net/minecraft/client/gui/screens/inventory/SmokerScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/SmokerScreen.java
@@ -10,8 +10,8 @@ import net.minecraft.world.inventory.SmokerMenu;
 public class SmokerScreen extends AbstractFurnaceScreen<SmokerMenu> {
     private static final ResourceLocation TEXTURE;
     
-    public SmokerScreen(final SmokerMenu bcb, final Inventory ayi, final Component lf) {
-        super(bcb, new SmokingRecipeBookComponent(), ayi, lf, SmokerScreen.TEXTURE);
+    public SmokerScreen(final SmokerMenu bhy, final Inventory beb, final Component mr) {
+        super(bhy, new SmokingRecipeBookComponent(), beb, mr, SmokerScreen.TEXTURE);
     }
     
     static {
diff --git a/src/net/minecraft/client/gui/screens/inventory/StonecutterScreen.java b/src/net/minecraft/client/gui/screens/inventory/StonecutterScreen.java
index 21d15bf..f798a4b 100644
--- a/src/net/minecraft/client/gui/screens/inventory/StonecutterScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/StonecutterScreen.java
@@ -9,6 +9,7 @@ import net.minecraft.world.entity.player.Player;
 import java.util.List;
 import net.minecraft.world.item.crafting.StonecutterRecipe;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.resources.ResourceLocation;
@@ -21,54 +22,68 @@ public class StonecutterScreen extends AbstractContainerScreen<StonecutterMenu>
     private int startIndex;
     private boolean displayRecipes;
     
-    public StonecutterScreen(final StonecutterMenu bcd, final Inventory ayi, final Component lf) {
-        super(bcd, ayi, lf);
-        bcd.registerUpdateListener(this::containerChanged);
+    public StonecutterScreen(final StonecutterMenu bia, final Inventory beb, final Component mr) {
+        super(bia, beb, mr);
+        bia.registerUpdateListener(this::containerChanged);
+        --this.titleLabelY;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        super.render(integer1, integer2, float3);
-        this.renderTooltip(integer1, integer2);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        super.render(dhl, integer2, integer3, float4);
+        this.renderTooltip(dhl, integer2, integer3);
     }
     
     @Override
-    protected void renderLabels(final int integer1, final int integer2) {
-        this.font.draw(this.title.getColoredString(), 8.0f, 4.0f, 4210752);
-        this.font.draw(this.inventory.getDisplayName().getColoredString(), 8.0f, (float)(this.imageHeight - 94), 4210752);
-    }
-    
-    @Override
-    protected void renderBg(final float float1, final int integer2, final int integer3) {
-        this.renderBackground();
+    protected void renderBg(final PoseStack dhl, final float float2, final int integer3, final int integer4) {
+        this.renderBackground(dhl);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(StonecutterScreen.BG_LOCATION);
-        final int integer4 = this.leftPos;
-        final int integer5 = this.topPos;
-        this.blit(integer4, integer5, 0, 0, this.imageWidth, this.imageHeight);
-        final int integer6 = (int)(41.0f * this.scrollOffs);
-        this.blit(integer4 + 119, integer5 + 15 + integer6, 176 + (this.isScrollBarActive() ? 0 : 12), 0, 12, 15);
-        final int integer7 = this.leftPos + 52;
-        final int integer8 = this.topPos + 14;
-        final int integer9 = this.startIndex + 12;
-        this.renderButtons(integer2, integer3, integer7, integer8, integer9);
-        this.renderRecipes(integer7, integer8, integer9);
+        final int integer5 = this.leftPos;
+        final int integer6 = this.topPos;
+        this.blit(dhl, integer5, integer6, 0, 0, this.imageWidth, this.imageHeight);
+        final int integer7 = (int)(41.0f * this.scrollOffs);
+        this.blit(dhl, integer5 + 119, integer6 + 15 + integer7, 176 + (this.isScrollBarActive() ? 0 : 12), 0, 12, 15);
+        final int integer8 = this.leftPos + 52;
+        final int integer9 = this.topPos + 14;
+        final int integer10 = this.startIndex + 12;
+        this.renderButtons(dhl, integer3, integer4, integer8, integer9, integer10);
+        this.renderRecipes(integer8, integer9, integer10);
     }
     
-    private void renderButtons(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-        for (int integer6 = this.startIndex; integer6 < integer5 && integer6 < ((StonecutterMenu)this.menu).getNumRecipes(); ++integer6) {
-            final int integer7 = integer6 - this.startIndex;
-            final int integer8 = integer3 + integer7 % 4 * 16;
-            final int integer9 = integer7 / 4;
-            final int integer10 = integer4 + integer9 * 18 + 2;
-            int integer11 = this.imageHeight;
-            if (integer6 == ((StonecutterMenu)this.menu).getSelectedRecipeIndex()) {
-                integer11 += 18;
+    @Override
+    protected void renderTooltip(final PoseStack dhl, final int integer2, final int integer3) {
+        super.renderTooltip(dhl, integer2, integer3);
+        if (this.displayRecipes) {
+            final int integer4 = this.leftPos + 52;
+            final int integer5 = this.topPos + 14;
+            final int integer6 = this.startIndex + 12;
+            final List<StonecutterRecipe> list8 = ((StonecutterMenu)this.menu).getRecipes();
+            for (int integer7 = this.startIndex; integer7 < integer6 && integer7 < ((StonecutterMenu)this.menu).getNumRecipes(); ++integer7) {
+                final int integer8 = integer7 - this.startIndex;
+                final int integer9 = integer4 + integer8 % 4 * 16;
+                final int integer10 = integer5 + integer8 / 4 * 18 + 2;
+                if (integer2 >= integer9 && integer2 < integer9 + 16 && integer3 >= integer10 && integer3 < integer10 + 18) {
+                    this.renderTooltip(dhl, list8.get(integer7).getResultItem(), integer2, integer3);
+                }
             }
-            else if (integer1 >= integer8 && integer2 >= integer10 && integer1 < integer8 + 16 && integer2 < integer10 + 18) {
-                integer11 += 36;
+        }
+    }
+    
+    private void renderButtons(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        for (int integer7 = this.startIndex; integer7 < integer6 && integer7 < ((StonecutterMenu)this.menu).getNumRecipes(); ++integer7) {
+            final int integer8 = integer7 - this.startIndex;
+            final int integer9 = integer4 + integer8 % 4 * 16;
+            final int integer10 = integer8 / 4;
+            final int integer11 = integer5 + integer10 * 18 + 2;
+            int integer12 = this.imageHeight;
+            if (integer7 == ((StonecutterMenu)this.menu).getSelectedRecipeIndex()) {
+                integer12 += 18;
             }
-            this.blit(integer8, integer10 - 1, 0, integer11, 16, 18);
+            else if (integer2 >= integer9 && integer3 >= integer11 && integer2 < integer9 + 16 && integer3 < integer11 + 18) {
+                integer12 += 36;
+            }
+            this.blit(dhl, integer9, integer11 - 1, 0, integer12, 16, 18);
         }
     }
     
diff --git a/src/net/minecraft/client/gui/screens/inventory/StructureBlockEditScreen.java b/src/net/minecraft/client/gui/screens/inventory/StructureBlockEditScreen.java
index e7b72dc..90e0134 100644
--- a/src/net/minecraft/client/gui/screens/inventory/StructureBlockEditScreen.java
+++ b/src/net/minecraft/client/gui/screens/inventory/StructureBlockEditScreen.java
@@ -1,12 +1,16 @@
 package net.minecraft.client.gui.screens.inventory;
 
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundSetStructureBlockPacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.CommonComponents;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 import net.minecraft.network.chat.Component;
@@ -55,13 +59,13 @@ public class StructureBlockEditScreen extends Screen {
     private Button toggleBoundingBox;
     private final DecimalFormat decimalFormat;
     
-    public StructureBlockEditScreen(final StructureBlockEntity bxl) {
-        super(new TranslatableComponent(Blocks.STRUCTURE_BLOCK.getDescriptionId(), new Object[0]));
+    public StructureBlockEditScreen(final StructureBlockEntity cel) {
+        super(new TranslatableComponent(Blocks.STRUCTURE_BLOCK.getDescriptionId()));
         this.initialMirror = Mirror.NONE;
         this.initialRotation = Rotation.NONE;
         this.initialMode = StructureMode.DATA;
         this.decimalFormat = new DecimalFormat("0.0###");
-        this.structure = bxl;
+        this.structure = cel;
         this.decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT));
     }
     
@@ -98,40 +102,40 @@ public class StructureBlockEditScreen extends Screen {
     @Override
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 4 - 150, 210, 150, 20, I18n.get("gui.done"), dcv -> this.onDone()));
-        this.cancelButton = this.<Button>addButton(new Button(this.width / 2 + 4, 210, 150, 20, I18n.get("gui.cancel"), dcv -> this.onCancel()));
-        this.saveButton = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 185, 50, 20, I18n.get("structure_block.button.save"), dcv -> {
+        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 4 - 150, 210, 150, 20, CommonComponents.GUI_DONE, dni -> this.onDone()));
+        this.cancelButton = this.<Button>addButton(new Button(this.width / 2 + 4, 210, 150, 20, CommonComponents.GUI_CANCEL, dni -> this.onCancel()));
+        this.saveButton = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 185, 50, 20, new TranslatableComponent("structure_block.button.save"), dni -> {
             if (this.structure.getMode() == StructureMode.SAVE) {
                 this.sendToServer(StructureBlockEntity.UpdateType.SAVE_AREA);
                 this.minecraft.setScreen(null);
             }
             return;
         }));
-        this.loadButton = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 185, 50, 20, I18n.get("structure_block.button.load"), dcv -> {
+        this.loadButton = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 185, 50, 20, new TranslatableComponent("structure_block.button.load"), dni -> {
             if (this.structure.getMode() == StructureMode.LOAD) {
                 this.sendToServer(StructureBlockEntity.UpdateType.LOAD_AREA);
                 this.minecraft.setScreen(null);
             }
             return;
         }));
-        this.modeButton = this.<Button>addButton(new Button(this.width / 2 - 4 - 150, 185, 50, 20, "MODE", dcv -> {
+        this.modeButton = this.<Button>addButton(new Button(this.width / 2 - 4 - 150, 185, 50, 20, new TextComponent("MODE"), dni -> {
             this.structure.nextMode();
             this.updateMode();
             return;
         }));
-        this.detectButton = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 120, 50, 20, I18n.get("structure_block.button.detect_size"), dcv -> {
+        this.detectButton = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 120, 50, 20, new TranslatableComponent("structure_block.button.detect_size"), dni -> {
             if (this.structure.getMode() == StructureMode.SAVE) {
                 this.sendToServer(StructureBlockEntity.UpdateType.SCAN_AREA);
                 this.minecraft.setScreen(null);
             }
             return;
         }));
-        this.entitiesButton = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 160, 50, 20, "ENTITIES", dcv -> {
+        this.entitiesButton = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 160, 50, 20, new TextComponent("ENTITIES"), dni -> {
             this.structure.setIgnoreEntities(!this.structure.isIgnoreEntities());
             this.updateEntitiesButton();
             return;
         }));
-        this.mirrorButton = this.<Button>addButton(new Button(this.width / 2 - 20, 185, 40, 20, "MIRROR", dcv -> {
+        this.mirrorButton = this.<Button>addButton(new Button(this.width / 2 - 20, 185, 40, 20, new TextComponent("MIRROR"), dni -> {
             switch (this.structure.getMirror()) {
                 case NONE: {
                     this.structure.setMirror(Mirror.LEFT_RIGHT);
@@ -149,37 +153,37 @@ public class StructureBlockEditScreen extends Screen {
             this.updateMirrorButton();
             return;
         }));
-        this.toggleAirButton = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 80, 50, 20, "SHOWAIR", dcv -> {
+        this.toggleAirButton = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 80, 50, 20, new TextComponent("SHOWAIR"), dni -> {
             this.structure.setShowAir(!this.structure.getShowAir());
             this.updateToggleAirButton();
             return;
         }));
-        this.toggleBoundingBox = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 80, 50, 20, "SHOWBB", dcv -> {
+        this.toggleBoundingBox = this.<Button>addButton(new Button(this.width / 2 + 4 + 100, 80, 50, 20, new TextComponent("SHOWBB"), dni -> {
             this.structure.setShowBoundingBox(!this.structure.getShowBoundingBox());
             this.updateToggleBoundingBox();
             return;
         }));
-        this.rot0Button = this.<Button>addButton(new Button(this.width / 2 - 1 - 40 - 1 - 40 - 20, 185, 40, 20, "0", dcv -> {
+        this.rot0Button = this.<Button>addButton(new Button(this.width / 2 - 1 - 40 - 1 - 40 - 20, 185, 40, 20, new TextComponent("0"), dni -> {
             this.structure.setRotation(Rotation.NONE);
             this.updateDirectionButtons();
             return;
         }));
-        this.rot90Button = this.<Button>addButton(new Button(this.width / 2 - 1 - 40 - 20, 185, 40, 20, "90", dcv -> {
+        this.rot90Button = this.<Button>addButton(new Button(this.width / 2 - 1 - 40 - 20, 185, 40, 20, new TextComponent("90"), dni -> {
             this.structure.setRotation(Rotation.CLOCKWISE_90);
             this.updateDirectionButtons();
             return;
         }));
-        this.rot180Button = this.<Button>addButton(new Button(this.width / 2 + 1 + 20, 185, 40, 20, "180", dcv -> {
+        this.rot180Button = this.<Button>addButton(new Button(this.width / 2 + 1 + 20, 185, 40, 20, new TextComponent("180"), dni -> {
             this.structure.setRotation(Rotation.CLOCKWISE_180);
             this.updateDirectionButtons();
             return;
         }));
-        this.rot270Button = this.<Button>addButton(new Button(this.width / 2 + 1 + 40 + 1 + 20, 185, 40, 20, "270", dcv -> {
+        this.rot270Button = this.<Button>addButton(new Button(this.width / 2 + 1 + 40 + 1 + 20, 185, 40, 20, new TextComponent("270"), dni -> {
             this.structure.setRotation(Rotation.COUNTERCLOCKWISE_90);
             this.updateDirectionButtons();
             return;
         }));
-        (this.nameEdit = new EditBox(this.font, this.width / 2 - 152, 40, 300, 20, I18n.get("structure_block.structure_name")) {
+        (this.nameEdit = new EditBox(this.font, this.width / 2 - 152, 40, 300, 20, new TranslatableComponent("structure_block.structure_name")) {
             @Override
             public boolean charTyped(final char character, final int integer) {
                 return Screen.this.isValidCharacterForName(this.getValue(), character, this.getCursorPosition()) && super.charTyped(character, integer);
@@ -187,33 +191,33 @@ public class StructureBlockEditScreen extends Screen {
         }).setMaxLength(64);
         this.nameEdit.setValue(this.structure.getStructureName());
         this.children.add(this.nameEdit);
-        final BlockPos fk2 = this.structure.getStructurePos();
-        (this.posXEdit = new EditBox(this.font, this.width / 2 - 152, 80, 80, 20, I18n.get("structure_block.position.x"))).setMaxLength(15);
-        this.posXEdit.setValue(Integer.toString(fk2.getX()));
+        final BlockPos fu2 = this.structure.getStructurePos();
+        (this.posXEdit = new EditBox(this.font, this.width / 2 - 152, 80, 80, 20, new TranslatableComponent("structure_block.position.x"))).setMaxLength(15);
+        this.posXEdit.setValue(Integer.toString(fu2.getX()));
         this.children.add(this.posXEdit);
-        (this.posYEdit = new EditBox(this.font, this.width / 2 - 72, 80, 80, 20, I18n.get("structure_block.position.y"))).setMaxLength(15);
-        this.posYEdit.setValue(Integer.toString(fk2.getY()));
+        (this.posYEdit = new EditBox(this.font, this.width / 2 - 72, 80, 80, 20, new TranslatableComponent("structure_block.position.y"))).setMaxLength(15);
+        this.posYEdit.setValue(Integer.toString(fu2.getY()));
         this.children.add(this.posYEdit);
-        (this.posZEdit = new EditBox(this.font, this.width / 2 + 8, 80, 80, 20, I18n.get("structure_block.position.z"))).setMaxLength(15);
-        this.posZEdit.setValue(Integer.toString(fk2.getZ()));
+        (this.posZEdit = new EditBox(this.font, this.width / 2 + 8, 80, 80, 20, new TranslatableComponent("structure_block.position.z"))).setMaxLength(15);
+        this.posZEdit.setValue(Integer.toString(fu2.getZ()));
         this.children.add(this.posZEdit);
-        final BlockPos fk3 = this.structure.getStructureSize();
-        (this.sizeXEdit = new EditBox(this.font, this.width / 2 - 152, 120, 80, 20, I18n.get("structure_block.size.x"))).setMaxLength(15);
-        this.sizeXEdit.setValue(Integer.toString(fk3.getX()));
+        final BlockPos fu3 = this.structure.getStructureSize();
+        (this.sizeXEdit = new EditBox(this.font, this.width / 2 - 152, 120, 80, 20, new TranslatableComponent("structure_block.size.x"))).setMaxLength(15);
+        this.sizeXEdit.setValue(Integer.toString(fu3.getX()));
         this.children.add(this.sizeXEdit);
-        (this.sizeYEdit = new EditBox(this.font, this.width / 2 - 72, 120, 80, 20, I18n.get("structure_block.size.y"))).setMaxLength(15);
-        this.sizeYEdit.setValue(Integer.toString(fk3.getY()));
+        (this.sizeYEdit = new EditBox(this.font, this.width / 2 - 72, 120, 80, 20, new TranslatableComponent("structure_block.size.y"))).setMaxLength(15);
+        this.sizeYEdit.setValue(Integer.toString(fu3.getY()));
         this.children.add(this.sizeYEdit);
-        (this.sizeZEdit = new EditBox(this.font, this.width / 2 + 8, 120, 80, 20, I18n.get("structure_block.size.z"))).setMaxLength(15);
-        this.sizeZEdit.setValue(Integer.toString(fk3.getZ()));
+        (this.sizeZEdit = new EditBox(this.font, this.width / 2 + 8, 120, 80, 20, new TranslatableComponent("structure_block.size.z"))).setMaxLength(15);
+        this.sizeZEdit.setValue(Integer.toString(fu3.getZ()));
         this.children.add(this.sizeZEdit);
-        (this.integrityEdit = new EditBox(this.font, this.width / 2 - 152, 120, 80, 20, I18n.get("structure_block.integrity.integrity"))).setMaxLength(15);
+        (this.integrityEdit = new EditBox(this.font, this.width / 2 - 152, 120, 80, 20, new TranslatableComponent("structure_block.integrity.integrity"))).setMaxLength(15);
         this.integrityEdit.setValue(this.decimalFormat.format(this.structure.getIntegrity()));
         this.children.add(this.integrityEdit);
-        (this.seedEdit = new EditBox(this.font, this.width / 2 - 72, 120, 80, 20, I18n.get("structure_block.integrity.seed"))).setMaxLength(31);
+        (this.seedEdit = new EditBox(this.font, this.width / 2 - 72, 120, 80, 20, new TranslatableComponent("structure_block.integrity.seed"))).setMaxLength(31);
         this.seedEdit.setValue(Long.toString(this.structure.getSeed()));
         this.children.add(this.seedEdit);
-        (this.dataEdit = new EditBox(this.font, this.width / 2 - 152, 120, 240, 20, I18n.get("structure_block.custom_data"))).setMaxLength(128);
+        (this.dataEdit = new EditBox(this.font, this.width / 2 - 152, 120, 240, 20, new TranslatableComponent("structure_block.custom_data"))).setMaxLength(128);
         this.dataEdit.setValue(this.structure.getMetaData());
         this.children.add(this.dataEdit);
         this.initialMirror = this.structure.getMirror();
@@ -232,7 +236,7 @@ public class StructureBlockEditScreen extends Screen {
     }
     
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
         final String string5 = this.nameEdit.getValue();
         final String string6 = this.posXEdit.getValue();
         final String string7 = this.posYEdit.getValue();
@@ -243,7 +247,7 @@ public class StructureBlockEditScreen extends Screen {
         final String string12 = this.integrityEdit.getValue();
         final String string13 = this.seedEdit.getValue();
         final String string14 = this.dataEdit.getValue();
-        this.init(dbn, integer2, integer3);
+        this.init(dlx, integer2, integer3);
         this.nameEdit.setValue(string5);
         this.posXEdit.setValue(string6);
         this.posYEdit.setValue(string7);
@@ -262,48 +266,30 @@ public class StructureBlockEditScreen extends Screen {
     }
     
     private void updateEntitiesButton() {
-        final boolean boolean2 = !this.structure.isIgnoreEntities();
-        if (boolean2) {
-            this.entitiesButton.setMessage(I18n.get("options.on"));
-        }
-        else {
-            this.entitiesButton.setMessage(I18n.get("options.off"));
-        }
+        this.entitiesButton.setMessage(CommonComponents.optionStatus(!this.structure.isIgnoreEntities()));
     }
     
     private void updateToggleAirButton() {
-        final boolean boolean2 = this.structure.getShowAir();
-        if (boolean2) {
-            this.toggleAirButton.setMessage(I18n.get("options.on"));
-        }
-        else {
-            this.toggleAirButton.setMessage(I18n.get("options.off"));
-        }
+        this.toggleAirButton.setMessage(CommonComponents.optionStatus(this.structure.getShowAir()));
     }
     
     private void updateToggleBoundingBox() {
-        final boolean boolean2 = this.structure.getShowBoundingBox();
-        if (boolean2) {
-            this.toggleBoundingBox.setMessage(I18n.get("options.on"));
-        }
-        else {
-            this.toggleBoundingBox.setMessage(I18n.get("options.off"));
-        }
+        this.toggleBoundingBox.setMessage(CommonComponents.optionStatus(this.structure.getShowBoundingBox()));
     }
     
     private void updateMirrorButton() {
-        final Mirror bsu2 = this.structure.getMirror();
-        switch (bsu2) {
+        final Mirror bzj2 = this.structure.getMirror();
+        switch (bzj2) {
             case NONE: {
-                this.mirrorButton.setMessage("|");
+                this.mirrorButton.setMessage(new TextComponent("|"));
                 break;
             }
             case LEFT_RIGHT: {
-                this.mirrorButton.setMessage("< >");
+                this.mirrorButton.setMessage(new TextComponent("< >"));
                 break;
             }
             case FRONT_BACK: {
-                this.mirrorButton.setMessage("^ v");
+                this.mirrorButton.setMessage(new TextComponent("^ v"));
                 break;
             }
         }
@@ -398,15 +384,15 @@ public class StructureBlockEditScreen extends Screen {
                 break;
             }
         }
-        this.modeButton.setMessage(I18n.get("structure_block.mode." + this.structure.getMode().getSerializedName()));
+        this.modeButton.setMessage(new TranslatableComponent("structure_block.mode." + this.structure.getMode().getSerializedName()));
     }
     
     private boolean sendToServer(final StructureBlockEntity.UpdateType a) {
-        final BlockPos fk3 = new BlockPos(this.parseCoordinate(this.posXEdit.getValue()), this.parseCoordinate(this.posYEdit.getValue()), this.parseCoordinate(this.posZEdit.getValue()));
-        final BlockPos fk4 = new BlockPos(this.parseCoordinate(this.sizeXEdit.getValue()), this.parseCoordinate(this.sizeYEdit.getValue()), this.parseCoordinate(this.sizeZEdit.getValue()));
+        final BlockPos fu3 = new BlockPos(this.parseCoordinate(this.posXEdit.getValue()), this.parseCoordinate(this.posYEdit.getValue()), this.parseCoordinate(this.posZEdit.getValue()));
+        final BlockPos fu4 = new BlockPos(this.parseCoordinate(this.sizeXEdit.getValue()), this.parseCoordinate(this.sizeYEdit.getValue()), this.parseCoordinate(this.sizeZEdit.getValue()));
         final float float5 = this.parseIntegrity(this.integrityEdit.getValue());
         final long long6 = this.parseSeed(this.seedEdit.getValue());
-        this.minecraft.getConnection().send(new ServerboundSetStructureBlockPacket(this.structure.getBlockPos(), a, this.structure.getMode(), this.nameEdit.getValue(), fk3, fk4, this.structure.getMirror(), this.structure.getRotation(), this.dataEdit.getValue(), this.structure.isIgnoreEntities(), this.structure.getShowAir(), this.structure.getShowBoundingBox(), float5, long6));
+        this.minecraft.getConnection().send(new ServerboundSetStructureBlockPacket(this.structure.getBlockPos(), a, this.structure.getMode(), this.nameEdit.getValue(), fu3, fu4, this.structure.getMirror(), this.structure.getRotation(), this.dataEdit.getValue(), this.structure.isIgnoreEntities(), this.structure.getShowAir(), this.structure.getShowBoundingBox(), float5, long6));
         return true;
     }
     
@@ -455,50 +441,50 @@ public class StructureBlockEditScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        final StructureMode bzr5 = this.structure.getMode();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 10, 16777215);
-        if (bzr5 != StructureMode.DATA) {
-            this.drawString(this.font, I18n.get("structure_block.structure_name"), this.width / 2 - 153, 30, 10526880);
-            this.nameEdit.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        final StructureMode cgq6 = this.structure.getMode();
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 10, 16777215);
+        if (cgq6 != StructureMode.DATA) {
+            this.drawString(dhl, this.font, I18n.get("structure_block.structure_name"), this.width / 2 - 153, 30, 10526880);
+            this.nameEdit.render(dhl, integer2, integer3, float4);
         }
-        if (bzr5 == StructureMode.LOAD || bzr5 == StructureMode.SAVE) {
-            this.drawString(this.font, I18n.get("structure_block.position"), this.width / 2 - 153, 70, 10526880);
-            this.posXEdit.render(integer1, integer2, float3);
-            this.posYEdit.render(integer1, integer2, float3);
-            this.posZEdit.render(integer1, integer2, float3);
-            final String string6 = I18n.get("structure_block.include_entities");
-            final int integer3 = this.font.width(string6);
-            this.drawString(this.font, string6, this.width / 2 + 154 - integer3, 150, 10526880);
-        }
-        if (bzr5 == StructureMode.SAVE) {
-            this.drawString(this.font, I18n.get("structure_block.size"), this.width / 2 - 153, 110, 10526880);
-            this.sizeXEdit.render(integer1, integer2, float3);
-            this.sizeYEdit.render(integer1, integer2, float3);
-            this.sizeZEdit.render(integer1, integer2, float3);
-            final String string6 = I18n.get("structure_block.detect_size");
-            final int integer3 = this.font.width(string6);
-            this.drawString(this.font, string6, this.width / 2 + 154 - integer3, 110, 10526880);
-            final String string7 = I18n.get("structure_block.show_air");
+        if (cgq6 == StructureMode.LOAD || cgq6 == StructureMode.SAVE) {
+            this.drawString(dhl, this.font, I18n.get("structure_block.position"), this.width / 2 - 153, 70, 10526880);
+            this.posXEdit.render(dhl, integer2, integer3, float4);
+            this.posYEdit.render(dhl, integer2, integer3, float4);
+            this.posZEdit.render(dhl, integer2, integer3, float4);
+            final String string7 = I18n.get("structure_block.include_entities");
             final int integer4 = this.font.width(string7);
-            this.drawString(this.font, string7, this.width / 2 + 154 - integer4, 70, 10526880);
+            this.drawString(dhl, this.font, string7, this.width / 2 + 154 - integer4, 150, 10526880);
         }
-        if (bzr5 == StructureMode.LOAD) {
-            this.drawString(this.font, I18n.get("structure_block.integrity"), this.width / 2 - 153, 110, 10526880);
-            this.integrityEdit.render(integer1, integer2, float3);
-            this.seedEdit.render(integer1, integer2, float3);
-            final String string6 = I18n.get("structure_block.show_boundingbox");
-            final int integer3 = this.font.width(string6);
-            this.drawString(this.font, string6, this.width / 2 + 154 - integer3, 70, 10526880);
+        if (cgq6 == StructureMode.SAVE) {
+            this.drawString(dhl, this.font, I18n.get("structure_block.size"), this.width / 2 - 153, 110, 10526880);
+            this.sizeXEdit.render(dhl, integer2, integer3, float4);
+            this.sizeYEdit.render(dhl, integer2, integer3, float4);
+            this.sizeZEdit.render(dhl, integer2, integer3, float4);
+            final String string7 = I18n.get("structure_block.detect_size");
+            final int integer4 = this.font.width(string7);
+            this.drawString(dhl, this.font, string7, this.width / 2 + 154 - integer4, 110, 10526880);
+            final String string8 = I18n.get("structure_block.show_air");
+            final int integer5 = this.font.width(string8);
+            this.drawString(dhl, this.font, string8, this.width / 2 + 154 - integer5, 70, 10526880);
         }
-        if (bzr5 == StructureMode.DATA) {
-            this.drawString(this.font, I18n.get("structure_block.custom_data"), this.width / 2 - 153, 110, 10526880);
-            this.dataEdit.render(integer1, integer2, float3);
+        if (cgq6 == StructureMode.LOAD) {
+            this.drawString(dhl, this.font, I18n.get("structure_block.integrity"), this.width / 2 - 153, 110, 10526880);
+            this.integrityEdit.render(dhl, integer2, integer3, float4);
+            this.seedEdit.render(dhl, integer2, integer3, float4);
+            final String string7 = I18n.get("structure_block.show_boundingbox");
+            final int integer4 = this.font.width(string7);
+            this.drawString(dhl, this.font, string7, this.width / 2 + 154 - integer4, 70, 10526880);
         }
-        final String string6 = "structure_block.mode_info." + bzr5.getSerializedName();
-        this.drawString(this.font, I18n.get(string6), this.width / 2 - 153, 174, 10526880);
-        super.render(integer1, integer2, float3);
+        if (cgq6 == StructureMode.DATA) {
+            this.drawString(dhl, this.font, I18n.get("structure_block.custom_data"), this.width / 2 - 153, 110, 10526880);
+            this.dataEdit.render(dhl, integer2, integer3, float4);
+        }
+        final String string7 = "structure_block.mode_info." + cgq6.getSerializedName();
+        this.drawString(dhl, this.font, I18n.get(string7), this.width / 2 - 153, 174, 10526880);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java b/src/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java
index dfbde4e..6de854c 100644
--- a/src/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java
+++ b/src/net/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen.java
@@ -2,18 +2,19 @@ package net.minecraft.client.gui.screens.multiplayer;
 
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.client.gui.screens.ConnectScreen;
-import com.google.common.collect.Lists;
-import com.google.common.base.Splitter;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.server.LanServer;
-import java.util.List;
 import net.minecraft.client.gui.screens.ConfirmScreen;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.gui.screens.EditServerScreen;
 import net.minecraft.client.gui.screens.DirectJoinServerScreen;
 import net.minecraft.client.resources.language.I18n;
-import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.server.LanServerDetection;
 import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.network.chat.Component;
+import java.util.List;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.multiplayer.ServerList;
 import net.minecraft.client.multiplayer.ServerStatusPinger;
@@ -29,16 +30,16 @@ public class JoinMultiplayerScreen extends Screen {
     private Button editButton;
     private Button selectButton;
     private Button deleteButton;
-    private String toolTip;
+    private List<Component> toolTip;
     private ServerData editingServer;
     private LanServerDetection.LanServerList lanServerList;
     private LanServerDetection.LanServerDetector lanServerDetector;
     private boolean initedOnce;
     
-    public JoinMultiplayerScreen(final Screen dgb) {
-        super(new TranslatableComponent("multiplayer.title", new Object[0]));
+    public JoinMultiplayerScreen(final Screen dqs) {
+        super(new TranslatableComponent("multiplayer.title"));
         this.pinger = new ServerStatusPinger();
-        this.lastScreen = dgb;
+        this.lastScreen = dqs;
     }
     
     @Override
@@ -61,52 +62,52 @@ public class JoinMultiplayerScreen extends Screen {
             (this.serverSelectionList = new ServerSelectionList(this, this.minecraft, this.width, this.height, 32, this.height - 64, 36)).updateOnlineServers(this.servers);
         }
         this.children.add(this.serverSelectionList);
-        this.selectButton = this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 52, 100, 20, I18n.get("selectServer.select"), dcv -> this.joinSelectedServer()));
-        this.<Button>addButton(new Button(this.width / 2 - 50, this.height - 52, 100, 20, I18n.get("selectServer.direct"), dcv -> {
+        this.selectButton = this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 52, 100, 20, new TranslatableComponent("selectServer.select"), dni -> this.joinSelectedServer()));
+        this.<Button>addButton(new Button(this.width / 2 - 50, this.height - 52, 100, 20, new TranslatableComponent("selectServer.direct"), dni -> {
             this.editingServer = new ServerData(I18n.get("selectServer.defaultName"), "", false);
             this.minecraft.setScreen(new DirectJoinServerScreen(this, this::directJoinCallback, this.editingServer));
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 + 4 + 50, this.height - 52, 100, 20, I18n.get("selectServer.add"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 + 4 + 50, this.height - 52, 100, 20, new TranslatableComponent("selectServer.add"), dni -> {
             this.editingServer = new ServerData(I18n.get("selectServer.defaultName"), "", false);
             this.minecraft.setScreen(new EditServerScreen(this, this::addServerCallback, this.editingServer));
             return;
         }));
         final ServerSelectionList.Entry a3;
-        ServerData dnu4;
-        this.editButton = this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 28, 70, 20, I18n.get("selectServer.edit"), dcv -> {
+        ServerData dys4;
+        this.editButton = this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 28, 70, 20, new TranslatableComponent("selectServer.edit"), dni -> {
             a3 = this.serverSelectionList.getSelected();
             if (a3 instanceof ServerSelectionList.OnlineServerEntry) {
-                dnu4 = ((ServerSelectionList.OnlineServerEntry)a3).getServerData();
-                (this.editingServer = new ServerData(dnu4.name, dnu4.ip, false)).copyFrom(dnu4);
+                dys4 = ((ServerSelectionList.OnlineServerEntry)a3).getServerData();
+                (this.editingServer = new ServerData(dys4.name, dys4.ip, false)).copyFrom(dys4);
                 this.minecraft.setScreen(new EditServerScreen(this, this::editServerCallback, this.editingServer));
             }
             return;
         }));
         final ServerSelectionList.Entry a4;
         String string4;
-        Component lf5;
+        Component mr5;
         final TranslatableComponent translatableComponent;
-        Component lf6;
-        String string5;
-        String string6;
-        this.deleteButton = this.<Button>addButton(new Button(this.width / 2 - 74, this.height - 28, 70, 20, I18n.get("selectServer.delete"), dcv -> {
+        Component mr6;
+        Component mr7;
+        Component mr8;
+        this.deleteButton = this.<Button>addButton(new Button(this.width / 2 - 74, this.height - 28, 70, 20, new TranslatableComponent("selectServer.delete"), dni -> {
             a4 = this.serverSelectionList.getSelected();
             if (a4 instanceof ServerSelectionList.OnlineServerEntry) {
                 string4 = ((ServerSelectionList.OnlineServerEntry)a4).getServerData().name;
                 if (string4 != null) {
-                    lf5 = new TranslatableComponent("selectServer.deleteQuestion", new Object[0]);
+                    mr5 = new TranslatableComponent("selectServer.deleteQuestion");
                     new TranslatableComponent("selectServer.deleteWarning", new Object[] { string4 });
-                    lf6 = translatableComponent;
-                    string5 = I18n.get("selectServer.deleteButton");
-                    string6 = I18n.get("gui.cancel");
-                    this.minecraft.setScreen(new ConfirmScreen(this::deleteCallback, lf5, lf6, string5, string6));
+                    mr6 = translatableComponent;
+                    mr7 = new TranslatableComponent("selectServer.deleteButton");
+                    mr8 = CommonComponents.GUI_CANCEL;
+                    this.minecraft.setScreen(new ConfirmScreen(this::deleteCallback, mr5, mr6, mr7, mr8));
                 }
             }
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 + 4, this.height - 28, 70, 20, I18n.get("selectServer.refresh"), dcv -> this.refreshServerList()));
-        this.<Button>addButton(new Button(this.width / 2 + 4 + 76, this.height - 28, 75, 20, I18n.get("gui.cancel"), dcv -> this.minecraft.setScreen(this.lastScreen)));
+        this.<Button>addButton(new Button(this.width / 2 + 4, this.height - 28, 70, 20, new TranslatableComponent("selectServer.refresh"), dni -> this.refreshServerList()));
+        this.<Button>addButton(new Button(this.width / 2 + 4 + 76, this.height - 28, 75, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(this.lastScreen)));
         this.onSelectedChange();
     }
     
@@ -149,10 +150,10 @@ public class JoinMultiplayerScreen extends Screen {
     private void editServerCallback(final boolean boolean1) {
         final ServerSelectionList.Entry a3 = this.serverSelectionList.getSelected();
         if (boolean1 && a3 instanceof ServerSelectionList.OnlineServerEntry) {
-            final ServerData dnu4 = ((ServerSelectionList.OnlineServerEntry)a3).getServerData();
-            dnu4.name = this.editingServer.name;
-            dnu4.ip = this.editingServer.ip;
-            dnu4.copyFrom(this.editingServer);
+            final ServerData dys4 = ((ServerSelectionList.OnlineServerEntry)a3).getServerData();
+            dys4.name = this.editingServer.name;
+            dys4.ip = this.editingServer.ip;
+            dys4.copyFrom(this.editingServer);
             this.servers.save();
             this.serverSelectionList.updateOnlineServers(this.servers);
         }
@@ -198,14 +199,14 @@ public class JoinMultiplayerScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.toolTip = null;
-        this.renderBackground();
-        this.serverSelectionList.render(integer1, integer2, float3);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 20, 16777215);
-        super.render(integer1, integer2, float3);
+        this.renderBackground(dhl);
+        this.serverSelectionList.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 20, 16777215);
+        super.render(dhl, integer2, integer3, float4);
         if (this.toolTip != null) {
-            this.renderTooltip(Lists.newArrayList(Splitter.on("\n").split(this.toolTip)), integer1, integer2);
+            this.renderTooltip(dhl, this.toolTip, integer2, integer3);
         }
     }
     
@@ -215,13 +216,13 @@ public class JoinMultiplayerScreen extends Screen {
             this.join(((ServerSelectionList.OnlineServerEntry)a2).getServerData());
         }
         else if (a2 instanceof ServerSelectionList.NetworkServerEntry) {
-            final LanServer edn3 = ((ServerSelectionList.NetworkServerEntry)a2).getServerData();
-            this.join(new ServerData(edn3.getMotd(), edn3.getAddress(), true));
+            final LanServer epa3 = ((ServerSelectionList.NetworkServerEntry)a2).getServerData();
+            this.join(new ServerData(epa3.getMotd(), epa3.getAddress(), true));
         }
     }
     
-    private void join(final ServerData dnu) {
-        this.minecraft.setScreen(new ConnectScreen(this, this.minecraft, dnu));
+    private void join(final ServerData dys) {
+        this.minecraft.setScreen(new ConnectScreen(this, this.minecraft, dys));
     }
     
     public void setSelected(final ServerSelectionList.Entry a) {
@@ -247,8 +248,8 @@ public class JoinMultiplayerScreen extends Screen {
         return this.pinger;
     }
     
-    public void setToolTip(final String string) {
-        this.toolTip = string;
+    public void setToolTip(final List<Component> list) {
+        this.toolTip = list;
     }
     
     public ServerList getServers() {
diff --git a/src/net/minecraft/client/gui/screens/multiplayer/SafetyScreen.java b/src/net/minecraft/client/gui/screens/multiplayer/SafetyScreen.java
index c0d6a5d..56b238f 100644
--- a/src/net/minecraft/client/gui/screens/multiplayer/SafetyScreen.java
+++ b/src/net/minecraft/client/gui/screens/multiplayer/SafetyScreen.java
@@ -1,12 +1,15 @@
 package net.minecraft.client.gui.screens.multiplayer;
 
-import java.util.Iterator;
-import net.minecraft.client.gui.components.Button;
-import java.util.Collection;
-import com.google.common.collect.Lists;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TranslatableComponent;
+import java.util.Iterator;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
+import java.util.Collection;
+import com.google.common.collect.Lists;
 import net.minecraft.client.gui.chat.NarratorChatListener;
+import net.minecraft.network.chat.FormattedText;
 import java.util.List;
 import net.minecraft.client.gui.components.Checkbox;
 import net.minecraft.network.chat.Component;
@@ -14,34 +17,28 @@ import net.minecraft.client.gui.screens.Screen;
 
 public class SafetyScreen extends Screen {
     private final Screen previous;
-    private final Component title;
-    private final Component content;
-    private final Component check;
-    private final Component proceed;
-    private final Component back;
+    private static final Component TITLE;
+    private static final Component CONTENT;
+    private static final Component CHECK;
+    private static final Component NARRATION;
     private Checkbox stopShowing;
-    private final List<String> lines;
+    private final List<FormattedText> lines;
     
-    public SafetyScreen(final Screen dgb) {
+    public SafetyScreen(final Screen dqs) {
         super(NarratorChatListener.NO_TITLE);
-        this.title = new TranslatableComponent("multiplayerWarning.header", new Object[0]).withStyle(ChatFormatting.BOLD);
-        this.content = new TranslatableComponent("multiplayerWarning.message", new Object[0]);
-        this.check = new TranslatableComponent("multiplayerWarning.check", new Object[0]);
-        this.proceed = new TranslatableComponent("gui.proceed", new Object[0]);
-        this.back = new TranslatableComponent("gui.back", new Object[0]);
         this.lines = Lists.newArrayList();
-        this.previous = dgb;
+        this.previous = dqs;
     }
     
     @Override
     protected void init() {
         super.init();
         this.lines.clear();
-        this.lines.addAll(this.font.split(this.content.getColoredString(), this.width - 50));
+        this.lines.addAll(this.font.split(SafetyScreen.CONTENT, this.width - 50));
         final int n = this.lines.size() + 1;
         this.font.getClass();
         final int integer2 = n * 9;
-        this.<Button>addButton(new Button(this.width / 2 - 155, 100 + integer2, 150, 20, this.proceed.getColoredString(), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 - 155, 100 + integer2, 150, 20, CommonComponents.GUI_PROCEED, dni -> {
             if (this.stopShowing.selected()) {
                 this.minecraft.options.skipMultiplayerWarning = true;
                 this.minecraft.options.save();
@@ -49,26 +46,33 @@ public class SafetyScreen extends Screen {
             this.minecraft.setScreen(new JoinMultiplayerScreen(this.previous));
             return;
         }));
-        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, 100 + integer2, 150, 20, this.back.getColoredString(), dcv -> this.minecraft.setScreen(this.previous)));
-        this.<Checkbox>addButton(this.stopShowing = new Checkbox(this.width / 2 - 155 + 80, 76 + integer2, 150, 20, this.check.getColoredString(), false));
+        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, 100 + integer2, 150, 20, CommonComponents.GUI_BACK, dni -> this.minecraft.setScreen(this.previous)));
+        this.<Checkbox>addButton(this.stopShowing = new Checkbox(this.width / 2 - 155 + 80, 76 + integer2, 150, 20, SafetyScreen.CHECK, false));
     }
     
     @Override
     public String getNarrationMessage() {
-        return this.title.getString() + "\n" + this.content.getString();
+        return SafetyScreen.NARRATION.getString();
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.renderDirtBackground(0);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 30, 16777215);
-        int integer3 = 70;
-        for (final String string7 : this.lines) {
-            this.drawCenteredString(this.font, string7, this.width / 2, integer3, 16777215);
-            final int n = integer3;
+        this.drawCenteredString(dhl, this.font, SafetyScreen.TITLE, this.width / 2, 30, 16777215);
+        int integer4 = 70;
+        for (final FormattedText mu8 : this.lines) {
+            this.drawCenteredString(dhl, this.font, mu8, this.width / 2, integer4, 16777215);
+            final int n = integer4;
             this.font.getClass();
-            integer3 = n + 9;
+            integer4 = n + 9;
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
+    }
+    
+    static {
+        TITLE = new TranslatableComponent("multiplayerWarning.header").withStyle(ChatFormatting.BOLD);
+        CONTENT = new TranslatableComponent("multiplayerWarning.message");
+        CHECK = new TranslatableComponent("multiplayerWarning.check");
+        NARRATION = SafetyScreen.TITLE.copy().append("\n").append(SafetyScreen.CONTENT);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java b/src/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
index 92b553f..23c430f 100644
--- a/src/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
+++ b/src/net/minecraft/client/gui/screens/multiplayer/ServerSelectionList.java
@@ -4,28 +4,34 @@ import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import org.apache.commons.lang3.Validate;
 import com.mojang.blaze3d.platform.NativeImage;
+import java.util.Objects;
 import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.network.chat.Component;
+import java.util.Collections;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.SharedConstants;
 import java.net.UnknownHostException;
 import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.TextComponent;
 import com.google.common.hash.Hashing;
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.gui.Font;
 import net.minecraft.Util;
 import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import net.minecraft.DefaultUncaughtExceptionHandler;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.client.gui.components.AbstractSelectionList;
 import java.util.Iterator;
 import net.minecraft.client.server.LanServer;
 import net.minecraft.client.multiplayer.ServerList;
-import net.minecraft.util.Mth;
+import net.minecraft.client.gui.components.AbstractSelectionList;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.gui.chat.NarratorChatListener;
+import javax.annotation.Nullable;
 import java.util.function.Consumer;
 import com.google.common.collect.Lists;
 import net.minecraft.client.Minecraft;
@@ -45,12 +51,12 @@ public class ServerSelectionList extends ObjectSelectionList<Entry> {
     private final Entry lanHeader;
     private final List<NetworkServerEntry> networkServers;
     
-    public ServerSelectionList(final JoinMultiplayerScreen dig, final Minecraft dbn, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7) {
-        super(dbn, integer3, integer4, integer5, integer6, integer7);
+    public ServerSelectionList(final JoinMultiplayerScreen dta, final Minecraft dlx, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7) {
+        super(dlx, integer3, integer4, integer5, integer6, integer7);
         this.onlineServers = Lists.newArrayList();
         this.lanHeader = new LANHeader();
         this.networkServers = Lists.newArrayList();
-        this.screen = dig;
+        this.screen = dta;
     }
     
     private void refreshEntries() {
@@ -61,11 +67,12 @@ public class ServerSelectionList extends ObjectSelectionList<Entry> {
     }
     
     @Override
-    public void setSelected(final Entry a) {
+    public void setSelected(@Nullable final Entry a) {
         super.setSelected(a);
         if (this.getSelected() instanceof OnlineServerEntry) {
             NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.select", new Object[] { ((AbstractSelectionList<OnlineServerEntry>)this).getSelected().serverData.name }).getString());
         }
+        this.screen.onSelectedChange();
     }
     
     @Override
@@ -75,31 +82,22 @@ public class ServerSelectionList extends ObjectSelectionList<Entry> {
     }
     
     @Override
-    protected void moveSelection(final int integer) {
-        final int integer2 = this.children().indexOf(((AbstractSelectionList<Object>)this).getSelected());
-        int integer3 = Mth.clamp(integer2 + integer, 0, this.getItemCount() - 1);
-        Entry a5 = this.children().get(integer3);
-        if (a5 instanceof LANHeader) {
-            integer3 = Mth.clamp(integer3 + ((integer > 0) ? 1 : -1), 0, this.getItemCount() - 1);
-            a5 = this.children().get(integer3);
-        }
-        super.setSelected(a5);
-        this.ensureVisible(a5);
-        this.screen.onSelectedChange();
+    protected void moveSelection(final SelectionDirection b) {
+        this.moveSelection(b, a -> !(a instanceof LANHeader));
     }
     
-    public void updateOnlineServers(final ServerList dnv) {
+    public void updateOnlineServers(final ServerList dyt) {
         this.onlineServers.clear();
-        for (int integer3 = 0; integer3 < dnv.size(); ++integer3) {
-            this.onlineServers.add(new OnlineServerEntry(this.screen, dnv.get(integer3)));
+        for (int integer3 = 0; integer3 < dyt.size(); ++integer3) {
+            this.onlineServers.add(new OnlineServerEntry(this.screen, dyt.get(integer3)));
         }
         this.refreshEntries();
     }
     
     public void updateNetworkServers(final List<LanServer> list) {
         this.networkServers.clear();
-        for (final LanServer edn4 : list) {
-            this.networkServers.add(new NetworkServerEntry(this.screen, edn4));
+        for (final LanServer epa4 : list) {
+            this.networkServers.add(new NetworkServerEntry(this.screen, epa4));
         }
         this.refreshEntries();
     }
@@ -137,33 +135,33 @@ public class ServerSelectionList extends ObjectSelectionList<Entry> {
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            final int n = integer2 + integer5 / 2;
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            final int n = integer3 + integer6 / 2;
             this.minecraft.font.getClass();
-            final int integer8 = n - 9 / 2;
-            this.minecraft.font.draw(I18n.get("lanServer.scanning"), (float)(this.minecraft.screen.width / 2 - this.minecraft.font.width(I18n.get("lanServer.scanning")) / 2), (float)integer8, 16777215);
-            String string12 = null;
+            final int integer9 = n - 9 / 2;
+            this.minecraft.font.draw(dhl, I18n.get("lanServer.scanning"), (float)(this.minecraft.screen.width / 2 - this.minecraft.font.width(I18n.get("lanServer.scanning")) / 2), (float)integer9, 16777215);
+            String string13 = null;
             switch ((int)(Util.getMillis() / 300L % 4L)) {
                 default: {
-                    string12 = "O o o";
+                    string13 = "O o o";
                     break;
                 }
                 case 1:
                 case 3: {
-                    string12 = "o O o";
+                    string13 = "o O o";
                     break;
                 }
                 case 2: {
-                    string12 = "o o O";
+                    string13 = "o o O";
                     break;
                 }
             }
             final Font font = this.minecraft.font;
-            final String string13 = string12;
-            final float float10 = (float)(this.minecraft.screen.width / 2 - this.minecraft.font.width(string12) / 2);
-            final int n2 = integer8;
+            final String string14 = string13;
+            final float float11 = (float)(this.minecraft.screen.width / 2 - this.minecraft.font.width(string13) / 2);
+            final int n2 = integer9;
             this.minecraft.font.getClass();
-            font.draw(string13, float10, (float)(n2 + 9), 8421504);
+            font.draw(dhl, string14, float11, (float)(n2 + 9), 8421504);
         }
     }
     
@@ -173,21 +171,21 @@ public class ServerSelectionList extends ObjectSelectionList<Entry> {
         protected final LanServer serverData;
         private long lastClickTime;
         
-        protected NetworkServerEntry(final JoinMultiplayerScreen dig, final LanServer edn) {
-            this.screen = dig;
-            this.serverData = edn;
+        protected NetworkServerEntry(final JoinMultiplayerScreen dta, final LanServer epa) {
+            this.screen = dta;
+            this.serverData = epa;
             this.minecraft = Minecraft.getInstance();
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            this.minecraft.font.draw(I18n.get("lanServer.title"), (float)(integer3 + 32 + 3), (float)(integer2 + 1), 16777215);
-            this.minecraft.font.draw(this.serverData.getMotd(), (float)(integer3 + 32 + 3), (float)(integer2 + 12), 8421504);
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.minecraft.font.draw(dhl, I18n.get("lanServer.title"), (float)(integer4 + 32 + 3), (float)(integer3 + 1), 16777215);
+            this.minecraft.font.draw(dhl, this.serverData.getMotd(), (float)(integer4 + 32 + 3), (float)(integer3 + 12), 8421504);
             if (this.minecraft.options.hideServerAddress) {
-                this.minecraft.font.draw(I18n.get("selectServer.hiddenAddress"), (float)(integer3 + 32 + 3), (float)(integer2 + 12 + 11), 3158064);
+                this.minecraft.font.draw(dhl, I18n.get("selectServer.hiddenAddress"), (float)(integer4 + 32 + 3), (float)(integer3 + 12 + 11), 3158064);
             }
             else {
-                this.minecraft.font.draw(this.serverData.getAddress(), (float)(integer3 + 32 + 3), (float)(integer2 + 12 + 11), 3158064);
+                this.minecraft.font.draw(dhl, this.serverData.getAddress(), (float)(integer4 + 32 + 3), (float)(integer3 + 12 + 11), 3158064);
             }
         }
         
@@ -215,155 +213,166 @@ public class ServerSelectionList extends ObjectSelectionList<Entry> {
         private DynamicTexture icon;
         private long lastClickTime;
         
-        protected OnlineServerEntry(final JoinMultiplayerScreen dig, final ServerData dnu) {
-            this.screen = dig;
-            this.serverData = dnu;
+        protected OnlineServerEntry(final JoinMultiplayerScreen dta, final ServerData dys) {
+            this.screen = dta;
+            this.serverData = dys;
             this.minecraft = Minecraft.getInstance();
-            this.iconLocation = new ResourceLocation("servers/" + Hashing.sha1().hashUnencodedChars(dnu.ip) + "/icon");
+            this.iconLocation = new ResourceLocation("servers/" + Hashing.sha1().hashUnencodedChars(dys.ip) + "/icon");
             this.icon = (DynamicTexture)this.minecraft.getTextureManager().getTexture(this.iconLocation);
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
             if (!this.serverData.pinged) {
                 this.serverData.pinged = true;
                 this.serverData.ping = -2L;
-                this.serverData.motd = "";
-                this.serverData.status = "";
+                this.serverData.motd = TextComponent.EMPTY;
+                this.serverData.status = TextComponent.EMPTY;
                 ServerSelectionList.THREAD_POOL.submit(() -> {
                     try {
-                        this.screen.getPinger().pingServer(this.serverData);
+                        this.screen.getPinger().pingServer(this.serverData, () -> this.minecraft.execute(this::updateServerList));
                     }
                     catch (UnknownHostException unknownHostException2) {
                         this.serverData.ping = -1L;
-                        this.serverData.motd = ChatFormatting.DARK_RED + I18n.get("multiplayer.status.cannot_resolve");
+                        this.serverData.motd = new TranslatableComponent("multiplayer.status.cannot_resolve").withStyle(ChatFormatting.DARK_RED);
                     }
                     catch (Exception exception2) {
                         this.serverData.ping = -1L;
-                        this.serverData.motd = ChatFormatting.DARK_RED + I18n.get("multiplayer.status.cannot_connect");
+                        this.serverData.motd = new TranslatableComponent("multiplayer.status.cannot_connect").withStyle(ChatFormatting.DARK_RED);
                     }
                     return;
                 });
             }
-            final boolean boolean9 = this.serverData.protocol > SharedConstants.getCurrentVersion().getProtocolVersion();
-            final boolean boolean10 = this.serverData.protocol < SharedConstants.getCurrentVersion().getProtocolVersion();
-            final boolean boolean11 = boolean9 || boolean10;
-            this.minecraft.font.draw(this.serverData.name, (float)(integer3 + 32 + 3), (float)(integer2 + 1), 16777215);
-            final List<String> list14 = this.minecraft.font.split(this.serverData.motd, integer4 - 32 - 2);
-            for (int integer8 = 0; integer8 < Math.min(list14.size(), 2); ++integer8) {
+            final boolean boolean10 = this.serverData.protocol > SharedConstants.getCurrentVersion().getProtocolVersion();
+            final boolean boolean11 = this.serverData.protocol < SharedConstants.getCurrentVersion().getProtocolVersion();
+            final boolean boolean12 = boolean10 || boolean11;
+            this.minecraft.font.draw(dhl, this.serverData.name, (float)(integer4 + 32 + 3), (float)(integer3 + 1), 16777215);
+            final List<FormattedText> list15 = this.minecraft.font.split(this.serverData.motd, integer5 - 32 - 2);
+            for (int integer9 = 0; integer9 < Math.min(list15.size(), 2); ++integer9) {
                 final Font font = this.minecraft.font;
-                final String string18 = list14.get(integer8);
-                final float float10 = (float)(integer3 + 32 + 3);
-                final int n = integer2 + 12;
+                final FormattedText mu = list15.get(integer9);
+                final float float11 = (float)(integer4 + 32 + 3);
+                final int n = integer3 + 12;
                 this.minecraft.font.getClass();
-                font.draw(string18, float10, (float)(n + 9 * integer8), 8421504);
+                font.draw(dhl, mu, float11, (float)(n + 9 * integer9), 8421504);
             }
-            final String string15 = boolean11 ? (ChatFormatting.DARK_RED + this.serverData.version) : this.serverData.status;
-            final int integer9 = this.minecraft.font.width(string15);
-            this.minecraft.font.draw(string15, (float)(integer3 + integer4 - integer9 - 15 - 2), (float)(integer2 + 1), 8421504);
-            int integer10 = 0;
-            String string16 = null;
-            int integer11;
-            String string17;
-            if (boolean11) {
-                integer11 = 5;
-                string17 = I18n.get(boolean9 ? "multiplayer.status.client_out_of_date" : "multiplayer.status.server_out_of_date");
-                string16 = this.serverData.playerList;
+            final Component mr16 = boolean12 ? this.serverData.version.copy().withStyle(ChatFormatting.DARK_RED) : this.serverData.status;
+            final int integer10 = this.minecraft.font.width(mr16);
+            this.minecraft.font.draw(dhl, mr16, (float)(integer4 + integer5 - integer10 - 15 - 2), (float)(integer3 + 1), 8421504);
+            int integer11 = 0;
+            int integer12;
+            Component mr17;
+            List<Component> list16;
+            if (boolean12) {
+                integer12 = 5;
+                mr17 = new TranslatableComponent(boolean10 ? "multiplayer.status.client_out_of_date" : "multiplayer.status.server_out_of_date");
+                list16 = this.serverData.playerList;
             }
             else if (this.serverData.pinged && this.serverData.ping != -2L) {
                 if (this.serverData.ping < 0L) {
-                    integer11 = 5;
+                    integer12 = 5;
                 }
                 else if (this.serverData.ping < 150L) {
-                    integer11 = 0;
+                    integer12 = 0;
                 }
                 else if (this.serverData.ping < 300L) {
-                    integer11 = 1;
+                    integer12 = 1;
                 }
                 else if (this.serverData.ping < 600L) {
-                    integer11 = 2;
+                    integer12 = 2;
                 }
                 else if (this.serverData.ping < 1000L) {
-                    integer11 = 3;
+                    integer12 = 3;
                 }
                 else {
-                    integer11 = 4;
+                    integer12 = 4;
                 }
                 if (this.serverData.ping < 0L) {
-                    string17 = I18n.get("multiplayer.status.no_connection");
+                    mr17 = new TranslatableComponent("multiplayer.status.no_connection");
+                    list16 = Collections.<Component>emptyList();
                 }
                 else {
-                    string17 = this.serverData.ping + "ms";
-                    string16 = this.serverData.playerList;
+                    mr17 = new TranslatableComponent("multiplayer.status.ping", new Object[] { this.serverData.ping });
+                    list16 = this.serverData.playerList;
                 }
             }
             else {
-                integer10 = 1;
-                integer11 = (int)(Util.getMillis() / 100L + integer1 * 2 & 0x7L);
-                if (integer11 > 4) {
-                    integer11 = 8 - integer11;
+                integer11 = 1;
+                integer12 = (int)(Util.getMillis() / 100L + integer2 * 2 & 0x7L);
+                if (integer12 > 4) {
+                    integer12 = 8 - integer12;
                 }
-                string17 = I18n.get("multiplayer.status.pinging");
+                mr17 = new TranslatableComponent("multiplayer.status.pinging");
+                list16 = Collections.<Component>emptyList();
             }
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
             this.minecraft.getTextureManager().bind(GuiComponent.GUI_ICONS_LOCATION);
-            GuiComponent.blit(integer3 + integer4 - 15, integer2, (float)(integer10 * 10), (float)(176 + integer11 * 8), 10, 8, 256, 256);
-            if (this.serverData.getIconB64() != null && !this.serverData.getIconB64().equals(this.lastIconB64)) {
-                this.lastIconB64 = this.serverData.getIconB64();
-                this.loadServerIcon();
-                this.screen.getServers().save();
+            GuiComponent.blit(dhl, integer4 + integer5 - 15, integer3, (float)(integer11 * 10), (float)(176 + integer12 * 8), 10, 8, 256, 256);
+            final String string22 = this.serverData.getIconB64();
+            if (!Objects.equals(string22, this.lastIconB64)) {
+                if (this.uploadServerIcon(string22)) {
+                    this.lastIconB64 = string22;
+                }
+                else {
+                    this.serverData.setIconB64(null);
+                    this.updateServerList();
+                }
             }
             if (this.icon != null) {
-                this.drawIcon(integer3, integer2, this.iconLocation);
+                this.drawIcon(dhl, integer4, integer3, this.iconLocation);
             }
             else {
-                this.drawIcon(integer3, integer2, ServerSelectionList.ICON_MISSING);
+                this.drawIcon(dhl, integer4, integer3, ServerSelectionList.ICON_MISSING);
             }
-            final int integer12 = integer6 - integer3;
-            final int integer13 = integer7 - integer2;
-            if (integer12 >= integer4 - 15 && integer12 <= integer4 - 5 && integer13 >= 0 && integer13 <= 8) {
-                this.screen.setToolTip(string17);
+            final int integer13 = integer7 - integer4;
+            final int integer14 = integer8 - integer3;
+            if (integer13 >= integer5 - 15 && integer13 <= integer5 - 5 && integer14 >= 0 && integer14 <= 8) {
+                this.screen.setToolTip(Collections.<Component>singletonList(mr17));
             }
-            else if (integer12 >= integer4 - integer9 - 15 - 2 && integer12 <= integer4 - 15 - 2 && integer13 >= 0 && integer13 <= 8) {
-                this.screen.setToolTip(string16);
+            else if (integer13 >= integer5 - integer10 - 15 - 2 && integer13 <= integer5 - 15 - 2 && integer14 >= 0 && integer14 <= 8) {
+                this.screen.setToolTip(list16);
             }
-            if (this.minecraft.options.touchscreen || boolean8) {
+            if (this.minecraft.options.touchscreen || boolean9) {
                 this.minecraft.getTextureManager().bind(ServerSelectionList.ICON_OVERLAY_LOCATION);
-                GuiComponent.fill(integer3, integer2, integer3 + 32, integer2 + 32, -1601138544);
+                GuiComponent.fill(dhl, integer4, integer3, integer4 + 32, integer3 + 32, -1601138544);
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                final int integer14 = integer6 - integer3;
-                final int integer15 = integer7 - integer2;
+                final int integer15 = integer7 - integer4;
+                final int integer16 = integer8 - integer3;
                 if (this.canJoin()) {
-                    if (integer14 < 32 && integer14 > 16) {
-                        GuiComponent.blit(integer3, integer2, 0.0f, 32.0f, 32, 32, 256, 256);
+                    if (integer15 < 32 && integer15 > 16) {
+                        GuiComponent.blit(dhl, integer4, integer3, 0.0f, 32.0f, 32, 32, 256, 256);
                     }
                     else {
-                        GuiComponent.blit(integer3, integer2, 0.0f, 0.0f, 32, 32, 256, 256);
+                        GuiComponent.blit(dhl, integer4, integer3, 0.0f, 0.0f, 32, 32, 256, 256);
                     }
                 }
-                if (integer1 > 0) {
-                    if (integer14 < 16 && integer15 < 16) {
-                        GuiComponent.blit(integer3, integer2, 96.0f, 32.0f, 32, 32, 256, 256);
+                if (integer2 > 0) {
+                    if (integer15 < 16 && integer16 < 16) {
+                        GuiComponent.blit(dhl, integer4, integer3, 96.0f, 32.0f, 32, 32, 256, 256);
                     }
                     else {
-                        GuiComponent.blit(integer3, integer2, 96.0f, 0.0f, 32, 32, 256, 256);
+                        GuiComponent.blit(dhl, integer4, integer3, 96.0f, 0.0f, 32, 32, 256, 256);
                     }
                 }
-                if (integer1 < this.screen.getServers().size() - 1) {
-                    if (integer14 < 16 && integer15 > 16) {
-                        GuiComponent.blit(integer3, integer2, 64.0f, 32.0f, 32, 32, 256, 256);
+                if (integer2 < this.screen.getServers().size() - 1) {
+                    if (integer15 < 16 && integer16 > 16) {
+                        GuiComponent.blit(dhl, integer4, integer3, 64.0f, 32.0f, 32, 32, 256, 256);
                     }
                     else {
-                        GuiComponent.blit(integer3, integer2, 64.0f, 0.0f, 32, 32, 256, 256);
+                        GuiComponent.blit(dhl, integer4, integer3, 64.0f, 0.0f, 32, 32, 256, 256);
                     }
                 }
             }
         }
         
-        protected void drawIcon(final int integer1, final int integer2, final ResourceLocation sm) {
-            this.minecraft.getTextureManager().bind(sm);
+        public void updateServerList() {
+            this.screen.getServers().save();
+        }
+        
+        protected void drawIcon(final PoseStack dhl, final int integer2, final int integer3, final ResourceLocation uh) {
+            this.minecraft.getTextureManager().bind(uh);
             RenderSystem.enableBlend();
-            GuiComponent.blit(integer1, integer2, 0.0f, 0.0f, 32, 32, 32, 32);
+            GuiComponent.blit(dhl, integer2, integer3, 0.0f, 0.0f, 32, 32, 32, 32);
             RenderSystem.disableBlend();
         }
         
@@ -371,9 +380,8 @@ public class ServerSelectionList extends ObjectSelectionList<Entry> {
             return true;
         }
         
-        private void loadServerIcon() {
-            final String string2 = this.serverData.getIconB64();
-            if (string2 == null) {
+        private boolean uploadServerIcon(@Nullable final String string) {
+            if (string == null) {
                 this.minecraft.getTextureManager().release(this.iconLocation);
                 if (this.icon != null && this.icon.getPixels() != null) {
                     this.icon.getPixels().close();
@@ -382,30 +390,31 @@ public class ServerSelectionList extends ObjectSelectionList<Entry> {
             }
             else {
                 try {
-                    final NativeImage cxr3 = NativeImage.fromBase64(string2);
-                    Validate.validState(cxr3.getWidth() == 64, "Must be 64 pixels wide", new Object[0]);
-                    Validate.validState(cxr3.getHeight() == 64, "Must be 64 pixels high", new Object[0]);
+                    final NativeImage dgs3 = NativeImage.fromBase64(string);
+                    Validate.validState(dgs3.getWidth() == 64, "Must be 64 pixels wide", new Object[0]);
+                    Validate.validState(dgs3.getHeight() == 64, "Must be 64 pixels high", new Object[0]);
                     if (this.icon == null) {
-                        this.icon = new DynamicTexture(cxr3);
+                        this.icon = new DynamicTexture(dgs3);
                     }
                     else {
-                        this.icon.setPixels(cxr3);
+                        this.icon.setPixels(dgs3);
                         this.icon.upload();
                     }
                     this.minecraft.getTextureManager().register(this.iconLocation, this.icon);
                 }
                 catch (Throwable throwable3) {
                     ServerSelectionList.LOGGER.error("Invalid icon for server {} ({})", this.serverData.name, this.serverData.ip, throwable3);
-                    this.serverData.setIconB64(null);
+                    return false;
                 }
             }
+            return true;
         }
         
         @Override
         public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
             if (Screen.hasShiftDown()) {
-                final ServerSelectionList dii5 = this.screen.serverSelectionList;
-                final int integer4 = dii5.children().indexOf(this);
+                final ServerSelectionList dtc5 = this.screen.serverSelectionList;
+                final int integer4 = dtc5.children().indexOf(this);
                 if ((integer1 == 264 && integer4 < this.screen.getServers().size() - 1) || (integer1 == 265 && integer4 > 0)) {
                     this.swap(integer4, (integer1 == 264) ? (integer4 + 1) : (integer4 - 1));
                     return true;
diff --git a/src/net/minecraft/client/gui/screens/packs/PackSelectionModel.java b/src/net/minecraft/client/gui/screens/packs/PackSelectionModel.java
new file mode 100644
index 0000000..7814bab
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/packs/PackSelectionModel.java
@@ -0,0 +1,244 @@
+package net.minecraft.client.gui.screens.packs;
+
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.server.packs.repository.PackSource;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.packs.repository.PackCompatibility;
+import java.util.stream.Collector;
+import com.google.common.collect.ImmutableList;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import java.util.Collection;
+import java.util.Collections;
+import com.google.common.collect.Lists;
+import java.util.function.Consumer;
+import net.minecraft.client.renderer.texture.TextureManager;
+import java.util.function.BiConsumer;
+import java.util.List;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.server.packs.repository.Pack;
+
+public class PackSelectionModel<T extends Pack> {
+    private final PackRepository<T> repository;
+    private final List<T> selected;
+    private final List<T> unselected;
+    private final BiConsumer<T, TextureManager> iconBinder;
+    private final Runnable onListChanged;
+    private final Consumer<PackRepository<T>> output;
+    
+    public PackSelectionModel(final Runnable runnable, final BiConsumer<T, TextureManager> biConsumer, final PackRepository<T> aar, final Consumer<PackRepository<T>> consumer) {
+        this.onListChanged = runnable;
+        this.iconBinder = biConsumer;
+        this.repository = aar;
+        Collections.reverse(this.selected = Lists.newArrayList(aar.getSelectedPacks()));
+        (this.unselected = Lists.newArrayList(aar.getAvailablePacks())).removeAll(this.selected);
+        this.output = consumer;
+    }
+    
+    public Stream<Entry> getUnselected() {
+        return this.unselected.stream().<Entry>map(aap -> new UnselectedPackEntry((T)aap));
+    }
+    
+    public Stream<Entry> getSelected() {
+        return this.selected.stream().<Entry>map(aap -> new SelectedPackEntry((T)aap));
+    }
+    
+    public void commit() {
+        this.repository.setSelected(Lists.<T>reverse(this.selected).stream().map(Pack::getId).collect(ImmutableList.toImmutableList()));
+        this.output.accept(this.repository);
+    }
+    
+    public void findNewPacks() {
+        this.repository.reload();
+        this.unselected.clear();
+        this.unselected.addAll(this.repository.getAvailablePacks());
+        this.unselected.removeAll(this.selected);
+    }
+    
+    public interface Entry {
+        void bindIcon(final TextureManager elw);
+        
+        PackCompatibility getCompatibility();
+        
+        Component getTitle();
+        
+        Component getDescription();
+        
+        PackSource getPackSource();
+        
+        default FormattedText getExtendedDescription() {
+            return this.getPackSource().decorate(this.getDescription());
+        }
+        
+        boolean isFixedPosition();
+        
+        boolean isRequired();
+        
+        void select();
+        
+        void unselect();
+        
+        void moveUp();
+        
+        void moveDown();
+        
+        boolean isSelected();
+        
+        default boolean canSelect() {
+            return !this.isSelected();
+        }
+        
+        default boolean canUnselect() {
+            return this.isSelected() && !this.isRequired();
+        }
+        
+        boolean canMoveUp();
+        
+        boolean canMoveDown();
+    }
+    
+    abstract class EntryBase implements Entry {
+        private final T pack;
+        
+        public EntryBase(final T aap) {
+            this.pack = aap;
+        }
+        
+        protected abstract List<T> getSelfList();
+        
+        protected abstract List<T> getOtherList();
+        
+        @Override
+        public void bindIcon(final TextureManager elw) {
+            PackSelectionModel.this.iconBinder.accept(this.pack, elw);
+        }
+        
+        @Override
+        public PackCompatibility getCompatibility() {
+            return this.pack.getCompatibility();
+        }
+        
+        @Override
+        public Component getTitle() {
+            return this.pack.getTitle();
+        }
+        
+        @Override
+        public Component getDescription() {
+            return this.pack.getDescription();
+        }
+        
+        @Override
+        public PackSource getPackSource() {
+            return this.pack.getPackSource();
+        }
+        
+        @Override
+        public boolean isFixedPosition() {
+            return this.pack.isFixedPosition();
+        }
+        
+        @Override
+        public boolean isRequired() {
+            return this.pack.isRequired();
+        }
+        
+        protected void toggleSelection() {
+            this.getSelfList().remove(this.pack);
+            this.pack.getDefaultPosition().insert(this.getOtherList(), this.pack, Function.identity(), true);
+            PackSelectionModel.this.onListChanged.run();
+        }
+        
+        protected void move(final int integer) {
+            final List<T> list3 = this.getSelfList();
+            final int integer2 = list3.indexOf(this.pack);
+            list3.remove(integer2);
+            list3.add(integer2 + integer, this.pack);
+            PackSelectionModel.this.onListChanged.run();
+        }
+        
+        @Override
+        public boolean canMoveUp() {
+            final List<T> list2 = this.getSelfList();
+            final int integer3 = list2.indexOf(this.pack);
+            return integer3 > 0 && !list2.get(integer3 - 1).isFixedPosition();
+        }
+        
+        @Override
+        public void moveUp() {
+            this.move(-1);
+        }
+        
+        @Override
+        public boolean canMoveDown() {
+            final List<T> list2 = this.getSelfList();
+            final int integer3 = list2.indexOf(this.pack);
+            return integer3 >= 0 && integer3 < list2.size() - 1 && !list2.get(integer3 + 1).isFixedPosition();
+        }
+        
+        @Override
+        public void moveDown() {
+            this.move(1);
+        }
+    }
+    
+    class SelectedPackEntry extends EntryBase {
+        public SelectedPackEntry(final T aap) {
+            super(aap);
+        }
+        
+        @Override
+        protected List<T> getSelfList() {
+            return PackSelectionModel.this.selected;
+        }
+        
+        @Override
+        protected List<T> getOtherList() {
+            return PackSelectionModel.this.unselected;
+        }
+        
+        @Override
+        public boolean isSelected() {
+            return true;
+        }
+        
+        @Override
+        public void select() {
+        }
+        
+        @Override
+        public void unselect() {
+            this.toggleSelection();
+        }
+    }
+    
+    class UnselectedPackEntry extends EntryBase {
+        public UnselectedPackEntry(final T aap) {
+            super(aap);
+        }
+        
+        @Override
+        protected List<T> getSelfList() {
+            return PackSelectionModel.this.unselected;
+        }
+        
+        @Override
+        protected List<T> getOtherList() {
+            return PackSelectionModel.this.selected;
+        }
+        
+        @Override
+        public boolean isSelected() {
+            return false;
+        }
+        
+        @Override
+        public void select() {
+            this.toggleSelection();
+        }
+        
+        @Override
+        public void unselect() {
+        }
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java b/src/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java
new file mode 100644
index 0000000..33f8c67
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/packs/PackSelectionScreen.java
@@ -0,0 +1,169 @@
+package net.minecraft.client.gui.screens.packs;
+
+import net.minecraft.ChatFormatting;
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.client.gui.screens.ConfirmScreen;
+import net.minecraft.network.chat.TextComponent;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import net.minecraft.client.gui.components.toasts.SystemToast;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.FileVisitOption;
+import org.apache.commons.lang3.mutable.MutableBoolean;
+import java.nio.file.Path;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import com.mojang.blaze3d.vertex.PoseStack;
+import java.util.stream.Stream;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.Util;
+import net.minecraft.network.chat.CommonComponents;
+import java.util.function.Function;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.client.gui.components.Button;
+import java.io.File;
+import net.minecraft.network.chat.Component;
+import org.apache.logging.log4j.Logger;
+import net.minecraft.client.gui.screens.Screen;
+
+public abstract class PackSelectionScreen extends Screen {
+    private static final Logger LOGGER;
+    private static final Component DRAG_AND_DROP;
+    private static final Component DIRECTORY_BUTTON_TOOLTIP;
+    private final PackSelectionModel<?> model;
+    private final Screen lastScreen;
+    private boolean shouldCommit;
+    private TransferableSelectionList availablePackList;
+    private TransferableSelectionList selectedPackList;
+    private final File packDir;
+    private Button doneButton;
+    
+    public PackSelectionScreen(final Screen dqs, final TranslatableComponent ne, final Function<Runnable, PackSelectionModel<?>> function, final File file) {
+        super(ne);
+        this.lastScreen = dqs;
+        this.model = function.apply(this::populateLists);
+        this.packDir = file;
+    }
+    
+    @Override
+    public void removed() {
+        if (this.shouldCommit) {
+            this.shouldCommit = false;
+            this.model.commit();
+        }
+    }
+    
+    @Override
+    public void onClose() {
+        this.shouldCommit = true;
+        this.minecraft.setScreen(this.lastScreen);
+    }
+    
+    @Override
+    protected void init() {
+        this.doneButton = this.<Button>addButton(new Button(this.width / 2 + 4, this.height - 48, 150, 20, CommonComponents.GUI_DONE, dni -> this.onClose()));
+        this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 48, 150, 20, new TranslatableComponent("pack.openFolder"), dni -> Util.getPlatform().openFile(this.packDir), (dni, dhl, integer3, integer4) -> this.renderTooltip(dhl, PackSelectionScreen.DIRECTORY_BUTTON_TOOLTIP, integer3, integer4)));
+        (this.availablePackList = new TransferableSelectionList(this.minecraft, 200, this.height, new TranslatableComponent("pack.available.title"))).setLeftPos(this.width / 2 - 4 - 200);
+        this.children.add(this.availablePackList);
+        (this.selectedPackList = new TransferableSelectionList(this.minecraft, 200, this.height, new TranslatableComponent("pack.selected.title"))).setLeftPos(this.width / 2 + 4);
+        this.children.add(this.selectedPackList);
+        this.populateLists();
+    }
+    
+    private void populateLists() {
+        this.updateList(this.selectedPackList, this.model.getSelected());
+        this.updateList(this.availablePackList, this.model.getUnselected());
+        this.doneButton.active = !this.selectedPackList.children().isEmpty();
+    }
+    
+    private void updateList(final TransferableSelectionList dth, final Stream<PackSelectionModel.Entry> stream) {
+        dth.children().clear();
+        stream.forEach(a -> dth.children().add(new TransferableSelectionList.PackEntry(this.minecraft, dth, this, a)));
+    }
+    
+    private void reload() {
+        this.model.findNewPacks();
+        this.populateLists();
+        this.shouldCommit = true;
+    }
+    
+    @Override
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderDirtBackground(0);
+        this.availablePackList.render(dhl, integer2, integer3, float4);
+        this.selectedPackList.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 8, 16777215);
+        this.drawCenteredString(dhl, this.font, PackSelectionScreen.DRAG_AND_DROP, this.width / 2, 20, 16777215);
+        super.render(dhl, integer2, integer3, float4);
+    }
+    
+    protected static void copyPacks(final Minecraft dlx, final List<Path> list, final Path path) {
+        final MutableBoolean mutableBoolean4 = new MutableBoolean();
+        Stream<Path> stream4;
+        final MutableBoolean mutableBoolean5;
+        final Throwable t2;
+        final MutableBoolean mutableBoolean6;
+        list.forEach(path3 -> {
+            try {
+                stream4 = Files.walk(path3);
+                try {
+                    stream4.forEach(path4 -> {
+                        try {
+                            Util.copyBetweenDirs(path3.getParent(), path, path4);
+                        }
+                        catch (IOException iOException5) {
+                            PackSelectionScreen.LOGGER.warn("Failed to copy datapack file  from {} to {}", path4, path, iOException5);
+                            mutableBoolean5.setTrue();
+                        }
+                        return;
+                    });
+                }
+                catch (Throwable t) {
+                    throw t;
+                }
+                finally {
+                    if (stream4 != null) {
+                        if (t2 != null) {
+                            try {
+                                stream4.close();
+                            }
+                            catch (Throwable exception) {
+                                t2.addSuppressed(exception);
+                            }
+                        }
+                        else {
+                            stream4.close();
+                        }
+                    }
+                }
+            }
+            catch (IOException iOException6) {
+                PackSelectionScreen.LOGGER.warn("Failed to copy datapack file from {} to {}", path3, path);
+                mutableBoolean6.setTrue();
+            }
+            return;
+        });
+        if (mutableBoolean4.isTrue()) {
+            SystemToast.onPackCopyFailure(dlx, path.toString());
+        }
+    }
+    
+    @Override
+    public void onFilesDrop(final List<Path> list) {
+        final String string3 = list.stream().map(Path::getFileName).map(Path::toString).collect(Collectors.joining(", "));
+        this.minecraft.setScreen(new ConfirmScreen(boolean2 -> {
+            if (boolean2) {
+                copyPacks(this.minecraft, list, this.packDir.toPath());
+                this.reload();
+            }
+            this.minecraft.setScreen(this);
+        }, new TranslatableComponent("pack.dropConfirm"), new TextComponent(string3)));
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+        DRAG_AND_DROP = new TranslatableComponent("pack.dropInfo").withStyle(ChatFormatting.DARK_GRAY);
+        DIRECTORY_BUTTON_TOOLTIP = new TranslatableComponent("pack.folderInfo");
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/packs/TransferableSelectionList.java b/src/net/minecraft/client/gui/screens/packs/TransferableSelectionList.java
new file mode 100644
index 0000000..5f8ea0c
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/packs/TransferableSelectionList.java
@@ -0,0 +1,183 @@
+package net.minecraft.client.gui.screens.packs;
+
+import net.minecraft.client.gui.screens.ConfirmScreen;
+import java.util.List;
+import net.minecraft.server.packs.repository.PackCompatibility;
+import net.minecraft.client.gui.GuiComponent;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.TextComponent;
+import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.gui.components.ObjectSelectionList;
+
+public class TransferableSelectionList extends ObjectSelectionList<PackEntry> {
+    private static final ResourceLocation ICON_OVERLAY_LOCATION;
+    private static final Component INCOMPATIBLE_TITLE;
+    private static final Component INCOMPATIBLE_CONFIRM_TITLE;
+    private final Component title;
+    
+    public TransferableSelectionList(final Minecraft dlx, final int integer2, final int integer3, final Component mr) {
+        super(dlx, integer2, integer3, 32, integer3 - 55 + 4, 36);
+        this.title = mr;
+        this.centerListVertically = false;
+        final boolean boolean1 = true;
+        dlx.font.getClass();
+        this.setRenderHeader(boolean1, (int)(9.0f * 1.5f));
+    }
+    
+    @Override
+    protected void renderHeader(final PoseStack dhl, final int integer2, final int integer3, final Tesselator dhn) {
+        final Component mr6 = new TextComponent("").append(this.title).withStyle(ChatFormatting.UNDERLINE, ChatFormatting.BOLD);
+        this.minecraft.font.draw(dhl, mr6, (float)(integer2 + this.width / 2 - this.minecraft.font.width(mr6) / 2), (float)Math.min(this.y0 + 3, integer3), 16777215);
+    }
+    
+    @Override
+    public int getRowWidth() {
+        return this.width;
+    }
+    
+    @Override
+    protected int getScrollbarPosition() {
+        return this.x1 - 6;
+    }
+    
+    static {
+        ICON_OVERLAY_LOCATION = new ResourceLocation("textures/gui/resource_packs.png");
+        INCOMPATIBLE_TITLE = new TranslatableComponent("pack.incompatible");
+        INCOMPATIBLE_CONFIRM_TITLE = new TranslatableComponent("pack.incompatible.confirm.title");
+    }
+    
+    public static class PackEntry extends Entry<PackEntry> {
+        private TransferableSelectionList parent;
+        protected final Minecraft minecraft;
+        protected final Screen screen;
+        private final PackSelectionModel.Entry pack;
+        
+        public PackEntry(final Minecraft dlx, final TransferableSelectionList dth, final Screen dqs, final PackSelectionModel.Entry a) {
+            this.minecraft = dlx;
+            this.screen = dqs;
+            this.pack = a;
+            this.parent = dth;
+        }
+        
+        @Override
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            final PackCompatibility aaq12 = this.pack.getCompatibility();
+            if (!aaq12.isCompatible()) {
+                RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
+                GuiComponent.fill(dhl, integer4 - 1, integer3 - 1, integer4 + integer5 - 9, integer3 + integer6 + 1, -8978432);
+            }
+            this.pack.bindIcon(this.minecraft.getTextureManager());
+            RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
+            GuiComponent.blit(dhl, integer4, integer3, 0.0f, 0.0f, 32, 32, 32, 32);
+            Component mr13 = this.pack.getTitle();
+            FormattedText mu14 = this.pack.getExtendedDescription();
+            if (this.showHoverOverlay() && (this.minecraft.options.touchscreen || boolean9)) {
+                this.minecraft.getTextureManager().bind(TransferableSelectionList.ICON_OVERLAY_LOCATION);
+                GuiComponent.fill(dhl, integer4, integer3, integer4 + 32, integer3 + 32, -1601138544);
+                RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
+                final int integer9 = integer7 - integer4;
+                final int integer10 = integer8 - integer3;
+                if (!aaq12.isCompatible()) {
+                    mr13 = TransferableSelectionList.INCOMPATIBLE_TITLE;
+                    mu14 = aaq12.getDescription();
+                }
+                if (this.pack.canSelect()) {
+                    if (integer9 < 32) {
+                        GuiComponent.blit(dhl, integer4, integer3, 0.0f, 32.0f, 32, 32, 256, 256);
+                    }
+                    else {
+                        GuiComponent.blit(dhl, integer4, integer3, 0.0f, 0.0f, 32, 32, 256, 256);
+                    }
+                }
+                else {
+                    if (this.pack.canUnselect()) {
+                        if (integer9 < 16) {
+                            GuiComponent.blit(dhl, integer4, integer3, 32.0f, 32.0f, 32, 32, 256, 256);
+                        }
+                        else {
+                            GuiComponent.blit(dhl, integer4, integer3, 32.0f, 0.0f, 32, 32, 256, 256);
+                        }
+                    }
+                    if (this.pack.canMoveUp()) {
+                        if (integer9 < 32 && integer9 > 16 && integer10 < 16) {
+                            GuiComponent.blit(dhl, integer4, integer3, 96.0f, 32.0f, 32, 32, 256, 256);
+                        }
+                        else {
+                            GuiComponent.blit(dhl, integer4, integer3, 96.0f, 0.0f, 32, 32, 256, 256);
+                        }
+                    }
+                    if (this.pack.canMoveDown()) {
+                        if (integer9 < 32 && integer9 > 16 && integer10 > 16) {
+                            GuiComponent.blit(dhl, integer4, integer3, 64.0f, 32.0f, 32, 32, 256, 256);
+                        }
+                        else {
+                            GuiComponent.blit(dhl, integer4, integer3, 64.0f, 0.0f, 32, 32, 256, 256);
+                        }
+                    }
+                }
+            }
+            final int integer9 = this.minecraft.font.width(mr13);
+            if (integer9 > 157) {
+                final FormattedText mu15 = FormattedText.composite(this.minecraft.font.substrByWidth(mr13, 157 - this.minecraft.font.width("...")), FormattedText.of("..."));
+                this.minecraft.font.drawShadow(dhl, mu15, (float)(integer4 + 32 + 2), (float)(integer3 + 1), 16777215);
+            }
+            else {
+                this.minecraft.font.drawShadow(dhl, mr13, (float)(integer4 + 32 + 2), (float)(integer3 + 1), 16777215);
+            }
+            this.minecraft.font.drawShadow(dhl, mr13, (float)(integer4 + 32 + 2), (float)(integer3 + 1), 16777215);
+            final List<FormattedText> list16 = this.minecraft.font.split(mu14, 157);
+            for (int integer11 = 0; integer11 < 2 && integer11 < list16.size(); ++integer11) {
+                this.minecraft.font.drawShadow(dhl, list16.get(integer11), (float)(integer4 + 32 + 2), (float)(integer3 + 12 + 10 * integer11), 8421504);
+            }
+        }
+        
+        private boolean showHoverOverlay() {
+            return !this.pack.isFixedPosition() || !this.pack.isRequired();
+        }
+        
+        @Override
+        public boolean mouseClicked(final double double1, final double double2, final int integer) {
+            final double double3 = double1 - this.parent.getRowLeft();
+            final double double4 = double2 - this.parent.getRowTop(this.parent.children().indexOf(this));
+            if (this.showHoverOverlay() && double3 <= 32.0) {
+                if (this.pack.canSelect()) {
+                    final PackCompatibility aaq11 = this.pack.getCompatibility();
+                    if (aaq11.isCompatible()) {
+                        this.pack.select();
+                    }
+                    else {
+                        final Component mr12 = aaq11.getConfirmation();
+                        this.minecraft.setScreen(new ConfirmScreen(boolean1 -> {
+                            this.minecraft.setScreen(this.screen);
+                            if (boolean1) {
+                                this.pack.select();
+                            }
+                        }, TransferableSelectionList.INCOMPATIBLE_CONFIRM_TITLE, mr12));
+                    }
+                    return true;
+                }
+                if (double3 < 16.0 && this.pack.canUnselect()) {
+                    this.pack.unselect();
+                    return true;
+                }
+                if (double3 > 16.0 && double4 < 16.0 && this.pack.canMoveUp()) {
+                    this.pack.moveUp();
+                    return true;
+                }
+                if (double3 > 16.0 && double4 > 16.0 && this.pack.canMoveDown()) {
+                    this.pack.moveDown();
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/recipebook/AbstractFurnaceRecipeBookComponent.java b/src/net/minecraft/client/gui/screens/recipebook/AbstractFurnaceRecipeBookComponent.java
index 50804e0..2d7343e 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/AbstractFurnaceRecipeBookComponent.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/AbstractFurnaceRecipeBookComponent.java
@@ -4,13 +4,15 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.screens.Screen;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.ItemStack;
 import java.util.List;
 import net.minecraft.world.item.crafting.Recipe;
 import javax.annotation.Nullable;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.inventory.Slot;
 import java.util.Set;
 import net.minecraft.world.item.Item;
@@ -58,41 +60,41 @@ public abstract class AbstractFurnaceRecipeBookComponent extends RecipeBookCompo
     }
     
     @Override
-    protected String getFilterButtonTooltip() {
-        return I18n.get(this.filterButton.isStateTriggered() ? this.getRecipeFilterName() : "gui.recipebook.toggleRecipes.all");
+    protected Component getFilterButtonTooltip() {
+        return this.filterButton.isStateTriggered() ? this.getRecipeFilterName() : new TranslatableComponent("gui.recipebook.toggleRecipes.all");
     }
     
-    protected abstract String getRecipeFilterName();
+    protected abstract Component getRecipeFilterName();
     
     @Override
-    public void slotClicked(@Nullable final Slot bca) {
-        super.slotClicked(bca);
-        if (bca != null && bca.index < this.menu.getSize()) {
+    public void slotClicked(@Nullable final Slot bhw) {
+        super.slotClicked(bhw);
+        if (bhw != null && bhw.index < this.menu.getSize()) {
             this.fuelSlot = null;
         }
     }
     
     @Override
-    public void setupGhostRecipe(final Recipe<?> bgw, final List<Slot> list) {
-        final ItemStack ben4 = bgw.getResultItem();
-        this.ghostRecipe.setRecipe(bgw);
-        this.ghostRecipe.addIngredient(Ingredient.of(ben4), list.get(2).x, list.get(2).y);
-        final NonNullList<Ingredient> fy5 = bgw.getIngredients();
+    public void setupGhostRecipe(final Recipe<?> bmu, final List<Slot> list) {
+        final ItemStack bki4 = bmu.getResultItem();
+        this.ghostRecipe.setRecipe(bmu);
+        this.ghostRecipe.addIngredient(Ingredient.of(bki4), list.get(2).x, list.get(2).y);
+        final NonNullList<Ingredient> gi5 = bmu.getIngredients();
         this.fuelSlot = list.get(1);
         if (this.fuels == null) {
             this.fuels = this.getFuelItems();
         }
         this.iterator = this.fuels.iterator();
         this.fuel = null;
-        final Iterator<Ingredient> iterator6 = fy5.iterator();
+        final Iterator<Ingredient> iterator6 = gi5.iterator();
         for (int integer7 = 0; integer7 < 2; ++integer7) {
             if (!iterator6.hasNext()) {
                 return;
             }
-            final Ingredient bgt8 = iterator6.next();
-            if (!bgt8.isEmpty()) {
-                final Slot bca9 = list.get(integer7);
-                this.ghostRecipe.addIngredient(bgt8, bca9.x, bca9.y);
+            final Ingredient bmr8 = iterator6.next();
+            if (!bmr8.isEmpty()) {
+                final Slot bhw9 = list.get(integer7);
+                this.ghostRecipe.addIngredient(bmr8, bhw9.x, bhw9.y);
             }
         }
     }
@@ -100,20 +102,20 @@ public abstract class AbstractFurnaceRecipeBookComponent extends RecipeBookCompo
     protected abstract Set<Item> getFuelItems();
     
     @Override
-    public void renderGhostRecipe(final int integer1, final int integer2, final boolean boolean3, final float float4) {
-        super.renderGhostRecipe(integer1, integer2, boolean3, float4);
+    public void renderGhostRecipe(final PoseStack dhl, final int integer2, final int integer3, final boolean boolean4, final float float5) {
+        super.renderGhostRecipe(dhl, integer2, integer3, boolean4, float5);
         if (this.fuelSlot == null) {
             return;
         }
         if (!Screen.hasControlDown()) {
-            this.time += float4;
+            this.time += float5;
         }
-        final int integer3 = this.fuelSlot.x + integer1;
-        final int integer4 = this.fuelSlot.y + integer2;
-        GuiComponent.fill(integer3, integer4, integer3 + 16, integer4 + 16, 822018048);
-        this.minecraft.getItemRenderer().renderAndDecorateItem(this.minecraft.player, this.getFuel().getDefaultInstance(), integer3, integer4);
+        final int integer4 = this.fuelSlot.x + integer2;
+        final int integer5 = this.fuelSlot.y + integer3;
+        GuiComponent.fill(dhl, integer4, integer5, integer4 + 16, integer5 + 16, 822018048);
+        this.minecraft.getItemRenderer().renderAndDecorateItem(this.minecraft.player, this.getFuel().getDefaultInstance(), integer4, integer5);
         RenderSystem.depthFunc(516);
-        GuiComponent.fill(integer3, integer4, integer3 + 16, integer4 + 16, 822083583);
+        GuiComponent.fill(dhl, integer4, integer5, integer4 + 16, integer5 + 16, 822083583);
         RenderSystem.depthFunc(515);
     }
     
diff --git a/src/net/minecraft/client/gui/screens/recipebook/BlastingRecipeBookComponent.java b/src/net/minecraft/client/gui/screens/recipebook/BlastingRecipeBookComponent.java
index 0e2ea8a..ee8d8b6 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/BlastingRecipeBookComponent.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/BlastingRecipeBookComponent.java
@@ -3,6 +3,8 @@ package net.minecraft.client.gui.screens.recipebook;
 import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.item.Item;
 import java.util.Set;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 
 public class BlastingRecipeBookComponent extends AbstractFurnaceRecipeBookComponent {
     @Override
@@ -26,8 +28,8 @@ public class BlastingRecipeBookComponent extends AbstractFurnaceRecipeBookCompon
     }
     
     @Override
-    protected String getRecipeFilterName() {
-        return "gui.recipebook.toggleRecipes.blastable";
+    protected Component getRecipeFilterName() {
+        return new TranslatableComponent("gui.recipebook.toggleRecipes.blastable");
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/recipebook/GhostRecipe.java b/src/net/minecraft/client/gui/screens/recipebook/GhostRecipe.java
index 3a6f355..b3bd709 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/GhostRecipe.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/GhostRecipe.java
@@ -4,10 +4,10 @@ import net.minecraft.util.Mth;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.world.item.ItemStack;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.Minecraft;
+import com.mojang.blaze3d.vertex.PoseStack;
 import javax.annotation.Nullable;
 import net.minecraft.world.item.crafting.Ingredient;
 import com.google.common.collect.Lists;
@@ -29,8 +29,8 @@ public class GhostRecipe {
         this.time = 0.0f;
     }
     
-    public void addIngredient(final Ingredient bgt, final int integer2, final int integer3) {
-        this.ingredients.add(new GhostIngredient(bgt, integer2, integer3));
+    public void addIngredient(final Ingredient bmr, final int integer2, final int integer3) {
+        this.ingredients.add(new GhostIngredient(bmr, integer2, integer3));
     }
     
     public GhostIngredient get(final int integer) {
@@ -46,32 +46,32 @@ public class GhostRecipe {
         return this.recipe;
     }
     
-    public void setRecipe(final Recipe<?> bgw) {
-        this.recipe = bgw;
+    public void setRecipe(final Recipe<?> bmu) {
+        this.recipe = bmu;
     }
     
-    public void render(final Minecraft dbn, final int integer2, final int integer3, final boolean boolean4, final float float5) {
+    public void render(final PoseStack dhl, final Minecraft dlx, final int integer3, final int integer4, final boolean boolean5, final float float6) {
         if (!Screen.hasControlDown()) {
-            this.time += float5;
+            this.time += float6;
         }
-        for (int integer4 = 0; integer4 < this.ingredients.size(); ++integer4) {
-            final GhostIngredient a8 = this.ingredients.get(integer4);
-            final int integer5 = a8.getX() + integer2;
-            final int integer6 = a8.getY() + integer3;
-            if (integer4 == 0 && boolean4) {
-                GuiComponent.fill(integer5 - 4, integer6 - 4, integer5 + 20, integer6 + 20, 822018048);
+        for (int integer5 = 0; integer5 < this.ingredients.size(); ++integer5) {
+            final GhostIngredient a9 = this.ingredients.get(integer5);
+            final int integer6 = a9.getX() + integer3;
+            final int integer7 = a9.getY() + integer4;
+            if (integer5 == 0 && boolean5) {
+                GuiComponent.fill(dhl, integer6 - 4, integer7 - 4, integer6 + 20, integer7 + 20, 822018048);
             }
             else {
-                GuiComponent.fill(integer5, integer6, integer5 + 16, integer6 + 16, 822018048);
+                GuiComponent.fill(dhl, integer6, integer7, integer6 + 16, integer7 + 16, 822018048);
             }
-            final ItemStack ben11 = a8.getItem();
-            final ItemRenderer dvz12 = dbn.getItemRenderer();
-            dvz12.renderAndDecorateItem(dbn.player, ben11, integer5, integer6);
+            final ItemStack bki12 = a9.getItem();
+            final ItemRenderer ehh13 = dlx.getItemRenderer();
+            ehh13.renderAndDecorateFakeItem(bki12, integer6, integer7);
             RenderSystem.depthFunc(516);
-            GuiComponent.fill(integer5, integer6, integer5 + 16, integer6 + 16, 822083583);
+            GuiComponent.fill(dhl, integer6, integer7, integer6 + 16, integer7 + 16, 822083583);
             RenderSystem.depthFunc(515);
-            if (integer4 == 0) {
-                dvz12.renderGuiItemDecorations(dbn.font, ben11, integer5, integer6);
+            if (integer5 == 0) {
+                ehh13.renderGuiItemDecorations(dlx.font, bki12, integer6, integer7);
             }
         }
     }
@@ -81,8 +81,8 @@ public class GhostRecipe {
         private final int x;
         private final int y;
         
-        public GhostIngredient(final Ingredient bgt, final int integer3, final int integer4) {
-            this.ingredient = bgt;
+        public GhostIngredient(final Ingredient bmr, final int integer3, final int integer4) {
+            this.ingredient = bmr;
             this.x = integer3;
             this.y = integer4;
         }
diff --git a/src/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java b/src/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java
index 2aff365..a4be9ce 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java
@@ -1,10 +1,12 @@
 package net.minecraft.client.gui.screens.recipebook;
 
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.recipebook.PlaceRecipe;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.Iterator;
 import net.minecraft.util.Mth;
 import java.util.Collections;
@@ -35,15 +37,15 @@ public class OverlayRecipeComponent extends GuiComponent implements Widget, GuiE
         this.recipeButtons = Lists.newArrayList();
     }
     
-    public void init(final Minecraft dbn, final RecipeCollection dit, final int integer3, final int integer4, final int integer5, final int integer6, final float float7) {
-        this.minecraft = dbn;
-        this.collection = dit;
-        if (dbn.player.containerMenu instanceof AbstractFurnaceMenu) {
+    public void init(final Minecraft dlx, final RecipeCollection dtr, final int integer3, final int integer4, final int integer5, final int integer6, final float float7) {
+        this.minecraft = dlx;
+        this.collection = dtr;
+        if (dlx.player.containerMenu instanceof AbstractFurnaceMenu) {
             this.isFurnaceMenu = true;
         }
-        final boolean boolean9 = dbn.player.getRecipeBook().isFilteringCraftable(dbn.player.containerMenu);
-        final List<Recipe<?>> list10 = dit.getDisplayRecipes(true);
-        final List<Recipe<?>> list11 = boolean9 ? Collections.<Recipe<?>>emptyList() : dit.getDisplayRecipes(false);
+        final boolean boolean9 = dlx.player.getRecipeBook().isFilteringCraftable(dlx.player.containerMenu);
+        final List<Recipe<?>> list10 = dtr.getDisplayRecipes(true);
+        final List<Recipe<?>> list11 = boolean9 ? Collections.<Recipe<?>>emptyList() : dtr.getDisplayRecipes(false);
         final int integer7 = list10.size();
         final int integer8 = integer7 + list11.size();
         final int integer9 = (integer8 <= 16) ? 4 : 5;
@@ -70,14 +72,14 @@ public class OverlayRecipeComponent extends GuiComponent implements Widget, GuiE
         this.recipeButtons.clear();
         for (int integer12 = 0; integer12 < integer8; ++integer12) {
             final boolean boolean10 = integer12 < integer7;
-            final Recipe<?> bgw25 = boolean10 ? list10.get(integer12) : list11.get(integer12 - integer7);
+            final Recipe<?> bmu25 = boolean10 ? list10.get(integer12) : list11.get(integer12 - integer7);
             final int integer13 = this.x + 4 + 25 * (integer12 % integer9);
             final int integer14 = this.y + 5 + 25 * (integer12 / integer9);
             if (this.isFurnaceMenu) {
-                this.recipeButtons.add(new OverlaySmeltingRecipeButton(integer13, integer14, bgw25, boolean10));
+                this.recipeButtons.add(new OverlaySmeltingRecipeButton(integer13, integer14, bmu25, boolean10));
             }
             else {
-                this.recipeButtons.add(new OverlayRecipeButton(integer13, integer14, bgw25, boolean10));
+                this.recipeButtons.add(new OverlayRecipeButton(integer13, integer14, bmu25, boolean10));
             }
         }
         this.lastRecipeClicked = null;
@@ -116,55 +118,55 @@ public class OverlayRecipeComponent extends GuiComponent implements Widget, GuiE
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (!this.isVisible) {
             return;
         }
-        this.time += float3;
+        this.time += float4;
         RenderSystem.enableBlend();
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         this.minecraft.getTextureManager().bind(OverlayRecipeComponent.RECIPE_BOOK_LOCATION);
         RenderSystem.pushMatrix();
         RenderSystem.translatef(0.0f, 0.0f, 170.0f);
-        final int integer3 = (this.recipeButtons.size() <= 16) ? 4 : 5;
-        final int integer4 = Math.min(this.recipeButtons.size(), integer3);
-        final int integer5 = Mth.ceil(this.recipeButtons.size() / (float)integer3);
-        final int integer6 = 24;
-        final int integer7 = 4;
-        final int integer8 = 82;
-        final int integer9 = 208;
-        this.nineInchSprite(integer4, integer5, 24, 4, 82, 208);
+        final int integer4 = (this.recipeButtons.size() <= 16) ? 4 : 5;
+        final int integer5 = Math.min(this.recipeButtons.size(), integer4);
+        final int integer6 = Mth.ceil(this.recipeButtons.size() / (float)integer4);
+        final int integer7 = 24;
+        final int integer8 = 4;
+        final int integer9 = 82;
+        final int integer10 = 208;
+        this.nineInchSprite(dhl, integer5, integer6, 24, 4, 82, 208);
         RenderSystem.disableBlend();
-        for (final OverlayRecipeButton a13 : this.recipeButtons) {
-            a13.render(integer1, integer2, float3);
+        for (final OverlayRecipeButton a14 : this.recipeButtons) {
+            a14.render(dhl, integer2, integer3, float4);
         }
         RenderSystem.popMatrix();
     }
     
-    private void nineInchSprite(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.blit(this.x, this.y, integer5, integer6, integer4, integer4);
-        this.blit(this.x + integer4 * 2 + integer1 * integer3, this.y, integer5 + integer3 + integer4, integer6, integer4, integer4);
-        this.blit(this.x, this.y + integer4 * 2 + integer2 * integer3, integer5, integer6 + integer3 + integer4, integer4, integer4);
-        this.blit(this.x + integer4 * 2 + integer1 * integer3, this.y + integer4 * 2 + integer2 * integer3, integer5 + integer3 + integer4, integer6 + integer3 + integer4, integer4, integer4);
-        for (int integer7 = 0; integer7 < integer1; ++integer7) {
-            this.blit(this.x + integer4 + integer7 * integer3, this.y, integer5 + integer4, integer6, integer3, integer4);
-            this.blit(this.x + integer4 + (integer7 + 1) * integer3, this.y, integer5 + integer4, integer6, integer4, integer4);
-            for (int integer8 = 0; integer8 < integer2; ++integer8) {
-                if (integer7 == 0) {
-                    this.blit(this.x, this.y + integer4 + integer8 * integer3, integer5, integer6 + integer4, integer4, integer3);
-                    this.blit(this.x, this.y + integer4 + (integer8 + 1) * integer3, integer5, integer6 + integer4, integer4, integer4);
+    private void nineInchSprite(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7) {
+        this.blit(dhl, this.x, this.y, integer6, integer7, integer5, integer5);
+        this.blit(dhl, this.x + integer5 * 2 + integer2 * integer4, this.y, integer6 + integer4 + integer5, integer7, integer5, integer5);
+        this.blit(dhl, this.x, this.y + integer5 * 2 + integer3 * integer4, integer6, integer7 + integer4 + integer5, integer5, integer5);
+        this.blit(dhl, this.x + integer5 * 2 + integer2 * integer4, this.y + integer5 * 2 + integer3 * integer4, integer6 + integer4 + integer5, integer7 + integer4 + integer5, integer5, integer5);
+        for (int integer8 = 0; integer8 < integer2; ++integer8) {
+            this.blit(dhl, this.x + integer5 + integer8 * integer4, this.y, integer6 + integer5, integer7, integer4, integer5);
+            this.blit(dhl, this.x + integer5 + (integer8 + 1) * integer4, this.y, integer6 + integer5, integer7, integer5, integer5);
+            for (int integer9 = 0; integer9 < integer3; ++integer9) {
+                if (integer8 == 0) {
+                    this.blit(dhl, this.x, this.y + integer5 + integer9 * integer4, integer6, integer7 + integer5, integer5, integer4);
+                    this.blit(dhl, this.x, this.y + integer5 + (integer9 + 1) * integer4, integer6, integer7 + integer5, integer5, integer5);
                 }
-                this.blit(this.x + integer4 + integer7 * integer3, this.y + integer4 + integer8 * integer3, integer5 + integer4, integer6 + integer4, integer3, integer3);
-                this.blit(this.x + integer4 + (integer7 + 1) * integer3, this.y + integer4 + integer8 * integer3, integer5 + integer4, integer6 + integer4, integer4, integer3);
-                this.blit(this.x + integer4 + integer7 * integer3, this.y + integer4 + (integer8 + 1) * integer3, integer5 + integer4, integer6 + integer4, integer3, integer4);
-                this.blit(this.x + integer4 + (integer7 + 1) * integer3 - 1, this.y + integer4 + (integer8 + 1) * integer3 - 1, integer5 + integer4, integer6 + integer4, integer4 + 1, integer4 + 1);
-                if (integer7 == integer1 - 1) {
-                    this.blit(this.x + integer4 * 2 + integer1 * integer3, this.y + integer4 + integer8 * integer3, integer5 + integer3 + integer4, integer6 + integer4, integer4, integer3);
-                    this.blit(this.x + integer4 * 2 + integer1 * integer3, this.y + integer4 + (integer8 + 1) * integer3, integer5 + integer3 + integer4, integer6 + integer4, integer4, integer4);
+                this.blit(dhl, this.x + integer5 + integer8 * integer4, this.y + integer5 + integer9 * integer4, integer6 + integer5, integer7 + integer5, integer4, integer4);
+                this.blit(dhl, this.x + integer5 + (integer8 + 1) * integer4, this.y + integer5 + integer9 * integer4, integer6 + integer5, integer7 + integer5, integer5, integer4);
+                this.blit(dhl, this.x + integer5 + integer8 * integer4, this.y + integer5 + (integer9 + 1) * integer4, integer6 + integer5, integer7 + integer5, integer4, integer5);
+                this.blit(dhl, this.x + integer5 + (integer8 + 1) * integer4 - 1, this.y + integer5 + (integer9 + 1) * integer4 - 1, integer6 + integer5, integer7 + integer5, integer5 + 1, integer5 + 1);
+                if (integer8 == integer2 - 1) {
+                    this.blit(dhl, this.x + integer5 * 2 + integer2 * integer4, this.y + integer5 + integer9 * integer4, integer6 + integer4 + integer5, integer7 + integer5, integer5, integer4);
+                    this.blit(dhl, this.x + integer5 * 2 + integer2 * integer4, this.y + integer5 + (integer9 + 1) * integer4, integer6 + integer4 + integer5, integer7 + integer5, integer5, integer5);
                 }
             }
-            this.blit(this.x + integer4 + integer7 * integer3, this.y + integer4 * 2 + integer2 * integer3, integer5 + integer4, integer6 + integer3 + integer4, integer3, integer4);
-            this.blit(this.x + integer4 + (integer7 + 1) * integer3, this.y + integer4 * 2 + integer2 * integer3, integer5 + integer4, integer6 + integer3 + integer4, integer4, integer4);
+            this.blit(dhl, this.x + integer5 + integer8 * integer4, this.y + integer5 * 2 + integer3 * integer4, integer6 + integer5, integer7 + integer4 + integer5, integer4, integer5);
+            this.blit(dhl, this.x + integer5 + (integer8 + 1) * integer4, this.y + integer5 * 2 + integer3 * integer4, integer6 + integer5, integer7 + integer4 + integer5, integer5, integer5);
         }
     }
     
@@ -181,13 +183,13 @@ public class OverlayRecipeComponent extends GuiComponent implements Widget, GuiE
     }
     
     class OverlaySmeltingRecipeButton extends OverlayRecipeButton {
-        public OverlaySmeltingRecipeButton(final int integer2, final int integer3, final Recipe<?> bgw, final boolean boolean5) {
-            super(integer2, integer3, bgw, boolean5);
+        public OverlaySmeltingRecipeButton(final int integer2, final int integer3, final Recipe<?> bmu, final boolean boolean5) {
+            super(integer2, integer3, bmu, boolean5);
         }
         
         @Override
-        protected void calculateIngredientsPositions(final Recipe<?> bgw) {
-            final ItemStack[] arr3 = bgw.getIngredients().get(0).getItems();
+        protected void calculateIngredientsPositions(final Recipe<?> bmu) {
+            final ItemStack[] arr3 = bmu.getIngredients().get(0).getItems();
             this.ingredientPos.add(new Pos(10, 10, arr3));
         }
     }
@@ -197,18 +199,18 @@ public class OverlayRecipeComponent extends GuiComponent implements Widget, GuiE
         private final boolean isCraftable;
         protected final List<Pos> ingredientPos;
         
-        public OverlayRecipeButton(final int integer2, final int integer3, final Recipe<?> bgw, final boolean boolean5) {
-            super(integer2, integer3, 200, 20, "");
+        public OverlayRecipeButton(final int integer2, final int integer3, final Recipe<?> bmu, final boolean boolean5) {
+            super(integer2, integer3, 200, 20, TextComponent.EMPTY);
             this.ingredientPos = Lists.newArrayList();
             this.width = 24;
             this.height = 24;
-            this.recipe = bgw;
+            this.recipe = bmu;
             this.isCraftable = boolean5;
-            this.calculateIngredientsPositions(bgw);
+            this.calculateIngredientsPositions(bmu);
         }
         
-        protected void calculateIngredientsPositions(final Recipe<?> bgw) {
-            this.placeRecipe(3, 3, -1, bgw, bgw.getIngredients().iterator(), 0);
+        protected void calculateIngredientsPositions(final Recipe<?> bmu) {
+            this.placeRecipe(3, 3, -1, bmu, bmu.getIngredients().iterator(), 0);
         }
         
         @Override
@@ -220,25 +222,25 @@ public class OverlayRecipeComponent extends GuiComponent implements Widget, GuiE
         }
         
         @Override
-        public void renderButton(final int integer1, final int integer2, final float float3) {
+        public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
             RenderSystem.enableAlphaTest();
             OverlayRecipeComponent.this.minecraft.getTextureManager().bind(OverlayRecipeComponent.RECIPE_BOOK_LOCATION);
-            int integer3 = 152;
+            int integer4 = 152;
             if (!this.isCraftable) {
-                integer3 += 26;
-            }
-            int integer4 = OverlayRecipeComponent.this.isFurnaceMenu ? 130 : 78;
-            if (this.isHovered()) {
                 integer4 += 26;
             }
-            this.blit(this.x, this.y, integer3, integer4, this.width, this.height);
-            for (final Pos a8 : this.ingredientPos) {
+            int integer5 = OverlayRecipeComponent.this.isFurnaceMenu ? 130 : 78;
+            if (this.isHovered()) {
+                integer5 += 26;
+            }
+            this.blit(dhl, this.x, this.y, integer4, integer5, this.width, this.height);
+            for (final Pos a9 : this.ingredientPos) {
                 RenderSystem.pushMatrix();
-                final float float4 = 0.42f;
-                final int integer5 = (int)((this.x + a8.x) / 0.42f - 3.0f);
-                final int integer6 = (int)((this.y + a8.y) / 0.42f - 3.0f);
+                final float float5 = 0.42f;
+                final int integer6 = (int)((this.x + a9.x) / 0.42f - 3.0f);
+                final int integer7 = (int)((this.y + a9.y) / 0.42f - 3.0f);
                 RenderSystem.scalef(0.42f, 0.42f, 1.0f);
-                OverlayRecipeComponent.this.minecraft.getItemRenderer().renderAndDecorateItem(a8.ingredients[Mth.floor(OverlayRecipeComponent.this.time / 30.0f) % a8.ingredients.length], integer5, integer6);
+                OverlayRecipeComponent.this.minecraft.getItemRenderer().renderAndDecorateItem(a9.ingredients[Mth.floor(OverlayRecipeComponent.this.time / 30.0f) % a9.ingredients.length], integer6, integer7);
                 RenderSystem.popMatrix();
             }
             RenderSystem.disableAlphaTest();
diff --git a/src/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java b/src/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java
index bd43b32..d1e4371 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java
@@ -1,13 +1,16 @@
 package net.minecraft.client.gui.screens.recipebook;
 
+import net.minecraft.ChatFormatting;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket;
-import net.minecraft.client.resources.language.Language;
+import net.minecraft.client.resources.language.LanguageInfo;
 import net.minecraft.client.resources.language.LanguageManager;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.network.chat.FormattedText;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import it.unimi.dsi.fastutil.objects.ObjectSet;
 import java.util.Collection;
 import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
@@ -19,7 +22,7 @@ import net.minecraft.world.inventory.Slot;
 import java.util.Iterator;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.RecipeBookCategories;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
 import com.google.common.collect.Lists;
 import net.minecraft.world.entity.player.StackedContents;
 import net.minecraft.client.ClientRecipeBook;
@@ -28,6 +31,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.world.inventory.RecipeBookMenu;
 import net.minecraft.client.gui.components.StateSwitchingButton;
 import java.util.List;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.recipebook.PlaceRecipe;
@@ -37,6 +41,7 @@ import net.minecraft.client.gui.GuiComponent;
 
 public class RecipeBookComponent extends GuiComponent implements Widget, GuiEventListener, RecipeShownListener, PlaceRecipe<Ingredient> {
     protected static final ResourceLocation RECIPE_BOOK_LOCATION;
+    private static final Component SEARCH_HINT;
     private int xOffset;
     private int width;
     private int height;
@@ -62,18 +67,18 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
         this.stackedContents = new StackedContents();
     }
     
-    public void init(final int integer1, final int integer2, final Minecraft dbn, final boolean boolean4, final RecipeBookMenu<?> bbt) {
-        this.minecraft = dbn;
+    public void init(final int integer1, final int integer2, final Minecraft dlx, final boolean boolean4, final RecipeBookMenu<?> bhp) {
+        this.minecraft = dlx;
         this.width = integer1;
         this.height = integer2;
-        this.menu = bbt;
-        dbn.player.containerMenu = bbt;
-        this.book = dbn.player.getRecipeBook();
-        this.timesInventoryChanged = dbn.player.inventory.getTimesChanged();
+        this.menu = bhp;
+        dlx.player.containerMenu = bhp;
+        this.book = dlx.player.getRecipeBook();
+        this.timesInventoryChanged = dlx.player.inventory.getTimesChanged();
         if (this.isVisible()) {
             this.initVisuals(boolean4);
         }
-        dbn.keyboardHandler.setSendRepeatsToGui(true);
+        dlx.keyboardHandler.setSendRepeatsToGui(true);
     }
     
     public void initVisuals(final boolean boolean1) {
@@ -89,7 +94,7 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
         final int integer6 = integer4 + 14;
         final int integer7 = 80;
         this.minecraft.font.getClass();
-        (this.searchBox = new EditBox(font, integer5, integer6, integer7, 9 + 5, I18n.get("itemGroup.search"))).setMaxLength(50);
+        (this.searchBox = new EditBox(font, integer5, integer6, integer7, 9 + 5, new TranslatableComponent("itemGroup.search"))).setMaxLength(50);
         this.searchBox.setBordered(false);
         this.searchBox.setVisible(true);
         this.searchBox.setTextColor(16777215);
@@ -99,11 +104,11 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
         this.filterButton = new StateSwitchingButton(integer3 + 110, integer4 + 12, 26, 16, this.book.isFilteringCraftable(this.menu));
         this.initFilterButtonTextures();
         this.tabButtons.clear();
-        for (final RecipeBookCategories dbu7 : ClientRecipeBook.getCategories(this.menu)) {
-            this.tabButtons.add(new RecipeBookTabButton(dbu7));
+        for (final RecipeBookCategories dme7 : ClientRecipeBook.getCategories(this.menu)) {
+            this.tabButtons.add(new RecipeBookTabButton(dme7));
         }
         if (this.selectedTab != null) {
-            this.selectedTab = this.tabButtons.stream().filter(dir -> dir.getCategory().equals(this.selectedTab.getCategory())).findFirst().orElse(null);
+            this.selectedTab = this.tabButtons.stream().filter(dtp -> dtp.getCategory().equals(this.selectedTab.getCategory())).findFirst().orElse(null);
         }
         if (this.selectedTab == null) {
             this.selectedTab = this.tabButtons.get(0);
@@ -155,8 +160,8 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
         this.sendUpdateSettings();
     }
     
-    public void slotClicked(@Nullable final Slot bca) {
-        if (bca != null && bca.index < this.menu.getSize()) {
+    public void slotClicked(@Nullable final Slot bhw) {
+        if (bhw != null && bhw.index < this.menu.getSize()) {
             this.ghostRecipe.clear();
             if (this.isVisible()) {
                 this.updateStackedContents();
@@ -166,17 +171,17 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
     
     private void updateCollections(final boolean boolean1) {
         final List<RecipeCollection> list3 = this.book.getCollection(this.selectedTab.getCategory());
-        list3.forEach(dit -> dit.canCraft(this.stackedContents, this.menu.getGridWidth(), this.menu.getGridHeight(), this.book));
+        list3.forEach(dtr -> dtr.canCraft(this.stackedContents, this.menu.getGridWidth(), this.menu.getGridHeight(), this.book));
         final List<RecipeCollection> list4 = Lists.newArrayList(list3);
-        list4.removeIf(dit -> !dit.hasKnownRecipes());
-        list4.removeIf(dit -> !dit.hasFitting());
+        list4.removeIf(dtr -> !dtr.hasKnownRecipes());
+        list4.removeIf(dtr -> !dtr.hasFitting());
         final String string5 = this.searchBox.getValue();
         if (!string5.isEmpty()) {
             final ObjectSet<RecipeCollection> objectSet6 = (ObjectSet<RecipeCollection>)new ObjectLinkedOpenHashSet((Collection)this.minecraft.<RecipeCollection>getSearchTree(SearchRegistry.RECIPE_COLLECTIONS).search(string5.toLowerCase(Locale.ROOT)));
-            list4.removeIf(dit -> !objectSet6.contains(dit));
+            list4.removeIf(dtr -> !objectSet6.contains(dtr));
         }
         if (this.book.isFilteringCraftable(this.menu)) {
-            list4.removeIf(dit -> !dit.hasCraftable());
+            list4.removeIf(dtr -> !dtr.hasCraftable());
         }
         this.recipeBookPage.updateCollections(list4, boolean1);
     }
@@ -186,18 +191,18 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
         final int integer3 = (this.height - 166) / 2 + 3;
         final int integer4 = 27;
         int integer5 = 0;
-        for (final RecipeBookTabButton dir7 : this.tabButtons) {
-            final RecipeBookCategories dbu8 = dir7.getCategory();
-            if (dbu8 == RecipeBookCategories.SEARCH || dbu8 == RecipeBookCategories.FURNACE_SEARCH) {
-                dir7.visible = true;
-                dir7.setPosition(integer2, integer3 + 27 * integer5++);
+        for (final RecipeBookTabButton dtp7 : this.tabButtons) {
+            final RecipeBookCategories dme8 = dtp7.getCategory();
+            if (dme8 == RecipeBookCategories.SEARCH || dme8 == RecipeBookCategories.FURNACE_SEARCH) {
+                dtp7.visible = true;
+                dtp7.setPosition(integer2, integer3 + 27 * integer5++);
             }
             else {
-                if (!dir7.updateVisibility(this.book)) {
+                if (!dtp7.updateVisibility(this.book)) {
                     continue;
                 }
-                dir7.setPosition(integer2, integer3 + 27 * integer5++);
-                dir7.startAnimation(this.minecraft);
+                dtp7.setPosition(integer2, integer3 + 27 * integer5++);
+                dtp7.startAnimation(this.minecraft);
             }
         }
     }
@@ -220,7 +225,7 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (!this.isVisible()) {
             return;
         }
@@ -228,53 +233,58 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
         RenderSystem.translatef(0.0f, 0.0f, 100.0f);
         this.minecraft.getTextureManager().bind(RecipeBookComponent.RECIPE_BOOK_LOCATION);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        final int integer3 = (this.width - 147) / 2 - this.xOffset;
-        final int integer4 = (this.height - 166) / 2;
-        this.blit(integer3, integer4, 1, 1, 147, 166);
-        this.searchBox.render(integer1, integer2, float3);
-        for (final RecipeBookTabButton dir8 : this.tabButtons) {
-            dir8.render(integer1, integer2, float3);
+        final int integer4 = (this.width - 147) / 2 - this.xOffset;
+        final int integer5 = (this.height - 166) / 2;
+        this.blit(dhl, integer4, integer5, 1, 1, 147, 166);
+        if (!this.searchBox.isFocused() && this.searchBox.getValue().isEmpty()) {
+            this.drawString(dhl, this.minecraft.font, RecipeBookComponent.SEARCH_HINT, integer4 + 25, integer5 + 14, -1);
         }
-        this.filterButton.render(integer1, integer2, float3);
-        this.recipeBookPage.render(integer3, integer4, integer1, integer2, float3);
+        else {
+            this.searchBox.render(dhl, integer2, integer3, float4);
+        }
+        for (final RecipeBookTabButton dtp9 : this.tabButtons) {
+            dtp9.render(dhl, integer2, integer3, float4);
+        }
+        this.filterButton.render(dhl, integer2, integer3, float4);
+        this.recipeBookPage.render(dhl, integer4, integer5, integer2, integer3, float4);
         RenderSystem.popMatrix();
     }
     
-    public void renderTooltip(final int integer1, final int integer2, final int integer3, final int integer4) {
+    public void renderTooltip(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
         if (!this.isVisible()) {
             return;
         }
-        this.recipeBookPage.renderTooltip(integer3, integer4);
+        this.recipeBookPage.renderTooltip(dhl, integer4, integer5);
         if (this.filterButton.isHovered()) {
-            final String string6 = this.getFilterButtonTooltip();
+            final Component mr7 = this.getFilterButtonTooltip();
             if (this.minecraft.screen != null) {
-                this.minecraft.screen.renderTooltip(string6, integer3, integer4);
+                this.minecraft.screen.renderTooltip(dhl, mr7, integer4, integer5);
             }
         }
-        this.renderGhostRecipeTooltip(integer1, integer2, integer3, integer4);
+        this.renderGhostRecipeTooltip(dhl, integer2, integer3, integer4, integer5);
     }
     
-    protected String getFilterButtonTooltip() {
-        return I18n.get(this.filterButton.isStateTriggered() ? "gui.recipebook.toggleRecipes.craftable" : "gui.recipebook.toggleRecipes.all");
+    protected Component getFilterButtonTooltip() {
+        return new TranslatableComponent(this.filterButton.isStateTriggered() ? "gui.recipebook.toggleRecipes.craftable" : "gui.recipebook.toggleRecipes.all");
     }
     
-    private void renderGhostRecipeTooltip(final int integer1, final int integer2, final int integer3, final int integer4) {
-        ItemStack ben6 = null;
-        for (int integer5 = 0; integer5 < this.ghostRecipe.size(); ++integer5) {
-            final GhostRecipe.GhostIngredient a8 = this.ghostRecipe.get(integer5);
-            final int integer6 = a8.getX() + integer1;
-            final int integer7 = a8.getY() + integer2;
-            if (integer3 >= integer6 && integer4 >= integer7 && integer3 < integer6 + 16 && integer4 < integer7 + 16) {
-                ben6 = a8.getItem();
+    private void renderGhostRecipeTooltip(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5) {
+        ItemStack bki7 = null;
+        for (int integer6 = 0; integer6 < this.ghostRecipe.size(); ++integer6) {
+            final GhostRecipe.GhostIngredient a9 = this.ghostRecipe.get(integer6);
+            final int integer7 = a9.getX() + integer2;
+            final int integer8 = a9.getY() + integer3;
+            if (integer4 >= integer7 && integer5 >= integer8 && integer4 < integer7 + 16 && integer5 < integer8 + 16) {
+                bki7 = a9.getItem();
             }
         }
-        if (ben6 != null && this.minecraft.screen != null) {
-            this.minecraft.screen.renderTooltip(this.minecraft.screen.getTooltipFromItem(ben6), integer3, integer4);
+        if (bki7 != null && this.minecraft.screen != null) {
+            this.minecraft.screen.renderTooltip(dhl, this.minecraft.screen.getTooltipFromItem(bki7), integer4, integer5);
         }
     }
     
-    public void renderGhostRecipe(final int integer1, final int integer2, final boolean boolean3, final float float4) {
-        this.ghostRecipe.render(this.minecraft, integer1, integer2, boolean3, float4);
+    public void renderGhostRecipe(final PoseStack dhl, final int integer2, final int integer3, final boolean boolean4, final float float5) {
+        this.ghostRecipe.render(dhl, this.minecraft, integer2, integer3, boolean4, float5);
     }
     
     @Override
@@ -283,14 +293,14 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
             return false;
         }
         if (this.recipeBookPage.mouseClicked(double1, double2, integer, (this.width - 147) / 2 - this.xOffset, (this.height - 166) / 2, 147, 166)) {
-            final Recipe<?> bgw7 = this.recipeBookPage.getLastClickedRecipe();
-            final RecipeCollection dit8 = this.recipeBookPage.getLastClickedRecipeCollection();
-            if (bgw7 != null && dit8 != null) {
-                if (!dit8.isCraftable(bgw7) && this.ghostRecipe.getRecipe() == bgw7) {
+            final Recipe<?> bmu7 = this.recipeBookPage.getLastClickedRecipe();
+            final RecipeCollection dtr8 = this.recipeBookPage.getLastClickedRecipeCollection();
+            if (bmu7 != null && dtr8 != null) {
+                if (!dtr8.isCraftable(bmu7) && this.ghostRecipe.getRecipe() == bmu7) {
                     return false;
                 }
                 this.ghostRecipe.clear();
-                this.minecraft.gameMode.handlePlaceRecipe(this.minecraft.player.containerMenu.containerId, bgw7, Screen.hasShiftDown());
+                this.minecraft.gameMode.handlePlaceRecipe(this.minecraft.player.containerMenu.containerId, bmu7, Screen.hasShiftDown());
                 if (!this.isOffsetNextToMainGUI()) {
                     this.setVisible(false);
                 }
@@ -307,11 +317,11 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
             this.updateCollections(false);
             return true;
         }
-        for (final RecipeBookTabButton dir8 : this.tabButtons) {
-            if (dir8.mouseClicked(double1, double2, integer)) {
-                if (this.selectedTab != dir8) {
+        for (final RecipeBookTabButton dtp8 : this.tabButtons) {
+            if (dtp8.mouseClicked(double1, double2, integer)) {
+                if (this.selectedTab != dtp8) {
                     this.selectedTab.setStateTriggered(false);
-                    (this.selectedTab = dir8).setStateTriggered(true);
+                    (this.selectedTab = dtp8).setStateTriggered(true);
                     this.updateCollections(true);
                 }
                 return true;
@@ -397,15 +407,14 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
     
     private void pirateSpeechForThePeople(final String string) {
         if ("excitedze".equals(string)) {
-            final LanguageManager ebf3 = this.minecraft.getLanguageManager();
-            final Language ebe4 = ebf3.getLanguage("en_pt");
-            if (ebf3.getSelected().compareTo(ebe4) == 0) {
+            final LanguageManager ems3 = this.minecraft.getLanguageManager();
+            final LanguageInfo emr4 = ems3.getLanguage("en_pt");
+            if (ems3.getSelected().compareTo(emr4) == 0) {
                 return;
             }
-            ebf3.setSelected(ebe4);
-            this.minecraft.options.languageCode = ebe4.getCode();
+            ems3.setSelected(emr4);
+            this.minecraft.options.languageCode = emr4.getCode();
             this.minecraft.reloadResourcePacks();
-            this.minecraft.font.setBidirectional(ebf3.isBidirectional());
             this.minecraft.options.save();
         }
     }
@@ -423,24 +432,24 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
     
     @Override
     public void recipesShown(final List<Recipe<?>> list) {
-        for (final Recipe<?> bgw4 : list) {
-            this.minecraft.player.removeRecipeHighlight(bgw4);
+        for (final Recipe<?> bmu4 : list) {
+            this.minecraft.player.removeRecipeHighlight(bmu4);
         }
     }
     
-    public void setupGhostRecipe(final Recipe<?> bgw, final List<Slot> list) {
-        final ItemStack ben4 = bgw.getResultItem();
-        this.ghostRecipe.setRecipe(bgw);
-        this.ghostRecipe.addIngredient(Ingredient.of(ben4), list.get(0).x, list.get(0).y);
-        this.placeRecipe(this.menu.getGridWidth(), this.menu.getGridHeight(), this.menu.getResultSlotIndex(), bgw, bgw.getIngredients().iterator(), 0);
+    public void setupGhostRecipe(final Recipe<?> bmu, final List<Slot> list) {
+        final ItemStack bki4 = bmu.getResultItem();
+        this.ghostRecipe.setRecipe(bmu);
+        this.ghostRecipe.addIngredient(Ingredient.of(bki4), list.get(0).x, list.get(0).y);
+        this.placeRecipe(this.menu.getGridWidth(), this.menu.getGridHeight(), this.menu.getResultSlotIndex(), bmu, bmu.getIngredients().iterator(), 0);
     }
     
     @Override
     public void addItemToSlot(final Iterator<Ingredient> iterator, final int integer2, final int integer3, final int integer4, final int integer5) {
-        final Ingredient bgt7 = iterator.next();
-        if (!bgt7.isEmpty()) {
-            final Slot bca8 = this.menu.slots.get(integer2);
-            this.ghostRecipe.addIngredient(bgt7, bca8.x, bca8.y);
+        final Ingredient bmr7 = iterator.next();
+        if (!bmr7.isEmpty()) {
+            final Slot bhw8 = this.menu.slots.get(integer2);
+            this.ghostRecipe.addIngredient(bmr7, bhw8.x, bhw8.y);
         }
     }
     
@@ -452,5 +461,6 @@ public class RecipeBookComponent extends GuiComponent implements Widget, GuiEven
     
     static {
         RECIPE_BOOK_LOCATION = new ResourceLocation("textures/gui/recipe_book.png");
+        SEARCH_HINT = new TranslatableComponent("gui.recipebook.search_hint").withStyle(ChatFormatting.ITALIC).withStyle(ChatFormatting.GRAY);
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/recipebook/RecipeBookPage.java b/src/net/minecraft/client/gui/screens/recipebook/RecipeBookPage.java
index 005c77a..5be3cef 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/RecipeBookPage.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/RecipeBookPage.java
@@ -1,7 +1,9 @@
 package net.minecraft.client.gui.screens.recipebook;
 
 import javax.annotation.Nullable;
+import net.minecraft.network.chat.FormattedText;
 import java.util.Iterator;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.collect.Lists;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.stats.RecipeBook;
@@ -33,9 +35,9 @@ public class RecipeBookPage {
         }
     }
     
-    public void init(final Minecraft dbn, final int integer2, final int integer3) {
-        this.minecraft = dbn;
-        this.recipeBook = dbn.player.getRecipeBook();
+    public void init(final Minecraft dlx, final int integer2, final int integer3) {
+        this.minecraft = dlx;
+        this.recipeBook = dlx.player.getRecipeBook();
         for (int integer4 = 0; integer4 < this.buttons.size(); ++integer4) {
             this.buttons.get(integer4).setPosition(integer2 + 11 + 25 * (integer4 % 5), integer3 + 31 + 25 * (integer4 / 5));
         }
@@ -43,9 +45,9 @@ public class RecipeBookPage {
         (this.backButton = new StateSwitchingButton(integer2 + 38, integer3 + 137, 12, 17, true)).initTextureValues(1, 208, 13, 18, RecipeBookComponent.RECIPE_BOOK_LOCATION);
     }
     
-    public void addListener(final RecipeBookComponent dip) {
-        this.showListeners.remove(dip);
-        this.showListeners.add(dip);
+    public void addListener(final RecipeBookComponent dtn) {
+        this.showListeners.remove(dtn);
+        this.showListeners.add(dtn);
     }
     
     public void updateCollections(final List<RecipeCollection> list, final boolean boolean2) {
@@ -60,14 +62,14 @@ public class RecipeBookPage {
     private void updateButtonsForPage() {
         final int integer2 = 20 * this.currentPage;
         for (int integer3 = 0; integer3 < this.buttons.size(); ++integer3) {
-            final RecipeButton dis4 = this.buttons.get(integer3);
+            final RecipeButton dtq4 = this.buttons.get(integer3);
             if (integer2 + integer3 < this.recipeCollections.size()) {
-                final RecipeCollection dit5 = this.recipeCollections.get(integer2 + integer3);
-                dis4.init(dit5, this);
-                dis4.visible = true;
+                final RecipeCollection dtr5 = this.recipeCollections.get(integer2 + integer3);
+                dtq4.init(dtr5, this);
+                dtq4.visible = true;
             }
             else {
-                dis4.visible = false;
+                dtq4.visible = false;
             }
         }
         this.updateArrowButtons();
@@ -78,27 +80,27 @@ public class RecipeBookPage {
         this.backButton.visible = (this.totalPages > 1 && this.currentPage > 0);
     }
     
-    public void render(final int integer1, final int integer2, final int integer3, final int integer4, final float float5) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final float float6) {
         if (this.totalPages > 1) {
-            final String string7 = this.currentPage + 1 + "/" + this.totalPages;
-            final int integer5 = this.minecraft.font.width(string7);
-            this.minecraft.font.draw(string7, (float)(integer1 - integer5 / 2 + 73), (float)(integer2 + 141), -1);
+            final String string8 = this.currentPage + 1 + "/" + this.totalPages;
+            final int integer6 = this.minecraft.font.width(string8);
+            this.minecraft.font.draw(dhl, string8, (float)(integer2 - integer6 / 2 + 73), (float)(integer3 + 141), -1);
         }
         this.hoveredButton = null;
-        for (final RecipeButton dis8 : this.buttons) {
-            dis8.render(integer3, integer4, float5);
-            if (dis8.visible && dis8.isHovered()) {
-                this.hoveredButton = dis8;
+        for (final RecipeButton dtq9 : this.buttons) {
+            dtq9.render(dhl, integer4, integer5, float6);
+            if (dtq9.visible && dtq9.isHovered()) {
+                this.hoveredButton = dtq9;
             }
         }
-        this.backButton.render(integer3, integer4, float5);
-        this.forwardButton.render(integer3, integer4, float5);
-        this.overlay.render(integer3, integer4, float5);
+        this.backButton.render(dhl, integer4, integer5, float6);
+        this.forwardButton.render(dhl, integer4, integer5, float6);
+        this.overlay.render(dhl, integer4, integer5, float6);
     }
     
-    public void renderTooltip(final int integer1, final int integer2) {
+    public void renderTooltip(final PoseStack dhl, final int integer2, final int integer3) {
         if (this.minecraft.screen != null && this.hoveredButton != null && !this.overlay.isVisible()) {
-            this.minecraft.screen.renderTooltip(this.hoveredButton.getTooltipText(this.minecraft.screen), integer1, integer2);
+            this.minecraft.screen.renderTooltip(dhl, this.hoveredButton.getTooltipText(this.minecraft.screen), integer2, integer3);
         }
     }
     
@@ -139,14 +141,14 @@ public class RecipeBookPage {
             this.updateButtonsForPage();
             return true;
         }
-        for (final RecipeButton dis12 : this.buttons) {
-            if (dis12.mouseClicked(double1, double2, integer3)) {
+        for (final RecipeButton dtq12 : this.buttons) {
+            if (dtq12.mouseClicked(double1, double2, integer3)) {
                 if (integer3 == 0) {
-                    this.lastClickedRecipe = dis12.getRecipe();
-                    this.lastClickedRecipeCollection = dis12.getCollection();
+                    this.lastClickedRecipe = dtq12.getRecipe();
+                    this.lastClickedRecipeCollection = dtq12.getCollection();
                 }
-                else if (integer3 == 1 && !this.overlay.isVisible() && !dis12.isOnlyOption()) {
-                    this.overlay.init(this.minecraft, dis12.getCollection(), dis12.x, dis12.y, integer4 + integer6 / 2, integer5 + 13 + integer7 / 2, (float)dis12.getWidth());
+                else if (integer3 == 1 && !this.overlay.isVisible() && !dtq12.isOnlyOption()) {
+                    this.overlay.init(this.minecraft, dtq12.getCollection(), dtq12.x, dtq12.y, integer4 + integer6 / 2, integer5 + 13 + integer7 / 2, (float)dtq12.getWidth());
                 }
                 return true;
             }
@@ -155,8 +157,8 @@ public class RecipeBookPage {
     }
     
     public void recipesShown(final List<Recipe<?>> list) {
-        for (final RecipeShownListener diu4 : this.showListeners) {
-            diu4.recipesShown(list);
+        for (final RecipeShownListener dts4 : this.showListeners) {
+            dts4.recipesShown(list);
         }
     }
     
diff --git a/src/net/minecraft/client/gui/screens/recipebook/RecipeBookTabButton.java b/src/net/minecraft/client/gui/screens/recipebook/RecipeBookTabButton.java
index 3c32e9d..5925460 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/RecipeBookTabButton.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/RecipeBookTabButton.java
@@ -3,6 +3,7 @@ package net.minecraft.client.gui.screens.recipebook;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.client.ClientRecipeBook;
@@ -16,21 +17,21 @@ public class RecipeBookTabButton extends StateSwitchingButton {
     private final RecipeBookCategories category;
     private float animationTime;
     
-    public RecipeBookTabButton(final RecipeBookCategories dbu) {
+    public RecipeBookTabButton(final RecipeBookCategories dme) {
         super(0, 0, 35, 27, false);
-        this.category = dbu;
+        this.category = dme;
         this.initTextureValues(153, 2, 35, 0, RecipeBookComponent.RECIPE_BOOK_LOCATION);
     }
     
-    public void startAnimation(final Minecraft dbn) {
-        final ClientRecipeBook dbc3 = dbn.player.getRecipeBook();
-        final List<RecipeCollection> list4 = dbc3.getCollection(this.category);
-        if (!(dbn.player.containerMenu instanceof RecipeBookMenu)) {
+    public void startAnimation(final Minecraft dlx) {
+        final ClientRecipeBook dlk3 = dlx.player.getRecipeBook();
+        final List<RecipeCollection> list4 = dlk3.getCollection(this.category);
+        if (!(dlx.player.containerMenu instanceof RecipeBookMenu)) {
             return;
         }
-        for (final RecipeCollection dit6 : list4) {
-            for (final Recipe<?> bgw8 : dit6.getRecipes(dbc3.isFilteringCraftable(dbn.player.containerMenu))) {
-                if (dbc3.willHighlight(bgw8)) {
+        for (final RecipeCollection dtr6 : list4) {
+            for (final Recipe<?> bmu8 : dtr6.getRecipes(dlk3.isFilteringCraftable(dlx.player.containerMenu))) {
+                if (dlk3.willHighlight(bmu8)) {
                     this.animationTime = 15.0f;
                 }
             }
@@ -38,48 +39,48 @@ public class RecipeBookTabButton extends StateSwitchingButton {
     }
     
     @Override
-    public void renderButton(final int integer1, final int integer2, final float float3) {
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (this.animationTime > 0.0f) {
-            final float float4 = 1.0f + 0.1f * (float)Math.sin(this.animationTime / 15.0f * 3.1415927f);
+            final float float5 = 1.0f + 0.1f * (float)Math.sin(this.animationTime / 15.0f * 3.1415927f);
             RenderSystem.pushMatrix();
             RenderSystem.translatef((float)(this.x + 8), (float)(this.y + 12), 0.0f);
-            RenderSystem.scalef(1.0f, float4, 1.0f);
+            RenderSystem.scalef(1.0f, float5, 1.0f);
             RenderSystem.translatef((float)(-(this.x + 8)), (float)(-(this.y + 12)), 0.0f);
         }
-        final Minecraft dbn5 = Minecraft.getInstance();
-        dbn5.getTextureManager().bind(this.resourceLocation);
+        final Minecraft dlx6 = Minecraft.getInstance();
+        dlx6.getTextureManager().bind(this.resourceLocation);
         RenderSystem.disableDepthTest();
-        int integer3 = this.xTexStart;
-        int integer4 = this.yTexStart;
+        int integer4 = this.xTexStart;
+        int integer5 = this.yTexStart;
         if (this.isStateTriggered) {
-            integer3 += this.xDiffTex;
+            integer4 += this.xDiffTex;
         }
         if (this.isHovered()) {
-            integer4 += this.yDiffTex;
+            integer5 += this.yDiffTex;
         }
-        int integer5 = this.x;
+        int integer6 = this.x;
         if (this.isStateTriggered) {
-            integer5 -= 2;
+            integer6 -= 2;
         }
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-        this.blit(integer5, this.y, integer3, integer4, this.width, this.height);
+        this.blit(dhl, integer6, this.y, integer4, integer5, this.width, this.height);
         RenderSystem.enableDepthTest();
-        this.renderIcon(dbn5.getItemRenderer());
+        this.renderIcon(dlx6.getItemRenderer());
         if (this.animationTime > 0.0f) {
             RenderSystem.popMatrix();
-            this.animationTime -= float3;
+            this.animationTime -= float4;
         }
     }
     
-    private void renderIcon(final ItemRenderer dvz) {
+    private void renderIcon(final ItemRenderer ehh) {
         final List<ItemStack> list3 = this.category.getIconItems();
         final int integer4 = this.isStateTriggered ? -2 : 0;
         if (list3.size() == 1) {
-            dvz.renderAndDecorateItem(list3.get(0), this.x + 9 + integer4, this.y + 5);
+            ehh.renderAndDecorateFakeItem(list3.get(0), this.x + 9 + integer4, this.y + 5);
         }
         else if (list3.size() == 2) {
-            dvz.renderAndDecorateItem(list3.get(0), this.x + 3 + integer4, this.y + 5);
-            dvz.renderAndDecorateItem(list3.get(1), this.x + 14 + integer4, this.y + 5);
+            ehh.renderAndDecorateFakeItem(list3.get(0), this.x + 3 + integer4, this.y + 5);
+            ehh.renderAndDecorateFakeItem(list3.get(1), this.x + 14 + integer4, this.y + 5);
         }
     }
     
@@ -87,12 +88,12 @@ public class RecipeBookTabButton extends StateSwitchingButton {
         return this.category;
     }
     
-    public boolean updateVisibility(final ClientRecipeBook dbc) {
-        final List<RecipeCollection> list3 = dbc.getCollection(this.category);
+    public boolean updateVisibility(final ClientRecipeBook dlk) {
+        final List<RecipeCollection> list3 = dlk.getCollection(this.category);
         this.visible = false;
         if (list3 != null) {
-            for (final RecipeCollection dit5 : list3) {
-                if (dit5.hasKnownRecipes() && dit5.hasFitting()) {
+            for (final RecipeCollection dtr5 : list3) {
+                if (dtr5.hasKnownRecipes() && dtr5.hasFitting()) {
                     this.visible = true;
                     break;
                 }
diff --git a/src/net/minecraft/client/gui/screens/recipebook/RecipeButton.java b/src/net/minecraft/client/gui/screens/recipebook/RecipeButton.java
index 6560605..6261714 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/RecipeButton.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/RecipeButton.java
@@ -1,15 +1,19 @@
 package net.minecraft.client.gui.screens.recipebook;
 
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
+import com.google.common.collect.Lists;
+import net.minecraft.network.chat.FormattedText;
 import java.util.Collection;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.util.Mth;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.world.item.crafting.Recipe;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.stats.RecipeBook;
 import net.minecraft.world.inventory.RecipeBookMenu;
 import net.minecraft.resources.ResourceLocation;
@@ -25,17 +29,17 @@ public class RecipeButton extends AbstractWidget {
     private int currentIndex;
     
     public RecipeButton() {
-        super(0, 0, 25, 25, "");
+        super(0, 0, 25, 25, TextComponent.EMPTY);
     }
     
-    public void init(final RecipeCollection dit, final RecipeBookPage diq) {
-        this.collection = dit;
-        this.menu = diq.getMinecraft().player.containerMenu;
-        this.book = diq.getRecipeBook();
-        final List<Recipe<?>> list4 = dit.getRecipes(this.book.isFilteringCraftable(this.menu));
-        for (final Recipe<?> bgw6 : list4) {
-            if (this.book.willHighlight(bgw6)) {
-                diq.recipesShown(list4);
+    public void init(final RecipeCollection dtr, final RecipeBookPage dto) {
+        this.collection = dtr;
+        this.menu = dto.getMinecraft().player.containerMenu;
+        this.book = dto.getRecipeBook();
+        final List<Recipe<?>> list4 = dtr.getRecipes(this.book.isFilteringCraftable(this.menu));
+        for (final Recipe<?> bmu6 : list4) {
+            if (this.book.willHighlight(bmu6)) {
+                dto.recipesShown(list4);
                 this.animationTime = 15.0f;
                 break;
             }
@@ -52,40 +56,40 @@ public class RecipeButton extends AbstractWidget {
     }
     
     @Override
-    public void renderButton(final int integer1, final int integer2, final float float3) {
+    public void renderButton(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         if (!Screen.hasControlDown()) {
-            this.time += float3;
+            this.time += float4;
         }
-        final Minecraft dbn5 = Minecraft.getInstance();
-        dbn5.getTextureManager().bind(RecipeButton.RECIPE_BOOK_LOCATION);
-        int integer3 = 29;
+        final Minecraft dlx6 = Minecraft.getInstance();
+        dlx6.getTextureManager().bind(RecipeButton.RECIPE_BOOK_LOCATION);
+        int integer4 = 29;
         if (!this.collection.hasCraftable()) {
-            integer3 += 25;
-        }
-        int integer4 = 206;
-        if (this.collection.getRecipes(this.book.isFilteringCraftable(this.menu)).size() > 1) {
             integer4 += 25;
         }
-        final boolean boolean8 = this.animationTime > 0.0f;
-        if (boolean8) {
-            final float float4 = 1.0f + 0.1f * (float)Math.sin(this.animationTime / 15.0f * 3.1415927f);
+        int integer5 = 206;
+        if (this.collection.getRecipes(this.book.isFilteringCraftable(this.menu)).size() > 1) {
+            integer5 += 25;
+        }
+        final boolean boolean9 = this.animationTime > 0.0f;
+        if (boolean9) {
+            final float float5 = 1.0f + 0.1f * (float)Math.sin(this.animationTime / 15.0f * 3.1415927f);
             RenderSystem.pushMatrix();
             RenderSystem.translatef((float)(this.x + 8), (float)(this.y + 12), 0.0f);
-            RenderSystem.scalef(float4, float4, 1.0f);
+            RenderSystem.scalef(float5, float5, 1.0f);
             RenderSystem.translatef((float)(-(this.x + 8)), (float)(-(this.y + 12)), 0.0f);
-            this.animationTime -= float3;
+            this.animationTime -= float4;
         }
-        this.blit(this.x, this.y, integer3, integer4, this.width, this.height);
-        final List<Recipe<?>> list9 = this.getOrderedRecipes();
-        this.currentIndex = Mth.floor(this.time / 30.0f) % list9.size();
-        final ItemStack ben10 = list9.get(this.currentIndex).getResultItem();
-        int integer5 = 4;
+        this.blit(dhl, this.x, this.y, integer4, integer5, this.width, this.height);
+        final List<Recipe<?>> list10 = this.getOrderedRecipes();
+        this.currentIndex = Mth.floor(this.time / 30.0f) % list10.size();
+        final ItemStack bki11 = list10.get(this.currentIndex).getResultItem();
+        int integer6 = 4;
         if (this.collection.hasSingleResultItem() && this.getOrderedRecipes().size() > 1) {
-            dbn5.getItemRenderer().renderAndDecorateItem(ben10, this.x + integer5 + 1, this.y + integer5 + 1);
-            --integer5;
+            dlx6.getItemRenderer().renderAndDecorateItem(bki11, this.x + integer6 + 1, this.y + integer6 + 1);
+            --integer6;
         }
-        dbn5.getItemRenderer().renderAndDecorateItem(ben10, this.x + integer5, this.y + integer5);
-        if (boolean8) {
+        dlx6.getItemRenderer().renderAndDecorateFakeItem(bki11, this.x + integer6, this.y + integer6);
+        if (boolean9) {
             RenderSystem.popMatrix();
         }
     }
@@ -107,11 +111,11 @@ public class RecipeButton extends AbstractWidget {
         return list2.get(this.currentIndex);
     }
     
-    public List<String> getTooltipText(final Screen dgb) {
-        final ItemStack ben3 = this.getOrderedRecipes().get(this.currentIndex).getResultItem();
-        final List<String> list4 = dgb.getTooltipFromItem(ben3);
+    public List<FormattedText> getTooltipText(final Screen dqs) {
+        final ItemStack bki3 = this.getOrderedRecipes().get(this.currentIndex).getResultItem();
+        final List<FormattedText> list4 = Lists.newArrayList(dqs.getTooltipFromItem(bki3));
         if (this.collection.getRecipes(this.book.isFilteringCraftable(this.menu)).size() > 1) {
-            list4.add(I18n.get("gui.recipebook.moreRecipes"));
+            list4.add(new TranslatableComponent("gui.recipebook.moreRecipes"));
         }
         return list4;
     }
diff --git a/src/net/minecraft/client/gui/screens/recipebook/RecipeCollection.java b/src/net/minecraft/client/gui/screens/recipebook/RecipeCollection.java
index 610acc2..befe13d 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/RecipeCollection.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/RecipeCollection.java
@@ -30,35 +30,35 @@ public class RecipeCollection {
         return !this.known.isEmpty();
     }
     
-    public void updateKnownRecipes(final RecipeBook aal) {
-        for (final Recipe<?> bgw4 : this.recipes) {
-            if (aal.contains(bgw4)) {
-                this.known.add(bgw4);
+    public void updateKnownRecipes(final RecipeBook aco) {
+        for (final Recipe<?> bmu4 : this.recipes) {
+            if (aco.contains(bmu4)) {
+                this.known.add(bmu4);
             }
         }
     }
     
-    public void canCraft(final StackedContents ayl, final int integer2, final int integer3, final RecipeBook aal) {
+    public void canCraft(final StackedContents bee, final int integer2, final int integer3, final RecipeBook aco) {
         for (int integer4 = 0; integer4 < this.recipes.size(); ++integer4) {
-            final Recipe<?> bgw7 = this.recipes.get(integer4);
-            final boolean boolean8 = bgw7.canCraftInDimensions(integer2, integer3) && aal.contains(bgw7);
+            final Recipe<?> bmu7 = this.recipes.get(integer4);
+            final boolean boolean8 = bmu7.canCraftInDimensions(integer2, integer3) && aco.contains(bmu7);
             if (boolean8) {
-                this.fitsDimensions.add(bgw7);
+                this.fitsDimensions.add(bmu7);
             }
             else {
-                this.fitsDimensions.remove(bgw7);
+                this.fitsDimensions.remove(bmu7);
             }
-            if (boolean8 && ayl.canCraft(bgw7, null)) {
-                this.craftable.add(bgw7);
+            if (boolean8 && bee.canCraft(bmu7, null)) {
+                this.craftable.add(bmu7);
             }
             else {
-                this.craftable.remove(bgw7);
+                this.craftable.remove(bmu7);
             }
         }
     }
     
-    public boolean isCraftable(final Recipe<?> bgw) {
-        return this.craftable.contains(bgw);
+    public boolean isCraftable(final Recipe<?> bmu) {
+        return this.craftable.contains(bmu);
     }
     
     public boolean hasCraftable() {
@@ -76,9 +76,9 @@ public class RecipeCollection {
     public List<Recipe<?>> getRecipes(final boolean boolean1) {
         final List<Recipe<?>> list3 = Lists.newArrayList();
         final Set<Recipe<?>> set4 = boolean1 ? this.craftable : this.fitsDimensions;
-        for (final Recipe<?> bgw6 : this.recipes) {
-            if (set4.contains(bgw6)) {
-                list3.add(bgw6);
+        for (final Recipe<?> bmu6 : this.recipes) {
+            if (set4.contains(bmu6)) {
+                list3.add(bmu6);
             }
         }
         return list3;
@@ -86,20 +86,20 @@ public class RecipeCollection {
     
     public List<Recipe<?>> getDisplayRecipes(final boolean boolean1) {
         final List<Recipe<?>> list3 = Lists.newArrayList();
-        for (final Recipe<?> bgw5 : this.recipes) {
-            if (this.fitsDimensions.contains(bgw5) && this.craftable.contains(bgw5) == boolean1) {
-                list3.add(bgw5);
+        for (final Recipe<?> bmu5 : this.recipes) {
+            if (this.fitsDimensions.contains(bmu5) && this.craftable.contains(bmu5) == boolean1) {
+                list3.add(bmu5);
             }
         }
         return list3;
     }
     
-    public void add(final Recipe<?> bgw) {
-        this.recipes.add(bgw);
+    public void add(final Recipe<?> bmu) {
+        this.recipes.add(bmu);
         if (this.singleResultItem) {
-            final ItemStack ben3 = this.recipes.get(0).getResultItem();
-            final ItemStack ben4 = bgw.getResultItem();
-            this.singleResultItem = (ItemStack.isSame(ben3, ben4) && ItemStack.tagMatches(ben3, ben4));
+            final ItemStack bki3 = this.recipes.get(0).getResultItem();
+            final ItemStack bki4 = bmu.getResultItem();
+            this.singleResultItem = (ItemStack.isSame(bki3, bki4) && ItemStack.tagMatches(bki3, bki4));
         }
     }
     
diff --git a/src/net/minecraft/client/gui/screens/recipebook/SmeltingRecipeBookComponent.java b/src/net/minecraft/client/gui/screens/recipebook/SmeltingRecipeBookComponent.java
index 56dfd4c..cde0bb3 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/SmeltingRecipeBookComponent.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/SmeltingRecipeBookComponent.java
@@ -3,6 +3,8 @@ package net.minecraft.client.gui.screens.recipebook;
 import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.item.Item;
 import java.util.Set;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 
 public class SmeltingRecipeBookComponent extends AbstractFurnaceRecipeBookComponent {
     @Override
@@ -26,8 +28,8 @@ public class SmeltingRecipeBookComponent extends AbstractFurnaceRecipeBookCompon
     }
     
     @Override
-    protected String getRecipeFilterName() {
-        return "gui.recipebook.toggleRecipes.smeltable";
+    protected Component getRecipeFilterName() {
+        return new TranslatableComponent("gui.recipebook.toggleRecipes.smeltable");
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/recipebook/SmokingRecipeBookComponent.java b/src/net/minecraft/client/gui/screens/recipebook/SmokingRecipeBookComponent.java
index 08c486a..4d05371 100644
--- a/src/net/minecraft/client/gui/screens/recipebook/SmokingRecipeBookComponent.java
+++ b/src/net/minecraft/client/gui/screens/recipebook/SmokingRecipeBookComponent.java
@@ -3,6 +3,8 @@ package net.minecraft.client.gui.screens.recipebook;
 import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.item.Item;
 import java.util.Set;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 
 public class SmokingRecipeBookComponent extends AbstractFurnaceRecipeBookComponent {
     @Override
@@ -26,8 +28,8 @@ public class SmokingRecipeBookComponent extends AbstractFurnaceRecipeBookCompone
     }
     
     @Override
-    protected String getRecipeFilterName() {
-        return "gui.recipebook.toggleRecipes.smokable";
+    protected Component getRecipeFilterName() {
+        return new TranslatableComponent("gui.recipebook.toggleRecipes.smokable");
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/screens/resourcepacks/ResourcePackSelectScreen.java b/src/net/minecraft/client/gui/screens/resourcepacks/ResourcePackSelectScreen.java
deleted file mode 100644
index 7f44948..0000000
--- a/src/net/minecraft/client/gui/screens/resourcepacks/ResourcePackSelectScreen.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package net.minecraft.client.gui.screens.resourcepacks;
-
-import net.minecraft.server.packs.repository.PackRepository;
-import java.util.Iterator;
-import net.minecraft.client.resources.UnopenedResourcePack;
-import java.util.Collection;
-import java.util.List;
-import java.util.Collections;
-import net.minecraft.client.gui.screens.resourcepacks.lists.ResourcePackList;
-import com.google.common.collect.Lists;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.Util;
-import net.minecraft.client.resources.language.I18n;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.client.Options;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.resourcepacks.lists.SelectedResourcePackList;
-import net.minecraft.client.gui.screens.resourcepacks.lists.AvailableResourcePackList;
-import net.minecraft.client.gui.screens.OptionsSubScreen;
-
-public class ResourcePackSelectScreen extends OptionsSubScreen {
-    private AvailableResourcePackList availableResourcePackList;
-    private SelectedResourcePackList selectedResourcePackList;
-    private boolean changed;
-    
-    public ResourcePackSelectScreen(final Screen dgb, final Options dbr) {
-        super(dgb, dbr, new TranslatableComponent("resourcePack.title", new Object[0]));
-    }
-    
-    @Override
-    protected void init() {
-        this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 48, 150, 20, I18n.get("resourcePack.openFolder"), dcv -> Util.getPlatform().openFile(this.minecraft.getResourcePackDirectory())));
-        List<UnopenedResourcePack> list3;
-        final Iterator<ResourcePackList.ResourcePackEntry> iterator;
-        ResourcePackList.ResourcePackEntry a2;
-        final Iterator<UnopenedResourcePack> iterator2;
-        UnopenedResourcePack ebc5;
-        this.<Button>addButton(new Button(this.width / 2 + 4, this.height - 48, 150, 20, I18n.get("gui.done"), dcv -> {
-            if (this.changed) {
-                list3 = Lists.newArrayList();
-                this.selectedResourcePackList.children().iterator();
-                while (iterator.hasNext()) {
-                    a2 = iterator.next();
-                    list3.add(a2.getResourcePack());
-                }
-                Collections.reverse(list3);
-                this.minecraft.getResourcePackRepository().setSelected(list3);
-                this.options.resourcePacks.clear();
-                this.options.incompatibleResourcePacks.clear();
-                list3.iterator();
-                while (iterator2.hasNext()) {
-                    ebc5 = iterator2.next();
-                    if (!ebc5.isFixedPosition()) {
-                        this.options.resourcePacks.add(ebc5.getId());
-                        if (!ebc5.getCompatibility().isCompatible()) {
-                            this.options.incompatibleResourcePacks.add(ebc5.getId());
-                        }
-                        else {
-                            continue;
-                        }
-                    }
-                }
-                this.options.save();
-                this.minecraft.setScreen(this.lastScreen);
-                this.minecraft.reloadResourcePacks();
-            }
-            else {
-                this.minecraft.setScreen(this.lastScreen);
-            }
-            return;
-        }));
-        final AvailableResourcePackList djb2 = this.availableResourcePackList;
-        final SelectedResourcePackList djd3 = this.selectedResourcePackList;
-        (this.availableResourcePackList = new AvailableResourcePackList(this.minecraft, 200, this.height)).setLeftPos(this.width / 2 - 4 - 200);
-        if (djb2 != null) {
-            this.availableResourcePackList.children().addAll(djb2.children());
-        }
-        this.children.add(this.availableResourcePackList);
-        (this.selectedResourcePackList = new SelectedResourcePackList(this.minecraft, 200, this.height)).setLeftPos(this.width / 2 + 4);
-        if (djd3 != null) {
-            djd3.children().forEach(a -> {
-                this.selectedResourcePackList.children().add(a);
-                a.updateParentList(this.selectedResourcePackList);
-                return;
-            });
-        }
-        this.children.add(this.selectedResourcePackList);
-        if (!this.changed) {
-            this.availableResourcePackList.children().clear();
-            this.selectedResourcePackList.children().clear();
-            final PackRepository<UnopenedResourcePack> yq4 = this.minecraft.getResourcePackRepository();
-            yq4.reload();
-            final List<UnopenedResourcePack> list4 = Lists.newArrayList(yq4.getAvailable());
-            list4.removeAll(yq4.getSelected());
-            for (final UnopenedResourcePack ebc6 : list4) {
-                this.availableResourcePackList.addResourcePackEntry(new ResourcePackList.ResourcePackEntry(this.availableResourcePackList, this, ebc6));
-            }
-            for (final UnopenedResourcePack ebc6 : Lists.<UnopenedResourcePack>reverse(Lists.newArrayList(yq4.getSelected()))) {
-                this.selectedResourcePackList.addResourcePackEntry(new ResourcePackList.ResourcePackEntry(this.selectedResourcePackList, this, ebc6));
-            }
-        }
-    }
-    
-    public void select(final ResourcePackList.ResourcePackEntry a) {
-        this.availableResourcePackList.children().remove(a);
-        a.addToList(this.selectedResourcePackList);
-        this.setChanged();
-    }
-    
-    public void deselect(final ResourcePackList.ResourcePackEntry a) {
-        this.selectedResourcePackList.children().remove(a);
-        this.availableResourcePackList.addResourcePackEntry(a);
-        this.setChanged();
-    }
-    
-    public boolean isSelected(final ResourcePackList.ResourcePackEntry a) {
-        return this.selectedResourcePackList.children().contains(a);
-    }
-    
-    @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderDirtBackground(0);
-        this.availableResourcePackList.render(integer1, integer2, float3);
-        this.selectedResourcePackList.render(integer1, integer2, float3);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 16, 16777215);
-        this.drawCenteredString(this.font, I18n.get("resourcePack.folderInfo"), this.width / 2 - 77, this.height - 26, 8421504);
-        super.render(integer1, integer2, float3);
-    }
-    
-    public void setChanged() {
-        this.changed = true;
-    }
-}
diff --git a/src/net/minecraft/client/gui/screens/resourcepacks/lists/AvailableResourcePackList.java b/src/net/minecraft/client/gui/screens/resourcepacks/lists/AvailableResourcePackList.java
deleted file mode 100644
index 18a12db..0000000
--- a/src/net/minecraft/client/gui/screens/resourcepacks/lists/AvailableResourcePackList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.minecraft.client.gui.screens.resourcepacks.lists;
-
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.client.Minecraft;
-
-public class AvailableResourcePackList extends ResourcePackList {
-    public AvailableResourcePackList(final Minecraft dbn, final int integer2, final int integer3) {
-        super(dbn, integer2, integer3, new TranslatableComponent("resourcePack.available.title", new Object[0]));
-    }
-}
diff --git a/src/net/minecraft/client/gui/screens/resourcepacks/lists/ResourcePackList.java b/src/net/minecraft/client/gui/screens/resourcepacks/lists/ResourcePackList.java
deleted file mode 100644
index f5255b3..0000000
--- a/src/net/minecraft/client/gui/screens/resourcepacks/lists/ResourcePackList.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package net.minecraft.client.gui.screens.resourcepacks.lists;
-
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.ConfirmScreen;
-import java.util.List;
-import net.minecraft.client.gui.GuiComponent;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.server.packs.repository.PackCompatibility;
-import net.minecraft.client.resources.UnopenedResourcePack;
-import net.minecraft.client.gui.screens.resourcepacks.ResourcePackSelectScreen;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.TextComponent;
-import com.mojang.blaze3d.vertex.Tesselator;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.client.gui.components.ObjectSelectionList;
-
-public abstract class ResourcePackList extends ObjectSelectionList<ResourcePackEntry> {
-    private static final ResourceLocation ICON_OVERLAY_LOCATION;
-    private static final Component INCOMPATIBLE_TITLE;
-    private static final Component INCOMPATIBLE_CONFIRM_TITLE;
-    protected final Minecraft minecraft;
-    private final Component title;
-    
-    public ResourcePackList(final Minecraft dbn, final int integer2, final int integer3, final Component lf) {
-        super(dbn, integer2, integer3, 32, integer3 - 55 + 4, 36);
-        this.minecraft = dbn;
-        this.centerListVertically = false;
-        final boolean boolean1 = true;
-        dbn.font.getClass();
-        this.setRenderHeader(boolean1, (int)(9.0f * 1.5f));
-        this.title = lf;
-    }
-    
-    @Override
-    protected void renderHeader(final int integer1, final int integer2, final Tesselator cym) {
-        final Component lf5 = new TextComponent("").append(this.title).withStyle(ChatFormatting.UNDERLINE, ChatFormatting.BOLD);
-        this.minecraft.font.draw(lf5.getColoredString(), (float)(integer1 + this.width / 2 - this.minecraft.font.width(lf5.getColoredString()) / 2), (float)Math.min(this.y0 + 3, integer2), 16777215);
-    }
-    
-    @Override
-    public int getRowWidth() {
-        return this.width;
-    }
-    
-    @Override
-    protected int getScrollbarPosition() {
-        return this.x1 - 6;
-    }
-    
-    public void addResourcePackEntry(final ResourcePackEntry a) {
-        this.addEntry(a);
-        a.parent = this;
-    }
-    
-    static {
-        ICON_OVERLAY_LOCATION = new ResourceLocation("textures/gui/resource_packs.png");
-        INCOMPATIBLE_TITLE = new TranslatableComponent("resourcePack.incompatible", new Object[0]);
-        INCOMPATIBLE_CONFIRM_TITLE = new TranslatableComponent("resourcePack.incompatible.confirm.title", new Object[0]);
-    }
-    
-    public static class ResourcePackEntry extends Entry<ResourcePackEntry> {
-        private ResourcePackList parent;
-        protected final Minecraft minecraft;
-        protected final ResourcePackSelectScreen screen;
-        private final UnopenedResourcePack resourcePack;
-        
-        public ResourcePackEntry(final ResourcePackList djc, final ResourcePackSelectScreen diz, final UnopenedResourcePack ebc) {
-            this.screen = diz;
-            this.minecraft = Minecraft.getInstance();
-            this.resourcePack = ebc;
-            this.parent = djc;
-        }
-        
-        public void addToList(final SelectedResourcePackList djd) {
-            this.getResourcePack().getDefaultPosition().<ResourcePackEntry, UnopenedResourcePack>insert(djd.children(), this, ResourcePackEntry::getResourcePack, true);
-            this.updateParentList(djd);
-        }
-        
-        public void updateParentList(final SelectedResourcePackList djd) {
-            this.parent = djd;
-        }
-        
-        protected void bindToIcon() {
-            this.resourcePack.bindIcon(this.minecraft.getTextureManager());
-        }
-        
-        protected PackCompatibility getCompatibility() {
-            return this.resourcePack.getCompatibility();
-        }
-        
-        protected String getDescription() {
-            return this.resourcePack.getDescription().getColoredString();
-        }
-        
-        protected String getName() {
-            return this.resourcePack.getTitle().getColoredString();
-        }
-        
-        public UnopenedResourcePack getResourcePack() {
-            return this.resourcePack;
-        }
-        
-        @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            final PackCompatibility yp11 = this.getCompatibility();
-            if (!yp11.isCompatible()) {
-                RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                GuiComponent.fill(integer3 - 1, integer2 - 1, integer3 + integer4 - 9, integer2 + integer5 + 1, -8978432);
-            }
-            this.bindToIcon();
-            RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            GuiComponent.blit(integer3, integer2, 0.0f, 0.0f, 32, 32, 32, 32);
-            String string12 = this.getName();
-            String string13 = this.getDescription();
-            if (this.showHoverOverlay() && (this.minecraft.options.touchscreen || boolean8)) {
-                this.minecraft.getTextureManager().bind(ResourcePackList.ICON_OVERLAY_LOCATION);
-                GuiComponent.fill(integer3, integer2, integer3 + 32, integer2 + 32, -1601138544);
-                RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                final int integer8 = integer6 - integer3;
-                final int integer9 = integer7 - integer2;
-                if (!yp11.isCompatible()) {
-                    string12 = ResourcePackList.INCOMPATIBLE_TITLE.getColoredString();
-                    string13 = yp11.getDescription().getColoredString();
-                }
-                if (this.canMoveRight()) {
-                    if (integer8 < 32) {
-                        GuiComponent.blit(integer3, integer2, 0.0f, 32.0f, 32, 32, 256, 256);
-                    }
-                    else {
-                        GuiComponent.blit(integer3, integer2, 0.0f, 0.0f, 32, 32, 256, 256);
-                    }
-                }
-                else {
-                    if (this.canMoveLeft()) {
-                        if (integer8 < 16) {
-                            GuiComponent.blit(integer3, integer2, 32.0f, 32.0f, 32, 32, 256, 256);
-                        }
-                        else {
-                            GuiComponent.blit(integer3, integer2, 32.0f, 0.0f, 32, 32, 256, 256);
-                        }
-                    }
-                    if (this.canMoveUp()) {
-                        if (integer8 < 32 && integer8 > 16 && integer9 < 16) {
-                            GuiComponent.blit(integer3, integer2, 96.0f, 32.0f, 32, 32, 256, 256);
-                        }
-                        else {
-                            GuiComponent.blit(integer3, integer2, 96.0f, 0.0f, 32, 32, 256, 256);
-                        }
-                    }
-                    if (this.canMoveDown()) {
-                        if (integer8 < 32 && integer8 > 16 && integer9 > 16) {
-                            GuiComponent.blit(integer3, integer2, 64.0f, 32.0f, 32, 32, 256, 256);
-                        }
-                        else {
-                            GuiComponent.blit(integer3, integer2, 64.0f, 0.0f, 32, 32, 256, 256);
-                        }
-                    }
-                }
-            }
-            final int integer8 = this.minecraft.font.width(string12);
-            if (integer8 > 157) {
-                string12 = this.minecraft.font.substrByWidth(string12, 157 - this.minecraft.font.width("...")) + "...";
-            }
-            this.minecraft.font.drawShadow(string12, (float)(integer3 + 32 + 2), (float)(integer2 + 1), 16777215);
-            final List<String> list15 = this.minecraft.font.split(string13, 157);
-            for (int integer10 = 0; integer10 < 2 && integer10 < list15.size(); ++integer10) {
-                this.minecraft.font.drawShadow(list15.get(integer10), (float)(integer3 + 32 + 2), (float)(integer2 + 12 + 10 * integer10), 8421504);
-            }
-        }
-        
-        protected boolean showHoverOverlay() {
-            return !this.resourcePack.isFixedPosition() || !this.resourcePack.isRequired();
-        }
-        
-        protected boolean canMoveRight() {
-            return !this.screen.isSelected(this);
-        }
-        
-        protected boolean canMoveLeft() {
-            return this.screen.isSelected(this) && !this.resourcePack.isRequired();
-        }
-        
-        protected boolean canMoveUp() {
-            final List<ResourcePackEntry> list2 = this.parent.children();
-            final int integer3 = list2.indexOf(this);
-            return integer3 > 0 && !list2.get(integer3 - 1).resourcePack.isFixedPosition();
-        }
-        
-        protected boolean canMoveDown() {
-            final List<ResourcePackEntry> list2 = this.parent.children();
-            final int integer3 = list2.indexOf(this);
-            return integer3 >= 0 && integer3 < list2.size() - 1 && !list2.get(integer3 + 1).resourcePack.isFixedPosition();
-        }
-        
-        @Override
-        public boolean mouseClicked(final double double1, final double double2, final int integer) {
-            final double double3 = double1 - this.parent.getRowLeft();
-            final double double4 = double2 - this.parent.getRowTop(this.parent.children().indexOf(this));
-            if (this.showHoverOverlay() && double3 <= 32.0) {
-                if (this.canMoveRight()) {
-                    this.getScreen().setChanged();
-                    final PackCompatibility yp11 = this.getCompatibility();
-                    if (yp11.isCompatible()) {
-                        this.getScreen().select(this);
-                    }
-                    else {
-                        final Component lf12 = yp11.getConfirmation();
-                        this.minecraft.setScreen(new ConfirmScreen(boolean1 -> {
-                            this.minecraft.setScreen(this.getScreen());
-                            if (boolean1) {
-                                this.getScreen().select(this);
-                            }
-                        }, ResourcePackList.INCOMPATIBLE_CONFIRM_TITLE, lf12));
-                    }
-                    return true;
-                }
-                if (double3 < 16.0 && this.canMoveLeft()) {
-                    this.getScreen().deselect(this);
-                    return true;
-                }
-                if (double3 > 16.0 && double4 < 16.0 && this.canMoveUp()) {
-                    final List<ResourcePackEntry> list11 = this.parent.children();
-                    final int integer2 = list11.indexOf(this);
-                    list11.remove(integer2);
-                    list11.add(integer2 - 1, this);
-                    this.getScreen().setChanged();
-                    return true;
-                }
-                if (double3 > 16.0 && double4 > 16.0 && this.canMoveDown()) {
-                    final List<ResourcePackEntry> list11 = this.parent.children();
-                    final int integer2 = list11.indexOf(this);
-                    list11.remove(integer2);
-                    list11.add(integer2 + 1, this);
-                    this.getScreen().setChanged();
-                    return true;
-                }
-            }
-            return false;
-        }
-        
-        public ResourcePackSelectScreen getScreen() {
-            return this.screen;
-        }
-    }
-}
diff --git a/src/net/minecraft/client/gui/screens/resourcepacks/lists/SelectedResourcePackList.java b/src/net/minecraft/client/gui/screens/resourcepacks/lists/SelectedResourcePackList.java
deleted file mode 100644
index 3c1cd44..0000000
--- a/src/net/minecraft/client/gui/screens/resourcepacks/lists/SelectedResourcePackList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.minecraft.client.gui.screens.resourcepacks.lists;
-
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.client.Minecraft;
-
-public class SelectedResourcePackList extends ResourcePackList {
-    public SelectedResourcePackList(final Minecraft dbn, final int integer2, final int integer3) {
-        super(dbn, integer2, integer3, new TranslatableComponent("resourcePack.selected.title", new Object[0]));
-    }
-}
diff --git a/src/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java b/src/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
index 9fa8962..d722dc6 100644
--- a/src/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
+++ b/src/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
@@ -1,83 +1,143 @@
 package net.minecraft.client.gui.screens.worldselection;
 
+import org.apache.logging.log4j.LogManager;
+import java.util.Optional;
+import org.apache.commons.lang3.mutable.MutableObject;
+import net.minecraft.world.level.storage.LevelStorageSource;
+import net.minecraft.world.level.storage.LevelResource;
+import java.util.stream.Stream;
+import java.util.Comparator;
+import java.nio.file.FileVisitOption;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.client.gui.screens.ConfirmScreen;
+import java.util.concurrent.Executor;
+import net.minecraft.server.ServerResources;
+import net.minecraft.Util;
+import net.minecraft.commands.Commands;
+import java.util.stream.Collector;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import java.io.File;
+import net.minecraft.client.gui.screens.DataPackSelectScreen;
+import java.util.Collection;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.server.packs.repository.FolderRepositorySource;
+import net.minecraft.server.packs.repository.PackSource;
+import net.minecraft.server.packs.repository.ServerPacksSource;
+import net.minecraft.server.packs.repository.RepositorySource;
+import net.minecraft.server.packs.repository.Pack;
+import java.io.IOException;
+import net.minecraft.client.gui.components.toasts.SystemToast;
+import java.nio.file.Files;
+import java.nio.file.attribute.FileAttribute;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.level.GameType;
-import net.minecraft.world.level.storage.LevelData;
-import com.mojang.datafixers.types.DynamicOps;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.JsonOps;
-import net.minecraft.nbt.NbtOps;
-import com.google.gson.JsonElement;
-import net.minecraft.world.level.LevelSettings;
-import org.apache.commons.lang3.StringUtils;
-import java.util.Random;
+import net.minecraft.client.gui.screens.GenericDirtMessageScreen;
 import net.minecraft.FileUtil;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.CreateBuffetWorldScreen;
-import net.minecraft.client.gui.screens.CreateFlatWorldScreen;
-import net.minecraft.world.level.LevelType;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.resources.language.I18n;
-import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import net.minecraft.world.level.LevelSettings;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.network.chat.Component;
 import net.minecraft.client.gui.components.Button;
+import java.nio.file.Path;
+import net.minecraft.world.level.DataPackConfig;
+import net.minecraft.world.Difficulty;
 import javax.annotation.Nullable;
 import net.minecraft.client.gui.components.EditBox;
+import org.apache.logging.log4j.Logger;
 import net.minecraft.client.gui.screens.Screen;
 
 public class CreateWorldScreen extends Screen {
+    private static final Logger LOGGER;
     private final Screen lastScreen;
     private EditBox nameEdit;
-    private EditBox seedEdit;
     private String resultFolder;
     private SelectedGameMode gameMode;
     @Nullable
     private SelectedGameMode oldGameMode;
-    private boolean features;
+    private Difficulty selectedDifficulty;
+    private Difficulty effectiveDifficulty;
     private boolean commands;
     private boolean commandsChanged;
-    private boolean bonusItems;
-    private boolean hardCore;
-    private boolean done;
+    public boolean hardCore;
+    protected DataPackConfig dataPacks;
+    @Nullable
+    private Path tempDataPackDir;
     private boolean displayOptions;
     private Button createButton;
     private Button modeButton;
+    private Button difficultyButton;
     private Button moreOptionsButton;
-    private Button featuresButton;
-    private Button bonusItemsButton;
-    private Button typeButton;
+    private Button gameRulesButton;
+    private Button dataPacksButton;
     private Button commandsButton;
-    private Button customizeTypeButton;
-    private String gameModeHelp1;
-    private String gameModeHelp2;
-    private String initSeed;
+    private Component gameModeHelp1;
+    private Component gameModeHelp2;
     private String initName;
-    private int levelTypeIndex;
-    public CompoundTag levelTypeOptions;
+    private GameRules gameRules;
+    public final WorldGenSettingsComponent worldGenSettingsComponent;
     
-    public CreateWorldScreen(final Screen dgb) {
-        super(new TranslatableComponent("selectWorld.create", new Object[0]));
+    public CreateWorldScreen(@Nullable final Screen dqs, final LevelSettings bqe, final WorldGenSettings cix, @Nullable final Path path, final RegistryAccess.RegistryHolder a) {
+        this(dqs, new WorldGenSettingsComponent(a, cix));
+        this.initName = bqe.levelName();
+        this.commands = bqe.allowCommands();
+        this.commandsChanged = true;
+        this.selectedDifficulty = bqe.difficulty();
+        this.effectiveDifficulty = this.selectedDifficulty;
+        this.gameRules.assignFrom(bqe.gameRules(), null);
+        this.dataPacks = bqe.getDataPackConfig();
+        if (bqe.hardcore()) {
+            this.gameMode = SelectedGameMode.HARDCORE;
+        }
+        else if (bqe.gameType().isSurvival()) {
+            this.gameMode = SelectedGameMode.SURVIVAL;
+        }
+        else if (bqe.gameType().isCreative()) {
+            this.gameMode = SelectedGameMode.CREATIVE;
+        }
+        this.tempDataPackDir = path;
+    }
+    
+    public CreateWorldScreen(@Nullable final Screen dqs) {
+        this(dqs, new WorldGenSettingsComponent());
+    }
+    
+    private CreateWorldScreen(@Nullable final Screen dqs, final WorldGenSettingsComponent dud) {
+        super(new TranslatableComponent("selectWorld.create"));
         this.gameMode = SelectedGameMode.SURVIVAL;
-        this.features = true;
-        this.levelTypeOptions = new CompoundTag();
-        this.lastScreen = dgb;
-        this.initSeed = "";
+        this.selectedDifficulty = Difficulty.NORMAL;
+        this.effectiveDifficulty = Difficulty.NORMAL;
+        this.dataPacks = DataPackConfig.DEFAULT;
+        this.gameRules = new GameRules();
+        this.lastScreen = dqs;
         this.initName = I18n.get("selectWorld.newWorld");
+        this.worldGenSettingsComponent = dud;
     }
     
     @Override
     public void tick() {
         this.nameEdit.tick();
-        this.seedEdit.tick();
+        this.worldGenSettingsComponent.tick();
     }
     
     @Override
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        (this.nameEdit = new EditBox(this.font, this.width / 2 - 100, 60, 200, 20, I18n.get("selectWorld.enterName")) {
+        (this.nameEdit = new EditBox(this.font, this.width / 2 - 100, 60, 200, 20, new TranslatableComponent("selectWorld.enterName")) {
             @Override
-            protected String getNarrationMessage() {
-                return super.getNarrationMessage() + ". " + I18n.get("selectWorld.resultFolder") + " " + CreateWorldScreen.this.resultFolder;
+            protected MutableComponent createNarrationMessage() {
+                return super.createNarrationMessage().append(". ").append(new TranslatableComponent("selectWorld.resultFolder")).append(" ").append(CreateWorldScreen.this.resultFolder);
             }
         }).setValue(this.initName);
         this.nameEdit.setResponder(string -> {
@@ -87,7 +147,9 @@ public class CreateWorldScreen extends Screen {
             return;
         });
         this.children.add(this.nameEdit);
-        this.modeButton = this.addButton(new Button(this.width / 2 - 75, 115, 150, 20, I18n.get("selectWorld.gameMode"), dcv -> {
+        final int integer2 = this.width / 2 - 155;
+        final int integer3 = this.width / 2 + 5;
+        this.modeButton = this.addButton(new Button(integer2, 100, 150, 20, new TranslatableComponent("selectWorld.gameMode"), dni -> {
             switch (this.gameMode) {
                 case SURVIVAL: {
                     this.setGameMode(SelectedGameMode.HARDCORE);
@@ -102,120 +164,69 @@ public class CreateWorldScreen extends Screen {
                     break;
                 }
             }
-            dcv.queueNarration(250);
+            dni.queueNarration(250);
             return;
         }) {
             @Override
-            public String getMessage() {
-                return I18n.get("selectWorld.gameMode") + ": " + I18n.get("selectWorld.gameMode." + CreateWorldScreen.this.gameMode.name);
+            public Component getMessage() {
+                return super.getMessage().copy().append(": ").append(new TranslatableComponent("selectWorld.gameMode." + CreateWorldScreen.this.gameMode.name));
             }
             
             @Override
-            protected String getNarrationMessage() {
-                return super.getNarrationMessage() + ". " + CreateWorldScreen.this.gameModeHelp1 + " " + CreateWorldScreen.this.gameModeHelp2;
+            protected MutableComponent createNarrationMessage() {
+                return super.createNarrationMessage().append(". ").append(CreateWorldScreen.this.gameModeHelp1).append(" ").append(CreateWorldScreen.this.gameModeHelp2);
             }
         });
-        (this.seedEdit = new EditBox(this.font, this.width / 2 - 100, 60, 200, 20, I18n.get("selectWorld.enterSeed"))).setValue(this.initSeed);
-        this.seedEdit.setResponder(string -> this.initSeed = this.seedEdit.getValue());
-        this.children.add(this.seedEdit);
-        this.featuresButton = this.addButton(new Button(this.width / 2 - 155, 100, 150, 20, I18n.get("selectWorld.mapFeatures"), dcv -> {
-            this.features = !this.features;
-            dcv.queueNarration(250);
+        this.difficultyButton = this.addButton(new Button(integer3, 100, 150, 20, new TranslatableComponent("options.difficulty"), dni -> {
+            this.selectedDifficulty = this.selectedDifficulty.nextById();
+            this.effectiveDifficulty = this.selectedDifficulty;
+            dni.queueNarration(250);
             return;
         }) {
             @Override
-            public String getMessage() {
-                return I18n.get("selectWorld.mapFeatures") + ' ' + I18n.get(CreateWorldScreen.this.features ? "options.on" : "options.off");
-            }
-            
-            @Override
-            protected String getNarrationMessage() {
-                return super.getNarrationMessage() + ". " + I18n.get("selectWorld.mapFeatures.info");
+            public Component getMessage() {
+                return new TranslatableComponent("options.difficulty").append(": ").append(CreateWorldScreen.this.effectiveDifficulty.getDisplayName());
             }
         });
-        this.featuresButton.visible = false;
-        this.typeButton = this.addButton(new Button(this.width / 2 + 5, 100, 150, 20, I18n.get("selectWorld.mapType"), dcv -> {
-            ++this.levelTypeIndex;
-            if (this.levelTypeIndex >= LevelType.LEVEL_TYPES.length) {
-                this.levelTypeIndex = 0;
-            }
-            while (!this.isValidLevelType()) {
-                ++this.levelTypeIndex;
-                if (this.levelTypeIndex >= LevelType.LEVEL_TYPES.length) {
-                    this.levelTypeIndex = 0;
-                }
-            }
-            this.levelTypeOptions = new CompoundTag();
-            this.setDisplayOptions(this.displayOptions);
-            dcv.queueNarration(250);
-            return;
-        }) {
-            @Override
-            public String getMessage() {
-                return I18n.get("selectWorld.mapType") + ' ' + I18n.get(LevelType.LEVEL_TYPES[CreateWorldScreen.this.levelTypeIndex].getDescriptionId());
-            }
-            
-            @Override
-            protected String getNarrationMessage() {
-                final LevelType bkd2 = LevelType.LEVEL_TYPES[CreateWorldScreen.this.levelTypeIndex];
-                if (bkd2.hasHelpText()) {
-                    return super.getNarrationMessage() + ". " + I18n.get(bkd2.getHelpTextId());
-                }
-                return super.getNarrationMessage();
-            }
-        });
-        this.typeButton.visible = false;
-        this.customizeTypeButton = this.<Button>addButton(new Button(this.width / 2 + 5, 120, 150, 20, I18n.get("selectWorld.customizeType"), dcv -> {
-            if (LevelType.LEVEL_TYPES[this.levelTypeIndex] == LevelType.FLAT) {
-                this.minecraft.setScreen(new CreateFlatWorldScreen(this, this.levelTypeOptions));
-            }
-            if (LevelType.LEVEL_TYPES[this.levelTypeIndex] == LevelType.BUFFET) {
-                this.minecraft.setScreen(new CreateBuffetWorldScreen(this, this.levelTypeOptions));
-            }
-            return;
-        }));
-        this.customizeTypeButton.visible = false;
-        this.commandsButton = this.addButton(new Button(this.width / 2 - 155, 151, 150, 20, I18n.get("selectWorld.allowCommands"), dcv -> {
+        this.commandsButton = this.addButton(new Button(integer2, 151, 150, 20, new TranslatableComponent("selectWorld.allowCommands"), dni -> {
             this.commandsChanged = true;
             this.commands = !this.commands;
-            dcv.queueNarration(250);
+            dni.queueNarration(250);
             return;
         }) {
             @Override
-            public String getMessage() {
-                return I18n.get("selectWorld.allowCommands") + ' ' + I18n.get((CreateWorldScreen.this.commands && !CreateWorldScreen.this.hardCore) ? "options.on" : "options.off");
+            public Component getMessage() {
+                return super.getMessage().copy().append(" ").append(CommonComponents.optionStatus(CreateWorldScreen.this.commands && !CreateWorldScreen.this.hardCore));
             }
             
             @Override
-            protected String getNarrationMessage() {
-                return super.getNarrationMessage() + ". " + I18n.get("selectWorld.allowCommands.info");
+            protected MutableComponent createNarrationMessage() {
+                return super.createNarrationMessage().append(". ").append(new TranslatableComponent("selectWorld.allowCommands.info"));
             }
         });
-        this.commandsButton.visible = false;
-        this.bonusItemsButton = this.addButton(new Button(this.width / 2 + 5, 151, 150, 20, I18n.get("selectWorld.bonusItems"), dcv -> {
-            this.bonusItems = !this.bonusItems;
-            dcv.queueNarration(250);
-            return;
-        }) {
-            @Override
-            public String getMessage() {
-                return I18n.get("selectWorld.bonusItems") + ' ' + I18n.get((CreateWorldScreen.this.bonusItems && !CreateWorldScreen.this.hardCore) ? "options.on" : "options.off");
-            }
-        });
-        this.bonusItemsButton.visible = false;
-        this.moreOptionsButton = this.<Button>addButton(new Button(this.width / 2 - 75, 187, 150, 20, I18n.get("selectWorld.moreWorldOptions"), dcv -> this.toggleDisplayOptions()));
-        this.createButton = this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 28, 150, 20, I18n.get("selectWorld.create"), dcv -> this.onCreate()));
+        this.dataPacksButton = this.<Button>addButton(new Button(integer3, 151, 150, 20, new TranslatableComponent("selectWorld.dataPacks"), dni -> this.openDataPackSelectionScreen()));
+        this.gameRulesButton = this.<Button>addButton(new Button(integer2, 185, 150, 20, new TranslatableComponent("selectWorld.gameRules"), dni -> this.minecraft.setScreen(new EditGameRulesScreen(this.gameRules.copy(), optional -> {
+            this.minecraft.setScreen(this);
+            optional.ifPresent(bpx -> this.gameRules = bpx);
+        }))));
+        this.worldGenSettingsComponent.init(this, this.minecraft, this.font);
+        this.moreOptionsButton = this.<Button>addButton(new Button(integer3, 185, 150, 20, new TranslatableComponent("selectWorld.moreWorldOptions"), dni -> this.toggleDisplayOptions()));
+        this.createButton = this.<Button>addButton(new Button(integer2, this.height - 28, 150, 20, new TranslatableComponent("selectWorld.create"), dni -> this.onCreate()));
         this.createButton.active = !this.initName.isEmpty();
-        this.<Button>addButton(new Button(this.width / 2 + 5, this.height - 28, 150, 20, I18n.get("gui.cancel"), dcv -> this.minecraft.setScreen(this.lastScreen)));
-        this.setDisplayOptions(this.displayOptions);
+        this.<Button>addButton(new Button(integer3, this.height - 28, 150, 20, CommonComponents.GUI_CANCEL, dni -> {
+            this.removeTempDataPackDir();
+            this.minecraft.setScreen(this.lastScreen);
+            return;
+        }));
+        this.updateDisplayOptions();
         this.setInitialFocus(this.nameEdit);
         this.setGameMode(this.gameMode);
         this.updateResultFolder();
     }
     
     private void updateGameModeHelp() {
-        this.gameModeHelp1 = I18n.get("selectWorld.gameMode." + this.gameMode.name + ".line1");
-        this.gameModeHelp2 = I18n.get("selectWorld.gameMode." + this.gameMode.name + ".line2");
+        this.gameModeHelp1 = new TranslatableComponent("selectWorld.gameMode." + this.gameMode.name + ".line1");
+        this.gameModeHelp2 = new TranslatableComponent("selectWorld.gameMode." + this.gameMode.name + ".line2");
     }
     
     private void updateResultFolder() {
@@ -243,95 +254,83 @@ public class CreateWorldScreen extends Screen {
     }
     
     private void onCreate() {
-        this.minecraft.setScreen(null);
-        if (this.done) {
+        this.minecraft.forceSetScreen(new GenericDirtMessageScreen(new TranslatableComponent("createWorld.preparing")));
+        if (!this.copyTempDataPackDirToNewWorld()) {
             return;
         }
-        this.done = true;
-        long long2 = new Random().nextLong();
-        final String string4 = this.seedEdit.getValue();
-        if (!StringUtils.isEmpty((CharSequence)string4)) {
-            try {
-                final long long3 = Long.parseLong(string4);
-                if (long3 != 0L) {
-                    long2 = long3;
-                }
-            }
-            catch (NumberFormatException numberFormatException5) {
-                long2 = string4.hashCode();
-            }
+        final WorldGenSettings cix2 = this.worldGenSettingsComponent.makeSettings(this.hardCore);
+        LevelSettings bqe3;
+        if (cix2.isDebug()) {
+            final GameRules bpx4 = new GameRules();
+            bpx4.<GameRules.BooleanValue>getRule(GameRules.RULE_DAYLIGHT).set(false, null);
+            bqe3 = new LevelSettings(this.nameEdit.getValue().trim(), GameType.SPECTATOR, false, Difficulty.PEACEFUL, true, bpx4, DataPackConfig.DEFAULT);
         }
-        final LevelSettings bka5 = new LevelSettings(long2, this.gameMode.gameType, this.features, this.hardCore, LevelType.LEVEL_TYPES[this.levelTypeIndex]);
-        bka5.setLevelTypeOptions((JsonElement)Dynamic.convert((DynamicOps)NbtOps.INSTANCE, (DynamicOps)JsonOps.INSTANCE, this.levelTypeOptions));
-        if (this.bonusItems && !this.hardCore) {
-            bka5.enableStartingBonusItems();
+        else {
+            bqe3 = new LevelSettings(this.nameEdit.getValue().trim(), this.gameMode.gameType, this.hardCore, this.effectiveDifficulty, this.commands && !this.hardCore, this.gameRules, this.dataPacks);
         }
-        if (this.commands && !this.hardCore) {
-            bka5.enableSinglePlayerCommands();
-        }
-        this.minecraft.selectLevel(this.resultFolder, this.nameEdit.getValue().trim(), bka5);
-    }
-    
-    private boolean isValidLevelType() {
-        final LevelType bkd2 = LevelType.LEVEL_TYPES[this.levelTypeIndex];
-        return bkd2 != null && bkd2.isSelectable() && (bkd2 != LevelType.DEBUG_ALL_BLOCK_STATES || Screen.hasShiftDown());
+        this.minecraft.createLevel(this.resultFolder, bqe3, this.worldGenSettingsComponent.registryHolder(), cix2);
     }
     
     private void toggleDisplayOptions() {
         this.setDisplayOptions(!this.displayOptions);
     }
     
-    private void setGameMode(final SelectedGameMode a) {
+    private void setGameMode(final SelectedGameMode b) {
         if (!this.commandsChanged) {
-            this.commands = (a == SelectedGameMode.CREATIVE);
+            this.commands = (b == SelectedGameMode.CREATIVE);
         }
-        if (a == SelectedGameMode.HARDCORE) {
+        if (b == SelectedGameMode.HARDCORE) {
             this.hardCore = true;
             this.commandsButton.active = false;
-            this.bonusItemsButton.active = false;
+            this.worldGenSettingsComponent.bonusItemsButton.active = false;
+            this.effectiveDifficulty = Difficulty.HARD;
+            this.difficultyButton.active = false;
         }
         else {
             this.hardCore = false;
             this.commandsButton.active = true;
-            this.bonusItemsButton.active = true;
+            this.worldGenSettingsComponent.bonusItemsButton.active = true;
+            this.effectiveDifficulty = this.selectedDifficulty;
+            this.difficultyButton.active = true;
         }
-        this.gameMode = a;
+        this.gameMode = b;
         this.updateGameModeHelp();
     }
     
+    public void updateDisplayOptions() {
+        this.setDisplayOptions(this.displayOptions);
+    }
+    
     private void setDisplayOptions(final boolean boolean1) {
         this.displayOptions = boolean1;
         this.modeButton.visible = !this.displayOptions;
-        this.typeButton.visible = this.displayOptions;
-        if (LevelType.LEVEL_TYPES[this.levelTypeIndex] == LevelType.DEBUG_ALL_BLOCK_STATES) {
+        this.difficultyButton.visible = !this.displayOptions;
+        if (this.worldGenSettingsComponent.isDebug()) {
+            this.dataPacksButton.visible = false;
             this.modeButton.active = false;
             if (this.oldGameMode == null) {
                 this.oldGameMode = this.gameMode;
             }
             this.setGameMode(SelectedGameMode.DEBUG);
-            this.featuresButton.visible = false;
-            this.bonusItemsButton.visible = false;
             this.commandsButton.visible = false;
-            this.customizeTypeButton.visible = false;
         }
         else {
             this.modeButton.active = true;
             if (this.oldGameMode != null) {
                 this.setGameMode(this.oldGameMode);
             }
-            this.featuresButton.visible = (this.displayOptions && LevelType.LEVEL_TYPES[this.levelTypeIndex] != LevelType.CUSTOMIZED);
-            this.bonusItemsButton.visible = this.displayOptions;
-            this.commandsButton.visible = this.displayOptions;
-            this.customizeTypeButton.visible = (this.displayOptions && LevelType.LEVEL_TYPES[this.levelTypeIndex].hasCustomOptions());
+            this.commandsButton.visible = !this.displayOptions;
+            this.dataPacksButton.visible = !this.displayOptions;
         }
-        this.seedEdit.setVisible(this.displayOptions);
+        this.worldGenSettingsComponent.setDisplayOptions(this.displayOptions);
         this.nameEdit.setVisible(!this.displayOptions);
         if (this.displayOptions) {
-            this.moreOptionsButton.setMessage(I18n.get("gui.done"));
+            this.moreOptionsButton.setMessage(CommonComponents.GUI_DONE);
         }
         else {
-            this.moreOptionsButton.setMessage(I18n.get("selectWorld.moreWorldOptions"));
+            this.moreOptionsButton.setMessage(new TranslatableComponent("selectWorld.moreWorldOptions"));
         }
+        this.gameRulesButton.visible = !this.displayOptions;
     }
     
     @Override
@@ -354,53 +353,201 @@ public class CreateWorldScreen extends Screen {
         else {
             this.minecraft.setScreen(this.lastScreen);
         }
+        this.removeTempDataPackDir();
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 20, -1);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 20, -1);
         if (this.displayOptions) {
-            this.drawString(this.font, I18n.get("selectWorld.enterSeed"), this.width / 2 - 100, 47, -6250336);
-            this.drawString(this.font, I18n.get("selectWorld.seedInfo"), this.width / 2 - 100, 85, -6250336);
-            if (this.featuresButton.visible) {
-                this.drawString(this.font, I18n.get("selectWorld.mapFeatures.info"), this.width / 2 - 150, 122, -6250336);
-            }
-            if (this.commandsButton.visible) {
-                this.drawString(this.font, I18n.get("selectWorld.allowCommands.info"), this.width / 2 - 150, 172, -6250336);
-            }
-            this.seedEdit.render(integer1, integer2, float3);
-            if (LevelType.LEVEL_TYPES[this.levelTypeIndex].hasHelpText()) {
-                this.font.drawWordWrap(I18n.get(LevelType.LEVEL_TYPES[this.levelTypeIndex].getHelpTextId()), this.typeButton.x + 2, this.typeButton.y + 22, this.typeButton.getWidth(), 10526880);
-            }
+            this.drawString(dhl, this.font, I18n.get("selectWorld.enterSeed"), this.width / 2 - 100, 47, -6250336);
+            this.drawString(dhl, this.font, I18n.get("selectWorld.seedInfo"), this.width / 2 - 100, 85, -6250336);
+            this.worldGenSettingsComponent.render(dhl, integer2, integer3, float4);
         }
         else {
-            this.drawString(this.font, I18n.get("selectWorld.enterName"), this.width / 2 - 100, 47, -6250336);
-            this.drawString(this.font, I18n.get("selectWorld.resultFolder") + " " + this.resultFolder, this.width / 2 - 100, 85, -6250336);
-            this.nameEdit.render(integer1, integer2, float3);
-            this.drawCenteredString(this.font, this.gameModeHelp1, this.width / 2, 137, -6250336);
-            this.drawCenteredString(this.font, this.gameModeHelp2, this.width / 2, 149, -6250336);
+            this.drawString(dhl, this.font, I18n.get("selectWorld.enterName"), this.width / 2 - 100, 47, -6250336);
+            this.drawString(dhl, this.font, I18n.get("selectWorld.resultFolder") + " " + this.resultFolder, this.width / 2 - 100, 85, -6250336);
+            this.nameEdit.render(dhl, integer2, integer3, float4);
+            this.drawString(dhl, this.font, this.gameModeHelp1, this.width / 2 - 150, 122, -6250336);
+            this.drawString(dhl, this.font, this.gameModeHelp2, this.width / 2 - 150, 134, -6250336);
+            if (this.commandsButton.visible) {
+                this.drawString(dhl, this.font, I18n.get("selectWorld.allowCommands.info"), this.width / 2 - 150, 172, -6250336);
+            }
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
-    public void copyFromWorld(final LevelData crm) {
-        this.initName = crm.getLevelName();
-        this.initSeed = Long.toString(crm.getSeed());
-        final LevelType bkd3 = (crm.getGeneratorType() == LevelType.CUSTOMIZED) ? LevelType.NORMAL : crm.getGeneratorType();
-        this.levelTypeIndex = bkd3.getId();
-        this.levelTypeOptions = crm.getGeneratorOptions();
-        this.features = crm.isGenerateMapFeatures();
-        this.commands = crm.getAllowCommands();
-        if (crm.isHardcore()) {
-            this.gameMode = SelectedGameMode.HARDCORE;
+    @Override
+    protected <T extends GuiEventListener> T addWidget(final T dof) {
+        return super.<T>addWidget(dof);
+    }
+    
+    @Override
+    protected <T extends AbstractWidget> T addButton(final T dng) {
+        return super.<T>addButton(dng);
+    }
+    
+    @Nullable
+    protected Path getTempDataPackDir() {
+        if (this.tempDataPackDir == null) {
+            try {
+                this.tempDataPackDir = Files.createTempDirectory("mcworld-", new FileAttribute[0]);
+            }
+            catch (IOException iOException2) {
+                CreateWorldScreen.LOGGER.warn("Failed to create temporary dir", (Throwable)iOException2);
+                SystemToast.onPackCopyFailure(this.minecraft, this.resultFolder);
+                this.minecraft.setScreen(this.lastScreen);
+            }
         }
-        else if (crm.getGameType().isSurvival()) {
-            this.gameMode = SelectedGameMode.SURVIVAL;
+        return this.tempDataPackDir;
+    }
+    
+    private void openDataPackSelectionScreen() {
+        final Path path2 = this.getTempDataPackDir();
+        if (path2 != null) {
+            final File file3 = path2.toFile();
+            final PackRepository<Pack> aar4 = new PackRepository<Pack>(Pack::new, new RepositorySource[] { new ServerPacksSource(), new FolderRepositorySource(file3, PackSource.DEFAULT) });
+            aar4.reload();
+            aar4.setSelected(this.dataPacks.getEnabled());
+            this.minecraft.setScreen(new DataPackSelectScreen(this, aar4, this::tryApplyNewDataPacks, file3));
         }
-        else if (crm.getGameType().isCreative()) {
-            this.gameMode = SelectedGameMode.CREATIVE;
+    }
+    
+    private void tryApplyNewDataPacks(final PackRepository<Pack> aar) {
+        final List<String> list3 = ImmutableList.copyOf(aar.getSelectedIds());
+        final List<String> list4 = aar.getAvailableIds().stream().filter(string -> !list3.contains(string)).collect(ImmutableList.toImmutableList());
+        final DataPackConfig bpn5 = new DataPackConfig(list3, list4);
+        if (list3.equals(this.dataPacks.getEnabled())) {
+            this.dataPacks = bpn5;
+            return;
         }
+        final Minecraft minecraft;
+        final GenericDirtMessageScreen screen;
+        this.minecraft.tell(() -> {
+            minecraft = this.minecraft;
+            new GenericDirtMessageScreen(new TranslatableComponent("dataPack.validation.working"));
+            minecraft.setScreen(screen);
+            return;
+        });
+        Minecraft minecraft2;
+        final ConfirmScreen screen2;
+        final DataPackConfig dataPacks;
+        ServerResources.loadResources(aar.openAllSelected(), Commands.CommandSelection.INTEGRATED, 2, Util.backgroundExecutor(), this.minecraft).handle((uw, throwable) -> {
+            if (throwable != null) {
+                CreateWorldScreen.LOGGER.warn("Failed to validate datapack", throwable);
+                this.minecraft.tell(() -> {
+                    minecraft2 = this.minecraft;
+                    new ConfirmScreen(boolean1 -> {
+                        if (boolean1) {
+                            this.openDataPackSelectionScreen();
+                        }
+                        else {
+                            this.dataPacks = DataPackConfig.DEFAULT;
+                            this.minecraft.setScreen(this);
+                        }
+                    }, new TranslatableComponent("dataPack.validation.failed"), TextComponent.EMPTY, new TranslatableComponent("dataPack.validation.back"), new TranslatableComponent("dataPack.validation.reset"));
+                    minecraft2.setScreen(screen2);
+                    return;
+                });
+            }
+            else {
+                this.minecraft.tell(() -> {
+                    this.dataPacks = dataPacks;
+                    this.minecraft.setScreen(this);
+                    return;
+                });
+            }
+            return null;
+        });
+    }
+    
+    private void removeTempDataPackDir() {
+        if (this.tempDataPackDir != null) {
+            try (final Stream<Path> stream2 = Files.walk(this.tempDataPackDir)) {
+                stream2.sorted(Comparator.reverseOrder()).forEach(path -> {
+                    try {
+                        Files.delete(path);
+                    }
+                    catch (IOException iOException2) {
+                        CreateWorldScreen.LOGGER.warn("Failed to remove temporary file {}", path, iOException2);
+                    }
+                    return;
+                });
+            }
+            catch (IOException iOException3) {
+                CreateWorldScreen.LOGGER.warn("Failed to list temporary dir {}", this.tempDataPackDir);
+            }
+            this.tempDataPackDir = null;
+        }
+    }
+    
+    private static void copyBetweenDirs(final Path path1, final Path path2, final Path path3) {
+        try {
+            Util.copyBetweenDirs(path1, path2, path3);
+        }
+        catch (IOException iOException4) {
+            CreateWorldScreen.LOGGER.warn("Failed to copy datapack file from {} to {}", path3, path2);
+            throw new OperationFailedException(iOException4);
+        }
+    }
+    
+    private boolean copyTempDataPackDirToNewWorld() {
+        if (this.tempDataPackDir != null) {
+            try (final LevelStorageSource.LevelStorageAccess a2 = this.minecraft.getLevelSource().createAccess(this.resultFolder);
+                 final Stream<Path> stream4 = Files.walk(this.tempDataPackDir)) {
+                final Path path3 = a2.getLevelPath(LevelResource.DATAPACK_DIR);
+                Files.createDirectories(path3, new FileAttribute[0]);
+                stream4.filter(path -> !path.equals(this.tempDataPackDir)).forEach(path2 -> copyBetweenDirs(this.tempDataPackDir, path3, path2));
+            }
+            catch (IOException | OperationFailedException ex2) {
+                final Exception ex;
+                final Exception exception2 = ex;
+                CreateWorldScreen.LOGGER.warn("Failed to copy datapacks to world {}", this.resultFolder, exception2);
+                SystemToast.onPackCopyFailure(this.minecraft, this.resultFolder);
+                this.minecraft.setScreen(this.lastScreen);
+                this.removeTempDataPackDir();
+                return false;
+            }
+            this.removeTempDataPackDir();
+        }
+        return true;
+    }
+    
+    @Nullable
+    public static Path createTempDataPackDirFromExistingWorld(final Path path, final Minecraft dlx) {
+        final MutableObject<Path> mutableObject3 = (MutableObject<Path>)new MutableObject();
+        try (final Stream<Path> stream4 = Files.walk(path)) {
+            final MutableObject mutableObject4;
+            Path path4;
+            stream4.filter(path2 -> !path2.equals(path)).forEach(path3 -> {
+                path4 = (Path)mutableObject4.getValue();
+                if (path4 == null) {
+                    try {
+                        path4 = Files.createTempDirectory("mcworld-", new FileAttribute[0]);
+                    }
+                    catch (IOException iOException5) {
+                        CreateWorldScreen.LOGGER.warn("Failed to create temporary dir");
+                        throw new OperationFailedException(iOException5);
+                    }
+                    mutableObject4.setValue(path4);
+                }
+                copyBetweenDirs(path, path4, path3);
+                return;
+            });
+        }
+        catch (IOException | OperationFailedException ex2) {
+            final Exception ex;
+            final Exception exception4 = ex;
+            CreateWorldScreen.LOGGER.warn("Failed to copy datapacks from world {}", path, exception4);
+            SystemToast.onPackCopyFailure(dlx, path.toString());
+            return null;
+        }
+        return (Path)mutableObject3.getValue();
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
     }
     
     enum SelectedGameMode {
@@ -412,9 +559,15 @@ public class CreateWorldScreen extends Screen {
         private final String name;
         private final GameType gameType;
         
-        private SelectedGameMode(final String string3, final GameType bjt) {
+        private SelectedGameMode(final String string3, final GameType bpy) {
             this.name = string3;
-            this.gameType = bjt;
+            this.gameType = bpy;
+        }
+    }
+    
+    static class OperationFailedException extends RuntimeException {
+        public OperationFailedException(final Throwable throwable) {
+            super(throwable);
         }
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/worldselection/EditGameRulesScreen.java b/src/net/minecraft/client/gui/screens/worldselection/EditGameRulesScreen.java
new file mode 100644
index 0000000..445d1a8
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/worldselection/EditGameRulesScreen.java
@@ -0,0 +1,278 @@
+package net.minecraft.client.gui.screens.worldselection;
+
+import net.minecraft.client.gui.components.AbstractSelectionList;
+import java.util.function.Function;
+import java.util.Comparator;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.ChatFormatting;
+import java.util.Map;
+import com.google.common.collect.Maps;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.server.MinecraftServer;
+import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.components.ContainerObjectSelectionList;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.Minecraft;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.CommonComponents;
+import com.google.common.collect.Sets;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
+import javax.annotation.Nullable;
+import net.minecraft.network.chat.FormattedText;
+import java.util.List;
+import net.minecraft.client.gui.components.Button;
+import java.util.Set;
+import net.minecraft.world.level.GameRules;
+import java.util.Optional;
+import java.util.function.Consumer;
+import net.minecraft.client.gui.screens.Screen;
+
+public class EditGameRulesScreen extends Screen {
+    private final Consumer<Optional<GameRules>> exitCallback;
+    private RuleList rules;
+    private final Set<RuleEntry> invalidEntries;
+    private Button doneButton;
+    @Nullable
+    private List<FormattedText> tooltip;
+    private final GameRules gameRules;
+    
+    public EditGameRulesScreen(final GameRules bpx, final Consumer<Optional<GameRules>> consumer) {
+        super(new TranslatableComponent("editGamerule.title"));
+        this.invalidEntries = Sets.newHashSet();
+        this.gameRules = bpx;
+        this.exitCallback = consumer;
+    }
+    
+    @Override
+    protected void init() {
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
+        super.init();
+        this.rules = new RuleList(this.gameRules);
+        this.children.add(this.rules);
+        this.<Button>addButton(new Button(this.width / 2 - 155 + 160, this.height - 29, 150, 20, CommonComponents.GUI_CANCEL, dni -> this.exitCallback.accept(Optional.<GameRules>empty())));
+        this.doneButton = this.<Button>addButton(new Button(this.width / 2 - 155, this.height - 29, 150, 20, CommonComponents.GUI_DONE, dni -> this.exitCallback.accept(Optional.<GameRules>of(this.gameRules))));
+    }
+    
+    @Override
+    public void removed() {
+        this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
+    }
+    
+    @Override
+    public void onClose() {
+        this.exitCallback.accept(Optional.<GameRules>empty());
+    }
+    
+    @Override
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.tooltip = null;
+        this.rules.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 20, 16777215);
+        super.render(dhl, integer2, integer3, float4);
+        if (this.tooltip != null) {
+            this.renderTooltip(dhl, this.tooltip, integer2, integer3);
+        }
+    }
+    
+    private void setTooltip(@Nullable final List<FormattedText> list) {
+        this.tooltip = list;
+    }
+    
+    private void updateDoneButton() {
+        this.doneButton.active = this.invalidEntries.isEmpty();
+    }
+    
+    private void markInvalid(final RuleEntry f) {
+        this.invalidEntries.add(f);
+        this.updateDoneButton();
+    }
+    
+    private void clearInvalid(final RuleEntry f) {
+        this.invalidEntries.remove(f);
+        this.updateDoneButton();
+    }
+    
+    public abstract class RuleEntry extends ContainerObjectSelectionList.Entry<RuleEntry> {
+        @Nullable
+        private final List<FormattedText> tooltip;
+        
+        public RuleEntry(@Nullable final List<FormattedText> list) {
+            this.tooltip = list;
+        }
+    }
+    
+    public class CategoryRuleEntry extends RuleEntry {
+        private final Component label;
+        
+        public CategoryRuleEntry(final Component mr) {
+            super(null);
+            this.label = mr;
+        }
+        
+        @Override
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            EditGameRulesScreen.this.drawCenteredString(dhl, EditGameRulesScreen.this.minecraft.font, this.label, integer4 + integer5 / 2, integer3 + 5, 16777215);
+        }
+        
+        @Override
+        public List<? extends GuiEventListener> children() {
+            return ImmutableList.of();
+        }
+    }
+    
+    public abstract class GameRuleEntry extends RuleEntry {
+        private final List<FormattedText> label;
+        protected final List<GuiEventListener> children;
+        
+        public GameRuleEntry(@Nullable final List<FormattedText> list, final Component mr) {
+            super(list);
+            this.children = Lists.newArrayList();
+            this.label = EditGameRulesScreen.this.minecraft.font.split(mr, 175);
+        }
+        
+        @Override
+        public List<? extends GuiEventListener> children() {
+            return this.children;
+        }
+        
+        protected void renderLabel(final PoseStack dhl, final int integer2, final int integer3) {
+            if (this.label.size() == 1) {
+                EditGameRulesScreen.this.minecraft.font.draw(dhl, this.label.get(0), (float)integer3, (float)(integer2 + 5), 16777215);
+            }
+            else if (this.label.size() >= 2) {
+                EditGameRulesScreen.this.minecraft.font.draw(dhl, this.label.get(0), (float)integer3, (float)integer2, 16777215);
+                EditGameRulesScreen.this.minecraft.font.draw(dhl, this.label.get(1), (float)integer3, (float)(integer2 + 10), 16777215);
+            }
+        }
+    }
+    
+    public class BooleanRuleEntry extends GameRuleEntry {
+        private final Button checkbox;
+        
+        public BooleanRuleEntry(final Component mr, final List<FormattedText> list, final String string, final GameRules.BooleanValue a) {
+            super(list, mr);
+            final boolean boolean3;
+            this.checkbox = new Button(10, 5, 44, 20, CommonComponents.optionStatus(a.get()), dni -> {
+                boolean3 = !a.get();
+                a.set(boolean3, null);
+                dni.setMessage(CommonComponents.optionStatus(a.get()));
+                return;
+            }) {
+                @Override
+                protected MutableComponent createNarrationMessage() {
+                    return BooleanRuleEntry.this.createFullMessage(mr, a.get()).copy().append("\n").append(string);
+                }
+            };
+            this.children.add(this.checkbox);
+        }
+        
+        private MutableComponent createFullMessage(final Component mr, final boolean boolean2) {
+            return new TextComponent("").append(mr).append(": ").append(CommonComponents.optionStatus(boolean2));
+        }
+        
+        @Override
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.renderLabel(dhl, integer3, integer4);
+            this.checkbox.x = integer4 + integer5 - 45;
+            this.checkbox.y = integer3;
+            this.checkbox.render(dhl, integer7, integer8, float10);
+        }
+    }
+    
+    public class IntegerRuleEntry extends GameRuleEntry {
+        private final EditBox input;
+        
+        public IntegerRuleEntry(final Component mr, final List<FormattedText> list, final String string, final GameRules.IntegerValue d) {
+            super(list, mr);
+            (this.input = new EditBox(EditGameRulesScreen.this.minecraft.font, 10, 5, 42, 20, mr.copy().append("\n").append(string).append("\n"))).setValue(Integer.toString(d.get()));
+            this.input.setResponder(string -> {
+                if (d.tryDeserialize(string)) {
+                    this.input.setTextColor(14737632);
+                    EditGameRulesScreen.this.clearInvalid(this);
+                }
+                else {
+                    this.input.setTextColor(16711680);
+                    EditGameRulesScreen.this.markInvalid(this);
+                }
+                return;
+            });
+            this.children.add(this.input);
+        }
+        
+        @Override
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            this.renderLabel(dhl, integer3, integer4);
+            this.input.x = integer4 + integer5 - 44;
+            this.input.y = integer3;
+            this.input.render(dhl, integer7, integer8, float10);
+        }
+    }
+    
+    public class RuleList extends ContainerObjectSelectionList<RuleEntry> {
+        public RuleList(final GameRules bpx) {
+            super(EditGameRulesScreen.this.minecraft, EditGameRulesScreen.this.width, EditGameRulesScreen.this.height, 43, EditGameRulesScreen.this.height - 32, 24);
+            final Map<GameRules.Category, Map<GameRules.Key<?>, RuleEntry>> map4 = Maps.newHashMap();
+            GameRules.visitGameRuleTypes(new GameRules.GameRuleTypeVisitor() {
+                @Override
+                public void visitBoolean(final GameRules.Key<GameRules.BooleanValue> e, final GameRules.Type<GameRules.BooleanValue> f) {
+                    this.<GameRules.BooleanValue>addEntry(e, (mr, list, string, a) -> new BooleanRuleEntry(mr, list, string, a));
+                }
+                
+                @Override
+                public void visitInteger(final GameRules.Key<GameRules.IntegerValue> e, final GameRules.Type<GameRules.IntegerValue> f) {
+                    this.<GameRules.IntegerValue>addEntry(e, (mr, list, string, d) -> new IntegerRuleEntry(mr, list, string, d));
+                }
+                
+                private <T extends GameRules.Value<T>> void addEntry(final GameRules.Key<T> e, final EntryFactory<T> c) {
+                    final Component mr4 = new TranslatableComponent(e.getDescriptionId());
+                    final Component mr5 = new TextComponent(e.getId()).withStyle(ChatFormatting.YELLOW);
+                    final T g6 = bpx.<T>getRule(e);
+                    final String string7 = g6.serialize();
+                    final Component mr6 = new TranslatableComponent("editGamerule.default", new Object[] { new TextComponent(string7) }).withStyle(ChatFormatting.GRAY);
+                    final String string8 = e.getDescriptionId() + ".description";
+                    List<FormattedText> list10;
+                    String string9;
+                    if (I18n.exists(string8)) {
+                        final ImmutableList.Builder<FormattedText> builder12 = (ImmutableList.Builder<FormattedText>)ImmutableList.<Component>builder().add(mr5);
+                        final Component mr7 = new TranslatableComponent(string8);
+                        EditGameRulesScreen.this.font.split(mr7, 150).forEach(builder12::add);
+                        list10 = (List<FormattedText>)builder12.add(mr6).build();
+                        string9 = mr7.getString() + "\n" + mr6.getString();
+                    }
+                    else {
+                        list10 = ImmutableList.of(mr5, mr6);
+                        string9 = mr6.getString();
+                    }
+                    map4.computeIfAbsent(e.getCategory(), b -> Maps.newHashMap()).put(e, c.create(mr4, list10, string9, g6));
+                }
+            });
+            final CategoryRuleEntry a;
+            map4.entrySet().stream().sorted(Map.Entry.<Comparable, Object>comparingByKey()).forEach(entry -> {
+                new CategoryRuleEntry(new TranslatableComponent(entry.getKey().getDescriptionId()).withStyle(ChatFormatting.BOLD, ChatFormatting.YELLOW));
+                ((AbstractSelectionList<CategoryRuleEntry>)this).addEntry(a);
+                ((Map)entry.getValue()).entrySet().stream().sorted(Map.Entry.comparingByKey(Comparator.comparing(GameRules.Key::getId))).forEach(entry -> this.addEntry((RuleEntry)entry.getValue()));
+            });
+        }
+        
+        @Override
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+            super.render(dhl, integer2, integer3, float4);
+            if (this.isMouseOver(integer2, integer3)) {
+                final RuleEntry f6 = this.getEntryAtPosition(integer2, integer3);
+                if (f6 != null) {
+                    EditGameRulesScreen.this.setTooltip(f6.tooltip);
+                }
+            }
+        }
+    }
+    
+    @FunctionalInterface
+    interface EntryFactory<T extends GameRules.Value<T>> {
+        RuleEntry create(final Component mr, final List<FormattedText> list, final String string, final T g);
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/worldselection/EditWorldScreen.java b/src/net/minecraft/client/gui/screens/worldselection/EditWorldScreen.java
index 83ac68e..7d63535 100644
--- a/src/net/minecraft/client/gui/screens/worldselection/EditWorldScreen.java
+++ b/src/net/minecraft/client/gui/screens/worldselection/EditWorldScreen.java
@@ -1,40 +1,64 @@
 package net.minecraft.client.gui.screens.worldselection;
 
-import net.minecraft.client.gui.components.toasts.ToastComponent;
-import net.minecraft.client.gui.components.toasts.Toast;
-import net.minecraft.client.gui.components.toasts.SystemToast;
-import net.minecraft.util.Mth;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.world.level.storage.LevelData;
-import net.minecraft.client.Minecraft;
-import java.nio.file.Path;
-import net.minecraft.world.level.storage.LevelStorageSource;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.BackupConfirmScreen;
-import java.io.IOException;
-import java.nio.file.attribute.FileAttribute;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import net.minecraft.Util;
+import com.google.gson.GsonBuilder;
+import org.apache.logging.log4j.LogManager;
 import org.apache.commons.io.FileUtils;
+import net.minecraft.Util;
+import java.nio.file.attribute.FileAttribute;
+import java.nio.file.LinkOption;
+import net.minecraft.client.gui.screens.BackupConfirmScreen;
+import com.google.gson.stream.JsonWriter;
+import java.nio.file.Path;
+import com.google.gson.JsonElement;
+import java.util.function.Function;
+import java.util.concurrent.ExecutionException;
+import com.google.gson.JsonIOException;
+import com.mojang.serialization.DataResult;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.OpenOption;
+import java.nio.charset.StandardCharsets;
+import net.minecraft.world.level.storage.LevelResource;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.resources.RegistryWriteOps;
+import com.mojang.serialization.JsonOps;
+import net.minecraft.world.level.storage.WorldData;
+import net.minecraft.world.level.DataPackConfig;
+import net.minecraft.server.packs.resources.ResourceManager;
+import com.mojang.datafixers.util.Function4;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.util.Mth;
+import net.minecraft.client.gui.components.toasts.Toast;
+import net.minecraft.network.chat.TextComponent;
+import java.io.IOException;
+import net.minecraft.client.gui.components.toasts.SystemToast;
+import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.world.level.storage.LevelStorageSource;
 import net.minecraft.client.gui.components.EditBox;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.minecraft.client.gui.components.Button;
+import com.google.gson.Gson;
+import org.apache.logging.log4j.Logger;
 import net.minecraft.client.gui.screens.Screen;
 
 public class EditWorldScreen extends Screen {
+    private static final Logger LOGGER;
+    private static final Gson WORLD_GEN_SETTINGS_GSON;
     private Button renameButton;
     private final BooleanConsumer callback;
     private EditBox nameEdit;
-    private final String levelId;
+    private final LevelStorageSource.LevelStorageAccess levelAccess;
     
-    public EditWorldScreen(final BooleanConsumer booleanConsumer, final String string) {
-        super(new TranslatableComponent("selectWorld.edit.title", new Object[0]));
+    public EditWorldScreen(final BooleanConsumer booleanConsumer, final LevelStorageSource.LevelStorageAccess a) {
+        super(new TranslatableComponent("selectWorld.edit.title"));
         this.callback = booleanConsumer;
-        this.levelId = string;
+        this.levelAccess = a;
     }
     
     @Override
@@ -44,114 +68,409 @@ public class EditWorldScreen extends Screen {
     
     @Override
     protected void init() {
-        this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        final LevelStorageSource crp3;
-        final Button dcv2 = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 24 + 5, 200, 20, I18n.get("selectWorld.edit.resetIcon"), dcv -> {
-            crp3 = this.minecraft.getLevelSource();
-            FileUtils.deleteQuietly(crp3.getFile(this.levelId, "icon.png"));
-            dcv.active = false;
-            return;
-        }));
-        final LevelStorageSource crp4;
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 48 + 5, 200, 20, I18n.get("selectWorld.edit.openFolder"), dcv -> {
-            crp4 = this.minecraft.getLevelSource();
-            Util.getPlatform().openFile(crp4.getFile(this.levelId, "icon.png").getParentFile());
-            return;
-        }));
-        final LevelStorageSource crp5;
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 72 + 5, 200, 20, I18n.get("selectWorld.edit.backup"), dcv -> {
-            crp5 = this.minecraft.getLevelSource();
-            makeBackupAndShowToast(crp5, this.levelId);
-            this.callback.accept(false);
-            return;
-        }));
-        final LevelStorageSource crp6;
-        final Path path4;
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 96 + 5, 200, 20, I18n.get("selectWorld.edit.backupFolder"), dcv -> {
-            crp6 = this.minecraft.getLevelSource();
-            path4 = crp6.getBackupPath();
-            try {
-                Files.createDirectories(Files.exists(path4) ? path4.toRealPath() : path4, new FileAttribute[0]);
-            }
-            catch (IOException iOException5) {
-                throw new RuntimeException(iOException5);
-            }
-            Util.getPlatform().openFile(path4.toFile());
-            return;
-        }));
-        final Minecraft minecraft;
-        final BackupConfirmScreen screen;
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 120 + 5, 200, 20, I18n.get("selectWorld.edit.optimize"), dcv -> {
-            minecraft = this.minecraft;
-            new BackupConfirmScreen(this, (boolean1, boolean2) -> {
-                if (boolean1) {
-                    makeBackupAndShowToast(this.minecraft.getLevelSource(), this.levelId);
-                }
-                this.minecraft.setScreen(new OptimizeWorldScreen(this.callback, this.levelId, this.minecraft.getLevelSource(), boolean2));
-                return;
-            }, new TranslatableComponent("optimizeWorld.confirm.title", new Object[0]), new TranslatableComponent("optimizeWorld.confirm.description", new Object[0]), true);
-            minecraft.setScreen(screen);
-            return;
-        }));
-        this.renameButton = this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 144 + 5, 98, 20, I18n.get("selectWorld.edit.save"), dcv -> this.onRename()));
-        this.<Button>addButton(new Button(this.width / 2 + 2, this.height / 4 + 144 + 5, 98, 20, I18n.get("gui.cancel"), dcv -> this.callback.accept(false)));
-        dcv2.active = this.minecraft.getLevelSource().getFile(this.levelId, "icon.png").isFile();
-        final LevelStorageSource crp7 = this.minecraft.getLevelSource();
-        final LevelData crm4 = crp7.getDataTagFor(this.levelId);
-        final String string2 = (crm4 == null) ? "" : crm4.getLevelName();
-        (this.nameEdit = new EditBox(this.font, this.width / 2 - 100, 53, 200, 20, I18n.get("selectWorld.enterName"))).setValue(string2);
-        this.nameEdit.setResponder(string -> this.renameButton.active = !string.trim().isEmpty());
-        this.children.add(this.nameEdit);
-        this.setInitialFocus(this.nameEdit);
+        // 
+        // This method could not be decompiled.
+        // 
+        // Original Bytecode:
+        // 
+        //     1: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.minecraft:Lnet/minecraft/client/Minecraft;
+        //     4: getfield        net/minecraft/client/Minecraft.keyboardHandler:Lnet/minecraft/client/KeyboardHandler;
+        //     7: iconst_1       
+        //     8: invokevirtual   net/minecraft/client/KeyboardHandler.setSendRepeatsToGui:(Z)V
+        //    11: aload_0         /* this */
+        //    12: new             Lnet/minecraft/client/gui/components/Button;
+        //    15: dup            
+        //    16: aload_0         /* this */
+        //    17: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.width:I
+        //    20: iconst_2       
+        //    21: idiv           
+        //    22: bipush          100
+        //    24: isub           
+        //    25: aload_0         /* this */
+        //    26: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.height:I
+        //    29: iconst_4       
+        //    30: idiv           
+        //    31: iconst_0       
+        //    32: iadd           
+        //    33: iconst_5       
+        //    34: iadd           
+        //    35: sipush          200
+        //    38: bipush          20
+        //    40: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //    43: dup            
+        //    44: ldc             "selectWorld.edit.resetIcon"
+        //    46: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //    49: aload_0         /* this */
+        //    50: invokedynamic   BootstrapMethod #0, onPress:(Lnet/minecraft/client/gui/screens/worldselection/EditWorldScreen;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //    55: invokespecial   net/minecraft/client/gui/components/Button.<init>:(IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //    58: invokevirtual   net/minecraft/client/gui/screens/worldselection/EditWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //    61: checkcast       Lnet/minecraft/client/gui/components/Button;
+        //    64: astore_1        /* dni2 */
+        //    65: aload_0         /* this */
+        //    66: new             Lnet/minecraft/client/gui/components/Button;
+        //    69: dup            
+        //    70: aload_0         /* this */
+        //    71: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.width:I
+        //    74: iconst_2       
+        //    75: idiv           
+        //    76: bipush          100
+        //    78: isub           
+        //    79: aload_0         /* this */
+        //    80: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.height:I
+        //    83: iconst_4       
+        //    84: idiv           
+        //    85: bipush          24
+        //    87: iadd           
+        //    88: iconst_5       
+        //    89: iadd           
+        //    90: sipush          200
+        //    93: bipush          20
+        //    95: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //    98: dup            
+        //    99: ldc             "selectWorld.edit.openFolder"
+        //   101: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   104: aload_0         /* this */
+        //   105: invokedynamic   BootstrapMethod #1, onPress:(Lnet/minecraft/client/gui/screens/worldselection/EditWorldScreen;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   110: invokespecial   net/minecraft/client/gui/components/Button.<init>:(IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   113: invokevirtual   net/minecraft/client/gui/screens/worldselection/EditWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   116: pop            
+        //   117: aload_0         /* this */
+        //   118: new             Lnet/minecraft/client/gui/components/Button;
+        //   121: dup            
+        //   122: aload_0         /* this */
+        //   123: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.width:I
+        //   126: iconst_2       
+        //   127: idiv           
+        //   128: bipush          100
+        //   130: isub           
+        //   131: aload_0         /* this */
+        //   132: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.height:I
+        //   135: iconst_4       
+        //   136: idiv           
+        //   137: bipush          48
+        //   139: iadd           
+        //   140: iconst_5       
+        //   141: iadd           
+        //   142: sipush          200
+        //   145: bipush          20
+        //   147: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   150: dup            
+        //   151: ldc             "selectWorld.edit.backup"
+        //   153: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   156: aload_0         /* this */
+        //   157: invokedynamic   BootstrapMethod #2, onPress:(Lnet/minecraft/client/gui/screens/worldselection/EditWorldScreen;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   162: invokespecial   net/minecraft/client/gui/components/Button.<init>:(IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   165: invokevirtual   net/minecraft/client/gui/screens/worldselection/EditWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   168: pop            
+        //   169: aload_0         /* this */
+        //   170: new             Lnet/minecraft/client/gui/components/Button;
+        //   173: dup            
+        //   174: aload_0         /* this */
+        //   175: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.width:I
+        //   178: iconst_2       
+        //   179: idiv           
+        //   180: bipush          100
+        //   182: isub           
+        //   183: aload_0         /* this */
+        //   184: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.height:I
+        //   187: iconst_4       
+        //   188: idiv           
+        //   189: bipush          72
+        //   191: iadd           
+        //   192: iconst_5       
+        //   193: iadd           
+        //   194: sipush          200
+        //   197: bipush          20
+        //   199: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   202: dup            
+        //   203: ldc             "selectWorld.edit.backupFolder"
+        //   205: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   208: aload_0         /* this */
+        //   209: invokedynamic   BootstrapMethod #3, onPress:(Lnet/minecraft/client/gui/screens/worldselection/EditWorldScreen;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   214: invokespecial   net/minecraft/client/gui/components/Button.<init>:(IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   217: invokevirtual   net/minecraft/client/gui/screens/worldselection/EditWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   220: pop            
+        //   221: aload_0         /* this */
+        //   222: new             Lnet/minecraft/client/gui/components/Button;
+        //   225: dup            
+        //   226: aload_0         /* this */
+        //   227: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.width:I
+        //   230: iconst_2       
+        //   231: idiv           
+        //   232: bipush          100
+        //   234: isub           
+        //   235: aload_0         /* this */
+        //   236: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.height:I
+        //   239: iconst_4       
+        //   240: idiv           
+        //   241: bipush          96
+        //   243: iadd           
+        //   244: iconst_5       
+        //   245: iadd           
+        //   246: sipush          200
+        //   249: bipush          20
+        //   251: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   254: dup            
+        //   255: ldc             "selectWorld.edit.optimize"
+        //   257: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   260: aload_0         /* this */
+        //   261: invokedynamic   BootstrapMethod #4, onPress:(Lnet/minecraft/client/gui/screens/worldselection/EditWorldScreen;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   266: invokespecial   net/minecraft/client/gui/components/Button.<init>:(IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   269: invokevirtual   net/minecraft/client/gui/screens/worldselection/EditWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   272: pop            
+        //   273: aload_0         /* this */
+        //   274: new             Lnet/minecraft/client/gui/components/Button;
+        //   277: dup            
+        //   278: aload_0         /* this */
+        //   279: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.width:I
+        //   282: iconst_2       
+        //   283: idiv           
+        //   284: bipush          100
+        //   286: isub           
+        //   287: aload_0         /* this */
+        //   288: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.height:I
+        //   291: iconst_4       
+        //   292: idiv           
+        //   293: bipush          120
+        //   295: iadd           
+        //   296: iconst_5       
+        //   297: iadd           
+        //   298: sipush          200
+        //   301: bipush          20
+        //   303: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   306: dup            
+        //   307: ldc             "selectWorld.edit.export_worldgen_settings"
+        //   309: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   312: aload_0         /* this */
+        //   313: invokedynamic   BootstrapMethod #5, onPress:(Lnet/minecraft/client/gui/screens/worldselection/EditWorldScreen;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   318: invokespecial   net/minecraft/client/gui/components/Button.<init>:(IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   321: invokevirtual   net/minecraft/client/gui/screens/worldselection/EditWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   324: pop            
+        //   325: aload_0         /* this */
+        //   326: aload_0         /* this */
+        //   327: new             Lnet/minecraft/client/gui/components/Button;
+        //   330: dup            
+        //   331: aload_0         /* this */
+        //   332: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.width:I
+        //   335: iconst_2       
+        //   336: idiv           
+        //   337: bipush          100
+        //   339: isub           
+        //   340: aload_0         /* this */
+        //   341: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.height:I
+        //   344: iconst_4       
+        //   345: idiv           
+        //   346: sipush          144
+        //   349: iadd           
+        //   350: iconst_5       
+        //   351: iadd           
+        //   352: bipush          98
+        //   354: bipush          20
+        //   356: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   359: dup            
+        //   360: ldc             "selectWorld.edit.save"
+        //   362: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   365: aload_0         /* this */
+        //   366: invokedynamic   BootstrapMethod #6, onPress:(Lnet/minecraft/client/gui/screens/worldselection/EditWorldScreen;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   371: invokespecial   net/minecraft/client/gui/components/Button.<init>:(IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   374: invokevirtual   net/minecraft/client/gui/screens/worldselection/EditWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   377: checkcast       Lnet/minecraft/client/gui/components/Button;
+        //   380: putfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.renameButton:Lnet/minecraft/client/gui/components/Button;
+        //   383: aload_0         /* this */
+        //   384: new             Lnet/minecraft/client/gui/components/Button;
+        //   387: dup            
+        //   388: aload_0         /* this */
+        //   389: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.width:I
+        //   392: iconst_2       
+        //   393: idiv           
+        //   394: iconst_2       
+        //   395: iadd           
+        //   396: aload_0         /* this */
+        //   397: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.height:I
+        //   400: iconst_4       
+        //   401: idiv           
+        //   402: sipush          144
+        //   405: iadd           
+        //   406: iconst_5       
+        //   407: iadd           
+        //   408: bipush          98
+        //   410: bipush          20
+        //   412: getstatic       net/minecraft/network/chat/CommonComponents.GUI_CANCEL:Lnet/minecraft/network/chat/Component;
+        //   415: aload_0         /* this */
+        //   416: invokedynamic   BootstrapMethod #7, onPress:(Lnet/minecraft/client/gui/screens/worldselection/EditWorldScreen;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   421: invokespecial   net/minecraft/client/gui/components/Button.<init>:(IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   424: invokevirtual   net/minecraft/client/gui/screens/worldselection/EditWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   427: pop            
+        //   428: aload_1         /* dni2 */
+        //   429: aload_0         /* this */
+        //   430: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.levelAccess:Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;
+        //   433: invokevirtual   net/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess.getIconFile:()Ljava/io/File;
+        //   436: invokevirtual   java/io/File.isFile:()Z
+        //   439: putfield        net/minecraft/client/gui/components/Button.active:Z
+        //   442: aload_0         /* this */
+        //   443: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.levelAccess:Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;
+        //   446: invokevirtual   net/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess.getSummary:()Lnet/minecraft/world/level/storage/LevelSummary;
+        //   449: astore_2        /* daf3 */
+        //   450: aload_2         /* daf3 */
+        //   451: ifnonnull       459
+        //   454: ldc             ""
+        //   456: goto            463
+        //   459: aload_2         /* daf3 */
+        //   460: invokevirtual   net/minecraft/world/level/storage/LevelSummary.getLevelName:()Ljava/lang/String;
+        //   463: astore_3        /* string4 */
+        //   464: aload_0         /* this */
+        //   465: new             Lnet/minecraft/client/gui/components/EditBox;
+        //   468: dup            
+        //   469: aload_0         /* this */
+        //   470: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.font:Lnet/minecraft/client/gui/Font;
+        //   473: aload_0         /* this */
+        //   474: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.width:I
+        //   477: iconst_2       
+        //   478: idiv           
+        //   479: bipush          100
+        //   481: isub           
+        //   482: bipush          38
+        //   484: sipush          200
+        //   487: bipush          20
+        //   489: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   492: dup            
+        //   493: ldc             "selectWorld.enterName"
+        //   495: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   498: invokespecial   net/minecraft/client/gui/components/EditBox.<init>:(Lnet/minecraft/client/gui/Font;IIIILnet/minecraft/network/chat/Component;)V
+        //   501: putfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.nameEdit:Lnet/minecraft/client/gui/components/EditBox;
+        //   504: aload_0         /* this */
+        //   505: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.nameEdit:Lnet/minecraft/client/gui/components/EditBox;
+        //   508: aload_3         /* string4 */
+        //   509: invokevirtual   net/minecraft/client/gui/components/EditBox.setValue:(Ljava/lang/String;)V
+        //   512: aload_0         /* this */
+        //   513: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.nameEdit:Lnet/minecraft/client/gui/components/EditBox;
+        //   516: aload_0         /* this */
+        //   517: invokedynamic   BootstrapMethod #8, accept:(Lnet/minecraft/client/gui/screens/worldselection/EditWorldScreen;)Ljava/util/function/Consumer;
+        //   522: invokevirtual   net/minecraft/client/gui/components/EditBox.setResponder:(Ljava/util/function/Consumer;)V
+        //   525: aload_0         /* this */
+        //   526: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.children:Ljava/util/List;
+        //   529: aload_0         /* this */
+        //   530: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.nameEdit:Lnet/minecraft/client/gui/components/EditBox;
+        //   533: invokeinterface java/util/List.add:(Ljava/lang/Object;)Z
+        //   538: pop            
+        //   539: aload_0         /* this */
+        //   540: aload_0         /* this */
+        //   541: getfield        net/minecraft/client/gui/screens/worldselection/EditWorldScreen.nameEdit:Lnet/minecraft/client/gui/components/EditBox;
+        //   544: invokevirtual   net/minecraft/client/gui/screens/worldselection/EditWorldScreen.setInitialFocus:(Lnet/minecraft/client/gui/components/events/GuiEventListener;)V
+        //   547: return         
+        //    StackMapTable: 00 02 FD 01 CB 00 07 00 D7 FF 00 03 00 01 07 00 02 00 01 07 00 DD
+        // 
+        // The error that occurred was:
+        // 
+        // java.lang.IllegalStateException: Could not infer any expression.
+        //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:374)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.run(TypeAnalysis.java:96)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:344)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:42)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:214)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
+        //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
+        //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
+        //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
+        //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
+        //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
+        //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
+        //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
+        //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
+        //     at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
+        //     at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
+        //     at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:177)
+        // 
+        throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
     @Override
-    public void resize(final Minecraft dbn, final int integer2, final int integer3) {
+    public void resize(final Minecraft dlx, final int integer2, final int integer3) {
         final String string5 = this.nameEdit.getValue();
-        this.init(dbn, integer2, integer3);
+        this.init(dlx, integer2, integer3);
         this.nameEdit.setValue(string5);
     }
     
+    @Override
+    public void onClose() {
+        this.callback.accept(false);
+    }
+    
     @Override
     public void removed() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(false);
     }
     
     private void onRename() {
-        final LevelStorageSource crp2 = this.minecraft.getLevelSource();
-        crp2.renameLevel(this.levelId, this.nameEdit.getValue().trim());
-        this.callback.accept(true);
+        try {
+            this.levelAccess.renameLevel(this.nameEdit.getValue().trim());
+            this.callback.accept(true);
+        }
+        catch (IOException iOException2) {
+            EditWorldScreen.LOGGER.error("Failed to access world '{}'", this.levelAccess.getLevelId(), iOException2);
+            SystemToast.onWorldAccessFailure(this.minecraft, this.levelAccess.getLevelId());
+            this.callback.accept(true);
+        }
     }
     
-    public static void makeBackupAndShowToast(final LevelStorageSource crp, final String string) {
-        final ToastComponent deb3 = Minecraft.getInstance().getToasts();
-        long long4 = 0L;
-        IOException iOException6 = null;
+    public static void makeBackupAndShowToast(final LevelStorageSource dae, final String string) {
+        boolean boolean3 = false;
+        try (final LevelStorageSource.LevelStorageAccess a4 = dae.createAccess(string)) {
+            boolean3 = true;
+            makeBackupAndShowToast(a4);
+        }
+        catch (IOException iOException4) {
+            if (!boolean3) {
+                SystemToast.onWorldAccessFailure(Minecraft.getInstance(), string);
+            }
+            EditWorldScreen.LOGGER.warn("Failed to create backup of level {}", string, iOException4);
+        }
+    }
+    
+    public static boolean makeBackupAndShowToast(final LevelStorageSource.LevelStorageAccess a) {
+        long long2 = 0L;
+        IOException iOException4 = null;
         try {
-            long4 = crp.makeWorldBackup(string);
+            long2 = a.makeWorldBackup();
         }
-        catch (IOException iOException7) {
-            iOException6 = iOException7;
+        catch (IOException iOException5) {
+            iOException4 = iOException5;
         }
-        Component lf7;
-        Component lf8;
-        if (iOException6 != null) {
-            lf7 = new TranslatableComponent("selectWorld.edit.backupFailed", new Object[0]);
-            lf8 = new TextComponent(iOException6.getMessage());
+        if (iOException4 != null) {
+            final Component mr5 = new TranslatableComponent("selectWorld.edit.backupFailed");
+            final Component mr6 = new TextComponent(iOException4.getMessage());
+            Minecraft.getInstance().getToasts().addToast(new SystemToast(SystemToast.SystemToastIds.WORLD_BACKUP, mr5, mr6));
+            return false;
         }
-        else {
-            lf7 = new TranslatableComponent("selectWorld.edit.backupCreated", new Object[] { string });
-            lf8 = new TranslatableComponent("selectWorld.edit.backupSize", new Object[] { Mth.ceil(long4 / 1048576.0) });
-        }
-        deb3.addToast(new SystemToast(SystemToast.SystemToastIds.WORLD_BACKUP, lf7, lf8));
+        final Component mr5 = new TranslatableComponent("selectWorld.edit.backupCreated", new Object[] { a.getLevelId() });
+        final Component mr6 = new TranslatableComponent("selectWorld.edit.backupSize", new Object[] { Mth.ceil(long2 / 1048576.0) });
+        Minecraft.getInstance().getToasts().addToast(new SystemToast(SystemToast.SystemToastIds.WORLD_BACKUP, mr5, mr6));
+        return true;
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 20, 16777215);
-        this.drawString(this.font, I18n.get("selectWorld.enterName"), this.width / 2 - 100, 40, 10526880);
-        this.nameEdit.render(integer1, integer2, float3);
-        super.render(integer1, integer2, float3);
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 15, 16777215);
+        this.drawString(dhl, this.font, I18n.get("selectWorld.enterName"), this.width / 2 - 100, 24, 10526880);
+        this.nameEdit.render(dhl, integer2, integer3, float4);
+        super.render(dhl, integer2, integer3, float4);
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+        WORLD_GEN_SETTINGS_GSON = new GsonBuilder().setPrettyPrinting().serializeNulls().disableHtmlEscaping().create();
     }
 }
diff --git a/src/net/minecraft/client/gui/screens/worldselection/OptimizeWorldScreen.java b/src/net/minecraft/client/gui/screens/worldselection/OptimizeWorldScreen.java
index f35688a..31083da 100644
--- a/src/net/minecraft/client/gui/screens/worldselection/OptimizeWorldScreen.java
+++ b/src/net/minecraft/client/gui/screens/worldselection/OptimizeWorldScreen.java
@@ -2,37 +2,69 @@ package net.minecraft.client.gui.screens.worldselection;
 
 import it.unimi.dsi.fastutil.Hash;
 import net.minecraft.Util;
+import org.apache.logging.log4j.LogManager;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenCustomHashMap;
-import java.util.Iterator;
+import com.google.common.collect.UnmodifiableIterator;
 import net.minecraft.client.gui.Font;
 import net.minecraft.util.Mth;
-import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.network.chat.FormattedText;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.world.level.LevelSettings;
+import javax.annotation.Nullable;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.level.storage.WorldData;
+import net.minecraft.world.level.DataPackConfig;
+import net.minecraft.server.packs.resources.ResourceManager;
+import com.mojang.datafixers.util.Function4;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.world.level.storage.LevelStorageSource;
+import com.mojang.datafixers.DataFixer;
+import net.minecraft.client.Minecraft;
 import net.minecraft.util.worldupdate.WorldUpgrader;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import org.apache.logging.log4j.Logger;
 import net.minecraft.client.gui.screens.Screen;
 
 public class OptimizeWorldScreen extends Screen {
-    private static final Object2IntMap<DimensionType> DIMENSION_COLORS;
+    private static final Logger LOGGER;
+    private static final Object2IntMap<ResourceKey<Level>> DIMENSION_COLORS;
     private final BooleanConsumer callback;
     private final WorldUpgrader upgrader;
     
-    public OptimizeWorldScreen(final BooleanConsumer booleanConsumer, final String string, final LevelStorageSource crp, final boolean boolean4) {
-        super(new TranslatableComponent("optimizeWorld.title", new Object[] { crp.getDataTagFor(string).getLevelName() }));
+    @Nullable
+    public static OptimizeWorldScreen create(final Minecraft dlx, final BooleanConsumer booleanConsumer, final DataFixer dataFixer, final LevelStorageSource.LevelStorageAccess a, final boolean boolean5) {
+        final RegistryAccess.RegistryHolder a2 = RegistryAccess.builtin();
+        try (final Minecraft.ServerStem b7 = dlx.makeServerStem(a2, Minecraft::loadDataPacks, (Function4<LevelStorageSource.LevelStorageAccess, RegistryAccess.RegistryHolder, ResourceManager, DataPackConfig, WorldData>)Minecraft::loadWorldData, false, a)) {
+            final WorldData dal9 = b7.worldData();
+            a.saveDataTag(a2, dal9);
+            final ImmutableSet<ResourceKey<Level>> immutableSet10 = dal9.worldGenSettings().levels();
+            return new OptimizeWorldScreen(booleanConsumer, dataFixer, a, dal9.getLevelSettings(), boolean5, immutableSet10);
+        }
+        catch (Exception exception7) {
+            OptimizeWorldScreen.LOGGER.warn("Failed to load datapacks, can't optimize world", (Throwable)exception7);
+            return null;
+        }
+    }
+    
+    private OptimizeWorldScreen(final BooleanConsumer booleanConsumer, final DataFixer dataFixer, final LevelStorageSource.LevelStorageAccess a, final LevelSettings bqe, final boolean boolean5, final ImmutableSet<ResourceKey<Level>> immutableSet) {
+        super(new TranslatableComponent("optimizeWorld.title", new Object[] { bqe.levelName() }));
         this.callback = booleanConsumer;
-        this.upgrader = new WorldUpgrader(string, crp, crp.getDataTagFor(string), boolean4);
+        this.upgrader = new WorldUpgrader(a, dataFixer, immutableSet, boolean5);
     }
     
     @Override
     protected void init() {
         super.init();
-        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 150, 200, 20, I18n.get("gui.cancel"), dcv -> {
+        this.<Button>addButton(new Button(this.width / 2 - 100, this.height / 4 + 150, 200, 20, CommonComponents.GUI_CANCEL, dni -> {
             this.upgrader.cancel();
             this.callback.accept(false);
         }));
@@ -45,69 +77,75 @@ public class OptimizeWorldScreen extends Screen {
         }
     }
     
+    @Override
+    public void onClose() {
+        this.callback.accept(false);
+    }
+    
     @Override
     public void removed() {
         this.upgrader.cancel();
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 20, 16777215);
-        final int integer3 = this.width / 2 - 150;
-        final int integer4 = this.width / 2 + 150;
-        final int integer5 = this.height / 4 + 100;
-        final int integer6 = integer5 + 10;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 20, 16777215);
+        final int integer4 = this.width / 2 - 150;
+        final int integer5 = this.width / 2 + 150;
+        final int integer6 = this.height / 4 + 100;
+        final int integer7 = integer6 + 10;
         final Font font = this.font;
-        final String coloredString = this.upgrader.getStatus().getColoredString();
-        final int integer10 = this.width / 2;
-        final int n = integer5;
+        final Component status = this.upgrader.getStatus();
+        final int integer11 = this.width / 2;
+        final int n = integer6;
         this.font.getClass();
-        this.drawCenteredString(font, coloredString, integer10, n - 9 - 2, 10526880);
+        this.drawCenteredString(dhl, font, status, integer11, n - 9 - 2, 10526880);
         if (this.upgrader.getTotalChunks() > 0) {
-            GuiComponent.fill(integer3 - 1, integer5 - 1, integer4 + 1, integer6 + 1, -16777216);
-            this.drawString(this.font, I18n.get("optimizeWorld.info.converted", this.upgrader.getConverted()), integer3, 40, 10526880);
+            GuiComponent.fill(dhl, integer4 - 1, integer6 - 1, integer5 + 1, integer7 + 1, -16777216);
+            this.drawString(dhl, this.font, I18n.get("optimizeWorld.info.converted", this.upgrader.getConverted()), integer4, 40, 10526880);
             final Font font2 = this.font;
             final String value = I18n.get("optimizeWorld.info.skipped", this.upgrader.getSkipped());
-            final int integer11 = integer3;
+            final int integer12 = integer4;
             final int n2 = 40;
             this.font.getClass();
-            this.drawString(font2, value, integer11, n2 + 9 + 3, 10526880);
+            this.drawString(dhl, font2, value, integer12, n2 + 9 + 3, 10526880);
             final Font font3 = this.font;
             final String value2 = I18n.get("optimizeWorld.info.total", this.upgrader.getTotalChunks());
-            final int integer12 = integer3;
+            final int integer13 = integer4;
             final int n3 = 40;
             this.font.getClass();
-            this.drawString(font3, value2, integer12, n3 + (9 + 3) * 2, 10526880);
-            int integer7 = 0;
-            for (final DimensionType cbi11 : DimensionType.getAllTypes()) {
-                final int integer8 = Mth.floor(this.upgrader.dimensionProgress(cbi11) * (integer4 - integer3));
-                GuiComponent.fill(integer3 + integer7, integer5, integer3 + integer7 + integer8, integer6, OptimizeWorldScreen.DIMENSION_COLORS.getInt(cbi11));
-                integer7 += integer8;
+            this.drawString(dhl, font3, value2, integer13, n3 + (9 + 3) * 2, 10526880);
+            int integer8 = 0;
+            for (final ResourceKey<Level> ug12 : this.upgrader.levels()) {
+                final int integer9 = Mth.floor(this.upgrader.dimensionProgress(ug12) * (integer5 - integer4));
+                GuiComponent.fill(dhl, integer4 + integer8, integer6, integer4 + integer8 + integer9, integer7, OptimizeWorldScreen.DIMENSION_COLORS.getInt(ug12));
+                integer8 += integer9;
             }
-            final int integer9 = this.upgrader.getConverted() + this.upgrader.getSkipped();
+            final int integer10 = this.upgrader.getConverted() + this.upgrader.getSkipped();
             final Font font4 = this.font;
-            final String string = integer9 + " / " + this.upgrader.getTotalChunks();
-            final int integer13 = this.width / 2;
-            final int n4 = integer5;
+            final String string = integer10 + " / " + this.upgrader.getTotalChunks();
+            final int integer14 = this.width / 2;
+            final int n4 = integer6;
             final int n5 = 2;
             this.font.getClass();
-            this.drawCenteredString(font4, string, integer13, n4 + n5 * 9 + 2, 10526880);
+            this.drawCenteredString(dhl, font4, string, integer14, n4 + n5 * 9 + 2, 10526880);
             final Font font5 = this.font;
             final String string2 = Mth.floor(this.upgrader.getProgress() * 100.0f) + "%";
-            final int integer14 = this.width / 2;
-            final int n6 = integer5 + (integer6 - integer5) / 2;
+            final int integer15 = this.width / 2;
+            final int n6 = integer6 + (integer7 - integer6) / 2;
             this.font.getClass();
-            this.drawCenteredString(font5, string2, integer14, n6 - 9 / 2, 10526880);
+            this.drawCenteredString(dhl, font5, string2, integer15, n6 - 9 / 2, 10526880);
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
     
     static {
+        LOGGER = LogManager.getLogger();
         DIMENSION_COLORS = Util.<Object2IntMap>make((Object2IntMap)new Object2IntOpenCustomHashMap((Hash.Strategy)Util.identityStrategy()), object2IntOpenCustomHashMap -> {
-            object2IntOpenCustomHashMap.put(DimensionType.OVERWORLD, -13408734);
-            object2IntOpenCustomHashMap.put(DimensionType.NETHER, -10075085);
-            object2IntOpenCustomHashMap.put(DimensionType.THE_END, -8943531);
+            object2IntOpenCustomHashMap.put(Level.OVERWORLD, -13408734);
+            object2IntOpenCustomHashMap.put(Level.NETHER, -10075085);
+            object2IntOpenCustomHashMap.put(Level.END, -8943531);
             object2IntOpenCustomHashMap.defaultReturnValue(-2236963);
         });
     }
diff --git a/src/net/minecraft/client/gui/screens/worldselection/SelectWorldScreen.java b/src/net/minecraft/client/gui/screens/worldselection/SelectWorldScreen.java
index 01a7af2..16e3f4f 100644
--- a/src/net/minecraft/client/gui/screens/worldselection/SelectWorldScreen.java
+++ b/src/net/minecraft/client/gui/screens/worldselection/SelectWorldScreen.java
@@ -1,19 +1,19 @@
 package net.minecraft.client.gui.screens.worldselection;
 
-import java.util.List;
-import com.google.common.collect.Lists;
-import com.google.common.base.Splitter;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.FormattedText;
+import java.util.List;
 import net.minecraft.client.gui.screens.Screen;
 
 public class SelectWorldScreen extends Screen {
     protected final Screen lastScreen;
-    private String toolTip;
+    private List<FormattedText> toolTip;
     private Button deleteButton;
     private Button selectButton;
     private Button renameButton;
@@ -21,9 +21,9 @@ public class SelectWorldScreen extends Screen {
     protected EditBox searchBox;
     private WorldSelectionList list;
     
-    public SelectWorldScreen(final Screen dgb) {
-        super(new TranslatableComponent("selectWorld.title", new Object[0]));
-        this.lastScreen = dgb;
+    public SelectWorldScreen(final Screen dqs) {
+        super(new TranslatableComponent("selectWorld.title"));
+        this.lastScreen = dqs;
     }
     
     @Override
@@ -39,16 +39,16 @@ public class SelectWorldScreen extends Screen {
     @Override
     protected void init() {
         this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
-        (this.searchBox = new EditBox(this.font, this.width / 2 - 100, 22, 200, 20, this.searchBox, I18n.get("selectWorld.search"))).setResponder(string -> this.list.refreshList(() -> string, false));
+        (this.searchBox = new EditBox(this.font, this.width / 2 - 100, 22, 200, 20, this.searchBox, new TranslatableComponent("selectWorld.search"))).setResponder(string -> this.list.refreshList(() -> string, false));
         this.list = new WorldSelectionList(this, this.minecraft, this.width, this.height, 48, this.height - 64, 36, () -> this.searchBox.getValue(), this.list);
         this.children.add(this.searchBox);
         this.children.add(this.list);
-        this.selectButton = this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 52, 150, 20, I18n.get("selectWorld.select"), dcv -> this.list.getSelectedOpt().ifPresent(WorldSelectionList.WorldListEntry::joinWorld)));
-        this.<Button>addButton(new Button(this.width / 2 + 4, this.height - 52, 150, 20, I18n.get("selectWorld.create"), dcv -> this.minecraft.setScreen(new CreateWorldScreen(this))));
-        this.renameButton = this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 28, 72, 20, I18n.get("selectWorld.edit"), dcv -> this.list.getSelectedOpt().ifPresent(WorldSelectionList.WorldListEntry::editWorld)));
-        this.deleteButton = this.<Button>addButton(new Button(this.width / 2 - 76, this.height - 28, 72, 20, I18n.get("selectWorld.delete"), dcv -> this.list.getSelectedOpt().ifPresent(WorldSelectionList.WorldListEntry::deleteWorld)));
-        this.copyButton = this.<Button>addButton(new Button(this.width / 2 + 4, this.height - 28, 72, 20, I18n.get("selectWorld.recreate"), dcv -> this.list.getSelectedOpt().ifPresent(WorldSelectionList.WorldListEntry::recreateWorld)));
-        this.<Button>addButton(new Button(this.width / 2 + 82, this.height - 28, 72, 20, I18n.get("gui.cancel"), dcv -> this.minecraft.setScreen(this.lastScreen)));
+        this.selectButton = this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 52, 150, 20, new TranslatableComponent("selectWorld.select"), dni -> this.list.getSelectedOpt().ifPresent(WorldSelectionList.WorldListEntry::joinWorld)));
+        this.<Button>addButton(new Button(this.width / 2 + 4, this.height - 52, 150, 20, new TranslatableComponent("selectWorld.create"), dni -> this.minecraft.setScreen(new CreateWorldScreen(this))));
+        this.renameButton = this.<Button>addButton(new Button(this.width / 2 - 154, this.height - 28, 72, 20, new TranslatableComponent("selectWorld.edit"), dni -> this.list.getSelectedOpt().ifPresent(WorldSelectionList.WorldListEntry::editWorld)));
+        this.deleteButton = this.<Button>addButton(new Button(this.width / 2 - 76, this.height - 28, 72, 20, new TranslatableComponent("selectWorld.delete"), dni -> this.list.getSelectedOpt().ifPresent(WorldSelectionList.WorldListEntry::deleteWorld)));
+        this.copyButton = this.<Button>addButton(new Button(this.width / 2 + 4, this.height - 28, 72, 20, new TranslatableComponent("selectWorld.recreate"), dni -> this.list.getSelectedOpt().ifPresent(WorldSelectionList.WorldListEntry::recreateWorld)));
+        this.<Button>addButton(new Button(this.width / 2 + 82, this.height - 28, 72, 20, CommonComponents.GUI_CANCEL, dni -> this.minecraft.setScreen(this.lastScreen)));
         this.updateButtonStatus(false);
         this.setInitialFocus(this.searchBox);
     }
@@ -69,19 +69,19 @@ public class SelectWorldScreen extends Screen {
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
         this.toolTip = null;
-        this.list.render(integer1, integer2, float3);
-        this.searchBox.render(integer1, integer2, float3);
-        this.drawCenteredString(this.font, this.title.getColoredString(), this.width / 2, 8, 16777215);
-        super.render(integer1, integer2, float3);
+        this.list.render(dhl, integer2, integer3, float4);
+        this.searchBox.render(dhl, integer2, integer3, float4);
+        this.drawCenteredString(dhl, this.font, this.title, this.width / 2, 8, 16777215);
+        super.render(dhl, integer2, integer3, float4);
         if (this.toolTip != null) {
-            this.renderTooltip(Lists.newArrayList(Splitter.on("\n").split(this.toolTip)), integer1, integer2);
+            this.renderTooltip(dhl, this.toolTip, integer2, integer3);
         }
     }
     
-    public void setToolTip(final String string) {
-        this.toolTip = string;
+    public void setToolTip(final List<FormattedText> list) {
+        this.toolTip = list;
     }
     
     public void updateButtonStatus(final boolean boolean1) {
diff --git a/src/net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.java b/src/net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.java
new file mode 100644
index 0000000..6412d61
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.java
@@ -0,0 +1,417 @@
+package net.minecraft.client.gui.screens.worldselection;
+
+import org.apache.logging.log4j.LogManager;
+import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
+import java.io.BufferedReader;
+import java.util.concurrent.CompletableFuture;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.ConfirmScreen;
+import com.mojang.serialization.Lifecycle;
+import java.util.function.Consumer;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.JsonIOException;
+import java.io.IOException;
+import com.mojang.serialization.DataResult;
+import java.io.Reader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import com.google.gson.JsonParser;
+import com.mojang.serialization.DynamicOps;
+import com.google.gson.JsonElement;
+import net.minecraft.resources.RegistryReadOps;
+import com.mojang.serialization.JsonOps;
+import java.util.concurrent.ExecutionException;
+import net.minecraft.client.gui.components.toasts.Toast;
+import net.minecraft.client.gui.components.toasts.SystemToast;
+import net.minecraft.network.chat.TextComponent;
+import java.util.concurrent.Executor;
+import net.minecraft.server.ServerResources;
+import net.minecraft.Util;
+import net.minecraft.commands.Commands;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.server.packs.repository.FolderRepositorySource;
+import net.minecraft.server.packs.repository.PackSource;
+import net.minecraft.server.packs.repository.ServerPacksSource;
+import net.minecraft.server.packs.repository.RepositorySource;
+import net.minecraft.server.packs.repository.Pack;
+import org.lwjgl.PointerBuffer;
+import org.lwjgl.util.tinyfd.TinyFileDialogs;
+import net.minecraft.network.chat.TranslatableComponent;
+import org.apache.commons.lang3.StringUtils;
+import java.util.OptionalLong;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.client.resources.language.I18n;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import java.util.Optional;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.Font;
+import net.minecraft.network.chat.Component;
+import org.apache.logging.log4j.Logger;
+import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.TickableWidget;
+
+public class WorldGenSettingsComponent implements TickableWidget, Widget {
+    private static final Logger LOGGER;
+    private static final Component CUSTOM_WORLD_DESCRIPTION;
+    private static final Component AMPLIFIED_HELP_TEXT;
+    private Font font;
+    private int width;
+    private EditBox seedEdit;
+    private Button featuresButton;
+    public Button bonusItemsButton;
+    private Button typeButton;
+    private Button customizeTypeButton;
+    private Button importSettingsButton;
+    private RegistryAccess.RegistryHolder registryHolder;
+    private WorldGenSettings settings;
+    private Optional<WorldPreset> preset;
+    private String initSeed;
+    
+    public WorldGenSettingsComponent() {
+        this.registryHolder = RegistryAccess.builtin();
+        this.settings = WorldGenSettings.makeDefault();
+        this.preset = Optional.<WorldPreset>of(WorldPreset.NORMAL);
+        this.initSeed = "";
+    }
+    
+    public WorldGenSettingsComponent(final RegistryAccess.RegistryHolder a, final WorldGenSettings cix) {
+        this.registryHolder = a;
+        this.settings = cix;
+        this.preset = WorldPreset.of(cix);
+        this.initSeed = Long.toString(cix.seed());
+    }
+    
+    public void init(final CreateWorldScreen dty, final Minecraft dlx, final Font dmt) {
+        // 
+        // This method could not be decompiled.
+        // 
+        // Original Bytecode:
+        // 
+        //     1: aload_3         /* dmt */
+        //     2: putfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.font:Lnet/minecraft/client/gui/Font;
+        //     5: aload_0         /* this */
+        //     6: aload_1         /* dty */
+        //     7: getfield        net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.width:I
+        //    10: putfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.width:I
+        //    13: aload_0         /* this */
+        //    14: new             Lnet/minecraft/client/gui/components/EditBox;
+        //    17: dup            
+        //    18: aload_0         /* this */
+        //    19: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.font:Lnet/minecraft/client/gui/Font;
+        //    22: aload_0         /* this */
+        //    23: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.width:I
+        //    26: iconst_2       
+        //    27: idiv           
+        //    28: bipush          100
+        //    30: isub           
+        //    31: bipush          60
+        //    33: sipush          200
+        //    36: bipush          20
+        //    38: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //    41: dup            
+        //    42: ldc             "selectWorld.enterSeed"
+        //    44: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //    47: invokespecial   net/minecraft/client/gui/components/EditBox.<init>:(Lnet/minecraft/client/gui/Font;IIIILnet/minecraft/network/chat/Component;)V
+        //    50: putfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.seedEdit:Lnet/minecraft/client/gui/components/EditBox;
+        //    53: aload_0         /* this */
+        //    54: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.seedEdit:Lnet/minecraft/client/gui/components/EditBox;
+        //    57: aload_0         /* this */
+        //    58: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.initSeed:Ljava/lang/String;
+        //    61: invokevirtual   net/minecraft/client/gui/components/EditBox.setValue:(Ljava/lang/String;)V
+        //    64: aload_0         /* this */
+        //    65: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.seedEdit:Lnet/minecraft/client/gui/components/EditBox;
+        //    68: aload_0         /* this */
+        //    69: invokedynamic   BootstrapMethod #0, accept:(Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent;)Ljava/util/function/Consumer;
+        //    74: invokevirtual   net/minecraft/client/gui/components/EditBox.setResponder:(Ljava/util/function/Consumer;)V
+        //    77: aload_1         /* dty */
+        //    78: aload_0         /* this */
+        //    79: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.seedEdit:Lnet/minecraft/client/gui/components/EditBox;
+        //    82: invokevirtual   net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.addWidget:(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
+        //    85: pop            
+        //    86: aload_0         /* this */
+        //    87: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.width:I
+        //    90: iconst_2       
+        //    91: idiv           
+        //    92: sipush          155
+        //    95: isub           
+        //    96: istore          integer5
+        //    98: aload_0         /* this */
+        //    99: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.width:I
+        //   102: iconst_2       
+        //   103: idiv           
+        //   104: iconst_5       
+        //   105: iadd           
+        //   106: istore          integer6
+        //   108: aload_0         /* this */
+        //   109: aload_1         /* dty */
+        //   110: new             Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent$1;
+        //   113: dup            
+        //   114: aload_0         /* this */
+        //   115: iload           integer5
+        //   117: bipush          100
+        //   119: sipush          150
+        //   122: bipush          20
+        //   124: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   127: dup            
+        //   128: ldc             "selectWorld.mapFeatures"
+        //   130: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   133: aload_0         /* this */
+        //   134: invokedynamic   BootstrapMethod #1, onPress:(Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   139: invokespecial   net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent$1.<init>:(Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent;IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   142: invokevirtual   net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   145: checkcast       Lnet/minecraft/client/gui/components/Button;
+        //   148: putfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.featuresButton:Lnet/minecraft/client/gui/components/Button;
+        //   151: aload_0         /* this */
+        //   152: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.featuresButton:Lnet/minecraft/client/gui/components/Button;
+        //   155: iconst_0       
+        //   156: putfield        net/minecraft/client/gui/components/Button.visible:Z
+        //   159: aload_0         /* this */
+        //   160: aload_1         /* dty */
+        //   161: new             Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent$2;
+        //   164: dup            
+        //   165: aload_0         /* this */
+        //   166: iload           integer6
+        //   168: bipush          100
+        //   170: sipush          150
+        //   173: bipush          20
+        //   175: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   178: dup            
+        //   179: ldc             "selectWorld.mapType"
+        //   181: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   184: aload_0         /* this */
+        //   185: aload_1         /* dty */
+        //   186: invokedynamic   BootstrapMethod #2, onPress:(Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   191: invokespecial   net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent$2.<init>:(Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent;IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   194: invokevirtual   net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   197: checkcast       Lnet/minecraft/client/gui/components/Button;
+        //   200: putfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.typeButton:Lnet/minecraft/client/gui/components/Button;
+        //   203: aload_0         /* this */
+        //   204: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.typeButton:Lnet/minecraft/client/gui/components/Button;
+        //   207: iconst_0       
+        //   208: putfield        net/minecraft/client/gui/components/Button.visible:Z
+        //   211: aload_0         /* this */
+        //   212: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.typeButton:Lnet/minecraft/client/gui/components/Button;
+        //   215: aload_0         /* this */
+        //   216: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.preset:Ljava/util/Optional;
+        //   219: invokevirtual   java/util/Optional.isPresent:()Z
+        //   222: putfield        net/minecraft/client/gui/components/Button.active:Z
+        //   225: aload_0         /* this */
+        //   226: aload_1         /* dty */
+        //   227: new             Lnet/minecraft/client/gui/components/Button;
+        //   230: dup            
+        //   231: iload           integer6
+        //   233: bipush          120
+        //   235: sipush          150
+        //   238: bipush          20
+        //   240: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   243: dup            
+        //   244: ldc             "selectWorld.customizeType"
+        //   246: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   249: aload_0         /* this */
+        //   250: aload_2         /* dlx */
+        //   251: aload_1         /* dty */
+        //   252: invokedynamic   BootstrapMethod #3, onPress:(Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent;Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   257: invokespecial   net/minecraft/client/gui/components/Button.<init>:(IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   260: invokevirtual   net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   263: checkcast       Lnet/minecraft/client/gui/components/Button;
+        //   266: putfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.customizeTypeButton:Lnet/minecraft/client/gui/components/Button;
+        //   269: aload_0         /* this */
+        //   270: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.customizeTypeButton:Lnet/minecraft/client/gui/components/Button;
+        //   273: iconst_0       
+        //   274: putfield        net/minecraft/client/gui/components/Button.visible:Z
+        //   277: aload_0         /* this */
+        //   278: aload_1         /* dty */
+        //   279: new             Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent$3;
+        //   282: dup            
+        //   283: aload_0         /* this */
+        //   284: iload           integer5
+        //   286: sipush          151
+        //   289: sipush          150
+        //   292: bipush          20
+        //   294: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   297: dup            
+        //   298: ldc             "selectWorld.bonusItems"
+        //   300: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   303: aload_0         /* this */
+        //   304: invokedynamic   BootstrapMethod #4, onPress:(Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   309: aload_1         /* dty */
+        //   310: invokespecial   net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent$3.<init>:(Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent;IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;)V
+        //   313: invokevirtual   net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   316: checkcast       Lnet/minecraft/client/gui/components/Button;
+        //   319: putfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.bonusItemsButton:Lnet/minecraft/client/gui/components/Button;
+        //   322: aload_0         /* this */
+        //   323: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.bonusItemsButton:Lnet/minecraft/client/gui/components/Button;
+        //   326: iconst_0       
+        //   327: putfield        net/minecraft/client/gui/components/Button.visible:Z
+        //   330: aload_0         /* this */
+        //   331: aload_1         /* dty */
+        //   332: new             Lnet/minecraft/client/gui/components/Button;
+        //   335: dup            
+        //   336: iload           integer5
+        //   338: sipush          185
+        //   341: sipush          150
+        //   344: bipush          20
+        //   346: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   349: dup            
+        //   350: ldc_w           "selectWorld.import_worldgen_settings"
+        //   353: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   356: aload_0         /* this */
+        //   357: aload_1         /* dty */
+        //   358: aload_2         /* dlx */
+        //   359: invokedynamic   BootstrapMethod #5, onPress:(Lnet/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;Lnet/minecraft/client/Minecraft;)Lnet/minecraft/client/gui/components/Button$OnPress;
+        //   364: invokespecial   net/minecraft/client/gui/components/Button.<init>:(IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button$OnPress;)V
+        //   367: invokevirtual   net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.addButton:(Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
+        //   370: checkcast       Lnet/minecraft/client/gui/components/Button;
+        //   373: putfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.importSettingsButton:Lnet/minecraft/client/gui/components/Button;
+        //   376: aload_0         /* this */
+        //   377: getfield        net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent.importSettingsButton:Lnet/minecraft/client/gui/components/Button;
+        //   380: iconst_0       
+        //   381: putfield        net/minecraft/client/gui/components/Button.visible:Z
+        //   384: return         
+        //    MethodParameters:
+        //  Name  Flags  
+        //  ----  -----
+        //  dty   
+        //  dlx   
+        //  dmt   
+        // 
+        // The error that occurred was:
+        // 
+        // java.lang.IllegalStateException: Unsupported node type: com.strobel.decompiler.ast.Lambda
+        //     at com.strobel.decompiler.ast.Error.unsupportedNode(Error.java:32)
+        //     at com.strobel.decompiler.ast.GotoRemoval.exit(GotoRemoval.java:612)
+        //     at com.strobel.decompiler.ast.GotoRemoval.exit(GotoRemoval.java:586)
+        //     at com.strobel.decompiler.ast.GotoRemoval.transformLeaveStatements(GotoRemoval.java:625)
+        //     at com.strobel.decompiler.ast.GotoRemoval.removeGotosCore(GotoRemoval.java:57)
+        //     at com.strobel.decompiler.ast.GotoRemoval.removeGotos(GotoRemoval.java:53)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:276)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:42)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:214)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
+        //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
+        //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
+        //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
+        //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
+        //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
+        //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
+        //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
+        //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.helpCC(ForkJoinPool.java:1115)
+        //     at java.base/java.util.concurrent.ForkJoinPool.externalHelpComplete(ForkJoinPool.java:1957)
+        //     at java.base/java.util.concurrent.ForkJoinTask.tryExternalHelp(ForkJoinTask.java:378)
+        //     at java.base/java.util.concurrent.ForkJoinTask.externalAwaitDone(ForkJoinTask.java:323)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doInvoke(ForkJoinTask.java:412)
+        //     at java.base/java.util.concurrent.ForkJoinTask.invoke(ForkJoinTask.java:736)
+        //     at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateParallel(ReduceOps.java:919)
+        //     at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:233)
+        //     at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:578)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompile(EnigmaProject.java:233)
+        //     at cuchaz.enigma.command.DecompileCommand.run(DecompileCommand.java:35)
+        //     at cuchaz.enigma.CommandMain.main(CommandMain.java:43)
+        // 
+        throw new IllegalStateException("An error occurred while decompiling this method.");
+    }
+    
+    private void importSettings(final RegistryAccess.RegistryHolder a, final WorldGenSettings cix) {
+        this.registryHolder = a;
+        this.settings = cix;
+        this.preset = WorldPreset.of(cix);
+        this.initSeed = Long.toString(cix.seed());
+        this.seedEdit.setValue(this.initSeed);
+        this.typeButton.active = this.preset.isPresent();
+    }
+    
+    @Override
+    public void tick() {
+        this.seedEdit.tick();
+    }
+    
+    @Override
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        if (this.featuresButton.visible) {
+            this.font.drawShadow(dhl, I18n.get("selectWorld.mapFeatures.info"), (float)(this.width / 2 - 150), 122.0f, -6250336);
+        }
+        this.seedEdit.render(dhl, integer2, integer3, float4);
+        if (this.preset.equals(Optional.<WorldPreset>of(WorldPreset.AMPLIFIED))) {
+            this.font.drawWordWrap(WorldGenSettingsComponent.AMPLIFIED_HELP_TEXT, this.typeButton.x + 2, this.typeButton.y + 22, this.typeButton.getWidth(), 10526880);
+        }
+    }
+    
+    protected void updateSettings(final WorldGenSettings cix) {
+        this.settings = cix;
+    }
+    
+    private static OptionalLong parseLong(final String string) {
+        try {
+            return OptionalLong.of(Long.parseLong(string));
+        }
+        catch (NumberFormatException ex) {
+            return OptionalLong.empty();
+        }
+    }
+    
+    public WorldGenSettings makeSettings(final boolean boolean1) {
+        final String string3 = this.seedEdit.getValue();
+        OptionalLong optionalLong4;
+        if (StringUtils.isEmpty((CharSequence)string3)) {
+            optionalLong4 = OptionalLong.empty();
+        }
+        else {
+            final OptionalLong optionalLong5 = parseLong(string3);
+            if (optionalLong5.isPresent() && optionalLong5.getAsLong() != 0L) {
+                optionalLong4 = optionalLong5;
+            }
+            else {
+                optionalLong4 = OptionalLong.of(string3.hashCode());
+            }
+        }
+        return this.settings.withSeed(boolean1, optionalLong4);
+    }
+    
+    public boolean isDebug() {
+        return this.settings.isDebug();
+    }
+    
+    public void setDisplayOptions(final boolean boolean1) {
+        this.typeButton.visible = boolean1;
+        if (this.settings.isDebug()) {
+            this.featuresButton.visible = false;
+            this.bonusItemsButton.visible = false;
+            this.customizeTypeButton.visible = false;
+            this.importSettingsButton.visible = false;
+        }
+        else {
+            this.featuresButton.visible = boolean1;
+            this.bonusItemsButton.visible = boolean1;
+            this.customizeTypeButton.visible = (boolean1 && WorldPreset.EDITORS.containsKey(this.preset));
+            this.importSettingsButton.visible = boolean1;
+        }
+        this.seedEdit.setVisible(boolean1);
+    }
+    
+    public RegistryAccess.RegistryHolder registryHolder() {
+        return this.registryHolder;
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+        CUSTOM_WORLD_DESCRIPTION = new TranslatableComponent("generator.custom");
+        AMPLIFIED_HELP_TEXT = new TranslatableComponent("generator.amplified.info");
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/worldselection/WorldPreset.java b/src/net/minecraft/client/gui/screens/worldselection/WorldPreset.java
new file mode 100644
index 0000000..45cbc00
--- /dev/null
+++ b/src/net/minecraft/client/gui/screens/worldselection/WorldPreset.java
@@ -0,0 +1,159 @@
+package net.minecraft.client.gui.screens.worldselection;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import net.minecraft.world.level.biome.OverworldBiomeSource;
+import net.minecraft.client.gui.screens.CreateFlatWorldScreen;
+import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
+import net.minecraft.client.gui.screens.CreateBuffetWorldScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.level.levelgen.DebugLevelSource;
+import net.minecraft.world.level.levelgen.FlatLevelSource;
+import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
+import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
+import net.minecraft.world.level.biome.FixedBiomeSource;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
+import java.util.Optional;
+import java.util.Map;
+import java.util.List;
+
+public abstract class WorldPreset {
+    public static final WorldPreset NORMAL;
+    private static final WorldPreset FLAT;
+    private static final WorldPreset LARGE_BIOMES;
+    public static final WorldPreset AMPLIFIED;
+    private static final WorldPreset SINGLE_BIOME_SURFACE;
+    private static final WorldPreset SINGLE_BIOME_CAVES;
+    private static final WorldPreset SINGLE_BIOME_FLOATING_ISLANDS;
+    private static final WorldPreset DEBUG;
+    protected static final List<WorldPreset> PRESETS;
+    protected static final Map<Optional<WorldPreset>, PresetEditor> EDITORS;
+    private final Component description;
+    
+    private WorldPreset(final String string) {
+        this.description = new TranslatableComponent("generator." + string);
+    }
+    
+    private static WorldGenSettings fromBuffetSettings(final WorldGenSettings cix, final WorldPreset due, final Biome bre) {
+        final BiomeSource brh4 = new FixedBiomeSource(bre);
+        NoiseGeneratorSettings ciq5;
+        if (due == WorldPreset.SINGLE_BIOME_CAVES) {
+            ciq5 = NoiseGeneratorSettings.Preset.CAVES.settings();
+        }
+        else if (due == WorldPreset.SINGLE_BIOME_FLOATING_ISLANDS) {
+            ciq5 = NoiseGeneratorSettings.Preset.FLOATING_ISLANDS.settings();
+        }
+        else {
+            ciq5 = NoiseGeneratorSettings.Preset.OVERWORLD.settings();
+        }
+        return new WorldGenSettings(cix.seed(), cix.generateFeatures(), cix.generateBonusChest(), WorldGenSettings.withOverworld(cix.dimensions(), new NoiseBasedChunkGenerator(brh4, cix.seed(), ciq5)));
+    }
+    
+    private static Biome parseBuffetSettings(final WorldGenSettings cix) {
+        return cix.overworld().getBiomeSource().possibleBiomes().stream().findFirst().orElse(Biomes.PLAINS);
+    }
+    
+    public static Optional<WorldPreset> of(final WorldGenSettings cix) {
+        final ChunkGenerator cha2 = cix.overworld();
+        if (cha2 instanceof FlatLevelSource) {
+            return Optional.<WorldPreset>of(WorldPreset.FLAT);
+        }
+        if (cha2 instanceof DebugLevelSource) {
+            return Optional.<WorldPreset>of(WorldPreset.DEBUG);
+        }
+        return Optional.<WorldPreset>empty();
+    }
+    
+    public Component description() {
+        return this.description;
+    }
+    
+    public WorldGenSettings create(final RegistryAccess.RegistryHolder a, final long long2, final boolean boolean3, final boolean boolean4) {
+        return new WorldGenSettings(long2, boolean3, boolean4, WorldGenSettings.withOverworld(DimensionType.defaultDimensions(long2), this.generator(long2)));
+    }
+    
+    protected abstract ChunkGenerator generator(final long long1);
+    
+    static {
+        NORMAL = new WorldPreset("default") {
+            @Override
+            protected ChunkGenerator generator(final long long1) {
+                return new NoiseBasedChunkGenerator(new OverworldBiomeSource(long1, false, false), long1, NoiseGeneratorSettings.Preset.OVERWORLD.settings());
+            }
+        };
+        FLAT = new WorldPreset("flat") {
+            @Override
+            protected ChunkGenerator generator(final long long1) {
+                return new FlatLevelSource(FlatLevelGeneratorSettings.getDefault());
+            }
+        };
+        LARGE_BIOMES = new WorldPreset("large_biomes") {
+            @Override
+            protected ChunkGenerator generator(final long long1) {
+                return new NoiseBasedChunkGenerator(new OverworldBiomeSource(long1, false, true), long1, NoiseGeneratorSettings.Preset.OVERWORLD.settings());
+            }
+        };
+        AMPLIFIED = new WorldPreset("amplified") {
+            @Override
+            protected ChunkGenerator generator(final long long1) {
+                return new NoiseBasedChunkGenerator(new OverworldBiomeSource(long1, false, false), long1, NoiseGeneratorSettings.Preset.AMPLIFIED.settings());
+            }
+        };
+        SINGLE_BIOME_SURFACE = new WorldPreset("single_biome_surface") {
+            @Override
+            protected ChunkGenerator generator(final long long1) {
+                return new NoiseBasedChunkGenerator(new FixedBiomeSource(Biomes.PLAINS), long1, NoiseGeneratorSettings.Preset.OVERWORLD.settings());
+            }
+        };
+        SINGLE_BIOME_CAVES = new WorldPreset("single_biome_caves") {
+            @Override
+            public WorldGenSettings create(final RegistryAccess.RegistryHolder a, final long long2, final boolean boolean3, final boolean boolean4) {
+                return new WorldGenSettings(long2, boolean3, boolean4, WorldGenSettings.withOverworld(DimensionType.defaultDimensions(long2), DimensionType::defaultOverworldCaves, this.generator(long2)));
+            }
+            
+            @Override
+            protected ChunkGenerator generator(final long long1) {
+                return new NoiseBasedChunkGenerator(new FixedBiomeSource(Biomes.PLAINS), long1, NoiseGeneratorSettings.Preset.CAVES.settings());
+            }
+        };
+        SINGLE_BIOME_FLOATING_ISLANDS = new WorldPreset("single_biome_floating_islands") {
+            @Override
+            protected ChunkGenerator generator(final long long1) {
+                return new NoiseBasedChunkGenerator(new FixedBiomeSource(Biomes.PLAINS), long1, NoiseGeneratorSettings.Preset.FLOATING_ISLANDS.settings());
+            }
+        };
+        DEBUG = new WorldPreset("debug_all_block_states") {
+            @Override
+            protected ChunkGenerator generator(final long long1) {
+                return DebugLevelSource.INSTANCE;
+            }
+        };
+        PRESETS = Lists.<WorldPreset>newArrayList(WorldPreset.NORMAL, WorldPreset.FLAT, WorldPreset.LARGE_BIOMES, WorldPreset.AMPLIFIED, WorldPreset.SINGLE_BIOME_SURFACE, WorldPreset.SINGLE_BIOME_CAVES, WorldPreset.SINGLE_BIOME_FLOATING_ISLANDS, WorldPreset.DEBUG);
+        final ChunkGenerator cha3;
+        final Screen screen;
+        final WorldGenSettingsComponent worldGenSettingsComponent;
+        final WorldGenSettings cix2;
+        EDITORS = ImmutableMap.<Optional<WorldPreset>, Object>of(Optional.<WorldPreset>of(WorldPreset.FLAT), (dty, cix) -> {
+            cha3 = cix.overworld();
+            new CreateFlatWorldScreen(dty, cra -> {
+                worldGenSettingsComponent = dty.worldGenSettingsComponent;
+                new WorldGenSettings(cix.seed(), cix.generateFeatures(), cix.generateBonusChest(), WorldGenSettings.withOverworld(cix.dimensions(), new FlatLevelSource(cra)));
+                worldGenSettingsComponent.updateSettings(cix2);
+                return;
+            }, (cha3 instanceof FlatLevelSource) ? ((FlatLevelSource)cha3).settings() : FlatLevelGeneratorSettings.getDefault());
+            return screen;
+        }, Optional.<WorldPreset>of(WorldPreset.SINGLE_BIOME_SURFACE), (dty, cix) -> new CreateBuffetWorldScreen(dty, bre -> dty.worldGenSettingsComponent.updateSettings(fromBuffetSettings(cix, WorldPreset.SINGLE_BIOME_SURFACE, bre)), parseBuffetSettings(cix)), Optional.<WorldPreset>of(WorldPreset.SINGLE_BIOME_CAVES), (dty, cix) -> new CreateBuffetWorldScreen(dty, bre -> dty.worldGenSettingsComponent.updateSettings(fromBuffetSettings(cix, WorldPreset.SINGLE_BIOME_CAVES, bre)), parseBuffetSettings(cix)), Optional.<WorldPreset>of(WorldPreset.SINGLE_BIOME_FLOATING_ISLANDS), (dty, cix) -> new CreateBuffetWorldScreen(dty, bre -> dty.worldGenSettingsComponent.updateSettings(fromBuffetSettings(cix, WorldPreset.SINGLE_BIOME_FLOATING_ISLANDS, bre)), parseBuffetSettings(cix)));
+    }
+    
+    public interface PresetEditor {
+        Screen createEditScreen(final CreateWorldScreen dty, final WorldGenSettings cix);
+    }
+}
diff --git a/src/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java b/src/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java
index bff31c5..be85944 100644
--- a/src/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java
+++ b/src/net/minecraft/client/gui/screens/worldselection/WorldSelectionList.java
@@ -1,36 +1,48 @@
 package net.minecraft.client.gui.screens.worldselection;
 
+import net.minecraft.client.gui.screens.ProgressScreen;
 import java.io.InputStream;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import org.apache.commons.lang3.Validate;
 import com.mojang.blaze3d.platform.NativeImage;
 import java.io.FileInputStream;
-import net.minecraft.world.level.LevelSettings;
+import net.minecraft.client.gui.screens.GenericDirtMessageScreen;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.level.storage.LevelData;
-import net.minecraft.world.level.storage.LevelStorage;
+import java.nio.file.Path;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import net.minecraft.world.level.LevelSettings;
 import net.minecraft.client.gui.screens.AlertScreen;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.client.gui.screens.ProgressScreen;
+import net.minecraft.world.level.storage.LevelResource;
+import net.minecraft.world.level.storage.WorldData;
+import net.minecraft.world.level.DataPackConfig;
+import net.minecraft.server.packs.resources.ResourceManager;
+import com.mojang.datafixers.util.Function4;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.client.gui.screens.ConfirmScreen;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.client.gui.screens.BackupConfirmScreen;
+import java.io.IOException;
+import net.minecraft.client.gui.components.toasts.SystemToast;
 import net.minecraft.Util;
 import net.minecraft.client.gui.Font;
 import net.minecraft.SharedConstants;
+import java.util.Arrays;
+import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.client.resources.language.I18n;
 import org.apache.commons.lang3.StringUtils;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.hash.Hashing;
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.client.gui.components.AbstractSelectionList;
 import java.util.Optional;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.gui.components.AbstractSelectionList;
 import java.util.Date;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import java.util.Iterator;
@@ -41,6 +53,7 @@ import net.minecraft.world.level.storage.LevelStorageException;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.client.gui.screens.ErrorScreen;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import java.util.function.Supplier;
 import net.minecraft.client.Minecraft;
@@ -61,38 +74,42 @@ public class WorldSelectionList extends ObjectSelectionList<WorldListEntry> {
     @Nullable
     private List<LevelSummary> cachedList;
     
-    public WorldSelectionList(final SelectWorldScreen djk, final Minecraft dbn, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final Supplier<String> supplier, @Nullable final WorldSelectionList djl) {
-        super(dbn, integer3, integer4, integer5, integer6, integer7);
-        this.screen = djk;
-        if (djl != null) {
-            this.cachedList = djl.cachedList;
+    public WorldSelectionList(final SelectWorldScreen duc, final Minecraft dlx, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final Supplier<String> supplier, @Nullable final WorldSelectionList duf) {
+        super(dlx, integer3, integer4, integer5, integer6, integer7);
+        this.screen = duc;
+        if (duf != null) {
+            this.cachedList = duf.cachedList;
         }
         this.refreshList(supplier, false);
     }
     
     public void refreshList(final Supplier<String> supplier, final boolean boolean2) {
         this.clearEntries();
-        final LevelStorageSource crp4 = this.minecraft.getLevelSource();
-        Label_0088: {
+        final LevelStorageSource dae4 = this.minecraft.getLevelSource();
+        Label_0091: {
             if (this.cachedList != null) {
                 if (!boolean2) {
-                    break Label_0088;
+                    break Label_0091;
                 }
             }
             try {
-                this.cachedList = crp4.getLevelList();
+                this.cachedList = dae4.getLevelList();
             }
-            catch (LevelStorageException cro5) {
-                WorldSelectionList.LOGGER.error("Couldn't load level list", (Throwable)cro5);
-                this.minecraft.setScreen(new ErrorScreen(new TranslatableComponent("selectWorld.unable_to_load", new Object[0]), cro5.getMessage()));
+            catch (LevelStorageException dad5) {
+                WorldSelectionList.LOGGER.error("Couldn't load level list", (Throwable)dad5);
+                this.minecraft.setScreen(new ErrorScreen(new TranslatableComponent("selectWorld.unable_to_load"), new TextComponent(dad5.getMessage())));
                 return;
             }
             Collections.<LevelSummary>sort(this.cachedList);
         }
+        if (this.cachedList.isEmpty()) {
+            this.minecraft.setScreen(new CreateWorldScreen((Screen)null));
+            return;
+        }
         final String string5 = supplier.get().toLowerCase(Locale.ROOT);
-        for (final LevelSummary crq7 : this.cachedList) {
-            if (crq7.getLevelName().toLowerCase(Locale.ROOT).contains(string5) || crq7.getLevelId().toLowerCase(Locale.ROOT).contains(string5)) {
-                this.addEntry(new WorldListEntry(this, crq7, this.minecraft.getLevelSource()));
+        for (final LevelSummary daf7 : this.cachedList) {
+            if (daf7.getLevelName().toLowerCase(Locale.ROOT).contains(string5) || daf7.getLevelId().toLowerCase(Locale.ROOT).contains(string5)) {
+                this.addEntry(new WorldListEntry(this, daf7, this.minecraft.getLevelSource()));
             }
         }
     }
@@ -116,15 +133,15 @@ public class WorldSelectionList extends ObjectSelectionList<WorldListEntry> {
     public void setSelected(@Nullable final WorldListEntry a) {
         super.setSelected(a);
         if (a != null) {
-            final LevelSummary crq3 = a.summary;
-            NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.select", new Object[] { new TranslatableComponent("narrator.select.world", new Object[] { crq3.getLevelName(), new Date(crq3.getLastPlayed()), crq3.isHardcore() ? I18n.get("gameMode.hardcore") : I18n.get("gameMode." + crq3.getGameMode().getName()), crq3.hasCheats() ? I18n.get("selectWorld.cheats") : "", crq3.getWorldVersionName() }) }).getString());
+            final LevelSummary daf3 = a.summary;
+            NarratorChatListener.INSTANCE.sayNow(new TranslatableComponent("narrator.select", new Object[] { new TranslatableComponent("narrator.select.world", new Object[] { daf3.getLevelName(), new Date(daf3.getLastPlayed()), daf3.isHardcore() ? new TranslatableComponent("gameMode.hardcore") : new TranslatableComponent("gameMode." + daf3.getGameMode().getName()), daf3.hasCheats() ? new TranslatableComponent("selectWorld.cheats") : TextComponent.EMPTY, daf3.getWorldVersionName() }) }).getString());
         }
+        this.screen.updateButtonStatus(a != null && !a.summary.isLocked());
     }
     
     @Override
-    protected void moveSelection(final int integer) {
-        super.moveSelection(integer);
-        this.screen.updateButtonStatus(true);
+    protected void moveSelection(final SelectionDirection b) {
+        this.moveSelection(b, a -> !a.summary.isLocked());
     }
     
     public Optional<WorldListEntry> getSelectedOpt() {
@@ -152,12 +169,12 @@ public class WorldSelectionList extends ObjectSelectionList<WorldListEntry> {
         private final DynamicTexture icon;
         private long lastClickTime;
         
-        public WorldListEntry(final WorldSelectionList djl2, final LevelSummary crq, final LevelStorageSource crp) {
-            this.screen = djl2.getScreen();
-            this.summary = crq;
+        public WorldListEntry(final WorldSelectionList duf2, final LevelSummary daf, final LevelStorageSource dae) {
+            this.screen = duf2.getScreen();
+            this.summary = daf;
             this.minecraft = Minecraft.getInstance();
-            this.iconLocation = new ResourceLocation("worlds/" + Hashing.sha1().hashUnencodedChars(crq.getLevelId()) + "/icon");
-            this.iconFile = crp.getFile(crq.getLevelId(), "icon.png");
+            this.iconLocation = new ResourceLocation("worlds/" + Hashing.sha1().hashUnencodedChars(daf.getLevelId()) + "/icon");
+            this.iconFile = daf.getIcon();
             if (!this.iconFile.isFile()) {
                 this.iconFile = null;
             }
@@ -165,91 +182,71 @@ public class WorldSelectionList extends ObjectSelectionList<WorldListEntry> {
         }
         
         @Override
-        public void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9) {
-            String string11 = this.summary.getLevelName();
-            final String string12 = this.summary.getLevelId() + " (" + WorldSelectionList.DATE_FORMAT.format(new Date(this.summary.getLastPlayed())) + ")";
-            if (StringUtils.isEmpty((CharSequence)string11)) {
-                string11 = I18n.get("selectWorld.world") + " " + (integer1 + 1);
+        public void render(final PoseStack dhl, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final float float10) {
+            String string12 = this.summary.getLevelName();
+            final String string13 = this.summary.getLevelId() + " (" + WorldSelectionList.DATE_FORMAT.format(new Date(this.summary.getLastPlayed())) + ")";
+            if (StringUtils.isEmpty((CharSequence)string12)) {
+                string12 = I18n.get("selectWorld.world") + " " + (integer2 + 1);
             }
-            String string13 = "";
-            if (this.summary.isRequiresConversion()) {
-                string13 = I18n.get("selectWorld.conversion") + " " + string13;
-            }
-            else {
-                string13 = I18n.get("gameMode." + this.summary.getGameMode().getName());
-                if (this.summary.isHardcore()) {
-                    string13 = ChatFormatting.DARK_RED + I18n.get("gameMode.hardcore") + ChatFormatting.RESET;
-                }
-                if (this.summary.hasCheats()) {
-                    string13 = string13 + ", " + I18n.get("selectWorld.cheats");
-                }
-                final String string14 = this.summary.getWorldVersionName().getColoredString();
-                if (this.summary.markVersionInList()) {
-                    if (this.summary.askToOpenWorld()) {
-                        string13 = string13 + ", " + I18n.get("selectWorld.version") + " " + ChatFormatting.RED + string14 + ChatFormatting.RESET;
-                    }
-                    else {
-                        string13 = string13 + ", " + I18n.get("selectWorld.version") + " " + ChatFormatting.ITALIC + string14 + ChatFormatting.RESET;
-                    }
-                }
-                else {
-                    string13 = string13 + ", " + I18n.get("selectWorld.version") + " " + string14;
-                }
-            }
-            this.minecraft.font.draw(string11, (float)(integer3 + 32 + 3), (float)(integer2 + 1), 16777215);
+            final Component mr14 = this.summary.getInfo();
+            this.minecraft.font.draw(dhl, string12, (float)(integer4 + 32 + 3), (float)(integer3 + 1), 16777215);
             final Font font = this.minecraft.font;
-            final String string15 = string12;
-            final float float10 = (float)(integer3 + 32 + 3);
+            final String string14 = string13;
+            final float float11 = (float)(integer4 + 32 + 3);
             this.minecraft.font.getClass();
-            font.draw(string15, float10, (float)(integer2 + 9 + 3), 8421504);
+            font.draw(dhl, string14, float11, (float)(integer3 + 9 + 3), 8421504);
             final Font font2 = this.minecraft.font;
-            final String string16 = string13;
-            final float float11 = (float)(integer3 + 32 + 3);
+            final Component mu19 = mr14;
+            final float float12 = (float)(integer4 + 32 + 3);
             this.minecraft.font.getClass();
-            final int n = integer2 + 9;
+            final int n = integer3 + 9;
             this.minecraft.font.getClass();
-            font2.draw(string16, float11, (float)(n + 9 + 3), 8421504);
+            font2.draw(dhl, mu19, float12, (float)(n + 9 + 3), 8421504);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
             this.minecraft.getTextureManager().bind((this.icon != null) ? this.iconLocation : WorldSelectionList.ICON_MISSING);
             RenderSystem.enableBlend();
-            GuiComponent.blit(integer3, integer2, 0.0f, 0.0f, 32, 32, 32, 32);
+            GuiComponent.blit(dhl, integer4, integer3, 0.0f, 0.0f, 32, 32, 32, 32);
             RenderSystem.disableBlend();
-            if (this.minecraft.options.touchscreen || boolean8) {
+            if (this.minecraft.options.touchscreen || boolean9) {
                 this.minecraft.getTextureManager().bind(WorldSelectionList.ICON_OVERLAY_LOCATION);
-                GuiComponent.fill(integer3, integer2, integer3 + 32, integer2 + 32, -1601138544);
+                GuiComponent.fill(dhl, integer4, integer3, integer4 + 32, integer3 + 32, -1601138544);
                 RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-                final int integer8 = integer6 - integer3;
-                final int integer9 = (integer8 < 32) ? 32 : 0;
-                if (this.summary.markVersionInList()) {
-                    GuiComponent.blit(integer3, integer2, 32.0f, (float)integer9, 32, 32, 256, 256);
-                    if (this.summary.isOldCustomizedWorld()) {
-                        GuiComponent.blit(integer3, integer2, 96.0f, (float)integer9, 32, 32, 256, 256);
-                        if (integer8 < 32) {
-                            final Component lf16 = new TranslatableComponent("selectWorld.tooltip.unsupported", new Object[] { this.summary.getWorldVersionName() }).withStyle(ChatFormatting.RED);
-                            this.screen.setToolTip(this.minecraft.font.insertLineBreaks(lf16.getColoredString(), 175));
-                        }
+                final int integer9 = integer7 - integer4;
+                final boolean boolean10 = integer9 < 32;
+                final int integer10 = boolean10 ? 32 : 0;
+                if (this.summary.isLocked()) {
+                    GuiComponent.blit(dhl, integer4, integer3, 96.0f, (float)integer10, 32, 32, 256, 256);
+                    if (boolean10) {
+                        final FormattedText mu18 = new TranslatableComponent("selectWorld.locked").withStyle(ChatFormatting.RED);
+                        this.screen.setToolTip(this.minecraft.font.split(mu18, 175));
                     }
-                    else if (this.summary.askToOpenWorld()) {
-                        GuiComponent.blit(integer3, integer2, 96.0f, (float)integer9, 32, 32, 256, 256);
-                        if (integer8 < 32) {
-                            this.screen.setToolTip(ChatFormatting.RED + I18n.get("selectWorld.tooltip.fromNewerVersion1") + "\n" + ChatFormatting.RED + I18n.get("selectWorld.tooltip.fromNewerVersion2"));
+                }
+                else if (this.summary.markVersionInList()) {
+                    GuiComponent.blit(dhl, integer4, integer3, 32.0f, (float)integer10, 32, 32, 256, 256);
+                    if (this.summary.askToOpenWorld()) {
+                        GuiComponent.blit(dhl, integer4, integer3, 96.0f, (float)integer10, 32, 32, 256, 256);
+                        if (boolean10) {
+                            this.screen.setToolTip(Arrays.<FormattedText>asList(new TranslatableComponent("selectWorld.tooltip.fromNewerVersion1").withStyle(ChatFormatting.RED), new TranslatableComponent("selectWorld.tooltip.fromNewerVersion2").withStyle(ChatFormatting.RED)));
                         }
                     }
                     else if (!SharedConstants.getCurrentVersion().isStable()) {
-                        GuiComponent.blit(integer3, integer2, 64.0f, (float)integer9, 32, 32, 256, 256);
-                        if (integer8 < 32) {
-                            this.screen.setToolTip(ChatFormatting.GOLD + I18n.get("selectWorld.tooltip.snapshot1") + "\n" + ChatFormatting.GOLD + I18n.get("selectWorld.tooltip.snapshot2"));
+                        GuiComponent.blit(dhl, integer4, integer3, 64.0f, (float)integer10, 32, 32, 256, 256);
+                        if (boolean10) {
+                            this.screen.setToolTip(Arrays.<FormattedText>asList(new TranslatableComponent("selectWorld.tooltip.snapshot1").withStyle(ChatFormatting.GOLD), new TranslatableComponent("selectWorld.tooltip.snapshot2").withStyle(ChatFormatting.GOLD)));
                         }
                     }
                 }
                 else {
-                    GuiComponent.blit(integer3, integer2, 0.0f, (float)integer9, 32, 32, 256, 256);
+                    GuiComponent.blit(dhl, integer4, integer3, 0.0f, (float)integer10, 32, 32, 256, 256);
                 }
             }
         }
         
         @Override
         public boolean mouseClicked(final double double1, final double double2, final int integer) {
+            if (this.summary.isLocked()) {
+                return true;
+            }
             WorldSelectionList.this.setSelected(this);
             this.screen.updateButtonStatus(WorldSelectionList.this.getSelectedOpt().isPresent());
             if (double1 - AbstractSelectionList.this.getRowLeft() <= 32.0) {
@@ -265,21 +262,49 @@ public class WorldSelectionList extends ObjectSelectionList<WorldListEntry> {
         }
         
         public void joinWorld() {
-            if (this.summary.shouldBackup() || this.summary.isOldCustomizedWorld()) {
-                Component lf2 = new TranslatableComponent("selectWorld.backupQuestion", new Object[0]);
-                Component lf3 = new TranslatableComponent("selectWorld.backupWarning", new Object[] { this.summary.getWorldVersionName().getColoredString(), SharedConstants.getCurrentVersion().getName() });
-                if (this.summary.isOldCustomizedWorld()) {
-                    lf2 = new TranslatableComponent("selectWorld.backupQuestion.customized", new Object[0]);
-                    lf3 = new TranslatableComponent("selectWorld.backupWarning.customized", new Object[0]);
-                }
+            if (this.summary.isLocked()) {
+                return;
+            }
+            if (this.summary.shouldBackup()) {
+                final Component mr2 = new TranslatableComponent("selectWorld.backupQuestion");
+                final Component mr3 = new TranslatableComponent("selectWorld.backupWarning", new Object[] { this.summary.getWorldVersionName(), SharedConstants.getCurrentVersion().getName() });
                 String string4;
+                LevelStorageSource.LevelStorageAccess a5;
+                final Throwable t2;
                 this.minecraft.setScreen(new BackupConfirmScreen(this.screen, (boolean1, boolean2) -> {
                     if (boolean1) {
                         string4 = this.summary.getLevelId();
-                        EditWorldScreen.makeBackupAndShowToast(this.minecraft.getLevelSource(), string4);
+                        try {
+                            a5 = this.minecraft.getLevelSource().createAccess(string4);
+                            try {
+                                EditWorldScreen.makeBackupAndShowToast(a5);
+                            }
+                            catch (Throwable t) {
+                                throw t;
+                            }
+                            finally {
+                                if (a5 != null) {
+                                    if (t2 != null) {
+                                        try {
+                                            a5.close();
+                                        }
+                                        catch (Throwable exception) {
+                                            t2.addSuppressed(exception);
+                                        }
+                                    }
+                                    else {
+                                        a5.close();
+                                    }
+                                }
+                            }
+                        }
+                        catch (IOException iOException5) {
+                            SystemToast.onWorldAccessFailure(this.minecraft, string4);
+                            WorldSelectionList.LOGGER.error("Failed to backup level {}", string4, iOException5);
+                        }
                     }
                     this.loadWorld();
-                }, lf2, lf3, false));
+                }, mr2, mr3, false));
             }
             else if (this.summary.askToOpenWorld()) {
                 this.minecraft.setScreen(new ConfirmScreen(boolean1 -> {
@@ -289,13 +314,13 @@ public class WorldSelectionList extends ObjectSelectionList<WorldListEntry> {
                         }
                         catch (Exception exception3) {
                             WorldSelectionList.LOGGER.error("Failure to open 'future world'", (Throwable)exception3);
-                            this.minecraft.setScreen(new AlertScreen(() -> this.minecraft.setScreen(this.screen), new TranslatableComponent("selectWorld.futureworld.error.title", new Object[0]), new TranslatableComponent("selectWorld.futureworld.error.text", new Object[0])));
+                            this.minecraft.setScreen(new AlertScreen(() -> this.minecraft.setScreen(this.screen), new TranslatableComponent("selectWorld.futureworld.error.title"), new TranslatableComponent("selectWorld.futureworld.error.text")));
                         }
                     }
                     else {
                         this.minecraft.setScreen(this.screen);
                     }
-                }, new TranslatableComponent("selectWorld.versionQuestion", new Object[0]), new TranslatableComponent("selectWorld.versionWarning", new Object[] { this.summary.getWorldVersionName().getColoredString() }), I18n.get("selectWorld.versionJoinButton"), I18n.get("gui.cancel")));
+                }, new TranslatableComponent("selectWorld.versionQuestion"), new TranslatableComponent("selectWorld.versionWarning", new Object[] { this.summary.getWorldVersionName(), new TranslatableComponent("selectWorld.versionJoinButton"), CommonComponents.GUI_CANCEL })));
             }
             else {
                 this.loadWorld();
@@ -306,63 +331,89 @@ public class WorldSelectionList extends ObjectSelectionList<WorldListEntry> {
             this.minecraft.setScreen(new ConfirmScreen(boolean1 -> {
                 if (boolean1) {
                     this.minecraft.setScreen(new ProgressScreen());
-                    final LevelStorageSource crp3 = this.minecraft.getLevelSource();
-                    crp3.deleteLevel(this.summary.getLevelId());
+                    final LevelStorageSource dae3 = this.minecraft.getLevelSource();
+                    final String string4 = this.summary.getLevelId();
+                    try (final LevelStorageSource.LevelStorageAccess a5 = dae3.createAccess(string4)) {
+                        a5.deleteLevel();
+                    }
+                    catch (IOException iOException5) {
+                        SystemToast.onWorldDeleteFailure(this.minecraft, string4);
+                        WorldSelectionList.LOGGER.error("Failed to delete world {}", string4, iOException5);
+                    }
                     WorldSelectionList.this.refreshList(() -> this.screen.searchBox.getValue(), true);
                 }
                 this.minecraft.setScreen(this.screen);
-            }, new TranslatableComponent("selectWorld.deleteQuestion", new Object[0]), new TranslatableComponent("selectWorld.deleteWarning", new Object[] { this.summary.getLevelName() }), I18n.get("selectWorld.deleteButton"), I18n.get("gui.cancel")));
+            }, new TranslatableComponent("selectWorld.deleteQuestion"), new TranslatableComponent("selectWorld.deleteWarning", new Object[] { this.summary.getLevelName() }), new TranslatableComponent("selectWorld.deleteButton"), CommonComponents.GUI_CANCEL));
         }
         
         public void editWorld() {
-            this.minecraft.setScreen(new EditWorldScreen(boolean1 -> {
-                if (boolean1) {
-                    WorldSelectionList.this.refreshList(() -> this.screen.searchBox.getValue(), true);
-                }
-                this.minecraft.setScreen(this.screen);
-            }, this.summary.getLevelId()));
+            final String string2 = this.summary.getLevelId();
+            try {
+                final LevelStorageSource.LevelStorageAccess a3 = this.minecraft.getLevelSource().createAccess(string2);
+                this.minecraft.setScreen(new EditWorldScreen(boolean3 -> {
+                    try {
+                        a3.close();
+                    }
+                    catch (IOException iOException5) {
+                        WorldSelectionList.LOGGER.error("Failed to unlock level {}", string2, iOException5);
+                    }
+                    if (boolean3) {
+                        WorldSelectionList.this.refreshList(() -> this.screen.searchBox.getValue(), true);
+                    }
+                    this.minecraft.setScreen(this.screen);
+                }, a3));
+            }
+            catch (IOException iOException3) {
+                SystemToast.onWorldAccessFailure(this.minecraft, string2);
+                WorldSelectionList.LOGGER.error("Failed to access level {}", string2, iOException3);
+                WorldSelectionList.this.refreshList(() -> this.screen.searchBox.getValue(), true);
+            }
         }
         
         public void recreateWorld() {
-            try {
-                this.minecraft.setScreen(new ProgressScreen());
-                final CreateWorldScreen djh2 = new CreateWorldScreen(this.screen);
-                final LevelStorage crn3 = this.minecraft.getLevelSource().selectLevel(this.summary.getLevelId(), null);
-                final LevelData crm4 = crn3.prepareLevel();
-                if (crm4 != null) {
-                    djh2.copyFromWorld(crm4);
-                    if (this.summary.isOldCustomizedWorld()) {
-                        this.minecraft.setScreen(new ConfirmScreen(boolean2 -> this.minecraft.setScreen(boolean2 ? djh2 : this.screen), new TranslatableComponent("selectWorld.recreate.customized.title", new Object[0]), new TranslatableComponent("selectWorld.recreate.customized.text", new Object[0]), I18n.get("gui.proceed"), I18n.get("gui.cancel")));
-                    }
-                    else {
-                        this.minecraft.setScreen(djh2);
-                    }
+            this.queueLoadScreen();
+            final RegistryAccess.RegistryHolder a2 = RegistryAccess.builtin();
+            try (final LevelStorageSource.LevelStorageAccess a3 = this.minecraft.getLevelSource().createAccess(this.summary.getLevelId());
+                 final Minecraft.ServerStem b5 = this.minecraft.makeServerStem(a2, Minecraft::loadDataPacks, (Function4<LevelStorageSource.LevelStorageAccess, RegistryAccess.RegistryHolder, ResourceManager, DataPackConfig, WorldData>)Minecraft::loadWorldData, false, a3)) {
+                final LevelSettings bqe7 = b5.worldData().getLevelSettings();
+                final WorldGenSettings cix8 = b5.worldData().worldGenSettings();
+                final Path path9 = CreateWorldScreen.createTempDataPackDirFromExistingWorld(a3.getLevelPath(LevelResource.DATAPACK_DIR), this.minecraft);
+                if (cix8.isOldCustomizedWorld()) {
+                    this.minecraft.setScreen(new ConfirmScreen(boolean5 -> this.minecraft.setScreen(boolean5 ? new CreateWorldScreen(this.screen, bqe7, cix8, path9, a2) : this.screen), new TranslatableComponent("selectWorld.recreate.customized.title"), new TranslatableComponent("selectWorld.recreate.customized.text"), CommonComponents.GUI_PROCEED, CommonComponents.GUI_CANCEL));
+                }
+                else {
+                    this.minecraft.setScreen(new CreateWorldScreen(this.screen, bqe7, cix8, path9, a2));
                 }
             }
-            catch (Exception exception2) {
-                WorldSelectionList.LOGGER.error("Unable to recreate world", (Throwable)exception2);
-                this.minecraft.setScreen(new AlertScreen(() -> this.minecraft.setScreen(this.screen), new TranslatableComponent("selectWorld.recreate.error.title", new Object[0]), new TranslatableComponent("selectWorld.recreate.error.text", new Object[0])));
+            catch (Exception exception3) {
+                WorldSelectionList.LOGGER.error("Unable to recreate world", (Throwable)exception3);
+                this.minecraft.setScreen(new AlertScreen(() -> this.minecraft.setScreen(this.screen), new TranslatableComponent("selectWorld.recreate.error.title"), new TranslatableComponent("selectWorld.recreate.error.text")));
             }
         }
         
         private void loadWorld() {
             this.minecraft.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0f));
             if (this.minecraft.getLevelSource().levelExists(this.summary.getLevelId())) {
-                this.minecraft.selectLevel(this.summary.getLevelId(), this.summary.getLevelName(), null);
+                this.queueLoadScreen();
+                this.minecraft.loadLevel(this.summary.getLevelId());
             }
         }
         
+        private void queueLoadScreen() {
+            this.minecraft.forceSetScreen(new GenericDirtMessageScreen(new TranslatableComponent("selectWorld.data_read")));
+        }
+        
         @Nullable
         private DynamicTexture loadServerIcon() {
             final boolean boolean2 = this.iconFile != null && this.iconFile.isFile();
             if (boolean2) {
                 try (final InputStream inputStream3 = new FileInputStream(this.iconFile)) {
-                    final NativeImage cxr5 = NativeImage.read(inputStream3);
-                    Validate.validState(cxr5.getWidth() == 64, "Must be 64 pixels wide", new Object[0]);
-                    Validate.validState(cxr5.getHeight() == 64, "Must be 64 pixels high", new Object[0]);
-                    final DynamicTexture dzy6 = new DynamicTexture(cxr5);
-                    this.minecraft.getTextureManager().register(this.iconLocation, dzy6);
-                    return dzy6;
+                    final NativeImage dgs5 = NativeImage.read(inputStream3);
+                    Validate.validState(dgs5.getWidth() == 64, "Must be 64 pixels wide", new Object[0]);
+                    Validate.validState(dgs5.getHeight() == 64, "Must be 64 pixels high", new Object[0]);
+                    final DynamicTexture ell6 = new DynamicTexture(dgs5);
+                    this.minecraft.getTextureManager().register(this.iconLocation, ell6);
+                    return ell6;
                 }
                 catch (Throwable throwable3) {
                     WorldSelectionList.LOGGER.error("Invalid icon for world {}", this.summary.getLevelId(), throwable3);
diff --git a/src/net/minecraft/client/gui/spectator/PlayerMenuItem.java b/src/net/minecraft/client/gui/spectator/PlayerMenuItem.java
index 24b7030..e0c2ec1 100644
--- a/src/net/minecraft/client/gui/spectator/PlayerMenuItem.java
+++ b/src/net/minecraft/client/gui/spectator/PlayerMenuItem.java
@@ -2,6 +2,7 @@ package net.minecraft.client.gui.spectator;
 
 import net.minecraft.client.gui.GuiComponent;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
@@ -20,10 +21,10 @@ public class PlayerMenuItem implements SpectatorMenuItem {
     
     public PlayerMenuItem(final GameProfile gameProfile) {
         this.profile = gameProfile;
-        final Minecraft dbn3 = Minecraft.getInstance();
-        final Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> map4 = dbn3.getSkinManager().getInsecureSkinInformation(gameProfile);
+        final Minecraft dlx3 = Minecraft.getInstance();
+        final Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> map4 = dlx3.getSkinManager().getInsecureSkinInformation(gameProfile);
         if (map4.containsKey(MinecraftProfileTexture.Type.SKIN)) {
-            this.location = dbn3.getSkinManager().registerTexture(map4.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN);
+            this.location = dlx3.getSkinManager().registerTexture(map4.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN);
         }
         else {
             this.location = DefaultPlayerSkin.getDefaultSkin(Player.createPlayerUUID(gameProfile));
@@ -31,7 +32,7 @@ public class PlayerMenuItem implements SpectatorMenuItem {
     }
     
     @Override
-    public void selectItem(final SpectatorMenu djp) {
+    public void selectItem(final SpectatorMenu duj) {
         Minecraft.getInstance().getConnection().send(new ServerboundTeleportToEntityPacket(this.profile.getId()));
     }
     
@@ -41,11 +42,11 @@ public class PlayerMenuItem implements SpectatorMenuItem {
     }
     
     @Override
-    public void renderIcon(final float float1, final int integer) {
+    public void renderIcon(final PoseStack dhl, final float float2, final int integer) {
         Minecraft.getInstance().getTextureManager().bind(this.location);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, integer / 255.0f);
-        GuiComponent.blit(2, 2, 12, 12, 8.0f, 8.0f, 8, 8, 64, 64);
-        GuiComponent.blit(2, 2, 12, 12, 40.0f, 8.0f, 8, 8, 64, 64);
+        GuiComponent.blit(dhl, 2, 2, 12, 12, 8.0f, 8.0f, 8, 8, 64, 64);
+        GuiComponent.blit(dhl, 2, 2, 12, 12, 40.0f, 8.0f, 8, 8, 64, 64);
     }
     
     @Override
diff --git a/src/net/minecraft/client/gui/spectator/RootSpectatorMenuCategory.java b/src/net/minecraft/client/gui/spectator/RootSpectatorMenuCategory.java
index f7665ad..e294baa 100644
--- a/src/net/minecraft/client/gui/spectator/RootSpectatorMenuCategory.java
+++ b/src/net/minecraft/client/gui/spectator/RootSpectatorMenuCategory.java
@@ -22,6 +22,6 @@ public class RootSpectatorMenuCategory implements SpectatorMenuCategory {
     
     @Override
     public Component getPrompt() {
-        return new TranslatableComponent("spectatorMenu.root.prompt", new Object[0]);
+        return new TranslatableComponent("spectatorMenu.root.prompt");
     }
 }
diff --git a/src/net/minecraft/client/gui/spectator/SpectatorMenu.java b/src/net/minecraft/client/gui/spectator/SpectatorMenu.java
index 27b0a42..4194511 100644
--- a/src/net/minecraft/client/gui/spectator/SpectatorMenu.java
+++ b/src/net/minecraft/client/gui/spectator/SpectatorMenu.java
@@ -4,12 +4,13 @@ import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.components.spectator.SpectatorGui;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.Component;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.Lists;
 import net.minecraft.client.gui.spectator.categories.SpectatorPage;
+import com.google.common.collect.Lists;
 import java.util.List;
+import com.google.common.base.MoreObjects;
 
 public class SpectatorMenu {
     private static final SpectatorMenuItem CLOSE_ITEM;
@@ -18,16 +19,14 @@ public class SpectatorMenu {
     private static final SpectatorMenuItem SCROLL_RIGHT_DISABLED;
     public static final SpectatorMenuItem EMPTY_SLOT;
     private final SpectatorMenuListener listener;
-    private final List<SpectatorPage> previousCategories;
     private SpectatorMenuCategory category;
     private int selectedSlot;
     private int page;
     
-    public SpectatorMenu(final SpectatorMenuListener djs) {
-        this.previousCategories = Lists.newArrayList();
+    public SpectatorMenu(final SpectatorMenuListener dum) {
         this.selectedSlot = -1;
         this.category = new RootSpectatorMenuCategory();
-        this.listener = djs;
+        this.listener = dum;
     }
     
     public SpectatorMenuItem getItem(final int integer) {
@@ -69,10 +68,10 @@ public class SpectatorMenu {
     }
     
     public void selectSlot(final int integer) {
-        final SpectatorMenuItem djr3 = this.getItem(integer);
-        if (djr3 != SpectatorMenu.EMPTY_SLOT) {
-            if (this.selectedSlot == integer && djr3.isEnabled()) {
-                djr3.selectItem(this);
+        final SpectatorMenuItem dul3 = this.getItem(integer);
+        if (dul3 != SpectatorMenu.EMPTY_SLOT) {
+            if (this.selectedSlot == integer && dul3.isEnabled()) {
+                dul3.selectItem(this);
             }
             else {
                 this.selectedSlot = integer;
@@ -88,9 +87,8 @@ public class SpectatorMenu {
         return this.selectedSlot;
     }
     
-    public void selectCategory(final SpectatorMenuCategory djq) {
-        this.previousCategories.add(this.getCurrentPage());
-        this.category = djq;
+    public void selectCategory(final SpectatorMenuCategory duk) {
+        this.category = duk;
         this.selectedSlot = -1;
         this.page = 0;
     }
@@ -106,16 +104,16 @@ public class SpectatorMenu {
         SCROLL_RIGHT_DISABLED = new ScrollMenuItem(1, false);
         EMPTY_SLOT = new SpectatorMenuItem() {
             @Override
-            public void selectItem(final SpectatorMenu djp) {
+            public void selectItem(final SpectatorMenu duj) {
             }
             
             @Override
             public Component getName() {
-                return new TextComponent("");
+                return TextComponent.EMPTY;
             }
             
             @Override
-            public void renderIcon(final float float1, final int integer) {
+            public void renderIcon(final PoseStack dhl, final float float2, final int integer) {
             }
             
             @Override
@@ -130,19 +128,19 @@ public class SpectatorMenu {
         }
         
         @Override
-        public void selectItem(final SpectatorMenu djp) {
-            djp.exit();
+        public void selectItem(final SpectatorMenu duj) {
+            duj.exit();
         }
         
         @Override
         public Component getName() {
-            return new TranslatableComponent("spectatorMenu.close", new Object[0]);
+            return new TranslatableComponent("spectatorMenu.close");
         }
         
         @Override
-        public void renderIcon(final float float1, final int integer) {
+        public void renderIcon(final PoseStack dhl, final float float2, final int integer) {
             Minecraft.getInstance().getTextureManager().bind(SpectatorGui.SPECTATOR_LOCATION);
-            GuiComponent.blit(0, 0, 128.0f, 0.0f, 16, 16, 256, 256);
+            GuiComponent.blit(dhl, 0, 0, 128.0f, 0.0f, 16, 16, 256, 256);
         }
         
         @Override
@@ -161,26 +159,26 @@ public class SpectatorMenu {
         }
         
         @Override
-        public void selectItem(final SpectatorMenu djp) {
-            djp.page += this.direction;
+        public void selectItem(final SpectatorMenu duj) {
+            duj.page += this.direction;
         }
         
         @Override
         public Component getName() {
             if (this.direction < 0) {
-                return new TranslatableComponent("spectatorMenu.previous_page", new Object[0]);
+                return new TranslatableComponent("spectatorMenu.previous_page");
             }
-            return new TranslatableComponent("spectatorMenu.next_page", new Object[0]);
+            return new TranslatableComponent("spectatorMenu.next_page");
         }
         
         @Override
-        public void renderIcon(final float float1, final int integer) {
+        public void renderIcon(final PoseStack dhl, final float float2, final int integer) {
             Minecraft.getInstance().getTextureManager().bind(SpectatorGui.SPECTATOR_LOCATION);
             if (this.direction < 0) {
-                GuiComponent.blit(0, 0, 144.0f, 0.0f, 16, 16, 256, 256);
+                GuiComponent.blit(dhl, 0, 0, 144.0f, 0.0f, 16, 16, 256, 256);
             }
             else {
-                GuiComponent.blit(0, 0, 160.0f, 0.0f, 16, 16, 256, 256);
+                GuiComponent.blit(dhl, 0, 0, 160.0f, 0.0f, 16, 16, 256, 256);
             }
         }
         
diff --git a/src/net/minecraft/client/gui/spectator/SpectatorMenuItem.java b/src/net/minecraft/client/gui/spectator/SpectatorMenuItem.java
index 3555971..e84fcf9 100644
--- a/src/net/minecraft/client/gui/spectator/SpectatorMenuItem.java
+++ b/src/net/minecraft/client/gui/spectator/SpectatorMenuItem.java
@@ -1,13 +1,14 @@
 package net.minecraft.client.gui.spectator;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 
 public interface SpectatorMenuItem {
-    void selectItem(final SpectatorMenu djp);
+    void selectItem(final SpectatorMenu duj);
     
     Component getName();
     
-    void renderIcon(final float float1, final int integer);
+    void renderIcon(final PoseStack dhl, final float float2, final int integer);
     
     boolean isEnabled();
 }
diff --git a/src/net/minecraft/client/gui/spectator/SpectatorMenuListener.java b/src/net/minecraft/client/gui/spectator/SpectatorMenuListener.java
index 3c8f65d..c37b905 100644
--- a/src/net/minecraft/client/gui/spectator/SpectatorMenuListener.java
+++ b/src/net/minecraft/client/gui/spectator/SpectatorMenuListener.java
@@ -1,5 +1,5 @@
 package net.minecraft.client.gui.spectator;
 
 public interface SpectatorMenuListener {
-    void onSpectatorMenuClosed(final SpectatorMenu djp);
+    void onSpectatorMenuClosed(final SpectatorMenu duj);
 }
diff --git a/src/net/minecraft/client/gui/spectator/categories/SpectatorPage.java b/src/net/minecraft/client/gui/spectator/categories/SpectatorPage.java
index 6985bd9..bf9efd2 100644
--- a/src/net/minecraft/client/gui/spectator/categories/SpectatorPage.java
+++ b/src/net/minecraft/client/gui/spectator/categories/SpectatorPage.java
@@ -11,8 +11,8 @@ public class SpectatorPage {
     private final List<SpectatorMenuItem> items;
     private final int selection;
     
-    public SpectatorPage(final SpectatorMenuCategory djq, final List<SpectatorMenuItem> list, final int integer) {
-        this.category = djq;
+    public SpectatorPage(final SpectatorMenuCategory duk, final List<SpectatorMenuItem> list, final int integer) {
+        this.category = duk;
         this.items = list;
         this.selection = integer;
     }
diff --git a/src/net/minecraft/client/gui/spectator/categories/TeleportToPlayerMenuCategory.java b/src/net/minecraft/client/gui/spectator/categories/TeleportToPlayerMenuCategory.java
index d4621bb..15623a2 100644
--- a/src/net/minecraft/client/gui/spectator/categories/TeleportToPlayerMenuCategory.java
+++ b/src/net/minecraft/client/gui/spectator/categories/TeleportToPlayerMenuCategory.java
@@ -3,6 +3,7 @@ package net.minecraft.client.gui.spectator.categories;
 import com.google.common.collect.ComparisonChain;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.components.spectator.SpectatorGui;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.spectator.SpectatorMenu;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
@@ -28,9 +29,9 @@ public class TeleportToPlayerMenuCategory implements SpectatorMenuCategory, Spec
     
     public TeleportToPlayerMenuCategory(final Collection<PlayerInfo> collection) {
         this.items = Lists.newArrayList();
-        for (final PlayerInfo dns4 : TeleportToPlayerMenuCategory.PROFILE_ORDER.<PlayerInfo>sortedCopy(collection)) {
-            if (dns4.getGameMode() != GameType.SPECTATOR) {
-                this.items.add(new PlayerMenuItem(dns4.getProfile()));
+        for (final PlayerInfo dyq4 : TeleportToPlayerMenuCategory.PROFILE_ORDER.<PlayerInfo>sortedCopy(collection)) {
+            if (dyq4.getGameMode() != GameType.SPECTATOR) {
+                this.items.add(new PlayerMenuItem(dyq4.getProfile()));
             }
         }
     }
@@ -42,23 +43,23 @@ public class TeleportToPlayerMenuCategory implements SpectatorMenuCategory, Spec
     
     @Override
     public Component getPrompt() {
-        return new TranslatableComponent("spectatorMenu.teleport.prompt", new Object[0]);
+        return new TranslatableComponent("spectatorMenu.teleport.prompt");
     }
     
     @Override
-    public void selectItem(final SpectatorMenu djp) {
-        djp.selectCategory(this);
+    public void selectItem(final SpectatorMenu duj) {
+        duj.selectCategory(this);
     }
     
     @Override
     public Component getName() {
-        return new TranslatableComponent("spectatorMenu.teleport", new Object[0]);
+        return new TranslatableComponent("spectatorMenu.teleport");
     }
     
     @Override
-    public void renderIcon(final float float1, final int integer) {
+    public void renderIcon(final PoseStack dhl, final float float2, final int integer) {
         Minecraft.getInstance().getTextureManager().bind(SpectatorGui.SPECTATOR_LOCATION);
-        GuiComponent.blit(0, 0, 0.0f, 0.0f, 16, 16, 256, 256);
+        GuiComponent.blit(dhl, 0, 0, 0.0f, 0.0f, 16, 16, 256, 256);
     }
     
     @Override
@@ -67,6 +68,6 @@ public class TeleportToPlayerMenuCategory implements SpectatorMenuCategory, Spec
     }
     
     static {
-        PROFILE_ORDER = Ordering.<PlayerInfo>from((dns1, dns2) -> ComparisonChain.start().compare(dns1.getProfile().getId(), dns2.getProfile().getId()).result());
+        PROFILE_ORDER = Ordering.<PlayerInfo>from((dyq1, dyq2) -> ComparisonChain.start().compare(dyq1.getProfile().getId(), dyq2.getProfile().getId()).result());
     }
 }
diff --git a/src/net/minecraft/client/gui/spectator/categories/TeleportToTeamMenuCategory.java b/src/net/minecraft/client/gui/spectator/categories/TeleportToTeamMenuCategory.java
index f88bdf8..5c59507 100644
--- a/src/net/minecraft/client/gui/spectator/categories/TeleportToTeamMenuCategory.java
+++ b/src/net/minecraft/client/gui/spectator/categories/TeleportToTeamMenuCategory.java
@@ -10,6 +10,7 @@ import net.minecraft.client.multiplayer.PlayerInfo;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.components.spectator.SpectatorGui;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.spectator.SpectatorMenu;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
@@ -26,9 +27,9 @@ public class TeleportToTeamMenuCategory implements SpectatorMenuCategory, Specta
     
     public TeleportToTeamMenuCategory() {
         this.items = Lists.newArrayList();
-        final Minecraft dbn2 = Minecraft.getInstance();
-        for (final PlayerTeam cwj4 : dbn2.level.getScoreboard().getPlayerTeams()) {
-            this.items.add(new TeamSelectionItem(cwj4));
+        final Minecraft dlx2 = Minecraft.getInstance();
+        for (final PlayerTeam dfk4 : dlx2.level.getScoreboard().getPlayerTeams()) {
+            this.items.add(new TeamSelectionItem(dfk4));
         }
     }
     
@@ -39,29 +40,29 @@ public class TeleportToTeamMenuCategory implements SpectatorMenuCategory, Specta
     
     @Override
     public Component getPrompt() {
-        return new TranslatableComponent("spectatorMenu.team_teleport.prompt", new Object[0]);
+        return new TranslatableComponent("spectatorMenu.team_teleport.prompt");
     }
     
     @Override
-    public void selectItem(final SpectatorMenu djp) {
-        djp.selectCategory(this);
+    public void selectItem(final SpectatorMenu duj) {
+        duj.selectCategory(this);
     }
     
     @Override
     public Component getName() {
-        return new TranslatableComponent("spectatorMenu.team_teleport", new Object[0]);
+        return new TranslatableComponent("spectatorMenu.team_teleport");
     }
     
     @Override
-    public void renderIcon(final float float1, final int integer) {
+    public void renderIcon(final PoseStack dhl, final float float2, final int integer) {
         Minecraft.getInstance().getTextureManager().bind(SpectatorGui.SPECTATOR_LOCATION);
-        GuiComponent.blit(0, 0, 16.0f, 0.0f, 16, 16, 256, 256);
+        GuiComponent.blit(dhl, 0, 0, 16.0f, 0.0f, 16, 16, 256, 256);
     }
     
     @Override
     public boolean isEnabled() {
-        for (final SpectatorMenuItem djr3 : this.items) {
-            if (djr3.isEnabled()) {
+        for (final SpectatorMenuItem dul3 : this.items) {
+            if (dul3.isEnabled()) {
                 return true;
             }
         }
@@ -73,13 +74,13 @@ public class TeleportToTeamMenuCategory implements SpectatorMenuCategory, Specta
         private final ResourceLocation location;
         private final List<PlayerInfo> players;
         
-        public TeamSelectionItem(final PlayerTeam cwj) {
-            this.team = cwj;
+        public TeamSelectionItem(final PlayerTeam dfk) {
+            this.team = dfk;
             this.players = Lists.newArrayList();
-            for (final String string5 : cwj.getPlayers()) {
-                final PlayerInfo dns6 = Minecraft.getInstance().getConnection().getPlayerInfo(string5);
-                if (dns6 != null) {
-                    this.players.add(dns6);
+            for (final String string5 : dfk.getPlayers()) {
+                final PlayerInfo dyq6 = Minecraft.getInstance().getConnection().getPlayerInfo(string5);
+                if (dyq6 != null) {
+                    this.players.add(dyq6);
                 }
             }
             if (this.players.isEmpty()) {
@@ -92,8 +93,8 @@ public class TeleportToTeamMenuCategory implements SpectatorMenuCategory, Specta
         }
         
         @Override
-        public void selectItem(final SpectatorMenu djp) {
-            djp.selectCategory(new TeleportToPlayerMenuCategory(this.players));
+        public void selectItem(final SpectatorMenu duj) {
+            duj.selectCategory(new TeleportToPlayerMenuCategory(this.players));
         }
         
         @Override
@@ -102,18 +103,18 @@ public class TeleportToTeamMenuCategory implements SpectatorMenuCategory, Specta
         }
         
         @Override
-        public void renderIcon(final float float1, final int integer) {
+        public void renderIcon(final PoseStack dhl, final float float2, final int integer) {
             final Integer integer2 = this.team.getColor().getColor();
             if (integer2 != null) {
-                final float float2 = (integer2 >> 16 & 0xFF) / 255.0f;
-                final float float3 = (integer2 >> 8 & 0xFF) / 255.0f;
-                final float float4 = (integer2 & 0xFF) / 255.0f;
-                GuiComponent.fill(1, 1, 15, 15, Mth.color(float2 * float1, float3 * float1, float4 * float1) | integer << 24);
+                final float float3 = (integer2 >> 16 & 0xFF) / 255.0f;
+                final float float4 = (integer2 >> 8 & 0xFF) / 255.0f;
+                final float float5 = (integer2 & 0xFF) / 255.0f;
+                GuiComponent.fill(dhl, 1, 1, 15, 15, Mth.color(float3 * float2, float4 * float2, float5 * float2) | integer << 24);
             }
             Minecraft.getInstance().getTextureManager().bind(this.location);
-            RenderSystem.color4f(float1, float1, float1, integer / 255.0f);
-            GuiComponent.blit(2, 2, 12, 12, 8.0f, 8.0f, 8, 8, 64, 64);
-            GuiComponent.blit(2, 2, 12, 12, 40.0f, 8.0f, 8, 8, 64, 64);
+            RenderSystem.color4f(float2, float2, float2, integer / 255.0f);
+            GuiComponent.blit(dhl, 2, 2, 12, 12, 8.0f, 8.0f, 8, 8, 64, 64);
+            GuiComponent.blit(dhl, 2, 2, 12, 12, 40.0f, 8.0f, 8, 8, 64, 64);
         }
         
         @Override
diff --git a/src/net/minecraft/client/main/GameConfig.java b/src/net/minecraft/client/main/GameConfig.java
index 38d9cba..0ccf264 100644
--- a/src/net/minecraft/client/main/GameConfig.java
+++ b/src/net/minecraft/client/main/GameConfig.java
@@ -16,9 +16,9 @@ public class GameConfig {
     public final GameData game;
     public final ServerData server;
     
-    public GameConfig(final UserData d, final DisplayData cxh, final FolderData a, final GameData b, final ServerData c) {
+    public GameConfig(final UserData d, final DisplayData dgi, final FolderData a, final GameData b, final ServerData c) {
         this.user = d;
-        this.display = cxh;
+        this.display = dgi;
         this.location = a;
         this.game = b;
         this.server = c;
@@ -28,11 +28,15 @@ public class GameConfig {
         public final boolean demo;
         public final String launchVersion;
         public final String versionType;
+        public final boolean disableMultiplayer;
+        public final boolean disableChat;
         
-        public GameData(final boolean boolean1, final String string2, final String string3) {
+        public GameData(final boolean boolean1, final String string2, final String string3, final boolean boolean4, final boolean boolean5) {
             this.demo = boolean1;
             this.launchVersion = string2;
             this.versionType = string3;
+            this.disableMultiplayer = boolean4;
+            this.disableChat = boolean5;
         }
     }
     
@@ -42,8 +46,8 @@ public class GameConfig {
         public final PropertyMap profileProperties;
         public final Proxy proxy;
         
-        public UserData(final User dbz, final PropertyMap propertyMap2, final PropertyMap propertyMap3, final Proxy proxy) {
-            this.user = dbz;
+        public UserData(final User dml, final PropertyMap propertyMap2, final PropertyMap propertyMap3, final Proxy proxy) {
+            this.user = dml;
             this.userProperties = propertyMap2;
             this.profileProperties = propertyMap3;
             this.proxy = proxy;
diff --git a/src/net/minecraft/client/main/Main.java b/src/net/minecraft/client/main/Main.java
index 8e5c24f..f3aef02 100644
--- a/src/net/minecraft/client/main/Main.java
+++ b/src/net/minecraft/client/main/Main.java
@@ -16,6 +16,7 @@ import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.client.Minecraft;
 import com.mojang.blaze3d.platform.DisplayData;
 import net.minecraft.client.User;
+import net.minecraft.server.Bootstrap;
 import net.minecraft.CrashReport;
 import net.minecraft.world.entity.player.Player;
 import joptsimple.OptionSpec;
@@ -40,6 +41,8 @@ public class Main {
         final OptionParser optionParser2 = new OptionParser();
         optionParser2.allowsUnrecognizedOptions();
         optionParser2.accepts("demo");
+        optionParser2.accepts("disableMultiplayer");
+        optionParser2.accepts("disableChat");
         optionParser2.accepts("fullscreen");
         optionParser2.accepts("checkGlErrors");
         final OptionSpec<String> optionSpec3 = optionParser2.accepts("server").withRequiredArg();
@@ -47,141 +50,147 @@ public class Main {
         final OptionSpec<File> optionSpec5 = optionParser2.accepts("gameDir").withRequiredArg().<File>ofType(File.class).defaultsTo(new File("."), new File[0]);
         final OptionSpec<File> optionSpec6 = optionParser2.accepts("assetsDir").withRequiredArg().<File>ofType(File.class);
         final OptionSpec<File> optionSpec7 = optionParser2.accepts("resourcePackDir").withRequiredArg().<File>ofType(File.class);
-        final OptionSpec<String> optionSpec8 = optionParser2.accepts("proxyHost").withRequiredArg();
-        final OptionSpec<Integer> optionSpec9 = optionParser2.accepts("proxyPort").withRequiredArg().defaultsTo("8080", new String[0]).<Integer>ofType(Integer.class);
-        final OptionSpec<String> optionSpec10 = optionParser2.accepts("proxyUser").withRequiredArg();
-        final OptionSpec<String> optionSpec11 = optionParser2.accepts("proxyPass").withRequiredArg();
-        final OptionSpec<String> optionSpec12 = optionParser2.accepts("username").withRequiredArg().defaultsTo("Player" + Util.getMillis() % 1000L, new String[0]);
-        final OptionSpec<String> optionSpec13 = optionParser2.accepts("uuid").withRequiredArg();
-        final OptionSpec<String> optionSpec14 = optionParser2.accepts("accessToken").withRequiredArg().required();
-        final OptionSpec<String> optionSpec15 = optionParser2.accepts("version").withRequiredArg().required();
-        final OptionSpec<Integer> optionSpec16 = optionParser2.accepts("width").withRequiredArg().<Integer>ofType(Integer.class).defaultsTo(854, new Integer[0]);
-        final OptionSpec<Integer> optionSpec17 = optionParser2.accepts("height").withRequiredArg().<Integer>ofType(Integer.class).defaultsTo(480, new Integer[0]);
-        final OptionSpec<Integer> optionSpec18 = optionParser2.accepts("fullscreenWidth").withRequiredArg().<Integer>ofType(Integer.class);
-        final OptionSpec<Integer> optionSpec19 = optionParser2.accepts("fullscreenHeight").withRequiredArg().<Integer>ofType(Integer.class);
-        final OptionSpec<String> optionSpec20 = optionParser2.accepts("userProperties").withRequiredArg().defaultsTo("{}", new String[0]);
-        final OptionSpec<String> optionSpec21 = optionParser2.accepts("profileProperties").withRequiredArg().defaultsTo("{}", new String[0]);
-        final OptionSpec<String> optionSpec22 = optionParser2.accepts("assetIndex").withRequiredArg();
-        final OptionSpec<String> optionSpec23 = optionParser2.accepts("userType").withRequiredArg().defaultsTo("legacy", new String[0]);
-        final OptionSpec<String> optionSpec24 = optionParser2.accepts("versionType").withRequiredArg().defaultsTo("release", new String[0]);
-        final OptionSpec<String> optionSpec25 = optionParser2.nonOptions();
-        final OptionSet optionSet26 = optionParser2.parse(arr);
-        final List<String> list27 = optionSet26.<String>valuesOf(optionSpec25);
-        if (!list27.isEmpty()) {
-            System.out.println("Completely ignored arguments: " + list27);
+        final OptionSpec<File> optionSpec8 = optionParser2.accepts("dataPackDir").withRequiredArg().<File>ofType(File.class);
+        final OptionSpec<String> optionSpec9 = optionParser2.accepts("proxyHost").withRequiredArg();
+        final OptionSpec<Integer> optionSpec10 = optionParser2.accepts("proxyPort").withRequiredArg().defaultsTo("8080", new String[0]).<Integer>ofType(Integer.class);
+        final OptionSpec<String> optionSpec11 = optionParser2.accepts("proxyUser").withRequiredArg();
+        final OptionSpec<String> optionSpec12 = optionParser2.accepts("proxyPass").withRequiredArg();
+        final OptionSpec<String> optionSpec13 = optionParser2.accepts("username").withRequiredArg().defaultsTo("Player" + Util.getMillis() % 1000L, new String[0]);
+        final OptionSpec<String> optionSpec14 = optionParser2.accepts("uuid").withRequiredArg();
+        final OptionSpec<String> optionSpec15 = optionParser2.accepts("accessToken").withRequiredArg().required();
+        final OptionSpec<String> optionSpec16 = optionParser2.accepts("version").withRequiredArg().required();
+        final OptionSpec<Integer> optionSpec17 = optionParser2.accepts("width").withRequiredArg().<Integer>ofType(Integer.class).defaultsTo(854, new Integer[0]);
+        final OptionSpec<Integer> optionSpec18 = optionParser2.accepts("height").withRequiredArg().<Integer>ofType(Integer.class).defaultsTo(480, new Integer[0]);
+        final OptionSpec<Integer> optionSpec19 = optionParser2.accepts("fullscreenWidth").withRequiredArg().<Integer>ofType(Integer.class);
+        final OptionSpec<Integer> optionSpec20 = optionParser2.accepts("fullscreenHeight").withRequiredArg().<Integer>ofType(Integer.class);
+        final OptionSpec<String> optionSpec21 = optionParser2.accepts("userProperties").withRequiredArg().defaultsTo("{}", new String[0]);
+        final OptionSpec<String> optionSpec22 = optionParser2.accepts("profileProperties").withRequiredArg().defaultsTo("{}", new String[0]);
+        final OptionSpec<String> optionSpec23 = optionParser2.accepts("assetIndex").withRequiredArg();
+        final OptionSpec<String> optionSpec24 = optionParser2.accepts("userType").withRequiredArg().defaultsTo("legacy", new String[0]);
+        final OptionSpec<String> optionSpec25 = optionParser2.accepts("versionType").withRequiredArg().defaultsTo("release", new String[0]);
+        final OptionSpec<String> optionSpec26 = optionParser2.nonOptions();
+        final OptionSet optionSet27 = optionParser2.parse(arr);
+        final List<String> list28 = optionSet27.<String>valuesOf(optionSpec26);
+        if (!list28.isEmpty()) {
+            System.out.println("Completely ignored arguments: " + list28);
         }
-        final String string28 = Main.<String>parseArgument(optionSet26, optionSpec8);
-        Proxy proxy29 = Proxy.NO_PROXY;
-        if (string28 != null) {
+        final String string29 = Main.<String>parseArgument(optionSet27, optionSpec9);
+        Proxy proxy30 = Proxy.NO_PROXY;
+        if (string29 != null) {
             try {
-                proxy29 = new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(string28, Main.<Integer>parseArgument(optionSet26, optionSpec9)));
+                proxy30 = new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(string29, Main.<Integer>parseArgument(optionSet27, optionSpec10)));
             }
             catch (Exception ex) {}
         }
-        final String string29 = Main.<String>parseArgument(optionSet26, optionSpec10);
-        final String string30 = Main.<String>parseArgument(optionSet26, optionSpec11);
-        if (!proxy29.equals(Proxy.NO_PROXY) && stringHasValue(string29) && stringHasValue(string30)) {
+        final String string30 = Main.<String>parseArgument(optionSet27, optionSpec11);
+        final String string31 = Main.<String>parseArgument(optionSet27, optionSpec12);
+        if (!proxy30.equals(Proxy.NO_PROXY) && stringHasValue(string30) && stringHasValue(string31)) {
             Authenticator.setDefault(new Authenticator() {
                 @Override
                 protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(string29, string30.toCharArray());
+                    return new PasswordAuthentication(string30, string31.toCharArray());
                 }
             });
         }
-        final int integer32 = Main.<Integer>parseArgument(optionSet26, optionSpec16);
-        final int integer33 = Main.<Integer>parseArgument(optionSet26, optionSpec17);
-        final OptionalInt optionalInt34 = ofNullable(Main.<Integer>parseArgument(optionSet26, optionSpec18));
-        final OptionalInt optionalInt35 = ofNullable(Main.<Integer>parseArgument(optionSet26, optionSpec19));
-        final boolean boolean36 = optionSet26.has("fullscreen");
-        final boolean boolean37 = optionSet26.has("demo");
-        final String string31 = Main.<String>parseArgument(optionSet26, optionSpec15);
-        final Gson gson39 = new GsonBuilder().registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer()).create();
-        final PropertyMap propertyMap40 = GsonHelper.<PropertyMap>fromJson(gson39, Main.<String>parseArgument(optionSet26, optionSpec20), PropertyMap.class);
-        final PropertyMap propertyMap41 = GsonHelper.<PropertyMap>fromJson(gson39, Main.<String>parseArgument(optionSet26, optionSpec21), PropertyMap.class);
-        final String string32 = Main.<String>parseArgument(optionSet26, optionSpec24);
-        final File file43 = Main.<File>parseArgument(optionSet26, optionSpec5);
-        final File file44 = optionSet26.has(optionSpec6) ? Main.<File>parseArgument(optionSet26, optionSpec6) : new File(file43, "assets/");
-        final File file45 = optionSet26.has(optionSpec7) ? Main.<File>parseArgument(optionSet26, optionSpec7) : new File(file43, "resourcepacks/");
-        final String string33 = optionSet26.has(optionSpec13) ? optionSpec13.value(optionSet26) : Player.createPlayerUUID(optionSpec12.value(optionSet26)).toString();
-        final String string34 = optionSet26.has(optionSpec22) ? optionSpec22.value(optionSet26) : null;
-        final String string35 = Main.<String>parseArgument(optionSet26, optionSpec3);
-        final Integer integer34 = Main.<Integer>parseArgument(optionSet26, optionSpec4);
+        final int integer33 = Main.<Integer>parseArgument(optionSet27, optionSpec17);
+        final int integer34 = Main.<Integer>parseArgument(optionSet27, optionSpec18);
+        final OptionalInt optionalInt35 = ofNullable(Main.<Integer>parseArgument(optionSet27, optionSpec19));
+        final OptionalInt optionalInt36 = ofNullable(Main.<Integer>parseArgument(optionSet27, optionSpec20));
+        final boolean boolean37 = optionSet27.has("fullscreen");
+        final boolean boolean38 = optionSet27.has("demo");
+        final boolean boolean39 = optionSet27.has("disableMultiplayer");
+        final boolean boolean40 = optionSet27.has("disableChat");
+        final String string32 = Main.<String>parseArgument(optionSet27, optionSpec16);
+        final Gson gson42 = new GsonBuilder().registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer()).create();
+        final PropertyMap propertyMap43 = GsonHelper.<PropertyMap>fromJson(gson42, Main.<String>parseArgument(optionSet27, optionSpec21), PropertyMap.class);
+        final PropertyMap propertyMap44 = GsonHelper.<PropertyMap>fromJson(gson42, Main.<String>parseArgument(optionSet27, optionSpec22), PropertyMap.class);
+        final String string33 = Main.<String>parseArgument(optionSet27, optionSpec25);
+        final File file46 = Main.<File>parseArgument(optionSet27, optionSpec5);
+        final File file47 = optionSet27.has(optionSpec6) ? Main.<File>parseArgument(optionSet27, optionSpec6) : new File(file46, "assets/");
+        final File file48 = optionSet27.has(optionSpec7) ? Main.<File>parseArgument(optionSet27, optionSpec7) : new File(file46, "resourcepacks/");
+        final String string34 = optionSet27.has(optionSpec14) ? optionSpec14.value(optionSet27) : Player.createPlayerUUID(optionSpec13.value(optionSet27)).toString();
+        final String string35 = optionSet27.has(optionSpec23) ? optionSpec23.value(optionSet27) : null;
+        final String string36 = Main.<String>parseArgument(optionSet27, optionSpec3);
+        final Integer integer35 = Main.<Integer>parseArgument(optionSet27, optionSpec4);
         CrashReport.preload();
-        final User dbz50 = new User(optionSpec12.value(optionSet26), string33, optionSpec14.value(optionSet26), optionSpec23.value(optionSet26));
-        final GameConfig djy51 = new GameConfig(new GameConfig.UserData(dbz50, propertyMap40, propertyMap41, proxy29), new DisplayData(integer32, integer33, optionalInt34, optionalInt35, boolean36), new GameConfig.FolderData(file43, file45, file44, string34), new GameConfig.GameData(boolean37, string31, string32), new GameConfig.ServerData(string35, integer34));
-        final Thread thread52 = new Thread("Client Shutdown Thread") {
+        Bootstrap.bootStrap();
+        Bootstrap.validate();
+        Util.startTimerHackThread();
+        final User dml53 = new User(optionSpec13.value(optionSet27), string34, optionSpec15.value(optionSet27), optionSpec24.value(optionSet27));
+        final GameConfig dus54 = new GameConfig(new GameConfig.UserData(dml53, propertyMap43, propertyMap44, proxy30), new DisplayData(integer33, integer34, optionalInt35, optionalInt36, boolean37), new GameConfig.FolderData(file46, file48, file47, string35), new GameConfig.GameData(boolean38, string32, string33, boolean39, boolean40), new GameConfig.ServerData(string36, integer35));
+        final Thread thread55 = new Thread("Client Shutdown Thread") {
             @Override
             public void run() {
-                final Minecraft dbn2 = Minecraft.getInstance();
-                if (dbn2 == null) {
+                final Minecraft dlx2 = Minecraft.getInstance();
+                if (dlx2 == null) {
                     return;
                 }
-                final IntegratedServer edm3 = dbn2.getSingleplayerServer();
-                if (edm3 != null) {
-                    edm3.halt(true);
+                final IntegratedServer eoz3 = dlx2.getSingleplayerServer();
+                if (eoz3 != null) {
+                    eoz3.halt(true);
                 }
             }
         };
-        thread52.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(Main.LOGGER));
-        Runtime.getRuntime().addShutdownHook(thread52);
-        final RenderPipeline cxd53 = new RenderPipeline();
-        Minecraft dbn54;
+        thread55.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(Main.LOGGER));
+        Runtime.getRuntime().addShutdownHook(thread55);
+        final RenderPipeline dge56 = new RenderPipeline();
+        Minecraft dlx57;
         try {
             Thread.currentThread().setName("Render thread");
             RenderSystem.initRenderThread();
             RenderSystem.beginInitialization();
-            dbn54 = new Minecraft(djy51);
+            dlx57 = new Minecraft(dus54);
             RenderSystem.finishInitialization();
         }
-        catch (SilentInitException djz55) {
-            Main.LOGGER.warn("Failed to create window: ", (Throwable)djz55);
+        catch (SilentInitException dut58) {
+            Main.LOGGER.warn("Failed to create window: ", (Throwable)dut58);
             return;
         }
-        catch (Throwable throwable55) {
-            final CrashReport h56 = CrashReport.forThrowable(throwable55, "Initializing game");
-            h56.addCategory("Initialization");
-            Minecraft.fillReport(null, djy51.game.launchVersion, null, h56);
-            Minecraft.crash(h56);
+        catch (Throwable throwable58) {
+            final CrashReport j59 = CrashReport.forThrowable(throwable58, "Initializing game");
+            j59.addCategory("Initialization");
+            Minecraft.fillReport(null, dus54.game.launchVersion, null, j59);
+            Minecraft.crash(j59);
             return;
         }
-        Thread thread53;
-        if (dbn54.renderOnThread()) {
-            thread53 = new Thread("Game thread") {
+        Thread thread56;
+        if (dlx57.renderOnThread()) {
+            thread56 = new Thread("Game thread") {
                 @Override
                 public void run() {
                     try {
                         RenderSystem.initGameThread(true);
-                        dbn54.run();
+                        dlx57.run();
                     }
                     catch (Throwable throwable2) {
                         Main.LOGGER.error("Exception in client thread", throwable2);
                     }
                 }
             };
-            thread53.start();
-            while (dbn54.isRunning()) {}
+            thread56.start();
+            while (dlx57.isRunning()) {}
         }
         else {
-            thread53 = null;
+            thread56 = null;
             try {
                 RenderSystem.initGameThread(false);
-                dbn54.run();
+                dlx57.run();
             }
-            catch (Throwable throwable56) {
-                Main.LOGGER.error("Unhandled game exception", throwable56);
+            catch (Throwable throwable59) {
+                Main.LOGGER.error("Unhandled game exception", throwable59);
             }
         }
         try {
-            dbn54.stop();
-            if (thread53 != null) {
-                thread53.join();
+            dlx57.stop();
+            if (thread56 != null) {
+                thread56.join();
             }
         }
-        catch (InterruptedException interruptedException56) {
-            Main.LOGGER.error("Exception during client thread shutdown", (Throwable)interruptedException56);
+        catch (InterruptedException interruptedException59) {
+            Main.LOGGER.error("Exception during client thread shutdown", (Throwable)interruptedException59);
         }
         finally {
-            dbn54.destroy();
+            dlx57.destroy();
         }
     }
     
diff --git a/src/net/minecraft/client/model/AbstractZombieModel.java b/src/net/minecraft/client/model/AbstractZombieModel.java
index 2cb9f53..cf09bfd 100644
--- a/src/net/minecraft/client/model/AbstractZombieModel.java
+++ b/src/net/minecraft/client/model/AbstractZombieModel.java
@@ -2,8 +2,6 @@ package net.minecraft.client.model;
 
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.client.model.geom.ModelPart;
-import net.minecraft.util.Mth;
 import net.minecraft.world.entity.monster.Monster;
 
 public abstract class AbstractZombieModel<T extends Monster> extends HumanoidModel<T> {
@@ -12,31 +10,10 @@ public abstract class AbstractZombieModel<T extends Monster> extends HumanoidMod
     }
     
     @Override
-    public void setupAnim(final T aww, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(aww, float2, float3, float4, float5, float6);
-        final boolean boolean8 = this.isAggressive(aww);
-        final float float7 = Mth.sin(this.attackTime * 3.1415927f);
-        final float float8 = Mth.sin((1.0f - (1.0f - this.attackTime) * (1.0f - this.attackTime)) * 3.1415927f);
-        this.rightArm.zRot = 0.0f;
-        this.leftArm.zRot = 0.0f;
-        this.rightArm.yRot = -(0.1f - float7 * 0.6f);
-        this.leftArm.yRot = 0.1f - float7 * 0.6f;
-        final float float9 = -3.1415927f / (boolean8 ? 1.5f : 2.25f);
-        this.rightArm.xRot = float9;
-        this.leftArm.xRot = float9;
-        final ModelPart rightArm = this.rightArm;
-        rightArm.xRot += float7 * 1.2f - float8 * 0.4f;
-        final ModelPart leftArm = this.leftArm;
-        leftArm.xRot += float7 * 1.2f - float8 * 0.4f;
-        final ModelPart rightArm2 = this.rightArm;
-        rightArm2.zRot += Mth.cos(float4 * 0.09f) * 0.05f + 0.05f;
-        final ModelPart leftArm2 = this.leftArm;
-        leftArm2.zRot -= Mth.cos(float4 * 0.09f) * 0.05f + 0.05f;
-        final ModelPart rightArm3 = this.rightArm;
-        rightArm3.xRot += Mth.sin(float4 * 0.067f) * 0.05f;
-        final ModelPart leftArm3 = this.leftArm;
-        leftArm3.xRot -= Mth.sin(float4 * 0.067f) * 0.05f;
+    public void setupAnim(final T bcb, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(bcb, float2, float3, float4, float5, float6);
+        AnimationUtils.animateZombieArms(this.leftArm, this.rightArm, this.isAggressive(bcb), this.attackTime, float4);
     }
     
-    public abstract boolean isAggressive(final T aww);
+    public abstract boolean isAggressive(final T bcb);
 }
diff --git a/src/net/minecraft/client/model/AgeableListModel.java b/src/net/minecraft/client/model/AgeableListModel.java
index 085868c..e5a2cbd 100644
--- a/src/net/minecraft/client/model/AgeableListModel.java
+++ b/src/net/minecraft/client/model/AgeableListModel.java
@@ -39,26 +39,26 @@ public abstract class AgeableListModel<E extends Entity> extends EntityModel<E>
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
         if (this.young) {
-            cyl.pushPose();
+            dhl.pushPose();
             if (this.scaleHead) {
                 final float float9 = 1.5f / this.babyHeadScale;
-                cyl.scale(float9, float9, float9);
+                dhl.scale(float9, float9, float9);
             }
-            cyl.translate(0.0, this.yHeadOffset / 16.0f, this.zHeadOffset / 16.0f);
-            this.headParts().forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
-            cyl.popPose();
-            cyl.pushPose();
+            dhl.translate(0.0, this.yHeadOffset / 16.0f, this.zHeadOffset / 16.0f);
+            this.headParts().forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
+            dhl.popPose();
+            dhl.pushPose();
             final float float9 = 1.0f / this.babyBodyScale;
-            cyl.scale(float9, float9, float9);
-            cyl.translate(0.0, this.bodyYOffset / 16.0f, 0.0);
-            this.bodyParts().forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
-            cyl.popPose();
+            dhl.scale(float9, float9, float9);
+            dhl.translate(0.0, this.bodyYOffset / 16.0f, 0.0);
+            this.bodyParts().forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
+            dhl.popPose();
         }
         else {
-            this.headParts().forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
-            this.bodyParts().forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
+            this.headParts().forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
+            this.bodyParts().forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
         }
     }
     
diff --git a/src/net/minecraft/client/model/AnimationUtils.java b/src/net/minecraft/client/model/AnimationUtils.java
new file mode 100644
index 0000000..23410d6
--- /dev/null
+++ b/src/net/minecraft/client/model/AnimationUtils.java
@@ -0,0 +1,76 @@
+package net.minecraft.client.model;
+
+import net.minecraft.world.entity.HumanoidArm;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.util.Mth;
+import net.minecraft.world.item.CrossbowItem;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.client.model.geom.ModelPart;
+
+public class AnimationUtils {
+    public static void animateCrossbowHold(final ModelPart dyg1, final ModelPart dyg2, final ModelPart dyg3, final boolean boolean4) {
+        final ModelPart dyg4 = boolean4 ? dyg1 : dyg2;
+        final ModelPart dyg5 = boolean4 ? dyg2 : dyg1;
+        dyg4.yRot = (boolean4 ? -0.3f : 0.3f) + dyg3.yRot;
+        dyg5.yRot = (boolean4 ? 0.6f : -0.6f) + dyg3.yRot;
+        dyg4.xRot = -1.5707964f + dyg3.xRot + 0.1f;
+        dyg5.xRot = -1.5f + dyg3.xRot;
+    }
+    
+    public static void animateCrossbowCharge(final ModelPart dyg1, final ModelPart dyg2, final LivingEntity aoy, final boolean boolean4) {
+        final ModelPart dyg3 = boolean4 ? dyg1 : dyg2;
+        final ModelPart dyg4 = boolean4 ? dyg2 : dyg1;
+        dyg3.yRot = (boolean4 ? -0.8f : 0.8f);
+        dyg3.xRot = -0.97079635f;
+        dyg4.xRot = dyg3.xRot;
+        final float float7 = (float)CrossbowItem.getChargeDuration(aoy.getUseItem());
+        final float float8 = Mth.clamp((float)aoy.getTicksUsingItem(), 0.0f, float7);
+        final float float9 = float8 / float7;
+        dyg4.yRot = Mth.lerp(float9, 0.4f, 0.85f) * (boolean4 ? 1 : -1);
+        dyg4.xRot = Mth.lerp(float9, dyg4.xRot, -1.5707964f);
+    }
+    
+    public static <T extends Mob> void swingWeaponDown(final ModelPart dyg1, final ModelPart dyg2, final T aoz, final float float4, final float float5) {
+        final float float6 = Mth.sin(float4 * 3.1415927f);
+        final float float7 = Mth.sin((1.0f - (1.0f - float4) * (1.0f - float4)) * 3.1415927f);
+        dyg1.zRot = 0.0f;
+        dyg2.zRot = 0.0f;
+        dyg1.yRot = 0.15707964f;
+        dyg2.yRot = -0.15707964f;
+        if (aoz.getMainArm() == HumanoidArm.RIGHT) {
+            dyg1.xRot = -1.8849558f + Mth.cos(float5 * 0.09f) * 0.15f;
+            dyg2.xRot = -0.0f + Mth.cos(float5 * 0.19f) * 0.5f;
+            dyg1.xRot += float6 * 2.2f - float7 * 0.4f;
+            dyg2.xRot += float6 * 1.2f - float7 * 0.4f;
+        }
+        else {
+            dyg1.xRot = -0.0f + Mth.cos(float5 * 0.19f) * 0.5f;
+            dyg2.xRot = -1.8849558f + Mth.cos(float5 * 0.09f) * 0.15f;
+            dyg1.xRot += float6 * 1.2f - float7 * 0.4f;
+            dyg2.xRot += float6 * 2.2f - float7 * 0.4f;
+        }
+        bobArms(dyg1, dyg2, float5);
+    }
+    
+    public static void bobArms(final ModelPart dyg1, final ModelPart dyg2, final float float3) {
+        dyg1.zRot += Mth.cos(float3 * 0.09f) * 0.05f + 0.05f;
+        dyg2.zRot -= Mth.cos(float3 * 0.09f) * 0.05f + 0.05f;
+        dyg1.xRot += Mth.sin(float3 * 0.067f) * 0.05f;
+        dyg2.xRot -= Mth.sin(float3 * 0.067f) * 0.05f;
+    }
+    
+    public static void animateZombieArms(final ModelPart dyg1, final ModelPart dyg2, final boolean boolean3, final float float4, final float float5) {
+        final float float6 = Mth.sin(float4 * 3.1415927f);
+        final float float7 = Mth.sin((1.0f - (1.0f - float4) * (1.0f - float4)) * 3.1415927f);
+        dyg2.zRot = 0.0f;
+        dyg1.zRot = 0.0f;
+        dyg2.yRot = -(0.1f - float6 * 0.6f);
+        dyg1.yRot = 0.1f - float6 * 0.6f;
+        final float float8 = -3.1415927f / (boolean3 ? 1.5f : 2.25f);
+        dyg2.xRot = float8;
+        dyg1.xRot = float8;
+        dyg2.xRot += float6 * 1.2f - float7 * 0.4f;
+        dyg1.xRot += float6 * 1.2f - float7 * 0.4f;
+        bobArms(dyg2, dyg1, float5);
+    }
+}
diff --git a/src/net/minecraft/client/model/ArmedModel.java b/src/net/minecraft/client/model/ArmedModel.java
index 166e2f1..78750a0 100644
--- a/src/net/minecraft/client/model/ArmedModel.java
+++ b/src/net/minecraft/client/model/ArmedModel.java
@@ -4,5 +4,5 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.entity.HumanoidArm;
 
 public interface ArmedModel {
-    void translateToHand(final HumanoidArm aky, final PoseStack cyl);
+    void translateToHand(final HumanoidArm aou, final PoseStack dhl);
 }
diff --git a/src/net/minecraft/client/model/ArmorStandArmorModel.java b/src/net/minecraft/client/model/ArmorStandArmorModel.java
index fd2eae2..3c8c2b5 100644
--- a/src/net/minecraft/client/model/ArmorStandArmorModel.java
+++ b/src/net/minecraft/client/model/ArmorStandArmorModel.java
@@ -14,27 +14,27 @@ public class ArmorStandArmorModel extends HumanoidModel<ArmorStand> {
     }
     
     @Override
-    public void setupAnim(final ArmorStand avp, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        this.head.xRot = 0.017453292f * avp.getHeadPose().getX();
-        this.head.yRot = 0.017453292f * avp.getHeadPose().getY();
-        this.head.zRot = 0.017453292f * avp.getHeadPose().getZ();
+    public void setupAnim(final ArmorStand bay, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        this.head.xRot = 0.017453292f * bay.getHeadPose().getX();
+        this.head.yRot = 0.017453292f * bay.getHeadPose().getY();
+        this.head.zRot = 0.017453292f * bay.getHeadPose().getZ();
         this.head.setPos(0.0f, 1.0f, 0.0f);
-        this.body.xRot = 0.017453292f * avp.getBodyPose().getX();
-        this.body.yRot = 0.017453292f * avp.getBodyPose().getY();
-        this.body.zRot = 0.017453292f * avp.getBodyPose().getZ();
-        this.leftArm.xRot = 0.017453292f * avp.getLeftArmPose().getX();
-        this.leftArm.yRot = 0.017453292f * avp.getLeftArmPose().getY();
-        this.leftArm.zRot = 0.017453292f * avp.getLeftArmPose().getZ();
-        this.rightArm.xRot = 0.017453292f * avp.getRightArmPose().getX();
-        this.rightArm.yRot = 0.017453292f * avp.getRightArmPose().getY();
-        this.rightArm.zRot = 0.017453292f * avp.getRightArmPose().getZ();
-        this.leftLeg.xRot = 0.017453292f * avp.getLeftLegPose().getX();
-        this.leftLeg.yRot = 0.017453292f * avp.getLeftLegPose().getY();
-        this.leftLeg.zRot = 0.017453292f * avp.getLeftLegPose().getZ();
+        this.body.xRot = 0.017453292f * bay.getBodyPose().getX();
+        this.body.yRot = 0.017453292f * bay.getBodyPose().getY();
+        this.body.zRot = 0.017453292f * bay.getBodyPose().getZ();
+        this.leftArm.xRot = 0.017453292f * bay.getLeftArmPose().getX();
+        this.leftArm.yRot = 0.017453292f * bay.getLeftArmPose().getY();
+        this.leftArm.zRot = 0.017453292f * bay.getLeftArmPose().getZ();
+        this.rightArm.xRot = 0.017453292f * bay.getRightArmPose().getX();
+        this.rightArm.yRot = 0.017453292f * bay.getRightArmPose().getY();
+        this.rightArm.zRot = 0.017453292f * bay.getRightArmPose().getZ();
+        this.leftLeg.xRot = 0.017453292f * bay.getLeftLegPose().getX();
+        this.leftLeg.yRot = 0.017453292f * bay.getLeftLegPose().getY();
+        this.leftLeg.zRot = 0.017453292f * bay.getLeftLegPose().getZ();
         this.leftLeg.setPos(1.9f, 11.0f, 0.0f);
-        this.rightLeg.xRot = 0.017453292f * avp.getRightLegPose().getX();
-        this.rightLeg.yRot = 0.017453292f * avp.getRightLegPose().getY();
-        this.rightLeg.zRot = 0.017453292f * avp.getRightLegPose().getZ();
+        this.rightLeg.xRot = 0.017453292f * bay.getRightLegPose().getX();
+        this.rightLeg.yRot = 0.017453292f * bay.getRightLegPose().getY();
+        this.rightLeg.zRot = 0.017453292f * bay.getRightLegPose().getZ();
         this.rightLeg.setPos(-1.9f, 11.0f, 0.0f);
         this.hat.copyFrom(this.head);
     }
diff --git a/src/net/minecraft/client/model/ArmorStandModel.java b/src/net/minecraft/client/model/ArmorStandModel.java
index cd9539b..cacbdd0 100644
--- a/src/net/minecraft/client/model/ArmorStandModel.java
+++ b/src/net/minecraft/client/model/ArmorStandModel.java
@@ -51,29 +51,29 @@ public class ArmorStandModel extends ArmorStandArmorModel {
     }
     
     @Override
-    public void prepareMobModel(final ArmorStand avp, final float float2, final float float3, final float float4) {
+    public void prepareMobModel(final ArmorStand bay, final float float2, final float float3, final float float4) {
         this.basePlate.xRot = 0.0f;
-        this.basePlate.yRot = 0.017453292f * -Mth.rotLerp(float4, avp.yRotO, avp.yRot);
+        this.basePlate.yRot = 0.017453292f * -Mth.rotLerp(float4, bay.yRotO, bay.yRot);
         this.basePlate.zRot = 0.0f;
     }
     
     @Override
-    public void setupAnim(final ArmorStand avp, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(avp, float2, float3, float4, float5, float6);
-        this.leftArm.visible = avp.isShowArms();
-        this.rightArm.visible = avp.isShowArms();
-        this.basePlate.visible = !avp.isNoBasePlate();
+    public void setupAnim(final ArmorStand bay, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(bay, float2, float3, float4, float5, float6);
+        this.leftArm.visible = bay.isShowArms();
+        this.rightArm.visible = bay.isShowArms();
+        this.basePlate.visible = !bay.isNoBasePlate();
         this.leftLeg.setPos(1.9f, 12.0f, 0.0f);
         this.rightLeg.setPos(-1.9f, 12.0f, 0.0f);
-        this.bodyStick1.xRot = 0.017453292f * avp.getBodyPose().getX();
-        this.bodyStick1.yRot = 0.017453292f * avp.getBodyPose().getY();
-        this.bodyStick1.zRot = 0.017453292f * avp.getBodyPose().getZ();
-        this.bodyStick2.xRot = 0.017453292f * avp.getBodyPose().getX();
-        this.bodyStick2.yRot = 0.017453292f * avp.getBodyPose().getY();
-        this.bodyStick2.zRot = 0.017453292f * avp.getBodyPose().getZ();
-        this.shoulderStick.xRot = 0.017453292f * avp.getBodyPose().getX();
-        this.shoulderStick.yRot = 0.017453292f * avp.getBodyPose().getY();
-        this.shoulderStick.zRot = 0.017453292f * avp.getBodyPose().getZ();
+        this.bodyStick1.xRot = 0.017453292f * bay.getBodyPose().getX();
+        this.bodyStick1.yRot = 0.017453292f * bay.getBodyPose().getY();
+        this.bodyStick1.zRot = 0.017453292f * bay.getBodyPose().getZ();
+        this.bodyStick2.xRot = 0.017453292f * bay.getBodyPose().getX();
+        this.bodyStick2.yRot = 0.017453292f * bay.getBodyPose().getY();
+        this.bodyStick2.zRot = 0.017453292f * bay.getBodyPose().getZ();
+        this.shoulderStick.xRot = 0.017453292f * bay.getBodyPose().getX();
+        this.shoulderStick.yRot = 0.017453292f * bay.getBodyPose().getY();
+        this.shoulderStick.zRot = 0.017453292f * bay.getBodyPose().getZ();
     }
     
     @Override
@@ -82,11 +82,11 @@ public class ArmorStandModel extends ArmorStandArmorModel {
     }
     
     @Override
-    public void translateToHand(final HumanoidArm aky, final PoseStack cyl) {
-        final ModelPart dni4 = this.getArm(aky);
-        final boolean boolean5 = dni4.visible;
-        dni4.visible = true;
-        super.translateToHand(aky, cyl);
-        dni4.visible = boolean5;
+    public void translateToHand(final HumanoidArm aou, final PoseStack dhl) {
+        final ModelPart dyg4 = this.getArm(aou);
+        final boolean boolean5 = dyg4.visible;
+        dyg4.visible = true;
+        super.translateToHand(aou, dhl);
+        dyg4.visible = boolean5;
     }
 }
diff --git a/src/net/minecraft/client/model/BatModel.java b/src/net/minecraft/client/model/BatModel.java
index 21ca84b..7739017 100644
--- a/src/net/minecraft/client/model/BatModel.java
+++ b/src/net/minecraft/client/model/BatModel.java
@@ -18,13 +18,13 @@ public class BatModel extends ListModel<Bat> {
         this.texWidth = 64;
         this.texHeight = 64;
         (this.head = new ModelPart(this, 0, 0)).addBox(-3.0f, -3.0f, -3.0f, 6.0f, 6.0f, 6.0f);
-        final ModelPart dni2 = new ModelPart(this, 24, 0);
-        dni2.addBox(-4.0f, -6.0f, -2.0f, 3.0f, 4.0f, 1.0f);
-        this.head.addChild(dni2);
-        final ModelPart dni3 = new ModelPart(this, 24, 0);
-        dni3.mirror = true;
-        dni3.addBox(1.0f, -6.0f, -2.0f, 3.0f, 4.0f, 1.0f);
-        this.head.addChild(dni3);
+        final ModelPart dyg2 = new ModelPart(this, 24, 0);
+        dyg2.addBox(-4.0f, -6.0f, -2.0f, 3.0f, 4.0f, 1.0f);
+        this.head.addChild(dyg2);
+        final ModelPart dyg3 = new ModelPart(this, 24, 0);
+        dyg3.mirror = true;
+        dyg3.addBox(1.0f, -6.0f, -2.0f, 3.0f, 4.0f, 1.0f);
+        this.head.addChild(dyg3);
         (this.body = new ModelPart(this, 0, 16)).addBox(-3.0f, 4.0f, -3.0f, 6.0f, 12.0f, 6.0f);
         this.body.texOffs(0, 34).addBox(-5.0f, 16.0f, 0.0f, 10.0f, 6.0f, 1.0f);
         (this.rightWing = new ModelPart(this, 42, 0)).addBox(-12.0f, 1.0f, 1.5f, 10.0f, 16.0f, 1.0f);
@@ -49,8 +49,8 @@ public class BatModel extends ListModel<Bat> {
     }
     
     @Override
-    public void setupAnim(final Bat asx, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        if (asx.isResting()) {
+    public void setupAnim(final Bat ayf, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        if (ayf.isResting()) {
             this.head.xRot = float6 * 0.017453292f;
             this.head.yRot = 3.1415927f - float5 * 0.017453292f;
             this.head.zRot = 3.1415927f;
diff --git a/src/net/minecraft/client/model/BeeModel.java b/src/net/minecraft/client/model/BeeModel.java
index e9ab233..6d5f209 100644
--- a/src/net/minecraft/client/model/BeeModel.java
+++ b/src/net/minecraft/client/model/BeeModel.java
@@ -60,20 +60,20 @@ public class BeeModel<T extends Bee> extends AgeableListModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T atd, final float float2, final float float3, final float float4) {
-        super.prepareMobModel(atd, float2, float3, float4);
-        this.rollAmount = atd.getRollAmount(float4);
-        this.stinger.visible = !atd.hasStung();
+    public void prepareMobModel(final T ayl, final float float2, final float float3, final float float4) {
+        super.prepareMobModel(ayl, float2, float3, float4);
+        this.rollAmount = ayl.getRollAmount(float4);
+        this.stinger.visible = !ayl.hasStung();
     }
     
     @Override
-    public void setupAnim(final T atd, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T ayl, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.rightWing.xRot = 0.0f;
         this.leftAntenna.xRot = 0.0f;
         this.rightAntenna.xRot = 0.0f;
         this.bone.xRot = 0.0f;
         this.bone.y = 19.0f;
-        final boolean boolean8 = atd.onGround && atd.getDeltaMovement().lengthSqr() < 1.0E-7;
+        final boolean boolean8 = ayl.isOnGround() && ayl.getDeltaMovement().lengthSqr() < 1.0E-7;
         if (boolean8) {
             this.rightWing.yRot = -0.2618f;
             this.rightWing.zRot = 0.0f;
@@ -98,7 +98,7 @@ public class BeeModel<T extends Bee> extends AgeableListModel<T> {
             this.bone.yRot = 0.0f;
             this.bone.zRot = 0.0f;
         }
-        if (!atd.isAngry()) {
+        if (!ayl.isAngry()) {
             this.bone.xRot = 0.0f;
             this.bone.yRot = 0.0f;
             this.bone.zRot = 0.0f;
diff --git a/src/net/minecraft/client/model/BlazeModel.java b/src/net/minecraft/client/model/BlazeModel.java
index cb17499..adff16e 100644
--- a/src/net/minecraft/client/model/BlazeModel.java
+++ b/src/net/minecraft/client/model/BlazeModel.java
@@ -29,7 +29,7 @@ public class BlazeModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         float float7 = float4 * 3.1415927f * -0.1f;
         for (int integer9 = 0; integer9 < 4; ++integer9) {
             this.upperBodyParts[integer9].y = -2.0f + Mth.cos((integer9 * 2 + float4) * 0.25f);
diff --git a/src/net/minecraft/client/model/BoatModel.java b/src/net/minecraft/client/model/BoatModel.java
index c2c3ea7..7e1c477 100644
--- a/src/net/minecraft/client/model/BoatModel.java
+++ b/src/net/minecraft/client/model/BoatModel.java
@@ -49,9 +49,9 @@ public class BoatModel extends ListModel<Boat> {
     }
     
     @Override
-    public void setupAnim(final Boat azz, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        this.animatePaddle(azz, 0, float2);
-        this.animatePaddle(azz, 1, float2);
+    public void setupAnim(final Boat bft, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        this.animatePaddle(bft, 0, float2);
+        this.animatePaddle(bft, 1, float2);
     }
     
     @Override
@@ -64,23 +64,23 @@ public class BoatModel extends ListModel<Boat> {
     }
     
     protected ModelPart makePaddle(final boolean boolean1) {
-        final ModelPart dni3 = new ModelPart(this, 62, boolean1 ? 0 : 20).setTexSize(128, 64);
+        final ModelPart dyg3 = new ModelPart(this, 62, boolean1 ? 0 : 20).setTexSize(128, 64);
         final int integer4 = 20;
         final int integer5 = 7;
         final int integer6 = 6;
         final float float7 = -5.0f;
-        dni3.addBox(-1.0f, 0.0f, -5.0f, 2.0f, 2.0f, 18.0f);
-        dni3.addBox(boolean1 ? -1.001f : 0.001f, -3.0f, 8.0f, 1.0f, 6.0f, 7.0f);
-        return dni3;
+        dyg3.addBox(-1.0f, 0.0f, -5.0f, 2.0f, 2.0f, 18.0f);
+        dyg3.addBox(boolean1 ? -1.001f : 0.001f, -3.0f, 8.0f, 1.0f, 6.0f, 7.0f);
+        return dyg3;
     }
     
-    protected void animatePaddle(final Boat azz, final int integer, final float float3) {
-        final float float4 = azz.getRowingTime(integer, float3);
-        final ModelPart dni6 = this.paddles[integer];
-        dni6.xRot = (float)Mth.clampedLerp(-1.0471975803375244, -0.2617993950843811, (Mth.sin(-float4) + 1.0f) / 2.0f);
-        dni6.yRot = (float)Mth.clampedLerp(-0.7853981852531433, 0.7853981852531433, (Mth.sin(-float4 + 1.0f) + 1.0f) / 2.0f);
+    protected void animatePaddle(final Boat bft, final int integer, final float float3) {
+        final float float4 = bft.getRowingTime(integer, float3);
+        final ModelPart dyg6 = this.paddles[integer];
+        dyg6.xRot = (float)Mth.clampedLerp(-1.0471975803375244, -0.2617993950843811, (Mth.sin(-float4) + 1.0f) / 2.0f);
+        dyg6.yRot = (float)Mth.clampedLerp(-0.7853981852531433, 0.7853981852531433, (Mth.sin(-float4 + 1.0f) + 1.0f) / 2.0f);
         if (integer == 1) {
-            dni6.yRot = 3.1415927f - dni6.yRot;
+            dyg6.yRot = 3.1415927f - dyg6.yRot;
         }
     }
 }
diff --git a/src/net/minecraft/client/model/BookModel.java b/src/net/minecraft/client/model/BookModel.java
index 8b5adcf..411d9cd 100644
--- a/src/net/minecraft/client/model/BookModel.java
+++ b/src/net/minecraft/client/model/BookModel.java
@@ -34,12 +34,12 @@ public class BookModel extends Model {
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-        this.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+        this.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
     }
     
-    public void render(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-        this.parts.forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
+    public void render(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+        this.parts.forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
     }
     
     public void setupAnim(final float float1, final float float2, final float float3, final float float4) {
diff --git a/src/net/minecraft/client/model/CatModel.java b/src/net/minecraft/client/model/CatModel.java
index f9bd129..9cc49ef 100644
--- a/src/net/minecraft/client/model/CatModel.java
+++ b/src/net/minecraft/client/model/CatModel.java
@@ -14,10 +14,10 @@ public class CatModel<T extends Cat> extends OcelotModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T ate, final float float2, final float float3, final float float4) {
-        this.lieDownAmount = ate.getLieDownAmount(float4);
-        this.lieDownAmountTail = ate.getLieDownAmountTail(float4);
-        this.relaxStateOneAmount = ate.getRelaxStateOneAmount(float4);
+    public void prepareMobModel(final T aym, final float float2, final float float3, final float float4) {
+        this.lieDownAmount = aym.getLieDownAmount(float4);
+        this.lieDownAmountTail = aym.getLieDownAmountTail(float4);
+        this.relaxStateOneAmount = aym.getRelaxStateOneAmount(float4);
         if (this.lieDownAmount <= 0.0f) {
             this.head.xRot = 0.0f;
             this.head.zRot = 0.0f;
@@ -32,8 +32,8 @@ public class CatModel<T extends Cat> extends OcelotModel<T> {
             this.backLegR.x = -1.1f;
             this.backLegR.y = 18.0f;
         }
-        super.prepareMobModel(ate, float2, float3, float4);
-        if (ate.isSitting()) {
+        super.prepareMobModel(aym, float2, float3, float4);
+        if (aym.isInSittingPose()) {
             this.body.xRot = 0.7853982f;
             final ModelPart body = this.body;
             body.y -= 4.0f;
@@ -70,8 +70,8 @@ public class CatModel<T extends Cat> extends OcelotModel<T> {
     }
     
     @Override
-    public void setupAnim(final T ate, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(ate, float2, float3, float4, float5, float6);
+    public void setupAnim(final T aym, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(aym, float2, float3, float4, float5, float6);
         if (this.lieDownAmount > 0.0f) {
             this.head.zRot = ModelUtils.rotlerpRad(this.head.zRot, -1.2707963f, this.lieDownAmount);
             this.head.yRot = ModelUtils.rotlerpRad(this.head.yRot, 1.2707963f, this.lieDownAmount);
diff --git a/src/net/minecraft/client/model/ChestedHorseModel.java b/src/net/minecraft/client/model/ChestedHorseModel.java
index 14aaee8..98b13af 100644
--- a/src/net/minecraft/client/model/ChestedHorseModel.java
+++ b/src/net/minecraft/client/model/ChestedHorseModel.java
@@ -22,25 +22,25 @@ public class ChestedHorseModel<T extends AbstractChestedHorse> extends HorseMode
     }
     
     @Override
-    protected void addEarModels(final ModelPart dni) {
-        final ModelPart dni2 = new ModelPart(this, 0, 12);
-        dni2.addBox(-1.0f, -7.0f, 0.0f, 2.0f, 7.0f, 1.0f);
-        dni2.setPos(1.25f, -10.0f, 4.0f);
-        final ModelPart dni3 = new ModelPart(this, 0, 12);
-        dni3.addBox(-1.0f, -7.0f, 0.0f, 2.0f, 7.0f, 1.0f);
-        dni3.setPos(-1.25f, -10.0f, 4.0f);
-        dni2.xRot = 0.2617994f;
-        dni2.zRot = 0.2617994f;
-        dni3.xRot = 0.2617994f;
-        dni3.zRot = -0.2617994f;
-        dni.addChild(dni2);
-        dni.addChild(dni3);
+    protected void addEarModels(final ModelPart dyg) {
+        final ModelPart dyg2 = new ModelPart(this, 0, 12);
+        dyg2.addBox(-1.0f, -7.0f, 0.0f, 2.0f, 7.0f, 1.0f);
+        dyg2.setPos(1.25f, -10.0f, 4.0f);
+        final ModelPart dyg3 = new ModelPart(this, 0, 12);
+        dyg3.addBox(-1.0f, -7.0f, 0.0f, 2.0f, 7.0f, 1.0f);
+        dyg3.setPos(-1.25f, -10.0f, 4.0f);
+        dyg2.xRot = 0.2617994f;
+        dyg2.zRot = 0.2617994f;
+        dyg3.xRot = 0.2617994f;
+        dyg3.zRot = -0.2617994f;
+        dyg.addChild(dyg2);
+        dyg.addChild(dyg3);
     }
     
     @Override
-    public void setupAnim(final T aud, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(aud, float2, float3, float4, float5, float6);
-        if (aud.hasChest()) {
+    public void setupAnim(final T azl, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(azl, float2, float3, float4, float5, float6);
+        if (azl.hasChest()) {
             this.boxL.visible = true;
             this.boxR.visible = true;
         }
diff --git a/src/net/minecraft/client/model/ChickenModel.java b/src/net/minecraft/client/model/ChickenModel.java
index 9b0dc16..7e4b925 100644
--- a/src/net/minecraft/client/model/ChickenModel.java
+++ b/src/net/minecraft/client/model/ChickenModel.java
@@ -46,7 +46,7 @@ public class ChickenModel<T extends Entity> extends AgeableListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.xRot = float6 * 0.017453292f;
         this.head.yRot = float5 * 0.017453292f;
         this.beak.xRot = this.head.xRot;
diff --git a/src/net/minecraft/client/model/CodModel.java b/src/net/minecraft/client/model/CodModel.java
index 943a4df..b3e74d8 100644
--- a/src/net/minecraft/client/model/CodModel.java
+++ b/src/net/minecraft/client/model/CodModel.java
@@ -42,9 +42,9 @@ public class CodModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         float float7 = 1.0f;
-        if (!akq.isInWater()) {
+        if (!aom.isInWater()) {
             float7 = 1.5f;
         }
         this.tailFin.yRot = -float7 * 0.45f * Mth.sin(0.6f * float4);
diff --git a/src/net/minecraft/client/model/ColorableAgeableListModel.java b/src/net/minecraft/client/model/ColorableAgeableListModel.java
index 0281d19..53fc849 100644
--- a/src/net/minecraft/client/model/ColorableAgeableListModel.java
+++ b/src/net/minecraft/client/model/ColorableAgeableListModel.java
@@ -22,7 +22,7 @@ public abstract class ColorableAgeableListModel<E extends Entity> extends Ageabl
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-        super.renderToBuffer(cyl, cyo, integer3, integer4, this.r * float5, this.g * float6, this.b * float7, float8);
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+        super.renderToBuffer(dhl, dhp, integer3, integer4, this.r * float5, this.g * float6, this.b * float7, float8);
     }
 }
diff --git a/src/net/minecraft/client/model/ColorableListModel.java b/src/net/minecraft/client/model/ColorableListModel.java
index 3be351b..d93b002 100644
--- a/src/net/minecraft/client/model/ColorableListModel.java
+++ b/src/net/minecraft/client/model/ColorableListModel.java
@@ -22,7 +22,7 @@ public abstract class ColorableListModel<E extends Entity> extends ListModel<E>
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-        super.renderToBuffer(cyl, cyo, integer3, integer4, this.r * float5, this.g * float6, this.b * float7, float8);
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+        super.renderToBuffer(dhl, dhp, integer3, integer4, this.r * float5, this.g * float6, this.b * float7, float8);
     }
 }
diff --git a/src/net/minecraft/client/model/CreeperModel.java b/src/net/minecraft/client/model/CreeperModel.java
index c7c9c5d..5ec1cbf 100644
--- a/src/net/minecraft/client/model/CreeperModel.java
+++ b/src/net/minecraft/client/model/CreeperModel.java
@@ -42,7 +42,7 @@ public class CreeperModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.yRot = float5 * 0.017453292f;
         this.head.xRot = float6 * 0.017453292f;
         this.leg0.xRot = Mth.cos(float2 * 0.6662f) * 1.4f * float3;
diff --git a/src/net/minecraft/client/model/DolphinModel.java b/src/net/minecraft/client/model/DolphinModel.java
index 6ab9838..5dd1755 100644
--- a/src/net/minecraft/client/model/DolphinModel.java
+++ b/src/net/minecraft/client/model/DolphinModel.java
@@ -17,23 +17,23 @@ public class DolphinModel<T extends Entity> extends ListModel<T> {
         final float float3 = -8.0f;
         (this.body = new ModelPart(this, 22, 0)).addBox(-4.0f, -7.0f, 0.0f, 8.0f, 7.0f, 13.0f);
         this.body.setPos(0.0f, 22.0f, -5.0f);
-        final ModelPart dni4 = new ModelPart(this, 51, 0);
-        dni4.addBox(-0.5f, 0.0f, 8.0f, 1.0f, 4.0f, 5.0f);
-        dni4.xRot = 1.0471976f;
-        this.body.addChild(dni4);
-        final ModelPart dni5 = new ModelPart(this, 48, 20);
-        dni5.mirror = true;
-        dni5.addBox(-0.5f, -4.0f, 0.0f, 1.0f, 4.0f, 7.0f);
-        dni5.setPos(2.0f, -2.0f, 4.0f);
-        dni5.xRot = 1.0471976f;
-        dni5.zRot = 2.0943952f;
-        this.body.addChild(dni5);
-        final ModelPart dni6 = new ModelPart(this, 48, 20);
-        dni6.addBox(-0.5f, -4.0f, 0.0f, 1.0f, 4.0f, 7.0f);
-        dni6.setPos(-2.0f, -2.0f, 4.0f);
-        dni6.xRot = 1.0471976f;
-        dni6.zRot = -2.0943952f;
-        this.body.addChild(dni6);
+        final ModelPart dyg4 = new ModelPart(this, 51, 0);
+        dyg4.addBox(-0.5f, 0.0f, 8.0f, 1.0f, 4.0f, 5.0f);
+        dyg4.xRot = 1.0471976f;
+        this.body.addChild(dyg4);
+        final ModelPart dyg5 = new ModelPart(this, 48, 20);
+        dyg5.mirror = true;
+        dyg5.addBox(-0.5f, -4.0f, 0.0f, 1.0f, 4.0f, 7.0f);
+        dyg5.setPos(2.0f, -2.0f, 4.0f);
+        dyg5.xRot = 1.0471976f;
+        dyg5.zRot = 2.0943952f;
+        this.body.addChild(dyg5);
+        final ModelPart dyg6 = new ModelPart(this, 48, 20);
+        dyg6.addBox(-0.5f, -4.0f, 0.0f, 1.0f, 4.0f, 7.0f);
+        dyg6.setPos(-2.0f, -2.0f, 4.0f);
+        dyg6.xRot = 1.0471976f;
+        dyg6.zRot = -2.0943952f;
+        this.body.addChild(dyg6);
         (this.tail = new ModelPart(this, 0, 19)).addBox(-2.0f, -2.5f, 0.0f, 4.0f, 5.0f, 11.0f);
         this.tail.setPos(0.0f, -2.5f, 11.0f);
         this.tail.xRot = -0.10471976f;
@@ -42,13 +42,13 @@ public class DolphinModel<T extends Entity> extends ListModel<T> {
         this.tailFin.setPos(0.0f, 0.0f, 9.0f);
         this.tailFin.xRot = 0.0f;
         this.tail.addChild(this.tailFin);
-        final ModelPart dni7 = new ModelPart(this, 0, 0);
-        dni7.addBox(-4.0f, -3.0f, -3.0f, 8.0f, 7.0f, 6.0f);
-        dni7.setPos(0.0f, -4.0f, -3.0f);
-        final ModelPart dni8 = new ModelPart(this, 0, 13);
-        dni8.addBox(-1.0f, 2.0f, -7.0f, 2.0f, 2.0f, 4.0f);
-        dni7.addChild(dni8);
-        this.body.addChild(dni7);
+        final ModelPart dyg7 = new ModelPart(this, 0, 0);
+        dyg7.addBox(-4.0f, -3.0f, -3.0f, 8.0f, 7.0f, 6.0f);
+        dyg7.setPos(0.0f, -4.0f, -3.0f);
+        final ModelPart dyg8 = new ModelPart(this, 0, 13);
+        dyg8.addBox(-1.0f, 2.0f, -7.0f, 2.0f, 2.0f, 4.0f);
+        dyg7.addChild(dyg8);
+        this.body.addChild(dyg7);
     }
     
     @Override
@@ -57,10 +57,10 @@ public class DolphinModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.body.xRot = float6 * 0.017453292f;
         this.body.yRot = float5 * 0.017453292f;
-        if (Entity.getHorizontalDistanceSqr(akq.getDeltaMovement()) > 1.0E-7) {
+        if (Entity.getHorizontalDistanceSqr(aom.getDeltaMovement()) > 1.0E-7) {
             final ModelPart body = this.body;
             body.xRot += -0.05f + -0.05f * Mth.cos(float4 * 0.3f);
             this.tail.xRot = -0.1f * Mth.cos(float4 * 0.3f);
diff --git a/src/net/minecraft/client/model/DrownedModel.java b/src/net/minecraft/client/model/DrownedModel.java
index 5bb7191..f1d7184 100644
--- a/src/net/minecraft/client/model/DrownedModel.java
+++ b/src/net/minecraft/client/model/DrownedModel.java
@@ -25,24 +25,24 @@ public class DrownedModel<T extends Zombie> extends ZombieModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T axp, final float float2, final float float3, final float float4) {
+    public void prepareMobModel(final T bcu, final float float2, final float float3, final float float4) {
         this.rightArmPose = ArmPose.EMPTY;
         this.leftArmPose = ArmPose.EMPTY;
-        final ItemStack ben6 = axp.getItemInHand(InteractionHand.MAIN_HAND);
-        if (ben6.getItem() == Items.TRIDENT && axp.isAggressive()) {
-            if (axp.getMainArm() == HumanoidArm.RIGHT) {
+        final ItemStack bki6 = bcu.getItemInHand(InteractionHand.MAIN_HAND);
+        if (bki6.getItem() == Items.TRIDENT && bcu.isAggressive()) {
+            if (bcu.getMainArm() == HumanoidArm.RIGHT) {
                 this.rightArmPose = ArmPose.THROW_SPEAR;
             }
             else {
                 this.leftArmPose = ArmPose.THROW_SPEAR;
             }
         }
-        super.prepareMobModel(axp, float2, float3, float4);
+        super.prepareMobModel(bcu, float2, float3, float4);
     }
     
     @Override
-    public void setupAnim(final T axp, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(axp, float2, float3, float4, float5, float6);
+    public void setupAnim(final T bcu, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(bcu, float2, float3, float4, float5, float6);
         if (this.leftArmPose == ArmPose.THROW_SPEAR) {
             this.leftArm.xRot = this.leftArm.xRot * 0.5f - 3.1415927f;
             this.leftArm.yRot = 0.0f;
@@ -52,10 +52,10 @@ public class DrownedModel<T extends Zombie> extends ZombieModel<T> {
             this.rightArm.yRot = 0.0f;
         }
         if (this.swimAmount > 0.0f) {
-            this.rightArm.xRot = this.rotlerpRad(this.rightArm.xRot, -2.5132742f, this.swimAmount) + this.swimAmount * 0.35f * Mth.sin(0.1f * float4);
-            this.leftArm.xRot = this.rotlerpRad(this.leftArm.xRot, -2.5132742f, this.swimAmount) - this.swimAmount * 0.35f * Mth.sin(0.1f * float4);
-            this.rightArm.zRot = this.rotlerpRad(this.rightArm.zRot, -0.15f, this.swimAmount);
-            this.leftArm.zRot = this.rotlerpRad(this.leftArm.zRot, 0.15f, this.swimAmount);
+            this.rightArm.xRot = this.rotlerpRad(this.swimAmount, this.rightArm.xRot, -2.5132742f) + this.swimAmount * 0.35f * Mth.sin(0.1f * float4);
+            this.leftArm.xRot = this.rotlerpRad(this.swimAmount, this.leftArm.xRot, -2.5132742f) - this.swimAmount * 0.35f * Mth.sin(0.1f * float4);
+            this.rightArm.zRot = this.rotlerpRad(this.swimAmount, this.rightArm.zRot, -0.15f);
+            this.leftArm.zRot = this.rotlerpRad(this.swimAmount, this.leftArm.zRot, 0.15f);
             final ModelPart leftLeg = this.leftLeg;
             leftLeg.xRot -= this.swimAmount * 0.55f * Mth.sin(0.1f * float4);
             final ModelPart rightLeg = this.rightLeg;
diff --git a/src/net/minecraft/client/model/ElytraModel.java b/src/net/minecraft/client/model/ElytraModel.java
index 8e1268d..a91ab9d 100644
--- a/src/net/minecraft/client/model/ElytraModel.java
+++ b/src/net/minecraft/client/model/ElytraModel.java
@@ -29,22 +29,22 @@ public class ElytraModel<T extends LivingEntity> extends AgeableListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akz, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aoy, final float float2, final float float3, final float float4, final float float5, final float float6) {
         float float7 = 0.2617994f;
         float float8 = -0.2617994f;
         float float9 = 0.0f;
         float float10 = 0.0f;
-        if (akz.isFallFlying()) {
+        if (aoy.isFallFlying()) {
             float float11 = 1.0f;
-            final Vec3 cvl13 = akz.getDeltaMovement();
-            if (cvl13.y < 0.0) {
-                final Vec3 cvl14 = cvl13.normalize();
-                float11 = 1.0f - (float)Math.pow(-cvl14.y, 1.5);
+            final Vec3 dem13 = aoy.getDeltaMovement();
+            if (dem13.y < 0.0) {
+                final Vec3 dem14 = dem13.normalize();
+                float11 = 1.0f - (float)Math.pow(-dem14.y, 1.5);
             }
             float7 = float11 * 0.34906584f + (1.0f - float11) * float7;
             float8 = float11 * -1.5707964f + (1.0f - float11) * float8;
         }
-        else if (akz.isCrouching()) {
+        else if (aoy.isCrouching()) {
             float7 = 0.6981317f;
             float8 = -0.7853982f;
             float9 = 3.0f;
@@ -52,17 +52,17 @@ public class ElytraModel<T extends LivingEntity> extends AgeableListModel<T> {
         }
         this.leftWing.x = 5.0f;
         this.leftWing.y = float9;
-        if (akz instanceof AbstractClientPlayer) {
+        if (aoy instanceof AbstractClientPlayer) {
             final AbstractClientPlayer abstractClientPlayer;
-            final AbstractClientPlayer dpy12 = abstractClientPlayer = (AbstractClientPlayer)akz;
-            abstractClientPlayer.elytraRotX += (float)((float7 - dpy12.elytraRotX) * 0.1);
-            final AbstractClientPlayer abstractClientPlayer2 = dpy12;
-            abstractClientPlayer2.elytraRotY += (float)((float10 - dpy12.elytraRotY) * 0.1);
-            final AbstractClientPlayer abstractClientPlayer3 = dpy12;
-            abstractClientPlayer3.elytraRotZ += (float)((float8 - dpy12.elytraRotZ) * 0.1);
-            this.leftWing.xRot = dpy12.elytraRotX;
-            this.leftWing.yRot = dpy12.elytraRotY;
-            this.leftWing.zRot = dpy12.elytraRotZ;
+            final AbstractClientPlayer ebc12 = abstractClientPlayer = (AbstractClientPlayer)aoy;
+            abstractClientPlayer.elytraRotX += (float)((float7 - ebc12.elytraRotX) * 0.1);
+            final AbstractClientPlayer abstractClientPlayer2 = ebc12;
+            abstractClientPlayer2.elytraRotY += (float)((float10 - ebc12.elytraRotY) * 0.1);
+            final AbstractClientPlayer abstractClientPlayer3 = ebc12;
+            abstractClientPlayer3.elytraRotZ += (float)((float8 - ebc12.elytraRotZ) * 0.1);
+            this.leftWing.xRot = ebc12.elytraRotX;
+            this.leftWing.yRot = ebc12.elytraRotY;
+            this.leftWing.zRot = ebc12.elytraRotZ;
         }
         else {
             this.leftWing.xRot = float7;
diff --git a/src/net/minecraft/client/model/EndermanModel.java b/src/net/minecraft/client/model/EndermanModel.java
index d8df4b2..d3c5c33 100644
--- a/src/net/minecraft/client/model/EndermanModel.java
+++ b/src/net/minecraft/client/model/EndermanModel.java
@@ -30,8 +30,8 @@ public class EndermanModel<T extends LivingEntity> extends HumanoidModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akz, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(akz, float2, float3, float4, float5, float6);
+    public void setupAnim(final T aoy, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(aoy, float2, float3, float4, float5, float6);
         this.head.visible = true;
         final float float7 = -14.0f;
         this.body.xRot = 0.0f;
diff --git a/src/net/minecraft/client/model/EndermiteModel.java b/src/net/minecraft/client/model/EndermiteModel.java
index d2ca0d3..2ab0577 100644
--- a/src/net/minecraft/client/model/EndermiteModel.java
+++ b/src/net/minecraft/client/model/EndermiteModel.java
@@ -29,7 +29,7 @@ public class EndermiteModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         for (int integer8 = 0; integer8 < this.bodyParts.length; ++integer8) {
             this.bodyParts[integer8].yRot = Mth.cos(float4 * 0.9f + integer8 * 0.15f * 3.1415927f) * 3.1415927f * 0.01f * (1 + Math.abs(integer8 - 2));
             this.bodyParts[integer8].x = Mth.sin(float4 * 0.9f + integer8 * 0.15f * 3.1415927f) * 3.1415927f * 0.1f * Math.abs(integer8 - 2);
diff --git a/src/net/minecraft/client/model/EntityModel.java b/src/net/minecraft/client/model/EntityModel.java
index 510d4cf..9d6a6d3 100644
--- a/src/net/minecraft/client/model/EntityModel.java
+++ b/src/net/minecraft/client/model/EntityModel.java
@@ -19,14 +19,14 @@ public abstract class EntityModel<T extends Entity> extends Model {
         this.young = true;
     }
     
-    public abstract void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6);
+    public abstract void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6);
     
-    public void prepareMobModel(final T akq, final float float2, final float float3, final float float4) {
+    public void prepareMobModel(final T aom, final float float2, final float float3, final float float4) {
     }
     
-    public void copyPropertiesTo(final EntityModel<T> dla) {
-        dla.attackTime = this.attackTime;
-        dla.riding = this.riding;
-        dla.young = this.young;
+    public void copyPropertiesTo(final EntityModel<T> dvv) {
+        dvv.attackTime = this.attackTime;
+        dvv.riding = this.riding;
+        dvv.young = this.young;
     }
 }
diff --git a/src/net/minecraft/client/model/EvokerFangsModel.java b/src/net/minecraft/client/model/EvokerFangsModel.java
index 7d86b93..a875d37 100644
--- a/src/net/minecraft/client/model/EvokerFangsModel.java
+++ b/src/net/minecraft/client/model/EvokerFangsModel.java
@@ -20,7 +20,7 @@ public class EvokerFangsModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         float float7 = float2 * 2.0f;
         if (float7 > 1.0f) {
             float7 = 1.0f;
diff --git a/src/net/minecraft/client/model/FoxModel.java b/src/net/minecraft/client/model/FoxModel.java
index bda82b4..4cdb4a5 100644
--- a/src/net/minecraft/client/model/FoxModel.java
+++ b/src/net/minecraft/client/model/FoxModel.java
@@ -48,7 +48,7 @@ public class FoxModel<T extends Fox> extends AgeableListModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T atk, final float float2, final float float3, final float float4) {
+    public void prepareMobModel(final T ays, final float float2, final float float3, final float float4) {
         this.body.xRot = 1.5707964f;
         this.tail.xRot = -0.05235988f;
         this.leg0.xRot = Mth.cos(float2 * 0.6662f) * 1.4f * float3;
@@ -57,7 +57,7 @@ public class FoxModel<T extends Fox> extends AgeableListModel<T> {
         this.leg3.xRot = Mth.cos(float2 * 0.6662f) * 1.4f * float3;
         this.head.setPos(-1.0f, 16.5f, -3.0f);
         this.head.yRot = 0.0f;
-        this.head.zRot = atk.getHeadRollAngle(float4);
+        this.head.zRot = ays.getHeadRollAngle(float4);
         this.leg0.visible = true;
         this.leg1.visible = true;
         this.leg2.visible = true;
@@ -66,14 +66,14 @@ public class FoxModel<T extends Fox> extends AgeableListModel<T> {
         this.body.zRot = 0.0f;
         this.leg0.setPos(-5.0f, 17.5f, 7.0f);
         this.leg1.setPos(-1.0f, 17.5f, 7.0f);
-        if (atk.isCrouching()) {
+        if (ays.isCrouching()) {
             this.body.xRot = 1.6755161f;
-            final float float5 = atk.getCrouchAmount(float4);
-            this.body.setPos(0.0f, 16.0f + atk.getCrouchAmount(float4), -6.0f);
+            final float float5 = ays.getCrouchAmount(float4);
+            this.body.setPos(0.0f, 16.0f + ays.getCrouchAmount(float4), -6.0f);
             this.head.setPos(-1.0f, 16.5f + float5, -3.0f);
             this.head.yRot = 0.0f;
         }
-        else if (atk.isSleeping()) {
+        else if (ays.isSleeping()) {
             this.body.zRot = -1.5707964f;
             this.body.setPos(0.0f, 21.0f, -6.0f);
             this.tail.xRot = -2.6179938f;
@@ -90,7 +90,7 @@ public class FoxModel<T extends Fox> extends AgeableListModel<T> {
             this.leg2.visible = false;
             this.leg3.visible = false;
         }
-        else if (atk.isSitting()) {
+        else if (ays.isSitting()) {
             this.body.xRot = 0.5235988f;
             this.body.setPos(0.0f, 9.0f, -3.0f);
             this.tail.xRot = 0.7853982f;
@@ -121,17 +121,17 @@ public class FoxModel<T extends Fox> extends AgeableListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T atk, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        if (!atk.isSleeping() && !atk.isFaceplanted() && !atk.isCrouching()) {
+    public void setupAnim(final T ays, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        if (!ays.isSleeping() && !ays.isFaceplanted() && !ays.isCrouching()) {
             this.head.xRot = float6 * 0.017453292f;
             this.head.yRot = float5 * 0.017453292f;
         }
-        if (atk.isSleeping()) {
+        if (ays.isSleeping()) {
             this.head.xRot = 0.0f;
             this.head.yRot = -2.0943952f;
             this.head.zRot = Mth.cos(float4 * 0.027f) / 22.0f;
         }
-        if (atk.isCrouching()) {
+        if (ays.isCrouching()) {
             final float float7 = Mth.cos(float4) * 0.01f;
             this.body.yRot = float7;
             this.leg0.zRot = float7;
@@ -139,7 +139,7 @@ public class FoxModel<T extends Fox> extends AgeableListModel<T> {
             this.leg2.zRot = float7 / 2.0f;
             this.leg3.zRot = float7 / 2.0f;
         }
-        if (atk.isFaceplanted()) {
+        if (ays.isFaceplanted()) {
             final float float7 = 0.1f;
             this.legMotionPos += 0.67f;
             this.leg0.xRot = Mth.cos(this.legMotionPos * 0.4662f) * 0.1f;
diff --git a/src/net/minecraft/client/model/GhastModel.java b/src/net/minecraft/client/model/GhastModel.java
index 4eae1af..925f3f4 100644
--- a/src/net/minecraft/client/model/GhastModel.java
+++ b/src/net/minecraft/client/model/GhastModel.java
@@ -13,10 +13,10 @@ public class GhastModel<T extends Entity> extends ListModel<T> {
     public GhastModel() {
         this.tentacles = new ModelPart[9];
         final ImmutableList.Builder<ModelPart> builder2 = ImmutableList.<ModelPart>builder();
-        final ModelPart dni3 = new ModelPart(this, 0, 0);
-        dni3.addBox(-8.0f, -8.0f, -8.0f, 16.0f, 16.0f, 16.0f);
-        dni3.y = 17.6f;
-        builder2.add(dni3);
+        final ModelPart dyg3 = new ModelPart(this, 0, 0);
+        dyg3.addBox(-8.0f, -8.0f, -8.0f, 16.0f, 16.0f, 16.0f);
+        dyg3.y = 17.6f;
+        builder2.add(dyg3);
         final Random random4 = new Random(1660L);
         for (int integer5 = 0; integer5 < this.tentacles.length; ++integer5) {
             this.tentacles[integer5] = new ModelPart(this, 0, 0);
@@ -33,7 +33,7 @@ public class GhastModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         for (int integer8 = 0; integer8 < this.tentacles.length; ++integer8) {
             this.tentacles[integer8].xRot = 0.2f * Mth.sin(float4 * 0.3f + integer8) + 0.4f;
         }
diff --git a/src/net/minecraft/client/model/GiantZombieModel.java b/src/net/minecraft/client/model/GiantZombieModel.java
index e130922..c5b7e57 100644
--- a/src/net/minecraft/client/model/GiantZombieModel.java
+++ b/src/net/minecraft/client/model/GiantZombieModel.java
@@ -13,7 +13,7 @@ public class GiantZombieModel extends AbstractZombieModel<Giant> {
     }
     
     @Override
-    public boolean isAggressive(final Giant awr) {
+    public boolean isAggressive(final Giant bbw) {
         return false;
     }
 }
diff --git a/src/net/minecraft/client/model/GuardianModel.java b/src/net/minecraft/client/model/GuardianModel.java
index 55b12eb..102d5e9 100644
--- a/src/net/minecraft/client/model/GuardianModel.java
+++ b/src/net/minecraft/client/model/GuardianModel.java
@@ -54,35 +54,35 @@ public class GuardianModel extends ListModel<Guardian> {
     }
     
     @Override
-    public void setupAnim(final Guardian aws, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        final float float7 = float4 - aws.tickCount;
+    public void setupAnim(final Guardian bbx, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        final float float7 = float4 - bbx.tickCount;
         this.head.yRot = float5 * 0.017453292f;
         this.head.xRot = float6 * 0.017453292f;
-        final float float8 = (1.0f - aws.getSpikesAnimation(float7)) * 0.55f;
+        final float float8 = (1.0f - bbx.getSpikesAnimation(float7)) * 0.55f;
         this.setupSpikes(float4, float8);
         this.eye.z = -8.25f;
-        Entity akq10 = Minecraft.getInstance().getCameraEntity();
-        if (aws.hasActiveAttackTarget()) {
-            akq10 = aws.getActiveAttackTarget();
+        Entity aom10 = Minecraft.getInstance().getCameraEntity();
+        if (bbx.hasActiveAttackTarget()) {
+            aom10 = bbx.getActiveAttackTarget();
         }
-        if (akq10 != null) {
-            final Vec3 cvl11 = akq10.getEyePosition(0.0f);
-            final Vec3 cvl12 = aws.getEyePosition(0.0f);
-            final double double13 = cvl11.y - cvl12.y;
+        if (aom10 != null) {
+            final Vec3 dem11 = aom10.getEyePosition(0.0f);
+            final Vec3 dem12 = bbx.getEyePosition(0.0f);
+            final double double13 = dem11.y - dem12.y;
             if (double13 > 0.0) {
                 this.eye.y = 0.0f;
             }
             else {
                 this.eye.y = 1.0f;
             }
-            Vec3 cvl13 = aws.getViewVector(0.0f);
-            cvl13 = new Vec3(cvl13.x, 0.0, cvl13.z);
-            final Vec3 cvl14 = new Vec3(cvl12.x - cvl11.x, 0.0, cvl12.z - cvl11.z).normalize().yRot(1.5707964f);
-            final double double14 = cvl13.dot(cvl14);
+            Vec3 dem13 = bbx.getViewVector(0.0f);
+            dem13 = new Vec3(dem13.x, 0.0, dem13.z);
+            final Vec3 dem14 = new Vec3(dem12.x - dem11.x, 0.0, dem12.z - dem11.z).normalize().yRot(1.5707964f);
+            final double double14 = dem13.dot(dem14);
             this.eye.x = Mth.sqrt((float)Math.abs(double14)) * 2.0f * (float)Math.signum(double14);
         }
         this.eye.visible = true;
-        final float float9 = aws.getTailAnimation(float7);
+        final float float9 = bbx.getTailAnimation(float7);
         this.tailParts[0].yRot = Mth.sin(float9) * 3.1415927f * 0.05f;
         this.tailParts[1].yRot = Mth.sin(float9) * 3.1415927f * 0.1f;
         this.tailParts[1].x = -1.5f;
diff --git a/src/net/minecraft/client/model/HoglinModel.java b/src/net/minecraft/client/model/HoglinModel.java
new file mode 100644
index 0000000..eae5e1b
--- /dev/null
+++ b/src/net/minecraft/client/model/HoglinModel.java
@@ -0,0 +1,93 @@
+package net.minecraft.client.model;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.monster.hoglin.HoglinBase;
+import net.minecraft.util.Mth;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.client.model.geom.ModelPart;
+
+public class HoglinModel<T extends Mob> extends AgeableListModel<T> {
+    private final ModelPart head;
+    private final ModelPart rightEar;
+    private final ModelPart leftEar;
+    private final ModelPart body;
+    private final ModelPart frontRightLeg;
+    private final ModelPart frontLeftLeg;
+    private final ModelPart backRightLeg;
+    private final ModelPart backLeftLeg;
+    private final ModelPart mane;
+    
+    public HoglinModel() {
+        super(true, 8.0f, 6.0f, 1.9f, 2.0f, 24.0f);
+        this.texWidth = 128;
+        this.texHeight = 64;
+        (this.body = new ModelPart(this)).setPos(0.0f, 7.0f, 0.0f);
+        this.body.texOffs(1, 1).addBox(-8.0f, -7.0f, -13.0f, 16.0f, 14.0f, 26.0f);
+        (this.mane = new ModelPart(this)).setPos(0.0f, -14.0f, -5.0f);
+        this.mane.texOffs(90, 33).addBox(0.0f, 0.0f, -9.0f, 0.0f, 10.0f, 19.0f, 0.001f);
+        this.body.addChild(this.mane);
+        (this.head = new ModelPart(this)).setPos(0.0f, 2.0f, -12.0f);
+        this.head.texOffs(61, 1).addBox(-7.0f, -3.0f, -19.0f, 14.0f, 6.0f, 19.0f);
+        (this.rightEar = new ModelPart(this)).setPos(-6.0f, -2.0f, -3.0f);
+        this.rightEar.texOffs(1, 1).addBox(-6.0f, -1.0f, -2.0f, 6.0f, 1.0f, 4.0f);
+        this.rightEar.zRot = -0.6981317f;
+        this.head.addChild(this.rightEar);
+        (this.leftEar = new ModelPart(this)).setPos(6.0f, -2.0f, -3.0f);
+        this.leftEar.texOffs(1, 6).addBox(0.0f, -1.0f, -2.0f, 6.0f, 1.0f, 4.0f);
+        this.leftEar.zRot = 0.6981317f;
+        this.head.addChild(this.leftEar);
+        final ModelPart dyg2 = new ModelPart(this);
+        dyg2.setPos(-7.0f, 2.0f, -12.0f);
+        dyg2.texOffs(10, 13).addBox(-1.0f, -11.0f, -1.0f, 2.0f, 11.0f, 2.0f);
+        this.head.addChild(dyg2);
+        final ModelPart dyg3 = new ModelPart(this);
+        dyg3.setPos(7.0f, 2.0f, -12.0f);
+        dyg3.texOffs(1, 13).addBox(-1.0f, -11.0f, -1.0f, 2.0f, 11.0f, 2.0f);
+        this.head.addChild(dyg3);
+        this.head.xRot = 0.87266463f;
+        final int integer4 = 14;
+        final int integer5 = 11;
+        (this.frontRightLeg = new ModelPart(this)).setPos(-4.0f, 10.0f, -8.5f);
+        this.frontRightLeg.texOffs(66, 42).addBox(-3.0f, 0.0f, -3.0f, 6.0f, 14.0f, 6.0f);
+        (this.frontLeftLeg = new ModelPart(this)).setPos(4.0f, 10.0f, -8.5f);
+        this.frontLeftLeg.texOffs(41, 42).addBox(-3.0f, 0.0f, -3.0f, 6.0f, 14.0f, 6.0f);
+        (this.backRightLeg = new ModelPart(this)).setPos(-5.0f, 13.0f, 10.0f);
+        this.backRightLeg.texOffs(21, 45).addBox(-2.5f, 0.0f, -2.5f, 5.0f, 11.0f, 5.0f);
+        (this.backLeftLeg = new ModelPart(this)).setPos(5.0f, 13.0f, 10.0f);
+        this.backLeftLeg.texOffs(0, 45).addBox(-2.5f, 0.0f, -2.5f, 5.0f, 11.0f, 5.0f);
+    }
+    
+    @Override
+    protected Iterable<ModelPart> headParts() {
+        return ImmutableList.<ModelPart>of(this.head);
+    }
+    
+    @Override
+    protected Iterable<ModelPart> bodyParts() {
+        return ImmutableList.<ModelPart>of(this.body, this.frontRightLeg, this.frontLeftLeg, this.backRightLeg, this.backLeftLeg);
+    }
+    
+    @Override
+    public void setupAnim(final T aoz, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        this.rightEar.zRot = -0.6981317f - float3 * Mth.sin(float2);
+        this.leftEar.zRot = 0.6981317f + float3 * Mth.sin(float2);
+        this.head.yRot = float5 * 0.017453292f;
+        final int integer8 = ((HoglinBase)aoz).getAttackAnimationRemainingTicks();
+        final float float7 = 1.0f - Mth.abs(10 - 2 * integer8) / 10.0f;
+        this.head.xRot = Mth.lerp(float7, 0.87266463f, -0.34906584f);
+        if (((LivingEntity)aoz).isBaby()) {
+            this.head.y = Mth.lerp(float7, 2.0f, 5.0f);
+            this.mane.z = -3.0f;
+        }
+        else {
+            this.head.y = 2.0f;
+            this.mane.z = -7.0f;
+        }
+        final float float8 = 1.2f;
+        this.frontRightLeg.xRot = Mth.cos(float2) * 1.2f * float3;
+        this.frontLeftLeg.xRot = Mth.cos(float2 + 3.1415927f) * 1.2f * float3;
+        this.backRightLeg.xRot = this.frontLeftLeg.xRot;
+        this.backLeftLeg.xRot = this.frontRightLeg.xRot;
+    }
+}
diff --git a/src/net/minecraft/client/model/HorseModel.java b/src/net/minecraft/client/model/HorseModel.java
index 4a080ba..898b27b 100644
--- a/src/net/minecraft/client/model/HorseModel.java
+++ b/src/net/minecraft/client/model/HorseModel.java
@@ -29,15 +29,15 @@ public class HorseModel<T extends AbstractHorse> extends AgeableListModel<T> {
         this.body.setPos(0.0f, 11.0f, 5.0f);
         (this.headParts = new ModelPart(this, 0, 35)).addBox(-2.05f, -6.0f, -2.0f, 4.0f, 12.0f, 7.0f);
         this.headParts.xRot = 0.5235988f;
-        final ModelPart dni3 = new ModelPart(this, 0, 13);
-        dni3.addBox(-3.0f, -11.0f, -2.0f, 6.0f, 5.0f, 7.0f, float1);
-        final ModelPart dni4 = new ModelPart(this, 56, 36);
-        dni4.addBox(-1.0f, -11.0f, 5.01f, 2.0f, 16.0f, 2.0f, float1);
-        final ModelPart dni5 = new ModelPart(this, 0, 25);
-        dni5.addBox(-2.0f, -11.0f, -7.0f, 4.0f, 5.0f, 5.0f, float1);
-        this.headParts.addChild(dni3);
-        this.headParts.addChild(dni4);
-        this.headParts.addChild(dni5);
+        final ModelPart dyg3 = new ModelPart(this, 0, 13);
+        dyg3.addBox(-3.0f, -11.0f, -2.0f, 6.0f, 5.0f, 7.0f, float1);
+        final ModelPart dyg4 = new ModelPart(this, 56, 36);
+        dyg4.addBox(-1.0f, -11.0f, 5.01f, 2.0f, 16.0f, 2.0f, float1);
+        final ModelPart dyg5 = new ModelPart(this, 0, 25);
+        dyg5.addBox(-2.0f, -11.0f, -7.0f, 4.0f, 5.0f, 5.0f, float1);
+        this.headParts.addChild(dyg3);
+        this.headParts.addChild(dyg4);
+        this.headParts.addChild(dyg5);
         this.addEarModels(this.headParts);
         this.leg1 = new ModelPart(this, 48, 21);
         this.leg1.mirror = true;
@@ -68,51 +68,51 @@ public class HorseModel<T extends AbstractHorse> extends AgeableListModel<T> {
         this.tail.setPos(0.0f, -5.0f, 2.0f);
         this.tail.xRot = 0.5235988f;
         this.body.addChild(this.tail);
-        final ModelPart dni6 = new ModelPart(this, 26, 0);
-        dni6.addBox(-5.0f, -8.0f, -9.0f, 10.0f, 9.0f, 9.0f, 0.5f);
-        this.body.addChild(dni6);
-        final ModelPart dni7 = new ModelPart(this, 29, 5);
-        dni7.addBox(2.0f, -9.0f, -6.0f, 1.0f, 2.0f, 2.0f, float1);
-        this.headParts.addChild(dni7);
-        final ModelPart dni8 = new ModelPart(this, 29, 5);
-        dni8.addBox(-3.0f, -9.0f, -6.0f, 1.0f, 2.0f, 2.0f, float1);
-        this.headParts.addChild(dni8);
-        final ModelPart dni9 = new ModelPart(this, 32, 2);
-        dni9.addBox(3.1f, -6.0f, -8.0f, 0.0f, 3.0f, 16.0f, float1);
-        dni9.xRot = -0.5235988f;
-        this.headParts.addChild(dni9);
-        final ModelPart dni10 = new ModelPart(this, 32, 2);
-        dni10.addBox(-3.1f, -6.0f, -8.0f, 0.0f, 3.0f, 16.0f, float1);
-        dni10.xRot = -0.5235988f;
-        this.headParts.addChild(dni10);
-        final ModelPart dni11 = new ModelPart(this, 1, 1);
-        dni11.addBox(-3.0f, -11.0f, -1.9f, 6.0f, 5.0f, 6.0f, 0.2f);
-        this.headParts.addChild(dni11);
-        final ModelPart dni12 = new ModelPart(this, 19, 0);
-        dni12.addBox(-2.0f, -11.0f, -4.0f, 4.0f, 5.0f, 2.0f, 0.2f);
-        this.headParts.addChild(dni12);
-        this.saddleParts = new ModelPart[] { dni6, dni7, dni8, dni11, dni12 };
-        this.ridingParts = new ModelPart[] { dni9, dni10 };
+        final ModelPart dyg6 = new ModelPart(this, 26, 0);
+        dyg6.addBox(-5.0f, -8.0f, -9.0f, 10.0f, 9.0f, 9.0f, 0.5f);
+        this.body.addChild(dyg6);
+        final ModelPart dyg7 = new ModelPart(this, 29, 5);
+        dyg7.addBox(2.0f, -9.0f, -6.0f, 1.0f, 2.0f, 2.0f, float1);
+        this.headParts.addChild(dyg7);
+        final ModelPart dyg8 = new ModelPart(this, 29, 5);
+        dyg8.addBox(-3.0f, -9.0f, -6.0f, 1.0f, 2.0f, 2.0f, float1);
+        this.headParts.addChild(dyg8);
+        final ModelPart dyg9 = new ModelPart(this, 32, 2);
+        dyg9.addBox(3.1f, -6.0f, -8.0f, 0.0f, 3.0f, 16.0f, float1);
+        dyg9.xRot = -0.5235988f;
+        this.headParts.addChild(dyg9);
+        final ModelPart dyg10 = new ModelPart(this, 32, 2);
+        dyg10.addBox(-3.1f, -6.0f, -8.0f, 0.0f, 3.0f, 16.0f, float1);
+        dyg10.xRot = -0.5235988f;
+        this.headParts.addChild(dyg10);
+        final ModelPart dyg11 = new ModelPart(this, 1, 1);
+        dyg11.addBox(-3.0f, -11.0f, -1.9f, 6.0f, 5.0f, 6.0f, 0.2f);
+        this.headParts.addChild(dyg11);
+        final ModelPart dyg12 = new ModelPart(this, 19, 0);
+        dyg12.addBox(-2.0f, -11.0f, -4.0f, 4.0f, 5.0f, 2.0f, 0.2f);
+        this.headParts.addChild(dyg12);
+        this.saddleParts = new ModelPart[] { dyg6, dyg7, dyg8, dyg11, dyg12 };
+        this.ridingParts = new ModelPart[] { dyg9, dyg10 };
     }
     
-    protected void addEarModels(final ModelPart dni) {
-        final ModelPart dni2 = new ModelPart(this, 19, 16);
-        dni2.addBox(0.55f, -13.0f, 4.0f, 2.0f, 3.0f, 1.0f, -0.001f);
-        final ModelPart dni3 = new ModelPart(this, 19, 16);
-        dni3.addBox(-2.55f, -13.0f, 4.0f, 2.0f, 3.0f, 1.0f, -0.001f);
-        dni.addChild(dni2);
-        dni.addChild(dni3);
+    protected void addEarModels(final ModelPart dyg) {
+        final ModelPart dyg2 = new ModelPart(this, 19, 16);
+        dyg2.addBox(0.55f, -13.0f, 4.0f, 2.0f, 3.0f, 1.0f, -0.001f);
+        final ModelPart dyg3 = new ModelPart(this, 19, 16);
+        dyg3.addBox(-2.55f, -13.0f, 4.0f, 2.0f, 3.0f, 1.0f, -0.001f);
+        dyg.addChild(dyg2);
+        dyg.addChild(dyg3);
     }
     
     @Override
-    public void setupAnim(final T aue, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        final boolean boolean8 = aue.isSaddled();
-        final boolean boolean9 = aue.isVehicle();
-        for (final ModelPart dni13 : this.saddleParts) {
-            dni13.visible = boolean8;
+    public void setupAnim(final T azm, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        final boolean boolean8 = azm.isSaddled();
+        final boolean boolean9 = azm.isVehicle();
+        for (final ModelPart dyg13 : this.saddleParts) {
+            dyg13.visible = boolean8;
         }
-        for (final ModelPart dni13 : this.ridingParts) {
-            dni13.visible = (boolean9 && boolean8);
+        for (final ModelPart dyg13 : this.ridingParts) {
+            dyg13.visible = (boolean9 && boolean8);
         }
         this.body.y = 11.0f;
     }
@@ -127,11 +127,11 @@ public class HorseModel<T extends AbstractHorse> extends AgeableListModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T aue, final float float2, final float float3, final float float4) {
-        super.prepareMobModel(aue, float2, float3, float4);
-        final float float5 = Mth.rotlerp(aue.yBodyRotO, aue.yBodyRot, float4);
-        final float float6 = Mth.rotlerp(aue.yHeadRotO, aue.yHeadRot, float4);
-        final float float7 = Mth.lerp(float4, aue.xRotO, aue.xRot);
+    public void prepareMobModel(final T azm, final float float2, final float float3, final float float4) {
+        super.prepareMobModel(azm, float2, float3, float4);
+        final float float5 = Mth.rotlerp(azm.yBodyRotO, azm.yBodyRot, float4);
+        final float float6 = Mth.rotlerp(azm.yHeadRotO, azm.yHeadRot, float4);
+        final float float7 = Mth.lerp(float4, azm.xRotO, azm.xRot);
         float float8 = float6 - float5;
         float float9 = float7 * 0.017453292f;
         if (float8 > 20.0f) {
@@ -143,18 +143,18 @@ public class HorseModel<T extends AbstractHorse> extends AgeableListModel<T> {
         if (float3 > 0.2f) {
             float9 += Mth.cos(float2 * 0.4f) * 0.15f * float3;
         }
-        final float float10 = aue.getEatAnim(float4);
-        final float float11 = aue.getStandAnim(float4);
+        final float float10 = azm.getEatAnim(float4);
+        final float float11 = azm.getStandAnim(float4);
         final float float12 = 1.0f - float11;
-        final float float13 = aue.getMouthAnim(float4);
-        final boolean boolean15 = aue.tailCounter != 0;
-        final float float14 = aue.tickCount + float4;
+        final float float13 = azm.getMouthAnim(float4);
+        final boolean boolean15 = azm.tailCounter != 0;
+        final float float14 = azm.tickCount + float4;
         this.headParts.y = 4.0f;
         this.headParts.z = -12.0f;
         this.body.xRot = 0.0f;
         this.headParts.xRot = 0.5235988f + float9;
         this.headParts.yRot = float8 * 0.017453292f;
-        final float float15 = aue.isInWater() ? 0.2f : 1.0f;
+        final float float15 = azm.isInWater() ? 0.2f : 1.0f;
         final float float16 = Mth.cos(float15 * float2 * 0.6662f + 3.1415927f);
         final float float17 = float16 * 0.8f * float3;
         final float float18 = (1.0f - Math.max(float11, float10)) * (0.5235988f + float9 + float13 * Mth.sin(float14) * 0.05f);
@@ -196,7 +196,7 @@ public class HorseModel<T extends AbstractHorse> extends AgeableListModel<T> {
         this.babyLeg4.y = this.leg4.y;
         this.babyLeg4.z = this.leg4.z;
         this.babyLeg4.xRot = this.leg4.xRot;
-        final boolean boolean16 = aue.isBaby();
+        final boolean boolean16 = azm.isBaby();
         this.leg1.visible = !boolean16;
         this.leg2.visible = !boolean16;
         this.leg3.visible = !boolean16;
diff --git a/src/net/minecraft/client/model/HumanoidHeadModel.java b/src/net/minecraft/client/model/HumanoidHeadModel.java
index 91f05e6..bb70257 100644
--- a/src/net/minecraft/client/model/HumanoidHeadModel.java
+++ b/src/net/minecraft/client/model/HumanoidHeadModel.java
@@ -21,8 +21,8 @@ public class HumanoidHeadModel extends SkullModel {
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-        super.renderToBuffer(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
-        this.hat.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+        super.renderToBuffer(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
+        this.hat.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
     }
 }
diff --git a/src/net/minecraft/client/model/HumanoidModel.java b/src/net/minecraft/client/model/HumanoidModel.java
index 5983e38..7004713 100644
--- a/src/net/minecraft/client/model/HumanoidModel.java
+++ b/src/net/minecraft/client/model/HumanoidModel.java
@@ -3,7 +3,6 @@ package net.minecraft.client.model;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.InteractionHand;
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.world.item.CrossbowItem;
 import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.util.Mth;
 import com.google.common.collect.ImmutableList;
@@ -25,7 +24,6 @@ public class HumanoidModel<T extends LivingEntity> extends AgeableListModel<T> i
     public ArmPose rightArmPose;
     public boolean crouching;
     public float swimAmount;
-    private float itemUseTicks;
     
     public HumanoidModel(final float float1) {
         this(RenderType::entityCutoutNoCull, float1, 0.0f, 64, 32);
@@ -72,26 +70,25 @@ public class HumanoidModel<T extends LivingEntity> extends AgeableListModel<T> i
     }
     
     @Override
-    public void prepareMobModel(final T akz, final float float2, final float float3, final float float4) {
-        this.swimAmount = akz.getSwimAmount(float4);
-        this.itemUseTicks = (float)akz.getTicksUsingItem();
-        super.prepareMobModel(akz, float2, float3, float4);
+    public void prepareMobModel(final T aoy, final float float2, final float float3, final float float4) {
+        this.swimAmount = aoy.getSwimAmount(float4);
+        super.prepareMobModel(aoy, float2, float3, float4);
     }
     
     @Override
-    public void setupAnim(final T akz, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        final boolean boolean8 = akz.getFallFlyingTicks() > 4;
-        final boolean boolean9 = akz.isVisuallySwimming();
+    public void setupAnim(final T aoy, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        final boolean boolean8 = aoy.getFallFlyingTicks() > 4;
+        final boolean boolean9 = aoy.isVisuallySwimming();
         this.head.yRot = float5 * 0.017453292f;
         if (boolean8) {
             this.head.xRot = -0.7853982f;
         }
         else if (this.swimAmount > 0.0f) {
             if (boolean9) {
-                this.head.xRot = this.rotlerpRad(this.head.xRot, -0.7853982f, this.swimAmount);
+                this.head.xRot = this.rotlerpRad(this.swimAmount, this.head.xRot, -0.7853982f);
             }
             else {
-                this.head.xRot = this.rotlerpRad(this.head.xRot, float6 * 0.017453292f, this.swimAmount);
+                this.head.xRot = this.rotlerpRad(this.swimAmount, this.head.xRot, float6 * 0.017453292f);
             }
         }
         else {
@@ -104,7 +101,7 @@ public class HumanoidModel<T extends LivingEntity> extends AgeableListModel<T> i
         this.leftArm.x = 5.0f;
         float float7 = 1.0f;
         if (boolean8) {
-            float7 = (float)akz.getDeltaMovement().lengthSqr();
+            float7 = (float)aoy.getDeltaMovement().lengthSqr();
             float7 /= 0.2f;
             float7 *= float7 * float7;
         }
@@ -134,86 +131,24 @@ public class HumanoidModel<T extends LivingEntity> extends AgeableListModel<T> i
             this.leftLeg.zRot = -0.07853982f;
         }
         this.rightArm.yRot = 0.0f;
-        this.rightArm.zRot = 0.0f;
-        switch (this.leftArmPose) {
-            case EMPTY: {
-                this.leftArm.yRot = 0.0f;
-                break;
-            }
-            case BLOCK: {
-                this.leftArm.xRot = this.leftArm.xRot * 0.5f - 0.9424779f;
-                this.leftArm.yRot = 0.5235988f;
-                break;
-            }
-            case ITEM: {
-                this.leftArm.xRot = this.leftArm.xRot * 0.5f - 0.31415927f;
-                this.leftArm.yRot = 0.0f;
-                break;
-            }
+        this.leftArm.yRot = 0.0f;
+        final boolean boolean10 = aoy.getMainArm() == HumanoidArm.RIGHT;
+        final boolean boolean11 = boolean10 ? this.leftArmPose.isTwoHanded() : this.rightArmPose.isTwoHanded();
+        if (boolean10 != boolean11) {
+            this.poseLeftArm(aoy);
+            this.poseRightArm(aoy);
         }
-        switch (this.rightArmPose) {
-            case EMPTY: {
-                this.rightArm.yRot = 0.0f;
-                break;
-            }
-            case BLOCK: {
-                this.rightArm.xRot = this.rightArm.xRot * 0.5f - 0.9424779f;
-                this.rightArm.yRot = -0.5235988f;
-                break;
-            }
-            case ITEM: {
-                this.rightArm.xRot = this.rightArm.xRot * 0.5f - 0.31415927f;
-                this.rightArm.yRot = 0.0f;
-                break;
-            }
-            case THROW_SPEAR: {
-                this.rightArm.xRot = this.rightArm.xRot * 0.5f - 3.1415927f;
-                this.rightArm.yRot = 0.0f;
-                break;
-            }
-        }
-        if (this.leftArmPose == ArmPose.THROW_SPEAR && this.rightArmPose != ArmPose.BLOCK && this.rightArmPose != ArmPose.THROW_SPEAR && this.rightArmPose != ArmPose.BOW_AND_ARROW) {
-            this.leftArm.xRot = this.leftArm.xRot * 0.5f - 3.1415927f;
-            this.leftArm.yRot = 0.0f;
-        }
-        if (this.attackTime > 0.0f) {
-            final HumanoidArm aky11 = this.getAttackArm(akz);
-            final ModelPart dni12 = this.getArm(aky11);
-            float float8 = this.attackTime;
-            this.body.yRot = Mth.sin(Mth.sqrt(float8) * 6.2831855f) * 0.2f;
-            if (aky11 == HumanoidArm.LEFT) {
-                final ModelPart body = this.body;
-                body.yRot *= -1.0f;
-            }
-            this.rightArm.z = Mth.sin(this.body.yRot) * 5.0f;
-            this.rightArm.x = -Mth.cos(this.body.yRot) * 5.0f;
-            this.leftArm.z = -Mth.sin(this.body.yRot) * 5.0f;
-            this.leftArm.x = Mth.cos(this.body.yRot) * 5.0f;
-            final ModelPart rightArm2 = this.rightArm;
-            rightArm2.yRot += this.body.yRot;
-            final ModelPart leftArm2 = this.leftArm;
-            leftArm2.yRot += this.body.yRot;
-            final ModelPart leftArm3 = this.leftArm;
-            leftArm3.xRot += this.body.yRot;
-            float8 = 1.0f - this.attackTime;
-            float8 *= float8;
-            float8 *= float8;
-            float8 = 1.0f - float8;
-            final float float9 = Mth.sin(float8 * 3.1415927f);
-            final float float10 = Mth.sin(this.attackTime * 3.1415927f) * -(this.head.xRot - 0.7f) * 0.75f;
-            final ModelPart modelPart = dni12;
-            modelPart.xRot -= (float)(float9 * 1.2 + float10);
-            final ModelPart modelPart2 = dni12;
-            modelPart2.yRot += this.body.yRot * 2.0f;
-            final ModelPart modelPart3 = dni12;
-            modelPart3.zRot += Mth.sin(this.attackTime * 3.1415927f) * -0.4f;
+        else {
+            this.poseRightArm(aoy);
+            this.poseLeftArm(aoy);
         }
+        this.setupAttackAnimation(aoy, float4);
         if (this.crouching) {
             this.body.xRot = 0.5f;
-            final ModelPart rightArm3 = this.rightArm;
-            rightArm3.xRot += 0.4f;
-            final ModelPart leftArm4 = this.leftArm;
-            leftArm4.xRot += 0.4f;
+            final ModelPart rightArm2 = this.rightArm;
+            rightArm2.xRot += 0.4f;
+            final ModelPart leftArm2 = this.leftArm;
+            leftArm2.xRot += 0.4f;
             this.rightLeg.z = 4.0f;
             this.leftLeg.z = 4.0f;
             this.rightLeg.y = 12.2f;
@@ -234,112 +169,187 @@ public class HumanoidModel<T extends LivingEntity> extends AgeableListModel<T> i
             this.leftArm.y = 2.0f;
             this.rightArm.y = 2.0f;
         }
-        final ModelPart rightArm4 = this.rightArm;
-        rightArm4.zRot += Mth.cos(float4 * 0.09f) * 0.05f + 0.05f;
-        final ModelPart leftArm5 = this.leftArm;
-        leftArm5.zRot -= Mth.cos(float4 * 0.09f) * 0.05f + 0.05f;
-        final ModelPart rightArm5 = this.rightArm;
-        rightArm5.xRot += Mth.sin(float4 * 0.067f) * 0.05f;
-        final ModelPart leftArm6 = this.leftArm;
-        leftArm6.xRot -= Mth.sin(float4 * 0.067f) * 0.05f;
-        if (this.rightArmPose == ArmPose.BOW_AND_ARROW) {
-            this.rightArm.yRot = -0.1f + this.head.yRot;
-            this.leftArm.yRot = 0.1f + this.head.yRot + 0.4f;
-            this.rightArm.xRot = -1.5707964f + this.head.xRot;
-            this.leftArm.xRot = -1.5707964f + this.head.xRot;
-        }
-        else if (this.leftArmPose == ArmPose.BOW_AND_ARROW && this.rightArmPose != ArmPose.THROW_SPEAR && this.rightArmPose != ArmPose.BLOCK) {
-            this.rightArm.yRot = -0.1f + this.head.yRot - 0.4f;
-            this.leftArm.yRot = 0.1f + this.head.yRot;
-            this.rightArm.xRot = -1.5707964f + this.head.xRot;
-            this.leftArm.xRot = -1.5707964f + this.head.xRot;
-        }
-        final float float11 = (float)CrossbowItem.getChargeDuration(akz.getUseItem());
-        if (this.rightArmPose == ArmPose.CROSSBOW_CHARGE) {
-            this.rightArm.yRot = -0.8f;
-            this.rightArm.xRot = -0.97079635f;
-            this.leftArm.xRot = -0.97079635f;
-            final float float12 = Mth.clamp(this.itemUseTicks, 0.0f, float11);
-            this.leftArm.yRot = Mth.lerp(float12 / float11, 0.4f, 0.85f);
-            this.leftArm.xRot = Mth.lerp(float12 / float11, this.leftArm.xRot, -1.5707964f);
-        }
-        else if (this.leftArmPose == ArmPose.CROSSBOW_CHARGE) {
-            this.leftArm.yRot = 0.8f;
-            this.rightArm.xRot = -0.97079635f;
-            this.leftArm.xRot = -0.97079635f;
-            final float float12 = Mth.clamp(this.itemUseTicks, 0.0f, float11);
-            this.rightArm.yRot = Mth.lerp(float12 / float11, -0.4f, -0.85f);
-            this.rightArm.xRot = Mth.lerp(float12 / float11, this.rightArm.xRot, -1.5707964f);
-        }
-        if (this.rightArmPose == ArmPose.CROSSBOW_HOLD && this.attackTime <= 0.0f) {
-            this.rightArm.yRot = -0.3f + this.head.yRot;
-            this.leftArm.yRot = 0.6f + this.head.yRot;
-            this.rightArm.xRot = -1.5707964f + this.head.xRot + 0.1f;
-            this.leftArm.xRot = -1.5f + this.head.xRot;
-        }
-        else if (this.leftArmPose == ArmPose.CROSSBOW_HOLD) {
-            this.rightArm.yRot = -0.6f + this.head.yRot;
-            this.leftArm.yRot = 0.3f + this.head.yRot;
-            this.rightArm.xRot = -1.5f + this.head.xRot;
-            this.leftArm.xRot = -1.5707964f + this.head.xRot + 0.1f;
-        }
+        AnimationUtils.bobArms(this.rightArm, this.leftArm, float4);
         if (this.swimAmount > 0.0f) {
-            final float float12 = float2 % 26.0f;
-            final float float8 = (this.attackTime > 0.0f) ? 0.0f : this.swimAmount;
-            if (float12 < 14.0f) {
-                this.leftArm.xRot = this.rotlerpRad(this.leftArm.xRot, 0.0f, this.swimAmount);
-                this.rightArm.xRot = Mth.lerp(float8, this.rightArm.xRot, 0.0f);
-                this.leftArm.yRot = this.rotlerpRad(this.leftArm.yRot, 3.1415927f, this.swimAmount);
-                this.rightArm.yRot = Mth.lerp(float8, this.rightArm.yRot, 3.1415927f);
-                this.leftArm.zRot = this.rotlerpRad(this.leftArm.zRot, 3.1415927f + 1.8707964f * this.quadraticArmUpdate(float12) / this.quadraticArmUpdate(14.0f), this.swimAmount);
-                this.rightArm.zRot = Mth.lerp(float8, this.rightArm.zRot, 3.1415927f - 1.8707964f * this.quadraticArmUpdate(float12) / this.quadraticArmUpdate(14.0f));
+            final float float8 = float2 % 26.0f;
+            final HumanoidArm aou14 = this.getAttackArm(aoy);
+            final float float9 = (aou14 == HumanoidArm.RIGHT && this.attackTime > 0.0f) ? 0.0f : this.swimAmount;
+            final float float10 = (aou14 == HumanoidArm.LEFT && this.attackTime > 0.0f) ? 0.0f : this.swimAmount;
+            if (float8 < 14.0f) {
+                this.leftArm.xRot = this.rotlerpRad(float10, this.leftArm.xRot, 0.0f);
+                this.rightArm.xRot = Mth.lerp(float9, this.rightArm.xRot, 0.0f);
+                this.leftArm.yRot = this.rotlerpRad(float10, this.leftArm.yRot, 3.1415927f);
+                this.rightArm.yRot = Mth.lerp(float9, this.rightArm.yRot, 3.1415927f);
+                this.leftArm.zRot = this.rotlerpRad(float10, this.leftArm.zRot, 3.1415927f + 1.8707964f * this.quadraticArmUpdate(float8) / this.quadraticArmUpdate(14.0f));
+                this.rightArm.zRot = Mth.lerp(float9, this.rightArm.zRot, 3.1415927f - 1.8707964f * this.quadraticArmUpdate(float8) / this.quadraticArmUpdate(14.0f));
             }
-            else if (float12 >= 14.0f && float12 < 22.0f) {
-                final float float9 = (float12 - 14.0f) / 8.0f;
-                this.leftArm.xRot = this.rotlerpRad(this.leftArm.xRot, 1.5707964f * float9, this.swimAmount);
-                this.rightArm.xRot = Mth.lerp(float8, this.rightArm.xRot, 1.5707964f * float9);
-                this.leftArm.yRot = this.rotlerpRad(this.leftArm.yRot, 3.1415927f, this.swimAmount);
-                this.rightArm.yRot = Mth.lerp(float8, this.rightArm.yRot, 3.1415927f);
-                this.leftArm.zRot = this.rotlerpRad(this.leftArm.zRot, 5.012389f - 1.8707964f * float9, this.swimAmount);
-                this.rightArm.zRot = Mth.lerp(float8, this.rightArm.zRot, 1.2707963f + 1.8707964f * float9);
+            else if (float8 >= 14.0f && float8 < 22.0f) {
+                final float float11 = (float8 - 14.0f) / 8.0f;
+                this.leftArm.xRot = this.rotlerpRad(float10, this.leftArm.xRot, 1.5707964f * float11);
+                this.rightArm.xRot = Mth.lerp(float9, this.rightArm.xRot, 1.5707964f * float11);
+                this.leftArm.yRot = this.rotlerpRad(float10, this.leftArm.yRot, 3.1415927f);
+                this.rightArm.yRot = Mth.lerp(float9, this.rightArm.yRot, 3.1415927f);
+                this.leftArm.zRot = this.rotlerpRad(float10, this.leftArm.zRot, 5.012389f - 1.8707964f * float11);
+                this.rightArm.zRot = Mth.lerp(float9, this.rightArm.zRot, 1.2707963f + 1.8707964f * float11);
             }
-            else if (float12 >= 22.0f && float12 < 26.0f) {
-                final float float9 = (float12 - 22.0f) / 4.0f;
-                this.leftArm.xRot = this.rotlerpRad(this.leftArm.xRot, 1.5707964f - 1.5707964f * float9, this.swimAmount);
-                this.rightArm.xRot = Mth.lerp(float8, this.rightArm.xRot, 1.5707964f - 1.5707964f * float9);
-                this.leftArm.yRot = this.rotlerpRad(this.leftArm.yRot, 3.1415927f, this.swimAmount);
-                this.rightArm.yRot = Mth.lerp(float8, this.rightArm.yRot, 3.1415927f);
-                this.leftArm.zRot = this.rotlerpRad(this.leftArm.zRot, 3.1415927f, this.swimAmount);
-                this.rightArm.zRot = Mth.lerp(float8, this.rightArm.zRot, 3.1415927f);
+            else if (float8 >= 22.0f && float8 < 26.0f) {
+                final float float11 = (float8 - 22.0f) / 4.0f;
+                this.leftArm.xRot = this.rotlerpRad(float10, this.leftArm.xRot, 1.5707964f - 1.5707964f * float11);
+                this.rightArm.xRot = Mth.lerp(float9, this.rightArm.xRot, 1.5707964f - 1.5707964f * float11);
+                this.leftArm.yRot = this.rotlerpRad(float10, this.leftArm.yRot, 3.1415927f);
+                this.rightArm.yRot = Mth.lerp(float9, this.rightArm.yRot, 3.1415927f);
+                this.leftArm.zRot = this.rotlerpRad(float10, this.leftArm.zRot, 3.1415927f);
+                this.rightArm.zRot = Mth.lerp(float9, this.rightArm.zRot, 3.1415927f);
             }
-            final float float9 = 0.3f;
-            final float float10 = 0.33333334f;
+            final float float11 = 0.3f;
+            final float float12 = 0.33333334f;
             this.leftLeg.xRot = Mth.lerp(this.swimAmount, this.leftLeg.xRot, 0.3f * Mth.cos(float2 * 0.33333334f + 3.1415927f));
             this.rightLeg.xRot = Mth.lerp(this.swimAmount, this.rightLeg.xRot, 0.3f * Mth.cos(float2 * 0.33333334f));
         }
         this.hat.copyFrom(this.head);
     }
     
+    private void poseRightArm(final T aoy) {
+        switch (this.rightArmPose) {
+            case EMPTY: {
+                this.rightArm.yRot = 0.0f;
+                break;
+            }
+            case BLOCK: {
+                this.rightArm.xRot = this.rightArm.xRot * 0.5f - 0.9424779f;
+                this.rightArm.yRot = -0.5235988f;
+                break;
+            }
+            case ITEM: {
+                this.rightArm.xRot = this.rightArm.xRot * 0.5f - 0.31415927f;
+                this.rightArm.yRot = 0.0f;
+                break;
+            }
+            case THROW_SPEAR: {
+                this.rightArm.xRot = this.rightArm.xRot * 0.5f - 3.1415927f;
+                this.rightArm.yRot = 0.0f;
+                break;
+            }
+            case BOW_AND_ARROW: {
+                this.rightArm.yRot = -0.1f + this.head.yRot;
+                this.leftArm.yRot = 0.1f + this.head.yRot + 0.4f;
+                this.rightArm.xRot = -1.5707964f + this.head.xRot;
+                this.leftArm.xRot = -1.5707964f + this.head.xRot;
+                break;
+            }
+            case CROSSBOW_CHARGE: {
+                AnimationUtils.animateCrossbowCharge(this.rightArm, this.leftArm, aoy, true);
+                break;
+            }
+            case CROSSBOW_HOLD: {
+                AnimationUtils.animateCrossbowHold(this.rightArm, this.leftArm, this.head, true);
+                break;
+            }
+        }
+    }
+    
+    private void poseLeftArm(final T aoy) {
+        switch (this.leftArmPose) {
+            case EMPTY: {
+                this.leftArm.yRot = 0.0f;
+                break;
+            }
+            case BLOCK: {
+                this.leftArm.xRot = this.leftArm.xRot * 0.5f - 0.9424779f;
+                this.leftArm.yRot = 0.5235988f;
+                break;
+            }
+            case ITEM: {
+                this.leftArm.xRot = this.leftArm.xRot * 0.5f - 0.31415927f;
+                this.leftArm.yRot = 0.0f;
+                break;
+            }
+            case THROW_SPEAR: {
+                this.leftArm.xRot = this.leftArm.xRot * 0.5f - 3.1415927f;
+                this.leftArm.yRot = 0.0f;
+                break;
+            }
+            case BOW_AND_ARROW: {
+                this.rightArm.yRot = -0.1f + this.head.yRot - 0.4f;
+                this.leftArm.yRot = 0.1f + this.head.yRot;
+                this.rightArm.xRot = -1.5707964f + this.head.xRot;
+                this.leftArm.xRot = -1.5707964f + this.head.xRot;
+                break;
+            }
+            case CROSSBOW_CHARGE: {
+                AnimationUtils.animateCrossbowCharge(this.rightArm, this.leftArm, aoy, false);
+                break;
+            }
+            case CROSSBOW_HOLD: {
+                AnimationUtils.animateCrossbowHold(this.rightArm, this.leftArm, this.head, false);
+                break;
+            }
+        }
+    }
+    
+    protected void setupAttackAnimation(final T aoy, final float float2) {
+        if (this.attackTime <= 0.0f) {
+            return;
+        }
+        final HumanoidArm aou4 = this.getAttackArm(aoy);
+        final ModelPart dyg5 = this.getArm(aou4);
+        float float3 = this.attackTime;
+        this.body.yRot = Mth.sin(Mth.sqrt(float3) * 6.2831855f) * 0.2f;
+        if (aou4 == HumanoidArm.LEFT) {
+            final ModelPart body = this.body;
+            body.yRot *= -1.0f;
+        }
+        this.rightArm.z = Mth.sin(this.body.yRot) * 5.0f;
+        this.rightArm.x = -Mth.cos(this.body.yRot) * 5.0f;
+        this.leftArm.z = -Mth.sin(this.body.yRot) * 5.0f;
+        this.leftArm.x = Mth.cos(this.body.yRot) * 5.0f;
+        final ModelPart rightArm = this.rightArm;
+        rightArm.yRot += this.body.yRot;
+        final ModelPart leftArm = this.leftArm;
+        leftArm.yRot += this.body.yRot;
+        final ModelPart leftArm2 = this.leftArm;
+        leftArm2.xRot += this.body.yRot;
+        float3 = 1.0f - this.attackTime;
+        float3 *= float3;
+        float3 *= float3;
+        float3 = 1.0f - float3;
+        final float float4 = Mth.sin(float3 * 3.1415927f);
+        final float float5 = Mth.sin(this.attackTime * 3.1415927f) * -(this.head.xRot - 0.7f) * 0.75f;
+        final ModelPart modelPart = dyg5;
+        modelPart.xRot -= (float)(float4 * 1.2 + float5);
+        final ModelPart modelPart2 = dyg5;
+        modelPart2.yRot += this.body.yRot * 2.0f;
+        final ModelPart modelPart3 = dyg5;
+        modelPart3.zRot += Mth.sin(this.attackTime * 3.1415927f) * -0.4f;
+    }
+    
     protected float rotlerpRad(final float float1, final float float2, final float float3) {
-        float float4 = (float2 - float1) % 6.2831855f;
+        float float4 = (float3 - float2) % 6.2831855f;
         if (float4 < -3.1415927f) {
             float4 += 6.2831855f;
         }
         if (float4 >= 3.1415927f) {
             float4 -= 6.2831855f;
         }
-        return float1 + float3 * float4;
+        return float2 + float1 * float4;
     }
     
     private float quadraticArmUpdate(final float float1) {
         return -65.0f * float1 + float1 * float1;
     }
     
-    public void copyPropertiesTo(final HumanoidModel<T> dlj) {
-        super.copyPropertiesTo(dlj);
-        dlj.leftArmPose = this.leftArmPose;
-        dlj.rightArmPose = this.rightArmPose;
-        dlj.crouching = this.crouching;
+    public void copyPropertiesTo(final HumanoidModel<T> dwf) {
+        super.copyPropertiesTo(dwf);
+        dwf.leftArmPose = this.leftArmPose;
+        dwf.rightArmPose = this.rightArmPose;
+        dwf.crouching = this.crouching;
+        dwf.head.copyFrom(this.head);
+        dwf.hat.copyFrom(this.hat);
+        dwf.body.copyFrom(this.body);
+        dwf.rightArm.copyFrom(this.rightArm);
+        dwf.leftArm.copyFrom(this.leftArm);
+        dwf.rightLeg.copyFrom(this.rightLeg);
+        dwf.leftLeg.copyFrom(this.leftLeg);
     }
     
     public void setAllVisible(final boolean boolean1) {
@@ -353,12 +363,12 @@ public class HumanoidModel<T extends LivingEntity> extends AgeableListModel<T> i
     }
     
     @Override
-    public void translateToHand(final HumanoidArm aky, final PoseStack cyl) {
-        this.getArm(aky).translateAndRotate(cyl);
+    public void translateToHand(final HumanoidArm aou, final PoseStack dhl) {
+        this.getArm(aou).translateAndRotate(dhl);
     }
     
-    protected ModelPart getArm(final HumanoidArm aky) {
-        if (aky == HumanoidArm.LEFT) {
+    protected ModelPart getArm(final HumanoidArm aou) {
+        if (aou == HumanoidArm.LEFT) {
             return this.leftArm;
         }
         return this.rightArm;
@@ -369,18 +379,28 @@ public class HumanoidModel<T extends LivingEntity> extends AgeableListModel<T> i
         return this.head;
     }
     
-    protected HumanoidArm getAttackArm(final T akz) {
-        final HumanoidArm aky3 = akz.getMainArm();
-        return (akz.swingingArm == InteractionHand.MAIN_HAND) ? aky3 : aky3.getOpposite();
+    protected HumanoidArm getAttackArm(final T aoy) {
+        final HumanoidArm aou3 = aoy.getMainArm();
+        return (aoy.swingingArm == InteractionHand.MAIN_HAND) ? aou3 : aou3.getOpposite();
     }
     
     public enum ArmPose {
-        EMPTY, 
-        ITEM, 
-        BLOCK, 
-        BOW_AND_ARROW, 
-        THROW_SPEAR, 
-        CROSSBOW_CHARGE, 
-        CROSSBOW_HOLD;
+        EMPTY(false), 
+        ITEM(false), 
+        BLOCK(false), 
+        BOW_AND_ARROW(true), 
+        THROW_SPEAR(false), 
+        CROSSBOW_CHARGE(true), 
+        CROSSBOW_HOLD(true);
+        
+        private final boolean twoHanded;
+        
+        private ArmPose(final boolean boolean3) {
+            this.twoHanded = boolean3;
+        }
+        
+        public boolean isTwoHanded() {
+            return this.twoHanded;
+        }
     }
 }
diff --git a/src/net/minecraft/client/model/IllagerModel.java b/src/net/minecraft/client/model/IllagerModel.java
index ecd6ac9..6846ac4 100644
--- a/src/net/minecraft/client/model/IllagerModel.java
+++ b/src/net/minecraft/client/model/IllagerModel.java
@@ -3,6 +3,7 @@ package net.minecraft.client.model;
 import net.minecraft.world.entity.Entity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.entity.HumanoidArm;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.util.Mth;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.model.geom.ModelPart;
@@ -17,7 +18,6 @@ public class IllagerModel<T extends AbstractIllager> extends ListModel<T> implem
     private final ModelPart rightLeg;
     private final ModelPart rightArm;
     private final ModelPart leftArm;
-    private float itemUseTicks;
     
     public IllagerModel(final float float1, final float float2, final int integer3, final int integer4) {
         (this.head = new ModelPart(this).setTexSize(integer3, integer4)).setPos(0.0f, 0.0f + float2, 0.0f);
@@ -25,19 +25,19 @@ public class IllagerModel<T extends AbstractIllager> extends ListModel<T> implem
         (this.hat = new ModelPart(this, 32, 0).setTexSize(integer3, integer4)).addBox(-4.0f, -10.0f, -4.0f, 8.0f, 12.0f, 8.0f, float1 + 0.45f);
         this.head.addChild(this.hat);
         this.hat.visible = false;
-        final ModelPart dni6 = new ModelPart(this).setTexSize(integer3, integer4);
-        dni6.setPos(0.0f, float2 - 2.0f, 0.0f);
-        dni6.texOffs(24, 0).addBox(-1.0f, -1.0f, -6.0f, 2.0f, 4.0f, 2.0f, float1);
-        this.head.addChild(dni6);
+        final ModelPart dyg6 = new ModelPart(this).setTexSize(integer3, integer4);
+        dyg6.setPos(0.0f, float2 - 2.0f, 0.0f);
+        dyg6.texOffs(24, 0).addBox(-1.0f, -1.0f, -6.0f, 2.0f, 4.0f, 2.0f, float1);
+        this.head.addChild(dyg6);
         (this.body = new ModelPart(this).setTexSize(integer3, integer4)).setPos(0.0f, 0.0f + float2, 0.0f);
         this.body.texOffs(16, 20).addBox(-4.0f, 0.0f, -3.0f, 8.0f, 12.0f, 6.0f, float1);
         this.body.texOffs(0, 38).addBox(-4.0f, 0.0f, -3.0f, 8.0f, 18.0f, 6.0f, float1 + 0.5f);
         (this.arms = new ModelPart(this).setTexSize(integer3, integer4)).setPos(0.0f, 0.0f + float2 + 2.0f, 0.0f);
         this.arms.texOffs(44, 22).addBox(-8.0f, -2.0f, -2.0f, 4.0f, 8.0f, 4.0f, float1);
-        final ModelPart dni7 = new ModelPart(this, 44, 22).setTexSize(integer3, integer4);
-        dni7.mirror = true;
-        dni7.addBox(4.0f, -2.0f, -2.0f, 4.0f, 8.0f, 4.0f, float1);
-        this.arms.addChild(dni7);
+        final ModelPart dyg7 = new ModelPart(this, 44, 22).setTexSize(integer3, integer4);
+        dyg7.mirror = true;
+        dyg7.addBox(4.0f, -2.0f, -2.0f, 4.0f, 8.0f, 4.0f, float1);
+        this.arms.addChild(dyg7);
         this.arms.texOffs(40, 38).addBox(-4.0f, 2.0f, -2.0f, 8.0f, 4.0f, 4.0f, float1);
         (this.leftLeg = new ModelPart(this, 0, 22).setTexSize(integer3, integer4)).setPos(-2.0f, 12.0f + float2, 0.0f);
         this.leftLeg.addBox(-2.0f, 0.0f, -2.0f, 4.0f, 12.0f, 4.0f, float1);
@@ -59,7 +59,7 @@ public class IllagerModel<T extends AbstractIllager> extends ListModel<T> implem
     }
     
     @Override
-    public void setupAnim(final T awe, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T bbj, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.yRot = float5 * 0.017453292f;
         this.head.xRot = float6 * 0.017453292f;
         this.arms.y = 3.0f;
@@ -93,38 +93,9 @@ public class IllagerModel<T extends AbstractIllager> extends ListModel<T> implem
             this.rightLeg.yRot = 0.0f;
             this.rightLeg.zRot = 0.0f;
         }
-        final AbstractIllager.IllagerArmPose a8 = awe.getArmPose();
+        final AbstractIllager.IllagerArmPose a8 = bbj.getArmPose();
         if (a8 == AbstractIllager.IllagerArmPose.ATTACKING) {
-            final float float7 = Mth.sin(this.attackTime * 3.1415927f);
-            final float float8 = Mth.sin((1.0f - (1.0f - this.attackTime) * (1.0f - this.attackTime)) * 3.1415927f);
-            this.rightArm.zRot = 0.0f;
-            this.leftArm.zRot = 0.0f;
-            this.rightArm.yRot = 0.15707964f;
-            this.leftArm.yRot = -0.15707964f;
-            if (awe.getMainArm() == HumanoidArm.RIGHT) {
-                this.rightArm.xRot = -1.8849558f + Mth.cos(float4 * 0.09f) * 0.15f;
-                this.leftArm.xRot = -0.0f + Mth.cos(float4 * 0.19f) * 0.5f;
-                final ModelPart rightArm = this.rightArm;
-                rightArm.xRot += float7 * 2.2f - float8 * 0.4f;
-                final ModelPart leftArm = this.leftArm;
-                leftArm.xRot += float7 * 1.2f - float8 * 0.4f;
-            }
-            else {
-                this.rightArm.xRot = -0.0f + Mth.cos(float4 * 0.19f) * 0.5f;
-                this.leftArm.xRot = -1.8849558f + Mth.cos(float4 * 0.09f) * 0.15f;
-                final ModelPart rightArm2 = this.rightArm;
-                rightArm2.xRot += float7 * 1.2f - float8 * 0.4f;
-                final ModelPart leftArm2 = this.leftArm;
-                leftArm2.xRot += float7 * 2.2f - float8 * 0.4f;
-            }
-            final ModelPart rightArm3 = this.rightArm;
-            rightArm3.zRot += Mth.cos(float4 * 0.09f) * 0.05f + 0.05f;
-            final ModelPart leftArm3 = this.leftArm;
-            leftArm3.zRot -= Mth.cos(float4 * 0.09f) * 0.05f + 0.05f;
-            final ModelPart rightArm4 = this.rightArm;
-            rightArm4.xRot += Mth.sin(float4 * 0.067f) * 0.05f;
-            final ModelPart leftArm4 = this.leftArm;
-            leftArm4.xRot -= Mth.sin(float4 * 0.067f) * 0.05f;
+            AnimationUtils.<T>swingWeaponDown(this.rightArm, this.leftArm, bbj, this.attackTime, float4);
         }
         else if (a8 == AbstractIllager.IllagerArmPose.SPELLCASTING) {
             this.rightArm.z = 0.0f;
@@ -146,18 +117,10 @@ public class IllagerModel<T extends AbstractIllager> extends ListModel<T> implem
             this.leftArm.zRot = 1.5707964f;
         }
         else if (a8 == AbstractIllager.IllagerArmPose.CROSSBOW_HOLD) {
-            this.rightArm.yRot = -0.3f + this.head.yRot;
-            this.leftArm.yRot = 0.6f + this.head.yRot;
-            this.rightArm.xRot = -1.5707964f + this.head.xRot + 0.1f;
-            this.leftArm.xRot = -1.5f + this.head.xRot;
+            AnimationUtils.animateCrossbowHold(this.rightArm, this.leftArm, this.head, true);
         }
         else if (a8 == AbstractIllager.IllagerArmPose.CROSSBOW_CHARGE) {
-            this.rightArm.yRot = -0.8f;
-            this.rightArm.xRot = -0.97079635f;
-            this.leftArm.xRot = -0.97079635f;
-            final float float7 = Mth.clamp(this.itemUseTicks, 0.0f, 25.0f);
-            this.leftArm.yRot = Mth.lerp(float7 / 25.0f, 0.4f, 0.85f);
-            this.leftArm.xRot = Mth.lerp(float7 / 25.0f, this.leftArm.xRot, -1.5707964f);
+            AnimationUtils.animateCrossbowCharge(this.rightArm, this.leftArm, bbj, true);
         }
         else if (a8 == AbstractIllager.IllagerArmPose.CELEBRATING) {
             this.rightArm.z = 0.0f;
@@ -177,14 +140,8 @@ public class IllagerModel<T extends AbstractIllager> extends ListModel<T> implem
         this.rightArm.visible = !boolean9;
     }
     
-    @Override
-    public void prepareMobModel(final T awe, final float float2, final float float3, final float float4) {
-        this.itemUseTicks = (float)awe.getTicksUsingItem();
-        super.prepareMobModel(awe, float2, float3, float4);
-    }
-    
-    private ModelPart getArm(final HumanoidArm aky) {
-        if (aky == HumanoidArm.LEFT) {
+    private ModelPart getArm(final HumanoidArm aou) {
+        if (aou == HumanoidArm.LEFT) {
             return this.leftArm;
         }
         return this.rightArm;
@@ -200,7 +157,7 @@ public class IllagerModel<T extends AbstractIllager> extends ListModel<T> implem
     }
     
     @Override
-    public void translateToHand(final HumanoidArm aky, final PoseStack cyl) {
-        this.getArm(aky).translateAndRotate(cyl);
+    public void translateToHand(final HumanoidArm aou, final PoseStack dhl) {
+        this.getArm(aou).translateAndRotate(dhl);
     }
 }
diff --git a/src/net/minecraft/client/model/IronGolemModel.java b/src/net/minecraft/client/model/IronGolemModel.java
index 94d7c16..0217ad9 100644
--- a/src/net/minecraft/client/model/IronGolemModel.java
+++ b/src/net/minecraft/client/model/IronGolemModel.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.model;
 
 import net.minecraft.world.entity.Entity;
+import net.minecraft.util.Mth;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.world.entity.animal.IronGolem;
@@ -40,39 +41,35 @@ public class IronGolemModel<T extends IronGolem> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T atl, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T ayt, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.yRot = float5 * 0.017453292f;
         this.head.xRot = float6 * 0.017453292f;
-        this.leg0.xRot = -1.5f * this.triangleWave(float2, 13.0f) * float3;
-        this.leg1.xRot = 1.5f * this.triangleWave(float2, 13.0f) * float3;
+        this.leg0.xRot = -1.5f * Mth.triangleWave(float2, 13.0f) * float3;
+        this.leg1.xRot = 1.5f * Mth.triangleWave(float2, 13.0f) * float3;
         this.leg0.yRot = 0.0f;
         this.leg1.yRot = 0.0f;
     }
     
     @Override
-    public void prepareMobModel(final T atl, final float float2, final float float3, final float float4) {
-        final int integer6 = atl.getAttackAnimationTick();
+    public void prepareMobModel(final T ayt, final float float2, final float float3, final float float4) {
+        final int integer6 = ayt.getAttackAnimationTick();
         if (integer6 > 0) {
-            this.arm0.xRot = -2.0f + 1.5f * this.triangleWave(integer6 - float4, 10.0f);
-            this.arm1.xRot = -2.0f + 1.5f * this.triangleWave(integer6 - float4, 10.0f);
+            this.arm0.xRot = -2.0f + 1.5f * Mth.triangleWave(integer6 - float4, 10.0f);
+            this.arm1.xRot = -2.0f + 1.5f * Mth.triangleWave(integer6 - float4, 10.0f);
         }
         else {
-            final int integer7 = atl.getOfferFlowerTick();
+            final int integer7 = ayt.getOfferFlowerTick();
             if (integer7 > 0) {
-                this.arm0.xRot = -0.8f + 0.025f * this.triangleWave((float)integer7, 70.0f);
+                this.arm0.xRot = -0.8f + 0.025f * Mth.triangleWave((float)integer7, 70.0f);
                 this.arm1.xRot = 0.0f;
             }
             else {
-                this.arm0.xRot = (-0.2f + 1.5f * this.triangleWave(float2, 13.0f)) * float3;
-                this.arm1.xRot = (-0.2f - 1.5f * this.triangleWave(float2, 13.0f)) * float3;
+                this.arm0.xRot = (-0.2f + 1.5f * Mth.triangleWave(float2, 13.0f)) * float3;
+                this.arm1.xRot = (-0.2f - 1.5f * Mth.triangleWave(float2, 13.0f)) * float3;
             }
         }
     }
     
-    private float triangleWave(final float float1, final float float2) {
-        return (Math.abs(float1 % float2 - float2 * 0.5f) - float2 * 0.25f) / (float2 * 0.25f);
-    }
-    
     public ModelPart getFlowerHoldingArm() {
         return this.arm0;
     }
diff --git a/src/net/minecraft/client/model/LavaSlimeModel.java b/src/net/minecraft/client/model/LavaSlimeModel.java
index 25f36c5..3caff02 100644
--- a/src/net/minecraft/client/model/LavaSlimeModel.java
+++ b/src/net/minecraft/client/model/LavaSlimeModel.java
@@ -35,12 +35,12 @@ public class LavaSlimeModel<T extends Slime> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T axh, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T bck, final float float2, final float float3, final float float4, final float float5, final float float6) {
     }
     
     @Override
-    public void prepareMobModel(final T axh, final float float2, final float float3, final float float4) {
-        float float5 = Mth.lerp(float4, axh.oSquish, axh.squish);
+    public void prepareMobModel(final T bck, final float float2, final float float3, final float float4) {
+        float float5 = Mth.lerp(float4, bck.oSquish, bck.squish);
         if (float5 < 0.0f) {
             float5 = 0.0f;
         }
diff --git a/src/net/minecraft/client/model/LeashKnotModel.java b/src/net/minecraft/client/model/LeashKnotModel.java
index 42615c7..67098ca 100644
--- a/src/net/minecraft/client/model/LeashKnotModel.java
+++ b/src/net/minecraft/client/model/LeashKnotModel.java
@@ -20,7 +20,7 @@ public class LeashKnotModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.knot.yRot = float5 * 0.017453292f;
         this.knot.xRot = float6 * 0.017453292f;
     }
diff --git a/src/net/minecraft/client/model/ListModel.java b/src/net/minecraft/client/model/ListModel.java
index 5873907..d966ddc 100644
--- a/src/net/minecraft/client/model/ListModel.java
+++ b/src/net/minecraft/client/model/ListModel.java
@@ -3,12 +3,23 @@ package net.minecraft.client.model;
 import net.minecraft.client.model.geom.ModelPart;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.resources.ResourceLocation;
+import java.util.function.Function;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.entity.Entity;
 
 public abstract class ListModel<E extends Entity> extends EntityModel<E> {
+    public ListModel() {
+        this(RenderType::entityCutoutNoCull);
+    }
+    
+    public ListModel(final Function<ResourceLocation, RenderType> function) {
+        super(function);
+    }
+    
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-        this.parts().forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+        this.parts().forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
     }
     
     public abstract Iterable<ModelPart> parts();
diff --git a/src/net/minecraft/client/model/LlamaModel.java b/src/net/minecraft/client/model/LlamaModel.java
index cd5b82b..01ccd98 100644
--- a/src/net/minecraft/client/model/LlamaModel.java
+++ b/src/net/minecraft/client/model/LlamaModel.java
@@ -63,7 +63,7 @@ public class LlamaModel<T extends AbstractChestedHorse> extends EntityModel<T> {
     }
     
     @Override
-    public void setupAnim(final T aud, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T azl, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.xRot = float6 * 0.017453292f;
         this.head.yRot = float5 * 0.017453292f;
         this.body.xRot = 1.5707964f;
@@ -71,35 +71,35 @@ public class LlamaModel<T extends AbstractChestedHorse> extends EntityModel<T> {
         this.leg1.xRot = Mth.cos(float2 * 0.6662f + 3.1415927f) * 1.4f * float3;
         this.leg2.xRot = Mth.cos(float2 * 0.6662f + 3.1415927f) * 1.4f * float3;
         this.leg3.xRot = Mth.cos(float2 * 0.6662f) * 1.4f * float3;
-        final boolean boolean8 = !aud.isBaby() && aud.hasChest();
+        final boolean boolean8 = !azl.isBaby() && azl.hasChest();
         this.chest1.visible = boolean8;
         this.chest2.visible = boolean8;
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
         if (this.young) {
             final float float9 = 2.0f;
-            cyl.pushPose();
+            dhl.pushPose();
             final float float10 = 0.7f;
-            cyl.scale(0.71428573f, 0.64935064f, 0.7936508f);
-            cyl.translate(0.0, 1.3125, 0.2199999988079071);
-            this.head.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
-            cyl.popPose();
-            cyl.pushPose();
+            dhl.scale(0.71428573f, 0.64935064f, 0.7936508f);
+            dhl.translate(0.0, 1.3125, 0.2199999988079071);
+            this.head.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
+            dhl.popPose();
+            dhl.pushPose();
             final float float11 = 1.1f;
-            cyl.scale(0.625f, 0.45454544f, 0.45454544f);
-            cyl.translate(0.0, 2.0625, 0.0);
-            this.body.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
-            cyl.popPose();
-            cyl.pushPose();
-            cyl.scale(0.45454544f, 0.41322312f, 0.45454544f);
-            cyl.translate(0.0, 2.0625, 0.0);
-            ImmutableList.<ModelPart>of(this.leg0, this.leg1, this.leg2, this.leg3, this.chest1, this.chest2).forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
-            cyl.popPose();
+            dhl.scale(0.625f, 0.45454544f, 0.45454544f);
+            dhl.translate(0.0, 2.0625, 0.0);
+            this.body.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
+            dhl.popPose();
+            dhl.pushPose();
+            dhl.scale(0.45454544f, 0.41322312f, 0.45454544f);
+            dhl.translate(0.0, 2.0625, 0.0);
+            ImmutableList.<ModelPart>of(this.leg0, this.leg1, this.leg2, this.leg3, this.chest1, this.chest2).forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
+            dhl.popPose();
         }
         else {
-            ImmutableList.<ModelPart>of(this.head, this.body, this.leg0, this.leg1, this.leg2, this.leg3, this.chest1, this.chest2).forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
+            ImmutableList.<ModelPart>of(this.head, this.body, this.leg0, this.leg1, this.leg2, this.leg3, this.chest1, this.chest2).forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
         }
     }
 }
diff --git a/src/net/minecraft/client/model/LlamaSpitModel.java b/src/net/minecraft/client/model/LlamaSpitModel.java
index fdf46de..b0e6d9e 100644
--- a/src/net/minecraft/client/model/LlamaSpitModel.java
+++ b/src/net/minecraft/client/model/LlamaSpitModel.java
@@ -25,7 +25,7 @@ public class LlamaSpitModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
     }
     
     @Override
diff --git a/src/net/minecraft/client/model/MinecartModel.java b/src/net/minecraft/client/model/MinecartModel.java
index b1b63cf..d997ce9 100644
--- a/src/net/minecraft/client/model/MinecartModel.java
+++ b/src/net/minecraft/client/model/MinecartModel.java
@@ -38,7 +38,7 @@ public class MinecartModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.cubes[5].y = 4.0f - float4;
     }
     
diff --git a/src/net/minecraft/client/model/Model.java b/src/net/minecraft/client/model/Model.java
index a1bcf58..f26e4c7 100644
--- a/src/net/minecraft/client/model/Model.java
+++ b/src/net/minecraft/client/model/Model.java
@@ -20,12 +20,12 @@ public abstract class Model implements Consumer<ModelPart> {
     }
     
     @Override
-    public void accept(final ModelPart dni) {
+    public void accept(final ModelPart dyg) {
     }
     
-    public final RenderType renderType(final ResourceLocation sm) {
-        return this.renderType.apply(sm);
+    public final RenderType renderType(final ResourceLocation uh) {
+        return this.renderType.apply(uh);
     }
     
-    public abstract void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8);
+    public abstract void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8);
 }
diff --git a/src/net/minecraft/client/model/OcelotModel.java b/src/net/minecraft/client/model/OcelotModel.java
index f2ff35a..8860f19 100644
--- a/src/net/minecraft/client/model/OcelotModel.java
+++ b/src/net/minecraft/client/model/OcelotModel.java
@@ -52,7 +52,7 @@ public class OcelotModel<T extends Entity> extends AgeableListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.xRot = float6 * 0.017453292f;
         this.head.yRot = float5 * 0.017453292f;
         if (this.state != 3) {
@@ -80,7 +80,7 @@ public class OcelotModel<T extends Entity> extends AgeableListModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T akq, final float float2, final float float3, final float float4) {
+    public void prepareMobModel(final T aom, final float float2, final float float3, final float float4) {
         this.body.y = 12.0f;
         this.body.z = -10.0f;
         this.head.y = 15.0f;
@@ -98,7 +98,7 @@ public class OcelotModel<T extends Entity> extends AgeableListModel<T> {
         this.backLegR.y = 18.0f;
         this.backLegR.z = 5.0f;
         this.tail1.xRot = 0.9f;
-        if (akq.isCrouching()) {
+        if (aom.isCrouching()) {
             final ModelPart body = this.body;
             ++body.y;
             final ModelPart head = this.head;
@@ -113,7 +113,7 @@ public class OcelotModel<T extends Entity> extends AgeableListModel<T> {
             this.tail2.xRot = 1.5707964f;
             this.state = 0;
         }
-        else if (akq.isSprinting()) {
+        else if (aom.isSprinting()) {
             this.tail2.y = this.tail1.y;
             final ModelPart tail4 = this.tail2;
             tail4.z += 2.0f;
diff --git a/src/net/minecraft/client/model/PandaModel.java b/src/net/minecraft/client/model/PandaModel.java
index ac9986a..c414480 100644
--- a/src/net/minecraft/client/model/PandaModel.java
+++ b/src/net/minecraft/client/model/PandaModel.java
@@ -34,21 +34,21 @@ public class PandaModel<T extends Panda> extends QuadrupedModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T ato, final float float2, final float float3, final float float4) {
-        super.prepareMobModel(ato, float2, float3, float4);
-        this.sitAmount = ato.getSitAmount(float4);
-        this.lieOnBackAmount = ato.getLieOnBackAmount(float4);
-        this.rollAmount = (ato.isBaby() ? 0.0f : ato.getRollAmount(float4));
+    public void prepareMobModel(final T ayw, final float float2, final float float3, final float float4) {
+        super.prepareMobModel(ayw, float2, float3, float4);
+        this.sitAmount = ayw.getSitAmount(float4);
+        this.lieOnBackAmount = ayw.getLieOnBackAmount(float4);
+        this.rollAmount = (ayw.isBaby() ? 0.0f : ayw.getRollAmount(float4));
     }
     
     @Override
-    public void setupAnim(final T ato, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(ato, float2, float3, float4, float5, float6);
-        final boolean boolean8 = ato.getUnhappyCounter() > 0;
-        final boolean boolean9 = ato.isSneezing();
-        final int integer10 = ato.getSneezeCounter();
-        final boolean boolean10 = ato.isEating();
-        final boolean boolean11 = ato.isScared();
+    public void setupAnim(final T ayw, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(ayw, float2, float3, float4, float5, float6);
+        final boolean boolean8 = ayw.getUnhappyCounter() > 0;
+        final boolean boolean9 = ayw.isSneezing();
+        final int integer10 = ayw.getSneezeCounter();
+        final boolean boolean10 = ayw.isEating();
+        final boolean boolean11 = ayw.isScared();
         if (boolean8) {
             this.head.yRot = 0.35f * Mth.sin(0.6f * float4);
             this.head.zRot = 0.35f * Mth.sin(0.6f * float4);
diff --git a/src/net/minecraft/client/model/ParrotModel.java b/src/net/minecraft/client/model/ParrotModel.java
index bb9f5b2..a819b57 100644
--- a/src/net/minecraft/client/model/ParrotModel.java
+++ b/src/net/minecraft/client/model/ParrotModel.java
@@ -58,19 +58,19 @@ public class ParrotModel extends ListModel<Parrot> {
     }
     
     @Override
-    public void setupAnim(final Parrot atp, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        this.setupAnim(getState(atp), atp.tickCount, float2, float3, float4, float5, float6);
+    public void setupAnim(final Parrot ayx, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        this.setupAnim(getState(ayx), ayx.tickCount, float2, float3, float4, float5, float6);
     }
     
     @Override
-    public void prepareMobModel(final Parrot atp, final float float2, final float float3, final float float4) {
-        this.prepare(getState(atp));
+    public void prepareMobModel(final Parrot ayx, final float float2, final float float3, final float float4) {
+        this.prepare(getState(ayx));
     }
     
-    public void renderOnShoulder(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8, final int integer9) {
+    public void renderOnShoulder(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8, final int integer9) {
         this.prepare(State.ON_SHOULDER);
         this.setupAnim(State.ON_SHOULDER, integer9, float5, float6, 0.0f, float7, float8);
-        this.parts().forEach(dni -> dni.render(cyl, cyo, integer3, integer4));
+        this.parts().forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4));
     }
     
     private void setupAnim(final State a, final int integer, final float float3, final float float4, final float float5, final float float6, final float float7) {
@@ -176,14 +176,14 @@ public class ParrotModel extends ListModel<Parrot> {
         }
     }
     
-    private static State getState(final Parrot atp) {
-        if (atp.isPartyParrot()) {
+    private static State getState(final Parrot ayx) {
+        if (ayx.isPartyParrot()) {
             return State.PARTY;
         }
-        if (atp.isSitting()) {
+        if (ayx.isInSittingPose()) {
             return State.SITTING;
         }
-        if (atp.isFlying()) {
+        if (ayx.isFlying()) {
             return State.FLYING;
         }
         return State.STANDING;
diff --git a/src/net/minecraft/client/model/PhantomModel.java b/src/net/minecraft/client/model/PhantomModel.java
index c35f7d1..87055bb 100644
--- a/src/net/minecraft/client/model/PhantomModel.java
+++ b/src/net/minecraft/client/model/PhantomModel.java
@@ -43,11 +43,11 @@ public class PhantomModel<T extends Entity> extends ListModel<T> {
         this.rightWingBase.zRot = -0.1f;
         this.rightWingTip.zRot = -0.1f;
         this.body.xRot = -0.1f;
-        final ModelPart dni2 = new ModelPart(this, 0, 0);
-        dni2.addBox(-4.0f, -2.0f, -5.0f, 7.0f, 3.0f, 5.0f);
-        dni2.setPos(0.0f, 1.0f, -7.0f);
-        dni2.xRot = 0.2f;
-        this.body.addChild(dni2);
+        final ModelPart dyg2 = new ModelPart(this, 0, 0);
+        dyg2.addBox(-4.0f, -2.0f, -5.0f, 7.0f, 3.0f, 5.0f);
+        dyg2.setPos(0.0f, 1.0f, -7.0f);
+        dyg2.xRot = 0.2f;
+        this.body.addChild(dyg2);
         this.body.addChild(this.leftWingBase);
         this.body.addChild(this.rightWingBase);
     }
@@ -58,8 +58,8 @@ public class PhantomModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        final float float7 = (akq.getId() * 3 + float4) * 0.13f;
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        final float float7 = (aom.getId() * 3 + float4) * 0.13f;
         final float float8 = 16.0f;
         this.leftWingBase.zRot = Mth.cos(float7) * 16.0f * 0.017453292f;
         this.leftWingTip.zRot = Mth.cos(float7) * 16.0f * 0.017453292f;
diff --git a/src/net/minecraft/client/model/PiglinModel.java b/src/net/minecraft/client/model/PiglinModel.java
new file mode 100644
index 0000000..35bc84c
--- /dev/null
+++ b/src/net/minecraft/client/model/PiglinModel.java
@@ -0,0 +1,118 @@
+package net.minecraft.client.model;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.monster.piglin.Piglin;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.util.Mth;
+import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.world.entity.Mob;
+
+public class PiglinModel<T extends Mob> extends PlayerModel<T> {
+    public final ModelPart earRight;
+    public final ModelPart earLeft;
+    private final ModelPart bodyDefault;
+    private final ModelPart headDefault;
+    private final ModelPart leftArmDefault;
+    private final ModelPart rightArmDefault;
+    
+    public PiglinModel(final float float1, final int integer2, final int integer3) {
+        super(float1, false);
+        this.texWidth = integer2;
+        this.texHeight = integer3;
+        (this.body = new ModelPart(this, 16, 16)).addBox(-4.0f, 0.0f, -2.0f, 8.0f, 12.0f, 4.0f, float1);
+        this.head = new ModelPart(this);
+        this.head.texOffs(0, 0).addBox(-5.0f, -8.0f, -4.0f, 10.0f, 8.0f, 8.0f, float1);
+        this.head.texOffs(31, 1).addBox(-2.0f, -4.0f, -5.0f, 4.0f, 4.0f, 1.0f, float1);
+        this.head.texOffs(2, 4).addBox(2.0f, -2.0f, -5.0f, 1.0f, 2.0f, 1.0f, float1);
+        this.head.texOffs(2, 0).addBox(-3.0f, -2.0f, -5.0f, 1.0f, 2.0f, 1.0f, float1);
+        (this.earRight = new ModelPart(this)).setPos(4.5f, -6.0f, 0.0f);
+        this.earRight.texOffs(51, 6).addBox(0.0f, 0.0f, -2.0f, 1.0f, 5.0f, 4.0f, float1);
+        this.head.addChild(this.earRight);
+        (this.earLeft = new ModelPart(this)).setPos(-4.5f, -6.0f, 0.0f);
+        this.earLeft.texOffs(39, 6).addBox(-1.0f, 0.0f, -2.0f, 1.0f, 5.0f, 4.0f, float1);
+        this.head.addChild(this.earLeft);
+        this.hat = new ModelPart(this);
+        this.bodyDefault = this.body.createShallowCopy();
+        this.headDefault = this.head.createShallowCopy();
+        this.leftArmDefault = this.leftArm.createShallowCopy();
+        this.rightArmDefault = this.leftArm.createShallowCopy();
+    }
+    
+    @Override
+    public void setupAnim(final T aoz, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        this.body.copyFrom(this.bodyDefault);
+        this.head.copyFrom(this.headDefault);
+        this.leftArm.copyFrom(this.leftArmDefault);
+        this.rightArm.copyFrom(this.rightArmDefault);
+        super.setupAnim(aoz, float2, float3, float4, float5, float6);
+        final float float7 = 0.5235988f;
+        final float float8 = float4 * 0.1f + float2 * 0.5f;
+        final float float9 = 0.08f + float3 * 0.4f;
+        this.earRight.zRot = -0.5235988f - Mth.cos(float8 * 1.2f) * float9;
+        this.earLeft.zRot = 0.5235988f + Mth.cos(float8) * float9;
+        if (aoz.getType() == EntityType.PIGLIN) {
+            final Piglin bdc11 = (Piglin)aoz;
+            final Piglin.PiglinArmPose a12 = bdc11.getArmPose();
+            if (a12 == Piglin.PiglinArmPose.DANCING) {
+                final float float10 = float4 / 60.0f;
+                this.earLeft.zRot = 0.5235988f + 0.017453292f * Mth.sin(float10 * 30.0f) * 10.0f;
+                this.earRight.zRot = -0.5235988f - 0.017453292f * Mth.cos(float10 * 30.0f) * 10.0f;
+                this.head.x = Mth.sin(float10 * 10.0f);
+                this.head.y = Mth.sin(float10 * 40.0f) + 0.4f;
+                this.rightArm.zRot = 0.017453292f * (70.0f + Mth.cos(float10 * 40.0f) * 10.0f);
+                this.leftArm.zRot = this.rightArm.zRot * -1.0f;
+                this.rightArm.y = Mth.sin(float10 * 40.0f) * 0.5f + 1.5f;
+                this.leftArm.y = Mth.sin(float10 * 40.0f) * 0.5f + 1.5f;
+                this.body.y = Mth.sin(float10 * 40.0f) * 0.35f;
+            }
+            else if (a12 == Piglin.PiglinArmPose.ATTACKING_WITH_MELEE_WEAPON && this.attackTime == 0.0f) {
+                this.holdWeaponHigh(aoz);
+            }
+            else if (a12 == Piglin.PiglinArmPose.CROSSBOW_HOLD) {
+                AnimationUtils.animateCrossbowHold(this.rightArm, this.leftArm, this.head, !aoz.isLeftHanded());
+            }
+            else if (a12 == Piglin.PiglinArmPose.CROSSBOW_CHARGE) {
+                AnimationUtils.animateCrossbowCharge(this.rightArm, this.leftArm, aoz, !aoz.isLeftHanded());
+            }
+            else if (a12 == Piglin.PiglinArmPose.ADMIRING_ITEM) {
+                this.head.xRot = 0.5f;
+                this.head.yRot = 0.0f;
+                if (aoz.isLeftHanded()) {
+                    this.rightArm.yRot = -0.5f;
+                    this.rightArm.xRot = -0.9f;
+                }
+                else {
+                    this.leftArm.yRot = 0.5f;
+                    this.leftArm.xRot = -0.9f;
+                }
+            }
+        }
+        else if (aoz.getType() == EntityType.ZOMBIFIED_PIGLIN) {
+            AnimationUtils.animateZombieArms(this.leftArm, this.rightArm, aoz.isAggressive(), this.attackTime, float4);
+        }
+        this.leftPants.copyFrom(this.leftLeg);
+        this.rightPants.copyFrom(this.rightLeg);
+        this.leftSleeve.copyFrom(this.leftArm);
+        this.rightSleeve.copyFrom(this.rightArm);
+        this.jacket.copyFrom(this.body);
+    }
+    
+    @Override
+    protected void setupAttackAnimation(final T aoz, final float float2) {
+        if (this.attackTime > 0.0f && aoz instanceof Piglin && ((Piglin)aoz).getArmPose() == Piglin.PiglinArmPose.ATTACKING_WITH_MELEE_WEAPON) {
+            AnimationUtils.<T>swingWeaponDown(this.rightArm, this.leftArm, aoz, this.attackTime, float2);
+            return;
+        }
+        super.setupAttackAnimation(aoz, float2);
+    }
+    
+    private void holdWeaponHigh(final T aoz) {
+        if (aoz.isLeftHanded()) {
+            this.leftArm.xRot = -1.8f;
+        }
+        else {
+            this.rightArm.xRot = -1.8f;
+        }
+    }
+}
diff --git a/src/net/minecraft/client/model/PlayerModel.java b/src/net/minecraft/client/model/PlayerModel.java
index c3134d2..f6e6ec8 100644
--- a/src/net/minecraft/client/model/PlayerModel.java
+++ b/src/net/minecraft/client/model/PlayerModel.java
@@ -3,6 +3,7 @@ package net.minecraft.client.model;
 import net.minecraft.world.entity.Entity;
 import java.util.Random;
 import net.minecraft.world.entity.HumanoidArm;
+import net.minecraft.world.entity.EquipmentSlot;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.google.common.collect.Iterables;
@@ -65,30 +66,42 @@ public class PlayerModel<T extends LivingEntity> extends HumanoidModel<T> {
         return Iterables.<ModelPart>concat(super.bodyParts(), ImmutableList.<ModelPart>of(this.leftPants, this.rightPants, this.leftSleeve, this.rightSleeve, this.jacket));
     }
     
-    public void renderEars(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4) {
+    public void renderEars(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4) {
         this.ear.copyFrom(this.head);
         this.ear.x = 0.0f;
         this.ear.y = 0.0f;
-        this.ear.render(cyl, cyo, integer3, integer4);
+        this.ear.render(dhl, dhp, integer3, integer4);
     }
     
-    public void renderCloak(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4) {
-        this.cloak.render(cyl, cyo, integer3, integer4);
+    public void renderCloak(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4) {
+        this.cloak.render(dhl, dhp, integer3, integer4);
     }
     
     @Override
-    public void setupAnim(final T akz, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(akz, float2, float3, float4, float5, float6);
+    public void setupAnim(final T aoy, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(aoy, float2, float3, float4, float5, float6);
         this.leftPants.copyFrom(this.leftLeg);
         this.rightPants.copyFrom(this.rightLeg);
         this.leftSleeve.copyFrom(this.leftArm);
         this.rightSleeve.copyFrom(this.rightArm);
         this.jacket.copyFrom(this.body);
-        if (akz.isCrouching()) {
-            this.cloak.y = 2.0f;
+        if (aoy.getItemBySlot(EquipmentSlot.CHEST).isEmpty()) {
+            if (aoy.isCrouching()) {
+                this.cloak.z = 1.4f;
+                this.cloak.y = 1.85f;
+            }
+            else {
+                this.cloak.z = 0.0f;
+                this.cloak.y = 0.0f;
+            }
+        }
+        else if (aoy.isCrouching()) {
+            this.cloak.z = 0.3f;
+            this.cloak.y = 0.8f;
         }
         else {
-            this.cloak.y = 0.0f;
+            this.cloak.z = -1.1f;
+            this.cloak.y = -0.85f;
         }
     }
     
@@ -105,18 +118,18 @@ public class PlayerModel<T extends LivingEntity> extends HumanoidModel<T> {
     }
     
     @Override
-    public void translateToHand(final HumanoidArm aky, final PoseStack cyl) {
-        final ModelPart dni4 = this.getArm(aky);
+    public void translateToHand(final HumanoidArm aou, final PoseStack dhl) {
+        final ModelPart dyg4 = this.getArm(aou);
         if (this.slim) {
-            final float float5 = 0.5f * ((aky == HumanoidArm.RIGHT) ? 1 : -1);
-            final ModelPart modelPart = dni4;
+            final float float5 = 0.5f * ((aou == HumanoidArm.RIGHT) ? 1 : -1);
+            final ModelPart modelPart = dyg4;
             modelPart.x += float5;
-            dni4.translateAndRotate(cyl);
-            final ModelPart modelPart2 = dni4;
+            dyg4.translateAndRotate(dhl);
+            final ModelPart modelPart2 = dyg4;
             modelPart2.x -= float5;
         }
         else {
-            dni4.translateAndRotate(cyl);
+            dyg4.translateAndRotate(dhl);
         }
     }
     
@@ -125,10 +138,10 @@ public class PlayerModel<T extends LivingEntity> extends HumanoidModel<T> {
     }
     
     @Override
-    public void accept(final ModelPart dni) {
+    public void accept(final ModelPart dyg) {
         if (this.cubes == null) {
             this.cubes = Lists.newArrayList();
         }
-        this.cubes.add(dni);
+        this.cubes.add(dyg);
     }
 }
diff --git a/src/net/minecraft/client/model/PolarBearModel.java b/src/net/minecraft/client/model/PolarBearModel.java
index 4dd5dd5..1c92de6 100644
--- a/src/net/minecraft/client/model/PolarBearModel.java
+++ b/src/net/minecraft/client/model/PolarBearModel.java
@@ -13,9 +13,9 @@ public class PolarBearModel<T extends PolarBear> extends QuadrupedModel<T> {
         this.head.setPos(0.0f, 10.0f, -16.0f);
         this.head.texOffs(0, 44).addBox(-2.5f, 1.0f, -6.0f, 5.0f, 3.0f, 3.0f, 0.0f);
         this.head.texOffs(26, 0).addBox(-4.5f, -4.0f, -1.0f, 2.0f, 2.0f, 1.0f, 0.0f);
-        final ModelPart dni2 = this.head.texOffs(26, 0);
-        dni2.mirror = true;
-        dni2.addBox(2.5f, -4.0f, -1.0f, 2.0f, 2.0f, 1.0f, 0.0f);
+        final ModelPart dyg2 = this.head.texOffs(26, 0);
+        dyg2.mirror = true;
+        dyg2.addBox(2.5f, -4.0f, -1.0f, 2.0f, 2.0f, 1.0f, 0.0f);
         this.body = new ModelPart(this);
         this.body.texOffs(0, 19).addBox(-5.0f, -13.0f, -7.0f, 14.0f, 14.0f, 11.0f, 0.0f);
         this.body.texOffs(39, 0).addBox(-4.0f, -25.0f, -7.0f, 12.0f, 12.0f, 10.0f, 0.0f);
@@ -48,10 +48,10 @@ public class PolarBearModel<T extends PolarBear> extends QuadrupedModel<T> {
     }
     
     @Override
-    public void setupAnim(final T atr, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(atr, float2, float3, float4, float5, float6);
-        final float float7 = float4 - atr.tickCount;
-        float float8 = atr.getStandingAnimationScale(float7);
+    public void setupAnim(final T ayz, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(ayz, float2, float3, float4, float5, float6);
+        final float float7 = float4 - ayz.tickCount;
+        float float8 = ayz.getStandingAnimationScale(float7);
         float8 *= float8;
         final float float9 = 1.0f - float8;
         this.body.xRot = 1.5707964f - float8 * 3.1415927f * 0.35f;
diff --git a/src/net/minecraft/client/model/PufferfishBigModel.java b/src/net/minecraft/client/model/PufferfishBigModel.java
index 653dc15..f418f4c 100644
--- a/src/net/minecraft/client/model/PufferfishBigModel.java
+++ b/src/net/minecraft/client/model/PufferfishBigModel.java
@@ -62,11 +62,11 @@ public class PufferfishBigModel<T extends Entity> extends ListModel<T> {
     
     @Override
     public Iterable<ModelPart> parts() {
-        return ImmutableList.<ModelPart>of(this.cube, this.blueFin0, this.blueFin1, this.topFrontFin, this.topMidFin, this.topBackFin, this.sideFrontFin0, this.sideBackFin1, this.bottomFrontFin, this.bottomMidFin, this.bottomBackFin, this.sideBackFin0, this.sideBackFin1);
+        return ImmutableList.<ModelPart>of(this.cube, this.blueFin0, this.blueFin1, this.topFrontFin, this.topMidFin, this.topBackFin, this.sideFrontFin0, this.sideFrontFin1, this.bottomFrontFin, this.bottomMidFin, this.bottomBackFin, this.sideBackFin0, this.sideBackFin1);
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.blueFin0.zRot = -0.2f + 0.4f * Mth.sin(float4 * 0.2f);
         this.blueFin1.zRot = 0.2f - 0.4f * Mth.sin(float4 * 0.2f);
     }
diff --git a/src/net/minecraft/client/model/PufferfishMidModel.java b/src/net/minecraft/client/model/PufferfishMidModel.java
index be6e22c..dbac5a0 100644
--- a/src/net/minecraft/client/model/PufferfishMidModel.java
+++ b/src/net/minecraft/client/model/PufferfishMidModel.java
@@ -60,7 +60,7 @@ public class PufferfishMidModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.finBlue0.zRot = -0.2f + 0.4f * Mth.sin(float4 * 0.2f);
         this.finBlue1.zRot = 0.2f - 0.4f * Mth.sin(float4 * 0.2f);
     }
diff --git a/src/net/minecraft/client/model/PufferfishSmallModel.java b/src/net/minecraft/client/model/PufferfishSmallModel.java
index 2a62d42..1b0e99a 100644
--- a/src/net/minecraft/client/model/PufferfishSmallModel.java
+++ b/src/net/minecraft/client/model/PufferfishSmallModel.java
@@ -37,7 +37,7 @@ public class PufferfishSmallModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.fin0.zRot = -0.2f + 0.4f * Mth.sin(float4 * 0.2f);
         this.fin1.zRot = 0.2f - 0.4f * Mth.sin(float4 * 0.2f);
     }
diff --git a/src/net/minecraft/client/model/QuadrupedModel.java b/src/net/minecraft/client/model/QuadrupedModel.java
index cec7260..1f21108 100644
--- a/src/net/minecraft/client/model/QuadrupedModel.java
+++ b/src/net/minecraft/client/model/QuadrupedModel.java
@@ -40,7 +40,7 @@ public class QuadrupedModel<T extends Entity> extends AgeableListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.xRot = float6 * 0.017453292f;
         this.head.yRot = float5 * 0.017453292f;
         this.body.xRot = 1.5707964f;
diff --git a/src/net/minecraft/client/model/RabbitModel.java b/src/net/minecraft/client/model/RabbitModel.java
index 555ad08..5ef84ab 100644
--- a/src/net/minecraft/client/model/RabbitModel.java
+++ b/src/net/minecraft/client/model/RabbitModel.java
@@ -74,39 +74,39 @@ public class RabbitModel<T extends Rabbit> extends EntityModel<T> {
         this.setRotation(this.nose, 0.0f, 0.0f, 0.0f);
     }
     
-    private void setRotation(final ModelPart dni, final float float2, final float float3, final float float4) {
-        dni.xRot = float2;
-        dni.yRot = float3;
-        dni.zRot = float4;
+    private void setRotation(final ModelPart dyg, final float float2, final float float3, final float float4) {
+        dyg.xRot = float2;
+        dyg.yRot = float3;
+        dyg.zRot = float4;
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
         if (this.young) {
             final float float9 = 1.5f;
-            cyl.pushPose();
-            cyl.scale(0.56666666f, 0.56666666f, 0.56666666f);
-            cyl.translate(0.0, 1.375, 0.125);
-            ImmutableList.<ModelPart>of(this.head, this.earLeft, this.earRight, this.nose).forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
-            cyl.popPose();
-            cyl.pushPose();
-            cyl.scale(0.4f, 0.4f, 0.4f);
-            cyl.translate(0.0, 2.25, 0.0);
-            ImmutableList.<ModelPart>of(this.rearFootLeft, this.rearFootRight, this.haunchLeft, this.haunchRight, this.body, this.frontLegLeft, this.frontLegRight, this.tail).forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
-            cyl.popPose();
+            dhl.pushPose();
+            dhl.scale(0.56666666f, 0.56666666f, 0.56666666f);
+            dhl.translate(0.0, 1.375, 0.125);
+            ImmutableList.<ModelPart>of(this.head, this.earLeft, this.earRight, this.nose).forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
+            dhl.popPose();
+            dhl.pushPose();
+            dhl.scale(0.4f, 0.4f, 0.4f);
+            dhl.translate(0.0, 2.25, 0.0);
+            ImmutableList.<ModelPart>of(this.rearFootLeft, this.rearFootRight, this.haunchLeft, this.haunchRight, this.body, this.frontLegLeft, this.frontLegRight, this.tail).forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
+            dhl.popPose();
         }
         else {
-            cyl.pushPose();
-            cyl.scale(0.6f, 0.6f, 0.6f);
-            cyl.translate(0.0, 1.0, 0.0);
-            ImmutableList.<ModelPart>of(this.rearFootLeft, this.rearFootRight, this.haunchLeft, this.haunchRight, this.body, this.frontLegLeft, this.frontLegRight, this.head, this.earRight, this.earLeft, this.tail, this.nose, new ModelPart[0]).forEach(dni -> dni.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8));
-            cyl.popPose();
+            dhl.pushPose();
+            dhl.scale(0.6f, 0.6f, 0.6f);
+            dhl.translate(0.0, 1.0, 0.0);
+            ImmutableList.<ModelPart>of(this.rearFootLeft, this.rearFootRight, this.haunchLeft, this.haunchRight, this.body, this.frontLegLeft, this.frontLegRight, this.head, this.earRight, this.earLeft, this.tail, this.nose, new ModelPart[0]).forEach(dyg -> dyg.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8));
+            dhl.popPose();
         }
     }
     
     @Override
-    public void setupAnim(final T att, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        final float float7 = float4 - att.tickCount;
+    public void setupAnim(final T azb, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        final float float7 = float4 - azb.tickCount;
         this.nose.xRot = float6 * 0.017453292f;
         this.head.xRot = float6 * 0.017453292f;
         this.earRight.xRot = float6 * 0.017453292f;
@@ -115,7 +115,7 @@ public class RabbitModel<T extends Rabbit> extends EntityModel<T> {
         this.head.yRot = float5 * 0.017453292f;
         this.earRight.yRot = this.nose.yRot - 0.2617994f;
         this.earLeft.yRot = this.nose.yRot + 0.2617994f;
-        this.jumpRotation = Mth.sin(att.getJumpCompletion(float7) * 3.1415927f);
+        this.jumpRotation = Mth.sin(azb.getJumpCompletion(float7) * 3.1415927f);
         this.haunchLeft.xRot = (this.jumpRotation * 50.0f - 21.0f) * 0.017453292f;
         this.haunchRight.xRot = (this.jumpRotation * 50.0f - 21.0f) * 0.017453292f;
         this.rearFootLeft.xRot = this.jumpRotation * 50.0f * 0.017453292f;
@@ -125,8 +125,8 @@ public class RabbitModel<T extends Rabbit> extends EntityModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T att, final float float2, final float float3, final float float4) {
-        super.prepareMobModel(att, float2, float3, float4);
-        this.jumpRotation = Mth.sin(att.getJumpCompletion(float4) * 3.1415927f);
+    public void prepareMobModel(final T azb, final float float2, final float float3, final float float4) {
+        super.prepareMobModel(azb, float2, float3, float4);
+        this.jumpRotation = Mth.sin(azb.getJumpCompletion(float4) * 3.1415927f);
     }
 }
diff --git a/src/net/minecraft/client/model/RavagerModel.java b/src/net/minecraft/client/model/RavagerModel.java
index b82a50a..9dce0fe 100644
--- a/src/net/minecraft/client/model/RavagerModel.java
+++ b/src/net/minecraft/client/model/RavagerModel.java
@@ -26,17 +26,17 @@ public class RavagerModel extends ListModel<Ravager> {
         (this.head = new ModelPart(this)).setPos(0.0f, 16.0f, -17.0f);
         this.head.texOffs(0, 0).addBox(-8.0f, -20.0f, -14.0f, 16.0f, 20.0f, 16.0f, 0.0f);
         this.head.texOffs(0, 0).addBox(-2.0f, -6.0f, -18.0f, 4.0f, 8.0f, 4.0f, 0.0f);
-        final ModelPart dni4 = new ModelPart(this);
-        dni4.setPos(-10.0f, -14.0f, -8.0f);
-        dni4.texOffs(74, 55).addBox(0.0f, -14.0f, -2.0f, 2.0f, 14.0f, 4.0f, 0.0f);
-        dni4.xRot = 1.0995574f;
-        this.head.addChild(dni4);
-        final ModelPart dni5 = new ModelPart(this);
-        dni5.mirror = true;
-        dni5.setPos(8.0f, -14.0f, -8.0f);
-        dni5.texOffs(74, 55).addBox(0.0f, -14.0f, -2.0f, 2.0f, 14.0f, 4.0f, 0.0f);
-        dni5.xRot = 1.0995574f;
-        this.head.addChild(dni5);
+        final ModelPart dyg4 = new ModelPart(this);
+        dyg4.setPos(-10.0f, -14.0f, -8.0f);
+        dyg4.texOffs(74, 55).addBox(0.0f, -14.0f, -2.0f, 2.0f, 14.0f, 4.0f, 0.0f);
+        dyg4.xRot = 1.0995574f;
+        this.head.addChild(dyg4);
+        final ModelPart dyg5 = new ModelPart(this);
+        dyg5.mirror = true;
+        dyg5.setPos(8.0f, -14.0f, -8.0f);
+        dyg5.texOffs(74, 55).addBox(0.0f, -14.0f, -2.0f, 2.0f, 14.0f, 4.0f, 0.0f);
+        dyg5.xRot = 1.0995574f;
+        this.head.addChild(dyg5);
         (this.mouth = new ModelPart(this)).setPos(0.0f, -2.0f, 2.0f);
         this.mouth.texOffs(0, 36).addBox(-8.0f, 0.0f, -16.0f, 16.0f, 3.0f, 16.0f, 0.0f);
         this.head.addChild(this.mouth);
@@ -65,7 +65,7 @@ public class RavagerModel extends ListModel<Ravager> {
     }
     
     @Override
-    public void setupAnim(final Ravager axc, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final Ravager bcg, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.xRot = float6 * 0.017453292f;
         this.head.yRot = float5 * 0.017453292f;
         this.body.xRot = 1.5707964f;
@@ -77,15 +77,15 @@ public class RavagerModel extends ListModel<Ravager> {
     }
     
     @Override
-    public void prepareMobModel(final Ravager axc, final float float2, final float float3, final float float4) {
-        super.prepareMobModel(axc, float2, float3, float4);
-        final int integer6 = axc.getStunnedTick();
-        final int integer7 = axc.getRoarTick();
+    public void prepareMobModel(final Ravager bcg, final float float2, final float float3, final float float4) {
+        super.prepareMobModel(bcg, float2, float3, float4);
+        final int integer6 = bcg.getStunnedTick();
+        final int integer7 = bcg.getRoarTick();
         final int integer8 = 20;
-        final int integer9 = axc.getAttackTick();
+        final int integer9 = bcg.getAttackTick();
         final int integer10 = 10;
         if (integer9 > 0) {
-            final float float5 = this.triangleWave(integer9 - float4, 10.0f);
+            final float float5 = Mth.triangleWave(integer9 - float4, 10.0f);
             final float float6 = (1.0f + float5) * 0.5f;
             final float float7 = float6 * float6 * float6 * 12.0f;
             final float float8 = float7 * Mth.sin(this.neck.xRot);
@@ -119,8 +119,4 @@ public class RavagerModel extends ListModel<Ravager> {
             }
         }
     }
-    
-    private float triangleWave(final float float1, final float float2) {
-        return (Math.abs(float1 % float2 - float2 * 0.5f) - float2 * 0.25f) / (float2 * 0.25f);
-    }
 }
diff --git a/src/net/minecraft/client/model/SalmonModel.java b/src/net/minecraft/client/model/SalmonModel.java
index fffb124..159bccc 100644
--- a/src/net/minecraft/client/model/SalmonModel.java
+++ b/src/net/minecraft/client/model/SalmonModel.java
@@ -22,18 +22,18 @@ public class SalmonModel<T extends Entity> extends ListModel<T> {
         this.bodyBack.setPos(0.0f, 20.0f, 8.0f);
         (this.head = new ModelPart(this, 22, 0)).addBox(-1.0f, -2.0f, -3.0f, 2.0f, 4.0f, 3.0f);
         this.head.setPos(0.0f, 20.0f, 0.0f);
-        final ModelPart dni3 = new ModelPart(this, 20, 10);
-        dni3.addBox(0.0f, -2.5f, 0.0f, 0.0f, 5.0f, 6.0f);
-        dni3.setPos(0.0f, 0.0f, 8.0f);
-        this.bodyBack.addChild(dni3);
-        final ModelPart dni4 = new ModelPart(this, 2, 1);
-        dni4.addBox(0.0f, 0.0f, 0.0f, 0.0f, 2.0f, 3.0f);
-        dni4.setPos(0.0f, -4.5f, 5.0f);
-        this.bodyFront.addChild(dni4);
-        final ModelPart dni5 = new ModelPart(this, 0, 2);
-        dni5.addBox(0.0f, 0.0f, 0.0f, 0.0f, 2.0f, 4.0f);
-        dni5.setPos(0.0f, -4.5f, -1.0f);
-        this.bodyBack.addChild(dni5);
+        final ModelPart dyg3 = new ModelPart(this, 20, 10);
+        dyg3.addBox(0.0f, -2.5f, 0.0f, 0.0f, 5.0f, 6.0f);
+        dyg3.setPos(0.0f, 0.0f, 8.0f);
+        this.bodyBack.addChild(dyg3);
+        final ModelPart dyg4 = new ModelPart(this, 2, 1);
+        dyg4.addBox(0.0f, 0.0f, 0.0f, 0.0f, 2.0f, 3.0f);
+        dyg4.setPos(0.0f, -4.5f, 5.0f);
+        this.bodyFront.addChild(dyg4);
+        final ModelPart dyg5 = new ModelPart(this, 0, 2);
+        dyg5.addBox(0.0f, 0.0f, 0.0f, 0.0f, 2.0f, 4.0f);
+        dyg5.setPos(0.0f, -4.5f, -1.0f);
+        this.bodyBack.addChild(dyg5);
         (this.sideFin0 = new ModelPart(this, -4, 0)).addBox(-2.0f, 0.0f, 0.0f, 2.0f, 0.0f, 2.0f);
         this.sideFin0.setPos(-1.5f, 21.5f, 0.0f);
         this.sideFin0.zRot = -0.7853982f;
@@ -48,10 +48,10 @@ public class SalmonModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         float float7 = 1.0f;
         float float8 = 1.0f;
-        if (!akq.isInWater()) {
+        if (!aom.isInWater()) {
             float7 = 1.3f;
             float8 = 1.7f;
         }
diff --git a/src/net/minecraft/client/model/SheepFurModel.java b/src/net/minecraft/client/model/SheepFurModel.java
index 21af017..5be11dc 100644
--- a/src/net/minecraft/client/model/SheepFurModel.java
+++ b/src/net/minecraft/client/model/SheepFurModel.java
@@ -25,15 +25,15 @@ public class SheepFurModel<T extends Sheep> extends QuadrupedModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T atv, final float float2, final float float3, final float float4) {
-        super.prepareMobModel(atv, float2, float3, float4);
-        this.head.y = 6.0f + atv.getHeadEatPositionScale(float4) * 9.0f;
-        this.headXRot = atv.getHeadEatAngleScale(float4);
+    public void prepareMobModel(final T azd, final float float2, final float float3, final float float4) {
+        super.prepareMobModel(azd, float2, float3, float4);
+        this.head.y = 6.0f + azd.getHeadEatPositionScale(float4) * 9.0f;
+        this.headXRot = azd.getHeadEatAngleScale(float4);
     }
     
     @Override
-    public void setupAnim(final T atv, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(atv, float2, float3, float4, float5, float6);
+    public void setupAnim(final T azd, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(azd, float2, float3, float4, float5, float6);
         this.head.xRot = this.headXRot;
     }
 }
diff --git a/src/net/minecraft/client/model/SheepModel.java b/src/net/minecraft/client/model/SheepModel.java
index 3faff7d..de16039 100644
--- a/src/net/minecraft/client/model/SheepModel.java
+++ b/src/net/minecraft/client/model/SheepModel.java
@@ -16,15 +16,15 @@ public class SheepModel<T extends Sheep> extends QuadrupedModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T atv, final float float2, final float float3, final float float4) {
-        super.prepareMobModel(atv, float2, float3, float4);
-        this.head.y = 6.0f + atv.getHeadEatPositionScale(float4) * 9.0f;
-        this.headXRot = atv.getHeadEatAngleScale(float4);
+    public void prepareMobModel(final T azd, final float float2, final float float3, final float float4) {
+        super.prepareMobModel(azd, float2, float3, float4);
+        this.head.y = 6.0f + azd.getHeadEatPositionScale(float4) * 9.0f;
+        this.headXRot = azd.getHeadEatAngleScale(float4);
     }
     
     @Override
-    public void setupAnim(final T atv, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(atv, float2, float3, float4, float5, float6);
+    public void setupAnim(final T azd, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(azd, float2, float3, float4, float5, float6);
         this.head.xRot = this.headXRot;
     }
 }
diff --git a/src/net/minecraft/client/model/ShieldModel.java b/src/net/minecraft/client/model/ShieldModel.java
index b448908..c05058e 100644
--- a/src/net/minecraft/client/model/ShieldModel.java
+++ b/src/net/minecraft/client/model/ShieldModel.java
@@ -26,8 +26,8 @@ public class ShieldModel extends Model {
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-        this.plate.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
-        this.handle.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+        this.plate.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
+        this.handle.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
     }
 }
diff --git a/src/net/minecraft/client/model/ShulkerBulletModel.java b/src/net/minecraft/client/model/ShulkerBulletModel.java
index dac5b70..d564689 100644
--- a/src/net/minecraft/client/model/ShulkerBulletModel.java
+++ b/src/net/minecraft/client/model/ShulkerBulletModel.java
@@ -23,7 +23,7 @@ public class ShulkerBulletModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.main.yRot = float5 * 0.017453292f;
         this.main.xRot = float6 * 0.017453292f;
     }
diff --git a/src/net/minecraft/client/model/ShulkerModel.java b/src/net/minecraft/client/model/ShulkerModel.java
index 4cfde99..86ed969 100644
--- a/src/net/minecraft/client/model/ShulkerModel.java
+++ b/src/net/minecraft/client/model/ShulkerModel.java
@@ -3,6 +3,8 @@ package net.minecraft.client.model;
 import net.minecraft.world.entity.Entity;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.util.Mth;
+import java.util.function.Function;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.world.entity.monster.Shulker;
 
@@ -12,6 +14,7 @@ public class ShulkerModel<T extends Shulker> extends ListModel<T> {
     private final ModelPart head;
     
     public ShulkerModel() {
+        super(RenderType::entityCutoutNoCullZOffset);
         this.lid = new ModelPart(64, 64, 0, 0);
         this.base = new ModelPart(64, 64, 0, 28);
         this.head = new ModelPart(64, 64, 0, 52);
@@ -24,23 +27,23 @@ public class ShulkerModel<T extends Shulker> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T axe, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        final float float7 = float4 - axe.tickCount;
-        final float float8 = (0.5f + axe.getClientPeekAmount(float7)) * 3.1415927f;
+    public void setupAnim(final T bch, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        final float float7 = float4 - bch.tickCount;
+        final float float8 = (0.5f + bch.getClientPeekAmount(float7)) * 3.1415927f;
         final float float9 = -1.0f + Mth.sin(float8);
         float float10 = 0.0f;
         if (float8 > 3.1415927f) {
             float10 = Mth.sin(float4 * 0.1f) * 0.7f;
         }
         this.lid.setPos(0.0f, 16.0f + Mth.sin(float8) * 8.0f + float10, 0.0f);
-        if (axe.getClientPeekAmount(float7) > 0.3f) {
+        if (bch.getClientPeekAmount(float7) > 0.3f) {
             this.lid.yRot = float9 * float9 * float9 * float9 * 3.1415927f * 0.125f;
         }
         else {
             this.lid.yRot = 0.0f;
         }
         this.head.xRot = float6 * 0.017453292f;
-        this.head.yRot = float5 * 0.017453292f;
+        this.head.yRot = (bch.yHeadRot - 180.0f - bch.yBodyRot) * 0.017453292f;
     }
     
     @Override
diff --git a/src/net/minecraft/client/model/SilverfishModel.java b/src/net/minecraft/client/model/SilverfishModel.java
index 3bff9ac..1d26be3 100644
--- a/src/net/minecraft/client/model/SilverfishModel.java
+++ b/src/net/minecraft/client/model/SilverfishModel.java
@@ -45,7 +45,7 @@ public class SilverfishModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         for (int integer8 = 0; integer8 < this.bodyParts.length; ++integer8) {
             this.bodyParts[integer8].yRot = Mth.cos(float4 * 0.9f + integer8 * 0.15f * 3.1415927f) * 3.1415927f * 0.05f * (1 + Math.abs(integer8 - 2));
             this.bodyParts[integer8].x = Mth.sin(float4 * 0.9f + integer8 * 0.15f * 3.1415927f) * 3.1415927f * 0.2f * Math.abs(integer8 - 2);
diff --git a/src/net/minecraft/client/model/SkeletonModel.java b/src/net/minecraft/client/model/SkeletonModel.java
index 38c7fe7..ca5a840 100644
--- a/src/net/minecraft/client/model/SkeletonModel.java
+++ b/src/net/minecraft/client/model/SkeletonModel.java
@@ -34,26 +34,26 @@ public class SkeletonModel<T extends Mob> extends HumanoidModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T ala, final float float2, final float float3, final float float4) {
+    public void prepareMobModel(final T aoz, final float float2, final float float3, final float float4) {
         this.rightArmPose = ArmPose.EMPTY;
         this.leftArmPose = ArmPose.EMPTY;
-        final ItemStack ben6 = ((LivingEntity)ala).getItemInHand(InteractionHand.MAIN_HAND);
-        if (ben6.getItem() == Items.BOW && ((Mob)ala).isAggressive()) {
-            if (((Mob)ala).getMainArm() == HumanoidArm.RIGHT) {
+        final ItemStack bki6 = ((LivingEntity)aoz).getItemInHand(InteractionHand.MAIN_HAND);
+        if (bki6.getItem() == Items.BOW && ((Mob)aoz).isAggressive()) {
+            if (((Mob)aoz).getMainArm() == HumanoidArm.RIGHT) {
                 this.rightArmPose = ArmPose.BOW_AND_ARROW;
             }
             else {
                 this.leftArmPose = ArmPose.BOW_AND_ARROW;
             }
         }
-        super.prepareMobModel(ala, float2, float3, float4);
+        super.prepareMobModel(aoz, float2, float3, float4);
     }
     
     @Override
-    public void setupAnim(final T ala, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(ala, float2, float3, float4, float5, float6);
-        final ItemStack ben8 = ((LivingEntity)ala).getMainHandItem();
-        if (((Mob)ala).isAggressive() && (ben8.isEmpty() || ben8.getItem() != Items.BOW)) {
+    public void setupAnim(final T aoz, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(aoz, float2, float3, float4, float5, float6);
+        final ItemStack bki8 = ((LivingEntity)aoz).getMainHandItem();
+        if (((Mob)aoz).isAggressive() && (bki8.isEmpty() || bki8.getItem() != Items.BOW)) {
             final float float7 = Mth.sin(this.attackTime * 3.1415927f);
             final float float8 = Mth.sin((1.0f - (1.0f - this.attackTime) * (1.0f - this.attackTime)) * 3.1415927f);
             this.rightArm.zRot = 0.0f;
@@ -66,25 +66,18 @@ public class SkeletonModel<T extends Mob> extends HumanoidModel<T> {
             rightArm.xRot -= float7 * 1.2f - float8 * 0.4f;
             final ModelPart leftArm = this.leftArm;
             leftArm.xRot -= float7 * 1.2f - float8 * 0.4f;
-            final ModelPart rightArm2 = this.rightArm;
-            rightArm2.zRot += Mth.cos(float4 * 0.09f) * 0.05f + 0.05f;
-            final ModelPart leftArm2 = this.leftArm;
-            leftArm2.zRot -= Mth.cos(float4 * 0.09f) * 0.05f + 0.05f;
-            final ModelPart rightArm3 = this.rightArm;
-            rightArm3.xRot += Mth.sin(float4 * 0.067f) * 0.05f;
-            final ModelPart leftArm3 = this.leftArm;
-            leftArm3.xRot -= Mth.sin(float4 * 0.067f) * 0.05f;
+            AnimationUtils.bobArms(this.rightArm, this.leftArm, float4);
         }
     }
     
     @Override
-    public void translateToHand(final HumanoidArm aky, final PoseStack cyl) {
-        final float float4 = (aky == HumanoidArm.RIGHT) ? 1.0f : -1.0f;
+    public void translateToHand(final HumanoidArm aou, final PoseStack dhl) {
+        final float float4 = (aou == HumanoidArm.RIGHT) ? 1.0f : -1.0f;
         final ModelPart arm;
-        final ModelPart dni5 = arm = this.getArm(aky);
+        final ModelPart dyg5 = arm = this.getArm(aou);
         arm.x += float4;
-        dni5.translateAndRotate(cyl);
-        final ModelPart modelPart = dni5;
+        dyg5.translateAndRotate(dhl);
+        final ModelPart modelPart = dyg5;
         modelPart.x -= float4;
     }
 }
diff --git a/src/net/minecraft/client/model/SkullModel.java b/src/net/minecraft/client/model/SkullModel.java
index 3d5fb8a..9e720cd 100644
--- a/src/net/minecraft/client/model/SkullModel.java
+++ b/src/net/minecraft/client/model/SkullModel.java
@@ -26,7 +26,7 @@ public class SkullModel extends Model {
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-        this.head.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+        this.head.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
     }
 }
diff --git a/src/net/minecraft/client/model/SlimeModel.java b/src/net/minecraft/client/model/SlimeModel.java
index e7d99e4..607c568 100644
--- a/src/net/minecraft/client/model/SlimeModel.java
+++ b/src/net/minecraft/client/model/SlimeModel.java
@@ -27,7 +27,7 @@ public class SlimeModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
     }
     
     @Override
diff --git a/src/net/minecraft/client/model/SnowGolemModel.java b/src/net/minecraft/client/model/SnowGolemModel.java
index c11f58b..d1f5981 100644
--- a/src/net/minecraft/client/model/SnowGolemModel.java
+++ b/src/net/minecraft/client/model/SnowGolemModel.java
@@ -28,7 +28,7 @@ public class SnowGolemModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.yRot = float5 * 0.017453292f;
         this.head.xRot = float6 * 0.017453292f;
         this.piece1.yRot = float5 * 0.017453292f * 0.25f;
diff --git a/src/net/minecraft/client/model/SpiderModel.java b/src/net/minecraft/client/model/SpiderModel.java
index e52108c..cc3e5c9 100644
--- a/src/net/minecraft/client/model/SpiderModel.java
+++ b/src/net/minecraft/client/model/SpiderModel.java
@@ -51,7 +51,7 @@ public class SpiderModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.yRot = float5 * 0.017453292f;
         this.head.xRot = float6 * 0.017453292f;
         final float float7 = 0.7853982f;
diff --git a/src/net/minecraft/client/model/SquidModel.java b/src/net/minecraft/client/model/SquidModel.java
index 51d1d73..fa2b538 100644
--- a/src/net/minecraft/client/model/SquidModel.java
+++ b/src/net/minecraft/client/model/SquidModel.java
@@ -35,9 +35,9 @@ public class SquidModel<T extends Entity> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        for (final ModelPart dni11 : this.tentacles) {
-            dni11.xRot = float4;
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        for (final ModelPart dyg11 : this.tentacles) {
+            dyg11.xRot = float4;
         }
     }
     
diff --git a/src/net/minecraft/client/model/StriderModel.java b/src/net/minecraft/client/model/StriderModel.java
new file mode 100644
index 0000000..464142f
--- /dev/null
+++ b/src/net/minecraft/client/model/StriderModel.java
@@ -0,0 +1,122 @@
+package net.minecraft.client.model;
+
+import net.minecraft.world.entity.Entity;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.util.Mth;
+import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.world.entity.monster.Strider;
+
+public class StriderModel<T extends Strider> extends ListModel<T> {
+    private final ModelPart rightLeg;
+    private final ModelPart leftLeg;
+    private final ModelPart body;
+    private final ModelPart bristle0;
+    private final ModelPart bristle1;
+    private final ModelPart bristle2;
+    private final ModelPart bristle3;
+    private final ModelPart bristle4;
+    private final ModelPart bristle5;
+    
+    public StriderModel() {
+        this.texWidth = 64;
+        this.texHeight = 128;
+        (this.rightLeg = new ModelPart(this, 0, 32)).setPos(-4.0f, 8.0f, 0.0f);
+        this.rightLeg.addBox(-2.0f, 0.0f, -2.0f, 4.0f, 16.0f, 4.0f, 0.0f);
+        (this.leftLeg = new ModelPart(this, 0, 55)).setPos(4.0f, 8.0f, 0.0f);
+        this.leftLeg.addBox(-2.0f, 0.0f, -2.0f, 4.0f, 16.0f, 4.0f, 0.0f);
+        (this.body = new ModelPart(this, 0, 0)).setPos(0.0f, 1.0f, 0.0f);
+        this.body.addBox(-8.0f, -6.0f, -8.0f, 16.0f, 14.0f, 16.0f, 0.0f);
+        (this.bristle0 = new ModelPart(this, 16, 65)).setPos(-8.0f, 4.0f, -8.0f);
+        this.bristle0.addBox(-12.0f, 0.0f, 0.0f, 12.0f, 0.0f, 16.0f, 0.0f, true);
+        this.setRotationAngle(this.bristle0, 0.0f, 0.0f, -1.2217305f);
+        (this.bristle1 = new ModelPart(this, 16, 49)).setPos(-8.0f, -1.0f, -8.0f);
+        this.bristle1.addBox(-12.0f, 0.0f, 0.0f, 12.0f, 0.0f, 16.0f, 0.0f, true);
+        this.setRotationAngle(this.bristle1, 0.0f, 0.0f, -1.134464f);
+        (this.bristle2 = new ModelPart(this, 16, 33)).setPos(-8.0f, -5.0f, -8.0f);
+        this.bristle2.addBox(-12.0f, 0.0f, 0.0f, 12.0f, 0.0f, 16.0f, 0.0f, true);
+        this.setRotationAngle(this.bristle2, 0.0f, 0.0f, -0.87266463f);
+        (this.bristle3 = new ModelPart(this, 16, 33)).setPos(8.0f, -6.0f, -8.0f);
+        this.bristle3.addBox(0.0f, 0.0f, 0.0f, 12.0f, 0.0f, 16.0f, 0.0f);
+        this.setRotationAngle(this.bristle3, 0.0f, 0.0f, 0.87266463f);
+        (this.bristle4 = new ModelPart(this, 16, 49)).setPos(8.0f, -2.0f, -8.0f);
+        this.bristle4.addBox(0.0f, 0.0f, 0.0f, 12.0f, 0.0f, 16.0f, 0.0f);
+        this.setRotationAngle(this.bristle4, 0.0f, 0.0f, 1.134464f);
+        (this.bristle5 = new ModelPart(this, 16, 65)).setPos(8.0f, 3.0f, -8.0f);
+        this.bristle5.addBox(0.0f, 0.0f, 0.0f, 12.0f, 0.0f, 16.0f, 0.0f);
+        this.setRotationAngle(this.bristle5, 0.0f, 0.0f, 1.2217305f);
+        this.body.addChild(this.bristle0);
+        this.body.addChild(this.bristle1);
+        this.body.addChild(this.bristle2);
+        this.body.addChild(this.bristle3);
+        this.body.addChild(this.bristle4);
+        this.body.addChild(this.bristle5);
+    }
+    
+    @Override
+    public void setupAnim(final Strider bco, final float float2, float float3, final float float4, final float float5, final float float6) {
+        float3 = Math.min(0.25f, float3);
+        if (bco.getPassengers().size() <= 0) {
+            this.body.xRot = float6 * 0.017453292f;
+            this.body.yRot = float5 * 0.017453292f;
+        }
+        else {
+            this.body.xRot = 0.0f;
+            this.body.yRot = 0.0f;
+        }
+        final float float7 = 1.5f;
+        this.body.zRot = 0.1f * Mth.sin(float2 * 1.5f) * 4.0f * float3;
+        this.body.y = 2.0f;
+        final ModelPart body = this.body;
+        body.y -= 2.0f * Mth.cos(float2 * 1.5f) * 2.0f * float3;
+        this.leftLeg.xRot = Mth.sin(float2 * 1.5f * 0.5f) * 2.0f * float3;
+        this.rightLeg.xRot = Mth.sin(float2 * 1.5f * 0.5f + 3.1415927f) * 2.0f * float3;
+        this.leftLeg.zRot = 0.17453292f * Mth.cos(float2 * 1.5f * 0.5f) * float3;
+        this.rightLeg.zRot = 0.17453292f * Mth.cos(float2 * 1.5f * 0.5f + 3.1415927f) * float3;
+        this.leftLeg.y = 8.0f + 2.0f * Mth.sin(float2 * 1.5f * 0.5f + 3.1415927f) * 2.0f * float3;
+        this.rightLeg.y = 8.0f + 2.0f * Mth.sin(float2 * 1.5f * 0.5f) * 2.0f * float3;
+        this.bristle0.zRot = -1.2217305f;
+        this.bristle1.zRot = -1.134464f;
+        this.bristle2.zRot = -0.87266463f;
+        this.bristle3.zRot = 0.87266463f;
+        this.bristle4.zRot = 1.134464f;
+        this.bristle5.zRot = 1.2217305f;
+        final float float8 = Mth.cos(float2 * 1.5f + 3.1415927f) * float3;
+        final ModelPart bristle0 = this.bristle0;
+        bristle0.zRot += float8 * 1.3f;
+        final ModelPart bristle2 = this.bristle1;
+        bristle2.zRot += float8 * 1.2f;
+        final ModelPart bristle3 = this.bristle2;
+        bristle3.zRot += float8 * 0.6f;
+        final ModelPart bristle4 = this.bristle3;
+        bristle4.zRot += float8 * 0.6f;
+        final ModelPart bristle5 = this.bristle4;
+        bristle5.zRot += float8 * 1.2f;
+        final ModelPart bristle6 = this.bristle5;
+        bristle6.zRot += float8 * 1.3f;
+        final float float9 = 1.0f;
+        final float float10 = 1.0f;
+        final ModelPart bristle7 = this.bristle0;
+        bristle7.zRot += 0.05f * Mth.sin(float4 * 1.0f * -0.4f);
+        final ModelPart bristle8 = this.bristle1;
+        bristle8.zRot += 0.1f * Mth.sin(float4 * 1.0f * 0.2f);
+        final ModelPart bristle9 = this.bristle2;
+        bristle9.zRot += 0.1f * Mth.sin(float4 * 1.0f * 0.4f);
+        final ModelPart bristle10 = this.bristle3;
+        bristle10.zRot += 0.1f * Mth.sin(float4 * 1.0f * 0.4f);
+        final ModelPart bristle11 = this.bristle4;
+        bristle11.zRot += 0.1f * Mth.sin(float4 * 1.0f * 0.2f);
+        final ModelPart bristle12 = this.bristle5;
+        bristle12.zRot += 0.05f * Mth.sin(float4 * 1.0f * -0.4f);
+    }
+    
+    public void setRotationAngle(final ModelPart dyg, final float float2, final float float3, final float float4) {
+        dyg.xRot = float2;
+        dyg.yRot = float3;
+        dyg.zRot = float4;
+    }
+    
+    @Override
+    public Iterable<ModelPart> parts() {
+        return ImmutableList.<ModelPart>of(this.body, this.leftLeg, this.rightLeg);
+    }
+}
diff --git a/src/net/minecraft/client/model/TridentModel.java b/src/net/minecraft/client/model/TridentModel.java
index 0f47f5d..49ce250 100644
--- a/src/net/minecraft/client/model/TridentModel.java
+++ b/src/net/minecraft/client/model/TridentModel.java
@@ -13,24 +13,24 @@ public class TridentModel extends Model {
     public TridentModel() {
         super(RenderType::entitySolid);
         (this.pole = new ModelPart(32, 32, 0, 6)).addBox(-0.5f, 2.0f, -0.5f, 1.0f, 25.0f, 1.0f, 0.0f);
-        final ModelPart dni2 = new ModelPart(32, 32, 4, 0);
-        dni2.addBox(-1.5f, 0.0f, -0.5f, 3.0f, 2.0f, 1.0f);
-        this.pole.addChild(dni2);
-        final ModelPart dni3 = new ModelPart(32, 32, 4, 3);
-        dni3.addBox(-2.5f, -3.0f, -0.5f, 1.0f, 4.0f, 1.0f);
-        this.pole.addChild(dni3);
-        final ModelPart dni4 = new ModelPart(32, 32, 0, 0);
-        dni4.addBox(-0.5f, -4.0f, -0.5f, 1.0f, 4.0f, 1.0f, 0.0f);
-        this.pole.addChild(dni4);
-        final ModelPart dni5 = new ModelPart(32, 32, 4, 3);
-        dni5.mirror = true;
-        dni5.addBox(1.5f, -3.0f, -0.5f, 1.0f, 4.0f, 1.0f);
-        this.pole.addChild(dni5);
+        final ModelPart dyg2 = new ModelPart(32, 32, 4, 0);
+        dyg2.addBox(-1.5f, 0.0f, -0.5f, 3.0f, 2.0f, 1.0f);
+        this.pole.addChild(dyg2);
+        final ModelPart dyg3 = new ModelPart(32, 32, 4, 3);
+        dyg3.addBox(-2.5f, -3.0f, -0.5f, 1.0f, 4.0f, 1.0f);
+        this.pole.addChild(dyg3);
+        final ModelPart dyg4 = new ModelPart(32, 32, 0, 0);
+        dyg4.addBox(-0.5f, -4.0f, -0.5f, 1.0f, 4.0f, 1.0f, 0.0f);
+        this.pole.addChild(dyg4);
+        final ModelPart dyg5 = new ModelPart(32, 32, 4, 3);
+        dyg5.mirror = true;
+        dyg5.addBox(1.5f, -3.0f, -0.5f, 1.0f, 4.0f, 1.0f);
+        this.pole.addChild(dyg5);
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-        this.pole.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+        this.pole.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
     }
     
     static {
diff --git a/src/net/minecraft/client/model/TropicalFishModelA.java b/src/net/minecraft/client/model/TropicalFishModelA.java
index 01687fd..2671a5b 100644
--- a/src/net/minecraft/client/model/TropicalFishModelA.java
+++ b/src/net/minecraft/client/model/TropicalFishModelA.java
@@ -36,9 +36,9 @@ public class TropicalFishModelA<T extends Entity> extends ColorableListModel<T>
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         float float7 = 1.0f;
-        if (!akq.isInWater()) {
+        if (!aom.isInWater()) {
             float7 = 1.5f;
         }
         this.tail.yRot = -float7 * 0.45f * Mth.sin(0.6f * float4);
diff --git a/src/net/minecraft/client/model/TropicalFishModelB.java b/src/net/minecraft/client/model/TropicalFishModelB.java
index e302729..0503a94 100644
--- a/src/net/minecraft/client/model/TropicalFishModelB.java
+++ b/src/net/minecraft/client/model/TropicalFishModelB.java
@@ -39,9 +39,9 @@ public class TropicalFishModelB<T extends Entity> extends ColorableListModel<T>
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         float float7 = 1.0f;
-        if (!akq.isInWater()) {
+        if (!aom.isInWater()) {
             float7 = 1.5f;
         }
         this.tail.yRot = -float7 * 0.45f * Mth.sin(0.6f * float4);
diff --git a/src/net/minecraft/client/model/TurtleModel.java b/src/net/minecraft/client/model/TurtleModel.java
index ba16c70..1b5f5ca 100644
--- a/src/net/minecraft/client/model/TurtleModel.java
+++ b/src/net/minecraft/client/model/TurtleModel.java
@@ -42,8 +42,8 @@ public class TurtleModel<T extends Turtle> extends QuadrupedModel<T> {
     }
     
     @Override
-    public void setupAnim(final T aua, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(aua, float2, float3, float4, float5, float6);
+    public void setupAnim(final T azi, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(azi, float2, float3, float4, float5, float6);
         this.leg0.xRot = Mth.cos(float2 * 0.6662f * 0.6f) * 0.5f * float3;
         this.leg1.xRot = Mth.cos(float2 * 0.6662f * 0.6f + 3.1415927f) * 0.5f * float3;
         this.leg2.zRot = Mth.cos(float2 * 0.6662f * 0.6f + 3.1415927f) * 0.5f * float3;
@@ -55,9 +55,9 @@ public class TurtleModel<T extends Turtle> extends QuadrupedModel<T> {
         this.leg0.yRot = 0.0f;
         this.leg1.yRot = 0.0f;
         this.eggBelly.xRot = 1.5707964f;
-        if (!aua.isInWater() && aua.onGround) {
-            final float float7 = aua.isLayingEgg() ? 4.0f : 1.0f;
-            final float float8 = aua.isLayingEgg() ? 2.0f : 1.0f;
+        if (!azi.isInWater() && azi.isOnGround()) {
+            final float float7 = azi.isLayingEgg() ? 4.0f : 1.0f;
+            final float float8 = azi.isLayingEgg() ? 2.0f : 1.0f;
             final float float9 = 5.0f;
             this.leg2.yRot = Mth.cos(float7 * float2 * 5.0f + 3.1415927f) * 8.0f * float3 * float8;
             this.leg2.zRot = 0.0f;
@@ -68,19 +68,19 @@ public class TurtleModel<T extends Turtle> extends QuadrupedModel<T> {
             this.leg1.yRot = Mth.cos(float2 * 5.0f) * 3.0f * float3;
             this.leg1.xRot = 0.0f;
         }
-        this.eggBelly.visible = (!this.young && aua.hasEgg());
+        this.eggBelly.visible = (!this.young && azi.hasEgg());
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
         final boolean boolean10 = this.eggBelly.visible;
         if (boolean10) {
-            cyl.pushPose();
-            cyl.translate(0.0, -0.07999999821186066, 0.0);
+            dhl.pushPose();
+            dhl.translate(0.0, -0.07999999821186066, 0.0);
         }
-        super.renderToBuffer(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
+        super.renderToBuffer(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
         if (boolean10) {
-            cyl.popPose();
+            dhl.popPose();
         }
     }
 }
diff --git a/src/net/minecraft/client/model/VexModel.java b/src/net/minecraft/client/model/VexModel.java
index aa33864..e98774a 100644
--- a/src/net/minecraft/client/model/VexModel.java
+++ b/src/net/minecraft/client/model/VexModel.java
@@ -31,10 +31,10 @@ public class VexModel extends HumanoidModel<Vex> {
     }
     
     @Override
-    public void setupAnim(final Vex axl, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(axl, float2, float3, float4, float5, float6);
-        if (axl.isCharging()) {
-            if (axl.getMainArm() == HumanoidArm.RIGHT) {
+    public void setupAnim(final Vex bcp, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(bcp, float2, float3, float4, float5, float6);
+        if (bcp.isCharging()) {
+            if (bcp.getMainArm() == HumanoidArm.RIGHT) {
                 this.rightArm.xRot = 3.7699115f;
             }
             else {
diff --git a/src/net/minecraft/client/model/VillagerModel.java b/src/net/minecraft/client/model/VillagerModel.java
index de75def..abb86e8 100644
--- a/src/net/minecraft/client/model/VillagerModel.java
+++ b/src/net/minecraft/client/model/VillagerModel.java
@@ -58,10 +58,10 @@ public class VillagerModel<T extends Entity> extends ListModel<T> implements Hea
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
         boolean boolean8 = false;
-        if (akq instanceof AbstractVillager) {
-            boolean8 = (((AbstractVillager)akq).getUnhappyCounter() > 0);
+        if (aom instanceof AbstractVillager) {
+            boolean8 = (((AbstractVillager)aom).getUnhappyCounter() > 0);
         }
         this.head.yRot = float5 * 0.017453292f;
         this.head.xRot = float6 * 0.017453292f;
diff --git a/src/net/minecraft/client/model/WitchModel.java b/src/net/minecraft/client/model/WitchModel.java
index cc7b4dd..a02219e 100644
--- a/src/net/minecraft/client/model/WitchModel.java
+++ b/src/net/minecraft/client/model/WitchModel.java
@@ -19,34 +19,34 @@ public class WitchModel<T extends Entity> extends VillagerModel<T> {
         this.hat.texOffs(0, 64).addBox(0.0f, 0.0f, 0.0f, 10.0f, 2.0f, 10.0f);
         this.head.addChild(this.hat);
         this.head.addChild(this.nose);
-        final ModelPart dni3 = new ModelPart(this).setTexSize(64, 128);
-        dni3.setPos(1.75f, -4.0f, 2.0f);
-        dni3.texOffs(0, 76).addBox(0.0f, 0.0f, 0.0f, 7.0f, 4.0f, 7.0f);
-        dni3.xRot = -0.05235988f;
-        dni3.zRot = 0.02617994f;
-        this.hat.addChild(dni3);
-        final ModelPart dni4 = new ModelPart(this).setTexSize(64, 128);
-        dni4.setPos(1.75f, -4.0f, 2.0f);
-        dni4.texOffs(0, 87).addBox(0.0f, 0.0f, 0.0f, 4.0f, 4.0f, 4.0f);
-        dni4.xRot = -0.10471976f;
-        dni4.zRot = 0.05235988f;
-        dni3.addChild(dni4);
-        final ModelPart dni5 = new ModelPart(this).setTexSize(64, 128);
-        dni5.setPos(1.75f, -2.0f, 2.0f);
-        dni5.texOffs(0, 95).addBox(0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 1.0f, 0.25f);
-        dni5.xRot = -0.20943952f;
-        dni5.zRot = 0.10471976f;
-        dni4.addChild(dni5);
+        final ModelPart dyg3 = new ModelPart(this).setTexSize(64, 128);
+        dyg3.setPos(1.75f, -4.0f, 2.0f);
+        dyg3.texOffs(0, 76).addBox(0.0f, 0.0f, 0.0f, 7.0f, 4.0f, 7.0f);
+        dyg3.xRot = -0.05235988f;
+        dyg3.zRot = 0.02617994f;
+        this.hat.addChild(dyg3);
+        final ModelPart dyg4 = new ModelPart(this).setTexSize(64, 128);
+        dyg4.setPos(1.75f, -4.0f, 2.0f);
+        dyg4.texOffs(0, 87).addBox(0.0f, 0.0f, 0.0f, 4.0f, 4.0f, 4.0f);
+        dyg4.xRot = -0.10471976f;
+        dyg4.zRot = 0.05235988f;
+        dyg3.addChild(dyg4);
+        final ModelPart dyg5 = new ModelPart(this).setTexSize(64, 128);
+        dyg5.setPos(1.75f, -2.0f, 2.0f);
+        dyg5.texOffs(0, 95).addBox(0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 1.0f, 0.25f);
+        dyg5.xRot = -0.20943952f;
+        dyg5.zRot = 0.10471976f;
+        dyg4.addChild(dyg5);
     }
     
     @Override
-    public void setupAnim(final T akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(akq, float2, float3, float4, float5, float6);
+    public void setupAnim(final T aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(aom, float2, float3, float4, float5, float6);
         this.nose.setPos(0.0f, -2.0f, 0.0f);
-        final float float7 = 0.01f * (akq.getId() % 10);
-        this.nose.xRot = Mth.sin(akq.tickCount * float7) * 4.5f * 0.017453292f;
+        final float float7 = 0.01f * (aom.getId() % 10);
+        this.nose.xRot = Mth.sin(aom.tickCount * float7) * 4.5f * 0.017453292f;
         this.nose.yRot = 0.0f;
-        this.nose.zRot = Mth.cos(akq.tickCount * float7) * 2.5f * 0.017453292f;
+        this.nose.zRot = Mth.cos(aom.tickCount * float7) * 2.5f * 0.017453292f;
         if (this.holdingItem) {
             this.nose.setPos(0.0f, 1.0f, -1.5f);
             this.nose.xRot = -0.9f;
diff --git a/src/net/minecraft/client/model/WitherBossModel.java b/src/net/minecraft/client/model/WitherBossModel.java
index 7157a05..5e40d9a 100644
--- a/src/net/minecraft/client/model/WitherBossModel.java
+++ b/src/net/minecraft/client/model/WitherBossModel.java
@@ -43,7 +43,7 @@ public class WitherBossModel<T extends WitherBoss> extends ListModel<T> {
     }
     
     @Override
-    public void setupAnim(final T avn, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T baw, final float float2, final float float3, final float float4, final float float5, final float float6) {
         final float float7 = Mth.cos(float4 * 0.1f);
         this.upperBodyParts[1].xRot = (0.065f + 0.05f * float7) * 3.1415927f;
         this.upperBodyParts[2].setPos(-2.0f, 6.9f + Mth.cos(this.upperBodyParts[1].xRot) * 10.0f, -0.5f + Mth.sin(this.upperBodyParts[1].xRot) * 10.0f);
@@ -53,10 +53,10 @@ public class WitherBossModel<T extends WitherBoss> extends ListModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T avn, final float float2, final float float3, final float float4) {
+    public void prepareMobModel(final T baw, final float float2, final float float3, final float float4) {
         for (int integer6 = 1; integer6 < 3; ++integer6) {
-            this.heads[integer6].yRot = (avn.getHeadYRot(integer6 - 1) - avn.yBodyRot) * 0.017453292f;
-            this.heads[integer6].xRot = avn.getHeadXRot(integer6 - 1) * 0.017453292f;
+            this.heads[integer6].yRot = (baw.getHeadYRot(integer6 - 1) - baw.yBodyRot) * 0.017453292f;
+            this.heads[integer6].xRot = baw.getHeadXRot(integer6 - 1) * 0.017453292f;
         }
     }
 }
diff --git a/src/net/minecraft/client/model/WolfModel.java b/src/net/minecraft/client/model/WolfModel.java
index e3ad334..d1b0dcf 100644
--- a/src/net/minecraft/client/model/WolfModel.java
+++ b/src/net/minecraft/client/model/WolfModel.java
@@ -55,14 +55,14 @@ public class WolfModel<T extends Wolf> extends ColorableAgeableListModel<T> {
     }
     
     @Override
-    public void prepareMobModel(final T auc, final float float2, final float float3, final float float4) {
-        if (auc.isAngry()) {
+    public void prepareMobModel(final T azk, final float float2, final float float3, final float float4) {
+        if (azk.isAngry()) {
             this.tail.yRot = 0.0f;
         }
         else {
             this.tail.yRot = Mth.cos(float2 * 0.6662f) * 1.4f * float3;
         }
-        if (auc.isSitting()) {
+        if (azk.isInSittingPose()) {
             this.upperBody.setPos(-1.0f, 16.0f, -3.0f);
             this.upperBody.xRot = 1.2566371f;
             this.upperBody.yRot = 0.0f;
@@ -93,14 +93,14 @@ public class WolfModel<T extends Wolf> extends ColorableAgeableListModel<T> {
             this.leg2.xRot = Mth.cos(float2 * 0.6662f + 3.1415927f) * 1.4f * float3;
             this.leg3.xRot = Mth.cos(float2 * 0.6662f) * 1.4f * float3;
         }
-        this.realHead.zRot = auc.getHeadRollAngle(float4) + auc.getBodyRollAngle(float4, 0.0f);
-        this.upperBody.zRot = auc.getBodyRollAngle(float4, -0.08f);
-        this.body.zRot = auc.getBodyRollAngle(float4, -0.16f);
-        this.realTail.zRot = auc.getBodyRollAngle(float4, -0.2f);
+        this.realHead.zRot = azk.getHeadRollAngle(float4) + azk.getBodyRollAngle(float4, 0.0f);
+        this.upperBody.zRot = azk.getBodyRollAngle(float4, -0.08f);
+        this.body.zRot = azk.getBodyRollAngle(float4, -0.16f);
+        this.realTail.zRot = azk.getBodyRollAngle(float4, -0.2f);
     }
     
     @Override
-    public void setupAnim(final T auc, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    public void setupAnim(final T azk, final float float2, final float float3, final float float4, final float float5, final float float6) {
         this.head.xRot = float6 * 0.017453292f;
         this.head.yRot = float5 * 0.017453292f;
         this.tail.xRot = float4;
diff --git a/src/net/minecraft/client/model/ZombieModel.java b/src/net/minecraft/client/model/ZombieModel.java
index 576d2e6..498162d 100644
--- a/src/net/minecraft/client/model/ZombieModel.java
+++ b/src/net/minecraft/client/model/ZombieModel.java
@@ -13,7 +13,7 @@ public class ZombieModel<T extends Zombie> extends AbstractZombieModel<T> {
     }
     
     @Override
-    public boolean isAggressive(final T axp) {
-        return axp.isAggressive();
+    public boolean isAggressive(final T bcu) {
+        return bcu.isAggressive();
     }
 }
diff --git a/src/net/minecraft/client/model/ZombieVillagerModel.java b/src/net/minecraft/client/model/ZombieVillagerModel.java
index ba32bc8..5647abb 100644
--- a/src/net/minecraft/client/model/ZombieVillagerModel.java
+++ b/src/net/minecraft/client/model/ZombieVillagerModel.java
@@ -2,7 +2,6 @@ package net.minecraft.client.model;
 
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.util.Mth;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.world.entity.monster.Zombie;
 
@@ -48,29 +47,9 @@ public class ZombieVillagerModel<T extends Zombie> extends HumanoidModel<T> impl
     }
     
     @Override
-    public void setupAnim(final T axp, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        super.setupAnim(axp, float2, float3, float4, float5, float6);
-        final float float7 = Mth.sin(this.attackTime * 3.1415927f);
-        final float float8 = Mth.sin((1.0f - (1.0f - this.attackTime) * (1.0f - this.attackTime)) * 3.1415927f);
-        this.rightArm.zRot = 0.0f;
-        this.leftArm.zRot = 0.0f;
-        this.rightArm.yRot = -(0.1f - float7 * 0.6f);
-        this.leftArm.yRot = 0.1f - float7 * 0.6f;
-        final float float9 = -3.1415927f / (axp.isAggressive() ? 1.5f : 2.25f);
-        this.rightArm.xRot = float9;
-        this.leftArm.xRot = float9;
-        final ModelPart rightArm = this.rightArm;
-        rightArm.xRot += float7 * 1.2f - float8 * 0.4f;
-        final ModelPart leftArm = this.leftArm;
-        leftArm.xRot += float7 * 1.2f - float8 * 0.4f;
-        final ModelPart rightArm2 = this.rightArm;
-        rightArm2.zRot += Mth.cos(float4 * 0.09f) * 0.05f + 0.05f;
-        final ModelPart leftArm2 = this.leftArm;
-        leftArm2.zRot -= Mth.cos(float4 * 0.09f) * 0.05f + 0.05f;
-        final ModelPart rightArm3 = this.rightArm;
-        rightArm3.xRot += Mth.sin(float4 * 0.067f) * 0.05f;
-        final ModelPart leftArm3 = this.leftArm;
-        leftArm3.xRot -= Mth.sin(float4 * 0.067f) * 0.05f;
+    public void setupAnim(final T bcu, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        super.setupAnim(bcu, float2, float3, float4, float5, float6);
+        AnimationUtils.animateZombieArms(this.leftArm, this.rightArm, bcu.isAggressive(), this.attackTime, float4);
     }
     
     @Override
diff --git a/src/net/minecraft/client/model/dragon/DragonHeadModel.java b/src/net/minecraft/client/model/dragon/DragonHeadModel.java
index 1e569af..50307f0 100644
--- a/src/net/minecraft/client/model/dragon/DragonHeadModel.java
+++ b/src/net/minecraft/client/model/dragon/DragonHeadModel.java
@@ -35,11 +35,11 @@ public class DragonHeadModel extends SkullModel {
     }
     
     @Override
-    public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-        cyl.pushPose();
-        cyl.translate(0.0, -0.37437498569488525, 0.0);
-        cyl.scale(0.75f, 0.75f, 0.75f);
-        this.head.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
-        cyl.popPose();
+    public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+        dhl.pushPose();
+        dhl.translate(0.0, -0.37437498569488525, 0.0);
+        dhl.scale(0.75f, 0.75f, 0.75f);
+        this.head.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/model/geom/ModelPart.java b/src/net/minecraft/client/model/geom/ModelPart.java
index 45ad119..b52f67e 100644
--- a/src/net/minecraft/client/model/geom/ModelPart.java
+++ b/src/net/minecraft/client/model/geom/ModelPart.java
@@ -29,19 +29,19 @@ public class ModelPart {
     private final ObjectList<Cube> cubes;
     private final ObjectList<ModelPart> children;
     
-    public ModelPart(final Model dls) {
+    public ModelPart(final Model dwo) {
         this.xTexSize = 64.0f;
         this.yTexSize = 32.0f;
         this.visible = true;
         this.cubes = (ObjectList<Cube>)new ObjectArrayList();
         this.children = (ObjectList<ModelPart>)new ObjectArrayList();
-        dls.accept(this);
-        this.setTexSize(dls.texWidth, dls.texHeight);
+        dwo.accept(this);
+        this.setTexSize(dwo.texWidth, dwo.texHeight);
     }
     
-    public ModelPart(final Model dls, final int integer2, final int integer3) {
-        this(dls.texWidth, dls.texHeight, integer2, integer3);
-        dls.accept(this);
+    public ModelPart(final Model dwo, final int integer2, final int integer3) {
+        this(dwo.texWidth, dwo.texHeight, integer2, integer3);
+        dwo.accept(this);
     }
     
     public ModelPart(final int integer1, final int integer2, final int integer3, final int integer4) {
@@ -54,17 +54,31 @@ public class ModelPart {
         this.texOffs(integer3, integer4);
     }
     
-    public void copyFrom(final ModelPart dni) {
-        this.xRot = dni.xRot;
-        this.yRot = dni.yRot;
-        this.zRot = dni.zRot;
-        this.x = dni.x;
-        this.y = dni.y;
-        this.z = dni.z;
+    private ModelPart() {
+        this.xTexSize = 64.0f;
+        this.yTexSize = 32.0f;
+        this.visible = true;
+        this.cubes = (ObjectList<Cube>)new ObjectArrayList();
+        this.children = (ObjectList<ModelPart>)new ObjectArrayList();
     }
     
-    public void addChild(final ModelPart dni) {
-        this.children.add(dni);
+    public ModelPart createShallowCopy() {
+        final ModelPart dyg2 = new ModelPart();
+        dyg2.copyFrom(this);
+        return dyg2;
+    }
+    
+    public void copyFrom(final ModelPart dyg) {
+        this.xRot = dyg.xRot;
+        this.yRot = dyg.yRot;
+        this.zRot = dyg.zRot;
+        this.x = dyg.x;
+        this.y = dyg.y;
+        this.z = dyg.z;
+    }
+    
+    public void addChild(final ModelPart dyg) {
+        this.children.add(dyg);
     }
     
     public ModelPart texOffs(final int integer1, final int integer2) {
@@ -111,57 +125,57 @@ public class ModelPart {
         this.z = float3;
     }
     
-    public void render(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4) {
-        this.render(cyl, cyo, integer3, integer4, 1.0f, 1.0f, 1.0f, 1.0f);
+    public void render(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4) {
+        this.render(dhl, dhp, integer3, integer4, 1.0f, 1.0f, 1.0f, 1.0f);
     }
     
-    public void render(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+    public void render(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
         if (!this.visible) {
             return;
         }
         if (this.cubes.isEmpty() && this.children.isEmpty()) {
             return;
         }
-        cyl.pushPose();
-        this.translateAndRotate(cyl);
-        this.compile(cyl.last(), cyo, integer3, integer4, float5, float6, float7, float8);
-        for (final ModelPart dni11 : this.children) {
-            dni11.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
+        dhl.pushPose();
+        this.translateAndRotate(dhl);
+        this.compile(dhl.last(), dhp, integer3, integer4, float5, float6, float7, float8);
+        for (final ModelPart dyg11 : this.children) {
+            dyg11.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
         }
-        cyl.popPose();
+        dhl.popPose();
     }
     
-    public void translateAndRotate(final PoseStack cyl) {
-        cyl.translate(this.x / 16.0f, this.y / 16.0f, this.z / 16.0f);
+    public void translateAndRotate(final PoseStack dhl) {
+        dhl.translate(this.x / 16.0f, this.y / 16.0f, this.z / 16.0f);
         if (this.zRot != 0.0f) {
-            cyl.mulPose(Vector3f.ZP.rotation(this.zRot));
+            dhl.mulPose(Vector3f.ZP.rotation(this.zRot));
         }
         if (this.yRot != 0.0f) {
-            cyl.mulPose(Vector3f.YP.rotation(this.yRot));
+            dhl.mulPose(Vector3f.YP.rotation(this.yRot));
         }
         if (this.xRot != 0.0f) {
-            cyl.mulPose(Vector3f.XP.rotation(this.xRot));
+            dhl.mulPose(Vector3f.XP.rotation(this.xRot));
         }
     }
     
-    private void compile(final PoseStack.Pose a, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+    private void compile(final PoseStack.Pose a, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
         final Matrix4f b10 = a.pose();
         final Matrix3f a2 = a.normal();
         for (final Cube a3 : this.cubes) {
             for (final Polygon b11 : a3.polygons) {
-                final Vector3f e18 = b11.normal.copy();
-                e18.transform(a2);
-                final float float9 = e18.x();
-                final float float10 = e18.y();
-                final float float11 = e18.z();
+                final Vector3f g18 = b11.normal.copy();
+                g18.transform(a2);
+                final float float9 = g18.x();
+                final float float10 = g18.y();
+                final float float11 = g18.z();
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
                     final Vertex c23 = b11.vertices[integer5];
                     final float float12 = c23.pos.x() / 16.0f;
                     final float float13 = c23.pos.y() / 16.0f;
                     final float float14 = c23.pos.z() / 16.0f;
-                    final Vector4f f27 = new Vector4f(float12, float13, float14, 1.0f);
-                    f27.transform(b10);
-                    cyo.vertex(f27.x(), f27.y(), f27.z(), float5, float6, float7, float8, c23.u, c23.v, integer4, integer3, float9, float10, float11);
+                    final Vector4f h27 = new Vector4f(float12, float13, float14, 1.0f);
+                    h27.transform(b10);
+                    dhp.vertex(h27.x(), h27.y(), h27.z(), float5, float6, float7, float8, c23.u, c23.v, integer4, integer3, float9, float10, float11);
                 }
             }
         }
@@ -238,7 +252,7 @@ public class ModelPart {
         public final Vertex[] vertices;
         public final Vector3f normal;
         
-        public Polygon(final Vertex[] arr, final float float2, final float float3, final float float4, final float float5, final float float6, final float float7, final boolean boolean8, final Direction fp) {
+        public Polygon(final Vertex[] arr, final float float2, final float float3, final float float4, final float float5, final float float6, final float float7, final boolean boolean8, final Direction fz) {
             this.vertices = arr;
             final float float8 = 0.0f / float6;
             final float float9 = 0.0f / float7;
@@ -253,7 +267,7 @@ public class ModelPart {
                     arr[integer13 - 1 - integer14] = c15;
                 }
             }
-            this.normal = fp.step();
+            this.normal = fz.step();
             if (boolean8) {
                 this.normal.mul(-1.0f, 1.0f, 1.0f);
             }
@@ -273,8 +287,8 @@ public class ModelPart {
             return new Vertex(this.pos, float1, float2);
         }
         
-        public Vertex(final Vector3f e, final float float2, final float float3) {
-            this.pos = e;
+        public Vertex(final Vector3f g, final float float2, final float float3) {
+            this.pos = g;
             this.u = float2;
             this.v = float3;
         }
diff --git a/src/net/minecraft/client/multiplayer/ClientAdvancements.java b/src/net/minecraft/client/multiplayer/ClientAdvancements.java
index 451ff40..a4988b1 100644
--- a/src/net/minecraft/client/multiplayer/ClientAdvancements.java
+++ b/src/net/minecraft/client/multiplayer/ClientAdvancements.java
@@ -27,32 +27,32 @@ public class ClientAdvancements {
     @Nullable
     private Advancement selectedTab;
     
-    public ClientAdvancements(final Minecraft dbn) {
+    public ClientAdvancements(final Minecraft dlx) {
         this.advancements = new AdvancementList();
         this.progress = Maps.newHashMap();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
-    public void update(final ClientboundUpdateAdvancementsPacket pe) {
-        if (pe.shouldReset()) {
+    public void update(final ClientboundUpdateAdvancementsPacket qs) {
+        if (qs.shouldReset()) {
             this.advancements.clear();
             this.progress.clear();
         }
-        this.advancements.remove(pe.getRemoved());
-        this.advancements.add(pe.getAdded());
-        for (final Map.Entry<ResourceLocation, AdvancementProgress> entry4 : pe.getProgress().entrySet()) {
-            final Advancement u5 = this.advancements.get(entry4.getKey());
-            if (u5 != null) {
-                final AdvancementProgress w6 = entry4.getValue();
-                w6.update(u5.getCriteria(), u5.getRequirements());
-                this.progress.put(u5, w6);
+        this.advancements.remove(qs.getRemoved());
+        this.advancements.add(qs.getAdded());
+        for (final Map.Entry<ResourceLocation, AdvancementProgress> entry4 : qs.getProgress().entrySet()) {
+            final Advancement w5 = this.advancements.get(entry4.getKey());
+            if (w5 != null) {
+                final AdvancementProgress y6 = entry4.getValue();
+                y6.update(w5.getCriteria(), w5.getRequirements());
+                this.progress.put(w5, y6);
                 if (this.listener != null) {
-                    this.listener.onUpdateAdvancementProgress(u5, w6);
+                    this.listener.onUpdateAdvancementProgress(w5, y6);
                 }
-                if (pe.shouldReset() || !w6.isDone() || u5.getDisplay() == null || !u5.getDisplay().shouldShowToast()) {
+                if (qs.shouldReset() || !y6.isDone() || w5.getDisplay() == null || !w5.getDisplay().shouldShowToast()) {
                     continue;
                 }
-                this.minecraft.getToasts().addToast(new AdvancementToast(u5));
+                this.minecraft.getToasts().addToast(new AdvancementToast(w5));
             }
             else {
                 ClientAdvancements.LOGGER.warn("Server informed client about progress for unknown advancement {}", entry4.getKey());
@@ -64,15 +64,15 @@ public class ClientAdvancements {
         return this.advancements;
     }
     
-    public void setSelectedTab(@Nullable final Advancement u, final boolean boolean2) {
-        final ClientPacketListener dnp4 = this.minecraft.getConnection();
-        if (dnp4 != null && u != null && boolean2) {
-            dnp4.send(ServerboundSeenAdvancementsPacket.openedTab(u));
+    public void setSelectedTab(@Nullable final Advancement w, final boolean boolean2) {
+        final ClientPacketListener dyn4 = this.minecraft.getConnection();
+        if (dyn4 != null && w != null && boolean2) {
+            dyn4.send(ServerboundSeenAdvancementsPacket.openedTab(w));
         }
-        if (this.selectedTab != u) {
-            this.selectedTab = u;
+        if (this.selectedTab != w) {
+            this.selectedTab = w;
             if (this.listener != null) {
-                this.listener.onSelectedTabChanged(u);
+                this.listener.onSelectedTabChanged(w);
             }
         }
     }
@@ -93,8 +93,8 @@ public class ClientAdvancements {
     }
     
     public interface Listener extends AdvancementList.Listener {
-        void onUpdateAdvancementProgress(final Advancement u, final AdvancementProgress w);
+        void onUpdateAdvancementProgress(final Advancement w, final AdvancementProgress y);
         
-        void onSelectedTabChanged(@Nullable final Advancement u);
+        void onSelectedTabChanged(@Nullable final Advancement w);
     }
 }
diff --git a/src/net/minecraft/client/multiplayer/ClientChunkCache.java b/src/net/minecraft/client/multiplayer/ClientChunkCache.java
index 2c6f154..f7326fe 100644
--- a/src/net/minecraft/client/multiplayer/ClientChunkCache.java
+++ b/src/net/minecraft/client/multiplayer/ClientChunkCache.java
@@ -33,10 +33,10 @@ public class ClientChunkCache extends ChunkSource {
     private volatile Storage storage;
     private final ClientLevel level;
     
-    public ClientChunkCache(final ClientLevel dno, final int integer) {
-        this.level = dno;
-        this.emptyChunk = new EmptyLevelChunk(dno, new ChunkPos(0, 0));
-        this.lightEngine = new LevelLightEngine(this, true, dno.getDimension().isHasSkyLight());
+    public ClientChunkCache(final ClientLevel dym, final int integer) {
+        this.level = dym;
+        this.emptyChunk = new EmptyLevelChunk(dym, new ChunkPos(0, 0));
+        this.lightEngine = new LevelLightEngine(this, true, dym.dimensionType().hasSkyLight());
         this.storage = new Storage(calculateStorageRange(integer));
     }
     
@@ -45,12 +45,12 @@ public class ClientChunkCache extends ChunkSource {
         return this.lightEngine;
     }
     
-    private static boolean isValidChunk(@Nullable final LevelChunk cal, final int integer2, final int integer3) {
-        if (cal == null) {
+    private static boolean isValidChunk(@Nullable final LevelChunk chj, final int integer2, final int integer3) {
+        if (chj == null) {
             return false;
         }
-        final ChunkPos bjh4 = cal.getPos();
-        return bjh4.x == integer2 && bjh4.z == integer3;
+        final ChunkPos bph4 = chj.getPos();
+        return bph4.x == integer2 && bph4.z == integer3;
     }
     
     public void drop(final int integer1, final int integer2) {
@@ -58,19 +58,19 @@ public class ClientChunkCache extends ChunkSource {
             return;
         }
         final int integer3 = this.storage.getIndex(integer1, integer2);
-        final LevelChunk cal5 = this.storage.getChunk(integer3);
-        if (isValidChunk(cal5, integer1, integer2)) {
-            this.storage.replace(integer3, cal5, null);
+        final LevelChunk chj5 = this.storage.getChunk(integer3);
+        if (isValidChunk(chj5, integer1, integer2)) {
+            this.storage.replace(integer3, chj5, null);
         }
     }
     
     @Nullable
     @Override
-    public LevelChunk getChunk(final int integer1, final int integer2, final ChunkStatus cae, final boolean boolean4) {
+    public LevelChunk getChunk(final int integer1, final int integer2, final ChunkStatus chc, final boolean boolean4) {
         if (this.storage.inRange(integer1, integer2)) {
-            final LevelChunk cal6 = this.storage.getChunk(this.storage.getIndex(integer1, integer2));
-            if (isValidChunk(cal6, integer1, integer2)) {
-                return cal6;
+            final LevelChunk chj6 = this.storage.getChunk(this.storage.getIndex(integer1, integer2));
+            if (isValidChunk(chj6, integer1, integer2)) {
+                return chj6;
             }
         }
         if (boolean4) {
@@ -85,37 +85,36 @@ public class ClientChunkCache extends ChunkSource {
     }
     
     @Nullable
-    public LevelChunk replaceWithPacketData(final int integer1, final int integer2, @Nullable final ChunkBiomeContainer bzz, final FriendlyByteBuf kv, final CompoundTag jt, final int integer6) {
+    public LevelChunk replaceWithPacketData(final int integer1, final int integer2, @Nullable final ChunkBiomeContainer cgz, final FriendlyByteBuf mg, final CompoundTag le, final int integer6, final boolean boolean7) {
         if (!this.storage.inRange(integer1, integer2)) {
             ClientChunkCache.LOGGER.warn("Ignoring chunk since it's not in the view range: {}, {}", integer1, integer2);
             return null;
         }
         final int integer7 = this.storage.getIndex(integer1, integer2);
-        LevelChunk cal9 = this.storage.chunks.get(integer7);
-        if (!isValidChunk(cal9, integer1, integer2)) {
-            if (bzz == null) {
+        LevelChunk chj10 = this.storage.chunks.get(integer7);
+        if (boolean7 || !isValidChunk(chj10, integer1, integer2)) {
+            if (cgz == null) {
                 ClientChunkCache.LOGGER.warn("Ignoring chunk since we don't have complete data: {}, {}", integer1, integer2);
                 return null;
             }
-            cal9 = new LevelChunk(this.level, new ChunkPos(integer1, integer2), bzz);
-            cal9.replaceWithPacketData(bzz, kv, jt, integer6);
-            this.storage.replace(integer7, cal9);
+            chj10 = new LevelChunk(this.level, new ChunkPos(integer1, integer2), cgz);
+            chj10.replaceWithPacketData(cgz, mg, le, integer6);
+            this.storage.replace(integer7, chj10);
         }
         else {
-            cal9.replaceWithPacketData(bzz, kv, jt, integer6);
+            chj10.replaceWithPacketData(cgz, mg, le, integer6);
         }
-        final LevelChunkSection[] arr10 = cal9.getSections();
-        final LevelLightEngine coa11 = this.getLightEngine();
-        coa11.enableLightSources(new ChunkPos(integer1, integer2), true);
-        for (int integer8 = 0; integer8 < arr10.length; ++integer8) {
-            final LevelChunkSection cam13 = arr10[integer8];
-            coa11.updateSectionStatus(SectionPos.of(integer1, integer8, integer2), LevelChunkSection.isEmpty(cam13));
+        final LevelChunkSection[] arr11 = chj10.getSections();
+        final LevelLightEngine cwr12 = this.getLightEngine();
+        cwr12.enableLightSources(new ChunkPos(integer1, integer2), true);
+        for (int integer8 = 0; integer8 < arr11.length; ++integer8) {
+            final LevelChunkSection chk14 = arr11[integer8];
+            cwr12.updateSectionStatus(SectionPos.of(integer1, integer8, integer2), LevelChunkSection.isEmpty(chk14));
         }
         this.level.onChunkLoaded(integer1, integer2);
-        return cal9;
+        return chj10;
     }
     
-    @Override
     public void tick(final BooleanSupplier booleanSupplier) {
     }
     
@@ -132,11 +131,11 @@ public class ClientChunkCache extends ChunkSource {
             a5.viewCenterX = this.storage.viewCenterX;
             a5.viewCenterZ = this.storage.viewCenterZ;
             for (int integer4 = 0; integer4 < this.storage.chunks.length(); ++integer4) {
-                final LevelChunk cal7 = this.storage.chunks.get(integer4);
-                if (cal7 != null) {
-                    final ChunkPos bjh8 = cal7.getPos();
-                    if (a5.inRange(bjh8.x, bjh8.z)) {
-                        a5.replace(a5.getIndex(bjh8.x, bjh8.z), cal7);
+                final LevelChunk chj7 = this.storage.chunks.get(integer4);
+                if (chj7 != null) {
+                    final ChunkPos bph8 = chj7.getPos();
+                    if (a5.inRange(bph8.x, bph8.z)) {
+                        a5.replace(a5.getIndex(bph8.x, bph8.z), chj7);
                     }
                 }
             }
@@ -158,23 +157,23 @@ public class ClientChunkCache extends ChunkSource {
     }
     
     @Override
-    public void onLightUpdate(final LightLayer bkf, final SectionPos gd) {
-        Minecraft.getInstance().levelRenderer.setSectionDirty(gd.x(), gd.y(), gd.z());
+    public void onLightUpdate(final LightLayer bqi, final SectionPos go) {
+        Minecraft.getInstance().levelRenderer.setSectionDirty(go.x(), go.y(), go.z());
     }
     
     @Override
-    public boolean isTickingChunk(final BlockPos fk) {
-        return this.hasChunk(fk.getX() >> 4, fk.getZ() >> 4);
+    public boolean isTickingChunk(final BlockPos fu) {
+        return this.hasChunk(fu.getX() >> 4, fu.getZ() >> 4);
     }
     
     @Override
-    public boolean isEntityTickingChunk(final ChunkPos bjh) {
-        return this.hasChunk(bjh.x, bjh.z);
+    public boolean isEntityTickingChunk(final ChunkPos bph) {
+        return this.hasChunk(bph.x, bph.z);
     }
     
     @Override
-    public boolean isEntityTickingChunk(final Entity akq) {
-        return this.hasChunk(Mth.floor(akq.getX()) >> 4, Mth.floor(akq.getZ()) >> 4);
+    public boolean isEntityTickingChunk(final Entity aom) {
+        return this.hasChunk(Mth.floor(aom.getX()) >> 4, Mth.floor(aom.getZ()) >> 4);
     }
     
     static {
@@ -199,23 +198,23 @@ public class ClientChunkCache extends ChunkSource {
             return Math.floorMod(integer2, this.viewRange) * this.viewRange + Math.floorMod(integer1, this.viewRange);
         }
         
-        protected void replace(final int integer, @Nullable final LevelChunk cal) {
-            final LevelChunk cal2 = this.chunks.getAndSet(integer, cal);
-            if (cal2 != null) {
+        protected void replace(final int integer, @Nullable final LevelChunk chj) {
+            final LevelChunk chj2 = this.chunks.getAndSet(integer, chj);
+            if (chj2 != null) {
                 --this.chunkCount;
-                ClientChunkCache.this.level.unload(cal2);
+                ClientChunkCache.this.level.unload(chj2);
             }
-            if (cal != null) {
+            if (chj != null) {
                 ++this.chunkCount;
             }
         }
         
-        protected LevelChunk replace(final int integer, final LevelChunk cal2, @Nullable final LevelChunk cal3) {
-            if (this.chunks.compareAndSet(integer, cal2, cal3) && cal3 == null) {
+        protected LevelChunk replace(final int integer, final LevelChunk chj2, @Nullable final LevelChunk chj3) {
+            if (this.chunks.compareAndSet(integer, chj2, chj3) && chj3 == null) {
                 --this.chunkCount;
             }
-            ClientChunkCache.this.level.unload(cal2);
-            return cal2;
+            ClientChunkCache.this.level.unload(chj2);
+            return chj2;
         }
         
         private boolean inRange(final int integer1, final int integer2) {
diff --git a/src/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java b/src/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java
index b89fa47..3cff1e3 100644
--- a/src/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java
+++ b/src/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.java
@@ -8,7 +8,7 @@ import net.minecraft.network.protocol.login.ClientboundLoginCompressionPacket;
 import net.minecraft.network.protocol.login.ClientboundLoginDisconnectPacket;
 import net.minecraft.client.gui.screens.DisconnectedScreen;
 import net.minecraft.realms.DisconnectedRealmsScreen;
-import net.minecraft.realms.RealmsScreenProxy;
+import net.minecraft.realms.RealmsScreen;
 import net.minecraft.network.PacketListener;
 import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.protocol.login.ClientboundGameProfilePacket;
@@ -46,37 +46,37 @@ public class ClientHandshakePacketListenerImpl implements ClientLoginPacketListe
     private final Connection connection;
     private GameProfile localGameProfile;
     
-    public ClientHandshakePacketListenerImpl(final Connection kt, final Minecraft dbn, @Nullable final Screen dgb, final Consumer<Component> consumer) {
-        this.connection = kt;
-        this.minecraft = dbn;
-        this.parent = dgb;
+    public ClientHandshakePacketListenerImpl(final Connection me, final Minecraft dlx, @Nullable final Screen dqs, final Consumer<Component> consumer) {
+        this.connection = me;
+        this.minecraft = dlx;
+        this.parent = dqs;
         this.updateStatus = consumer;
     }
     
     @Override
-    public void handleHello(final ClientboundHelloPacket rk) {
+    public void handleHello(final ClientboundHelloPacket sz) {
         final SecretKey secretKey3 = Crypt.generateSecretKey();
-        final PublicKey publicKey4 = rk.getPublicKey();
-        final String string5 = new BigInteger(Crypt.digestData(rk.getServerId(), publicKey4, secretKey3)).toString(16);
-        final ServerboundKeyPacket rq6 = new ServerboundKeyPacket(secretKey3, publicKey4, rk.getNonce());
-        this.updateStatus.accept(new TranslatableComponent("connect.authorizing", new Object[0]));
+        final PublicKey publicKey4 = sz.getPublicKey();
+        final String string5 = new BigInteger(Crypt.digestData(sz.getServerId(), publicKey4, secretKey3)).toString(16);
+        final ServerboundKeyPacket tf6 = new ServerboundKeyPacket(secretKey3, publicKey4, sz.getNonce());
+        this.updateStatus.accept(new TranslatableComponent("connect.authorizing"));
         final String string6;
-        final Component lf5;
-        final Packet<?> lt;
+        final Component mr5;
+        final Packet<?> ni;
         final Object o;
         HttpUtil.DOWNLOAD_EXECUTOR.submit(() -> {
-            lf5 = this.authenticateServer(string6);
-            if (lf5 != null) {
+            mr5 = this.authenticateServer(string6);
+            if (mr5 != null) {
                 if (this.minecraft.getCurrentServer() != null && this.minecraft.getCurrentServer().isLan()) {
-                    ClientHandshakePacketListenerImpl.LOGGER.warn(lf5.getString());
+                    ClientHandshakePacketListenerImpl.LOGGER.warn(mr5.getString());
                 }
                 else {
-                    this.connection.disconnect(lf5);
+                    this.connection.disconnect(mr5);
                     return;
                 }
             }
-            this.updateStatus.accept(new TranslatableComponent("connect.encrypting", new Object[0]));
-            this.connection.send(lt, (future -> this.connection.setEncryptionKey(o)));
+            this.updateStatus.accept(new TranslatableComponent("connect.encrypting"));
+            this.connection.send(ni, (future -> this.connection.setEncryptionKey(o)));
         });
     }
     
@@ -86,10 +86,10 @@ public class ClientHandshakePacketListenerImpl implements ClientLoginPacketListe
             this.getMinecraftSessionService().joinServer(this.minecraft.getUser().getGameProfile(), this.minecraft.getUser().getAccessToken(), string);
         }
         catch (AuthenticationUnavailableException authenticationUnavailableException3) {
-            return new TranslatableComponent("disconnect.loginFailedInfo", new Object[] { new TranslatableComponent("disconnect.loginFailedInfo.serversUnavailable", new Object[0]) });
+            return new TranslatableComponent("disconnect.loginFailedInfo", new Object[] { new TranslatableComponent("disconnect.loginFailedInfo.serversUnavailable") });
         }
         catch (InvalidCredentialsException invalidCredentialsException3) {
-            return new TranslatableComponent("disconnect.loginFailedInfo", new Object[] { new TranslatableComponent("disconnect.loginFailedInfo.invalidSession", new Object[0]) });
+            return new TranslatableComponent("disconnect.loginFailedInfo", new Object[] { new TranslatableComponent("disconnect.loginFailedInfo.invalidSession") });
         }
         catch (AuthenticationException authenticationException3) {
             return new TranslatableComponent("disconnect.loginFailedInfo", new Object[] { authenticationException3.getMessage() });
@@ -102,20 +102,20 @@ public class ClientHandshakePacketListenerImpl implements ClientLoginPacketListe
     }
     
     @Override
-    public void handleGameProfile(final ClientboundGameProfilePacket rj) {
-        this.updateStatus.accept(new TranslatableComponent("connect.joining", new Object[0]));
-        this.localGameProfile = rj.getGameProfile();
+    public void handleGameProfile(final ClientboundGameProfilePacket sy) {
+        this.updateStatus.accept(new TranslatableComponent("connect.joining"));
+        this.localGameProfile = sy.getGameProfile();
         this.connection.setProtocol(ConnectionProtocol.PLAY);
         this.connection.setListener(new ClientPacketListener(this.minecraft, this.parent, this.connection, this.localGameProfile));
     }
     
     @Override
-    public void onDisconnect(final Component lf) {
-        if (this.parent != null && this.parent instanceof RealmsScreenProxy) {
-            this.minecraft.setScreen(new DisconnectedRealmsScreen(((RealmsScreenProxy)this.parent).getScreen(), "connect.failed", lf).getProxy());
+    public void onDisconnect(final Component mr) {
+        if (this.parent != null && this.parent instanceof RealmsScreen) {
+            this.minecraft.setScreen(new DisconnectedRealmsScreen(this.parent, "connect.failed", mr));
         }
         else {
-            this.minecraft.setScreen(new DisconnectedScreen(this.parent, "connect.failed", lf));
+            this.minecraft.setScreen(new DisconnectedScreen(this.parent, "connect.failed", mr));
         }
     }
     
@@ -125,21 +125,21 @@ public class ClientHandshakePacketListenerImpl implements ClientLoginPacketListe
     }
     
     @Override
-    public void handleDisconnect(final ClientboundLoginDisconnectPacket rm) {
-        this.connection.disconnect(rm.getReason());
+    public void handleDisconnect(final ClientboundLoginDisconnectPacket tb) {
+        this.connection.disconnect(tb.getReason());
     }
     
     @Override
-    public void handleCompression(final ClientboundLoginCompressionPacket rl) {
+    public void handleCompression(final ClientboundLoginCompressionPacket ta) {
         if (!this.connection.isMemoryConnection()) {
-            this.connection.setupCompression(rl.getCompressionThreshold());
+            this.connection.setupCompression(ta.getCompressionThreshold());
         }
     }
     
     @Override
-    public void handleCustomQuery(final ClientboundCustomQueryPacket ri) {
-        this.updateStatus.accept(new TranslatableComponent("connect.negotiating", new Object[0]));
-        this.connection.send(new ServerboundCustomQueryPacket(ri.getTransactionId(), null));
+    public void handleCustomQuery(final ClientboundCustomQueryPacket sx) {
+        this.updateStatus.accept(new TranslatableComponent("connect.negotiating"));
+        this.connection.send(new ServerboundCustomQueryPacket(sx.getTransactionId(), null));
     }
     
     static {
diff --git a/src/net/minecraft/client/multiplayer/ClientLevel.java b/src/net/minecraft/client/multiplayer/ClientLevel.java
index 95f2556..ce0fdf6 100644
--- a/src/net/minecraft/client/multiplayer/ClientLevel.java
+++ b/src/net/minecraft/client/multiplayer/ClientLevel.java
@@ -1,9 +1,11 @@
 package net.minecraft.client.multiplayer;
 
-import net.minecraft.world.level.dimension.Dimension;
+import net.minecraft.world.Difficulty;
+import net.minecraft.world.level.biome.AmbientParticleSettings;
 import net.minecraft.world.level.chunk.ChunkSource;
+import net.minecraft.world.level.storage.LevelData;
+import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.core.Cursor3D;
-import net.minecraft.world.level.LevelType;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.biome.Biome;
@@ -11,10 +13,7 @@ import net.minecraft.ReportedException;
 import net.minecraft.tags.TagManager;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.EmptyTickList;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.TickList;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.GameRules;
 import net.minecraft.world.item.crafting.RecipeManager;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.client.particle.Particle;
@@ -23,10 +22,13 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.EntityBoundSoundInstance;
+import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.CrashReportCategory;
 import net.minecraft.CrashReport;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.core.particles.ParticleOptions;
@@ -39,14 +41,9 @@ import net.minecraft.world.level.GameType;
 import java.util.Random;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.world.level.block.state.BlockState;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.entity.global.LightningBolt;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import java.util.Collection;
 import net.minecraft.world.level.chunk.LevelChunk;
@@ -55,18 +52,20 @@ import java.util.Iterator;
 import net.minecraft.core.Registry;
 import net.minecraft.world.entity.player.Player;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
-import com.google.common.collect.Iterables;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.GameRules;
 import java.util.function.BooleanSupplier;
 import net.minecraft.core.BlockPos;
 import net.minecraft.Util;
 import net.minecraft.client.renderer.BiomeColors;
 import com.google.common.collect.Maps;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import com.google.common.collect.Lists;
-import net.minecraft.world.level.storage.LevelData;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import net.minecraft.world.level.storage.WritableLevelData;
 import net.minecraft.util.profiling.ProfilerFiller;
+import java.util.function.Supplier;
 import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.LevelSettings;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.client.color.block.BlockTintCache;
 import net.minecraft.world.level.ColorResolver;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
@@ -74,33 +73,33 @@ import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
 import java.util.Map;
 import net.minecraft.world.scores.Scoreboard;
 import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.LevelRenderer;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import net.minecraft.world.entity.Entity;
 import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.DimensionSpecialEffects;
+import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.world.entity.Entity;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.world.level.Level;
 
 public class ClientLevel extends Level {
-    private final List<Entity> globalEntities;
     private final Int2ObjectMap<Entity> entitiesById;
     private final ClientPacketListener connection;
     private final LevelRenderer levelRenderer;
+    private final ClientLevelData clientLevelData;
+    private final DimensionSpecialEffects effects;
     private final Minecraft minecraft;
     private final List<AbstractClientPlayer> players;
-    private int delayUntilNextMoodSound;
     private Scoreboard scoreboard;
     private final Map<String, MapItemSavedData> mapData;
     private int skyFlashTime;
     private final Object2ObjectArrayMap<ColorResolver, BlockTintCache> tintCaches;
+    private final ClientChunkCache chunkSource;
     
-    public ClientLevel(final ClientPacketListener dnp, final LevelSettings bka, final DimensionType cbi, final int integer, final ProfilerFiller aio, final LevelRenderer dqr) {
-        super(new LevelData(bka, "MpServer"), cbi, (bjw, cbh) -> new ClientChunkCache(bjw, integer), aio, true);
-        this.globalEntities = Lists.newArrayList();
+    public ClientLevel(final ClientPacketListener dyn, final ClientLevelData a, final ResourceKey<Level> ug3, final ResourceKey<DimensionType> ug4, final DimensionType cif, final int integer, final Supplier<ProfilerFiller> supplier, final LevelRenderer ebx, final boolean boolean9, final long long10) {
+        super(a, ug3, ug4, cif, supplier, true, boolean9, long10);
         this.entitiesById = (Int2ObjectMap<Entity>)new Int2ObjectOpenHashMap();
         this.minecraft = Minecraft.getInstance();
         this.players = Lists.newArrayList();
-        this.delayUntilNextMoodSound = this.random.nextInt(12000);
         this.scoreboard = new Scoreboard();
         this.mapData = Maps.newHashMap();
         this.tintCaches = Util.make(new Object2ObjectArrayMap(3), object2ObjectArrayMap -> {
@@ -109,140 +108,161 @@ public class ClientLevel extends Level {
             object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new BlockTintCache());
             return;
         });
-        this.connection = dnp;
-        this.levelRenderer = dqr;
-        this.setSpawnPos(new BlockPos(8, 64, 8));
+        this.chunkSource = new ClientChunkCache(this, integer);
+        this.clientLevelData = a;
+        this.connection = dyn;
+        this.levelRenderer = ebx;
+        this.effects = DimensionSpecialEffects.forType(dyn.registryAccess().dimensionTypes().getResourceKey(cif));
+        this.setDefaultSpawnPos(new BlockPos(8, 64, 8));
         this.updateSkyBrightness();
         this.prepareWeather();
     }
     
+    public DimensionSpecialEffects effects() {
+        return this.effects;
+    }
+    
     public void tick(final BooleanSupplier booleanSupplier) {
         this.getWorldBorder().tick();
         this.tickTime();
         this.getProfiler().push("blocks");
         this.chunkSource.tick(booleanSupplier);
-        this.playMoodSounds();
         this.getProfiler().pop();
     }
     
+    private void tickTime() {
+        this.setGameTime(this.levelData.getGameTime() + 1L);
+        if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
+            this.setDayTime(this.levelData.getDayTime() + 1L);
+        }
+    }
+    
+    public void setGameTime(final long long1) {
+        this.clientLevelData.setGameTime(long1);
+    }
+    
+    public void setDayTime(long long1) {
+        if (long1 < 0L) {
+            long1 = -long1;
+            this.getGameRules().<GameRules.BooleanValue>getRule(GameRules.RULE_DAYLIGHT).set(false, null);
+        }
+        else {
+            this.getGameRules().<GameRules.BooleanValue>getRule(GameRules.RULE_DAYLIGHT).set(true, null);
+        }
+        this.clientLevelData.setDayTime(long1);
+    }
+    
     public Iterable<Entity> entitiesForRendering() {
-        return Iterables.<Entity>concat(this.entitiesById.values(), this.globalEntities);
+        return (Iterable<Entity>)this.entitiesById.values();
     }
     
     public void tickEntities() {
-        final ProfilerFiller aio2 = this.getProfiler();
-        aio2.push("entities");
-        aio2.push("global");
-        for (int integer3 = 0; integer3 < this.globalEntities.size(); ++integer3) {
-            final Entity akq2 = this.globalEntities.get(integer3);
-            this.guardEntityTick(akq -> {
-                ++akq.tickCount;
-                akq.tick();
-                return;
-            }, akq2);
-            if (akq2.removed) {
-                this.globalEntities.remove(integer3--);
-            }
-        }
-        aio2.popPush("regular");
+        final ProfilerFiller ami2 = this.getProfiler();
+        ami2.push("entities");
         final ObjectIterator<Int2ObjectMap.Entry<Entity>> objectIterator3 = (ObjectIterator<Int2ObjectMap.Entry<Entity>>)this.entitiesById.int2ObjectEntrySet().iterator();
         while (objectIterator3.hasNext()) {
             final Int2ObjectMap.Entry<Entity> entry4 = (Int2ObjectMap.Entry<Entity>)objectIterator3.next();
-            final Entity akq3 = (Entity)entry4.getValue();
-            if (akq3.isPassenger()) {
+            final Entity aom5 = (Entity)entry4.getValue();
+            if (aom5.isPassenger()) {
                 continue;
             }
-            aio2.push("tick");
-            if (!akq3.removed) {
-                this.guardEntityTick(this::tickNonPassenger, akq3);
+            ami2.push("tick");
+            if (!aom5.removed) {
+                this.guardEntityTick(this::tickNonPassenger, aom5);
             }
-            aio2.pop();
-            aio2.push("remove");
-            if (akq3.removed) {
+            ami2.pop();
+            ami2.push("remove");
+            if (aom5.removed) {
                 objectIterator3.remove();
-                this.onEntityRemoved(akq3);
+                this.onEntityRemoved(aom5);
             }
-            aio2.pop();
+            ami2.pop();
         }
-        aio2.pop();
         this.tickBlockEntities();
-        aio2.pop();
+        ami2.pop();
     }
     
-    public void tickNonPassenger(final Entity akq) {
-        if (!(akq instanceof Player) && !this.getChunkSource().isEntityTickingChunk(akq)) {
+    public void tickNonPassenger(final Entity aom) {
+        if (!(aom instanceof Player) && !this.getChunkSource().isEntityTickingChunk(aom)) {
+            this.updateChunkPos(aom);
             return;
         }
-        akq.setPosAndOldPos(akq.getX(), akq.getY(), akq.getZ());
-        akq.yRotO = akq.yRot;
-        akq.xRotO = akq.xRot;
-        if (akq.inChunk || akq.isSpectator()) {
-            ++akq.tickCount;
-            this.getProfiler().push(() -> Registry.ENTITY_TYPE.getKey(akq.getType()).toString());
-            akq.tick();
+        aom.setPosAndOldPos(aom.getX(), aom.getY(), aom.getZ());
+        aom.yRotO = aom.yRot;
+        aom.xRotO = aom.xRot;
+        if (aom.inChunk || aom.isSpectator()) {
+            ++aom.tickCount;
+            this.getProfiler().push(() -> Registry.ENTITY_TYPE.getKey(aom.getType()).toString());
+            aom.tick();
             this.getProfiler().pop();
         }
-        this.updateChunkPos(akq);
-        if (akq.inChunk) {
-            for (final Entity akq2 : akq.getPassengers()) {
-                this.tickPassenger(akq, akq2);
+        this.updateChunkPos(aom);
+        if (aom.inChunk) {
+            for (final Entity aom2 : aom.getPassengers()) {
+                this.tickPassenger(aom, aom2);
             }
         }
     }
     
-    public void tickPassenger(final Entity akq1, final Entity akq2) {
-        if (akq2.removed || akq2.getVehicle() != akq1) {
-            akq2.stopRiding();
+    public void tickPassenger(final Entity aom1, final Entity aom2) {
+        if (aom2.removed || aom2.getVehicle() != aom1) {
+            aom2.stopRiding();
             return;
         }
-        if (!(akq2 instanceof Player) && !this.getChunkSource().isEntityTickingChunk(akq2)) {
+        if (!(aom2 instanceof Player) && !this.getChunkSource().isEntityTickingChunk(aom2)) {
             return;
         }
-        akq2.setPosAndOldPos(akq2.getX(), akq2.getY(), akq2.getZ());
-        akq2.yRotO = akq2.yRot;
-        akq2.xRotO = akq2.xRot;
-        if (akq2.inChunk) {
-            ++akq2.tickCount;
-            akq2.rideTick();
+        aom2.setPosAndOldPos(aom2.getX(), aom2.getY(), aom2.getZ());
+        aom2.yRotO = aom2.yRot;
+        aom2.xRotO = aom2.xRot;
+        if (aom2.inChunk) {
+            ++aom2.tickCount;
+            aom2.rideTick();
         }
-        this.updateChunkPos(akq2);
-        if (akq2.inChunk) {
-            for (final Entity akq3 : akq2.getPassengers()) {
-                this.tickPassenger(akq2, akq3);
+        this.updateChunkPos(aom2);
+        if (aom2.inChunk) {
+            for (final Entity aom3 : aom2.getPassengers()) {
+                this.tickPassenger(aom2, aom3);
             }
         }
     }
     
-    public void updateChunkPos(final Entity akq) {
+    private void updateChunkPos(final Entity aom) {
+        if (!aom.checkAndResetUpdateChunkPos()) {
+            return;
+        }
         this.getProfiler().push("chunkCheck");
-        final int integer3 = Mth.floor(akq.getX() / 16.0);
-        final int integer4 = Mth.floor(akq.getY() / 16.0);
-        final int integer5 = Mth.floor(akq.getZ() / 16.0);
-        if (!akq.inChunk || akq.xChunk != integer3 || akq.yChunk != integer4 || akq.zChunk != integer5) {
-            if (akq.inChunk && this.hasChunk(akq.xChunk, akq.zChunk)) {
-                this.getChunk(akq.xChunk, akq.zChunk).removeEntity(akq, akq.yChunk);
+        final int integer3 = Mth.floor(aom.getX() / 16.0);
+        final int integer4 = Mth.floor(aom.getY() / 16.0);
+        final int integer5 = Mth.floor(aom.getZ() / 16.0);
+        if (!aom.inChunk || aom.xChunk != integer3 || aom.yChunk != integer4 || aom.zChunk != integer5) {
+            if (aom.inChunk && this.hasChunk(aom.xChunk, aom.zChunk)) {
+                this.getChunk(aom.xChunk, aom.zChunk).removeEntity(aom, aom.yChunk);
             }
-            if (akq.checkAndResetTeleportedFlag() || this.hasChunk(integer3, integer5)) {
-                this.getChunk(integer3, integer5).addEntity(akq);
+            if (aom.checkAndResetForcedChunkAdditionFlag() || this.hasChunk(integer3, integer5)) {
+                this.getChunk(integer3, integer5).addEntity(aom);
             }
             else {
-                akq.inChunk = false;
+                if (aom.inChunk) {
+                    ClientLevel.LOGGER.warn("Entity {} left loaded chunk area", aom);
+                }
+                aom.inChunk = false;
             }
         }
         this.getProfiler().pop();
     }
     
-    public void unload(final LevelChunk cal) {
-        this.blockEntitiesToUnload.addAll(cal.getBlockEntities().values());
-        this.chunkSource.getLightEngine().enableLightSources(cal.getPos(), false);
+    public void unload(final LevelChunk chj) {
+        this.blockEntitiesToUnload.addAll(chj.getBlockEntities().values());
+        this.chunkSource.getLightEngine().enableLightSources(chj.getPos(), false);
     }
     
     public void onChunkLoaded(final int integer1, final int integer2) {
-        this.tintCaches.forEach((colorResolver, dcc) -> dcc.invalidateForChunk(integer1, integer2));
+        this.tintCaches.forEach((colorResolver, dmo) -> dmo.invalidateForChunk(integer1, integer2));
     }
     
     public void clearTintCaches() {
-        this.tintCaches.forEach((colorResolver, dcc) -> dcc.invalidateAll());
+        this.tintCaches.forEach((colorResolver, dmo) -> dmo.invalidateAll());
     }
     
     @Override
@@ -250,72 +270,48 @@ public class ClientLevel extends Level {
         return true;
     }
     
-    private void playMoodSounds() {
-        if (this.minecraft.player == null) {
-            return;
-        }
-        if (this.delayUntilNextMoodSound > 0) {
-            --this.delayUntilNextMoodSound;
-            return;
-        }
-        final BlockPos fk2 = new BlockPos(this.minecraft.player);
-        final BlockPos fk3 = fk2.offset(4 * (this.random.nextInt(3) - 1), 4 * (this.random.nextInt(3) - 1), 4 * (this.random.nextInt(3) - 1));
-        final double double4 = fk2.distSqr(fk3);
-        if (double4 >= 4.0 && double4 <= 256.0) {
-            final BlockState byj6 = this.getBlockState(fk3);
-            if (byj6.isAir() && this.getRawBrightness(fk3, 0) <= this.random.nextInt(8) && this.getBrightness(LightLayer.SKY, fk3) <= 0) {
-                this.playLocalSound(fk3.getX() + 0.5, fk3.getY() + 0.5, fk3.getZ() + 0.5, SoundEvents.AMBIENT_CAVE, SoundSource.AMBIENT, 0.7f, 0.8f + this.random.nextFloat() * 0.2f, false);
-                this.delayUntilNextMoodSound = this.random.nextInt(12000) + 6000;
-            }
-        }
-    }
-    
     public int getEntityCount() {
         return this.entitiesById.size();
     }
     
-    public void addLightning(final LightningBolt avy) {
-        this.globalEntities.add(avy);
+    public void addPlayer(final int integer, final AbstractClientPlayer ebc) {
+        this.addEntity(integer, ebc);
+        this.players.add(ebc);
     }
     
-    public void addPlayer(final int integer, final AbstractClientPlayer dpy) {
-        this.addEntity(integer, dpy);
-        this.players.add(dpy);
+    public void putNonPlayerEntity(final int integer, final Entity aom) {
+        this.addEntity(integer, aom);
     }
     
-    public void putNonPlayerEntity(final int integer, final Entity akq) {
-        this.addEntity(integer, akq);
-    }
-    
-    private void addEntity(final int integer, final Entity akq) {
+    private void addEntity(final int integer, final Entity aom) {
         this.removeEntity(integer);
-        this.entitiesById.put(integer, akq);
-        this.getChunkSource().getChunk(Mth.floor(akq.getX() / 16.0), Mth.floor(akq.getZ() / 16.0), ChunkStatus.FULL, true).addEntity(akq);
+        this.entitiesById.put(integer, aom);
+        this.getChunkSource().getChunk(Mth.floor(aom.getX() / 16.0), Mth.floor(aom.getZ() / 16.0), ChunkStatus.FULL, true).addEntity(aom);
     }
     
     public void removeEntity(final int integer) {
-        final Entity akq3 = (Entity)this.entitiesById.remove(integer);
-        if (akq3 != null) {
-            akq3.remove();
-            this.onEntityRemoved(akq3);
+        final Entity aom3 = (Entity)this.entitiesById.remove(integer);
+        if (aom3 != null) {
+            aom3.remove();
+            this.onEntityRemoved(aom3);
         }
     }
     
-    private void onEntityRemoved(final Entity akq) {
-        akq.unRide();
-        if (akq.inChunk) {
-            this.getChunk(akq.xChunk, akq.zChunk).removeEntity(akq);
+    private void onEntityRemoved(final Entity aom) {
+        aom.unRide();
+        if (aom.inChunk) {
+            this.getChunk(aom.xChunk, aom.zChunk).removeEntity(aom);
         }
-        this.players.remove(akq);
+        this.players.remove(aom);
     }
     
-    public void reAddEntitiesToChunk(final LevelChunk cal) {
+    public void reAddEntitiesToChunk(final LevelChunk chj) {
         for (final Int2ObjectMap.Entry<Entity> entry4 : this.entitiesById.int2ObjectEntrySet()) {
-            final Entity akq5 = (Entity)entry4.getValue();
-            final int integer6 = Mth.floor(akq5.getX() / 16.0);
-            final int integer7 = Mth.floor(akq5.getZ() / 16.0);
-            if (integer6 == cal.getPos().x && integer7 == cal.getPos().z) {
-                cal.addEntity(akq5);
+            final Entity aom5 = (Entity)entry4.getValue();
+            final int integer6 = Mth.floor(aom5.getX() / 16.0);
+            final int integer7 = Mth.floor(aom5.getZ() / 16.0);
+            if (integer6 == chj.getPos().x && integer7 == chj.getPos().z) {
+                chj.addEntity(aom5);
             }
         }
     }
@@ -326,13 +322,13 @@ public class ClientLevel extends Level {
         return (Entity)this.entitiesById.get(integer);
     }
     
-    public void setKnownState(final BlockPos fk, final BlockState byj) {
-        this.setBlock(fk, byj, 19);
+    public void setKnownState(final BlockPos fu, final BlockState cfj) {
+        this.setBlock(fu, cfj, 19);
     }
     
     @Override
     public void disconnect() {
-        this.connection.getConnection().disconnect(new TranslatableComponent("multiplayer.status.quitting", new Object[0]));
+        this.connection.getConnection().disconnect(new TranslatableComponent("multiplayer.status.quitting"));
     }
     
     public void animateTick(final int integer1, final int integer2, final int integer3) {
@@ -340,8 +336,8 @@ public class ClientLevel extends Level {
         final Random random6 = new Random();
         boolean boolean7 = false;
         if (this.minecraft.gameMode.getPlayerMode() == GameType.CREATIVE) {
-            for (final ItemStack ben9 : this.minecraft.player.getHandSlots()) {
-                if (ben9.getItem() == Blocks.BARRIER.asItem()) {
+            for (final ItemStack bki9 : this.minecraft.player.getHandSlots()) {
+                if (bki9.getItem() == Blocks.BARRIER.asItem()) {
                     boolean7 = true;
                     break;
                 }
@@ -359,118 +355,125 @@ public class ClientLevel extends Level {
         final int integer6 = integer2 + this.random.nextInt(integer4) - this.random.nextInt(integer4);
         final int integer7 = integer3 + this.random.nextInt(integer4) - this.random.nextInt(integer4);
         a.set(integer5, integer6, integer7);
-        final BlockState byj12 = this.getBlockState(a);
-        byj12.getBlock().animateTick(byj12, this, a, random);
-        final FluidState coj13 = this.getFluidState(a);
-        if (!coj13.isEmpty()) {
-            coj13.animateTick(this, a, random);
-            final ParticleOptions gt14 = coj13.getDripParticle();
-            if (gt14 != null && this.random.nextInt(10) == 0) {
-                final boolean boolean7 = byj12.isFaceSturdy(this, a, Direction.DOWN);
-                final BlockPos fk16 = a.below();
-                this.trySpawnDripParticles(fk16, this.getBlockState(fk16), gt14, boolean7);
+        final BlockState cfj12 = this.getBlockState(a);
+        cfj12.getBlock().animateTick(cfj12, this, a, random);
+        final FluidState cxa13 = this.getFluidState(a);
+        if (!cxa13.isEmpty()) {
+            cxa13.animateTick(this, a, random);
+            final ParticleOptions hf14 = cxa13.getDripParticle();
+            if (hf14 != null && this.random.nextInt(10) == 0) {
+                final boolean boolean7 = cfj12.isFaceSturdy(this, a, Direction.DOWN);
+                final BlockPos fu16 = a.below();
+                this.trySpawnDripParticles(fu16, this.getBlockState(fu16), hf14, boolean7);
             }
         }
-        if (boolean6 && byj12.getBlock() == Blocks.BARRIER) {
+        if (boolean6 && cfj12.is(Blocks.BARRIER)) {
             this.addParticle(ParticleTypes.BARRIER, integer5 + 0.5, integer6 + 0.5, integer7 + 0.5, 0.0, 0.0, 0.0);
         }
+        if (!cfj12.isCollisionShapeFullBlock(this, a)) {
+            this.getBiome(a).getAmbientParticle().ifPresent(bqx -> {
+                if (bqx.canSpawn(this.random)) {
+                    this.addParticle(bqx.getOptions(), a.getX() + this.random.nextDouble(), a.getY() + this.random.nextDouble(), a.getZ() + this.random.nextDouble(), 0.0, 0.0, 0.0);
+                }
+            });
+        }
     }
     
-    private void trySpawnDripParticles(final BlockPos fk, final BlockState byj, final ParticleOptions gt, final boolean boolean4) {
-        if (!byj.getFluidState().isEmpty()) {
+    private void trySpawnDripParticles(final BlockPos fu, final BlockState cfj, final ParticleOptions hf, final boolean boolean4) {
+        if (!cfj.getFluidState().isEmpty()) {
             return;
         }
-        final VoxelShape cwf6 = byj.getCollisionShape(this, fk);
-        final double double7 = cwf6.max(Direction.Axis.Y);
+        final VoxelShape dfg6 = cfj.getCollisionShape(this, fu);
+        final double double7 = dfg6.max(Direction.Axis.Y);
         if (double7 < 1.0) {
             if (boolean4) {
-                this.spawnFluidParticle(fk.getX(), fk.getX() + 1, fk.getZ(), fk.getZ() + 1, fk.getY() + 1 - 0.05, gt);
+                this.spawnFluidParticle(fu.getX(), fu.getX() + 1, fu.getZ(), fu.getZ() + 1, fu.getY() + 1 - 0.05, hf);
             }
         }
-        else if (!byj.is(BlockTags.IMPERMEABLE)) {
-            final double double8 = cwf6.min(Direction.Axis.Y);
+        else if (!cfj.is(BlockTags.IMPERMEABLE)) {
+            final double double8 = dfg6.min(Direction.Axis.Y);
             if (double8 > 0.0) {
-                this.spawnParticle(fk, gt, cwf6, fk.getY() + double8 - 0.05);
+                this.spawnParticle(fu, hf, dfg6, fu.getY() + double8 - 0.05);
             }
             else {
-                final BlockPos fk2 = fk.below();
-                final BlockState byj2 = this.getBlockState(fk2);
-                final VoxelShape cwf7 = byj2.getCollisionShape(this, fk2);
-                final double double9 = cwf7.max(Direction.Axis.Y);
-                if (double9 < 1.0 && byj2.getFluidState().isEmpty()) {
-                    this.spawnParticle(fk, gt, cwf6, fk.getY() - 0.05);
+                final BlockPos fu2 = fu.below();
+                final BlockState cfj2 = this.getBlockState(fu2);
+                final VoxelShape dfg7 = cfj2.getCollisionShape(this, fu2);
+                final double double9 = dfg7.max(Direction.Axis.Y);
+                if (double9 < 1.0 && cfj2.getFluidState().isEmpty()) {
+                    this.spawnParticle(fu, hf, dfg6, fu.getY() - 0.05);
                 }
             }
         }
     }
     
-    private void spawnParticle(final BlockPos fk, final ParticleOptions gt, final VoxelShape cwf, final double double4) {
-        this.spawnFluidParticle(fk.getX() + cwf.min(Direction.Axis.X), fk.getX() + cwf.max(Direction.Axis.X), fk.getZ() + cwf.min(Direction.Axis.Z), fk.getZ() + cwf.max(Direction.Axis.Z), double4, gt);
+    private void spawnParticle(final BlockPos fu, final ParticleOptions hf, final VoxelShape dfg, final double double4) {
+        this.spawnFluidParticle(fu.getX() + dfg.min(Direction.Axis.X), fu.getX() + dfg.max(Direction.Axis.X), fu.getZ() + dfg.min(Direction.Axis.Z), fu.getZ() + dfg.max(Direction.Axis.Z), double4, hf);
     }
     
-    private void spawnFluidParticle(final double double1, final double double2, final double double3, final double double4, final double double5, final ParticleOptions gt) {
-        this.addParticle(gt, Mth.lerp(this.random.nextDouble(), double1, double2), double5, Mth.lerp(this.random.nextDouble(), double3, double4), 0.0, 0.0, 0.0);
+    private void spawnFluidParticle(final double double1, final double double2, final double double3, final double double4, final double double5, final ParticleOptions hf) {
+        this.addParticle(hf, Mth.lerp(this.random.nextDouble(), double1, double2), double5, Mth.lerp(this.random.nextDouble(), double3, double4), 0.0, 0.0, 0.0);
     }
     
     public void removeAllPendingEntityRemovals() {
         final ObjectIterator<Int2ObjectMap.Entry<Entity>> objectIterator2 = (ObjectIterator<Int2ObjectMap.Entry<Entity>>)this.entitiesById.int2ObjectEntrySet().iterator();
         while (objectIterator2.hasNext()) {
             final Int2ObjectMap.Entry<Entity> entry3 = (Int2ObjectMap.Entry<Entity>)objectIterator2.next();
-            final Entity akq4 = (Entity)entry3.getValue();
-            if (akq4.removed) {
+            final Entity aom4 = (Entity)entry3.getValue();
+            if (aom4.removed) {
                 objectIterator2.remove();
-                this.onEntityRemoved(akq4);
+                this.onEntityRemoved(aom4);
             }
         }
     }
     
     @Override
-    public CrashReportCategory fillReportDetails(final CrashReport h) {
-        final CrashReportCategory i3 = super.fillReportDetails(h);
-        i3.setDetail("Server brand", () -> this.minecraft.player.getServerBrand());
-        i3.setDetail("Server type", () -> (this.minecraft.getSingleplayerServer() == null) ? "Non-integrated multiplayer server" : "Integrated singleplayer server");
-        return i3;
+    public CrashReportCategory fillReportDetails(final CrashReport j) {
+        final CrashReportCategory k3 = super.fillReportDetails(j);
+        k3.setDetail("Server brand", () -> this.minecraft.player.getServerBrand());
+        k3.setDetail("Server type", () -> (this.minecraft.getSingleplayerServer() == null) ? "Non-integrated multiplayer server" : "Integrated singleplayer server");
+        return k3;
     }
     
     @Override
-    public void playSound(@Nullable final Player ayj, final double double2, final double double3, final double double4, final SoundEvent aah, final SoundSource aaj, final float float7, final float float8) {
-        if (ayj == this.minecraft.player) {
-            this.playLocalSound(double2, double3, double4, aah, aaj, float7, float8, false);
+    public void playSound(@Nullable final Player bec, final double double2, final double double3, final double double4, final SoundEvent ack, final SoundSource acm, final float float7, final float float8) {
+        if (bec == this.minecraft.player) {
+            this.playLocalSound(double2, double3, double4, ack, acm, float7, float8, false);
         }
     }
     
     @Override
-    public void playSound(@Nullable final Player ayj, final Entity akq, final SoundEvent aah, final SoundSource aaj, final float float5, final float float6) {
-        if (ayj == this.minecraft.player) {
-            this.minecraft.getSoundManager().play(new EntityBoundSoundInstance(aah, aaj, akq));
+    public void playSound(@Nullable final Player bec, final Entity aom, final SoundEvent ack, final SoundSource acm, final float float5, final float float6) {
+        if (bec == this.minecraft.player) {
+            this.minecraft.getSoundManager().play(new EntityBoundSoundInstance(ack, acm, aom));
         }
     }
     
-    public void playLocalSound(final BlockPos fk, final SoundEvent aah, final SoundSource aaj, final float float4, final float float5, final boolean boolean6) {
-        this.playLocalSound(fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5, aah, aaj, float4, float5, boolean6);
+    public void playLocalSound(final BlockPos fu, final SoundEvent ack, final SoundSource acm, final float float4, final float float5, final boolean boolean6) {
+        this.playLocalSound(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, ack, acm, float4, float5, boolean6);
     }
     
     @Override
-    public void playLocalSound(final double double1, final double double2, final double double3, final SoundEvent aah, final SoundSource aaj, final float float6, final float float7, final boolean boolean8) {
+    public void playLocalSound(final double double1, final double double2, final double double3, final SoundEvent ack, final SoundSource acm, final float float6, final float float7, final boolean boolean8) {
         final double double4 = this.minecraft.gameRenderer.getMainCamera().getPosition().distanceToSqr(double1, double2, double3);
-        final SimpleSoundInstance ecv15 = new SimpleSoundInstance(aah, aaj, float6, float7, (float)double1, (float)double2, (float)double3);
+        final SimpleSoundInstance eoi15 = new SimpleSoundInstance(ack, acm, float6, float7, double1, double2, double3);
         if (boolean8 && double4 > 100.0) {
             final double double5 = Math.sqrt(double4) / 40.0;
-            this.minecraft.getSoundManager().playDelayed(ecv15, (int)(double5 * 20.0));
+            this.minecraft.getSoundManager().playDelayed(eoi15, (int)(double5 * 20.0));
         }
         else {
-            this.minecraft.getSoundManager().play(ecv15);
+            this.minecraft.getSoundManager().play(eoi15);
         }
     }
     
     @Override
-    public void createFireworks(final double double1, final double double2, final double double3, final double double4, final double double5, final double double6, @Nullable final CompoundTag jt) {
-        this.minecraft.particleEngine.add(new FireworkParticles.Starter(this, double1, double2, double3, double4, double5, double6, this.minecraft.particleEngine, jt));
+    public void createFireworks(final double double1, final double double2, final double double3, final double double4, final double double5, final double double6, @Nullable final CompoundTag le) {
+        this.minecraft.particleEngine.add(new FireworkParticles.Starter(this, double1, double2, double3, double4, double5, double6, this.minecraft.particleEngine, le));
     }
     
     @Override
-    public void sendPacketToServer(final Packet<?> lt) {
-        this.connection.send(lt);
+    public void sendPacketToServer(final Packet<?> ni) {
+        this.connection.send(ni);
     }
     
     @Override
@@ -478,20 +481,8 @@ public class ClientLevel extends Level {
         return this.connection.getRecipeManager();
     }
     
-    public void setScoreboard(final Scoreboard cwl) {
-        this.scoreboard = cwl;
-    }
-    
-    @Override
-    public void setDayTime(long long1) {
-        if (long1 < 0L) {
-            long1 = -long1;
-            this.getGameRules().<GameRules.BooleanValue>getRule(GameRules.RULE_DAYLIGHT).set(false, null);
-        }
-        else {
-            this.getGameRules().<GameRules.BooleanValue>getRule(GameRules.RULE_DAYLIGHT).set(true, null);
-        }
-        super.setDayTime(long1);
+    public void setScoreboard(final Scoreboard dfm) {
+        this.scoreboard = dfm;
     }
     
     @Override
@@ -506,7 +497,7 @@ public class ClientLevel extends Level {
     
     @Override
     public ClientChunkCache getChunkSource() {
-        return (ClientChunkCache)super.getChunkSource();
+        return this.chunkSource;
     }
     
     @Nullable
@@ -516,8 +507,8 @@ public class ClientLevel extends Level {
     }
     
     @Override
-    public void setMapData(final MapItemSavedData crg) {
-        this.mapData.put(crg.getId(), crg);
+    public void setMapData(final MapItemSavedData czv) {
+        this.mapData.put(czv.getId(), czv);
     }
     
     @Override
@@ -536,13 +527,13 @@ public class ClientLevel extends Level {
     }
     
     @Override
-    public void sendBlockUpdated(final BlockPos fk, final BlockState byj2, final BlockState byj3, final int integer) {
-        this.levelRenderer.blockChanged(this, fk, byj2, byj3, integer);
+    public void sendBlockUpdated(final BlockPos fu, final BlockState cfj2, final BlockState cfj3, final int integer) {
+        this.levelRenderer.blockChanged(this, fu, cfj2, cfj3, integer);
     }
     
     @Override
-    public void setBlocksDirty(final BlockPos fk, final BlockState byj2, final BlockState byj3) {
-        this.levelRenderer.setBlockDirty(fk, byj2, byj3);
+    public void setBlocksDirty(final BlockPos fu, final BlockState cfj2, final BlockState cfj3) {
+        this.levelRenderer.setBlockDirty(fu, cfj2, cfj3);
     }
     
     public void setSectionDirtyWithNeighbors(final int integer1, final int integer2, final int integer3) {
@@ -550,49 +541,49 @@ public class ClientLevel extends Level {
     }
     
     @Override
-    public void destroyBlockProgress(final int integer1, final BlockPos fk, final int integer3) {
-        this.levelRenderer.destroyBlockProgress(integer1, fk, integer3);
+    public void destroyBlockProgress(final int integer1, final BlockPos fu, final int integer3) {
+        this.levelRenderer.destroyBlockProgress(integer1, fu, integer3);
     }
     
     @Override
-    public void globalLevelEvent(final int integer1, final BlockPos fk, final int integer3) {
-        this.levelRenderer.globalLevelEvent(integer1, fk, integer3);
+    public void globalLevelEvent(final int integer1, final BlockPos fu, final int integer3) {
+        this.levelRenderer.globalLevelEvent(integer1, fu, integer3);
     }
     
     @Override
-    public void levelEvent(@Nullable final Player ayj, final int integer2, final BlockPos fk, final int integer4) {
+    public void levelEvent(@Nullable final Player bec, final int integer2, final BlockPos fu, final int integer4) {
         try {
-            this.levelRenderer.levelEvent(ayj, integer2, fk, integer4);
+            this.levelRenderer.levelEvent(bec, integer2, fu, integer4);
         }
         catch (Throwable throwable6) {
-            final CrashReport h7 = CrashReport.forThrowable(throwable6, "Playing level event");
-            final CrashReportCategory i8 = h7.addCategory("Level event being played");
-            i8.setDetail("Block coordinates", CrashReportCategory.formatLocation(fk));
-            i8.setDetail("Event source", ayj);
-            i8.setDetail("Event type", integer2);
-            i8.setDetail("Event data", integer4);
-            throw new ReportedException(h7);
+            final CrashReport j7 = CrashReport.forThrowable(throwable6, "Playing level event");
+            final CrashReportCategory k8 = j7.addCategory("Level event being played");
+            k8.setDetail("Block coordinates", CrashReportCategory.formatLocation(fu));
+            k8.setDetail("Event source", bec);
+            k8.setDetail("Event type", integer2);
+            k8.setDetail("Event data", integer4);
+            throw new ReportedException(j7);
         }
     }
     
     @Override
-    public void addParticle(final ParticleOptions gt, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        this.levelRenderer.addParticle(gt, gt.getType().getOverrideLimiter(), double2, double3, double4, double5, double6, double7);
+    public void addParticle(final ParticleOptions hf, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        this.levelRenderer.addParticle(hf, hf.getType().getOverrideLimiter(), double2, double3, double4, double5, double6, double7);
     }
     
     @Override
-    public void addParticle(final ParticleOptions gt, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-        this.levelRenderer.addParticle(gt, gt.getType().getOverrideLimiter() || boolean2, double3, double4, double5, double6, double7, double8);
+    public void addParticle(final ParticleOptions hf, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+        this.levelRenderer.addParticle(hf, hf.getType().getOverrideLimiter() || boolean2, double3, double4, double5, double6, double7, double8);
     }
     
     @Override
-    public void addAlwaysVisibleParticle(final ParticleOptions gt, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        this.levelRenderer.addParticle(gt, false, true, double2, double3, double4, double5, double6, double7);
+    public void addAlwaysVisibleParticle(final ParticleOptions hf, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        this.levelRenderer.addParticle(hf, false, true, double2, double3, double4, double5, double6, double7);
     }
     
     @Override
-    public void addAlwaysVisibleParticle(final ParticleOptions gt, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-        this.levelRenderer.addParticle(gt, gt.getType().getOverrideLimiter() || boolean2, true, double3, double4, double5, double6, double7, double8);
+    public void addAlwaysVisibleParticle(final ParticleOptions hf, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+        this.levelRenderer.addParticle(hf, hf.getType().getOverrideLimiter() || boolean2, true, double3, double4, double5, double6, double7, double8);
     }
     
     @Override
@@ -615,12 +606,12 @@ public class ClientLevel extends Level {
         return float3 * 0.8f + 0.2f;
     }
     
-    public Vec3 getSkyColor(final BlockPos fk, final float float2) {
+    public Vec3 getSkyColor(final BlockPos fu, final float float2) {
         final float float3 = this.getTimeOfDay(float2);
         float float4 = Mth.cos(float3 * 6.2831855f) * 2.0f + 0.5f;
         float4 = Mth.clamp(float4, 0.0f, 1.0f);
-        final Biome bkt6 = this.getBiome(fk);
-        final int integer7 = bkt6.getSkyColor();
+        final Biome bre6 = this.getBiome(fu);
+        final int integer7 = bre6.getSkyColor();
         float float5 = (integer7 >> 16 & 0xFF) / 255.0f;
         float float6 = (integer7 >> 8 & 0xFF) / 255.0f;
         float float7 = (integer7 & 0xFF) / 255.0f;
@@ -685,11 +676,6 @@ public class ClientLevel extends Level {
         return new Vec3(float4, float5, float6);
     }
     
-    public Vec3 getFogColor(final float float1) {
-        final float float2 = this.getTimeOfDay(float1);
-        return this.dimension.getFogColor(float2, float1);
-    }
-    
     public float getStarBrightness(final float float1) {
         final float float2 = this.getTimeOfDay(float1);
         float float3 = 1.0f - (Mth.cos(float2 * 6.2831855f) * 2.0f + 0.25f);
@@ -697,13 +683,6 @@ public class ClientLevel extends Level {
         return float3 * float3 * 0.5f;
     }
     
-    public double getHorizonHeight() {
-        if (this.levelData.getGeneratorType() == LevelType.FLAT) {
-            return 0.0;
-        }
-        return 63.0;
-    }
-    
     public int getSkyFlashTime() {
         return this.skyFlashTime;
     }
@@ -714,24 +693,51 @@ public class ClientLevel extends Level {
     }
     
     @Override
-    public int getBlockTint(final BlockPos fk, final ColorResolver colorResolver) {
-        final BlockTintCache dcc4 = (BlockTintCache)this.tintCaches.get(colorResolver);
-        return dcc4.getColor(fk, () -> this.calculateBlockTint(fk, colorResolver));
+    public float getShade(final Direction fz, final boolean boolean2) {
+        final boolean boolean3 = this.effects().constantAmbientLight();
+        if (!boolean2) {
+            return boolean3 ? 0.9f : 1.0f;
+        }
+        switch (fz) {
+            case DOWN: {
+                return boolean3 ? 0.9f : 0.5f;
+            }
+            case UP: {
+                return boolean3 ? 0.9f : 1.0f;
+            }
+            case NORTH:
+            case SOUTH: {
+                return 0.8f;
+            }
+            case WEST:
+            case EAST: {
+                return 0.6f;
+            }
+            default: {
+                return 1.0f;
+            }
+        }
     }
     
-    public int calculateBlockTint(final BlockPos fk, final ColorResolver colorResolver) {
+    @Override
+    public int getBlockTint(final BlockPos fu, final ColorResolver colorResolver) {
+        final BlockTintCache dmo4 = (BlockTintCache)this.tintCaches.get(colorResolver);
+        return dmo4.getColor(fu, () -> this.calculateBlockTint(fu, colorResolver));
+    }
+    
+    public int calculateBlockTint(final BlockPos fu, final ColorResolver colorResolver) {
         final int integer4 = Minecraft.getInstance().options.biomeBlendRadius;
         if (integer4 == 0) {
-            return colorResolver.getColor(this.getBiome(fk), fk.getX(), fk.getZ());
+            return colorResolver.getColor(this.getBiome(fu), fu.getX(), fu.getZ());
         }
         final int integer5 = (integer4 * 2 + 1) * (integer4 * 2 + 1);
         int integer6 = 0;
         int integer7 = 0;
         int integer8 = 0;
-        final Cursor3D fn9 = new Cursor3D(fk.getX() - integer4, fk.getY(), fk.getZ() - integer4, fk.getX() + integer4, fk.getY(), fk.getZ() + integer4);
+        final Cursor3D fx9 = new Cursor3D(fu.getX() - integer4, fu.getY(), fu.getZ() - integer4, fu.getX() + integer4, fu.getY(), fu.getZ() + integer4);
         final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
-        while (fn9.advance()) {
-            a10.set(fn9.nextX(), fn9.nextY(), fn9.nextZ());
+        while (fx9.advance()) {
+            a10.set(fx9.nextX(), fx9.nextY(), fx9.nextZ());
             final int integer9 = colorResolver.getColor(this.getBiome(a10), a10.getX(), a10.getZ());
             integer6 += (integer9 & 0xFF0000) >> 16;
             integer7 += (integer9 & 0xFF00) >> 8;
@@ -739,4 +745,164 @@ public class ClientLevel extends Level {
         }
         return (integer6 / integer5 & 0xFF) << 16 | (integer7 / integer5 & 0xFF) << 8 | (integer8 / integer5 & 0xFF);
     }
+    
+    public BlockPos getSharedSpawnPos() {
+        BlockPos fu2 = new BlockPos(this.levelData.getXSpawn(), this.levelData.getYSpawn(), this.levelData.getZSpawn());
+        if (!this.getWorldBorder().isWithinBounds(fu2)) {
+            fu2 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, new BlockPos(this.getWorldBorder().getCenterX(), 0.0, this.getWorldBorder().getCenterZ()));
+        }
+        return fu2;
+    }
+    
+    public void setDefaultSpawnPos(final BlockPos fu) {
+        this.levelData.setSpawn(fu);
+    }
+    
+    @Override
+    public String toString() {
+        return "ClientLevel";
+    }
+    
+    @Override
+    public ClientLevelData getLevelData() {
+        return this.clientLevelData;
+    }
+    
+    public static class ClientLevelData implements WritableLevelData {
+        private final boolean hardcore;
+        private final GameRules gameRules;
+        private final boolean isFlat;
+        private int xSpawn;
+        private int ySpawn;
+        private int zSpawn;
+        private long gameTime;
+        private long dayTime;
+        private boolean raining;
+        private Difficulty difficulty;
+        private boolean difficultyLocked;
+        
+        public ClientLevelData(final Difficulty and, final boolean boolean2, final boolean boolean3) {
+            this.difficulty = and;
+            this.hardcore = boolean2;
+            this.isFlat = boolean3;
+            this.gameRules = new GameRules();
+        }
+        
+        @Override
+        public int getXSpawn() {
+            return this.xSpawn;
+        }
+        
+        @Override
+        public int getYSpawn() {
+            return this.ySpawn;
+        }
+        
+        @Override
+        public int getZSpawn() {
+            return this.zSpawn;
+        }
+        
+        @Override
+        public long getGameTime() {
+            return this.gameTime;
+        }
+        
+        @Override
+        public long getDayTime() {
+            return this.dayTime;
+        }
+        
+        @Override
+        public void setXSpawn(final int integer) {
+            this.xSpawn = integer;
+        }
+        
+        @Override
+        public void setYSpawn(final int integer) {
+            this.ySpawn = integer;
+        }
+        
+        @Override
+        public void setZSpawn(final int integer) {
+            this.zSpawn = integer;
+        }
+        
+        public void setGameTime(final long long1) {
+            this.gameTime = long1;
+        }
+        
+        public void setDayTime(final long long1) {
+            this.dayTime = long1;
+        }
+        
+        @Override
+        public void setSpawn(final BlockPos fu) {
+            this.xSpawn = fu.getX();
+            this.ySpawn = fu.getY();
+            this.zSpawn = fu.getZ();
+        }
+        
+        @Override
+        public boolean isThundering() {
+            return false;
+        }
+        
+        @Override
+        public boolean isRaining() {
+            return this.raining;
+        }
+        
+        @Override
+        public void setRaining(final boolean boolean1) {
+            this.raining = boolean1;
+        }
+        
+        @Override
+        public boolean isHardcore() {
+            return this.hardcore;
+        }
+        
+        @Override
+        public GameRules getGameRules() {
+            return this.gameRules;
+        }
+        
+        @Override
+        public Difficulty getDifficulty() {
+            return this.difficulty;
+        }
+        
+        @Override
+        public boolean isDifficultyLocked() {
+            return this.difficultyLocked;
+        }
+        
+        @Override
+        public void fillCrashReportCategory(final CrashReportCategory k) {
+            super.fillCrashReportCategory(k);
+        }
+        
+        public void setDifficulty(final Difficulty and) {
+            this.difficulty = and;
+        }
+        
+        public void setDifficultyLocked(final boolean boolean1) {
+            this.difficultyLocked = boolean1;
+        }
+        
+        public double getHorizonHeight() {
+            if (this.isFlat) {
+                return 0.0;
+            }
+            return 63.0;
+        }
+        
+        public double getClearColorScale() {
+            if (this.isFlat) {
+                return 1.0;
+            }
+            return 0.03125;
+        }
+    }
 }
diff --git a/src/net/minecraft/client/multiplayer/ClientPacketListener.java b/src/net/minecraft/client/multiplayer/ClientPacketListener.java
index 43443e2..8002198 100644
--- a/src/net/minecraft/client/multiplayer/ClientPacketListener.java
+++ b/src/net/minecraft/client/multiplayer/ClientPacketListener.java
@@ -1,23 +1,21 @@
 package net.minecraft.client.multiplayer;
 
 import org.apache.logging.log4j.LogManager;
+import com.mojang.datafixers.util.Pair;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.chunk.DataLayer;
 import net.minecraft.network.protocol.game.ClientboundBlockBreakAckPacket;
 import net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket;
 import net.minecraft.network.protocol.game.ClientboundSetChunkCacheRadiusPacket;
 import net.minecraft.world.item.trading.MerchantOffers;
 import net.minecraft.world.inventory.MerchantMenu;
 import net.minecraft.network.protocol.game.ClientboundMerchantOffersPacket;
-import net.minecraft.world.level.LightLayer;
 import net.minecraft.network.protocol.game.ClientboundLightUpdatePacket;
 import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
 import net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket;
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
-import net.minecraft.world.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.world.entity.ai.attributes.AttributeMap;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import net.minecraft.world.entity.ai.attributes.Attribute;
-import net.minecraft.world.entity.ai.attributes.RangedAttribute;
+import net.minecraft.core.Registry;
 import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket;
 import net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket;
 import net.minecraft.world.scores.PlayerTeam;
@@ -31,14 +29,12 @@ import net.minecraft.world.scores.criteria.ObjectiveCriteria;
 import net.minecraft.network.protocol.game.ClientboundSetObjectivePacket;
 import net.minecraft.core.Position;
 import java.util.Collection;
-import java.util.List;
 import net.minecraft.client.renderer.debug.BeeDebugRenderer;
 import net.minecraft.core.PositionImpl;
 import net.minecraft.client.renderer.debug.GoalSelectorDebugRenderer;
-import net.minecraft.client.renderer.debug.VillageDebugRenderer;
+import net.minecraft.client.renderer.debug.BrainDebugRenderer;
 import net.minecraft.client.renderer.debug.WorldGenAttemptRenderer;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import com.google.common.collect.Lists;
 import net.minecraft.client.renderer.debug.NeighborsUpdateRenderer;
 import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
@@ -53,6 +49,7 @@ import java.net.URI;
 import java.util.concurrent.CompletableFuture;
 import net.minecraft.client.gui.screens.ConfirmScreen;
 import java.io.UnsupportedEncodingException;
+import net.minecraft.server.packs.repository.PackSource;
 import net.minecraft.network.protocol.game.ServerboundResourcePackPacket;
 import java.io.File;
 import java.net.URLDecoder;
@@ -68,18 +65,12 @@ import net.minecraft.network.protocol.game.ClientboundKeepAlivePacket;
 import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket;
 import net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket;
 import net.minecraft.network.protocol.game.ClientboundTabListPacket;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.protocol.game.ClientboundSetTitlesPacket;
 import net.minecraft.network.protocol.game.ClientboundSetBorderPacket;
 import net.minecraft.network.protocol.game.ClientboundSetCameraPacket;
 import net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket;
 import net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket;
-import net.minecraft.tags.EntityTypeTags;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraft.tags.FluidTags;
-import net.minecraft.world.item.Item;
-import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.TagCollection;
-import net.minecraft.tags.BlockTags;
 import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffect;
@@ -117,13 +108,13 @@ import net.minecraft.client.gui.screens.DemoIntroScreen;
 import net.minecraft.client.gui.screens.WinScreen;
 import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
 import net.minecraft.world.level.GameType;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
 import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
 import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket;
 import net.minecraft.network.protocol.game.ClientboundBlockEventPacket;
 import net.minecraft.network.protocol.game.ClientboundContainerClosePacket;
-import net.minecraft.network.protocol.game.ClientboundSetEquippedItemPacket;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
 import net.minecraft.network.protocol.game.ClientboundContainerSetDataPacket;
 import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen;
 import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
@@ -160,7 +151,6 @@ import net.minecraft.world.level.Explosion;
 import net.minecraft.network.protocol.game.ClientboundExplodePacket;
 import net.minecraft.world.scores.Scoreboard;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.client.gui.screens.DeathScreen;
 import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
 import net.minecraft.network.protocol.game.ClientboundSetExperiencePacket;
@@ -172,12 +162,13 @@ import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.protocol.game.ClientboundSetPassengersPacket;
-import net.minecraft.network.protocol.game.ClientboundSetSpawnPositionPacket;
+import net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket;
 import net.minecraft.network.protocol.game.ClientboundSetTimePacket;
 import net.minecraft.client.resources.sounds.BeeSoundInstance;
 import net.minecraft.world.entity.boss.EnderDragonPart;
+import net.minecraft.client.resources.sounds.TickableSoundInstance;
 import net.minecraft.client.resources.sounds.BeeFlyingSoundInstance;
 import net.minecraft.client.resources.sounds.BeeAggressiveSoundInstance;
 import net.minecraft.world.entity.animal.Bee;
@@ -197,17 +188,19 @@ import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.gui.screens.DisconnectedScreen;
 import net.minecraft.realms.DisconnectedRealmsScreen;
-import net.minecraft.realms.RealmsScreenProxy;
+import net.minecraft.realms.RealmsScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundDisconnectPacket;
 import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.core.SectionPos;
 import net.minecraft.network.protocol.game.ClientboundForgetLevelChunkPacket;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import java.util.Iterator;
 import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.chunk.DataLayer;
+import net.minecraft.core.SectionPos;
+import net.minecraft.world.level.LightLayer;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkPacket;
 import net.minecraft.network.protocol.game.ClientboundChunkBlocksUpdatePacket;
@@ -227,14 +220,13 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
 import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket;
 import net.minecraft.world.entity.decoration.Painting;
 import net.minecraft.network.protocol.game.ClientboundAddPaintingPacket;
-import net.minecraft.world.entity.global.LightningBolt;
-import net.minecraft.network.protocol.game.ClientboundAddGlobalEntityPacket;
 import net.minecraft.world.entity.ExperienceOrb;
 import net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.MinecartSoundInstance;
 import net.minecraft.world.entity.vehicle.AbstractMinecart;
+import net.minecraft.world.entity.LightningBolt;
 import net.minecraft.world.entity.AreaEffectCloud;
 import net.minecraft.world.entity.item.FallingBlockEntity;
 import net.minecraft.world.level.block.Block;
@@ -267,17 +259,17 @@ import net.minecraft.world.entity.projectile.ThrownTrident;
 import net.minecraft.world.entity.projectile.SpectralArrow;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.projectile.Arrow;
-import net.minecraft.world.entity.fishing.FishingHook;
+import net.minecraft.world.entity.projectile.FishingHook;
 import net.minecraft.world.entity.vehicle.Minecart;
 import net.minecraft.world.entity.vehicle.MinecartCommandBlock;
 import net.minecraft.world.entity.vehicle.MinecartHopper;
 import net.minecraft.world.entity.vehicle.MinecartSpawner;
 import net.minecraft.world.entity.vehicle.MinecartTNT;
 import net.minecraft.world.entity.vehicle.MinecartFurnace;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.vehicle.MinecartChest;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
+import java.util.ArrayList;
 import net.minecraft.client.ClientBrandRetriever;
 import net.minecraft.network.FriendlyByteBuf;
 import io.netty.buffer.Unpooled;
@@ -288,12 +280,25 @@ import net.minecraft.client.player.KeyboardInput;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.ClientRecipeBook;
 import net.minecraft.stats.StatsCounter;
-import net.minecraft.world.level.LevelSettings;
+import net.minecraft.world.Difficulty;
+import net.minecraft.world.level.dimension.DimensionType;
+import com.google.common.collect.Sets;
+import java.util.List;
+import java.util.Collections;
+import com.google.common.collect.Lists;
+import net.minecraft.tags.EntityTypeTags;
+import net.minecraft.tags.FluidTags;
+import net.minecraft.tags.ItemTags;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.util.thread.BlockableEventLoop;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.PacketUtils;
 import net.minecraft.network.protocol.game.ClientboundLoginPacket;
 import com.google.common.collect.Maps;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import java.util.Set;
 import net.minecraft.world.item.crafting.RecipeManager;
 import net.minecraft.commands.SharedSuggestionProvider;
 import com.mojang.brigadier.CommandDispatcher;
@@ -316,6 +321,7 @@ public class ClientPacketListener implements ClientGamePacketListener {
     private final Screen callbackScreen;
     private Minecraft minecraft;
     private ClientLevel level;
+    private ClientLevel.ClientLevelData levelData;
     private boolean started;
     private final Map<UUID, PlayerInfo> playerInfoMap;
     private final ClientAdvancements advancements;
@@ -327,8 +333,10 @@ public class ClientPacketListener implements ClientGamePacketListener {
     private CommandDispatcher<SharedSuggestionProvider> commands;
     private final RecipeManager recipeManager;
     private final UUID id;
+    private Set<ResourceKey<Level>> levels;
+    private RegistryAccess registryAccess;
     
-    public ClientPacketListener(final Minecraft dbn, final Screen dgb, final Connection kt, final GameProfile gameProfile) {
+    public ClientPacketListener(final Minecraft dlx, final Screen dqs, final Connection me, final GameProfile gameProfile) {
         this.playerInfoMap = Maps.newHashMap();
         this.tags = new TagManager();
         this.debugQueryHandler = new DebugQueryHandler(this);
@@ -337,12 +345,13 @@ public class ClientPacketListener implements ClientGamePacketListener {
         this.commands = (CommandDispatcher<SharedSuggestionProvider>)new CommandDispatcher();
         this.recipeManager = new RecipeManager();
         this.id = UUID.randomUUID();
-        this.minecraft = dbn;
-        this.callbackScreen = dgb;
-        this.connection = kt;
+        this.registryAccess = RegistryAccess.builtin();
+        this.minecraft = dlx;
+        this.callbackScreen = dqs;
+        this.connection = me;
         this.localGameProfile = gameProfile;
-        this.advancements = new ClientAdvancements(dbn);
-        this.suggestionsProvider = new ClientSuggestionProvider(this, dbn);
+        this.advancements = new ClientAdvancements(dlx);
+        this.suggestionsProvider = new ClientSuggestionProvider(this, dlx);
     }
     
     public ClientSuggestionProvider getSuggestionsProvider() {
@@ -358,11 +367,28 @@ public class ClientPacketListener implements ClientGamePacketListener {
     }
     
     @Override
-    public void handleLogin(final ClientboundLoginPacket nj) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nj, this, this.minecraft);
+    public void handleLogin(final ClientboundLoginPacket ox) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ox, this, this.minecraft);
         this.minecraft.gameMode = new MultiPlayerGameMode(this.minecraft, this);
-        this.serverChunkRadius = nj.getChunkRadius();
-        this.level = new ClientLevel(this, new LevelSettings(nj.getSeed(), nj.getGameType(), false, nj.isHardcore(), nj.getLevelType()), nj.getDimension(), this.serverChunkRadius, this.minecraft.getProfiler(), this.minecraft.levelRenderer);
+        if (!this.connection.isMemoryConnection()) {
+            BlockTags.resetToEmpty();
+            ItemTags.resetToEmpty();
+            FluidTags.resetToEmpty();
+            EntityTypeTags.resetToEmpty();
+        }
+        final ArrayList<ResourceKey<Level>> arrayList3 = Lists.<ResourceKey<Level>>newArrayList(ox.levels());
+        Collections.shuffle(arrayList3);
+        this.levels = Sets.newLinkedHashSet(arrayList3);
+        this.registryAccess = ox.registryAccess();
+        final ResourceKey<DimensionType> ug4 = ox.getDimensionType();
+        final ResourceKey<Level> ug5 = ox.getDimension();
+        final DimensionType cif6 = this.registryAccess.dimensionTypes().get(ug4);
+        this.serverChunkRadius = ox.getChunkRadius();
+        final boolean boolean7 = ox.isDebug();
+        final boolean boolean8 = ox.isFlat();
+        final ClientLevel.ClientLevelData a9 = new ClientLevel.ClientLevelData(Difficulty.NORMAL, ox.isHardcore(), boolean8);
+        this.levelData = a9;
+        this.level = new ClientLevel(this, a9, ug5, ug4, cif6, this.serverChunkRadius, this.minecraft::getProfiler, this.minecraft.levelRenderer, boolean7, ox.getSeed());
         this.minecraft.setLevel(this.level);
         if (this.minecraft.player == null) {
             this.minecraft.player = this.minecraft.gameMode.createPlayer(this.level, new StatsCounter(), new ClientRecipeBook(this.level.getRecipeManager()));
@@ -373,383 +399,374 @@ public class ClientPacketListener implements ClientGamePacketListener {
         }
         this.minecraft.debugRenderer.clear();
         this.minecraft.player.resetPos();
-        final int integer3 = nj.getPlayerId();
-        this.level.addPlayer(integer3, this.minecraft.player);
+        final int integer10 = ox.getPlayerId();
+        this.level.addPlayer(integer10, this.minecraft.player);
         this.minecraft.player.input = new KeyboardInput(this.minecraft.options);
         this.minecraft.gameMode.adjustPlayer(this.minecraft.player);
         this.minecraft.cameraEntity = this.minecraft.player;
-        this.minecraft.player.dimension = nj.getDimension();
         this.minecraft.setScreen(new ReceivingLevelScreen());
-        this.minecraft.player.setId(integer3);
-        this.minecraft.player.setReducedDebugInfo(nj.isReducedDebugInfo());
-        this.minecraft.player.setShowDeathScreen(nj.shouldShowDeathScreen());
-        this.minecraft.gameMode.setLocalMode(nj.getGameType());
+        this.minecraft.player.setId(integer10);
+        this.minecraft.player.setReducedDebugInfo(ox.isReducedDebugInfo());
+        this.minecraft.player.setShowDeathScreen(ox.shouldShowDeathScreen());
+        this.minecraft.gameMode.setLocalMode(ox.getGameType());
+        this.minecraft.gameMode.setPreviousLocalMode(ox.getPreviousGameType());
         this.minecraft.options.broadcastOptions();
         this.connection.send(new ServerboundCustomPayloadPacket(ServerboundCustomPayloadPacket.BRAND, new FriendlyByteBuf(Unpooled.buffer()).writeUtf(ClientBrandRetriever.getClientModName())));
         this.minecraft.getGame().onStartGameSession();
     }
     
     @Override
-    public void handleAddEntity(final ClientboundAddEntityPacket lx) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)lx, this, this.minecraft);
-        final double double3 = lx.getX();
-        final double double4 = lx.getY();
-        final double double5 = lx.getZ();
-        final EntityType<?> aku10 = lx.getType();
-        Entity akq9;
-        if (aku10 == EntityType.CHEST_MINECART) {
-            akq9 = new MinecartChest(this.level, double3, double4, double5);
+    public void handleAddEntity(final ClientboundAddEntityPacket nm) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nm, this, this.minecraft);
+        final double double3 = nm.getX();
+        final double double4 = nm.getY();
+        final double double5 = nm.getZ();
+        final EntityType<?> aoq10 = nm.getType();
+        Entity aom9;
+        if (aoq10 == EntityType.CHEST_MINECART) {
+            aom9 = new MinecartChest(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.FURNACE_MINECART) {
-            akq9 = new MinecartFurnace(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.FURNACE_MINECART) {
+            aom9 = new MinecartFurnace(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.TNT_MINECART) {
-            akq9 = new MinecartTNT(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.TNT_MINECART) {
+            aom9 = new MinecartTNT(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.SPAWNER_MINECART) {
-            akq9 = new MinecartSpawner(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.SPAWNER_MINECART) {
+            aom9 = new MinecartSpawner(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.HOPPER_MINECART) {
-            akq9 = new MinecartHopper(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.HOPPER_MINECART) {
+            aom9 = new MinecartHopper(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.COMMAND_BLOCK_MINECART) {
-            akq9 = new MinecartCommandBlock(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.COMMAND_BLOCK_MINECART) {
+            aom9 = new MinecartCommandBlock(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.MINECART) {
-            akq9 = new Minecart(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.MINECART) {
+            aom9 = new Minecart(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.FISHING_BOBBER) {
-            final Entity akq10 = this.level.getEntity(lx.getData());
-            if (akq10 instanceof Player) {
-                akq9 = new FishingHook(this.level, (Player)akq10, double3, double4, double5);
+        else if (aoq10 == EntityType.FISHING_BOBBER) {
+            final Entity aom10 = this.level.getEntity(nm.getData());
+            if (aom10 instanceof Player) {
+                aom9 = new FishingHook(this.level, (Player)aom10, double3, double4, double5);
             }
             else {
-                akq9 = null;
+                aom9 = null;
             }
         }
-        else if (aku10 == EntityType.ARROW) {
-            akq9 = new Arrow(this.level, double3, double4, double5);
-            final Entity akq10 = this.level.getEntity(lx.getData());
-            if (akq10 != null) {
-                ((AbstractArrow)akq9).setOwner(akq10);
+        else if (aoq10 == EntityType.ARROW) {
+            aom9 = new Arrow(this.level, double3, double4, double5);
+            final Entity aom10 = this.level.getEntity(nm.getData());
+            if (aom10 != null) {
+                ((AbstractArrow)aom9).setOwner(aom10);
             }
         }
-        else if (aku10 == EntityType.SPECTRAL_ARROW) {
-            akq9 = new SpectralArrow(this.level, double3, double4, double5);
-            final Entity akq10 = this.level.getEntity(lx.getData());
-            if (akq10 != null) {
-                ((AbstractArrow)akq9).setOwner(akq10);
+        else if (aoq10 == EntityType.SPECTRAL_ARROW) {
+            aom9 = new SpectralArrow(this.level, double3, double4, double5);
+            final Entity aom10 = this.level.getEntity(nm.getData());
+            if (aom10 != null) {
+                ((AbstractArrow)aom9).setOwner(aom10);
             }
         }
-        else if (aku10 == EntityType.TRIDENT) {
-            akq9 = new ThrownTrident(this.level, double3, double4, double5);
-            final Entity akq10 = this.level.getEntity(lx.getData());
-            if (akq10 != null) {
-                ((AbstractArrow)akq9).setOwner(akq10);
+        else if (aoq10 == EntityType.TRIDENT) {
+            aom9 = new ThrownTrident(this.level, double3, double4, double5);
+            final Entity aom10 = this.level.getEntity(nm.getData());
+            if (aom10 != null) {
+                ((AbstractArrow)aom9).setOwner(aom10);
             }
         }
-        else if (aku10 == EntityType.SNOWBALL) {
-            akq9 = new Snowball(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.SNOWBALL) {
+            aom9 = new Snowball(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.LLAMA_SPIT) {
-            akq9 = new LlamaSpit(this.level, double3, double4, double5, lx.getXa(), lx.getYa(), lx.getZa());
+        else if (aoq10 == EntityType.LLAMA_SPIT) {
+            aom9 = new LlamaSpit(this.level, double3, double4, double5, nm.getXa(), nm.getYa(), nm.getZa());
         }
-        else if (aku10 == EntityType.ITEM_FRAME) {
-            akq9 = new ItemFrame(this.level, new BlockPos(double3, double4, double5), Direction.from3DDataValue(lx.getData()));
+        else if (aoq10 == EntityType.ITEM_FRAME) {
+            aom9 = new ItemFrame(this.level, new BlockPos(double3, double4, double5), Direction.from3DDataValue(nm.getData()));
         }
-        else if (aku10 == EntityType.LEASH_KNOT) {
-            akq9 = new LeashFenceKnotEntity(this.level, new BlockPos(double3, double4, double5));
+        else if (aoq10 == EntityType.LEASH_KNOT) {
+            aom9 = new LeashFenceKnotEntity(this.level, new BlockPos(double3, double4, double5));
         }
-        else if (aku10 == EntityType.ENDER_PEARL) {
-            akq9 = new ThrownEnderpearl(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.ENDER_PEARL) {
+            aom9 = new ThrownEnderpearl(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.EYE_OF_ENDER) {
-            akq9 = new EyeOfEnder(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.EYE_OF_ENDER) {
+            aom9 = new EyeOfEnder(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.FIREWORK_ROCKET) {
-            akq9 = new FireworkRocketEntity(this.level, double3, double4, double5, ItemStack.EMPTY);
+        else if (aoq10 == EntityType.FIREWORK_ROCKET) {
+            aom9 = new FireworkRocketEntity(this.level, double3, double4, double5, ItemStack.EMPTY);
         }
-        else if (aku10 == EntityType.FIREBALL) {
-            akq9 = new LargeFireball(this.level, double3, double4, double5, lx.getXa(), lx.getYa(), lx.getZa());
+        else if (aoq10 == EntityType.FIREBALL) {
+            aom9 = new LargeFireball(this.level, double3, double4, double5, nm.getXa(), nm.getYa(), nm.getZa());
         }
-        else if (aku10 == EntityType.DRAGON_FIREBALL) {
-            akq9 = new DragonFireball(this.level, double3, double4, double5, lx.getXa(), lx.getYa(), lx.getZa());
+        else if (aoq10 == EntityType.DRAGON_FIREBALL) {
+            aom9 = new DragonFireball(this.level, double3, double4, double5, nm.getXa(), nm.getYa(), nm.getZa());
         }
-        else if (aku10 == EntityType.SMALL_FIREBALL) {
-            akq9 = new SmallFireball(this.level, double3, double4, double5, lx.getXa(), lx.getYa(), lx.getZa());
+        else if (aoq10 == EntityType.SMALL_FIREBALL) {
+            aom9 = new SmallFireball(this.level, double3, double4, double5, nm.getXa(), nm.getYa(), nm.getZa());
         }
-        else if (aku10 == EntityType.WITHER_SKULL) {
-            akq9 = new WitherSkull(this.level, double3, double4, double5, lx.getXa(), lx.getYa(), lx.getZa());
+        else if (aoq10 == EntityType.WITHER_SKULL) {
+            aom9 = new WitherSkull(this.level, double3, double4, double5, nm.getXa(), nm.getYa(), nm.getZa());
         }
-        else if (aku10 == EntityType.SHULKER_BULLET) {
-            akq9 = new ShulkerBullet(this.level, double3, double4, double5, lx.getXa(), lx.getYa(), lx.getZa());
+        else if (aoq10 == EntityType.SHULKER_BULLET) {
+            aom9 = new ShulkerBullet(this.level, double3, double4, double5, nm.getXa(), nm.getYa(), nm.getZa());
         }
-        else if (aku10 == EntityType.EGG) {
-            akq9 = new ThrownEgg(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.EGG) {
+            aom9 = new ThrownEgg(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.EVOKER_FANGS) {
-            akq9 = new EvokerFangs(this.level, double3, double4, double5, 0.0f, 0, null);
+        else if (aoq10 == EntityType.EVOKER_FANGS) {
+            aom9 = new EvokerFangs(this.level, double3, double4, double5, 0.0f, 0, null);
         }
-        else if (aku10 == EntityType.POTION) {
-            akq9 = new ThrownPotion(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.POTION) {
+            aom9 = new ThrownPotion(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.EXPERIENCE_BOTTLE) {
-            akq9 = new ThrownExperienceBottle(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.EXPERIENCE_BOTTLE) {
+            aom9 = new ThrownExperienceBottle(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.BOAT) {
-            akq9 = new Boat(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.BOAT) {
+            aom9 = new Boat(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.TNT) {
-            akq9 = new PrimedTnt(this.level, double3, double4, double5, null);
+        else if (aoq10 == EntityType.TNT) {
+            aom9 = new PrimedTnt(this.level, double3, double4, double5, null);
         }
-        else if (aku10 == EntityType.ARMOR_STAND) {
-            akq9 = new ArmorStand(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.ARMOR_STAND) {
+            aom9 = new ArmorStand(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.END_CRYSTAL) {
-            akq9 = new EndCrystal(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.END_CRYSTAL) {
+            aom9 = new EndCrystal(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.ITEM) {
-            akq9 = new ItemEntity(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.ITEM) {
+            aom9 = new ItemEntity(this.level, double3, double4, double5);
         }
-        else if (aku10 == EntityType.FALLING_BLOCK) {
-            akq9 = new FallingBlockEntity(this.level, double3, double4, double5, Block.stateById(lx.getData()));
+        else if (aoq10 == EntityType.FALLING_BLOCK) {
+            aom9 = new FallingBlockEntity(this.level, double3, double4, double5, Block.stateById(nm.getData()));
         }
-        else if (aku10 == EntityType.AREA_EFFECT_CLOUD) {
-            akq9 = new AreaEffectCloud(this.level, double3, double4, double5);
+        else if (aoq10 == EntityType.AREA_EFFECT_CLOUD) {
+            aom9 = new AreaEffectCloud(this.level, double3, double4, double5);
+        }
+        else if (aoq10 == EntityType.LIGHTNING_BOLT) {
+            aom9 = new LightningBolt(EntityType.LIGHTNING_BOLT, this.level);
         }
         else {
-            akq9 = null;
+            aom9 = null;
         }
-        if (akq9 != null) {
-            final int integer11 = lx.getId();
-            akq9.setPacketCoordinates(double3, double4, double5);
-            akq9.xRot = lx.getxRot() * 360 / 256.0f;
-            akq9.yRot = lx.getyRot() * 360 / 256.0f;
-            akq9.setId(integer11);
-            akq9.setUUID(lx.getUUID());
-            this.level.putNonPlayerEntity(integer11, akq9);
-            if (akq9 instanceof AbstractMinecart) {
-                this.minecraft.getSoundManager().play(new MinecartSoundInstance((AbstractMinecart)akq9));
+        if (aom9 != null) {
+            final int integer11 = nm.getId();
+            aom9.setPacketCoordinates(double3, double4, double5);
+            aom9.moveTo(double3, double4, double5);
+            aom9.xRot = nm.getxRot() * 360 / 256.0f;
+            aom9.yRot = nm.getyRot() * 360 / 256.0f;
+            aom9.setId(integer11);
+            aom9.setUUID(nm.getUUID());
+            this.level.putNonPlayerEntity(integer11, aom9);
+            if (aom9 instanceof AbstractMinecart) {
+                this.minecraft.getSoundManager().play(new MinecartSoundInstance((AbstractMinecart)aom9));
             }
         }
     }
     
     @Override
-    public void handleAddExperienceOrb(final ClientboundAddExperienceOrbPacket ly) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ly, this, this.minecraft);
-        final double double3 = ly.getX();
-        final double double4 = ly.getY();
-        final double double5 = ly.getZ();
-        final Entity akq9 = new ExperienceOrb(this.level, double3, double4, double5, ly.getValue());
-        akq9.setPacketCoordinates(double3, double4, double5);
-        akq9.yRot = 0.0f;
-        akq9.xRot = 0.0f;
-        akq9.setId(ly.getId());
-        this.level.putNonPlayerEntity(ly.getId(), akq9);
+    public void handleAddExperienceOrb(final ClientboundAddExperienceOrbPacket nn) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nn, this, this.minecraft);
+        final double double3 = nn.getX();
+        final double double4 = nn.getY();
+        final double double5 = nn.getZ();
+        final Entity aom9 = new ExperienceOrb(this.level, double3, double4, double5, nn.getValue());
+        aom9.setPacketCoordinates(double3, double4, double5);
+        aom9.yRot = 0.0f;
+        aom9.xRot = 0.0f;
+        aom9.setId(nn.getId());
+        this.level.putNonPlayerEntity(nn.getId(), aom9);
     }
     
     @Override
-    public void handleAddGlobalEntity(final ClientboundAddGlobalEntityPacket lz) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)lz, this, this.minecraft);
-        final double double3 = lz.getX();
-        final double double4 = lz.getY();
-        final double double5 = lz.getZ();
-        if (lz.getType() == 1) {
-            final LightningBolt avy9 = new LightningBolt(this.level, double3, double4, double5, false);
-            avy9.setPacketCoordinates(double3, double4, double5);
-            avy9.yRot = 0.0f;
-            avy9.xRot = 0.0f;
-            avy9.setId(lz.getId());
-            this.level.addLightning(avy9);
-        }
+    public void handleAddPainting(final ClientboundAddPaintingPacket np) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)np, this, this.minecraft);
+        final Painting bbd3 = new Painting(this.level, np.getPos(), np.getDirection(), np.getMotive());
+        bbd3.setId(np.getId());
+        bbd3.setUUID(np.getUUID());
+        this.level.putNonPlayerEntity(np.getId(), bbd3);
     }
     
     @Override
-    public void handleAddPainting(final ClientboundAddPaintingPacket mb) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mb, this, this.minecraft);
-        final Painting avu3 = new Painting(this.level, mb.getPos(), mb.getDirection(), mb.getMotive());
-        avu3.setId(mb.getId());
-        avu3.setUUID(mb.getUUID());
-        this.level.putNonPlayerEntity(mb.getId(), avu3);
-    }
-    
-    @Override
-    public void handleSetEntityMotion(final ClientboundSetEntityMotionPacket om) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)om, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(om.getId());
-        if (akq3 == null) {
+    public void handleSetEntityMotion(final ClientboundSetEntityMotionPacket qb) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qb, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(qb.getId());
+        if (aom3 == null) {
             return;
         }
-        akq3.lerpMotion(om.getXa() / 8000.0, om.getYa() / 8000.0, om.getZa() / 8000.0);
+        aom3.lerpMotion(qb.getXa() / 8000.0, qb.getYa() / 8000.0, qb.getZa() / 8000.0);
     }
     
     @Override
-    public void handleSetEntityData(final ClientboundSetEntityDataPacket ok) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ok, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(ok.getId());
-        if (akq3 != null && ok.getUnpackedData() != null) {
-            akq3.getEntityData().assignValues(ok.getUnpackedData());
+    public void handleSetEntityData(final ClientboundSetEntityDataPacket pz) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pz, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(pz.getId());
+        if (aom3 != null && pz.getUnpackedData() != null) {
+            aom3.getEntityData().assignValues(pz.getUnpackedData());
         }
     }
     
     @Override
-    public void handleAddPlayer(final ClientboundAddPlayerPacket mc) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mc, this, this.minecraft);
-        final double double3 = mc.getX();
-        final double double4 = mc.getY();
-        final double double5 = mc.getZ();
-        final float float9 = mc.getyRot() * 360 / 256.0f;
-        final float float10 = mc.getxRot() * 360 / 256.0f;
-        final int integer11 = mc.getEntityId();
-        final RemotePlayer dqc12 = new RemotePlayer(this.minecraft.level, this.getPlayerInfo(mc.getPlayerId()).getProfile());
-        dqc12.setId(integer11);
-        dqc12.setPosAndOldPos(double3, double4, double5);
-        dqc12.setPacketCoordinates(double3, double4, double5);
-        dqc12.absMoveTo(double3, double4, double5, float9, float10);
-        this.level.addPlayer(integer11, dqc12);
+    public void handleAddPlayer(final ClientboundAddPlayerPacket nq) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nq, this, this.minecraft);
+        final double double3 = nq.getX();
+        final double double4 = nq.getY();
+        final double double5 = nq.getZ();
+        final float float9 = nq.getyRot() * 360 / 256.0f;
+        final float float10 = nq.getxRot() * 360 / 256.0f;
+        final int integer11 = nq.getEntityId();
+        final RemotePlayer ebg12 = new RemotePlayer(this.minecraft.level, this.getPlayerInfo(nq.getPlayerId()).getProfile());
+        ebg12.setId(integer11);
+        ebg12.setPosAndOldPos(double3, double4, double5);
+        ebg12.setPacketCoordinates(double3, double4, double5);
+        ebg12.absMoveTo(double3, double4, double5, float9, float10);
+        this.level.addPlayer(integer11, ebg12);
     }
     
     @Override
-    public void handleTeleportEntity(final ClientboundTeleportEntityPacket pd) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pd, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(pd.getId());
-        if (akq3 == null) {
+    public void handleTeleportEntity(final ClientboundTeleportEntityPacket qr) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qr, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(qr.getId());
+        if (aom3 == null) {
             return;
         }
-        final double double4 = pd.getX();
-        final double double5 = pd.getY();
-        final double double6 = pd.getZ();
-        akq3.setPacketCoordinates(double4, double5, double6);
-        if (!akq3.isControlledByLocalInstance()) {
-            final float float10 = pd.getyRot() * 360 / 256.0f;
-            final float float11 = pd.getxRot() * 360 / 256.0f;
-            if (Math.abs(akq3.getX() - double4) >= 0.03125 || Math.abs(akq3.getY() - double5) >= 0.015625 || Math.abs(akq3.getZ() - double6) >= 0.03125) {
-                akq3.lerpTo(double4, double5, double6, float10, float11, 3, true);
+        final double double4 = qr.getX();
+        final double double5 = qr.getY();
+        final double double6 = qr.getZ();
+        aom3.setPacketCoordinates(double4, double5, double6);
+        if (!aom3.isControlledByLocalInstance()) {
+            final float float10 = qr.getyRot() * 360 / 256.0f;
+            final float float11 = qr.getxRot() * 360 / 256.0f;
+            if (Math.abs(aom3.getX() - double4) >= 0.03125 || Math.abs(aom3.getY() - double5) >= 0.015625 || Math.abs(aom3.getZ() - double6) >= 0.03125) {
+                aom3.lerpTo(double4, double5, double6, float10, float11, 3, true);
             }
             else {
-                akq3.lerpTo(akq3.getX(), akq3.getY(), akq3.getZ(), float10, float11, 3, true);
+                aom3.lerpTo(aom3.getX(), aom3.getY(), aom3.getZ(), float10, float11, 3, true);
             }
-            akq3.onGround = pd.isOnGround();
+            aom3.setOnGround(qr.isOnGround());
         }
     }
     
     @Override
-    public void handleSetCarriedItem(final ClientboundSetCarriedItemPacket og) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)og, this, this.minecraft);
-        if (Inventory.isHotbarSlot(og.getSlot())) {
-            this.minecraft.player.inventory.selected = og.getSlot();
+    public void handleSetCarriedItem(final ClientboundSetCarriedItemPacket pu) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pu, this, this.minecraft);
+        if (Inventory.isHotbarSlot(pu.getSlot())) {
+            this.minecraft.player.inventory.selected = pu.getSlot();
         }
     }
     
     @Override
-    public void handleMoveEntity(final ClientboundMoveEntityPacket nm) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nm, this, this.minecraft);
-        final Entity akq3 = nm.getEntity(this.level);
-        if (akq3 == null) {
+    public void handleMoveEntity(final ClientboundMoveEntityPacket pa) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pa, this, this.minecraft);
+        final Entity aom3 = pa.getEntity(this.level);
+        if (aom3 == null) {
             return;
         }
-        if (!akq3.isControlledByLocalInstance()) {
-            if (nm.hasPosition()) {
-                final Entity entity = akq3;
-                entity.xp += nm.getXa();
-                final Entity entity2 = akq3;
-                entity2.yp += nm.getYa();
-                final Entity entity3 = akq3;
-                entity3.zp += nm.getZa();
-                final Vec3 cvl4 = ClientboundMoveEntityPacket.packetToEntity(akq3.xp, akq3.yp, akq3.zp);
-                final float float5 = nm.hasRotation() ? (nm.getyRot() * 360 / 256.0f) : akq3.yRot;
-                final float float6 = nm.hasRotation() ? (nm.getxRot() * 360 / 256.0f) : akq3.xRot;
-                akq3.lerpTo(cvl4.x, cvl4.y, cvl4.z, float5, float6, 3, false);
+        if (!aom3.isControlledByLocalInstance()) {
+            if (pa.hasPosition()) {
+                final Entity entity = aom3;
+                entity.xp += pa.getXa();
+                final Entity entity2 = aom3;
+                entity2.yp += pa.getYa();
+                final Entity entity3 = aom3;
+                entity3.zp += pa.getZa();
+                final Vec3 dem4 = ClientboundMoveEntityPacket.packetToEntity(aom3.xp, aom3.yp, aom3.zp);
+                final float float5 = pa.hasRotation() ? (pa.getyRot() * 360 / 256.0f) : aom3.yRot;
+                final float float6 = pa.hasRotation() ? (pa.getxRot() * 360 / 256.0f) : aom3.xRot;
+                aom3.lerpTo(dem4.x, dem4.y, dem4.z, float5, float6, 3, false);
             }
-            else if (nm.hasRotation()) {
-                final float float7 = nm.getyRot() * 360 / 256.0f;
-                final float float5 = nm.getxRot() * 360 / 256.0f;
-                akq3.lerpTo(akq3.getX(), akq3.getY(), akq3.getZ(), float7, float5, 3, false);
+            else if (pa.hasRotation()) {
+                final float float7 = pa.getyRot() * 360 / 256.0f;
+                final float float5 = pa.getxRot() * 360 / 256.0f;
+                aom3.lerpTo(aom3.getX(), aom3.getY(), aom3.getZ(), float7, float5, 3, false);
             }
-            akq3.onGround = nm.isOnGround();
+            aom3.setOnGround(pa.isOnGround());
         }
     }
     
     @Override
-    public void handleRotateMob(final ClientboundRotateHeadPacket oc) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oc, this, this.minecraft);
-        final Entity akq3 = oc.getEntity(this.level);
-        if (akq3 == null) {
+    public void handleRotateMob(final ClientboundRotateHeadPacket pq) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pq, this, this.minecraft);
+        final Entity aom3 = pq.getEntity(this.level);
+        if (aom3 == null) {
             return;
         }
-        final float float4 = oc.getYHeadRot() * 360 / 256.0f;
-        akq3.lerpHeadTo(float4, 3);
+        final float float4 = pq.getYHeadRot() * 360 / 256.0f;
+        aom3.lerpHeadTo(float4, 3);
     }
     
     @Override
-    public void handleRemoveEntity(final ClientboundRemoveEntitiesPacket ny) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ny, this, this.minecraft);
-        for (int integer3 = 0; integer3 < ny.getEntityIds().length; ++integer3) {
-            final int integer4 = ny.getEntityIds()[integer3];
+    public void handleRemoveEntity(final ClientboundRemoveEntitiesPacket pm) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pm, this, this.minecraft);
+        for (int integer3 = 0; integer3 < pm.getEntityIds().length; ++integer3) {
+            final int integer4 = pm.getEntityIds()[integer3];
             this.level.removeEntity(integer4);
         }
     }
     
     @Override
-    public void handleMovePlayer(final ClientboundPlayerPositionPacket nw) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nw, this, this.minecraft);
-        final Player ayj3 = this.minecraft.player;
-        final Vec3 cvl4 = ayj3.getDeltaMovement();
-        final boolean boolean5 = nw.getRelativeArguments().contains(ClientboundPlayerPositionPacket.RelativeArgument.X);
-        final boolean boolean6 = nw.getRelativeArguments().contains(ClientboundPlayerPositionPacket.RelativeArgument.Y);
-        final boolean boolean7 = nw.getRelativeArguments().contains(ClientboundPlayerPositionPacket.RelativeArgument.Z);
+    public void handleMovePlayer(final ClientboundPlayerPositionPacket pk) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pk, this, this.minecraft);
+        final Player bec3 = this.minecraft.player;
+        final Vec3 dem4 = bec3.getDeltaMovement();
+        final boolean boolean5 = pk.getRelativeArguments().contains(ClientboundPlayerPositionPacket.RelativeArgument.X);
+        final boolean boolean6 = pk.getRelativeArguments().contains(ClientboundPlayerPositionPacket.RelativeArgument.Y);
+        final boolean boolean7 = pk.getRelativeArguments().contains(ClientboundPlayerPositionPacket.RelativeArgument.Z);
         double double8;
         double double9;
         if (boolean5) {
-            double8 = cvl4.x();
-            double9 = ayj3.getX() + nw.getX();
-            ayj3.xOld += nw.getX();
+            double8 = dem4.x();
+            double9 = bec3.getX() + pk.getX();
+            bec3.xOld += pk.getX();
         }
         else {
             double8 = 0.0;
-            double9 = nw.getX();
-            ayj3.xOld = double9;
+            double9 = pk.getX();
+            bec3.xOld = double9;
         }
         double double10;
         double double11;
         if (boolean6) {
-            double10 = cvl4.y();
-            double11 = ayj3.getY() + nw.getY();
-            ayj3.yOld += nw.getY();
+            double10 = dem4.y();
+            double11 = bec3.getY() + pk.getY();
+            bec3.yOld += pk.getY();
         }
         else {
             double10 = 0.0;
-            double11 = nw.getY();
-            ayj3.yOld = double11;
+            double11 = pk.getY();
+            bec3.yOld = double11;
         }
         double double12;
         double double13;
         if (boolean7) {
-            double12 = cvl4.z();
-            double13 = ayj3.getZ() + nw.getZ();
-            ayj3.zOld += nw.getZ();
+            double12 = dem4.z();
+            double13 = bec3.getZ() + pk.getZ();
+            bec3.zOld += pk.getZ();
         }
         else {
             double12 = 0.0;
-            double13 = nw.getZ();
-            ayj3.zOld = double13;
+            double13 = pk.getZ();
+            bec3.zOld = double13;
         }
-        ayj3.setPosRaw(double9, double11, double13);
-        ayj3.xo = double9;
-        ayj3.yo = double11;
-        ayj3.zo = double13;
-        ayj3.setDeltaMovement(double8, double10, double12);
-        float float20 = nw.getYRot();
-        float float21 = nw.getXRot();
-        if (nw.getRelativeArguments().contains(ClientboundPlayerPositionPacket.RelativeArgument.X_ROT)) {
-            float21 += ayj3.xRot;
+        if (bec3.tickCount > 0 && bec3.getVehicle() != null) {
+            bec3.removeVehicle();
         }
-        if (nw.getRelativeArguments().contains(ClientboundPlayerPositionPacket.RelativeArgument.Y_ROT)) {
-            float20 += ayj3.yRot;
+        bec3.setPosRaw(double9, double11, double13);
+        bec3.xo = double9;
+        bec3.yo = double11;
+        bec3.zo = double13;
+        bec3.setDeltaMovement(double8, double10, double12);
+        float float20 = pk.getYRot();
+        float float21 = pk.getXRot();
+        if (pk.getRelativeArguments().contains(ClientboundPlayerPositionPacket.RelativeArgument.X_ROT)) {
+            float21 += bec3.xRot;
         }
-        ayj3.absMoveTo(double9, double11, double13, float20, float21);
-        this.connection.send(new ServerboundAcceptTeleportationPacket(nw.getId()));
-        this.connection.send(new ServerboundMovePlayerPacket.PosRot(ayj3.getX(), ayj3.getY(), ayj3.getZ(), ayj3.yRot, ayj3.xRot, false));
+        if (pk.getRelativeArguments().contains(ClientboundPlayerPositionPacket.RelativeArgument.Y_ROT)) {
+            float20 += bec3.yRot;
+        }
+        bec3.absMoveTo(double9, double11, double13, float20, float21);
+        this.connection.send(new ServerboundAcceptTeleportationPacket(pk.getId()));
+        this.connection.send(new ServerboundMovePlayerPacket.PosRot(bec3.getX(), bec3.getY(), bec3.getZ(), bec3.yRot, bec3.xRot, false));
         if (!this.started) {
             this.started = true;
             this.minecraft.setScreen(null);
@@ -757,636 +774,666 @@ public class ClientPacketListener implements ClientGamePacketListener {
     }
     
     @Override
-    public void handleChunkBlocksUpdate(final ClientboundChunkBlocksUpdatePacket mn) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mn, this, this.minecraft);
-        for (final ClientboundChunkBlocksUpdatePacket.BlockUpdate a6 : mn.getUpdates()) {
+    public void handleChunkBlocksUpdate(final ClientboundChunkBlocksUpdatePacket ob) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ob, this, this.minecraft);
+        for (final ClientboundChunkBlocksUpdatePacket.BlockUpdate a6 : ob.getUpdates()) {
             this.level.setKnownState(a6.getPos(), a6.getBlock());
         }
     }
     
     @Override
-    public void handleLevelChunk(final ClientboundLevelChunkPacket nf) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nf, this, this.minecraft);
-        final int integer3 = nf.getX();
-        final int integer4 = nf.getZ();
-        final LevelChunk cal5 = this.level.getChunkSource().replaceWithPacketData(integer3, integer4, nf.getBiomes(), nf.getReadBuffer(), nf.getHeightmaps(), nf.getAvailableSections());
-        if (cal5 != null && nf.isFullChunk()) {
-            this.level.reAddEntitiesToChunk(cal5);
+    public void handleLevelChunk(final ClientboundLevelChunkPacket ot) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ot, this, this.minecraft);
+        final int integer3 = ot.getX();
+        final int integer4 = ot.getZ();
+        final LevelChunk chj5 = this.level.getChunkSource().replaceWithPacketData(integer3, integer4, ot.getBiomes(), ot.getReadBuffer(), ot.getHeightmaps(), ot.getAvailableSections(), ot.isFullChunk());
+        if (chj5 != null && ot.isFullChunk()) {
+            this.level.reAddEntitiesToChunk(chj5);
         }
         for (int integer5 = 0; integer5 < 16; ++integer5) {
             this.level.setSectionDirtyWithNeighbors(integer3, integer5, integer4);
         }
-        for (final CompoundTag jt7 : nf.getBlockEntitiesTags()) {
-            final BlockPos fk8 = new BlockPos(jt7.getInt("x"), jt7.getInt("y"), jt7.getInt("z"));
-            final BlockEntity bwl9 = this.level.getBlockEntity(fk8);
-            if (bwl9 != null) {
-                bwl9.load(jt7);
+        for (final CompoundTag le7 : ot.getBlockEntitiesTags()) {
+            final BlockPos fu2 = new BlockPos(le7.getInt("x"), le7.getInt("y"), le7.getInt("z"));
+            final BlockEntity cdl9 = this.level.getBlockEntity(fu2);
+            if (cdl9 != null) {
+                cdl9.load(this.level.getBlockState(fu2), le7);
             }
         }
+        if (!ot.forgetOldData()) {
+            this.level.getLightEngine().enableLightSources(chj5.getPos(), false);
+            final int integer5 = ot.getAvailableSections();
+            for (int integer6 = 0; integer6 < 16; ++integer6) {
+                if ((integer5 & 1 << integer6) != 0x0) {
+                    this.level.getLightEngine().queueSectionData(LightLayer.BLOCK, SectionPos.of(chj5.getPos(), integer6), new DataLayer(), false);
+                    this.level.getLightEngine().queueSectionData(LightLayer.SKY, SectionPos.of(chj5.getPos(), integer6), new DataLayer(), false);
+                }
+            }
+            this.level.getLightEngine().runUpdates(Integer.MAX_VALUE, true, true);
+            this.level.getLightEngine().enableLightSources(chj5.getPos(), true);
+            chj5.getLights().forEach(fu -> this.level.getLightEngine().onBlockEmissionIncrease(fu, chj5.getLightEmission(fu)));
+        }
     }
     
     @Override
-    public void handleForgetLevelChunk(final ClientboundForgetLevelChunkPacket nb) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nb, this, this.minecraft);
-        final int integer3 = nb.getX();
-        final int integer4 = nb.getZ();
-        final ClientChunkCache dnm5 = this.level.getChunkSource();
-        dnm5.drop(integer3, integer4);
-        final LevelLightEngine coa6 = dnm5.getLightEngine();
+    public void handleForgetLevelChunk(final ClientboundForgetLevelChunkPacket op) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)op, this, this.minecraft);
+        final int integer3 = op.getX();
+        final int integer4 = op.getZ();
+        final ClientChunkCache dyk5 = this.level.getChunkSource();
+        dyk5.drop(integer3, integer4);
+        final LevelLightEngine cwr6 = dyk5.getLightEngine();
         for (int integer5 = 0; integer5 < 16; ++integer5) {
             this.level.setSectionDirtyWithNeighbors(integer3, integer5, integer4);
-            coa6.updateSectionStatus(SectionPos.of(integer3, integer5, integer4), true);
+            cwr6.updateSectionStatus(SectionPos.of(integer3, integer5, integer4), true);
         }
-        coa6.enableLightSources(new ChunkPos(integer3, integer4), false);
+        cwr6.enableLightSources(new ChunkPos(integer3, integer4), false);
     }
     
     @Override
-    public void handleBlockUpdate(final ClientboundBlockUpdatePacket mj) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mj, this, this.minecraft);
-        this.level.setKnownState(mj.getPos(), mj.getBlockState());
+    public void handleBlockUpdate(final ClientboundBlockUpdatePacket nx) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nx, this, this.minecraft);
+        this.level.setKnownState(nx.getPos(), nx.getBlockState());
     }
     
     @Override
-    public void handleDisconnect(final ClientboundDisconnectPacket my) {
-        this.connection.disconnect(my.getReason());
+    public void handleDisconnect(final ClientboundDisconnectPacket om) {
+        this.connection.disconnect(om.getReason());
     }
     
     @Override
-    public void onDisconnect(final Component lf) {
+    public void onDisconnect(final Component mr) {
         this.minecraft.clearLevel();
         if (this.callbackScreen != null) {
-            if (this.callbackScreen instanceof RealmsScreenProxy) {
-                this.minecraft.setScreen(new DisconnectedRealmsScreen(((RealmsScreenProxy)this.callbackScreen).getScreen(), "disconnect.lost", lf).getProxy());
+            if (this.callbackScreen instanceof RealmsScreen) {
+                this.minecraft.setScreen(new DisconnectedRealmsScreen(this.callbackScreen, "disconnect.lost", mr));
             }
             else {
-                this.minecraft.setScreen(new DisconnectedScreen(this.callbackScreen, "disconnect.lost", lf));
+                this.minecraft.setScreen(new DisconnectedScreen(this.callbackScreen, "disconnect.lost", mr));
             }
         }
         else {
-            this.minecraft.setScreen(new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()), "disconnect.lost", lf));
+            this.minecraft.setScreen(new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()), "disconnect.lost", mr));
         }
     }
     
-    public void send(final Packet<?> lt) {
-        this.connection.send(lt);
+    public void send(final Packet<?> ni) {
+        this.connection.send(ni);
     }
     
     @Override
-    public void handleTakeItemEntity(final ClientboundTakeItemEntityPacket pc) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pc, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(pc.getItemId());
-        LivingEntity akz4 = (LivingEntity)this.level.getEntity(pc.getPlayerId());
-        if (akz4 == null) {
-            akz4 = this.minecraft.player;
+    public void handleTakeItemEntity(final ClientboundTakeItemEntityPacket qq) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qq, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(qq.getItemId());
+        LivingEntity aoy4 = (LivingEntity)this.level.getEntity(qq.getPlayerId());
+        if (aoy4 == null) {
+            aoy4 = this.minecraft.player;
         }
-        if (akq3 != null) {
-            if (akq3 instanceof ExperienceOrb) {
-                this.level.playLocalSound(akq3.getX(), akq3.getY(), akq3.getZ(), SoundEvents.EXPERIENCE_ORB_PICKUP, SoundSource.PLAYERS, 0.1f, (this.random.nextFloat() - this.random.nextFloat()) * 0.35f + 0.9f, false);
+        if (aom3 != null) {
+            if (aom3 instanceof ExperienceOrb) {
+                this.level.playLocalSound(aom3.getX(), aom3.getY(), aom3.getZ(), SoundEvents.EXPERIENCE_ORB_PICKUP, SoundSource.PLAYERS, 0.1f, (this.random.nextFloat() - this.random.nextFloat()) * 0.35f + 0.9f, false);
             }
             else {
-                this.level.playLocalSound(akq3.getX(), akq3.getY(), akq3.getZ(), SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2f, (this.random.nextFloat() - this.random.nextFloat()) * 1.4f + 2.0f, false);
+                this.level.playLocalSound(aom3.getX(), aom3.getY(), aom3.getZ(), SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2f, (this.random.nextFloat() - this.random.nextFloat()) * 1.4f + 2.0f, false);
             }
-            if (akq3 instanceof ItemEntity) {
-                ((ItemEntity)akq3).getItem().setCount(pc.getAmount());
+            this.minecraft.particleEngine.add(new ItemPickupParticle(this.minecraft.getEntityRenderDispatcher(), this.minecraft.renderBuffers(), this.level, aom3, aoy4));
+            if (aom3 instanceof ItemEntity) {
+                final ItemEntity bbg5 = (ItemEntity)aom3;
+                final ItemStack bki6 = bbg5.getItem();
+                bki6.shrink(qq.getAmount());
+                if (bki6.isEmpty()) {
+                    this.level.removeEntity(qq.getItemId());
+                }
+            }
+            else {
+                this.level.removeEntity(qq.getItemId());
             }
-            this.minecraft.particleEngine.add(new ItemPickupParticle(this.minecraft.getEntityRenderDispatcher(), this.minecraft.renderBuffers(), this.level, akq3, akz4));
-            this.level.removeEntity(pc.getItemId());
         }
     }
     
     @Override
-    public void handleChat(final ClientboundChatPacket mm) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mm, this, this.minecraft);
-        this.minecraft.gui.handleChat(mm.getType(), mm.getMessage());
+    public void handleChat(final ClientboundChatPacket oa) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oa, this, this.minecraft);
+        this.minecraft.gui.handleChat(oa.getType(), oa.getMessage(), oa.getSender());
     }
     
     @Override
-    public void handleAnimate(final ClientboundAnimatePacket md) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)md, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(md.getId());
-        if (akq3 == null) {
+    public void handleAnimate(final ClientboundAnimatePacket nr) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nr, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(nr.getId());
+        if (aom3 == null) {
             return;
         }
-        if (md.getAction() == 0) {
-            final LivingEntity akz4 = (LivingEntity)akq3;
-            akz4.swing(InteractionHand.MAIN_HAND);
+        if (nr.getAction() == 0) {
+            final LivingEntity aoy4 = (LivingEntity)aom3;
+            aoy4.swing(InteractionHand.MAIN_HAND);
         }
-        else if (md.getAction() == 3) {
-            final LivingEntity akz4 = (LivingEntity)akq3;
-            akz4.swing(InteractionHand.OFF_HAND);
+        else if (nr.getAction() == 3) {
+            final LivingEntity aoy4 = (LivingEntity)aom3;
+            aoy4.swing(InteractionHand.OFF_HAND);
         }
-        else if (md.getAction() == 1) {
-            akq3.animateHurt();
+        else if (nr.getAction() == 1) {
+            aom3.animateHurt();
         }
-        else if (md.getAction() == 2) {
-            final Player ayj4 = (Player)akq3;
-            ayj4.stopSleepInBed(false, false);
+        else if (nr.getAction() == 2) {
+            final Player bec4 = (Player)aom3;
+            bec4.stopSleepInBed(false, false);
         }
-        else if (md.getAction() == 4) {
-            this.minecraft.particleEngine.createTrackingEmitter(akq3, ParticleTypes.CRIT);
+        else if (nr.getAction() == 4) {
+            this.minecraft.particleEngine.createTrackingEmitter(aom3, ParticleTypes.CRIT);
         }
-        else if (md.getAction() == 5) {
-            this.minecraft.particleEngine.createTrackingEmitter(akq3, ParticleTypes.ENCHANTED_HIT);
+        else if (nr.getAction() == 5) {
+            this.minecraft.particleEngine.createTrackingEmitter(aom3, ParticleTypes.ENCHANTED_HIT);
         }
     }
     
     @Override
-    public void handleAddMob(final ClientboundAddMobPacket ma) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ma, this, this.minecraft);
-        final double double3 = ma.getX();
-        final double double4 = ma.getY();
-        final double double5 = ma.getZ();
-        final float float9 = ma.getyRot() * 360 / 256.0f;
-        final float float10 = ma.getxRot() * 360 / 256.0f;
-        final LivingEntity akz11 = (LivingEntity)EntityType.create(ma.getType(), this.minecraft.level);
-        if (akz11 != null) {
-            akz11.setPacketCoordinates(double3, double4, double5);
-            akz11.yBodyRot = ma.getyHeadRot() * 360 / 256.0f;
-            akz11.yHeadRot = ma.getyHeadRot() * 360 / 256.0f;
-            if (akz11 instanceof EnderDragon) {
-                final EnderDragonPart[] arr12 = ((EnderDragon)akz11).getSubEntities();
+    public void handleAddMob(final ClientboundAddMobPacket no) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)no, this, this.minecraft);
+        final double double3 = no.getX();
+        final double double4 = no.getY();
+        final double double5 = no.getZ();
+        final float float9 = no.getyRot() * 360 / 256.0f;
+        final float float10 = no.getxRot() * 360 / 256.0f;
+        final LivingEntity aoy11 = (LivingEntity)EntityType.create(no.getType(), this.minecraft.level);
+        if (aoy11 != null) {
+            aoy11.setPacketCoordinates(double3, double4, double5);
+            aoy11.yBodyRot = no.getyHeadRot() * 360 / 256.0f;
+            aoy11.yHeadRot = no.getyHeadRot() * 360 / 256.0f;
+            if (aoy11 instanceof EnderDragon) {
+                final EnderDragonPart[] arr12 = ((EnderDragon)aoy11).getSubEntities();
                 for (int integer13 = 0; integer13 < arr12.length; ++integer13) {
-                    arr12[integer13].setId(integer13 + ma.getId());
+                    arr12[integer13].setId(integer13 + no.getId());
                 }
             }
-            akz11.setId(ma.getId());
-            akz11.setUUID(ma.getUUID());
-            akz11.absMoveTo(double3, double4, double5, float9, float10);
-            akz11.setDeltaMovement(ma.getXd() / 8000.0f, ma.getYd() / 8000.0f, ma.getZd() / 8000.0f);
-            this.level.putNonPlayerEntity(ma.getId(), akz11);
-            if (akz11 instanceof Bee) {
-                final boolean boolean12 = ((Bee)akz11).isAngry();
-                BeeSoundInstance eco13;
+            aoy11.setId(no.getId());
+            aoy11.setUUID(no.getUUID());
+            aoy11.absMoveTo(double3, double4, double5, float9, float10);
+            aoy11.setDeltaMovement(no.getXd() / 8000.0f, no.getYd() / 8000.0f, no.getZd() / 8000.0f);
+            this.level.putNonPlayerEntity(no.getId(), aoy11);
+            if (aoy11 instanceof Bee) {
+                final boolean boolean12 = ((Bee)aoy11).isAngry();
+                BeeSoundInstance eoa13;
                 if (boolean12) {
-                    eco13 = new BeeAggressiveSoundInstance((Bee)akz11);
+                    eoa13 = new BeeAggressiveSoundInstance((Bee)aoy11);
                 }
                 else {
-                    eco13 = new BeeFlyingSoundInstance((Bee)akz11);
+                    eoa13 = new BeeFlyingSoundInstance((Bee)aoy11);
                 }
-                this.minecraft.getSoundManager().play(eco13);
+                this.minecraft.getSoundManager().queueTickingSound(eoa13);
             }
         }
         else {
-            ClientPacketListener.LOGGER.warn("Skipping Entity with id {}", ma.getType());
+            ClientPacketListener.LOGGER.warn("Skipping Entity with id {}", no.getType());
         }
     }
     
     @Override
-    public void handleSetTime(final ClientboundSetTimePacket ov) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ov, this, this.minecraft);
-        this.minecraft.level.setGameTime(ov.getGameTime());
-        this.minecraft.level.setDayTime(ov.getDayTime());
+    public void handleSetTime(final ClientboundSetTimePacket qj) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qj, this, this.minecraft);
+        this.minecraft.level.setGameTime(qj.getGameTime());
+        this.minecraft.level.setDayTime(qj.getDayTime());
     }
     
     @Override
-    public void handleSetSpawn(final ClientboundSetSpawnPositionPacket ou) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ou, this, this.minecraft);
-        this.minecraft.player.setRespawnPosition(ou.getPos(), true, false);
-        this.minecraft.level.getLevelData().setSpawn(ou.getPos());
+    public void handleSetSpawn(final ClientboundSetDefaultSpawnPositionPacket px) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)px, this, this.minecraft);
+        this.minecraft.level.setDefaultSpawnPos(px.getPos());
     }
     
     @Override
-    public void handleSetEntityPassengersPacket(final ClientboundSetPassengersPacket or) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)or, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(or.getVehicle());
-        if (akq3 == null) {
+    public void handleSetEntityPassengersPacket(final ClientboundSetPassengersPacket qg) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qg, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(qg.getVehicle());
+        if (aom3 == null) {
             ClientPacketListener.LOGGER.warn("Received passengers for unknown entity");
             return;
         }
-        final boolean boolean4 = akq3.hasIndirectPassenger(this.minecraft.player);
-        akq3.ejectPassengers();
-        for (final int integer8 : or.getPassengers()) {
-            final Entity akq4 = this.level.getEntity(integer8);
-            if (akq4 != null) {
-                akq4.startRiding(akq3, true);
-                if (akq4 == this.minecraft.player && !boolean4) {
-                    this.minecraft.gui.setOverlayMessage(I18n.get("mount.onboard", this.minecraft.options.keyShift.getTranslatedKeyMessage()), false);
+        final boolean boolean4 = aom3.hasIndirectPassenger(this.minecraft.player);
+        aom3.ejectPassengers();
+        for (final int integer8 : qg.getPassengers()) {
+            final Entity aom4 = this.level.getEntity(integer8);
+            if (aom4 != null) {
+                aom4.startRiding(aom3, true);
+                if (aom4 == this.minecraft.player && !boolean4) {
+                    this.minecraft.gui.setOverlayMessage(new TranslatableComponent("mount.onboard", new Object[] { this.minecraft.options.keyShift.getTranslatedKeyMessage() }), false);
                 }
             }
         }
     }
     
     @Override
-    public void handleEntityLinkPacket(final ClientboundSetEntityLinkPacket ol) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ol, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(ol.getSourceId());
-        if (akq3 instanceof Mob) {
-            ((Mob)akq3).setDelayedLeashHolderId(ol.getDestId());
+    public void handleEntityLinkPacket(final ClientboundSetEntityLinkPacket qa) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qa, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(qa.getSourceId());
+        if (aom3 instanceof Mob) {
+            ((Mob)aom3).setDelayedLeashHolderId(qa.getDestId());
         }
     }
     
-    private static ItemStack findTotem(final Player ayj) {
-        for (final InteractionHand ajk5 : InteractionHand.values()) {
-            final ItemStack ben6 = ayj.getItemInHand(ajk5);
-            if (ben6.getItem() == Items.TOTEM_OF_UNDYING) {
-                return ben6;
+    private static ItemStack findTotem(final Player bec) {
+        for (final InteractionHand anf5 : InteractionHand.values()) {
+            final ItemStack bki6 = bec.getItemInHand(anf5);
+            if (bki6.getItem() == Items.TOTEM_OF_UNDYING) {
+                return bki6;
             }
         }
         return new ItemStack(Items.TOTEM_OF_UNDYING);
     }
     
     @Override
-    public void handleEntityEvent(final ClientboundEntityEventPacket mz) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mz, this, this.minecraft);
-        final Entity akq3 = mz.getEntity(this.level);
-        if (akq3 != null) {
-            if (mz.getEventId() == 21) {
-                this.minecraft.getSoundManager().play(new GuardianAttackSoundInstance((Guardian)akq3));
+    public void handleEntityEvent(final ClientboundEntityEventPacket on) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)on, this, this.minecraft);
+        final Entity aom3 = on.getEntity(this.level);
+        if (aom3 != null) {
+            if (on.getEventId() == 21) {
+                this.minecraft.getSoundManager().play(new GuardianAttackSoundInstance((Guardian)aom3));
             }
-            else if (mz.getEventId() == 35) {
+            else if (on.getEventId() == 35) {
                 final int integer4 = 40;
-                this.minecraft.particleEngine.createTrackingEmitter(akq3, ParticleTypes.TOTEM_OF_UNDYING, 30);
-                this.level.playLocalSound(akq3.getX(), akq3.getY(), akq3.getZ(), SoundEvents.TOTEM_USE, akq3.getSoundSource(), 1.0f, 1.0f, false);
-                if (akq3 == this.minecraft.player) {
+                this.minecraft.particleEngine.createTrackingEmitter(aom3, ParticleTypes.TOTEM_OF_UNDYING, 30);
+                this.level.playLocalSound(aom3.getX(), aom3.getY(), aom3.getZ(), SoundEvents.TOTEM_USE, aom3.getSoundSource(), 1.0f, 1.0f, false);
+                if (aom3 == this.minecraft.player) {
                     this.minecraft.gameRenderer.displayItemActivation(findTotem(this.minecraft.player));
                 }
             }
             else {
-                akq3.handleEntityEvent(mz.getEventId());
+                aom3.handleEntityEvent(on.getEventId());
             }
         }
     }
     
     @Override
-    public void handleSetHealth(final ClientboundSetHealthPacket op) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)op, this, this.minecraft);
-        this.minecraft.player.hurtTo(op.getHealth());
-        this.minecraft.player.getFoodData().setFoodLevel(op.getFood());
-        this.minecraft.player.getFoodData().setSaturation(op.getSaturation());
+    public void handleSetHealth(final ClientboundSetHealthPacket qe) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qe, this, this.minecraft);
+        this.minecraft.player.hurtTo(qe.getHealth());
+        this.minecraft.player.getFoodData().setFoodLevel(qe.getFood());
+        this.minecraft.player.getFoodData().setSaturation(qe.getSaturation());
     }
     
     @Override
-    public void handleSetExperience(final ClientboundSetExperiencePacket oo) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oo, this, this.minecraft);
-        this.minecraft.player.setExperienceValues(oo.getExperienceProgress(), oo.getTotalExperience(), oo.getExperienceLevel());
+    public void handleSetExperience(final ClientboundSetExperiencePacket qd) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qd, this, this.minecraft);
+        this.minecraft.player.setExperienceValues(qd.getExperienceProgress(), qd.getTotalExperience(), qd.getExperienceLevel());
     }
     
     @Override
-    public void handleRespawn(final ClientboundRespawnPacket ob) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ob, this, this.minecraft);
-        final DimensionType cbi3 = ob.getDimension();
-        final LocalPlayer dqb4 = this.minecraft.player;
-        final int integer5 = dqb4.getId();
-        if (cbi3 != dqb4.dimension) {
-            this.started = false;
-            final Scoreboard cwl6 = this.level.getScoreboard();
-            (this.level = new ClientLevel(this, new LevelSettings(ob.getSeed(), ob.getPlayerGameType(), false, this.minecraft.level.getLevelData().isHardcore(), ob.getLevelType()), ob.getDimension(), this.serverChunkRadius, this.minecraft.getProfiler(), this.minecraft.levelRenderer)).setScoreboard(cwl6);
+    public void handleRespawn(final ClientboundRespawnPacket pp) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pp, this, this.minecraft);
+        final ResourceKey<DimensionType> ug3 = pp.getDimensionType();
+        final ResourceKey<Level> ug4 = pp.getDimension();
+        final DimensionType cif5 = this.registryAccess.dimensionTypes().get(ug3);
+        final LocalPlayer ebf6 = this.minecraft.player;
+        final int integer7 = ebf6.getId();
+        this.started = false;
+        if (ug4 != ebf6.level.dimension()) {
+            final Scoreboard dfm8 = this.level.getScoreboard();
+            final boolean boolean9 = pp.isDebug();
+            final boolean boolean10 = pp.isFlat();
+            final ClientLevel.ClientLevelData a11 = new ClientLevel.ClientLevelData(this.levelData.getDifficulty(), this.levelData.isHardcore(), boolean10);
+            this.levelData = a11;
+            (this.level = new ClientLevel(this, a11, ug4, ug3, cif5, this.serverChunkRadius, this.minecraft::getProfiler, this.minecraft.levelRenderer, boolean9, pp.getSeed())).setScoreboard(dfm8);
             this.minecraft.setLevel(this.level);
             this.minecraft.setScreen(new ReceivingLevelScreen());
         }
-        this.level.validateSpawn();
         this.level.removeAllPendingEntityRemovals();
-        final String string6 = dqb4.getServerBrand();
+        final String string8 = ebf6.getServerBrand();
         this.minecraft.cameraEntity = null;
-        final LocalPlayer dqb5 = this.minecraft.gameMode.createPlayer(this.level, dqb4.getStats(), dqb4.getRecipeBook());
-        dqb5.setId(integer5);
-        dqb5.dimension = cbi3;
-        this.minecraft.player = dqb5;
-        this.minecraft.cameraEntity = dqb5;
-        dqb5.getEntityData().assignValues(dqb4.getEntityData().getAll());
-        dqb5.getAttributes().assignValues(dqb4.getAttributes());
-        dqb5.resetPos();
-        dqb5.setServerBrand(string6);
-        this.level.addPlayer(integer5, dqb5);
-        dqb5.yRot = -180.0f;
-        dqb5.input = new KeyboardInput(this.minecraft.options);
-        this.minecraft.gameMode.adjustPlayer(dqb5);
-        dqb5.setReducedDebugInfo(dqb4.isReducedDebugInfo());
-        dqb5.setShowDeathScreen(dqb4.shouldShowDeathScreen());
+        final LocalPlayer ebf7 = this.minecraft.gameMode.createPlayer(this.level, ebf6.getStats(), ebf6.getRecipeBook(), ebf6.isShiftKeyDown(), ebf6.isSprinting());
+        ebf7.setId(integer7);
+        this.minecraft.player = ebf7;
+        if (ug4 != ebf6.level.dimension()) {
+            this.minecraft.getMusicManager().stopPlaying();
+        }
+        this.minecraft.cameraEntity = ebf7;
+        ebf7.getEntityData().assignValues(ebf6.getEntityData().getAll());
+        if (pp.shouldKeepAllPlayerData()) {
+            ebf7.getAttributes().assignValues(ebf6.getAttributes());
+        }
+        ebf7.resetPos();
+        ebf7.setServerBrand(string8);
+        this.level.addPlayer(integer7, ebf7);
+        ebf7.yRot = -180.0f;
+        ebf7.input = new KeyboardInput(this.minecraft.options);
+        this.minecraft.gameMode.adjustPlayer(ebf7);
+        ebf7.setReducedDebugInfo(ebf6.isReducedDebugInfo());
+        ebf7.setShowDeathScreen(ebf6.shouldShowDeathScreen());
         if (this.minecraft.screen instanceof DeathScreen) {
             this.minecraft.setScreen(null);
         }
-        this.minecraft.gameMode.setLocalMode(ob.getPlayerGameType());
+        this.minecraft.gameMode.setLocalMode(pp.getPlayerGameType());
+        this.minecraft.gameMode.setPreviousLocalMode(pp.getPreviousPlayerGameType());
     }
     
     @Override
-    public void handleExplosion(final ClientboundExplodePacket na) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)na, this, this.minecraft);
-        final Explosion bjp3 = new Explosion(this.minecraft.level, null, na.getX(), na.getY(), na.getZ(), na.getPower(), na.getToBlow());
-        bjp3.finalizeExplosion(true);
-        this.minecraft.player.setDeltaMovement(this.minecraft.player.getDeltaMovement().add(na.getKnockbackX(), na.getKnockbackY(), na.getKnockbackZ()));
+    public void handleExplosion(final ClientboundExplodePacket oo) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oo, this, this.minecraft);
+        final Explosion bpt3 = new Explosion(this.minecraft.level, null, oo.getX(), oo.getY(), oo.getZ(), oo.getPower(), oo.getToBlow());
+        bpt3.finalizeExplosion(true);
+        this.minecraft.player.setDeltaMovement(this.minecraft.player.getDeltaMovement().add(oo.getKnockbackX(), oo.getKnockbackY(), oo.getKnockbackZ()));
     }
     
     @Override
-    public void handleHorseScreenOpen(final ClientboundHorseScreenOpenPacket nd) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nd, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(nd.getEntityId());
-        if (akq3 instanceof AbstractHorse) {
-            final LocalPlayer dqb4 = this.minecraft.player;
-            final AbstractHorse aue5 = (AbstractHorse)akq3;
-            final SimpleContainer ajq6 = new SimpleContainer(nd.getSize());
-            final HorseInventoryMenu bbj7 = new HorseInventoryMenu(nd.getContainerId(), dqb4.inventory, ajq6, aue5);
-            dqb4.containerMenu = bbj7;
-            this.minecraft.setScreen(new HorseInventoryScreen(bbj7, dqb4.inventory, aue5));
+    public void handleHorseScreenOpen(final ClientboundHorseScreenOpenPacket or) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)or, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(or.getEntityId());
+        if (aom3 instanceof AbstractHorse) {
+            final LocalPlayer ebf4 = this.minecraft.player;
+            final AbstractHorse azm5 = (AbstractHorse)aom3;
+            final SimpleContainer anm6 = new SimpleContainer(or.getSize());
+            final HorseInventoryMenu bhe7 = new HorseInventoryMenu(or.getContainerId(), ebf4.inventory, anm6, azm5);
+            ebf4.containerMenu = bhe7;
+            this.minecraft.setScreen(new HorseInventoryScreen(bhe7, ebf4.inventory, azm5));
         }
     }
     
     @Override
-    public void handleOpenScreen(final ClientboundOpenScreenPacket np) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)np, this, this.minecraft);
-        MenuScreens.create(np.getType(), this.minecraft, np.getContainerId(), np.getTitle());
+    public void handleOpenScreen(final ClientboundOpenScreenPacket pd) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pd, this, this.minecraft);
+        MenuScreens.create(pd.getType(), this.minecraft, pd.getContainerId(), pd.getTitle());
     }
     
     @Override
-    public void handleContainerSetSlot(final ClientboundContainerSetSlotPacket mu) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mu, this, this.minecraft);
-        final Player ayj3 = this.minecraft.player;
-        final ItemStack ben4 = mu.getItem();
-        final int integer5 = mu.getSlot();
-        this.minecraft.getTutorial().onGetItem(ben4);
-        if (mu.getContainerId() == -1) {
+    public void handleContainerSetSlot(final ClientboundContainerSetSlotPacket oi) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oi, this, this.minecraft);
+        final Player bec3 = this.minecraft.player;
+        final ItemStack bki4 = oi.getItem();
+        final int integer5 = oi.getSlot();
+        this.minecraft.getTutorial().onGetItem(bki4);
+        if (oi.getContainerId() == -1) {
             if (!(this.minecraft.screen instanceof CreativeModeInventoryScreen)) {
-                ayj3.inventory.setCarried(ben4);
+                bec3.inventory.setCarried(bki4);
             }
         }
-        else if (mu.getContainerId() == -2) {
-            ayj3.inventory.setItem(integer5, ben4);
+        else if (oi.getContainerId() == -2) {
+            bec3.inventory.setItem(integer5, bki4);
         }
         else {
             boolean boolean6 = false;
             if (this.minecraft.screen instanceof CreativeModeInventoryScreen) {
-                final CreativeModeInventoryScreen dhi7 = (CreativeModeInventoryScreen)this.minecraft.screen;
-                boolean6 = (dhi7.getSelectedTab() != CreativeModeTab.TAB_INVENTORY.getId());
+                final CreativeModeInventoryScreen dsa7 = (CreativeModeInventoryScreen)this.minecraft.screen;
+                boolean6 = (dsa7.getSelectedTab() != CreativeModeTab.TAB_INVENTORY.getId());
             }
-            if (mu.getContainerId() == 0 && mu.getSlot() >= 36 && integer5 < 45) {
-                if (!ben4.isEmpty()) {
-                    final ItemStack ben5 = ayj3.inventoryMenu.getSlot(integer5).getItem();
-                    if (ben5.isEmpty() || ben5.getCount() < ben4.getCount()) {
-                        ben4.setPopTime(5);
+            if (oi.getContainerId() == 0 && oi.getSlot() >= 36 && integer5 < 45) {
+                if (!bki4.isEmpty()) {
+                    final ItemStack bki5 = bec3.inventoryMenu.getSlot(integer5).getItem();
+                    if (bki5.isEmpty() || bki5.getCount() < bki4.getCount()) {
+                        bki4.setPopTime(5);
                     }
                 }
-                ayj3.inventoryMenu.setItem(integer5, ben4);
+                bec3.inventoryMenu.setItem(integer5, bki4);
             }
-            else if (mu.getContainerId() == ayj3.containerMenu.containerId && (mu.getContainerId() != 0 || !boolean6)) {
-                ayj3.containerMenu.setItem(integer5, ben4);
+            else if (oi.getContainerId() == bec3.containerMenu.containerId && (oi.getContainerId() != 0 || !boolean6)) {
+                bec3.containerMenu.setItem(integer5, bki4);
             }
         }
     }
     
     @Override
-    public void handleContainerAck(final ClientboundContainerAckPacket mq) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mq, this, this.minecraft);
-        AbstractContainerMenu ban3 = null;
-        final Player ayj4 = this.minecraft.player;
-        if (mq.getContainerId() == 0) {
-            ban3 = ayj4.inventoryMenu;
+    public void handleContainerAck(final ClientboundContainerAckPacket oe) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oe, this, this.minecraft);
+        AbstractContainerMenu bgi3 = null;
+        final Player bec4 = this.minecraft.player;
+        if (oe.getContainerId() == 0) {
+            bgi3 = bec4.inventoryMenu;
         }
-        else if (mq.getContainerId() == ayj4.containerMenu.containerId) {
-            ban3 = ayj4.containerMenu;
+        else if (oe.getContainerId() == bec4.containerMenu.containerId) {
+            bgi3 = bec4.containerMenu;
         }
-        if (ban3 != null && !mq.isAccepted()) {
-            this.send(new ServerboundContainerAckPacket(mq.getContainerId(), mq.getUid(), true));
+        if (bgi3 != null && !oe.isAccepted()) {
+            this.send(new ServerboundContainerAckPacket(oe.getContainerId(), oe.getUid(), true));
         }
     }
     
     @Override
-    public void handleContainerContent(final ClientboundContainerSetContentPacket ms) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ms, this, this.minecraft);
-        final Player ayj3 = this.minecraft.player;
-        if (ms.getContainerId() == 0) {
-            ayj3.inventoryMenu.setAll(ms.getItems());
+    public void handleContainerContent(final ClientboundContainerSetContentPacket og) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)og, this, this.minecraft);
+        final Player bec3 = this.minecraft.player;
+        if (og.getContainerId() == 0) {
+            bec3.inventoryMenu.setAll(og.getItems());
         }
-        else if (ms.getContainerId() == ayj3.containerMenu.containerId) {
-            ayj3.containerMenu.setAll(ms.getItems());
+        else if (og.getContainerId() == bec3.containerMenu.containerId) {
+            bec3.containerMenu.setAll(og.getItems());
         }
     }
     
     @Override
-    public void handleOpenSignEditor(final ClientboundOpenSignEditorPacket nq) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nq, this, this.minecraft);
-        BlockEntity bwl3 = this.level.getBlockEntity(nq.getPos());
-        if (!(bwl3 instanceof SignBlockEntity)) {
-            bwl3 = new SignBlockEntity();
-            bwl3.setLevelAndPosition(this.level, nq.getPos());
+    public void handleOpenSignEditor(final ClientboundOpenSignEditorPacket pe) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pe, this, this.minecraft);
+        BlockEntity cdl3 = this.level.getBlockEntity(pe.getPos());
+        if (!(cdl3 instanceof SignBlockEntity)) {
+            cdl3 = new SignBlockEntity();
+            cdl3.setLevelAndPosition(this.level, pe.getPos());
         }
-        this.minecraft.player.openTextEdit((SignBlockEntity)bwl3);
+        this.minecraft.player.openTextEdit((SignBlockEntity)cdl3);
     }
     
     @Override
-    public void handleBlockEntityData(final ClientboundBlockEntityDataPacket mh) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mh, this, this.minecraft);
-        if (this.minecraft.level.hasChunkAt(mh.getPos())) {
-            final BlockEntity bwl3 = this.minecraft.level.getBlockEntity(mh.getPos());
-            final int integer4 = mh.getType();
-            final boolean boolean5 = integer4 == 2 && bwl3 instanceof CommandBlockEntity;
-            if ((integer4 == 1 && bwl3 instanceof SpawnerBlockEntity) || boolean5 || (integer4 == 3 && bwl3 instanceof BeaconBlockEntity) || (integer4 == 4 && bwl3 instanceof SkullBlockEntity) || (integer4 == 6 && bwl3 instanceof BannerBlockEntity) || (integer4 == 7 && bwl3 instanceof StructureBlockEntity) || (integer4 == 8 && bwl3 instanceof TheEndGatewayBlockEntity) || (integer4 == 9 && bwl3 instanceof SignBlockEntity) || (integer4 == 11 && bwl3 instanceof BedBlockEntity) || (integer4 == 5 && bwl3 instanceof ConduitBlockEntity) || (integer4 == 12 && bwl3 instanceof JigsawBlockEntity) || (integer4 == 13 && bwl3 instanceof CampfireBlockEntity) || (integer4 == 14 && bwl3 instanceof BeehiveBlockEntity)) {
-                bwl3.load(mh.getTag());
-            }
-            if (boolean5 && this.minecraft.screen instanceof CommandBlockEditScreen) {
-                ((CommandBlockEditScreen)this.minecraft.screen).updateGui();
-            }
+    public void handleBlockEntityData(final ClientboundBlockEntityDataPacket nv) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nv, this, this.minecraft);
+        final BlockPos fu3 = nv.getPos();
+        final BlockEntity cdl4 = this.minecraft.level.getBlockEntity(fu3);
+        final int integer5 = nv.getType();
+        final boolean boolean6 = integer5 == 2 && cdl4 instanceof CommandBlockEntity;
+        if ((integer5 == 1 && cdl4 instanceof SpawnerBlockEntity) || boolean6 || (integer5 == 3 && cdl4 instanceof BeaconBlockEntity) || (integer5 == 4 && cdl4 instanceof SkullBlockEntity) || (integer5 == 6 && cdl4 instanceof BannerBlockEntity) || (integer5 == 7 && cdl4 instanceof StructureBlockEntity) || (integer5 == 8 && cdl4 instanceof TheEndGatewayBlockEntity) || (integer5 == 9 && cdl4 instanceof SignBlockEntity) || (integer5 == 11 && cdl4 instanceof BedBlockEntity) || (integer5 == 5 && cdl4 instanceof ConduitBlockEntity) || (integer5 == 12 && cdl4 instanceof JigsawBlockEntity) || (integer5 == 13 && cdl4 instanceof CampfireBlockEntity) || (integer5 == 14 && cdl4 instanceof BeehiveBlockEntity)) {
+            cdl4.load(this.minecraft.level.getBlockState(fu3), nv.getTag());
+        }
+        if (boolean6 && this.minecraft.screen instanceof CommandBlockEditScreen) {
+            ((CommandBlockEditScreen)this.minecraft.screen).updateGui();
         }
     }
     
     @Override
-    public void handleContainerSetData(final ClientboundContainerSetDataPacket mt) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mt, this, this.minecraft);
-        final Player ayj3 = this.minecraft.player;
-        if (ayj3.containerMenu != null && ayj3.containerMenu.containerId == mt.getContainerId()) {
-            ayj3.containerMenu.setData(mt.getId(), mt.getValue());
+    public void handleContainerSetData(final ClientboundContainerSetDataPacket oh) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oh, this, this.minecraft);
+        final Player bec3 = this.minecraft.player;
+        if (bec3.containerMenu != null && bec3.containerMenu.containerId == oh.getContainerId()) {
+            bec3.containerMenu.setData(oh.getId(), oh.getValue());
         }
     }
     
     @Override
-    public void handleSetEquippedItem(final ClientboundSetEquippedItemPacket on) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)on, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(on.getEntity());
-        if (akq3 != null) {
-            akq3.setItemSlot(on.getSlot(), on.getItem());
+    public void handleSetEquipment(final ClientboundSetEquipmentPacket qc) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qc, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(qc.getEntity());
+        if (aom3 != null) {
+            qc.getSlots().forEach(pair -> aom3.setItemSlot((EquipmentSlot)pair.getFirst(), (ItemStack)pair.getSecond()));
         }
     }
     
     @Override
-    public void handleContainerClose(final ClientboundContainerClosePacket mr) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mr, this, this.minecraft);
+    public void handleContainerClose(final ClientboundContainerClosePacket of) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)of, this, this.minecraft);
         this.minecraft.player.clientSideCloseContainer();
     }
     
     @Override
-    public void handleBlockEvent(final ClientboundBlockEventPacket mi) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mi, this, this.minecraft);
-        this.minecraft.level.blockEvent(mi.getPos(), mi.getBlock(), mi.getB0(), mi.getB1());
+    public void handleBlockEvent(final ClientboundBlockEventPacket nw) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nw, this, this.minecraft);
+        this.minecraft.level.blockEvent(nw.getPos(), nw.getBlock(), nw.getB0(), nw.getB1());
     }
     
     @Override
-    public void handleBlockDestruction(final ClientboundBlockDestructionPacket mg) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mg, this, this.minecraft);
-        this.minecraft.level.destroyBlockProgress(mg.getId(), mg.getPos(), mg.getProgress());
+    public void handleBlockDestruction(final ClientboundBlockDestructionPacket nu) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nu, this, this.minecraft);
+        this.minecraft.level.destroyBlockProgress(nu.getId(), nu.getPos(), nu.getProgress());
     }
     
     @Override
-    public void handleGameEvent(final ClientboundGameEventPacket nc) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nc, this, this.minecraft);
-        final Player ayj3 = this.minecraft.player;
-        final int integer4 = nc.getEvent();
-        final float float5 = nc.getParam();
-        final int integer5 = Mth.floor(float5 + 0.5f);
-        if (integer4 >= 0 && integer4 < ClientboundGameEventPacket.EVENT_LANGUAGE_ID.length && ClientboundGameEventPacket.EVENT_LANGUAGE_ID[integer4] != null) {
-            ayj3.displayClientMessage(new TranslatableComponent(ClientboundGameEventPacket.EVENT_LANGUAGE_ID[integer4], new Object[0]), false);
+    public void handleGameEvent(final ClientboundGameEventPacket oq) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oq, this, this.minecraft);
+        final Player bec3 = this.minecraft.player;
+        final ClientboundGameEventPacket.Type a4 = oq.getEvent();
+        final float float5 = oq.getParam();
+        final int integer6 = Mth.floor(float5 + 0.5f);
+        if (a4 == ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE) {
+            bec3.displayClientMessage(new TranslatableComponent("block.minecraft.spawn.not_valid"), false);
         }
-        if (integer4 == 1) {
+        else if (a4 == ClientboundGameEventPacket.START_RAINING) {
             this.level.getLevelData().setRaining(true);
             this.level.setRainLevel(0.0f);
         }
-        else if (integer4 == 2) {
+        else if (a4 == ClientboundGameEventPacket.STOP_RAINING) {
             this.level.getLevelData().setRaining(false);
             this.level.setRainLevel(1.0f);
         }
-        else if (integer4 == 3) {
-            this.minecraft.gameMode.setLocalMode(GameType.byId(integer5));
+        else if (a4 == ClientboundGameEventPacket.CHANGE_GAME_MODE) {
+            this.minecraft.gameMode.setLocalMode(GameType.byId(integer6));
         }
-        else if (integer4 == 4) {
-            if (integer5 == 0) {
+        else if (a4 == ClientboundGameEventPacket.WIN_GAME) {
+            if (integer6 == 0) {
                 this.minecraft.player.connection.send(new ServerboundClientCommandPacket(ServerboundClientCommandPacket.Action.PERFORM_RESPAWN));
                 this.minecraft.setScreen(new ReceivingLevelScreen());
             }
-            else if (integer5 == 1) {
+            else if (integer6 == 1) {
                 this.minecraft.setScreen(new WinScreen(true, () -> this.minecraft.player.connection.send(new ServerboundClientCommandPacket(ServerboundClientCommandPacket.Action.PERFORM_RESPAWN))));
             }
         }
-        else if (integer4 == 5) {
-            final Options dbr7 = this.minecraft.options;
+        else if (a4 == ClientboundGameEventPacket.DEMO_EVENT) {
+            final Options dmb7 = this.minecraft.options;
             if (float5 == 0.0f) {
                 this.minecraft.setScreen(new DemoIntroScreen());
             }
             else if (float5 == 101.0f) {
-                this.minecraft.gui.getChat().addMessage(new TranslatableComponent("demo.help.movement", new Object[] { dbr7.keyUp.getTranslatedKeyMessage(), dbr7.keyLeft.getTranslatedKeyMessage(), dbr7.keyDown.getTranslatedKeyMessage(), dbr7.keyRight.getTranslatedKeyMessage() }));
+                this.minecraft.gui.getChat().addMessage(new TranslatableComponent("demo.help.movement", new Object[] { dmb7.keyUp.getTranslatedKeyMessage(), dmb7.keyLeft.getTranslatedKeyMessage(), dmb7.keyDown.getTranslatedKeyMessage(), dmb7.keyRight.getTranslatedKeyMessage() }));
             }
             else if (float5 == 102.0f) {
-                this.minecraft.gui.getChat().addMessage(new TranslatableComponent("demo.help.jump", new Object[] { dbr7.keyJump.getTranslatedKeyMessage() }));
+                this.minecraft.gui.getChat().addMessage(new TranslatableComponent("demo.help.jump", new Object[] { dmb7.keyJump.getTranslatedKeyMessage() }));
             }
             else if (float5 == 103.0f) {
-                this.minecraft.gui.getChat().addMessage(new TranslatableComponent("demo.help.inventory", new Object[] { dbr7.keyInventory.getTranslatedKeyMessage() }));
+                this.minecraft.gui.getChat().addMessage(new TranslatableComponent("demo.help.inventory", new Object[] { dmb7.keyInventory.getTranslatedKeyMessage() }));
             }
             else if (float5 == 104.0f) {
-                this.minecraft.gui.getChat().addMessage(new TranslatableComponent("demo.day.6", new Object[] { dbr7.keyScreenshot.getTranslatedKeyMessage() }));
+                this.minecraft.gui.getChat().addMessage(new TranslatableComponent("demo.day.6", new Object[] { dmb7.keyScreenshot.getTranslatedKeyMessage() }));
             }
         }
-        else if (integer4 == 6) {
-            this.level.playSound(ayj3, ayj3.getX(), ayj3.getEyeY(), ayj3.getZ(), SoundEvents.ARROW_HIT_PLAYER, SoundSource.PLAYERS, 0.18f, 0.45f);
+        else if (a4 == ClientboundGameEventPacket.ARROW_HIT_PLAYER) {
+            this.level.playSound(bec3, bec3.getX(), bec3.getEyeY(), bec3.getZ(), SoundEvents.ARROW_HIT_PLAYER, SoundSource.PLAYERS, 0.18f, 0.45f);
         }
-        else if (integer4 == 7) {
+        else if (a4 == ClientboundGameEventPacket.RAIN_LEVEL_CHANGE) {
             this.level.setRainLevel(float5);
         }
-        else if (integer4 == 8) {
+        else if (a4 == ClientboundGameEventPacket.THUNDER_LEVEL_CHANGE) {
             this.level.setThunderLevel(float5);
         }
-        else if (integer4 == 9) {
-            this.level.playSound(ayj3, ayj3.getX(), ayj3.getY(), ayj3.getZ(), SoundEvents.PUFFER_FISH_STING, SoundSource.NEUTRAL, 1.0f, 1.0f);
+        else if (a4 == ClientboundGameEventPacket.PUFFER_FISH_STING) {
+            this.level.playSound(bec3, bec3.getX(), bec3.getY(), bec3.getZ(), SoundEvents.PUFFER_FISH_STING, SoundSource.NEUTRAL, 1.0f, 1.0f);
         }
-        else if (integer4 == 10) {
-            this.level.addParticle(ParticleTypes.ELDER_GUARDIAN, ayj3.getX(), ayj3.getY(), ayj3.getZ(), 0.0, 0.0, 0.0);
-            this.level.playSound(ayj3, ayj3.getX(), ayj3.getY(), ayj3.getZ(), SoundEvents.ELDER_GUARDIAN_CURSE, SoundSource.HOSTILE, 1.0f, 1.0f);
+        else if (a4 == ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT) {
+            this.level.addParticle(ParticleTypes.ELDER_GUARDIAN, bec3.getX(), bec3.getY(), bec3.getZ(), 0.0, 0.0, 0.0);
+            if (integer6 == 1) {
+                this.level.playSound(bec3, bec3.getX(), bec3.getY(), bec3.getZ(), SoundEvents.ELDER_GUARDIAN_CURSE, SoundSource.HOSTILE, 1.0f, 1.0f);
+            }
         }
-        else if (integer4 == 11) {
+        else if (a4 == ClientboundGameEventPacket.IMMEDIATE_RESPAWN) {
             this.minecraft.player.setShowDeathScreen(float5 == 0.0f);
         }
     }
     
     @Override
-    public void handleMapItemData(final ClientboundMapItemDataPacket nk) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nk, this, this.minecraft);
-        final MapRenderer dck3 = this.minecraft.gameRenderer.getMapRenderer();
-        final String string4 = MapItem.makeKey(nk.getMapId());
-        MapItemSavedData crg5 = this.minecraft.level.getMapData(string4);
-        if (crg5 == null) {
-            crg5 = new MapItemSavedData(string4);
-            if (dck3.getMapInstanceIfExists(string4) != null) {
-                final MapItemSavedData crg6 = dck3.getData(dck3.getMapInstanceIfExists(string4));
-                if (crg6 != null) {
-                    crg5 = crg6;
+    public void handleMapItemData(final ClientboundMapItemDataPacket oy) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oy, this, this.minecraft);
+        final MapRenderer dmw3 = this.minecraft.gameRenderer.getMapRenderer();
+        final String string4 = MapItem.makeKey(oy.getMapId());
+        MapItemSavedData czv5 = this.minecraft.level.getMapData(string4);
+        if (czv5 == null) {
+            czv5 = new MapItemSavedData(string4);
+            if (dmw3.getMapInstanceIfExists(string4) != null) {
+                final MapItemSavedData czv6 = dmw3.getData(dmw3.getMapInstanceIfExists(string4));
+                if (czv6 != null) {
+                    czv5 = czv6;
                 }
             }
-            this.minecraft.level.setMapData(crg5);
+            this.minecraft.level.setMapData(czv5);
         }
-        nk.applyToMap(crg5);
-        dck3.update(crg5);
+        oy.applyToMap(czv5);
+        dmw3.update(czv5);
     }
     
     @Override
-    public void handleLevelEvent(final ClientboundLevelEventPacket ng) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ng, this, this.minecraft);
-        if (ng.isGlobalEvent()) {
-            this.minecraft.level.globalLevelEvent(ng.getType(), ng.getPos(), ng.getData());
+    public void handleLevelEvent(final ClientboundLevelEventPacket ou) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ou, this, this.minecraft);
+        if (ou.isGlobalEvent()) {
+            this.minecraft.level.globalLevelEvent(ou.getType(), ou.getPos(), ou.getData());
         }
         else {
-            this.minecraft.level.levelEvent(ng.getType(), ng.getPos(), ng.getData());
+            this.minecraft.level.levelEvent(ou.getType(), ou.getPos(), ou.getData());
         }
     }
     
     @Override
-    public void handleUpdateAdvancementsPacket(final ClientboundUpdateAdvancementsPacket pe) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pe, this, this.minecraft);
-        this.advancements.update(pe);
+    public void handleUpdateAdvancementsPacket(final ClientboundUpdateAdvancementsPacket qs) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qs, this, this.minecraft);
+        this.advancements.update(qs);
     }
     
     @Override
-    public void handleSelectAdvancementsTab(final ClientboundSelectAdvancementsTabPacket od) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)od, this, this.minecraft);
-        final ResourceLocation sm3 = od.getTab();
-        if (sm3 == null) {
+    public void handleSelectAdvancementsTab(final ClientboundSelectAdvancementsTabPacket pr) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pr, this, this.minecraft);
+        final ResourceLocation uh3 = pr.getTab();
+        if (uh3 == null) {
             this.advancements.setSelectedTab(null, false);
         }
         else {
-            final Advancement u4 = this.advancements.getAdvancements().get(sm3);
-            this.advancements.setSelectedTab(u4, false);
+            final Advancement w4 = this.advancements.getAdvancements().get(uh3);
+            this.advancements.setSelectedTab(w4, false);
         }
     }
     
     @Override
-    public void handleCommands(final ClientboundCommandsPacket mp) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mp, this, this.minecraft);
-        this.commands = (CommandDispatcher<SharedSuggestionProvider>)new CommandDispatcher((RootCommandNode)mp.getRoot());
+    public void handleCommands(final ClientboundCommandsPacket od) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)od, this, this.minecraft);
+        this.commands = (CommandDispatcher<SharedSuggestionProvider>)new CommandDispatcher((RootCommandNode)od.getRoot());
     }
     
     @Override
-    public void handleStopSoundEvent(final ClientboundStopSoundPacket oz) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oz, this, this.minecraft);
-        this.minecraft.getSoundManager().stop(oz.getName(), oz.getSource());
+    public void handleStopSoundEvent(final ClientboundStopSoundPacket qn) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qn, this, this.minecraft);
+        this.minecraft.getSoundManager().stop(qn.getName(), qn.getSource());
     }
     
     @Override
-    public void handleCommandSuggestions(final ClientboundCommandSuggestionsPacket mo) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mo, this, this.minecraft);
-        this.suggestionsProvider.completeCustomSuggestions(mo.getId(), mo.getSuggestions());
+    public void handleCommandSuggestions(final ClientboundCommandSuggestionsPacket oc) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oc, this, this.minecraft);
+        this.suggestionsProvider.completeCustomSuggestions(oc.getId(), oc.getSuggestions());
     }
     
     @Override
-    public void handleUpdateRecipes(final ClientboundUpdateRecipesPacket ph) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ph, this, this.minecraft);
-        this.recipeManager.replaceRecipes(ph.getRecipes());
-        final MutableSearchTree<RecipeCollection> ede3 = this.minecraft.<RecipeCollection>getSearchTree(SearchRegistry.RECIPE_COLLECTIONS);
-        ede3.clear();
-        final ClientRecipeBook dbc4 = this.minecraft.player.getRecipeBook();
-        dbc4.setupCollections();
-        dbc4.getCollections().forEach(ede3::add);
-        ede3.refresh();
+    public void handleUpdateRecipes(final ClientboundUpdateRecipesPacket qv) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qv, this, this.minecraft);
+        this.recipeManager.replaceRecipes(qv.getRecipes());
+        final MutableSearchTree<RecipeCollection> eor3 = this.minecraft.<RecipeCollection>getSearchTree(SearchRegistry.RECIPE_COLLECTIONS);
+        eor3.clear();
+        final ClientRecipeBook dlk4 = this.minecraft.player.getRecipeBook();
+        dlk4.setupCollections();
+        dlk4.getCollections().forEach(eor3::add);
+        eor3.refresh();
     }
     
     @Override
-    public void handleLookAt(final ClientboundPlayerLookAtPacket nv) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nv, this, this.minecraft);
-        final Vec3 cvl3 = nv.getPosition(this.level);
-        if (cvl3 != null) {
-            this.minecraft.player.lookAt(nv.getFromAnchor(), cvl3);
+    public void handleLookAt(final ClientboundPlayerLookAtPacket pj) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pj, this, this.minecraft);
+        final Vec3 dem3 = pj.getPosition(this.level);
+        if (dem3 != null) {
+            this.minecraft.player.lookAt(pj.getFromAnchor(), dem3);
         }
     }
     
     @Override
-    public void handleTagQueryPacket(final ClientboundTagQueryPacket pb) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pb, this, this.minecraft);
-        if (!this.debugQueryHandler.handleResponse(pb.getTransactionId(), pb.getTag())) {
-            ClientPacketListener.LOGGER.debug("Got unhandled response to tag query {}", pb.getTransactionId());
+    public void handleTagQueryPacket(final ClientboundTagQueryPacket qp) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qp, this, this.minecraft);
+        if (!this.debugQueryHandler.handleResponse(qp.getTransactionId(), qp.getTag())) {
+            ClientPacketListener.LOGGER.debug("Got unhandled response to tag query {}", qp.getTransactionId());
         }
     }
     
     @Override
-    public void handleAwardStats(final ClientboundAwardStatsPacket me) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)me, this, this.minecraft);
-        for (final Map.Entry<Stat<?>, Integer> entry4 : me.getStats().entrySet()) {
-            final Stat<?> aao5 = entry4.getKey();
+    public void handleAwardStats(final ClientboundAwardStatsPacket ns) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ns, this, this.minecraft);
+        for (final Map.Entry<Stat<?>, Integer> entry4 : ns.getStats().entrySet()) {
+            final Stat<?> acr5 = entry4.getKey();
             final int integer6 = entry4.getValue();
-            this.minecraft.player.getStats().setValue(this.minecraft.player, aao5, integer6);
+            this.minecraft.player.getStats().setValue(this.minecraft.player, acr5, integer6);
         }
         if (this.minecraft.screen instanceof StatsUpdateListener) {
             ((StatsUpdateListener)this.minecraft.screen).onStatsUpdated();
@@ -1394,86 +1441,83 @@ public class ClientPacketListener implements ClientGamePacketListener {
     }
     
     @Override
-    public void handleAddOrRemoveRecipes(final ClientboundRecipePacket nx) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nx, this, this.minecraft);
-        final ClientRecipeBook dbc3 = this.minecraft.player.getRecipeBook();
-        dbc3.setGuiOpen(nx.isGuiOpen());
-        dbc3.setFilteringCraftable(nx.isFilteringCraftable());
-        dbc3.setFurnaceGuiOpen(nx.isFurnaceGuiOpen());
-        dbc3.setFurnaceFilteringCraftable(nx.isFurnaceFilteringCraftable());
-        final ClientboundRecipePacket.State a4 = nx.getState();
+    public void handleAddOrRemoveRecipes(final ClientboundRecipePacket pl) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pl, this, this.minecraft);
+        final ClientRecipeBook dlk3 = this.minecraft.player.getRecipeBook();
+        dlk3.setGuiOpen(pl.isGuiOpen());
+        dlk3.setFilteringCraftable(pl.isFilteringCraftable());
+        dlk3.setFurnaceGuiOpen(pl.isFurnaceGuiOpen());
+        dlk3.setFurnaceFilteringCraftable(pl.isFurnaceFilteringCraftable());
+        final ClientboundRecipePacket.State a4 = pl.getState();
         switch (a4) {
             case REMOVE: {
-                for (final ResourceLocation sm6 : nx.getRecipes()) {
-                    this.recipeManager.byKey(sm6).ifPresent(dbc3::remove);
+                for (final ResourceLocation uh6 : pl.getRecipes()) {
+                    this.recipeManager.byKey(uh6).ifPresent(dlk3::remove);
                 }
                 break;
             }
             case INIT: {
-                for (final ResourceLocation sm6 : nx.getRecipes()) {
-                    this.recipeManager.byKey(sm6).ifPresent(dbc3::add);
+                for (final ResourceLocation uh6 : pl.getRecipes()) {
+                    this.recipeManager.byKey(uh6).ifPresent(dlk3::add);
                 }
-                for (final ResourceLocation sm6 : nx.getHighlights()) {
-                    this.recipeManager.byKey(sm6).ifPresent(dbc3::addHighlight);
+                for (final ResourceLocation uh6 : pl.getHighlights()) {
+                    this.recipeManager.byKey(uh6).ifPresent(dlk3::addHighlight);
                 }
                 break;
             }
             case ADD: {
-                for (final ResourceLocation sm6 : nx.getRecipes()) {
+                for (final ResourceLocation uh6 : pl.getRecipes()) {
                     final RecipeBook recipeBook;
-                    this.recipeManager.byKey(sm6).ifPresent(bgw -> {
-                        recipeBook.add(bgw);
-                        recipeBook.addHighlight(bgw);
-                        RecipeToast.addOrUpdate(this.minecraft.getToasts(), bgw);
+                    this.recipeManager.byKey(uh6).ifPresent(bmu -> {
+                        recipeBook.add(bmu);
+                        recipeBook.addHighlight(bmu);
+                        RecipeToast.addOrUpdate(this.minecraft.getToasts(), bmu);
                         return;
                     });
                 }
                 break;
             }
         }
-        dbc3.getCollections().forEach(dit -> dit.updateKnownRecipes(dbc3));
+        dlk3.getCollections().forEach(dtr -> dtr.updateKnownRecipes(dlk3));
         if (this.minecraft.screen instanceof RecipeUpdateListener) {
             ((RecipeUpdateListener)this.minecraft.screen).recipesUpdated();
         }
     }
     
     @Override
-    public void handleUpdateMobEffect(final ClientboundUpdateMobEffectPacket pg) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pg, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(pg.getEntityId());
-        if (!(akq3 instanceof LivingEntity)) {
+    public void handleUpdateMobEffect(final ClientboundUpdateMobEffectPacket qu) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qu, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(qu.getEntityId());
+        if (!(aom3 instanceof LivingEntity)) {
             return;
         }
-        final MobEffect aki4 = MobEffect.byId(pg.getEffectId());
-        if (aki4 == null) {
+        final MobEffect aoe4 = MobEffect.byId(qu.getEffectId());
+        if (aoe4 == null) {
             return;
         }
-        final MobEffectInstance akk5 = new MobEffectInstance(aki4, pg.getEffectDurationTicks(), pg.getEffectAmplifier(), pg.isEffectAmbient(), pg.isEffectVisible(), pg.effectShowsIcon());
-        akk5.setNoCounter(pg.isSuperLongDuration());
-        ((LivingEntity)akq3).addEffect(akk5);
+        final MobEffectInstance aog5 = new MobEffectInstance(aoe4, qu.getEffectDurationTicks(), qu.getEffectAmplifier(), qu.isEffectAmbient(), qu.isEffectVisible(), qu.effectShowsIcon());
+        aog5.setNoCounter(qu.isSuperLongDuration());
+        ((LivingEntity)aom3).forceAddEffect(aog5);
     }
     
     @Override
-    public void handleUpdateTags(final ClientboundUpdateTagsPacket pi) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pi, this, this.minecraft);
-        this.tags = pi.getTags();
+    public void handleUpdateTags(final ClientboundUpdateTagsPacket qw) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qw, this, this.minecraft);
+        this.tags = qw.getTags();
         if (!this.connection.isMemoryConnection()) {
-            BlockTags.reset(this.tags.getBlocks());
-            ItemTags.reset(this.tags.getItems());
-            FluidTags.reset(this.tags.getFluids());
-            EntityTypeTags.reset(this.tags.getEntityTypes());
+            this.tags.bindToGlobal();
         }
         this.minecraft.<ItemStack>getSearchTree(SearchRegistry.CREATIVE_TAGS).refresh();
     }
     
     @Override
-    public void handlePlayerCombat(final ClientboundPlayerCombatPacket nt) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nt, this, this.minecraft);
-        if (nt.event == ClientboundPlayerCombatPacket.Event.ENTITY_DIED) {
-            final Entity akq3 = this.level.getEntity(nt.playerId);
-            if (akq3 == this.minecraft.player) {
+    public void handlePlayerCombat(final ClientboundPlayerCombatPacket ph) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ph, this, this.minecraft);
+        if (ph.event == ClientboundPlayerCombatPacket.Event.ENTITY_DIED) {
+            final Entity aom3 = this.level.getEntity(ph.playerId);
+            if (aom3 == this.minecraft.player) {
                 if (this.minecraft.player.shouldShowDeathScreen()) {
-                    this.minecraft.setScreen(new DeathScreen(nt.message, this.level.getLevelData().isHardcore()));
+                    this.minecraft.setScreen(new DeathScreen(ph.message, this.level.getLevelData().isHardcore()));
                 }
                 else {
                     this.minecraft.player.respawn();
@@ -1483,104 +1527,104 @@ public class ClientPacketListener implements ClientGamePacketListener {
     }
     
     @Override
-    public void handleChangeDifficulty(final ClientboundChangeDifficultyPacket ml) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ml, this, this.minecraft);
-        this.minecraft.level.getLevelData().setDifficulty(ml.getDifficulty());
-        this.minecraft.level.getLevelData().setDifficultyLocked(ml.isLocked());
+    public void handleChangeDifficulty(final ClientboundChangeDifficultyPacket nz) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nz, this, this.minecraft);
+        this.levelData.setDifficulty(nz.getDifficulty());
+        this.levelData.setDifficultyLocked(nz.isLocked());
     }
     
     @Override
-    public void handleSetCamera(final ClientboundSetCameraPacket of) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)of, this, this.minecraft);
-        final Entity akq3 = of.getEntity(this.level);
-        if (akq3 != null) {
-            this.minecraft.setCameraEntity(akq3);
+    public void handleSetCamera(final ClientboundSetCameraPacket pt) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pt, this, this.minecraft);
+        final Entity aom3 = pt.getEntity(this.level);
+        if (aom3 != null) {
+            this.minecraft.setCameraEntity(aom3);
         }
     }
     
     @Override
-    public void handleSetBorder(final ClientboundSetBorderPacket oe) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oe, this, this.minecraft);
-        oe.applyChanges(this.level.getWorldBorder());
+    public void handleSetBorder(final ClientboundSetBorderPacket ps) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ps, this, this.minecraft);
+        ps.applyChanges(this.level.getWorldBorder());
     }
     
     @Override
-    public void handleSetTitles(final ClientboundSetTitlesPacket ow) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ow, this, this.minecraft);
-        final ClientboundSetTitlesPacket.Type a3 = ow.getType();
-        String string4 = null;
-        String string5 = null;
-        final String string6 = (ow.getText() != null) ? ow.getText().getColoredString() : "";
+    public void handleSetTitles(final ClientboundSetTitlesPacket qk) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qk, this, this.minecraft);
+        final ClientboundSetTitlesPacket.Type a3 = qk.getType();
+        Component mr4 = null;
+        Component mr5 = null;
+        final Component mr6 = (qk.getText() != null) ? qk.getText() : TextComponent.EMPTY;
         switch (a3) {
             case TITLE: {
-                string4 = string6;
+                mr4 = mr6;
                 break;
             }
             case SUBTITLE: {
-                string5 = string6;
+                mr5 = mr6;
                 break;
             }
             case ACTIONBAR: {
-                this.minecraft.gui.setOverlayMessage(string6, false);
+                this.minecraft.gui.setOverlayMessage(mr6, false);
                 return;
             }
             case RESET: {
-                this.minecraft.gui.setTitles("", "", -1, -1, -1);
+                this.minecraft.gui.setTitles(null, null, -1, -1, -1);
                 this.minecraft.gui.resetTitleTimes();
                 return;
             }
         }
-        this.minecraft.gui.setTitles(string4, string5, ow.getFadeInTime(), ow.getStayTime(), ow.getFadeOutTime());
+        this.minecraft.gui.setTitles(mr4, mr5, qk.getFadeInTime(), qk.getStayTime(), qk.getFadeOutTime());
     }
     
     @Override
-    public void handleTabListCustomisation(final ClientboundTabListPacket pa) {
-        this.minecraft.gui.getTabList().setHeader(pa.getHeader().getColoredString().isEmpty() ? null : pa.getHeader());
-        this.minecraft.gui.getTabList().setFooter(pa.getFooter().getColoredString().isEmpty() ? null : pa.getFooter());
+    public void handleTabListCustomisation(final ClientboundTabListPacket qo) {
+        this.minecraft.gui.getTabList().setHeader(qo.getHeader().getString().isEmpty() ? null : qo.getHeader());
+        this.minecraft.gui.getTabList().setFooter(qo.getFooter().getString().isEmpty() ? null : qo.getFooter());
     }
     
     @Override
-    public void handleRemoveMobEffect(final ClientboundRemoveMobEffectPacket nz) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nz, this, this.minecraft);
-        final Entity akq3 = nz.getEntity(this.level);
-        if (akq3 instanceof LivingEntity) {
-            ((LivingEntity)akq3).removeEffectNoUpdate(nz.getEffect());
+    public void handleRemoveMobEffect(final ClientboundRemoveMobEffectPacket pn) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pn, this, this.minecraft);
+        final Entity aom3 = pn.getEntity(this.level);
+        if (aom3 instanceof LivingEntity) {
+            ((LivingEntity)aom3).removeEffectNoUpdate(pn.getEffect());
         }
     }
     
     @Override
-    public void handlePlayerInfo(final ClientboundPlayerInfoPacket nu) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nu, this, this.minecraft);
-        for (final ClientboundPlayerInfoPacket.PlayerUpdate b4 : nu.getEntries()) {
-            if (nu.getAction() == ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER) {
+    public void handlePlayerInfo(final ClientboundPlayerInfoPacket pi) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pi, this, this.minecraft);
+        for (final ClientboundPlayerInfoPacket.PlayerUpdate b4 : pi.getEntries()) {
+            if (pi.getAction() == ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER) {
                 this.playerInfoMap.remove(b4.getProfile().getId());
             }
             else {
-                PlayerInfo dns5 = this.playerInfoMap.get(b4.getProfile().getId());
-                if (nu.getAction() == ClientboundPlayerInfoPacket.Action.ADD_PLAYER) {
-                    dns5 = new PlayerInfo(b4);
-                    this.playerInfoMap.put(dns5.getProfile().getId(), dns5);
+                PlayerInfo dyq5 = this.playerInfoMap.get(b4.getProfile().getId());
+                if (pi.getAction() == ClientboundPlayerInfoPacket.Action.ADD_PLAYER) {
+                    dyq5 = new PlayerInfo(b4);
+                    this.playerInfoMap.put(dyq5.getProfile().getId(), dyq5);
                 }
-                if (dns5 == null) {
+                if (dyq5 == null) {
                     continue;
                 }
-                switch (nu.getAction()) {
+                switch (pi.getAction()) {
                     case ADD_PLAYER: {
-                        dns5.setGameMode(b4.getGameMode());
-                        dns5.setLatency(b4.getLatency());
-                        dns5.setTabListDisplayName(b4.getDisplayName());
+                        dyq5.setGameMode(b4.getGameMode());
+                        dyq5.setLatency(b4.getLatency());
+                        dyq5.setTabListDisplayName(b4.getDisplayName());
                         continue;
                     }
                     case UPDATE_GAME_MODE: {
-                        dns5.setGameMode(b4.getGameMode());
+                        dyq5.setGameMode(b4.getGameMode());
                         continue;
                     }
                     case UPDATE_LATENCY: {
-                        dns5.setLatency(b4.getLatency());
+                        dyq5.setLatency(b4.getLatency());
                         continue;
                     }
                     case UPDATE_DISPLAY_NAME: {
-                        dns5.setTabListDisplayName(b4.getDisplayName());
+                        dyq5.setTabListDisplayName(b4.getDisplayName());
                         continue;
                     }
                 }
@@ -1589,48 +1633,48 @@ public class ClientPacketListener implements ClientGamePacketListener {
     }
     
     @Override
-    public void handleKeepAlive(final ClientboundKeepAlivePacket ne) {
-        this.send(new ServerboundKeepAlivePacket(ne.getId()));
+    public void handleKeepAlive(final ClientboundKeepAlivePacket os) {
+        this.send(new ServerboundKeepAlivePacket(os.getId()));
     }
     
     @Override
-    public void handlePlayerAbilities(final ClientboundPlayerAbilitiesPacket ns) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ns, this, this.minecraft);
-        final Player ayj3 = this.minecraft.player;
-        ayj3.abilities.flying = ns.isFlying();
-        ayj3.abilities.instabuild = ns.canInstabuild();
-        ayj3.abilities.invulnerable = ns.isInvulnerable();
-        ayj3.abilities.mayfly = ns.canFly();
-        ayj3.abilities.setFlyingSpeed(ns.getFlyingSpeed());
-        ayj3.abilities.setWalkingSpeed(ns.getWalkingSpeed());
+    public void handlePlayerAbilities(final ClientboundPlayerAbilitiesPacket pg) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pg, this, this.minecraft);
+        final Player bec3 = this.minecraft.player;
+        bec3.abilities.flying = pg.isFlying();
+        bec3.abilities.instabuild = pg.canInstabuild();
+        bec3.abilities.invulnerable = pg.isInvulnerable();
+        bec3.abilities.mayfly = pg.canFly();
+        bec3.abilities.setFlyingSpeed(pg.getFlyingSpeed());
+        bec3.abilities.setWalkingSpeed(pg.getWalkingSpeed());
     }
     
     @Override
-    public void handleSoundEvent(final ClientboundSoundPacket oy) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oy, this, this.minecraft);
-        this.minecraft.level.playSound(this.minecraft.player, oy.getX(), oy.getY(), oy.getZ(), oy.getSound(), oy.getSource(), oy.getVolume(), oy.getPitch());
+    public void handleSoundEvent(final ClientboundSoundPacket qm) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qm, this, this.minecraft);
+        this.minecraft.level.playSound(this.minecraft.player, qm.getX(), qm.getY(), qm.getZ(), qm.getSound(), qm.getSource(), qm.getVolume(), qm.getPitch());
     }
     
     @Override
-    public void handleSoundEntityEvent(final ClientboundSoundEntityPacket ox) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ox, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(ox.getId());
-        if (akq3 == null) {
+    public void handleSoundEntityEvent(final ClientboundSoundEntityPacket ql) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ql, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(ql.getId());
+        if (aom3 == null) {
             return;
         }
-        this.minecraft.level.playSound(this.minecraft.player, akq3, ox.getSound(), ox.getSource(), ox.getVolume(), ox.getPitch());
+        this.minecraft.level.playSound(this.minecraft.player, aom3, ql.getSound(), ql.getSource(), ql.getVolume(), ql.getPitch());
     }
     
     @Override
-    public void handleCustomSoundEvent(final ClientboundCustomSoundPacket mx) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mx, this, this.minecraft);
-        this.minecraft.getSoundManager().play(new SimpleSoundInstance(mx.getName(), mx.getSource(), mx.getVolume(), mx.getPitch(), false, 0, SoundInstance.Attenuation.LINEAR, (float)mx.getX(), (float)mx.getY(), (float)mx.getZ(), false));
+    public void handleCustomSoundEvent(final ClientboundCustomSoundPacket ol) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ol, this, this.minecraft);
+        this.minecraft.getSoundManager().play(new SimpleSoundInstance(ol.getName(), ol.getSource(), ol.getVolume(), ol.getPitch(), false, 0, SoundInstance.Attenuation.LINEAR, ol.getX(), ol.getY(), ol.getZ(), false));
     }
     
     @Override
-    public void handleResourcePack(final ClientboundResourcePackPacket oa) {
-        final String string3 = oa.getUrl();
-        final String string4 = oa.getHash();
+    public void handleResourcePack(final ClientboundResourcePackPacket po) {
+        final String string3 = po.getUrl();
+        final String string4 = po.getHash();
         if (!this.validateResourcePackUrl(string3)) {
             return;
         }
@@ -1641,7 +1685,7 @@ public class ClientPacketListener implements ClientGamePacketListener {
                 final File file7 = new File(file6, string5);
                 if (file7.isFile()) {
                     this.send(ServerboundResourcePackPacket.Action.ACCEPTED);
-                    final CompletableFuture<?> completableFuture8 = this.minecraft.getClientPackSource().setServerPack(file7);
+                    final CompletableFuture<?> completableFuture8 = this.minecraft.getClientPackSource().setServerPack(file7, PackSource.WORLD);
                     this.downloadCallback(completableFuture8);
                     return;
                 }
@@ -1650,12 +1694,12 @@ public class ClientPacketListener implements ClientGamePacketListener {
             this.send(ServerboundResourcePackPacket.Action.FAILED_DOWNLOAD);
             return;
         }
-        final ServerData dnu5 = this.minecraft.getCurrentServer();
-        if (dnu5 != null && dnu5.getResourcePackStatus() == ServerData.ServerPackStatus.ENABLED) {
+        final ServerData dys5 = this.minecraft.getCurrentServer();
+        if (dys5 != null && dys5.getResourcePackStatus() == ServerData.ServerPackStatus.ENABLED) {
             this.send(ServerboundResourcePackPacket.Action.ACCEPTED);
             this.downloadCallback(this.minecraft.getClientPackSource().downloadAndSelectResourcePack(string3, string4));
         }
-        else if (dnu5 == null || dnu5.getResourcePackStatus() == ServerData.ServerPackStatus.PROMPT) {
+        else if (dys5 == null || dys5.getResourcePackStatus() == ServerData.ServerPackStatus.PROMPT) {
             final Minecraft minecraft;
             final Screen screen;
             final Object o;
@@ -1664,23 +1708,23 @@ public class ClientPacketListener implements ClientGamePacketListener {
                 minecraft = this.minecraft;
                 new ConfirmScreen(boolean3 -> {
                     this.minecraft = Minecraft.getInstance();
-                    final ServerData dnu5 = this.minecraft.getCurrentServer();
+                    final ServerData dys5 = this.minecraft.getCurrentServer();
                     if (boolean3) {
-                        if (dnu5 != null) {
-                            dnu5.setResourcePackStatus(ServerData.ServerPackStatus.ENABLED);
+                        if (dys5 != null) {
+                            dys5.setResourcePackStatus(ServerData.ServerPackStatus.ENABLED);
                         }
                         this.send(ServerboundResourcePackPacket.Action.ACCEPTED);
                         this.downloadCallback(this.minecraft.getClientPackSource().downloadAndSelectResourcePack(o, o2));
                     }
                     else {
-                        if (dnu5 != null) {
-                            dnu5.setResourcePackStatus(ServerData.ServerPackStatus.DISABLED);
+                        if (dys5 != null) {
+                            dys5.setResourcePackStatus(ServerData.ServerPackStatus.DISABLED);
                         }
                         this.send(ServerboundResourcePackPacket.Action.DECLINED);
                     }
-                    ServerList.saveSingleServer(dnu5);
+                    ServerList.saveSingleServer(dys5);
                     this.minecraft.setScreen(null);
-                }, new TranslatableComponent("multiplayer.texturePrompt.line1", new Object[0]), new TranslatableComponent("multiplayer.texturePrompt.line2", new Object[0]));
+                }, new TranslatableComponent("multiplayer.texturePrompt.line1"), new TranslatableComponent("multiplayer.texturePrompt.line2"));
                 minecraft.setScreen(screen);
             });
         }
@@ -1720,356 +1764,362 @@ public class ClientPacketListener implements ClientGamePacketListener {
     }
     
     @Override
-    public void handleBossUpdate(final ClientboundBossEventPacket mk) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mk, this, this.minecraft);
-        this.minecraft.gui.getBossOverlay().update(mk);
+    public void handleBossUpdate(final ClientboundBossEventPacket ny) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ny, this, this.minecraft);
+        this.minecraft.gui.getBossOverlay().update(ny);
     }
     
     @Override
-    public void handleItemCooldown(final ClientboundCooldownPacket mv) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mv, this, this.minecraft);
-        if (mv.getDuration() == 0) {
-            this.minecraft.player.getCooldowns().removeCooldown(mv.getItem());
+    public void handleItemCooldown(final ClientboundCooldownPacket oj) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oj, this, this.minecraft);
+        if (oj.getDuration() == 0) {
+            this.minecraft.player.getCooldowns().removeCooldown(oj.getItem());
         }
         else {
-            this.minecraft.player.getCooldowns().addCooldown(mv.getItem(), mv.getDuration());
+            this.minecraft.player.getCooldowns().addCooldown(oj.getItem(), oj.getDuration());
         }
     }
     
     @Override
-    public void handleMoveVehicle(final ClientboundMoveVehiclePacket nn) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nn, this, this.minecraft);
-        final Entity akq3 = this.minecraft.player.getRootVehicle();
-        if (akq3 != this.minecraft.player && akq3.isControlledByLocalInstance()) {
-            akq3.absMoveTo(nn.getX(), nn.getY(), nn.getZ(), nn.getYRot(), nn.getXRot());
-            this.connection.send(new ServerboundMoveVehiclePacket(akq3));
+    public void handleMoveVehicle(final ClientboundMoveVehiclePacket pb) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pb, this, this.minecraft);
+        final Entity aom3 = this.minecraft.player.getRootVehicle();
+        if (aom3 != this.minecraft.player && aom3.isControlledByLocalInstance()) {
+            aom3.absMoveTo(pb.getX(), pb.getY(), pb.getZ(), pb.getYRot(), pb.getXRot());
+            this.connection.send(new ServerboundMoveVehiclePacket(aom3));
         }
     }
     
     @Override
-    public void handleOpenBook(final ClientboundOpenBookPacket no) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)no, this, this.minecraft);
-        final ItemStack ben3 = this.minecraft.player.getItemInHand(no.getHand());
-        if (ben3.getItem() == Items.WRITTEN_BOOK) {
-            this.minecraft.setScreen(new BookViewScreen(new BookViewScreen.WrittenBookAccess(ben3)));
+    public void handleOpenBook(final ClientboundOpenBookPacket pc) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pc, this, this.minecraft);
+        final ItemStack bki3 = this.minecraft.player.getItemInHand(pc.getHand());
+        if (bki3.getItem() == Items.WRITTEN_BOOK) {
+            this.minecraft.setScreen(new BookViewScreen(new BookViewScreen.WrittenBookAccess(bki3)));
         }
     }
     
     @Override
-    public void handleCustomPayload(final ClientboundCustomPayloadPacket mw) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mw, this, this.minecraft);
-        final ResourceLocation sm3 = mw.getIdentifier();
-        FriendlyByteBuf kv4 = null;
+    public void handleCustomPayload(final ClientboundCustomPayloadPacket ok) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ok, this, this.minecraft);
+        final ResourceLocation uh3 = ok.getIdentifier();
+        FriendlyByteBuf mg4 = null;
         try {
-            kv4 = mw.getData();
-            if (ClientboundCustomPayloadPacket.BRAND.equals(sm3)) {
-                this.minecraft.player.setServerBrand(kv4.readUtf(32767));
+            mg4 = ok.getData();
+            if (ClientboundCustomPayloadPacket.BRAND.equals(uh3)) {
+                this.minecraft.player.setServerBrand(mg4.readUtf(32767));
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_PATHFINDING_PACKET.equals(sm3)) {
-                final int integer5 = kv4.readInt();
-                final float float6 = kv4.readFloat();
-                final Path cqq7 = Path.createFromStream(kv4);
-                this.minecraft.debugRenderer.pathfindingRenderer.addPath(integer5, cqq7, float6);
+            else if (ClientboundCustomPayloadPacket.DEBUG_PATHFINDING_PACKET.equals(uh3)) {
+                final int integer5 = mg4.readInt();
+                final float float6 = mg4.readFloat();
+                final Path czf7 = Path.createFromStream(mg4);
+                this.minecraft.debugRenderer.pathfindingRenderer.addPath(integer5, czf7, float6);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_NEIGHBORSUPDATE_PACKET.equals(sm3)) {
-                final long long5 = kv4.readVarLong();
-                final BlockPos fk7 = kv4.readBlockPos();
-                ((NeighborsUpdateRenderer)this.minecraft.debugRenderer.neighborsUpdateRenderer).addUpdate(long5, fk7);
+            else if (ClientboundCustomPayloadPacket.DEBUG_NEIGHBORSUPDATE_PACKET.equals(uh3)) {
+                final long long5 = mg4.readVarLong();
+                final BlockPos fu7 = mg4.readBlockPos();
+                ((NeighborsUpdateRenderer)this.minecraft.debugRenderer.neighborsUpdateRenderer).addUpdate(long5, fu7);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_CAVES_PACKET.equals(sm3)) {
-                final BlockPos fk8 = kv4.readBlockPos();
-                final int integer6 = kv4.readInt();
+            else if (ClientboundCustomPayloadPacket.DEBUG_CAVES_PACKET.equals(uh3)) {
+                final BlockPos fu8 = mg4.readBlockPos();
+                final int integer6 = mg4.readInt();
                 final List<BlockPos> list7 = Lists.newArrayList();
                 final List<Float> list8 = Lists.newArrayList();
                 for (int integer7 = 0; integer7 < integer6; ++integer7) {
-                    list7.add(kv4.readBlockPos());
-                    list8.add(kv4.readFloat());
+                    list7.add(mg4.readBlockPos());
+                    list8.add(mg4.readFloat());
                 }
-                this.minecraft.debugRenderer.caveRenderer.addTunnel(fk8, list7, list8);
+                this.minecraft.debugRenderer.caveRenderer.addTunnel(fu8, list7, list8);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_STRUCTURES_PACKET.equals(sm3)) {
-                final DimensionType cbi5 = DimensionType.getById(kv4.readInt());
-                final BoundingBox clb6 = new BoundingBox(kv4.readInt(), kv4.readInt(), kv4.readInt(), kv4.readInt(), kv4.readInt(), kv4.readInt());
-                final int integer8 = kv4.readInt();
+            else if (ClientboundCustomPayloadPacket.DEBUG_STRUCTURES_PACKET.equals(uh3)) {
+                final DimensionType cif5 = this.registryAccess.dimensionTypes().get(mg4.readResourceLocation());
+                final BoundingBox ctd6 = new BoundingBox(mg4.readInt(), mg4.readInt(), mg4.readInt(), mg4.readInt(), mg4.readInt(), mg4.readInt());
+                final int integer8 = mg4.readInt();
                 final List<BoundingBox> list9 = Lists.newArrayList();
                 final List<Boolean> list10 = Lists.newArrayList();
                 for (int integer9 = 0; integer9 < integer8; ++integer9) {
-                    list9.add(new BoundingBox(kv4.readInt(), kv4.readInt(), kv4.readInt(), kv4.readInt(), kv4.readInt(), kv4.readInt()));
-                    list10.add(kv4.readBoolean());
+                    list9.add(new BoundingBox(mg4.readInt(), mg4.readInt(), mg4.readInt(), mg4.readInt(), mg4.readInt(), mg4.readInt()));
+                    list10.add(mg4.readBoolean());
                 }
-                this.minecraft.debugRenderer.structureRenderer.addBoundingBox(clb6, list9, list10, cbi5);
+                this.minecraft.debugRenderer.structureRenderer.addBoundingBox(ctd6, list9, list10, cif5);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_WORLDGENATTEMPT_PACKET.equals(sm3)) {
-                ((WorldGenAttemptRenderer)this.minecraft.debugRenderer.worldGenAttemptRenderer).addPos(kv4.readBlockPos(), kv4.readFloat(), kv4.readFloat(), kv4.readFloat(), kv4.readFloat(), kv4.readFloat());
+            else if (ClientboundCustomPayloadPacket.DEBUG_WORLDGENATTEMPT_PACKET.equals(uh3)) {
+                ((WorldGenAttemptRenderer)this.minecraft.debugRenderer.worldGenAttemptRenderer).addPos(mg4.readBlockPos(), mg4.readFloat(), mg4.readFloat(), mg4.readFloat(), mg4.readFloat(), mg4.readFloat());
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_VILLAGE_SECTIONS.equals(sm3)) {
-                for (int integer5 = kv4.readInt(), integer6 = 0; integer6 < integer5; ++integer6) {
-                    this.minecraft.debugRenderer.villageDebugRenderer.setVillageSection(kv4.readSectionPos());
+            else if (ClientboundCustomPayloadPacket.DEBUG_VILLAGE_SECTIONS.equals(uh3)) {
+                for (int integer5 = mg4.readInt(), integer6 = 0; integer6 < integer5; ++integer6) {
+                    this.minecraft.debugRenderer.villageSectionsDebugRenderer.setVillageSection(mg4.readSectionPos());
                 }
-                for (int integer6 = kv4.readInt(), integer8 = 0; integer8 < integer6; ++integer8) {
-                    this.minecraft.debugRenderer.villageDebugRenderer.setNotVillageSection(kv4.readSectionPos());
+                for (int integer6 = mg4.readInt(), integer8 = 0; integer8 < integer6; ++integer8) {
+                    this.minecraft.debugRenderer.villageSectionsDebugRenderer.setNotVillageSection(mg4.readSectionPos());
                 }
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_POI_ADDED_PACKET.equals(sm3)) {
-                final BlockPos fk8 = kv4.readBlockPos();
-                final String string6 = kv4.readUtf();
-                final int integer8 = kv4.readInt();
-                final VillageDebugRenderer.PoiInfo b8 = new VillageDebugRenderer.PoiInfo(fk8, string6, integer8);
-                this.minecraft.debugRenderer.villageDebugRenderer.addPoi(b8);
+            else if (ClientboundCustomPayloadPacket.DEBUG_POI_ADDED_PACKET.equals(uh3)) {
+                final BlockPos fu8 = mg4.readBlockPos();
+                final String string6 = mg4.readUtf();
+                final int integer8 = mg4.readInt();
+                final BrainDebugRenderer.PoiInfo b8 = new BrainDebugRenderer.PoiInfo(fu8, string6, integer8);
+                this.minecraft.debugRenderer.brainDebugRenderer.addPoi(b8);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_POI_REMOVED_PACKET.equals(sm3)) {
-                final BlockPos fk8 = kv4.readBlockPos();
-                this.minecraft.debugRenderer.villageDebugRenderer.removePoi(fk8);
+            else if (ClientboundCustomPayloadPacket.DEBUG_POI_REMOVED_PACKET.equals(uh3)) {
+                final BlockPos fu8 = mg4.readBlockPos();
+                this.minecraft.debugRenderer.brainDebugRenderer.removePoi(fu8);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_POI_TICKET_COUNT_PACKET.equals(sm3)) {
-                final BlockPos fk8 = kv4.readBlockPos();
-                final int integer6 = kv4.readInt();
-                this.minecraft.debugRenderer.villageDebugRenderer.setFreeTicketCount(fk8, integer6);
+            else if (ClientboundCustomPayloadPacket.DEBUG_POI_TICKET_COUNT_PACKET.equals(uh3)) {
+                final BlockPos fu8 = mg4.readBlockPos();
+                final int integer6 = mg4.readInt();
+                this.minecraft.debugRenderer.brainDebugRenderer.setFreeTicketCount(fu8, integer6);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_GOAL_SELECTOR.equals(sm3)) {
-                final BlockPos fk8 = kv4.readBlockPos();
-                final int integer6 = kv4.readInt();
-                final int integer8 = kv4.readInt();
+            else if (ClientboundCustomPayloadPacket.DEBUG_GOAL_SELECTOR.equals(uh3)) {
+                final BlockPos fu8 = mg4.readBlockPos();
+                final int integer6 = mg4.readInt();
+                final int integer8 = mg4.readInt();
                 final List<GoalSelectorDebugRenderer.DebugGoal> list11 = Lists.newArrayList();
                 for (int integer7 = 0; integer7 < integer8; ++integer7) {
-                    final int integer9 = kv4.readInt();
-                    final boolean boolean11 = kv4.readBoolean();
-                    final String string7 = kv4.readUtf(255);
-                    list11.add(new GoalSelectorDebugRenderer.DebugGoal(fk8, integer9, string7, boolean11));
+                    final int integer9 = mg4.readInt();
+                    final boolean boolean11 = mg4.readBoolean();
+                    final String string7 = mg4.readUtf(255);
+                    list11.add(new GoalSelectorDebugRenderer.DebugGoal(fu8, integer9, string7, boolean11));
                 }
                 this.minecraft.debugRenderer.goalSelectorRenderer.addGoalSelector(integer6, list11);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_RAIDS.equals(sm3)) {
-                final int integer5 = kv4.readInt();
+            else if (ClientboundCustomPayloadPacket.DEBUG_RAIDS.equals(uh3)) {
+                final int integer5 = mg4.readInt();
                 final Collection<BlockPos> collection6 = Lists.newArrayList();
                 for (int integer8 = 0; integer8 < integer5; ++integer8) {
-                    collection6.add(kv4.readBlockPos());
+                    collection6.add(mg4.readBlockPos());
                 }
                 this.minecraft.debugRenderer.raidDebugRenderer.setRaidCenters(collection6);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_BRAIN.equals(sm3)) {
-                final double double5 = kv4.readDouble();
-                final double double6 = kv4.readDouble();
-                final double double7 = kv4.readDouble();
-                final Position fz11 = new PositionImpl(double5, double6, double7);
-                final UUID uUID12 = kv4.readUUID();
-                final int integer10 = kv4.readInt();
-                final String string8 = kv4.readUtf();
-                final String string9 = kv4.readUtf();
-                final int integer11 = kv4.readInt();
-                final String string10 = kv4.readUtf();
-                final boolean boolean12 = kv4.readBoolean();
-                Path cqq8;
+            else if (ClientboundCustomPayloadPacket.DEBUG_BRAIN.equals(uh3)) {
+                final double double5 = mg4.readDouble();
+                final double double6 = mg4.readDouble();
+                final double double7 = mg4.readDouble();
+                final Position gj11 = new PositionImpl(double5, double6, double7);
+                final UUID uUID12 = mg4.readUUID();
+                final int integer10 = mg4.readInt();
+                final String string8 = mg4.readUtf();
+                final String string9 = mg4.readUtf();
+                final int integer11 = mg4.readInt();
+                final float float7 = mg4.readFloat();
+                final float float8 = mg4.readFloat();
+                final String string10 = mg4.readUtf();
+                final boolean boolean12 = mg4.readBoolean();
+                Path czf8;
                 if (boolean12) {
-                    cqq8 = Path.createFromStream(kv4);
+                    czf8 = Path.createFromStream(mg4);
                 }
                 else {
-                    cqq8 = null;
+                    czf8 = null;
                 }
-                final boolean boolean13 = kv4.readBoolean();
-                final VillageDebugRenderer.BrainDump a21 = new VillageDebugRenderer.BrainDump(uUID12, integer10, string8, string9, integer11, fz11, string10, cqq8, boolean13);
-                for (int integer12 = kv4.readInt(), integer13 = 0; integer13 < integer12; ++integer13) {
-                    final String string11 = kv4.readUtf();
-                    a21.activities.add(string11);
+                final boolean boolean13 = mg4.readBoolean();
+                final BrainDebugRenderer.BrainDump a23 = new BrainDebugRenderer.BrainDump(uUID12, integer10, string8, string9, integer11, float7, float8, gj11, string10, czf8, boolean13);
+                for (int integer12 = mg4.readInt(), integer13 = 0; integer13 < integer12; ++integer13) {
+                    final String string11 = mg4.readUtf();
+                    a23.activities.add(string11);
                 }
-                for (int integer13 = kv4.readInt(), integer14 = 0; integer14 < integer13; ++integer14) {
-                    final String string12 = kv4.readUtf();
-                    a21.behaviors.add(string12);
+                for (int integer13 = mg4.readInt(), integer14 = 0; integer14 < integer13; ++integer14) {
+                    final String string12 = mg4.readUtf();
+                    a23.behaviors.add(string12);
                 }
-                for (int integer14 = kv4.readInt(), integer15 = 0; integer15 < integer14; ++integer15) {
-                    final String string13 = kv4.readUtf();
-                    a21.memories.add(string13);
+                for (int integer14 = mg4.readInt(), integer15 = 0; integer15 < integer14; ++integer15) {
+                    final String string13 = mg4.readUtf();
+                    a23.memories.add(string13);
                 }
-                for (int integer15 = kv4.readInt(), integer16 = 0; integer16 < integer15; ++integer16) {
-                    final BlockPos fk9 = kv4.readBlockPos();
-                    a21.pois.add(fk9);
+                for (int integer15 = mg4.readInt(), integer16 = 0; integer16 < integer15; ++integer16) {
+                    final BlockPos fu9 = mg4.readBlockPos();
+                    a23.pois.add(fu9);
                 }
-                for (int integer16 = kv4.readInt(), integer17 = 0; integer17 < integer16; ++integer17) {
-                    final String string14 = kv4.readUtf();
-                    a21.gossips.add(string14);
+                for (int integer16 = mg4.readInt(), integer17 = 0; integer17 < integer16; ++integer17) {
+                    final BlockPos fu10 = mg4.readBlockPos();
+                    a23.potentialPois.add(fu10);
                 }
-                this.minecraft.debugRenderer.villageDebugRenderer.addOrUpdateBrainDump(a21);
+                for (int integer17 = mg4.readInt(), integer18 = 0; integer18 < integer17; ++integer18) {
+                    final String string14 = mg4.readUtf();
+                    a23.gossips.add(string14);
+                }
+                this.minecraft.debugRenderer.brainDebugRenderer.addOrUpdateBrainDump(a23);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_BEE.equals(sm3)) {
-                final double double5 = kv4.readDouble();
-                final double double6 = kv4.readDouble();
-                final double double7 = kv4.readDouble();
-                final Position fz11 = new PositionImpl(double5, double6, double7);
-                final UUID uUID12 = kv4.readUUID();
-                final int integer10 = kv4.readInt();
-                final boolean boolean14 = kv4.readBoolean();
-                BlockPos fk10 = null;
+            else if (ClientboundCustomPayloadPacket.DEBUG_BEE.equals(uh3)) {
+                final double double5 = mg4.readDouble();
+                final double double6 = mg4.readDouble();
+                final double double7 = mg4.readDouble();
+                final Position gj11 = new PositionImpl(double5, double6, double7);
+                final UUID uUID12 = mg4.readUUID();
+                final int integer10 = mg4.readInt();
+                final boolean boolean14 = mg4.readBoolean();
+                BlockPos fu11 = null;
                 if (boolean14) {
-                    fk10 = kv4.readBlockPos();
+                    fu11 = mg4.readBlockPos();
                 }
-                final boolean boolean15 = kv4.readBoolean();
-                BlockPos fk11 = null;
+                final boolean boolean15 = mg4.readBoolean();
+                BlockPos fu12 = null;
                 if (boolean15) {
-                    fk11 = kv4.readBlockPos();
+                    fu12 = mg4.readBlockPos();
                 }
-                final int integer18 = kv4.readInt();
-                final boolean boolean16 = kv4.readBoolean();
-                Path cqq9 = null;
+                final int integer19 = mg4.readInt();
+                final boolean boolean16 = mg4.readBoolean();
+                Path czf9 = null;
                 if (boolean16) {
-                    cqq9 = Path.createFromStream(kv4);
+                    czf9 = Path.createFromStream(mg4);
                 }
-                final BeeDebugRenderer.BeeInfo a22 = new BeeDebugRenderer.BeeInfo(uUID12, integer10, fz11, cqq9, fk10, fk11, integer18);
-                for (int integer12 = kv4.readInt(), integer13 = 0; integer13 < integer12; ++integer13) {
-                    final String string11 = kv4.readUtf();
-                    a22.goals.add(string11);
+                final BeeDebugRenderer.BeeInfo a24 = new BeeDebugRenderer.BeeInfo(uUID12, integer10, gj11, czf9, fu11, fu12, integer19);
+                for (int integer20 = mg4.readInt(), integer21 = 0; integer21 < integer20; ++integer21) {
+                    final String string15 = mg4.readUtf();
+                    a24.goals.add(string15);
                 }
-                for (int integer13 = kv4.readInt(), integer14 = 0; integer14 < integer13; ++integer14) {
-                    final BlockPos fk12 = kv4.readBlockPos();
-                    a22.blacklistedHives.add(fk12);
+                for (int integer21 = mg4.readInt(), integer12 = 0; integer12 < integer21; ++integer12) {
+                    final BlockPos fu13 = mg4.readBlockPos();
+                    a24.blacklistedHives.add(fu13);
                 }
-                this.minecraft.debugRenderer.beeDebugRenderer.addOrUpdateBeeInfo(a22);
+                this.minecraft.debugRenderer.beeDebugRenderer.addOrUpdateBeeInfo(a24);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_HIVE.equals(sm3)) {
-                final BlockPos fk8 = kv4.readBlockPos();
-                final String string6 = kv4.readUtf();
-                final int integer8 = kv4.readInt();
-                final int integer19 = kv4.readInt();
-                final boolean boolean17 = kv4.readBoolean();
-                final BeeDebugRenderer.HiveInfo b9 = new BeeDebugRenderer.HiveInfo(fk8, string6, integer8, integer19, boolean17, this.level.getGameTime());
+            else if (ClientboundCustomPayloadPacket.DEBUG_HIVE.equals(uh3)) {
+                final BlockPos fu8 = mg4.readBlockPos();
+                final String string6 = mg4.readUtf();
+                final int integer8 = mg4.readInt();
+                final int integer22 = mg4.readInt();
+                final boolean boolean17 = mg4.readBoolean();
+                final BeeDebugRenderer.HiveInfo b9 = new BeeDebugRenderer.HiveInfo(fu8, string6, integer8, integer22, boolean17, this.level.getGameTime());
                 this.minecraft.debugRenderer.beeDebugRenderer.addOrUpdateHiveInfo(b9);
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR.equals(sm3)) {
+            else if (ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR.equals(uh3)) {
                 this.minecraft.debugRenderer.gameTestDebugRenderer.clear();
             }
-            else if (ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_ADD_MARKER.equals(sm3)) {
-                final BlockPos fk8 = kv4.readBlockPos();
-                final int integer6 = kv4.readInt();
-                final String string15 = kv4.readUtf();
-                final int integer19 = kv4.readInt();
-                this.minecraft.debugRenderer.gameTestDebugRenderer.addMarker(fk8, integer6, string15, integer19);
+            else if (ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_ADD_MARKER.equals(uh3)) {
+                final BlockPos fu8 = mg4.readBlockPos();
+                final int integer6 = mg4.readInt();
+                final String string16 = mg4.readUtf();
+                final int integer22 = mg4.readInt();
+                this.minecraft.debugRenderer.gameTestDebugRenderer.addMarker(fu8, integer6, string16, integer22);
             }
             else {
-                ClientPacketListener.LOGGER.warn("Unknown custom packed identifier: {}", sm3);
+                ClientPacketListener.LOGGER.warn("Unknown custom packed identifier: {}", uh3);
             }
         }
         finally {
-            if (kv4 != null) {
-                kv4.release();
+            if (mg4 != null) {
+                mg4.release();
             }
         }
     }
     
     @Override
-    public void handleAddObjective(final ClientboundSetObjectivePacket oq) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oq, this, this.minecraft);
-        final Scoreboard cwl3 = this.level.getScoreboard();
-        final String string4 = oq.getObjectiveName();
-        if (oq.getMethod() == 0) {
-            cwl3.addObjective(string4, ObjectiveCriteria.DUMMY, oq.getDisplayName(), oq.getRenderType());
+    public void handleAddObjective(final ClientboundSetObjectivePacket qf) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qf, this, this.minecraft);
+        final Scoreboard dfm3 = this.level.getScoreboard();
+        final String string4 = qf.getObjectiveName();
+        if (qf.getMethod() == 0) {
+            dfm3.addObjective(string4, ObjectiveCriteria.DUMMY, qf.getDisplayName(), qf.getRenderType());
         }
-        else if (cwl3.hasObjective(string4)) {
-            final Objective cwi5 = cwl3.getObjective(string4);
-            if (oq.getMethod() == 1) {
-                cwl3.removeObjective(cwi5);
+        else if (dfm3.hasObjective(string4)) {
+            final Objective dfj5 = dfm3.getObjective(string4);
+            if (qf.getMethod() == 1) {
+                dfm3.removeObjective(dfj5);
             }
-            else if (oq.getMethod() == 2) {
-                cwi5.setRenderType(oq.getRenderType());
-                cwi5.setDisplayName(oq.getDisplayName());
+            else if (qf.getMethod() == 2) {
+                dfj5.setRenderType(qf.getRenderType());
+                dfj5.setDisplayName(qf.getDisplayName());
             }
         }
     }
     
     @Override
-    public void handleSetScore(final ClientboundSetScorePacket ot) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ot, this, this.minecraft);
-        final Scoreboard cwl3 = this.level.getScoreboard();
-        final String string4 = ot.getObjectiveName();
-        switch (ot.getMethod()) {
+    public void handleSetScore(final ClientboundSetScorePacket qi) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qi, this, this.minecraft);
+        final Scoreboard dfm3 = this.level.getScoreboard();
+        final String string4 = qi.getObjectiveName();
+        switch (qi.getMethod()) {
             case CHANGE: {
-                final Objective cwi5 = cwl3.getOrCreateObjective(string4);
-                final Score cwk6 = cwl3.getOrCreatePlayerScore(ot.getOwner(), cwi5);
-                cwk6.setScore(ot.getScore());
+                final Objective dfj5 = dfm3.getOrCreateObjective(string4);
+                final Score dfl6 = dfm3.getOrCreatePlayerScore(qi.getOwner(), dfj5);
+                dfl6.setScore(qi.getScore());
                 break;
             }
             case REMOVE: {
-                cwl3.resetPlayerScore(ot.getOwner(), cwl3.getObjective(string4));
+                dfm3.resetPlayerScore(qi.getOwner(), dfm3.getObjective(string4));
                 break;
             }
         }
     }
     
     @Override
-    public void handleSetDisplayObjective(final ClientboundSetDisplayObjectivePacket oj) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oj, this, this.minecraft);
-        final Scoreboard cwl3 = this.level.getScoreboard();
-        final String string4 = oj.getObjectiveName();
-        final Objective cwi5 = (string4 == null) ? null : cwl3.getOrCreateObjective(string4);
-        cwl3.setDisplayObjective(oj.getSlot(), cwi5);
+    public void handleSetDisplayObjective(final ClientboundSetDisplayObjectivePacket py) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)py, this, this.minecraft);
+        final Scoreboard dfm3 = this.level.getScoreboard();
+        final String string4 = py.getObjectiveName();
+        final Objective dfj5 = (string4 == null) ? null : dfm3.getOrCreateObjective(string4);
+        dfm3.setDisplayObjective(py.getSlot(), dfj5);
     }
     
     @Override
-    public void handleSetPlayerTeamPacket(final ClientboundSetPlayerTeamPacket os) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)os, this, this.minecraft);
-        final Scoreboard cwl3 = this.level.getScoreboard();
-        PlayerTeam cwj4;
-        if (os.getMethod() == 0) {
-            cwj4 = cwl3.addPlayerTeam(os.getName());
+    public void handleSetPlayerTeamPacket(final ClientboundSetPlayerTeamPacket qh) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qh, this, this.minecraft);
+        final Scoreboard dfm3 = this.level.getScoreboard();
+        PlayerTeam dfk4;
+        if (qh.getMethod() == 0) {
+            dfk4 = dfm3.addPlayerTeam(qh.getName());
         }
         else {
-            cwj4 = cwl3.getPlayerTeam(os.getName());
+            dfk4 = dfm3.getPlayerTeam(qh.getName());
         }
-        if (os.getMethod() == 0 || os.getMethod() == 2) {
-            cwj4.setDisplayName(os.getDisplayName());
-            cwj4.setColor(os.getColor());
-            cwj4.unpackOptions(os.getOptions());
-            final Team.Visibility b5 = Team.Visibility.byName(os.getNametagVisibility());
+        if (qh.getMethod() == 0 || qh.getMethod() == 2) {
+            dfk4.setDisplayName(qh.getDisplayName());
+            dfk4.setColor(qh.getColor());
+            dfk4.unpackOptions(qh.getOptions());
+            final Team.Visibility b5 = Team.Visibility.byName(qh.getNametagVisibility());
             if (b5 != null) {
-                cwj4.setNameTagVisibility(b5);
+                dfk4.setNameTagVisibility(b5);
             }
-            final Team.CollisionRule a6 = Team.CollisionRule.byName(os.getCollisionRule());
+            final Team.CollisionRule a6 = Team.CollisionRule.byName(qh.getCollisionRule());
             if (a6 != null) {
-                cwj4.setCollisionRule(a6);
+                dfk4.setCollisionRule(a6);
             }
-            cwj4.setPlayerPrefix(os.getPlayerPrefix());
-            cwj4.setPlayerSuffix(os.getPlayerSuffix());
+            dfk4.setPlayerPrefix(qh.getPlayerPrefix());
+            dfk4.setPlayerSuffix(qh.getPlayerSuffix());
         }
-        if (os.getMethod() == 0 || os.getMethod() == 3) {
-            for (final String string6 : os.getPlayers()) {
-                cwl3.addPlayerToTeam(string6, cwj4);
+        if (qh.getMethod() == 0 || qh.getMethod() == 3) {
+            for (final String string6 : qh.getPlayers()) {
+                dfm3.addPlayerToTeam(string6, dfk4);
             }
         }
-        if (os.getMethod() == 4) {
-            for (final String string6 : os.getPlayers()) {
-                cwl3.removePlayerFromTeam(string6, cwj4);
+        if (qh.getMethod() == 4) {
+            for (final String string6 : qh.getPlayers()) {
+                dfm3.removePlayerFromTeam(string6, dfk4);
             }
         }
-        if (os.getMethod() == 1) {
-            cwl3.removePlayerTeam(cwj4);
+        if (qh.getMethod() == 1) {
+            dfm3.removePlayerTeam(dfk4);
         }
     }
     
     @Override
-    public void handleParticleEvent(final ClientboundLevelParticlesPacket nh) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nh, this, this.minecraft);
-        if (nh.getCount() == 0) {
-            final double double3 = nh.getMaxSpeed() * nh.getXDist();
-            final double double4 = nh.getMaxSpeed() * nh.getYDist();
-            final double double5 = nh.getMaxSpeed() * nh.getZDist();
+    public void handleParticleEvent(final ClientboundLevelParticlesPacket ov) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ov, this, this.minecraft);
+        if (ov.getCount() == 0) {
+            final double double3 = ov.getMaxSpeed() * ov.getXDist();
+            final double double4 = ov.getMaxSpeed() * ov.getYDist();
+            final double double5 = ov.getMaxSpeed() * ov.getZDist();
             try {
-                this.level.addParticle(nh.getParticle(), nh.isOverrideLimiter(), nh.getX(), nh.getY(), nh.getZ(), double3, double4, double5);
+                this.level.addParticle(ov.getParticle(), ov.isOverrideLimiter(), ov.getX(), ov.getY(), ov.getZ(), double3, double4, double5);
             }
             catch (Throwable throwable9) {
-                ClientPacketListener.LOGGER.warn("Could not spawn particle effect {}", nh.getParticle());
+                ClientPacketListener.LOGGER.warn("Could not spawn particle effect {}", ov.getParticle());
             }
         }
         else {
-            for (int integer3 = 0; integer3 < nh.getCount(); ++integer3) {
-                final double double6 = this.random.nextGaussian() * nh.getXDist();
-                final double double7 = this.random.nextGaussian() * nh.getYDist();
-                final double double8 = this.random.nextGaussian() * nh.getZDist();
-                final double double9 = this.random.nextGaussian() * nh.getMaxSpeed();
-                final double double10 = this.random.nextGaussian() * nh.getMaxSpeed();
-                final double double11 = this.random.nextGaussian() * nh.getMaxSpeed();
+            for (int integer3 = 0; integer3 < ov.getCount(); ++integer3) {
+                final double double6 = this.random.nextGaussian() * ov.getXDist();
+                final double double7 = this.random.nextGaussian() * ov.getYDist();
+                final double double8 = this.random.nextGaussian() * ov.getZDist();
+                final double double9 = this.random.nextGaussian() * ov.getMaxSpeed();
+                final double double10 = this.random.nextGaussian() * ov.getMaxSpeed();
+                final double double11 = this.random.nextGaussian() * ov.getMaxSpeed();
                 try {
-                    this.level.addParticle(nh.getParticle(), nh.isOverrideLimiter(), nh.getX() + double6, nh.getY() + double7, nh.getZ() + double8, double9, double10, double11);
+                    this.level.addParticle(ov.getParticle(), ov.isOverrideLimiter(), ov.getX() + double6, ov.getY() + double7, ov.getZ() + double8, double9, double10, double11);
                 }
                 catch (Throwable throwable10) {
-                    ClientPacketListener.LOGGER.warn("Could not spawn particle effect {}", nh.getParticle());
+                    ClientPacketListener.LOGGER.warn("Could not spawn particle effect {}", ov.getParticle());
                     return;
                 }
             }
@@ -2077,101 +2127,103 @@ public class ClientPacketListener implements ClientGamePacketListener {
     }
     
     @Override
-    public void handleUpdateAttributes(final ClientboundUpdateAttributesPacket pf) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pf, this, this.minecraft);
-        final Entity akq3 = this.level.getEntity(pf.getEntityId());
-        if (akq3 == null) {
+    public void handleUpdateAttributes(final ClientboundUpdateAttributesPacket qt) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)qt, this, this.minecraft);
+        final Entity aom3 = this.level.getEntity(qt.getEntityId());
+        if (aom3 == null) {
             return;
         }
-        if (!(akq3 instanceof LivingEntity)) {
-            throw new IllegalStateException("Server tried to update attributes of a non-living entity (actually: " + akq3 + ")");
+        if (!(aom3 instanceof LivingEntity)) {
+            throw new IllegalStateException("Server tried to update attributes of a non-living entity (actually: " + aom3 + ")");
         }
-        final BaseAttributeMap alu4 = ((LivingEntity)akq3).getAttributes();
-        for (final ClientboundUpdateAttributesPacket.AttributeSnapshot a6 : pf.getValues()) {
-            AttributeInstance alr7 = alu4.getInstance(a6.getName());
-            if (alr7 == null) {
-                alr7 = alu4.registerAttribute(new RangedAttribute(null, a6.getName(), 0.0, Double.MIN_NORMAL, Double.MAX_VALUE));
+        final AttributeMap apu4 = ((LivingEntity)aom3).getAttributes();
+        for (final ClientboundUpdateAttributesPacket.AttributeSnapshot a6 : qt.getValues()) {
+            final AttributeInstance apt7 = apu4.getInstance(a6.getAttribute());
+            if (apt7 == null) {
+                ClientPacketListener.LOGGER.warn("Entity {} does not have attribute {}", aom3, Registry.ATTRIBUTE.getKey(a6.getAttribute()));
             }
-            alr7.setBaseValue(a6.getBase());
-            alr7.removeModifiers();
-            for (final AttributeModifier als9 : a6.getModifiers()) {
-                alr7.addModifier(als9);
+            else {
+                apt7.setBaseValue(a6.getBase());
+                apt7.removeModifiers();
+                for (final AttributeModifier apv9 : a6.getModifiers()) {
+                    apt7.addTransientModifier(apv9);
+                }
             }
         }
     }
     
     @Override
-    public void handlePlaceRecipe(final ClientboundPlaceGhostRecipePacket nr) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nr, this, this.minecraft);
-        final AbstractContainerMenu ban3 = this.minecraft.player.containerMenu;
-        if (ban3.containerId != nr.getContainerId() || !ban3.isSynched(this.minecraft.player)) {
+    public void handlePlaceRecipe(final ClientboundPlaceGhostRecipePacket pf) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pf, this, this.minecraft);
+        final AbstractContainerMenu bgi3 = this.minecraft.player.containerMenu;
+        if (bgi3.containerId != pf.getContainerId() || !bgi3.isSynched(this.minecraft.player)) {
             return;
         }
-        RecipeBookComponent dip4;
+        RecipeBookComponent dtn4;
         final AbstractContainerMenu abstractContainerMenu;
-        this.recipeManager.byKey(nr.getRecipe()).ifPresent(bgw -> {
+        this.recipeManager.byKey(pf.getRecipe()).ifPresent(bmu -> {
             if (this.minecraft.screen instanceof RecipeUpdateListener) {
-                dip4 = ((RecipeUpdateListener)this.minecraft.screen).getRecipeBookComponent();
-                dip4.setupGhostRecipe(bgw, abstractContainerMenu.slots);
+                dtn4 = ((RecipeUpdateListener)this.minecraft.screen).getRecipeBookComponent();
+                dtn4.setupGhostRecipe(bmu, abstractContainerMenu.slots);
             }
         });
     }
     
     @Override
-    public void handleLightUpdatePacked(final ClientboundLightUpdatePacket ni) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ni, this, this.minecraft);
-        final int integer3 = ni.getX();
-        final int integer4 = ni.getZ();
-        final LevelLightEngine coa5 = this.level.getChunkSource().getLightEngine();
-        final int integer5 = ni.getSkyYMask();
-        final int integer6 = ni.getEmptySkyYMask();
-        final Iterator<byte[]> iterator8 = ni.getSkyUpdates().iterator();
-        this.readSectionList(integer3, integer4, coa5, LightLayer.SKY, integer5, integer6, iterator8);
-        final int integer7 = ni.getBlockYMask();
-        final int integer8 = ni.getEmptyBlockYMask();
-        final Iterator<byte[]> iterator9 = ni.getBlockUpdates().iterator();
-        this.readSectionList(integer3, integer4, coa5, LightLayer.BLOCK, integer7, integer8, iterator9);
+    public void handleLightUpdatePacked(final ClientboundLightUpdatePacket ow) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)ow, this, this.minecraft);
+        final int integer3 = ow.getX();
+        final int integer4 = ow.getZ();
+        final LevelLightEngine cwr5 = this.level.getChunkSource().getLightEngine();
+        final int integer5 = ow.getSkyYMask();
+        final int integer6 = ow.getEmptySkyYMask();
+        final Iterator<byte[]> iterator8 = ow.getSkyUpdates().iterator();
+        this.readSectionList(integer3, integer4, cwr5, LightLayer.SKY, integer5, integer6, iterator8, ow.getTrustEdges());
+        final int integer7 = ow.getBlockYMask();
+        final int integer8 = ow.getEmptyBlockYMask();
+        final Iterator<byte[]> iterator9 = ow.getBlockUpdates().iterator();
+        this.readSectionList(integer3, integer4, cwr5, LightLayer.BLOCK, integer7, integer8, iterator9, ow.getTrustEdges());
     }
     
     @Override
-    public void handleMerchantOffers(final ClientboundMerchantOffersPacket nl) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nl, this, this.minecraft);
-        final AbstractContainerMenu ban3 = this.minecraft.player.containerMenu;
-        if (nl.getContainerId() == ban3.containerId && ban3 instanceof MerchantMenu) {
-            ((MerchantMenu)ban3).setOffers(new MerchantOffers(nl.getOffers().createTag()));
-            ((MerchantMenu)ban3).setXp(nl.getVillagerXp());
-            ((MerchantMenu)ban3).setMerchantLevel(nl.getVillagerLevel());
-            ((MerchantMenu)ban3).setShowProgressBar(nl.showProgress());
-            ((MerchantMenu)ban3).setCanRestock(nl.canRestock());
+    public void handleMerchantOffers(final ClientboundMerchantOffersPacket oz) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oz, this, this.minecraft);
+        final AbstractContainerMenu bgi3 = this.minecraft.player.containerMenu;
+        if (oz.getContainerId() == bgi3.containerId && bgi3 instanceof MerchantMenu) {
+            ((MerchantMenu)bgi3).setOffers(new MerchantOffers(oz.getOffers().createTag()));
+            ((MerchantMenu)bgi3).setXp(oz.getVillagerXp());
+            ((MerchantMenu)bgi3).setMerchantLevel(oz.getVillagerLevel());
+            ((MerchantMenu)bgi3).setShowProgressBar(oz.showProgress());
+            ((MerchantMenu)bgi3).setCanRestock(oz.canRestock());
         }
     }
     
     @Override
-    public void handleSetChunkCacheRadius(final ClientboundSetChunkCacheRadiusPacket oi) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oi, this, this.minecraft);
-        this.serverChunkRadius = oi.getRadius();
-        this.level.getChunkSource().updateViewRadius(oi.getRadius());
+    public void handleSetChunkCacheRadius(final ClientboundSetChunkCacheRadiusPacket pw) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pw, this, this.minecraft);
+        this.serverChunkRadius = pw.getRadius();
+        this.level.getChunkSource().updateViewRadius(pw.getRadius());
     }
     
     @Override
-    public void handleSetChunkCacheCenter(final ClientboundSetChunkCacheCenterPacket oh) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)oh, this, this.minecraft);
-        this.level.getChunkSource().updateViewCenter(oh.getX(), oh.getZ());
+    public void handleSetChunkCacheCenter(final ClientboundSetChunkCacheCenterPacket pv) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)pv, this, this.minecraft);
+        this.level.getChunkSource().updateViewCenter(pv.getX(), pv.getZ());
     }
     
     @Override
-    public void handleBlockBreakAck(final ClientboundBlockBreakAckPacket mf) {
-        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)mf, this, this.minecraft);
-        this.minecraft.gameMode.handleBlockBreakAck(this.level, mf.getPos(), mf.getState(), mf.action(), mf.allGood());
+    public void handleBlockBreakAck(final ClientboundBlockBreakAckPacket nt) {
+        PacketUtils.<ClientPacketListener>ensureRunningOnSameThread((Packet<ClientPacketListener>)nt, this, this.minecraft);
+        this.minecraft.gameMode.handleBlockBreakAck(this.level, nt.getPos(), nt.getState(), nt.action(), nt.allGood());
     }
     
-    private void readSectionList(final int integer1, final int integer2, final LevelLightEngine coa, final LightLayer bkf, final int integer5, final int integer6, final Iterator<byte[]> iterator) {
+    private void readSectionList(final int integer1, final int integer2, final LevelLightEngine cwr, final LightLayer bqi, final int integer5, final int integer6, final Iterator<byte[]> iterator, final boolean boolean8) {
         for (int integer7 = 0; integer7 < 18; ++integer7) {
             final int integer8 = -1 + integer7;
-            final boolean boolean11 = (integer5 & 1 << integer7) != 0x0;
-            final boolean boolean12 = (integer6 & 1 << integer7) != 0x0;
-            if (boolean11 || boolean12) {
-                coa.queueSectionData(bkf, SectionPos.of(integer1, integer8, integer2), boolean11 ? new DataLayer(iterator.next().clone()) : new DataLayer());
+            final boolean boolean9 = (integer5 & 1 << integer7) != 0x0;
+            final boolean boolean10 = (integer6 & 1 << integer7) != 0x0;
+            if (boolean9 || boolean10) {
+                cwr.queueSectionData(bqi, SectionPos.of(integer1, integer8, integer2), boolean9 ? new DataLayer(iterator.next().clone()) : new DataLayer(), boolean8);
                 this.level.setSectionDirtyWithNeighbors(integer1, integer8, integer2);
             }
         }
@@ -2193,9 +2245,9 @@ public class ClientPacketListener implements ClientGamePacketListener {
     
     @Nullable
     public PlayerInfo getPlayerInfo(final String string) {
-        for (final PlayerInfo dns4 : this.playerInfoMap.values()) {
-            if (dns4.getProfile().getName().equals(string)) {
-                return dns4;
+        for (final PlayerInfo dyq4 : this.playerInfoMap.values()) {
+            if (dyq4.getProfile().getName().equals(string)) {
+                return dyq4;
             }
         }
         return null;
@@ -2229,6 +2281,14 @@ public class ClientPacketListener implements ClientGamePacketListener {
         return this.id;
     }
     
+    public Set<ResourceKey<Level>> levels() {
+        return this.levels;
+    }
+    
+    public RegistryAccess registryAccess() {
+        return this.registryAccess;
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
     }
diff --git a/src/net/minecraft/client/multiplayer/ClientSuggestionProvider.java b/src/net/minecraft/client/multiplayer/ClientSuggestionProvider.java
index 65fcc09..77d9767 100644
--- a/src/net/minecraft/client/multiplayer/ClientSuggestionProvider.java
+++ b/src/net/minecraft/client/multiplayer/ClientSuggestionProvider.java
@@ -1,5 +1,8 @@
 package net.minecraft.client.multiplayer;
 
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import java.util.Set;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.BlockHitResult;
@@ -29,17 +32,17 @@ public class ClientSuggestionProvider implements SharedSuggestionProvider {
     private int pendingSuggestionsId;
     private CompletableFuture<Suggestions> pendingSuggestionsFuture;
     
-    public ClientSuggestionProvider(final ClientPacketListener dnp, final Minecraft dbn) {
+    public ClientSuggestionProvider(final ClientPacketListener dyn, final Minecraft dlx) {
         this.pendingSuggestionsId = -1;
-        this.connection = dnp;
-        this.minecraft = dbn;
+        this.connection = dyn;
+        this.minecraft = dlx;
     }
     
     @Override
     public Collection<String> getOnlinePlayerNames() {
         final List<String> list2 = Lists.newArrayList();
-        for (final PlayerInfo dns4 : this.connection.getOnlinePlayers()) {
-            list2.add(dns4.getProfile().getName());
+        for (final PlayerInfo dyq4 : this.connection.getOnlinePlayers()) {
+            list2.add(dyq4.getProfile().getName());
         }
         return list2;
     }
@@ -69,8 +72,8 @@ public class ClientSuggestionProvider implements SharedSuggestionProvider {
     
     @Override
     public boolean hasPermission(final int integer) {
-        final LocalPlayer dqb3 = this.minecraft.player;
-        return (dqb3 != null) ? dqb3.hasPermissions(integer) : (integer == 0);
+        final LocalPlayer ebf3 = this.minecraft.player;
+        return (ebf3 != null) ? ebf3.hasPermissions(integer) : (integer == 0);
     }
     
     @Override
@@ -94,22 +97,27 @@ public class ClientSuggestionProvider implements SharedSuggestionProvider {
     
     @Override
     public Collection<TextCoordinates> getRelevantCoordinates() {
-        final HitResult cvi2 = this.minecraft.hitResult;
-        if (cvi2 == null || cvi2.getType() != HitResult.Type.BLOCK) {
+        final HitResult dej2 = this.minecraft.hitResult;
+        if (dej2 == null || dej2.getType() != HitResult.Type.BLOCK) {
             return super.getRelevantCoordinates();
         }
-        final BlockPos fk3 = ((BlockHitResult)cvi2).getBlockPos();
-        return Collections.<TextCoordinates>singleton(new TextCoordinates(prettyPrint(fk3.getX()), prettyPrint(fk3.getY()), prettyPrint(fk3.getZ())));
+        final BlockPos fu3 = ((BlockHitResult)dej2).getBlockPos();
+        return Collections.<TextCoordinates>singleton(new TextCoordinates(prettyPrint(fu3.getX()), prettyPrint(fu3.getY()), prettyPrint(fu3.getZ())));
     }
     
     @Override
     public Collection<TextCoordinates> getAbsoluteCoordinates() {
-        final HitResult cvi2 = this.minecraft.hitResult;
-        if (cvi2 == null || cvi2.getType() != HitResult.Type.BLOCK) {
+        final HitResult dej2 = this.minecraft.hitResult;
+        if (dej2 == null || dej2.getType() != HitResult.Type.BLOCK) {
             return super.getAbsoluteCoordinates();
         }
-        final Vec3 cvl3 = cvi2.getLocation();
-        return Collections.<TextCoordinates>singleton(new TextCoordinates(prettyPrint(cvl3.x), prettyPrint(cvl3.y), prettyPrint(cvl3.z)));
+        final Vec3 dem3 = dej2.getLocation();
+        return Collections.<TextCoordinates>singleton(new TextCoordinates(prettyPrint(dem3.x), prettyPrint(dem3.y), prettyPrint(dem3.z)));
+    }
+    
+    @Override
+    public Set<ResourceKey<Level>> levels() {
+        return this.connection.levels();
     }
     
     public void completeCustomSuggestions(final int integer, final Suggestions suggestions) {
diff --git a/src/net/minecraft/client/multiplayer/MultiPlayerGameMode.java b/src/net/minecraft/client/multiplayer/MultiPlayerGameMode.java
index 32d4d58..58ba09e 100644
--- a/src/net/minecraft/client/multiplayer/MultiPlayerGameMode.java
+++ b/src/net/minecraft/client/multiplayer/MultiPlayerGameMode.java
@@ -31,6 +31,7 @@ import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.core.Direction;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
@@ -40,7 +41,6 @@ import net.minecraft.world.level.block.StructureBlock;
 import net.minecraft.world.level.block.CommandBlock;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.Direction;
 import net.minecraft.world.phys.PosAndRot;
 import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
 import com.mojang.datafixers.util.Pair;
@@ -62,92 +62,95 @@ public class MultiPlayerGameMode {
     private int destroyDelay;
     private boolean isDestroying;
     private GameType localPlayerMode;
+    private GameType previousLocalPlayerMode;
     private final Object2ObjectLinkedOpenHashMap<Pair<BlockPos, ServerboundPlayerActionPacket.Action>, PosAndRot> unAckedActions;
     private int carriedIndex;
     
-    public MultiPlayerGameMode(final Minecraft dbn, final ClientPacketListener dnp) {
+    public MultiPlayerGameMode(final Minecraft dlx, final ClientPacketListener dyn) {
         this.destroyBlockPos = new BlockPos(-1, -1, -1);
         this.destroyingItem = ItemStack.EMPTY;
         this.localPlayerMode = GameType.SURVIVAL;
+        this.previousLocalPlayerMode = GameType.NOT_SET;
         this.unAckedActions = (Object2ObjectLinkedOpenHashMap<Pair<BlockPos, ServerboundPlayerActionPacket.Action>, PosAndRot>)new Object2ObjectLinkedOpenHashMap();
-        this.minecraft = dbn;
-        this.connection = dnp;
+        this.minecraft = dlx;
+        this.connection = dyn;
     }
     
-    public static void creativeDestroyBlock(final Minecraft dbn, final MultiPlayerGameMode dnr, final BlockPos fk, final Direction fp) {
-        if (!dbn.level.extinguishFire(dbn.player, fk, fp)) {
-            dnr.destroyBlock(fk);
+    public void adjustPlayer(final Player bec) {
+        this.localPlayerMode.updatePlayerAbilities(bec.abilities);
+    }
+    
+    public void setPreviousLocalMode(final GameType bpy) {
+        this.previousLocalPlayerMode = bpy;
+    }
+    
+    public void setLocalMode(final GameType bpy) {
+        if (bpy != this.localPlayerMode) {
+            this.previousLocalPlayerMode = this.localPlayerMode;
         }
-    }
-    
-    public void adjustPlayer(final Player ayj) {
-        this.localPlayerMode.updatePlayerAbilities(ayj.abilities);
-    }
-    
-    public void setLocalMode(final GameType bjt) {
-        (this.localPlayerMode = bjt).updatePlayerAbilities(this.minecraft.player.abilities);
+        (this.localPlayerMode = bpy).updatePlayerAbilities(this.minecraft.player.abilities);
     }
     
     public boolean canHurtPlayer() {
         return this.localPlayerMode.isSurvival();
     }
     
-    public boolean destroyBlock(final BlockPos fk) {
-        if (this.minecraft.player.blockActionRestricted(this.minecraft.level, fk, this.localPlayerMode)) {
+    public boolean destroyBlock(final BlockPos fu) {
+        if (this.minecraft.player.blockActionRestricted(this.minecraft.level, fu, this.localPlayerMode)) {
             return false;
         }
-        final Level bjw3 = this.minecraft.level;
-        final BlockState byj4 = bjw3.getBlockState(fk);
-        if (!this.minecraft.player.getMainHandItem().getItem().canAttackBlock(byj4, bjw3, fk, this.minecraft.player)) {
+        final Level bqb3 = this.minecraft.level;
+        final BlockState cfj4 = bqb3.getBlockState(fu);
+        if (!this.minecraft.player.getMainHandItem().getItem().canAttackBlock(cfj4, bqb3, fu, this.minecraft.player)) {
             return false;
         }
-        final Block bph5 = byj4.getBlock();
-        if ((bph5 instanceof CommandBlock || bph5 instanceof StructureBlock || bph5 instanceof JigsawBlock) && !this.minecraft.player.canUseGameMasterBlocks()) {
+        final Block bvr5 = cfj4.getBlock();
+        if ((bvr5 instanceof CommandBlock || bvr5 instanceof StructureBlock || bvr5 instanceof JigsawBlock) && !this.minecraft.player.canUseGameMasterBlocks()) {
             return false;
         }
-        if (byj4.isAir()) {
+        if (cfj4.isAir()) {
             return false;
         }
-        bph5.playerWillDestroy(bjw3, fk, byj4, this.minecraft.player);
-        final FluidState coj6 = bjw3.getFluidState(fk);
-        final boolean boolean7 = bjw3.setBlock(fk, coj6.createLegacyBlock(), 11);
+        bvr5.playerWillDestroy(bqb3, fu, cfj4, this.minecraft.player);
+        final FluidState cxa6 = bqb3.getFluidState(fu);
+        final boolean boolean7 = bqb3.setBlock(fu, cxa6.createLegacyBlock(), 11);
         if (boolean7) {
-            bph5.destroy(bjw3, fk, byj4);
+            bvr5.destroy(bqb3, fu, cfj4);
         }
         return boolean7;
     }
     
-    public boolean startDestroyBlock(final BlockPos fk, final Direction fp) {
-        if (this.minecraft.player.blockActionRestricted(this.minecraft.level, fk, this.localPlayerMode)) {
+    public boolean startDestroyBlock(final BlockPos fu, final Direction fz) {
+        if (this.minecraft.player.blockActionRestricted(this.minecraft.level, fu, this.localPlayerMode)) {
             return false;
         }
-        if (!this.minecraft.level.getWorldBorder().isWithinBounds(fk)) {
+        if (!this.minecraft.level.getWorldBorder().isWithinBounds(fu)) {
             return false;
         }
         if (this.localPlayerMode.isCreative()) {
-            final BlockState byj4 = this.minecraft.level.getBlockState(fk);
-            this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, fk, byj4, 1.0f);
-            this.sendBlockAction(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, fk, fp);
-            creativeDestroyBlock(this.minecraft, this, fk, fp);
+            final BlockState cfj4 = this.minecraft.level.getBlockState(fu);
+            this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, fu, cfj4, 1.0f);
+            this.sendBlockAction(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, fu, fz);
+            this.destroyBlock(fu);
             this.destroyDelay = 5;
         }
-        else if (!this.isDestroying || !this.sameDestroyTarget(fk)) {
+        else if (!this.isDestroying || !this.sameDestroyTarget(fu)) {
             if (this.isDestroying) {
-                this.sendBlockAction(ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, this.destroyBlockPos, fp);
+                this.sendBlockAction(ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, this.destroyBlockPos, fz);
             }
-            final BlockState byj4 = this.minecraft.level.getBlockState(fk);
-            this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, fk, byj4, 0.0f);
-            this.sendBlockAction(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, fk, fp);
-            final boolean boolean5 = !byj4.isAir();
+            final BlockState cfj4 = this.minecraft.level.getBlockState(fu);
+            this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, fu, cfj4, 0.0f);
+            this.sendBlockAction(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, fu, fz);
+            final boolean boolean5 = !cfj4.isAir();
             if (boolean5 && this.destroyProgress == 0.0f) {
-                byj4.attack(this.minecraft.level, fk, this.minecraft.player);
+                cfj4.attack(this.minecraft.level, fu, this.minecraft.player);
             }
-            if (boolean5 && byj4.getDestroyProgress(this.minecraft.player, this.minecraft.player.level, fk) >= 1.0f) {
-                this.destroyBlock(fk);
+            if (boolean5 && cfj4.getDestroyProgress(this.minecraft.player, this.minecraft.player.level, fu) >= 1.0f) {
+                this.destroyBlock(fu);
             }
             else {
                 this.isDestroying = true;
-                this.destroyBlockPos = fk;
+                this.destroyBlockPos = fu;
                 this.destroyingItem = this.minecraft.player.getMainHandItem();
                 this.destroyProgress = 0.0f;
                 this.destroyTicks = 0.0f;
@@ -159,8 +162,8 @@ public class MultiPlayerGameMode {
     
     public void stopDestroyBlock() {
         if (this.isDestroying) {
-            final BlockState byj2 = this.minecraft.level.getBlockState(this.destroyBlockPos);
-            this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, this.destroyBlockPos, byj2, -1.0f);
+            final BlockState cfj2 = this.minecraft.level.getBlockState(this.destroyBlockPos);
+            this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, this.destroyBlockPos, cfj2, -1.0f);
             this.sendBlockAction(ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, this.destroyBlockPos, Direction.DOWN);
             this.isDestroying = false;
             this.destroyProgress = 0.0f;
@@ -169,38 +172,38 @@ public class MultiPlayerGameMode {
         }
     }
     
-    public boolean continueDestroyBlock(final BlockPos fk, final Direction fp) {
+    public boolean continueDestroyBlock(final BlockPos fu, final Direction fz) {
         this.ensureHasSentCarriedItem();
         if (this.destroyDelay > 0) {
             --this.destroyDelay;
             return true;
         }
-        if (this.localPlayerMode.isCreative() && this.minecraft.level.getWorldBorder().isWithinBounds(fk)) {
+        if (this.localPlayerMode.isCreative() && this.minecraft.level.getWorldBorder().isWithinBounds(fu)) {
             this.destroyDelay = 5;
-            final BlockState byj4 = this.minecraft.level.getBlockState(fk);
-            this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, fk, byj4, 1.0f);
-            this.sendBlockAction(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, fk, fp);
-            creativeDestroyBlock(this.minecraft, this, fk, fp);
+            final BlockState cfj4 = this.minecraft.level.getBlockState(fu);
+            this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, fu, cfj4, 1.0f);
+            this.sendBlockAction(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, fu, fz);
+            this.destroyBlock(fu);
             return true;
         }
-        if (!this.sameDestroyTarget(fk)) {
-            return this.startDestroyBlock(fk, fp);
+        if (!this.sameDestroyTarget(fu)) {
+            return this.startDestroyBlock(fu, fz);
         }
-        final BlockState byj4 = this.minecraft.level.getBlockState(fk);
-        if (byj4.isAir()) {
+        final BlockState cfj4 = this.minecraft.level.getBlockState(fu);
+        if (cfj4.isAir()) {
             return this.isDestroying = false;
         }
-        this.destroyProgress += byj4.getDestroyProgress(this.minecraft.player, this.minecraft.player.level, fk);
+        this.destroyProgress += cfj4.getDestroyProgress(this.minecraft.player, this.minecraft.player.level, fu);
         if (this.destroyTicks % 4.0f == 0.0f) {
-            final SoundType bum5 = byj4.getSoundType();
-            this.minecraft.getSoundManager().play(new SimpleSoundInstance(bum5.getHitSound(), SoundSource.BLOCKS, (bum5.getVolume() + 1.0f) / 8.0f, bum5.getPitch() * 0.5f, fk));
+            final SoundType cbh5 = cfj4.getSoundType();
+            this.minecraft.getSoundManager().play(new SimpleSoundInstance(cbh5.getHitSound(), SoundSource.BLOCKS, (cbh5.getVolume() + 1.0f) / 8.0f, cbh5.getPitch() * 0.5f, fu));
         }
         ++this.destroyTicks;
-        this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, fk, byj4, Mth.clamp(this.destroyProgress, 0.0f, 1.0f));
+        this.minecraft.getTutorial().onDestroyBlock(this.minecraft.level, fu, cfj4, Mth.clamp(this.destroyProgress, 0.0f, 1.0f));
         if (this.destroyProgress >= 1.0f) {
             this.isDestroying = false;
-            this.sendBlockAction(ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, fk, fp);
-            this.destroyBlock(fk);
+            this.sendBlockAction(ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, fu, fz);
+            this.destroyBlock(fu);
             this.destroyProgress = 0.0f;
             this.destroyTicks = 0.0f;
             this.destroyDelay = 5;
@@ -226,13 +229,13 @@ public class MultiPlayerGameMode {
         }
     }
     
-    private boolean sameDestroyTarget(final BlockPos fk) {
-        final ItemStack ben3 = this.minecraft.player.getMainHandItem();
-        boolean boolean4 = this.destroyingItem.isEmpty() && ben3.isEmpty();
-        if (!this.destroyingItem.isEmpty() && !ben3.isEmpty()) {
-            boolean4 = (ben3.getItem() == this.destroyingItem.getItem() && ItemStack.tagMatches(ben3, this.destroyingItem) && (ben3.isDamageableItem() || ben3.getDamageValue() == this.destroyingItem.getDamageValue()));
+    private boolean sameDestroyTarget(final BlockPos fu) {
+        final ItemStack bki3 = this.minecraft.player.getMainHandItem();
+        boolean boolean4 = this.destroyingItem.isEmpty() && bki3.isEmpty();
+        if (!this.destroyingItem.isEmpty() && !bki3.isEmpty()) {
+            boolean4 = (bki3.getItem() == this.destroyingItem.getItem() && ItemStack.tagMatches(bki3, this.destroyingItem) && (bki3.isDamageableItem() || bki3.getDamageValue() == this.destroyingItem.getDamageValue()));
         }
-        return fk.equals(this.destroyBlockPos) && boolean4;
+        return fu.equals(this.destroyBlockPos) && boolean4;
     }
     
     private void ensureHasSentCarriedItem() {
@@ -243,125 +246,129 @@ public class MultiPlayerGameMode {
         }
     }
     
-    public InteractionResult useItemOn(final LocalPlayer dqb, final ClientLevel dno, final InteractionHand ajk, final BlockHitResult cvg) {
+    public InteractionResult useItemOn(final LocalPlayer ebf, final ClientLevel dym, final InteractionHand anf, final BlockHitResult deh) {
         this.ensureHasSentCarriedItem();
-        final BlockPos fk6 = cvg.getBlockPos();
-        if (!this.minecraft.level.getWorldBorder().isWithinBounds(fk6)) {
+        final BlockPos fu6 = deh.getBlockPos();
+        if (!this.minecraft.level.getWorldBorder().isWithinBounds(fu6)) {
             return InteractionResult.FAIL;
         }
-        final ItemStack ben7 = dqb.getItemInHand(ajk);
+        final ItemStack bki7 = ebf.getItemInHand(anf);
         if (this.localPlayerMode == GameType.SPECTATOR) {
-            this.connection.send(new ServerboundUseItemOnPacket(ajk, cvg));
+            this.connection.send(new ServerboundUseItemOnPacket(anf, deh));
             return InteractionResult.SUCCESS;
         }
-        final boolean boolean8 = !dqb.getMainHandItem().isEmpty() || !dqb.getOffhandItem().isEmpty();
-        final boolean boolean9 = dqb.isSecondaryUseActive() && boolean8;
+        final boolean boolean8 = !ebf.getMainHandItem().isEmpty() || !ebf.getOffhandItem().isEmpty();
+        final boolean boolean9 = ebf.isSecondaryUseActive() && boolean8;
         if (!boolean9) {
-            final InteractionResult ajl10 = dno.getBlockState(fk6).use(dno, dqb, ajk, cvg);
-            if (ajl10.consumesAction()) {
-                this.connection.send(new ServerboundUseItemOnPacket(ajk, cvg));
-                return ajl10;
+            final InteractionResult ang10 = dym.getBlockState(fu6).use(dym, ebf, anf, deh);
+            if (ang10.consumesAction()) {
+                this.connection.send(new ServerboundUseItemOnPacket(anf, deh));
+                return ang10;
             }
         }
-        this.connection.send(new ServerboundUseItemOnPacket(ajk, cvg));
-        if (ben7.isEmpty() || dqb.getCooldowns().isOnCooldown(ben7.getItem())) {
+        this.connection.send(new ServerboundUseItemOnPacket(anf, deh));
+        if (bki7.isEmpty() || ebf.getCooldowns().isOnCooldown(bki7.getItem())) {
             return InteractionResult.PASS;
         }
-        final UseOnContext bfz11 = new UseOnContext(dqb, ajk, cvg);
-        InteractionResult ajl10;
+        final UseOnContext blv11 = new UseOnContext(ebf, anf, deh);
+        InteractionResult ang10;
         if (this.localPlayerMode.isCreative()) {
-            final int integer12 = ben7.getCount();
-            ajl10 = ben7.useOn(bfz11);
-            ben7.setCount(integer12);
+            final int integer12 = bki7.getCount();
+            ang10 = bki7.useOn(blv11);
+            bki7.setCount(integer12);
         }
         else {
-            ajl10 = ben7.useOn(bfz11);
+            ang10 = bki7.useOn(blv11);
         }
-        return ajl10;
+        return ang10;
     }
     
-    public InteractionResult useItem(final Player ayj, final Level bjw, final InteractionHand ajk) {
+    public InteractionResult useItem(final Player bec, final Level bqb, final InteractionHand anf) {
         if (this.localPlayerMode == GameType.SPECTATOR) {
             return InteractionResult.PASS;
         }
         this.ensureHasSentCarriedItem();
-        this.connection.send(new ServerboundUseItemPacket(ajk));
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        if (ayj.getCooldowns().isOnCooldown(ben5.getItem())) {
+        this.connection.send(new ServerboundUseItemPacket(anf));
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        if (bec.getCooldowns().isOnCooldown(bki5.getItem())) {
             return InteractionResult.PASS;
         }
-        final int integer6 = ben5.getCount();
-        final InteractionResultHolder<ItemStack> ajm7 = ben5.use(bjw, ayj, ajk);
-        final ItemStack ben6 = ajm7.getObject();
-        if (ben6 != ben5 || ben6.getCount() != integer6) {
-            ayj.setItemInHand(ajk, ben6);
+        final int integer6 = bki5.getCount();
+        final InteractionResultHolder<ItemStack> anh7 = bki5.use(bqb, bec, anf);
+        final ItemStack bki6 = anh7.getObject();
+        if (bki6 != bki5) {
+            bec.setItemInHand(anf, bki6);
         }
-        return ajm7.getResult();
+        return anh7.getResult();
     }
     
-    public LocalPlayer createPlayer(final ClientLevel dno, final StatsCounter aas, final ClientRecipeBook dbc) {
-        return new LocalPlayer(this.minecraft, dno, this.connection, aas, dbc);
+    public LocalPlayer createPlayer(final ClientLevel dym, final StatsCounter acv, final ClientRecipeBook dlk) {
+        return this.createPlayer(dym, acv, dlk, false, false);
     }
     
-    public void attack(final Player ayj, final Entity akq) {
+    public LocalPlayer createPlayer(final ClientLevel dym, final StatsCounter acv, final ClientRecipeBook dlk, final boolean boolean4, final boolean boolean5) {
+        return new LocalPlayer(this.minecraft, dym, this.connection, acv, dlk, boolean4, boolean5);
+    }
+    
+    public void attack(final Player bec, final Entity aom) {
         this.ensureHasSentCarriedItem();
-        this.connection.send(new ServerboundInteractPacket(akq));
+        this.connection.send(new ServerboundInteractPacket(aom, bec.isShiftKeyDown()));
         if (this.localPlayerMode != GameType.SPECTATOR) {
-            ayj.attack(akq);
-            ayj.resetAttackStrengthTicker();
+            bec.attack(aom);
+            bec.resetAttackStrengthTicker();
         }
     }
     
-    public InteractionResult interact(final Player ayj, final Entity akq, final InteractionHand ajk) {
+    public InteractionResult interact(final Player bec, final Entity aom, final InteractionHand anf) {
         this.ensureHasSentCarriedItem();
-        this.connection.send(new ServerboundInteractPacket(akq, ajk));
+        this.connection.send(new ServerboundInteractPacket(aom, anf, bec.isShiftKeyDown()));
         if (this.localPlayerMode == GameType.SPECTATOR) {
             return InteractionResult.PASS;
         }
-        return ayj.interactOn(akq, ajk);
+        return bec.interactOn(aom, anf);
     }
     
-    public InteractionResult interactAt(final Player ayj, final Entity akq, final EntityHitResult cvh, final InteractionHand ajk) {
+    public InteractionResult interactAt(final Player bec, final Entity aom, final EntityHitResult dei, final InteractionHand anf) {
         this.ensureHasSentCarriedItem();
-        final Vec3 cvl6 = cvh.getLocation().subtract(akq.getX(), akq.getY(), akq.getZ());
-        this.connection.send(new ServerboundInteractPacket(akq, ajk, cvl6));
+        final Vec3 dem6 = dei.getLocation().subtract(aom.getX(), aom.getY(), aom.getZ());
+        this.connection.send(new ServerboundInteractPacket(aom, anf, dem6, bec.isShiftKeyDown()));
         if (this.localPlayerMode == GameType.SPECTATOR) {
             return InteractionResult.PASS;
         }
-        return akq.interactAt(ayj, cvl6, ajk);
+        return aom.interactAt(bec, dem6, anf);
     }
     
-    public ItemStack handleInventoryMouseClick(final int integer1, final int integer2, final int integer3, final ClickType bav, final Player ayj) {
-        final short short7 = ayj.containerMenu.backup(ayj.inventory);
-        final ItemStack ben8 = ayj.containerMenu.clicked(integer2, integer3, bav, ayj);
-        this.connection.send(new ServerboundContainerClickPacket(integer1, integer2, integer3, bav, ben8, short7));
-        return ben8;
+    public ItemStack handleInventoryMouseClick(final int integer1, final int integer2, final int integer3, final ClickType bgq, final Player bec) {
+        final short short7 = bec.containerMenu.backup(bec.inventory);
+        final ItemStack bki8 = bec.containerMenu.clicked(integer2, integer3, bgq, bec);
+        this.connection.send(new ServerboundContainerClickPacket(integer1, integer2, integer3, bgq, bki8, short7));
+        return bki8;
     }
     
-    public void handlePlaceRecipe(final int integer, final Recipe<?> bgw, final boolean boolean3) {
-        this.connection.send(new ServerboundPlaceRecipePacket(integer, bgw, boolean3));
+    public void handlePlaceRecipe(final int integer, final Recipe<?> bmu, final boolean boolean3) {
+        this.connection.send(new ServerboundPlaceRecipePacket(integer, bmu, boolean3));
     }
     
     public void handleInventoryButtonClick(final int integer1, final int integer2) {
         this.connection.send(new ServerboundContainerButtonClickPacket(integer1, integer2));
     }
     
-    public void handleCreativeModeItemAdd(final ItemStack ben, final int integer) {
+    public void handleCreativeModeItemAdd(final ItemStack bki, final int integer) {
         if (this.localPlayerMode.isCreative()) {
-            this.connection.send(new ServerboundSetCreativeModeSlotPacket(integer, ben));
+            this.connection.send(new ServerboundSetCreativeModeSlotPacket(integer, bki));
         }
     }
     
-    public void handleCreativeModeItemDrop(final ItemStack ben) {
-        if (this.localPlayerMode.isCreative() && !ben.isEmpty()) {
-            this.connection.send(new ServerboundSetCreativeModeSlotPacket(-1, ben));
+    public void handleCreativeModeItemDrop(final ItemStack bki) {
+        if (this.localPlayerMode.isCreative() && !bki.isEmpty()) {
+            this.connection.send(new ServerboundSetCreativeModeSlotPacket(-1, bki));
         }
     }
     
-    public void releaseUsingItem(final Player ayj) {
+    public void releaseUsingItem(final Player bec) {
         this.ensureHasSentCarriedItem();
         this.connection.send(new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.RELEASE_USE_ITEM, BlockPos.ZERO, Direction.DOWN));
-        ayj.releaseUsingItem();
+        bec.releaseUsingItem();
     }
     
     public boolean hasExperience() {
@@ -388,6 +395,10 @@ public class MultiPlayerGameMode {
         return this.localPlayerMode == GameType.SPECTATOR;
     }
     
+    public GameType getPreviousPlayerMode() {
+        return this.previousLocalPlayerMode;
+    }
+    
     public GameType getPlayerMode() {
         return this.localPlayerMode;
     }
@@ -400,25 +411,26 @@ public class MultiPlayerGameMode {
         this.connection.send(new ServerboundPickItemPacket(integer));
     }
     
-    private void sendBlockAction(final ServerboundPlayerActionPacket.Action a, final BlockPos fk, final Direction fp) {
-        final LocalPlayer dqb5 = this.minecraft.player;
-        this.unAckedActions.put(Pair.of((Object)fk, (Object)a), new PosAndRot(dqb5.position(), dqb5.xRot, dqb5.yRot));
-        this.connection.send(new ServerboundPlayerActionPacket(a, fk, fp));
+    private void sendBlockAction(final ServerboundPlayerActionPacket.Action a, final BlockPos fu, final Direction fz) {
+        final LocalPlayer ebf5 = this.minecraft.player;
+        this.unAckedActions.put(Pair.of((Object)fu, (Object)a), new PosAndRot(ebf5.position(), ebf5.xRot, ebf5.yRot));
+        this.connection.send(new ServerboundPlayerActionPacket(a, fu, fz));
     }
     
-    public void handleBlockBreakAck(final ClientLevel dno, final BlockPos fk, final BlockState byj, final ServerboundPlayerActionPacket.Action a, final boolean boolean5) {
-        final PosAndRot cvj7 = (PosAndRot)this.unAckedActions.remove(Pair.of((Object)fk, (Object)a));
-        if (cvj7 == null || !boolean5 || (a != ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK && dno.getBlockState(fk) != byj)) {
-            dno.setKnownState(fk, byj);
-            if (cvj7 != null) {
-                final Vec3 cvl8 = cvj7.pos();
-                this.minecraft.player.absMoveTo(cvl8.x, cvl8.y, cvl8.z, cvj7.yRot(), cvj7.xRot());
+    public void handleBlockBreakAck(final ClientLevel dym, final BlockPos fu, final BlockState cfj, final ServerboundPlayerActionPacket.Action a, final boolean boolean5) {
+        final PosAndRot dek7 = (PosAndRot)this.unAckedActions.remove(Pair.of((Object)fu, (Object)a));
+        final BlockState cfj2 = dym.getBlockState(fu);
+        if ((dek7 == null || !boolean5 || (a != ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK && cfj2 != cfj)) && cfj2 != cfj) {
+            dym.setKnownState(fu, cfj);
+            if (dek7 != null) {
+                final Vec3 dem9 = dek7.pos();
+                this.minecraft.player.absMoveTo(dem9.x, dem9.y, dem9.z, dek7.yRot(), dek7.xRot());
             }
         }
         while (this.unAckedActions.size() >= 50) {
-            final Pair<BlockPos, ServerboundPlayerActionPacket.Action> pair8 = (Pair<BlockPos, ServerboundPlayerActionPacket.Action>)this.unAckedActions.firstKey();
+            final Pair<BlockPos, ServerboundPlayerActionPacket.Action> pair9 = (Pair<BlockPos, ServerboundPlayerActionPacket.Action>)this.unAckedActions.firstKey();
             this.unAckedActions.removeFirst();
-            MultiPlayerGameMode.LOGGER.error("Too many unacked block actions, dropping " + pair8);
+            MultiPlayerGameMode.LOGGER.error("Too many unacked block actions, dropping " + pair9);
         }
     }
     
diff --git a/src/net/minecraft/client/multiplayer/PlayerInfo.java b/src/net/minecraft/client/multiplayer/PlayerInfo.java
index e325137..e848af1 100644
--- a/src/net/minecraft/client/multiplayer/PlayerInfo.java
+++ b/src/net/minecraft/client/multiplayer/PlayerInfo.java
@@ -47,8 +47,8 @@ public class PlayerInfo {
         return this.gameMode;
     }
     
-    protected void setGameMode(final GameType bjt) {
-        this.gameMode = bjt;
+    protected void setGameMode(final GameType bpy) {
+        this.gameMode = bpy;
     }
     
     public int getLatency() {
@@ -96,8 +96,8 @@ public class PlayerInfo {
         synchronized (this) {
             if (!this.pendingTextures) {
                 this.pendingTextures = true;
-                Minecraft.getInstance().getSkinManager().registerSkins(this.profile, (type, sm, minecraftProfileTexture) -> {
-                    this.textureLocations.put(type, sm);
+                Minecraft.getInstance().getSkinManager().registerSkins(this.profile, (type, uh, minecraftProfileTexture) -> {
+                    this.textureLocations.put(type, uh);
                     if (type == MinecraftProfileTexture.Type.SKIN) {
                         this.skinModel = minecraftProfileTexture.getMetadata("model");
                         if (this.skinModel == null) {
@@ -109,8 +109,8 @@ public class PlayerInfo {
         }
     }
     
-    public void setTabListDisplayName(@Nullable final Component lf) {
-        this.tabListDisplayName = lf;
+    public void setTabListDisplayName(@Nullable final Component mr) {
+        this.tabListDisplayName = mr;
     }
     
     @Nullable
diff --git a/src/net/minecraft/client/multiplayer/ServerAddress.java b/src/net/minecraft/client/multiplayer/ServerAddress.java
index 8ce7709..47c41ea 100644
--- a/src/net/minecraft/client/multiplayer/ServerAddress.java
+++ b/src/net/minecraft/client/multiplayer/ServerAddress.java
@@ -1,9 +1,11 @@
 package net.minecraft.client.multiplayer;
 
+import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 import java.util.Hashtable;
+import com.mojang.datafixers.util.Pair;
 import java.net.IDN;
 
 public class ServerAddress {
@@ -53,14 +55,14 @@ public class ServerAddress {
         String string4 = arr2[0];
         int integer4 = (arr2.length > 1) ? parseInt(arr2[1], 25565) : 25565;
         if (integer4 == 25565) {
-            final String[] arr3 = lookupSrv(string4);
-            string4 = arr3[0];
-            integer4 = parseInt(arr3[1], 25565);
+            final Pair<String, Integer> pair5 = lookupSrv(string4);
+            string4 = (String)pair5.getFirst();
+            integer4 = (int)pair5.getSecond();
         }
         return new ServerAddress(string4, integer4);
     }
     
-    private static String[] lookupSrv(final String string) {
+    private static Pair<String, Integer> lookupSrv(final String string) {
         try {
             final String string2 = "com.sun.jndi.dns.DnsContextFactory";
             Class.forName("com.sun.jndi.dns.DnsContextFactory");
@@ -70,12 +72,14 @@ public class ServerAddress {
             hashtable3.put("com.sun.jndi.dns.timeout.retries", "1");
             final DirContext dirContext4 = new InitialDirContext(hashtable3);
             final Attributes attributes5 = dirContext4.getAttributes("_minecraft._tcp." + string, new String[] { "SRV" });
-            final String[] arr6 = attributes5.get("srv").get().toString().split(" ", 4);
-            return new String[] { arr6[3], arr6[2] };
-        }
-        catch (Throwable throwable2) {
-            return new String[] { string, Integer.toString(25565) };
+            final Attribute attribute6 = attributes5.get("srv");
+            if (attribute6 != null) {
+                final String[] arr7 = attribute6.get().toString().split(" ", 4);
+                return (Pair<String, Integer>)Pair.of(arr7[3], parseInt(arr7[2], 25565));
+            }
         }
+        catch (Throwable t) {}
+        return (Pair<String, Integer>)Pair.of(string, 25565);
     }
     
     private static int parseInt(final String string, final int integer) {
diff --git a/src/net/minecraft/client/multiplayer/ServerData.java b/src/net/minecraft/client/multiplayer/ServerData.java
index 1c2f029..e0b1c66 100644
--- a/src/net/minecraft/client/multiplayer/ServerData.java
+++ b/src/net/minecraft/client/multiplayer/ServerData.java
@@ -1,28 +1,33 @@
 package net.minecraft.client.multiplayer;
 
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.network.chat.Component;
-import javax.annotation.Nullable;
 import net.minecraft.nbt.CompoundTag;
+import java.util.Collections;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.SharedConstants;
+import javax.annotation.Nullable;
+import java.util.List;
+import net.minecraft.network.chat.Component;
 
 public class ServerData {
     public String name;
     public String ip;
-    public String status;
-    public String motd;
+    public Component status;
+    public Component motd;
     public long ping;
     public int protocol;
-    public String version;
+    public Component version;
     public boolean pinged;
-    public String playerList;
+    public List<Component> playerList;
     private ServerPackStatus packStatus;
+    @Nullable
     private String iconB64;
     private boolean lan;
     
     public ServerData(final String string1, final String string2, final boolean boolean3) {
         this.protocol = SharedConstants.getCurrentVersion().getProtocolVersion();
-        this.version = SharedConstants.getCurrentVersion().getName();
+        this.version = new TextComponent(SharedConstants.getCurrentVersion().getName());
+        this.playerList = Collections.<Component>emptyList();
         this.packStatus = ServerPackStatus.PROMPT;
         this.name = string1;
         this.ip = string2;
@@ -30,19 +35,19 @@ public class ServerData {
     }
     
     public CompoundTag write() {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.putString("name", this.name);
-        jt2.putString("ip", this.ip);
+        final CompoundTag le2 = new CompoundTag();
+        le2.putString("name", this.name);
+        le2.putString("ip", this.ip);
         if (this.iconB64 != null) {
-            jt2.putString("icon", this.iconB64);
+            le2.putString("icon", this.iconB64);
         }
         if (this.packStatus == ServerPackStatus.ENABLED) {
-            jt2.putBoolean("acceptTextures", true);
+            le2.putBoolean("acceptTextures", true);
         }
         else if (this.packStatus == ServerPackStatus.DISABLED) {
-            jt2.putBoolean("acceptTextures", false);
+            le2.putBoolean("acceptTextures", false);
         }
-        return jt2;
+        return le2;
     }
     
     public ServerPackStatus getResourcePackStatus() {
@@ -53,23 +58,23 @@ public class ServerData {
         this.packStatus = a;
     }
     
-    public static ServerData read(final CompoundTag jt) {
-        final ServerData dnu2 = new ServerData(jt.getString("name"), jt.getString("ip"), false);
-        if (jt.contains("icon", 8)) {
-            dnu2.setIconB64(jt.getString("icon"));
+    public static ServerData read(final CompoundTag le) {
+        final ServerData dys2 = new ServerData(le.getString("name"), le.getString("ip"), false);
+        if (le.contains("icon", 8)) {
+            dys2.setIconB64(le.getString("icon"));
         }
-        if (jt.contains("acceptTextures", 1)) {
-            if (jt.getBoolean("acceptTextures")) {
-                dnu2.setResourcePackStatus(ServerPackStatus.ENABLED);
+        if (le.contains("acceptTextures", 1)) {
+            if (le.getBoolean("acceptTextures")) {
+                dys2.setResourcePackStatus(ServerPackStatus.ENABLED);
             }
             else {
-                dnu2.setResourcePackStatus(ServerPackStatus.DISABLED);
+                dys2.setResourcePackStatus(ServerPackStatus.DISABLED);
             }
         }
         else {
-            dnu2.setResourcePackStatus(ServerPackStatus.PROMPT);
+            dys2.setResourcePackStatus(ServerPackStatus.PROMPT);
         }
-        return dnu2;
+        return dys2;
     }
     
     @Nullable
@@ -85,12 +90,12 @@ public class ServerData {
         return this.lan;
     }
     
-    public void copyFrom(final ServerData dnu) {
-        this.ip = dnu.ip;
-        this.name = dnu.name;
-        this.setResourcePackStatus(dnu.getResourcePackStatus());
-        this.iconB64 = dnu.iconB64;
-        this.lan = dnu.lan;
+    public void copyFrom(final ServerData dys) {
+        this.ip = dys.ip;
+        this.name = dys.name;
+        this.setResourcePackStatus(dys.getResourcePackStatus());
+        this.iconB64 = dys.iconB64;
+        this.lan = dys.lan;
     }
     
     public enum ServerPackStatus {
@@ -101,7 +106,7 @@ public class ServerData {
         private final Component name;
         
         private ServerPackStatus(final String string3) {
-            this.name = new TranslatableComponent("addServer.resourcePack." + string3, new Object[0]);
+            this.name = new TranslatableComponent("addServer.resourcePack." + string3);
         }
         
         public Component getName() {
diff --git a/src/net/minecraft/client/multiplayer/ServerList.java b/src/net/minecraft/client/multiplayer/ServerList.java
index d3e0cb5..6f0121c 100644
--- a/src/net/minecraft/client/multiplayer/ServerList.java
+++ b/src/net/minecraft/client/multiplayer/ServerList.java
@@ -3,6 +3,7 @@ package net.minecraft.client.multiplayer;
 import java.util.AbstractList;
 import org.apache.logging.log4j.LogManager;
 import java.util.Iterator;
+import net.minecraft.Util;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.CompoundTag;
@@ -18,22 +19,22 @@ public class ServerList {
     private final Minecraft minecraft;
     private final List<ServerData> serverList;
     
-    public ServerList(final Minecraft dbn) {
+    public ServerList(final Minecraft dlx) {
         this.serverList = Lists.newArrayList();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
         this.load();
     }
     
     public void load() {
         try {
             this.serverList.clear();
-            final CompoundTag jt2 = NbtIo.read(new File(this.minecraft.gameDirectory, "servers.dat"));
-            if (jt2 == null) {
+            final CompoundTag le2 = NbtIo.read(new File(this.minecraft.gameDirectory, "servers.dat"));
+            if (le2 == null) {
                 return;
             }
-            final ListTag jz3 = jt2.getList("servers", 10);
-            for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-                this.serverList.add(ServerData.read(jz3.getCompound(integer4)));
+            final ListTag lk3 = le2.getList("servers", 10);
+            for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+                this.serverList.add(ServerData.read(lk3.getCompound(integer4)));
             }
         }
         catch (Exception exception2) {
@@ -43,13 +44,17 @@ public class ServerList {
     
     public void save() {
         try {
-            final ListTag jz2 = new ListTag();
-            for (final ServerData dnu4 : this.serverList) {
-                ((AbstractList<CompoundTag>)jz2).add(dnu4.write());
+            final ListTag lk2 = new ListTag();
+            for (final ServerData dys4 : this.serverList) {
+                ((AbstractList<CompoundTag>)lk2).add(dys4.write());
             }
-            final CompoundTag jt3 = new CompoundTag();
-            jt3.put("servers", jz2);
-            NbtIo.safeWrite(jt3, new File(this.minecraft.gameDirectory, "servers.dat"));
+            final CompoundTag le3 = new CompoundTag();
+            le3.put("servers", lk2);
+            final File file4 = File.createTempFile("servers", ".dat", this.minecraft.gameDirectory);
+            NbtIo.write(le3, file4);
+            final File file5 = new File(this.minecraft.gameDirectory, "servers.dat_old");
+            final File file6 = new File(this.minecraft.gameDirectory, "servers.dat");
+            Util.safeReplaceFile(file6, file4, file5);
         }
         catch (Exception exception2) {
             ServerList.LOGGER.error("Couldn't save server list", (Throwable)exception2);
@@ -60,12 +65,12 @@ public class ServerList {
         return this.serverList.get(integer);
     }
     
-    public void remove(final ServerData dnu) {
-        this.serverList.remove(dnu);
+    public void remove(final ServerData dys) {
+        this.serverList.remove(dys);
     }
     
-    public void add(final ServerData dnu) {
-        this.serverList.add(dnu);
+    public void add(final ServerData dys) {
+        this.serverList.add(dys);
     }
     
     public int size() {
@@ -73,27 +78,27 @@ public class ServerList {
     }
     
     public void swap(final int integer1, final int integer2) {
-        final ServerData dnu4 = this.get(integer1);
+        final ServerData dys4 = this.get(integer1);
         this.serverList.set(integer1, this.get(integer2));
-        this.serverList.set(integer2, dnu4);
+        this.serverList.set(integer2, dys4);
         this.save();
     }
     
-    public void replace(final int integer, final ServerData dnu) {
-        this.serverList.set(integer, dnu);
+    public void replace(final int integer, final ServerData dys) {
+        this.serverList.set(integer, dys);
     }
     
-    public static void saveSingleServer(final ServerData dnu) {
-        final ServerList dnv2 = new ServerList(Minecraft.getInstance());
-        dnv2.load();
-        for (int integer3 = 0; integer3 < dnv2.size(); ++integer3) {
-            final ServerData dnu2 = dnv2.get(integer3);
-            if (dnu2.name.equals(dnu.name) && dnu2.ip.equals(dnu.ip)) {
-                dnv2.replace(integer3, dnu);
+    public static void saveSingleServer(final ServerData dys) {
+        final ServerList dyt2 = new ServerList(Minecraft.getInstance());
+        dyt2.load();
+        for (int integer3 = 0; integer3 < dyt2.size(); ++integer3) {
+            final ServerData dys2 = dyt2.get(integer3);
+            if (dys2.name.equals(dys.name) && dys2.ip.equals(dys.ip)) {
+                dyt2.replace(integer3, dys);
                 break;
             }
         }
-        dnv2.save();
+        dyt2.save();
     }
     
     static {
diff --git a/src/net/minecraft/client/multiplayer/ServerStatusPinger.java b/src/net/minecraft/client/multiplayer/ServerStatusPinger.java
index 6eb4f2e..c4ebd0c 100644
--- a/src/net/minecraft/client/multiplayer/ServerStatusPinger.java
+++ b/src/net/minecraft/client/multiplayer/ServerStatusPinger.java
@@ -30,13 +30,14 @@ import net.minecraft.network.protocol.status.ServerStatus;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.status.ServerboundPingRequestPacket;
 import net.minecraft.Util;
-import org.apache.commons.lang3.ArrayUtils;
+import java.util.Objects;
 import net.minecraft.ChatFormatting;
+import org.apache.commons.lang3.ArrayUtils;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket;
 import net.minecraft.network.protocol.status.ClientStatusPacketListener;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.TranslatableComponent;
 import java.net.InetAddress;
 import java.util.Collections;
 import com.google.common.collect.Lists;
@@ -54,113 +55,109 @@ public class ServerStatusPinger {
         this.connections = Collections.<Connection>synchronizedList(Lists.newArrayList());
     }
     
-    public void pingServer(final ServerData dnu) throws UnknownHostException {
-        final ServerAddress dnt3 = ServerAddress.parseString(dnu.ip);
-        final Connection kt4 = Connection.connectToServer(InetAddress.getByName(dnt3.getHost()), dnt3.getPort(), false);
-        this.connections.add(kt4);
-        dnu.motd = I18n.get("multiplayer.status.pinging");
-        dnu.ping = -1L;
-        dnu.playerList = null;
-        kt4.setListener(new ClientStatusPacketListener() {
+    public void pingServer(final ServerData dys, final Runnable runnable) throws UnknownHostException {
+        final ServerAddress dyr4 = ServerAddress.parseString(dys.ip);
+        final Connection me5 = Connection.connectToServer(InetAddress.getByName(dyr4.getHost()), dyr4.getPort(), false);
+        this.connections.add(me5);
+        dys.motd = new TranslatableComponent("multiplayer.status.pinging");
+        dys.ping = -1L;
+        dys.playerList = null;
+        me5.setListener(new ClientStatusPacketListener() {
             private boolean success;
             private boolean receivedPing;
             private long pingStart;
             
             @Override
-            public void handleStatusResponse(final ClientboundStatusResponsePacket rv) {
+            public void handleStatusResponse(final ClientboundStatusResponsePacket tk) {
                 if (this.receivedPing) {
-                    kt4.disconnect(new TranslatableComponent("multiplayer.status.unrequested", new Object[0]));
+                    me5.disconnect(new TranslatableComponent("multiplayer.status.unrequested"));
                     return;
                 }
                 this.receivedPing = true;
-                final ServerStatus rw3 = rv.getStatus();
-                if (rw3.getDescription() != null) {
-                    dnu.motd = rw3.getDescription().getColoredString();
+                final ServerStatus tl3 = tk.getStatus();
+                if (tl3.getDescription() != null) {
+                    dys.motd = tl3.getDescription();
                 }
                 else {
-                    dnu.motd = "";
+                    dys.motd = TextComponent.EMPTY;
                 }
-                if (rw3.getVersion() != null) {
-                    dnu.version = rw3.getVersion().getName();
-                    dnu.protocol = rw3.getVersion().getProtocol();
+                if (tl3.getVersion() != null) {
+                    dys.version = new TextComponent(tl3.getVersion().getName());
+                    dys.protocol = tl3.getVersion().getProtocol();
                 }
                 else {
-                    dnu.version = I18n.get("multiplayer.status.old");
-                    dnu.protocol = 0;
+                    dys.version = new TranslatableComponent("multiplayer.status.old");
+                    dys.protocol = 0;
                 }
-                if (rw3.getPlayers() != null) {
-                    dnu.status = ChatFormatting.GRAY + "" + rw3.getPlayers().getNumPlayers() + "" + ChatFormatting.DARK_GRAY + "/" + ChatFormatting.GRAY + rw3.getPlayers().getMaxPlayers();
-                    if (ArrayUtils.isNotEmpty((Object[])rw3.getPlayers().getSample())) {
-                        final StringBuilder stringBuilder4 = new StringBuilder();
-                        for (final GameProfile gameProfile8 : rw3.getPlayers().getSample()) {
-                            if (stringBuilder4.length() > 0) {
-                                stringBuilder4.append("\n");
-                            }
-                            stringBuilder4.append(gameProfile8.getName());
+                if (tl3.getPlayers() != null) {
+                    dys.status = formatPlayerCount(tl3.getPlayers().getNumPlayers(), tl3.getPlayers().getMaxPlayers());
+                    final List<Component> list4 = Lists.newArrayList();
+                    if (ArrayUtils.isNotEmpty((Object[])tl3.getPlayers().getSample())) {
+                        for (final GameProfile gameProfile8 : tl3.getPlayers().getSample()) {
+                            list4.add(new TextComponent(gameProfile8.getName()));
                         }
-                        if (rw3.getPlayers().getSample().length < rw3.getPlayers().getNumPlayers()) {
-                            if (stringBuilder4.length() > 0) {
-                                stringBuilder4.append("\n");
-                            }
-                            stringBuilder4.append(I18n.get("multiplayer.status.and_more", rw3.getPlayers().getNumPlayers() - rw3.getPlayers().getSample().length));
+                        if (tl3.getPlayers().getSample().length < tl3.getPlayers().getNumPlayers()) {
+                            list4.add(new TranslatableComponent("multiplayer.status.and_more", new Object[] { tl3.getPlayers().getNumPlayers() - tl3.getPlayers().getSample().length }));
                         }
-                        dnu.playerList = stringBuilder4.toString();
+                        dys.playerList = list4;
                     }
                 }
                 else {
-                    dnu.status = ChatFormatting.DARK_GRAY + I18n.get("multiplayer.status.unknown");
+                    dys.status = new TranslatableComponent("multiplayer.status.unknown").withStyle(ChatFormatting.DARK_GRAY);
                 }
-                if (rw3.getFavicon() != null) {
-                    final String string4 = rw3.getFavicon();
-                    if (string4.startsWith("data:image/png;base64,")) {
-                        dnu.setIconB64(string4.substring("data:image/png;base64,".length()));
+                String string4 = null;
+                if (tl3.getFavicon() != null) {
+                    final String string5 = tl3.getFavicon();
+                    if (string5.startsWith("data:image/png;base64,")) {
+                        string4 = string5.substring("data:image/png;base64,".length());
                     }
                     else {
                         ServerStatusPinger.LOGGER.error("Invalid server icon (unknown format)");
                     }
                 }
-                else {
-                    dnu.setIconB64(null);
+                if (!Objects.equals(string4, dys.getIconB64())) {
+                    dys.setIconB64(string4);
+                    runnable.run();
                 }
                 this.pingStart = Util.getMillis();
-                kt4.send(new ServerboundPingRequestPacket(this.pingStart));
+                me5.send(new ServerboundPingRequestPacket(this.pingStart));
                 this.success = true;
             }
             
             @Override
-            public void handlePongResponse(final ClientboundPongResponsePacket ru) {
+            public void handlePongResponse(final ClientboundPongResponsePacket tj) {
                 final long long3 = this.pingStart;
                 final long long4 = Util.getMillis();
-                dnu.ping = long4 - long3;
-                kt4.disconnect(new TranslatableComponent("multiplayer.status.finished", new Object[0]));
+                dys.ping = long4 - long3;
+                me5.disconnect(new TranslatableComponent("multiplayer.status.finished"));
             }
             
             @Override
-            public void onDisconnect(final Component lf) {
+            public void onDisconnect(final Component mr) {
                 if (!this.success) {
-                    ServerStatusPinger.LOGGER.error("Can't ping {}: {}", dnu.ip, lf.getString());
-                    dnu.motd = ChatFormatting.DARK_RED + I18n.get("multiplayer.status.cannot_connect");
-                    dnu.status = "";
-                    ServerStatusPinger.this.pingLegacyServer(dnu);
+                    ServerStatusPinger.LOGGER.error("Can't ping {}: {}", dys.ip, mr.getString());
+                    dys.motd = new TranslatableComponent("multiplayer.status.cannot_connect").withStyle(ChatFormatting.DARK_RED);
+                    dys.status = TextComponent.EMPTY;
+                    ServerStatusPinger.this.pingLegacyServer(dys);
                 }
             }
             
             @Override
             public Connection getConnection() {
-                return kt4;
+                return me5;
             }
         });
         try {
-            kt4.send(new ClientIntentionPacket(dnt3.getHost(), dnt3.getPort(), ConnectionProtocol.STATUS));
-            kt4.send(new ServerboundStatusRequestPacket());
+            me5.send(new ClientIntentionPacket(dyr4.getHost(), dyr4.getPort(), ConnectionProtocol.STATUS));
+            me5.send(new ServerboundStatusRequestPacket());
         }
-        catch (Throwable throwable5) {
-            ServerStatusPinger.LOGGER.error(throwable5);
+        catch (Throwable throwable6) {
+            ServerStatusPinger.LOGGER.error(throwable6);
         }
     }
     
-    private void pingLegacyServer(final ServerData dnu) {
-        final ServerAddress dnt3 = ServerAddress.parseString(dnu.ip);
+    private void pingLegacyServer(final ServerData dys) {
+        final ServerAddress dyr3 = ServerAddress.parseString(dys.ip);
         ((Bootstrap)((Bootstrap)((Bootstrap)new Bootstrap().group((EventLoopGroup)Connection.NETWORK_WORKER_GROUP.get())).handler((ChannelHandler)new ChannelInitializer<Channel>() {
             protected void initChannel(final Channel channel) throws Exception {
                 try {
@@ -180,14 +177,14 @@ public class ServerStatusPinger {
                                 for (final char character8 : arr4) {
                                     byteBuf3.writeChar((int)character8);
                                 }
-                                byteBuf3.writeShort(7 + 2 * dnt3.getHost().length());
+                                byteBuf3.writeShort(7 + 2 * dyr3.getHost().length());
                                 byteBuf3.writeByte(127);
-                                arr4 = dnt3.getHost().toCharArray();
+                                arr4 = dyr3.getHost().toCharArray();
                                 byteBuf3.writeShort(arr4.length);
                                 for (final char character8 : arr4) {
                                     byteBuf3.writeChar((int)character8);
                                 }
-                                byteBuf3.writeInt(dnt3.getPort());
+                                byteBuf3.writeInt(dyr3.getPort());
                                 channelHandlerContext.channel().writeAndFlush(byteBuf3).addListener((GenericFutureListener)ChannelFutureListener.CLOSE_ON_FAILURE);
                             }
                             finally {
@@ -206,10 +203,10 @@ public class ServerStatusPinger {
                                     final String string7 = arr6[3];
                                     final int integer8 = Mth.getInt(arr6[4], -1);
                                     final int integer9 = Mth.getInt(arr6[5], -1);
-                                    dnu.protocol = -1;
-                                    dnu.version = string6;
-                                    dnu.motd = string7;
-                                    dnu.status = ChatFormatting.GRAY + "" + integer8 + "" + ChatFormatting.DARK_GRAY + "/" + ChatFormatting.GRAY + integer9;
+                                    dys.protocol = -1;
+                                    dys.version = new TextComponent(string6);
+                                    dys.motd = new TextComponent(string7);
+                                    dys.status = formatPlayerCount(integer8, integer9);
                                 }
                             }
                             channelHandlerContext.close();
@@ -220,20 +217,24 @@ public class ServerStatusPinger {
                         }
                     } });
             }
-        })).channel((Class)NioSocketChannel.class)).connect(dnt3.getHost(), dnt3.getPort());
+        })).channel((Class)NioSocketChannel.class)).connect(dyr3.getHost(), dyr3.getPort());
+    }
+    
+    private static Component formatPlayerCount(final int integer1, final int integer2) {
+        return new TextComponent(Integer.toString(integer1)).append(new TextComponent("/").withStyle(ChatFormatting.DARK_GRAY)).append(Integer.toString(integer2)).withStyle(ChatFormatting.GRAY);
     }
     
     public void tick() {
         synchronized (this.connections) {
             final Iterator<Connection> iterator3 = this.connections.iterator();
             while (iterator3.hasNext()) {
-                final Connection kt4 = iterator3.next();
-                if (kt4.isConnected()) {
-                    kt4.tick();
+                final Connection me4 = iterator3.next();
+                if (me4.isConnected()) {
+                    me4.tick();
                 }
                 else {
                     iterator3.remove();
-                    kt4.handleDisconnection();
+                    me4.handleDisconnection();
                 }
             }
         }
@@ -243,10 +244,10 @@ public class ServerStatusPinger {
         synchronized (this.connections) {
             final Iterator<Connection> iterator3 = this.connections.iterator();
             while (iterator3.hasNext()) {
-                final Connection kt4 = iterator3.next();
-                if (kt4.isConnected()) {
+                final Connection me4 = iterator3.next();
+                if (me4.isConnected()) {
                     iterator3.remove();
-                    kt4.disconnect(new TranslatableComponent("multiplayer.status.cancelled", new Object[0]));
+                    me4.disconnect(new TranslatableComponent("multiplayer.status.cancelled"));
                 }
             }
         }
diff --git a/src/net/minecraft/client/particle/AshParticle.java b/src/net/minecraft/client/particle/AshParticle.java
new file mode 100644
index 0000000..f0d549b
--- /dev/null
+++ b/src/net/minecraft/client/particle/AshParticle.java
@@ -0,0 +1,24 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.SimpleParticleType;
+import net.minecraft.client.multiplayer.ClientLevel;
+
+public class AshParticle extends BaseAshSmokeParticle {
+    protected AshParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final float float8, final SpriteSet eap) {
+        super(dym, double2, double3, double4, 0.1f, -0.1f, 0.1f, double5, double6, double7, float8, eap, 0.5f, 20, -0.004, false);
+    }
+    
+    public static class Provider implements ParticleProvider<SimpleParticleType> {
+        private final SpriteSet sprites;
+        
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
+        }
+        
+        @Override
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new AshParticle(dym, double3, double4, double5, 0.0, 0.0, 0.0, 1.0f, this.sprites);
+        }
+    }
+}
diff --git a/src/net/minecraft/client/particle/AttackSweepParticle.java b/src/net/minecraft/client/particle/AttackSweepParticle.java
index 9c5f851..32c4ca9 100644
--- a/src/net/minecraft/client/particle/AttackSweepParticle.java
+++ b/src/net/minecraft/client/particle/AttackSweepParticle.java
@@ -2,21 +2,21 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class AttackSweepParticle extends TextureSheetParticle {
     private final SpriteSet sprites;
     
-    private AttackSweepParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
-        this.sprites = dpm;
+    private AttackSweepParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final SpriteSet eap) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
+        this.sprites = eap;
         this.lifetime = 4;
         final float float12 = this.random.nextFloat() * 0.6f + 0.4f;
         this.rCol = float12;
         this.gCol = float12;
         this.bCol = float12;
         this.quadSize = 1.0f - (float)double5 * 0.5f;
-        this.setSpriteFromAge(dpm);
+        this.setSpriteFromAge(eap);
     }
     
     public int getLightColor(final float float1) {
@@ -43,13 +43,13 @@ public class AttackSweepParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new AttackSweepParticle(bjw, double3, double4, double5, double6, this.sprites, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new AttackSweepParticle(dym, double3, double4, double5, double6, this.sprites, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/BarrierParticle.java b/src/net/minecraft/client/particle/BarrierParticle.java
index 98f99bf..c251cfc 100644
--- a/src/net/minecraft/client/particle/BarrierParticle.java
+++ b/src/net/minecraft/client/particle/BarrierParticle.java
@@ -5,12 +5,12 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class BarrierParticle extends TextureSheetParticle {
-    private BarrierParticle(final Level bjw, final double double2, final double double3, final double double4, final ItemLike bjv) {
-        super(bjw, double2, double3, double4);
-        this.setSprite(Minecraft.getInstance().getItemRenderer().getItemModelShaper().getParticleIcon(bjv));
+    private BarrierParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final ItemLike bqa) {
+        super(dym, double2, double3, double4);
+        this.setSprite(Minecraft.getInstance().getItemRenderer().getItemModelShaper().getParticleIcon(bqa));
         this.gravity = 0.0f;
         this.lifetime = 80;
         this.hasPhysics = false;
@@ -28,8 +28,8 @@ public class BarrierParticle extends TextureSheetParticle {
     
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new BarrierParticle(bjw, double3, double4, double5, Blocks.BARRIER.asItem(), null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new BarrierParticle(dym, double3, double4, double5, Blocks.BARRIER.asItem(), null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/BaseAshSmokeParticle.java b/src/net/minecraft/client/particle/BaseAshSmokeParticle.java
new file mode 100644
index 0000000..2cc13dd
--- /dev/null
+++ b/src/net/minecraft/client/particle/BaseAshSmokeParticle.java
@@ -0,0 +1,66 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.util.Mth;
+import net.minecraft.client.multiplayer.ClientLevel;
+
+public class BaseAshSmokeParticle extends TextureSheetParticle {
+    private final SpriteSet sprites;
+    private final double fallSpeed;
+    
+    protected BaseAshSmokeParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final float float5, final float float6, final float float7, final double double8, final double double9, final double double10, final float float11, final SpriteSet eap, final float float13, final int integer, final double double15, final boolean boolean16) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
+        this.fallSpeed = double15;
+        this.sprites = eap;
+        this.xd *= float5;
+        this.yd *= float6;
+        this.zd *= float7;
+        this.xd += double8;
+        this.yd += double9;
+        this.zd += double10;
+        final float float14 = dym.random.nextFloat() * float13;
+        this.rCol = float14;
+        this.gCol = float14;
+        this.bCol = float14;
+        this.quadSize *= 0.75f * float11;
+        this.lifetime = (int)(integer / (dym.random.nextFloat() * 0.8 + 0.2));
+        this.lifetime *= (int)float11;
+        this.lifetime = Math.max(this.lifetime, 1);
+        this.setSpriteFromAge(eap);
+        this.hasPhysics = boolean16;
+    }
+    
+    @Override
+    public ParticleRenderType getRenderType() {
+        return ParticleRenderType.PARTICLE_SHEET_OPAQUE;
+    }
+    
+    @Override
+    public float getQuadSize(final float float1) {
+        return this.quadSize * Mth.clamp((this.age + float1) / this.lifetime * 32.0f, 0.0f, 1.0f);
+    }
+    
+    @Override
+    public void tick() {
+        this.xo = this.x;
+        this.yo = this.y;
+        this.zo = this.z;
+        if (this.age++ >= this.lifetime) {
+            this.remove();
+            return;
+        }
+        this.setSpriteFromAge(this.sprites);
+        this.yd += this.fallSpeed;
+        this.move(this.xd, this.yd, this.zd);
+        if (this.y == this.yo) {
+            this.xd *= 1.1;
+            this.zd *= 1.1;
+        }
+        this.xd *= 0.9599999785423279;
+        this.yd *= 0.9599999785423279;
+        this.zd *= 0.9599999785423279;
+        if (this.onGround) {
+            this.xd *= 0.699999988079071;
+            this.zd *= 0.699999988079071;
+        }
+    }
+}
diff --git a/src/net/minecraft/client/particle/BreakingItemParticle.java b/src/net/minecraft/client/particle/BreakingItemParticle.java
index 639feb3..5a77807 100644
--- a/src/net/minecraft/client/particle/BreakingItemParticle.java
+++ b/src/net/minecraft/client/particle/BreakingItemParticle.java
@@ -6,16 +6,17 @@ import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ItemParticleOption;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.Level;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class BreakingItemParticle extends TextureSheetParticle {
     private final float uo;
     private final float vo;
     
-    private BreakingItemParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final ItemStack ben) {
-        this(bjw, double2, double3, double4, ben);
+    private BreakingItemParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final ItemStack bki) {
+        this(dym, double2, double3, double4, bki);
         this.xd *= 0.10000000149011612;
         this.yd *= 0.10000000149011612;
         this.zd *= 0.10000000149011612;
@@ -29,9 +30,9 @@ public class BreakingItemParticle extends TextureSheetParticle {
         return ParticleRenderType.TERRAIN_SHEET;
     }
     
-    protected BreakingItemParticle(final Level bjw, final double double2, final double double3, final double double4, final ItemStack ben) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
-        this.setSprite(Minecraft.getInstance().getItemRenderer().getModel(ben, bjw, null).getParticleIcon());
+    protected BreakingItemParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final ItemStack bki) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
+        this.setSprite(Minecraft.getInstance().getItemRenderer().getModel(bki, dym, null).getParticleIcon());
         this.gravity = 1.0f;
         this.quadSize /= 2.0f;
         this.uo = this.random.nextFloat() * 3.0f;
@@ -60,22 +61,22 @@ public class BreakingItemParticle extends TextureSheetParticle {
     
     public static class Provider implements ParticleProvider<ItemParticleOption> {
         @Override
-        public Particle createParticle(final ItemParticleOption gs, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new BreakingItemParticle(bjw, double3, double4, double5, double6, double7, double8, gs.getItem(), null);
+        public Particle createParticle(final ItemParticleOption he, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new BreakingItemParticle(dym, double3, double4, double5, double6, double7, double8, he.getItem(), null);
         }
     }
     
     public static class SlimeProvider implements ParticleProvider<SimpleParticleType> {
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new BreakingItemParticle(bjw, double3, double4, double5, new ItemStack(Items.SLIME_BALL));
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new BreakingItemParticle(dym, double3, double4, double5, new ItemStack(Items.SLIME_BALL));
         }
     }
     
     public static class SnowballProvider implements ParticleProvider<SimpleParticleType> {
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new BreakingItemParticle(bjw, double3, double4, double5, new ItemStack(Items.SNOWBALL));
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new BreakingItemParticle(dym, double3, double4, double5, new ItemStack(Items.SNOWBALL));
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/BubbleColumnUpParticle.java b/src/net/minecraft/client/particle/BubbleColumnUpParticle.java
index 09795bf..3bfd8fe 100644
--- a/src/net/minecraft/client/particle/BubbleColumnUpParticle.java
+++ b/src/net/minecraft/client/particle/BubbleColumnUpParticle.java
@@ -2,13 +2,15 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class BubbleColumnUpParticle extends TextureSheetParticle {
-    private BubbleColumnUpParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4);
+    private BubbleColumnUpParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4);
         this.setSize(0.02f, 0.02f);
         this.quadSize *= this.random.nextFloat() * 0.6f + 0.2f;
         this.xd = double5 * 0.20000000298023224 + (Math.random() * 2.0 - 1.0) * 0.019999999552965164;
@@ -44,15 +46,15 @@ public class BubbleColumnUpParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final BubbleColumnUpParticle doc16 = new BubbleColumnUpParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            doc16.pickSprite(this.sprite);
-            return doc16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final BubbleColumnUpParticle dzc16 = new BubbleColumnUpParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            dzc16.pickSprite(this.sprite);
+            return dzc16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/BubbleParticle.java b/src/net/minecraft/client/particle/BubbleParticle.java
index 2d6ea6e..bf2cf1b 100644
--- a/src/net/minecraft/client/particle/BubbleParticle.java
+++ b/src/net/minecraft/client/particle/BubbleParticle.java
@@ -2,13 +2,15 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class BubbleParticle extends TextureSheetParticle {
-    private BubbleParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4);
+    private BubbleParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4);
         this.setSize(0.02f, 0.02f);
         this.quadSize *= this.random.nextFloat() * 0.6f + 0.2f;
         this.xd = double5 * 0.20000000298023224 + (Math.random() * 2.0 - 1.0) * 0.019999999552965164;
@@ -44,15 +46,15 @@ public class BubbleParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final BubbleParticle dod16 = new BubbleParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dod16.pickSprite(this.sprite);
-            return dod16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final BubbleParticle dzd16 = new BubbleParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            dzd16.pickSprite(this.sprite);
+            return dzd16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/BubblePopParticle.java b/src/net/minecraft/client/particle/BubblePopParticle.java
index 231a159..3825b4a 100644
--- a/src/net/minecraft/client/particle/BubblePopParticle.java
+++ b/src/net/minecraft/client/particle/BubblePopParticle.java
@@ -2,20 +2,20 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class BubblePopParticle extends TextureSheetParticle {
     private final SpriteSet sprites;
     
-    private BubblePopParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4);
-        this.sprites = dpm;
+    private BubblePopParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4);
+        this.sprites = eap;
         this.lifetime = 4;
         this.gravity = 0.008f;
         this.xd = double5;
         this.yd = double6;
         this.zd = double7;
-        this.setSpriteFromAge(dpm);
+        this.setSpriteFromAge(eap);
     }
     
     @Override
@@ -40,13 +40,13 @@ public class BubblePopParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new BubblePopParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new BubblePopParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/CampfireSmokeParticle.java b/src/net/minecraft/client/particle/CampfireSmokeParticle.java
index 08f7a26..8ce8702 100644
--- a/src/net/minecraft/client/particle/CampfireSmokeParticle.java
+++ b/src/net/minecraft/client/particle/CampfireSmokeParticle.java
@@ -2,11 +2,11 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class CampfireSmokeParticle extends TextureSheetParticle {
-    private CampfireSmokeParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final boolean boolean8) {
-        super(bjw, double2, double3, double4);
+    private CampfireSmokeParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final boolean boolean8) {
+        super(dym, double2, double3, double4);
         this.scale(3.0f);
         this.setSize(0.25f, 0.25f);
         if (boolean8) {
@@ -47,32 +47,32 @@ public class CampfireSmokeParticle extends TextureSheetParticle {
     public static class CosyProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public CosyProvider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public CosyProvider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final CampfireSmokeParticle dof16 = new CampfireSmokeParticle(bjw, double3, double4, double5, double6, double7, double8, false, null);
-            dof16.setAlpha(0.9f);
-            dof16.pickSprite(this.sprites);
-            return dof16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final CampfireSmokeParticle dzf16 = new CampfireSmokeParticle(dym, double3, double4, double5, double6, double7, double8, false, null);
+            dzf16.setAlpha(0.9f);
+            dzf16.pickSprite(this.sprites);
+            return dzf16;
         }
     }
     
     public static class SignalProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public SignalProvider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public SignalProvider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final CampfireSmokeParticle dof16 = new CampfireSmokeParticle(bjw, double3, double4, double5, double6, double7, double8, true, null);
-            dof16.setAlpha(0.95f);
-            dof16.pickSprite(this.sprites);
-            return dof16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final CampfireSmokeParticle dzf16 = new CampfireSmokeParticle(dym, double3, double4, double5, double6, double7, double8, true, null);
+            dzf16.setAlpha(0.95f);
+            dzf16.pickSprite(this.sprites);
+            return dzf16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/CritParticle.java b/src/net/minecraft/client/particle/CritParticle.java
index 5dfce7b..eaa1dd2 100644
--- a/src/net/minecraft/client/particle/CritParticle.java
+++ b/src/net/minecraft/client/particle/CritParticle.java
@@ -3,11 +3,11 @@ package net.minecraft.client.particle;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class CritParticle extends TextureSheetParticle {
-    private CritParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
+    private CritParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
         this.xd *= 0.10000000149011612;
         this.yd *= 0.10000000149011612;
         this.zd *= 0.10000000149011612;
@@ -59,50 +59,50 @@ public class CritParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final CritParticle dog16 = new CritParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dog16.pickSprite(this.sprite);
-            return dog16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final CritParticle dzg16 = new CritParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            dzg16.pickSprite(this.sprite);
+            return dzg16;
         }
     }
     
     public static class MagicProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public MagicProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public MagicProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
             final CritParticle critParticle;
-            final CritParticle dog16 = critParticle = new CritParticle(bjw, double3, double4, double5, double6, double7, double8, null);
+            final CritParticle dzg16 = critParticle = new CritParticle(dym, double3, double4, double5, double6, double7, double8, null);
             critParticle.rCol *= 0.3f;
-            final CritParticle critParticle2 = dog16;
+            final CritParticle critParticle2 = dzg16;
             critParticle2.gCol *= 0.8f;
-            dog16.pickSprite(this.sprite);
-            return dog16;
+            dzg16.pickSprite(this.sprite);
+            return dzg16;
         }
     }
     
     public static class DamageIndicatorProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public DamageIndicatorProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public DamageIndicatorProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final CritParticle dog16 = new CritParticle(bjw, double3, double4, double5, double6, double7 + 1.0, double8, null);
-            dog16.setLifetime(20);
-            dog16.pickSprite(this.sprite);
-            return dog16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final CritParticle dzg16 = new CritParticle(dym, double3, double4, double5, double6, double7 + 1.0, double8, null);
+            dzg16.setLifetime(20);
+            dzg16.pickSprite(this.sprite);
+            return dzg16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/DragonBreathParticle.java b/src/net/minecraft/client/particle/DragonBreathParticle.java
index 2f8f07a..10ef062 100644
--- a/src/net/minecraft/client/particle/DragonBreathParticle.java
+++ b/src/net/minecraft/client/particle/DragonBreathParticle.java
@@ -3,14 +3,14 @@ package net.minecraft.client.particle;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class DragonBreathParticle extends TextureSheetParticle {
     private boolean hasHitGround;
     private final SpriteSet sprites;
     
-    private DragonBreathParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4);
+    private DragonBreathParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4);
         this.xd = double5;
         this.yd = double6;
         this.zd = double7;
@@ -21,7 +21,7 @@ public class DragonBreathParticle extends TextureSheetParticle {
         this.lifetime = (int)(20.0 / (this.random.nextFloat() * 0.8 + 0.2));
         this.hasHitGround = false;
         this.hasPhysics = false;
-        this.setSpriteFromAge(this.sprites = dpm);
+        this.setSpriteFromAge(this.sprites = eap);
     }
     
     @Override
@@ -66,13 +66,13 @@ public class DragonBreathParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new DragonBreathParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new DragonBreathParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/DripParticle.java b/src/net/minecraft/client/particle/DripParticle.java
index acd1493..46c434d 100644
--- a/src/net/minecraft/client/particle/DripParticle.java
+++ b/src/net/minecraft/client/particle/DripParticle.java
@@ -9,18 +9,18 @@ import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.core.BlockPos;
-import net.minecraft.tags.FluidTags;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.level.material.Fluid;
 
 public class DripParticle extends TextureSheetParticle {
     private final Fluid type;
+    protected boolean isGlowing;
     
-    private DripParticle(final Level bjw, final double double2, final double double3, final double double4, final Fluid coi) {
-        super(bjw, double2, double3, double4);
+    private DripParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final Fluid cwz) {
+        super(dym, double2, double3, double4);
         this.setSize(0.01f, 0.01f);
         this.gravity = 0.06f;
-        this.type = coi;
+        this.type = cwz;
     }
     
     @Override
@@ -29,7 +29,7 @@ public class DripParticle extends TextureSheetParticle {
     }
     
     public int getLightColor(final float float1) {
-        if (this.type.is(FluidTags.LAVA)) {
+        if (this.isGlowing) {
             return 240;
         }
         return super.getLightColor(float1);
@@ -53,9 +53,9 @@ public class DripParticle extends TextureSheetParticle {
         this.xd *= 0.9800000190734863;
         this.yd *= 0.9800000190734863;
         this.zd *= 0.9800000190734863;
-        final BlockPos fk2 = new BlockPos(this.x, this.y, this.z);
-        final FluidState coj3 = this.level.getFluidState(fk2);
-        if (coj3.getType() == this.type && this.y < fk2.getY() + coj3.getHeight(this.level, fk2)) {
+        final BlockPos fu2 = new BlockPos(this.x, this.y, this.z);
+        final FluidState cxa3 = this.level.getFluidState(fu2);
+        if (cxa3.getType() == this.type && this.y < fu2.getY() + cxa3.getHeight(this.level, fu2)) {
             this.remove();
         }
     }
@@ -72,9 +72,9 @@ public class DripParticle extends TextureSheetParticle {
     static class DripHangParticle extends DripParticle {
         private final ParticleOptions fallingParticle;
         
-        private DripHangParticle(final Level bjw, final double double2, final double double3, final double double4, final Fluid coi, final ParticleOptions gt) {
-            super(bjw, double2, double3, double4, coi, null);
-            this.fallingParticle = gt;
+        private DripHangParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final Fluid cwz, final ParticleOptions hf) {
+            super(dym, double2, double3, double4, cwz, null);
+            this.fallingParticle = hf;
             this.gravity *= 0.02f;
             this.lifetime = 40;
         }
@@ -96,8 +96,8 @@ public class DripParticle extends TextureSheetParticle {
     }
     
     static class CoolingDripHangParticle extends DripHangParticle {
-        private CoolingDripHangParticle(final Level bjw, final double double2, final double double3, final double double4, final Fluid coi, final ParticleOptions gt) {
-            super(bjw, double2, double3, double4, coi, gt);
+        private CoolingDripHangParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final Fluid cwz, final ParticleOptions hf) {
+            super(dym, double2, double3, double4, cwz, hf);
         }
         
         @Override
@@ -112,9 +112,9 @@ public class DripParticle extends TextureSheetParticle {
     static class FallAndLandParticle extends FallingParticle {
         protected final ParticleOptions landParticle;
         
-        private FallAndLandParticle(final Level bjw, final double double2, final double double3, final double double4, final Fluid coi, final ParticleOptions gt) {
-            super(bjw, double2, double3, double4, coi);
-            this.landParticle = gt;
+        private FallAndLandParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final Fluid cwz, final ParticleOptions hf) {
+            super(dym, double2, double3, double4, cwz);
+            this.landParticle = hf;
         }
         
         @Override
@@ -127,8 +127,8 @@ public class DripParticle extends TextureSheetParticle {
     }
     
     static class HoneyFallAndLandParticle extends FallAndLandParticle {
-        private HoneyFallAndLandParticle(final Level bjw, final double double2, final double double3, final double double4, final Fluid coi, final ParticleOptions gt) {
-            super(bjw, double2, double3, double4, coi, gt);
+        private HoneyFallAndLandParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final Fluid cwz, final ParticleOptions hf) {
+            super(dym, double2, double3, double4, cwz, hf);
         }
         
         @Override
@@ -142,8 +142,8 @@ public class DripParticle extends TextureSheetParticle {
     }
     
     static class FallingParticle extends DripParticle {
-        private FallingParticle(final Level bjw, final double double2, final double double3, final double double4, final Fluid coi) {
-            super(bjw, double2, double3, double4, coi, null);
+        private FallingParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final Fluid cwz) {
+            super(dym, double2, double3, double4, cwz, null);
             this.lifetime = (int)(64.0 / (Math.random() * 0.8 + 0.2));
         }
         
@@ -156,8 +156,8 @@ public class DripParticle extends TextureSheetParticle {
     }
     
     static class DripLandParticle extends DripParticle {
-        private DripLandParticle(final Level bjw, final double double2, final double double3, final double double4, final Fluid coi) {
-            super(bjw, double2, double3, double4, coi, null);
+        private DripLandParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final Fluid cwz) {
+            super(dym, double2, double3, double4, cwz, null);
             this.lifetime = (int)(16.0 / (Math.random() * 0.8 + 0.2));
         }
     }
@@ -165,45 +165,45 @@ public class DripParticle extends TextureSheetParticle {
     public static class WaterHangProvider implements ParticleProvider<SimpleParticleType> {
         protected final SpriteSet sprite;
         
-        public WaterHangProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public WaterHangProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final DripParticle doi16 = new DripHangParticle(bjw, double3, double4, double5, (Fluid)Fluids.WATER, (ParticleOptions)ParticleTypes.FALLING_WATER);
-            doi16.setColor(0.2f, 0.3f, 1.0f);
-            doi16.pickSprite(this.sprite);
-            return doi16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final DripParticle dzi16 = new DripHangParticle(dym, double3, double4, double5, (Fluid)Fluids.WATER, (ParticleOptions)ParticleTypes.FALLING_WATER);
+            dzi16.setColor(0.2f, 0.3f, 1.0f);
+            dzi16.pickSprite(this.sprite);
+            return dzi16;
         }
     }
     
     public static class WaterFallProvider implements ParticleProvider<SimpleParticleType> {
         protected final SpriteSet sprite;
         
-        public WaterFallProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public WaterFallProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final DripParticle doi16 = new FallAndLandParticle(bjw, double3, double4, double5, (Fluid)Fluids.WATER, (ParticleOptions)ParticleTypes.SPLASH);
-            doi16.setColor(0.2f, 0.3f, 1.0f);
-            doi16.pickSprite(this.sprite);
-            return doi16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final DripParticle dzi16 = new FallAndLandParticle(dym, double3, double4, double5, (Fluid)Fluids.WATER, (ParticleOptions)ParticleTypes.SPLASH);
+            dzi16.setColor(0.2f, 0.3f, 1.0f);
+            dzi16.pickSprite(this.sprite);
+            return dzi16;
         }
     }
     
     public static class LavaHangProvider implements ParticleProvider<SimpleParticleType> {
         protected final SpriteSet sprite;
         
-        public LavaHangProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public LavaHangProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final CoolingDripHangParticle a16 = new CoolingDripHangParticle(bjw, double3, double4, double5, (Fluid)Fluids.LAVA, (ParticleOptions)ParticleTypes.FALLING_LAVA);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final CoolingDripHangParticle a16 = new CoolingDripHangParticle(dym, double3, double4, double5, (Fluid)Fluids.LAVA, (ParticleOptions)ParticleTypes.FALLING_LAVA);
             a16.pickSprite(this.sprite);
             return a16;
         }
@@ -212,46 +212,46 @@ public class DripParticle extends TextureSheetParticle {
     public static class LavaFallProvider implements ParticleProvider<SimpleParticleType> {
         protected final SpriteSet sprite;
         
-        public LavaFallProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public LavaFallProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final DripParticle doi16 = new FallAndLandParticle(bjw, double3, double4, double5, (Fluid)Fluids.LAVA, (ParticleOptions)ParticleTypes.LANDING_LAVA);
-            doi16.setColor(1.0f, 0.2857143f, 0.083333336f);
-            doi16.pickSprite(this.sprite);
-            return doi16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final DripParticle dzi16 = new FallAndLandParticle(dym, double3, double4, double5, (Fluid)Fluids.LAVA, (ParticleOptions)ParticleTypes.LANDING_LAVA);
+            dzi16.setColor(1.0f, 0.2857143f, 0.083333336f);
+            dzi16.pickSprite(this.sprite);
+            return dzi16;
         }
     }
     
     public static class LavaLandProvider implements ParticleProvider<SimpleParticleType> {
         protected final SpriteSet sprite;
         
-        public LavaLandProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public LavaLandProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final DripParticle doi16 = new DripLandParticle(bjw, double3, double4, double5, (Fluid)Fluids.LAVA);
-            doi16.setColor(1.0f, 0.2857143f, 0.083333336f);
-            doi16.pickSprite(this.sprite);
-            return doi16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final DripParticle dzi16 = new DripLandParticle(dym, double3, double4, double5, (Fluid)Fluids.LAVA);
+            dzi16.setColor(1.0f, 0.2857143f, 0.083333336f);
+            dzi16.pickSprite(this.sprite);
+            return dzi16;
         }
     }
     
     public static class HoneyHangProvider implements ParticleProvider<SimpleParticleType> {
         protected final SpriteSet sprite;
         
-        public HoneyHangProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public HoneyHangProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
             final DripHangParticle dripHangParticle;
-            final DripHangParticle b16 = dripHangParticle = new DripHangParticle(bjw, double3, double4, double5, Fluids.EMPTY, (ParticleOptions)ParticleTypes.FALLING_HONEY);
+            final DripHangParticle b16 = dripHangParticle = new DripHangParticle(dym, double3, double4, double5, Fluids.EMPTY, (ParticleOptions)ParticleTypes.FALLING_HONEY);
             dripHangParticle.gravity *= 0.01f;
             b16.lifetime = 100;
             b16.setColor(0.622f, 0.508f, 0.082f);
@@ -263,52 +263,108 @@ public class DripParticle extends TextureSheetParticle {
     public static class HoneyFallProvider implements ParticleProvider<SimpleParticleType> {
         protected final SpriteSet sprite;
         
-        public HoneyFallProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public HoneyFallProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final DripParticle doi16 = new HoneyFallAndLandParticle(bjw, double3, double4, double5, Fluids.EMPTY, (ParticleOptions)ParticleTypes.LANDING_HONEY);
-            doi16.gravity = 0.01f;
-            doi16.setColor(0.582f, 0.448f, 0.082f);
-            doi16.pickSprite(this.sprite);
-            return doi16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final DripParticle dzi16 = new HoneyFallAndLandParticle(dym, double3, double4, double5, Fluids.EMPTY, (ParticleOptions)ParticleTypes.LANDING_HONEY);
+            dzi16.gravity = 0.01f;
+            dzi16.setColor(0.582f, 0.448f, 0.082f);
+            dzi16.pickSprite(this.sprite);
+            return dzi16;
         }
     }
     
     public static class HoneyLandProvider implements ParticleProvider<SimpleParticleType> {
         protected final SpriteSet sprite;
         
-        public HoneyLandProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public HoneyLandProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final DripParticle doi16 = new DripLandParticle(bjw, double3, double4, double5, Fluids.EMPTY);
-            doi16.lifetime = (int)(128.0 / (Math.random() * 0.8 + 0.2));
-            doi16.setColor(0.522f, 0.408f, 0.082f);
-            doi16.pickSprite(this.sprite);
-            return doi16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final DripParticle dzi16 = new DripLandParticle(dym, double3, double4, double5, Fluids.EMPTY);
+            dzi16.lifetime = (int)(128.0 / (Math.random() * 0.8 + 0.2));
+            dzi16.setColor(0.522f, 0.408f, 0.082f);
+            dzi16.pickSprite(this.sprite);
+            return dzi16;
         }
     }
     
     public static class NectarFallProvider implements ParticleProvider<SimpleParticleType> {
         protected final SpriteSet sprite;
         
-        public NectarFallProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public NectarFallProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final DripParticle doi16 = new FallingParticle(bjw, double3, double4, double5, Fluids.EMPTY);
-            doi16.lifetime = (int)(16.0 / (Math.random() * 0.8 + 0.2));
-            doi16.gravity = 0.007f;
-            doi16.setColor(0.92f, 0.782f, 0.72f);
-            doi16.pickSprite(this.sprite);
-            return doi16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final DripParticle dzi16 = new FallingParticle(dym, double3, double4, double5, Fluids.EMPTY);
+            dzi16.lifetime = (int)(16.0 / (Math.random() * 0.8 + 0.2));
+            dzi16.gravity = 0.007f;
+            dzi16.setColor(0.92f, 0.782f, 0.72f);
+            dzi16.pickSprite(this.sprite);
+            return dzi16;
+        }
+    }
+    
+    public static class ObsidianTearHangProvider implements ParticleProvider<SimpleParticleType> {
+        protected final SpriteSet sprite;
+        
+        public ObsidianTearHangProvider(final SpriteSet eap) {
+            this.sprite = eap;
+        }
+        
+        @Override
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final DripHangParticle b16 = new DripHangParticle(dym, double3, double4, double5, Fluids.EMPTY, (ParticleOptions)ParticleTypes.FALLING_OBSIDIAN_TEAR);
+            b16.isGlowing = true;
+            final DripHangParticle dripHangParticle = b16;
+            dripHangParticle.gravity *= 0.01f;
+            b16.lifetime = 100;
+            b16.setColor(0.51171875f, 0.03125f, 0.890625f);
+            b16.pickSprite(this.sprite);
+            return b16;
+        }
+    }
+    
+    public static class ObsidianTearFallProvider implements ParticleProvider<SimpleParticleType> {
+        protected final SpriteSet sprite;
+        
+        public ObsidianTearFallProvider(final SpriteSet eap) {
+            this.sprite = eap;
+        }
+        
+        @Override
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final DripParticle dzi16 = new FallAndLandParticle(dym, double3, double4, double5, Fluids.EMPTY, (ParticleOptions)ParticleTypes.LANDING_OBSIDIAN_TEAR);
+            dzi16.isGlowing = true;
+            dzi16.gravity = 0.01f;
+            dzi16.setColor(0.51171875f, 0.03125f, 0.890625f);
+            dzi16.pickSprite(this.sprite);
+            return dzi16;
+        }
+    }
+    
+    public static class ObsidianTearLandProvider implements ParticleProvider<SimpleParticleType> {
+        protected final SpriteSet sprite;
+        
+        public ObsidianTearLandProvider(final SpriteSet eap) {
+            this.sprite = eap;
+        }
+        
+        @Override
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final DripParticle dzi16 = new DripLandParticle(dym, double3, double4, double5, Fluids.EMPTY);
+            dzi16.isGlowing = true;
+            dzi16.lifetime = (int)(28.0 / (Math.random() * 0.8 + 0.2));
+            dzi16.setColor(0.51171875f, 0.03125f, 0.890625f);
+            dzi16.pickSprite(this.sprite);
+            return dzi16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/DustParticle.java b/src/net/minecraft/client/particle/DustParticle.java
index d0e9943..b325d94 100644
--- a/src/net/minecraft/client/particle/DustParticle.java
+++ b/src/net/minecraft/client/particle/DustParticle.java
@@ -3,25 +3,25 @@ package net.minecraft.client.particle;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.util.Mth;
 import net.minecraft.core.particles.DustParticleOptions;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class DustParticle extends TextureSheetParticle {
     private final SpriteSet sprites;
     
-    private DustParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final DustParticleOptions gr, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, double5, double6, double7);
-        this.sprites = dpm;
+    private DustParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final DustParticleOptions hd, final SpriteSet eap) {
+        super(dym, double2, double3, double4, double5, double6, double7);
+        this.sprites = eap;
         this.xd *= 0.10000000149011612;
         this.yd *= 0.10000000149011612;
         this.zd *= 0.10000000149011612;
         final float float17 = (float)Math.random() * 0.4f + 0.6f;
-        this.rCol = ((float)(Math.random() * 0.20000000298023224) + 0.8f) * gr.getR() * float17;
-        this.gCol = ((float)(Math.random() * 0.20000000298023224) + 0.8f) * gr.getG() * float17;
-        this.bCol = ((float)(Math.random() * 0.20000000298023224) + 0.8f) * gr.getB() * float17;
-        this.quadSize *= 0.75f * gr.getScale();
+        this.rCol = ((float)(Math.random() * 0.20000000298023224) + 0.8f) * hd.getR() * float17;
+        this.gCol = ((float)(Math.random() * 0.20000000298023224) + 0.8f) * hd.getG() * float17;
+        this.bCol = ((float)(Math.random() * 0.20000000298023224) + 0.8f) * hd.getB() * float17;
+        this.quadSize *= 0.75f * hd.getScale();
         final int integer18 = (int)(8.0 / (Math.random() * 0.8 + 0.2));
-        this.lifetime = (int)Math.max(integer18 * gr.getScale(), 1.0f);
-        this.setSpriteFromAge(dpm);
+        this.lifetime = (int)Math.max(integer18 * hd.getScale(), 1.0f);
+        this.setSpriteFromAge(eap);
     }
     
     @Override
@@ -61,13 +61,13 @@ public class DustParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<DustParticleOptions> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final DustParticleOptions gr, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new DustParticle(bjw, double3, double4, double5, double6, double7, double8, gr, this.sprites, null);
+        public Particle createParticle(final DustParticleOptions hd, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new DustParticle(dym, double3, double4, double5, double6, double7, double8, hd, this.sprites, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/EnchantmentTableParticle.java b/src/net/minecraft/client/particle/EnchantmentTableParticle.java
index d91d6f0..cd54436 100644
--- a/src/net/minecraft/client/particle/EnchantmentTableParticle.java
+++ b/src/net/minecraft/client/particle/EnchantmentTableParticle.java
@@ -2,15 +2,15 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class EnchantmentTableParticle extends TextureSheetParticle {
     private final double xStart;
     private final double yStart;
     private final double zStart;
     
-    private EnchantmentTableParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4);
+    private EnchantmentTableParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4);
         this.xd = double5;
         this.yd = double6;
         this.zd = double7;
@@ -79,30 +79,30 @@ public class EnchantmentTableParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final EnchantmentTableParticle dok16 = new EnchantmentTableParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dok16.pickSprite(this.sprite);
-            return dok16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final EnchantmentTableParticle dzk16 = new EnchantmentTableParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            dzk16.pickSprite(this.sprite);
+            return dzk16;
         }
     }
     
     public static class NautilusProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public NautilusProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public NautilusProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final EnchantmentTableParticle dok16 = new EnchantmentTableParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dok16.pickSprite(this.sprite);
-            return dok16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final EnchantmentTableParticle dzk16 = new EnchantmentTableParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            dzk16.pickSprite(this.sprite);
+            return dzk16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/EndRodParticle.java b/src/net/minecraft/client/particle/EndRodParticle.java
index 02750b0..132a7f7 100644
--- a/src/net/minecraft/client/particle/EndRodParticle.java
+++ b/src/net/minecraft/client/particle/EndRodParticle.java
@@ -2,18 +2,18 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class EndRodParticle extends SimpleAnimatedParticle {
-    private EndRodParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, dpm, -5.0E-4f);
+    private EndRodParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4, eap, -5.0E-4f);
         this.xd = double5;
         this.yd = double6;
         this.zd = double7;
         this.quadSize *= 0.75f;
         this.lifetime = 60 + this.random.nextInt(12);
         this.setFadeColor(15916745);
-        this.setSpriteFromAge(dpm);
+        this.setSpriteFromAge(eap);
     }
     
     @Override
@@ -25,13 +25,13 @@ public class EndRodParticle extends SimpleAnimatedParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new EndRodParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new EndRodParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/ExplodeParticle.java b/src/net/minecraft/client/particle/ExplodeParticle.java
index b0f49ac..5f5011f 100644
--- a/src/net/minecraft/client/particle/ExplodeParticle.java
+++ b/src/net/minecraft/client/particle/ExplodeParticle.java
@@ -2,14 +2,14 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class ExplodeParticle extends TextureSheetParticle {
     private final SpriteSet sprites;
     
-    protected ExplodeParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4);
-        this.sprites = dpm;
+    protected ExplodeParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4);
+        this.sprites = eap;
         this.xd = double5 + (Math.random() * 2.0 - 1.0) * 0.05000000074505806;
         this.yd = double6 + (Math.random() * 2.0 - 1.0) * 0.05000000074505806;
         this.zd = double7 + (Math.random() * 2.0 - 1.0) * 0.05000000074505806;
@@ -19,7 +19,7 @@ public class ExplodeParticle extends TextureSheetParticle {
         this.bCol = float16;
         this.quadSize = 0.1f * (this.random.nextFloat() * this.random.nextFloat() * 6.0f + 1.0f);
         this.lifetime = (int)(16.0 / (this.random.nextFloat() * 0.8 + 0.2)) + 2;
-        this.setSpriteFromAge(dpm);
+        this.setSpriteFromAge(eap);
     }
     
     @Override
@@ -51,13 +51,13 @@ public class ExplodeParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new ExplodeParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new ExplodeParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/FallingDustParticle.java b/src/net/minecraft/client/particle/FallingDustParticle.java
index 5282241..4382f51 100644
--- a/src/net/minecraft/client/particle/FallingDustParticle.java
+++ b/src/net/minecraft/client/particle/FallingDustParticle.java
@@ -3,21 +3,23 @@ package net.minecraft.client.particle;
 import net.minecraft.core.particles.ParticleOptions;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.FallingBlock;
-import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
 import net.minecraft.client.Minecraft;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.core.particles.BlockParticleOption;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class FallingDustParticle extends TextureSheetParticle {
     private final float rotSpeed;
     private final SpriteSet sprites;
     
-    private FallingDustParticle(final Level bjw, final double double2, final double double3, final double double4, final float float5, final float float6, final float float7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4);
-        this.sprites = dpm;
+    private FallingDustParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final float float5, final float float6, final float float7, final SpriteSet eap) {
+        super(dym, double2, double3, double4);
+        this.sprites = eap;
         this.rCol = float5;
         this.gCol = float6;
         this.bCol = float7;
@@ -25,7 +27,7 @@ public class FallingDustParticle extends TextureSheetParticle {
         this.quadSize *= 0.67499995f;
         final int integer14 = (int)(32.0 / (Math.random() * 0.8 + 0.2));
         this.lifetime = (int)Math.max(integer14 * 0.9f, 1.0f);
-        this.setSpriteFromAge(dpm);
+        this.setSpriteFromAge(eap);
         this.rotSpeed = ((float)Math.random() - 0.5f) * 0.1f;
         this.roll = (float)Math.random() * 6.2831855f;
     }
@@ -65,25 +67,26 @@ public class FallingDustParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<BlockParticleOption> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Nullable
         @Override
-        public Particle createParticle(final BlockParticleOption gq, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final BlockState byj16 = gq.getState();
-            if (!byj16.isAir() && byj16.getRenderShape() == RenderShape.INVISIBLE) {
+        public Particle createParticle(final BlockParticleOption hc, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final BlockState cfj16 = hc.getState();
+            if (!cfj16.isAir() && cfj16.getRenderShape() == RenderShape.INVISIBLE) {
                 return null;
             }
-            int integer17 = Minecraft.getInstance().getBlockColors().getColor(byj16, bjw, new BlockPos(double3, double4, double5));
-            if (byj16.getBlock() instanceof FallingBlock) {
-                integer17 = ((FallingBlock)byj16.getBlock()).getDustColor(byj16);
+            final BlockPos fu17 = new BlockPos(double3, double4, double5);
+            int integer18 = Minecraft.getInstance().getBlockColors().getColor(cfj16, dym, fu17);
+            if (cfj16.getBlock() instanceof FallingBlock) {
+                integer18 = ((FallingBlock)cfj16.getBlock()).getDustColor(cfj16, dym, fu17);
             }
-            final float float18 = (integer17 >> 16 & 0xFF) / 255.0f;
-            final float float19 = (integer17 >> 8 & 0xFF) / 255.0f;
-            final float float20 = (integer17 & 0xFF) / 255.0f;
-            return new FallingDustParticle(bjw, double3, double4, double5, float18, float19, float20, this.sprite, null);
+            final float float19 = (integer18 >> 16 & 0xFF) / 255.0f;
+            final float float20 = (integer18 >> 8 & 0xFF) / 255.0f;
+            final float float21 = (integer18 & 0xFF) / 255.0f;
+            return new FallingDustParticle(dym, double3, double4, double5, float19, float20, float21, this.sprite, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/FireworkParticles.java b/src/net/minecraft/client/particle/FireworkParticles.java
index 74b1c06..a2938f4 100644
--- a/src/net/minecraft/client/particle/FireworkParticles.java
+++ b/src/net/minecraft/client/particle/FireworkParticles.java
@@ -4,6 +4,7 @@ import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.client.Camera;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.util.Mth;
+import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.core.particles.ParticleOptions;
@@ -14,7 +15,7 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.FireworkRocketItem;
 import javax.annotation.Nullable;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.nbt.ListTag;
 
 public class FireworkParticles {
@@ -24,23 +25,23 @@ public class FireworkParticles {
         private ListTag explosions;
         private boolean twinkleDelay;
         
-        public Starter(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final ParticleEngine dpb, @Nullable final CompoundTag jt) {
-            super(bjw, double2, double3, double4);
+        public Starter(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final ParticleEngine eab, @Nullable final CompoundTag le) {
+            super(dym, double2, double3, double4);
             this.xd = double5;
             this.yd = double6;
             this.zd = double7;
-            this.engine = dpb;
+            this.engine = eab;
             this.lifetime = 8;
-            if (jt != null) {
-                this.explosions = jt.getList("Explosions", 10);
+            if (le != null) {
+                this.explosions = le.getList("Explosions", 10);
                 if (this.explosions.isEmpty()) {
                     this.explosions = null;
                 }
                 else {
                     this.lifetime = this.explosions.size() * 2 - 1;
                     for (int integer17 = 0; integer17 < this.explosions.size(); ++integer17) {
-                        final CompoundTag jt2 = this.explosions.getCompound(integer17);
-                        if (jt2.getBoolean("Flicker")) {
+                        final CompoundTag le2 = this.explosions.getCompound(integer17);
+                        if (le2.getBoolean("Flicker")) {
                             this.twinkleDelay = true;
                             this.lifetime += 15;
                             break;
@@ -60,30 +61,30 @@ public class FireworkParticles {
                 }
                 else {
                     for (int integer4 = 0; integer4 < this.explosions.size(); ++integer4) {
-                        final CompoundTag jt5 = this.explosions.getCompound(integer4);
-                        if (FireworkRocketItem.Shape.byId(jt5.getByte("Type")) == FireworkRocketItem.Shape.LARGE_BALL) {
+                        final CompoundTag le5 = this.explosions.getCompound(integer4);
+                        if (FireworkRocketItem.Shape.byId(le5.getByte("Type")) == FireworkRocketItem.Shape.LARGE_BALL) {
                             boolean3 = true;
                             break;
                         }
                     }
                 }
-                SoundEvent aah4;
+                SoundEvent ack4;
                 if (boolean3) {
-                    aah4 = (boolean2 ? SoundEvents.FIREWORK_ROCKET_LARGE_BLAST_FAR : SoundEvents.FIREWORK_ROCKET_LARGE_BLAST);
+                    ack4 = (boolean2 ? SoundEvents.FIREWORK_ROCKET_LARGE_BLAST_FAR : SoundEvents.FIREWORK_ROCKET_LARGE_BLAST);
                 }
                 else {
-                    aah4 = (boolean2 ? SoundEvents.FIREWORK_ROCKET_BLAST_FAR : SoundEvents.FIREWORK_ROCKET_BLAST);
+                    ack4 = (boolean2 ? SoundEvents.FIREWORK_ROCKET_BLAST_FAR : SoundEvents.FIREWORK_ROCKET_BLAST);
                 }
-                this.level.playLocalSound(this.x, this.y, this.z, aah4, SoundSource.AMBIENT, 20.0f, 0.95f + this.random.nextFloat() * 0.1f, true);
+                this.level.playLocalSound(this.x, this.y, this.z, ack4, SoundSource.AMBIENT, 20.0f, 0.95f + this.random.nextFloat() * 0.1f, true);
             }
             if (this.life % 2 == 0 && this.explosions != null && this.life / 2 < this.explosions.size()) {
                 final int integer5 = this.life / 2;
-                final CompoundTag jt6 = this.explosions.getCompound(integer5);
-                final FireworkRocketItem.Shape a4 = FireworkRocketItem.Shape.byId(jt6.getByte("Type"));
-                final boolean boolean4 = jt6.getBoolean("Trail");
-                final boolean boolean5 = jt6.getBoolean("Flicker");
-                int[] arr7 = jt6.getIntArray("Colors");
-                final int[] arr8 = jt6.getIntArray("FadeColors");
+                final CompoundTag le6 = this.explosions.getCompound(integer5);
+                final FireworkRocketItem.Shape a4 = FireworkRocketItem.Shape.byId(le6.getByte("Type"));
+                final boolean boolean4 = le6.getBoolean("Trail");
+                final boolean boolean5 = le6.getBoolean("Flicker");
+                int[] arr7 = le6.getIntArray("Colors");
+                final int[] arr8 = le6.getIntArray("FadeColors");
                 if (arr7.length == 0) {
                     arr7 = new int[] { DyeColor.BLACK.getFireworkColor() };
                 }
@@ -113,23 +114,23 @@ public class FireworkParticles {
                 final float float10 = ((integer6 & 0xFF0000) >> 16) / 255.0f;
                 final float float11 = ((integer6 & 0xFF00) >> 8) / 255.0f;
                 final float float12 = ((integer6 & 0xFF) >> 0) / 255.0f;
-                final Particle doz13 = this.engine.createParticle(ParticleTypes.FLASH, this.x, this.y, this.z, 0.0, 0.0, 0.0);
-                doz13.setColor(float10, float11, float12);
+                final Particle dzz13 = this.engine.createParticle(ParticleTypes.FLASH, this.x, this.y, this.z, 0.0, 0.0, 0.0);
+                dzz13.setColor(float10, float11, float12);
             }
             ++this.life;
             if (this.life > this.lifetime) {
                 if (this.twinkleDelay) {
                     final boolean boolean2 = this.isFarAwayFromCamera();
-                    final SoundEvent aah5 = boolean2 ? SoundEvents.FIREWORK_ROCKET_TWINKLE_FAR : SoundEvents.FIREWORK_ROCKET_TWINKLE;
-                    this.level.playLocalSound(this.x, this.y, this.z, aah5, SoundSource.AMBIENT, 20.0f, 0.9f + this.random.nextFloat() * 0.15f, true);
+                    final SoundEvent ack5 = boolean2 ? SoundEvents.FIREWORK_ROCKET_TWINKLE_FAR : SoundEvents.FIREWORK_ROCKET_TWINKLE;
+                    this.level.playLocalSound(this.x, this.y, this.z, ack5, SoundSource.AMBIENT, 20.0f, 0.9f + this.random.nextFloat() * 0.15f, true);
                 }
                 this.remove();
             }
         }
         
         private boolean isFarAwayFromCamera() {
-            final Minecraft dbn2 = Minecraft.getInstance();
-            return dbn2.gameRenderer.getMainCamera().getPosition().distanceToSqr(this.x, this.y, this.z) >= 256.0;
+            final Minecraft dlx2 = Minecraft.getInstance();
+            return dlx2.gameRenderer.getMainCamera().getPosition().distanceToSqr(this.x, this.y, this.z) >= 256.0;
         }
         
         private void createParticle(final double double1, final double double2, final double double3, final double double4, final double double5, final double double6, final int[] arr7, final int[] arr8, final boolean boolean9, final boolean boolean10) {
@@ -140,7 +141,7 @@ public class FireworkParticles {
             final int integer19 = this.random.nextInt(arr7.length);
             c18.setColor(arr7[integer19]);
             if (arr8.length > 0) {
-                c18.setFadeColor(arr8[this.random.nextInt(arr8.length)]);
+                c18.setFadeColor(Util.getRandom(arr8, this.random));
             }
         }
         
@@ -213,15 +214,15 @@ public class FireworkParticles {
         private float fadeB;
         private boolean hasFade;
         
-        private SparkParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final ParticleEngine dpb, final SpriteSet dpm) {
-            super(bjw, double2, double3, double4, dpm, -0.004f);
+        private SparkParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final ParticleEngine eab, final SpriteSet eap) {
+            super(dym, double2, double3, double4, eap, -0.004f);
             this.xd = double5;
             this.yd = double6;
             this.zd = double7;
-            this.engine = dpb;
+            this.engine = eab;
             this.quadSize *= 0.75f;
             this.lifetime = 48 + this.random.nextInt(12);
-            this.setSpriteFromAge(dpm);
+            this.setSpriteFromAge(eap);
         }
         
         public void setTrail(final boolean boolean1) {
@@ -233,9 +234,9 @@ public class FireworkParticles {
         }
         
         @Override
-        public void render(final VertexConsumer cyo, final Camera dbb, final float float3) {
+        public void render(final VertexConsumer dhp, final Camera dlj, final float float3) {
             if (!this.flicker || this.age < this.lifetime / 3 || (this.age + this.lifetime) / 3 % 2 == 0) {
-                super.render(cyo, dbb, float3);
+                super.render(dhp, dlj, float3);
             }
         }
         
@@ -260,8 +261,8 @@ public class FireworkParticles {
     }
     
     public static class OverlayParticle extends TextureSheetParticle {
-        private OverlayParticle(final Level bjw, final double double2, final double double3, final double double4) {
-            super(bjw, double2, double3, double4);
+        private OverlayParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+            super(dym, double2, double3, double4);
             this.lifetime = 4;
         }
         
@@ -271,9 +272,9 @@ public class FireworkParticles {
         }
         
         @Override
-        public void render(final VertexConsumer cyo, final Camera dbb, final float float3) {
+        public void render(final VertexConsumer dhp, final Camera dlj, final float float3) {
             this.setAlpha(0.6f - (this.age + float3 - 1.0f) * 0.25f * 0.5f);
-            super.render(cyo, dbb, float3);
+            super.render(dhp, dlj, float3);
         }
         
         @Override
@@ -285,13 +286,13 @@ public class FireworkParticles {
     public static class FlashProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public FlashProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public FlashProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final OverlayParticle b16 = new OverlayParticle(bjw, double3, double4, double5);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final OverlayParticle b16 = new OverlayParticle(dym, double3, double4, double5);
             b16.pickSprite(this.sprite);
             return b16;
         }
@@ -300,13 +301,13 @@ public class FireworkParticles {
     public static class SparkProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public SparkProvider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public SparkProvider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final SparkParticle c16 = new SparkParticle(bjw, double3, double4, double5, double6, double7, double8, Minecraft.getInstance().particleEngine, this.sprites);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final SparkParticle c16 = new SparkParticle(dym, double3, double4, double5, double6, double7, double8, Minecraft.getInstance().particleEngine, this.sprites);
             c16.setAlpha(0.99f);
             return c16;
         }
diff --git a/src/net/minecraft/client/particle/FlameParticle.java b/src/net/minecraft/client/particle/FlameParticle.java
index 22417ae..678f100 100644
--- a/src/net/minecraft/client/particle/FlameParticle.java
+++ b/src/net/minecraft/client/particle/FlameParticle.java
@@ -3,18 +3,11 @@ package net.minecraft.client.particle;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
-public class FlameParticle extends TextureSheetParticle {
-    private FlameParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4, double5, double6, double7);
-        this.xd = this.xd * 0.009999999776482582 + double5;
-        this.yd = this.yd * 0.009999999776482582 + double6;
-        this.zd = this.zd * 0.009999999776482582 + double7;
-        this.x += (this.random.nextFloat() - this.random.nextFloat()) * 0.05f;
-        this.y += (this.random.nextFloat() - this.random.nextFloat()) * 0.05f;
-        this.z += (this.random.nextFloat() - this.random.nextFloat()) * 0.05f;
-        this.lifetime = (int)(8.0 / (Math.random() * 0.8 + 0.2)) + 4;
+public class FlameParticle extends RisingParticle {
+    private FlameParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4, double5, double6, double7);
     }
     
     @Override
@@ -47,37 +40,18 @@ public class FlameParticle extends TextureSheetParticle {
         return integer5 | integer6 << 16;
     }
     
-    @Override
-    public void tick() {
-        this.xo = this.x;
-        this.yo = this.y;
-        this.zo = this.z;
-        if (this.age++ >= this.lifetime) {
-            this.remove();
-            return;
-        }
-        this.move(this.xd, this.yd, this.zd);
-        this.xd *= 0.9599999785423279;
-        this.yd *= 0.9599999785423279;
-        this.zd *= 0.9599999785423279;
-        if (this.onGround) {
-            this.xd *= 0.699999988079071;
-            this.zd *= 0.699999988079071;
-        }
-    }
-    
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final FlameParticle dop16 = new FlameParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dop16.pickSprite(this.sprite);
-            return dop16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final FlameParticle dzp16 = new FlameParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            dzp16.pickSprite(this.sprite);
+            return dzp16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/HeartParticle.java b/src/net/minecraft/client/particle/HeartParticle.java
index fb0930a..ec674d2 100644
--- a/src/net/minecraft/client/particle/HeartParticle.java
+++ b/src/net/minecraft/client/particle/HeartParticle.java
@@ -3,11 +3,11 @@ package net.minecraft.client.particle;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class HeartParticle extends TextureSheetParticle {
-    private HeartParticle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
+    private HeartParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
         this.xd *= 0.009999999776482582;
         this.yd *= 0.009999999776482582;
         this.zd *= 0.009999999776482582;
@@ -53,31 +53,31 @@ public class HeartParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final HeartParticle doq16 = new HeartParticle(bjw, double3, double4, double5, null);
-            doq16.pickSprite(this.sprite);
-            return doq16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final HeartParticle dzq16 = new HeartParticle(dym, double3, double4, double5, null);
+            dzq16.pickSprite(this.sprite);
+            return dzq16;
         }
     }
     
     public static class AngryVillagerProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public AngryVillagerProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public AngryVillagerProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final HeartParticle doq16 = new HeartParticle(bjw, double3, double4 + 0.5, double5, null);
-            doq16.pickSprite(this.sprite);
-            doq16.setColor(1.0f, 1.0f, 1.0f);
-            return doq16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final HeartParticle dzq16 = new HeartParticle(dym, double3, double4 + 0.5, double5, null);
+            dzq16.pickSprite(this.sprite);
+            dzq16.setColor(1.0f, 1.0f, 1.0f);
+            return dzq16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/HugeExplosionParticle.java b/src/net/minecraft/client/particle/HugeExplosionParticle.java
index 5470d94..698ea12 100644
--- a/src/net/minecraft/client/particle/HugeExplosionParticle.java
+++ b/src/net/minecraft/client/particle/HugeExplosionParticle.java
@@ -2,20 +2,20 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class HugeExplosionParticle extends TextureSheetParticle {
     private final SpriteSet sprites;
     
-    private HugeExplosionParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
+    private HugeExplosionParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final SpriteSet eap) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
         this.lifetime = 6 + this.random.nextInt(4);
         final float float12 = this.random.nextFloat() * 0.6f + 0.4f;
         this.rCol = float12;
         this.gCol = float12;
         this.bCol = float12;
         this.quadSize = 2.0f * (1.0f - (float)double5 * 0.5f);
-        this.setSpriteFromAge(this.sprites = dpm);
+        this.setSpriteFromAge(this.sprites = eap);
     }
     
     public int getLightColor(final float float1) {
@@ -42,13 +42,13 @@ public class HugeExplosionParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new HugeExplosionParticle(bjw, double3, double4, double5, double6, this.sprites, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new HugeExplosionParticle(dym, double3, double4, double5, double6, this.sprites, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/HugeExplosionSeedParticle.java b/src/net/minecraft/client/particle/HugeExplosionSeedParticle.java
index f341b43..375139f 100644
--- a/src/net/minecraft/client/particle/HugeExplosionSeedParticle.java
+++ b/src/net/minecraft/client/particle/HugeExplosionSeedParticle.java
@@ -3,14 +3,14 @@ package net.minecraft.client.particle;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class HugeExplosionSeedParticle extends NoRenderParticle {
     private int life;
     private final int lifeTime;
     
-    private HugeExplosionSeedParticle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
+    private HugeExplosionSeedParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
         this.lifeTime = 8;
     }
     
@@ -30,8 +30,8 @@ public class HugeExplosionSeedParticle extends NoRenderParticle {
     
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new HugeExplosionSeedParticle(bjw, double3, double4, double5, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new HugeExplosionSeedParticle(dym, double3, double4, double5, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/ItemPickupParticle.java b/src/net/minecraft/client/particle/ItemPickupParticle.java
index 3b1d1c0..877899c 100644
--- a/src/net/minecraft/client/particle/ItemPickupParticle.java
+++ b/src/net/minecraft/client/particle/ItemPickupParticle.java
@@ -5,8 +5,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.util.Mth;
 import net.minecraft.client.Camera;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.client.renderer.RenderBuffers;
@@ -18,16 +19,23 @@ public class ItemPickupParticle extends Particle {
     private int life;
     private final EntityRenderDispatcher entityRenderDispatcher;
     
-    public ItemPickupParticle(final EntityRenderDispatcher dvf, final RenderBuffers dqz, final Level bjw, final Entity akq4, final Entity akq5) {
-        this(dvf, dqz, bjw, akq4, akq5, akq4.getDeltaMovement());
+    public ItemPickupParticle(final EntityRenderDispatcher egm, final RenderBuffers ecf, final ClientLevel dym, final Entity aom4, final Entity aom5) {
+        this(egm, ecf, dym, aom4, aom5, aom4.getDeltaMovement());
     }
     
-    private ItemPickupParticle(final EntityRenderDispatcher dvf, final RenderBuffers dqz, final Level bjw, final Entity akq4, final Entity akq5, final Vec3 cvl) {
-        super(bjw, akq4.getX(), akq4.getY(), akq4.getZ(), cvl.x, cvl.y, cvl.z);
-        this.renderBuffers = dqz;
-        this.itemEntity = akq4;
-        this.target = akq5;
-        this.entityRenderDispatcher = dvf;
+    private ItemPickupParticle(final EntityRenderDispatcher egm, final RenderBuffers ecf, final ClientLevel dym, final Entity aom4, final Entity aom5, final Vec3 dem) {
+        super(dym, aom4.getX(), aom4.getY(), aom4.getZ(), dem.x, dem.y, dem.z);
+        this.renderBuffers = ecf;
+        this.itemEntity = this.getSafeCopy(aom4);
+        this.target = aom5;
+        this.entityRenderDispatcher = egm;
+    }
+    
+    private Entity getSafeCopy(final Entity aom) {
+        if (!(aom instanceof ItemEntity)) {
+            return aom;
+        }
+        return ((ItemEntity)aom).copy();
     }
     
     @Override
@@ -36,7 +44,7 @@ public class ItemPickupParticle extends Particle {
     }
     
     @Override
-    public void render(final VertexConsumer cyo, final Camera dbb, final float float3) {
+    public void render(final VertexConsumer dhp, final Camera dlj, final float float3) {
         float float4 = (this.life + float3) / 3.0f;
         float4 *= float4;
         final double double6 = Mth.lerp(float3, this.target.xOld, this.target.getX());
@@ -46,8 +54,8 @@ public class ItemPickupParticle extends Particle {
         final double double10 = Mth.lerp(float4, this.itemEntity.getY(), double7);
         final double double11 = Mth.lerp(float4, this.itemEntity.getZ(), double8);
         final MultiBufferSource.BufferSource a18 = this.renderBuffers.bufferSource();
-        final Vec3 cvl19 = dbb.getPosition();
-        this.entityRenderDispatcher.<Entity>render(this.itemEntity, double9 - cvl19.x(), double10 - cvl19.y(), double11 - cvl19.z(), this.itemEntity.yRot, float3, new PoseStack(), a18, this.entityRenderDispatcher.<Entity>getPackedLightCoords(this.itemEntity, float3));
+        final Vec3 dem19 = dlj.getPosition();
+        this.entityRenderDispatcher.<Entity>render(this.itemEntity, double9 - dem19.x(), double10 - dem19.y(), double11 - dem19.z(), this.itemEntity.yRot, float3, new PoseStack(), a18, this.entityRenderDispatcher.<Entity>getPackedLightCoords(this.itemEntity, float3));
         a18.endBatch();
     }
     
diff --git a/src/net/minecraft/client/particle/LargeSmokeParticle.java b/src/net/minecraft/client/particle/LargeSmokeParticle.java
index dd8add2..400d910 100644
--- a/src/net/minecraft/client/particle/LargeSmokeParticle.java
+++ b/src/net/minecraft/client/particle/LargeSmokeParticle.java
@@ -2,23 +2,23 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class LargeSmokeParticle extends SmokeParticle {
-    protected LargeSmokeParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, double5, double6, double7, 2.5f, dpm);
+    protected LargeSmokeParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4, double5, double6, double7, 2.5f, eap);
     }
     
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new LargeSmokeParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new LargeSmokeParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/LavaParticle.java b/src/net/minecraft/client/particle/LavaParticle.java
index b16a771..7601f0d 100644
--- a/src/net/minecraft/client/particle/LavaParticle.java
+++ b/src/net/minecraft/client/particle/LavaParticle.java
@@ -3,11 +3,11 @@ package net.minecraft.client.particle;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class LavaParticle extends TextureSheetParticle {
-    private LavaParticle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
+    private LavaParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
         this.xd *= 0.800000011920929;
         this.yd *= 0.800000011920929;
         this.zd *= 0.800000011920929;
@@ -61,15 +61,15 @@ public class LavaParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final LavaParticle dov16 = new LavaParticle(bjw, double3, double4, double5, null);
-            dov16.pickSprite(this.sprite);
-            return dov16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final LavaParticle dzv16 = new LavaParticle(dym, double3, double4, double5, null);
+            dzv16.pickSprite(this.sprite);
+            return dzv16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/MobAppearanceParticle.java b/src/net/minecraft/client/particle/MobAppearanceParticle.java
index d0f4ede..1423185 100644
--- a/src/net/minecraft/client/particle/MobAppearanceParticle.java
+++ b/src/net/minecraft/client/particle/MobAppearanceParticle.java
@@ -12,7 +12,7 @@ import net.minecraft.client.Camera;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.renderer.entity.ElderGuardianRenderer;
 import net.minecraft.client.model.GuardianModel;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.model.Model;
 
@@ -20,8 +20,8 @@ public class MobAppearanceParticle extends Particle {
     private final Model model;
     private final RenderType renderType;
     
-    private MobAppearanceParticle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(bjw, double2, double3, double4);
+    private MobAppearanceParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+        super(dym, double2, double3, double4);
         this.model = new GuardianModel();
         this.renderType = RenderType.entityTranslucent(ElderGuardianRenderer.GUARDIAN_ELDER_LOCATION);
         this.gravity = 0.0f;
@@ -34,24 +34,24 @@ public class MobAppearanceParticle extends Particle {
     }
     
     @Override
-    public void render(final VertexConsumer cyo, final Camera dbb, final float float3) {
+    public void render(final VertexConsumer dhp, final Camera dlj, final float float3) {
         final float float4 = (this.age + float3) / this.lifetime;
         final float float5 = 0.05f + 0.5f * Mth.sin(float4 * 3.1415927f);
-        final PoseStack cyl7 = new PoseStack();
-        cyl7.mulPose(dbb.rotation());
-        cyl7.mulPose(Vector3f.XP.rotationDegrees(150.0f * float4 - 60.0f));
-        cyl7.scale(-1.0f, -1.0f, 1.0f);
-        cyl7.translate(0.0, -1.1009999513626099, 1.5);
+        final PoseStack dhl7 = new PoseStack();
+        dhl7.mulPose(dlj.rotation());
+        dhl7.mulPose(Vector3f.XP.rotationDegrees(150.0f * float4 - 60.0f));
+        dhl7.scale(-1.0f, -1.0f, 1.0f);
+        dhl7.translate(0.0, -1.1009999513626099, 1.5);
         final MultiBufferSource.BufferSource a8 = Minecraft.getInstance().renderBuffers().bufferSource();
-        final VertexConsumer cyo2 = a8.getBuffer(this.renderType);
-        this.model.renderToBuffer(cyl7, cyo2, 15728880, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, float5);
+        final VertexConsumer dhp2 = a8.getBuffer(this.renderType);
+        this.model.renderToBuffer(dhl7, dhp2, 15728880, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, float5);
         a8.endBatch();
     }
     
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new MobAppearanceParticle(bjw, double3, double4, double5, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new MobAppearanceParticle(dym, double3, double4, double5, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/NoRenderParticle.java b/src/net/minecraft/client/particle/NoRenderParticle.java
index a64343a..cf1e434 100644
--- a/src/net/minecraft/client/particle/NoRenderParticle.java
+++ b/src/net/minecraft/client/particle/NoRenderParticle.java
@@ -2,19 +2,19 @@ package net.minecraft.client.particle;
 
 import net.minecraft.client.Camera;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class NoRenderParticle extends Particle {
-    protected NoRenderParticle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(bjw, double2, double3, double4);
+    protected NoRenderParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+        super(dym, double2, double3, double4);
     }
     
-    protected NoRenderParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4, double5, double6, double7);
+    protected NoRenderParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4, double5, double6, double7);
     }
     
     @Override
-    public final void render(final VertexConsumer cyo, final Camera dbb, final float float3) {
+    public final void render(final VertexConsumer dhp, final Camera dlj, final float float3) {
     }
     
     @Override
diff --git a/src/net/minecraft/client/particle/NoteParticle.java b/src/net/minecraft/client/particle/NoteParticle.java
index 414bd83..c48dd07 100644
--- a/src/net/minecraft/client/particle/NoteParticle.java
+++ b/src/net/minecraft/client/particle/NoteParticle.java
@@ -3,11 +3,11 @@ package net.minecraft.client.particle;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class NoteParticle extends TextureSheetParticle {
-    private NoteParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
+    private NoteParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
         this.xd *= 0.009999999776482582;
         this.yd *= 0.009999999776482582;
         this.zd *= 0.009999999776482582;
@@ -55,15 +55,15 @@ public class NoteParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final NoteParticle doy16 = new NoteParticle(bjw, double3, double4, double5, double6, null);
-            doy16.pickSprite(this.sprite);
-            return doy16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final NoteParticle dzy16 = new NoteParticle(dym, double3, double4, double5, double6, null);
+            dzy16.pickSprite(this.sprite);
+            return dzy16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/Particle.java b/src/net/minecraft/client/particle/Particle.java
index 2ec75ca..f031bc7 100644
--- a/src/net/minecraft/client/particle/Particle.java
+++ b/src/net/minecraft/client/particle/Particle.java
@@ -3,6 +3,7 @@ package net.minecraft.client.particle;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.util.RewindableStream;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -13,12 +14,12 @@ import net.minecraft.client.Camera;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.util.Mth;
 import java.util.Random;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.phys.AABB;
 
 public abstract class Particle {
     private static final AABB INITIAL_AABB;
-    protected final Level level;
+    protected final ClientLevel level;
     protected double xo;
     protected double yo;
     protected double zo;
@@ -46,7 +47,7 @@ public abstract class Particle {
     protected float roll;
     protected float oRoll;
     
-    protected Particle(final Level bjw, final double double2, final double double3, final double double4) {
+    protected Particle(final ClientLevel dym, final double double2, final double double3, final double double4) {
         this.bb = Particle.INITIAL_AABB;
         this.hasPhysics = true;
         this.bbWidth = 0.6f;
@@ -56,7 +57,7 @@ public abstract class Particle {
         this.gCol = 1.0f;
         this.bCol = 1.0f;
         this.alpha = 1.0f;
-        this.level = bjw;
+        this.level = dym;
         this.setSize(0.2f, 0.2f);
         this.setPos(double2, double3, double4);
         this.xo = double2;
@@ -65,8 +66,8 @@ public abstract class Particle {
         this.lifetime = (int)(4.0f / (this.random.nextFloat() * 0.9f + 0.1f));
     }
     
-    public Particle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        this(bjw, double2, double3, double4);
+    public Particle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        this(dym, double2, double3, double4);
         this.xd = double5 + (Math.random() * 2.0 - 1.0) * 0.4000000059604645;
         this.yd = double6 + (Math.random() * 2.0 - 1.0) * 0.4000000059604645;
         this.zd = double7 + (Math.random() * 2.0 - 1.0) * 0.4000000059604645;
@@ -126,7 +127,7 @@ public abstract class Particle {
         }
     }
     
-    public abstract void render(final VertexConsumer cyo, final Camera dbb, final float float3);
+    public abstract void render(final VertexConsumer dhp, final Camera dlj, final float float3);
     
     public abstract ParticleRenderType getRenderType();
     
@@ -143,10 +144,10 @@ public abstract class Particle {
         if (float1 != this.bbWidth || float2 != this.bbHeight) {
             this.bbWidth = float1;
             this.bbHeight = float2;
-            final AABB cvf4 = this.getBoundingBox();
-            final double double5 = (cvf4.minX + cvf4.maxX - float1) / 2.0;
-            final double double6 = (cvf4.minZ + cvf4.maxZ - float1) / 2.0;
-            this.setBoundingBox(new AABB(double5, cvf4.minY, double6, double5 + this.bbWidth, cvf4.minY + this.bbHeight, double6 + this.bbWidth));
+            final AABB deg4 = this.getBoundingBox();
+            final double double5 = (deg4.minX + deg4.maxX - float1) / 2.0;
+            final double double6 = (deg4.minZ + deg4.maxZ - float1) / 2.0;
+            this.setBoundingBox(new AABB(double5, deg4.minY, double6, double5 + this.bbWidth, deg4.minY + this.bbHeight, double6 + this.bbWidth));
         }
     }
     
@@ -167,10 +168,10 @@ public abstract class Particle {
         final double double5 = double2;
         final double double6 = double3;
         if (this.hasPhysics && (double1 != 0.0 || double2 != 0.0 || double3 != 0.0)) {
-            final Vec3 cvl14 = Entity.collideBoundingBoxHeuristically(null, new Vec3(double1, double2, double3), this.getBoundingBox(), this.level, CollisionContext.empty(), new RewindableStream<VoxelShape>(Stream.<VoxelShape>empty()));
-            double1 = cvl14.x;
-            double2 = cvl14.y;
-            double3 = cvl14.z;
+            final Vec3 dem14 = Entity.collideBoundingBoxHeuristically(null, new Vec3(double1, double2, double3), this.getBoundingBox(), this.level, CollisionContext.empty(), new RewindableStream<VoxelShape>(Stream.<VoxelShape>empty()));
+            double1 = dem14.x;
+            double2 = dem14.y;
+            double3 = dem14.z;
         }
         if (double1 != 0.0 || double2 != 0.0 || double3 != 0.0) {
             this.setBoundingBox(this.getBoundingBox().move(double1, double2, double3));
@@ -189,16 +190,16 @@ public abstract class Particle {
     }
     
     protected void setLocationFromBoundingbox() {
-        final AABB cvf2 = this.getBoundingBox();
-        this.x = (cvf2.minX + cvf2.maxX) / 2.0;
-        this.y = cvf2.minY;
-        this.z = (cvf2.minZ + cvf2.maxZ) / 2.0;
+        final AABB deg2 = this.getBoundingBox();
+        this.x = (deg2.minX + deg2.maxX) / 2.0;
+        this.y = deg2.minY;
+        this.z = (deg2.minZ + deg2.maxZ) / 2.0;
     }
     
     protected int getLightColor(final float float1) {
-        final BlockPos fk3 = new BlockPos(this.x, this.y, this.z);
-        if (this.level.hasChunkAt(fk3)) {
-            return LevelRenderer.getLightColor(this.level, fk3);
+        final BlockPos fu3 = new BlockPos(this.x, this.y, this.z);
+        if (this.level.hasChunkAt(fu3)) {
+            return LevelRenderer.getLightColor(this.level, fu3);
         }
         return 0;
     }
@@ -211,8 +212,8 @@ public abstract class Particle {
         return this.bb;
     }
     
-    public void setBoundingBox(final AABB cvf) {
-        this.bb = cvf;
+    public void setBoundingBox(final AABB deg) {
+        this.bb = deg;
     }
     
     static {
diff --git a/src/net/minecraft/client/particle/ParticleEngine.java b/src/net/minecraft/client/particle/ParticleEngine.java
index 6ca14ed..983475f 100644
--- a/src/net/minecraft/client/particle/ParticleEngine.java
+++ b/src/net/minecraft/client/particle/ParticleEngine.java
@@ -61,13 +61,13 @@ import java.util.Random;
 import net.minecraft.client.renderer.texture.TextureManager;
 import java.util.Queue;
 import java.util.Map;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import java.util.List;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 
 public class ParticleEngine implements PreparableReloadListener {
     private static final List<ParticleRenderType> RENDER_ORDER;
-    protected Level level;
+    protected ClientLevel level;
     private final Map<ParticleRenderType, Queue<Particle>> particles;
     private final Queue<TrackingEmitter> trackingEmitters;
     private final TextureManager textureManager;
@@ -77,7 +77,7 @@ public class ParticleEngine implements PreparableReloadListener {
     private final Map<ResourceLocation, MutableSpriteSet> spriteSets;
     private final TextureAtlas textureAtlas;
     
-    public ParticleEngine(final Level bjw, final TextureManager eak) {
+    public ParticleEngine(final ClientLevel dym, final TextureManager elw) {
         this.particles = Maps.newIdentityHashMap();
         this.trackingEmitters = Queues.newArrayDeque();
         this.random = new Random();
@@ -85,9 +85,9 @@ public class ParticleEngine implements PreparableReloadListener {
         this.particlesToAdd = Queues.newArrayDeque();
         this.spriteSets = Maps.newHashMap();
         this.textureAtlas = new TextureAtlas(TextureAtlas.LOCATION_PARTICLES);
-        eak.register(this.textureAtlas.location(), this.textureAtlas);
-        this.level = bjw;
-        this.textureManager = eak;
+        elw.register(this.textureAtlas.location(), this.textureAtlas);
+        this.level = dym;
+        this.textureManager = elw;
         this.registerProviders();
     }
     
@@ -126,6 +126,8 @@ public class ParticleEngine implements PreparableReloadListener {
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.FIREWORK, FireworkParticles.SparkProvider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.FISHING, WakeParticle.Provider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.FLAME, FlameParticle.Provider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.SOUL, SoulParticle.Provider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.SOUL_FIRE_FLAME, FlameParticle.Provider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.FLASH, FireworkParticles.FlashProvider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.HAPPY_VILLAGER, SuspendedTownParticle.HappyVillagerProvider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.HEART, HeartParticle.Provider::new);
@@ -147,56 +149,64 @@ public class ParticleEngine implements PreparableReloadListener {
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.SWEEP_ATTACK, AttackSweepParticle.Provider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.TOTEM_OF_UNDYING, TotemParticle.Provider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.SQUID_INK, SquidInkParticle.Provider::new);
-        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.UNDERWATER, SuspendedParticle.Provider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.UNDERWATER, SuspendedParticle.UnderwaterProvider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.SPLASH, SplashParticle.Provider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.WITCH, SpellParticle.WitchProvider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.DRIPPING_HONEY, DripParticle.HoneyHangProvider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.FALLING_HONEY, DripParticle.HoneyFallProvider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.LANDING_HONEY, DripParticle.HoneyLandProvider::new);
         this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.FALLING_NECTAR, DripParticle.NectarFallProvider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.ASH, AshParticle.Provider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.CRIMSON_SPORE, SuspendedParticle.CrimsonSporeProvider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.WARPED_SPORE, SuspendedParticle.WarpedSporeProvider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.DRIPPING_OBSIDIAN_TEAR, DripParticle.ObsidianTearHangProvider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.FALLING_OBSIDIAN_TEAR, DripParticle.ObsidianTearFallProvider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.LANDING_OBSIDIAN_TEAR, DripParticle.ObsidianTearLandProvider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.REVERSE_PORTAL, ReversePortalParticle.ReversePortalProvider::new);
+        this.<ParticleOptions>register((ParticleType<ParticleOptions>)ParticleTypes.WHITE_ASH, WhiteAshParticle.Provider::new);
     }
     
-    private <T extends ParticleOptions> void register(final ParticleType<T> gu, final ParticleProvider<T> dpc) {
-        this.providers.put(Registry.PARTICLE_TYPE.getId(gu), dpc);
+    private <T extends ParticleOptions> void register(final ParticleType<T> hg, final ParticleProvider<T> eac) {
+        this.providers.put(Registry.PARTICLE_TYPE.getId(hg), eac);
     }
     
-    private <T extends ParticleOptions> void register(final ParticleType<T> gu, final SpriteParticleRegistration<T> b) {
+    private <T extends ParticleOptions> void register(final ParticleType<T> hg, final SpriteParticleRegistration<T> b) {
         final MutableSpriteSet a4 = new MutableSpriteSet();
-        this.spriteSets.put(Registry.PARTICLE_TYPE.getKey(gu), a4);
-        this.providers.put(Registry.PARTICLE_TYPE.getId(gu), b.create(a4));
+        this.spriteSets.put(Registry.PARTICLE_TYPE.getKey(hg), a4);
+        this.providers.put(Registry.PARTICLE_TYPE.getId(hg), b.create(a4));
     }
     
     @Override
-    public CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager zb, final ProfilerFiller aio3, final ProfilerFiller aio4, final Executor executor5, final Executor executor6) {
+    public CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager abc, final ProfilerFiller ami3, final ProfilerFiller ami4, final Executor executor5, final Executor executor6) {
         final Map<ResourceLocation, List<ResourceLocation>> map8 = Maps.newConcurrentMap();
-        final CompletableFuture<?>[] arr9 = Registry.PARTICLE_TYPE.keySet().stream().map(sm -> CompletableFuture.runAsync(() -> this.loadParticleDescription(zb, sm, map8), executor5)).<CompletableFuture<?>>toArray(CompletableFuture[]::new);
+        final CompletableFuture<?>[] arr9 = Registry.PARTICLE_TYPE.keySet().stream().map(uh -> CompletableFuture.runAsync(() -> this.loadParticleDescription(abc, uh, map8), executor5)).<CompletableFuture<?>>toArray(CompletableFuture[]::new);
         final Map<K, Object> map9;
         final TextureAtlas.Preparations a2;
-        final TextureAtlasSprite eaj5;
+        final TextureAtlasSprite elv5;
         final Map map10;
         final TextureAtlasSprite element;
         final ImmutableList<TextureAtlasSprite> immutableList5;
         return CompletableFuture.allOf(arr9).thenApplyAsync(void4 -> {
-            aio3.startTick();
-            aio3.push("stitching");
-            a2 = this.textureAtlas.prepareToStitch(zb, map9.values().stream().flatMap(Collection::stream), aio3, 0);
-            aio3.pop();
-            aio3.endTick();
+            ami3.startTick();
+            ami3.push("stitching");
+            a2 = this.textureAtlas.prepareToStitch(abc, map9.values().stream().flatMap(Collection::stream), ami3, 0);
+            ami3.pop();
+            ami3.endTick();
             return a2;
         }, executor5).thenCompose(a::wait).thenAcceptAsync(a -> {
             this.particles.clear();
-            aio4.startTick();
-            aio4.push("upload");
+            ami4.startTick();
+            ami4.push("upload");
             this.textureAtlas.reload(a);
-            aio4.popPush("bindSpriteSets");
-            eaj5 = this.textureAtlas.getSprite(MissingTextureAtlasSprite.getLocation());
-            map10.forEach((sm, list) -> {
+            ami4.popPush("bindSpriteSets");
+            elv5 = this.textureAtlas.getSprite(MissingTextureAtlasSprite.getLocation());
+            map10.forEach((uh, list) -> {
                 immutableList5 = (ImmutableList<TextureAtlasSprite>)(list.isEmpty() ? ImmutableList.<TextureAtlasSprite>of(element) : (list.stream().map(this.textureAtlas::getSprite).collect(ImmutableList.toImmutableList())));
-                this.spriteSets.get(sm).rebind(immutableList5);
+                this.spriteSets.get(uh).rebind(immutableList5);
                 return;
             });
-            aio4.pop();
-            aio4.endTick();
+            ami4.pop();
+            ami4.endTick();
         }, executor6);
     }
     
@@ -204,86 +214,86 @@ public class ParticleEngine implements PreparableReloadListener {
         this.textureAtlas.clearTextureData();
     }
     
-    private void loadParticleDescription(final ResourceManager zb, final ResourceLocation sm, final Map<ResourceLocation, List<ResourceLocation>> map) {
-        final ResourceLocation sm2 = new ResourceLocation(sm.getNamespace(), "particles/" + sm.getPath() + ".json");
-        try (final Resource za6 = zb.getResource(sm2);
-             final Reader reader8 = new InputStreamReader(za6.getInputStream(), Charsets.UTF_8)) {
-            final ParticleDescription dpa10 = ParticleDescription.fromJson(GsonHelper.parse(reader8));
-            final List<ResourceLocation> list11 = dpa10.getTextures();
-            final boolean boolean12 = this.spriteSets.containsKey(sm);
+    private void loadParticleDescription(final ResourceManager abc, final ResourceLocation uh, final Map<ResourceLocation, List<ResourceLocation>> map) {
+        final ResourceLocation uh2 = new ResourceLocation(uh.getNamespace(), "particles/" + uh.getPath() + ".json");
+        try (final Resource abb6 = abc.getResource(uh2);
+             final Reader reader8 = new InputStreamReader(abb6.getInputStream(), Charsets.UTF_8)) {
+            final ParticleDescription eaa10 = ParticleDescription.fromJson(GsonHelper.parse(reader8));
+            final List<ResourceLocation> list11 = eaa10.getTextures();
+            final boolean boolean12 = this.spriteSets.containsKey(uh);
             if (list11 == null) {
                 if (boolean12) {
-                    throw new IllegalStateException("Missing texture list for particle " + sm);
+                    throw new IllegalStateException("Missing texture list for particle " + uh);
                 }
             }
             else {
                 if (!boolean12) {
-                    throw new IllegalStateException("Redundant texture list for particle " + sm);
+                    throw new IllegalStateException("Redundant texture list for particle " + uh);
                 }
                 final ResourceLocation resourceLocation;
-                map.put(sm, list11.stream().map(sm -> {
-                    new ResourceLocation(sm.getNamespace(), "particle/" + sm.getPath());
+                map.put(uh, list11.stream().map(uh -> {
+                    new ResourceLocation(uh.getNamespace(), "particle/" + uh.getPath());
                     return resourceLocation;
                 }).collect(Collectors.toList()));
             }
         }
         catch (IOException iOException6) {
-            throw new IllegalStateException("Failed to load description for particle " + sm, iOException6);
+            throw new IllegalStateException("Failed to load description for particle " + uh, iOException6);
         }
     }
     
-    public void createTrackingEmitter(final Entity akq, final ParticleOptions gt) {
-        this.trackingEmitters.add(new TrackingEmitter(this.level, akq, gt));
+    public void createTrackingEmitter(final Entity aom, final ParticleOptions hf) {
+        this.trackingEmitters.add(new TrackingEmitter(this.level, aom, hf));
     }
     
-    public void createTrackingEmitter(final Entity akq, final ParticleOptions gt, final int integer) {
-        this.trackingEmitters.add(new TrackingEmitter(this.level, akq, gt, integer));
+    public void createTrackingEmitter(final Entity aom, final ParticleOptions hf, final int integer) {
+        this.trackingEmitters.add(new TrackingEmitter(this.level, aom, hf, integer));
     }
     
     @Nullable
-    public Particle createParticle(final ParticleOptions gt, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        final Particle doz15 = this.<ParticleOptions>makeParticle(gt, double2, double3, double4, double5, double6, double7);
-        if (doz15 != null) {
-            this.add(doz15);
-            return doz15;
+    public Particle createParticle(final ParticleOptions hf, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        final Particle dzz15 = this.<ParticleOptions>makeParticle(hf, double2, double3, double4, double5, double6, double7);
+        if (dzz15 != null) {
+            this.add(dzz15);
+            return dzz15;
         }
         return null;
     }
     
     @Nullable
-    private <T extends ParticleOptions> Particle makeParticle(final T gt, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        final ParticleProvider<T> dpc15 = (ParticleProvider<T>)this.providers.get(Registry.PARTICLE_TYPE.getId(gt.getType()));
-        if (dpc15 == null) {
+    private <T extends ParticleOptions> Particle makeParticle(final T hf, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        final ParticleProvider<T> eac15 = (ParticleProvider<T>)this.providers.get(Registry.PARTICLE_TYPE.getId(hf.getType()));
+        if (eac15 == null) {
             return null;
         }
-        return dpc15.createParticle(gt, this.level, double2, double3, double4, double5, double6, double7);
+        return eac15.createParticle(hf, this.level, double2, double3, double4, double5, double6, double7);
     }
     
-    public void add(final Particle doz) {
-        this.particlesToAdd.add(doz);
+    public void add(final Particle dzz) {
+        this.particlesToAdd.add(dzz);
     }
     
     public void tick() {
-        this.particles.forEach((dpd, queue) -> {
-            this.level.getProfiler().push(dpd.toString());
+        this.particles.forEach((ead, queue) -> {
+            this.level.getProfiler().push(ead.toString());
             this.tickParticleList(queue);
             this.level.getProfiler().pop();
             return;
         });
         if (!this.trackingEmitters.isEmpty()) {
             final List<TrackingEmitter> list2 = Lists.newArrayList();
-            for (final TrackingEmitter dpt4 : this.trackingEmitters) {
-                dpt4.tick();
-                if (!dpt4.isAlive()) {
-                    list2.add(dpt4);
+            for (final TrackingEmitter eaw4 : this.trackingEmitters) {
+                eaw4.tick();
+                if (!eaw4.isAlive()) {
+                    list2.add(eaw4);
                 }
             }
             this.trackingEmitters.removeAll(list2);
         }
         if (!this.particlesToAdd.isEmpty()) {
-            Particle doz2;
-            while ((doz2 = this.particlesToAdd.poll()) != null) {
-                this.particles.computeIfAbsent(doz2.getRenderType(), dpd -> EvictingQueue.create(16384)).add(doz2);
+            Particle dzz2;
+            while ((dzz2 = this.particlesToAdd.poll()) != null) {
+                this.particles.computeIfAbsent(dzz2.getRenderType(), ead -> EvictingQueue.create(16384)).add(dzz2);
             }
         }
     }
@@ -292,78 +302,79 @@ public class ParticleEngine implements PreparableReloadListener {
         if (!collection.isEmpty()) {
             final Iterator<Particle> iterator3 = collection.iterator();
             while (iterator3.hasNext()) {
-                final Particle doz4 = iterator3.next();
-                this.tickParticle(doz4);
-                if (!doz4.isAlive()) {
+                final Particle dzz4 = iterator3.next();
+                this.tickParticle(dzz4);
+                if (!dzz4.isAlive()) {
                     iterator3.remove();
                 }
             }
         }
     }
     
-    private void tickParticle(final Particle doz) {
+    private void tickParticle(final Particle dzz) {
         try {
-            doz.tick();
+            dzz.tick();
         }
         catch (Throwable throwable3) {
-            final CrashReport h4 = CrashReport.forThrowable(throwable3, "Ticking Particle");
-            final CrashReportCategory i5 = h4.addCategory("Particle being ticked");
-            i5.setDetail("Particle", doz::toString);
-            i5.setDetail("Particle Type", doz.getRenderType()::toString);
-            throw new ReportedException(h4);
+            final CrashReport j4 = CrashReport.forThrowable(throwable3, "Ticking Particle");
+            final CrashReportCategory k5 = j4.addCategory("Particle being ticked");
+            k5.setDetail("Particle", dzz::toString);
+            k5.setDetail("Particle Type", dzz.getRenderType()::toString);
+            throw new ReportedException(j4);
         }
     }
     
-    public void render(final PoseStack cyl, final MultiBufferSource.BufferSource a, final LightTexture dqs, final Camera dbb, final float float5) {
-        dqs.turnOnLightLayer();
+    public void render(final PoseStack dhl, final MultiBufferSource.BufferSource a, final LightTexture eby, final Camera dlj, final float float5) {
+        eby.turnOnLightLayer();
         RenderSystem.enableAlphaTest();
         RenderSystem.defaultAlphaFunc();
         RenderSystem.enableDepthTest();
         RenderSystem.enableFog();
         RenderSystem.pushMatrix();
-        RenderSystem.multMatrix(cyl.last().pose());
-        for (final ParticleRenderType dpd8 : ParticleEngine.RENDER_ORDER) {
-            final Iterable<Particle> iterable9 = this.particles.get(dpd8);
+        RenderSystem.multMatrix(dhl.last().pose());
+        for (final ParticleRenderType ead8 : ParticleEngine.RENDER_ORDER) {
+            final Iterable<Particle> iterable9 = this.particles.get(ead8);
             if (iterable9 == null) {
                 continue;
             }
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            final Tesselator cym10 = Tesselator.getInstance();
-            final BufferBuilder cyg11 = cym10.getBuilder();
-            dpd8.begin(cyg11, this.textureManager);
-            for (final Particle doz13 : iterable9) {
+            final Tesselator dhn10 = Tesselator.getInstance();
+            final BufferBuilder dhg11 = dhn10.getBuilder();
+            ead8.begin(dhg11, this.textureManager);
+            for (final Particle dzz13 : iterable9) {
                 try {
-                    doz13.render(cyg11, dbb, float5);
+                    dzz13.render(dhg11, dlj, float5);
                 }
                 catch (Throwable throwable14) {
-                    final CrashReport h15 = CrashReport.forThrowable(throwable14, "Rendering Particle");
-                    final CrashReportCategory i16 = h15.addCategory("Particle being rendered");
-                    i16.setDetail("Particle", doz13::toString);
-                    i16.setDetail("Particle Type", dpd8::toString);
-                    throw new ReportedException(h15);
+                    final CrashReport j15 = CrashReport.forThrowable(throwable14, "Rendering Particle");
+                    final CrashReportCategory k16 = j15.addCategory("Particle being rendered");
+                    k16.setDetail("Particle", dzz13::toString);
+                    k16.setDetail("Particle Type", ead8::toString);
+                    throw new ReportedException(j15);
                 }
             }
-            dpd8.end(cym10);
+            ead8.end(dhn10);
         }
         RenderSystem.popMatrix();
         RenderSystem.depthMask(true);
+        RenderSystem.depthFunc(515);
         RenderSystem.disableBlend();
         RenderSystem.defaultAlphaFunc();
-        dqs.turnOffLightLayer();
+        eby.turnOffLightLayer();
         RenderSystem.disableFog();
     }
     
-    public void setLevel(@Nullable final Level bjw) {
-        this.level = bjw;
+    public void setLevel(@Nullable final ClientLevel dym) {
+        this.level = dym;
         this.particles.clear();
         this.trackingEmitters.clear();
     }
     
-    public void destroy(final BlockPos fk, final BlockState byj) {
-        if (byj.isAir()) {
+    public void destroy(final BlockPos fu, final BlockState cfj) {
+        if (cfj.isAir()) {
             return;
         }
-        final VoxelShape cwf4 = byj.getShape(this.level, fk);
+        final VoxelShape dfg4 = cfj.getShape(this.level, fu);
         final double double9 = 0.25;
         final double double10;
         final double double11;
@@ -380,7 +391,7 @@ public class ParticleEngine implements PreparableReloadListener {
         double double16;
         double double17;
         double double18;
-        cwf4.forAllBoxes((double3, double4, double5, double6, double7, double8) -> {
+        dfg4.forAllBoxes((double3, double4, double5, double6, double7, double8) -> {
             double10 = Math.min(1.0, double6 - double3);
             double11 = Math.min(1.0, double7 - double4);
             double12 = Math.min(1.0, double8 - double5);
@@ -396,45 +407,45 @@ public class ParticleEngine implements PreparableReloadListener {
                         double16 = double13 * double10 + double3;
                         double17 = double14 * double11 + double4;
                         double18 = double15 * double12 + double5;
-                        this.add(new TerrainParticle(this.level, fk.getX() + double16, fk.getY() + double17, fk.getZ() + double18, double13 - 0.5, double14 - 0.5, double15 - 0.5, byj).init(fk));
+                        this.add(new TerrainParticle(this.level, fu.getX() + double16, fu.getY() + double17, fu.getZ() + double18, double13 - 0.5, double14 - 0.5, double15 - 0.5, cfj).init(fu));
                     }
                 }
             }
         });
     }
     
-    public void crack(final BlockPos fk, final Direction fp) {
-        final BlockState byj4 = this.level.getBlockState(fk);
-        if (byj4.getRenderShape() == RenderShape.INVISIBLE) {
+    public void crack(final BlockPos fu, final Direction fz) {
+        final BlockState cfj4 = this.level.getBlockState(fu);
+        if (cfj4.getRenderShape() == RenderShape.INVISIBLE) {
             return;
         }
-        final int integer5 = fk.getX();
-        final int integer6 = fk.getY();
-        final int integer7 = fk.getZ();
+        final int integer5 = fu.getX();
+        final int integer6 = fu.getY();
+        final int integer7 = fu.getZ();
         final float float8 = 0.1f;
-        final AABB cvf9 = byj4.getShape(this.level, fk).bounds();
-        double double10 = integer5 + this.random.nextDouble() * (cvf9.maxX - cvf9.minX - 0.20000000298023224) + 0.10000000149011612 + cvf9.minX;
-        double double11 = integer6 + this.random.nextDouble() * (cvf9.maxY - cvf9.minY - 0.20000000298023224) + 0.10000000149011612 + cvf9.minY;
-        double double12 = integer7 + this.random.nextDouble() * (cvf9.maxZ - cvf9.minZ - 0.20000000298023224) + 0.10000000149011612 + cvf9.minZ;
-        if (fp == Direction.DOWN) {
-            double11 = integer6 + cvf9.minY - 0.10000000149011612;
+        final AABB deg9 = cfj4.getShape(this.level, fu).bounds();
+        double double10 = integer5 + this.random.nextDouble() * (deg9.maxX - deg9.minX - 0.20000000298023224) + 0.10000000149011612 + deg9.minX;
+        double double11 = integer6 + this.random.nextDouble() * (deg9.maxY - deg9.minY - 0.20000000298023224) + 0.10000000149011612 + deg9.minY;
+        double double12 = integer7 + this.random.nextDouble() * (deg9.maxZ - deg9.minZ - 0.20000000298023224) + 0.10000000149011612 + deg9.minZ;
+        if (fz == Direction.DOWN) {
+            double11 = integer6 + deg9.minY - 0.10000000149011612;
         }
-        if (fp == Direction.UP) {
-            double11 = integer6 + cvf9.maxY + 0.10000000149011612;
+        if (fz == Direction.UP) {
+            double11 = integer6 + deg9.maxY + 0.10000000149011612;
         }
-        if (fp == Direction.NORTH) {
-            double12 = integer7 + cvf9.minZ - 0.10000000149011612;
+        if (fz == Direction.NORTH) {
+            double12 = integer7 + deg9.minZ - 0.10000000149011612;
         }
-        if (fp == Direction.SOUTH) {
-            double12 = integer7 + cvf9.maxZ + 0.10000000149011612;
+        if (fz == Direction.SOUTH) {
+            double12 = integer7 + deg9.maxZ + 0.10000000149011612;
         }
-        if (fp == Direction.WEST) {
-            double10 = integer5 + cvf9.minX - 0.10000000149011612;
+        if (fz == Direction.WEST) {
+            double10 = integer5 + deg9.minX - 0.10000000149011612;
         }
-        if (fp == Direction.EAST) {
-            double10 = integer5 + cvf9.maxX + 0.10000000149011612;
+        if (fz == Direction.EAST) {
+            double10 = integer5 + deg9.maxX + 0.10000000149011612;
         }
-        this.add(new TerrainParticle(this.level, double10, double11, double12, 0.0, 0.0, 0.0, byj4).init(fk).setPower(0.2f).scale(0.6f));
+        this.add(new TerrainParticle(this.level, double10, double11, double12, 0.0, 0.0, 0.0, cfj4).init(fu).setPower(0.2f).scale(0.6f));
     }
     
     public String countParticles() {
@@ -468,6 +479,6 @@ public class ParticleEngine implements PreparableReloadListener {
     
     @FunctionalInterface
     interface SpriteParticleRegistration<T extends ParticleOptions> {
-        ParticleProvider<T> create(final SpriteSet dpm);
+        ParticleProvider<T> create(final SpriteSet eap);
     }
 }
diff --git a/src/net/minecraft/client/particle/ParticleProvider.java b/src/net/minecraft/client/particle/ParticleProvider.java
index 106101f..aaadc5d 100644
--- a/src/net/minecraft/client/particle/ParticleProvider.java
+++ b/src/net/minecraft/client/particle/ParticleProvider.java
@@ -1,10 +1,10 @@
 package net.minecraft.client.particle;
 
 import javax.annotation.Nullable;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.particles.ParticleOptions;
 
 public interface ParticleProvider<T extends ParticleOptions> {
     @Nullable
-    Particle createParticle(final T gt, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8);
+    Particle createParticle(final T hf, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8);
 }
diff --git a/src/net/minecraft/client/particle/ParticleRenderType.java b/src/net/minecraft/client/particle/ParticleRenderType.java
index fb8de33..f480cab 100644
--- a/src/net/minecraft/client/particle/ParticleRenderType.java
+++ b/src/net/minecraft/client/particle/ParticleRenderType.java
@@ -11,17 +11,17 @@ import com.mojang.blaze3d.vertex.BufferBuilder;
 public interface ParticleRenderType {
     public static final ParticleRenderType TERRAIN_SHEET = new ParticleRenderType() {
         @Override
-        public void begin(final BufferBuilder cyg, final TextureManager eak) {
+        public void begin(final BufferBuilder dhg, final TextureManager elw) {
             RenderSystem.enableBlend();
             RenderSystem.defaultBlendFunc();
             RenderSystem.depthMask(true);
-            eak.bind(TextureAtlas.LOCATION_BLOCKS);
-            cyg.begin(7, DefaultVertexFormat.PARTICLE);
+            elw.bind(TextureAtlas.LOCATION_BLOCKS);
+            dhg.begin(7, DefaultVertexFormat.PARTICLE);
         }
         
         @Override
-        public void end(final Tesselator cym) {
-            cym.end();
+        public void end(final Tesselator dhn) {
+            dhn.end();
         }
         
         @Override
@@ -31,16 +31,16 @@ public interface ParticleRenderType {
     };
     public static final ParticleRenderType PARTICLE_SHEET_OPAQUE = new ParticleRenderType() {
         @Override
-        public void begin(final BufferBuilder cyg, final TextureManager eak) {
+        public void begin(final BufferBuilder dhg, final TextureManager elw) {
             RenderSystem.disableBlend();
             RenderSystem.depthMask(true);
-            eak.bind(TextureAtlas.LOCATION_PARTICLES);
-            cyg.begin(7, DefaultVertexFormat.PARTICLE);
+            elw.bind(TextureAtlas.LOCATION_PARTICLES);
+            dhg.begin(7, DefaultVertexFormat.PARTICLE);
         }
         
         @Override
-        public void end(final Tesselator cym) {
-            cym.end();
+        public void end(final Tesselator dhn) {
+            dhn.end();
         }
         
         @Override
@@ -50,18 +50,18 @@ public interface ParticleRenderType {
     };
     public static final ParticleRenderType PARTICLE_SHEET_TRANSLUCENT = new ParticleRenderType() {
         @Override
-        public void begin(final BufferBuilder cyg, final TextureManager eak) {
+        public void begin(final BufferBuilder dhg, final TextureManager elw) {
             RenderSystem.depthMask(true);
-            eak.bind(TextureAtlas.LOCATION_PARTICLES);
+            elw.bind(TextureAtlas.LOCATION_PARTICLES);
             RenderSystem.enableBlend();
-            RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
+            RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
             RenderSystem.alphaFunc(516, 0.003921569f);
-            cyg.begin(7, DefaultVertexFormat.PARTICLE);
+            dhg.begin(7, DefaultVertexFormat.PARTICLE);
         }
         
         @Override
-        public void end(final Tesselator cym) {
-            cym.end();
+        public void end(final Tesselator dhn) {
+            dhn.end();
         }
         
         @Override
@@ -71,16 +71,16 @@ public interface ParticleRenderType {
     };
     public static final ParticleRenderType PARTICLE_SHEET_LIT = new ParticleRenderType() {
         @Override
-        public void begin(final BufferBuilder cyg, final TextureManager eak) {
+        public void begin(final BufferBuilder dhg, final TextureManager elw) {
             RenderSystem.disableBlend();
             RenderSystem.depthMask(true);
-            eak.bind(TextureAtlas.LOCATION_PARTICLES);
-            cyg.begin(7, DefaultVertexFormat.PARTICLE);
+            elw.bind(TextureAtlas.LOCATION_PARTICLES);
+            dhg.begin(7, DefaultVertexFormat.PARTICLE);
         }
         
         @Override
-        public void end(final Tesselator cym) {
-            cym.end();
+        public void end(final Tesselator dhn) {
+            dhn.end();
         }
         
         @Override
@@ -90,13 +90,13 @@ public interface ParticleRenderType {
     };
     public static final ParticleRenderType CUSTOM = new ParticleRenderType() {
         @Override
-        public void begin(final BufferBuilder cyg, final TextureManager eak) {
+        public void begin(final BufferBuilder dhg, final TextureManager elw) {
             RenderSystem.depthMask(true);
             RenderSystem.disableBlend();
         }
         
         @Override
-        public void end(final Tesselator cym) {
+        public void end(final Tesselator dhn) {
         }
         
         @Override
@@ -106,11 +106,11 @@ public interface ParticleRenderType {
     };
     public static final ParticleRenderType NO_RENDER = new ParticleRenderType() {
         @Override
-        public void begin(final BufferBuilder cyg, final TextureManager eak) {
+        public void begin(final BufferBuilder dhg, final TextureManager elw) {
         }
         
         @Override
-        public void end(final Tesselator cym) {
+        public void end(final Tesselator dhn) {
         }
         
         @Override
@@ -119,7 +119,7 @@ public interface ParticleRenderType {
         }
     };
     
-    void begin(final BufferBuilder cyg, final TextureManager eak);
+    void begin(final BufferBuilder dhg, final TextureManager elw);
     
-    void end(final Tesselator cym);
+    void end(final Tesselator dhn);
 }
diff --git a/src/net/minecraft/client/particle/PlayerCloudParticle.java b/src/net/minecraft/client/particle/PlayerCloudParticle.java
index da12a13..87a49e2 100644
--- a/src/net/minecraft/client/particle/PlayerCloudParticle.java
+++ b/src/net/minecraft/client/particle/PlayerCloudParticle.java
@@ -4,14 +4,14 @@ import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class PlayerCloudParticle extends TextureSheetParticle {
     private final SpriteSet sprites;
     
-    private PlayerCloudParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
-        this.sprites = dpm;
+    private PlayerCloudParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
+        this.sprites = eap;
         final float float16 = 2.5f;
         this.xd *= 0.10000000149011612;
         this.yd *= 0.10000000149011612;
@@ -27,7 +27,7 @@ public class PlayerCloudParticle extends TextureSheetParticle {
         final int integer18 = (int)(8.0 / (Math.random() * 0.8 + 0.3));
         this.lifetime = (int)Math.max(integer18 * 2.5f, 1.0f);
         this.hasPhysics = false;
-        this.setSpriteFromAge(dpm);
+        this.setSpriteFromAge(eap);
     }
     
     @Override
@@ -54,12 +54,12 @@ public class PlayerCloudParticle extends TextureSheetParticle {
         this.xd *= 0.9599999785423279;
         this.yd *= 0.9599999785423279;
         this.zd *= 0.9599999785423279;
-        final Player ayj2 = this.level.getNearestPlayer(this.x, this.y, this.z, 2.0, false);
-        if (ayj2 != null) {
-            final double double3 = ayj2.getY();
+        final Player bec2 = this.level.getNearestPlayer(this.x, this.y, this.z, 2.0, false);
+        if (bec2 != null) {
+            final double double3 = bec2.getY();
             if (this.y > double3) {
                 this.y += (double3 - this.y) * 0.2;
-                this.yd += (ayj2.getDeltaMovement().y - this.yd) * 0.2;
+                this.yd += (bec2.getDeltaMovement().y - this.yd) * 0.2;
                 this.setPos(this.x, this.y, this.z);
             }
         }
@@ -72,29 +72,29 @@ public class PlayerCloudParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new PlayerCloudParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new PlayerCloudParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites, null);
         }
     }
     
     public static class SneezeProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public SneezeProvider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public SneezeProvider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final Particle doz16 = new PlayerCloudParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites, null);
-            doz16.setColor(200.0f, 50.0f, 120.0f);
-            doz16.setAlpha(0.4f);
-            return doz16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final Particle dzz16 = new PlayerCloudParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites, null);
+            dzz16.setColor(200.0f, 50.0f, 120.0f);
+            dzz16.setAlpha(0.4f);
+            return dzz16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/PortalParticle.java b/src/net/minecraft/client/particle/PortalParticle.java
index 5e2029c..e56343c 100644
--- a/src/net/minecraft/client/particle/PortalParticle.java
+++ b/src/net/minecraft/client/particle/PortalParticle.java
@@ -2,15 +2,15 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class PortalParticle extends TextureSheetParticle {
     private final double xStart;
     private final double yStart;
     private final double zStart;
     
-    private PortalParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4);
+    protected PortalParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4);
         this.xd = double5;
         this.yd = double6;
         this.zd = double7;
@@ -83,15 +83,15 @@ public class PortalParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final PortalParticle dpf16 = new PortalParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dpf16.pickSprite(this.sprite);
-            return dpf16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final PortalParticle eaf16 = new PortalParticle(dym, double3, double4, double5, double6, double7, double8);
+            eaf16.pickSprite(this.sprite);
+            return eaf16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/ReversePortalParticle.java b/src/net/minecraft/client/particle/ReversePortalParticle.java
new file mode 100644
index 0000000..bbfc557
--- /dev/null
+++ b/src/net/minecraft/client/particle/ReversePortalParticle.java
@@ -0,0 +1,49 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.SimpleParticleType;
+import net.minecraft.client.multiplayer.ClientLevel;
+
+public class ReversePortalParticle extends PortalParticle {
+    private ReversePortalParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4, double5, double6, double7);
+        this.quadSize *= 1.5;
+        this.lifetime = (int)(Math.random() * 2.0) + 60;
+    }
+    
+    @Override
+    public float getQuadSize(final float float1) {
+        final float float2 = 1.0f - (this.age + float1) / (this.lifetime * 1.5f);
+        return this.quadSize * float2;
+    }
+    
+    @Override
+    public void tick() {
+        this.xo = this.x;
+        this.yo = this.y;
+        this.zo = this.z;
+        if (this.age++ >= this.lifetime) {
+            this.remove();
+            return;
+        }
+        final float float2 = this.age / (float)this.lifetime;
+        this.x += this.xd * float2;
+        this.y += this.yd * float2;
+        this.z += this.zd * float2;
+    }
+    
+    public static class ReversePortalProvider implements ParticleProvider<SimpleParticleType> {
+        private final SpriteSet sprite;
+        
+        public ReversePortalProvider(final SpriteSet eap) {
+            this.sprite = eap;
+        }
+        
+        @Override
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final ReversePortalParticle eag16 = new ReversePortalParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            eag16.pickSprite(this.sprite);
+            return eag16;
+        }
+    }
+}
diff --git a/src/net/minecraft/client/particle/RisingParticle.java b/src/net/minecraft/client/particle/RisingParticle.java
new file mode 100644
index 0000000..5bd2f53
--- /dev/null
+++ b/src/net/minecraft/client/particle/RisingParticle.java
@@ -0,0 +1,35 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.multiplayer.ClientLevel;
+
+public abstract class RisingParticle extends TextureSheetParticle {
+    protected RisingParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4, double5, double6, double7);
+        this.xd = this.xd * 0.009999999776482582 + double5;
+        this.yd = this.yd * 0.009999999776482582 + double6;
+        this.zd = this.zd * 0.009999999776482582 + double7;
+        this.x += (this.random.nextFloat() - this.random.nextFloat()) * 0.05f;
+        this.y += (this.random.nextFloat() - this.random.nextFloat()) * 0.05f;
+        this.z += (this.random.nextFloat() - this.random.nextFloat()) * 0.05f;
+        this.lifetime = (int)(8.0 / (Math.random() * 0.8 + 0.2)) + 4;
+    }
+    
+    @Override
+    public void tick() {
+        this.xo = this.x;
+        this.yo = this.y;
+        this.zo = this.z;
+        if (this.age++ >= this.lifetime) {
+            this.remove();
+            return;
+        }
+        this.move(this.xd, this.yd, this.zd);
+        this.xd *= 0.9599999785423279;
+        this.yd *= 0.9599999785423279;
+        this.zd *= 0.9599999785423279;
+        if (this.onGround) {
+            this.xd *= 0.699999988079071;
+            this.zd *= 0.699999988079071;
+        }
+    }
+}
diff --git a/src/net/minecraft/client/particle/SimpleAnimatedParticle.java b/src/net/minecraft/client/particle/SimpleAnimatedParticle.java
index 1535272..92f50bc 100644
--- a/src/net/minecraft/client/particle/SimpleAnimatedParticle.java
+++ b/src/net/minecraft/client/particle/SimpleAnimatedParticle.java
@@ -1,6 +1,6 @@
 package net.minecraft.client.particle;
 
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class SimpleAnimatedParticle extends TextureSheetParticle {
     protected final SpriteSet sprites;
@@ -11,10 +11,10 @@ public class SimpleAnimatedParticle extends TextureSheetParticle {
     private float fadeB;
     private boolean hasFade;
     
-    protected SimpleAnimatedParticle(final Level bjw, final double double2, final double double3, final double double4, final SpriteSet dpm, final float float6) {
-        super(bjw, double2, double3, double4);
+    protected SimpleAnimatedParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final SpriteSet eap, final float float6) {
+        super(dym, double2, double3, double4);
         this.baseAirFriction = 0.91f;
-        this.sprites = dpm;
+        this.sprites = eap;
         this.baseGravity = float6;
     }
     
diff --git a/src/net/minecraft/client/particle/SingleQuadParticle.java b/src/net/minecraft/client/particle/SingleQuadParticle.java
index eed81be..bde57bc 100644
--- a/src/net/minecraft/client/particle/SingleQuadParticle.java
+++ b/src/net/minecraft/client/particle/SingleQuadParticle.java
@@ -6,55 +6,55 @@ import com.mojang.math.Quaternion;
 import net.minecraft.util.Mth;
 import net.minecraft.client.Camera;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public abstract class SingleQuadParticle extends Particle {
     protected float quadSize;
     
-    protected SingleQuadParticle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(bjw, double2, double3, double4);
+    protected SingleQuadParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+        super(dym, double2, double3, double4);
         this.quadSize = 0.1f * (this.random.nextFloat() * 0.5f + 0.5f) * 2.0f;
     }
     
-    protected SingleQuadParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4, double5, double6, double7);
+    protected SingleQuadParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4, double5, double6, double7);
         this.quadSize = 0.1f * (this.random.nextFloat() * 0.5f + 0.5f) * 2.0f;
     }
     
     @Override
-    public void render(final VertexConsumer cyo, final Camera dbb, final float float3) {
-        final Vec3 cvl5 = dbb.getPosition();
-        final float float4 = (float)(Mth.lerp(float3, this.xo, this.x) - cvl5.x());
-        final float float5 = (float)(Mth.lerp(float3, this.yo, this.y) - cvl5.y());
-        final float float6 = (float)(Mth.lerp(float3, this.zo, this.z) - cvl5.z());
-        Quaternion c9;
+    public void render(final VertexConsumer dhp, final Camera dlj, final float float3) {
+        final Vec3 dem5 = dlj.getPosition();
+        final float float4 = (float)(Mth.lerp(float3, this.xo, this.x) - dem5.x());
+        final float float5 = (float)(Mth.lerp(float3, this.yo, this.y) - dem5.y());
+        final float float6 = (float)(Mth.lerp(float3, this.zo, this.z) - dem5.z());
+        Quaternion d9;
         if (this.roll == 0.0f) {
-            c9 = dbb.rotation();
+            d9 = dlj.rotation();
         }
         else {
-            c9 = new Quaternion(dbb.rotation());
+            d9 = new Quaternion(dlj.rotation());
             final float float7 = Mth.lerp(float3, this.oRoll, this.roll);
-            c9.mul(Vector3f.ZP.rotation(float7));
+            d9.mul(Vector3f.ZP.rotation(float7));
         }
-        final Vector3f e10 = new Vector3f(-1.0f, -1.0f, 0.0f);
-        e10.transform(c9);
+        final Vector3f g10 = new Vector3f(-1.0f, -1.0f, 0.0f);
+        g10.transform(d9);
         final Vector3f[] arr11 = { new Vector3f(-1.0f, -1.0f, 0.0f), new Vector3f(-1.0f, 1.0f, 0.0f), new Vector3f(1.0f, 1.0f, 0.0f), new Vector3f(1.0f, -1.0f, 0.0f) };
         final float float8 = this.getQuadSize(float3);
         for (int integer13 = 0; integer13 < 4; ++integer13) {
-            final Vector3f e11 = arr11[integer13];
-            e11.transform(c9);
-            e11.mul(float8);
-            e11.add(float4, float5, float6);
+            final Vector3f g11 = arr11[integer13];
+            g11.transform(d9);
+            g11.mul(float8);
+            g11.add(float4, float5, float6);
         }
         final float float9 = this.getU0();
         final float float10 = this.getU1();
         final float float11 = this.getV0();
         final float float12 = this.getV1();
         final int integer14 = this.getLightColor(float3);
-        cyo.vertex(arr11[0].x(), arr11[0].y(), arr11[0].z()).uv(float10, float12).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(integer14).endVertex();
-        cyo.vertex(arr11[1].x(), arr11[1].y(), arr11[1].z()).uv(float10, float11).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(integer14).endVertex();
-        cyo.vertex(arr11[2].x(), arr11[2].y(), arr11[2].z()).uv(float9, float11).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(integer14).endVertex();
-        cyo.vertex(arr11[3].x(), arr11[3].y(), arr11[3].z()).uv(float9, float12).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(integer14).endVertex();
+        dhp.vertex(arr11[0].x(), arr11[0].y(), arr11[0].z()).uv(float10, float12).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(integer14).endVertex();
+        dhp.vertex(arr11[1].x(), arr11[1].y(), arr11[1].z()).uv(float10, float11).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(integer14).endVertex();
+        dhp.vertex(arr11[2].x(), arr11[2].y(), arr11[2].z()).uv(float9, float11).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(integer14).endVertex();
+        dhp.vertex(arr11[3].x(), arr11[3].y(), arr11[3].z()).uv(float9, float12).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(integer14).endVertex();
     }
     
     public float getQuadSize(final float float1) {
diff --git a/src/net/minecraft/client/particle/SmokeParticle.java b/src/net/minecraft/client/particle/SmokeParticle.java
index 119170e..e48418c 100644
--- a/src/net/minecraft/client/particle/SmokeParticle.java
+++ b/src/net/minecraft/client/particle/SmokeParticle.java
@@ -2,77 +2,23 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
-public class SmokeParticle extends TextureSheetParticle {
-    private final SpriteSet sprites;
-    
-    protected SmokeParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final float float8, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
-        this.sprites = dpm;
-        this.xd *= 0.10000000149011612;
-        this.yd *= 0.10000000149011612;
-        this.zd *= 0.10000000149011612;
-        this.xd += double5;
-        this.yd += double6;
-        this.zd += double7;
-        final float float9 = (float)(Math.random() * 0.30000001192092896);
-        this.rCol = float9;
-        this.gCol = float9;
-        this.bCol = float9;
-        this.quadSize *= 0.75f * float8;
-        this.lifetime = (int)(8.0 / (Math.random() * 0.8 + 0.2));
-        this.lifetime *= (int)float8;
-        this.lifetime = Math.max(this.lifetime, 1);
-        this.setSpriteFromAge(dpm);
-    }
-    
-    @Override
-    public ParticleRenderType getRenderType() {
-        return ParticleRenderType.PARTICLE_SHEET_OPAQUE;
-    }
-    
-    @Override
-    public float getQuadSize(final float float1) {
-        return this.quadSize * Mth.clamp((this.age + float1) / this.lifetime * 32.0f, 0.0f, 1.0f);
-    }
-    
-    @Override
-    public void tick() {
-        this.xo = this.x;
-        this.yo = this.y;
-        this.zo = this.z;
-        if (this.age++ >= this.lifetime) {
-            this.remove();
-            return;
-        }
-        this.setSpriteFromAge(this.sprites);
-        this.yd += 0.004;
-        this.move(this.xd, this.yd, this.zd);
-        if (this.y == this.yo) {
-            this.xd *= 1.1;
-            this.zd *= 1.1;
-        }
-        this.xd *= 0.9599999785423279;
-        this.yd *= 0.9599999785423279;
-        this.zd *= 0.9599999785423279;
-        if (this.onGround) {
-            this.xd *= 0.699999988079071;
-            this.zd *= 0.699999988079071;
-        }
+public class SmokeParticle extends BaseAshSmokeParticle {
+    protected SmokeParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final float float8, final SpriteSet eap) {
+        super(dym, double2, double3, double4, 0.1f, 0.1f, 0.1f, double5, double6, double7, float8, eap, 0.3f, 8, 0.004, true);
     }
     
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new SmokeParticle(bjw, double3, double4, double5, double6, double7, double8, 1.0f, this.sprites);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new SmokeParticle(dym, double3, double4, double5, double6, double7, double8, 1.0f, this.sprites);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/SoulParticle.java b/src/net/minecraft/client/particle/SoulParticle.java
new file mode 100644
index 0000000..3a8d86a
--- /dev/null
+++ b/src/net/minecraft/client/particle/SoulParticle.java
@@ -0,0 +1,45 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.SimpleParticleType;
+import net.minecraft.client.multiplayer.ClientLevel;
+
+public class SoulParticle extends RisingParticle {
+    private final SpriteSet sprites;
+    
+    private SoulParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4, double5, double6, double7);
+        this.sprites = eap;
+        this.scale(1.5f);
+        this.setSpriteFromAge(eap);
+    }
+    
+    @Override
+    public ParticleRenderType getRenderType() {
+        return ParticleRenderType.PARTICLE_SHEET_TRANSLUCENT;
+    }
+    
+    @Override
+    public void tick() {
+        super.tick();
+        if (!this.removed) {
+            this.setSpriteFromAge(this.sprites);
+        }
+    }
+    
+    public static class Provider implements ParticleProvider<SimpleParticleType> {
+        private final SpriteSet sprite;
+        
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
+        }
+        
+        @Override
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final SoulParticle eal16 = new SoulParticle(dym, double3, double4, double5, double6, double7, double8, this.sprite, null);
+            eal16.setAlpha(1.0f);
+            eal16.pickSprite(this.sprite);
+            return eal16;
+        }
+    }
+}
diff --git a/src/net/minecraft/client/particle/SpellParticle.java b/src/net/minecraft/client/particle/SpellParticle.java
index 178fbad..f56b862 100644
--- a/src/net/minecraft/client/particle/SpellParticle.java
+++ b/src/net/minecraft/client/particle/SpellParticle.java
@@ -2,16 +2,16 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import java.util.Random;
 
 public class SpellParticle extends TextureSheetParticle {
     private static final Random RANDOM;
     private final SpriteSet sprites;
     
-    private SpellParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, 0.5 - SpellParticle.RANDOM.nextDouble(), double6, 0.5 - SpellParticle.RANDOM.nextDouble());
-        this.sprites = dpm;
+    private SpellParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4, 0.5 - SpellParticle.RANDOM.nextDouble(), double6, 0.5 - SpellParticle.RANDOM.nextDouble());
+        this.sprites = eap;
         this.yd *= 0.20000000298023224;
         if (double5 == 0.0 && double7 == 0.0) {
             this.xd *= 0.10000000149011612;
@@ -20,7 +20,7 @@ public class SpellParticle extends TextureSheetParticle {
         this.quadSize *= 0.75f;
         this.lifetime = (int)(8.0 / (Math.random() * 0.8 + 0.2));
         this.hasPhysics = false;
-        this.setSpriteFromAge(dpm);
+        this.setSpriteFromAge(eap);
     }
     
     @Override
@@ -60,73 +60,73 @@ public class SpellParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new SpellParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprite, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new SpellParticle(dym, double3, double4, double5, double6, double7, double8, this.sprite, null);
         }
     }
     
     public static class MobProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public MobProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public MobProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final Particle doz16 = new SpellParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprite, null);
-            doz16.setColor((float)double6, (float)double7, (float)double8);
-            return doz16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final Particle dzz16 = new SpellParticle(dym, double3, double4, double5, double6, double7, double8, this.sprite, null);
+            dzz16.setColor((float)double6, (float)double7, (float)double8);
+            return dzz16;
         }
     }
     
     public static class AmbientMobProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public AmbientMobProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public AmbientMobProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final Particle doz16 = new SpellParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprite, null);
-            doz16.setAlpha(0.15f);
-            doz16.setColor((float)double6, (float)double7, (float)double8);
-            return doz16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final Particle dzz16 = new SpellParticle(dym, double3, double4, double5, double6, double7, double8, this.sprite, null);
+            dzz16.setAlpha(0.15f);
+            dzz16.setColor((float)double6, (float)double7, (float)double8);
+            return dzz16;
         }
     }
     
     public static class WitchProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public WitchProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public WitchProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final SpellParticle dpj16 = new SpellParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprite, null);
-            final float float17 = bjw.random.nextFloat() * 0.5f + 0.35f;
-            dpj16.setColor(1.0f * float17, 0.0f * float17, 1.0f * float17);
-            return dpj16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final SpellParticle eam16 = new SpellParticle(dym, double3, double4, double5, double6, double7, double8, this.sprite, null);
+            final float float17 = dym.random.nextFloat() * 0.5f + 0.35f;
+            eam16.setColor(1.0f * float17, 0.0f * float17, 1.0f * float17);
+            return eam16;
         }
     }
     
     public static class InstantProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public InstantProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public InstantProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new SpellParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprite, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new SpellParticle(dym, double3, double4, double5, double6, double7, double8, this.sprite, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/SpitParticle.java b/src/net/minecraft/client/particle/SpitParticle.java
index d59c028..a1ff15d 100644
--- a/src/net/minecraft/client/particle/SpitParticle.java
+++ b/src/net/minecraft/client/particle/SpitParticle.java
@@ -2,11 +2,11 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class SpitParticle extends ExplodeParticle {
-    private SpitParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, double5, double6, double7, dpm);
+    private SpitParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4, double5, double6, double7, eap);
         this.gravity = 0.5f;
     }
     
@@ -19,13 +19,13 @@ public class SpitParticle extends ExplodeParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new SpitParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new SpitParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/SplashParticle.java b/src/net/minecraft/client/particle/SplashParticle.java
index ef064ae..cc2ff17 100644
--- a/src/net/minecraft/client/particle/SplashParticle.java
+++ b/src/net/minecraft/client/particle/SplashParticle.java
@@ -2,11 +2,11 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class SplashParticle extends WaterDropParticle {
-    private SplashParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4);
+    private SplashParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4);
         this.gravity = 0.04f;
         if (double6 == 0.0 && (double5 != 0.0 || double7 != 0.0)) {
             this.xd = double5;
@@ -18,15 +18,15 @@ public class SplashParticle extends WaterDropParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final SplashParticle dpl16 = new SplashParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dpl16.pickSprite(this.sprite);
-            return dpl16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final SplashParticle eao16 = new SplashParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            eao16.pickSprite(this.sprite);
+            return eao16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/SquidInkParticle.java b/src/net/minecraft/client/particle/SquidInkParticle.java
index 1132923..b1c4a30 100644
--- a/src/net/minecraft/client/particle/SquidInkParticle.java
+++ b/src/net/minecraft/client/particle/SquidInkParticle.java
@@ -3,16 +3,16 @@ package net.minecraft.client.particle;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class SquidInkParticle extends SimpleAnimatedParticle {
-    private SquidInkParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, dpm, 0.0f);
+    private SquidInkParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4, eap, 0.0f);
         this.quadSize = 0.5f;
         this.setAlpha(1.0f);
         this.setColor(0.0f, 0.0f, 0.0f);
         this.lifetime = (int)(this.quadSize * 12.0f / (Math.random() * 0.800000011920929 + 0.20000000298023224));
-        this.setSpriteFromAge(dpm);
+        this.setSpriteFromAge(eap);
         this.hasPhysics = false;
         this.xd = double5;
         this.yd = double6;
@@ -49,13 +49,13 @@ public class SquidInkParticle extends SimpleAnimatedParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new SquidInkParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new SquidInkParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/SuspendedParticle.java b/src/net/minecraft/client/particle/SuspendedParticle.java
index 6d0173b..d12f012 100644
--- a/src/net/minecraft/client/particle/SuspendedParticle.java
+++ b/src/net/minecraft/client/particle/SuspendedParticle.java
@@ -1,20 +1,28 @@
 package net.minecraft.client.particle;
 
+import java.util.Random;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.tags.FluidTags;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class SuspendedParticle extends TextureSheetParticle {
-    private SuspendedParticle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(bjw, double2, double3 - 0.125, double4);
+    private SuspendedParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+        super(dym, double2, double3 - 0.125, double4);
         this.rCol = 0.4f;
         this.gCol = 0.4f;
         this.bCol = 0.7f;
         this.setSize(0.01f, 0.01f);
         this.quadSize *= this.random.nextFloat() * 0.6f + 0.2f;
         this.lifetime = (int)(16.0 / (Math.random() * 0.8 + 0.2));
+        this.hasPhysics = false;
+    }
+    
+    private SuspendedParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3 - 0.125, double4, double5, double6, double7);
+        this.setSize(0.01f, 0.01f);
+        this.quadSize *= this.random.nextFloat() * 0.6f + 0.6f;
+        this.lifetime = (int)(16.0 / (Math.random() * 0.8 + 0.2));
+        this.hasPhysics = false;
     }
     
     @Override
@@ -32,23 +40,58 @@ public class SuspendedParticle extends TextureSheetParticle {
             return;
         }
         this.move(this.xd, this.yd, this.zd);
-        if (!this.level.getFluidState(new BlockPos(this.x, this.y, this.z)).is(FluidTags.WATER)) {
-            this.remove();
-        }
     }
     
-    public static class Provider implements ParticleProvider<SimpleParticleType> {
+    public static class UnderwaterProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public UnderwaterProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final SuspendedParticle dpo16 = new SuspendedParticle(bjw, double3, double4, double5, null);
-            dpo16.pickSprite(this.sprite);
-            return dpo16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final SuspendedParticle ear16 = new SuspendedParticle(dym, double3, double4, double5, null);
+            ear16.pickSprite(this.sprite);
+            return ear16;
+        }
+    }
+    
+    public static class CrimsonSporeProvider implements ParticleProvider<SimpleParticleType> {
+        private final SpriteSet sprite;
+        
+        public CrimsonSporeProvider(final SpriteSet eap) {
+            this.sprite = eap;
+        }
+        
+        @Override
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final Random random16 = dym.random;
+            final double double9 = random16.nextGaussian() * 9.999999974752427E-7;
+            final double double10 = random16.nextGaussian() * 9.999999747378752E-5;
+            final double double11 = random16.nextGaussian() * 9.999999974752427E-7;
+            final SuspendedParticle ear23 = new SuspendedParticle(dym, double3, double4, double5, double9, double10, double11, null);
+            ear23.pickSprite(this.sprite);
+            ear23.setColor(0.9f, 0.4f, 0.5f);
+            return ear23;
+        }
+    }
+    
+    public static class WarpedSporeProvider implements ParticleProvider<SimpleParticleType> {
+        private final SpriteSet sprite;
+        
+        public WarpedSporeProvider(final SpriteSet eap) {
+            this.sprite = eap;
+        }
+        
+        @Override
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final double double9 = dym.random.nextFloat() * -1.9 * dym.random.nextFloat() * 0.1;
+            final SuspendedParticle ear18 = new SuspendedParticle(dym, double3, double4, double5, 0.0, double9, 0.0, null);
+            ear18.pickSprite(this.sprite);
+            ear18.setColor(0.1f, 0.1f, 0.3f);
+            ear18.setSize(0.001f, 0.001f);
+            return ear18;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/SuspendedTownParticle.java b/src/net/minecraft/client/particle/SuspendedTownParticle.java
index 88c0fbf..14d188d 100644
--- a/src/net/minecraft/client/particle/SuspendedTownParticle.java
+++ b/src/net/minecraft/client/particle/SuspendedTownParticle.java
@@ -2,11 +2,11 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class SuspendedTownParticle extends TextureSheetParticle {
-    private SuspendedTownParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4, double5, double6, double7);
+    private SuspendedTownParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4, double5, double6, double7);
         final float float15 = this.random.nextFloat() * 0.1f + 0.2f;
         this.rCol = float15;
         this.gCol = float15;
@@ -48,66 +48,66 @@ public class SuspendedTownParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final SuspendedTownParticle dpp16 = new SuspendedTownParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dpp16.pickSprite(this.sprite);
-            return dpp16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final SuspendedTownParticle eas16 = new SuspendedTownParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            eas16.pickSprite(this.sprite);
+            return eas16;
         }
     }
     
     public static class HappyVillagerProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public HappyVillagerProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public HappyVillagerProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final SuspendedTownParticle dpp16 = new SuspendedTownParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dpp16.pickSprite(this.sprite);
-            dpp16.setColor(1.0f, 1.0f, 1.0f);
-            return dpp16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final SuspendedTownParticle eas16 = new SuspendedTownParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            eas16.pickSprite(this.sprite);
+            eas16.setColor(1.0f, 1.0f, 1.0f);
+            return eas16;
         }
     }
     
     public static class ComposterFillProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public ComposterFillProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public ComposterFillProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final SuspendedTownParticle dpp16 = new SuspendedTownParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dpp16.pickSprite(this.sprite);
-            dpp16.setColor(1.0f, 1.0f, 1.0f);
-            dpp16.setLifetime(3 + bjw.getRandom().nextInt(5));
-            return dpp16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final SuspendedTownParticle eas16 = new SuspendedTownParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            eas16.pickSprite(this.sprite);
+            eas16.setColor(1.0f, 1.0f, 1.0f);
+            eas16.setLifetime(3 + dym.getRandom().nextInt(5));
+            return eas16;
         }
     }
     
     public static class DolphinSpeedProvider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public DolphinSpeedProvider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public DolphinSpeedProvider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final SuspendedTownParticle dpp16 = new SuspendedTownParticle(bjw, double3, double4, double5, double6, double7, double8, null);
-            dpp16.setColor(0.3f, 0.5f, 1.0f);
-            dpp16.pickSprite(this.sprite);
-            dpp16.setAlpha(1.0f - bjw.random.nextFloat() * 0.7f);
-            dpp16.setLifetime(dpp16.getLifetime() / 2);
-            return dpp16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final SuspendedTownParticle eas16 = new SuspendedTownParticle(dym, double3, double4, double5, double6, double7, double8, null);
+            eas16.setColor(0.3f, 0.5f, 1.0f);
+            eas16.pickSprite(this.sprite);
+            eas16.setAlpha(1.0f - dym.random.nextFloat() * 0.7f);
+            eas16.setLifetime(eas16.getLifetime() / 2);
+            return eas16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/TerrainParticle.java b/src/net/minecraft/client/particle/TerrainParticle.java
index a9c0df6..01a464b 100644
--- a/src/net/minecraft/client/particle/TerrainParticle.java
+++ b/src/net/minecraft/client/particle/TerrainParticle.java
@@ -5,10 +5,9 @@ import net.minecraft.core.particles.BlockParticleOption;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.world.level.BlockAndTintGetter;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.client.Minecraft;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.BlockState;
 
@@ -18,10 +17,10 @@ public class TerrainParticle extends TextureSheetParticle {
     private final float uo;
     private final float vo;
     
-    public TerrainParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final BlockState byj) {
-        super(bjw, double2, double3, double4, double5, double6, double7);
-        this.blockState = byj;
-        this.setSprite(Minecraft.getInstance().getBlockRenderer().getBlockModelShaper().getParticleIcon(byj));
+    public TerrainParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final BlockState cfj) {
+        super(dym, double2, double3, double4, double5, double6, double7);
+        this.blockState = cfj;
+        this.setSprite(Minecraft.getInstance().getBlockRenderer().getBlockModelShaper().getParticleIcon(cfj));
         this.gravity = 1.0f;
         this.rCol = 0.6f;
         this.gCol = 0.6f;
@@ -36,27 +35,26 @@ public class TerrainParticle extends TextureSheetParticle {
         return ParticleRenderType.TERRAIN_SHEET;
     }
     
-    public TerrainParticle init(final BlockPos fk) {
-        this.pos = fk;
-        if (this.blockState.getBlock() == Blocks.GRASS_BLOCK) {
+    public TerrainParticle init(final BlockPos fu) {
+        this.pos = fu;
+        if (this.blockState.is(Blocks.GRASS_BLOCK)) {
             return this;
         }
-        this.multiplyColor(fk);
+        this.multiplyColor(fu);
         return this;
     }
     
     public TerrainParticle init() {
         this.pos = new BlockPos(this.x, this.y, this.z);
-        final Block bph2 = this.blockState.getBlock();
-        if (bph2 == Blocks.GRASS_BLOCK) {
+        if (this.blockState.is(Blocks.GRASS_BLOCK)) {
             return this;
         }
         this.multiplyColor(this.pos);
         return this;
     }
     
-    protected void multiplyColor(@Nullable final BlockPos fk) {
-        final int integer3 = Minecraft.getInstance().getBlockColors().getColor(this.blockState, this.level, fk, 0);
+    protected void multiplyColor(@Nullable final BlockPos fu) {
+        final int integer3 = Minecraft.getInstance().getBlockColors().getColor(this.blockState, this.level, fu, 0);
         this.rCol *= (integer3 >> 16 & 0xFF) / 255.0f;
         this.gCol *= (integer3 >> 8 & 0xFF) / 255.0f;
         this.bCol *= (integer3 & 0xFF) / 255.0f;
@@ -93,12 +91,12 @@ public class TerrainParticle extends TextureSheetParticle {
     
     public static class Provider implements ParticleProvider<BlockParticleOption> {
         @Override
-        public Particle createParticle(final BlockParticleOption gq, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final BlockState byj16 = gq.getState();
-            if (byj16.isAir() || byj16.getBlock() == Blocks.MOVING_PISTON) {
+        public Particle createParticle(final BlockParticleOption hc, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final BlockState cfj16 = hc.getState();
+            if (cfj16.isAir() || cfj16.is(Blocks.MOVING_PISTON)) {
                 return null;
             }
-            return new TerrainParticle(bjw, double3, double4, double5, double6, double7, double8, byj16).init();
+            return new TerrainParticle(dym, double3, double4, double5, double6, double7, double8, cfj16).init();
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/TextureSheetParticle.java b/src/net/minecraft/client/particle/TextureSheetParticle.java
index 11cb854..bd22423 100644
--- a/src/net/minecraft/client/particle/TextureSheetParticle.java
+++ b/src/net/minecraft/client/particle/TextureSheetParticle.java
@@ -1,21 +1,21 @@
 package net.minecraft.client.particle;
 
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 
 public abstract class TextureSheetParticle extends SingleQuadParticle {
     protected TextureAtlasSprite sprite;
     
-    protected TextureSheetParticle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(bjw, double2, double3, double4);
+    protected TextureSheetParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+        super(dym, double2, double3, double4);
     }
     
-    protected TextureSheetParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(bjw, double2, double3, double4, double5, double6, double7);
+    protected TextureSheetParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(dym, double2, double3, double4, double5, double6, double7);
     }
     
-    protected void setSprite(final TextureAtlasSprite eaj) {
-        this.sprite = eaj;
+    protected void setSprite(final TextureAtlasSprite elv) {
+        this.sprite = elv;
     }
     
     @Override
@@ -38,11 +38,11 @@ public abstract class TextureSheetParticle extends SingleQuadParticle {
         return this.sprite.getV1();
     }
     
-    public void pickSprite(final SpriteSet dpm) {
-        this.setSprite(dpm.get(this.random));
+    public void pickSprite(final SpriteSet eap) {
+        this.setSprite(eap.get(this.random));
     }
     
-    public void setSpriteFromAge(final SpriteSet dpm) {
-        this.setSprite(dpm.get(this.age, this.lifetime));
+    public void setSpriteFromAge(final SpriteSet eap) {
+        this.setSprite(eap.get(this.age, this.lifetime));
     }
 }
diff --git a/src/net/minecraft/client/particle/TotemParticle.java b/src/net/minecraft/client/particle/TotemParticle.java
index 6653f37..9d3d029 100644
--- a/src/net/minecraft/client/particle/TotemParticle.java
+++ b/src/net/minecraft/client/particle/TotemParticle.java
@@ -2,17 +2,17 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class TotemParticle extends SimpleAnimatedParticle {
-    private TotemParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, dpm, -0.05f);
+    private TotemParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4, eap, -0.05f);
         this.xd = double5;
         this.yd = double6;
         this.zd = double7;
         this.quadSize *= 0.75f;
         this.lifetime = 60 + this.random.nextInt(12);
-        this.setSpriteFromAge(dpm);
+        this.setSpriteFromAge(eap);
         if (this.random.nextInt(4) == 0) {
             this.setColor(0.6f + this.random.nextFloat() * 0.2f, 0.6f + this.random.nextFloat() * 0.3f, this.random.nextFloat() * 0.2f);
         }
@@ -25,13 +25,13 @@ public class TotemParticle extends SimpleAnimatedParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new TotemParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new TotemParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/TrackingEmitter.java b/src/net/minecraft/client/particle/TrackingEmitter.java
index 03d1f10..1c3483d 100644
--- a/src/net/minecraft/client/particle/TrackingEmitter.java
+++ b/src/net/minecraft/client/particle/TrackingEmitter.java
@@ -1,7 +1,7 @@
 package net.minecraft.client.particle;
 
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.world.entity.Entity;
 
@@ -11,19 +11,19 @@ public class TrackingEmitter extends NoRenderParticle {
     private final int lifeTime;
     private final ParticleOptions particleType;
     
-    public TrackingEmitter(final Level bjw, final Entity akq, final ParticleOptions gt) {
-        this(bjw, akq, gt, 3);
+    public TrackingEmitter(final ClientLevel dym, final Entity aom, final ParticleOptions hf) {
+        this(dym, aom, hf, 3);
     }
     
-    public TrackingEmitter(final Level bjw, final Entity akq, final ParticleOptions gt, final int integer) {
-        this(bjw, akq, gt, integer, akq.getDeltaMovement());
+    public TrackingEmitter(final ClientLevel dym, final Entity aom, final ParticleOptions hf, final int integer) {
+        this(dym, aom, hf, integer, aom.getDeltaMovement());
     }
     
-    private TrackingEmitter(final Level bjw, final Entity akq, final ParticleOptions gt, final int integer, final Vec3 cvl) {
-        super(bjw, akq.getX(), akq.getY(0.5), akq.getZ(), cvl.x, cvl.y, cvl.z);
-        this.entity = akq;
+    private TrackingEmitter(final ClientLevel dym, final Entity aom, final ParticleOptions hf, final int integer, final Vec3 dem) {
+        super(dym, aom.getX(), aom.getY(0.5), aom.getZ(), dem.x, dem.y, dem.z);
+        this.entity = aom;
         this.lifeTime = integer;
-        this.particleType = gt;
+        this.particleType = hf;
         this.tick();
     }
     
diff --git a/src/net/minecraft/client/particle/WakeParticle.java b/src/net/minecraft/client/particle/WakeParticle.java
index f064567..0982edb 100644
--- a/src/net/minecraft/client/particle/WakeParticle.java
+++ b/src/net/minecraft/client/particle/WakeParticle.java
@@ -2,20 +2,20 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class WakeParticle extends TextureSheetParticle {
     private final SpriteSet sprites;
     
-    private WakeParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet dpm) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
-        this.sprites = dpm;
+    private WakeParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final SpriteSet eap) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
+        this.sprites = eap;
         this.xd *= 0.30000001192092896;
         this.yd = Math.random() * 0.20000000298023224 + 0.10000000149011612;
         this.zd *= 0.30000001192092896;
         this.setSize(0.01f, 0.01f);
         this.lifetime = (int)(8.0 / (Math.random() * 0.8 + 0.2));
-        this.setSpriteFromAge(dpm);
+        this.setSpriteFromAge(eap);
         this.gravity = 0.0f;
         this.xd = double5;
         this.yd = double6;
@@ -50,13 +50,13 @@ public class WakeParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprites;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprites = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            return new WakeParticle(bjw, double3, double4, double5, double6, double7, double8, this.sprites, null);
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            return new WakeParticle(dym, double3, double4, double5, double6, double7, double8, this.sprites, null);
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/WaterCurrentDownParticle.java b/src/net/minecraft/client/particle/WaterCurrentDownParticle.java
index 60c2c48..1a08cd1 100644
--- a/src/net/minecraft/client/particle/WaterCurrentDownParticle.java
+++ b/src/net/minecraft/client/particle/WaterCurrentDownParticle.java
@@ -2,16 +2,18 @@ package net.minecraft.client.particle;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.SimpleParticleType;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class WaterCurrentDownParticle extends TextureSheetParticle {
     private float angle;
     
-    private WaterCurrentDownParticle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(bjw, double2, double3, double4);
+    private WaterCurrentDownParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+        super(dym, double2, double3, double4);
         this.lifetime = (int)(Math.random() * 60.0) + 30;
         this.hasPhysics = false;
         this.xd = 0.0;
@@ -51,15 +53,15 @@ public class WaterCurrentDownParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final WaterCurrentDownParticle dpv16 = new WaterCurrentDownParticle(bjw, double3, double4, double5, null);
-            dpv16.pickSprite(this.sprite);
-            return dpv16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final WaterCurrentDownParticle eay16 = new WaterCurrentDownParticle(dym, double3, double4, double5, null);
+            eay16.pickSprite(this.sprite);
+            return eay16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/WaterDropParticle.java b/src/net/minecraft/client/particle/WaterDropParticle.java
index cc6c701..a34818b 100644
--- a/src/net/minecraft/client/particle/WaterDropParticle.java
+++ b/src/net/minecraft/client/particle/WaterDropParticle.java
@@ -5,11 +5,11 @@ import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 public class WaterDropParticle extends TextureSheetParticle {
-    protected WaterDropParticle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(bjw, double2, double3, double4, 0.0, 0.0, 0.0);
+    protected WaterDropParticle(final ClientLevel dym, final double double2, final double double3, final double double4) {
+        super(dym, double2, double3, double4, 0.0, 0.0, 0.0);
         this.xd *= 0.30000001192092896;
         this.yd = Math.random() * 0.20000000298023224 + 0.10000000149011612;
         this.zd *= 0.30000001192092896;
@@ -44,9 +44,9 @@ public class WaterDropParticle extends TextureSheetParticle {
             this.xd *= 0.699999988079071;
             this.zd *= 0.699999988079071;
         }
-        final BlockPos fk2 = new BlockPos(this.x, this.y, this.z);
-        final double double3 = Math.max(this.level.getBlockState(fk2).getCollisionShape(this.level, fk2).max(Direction.Axis.Y, this.x - fk2.getX(), this.z - fk2.getZ()), this.level.getFluidState(fk2).getHeight(this.level, fk2));
-        if (double3 > 0.0 && this.y < fk2.getY() + double3) {
+        final BlockPos fu2 = new BlockPos(this.x, this.y, this.z);
+        final double double3 = Math.max(this.level.getBlockState(fu2).getCollisionShape(this.level, fu2).max(Direction.Axis.Y, this.x - fu2.getX(), this.z - fu2.getZ()), this.level.getFluidState(fu2).getHeight(this.level, fu2));
+        if (double3 > 0.0 && this.y < fu2.getY() + double3) {
             this.remove();
         }
     }
@@ -54,15 +54,15 @@ public class WaterDropParticle extends TextureSheetParticle {
     public static class Provider implements ParticleProvider<SimpleParticleType> {
         private final SpriteSet sprite;
         
-        public Provider(final SpriteSet dpm) {
-            this.sprite = dpm;
+        public Provider(final SpriteSet eap) {
+            this.sprite = eap;
         }
         
         @Override
-        public Particle createParticle(final SimpleParticleType gw, final Level bjw, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-            final WaterDropParticle dpw16 = new WaterDropParticle(bjw, double3, double4, double5);
-            dpw16.pickSprite(this.sprite);
-            return dpw16;
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final WaterDropParticle eaz16 = new WaterDropParticle(dym, double3, double4, double5);
+            eaz16.pickSprite(this.sprite);
+            return eaz16;
         }
     }
 }
diff --git a/src/net/minecraft/client/particle/WhiteAshParticle.java b/src/net/minecraft/client/particle/WhiteAshParticle.java
new file mode 100644
index 0000000..4fdf6d6
--- /dev/null
+++ b/src/net/minecraft/client/particle/WhiteAshParticle.java
@@ -0,0 +1,32 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.core.particles.ParticleOptions;
+import java.util.Random;
+import net.minecraft.core.particles.SimpleParticleType;
+import net.minecraft.client.multiplayer.ClientLevel;
+
+public class WhiteAshParticle extends BaseAshSmokeParticle {
+    protected WhiteAshParticle(final ClientLevel dym, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final float float8, final SpriteSet eap) {
+        super(dym, double2, double3, double4, 0.1f, -0.1f, 0.1f, double5, double6, double7, float8, eap, 0.0f, 20, -5.0E-4, false);
+        this.rCol = 0.7294118f;
+        this.gCol = 0.69411767f;
+        this.bCol = 0.7607843f;
+    }
+    
+    public static class Provider implements ParticleProvider<SimpleParticleType> {
+        private final SpriteSet sprites;
+        
+        public Provider(final SpriteSet eap) {
+            this.sprites = eap;
+        }
+        
+        @Override
+        public Particle createParticle(final SimpleParticleType hi, final ClientLevel dym, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+            final Random random16 = dym.random;
+            final double double9 = random16.nextFloat() * -1.9 * random16.nextFloat() * 0.1;
+            final double double10 = random16.nextFloat() * -0.5 * random16.nextFloat() * 0.1 * 5.0;
+            final double double11 = random16.nextFloat() * -1.9 * random16.nextFloat() * 0.1;
+            return new WhiteAshParticle(dym, double3, double4, double5, double9, double10, double11, 1.0f, this.sprites);
+        }
+    }
+}
diff --git a/src/net/minecraft/client/player/AbstractClientPlayer.java b/src/net/minecraft/client/player/AbstractClientPlayer.java
index 95329bd..414d2c4 100644
--- a/src/net/minecraft/client/player/AbstractClientPlayer.java
+++ b/src/net/minecraft/client/player/AbstractClientPlayer.java
@@ -1,8 +1,7 @@
 package net.minecraft.client.player;
 
-import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import com.google.common.hash.Hashing;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import net.minecraft.client.renderer.texture.TextureManager;
@@ -27,21 +26,21 @@ public abstract class AbstractClientPlayer extends Player {
     public float elytraRotZ;
     public final ClientLevel clientLevel;
     
-    public AbstractClientPlayer(final ClientLevel dno, final GameProfile gameProfile) {
-        super(dno, gameProfile);
-        this.clientLevel = dno;
+    public AbstractClientPlayer(final ClientLevel dym, final GameProfile gameProfile) {
+        super(dym, dym.getSharedSpawnPos(), gameProfile);
+        this.clientLevel = dym;
     }
     
     @Override
     public boolean isSpectator() {
-        final PlayerInfo dns2 = Minecraft.getInstance().getConnection().getPlayerInfo(this.getGameProfile().getId());
-        return dns2 != null && dns2.getGameMode() == GameType.SPECTATOR;
+        final PlayerInfo dyq2 = Minecraft.getInstance().getConnection().getPlayerInfo(this.getGameProfile().getId());
+        return dyq2 != null && dyq2.getGameMode() == GameType.SPECTATOR;
     }
     
     @Override
     public boolean isCreative() {
-        final PlayerInfo dns2 = Minecraft.getInstance().getConnection().getPlayerInfo(this.getGameProfile().getId());
-        return dns2 != null && dns2.getGameMode() == GameType.CREATIVE;
+        final PlayerInfo dyq2 = Minecraft.getInstance().getConnection().getPlayerInfo(this.getGameProfile().getId());
+        return dyq2 != null && dyq2.getGameMode() == GameType.CREATIVE;
     }
     
     public boolean isCapeLoaded() {
@@ -57,19 +56,19 @@ public abstract class AbstractClientPlayer extends Player {
     }
     
     public boolean isSkinLoaded() {
-        final PlayerInfo dns2 = this.getPlayerInfo();
-        return dns2 != null && dns2.isSkinLoaded();
+        final PlayerInfo dyq2 = this.getPlayerInfo();
+        return dyq2 != null && dyq2.isSkinLoaded();
     }
     
     public ResourceLocation getSkinTextureLocation() {
-        final PlayerInfo dns2 = this.getPlayerInfo();
-        return (dns2 == null) ? DefaultPlayerSkin.getDefaultSkin(this.getUUID()) : dns2.getSkinLocation();
+        final PlayerInfo dyq2 = this.getPlayerInfo();
+        return (dyq2 == null) ? DefaultPlayerSkin.getDefaultSkin(this.getUUID()) : dyq2.getSkinLocation();
     }
     
     @Nullable
     public ResourceLocation getCloakTextureLocation() {
-        final PlayerInfo dns2 = this.getPlayerInfo();
-        return (dns2 == null) ? null : dns2.getCapeLocation();
+        final PlayerInfo dyq2 = this.getPlayerInfo();
+        return (dyq2 == null) ? null : dyq2.getCapeLocation();
     }
     
     public boolean isElytraLoaded() {
@@ -78,18 +77,18 @@ public abstract class AbstractClientPlayer extends Player {
     
     @Nullable
     public ResourceLocation getElytraTextureLocation() {
-        final PlayerInfo dns2 = this.getPlayerInfo();
-        return (dns2 == null) ? null : dns2.getElytraLocation();
+        final PlayerInfo dyq2 = this.getPlayerInfo();
+        return (dyq2 == null) ? null : dyq2.getElytraLocation();
     }
     
-    public static HttpTexture registerSkinTexture(final ResourceLocation sm, final String string) {
-        final TextureManager eak3 = Minecraft.getInstance().getTextureManager();
-        AbstractTexture dzw4 = eak3.getTexture(sm);
-        if (dzw4 == null) {
-            dzw4 = new HttpTexture(null, String.format("http://skins.minecraft.net/MinecraftSkins/%s.png", StringUtil.stripColor(string)), DefaultPlayerSkin.getDefaultSkin(Player.createPlayerUUID(string)), true, null);
-            eak3.register(sm, dzw4);
+    public static HttpTexture registerSkinTexture(final ResourceLocation uh, final String string) {
+        final TextureManager elw3 = Minecraft.getInstance().getTextureManager();
+        AbstractTexture elj4 = elw3.getTexture(uh);
+        if (elj4 == null) {
+            elj4 = new HttpTexture(null, String.format("http://skins.minecraft.net/MinecraftSkins/%s.png", StringUtil.stripColor(string)), DefaultPlayerSkin.getDefaultSkin(Player.createPlayerUUID(string)), true, null);
+            elw3.register(uh, elj4);
         }
-        return (HttpTexture)dzw4;
+        return (HttpTexture)elj4;
     }
     
     public static ResourceLocation getSkinLocation(final String string) {
@@ -97,8 +96,8 @@ public abstract class AbstractClientPlayer extends Player {
     }
     
     public String getModelName() {
-        final PlayerInfo dns2 = this.getPlayerInfo();
-        return (dns2 == null) ? DefaultPlayerSkin.getSkinModelName(this.getUUID()) : dns2.getModelName();
+        final PlayerInfo dyq2 = this.getPlayerInfo();
+        return (dyq2 == null) ? DefaultPlayerSkin.getSkinModelName(this.getUUID()) : dyq2.getModelName();
     }
     
     public float getFieldOfViewModifier() {
@@ -106,14 +105,13 @@ public abstract class AbstractClientPlayer extends Player {
         if (this.abilities.flying) {
             float2 *= 1.1f;
         }
-        final AttributeInstance alr3 = this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED);
-        float2 *= (float)((alr3.getValue() / this.abilities.getWalkingSpeed() + 1.0) / 2.0);
+        float2 *= (float)((this.getAttributeValue(Attributes.MOVEMENT_SPEED) / this.abilities.getWalkingSpeed() + 1.0) / 2.0);
         if (this.abilities.getWalkingSpeed() == 0.0f || Float.isNaN(float2) || Float.isInfinite(float2)) {
             float2 = 1.0f;
         }
         if (this.isUsingItem() && this.getUseItem().getItem() == Items.BOW) {
-            final int integer4 = this.getTicksUsingItem();
-            float float3 = integer4 / 20.0f;
+            final int integer3 = this.getTicksUsingItem();
+            float float3 = integer3 / 20.0f;
             if (float3 > 1.0f) {
                 float3 = 1.0f;
             }
diff --git a/src/net/minecraft/client/player/KeyboardInput.java b/src/net/minecraft/client/player/KeyboardInput.java
index e33e553..709672c 100644
--- a/src/net/minecraft/client/player/KeyboardInput.java
+++ b/src/net/minecraft/client/player/KeyboardInput.java
@@ -5,8 +5,8 @@ import net.minecraft.client.Options;
 public class KeyboardInput extends Input {
     private final Options options;
     
-    public KeyboardInput(final Options dbr) {
-        this.options = dbr;
+    public KeyboardInput(final Options dmb) {
+        this.options = dmb;
     }
     
     @Override
diff --git a/src/net/minecraft/client/player/LocalPlayer.java b/src/net/minecraft/client/player/LocalPlayer.java
index e26d6fd..d33bf7a 100644
--- a/src/net/minecraft/client/player/LocalPlayer.java
+++ b/src/net/minecraft/client/player/LocalPlayer.java
@@ -5,7 +5,6 @@ import net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec2;
-import java.util.Collections;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.entity.MoverType;
@@ -15,6 +14,8 @@ import net.minecraft.world.effect.MobEffect;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.item.ElytraItem;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -40,6 +41,7 @@ import net.minecraft.client.resources.sounds.ElytraOnPlayerSoundInstance;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvent;
+import java.util.UUID;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket;
@@ -69,9 +71,9 @@ import net.minecraft.client.resources.sounds.RidingMinecartSoundInstance;
 import net.minecraft.world.entity.vehicle.AbstractMinecart;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.client.resources.sounds.BiomeAmbientSoundsHandler;
 import net.minecraft.client.resources.sounds.BubbleColumnAmbientSoundHandler;
 import net.minecraft.client.resources.sounds.UnderwaterAmbientSoundHandler;
-import net.minecraft.world.level.dimension.DimensionType;
 import com.google.common.collect.Lists;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.InteractionHand;
@@ -94,6 +96,7 @@ public class LocalPlayer extends AbstractClientPlayer {
     private float yRotLast;
     private float xRotLast;
     private boolean lastOnGround;
+    private boolean crouching;
     private boolean wasShiftKeyDown;
     private boolean wasSprinting;
     private int positionReminder;
@@ -120,28 +123,25 @@ public class LocalPlayer extends AbstractClientPlayer {
     private int waterVisionTime;
     private boolean showDeathScreen;
     
-    public LocalPlayer(final Minecraft dbn, final ClientLevel dno, final ClientPacketListener dnp, final StatsCounter aas, final ClientRecipeBook dbc) {
-        super(dno, dnp.getLocalGameProfile());
+    public LocalPlayer(final Minecraft dlx, final ClientLevel dym, final ClientPacketListener dyn, final StatsCounter acv, final ClientRecipeBook dlk, final boolean boolean6, final boolean boolean7) {
+        super(dym, dyn.getLocalGameProfile());
         this.ambientSoundHandlers = Lists.newArrayList();
         this.permissionLevel = 0;
         this.autoJumpEnabled = true;
         this.showDeathScreen = true;
-        this.connection = dnp;
-        this.stats = aas;
-        this.recipeBook = dbc;
-        this.minecraft = dbn;
-        this.dimension = DimensionType.OVERWORLD;
-        this.ambientSoundHandlers.add(new UnderwaterAmbientSoundHandler(this, dbn.getSoundManager()));
+        this.minecraft = dlx;
+        this.connection = dyn;
+        this.stats = acv;
+        this.recipeBook = dlk;
+        this.wasShiftKeyDown = boolean6;
+        this.wasSprinting = boolean7;
+        this.ambientSoundHandlers.add(new UnderwaterAmbientSoundHandler(this, dlx.getSoundManager()));
         this.ambientSoundHandlers.add(new BubbleColumnAmbientSoundHandler(this));
+        this.ambientSoundHandlers.add(new BiomeAmbientSoundsHandler(this, dlx.getSoundManager(), dym.getBiomeManager()));
     }
     
     @Override
-    public boolean isGlowing() {
-        return super.isGlowing() || (this.minecraft.player.isSpectator() && this.minecraft.options.keySpectatorOutlines.isDown());
-    }
-    
-    @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         return false;
     }
     
@@ -150,24 +150,24 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     @Override
-    public boolean startRiding(final Entity akq, final boolean boolean2) {
-        if (!super.startRiding(akq, boolean2)) {
+    public boolean startRiding(final Entity aom, final boolean boolean2) {
+        if (!super.startRiding(aom, boolean2)) {
             return false;
         }
-        if (akq instanceof AbstractMinecart) {
-            this.minecraft.getSoundManager().play(new RidingMinecartSoundInstance(this, (AbstractMinecart)akq));
+        if (aom instanceof AbstractMinecart) {
+            this.minecraft.getSoundManager().play(new RidingMinecartSoundInstance(this, (AbstractMinecart)aom));
         }
-        if (akq instanceof Boat) {
-            this.yRotO = akq.yRot;
-            this.yRot = akq.yRot;
-            this.setYHeadRot(akq.yRot);
+        if (aom instanceof Boat) {
+            this.yRotO = aom.yRot;
+            this.yRot = aom.yRot;
+            this.setYHeadRot(aom.yRot);
         }
         return true;
     }
     
     @Override
-    public void stopRiding() {
-        super.stopRiding();
+    public void removeVehicle() {
+        super.removeVehicle();
         this.handsBusy = false;
     }
     
@@ -193,19 +193,28 @@ public class LocalPlayer extends AbstractClientPlayer {
         if (this.isPassenger()) {
             this.connection.send(new ServerboundMovePlayerPacket.Rot(this.yRot, this.xRot, this.onGround));
             this.connection.send(new ServerboundPlayerInputPacket(this.xxa, this.zza, this.input.jumping, this.input.shiftKeyDown));
-            final Entity akq2 = this.getRootVehicle();
-            if (akq2 != this && akq2.isControlledByLocalInstance()) {
-                this.connection.send(new ServerboundMoveVehiclePacket(akq2));
+            final Entity aom2 = this.getRootVehicle();
+            if (aom2 != this && aom2.isControlledByLocalInstance()) {
+                this.connection.send(new ServerboundMoveVehiclePacket(aom2));
             }
         }
         else {
             this.sendPosition();
         }
-        for (final AmbientSoundHandler ecl3 : this.ambientSoundHandlers) {
-            ecl3.tick();
+        for (final AmbientSoundHandler enx3 : this.ambientSoundHandlers) {
+            enx3.tick();
         }
     }
     
+    public float getCurrentMood() {
+        for (final AmbientSoundHandler enx3 : this.ambientSoundHandlers) {
+            if (enx3 instanceof BiomeAmbientSoundsHandler) {
+                return ((BiomeAmbientSoundsHandler)enx3).getMoodiness();
+            }
+        }
+        return 0.0f;
+    }
+    
     private void sendPosition() {
         final boolean boolean2 = this.isSprinting();
         if (boolean2 != this.wasSprinting) {
@@ -229,8 +238,8 @@ public class LocalPlayer extends AbstractClientPlayer {
             boolean boolean4 = double4 * double4 + double5 * double5 + double6 * double6 > 9.0E-4 || this.positionReminder >= 20;
             final boolean boolean5 = double7 != 0.0 || double8 != 0.0;
             if (this.isPassenger()) {
-                final Vec3 cvl16 = this.getDeltaMovement();
-                this.connection.send(new ServerboundMovePlayerPacket.PosRot(cvl16.x, -999.0, cvl16.z, this.yRot, this.xRot, this.onGround));
+                final Vec3 dem16 = this.getDeltaMovement();
+                this.connection.send(new ServerboundMovePlayerPacket.PosRot(dem16.x, -999.0, dem16.z, this.yRot, this.xRot, this.onGround));
                 boolean4 = false;
             }
             else if (boolean4 && boolean5) {
@@ -272,9 +281,9 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     @Override
-    public void swing(final InteractionHand ajk) {
-        super.swing(ajk);
-        this.connection.send(new ServerboundSwingPacket(ajk));
+    public void swing(final InteractionHand anf) {
+        super.swing(anf);
+        this.connection.send(new ServerboundSwingPacket(anf));
     }
     
     @Override
@@ -283,8 +292,8 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     @Override
-    protected void actuallyHurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    protected void actuallyHurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return;
         }
         this.setHealth(this.getHealth() - float2);
@@ -335,6 +344,21 @@ public class LocalPlayer extends AbstractClientPlayer {
         return true;
     }
     
+    @Override
+    public boolean isSuppressingSlidingDownLadder() {
+        return !this.abilities.flying && super.isSuppressingSlidingDownLadder();
+    }
+    
+    @Override
+    public boolean canSpawnSprintParticle() {
+        return !this.abilities.flying && super.canSpawnSprintParticle();
+    }
+    
+    @Override
+    public boolean canSpawnSoulSpeedParticle() {
+        return !this.abilities.flying && super.canSpawnSoulSpeedParticle();
+    }
+    
     protected void sendRidingJump() {
         this.connection.send(new ServerboundPlayerCommandPacket(this, ServerboundPlayerCommandPacket.Action.START_RIDING_JUMP, Mth.floor(this.getJumpRidingScale() * 100.0f)));
     }
@@ -359,10 +383,10 @@ public class LocalPlayer extends AbstractClientPlayer {
         return this.recipeBook;
     }
     
-    public void removeRecipeHighlight(final Recipe<?> bgw) {
-        if (this.recipeBook.willHighlight(bgw)) {
-            this.recipeBook.removeHighlight(bgw);
-            this.connection.send(new ServerboundRecipeBookUpdatePacket(bgw));
+    public void removeRecipeHighlight(final Recipe<?> bmu) {
+        if (this.recipeBook.willHighlight(bmu)) {
+            this.recipeBook.removeHighlight(bmu);
+            this.connection.send(new ServerboundRecipeBookUpdatePacket(bmu));
         }
     }
     
@@ -376,56 +400,56 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     @Override
-    public void displayClientMessage(final Component lf, final boolean boolean2) {
+    public void displayClientMessage(final Component mr, final boolean boolean2) {
         if (boolean2) {
-            this.minecraft.gui.setOverlayMessage(lf, false);
+            this.minecraft.gui.setOverlayMessage(mr, false);
         }
         else {
-            this.minecraft.gui.getChat().addMessage(lf);
+            this.minecraft.gui.getChat().addMessage(mr);
         }
     }
     
     @Override
     protected void checkInBlock(final double double1, final double double2, final double double3) {
-        final BlockPos fk8 = new BlockPos(double1, double2, double3);
-        if (this.blocked(fk8)) {
-            final double double4 = double1 - fk8.getX();
-            final double double5 = double3 - fk8.getZ();
-            Direction fp13 = null;
+        final BlockPos fu8 = new BlockPos(double1, double2, double3);
+        if (this.blocked(fu8)) {
+            final double double4 = double1 - fu8.getX();
+            final double double5 = double3 - fu8.getZ();
+            Direction fz13 = null;
             double double6 = 9999.0;
-            if (!this.blocked(fk8.west()) && double4 < double6) {
+            if (!this.blocked(fu8.west()) && double4 < double6) {
                 double6 = double4;
-                fp13 = Direction.WEST;
+                fz13 = Direction.WEST;
             }
-            if (!this.blocked(fk8.east()) && 1.0 - double4 < double6) {
+            if (!this.blocked(fu8.east()) && 1.0 - double4 < double6) {
                 double6 = 1.0 - double4;
-                fp13 = Direction.EAST;
+                fz13 = Direction.EAST;
             }
-            if (!this.blocked(fk8.north()) && double5 < double6) {
+            if (!this.blocked(fu8.north()) && double5 < double6) {
                 double6 = double5;
-                fp13 = Direction.NORTH;
+                fz13 = Direction.NORTH;
             }
-            if (!this.blocked(fk8.south()) && 1.0 - double5 < double6) {
+            if (!this.blocked(fu8.south()) && 1.0 - double5 < double6) {
                 double6 = 1.0 - double5;
-                fp13 = Direction.SOUTH;
+                fz13 = Direction.SOUTH;
             }
-            if (fp13 != null) {
-                final Vec3 cvl16 = this.getDeltaMovement();
-                switch (fp13) {
+            if (fz13 != null) {
+                final Vec3 dem16 = this.getDeltaMovement();
+                switch (fz13) {
                     case WEST: {
-                        this.setDeltaMovement(-0.1, cvl16.y, cvl16.z);
+                        this.setDeltaMovement(-0.1, dem16.y, dem16.z);
                         break;
                     }
                     case EAST: {
-                        this.setDeltaMovement(0.1, cvl16.y, cvl16.z);
+                        this.setDeltaMovement(0.1, dem16.y, dem16.z);
                         break;
                     }
                     case NORTH: {
-                        this.setDeltaMovement(cvl16.x, cvl16.y, -0.1);
+                        this.setDeltaMovement(dem16.x, dem16.y, -0.1);
                         break;
                     }
                     case SOUTH: {
-                        this.setDeltaMovement(cvl16.x, cvl16.y, 0.1);
+                        this.setDeltaMovement(dem16.x, dem16.y, 0.1);
                         break;
                     }
                 }
@@ -433,10 +457,10 @@ public class LocalPlayer extends AbstractClientPlayer {
         }
     }
     
-    private boolean blocked(final BlockPos fk) {
-        final AABB cvf3 = this.getBoundingBox();
-        final BlockPos.MutableBlockPos a4 = new BlockPos.MutableBlockPos(fk);
-        for (int integer5 = Mth.floor(cvf3.minY); integer5 < Mth.ceil(cvf3.maxY); ++integer5) {
+    private boolean blocked(final BlockPos fu) {
+        final AABB deg3 = this.getBoundingBox();
+        final BlockPos.MutableBlockPos a4 = fu.mutable();
+        for (int integer5 = Mth.floor(deg3.minY); integer5 < Mth.ceil(deg3.maxY); ++integer5) {
             a4.setY(integer5);
             if (!this.freeAt(a4)) {
                 return true;
@@ -458,8 +482,8 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     @Override
-    public void sendMessage(final Component lf) {
-        this.minecraft.gui.getChat().addMessage(lf);
+    public void sendMessage(final Component mr, final UUID uUID) {
+        this.minecraft.gui.getChat().addMessage(mr);
     }
     
     @Override
@@ -481,13 +505,13 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     @Override
-    public void playSound(final SoundEvent aah, final float float2, final float float3) {
-        this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), aah, this.getSoundSource(), float2, float3, false);
+    public void playSound(final SoundEvent ack, final float float2, final float float3) {
+        this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), ack, this.getSoundSource(), float2, float3, false);
     }
     
     @Override
-    public void playNotifySound(final SoundEvent aah, final SoundSource aaj, final float float3, final float float4) {
-        this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), aah, aaj, float3, float4, false);
+    public void playNotifySound(final SoundEvent ack, final SoundSource acm, final float float3, final float float4) {
+        this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), ack, acm, float3, float4, false);
     }
     
     @Override
@@ -496,14 +520,14 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     @Override
-    public void startUsingItem(final InteractionHand ajk) {
-        final ItemStack ben3 = this.getItemInHand(ajk);
-        if (ben3.isEmpty() || this.isUsingItem()) {
+    public void startUsingItem(final InteractionHand anf) {
+        final ItemStack bki3 = this.getItemInHand(anf);
+        if (bki3.isEmpty() || this.isUsingItem()) {
             return;
         }
-        super.startUsingItem(ajk);
+        super.startUsingItem(anf);
         this.startedUsingItem = true;
-        this.usingItemHand = ajk;
+        this.usingItemHand = anf;
     }
     
     @Override
@@ -523,26 +547,26 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        super.onSyncedDataUpdated(sb);
-        if (LocalPlayer.DATA_LIVING_ENTITY_FLAGS.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        super.onSyncedDataUpdated(tq);
+        if (LocalPlayer.DATA_LIVING_ENTITY_FLAGS.equals(tq)) {
             final boolean boolean3 = (this.entityData.<Byte>get(LocalPlayer.DATA_LIVING_ENTITY_FLAGS) & 0x1) > 0;
-            final InteractionHand ajk4 = ((this.entityData.<Byte>get(LocalPlayer.DATA_LIVING_ENTITY_FLAGS) & 0x2) > 0) ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
+            final InteractionHand anf4 = ((this.entityData.<Byte>get(LocalPlayer.DATA_LIVING_ENTITY_FLAGS) & 0x2) > 0) ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
             if (boolean3 && !this.startedUsingItem) {
-                this.startUsingItem(ajk4);
+                this.startUsingItem(anf4);
             }
             else if (!boolean3 && this.startedUsingItem) {
                 this.stopUsingItem();
             }
         }
-        if (LocalPlayer.DATA_SHARED_FLAGS_ID.equals(sb) && this.isFallFlying() && !this.wasFallFlying) {
+        if (LocalPlayer.DATA_SHARED_FLAGS_ID.equals(tq) && this.isFallFlying() && !this.wasFallFlying) {
             this.minecraft.getSoundManager().play(new ElytraOnPlayerSoundInstance(this));
         }
     }
     
     public boolean isRidingJumpable() {
-        final Entity akq2 = this.getVehicle();
-        return this.isPassenger() && akq2 instanceof PlayerRideableJumping && ((PlayerRideableJumping)akq2).canJump();
+        final Entity aom2 = this.getVehicle();
+        return this.isPassenger() && aom2 instanceof PlayerRideableJumping && ((PlayerRideableJumping)aom2).canJump();
     }
     
     public float getJumpRidingScale() {
@@ -550,46 +574,46 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     @Override
-    public void openTextEdit(final SignBlockEntity bxh) {
-        this.minecraft.setScreen(new SignEditScreen(bxh));
+    public void openTextEdit(final SignBlockEntity ceh) {
+        this.minecraft.setScreen(new SignEditScreen(ceh));
     }
     
     @Override
-    public void openMinecartCommandBlock(final BaseCommandBlock bjc) {
-        this.minecraft.setScreen(new MinecartCommandBlockEditScreen(bjc));
+    public void openMinecartCommandBlock(final BaseCommandBlock bpc) {
+        this.minecraft.setScreen(new MinecartCommandBlockEditScreen(bpc));
     }
     
     @Override
-    public void openCommandBlock(final CommandBlockEntity bwq) {
-        this.minecraft.setScreen(new CommandBlockEditScreen(bwq));
+    public void openCommandBlock(final CommandBlockEntity cdq) {
+        this.minecraft.setScreen(new CommandBlockEditScreen(cdq));
     }
     
     @Override
-    public void openStructureBlock(final StructureBlockEntity bxl) {
-        this.minecraft.setScreen(new StructureBlockEditScreen(bxl));
+    public void openStructureBlock(final StructureBlockEntity cel) {
+        this.minecraft.setScreen(new StructureBlockEditScreen(cel));
     }
     
     @Override
-    public void openJigsawBlock(final JigsawBlockEntity bxb) {
-        this.minecraft.setScreen(new JigsawBlockEditScreen(bxb));
+    public void openJigsawBlock(final JigsawBlockEntity ceb) {
+        this.minecraft.setScreen(new JigsawBlockEditScreen(ceb));
     }
     
     @Override
-    public void openItemGui(final ItemStack ben, final InteractionHand ajk) {
-        final Item bei4 = ben.getItem();
-        if (bei4 == Items.WRITABLE_BOOK) {
-            this.minecraft.setScreen(new BookEditScreen(this, ben, ajk));
+    public void openItemGui(final ItemStack bki, final InteractionHand anf) {
+        final Item bke4 = bki.getItem();
+        if (bke4 == Items.WRITABLE_BOOK) {
+            this.minecraft.setScreen(new BookEditScreen(this, bki, anf));
         }
     }
     
     @Override
-    public void crit(final Entity akq) {
-        this.minecraft.particleEngine.createTrackingEmitter(akq, ParticleTypes.CRIT);
+    public void crit(final Entity aom) {
+        this.minecraft.particleEngine.createTrackingEmitter(aom, ParticleTypes.CRIT);
     }
     
     @Override
-    public void magicCrit(final Entity akq) {
-        this.minecraft.particleEngine.createTrackingEmitter(akq, ParticleTypes.ENCHANTED_HIT);
+    public void magicCrit(final Entity aom) {
+        this.minecraft.particleEngine.createTrackingEmitter(aom, ParticleTypes.ENCHANTED_HIT);
     }
     
     @Override
@@ -599,7 +623,7 @@ public class LocalPlayer extends AbstractClientPlayer {
     
     @Override
     public boolean isCrouching() {
-        return !this.abilities.flying && !this.isSwimming() && this.canEnterPose(Pose.CROUCHING) && (this.isShiftKeyDown() || (!this.isSleeping() && !this.canEnterPose(Pose.STANDING)));
+        return this.crouching;
     }
     
     public boolean isMovingSlowly() {
@@ -633,6 +657,7 @@ public class LocalPlayer extends AbstractClientPlayer {
         final boolean boolean2 = this.input.jumping;
         final boolean boolean3 = this.input.shiftKeyDown;
         final boolean boolean4 = this.hasEnoughImpulseToStartSprinting();
+        this.crouching = (!this.abilities.flying && !this.isSwimming() && this.canEnterPose(Pose.CROUCHING) && (this.isShiftKeyDown() || (!this.isSleeping() && !this.canEnterPose(Pose.STANDING))));
         this.input.tick(this.isMovingSlowly());
         this.minecraft.getTutorial().onInput(this.input);
         if (this.isUsingItem() && !this.isPassenger()) {
@@ -654,6 +679,9 @@ public class LocalPlayer extends AbstractClientPlayer {
             this.checkInBlock(this.getX() + this.getBbWidth() * 0.35, this.getY() + 0.5, this.getZ() - this.getBbWidth() * 0.35);
             this.checkInBlock(this.getX() + this.getBbWidth() * 0.35, this.getY() + 0.5, this.getZ() + this.getBbWidth() * 0.35);
         }
+        if (boolean3) {
+            this.sprintTriggerTime = 0;
+        }
         final boolean boolean6 = this.getFoodData().getFoodLevel() > 6.0f || this.abilities.mayfly;
         if ((this.onGround || this.isUnderWater()) && !boolean3 && !boolean4 && this.hasEnoughImpulseToStartSprinting() && !this.isSprinting() && boolean6 && !this.isUsingItem() && !this.hasEffect(MobEffects.BLINDNESS)) {
             if (this.sprintTriggerTime > 0 || this.minecraft.options.keySprint.isDown()) {
@@ -699,22 +727,22 @@ public class LocalPlayer extends AbstractClientPlayer {
                 }
             }
         }
-        if (this.input.jumping && !boolean7 && !boolean2 && !this.abilities.flying && !this.isPassenger() && !this.onLadder()) {
-            final ItemStack ben8 = this.getItemBySlot(EquipmentSlot.CHEST);
-            if (ben8.getItem() == Items.ELYTRA && ElytraItem.isFlyEnabled(ben8) && this.tryToStartFallFlying()) {
+        if (this.input.jumping && !boolean7 && !boolean2 && !this.abilities.flying && !this.isPassenger() && !this.onClimbable()) {
+            final ItemStack bki8 = this.getItemBySlot(EquipmentSlot.CHEST);
+            if (bki8.getItem() == Items.ELYTRA && ElytraItem.isFlyEnabled(bki8) && this.tryToStartFallFlying()) {
                 this.connection.send(new ServerboundPlayerCommandPacket(this, ServerboundPlayerCommandPacket.Action.START_FALL_FLYING));
             }
         }
         this.wasFallFlying = this.isFallFlying();
-        if (this.isInWater() && this.input.shiftKeyDown) {
+        if (this.isInWater() && this.input.shiftKeyDown && this.isAffectedByFluids()) {
             this.goDownInWater();
         }
-        if (this.isUnderLiquid(FluidTags.WATER)) {
+        if (this.isEyeInFluid(FluidTags.WATER)) {
             final int integer8 = this.isSpectator() ? 10 : 1;
             this.waterVisionTime = Mth.clamp(this.waterVisionTime + integer8, 0, 600);
         }
         else if (this.waterVisionTime > 0) {
-            this.isUnderLiquid(FluidTags.WATER);
+            this.isEyeInFluid(FluidTags.WATER);
             this.waterVisionTime = Mth.clamp(this.waterVisionTime - 10, 0, 600);
         }
         if (this.abilities.flying && this.isControlledCamera()) {
@@ -730,7 +758,7 @@ public class LocalPlayer extends AbstractClientPlayer {
             }
         }
         if (this.isRidingJumpable()) {
-            final PlayerRideableJumping ali8 = (PlayerRideableJumping)this.getVehicle();
+            final PlayerRideableJumping api8 = (PlayerRideableJumping)this.getVehicle();
             if (this.jumpRidingTicks < 0) {
                 ++this.jumpRidingTicks;
                 if (this.jumpRidingTicks == 0) {
@@ -739,7 +767,7 @@ public class LocalPlayer extends AbstractClientPlayer {
             }
             if (boolean2 && !this.input.jumping) {
                 this.jumpRidingTicks = -10;
-                ali8.onPlayerJump(Mth.floor(this.getJumpRidingScale() * 100.0f));
+                api8.onPlayerJump(Mth.floor(this.getJumpRidingScale() * 100.0f));
                 this.sendRidingJump();
             }
             else if (!boolean2 && this.input.jumping) {
@@ -776,7 +804,7 @@ public class LocalPlayer extends AbstractClientPlayer {
                 this.minecraft.setScreen(null);
             }
             if (this.portalTime == 0.0f) {
-                this.minecraft.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.PORTAL_TRIGGER, this.random.nextFloat() * 0.4f + 0.8f));
+                this.minecraft.getSoundManager().play(SimpleSoundInstance.forLocalAmbience(SoundEvents.PORTAL_TRIGGER, this.random.nextFloat() * 0.4f + 0.8f, 0.25f));
             }
             this.portalTime += 0.0125f;
             if (this.portalTime >= 1.0f) {
@@ -806,8 +834,8 @@ public class LocalPlayer extends AbstractClientPlayer {
         super.rideTick();
         this.handsBusy = false;
         if (this.getVehicle() instanceof Boat) {
-            final Boat azz2 = (Boat)this.getVehicle();
-            azz2.setInput(this.input.left, this.input.right, this.input.up, this.input.down);
+            final Boat bft2 = (Boat)this.getVehicle();
+            bft2.setInput(this.input.left, this.input.right, this.input.up, this.input.down);
             this.handsBusy |= (this.input.left || this.input.right || this.input.up || this.input.down);
         }
     }
@@ -818,19 +846,19 @@ public class LocalPlayer extends AbstractClientPlayer {
     
     @Nullable
     @Override
-    public MobEffectInstance removeEffectNoUpdate(@Nullable final MobEffect aki) {
-        if (aki == MobEffects.CONFUSION) {
+    public MobEffectInstance removeEffectNoUpdate(@Nullable final MobEffect aoe) {
+        if (aoe == MobEffects.CONFUSION) {
             this.oPortalTime = 0.0f;
             this.portalTime = 0.0f;
         }
-        return super.removeEffectNoUpdate(aki);
+        return super.removeEffectNoUpdate(aoe);
     }
     
     @Override
-    public void move(final MoverType ale, final Vec3 cvl) {
+    public void move(final MoverType apd, final Vec3 dem) {
         final double double4 = this.getX();
         final double double5 = this.getZ();
-        super.move(ale, cvl);
+        super.move(apd, dem);
         this.updateAutoJump((float)(this.getX() - double4), (float)(this.getZ() - double5));
     }
     
@@ -842,39 +870,39 @@ public class LocalPlayer extends AbstractClientPlayer {
         if (!this.canAutoJump()) {
             return;
         }
-        final Vec3 cvl4 = this.position();
-        final Vec3 cvl5 = cvl4.add(float1, 0.0, float2);
-        Vec3 cvl6 = new Vec3(float1, 0.0, float2);
+        final Vec3 dem4 = this.position();
+        final Vec3 dem5 = dem4.add(float1, 0.0, float2);
+        Vec3 dem6 = new Vec3(float1, 0.0, float2);
         final float float3 = this.getSpeed();
-        float float4 = (float)cvl6.lengthSqr();
+        float float4 = (float)dem6.lengthSqr();
         if (float4 <= 0.001f) {
-            final Vec2 cvk9 = this.input.getMoveVector();
-            final float float5 = float3 * cvk9.x;
-            final float float6 = float3 * cvk9.y;
+            final Vec2 del9 = this.input.getMoveVector();
+            final float float5 = float3 * del9.x;
+            final float float6 = float3 * del9.y;
             final float float7 = Mth.sin(this.yRot * 0.017453292f);
             final float float8 = Mth.cos(this.yRot * 0.017453292f);
-            cvl6 = new Vec3(float5 * float8 - float6 * float7, cvl6.y, float6 * float8 + float5 * float7);
-            float4 = (float)cvl6.lengthSqr();
+            dem6 = new Vec3(float5 * float8 - float6 * float7, dem6.y, float6 * float8 + float5 * float7);
+            float4 = (float)dem6.lengthSqr();
             if (float4 <= 0.001f) {
                 return;
             }
         }
         final float float9 = Mth.fastInvSqrt(float4);
-        final Vec3 cvl7 = cvl6.scale(float9);
-        final Vec3 cvl8 = this.getForward();
-        final float float7 = (float)(cvl8.x * cvl7.x + cvl8.z * cvl7.z);
+        final Vec3 dem7 = dem6.scale(float9);
+        final Vec3 dem8 = this.getForward();
+        final float float7 = (float)(dem8.x * dem7.x + dem8.z * dem7.z);
         if (float7 < -0.15f) {
             return;
         }
-        final CollisionContext cvq13 = CollisionContext.of(this);
-        BlockPos fk14 = new BlockPos(this.getX(), this.getBoundingBox().maxY, this.getZ());
-        final BlockState byj15 = this.level.getBlockState(fk14);
-        if (!byj15.getCollisionShape(this.level, fk14, cvq13).isEmpty()) {
+        final CollisionContext der13 = CollisionContext.of(this);
+        BlockPos fu14 = new BlockPos(this.getX(), this.getBoundingBox().maxY, this.getZ());
+        final BlockState cfj15 = this.level.getBlockState(fu14);
+        if (!cfj15.getCollisionShape(this.level, fu14, der13).isEmpty()) {
             return;
         }
-        fk14 = fk14.above();
-        final BlockState byj16 = this.level.getBlockState(fk14);
-        if (!byj16.getCollisionShape(this.level, fk14, cvq13).isEmpty()) {
+        fu14 = fu14.above();
+        final BlockState cfj16 = this.level.getBlockState(fu14);
+        if (!cfj16.getCollisionShape(this.level, fu14, der13).isEmpty()) {
             return;
         }
         final float float10 = 7.0f;
@@ -883,43 +911,43 @@ public class LocalPlayer extends AbstractClientPlayer {
             float11 += (this.getEffect(MobEffects.JUMP).getAmplifier() + 1) * 0.75f;
         }
         final float float12 = Math.max(float3 * 7.0f, 1.0f / float9);
-        Vec3 cvl9 = cvl4;
-        Vec3 cvl10 = cvl5.add(cvl7.scale(float12));
+        Vec3 dem9 = dem4;
+        Vec3 dem10 = dem5.add(dem7.scale(float12));
         final float float13 = this.getBbWidth();
         final float float14 = this.getBbHeight();
-        final AABB cvf24 = new AABB(cvl9, cvl10.add(0.0, float14, 0.0)).inflate(float13, 0.0, float13);
-        cvl9 = cvl9.add(0.0, 0.5099999904632568, 0.0);
-        cvl10 = cvl10.add(0.0, 0.5099999904632568, 0.0);
-        final Vec3 cvl11 = cvl7.cross(new Vec3(0.0, 1.0, 0.0));
-        final Vec3 cvl12 = cvl11.scale(float13 * 0.5f);
-        final Vec3 cvl13 = cvl9.subtract(cvl12);
-        final Vec3 cvl14 = cvl10.subtract(cvl12);
-        final Vec3 cvl15 = cvl9.add(cvl12);
-        final Vec3 cvl16 = cvl10.add(cvl12);
-        final Iterator<AABB> iterator31 = this.level.getCollisions(this, cvf24, Collections.<Entity>emptySet()).flatMap(cwf -> cwf.toAabbs().stream()).iterator();
+        final AABB deg24 = new AABB(dem9, dem10.add(0.0, float14, 0.0)).inflate(float13, 0.0, float13);
+        dem9 = dem9.add(0.0, 0.5099999904632568, 0.0);
+        dem10 = dem10.add(0.0, 0.5099999904632568, 0.0);
+        final Vec3 dem11 = dem7.cross(new Vec3(0.0, 1.0, 0.0));
+        final Vec3 dem12 = dem11.scale(float13 * 0.5f);
+        final Vec3 dem13 = dem9.subtract(dem12);
+        final Vec3 dem14 = dem10.subtract(dem12);
+        final Vec3 dem15 = dem9.add(dem12);
+        final Vec3 dem16 = dem10.add(dem12);
+        final Iterator<AABB> iterator31 = this.level.getCollisions(this, deg24, aom -> true).flatMap(dfg -> dfg.toAabbs().stream()).iterator();
         float float15 = Float.MIN_VALUE;
         while (iterator31.hasNext()) {
-            final AABB cvf25 = iterator31.next();
-            if (!cvf25.intersects(cvl13, cvl14) && !cvf25.intersects(cvl15, cvl16)) {
+            final AABB deg25 = iterator31.next();
+            if (!deg25.intersects(dem13, dem14) && !deg25.intersects(dem15, dem16)) {
                 continue;
             }
-            float15 = (float)cvf25.maxY;
-            final Vec3 cvl17 = cvf25.getCenter();
-            final BlockPos fk15 = new BlockPos(cvl17);
+            float15 = (float)deg25.maxY;
+            final Vec3 dem17 = deg25.getCenter();
+            final BlockPos fu15 = new BlockPos(dem17);
             for (int integer37 = 1; integer37 < float11; ++integer37) {
-                final BlockPos fk16 = fk15.above(integer37);
-                final BlockState byj17 = this.level.getBlockState(fk16);
-                final VoxelShape cwf2;
-                if (!(cwf2 = byj17.getCollisionShape(this.level, fk16, cvq13)).isEmpty()) {
-                    float15 = (float)cwf2.max(Direction.Axis.Y) + fk16.getY();
+                final BlockPos fu16 = fu15.above(integer37);
+                final BlockState cfj17 = this.level.getBlockState(fu16);
+                final VoxelShape dfg2;
+                if (!(dfg2 = cfj17.getCollisionShape(this.level, fu16, der13)).isEmpty()) {
+                    float15 = (float)dfg2.max(Direction.Axis.Y) + fu16.getY();
                     if (float15 - this.getY() > float11) {
                         return;
                     }
                 }
                 if (integer37 > 1) {
-                    fk14 = fk14.above();
-                    final BlockState byj18 = this.level.getBlockState(fk14);
-                    if (!byj18.getCollisionShape(this.level, fk14, cvq13).isEmpty()) {
+                    fu14 = fu14.above();
+                    final BlockState cfj18 = this.level.getBlockState(fu14);
+                    if (!cfj18.getCollisionShape(this.level, fu14, der13).isEmpty()) {
                         return;
                     }
                 }
@@ -941,8 +969,8 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     private boolean isMoving() {
-        final Vec2 cvk2 = this.input.getMoveVector();
-        return cvk2.x != 0.0f || cvk2.y != 0.0f;
+        final Vec2 del2 = this.input.getMoveVector();
+        return del2.x != 0.0f || del2.y != 0.0f;
     }
     
     private boolean hasEnoughImpulseToStartSprinting() {
@@ -951,7 +979,7 @@ public class LocalPlayer extends AbstractClientPlayer {
     }
     
     public float getWaterVision() {
-        if (!this.isUnderLiquid(FluidTags.WATER)) {
+        if (!this.isEyeInFluid(FluidTags.WATER)) {
             return 0.0f;
         }
         final float float2 = 600.0f;
diff --git a/src/net/minecraft/client/player/RemotePlayer.java b/src/net/minecraft/client/player/RemotePlayer.java
index 030bce2..dce08ed 100644
--- a/src/net/minecraft/client/player/RemotePlayer.java
+++ b/src/net/minecraft/client/player/RemotePlayer.java
@@ -1,16 +1,18 @@
 package net.minecraft.client.player;
 
 import net.minecraft.client.Minecraft;
+import java.util.UUID;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.util.Mth;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.damagesource.DamageSource;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.multiplayer.ClientLevel;
 
 public class RemotePlayer extends AbstractClientPlayer {
-    public RemotePlayer(final ClientLevel dno, final GameProfile gameProfile) {
-        super(dno, gameProfile);
+    public RemotePlayer(final ClientLevel dym, final GameProfile gameProfile) {
+        super(dym, gameProfile);
         this.maxUpStep = 1.0f;
         this.noPhysics = true;
     }
@@ -26,22 +28,14 @@ public class RemotePlayer extends AbstractClientPlayer {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         return true;
     }
     
     @Override
     public void tick() {
         super.tick();
-        this.animationSpeedOld = this.animationSpeed;
-        final double double2 = this.getX() - this.xo;
-        final double double3 = this.getZ() - this.zo;
-        float float6 = Mth.sqrt(double2 * double2 + double3 * double3) * 4.0f;
-        if (float6 > 1.0f) {
-            float6 = 1.0f;
-        }
-        this.animationSpeed += (float6 - this.animationSpeed) * 0.4f;
-        this.animationPosition += this.animationSpeed;
+        this.calculateEntityAnimation(this, false);
     }
     
     @Override
@@ -63,13 +57,13 @@ public class RemotePlayer extends AbstractClientPlayer {
         this.oBob = this.bob;
         this.updateSwingTime();
         float float2;
-        if (!this.onGround || this.getHealth() <= 0.0f) {
+        if (!this.onGround || this.isDeadOrDying()) {
             float2 = 0.0f;
         }
         else {
             float2 = Math.min(0.1f, Mth.sqrt(Entity.getHorizontalDistanceSqr(this.getDeltaMovement())));
         }
-        if (this.onGround || this.getHealth() <= 0.0f) {
+        if (this.onGround || this.isDeadOrDying()) {
             final float float3 = 0.0f;
         }
         else {
@@ -86,7 +80,10 @@ public class RemotePlayer extends AbstractClientPlayer {
     }
     
     @Override
-    public void sendMessage(final Component lf) {
-        Minecraft.getInstance().gui.getChat().addMessage(lf);
+    public void sendMessage(final Component mr, final UUID uUID) {
+        final Minecraft dlx4 = Minecraft.getInstance();
+        if (!dlx4.isBlocked(uUID)) {
+            dlx4.gui.getChat().addMessage(mr);
+        }
     }
 }
diff --git a/src/net/minecraft/client/player/inventory/Hotbar.java b/src/net/minecraft/client/player/inventory/Hotbar.java
index 85386f4..16de812 100644
--- a/src/net/minecraft/client/player/inventory/Hotbar.java
+++ b/src/net/minecraft/client/player/inventory/Hotbar.java
@@ -24,24 +24,24 @@ public class Hotbar extends ForwardingList<ItemStack> {
     }
     
     public ListTag createTag() {
-        final ListTag jz2 = new ListTag();
-        for (final ItemStack ben4 : this.delegate()) {
-            ((AbstractList<CompoundTag>)jz2).add(ben4.save(new CompoundTag()));
+        final ListTag lk2 = new ListTag();
+        for (final ItemStack bki4 : this.delegate()) {
+            ((AbstractList<CompoundTag>)lk2).add(bki4.save(new CompoundTag()));
         }
-        return jz2;
+        return lk2;
     }
     
-    public void fromTag(final ListTag jz) {
+    public void fromTag(final ListTag lk) {
         final List<ItemStack> list3 = this.delegate();
         for (int integer4 = 0; integer4 < list3.size(); ++integer4) {
-            list3.set(integer4, ItemStack.of(jz.getCompound(integer4)));
+            list3.set(integer4, ItemStack.of(lk.getCompound(integer4)));
         }
     }
     
     @Override
     public boolean isEmpty() {
-        for (final ItemStack ben3 : this.delegate()) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.delegate()) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
diff --git a/src/net/minecraft/client/renderer/BiomeColors.java b/src/net/minecraft/client/renderer/BiomeColors.java
index 769fc8b..c383f49 100644
--- a/src/net/minecraft/client/renderer/BiomeColors.java
+++ b/src/net/minecraft/client/renderer/BiomeColors.java
@@ -10,25 +10,25 @@ public class BiomeColors {
     public static final ColorResolver FOLIAGE_COLOR_RESOLVER;
     public static final ColorResolver WATER_COLOR_RESOLVER;
     
-    private static int getAverageColor(final BlockAndTintGetter bje, final BlockPos fk, final ColorResolver colorResolver) {
-        return bje.getBlockTint(fk, colorResolver);
+    private static int getAverageColor(final BlockAndTintGetter bpe, final BlockPos fu, final ColorResolver colorResolver) {
+        return bpe.getBlockTint(fu, colorResolver);
     }
     
-    public static int getAverageGrassColor(final BlockAndTintGetter bje, final BlockPos fk) {
-        return getAverageColor(bje, fk, BiomeColors.GRASS_COLOR_RESOLVER);
+    public static int getAverageGrassColor(final BlockAndTintGetter bpe, final BlockPos fu) {
+        return getAverageColor(bpe, fu, BiomeColors.GRASS_COLOR_RESOLVER);
     }
     
-    public static int getAverageFoliageColor(final BlockAndTintGetter bje, final BlockPos fk) {
-        return getAverageColor(bje, fk, BiomeColors.FOLIAGE_COLOR_RESOLVER);
+    public static int getAverageFoliageColor(final BlockAndTintGetter bpe, final BlockPos fu) {
+        return getAverageColor(bpe, fu, BiomeColors.FOLIAGE_COLOR_RESOLVER);
     }
     
-    public static int getAverageWaterColor(final BlockAndTintGetter bje, final BlockPos fk) {
-        return getAverageColor(bje, fk, BiomeColors.WATER_COLOR_RESOLVER);
+    public static int getAverageWaterColor(final BlockAndTintGetter bpe, final BlockPos fu) {
+        return getAverageColor(bpe, fu, BiomeColors.WATER_COLOR_RESOLVER);
     }
     
     static {
         GRASS_COLOR_RESOLVER = Biome::getGrassColor;
-        FOLIAGE_COLOR_RESOLVER = ((bkt, double2, double3) -> bkt.getFoliageColor());
-        WATER_COLOR_RESOLVER = ((bkt, double2, double3) -> bkt.getWaterColor());
+        FOLIAGE_COLOR_RESOLVER = ((bre, double2, double3) -> bre.getFoliageColor());
+        WATER_COLOR_RESOLVER = ((bre, double2, double3) -> bre.getWaterColor());
     }
 }
diff --git a/src/net/minecraft/client/renderer/BlockEntityWithoutLevelRenderer.java b/src/net/minecraft/client/renderer/BlockEntityWithoutLevelRenderer.java
index 34cfddf..c849b7e 100644
--- a/src/net/minecraft/client/renderer/BlockEntityWithoutLevelRenderer.java
+++ b/src/net/minecraft/client/renderer/BlockEntityWithoutLevelRenderer.java
@@ -34,6 +34,7 @@ import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.BlockItem;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.block.model.ItemTransforms;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.TrappedChestBlockEntity;
 import net.minecraft.client.model.TridentModel;
@@ -69,86 +70,86 @@ public class BlockEntityWithoutLevelRenderer {
         this.tridentModel = new TridentModel();
     }
     
-    public void renderByItem(final ItemStack ben, final PoseStack cyl, final MultiBufferSource dqt, final int integer4, final int integer5) {
-        final Item bei7 = ben.getItem();
-        if (!(bei7 instanceof BlockItem)) {
-            if (bei7 == Items.SHIELD) {
-                final boolean boolean8 = ben.getTagElement("BlockEntityTag") != null;
-                cyl.pushPose();
-                cyl.scale(1.0f, -1.0f, -1.0f);
-                final Material eby9 = boolean8 ? ModelBakery.SHIELD_BASE : ModelBakery.NO_PATTERN_SHIELD;
-                final VertexConsumer cyo10 = eby9.sprite().wrap(ItemRenderer.getFoilBuffer(dqt, this.shieldModel.renderType(eby9.atlasLocation()), false, ben.hasFoil()));
-                this.shieldModel.handle().render(cyl, cyo10, integer4, integer5, 1.0f, 1.0f, 1.0f, 1.0f);
-                if (boolean8) {
-                    final List<Pair<BannerPattern, DyeColor>> list11 = BannerBlockEntity.createPatterns(ShieldItem.getColor(ben), BannerBlockEntity.getItemPatterns(ben));
-                    BannerRenderer.renderPatterns(cyl, dqt, integer4, integer5, this.shieldModel.plate(), eby9, false, list11);
+    public void renderByItem(final ItemStack bki, final ItemTransforms.TransformType b, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final Item bke8 = bki.getItem();
+        if (!(bke8 instanceof BlockItem)) {
+            if (bke8 == Items.SHIELD) {
+                final boolean boolean9 = bki.getTagElement("BlockEntityTag") != null;
+                dhl.pushPose();
+                dhl.scale(1.0f, -1.0f, -1.0f);
+                final Material enk10 = boolean9 ? ModelBakery.SHIELD_BASE : ModelBakery.NO_PATTERN_SHIELD;
+                final VertexConsumer dhp11 = enk10.sprite().wrap(ItemRenderer.getFoilBufferDirect(ebz, this.shieldModel.renderType(enk10.atlasLocation()), true, bki.hasFoil()));
+                this.shieldModel.handle().render(dhl, dhp11, integer5, integer6, 1.0f, 1.0f, 1.0f, 1.0f);
+                if (boolean9) {
+                    final List<Pair<BannerPattern, DyeColor>> list12 = BannerBlockEntity.createPatterns(ShieldItem.getColor(bki), BannerBlockEntity.getItemPatterns(bki));
+                    BannerRenderer.renderPatterns(dhl, ebz, integer5, integer6, this.shieldModel.plate(), enk10, false, list12, bki.hasFoil());
                 }
                 else {
-                    this.shieldModel.plate().render(cyl, cyo10, integer4, integer5, 1.0f, 1.0f, 1.0f, 1.0f);
+                    this.shieldModel.plate().render(dhl, dhp11, integer5, integer6, 1.0f, 1.0f, 1.0f, 1.0f);
                 }
-                cyl.popPose();
+                dhl.popPose();
             }
-            else if (bei7 == Items.TRIDENT) {
-                cyl.pushPose();
-                cyl.scale(1.0f, -1.0f, -1.0f);
-                final VertexConsumer cyo11 = ItemRenderer.getFoilBuffer(dqt, this.tridentModel.renderType(TridentModel.TEXTURE), false, ben.hasFoil());
-                this.tridentModel.renderToBuffer(cyl, cyo11, integer4, integer5, 1.0f, 1.0f, 1.0f, 1.0f);
-                cyl.popPose();
+            else if (bke8 == Items.TRIDENT) {
+                dhl.pushPose();
+                dhl.scale(1.0f, -1.0f, -1.0f);
+                final VertexConsumer dhp12 = ItemRenderer.getFoilBufferDirect(ebz, this.tridentModel.renderType(TridentModel.TEXTURE), false, bki.hasFoil());
+                this.tridentModel.renderToBuffer(dhl, dhp12, integer5, integer6, 1.0f, 1.0f, 1.0f, 1.0f);
+                dhl.popPose();
             }
             return;
         }
-        final Block bph8 = ((BlockItem)bei7).getBlock();
-        if (bph8 instanceof AbstractSkullBlock) {
-            GameProfile gameProfile9 = null;
-            if (ben.hasTag()) {
-                final CompoundTag jt10 = ben.getTag();
-                if (jt10.contains("SkullOwner", 10)) {
-                    gameProfile9 = NbtUtils.readGameProfile(jt10.getCompound("SkullOwner"));
+        final Block bvr9 = ((BlockItem)bke8).getBlock();
+        if (bvr9 instanceof AbstractSkullBlock) {
+            GameProfile gameProfile10 = null;
+            if (bki.hasTag()) {
+                final CompoundTag le11 = bki.getTag();
+                if (le11.contains("SkullOwner", 10)) {
+                    gameProfile10 = NbtUtils.readGameProfile(le11.getCompound("SkullOwner"));
                 }
-                else if (jt10.contains("SkullOwner", 8) && !StringUtils.isBlank((CharSequence)jt10.getString("SkullOwner"))) {
-                    gameProfile9 = new GameProfile((UUID)null, jt10.getString("SkullOwner"));
-                    gameProfile9 = SkullBlockEntity.updateGameprofile(gameProfile9);
-                    jt10.remove("SkullOwner");
-                    jt10.put("SkullOwner", NbtUtils.writeGameProfile(new CompoundTag(), gameProfile9));
+                else if (le11.contains("SkullOwner", 8) && !StringUtils.isBlank((CharSequence)le11.getString("SkullOwner"))) {
+                    gameProfile10 = new GameProfile((UUID)null, le11.getString("SkullOwner"));
+                    gameProfile10 = SkullBlockEntity.updateGameprofile(gameProfile10);
+                    le11.remove("SkullOwner");
+                    le11.put("SkullOwner", NbtUtils.writeGameProfile(new CompoundTag(), gameProfile10));
                 }
             }
-            SkullBlockRenderer.renderSkull(null, 180.0f, ((AbstractSkullBlock)bph8).getType(), gameProfile9, 0.0f, cyl, dqt, integer4);
+            SkullBlockRenderer.renderSkull(null, 180.0f, ((AbstractSkullBlock)bvr9).getType(), gameProfile10, 0.0f, dhl, ebz, integer5);
             return;
         }
-        BlockEntity bwl9;
-        if (bph8 instanceof AbstractBannerBlock) {
-            this.banner.fromItem(ben, ((AbstractBannerBlock)bph8).getColor());
-            bwl9 = this.banner;
+        BlockEntity cdl10;
+        if (bvr9 instanceof AbstractBannerBlock) {
+            this.banner.fromItem(bki, ((AbstractBannerBlock)bvr9).getColor());
+            cdl10 = this.banner;
         }
-        else if (bph8 instanceof BedBlock) {
-            this.bed.setColor(((BedBlock)bph8).getColor());
-            bwl9 = this.bed;
+        else if (bvr9 instanceof BedBlock) {
+            this.bed.setColor(((BedBlock)bvr9).getColor());
+            cdl10 = this.bed;
         }
-        else if (bph8 == Blocks.CONDUIT) {
-            bwl9 = this.conduit;
+        else if (bvr9 == Blocks.CONDUIT) {
+            cdl10 = this.conduit;
         }
-        else if (bph8 == Blocks.CHEST) {
-            bwl9 = this.chest;
+        else if (bvr9 == Blocks.CHEST) {
+            cdl10 = this.chest;
         }
-        else if (bph8 == Blocks.ENDER_CHEST) {
-            bwl9 = this.enderChest;
+        else if (bvr9 == Blocks.ENDER_CHEST) {
+            cdl10 = this.enderChest;
         }
-        else if (bph8 == Blocks.TRAPPED_CHEST) {
-            bwl9 = this.trappedChest;
+        else if (bvr9 == Blocks.TRAPPED_CHEST) {
+            cdl10 = this.trappedChest;
         }
         else {
-            if (!(bph8 instanceof ShulkerBoxBlock)) {
+            if (!(bvr9 instanceof ShulkerBoxBlock)) {
                 return;
             }
-            final DyeColor bdj10 = ShulkerBoxBlock.getColorFromItem(bei7);
-            if (bdj10 == null) {
-                bwl9 = BlockEntityWithoutLevelRenderer.DEFAULT_SHULKER_BOX;
+            final DyeColor bje11 = ShulkerBoxBlock.getColorFromItem(bke8);
+            if (bje11 == null) {
+                cdl10 = BlockEntityWithoutLevelRenderer.DEFAULT_SHULKER_BOX;
             }
             else {
-                bwl9 = BlockEntityWithoutLevelRenderer.SHULKER_BOXES[bdj10.getId()];
+                cdl10 = BlockEntityWithoutLevelRenderer.SHULKER_BOXES[bje11.getId()];
             }
         }
-        BlockEntityRenderDispatcher.instance.<BlockEntity>renderItem(bwl9, cyl, dqt, integer4, integer5);
+        BlockEntityRenderDispatcher.instance.<BlockEntity>renderItem(cdl10, dhl, ebz, integer5, integer6);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/ChunkBufferBuilderPack.java b/src/net/minecraft/client/renderer/ChunkBufferBuilderPack.java
index 355031f..6bd9755 100644
--- a/src/net/minecraft/client/renderer/ChunkBufferBuilderPack.java
+++ b/src/net/minecraft/client/renderer/ChunkBufferBuilderPack.java
@@ -8,11 +8,11 @@ public class ChunkBufferBuilderPack {
     private final Map<RenderType, BufferBuilder> builders;
     
     public ChunkBufferBuilderPack() {
-        this.builders = RenderType.chunkBufferLayers().stream().collect(Collectors.toMap(drb -> drb, drb -> new BufferBuilder(drb.bufferSize())));
+        this.builders = RenderType.chunkBufferLayers().stream().collect(Collectors.toMap(ech -> ech, ech -> new BufferBuilder(ech.bufferSize())));
     }
     
-    public BufferBuilder builder(final RenderType drb) {
-        return this.builders.get(drb);
+    public BufferBuilder builder(final RenderType ech) {
+        return this.builders.get(ech);
     }
     
     public void clearAll() {
diff --git a/src/net/minecraft/client/renderer/CubeMap.java b/src/net/minecraft/client/renderer/CubeMap.java
index 3b0b797..03d8947 100644
--- a/src/net/minecraft/client/renderer/CubeMap.java
+++ b/src/net/minecraft/client/renderer/CubeMap.java
@@ -14,20 +14,20 @@ import net.minecraft.resources.ResourceLocation;
 public class CubeMap {
     private final ResourceLocation[] images;
     
-    public CubeMap(final ResourceLocation sm) {
+    public CubeMap(final ResourceLocation uh) {
         this.images = new ResourceLocation[6];
         for (int integer3 = 0; integer3 < 6; ++integer3) {
-            this.images[integer3] = new ResourceLocation(sm.getNamespace(), sm.getPath() + '_' + integer3 + ".png");
+            this.images[integer3] = new ResourceLocation(uh.getNamespace(), uh.getPath() + '_' + integer3 + ".png");
         }
     }
     
-    public void render(final Minecraft dbn, final float float2, final float float3, final float float4) {
-        final Tesselator cym6 = Tesselator.getInstance();
-        final BufferBuilder cyg7 = cym6.getBuilder();
+    public void render(final Minecraft dlx, final float float2, final float float3, final float float4) {
+        final Tesselator dhn6 = Tesselator.getInstance();
+        final BufferBuilder dhg7 = dhn6.getBuilder();
         RenderSystem.matrixMode(5889);
         RenderSystem.pushMatrix();
         RenderSystem.loadIdentity();
-        RenderSystem.multMatrix(Matrix4f.perspective(85.0, dbn.getWindow().getWidth() / (float)dbn.getWindow().getHeight(), 0.05f, 10.0f));
+        RenderSystem.multMatrix(Matrix4f.perspective(85.0, dlx.getWindow().getWidth() / (float)dlx.getWindow().getHeight(), 0.05f, 10.0f));
         RenderSystem.matrixMode(5888);
         RenderSystem.pushMatrix();
         RenderSystem.loadIdentity();
@@ -48,46 +48,46 @@ public class CubeMap {
             RenderSystem.rotatef(float2, 1.0f, 0.0f, 0.0f);
             RenderSystem.rotatef(float3, 0.0f, 1.0f, 0.0f);
             for (int integer10 = 0; integer10 < 6; ++integer10) {
-                dbn.getTextureManager().bind(this.images[integer10]);
-                cyg7.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+                dlx.getTextureManager().bind(this.images[integer10]);
+                dhg7.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
                 final int integer11 = Math.round(255.0f * float4) / (integer9 + 1);
                 if (integer10 == 0) {
-                    cyg7.vertex(-1.0, -1.0, 1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(-1.0, 1.0, 1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(1.0, 1.0, 1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(1.0, -1.0, 1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, -1.0, 1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, 1.0, 1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, 1.0, 1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, -1.0, 1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
                 }
                 if (integer10 == 1) {
-                    cyg7.vertex(1.0, -1.0, 1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(1.0, 1.0, 1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(1.0, 1.0, -1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(1.0, -1.0, -1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, -1.0, 1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, 1.0, 1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, 1.0, -1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, -1.0, -1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
                 }
                 if (integer10 == 2) {
-                    cyg7.vertex(1.0, -1.0, -1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(1.0, 1.0, -1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(-1.0, 1.0, -1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(-1.0, -1.0, -1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, -1.0, -1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, 1.0, -1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, 1.0, -1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, -1.0, -1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
                 }
                 if (integer10 == 3) {
-                    cyg7.vertex(-1.0, -1.0, -1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(-1.0, 1.0, -1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(-1.0, 1.0, 1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(-1.0, -1.0, 1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, -1.0, -1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, 1.0, -1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, 1.0, 1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, -1.0, 1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
                 }
                 if (integer10 == 4) {
-                    cyg7.vertex(-1.0, -1.0, -1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(-1.0, -1.0, 1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(1.0, -1.0, 1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(1.0, -1.0, -1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, -1.0, -1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, -1.0, 1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, -1.0, 1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, -1.0, -1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
                 }
                 if (integer10 == 5) {
-                    cyg7.vertex(-1.0, 1.0, 1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(-1.0, 1.0, -1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(1.0, 1.0, -1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
-                    cyg7.vertex(1.0, 1.0, 1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, 1.0, 1.0).uv(0.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(-1.0, 1.0, -1.0).uv(0.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, 1.0, -1.0).uv(1.0f, 1.0f).color(255, 255, 255, integer11).endVertex();
+                    dhg7.vertex(1.0, 1.0, 1.0).uv(1.0f, 0.0f).color(255, 255, 255, integer11).endVertex();
                 }
-                cym6.end();
+                dhn6.end();
             }
             RenderSystem.popMatrix();
             RenderSystem.colorMask(true, true, true, false);
@@ -102,10 +102,10 @@ public class CubeMap {
         RenderSystem.enableDepthTest();
     }
     
-    public CompletableFuture<Void> preload(final TextureManager eak, final Executor executor) {
+    public CompletableFuture<Void> preload(final TextureManager elw, final Executor executor) {
         final CompletableFuture<?>[] arr4 = new CompletableFuture[6];
         for (int integer5 = 0; integer5 < arr4.length; ++integer5) {
-            arr4[integer5] = eak.preload(this.images[integer5], executor);
+            arr4[integer5] = elw.preload(this.images[integer5], executor);
         }
         return CompletableFuture.allOf(arr4);
     }
diff --git a/src/net/minecraft/client/renderer/DimensionSpecialEffects.java b/src/net/minecraft/client/renderer/DimensionSpecialEffects.java
new file mode 100644
index 0000000..a1ec320
--- /dev/null
+++ b/src/net/minecraft/client/renderer/DimensionSpecialEffects.java
@@ -0,0 +1,147 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.Util;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import net.minecraft.world.phys.Vec3;
+import javax.annotation.Nullable;
+import net.minecraft.util.Mth;
+import java.util.Optional;
+import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.resources.ResourceKey;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
+
+public abstract class DimensionSpecialEffects {
+    private static final Object2ObjectMap<ResourceKey<DimensionType>, DimensionSpecialEffects> EFFECTS;
+    private final float[] sunriseCol;
+    private final float cloudLevel;
+    private final boolean hasGround;
+    private final SkyType skyType;
+    private final boolean forceBrightLightmap;
+    private final boolean constantAmbientLight;
+    
+    public DimensionSpecialEffects(final float float1, final boolean boolean2, final SkyType d, final boolean boolean4, final boolean boolean5) {
+        this.sunriseCol = new float[4];
+        this.cloudLevel = float1;
+        this.hasGround = boolean2;
+        this.skyType = d;
+        this.forceBrightLightmap = boolean4;
+        this.constantAmbientLight = boolean5;
+    }
+    
+    public static DimensionSpecialEffects forType(final Optional<ResourceKey<DimensionType>> optional) {
+        return (DimensionSpecialEffects)DimensionSpecialEffects.EFFECTS.get(optional.orElse(DimensionType.OVERWORLD_LOCATION));
+    }
+    
+    @Nullable
+    public float[] getSunriseColor(final float float1, final float float2) {
+        final float float3 = 0.4f;
+        final float float4 = Mth.cos(float1 * 6.2831855f) - 0.0f;
+        final float float5 = -0.0f;
+        if (float4 >= -0.4f && float4 <= 0.4f) {
+            final float float6 = (float4 + 0.0f) / 0.4f * 0.5f + 0.5f;
+            float float7 = 1.0f - (1.0f - Mth.sin(float6 * 3.1415927f)) * 0.99f;
+            float7 *= float7;
+            this.sunriseCol[0] = float6 * 0.3f + 0.7f;
+            this.sunriseCol[1] = float6 * float6 * 0.7f + 0.2f;
+            this.sunriseCol[2] = float6 * float6 * 0.0f + 0.2f;
+            this.sunriseCol[3] = float7;
+            return this.sunriseCol;
+        }
+        return null;
+    }
+    
+    public float getCloudHeight() {
+        return this.cloudLevel;
+    }
+    
+    public boolean hasGround() {
+        return this.hasGround;
+    }
+    
+    public abstract Vec3 getBrightnessDependentFogColor(final Vec3 dem, final float float2);
+    
+    public abstract boolean isFoggyAt(final int integer1, final int integer2);
+    
+    public SkyType skyType() {
+        return this.skyType;
+    }
+    
+    public boolean forceBrightLightmap() {
+        return this.forceBrightLightmap;
+    }
+    
+    public boolean constantAmbientLight() {
+        return this.constantAmbientLight;
+    }
+    
+    static {
+        final OverworldEffects c2;
+        EFFECTS = Util.<Object2ObjectMap>make((Object2ObjectMap)new Object2ObjectArrayMap(), object2ObjectArrayMap -> {
+            c2 = new OverworldEffects();
+            object2ObjectArrayMap.defaultReturnValue(c2);
+            object2ObjectArrayMap.put(DimensionType.OVERWORLD_LOCATION, c2);
+            object2ObjectArrayMap.put(DimensionType.NETHER_LOCATION, new NetherEffects());
+            object2ObjectArrayMap.put(DimensionType.END_LOCATION, new EndEffects());
+        });
+    }
+    
+    public enum SkyType {
+        NONE, 
+        NORMAL, 
+        END;
+    }
+    
+    public static class NetherEffects extends DimensionSpecialEffects {
+        public NetherEffects() {
+            super(Float.NaN, true, SkyType.NONE, false, true);
+        }
+        
+        @Override
+        public Vec3 getBrightnessDependentFogColor(final Vec3 dem, final float float2) {
+            return dem;
+        }
+        
+        @Override
+        public boolean isFoggyAt(final int integer1, final int integer2) {
+            return true;
+        }
+    }
+    
+    public static class OverworldEffects extends DimensionSpecialEffects {
+        public OverworldEffects() {
+            super(128.0f, true, SkyType.NORMAL, false, false);
+        }
+        
+        @Override
+        public Vec3 getBrightnessDependentFogColor(final Vec3 dem, final float float2) {
+            return dem.multiply(float2 * 0.94f + 0.06f, float2 * 0.94f + 0.06f, float2 * 0.91f + 0.09f);
+        }
+        
+        @Override
+        public boolean isFoggyAt(final int integer1, final int integer2) {
+            return false;
+        }
+    }
+    
+    public static class EndEffects extends DimensionSpecialEffects {
+        public EndEffects() {
+            super(Float.NaN, false, SkyType.END, true, false);
+        }
+        
+        @Override
+        public Vec3 getBrightnessDependentFogColor(final Vec3 dem, final float float2) {
+            return dem.scale(0.15000000596046448);
+        }
+        
+        @Override
+        public boolean isFoggyAt(final int integer1, final int integer2) {
+            return false;
+        }
+        
+        @Nullable
+        @Override
+        public float[] getSunriseColor(final float float1, final float float2) {
+            return null;
+        }
+    }
+}
diff --git a/src/net/minecraft/client/renderer/EffectInstance.java b/src/net/minecraft/client/renderer/EffectInstance.java
index 7c51318..d6076ef 100644
--- a/src/net/minecraft/client/renderer/EffectInstance.java
+++ b/src/net/minecraft/client/renderer/EffectInstance.java
@@ -1,6 +1,8 @@
 package net.minecraft.client.renderer;
 
 import org.apache.logging.log4j.LogManager;
+import it.unimi.dsi.fastutil.ints.IntList;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
 import javax.annotation.Nullable;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import com.mojang.blaze3d.pipeline.RenderTarget;
@@ -46,7 +48,6 @@ public class EffectInstance implements Effect, AutoCloseable {
     private final Map<String, Uniform> uniformMap;
     private final int programId;
     private final String name;
-    private final boolean cull;
     private boolean dirty;
     private final BlendMode blend;
     private final List<Integer> attributes;
@@ -54,19 +55,19 @@ public class EffectInstance implements Effect, AutoCloseable {
     private final Program vertexProgram;
     private final Program fragmentProgram;
     
-    public EffectInstance(final ResourceManager zb, final String string) throws IOException {
+    public EffectInstance(final ResourceManager abc, final String string) throws IOException {
         this.samplerMap = Maps.newHashMap();
         this.samplerNames = Lists.newArrayList();
         this.samplerLocations = Lists.newArrayList();
         this.uniforms = Lists.newArrayList();
         this.uniformLocations = Lists.newArrayList();
         this.uniformMap = Maps.newHashMap();
-        final ResourceLocation sm4 = new ResourceLocation("shaders/program/" + string + ".json");
+        final ResourceLocation uh4 = new ResourceLocation("shaders/program/" + string + ".json");
         this.name = string;
-        Resource za5 = null;
+        Resource abb5 = null;
         try {
-            za5 = zb.getResource(sm4);
-            final JsonObject jsonObject6 = GsonHelper.parse(new InputStreamReader(za5.getInputStream(), StandardCharsets.UTF_8));
+            abb5 = abc.getResource(uh4);
+            final JsonObject jsonObject6 = GsonHelper.parse(new InputStreamReader(abb5.getInputStream(), StandardCharsets.UTF_8));
             final String string2 = GsonHelper.getAsString(jsonObject6, "vertex");
             final String string3 = GsonHelper.getAsString(jsonObject6, "fragment");
             final JsonArray jsonArray9 = GsonHelper.getAsJsonArray(jsonObject6, "samplers", null);
@@ -77,9 +78,9 @@ public class EffectInstance implements Effect, AutoCloseable {
                         this.parseSamplerNode(jsonElement12);
                     }
                     catch (Exception exception13) {
-                        final ChainedJsonException sp14 = ChainedJsonException.forException(exception13);
-                        sp14.prependJsonKey("samplers[" + integer10 + "]");
-                        throw sp14;
+                        final ChainedJsonException uk14 = ChainedJsonException.forException(exception13);
+                        uk14.prependJsonKey("samplers[" + integer10 + "]");
+                        throw uk14;
                     }
                     ++integer10;
                 }
@@ -94,9 +95,9 @@ public class EffectInstance implements Effect, AutoCloseable {
                         this.attributeNames.add(GsonHelper.convertToString(jsonElement13, "attribute"));
                     }
                     catch (Exception exception14) {
-                        final ChainedJsonException sp15 = ChainedJsonException.forException(exception14);
-                        sp15.prependJsonKey("attributes[" + integer11 + "]");
-                        throw sp15;
+                        final ChainedJsonException uk15 = ChainedJsonException.forException(exception14);
+                        uk15.prependJsonKey("attributes[" + integer11 + "]");
+                        throw uk15;
                     }
                     ++integer11;
                 }
@@ -113,17 +114,16 @@ public class EffectInstance implements Effect, AutoCloseable {
                         this.parseUniformNode(jsonElement14);
                     }
                     catch (Exception exception15) {
-                        final ChainedJsonException sp16 = ChainedJsonException.forException(exception15);
-                        sp16.prependJsonKey("uniforms[" + integer12 + "]");
-                        throw sp16;
+                        final ChainedJsonException uk16 = ChainedJsonException.forException(exception15);
+                        uk16.prependJsonKey("uniforms[" + integer12 + "]");
+                        throw uk16;
                     }
                     ++integer12;
                 }
             }
             this.blend = parseBlendNode(GsonHelper.getAsJsonObject(jsonObject6, "blend", null));
-            this.cull = GsonHelper.getAsBoolean(jsonObject6, "cull", true);
-            this.vertexProgram = getOrCreate(zb, Program.Type.VERTEX, string2);
-            this.fragmentProgram = getOrCreate(zb, Program.Type.FRAGMENT, string3);
+            this.vertexProgram = getOrCreate(abc, Program.Type.VERTEX, string2);
+            this.fragmentProgram = getOrCreate(abc, Program.Type.FRAGMENT, string3);
             this.programId = ProgramManager.createProgram();
             ProgramManager.linkProgram(this);
             this.updateLocations();
@@ -135,29 +135,29 @@ public class EffectInstance implements Effect, AutoCloseable {
             }
         }
         catch (Exception exception16) {
-            final ChainedJsonException sp17 = ChainedJsonException.forException(exception16);
-            sp17.setFilenameAndFlush(sm4.getPath());
-            throw sp17;
+            final ChainedJsonException uk17 = ChainedJsonException.forException(exception16);
+            uk17.setFilenameAndFlush(uh4.getPath());
+            throw uk17;
         }
         finally {
-            IOUtils.closeQuietly((Closeable)za5);
+            IOUtils.closeQuietly((Closeable)abb5);
         }
         this.markDirty();
     }
     
-    public static Program getOrCreate(final ResourceManager zb, final Program.Type a, final String string) throws IOException {
-        Program cyc4 = a.getPrograms().get(string);
-        if (cyc4 == null) {
-            final ResourceLocation sm5 = new ResourceLocation("shaders/program/" + string + a.getExtension());
-            final Resource za6 = zb.getResource(sm5);
+    public static Program getOrCreate(final ResourceManager abc, final Program.Type a, final String string) throws IOException {
+        Program dhd4 = a.getPrograms().get(string);
+        if (dhd4 == null) {
+            final ResourceLocation uh5 = new ResourceLocation("shaders/program/" + string + a.getExtension());
+            final Resource abb6 = abc.getResource(uh5);
             try {
-                cyc4 = Program.compileShader(a, string, za6.getInputStream());
+                dhd4 = Program.compileShader(a, string, abb6.getInputStream());
             }
             finally {
-                IOUtils.closeQuietly((Closeable)za6);
+                IOUtils.closeQuietly((Closeable)abb6);
             }
         }
-        return cyc4;
+        return dhd4;
     }
     
     public static BlendMode parseBlendNode(final JsonObject jsonObject) {
@@ -214,8 +214,8 @@ public class EffectInstance implements Effect, AutoCloseable {
     
     @Override
     public void close() {
-        for (final Uniform cye3 : this.uniforms) {
-            cye3.close();
+        for (final Uniform dhf3 : this.uniforms) {
+            dhf3.close();
         }
         ProgramManager.releaseProgram(this);
     }
@@ -228,6 +228,7 @@ public class EffectInstance implements Effect, AutoCloseable {
         for (int integer2 = 0; integer2 < this.samplerLocations.size(); ++integer2) {
             if (this.samplerMap.get(this.samplerNames.get(integer2)) != null) {
                 GlStateManager._activeTexture(33984 + integer2);
+                GlStateManager._disableTexture();
                 GlStateManager._bindTexture(0);
             }
         }
@@ -242,12 +243,6 @@ public class EffectInstance implements Effect, AutoCloseable {
             ProgramManager.glUseProgram(this.programId);
             EffectInstance.lastProgramId = this.programId;
         }
-        if (this.cull) {
-            RenderSystem.enableCull();
-        }
-        else {
-            RenderSystem.disableCull();
-        }
         for (int integer2 = 0; integer2 < this.samplerLocations.size(); ++integer2) {
             if (this.samplerMap.get(this.samplerNames.get(integer2)) != null) {
                 RenderSystem.activeTexture(33984 + integer2);
@@ -265,12 +260,12 @@ public class EffectInstance implements Effect, AutoCloseable {
                 }
                 if (integer3 != -1) {
                     RenderSystem.bindTexture(integer3);
-                    Uniform.uploadInteger(Uniform.glGetUniformLocation(this.programId, this.samplerNames.get(integer2)), integer2);
+                    Uniform.uploadInteger(this.samplerLocations.get(integer2), integer2);
                 }
             }
         }
-        for (final Uniform cye3 : this.uniforms) {
-            cye3.upload();
+        for (final Uniform dhf3 : this.uniforms) {
+            dhf3.upload();
         }
     }
     
@@ -287,35 +282,38 @@ public class EffectInstance implements Effect, AutoCloseable {
     
     public AbstractUniform safeGetUniform(final String string) {
         RenderSystem.assertThread(RenderSystem::isOnGameThread);
-        final Uniform cye3 = this.getUniform(string);
-        return (cye3 == null) ? EffectInstance.DUMMY_UNIFORM : cye3;
+        final Uniform dhf3 = this.getUniform(string);
+        return (dhf3 == null) ? EffectInstance.DUMMY_UNIFORM : dhf3;
     }
     
     private void updateLocations() {
         RenderSystem.assertThread(RenderSystem::isOnRenderThread);
-        for (int integer2 = 0, integer3 = 0; integer2 < this.samplerNames.size(); ++integer2, ++integer3) {
-            final String string4 = this.samplerNames.get(integer2);
+        final IntList intList2 = (IntList)new IntArrayList();
+        for (int integer3 = 0; integer3 < this.samplerNames.size(); ++integer3) {
+            final String string4 = this.samplerNames.get(integer3);
             final int integer4 = Uniform.glGetUniformLocation(this.programId, string4);
             if (integer4 == -1) {
-                EffectInstance.LOGGER.warn("Shader {}could not find sampler named {} in the specified shader program.", this.name, string4);
+                EffectInstance.LOGGER.warn("Shader {} could not find sampler named {} in the specified shader program.", this.name, string4);
                 this.samplerMap.remove(string4);
-                this.samplerNames.remove(integer3);
-                --integer3;
+                intList2.add(integer3);
             }
             else {
                 this.samplerLocations.add(integer4);
             }
         }
-        for (final Uniform cye3 : this.uniforms) {
-            final String string4 = cye3.getName();
-            final int integer4 = Uniform.glGetUniformLocation(this.programId, string4);
-            if (integer4 == -1) {
-                EffectInstance.LOGGER.warn("Could not find uniform named {} in the specified shader program.", string4);
+        for (int integer3 = intList2.size() - 1; integer3 >= 0; --integer3) {
+            this.samplerNames.remove(intList2.getInt(integer3));
+        }
+        for (final Uniform dhf4 : this.uniforms) {
+            final String string5 = dhf4.getName();
+            final int integer5 = Uniform.glGetUniformLocation(this.programId, string5);
+            if (integer5 == -1) {
+                EffectInstance.LOGGER.warn("Could not find uniform named {} in the specified shader program.", string5);
             }
             else {
-                this.uniformLocations.add(integer4);
-                cye3.setLocation(integer4);
-                this.uniformMap.put(string4, cye3);
+                this.uniformLocations.add(integer5);
+                dhf4.setLocation(integer5);
+                this.uniformMap.put(string5, dhf4);
             }
         }
     }
@@ -355,9 +353,9 @@ public class EffectInstance implements Effect, AutoCloseable {
                 arr7[integer7] = GsonHelper.convertToFloat(jsonElement2, "value");
             }
             catch (Exception exception12) {
-                final ChainedJsonException sp13 = ChainedJsonException.forException(exception12);
-                sp13.prependJsonKey("values[" + integer7 + "]");
-                throw sp13;
+                final ChainedJsonException uk13 = ChainedJsonException.forException(exception12);
+                uk13.prependJsonKey("values[" + integer7 + "]");
+                throw uk13;
             }
             ++integer7;
         }
@@ -368,17 +366,17 @@ public class EffectInstance implements Effect, AutoCloseable {
             }
         }
         final int integer8 = (integer6 > 1 && integer6 <= 4 && integer5 < 8) ? (integer6 - 1) : 0;
-        final Uniform cye11 = new Uniform(string4, integer5 + integer8, integer6, this);
+        final Uniform dhf11 = new Uniform(string4, integer5 + integer8, integer6, this);
         if (integer5 <= 3) {
-            cye11.setSafe((int)arr7[0], (int)arr7[1], (int)arr7[2], (int)arr7[3]);
+            dhf11.setSafe((int)arr7[0], (int)arr7[1], (int)arr7[2], (int)arr7[3]);
         }
         else if (integer5 <= 7) {
-            cye11.setSafe(arr7[0], arr7[1], arr7[2], arr7[3]);
+            dhf11.setSafe(arr7[0], arr7[1], arr7[2], arr7[3]);
         }
         else {
-            cye11.set(arr7);
+            dhf11.set(arr7);
         }
-        this.uniforms.add(cye11);
+        this.uniforms.add(dhf11);
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/FaceInfo.java b/src/net/minecraft/client/renderer/FaceInfo.java
index 63524dd..2e4a714 100644
--- a/src/net/minecraft/client/renderer/FaceInfo.java
+++ b/src/net/minecraft/client/renderer/FaceInfo.java
@@ -14,8 +14,8 @@ public enum FaceInfo {
     private static final FaceInfo[] BY_FACING;
     private final VertexInfo[] infos;
     
-    public static FaceInfo fromFacing(final Direction fp) {
-        return FaceInfo.BY_FACING[fp.get3DDataValue()];
+    public static FaceInfo fromFacing(final Direction fz) {
+        return FaceInfo.BY_FACING[fz.get3DDataValue()];
     }
     
     private FaceInfo(final VertexInfo[] arr) {
diff --git a/src/net/minecraft/client/renderer/FogRenderer.java b/src/net/minecraft/client/renderer/FogRenderer.java
index f5ae55f..2f8f621 100644
--- a/src/net/minecraft/client/renderer/FogRenderer.java
+++ b/src/net/minecraft/client/renderer/FogRenderer.java
@@ -1,20 +1,24 @@
 package net.minecraft.client.renderer;
 
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.material.Fluids;
 import com.mojang.blaze3d.platform.GlStateManager;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.world.level.material.FluidState;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.LivingEntity;
 import com.mojang.math.Vector3f;
+import net.minecraft.util.CubicSampler;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.util.Mth;
 import net.minecraft.core.BlockPos;
 import net.minecraft.Util;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.Camera;
@@ -27,36 +31,36 @@ public class FogRenderer {
     private static int previousBiomeFog;
     private static long biomeChangedTime;
     
-    public static void setupColor(final Camera dbb, final float float2, final ClientLevel dno, final int integer, final float float5) {
-        final FluidState coj6 = dbb.getFluidInCamera();
-        if (coj6.is(FluidTags.WATER)) {
+    public static void setupColor(final Camera dlj, final float float2, final ClientLevel dym, final int integer, final float float5) {
+        final FluidState cxa6 = dlj.getFluidInCamera();
+        if (cxa6.is(FluidTags.WATER)) {
             final long long7 = Util.getMillis();
-            final int integer2 = dno.getBiome(new BlockPos(dbb.getPosition())).getWaterFogColor();
+            final int integer7 = dym.getBiome(new BlockPos(dlj.getPosition())).getWaterFogColor();
             if (FogRenderer.biomeChangedTime < 0L) {
-                FogRenderer.targetBiomeFog = integer2;
-                FogRenderer.previousBiomeFog = integer2;
+                FogRenderer.targetBiomeFog = integer7;
+                FogRenderer.previousBiomeFog = integer7;
                 FogRenderer.biomeChangedTime = long7;
             }
-            final int integer3 = FogRenderer.targetBiomeFog >> 16 & 0xFF;
-            final int integer4 = FogRenderer.targetBiomeFog >> 8 & 0xFF;
-            final int integer5 = FogRenderer.targetBiomeFog & 0xFF;
-            final int integer6 = FogRenderer.previousBiomeFog >> 16 & 0xFF;
-            final int integer7 = FogRenderer.previousBiomeFog >> 8 & 0xFF;
-            final int integer8 = FogRenderer.previousBiomeFog & 0xFF;
+            final int integer8 = FogRenderer.targetBiomeFog >> 16 & 0xFF;
+            final int integer9 = FogRenderer.targetBiomeFog >> 8 & 0xFF;
+            final int integer10 = FogRenderer.targetBiomeFog & 0xFF;
+            final int integer11 = FogRenderer.previousBiomeFog >> 16 & 0xFF;
+            final int integer12 = FogRenderer.previousBiomeFog >> 8 & 0xFF;
+            final int integer13 = FogRenderer.previousBiomeFog & 0xFF;
             final float float6 = Mth.clamp((long7 - FogRenderer.biomeChangedTime) / 5000.0f, 0.0f, 1.0f);
-            final float float7 = Mth.lerp(float6, (float)integer6, (float)integer3);
-            final float float8 = Mth.lerp(float6, (float)integer7, (float)integer4);
-            final float float9 = Mth.lerp(float6, (float)integer8, (float)integer5);
+            final float float7 = Mth.lerp(float6, (float)integer11, (float)integer8);
+            final float float8 = Mth.lerp(float6, (float)integer12, (float)integer9);
+            final float float9 = Mth.lerp(float6, (float)integer13, (float)integer10);
             FogRenderer.fogRed = float7 / 255.0f;
             FogRenderer.fogGreen = float8 / 255.0f;
             FogRenderer.fogBlue = float9 / 255.0f;
-            if (FogRenderer.targetBiomeFog != integer2) {
-                FogRenderer.targetBiomeFog = integer2;
+            if (FogRenderer.targetBiomeFog != integer7) {
+                FogRenderer.targetBiomeFog = integer7;
                 FogRenderer.previousBiomeFog = (Mth.floor(float7) << 16 | Mth.floor(float8) << 8 | Mth.floor(float9));
                 FogRenderer.biomeChangedTime = long7;
             }
         }
-        else if (coj6.is(FluidTags.LAVA)) {
+        else if (cxa6.is(FluidTags.LAVA)) {
             FogRenderer.fogRed = 0.6f;
             FogRenderer.fogGreen = 0.1f;
             FogRenderer.fogBlue = 0.0f;
@@ -65,62 +69,65 @@ public class FogRenderer {
         else {
             float float10 = 0.25f + 0.75f * integer / 32.0f;
             float10 = 1.0f - (float)Math.pow(float10, 0.25);
-            final Vec3 cvl8 = dno.getSkyColor(dbb.getBlockPosition(), float2);
-            final float float11 = (float)cvl8.x;
-            final float float12 = (float)cvl8.y;
-            final float float13 = (float)cvl8.z;
-            final Vec3 cvl9 = dno.getFogColor(float2);
-            FogRenderer.fogRed = (float)cvl9.x;
-            FogRenderer.fogGreen = (float)cvl9.y;
-            FogRenderer.fogBlue = (float)cvl9.z;
+            final Vec3 dem8 = dym.getSkyColor(dlj.getBlockPosition(), float2);
+            final float float11 = (float)dem8.x;
+            final float float12 = (float)dem8.y;
+            final float float13 = (float)dem8.z;
+            final float float14 = Mth.clamp(Mth.cos(dym.getTimeOfDay(float2) * 6.2831855f) * 2.0f + 0.5f, 0.0f, 1.0f);
+            final BiomeManager brg13 = dym.getBiomeManager();
+            final Vec3 dem9 = dlj.getPosition().subtract(2.0, 2.0, 2.0).scale(0.25);
+            final Vec3 dem10 = CubicSampler.gaussianSampleVec3(dem9, (integer4, integer5, integer6) -> dym.effects().getBrightnessDependentFogColor(Vec3.fromRGB24(brg13.getNoiseBiomeAtQuart(integer4, integer5, integer6).getFogColor()), float14));
+            FogRenderer.fogRed = (float)dem10.x();
+            FogRenderer.fogGreen = (float)dem10.y();
+            FogRenderer.fogBlue = (float)dem10.z();
             if (integer >= 4) {
-                final float float14 = (Mth.sin(dno.getSunAngle(float2)) > 0.0f) ? -1.0f : 1.0f;
-                final Vector3f e14 = new Vector3f(float14, 0.0f, 0.0f);
-                float float15 = dbb.getLookVector().dot(e14);
-                if (float15 < 0.0f) {
-                    float15 = 0.0f;
+                final float float6 = (Mth.sin(dym.getSunAngle(float2)) > 0.0f) ? -1.0f : 1.0f;
+                final Vector3f g17 = new Vector3f(float6, 0.0f, 0.0f);
+                float float8 = dlj.getLookVector().dot(g17);
+                if (float8 < 0.0f) {
+                    float8 = 0.0f;
                 }
-                if (float15 > 0.0f) {
-                    final float[] arr16 = dno.dimension.getSunriseColor(dno.getTimeOfDay(float2), float2);
-                    if (arr16 != null) {
-                        float15 *= arr16[3];
-                        FogRenderer.fogRed = FogRenderer.fogRed * (1.0f - float15) + arr16[0] * float15;
-                        FogRenderer.fogGreen = FogRenderer.fogGreen * (1.0f - float15) + arr16[1] * float15;
-                        FogRenderer.fogBlue = FogRenderer.fogBlue * (1.0f - float15) + arr16[2] * float15;
+                if (float8 > 0.0f) {
+                    final float[] arr19 = dym.effects().getSunriseColor(dym.getTimeOfDay(float2), float2);
+                    if (arr19 != null) {
+                        float8 *= arr19[3];
+                        FogRenderer.fogRed = FogRenderer.fogRed * (1.0f - float8) + arr19[0] * float8;
+                        FogRenderer.fogGreen = FogRenderer.fogGreen * (1.0f - float8) + arr19[1] * float8;
+                        FogRenderer.fogBlue = FogRenderer.fogBlue * (1.0f - float8) + arr19[2] * float8;
                     }
                 }
             }
             FogRenderer.fogRed += (float11 - FogRenderer.fogRed) * float10;
             FogRenderer.fogGreen += (float12 - FogRenderer.fogGreen) * float10;
             FogRenderer.fogBlue += (float13 - FogRenderer.fogBlue) * float10;
-            final float float14 = dno.getRainLevel(float2);
-            if (float14 > 0.0f) {
-                final float float16 = 1.0f - float14 * 0.5f;
-                final float float15 = 1.0f - float14 * 0.4f;
-                FogRenderer.fogRed *= float16;
-                FogRenderer.fogGreen *= float16;
-                FogRenderer.fogBlue *= float15;
+            final float float6 = dym.getRainLevel(float2);
+            if (float6 > 0.0f) {
+                final float float7 = 1.0f - float6 * 0.5f;
+                final float float8 = 1.0f - float6 * 0.4f;
+                FogRenderer.fogRed *= float7;
+                FogRenderer.fogGreen *= float7;
+                FogRenderer.fogBlue *= float8;
             }
-            final float float16 = dno.getThunderLevel(float2);
-            if (float16 > 0.0f) {
-                final float float15 = 1.0f - float16 * 0.5f;
-                FogRenderer.fogRed *= float15;
-                FogRenderer.fogGreen *= float15;
-                FogRenderer.fogBlue *= float15;
+            final float float7 = dym.getThunderLevel(float2);
+            if (float7 > 0.0f) {
+                final float float8 = 1.0f - float7 * 0.5f;
+                FogRenderer.fogRed *= float8;
+                FogRenderer.fogGreen *= float8;
+                FogRenderer.fogBlue *= float8;
             }
             FogRenderer.biomeChangedTime = -1L;
         }
-        double double7 = dbb.getPosition().y * dno.dimension.getClearColorScale();
-        if (dbb.getEntity() instanceof LivingEntity && ((LivingEntity)dbb.getEntity()).hasEffect(MobEffects.BLINDNESS)) {
-            final int integer2 = ((LivingEntity)dbb.getEntity()).getEffect(MobEffects.BLINDNESS).getDuration();
-            if (integer2 < 20) {
-                double7 *= 1.0f - integer2 / 20.0f;
+        double double7 = dlj.getPosition().y * dym.getLevelData().getClearColorScale();
+        if (dlj.getEntity() instanceof LivingEntity && ((LivingEntity)dlj.getEntity()).hasEffect(MobEffects.BLINDNESS)) {
+            final int integer7 = ((LivingEntity)dlj.getEntity()).getEffect(MobEffects.BLINDNESS).getDuration();
+            if (integer7 < 20) {
+                double7 *= 1.0f - integer7 / 20.0f;
             }
             else {
                 double7 = 0.0;
             }
         }
-        if (double7 < 1.0) {
+        if (double7 < 1.0 && !cxa6.is(FluidTags.LAVA)) {
             if (double7 < 0.0) {
                 double7 = 0.0;
             }
@@ -134,19 +141,19 @@ public class FogRenderer {
             FogRenderer.fogGreen = FogRenderer.fogGreen * (1.0f - float5) + FogRenderer.fogGreen * 0.6f * float5;
             FogRenderer.fogBlue = FogRenderer.fogBlue * (1.0f - float5) + FogRenderer.fogBlue * 0.6f * float5;
         }
-        if (coj6.is(FluidTags.WATER)) {
+        if (cxa6.is(FluidTags.WATER)) {
             float float11 = 0.0f;
-            if (dbb.getEntity() instanceof LocalPlayer) {
-                final LocalPlayer dqb10 = (LocalPlayer)dbb.getEntity();
-                float11 = dqb10.getWaterVision();
+            if (dlj.getEntity() instanceof LocalPlayer) {
+                final LocalPlayer ebf10 = (LocalPlayer)dlj.getEntity();
+                float11 = ebf10.getWaterVision();
             }
             final float float12 = Math.min(1.0f / FogRenderer.fogRed, Math.min(1.0f / FogRenderer.fogGreen, 1.0f / FogRenderer.fogBlue));
             FogRenderer.fogRed = FogRenderer.fogRed * (1.0f - float11) + FogRenderer.fogRed * float12 * float11;
             FogRenderer.fogGreen = FogRenderer.fogGreen * (1.0f - float11) + FogRenderer.fogGreen * float12 * float11;
             FogRenderer.fogBlue = FogRenderer.fogBlue * (1.0f - float11) + FogRenderer.fogBlue * float12 * float11;
         }
-        else if (dbb.getEntity() instanceof LivingEntity && ((LivingEntity)dbb.getEntity()).hasEffect(MobEffects.NIGHT_VISION)) {
-            final float float11 = GameRenderer.getNightVisionScale((LivingEntity)dbb.getEntity(), float2);
+        else if (dlj.getEntity() instanceof LivingEntity && ((LivingEntity)dlj.getEntity()).hasEffect(MobEffects.NIGHT_VISION)) {
+            final float float11 = GameRenderer.getNightVisionScale((LivingEntity)dlj.getEntity(), float2);
             final float float12 = Math.min(1.0f / FogRenderer.fogRed, Math.min(1.0f / FogRenderer.fogGreen, 1.0f / FogRenderer.fogBlue));
             FogRenderer.fogRed = FogRenderer.fogRed * (1.0f - float11) + FogRenderer.fogRed * float12 * float11;
             FogRenderer.fogGreen = FogRenderer.fogGreen * (1.0f - float11) + FogRenderer.fogGreen * float12 * float11;
@@ -160,58 +167,63 @@ public class FogRenderer {
         RenderSystem.fogMode(GlStateManager.FogMode.EXP2);
     }
     
-    public static void setupFog(final Camera dbb, final FogMode a, final float float3, final boolean boolean4) {
-        final FluidState coj5 = dbb.getFluidInCamera();
-        final Entity akq6 = dbb.getEntity();
-        final boolean boolean5 = coj5.getType() != Fluids.EMPTY;
-        if (boolean5) {
+    public static void setupFog(final Camera dlj, final FogMode a, final float float3, final boolean boolean4) {
+        final FluidState cxa5 = dlj.getFluidInCamera();
+        final Entity aom6 = dlj.getEntity();
+        final boolean boolean5 = cxa5.getType() != Fluids.EMPTY;
+        if (cxa5.is(FluidTags.WATER)) {
             float float4 = 1.0f;
-            if (coj5.is(FluidTags.WATER)) {
-                float4 = 0.05f;
-                if (akq6 instanceof LocalPlayer) {
-                    final LocalPlayer dqb9 = (LocalPlayer)akq6;
-                    float4 -= dqb9.getWaterVision() * dqb9.getWaterVision() * 0.03f;
-                    final Biome bkt10 = dqb9.level.getBiome(new BlockPos(dqb9));
-                    if (bkt10 == Biomes.SWAMP || bkt10 == Biomes.SWAMP_HILLS) {
-                        float4 += 0.005f;
-                    }
+            float4 = 0.05f;
+            if (aom6 instanceof LocalPlayer) {
+                final LocalPlayer ebf9 = (LocalPlayer)aom6;
+                float4 -= ebf9.getWaterVision() * ebf9.getWaterVision() * 0.03f;
+                final Biome bre10 = ebf9.level.getBiome(ebf9.blockPosition());
+                if (bre10 == Biomes.SWAMP || bre10 == Biomes.SWAMP_HILLS) {
+                    float4 += 0.005f;
                 }
             }
-            else if (coj5.is(FluidTags.LAVA)) {
-                float4 = 2.0f;
-            }
             RenderSystem.fogDensity(float4);
             RenderSystem.fogMode(GlStateManager.FogMode.EXP2);
         }
         else {
             float float4;
-            float float6;
-            if (akq6 instanceof LivingEntity && ((LivingEntity)akq6).hasEffect(MobEffects.BLINDNESS)) {
-                final int integer10 = ((LivingEntity)akq6).getEffect(MobEffects.BLINDNESS).getDuration();
-                final float float5 = Mth.lerp(Math.min(1.0f, integer10 / 20.0f), float3, 5.0f);
-                if (a == FogMode.FOG_SKY) {
+            float float5;
+            if (cxa5.is(FluidTags.LAVA)) {
+                if (aom6 instanceof LivingEntity && ((LivingEntity)aom6).hasEffect(MobEffects.FIRE_RESISTANCE)) {
                     float4 = 0.0f;
-                    float6 = float5 * 0.8f;
+                    float5 = 3.0f;
                 }
                 else {
-                    float4 = float5 * 0.25f;
-                    float6 = float5;
+                    float4 = 0.25f;
+                    float5 = 1.0f;
+                }
+            }
+            else if (aom6 instanceof LivingEntity && ((LivingEntity)aom6).hasEffect(MobEffects.BLINDNESS)) {
+                final int integer10 = ((LivingEntity)aom6).getEffect(MobEffects.BLINDNESS).getDuration();
+                final float float6 = Mth.lerp(Math.min(1.0f, integer10 / 20.0f), float3, 5.0f);
+                if (a == FogMode.FOG_SKY) {
+                    float4 = 0.0f;
+                    float5 = float6 * 0.8f;
+                }
+                else {
+                    float4 = float6 * 0.25f;
+                    float5 = float6;
                 }
             }
             else if (boolean4) {
                 float4 = float3 * 0.05f;
-                float6 = Math.min(float3, 192.0f) * 0.5f;
+                float5 = Math.min(float3, 192.0f) * 0.5f;
             }
             else if (a == FogMode.FOG_SKY) {
                 float4 = 0.0f;
-                float6 = float3;
+                float5 = float3;
             }
             else {
                 float4 = float3 * 0.75f;
-                float6 = float3;
+                float5 = float3;
             }
             RenderSystem.fogStart(float4);
-            RenderSystem.fogEnd(float6);
+            RenderSystem.fogEnd(float5);
             RenderSystem.fogMode(GlStateManager.FogMode.LINEAR);
             RenderSystem.setupNvFogDistance();
         }
diff --git a/src/net/minecraft/client/renderer/GameRenderer.java b/src/net/minecraft/client/renderer/GameRenderer.java
index d48a642..f11b5ed 100644
--- a/src/net/minecraft/client/renderer/GameRenderer.java
+++ b/src/net/minecraft/client/renderer/GameRenderer.java
@@ -9,7 +9,6 @@ import net.minecraft.world.level.block.state.pattern.BlockInWorld;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.HitResult;
 import com.mojang.blaze3d.platform.NativeImage;
-import net.minecraft.server.packs.resources.SimpleResource;
 import net.minecraft.client.Screenshot;
 import net.minecraft.CrashReportCategory;
 import com.mojang.blaze3d.platform.Window;
@@ -56,7 +55,7 @@ import net.minecraft.client.Minecraft;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
 
-public class GameRenderer implements AutoCloseable, ResourceManagerReloadListener {
+public class GameRenderer implements ResourceManagerReloadListener, AutoCloseable {
     private static final Logger LOGGER;
     private final Minecraft minecraft;
     private final ResourceManager resourceManager;
@@ -93,7 +92,7 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
     private boolean effectActive;
     private final Camera mainCamera;
     
-    public GameRenderer(final Minecraft dbn, final ResourceManager zb, final RenderBuffers dqz) {
+    public GameRenderer(final Minecraft dlx, final ResourceManager abc, final RenderBuffers ecf) {
         this.random = new Random();
         this.renderHand = true;
         this.renderBlockOutline = true;
@@ -102,12 +101,12 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         this.zoom = 1.0f;
         this.effectIndex = GameRenderer.EFFECT_NONE;
         this.mainCamera = new Camera();
-        this.minecraft = dbn;
-        this.resourceManager = zb;
-        this.itemInHandRenderer = dbn.getItemInHandRenderer();
-        this.mapRenderer = new MapRenderer(dbn.getTextureManager());
-        this.lightTexture = new LightTexture(this, dbn);
-        this.renderBuffers = dqz;
+        this.minecraft = dlx;
+        this.resourceManager = abc;
+        this.itemInHandRenderer = dlx.getItemInHandRenderer();
+        this.mapRenderer = new MapRenderer(dlx.getTextureManager());
+        this.lightTexture = new LightTexture(this, dlx);
+        this.renderBuffers = ecf;
         this.postEffect = null;
     }
     
@@ -131,44 +130,44 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         this.effectActive = !this.effectActive;
     }
     
-    public void checkEntityPostEffect(@Nullable final Entity akq) {
+    public void checkEntityPostEffect(@Nullable final Entity aom) {
         if (this.postEffect != null) {
             this.postEffect.close();
         }
         this.postEffect = null;
-        if (akq instanceof Creeper) {
+        if (aom instanceof Creeper) {
             this.loadEffect(new ResourceLocation("shaders/post/creeper.json"));
         }
-        else if (akq instanceof Spider) {
+        else if (aom instanceof Spider) {
             this.loadEffect(new ResourceLocation("shaders/post/spider.json"));
         }
-        else if (akq instanceof EnderMan) {
+        else if (aom instanceof EnderMan) {
             this.loadEffect(new ResourceLocation("shaders/post/invert.json"));
         }
     }
     
-    private void loadEffect(final ResourceLocation sm) {
+    private void loadEffect(final ResourceLocation uh) {
         if (this.postEffect != null) {
             this.postEffect.close();
         }
         try {
-            (this.postEffect = new PostChain(this.minecraft.getTextureManager(), this.resourceManager, this.minecraft.getMainRenderTarget(), sm)).resize(this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight());
+            (this.postEffect = new PostChain(this.minecraft.getTextureManager(), this.resourceManager, this.minecraft.getMainRenderTarget(), uh)).resize(this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight());
             this.effectActive = true;
         }
         catch (IOException iOException3) {
-            GameRenderer.LOGGER.warn("Failed to load shader: {}", sm, iOException3);
+            GameRenderer.LOGGER.warn("Failed to load shader: {}", uh, iOException3);
             this.effectIndex = GameRenderer.EFFECT_NONE;
             this.effectActive = false;
         }
         catch (JsonSyntaxException jsonSyntaxException3) {
-            GameRenderer.LOGGER.warn("Failed to load shader: {}", sm, jsonSyntaxException3);
+            GameRenderer.LOGGER.warn("Failed to parse shader: {}", uh, jsonSyntaxException3);
             this.effectIndex = GameRenderer.EFFECT_NONE;
             this.effectActive = false;
         }
     }
     
     @Override
-    public void onResourceManagerReload(final ResourceManager zb) {
+    public void onResourceManagerReload(final ResourceManager abc) {
         if (this.postEffect != null) {
             this.postEffect.close();
         }
@@ -222,8 +221,8 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
     }
     
     public void pick(final float float1) {
-        final Entity akq2 = this.minecraft.getCameraEntity();
-        if (akq2 == null) {
+        final Entity aom2 = this.minecraft.getCameraEntity();
+        if (aom2 == null) {
             return;
         }
         if (this.minecraft.level == null) {
@@ -232,8 +231,8 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         this.minecraft.getProfiler().push("pick");
         this.minecraft.crosshairPickEntity = null;
         double double4 = this.minecraft.gameMode.getPickRange();
-        this.minecraft.hitResult = akq2.pick(double4, float1, false);
-        final Vec3 cvl6 = akq2.getEyePosition(float1);
+        this.minecraft.hitResult = aom2.pick(double4, float1, false);
+        final Vec3 dem6 = aom2.getEyePosition(float1);
         boolean boolean7 = false;
         final int integer8 = 3;
         double double5 = double4;
@@ -248,24 +247,24 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         }
         double5 *= double5;
         if (this.minecraft.hitResult != null) {
-            double5 = this.minecraft.hitResult.getLocation().distanceToSqr(cvl6);
+            double5 = this.minecraft.hitResult.getLocation().distanceToSqr(dem6);
         }
-        final Vec3 cvl7 = akq2.getViewVector(1.0f);
-        final Vec3 cvl8 = cvl6.add(cvl7.x * double4, cvl7.y * double4, cvl7.z * double4);
+        final Vec3 dem7 = aom2.getViewVector(1.0f);
+        final Vec3 dem8 = dem6.add(dem7.x * double4, dem7.y * double4, dem7.z * double4);
         final float float2 = 1.0f;
-        final AABB cvf14 = akq2.getBoundingBox().expandTowards(cvl7.scale(double4)).inflate(1.0, 1.0, 1.0);
-        final EntityHitResult cvh15 = ProjectileUtil.getEntityHitResult(akq2, cvl6, cvl8, cvf14, akq -> !akq.isSpectator() && akq.isPickable(), double5);
-        if (cvh15 != null) {
-            final Entity akq3 = cvh15.getEntity();
-            final Vec3 cvl9 = cvh15.getLocation();
-            final double double6 = cvl6.distanceToSqr(cvl9);
+        final AABB deg14 = aom2.getBoundingBox().expandTowards(dem7.scale(double4)).inflate(1.0, 1.0, 1.0);
+        final EntityHitResult dei15 = ProjectileUtil.getEntityHitResult(aom2, dem6, dem8, deg14, aom -> !aom.isSpectator() && aom.isPickable(), double5);
+        if (dei15 != null) {
+            final Entity aom3 = dei15.getEntity();
+            final Vec3 dem9 = dei15.getLocation();
+            final double double6 = dem6.distanceToSqr(dem9);
             if (boolean7 && double6 > 9.0) {
-                this.minecraft.hitResult = BlockHitResult.miss(cvl9, Direction.getNearest(cvl7.x, cvl7.y, cvl7.z), new BlockPos(cvl9));
+                this.minecraft.hitResult = BlockHitResult.miss(dem9, Direction.getNearest(dem7.x, dem7.y, dem7.z), new BlockPos(dem9));
             }
             else if (double6 < double5 || this.minecraft.hitResult == null) {
-                this.minecraft.hitResult = cvh15;
-                if (akq3 instanceof LivingEntity || akq3 instanceof ItemFrame) {
-                    this.minecraft.crosshairPickEntity = akq3;
+                this.minecraft.hitResult = dei15;
+                if (aom3 instanceof LivingEntity || aom3 instanceof ItemFrame) {
+                    this.minecraft.crosshairPickEntity = aom3;
                 }
             }
         }
@@ -275,8 +274,8 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
     private void tickFov() {
         float float2 = 1.0f;
         if (this.minecraft.getCameraEntity() instanceof AbstractClientPlayer) {
-            final AbstractClientPlayer dpy3 = (AbstractClientPlayer)this.minecraft.getCameraEntity();
-            float2 = dpy3.getFieldOfViewModifier();
+            final AbstractClientPlayer ebc3 = (AbstractClientPlayer)this.minecraft.getCameraEntity();
+            float2 = ebc3.getFieldOfViewModifier();
         }
         this.oldFov = this.fov;
         this.fov += (float2 - this.fov) * 0.5f;
@@ -288,7 +287,7 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         }
     }
     
-    private double getFov(final Camera dbb, final float float2, final boolean boolean3) {
+    private double getFov(final Camera dlj, final float float2, final boolean boolean3) {
         if (this.panoramicMode) {
             return 90.0;
         }
@@ -297,76 +296,76 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
             double5 = this.minecraft.options.fov;
             double5 *= Mth.lerp(float2, this.oldFov, this.fov);
         }
-        if (dbb.getEntity() instanceof LivingEntity && ((LivingEntity)dbb.getEntity()).getHealth() <= 0.0f) {
-            final float float3 = Math.min(((LivingEntity)dbb.getEntity()).deathTime + float2, 20.0f);
+        if (dlj.getEntity() instanceof LivingEntity && ((LivingEntity)dlj.getEntity()).isDeadOrDying()) {
+            final float float3 = Math.min(((LivingEntity)dlj.getEntity()).deathTime + float2, 20.0f);
             double5 /= (1.0f - 500.0f / (float3 + 500.0f)) * 2.0f + 1.0f;
         }
-        final FluidState coj7 = dbb.getFluidInCamera();
-        if (!coj7.isEmpty()) {
+        final FluidState cxa7 = dlj.getFluidInCamera();
+        if (!cxa7.isEmpty()) {
             double5 = double5 * 60.0 / 70.0;
         }
         return double5;
     }
     
-    private void bobHurt(final PoseStack cyl, final float float2) {
+    private void bobHurt(final PoseStack dhl, final float float2) {
         if (this.minecraft.getCameraEntity() instanceof LivingEntity) {
-            final LivingEntity akz4 = (LivingEntity)this.minecraft.getCameraEntity();
-            float float3 = akz4.hurtTime - float2;
-            if (akz4.getHealth() <= 0.0f) {
-                final float float4 = Math.min(akz4.deathTime + float2, 20.0f);
-                cyl.mulPose(Vector3f.ZP.rotationDegrees(40.0f - 8000.0f / (float4 + 200.0f)));
+            final LivingEntity aoy4 = (LivingEntity)this.minecraft.getCameraEntity();
+            float float3 = aoy4.hurtTime - float2;
+            if (aoy4.isDeadOrDying()) {
+                final float float4 = Math.min(aoy4.deathTime + float2, 20.0f);
+                dhl.mulPose(Vector3f.ZP.rotationDegrees(40.0f - 8000.0f / (float4 + 200.0f)));
             }
             if (float3 < 0.0f) {
                 return;
             }
-            float3 /= akz4.hurtDuration;
+            float3 /= aoy4.hurtDuration;
             float3 = Mth.sin(float3 * float3 * float3 * float3 * 3.1415927f);
-            final float float4 = akz4.hurtDir;
-            cyl.mulPose(Vector3f.YP.rotationDegrees(-float4));
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(-float3 * 14.0f));
-            cyl.mulPose(Vector3f.YP.rotationDegrees(float4));
+            final float float4 = aoy4.hurtDir;
+            dhl.mulPose(Vector3f.YP.rotationDegrees(-float4));
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(-float3 * 14.0f));
+            dhl.mulPose(Vector3f.YP.rotationDegrees(float4));
         }
     }
     
-    private void bobView(final PoseStack cyl, final float float2) {
+    private void bobView(final PoseStack dhl, final float float2) {
         if (!(this.minecraft.getCameraEntity() instanceof Player)) {
             return;
         }
-        final Player ayj4 = (Player)this.minecraft.getCameraEntity();
-        final float float3 = ayj4.walkDist - ayj4.walkDistO;
-        final float float4 = -(ayj4.walkDist + float3 * float2);
-        final float float5 = Mth.lerp(float2, ayj4.oBob, ayj4.bob);
-        cyl.translate(Mth.sin(float4 * 3.1415927f) * float5 * 0.5f, -Math.abs(Mth.cos(float4 * 3.1415927f) * float5), 0.0);
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(Mth.sin(float4 * 3.1415927f) * float5 * 3.0f));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(Math.abs(Mth.cos(float4 * 3.1415927f - 0.2f) * float5) * 5.0f));
+        final Player bec4 = (Player)this.minecraft.getCameraEntity();
+        final float float3 = bec4.walkDist - bec4.walkDistO;
+        final float float4 = -(bec4.walkDist + float3 * float2);
+        final float float5 = Mth.lerp(float2, bec4.oBob, bec4.bob);
+        dhl.translate(Mth.sin(float4 * 3.1415927f) * float5 * 0.5f, -Math.abs(Mth.cos(float4 * 3.1415927f) * float5), 0.0);
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(Mth.sin(float4 * 3.1415927f) * float5 * 3.0f));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(Math.abs(Mth.cos(float4 * 3.1415927f - 0.2f) * float5) * 5.0f));
     }
     
-    private void renderItemInHand(final PoseStack cyl, final Camera dbb, final float float3) {
+    private void renderItemInHand(final PoseStack dhl, final Camera dlj, final float float3) {
         if (this.panoramicMode) {
             return;
         }
-        this.resetProjectionMatrix(this.getProjectionMatrix(dbb, float3, false));
-        final PoseStack.Pose a5 = cyl.last();
+        this.resetProjectionMatrix(this.getProjectionMatrix(dlj, float3, false));
+        final PoseStack.Pose a5 = dhl.last();
         a5.pose().setIdentity();
         a5.normal().setIdentity();
-        cyl.pushPose();
-        this.bobHurt(cyl, float3);
+        dhl.pushPose();
+        this.bobHurt(dhl, float3);
         if (this.minecraft.options.bobView) {
-            this.bobView(cyl, float3);
+            this.bobView(dhl, float3);
         }
         final boolean boolean6 = this.minecraft.getCameraEntity() instanceof LivingEntity && ((LivingEntity)this.minecraft.getCameraEntity()).isSleeping();
         if (this.minecraft.options.thirdPersonView == 0 && !boolean6 && !this.minecraft.options.hideGui && this.minecraft.gameMode.getPlayerMode() != GameType.SPECTATOR) {
             this.lightTexture.turnOnLightLayer();
-            this.itemInHandRenderer.renderHandsWithItems(float3, cyl, this.renderBuffers.bufferSource(), this.minecraft.player, this.minecraft.getEntityRenderDispatcher().<LocalPlayer>getPackedLightCoords(this.minecraft.player, float3));
+            this.itemInHandRenderer.renderHandsWithItems(float3, dhl, this.renderBuffers.bufferSource(), this.minecraft.player, this.minecraft.getEntityRenderDispatcher().<LocalPlayer>getPackedLightCoords(this.minecraft.player, float3));
             this.lightTexture.turnOffLightLayer();
         }
-        cyl.popPose();
+        dhl.popPose();
         if (this.minecraft.options.thirdPersonView == 0 && !boolean6) {
-            ScreenEffectRenderer.renderScreenEffect(this.minecraft, cyl);
-            this.bobHurt(cyl, float3);
+            ScreenEffectRenderer.renderScreenEffect(this.minecraft, dhl);
+            this.bobHurt(dhl, float3);
         }
         if (this.minecraft.options.bobView) {
-            this.bobView(cyl, float3);
+            this.bobView(dhl, float3);
         }
     }
     
@@ -377,19 +376,19 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         RenderSystem.matrixMode(5888);
     }
     
-    public Matrix4f getProjectionMatrix(final Camera dbb, final float float2, final boolean boolean3) {
-        final PoseStack cyl5 = new PoseStack();
-        cyl5.last().pose().setIdentity();
+    public Matrix4f getProjectionMatrix(final Camera dlj, final float float2, final boolean boolean3) {
+        final PoseStack dhl5 = new PoseStack();
+        dhl5.last().pose().setIdentity();
         if (this.zoom != 1.0f) {
-            cyl5.translate(this.zoomX, -this.zoomY, 0.0);
-            cyl5.scale(this.zoom, this.zoom, 1.0f);
+            dhl5.translate(this.zoomX, -this.zoomY, 0.0);
+            dhl5.scale(this.zoom, this.zoom, 1.0f);
         }
-        cyl5.last().pose().multiply(Matrix4f.perspective(this.getFov(dbb, float2, boolean3), this.minecraft.getWindow().getWidth() / (float)this.minecraft.getWindow().getHeight(), 0.05f, this.renderDistance * 4.0f));
-        return cyl5.last().pose();
+        dhl5.last().pose().multiply(Matrix4f.perspective(this.getFov(dlj, float2, boolean3), this.minecraft.getWindow().getWidth() / (float)this.minecraft.getWindow().getHeight(), 0.05f, this.renderDistance * 4.0f));
+        return dhl5.last().pose();
     }
     
-    public static float getNightVisionScale(final LivingEntity akz, final float float2) {
-        final int integer3 = akz.getEffect(MobEffects.NIGHT_VISION).getDuration();
+    public static float getNightVisionScale(final LivingEntity aoy, final float float2) {
+        final int integer3 = aoy.getEffect(MobEffects.NIGHT_VISION).getDuration();
         if (integer3 > 200) {
             return 1.0f;
         }
@@ -408,11 +407,10 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         }
         final int integer6 = (int)(this.minecraft.mouseHandler.xpos() * this.minecraft.getWindow().getGuiScaledWidth() / this.minecraft.getWindow().getScreenWidth());
         final int integer7 = (int)(this.minecraft.mouseHandler.ypos() * this.minecraft.getWindow().getGuiScaledHeight() / this.minecraft.getWindow().getScreenHeight());
-        final PoseStack cyl8 = new PoseStack();
         RenderSystem.viewport(0, 0, this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight());
         if (boolean3 && this.minecraft.level != null) {
             this.minecraft.getProfiler().push("level");
-            this.renderLevel(float1, long2, cyl8);
+            this.renderLevel(float1, long2, new PoseStack());
             if (this.minecraft.hasSingleplayerServer() && this.lastScreenshotAttempt < Util.getMillis() - 1000L) {
                 this.lastScreenshotAttempt = Util.getMillis();
                 if (!this.minecraft.getSingleplayerServer().hasWorldScreenshot()) {
@@ -433,63 +431,64 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
             }
             this.minecraft.getMainRenderTarget().bindWrite(true);
         }
-        final Window cxx9 = this.minecraft.getWindow();
+        final Window dgy8 = this.minecraft.getWindow();
         RenderSystem.clear(256, Minecraft.ON_OSX);
         RenderSystem.matrixMode(5889);
         RenderSystem.loadIdentity();
-        RenderSystem.ortho(0.0, cxx9.getWidth() / cxx9.getGuiScale(), cxx9.getHeight() / cxx9.getGuiScale(), 0.0, 1000.0, 3000.0);
+        RenderSystem.ortho(0.0, dgy8.getWidth() / dgy8.getGuiScale(), dgy8.getHeight() / dgy8.getGuiScale(), 0.0, 1000.0, 3000.0);
         RenderSystem.matrixMode(5888);
         RenderSystem.loadIdentity();
         RenderSystem.translatef(0.0f, 0.0f, -2000.0f);
         Lighting.setupFor3DItems();
+        final PoseStack dhl9 = new PoseStack();
         if (boolean3 && this.minecraft.level != null) {
             this.minecraft.getProfiler().popPush("gui");
             if (!this.minecraft.options.hideGui || this.minecraft.screen != null) {
                 RenderSystem.defaultAlphaFunc();
                 this.renderItemActivationAnimation(this.minecraft.getWindow().getGuiScaledWidth(), this.minecraft.getWindow().getGuiScaledHeight(), float1);
-                this.minecraft.gui.render(float1);
+                this.minecraft.gui.render(dhl9, float1);
                 RenderSystem.clear(256, Minecraft.ON_OSX);
             }
             this.minecraft.getProfiler().pop();
         }
         if (this.minecraft.overlay != null) {
             try {
-                this.minecraft.overlay.render(integer6, integer7, this.minecraft.getDeltaFrameTime());
+                this.minecraft.overlay.render(dhl9, integer6, integer7, this.minecraft.getDeltaFrameTime());
                 return;
             }
             catch (Throwable throwable10) {
-                final CrashReport h11 = CrashReport.forThrowable(throwable10, "Rendering overlay");
-                final CrashReportCategory i12 = h11.addCategory("Overlay render details");
-                i12.setDetail("Overlay name", () -> this.minecraft.overlay.getClass().getCanonicalName());
-                throw new ReportedException(h11);
+                final CrashReport j11 = CrashReport.forThrowable(throwable10, "Rendering overlay");
+                final CrashReportCategory k12 = j11.addCategory("Overlay render details");
+                k12.setDetail("Overlay name", () -> this.minecraft.overlay.getClass().getCanonicalName());
+                throw new ReportedException(j11);
             }
         }
         if (this.minecraft.screen != null) {
             try {
-                this.minecraft.screen.render(integer6, integer7, this.minecraft.getDeltaFrameTime());
+                this.minecraft.screen.render(dhl9, integer6, integer7, this.minecraft.getDeltaFrameTime());
             }
             catch (Throwable throwable10) {
-                final CrashReport h11 = CrashReport.forThrowable(throwable10, "Rendering screen");
-                final CrashReportCategory i12 = h11.addCategory("Screen render details");
-                i12.setDetail("Screen name", () -> this.minecraft.screen.getClass().getCanonicalName());
-                i12.setDetail("Mouse location", () -> String.format(Locale.ROOT, "Scaled: (%d, %d). Absolute: (%f, %f)", integer6, integer7, this.minecraft.mouseHandler.xpos(), this.minecraft.mouseHandler.ypos()));
-                i12.setDetail("Screen size", () -> String.format(Locale.ROOT, "Scaled: (%d, %d). Absolute: (%d, %d). Scale factor of %f", this.minecraft.getWindow().getGuiScaledWidth(), this.minecraft.getWindow().getGuiScaledHeight(), this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight(), this.minecraft.getWindow().getGuiScale()));
-                throw new ReportedException(h11);
+                final CrashReport j11 = CrashReport.forThrowable(throwable10, "Rendering screen");
+                final CrashReportCategory k12 = j11.addCategory("Screen render details");
+                k12.setDetail("Screen name", () -> this.minecraft.screen.getClass().getCanonicalName());
+                k12.setDetail("Mouse location", () -> String.format(Locale.ROOT, "Scaled: (%d, %d). Absolute: (%f, %f)", integer6, integer7, this.minecraft.mouseHandler.xpos(), this.minecraft.mouseHandler.ypos()));
+                k12.setDetail("Screen size", () -> String.format(Locale.ROOT, "Scaled: (%d, %d). Absolute: (%d, %d). Scale factor of %f", this.minecraft.getWindow().getGuiScaledWidth(), this.minecraft.getWindow().getGuiScaledHeight(), this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight(), this.minecraft.getWindow().getGuiScale()));
+                throw new ReportedException(j11);
             }
         }
     }
     
     private void takeAutoScreenshot() {
         if (this.minecraft.levelRenderer.countRenderedChunks() > 10 && this.minecraft.levelRenderer.hasRenderedAllChunks() && !this.minecraft.getSingleplayerServer().hasWorldScreenshot()) {
-            final NativeImage cxr2 = Screenshot.takeScreenshot(this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight(), this.minecraft.getMainRenderTarget());
+            final NativeImage dgs2 = Screenshot.takeScreenshot(this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight(), this.minecraft.getMainRenderTarget());
             final NativeImage nativeImage;
             int integer3;
             int integer4;
             int integer5;
             int integer6;
-            NativeImage cxr3;
+            NativeImage dgs3;
             final Throwable t2;
-            SimpleResource.IO_EXECUTOR.execute(() -> {
+            Util.ioPool().execute(() -> {
                 integer3 = nativeImage.getWidth();
                 integer4 = nativeImage.getHeight();
                 integer5 = 0;
@@ -503,26 +502,26 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
                     integer4 = integer3;
                 }
                 try {
-                    cxr3 = new NativeImage(64, 64, false);
+                    dgs3 = new NativeImage(64, 64, false);
                     try {
-                        nativeImage.resizeSubRectTo(integer5, integer6, integer3, integer4, cxr3);
-                        cxr3.writeToFile(this.minecraft.getSingleplayerServer().getWorldScreenshotFile());
+                        nativeImage.resizeSubRectTo(integer5, integer6, integer3, integer4, dgs3);
+                        dgs3.writeToFile(this.minecraft.getSingleplayerServer().getWorldScreenshotFile());
                     }
                     catch (Throwable t) {
                         throw t;
                     }
                     finally {
-                        if (cxr3 != null) {
+                        if (dgs3 != null) {
                             if (t2 != null) {
                                 try {
-                                    cxr3.close();
+                                    dgs3.close();
                                 }
                                 catch (Throwable exception) {
                                     t2.addSuppressed(exception);
                                 }
                             }
                             else {
-                                cxr3.close();
+                                dgs3.close();
                             }
                         }
                     }
@@ -541,27 +540,27 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         if (!this.renderBlockOutline) {
             return false;
         }
-        final Entity akq2 = this.minecraft.getCameraEntity();
-        boolean boolean3 = akq2 instanceof Player && !this.minecraft.options.hideGui;
-        if (boolean3 && !((Player)akq2).abilities.mayBuild) {
-            final ItemStack ben4 = ((LivingEntity)akq2).getMainHandItem();
-            final HitResult cvi5 = this.minecraft.hitResult;
-            if (cvi5 != null && cvi5.getType() == HitResult.Type.BLOCK) {
-                final BlockPos fk6 = ((BlockHitResult)cvi5).getBlockPos();
-                final BlockState byj7 = this.minecraft.level.getBlockState(fk6);
+        final Entity aom2 = this.minecraft.getCameraEntity();
+        boolean boolean3 = aom2 instanceof Player && !this.minecraft.options.hideGui;
+        if (boolean3 && !((Player)aom2).abilities.mayBuild) {
+            final ItemStack bki4 = ((LivingEntity)aom2).getMainHandItem();
+            final HitResult dej5 = this.minecraft.hitResult;
+            if (dej5 != null && dej5.getType() == HitResult.Type.BLOCK) {
+                final BlockPos fu6 = ((BlockHitResult)dej5).getBlockPos();
+                final BlockState cfj7 = this.minecraft.level.getBlockState(fu6);
                 if (this.minecraft.gameMode.getPlayerMode() == GameType.SPECTATOR) {
-                    boolean3 = (byj7.getMenuProvider(this.minecraft.level, fk6) != null);
+                    boolean3 = (cfj7.getMenuProvider(this.minecraft.level, fu6) != null);
                 }
                 else {
-                    final BlockInWorld byn8 = new BlockInWorld(this.minecraft.level, fk6, false);
-                    boolean3 = (!ben4.isEmpty() && (ben4.hasAdventureModeBreakTagForBlock(this.minecraft.level.getTagManager(), byn8) || ben4.hasAdventureModePlaceTagForBlock(this.minecraft.level.getTagManager(), byn8)));
+                    final BlockInWorld cfn8 = new BlockInWorld(this.minecraft.level, fu6, false);
+                    boolean3 = (!bki4.isEmpty() && (bki4.hasAdventureModeBreakTagForBlock(this.minecraft.level.getTagManager(), cfn8) || bki4.hasAdventureModePlaceTagForBlock(this.minecraft.level.getTagManager(), cfn8)));
                 }
             }
         }
         return boolean3;
     }
     
-    public void renderLevel(final float float1, final long long2, final PoseStack cyl) {
+    public void renderLevel(final float float1, final long long2, final PoseStack dhl) {
         this.lightTexture.updateLightTexture(float1);
         if (this.minecraft.getCameraEntity() == null) {
             this.minecraft.setCameraEntity(this.minecraft.player);
@@ -570,13 +569,13 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         this.minecraft.getProfiler().push("center");
         final boolean boolean6 = this.shouldRenderBlockOutline();
         this.minecraft.getProfiler().popPush("camera");
-        final Camera dbb7 = this.mainCamera;
+        final Camera dlj7 = this.mainCamera;
         this.renderDistance = (float)(this.minecraft.options.renderDistance * 16);
-        final PoseStack cyl2 = new PoseStack();
-        cyl2.last().pose().multiply(this.getProjectionMatrix(dbb7, float1, true));
-        this.bobHurt(cyl2, float1);
+        final PoseStack dhl2 = new PoseStack();
+        dhl2.last().pose().multiply(this.getProjectionMatrix(dlj7, float1, true));
+        this.bobHurt(dhl2, float1);
         if (this.minecraft.options.bobView) {
-            this.bobView(cyl2, float1);
+            this.bobView(dhl2, float1);
         }
         final float float2 = Mth.lerp(float1, this.minecraft.player.oPortalTime, this.minecraft.player.portalTime);
         if (float2 > 0.0f) {
@@ -586,22 +585,22 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
             }
             float float3 = 5.0f / (float2 * float2 + 5.0f) - float2 * 0.04f;
             float3 *= float3;
-            final Vector3f e12 = new Vector3f(0.0f, Mth.SQRT_OF_TWO / 2.0f, Mth.SQRT_OF_TWO / 2.0f);
-            cyl2.mulPose(e12.rotationDegrees((this.tick + float1) * integer10));
-            cyl2.scale(1.0f / float3, 1.0f, 1.0f);
+            final Vector3f g12 = new Vector3f(0.0f, Mth.SQRT_OF_TWO / 2.0f, Mth.SQRT_OF_TWO / 2.0f);
+            dhl2.mulPose(g12.rotationDegrees((this.tick + float1) * integer10));
+            dhl2.scale(1.0f / float3, 1.0f, 1.0f);
             final float float4 = -(this.tick + float1) * integer10;
-            cyl2.mulPose(e12.rotationDegrees(float4));
+            dhl2.mulPose(g12.rotationDegrees(float4));
         }
-        final Matrix4f b10 = cyl2.last().pose();
+        final Matrix4f b10 = dhl2.last().pose();
         this.resetProjectionMatrix(b10);
-        dbb7.setup(this.minecraft.level, (this.minecraft.getCameraEntity() == null) ? this.minecraft.player : this.minecraft.getCameraEntity(), this.minecraft.options.thirdPersonView > 0, this.minecraft.options.thirdPersonView == 2, float1);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(dbb7.getXRot()));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(dbb7.getYRot() + 180.0f));
-        this.minecraft.levelRenderer.renderLevel(cyl, float1, long2, boolean6, dbb7, this, this.lightTexture, b10);
+        dlj7.setup(this.minecraft.level, (this.minecraft.getCameraEntity() == null) ? this.minecraft.player : this.minecraft.getCameraEntity(), this.minecraft.options.thirdPersonView > 0, this.minecraft.options.thirdPersonView == 2, float1);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(dlj7.getXRot()));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(dlj7.getYRot() + 180.0f));
+        this.minecraft.levelRenderer.renderLevel(dhl, float1, long2, boolean6, dlj7, this, this.lightTexture, b10);
         this.minecraft.getProfiler().popPush("hand");
         if (this.renderHand) {
             RenderSystem.clear(256, Minecraft.ON_OSX);
-            this.renderItemInHand(cyl, dbb7, float1);
+            this.renderItemInHand(dhl, dlj7, float1);
         }
         this.minecraft.getProfiler().pop();
     }
@@ -616,8 +615,8 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         return this.mapRenderer;
     }
     
-    public void displayItemActivation(final ItemStack ben) {
-        this.itemActivationItem = ben;
+    public void displayItemActivation(final ItemStack bki) {
+        this.itemActivationItem = bki;
         this.itemActivationTicks = 40;
         this.itemActivationOffX = this.random.nextFloat() * 2.0f - 1.0f;
         this.itemActivationOffY = this.random.nextFloat() * 2.0f - 1.0f;
@@ -640,17 +639,17 @@ public class GameRenderer implements AutoCloseable, ResourceManagerReloadListene
         RenderSystem.pushLightingAttributes();
         RenderSystem.enableDepthTest();
         RenderSystem.disableCull();
-        final PoseStack cyl13 = new PoseStack();
-        cyl13.pushPose();
-        cyl13.translate(integer1 / 2 + float9 * Mth.abs(Mth.sin(float8 * 2.0f)), integer2 / 2 + float10 * Mth.abs(Mth.sin(float8 * 2.0f)), -50.0);
+        final PoseStack dhl13 = new PoseStack();
+        dhl13.pushPose();
+        dhl13.translate(integer1 / 2 + float9 * Mth.abs(Mth.sin(float8 * 2.0f)), integer2 / 2 + float10 * Mth.abs(Mth.sin(float8 * 2.0f)), -50.0);
         final float float11 = 50.0f + 175.0f * Mth.sin(float8);
-        cyl13.scale(float11, -float11, float11);
-        cyl13.mulPose(Vector3f.YP.rotationDegrees(900.0f * Mth.abs(Mth.sin(float8))));
-        cyl13.mulPose(Vector3f.XP.rotationDegrees(6.0f * Mth.cos(float4 * 8.0f)));
-        cyl13.mulPose(Vector3f.ZP.rotationDegrees(6.0f * Mth.cos(float4 * 8.0f)));
+        dhl13.scale(float11, -float11, float11);
+        dhl13.mulPose(Vector3f.YP.rotationDegrees(900.0f * Mth.abs(Mth.sin(float8))));
+        dhl13.mulPose(Vector3f.XP.rotationDegrees(6.0f * Mth.cos(float4 * 8.0f)));
+        dhl13.mulPose(Vector3f.ZP.rotationDegrees(6.0f * Mth.cos(float4 * 8.0f)));
         final MultiBufferSource.BufferSource a15 = this.renderBuffers.bufferSource();
-        this.minecraft.getItemRenderer().renderStatic(this.itemActivationItem, ItemTransforms.TransformType.FIXED, 15728880, OverlayTexture.NO_OVERLAY, cyl13, a15);
-        cyl13.popPose();
+        this.minecraft.getItemRenderer().renderStatic(this.itemActivationItem, ItemTransforms.TransformType.FIXED, 15728880, OverlayTexture.NO_OVERLAY, dhl13, a15);
+        dhl13.popPose();
         a15.endBatch();
         RenderSystem.popAttributes();
         RenderSystem.popMatrix();
diff --git a/src/net/minecraft/client/renderer/GpuWarnlistManager.java b/src/net/minecraft/client/renderer/GpuWarnlistManager.java
new file mode 100644
index 0000000..4b3d65f
--- /dev/null
+++ b/src/net/minecraft/client/renderer/GpuWarnlistManager.java
@@ -0,0 +1,179 @@
+package net.minecraft.client.renderer;
+
+import com.mojang.blaze3d.platform.GlUtil;
+import java.util.regex.Matcher;
+import java.util.Iterator;
+import org.apache.logging.log4j.LogManager;
+import com.google.gson.JsonElement;
+import net.minecraft.server.packs.resources.Resource;
+import com.google.gson.JsonSyntaxException;
+import java.io.IOException;
+import com.google.gson.JsonParser;
+import java.io.Reader;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.util.regex.Pattern;
+import java.util.List;
+import com.google.common.collect.Lists;
+import net.minecraft.util.profiling.ProfilerFiller;
+import net.minecraft.server.packs.resources.ResourceManager;
+import javax.annotation.Nullable;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.resources.ResourceLocation;
+import org.apache.logging.log4j.Logger;
+import net.minecraft.server.packs.resources.SimplePreparableReloadListener;
+
+public class GpuWarnlistManager extends SimplePreparableReloadListener<Preparations> {
+    private static final Logger LOGGER;
+    private static final ResourceLocation GPU_WARNLIST_LOCATION;
+    private ImmutableMap<String, String> warnings;
+    private boolean showWarning;
+    private boolean warningDismissed;
+    private boolean skipFabulous;
+    
+    public GpuWarnlistManager() {
+        this.warnings = ImmutableMap.<String, String>of();
+    }
+    
+    public boolean hasWarnings() {
+        return !this.warnings.isEmpty();
+    }
+    
+    public boolean willShowWarning() {
+        return this.hasWarnings() && !this.warningDismissed;
+    }
+    
+    public void showWarning() {
+        this.showWarning = true;
+    }
+    
+    public void dismissWarning() {
+        this.warningDismissed = true;
+    }
+    
+    public void dismissWarningAndSkipFabulous() {
+        this.warningDismissed = true;
+        this.skipFabulous = true;
+    }
+    
+    public boolean isShowingWarning() {
+        return this.showWarning && !this.warningDismissed;
+    }
+    
+    public boolean isSkippingFabulous() {
+        return this.skipFabulous;
+    }
+    
+    public void resetWarnings() {
+        this.showWarning = false;
+        this.warningDismissed = false;
+        this.skipFabulous = false;
+    }
+    
+    @Nullable
+    public String getRendererWarnings() {
+        return this.warnings.get("renderer");
+    }
+    
+    @Nullable
+    public String getVersionWarnings() {
+        return this.warnings.get("version");
+    }
+    
+    @Nullable
+    public String getVendorWarnings() {
+        return this.warnings.get("vendor");
+    }
+    
+    @Override
+    protected Preparations prepare(final ResourceManager abc, final ProfilerFiller ami) {
+        final List<Pattern> list4 = Lists.newArrayList();
+        final List<Pattern> list5 = Lists.newArrayList();
+        final List<Pattern> list6 = Lists.newArrayList();
+        ami.startTick();
+        final JsonObject jsonObject7 = parseJson(abc, ami);
+        if (jsonObject7 != null) {
+            ami.push("compile_regex");
+            compilePatterns(jsonObject7.getAsJsonArray("renderer"), list4);
+            compilePatterns(jsonObject7.getAsJsonArray("version"), list5);
+            compilePatterns(jsonObject7.getAsJsonArray("vendor"), list6);
+            ami.pop();
+        }
+        ami.endTick();
+        return new Preparations((List)list4, (List)list5, (List)list6);
+    }
+    
+    @Override
+    protected void apply(final Preparations a, final ResourceManager abc, final ProfilerFiller ami) {
+        this.warnings = a.apply();
+    }
+    
+    private static void compilePatterns(final JsonArray jsonArray, final List<Pattern> list) {
+        jsonArray.forEach(jsonElement -> list.add(Pattern.compile(jsonElement.getAsString(), 2)));
+    }
+    
+    @Nullable
+    private static JsonObject parseJson(final ResourceManager abc, final ProfilerFiller ami) {
+        ami.push("parse_json");
+        JsonObject jsonObject3 = null;
+        try (final Resource abb4 = abc.getResource(GpuWarnlistManager.GPU_WARNLIST_LOCATION);
+             final BufferedReader bufferedReader6 = new BufferedReader(new InputStreamReader(abb4.getInputStream(), StandardCharsets.UTF_8))) {
+            jsonObject3 = new JsonParser().parse(bufferedReader6).getAsJsonObject();
+        }
+        catch (IOException | JsonSyntaxException ex2) {
+            final Exception ex;
+            final Exception exception4 = ex;
+            GpuWarnlistManager.LOGGER.warn("Failed to load GPU warnlist");
+        }
+        ami.pop();
+        return jsonObject3;
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+        GPU_WARNLIST_LOCATION = new ResourceLocation("gpu_warnlist.json");
+    }
+    
+    public static final class Preparations {
+        private final List<Pattern> rendererPatterns;
+        private final List<Pattern> versionPatterns;
+        private final List<Pattern> vendorPatterns;
+        
+        private Preparations(final List<Pattern> list1, final List<Pattern> list2, final List<Pattern> list3) {
+            this.rendererPatterns = list1;
+            this.versionPatterns = list2;
+            this.vendorPatterns = list3;
+        }
+        
+        private static String matchAny(final List<Pattern> list, final String string) {
+            final List<String> list2 = Lists.newArrayList();
+            for (final Pattern pattern5 : list) {
+                final Matcher matcher6 = pattern5.matcher(string);
+                while (matcher6.find()) {
+                    list2.add(matcher6.group());
+                }
+            }
+            return String.join(", ", list2);
+        }
+        
+        private ImmutableMap<String, String> apply() {
+            final ImmutableMap.Builder<String, String> builder2 = new ImmutableMap.Builder<String, String>();
+            final String string3 = matchAny(this.rendererPatterns, GlUtil.getRenderer());
+            if (!string3.isEmpty()) {
+                builder2.put("renderer", string3);
+            }
+            final String string4 = matchAny(this.versionPatterns, GlUtil.getOpenGLVersion());
+            if (!string4.isEmpty()) {
+                builder2.put("version", string4);
+            }
+            final String string5 = matchAny(this.vendorPatterns, GlUtil.getVendor());
+            if (!string5.isEmpty()) {
+                builder2.put("vendor", string5);
+            }
+            return builder2.build();
+        }
+    }
+}
diff --git a/src/net/minecraft/client/renderer/ItemBlockRenderTypes.java b/src/net/minecraft/client/renderer/ItemBlockRenderTypes.java
index 5b3dde4..b14cbbe 100644
--- a/src/net/minecraft/client/renderer/ItemBlockRenderTypes.java
+++ b/src/net/minecraft/client/renderer/ItemBlockRenderTypes.java
@@ -9,6 +9,7 @@ import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.block.LeavesBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Fluid;
@@ -20,39 +21,57 @@ public class ItemBlockRenderTypes {
     private static final Map<Fluid, RenderType> TYPE_BY_FLUID;
     private static boolean renderCutout;
     
-    public static RenderType getChunkRenderType(final BlockState byj) {
-        final Block bph2 = byj.getBlock();
-        if (bph2 instanceof LeavesBlock) {
+    public static RenderType getChunkRenderType(final BlockState cfj) {
+        final Block bvr2 = cfj.getBlock();
+        if (bvr2 instanceof LeavesBlock) {
             return ItemBlockRenderTypes.renderCutout ? RenderType.cutoutMipped() : RenderType.solid();
         }
-        final RenderType drb3 = ItemBlockRenderTypes.TYPE_BY_BLOCK.get(bph2);
-        if (drb3 != null) {
-            return drb3;
+        final RenderType ech3 = ItemBlockRenderTypes.TYPE_BY_BLOCK.get(bvr2);
+        if (ech3 != null) {
+            return ech3;
         }
         return RenderType.solid();
     }
     
-    public static RenderType getRenderType(final BlockState byj) {
-        final RenderType drb2 = getChunkRenderType(byj);
-        if (drb2 == RenderType.translucent()) {
-            return Sheets.translucentBlockSheet();
+    public static RenderType getMovingBlockRenderType(final BlockState cfj) {
+        final Block bvr2 = cfj.getBlock();
+        if (bvr2 instanceof LeavesBlock) {
+            return ItemBlockRenderTypes.renderCutout ? RenderType.cutoutMipped() : RenderType.solid();
         }
-        return Sheets.cutoutBlockSheet();
+        final RenderType ech3 = ItemBlockRenderTypes.TYPE_BY_BLOCK.get(bvr2);
+        if (ech3 == null) {
+            return RenderType.solid();
+        }
+        if (ech3 == RenderType.translucent()) {
+            return RenderType.translucentMovingBlock();
+        }
+        return ech3;
     }
     
-    public static RenderType getRenderType(final ItemStack ben) {
-        final Item bei2 = ben.getItem();
-        if (bei2 instanceof BlockItem) {
-            final Block bph3 = ((BlockItem)bei2).getBlock();
-            return getRenderType(bph3.defaultBlockState());
+    public static RenderType getRenderType(final BlockState cfj, final boolean boolean2) {
+        final RenderType ech3 = getChunkRenderType(cfj);
+        if (ech3 != RenderType.translucent()) {
+            return Sheets.cutoutBlockSheet();
         }
-        return Sheets.translucentBlockSheet();
+        if (!Minecraft.useShaderTransparency()) {
+            return Sheets.translucentCullBlockSheet();
+        }
+        return boolean2 ? Sheets.translucentCullBlockSheet() : Sheets.translucentItemSheet();
     }
     
-    public static RenderType getRenderLayer(final FluidState coj) {
-        final RenderType drb2 = ItemBlockRenderTypes.TYPE_BY_FLUID.get(coj.getType());
-        if (drb2 != null) {
-            return drb2;
+    public static RenderType getRenderType(final ItemStack bki, final boolean boolean2) {
+        final Item bke3 = bki.getItem();
+        if (bke3 instanceof BlockItem) {
+            final Block bvr4 = ((BlockItem)bke3).getBlock();
+            return getRenderType(bvr4.defaultBlockState(), boolean2);
+        }
+        return boolean2 ? Sheets.translucentCullBlockSheet() : Sheets.translucentItemSheet();
+    }
+    
+    public static RenderType getRenderLayer(final FluidState cxa) {
+        final RenderType ech2 = ItemBlockRenderTypes.TYPE_BY_FLUID.get(cxa.getType());
+        if (ech2 != null) {
+            return ech2;
         }
         return RenderType.solid();
     }
@@ -62,235 +81,260 @@ public class ItemBlockRenderTypes {
     }
     
     static {
-        final RenderType drb2;
-        final RenderType drb3;
-        final RenderType drb4;
+        final RenderType ech2;
+        final RenderType ech3;
+        final RenderType ech4;
+        final RenderType ech5;
         TYPE_BY_BLOCK = Util.<Map<Block, RenderType>>make(Maps.newHashMap(), hashMap -> {
-            drb2 = RenderType.cutoutMipped();
-            hashMap.put(Blocks.GRASS_BLOCK, drb2);
-            hashMap.put(Blocks.IRON_BARS, drb2);
-            hashMap.put(Blocks.GLASS_PANE, drb2);
-            hashMap.put(Blocks.TRIPWIRE_HOOK, drb2);
-            hashMap.put(Blocks.HOPPER, drb2);
-            hashMap.put(Blocks.JUNGLE_LEAVES, drb2);
-            hashMap.put(Blocks.OAK_LEAVES, drb2);
-            hashMap.put(Blocks.SPRUCE_LEAVES, drb2);
-            hashMap.put(Blocks.ACACIA_LEAVES, drb2);
-            hashMap.put(Blocks.BIRCH_LEAVES, drb2);
-            hashMap.put(Blocks.DARK_OAK_LEAVES, drb2);
-            drb3 = RenderType.cutout();
-            hashMap.put(Blocks.OAK_SAPLING, drb3);
-            hashMap.put(Blocks.SPRUCE_SAPLING, drb3);
-            hashMap.put(Blocks.BIRCH_SAPLING, drb3);
-            hashMap.put(Blocks.JUNGLE_SAPLING, drb3);
-            hashMap.put(Blocks.ACACIA_SAPLING, drb3);
-            hashMap.put(Blocks.DARK_OAK_SAPLING, drb3);
-            hashMap.put(Blocks.GLASS, drb3);
-            hashMap.put(Blocks.WHITE_BED, drb3);
-            hashMap.put(Blocks.ORANGE_BED, drb3);
-            hashMap.put(Blocks.MAGENTA_BED, drb3);
-            hashMap.put(Blocks.LIGHT_BLUE_BED, drb3);
-            hashMap.put(Blocks.YELLOW_BED, drb3);
-            hashMap.put(Blocks.LIME_BED, drb3);
-            hashMap.put(Blocks.PINK_BED, drb3);
-            hashMap.put(Blocks.GRAY_BED, drb3);
-            hashMap.put(Blocks.LIGHT_GRAY_BED, drb3);
-            hashMap.put(Blocks.CYAN_BED, drb3);
-            hashMap.put(Blocks.PURPLE_BED, drb3);
-            hashMap.put(Blocks.BLUE_BED, drb3);
-            hashMap.put(Blocks.BROWN_BED, drb3);
-            hashMap.put(Blocks.GREEN_BED, drb3);
-            hashMap.put(Blocks.RED_BED, drb3);
-            hashMap.put(Blocks.BLACK_BED, drb3);
-            hashMap.put(Blocks.POWERED_RAIL, drb3);
-            hashMap.put(Blocks.DETECTOR_RAIL, drb3);
-            hashMap.put(Blocks.COBWEB, drb3);
-            hashMap.put(Blocks.GRASS, drb3);
-            hashMap.put(Blocks.FERN, drb3);
-            hashMap.put(Blocks.DEAD_BUSH, drb3);
-            hashMap.put(Blocks.SEAGRASS, drb3);
-            hashMap.put(Blocks.TALL_SEAGRASS, drb3);
-            hashMap.put(Blocks.DANDELION, drb3);
-            hashMap.put(Blocks.POPPY, drb3);
-            hashMap.put(Blocks.BLUE_ORCHID, drb3);
-            hashMap.put(Blocks.ALLIUM, drb3);
-            hashMap.put(Blocks.AZURE_BLUET, drb3);
-            hashMap.put(Blocks.RED_TULIP, drb3);
-            hashMap.put(Blocks.ORANGE_TULIP, drb3);
-            hashMap.put(Blocks.WHITE_TULIP, drb3);
-            hashMap.put(Blocks.PINK_TULIP, drb3);
-            hashMap.put(Blocks.OXEYE_DAISY, drb3);
-            hashMap.put(Blocks.CORNFLOWER, drb3);
-            hashMap.put(Blocks.WITHER_ROSE, drb3);
-            hashMap.put(Blocks.LILY_OF_THE_VALLEY, drb3);
-            hashMap.put(Blocks.BROWN_MUSHROOM, drb3);
-            hashMap.put(Blocks.RED_MUSHROOM, drb3);
-            hashMap.put(Blocks.TORCH, drb3);
-            hashMap.put(Blocks.WALL_TORCH, drb3);
-            hashMap.put(Blocks.FIRE, drb3);
-            hashMap.put(Blocks.SPAWNER, drb3);
-            hashMap.put(Blocks.REDSTONE_WIRE, drb3);
-            hashMap.put(Blocks.WHEAT, drb3);
-            hashMap.put(Blocks.OAK_DOOR, drb3);
-            hashMap.put(Blocks.LADDER, drb3);
-            hashMap.put(Blocks.RAIL, drb3);
-            hashMap.put(Blocks.IRON_DOOR, drb3);
-            hashMap.put(Blocks.REDSTONE_TORCH, drb3);
-            hashMap.put(Blocks.REDSTONE_WALL_TORCH, drb3);
-            hashMap.put(Blocks.CACTUS, drb3);
-            hashMap.put(Blocks.SUGAR_CANE, drb3);
-            hashMap.put(Blocks.REPEATER, drb3);
-            hashMap.put(Blocks.OAK_TRAPDOOR, drb3);
-            hashMap.put(Blocks.SPRUCE_TRAPDOOR, drb3);
-            hashMap.put(Blocks.BIRCH_TRAPDOOR, drb3);
-            hashMap.put(Blocks.JUNGLE_TRAPDOOR, drb3);
-            hashMap.put(Blocks.ACACIA_TRAPDOOR, drb3);
-            hashMap.put(Blocks.DARK_OAK_TRAPDOOR, drb3);
-            hashMap.put(Blocks.ATTACHED_PUMPKIN_STEM, drb3);
-            hashMap.put(Blocks.ATTACHED_MELON_STEM, drb3);
-            hashMap.put(Blocks.PUMPKIN_STEM, drb3);
-            hashMap.put(Blocks.MELON_STEM, drb3);
-            hashMap.put(Blocks.VINE, drb3);
-            hashMap.put(Blocks.LILY_PAD, drb3);
-            hashMap.put(Blocks.NETHER_WART, drb3);
-            hashMap.put(Blocks.BREWING_STAND, drb3);
-            hashMap.put(Blocks.COCOA, drb3);
-            hashMap.put(Blocks.BEACON, drb3);
-            hashMap.put(Blocks.FLOWER_POT, drb3);
-            hashMap.put(Blocks.POTTED_OAK_SAPLING, drb3);
-            hashMap.put(Blocks.POTTED_SPRUCE_SAPLING, drb3);
-            hashMap.put(Blocks.POTTED_BIRCH_SAPLING, drb3);
-            hashMap.put(Blocks.POTTED_JUNGLE_SAPLING, drb3);
-            hashMap.put(Blocks.POTTED_ACACIA_SAPLING, drb3);
-            hashMap.put(Blocks.POTTED_DARK_OAK_SAPLING, drb3);
-            hashMap.put(Blocks.POTTED_FERN, drb3);
-            hashMap.put(Blocks.POTTED_DANDELION, drb3);
-            hashMap.put(Blocks.POTTED_POPPY, drb3);
-            hashMap.put(Blocks.POTTED_BLUE_ORCHID, drb3);
-            hashMap.put(Blocks.POTTED_ALLIUM, drb3);
-            hashMap.put(Blocks.POTTED_AZURE_BLUET, drb3);
-            hashMap.put(Blocks.POTTED_RED_TULIP, drb3);
-            hashMap.put(Blocks.POTTED_ORANGE_TULIP, drb3);
-            hashMap.put(Blocks.POTTED_WHITE_TULIP, drb3);
-            hashMap.put(Blocks.POTTED_PINK_TULIP, drb3);
-            hashMap.put(Blocks.POTTED_OXEYE_DAISY, drb3);
-            hashMap.put(Blocks.POTTED_CORNFLOWER, drb3);
-            hashMap.put(Blocks.POTTED_LILY_OF_THE_VALLEY, drb3);
-            hashMap.put(Blocks.POTTED_WITHER_ROSE, drb3);
-            hashMap.put(Blocks.POTTED_RED_MUSHROOM, drb3);
-            hashMap.put(Blocks.POTTED_BROWN_MUSHROOM, drb3);
-            hashMap.put(Blocks.POTTED_DEAD_BUSH, drb3);
-            hashMap.put(Blocks.POTTED_CACTUS, drb3);
-            hashMap.put(Blocks.CARROTS, drb3);
-            hashMap.put(Blocks.POTATOES, drb3);
-            hashMap.put(Blocks.COMPARATOR, drb3);
-            hashMap.put(Blocks.ACTIVATOR_RAIL, drb3);
-            hashMap.put(Blocks.IRON_TRAPDOOR, drb3);
-            hashMap.put(Blocks.SUNFLOWER, drb3);
-            hashMap.put(Blocks.LILAC, drb3);
-            hashMap.put(Blocks.ROSE_BUSH, drb3);
-            hashMap.put(Blocks.PEONY, drb3);
-            hashMap.put(Blocks.TALL_GRASS, drb3);
-            hashMap.put(Blocks.LARGE_FERN, drb3);
-            hashMap.put(Blocks.SPRUCE_DOOR, drb3);
-            hashMap.put(Blocks.BIRCH_DOOR, drb3);
-            hashMap.put(Blocks.JUNGLE_DOOR, drb3);
-            hashMap.put(Blocks.ACACIA_DOOR, drb3);
-            hashMap.put(Blocks.DARK_OAK_DOOR, drb3);
-            hashMap.put(Blocks.END_ROD, drb3);
-            hashMap.put(Blocks.CHORUS_PLANT, drb3);
-            hashMap.put(Blocks.CHORUS_FLOWER, drb3);
-            hashMap.put(Blocks.BEETROOTS, drb3);
-            hashMap.put(Blocks.KELP, drb3);
-            hashMap.put(Blocks.KELP_PLANT, drb3);
-            hashMap.put(Blocks.TURTLE_EGG, drb3);
-            hashMap.put(Blocks.DEAD_TUBE_CORAL, drb3);
-            hashMap.put(Blocks.DEAD_BRAIN_CORAL, drb3);
-            hashMap.put(Blocks.DEAD_BUBBLE_CORAL, drb3);
-            hashMap.put(Blocks.DEAD_FIRE_CORAL, drb3);
-            hashMap.put(Blocks.DEAD_HORN_CORAL, drb3);
-            hashMap.put(Blocks.TUBE_CORAL, drb3);
-            hashMap.put(Blocks.BRAIN_CORAL, drb3);
-            hashMap.put(Blocks.BUBBLE_CORAL, drb3);
-            hashMap.put(Blocks.FIRE_CORAL, drb3);
-            hashMap.put(Blocks.HORN_CORAL, drb3);
-            hashMap.put(Blocks.DEAD_TUBE_CORAL_FAN, drb3);
-            hashMap.put(Blocks.DEAD_BRAIN_CORAL_FAN, drb3);
-            hashMap.put(Blocks.DEAD_BUBBLE_CORAL_FAN, drb3);
-            hashMap.put(Blocks.DEAD_FIRE_CORAL_FAN, drb3);
-            hashMap.put(Blocks.DEAD_HORN_CORAL_FAN, drb3);
-            hashMap.put(Blocks.TUBE_CORAL_FAN, drb3);
-            hashMap.put(Blocks.BRAIN_CORAL_FAN, drb3);
-            hashMap.put(Blocks.BUBBLE_CORAL_FAN, drb3);
-            hashMap.put(Blocks.FIRE_CORAL_FAN, drb3);
-            hashMap.put(Blocks.HORN_CORAL_FAN, drb3);
-            hashMap.put(Blocks.DEAD_TUBE_CORAL_WALL_FAN, drb3);
-            hashMap.put(Blocks.DEAD_BRAIN_CORAL_WALL_FAN, drb3);
-            hashMap.put(Blocks.DEAD_BUBBLE_CORAL_WALL_FAN, drb3);
-            hashMap.put(Blocks.DEAD_FIRE_CORAL_WALL_FAN, drb3);
-            hashMap.put(Blocks.DEAD_HORN_CORAL_WALL_FAN, drb3);
-            hashMap.put(Blocks.TUBE_CORAL_WALL_FAN, drb3);
-            hashMap.put(Blocks.BRAIN_CORAL_WALL_FAN, drb3);
-            hashMap.put(Blocks.BUBBLE_CORAL_WALL_FAN, drb3);
-            hashMap.put(Blocks.FIRE_CORAL_WALL_FAN, drb3);
-            hashMap.put(Blocks.HORN_CORAL_WALL_FAN, drb3);
-            hashMap.put(Blocks.SEA_PICKLE, drb3);
-            hashMap.put(Blocks.CONDUIT, drb3);
-            hashMap.put(Blocks.BAMBOO_SAPLING, drb3);
-            hashMap.put(Blocks.BAMBOO, drb3);
-            hashMap.put(Blocks.POTTED_BAMBOO, drb3);
-            hashMap.put(Blocks.SCAFFOLDING, drb3);
-            hashMap.put(Blocks.STONECUTTER, drb3);
-            hashMap.put(Blocks.LANTERN, drb3);
-            hashMap.put(Blocks.CAMPFIRE, drb3);
-            hashMap.put(Blocks.SWEET_BERRY_BUSH, drb3);
-            drb4 = RenderType.translucent();
-            hashMap.put(Blocks.ICE, drb4);
-            hashMap.put(Blocks.NETHER_PORTAL, drb4);
-            hashMap.put(Blocks.WHITE_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.ORANGE_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.MAGENTA_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.LIGHT_BLUE_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.YELLOW_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.LIME_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.PINK_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.GRAY_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.LIGHT_GRAY_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.CYAN_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.PURPLE_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.BLUE_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.BROWN_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.GREEN_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.RED_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.BLACK_STAINED_GLASS, drb4);
-            hashMap.put(Blocks.TRIPWIRE, drb4);
-            hashMap.put(Blocks.WHITE_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.ORANGE_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.MAGENTA_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.YELLOW_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.LIME_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.PINK_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.GRAY_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.LIGHT_GRAY_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.CYAN_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.PURPLE_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.BLUE_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.BROWN_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.GREEN_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.RED_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.BLACK_STAINED_GLASS_PANE, drb4);
-            hashMap.put(Blocks.SLIME_BLOCK, drb4);
-            hashMap.put(Blocks.HONEY_BLOCK, drb4);
-            hashMap.put(Blocks.FROSTED_ICE, drb4);
-            hashMap.put(Blocks.BUBBLE_COLUMN, drb4);
+            ech2 = RenderType.tripwire();
+            hashMap.put(Blocks.TRIPWIRE, ech2);
+            ech3 = RenderType.cutoutMipped();
+            hashMap.put(Blocks.GRASS_BLOCK, ech3);
+            hashMap.put(Blocks.IRON_BARS, ech3);
+            hashMap.put(Blocks.GLASS_PANE, ech3);
+            hashMap.put(Blocks.TRIPWIRE_HOOK, ech3);
+            hashMap.put(Blocks.HOPPER, ech3);
+            hashMap.put(Blocks.CHAIN, ech3);
+            hashMap.put(Blocks.JUNGLE_LEAVES, ech3);
+            hashMap.put(Blocks.OAK_LEAVES, ech3);
+            hashMap.put(Blocks.SPRUCE_LEAVES, ech3);
+            hashMap.put(Blocks.ACACIA_LEAVES, ech3);
+            hashMap.put(Blocks.BIRCH_LEAVES, ech3);
+            hashMap.put(Blocks.DARK_OAK_LEAVES, ech3);
+            ech4 = RenderType.cutout();
+            hashMap.put(Blocks.OAK_SAPLING, ech4);
+            hashMap.put(Blocks.SPRUCE_SAPLING, ech4);
+            hashMap.put(Blocks.BIRCH_SAPLING, ech4);
+            hashMap.put(Blocks.JUNGLE_SAPLING, ech4);
+            hashMap.put(Blocks.ACACIA_SAPLING, ech4);
+            hashMap.put(Blocks.DARK_OAK_SAPLING, ech4);
+            hashMap.put(Blocks.GLASS, ech4);
+            hashMap.put(Blocks.WHITE_BED, ech4);
+            hashMap.put(Blocks.ORANGE_BED, ech4);
+            hashMap.put(Blocks.MAGENTA_BED, ech4);
+            hashMap.put(Blocks.LIGHT_BLUE_BED, ech4);
+            hashMap.put(Blocks.YELLOW_BED, ech4);
+            hashMap.put(Blocks.LIME_BED, ech4);
+            hashMap.put(Blocks.PINK_BED, ech4);
+            hashMap.put(Blocks.GRAY_BED, ech4);
+            hashMap.put(Blocks.LIGHT_GRAY_BED, ech4);
+            hashMap.put(Blocks.CYAN_BED, ech4);
+            hashMap.put(Blocks.PURPLE_BED, ech4);
+            hashMap.put(Blocks.BLUE_BED, ech4);
+            hashMap.put(Blocks.BROWN_BED, ech4);
+            hashMap.put(Blocks.GREEN_BED, ech4);
+            hashMap.put(Blocks.RED_BED, ech4);
+            hashMap.put(Blocks.BLACK_BED, ech4);
+            hashMap.put(Blocks.POWERED_RAIL, ech4);
+            hashMap.put(Blocks.DETECTOR_RAIL, ech4);
+            hashMap.put(Blocks.COBWEB, ech4);
+            hashMap.put(Blocks.GRASS, ech4);
+            hashMap.put(Blocks.FERN, ech4);
+            hashMap.put(Blocks.DEAD_BUSH, ech4);
+            hashMap.put(Blocks.SEAGRASS, ech4);
+            hashMap.put(Blocks.TALL_SEAGRASS, ech4);
+            hashMap.put(Blocks.DANDELION, ech4);
+            hashMap.put(Blocks.POPPY, ech4);
+            hashMap.put(Blocks.BLUE_ORCHID, ech4);
+            hashMap.put(Blocks.ALLIUM, ech4);
+            hashMap.put(Blocks.AZURE_BLUET, ech4);
+            hashMap.put(Blocks.RED_TULIP, ech4);
+            hashMap.put(Blocks.ORANGE_TULIP, ech4);
+            hashMap.put(Blocks.WHITE_TULIP, ech4);
+            hashMap.put(Blocks.PINK_TULIP, ech4);
+            hashMap.put(Blocks.OXEYE_DAISY, ech4);
+            hashMap.put(Blocks.CORNFLOWER, ech4);
+            hashMap.put(Blocks.WITHER_ROSE, ech4);
+            hashMap.put(Blocks.LILY_OF_THE_VALLEY, ech4);
+            hashMap.put(Blocks.BROWN_MUSHROOM, ech4);
+            hashMap.put(Blocks.RED_MUSHROOM, ech4);
+            hashMap.put(Blocks.TORCH, ech4);
+            hashMap.put(Blocks.WALL_TORCH, ech4);
+            hashMap.put(Blocks.SOUL_TORCH, ech4);
+            hashMap.put(Blocks.SOUL_WALL_TORCH, ech4);
+            hashMap.put(Blocks.FIRE, ech4);
+            hashMap.put(Blocks.SOUL_FIRE, ech4);
+            hashMap.put(Blocks.SPAWNER, ech4);
+            hashMap.put(Blocks.REDSTONE_WIRE, ech4);
+            hashMap.put(Blocks.WHEAT, ech4);
+            hashMap.put(Blocks.OAK_DOOR, ech4);
+            hashMap.put(Blocks.LADDER, ech4);
+            hashMap.put(Blocks.RAIL, ech4);
+            hashMap.put(Blocks.IRON_DOOR, ech4);
+            hashMap.put(Blocks.REDSTONE_TORCH, ech4);
+            hashMap.put(Blocks.REDSTONE_WALL_TORCH, ech4);
+            hashMap.put(Blocks.CACTUS, ech4);
+            hashMap.put(Blocks.SUGAR_CANE, ech4);
+            hashMap.put(Blocks.REPEATER, ech4);
+            hashMap.put(Blocks.OAK_TRAPDOOR, ech4);
+            hashMap.put(Blocks.SPRUCE_TRAPDOOR, ech4);
+            hashMap.put(Blocks.BIRCH_TRAPDOOR, ech4);
+            hashMap.put(Blocks.JUNGLE_TRAPDOOR, ech4);
+            hashMap.put(Blocks.ACACIA_TRAPDOOR, ech4);
+            hashMap.put(Blocks.DARK_OAK_TRAPDOOR, ech4);
+            hashMap.put(Blocks.CRIMSON_TRAPDOOR, ech4);
+            hashMap.put(Blocks.WARPED_TRAPDOOR, ech4);
+            hashMap.put(Blocks.ATTACHED_PUMPKIN_STEM, ech4);
+            hashMap.put(Blocks.ATTACHED_MELON_STEM, ech4);
+            hashMap.put(Blocks.PUMPKIN_STEM, ech4);
+            hashMap.put(Blocks.MELON_STEM, ech4);
+            hashMap.put(Blocks.VINE, ech4);
+            hashMap.put(Blocks.LILY_PAD, ech4);
+            hashMap.put(Blocks.NETHER_WART, ech4);
+            hashMap.put(Blocks.BREWING_STAND, ech4);
+            hashMap.put(Blocks.COCOA, ech4);
+            hashMap.put(Blocks.BEACON, ech4);
+            hashMap.put(Blocks.FLOWER_POT, ech4);
+            hashMap.put(Blocks.POTTED_OAK_SAPLING, ech4);
+            hashMap.put(Blocks.POTTED_SPRUCE_SAPLING, ech4);
+            hashMap.put(Blocks.POTTED_BIRCH_SAPLING, ech4);
+            hashMap.put(Blocks.POTTED_JUNGLE_SAPLING, ech4);
+            hashMap.put(Blocks.POTTED_ACACIA_SAPLING, ech4);
+            hashMap.put(Blocks.POTTED_DARK_OAK_SAPLING, ech4);
+            hashMap.put(Blocks.POTTED_FERN, ech4);
+            hashMap.put(Blocks.POTTED_DANDELION, ech4);
+            hashMap.put(Blocks.POTTED_POPPY, ech4);
+            hashMap.put(Blocks.POTTED_BLUE_ORCHID, ech4);
+            hashMap.put(Blocks.POTTED_ALLIUM, ech4);
+            hashMap.put(Blocks.POTTED_AZURE_BLUET, ech4);
+            hashMap.put(Blocks.POTTED_RED_TULIP, ech4);
+            hashMap.put(Blocks.POTTED_ORANGE_TULIP, ech4);
+            hashMap.put(Blocks.POTTED_WHITE_TULIP, ech4);
+            hashMap.put(Blocks.POTTED_PINK_TULIP, ech4);
+            hashMap.put(Blocks.POTTED_OXEYE_DAISY, ech4);
+            hashMap.put(Blocks.POTTED_CORNFLOWER, ech4);
+            hashMap.put(Blocks.POTTED_LILY_OF_THE_VALLEY, ech4);
+            hashMap.put(Blocks.POTTED_WITHER_ROSE, ech4);
+            hashMap.put(Blocks.POTTED_RED_MUSHROOM, ech4);
+            hashMap.put(Blocks.POTTED_BROWN_MUSHROOM, ech4);
+            hashMap.put(Blocks.POTTED_DEAD_BUSH, ech4);
+            hashMap.put(Blocks.POTTED_CACTUS, ech4);
+            hashMap.put(Blocks.CARROTS, ech4);
+            hashMap.put(Blocks.POTATOES, ech4);
+            hashMap.put(Blocks.COMPARATOR, ech4);
+            hashMap.put(Blocks.ACTIVATOR_RAIL, ech4);
+            hashMap.put(Blocks.IRON_TRAPDOOR, ech4);
+            hashMap.put(Blocks.SUNFLOWER, ech4);
+            hashMap.put(Blocks.LILAC, ech4);
+            hashMap.put(Blocks.ROSE_BUSH, ech4);
+            hashMap.put(Blocks.PEONY, ech4);
+            hashMap.put(Blocks.TALL_GRASS, ech4);
+            hashMap.put(Blocks.LARGE_FERN, ech4);
+            hashMap.put(Blocks.SPRUCE_DOOR, ech4);
+            hashMap.put(Blocks.BIRCH_DOOR, ech4);
+            hashMap.put(Blocks.JUNGLE_DOOR, ech4);
+            hashMap.put(Blocks.ACACIA_DOOR, ech4);
+            hashMap.put(Blocks.DARK_OAK_DOOR, ech4);
+            hashMap.put(Blocks.END_ROD, ech4);
+            hashMap.put(Blocks.CHORUS_PLANT, ech4);
+            hashMap.put(Blocks.CHORUS_FLOWER, ech4);
+            hashMap.put(Blocks.BEETROOTS, ech4);
+            hashMap.put(Blocks.KELP, ech4);
+            hashMap.put(Blocks.KELP_PLANT, ech4);
+            hashMap.put(Blocks.TURTLE_EGG, ech4);
+            hashMap.put(Blocks.DEAD_TUBE_CORAL, ech4);
+            hashMap.put(Blocks.DEAD_BRAIN_CORAL, ech4);
+            hashMap.put(Blocks.DEAD_BUBBLE_CORAL, ech4);
+            hashMap.put(Blocks.DEAD_FIRE_CORAL, ech4);
+            hashMap.put(Blocks.DEAD_HORN_CORAL, ech4);
+            hashMap.put(Blocks.TUBE_CORAL, ech4);
+            hashMap.put(Blocks.BRAIN_CORAL, ech4);
+            hashMap.put(Blocks.BUBBLE_CORAL, ech4);
+            hashMap.put(Blocks.FIRE_CORAL, ech4);
+            hashMap.put(Blocks.HORN_CORAL, ech4);
+            hashMap.put(Blocks.DEAD_TUBE_CORAL_FAN, ech4);
+            hashMap.put(Blocks.DEAD_BRAIN_CORAL_FAN, ech4);
+            hashMap.put(Blocks.DEAD_BUBBLE_CORAL_FAN, ech4);
+            hashMap.put(Blocks.DEAD_FIRE_CORAL_FAN, ech4);
+            hashMap.put(Blocks.DEAD_HORN_CORAL_FAN, ech4);
+            hashMap.put(Blocks.TUBE_CORAL_FAN, ech4);
+            hashMap.put(Blocks.BRAIN_CORAL_FAN, ech4);
+            hashMap.put(Blocks.BUBBLE_CORAL_FAN, ech4);
+            hashMap.put(Blocks.FIRE_CORAL_FAN, ech4);
+            hashMap.put(Blocks.HORN_CORAL_FAN, ech4);
+            hashMap.put(Blocks.DEAD_TUBE_CORAL_WALL_FAN, ech4);
+            hashMap.put(Blocks.DEAD_BRAIN_CORAL_WALL_FAN, ech4);
+            hashMap.put(Blocks.DEAD_BUBBLE_CORAL_WALL_FAN, ech4);
+            hashMap.put(Blocks.DEAD_FIRE_CORAL_WALL_FAN, ech4);
+            hashMap.put(Blocks.DEAD_HORN_CORAL_WALL_FAN, ech4);
+            hashMap.put(Blocks.TUBE_CORAL_WALL_FAN, ech4);
+            hashMap.put(Blocks.BRAIN_CORAL_WALL_FAN, ech4);
+            hashMap.put(Blocks.BUBBLE_CORAL_WALL_FAN, ech4);
+            hashMap.put(Blocks.FIRE_CORAL_WALL_FAN, ech4);
+            hashMap.put(Blocks.HORN_CORAL_WALL_FAN, ech4);
+            hashMap.put(Blocks.SEA_PICKLE, ech4);
+            hashMap.put(Blocks.CONDUIT, ech4);
+            hashMap.put(Blocks.BAMBOO_SAPLING, ech4);
+            hashMap.put(Blocks.BAMBOO, ech4);
+            hashMap.put(Blocks.POTTED_BAMBOO, ech4);
+            hashMap.put(Blocks.SCAFFOLDING, ech4);
+            hashMap.put(Blocks.STONECUTTER, ech4);
+            hashMap.put(Blocks.LANTERN, ech4);
+            hashMap.put(Blocks.SOUL_LANTERN, ech4);
+            hashMap.put(Blocks.CAMPFIRE, ech4);
+            hashMap.put(Blocks.SOUL_CAMPFIRE, ech4);
+            hashMap.put(Blocks.SWEET_BERRY_BUSH, ech4);
+            hashMap.put(Blocks.WEEPING_VINES, ech4);
+            hashMap.put(Blocks.WEEPING_VINES_PLANT, ech4);
+            hashMap.put(Blocks.TWISTING_VINES, ech4);
+            hashMap.put(Blocks.TWISTING_VINES_PLANT, ech4);
+            hashMap.put(Blocks.NETHER_SPROUTS, ech4);
+            hashMap.put(Blocks.CRIMSON_FUNGUS, ech4);
+            hashMap.put(Blocks.WARPED_FUNGUS, ech4);
+            hashMap.put(Blocks.CRIMSON_ROOTS, ech4);
+            hashMap.put(Blocks.WARPED_ROOTS, ech4);
+            hashMap.put(Blocks.POTTED_CRIMSON_FUNGUS, ech4);
+            hashMap.put(Blocks.POTTED_WARPED_FUNGUS, ech4);
+            hashMap.put(Blocks.POTTED_CRIMSON_ROOTS, ech4);
+            hashMap.put(Blocks.POTTED_WARPED_ROOTS, ech4);
+            hashMap.put(Blocks.CRIMSON_DOOR, ech4);
+            hashMap.put(Blocks.WARPED_DOOR, ech4);
+            ech5 = RenderType.translucent();
+            hashMap.put(Blocks.ICE, ech5);
+            hashMap.put(Blocks.NETHER_PORTAL, ech5);
+            hashMap.put(Blocks.WHITE_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.ORANGE_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.MAGENTA_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.LIGHT_BLUE_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.YELLOW_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.LIME_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.PINK_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.GRAY_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.LIGHT_GRAY_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.CYAN_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.PURPLE_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.BLUE_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.BROWN_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.GREEN_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.RED_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.BLACK_STAINED_GLASS, ech5);
+            hashMap.put(Blocks.WHITE_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.ORANGE_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.MAGENTA_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.YELLOW_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.LIME_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.PINK_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.GRAY_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.LIGHT_GRAY_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.CYAN_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.PURPLE_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.BLUE_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.BROWN_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.GREEN_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.RED_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.BLACK_STAINED_GLASS_PANE, ech5);
+            hashMap.put(Blocks.SLIME_BLOCK, ech5);
+            hashMap.put(Blocks.HONEY_BLOCK, ech5);
+            hashMap.put(Blocks.FROSTED_ICE, ech5);
+            hashMap.put(Blocks.BUBBLE_COLUMN, ech5);
             return;
         });
-        final RenderType drb5;
+        final RenderType ech6;
         TYPE_BY_FLUID = Util.<Map<Fluid, RenderType>>make(Maps.newHashMap(), hashMap -> {
-            drb5 = RenderType.translucent();
-            hashMap.put(Fluids.FLOWING_WATER, drb5);
-            hashMap.put(Fluids.WATER, drb5);
+            ech6 = RenderType.translucent();
+            hashMap.put(Fluids.FLOWING_WATER, ech6);
+            hashMap.put(Fluids.WATER, ech6);
         });
     }
 }
diff --git a/src/net/minecraft/client/renderer/ItemInHandRenderer.java b/src/net/minecraft/client/renderer/ItemInHandRenderer.java
index fc6420a..d9d0b82 100644
--- a/src/net/minecraft/client/renderer/ItemInHandRenderer.java
+++ b/src/net/minecraft/client/renderer/ItemInHandRenderer.java
@@ -1,7 +1,6 @@
 package net.minecraft.client.renderer;
 
 import net.minecraft.resources.ResourceLocation;
-import java.util.Objects;
 import net.minecraft.world.item.CrossbowItem;
 import net.minecraft.world.item.Items;
 import com.google.common.base.MoreObjects;
@@ -39,19 +38,19 @@ public class ItemInHandRenderer {
     private final EntityRenderDispatcher entityRenderDispatcher;
     private final ItemRenderer itemRenderer;
     
-    public ItemInHandRenderer(final Minecraft dbn) {
+    public ItemInHandRenderer(final Minecraft dlx) {
         this.mainHandItem = ItemStack.EMPTY;
         this.offHandItem = ItemStack.EMPTY;
-        this.minecraft = dbn;
-        this.entityRenderDispatcher = dbn.getEntityRenderDispatcher();
-        this.itemRenderer = dbn.getItemRenderer();
+        this.minecraft = dlx;
+        this.entityRenderDispatcher = dlx.getEntityRenderDispatcher();
+        this.itemRenderer = dlx.getItemRenderer();
     }
     
-    public void renderItem(final LivingEntity akz, final ItemStack ben, final ItemTransforms.TransformType b, final boolean boolean4, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        if (ben.isEmpty()) {
+    public void renderItem(final LivingEntity aoy, final ItemStack bki, final ItemTransforms.TransformType b, final boolean boolean4, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        if (bki.isEmpty()) {
             return;
         }
-        this.itemRenderer.renderStatic(akz, ben, b, boolean4, cyl, dqt, akz.level, integer, OverlayTexture.NO_OVERLAY);
+        this.itemRenderer.renderStatic(aoy, bki, b, boolean4, dhl, ebz, aoy.level, integer, OverlayTexture.NO_OVERLAY);
     }
     
     private float calculateMapTilt(final float float1) {
@@ -61,222 +60,222 @@ public class ItemInHandRenderer {
         return float2;
     }
     
-    private void renderMapHand(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final HumanoidArm aky) {
+    private void renderMapHand(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final HumanoidArm aou) {
         this.minecraft.getTextureManager().bind(this.minecraft.player.getSkinTextureLocation());
-        final PlayerRenderer dzt6 = (PlayerRenderer)this.entityRenderDispatcher.<LocalPlayer>getRenderer(this.minecraft.player);
-        cyl.pushPose();
-        final float float7 = (aky == HumanoidArm.RIGHT) ? 1.0f : -1.0f;
-        cyl.mulPose(Vector3f.YP.rotationDegrees(92.0f));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(45.0f));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(float7 * -41.0f));
-        cyl.translate(float7 * 0.3f, -1.100000023841858, 0.44999998807907104);
-        if (aky == HumanoidArm.RIGHT) {
-            dzt6.renderRightHand(cyl, dqt, integer, this.minecraft.player);
+        final PlayerRenderer eld6 = (PlayerRenderer)this.entityRenderDispatcher.<LocalPlayer>getRenderer(this.minecraft.player);
+        dhl.pushPose();
+        final float float7 = (aou == HumanoidArm.RIGHT) ? 1.0f : -1.0f;
+        dhl.mulPose(Vector3f.YP.rotationDegrees(92.0f));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(45.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(float7 * -41.0f));
+        dhl.translate(float7 * 0.3f, -1.100000023841858, 0.44999998807907104);
+        if (aou == HumanoidArm.RIGHT) {
+            eld6.renderRightHand(dhl, ebz, integer, this.minecraft.player);
         }
         else {
-            dzt6.renderLeftHand(cyl, dqt, integer, this.minecraft.player);
+            eld6.renderLeftHand(dhl, ebz, integer, this.minecraft.player);
         }
-        cyl.popPose();
+        dhl.popPose();
     }
     
-    private void renderOneHandedMap(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final float float4, final HumanoidArm aky, final float float6, final ItemStack ben) {
-        final float float7 = (aky == HumanoidArm.RIGHT) ? 1.0f : -1.0f;
-        cyl.translate(float7 * 0.125f, -0.125, 0.0);
+    private void renderOneHandedMap(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final float float4, final HumanoidArm aou, final float float6, final ItemStack bki) {
+        final float float7 = (aou == HumanoidArm.RIGHT) ? 1.0f : -1.0f;
+        dhl.translate(float7 * 0.125f, -0.125, 0.0);
         if (!this.minecraft.player.isInvisible()) {
-            cyl.pushPose();
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(float7 * 10.0f));
-            this.renderPlayerArm(cyl, dqt, integer, float4, float6, aky);
-            cyl.popPose();
+            dhl.pushPose();
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(float7 * 10.0f));
+            this.renderPlayerArm(dhl, ebz, integer, float4, float6, aou);
+            dhl.popPose();
         }
-        cyl.pushPose();
-        cyl.translate(float7 * 0.51f, -0.08f + float4 * -1.2f, -0.75);
+        dhl.pushPose();
+        dhl.translate(float7 * 0.51f, -0.08f + float4 * -1.2f, -0.75);
         final float float8 = Mth.sqrt(float6);
         final float float9 = Mth.sin(float8 * 3.1415927f);
         final float float10 = -0.5f * float9;
         final float float11 = 0.4f * Mth.sin(float8 * 6.2831855f);
         final float float12 = -0.3f * Mth.sin(float6 * 3.1415927f);
-        cyl.translate(float7 * float10, float11 - 0.3f * float9, float12);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(float9 * -45.0f));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float7 * float9 * -30.0f));
-        this.renderMap(cyl, dqt, integer, ben);
-        cyl.popPose();
+        dhl.translate(float7 * float10, float11 - 0.3f * float9, float12);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(float9 * -45.0f));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float7 * float9 * -30.0f));
+        this.renderMap(dhl, ebz, integer, bki);
+        dhl.popPose();
     }
     
-    private void renderTwoHandedMap(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final float float4, final float float5, final float float6) {
+    private void renderTwoHandedMap(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final float float4, final float float5, final float float6) {
         final float float7 = Mth.sqrt(float6);
         final float float8 = -0.2f * Mth.sin(float6 * 3.1415927f);
         final float float9 = -0.4f * Mth.sin(float7 * 3.1415927f);
-        cyl.translate(0.0, -float8 / 2.0f, float9);
+        dhl.translate(0.0, -float8 / 2.0f, float9);
         final float float10 = this.calculateMapTilt(float4);
-        cyl.translate(0.0, 0.04f + float5 * -1.2f + float10 * -0.5f, -0.7200000286102295);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(float10 * -85.0f));
+        dhl.translate(0.0, 0.04f + float5 * -1.2f + float10 * -0.5f, -0.7200000286102295);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(float10 * -85.0f));
         if (!this.minecraft.player.isInvisible()) {
-            cyl.pushPose();
-            cyl.mulPose(Vector3f.YP.rotationDegrees(90.0f));
-            this.renderMapHand(cyl, dqt, integer, HumanoidArm.RIGHT);
-            this.renderMapHand(cyl, dqt, integer, HumanoidArm.LEFT);
-            cyl.popPose();
+            dhl.pushPose();
+            dhl.mulPose(Vector3f.YP.rotationDegrees(90.0f));
+            this.renderMapHand(dhl, ebz, integer, HumanoidArm.RIGHT);
+            this.renderMapHand(dhl, ebz, integer, HumanoidArm.LEFT);
+            dhl.popPose();
         }
         final float float11 = Mth.sin(float7 * 3.1415927f);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(float11 * 20.0f));
-        cyl.scale(2.0f, 2.0f, 2.0f);
-        this.renderMap(cyl, dqt, integer, this.mainHandItem);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(float11 * 20.0f));
+        dhl.scale(2.0f, 2.0f, 2.0f);
+        this.renderMap(dhl, ebz, integer, this.mainHandItem);
     }
     
-    private void renderMap(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final ItemStack ben) {
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
-        cyl.scale(0.38f, 0.38f, 0.38f);
-        cyl.translate(-0.5, -0.5, 0.0);
-        cyl.scale(0.0078125f, 0.0078125f, 0.0078125f);
-        final MapItemSavedData crg6 = MapItem.getOrCreateSavedData(ben, this.minecraft.level);
-        final VertexConsumer cyo7 = dqt.getBuffer((crg6 == null) ? ItemInHandRenderer.MAP_BACKGROUND : ItemInHandRenderer.MAP_BACKGROUND_CHECKERBOARD);
-        final Matrix4f b8 = cyl.last().pose();
-        cyo7.vertex(b8, -7.0f, 135.0f, 0.0f).color(255, 255, 255, 255).uv(0.0f, 1.0f).uv2(integer).endVertex();
-        cyo7.vertex(b8, 135.0f, 135.0f, 0.0f).color(255, 255, 255, 255).uv(1.0f, 1.0f).uv2(integer).endVertex();
-        cyo7.vertex(b8, 135.0f, -7.0f, 0.0f).color(255, 255, 255, 255).uv(1.0f, 0.0f).uv2(integer).endVertex();
-        cyo7.vertex(b8, -7.0f, -7.0f, 0.0f).color(255, 255, 255, 255).uv(0.0f, 0.0f).uv2(integer).endVertex();
-        if (crg6 != null) {
-            this.minecraft.gameRenderer.getMapRenderer().render(cyl, dqt, crg6, false, integer);
+    private void renderMap(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final ItemStack bki) {
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
+        dhl.scale(0.38f, 0.38f, 0.38f);
+        dhl.translate(-0.5, -0.5, 0.0);
+        dhl.scale(0.0078125f, 0.0078125f, 0.0078125f);
+        final MapItemSavedData czv6 = MapItem.getOrCreateSavedData(bki, this.minecraft.level);
+        final VertexConsumer dhp7 = ebz.getBuffer((czv6 == null) ? ItemInHandRenderer.MAP_BACKGROUND : ItemInHandRenderer.MAP_BACKGROUND_CHECKERBOARD);
+        final Matrix4f b8 = dhl.last().pose();
+        dhp7.vertex(b8, -7.0f, 135.0f, 0.0f).color(255, 255, 255, 255).uv(0.0f, 1.0f).uv2(integer).endVertex();
+        dhp7.vertex(b8, 135.0f, 135.0f, 0.0f).color(255, 255, 255, 255).uv(1.0f, 1.0f).uv2(integer).endVertex();
+        dhp7.vertex(b8, 135.0f, -7.0f, 0.0f).color(255, 255, 255, 255).uv(1.0f, 0.0f).uv2(integer).endVertex();
+        dhp7.vertex(b8, -7.0f, -7.0f, 0.0f).color(255, 255, 255, 255).uv(0.0f, 0.0f).uv2(integer).endVertex();
+        if (czv6 != null) {
+            this.minecraft.gameRenderer.getMapRenderer().render(dhl, ebz, czv6, false, integer);
         }
     }
     
-    private void renderPlayerArm(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final float float4, final float float5, final HumanoidArm aky) {
-        final boolean boolean8 = aky != HumanoidArm.LEFT;
+    private void renderPlayerArm(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final float float4, final float float5, final HumanoidArm aou) {
+        final boolean boolean8 = aou != HumanoidArm.LEFT;
         final float float6 = boolean8 ? 1.0f : -1.0f;
         final float float7 = Mth.sqrt(float5);
         final float float8 = -0.3f * Mth.sin(float7 * 3.1415927f);
         final float float9 = 0.4f * Mth.sin(float7 * 6.2831855f);
         final float float10 = -0.4f * Mth.sin(float5 * 3.1415927f);
-        cyl.translate(float6 * (float8 + 0.64000005f), float9 - 0.6f + float4 * -0.6f, float10 - 0.71999997f);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float6 * 45.0f));
+        dhl.translate(float6 * (float8 + 0.64000005f), float9 - 0.6f + float4 * -0.6f, float10 - 0.71999997f);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float6 * 45.0f));
         final float float11 = Mth.sin(float5 * float5 * 3.1415927f);
         final float float12 = Mth.sin(float7 * 3.1415927f);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float6 * float12 * 70.0f));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(float6 * float11 * -20.0f));
-        final AbstractClientPlayer dpy16 = this.minecraft.player;
-        this.minecraft.getTextureManager().bind(dpy16.getSkinTextureLocation());
-        cyl.translate(float6 * -1.0f, 3.5999999046325684, 3.5);
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(float6 * 120.0f));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(200.0f));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float6 * -135.0f));
-        cyl.translate(float6 * 5.6f, 0.0, 0.0);
-        final PlayerRenderer dzt17 = (PlayerRenderer)this.entityRenderDispatcher.<AbstractClientPlayer>getRenderer(dpy16);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float6 * float12 * 70.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(float6 * float11 * -20.0f));
+        final AbstractClientPlayer ebc16 = this.minecraft.player;
+        this.minecraft.getTextureManager().bind(ebc16.getSkinTextureLocation());
+        dhl.translate(float6 * -1.0f, 3.5999999046325684, 3.5);
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(float6 * 120.0f));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(200.0f));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float6 * -135.0f));
+        dhl.translate(float6 * 5.6f, 0.0, 0.0);
+        final PlayerRenderer eld17 = (PlayerRenderer)this.entityRenderDispatcher.<AbstractClientPlayer>getRenderer(ebc16);
         if (boolean8) {
-            dzt17.renderRightHand(cyl, dqt, integer, dpy16);
+            eld17.renderRightHand(dhl, ebz, integer, ebc16);
         }
         else {
-            dzt17.renderLeftHand(cyl, dqt, integer, dpy16);
+            eld17.renderLeftHand(dhl, ebz, integer, ebc16);
         }
     }
     
-    private void applyEatTransform(final PoseStack cyl, final float float2, final HumanoidArm aky, final ItemStack ben) {
+    private void applyEatTransform(final PoseStack dhl, final float float2, final HumanoidArm aou, final ItemStack bki) {
         final float float3 = this.minecraft.player.getUseItemRemainingTicks() - float2 + 1.0f;
-        final float float4 = float3 / ben.getUseDuration();
+        final float float4 = float3 / bki.getUseDuration();
         if (float4 < 0.8f) {
             final float float5 = Mth.abs(Mth.cos(float3 / 4.0f * 3.1415927f) * 0.1f);
-            cyl.translate(0.0, float5, 0.0);
+            dhl.translate(0.0, float5, 0.0);
         }
         final float float5 = 1.0f - (float)Math.pow(float4, 27.0);
-        final int integer9 = (aky == HumanoidArm.RIGHT) ? 1 : -1;
-        cyl.translate(float5 * 0.6f * integer9, float5 * -0.5f, float5 * 0.0f);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(integer9 * float5 * 90.0f));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(float5 * 10.0f));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(integer9 * float5 * 30.0f));
+        final int integer9 = (aou == HumanoidArm.RIGHT) ? 1 : -1;
+        dhl.translate(float5 * 0.6f * integer9, float5 * -0.5f, float5 * 0.0f);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(integer9 * float5 * 90.0f));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(float5 * 10.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(integer9 * float5 * 30.0f));
     }
     
-    private void applyItemArmAttackTransform(final PoseStack cyl, final HumanoidArm aky, final float float3) {
-        final int integer5 = (aky == HumanoidArm.RIGHT) ? 1 : -1;
+    private void applyItemArmAttackTransform(final PoseStack dhl, final HumanoidArm aou, final float float3) {
+        final int integer5 = (aou == HumanoidArm.RIGHT) ? 1 : -1;
         final float float4 = Mth.sin(float3 * float3 * 3.1415927f);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(integer5 * (45.0f + float4 * -20.0f)));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(integer5 * (45.0f + float4 * -20.0f)));
         final float float5 = Mth.sin(Mth.sqrt(float3) * 3.1415927f);
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(integer5 * float5 * -20.0f));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(float5 * -80.0f));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(integer5 * -45.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(integer5 * float5 * -20.0f));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(float5 * -80.0f));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(integer5 * -45.0f));
     }
     
-    private void applyItemArmTransform(final PoseStack cyl, final HumanoidArm aky, final float float3) {
-        final int integer5 = (aky == HumanoidArm.RIGHT) ? 1 : -1;
-        cyl.translate(integer5 * 0.56f, -0.52f + float3 * -0.6f, -0.7200000286102295);
+    private void applyItemArmTransform(final PoseStack dhl, final HumanoidArm aou, final float float3) {
+        final int integer5 = (aou == HumanoidArm.RIGHT) ? 1 : -1;
+        dhl.translate(integer5 * 0.56f, -0.52f + float3 * -0.6f, -0.7200000286102295);
     }
     
-    public void renderHandsWithItems(final float float1, final PoseStack cyl, final MultiBufferSource.BufferSource a, final LocalPlayer dqb, final int integer) {
-        final float float2 = dqb.getAttackAnim(float1);
-        final InteractionHand ajk8 = MoreObjects.<InteractionHand>firstNonNull(dqb.swingingArm, InteractionHand.MAIN_HAND);
-        final float float3 = Mth.lerp(float1, dqb.xRotO, dqb.xRot);
+    public void renderHandsWithItems(final float float1, final PoseStack dhl, final MultiBufferSource.BufferSource a, final LocalPlayer ebf, final int integer) {
+        final float float2 = ebf.getAttackAnim(float1);
+        final InteractionHand anf8 = MoreObjects.<InteractionHand>firstNonNull(ebf.swingingArm, InteractionHand.MAIN_HAND);
+        final float float3 = Mth.lerp(float1, ebf.xRotO, ebf.xRot);
         boolean boolean10 = true;
         boolean boolean11 = true;
-        if (dqb.isUsingItem()) {
-            final ItemStack ben12 = dqb.getUseItem();
-            if (ben12.getItem() == Items.BOW || ben12.getItem() == Items.CROSSBOW) {
-                boolean10 = (dqb.getUsedItemHand() == InteractionHand.MAIN_HAND);
+        if (ebf.isUsingItem()) {
+            final ItemStack bki12 = ebf.getUseItem();
+            if (bki12.getItem() == Items.BOW || bki12.getItem() == Items.CROSSBOW) {
+                boolean10 = (ebf.getUsedItemHand() == InteractionHand.MAIN_HAND);
                 boolean11 = !boolean10;
             }
-            final InteractionHand ajk9 = dqb.getUsedItemHand();
-            if (ajk9 == InteractionHand.MAIN_HAND) {
-                final ItemStack ben13 = dqb.getOffhandItem();
-                if (ben13.getItem() == Items.CROSSBOW && CrossbowItem.isCharged(ben13)) {
+            final InteractionHand anf9 = ebf.getUsedItemHand();
+            if (anf9 == InteractionHand.MAIN_HAND) {
+                final ItemStack bki13 = ebf.getOffhandItem();
+                if (bki13.getItem() == Items.CROSSBOW && CrossbowItem.isCharged(bki13)) {
                     boolean11 = false;
                 }
             }
         }
         else {
-            final ItemStack ben12 = dqb.getMainHandItem();
-            final ItemStack ben14 = dqb.getOffhandItem();
-            if (ben12.getItem() == Items.CROSSBOW && CrossbowItem.isCharged(ben12)) {
+            final ItemStack bki12 = ebf.getMainHandItem();
+            final ItemStack bki14 = ebf.getOffhandItem();
+            if (bki12.getItem() == Items.CROSSBOW && CrossbowItem.isCharged(bki12)) {
                 boolean11 = !boolean10;
             }
-            if (ben14.getItem() == Items.CROSSBOW && CrossbowItem.isCharged(ben14)) {
-                boolean10 = !ben12.isEmpty();
+            if (bki14.getItem() == Items.CROSSBOW && CrossbowItem.isCharged(bki14)) {
+                boolean10 = !bki12.isEmpty();
                 boolean11 = !boolean10;
             }
         }
-        final float float4 = Mth.lerp(float1, dqb.xBobO, dqb.xBob);
-        final float float5 = Mth.lerp(float1, dqb.yBobO, dqb.yBob);
-        cyl.mulPose(Vector3f.XP.rotationDegrees((dqb.getViewXRot(float1) - float4) * 0.1f));
-        cyl.mulPose(Vector3f.YP.rotationDegrees((dqb.getViewYRot(float1) - float5) * 0.1f));
+        final float float4 = Mth.lerp(float1, ebf.xBobO, ebf.xBob);
+        final float float5 = Mth.lerp(float1, ebf.yBobO, ebf.yBob);
+        dhl.mulPose(Vector3f.XP.rotationDegrees((ebf.getViewXRot(float1) - float4) * 0.1f));
+        dhl.mulPose(Vector3f.YP.rotationDegrees((ebf.getViewYRot(float1) - float5) * 0.1f));
         if (boolean10) {
-            final float float6 = (ajk8 == InteractionHand.MAIN_HAND) ? float2 : 0.0f;
+            final float float6 = (anf8 == InteractionHand.MAIN_HAND) ? float2 : 0.0f;
             final float float7 = 1.0f - Mth.lerp(float1, this.oMainHandHeight, this.mainHandHeight);
-            this.renderArmWithItem(dqb, float1, float3, InteractionHand.MAIN_HAND, float6, this.mainHandItem, float7, cyl, a, integer);
+            this.renderArmWithItem(ebf, float1, float3, InteractionHand.MAIN_HAND, float6, this.mainHandItem, float7, dhl, a, integer);
         }
         if (boolean11) {
-            final float float6 = (ajk8 == InteractionHand.OFF_HAND) ? float2 : 0.0f;
+            final float float6 = (anf8 == InteractionHand.OFF_HAND) ? float2 : 0.0f;
             final float float7 = 1.0f - Mth.lerp(float1, this.oOffHandHeight, this.offHandHeight);
-            this.renderArmWithItem(dqb, float1, float3, InteractionHand.OFF_HAND, float6, this.offHandItem, float7, cyl, a, integer);
+            this.renderArmWithItem(ebf, float1, float3, InteractionHand.OFF_HAND, float6, this.offHandItem, float7, dhl, a, integer);
         }
         a.endBatch();
     }
     
-    private void renderArmWithItem(final AbstractClientPlayer dpy, final float float2, final float float3, final InteractionHand ajk, final float float5, final ItemStack ben, final float float7, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final boolean boolean12 = ajk == InteractionHand.MAIN_HAND;
-        final HumanoidArm aky13 = boolean12 ? dpy.getMainArm() : dpy.getMainArm().getOpposite();
-        cyl.pushPose();
-        if (ben.isEmpty()) {
-            if (boolean12 && !dpy.isInvisible()) {
-                this.renderPlayerArm(cyl, dqt, integer, float7, float5, aky13);
+    private void renderArmWithItem(final AbstractClientPlayer ebc, final float float2, final float float3, final InteractionHand anf, final float float5, final ItemStack bki, final float float7, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final boolean boolean12 = anf == InteractionHand.MAIN_HAND;
+        final HumanoidArm aou13 = boolean12 ? ebc.getMainArm() : ebc.getMainArm().getOpposite();
+        dhl.pushPose();
+        if (bki.isEmpty()) {
+            if (boolean12 && !ebc.isInvisible()) {
+                this.renderPlayerArm(dhl, ebz, integer, float7, float5, aou13);
             }
         }
-        else if (ben.getItem() == Items.FILLED_MAP) {
+        else if (bki.getItem() == Items.FILLED_MAP) {
             if (boolean12 && this.offHandItem.isEmpty()) {
-                this.renderTwoHandedMap(cyl, dqt, integer, float3, float7, float5);
+                this.renderTwoHandedMap(dhl, ebz, integer, float3, float7, float5);
             }
             else {
-                this.renderOneHandedMap(cyl, dqt, integer, float7, aky13, float5, ben);
+                this.renderOneHandedMap(dhl, ebz, integer, float7, aou13, float5, bki);
             }
         }
-        else if (ben.getItem() == Items.CROSSBOW) {
-            final boolean boolean13 = CrossbowItem.isCharged(ben);
-            final boolean boolean14 = aky13 == HumanoidArm.RIGHT;
+        else if (bki.getItem() == Items.CROSSBOW) {
+            final boolean boolean13 = CrossbowItem.isCharged(bki);
+            final boolean boolean14 = aou13 == HumanoidArm.RIGHT;
             final int integer2 = boolean14 ? 1 : -1;
-            if (dpy.isUsingItem() && dpy.getUseItemRemainingTicks() > 0 && dpy.getUsedItemHand() == ajk) {
-                this.applyItemArmTransform(cyl, aky13, float7);
-                cyl.translate(integer2 * -0.4785682f, -0.0943870022892952, 0.05731530860066414);
-                cyl.mulPose(Vector3f.XP.rotationDegrees(-11.935f));
-                cyl.mulPose(Vector3f.YP.rotationDegrees(integer2 * 65.3f));
-                cyl.mulPose(Vector3f.ZP.rotationDegrees(integer2 * -9.785f));
-                final float float8 = ben.getUseDuration() - (this.minecraft.player.getUseItemRemainingTicks() - float2 + 1.0f);
-                float float9 = float8 / CrossbowItem.getChargeDuration(ben);
+            if (ebc.isUsingItem() && ebc.getUseItemRemainingTicks() > 0 && ebc.getUsedItemHand() == anf) {
+                this.applyItemArmTransform(dhl, aou13, float7);
+                dhl.translate(integer2 * -0.4785682f, -0.0943870022892952, 0.05731530860066414);
+                dhl.mulPose(Vector3f.XP.rotationDegrees(-11.935f));
+                dhl.mulPose(Vector3f.YP.rotationDegrees(integer2 * 65.3f));
+                dhl.mulPose(Vector3f.ZP.rotationDegrees(integer2 * -9.785f));
+                final float float8 = bki.getUseDuration() - (this.minecraft.player.getUseItemRemainingTicks() - float2 + 1.0f);
+                float float9 = float8 / CrossbowItem.getChargeDuration(bki);
                 if (float9 > 1.0f) {
                     float9 = 1.0f;
                 }
@@ -284,52 +283,52 @@ public class ItemInHandRenderer {
                     final float float10 = Mth.sin((float8 - 0.1f) * 1.3f);
                     final float float11 = float9 - 0.1f;
                     final float float12 = float10 * float11;
-                    cyl.translate(float12 * 0.0f, float12 * 0.004f, float12 * 0.0f);
+                    dhl.translate(float12 * 0.0f, float12 * 0.004f, float12 * 0.0f);
                 }
-                cyl.translate(float9 * 0.0f, float9 * 0.0f, float9 * 0.04f);
-                cyl.scale(1.0f, 1.0f, 1.0f + float9 * 0.2f);
-                cyl.mulPose(Vector3f.YN.rotationDegrees(integer2 * 45.0f));
+                dhl.translate(float9 * 0.0f, float9 * 0.0f, float9 * 0.04f);
+                dhl.scale(1.0f, 1.0f, 1.0f + float9 * 0.2f);
+                dhl.mulPose(Vector3f.YN.rotationDegrees(integer2 * 45.0f));
             }
             else {
                 final float float8 = -0.4f * Mth.sin(Mth.sqrt(float5) * 3.1415927f);
                 final float float9 = 0.2f * Mth.sin(Mth.sqrt(float5) * 6.2831855f);
                 final float float10 = -0.2f * Mth.sin(float5 * 3.1415927f);
-                cyl.translate(integer2 * float8, float9, float10);
-                this.applyItemArmTransform(cyl, aky13, float7);
-                this.applyItemArmAttackTransform(cyl, aky13, float5);
+                dhl.translate(integer2 * float8, float9, float10);
+                this.applyItemArmTransform(dhl, aou13, float7);
+                this.applyItemArmAttackTransform(dhl, aou13, float5);
                 if (boolean13 && float5 < 0.001f) {
-                    cyl.translate(integer2 * -0.641864f, 0.0, 0.0);
-                    cyl.mulPose(Vector3f.YP.rotationDegrees(integer2 * 10.0f));
+                    dhl.translate(integer2 * -0.641864f, 0.0, 0.0);
+                    dhl.mulPose(Vector3f.YP.rotationDegrees(integer2 * 10.0f));
                 }
             }
-            this.renderItem(dpy, ben, boolean14 ? ItemTransforms.TransformType.FIRST_PERSON_RIGHT_HAND : ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND, !boolean14, cyl, dqt, integer);
+            this.renderItem(ebc, bki, boolean14 ? ItemTransforms.TransformType.FIRST_PERSON_RIGHT_HAND : ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND, !boolean14, dhl, ebz, integer);
         }
         else {
-            final boolean boolean13 = aky13 == HumanoidArm.RIGHT;
-            if (dpy.isUsingItem() && dpy.getUseItemRemainingTicks() > 0 && dpy.getUsedItemHand() == ajk) {
+            final boolean boolean13 = aou13 == HumanoidArm.RIGHT;
+            if (ebc.isUsingItem() && ebc.getUseItemRemainingTicks() > 0 && ebc.getUsedItemHand() == anf) {
                 final int integer3 = boolean13 ? 1 : -1;
-                switch (ben.getUseAnimation()) {
+                switch (bki.getUseAnimation()) {
                     case NONE: {
-                        this.applyItemArmTransform(cyl, aky13, float7);
+                        this.applyItemArmTransform(dhl, aou13, float7);
                         break;
                     }
                     case EAT:
                     case DRINK: {
-                        this.applyEatTransform(cyl, float2, aky13, ben);
-                        this.applyItemArmTransform(cyl, aky13, float7);
+                        this.applyEatTransform(dhl, float2, aou13, bki);
+                        this.applyItemArmTransform(dhl, aou13, float7);
                         break;
                     }
                     case BLOCK: {
-                        this.applyItemArmTransform(cyl, aky13, float7);
+                        this.applyItemArmTransform(dhl, aou13, float7);
                         break;
                     }
                     case BOW: {
-                        this.applyItemArmTransform(cyl, aky13, float7);
-                        cyl.translate(integer3 * -0.2785682f, 0.18344387412071228, 0.15731531381607056);
-                        cyl.mulPose(Vector3f.XP.rotationDegrees(-13.935f));
-                        cyl.mulPose(Vector3f.YP.rotationDegrees(integer3 * 35.3f));
-                        cyl.mulPose(Vector3f.ZP.rotationDegrees(integer3 * -9.785f));
-                        final float float13 = ben.getUseDuration() - (this.minecraft.player.getUseItemRemainingTicks() - float2 + 1.0f);
+                        this.applyItemArmTransform(dhl, aou13, float7);
+                        dhl.translate(integer3 * -0.2785682f, 0.18344387412071228, 0.15731531381607056);
+                        dhl.mulPose(Vector3f.XP.rotationDegrees(-13.935f));
+                        dhl.mulPose(Vector3f.YP.rotationDegrees(integer3 * 35.3f));
+                        dhl.mulPose(Vector3f.ZP.rotationDegrees(integer3 * -9.785f));
+                        final float float13 = bki.getUseDuration() - (this.minecraft.player.getUseItemRemainingTicks() - float2 + 1.0f);
                         float float8 = float13 / 20.0f;
                         float8 = (float8 * float8 + float8 * 2.0f) / 3.0f;
                         if (float8 > 1.0f) {
@@ -339,20 +338,20 @@ public class ItemInHandRenderer {
                             final float float9 = Mth.sin((float13 - 0.1f) * 1.3f);
                             final float float10 = float8 - 0.1f;
                             final float float11 = float9 * float10;
-                            cyl.translate(float11 * 0.0f, float11 * 0.004f, float11 * 0.0f);
+                            dhl.translate(float11 * 0.0f, float11 * 0.004f, float11 * 0.0f);
                         }
-                        cyl.translate(float8 * 0.0f, float8 * 0.0f, float8 * 0.04f);
-                        cyl.scale(1.0f, 1.0f, 1.0f + float8 * 0.2f);
-                        cyl.mulPose(Vector3f.YN.rotationDegrees(integer3 * 45.0f));
+                        dhl.translate(float8 * 0.0f, float8 * 0.0f, float8 * 0.04f);
+                        dhl.scale(1.0f, 1.0f, 1.0f + float8 * 0.2f);
+                        dhl.mulPose(Vector3f.YN.rotationDegrees(integer3 * 45.0f));
                         break;
                     }
                     case SPEAR: {
-                        this.applyItemArmTransform(cyl, aky13, float7);
-                        cyl.translate(integer3 * -0.5f, 0.699999988079071, 0.10000000149011612);
-                        cyl.mulPose(Vector3f.XP.rotationDegrees(-55.0f));
-                        cyl.mulPose(Vector3f.YP.rotationDegrees(integer3 * 35.3f));
-                        cyl.mulPose(Vector3f.ZP.rotationDegrees(integer3 * -9.785f));
-                        final float float13 = ben.getUseDuration() - (this.minecraft.player.getUseItemRemainingTicks() - float2 + 1.0f);
+                        this.applyItemArmTransform(dhl, aou13, float7);
+                        dhl.translate(integer3 * -0.5f, 0.699999988079071, 0.10000000149011612);
+                        dhl.mulPose(Vector3f.XP.rotationDegrees(-55.0f));
+                        dhl.mulPose(Vector3f.YP.rotationDegrees(integer3 * 35.3f));
+                        dhl.mulPose(Vector3f.ZP.rotationDegrees(integer3 * -9.785f));
+                        final float float13 = bki.getUseDuration() - (this.minecraft.player.getUseItemRemainingTicks() - float2 + 1.0f);
                         float float8 = float13 / 10.0f;
                         if (float8 > 1.0f) {
                             float8 = 1.0f;
@@ -361,61 +360,67 @@ public class ItemInHandRenderer {
                             final float float9 = Mth.sin((float13 - 0.1f) * 1.3f);
                             final float float10 = float8 - 0.1f;
                             final float float11 = float9 * float10;
-                            cyl.translate(float11 * 0.0f, float11 * 0.004f, float11 * 0.0f);
+                            dhl.translate(float11 * 0.0f, float11 * 0.004f, float11 * 0.0f);
                         }
-                        cyl.translate(0.0, 0.0, float8 * 0.2f);
-                        cyl.scale(1.0f, 1.0f, 1.0f + float8 * 0.2f);
-                        cyl.mulPose(Vector3f.YN.rotationDegrees(integer3 * 45.0f));
+                        dhl.translate(0.0, 0.0, float8 * 0.2f);
+                        dhl.scale(1.0f, 1.0f, 1.0f + float8 * 0.2f);
+                        dhl.mulPose(Vector3f.YN.rotationDegrees(integer3 * 45.0f));
                         break;
                     }
                 }
             }
-            else if (dpy.isAutoSpinAttack()) {
-                this.applyItemArmTransform(cyl, aky13, float7);
+            else if (ebc.isAutoSpinAttack()) {
+                this.applyItemArmTransform(dhl, aou13, float7);
                 final int integer3 = boolean13 ? 1 : -1;
-                cyl.translate(integer3 * -0.4f, 0.800000011920929, 0.30000001192092896);
-                cyl.mulPose(Vector3f.YP.rotationDegrees(integer3 * 65.0f));
-                cyl.mulPose(Vector3f.ZP.rotationDegrees(integer3 * -85.0f));
+                dhl.translate(integer3 * -0.4f, 0.800000011920929, 0.30000001192092896);
+                dhl.mulPose(Vector3f.YP.rotationDegrees(integer3 * 65.0f));
+                dhl.mulPose(Vector3f.ZP.rotationDegrees(integer3 * -85.0f));
             }
             else {
                 final float float14 = -0.4f * Mth.sin(Mth.sqrt(float5) * 3.1415927f);
                 final float float13 = 0.2f * Mth.sin(Mth.sqrt(float5) * 6.2831855f);
                 final float float8 = -0.2f * Mth.sin(float5 * 3.1415927f);
                 final int integer4 = boolean13 ? 1 : -1;
-                cyl.translate(integer4 * float14, float13, float8);
-                this.applyItemArmTransform(cyl, aky13, float7);
-                this.applyItemArmAttackTransform(cyl, aky13, float5);
+                dhl.translate(integer4 * float14, float13, float8);
+                this.applyItemArmTransform(dhl, aou13, float7);
+                this.applyItemArmAttackTransform(dhl, aou13, float5);
             }
-            this.renderItem(dpy, ben, boolean13 ? ItemTransforms.TransformType.FIRST_PERSON_RIGHT_HAND : ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND, !boolean13, cyl, dqt, integer);
+            this.renderItem(ebc, bki, boolean13 ? ItemTransforms.TransformType.FIRST_PERSON_RIGHT_HAND : ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND, !boolean13, dhl, ebz, integer);
         }
-        cyl.popPose();
+        dhl.popPose();
     }
     
     public void tick() {
         this.oMainHandHeight = this.mainHandHeight;
         this.oOffHandHeight = this.offHandHeight;
-        final LocalPlayer dqb2 = this.minecraft.player;
-        final ItemStack ben3 = dqb2.getMainHandItem();
-        final ItemStack ben4 = dqb2.getOffhandItem();
-        if (dqb2.isHandsBusy()) {
+        final LocalPlayer ebf2 = this.minecraft.player;
+        final ItemStack bki3 = ebf2.getMainHandItem();
+        final ItemStack bki4 = ebf2.getOffhandItem();
+        if (ItemStack.matches(this.mainHandItem, bki3)) {
+            this.mainHandItem = bki3;
+        }
+        if (ItemStack.matches(this.offHandItem, bki4)) {
+            this.offHandItem = bki4;
+        }
+        if (ebf2.isHandsBusy()) {
             this.mainHandHeight = Mth.clamp(this.mainHandHeight - 0.4f, 0.0f, 1.0f);
             this.offHandHeight = Mth.clamp(this.offHandHeight - 0.4f, 0.0f, 1.0f);
         }
         else {
-            final float float5 = dqb2.getAttackStrengthScale(1.0f);
-            this.mainHandHeight += Mth.clamp((Objects.equals(this.mainHandItem, ben3) ? (float5 * float5 * float5) : 0.0f) - this.mainHandHeight, -0.4f, 0.4f);
-            this.offHandHeight += Mth.clamp((float)(Objects.equals(this.offHandItem, ben4) ? 1 : 0) - this.offHandHeight, -0.4f, 0.4f);
+            final float float5 = ebf2.getAttackStrengthScale(1.0f);
+            this.mainHandHeight += Mth.clamp(((this.mainHandItem == bki3) ? (float5 * float5 * float5) : 0.0f) - this.mainHandHeight, -0.4f, 0.4f);
+            this.offHandHeight += Mth.clamp((float)((this.offHandItem == bki4) ? 1 : 0) - this.offHandHeight, -0.4f, 0.4f);
         }
         if (this.mainHandHeight < 0.1f) {
-            this.mainHandItem = ben3;
+            this.mainHandItem = bki3;
         }
         if (this.offHandHeight < 0.1f) {
-            this.offHandItem = ben4;
+            this.offHandItem = bki4;
         }
     }
     
-    public void itemUsed(final InteractionHand ajk) {
-        if (ajk == InteractionHand.MAIN_HAND) {
+    public void itemUsed(final InteractionHand anf) {
+        if (anf == InteractionHand.MAIN_HAND) {
             this.mainHandHeight = 0.0f;
         }
         else {
diff --git a/src/net/minecraft/client/renderer/ItemModelShaper.java b/src/net/minecraft/client/renderer/ItemModelShaper.java
index 80250d8..41d0f7f 100644
--- a/src/net/minecraft/client/renderer/ItemModelShaper.java
+++ b/src/net/minecraft/client/renderer/ItemModelShaper.java
@@ -19,40 +19,40 @@ public class ItemModelShaper {
     private final Int2ObjectMap<BakedModel> shapesCache;
     private final ModelManager modelManager;
     
-    public ItemModelShaper(final ModelManager eca) {
+    public ItemModelShaper(final ModelManager enm) {
         this.shapes = (Int2ObjectMap<ModelResourceLocation>)new Int2ObjectOpenHashMap(256);
         this.shapesCache = (Int2ObjectMap<BakedModel>)new Int2ObjectOpenHashMap(256);
-        this.modelManager = eca;
+        this.modelManager = enm;
     }
     
-    public TextureAtlasSprite getParticleIcon(final ItemLike bjv) {
-        return this.getParticleIcon(new ItemStack(bjv));
+    public TextureAtlasSprite getParticleIcon(final ItemLike bqa) {
+        return this.getParticleIcon(new ItemStack(bqa));
     }
     
-    public TextureAtlasSprite getParticleIcon(final ItemStack ben) {
-        final BakedModel ebv3 = this.getItemModel(ben);
-        if (ebv3 == this.modelManager.getMissingModel() && ben.getItem() instanceof BlockItem) {
-            return this.modelManager.getBlockModelShaper().getParticleIcon(((BlockItem)ben.getItem()).getBlock().defaultBlockState());
+    public TextureAtlasSprite getParticleIcon(final ItemStack bki) {
+        final BakedModel enh3 = this.getItemModel(bki);
+        if (enh3 == this.modelManager.getMissingModel() && bki.getItem() instanceof BlockItem) {
+            return this.modelManager.getBlockModelShaper().getParticleIcon(((BlockItem)bki.getItem()).getBlock().defaultBlockState());
         }
-        return ebv3.getParticleIcon();
+        return enh3.getParticleIcon();
     }
     
-    public BakedModel getItemModel(final ItemStack ben) {
-        final BakedModel ebv3 = this.getItemModel(ben.getItem());
-        return (ebv3 == null) ? this.modelManager.getMissingModel() : ebv3;
+    public BakedModel getItemModel(final ItemStack bki) {
+        final BakedModel enh3 = this.getItemModel(bki.getItem());
+        return (enh3 == null) ? this.modelManager.getMissingModel() : enh3;
     }
     
     @Nullable
-    public BakedModel getItemModel(final Item bei) {
-        return (BakedModel)this.shapesCache.get(getIndex(bei));
+    public BakedModel getItemModel(final Item bke) {
+        return (BakedModel)this.shapesCache.get(getIndex(bke));
     }
     
-    private static int getIndex(final Item bei) {
-        return Item.getId(bei);
+    private static int getIndex(final Item bke) {
+        return Item.getId(bke);
     }
     
-    public void register(final Item bei, final ModelResourceLocation ecb) {
-        this.shapes.put(getIndex(bei), ecb);
+    public void register(final Item bke, final ModelResourceLocation enn) {
+        this.shapes.put(getIndex(bke), enn);
     }
     
     public ModelManager getModelManager() {
diff --git a/src/net/minecraft/client/renderer/LevelRenderer.java b/src/net/minecraft/client/renderer/LevelRenderer.java
index fcab0a2..54c606e 100644
--- a/src/net/minecraft/client/renderer/LevelRenderer.java
+++ b/src/net/minecraft/client/renderer/LevelRenderer.java
@@ -17,10 +17,10 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.ReportedException;
 import net.minecraft.CrashReportCategory;
-import net.minecraft.core.particles.ParticleType;
 import net.minecraft.core.Registry;
 import net.minecraft.CrashReport;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.RecordItem;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.phys.shapes.Shapes;
@@ -28,14 +28,15 @@ import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.level.border.WorldBorder;
 import com.mojang.blaze3d.vertex.BufferUploader;
-import net.minecraft.world.level.dimension.DimensionType;
+import com.mojang.math.Vector3f;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import java.util.Iterator;
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import com.mojang.blaze3d.vertex.VertexMultiConsumer;
-import com.mojang.blaze3d.vertex.BreakingTextureGenerator;
+import com.mojang.blaze3d.vertex.SheetedDecalTextureGenerator;
 import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.player.LocalPlayer;
@@ -45,10 +46,6 @@ import net.minecraft.client.Option;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
-import java.util.Iterator;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.client.renderer.chunk.VisGraph;
-import com.mojang.math.Vector3f;
 import java.util.List;
 import java.util.Queue;
 import java.util.Collection;
@@ -60,20 +57,23 @@ import it.unimi.dsi.fastutil.objects.ObjectListIterator;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.Util;
 import com.mojang.blaze3d.platform.GlStateManager;
+import net.minecraft.client.Options;
+import net.minecraft.client.GraphicsStatus;
 import com.google.gson.JsonSyntaxException;
 import java.io.IOException;
 import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.CampfireBlock;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.client.ParticleStatus;
@@ -122,7 +122,7 @@ import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
 
-public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListener {
+public class LevelRenderer implements ResourceManagerReloadListener, AutoCloseable {
     private static final Logger LOGGER;
     private static final ResourceLocation MOON_LOCATION;
     private static final ResourceLocation SUN_LOCATION;
@@ -151,13 +151,27 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
     private boolean generateClouds;
     @Nullable
     private VertexBuffer cloudBuffer;
-    private RunningTrimmedMean frameTimes;
+    private final RunningTrimmedMean frameTimes;
     private int ticks;
     private final Int2ObjectMap<BlockDestructionProgress> destroyingBlocks;
     private final Long2ObjectMap<SortedSet<BlockDestructionProgress>> destructionProgress;
     private final Map<BlockPos, SoundInstance> playingRecords;
+    @Nullable
     private RenderTarget entityTarget;
+    @Nullable
     private PostChain entityEffect;
+    @Nullable
+    private RenderTarget translucentTarget;
+    @Nullable
+    private RenderTarget itemEntityTarget;
+    @Nullable
+    private RenderTarget particlesTarget;
+    @Nullable
+    private RenderTarget weatherTarget;
+    @Nullable
+    private RenderTarget cloudsTarget;
+    @Nullable
+    private PostChain transparencyChain;
     private double lastCameraX;
     private double lastCameraY;
     private double lastCameraZ;
@@ -193,7 +207,7 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
     private final float[] rainSizeX;
     private final float[] rainSizeZ;
     
-    public LevelRenderer(final Minecraft dbn, final RenderBuffers dqz) {
+    public LevelRenderer(final Minecraft dlx, final RenderBuffers ecf) {
         this.chunksToCompile = Sets.newLinkedHashSet();
         this.renderChunks = (ObjectList<RenderChunkInfo>)new ObjectArrayList(69696);
         this.globalBlockEntities = Sets.newHashSet();
@@ -225,10 +239,10 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         this.needsUpdate = true;
         this.rainSizeX = new float[1024];
         this.rainSizeZ = new float[1024];
-        this.minecraft = dbn;
-        this.entityRenderDispatcher = dbn.getEntityRenderDispatcher();
-        this.renderBuffers = dqz;
-        this.textureManager = dbn.getTextureManager();
+        this.minecraft = dlx;
+        this.entityRenderDispatcher = dlx.getEntityRenderDispatcher();
+        this.renderBuffers = ecf;
+        this.textureManager = dlx.getTextureManager();
         for (int integer4 = 0; integer4 < 32; ++integer4) {
             for (int integer5 = 0; integer5 < 32; ++integer5) {
                 final float float6 = (float)(integer5 - 16);
@@ -243,27 +257,30 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         this.createDarkSky();
     }
     
-    private void renderSnowAndRain(final LightTexture dqs, final float float2, final double double3, final double double4, final double double5) {
+    private void renderSnowAndRain(final LightTexture eby, final float float2, final double double3, final double double4, final double double5) {
         final float float3 = this.minecraft.level.getRainLevel(float2);
         if (float3 <= 0.0f) {
             return;
         }
-        dqs.turnOnLightLayer();
-        final Level bjw11 = this.minecraft.level;
+        eby.turnOnLightLayer();
+        final Level bqb11 = this.minecraft.level;
         final int integer12 = Mth.floor(double3);
         final int integer13 = Mth.floor(double4);
         final int integer14 = Mth.floor(double5);
-        final Tesselator cym15 = Tesselator.getInstance();
-        final BufferBuilder cyg16 = cym15.getBuilder();
+        final Tesselator dhn15 = Tesselator.getInstance();
+        final BufferBuilder dhg16 = dhn15.getBuilder();
+        RenderSystem.enableAlphaTest();
         RenderSystem.disableCull();
         RenderSystem.normal3f(0.0f, 1.0f, 0.0f);
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.defaultAlphaFunc();
+        RenderSystem.enableDepthTest();
         int integer15 = 5;
-        if (this.minecraft.options.fancyGraphics) {
+        if (Minecraft.useFancyGraphics()) {
             integer15 = 10;
         }
+        RenderSystem.depthMask(Minecraft.useShaderTransparency());
         int integer16 = -1;
         final float float4 = this.ticks + float2;
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
@@ -274,9 +291,9 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                 final double double6 = this.rainSizeX[integer19] * 0.5;
                 final double double7 = this.rainSizeZ[integer19] * 0.5;
                 a20.set(integer18, 0, integer17);
-                final Biome bkt28 = bjw11.getBiome(a20);
-                if (bkt28.getPrecipitation() != Biome.Precipitation.NONE) {
-                    final int integer20 = bjw11.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, a20).getY();
+                final Biome bre28 = bqb11.getBiome(a20);
+                if (bre28.getPrecipitation() != Biome.Precipitation.NONE) {
+                    final int integer20 = bqb11.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, a20).getY();
                     int integer21 = integer13 - integer15;
                     int integer22 = integer13 + integer15;
                     if (integer21 < integer20) {
@@ -292,15 +309,15 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                     if (integer21 != integer22) {
                         final Random random33 = new Random(integer18 * integer18 * 3121 + integer18 * 45238971 ^ integer17 * integer17 * 418711 + integer17 * 13761);
                         a20.set(integer18, integer21, integer17);
-                        final float float5 = bkt28.getTemperature(a20);
+                        final float float5 = bre28.getTemperature(a20);
                         if (float5 >= 0.15f) {
                             if (integer16 != 0) {
                                 if (integer16 >= 0) {
-                                    cym15.end();
+                                    dhn15.end();
                                 }
                                 integer16 = 0;
                                 this.minecraft.getTextureManager().bind(LevelRenderer.RAIN_LOCATION);
-                                cyg16.begin(7, DefaultVertexFormat.PARTICLE);
+                                dhg16.begin(7, DefaultVertexFormat.PARTICLE);
                             }
                             final int integer24 = this.ticks + integer18 * integer18 * 3121 + integer18 * 45238971 + integer17 * integer17 * 418711 + integer17 * 13761 & 0x1F;
                             final float float6 = -(integer24 + float2) / 32.0f * (3.0f + random33.nextFloat());
@@ -309,20 +326,20 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                             final float float7 = Mth.sqrt(double8 * double8 + double9 * double9) / integer15;
                             final float float8 = ((1.0f - float7 * float7) * 0.5f + 0.5f) * float3;
                             a20.set(integer18, integer23, integer17);
-                            final int integer25 = getLightColor(bjw11, a20);
-                            cyg16.vertex(integer18 - double3 - double6 + 0.5, integer22 - double4, integer17 - double5 - double7 + 0.5).uv(0.0f, integer21 * 0.25f + float6).color(1.0f, 1.0f, 1.0f, float8).uv2(integer25).endVertex();
-                            cyg16.vertex(integer18 - double3 + double6 + 0.5, integer22 - double4, integer17 - double5 + double7 + 0.5).uv(1.0f, integer21 * 0.25f + float6).color(1.0f, 1.0f, 1.0f, float8).uv2(integer25).endVertex();
-                            cyg16.vertex(integer18 - double3 + double6 + 0.5, integer21 - double4, integer17 - double5 + double7 + 0.5).uv(1.0f, integer22 * 0.25f + float6).color(1.0f, 1.0f, 1.0f, float8).uv2(integer25).endVertex();
-                            cyg16.vertex(integer18 - double3 - double6 + 0.5, integer21 - double4, integer17 - double5 - double7 + 0.5).uv(0.0f, integer22 * 0.25f + float6).color(1.0f, 1.0f, 1.0f, float8).uv2(integer25).endVertex();
+                            final int integer25 = getLightColor(bqb11, a20);
+                            dhg16.vertex(integer18 - double3 - double6 + 0.5, integer22 - double4, integer17 - double5 - double7 + 0.5).uv(0.0f, integer21 * 0.25f + float6).color(1.0f, 1.0f, 1.0f, float8).uv2(integer25).endVertex();
+                            dhg16.vertex(integer18 - double3 + double6 + 0.5, integer22 - double4, integer17 - double5 + double7 + 0.5).uv(1.0f, integer21 * 0.25f + float6).color(1.0f, 1.0f, 1.0f, float8).uv2(integer25).endVertex();
+                            dhg16.vertex(integer18 - double3 + double6 + 0.5, integer21 - double4, integer17 - double5 + double7 + 0.5).uv(1.0f, integer22 * 0.25f + float6).color(1.0f, 1.0f, 1.0f, float8).uv2(integer25).endVertex();
+                            dhg16.vertex(integer18 - double3 - double6 + 0.5, integer21 - double4, integer17 - double5 - double7 + 0.5).uv(0.0f, integer22 * 0.25f + float6).color(1.0f, 1.0f, 1.0f, float8).uv2(integer25).endVertex();
                         }
                         else {
                             if (integer16 != 1) {
                                 if (integer16 >= 0) {
-                                    cym15.end();
+                                    dhn15.end();
                                 }
                                 integer16 = 1;
                                 this.minecraft.getTextureManager().bind(LevelRenderer.SNOW_LOCATION);
-                                cyg16.begin(7, DefaultVertexFormat.PARTICLE);
+                                dhg16.begin(7, DefaultVertexFormat.PARTICLE);
                             }
                             final float float9 = -((this.ticks & 0x1FF) + float2) / 512.0f;
                             final float float6 = (float)(random33.nextDouble() + float4 * 0.01 * (float)random33.nextGaussian());
@@ -332,96 +349,68 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                             final float float8 = Mth.sqrt(double10 * double10 + double11 * double11) / integer15;
                             final float float11 = ((1.0f - float8 * float8) * 0.3f + 0.5f) * float3;
                             a20.set(integer18, integer23, integer17);
-                            final int integer26 = getLightColor(bjw11, a20);
+                            final int integer26 = getLightColor(bqb11, a20);
                             final int integer27 = integer26 >> 16 & 0xFFFF;
                             final int integer28 = (integer26 & 0xFFFF) * 3;
                             final int integer29 = (integer27 * 3 + 240) / 4;
                             final int integer30 = (integer28 * 3 + 240) / 4;
-                            cyg16.vertex(integer18 - double3 - double6 + 0.5, integer22 - double4, integer17 - double5 - double7 + 0.5).uv(0.0f + float6, integer21 * 0.25f + float9 + float10).color(1.0f, 1.0f, 1.0f, float11).uv2(integer30, integer29).endVertex();
-                            cyg16.vertex(integer18 - double3 + double6 + 0.5, integer22 - double4, integer17 - double5 + double7 + 0.5).uv(1.0f + float6, integer21 * 0.25f + float9 + float10).color(1.0f, 1.0f, 1.0f, float11).uv2(integer30, integer29).endVertex();
-                            cyg16.vertex(integer18 - double3 + double6 + 0.5, integer21 - double4, integer17 - double5 + double7 + 0.5).uv(1.0f + float6, integer22 * 0.25f + float9 + float10).color(1.0f, 1.0f, 1.0f, float11).uv2(integer30, integer29).endVertex();
-                            cyg16.vertex(integer18 - double3 - double6 + 0.5, integer21 - double4, integer17 - double5 - double7 + 0.5).uv(0.0f + float6, integer22 * 0.25f + float9 + float10).color(1.0f, 1.0f, 1.0f, float11).uv2(integer30, integer29).endVertex();
+                            dhg16.vertex(integer18 - double3 - double6 + 0.5, integer22 - double4, integer17 - double5 - double7 + 0.5).uv(0.0f + float6, integer21 * 0.25f + float9 + float10).color(1.0f, 1.0f, 1.0f, float11).uv2(integer30, integer29).endVertex();
+                            dhg16.vertex(integer18 - double3 + double6 + 0.5, integer22 - double4, integer17 - double5 + double7 + 0.5).uv(1.0f + float6, integer21 * 0.25f + float9 + float10).color(1.0f, 1.0f, 1.0f, float11).uv2(integer30, integer29).endVertex();
+                            dhg16.vertex(integer18 - double3 + double6 + 0.5, integer21 - double4, integer17 - double5 + double7 + 0.5).uv(1.0f + float6, integer22 * 0.25f + float9 + float10).color(1.0f, 1.0f, 1.0f, float11).uv2(integer30, integer29).endVertex();
+                            dhg16.vertex(integer18 - double3 - double6 + 0.5, integer21 - double4, integer17 - double5 - double7 + 0.5).uv(0.0f + float6, integer22 * 0.25f + float9 + float10).color(1.0f, 1.0f, 1.0f, float11).uv2(integer30, integer29).endVertex();
                         }
                     }
                 }
             }
         }
         if (integer16 >= 0) {
-            cym15.end();
+            dhn15.end();
         }
         RenderSystem.enableCull();
         RenderSystem.disableBlend();
         RenderSystem.defaultAlphaFunc();
-        dqs.turnOffLightLayer();
+        RenderSystem.disableAlphaTest();
+        eby.turnOffLightLayer();
     }
     
-    public void tickRain(final Camera dbb) {
-        float float3 = this.minecraft.level.getRainLevel(1.0f);
-        if (!this.minecraft.options.fancyGraphics) {
-            float3 /= 2.0f;
-        }
-        if (float3 == 0.0f) {
+    public void tickRain(final Camera dlj) {
+        final float float3 = this.minecraft.level.getRainLevel(1.0f) / (Minecraft.useFancyGraphics() ? 1.0f : 2.0f);
+        if (float3 <= 0.0f) {
             return;
         }
         final Random random4 = new Random(this.ticks * 312987231L);
-        final LevelReader bjz5 = this.minecraft.level;
-        final BlockPos fk6 = new BlockPos(dbb.getPosition());
-        final int integer7 = 10;
-        double double8 = 0.0;
-        double double9 = 0.0;
-        double double10 = 0.0;
-        int integer8 = 0;
-        int integer9 = (int)(100.0f * float3 * float3);
-        if (this.minecraft.options.particles == ParticleStatus.DECREASED) {
-            integer9 >>= 1;
-        }
-        else if (this.minecraft.options.particles == ParticleStatus.MINIMAL) {
-            integer9 = 0;
-        }
-        for (int integer10 = 0; integer10 < integer9; ++integer10) {
-            final BlockPos fk7 = bjz5.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, fk6.offset(random4.nextInt(10) - random4.nextInt(10), 0, random4.nextInt(10) - random4.nextInt(10)));
-            final Biome bkt18 = bjz5.getBiome(fk7);
-            final BlockPos fk8 = fk7.below();
-            if (fk7.getY() <= fk6.getY() + 10 && fk7.getY() >= fk6.getY() - 10 && bkt18.getPrecipitation() == Biome.Precipitation.RAIN && bkt18.getTemperature(fk7) >= 0.15f) {
-                final double double11 = random4.nextDouble();
-                final double double12 = random4.nextDouble();
-                final BlockState byj24 = bjz5.getBlockState(fk8);
-                final FluidState coj25 = bjz5.getFluidState(fk7);
-                final VoxelShape cwf26 = byj24.getCollisionShape(bjz5, fk8);
-                final double double13 = cwf26.max(Direction.Axis.Y, double11, double12);
-                final double double14 = coj25.getHeight(bjz5, fk7);
-                double double15;
-                double double16;
-                if (double13 >= double14) {
-                    double15 = double13;
-                    double16 = cwf26.min(Direction.Axis.Y, double11, double12);
-                }
-                else {
-                    double15 = 0.0;
-                    double16 = 0.0;
-                }
-                if (double15 > -1.7976931348623157E308) {
-                    if (coj25.is(FluidTags.LAVA) || byj24.getBlock() == Blocks.MAGMA_BLOCK || (byj24.getBlock() == Blocks.CAMPFIRE && byj24.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT))) {
-                        this.minecraft.level.addParticle(ParticleTypes.SMOKE, fk7.getX() + double11, fk7.getY() + 0.1f - double16, fk7.getZ() + double12, 0.0, 0.0, 0.0);
-                    }
-                    else {
-                        if (random4.nextInt(++integer8) == 0) {
-                            double8 = fk8.getX() + double11;
-                            double9 = fk8.getY() + 0.1f + double15 - 1.0;
-                            double10 = fk8.getZ() + double12;
-                        }
-                        this.minecraft.level.addParticle(ParticleTypes.RAIN, fk8.getX() + double11, fk8.getY() + 0.1f + double15, fk8.getZ() + double12, 0.0, 0.0, 0.0);
-                    }
+        final LevelReader bqd5 = this.minecraft.level;
+        final BlockPos fu6 = new BlockPos(dlj.getPosition());
+        BlockPos fu7 = null;
+        for (int integer8 = (int)(100.0f * float3 * float3) / ((this.minecraft.options.particles == ParticleStatus.DECREASED) ? 2 : 1), integer9 = 0; integer9 < integer8; ++integer9) {
+            final int integer10 = random4.nextInt(21) - 10;
+            final int integer11 = random4.nextInt(21) - 10;
+            final BlockPos fu8 = bqd5.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, fu6.offset(integer10, 0, integer11)).below();
+            final Biome bre13 = bqd5.getBiome(fu8);
+            if (fu8.getY() > 0 && fu8.getY() <= fu6.getY() + 10 && fu8.getY() >= fu6.getY() - 10 && bre13.getPrecipitation() == Biome.Precipitation.RAIN && bre13.getTemperature(fu8) >= 0.15f) {
+                fu7 = fu8;
+                if (this.minecraft.options.particles == ParticleStatus.MINIMAL) {
+                    break;
                 }
+                final double double14 = random4.nextDouble();
+                final double double15 = random4.nextDouble();
+                final BlockState cfj18 = bqd5.getBlockState(fu7);
+                final FluidState cxa19 = bqd5.getFluidState(fu7);
+                final VoxelShape dfg20 = cfj18.getCollisionShape(bqd5, fu7);
+                final double double16 = dfg20.max(Direction.Axis.Y, double14, double15);
+                final double double17 = cxa19.getHeight(bqd5, fu7);
+                final double double18 = Math.max(double16, double17);
+                final ParticleOptions hf27 = (cxa19.is(FluidTags.LAVA) || cfj18.is(Blocks.MAGMA_BLOCK) || CampfireBlock.isLitCampfire(cfj18)) ? ParticleTypes.SMOKE : ParticleTypes.RAIN;
+                this.minecraft.level.addParticle(hf27, fu7.getX() + double14, fu7.getY() + double18, fu7.getZ() + double15, 0.0, 0.0, 0.0);
             }
         }
-        if (integer8 > 0 && random4.nextInt(3) < this.rainSoundTime++) {
+        if (fu7 != null && random4.nextInt(3) < this.rainSoundTime++) {
             this.rainSoundTime = 0;
-            if (double9 > fk6.getY() + 1 && bjz5.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, fk6).getY() > Mth.floor((float)fk6.getY())) {
-                this.minecraft.level.playLocalSound(double8, double9, double10, SoundEvents.WEATHER_RAIN_ABOVE, SoundSource.WEATHER, 0.1f, 0.5f, false);
+            if (fu7.getY() > fu6.getY() + 1 && bqd5.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, fu6).getY() > Mth.floor((float)fu6.getY())) {
+                this.minecraft.level.playLocalSound(fu7, SoundEvents.WEATHER_RAIN_ABOVE, SoundSource.WEATHER, 0.1f, 0.5f, false);
             }
             else {
-                this.minecraft.level.playLocalSound(double8, double9, double10, SoundEvents.WEATHER_RAIN, SoundSource.WEATHER, 0.2f, 1.0f, false);
+                this.minecraft.level.playLocalSound(fu7, SoundEvents.WEATHER_RAIN, SoundSource.WEATHER, 0.2f, 1.0f, false);
             }
         }
     }
@@ -431,38 +420,88 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         if (this.entityEffect != null) {
             this.entityEffect.close();
         }
+        if (this.transparencyChain != null) {
+            this.transparencyChain.close();
+        }
     }
     
     @Override
-    public void onResourceManagerReload(final ResourceManager zb) {
+    public void onResourceManagerReload(final ResourceManager abc) {
         this.textureManager.bind(LevelRenderer.FORCEFIELD_LOCATION);
         RenderSystem.texParameter(3553, 10242, 10497);
         RenderSystem.texParameter(3553, 10243, 10497);
         RenderSystem.bindTexture(0);
         this.initOutline();
+        if (Minecraft.useShaderTransparency()) {
+            this.initTransparency();
+        }
     }
     
     public void initOutline() {
         if (this.entityEffect != null) {
             this.entityEffect.close();
         }
-        final ResourceLocation sm2 = new ResourceLocation("shaders/post/entity_outline.json");
+        final ResourceLocation uh2 = new ResourceLocation("shaders/post/entity_outline.json");
         try {
-            (this.entityEffect = new PostChain(this.minecraft.getTextureManager(), this.minecraft.getResourceManager(), this.minecraft.getMainRenderTarget(), sm2)).resize(this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight());
+            (this.entityEffect = new PostChain(this.minecraft.getTextureManager(), this.minecraft.getResourceManager(), this.minecraft.getMainRenderTarget(), uh2)).resize(this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight());
             this.entityTarget = this.entityEffect.getTempTarget("final");
         }
         catch (IOException iOException3) {
-            LevelRenderer.LOGGER.warn("Failed to load shader: {}", sm2, iOException3);
+            LevelRenderer.LOGGER.warn("Failed to load shader: {}", uh2, iOException3);
             this.entityEffect = null;
             this.entityTarget = null;
         }
         catch (JsonSyntaxException jsonSyntaxException3) {
-            LevelRenderer.LOGGER.warn("Failed to load shader: {}", sm2, jsonSyntaxException3);
+            LevelRenderer.LOGGER.warn("Failed to parse shader: {}", uh2, jsonSyntaxException3);
             this.entityEffect = null;
             this.entityTarget = null;
         }
     }
     
+    private void initTransparency() {
+        this.deinitTransparency();
+        final ResourceLocation uh2 = new ResourceLocation("shaders/post/transparency.json");
+        try {
+            final PostChain ecc3 = new PostChain(this.minecraft.getTextureManager(), this.minecraft.getResourceManager(), this.minecraft.getMainRenderTarget(), uh2);
+            ecc3.resize(this.minecraft.getWindow().getWidth(), this.minecraft.getWindow().getHeight());
+            final RenderTarget dgf4 = ecc3.getTempTarget("translucent");
+            final RenderTarget dgf5 = ecc3.getTempTarget("itemEntity");
+            final RenderTarget dgf6 = ecc3.getTempTarget("particles");
+            final RenderTarget dgf7 = ecc3.getTempTarget("weather");
+            final RenderTarget dgf8 = ecc3.getTempTarget("clouds");
+            this.transparencyChain = ecc3;
+            this.translucentTarget = dgf4;
+            this.itemEntityTarget = dgf5;
+            this.particlesTarget = dgf6;
+            this.weatherTarget = dgf7;
+            this.cloudsTarget = dgf8;
+        }
+        catch (Exception exception3) {
+            final String string4 = (exception3 instanceof JsonSyntaxException) ? "parse" : "load";
+            final Options dmb5 = Minecraft.getInstance().options;
+            dmb5.graphicsMode = GraphicsStatus.FANCY;
+            dmb5.save();
+            throw new TranparencyShaderException("Failed to " + string4 + " shader: " + uh2, exception3);
+        }
+    }
+    
+    private void deinitTransparency() {
+        if (this.transparencyChain != null) {
+            this.transparencyChain.close();
+            this.translucentTarget.destroyBuffers();
+            this.itemEntityTarget.destroyBuffers();
+            this.particlesTarget.destroyBuffers();
+            this.weatherTarget.destroyBuffers();
+            this.cloudsTarget.destroyBuffers();
+            this.transparencyChain = null;
+            this.translucentTarget = null;
+            this.itemEntityTarget = null;
+            this.particlesTarget = null;
+            this.weatherTarget = null;
+            this.cloudsTarget = null;
+        }
+    }
+    
     public void doEntityOutline() {
         if (this.shouldShowEntityOutlines()) {
             RenderSystem.enableBlend();
@@ -477,33 +516,33 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
     }
     
     private void createDarkSky() {
-        final Tesselator cym2 = Tesselator.getInstance();
-        final BufferBuilder cyg3 = cym2.getBuilder();
+        final Tesselator dhn2 = Tesselator.getInstance();
+        final BufferBuilder dhg3 = dhn2.getBuilder();
         if (this.darkBuffer != null) {
             this.darkBuffer.close();
         }
         this.darkBuffer = new VertexBuffer(this.skyFormat);
-        this.drawSkyHemisphere(cyg3, -16.0f, true);
-        cyg3.end();
-        this.darkBuffer.upload(cyg3);
+        this.drawSkyHemisphere(dhg3, -16.0f, true);
+        dhg3.end();
+        this.darkBuffer.upload(dhg3);
     }
     
     private void createLightSky() {
-        final Tesselator cym2 = Tesselator.getInstance();
-        final BufferBuilder cyg3 = cym2.getBuilder();
+        final Tesselator dhn2 = Tesselator.getInstance();
+        final BufferBuilder dhg3 = dhn2.getBuilder();
         if (this.skyBuffer != null) {
             this.skyBuffer.close();
         }
         this.skyBuffer = new VertexBuffer(this.skyFormat);
-        this.drawSkyHemisphere(cyg3, 16.0f, false);
-        cyg3.end();
-        this.skyBuffer.upload(cyg3);
+        this.drawSkyHemisphere(dhg3, 16.0f, false);
+        dhg3.end();
+        this.skyBuffer.upload(dhg3);
     }
     
-    private void drawSkyHemisphere(final BufferBuilder cyg, final float float2, final boolean boolean3) {
+    private void drawSkyHemisphere(final BufferBuilder dhg, final float float2, final boolean boolean3) {
         final int integer5 = 64;
         final int integer6 = 6;
-        cyg.begin(7, DefaultVertexFormat.POSITION);
+        dhg.begin(7, DefaultVertexFormat.POSITION);
         for (int integer7 = -384; integer7 <= 384; integer7 += 64) {
             for (int integer8 = -384; integer8 <= 384; integer8 += 64) {
                 float float3 = (float)integer7;
@@ -512,29 +551,29 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                     float4 = (float)integer7;
                     float3 = (float)(integer7 + 64);
                 }
-                cyg.vertex(float3, float2, integer8).endVertex();
-                cyg.vertex(float4, float2, integer8).endVertex();
-                cyg.vertex(float4, float2, integer8 + 64).endVertex();
-                cyg.vertex(float3, float2, integer8 + 64).endVertex();
+                dhg.vertex(float3, float2, integer8).endVertex();
+                dhg.vertex(float4, float2, integer8).endVertex();
+                dhg.vertex(float4, float2, integer8 + 64).endVertex();
+                dhg.vertex(float3, float2, integer8 + 64).endVertex();
             }
         }
     }
     
     private void createStars() {
-        final Tesselator cym2 = Tesselator.getInstance();
-        final BufferBuilder cyg3 = cym2.getBuilder();
+        final Tesselator dhn2 = Tesselator.getInstance();
+        final BufferBuilder dhg3 = dhn2.getBuilder();
         if (this.starBuffer != null) {
             this.starBuffer.close();
         }
         this.starBuffer = new VertexBuffer(this.skyFormat);
-        this.drawStars(cyg3);
-        cyg3.end();
-        this.starBuffer.upload(cyg3);
+        this.drawStars(dhg3);
+        dhg3.end();
+        this.starBuffer.upload(dhg3);
     }
     
-    private void drawStars(final BufferBuilder cyg) {
+    private void drawStars(final BufferBuilder dhg) {
         final Random random3 = new Random(10842L);
-        cyg.begin(7, DefaultVertexFormat.POSITION);
+        dhg.begin(7, DefaultVertexFormat.POSITION);
         for (int integer4 = 0; integer4 < 1500; ++integer4) {
             double double5 = random3.nextFloat() * 2.0f - 1.0f;
             double double6 = random3.nextFloat() * 2.0f - 1.0f;
@@ -571,22 +610,22 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                     final double double31 = double30 * double14 - double28 * double15;
                     final double double32 = double29;
                     final double double33 = double28 * double14 + double30 * double15;
-                    cyg.vertex(double10 + double31, double11 + double32, double12 + double33).endVertex();
+                    dhg.vertex(double10 + double31, double11 + double32, double12 + double33).endVertex();
                 }
             }
         }
     }
     
-    public void setLevel(@Nullable final ClientLevel dno) {
+    public void setLevel(@Nullable final ClientLevel dym) {
         this.lastCameraX = Double.MIN_VALUE;
         this.lastCameraY = Double.MIN_VALUE;
         this.lastCameraZ = Double.MIN_VALUE;
         this.lastCameraChunkX = Integer.MIN_VALUE;
         this.lastCameraChunkY = Integer.MIN_VALUE;
         this.lastCameraChunkZ = Integer.MIN_VALUE;
-        this.entityRenderDispatcher.setLevel(dno);
-        this.level = dno;
-        if (dno != null) {
+        this.entityRenderDispatcher.setLevel(dym);
+        this.level = dym;
+        if (dym != null) {
             this.allChanged();
         }
         else {
@@ -608,6 +647,12 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         if (this.level == null) {
             return;
         }
+        if (Minecraft.useShaderTransparency()) {
+            this.initTransparency();
+        }
+        else {
+            this.deinitTransparency();
+        }
         this.level.clearTintCaches();
         if (this.chunkRenderDispatcher == null) {
             this.chunkRenderDispatcher = new ChunkRenderDispatcher(this.level, this, Util.backgroundExecutor(), this.minecraft.is64Bit(), this.renderBuffers.fixedBufferPack());
@@ -617,7 +662,7 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         }
         this.needsUpdate = true;
         this.generateClouds = true;
-        ItemBlockRenderTypes.setFancy(this.minecraft.options.fancyGraphics);
+        ItemBlockRenderTypes.setFancy(Minecraft.useFancyGraphics());
         this.lastViewDistance = this.minecraft.options.renderDistance;
         if (this.viewArea != null) {
             this.viewArea.releaseAllBuffers();
@@ -628,9 +673,9 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         }
         this.viewArea = new ViewArea(this.chunkRenderDispatcher, this.level, this.minecraft.options.renderDistance, this);
         if (this.level != null) {
-            final Entity akq2 = this.minecraft.getCameraEntity();
-            if (akq2 != null) {
-                this.viewArea.repositionCamera(akq2.getX(), akq2.getZ());
+            final Entity aom2 = this.minecraft.getCameraEntity();
+            if (aom2 != null) {
+                this.viewArea.repositionCamera(aom2.getX(), aom2.getZ());
             }
         }
     }
@@ -645,6 +690,9 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         if (this.entityEffect != null) {
             this.entityEffect.resize(integer1, integer2);
         }
+        if (this.transparencyChain != null) {
+            this.transparencyChain.resize(integer1, integer2);
+        }
     }
     
     public String getChunkStatistics() {
@@ -667,8 +715,8 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         return "E: " + this.renderedEntities + "/" + this.level.getEntityCount() + ", B: " + this.culledEntities;
     }
     
-    private void setupRender(final Camera dbb, final Frustum dtm, final boolean boolean3, final int integer, final boolean boolean5) {
-        final Vec3 cvl7 = dbb.getPosition();
+    private void setupRender(final Camera dlj, final Frustum ees, final boolean boolean3, final int integer, final boolean boolean5) {
+        final Vec3 dem7 = dlj.getPosition();
         if (this.minecraft.options.renderDistance != this.lastViewDistance) {
             this.allChanged();
         }
@@ -685,19 +733,19 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
             this.lastCameraChunkZ = this.minecraft.player.zChunk;
             this.viewArea.repositionCamera(this.minecraft.player.getX(), this.minecraft.player.getZ());
         }
-        this.chunkRenderDispatcher.setCamera(cvl7);
+        this.chunkRenderDispatcher.setCamera(dem7);
         this.level.getProfiler().popPush("cull");
         this.minecraft.getProfiler().popPush("culling");
-        final BlockPos fk14 = dbb.getBlockPosition();
-        final ChunkRenderDispatcher.RenderChunk c15 = this.viewArea.getRenderChunkAt(fk14);
+        final BlockPos fu14 = dlj.getBlockPosition();
+        final ChunkRenderDispatcher.RenderChunk c15 = this.viewArea.getRenderChunkAt(fu14);
         final int integer2 = 16;
-        final BlockPos fk15 = new BlockPos(Mth.floor(cvl7.x / 16.0) * 16, Mth.floor(cvl7.y / 16.0) * 16, Mth.floor(cvl7.z / 16.0) * 16);
-        final float float18 = dbb.getXRot();
-        final float float19 = dbb.getYRot();
-        this.needsUpdate = (this.needsUpdate || !this.chunksToCompile.isEmpty() || cvl7.x != this.prevCamX || cvl7.y != this.prevCamY || cvl7.z != this.prevCamZ || float18 != this.prevCamRotX || float19 != this.prevCamRotY);
-        this.prevCamX = cvl7.x;
-        this.prevCamY = cvl7.y;
-        this.prevCamZ = cvl7.z;
+        final BlockPos fu15 = new BlockPos(Mth.floor(dem7.x / 16.0) * 16, Mth.floor(dem7.y / 16.0) * 16, Mth.floor(dem7.z / 16.0) * 16);
+        final float float18 = dlj.getXRot();
+        final float float19 = dlj.getYRot();
+        this.needsUpdate = (this.needsUpdate || !this.chunksToCompile.isEmpty() || dem7.x != this.prevCamX || dem7.y != this.prevCamY || dem7.z != this.prevCamZ || float18 != this.prevCamRotX || float19 != this.prevCamRotY);
+        this.prevCamX = dem7.x;
+        this.prevCamY = dem7.y;
+        this.prevCamZ = dem7.z;
         this.prevCamRotX = float18;
         this.prevCamRotY = float19;
         this.minecraft.getProfiler().popPush("update");
@@ -705,65 +753,49 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
             this.needsUpdate = false;
             this.renderChunks.clear();
             final Queue<RenderChunkInfo> queue20 = Queues.newArrayDeque();
-            Entity.setViewScale(Mth.clamp(this.minecraft.options.renderDistance / 8.0, 1.0, 2.5));
+            Entity.setViewScale(Mth.clamp(this.minecraft.options.renderDistance / 8.0, 1.0, 2.5) * this.minecraft.options.entityDistanceScaling);
             boolean boolean6 = this.minecraft.smartCull;
             if (c15 == null) {
-                final int integer3 = (fk14.getY() > 0) ? 248 : 8;
-                final int integer4 = Mth.floor(cvl7.x / 16.0) * 16;
-                final int integer5 = Mth.floor(cvl7.z / 16.0) * 16;
+                final int integer3 = (fu14.getY() > 0) ? 248 : 8;
+                final int integer4 = Mth.floor(dem7.x / 16.0) * 16;
+                final int integer5 = Mth.floor(dem7.z / 16.0) * 16;
                 final List<RenderChunkInfo> list25 = Lists.newArrayList();
                 for (int integer6 = -this.lastViewDistance; integer6 <= this.lastViewDistance; ++integer6) {
                     for (int integer7 = -this.lastViewDistance; integer7 <= this.lastViewDistance; ++integer7) {
                         final ChunkRenderDispatcher.RenderChunk c16 = this.viewArea.getRenderChunkAt(new BlockPos(integer4 + (integer6 << 4) + 8, integer3, integer5 + (integer7 << 4) + 8));
-                        if (c16 != null && dtm.isVisible(c16.bb)) {
+                        if (c16 != null && ees.isVisible(c16.bb)) {
                             c16.setFrame(integer);
                             list25.add(new RenderChunkInfo(c16, (Direction)null, 0));
                         }
                     }
                 }
-                list25.sort(Comparator.comparingDouble(a -> fk14.distSqr(a.chunk.getOrigin().offset(8, 8, 8))));
+                list25.sort(Comparator.comparingDouble(a -> fu14.distSqr(a.chunk.getOrigin().offset(8, 8, 8))));
                 queue20.addAll(list25);
             }
             else {
-                boolean boolean7 = false;
-                final RenderChunkInfo a2 = new RenderChunkInfo(c15, (Direction)null, 0);
-                final Set<Direction> set24 = this.getVisibleDirections(fk14);
-                if (set24.size() == 1) {
-                    final Vector3f e25 = dbb.getLookVector();
-                    final Direction fp26 = Direction.getNearest(e25.x(), e25.y(), e25.z()).getOpposite();
-                    set24.remove(fp26);
-                }
-                if (set24.isEmpty()) {
-                    boolean7 = true;
-                }
-                if (!boolean7 || boolean5) {
-                    if (boolean5 && this.level.getBlockState(fk14).isSolidRender(this.level, fk14)) {
-                        boolean6 = false;
-                    }
-                    c15.setFrame(integer);
-                    queue20.add(a2);
-                }
-                else {
-                    this.renderChunks.add(a2);
+                if (boolean5 && this.level.getBlockState(fu14).isSolidRender(this.level, fu14)) {
+                    boolean6 = false;
                 }
+                c15.setFrame(integer);
+                queue20.add(new RenderChunkInfo(c15, (Direction)null, 0));
             }
             this.minecraft.getProfiler().push("iteration");
             while (!queue20.isEmpty()) {
-                final RenderChunkInfo a3 = queue20.poll();
-                final ChunkRenderDispatcher.RenderChunk c17 = a3.chunk;
-                final Direction fp27 = a3.sourceDirection;
-                this.renderChunks.add(a3);
-                for (final Direction fp28 : LevelRenderer.DIRECTIONS) {
-                    final ChunkRenderDispatcher.RenderChunk c18 = this.getRelativeFrom(fk15, c17, fp28);
-                    if (!boolean6 || !a3.hasDirection(fp28.getOpposite())) {
-                        if (!boolean6 || fp27 == null || c17.getCompiledChunk().facesCanSeeEachother(fp27.getOpposite(), fp28)) {
+                final RenderChunkInfo a2 = queue20.poll();
+                final ChunkRenderDispatcher.RenderChunk c17 = a2.chunk;
+                final Direction fz24 = a2.sourceDirection;
+                this.renderChunks.add(a2);
+                for (final Direction fz25 : LevelRenderer.DIRECTIONS) {
+                    final ChunkRenderDispatcher.RenderChunk c18 = this.getRelativeFrom(fu15, c17, fz25);
+                    if (!boolean6 || !a2.hasDirection(fz25.getOpposite())) {
+                        if (!boolean6 || fz24 == null || c17.getCompiledChunk().facesCanSeeEachother(fz24.getOpposite(), fz25)) {
                             if (c18 != null) {
                                 if (c18.hasAllNeighbors()) {
                                     if (c18.setFrame(integer)) {
-                                        if (dtm.isVisible(c18.bb)) {
-                                            final RenderChunkInfo a4 = new RenderChunkInfo(c18, fp28, a3.step + 1);
-                                            a4.setDirections(a3.directions, fp28);
-                                            queue20.add(a4);
+                                        if (ees.isVisible(c18.bb)) {
+                                            final RenderChunkInfo a3 = new RenderChunkInfo(c18, fz25, a2.step + 1);
+                                            a3.setDirections(a2.directions, fz25);
+                                            queue20.add(a3);
                                         }
                                     }
                                 }
@@ -775,17 +807,17 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
             this.minecraft.getProfiler().pop();
         }
         this.minecraft.getProfiler().popPush("rebuildNear");
-        final Set<ChunkRenderDispatcher.RenderChunk> set25 = this.chunksToCompile;
+        final Set<ChunkRenderDispatcher.RenderChunk> set20 = this.chunksToCompile;
         this.chunksToCompile = Sets.newLinkedHashSet();
         final ObjectListIterator iterator = this.renderChunks.iterator();
         while (((Iterator)iterator).hasNext()) {
-            final RenderChunkInfo a3 = ((Iterator<RenderChunkInfo>)iterator).next();
-            final ChunkRenderDispatcher.RenderChunk c17 = a3.chunk;
-            if (c17.isDirty() || set25.contains(c17)) {
+            final RenderChunkInfo a2 = ((Iterator<RenderChunkInfo>)iterator).next();
+            final ChunkRenderDispatcher.RenderChunk c17 = a2.chunk;
+            if (c17.isDirty() || set20.contains(c17)) {
                 this.needsUpdate = true;
-                final BlockPos fk16 = c17.getOrigin().offset(8, 8, 8);
-                final boolean boolean8 = fk16.distSqr(fk14) < 768.0;
-                if (c17.isDirtyFromPlayer() || boolean8) {
+                final BlockPos fu16 = c17.getOrigin().offset(8, 8, 8);
+                final boolean boolean7 = fu16.distSqr(fu14) < 768.0;
+                if (c17.isDirtyFromPlayer() || boolean7) {
                     this.minecraft.getProfiler().push("build near");
                     this.chunkRenderDispatcher.rebuildChunkSync(c17);
                     c17.setNotDirty();
@@ -796,39 +828,27 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                 }
             }
         }
-        this.chunksToCompile.addAll(set25);
+        this.chunksToCompile.addAll(set20);
         this.minecraft.getProfiler().pop();
     }
     
-    private Set<Direction> getVisibleDirections(final BlockPos fk) {
-        final VisGraph dtj3 = new VisGraph();
-        final BlockPos fk2 = new BlockPos(fk.getX() >> 4 << 4, fk.getY() >> 4 << 4, fk.getZ() >> 4 << 4);
-        final LevelChunk cal5 = this.level.getChunkAt(fk2);
-        for (final BlockPos fk3 : BlockPos.betweenClosed(fk2, fk2.offset(15, 15, 15))) {
-            if (cal5.getBlockState(fk3).isSolidRender(this.level, fk3)) {
-                dtj3.setOpaque(fk3);
-            }
-        }
-        return dtj3.floodFill(fk);
-    }
-    
     @Nullable
-    private ChunkRenderDispatcher.RenderChunk getRelativeFrom(final BlockPos fk, final ChunkRenderDispatcher.RenderChunk c, final Direction fp) {
-        final BlockPos fk2 = c.getRelativeOrigin(fp);
-        if (Mth.abs(fk.getX() - fk2.getX()) > this.lastViewDistance * 16) {
+    private ChunkRenderDispatcher.RenderChunk getRelativeFrom(final BlockPos fu, final ChunkRenderDispatcher.RenderChunk c, final Direction fz) {
+        final BlockPos fu2 = c.getRelativeOrigin(fz);
+        if (Mth.abs(fu.getX() - fu2.getX()) > this.lastViewDistance * 16) {
             return null;
         }
-        if (fk2.getY() < 0 || fk2.getY() >= 256) {
+        if (fu2.getY() < 0 || fu2.getY() >= 256) {
             return null;
         }
-        if (Mth.abs(fk.getZ() - fk2.getZ()) > this.lastViewDistance * 16) {
+        if (Mth.abs(fu.getZ() - fu2.getZ()) > this.lastViewDistance * 16) {
             return null;
         }
-        return this.viewArea.getRenderChunkAt(fk2);
+        return this.viewArea.getRenderChunkAt(fu2);
     }
     
-    private void captureFrustum(final Matrix4f b1, final Matrix4f b2, final double double3, final double double4, final double double5, final Frustum dtm) {
-        this.capturedFrustum = dtm;
+    private void captureFrustum(final Matrix4f b1, final Matrix4f b2, final double double3, final double double4, final double double5, final Frustum ees) {
+        this.capturedFrustum = ees;
         final Matrix4f b3 = b2.copy();
         b3.multiply(b1);
         b3.invert();
@@ -849,48 +869,48 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         }
     }
     
-    public void renderLevel(final PoseStack cyl, final float float2, final long long3, final boolean boolean4, final Camera dbb, final GameRenderer dqn, final LightTexture dqs, final Matrix4f b) {
-        BlockEntityRenderDispatcher.instance.prepare(this.level, this.minecraft.getTextureManager(), this.minecraft.font, dbb, this.minecraft.hitResult);
-        this.entityRenderDispatcher.prepare(this.level, dbb, this.minecraft.crosshairPickEntity);
-        final ProfilerFiller aio11 = this.level.getProfiler();
-        aio11.popPush("light_updates");
+    public void renderLevel(final PoseStack dhl, final float float2, final long long3, final boolean boolean4, final Camera dlj, final GameRenderer ebs, final LightTexture eby, final Matrix4f b) {
+        BlockEntityRenderDispatcher.instance.prepare(this.level, this.minecraft.getTextureManager(), this.minecraft.font, dlj, this.minecraft.hitResult);
+        this.entityRenderDispatcher.prepare(this.level, dlj, this.minecraft.crosshairPickEntity);
+        final ProfilerFiller ami11 = this.level.getProfiler();
+        ami11.popPush("light_updates");
         this.minecraft.level.getChunkSource().getLightEngine().runUpdates(Integer.MAX_VALUE, true, true);
-        final Vec3 cvl12 = dbb.getPosition();
-        final double double13 = cvl12.x();
-        final double double14 = cvl12.y();
-        final double double15 = cvl12.z();
-        final Matrix4f b2 = cyl.last().pose();
-        aio11.popPush("culling");
+        final Vec3 dem12 = dlj.getPosition();
+        final double double13 = dem12.x();
+        final double double14 = dem12.y();
+        final double double15 = dem12.z();
+        final Matrix4f b2 = dhl.last().pose();
+        ami11.popPush("culling");
         final boolean boolean5 = this.capturedFrustum != null;
-        Frustum dtm21;
+        Frustum ees21;
         if (boolean5) {
-            dtm21 = this.capturedFrustum;
-            dtm21.prepare(this.frustumPos.x, this.frustumPos.y, this.frustumPos.z);
+            ees21 = this.capturedFrustum;
+            ees21.prepare(this.frustumPos.x, this.frustumPos.y, this.frustumPos.z);
         }
         else {
-            dtm21 = new Frustum(b2, b);
-            dtm21.prepare(double13, double14, double15);
+            ees21 = new Frustum(b2, b);
+            ees21.prepare(double13, double14, double15);
         }
         this.minecraft.getProfiler().popPush("captureFrustum");
         if (this.captureFrustum) {
-            this.captureFrustum(b2, b, cvl12.x, cvl12.y, cvl12.z, boolean5 ? new Frustum(b2, b) : dtm21);
+            this.captureFrustum(b2, b, dem12.x, dem12.y, dem12.z, boolean5 ? new Frustum(b2, b) : ees21);
             this.captureFrustum = false;
         }
-        aio11.popPush("clear");
-        FogRenderer.setupColor(dbb, float2, this.minecraft.level, this.minecraft.options.renderDistance, dqn.getDarkenWorldAmount(float2));
+        ami11.popPush("clear");
+        FogRenderer.setupColor(dlj, float2, this.minecraft.level, this.minecraft.options.renderDistance, ebs.getDarkenWorldAmount(float2));
         RenderSystem.clear(16640, Minecraft.ON_OSX);
-        final float float3 = dqn.getRenderDistance();
-        final boolean boolean6 = this.minecraft.level.dimension.isFoggyAt(Mth.floor(double13), Mth.floor(double14)) || this.minecraft.gui.getBossOverlay().shouldCreateWorldFog();
+        final float float3 = ebs.getRenderDistance();
+        final boolean boolean6 = this.minecraft.level.effects().isFoggyAt(Mth.floor(double13), Mth.floor(double14)) || this.minecraft.gui.getBossOverlay().shouldCreateWorldFog();
         if (this.minecraft.options.renderDistance >= 4) {
-            FogRenderer.setupFog(dbb, FogRenderer.FogMode.FOG_SKY, float3, boolean6);
-            aio11.popPush("sky");
-            this.renderSky(cyl, float2);
+            FogRenderer.setupFog(dlj, FogRenderer.FogMode.FOG_SKY, float3, boolean6);
+            ami11.popPush("sky");
+            this.renderSky(dhl, float2);
         }
-        aio11.popPush("fog");
-        FogRenderer.setupFog(dbb, FogRenderer.FogMode.FOG_TERRAIN, Math.max(float3 - 16.0f, 32.0f), boolean6);
-        aio11.popPush("terrain_setup");
-        this.setupRender(dbb, dtm21, boolean5, this.frameId++, this.minecraft.player.isSpectator());
-        aio11.popPush("updatechunks");
+        ami11.popPush("fog");
+        FogRenderer.setupFog(dlj, FogRenderer.FogMode.FOG_TERRAIN, Math.max(float3 - 16.0f, 32.0f), boolean6);
+        ami11.popPush("terrain_setup");
+        this.setupRender(dlj, ees21, boolean5, this.frameId++, this.minecraft.player.isSpectator());
+        ami11.popPush("updatechunks");
         final int integer24 = 30;
         final int integer25 = this.minecraft.options.framerateLimit;
         final long long4 = 33333333L;
@@ -906,108 +926,122 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         final long long8 = long7 * 3L / 2L;
         final long long9 = Mth.clamp(long8, long5, 33333333L);
         this.compileChunksUntil(long3 + long9);
-        aio11.popPush("terrain");
-        this.renderChunkLayer(RenderType.solid(), cyl, double13, double14, double15);
-        this.renderChunkLayer(RenderType.cutoutMipped(), cyl, double13, double14, double15);
-        this.renderChunkLayer(RenderType.cutout(), cyl, double13, double14, double15);
-        Lighting.setupLevel(cyl.last().pose());
-        aio11.popPush("entities");
-        aio11.push("prepare");
+        ami11.popPush("terrain");
+        this.renderChunkLayer(RenderType.solid(), dhl, double13, double14, double15);
+        this.renderChunkLayer(RenderType.cutoutMipped(), dhl, double13, double14, double15);
+        this.renderChunkLayer(RenderType.cutout(), dhl, double13, double14, double15);
+        if (this.level.effects().constantAmbientLight()) {
+            Lighting.setupNetherLevel(dhl.last().pose());
+        }
+        else {
+            Lighting.setupLevel(dhl.last().pose());
+        }
+        ami11.popPush("entities");
+        ami11.push("prepare");
         this.renderedEntities = 0;
         this.culledEntities = 0;
-        aio11.popPush("entities");
+        ami11.popPush("entities");
+        if (this.itemEntityTarget != null) {
+            this.itemEntityTarget.clear(Minecraft.ON_OSX);
+            this.itemEntityTarget.copyDepthFrom(this.minecraft.getMainRenderTarget());
+            this.minecraft.getMainRenderTarget().bindWrite(false);
+        }
+        if (this.weatherTarget != null) {
+            this.weatherTarget.clear(Minecraft.ON_OSX);
+        }
         if (this.shouldShowEntityOutlines()) {
             this.entityTarget.clear(Minecraft.ON_OSX);
             this.minecraft.getMainRenderTarget().bindWrite(false);
         }
         boolean boolean7 = false;
         final MultiBufferSource.BufferSource a39 = this.renderBuffers.bufferSource();
-        for (final Entity akq41 : this.level.entitiesForRendering()) {
-            if (!this.entityRenderDispatcher.<Entity>shouldRender(akq41, dtm21, double13, double14, double15) && !akq41.hasIndirectPassenger(this.minecraft.player)) {
+        for (final Entity aom41 : this.level.entitiesForRendering()) {
+            if (!this.entityRenderDispatcher.<Entity>shouldRender(aom41, ees21, double13, double14, double15) && !aom41.hasIndirectPassenger(this.minecraft.player)) {
                 continue;
             }
-            if (akq41 == dbb.getEntity() && !dbb.isDetached()) {
-                if (!(dbb.getEntity() instanceof LivingEntity)) {
+            if (aom41 == dlj.getEntity() && !dlj.isDetached()) {
+                if (!(dlj.getEntity() instanceof LivingEntity)) {
                     continue;
                 }
-                if (!((LivingEntity)dbb.getEntity()).isSleeping()) {
+                if (!((LivingEntity)dlj.getEntity()).isSleeping()) {
                     continue;
                 }
             }
-            if (akq41 instanceof LocalPlayer && dbb.getEntity() != akq41) {
+            if (aom41 instanceof LocalPlayer && dlj.getEntity() != aom41) {
                 continue;
             }
             ++this.renderedEntities;
-            if (akq41.tickCount == 0) {
-                akq41.xOld = akq41.getX();
-                akq41.yOld = akq41.getY();
-                akq41.zOld = akq41.getZ();
+            if (aom41.tickCount == 0) {
+                aom41.xOld = aom41.getX();
+                aom41.yOld = aom41.getY();
+                aom41.zOld = aom41.getZ();
             }
-            MultiBufferSource dqt42;
-            if (this.shouldShowEntityOutlines() && akq41.isGlowing()) {
+            MultiBufferSource ebz42;
+            if (this.shouldShowEntityOutlines() && this.minecraft.shouldEntityAppearGlowing(aom41)) {
                 boolean7 = true;
-                final OutlineBufferSource dqu43 = (OutlineBufferSource)(dqt42 = this.renderBuffers.outlineBufferSource());
-                final int integer26 = akq41.getTeamColor();
+                final OutlineBufferSource eca43 = (OutlineBufferSource)(ebz42 = this.renderBuffers.outlineBufferSource());
+                final int integer26 = aom41.getTeamColor();
                 final int integer27 = 255;
                 final int integer28 = integer26 >> 16 & 0xFF;
                 final int integer29 = integer26 >> 8 & 0xFF;
                 final int integer30 = integer26 & 0xFF;
-                dqu43.setColor(integer28, integer29, integer30, 255);
+                eca43.setColor(integer28, integer29, integer30, 255);
             }
             else {
-                dqt42 = a39;
+                ebz42 = a39;
             }
-            this.renderEntity(akq41, double13, double14, double15, float2, cyl, dqt42);
+            this.renderEntity(aom41, double13, double14, double15, float2, dhl, ebz42);
         }
-        this.checkPoseStack(cyl);
+        this.checkPoseStack(dhl);
         a39.endBatch(RenderType.entitySolid(TextureAtlas.LOCATION_BLOCKS));
         a39.endBatch(RenderType.entityCutout(TextureAtlas.LOCATION_BLOCKS));
         a39.endBatch(RenderType.entityCutoutNoCull(TextureAtlas.LOCATION_BLOCKS));
         a39.endBatch(RenderType.entitySmoothCutout(TextureAtlas.LOCATION_BLOCKS));
-        aio11.popPush("blockentities");
+        ami11.popPush("blockentities");
         for (final RenderChunkInfo a40 : this.renderChunks) {
             final List<BlockEntity> list42 = a40.chunk.getCompiledChunk().getRenderableBlockEntities();
             if (list42.isEmpty()) {
                 continue;
             }
-            for (final BlockEntity bwl44 : list42) {
-                final BlockPos fk45 = bwl44.getBlockPos();
-                MultiBufferSource dqt43 = a39;
-                cyl.pushPose();
-                cyl.translate(fk45.getX() - double13, fk45.getY() - double14, fk45.getZ() - double15);
-                final SortedSet<BlockDestructionProgress> sortedSet47 = (SortedSet<BlockDestructionProgress>)this.destructionProgress.get(fk45.asLong());
+            for (final BlockEntity cdl44 : list42) {
+                final BlockPos fu45 = cdl44.getBlockPos();
+                MultiBufferSource ebz43 = a39;
+                dhl.pushPose();
+                dhl.translate(fu45.getX() - double13, fu45.getY() - double14, fu45.getZ() - double15);
+                final SortedSet<BlockDestructionProgress> sortedSet47 = (SortedSet<BlockDestructionProgress>)this.destructionProgress.get(fu45.asLong());
                 if (sortedSet47 != null && !sortedSet47.isEmpty()) {
                     final int integer30 = sortedSet47.last().getProgress();
                     if (integer30 >= 0) {
-                        final VertexConsumer cyo49 = new BreakingTextureGenerator(this.renderBuffers.crumblingBufferSource().getBuffer(ModelBakery.DESTROY_TYPES.get(integer30)), cyl.last());
+                        final PoseStack.Pose a41 = dhl.last();
+                        final VertexConsumer dhp50 = new SheetedDecalTextureGenerator(this.renderBuffers.crumblingBufferSource().getBuffer(ModelBakery.DESTROY_TYPES.get(integer30)), a41.pose(), a41.normal());
                         final MultiBufferSource.BufferSource bufferSource;
-                        final VertexConsumer cyo50;
-                        final VertexConsumer cyo53;
-                        dqt43 = (drb -> {
-                            cyo50 = bufferSource.getBuffer(drb);
-                            if (drb.affectsCrumbling()) {
-                                return VertexMultiConsumer.create(cyo53, cyo50);
+                        final VertexConsumer dhp51;
+                        final VertexConsumer dhp54;
+                        ebz43 = (ech -> {
+                            dhp51 = bufferSource.getBuffer(ech);
+                            if (ech.affectsCrumbling()) {
+                                return VertexMultiConsumer.create(dhp54, dhp51);
                             }
                             else {
-                                return cyo50;
+                                return dhp51;
                             }
                         });
                     }
                 }
-                BlockEntityRenderDispatcher.instance.<BlockEntity>render(bwl44, float2, cyl, dqt43);
-                cyl.popPose();
+                BlockEntityRenderDispatcher.instance.<BlockEntity>render(cdl44, float2, dhl, ebz43);
+                dhl.popPose();
             }
         }
         synchronized (this.globalBlockEntities) {
-            for (final BlockEntity bwl45 : this.globalBlockEntities) {
-                final BlockPos fk46 = bwl45.getBlockPos();
-                cyl.pushPose();
-                cyl.translate(fk46.getX() - double13, fk46.getY() - double14, fk46.getZ() - double15);
-                BlockEntityRenderDispatcher.instance.<BlockEntity>render(bwl45, float2, cyl, a39);
-                cyl.popPose();
+            for (final BlockEntity cdl45 : this.globalBlockEntities) {
+                final BlockPos fu46 = cdl45.getBlockPos();
+                dhl.pushPose();
+                dhl.translate(fu46.getX() - double13, fu46.getY() - double14, fu46.getZ() - double15);
+                BlockEntityRenderDispatcher.instance.<BlockEntity>render(cdl45, float2, dhl, a39);
+                dhl.popPose();
             }
         }
-        this.checkPoseStack(cyl);
+        this.checkPoseStack(dhl);
         a39.endBatch(RenderType.solid());
         a39.endBatch(Sheets.solidBlockSheet());
         a39.endBatch(Sheets.cutoutBlockSheet());
@@ -1020,12 +1054,12 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
             this.entityEffect.process(float2);
             this.minecraft.getMainRenderTarget().bindWrite(false);
         }
-        aio11.popPush("destroyProgress");
+        ami11.popPush("destroyProgress");
         for (final Long2ObjectMap.Entry<SortedSet<BlockDestructionProgress>> entry41 : this.destructionProgress.long2ObjectEntrySet()) {
-            final BlockPos fk47 = BlockPos.of(entry41.getLongKey());
-            final double double16 = fk47.getX() - double13;
-            final double double17 = fk47.getY() - double14;
-            final double double18 = fk47.getZ() - double15;
+            final BlockPos fu47 = BlockPos.of(entry41.getLongKey());
+            final double double16 = fu47.getX() - double13;
+            final double double17 = fu47.getY() - double14;
+            final double double18 = fu47.getZ() - double15;
             if (double16 * double16 + double17 * double17 + double18 * double18 > 1024.0) {
                 continue;
             }
@@ -1037,54 +1071,94 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                 continue;
             }
             final int integer31 = sortedSet48.last().getProgress();
-            cyl.pushPose();
-            cyl.translate(fk47.getX() - double13, fk47.getY() - double14, fk47.getZ() - double15);
-            final VertexConsumer cyo51 = new BreakingTextureGenerator(this.renderBuffers.crumblingBufferSource().getBuffer(ModelBakery.DESTROY_TYPES.get(integer31)), cyl.last());
-            this.minecraft.getBlockRenderer().renderBreakingTexture(this.level.getBlockState(fk47), fk47, this.level, cyl, cyo51);
-            cyl.popPose();
+            dhl.pushPose();
+            dhl.translate(fu47.getX() - double13, fu47.getY() - double14, fu47.getZ() - double15);
+            final PoseStack.Pose a42 = dhl.last();
+            final VertexConsumer dhp52 = new SheetedDecalTextureGenerator(this.renderBuffers.crumblingBufferSource().getBuffer(ModelBakery.DESTROY_TYPES.get(integer31)), a42.pose(), a42.normal());
+            this.minecraft.getBlockRenderer().renderBreakingTexture(this.level.getBlockState(fu47), fu47, this.level, dhl, dhp52);
+            dhl.popPose();
         }
-        this.checkPoseStack(cyl);
-        aio11.pop();
-        final HitResult cvi40 = this.minecraft.hitResult;
-        if (boolean4 && cvi40 != null && cvi40.getType() == HitResult.Type.BLOCK) {
-            aio11.popPush("outline");
-            final BlockPos fk48 = ((BlockHitResult)cvi40).getBlockPos();
-            final BlockState byj42 = this.level.getBlockState(fk48);
-            if (!byj42.isAir() && this.level.getWorldBorder().isWithinBounds(fk48)) {
-                final VertexConsumer cyo52 = a39.getBuffer(RenderType.lines());
-                this.renderHitOutline(cyl, cyo52, dbb.getEntity(), double13, double14, double15, fk48, byj42);
+        this.checkPoseStack(dhl);
+        ami11.pop();
+        final HitResult dej40 = this.minecraft.hitResult;
+        if (boolean4 && dej40 != null && dej40.getType() == HitResult.Type.BLOCK) {
+            ami11.popPush("outline");
+            final BlockPos fu48 = ((BlockHitResult)dej40).getBlockPos();
+            final BlockState cfj42 = this.level.getBlockState(fu48);
+            if (!cfj42.isAir() && this.level.getWorldBorder().isWithinBounds(fu48)) {
+                final VertexConsumer dhp53 = a39.getBuffer(RenderType.lines());
+                this.renderHitOutline(dhl, dhp53, dlj.getEntity(), double13, double14, double15, fu48, cfj42);
             }
         }
         RenderSystem.pushMatrix();
-        RenderSystem.multMatrix(cyl.last().pose());
-        this.minecraft.debugRenderer.render(cyl, a39, double13, double14, double15);
-        this.renderWorldBounds(dbb);
+        RenderSystem.multMatrix(dhl.last().pose());
+        this.minecraft.debugRenderer.render(dhl, a39, double13, double14, double15);
         RenderSystem.popMatrix();
-        a39.endBatch(Sheets.translucentBlockSheet());
+        a39.endBatch(Sheets.translucentCullBlockSheet());
         a39.endBatch(Sheets.bannerSheet());
         a39.endBatch(Sheets.shieldSheet());
+        a39.endBatch(RenderType.armorGlint());
+        a39.endBatch(RenderType.armorEntityGlint());
         a39.endBatch(RenderType.glint());
         a39.endBatch(RenderType.entityGlint());
         a39.endBatch(RenderType.waterMask());
         this.renderBuffers.crumblingBufferSource().endBatch();
         a39.endBatch(RenderType.lines());
         a39.endBatch();
-        aio11.popPush("translucent");
-        this.renderChunkLayer(RenderType.translucent(), cyl, double13, double14, double15);
-        aio11.popPush("particles");
-        this.minecraft.particleEngine.render(cyl, a39, dqs, dbb, float2);
-        RenderSystem.pushMatrix();
-        RenderSystem.multMatrix(cyl.last().pose());
-        aio11.popPush("cloudsLayers");
-        if (this.minecraft.options.getCloudsType() != CloudStatus.OFF) {
-            aio11.popPush("clouds");
-            this.renderClouds(cyl, float2, double13, double14, double15);
+        if (this.transparencyChain != null) {
+            this.translucentTarget.clear(Minecraft.ON_OSX);
+            this.translucentTarget.copyDepthFrom(this.minecraft.getMainRenderTarget());
+            ami11.popPush("translucent");
+            this.renderChunkLayer(RenderType.translucent(), dhl, double13, double14, double15);
+            ami11.popPush("string");
+            this.renderChunkLayer(RenderType.tripwire(), dhl, double13, double14, double15);
+            this.particlesTarget.clear(Minecraft.ON_OSX);
+            this.particlesTarget.copyDepthFrom(this.minecraft.getMainRenderTarget());
+            RenderStateShard.PARTICLES_TARGET.setupRenderState();
+            ami11.popPush("particles");
+            this.minecraft.particleEngine.render(dhl, a39, eby, dlj, float2);
+            RenderStateShard.PARTICLES_TARGET.clearRenderState();
         }
-        RenderSystem.depthMask(false);
-        aio11.popPush("weather");
-        this.renderSnowAndRain(dqs, float2, double13, double14, double15);
-        RenderSystem.depthMask(true);
-        this.renderDebug(dbb);
+        else {
+            ami11.popPush("translucent");
+            this.renderChunkLayer(RenderType.translucent(), dhl, double13, double14, double15);
+            ami11.popPush("string");
+            this.renderChunkLayer(RenderType.tripwire(), dhl, double13, double14, double15);
+            ami11.popPush("particles");
+            this.minecraft.particleEngine.render(dhl, a39, eby, dlj, float2);
+        }
+        RenderSystem.pushMatrix();
+        RenderSystem.multMatrix(dhl.last().pose());
+        if (this.minecraft.options.getCloudsType() != CloudStatus.OFF) {
+            if (this.transparencyChain != null) {
+                this.cloudsTarget.clear(Minecraft.ON_OSX);
+                RenderStateShard.CLOUDS_TARGET.setupRenderState();
+                ami11.popPush("clouds");
+                this.renderClouds(dhl, float2, double13, double14, double15);
+                RenderStateShard.CLOUDS_TARGET.clearRenderState();
+            }
+            else {
+                ami11.popPush("clouds");
+                this.renderClouds(dhl, float2, double13, double14, double15);
+            }
+        }
+        if (this.transparencyChain != null) {
+            RenderStateShard.WEATHER_TARGET.setupRenderState();
+            ami11.popPush("weather");
+            this.renderSnowAndRain(eby, float2, double13, double14, double15);
+            this.renderWorldBounds(dlj);
+            RenderStateShard.WEATHER_TARGET.clearRenderState();
+            this.transparencyChain.process(float2);
+            this.minecraft.getMainRenderTarget().bindWrite(false);
+        }
+        else {
+            RenderSystem.depthMask(false);
+            ami11.popPush("weather");
+            this.renderSnowAndRain(eby, float2, double13, double14, double15);
+            this.renderWorldBounds(dlj);
+            RenderSystem.depthMask(true);
+        }
+        this.renderDebug(dlj);
         RenderSystem.shadeModel(7424);
         RenderSystem.depthMask(true);
         RenderSystem.disableBlend();
@@ -1092,23 +1166,23 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         FogRenderer.setupNoFog();
     }
     
-    private void checkPoseStack(final PoseStack cyl) {
-        if (!cyl.clear()) {
+    private void checkPoseStack(final PoseStack dhl) {
+        if (!dhl.clear()) {
             throw new IllegalStateException("Pose stack not empty");
         }
     }
     
-    private void renderEntity(final Entity akq, final double double2, final double double3, final double double4, final float float5, final PoseStack cyl, final MultiBufferSource dqt) {
-        final double double5 = Mth.lerp(float5, akq.xOld, akq.getX());
-        final double double6 = Mth.lerp(float5, akq.yOld, akq.getY());
-        final double double7 = Mth.lerp(float5, akq.zOld, akq.getZ());
-        final float float6 = Mth.lerp(float5, akq.yRotO, akq.yRot);
-        this.entityRenderDispatcher.<Entity>render(akq, double5 - double2, double6 - double3, double7 - double4, float6, float5, cyl, dqt, this.entityRenderDispatcher.<Entity>getPackedLightCoords(akq, float5));
+    private void renderEntity(final Entity aom, final double double2, final double double3, final double double4, final float float5, final PoseStack dhl, final MultiBufferSource ebz) {
+        final double double5 = Mth.lerp(float5, aom.xOld, aom.getX());
+        final double double6 = Mth.lerp(float5, aom.yOld, aom.getY());
+        final double double7 = Mth.lerp(float5, aom.zOld, aom.getZ());
+        final float float6 = Mth.lerp(float5, aom.yRotO, aom.yRot);
+        this.entityRenderDispatcher.<Entity>render(aom, double5 - double2, double6 - double3, double7 - double4, float6, float5, dhl, ebz, this.entityRenderDispatcher.<Entity>getPackedLightCoords(aom, float5));
     }
     
-    private void renderChunkLayer(final RenderType drb, final PoseStack cyl, final double double3, final double double4, final double double5) {
-        drb.setupRenderState();
-        if (drb == RenderType.translucent()) {
+    private void renderChunkLayer(final RenderType ech, final PoseStack dhl, final double double3, final double double4, final double double5) {
+        ech.setupRenderState();
+        if (ech == RenderType.translucent()) {
             this.minecraft.getProfiler().push("translucent_sort");
             final double double6 = double3 - this.xTransparentOld;
             final double double7 = double4 - this.yTransparentOld;
@@ -1119,7 +1193,7 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                 this.zTransparentOld = double5;
                 int integer16 = 0;
                 for (final RenderChunkInfo a18 : this.renderChunks) {
-                    if (integer16 < 15 && a18.chunk.resortTransparency(drb, this.chunkRenderDispatcher)) {
+                    if (integer16 < 15 && a18.chunk.resortTransparency(ech, this.chunkRenderDispatcher)) {
                         ++integer16;
                     }
                 }
@@ -1127,8 +1201,8 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
             this.minecraft.getProfiler().pop();
         }
         this.minecraft.getProfiler().push("filterempty");
-        this.minecraft.getProfiler().popPush(() -> "render_" + drb);
-        final boolean boolean10 = drb != RenderType.translucent();
+        this.minecraft.getProfiler().popPush(() -> "render_" + ech);
+        final boolean boolean10 = ech != RenderType.translucent();
         final ObjectListIterator<RenderChunkInfo> objectListIterator11 = (ObjectListIterator<RenderChunkInfo>)this.renderChunks.listIterator(boolean10 ? 0 : this.renderChunks.size());
         while (true) {
             if (boolean10) {
@@ -1141,32 +1215,32 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
             }
             final RenderChunkInfo a19 = (RenderChunkInfo)(boolean10 ? objectListIterator11.next() : ((RenderChunkInfo)objectListIterator11.previous()));
             final ChunkRenderDispatcher.RenderChunk c13 = a19.chunk;
-            if (c13.getCompiledChunk().isEmpty(drb)) {
+            if (c13.getCompiledChunk().isEmpty(ech)) {
                 continue;
             }
-            final VertexBuffer cyn14 = c13.getBuffer(drb);
-            cyl.pushPose();
-            final BlockPos fk15 = c13.getOrigin();
-            cyl.translate(fk15.getX() - double3, fk15.getY() - double4, fk15.getZ() - double5);
-            cyn14.bind();
+            final VertexBuffer dho14 = c13.getBuffer(ech);
+            dhl.pushPose();
+            final BlockPos fu15 = c13.getOrigin();
+            dhl.translate(fu15.getX() - double3, fu15.getY() - double4, fu15.getZ() - double5);
+            dho14.bind();
             this.format.setupBufferState(0L);
-            cyn14.draw(cyl.last().pose(), 7);
-            cyl.popPose();
+            dho14.draw(dhl.last().pose(), 7);
+            dhl.popPose();
         }
         VertexBuffer.unbind();
         RenderSystem.clearCurrentColor();
         this.format.clearBufferState();
         this.minecraft.getProfiler().pop();
-        drb.clearRenderState();
+        ech.clearRenderState();
     }
     
-    private void renderDebug(final Camera dbb) {
-        final Tesselator cym3 = Tesselator.getInstance();
-        final BufferBuilder cyg4 = cym3.getBuilder();
+    private void renderDebug(final Camera dlj) {
+        final Tesselator dhn3 = Tesselator.getInstance();
+        final BufferBuilder dhg4 = dhn3.getBuilder();
         if (this.minecraft.chunkPath || this.minecraft.chunkVisibility) {
-            final double double5 = dbb.getPosition().x();
-            final double double6 = dbb.getPosition().y();
-            final double double7 = dbb.getPosition().z();
+            final double double5 = dlj.getPosition().x();
+            final double double6 = dlj.getPosition().y();
+            final double double7 = dlj.getPosition().z();
             RenderSystem.depthMask(true);
             RenderSystem.disableCull();
             RenderSystem.enableBlend();
@@ -1175,68 +1249,68 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
             for (final RenderChunkInfo a12 : this.renderChunks) {
                 final ChunkRenderDispatcher.RenderChunk c13 = a12.chunk;
                 RenderSystem.pushMatrix();
-                final BlockPos fk14 = c13.getOrigin();
-                RenderSystem.translated(fk14.getX() - double5, fk14.getY() - double6, fk14.getZ() - double7);
+                final BlockPos fu14 = c13.getOrigin();
+                RenderSystem.translated(fu14.getX() - double5, fu14.getY() - double6, fu14.getZ() - double7);
                 if (this.minecraft.chunkPath) {
-                    cyg4.begin(1, DefaultVertexFormat.POSITION_COLOR);
+                    dhg4.begin(1, DefaultVertexFormat.POSITION_COLOR);
                     RenderSystem.lineWidth(10.0f);
                     final int integer15 = (a12.step == 0) ? 0 : Mth.hsvToRgb(a12.step / 50.0f, 0.9f, 0.9f);
                     final int integer16 = integer15 >> 16 & 0xFF;
                     final int integer17 = integer15 >> 8 & 0xFF;
                     final int integer18 = integer15 & 0xFF;
-                    final Direction fp19 = a12.sourceDirection;
-                    if (fp19 != null) {
-                        cyg4.vertex(8.0, 8.0, 8.0).color(integer16, integer17, integer18, 255).endVertex();
-                        cyg4.vertex(8 - 16 * fp19.getStepX(), 8 - 16 * fp19.getStepY(), 8 - 16 * fp19.getStepZ()).color(integer16, integer17, integer18, 255).endVertex();
+                    final Direction fz19 = a12.sourceDirection;
+                    if (fz19 != null) {
+                        dhg4.vertex(8.0, 8.0, 8.0).color(integer16, integer17, integer18, 255).endVertex();
+                        dhg4.vertex(8 - 16 * fz19.getStepX(), 8 - 16 * fz19.getStepY(), 8 - 16 * fz19.getStepZ()).color(integer16, integer17, integer18, 255).endVertex();
                     }
-                    cym3.end();
+                    dhn3.end();
                     RenderSystem.lineWidth(1.0f);
                 }
                 if (this.minecraft.chunkVisibility && !c13.getCompiledChunk().hasNoRenderableLayers()) {
-                    cyg4.begin(1, DefaultVertexFormat.POSITION_COLOR);
+                    dhg4.begin(1, DefaultVertexFormat.POSITION_COLOR);
                     RenderSystem.lineWidth(10.0f);
                     int integer15 = 0;
-                    for (final Direction fp19 : Direction.values()) {
-                        for (final Direction fp20 : Direction.values()) {
-                            final boolean boolean24 = c13.getCompiledChunk().facesCanSeeEachother(fp19, fp20);
+                    for (final Direction fz19 : LevelRenderer.DIRECTIONS) {
+                        for (final Direction fz20 : LevelRenderer.DIRECTIONS) {
+                            final boolean boolean24 = c13.getCompiledChunk().facesCanSeeEachother(fz19, fz20);
                             if (!boolean24) {
                                 ++integer15;
-                                cyg4.vertex(8 + 8 * fp19.getStepX(), 8 + 8 * fp19.getStepY(), 8 + 8 * fp19.getStepZ()).color(1, 0, 0, 1).endVertex();
-                                cyg4.vertex(8 + 8 * fp20.getStepX(), 8 + 8 * fp20.getStepY(), 8 + 8 * fp20.getStepZ()).color(1, 0, 0, 1).endVertex();
+                                dhg4.vertex(8 + 8 * fz19.getStepX(), 8 + 8 * fz19.getStepY(), 8 + 8 * fz19.getStepZ()).color(1, 0, 0, 1).endVertex();
+                                dhg4.vertex(8 + 8 * fz20.getStepX(), 8 + 8 * fz20.getStepY(), 8 + 8 * fz20.getStepZ()).color(1, 0, 0, 1).endVertex();
                             }
                         }
                     }
-                    cym3.end();
+                    dhn3.end();
                     RenderSystem.lineWidth(1.0f);
                     if (integer15 > 0) {
-                        cyg4.begin(7, DefaultVertexFormat.POSITION_COLOR);
+                        dhg4.begin(7, DefaultVertexFormat.POSITION_COLOR);
                         final float float16 = 0.5f;
                         final float float17 = 0.2f;
-                        cyg4.vertex(0.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(15.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cyg4.vertex(0.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
-                        cym3.end();
+                        dhg4.vertex(0.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 0.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 15.5, 0.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 15.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(15.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhg4.vertex(0.5, 0.5, 15.5).color(0.9f, 0.9f, 0.0f, 0.2f).endVertex();
+                        dhn3.end();
                     }
                 }
                 RenderSystem.popMatrix();
@@ -1253,44 +1327,44 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
             RenderSystem.defaultBlendFunc();
             RenderSystem.lineWidth(10.0f);
             RenderSystem.pushMatrix();
-            RenderSystem.translatef((float)(this.frustumPos.x - dbb.getPosition().x), (float)(this.frustumPos.y - dbb.getPosition().y), (float)(this.frustumPos.z - dbb.getPosition().z));
+            RenderSystem.translatef((float)(this.frustumPos.x - dlj.getPosition().x), (float)(this.frustumPos.y - dlj.getPosition().y), (float)(this.frustumPos.z - dlj.getPosition().z));
             RenderSystem.depthMask(true);
-            cyg4.begin(7, DefaultVertexFormat.POSITION_COLOR);
-            this.addFrustumQuad(cyg4, 0, 1, 2, 3, 0, 1, 1);
-            this.addFrustumQuad(cyg4, 4, 5, 6, 7, 1, 0, 0);
-            this.addFrustumQuad(cyg4, 0, 1, 5, 4, 1, 1, 0);
-            this.addFrustumQuad(cyg4, 2, 3, 7, 6, 0, 0, 1);
-            this.addFrustumQuad(cyg4, 0, 4, 7, 3, 0, 1, 0);
-            this.addFrustumQuad(cyg4, 1, 5, 6, 2, 1, 0, 1);
-            cym3.end();
+            dhg4.begin(7, DefaultVertexFormat.POSITION_COLOR);
+            this.addFrustumQuad(dhg4, 0, 1, 2, 3, 0, 1, 1);
+            this.addFrustumQuad(dhg4, 4, 5, 6, 7, 1, 0, 0);
+            this.addFrustumQuad(dhg4, 0, 1, 5, 4, 1, 1, 0);
+            this.addFrustumQuad(dhg4, 2, 3, 7, 6, 0, 0, 1);
+            this.addFrustumQuad(dhg4, 0, 4, 7, 3, 0, 1, 0);
+            this.addFrustumQuad(dhg4, 1, 5, 6, 2, 1, 0, 1);
+            dhn3.end();
             RenderSystem.depthMask(false);
-            cyg4.begin(1, DefaultVertexFormat.POSITION);
+            dhg4.begin(1, DefaultVertexFormat.POSITION);
             RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-            this.addFrustumVertex(cyg4, 0);
-            this.addFrustumVertex(cyg4, 1);
-            this.addFrustumVertex(cyg4, 1);
-            this.addFrustumVertex(cyg4, 2);
-            this.addFrustumVertex(cyg4, 2);
-            this.addFrustumVertex(cyg4, 3);
-            this.addFrustumVertex(cyg4, 3);
-            this.addFrustumVertex(cyg4, 0);
-            this.addFrustumVertex(cyg4, 4);
-            this.addFrustumVertex(cyg4, 5);
-            this.addFrustumVertex(cyg4, 5);
-            this.addFrustumVertex(cyg4, 6);
-            this.addFrustumVertex(cyg4, 6);
-            this.addFrustumVertex(cyg4, 7);
-            this.addFrustumVertex(cyg4, 7);
-            this.addFrustumVertex(cyg4, 4);
-            this.addFrustumVertex(cyg4, 0);
-            this.addFrustumVertex(cyg4, 4);
-            this.addFrustumVertex(cyg4, 1);
-            this.addFrustumVertex(cyg4, 5);
-            this.addFrustumVertex(cyg4, 2);
-            this.addFrustumVertex(cyg4, 6);
-            this.addFrustumVertex(cyg4, 3);
-            this.addFrustumVertex(cyg4, 7);
-            cym3.end();
+            this.addFrustumVertex(dhg4, 0);
+            this.addFrustumVertex(dhg4, 1);
+            this.addFrustumVertex(dhg4, 1);
+            this.addFrustumVertex(dhg4, 2);
+            this.addFrustumVertex(dhg4, 2);
+            this.addFrustumVertex(dhg4, 3);
+            this.addFrustumVertex(dhg4, 3);
+            this.addFrustumVertex(dhg4, 0);
+            this.addFrustumVertex(dhg4, 4);
+            this.addFrustumVertex(dhg4, 5);
+            this.addFrustumVertex(dhg4, 5);
+            this.addFrustumVertex(dhg4, 6);
+            this.addFrustumVertex(dhg4, 6);
+            this.addFrustumVertex(dhg4, 7);
+            this.addFrustumVertex(dhg4, 7);
+            this.addFrustumVertex(dhg4, 4);
+            this.addFrustumVertex(dhg4, 0);
+            this.addFrustumVertex(dhg4, 4);
+            this.addFrustumVertex(dhg4, 1);
+            this.addFrustumVertex(dhg4, 5);
+            this.addFrustumVertex(dhg4, 2);
+            this.addFrustumVertex(dhg4, 6);
+            this.addFrustumVertex(dhg4, 3);
+            this.addFrustumVertex(dhg4, 7);
+            dhn3.end();
             RenderSystem.popMatrix();
             RenderSystem.depthMask(true);
             RenderSystem.disableBlend();
@@ -1300,16 +1374,16 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         }
     }
     
-    private void addFrustumVertex(final VertexConsumer cyo, final int integer) {
-        cyo.vertex(this.frustumPoints[integer].x(), this.frustumPoints[integer].y(), this.frustumPoints[integer].z()).endVertex();
+    private void addFrustumVertex(final VertexConsumer dhp, final int integer) {
+        dhp.vertex(this.frustumPoints[integer].x(), this.frustumPoints[integer].y(), this.frustumPoints[integer].z()).endVertex();
     }
     
-    private void addFrustumQuad(final VertexConsumer cyo, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
+    private void addFrustumQuad(final VertexConsumer dhp, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
         final float float10 = 0.25f;
-        cyo.vertex(this.frustumPoints[integer2].x(), this.frustumPoints[integer2].y(), this.frustumPoints[integer2].z()).color((float)integer6, (float)integer7, (float)integer8, 0.25f).endVertex();
-        cyo.vertex(this.frustumPoints[integer3].x(), this.frustumPoints[integer3].y(), this.frustumPoints[integer3].z()).color((float)integer6, (float)integer7, (float)integer8, 0.25f).endVertex();
-        cyo.vertex(this.frustumPoints[integer4].x(), this.frustumPoints[integer4].y(), this.frustumPoints[integer4].z()).color((float)integer6, (float)integer7, (float)integer8, 0.25f).endVertex();
-        cyo.vertex(this.frustumPoints[integer5].x(), this.frustumPoints[integer5].y(), this.frustumPoints[integer5].z()).color((float)integer6, (float)integer7, (float)integer8, 0.25f).endVertex();
+        dhp.vertex(this.frustumPoints[integer2].x(), this.frustumPoints[integer2].y(), this.frustumPoints[integer2].z()).color((float)integer6, (float)integer7, (float)integer8, 0.25f).endVertex();
+        dhp.vertex(this.frustumPoints[integer3].x(), this.frustumPoints[integer3].y(), this.frustumPoints[integer3].z()).color((float)integer6, (float)integer7, (float)integer8, 0.25f).endVertex();
+        dhp.vertex(this.frustumPoints[integer4].x(), this.frustumPoints[integer4].y(), this.frustumPoints[integer4].z()).color((float)integer6, (float)integer7, (float)integer8, 0.25f).endVertex();
+        dhp.vertex(this.frustumPoints[integer5].x(), this.frustumPoints[integer5].y(), this.frustumPoints[integer5].z()).color((float)integer6, (float)integer7, (float)integer8, 0.25f).endVertex();
     }
     
     public void tick() {
@@ -1319,57 +1393,57 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         }
         final Iterator<BlockDestructionProgress> iterator2 = (Iterator<BlockDestructionProgress>)this.destroyingBlocks.values().iterator();
         while (iterator2.hasNext()) {
-            final BlockDestructionProgress wn3 = iterator2.next();
-            final int integer4 = wn3.getUpdatedRenderTick();
+            final BlockDestructionProgress yn3 = iterator2.next();
+            final int integer4 = yn3.getUpdatedRenderTick();
             if (this.ticks - integer4 > 400) {
                 iterator2.remove();
-                this.removeProgress(wn3);
+                this.removeProgress(yn3);
             }
         }
     }
     
-    private void removeProgress(final BlockDestructionProgress wn) {
-        final long long3 = wn.getPos().asLong();
+    private void removeProgress(final BlockDestructionProgress yn) {
+        final long long3 = yn.getPos().asLong();
         final Set<BlockDestructionProgress> set5 = (Set<BlockDestructionProgress>)this.destructionProgress.get(long3);
-        set5.remove(wn);
+        set5.remove(yn);
         if (set5.isEmpty()) {
             this.destructionProgress.remove(long3);
         }
     }
     
-    private void renderEndSky(final PoseStack cyl) {
+    private void renderEndSky(final PoseStack dhl) {
         RenderSystem.disableAlphaTest();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.depthMask(false);
         this.textureManager.bind(LevelRenderer.END_SKY_LOCATION);
-        final Tesselator cym3 = Tesselator.getInstance();
-        final BufferBuilder cyg4 = cym3.getBuilder();
+        final Tesselator dhn3 = Tesselator.getInstance();
+        final BufferBuilder dhg4 = dhn3.getBuilder();
         for (int integer5 = 0; integer5 < 6; ++integer5) {
-            cyl.pushPose();
+            dhl.pushPose();
             if (integer5 == 1) {
-                cyl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
+                dhl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
             }
             if (integer5 == 2) {
-                cyl.mulPose(Vector3f.XP.rotationDegrees(-90.0f));
+                dhl.mulPose(Vector3f.XP.rotationDegrees(-90.0f));
             }
             if (integer5 == 3) {
-                cyl.mulPose(Vector3f.XP.rotationDegrees(180.0f));
+                dhl.mulPose(Vector3f.XP.rotationDegrees(180.0f));
             }
             if (integer5 == 4) {
-                cyl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
+                dhl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
             }
             if (integer5 == 5) {
-                cyl.mulPose(Vector3f.ZP.rotationDegrees(-90.0f));
+                dhl.mulPose(Vector3f.ZP.rotationDegrees(-90.0f));
             }
-            final Matrix4f b6 = cyl.last().pose();
-            cyg4.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-            cyg4.vertex(b6, -100.0f, -100.0f, -100.0f).uv(0.0f, 0.0f).color(40, 40, 40, 255).endVertex();
-            cyg4.vertex(b6, -100.0f, -100.0f, 100.0f).uv(0.0f, 16.0f).color(40, 40, 40, 255).endVertex();
-            cyg4.vertex(b6, 100.0f, -100.0f, 100.0f).uv(16.0f, 16.0f).color(40, 40, 40, 255).endVertex();
-            cyg4.vertex(b6, 100.0f, -100.0f, -100.0f).uv(16.0f, 0.0f).color(40, 40, 40, 255).endVertex();
-            cym3.end();
-            cyl.popPose();
+            final Matrix4f b6 = dhl.last().pose();
+            dhg4.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+            dhg4.vertex(b6, -100.0f, -100.0f, -100.0f).uv(0.0f, 0.0f).color(40, 40, 40, 255).endVertex();
+            dhg4.vertex(b6, -100.0f, -100.0f, 100.0f).uv(0.0f, 16.0f).color(40, 40, 40, 255).endVertex();
+            dhg4.vertex(b6, 100.0f, -100.0f, 100.0f).uv(16.0f, 16.0f).color(40, 40, 40, 255).endVertex();
+            dhg4.vertex(b6, 100.0f, -100.0f, -100.0f).uv(16.0f, 0.0f).color(40, 40, 40, 255).endVertex();
+            dhn3.end();
+            dhl.popPose();
         }
         RenderSystem.depthMask(true);
         RenderSystem.enableTexture();
@@ -1377,77 +1451,77 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         RenderSystem.enableAlphaTest();
     }
     
-    public void renderSky(final PoseStack cyl, final float float2) {
-        if (this.minecraft.level.dimension.getType() == DimensionType.THE_END) {
-            this.renderEndSky(cyl);
+    public void renderSky(final PoseStack dhl, final float float2) {
+        if (this.minecraft.level.effects().skyType() == DimensionSpecialEffects.SkyType.END) {
+            this.renderEndSky(dhl);
             return;
         }
-        if (!this.minecraft.level.dimension.isNaturalDimension()) {
+        if (this.minecraft.level.effects().skyType() != DimensionSpecialEffects.SkyType.NORMAL) {
             return;
         }
         RenderSystem.disableTexture();
-        final Vec3 cvl4 = this.level.getSkyColor(this.minecraft.gameRenderer.getMainCamera().getBlockPosition(), float2);
-        final float float3 = (float)cvl4.x;
-        final float float4 = (float)cvl4.y;
-        final float float5 = (float)cvl4.z;
+        final Vec3 dem4 = this.level.getSkyColor(this.minecraft.gameRenderer.getMainCamera().getBlockPosition(), float2);
+        final float float3 = (float)dem4.x;
+        final float float4 = (float)dem4.y;
+        final float float5 = (float)dem4.z;
         FogRenderer.levelFogColor();
-        final BufferBuilder cyg8 = Tesselator.getInstance().getBuilder();
+        final BufferBuilder dhg8 = Tesselator.getInstance().getBuilder();
         RenderSystem.depthMask(false);
         RenderSystem.enableFog();
         RenderSystem.color3f(float3, float4, float5);
         this.skyBuffer.bind();
         this.skyFormat.setupBufferState(0L);
-        this.skyBuffer.draw(cyl.last().pose(), 7);
+        this.skyBuffer.draw(dhl.last().pose(), 7);
         VertexBuffer.unbind();
         this.skyFormat.clearBufferState();
         RenderSystem.disableFog();
         RenderSystem.disableAlphaTest();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        final float[] arr9 = this.level.dimension.getSunriseColor(this.level.getTimeOfDay(float2), float2);
+        final float[] arr9 = this.level.effects().getSunriseColor(this.level.getTimeOfDay(float2), float2);
         if (arr9 != null) {
             RenderSystem.disableTexture();
             RenderSystem.shadeModel(7425);
-            cyl.pushPose();
-            cyl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
+            dhl.pushPose();
+            dhl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
             final float float6 = (Mth.sin(this.level.getSunAngle(float2)) < 0.0f) ? 180.0f : 0.0f;
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(float6));
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(float6));
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
             final float float7 = arr9[0];
             final float float8 = arr9[1];
             final float float9 = arr9[2];
-            final Matrix4f b14 = cyl.last().pose();
-            cyg8.begin(6, DefaultVertexFormat.POSITION_COLOR);
-            cyg8.vertex(b14, 0.0f, 100.0f, 0.0f).color(float7, float8, float9, arr9[3]).endVertex();
+            final Matrix4f b14 = dhl.last().pose();
+            dhg8.begin(6, DefaultVertexFormat.POSITION_COLOR);
+            dhg8.vertex(b14, 0.0f, 100.0f, 0.0f).color(float7, float8, float9, arr9[3]).endVertex();
             final int integer15 = 16;
             for (int integer16 = 0; integer16 <= 16; ++integer16) {
                 final float float10 = integer16 * 6.2831855f / 16.0f;
                 final float float11 = Mth.sin(float10);
                 final float float12 = Mth.cos(float10);
-                cyg8.vertex(b14, float11 * 120.0f, float12 * 120.0f, -float12 * 40.0f * arr9[3]).color(arr9[0], arr9[1], arr9[2], 0.0f).endVertex();
+                dhg8.vertex(b14, float11 * 120.0f, float12 * 120.0f, -float12 * 40.0f * arr9[3]).color(arr9[0], arr9[1], arr9[2], 0.0f).endVertex();
             }
-            cyg8.end();
-            BufferUploader.end(cyg8);
-            cyl.popPose();
+            dhg8.end();
+            BufferUploader.end(dhg8);
+            dhl.popPose();
             RenderSystem.shadeModel(7424);
         }
         RenderSystem.enableTexture();
         RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
-        cyl.pushPose();
+        dhl.pushPose();
         final float float6 = 1.0f - this.level.getRainLevel(float2);
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, float6);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(-90.0f));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(this.level.getTimeOfDay(float2) * 360.0f));
-        final Matrix4f b15 = cyl.last().pose();
+        dhl.mulPose(Vector3f.YP.rotationDegrees(-90.0f));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(this.level.getTimeOfDay(float2) * 360.0f));
+        final Matrix4f b15 = dhl.last().pose();
         float float8 = 30.0f;
         this.textureManager.bind(LevelRenderer.SUN_LOCATION);
-        cyg8.begin(7, DefaultVertexFormat.POSITION_TEX);
-        cyg8.vertex(b15, -float8, 100.0f, -float8).uv(0.0f, 0.0f).endVertex();
-        cyg8.vertex(b15, float8, 100.0f, -float8).uv(1.0f, 0.0f).endVertex();
-        cyg8.vertex(b15, float8, 100.0f, float8).uv(1.0f, 1.0f).endVertex();
-        cyg8.vertex(b15, -float8, 100.0f, float8).uv(0.0f, 1.0f).endVertex();
-        cyg8.end();
-        BufferUploader.end(cyg8);
+        dhg8.begin(7, DefaultVertexFormat.POSITION_TEX);
+        dhg8.vertex(b15, -float8, 100.0f, -float8).uv(0.0f, 0.0f).endVertex();
+        dhg8.vertex(b15, float8, 100.0f, -float8).uv(1.0f, 0.0f).endVertex();
+        dhg8.vertex(b15, float8, 100.0f, float8).uv(1.0f, 1.0f).endVertex();
+        dhg8.vertex(b15, -float8, 100.0f, float8).uv(0.0f, 1.0f).endVertex();
+        dhg8.end();
+        BufferUploader.end(dhg8);
         float8 = 20.0f;
         this.textureManager.bind(LevelRenderer.MOON_LOCATION);
         final int integer17 = this.level.getMoonPhase();
@@ -1457,20 +1531,20 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         final float float10 = (integer15 + 0) / 2.0f;
         final float float11 = (integer18 + 1) / 4.0f;
         final float float12 = (integer15 + 1) / 2.0f;
-        cyg8.begin(7, DefaultVertexFormat.POSITION_TEX);
-        cyg8.vertex(b15, -float8, -100.0f, float8).uv(float11, float12).endVertex();
-        cyg8.vertex(b15, float8, -100.0f, float8).uv(float13, float12).endVertex();
-        cyg8.vertex(b15, float8, -100.0f, -float8).uv(float13, float10).endVertex();
-        cyg8.vertex(b15, -float8, -100.0f, -float8).uv(float11, float10).endVertex();
-        cyg8.end();
-        BufferUploader.end(cyg8);
+        dhg8.begin(7, DefaultVertexFormat.POSITION_TEX);
+        dhg8.vertex(b15, -float8, -100.0f, float8).uv(float11, float12).endVertex();
+        dhg8.vertex(b15, float8, -100.0f, float8).uv(float13, float12).endVertex();
+        dhg8.vertex(b15, float8, -100.0f, -float8).uv(float13, float10).endVertex();
+        dhg8.vertex(b15, -float8, -100.0f, -float8).uv(float11, float10).endVertex();
+        dhg8.end();
+        BufferUploader.end(dhg8);
         RenderSystem.disableTexture();
         final float float14 = this.level.getStarBrightness(float2) * float6;
         if (float14 > 0.0f) {
             RenderSystem.color4f(float14, float14, float14, float14);
             this.starBuffer.bind();
             this.skyFormat.setupBufferState(0L);
-            this.starBuffer.draw(cyl.last().pose(), 7);
+            this.starBuffer.draw(dhl.last().pose(), 7);
             VertexBuffer.unbind();
             this.skyFormat.clearBufferState();
         }
@@ -1478,21 +1552,21 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         RenderSystem.disableBlend();
         RenderSystem.enableAlphaTest();
         RenderSystem.enableFog();
-        cyl.popPose();
+        dhl.popPose();
         RenderSystem.disableTexture();
         RenderSystem.color3f(0.0f, 0.0f, 0.0f);
-        final double double10 = this.minecraft.player.getEyePosition(float2).y - this.level.getHorizonHeight();
+        final double double10 = this.minecraft.player.getEyePosition(float2).y - this.level.getLevelData().getHorizonHeight();
         if (double10 < 0.0) {
-            cyl.pushPose();
-            cyl.translate(0.0, 12.0, 0.0);
+            dhl.pushPose();
+            dhl.translate(0.0, 12.0, 0.0);
             this.darkBuffer.bind();
             this.skyFormat.setupBufferState(0L);
-            this.darkBuffer.draw(cyl.last().pose(), 7);
+            this.darkBuffer.draw(dhl.last().pose(), 7);
             VertexBuffer.unbind();
             this.skyFormat.clearBufferState();
-            cyl.popPose();
+            dhl.popPose();
         }
-        if (this.level.dimension.hasGround()) {
+        if (this.level.effects().hasGround()) {
             RenderSystem.color3f(float3 * 0.2f + 0.04f, float4 * 0.2f + 0.04f, float5 * 0.6f + 0.1f);
         }
         else {
@@ -1503,8 +1577,9 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         RenderSystem.disableFog();
     }
     
-    public void renderClouds(final PoseStack cyl, final float float2, final double double3, final double double4, final double double5) {
-        if (!this.minecraft.level.dimension.isNaturalDimension()) {
+    public void renderClouds(final PoseStack dhl, final float float2, final double double3, final double double4, final double double5) {
+        final float float3 = this.level.effects().getCloudHeight();
+        if (Float.isNaN(float3)) {
             return;
         }
         RenderSystem.disableCull();
@@ -1512,64 +1587,65 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         RenderSystem.enableAlphaTest();
         RenderSystem.enableDepthTest();
         RenderSystem.defaultAlphaFunc();
-        RenderSystem.defaultBlendFunc();
+        RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
         RenderSystem.enableFog();
-        final float float3 = 12.0f;
-        final float float4 = 4.0f;
+        RenderSystem.depthMask(true);
+        final float float4 = 12.0f;
+        final float float5 = 4.0f;
         final double double6 = 2.0E-4;
         final double double7 = (this.ticks + float2) * 0.03f;
         double double8 = (double3 + double7) / 12.0;
-        final double double9 = this.level.dimension.getCloudHeight() - (float)double4 + 0.33f;
+        final double double9 = float3 - (float)double4 + 0.33f;
         double double10 = double5 / 12.0 + 0.33000001311302185;
         double8 -= Mth.floor(double8 / 2048.0) * 2048;
         double10 -= Mth.floor(double10 / 2048.0) * 2048;
-        final float float5 = (float)(double8 - Mth.floor(double8));
-        final float float6 = (float)(double9 / 4.0 - Mth.floor(double9 / 4.0)) * 4.0f;
-        final float float7 = (float)(double10 - Mth.floor(double10));
-        final Vec3 cvl25 = this.level.getCloudColor(float2);
-        final int integer26 = (int)Math.floor(double8);
-        final int integer27 = (int)Math.floor(double9 / 4.0);
-        final int integer28 = (int)Math.floor(double10);
-        if (integer26 != this.prevCloudX || integer27 != this.prevCloudY || integer28 != this.prevCloudZ || this.minecraft.options.getCloudsType() != this.prevCloudsType || this.prevCloudColor.distanceToSqr(cvl25) > 2.0E-4) {
-            this.prevCloudX = integer26;
-            this.prevCloudY = integer27;
-            this.prevCloudZ = integer28;
-            this.prevCloudColor = cvl25;
+        final float float6 = (float)(double8 - Mth.floor(double8));
+        final float float7 = (float)(double9 / 4.0 - Mth.floor(double9 / 4.0)) * 4.0f;
+        final float float8 = (float)(double10 - Mth.floor(double10));
+        final Vec3 dem26 = this.level.getCloudColor(float2);
+        final int integer27 = (int)Math.floor(double8);
+        final int integer28 = (int)Math.floor(double9 / 4.0);
+        final int integer29 = (int)Math.floor(double10);
+        if (integer27 != this.prevCloudX || integer28 != this.prevCloudY || integer29 != this.prevCloudZ || this.minecraft.options.getCloudsType() != this.prevCloudsType || this.prevCloudColor.distanceToSqr(dem26) > 2.0E-4) {
+            this.prevCloudX = integer27;
+            this.prevCloudY = integer28;
+            this.prevCloudZ = integer29;
+            this.prevCloudColor = dem26;
             this.prevCloudsType = this.minecraft.options.getCloudsType();
             this.generateClouds = true;
         }
         if (this.generateClouds) {
             this.generateClouds = false;
-            final BufferBuilder cyg29 = Tesselator.getInstance().getBuilder();
+            final BufferBuilder dhg30 = Tesselator.getInstance().getBuilder();
             if (this.cloudBuffer != null) {
                 this.cloudBuffer.close();
             }
             this.cloudBuffer = new VertexBuffer(DefaultVertexFormat.POSITION_TEX_COLOR_NORMAL);
-            this.buildClouds(cyg29, double8, double9, double10, cvl25);
-            cyg29.end();
-            this.cloudBuffer.upload(cyg29);
+            this.buildClouds(dhg30, double8, double9, double10, dem26);
+            dhg30.end();
+            this.cloudBuffer.upload(dhg30);
         }
         this.textureManager.bind(LevelRenderer.CLOUDS_LOCATION);
-        cyl.pushPose();
-        cyl.scale(12.0f, 1.0f, 12.0f);
-        cyl.translate(-float5, float6, -float7);
+        dhl.pushPose();
+        dhl.scale(12.0f, 1.0f, 12.0f);
+        dhl.translate(-float6, float7, -float8);
         if (this.cloudBuffer != null) {
             this.cloudBuffer.bind();
             DefaultVertexFormat.POSITION_TEX_COLOR_NORMAL.setupBufferState(0L);
-            int integer30;
-            for (int integer29 = integer30 = ((this.prevCloudsType != CloudStatus.FANCY) ? 1 : 0); integer30 < 2; ++integer30) {
-                if (integer30 == 0) {
+            int integer31;
+            for (int integer30 = integer31 = ((this.prevCloudsType != CloudStatus.FANCY) ? 1 : 0); integer31 < 2; ++integer31) {
+                if (integer31 == 0) {
                     RenderSystem.colorMask(false, false, false, false);
                 }
                 else {
                     RenderSystem.colorMask(true, true, true, true);
                 }
-                this.cloudBuffer.draw(cyl.last().pose(), 7);
+                this.cloudBuffer.draw(dhl.last().pose(), 7);
             }
             VertexBuffer.unbind();
             DefaultVertexFormat.POSITION_TEX_COLOR_NORMAL.clearBufferState();
         }
-        cyl.popPose();
+        dhl.popPose();
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.disableAlphaTest();
         RenderSystem.enableCull();
@@ -1577,7 +1653,7 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         RenderSystem.disableFog();
     }
     
-    private void buildClouds(final BufferBuilder cyg, final double double2, final double double3, final double double4, final Vec3 cvl) {
+    private void buildClouds(final BufferBuilder dhg, final double double2, final double double3, final double double4, final Vec3 dem) {
         final float float10 = 4.0f;
         final float float11 = 0.00390625f;
         final int integer12 = 8;
@@ -1585,9 +1661,9 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         final float float12 = 9.765625E-4f;
         final float float13 = Mth.floor(double2) * 0.00390625f;
         final float float14 = Mth.floor(double4) * 0.00390625f;
-        final float float15 = (float)cvl.x;
-        final float float16 = (float)cvl.y;
-        final float float17 = (float)cvl.z;
+        final float float15 = (float)dem.x;
+        final float float16 = (float)dem.y;
+        final float float17 = (float)dem.z;
         final float float18 = float15 * 0.9f;
         final float float19 = float16 * 0.9f;
         final float float20 = float17 * 0.9f;
@@ -1597,7 +1673,7 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         final float float24 = float15 * 0.8f;
         final float float25 = float16 * 0.8f;
         final float float26 = float17 * 0.8f;
-        cyg.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR_NORMAL);
+        dhg.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR_NORMAL);
         final float float27 = (float)Math.floor(double3 / 4.0) * 4.0f;
         if (this.prevCloudsType == CloudStatus.FANCY) {
             for (int integer14 = -3; integer14 <= 4; ++integer14) {
@@ -1605,47 +1681,47 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                     final float float28 = (float)(integer14 * 8);
                     final float float29 = (float)(integer15 * 8);
                     if (float27 > -5.0f) {
-                        cyg.vertex(float28 + 0.0f, float27 + 0.0f, float29 + 8.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float21, float22, float23, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
-                        cyg.vertex(float28 + 8.0f, float27 + 0.0f, float29 + 8.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float21, float22, float23, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
-                        cyg.vertex(float28 + 8.0f, float27 + 0.0f, float29 + 0.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float21, float22, float23, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
-                        cyg.vertex(float28 + 0.0f, float27 + 0.0f, float29 + 0.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float21, float22, float23, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
+                        dhg.vertex(float28 + 0.0f, float27 + 0.0f, float29 + 8.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float21, float22, float23, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
+                        dhg.vertex(float28 + 8.0f, float27 + 0.0f, float29 + 8.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float21, float22, float23, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
+                        dhg.vertex(float28 + 8.0f, float27 + 0.0f, float29 + 0.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float21, float22, float23, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
+                        dhg.vertex(float28 + 0.0f, float27 + 0.0f, float29 + 0.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float21, float22, float23, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
                     }
                     if (float27 <= 5.0f) {
-                        cyg.vertex(float28 + 0.0f, float27 + 4.0f - 9.765625E-4f, float29 + 8.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, 1.0f, 0.0f).endVertex();
-                        cyg.vertex(float28 + 8.0f, float27 + 4.0f - 9.765625E-4f, float29 + 8.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, 1.0f, 0.0f).endVertex();
-                        cyg.vertex(float28 + 8.0f, float27 + 4.0f - 9.765625E-4f, float29 + 0.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, 1.0f, 0.0f).endVertex();
-                        cyg.vertex(float28 + 0.0f, float27 + 4.0f - 9.765625E-4f, float29 + 0.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, 1.0f, 0.0f).endVertex();
+                        dhg.vertex(float28 + 0.0f, float27 + 4.0f - 9.765625E-4f, float29 + 8.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, 1.0f, 0.0f).endVertex();
+                        dhg.vertex(float28 + 8.0f, float27 + 4.0f - 9.765625E-4f, float29 + 8.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, 1.0f, 0.0f).endVertex();
+                        dhg.vertex(float28 + 8.0f, float27 + 4.0f - 9.765625E-4f, float29 + 0.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, 1.0f, 0.0f).endVertex();
+                        dhg.vertex(float28 + 0.0f, float27 + 4.0f - 9.765625E-4f, float29 + 0.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, 1.0f, 0.0f).endVertex();
                     }
                     if (integer14 > -1) {
                         for (int integer16 = 0; integer16 < 8; ++integer16) {
-                            cyg.vertex(float28 + integer16 + 0.0f, float27 + 0.0f, float29 + 8.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(-1.0f, 0.0f, 0.0f).endVertex();
-                            cyg.vertex(float28 + integer16 + 0.0f, float27 + 4.0f, float29 + 8.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(-1.0f, 0.0f, 0.0f).endVertex();
-                            cyg.vertex(float28 + integer16 + 0.0f, float27 + 4.0f, float29 + 0.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(-1.0f, 0.0f, 0.0f).endVertex();
-                            cyg.vertex(float28 + integer16 + 0.0f, float27 + 0.0f, float29 + 0.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(-1.0f, 0.0f, 0.0f).endVertex();
+                            dhg.vertex(float28 + integer16 + 0.0f, float27 + 0.0f, float29 + 8.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(-1.0f, 0.0f, 0.0f).endVertex();
+                            dhg.vertex(float28 + integer16 + 0.0f, float27 + 4.0f, float29 + 8.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(-1.0f, 0.0f, 0.0f).endVertex();
+                            dhg.vertex(float28 + integer16 + 0.0f, float27 + 4.0f, float29 + 0.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(-1.0f, 0.0f, 0.0f).endVertex();
+                            dhg.vertex(float28 + integer16 + 0.0f, float27 + 0.0f, float29 + 0.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(-1.0f, 0.0f, 0.0f).endVertex();
                         }
                     }
                     if (integer14 <= 1) {
                         for (int integer16 = 0; integer16 < 8; ++integer16) {
-                            cyg.vertex(float28 + integer16 + 1.0f - 9.765625E-4f, float27 + 0.0f, float29 + 8.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(1.0f, 0.0f, 0.0f).endVertex();
-                            cyg.vertex(float28 + integer16 + 1.0f - 9.765625E-4f, float27 + 4.0f, float29 + 8.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(1.0f, 0.0f, 0.0f).endVertex();
-                            cyg.vertex(float28 + integer16 + 1.0f - 9.765625E-4f, float27 + 4.0f, float29 + 0.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(1.0f, 0.0f, 0.0f).endVertex();
-                            cyg.vertex(float28 + integer16 + 1.0f - 9.765625E-4f, float27 + 0.0f, float29 + 0.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(1.0f, 0.0f, 0.0f).endVertex();
+                            dhg.vertex(float28 + integer16 + 1.0f - 9.765625E-4f, float27 + 0.0f, float29 + 8.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(1.0f, 0.0f, 0.0f).endVertex();
+                            dhg.vertex(float28 + integer16 + 1.0f - 9.765625E-4f, float27 + 4.0f, float29 + 8.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 8.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(1.0f, 0.0f, 0.0f).endVertex();
+                            dhg.vertex(float28 + integer16 + 1.0f - 9.765625E-4f, float27 + 4.0f, float29 + 0.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(1.0f, 0.0f, 0.0f).endVertex();
+                            dhg.vertex(float28 + integer16 + 1.0f - 9.765625E-4f, float27 + 0.0f, float29 + 0.0f).uv((float28 + integer16 + 0.5f) * 0.00390625f + float13, (float29 + 0.0f) * 0.00390625f + float14).color(float18, float19, float20, 0.8f).normal(1.0f, 0.0f, 0.0f).endVertex();
                         }
                     }
                     if (integer15 > -1) {
                         for (int integer16 = 0; integer16 < 8; ++integer16) {
-                            cyg.vertex(float28 + 0.0f, float27 + 4.0f, float29 + integer16 + 0.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, -1.0f).endVertex();
-                            cyg.vertex(float28 + 8.0f, float27 + 4.0f, float29 + integer16 + 0.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, -1.0f).endVertex();
-                            cyg.vertex(float28 + 8.0f, float27 + 0.0f, float29 + integer16 + 0.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, -1.0f).endVertex();
-                            cyg.vertex(float28 + 0.0f, float27 + 0.0f, float29 + integer16 + 0.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, -1.0f).endVertex();
+                            dhg.vertex(float28 + 0.0f, float27 + 4.0f, float29 + integer16 + 0.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, -1.0f).endVertex();
+                            dhg.vertex(float28 + 8.0f, float27 + 4.0f, float29 + integer16 + 0.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, -1.0f).endVertex();
+                            dhg.vertex(float28 + 8.0f, float27 + 0.0f, float29 + integer16 + 0.0f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, -1.0f).endVertex();
+                            dhg.vertex(float28 + 0.0f, float27 + 0.0f, float29 + integer16 + 0.0f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, -1.0f).endVertex();
                         }
                     }
                     if (integer15 <= 1) {
                         for (int integer16 = 0; integer16 < 8; ++integer16) {
-                            cyg.vertex(float28 + 0.0f, float27 + 4.0f, float29 + integer16 + 1.0f - 9.765625E-4f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, 1.0f).endVertex();
-                            cyg.vertex(float28 + 8.0f, float27 + 4.0f, float29 + integer16 + 1.0f - 9.765625E-4f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, 1.0f).endVertex();
-                            cyg.vertex(float28 + 8.0f, float27 + 0.0f, float29 + integer16 + 1.0f - 9.765625E-4f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, 1.0f).endVertex();
-                            cyg.vertex(float28 + 0.0f, float27 + 0.0f, float29 + integer16 + 1.0f - 9.765625E-4f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, 1.0f).endVertex();
+                            dhg.vertex(float28 + 0.0f, float27 + 4.0f, float29 + integer16 + 1.0f - 9.765625E-4f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, 1.0f).endVertex();
+                            dhg.vertex(float28 + 8.0f, float27 + 4.0f, float29 + integer16 + 1.0f - 9.765625E-4f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, 1.0f).endVertex();
+                            dhg.vertex(float28 + 8.0f, float27 + 0.0f, float29 + integer16 + 1.0f - 9.765625E-4f).uv((float28 + 8.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, 1.0f).endVertex();
+                            dhg.vertex(float28 + 0.0f, float27 + 0.0f, float29 + integer16 + 1.0f - 9.765625E-4f).uv((float28 + 0.0f) * 0.00390625f + float13, (float29 + integer16 + 0.5f) * 0.00390625f + float14).color(float24, float25, float26, 0.8f).normal(0.0f, 0.0f, 1.0f).endVertex();
                         }
                     }
                 }
@@ -1656,10 +1732,10 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
             final int integer15 = 32;
             for (int integer17 = -32; integer17 < 32; integer17 += 32) {
                 for (int integer18 = -32; integer18 < 32; integer18 += 32) {
-                    cyg.vertex(integer17 + 0, float27, integer18 + 32).uv((integer17 + 0) * 0.00390625f + float13, (integer18 + 32) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
-                    cyg.vertex(integer17 + 32, float27, integer18 + 32).uv((integer17 + 32) * 0.00390625f + float13, (integer18 + 32) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
-                    cyg.vertex(integer17 + 32, float27, integer18 + 0).uv((integer17 + 32) * 0.00390625f + float13, (integer18 + 0) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
-                    cyg.vertex(integer17 + 0, float27, integer18 + 0).uv((integer17 + 0) * 0.00390625f + float13, (integer18 + 0) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
+                    dhg.vertex(integer17 + 0, float27, integer18 + 32).uv((integer17 + 0) * 0.00390625f + float13, (integer18 + 32) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
+                    dhg.vertex(integer17 + 32, float27, integer18 + 32).uv((integer17 + 32) * 0.00390625f + float13, (integer18 + 32) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
+                    dhg.vertex(integer17 + 32, float27, integer18 + 0).uv((integer17 + 32) * 0.00390625f + float13, (integer18 + 0) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
+                    dhg.vertex(integer17 + 0, float27, integer18 + 0).uv((integer17 + 0) * 0.00390625f + float13, (integer18 + 0) * 0.00390625f + float14).color(float15, float16, float17, 0.8f).normal(0.0f, -1.0f, 0.0f).endVertex();
                 }
             }
         }
@@ -1693,25 +1769,25 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         }
     }
     
-    private void renderWorldBounds(final Camera dbb) {
-        final BufferBuilder cyg3 = Tesselator.getInstance().getBuilder();
-        final WorldBorder bzw4 = this.level.getWorldBorder();
+    private void renderWorldBounds(final Camera dlj) {
+        final BufferBuilder dhg3 = Tesselator.getInstance().getBuilder();
+        final WorldBorder cgw4 = this.level.getWorldBorder();
         final double double5 = this.minecraft.options.renderDistance * 16;
-        if (dbb.getPosition().x < bzw4.getMaxX() - double5 && dbb.getPosition().x > bzw4.getMinX() + double5 && dbb.getPosition().z < bzw4.getMaxZ() - double5 && dbb.getPosition().z > bzw4.getMinZ() + double5) {
+        if (dlj.getPosition().x < cgw4.getMaxX() - double5 && dlj.getPosition().x > cgw4.getMinX() + double5 && dlj.getPosition().z < cgw4.getMaxZ() - double5 && dlj.getPosition().z > cgw4.getMinZ() + double5) {
             return;
         }
-        double double6 = 1.0 - bzw4.getDistanceToBorder(dbb.getPosition().x, dbb.getPosition().z) / double5;
+        double double6 = 1.0 - cgw4.getDistanceToBorder(dlj.getPosition().x, dlj.getPosition().z) / double5;
         double6 = Math.pow(double6, 4.0);
-        final double double7 = dbb.getPosition().x;
-        final double double8 = dbb.getPosition().y;
-        final double double9 = dbb.getPosition().z;
+        final double double7 = dlj.getPosition().x;
+        final double double8 = dlj.getPosition().y;
+        final double double9 = dlj.getPosition().z;
         RenderSystem.enableBlend();
         RenderSystem.enableDepthTest();
         RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
         this.textureManager.bind(LevelRenderer.FORCEFIELD_LOCATION);
-        RenderSystem.depthMask(false);
+        RenderSystem.depthMask(Minecraft.useShaderTransparency());
         RenderSystem.pushMatrix();
-        final int integer15 = bzw4.getStatus().getColor();
+        final int integer15 = cgw4.getStatus().getColor();
         final float float16 = (integer15 >> 16 & 0xFF) / 255.0f;
         final float float17 = (integer15 >> 8 & 0xFF) / 255.0f;
         final float float18 = (integer15 & 0xFF) / 255.0f;
@@ -1725,57 +1801,57 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         final float float20 = 0.0f;
         final float float21 = 0.0f;
         final float float22 = 128.0f;
-        cyg3.begin(7, DefaultVertexFormat.POSITION_TEX);
-        double double10 = Math.max(Mth.floor(double9 - double5), bzw4.getMinZ());
-        double double11 = Math.min(Mth.ceil(double9 + double5), bzw4.getMaxZ());
-        if (double7 > bzw4.getMaxX() - double5) {
+        dhg3.begin(7, DefaultVertexFormat.POSITION_TEX);
+        double double10 = Math.max(Mth.floor(double9 - double5), cgw4.getMinZ());
+        double double11 = Math.min(Mth.ceil(double9 + double5), cgw4.getMaxZ());
+        if (double7 > cgw4.getMaxX() - double5) {
             float float23 = 0.0f;
             for (double double12 = double10; double12 < double11; ++double12, float23 += 0.5f) {
                 final double double13 = Math.min(1.0, double11 - double12);
                 final float float24 = (float)double13 * 0.5f;
-                this.vertex(cyg3, double7, double8, double9, bzw4.getMaxX(), 256, double12, float19 + float23, float19 + 0.0f);
-                this.vertex(cyg3, double7, double8, double9, bzw4.getMaxX(), 256, double12 + double13, float19 + float24 + float23, float19 + 0.0f);
-                this.vertex(cyg3, double7, double8, double9, bzw4.getMaxX(), 0, double12 + double13, float19 + float24 + float23, float19 + 128.0f);
-                this.vertex(cyg3, double7, double8, double9, bzw4.getMaxX(), 0, double12, float19 + float23, float19 + 128.0f);
+                this.vertex(dhg3, double7, double8, double9, cgw4.getMaxX(), 256, double12, float19 + float23, float19 + 0.0f);
+                this.vertex(dhg3, double7, double8, double9, cgw4.getMaxX(), 256, double12 + double13, float19 + float24 + float23, float19 + 0.0f);
+                this.vertex(dhg3, double7, double8, double9, cgw4.getMaxX(), 0, double12 + double13, float19 + float24 + float23, float19 + 128.0f);
+                this.vertex(dhg3, double7, double8, double9, cgw4.getMaxX(), 0, double12, float19 + float23, float19 + 128.0f);
             }
         }
-        if (double7 < bzw4.getMinX() + double5) {
+        if (double7 < cgw4.getMinX() + double5) {
             float float23 = 0.0f;
             for (double double12 = double10; double12 < double11; ++double12, float23 += 0.5f) {
                 final double double13 = Math.min(1.0, double11 - double12);
                 final float float24 = (float)double13 * 0.5f;
-                this.vertex(cyg3, double7, double8, double9, bzw4.getMinX(), 256, double12, float19 + float23, float19 + 0.0f);
-                this.vertex(cyg3, double7, double8, double9, bzw4.getMinX(), 256, double12 + double13, float19 + float24 + float23, float19 + 0.0f);
-                this.vertex(cyg3, double7, double8, double9, bzw4.getMinX(), 0, double12 + double13, float19 + float24 + float23, float19 + 128.0f);
-                this.vertex(cyg3, double7, double8, double9, bzw4.getMinX(), 0, double12, float19 + float23, float19 + 128.0f);
+                this.vertex(dhg3, double7, double8, double9, cgw4.getMinX(), 256, double12, float19 + float23, float19 + 0.0f);
+                this.vertex(dhg3, double7, double8, double9, cgw4.getMinX(), 256, double12 + double13, float19 + float24 + float23, float19 + 0.0f);
+                this.vertex(dhg3, double7, double8, double9, cgw4.getMinX(), 0, double12 + double13, float19 + float24 + float23, float19 + 128.0f);
+                this.vertex(dhg3, double7, double8, double9, cgw4.getMinX(), 0, double12, float19 + float23, float19 + 128.0f);
             }
         }
-        double10 = Math.max(Mth.floor(double7 - double5), bzw4.getMinX());
-        double11 = Math.min(Mth.ceil(double7 + double5), bzw4.getMaxX());
-        if (double9 > bzw4.getMaxZ() - double5) {
+        double10 = Math.max(Mth.floor(double7 - double5), cgw4.getMinX());
+        double11 = Math.min(Mth.ceil(double7 + double5), cgw4.getMaxX());
+        if (double9 > cgw4.getMaxZ() - double5) {
             float float23 = 0.0f;
             for (double double12 = double10; double12 < double11; ++double12, float23 += 0.5f) {
                 final double double13 = Math.min(1.0, double11 - double12);
                 final float float24 = (float)double13 * 0.5f;
-                this.vertex(cyg3, double7, double8, double9, double12, 256, bzw4.getMaxZ(), float19 + float23, float19 + 0.0f);
-                this.vertex(cyg3, double7, double8, double9, double12 + double13, 256, bzw4.getMaxZ(), float19 + float24 + float23, float19 + 0.0f);
-                this.vertex(cyg3, double7, double8, double9, double12 + double13, 0, bzw4.getMaxZ(), float19 + float24 + float23, float19 + 128.0f);
-                this.vertex(cyg3, double7, double8, double9, double12, 0, bzw4.getMaxZ(), float19 + float23, float19 + 128.0f);
+                this.vertex(dhg3, double7, double8, double9, double12, 256, cgw4.getMaxZ(), float19 + float23, float19 + 0.0f);
+                this.vertex(dhg3, double7, double8, double9, double12 + double13, 256, cgw4.getMaxZ(), float19 + float24 + float23, float19 + 0.0f);
+                this.vertex(dhg3, double7, double8, double9, double12 + double13, 0, cgw4.getMaxZ(), float19 + float24 + float23, float19 + 128.0f);
+                this.vertex(dhg3, double7, double8, double9, double12, 0, cgw4.getMaxZ(), float19 + float23, float19 + 128.0f);
             }
         }
-        if (double9 < bzw4.getMinZ() + double5) {
+        if (double9 < cgw4.getMinZ() + double5) {
             float float23 = 0.0f;
             for (double double12 = double10; double12 < double11; ++double12, float23 += 0.5f) {
                 final double double13 = Math.min(1.0, double11 - double12);
                 final float float24 = (float)double13 * 0.5f;
-                this.vertex(cyg3, double7, double8, double9, double12, 256, bzw4.getMinZ(), float19 + float23, float19 + 0.0f);
-                this.vertex(cyg3, double7, double8, double9, double12 + double13, 256, bzw4.getMinZ(), float19 + float24 + float23, float19 + 0.0f);
-                this.vertex(cyg3, double7, double8, double9, double12 + double13, 0, bzw4.getMinZ(), float19 + float24 + float23, float19 + 128.0f);
-                this.vertex(cyg3, double7, double8, double9, double12, 0, bzw4.getMinZ(), float19 + float23, float19 + 128.0f);
+                this.vertex(dhg3, double7, double8, double9, double12, 256, cgw4.getMinZ(), float19 + float23, float19 + 0.0f);
+                this.vertex(dhg3, double7, double8, double9, double12 + double13, 256, cgw4.getMinZ(), float19 + float24 + float23, float19 + 0.0f);
+                this.vertex(dhg3, double7, double8, double9, double12 + double13, 0, cgw4.getMinZ(), float19 + float24 + float23, float19 + 128.0f);
+                this.vertex(dhg3, double7, double8, double9, double12, 0, cgw4.getMinZ(), float19 + float23, float19 + 128.0f);
             }
         }
-        cyg3.end();
-        BufferUploader.end(cyg3);
+        dhg3.end();
+        BufferUploader.end(dhg3);
         RenderSystem.enableCull();
         RenderSystem.disableAlphaTest();
         RenderSystem.polygonOffset(0.0f, 0.0f);
@@ -1786,124 +1862,120 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         RenderSystem.depthMask(true);
     }
     
-    private void vertex(final BufferBuilder cyg, final double double2, final double double3, final double double4, final double double5, final int integer, final double double7, final float float8, final float float9) {
-        cyg.vertex(double5 - double2, integer - double3, double7 - double4).uv(float8, float9).endVertex();
+    private void vertex(final BufferBuilder dhg, final double double2, final double double3, final double double4, final double double5, final int integer, final double double7, final float float8, final float float9) {
+        dhg.vertex(double5 - double2, integer - double3, double7 - double4).uv(float8, float9).endVertex();
     }
     
-    private void renderHitOutline(final PoseStack cyl, final VertexConsumer cyo, final Entity akq, final double double4, final double double5, final double double6, final BlockPos fk, final BlockState byj) {
-        renderShape(cyl, cyo, byj.getShape(this.level, fk, CollisionContext.of(akq)), fk.getX() - double4, fk.getY() - double5, fk.getZ() - double6, 0.0f, 0.0f, 0.0f, 0.4f);
+    private void renderHitOutline(final PoseStack dhl, final VertexConsumer dhp, final Entity aom, final double double4, final double double5, final double double6, final BlockPos fu, final BlockState cfj) {
+        renderShape(dhl, dhp, cfj.getShape(this.level, fu, CollisionContext.of(aom)), fu.getX() - double4, fu.getY() - double5, fu.getZ() - double6, 0.0f, 0.0f, 0.0f, 0.4f);
     }
     
-    public static void renderVoxelShape(final PoseStack cyl, final VertexConsumer cyo, final VoxelShape cwf, final double double4, final double double5, final double double6, final float float7, final float float8, final float float9, final float float10) {
-        final List<AABB> list14 = cwf.toAabbs();
+    public static void renderVoxelShape(final PoseStack dhl, final VertexConsumer dhp, final VoxelShape dfg, final double double4, final double double5, final double double6, final float float7, final float float8, final float float9, final float float10) {
+        final List<AABB> list14 = dfg.toAabbs();
         final int integer15 = Mth.ceil(list14.size() / 3.0);
         for (int integer16 = 0; integer16 < list14.size(); ++integer16) {
-            final AABB cvf17 = list14.get(integer16);
+            final AABB deg17 = list14.get(integer16);
             final float float11 = (integer16 % (float)integer15 + 1.0f) / integer15;
             final float float12 = (float)(integer16 / integer15);
             final float float13 = float11 * ((float12 == 0.0f) ? 1 : 0);
             final float float14 = float11 * ((float12 == 1.0f) ? 1 : 0);
             final float float15 = float11 * ((float12 == 2.0f) ? 1 : 0);
-            renderShape(cyl, cyo, Shapes.create(cvf17.move(0.0, 0.0, 0.0)), double4, double5, double6, float13, float14, float15, 1.0f);
+            renderShape(dhl, dhp, Shapes.create(deg17.move(0.0, 0.0, 0.0)), double4, double5, double6, float13, float14, float15, 1.0f);
         }
     }
     
-    private static void renderShape(final PoseStack cyl, final VertexConsumer cyo, final VoxelShape cwf, final double double4, final double double5, final double double6, final float float7, final float float8, final float float9, final float float10) {
-        final Matrix4f b14 = cyl.last().pose();
+    private static void renderShape(final PoseStack dhl, final VertexConsumer dhp, final VoxelShape dfg, final double double4, final double double5, final double double6, final float float7, final float float8, final float float9, final float float10) {
+        final Matrix4f b14 = dhl.last().pose();
         final Matrix4f matrix4f;
-        cwf.forAllEdges((double10, double11, double12, double13, double14, double15) -> {
-            cyo.vertex(matrix4f, (float)(double10 + double4), (float)(double11 + double5), (float)(double12 + double6)).color(float7, float8, float9, float10).endVertex();
-            cyo.vertex(matrix4f, (float)(double13 + double4), (float)(double14 + double5), (float)(double15 + double6)).color(float7, float8, float9, float10).endVertex();
+        dfg.forAllEdges((double10, double11, double12, double13, double14, double15) -> {
+            dhp.vertex(matrix4f, (float)(double10 + double4), (float)(double11 + double5), (float)(double12 + double6)).color(float7, float8, float9, float10).endVertex();
+            dhp.vertex(matrix4f, (float)(double13 + double4), (float)(double14 + double5), (float)(double15 + double6)).color(float7, float8, float9, float10).endVertex();
         });
     }
     
-    public static void renderLineBox(final VertexConsumer cyo, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final float float8, final float float9, final float float10, final float float11) {
-        renderLineBox(new PoseStack(), cyo, double2, double3, double4, double5, double6, double7, float8, float9, float10, float11, float8, float9, float10);
+    public static void renderLineBox(final PoseStack dhl, final VertexConsumer dhp, final AABB deg, final float float4, final float float5, final float float6, final float float7) {
+        renderLineBox(dhl, dhp, deg.minX, deg.minY, deg.minZ, deg.maxX, deg.maxY, deg.maxZ, float4, float5, float6, float7, float4, float5, float6);
     }
     
-    public static void renderLineBox(final PoseStack cyl, final VertexConsumer cyo, final AABB cvf, final float float4, final float float5, final float float6, final float float7) {
-        renderLineBox(cyl, cyo, cvf.minX, cvf.minY, cvf.minZ, cvf.maxX, cvf.maxY, cvf.maxZ, float4, float5, float6, float7, float4, float5, float6);
+    public static void renderLineBox(final PoseStack dhl, final VertexConsumer dhp, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8, final float float9, final float float10, final float float11, final float float12) {
+        renderLineBox(dhl, dhp, double3, double4, double5, double6, double7, double8, float9, float10, float11, float12, float9, float10, float11);
     }
     
-    public static void renderLineBox(final PoseStack cyl, final VertexConsumer cyo, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8, final float float9, final float float10, final float float11, final float float12) {
-        renderLineBox(cyl, cyo, double3, double4, double5, double6, double7, double8, float9, float10, float11, float12, float9, float10, float11);
-    }
-    
-    public static void renderLineBox(final PoseStack cyl, final VertexConsumer cyo, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8, final float float9, final float float10, final float float11, final float float12, final float float13, final float float14, final float float15) {
-        final Matrix4f b22 = cyl.last().pose();
+    public static void renderLineBox(final PoseStack dhl, final VertexConsumer dhp, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8, final float float9, final float float10, final float float11, final float float12, final float float13, final float float14, final float float15) {
+        final Matrix4f b22 = dhl.last().pose();
         final float float16 = (float)double3;
         final float float17 = (float)double4;
         final float float18 = (float)double5;
         final float float19 = (float)double6;
         final float float20 = (float)double7;
         final float float21 = (float)double8;
-        cyo.vertex(b22, float16, float17, float18).color(float9, float14, float15, float12).endVertex();
-        cyo.vertex(b22, float19, float17, float18).color(float9, float14, float15, float12).endVertex();
-        cyo.vertex(b22, float16, float17, float18).color(float13, float10, float15, float12).endVertex();
-        cyo.vertex(b22, float16, float20, float18).color(float13, float10, float15, float12).endVertex();
-        cyo.vertex(b22, float16, float17, float18).color(float13, float14, float11, float12).endVertex();
-        cyo.vertex(b22, float16, float17, float21).color(float13, float14, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float17, float18).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float20, float18).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float20, float18).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float16, float20, float18).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float16, float20, float18).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float16, float20, float21).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float16, float20, float21).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float16, float17, float21).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float16, float17, float21).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float17, float21).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float17, float21).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float17, float18).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float16, float20, float21).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float20, float21).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float17, float21).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float20, float21).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float20, float18).color(float9, float10, float11, float12).endVertex();
-        cyo.vertex(b22, float19, float20, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float16, float17, float18).color(float9, float14, float15, float12).endVertex();
+        dhp.vertex(b22, float19, float17, float18).color(float9, float14, float15, float12).endVertex();
+        dhp.vertex(b22, float16, float17, float18).color(float13, float10, float15, float12).endVertex();
+        dhp.vertex(b22, float16, float20, float18).color(float13, float10, float15, float12).endVertex();
+        dhp.vertex(b22, float16, float17, float18).color(float13, float14, float11, float12).endVertex();
+        dhp.vertex(b22, float16, float17, float21).color(float13, float14, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float17, float18).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float20, float18).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float20, float18).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float16, float20, float18).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float16, float20, float18).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float16, float20, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float16, float20, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float16, float17, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float16, float17, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float17, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float17, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float17, float18).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float16, float20, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float20, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float17, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float20, float21).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float20, float18).color(float9, float10, float11, float12).endVertex();
+        dhp.vertex(b22, float19, float20, float21).color(float9, float10, float11, float12).endVertex();
     }
     
-    public static void addChainedFilledBoxVertices(final BufferBuilder cyg, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final float float8, final float float9, final float float10, final float float11) {
-        cyg.vertex(double2, double3, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double3, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double3, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double3, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double6, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double6, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double6, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double3, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double6, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double3, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double3, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double3, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double6, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double6, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double6, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double3, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double6, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double3, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double3, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double3, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double3, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double3, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double3, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double6, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double6, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double2, double6, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double6, double4).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double6, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double6, double7).color(float8, float9, float10, float11).endVertex();
-        cyg.vertex(double5, double6, double7).color(float8, float9, float10, float11).endVertex();
+    public static void addChainedFilledBoxVertices(final BufferBuilder dhg, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final float float8, final float float9, final float float10, final float float11) {
+        dhg.vertex(double2, double3, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double3, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double3, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double3, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double6, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double6, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double6, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double3, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double6, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double3, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double3, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double3, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double6, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double6, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double6, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double3, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double6, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double3, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double3, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double3, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double3, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double3, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double3, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double6, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double6, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double2, double6, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double6, double4).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double6, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double6, double7).color(float8, float9, float10, float11).endVertex();
+        dhg.vertex(double5, double6, double7).color(float8, float9, float10, float11).endVertex();
     }
     
-    public void blockChanged(final BlockGetter bjg, final BlockPos fk, final BlockState byj3, final BlockState byj4, final int integer) {
-        this.setBlockDirty(fk, (integer & 0x8) != 0x0);
+    public void blockChanged(final BlockGetter bpg, final BlockPos fu, final BlockState cfj3, final BlockState cfj4, final int integer) {
+        this.setBlockDirty(fu, (integer & 0x8) != 0x0);
     }
     
-    private void setBlockDirty(final BlockPos fk, final boolean boolean2) {
-        for (int integer4 = fk.getZ() - 1; integer4 <= fk.getZ() + 1; ++integer4) {
-            for (int integer5 = fk.getX() - 1; integer5 <= fk.getX() + 1; ++integer5) {
-                for (int integer6 = fk.getY() - 1; integer6 <= fk.getY() + 1; ++integer6) {
+    private void setBlockDirty(final BlockPos fu, final boolean boolean2) {
+        for (int integer4 = fu.getZ() - 1; integer4 <= fu.getZ() + 1; ++integer4) {
+            for (int integer5 = fu.getX() - 1; integer5 <= fu.getX() + 1; ++integer5) {
+                for (int integer6 = fu.getY() - 1; integer6 <= fu.getY() + 1; ++integer6) {
                     this.setSectionDirty(integer5 >> 4, integer6 >> 4, integer4 >> 4, boolean2);
                 }
             }
@@ -1920,9 +1992,9 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         }
     }
     
-    public void setBlockDirty(final BlockPos fk, final BlockState byj2, final BlockState byj3) {
-        if (this.minecraft.getModelManager().requiresRender(byj2, byj3)) {
-            this.setBlocksDirty(fk.getX(), fk.getY(), fk.getZ(), fk.getX(), fk.getY(), fk.getZ());
+    public void setBlockDirty(final BlockPos fu, final BlockState cfj2, final BlockState cfj3) {
+        if (this.minecraft.getModelManager().requiresRender(cfj2, cfj3)) {
+            this.setBlocksDirty(fu.getX(), fu.getY(), fu.getZ(), fu.getX(), fu.getY(), fu.getZ());
         }
     }
     
@@ -1944,107 +2016,107 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         this.viewArea.setDirty(integer1, integer2, integer3, boolean4);
     }
     
-    public void playStreamingMusic(@Nullable final SoundEvent aah, final BlockPos fk) {
-        SoundInstance ecz4 = this.playingRecords.get(fk);
-        if (ecz4 != null) {
-            this.minecraft.getSoundManager().stop(ecz4);
-            this.playingRecords.remove(fk);
+    public void playStreamingMusic(@Nullable final SoundEvent ack, final BlockPos fu) {
+        SoundInstance eom4 = this.playingRecords.get(fu);
+        if (eom4 != null) {
+            this.minecraft.getSoundManager().stop(eom4);
+            this.playingRecords.remove(fu);
         }
-        if (aah != null) {
-            final RecordItem bfb5 = RecordItem.getBySound(aah);
-            if (bfb5 != null) {
-                this.minecraft.gui.setNowPlaying(bfb5.getDisplayName().getColoredString());
+        if (ack != null) {
+            final RecordItem bkx5 = RecordItem.getBySound(ack);
+            if (bkx5 != null) {
+                this.minecraft.gui.setNowPlaying(bkx5.getDisplayName());
             }
-            ecz4 = SimpleSoundInstance.forRecord(aah, (float)fk.getX(), (float)fk.getY(), (float)fk.getZ());
-            this.playingRecords.put(fk, ecz4);
-            this.minecraft.getSoundManager().play(ecz4);
+            eom4 = SimpleSoundInstance.forRecord(ack, fu.getX(), fu.getY(), fu.getZ());
+            this.playingRecords.put(fu, eom4);
+            this.minecraft.getSoundManager().play(eom4);
         }
-        this.notifyNearbyEntities(this.level, fk, aah != null);
+        this.notifyNearbyEntities(this.level, fu, ack != null);
     }
     
-    private void notifyNearbyEntities(final Level bjw, final BlockPos fk, final boolean boolean3) {
-        final List<LivingEntity> list5 = bjw.<LivingEntity>getEntitiesOfClass(LivingEntity.class, new AABB(fk).inflate(3.0));
-        for (final LivingEntity akz7 : list5) {
-            akz7.setRecordPlayingNearby(fk, boolean3);
+    private void notifyNearbyEntities(final Level bqb, final BlockPos fu, final boolean boolean3) {
+        final List<LivingEntity> list5 = bqb.<LivingEntity>getEntitiesOfClass(LivingEntity.class, new AABB(fu).inflate(3.0));
+        for (final LivingEntity aoy7 : list5) {
+            aoy7.setRecordPlayingNearby(fu, boolean3);
         }
     }
     
-    public void addParticle(final ParticleOptions gt, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-        this.addParticle(gt, boolean2, false, double3, double4, double5, double6, double7, double8);
+    public void addParticle(final ParticleOptions hf, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+        this.addParticle(hf, boolean2, false, double3, double4, double5, double6, double7, double8);
     }
     
-    public void addParticle(final ParticleOptions gt, final boolean boolean2, final boolean boolean3, final double double4, final double double5, final double double6, final double double7, final double double8, final double double9) {
+    public void addParticle(final ParticleOptions hf, final boolean boolean2, final boolean boolean3, final double double4, final double double5, final double double6, final double double7, final double double8, final double double9) {
         try {
-            this.addParticleInternal(gt, boolean2, boolean3, double4, double5, double6, double7, double8, double9);
+            this.addParticleInternal(hf, boolean2, boolean3, double4, double5, double6, double7, double8, double9);
         }
         catch (Throwable throwable17) {
-            final CrashReport h18 = CrashReport.forThrowable(throwable17, "Exception while adding particle");
-            final CrashReportCategory i19 = h18.addCategory("Particle being added");
-            i19.setDetail("ID", Registry.PARTICLE_TYPE.getKey(gt.getType()));
-            i19.setDetail("Parameters", gt.writeToString());
-            i19.setDetail("Position", () -> CrashReportCategory.formatLocation(double4, double5, double6));
-            throw new ReportedException(h18);
+            final CrashReport j18 = CrashReport.forThrowable(throwable17, "Exception while adding particle");
+            final CrashReportCategory k19 = j18.addCategory("Particle being added");
+            k19.setDetail("ID", Registry.PARTICLE_TYPE.getKey(hf.getType()));
+            k19.setDetail("Parameters", hf.writeToString());
+            k19.setDetail("Position", () -> CrashReportCategory.formatLocation(double4, double5, double6));
+            throw new ReportedException(j18);
         }
     }
     
-    private <T extends ParticleOptions> void addParticle(final T gt, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        this.addParticle(gt, gt.getType().getOverrideLimiter(), double2, double3, double4, double5, double6, double7);
+    private <T extends ParticleOptions> void addParticle(final T hf, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        this.addParticle(hf, hf.getType().getOverrideLimiter(), double2, double3, double4, double5, double6, double7);
     }
     
     @Nullable
-    private Particle addParticleInternal(final ParticleOptions gt, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
-        return this.addParticleInternal(gt, boolean2, false, double3, double4, double5, double6, double7, double8);
+    private Particle addParticleInternal(final ParticleOptions hf, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+        return this.addParticleInternal(hf, boolean2, false, double3, double4, double5, double6, double7, double8);
     }
     
     @Nullable
-    private Particle addParticleInternal(final ParticleOptions gt, final boolean boolean2, final boolean boolean3, final double double4, final double double5, final double double6, final double double7, final double double8, final double double9) {
-        final Camera dbb17 = this.minecraft.gameRenderer.getMainCamera();
-        if (this.minecraft == null || !dbb17.isInitialized() || this.minecraft.particleEngine == null) {
+    private Particle addParticleInternal(final ParticleOptions hf, final boolean boolean2, final boolean boolean3, final double double4, final double double5, final double double6, final double double7, final double double8, final double double9) {
+        final Camera dlj17 = this.minecraft.gameRenderer.getMainCamera();
+        if (this.minecraft == null || !dlj17.isInitialized() || this.minecraft.particleEngine == null) {
             return null;
         }
-        final ParticleStatus dbs18 = this.calculateParticleLevel(boolean3);
+        final ParticleStatus dmc18 = this.calculateParticleLevel(boolean3);
         if (boolean2) {
-            return this.minecraft.particleEngine.createParticle(gt, double4, double5, double6, double7, double8, double9);
+            return this.minecraft.particleEngine.createParticle(hf, double4, double5, double6, double7, double8, double9);
         }
-        if (dbb17.getPosition().distanceToSqr(double4, double5, double6) > 1024.0) {
+        if (dlj17.getPosition().distanceToSqr(double4, double5, double6) > 1024.0) {
             return null;
         }
-        if (dbs18 == ParticleStatus.MINIMAL) {
+        if (dmc18 == ParticleStatus.MINIMAL) {
             return null;
         }
-        return this.minecraft.particleEngine.createParticle(gt, double4, double5, double6, double7, double8, double9);
+        return this.minecraft.particleEngine.createParticle(hf, double4, double5, double6, double7, double8, double9);
     }
     
     private ParticleStatus calculateParticleLevel(final boolean boolean1) {
-        ParticleStatus dbs3 = this.minecraft.options.particles;
-        if (boolean1 && dbs3 == ParticleStatus.MINIMAL && this.level.random.nextInt(10) == 0) {
-            dbs3 = ParticleStatus.DECREASED;
+        ParticleStatus dmc3 = this.minecraft.options.particles;
+        if (boolean1 && dmc3 == ParticleStatus.MINIMAL && this.level.random.nextInt(10) == 0) {
+            dmc3 = ParticleStatus.DECREASED;
         }
-        if (dbs3 == ParticleStatus.DECREASED && this.level.random.nextInt(3) == 0) {
-            dbs3 = ParticleStatus.MINIMAL;
+        if (dmc3 == ParticleStatus.DECREASED && this.level.random.nextInt(3) == 0) {
+            dmc3 = ParticleStatus.MINIMAL;
         }
-        return dbs3;
+        return dmc3;
     }
     
     public void clear() {
     }
     
-    public void globalLevelEvent(final int integer1, final BlockPos fk, final int integer3) {
+    public void globalLevelEvent(final int integer1, final BlockPos fu, final int integer3) {
         switch (integer1) {
             case 1023:
             case 1028:
             case 1038: {
-                final Camera dbb5 = this.minecraft.gameRenderer.getMainCamera();
-                if (!dbb5.isInitialized()) {
+                final Camera dlj5 = this.minecraft.gameRenderer.getMainCamera();
+                if (!dlj5.isInitialized()) {
                     break;
                 }
-                final double double6 = fk.getX() - dbb5.getPosition().x;
-                final double double7 = fk.getY() - dbb5.getPosition().y;
-                final double double8 = fk.getZ() - dbb5.getPosition().z;
+                final double double6 = fu.getX() - dlj5.getPosition().x;
+                final double double7 = fu.getY() - dlj5.getPosition().y;
+                final double double8 = fu.getZ() - dlj5.getPosition().z;
                 final double double9 = Math.sqrt(double6 * double6 + double7 * double7 + double8 * double8);
-                double double10 = dbb5.getPosition().x;
-                double double11 = dbb5.getPosition().y;
-                double double12 = dbb5.getPosition().z;
+                double double10 = dlj5.getPosition().x;
+                double double11 = dlj5.getPosition().y;
+                double double12 = dlj5.getPosition().z;
                 if (double9 > 0.0) {
                     double10 += double6 / double9 * 2.0;
                     double11 += double7 / double9 * 2.0;
@@ -2064,53 +2136,53 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         }
     }
     
-    public void levelEvent(final Player ayj, final int integer2, final BlockPos fk, final int integer4) {
+    public void levelEvent(final Player bec, final int integer2, final BlockPos fu, final int integer4) {
         final Random random6 = this.level.random;
         switch (integer2) {
             case 1035: {
-                this.level.playLocalSound(fk, SoundEvents.BREWING_STAND_BREW, SoundSource.BLOCKS, 1.0f, 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.BREWING_STAND_BREW, SoundSource.BLOCKS, 1.0f, 1.0f, false);
                 break;
             }
             case 1033: {
-                this.level.playLocalSound(fk, SoundEvents.CHORUS_FLOWER_GROW, SoundSource.BLOCKS, 1.0f, 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.CHORUS_FLOWER_GROW, SoundSource.BLOCKS, 1.0f, 1.0f, false);
                 break;
             }
             case 1034: {
-                this.level.playLocalSound(fk, SoundEvents.CHORUS_FLOWER_DEATH, SoundSource.BLOCKS, 1.0f, 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.CHORUS_FLOWER_DEATH, SoundSource.BLOCKS, 1.0f, 1.0f, false);
                 break;
             }
             case 1032: {
-                this.minecraft.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.PORTAL_TRAVEL, random6.nextFloat() * 0.4f + 0.8f));
+                this.minecraft.getSoundManager().play(SimpleSoundInstance.forLocalAmbience(SoundEvents.PORTAL_TRAVEL, random6.nextFloat() * 0.4f + 0.8f, 0.25f));
                 break;
             }
             case 1001: {
-                this.level.playLocalSound(fk, SoundEvents.DISPENSER_FAIL, SoundSource.BLOCKS, 1.0f, 1.2f, false);
+                this.level.playLocalSound(fu, SoundEvents.DISPENSER_FAIL, SoundSource.BLOCKS, 1.0f, 1.2f, false);
                 break;
             }
             case 1000: {
-                this.level.playLocalSound(fk, SoundEvents.DISPENSER_DISPENSE, SoundSource.BLOCKS, 1.0f, 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.DISPENSER_DISPENSE, SoundSource.BLOCKS, 1.0f, 1.0f, false);
                 break;
             }
             case 1003: {
-                this.level.playLocalSound(fk, SoundEvents.ENDER_EYE_LAUNCH, SoundSource.NEUTRAL, 1.0f, 1.2f, false);
+                this.level.playLocalSound(fu, SoundEvents.ENDER_EYE_LAUNCH, SoundSource.NEUTRAL, 1.0f, 1.2f, false);
                 break;
             }
             case 1004: {
-                this.level.playLocalSound(fk, SoundEvents.FIREWORK_ROCKET_SHOOT, SoundSource.NEUTRAL, 1.0f, 1.2f, false);
+                this.level.playLocalSound(fu, SoundEvents.FIREWORK_ROCKET_SHOOT, SoundSource.NEUTRAL, 1.0f, 1.2f, false);
                 break;
             }
             case 1002: {
-                this.level.playLocalSound(fk, SoundEvents.DISPENSER_LAUNCH, SoundSource.BLOCKS, 1.0f, 1.2f, false);
+                this.level.playLocalSound(fu, SoundEvents.DISPENSER_LAUNCH, SoundSource.BLOCKS, 1.0f, 1.2f, false);
                 break;
             }
             case 2000: {
-                final Direction fp7 = Direction.from3DDataValue(integer4);
-                final int integer5 = fp7.getStepX();
-                final int integer6 = fp7.getStepY();
-                final int integer7 = fp7.getStepZ();
-                final double double11 = fk.getX() + integer5 * 0.6 + 0.5;
-                final double double12 = fk.getY() + integer6 * 0.6 + 0.5;
-                final double double13 = fk.getZ() + integer7 * 0.6 + 0.5;
+                final Direction fz7 = Direction.from3DDataValue(integer4);
+                final int integer5 = fz7.getStepX();
+                final int integer6 = fz7.getStepY();
+                final int integer7 = fz7.getStepZ();
+                final double double11 = fu.getX() + integer5 * 0.6 + 0.5;
+                final double double12 = fu.getY() + integer6 * 0.6 + 0.5;
+                final double double13 = fu.getZ() + integer7 * 0.6 + 0.5;
                 for (int integer8 = 0; integer8 < 10; ++integer8) {
                     final double double14 = random6.nextDouble() * 0.2 + 0.01;
                     final double double15 = double11 + integer5 * 0.01 + (random6.nextDouble() - 0.5) * integer7 * 0.5;
@@ -2124,9 +2196,9 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
                 break;
             }
             case 2003: {
-                final double double21 = fk.getX() + 0.5;
-                final double double22 = fk.getY();
-                final double double11 = fk.getZ() + 0.5;
+                final double double21 = fu.getX() + 0.5;
+                final double double22 = fu.getY();
+                final double double11 = fu.getZ() + 0.5;
                 for (int integer9 = 0; integer9 < 8; ++integer9) {
                     this.<ItemParticleOption>addParticle(new ItemParticleOption(ParticleTypes.ITEM, new ItemStack(Items.ENDER_EYE)), double21, double22, double11, random6.nextGaussian() * 0.15, random6.nextDouble() * 0.2, random6.nextGaussian() * 0.15);
                 }
@@ -2138,277 +2210,279 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
             }
             case 2002:
             case 2007: {
-                final double double21 = fk.getX();
-                final double double22 = fk.getY();
-                final double double11 = fk.getZ();
-                for (int integer9 = 0; integer9 < 8; ++integer9) {
-                    this.<ItemParticleOption>addParticle(new ItemParticleOption(ParticleTypes.ITEM, new ItemStack(Items.SPLASH_POTION)), double21, double22, double11, random6.nextGaussian() * 0.15, random6.nextDouble() * 0.2, random6.nextGaussian() * 0.15);
+                final Vec3 dem7 = Vec3.atBottomCenterOf(fu);
+                for (int integer5 = 0; integer5 < 8; ++integer5) {
+                    this.<ItemParticleOption>addParticle(new ItemParticleOption(ParticleTypes.ITEM, new ItemStack(Items.SPLASH_POTION)), dem7.x, dem7.y, dem7.z, random6.nextGaussian() * 0.15, random6.nextDouble() * 0.2, random6.nextGaussian() * 0.15);
                 }
-                final float float13 = (integer4 >> 16 & 0xFF) / 255.0f;
-                final float float14 = (integer4 >> 8 & 0xFF) / 255.0f;
-                final float float15 = (integer4 >> 0 & 0xFF) / 255.0f;
-                final ParticleOptions gt16 = (integer2 == 2007) ? ParticleTypes.INSTANT_EFFECT : ParticleTypes.EFFECT;
-                for (int integer8 = 0; integer8 < 100; ++integer8) {
-                    final double double14 = random6.nextDouble() * 4.0;
-                    final double double15 = random6.nextDouble() * 3.141592653589793 * 2.0;
-                    final double double16 = Math.cos(double15) * double14;
-                    final double double17 = 0.01 + random6.nextDouble() * 0.5;
-                    final double double18 = Math.sin(double15) * double14;
-                    final Particle doz28 = this.addParticleInternal(gt16, gt16.getType().getOverrideLimiter(), double21 + double16 * 0.1, double22 + 0.3, double11 + double18 * 0.1, double16, double17, double18);
-                    if (doz28 != null) {
-                        final float float16 = 0.75f + random6.nextFloat() * 0.25f;
-                        doz28.setColor(float13 * float16, float14 * float16, float15 * float16);
-                        doz28.setPower((float)double14);
+                final float float8 = (integer4 >> 16 & 0xFF) / 255.0f;
+                final float float9 = (integer4 >> 8 & 0xFF) / 255.0f;
+                final float float10 = (integer4 >> 0 & 0xFF) / 255.0f;
+                final ParticleOptions hf11 = (integer2 == 2007) ? ParticleTypes.INSTANT_EFFECT : ParticleTypes.EFFECT;
+                for (int integer10 = 0; integer10 < 100; ++integer10) {
+                    final double double12 = random6.nextDouble() * 4.0;
+                    final double double13 = random6.nextDouble() * 3.141592653589793 * 2.0;
+                    final double double23 = Math.cos(double13) * double12;
+                    final double double24 = 0.01 + random6.nextDouble() * 0.5;
+                    final double double25 = Math.sin(double13) * double12;
+                    final Particle dzz23 = this.addParticleInternal(hf11, hf11.getType().getOverrideLimiter(), dem7.x + double23 * 0.1, dem7.y + 0.3, dem7.z + double25 * 0.1, double23, double24, double25);
+                    if (dzz23 != null) {
+                        final float float11 = 0.75f + random6.nextFloat() * 0.25f;
+                        dzz23.setColor(float8 * float11, float9 * float11, float10 * float11);
+                        dzz23.setPower((float)double12);
                     }
                 }
-                this.level.playLocalSound(fk, SoundEvents.SPLASH_POTION_BREAK, SoundSource.NEUTRAL, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.SPLASH_POTION_BREAK, SoundSource.NEUTRAL, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 2001: {
-                final BlockState byj7 = Block.stateById(integer4);
-                if (!byj7.isAir()) {
-                    final SoundType bum8 = byj7.getSoundType();
-                    this.level.playLocalSound(fk, bum8.getBreakSound(), SoundSource.BLOCKS, (bum8.getVolume() + 1.0f) / 2.0f, bum8.getPitch() * 0.8f, false);
+                final BlockState cfj7 = Block.stateById(integer4);
+                if (!cfj7.isAir()) {
+                    final SoundType cbh8 = cfj7.getSoundType();
+                    this.level.playLocalSound(fu, cbh8.getBreakSound(), SoundSource.BLOCKS, (cbh8.getVolume() + 1.0f) / 2.0f, cbh8.getPitch() * 0.8f, false);
                 }
-                this.minecraft.particleEngine.destroy(fk, byj7);
+                this.minecraft.particleEngine.destroy(fu, cfj7);
                 break;
             }
             case 2004: {
                 for (int integer5 = 0; integer5 < 20; ++integer5) {
-                    final double double22 = fk.getX() + 0.5 + (this.level.random.nextFloat() - 0.5) * 2.0;
-                    final double double11 = fk.getY() + 0.5 + (this.level.random.nextFloat() - 0.5) * 2.0;
-                    final double double12 = fk.getZ() + 0.5 + (this.level.random.nextFloat() - 0.5) * 2.0;
+                    final double double22 = fu.getX() + 0.5 + (random6.nextDouble() - 0.5) * 2.0;
+                    final double double11 = fu.getY() + 0.5 + (random6.nextDouble() - 0.5) * 2.0;
+                    final double double12 = fu.getZ() + 0.5 + (random6.nextDouble() - 0.5) * 2.0;
                     this.level.addParticle(ParticleTypes.SMOKE, double22, double11, double12, 0.0, 0.0, 0.0);
                     this.level.addParticle(ParticleTypes.FLAME, double22, double11, double12, 0.0, 0.0, 0.0);
                 }
                 break;
             }
             case 2005: {
-                BoneMealItem.addGrowthParticles(this.level, fk, integer4);
+                BoneMealItem.addGrowthParticles(this.level, fu, integer4);
                 break;
             }
             case 2008: {
-                this.level.addParticle(ParticleTypes.EXPLOSION, fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5, 0.0, 0.0, 0.0);
+                this.level.addParticle(ParticleTypes.EXPLOSION, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, 0.0, 0.0, 0.0);
                 break;
             }
             case 1500: {
-                ComposterBlock.handleFill(this.level, fk, integer4 > 0);
+                ComposterBlock.handleFill(this.level, fu, integer4 > 0);
                 break;
             }
             case 1501: {
-                this.level.playLocalSound(fk, SoundEvents.LAVA_EXTINGUISH, SoundSource.BLOCKS, 0.5f, 2.6f + (this.level.getRandom().nextFloat() - this.level.getRandom().nextFloat()) * 0.8f, false);
+                this.level.playLocalSound(fu, SoundEvents.LAVA_EXTINGUISH, SoundSource.BLOCKS, 0.5f, 2.6f + (random6.nextFloat() - random6.nextFloat()) * 0.8f, false);
                 for (int integer5 = 0; integer5 < 8; ++integer5) {
-                    this.level.addParticle(ParticleTypes.LARGE_SMOKE, fk.getX() + Math.random(), fk.getY() + 1.2, fk.getZ() + Math.random(), 0.0, 0.0, 0.0);
+                    this.level.addParticle(ParticleTypes.LARGE_SMOKE, fu.getX() + random6.nextDouble(), fu.getY() + 1.2, fu.getZ() + random6.nextDouble(), 0.0, 0.0, 0.0);
                 }
                 break;
             }
             case 1502: {
-                this.level.playLocalSound(fk, SoundEvents.REDSTONE_TORCH_BURNOUT, SoundSource.BLOCKS, 0.5f, 2.6f + (this.level.random.nextFloat() - this.level.random.nextFloat()) * 0.8f, false);
+                this.level.playLocalSound(fu, SoundEvents.REDSTONE_TORCH_BURNOUT, SoundSource.BLOCKS, 0.5f, 2.6f + (random6.nextFloat() - random6.nextFloat()) * 0.8f, false);
                 for (int integer5 = 0; integer5 < 5; ++integer5) {
-                    final double double22 = fk.getX() + random6.nextDouble() * 0.6 + 0.2;
-                    final double double11 = fk.getY() + random6.nextDouble() * 0.6 + 0.2;
-                    final double double12 = fk.getZ() + random6.nextDouble() * 0.6 + 0.2;
+                    final double double22 = fu.getX() + random6.nextDouble() * 0.6 + 0.2;
+                    final double double11 = fu.getY() + random6.nextDouble() * 0.6 + 0.2;
+                    final double double12 = fu.getZ() + random6.nextDouble() * 0.6 + 0.2;
                     this.level.addParticle(ParticleTypes.SMOKE, double22, double11, double12, 0.0, 0.0, 0.0);
                 }
                 break;
             }
             case 1503: {
-                this.level.playLocalSound(fk, SoundEvents.END_PORTAL_FRAME_FILL, SoundSource.BLOCKS, 1.0f, 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.END_PORTAL_FRAME_FILL, SoundSource.BLOCKS, 1.0f, 1.0f, false);
                 for (int integer5 = 0; integer5 < 16; ++integer5) {
-                    final double double22 = fk.getX() + (5.0f + random6.nextFloat() * 6.0f) / 16.0f;
-                    final double double11 = fk.getY() + 0.8125f;
-                    final double double12 = fk.getZ() + (5.0f + random6.nextFloat() * 6.0f) / 16.0f;
-                    final double double13 = 0.0;
-                    final double double23 = 0.0;
-                    final double double24 = 0.0;
+                    final double double22 = fu.getX() + (5.0 + random6.nextDouble() * 6.0) / 16.0;
+                    final double double11 = fu.getY() + 0.8125;
+                    final double double12 = fu.getZ() + (5.0 + random6.nextDouble() * 6.0) / 16.0;
                     this.level.addParticle(ParticleTypes.SMOKE, double22, double11, double12, 0.0, 0.0, 0.0);
                 }
                 break;
             }
             case 2006: {
                 for (int integer5 = 0; integer5 < 200; ++integer5) {
-                    final float float17 = random6.nextFloat() * 4.0f;
-                    final float float18 = random6.nextFloat() * 6.2831855f;
-                    final double double11 = Mth.cos(float18) * float17;
+                    final float float9 = random6.nextFloat() * 4.0f;
+                    final float float10 = random6.nextFloat() * 6.2831855f;
+                    final double double11 = Mth.cos(float10) * float9;
                     final double double12 = 0.01 + random6.nextDouble() * 0.5;
-                    final double double13 = Mth.sin(float18) * float17;
-                    final Particle doz29 = this.addParticleInternal(ParticleTypes.DRAGON_BREATH, false, fk.getX() + double11 * 0.1, fk.getY() + 0.3, fk.getZ() + double13 * 0.1, double11, double12, double13);
-                    if (doz29 != null) {
-                        doz29.setPower(float17);
+                    final double double13 = Mth.sin(float10) * float9;
+                    final Particle dzz24 = this.addParticleInternal(ParticleTypes.DRAGON_BREATH, false, fu.getX() + double11 * 0.1, fu.getY() + 0.3, fu.getZ() + double13 * 0.1, double11, double12, double13);
+                    if (dzz24 != null) {
+                        dzz24.setPower(float9);
                     }
                 }
-                this.level.playLocalSound(fk, SoundEvents.DRAGON_FIREBALL_EXPLODE, SoundSource.HOSTILE, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                if (integer4 == 1) {
+                    this.level.playLocalSound(fu, SoundEvents.DRAGON_FIREBALL_EXPLODE, SoundSource.HOSTILE, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
+                    break;
+                }
                 break;
             }
             case 2009: {
                 for (int integer5 = 0; integer5 < 8; ++integer5) {
-                    this.level.addParticle(ParticleTypes.CLOUD, fk.getX() + Math.random(), fk.getY() + 1.2, fk.getZ() + Math.random(), 0.0, 0.0, 0.0);
+                    this.level.addParticle(ParticleTypes.CLOUD, fu.getX() + random6.nextDouble(), fu.getY() + 1.2, fu.getZ() + random6.nextDouble(), 0.0, 0.0, 0.0);
                 }
                 break;
             }
             case 1012: {
-                this.level.playLocalSound(fk, SoundEvents.WOODEN_DOOR_CLOSE, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.WOODEN_DOOR_CLOSE, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1036: {
-                this.level.playLocalSound(fk, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1013: {
-                this.level.playLocalSound(fk, SoundEvents.WOODEN_TRAPDOOR_CLOSE, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.WOODEN_TRAPDOOR_CLOSE, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1014: {
-                this.level.playLocalSound(fk, SoundEvents.FENCE_GATE_CLOSE, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.FENCE_GATE_CLOSE, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1011: {
-                this.level.playLocalSound(fk, SoundEvents.IRON_DOOR_CLOSE, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.IRON_DOOR_CLOSE, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1006: {
-                this.level.playLocalSound(fk, SoundEvents.WOODEN_DOOR_OPEN, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.WOODEN_DOOR_OPEN, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1007: {
-                this.level.playLocalSound(fk, SoundEvents.WOODEN_TRAPDOOR_OPEN, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.WOODEN_TRAPDOOR_OPEN, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1037: {
-                this.level.playLocalSound(fk, SoundEvents.IRON_TRAPDOOR_OPEN, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.IRON_TRAPDOOR_OPEN, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1008: {
-                this.level.playLocalSound(fk, SoundEvents.FENCE_GATE_OPEN, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.FENCE_GATE_OPEN, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1005: {
-                this.level.playLocalSound(fk, SoundEvents.IRON_DOOR_OPEN, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.IRON_DOOR_OPEN, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1009: {
-                this.level.playLocalSound(fk, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5f, 2.6f + (random6.nextFloat() - random6.nextFloat()) * 0.8f, false);
+                this.level.playLocalSound(fu, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5f, 2.6f + (random6.nextFloat() - random6.nextFloat()) * 0.8f, false);
                 break;
             }
             case 1029: {
-                this.level.playLocalSound(fk, SoundEvents.ANVIL_DESTROY, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.ANVIL_DESTROY, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1030: {
-                this.level.playLocalSound(fk, SoundEvents.ANVIL_USE, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.ANVIL_USE, SoundSource.BLOCKS, 1.0f, random6.nextFloat() * 0.1f + 0.9f, false);
+                break;
+            }
+            case 1044: {
+                this.level.playLocalSound(fu, SoundEvents.SMITHING_TABLE_USE, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1031: {
-                this.level.playLocalSound(fk, SoundEvents.ANVIL_LAND, SoundSource.BLOCKS, 0.3f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.ANVIL_LAND, SoundSource.BLOCKS, 0.3f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1039: {
-                this.level.playLocalSound(fk, SoundEvents.PHANTOM_BITE, SoundSource.HOSTILE, 0.3f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.PHANTOM_BITE, SoundSource.HOSTILE, 0.3f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1010: {
                 if (Item.byId(integer4) instanceof RecordItem) {
-                    this.playStreamingMusic(((RecordItem)Item.byId(integer4)).getSound(), fk);
+                    this.playStreamingMusic(((RecordItem)Item.byId(integer4)).getSound(), fu);
                     break;
                 }
-                this.playStreamingMusic(null, fk);
+                this.playStreamingMusic(null, fu);
                 break;
             }
             case 1015: {
-                this.level.playLocalSound(fk, SoundEvents.GHAST_WARN, SoundSource.HOSTILE, 10.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.GHAST_WARN, SoundSource.HOSTILE, 10.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1017: {
-                this.level.playLocalSound(fk, SoundEvents.ENDER_DRAGON_SHOOT, SoundSource.HOSTILE, 10.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.ENDER_DRAGON_SHOOT, SoundSource.HOSTILE, 10.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1016: {
-                this.level.playLocalSound(fk, SoundEvents.GHAST_SHOOT, SoundSource.HOSTILE, 10.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.GHAST_SHOOT, SoundSource.HOSTILE, 10.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1019: {
-                this.level.playLocalSound(fk, SoundEvents.ZOMBIE_ATTACK_WOODEN_DOOR, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.ZOMBIE_ATTACK_WOODEN_DOOR, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1022: {
-                this.level.playLocalSound(fk, SoundEvents.WITHER_BREAK_BLOCK, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.WITHER_BREAK_BLOCK, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1021: {
-                this.level.playLocalSound(fk, SoundEvents.ZOMBIE_BREAK_WOODEN_DOOR, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.ZOMBIE_BREAK_WOODEN_DOOR, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1020: {
-                this.level.playLocalSound(fk, SoundEvents.ZOMBIE_ATTACK_IRON_DOOR, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.ZOMBIE_ATTACK_IRON_DOOR, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1018: {
-                this.level.playLocalSound(fk, SoundEvents.BLAZE_SHOOT, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.BLAZE_SHOOT, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1024: {
-                this.level.playLocalSound(fk, SoundEvents.WITHER_SHOOT, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.WITHER_SHOOT, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1026: {
-                this.level.playLocalSound(fk, SoundEvents.ZOMBIE_INFECT, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.ZOMBIE_INFECT, SoundSource.HOSTILE, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1027: {
-                this.level.playLocalSound(fk, SoundEvents.ZOMBIE_VILLAGER_CONVERTED, SoundSource.NEUTRAL, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.ZOMBIE_VILLAGER_CONVERTED, SoundSource.NEUTRAL, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1040: {
-                this.level.playLocalSound(fk, SoundEvents.ZOMBIE_CONVERTED_TO_DROWNED, SoundSource.NEUTRAL, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.ZOMBIE_CONVERTED_TO_DROWNED, SoundSource.NEUTRAL, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1041: {
-                this.level.playLocalSound(fk, SoundEvents.HUSK_CONVERTED_TO_ZOMBIE, SoundSource.NEUTRAL, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.HUSK_CONVERTED_TO_ZOMBIE, SoundSource.NEUTRAL, 2.0f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1025: {
-                this.level.playLocalSound(fk, SoundEvents.BAT_TAKEOFF, SoundSource.NEUTRAL, 0.05f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
+                this.level.playLocalSound(fu, SoundEvents.BAT_TAKEOFF, SoundSource.NEUTRAL, 0.05f, (random6.nextFloat() - random6.nextFloat()) * 0.2f + 1.0f, false);
                 break;
             }
             case 1042: {
-                this.level.playLocalSound(fk, SoundEvents.GRINDSTONE_USE, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.GRINDSTONE_USE, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 1043: {
-                this.level.playLocalSound(fk, SoundEvents.BOOK_PAGE_TURN, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
+                this.level.playLocalSound(fu, SoundEvents.BOOK_PAGE_TURN, SoundSource.BLOCKS, 1.0f, this.level.random.nextFloat() * 0.1f + 0.9f, false);
                 break;
             }
             case 3000: {
-                this.level.addParticle(ParticleTypes.EXPLOSION_EMITTER, true, fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5, 0.0, 0.0, 0.0);
-                this.level.playLocalSound(fk, SoundEvents.END_GATEWAY_SPAWN, SoundSource.BLOCKS, 10.0f, (1.0f + (this.level.random.nextFloat() - this.level.random.nextFloat()) * 0.2f) * 0.7f, false);
+                this.level.addParticle(ParticleTypes.EXPLOSION_EMITTER, true, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, 0.0, 0.0, 0.0);
+                this.level.playLocalSound(fu, SoundEvents.END_GATEWAY_SPAWN, SoundSource.BLOCKS, 10.0f, (1.0f + (this.level.random.nextFloat() - this.level.random.nextFloat()) * 0.2f) * 0.7f, false);
                 break;
             }
             case 3001: {
-                this.level.playLocalSound(fk, SoundEvents.ENDER_DRAGON_GROWL, SoundSource.HOSTILE, 64.0f, 0.8f + this.level.random.nextFloat() * 0.3f, false);
+                this.level.playLocalSound(fu, SoundEvents.ENDER_DRAGON_GROWL, SoundSource.HOSTILE, 64.0f, 0.8f + this.level.random.nextFloat() * 0.3f, false);
                 break;
             }
         }
     }
     
-    public void destroyBlockProgress(final int integer1, final BlockPos fk, final int integer3) {
+    public void destroyBlockProgress(final int integer1, final BlockPos fu, final int integer3) {
         if (integer3 < 0 || integer3 >= 10) {
-            final BlockDestructionProgress wn5 = (BlockDestructionProgress)this.destroyingBlocks.remove(integer1);
-            if (wn5 != null) {
-                this.removeProgress(wn5);
+            final BlockDestructionProgress yn5 = (BlockDestructionProgress)this.destroyingBlocks.remove(integer1);
+            if (yn5 != null) {
+                this.removeProgress(yn5);
             }
         }
         else {
-            BlockDestructionProgress wn5 = (BlockDestructionProgress)this.destroyingBlocks.get(integer1);
-            if (wn5 != null) {
-                this.removeProgress(wn5);
+            BlockDestructionProgress yn5 = (BlockDestructionProgress)this.destroyingBlocks.get(integer1);
+            if (yn5 != null) {
+                this.removeProgress(yn5);
             }
-            if (wn5 == null || wn5.getPos().getX() != fk.getX() || wn5.getPos().getY() != fk.getY() || wn5.getPos().getZ() != fk.getZ()) {
-                wn5 = new BlockDestructionProgress(integer1, fk);
-                this.destroyingBlocks.put(integer1, wn5);
+            if (yn5 == null || yn5.getPos().getX() != fu.getX() || yn5.getPos().getY() != fu.getY() || yn5.getPos().getZ() != fu.getZ()) {
+                yn5 = new BlockDestructionProgress(integer1, fu);
+                this.destroyingBlocks.put(integer1, yn5);
             }
-            wn5.setProgress(integer3);
-            wn5.updateTick(this.ticks);
-            ((SortedSet)this.destructionProgress.computeIfAbsent(wn5.getPos().asLong(), long1 -> Sets.<Comparable>newTreeSet())).add(wn5);
+            yn5.setProgress(integer3);
+            yn5.updateTick(this.ticks);
+            ((SortedSet)this.destructionProgress.computeIfAbsent(yn5.getPos().asLong(), long1 -> Sets.<Comparable>newTreeSet())).add(yn5);
         }
     }
     
@@ -2428,27 +2502,53 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         }
     }
     
-    public static int getLightColor(final BlockAndTintGetter bje, final BlockPos fk) {
-        return getLightColor(bje, bje.getBlockState(fk), fk);
+    public static int getLightColor(final BlockAndTintGetter bpe, final BlockPos fu) {
+        return getLightColor(bpe, bpe.getBlockState(fu), fu);
     }
     
-    public static int getLightColor(final BlockAndTintGetter bje, final BlockState byj, final BlockPos fk) {
-        if (byj.emissiveRendering()) {
+    public static int getLightColor(final BlockAndTintGetter bpe, final BlockState cfj, final BlockPos fu) {
+        if (cfj.emissiveRendering(bpe, fu)) {
             return 15728880;
         }
-        final int integer4 = bje.getBrightness(LightLayer.SKY, fk);
-        int integer5 = bje.getBrightness(LightLayer.BLOCK, fk);
-        final int integer6 = byj.getLightEmission();
+        final int integer4 = bpe.getBrightness(LightLayer.SKY, fu);
+        int integer5 = bpe.getBrightness(LightLayer.BLOCK, fu);
+        final int integer6 = cfj.getLightEmission();
         if (integer5 < integer6) {
             integer5 = integer6;
         }
         return integer4 << 20 | integer5 << 4;
     }
     
+    @Nullable
     public RenderTarget entityTarget() {
         return this.entityTarget;
     }
     
+    @Nullable
+    public RenderTarget getTranslucentTarget() {
+        return this.translucentTarget;
+    }
+    
+    @Nullable
+    public RenderTarget getItemEntityTarget() {
+        return this.itemEntityTarget;
+    }
+    
+    @Nullable
+    public RenderTarget getParticlesTarget() {
+        return this.particlesTarget;
+    }
+    
+    @Nullable
+    public RenderTarget getWeatherTarget() {
+        return this.weatherTarget;
+    }
+    
+    @Nullable
+    public RenderTarget getCloudsTarget() {
+        return this.cloudsTarget;
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
         MOON_LOCATION = new ResourceLocation("textures/environment/moon_phases.png");
@@ -2467,18 +2567,24 @@ public class LevelRenderer implements AutoCloseable, ResourceManagerReloadListen
         private byte directions;
         private final int step;
         
-        private RenderChunkInfo(final ChunkRenderDispatcher.RenderChunk c, @Nullable final Direction fp, final int integer) {
+        private RenderChunkInfo(final ChunkRenderDispatcher.RenderChunk c, @Nullable final Direction fz, final int integer) {
             this.chunk = c;
-            this.sourceDirection = fp;
+            this.sourceDirection = fz;
             this.step = integer;
         }
         
-        public void setDirections(final byte byte1, final Direction fp) {
-            this.directions |= (byte)(byte1 | 1 << fp.ordinal());
+        public void setDirections(final byte byte1, final Direction fz) {
+            this.directions |= (byte)(byte1 | 1 << fz.ordinal());
         }
         
-        public boolean hasDirection(final Direction fp) {
-            return (this.directions & 1 << fp.ordinal()) > 0;
+        public boolean hasDirection(final Direction fz) {
+            return (this.directions & 1 << fz.ordinal()) > 0;
+        }
+    }
+    
+    public static class TranparencyShaderException extends RuntimeException {
+        public TranparencyShaderException(final String string, final Throwable throwable) {
+            super(string, throwable);
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/LightTexture.java b/src/net/minecraft/client/renderer/LightTexture.java
index 87d07f7..fd73496 100644
--- a/src/net/minecraft/client/renderer/LightTexture.java
+++ b/src/net/minecraft/client/renderer/LightTexture.java
@@ -1,7 +1,6 @@
 package net.minecraft.client.renderer;
 
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.Level;
 import com.mojang.math.Vector3f;
 import net.minecraft.world.entity.LivingEntity;
@@ -21,9 +20,9 @@ public class LightTexture implements AutoCloseable {
     private final GameRenderer renderer;
     private final Minecraft minecraft;
     
-    public LightTexture(final GameRenderer dqn, final Minecraft dbn) {
-        this.renderer = dqn;
-        this.minecraft = dbn;
+    public LightTexture(final GameRenderer ebs, final Minecraft dlx) {
+        this.renderer = ebs;
+        this.minecraft = dlx;
         this.lightTexture = new DynamicTexture(16, 16, false);
         this.lightTextureLocation = this.minecraft.getTextureManager().register("light_map", this.lightTexture);
         this.lightPixels = this.lightTexture.getPixels();
@@ -76,13 +75,13 @@ public class LightTexture implements AutoCloseable {
         }
         this.updateLightTexture = false;
         this.minecraft.getProfiler().push("lightTex");
-        final ClientLevel dno3 = this.minecraft.level;
-        if (dno3 == null) {
+        final ClientLevel dym3 = this.minecraft.level;
+        if (dym3 == null) {
             return;
         }
-        final float float2 = dno3.getSkyDarken(1.0f);
+        final float float2 = dym3.getSkyDarken(1.0f);
         float float3;
-        if (dno3.getSkyFlashTime() > 0) {
+        if (dym3.getSkyFlashTime() > 0) {
             float3 = 1.0f;
         }
         else {
@@ -99,54 +98,54 @@ public class LightTexture implements AutoCloseable {
         else {
             float5 = 0.0f;
         }
-        final Vector3f e8 = new Vector3f(float2, float2, 1.0f);
-        e8.lerp(new Vector3f(1.0f, 1.0f, 1.0f), 0.35f);
+        final Vector3f g8 = new Vector3f(float2, float2, 1.0f);
+        g8.lerp(new Vector3f(1.0f, 1.0f, 1.0f), 0.35f);
         final float float6 = this.blockLightRedFlicker + 1.5f;
-        final Vector3f e9 = new Vector3f();
+        final Vector3f g9 = new Vector3f();
         for (int integer11 = 0; integer11 < 16; ++integer11) {
             for (int integer12 = 0; integer12 < 16; ++integer12) {
-                final float float7 = this.getBrightness(dno3, integer11) * float3;
+                final float float7 = this.getBrightness(dym3, integer11) * float3;
                 final float float9;
-                final float float8 = float9 = this.getBrightness(dno3, integer12) * float6;
+                final float float8 = float9 = this.getBrightness(dym3, integer12) * float6;
                 final float float10 = float8 * ((float8 * 0.6f + 0.4f) * 0.6f + 0.4f);
                 final float float11 = float8 * (float8 * float8 * 0.6f + 0.4f);
-                e9.set(float9, float10, float11);
-                if (dno3.dimension.getType() == DimensionType.THE_END) {
-                    e9.lerp(new Vector3f(0.99f, 1.12f, 1.0f), 0.25f);
+                g9.set(float9, float10, float11);
+                if (dym3.effects().forceBrightLightmap()) {
+                    g9.lerp(new Vector3f(0.99f, 1.12f, 1.0f), 0.25f);
                 }
                 else {
-                    final Vector3f e10 = e8.copy();
-                    e10.mul(float7);
-                    e9.add(e10);
-                    e9.lerp(new Vector3f(0.75f, 0.75f, 0.75f), 0.04f);
+                    final Vector3f g10 = g8.copy();
+                    g10.mul(float7);
+                    g9.add(g10);
+                    g9.lerp(new Vector3f(0.75f, 0.75f, 0.75f), 0.04f);
                     if (this.renderer.getDarkenWorldAmount(float1) > 0.0f) {
                         final float float12 = this.renderer.getDarkenWorldAmount(float1);
-                        final Vector3f e11 = e9.copy();
-                        e11.mul(0.7f, 0.6f, 0.6f);
-                        e9.lerp(e11, float12);
+                        final Vector3f g11 = g9.copy();
+                        g11.mul(0.7f, 0.6f, 0.6f);
+                        g9.lerp(g11, float12);
                     }
                 }
-                e9.clamp(0.0f, 1.0f);
+                g9.clamp(0.0f, 1.0f);
                 if (float5 > 0.0f) {
-                    final float float13 = Math.max(e9.x(), Math.max(e9.y(), e9.z()));
+                    final float float13 = Math.max(g9.x(), Math.max(g9.y(), g9.z()));
                     if (float13 < 1.0f) {
                         final float float12 = 1.0f / float13;
-                        final Vector3f e11 = e9.copy();
-                        e11.mul(float12);
-                        e9.lerp(e11, float5);
+                        final Vector3f g11 = g9.copy();
+                        g11.mul(float12);
+                        g9.lerp(g11, float5);
                     }
                 }
                 final float float13 = (float)this.minecraft.options.gamma;
-                final Vector3f e12 = e9.copy();
-                e12.map(this::notGamma);
-                e9.lerp(e12, float13);
-                e9.lerp(new Vector3f(0.75f, 0.75f, 0.75f), 0.04f);
-                e9.clamp(0.0f, 1.0f);
-                e9.mul(255.0f);
+                final Vector3f g12 = g9.copy();
+                g12.map(this::notGamma);
+                g9.lerp(g12, float13);
+                g9.lerp(new Vector3f(0.75f, 0.75f, 0.75f), 0.04f);
+                g9.clamp(0.0f, 1.0f);
+                g9.mul(255.0f);
                 final int integer13 = 255;
-                final int integer14 = (int)e9.x();
-                final int integer15 = (int)e9.y();
-                final int integer16 = (int)e9.z();
+                final int integer14 = (int)g9.x();
+                final int integer15 = (int)g9.y();
+                final int integer16 = (int)g9.z();
                 this.lightPixels.setPixelRGBA(integer12, integer11, 0xFF000000 | integer16 << 16 | integer15 << 8 | integer14);
             }
         }
@@ -159,8 +158,8 @@ public class LightTexture implements AutoCloseable {
         return 1.0f - float2 * float2 * float2 * float2;
     }
     
-    private float getBrightness(final Level bjw, final int integer) {
-        return bjw.dimension.getBrightness(integer);
+    private float getBrightness(final Level bqb, final int integer) {
+        return bqb.dimensionType().brightness(integer);
     }
     
     public static int pack(final int integer1, final int integer2) {
diff --git a/src/net/minecraft/client/renderer/MultiBufferSource.java b/src/net/minecraft/client/renderer/MultiBufferSource.java
index ce4a84f..6b70f1f 100644
--- a/src/net/minecraft/client/renderer/MultiBufferSource.java
+++ b/src/net/minecraft/client/renderer/MultiBufferSource.java
@@ -11,15 +11,15 @@ import com.google.common.collect.ImmutableMap;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 
 public interface MultiBufferSource {
-    default BufferSource immediate(final BufferBuilder cyg) {
-        return immediateWithBuffers(ImmutableMap.of(), cyg);
+    default BufferSource immediate(final BufferBuilder dhg) {
+        return immediateWithBuffers(ImmutableMap.of(), dhg);
     }
     
-    default BufferSource immediateWithBuffers(final Map<RenderType, BufferBuilder> map, final BufferBuilder cyg) {
-        return new BufferSource(cyg, map);
+    default BufferSource immediateWithBuffers(final Map<RenderType, BufferBuilder> map, final BufferBuilder dhg) {
+        return new BufferSource(dhg, map);
     }
     
-    VertexConsumer getBuffer(final RenderType drb);
+    VertexConsumer getBuffer(final RenderType ech);
     
     public static class BufferSource implements MultiBufferSource {
         protected final BufferBuilder builder;
@@ -27,60 +27,60 @@ public interface MultiBufferSource {
         protected Optional<RenderType> lastState;
         protected final Set<BufferBuilder> startedBuffers;
         
-        protected BufferSource(final BufferBuilder cyg, final Map<RenderType, BufferBuilder> map) {
+        protected BufferSource(final BufferBuilder dhg, final Map<RenderType, BufferBuilder> map) {
             this.lastState = Optional.<RenderType>empty();
             this.startedBuffers = Sets.newHashSet();
-            this.builder = cyg;
+            this.builder = dhg;
             this.fixedBuffers = map;
         }
         
         @Override
-        public VertexConsumer getBuffer(final RenderType drb) {
-            final Optional<RenderType> optional3 = drb.asOptional();
-            final BufferBuilder cyg4 = this.getBuilderRaw(drb);
+        public VertexConsumer getBuffer(final RenderType ech) {
+            final Optional<RenderType> optional3 = ech.asOptional();
+            final BufferBuilder dhg4 = this.getBuilderRaw(ech);
             if (!Objects.equals(this.lastState, optional3)) {
                 if (this.lastState.isPresent()) {
-                    final RenderType drb2 = this.lastState.get();
-                    if (!this.fixedBuffers.containsKey(drb2)) {
-                        this.endBatch(drb2);
+                    final RenderType ech2 = this.lastState.get();
+                    if (!this.fixedBuffers.containsKey(ech2)) {
+                        this.endBatch(ech2);
                     }
                 }
-                if (this.startedBuffers.add(cyg4)) {
-                    cyg4.begin(drb.mode(), drb.format());
+                if (this.startedBuffers.add(dhg4)) {
+                    dhg4.begin(ech.mode(), ech.format());
                 }
                 this.lastState = optional3;
             }
-            return cyg4;
+            return dhg4;
         }
         
-        private BufferBuilder getBuilderRaw(final RenderType drb) {
-            return this.fixedBuffers.getOrDefault(drb, this.builder);
+        private BufferBuilder getBuilderRaw(final RenderType ech) {
+            return this.fixedBuffers.getOrDefault(ech, this.builder);
         }
         
         public void endBatch() {
-            final VertexConsumer cyo3;
-            this.lastState.ifPresent(drb -> {
-                cyo3 = this.getBuffer(drb);
-                if (cyo3 == this.builder) {
-                    this.endBatch(drb);
+            final VertexConsumer dhp3;
+            this.lastState.ifPresent(ech -> {
+                dhp3 = this.getBuffer(ech);
+                if (dhp3 == this.builder) {
+                    this.endBatch(ech);
                 }
                 return;
             });
-            for (final RenderType drb2 : this.fixedBuffers.keySet()) {
-                this.endBatch(drb2);
+            for (final RenderType ech2 : this.fixedBuffers.keySet()) {
+                this.endBatch(ech2);
             }
         }
         
-        public void endBatch(final RenderType drb) {
-            final BufferBuilder cyg3 = this.getBuilderRaw(drb);
-            final boolean boolean4 = Objects.equals(this.lastState, drb.asOptional());
-            if (!boolean4 && cyg3 == this.builder) {
+        public void endBatch(final RenderType ech) {
+            final BufferBuilder dhg3 = this.getBuilderRaw(ech);
+            final boolean boolean4 = Objects.equals(this.lastState, ech.asOptional());
+            if (!boolean4 && dhg3 == this.builder) {
                 return;
             }
-            if (!this.startedBuffers.remove(cyg3)) {
+            if (!this.startedBuffers.remove(dhg3)) {
                 return;
             }
-            drb.end(cyg3, 0, 0, 0);
+            ech.end(dhg3, 0, 0, 0);
             if (boolean4) {
                 this.lastState = Optional.<RenderType>empty();
             }
diff --git a/src/net/minecraft/client/renderer/OutlineBufferSource.java b/src/net/minecraft/client/renderer/OutlineBufferSource.java
index 8051dc9..0b47a75 100644
--- a/src/net/minecraft/client/renderer/OutlineBufferSource.java
+++ b/src/net/minecraft/client/renderer/OutlineBufferSource.java
@@ -24,19 +24,19 @@ public class OutlineBufferSource implements MultiBufferSource {
     }
     
     @Override
-    public VertexConsumer getBuffer(final RenderType drb) {
-        if (drb.isOutline()) {
-            final VertexConsumer cyo3 = this.outlineBufferSource.getBuffer(drb);
-            return new EntityOutlineGenerator(cyo3, this.teamR, this.teamG, this.teamB, this.teamA);
+    public VertexConsumer getBuffer(final RenderType ech) {
+        if (ech.isOutline()) {
+            final VertexConsumer dhp3 = this.outlineBufferSource.getBuffer(ech);
+            return new EntityOutlineGenerator(dhp3, this.teamR, this.teamG, this.teamB, this.teamA);
         }
-        final VertexConsumer cyo3 = this.bufferSource.getBuffer(drb);
-        final Optional<RenderType> optional4 = drb.outline();
+        final VertexConsumer dhp3 = this.bufferSource.getBuffer(ech);
+        final Optional<RenderType> optional4 = ech.outline();
         if (optional4.isPresent()) {
-            final VertexConsumer cyo4 = this.outlineBufferSource.getBuffer(optional4.get());
-            final EntityOutlineGenerator a6 = new EntityOutlineGenerator(cyo4, this.teamR, this.teamG, this.teamB, this.teamA);
-            return VertexMultiConsumer.create(a6, cyo3);
+            final VertexConsumer dhp4 = this.outlineBufferSource.getBuffer(optional4.get());
+            final EntityOutlineGenerator a6 = new EntityOutlineGenerator(dhp4, this.teamR, this.teamG, this.teamB, this.teamA);
+            return VertexMultiConsumer.create(a6, dhp3);
         }
-        return cyo3;
+        return dhp3;
     }
     
     public void setColor(final int integer1, final int integer2, final int integer3, final int integer4) {
@@ -58,8 +58,8 @@ public class OutlineBufferSource implements MultiBufferSource {
         private float u;
         private float v;
         
-        private EntityOutlineGenerator(final VertexConsumer cyo, final int integer2, final int integer3, final int integer4, final int integer5) {
-            this.delegate = cyo;
+        private EntityOutlineGenerator(final VertexConsumer dhp, final int integer2, final int integer3, final int integer4, final int integer5) {
+            this.delegate = dhp;
             super.defaultColor(integer2, integer3, integer4, integer5);
         }
         
diff --git a/src/net/minecraft/client/renderer/PanoramaRenderer.java b/src/net/minecraft/client/renderer/PanoramaRenderer.java
index 4870bc2..ca52b77 100644
--- a/src/net/minecraft/client/renderer/PanoramaRenderer.java
+++ b/src/net/minecraft/client/renderer/PanoramaRenderer.java
@@ -8,8 +8,8 @@ public class PanoramaRenderer {
     private final CubeMap cubeMap;
     private float time;
     
-    public PanoramaRenderer(final CubeMap dqj) {
-        this.cubeMap = dqj;
+    public PanoramaRenderer(final CubeMap ebn) {
+        this.cubeMap = ebn;
         this.minecraft = Minecraft.getInstance();
     }
     
diff --git a/src/net/minecraft/client/renderer/PostChain.java b/src/net/minecraft/client/renderer/PostChain.java
index 8668350..b814056 100644
--- a/src/net/minecraft/client/renderer/PostChain.java
+++ b/src/net/minecraft/client/renderer/PostChain.java
@@ -42,26 +42,26 @@ public class PostChain implements AutoCloseable {
     private float time;
     private float lastStamp;
     
-    public PostChain(final TextureManager eak, final ResourceManager zb, final RenderTarget cxe, final ResourceLocation sm) throws IOException, JsonSyntaxException {
+    public PostChain(final TextureManager elw, final ResourceManager abc, final RenderTarget dgf, final ResourceLocation uh) throws IOException, JsonSyntaxException {
         this.passes = Lists.newArrayList();
         this.customRenderTargets = Maps.newHashMap();
         this.fullSizedTargets = Lists.newArrayList();
-        this.resourceManager = zb;
-        this.screenTarget = cxe;
+        this.resourceManager = abc;
+        this.screenTarget = dgf;
         this.time = 0.0f;
         this.lastStamp = 0.0f;
-        this.screenWidth = cxe.viewWidth;
-        this.screenHeight = cxe.viewHeight;
-        this.name = sm.toString();
+        this.screenWidth = dgf.viewWidth;
+        this.screenHeight = dgf.viewHeight;
+        this.name = uh.toString();
         this.updateOrthoMatrix();
-        this.load(eak, sm);
+        this.load(elw, uh);
     }
     
-    private void load(final TextureManager eak, final ResourceLocation sm) throws IOException, JsonSyntaxException {
-        Resource za4 = null;
+    private void load(final TextureManager elw, final ResourceLocation uh) throws IOException, JsonSyntaxException {
+        Resource abb4 = null;
         try {
-            za4 = this.resourceManager.getResource(sm);
-            final JsonObject jsonObject5 = GsonHelper.parse(new InputStreamReader(za4.getInputStream(), StandardCharsets.UTF_8));
+            abb4 = this.resourceManager.getResource(uh);
+            final JsonObject jsonObject5 = GsonHelper.parse(new InputStreamReader(abb4.getInputStream(), StandardCharsets.UTF_8));
             if (GsonHelper.isArrayNode(jsonObject5, "targets")) {
                 final JsonArray jsonArray6 = jsonObject5.getAsJsonArray("targets");
                 int integer7 = 0;
@@ -70,9 +70,9 @@ public class PostChain implements AutoCloseable {
                         this.parseTargetNode(jsonElement9);
                     }
                     catch (Exception exception10) {
-                        final ChainedJsonException sp11 = ChainedJsonException.forException(exception10);
-                        sp11.prependJsonKey("targets[" + integer7 + "]");
-                        throw sp11;
+                        final ChainedJsonException uk11 = ChainedJsonException.forException(exception10);
+                        uk11.prependJsonKey("targets[" + integer7 + "]");
+                        throw uk11;
                     }
                     ++integer7;
                 }
@@ -82,24 +82,24 @@ public class PostChain implements AutoCloseable {
                 int integer7 = 0;
                 for (final JsonElement jsonElement9 : jsonArray6) {
                     try {
-                        this.parsePassNode(eak, jsonElement9);
+                        this.parsePassNode(elw, jsonElement9);
                     }
                     catch (Exception exception10) {
-                        final ChainedJsonException sp11 = ChainedJsonException.forException(exception10);
-                        sp11.prependJsonKey("passes[" + integer7 + "]");
-                        throw sp11;
+                        final ChainedJsonException uk11 = ChainedJsonException.forException(exception10);
+                        uk11.prependJsonKey("passes[" + integer7 + "]");
+                        throw uk11;
                     }
                     ++integer7;
                 }
             }
         }
         catch (Exception exception11) {
-            final ChainedJsonException sp12 = ChainedJsonException.forException(exception11);
-            sp12.setFilenameAndFlush(sm.getPath());
-            throw sp12;
+            final ChainedJsonException uk12 = ChainedJsonException.forException(exception11);
+            uk12.setFilenameAndFlush(uh.getPath());
+            throw uk12;
         }
         finally {
-            IOUtils.closeQuietly((Closeable)za4);
+            IOUtils.closeQuietly((Closeable)abb4);
         }
     }
     
@@ -119,20 +119,20 @@ public class PostChain implements AutoCloseable {
         }
     }
     
-    private void parsePassNode(final TextureManager eak, final JsonElement jsonElement) throws IOException {
+    private void parsePassNode(final TextureManager elw, final JsonElement jsonElement) throws IOException {
         final JsonObject jsonObject4 = GsonHelper.convertToJsonObject(jsonElement, "pass");
         final String string5 = GsonHelper.getAsString(jsonObject4, "name");
         final String string6 = GsonHelper.getAsString(jsonObject4, "intarget");
         final String string7 = GsonHelper.getAsString(jsonObject4, "outtarget");
-        final RenderTarget cxe8 = this.getRenderTarget(string6);
-        final RenderTarget cxe9 = this.getRenderTarget(string7);
-        if (cxe8 == null) {
+        final RenderTarget dgf8 = this.getRenderTarget(string6);
+        final RenderTarget dgf9 = this.getRenderTarget(string7);
+        if (dgf8 == null) {
             throw new ChainedJsonException("Input target '" + string6 + "' does not exist");
         }
-        if (cxe9 == null) {
+        if (dgf9 == null) {
             throw new ChainedJsonException("Output target '" + string7 + "' does not exist");
         }
-        final PostPass dqx10 = this.addPass(string5, cxe8, cxe9);
+        final PostPass ecd10 = this.addPass(string5, dgf8, dgf9);
         final JsonArray jsonArray11 = GsonHelper.getAsJsonArray(jsonObject4, "auxtargets", null);
         if (jsonArray11 != null) {
             int integer12 = 0;
@@ -141,25 +141,38 @@ public class PostChain implements AutoCloseable {
                     final JsonObject jsonObject5 = GsonHelper.convertToJsonObject(jsonElement2, "auxtarget");
                     final String string8 = GsonHelper.getAsString(jsonObject5, "name");
                     final String string9 = GsonHelper.getAsString(jsonObject5, "id");
-                    final RenderTarget cxe10 = this.getRenderTarget(string9);
-                    if (cxe10 == null) {
-                        final ResourceLocation sm19 = new ResourceLocation("textures/effect/" + string9 + ".png");
-                        Resource za20 = null;
-                        try {
-                            za20 = this.resourceManager.getResource(sm19);
+                    boolean boolean18;
+                    String string10;
+                    if (string9.endsWith(":depth")) {
+                        boolean18 = true;
+                        string10 = string9.substring(0, string9.lastIndexOf(58));
+                    }
+                    else {
+                        boolean18 = false;
+                        string10 = string9;
+                    }
+                    final RenderTarget dgf10 = this.getRenderTarget(string10);
+                    if (dgf10 == null) {
+                        if (boolean18) {
+                            throw new ChainedJsonException("Render target '" + string10 + "' can't be used as depth buffer");
                         }
-                        catch (FileNotFoundException fileNotFoundException21) {
-                            throw new ChainedJsonException("Render target or texture '" + string9 + "' does not exist");
+                        final ResourceLocation uh21 = new ResourceLocation("textures/effect/" + string10 + ".png");
+                        Resource abb22 = null;
+                        try {
+                            abb22 = this.resourceManager.getResource(uh21);
+                        }
+                        catch (FileNotFoundException fileNotFoundException23) {
+                            throw new ChainedJsonException("Render target or texture '" + string10 + "' does not exist");
                         }
                         finally {
-                            IOUtils.closeQuietly((Closeable)za20);
+                            IOUtils.closeQuietly((Closeable)abb22);
                         }
-                        eak.bind(sm19);
-                        final AbstractTexture dzw21 = eak.getTexture(sm19);
+                        elw.bind(uh21);
+                        final AbstractTexture elj23 = elw.getTexture(uh21);
                         final int integer13 = GsonHelper.getAsInt(jsonObject5, "width");
                         final int integer14 = GsonHelper.getAsInt(jsonObject5, "height");
-                        final boolean boolean24 = GsonHelper.getAsBoolean(jsonObject5, "bilinear");
-                        if (boolean24) {
+                        final boolean boolean19 = GsonHelper.getAsBoolean(jsonObject5, "bilinear");
+                        if (boolean19) {
                             RenderSystem.texParameter(3553, 10241, 9729);
                             RenderSystem.texParameter(3553, 10240, 9729);
                         }
@@ -167,16 +180,19 @@ public class PostChain implements AutoCloseable {
                             RenderSystem.texParameter(3553, 10241, 9728);
                             RenderSystem.texParameter(3553, 10240, 9728);
                         }
-                        dqx10.addAuxAsset(string8, dzw21.getId(), integer13, integer14);
+                        ecd10.addAuxAsset(string8, elj23.getId(), integer13, integer14);
+                    }
+                    else if (boolean18) {
+                        ecd10.addAuxAsset(string8, dgf10.depthBufferId, dgf10.width, dgf10.height);
                     }
                     else {
-                        dqx10.addAuxAsset(string8, cxe10, cxe10.width, cxe10.height);
+                        ecd10.addAuxAsset(string8, dgf10, dgf10.width, dgf10.height);
                     }
                 }
                 catch (Exception exception15) {
-                    final ChainedJsonException sp16 = ChainedJsonException.forException(exception15);
-                    sp16.prependJsonKey("auxtargets[" + integer12 + "]");
-                    throw sp16;
+                    final ChainedJsonException uk16 = ChainedJsonException.forException(exception15);
+                    uk16.prependJsonKey("auxtargets[" + integer12 + "]");
+                    throw uk16;
                 }
                 ++integer12;
             }
@@ -189,9 +205,9 @@ public class PostChain implements AutoCloseable {
                     this.parseUniformNode(jsonElement3);
                 }
                 catch (Exception exception16) {
-                    final ChainedJsonException sp17 = ChainedJsonException.forException(exception16);
-                    sp17.prependJsonKey("uniforms[" + integer15 + "]");
-                    throw sp17;
+                    final ChainedJsonException uk17 = ChainedJsonException.forException(exception16);
+                    uk17.prependJsonKey("uniforms[" + integer15 + "]");
+                    throw uk17;
                 }
                 ++integer15;
             }
@@ -201,8 +217,8 @@ public class PostChain implements AutoCloseable {
     private void parseUniformNode(final JsonElement jsonElement) throws ChainedJsonException {
         final JsonObject jsonObject3 = GsonHelper.convertToJsonObject(jsonElement, "uniform");
         final String string4 = GsonHelper.getAsString(jsonObject3, "name");
-        final Uniform cye5 = this.passes.get(this.passes.size() - 1).getEffect().getUniform(string4);
-        if (cye5 == null) {
+        final Uniform dhf5 = this.passes.get(this.passes.size() - 1).getEffect().getUniform(string4);
+        if (dhf5 == null) {
             throw new ChainedJsonException("Uniform '" + string4 + "' does not exist");
         }
         final float[] arr6 = new float[4];
@@ -213,27 +229,27 @@ public class PostChain implements AutoCloseable {
                 arr6[integer7] = GsonHelper.convertToFloat(jsonElement2, "value");
             }
             catch (Exception exception11) {
-                final ChainedJsonException sp12 = ChainedJsonException.forException(exception11);
-                sp12.prependJsonKey("values[" + integer7 + "]");
-                throw sp12;
+                final ChainedJsonException uk12 = ChainedJsonException.forException(exception11);
+                uk12.prependJsonKey("values[" + integer7 + "]");
+                throw uk12;
             }
             ++integer7;
         }
         switch (integer7) {
             case 1: {
-                cye5.set(arr6[0]);
+                dhf5.set(arr6[0]);
                 break;
             }
             case 2: {
-                cye5.set(arr6[0], arr6[1]);
+                dhf5.set(arr6[0], arr6[1]);
                 break;
             }
             case 3: {
-                cye5.set(arr6[0], arr6[1], arr6[2]);
+                dhf5.set(arr6[0], arr6[1], arr6[2]);
                 break;
             }
             case 4: {
-                cye5.set(arr6[0], arr6[1], arr6[2], arr6[3]);
+                dhf5.set(arr6[0], arr6[1], arr6[2], arr6[3]);
                 break;
             }
         }
@@ -244,29 +260,29 @@ public class PostChain implements AutoCloseable {
     }
     
     public void addTempTarget(final String string, final int integer2, final int integer3) {
-        final RenderTarget cxe5 = new RenderTarget(integer2, integer3, true, Minecraft.ON_OSX);
-        cxe5.setClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-        this.customRenderTargets.put(string, cxe5);
+        final RenderTarget dgf5 = new RenderTarget(integer2, integer3, true, Minecraft.ON_OSX);
+        dgf5.setClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+        this.customRenderTargets.put(string, dgf5);
         if (integer2 == this.screenWidth && integer3 == this.screenHeight) {
-            this.fullSizedTargets.add(cxe5);
+            this.fullSizedTargets.add(dgf5);
         }
     }
     
     @Override
     public void close() {
-        for (final RenderTarget cxe3 : this.customRenderTargets.values()) {
-            cxe3.destroyBuffers();
+        for (final RenderTarget dgf3 : this.customRenderTargets.values()) {
+            dgf3.destroyBuffers();
         }
-        for (final PostPass dqx3 : this.passes) {
-            dqx3.close();
+        for (final PostPass ecd3 : this.passes) {
+            ecd3.close();
         }
         this.passes.clear();
     }
     
-    public PostPass addPass(final String string, final RenderTarget cxe2, final RenderTarget cxe3) throws IOException {
-        final PostPass dqx5 = new PostPass(this.resourceManager, string, cxe2, cxe3);
-        this.passes.add(this.passes.size(), dqx5);
-        return dqx5;
+    public PostPass addPass(final String string, final RenderTarget dgf2, final RenderTarget dgf3) throws IOException {
+        final PostPass ecd5 = new PostPass(this.resourceManager, string, dgf2, dgf3);
+        this.passes.add(this.passes.size(), ecd5);
+        return ecd5;
     }
     
     private void updateOrthoMatrix() {
@@ -277,11 +293,11 @@ public class PostChain implements AutoCloseable {
         this.screenWidth = this.screenTarget.width;
         this.screenHeight = this.screenTarget.height;
         this.updateOrthoMatrix();
-        for (final PostPass dqx5 : this.passes) {
-            dqx5.setOrthoMatrix(this.shaderOrthoMatrix);
+        for (final PostPass ecd5 : this.passes) {
+            ecd5.setOrthoMatrix(this.shaderOrthoMatrix);
         }
-        for (final RenderTarget cxe5 : this.fullSizedTargets) {
-            cxe5.resize(integer1, integer2, Minecraft.ON_OSX);
+        for (final RenderTarget dgf5 : this.fullSizedTargets) {
+            dgf5.resize(integer1, integer2, Minecraft.ON_OSX);
         }
     }
     
@@ -297,8 +313,8 @@ public class PostChain implements AutoCloseable {
         while (this.time > 20.0f) {
             this.time -= 20.0f;
         }
-        for (final PostPass dqx4 : this.passes) {
-            dqx4.process(this.time / 20.0f);
+        for (final PostPass ecd4 : this.passes) {
+            ecd4.process(this.time / 20.0f);
         }
     }
     
diff --git a/src/net/minecraft/client/renderer/PostPass.java b/src/net/minecraft/client/renderer/PostPass.java
index b255834..706e665 100644
--- a/src/net/minecraft/client/renderer/PostPass.java
+++ b/src/net/minecraft/client/renderer/PostPass.java
@@ -24,14 +24,14 @@ public class PostPass implements AutoCloseable {
     private final List<Integer> auxHeights;
     private Matrix4f shaderOrthoMatrix;
     
-    public PostPass(final ResourceManager zb, final String string, final RenderTarget cxe3, final RenderTarget cxe4) throws IOException {
+    public PostPass(final ResourceManager abc, final String string, final RenderTarget dgf3, final RenderTarget dgf4) throws IOException {
         this.auxAssets = Lists.newArrayList();
         this.auxNames = Lists.newArrayList();
         this.auxWidths = Lists.newArrayList();
         this.auxHeights = Lists.newArrayList();
-        this.effect = new EffectInstance(zb, string);
-        this.inTarget = cxe3;
-        this.outTarget = cxe4;
+        this.effect = new EffectInstance(abc, string);
+        this.inTarget = dgf3;
+        this.outTarget = dgf4;
     }
     
     @Override
@@ -64,20 +64,20 @@ public class PostPass implements AutoCloseable {
         this.effect.safeGetUniform("InSize").set((float)this.inTarget.width, (float)this.inTarget.height);
         this.effect.safeGetUniform("OutSize").set(float2, float3);
         this.effect.safeGetUniform("Time").set(float1);
-        final Minecraft dbn5 = Minecraft.getInstance();
-        this.effect.safeGetUniform("ScreenSize").set((float)dbn5.getWindow().getWidth(), (float)dbn5.getWindow().getHeight());
+        final Minecraft dlx5 = Minecraft.getInstance();
+        this.effect.safeGetUniform("ScreenSize").set((float)dlx5.getWindow().getWidth(), (float)dlx5.getWindow().getHeight());
         this.effect.apply();
         this.outTarget.clear(Minecraft.ON_OSX);
         this.outTarget.bindWrite(false);
         RenderSystem.depthMask(false);
-        final BufferBuilder cyg6 = Tesselator.getInstance().getBuilder();
-        cyg6.begin(7, DefaultVertexFormat.POSITION_COLOR);
-        cyg6.vertex(0.0, 0.0, 500.0).color(255, 255, 255, 255).endVertex();
-        cyg6.vertex(float2, 0.0, 500.0).color(255, 255, 255, 255).endVertex();
-        cyg6.vertex(float2, float3, 500.0).color(255, 255, 255, 255).endVertex();
-        cyg6.vertex(0.0, float3, 500.0).color(255, 255, 255, 255).endVertex();
-        cyg6.end();
-        BufferUploader.end(cyg6);
+        final BufferBuilder dhg6 = Tesselator.getInstance().getBuilder();
+        dhg6.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        dhg6.vertex(0.0, 0.0, 500.0).color(255, 255, 255, 255).endVertex();
+        dhg6.vertex(float2, 0.0, 500.0).color(255, 255, 255, 255).endVertex();
+        dhg6.vertex(float2, float3, 500.0).color(255, 255, 255, 255).endVertex();
+        dhg6.vertex(0.0, float3, 500.0).color(255, 255, 255, 255).endVertex();
+        dhg6.end();
+        BufferUploader.end(dhg6);
         RenderSystem.depthMask(true);
         this.effect.clear();
         this.outTarget.unbindWrite();
diff --git a/src/net/minecraft/client/renderer/RenderBuffers.java b/src/net/minecraft/client/renderer/RenderBuffers.java
index 52d4e46..87528af 100644
--- a/src/net/minecraft/client/renderer/RenderBuffers.java
+++ b/src/net/minecraft/client/renderer/RenderBuffers.java
@@ -20,17 +20,21 @@ public class RenderBuffers {
             object2ObjectLinkedOpenHashMap.put(Sheets.solidBlockSheet(), this.fixedBufferPack.builder(RenderType.solid()));
             object2ObjectLinkedOpenHashMap.put(Sheets.cutoutBlockSheet(), this.fixedBufferPack.builder(RenderType.cutout()));
             object2ObjectLinkedOpenHashMap.put(Sheets.bannerSheet(), this.fixedBufferPack.builder(RenderType.cutoutMipped()));
-            object2ObjectLinkedOpenHashMap.put(Sheets.translucentBlockSheet(), this.fixedBufferPack.builder(RenderType.translucent()));
+            object2ObjectLinkedOpenHashMap.put(Sheets.translucentCullBlockSheet(), this.fixedBufferPack.builder(RenderType.translucent()));
             put(object2ObjectLinkedOpenHashMap, Sheets.shieldSheet());
             put(object2ObjectLinkedOpenHashMap, Sheets.bedSheet());
             put(object2ObjectLinkedOpenHashMap, Sheets.shulkerBoxSheet());
             put(object2ObjectLinkedOpenHashMap, Sheets.signSheet());
             put(object2ObjectLinkedOpenHashMap, Sheets.chestSheet());
             put(object2ObjectLinkedOpenHashMap, RenderType.translucentNoCrumbling());
+            put(object2ObjectLinkedOpenHashMap, RenderType.armorGlint());
+            put(object2ObjectLinkedOpenHashMap, RenderType.armorEntityGlint());
             put(object2ObjectLinkedOpenHashMap, RenderType.glint());
+            put(object2ObjectLinkedOpenHashMap, RenderType.glintDirect());
             put(object2ObjectLinkedOpenHashMap, RenderType.entityGlint());
+            put(object2ObjectLinkedOpenHashMap, RenderType.entityGlintDirect());
             put(object2ObjectLinkedOpenHashMap, RenderType.waterMask());
-            ModelBakery.DESTROY_TYPES.forEach(drb -> put(object2ObjectLinkedOpenHashMap, drb));
+            ModelBakery.DESTROY_TYPES.forEach(ech -> put(object2ObjectLinkedOpenHashMap, ech));
             return;
         });
         this.bufferSource = MultiBufferSource.immediateWithBuffers(this.fixedBuffers, new BufferBuilder(256));
@@ -38,8 +42,8 @@ public class RenderBuffers {
         this.outlineBufferSource = new OutlineBufferSource(this.bufferSource);
     }
     
-    private static void put(final Object2ObjectLinkedOpenHashMap<RenderType, BufferBuilder> object2ObjectLinkedOpenHashMap, final RenderType drb) {
-        object2ObjectLinkedOpenHashMap.put(drb, new BufferBuilder(drb.bufferSize()));
+    private static void put(final Object2ObjectLinkedOpenHashMap<RenderType, BufferBuilder> object2ObjectLinkedOpenHashMap, final RenderType ech) {
+        object2ObjectLinkedOpenHashMap.put(ech, new BufferBuilder(ech.bufferSize()));
     }
     
     public ChunkBufferBuilderPack fixedBufferPack() {
diff --git a/src/net/minecraft/client/renderer/RenderStateShard.java b/src/net/minecraft/client/renderer/RenderStateShard.java
index e72aa03..7f9f23a 100644
--- a/src/net/minecraft/client/renderer/RenderStateShard.java
+++ b/src/net/minecraft/client/renderer/RenderStateShard.java
@@ -21,6 +21,7 @@ public abstract class RenderStateShard {
     protected static final TransparencyStateShard ADDITIVE_TRANSPARENCY;
     protected static final TransparencyStateShard LIGHTNING_TRANSPARENCY;
     protected static final TransparencyStateShard GLINT_TRANSPARENCY;
+    protected static final TransparencyStateShard GLINT_DIRECT_TRANSPARENCY;
     protected static final TransparencyStateShard CRUMBLING_TRANSPARENCY;
     protected static final TransparencyStateShard TRANSLUCENT_TRANSPARENCY;
     protected static final AlphaStateShard NO_ALPHA;
@@ -51,12 +52,17 @@ public abstract class RenderStateShard {
     protected static final WriteMaskStateShard DEPTH_WRITE;
     protected static final LayeringStateShard NO_LAYERING;
     protected static final LayeringStateShard POLYGON_OFFSET_LAYERING;
-    protected static final LayeringStateShard PROJECTION_LAYERING;
+    protected static final LayeringStateShard VIEW_OFFSET_Z_LAYERING;
     protected static final FogStateShard NO_FOG;
     protected static final FogStateShard FOG;
     protected static final FogStateShard BLACK_FOG;
     protected static final OutputStateShard MAIN_TARGET;
     protected static final OutputStateShard OUTLINE_TARGET;
+    protected static final OutputStateShard TRANSLUCENT_TARGET;
+    protected static final OutputStateShard PARTICLES_TARGET;
+    protected static final OutputStateShard WEATHER_TARGET;
+    protected static final OutputStateShard CLOUDS_TARGET;
+    protected static final OutputStateShard ITEM_ENTITY_TARGET;
     protected static final LineStateShard DEFAULT_LINE;
     
     public RenderStateShard(final String string, final Runnable runnable2, final Runnable runnable3) {
@@ -81,8 +87,8 @@ public abstract class RenderStateShard {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final RenderStateShard dra3 = (RenderStateShard)object;
-        return this.name.equals(dra3.name);
+        final RenderStateShard ecg3 = (RenderStateShard)object;
+        return this.name.equals(ecg3.name);
     }
     
     @Override
@@ -90,6 +96,11 @@ public abstract class RenderStateShard {
         return this.name.hashCode();
     }
     
+    @Override
+    public String toString() {
+        return this.name;
+    }
+    
     private static void setupGlintTexturing(final float float1) {
         RenderSystem.matrixMode(5890);
         RenderSystem.pushMatrix();
@@ -132,6 +143,15 @@ public abstract class RenderStateShard {
             RenderSystem.defaultBlendFunc();
             return;
         });
+        GLINT_DIRECT_TRANSPARENCY = new TransparencyStateShard("glint_gui_transparency", () -> {
+            RenderSystem.enableBlend();
+            RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_COLOR, GlStateManager.DestFactor.ONE);
+            return;
+        }, () -> {
+            RenderSystem.disableBlend();
+            RenderSystem.defaultBlendFunc();
+            return;
+        });
         CRUMBLING_TRANSPARENCY = new TransparencyStateShard("crumbling_transparency", () -> {
             RenderSystem.enableBlend();
             RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.DST_COLOR, GlStateManager.DestFactor.SRC_COLOR, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
@@ -143,9 +163,13 @@ public abstract class RenderStateShard {
         });
         TRANSLUCENT_TRANSPARENCY = new TransparencyStateShard("translucent_transparency", () -> {
             RenderSystem.enableBlend();
+            RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
+            return;
+        }, () -> {
+            RenderSystem.disableBlend();
             RenderSystem.defaultBlendFunc();
             return;
-        }, () -> RenderSystem.disableBlend());
+        });
         NO_ALPHA = new AlphaStateShard(0.0f);
         DEFAULT_ALPHA = new AlphaStateShard(0.003921569f);
         MIDWAY_ALPHA = new AlphaStateShard(0.5f);
@@ -176,9 +200,9 @@ public abstract class RenderStateShard {
         NO_DIFFUSE_LIGHTING = new DiffuseLightingStateShard(false);
         CULL = new CullStateShard(true);
         NO_CULL = new CullStateShard(false);
-        NO_DEPTH_TEST = new DepthTestStateShard(519);
-        EQUAL_DEPTH_TEST = new DepthTestStateShard(514);
-        LEQUAL_DEPTH_TEST = new DepthTestStateShard(515);
+        NO_DEPTH_TEST = new DepthTestStateShard("always", 519);
+        EQUAL_DEPTH_TEST = new DepthTestStateShard("==", 514);
+        LEQUAL_DEPTH_TEST = new DepthTestStateShard("<=", 515);
         COLOR_DEPTH_WRITE = new WriteMaskStateShard(true, true);
         COLOR_WRITE = new WriteMaskStateShard(true, false);
         DEPTH_WRITE = new WriteMaskStateShard(false, true);
@@ -192,18 +216,11 @@ public abstract class RenderStateShard {
             RenderSystem.disablePolygonOffset();
             return;
         });
-        PROJECTION_LAYERING = new LayeringStateShard("projection_layering", () -> {
-            RenderSystem.matrixMode(5889);
+        VIEW_OFFSET_Z_LAYERING = new LayeringStateShard("view_offset_z_layering", () -> {
             RenderSystem.pushMatrix();
-            RenderSystem.scalef(1.0f, 1.0f, 0.999f);
-            RenderSystem.matrixMode(5888);
+            RenderSystem.scalef(0.99975586f, 0.99975586f, 0.99975586f);
             return;
-        }, () -> {
-            RenderSystem.matrixMode(5889);
-            RenderSystem.popMatrix();
-            RenderSystem.matrixMode(5888);
-            return;
-        });
+        }, RenderSystem::popMatrix);
         NO_FOG = new FogStateShard("no_fog", () -> {}, () -> {});
         FOG = new FogStateShard("fog", () -> {
             FogRenderer.levelFogColor();
@@ -221,6 +238,61 @@ public abstract class RenderStateShard {
         });
         MAIN_TARGET = new OutputStateShard("main_target", () -> {}, () -> {});
         OUTLINE_TARGET = new OutputStateShard("outline_target", () -> Minecraft.getInstance().levelRenderer.entityTarget().bindWrite(false), () -> Minecraft.getInstance().getMainRenderTarget().bindWrite(false));
+        TRANSLUCENT_TARGET = new OutputStateShard("translucent_target", () -> {
+            if (Minecraft.useShaderTransparency()) {
+                Minecraft.getInstance().levelRenderer.getTranslucentTarget().bindWrite(false);
+            }
+            return;
+        }, () -> {
+            if (Minecraft.useShaderTransparency()) {
+                Minecraft.getInstance().getMainRenderTarget().bindWrite(false);
+            }
+            return;
+        });
+        PARTICLES_TARGET = new OutputStateShard("particles_target", () -> {
+            if (Minecraft.useShaderTransparency()) {
+                Minecraft.getInstance().levelRenderer.getParticlesTarget().bindWrite(false);
+            }
+            return;
+        }, () -> {
+            if (Minecraft.useShaderTransparency()) {
+                Minecraft.getInstance().getMainRenderTarget().bindWrite(false);
+            }
+            return;
+        });
+        WEATHER_TARGET = new OutputStateShard("weather_target", () -> {
+            if (Minecraft.useShaderTransparency()) {
+                Minecraft.getInstance().levelRenderer.getWeatherTarget().bindWrite(false);
+            }
+            return;
+        }, () -> {
+            if (Minecraft.useShaderTransparency()) {
+                Minecraft.getInstance().getMainRenderTarget().bindWrite(false);
+            }
+            return;
+        });
+        CLOUDS_TARGET = new OutputStateShard("clouds_target", () -> {
+            if (Minecraft.useShaderTransparency()) {
+                Minecraft.getInstance().levelRenderer.getCloudsTarget().bindWrite(false);
+            }
+            return;
+        }, () -> {
+            if (Minecraft.useShaderTransparency()) {
+                Minecraft.getInstance().getMainRenderTarget().bindWrite(false);
+            }
+            return;
+        });
+        ITEM_ENTITY_TARGET = new OutputStateShard("item_entity_target", () -> {
+            if (Minecraft.useShaderTransparency()) {
+                Minecraft.getInstance().levelRenderer.getItemEntityTarget().bindWrite(false);
+            }
+            return;
+        }, () -> {
+            if (Minecraft.useShaderTransparency()) {
+                Minecraft.getInstance().getMainRenderTarget().bindWrite(false);
+            }
+            return;
+        });
         DEFAULT_LINE = new LineStateShard(OptionalDouble.of(1.0));
     }
     
@@ -260,6 +332,11 @@ public abstract class RenderStateShard {
         public int hashCode() {
             return Objects.hash(super.hashCode(), this.cutoff);
         }
+        
+        @Override
+        public String toString() {
+            return this.name + '[' + this.cutoff + ']';
+        }
     }
     
     public static class ShadeModelStateShard extends RenderStateShard {
@@ -286,6 +363,11 @@ public abstract class RenderStateShard {
         public int hashCode() {
             return Boolean.hashCode(this.smooth);
         }
+        
+        @Override
+        public String toString() {
+            return this.name + '[' + (this.smooth ? "smooth" : "flat") + ']';
+        }
     }
     
     public static class TextureStateShard extends RenderStateShard {
@@ -293,16 +375,16 @@ public abstract class RenderStateShard {
         private final boolean blur;
         private final boolean mipmap;
         
-        public TextureStateShard(final ResourceLocation sm, final boolean boolean2, final boolean boolean3) {
-            final TextureManager eak4;
+        public TextureStateShard(final ResourceLocation uh, final boolean boolean2, final boolean boolean3) {
+            final TextureManager elw4;
             super("texture", () -> {
                 RenderSystem.enableTexture();
-                eak4 = Minecraft.getInstance().getTextureManager();
-                eak4.bind(sm);
-                eak4.getTexture(sm).setFilter(boolean2, boolean3);
+                elw4 = Minecraft.getInstance().getTextureManager();
+                elw4.bind(uh);
+                elw4.getTexture(uh).setFilter(boolean2, boolean3);
                 return;
             }, () -> {});
-            this.texture = Optional.<ResourceLocation>of(sm);
+            this.texture = Optional.<ResourceLocation>of(uh);
             this.blur = boolean2;
             this.mipmap = boolean3;
         }
@@ -331,6 +413,11 @@ public abstract class RenderStateShard {
             return this.texture.hashCode();
         }
         
+        @Override
+        public String toString() {
+            return this.name + '[' + this.texture + "(blur=" + this.blur + ", mipmap=" + this.mipmap + ")]";
+        }
+        
         protected Optional<ResourceLocation> texture() {
             return this.texture;
         }
@@ -451,6 +538,11 @@ public abstract class RenderStateShard {
         public int hashCode() {
             return Boolean.hashCode(this.enabled);
         }
+        
+        @Override
+        public String toString() {
+            return this.name + '[' + this.enabled + ']';
+        }
     }
     
     public static class LightmapStateShard extends BooleanStateShard {
@@ -498,21 +590,22 @@ public abstract class RenderStateShard {
     public static class CullStateShard extends BooleanStateShard {
         public CullStateShard(final boolean boolean1) {
             super("cull", () -> {
-                if (boolean1) {
-                    RenderSystem.enableCull();
+                if (!boolean1) {
+                    RenderSystem.disableCull();
                 }
             }, () -> {
-                if (boolean1) {
-                    RenderSystem.disableCull();
+                if (!boolean1) {
+                    RenderSystem.enableCull();
                 }
             }, boolean1);
         }
     }
     
     public static class DepthTestStateShard extends RenderStateShard {
+        private final String functionName;
         private final int function;
         
-        public DepthTestStateShard(final int integer) {
+        public DepthTestStateShard(final String string, final int integer) {
             super("depth_test", () -> {
                 if (integer != 519) {
                     RenderSystem.enableDepthTest();
@@ -526,6 +619,7 @@ public abstract class RenderStateShard {
                 }
                 return;
             });
+            this.functionName = string;
             this.function = integer;
         }
         
@@ -545,6 +639,11 @@ public abstract class RenderStateShard {
         public int hashCode() {
             return Integer.hashCode(this.function);
         }
+        
+        @Override
+        public String toString() {
+            return this.name + '[' + this.functionName + ']';
+        }
     }
     
     public static class WriteMaskStateShard extends RenderStateShard {
@@ -589,6 +688,11 @@ public abstract class RenderStateShard {
         public int hashCode() {
             return Objects.hash(this.writeColor, this.writeDepth);
         }
+        
+        @Override
+        public String toString() {
+            return this.name + "[writeColor=" + this.writeColor + ", writeDepth=" + this.writeDepth + ']';
+        }
     }
     
     public static class LayeringStateShard extends RenderStateShard {
@@ -613,7 +717,7 @@ public abstract class RenderStateShard {
         private final OptionalDouble width;
         
         public LineStateShard(final OptionalDouble optionalDouble) {
-            super("alpha", () -> {
+            super("line_width", () -> {
                 if (!Objects.equals(optionalDouble, OptionalDouble.of(1.0))) {
                     if (optionalDouble.isPresent()) {
                         RenderSystem.lineWidth((float)optionalDouble.getAsDouble());
@@ -641,5 +745,10 @@ public abstract class RenderStateShard {
         public int hashCode() {
             return Objects.hash(super.hashCode(), this.width);
         }
+        
+        @Override
+        public String toString() {
+            return this.name + '[' + (this.width.isPresent() ? Double.valueOf(this.width.getAsDouble()) : "window_scale") + ']';
+        }
     }
 }
diff --git a/src/net/minecraft/client/renderer/RenderType.java b/src/net/minecraft/client/renderer/RenderType.java
index c343ccc..bc183b7 100644
--- a/src/net/minecraft/client/renderer/RenderType.java
+++ b/src/net/minecraft/client/renderer/RenderType.java
@@ -2,7 +2,6 @@ package net.minecraft.client.renderer;
 
 import it.unimi.dsi.fastutil.Hash;
 import javax.annotation.Nullable;
-import java.util.function.Function;
 import java.util.function.Consumer;
 import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
 import java.util.Objects;
@@ -23,12 +22,18 @@ public abstract class RenderType extends RenderStateShard {
     private static final RenderType CUTOUT_MIPPED;
     private static final RenderType CUTOUT;
     private static final RenderType TRANSLUCENT;
+    private static final RenderType TRANSLUCENT_MOVING_BLOCK;
     private static final RenderType TRANSLUCENT_NO_CRUMBLING;
     private static final RenderType LEASH;
     private static final RenderType WATER_MASK;
+    private static final RenderType ARMOR_GLINT;
+    private static final RenderType ARMOR_ENTITY_GLINT;
     private static final RenderType GLINT;
+    private static final RenderType GLINT_DIRECT;
     private static final RenderType ENTITY_GLINT;
+    private static final RenderType ENTITY_GLINT_DIRECT;
     private static final RenderType LIGHTNING;
+    private static final RenderType TRIPWIRE;
     public static final CompositeRenderType LINES;
     private final VertexFormat format;
     private final int mode;
@@ -50,82 +55,114 @@ public abstract class RenderType extends RenderStateShard {
     }
     
     private static CompositeState translucentState() {
-        return CompositeState.builder().setShadeModelState(RenderType.SMOOTH_SHADE).setLightmapState(RenderType.LIGHTMAP).setTextureState(RenderType.BLOCK_SHEET_MIPPED).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).createCompositeState(true);
+        return CompositeState.builder().setShadeModelState(RenderType.SMOOTH_SHADE).setLightmapState(RenderType.LIGHTMAP).setTextureState(RenderType.BLOCK_SHEET_MIPPED).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setOutputState(RenderType.TRANSLUCENT_TARGET).createCompositeState(true);
     }
     
     public static RenderType translucent() {
         return RenderType.TRANSLUCENT;
     }
     
+    private static CompositeState translucentMovingBlockState() {
+        return CompositeState.builder().setShadeModelState(RenderType.SMOOTH_SHADE).setLightmapState(RenderType.LIGHTMAP).setTextureState(RenderType.BLOCK_SHEET_MIPPED).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setOutputState(RenderType.ITEM_ENTITY_TARGET).createCompositeState(true);
+    }
+    
+    public static RenderType translucentMovingBlock() {
+        return RenderType.TRANSLUCENT_MOVING_BLOCK;
+    }
+    
     public static RenderType translucentNoCrumbling() {
         return RenderType.TRANSLUCENT_NO_CRUMBLING;
     }
     
-    public static RenderType entitySolid(final ResourceLocation sm) {
-        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setTransparencyState(RenderType.NO_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(true);
+    public static RenderType armorCutoutNoCull(final ResourceLocation uh) {
+        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(RenderType.NO_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING).createCompositeState(true);
+        return create("armor_cutout_no_cull", DefaultVertexFormat.NEW_ENTITY, 7, 256, true, false, b2);
+    }
+    
+    public static RenderType entitySolid(final ResourceLocation uh) {
+        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(RenderType.NO_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(true);
         return create("entity_solid", DefaultVertexFormat.NEW_ENTITY, 7, 256, true, false, b2);
     }
     
-    public static RenderType entityCutout(final ResourceLocation sm) {
-        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setTransparencyState(RenderType.NO_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(true);
+    public static RenderType entityCutout(final ResourceLocation uh) {
+        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(RenderType.NO_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(true);
         return create("entity_cutout", DefaultVertexFormat.NEW_ENTITY, 7, 256, true, false, b2);
     }
     
-    public static RenderType entityCutoutNoCull(final ResourceLocation sm, final boolean boolean2) {
-        final CompositeState b3 = CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setTransparencyState(RenderType.NO_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(boolean2);
+    public static RenderType entityCutoutNoCull(final ResourceLocation uh, final boolean boolean2) {
+        final CompositeState b3 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(RenderType.NO_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(boolean2);
         return create("entity_cutout_no_cull", DefaultVertexFormat.NEW_ENTITY, 7, 256, true, false, b3);
     }
     
-    public static RenderType entityCutoutNoCull(final ResourceLocation sm) {
-        return entityCutoutNoCull(sm, true);
+    public static RenderType entityCutoutNoCull(final ResourceLocation uh) {
+        return entityCutoutNoCull(uh, true);
     }
     
-    public static RenderType entityTranslucentCull(final ResourceLocation sm) {
-        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(true);
+    public static RenderType entityCutoutNoCullZOffset(final ResourceLocation uh, final boolean boolean2) {
+        final CompositeState b3 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(RenderType.NO_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING).createCompositeState(boolean2);
+        return create("entity_cutout_no_cull_z_offset", DefaultVertexFormat.NEW_ENTITY, 7, 256, true, false, b3);
+    }
+    
+    public static RenderType entityCutoutNoCullZOffset(final ResourceLocation uh) {
+        return entityCutoutNoCullZOffset(uh, true);
+    }
+    
+    public static RenderType itemEntityTranslucentCull(final ResourceLocation uh) {
+        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setOutputState(RenderType.ITEM_ENTITY_TARGET).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE).createCompositeState(true);
+        return create("item_entity_translucent_cull", DefaultVertexFormat.NEW_ENTITY, 7, 256, true, true, b2);
+    }
+    
+    public static RenderType entityTranslucentCull(final ResourceLocation uh) {
+        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(true);
         return create("entity_translucent_cull", DefaultVertexFormat.NEW_ENTITY, 7, 256, true, true, b2);
     }
     
-    public static RenderType entityTranslucent(final ResourceLocation sm, final boolean boolean2) {
-        final CompositeState b3 = CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(boolean2);
+    public static RenderType entityTranslucent(final ResourceLocation uh, final boolean boolean2) {
+        final CompositeState b3 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(boolean2);
         return create("entity_translucent", DefaultVertexFormat.NEW_ENTITY, 7, 256, true, true, b3);
     }
     
-    public static RenderType entityTranslucent(final ResourceLocation sm) {
-        return entityTranslucent(sm, true);
+    public static RenderType entityTranslucent(final ResourceLocation uh) {
+        return entityTranslucent(uh, true);
     }
     
-    public static RenderType entitySmoothCutout(final ResourceLocation sm) {
-        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setAlphaState(RenderType.MIDWAY_ALPHA).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setShadeModelState(RenderType.SMOOTH_SHADE).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).createCompositeState(true);
+    public static RenderType entitySmoothCutout(final ResourceLocation uh) {
+        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setAlphaState(RenderType.MIDWAY_ALPHA).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setShadeModelState(RenderType.SMOOTH_SHADE).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).createCompositeState(true);
         return create("entity_smooth_cutout", DefaultVertexFormat.NEW_ENTITY, 7, 256, b2);
     }
     
-    public static RenderType beaconBeam(final ResourceLocation sm, final boolean boolean2) {
-        final CompositeState b3 = CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setTransparencyState(boolean2 ? RenderType.TRANSLUCENT_TRANSPARENCY : RenderType.NO_TRANSPARENCY).setWriteMaskState(boolean2 ? RenderType.COLOR_WRITE : RenderType.COLOR_DEPTH_WRITE).setFogState(RenderType.NO_FOG).createCompositeState(false);
+    public static RenderType beaconBeam(final ResourceLocation uh, final boolean boolean2) {
+        final CompositeState b3 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(boolean2 ? RenderType.TRANSLUCENT_TRANSPARENCY : RenderType.NO_TRANSPARENCY).setWriteMaskState(boolean2 ? RenderType.COLOR_WRITE : RenderType.COLOR_DEPTH_WRITE).setFogState(RenderType.NO_FOG).createCompositeState(false);
         return create("beacon_beam", DefaultVertexFormat.BLOCK, 7, 256, false, true, b3);
     }
     
-    public static RenderType entityDecal(final ResourceLocation sm) {
-        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setDepthTestState(RenderType.EQUAL_DEPTH_TEST).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(false);
+    public static RenderType entityDecal(final ResourceLocation uh) {
+        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setDepthTestState(RenderType.EQUAL_DEPTH_TEST).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(false);
         return create("entity_decal", DefaultVertexFormat.NEW_ENTITY, 7, 256, b2);
     }
     
-    public static RenderType entityNoOutline(final ResourceLocation sm) {
-        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).setWriteMaskState(RenderType.COLOR_WRITE).createCompositeState(false);
+    public static RenderType entityNoOutline(final ResourceLocation uh) {
+        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).setWriteMaskState(RenderType.COLOR_WRITE).createCompositeState(false);
         return create("entity_no_outline", DefaultVertexFormat.NEW_ENTITY, 7, 256, false, true, b2);
     }
     
-    public static RenderType entityAlpha(final ResourceLocation sm, final float float2) {
-        final CompositeState b3 = CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setAlphaState(new AlphaStateShard(float2)).setCullState(RenderType.NO_CULL).createCompositeState(true);
+    public static RenderType entityShadow(final ResourceLocation uh) {
+        final CompositeState b2 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).setWriteMaskState(RenderType.COLOR_WRITE).setDepthTestState(RenderType.LEQUAL_DEPTH_TEST).setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING).createCompositeState(false);
+        return create("entity_shadow", DefaultVertexFormat.NEW_ENTITY, 7, 256, false, false, b2);
+    }
+    
+    public static RenderType dragonExplosionAlpha(final ResourceLocation uh, final float float2) {
+        final CompositeState b3 = CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setAlphaState(new AlphaStateShard(float2)).setCullState(RenderType.NO_CULL).createCompositeState(true);
         return create("entity_alpha", DefaultVertexFormat.NEW_ENTITY, 7, 256, b3);
     }
     
-    public static RenderType eyes(final ResourceLocation sm) {
-        final TextureStateShard o2 = new TextureStateShard(sm, false, false);
+    public static RenderType eyes(final ResourceLocation uh) {
+        final TextureStateShard o2 = new TextureStateShard(uh, false, false);
         return create("eyes", DefaultVertexFormat.NEW_ENTITY, 7, 256, false, true, CompositeState.builder().setTextureState(o2).setTransparencyState(RenderType.ADDITIVE_TRANSPARENCY).setWriteMaskState(RenderType.COLOR_WRITE).setFogState(RenderType.BLACK_FOG).createCompositeState(false));
     }
     
-    public static RenderType energySwirl(final ResourceLocation sm, final float float2, final float float3) {
-        return create("energy_swirl", DefaultVertexFormat.NEW_ENTITY, 7, 256, false, true, CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setTexturingState(new OffsetTexturingStateShard(float2, float3)).setFogState(RenderType.BLACK_FOG).setTransparencyState(RenderType.ADDITIVE_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(false));
+    public static RenderType energySwirl(final ResourceLocation uh, final float float2, final float float3) {
+        return create("energy_swirl", DefaultVertexFormat.NEW_ENTITY, 7, 256, false, true, CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setTexturingState(new OffsetTexturingStateShard(float2, float3)).setFogState(RenderType.BLACK_FOG).setTransparencyState(RenderType.ADDITIVE_TRANSPARENCY).setDiffuseLightingState(RenderType.DIFFUSE_LIGHTING).setAlphaState(RenderType.DEFAULT_ALPHA).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).setOverlayState(RenderType.OVERLAY).createCompositeState(false));
     }
     
     public static RenderType leash() {
@@ -136,35 +173,63 @@ public abstract class RenderType extends RenderStateShard {
         return RenderType.WATER_MASK;
     }
     
-    public static RenderType outline(final ResourceLocation sm) {
-        return create("outline", DefaultVertexFormat.POSITION_COLOR_TEX, 7, 256, CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setCullState(RenderType.NO_CULL).setDepthTestState(RenderType.NO_DEPTH_TEST).setAlphaState(RenderType.DEFAULT_ALPHA).setTexturingState(RenderType.OUTLINE_TEXTURING).setFogState(RenderType.NO_FOG).setOutputState(RenderType.OUTLINE_TARGET).createCompositeState(OutlineProperty.IS_OUTLINE));
+    public static RenderType outline(final ResourceLocation uh) {
+        return outline(uh, RenderType.NO_CULL);
+    }
+    
+    public static RenderType outline(final ResourceLocation uh, final CullStateShard c) {
+        return create("outline", DefaultVertexFormat.POSITION_COLOR_TEX, 7, 256, CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setCullState(c).setDepthTestState(RenderType.NO_DEPTH_TEST).setAlphaState(RenderType.DEFAULT_ALPHA).setTexturingState(RenderType.OUTLINE_TEXTURING).setFogState(RenderType.NO_FOG).setOutputState(RenderType.OUTLINE_TARGET).createCompositeState(OutlineProperty.IS_OUTLINE));
+    }
+    
+    public static RenderType armorGlint() {
+        return RenderType.ARMOR_GLINT;
+    }
+    
+    public static RenderType armorEntityGlint() {
+        return RenderType.ARMOR_ENTITY_GLINT;
     }
     
     public static RenderType glint() {
         return RenderType.GLINT;
     }
     
+    public static RenderType glintDirect() {
+        return RenderType.GLINT_DIRECT;
+    }
+    
     public static RenderType entityGlint() {
         return RenderType.ENTITY_GLINT;
     }
     
-    public static RenderType crumbling(final ResourceLocation sm) {
-        final TextureStateShard o2 = new TextureStateShard(sm, false, false);
+    public static RenderType entityGlintDirect() {
+        return RenderType.ENTITY_GLINT_DIRECT;
+    }
+    
+    public static RenderType crumbling(final ResourceLocation uh) {
+        final TextureStateShard o2 = new TextureStateShard(uh, false, false);
         return create("crumbling", DefaultVertexFormat.BLOCK, 7, 256, false, true, CompositeState.builder().setTextureState(o2).setAlphaState(RenderType.DEFAULT_ALPHA).setTransparencyState(RenderType.CRUMBLING_TRANSPARENCY).setWriteMaskState(RenderType.COLOR_WRITE).setLayeringState(RenderType.POLYGON_OFFSET_LAYERING).createCompositeState(false));
     }
     
-    public static RenderType text(final ResourceLocation sm) {
-        return create("text", DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, 7, 256, false, true, CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setAlphaState(RenderType.DEFAULT_ALPHA).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setLightmapState(RenderType.LIGHTMAP).createCompositeState(false));
+    public static RenderType text(final ResourceLocation uh) {
+        return create("text", DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, 7, 256, false, true, CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setAlphaState(RenderType.DEFAULT_ALPHA).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setLightmapState(RenderType.LIGHTMAP).createCompositeState(false));
     }
     
-    public static RenderType textSeeThrough(final ResourceLocation sm) {
-        return create("text_see_through", DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, 7, 256, false, true, CompositeState.builder().setTextureState(new TextureStateShard(sm, false, false)).setAlphaState(RenderType.DEFAULT_ALPHA).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setLightmapState(RenderType.LIGHTMAP).setDepthTestState(RenderType.NO_DEPTH_TEST).setWriteMaskState(RenderType.COLOR_WRITE).createCompositeState(false));
+    public static RenderType textSeeThrough(final ResourceLocation uh) {
+        return create("text_see_through", DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, 7, 256, false, true, CompositeState.builder().setTextureState(new TextureStateShard(uh, false, false)).setAlphaState(RenderType.DEFAULT_ALPHA).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setLightmapState(RenderType.LIGHTMAP).setDepthTestState(RenderType.NO_DEPTH_TEST).setWriteMaskState(RenderType.COLOR_WRITE).createCompositeState(false));
     }
     
     public static RenderType lightning() {
         return RenderType.LIGHTNING;
     }
     
+    private static CompositeState tripwireState() {
+        return CompositeState.builder().setShadeModelState(RenderType.SMOOTH_SHADE).setLightmapState(RenderType.LIGHTMAP).setTextureState(RenderType.BLOCK_SHEET_MIPPED).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setOutputState(RenderType.WEATHER_TARGET).createCompositeState(true);
+    }
+    
+    public static RenderType tripwire() {
+        return RenderType.TRIPWIRE;
+    }
+    
     public static RenderType endPortal(final int integer) {
         TransparencyStateShard q2;
         TextureStateShard o3;
@@ -183,9 +248,9 @@ public abstract class RenderType extends RenderStateShard {
         return RenderType.LINES;
     }
     
-    public RenderType(final String string, final VertexFormat cyp, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6, final Runnable runnable7, final Runnable runnable8) {
+    public RenderType(final String string, final VertexFormat dhq, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6, final Runnable runnable7, final Runnable runnable8) {
         super(string, runnable7, runnable8);
-        this.format = cyp;
+        this.format = dhq;
         this.mode = integer3;
         this.bufferSize = integer4;
         this.affectsCrumbling = boolean5;
@@ -193,24 +258,24 @@ public abstract class RenderType extends RenderStateShard {
         this.asOptional = Optional.<RenderType>of(this);
     }
     
-    public static CompositeRenderType create(final String string, final VertexFormat cyp, final int integer3, final int integer4, final CompositeState b) {
-        return create(string, cyp, integer3, integer4, false, false, b);
+    public static CompositeRenderType create(final String string, final VertexFormat dhq, final int integer3, final int integer4, final CompositeState b) {
+        return create(string, dhq, integer3, integer4, false, false, b);
     }
     
-    public static CompositeRenderType create(final String string, final VertexFormat cyp, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6, final CompositeState b) {
-        return memoize(string, cyp, integer3, integer4, boolean5, boolean6, b);
+    public static CompositeRenderType create(final String string, final VertexFormat dhq, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6, final CompositeState b) {
+        return memoize(string, dhq, integer3, integer4, boolean5, boolean6, b);
     }
     
-    public void end(final BufferBuilder cyg, final int integer2, final int integer3, final int integer4) {
-        if (!cyg.building()) {
+    public void end(final BufferBuilder dhg, final int integer2, final int integer3, final int integer4) {
+        if (!dhg.building()) {
             return;
         }
         if (this.sortOnUpload) {
-            cyg.sortQuads((float)integer2, (float)integer3, (float)integer4);
+            dhg.sortQuads((float)integer2, (float)integer3, (float)integer4);
         }
-        cyg.end();
+        dhg.end();
         this.setupRenderState();
-        BufferUploader.end(cyg);
+        BufferUploader.end(dhg);
         this.clearRenderState();
     }
     
@@ -220,7 +285,7 @@ public abstract class RenderType extends RenderStateShard {
     }
     
     public static List<RenderType> chunkBufferLayers() {
-        return ImmutableList.<RenderType>of(solid(), cutoutMipped(), cutout(), translucent());
+        return ImmutableList.<RenderType>of(solid(), cutoutMipped(), cutout(), translucent(), tripwire());
     }
     
     public int bufferSize() {
@@ -256,19 +321,36 @@ public abstract class RenderType extends RenderStateShard {
         CUTOUT_MIPPED = create("cutout_mipped", DefaultVertexFormat.BLOCK, 7, 131072, true, false, CompositeState.builder().setShadeModelState(RenderType.SMOOTH_SHADE).setLightmapState(RenderType.LIGHTMAP).setTextureState(RenderType.BLOCK_SHEET_MIPPED).setAlphaState(RenderType.MIDWAY_ALPHA).createCompositeState(true));
         CUTOUT = create("cutout", DefaultVertexFormat.BLOCK, 7, 131072, true, false, CompositeState.builder().setShadeModelState(RenderType.SMOOTH_SHADE).setLightmapState(RenderType.LIGHTMAP).setTextureState(RenderType.BLOCK_SHEET).setAlphaState(RenderType.MIDWAY_ALPHA).createCompositeState(true));
         TRANSLUCENT = create("translucent", DefaultVertexFormat.BLOCK, 7, 262144, true, true, translucentState());
+        TRANSLUCENT_MOVING_BLOCK = create("translucent_moving_block", DefaultVertexFormat.BLOCK, 7, 262144, false, true, translucentMovingBlockState());
         TRANSLUCENT_NO_CRUMBLING = create("translucent_no_crumbling", DefaultVertexFormat.BLOCK, 7, 262144, false, true, translucentState());
         LEASH = create("leash", DefaultVertexFormat.POSITION_COLOR_LIGHTMAP, 7, 256, CompositeState.builder().setTextureState(RenderType.NO_TEXTURE).setCullState(RenderType.NO_CULL).setLightmapState(RenderType.LIGHTMAP).createCompositeState(false));
         WATER_MASK = create("water_mask", DefaultVertexFormat.POSITION, 7, 256, CompositeState.builder().setTextureState(RenderType.NO_TEXTURE).setWriteMaskState(RenderType.DEPTH_WRITE).createCompositeState(false));
-        GLINT = create("glint", DefaultVertexFormat.POSITION_TEX, 7, 256, CompositeState.builder().setTextureState(new TextureStateShard(ItemRenderer.ENCHANT_GLINT_LOCATION, true, false)).setWriteMaskState(RenderType.COLOR_WRITE).setCullState(RenderType.NO_CULL).setDepthTestState(RenderType.EQUAL_DEPTH_TEST).setTransparencyState(RenderType.GLINT_TRANSPARENCY).setTexturingState(RenderType.GLINT_TEXTURING).createCompositeState(false));
-        ENTITY_GLINT = create("entity_glint", DefaultVertexFormat.POSITION_TEX, 7, 256, CompositeState.builder().setTextureState(new TextureStateShard(ItemRenderer.ENCHANT_GLINT_LOCATION, true, false)).setWriteMaskState(RenderType.COLOR_WRITE).setCullState(RenderType.NO_CULL).setDepthTestState(RenderType.EQUAL_DEPTH_TEST).setTransparencyState(RenderType.GLINT_TRANSPARENCY).setTexturingState(RenderType.ENTITY_GLINT_TEXTURING).createCompositeState(false));
-        LIGHTNING = create("lightning", DefaultVertexFormat.POSITION_COLOR, 7, 256, false, true, CompositeState.builder().setWriteMaskState(RenderType.COLOR_WRITE).setTransparencyState(RenderType.LIGHTNING_TRANSPARENCY).setShadeModelState(RenderType.SMOOTH_SHADE).createCompositeState(false));
-        LINES = create("lines", DefaultVertexFormat.POSITION_COLOR, 1, 256, CompositeState.builder().setLineState(new LineStateShard(OptionalDouble.empty())).setLayeringState(RenderType.PROJECTION_LAYERING).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setWriteMaskState(RenderType.COLOR_WRITE).createCompositeState(false));
+        ARMOR_GLINT = create("armor_glint", DefaultVertexFormat.POSITION_TEX, 7, 256, CompositeState.builder().setTextureState(new TextureStateShard(ItemRenderer.ENCHANT_GLINT_LOCATION, true, false)).setWriteMaskState(RenderType.COLOR_WRITE).setCullState(RenderType.NO_CULL).setDepthTestState(RenderType.EQUAL_DEPTH_TEST).setTransparencyState(RenderType.GLINT_DIRECT_TRANSPARENCY).setTexturingState(RenderType.GLINT_TEXTURING).setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING).createCompositeState(false));
+        ARMOR_ENTITY_GLINT = create("armor_entity_glint", DefaultVertexFormat.POSITION_TEX, 7, 256, CompositeState.builder().setTextureState(new TextureStateShard(ItemRenderer.ENCHANT_GLINT_LOCATION, true, false)).setWriteMaskState(RenderType.COLOR_WRITE).setCullState(RenderType.NO_CULL).setDepthTestState(RenderType.EQUAL_DEPTH_TEST).setTransparencyState(RenderType.GLINT_DIRECT_TRANSPARENCY).setTexturingState(RenderType.ENTITY_GLINT_TEXTURING).setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING).createCompositeState(false));
+        GLINT = create("glint", DefaultVertexFormat.POSITION_TEX, 7, 256, CompositeState.builder().setTextureState(new TextureStateShard(ItemRenderer.ENCHANT_GLINT_LOCATION, true, false)).setWriteMaskState(RenderType.COLOR_WRITE).setCullState(RenderType.NO_CULL).setDepthTestState(RenderType.EQUAL_DEPTH_TEST).setTransparencyState(RenderType.GLINT_TRANSPARENCY).setOutputState(RenderType.ITEM_ENTITY_TARGET).setTexturingState(RenderType.GLINT_TEXTURING).createCompositeState(false));
+        GLINT_DIRECT = create("glint_direct", DefaultVertexFormat.POSITION_TEX, 7, 256, CompositeState.builder().setTextureState(new TextureStateShard(ItemRenderer.ENCHANT_GLINT_LOCATION, true, false)).setWriteMaskState(RenderType.COLOR_WRITE).setCullState(RenderType.NO_CULL).setDepthTestState(RenderType.EQUAL_DEPTH_TEST).setTransparencyState(RenderType.GLINT_DIRECT_TRANSPARENCY).setTexturingState(RenderType.GLINT_TEXTURING).createCompositeState(false));
+        ENTITY_GLINT = create("entity_glint", DefaultVertexFormat.POSITION_TEX, 7, 256, CompositeState.builder().setTextureState(new TextureStateShard(ItemRenderer.ENCHANT_GLINT_LOCATION, true, false)).setWriteMaskState(RenderType.COLOR_WRITE).setCullState(RenderType.NO_CULL).setDepthTestState(RenderType.EQUAL_DEPTH_TEST).setTransparencyState(RenderType.GLINT_TRANSPARENCY).setOutputState(RenderType.ITEM_ENTITY_TARGET).setTexturingState(RenderType.ENTITY_GLINT_TEXTURING).createCompositeState(false));
+        ENTITY_GLINT_DIRECT = create("entity_glint_direct", DefaultVertexFormat.POSITION_TEX, 7, 256, CompositeState.builder().setTextureState(new TextureStateShard(ItemRenderer.ENCHANT_GLINT_LOCATION, true, false)).setWriteMaskState(RenderType.COLOR_WRITE).setCullState(RenderType.NO_CULL).setDepthTestState(RenderType.EQUAL_DEPTH_TEST).setTransparencyState(RenderType.GLINT_DIRECT_TRANSPARENCY).setTexturingState(RenderType.ENTITY_GLINT_TEXTURING).createCompositeState(false));
+        LIGHTNING = create("lightning", DefaultVertexFormat.POSITION_COLOR, 7, 256, false, true, CompositeState.builder().setWriteMaskState(RenderType.COLOR_DEPTH_WRITE).setTransparencyState(RenderType.LIGHTNING_TRANSPARENCY).setOutputState(RenderType.WEATHER_TARGET).setShadeModelState(RenderType.SMOOTH_SHADE).createCompositeState(false));
+        TRIPWIRE = create("tripwire", DefaultVertexFormat.BLOCK, 7, 262144, true, true, tripwireState());
+        LINES = create("lines", DefaultVertexFormat.POSITION_COLOR, 1, 256, CompositeState.builder().setLineState(new LineStateShard(OptionalDouble.empty())).setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING).setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY).setOutputState(RenderType.ITEM_ENTITY_TARGET).setWriteMaskState(RenderType.COLOR_DEPTH_WRITE).createCompositeState(false));
     }
     
     enum OutlineProperty {
-        NONE, 
-        IS_OUTLINE, 
-        AFFECTS_OUTLINE;
+        NONE("none"), 
+        IS_OUTLINE("is_outline"), 
+        AFFECTS_OUTLINE("affects_outline");
+        
+        private final String name;
+        
+        private OutlineProperty(final String string3) {
+            this.name = string3;
+        }
+        
+        @Override
+        public String toString() {
+            return this.name;
+        }
     }
     
     public static final class CompositeState {
@@ -327,6 +409,11 @@ public abstract class RenderType extends RenderStateShard {
             return Objects.hash(this.states, this.outlineProperty);
         }
         
+        @Override
+        public String toString() {
+            return "CompositeState[" + this.states + ", outlineProperty=" + this.outlineProperty + ']';
+        }
+        
         public static CompositeStateBuilder builder() {
             return new CompositeStateBuilder();
         }
@@ -458,16 +545,16 @@ public abstract class RenderType extends RenderStateShard {
         private final Optional<RenderType> outline;
         private final boolean isOutline;
         
-        private CompositeRenderType(final String string, final VertexFormat cyp, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6, final CompositeState b) {
-            super(string, cyp, integer3, integer4, boolean5, boolean6, () -> b.states.forEach(RenderStateShard::setupRenderState), () -> b.states.forEach(RenderStateShard::clearRenderState));
+        private CompositeRenderType(final String string, final VertexFormat dhq, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6, final CompositeState b) {
+            super(string, dhq, integer3, integer4, boolean5, boolean6, () -> b.states.forEach(RenderStateShard::setupRenderState), () -> b.states.forEach(RenderStateShard::clearRenderState));
             this.state = b;
-            this.outline = ((b.outlineProperty == OutlineProperty.AFFECTS_OUTLINE) ? b.textureState.texture().<RenderType>map(RenderType::outline) : Optional.<RenderType>empty());
+            this.outline = ((b.outlineProperty == OutlineProperty.AFFECTS_OUTLINE) ? b.textureState.texture().<RenderType>map(uh -> RenderType.outline(uh, b.cullState)) : Optional.<RenderType>empty());
             this.isOutline = (b.outlineProperty == OutlineProperty.IS_OUTLINE);
             this.hashCode = Objects.hash(super.hashCode(), b);
         }
         
-        private static CompositeRenderType memoize(final String string, final VertexFormat cyp, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6, final CompositeState b) {
-            return (CompositeRenderType)CompositeRenderType.INSTANCES.addOrGet(new CompositeRenderType(string, cyp, integer3, integer4, boolean5, boolean6, b));
+        private static CompositeRenderType memoize(final String string, final VertexFormat dhq, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6, final CompositeState b) {
+            return (CompositeRenderType)CompositeRenderType.INSTANCES.addOrGet(new CompositeRenderType(string, dhq, integer3, integer4, boolean5, boolean6, b));
         }
         
         @Override
@@ -490,6 +577,11 @@ public abstract class RenderType extends RenderStateShard {
             return this.hashCode;
         }
         
+        @Override
+        public String toString() {
+            return "RenderType[" + this.state + ']';
+        }
+        
         static {
             INSTANCES = new ObjectOpenCustomHashSet((Hash.Strategy)EqualsStrategy.INSTANCE);
         }
diff --git a/src/net/minecraft/client/renderer/ScreenEffectRenderer.java b/src/net/minecraft/client/renderer/ScreenEffectRenderer.java
index c2e40b5..eb45f5a 100644
--- a/src/net/minecraft/client/renderer/ScreenEffectRenderer.java
+++ b/src/net/minecraft/client/renderer/ScreenEffectRenderer.java
@@ -15,6 +15,8 @@ import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -24,69 +26,70 @@ import net.minecraft.resources.ResourceLocation;
 public class ScreenEffectRenderer {
     private static final ResourceLocation UNDERWATER_LOCATION;
     
-    public static void renderScreenEffect(final Minecraft dbn, final PoseStack cyl) {
+    public static void renderScreenEffect(final Minecraft dlx, final PoseStack dhl) {
         RenderSystem.disableAlphaTest();
-        final Player ayj3 = dbn.player;
-        if (!ayj3.noPhysics) {
-            final BlockState byj4 = getViewBlockingState(ayj3);
-            if (byj4 != null) {
-                renderTex(dbn, dbn.getBlockRenderer().getBlockModelShaper().getParticleIcon(byj4), cyl);
+        final Player bec3 = dlx.player;
+        if (!bec3.noPhysics) {
+            final BlockState cfj4 = getViewBlockingState(bec3);
+            if (cfj4 != null) {
+                renderTex(dlx, dlx.getBlockRenderer().getBlockModelShaper().getParticleIcon(cfj4), dhl);
             }
         }
-        if (!dbn.player.isSpectator()) {
-            if (dbn.player.isUnderLiquid(FluidTags.WATER)) {
-                renderWater(dbn, cyl);
+        if (!dlx.player.isSpectator()) {
+            if (dlx.player.isEyeInFluid(FluidTags.WATER)) {
+                renderWater(dlx, dhl);
             }
-            if (dbn.player.isOnFire()) {
-                renderFire(dbn, cyl);
+            if (dlx.player.isOnFire()) {
+                renderFire(dlx, dhl);
             }
         }
         RenderSystem.enableAlphaTest();
     }
     
     @Nullable
-    private static BlockState getViewBlockingState(final Player ayj) {
+    private static BlockState getViewBlockingState(final Player bec) {
         final BlockPos.MutableBlockPos a2 = new BlockPos.MutableBlockPos();
         for (int integer3 = 0; integer3 < 8; ++integer3) {
-            final double double4 = ayj.getX() + ((integer3 >> 0) % 2 - 0.5f) * ayj.getBbWidth() * 0.8f;
-            final double double5 = ayj.getEyeY() + ((integer3 >> 1) % 2 - 0.5f) * 0.1f;
-            final double double6 = ayj.getZ() + ((integer3 >> 2) % 2 - 0.5f) * ayj.getBbWidth() * 0.8f;
+            final double double4 = bec.getX() + ((integer3 >> 0) % 2 - 0.5f) * bec.getBbWidth() * 0.8f;
+            final double double5 = bec.getEyeY() + ((integer3 >> 1) % 2 - 0.5f) * 0.1f;
+            final double double6 = bec.getZ() + ((integer3 >> 2) % 2 - 0.5f) * bec.getBbWidth() * 0.8f;
             a2.set(double4, double5, double6);
-            final BlockState byj10 = ayj.level.getBlockState(a2);
-            if (byj10.getRenderShape() != RenderShape.INVISIBLE && byj10.isViewBlocking(ayj.level, a2)) {
-                return byj10;
+            final BlockState cfj10 = bec.level.getBlockState(a2);
+            if (cfj10.getRenderShape() != RenderShape.INVISIBLE && cfj10.isViewBlocking(bec.level, a2)) {
+                return cfj10;
             }
         }
         return null;
     }
     
-    private static void renderTex(final Minecraft dbn, final TextureAtlasSprite eaj, final PoseStack cyl) {
-        dbn.getTextureManager().bind(eaj.atlas().location());
-        final BufferBuilder cyg4 = Tesselator.getInstance().getBuilder();
+    private static void renderTex(final Minecraft dlx, final TextureAtlasSprite elv, final PoseStack dhl) {
+        dlx.getTextureManager().bind(elv.atlas().location());
+        final BufferBuilder dhg4 = Tesselator.getInstance().getBuilder();
         final float float5 = 0.1f;
         final float float6 = -1.0f;
         final float float7 = 1.0f;
         final float float8 = -1.0f;
         final float float9 = 1.0f;
         final float float10 = -0.5f;
-        final float float11 = eaj.getU0();
-        final float float12 = eaj.getU1();
-        final float float13 = eaj.getV0();
-        final float float14 = eaj.getV1();
-        final Matrix4f b15 = cyl.last().pose();
-        cyg4.begin(7, DefaultVertexFormat.POSITION_COLOR_TEX);
-        cyg4.vertex(b15, -1.0f, -1.0f, -0.5f).color(0.1f, 0.1f, 0.1f, 1.0f).uv(float12, float14).endVertex();
-        cyg4.vertex(b15, 1.0f, -1.0f, -0.5f).color(0.1f, 0.1f, 0.1f, 1.0f).uv(float11, float14).endVertex();
-        cyg4.vertex(b15, 1.0f, 1.0f, -0.5f).color(0.1f, 0.1f, 0.1f, 1.0f).uv(float11, float13).endVertex();
-        cyg4.vertex(b15, -1.0f, 1.0f, -0.5f).color(0.1f, 0.1f, 0.1f, 1.0f).uv(float12, float13).endVertex();
-        cyg4.end();
-        BufferUploader.end(cyg4);
+        final float float11 = elv.getU0();
+        final float float12 = elv.getU1();
+        final float float13 = elv.getV0();
+        final float float14 = elv.getV1();
+        final Matrix4f b15 = dhl.last().pose();
+        dhg4.begin(7, DefaultVertexFormat.POSITION_COLOR_TEX);
+        dhg4.vertex(b15, -1.0f, -1.0f, -0.5f).color(0.1f, 0.1f, 0.1f, 1.0f).uv(float12, float14).endVertex();
+        dhg4.vertex(b15, 1.0f, -1.0f, -0.5f).color(0.1f, 0.1f, 0.1f, 1.0f).uv(float11, float14).endVertex();
+        dhg4.vertex(b15, 1.0f, 1.0f, -0.5f).color(0.1f, 0.1f, 0.1f, 1.0f).uv(float11, float13).endVertex();
+        dhg4.vertex(b15, -1.0f, 1.0f, -0.5f).color(0.1f, 0.1f, 0.1f, 1.0f).uv(float12, float13).endVertex();
+        dhg4.end();
+        BufferUploader.end(dhg4);
     }
     
-    private static void renderWater(final Minecraft dbn, final PoseStack cyl) {
-        dbn.getTextureManager().bind(ScreenEffectRenderer.UNDERWATER_LOCATION);
-        final BufferBuilder cyg3 = Tesselator.getInstance().getBuilder();
-        final float float4 = dbn.player.getBrightness();
+    private static void renderWater(final Minecraft dlx, final PoseStack dhl) {
+        RenderSystem.enableTexture();
+        dlx.getTextureManager().bind(ScreenEffectRenderer.UNDERWATER_LOCATION);
+        final BufferBuilder dhg3 = Tesselator.getInstance().getBuilder();
+        final float float4 = dlx.player.getBrightness();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         final float float5 = 4.0f;
@@ -95,57 +98,58 @@ public class ScreenEffectRenderer {
         final float float8 = -1.0f;
         final float float9 = 1.0f;
         final float float10 = -0.5f;
-        final float float11 = -dbn.player.yRot / 64.0f;
-        final float float12 = dbn.player.xRot / 64.0f;
-        final Matrix4f b13 = cyl.last().pose();
-        cyg3.begin(7, DefaultVertexFormat.POSITION_COLOR_TEX);
-        cyg3.vertex(b13, -1.0f, -1.0f, -0.5f).color(float4, float4, float4, 0.1f).uv(4.0f + float11, 4.0f + float12).endVertex();
-        cyg3.vertex(b13, 1.0f, -1.0f, -0.5f).color(float4, float4, float4, 0.1f).uv(0.0f + float11, 4.0f + float12).endVertex();
-        cyg3.vertex(b13, 1.0f, 1.0f, -0.5f).color(float4, float4, float4, 0.1f).uv(0.0f + float11, 0.0f + float12).endVertex();
-        cyg3.vertex(b13, -1.0f, 1.0f, -0.5f).color(float4, float4, float4, 0.1f).uv(4.0f + float11, 0.0f + float12).endVertex();
-        cyg3.end();
-        BufferUploader.end(cyg3);
+        final float float11 = -dlx.player.yRot / 64.0f;
+        final float float12 = dlx.player.xRot / 64.0f;
+        final Matrix4f b13 = dhl.last().pose();
+        dhg3.begin(7, DefaultVertexFormat.POSITION_COLOR_TEX);
+        dhg3.vertex(b13, -1.0f, -1.0f, -0.5f).color(float4, float4, float4, 0.1f).uv(4.0f + float11, 4.0f + float12).endVertex();
+        dhg3.vertex(b13, 1.0f, -1.0f, -0.5f).color(float4, float4, float4, 0.1f).uv(0.0f + float11, 4.0f + float12).endVertex();
+        dhg3.vertex(b13, 1.0f, 1.0f, -0.5f).color(float4, float4, float4, 0.1f).uv(0.0f + float11, 0.0f + float12).endVertex();
+        dhg3.vertex(b13, -1.0f, 1.0f, -0.5f).color(float4, float4, float4, 0.1f).uv(4.0f + float11, 0.0f + float12).endVertex();
+        dhg3.end();
+        BufferUploader.end(dhg3);
         RenderSystem.disableBlend();
     }
     
-    private static void renderFire(final Minecraft dbn, final PoseStack cyl) {
-        final BufferBuilder cyg3 = Tesselator.getInstance().getBuilder();
+    private static void renderFire(final Minecraft dlx, final PoseStack dhl) {
+        final BufferBuilder dhg3 = Tesselator.getInstance().getBuilder();
         RenderSystem.depthFunc(519);
         RenderSystem.depthMask(false);
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        final TextureAtlasSprite eaj4 = ModelBakery.FIRE_1.sprite();
-        dbn.getTextureManager().bind(eaj4.atlas().location());
-        final float float5 = eaj4.getU0();
-        final float float6 = eaj4.getU1();
+        RenderSystem.enableTexture();
+        final TextureAtlasSprite elv4 = ModelBakery.FIRE_1.sprite();
+        dlx.getTextureManager().bind(elv4.atlas().location());
+        final float float5 = elv4.getU0();
+        final float float6 = elv4.getU1();
         final float float7 = (float5 + float6) / 2.0f;
-        final float float8 = eaj4.getV0();
-        final float float9 = eaj4.getV1();
+        final float float8 = elv4.getV0();
+        final float float9 = elv4.getV1();
         final float float10 = (float8 + float9) / 2.0f;
-        final float float11 = eaj4.uvShrinkRatio();
+        final float float11 = elv4.uvShrinkRatio();
         final float float12 = Mth.lerp(float11, float5, float7);
         final float float13 = Mth.lerp(float11, float6, float7);
         final float float14 = Mth.lerp(float11, float8, float10);
         final float float15 = Mth.lerp(float11, float9, float10);
         final float float16 = 1.0f;
         for (int integer17 = 0; integer17 < 2; ++integer17) {
-            cyl.pushPose();
+            dhl.pushPose();
             final float float17 = -0.5f;
             final float float18 = 0.5f;
             final float float19 = -0.5f;
             final float float20 = 0.5f;
             final float float21 = -0.5f;
-            cyl.translate(-(integer17 * 2 - 1) * 0.24f, -0.30000001192092896, 0.0);
-            cyl.mulPose(Vector3f.YP.rotationDegrees((integer17 * 2 - 1) * 10.0f));
-            final Matrix4f b23 = cyl.last().pose();
-            cyg3.begin(7, DefaultVertexFormat.POSITION_COLOR_TEX);
-            cyg3.vertex(b23, -0.5f, -0.5f, -0.5f).color(1.0f, 1.0f, 1.0f, 0.9f).uv(float13, float15).endVertex();
-            cyg3.vertex(b23, 0.5f, -0.5f, -0.5f).color(1.0f, 1.0f, 1.0f, 0.9f).uv(float12, float15).endVertex();
-            cyg3.vertex(b23, 0.5f, 0.5f, -0.5f).color(1.0f, 1.0f, 1.0f, 0.9f).uv(float12, float14).endVertex();
-            cyg3.vertex(b23, -0.5f, 0.5f, -0.5f).color(1.0f, 1.0f, 1.0f, 0.9f).uv(float13, float14).endVertex();
-            cyg3.end();
-            BufferUploader.end(cyg3);
-            cyl.popPose();
+            dhl.translate(-(integer17 * 2 - 1) * 0.24f, -0.30000001192092896, 0.0);
+            dhl.mulPose(Vector3f.YP.rotationDegrees((integer17 * 2 - 1) * 10.0f));
+            final Matrix4f b23 = dhl.last().pose();
+            dhg3.begin(7, DefaultVertexFormat.POSITION_COLOR_TEX);
+            dhg3.vertex(b23, -0.5f, -0.5f, -0.5f).color(1.0f, 1.0f, 1.0f, 0.9f).uv(float13, float15).endVertex();
+            dhg3.vertex(b23, 0.5f, -0.5f, -0.5f).color(1.0f, 1.0f, 1.0f, 0.9f).uv(float12, float15).endVertex();
+            dhg3.vertex(b23, 0.5f, 0.5f, -0.5f).color(1.0f, 1.0f, 1.0f, 0.9f).uv(float12, float14).endVertex();
+            dhg3.vertex(b23, -0.5f, 0.5f, -0.5f).color(1.0f, 1.0f, 1.0f, 0.9f).uv(float13, float14).endVertex();
+            dhg3.end();
+            BufferUploader.end(dhg3);
+            dhl.popPose();
         }
         RenderSystem.disableBlend();
         RenderSystem.depthMask(true);
diff --git a/src/net/minecraft/client/renderer/Sheets.java b/src/net/minecraft/client/renderer/Sheets.java
index c98fdf6..2075c47 100644
--- a/src/net/minecraft/client/renderer/Sheets.java
+++ b/src/net/minecraft/client/renderer/Sheets.java
@@ -36,7 +36,7 @@ public class Sheets {
     private static final RenderType CHEST_SHEET_TYPE;
     private static final RenderType SOLID_BLOCK_SHEET;
     private static final RenderType CUTOUT_BLOCK_SHEET;
-    private static final RenderType TRANSLUCENT_BLOCK_SHEET;
+    private static final RenderType TRANSLUCENT_ITEM_CULL_BLOCK_SHEET;
     private static final RenderType TRANSLUCENT_CULL_BLOCK_SHEET;
     public static final Material DEFAULT_SHULKER_TEXTURE_LOCATION;
     public static final List<Material> SHULKER_TEXTURE_LOCATION;
@@ -85,8 +85,8 @@ public class Sheets {
         return Sheets.CUTOUT_BLOCK_SHEET;
     }
     
-    public static RenderType translucentBlockSheet() {
-        return Sheets.TRANSLUCENT_BLOCK_SHEET;
+    public static RenderType translucentItemSheet() {
+        return Sheets.TRANSLUCENT_ITEM_CULL_BLOCK_SHEET;
     }
     
     public static RenderType translucentCullBlockSheet() {
@@ -96,13 +96,13 @@ public class Sheets {
     public static void getAllMaterials(final Consumer<Material> consumer) {
         consumer.accept(Sheets.DEFAULT_SHULKER_TEXTURE_LOCATION);
         Sheets.SHULKER_TEXTURE_LOCATION.forEach(consumer);
-        for (final BannerPattern bwd5 : BannerPattern.values()) {
-            consumer.accept(new Material(Sheets.BANNER_SHEET, bwd5.location(true)));
-            consumer.accept(new Material(Sheets.SHIELD_SHEET, bwd5.location(false)));
+        for (final BannerPattern cdd5 : BannerPattern.values()) {
+            consumer.accept(new Material(Sheets.BANNER_SHEET, cdd5.location(true)));
+            consumer.accept(new Material(Sheets.SHIELD_SHEET, cdd5.location(false)));
         }
         Sheets.SIGN_MATERIALS.values().forEach(consumer);
-        for (final Material eby5 : Sheets.BED_TEXTURES) {
-            consumer.accept(eby5);
+        for (final Material enk5 : Sheets.BED_TEXTURES) {
+            consumer.accept(enk5);
         }
         consumer.accept(Sheets.CHEST_TRAP_LOCATION);
         consumer.accept(Sheets.CHEST_TRAP_LOCATION_LEFT);
@@ -116,37 +116,37 @@ public class Sheets {
         consumer.accept(Sheets.ENDER_CHEST_LOCATION);
     }
     
-    public static Material signTexture(final WoodType bzs) {
-        return new Material(Sheets.SIGN_SHEET, new ResourceLocation("entity/signs/" + bzs.name()));
+    public static Material signTexture(final WoodType cgs) {
+        return new Material(Sheets.SIGN_SHEET, new ResourceLocation("entity/signs/" + cgs.name()));
     }
     
     private static Material chestMaterial(final String string) {
         return new Material(Sheets.CHEST_SHEET, new ResourceLocation("entity/chest/" + string));
     }
     
-    public static Material chooseMaterial(final BlockEntity bwl, final ChestType bzc, final boolean boolean3) {
+    public static Material chooseMaterial(final BlockEntity cdl, final ChestType cgb, final boolean boolean3) {
         if (boolean3) {
-            return chooseMaterial(bzc, Sheets.CHEST_XMAS_LOCATION, Sheets.CHEST_XMAS_LOCATION_LEFT, Sheets.CHEST_XMAS_LOCATION_RIGHT);
+            return chooseMaterial(cgb, Sheets.CHEST_XMAS_LOCATION, Sheets.CHEST_XMAS_LOCATION_LEFT, Sheets.CHEST_XMAS_LOCATION_RIGHT);
         }
-        if (bwl instanceof TrappedChestBlockEntity) {
-            return chooseMaterial(bzc, Sheets.CHEST_TRAP_LOCATION, Sheets.CHEST_TRAP_LOCATION_LEFT, Sheets.CHEST_TRAP_LOCATION_RIGHT);
+        if (cdl instanceof TrappedChestBlockEntity) {
+            return chooseMaterial(cgb, Sheets.CHEST_TRAP_LOCATION, Sheets.CHEST_TRAP_LOCATION_LEFT, Sheets.CHEST_TRAP_LOCATION_RIGHT);
         }
-        if (bwl instanceof EnderChestBlockEntity) {
+        if (cdl instanceof EnderChestBlockEntity) {
             return Sheets.ENDER_CHEST_LOCATION;
         }
-        return chooseMaterial(bzc, Sheets.CHEST_LOCATION, Sheets.CHEST_LOCATION_LEFT, Sheets.CHEST_LOCATION_RIGHT);
+        return chooseMaterial(cgb, Sheets.CHEST_LOCATION, Sheets.CHEST_LOCATION_LEFT, Sheets.CHEST_LOCATION_RIGHT);
     }
     
-    private static Material chooseMaterial(final ChestType bzc, final Material eby2, final Material eby3, final Material eby4) {
-        switch (bzc) {
+    private static Material chooseMaterial(final ChestType cgb, final Material enk2, final Material enk3, final Material enk4) {
+        switch (cgb) {
             case LEFT: {
-                return eby3;
+                return enk3;
             }
             case RIGHT: {
-                return eby4;
+                return enk4;
             }
             default: {
-                return eby2;
+                return enk2;
             }
         }
     }
@@ -166,28 +166,28 @@ public class Sheets {
         CHEST_SHEET_TYPE = RenderType.entityCutout(Sheets.CHEST_SHEET);
         SOLID_BLOCK_SHEET = RenderType.entitySolid(TextureAtlas.LOCATION_BLOCKS);
         CUTOUT_BLOCK_SHEET = RenderType.entityCutout(TextureAtlas.LOCATION_BLOCKS);
-        TRANSLUCENT_BLOCK_SHEET = RenderType.entityTranslucent(TextureAtlas.LOCATION_BLOCKS);
+        TRANSLUCENT_ITEM_CULL_BLOCK_SHEET = RenderType.itemEntityTranslucentCull(TextureAtlas.LOCATION_BLOCKS);
         TRANSLUCENT_CULL_BLOCK_SHEET = RenderType.entityTranslucentCull(TextureAtlas.LOCATION_BLOCKS);
         DEFAULT_SHULKER_TEXTURE_LOCATION = new Material(Sheets.SHULKER_SHEET, new ResourceLocation("entity/shulker/shulker"));
         final ResourceLocation shulker_SHEET;
-        final ResourceLocation sm2;
+        final ResourceLocation uh2;
         final Object o;
         SHULKER_TEXTURE_LOCATION = Stream.<String>of(new String[] { "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", "blue", "brown", "green", "red", "black" }).map(string -> {
             // new(net.minecraft.client.resources.model.Material.class)
             shulker_SHEET = Sheets.SHULKER_SHEET;
             new ResourceLocation("entity/shulker/shulker_" + string);
-            new Material(shulker_SHEET, sm2);
+            new Material(shulker_SHEET, uh2);
             return o;
         }).collect(ImmutableList.toImmutableList());
         SIGN_MATERIALS = WoodType.values().collect(Collectors.toMap(Function.<WoodType>identity(), Sheets::signTexture));
         final ResourceLocation bed_SHEET;
-        final ResourceLocation sm3;
+        final ResourceLocation uh3;
         final Object o2;
-        BED_TEXTURES = Arrays.<DyeColor>stream(DyeColor.values()).sorted(Comparator.comparingInt(DyeColor::getId)).map(bdj -> {
+        BED_TEXTURES = Arrays.<DyeColor>stream(DyeColor.values()).sorted(Comparator.comparingInt(DyeColor::getId)).map(bje -> {
             // new(net.minecraft.client.resources.model.Material.class)
             bed_SHEET = Sheets.BED_SHEET;
-            new ResourceLocation("entity/bed/" + bdj.getName());
-            new Material(bed_SHEET, sm3);
+            new ResourceLocation("entity/bed/" + bje.getName());
+            new Material(bed_SHEET, uh3);
             return o2;
         }).<Material>toArray(Material[]::new);
         CHEST_TRAP_LOCATION = chestMaterial("trapped");
diff --git a/src/net/minecraft/client/renderer/SpriteCoordinateExpander.java b/src/net/minecraft/client/renderer/SpriteCoordinateExpander.java
index b756e24..42638e5 100644
--- a/src/net/minecraft/client/renderer/SpriteCoordinateExpander.java
+++ b/src/net/minecraft/client/renderer/SpriteCoordinateExpander.java
@@ -7,9 +7,9 @@ public class SpriteCoordinateExpander implements VertexConsumer {
     private final VertexConsumer delegate;
     private final TextureAtlasSprite sprite;
     
-    public SpriteCoordinateExpander(final VertexConsumer cyo, final TextureAtlasSprite eaj) {
-        this.delegate = cyo;
-        this.sprite = eaj;
+    public SpriteCoordinateExpander(final VertexConsumer dhp, final TextureAtlasSprite elv) {
+        this.delegate = dhp;
+        this.sprite = elv;
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/ViewArea.java b/src/net/minecraft/client/renderer/ViewArea.java
index f71d31c..9bc676b 100644
--- a/src/net/minecraft/client/renderer/ViewArea.java
+++ b/src/net/minecraft/client/renderer/ViewArea.java
@@ -14,21 +14,21 @@ public class ViewArea {
     protected int chunkGridSizeZ;
     public ChunkRenderDispatcher.RenderChunk[] chunks;
     
-    public ViewArea(final ChunkRenderDispatcher dth, final Level bjw, final int integer, final LevelRenderer dqr) {
-        this.levelRenderer = dqr;
-        this.level = bjw;
+    public ViewArea(final ChunkRenderDispatcher een, final Level bqb, final int integer, final LevelRenderer ebx) {
+        this.levelRenderer = ebx;
+        this.level = bqb;
         this.setViewDistance(integer);
-        this.createChunks(dth);
+        this.createChunks(een);
     }
     
-    protected void createChunks(final ChunkRenderDispatcher dth) {
+    protected void createChunks(final ChunkRenderDispatcher een) {
         final int integer3 = this.chunkGridSizeX * this.chunkGridSizeY * this.chunkGridSizeZ;
         this.chunks = new ChunkRenderDispatcher.RenderChunk[integer3];
         for (int integer4 = 0; integer4 < this.chunkGridSizeX; ++integer4) {
             for (int integer5 = 0; integer5 < this.chunkGridSizeY; ++integer5) {
                 for (int integer6 = 0; integer6 < this.chunkGridSizeZ; ++integer6) {
                     final int integer7 = this.getChunkIndex(integer4, integer5, integer6);
-                    (this.chunks[integer7] = dth.new RenderChunk()).setOrigin(integer4 * 16, integer5 * 16, integer6 * 16);
+                    (this.chunks[integer7] = een.new RenderChunk()).setOrigin(integer4 * 16, integer5 * 16, integer6 * 16);
                 }
             }
         }
@@ -80,10 +80,10 @@ public class ViewArea {
     }
     
     @Nullable
-    protected ChunkRenderDispatcher.RenderChunk getRenderChunkAt(final BlockPos fk) {
-        int integer3 = Mth.intFloorDiv(fk.getX(), 16);
-        final int integer4 = Mth.intFloorDiv(fk.getY(), 16);
-        int integer5 = Mth.intFloorDiv(fk.getZ(), 16);
+    protected ChunkRenderDispatcher.RenderChunk getRenderChunkAt(final BlockPos fu) {
+        int integer3 = Mth.intFloorDiv(fu.getX(), 16);
+        final int integer4 = Mth.intFloorDiv(fu.getY(), 16);
+        int integer5 = Mth.intFloorDiv(fu.getZ(), 16);
         if (integer4 < 0 || integer4 >= this.chunkGridSizeY) {
             return null;
         }
diff --git a/src/net/minecraft/client/renderer/VirtualScreen.java b/src/net/minecraft/client/renderer/VirtualScreen.java
index 7a2ffbb..8a0d30a 100644
--- a/src/net/minecraft/client/renderer/VirtualScreen.java
+++ b/src/net/minecraft/client/renderer/VirtualScreen.java
@@ -12,13 +12,13 @@ public final class VirtualScreen implements AutoCloseable {
     private final Minecraft minecraft;
     private final ScreenManager screenManager;
     
-    public VirtualScreen(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public VirtualScreen(final Minecraft dlx) {
+        this.minecraft = dlx;
         this.screenManager = new ScreenManager(Monitor::new);
     }
     
-    public Window newWindow(final DisplayData cxh, @Nullable final String string2, final String string3) {
-        return new Window(this.minecraft, this.screenManager, cxh, string2, string3);
+    public Window newWindow(final DisplayData dgi, @Nullable final String string2, final String string3) {
+        return new Window(this.minecraft, this.screenManager, dgi, string2, string3);
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/block/BlockModelShaper.java b/src/net/minecraft/client/renderer/block/BlockModelShaper.java
index ca7fa7e..03bca04 100644
--- a/src/net/minecraft/client/renderer/block/BlockModelShaper.java
+++ b/src/net/minecraft/client/renderer/block/BlockModelShaper.java
@@ -17,21 +17,21 @@ public class BlockModelShaper {
     private final Map<BlockState, BakedModel> modelByStateCache;
     private final ModelManager modelManager;
     
-    public BlockModelShaper(final ModelManager eca) {
+    public BlockModelShaper(final ModelManager enm) {
         this.modelByStateCache = Maps.newIdentityHashMap();
-        this.modelManager = eca;
+        this.modelManager = enm;
     }
     
-    public TextureAtlasSprite getParticleIcon(final BlockState byj) {
-        return this.getBlockModel(byj).getParticleIcon();
+    public TextureAtlasSprite getParticleIcon(final BlockState cfj) {
+        return this.getBlockModel(cfj).getParticleIcon();
     }
     
-    public BakedModel getBlockModel(final BlockState byj) {
-        BakedModel ebv3 = this.modelByStateCache.get(byj);
-        if (ebv3 == null) {
-            ebv3 = this.modelManager.getMissingModel();
+    public BakedModel getBlockModel(final BlockState cfj) {
+        BakedModel enh3 = this.modelByStateCache.get(cfj);
+        if (enh3 == null) {
+            enh3 = this.modelManager.getMissingModel();
         }
-        return ebv3;
+        return enh3;
     }
     
     public ModelManager getModelManager() {
@@ -40,18 +40,18 @@ public class BlockModelShaper {
     
     public void rebuildCache() {
         this.modelByStateCache.clear();
-        for (final Block bph3 : Registry.BLOCK) {
+        for (final Block bvr3 : Registry.BLOCK) {
             final BakedModel bakedModel;
-            bph3.getStateDefinition().getPossibleStates().forEach(byj -> bakedModel = this.modelByStateCache.put(byj, this.modelManager.getModel(stateToModelLocation(byj))));
+            bvr3.getStateDefinition().getPossibleStates().forEach(cfj -> bakedModel = this.modelByStateCache.put(cfj, this.modelManager.getModel(stateToModelLocation(cfj))));
         }
     }
     
-    public static ModelResourceLocation stateToModelLocation(final BlockState byj) {
-        return stateToModelLocation(Registry.BLOCK.getKey(byj.getBlock()), byj);
+    public static ModelResourceLocation stateToModelLocation(final BlockState cfj) {
+        return stateToModelLocation(Registry.BLOCK.getKey(cfj.getBlock()), cfj);
     }
     
-    public static ModelResourceLocation stateToModelLocation(final ResourceLocation sm, final BlockState byj) {
-        return new ModelResourceLocation(sm, statePropertiesToString(byj.getValues()));
+    public static ModelResourceLocation stateToModelLocation(final ResourceLocation uh, final BlockState cfj) {
+        return new ModelResourceLocation(uh, statePropertiesToString(cfj.getValues()));
     }
     
     public static String statePropertiesToString(final Map<Property<?>, Comparable<?>> map) {
@@ -60,15 +60,15 @@ public class BlockModelShaper {
             if (stringBuilder2.length() != 0) {
                 stringBuilder2.append(',');
             }
-            final Property<?> bzm5 = entry4.getKey();
-            stringBuilder2.append(bzm5.getName());
+            final Property<?> cgl5 = entry4.getKey();
+            stringBuilder2.append(cgl5.getName());
             stringBuilder2.append('=');
-            stringBuilder2.append(BlockModelShaper.getValue(bzm5, entry4.getValue()));
+            stringBuilder2.append(BlockModelShaper.getValue(cgl5, entry4.getValue()));
         }
         return stringBuilder2.toString();
     }
     
-    private static <T extends Comparable<T>> String getValue(final Property<T> bzm, final Comparable<?> comparable) {
-        return bzm.getName((T)comparable);
+    private static <T extends Comparable<T>> String getValue(final Property<T> cgl, final Comparable<?> comparable) {
+        return cgl.getName((T)comparable);
     }
 }
diff --git a/src/net/minecraft/client/renderer/block/BlockRenderDispatcher.java b/src/net/minecraft/client/renderer/block/BlockRenderDispatcher.java
index 0e8edde..611c4e9 100644
--- a/src/net/minecraft/client/renderer/block/BlockRenderDispatcher.java
+++ b/src/net/minecraft/client/renderer/block/BlockRenderDispatcher.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.renderer.block;
 
 import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.client.renderer.block.model.ItemTransforms;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
@@ -29,10 +30,10 @@ public class BlockRenderDispatcher implements ResourceManagerReloadListener {
     private final Random random;
     private final BlockColors blockColors;
     
-    public BlockRenderDispatcher(final BlockModelShaper drj, final BlockColors dcb) {
+    public BlockRenderDispatcher(final BlockModelShaper ecp, final BlockColors dmn) {
         this.random = new Random();
-        this.blockModelShaper = drj;
-        this.blockColors = dcb;
+        this.blockModelShaper = ecp;
+        this.blockColors = dmn;
         this.modelRenderer = new ModelBlockRenderer(this.blockColors);
         this.liquidBlockRenderer = new LiquidBlockRenderer();
     }
@@ -41,37 +42,37 @@ public class BlockRenderDispatcher implements ResourceManagerReloadListener {
         return this.blockModelShaper;
     }
     
-    public void renderBreakingTexture(final BlockState byj, final BlockPos fk, final BlockAndTintGetter bje, final PoseStack cyl, final VertexConsumer cyo) {
-        if (byj.getRenderShape() != RenderShape.MODEL) {
+    public void renderBreakingTexture(final BlockState cfj, final BlockPos fu, final BlockAndTintGetter bpe, final PoseStack dhl, final VertexConsumer dhp) {
+        if (cfj.getRenderShape() != RenderShape.MODEL) {
             return;
         }
-        final BakedModel ebv7 = this.blockModelShaper.getBlockModel(byj);
-        final long long8 = byj.getSeed(fk);
-        this.modelRenderer.tesselateBlock(bje, ebv7, byj, fk, cyl, cyo, true, this.random, long8, OverlayTexture.NO_OVERLAY);
+        final BakedModel enh7 = this.blockModelShaper.getBlockModel(cfj);
+        final long long8 = cfj.getSeed(fu);
+        this.modelRenderer.tesselateBlock(bpe, enh7, cfj, fu, dhl, dhp, true, this.random, long8, OverlayTexture.NO_OVERLAY);
     }
     
-    public boolean renderBatched(final BlockState byj, final BlockPos fk, final BlockAndTintGetter bje, final PoseStack cyl, final VertexConsumer cyo, final boolean boolean6, final Random random) {
+    public boolean renderBatched(final BlockState cfj, final BlockPos fu, final BlockAndTintGetter bpe, final PoseStack dhl, final VertexConsumer dhp, final boolean boolean6, final Random random) {
         try {
-            final RenderShape btr9 = byj.getRenderShape();
-            return btr9 == RenderShape.MODEL && this.modelRenderer.tesselateBlock(bje, this.getBlockModel(byj), byj, fk, cyl, cyo, boolean6, random, byj.getSeed(fk), OverlayTexture.NO_OVERLAY);
+            final RenderShape cak9 = cfj.getRenderShape();
+            return cak9 == RenderShape.MODEL && this.modelRenderer.tesselateBlock(bpe, this.getBlockModel(cfj), cfj, fu, dhl, dhp, boolean6, random, cfj.getSeed(fu), OverlayTexture.NO_OVERLAY);
         }
         catch (Throwable throwable9) {
-            final CrashReport h10 = CrashReport.forThrowable(throwable9, "Tesselating block in world");
-            final CrashReportCategory i11 = h10.addCategory("Block being tesselated");
-            CrashReportCategory.populateBlockDetails(i11, fk, byj);
-            throw new ReportedException(h10);
+            final CrashReport j10 = CrashReport.forThrowable(throwable9, "Tesselating block in world");
+            final CrashReportCategory k11 = j10.addCategory("Block being tesselated");
+            CrashReportCategory.populateBlockDetails(k11, fu, cfj);
+            throw new ReportedException(j10);
         }
     }
     
-    public boolean renderLiquid(final BlockPos fk, final BlockAndTintGetter bje, final VertexConsumer cyo, final FluidState coj) {
+    public boolean renderLiquid(final BlockPos fu, final BlockAndTintGetter bpe, final VertexConsumer dhp, final FluidState cxa) {
         try {
-            return this.liquidBlockRenderer.tesselate(bje, fk, cyo, coj);
+            return this.liquidBlockRenderer.tesselate(bpe, fu, dhp, cxa);
         }
         catch (Throwable throwable6) {
-            final CrashReport h7 = CrashReport.forThrowable(throwable6, "Tesselating liquid in world");
-            final CrashReportCategory i8 = h7.addCategory("Block being tesselated");
-            CrashReportCategory.populateBlockDetails(i8, fk, null);
-            throw new ReportedException(h7);
+            final CrashReport j7 = CrashReport.forThrowable(throwable6, "Tesselating liquid in world");
+            final CrashReportCategory k8 = j7.addCategory("Block being tesselated");
+            CrashReportCategory.populateBlockDetails(k8, fu, null);
+            throw new ReportedException(j7);
         }
     }
     
@@ -79,34 +80,34 @@ public class BlockRenderDispatcher implements ResourceManagerReloadListener {
         return this.modelRenderer;
     }
     
-    public BakedModel getBlockModel(final BlockState byj) {
-        return this.blockModelShaper.getBlockModel(byj);
+    public BakedModel getBlockModel(final BlockState cfj) {
+        return this.blockModelShaper.getBlockModel(cfj);
     }
     
-    public void renderSingleBlock(final BlockState byj, final PoseStack cyl, final MultiBufferSource dqt, final int integer4, final int integer5) {
-        final RenderShape btr7 = byj.getRenderShape();
-        if (btr7 == RenderShape.INVISIBLE) {
+    public void renderSingleBlock(final BlockState cfj, final PoseStack dhl, final MultiBufferSource ebz, final int integer4, final int integer5) {
+        final RenderShape cak7 = cfj.getRenderShape();
+        if (cak7 == RenderShape.INVISIBLE) {
             return;
         }
-        switch (btr7) {
+        switch (cak7) {
             case MODEL: {
-                final BakedModel ebv8 = this.getBlockModel(byj);
-                final int integer6 = this.blockColors.getColor(byj, null, null, 0);
+                final BakedModel enh8 = this.getBlockModel(cfj);
+                final int integer6 = this.blockColors.getColor(cfj, null, null, 0);
                 final float float10 = (integer6 >> 16 & 0xFF) / 255.0f;
                 final float float11 = (integer6 >> 8 & 0xFF) / 255.0f;
                 final float float12 = (integer6 & 0xFF) / 255.0f;
-                this.modelRenderer.renderModel(cyl.last(), dqt.getBuffer(ItemBlockRenderTypes.getRenderType(byj)), byj, ebv8, float10, float11, float12, integer4, integer5);
+                this.modelRenderer.renderModel(dhl.last(), ebz.getBuffer(ItemBlockRenderTypes.getRenderType(cfj, false)), cfj, enh8, float10, float11, float12, integer4, integer5);
                 break;
             }
             case ENTITYBLOCK_ANIMATED: {
-                BlockEntityWithoutLevelRenderer.instance.renderByItem(new ItemStack(byj.getBlock()), cyl, dqt, integer4, integer5);
+                BlockEntityWithoutLevelRenderer.instance.renderByItem(new ItemStack(cfj.getBlock()), ItemTransforms.TransformType.NONE, dhl, ebz, integer4, integer5);
                 break;
             }
         }
     }
     
     @Override
-    public void onResourceManagerReload(final ResourceManager zb) {
+    public void onResourceManagerReload(final ResourceManager abc) {
         this.liquidBlockRenderer.setupSprites();
     }
 }
diff --git a/src/net/minecraft/client/renderer/block/LiquidBlockRenderer.java b/src/net/minecraft/client/renderer/block/LiquidBlockRenderer.java
index bca6d31..703e4ec 100644
--- a/src/net/minecraft/client/renderer/block/LiquidBlockRenderer.java
+++ b/src/net/minecraft/client/renderer/block/LiquidBlockRenderer.java
@@ -1,18 +1,20 @@
 package net.minecraft.client.renderer.block;
 
-import net.minecraft.world.level.material.Fluid;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.block.StainedGlassBlock;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.HalfTransparentBlock;
 import net.minecraft.util.Mth;
 import net.minecraft.client.renderer.BiomeColors;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
@@ -40,61 +42,73 @@ public class LiquidBlockRenderer {
         this.waterOverlay = ModelBakery.WATER_OVERLAY.sprite();
     }
     
-    private static boolean isNeighborSameFluid(final BlockGetter bjg, final BlockPos fk, final Direction fp, final FluidState coj) {
-        final BlockPos fk2 = fk.relative(fp);
-        final FluidState coj2 = bjg.getFluidState(fk2);
-        return coj2.getType().isSame(coj.getType());
+    private static boolean isNeighborSameFluid(final BlockGetter bpg, final BlockPos fu, final Direction fz, final FluidState cxa) {
+        final BlockPos fu2 = fu.relative(fz);
+        final FluidState cxa2 = bpg.getFluidState(fu2);
+        return cxa2.getType().isSame(cxa.getType());
     }
     
-    private static boolean isFaceOccluded(final BlockGetter bjg, final BlockPos fk, final Direction fp, final float float4) {
-        final BlockPos fk2 = fk.relative(fp);
-        final BlockState byj6 = bjg.getBlockState(fk2);
-        if (byj6.canOcclude()) {
-            final VoxelShape cwf7 = Shapes.box(0.0, 0.0, 0.0, 1.0, float4, 1.0);
-            final VoxelShape cwf8 = byj6.getOcclusionShape(bjg, fk2);
-            return Shapes.blockOccudes(cwf7, cwf8, fp);
+    private static boolean isFaceOccludedByState(final BlockGetter bpg, final Direction fz, final float float3, final BlockPos fu, final BlockState cfj) {
+        if (cfj.canOcclude()) {
+            final VoxelShape dfg6 = Shapes.box(0.0, 0.0, 0.0, 1.0, float3, 1.0);
+            final VoxelShape dfg7 = cfj.getOcclusionShape(bpg, fu);
+            return Shapes.blockOccudes(dfg6, dfg7, fz);
         }
         return false;
     }
     
-    public boolean tesselate(final BlockAndTintGetter bje, final BlockPos fk, final VertexConsumer cyo, final FluidState coj) {
-        final boolean boolean6 = coj.is(FluidTags.LAVA);
+    private static boolean isFaceOccludedByNeighbor(final BlockGetter bpg, final BlockPos fu, final Direction fz, final float float4) {
+        final BlockPos fu2 = fu.relative(fz);
+        final BlockState cfj6 = bpg.getBlockState(fu2);
+        return isFaceOccludedByState(bpg, fz, float4, fu2, cfj6);
+    }
+    
+    private static boolean isFaceOccludedBySelf(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final Direction fz) {
+        return isFaceOccludedByState(bpg, fz.getOpposite(), 1.0f, fu, cfj);
+    }
+    
+    public static boolean shouldRenderFace(final BlockAndTintGetter bpe, final BlockPos fu, final FluidState cxa, final BlockState cfj, final Direction fz) {
+        return !isFaceOccludedBySelf(bpe, fu, cfj, fz) && !isNeighborSameFluid(bpe, fu, fz, cxa);
+    }
+    
+    public boolean tesselate(final BlockAndTintGetter bpe, final BlockPos fu, final VertexConsumer dhp, final FluidState cxa) {
+        final boolean boolean6 = cxa.is(FluidTags.LAVA);
         final TextureAtlasSprite[] arr7 = boolean6 ? this.lavaIcons : this.waterIcons;
-        final int integer8 = boolean6 ? 16777215 : BiomeColors.getAverageWaterColor(bje, fk);
-        final float float9 = (integer8 >> 16 & 0xFF) / 255.0f;
-        final float float10 = (integer8 >> 8 & 0xFF) / 255.0f;
-        final float float11 = (integer8 & 0xFF) / 255.0f;
-        final boolean boolean7 = !isNeighborSameFluid(bje, fk, Direction.UP, coj);
-        final boolean boolean8 = !isNeighborSameFluid(bje, fk, Direction.DOWN, coj) && !isFaceOccluded(bje, fk, Direction.DOWN, 0.8888889f);
-        final boolean boolean9 = !isNeighborSameFluid(bje, fk, Direction.NORTH, coj);
-        final boolean boolean10 = !isNeighborSameFluid(bje, fk, Direction.SOUTH, coj);
-        final boolean boolean11 = !isNeighborSameFluid(bje, fk, Direction.WEST, coj);
-        final boolean boolean12 = !isNeighborSameFluid(bje, fk, Direction.EAST, coj);
+        final BlockState cfj8 = bpe.getBlockState(fu);
+        final int integer9 = boolean6 ? 16777215 : BiomeColors.getAverageWaterColor(bpe, fu);
+        final float float10 = (integer9 >> 16 & 0xFF) / 255.0f;
+        final float float11 = (integer9 >> 8 & 0xFF) / 255.0f;
+        final float float12 = (integer9 & 0xFF) / 255.0f;
+        final boolean boolean7 = !isNeighborSameFluid(bpe, fu, Direction.UP, cxa);
+        final boolean boolean8 = shouldRenderFace(bpe, fu, cxa, cfj8, Direction.DOWN) && !isFaceOccludedByNeighbor(bpe, fu, Direction.DOWN, 0.8888889f);
+        final boolean boolean9 = shouldRenderFace(bpe, fu, cxa, cfj8, Direction.NORTH);
+        final boolean boolean10 = shouldRenderFace(bpe, fu, cxa, cfj8, Direction.SOUTH);
+        final boolean boolean11 = shouldRenderFace(bpe, fu, cxa, cfj8, Direction.WEST);
+        final boolean boolean12 = shouldRenderFace(bpe, fu, cxa, cfj8, Direction.EAST);
         if (!boolean7 && !boolean8 && !boolean12 && !boolean11 && !boolean9 && !boolean10) {
             return false;
         }
         boolean boolean13 = false;
-        final float float12 = 0.5f;
-        final float float13 = 1.0f;
-        final float float14 = 0.8f;
-        final float float15 = 0.6f;
-        float float16 = this.getWaterHeight(bje, fk, coj.getType());
-        float float17 = this.getWaterHeight(bje, fk.south(), coj.getType());
-        float float18 = this.getWaterHeight(bje, fk.east().south(), coj.getType());
-        float float19 = this.getWaterHeight(bje, fk.east(), coj.getType());
-        final double double27 = fk.getX() & 0xF;
-        final double double28 = fk.getY() & 0xF;
-        final double double29 = fk.getZ() & 0xF;
-        final float float20 = 0.001f;
-        final float float21 = boolean8 ? 0.001f : 0.0f;
-        if (boolean7 && !isFaceOccluded(bje, fk, Direction.UP, Math.min(Math.min(float16, float17), Math.min(float18, float19)))) {
+        final float float13 = bpe.getShade(Direction.DOWN, true);
+        final float float14 = bpe.getShade(Direction.UP, true);
+        final float float15 = bpe.getShade(Direction.NORTH, true);
+        final float float16 = bpe.getShade(Direction.WEST, true);
+        float float17 = this.getWaterHeight(bpe, fu, cxa.getType());
+        float float18 = this.getWaterHeight(bpe, fu.south(), cxa.getType());
+        float float19 = this.getWaterHeight(bpe, fu.east().south(), cxa.getType());
+        float float20 = this.getWaterHeight(bpe, fu.east(), cxa.getType());
+        final double double28 = fu.getX() & 0xF;
+        final double double29 = fu.getY() & 0xF;
+        final double double30 = fu.getZ() & 0xF;
+        final float float21 = 0.001f;
+        final float float22 = boolean8 ? 0.001f : 0.0f;
+        if (boolean7 && !isFaceOccludedByNeighbor(bpe, fu, Direction.UP, Math.min(Math.min(float17, float18), Math.min(float19, float20)))) {
             boolean13 = true;
-            float16 -= 0.001f;
             float17 -= 0.001f;
             float18 -= 0.001f;
             float19 -= 0.001f;
-            final Vec3 cvl43 = coj.getFlow(bje, fk);
-            float float22;
+            float20 -= 0.001f;
+            final Vec3 dem44 = cxa.getFlow(bpe, fu);
             float float23;
             float float24;
             float float25;
@@ -102,166 +116,167 @@ public class LiquidBlockRenderer {
             float float27;
             float float28;
             float float29;
-            if (cvl43.x == 0.0 && cvl43.z == 0.0) {
-                final TextureAtlasSprite eaj44 = arr7[0];
-                float22 = eaj44.getU(0.0);
-                float23 = eaj44.getV(0.0);
-                float24 = float22;
-                float25 = eaj44.getV(16.0);
-                float26 = eaj44.getU(16.0);
-                float27 = float25;
+            float float30;
+            if (dem44.x == 0.0 && dem44.z == 0.0) {
+                final TextureAtlasSprite elv45 = arr7[0];
+                float23 = elv45.getU(0.0);
+                float24 = elv45.getV(0.0);
+                float25 = float23;
+                float26 = elv45.getV(16.0);
+                float27 = elv45.getU(16.0);
                 float28 = float26;
-                float29 = float23;
+                float29 = float27;
+                float30 = float24;
             }
             else {
-                final TextureAtlasSprite eaj44 = arr7[1];
-                final float float30 = (float)Mth.atan2(cvl43.z, cvl43.x) - 1.5707964f;
-                final float float31 = Mth.sin(float30) * 0.25f;
-                final float float32 = Mth.cos(float30) * 0.25f;
-                final float float33 = 8.0f;
-                float22 = eaj44.getU(8.0f + (-float32 - float31) * 16.0f);
-                float23 = eaj44.getV(8.0f + (-float32 + float31) * 16.0f);
-                float24 = eaj44.getU(8.0f + (-float32 + float31) * 16.0f);
-                float25 = eaj44.getV(8.0f + (float32 + float31) * 16.0f);
-                float26 = eaj44.getU(8.0f + (float32 + float31) * 16.0f);
-                float27 = eaj44.getV(8.0f + (float32 - float31) * 16.0f);
-                float28 = eaj44.getU(8.0f + (float32 - float31) * 16.0f);
-                float29 = eaj44.getV(8.0f + (-float32 - float31) * 16.0f);
+                final TextureAtlasSprite elv45 = arr7[1];
+                final float float31 = (float)Mth.atan2(dem44.z, dem44.x) - 1.5707964f;
+                final float float32 = Mth.sin(float31) * 0.25f;
+                final float float33 = Mth.cos(float31) * 0.25f;
+                final float float34 = 8.0f;
+                float23 = elv45.getU(8.0f + (-float33 - float32) * 16.0f);
+                float24 = elv45.getV(8.0f + (-float33 + float32) * 16.0f);
+                float25 = elv45.getU(8.0f + (-float33 + float32) * 16.0f);
+                float26 = elv45.getV(8.0f + (float33 + float32) * 16.0f);
+                float27 = elv45.getU(8.0f + (float33 + float32) * 16.0f);
+                float28 = elv45.getV(8.0f + (float33 - float32) * 16.0f);
+                float29 = elv45.getU(8.0f + (float33 - float32) * 16.0f);
+                float30 = elv45.getV(8.0f + (-float33 - float32) * 16.0f);
             }
-            final float float34 = (float22 + float24 + float26 + float28) / 4.0f;
-            final float float30 = (float23 + float25 + float27 + float29) / 4.0f;
-            final float float31 = arr7[0].getWidth() / (arr7[0].getU1() - arr7[0].getU0());
-            final float float32 = arr7[0].getHeight() / (arr7[0].getV1() - arr7[0].getV0());
-            final float float33 = 4.0f / Math.max(float32, float31);
-            float22 = Mth.lerp(float33, float22, float34);
-            float24 = Mth.lerp(float33, float24, float34);
-            float26 = Mth.lerp(float33, float26, float34);
-            float28 = Mth.lerp(float33, float28, float34);
-            float23 = Mth.lerp(float33, float23, float30);
-            float25 = Mth.lerp(float33, float25, float30);
-            float27 = Mth.lerp(float33, float27, float30);
-            float29 = Mth.lerp(float33, float29, float30);
-            final int integer9 = this.getLightColor(bje, fk);
-            final float float35 = 1.0f * float9;
-            final float float36 = 1.0f * float10;
-            final float float37 = 1.0f * float11;
-            this.vertex(cyo, double27 + 0.0, double28 + float16, double29 + 0.0, float35, float36, float37, float22, float23, integer9);
-            this.vertex(cyo, double27 + 0.0, double28 + float17, double29 + 1.0, float35, float36, float37, float24, float25, integer9);
-            this.vertex(cyo, double27 + 1.0, double28 + float18, double29 + 1.0, float35, float36, float37, float26, float27, integer9);
-            this.vertex(cyo, double27 + 1.0, double28 + float19, double29 + 0.0, float35, float36, float37, float28, float29, integer9);
-            if (coj.shouldRenderBackwardUpFace(bje, fk.above())) {
-                this.vertex(cyo, double27 + 0.0, double28 + float16, double29 + 0.0, float35, float36, float37, float22, float23, integer9);
-                this.vertex(cyo, double27 + 1.0, double28 + float19, double29 + 0.0, float35, float36, float37, float28, float29, integer9);
-                this.vertex(cyo, double27 + 1.0, double28 + float18, double29 + 1.0, float35, float36, float37, float26, float27, integer9);
-                this.vertex(cyo, double27 + 0.0, double28 + float17, double29 + 1.0, float35, float36, float37, float24, float25, integer9);
+            final float float35 = (float23 + float25 + float27 + float29) / 4.0f;
+            final float float31 = (float24 + float26 + float28 + float30) / 4.0f;
+            final float float32 = arr7[0].getWidth() / (arr7[0].getU1() - arr7[0].getU0());
+            final float float33 = arr7[0].getHeight() / (arr7[0].getV1() - arr7[0].getV0());
+            final float float34 = 4.0f / Math.max(float33, float32);
+            float23 = Mth.lerp(float34, float23, float35);
+            float25 = Mth.lerp(float34, float25, float35);
+            float27 = Mth.lerp(float34, float27, float35);
+            float29 = Mth.lerp(float34, float29, float35);
+            float24 = Mth.lerp(float34, float24, float31);
+            float26 = Mth.lerp(float34, float26, float31);
+            float28 = Mth.lerp(float34, float28, float31);
+            float30 = Mth.lerp(float34, float30, float31);
+            final int integer10 = this.getLightColor(bpe, fu);
+            final float float36 = float14 * float10;
+            final float float37 = float14 * float11;
+            final float float38 = float14 * float12;
+            this.vertex(dhp, double28 + 0.0, double29 + float17, double30 + 0.0, float36, float37, float38, float23, float24, integer10);
+            this.vertex(dhp, double28 + 0.0, double29 + float18, double30 + 1.0, float36, float37, float38, float25, float26, integer10);
+            this.vertex(dhp, double28 + 1.0, double29 + float19, double30 + 1.0, float36, float37, float38, float27, float28, integer10);
+            this.vertex(dhp, double28 + 1.0, double29 + float20, double30 + 0.0, float36, float37, float38, float29, float30, integer10);
+            if (cxa.shouldRenderBackwardUpFace(bpe, fu.above())) {
+                this.vertex(dhp, double28 + 0.0, double29 + float17, double30 + 0.0, float36, float37, float38, float23, float24, integer10);
+                this.vertex(dhp, double28 + 1.0, double29 + float20, double30 + 0.0, float36, float37, float38, float29, float30, integer10);
+                this.vertex(dhp, double28 + 1.0, double29 + float19, double30 + 1.0, float36, float37, float38, float27, float28, integer10);
+                this.vertex(dhp, double28 + 0.0, double29 + float18, double30 + 1.0, float36, float37, float38, float25, float26, integer10);
             }
         }
         if (boolean8) {
-            final float float22 = arr7[0].getU0();
-            final float float24 = arr7[0].getU1();
-            final float float26 = arr7[0].getV0();
-            final float float28 = arr7[0].getV1();
-            final int integer10 = this.getLightColor(bje, fk.below());
-            final float float25 = 0.5f * float9;
-            final float float27 = 0.5f * float10;
-            final float float29 = 0.5f * float11;
-            this.vertex(cyo, double27, double28 + float21, double29 + 1.0, float25, float27, float29, float22, float28, integer10);
-            this.vertex(cyo, double27, double28 + float21, double29, float25, float27, float29, float22, float26, integer10);
-            this.vertex(cyo, double27 + 1.0, double28 + float21, double29, float25, float27, float29, float24, float26, integer10);
-            this.vertex(cyo, double27 + 1.0, double28 + float21, double29 + 1.0, float25, float27, float29, float24, float28, integer10);
+            final float float23 = arr7[0].getU0();
+            final float float25 = arr7[0].getU1();
+            final float float27 = arr7[0].getV0();
+            final float float29 = arr7[0].getV1();
+            final int integer11 = this.getLightColor(bpe, fu.below());
+            final float float26 = float13 * float10;
+            final float float28 = float13 * float11;
+            final float float30 = float13 * float12;
+            this.vertex(dhp, double28, double29 + float22, double30 + 1.0, float26, float28, float30, float23, float29, integer11);
+            this.vertex(dhp, double28, double29 + float22, double30, float26, float28, float30, float23, float27, integer11);
+            this.vertex(dhp, double28 + 1.0, double29 + float22, double30, float26, float28, float30, float25, float27, integer11);
+            this.vertex(dhp, double28 + 1.0, double29 + float22, double30 + 1.0, float26, float28, float30, float25, float29, integer11);
             boolean13 = true;
         }
-        for (int integer11 = 0; integer11 < 4; ++integer11) {
-            float float24;
-            float float26;
-            double double30;
+        for (int integer12 = 0; integer12 < 4; ++integer12) {
+            float float25;
+            float float27;
             double double31;
             double double32;
             double double33;
-            Direction fp46;
+            double double34;
+            Direction fz47;
             boolean boolean14;
-            if (integer11 == 0) {
-                float24 = float16;
-                float26 = float19;
-                double30 = double27;
-                double31 = double27 + 1.0;
-                double32 = double29 + 0.0010000000474974513;
-                double33 = double29 + 0.0010000000474974513;
-                fp46 = Direction.NORTH;
+            if (integer12 == 0) {
+                float25 = float17;
+                float27 = float20;
+                double31 = double28;
+                double32 = double28 + 1.0;
+                double33 = double30 + 0.0010000000474974513;
+                double34 = double30 + 0.0010000000474974513;
+                fz47 = Direction.NORTH;
                 boolean14 = boolean9;
             }
-            else if (integer11 == 1) {
-                float24 = float18;
-                float26 = float17;
-                double30 = double27 + 1.0;
-                double31 = double27;
-                double32 = double29 + 1.0 - 0.0010000000474974513;
-                double33 = double29 + 1.0 - 0.0010000000474974513;
-                fp46 = Direction.SOUTH;
+            else if (integer12 == 1) {
+                float25 = float19;
+                float27 = float18;
+                double31 = double28 + 1.0;
+                double32 = double28;
+                double33 = double30 + 1.0 - 0.0010000000474974513;
+                double34 = double30 + 1.0 - 0.0010000000474974513;
+                fz47 = Direction.SOUTH;
                 boolean14 = boolean10;
             }
-            else if (integer11 == 2) {
-                float24 = float17;
-                float26 = float16;
-                double30 = double27 + 0.0010000000474974513;
-                double31 = double27 + 0.0010000000474974513;
-                double32 = double29 + 1.0;
-                double33 = double29;
-                fp46 = Direction.WEST;
+            else if (integer12 == 2) {
+                float25 = float18;
+                float27 = float17;
+                double31 = double28 + 0.0010000000474974513;
+                double32 = double28 + 0.0010000000474974513;
+                double33 = double30 + 1.0;
+                double34 = double30;
+                fz47 = Direction.WEST;
                 boolean14 = boolean11;
             }
             else {
-                float24 = float19;
-                float26 = float18;
-                double30 = double27 + 1.0 - 0.0010000000474974513;
-                double31 = double27 + 1.0 - 0.0010000000474974513;
-                double32 = double29;
-                double33 = double29 + 1.0;
-                fp46 = Direction.EAST;
+                float25 = float20;
+                float27 = float19;
+                double31 = double28 + 1.0 - 0.0010000000474974513;
+                double32 = double28 + 1.0 - 0.0010000000474974513;
+                double33 = double30;
+                double34 = double30 + 1.0;
+                fz47 = Direction.EAST;
                 boolean14 = boolean12;
             }
-            if (boolean14 && !isFaceOccluded(bje, fk, fp46, Math.max(float24, float26))) {
+            if (boolean14 && !isFaceOccludedByNeighbor(bpe, fu, fz47, Math.max(float25, float27))) {
                 boolean13 = true;
-                final BlockPos fk2 = fk.relative(fp46);
-                TextureAtlasSprite eaj45 = arr7[1];
+                final BlockPos fu2 = fu.relative(fz47);
+                TextureAtlasSprite elv46 = arr7[1];
                 if (!boolean6) {
-                    final Block bph50 = bje.getBlockState(fk2).getBlock();
-                    if (bph50 == Blocks.GLASS || bph50 instanceof StainedGlassBlock) {
-                        eaj45 = this.waterOverlay;
+                    final Block bvr51 = bpe.getBlockState(fu2).getBlock();
+                    if (bvr51 instanceof HalfTransparentBlock || bvr51 instanceof LeavesBlock) {
+                        elv46 = this.waterOverlay;
                     }
                 }
-                final float float35 = eaj45.getU(0.0);
-                final float float36 = eaj45.getU(8.0);
-                final float float37 = eaj45.getV((1.0f - float24) * 16.0f * 0.5f);
-                final float float38 = eaj45.getV((1.0f - float26) * 16.0f * 0.5f);
-                final float float39 = eaj45.getV(8.0);
-                final int integer12 = this.getLightColor(bje, fk2);
-                final float float40 = (integer11 < 2) ? 0.8f : 0.6f;
-                final float float41 = 1.0f * float40 * float9;
-                final float float42 = 1.0f * float40 * float10;
-                final float float43 = 1.0f * float40 * float11;
-                this.vertex(cyo, double30, double28 + float24, double32, float41, float42, float43, float35, float37, integer12);
-                this.vertex(cyo, double31, double28 + float26, double33, float41, float42, float43, float36, float38, integer12);
-                this.vertex(cyo, double31, double28 + float21, double33, float41, float42, float43, float36, float39, integer12);
-                this.vertex(cyo, double30, double28 + float21, double32, float41, float42, float43, float35, float39, integer12);
-                if (eaj45 != this.waterOverlay) {
-                    this.vertex(cyo, double30, double28 + float21, double32, float41, float42, float43, float35, float39, integer12);
-                    this.vertex(cyo, double31, double28 + float21, double33, float41, float42, float43, float36, float39, integer12);
-                    this.vertex(cyo, double31, double28 + float26, double33, float41, float42, float43, float36, float38, integer12);
-                    this.vertex(cyo, double30, double28 + float24, double32, float41, float42, float43, float35, float37, integer12);
+                final float float36 = elv46.getU(0.0);
+                final float float37 = elv46.getU(8.0);
+                final float float38 = elv46.getV((1.0f - float25) * 16.0f * 0.5f);
+                final float float39 = elv46.getV((1.0f - float27) * 16.0f * 0.5f);
+                final float float40 = elv46.getV(8.0);
+                final int integer13 = this.getLightColor(bpe, fu2);
+                final float float41 = (integer12 < 2) ? float15 : float16;
+                final float float42 = float14 * float41 * float10;
+                final float float43 = float14 * float41 * float11;
+                final float float44 = float14 * float41 * float12;
+                this.vertex(dhp, double31, double29 + float25, double33, float42, float43, float44, float36, float38, integer13);
+                this.vertex(dhp, double32, double29 + float27, double34, float42, float43, float44, float37, float39, integer13);
+                this.vertex(dhp, double32, double29 + float22, double34, float42, float43, float44, float37, float40, integer13);
+                this.vertex(dhp, double31, double29 + float22, double33, float42, float43, float44, float36, float40, integer13);
+                if (elv46 != this.waterOverlay) {
+                    this.vertex(dhp, double31, double29 + float22, double33, float42, float43, float44, float36, float40, integer13);
+                    this.vertex(dhp, double32, double29 + float22, double34, float42, float43, float44, float37, float40, integer13);
+                    this.vertex(dhp, double32, double29 + float27, double34, float42, float43, float44, float37, float39, integer13);
+                    this.vertex(dhp, double31, double29 + float25, double33, float42, float43, float44, float36, float38, integer13);
                 }
             }
         }
         return boolean13;
     }
     
-    private void vertex(final VertexConsumer cyo, final double double2, final double double3, final double double4, final float float5, final float float6, final float float7, final float float8, final float float9, final int integer) {
-        cyo.vertex(double2, double3, double4).color(float5, float6, float7, 1.0f).uv(float8, float9).uv2(integer).normal(0.0f, 1.0f, 0.0f).endVertex();
+    private void vertex(final VertexConsumer dhp, final double double2, final double double3, final double double4, final float float5, final float float6, final float float7, final float float8, final float float9, final int integer) {
+        dhp.vertex(double2, double3, double4).color(float5, float6, float7, 1.0f).uv(float8, float9).uv2(integer).normal(0.0f, 1.0f, 0.0f).endVertex();
     }
     
-    private int getLightColor(final BlockAndTintGetter bje, final BlockPos fk) {
-        final int integer4 = LevelRenderer.getLightColor(bje, fk);
-        final int integer5 = LevelRenderer.getLightColor(bje, fk.above());
+    private int getLightColor(final BlockAndTintGetter bpe, final BlockPos fu) {
+        final int integer4 = LevelRenderer.getLightColor(bpe, fu);
+        final int integer5 = LevelRenderer.getLightColor(bpe, fu.above());
         final int integer6 = integer4 & 0xFF;
         final int integer7 = integer5 & 0xFF;
         final int integer8 = integer4 >> 16 & 0xFF;
@@ -269,17 +284,17 @@ public class LiquidBlockRenderer {
         return ((integer6 > integer7) ? integer6 : integer7) | ((integer8 > integer9) ? integer8 : integer9) << 16;
     }
     
-    private float getWaterHeight(final BlockGetter bjg, final BlockPos fk, final Fluid coi) {
+    private float getWaterHeight(final BlockGetter bpg, final BlockPos fu, final Fluid cwz) {
         int integer5 = 0;
         float float6 = 0.0f;
         for (int integer6 = 0; integer6 < 4; ++integer6) {
-            final BlockPos fk2 = fk.offset(-(integer6 & 0x1), 0, -(integer6 >> 1 & 0x1));
-            if (bjg.getFluidState(fk2.above()).getType().isSame(coi)) {
+            final BlockPos fu2 = fu.offset(-(integer6 & 0x1), 0, -(integer6 >> 1 & 0x1));
+            if (bpg.getFluidState(fu2.above()).getType().isSame(cwz)) {
                 return 1.0f;
             }
-            final FluidState coj9 = bjg.getFluidState(fk2);
-            if (coj9.getType().isSame(coi)) {
-                final float float7 = coj9.getHeight(bjg, fk2);
+            final FluidState cxa9 = bpg.getFluidState(fu2);
+            if (cxa9.getType().isSame(cwz)) {
+                final float float7 = cxa9.getHeight(bpg, fu2);
                 if (float7 >= 0.8f) {
                     float6 += float7 * 10.0f;
                     integer5 += 10;
@@ -289,7 +304,7 @@ public class LiquidBlockRenderer {
                     ++integer5;
                 }
             }
-            else if (!bjg.getBlockState(fk2).getMaterial().isSolid()) {
+            else if (!bpg.getBlockState(fu2).getMaterial().isSolid()) {
                 ++integer5;
             }
         }
diff --git a/src/net/minecraft/client/renderer/block/ModelBlockRenderer.java b/src/net/minecraft/client/renderer/block/ModelBlockRenderer.java
index ee8cda5..28279e4 100644
--- a/src/net/minecraft/client/renderer/block/ModelBlockRenderer.java
+++ b/src/net/minecraft/client/renderer/block/ModelBlockRenderer.java
@@ -32,90 +32,90 @@ public class ModelBlockRenderer {
     private final BlockColors blockColors;
     private static final ThreadLocal<Cache> CACHE;
     
-    public ModelBlockRenderer(final BlockColors dcb) {
-        this.blockColors = dcb;
+    public ModelBlockRenderer(final BlockColors dmn) {
+        this.blockColors = dmn;
     }
     
-    public boolean tesselateBlock(final BlockAndTintGetter bje, final BakedModel ebv, final BlockState byj, final BlockPos fk, final PoseStack cyl, final VertexConsumer cyo, final boolean boolean7, final Random random, final long long9, final int integer) {
-        final boolean boolean8 = Minecraft.useAmbientOcclusion() && byj.getLightEmission() == 0 && ebv.useAmbientOcclusion();
-        final Vec3 cvl14 = byj.getOffset(bje, fk);
-        cyl.translate(cvl14.x, cvl14.y, cvl14.z);
+    public boolean tesselateBlock(final BlockAndTintGetter bpe, final BakedModel enh, final BlockState cfj, final BlockPos fu, final PoseStack dhl, final VertexConsumer dhp, final boolean boolean7, final Random random, final long long9, final int integer) {
+        final boolean boolean8 = Minecraft.useAmbientOcclusion() && cfj.getLightEmission() == 0 && enh.useAmbientOcclusion();
+        final Vec3 dem14 = cfj.getOffset(bpe, fu);
+        dhl.translate(dem14.x, dem14.y, dem14.z);
         try {
             if (boolean8) {
-                return this.tesselateWithAO(bje, ebv, byj, fk, cyl, cyo, boolean7, random, long9, integer);
+                return this.tesselateWithAO(bpe, enh, cfj, fu, dhl, dhp, boolean7, random, long9, integer);
             }
-            return this.tesselateWithoutAO(bje, ebv, byj, fk, cyl, cyo, boolean7, random, long9, integer);
+            return this.tesselateWithoutAO(bpe, enh, cfj, fu, dhl, dhp, boolean7, random, long9, integer);
         }
         catch (Throwable throwable15) {
-            final CrashReport h16 = CrashReport.forThrowable(throwable15, "Tesselating block model");
-            final CrashReportCategory i17 = h16.addCategory("Block model being tesselated");
-            CrashReportCategory.populateBlockDetails(i17, fk, byj);
-            i17.setDetail("Using AO", boolean8);
-            throw new ReportedException(h16);
+            final CrashReport j16 = CrashReport.forThrowable(throwable15, "Tesselating block model");
+            final CrashReportCategory k17 = j16.addCategory("Block model being tesselated");
+            CrashReportCategory.populateBlockDetails(k17, fu, cfj);
+            k17.setDetail("Using AO", boolean8);
+            throw new ReportedException(j16);
         }
     }
     
-    public boolean tesselateWithAO(final BlockAndTintGetter bje, final BakedModel ebv, final BlockState byj, final BlockPos fk, final PoseStack cyl, final VertexConsumer cyo, final boolean boolean7, final Random random, final long long9, final int integer) {
+    public boolean tesselateWithAO(final BlockAndTintGetter bpe, final BakedModel enh, final BlockState cfj, final BlockPos fu, final PoseStack dhl, final VertexConsumer dhp, final boolean boolean7, final Random random, final long long9, final int integer) {
         boolean boolean8 = false;
         final float[] arr14 = new float[Direction.values().length * 2];
         final BitSet bitSet15 = new BitSet(3);
         final AmbientOcclusionFace b16 = new AmbientOcclusionFace();
-        for (final Direction fp20 : Direction.values()) {
+        for (final Direction fz20 : Direction.values()) {
             random.setSeed(long9);
-            final List<BakedQuad> list21 = ebv.getQuads(byj, fp20, random);
+            final List<BakedQuad> list21 = enh.getQuads(cfj, fz20, random);
             if (!list21.isEmpty()) {
-                if (!boolean7 || Block.shouldRenderFace(byj, bje, fk, fp20)) {
-                    this.renderModelFaceAO(bje, byj, fk, cyl, cyo, list21, arr14, bitSet15, b16, integer);
+                if (!boolean7 || Block.shouldRenderFace(cfj, bpe, fu, fz20)) {
+                    this.renderModelFaceAO(bpe, cfj, fu, dhl, dhp, list21, arr14, bitSet15, b16, integer);
                     boolean8 = true;
                 }
             }
         }
         random.setSeed(long9);
-        final List<BakedQuad> list22 = ebv.getQuads(byj, null, random);
+        final List<BakedQuad> list22 = enh.getQuads(cfj, null, random);
         if (!list22.isEmpty()) {
-            this.renderModelFaceAO(bje, byj, fk, cyl, cyo, list22, arr14, bitSet15, b16, integer);
+            this.renderModelFaceAO(bpe, cfj, fu, dhl, dhp, list22, arr14, bitSet15, b16, integer);
             boolean8 = true;
         }
         return boolean8;
     }
     
-    public boolean tesselateWithoutAO(final BlockAndTintGetter bje, final BakedModel ebv, final BlockState byj, final BlockPos fk, final PoseStack cyl, final VertexConsumer cyo, final boolean boolean7, final Random random, final long long9, final int integer) {
+    public boolean tesselateWithoutAO(final BlockAndTintGetter bpe, final BakedModel enh, final BlockState cfj, final BlockPos fu, final PoseStack dhl, final VertexConsumer dhp, final boolean boolean7, final Random random, final long long9, final int integer) {
         boolean boolean8 = false;
         final BitSet bitSet14 = new BitSet(3);
-        for (final Direction fp18 : Direction.values()) {
+        for (final Direction fz18 : Direction.values()) {
             random.setSeed(long9);
-            final List<BakedQuad> list19 = ebv.getQuads(byj, fp18, random);
+            final List<BakedQuad> list19 = enh.getQuads(cfj, fz18, random);
             if (!list19.isEmpty()) {
-                if (!boolean7 || Block.shouldRenderFace(byj, bje, fk, fp18)) {
-                    final int integer2 = LevelRenderer.getLightColor(bje, byj, fk.relative(fp18));
-                    this.renderModelFaceFlat(bje, byj, fk, integer2, integer, false, cyl, cyo, list19, bitSet14);
+                if (!boolean7 || Block.shouldRenderFace(cfj, bpe, fu, fz18)) {
+                    final int integer2 = LevelRenderer.getLightColor(bpe, cfj, fu.relative(fz18));
+                    this.renderModelFaceFlat(bpe, cfj, fu, integer2, integer, false, dhl, dhp, list19, bitSet14);
                     boolean8 = true;
                 }
             }
         }
         random.setSeed(long9);
-        final List<BakedQuad> list20 = ebv.getQuads(byj, null, random);
+        final List<BakedQuad> list20 = enh.getQuads(cfj, null, random);
         if (!list20.isEmpty()) {
-            this.renderModelFaceFlat(bje, byj, fk, -1, integer, true, cyl, cyo, list20, bitSet14);
+            this.renderModelFaceFlat(bpe, cfj, fu, -1, integer, true, dhl, dhp, list20, bitSet14);
             boolean8 = true;
         }
         return boolean8;
     }
     
-    private void renderModelFaceAO(final BlockAndTintGetter bje, final BlockState byj, final BlockPos fk, final PoseStack cyl, final VertexConsumer cyo, final List<BakedQuad> list, final float[] arr, final BitSet bitSet, final AmbientOcclusionFace b, final int integer) {
-        for (final BakedQuad drn13 : list) {
-            this.calculateShape(bje, byj, fk, drn13.getVertices(), drn13.getDirection(), arr, bitSet);
-            b.calculate(bje, byj, fk, drn13.getDirection(), arr, bitSet);
-            this.putQuadData(bje, byj, fk, cyo, cyl.last(), drn13, b.brightness[0], b.brightness[1], b.brightness[2], b.brightness[3], b.lightmap[0], b.lightmap[1], b.lightmap[2], b.lightmap[3], integer);
+    private void renderModelFaceAO(final BlockAndTintGetter bpe, final BlockState cfj, final BlockPos fu, final PoseStack dhl, final VertexConsumer dhp, final List<BakedQuad> list, final float[] arr, final BitSet bitSet, final AmbientOcclusionFace b, final int integer) {
+        for (final BakedQuad ect13 : list) {
+            this.calculateShape(bpe, cfj, fu, ect13.getVertices(), ect13.getDirection(), arr, bitSet);
+            b.calculate(bpe, cfj, fu, ect13.getDirection(), arr, bitSet, ect13.isShade());
+            this.putQuadData(bpe, cfj, fu, dhp, dhl.last(), ect13, b.brightness[0], b.brightness[1], b.brightness[2], b.brightness[3], b.lightmap[0], b.lightmap[1], b.lightmap[2], b.lightmap[3], integer);
         }
     }
     
-    private void putQuadData(final BlockAndTintGetter bje, final BlockState byj, final BlockPos fk, final VertexConsumer cyo, final PoseStack.Pose a, final BakedQuad drn, final float float7, final float float8, final float float9, final float float10, final int integer11, final int integer12, final int integer13, final int integer14, final int integer15) {
+    private void putQuadData(final BlockAndTintGetter bpe, final BlockState cfj, final BlockPos fu, final VertexConsumer dhp, final PoseStack.Pose a, final BakedQuad ect, final float float7, final float float8, final float float9, final float float10, final int integer11, final int integer12, final int integer13, final int integer14, final int integer15) {
         float float11;
         float float12;
         float float13;
-        if (drn.isTinted()) {
-            final int integer16 = this.blockColors.getColor(byj, bje, fk, drn.getTintIndex());
+        if (ect.isTinted()) {
+            final int integer16 = this.blockColors.getColor(cfj, bpe, fu, ect.getTintIndex());
             float11 = (integer16 >> 16 & 0xFF) / 255.0f;
             float12 = (integer16 >> 8 & 0xFF) / 255.0f;
             float13 = (integer16 & 0xFF) / 255.0f;
@@ -125,10 +125,10 @@ public class ModelBlockRenderer {
             float12 = 1.0f;
             float13 = 1.0f;
         }
-        cyo.putBulkData(a, drn, new float[] { float7, float8, float9, float10 }, float11, float12, float13, new int[] { integer11, integer12, integer13, integer14 }, integer15, true);
+        dhp.putBulkData(a, ect, new float[] { float7, float8, float9, float10 }, float11, float12, float13, new int[] { integer11, integer12, integer13, integer14 }, integer15, true);
     }
     
-    private void calculateShape(final BlockAndTintGetter bje, final BlockState byj, final BlockPos fk, final int[] arr, final Direction fp, @Nullable final float[] arr, final BitSet bitSet) {
+    private void calculateShape(final BlockAndTintGetter bpe, final BlockState cfj, final BlockPos fu, final int[] arr, final Direction fz, @Nullable final float[] arr, final BitSet bitSet) {
         float float9 = 32.0f;
         float float10 = 32.0f;
         float float11 = 32.0f;
@@ -163,68 +163,69 @@ public class ModelBlockRenderer {
         }
         final float float18 = 1.0E-4f;
         final float float15 = 0.9999f;
-        switch (fp) {
+        switch (fz) {
             case DOWN: {
                 bitSet.set(1, float9 >= 1.0E-4f || float11 >= 1.0E-4f || float12 <= 0.9999f || float14 <= 0.9999f);
-                bitSet.set(0, float10 == float13 && (float10 < 1.0E-4f || byj.isCollisionShapeFullBlock(bje, fk)));
+                bitSet.set(0, float10 == float13 && (float10 < 1.0E-4f || cfj.isCollisionShapeFullBlock(bpe, fu)));
                 break;
             }
             case UP: {
                 bitSet.set(1, float9 >= 1.0E-4f || float11 >= 1.0E-4f || float12 <= 0.9999f || float14 <= 0.9999f);
-                bitSet.set(0, float10 == float13 && (float13 > 0.9999f || byj.isCollisionShapeFullBlock(bje, fk)));
+                bitSet.set(0, float10 == float13 && (float13 > 0.9999f || cfj.isCollisionShapeFullBlock(bpe, fu)));
                 break;
             }
             case NORTH: {
                 bitSet.set(1, float9 >= 1.0E-4f || float10 >= 1.0E-4f || float12 <= 0.9999f || float13 <= 0.9999f);
-                bitSet.set(0, float11 == float14 && (float11 < 1.0E-4f || byj.isCollisionShapeFullBlock(bje, fk)));
+                bitSet.set(0, float11 == float14 && (float11 < 1.0E-4f || cfj.isCollisionShapeFullBlock(bpe, fu)));
                 break;
             }
             case SOUTH: {
                 bitSet.set(1, float9 >= 1.0E-4f || float10 >= 1.0E-4f || float12 <= 0.9999f || float13 <= 0.9999f);
-                bitSet.set(0, float11 == float14 && (float14 > 0.9999f || byj.isCollisionShapeFullBlock(bje, fk)));
+                bitSet.set(0, float11 == float14 && (float14 > 0.9999f || cfj.isCollisionShapeFullBlock(bpe, fu)));
                 break;
             }
             case WEST: {
                 bitSet.set(1, float10 >= 1.0E-4f || float11 >= 1.0E-4f || float13 <= 0.9999f || float14 <= 0.9999f);
-                bitSet.set(0, float9 == float12 && (float9 < 1.0E-4f || byj.isCollisionShapeFullBlock(bje, fk)));
+                bitSet.set(0, float9 == float12 && (float9 < 1.0E-4f || cfj.isCollisionShapeFullBlock(bpe, fu)));
                 break;
             }
             case EAST: {
                 bitSet.set(1, float10 >= 1.0E-4f || float11 >= 1.0E-4f || float13 <= 0.9999f || float14 <= 0.9999f);
-                bitSet.set(0, float9 == float12 && (float12 > 0.9999f || byj.isCollisionShapeFullBlock(bje, fk)));
+                bitSet.set(0, float9 == float12 && (float12 > 0.9999f || cfj.isCollisionShapeFullBlock(bpe, fu)));
                 break;
             }
         }
     }
     
-    private void renderModelFaceFlat(final BlockAndTintGetter bje, final BlockState byj, final BlockPos fk, int integer4, final int integer5, final boolean boolean6, final PoseStack cyl, final VertexConsumer cyo, final List<BakedQuad> list, final BitSet bitSet) {
-        for (final BakedQuad drn13 : list) {
+    private void renderModelFaceFlat(final BlockAndTintGetter bpe, final BlockState cfj, final BlockPos fu, int integer4, final int integer5, final boolean boolean6, final PoseStack dhl, final VertexConsumer dhp, final List<BakedQuad> list, final BitSet bitSet) {
+        for (final BakedQuad ect13 : list) {
             if (boolean6) {
-                this.calculateShape(bje, byj, fk, drn13.getVertices(), drn13.getDirection(), null, bitSet);
-                final BlockPos fk2 = bitSet.get(0) ? fk.relative(drn13.getDirection()) : fk;
-                integer4 = LevelRenderer.getLightColor(bje, byj, fk2);
+                this.calculateShape(bpe, cfj, fu, ect13.getVertices(), ect13.getDirection(), null, bitSet);
+                final BlockPos fu2 = bitSet.get(0) ? fu.relative(ect13.getDirection()) : fu;
+                integer4 = LevelRenderer.getLightColor(bpe, cfj, fu2);
             }
-            this.putQuadData(bje, byj, fk, cyo, cyl.last(), drn13, 1.0f, 1.0f, 1.0f, 1.0f, integer4, integer4, integer4, integer4, integer5);
+            final float float14 = bpe.getShade(ect13.getDirection(), ect13.isShade());
+            this.putQuadData(bpe, cfj, fu, dhp, dhl.last(), ect13, float14, float14, float14, float14, integer4, integer4, integer4, integer4, integer5);
         }
     }
     
-    public void renderModel(final PoseStack.Pose a, final VertexConsumer cyo, @Nullable final BlockState byj, final BakedModel ebv, final float float5, final float float6, final float float7, final int integer8, final int integer9) {
+    public void renderModel(final PoseStack.Pose a, final VertexConsumer dhp, @Nullable final BlockState cfj, final BakedModel enh, final float float5, final float float6, final float float7, final int integer8, final int integer9) {
         final Random random11 = new Random();
         final long long12 = 42L;
-        for (final Direction fp17 : Direction.values()) {
+        for (final Direction fz17 : Direction.values()) {
             random11.setSeed(42L);
-            renderQuadList(a, cyo, float5, float6, float7, ebv.getQuads(byj, fp17, random11), integer8, integer9);
+            renderQuadList(a, dhp, float5, float6, float7, enh.getQuads(cfj, fz17, random11), integer8, integer9);
         }
         random11.setSeed(42L);
-        renderQuadList(a, cyo, float5, float6, float7, ebv.getQuads(byj, null, random11), integer8, integer9);
+        renderQuadList(a, dhp, float5, float6, float7, enh.getQuads(cfj, null, random11), integer8, integer9);
     }
     
-    private static void renderQuadList(final PoseStack.Pose a, final VertexConsumer cyo, final float float3, final float float4, final float float5, final List<BakedQuad> list, final int integer7, final int integer8) {
-        for (final BakedQuad drn10 : list) {
+    private static void renderQuadList(final PoseStack.Pose a, final VertexConsumer dhp, final float float3, final float float4, final float float5, final List<BakedQuad> list, final int integer7, final int integer8) {
+        for (final BakedQuad ect10 : list) {
             float float6;
             float float7;
             float float8;
-            if (drn10.isTinted()) {
+            if (ect10.isTinted()) {
                 float6 = Mth.clamp(float3, 0.0f, 1.0f);
                 float7 = Mth.clamp(float4, 0.0f, 1.0f);
                 float8 = Mth.clamp(float5, 0.0f, 1.0f);
@@ -234,7 +235,7 @@ public class ModelBlockRenderer {
                 float7 = 1.0f;
                 float8 = 1.0f;
             }
-            cyo.putBulkData(a, drn10, float6, float7, float8, integer7, integer8);
+            dhp.putBulkData(a, ect10, float6, float7, float8, integer7, integer8);
         }
     }
     
@@ -271,8 +272,8 @@ public class ModelBlockRenderer {
             this.vert3 = integer6;
         }
         
-        public static AmbientVertexRemap fromFacing(final Direction fp) {
-            return AmbientVertexRemap.BY_FACING[fp.get3DDataValue()];
+        public static AmbientVertexRemap fromFacing(final Direction fz) {
+            return AmbientVertexRemap.BY_FACING[fz.get3DDataValue()];
         }
         
         static {
@@ -323,15 +324,15 @@ public class ModelBlockRenderer {
             this.brightnessCache.clear();
         }
         
-        public int getLightColor(final BlockState byj, final BlockAndTintGetter bje, final BlockPos fk) {
-            final long long5 = fk.asLong();
+        public int getLightColor(final BlockState cfj, final BlockAndTintGetter bpe, final BlockPos fu) {
+            final long long5 = fu.asLong();
             if (this.enabled) {
                 final int integer7 = this.colorCache.get(long5);
                 if (integer7 != Integer.MAX_VALUE) {
                     return integer7;
                 }
             }
-            final int integer7 = LevelRenderer.getLightColor(bje, byj, fk);
+            final int integer7 = LevelRenderer.getLightColor(bpe, cfj, fu);
             if (this.enabled) {
                 if (this.colorCache.size() == 100) {
                     this.colorCache.removeFirstInt();
@@ -341,15 +342,15 @@ public class ModelBlockRenderer {
             return integer7;
         }
         
-        public float getShadeBrightness(final BlockState byj, final BlockAndTintGetter bje, final BlockPos fk) {
-            final long long5 = fk.asLong();
+        public float getShadeBrightness(final BlockState cfj, final BlockAndTintGetter bpe, final BlockPos fu) {
+            final long long5 = fu.asLong();
             if (this.enabled) {
                 final float float7 = this.brightnessCache.get(long5);
                 if (!Float.isNaN(float7)) {
                     return float7;
                 }
             }
-            final float float7 = byj.getShadeBrightness(bje, fk);
+            final float float7 = cfj.getShadeBrightness(bpe, fu);
             if (this.enabled) {
                 if (this.brightnessCache.size() == 100) {
                     this.brightnessCache.removeFirstFloat();
@@ -369,138 +370,144 @@ public class ModelBlockRenderer {
             this.lightmap = new int[4];
         }
         
-        public void calculate(final BlockAndTintGetter bje, final BlockState byj, final BlockPos fk, final Direction fp, final float[] arr, final BitSet bitSet) {
-            final BlockPos fk2 = bitSet.get(0) ? fk.relative(fp) : fk;
-            final AdjacencyInfo a9 = AdjacencyInfo.fromFacing(fp);
-            final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
-            final Cache d11 = ModelBlockRenderer.CACHE.get();
-            a10.set(fk2).move(a9.corners[0]);
-            final BlockState byj2 = bje.getBlockState(a10);
-            final int integer13 = d11.getLightColor(byj2, bje, a10);
-            final float float14 = d11.getShadeBrightness(byj2, bje, a10);
-            a10.set(fk2).move(a9.corners[1]);
-            final BlockState byj3 = bje.getBlockState(a10);
-            final int integer14 = d11.getLightColor(byj3, bje, a10);
-            final float float15 = d11.getShadeBrightness(byj3, bje, a10);
-            a10.set(fk2).move(a9.corners[2]);
-            final BlockState byj4 = bje.getBlockState(a10);
-            final int integer15 = d11.getLightColor(byj4, bje, a10);
-            final float float16 = d11.getShadeBrightness(byj4, bje, a10);
-            a10.set(fk2).move(a9.corners[3]);
-            final BlockState byj5 = bje.getBlockState(a10);
-            final int integer16 = d11.getLightColor(byj5, bje, a10);
-            final float float17 = d11.getShadeBrightness(byj5, bje, a10);
-            a10.set(fk2).move(a9.corners[0]).move(fp);
-            final boolean boolean24 = bje.getBlockState(a10).getLightBlock(bje, a10) == 0;
-            a10.set(fk2).move(a9.corners[1]).move(fp);
-            final boolean boolean25 = bje.getBlockState(a10).getLightBlock(bje, a10) == 0;
-            a10.set(fk2).move(a9.corners[2]).move(fp);
-            final boolean boolean26 = bje.getBlockState(a10).getLightBlock(bje, a10) == 0;
-            a10.set(fk2).move(a9.corners[3]).move(fp);
-            final boolean boolean27 = bje.getBlockState(a10).getLightBlock(bje, a10) == 0;
-            float float18;
-            int integer17;
-            if (boolean26 || boolean24) {
-                a10.set(fk2).move(a9.corners[0]).move(a9.corners[2]);
-                final BlockState byj6 = bje.getBlockState(a10);
-                float18 = d11.getShadeBrightness(byj6, bje, a10);
-                integer17 = d11.getLightColor(byj6, bje, a10);
-            }
-            else {
-                float18 = float14;
-                integer17 = integer13;
-            }
+        public void calculate(final BlockAndTintGetter bpe, final BlockState cfj, final BlockPos fu, final Direction fz, final float[] arr, final BitSet bitSet, final boolean boolean7) {
+            final BlockPos fu2 = bitSet.get(0) ? fu.relative(fz) : fu;
+            final AdjacencyInfo a10 = AdjacencyInfo.fromFacing(fz);
+            final BlockPos.MutableBlockPos a11 = new BlockPos.MutableBlockPos();
+            final Cache d12 = ModelBlockRenderer.CACHE.get();
+            a11.setWithOffset(fu2, a10.corners[0]);
+            final BlockState cfj2 = bpe.getBlockState(a11);
+            final int integer14 = d12.getLightColor(cfj2, bpe, a11);
+            final float float15 = d12.getShadeBrightness(cfj2, bpe, a11);
+            a11.setWithOffset(fu2, a10.corners[1]);
+            final BlockState cfj3 = bpe.getBlockState(a11);
+            final int integer15 = d12.getLightColor(cfj3, bpe, a11);
+            final float float16 = d12.getShadeBrightness(cfj3, bpe, a11);
+            a11.setWithOffset(fu2, a10.corners[2]);
+            final BlockState cfj4 = bpe.getBlockState(a11);
+            final int integer16 = d12.getLightColor(cfj4, bpe, a11);
+            final float float17 = d12.getShadeBrightness(cfj4, bpe, a11);
+            a11.setWithOffset(fu2, a10.corners[3]);
+            final BlockState cfj5 = bpe.getBlockState(a11);
+            final int integer17 = d12.getLightColor(cfj5, bpe, a11);
+            final float float18 = d12.getShadeBrightness(cfj5, bpe, a11);
+            a11.setWithOffset(fu2, a10.corners[0]).move(fz);
+            final boolean boolean8 = bpe.getBlockState(a11).getLightBlock(bpe, a11) == 0;
+            a11.setWithOffset(fu2, a10.corners[1]).move(fz);
+            final boolean boolean9 = bpe.getBlockState(a11).getLightBlock(bpe, a11) == 0;
+            a11.setWithOffset(fu2, a10.corners[2]).move(fz);
+            final boolean boolean10 = bpe.getBlockState(a11).getLightBlock(bpe, a11) == 0;
+            a11.setWithOffset(fu2, a10.corners[3]).move(fz);
+            final boolean boolean11 = bpe.getBlockState(a11).getLightBlock(bpe, a11) == 0;
             float float19;
             int integer18;
-            if (boolean27 || boolean24) {
-                a10.set(fk2).move(a9.corners[0]).move(a9.corners[3]);
-                final BlockState byj6 = bje.getBlockState(a10);
-                float19 = d11.getShadeBrightness(byj6, bje, a10);
-                integer18 = d11.getLightColor(byj6, bje, a10);
+            if (boolean10 || boolean8) {
+                a11.setWithOffset(fu2, a10.corners[0]).move(a10.corners[2]);
+                final BlockState cfj6 = bpe.getBlockState(a11);
+                float19 = d12.getShadeBrightness(cfj6, bpe, a11);
+                integer18 = d12.getLightColor(cfj6, bpe, a11);
             }
             else {
-                float19 = float14;
-                integer18 = integer13;
+                float19 = float15;
+                integer18 = integer14;
             }
             float float20;
             int integer19;
-            if (boolean26 || boolean25) {
-                a10.set(fk2).move(a9.corners[1]).move(a9.corners[2]);
-                final BlockState byj6 = bje.getBlockState(a10);
-                float20 = d11.getShadeBrightness(byj6, bje, a10);
-                integer19 = d11.getLightColor(byj6, bje, a10);
+            if (boolean11 || boolean8) {
+                a11.setWithOffset(fu2, a10.corners[0]).move(a10.corners[3]);
+                final BlockState cfj6 = bpe.getBlockState(a11);
+                float20 = d12.getShadeBrightness(cfj6, bpe, a11);
+                integer19 = d12.getLightColor(cfj6, bpe, a11);
             }
             else {
-                float20 = float14;
-                integer19 = integer13;
+                float20 = float15;
+                integer19 = integer14;
             }
             float float21;
             int integer20;
-            if (boolean27 || boolean25) {
-                a10.set(fk2).move(a9.corners[1]).move(a9.corners[3]);
-                final BlockState byj6 = bje.getBlockState(a10);
-                float21 = d11.getShadeBrightness(byj6, bje, a10);
-                integer20 = d11.getLightColor(byj6, bje, a10);
+            if (boolean10 || boolean9) {
+                a11.setWithOffset(fu2, a10.corners[1]).move(a10.corners[2]);
+                final BlockState cfj6 = bpe.getBlockState(a11);
+                float21 = d12.getShadeBrightness(cfj6, bpe, a11);
+                integer20 = d12.getLightColor(cfj6, bpe, a11);
             }
             else {
-                float21 = float14;
-                integer20 = integer13;
+                float21 = float15;
+                integer20 = integer14;
             }
-            int integer21 = d11.getLightColor(byj, bje, fk);
-            a10.set(fk).move(fp);
-            final BlockState byj7 = bje.getBlockState(a10);
-            if (bitSet.get(0) || !byj7.isSolidRender(bje, a10)) {
-                integer21 = d11.getLightColor(byj7, bje, a10);
-            }
-            final float float22 = bitSet.get(0) ? d11.getShadeBrightness(bje.getBlockState(fk2), bje, fk2) : d11.getShadeBrightness(bje.getBlockState(fk), bje, fk);
-            final AmbientVertexRemap c39 = AmbientVertexRemap.fromFacing(fp);
-            if (!bitSet.get(1) || !a9.doNonCubicWeight) {
-                final float float23 = (float17 + float14 + float19 + float22) * 0.25f;
-                final float float24 = (float16 + float14 + float18 + float22) * 0.25f;
-                final float float25 = (float16 + float15 + float20 + float22) * 0.25f;
-                final float float26 = (float17 + float15 + float21 + float22) * 0.25f;
-                this.lightmap[c39.vert0] = this.blend(integer16, integer13, integer18, integer21);
-                this.lightmap[c39.vert1] = this.blend(integer15, integer13, integer17, integer21);
-                this.lightmap[c39.vert2] = this.blend(integer15, integer14, integer19, integer21);
-                this.lightmap[c39.vert3] = this.blend(integer16, integer14, integer20, integer21);
-                this.brightness[c39.vert0] = float23;
-                this.brightness[c39.vert1] = float24;
-                this.brightness[c39.vert2] = float25;
-                this.brightness[c39.vert3] = float26;
+            float float22;
+            int integer21;
+            if (boolean11 || boolean9) {
+                a11.setWithOffset(fu2, a10.corners[1]).move(a10.corners[3]);
+                final BlockState cfj6 = bpe.getBlockState(a11);
+                float22 = d12.getShadeBrightness(cfj6, bpe, a11);
+                integer21 = d12.getLightColor(cfj6, bpe, a11);
             }
             else {
-                final float float23 = (float17 + float14 + float19 + float22) * 0.25f;
-                final float float24 = (float16 + float14 + float18 + float22) * 0.25f;
-                final float float25 = (float16 + float15 + float20 + float22) * 0.25f;
-                final float float26 = (float17 + float15 + float21 + float22) * 0.25f;
-                final float float27 = arr[a9.vert0Weights[0].shape] * arr[a9.vert0Weights[1].shape];
-                final float float28 = arr[a9.vert0Weights[2].shape] * arr[a9.vert0Weights[3].shape];
-                final float float29 = arr[a9.vert0Weights[4].shape] * arr[a9.vert0Weights[5].shape];
-                final float float30 = arr[a9.vert0Weights[6].shape] * arr[a9.vert0Weights[7].shape];
-                final float float31 = arr[a9.vert1Weights[0].shape] * arr[a9.vert1Weights[1].shape];
-                final float float32 = arr[a9.vert1Weights[2].shape] * arr[a9.vert1Weights[3].shape];
-                final float float33 = arr[a9.vert1Weights[4].shape] * arr[a9.vert1Weights[5].shape];
-                final float float34 = arr[a9.vert1Weights[6].shape] * arr[a9.vert1Weights[7].shape];
-                final float float35 = arr[a9.vert2Weights[0].shape] * arr[a9.vert2Weights[1].shape];
-                final float float36 = arr[a9.vert2Weights[2].shape] * arr[a9.vert2Weights[3].shape];
-                final float float37 = arr[a9.vert2Weights[4].shape] * arr[a9.vert2Weights[5].shape];
-                final float float38 = arr[a9.vert2Weights[6].shape] * arr[a9.vert2Weights[7].shape];
-                final float float39 = arr[a9.vert3Weights[0].shape] * arr[a9.vert3Weights[1].shape];
-                final float float40 = arr[a9.vert3Weights[2].shape] * arr[a9.vert3Weights[3].shape];
-                final float float41 = arr[a9.vert3Weights[4].shape] * arr[a9.vert3Weights[5].shape];
-                final float float42 = arr[a9.vert3Weights[6].shape] * arr[a9.vert3Weights[7].shape];
-                this.brightness[c39.vert0] = float23 * float27 + float24 * float28 + float25 * float29 + float26 * float30;
-                this.brightness[c39.vert1] = float23 * float31 + float24 * float32 + float25 * float33 + float26 * float34;
-                this.brightness[c39.vert2] = float23 * float35 + float24 * float36 + float25 * float37 + float26 * float38;
-                this.brightness[c39.vert3] = float23 * float39 + float24 * float40 + float25 * float41 + float26 * float42;
-                final int integer22 = this.blend(integer16, integer13, integer18, integer21);
-                final int integer23 = this.blend(integer15, integer13, integer17, integer21);
-                final int integer24 = this.blend(integer15, integer14, integer19, integer21);
-                final int integer25 = this.blend(integer16, integer14, integer20, integer21);
-                this.lightmap[c39.vert0] = this.blend(integer22, integer23, integer24, integer25, float27, float28, float29, float30);
-                this.lightmap[c39.vert1] = this.blend(integer22, integer23, integer24, integer25, float31, float32, float33, float34);
-                this.lightmap[c39.vert2] = this.blend(integer22, integer23, integer24, integer25, float35, float36, float37, float38);
-                this.lightmap[c39.vert3] = this.blend(integer22, integer23, integer24, integer25, float39, float40, float41, float42);
+                float22 = float15;
+                integer21 = integer14;
+            }
+            int integer22 = d12.getLightColor(cfj, bpe, fu);
+            a11.setWithOffset(fu, fz);
+            final BlockState cfj7 = bpe.getBlockState(a11);
+            if (bitSet.get(0) || !cfj7.isSolidRender(bpe, a11)) {
+                integer22 = d12.getLightColor(cfj7, bpe, a11);
+            }
+            final float float23 = bitSet.get(0) ? d12.getShadeBrightness(bpe.getBlockState(fu2), bpe, fu2) : d12.getShadeBrightness(bpe.getBlockState(fu), bpe, fu);
+            final AmbientVertexRemap c40 = AmbientVertexRemap.fromFacing(fz);
+            if (!bitSet.get(1) || !a10.doNonCubicWeight) {
+                final float float24 = (float18 + float15 + float20 + float23) * 0.25f;
+                final float float25 = (float17 + float15 + float19 + float23) * 0.25f;
+                final float float26 = (float17 + float16 + float21 + float23) * 0.25f;
+                final float float27 = (float18 + float16 + float22 + float23) * 0.25f;
+                this.lightmap[c40.vert0] = this.blend(integer17, integer14, integer19, integer22);
+                this.lightmap[c40.vert1] = this.blend(integer16, integer14, integer18, integer22);
+                this.lightmap[c40.vert2] = this.blend(integer16, integer15, integer20, integer22);
+                this.lightmap[c40.vert3] = this.blend(integer17, integer15, integer21, integer22);
+                this.brightness[c40.vert0] = float24;
+                this.brightness[c40.vert1] = float25;
+                this.brightness[c40.vert2] = float26;
+                this.brightness[c40.vert3] = float27;
+            }
+            else {
+                final float float24 = (float18 + float15 + float20 + float23) * 0.25f;
+                final float float25 = (float17 + float15 + float19 + float23) * 0.25f;
+                final float float26 = (float17 + float16 + float21 + float23) * 0.25f;
+                final float float27 = (float18 + float16 + float22 + float23) * 0.25f;
+                final float float28 = arr[a10.vert0Weights[0].shape] * arr[a10.vert0Weights[1].shape];
+                final float float29 = arr[a10.vert0Weights[2].shape] * arr[a10.vert0Weights[3].shape];
+                final float float30 = arr[a10.vert0Weights[4].shape] * arr[a10.vert0Weights[5].shape];
+                final float float31 = arr[a10.vert0Weights[6].shape] * arr[a10.vert0Weights[7].shape];
+                final float float32 = arr[a10.vert1Weights[0].shape] * arr[a10.vert1Weights[1].shape];
+                final float float33 = arr[a10.vert1Weights[2].shape] * arr[a10.vert1Weights[3].shape];
+                final float float34 = arr[a10.vert1Weights[4].shape] * arr[a10.vert1Weights[5].shape];
+                final float float35 = arr[a10.vert1Weights[6].shape] * arr[a10.vert1Weights[7].shape];
+                final float float36 = arr[a10.vert2Weights[0].shape] * arr[a10.vert2Weights[1].shape];
+                final float float37 = arr[a10.vert2Weights[2].shape] * arr[a10.vert2Weights[3].shape];
+                final float float38 = arr[a10.vert2Weights[4].shape] * arr[a10.vert2Weights[5].shape];
+                final float float39 = arr[a10.vert2Weights[6].shape] * arr[a10.vert2Weights[7].shape];
+                final float float40 = arr[a10.vert3Weights[0].shape] * arr[a10.vert3Weights[1].shape];
+                final float float41 = arr[a10.vert3Weights[2].shape] * arr[a10.vert3Weights[3].shape];
+                final float float42 = arr[a10.vert3Weights[4].shape] * arr[a10.vert3Weights[5].shape];
+                final float float43 = arr[a10.vert3Weights[6].shape] * arr[a10.vert3Weights[7].shape];
+                this.brightness[c40.vert0] = float24 * float28 + float25 * float29 + float26 * float30 + float27 * float31;
+                this.brightness[c40.vert1] = float24 * float32 + float25 * float33 + float26 * float34 + float27 * float35;
+                this.brightness[c40.vert2] = float24 * float36 + float25 * float37 + float26 * float38 + float27 * float39;
+                this.brightness[c40.vert3] = float24 * float40 + float25 * float41 + float26 * float42 + float27 * float43;
+                final int integer23 = this.blend(integer17, integer14, integer19, integer22);
+                final int integer24 = this.blend(integer16, integer14, integer18, integer22);
+                final int integer25 = this.blend(integer16, integer15, integer20, integer22);
+                final int integer26 = this.blend(integer17, integer15, integer21, integer22);
+                this.lightmap[c40.vert0] = this.blend(integer23, integer24, integer25, integer26, float28, float29, float30, float31);
+                this.lightmap[c40.vert1] = this.blend(integer23, integer24, integer25, integer26, float32, float33, float34, float35);
+                this.lightmap[c40.vert2] = this.blend(integer23, integer24, integer25, integer26, float36, float37, float38, float39);
+                this.lightmap[c40.vert3] = this.blend(integer23, integer24, integer25, integer26, float40, float41, float42, float43);
+            }
+            final float float24 = bpe.getShade(fz, boolean7);
+            for (int integer27 = 0; integer27 < this.brightness.length; ++integer27) {
+                final float[] brightness = this.brightness;
+                final int n = integer27;
+                brightness[n] *= float24;
             }
         }
         
@@ -540,8 +547,8 @@ public class ModelBlockRenderer {
         
         private final int shape;
         
-        private SizeInfo(final Direction fp, final boolean boolean4) {
-            this.shape = fp.get3DDataValue() + (boolean4 ? Direction.values().length : 0);
+        private SizeInfo(final Direction fz, final boolean boolean4) {
+            this.shape = fz.get3DDataValue() + (boolean4 ? Direction.values().length : 0);
         }
     }
     
@@ -570,8 +577,8 @@ public class ModelBlockRenderer {
             this.vert3Weights = arr9;
         }
         
-        public static AdjacencyInfo fromFacing(final Direction fp) {
-            return AdjacencyInfo.BY_FACING[fp.get3DDataValue()];
+        public static AdjacencyInfo fromFacing(final Direction fz) {
+            return AdjacencyInfo.BY_FACING[fz.get3DDataValue()];
         }
         
         static {
diff --git a/src/net/minecraft/client/renderer/block/model/BakedQuad.java b/src/net/minecraft/client/renderer/block/model/BakedQuad.java
index 78036f8..f2f2327 100644
--- a/src/net/minecraft/client/renderer/block/model/BakedQuad.java
+++ b/src/net/minecraft/client/renderer/block/model/BakedQuad.java
@@ -8,12 +8,14 @@ public class BakedQuad {
     protected final int tintIndex;
     protected final Direction direction;
     protected final TextureAtlasSprite sprite;
+    private final boolean shade;
     
-    public BakedQuad(final int[] arr, final int integer, final Direction fp, final TextureAtlasSprite eaj) {
+    public BakedQuad(final int[] arr, final int integer, final Direction fz, final TextureAtlasSprite elv, final boolean boolean5) {
         this.vertices = arr;
         this.tintIndex = integer;
-        this.direction = fp;
-        this.sprite = eaj;
+        this.direction = fz;
+        this.sprite = elv;
+        this.shade = boolean5;
     }
     
     public int[] getVertices() {
@@ -31,4 +33,8 @@ public class BakedQuad {
     public Direction getDirection() {
         return this.direction;
     }
+    
+    public boolean isShade() {
+        return this.shade;
+    }
 }
diff --git a/src/net/minecraft/client/renderer/block/model/BlockElement.java b/src/net/minecraft/client/renderer/block/model/BlockElement.java
index cabd555..f3c65a0 100644
--- a/src/net/minecraft/client/renderer/block/model/BlockElement.java
+++ b/src/net/minecraft/client/renderer/block/model/BlockElement.java
@@ -24,11 +24,11 @@ public class BlockElement {
     public final BlockElementRotation rotation;
     public final boolean shade;
     
-    public BlockElement(final Vector3f e1, final Vector3f e2, final Map<Direction, BlockElementFace> map, @Nullable final BlockElementRotation drq, final boolean boolean5) {
-        this.from = e1;
-        this.to = e2;
+    public BlockElement(final Vector3f g1, final Vector3f g2, final Map<Direction, BlockElementFace> map, @Nullable final BlockElementRotation ecw, final boolean boolean5) {
+        this.from = g1;
+        this.to = g2;
         this.faces = map;
-        this.rotation = drq;
+        this.rotation = ecw;
         this.shade = boolean5;
         this.fillUvs();
     }
@@ -40,8 +40,8 @@ public class BlockElement {
         }
     }
     
-    private float[] uvsByFace(final Direction fp) {
-        switch (fp) {
+    private float[] uvsByFace(final Direction fz) {
+        switch (fz) {
             case DOWN: {
                 return new float[] { this.from.x(), 16.0f - this.to.z(), this.to.x(), 16.0f - this.from.z() };
             }
@@ -70,30 +70,30 @@ public class BlockElement {
         @Override
         public BlockElement deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             final JsonObject jsonObject5 = jsonElement.getAsJsonObject();
-            final Vector3f e6 = this.getFrom(jsonObject5);
-            final Vector3f e7 = this.getTo(jsonObject5);
-            final BlockElementRotation drq8 = this.getRotation(jsonObject5);
+            final Vector3f g6 = this.getFrom(jsonObject5);
+            final Vector3f g7 = this.getTo(jsonObject5);
+            final BlockElementRotation ecw8 = this.getRotation(jsonObject5);
             final Map<Direction, BlockElementFace> map9 = this.getFaces(jsonDeserializationContext, jsonObject5);
             if (jsonObject5.has("shade") && !GsonHelper.isBooleanValue(jsonObject5, "shade")) {
                 throw new JsonParseException("Expected shade to be a Boolean");
             }
             final boolean boolean10 = GsonHelper.getAsBoolean(jsonObject5, "shade", true);
-            return new BlockElement(e6, e7, map9, drq8, boolean10);
+            return new BlockElement(g6, g7, map9, ecw8, boolean10);
         }
         
         @Nullable
         private BlockElementRotation getRotation(final JsonObject jsonObject) {
-            BlockElementRotation drq3 = null;
+            BlockElementRotation ecw3 = null;
             if (jsonObject.has("rotation")) {
                 final JsonObject jsonObject2 = GsonHelper.getAsJsonObject(jsonObject, "rotation");
-                final Vector3f e5 = this.getVector3f(jsonObject2, "origin");
-                e5.mul(0.0625f);
+                final Vector3f g5 = this.getVector3f(jsonObject2, "origin");
+                g5.mul(0.0625f);
                 final Direction.Axis a6 = this.getAxis(jsonObject2);
                 final float float7 = this.getAngle(jsonObject2);
                 final boolean boolean8 = GsonHelper.getAsBoolean(jsonObject2, "rescale", false);
-                drq3 = new BlockElementRotation(e5, a6, float7, boolean8);
+                ecw3 = new BlockElementRotation(g5, a6, float7, boolean8);
             }
-            return drq3;
+            return ecw3;
         }
         
         private float getAngle(final JsonObject jsonObject) {
@@ -125,34 +125,34 @@ public class BlockElement {
             final Map<Direction, BlockElementFace> map4 = Maps.newEnumMap(Direction.class);
             final JsonObject jsonObject2 = GsonHelper.getAsJsonObject(jsonObject, "faces");
             for (final Map.Entry<String, JsonElement> entry7 : jsonObject2.entrySet()) {
-                final Direction fp8 = this.getFacing(entry7.getKey());
-                map4.put(fp8, jsonDeserializationContext.<BlockElementFace>deserialize(entry7.getValue(), BlockElementFace.class));
+                final Direction fz8 = this.getFacing(entry7.getKey());
+                map4.put(fz8, jsonDeserializationContext.<BlockElementFace>deserialize(entry7.getValue(), BlockElementFace.class));
             }
             return map4;
         }
         
         private Direction getFacing(final String string) {
-            final Direction fp3 = Direction.byName(string);
-            if (fp3 == null) {
+            final Direction fz3 = Direction.byName(string);
+            if (fz3 == null) {
                 throw new JsonParseException("Unknown facing: " + string);
             }
-            return fp3;
+            return fz3;
         }
         
         private Vector3f getTo(final JsonObject jsonObject) {
-            final Vector3f e3 = this.getVector3f(jsonObject, "to");
-            if (e3.x() < -16.0f || e3.y() < -16.0f || e3.z() < -16.0f || e3.x() > 32.0f || e3.y() > 32.0f || e3.z() > 32.0f) {
-                throw new JsonParseException("'to' specifier exceeds the allowed boundaries: " + e3);
+            final Vector3f g3 = this.getVector3f(jsonObject, "to");
+            if (g3.x() < -16.0f || g3.y() < -16.0f || g3.z() < -16.0f || g3.x() > 32.0f || g3.y() > 32.0f || g3.z() > 32.0f) {
+                throw new JsonParseException("'to' specifier exceeds the allowed boundaries: " + g3);
             }
-            return e3;
+            return g3;
         }
         
         private Vector3f getFrom(final JsonObject jsonObject) {
-            final Vector3f e3 = this.getVector3f(jsonObject, "from");
-            if (e3.x() < -16.0f || e3.y() < -16.0f || e3.z() < -16.0f || e3.x() > 32.0f || e3.y() > 32.0f || e3.z() > 32.0f) {
-                throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + e3);
+            final Vector3f g3 = this.getVector3f(jsonObject, "from");
+            if (g3.x() < -16.0f || g3.y() < -16.0f || g3.z() < -16.0f || g3.x() > 32.0f || g3.y() > 32.0f || g3.z() > 32.0f) {
+                throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + g3);
             }
-            return e3;
+            return g3;
         }
         
         private Vector3f getVector3f(final JsonObject jsonObject, final String string) {
diff --git a/src/net/minecraft/client/renderer/block/model/BlockElementFace.java b/src/net/minecraft/client/renderer/block/model/BlockElementFace.java
index cd80b0d..d3404ff 100644
--- a/src/net/minecraft/client/renderer/block/model/BlockElementFace.java
+++ b/src/net/minecraft/client/renderer/block/model/BlockElementFace.java
@@ -16,11 +16,11 @@ public class BlockElementFace {
     public final String texture;
     public final BlockFaceUV uv;
     
-    public BlockElementFace(@Nullable final Direction fp, final int integer, final String string, final BlockFaceUV drr) {
-        this.cullForDirection = fp;
+    public BlockElementFace(@Nullable final Direction fz, final int integer, final String string, final BlockFaceUV ecx) {
+        this.cullForDirection = fz;
         this.tintIndex = integer;
         this.texture = string;
-        this.uv = drr;
+        this.uv = ecx;
     }
     
     public static class Deserializer implements JsonDeserializer<BlockElementFace> {
@@ -30,11 +30,11 @@ public class BlockElementFace {
         @Override
         public BlockElementFace deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             final JsonObject jsonObject5 = jsonElement.getAsJsonObject();
-            final Direction fp6 = this.getCullFacing(jsonObject5);
+            final Direction fz6 = this.getCullFacing(jsonObject5);
             final int integer7 = this.getTintIndex(jsonObject5);
             final String string8 = this.getTexture(jsonObject5);
-            final BlockFaceUV drr9 = jsonDeserializationContext.<BlockFaceUV>deserialize(jsonObject5, BlockFaceUV.class);
-            return new BlockElementFace(fp6, integer7, string8, drr9);
+            final BlockFaceUV ecx9 = jsonDeserializationContext.<BlockFaceUV>deserialize(jsonObject5, BlockFaceUV.class);
+            return new BlockElementFace(fz6, integer7, string8, ecx9);
         }
         
         protected int getTintIndex(final JsonObject jsonObject) {
diff --git a/src/net/minecraft/client/renderer/block/model/BlockElementRotation.java b/src/net/minecraft/client/renderer/block/model/BlockElementRotation.java
index 1ad08e6..04ceb43 100644
--- a/src/net/minecraft/client/renderer/block/model/BlockElementRotation.java
+++ b/src/net/minecraft/client/renderer/block/model/BlockElementRotation.java
@@ -9,8 +9,8 @@ public class BlockElementRotation {
     public final float angle;
     public final boolean rescale;
     
-    public BlockElementRotation(final Vector3f e, final Direction.Axis a, final float float3, final boolean boolean4) {
-        this.origin = e;
+    public BlockElementRotation(final Vector3f g, final Direction.Axis a, final float float3, final boolean boolean4) {
+        this.origin = g;
         this.axis = a;
         this.angle = float3;
         this.rescale = boolean4;
diff --git a/src/net/minecraft/client/renderer/block/model/BlockModel.java b/src/net/minecraft/client/renderer/block/model/BlockModel.java
index 9b7e102..73db781 100644
--- a/src/net/minecraft/client/renderer/block/model/BlockModel.java
+++ b/src/net/minecraft/client/renderer/block/model/BlockModel.java
@@ -72,14 +72,14 @@ public class BlockModel implements UnbakedModel {
         return fromStream(new StringReader(string));
     }
     
-    public BlockModel(@Nullable final ResourceLocation sm, final List<BlockElement> list2, final Map<String, Either<Material, String>> map, final boolean boolean4, @Nullable final GuiLight b, final ItemTransforms drz, final List<ItemOverride> list7) {
+    public BlockModel(@Nullable final ResourceLocation uh, final List<BlockElement> list2, final Map<String, Either<Material, String>> map, final boolean boolean4, @Nullable final GuiLight b, final ItemTransforms edf, final List<ItemOverride> list7) {
         this.name = "";
         this.elements = list2;
         this.hasAmbientOcclusion = boolean4;
         this.guiLight = b;
         this.textureMap = map;
-        this.parentLocation = sm;
-        this.transforms = drz;
+        this.parentLocation = uh;
+        this.transforms = edf;
         this.overrides = list7;
     }
     
@@ -111,18 +111,18 @@ public class BlockModel implements UnbakedModel {
         return this.overrides;
     }
     
-    private ItemOverrides getItemOverrides(final ModelBakery ebz, final BlockModel drs) {
+    private ItemOverrides getItemOverrides(final ModelBakery enl, final BlockModel ecy) {
         if (this.overrides.isEmpty()) {
             return ItemOverrides.EMPTY;
         }
-        return new ItemOverrides(ebz, drs, ebz::getModel, this.overrides);
+        return new ItemOverrides(enl, ecy, enl::getModel, this.overrides);
     }
     
     @Override
     public Collection<ResourceLocation> getDependencies() {
         final Set<ResourceLocation> set2 = Sets.newHashSet();
-        for (final ItemOverride drw4 : this.overrides) {
-            set2.add(drw4.getModel());
+        for (final ItemOverride edc4 : this.overrides) {
+            set2.add(edc4.getModel());
         }
         if (this.parentLocation != null) {
             set2.add(this.parentLocation);
@@ -133,44 +133,44 @@ public class BlockModel implements UnbakedModel {
     @Override
     public Collection<Material> getMaterials(final Function<ResourceLocation, UnbakedModel> function, final Set<Pair<String, String>> set) {
         final Set<UnbakedModel> set2 = Sets.newLinkedHashSet();
-        for (BlockModel drs5 = this; drs5.parentLocation != null && drs5.parent == null; drs5 = drs5.parent) {
-            set2.add(drs5);
-            UnbakedModel ecf6 = function.apply(drs5.parentLocation);
-            if (ecf6 == null) {
-                BlockModel.LOGGER.warn("No parent '{}' while loading model '{}'", this.parentLocation, drs5);
+        for (BlockModel ecy5 = this; ecy5.parentLocation != null && ecy5.parent == null; ecy5 = ecy5.parent) {
+            set2.add(ecy5);
+            UnbakedModel enr6 = function.apply(ecy5.parentLocation);
+            if (enr6 == null) {
+                BlockModel.LOGGER.warn("No parent '{}' while loading model '{}'", this.parentLocation, ecy5);
             }
-            if (set2.contains(ecf6)) {
-                BlockModel.LOGGER.warn("Found 'parent' loop while loading model '{}' in chain: {} -> {}", drs5, set2.stream().map(Object::toString).collect(Collectors.joining(" -> ")), this.parentLocation);
-                ecf6 = null;
+            if (set2.contains(enr6)) {
+                BlockModel.LOGGER.warn("Found 'parent' loop while loading model '{}' in chain: {} -> {}", ecy5, set2.stream().map(Object::toString).collect(Collectors.joining(" -> ")), this.parentLocation);
+                enr6 = null;
             }
-            if (ecf6 == null) {
-                drs5.parentLocation = ModelBakery.MISSING_MODEL_LOCATION;
-                ecf6 = function.apply(drs5.parentLocation);
+            if (enr6 == null) {
+                ecy5.parentLocation = ModelBakery.MISSING_MODEL_LOCATION;
+                enr6 = function.apply(ecy5.parentLocation);
             }
-            if (!(ecf6 instanceof BlockModel)) {
+            if (!(enr6 instanceof BlockModel)) {
                 throw new IllegalStateException("BlockModel parent has to be a block model.");
             }
-            drs5.parent = (BlockModel)ecf6;
+            ecy5.parent = (BlockModel)enr6;
         }
         final Set<Material> set3 = Sets.<Material>newHashSet(this.getMaterial("particle"));
-        for (final BlockElement dro8 : this.getElements()) {
-            for (final BlockElementFace drp10 : dro8.faces.values()) {
-                final Material eby11 = this.getMaterial(drp10.texture);
-                if (Objects.equals(eby11.texture(), MissingTextureAtlasSprite.getLocation())) {
-                    set.add((Pair<String, String>)Pair.of(drp10.texture, this.name));
+        for (final BlockElement ecu8 : this.getElements()) {
+            for (final BlockElementFace ecv10 : ecu8.faces.values()) {
+                final Material enk11 = this.getMaterial(ecv10.texture);
+                if (Objects.equals(enk11.texture(), MissingTextureAtlasSprite.getLocation())) {
+                    set.add((Pair<String, String>)Pair.of(ecv10.texture, this.name));
                 }
-                set3.add(eby11);
+                set3.add(enk11);
             }
         }
-        final UnbakedModel ecf7;
+        final UnbakedModel enr7;
         final Set set4;
-        this.overrides.forEach(drw -> {
-            ecf7 = function.apply(drw.getModel());
-            if (Objects.equals(ecf7, this)) {
+        this.overrides.forEach(edc -> {
+            enr7 = function.apply(edc.getModel());
+            if (Objects.equals(enr7, this)) {
                 return;
             }
             else {
-                set4.addAll(ecf7.getMaterials(function, set));
+                set4.addAll(enr7.getMaterials(function, set));
                 return;
             }
         });
@@ -181,33 +181,33 @@ public class BlockModel implements UnbakedModel {
     }
     
     @Override
-    public BakedModel bake(final ModelBakery ebz, final Function<Material, TextureAtlasSprite> function, final ModelState ecc, final ResourceLocation sm) {
-        return this.bake(ebz, this, function, ecc, sm, true);
+    public BakedModel bake(final ModelBakery enl, final Function<Material, TextureAtlasSprite> function, final ModelState eno, final ResourceLocation uh) {
+        return this.bake(enl, this, function, eno, uh, true);
     }
     
-    public BakedModel bake(final ModelBakery ebz, final BlockModel drs, final Function<Material, TextureAtlasSprite> function, final ModelState ecc, final ResourceLocation sm, final boolean boolean6) {
-        final TextureAtlasSprite eaj8 = function.apply(this.getMaterial("particle"));
+    public BakedModel bake(final ModelBakery enl, final BlockModel ecy, final Function<Material, TextureAtlasSprite> function, final ModelState eno, final ResourceLocation uh, final boolean boolean6) {
+        final TextureAtlasSprite elv8 = function.apply(this.getMaterial("particle"));
         if (this.getRootModel() == ModelBakery.BLOCK_ENTITY_MARKER) {
-            return new BuiltInModel(this.getTransforms(), this.getItemOverrides(ebz, drs), eaj8, this.getGuiLight().lightLikeBlock());
+            return new BuiltInModel(this.getTransforms(), this.getItemOverrides(enl, ecy), elv8, this.getGuiLight().lightLikeBlock());
         }
-        final SimpleBakedModel.Builder a9 = new SimpleBakedModel.Builder(this, this.getItemOverrides(ebz, drs), boolean6).particle(eaj8);
-        for (final BlockElement dro11 : this.getElements()) {
-            for (final Direction fp13 : dro11.faces.keySet()) {
-                final BlockElementFace drp14 = dro11.faces.get(fp13);
-                final TextureAtlasSprite eaj9 = function.apply(this.getMaterial(drp14.texture));
-                if (drp14.cullForDirection == null) {
-                    a9.addUnculledFace(bakeFace(dro11, drp14, eaj9, fp13, ecc, sm));
+        final SimpleBakedModel.Builder a9 = new SimpleBakedModel.Builder(this, this.getItemOverrides(enl, ecy), boolean6).particle(elv8);
+        for (final BlockElement ecu11 : this.getElements()) {
+            for (final Direction fz13 : ecu11.faces.keySet()) {
+                final BlockElementFace ecv14 = ecu11.faces.get(fz13);
+                final TextureAtlasSprite elv9 = function.apply(this.getMaterial(ecv14.texture));
+                if (ecv14.cullForDirection == null) {
+                    a9.addUnculledFace(bakeFace(ecu11, ecv14, elv9, fz13, eno, uh));
                 }
                 else {
-                    a9.addCulledFace(Direction.rotate(ecc.getRotation().getMatrix(), drp14.cullForDirection), bakeFace(dro11, drp14, eaj9, fp13, ecc, sm));
+                    a9.addCulledFace(Direction.rotate(eno.getRotation().getMatrix(), ecv14.cullForDirection), bakeFace(ecu11, ecv14, elv9, fz13, eno, uh));
                 }
             }
         }
         return a9.build();
     }
     
-    private static BakedQuad bakeFace(final BlockElement dro, final BlockElementFace drp, final TextureAtlasSprite eaj, final Direction fp, final ModelState ecc, final ResourceLocation sm) {
-        return BlockModel.FACE_BAKERY.bakeQuad(dro.from, dro.to, drp, eaj, fp, ecc, dro.rotation, dro.shade, sm);
+    private static BakedQuad bakeFace(final BlockElement ecu, final BlockElementFace ecv, final TextureAtlasSprite elv, final Direction fz, final ModelState eno, final ResourceLocation uh) {
+        return BlockModel.FACE_BAKERY.bakeQuad(ecu.from, ecu.to, ecv, elv, fz, eno, ecu.rotation, ecu.shade, uh);
     }
     
     public boolean hasTexture(final String string) {
@@ -235,8 +235,8 @@ public class BlockModel implements UnbakedModel {
     }
     
     private Either<Material, String> findTextureEntry(final String string) {
-        for (BlockModel drs3 = this; drs3 != null; drs3 = drs3.parent) {
-            final Either<Material, String> either4 = drs3.textureMap.get(string);
+        for (BlockModel ecy3 = this; ecy3 != null; ecy3 = ecy3.parent) {
+            final Either<Material, String> either4 = ecy3.textureMap.get(string);
             if (either4 != null) {
                 return either4;
             }
@@ -253,15 +253,15 @@ public class BlockModel implements UnbakedModel {
     }
     
     public ItemTransforms getTransforms() {
-        final ItemTransform dry2 = this.getTransform(ItemTransforms.TransformType.THIRD_PERSON_LEFT_HAND);
-        final ItemTransform dry3 = this.getTransform(ItemTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
-        final ItemTransform dry4 = this.getTransform(ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND);
-        final ItemTransform dry5 = this.getTransform(ItemTransforms.TransformType.FIRST_PERSON_RIGHT_HAND);
-        final ItemTransform dry6 = this.getTransform(ItemTransforms.TransformType.HEAD);
-        final ItemTransform dry7 = this.getTransform(ItemTransforms.TransformType.GUI);
-        final ItemTransform dry8 = this.getTransform(ItemTransforms.TransformType.GROUND);
-        final ItemTransform dry9 = this.getTransform(ItemTransforms.TransformType.FIXED);
-        return new ItemTransforms(dry2, dry3, dry4, dry5, dry6, dry7, dry8, dry9);
+        final ItemTransform ede2 = this.getTransform(ItemTransforms.TransformType.THIRD_PERSON_LEFT_HAND);
+        final ItemTransform ede3 = this.getTransform(ItemTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
+        final ItemTransform ede4 = this.getTransform(ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND);
+        final ItemTransform ede5 = this.getTransform(ItemTransforms.TransformType.FIRST_PERSON_RIGHT_HAND);
+        final ItemTransform ede6 = this.getTransform(ItemTransforms.TransformType.HEAD);
+        final ItemTransform ede7 = this.getTransform(ItemTransforms.TransformType.GUI);
+        final ItemTransform ede8 = this.getTransform(ItemTransforms.TransformType.GROUND);
+        final ItemTransform ede9 = this.getTransform(ItemTransforms.TransformType.FIXED);
+        return new ItemTransforms(ede2, ede3, ede4, ede5, ede6, ede7, ede8, ede9);
     }
     
     private ItemTransform getTransform(final ItemTransforms.TransformType b) {
@@ -290,18 +290,18 @@ public class BlockModel implements UnbakedModel {
             final String string7 = this.getParentName(jsonObject5);
             final Map<String, Either<Material, String>> map8 = this.getTextureMap(jsonObject5);
             final boolean boolean9 = this.getAmbientOcclusion(jsonObject5);
-            ItemTransforms drz10 = ItemTransforms.NO_TRANSFORMS;
+            ItemTransforms edf10 = ItemTransforms.NO_TRANSFORMS;
             if (jsonObject5.has("display")) {
                 final JsonObject jsonObject6 = GsonHelper.getAsJsonObject(jsonObject5, "display");
-                drz10 = jsonDeserializationContext.<ItemTransforms>deserialize(jsonObject6, ItemTransforms.class);
+                edf10 = jsonDeserializationContext.<ItemTransforms>deserialize(jsonObject6, ItemTransforms.class);
             }
             final List<ItemOverride> list7 = this.getOverrides(jsonDeserializationContext, jsonObject5);
             GuiLight b12 = null;
             if (jsonObject5.has("gui_light")) {
                 b12 = GuiLight.getByName(GsonHelper.getAsString(jsonObject5, "gui_light"));
             }
-            final ResourceLocation sm13 = string7.isEmpty() ? null : new ResourceLocation(string7);
-            return new BlockModel(sm13, list6, map8, boolean9, b12, drz10, list7);
+            final ResourceLocation uh13 = string7.isEmpty() ? null : new ResourceLocation(string7);
+            return new BlockModel(uh13, list6, map8, boolean9, b12, edf10, list7);
         }
         
         protected List<ItemOverride> getOverrides(final JsonDeserializationContext jsonDeserializationContext, final JsonObject jsonObject) {
@@ -316,26 +316,26 @@ public class BlockModel implements UnbakedModel {
         }
         
         private Map<String, Either<Material, String>> getTextureMap(final JsonObject jsonObject) {
-            final ResourceLocation sm3 = TextureAtlas.LOCATION_BLOCKS;
+            final ResourceLocation uh3 = TextureAtlas.LOCATION_BLOCKS;
             final Map<String, Either<Material, String>> map4 = Maps.newHashMap();
             if (jsonObject.has("textures")) {
                 final JsonObject jsonObject2 = GsonHelper.getAsJsonObject(jsonObject, "textures");
                 for (final Map.Entry<String, JsonElement> entry7 : jsonObject2.entrySet()) {
-                    map4.put(entry7.getKey(), parseTextureLocationOrReference(sm3, entry7.getValue().getAsString()));
+                    map4.put(entry7.getKey(), parseTextureLocationOrReference(uh3, entry7.getValue().getAsString()));
                 }
             }
             return map4;
         }
         
-        private static Either<Material, String> parseTextureLocationOrReference(final ResourceLocation sm, final String string) {
+        private static Either<Material, String> parseTextureLocationOrReference(final ResourceLocation uh, final String string) {
             if (isTextureReference(string)) {
                 return (Either<Material, String>)Either.right(string.substring(1));
             }
-            final ResourceLocation sm2 = ResourceLocation.tryParse(string);
-            if (sm2 == null) {
+            final ResourceLocation uh2 = ResourceLocation.tryParse(string);
+            if (uh2 == null) {
                 throw new JsonParseException(string + " is not valid resource location");
             }
-            return (Either<Material, String>)Either.left(new Material(sm, sm2));
+            return (Either<Material, String>)Either.left(new Material(uh, uh2));
         }
         
         private String getParentName(final JsonObject jsonObject) {
diff --git a/src/net/minecraft/client/renderer/block/model/BlockModelDefinition.java b/src/net/minecraft/client/renderer/block/model/BlockModelDefinition.java
index be0b369..9403703 100644
--- a/src/net/minecraft/client/renderer/block/model/BlockModelDefinition.java
+++ b/src/net/minecraft/client/renderer/block/model/BlockModelDefinition.java
@@ -30,24 +30,24 @@ public class BlockModelDefinition {
         return GsonHelper.<BlockModelDefinition>fromJson(a.gson, reader, BlockModelDefinition.class);
     }
     
-    public BlockModelDefinition(final Map<String, MultiVariant> map, final MultiPart dsf) {
+    public BlockModelDefinition(final Map<String, MultiVariant> map, final MultiPart edl) {
         this.variants = Maps.newLinkedHashMap();
-        this.multiPart = dsf;
+        this.multiPart = edl;
         this.variants.putAll(map);
     }
     
     public BlockModelDefinition(final List<BlockModelDefinition> list) {
         this.variants = Maps.newLinkedHashMap();
-        BlockModelDefinition drt3 = null;
-        for (final BlockModelDefinition drt4 : list) {
-            if (drt4.isMultiPart()) {
+        BlockModelDefinition ecz3 = null;
+        for (final BlockModelDefinition ecz4 : list) {
+            if (ecz4.isMultiPart()) {
                 this.variants.clear();
-                drt3 = drt4;
+                ecz3 = ecz4;
             }
-            this.variants.putAll(drt4.variants);
+            this.variants.putAll(ecz4.variants);
         }
-        if (drt3 != null) {
-            this.multiPart = drt3.multiPart;
+        if (ecz3 != null) {
+            this.multiPart = ecz3.multiPart;
         }
     }
     
@@ -57,9 +57,9 @@ public class BlockModelDefinition {
             return true;
         }
         if (object instanceof BlockModelDefinition) {
-            final BlockModelDefinition drt3 = (BlockModelDefinition)object;
-            if (this.variants.equals(drt3.variants)) {
-                return this.isMultiPart() ? this.multiPart.equals(drt3.multiPart) : (!drt3.isMultiPart());
+            final BlockModelDefinition ecz3 = (BlockModelDefinition)object;
+            if (this.variants.equals(ecz3.variants)) {
+                return this.isMultiPart() ? this.multiPart.equals(ecz3.multiPart) : (!ecz3.isMultiPart());
             }
         }
         return false;
@@ -94,8 +94,8 @@ public class BlockModelDefinition {
             return this.definition;
         }
         
-        public void setDefinition(final StateDefinition<Block, BlockState> byk) {
-            this.definition = byk;
+        public void setDefinition(final StateDefinition<Block, BlockState> cfk) {
+            this.definition = cfk;
         }
     }
     
@@ -104,11 +104,11 @@ public class BlockModelDefinition {
         public BlockModelDefinition deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             final JsonObject jsonObject5 = jsonElement.getAsJsonObject();
             final Map<String, MultiVariant> map6 = this.getVariants(jsonDeserializationContext, jsonObject5);
-            final MultiPart dsf7 = this.getMultiPart(jsonDeserializationContext, jsonObject5);
-            if (map6.isEmpty() && (dsf7 == null || dsf7.getMultiVariants().isEmpty())) {
+            final MultiPart edl7 = this.getMultiPart(jsonDeserializationContext, jsonObject5);
+            if (map6.isEmpty() && (edl7 == null || edl7.getMultiVariants().isEmpty())) {
                 throw new JsonParseException("Neither 'variants' nor 'multipart' found");
             }
-            return new BlockModelDefinition(map6, dsf7);
+            return new BlockModelDefinition(map6, edl7);
         }
         
         protected Map<String, MultiVariant> getVariants(final JsonDeserializationContext jsonDeserializationContext, final JsonObject jsonObject) {
diff --git a/src/net/minecraft/client/renderer/block/model/FaceBakery.java b/src/net/minecraft/client/renderer/block/model/FaceBakery.java
index 56832b0..cb58f8d 100644
--- a/src/net/minecraft/client/renderer/block/model/FaceBakery.java
+++ b/src/net/minecraft/client/renderer/block/model/FaceBakery.java
@@ -20,43 +20,43 @@ public class FaceBakery {
     private static final float RESCALE_22_5;
     private static final float RESCALE_45;
     
-    public BakedQuad bakeQuad(final Vector3f e1, final Vector3f e2, final BlockElementFace drp, final TextureAtlasSprite eaj, final Direction fp, final ModelState ecc, @Nullable final BlockElementRotation drq, final boolean boolean8, final ResourceLocation sm) {
-        BlockFaceUV drr11 = drp.uv;
-        if (ecc.isUvLocked()) {
-            drr11 = recomputeUVs(drp.uv, fp, ecc.getRotation(), sm);
+    public BakedQuad bakeQuad(final Vector3f g1, final Vector3f g2, final BlockElementFace ecv, final TextureAtlasSprite elv, final Direction fz, final ModelState eno, @Nullable final BlockElementRotation ecw, final boolean boolean8, final ResourceLocation uh) {
+        BlockFaceUV ecx11 = ecv.uv;
+        if (eno.isUvLocked()) {
+            ecx11 = recomputeUVs(ecv.uv, fz, eno.getRotation(), uh);
         }
-        final float[] arr12 = new float[drr11.uvs.length];
-        System.arraycopy(drr11.uvs, 0, arr12, 0, arr12.length);
-        final float float13 = eaj.uvShrinkRatio();
-        final float float14 = (drr11.uvs[0] + drr11.uvs[0] + drr11.uvs[2] + drr11.uvs[2]) / 4.0f;
-        final float float15 = (drr11.uvs[1] + drr11.uvs[1] + drr11.uvs[3] + drr11.uvs[3]) / 4.0f;
-        drr11.uvs[0] = Mth.lerp(float13, drr11.uvs[0], float14);
-        drr11.uvs[2] = Mth.lerp(float13, drr11.uvs[2], float14);
-        drr11.uvs[1] = Mth.lerp(float13, drr11.uvs[1], float15);
-        drr11.uvs[3] = Mth.lerp(float13, drr11.uvs[3], float15);
-        final int[] arr13 = this.makeVertices(drr11, eaj, fp, this.setupShape(e1, e2), ecc.getRotation(), drq, boolean8);
-        final Direction fp2 = calculateFacing(arr13);
-        System.arraycopy(arr12, 0, drr11.uvs, 0, arr12.length);
-        if (drq == null) {
-            this.recalculateWinding(arr13, fp2);
+        final float[] arr12 = new float[ecx11.uvs.length];
+        System.arraycopy(ecx11.uvs, 0, arr12, 0, arr12.length);
+        final float float13 = elv.uvShrinkRatio();
+        final float float14 = (ecx11.uvs[0] + ecx11.uvs[0] + ecx11.uvs[2] + ecx11.uvs[2]) / 4.0f;
+        final float float15 = (ecx11.uvs[1] + ecx11.uvs[1] + ecx11.uvs[3] + ecx11.uvs[3]) / 4.0f;
+        ecx11.uvs[0] = Mth.lerp(float13, ecx11.uvs[0], float14);
+        ecx11.uvs[2] = Mth.lerp(float13, ecx11.uvs[2], float14);
+        ecx11.uvs[1] = Mth.lerp(float13, ecx11.uvs[1], float15);
+        ecx11.uvs[3] = Mth.lerp(float13, ecx11.uvs[3], float15);
+        final int[] arr13 = this.makeVertices(ecx11, elv, fz, this.setupShape(g1, g2), eno.getRotation(), ecw, boolean8);
+        final Direction fz2 = calculateFacing(arr13);
+        System.arraycopy(arr12, 0, ecx11.uvs, 0, arr12.length);
+        if (ecw == null) {
+            this.recalculateWinding(arr13, fz2);
         }
-        return new BakedQuad(arr13, drp.tintIndex, fp2, eaj);
+        return new BakedQuad(arr13, ecv.tintIndex, fz2, elv, boolean8);
     }
     
-    public static BlockFaceUV recomputeUVs(final BlockFaceUV drr, final Direction fp, final Transformation d, final ResourceLocation sm) {
-        final Matrix4f b5 = BlockMath.getUVLockTransform(d, fp, () -> "Unable to resolve UVLock for model: " + sm).getMatrix();
-        final float float6 = drr.getU(drr.getReverseIndex(0));
-        final float float7 = drr.getV(drr.getReverseIndex(0));
-        final Vector4f f8 = new Vector4f(float6 / 16.0f, float7 / 16.0f, 0.0f, 1.0f);
-        f8.transform(b5);
-        final float float8 = 16.0f * f8.x();
-        final float float9 = 16.0f * f8.y();
-        final float float10 = drr.getU(drr.getReverseIndex(2));
-        final float float11 = drr.getV(drr.getReverseIndex(2));
-        final Vector4f f9 = new Vector4f(float10 / 16.0f, float11 / 16.0f, 0.0f, 1.0f);
-        f9.transform(b5);
-        final float float12 = 16.0f * f9.x();
-        final float float13 = 16.0f * f9.y();
+    public static BlockFaceUV recomputeUVs(final BlockFaceUV ecx, final Direction fz, final Transformation f, final ResourceLocation uh) {
+        final Matrix4f b5 = BlockMath.getUVLockTransform(f, fz, () -> "Unable to resolve UVLock for model: " + uh).getMatrix();
+        final float float6 = ecx.getU(ecx.getReverseIndex(0));
+        final float float7 = ecx.getV(ecx.getReverseIndex(0));
+        final Vector4f h8 = new Vector4f(float6 / 16.0f, float7 / 16.0f, 0.0f, 1.0f);
+        h8.transform(b5);
+        final float float8 = 16.0f * h8.x();
+        final float float9 = 16.0f * h8.y();
+        final float float10 = ecx.getU(ecx.getReverseIndex(2));
+        final float float11 = ecx.getV(ecx.getReverseIndex(2));
+        final Vector4f h9 = new Vector4f(float10 / 16.0f, float11 / 16.0f, 0.0f, 1.0f);
+        h9.transform(b5);
+        final float float12 = 16.0f * h9.x();
+        final float float13 = 16.0f * h9.y();
         float float14;
         float float15;
         if (Math.signum(float10 - float6) == Math.signum(float12 - float8)) {
@@ -77,166 +77,136 @@ public class FaceBakery {
             float16 = float13;
             float17 = float9;
         }
-        final float float18 = (float)Math.toRadians(drr.rotation);
-        final Vector3f e21 = new Vector3f(Mth.cos(float18), Mth.sin(float18), 0.0f);
+        final float float18 = (float)Math.toRadians(ecx.rotation);
+        final Vector3f g21 = new Vector3f(Mth.cos(float18), Mth.sin(float18), 0.0f);
         final Matrix3f a22 = new Matrix3f(b5);
-        e21.transform(a22);
-        final int integer23 = Math.floorMod(-(int)Math.round(Math.toDegrees(Math.atan2(e21.y(), e21.x())) / 90.0) * 90, 360);
+        g21.transform(a22);
+        final int integer23 = Math.floorMod(-(int)Math.round(Math.toDegrees(Math.atan2(g21.y(), g21.x())) / 90.0) * 90, 360);
         return new BlockFaceUV(new float[] { float14, float16, float15, float17 }, integer23);
     }
     
-    private int[] makeVertices(final BlockFaceUV drr, final TextureAtlasSprite eaj, final Direction fp, final float[] arr, final Transformation d, @Nullable final BlockElementRotation drq, final boolean boolean7) {
+    private int[] makeVertices(final BlockFaceUV ecx, final TextureAtlasSprite elv, final Direction fz, final float[] arr, final Transformation f, @Nullable final BlockElementRotation ecw, final boolean boolean7) {
         final int[] arr2 = new int[32];
         for (int integer10 = 0; integer10 < 4; ++integer10) {
-            this.bakeVertex(arr2, integer10, fp, drr, arr, eaj, d, drq, boolean7);
+            this.bakeVertex(arr2, integer10, fz, ecx, arr, elv, f, ecw, boolean7);
         }
         return arr2;
     }
     
-    private int getShadeValue(final Direction fp) {
-        final float float3 = this.getShade(fp);
-        final int integer4 = Mth.clamp((int)(float3 * 255.0f), 0, 255);
-        return 0xFF000000 | integer4 << 16 | integer4 << 8 | integer4;
-    }
-    
-    private float getShade(final Direction fp) {
-        switch (fp) {
-            case DOWN: {
-                return 0.5f;
-            }
-            case UP: {
-                return 1.0f;
-            }
-            case NORTH:
-            case SOUTH: {
-                return 0.8f;
-            }
-            case WEST:
-            case EAST: {
-                return 0.6f;
-            }
-            default: {
-                return 1.0f;
-            }
-        }
-    }
-    
-    private float[] setupShape(final Vector3f e1, final Vector3f e2) {
+    private float[] setupShape(final Vector3f g1, final Vector3f g2) {
         final float[] arr4 = new float[Direction.values().length];
-        arr4[FaceInfo.Constants.MIN_X] = e1.x() / 16.0f;
-        arr4[FaceInfo.Constants.MIN_Y] = e1.y() / 16.0f;
-        arr4[FaceInfo.Constants.MIN_Z] = e1.z() / 16.0f;
-        arr4[FaceInfo.Constants.MAX_X] = e2.x() / 16.0f;
-        arr4[FaceInfo.Constants.MAX_Y] = e2.y() / 16.0f;
-        arr4[FaceInfo.Constants.MAX_Z] = e2.z() / 16.0f;
+        arr4[FaceInfo.Constants.MIN_X] = g1.x() / 16.0f;
+        arr4[FaceInfo.Constants.MIN_Y] = g1.y() / 16.0f;
+        arr4[FaceInfo.Constants.MIN_Z] = g1.z() / 16.0f;
+        arr4[FaceInfo.Constants.MAX_X] = g2.x() / 16.0f;
+        arr4[FaceInfo.Constants.MAX_Y] = g2.y() / 16.0f;
+        arr4[FaceInfo.Constants.MAX_Z] = g2.z() / 16.0f;
         return arr4;
     }
     
-    private void bakeVertex(final int[] arr, final int integer, final Direction fp, final BlockFaceUV drr, final float[] arr, final TextureAtlasSprite eaj, final Transformation d, @Nullable final BlockElementRotation drq, final boolean boolean9) {
-        final Direction fp2 = Direction.rotate(d.getMatrix(), fp);
-        final int integer2 = boolean9 ? this.getShadeValue(fp2) : -1;
-        final FaceInfo.VertexInfo b13 = FaceInfo.fromFacing(fp).getVertexInfo(integer);
-        final Vector3f e14 = new Vector3f(arr[b13.xFace], arr[b13.yFace], arr[b13.zFace]);
-        this.applyElementRotation(e14, drq);
-        this.applyModelRotation(e14, d);
-        this.fillVertex(arr, integer, e14, integer2, eaj, drr);
+    private void bakeVertex(final int[] arr, final int integer, final Direction fz, final BlockFaceUV ecx, final float[] arr, final TextureAtlasSprite elv, final Transformation f, @Nullable final BlockElementRotation ecw, final boolean boolean9) {
+        final FaceInfo.VertexInfo b11 = FaceInfo.fromFacing(fz).getVertexInfo(integer);
+        final Vector3f g12 = new Vector3f(arr[b11.xFace], arr[b11.yFace], arr[b11.zFace]);
+        this.applyElementRotation(g12, ecw);
+        this.applyModelRotation(g12, f);
+        this.fillVertex(arr, integer, g12, elv, ecx);
     }
     
-    private void fillVertex(final int[] arr, final int integer2, final Vector3f e, final int integer4, final TextureAtlasSprite eaj, final BlockFaceUV drr) {
-        final int integer5 = integer2 * 8;
-        arr[integer5] = Float.floatToRawIntBits(e.x());
-        arr[integer5 + 1] = Float.floatToRawIntBits(e.y());
-        arr[integer5 + 2] = Float.floatToRawIntBits(e.z());
-        arr[integer5 + 3] = integer4;
-        arr[integer5 + 4] = Float.floatToRawIntBits(eaj.getU(drr.getU(integer2)));
-        arr[integer5 + 4 + 1] = Float.floatToRawIntBits(eaj.getV(drr.getV(integer2)));
+    private void fillVertex(final int[] arr, final int integer, final Vector3f g, final TextureAtlasSprite elv, final BlockFaceUV ecx) {
+        final int integer2 = integer * 8;
+        arr[integer2] = Float.floatToRawIntBits(g.x());
+        arr[integer2 + 1] = Float.floatToRawIntBits(g.y());
+        arr[integer2 + 2] = Float.floatToRawIntBits(g.z());
+        arr[integer2 + 3] = -1;
+        arr[integer2 + 4] = Float.floatToRawIntBits(elv.getU(ecx.getU(integer)));
+        arr[integer2 + 4 + 1] = Float.floatToRawIntBits(elv.getV(ecx.getV(integer)));
     }
     
-    private void applyElementRotation(final Vector3f e, @Nullable final BlockElementRotation drq) {
-        if (drq == null) {
+    private void applyElementRotation(final Vector3f g, @Nullable final BlockElementRotation ecw) {
+        if (ecw == null) {
             return;
         }
-        Vector3f e2 = null;
-        Vector3f e3 = null;
-        switch (drq.axis) {
+        Vector3f g2 = null;
+        Vector3f g3 = null;
+        switch (ecw.axis) {
             case X: {
-                e2 = new Vector3f(1.0f, 0.0f, 0.0f);
-                e3 = new Vector3f(0.0f, 1.0f, 1.0f);
+                g2 = new Vector3f(1.0f, 0.0f, 0.0f);
+                g3 = new Vector3f(0.0f, 1.0f, 1.0f);
                 break;
             }
             case Y: {
-                e2 = new Vector3f(0.0f, 1.0f, 0.0f);
-                e3 = new Vector3f(1.0f, 0.0f, 1.0f);
+                g2 = new Vector3f(0.0f, 1.0f, 0.0f);
+                g3 = new Vector3f(1.0f, 0.0f, 1.0f);
                 break;
             }
             case Z: {
-                e2 = new Vector3f(0.0f, 0.0f, 1.0f);
-                e3 = new Vector3f(1.0f, 1.0f, 0.0f);
+                g2 = new Vector3f(0.0f, 0.0f, 1.0f);
+                g3 = new Vector3f(1.0f, 1.0f, 0.0f);
                 break;
             }
             default: {
                 throw new IllegalArgumentException("There are only 3 axes");
             }
         }
-        final Quaternion c6 = new Quaternion(e2, drq.angle, true);
-        if (drq.rescale) {
-            if (Math.abs(drq.angle) == 22.5f) {
-                e3.mul(FaceBakery.RESCALE_22_5);
+        final Quaternion d6 = new Quaternion(g2, ecw.angle, true);
+        if (ecw.rescale) {
+            if (Math.abs(ecw.angle) == 22.5f) {
+                g3.mul(FaceBakery.RESCALE_22_5);
             }
             else {
-                e3.mul(FaceBakery.RESCALE_45);
+                g3.mul(FaceBakery.RESCALE_45);
             }
-            e3.add(1.0f, 1.0f, 1.0f);
+            g3.add(1.0f, 1.0f, 1.0f);
         }
         else {
-            e3.set(1.0f, 1.0f, 1.0f);
+            g3.set(1.0f, 1.0f, 1.0f);
         }
-        this.rotateVertexBy(e, drq.origin.copy(), new Matrix4f(c6), e3);
+        this.rotateVertexBy(g, ecw.origin.copy(), new Matrix4f(d6), g3);
     }
     
-    public void applyModelRotation(final Vector3f e, final Transformation d) {
-        if (d == Transformation.identity()) {
+    public void applyModelRotation(final Vector3f g, final Transformation f) {
+        if (f == Transformation.identity()) {
             return;
         }
-        this.rotateVertexBy(e, new Vector3f(0.5f, 0.5f, 0.5f), d.getMatrix(), new Vector3f(1.0f, 1.0f, 1.0f));
+        this.rotateVertexBy(g, new Vector3f(0.5f, 0.5f, 0.5f), f.getMatrix(), new Vector3f(1.0f, 1.0f, 1.0f));
     }
     
-    private void rotateVertexBy(final Vector3f e1, final Vector3f e2, final Matrix4f b, final Vector3f e4) {
-        final Vector4f f6 = new Vector4f(e1.x() - e2.x(), e1.y() - e2.y(), e1.z() - e2.z(), 1.0f);
-        f6.transform(b);
-        f6.mul(e4);
-        e1.set(f6.x() + e2.x(), f6.y() + e2.y(), f6.z() + e2.z());
+    private void rotateVertexBy(final Vector3f g1, final Vector3f g2, final Matrix4f b, final Vector3f g4) {
+        final Vector4f h6 = new Vector4f(g1.x() - g2.x(), g1.y() - g2.y(), g1.z() - g2.z(), 1.0f);
+        h6.transform(b);
+        h6.mul(g4);
+        g1.set(h6.x() + g2.x(), h6.y() + g2.y(), h6.z() + g2.z());
     }
     
     public static Direction calculateFacing(final int[] arr) {
-        final Vector3f e2 = new Vector3f(Float.intBitsToFloat(arr[0]), Float.intBitsToFloat(arr[1]), Float.intBitsToFloat(arr[2]));
-        final Vector3f e3 = new Vector3f(Float.intBitsToFloat(arr[8]), Float.intBitsToFloat(arr[9]), Float.intBitsToFloat(arr[10]));
-        final Vector3f e4 = new Vector3f(Float.intBitsToFloat(arr[16]), Float.intBitsToFloat(arr[17]), Float.intBitsToFloat(arr[18]));
-        final Vector3f e5 = e2.copy();
-        e5.sub(e3);
-        final Vector3f e6 = e4.copy();
-        e6.sub(e3);
-        final Vector3f e7 = e6.copy();
-        e7.cross(e5);
-        e7.normalize();
-        Direction fp8 = null;
+        final Vector3f g2 = new Vector3f(Float.intBitsToFloat(arr[0]), Float.intBitsToFloat(arr[1]), Float.intBitsToFloat(arr[2]));
+        final Vector3f g3 = new Vector3f(Float.intBitsToFloat(arr[8]), Float.intBitsToFloat(arr[9]), Float.intBitsToFloat(arr[10]));
+        final Vector3f g4 = new Vector3f(Float.intBitsToFloat(arr[16]), Float.intBitsToFloat(arr[17]), Float.intBitsToFloat(arr[18]));
+        final Vector3f g5 = g2.copy();
+        g5.sub(g3);
+        final Vector3f g6 = g4.copy();
+        g6.sub(g3);
+        final Vector3f g7 = g6.copy();
+        g7.cross(g5);
+        g7.normalize();
+        Direction fz8 = null;
         float float9 = 0.0f;
-        for (final Direction fp9 : Direction.values()) {
-            final Vec3i gg14 = fp9.getNormal();
-            final Vector3f e8 = new Vector3f((float)gg14.getX(), (float)gg14.getY(), (float)gg14.getZ());
-            final float float10 = e7.dot(e8);
+        for (final Direction fz9 : Direction.values()) {
+            final Vec3i gr14 = fz9.getNormal();
+            final Vector3f g8 = new Vector3f((float)gr14.getX(), (float)gr14.getY(), (float)gr14.getZ());
+            final float float10 = g7.dot(g8);
             if (float10 >= 0.0f && float10 > float9) {
                 float9 = float10;
-                fp8 = fp9;
+                fz8 = fz9;
             }
         }
-        if (fp8 == null) {
+        if (fz8 == null) {
             return Direction.UP;
         }
-        return fp8;
+        return fz8;
     }
     
-    private void recalculateWinding(final int[] arr, final Direction fp) {
+    private void recalculateWinding(final int[] arr, final Direction fz) {
         final int[] arr2 = new int[arr.length];
         System.arraycopy(arr, 0, arr2, 0, arr.length);
         final float[] arr3 = new float[Direction.values().length];
@@ -270,10 +240,10 @@ public class FaceBakery {
                 arr3[FaceInfo.Constants.MAX_Z] = float10;
             }
         }
-        final FaceInfo dql6 = FaceInfo.fromFacing(fp);
+        final FaceInfo ebq6 = FaceInfo.fromFacing(fz);
         for (int integer7 = 0; integer7 < 4; ++integer7) {
             final int integer8 = 8 * integer7;
-            final FaceInfo.VertexInfo b9 = dql6.getVertexInfo(integer7);
+            final FaceInfo.VertexInfo b9 = ebq6.getVertexInfo(integer7);
             final float float10 = arr3[b9.xFace];
             final float float11 = arr3[b9.yFace];
             final float float12 = arr3[b9.zFace];
diff --git a/src/net/minecraft/client/renderer/block/model/ItemModelGenerator.java b/src/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
index 493d056..1f0005a 100644
--- a/src/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
+++ b/src/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
@@ -17,40 +17,40 @@ import java.util.List;
 public class ItemModelGenerator {
     public static final List<String> LAYERS;
     
-    public BlockModel generateBlockModel(final Function<Material, TextureAtlasSprite> function, final BlockModel drs) {
+    public BlockModel generateBlockModel(final Function<Material, TextureAtlasSprite> function, final BlockModel ecy) {
         final Map<String, Either<Material, String>> map4 = Maps.newHashMap();
         final List<BlockElement> list5 = Lists.newArrayList();
         for (int integer6 = 0; integer6 < ItemModelGenerator.LAYERS.size(); ++integer6) {
             final String string7 = ItemModelGenerator.LAYERS.get(integer6);
-            if (!drs.hasTexture(string7)) {
+            if (!ecy.hasTexture(string7)) {
                 break;
             }
-            final Material eby8 = drs.getMaterial(string7);
-            map4.put(string7, (Either<Material, String>)Either.left(eby8));
-            final TextureAtlasSprite eaj9 = function.apply(eby8);
-            list5.addAll(this.processFrames(integer6, string7, eaj9));
+            final Material enk8 = ecy.getMaterial(string7);
+            map4.put(string7, (Either<Material, String>)Either.left(enk8));
+            final TextureAtlasSprite elv9 = function.apply(enk8);
+            list5.addAll(this.processFrames(integer6, string7, elv9));
         }
-        map4.put("particle", (Either<Material, String>)(drs.hasTexture("particle") ? Either.left(drs.getMaterial("particle")) : ((Either<Material, String>)map4.get("layer0"))));
-        final BlockModel drs2 = new BlockModel(null, list5, map4, false, drs.getGuiLight(), drs.getTransforms(), drs.getOverrides());
-        drs2.name = drs.name;
-        return drs2;
+        map4.put("particle", (Either<Material, String>)(ecy.hasTexture("particle") ? Either.left(ecy.getMaterial("particle")) : ((Either<Material, String>)map4.get("layer0"))));
+        final BlockModel ecy2 = new BlockModel(null, list5, map4, false, ecy.getGuiLight(), ecy.getTransforms(), ecy.getOverrides());
+        ecy2.name = ecy.name;
+        return ecy2;
     }
     
-    private List<BlockElement> processFrames(final int integer, final String string, final TextureAtlasSprite eaj) {
+    private List<BlockElement> processFrames(final int integer, final String string, final TextureAtlasSprite elv) {
         final Map<Direction, BlockElementFace> map5 = Maps.newHashMap();
         map5.put(Direction.SOUTH, new BlockElementFace(null, integer, string, new BlockFaceUV(new float[] { 0.0f, 0.0f, 16.0f, 16.0f }, 0)));
         map5.put(Direction.NORTH, new BlockElementFace(null, integer, string, new BlockFaceUV(new float[] { 16.0f, 0.0f, 0.0f, 16.0f }, 0)));
         final List<BlockElement> list6 = Lists.newArrayList();
         list6.add(new BlockElement(new Vector3f(0.0f, 0.0f, 7.5f), new Vector3f(16.0f, 16.0f, 8.5f), map5, null, true));
-        list6.addAll(this.createSideElements(eaj, string, integer));
+        list6.addAll(this.createSideElements(elv, string, integer));
         return list6;
     }
     
-    private List<BlockElement> createSideElements(final TextureAtlasSprite eaj, final String string, final int integer) {
-        final float float5 = (float)eaj.getWidth();
-        final float float6 = (float)eaj.getHeight();
+    private List<BlockElement> createSideElements(final TextureAtlasSprite elv, final String string, final int integer) {
+        final float float5 = (float)elv.getWidth();
+        final float float6 = (float)elv.getHeight();
         final List<BlockElement> list7 = Lists.newArrayList();
-        for (final Span a9 : this.getSpans(eaj)) {
+        for (final Span a9 : this.getSpans(elv)) {
             float float7 = 0.0f;
             float float8 = 0.0f;
             float float9 = 0.0f;
@@ -135,26 +135,26 @@ public class ItemModelGenerator {
         return list7;
     }
     
-    private List<Span> getSpans(final TextureAtlasSprite eaj) {
-        final int integer3 = eaj.getWidth();
-        final int integer4 = eaj.getHeight();
+    private List<Span> getSpans(final TextureAtlasSprite elv) {
+        final int integer3 = elv.getWidth();
+        final int integer4 = elv.getHeight();
         final List<Span> list5 = Lists.newArrayList();
-        for (int integer5 = 0; integer5 < eaj.getFrameCount(); ++integer5) {
+        for (int integer5 = 0; integer5 < elv.getFrameCount(); ++integer5) {
             for (int integer6 = 0; integer6 < integer4; ++integer6) {
                 for (int integer7 = 0; integer7 < integer3; ++integer7) {
-                    final boolean boolean9 = !this.isTransparent(eaj, integer5, integer7, integer6, integer3, integer4);
-                    this.checkTransition(SpanFacing.UP, list5, eaj, integer5, integer7, integer6, integer3, integer4, boolean9);
-                    this.checkTransition(SpanFacing.DOWN, list5, eaj, integer5, integer7, integer6, integer3, integer4, boolean9);
-                    this.checkTransition(SpanFacing.LEFT, list5, eaj, integer5, integer7, integer6, integer3, integer4, boolean9);
-                    this.checkTransition(SpanFacing.RIGHT, list5, eaj, integer5, integer7, integer6, integer3, integer4, boolean9);
+                    final boolean boolean9 = !this.isTransparent(elv, integer5, integer7, integer6, integer3, integer4);
+                    this.checkTransition(SpanFacing.UP, list5, elv, integer5, integer7, integer6, integer3, integer4, boolean9);
+                    this.checkTransition(SpanFacing.DOWN, list5, elv, integer5, integer7, integer6, integer3, integer4, boolean9);
+                    this.checkTransition(SpanFacing.LEFT, list5, elv, integer5, integer7, integer6, integer3, integer4, boolean9);
+                    this.checkTransition(SpanFacing.RIGHT, list5, elv, integer5, integer7, integer6, integer3, integer4, boolean9);
                 }
             }
         }
         return list5;
     }
     
-    private void checkTransition(final SpanFacing b, final List<Span> list, final TextureAtlasSprite eaj, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9) {
-        final boolean boolean10 = this.isTransparent(eaj, integer4, integer5 + b.getXOffset(), integer6 + b.getYOffset(), integer7, integer8) && boolean9;
+    private void checkTransition(final SpanFacing b, final List<Span> list, final TextureAtlasSprite elv, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9) {
+        final boolean boolean10 = this.isTransparent(elv, integer4, integer5 + b.getXOffset(), integer6 + b.getYOffset(), integer7, integer8) && boolean9;
         if (boolean10) {
             this.createOrExpandSpan(list, b, integer5, integer6);
         }
@@ -182,8 +182,8 @@ public class ItemModelGenerator {
         }
     }
     
-    private boolean isTransparent(final TextureAtlasSprite eaj, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        return integer3 < 0 || integer4 < 0 || integer3 >= integer5 || integer4 >= integer6 || eaj.isTransparent(integer2, integer3, integer4);
+    private boolean isTransparent(final TextureAtlasSprite elv, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        return integer3 < 0 || integer4 < 0 || integer3 >= integer5 || integer4 >= integer6 || elv.isTransparent(integer2, integer3, integer4);
     }
     
     static {
@@ -200,8 +200,8 @@ public class ItemModelGenerator {
         private final int xOffset;
         private final int yOffset;
         
-        private SpanFacing(final Direction fp, final int integer4, final int integer5) {
-            this.direction = fp;
+        private SpanFacing(final Direction fz, final int integer4, final int integer5) {
+            this.direction = fz;
             this.xOffset = integer4;
             this.yOffset = integer5;
         }
diff --git a/src/net/minecraft/client/renderer/block/model/ItemOverride.java b/src/net/minecraft/client/renderer/block/model/ItemOverride.java
index bd75548..2667671 100644
--- a/src/net/minecraft/client/renderer/block/model/ItemOverride.java
+++ b/src/net/minecraft/client/renderer/block/model/ItemOverride.java
@@ -8,12 +8,13 @@ import com.google.gson.JsonDeserializationContext;
 import java.lang.reflect.Type;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonDeserializer;
-import net.minecraft.world.item.ItemPropertyFunction;
+import net.minecraft.client.renderer.item.ItemPropertyFunction;
 import java.util.Iterator;
 import net.minecraft.world.item.Item;
+import net.minecraft.client.renderer.item.ItemProperties;
 import net.minecraft.world.entity.LivingEntity;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.item.ItemStack;
 import java.util.Map;
 import net.minecraft.resources.ResourceLocation;
@@ -22,8 +23,8 @@ public class ItemOverride {
     private final ResourceLocation model;
     private final Map<ResourceLocation, Float> predicates;
     
-    public ItemOverride(final ResourceLocation sm, final Map<ResourceLocation, Float> map) {
-        this.model = sm;
+    public ItemOverride(final ResourceLocation uh, final Map<ResourceLocation, Float> map) {
+        this.model = uh;
         this.predicates = map;
     }
     
@@ -31,11 +32,11 @@ public class ItemOverride {
         return this.model;
     }
     
-    boolean test(final ItemStack ben, @Nullable final Level bjw, @Nullable final LivingEntity akz) {
-        final Item bei5 = ben.getItem();
+    boolean test(final ItemStack bki, @Nullable final ClientLevel dym, @Nullable final LivingEntity aoy) {
+        final Item bke5 = bki.getItem();
         for (final Map.Entry<ResourceLocation, Float> entry7 : this.predicates.entrySet()) {
-            final ItemPropertyFunction bem8 = bei5.getProperty(entry7.getKey());
-            if (bem8 == null || bem8.call(ben, bjw, akz) < entry7.getValue()) {
+            final ItemPropertyFunction elg8 = ItemProperties.getProperty(bke5, entry7.getKey());
+            if (elg8 == null || elg8.call(bki, dym, aoy) < entry7.getValue()) {
                 return false;
             }
         }
@@ -49,9 +50,9 @@ public class ItemOverride {
         @Override
         public ItemOverride deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             final JsonObject jsonObject5 = jsonElement.getAsJsonObject();
-            final ResourceLocation sm6 = new ResourceLocation(GsonHelper.getAsString(jsonObject5, "model"));
+            final ResourceLocation uh6 = new ResourceLocation(GsonHelper.getAsString(jsonObject5, "model"));
             final Map<ResourceLocation, Float> map7 = this.getPredicates(jsonObject5);
-            return new ItemOverride(sm6, map7);
+            return new ItemOverride(uh6, map7);
         }
         
         protected Map<ResourceLocation, Float> getPredicates(final JsonObject jsonObject) {
diff --git a/src/net/minecraft/client/renderer/block/model/ItemOverrides.java b/src/net/minecraft/client/renderer/block/model/ItemOverrides.java
index 65a2603..308da69 100644
--- a/src/net/minecraft/client/renderer/block/model/ItemOverrides.java
+++ b/src/net/minecraft/client/renderer/block/model/ItemOverrides.java
@@ -2,7 +2,7 @@ package net.minecraft.client.renderer.block.model;
 
 import net.minecraft.world.entity.LivingEntity;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.Level;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.item.ItemStack;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
@@ -28,16 +28,16 @@ public class ItemOverrides {
         this.overrideModels = Collections.<BakedModel>emptyList();
     }
     
-    public ItemOverrides(final ModelBakery ebz, final BlockModel drs, final Function<ResourceLocation, UnbakedModel> function, final List<ItemOverride> list) {
+    public ItemOverrides(final ModelBakery enl, final BlockModel ecy, final Function<ResourceLocation, UnbakedModel> function, final List<ItemOverride> list) {
         this.overrides = Lists.newArrayList();
-        final UnbakedModel ecf5;
-        Collections.reverse(this.overrideModels = list.stream().map(drw -> {
-            ecf5 = function.apply(drw.getModel());
-            if (Objects.equals(ecf5, drs)) {
+        final UnbakedModel enr5;
+        Collections.reverse(this.overrideModels = list.stream().map(edc -> {
+            enr5 = function.apply(edc.getModel());
+            if (Objects.equals(enr5, ecy)) {
                 return null;
             }
             else {
-                return ebz.bake(drw.getModel(), BlockModelRotation.X0_Y0);
+                return enl.bake(edc.getModel(), BlockModelRotation.X0_Y0);
             }
         }).collect(Collectors.toList()));
         for (int integer6 = list.size() - 1; integer6 >= 0; --integer6) {
@@ -46,24 +46,24 @@ public class ItemOverrides {
     }
     
     @Nullable
-    public BakedModel resolve(final BakedModel ebv, final ItemStack ben, @Nullable final Level bjw, @Nullable final LivingEntity akz) {
+    public BakedModel resolve(final BakedModel enh, final ItemStack bki, @Nullable final ClientLevel dym, @Nullable final LivingEntity aoy) {
         if (!this.overrides.isEmpty()) {
             int integer6 = 0;
             while (integer6 < this.overrides.size()) {
-                final ItemOverride drw7 = this.overrides.get(integer6);
-                if (drw7.test(ben, bjw, akz)) {
-                    final BakedModel ebv2 = this.overrideModels.get(integer6);
-                    if (ebv2 == null) {
-                        return ebv;
+                final ItemOverride edc7 = this.overrides.get(integer6);
+                if (edc7.test(bki, dym, aoy)) {
+                    final BakedModel enh2 = this.overrideModels.get(integer6);
+                    if (enh2 == null) {
+                        return enh;
                     }
-                    return ebv2;
+                    return enh2;
                 }
                 else {
                     ++integer6;
                 }
             }
         }
-        return ebv;
+        return enh;
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/block/model/ItemTransform.java b/src/net/minecraft/client/renderer/block/model/ItemTransform.java
index d1ed6b7..18c6b58 100644
--- a/src/net/minecraft/client/renderer/block/model/ItemTransform.java
+++ b/src/net/minecraft/client/renderer/block/model/ItemTransform.java
@@ -18,13 +18,13 @@ public class ItemTransform {
     public final Vector3f translation;
     public final Vector3f scale;
     
-    public ItemTransform(final Vector3f e1, final Vector3f e2, final Vector3f e3) {
-        this.rotation = e1.copy();
-        this.translation = e2.copy();
-        this.scale = e3.copy();
+    public ItemTransform(final Vector3f g1, final Vector3f g2, final Vector3f g3) {
+        this.rotation = g1.copy();
+        this.translation = g2.copy();
+        this.scale = g3.copy();
     }
     
-    public void apply(final boolean boolean1, final PoseStack cyl) {
+    public void apply(final boolean boolean1, final PoseStack dhl) {
         if (this == ItemTransform.NO_TRANSFORM) {
             return;
         }
@@ -36,9 +36,9 @@ public class ItemTransform {
             float6 = -float6;
         }
         final int integer7 = boolean1 ? -1 : 1;
-        cyl.translate(integer7 * this.translation.x(), this.translation.y(), this.translation.z());
-        cyl.mulPose(new Quaternion(float4, float5, float6, true));
-        cyl.scale(this.scale.x(), this.scale.y(), this.scale.z());
+        dhl.translate(integer7 * this.translation.x(), this.translation.y(), this.translation.z());
+        dhl.mulPose(new Quaternion(float4, float5, float6, true));
+        dhl.scale(this.scale.x(), this.scale.y(), this.scale.z());
     }
     
     @Override
@@ -47,8 +47,8 @@ public class ItemTransform {
             return true;
         }
         if (this.getClass() == object.getClass()) {
-            final ItemTransform dry3 = (ItemTransform)object;
-            return this.rotation.equals(dry3.rotation) && this.scale.equals(dry3.scale) && this.translation.equals(dry3.translation);
+            final ItemTransform ede3 = (ItemTransform)object;
+            return this.rotation.equals(ede3.rotation) && this.scale.equals(ede3.scale) && this.translation.equals(ede3.translation);
         }
         return false;
     }
@@ -76,18 +76,18 @@ public class ItemTransform {
         @Override
         public ItemTransform deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             final JsonObject jsonObject5 = jsonElement.getAsJsonObject();
-            final Vector3f e6 = this.getVector3f(jsonObject5, "rotation", Deserializer.DEFAULT_ROTATION);
-            final Vector3f e7 = this.getVector3f(jsonObject5, "translation", Deserializer.DEFAULT_TRANSLATION);
-            e7.mul(0.0625f);
-            e7.clamp(-5.0f, 5.0f);
-            final Vector3f e8 = this.getVector3f(jsonObject5, "scale", Deserializer.DEFAULT_SCALE);
-            e8.clamp(-4.0f, 4.0f);
-            return new ItemTransform(e6, e7, e8);
+            final Vector3f g6 = this.getVector3f(jsonObject5, "rotation", Deserializer.DEFAULT_ROTATION);
+            final Vector3f g7 = this.getVector3f(jsonObject5, "translation", Deserializer.DEFAULT_TRANSLATION);
+            g7.mul(0.0625f);
+            g7.clamp(-5.0f, 5.0f);
+            final Vector3f g8 = this.getVector3f(jsonObject5, "scale", Deserializer.DEFAULT_SCALE);
+            g8.clamp(-4.0f, 4.0f);
+            return new ItemTransform(g6, g7, g8);
         }
         
-        private Vector3f getVector3f(final JsonObject jsonObject, final String string, final Vector3f e) {
+        private Vector3f getVector3f(final JsonObject jsonObject, final String string, final Vector3f g) {
             if (!jsonObject.has(string)) {
-                return e;
+                return g;
             }
             final JsonArray jsonArray5 = GsonHelper.getAsJsonArray(jsonObject, string);
             if (jsonArray5.size() != 3) {
diff --git a/src/net/minecraft/client/renderer/block/model/ItemTransforms.java b/src/net/minecraft/client/renderer/block/model/ItemTransforms.java
index 2ab98a8..b0cc671 100644
--- a/src/net/minecraft/client/renderer/block/model/ItemTransforms.java
+++ b/src/net/minecraft/client/renderer/block/model/ItemTransforms.java
@@ -22,26 +22,26 @@ public class ItemTransforms {
         this(ItemTransform.NO_TRANSFORM, ItemTransform.NO_TRANSFORM, ItemTransform.NO_TRANSFORM, ItemTransform.NO_TRANSFORM, ItemTransform.NO_TRANSFORM, ItemTransform.NO_TRANSFORM, ItemTransform.NO_TRANSFORM, ItemTransform.NO_TRANSFORM);
     }
     
-    public ItemTransforms(final ItemTransforms drz) {
-        this.thirdPersonLeftHand = drz.thirdPersonLeftHand;
-        this.thirdPersonRightHand = drz.thirdPersonRightHand;
-        this.firstPersonLeftHand = drz.firstPersonLeftHand;
-        this.firstPersonRightHand = drz.firstPersonRightHand;
-        this.head = drz.head;
-        this.gui = drz.gui;
-        this.ground = drz.ground;
-        this.fixed = drz.fixed;
+    public ItemTransforms(final ItemTransforms edf) {
+        this.thirdPersonLeftHand = edf.thirdPersonLeftHand;
+        this.thirdPersonRightHand = edf.thirdPersonRightHand;
+        this.firstPersonLeftHand = edf.firstPersonLeftHand;
+        this.firstPersonRightHand = edf.firstPersonRightHand;
+        this.head = edf.head;
+        this.gui = edf.gui;
+        this.ground = edf.ground;
+        this.fixed = edf.fixed;
     }
     
-    public ItemTransforms(final ItemTransform dry1, final ItemTransform dry2, final ItemTransform dry3, final ItemTransform dry4, final ItemTransform dry5, final ItemTransform dry6, final ItemTransform dry7, final ItemTransform dry8) {
-        this.thirdPersonLeftHand = dry1;
-        this.thirdPersonRightHand = dry2;
-        this.firstPersonLeftHand = dry3;
-        this.firstPersonRightHand = dry4;
-        this.head = dry5;
-        this.gui = dry6;
-        this.ground = dry7;
-        this.fixed = dry8;
+    public ItemTransforms(final ItemTransform ede1, final ItemTransform ede2, final ItemTransform ede3, final ItemTransform ede4, final ItemTransform ede5, final ItemTransform ede6, final ItemTransform ede7, final ItemTransform ede8) {
+        this.thirdPersonLeftHand = ede1;
+        this.thirdPersonRightHand = ede2;
+        this.firstPersonLeftHand = ede3;
+        this.firstPersonRightHand = ede4;
+        this.head = ede5;
+        this.gui = ede6;
+        this.ground = ede7;
+        this.fixed = ede8;
     }
     
     public ItemTransform getTransform(final TransformType b) {
@@ -94,6 +94,10 @@ public class ItemTransforms {
         GUI, 
         GROUND, 
         FIXED;
+        
+        public boolean firstPerson() {
+            return this == TransformType.FIRST_PERSON_LEFT_HAND || this == TransformType.FIRST_PERSON_RIGHT_HAND;
+        }
     }
     
     public static class Deserializer implements JsonDeserializer<ItemTransforms> {
@@ -103,21 +107,21 @@ public class ItemTransforms {
         @Override
         public ItemTransforms deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             final JsonObject jsonObject5 = jsonElement.getAsJsonObject();
-            final ItemTransform dry6 = this.getTransform(jsonDeserializationContext, jsonObject5, "thirdperson_righthand");
-            ItemTransform dry7 = this.getTransform(jsonDeserializationContext, jsonObject5, "thirdperson_lefthand");
-            if (dry7 == ItemTransform.NO_TRANSFORM) {
-                dry7 = dry6;
+            final ItemTransform ede6 = this.getTransform(jsonDeserializationContext, jsonObject5, "thirdperson_righthand");
+            ItemTransform ede7 = this.getTransform(jsonDeserializationContext, jsonObject5, "thirdperson_lefthand");
+            if (ede7 == ItemTransform.NO_TRANSFORM) {
+                ede7 = ede6;
             }
-            final ItemTransform dry8 = this.getTransform(jsonDeserializationContext, jsonObject5, "firstperson_righthand");
-            ItemTransform dry9 = this.getTransform(jsonDeserializationContext, jsonObject5, "firstperson_lefthand");
-            if (dry9 == ItemTransform.NO_TRANSFORM) {
-                dry9 = dry8;
+            final ItemTransform ede8 = this.getTransform(jsonDeserializationContext, jsonObject5, "firstperson_righthand");
+            ItemTransform ede9 = this.getTransform(jsonDeserializationContext, jsonObject5, "firstperson_lefthand");
+            if (ede9 == ItemTransform.NO_TRANSFORM) {
+                ede9 = ede8;
             }
-            final ItemTransform dry10 = this.getTransform(jsonDeserializationContext, jsonObject5, "head");
-            final ItemTransform dry11 = this.getTransform(jsonDeserializationContext, jsonObject5, "gui");
-            final ItemTransform dry12 = this.getTransform(jsonDeserializationContext, jsonObject5, "ground");
-            final ItemTransform dry13 = this.getTransform(jsonDeserializationContext, jsonObject5, "fixed");
-            return new ItemTransforms(dry7, dry6, dry9, dry8, dry10, dry11, dry12, dry13);
+            final ItemTransform ede10 = this.getTransform(jsonDeserializationContext, jsonObject5, "head");
+            final ItemTransform ede11 = this.getTransform(jsonDeserializationContext, jsonObject5, "gui");
+            final ItemTransform ede12 = this.getTransform(jsonDeserializationContext, jsonObject5, "ground");
+            final ItemTransform ede13 = this.getTransform(jsonDeserializationContext, jsonObject5, "fixed");
+            return new ItemTransforms(ede7, ede6, ede9, ede8, ede10, ede11, ede12, ede13);
         }
         
         private ItemTransform getTransform(final JsonDeserializationContext jsonDeserializationContext, final JsonObject jsonObject, final String string) {
diff --git a/src/net/minecraft/client/renderer/block/model/MultiVariant.java b/src/net/minecraft/client/renderer/block/model/MultiVariant.java
index 848355a..87dadc8 100644
--- a/src/net/minecraft/client/renderer/block/model/MultiVariant.java
+++ b/src/net/minecraft/client/renderer/block/model/MultiVariant.java
@@ -43,8 +43,8 @@ public class MultiVariant implements UnbakedModel {
             return true;
         }
         if (object instanceof MultiVariant) {
-            final MultiVariant dsa3 = (MultiVariant)object;
-            return this.variants.equals(dsa3.variants);
+            final MultiVariant edg3 = (MultiVariant)object;
+            return this.variants.equals(edg3.variants);
         }
         return false;
     }
@@ -61,19 +61,19 @@ public class MultiVariant implements UnbakedModel {
     
     @Override
     public Collection<Material> getMaterials(final Function<ResourceLocation, UnbakedModel> function, final Set<Pair<String, String>> set) {
-        return this.getVariants().stream().map(Variant::getModelLocation).distinct().flatMap(sm -> function.apply(sm).getMaterials(function, set).stream()).collect(Collectors.toSet());
+        return this.getVariants().stream().map(Variant::getModelLocation).distinct().flatMap(uh -> function.apply(uh).getMaterials(function, set).stream()).collect(Collectors.toSet());
     }
     
     @Nullable
     @Override
-    public BakedModel bake(final ModelBakery ebz, final Function<Material, TextureAtlasSprite> function, final ModelState ecc, final ResourceLocation sm) {
+    public BakedModel bake(final ModelBakery enl, final Function<Material, TextureAtlasSprite> function, final ModelState eno, final ResourceLocation uh) {
         if (this.getVariants().isEmpty()) {
             return null;
         }
         final WeightedBakedModel.Builder a6 = new WeightedBakedModel.Builder();
-        for (final Variant dsb8 : this.getVariants()) {
-            final BakedModel ebv9 = ebz.bake(dsb8.getModelLocation(), dsb8);
-            a6.add(ebv9, dsb8.getWeight());
+        for (final Variant edh8 : this.getVariants()) {
+            final BakedModel enh9 = enl.bake(edh8.getModelLocation(), edh8);
+            a6.add(enh9, edh8.getWeight());
         }
         return a6.build();
     }
diff --git a/src/net/minecraft/client/renderer/block/model/Variant.java b/src/net/minecraft/client/renderer/block/model/Variant.java
index 9af7214..82afaec 100644
--- a/src/net/minecraft/client/renderer/block/model/Variant.java
+++ b/src/net/minecraft/client/renderer/block/model/Variant.java
@@ -19,9 +19,9 @@ public class Variant implements ModelState {
     private final boolean uvLock;
     private final int weight;
     
-    public Variant(final ResourceLocation sm, final Transformation d, final boolean boolean3, final int integer) {
-        this.modelLocation = sm;
-        this.rotation = d;
+    public Variant(final ResourceLocation uh, final Transformation f, final boolean boolean3, final int integer) {
+        this.modelLocation = uh;
+        this.rotation = f;
         this.uvLock = boolean3;
         this.weight = integer;
     }
@@ -55,8 +55,8 @@ public class Variant implements ModelState {
             return true;
         }
         if (object instanceof Variant) {
-            final Variant dsb3 = (Variant)object;
-            return this.modelLocation.equals(dsb3.modelLocation) && Objects.equals(this.rotation, dsb3.rotation) && this.uvLock == dsb3.uvLock && this.weight == dsb3.weight;
+            final Variant edh3 = (Variant)object;
+            return this.modelLocation.equals(edh3.modelLocation) && Objects.equals(this.rotation, edh3.rotation) && this.uvLock == edh3.uvLock && this.weight == edh3.weight;
         }
         return false;
     }
@@ -74,11 +74,11 @@ public class Variant implements ModelState {
         @Override
         public Variant deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             final JsonObject jsonObject5 = jsonElement.getAsJsonObject();
-            final ResourceLocation sm6 = this.getModel(jsonObject5);
-            final BlockModelRotation ebw7 = this.getBlockRotation(jsonObject5);
+            final ResourceLocation uh6 = this.getModel(jsonObject5);
+            final BlockModelRotation eni7 = this.getBlockRotation(jsonObject5);
             final boolean boolean8 = this.getUvLock(jsonObject5);
             final int integer9 = this.getWeight(jsonObject5);
-            return new Variant(sm6, ebw7.getRotation(), boolean8, integer9);
+            return new Variant(uh6, eni7.getRotation(), boolean8, integer9);
         }
         
         private boolean getUvLock(final JsonObject jsonObject) {
@@ -88,11 +88,11 @@ public class Variant implements ModelState {
         protected BlockModelRotation getBlockRotation(final JsonObject jsonObject) {
             final int integer3 = GsonHelper.getAsInt(jsonObject, "x", 0);
             final int integer4 = GsonHelper.getAsInt(jsonObject, "y", 0);
-            final BlockModelRotation ebw5 = BlockModelRotation.by(integer3, integer4);
-            if (ebw5 == null) {
+            final BlockModelRotation eni5 = BlockModelRotation.by(integer3, integer4);
+            if (eni5 == null) {
                 throw new JsonParseException("Invalid BlockModelRotation x: " + integer3 + ", y: " + integer4);
             }
-            return ebw5;
+            return eni5;
         }
         
         protected ResourceLocation getModel(final JsonObject jsonObject) {
diff --git a/src/net/minecraft/client/renderer/block/model/multipart/AndCondition.java b/src/net/minecraft/client/renderer/block/model/multipart/AndCondition.java
index 71e2bf5..81d0163 100644
--- a/src/net/minecraft/client/renderer/block/model/multipart/AndCondition.java
+++ b/src/net/minecraft/client/renderer/block/model/multipart/AndCondition.java
@@ -17,8 +17,8 @@ public class AndCondition implements Condition {
     }
     
     @Override
-    public Predicate<BlockState> getPredicate(final StateDefinition<Block, BlockState> byk) {
-        final List<Predicate<BlockState>> list3 = Streams.stream(this.conditions).map(dsd -> dsd.getPredicate(byk)).collect(Collectors.toList());
-        return byj -> list3.stream().allMatch(predicate -> predicate.test(byj));
+    public Predicate<BlockState> getPredicate(final StateDefinition<Block, BlockState> cfk) {
+        final List<Predicate<BlockState>> list3 = Streams.stream(this.conditions).map(edj -> edj.getPredicate(cfk)).collect(Collectors.toList());
+        return cfj -> list3.stream().allMatch(predicate -> predicate.test(cfj));
     }
 }
diff --git a/src/net/minecraft/client/renderer/block/model/multipart/Condition.java b/src/net/minecraft/client/renderer/block/model/multipart/Condition.java
index c4c837d..1d98ed4 100644
--- a/src/net/minecraft/client/renderer/block/model/multipart/Condition.java
+++ b/src/net/minecraft/client/renderer/block/model/multipart/Condition.java
@@ -7,8 +7,8 @@ import net.minecraft.world.level.block.state.StateDefinition;
 
 @FunctionalInterface
 public interface Condition {
-    public static final Condition TRUE = byk -> byj -> 1;
-    public static final Condition FALSE = byk -> byj -> 0;
+    public static final Condition TRUE = cfk -> cfj -> 1;
+    public static final Condition FALSE = cfk -> cfj -> 0;
     
-    Predicate<BlockState> getPredicate(final StateDefinition<Block, BlockState> byk);
+    Predicate<BlockState> getPredicate(final StateDefinition<Block, BlockState> cfk);
 }
diff --git a/src/net/minecraft/client/renderer/block/model/multipart/KeyValueCondition.java b/src/net/minecraft/client/renderer/block/model/multipart/KeyValueCondition.java
index 35de6a0..355a842 100644
--- a/src/net/minecraft/client/renderer/block/model/multipart/KeyValueCondition.java
+++ b/src/net/minecraft/client/renderer/block/model/multipart/KeyValueCondition.java
@@ -23,10 +23,10 @@ public class KeyValueCondition implements Condition {
     }
     
     @Override
-    public Predicate<BlockState> getPredicate(final StateDefinition<Block, BlockState> byk) {
-        final Property<?> bzm3 = byk.getProperty(this.key);
-        if (bzm3 == null) {
-            throw new RuntimeException(String.format("Unknown property '%s' on '%s'", this.key, byk.getOwner().toString()));
+    public Predicate<BlockState> getPredicate(final StateDefinition<Block, BlockState> cfk) {
+        final Property<?> cgl3 = cfk.getProperty(this.key);
+        if (cgl3 == null) {
+            throw new RuntimeException(String.format("Unknown property '%s' on '%s'", this.key, cfk.getOwner().toString()));
         }
         String string2 = this.value;
         final boolean boolean5 = !string2.isEmpty() && string2.charAt(0) == '!';
@@ -35,25 +35,25 @@ public class KeyValueCondition implements Condition {
         }
         final List<String> list6 = KeyValueCondition.PIPE_SPLITTER.splitToList(string2);
         if (list6.isEmpty()) {
-            throw new RuntimeException(String.format("Empty value '%s' for property '%s' on '%s'", this.value, this.key, byk.getOwner().toString()));
+            throw new RuntimeException(String.format("Empty value '%s' for property '%s' on '%s'", this.value, this.key, cfk.getOwner().toString()));
         }
         Predicate<BlockState> predicate2;
         if (list6.size() == 1) {
-            predicate2 = this.getBlockStatePredicate(byk, bzm3, string2);
+            predicate2 = this.getBlockStatePredicate(cfk, cgl3, string2);
         }
         else {
-            final List<Predicate<BlockState>> list7 = list6.stream().map(string -> this.getBlockStatePredicate(byk, bzm3, string)).collect(Collectors.toList());
-            predicate2 = (byj -> list7.stream().anyMatch(predicate -> predicate.test(byj)));
+            final List<Predicate<BlockState>> list7 = list6.stream().map(string -> this.getBlockStatePredicate(cfk, cgl3, string)).collect(Collectors.toList());
+            predicate2 = (cfj -> list7.stream().anyMatch(predicate -> predicate.test(cfj)));
         }
         return boolean5 ? predicate2.negate() : predicate2;
     }
     
-    private Predicate<BlockState> getBlockStatePredicate(final StateDefinition<Block, BlockState> byk, final Property<?> bzm, final String string) {
-        final Optional<?> optional5 = bzm.getValue(string);
+    private Predicate<BlockState> getBlockStatePredicate(final StateDefinition<Block, BlockState> cfk, final Property<?> cgl, final String string) {
+        final Optional<?> optional5 = cgl.getValue(string);
         if (!optional5.isPresent()) {
-            throw new RuntimeException(String.format("Unknown value '%s' for property '%s' on '%s' in '%s'", string, this.key, byk.getOwner().toString(), this.value));
+            throw new RuntimeException(String.format("Unknown value '%s' for property '%s' on '%s' in '%s'", string, this.key, cfk.getOwner().toString(), this.value));
         }
-        return byj -> byj.getValue(bzm).equals(optional5.get());
+        return cfj -> cfj.getValue(cgl).equals(optional5.get());
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/block/model/multipart/MultiPart.java b/src/net/minecraft/client/renderer/block/model/multipart/MultiPart.java
index f4edb5d..6361242 100644
--- a/src/net/minecraft/client/renderer/block/model/multipart/MultiPart.java
+++ b/src/net/minecraft/client/renderer/block/model/multipart/MultiPart.java
@@ -37,8 +37,8 @@ public class MultiPart implements UnbakedModel {
     private final StateDefinition<Block, BlockState> definition;
     private final List<Selector> selectors;
     
-    public MultiPart(final StateDefinition<Block, BlockState> byk, final List<Selector> list) {
-        this.definition = byk;
+    public MultiPart(final StateDefinition<Block, BlockState> cfk, final List<Selector> list) {
+        this.definition = cfk;
         this.selectors = list;
     }
     
@@ -48,8 +48,8 @@ public class MultiPart implements UnbakedModel {
     
     public Set<MultiVariant> getMultiVariants() {
         final Set<MultiVariant> set2 = Sets.newHashSet();
-        for (final Selector dsh4 : this.selectors) {
-            set2.add(dsh4.getVariant());
+        for (final Selector edn4 : this.selectors) {
+            set2.add(edn4.getVariant());
         }
         return set2;
     }
@@ -60,8 +60,8 @@ public class MultiPart implements UnbakedModel {
             return true;
         }
         if (object instanceof MultiPart) {
-            final MultiPart dsf3 = (MultiPart)object;
-            return Objects.equals(this.definition, dsf3.definition) && Objects.equals(this.selectors, dsf3.selectors);
+            final MultiPart edl3 = (MultiPart)object;
+            return Objects.equals(this.definition, edl3.definition) && Objects.equals(this.selectors, edl3.selectors);
         }
         return false;
     }
@@ -73,22 +73,22 @@ public class MultiPart implements UnbakedModel {
     
     @Override
     public Collection<ResourceLocation> getDependencies() {
-        return this.getSelectors().stream().flatMap(dsh -> dsh.getVariant().getDependencies().stream()).collect(Collectors.toSet());
+        return this.getSelectors().stream().flatMap(edn -> edn.getVariant().getDependencies().stream()).collect(Collectors.toSet());
     }
     
     @Override
     public Collection<Material> getMaterials(final Function<ResourceLocation, UnbakedModel> function, final Set<Pair<String, String>> set) {
-        return this.getSelectors().stream().flatMap(dsh -> dsh.getVariant().getMaterials(function, set).stream()).collect(Collectors.toSet());
+        return this.getSelectors().stream().flatMap(edn -> edn.getVariant().getMaterials(function, set).stream()).collect(Collectors.toSet());
     }
     
     @Nullable
     @Override
-    public BakedModel bake(final ModelBakery ebz, final Function<Material, TextureAtlasSprite> function, final ModelState ecc, final ResourceLocation sm) {
+    public BakedModel bake(final ModelBakery enl, final Function<Material, TextureAtlasSprite> function, final ModelState eno, final ResourceLocation uh) {
         final MultiPartBakedModel.Builder a6 = new MultiPartBakedModel.Builder();
-        for (final Selector dsh8 : this.getSelectors()) {
-            final BakedModel ebv9 = dsh8.getVariant().bake(ebz, function, ecc, sm);
-            if (ebv9 != null) {
-                a6.add(dsh8.getPredicate(this.definition), ebv9);
+        for (final Selector edn8 : this.getSelectors()) {
+            final BakedModel enh9 = edn8.getVariant().bake(enl, function, eno, uh);
+            if (enh9 != null) {
+                a6.add(edn8.getPredicate(this.definition), enh9);
             }
         }
         return a6.build();
diff --git a/src/net/minecraft/client/renderer/block/model/multipart/OrCondition.java b/src/net/minecraft/client/renderer/block/model/multipart/OrCondition.java
index 1236a3a..0aa506b 100644
--- a/src/net/minecraft/client/renderer/block/model/multipart/OrCondition.java
+++ b/src/net/minecraft/client/renderer/block/model/multipart/OrCondition.java
@@ -17,8 +17,8 @@ public class OrCondition implements Condition {
     }
     
     @Override
-    public Predicate<BlockState> getPredicate(final StateDefinition<Block, BlockState> byk) {
-        final List<Predicate<BlockState>> list3 = Streams.stream(this.conditions).map(dsd -> dsd.getPredicate(byk)).collect(Collectors.toList());
-        return byj -> list3.stream().anyMatch(predicate -> predicate.test(byj));
+    public Predicate<BlockState> getPredicate(final StateDefinition<Block, BlockState> cfk) {
+        final List<Predicate<BlockState>> list3 = Streams.stream(this.conditions).map(edj -> edj.getPredicate(cfk)).collect(Collectors.toList());
+        return cfj -> list3.stream().anyMatch(predicate -> predicate.test(cfj));
     }
 }
diff --git a/src/net/minecraft/client/renderer/block/model/multipart/Selector.java b/src/net/minecraft/client/renderer/block/model/multipart/Selector.java
index 6bf1888..c1a78d5 100644
--- a/src/net/minecraft/client/renderer/block/model/multipart/Selector.java
+++ b/src/net/minecraft/client/renderer/block/model/multipart/Selector.java
@@ -25,23 +25,23 @@ public class Selector {
     private final Condition condition;
     private final MultiVariant variant;
     
-    public Selector(final Condition dsd, final MultiVariant dsa) {
-        if (dsd == null) {
+    public Selector(final Condition edj, final MultiVariant edg) {
+        if (edj == null) {
             throw new IllegalArgumentException("Missing condition for selector");
         }
-        if (dsa == null) {
+        if (edg == null) {
             throw new IllegalArgumentException("Missing variant for selector");
         }
-        this.condition = dsd;
-        this.variant = dsa;
+        this.condition = edj;
+        this.variant = edg;
     }
     
     public MultiVariant getVariant() {
         return this.variant;
     }
     
-    public Predicate<BlockState> getPredicate(final StateDefinition<Block, BlockState> byk) {
-        return this.condition.getPredicate(byk);
+    public Predicate<BlockState> getPredicate(final StateDefinition<Block, BlockState> cfk) {
+        return this.condition.getPredicate(cfk);
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/blockentity/BannerRenderer.java b/src/net/minecraft/client/renderer/blockentity/BannerRenderer.java
index 97bcf1a..f0ae5b1 100644
--- a/src/net/minecraft/client/renderer/blockentity/BannerRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/BannerRenderer.java
@@ -28,72 +28,76 @@ public class BannerRenderer extends BlockEntityRenderer<BannerBlockEntity> {
     private final ModelPart pole;
     private final ModelPart bar;
     
-    public BannerRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public BannerRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
         this.flag = makeFlag();
         (this.pole = new ModelPart(64, 64, 44, 0)).addBox(-1.0f, -30.0f, -1.0f, 2.0f, 42.0f, 2.0f, 0.0f);
         (this.bar = new ModelPart(64, 64, 0, 42)).addBox(-10.0f, -32.0f, -1.0f, 20.0f, 2.0f, 2.0f, 0.0f);
     }
     
     public static ModelPart makeFlag() {
-        final ModelPart dni1 = new ModelPart(64, 64, 0, 0);
-        dni1.addBox(-10.0f, 0.0f, -2.0f, 20.0f, 40.0f, 1.0f, 0.0f);
-        return dni1;
+        final ModelPart dyg1 = new ModelPart(64, 64, 0, 0);
+        dyg1.addBox(-10.0f, 0.0f, -2.0f, 20.0f, 40.0f, 1.0f, 0.0f);
+        return dyg1;
     }
     
     @Override
-    public void render(final BannerBlockEntity bwc, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final List<Pair<BannerPattern, DyeColor>> list8 = bwc.getPatterns();
+    public void render(final BannerBlockEntity cdc, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final List<Pair<BannerPattern, DyeColor>> list8 = cdc.getPatterns();
         if (list8 == null) {
             return;
         }
         final float float3 = 0.6666667f;
-        final boolean boolean10 = bwc.getLevel() == null;
-        cyl.pushPose();
+        final boolean boolean10 = cdc.getLevel() == null;
+        dhl.pushPose();
         long long11;
         if (boolean10) {
             long11 = 0L;
-            cyl.translate(0.5, 0.5, 0.5);
+            dhl.translate(0.5, 0.5, 0.5);
             this.pole.visible = true;
         }
         else {
-            long11 = bwc.getLevel().getGameTime();
-            final BlockState byj13 = bwc.getBlockState();
-            if (byj13.getBlock() instanceof BannerBlock) {
-                cyl.translate(0.5, 0.5, 0.5);
-                final float float4 = -byj13.<Integer>getValue((Property<Integer>)BannerBlock.ROTATION) * 360 / 16.0f;
-                cyl.mulPose(Vector3f.YP.rotationDegrees(float4));
+            long11 = cdc.getLevel().getGameTime();
+            final BlockState cfj13 = cdc.getBlockState();
+            if (cfj13.getBlock() instanceof BannerBlock) {
+                dhl.translate(0.5, 0.5, 0.5);
+                final float float4 = -cfj13.<Integer>getValue((Property<Integer>)BannerBlock.ROTATION) * 360 / 16.0f;
+                dhl.mulPose(Vector3f.YP.rotationDegrees(float4));
                 this.pole.visible = true;
             }
             else {
-                cyl.translate(0.5, -0.1666666716337204, 0.5);
-                final float float4 = -byj13.<Direction>getValue((Property<Direction>)WallBannerBlock.FACING).toYRot();
-                cyl.mulPose(Vector3f.YP.rotationDegrees(float4));
-                cyl.translate(0.0, -0.3125, -0.4375);
+                dhl.translate(0.5, -0.1666666716337204, 0.5);
+                final float float4 = -cfj13.<Direction>getValue((Property<Direction>)WallBannerBlock.FACING).toYRot();
+                dhl.mulPose(Vector3f.YP.rotationDegrees(float4));
+                dhl.translate(0.0, -0.3125, -0.4375);
                 this.pole.visible = false;
             }
         }
-        cyl.pushPose();
-        cyl.scale(0.6666667f, -0.6666667f, -0.6666667f);
-        final VertexConsumer cyo13 = ModelBakery.BANNER_BASE.buffer(dqt, RenderType::entitySolid);
-        this.pole.render(cyl, cyo13, integer5, integer6);
-        this.bar.render(cyl, cyo13, integer5, integer6);
-        final BlockPos fk14 = bwc.getBlockPos();
-        final float float5 = (Math.floorMod(fk14.getX() * 7 + fk14.getY() * 9 + fk14.getZ() * 13 + long11, 100L) + float2) / 100.0f;
+        dhl.pushPose();
+        dhl.scale(0.6666667f, -0.6666667f, -0.6666667f);
+        final VertexConsumer dhp13 = ModelBakery.BANNER_BASE.buffer(ebz, RenderType::entitySolid);
+        this.pole.render(dhl, dhp13, integer5, integer6);
+        this.bar.render(dhl, dhp13, integer5, integer6);
+        final BlockPos fu14 = cdc.getBlockPos();
+        final float float5 = (Math.floorMod(fu14.getX() * 7 + fu14.getY() * 9 + fu14.getZ() * 13 + long11, 100L) + float2) / 100.0f;
         this.flag.xRot = (-0.0125f + 0.01f * Mth.cos(6.2831855f * float5)) * 3.1415927f;
         this.flag.y = -32.0f;
-        renderPatterns(cyl, dqt, integer5, integer6, this.flag, ModelBakery.BANNER_BASE, true, list8);
-        cyl.popPose();
-        cyl.popPose();
+        renderPatterns(dhl, ebz, integer5, integer6, this.flag, ModelBakery.BANNER_BASE, true, list8);
+        dhl.popPose();
+        dhl.popPose();
     }
     
-    public static void renderPatterns(final PoseStack cyl, final MultiBufferSource dqt, final int integer3, final int integer4, final ModelPart dni, final Material eby, final boolean boolean7, final List<Pair<BannerPattern, DyeColor>> list) {
-        dni.render(cyl, eby.buffer(dqt, RenderType::entitySolid), integer3, integer4);
+    public static void renderPatterns(final PoseStack dhl, final MultiBufferSource ebz, final int integer3, final int integer4, final ModelPart dyg, final Material enk, final boolean boolean7, final List<Pair<BannerPattern, DyeColor>> list) {
+        renderPatterns(dhl, ebz, integer3, integer4, dyg, enk, boolean7, list, false);
+    }
+    
+    public static void renderPatterns(final PoseStack dhl, final MultiBufferSource ebz, final int integer3, final int integer4, final ModelPart dyg, final Material enk, final boolean boolean7, final List<Pair<BannerPattern, DyeColor>> list, final boolean boolean9) {
+        dyg.render(dhl, enk.buffer(ebz, RenderType::entitySolid, boolean9), integer3, integer4);
         for (int integer5 = 0; integer5 < 17 && integer5 < list.size(); ++integer5) {
-            final Pair<BannerPattern, DyeColor> pair10 = list.get(integer5);
-            final float[] arr11 = ((DyeColor)pair10.getSecond()).getTextureDiffuseColors();
-            final Material eby2 = new Material(boolean7 ? Sheets.BANNER_SHEET : Sheets.SHIELD_SHEET, ((BannerPattern)pair10.getFirst()).location(boolean7));
-            dni.render(cyl, eby2.buffer(dqt, RenderType::entityNoOutline), integer3, integer4, arr11[0], arr11[1], arr11[2], 1.0f);
+            final Pair<BannerPattern, DyeColor> pair11 = list.get(integer5);
+            final float[] arr12 = ((DyeColor)pair11.getSecond()).getTextureDiffuseColors();
+            final Material enk2 = new Material(boolean7 ? Sheets.BANNER_SHEET : Sheets.SHIELD_SHEET, ((BannerPattern)pair11.getFirst()).location(boolean7));
+            dyg.render(dhl, enk2.buffer(ebz, RenderType::entityNoOutline), integer3, integer4, arr12[0], arr12[1], arr12[2], 1.0f);
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/blockentity/BeaconRenderer.java b/src/net/minecraft/client/renderer/blockentity/BeaconRenderer.java
index be75801..5dc5898 100644
--- a/src/net/minecraft/client/renderer/blockentity/BeaconRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/BeaconRenderer.java
@@ -17,38 +17,38 @@ import net.minecraft.world.level.block.entity.BeaconBlockEntity;
 public class BeaconRenderer extends BlockEntityRenderer<BeaconBlockEntity> {
     public static final ResourceLocation BEAM_LOCATION;
     
-    public BeaconRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public BeaconRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
     }
     
     @Override
-    public void render(final BeaconBlockEntity bwg, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final long long8 = bwg.getLevel().getGameTime();
-        final List<BeaconBlockEntity.BeaconBeamSection> list10 = bwg.getBeamSections();
+    public void render(final BeaconBlockEntity cdg, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final long long8 = cdg.getLevel().getGameTime();
+        final List<BeaconBlockEntity.BeaconBeamSection> list10 = cdg.getBeamSections();
         int integer7 = 0;
         for (int integer8 = 0; integer8 < list10.size(); ++integer8) {
             final BeaconBlockEntity.BeaconBeamSection a13 = list10.get(integer8);
-            renderBeaconBeam(cyl, dqt, float2, long8, integer7, (integer8 == list10.size() - 1) ? 1024 : a13.getHeight(), a13.getColor());
+            renderBeaconBeam(dhl, ebz, float2, long8, integer7, (integer8 == list10.size() - 1) ? 1024 : a13.getHeight(), a13.getColor());
             integer7 += a13.getHeight();
         }
     }
     
-    private static void renderBeaconBeam(final PoseStack cyl, final MultiBufferSource dqt, final float float3, final long long4, final int integer5, final int integer6, final float[] arr) {
-        renderBeaconBeam(cyl, dqt, BeaconRenderer.BEAM_LOCATION, float3, 1.0f, long4, integer5, integer6, arr, 0.2f, 0.25f);
+    private static void renderBeaconBeam(final PoseStack dhl, final MultiBufferSource ebz, final float float3, final long long4, final int integer5, final int integer6, final float[] arr) {
+        renderBeaconBeam(dhl, ebz, BeaconRenderer.BEAM_LOCATION, float3, 1.0f, long4, integer5, integer6, arr, 0.2f, 0.25f);
     }
     
-    public static void renderBeaconBeam(final PoseStack cyl, final MultiBufferSource dqt, final ResourceLocation sm, final float float4, final float float5, final long long6, final int integer7, final int integer8, final float[] arr, final float float10, final float float11) {
+    public static void renderBeaconBeam(final PoseStack dhl, final MultiBufferSource ebz, final ResourceLocation uh, final float float4, final float float5, final long long6, final int integer7, final int integer8, final float[] arr, final float float10, final float float11) {
         final int integer9 = integer7 + integer8;
-        cyl.pushPose();
-        cyl.translate(0.5, 0.0, 0.5);
+        dhl.pushPose();
+        dhl.translate(0.5, 0.0, 0.5);
         final float float12 = Math.floorMod(long6, 40L) + float4;
         final float float13 = (integer8 < 0) ? float12 : (-float12);
         final float float14 = Mth.frac(float13 * 0.2f - Mth.floor(float13 * 0.1f));
         final float float15 = arr[0];
         final float float16 = arr[1];
         final float float17 = arr[2];
-        cyl.pushPose();
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float12 * 2.25f - 45.0f));
+        dhl.pushPose();
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float12 * 2.25f - 45.0f));
         float float18 = 0.0f;
         float float19 = float10;
         float float20 = float10;
@@ -61,8 +61,8 @@ public class BeaconRenderer extends BlockEntityRenderer<BeaconBlockEntity> {
         float float27 = 1.0f;
         float float28 = -1.0f + float14;
         float float29 = integer8 * float5 * (0.5f / float10) + float28;
-        renderPart(cyl, dqt.getBuffer(RenderType.beaconBeam(sm, false)), float15, float16, float17, 1.0f, integer7, integer9, 0.0f, float19, float20, 0.0f, float22, 0.0f, 0.0f, float25, 0.0f, 1.0f, float29, float28);
-        cyl.popPose();
+        renderPart(dhl, ebz.getBuffer(RenderType.beaconBeam(uh, false)), float15, float16, float17, 1.0f, integer7, integer9, 0.0f, float19, float20, 0.0f, float22, 0.0f, 0.0f, float25, 0.0f, 1.0f, float29, float28);
+        dhl.popPose();
         float18 = -float11;
         float19 = -float11;
         float20 = float11;
@@ -75,33 +75,33 @@ public class BeaconRenderer extends BlockEntityRenderer<BeaconBlockEntity> {
         float27 = 1.0f;
         float28 = -1.0f + float14;
         float29 = integer8 * float5 + float28;
-        renderPart(cyl, dqt.getBuffer(RenderType.beaconBeam(sm, true)), float15, float16, float17, 0.125f, integer7, integer9, float18, float19, float20, float21, float22, float23, float24, float25, 0.0f, 1.0f, float29, float28);
-        cyl.popPose();
+        renderPart(dhl, ebz.getBuffer(RenderType.beaconBeam(uh, true)), float15, float16, float17, 0.125f, integer7, integer9, float18, float19, float20, float21, float22, float23, float24, float25, 0.0f, 1.0f, float29, float28);
+        dhl.popPose();
     }
     
-    private static void renderPart(final PoseStack cyl, final VertexConsumer cyo, final float float3, final float float4, final float float5, final float float6, final int integer7, final int integer8, final float float9, final float float10, final float float11, final float float12, final float float13, final float float14, final float float15, final float float16, final float float17, final float float18, final float float19, final float float20) {
-        final PoseStack.Pose a21 = cyl.last();
+    private static void renderPart(final PoseStack dhl, final VertexConsumer dhp, final float float3, final float float4, final float float5, final float float6, final int integer7, final int integer8, final float float9, final float float10, final float float11, final float float12, final float float13, final float float14, final float float15, final float float16, final float float17, final float float18, final float float19, final float float20) {
+        final PoseStack.Pose a21 = dhl.last();
         final Matrix4f b22 = a21.pose();
         final Matrix3f a22 = a21.normal();
-        renderQuad(b22, a22, cyo, float3, float4, float5, float6, integer7, integer8, float9, float10, float11, float12, float17, float18, float19, float20);
-        renderQuad(b22, a22, cyo, float3, float4, float5, float6, integer7, integer8, float15, float16, float13, float14, float17, float18, float19, float20);
-        renderQuad(b22, a22, cyo, float3, float4, float5, float6, integer7, integer8, float11, float12, float15, float16, float17, float18, float19, float20);
-        renderQuad(b22, a22, cyo, float3, float4, float5, float6, integer7, integer8, float13, float14, float9, float10, float17, float18, float19, float20);
+        renderQuad(b22, a22, dhp, float3, float4, float5, float6, integer7, integer8, float9, float10, float11, float12, float17, float18, float19, float20);
+        renderQuad(b22, a22, dhp, float3, float4, float5, float6, integer7, integer8, float15, float16, float13, float14, float17, float18, float19, float20);
+        renderQuad(b22, a22, dhp, float3, float4, float5, float6, integer7, integer8, float11, float12, float15, float16, float17, float18, float19, float20);
+        renderQuad(b22, a22, dhp, float3, float4, float5, float6, integer7, integer8, float13, float14, float9, float10, float17, float18, float19, float20);
     }
     
-    private static void renderQuad(final Matrix4f b, final Matrix3f a, final VertexConsumer cyo, final float float4, final float float5, final float float6, final float float7, final int integer8, final int integer9, final float float10, final float float11, final float float12, final float float13, final float float14, final float float15, final float float16, final float float17) {
-        addVertex(b, a, cyo, float4, float5, float6, float7, integer9, float10, float11, float15, float16);
-        addVertex(b, a, cyo, float4, float5, float6, float7, integer8, float10, float11, float15, float17);
-        addVertex(b, a, cyo, float4, float5, float6, float7, integer8, float12, float13, float14, float17);
-        addVertex(b, a, cyo, float4, float5, float6, float7, integer9, float12, float13, float14, float16);
+    private static void renderQuad(final Matrix4f b, final Matrix3f a, final VertexConsumer dhp, final float float4, final float float5, final float float6, final float float7, final int integer8, final int integer9, final float float10, final float float11, final float float12, final float float13, final float float14, final float float15, final float float16, final float float17) {
+        addVertex(b, a, dhp, float4, float5, float6, float7, integer9, float10, float11, float15, float16);
+        addVertex(b, a, dhp, float4, float5, float6, float7, integer8, float10, float11, float15, float17);
+        addVertex(b, a, dhp, float4, float5, float6, float7, integer8, float12, float13, float14, float17);
+        addVertex(b, a, dhp, float4, float5, float6, float7, integer9, float12, float13, float14, float16);
     }
     
-    private static void addVertex(final Matrix4f b, final Matrix3f a, final VertexConsumer cyo, final float float4, final float float5, final float float6, final float float7, final int integer, final float float9, final float float10, final float float11, final float float12) {
-        cyo.vertex(b, float9, (float)integer, float10).color(float4, float5, float6, float7).uv(float11, float12).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(15728880).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
+    private static void addVertex(final Matrix4f b, final Matrix3f a, final VertexConsumer dhp, final float float4, final float float5, final float float6, final float float7, final int integer, final float float9, final float float10, final float float11, final float float12) {
+        dhp.vertex(b, float9, (float)integer, float10).color(float4, float5, float6, float7).uv(float11, float12).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(15728880).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
     }
     
     @Override
-    public boolean shouldRenderOffScreen(final BeaconBlockEntity bwg) {
+    public boolean shouldRenderOffScreen(final BeaconBlockEntity cdg) {
         return true;
     }
     
diff --git a/src/net/minecraft/client/renderer/blockentity/BedRenderer.java b/src/net/minecraft/client/renderer/blockentity/BedRenderer.java
index e6e6fa8..3ef5b59 100644
--- a/src/net/minecraft/client/renderer/blockentity/BedRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/BedRenderer.java
@@ -28,8 +28,8 @@ public class BedRenderer extends BlockEntityRenderer<BedBlockEntity> {
     private final ModelPart footPiece;
     private final ModelPart[] legs;
     
-    public BedRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public BedRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
         this.legs = new ModelPart[4];
         (this.headPiece = new ModelPart(64, 64, 0, 0)).addBox(0.0f, 0.0f, 0.0f, 16.0f, 16.0f, 6.0f, 0.0f);
         (this.footPiece = new ModelPart(64, 64, 0, 22)).addBox(0.0f, 0.0f, 0.0f, 16.0f, 16.0f, 6.0f, 0.0f);
@@ -52,41 +52,41 @@ public class BedRenderer extends BlockEntityRenderer<BedBlockEntity> {
     }
     
     @Override
-    public void render(final BedBlockEntity bwh, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final Material eby8 = Sheets.BED_TEXTURES[bwh.getColor().getId()];
-        final Level bjw9 = bwh.getLevel();
-        if (bjw9 != null) {
-            final BlockState byj10 = bwh.getBlockState();
-            final DoubleBlockCombiner.NeighborCombineResult<? extends BedBlockEntity> c11 = DoubleBlockCombiner.combineWithNeigbour(BlockEntityType.BED, BedBlock::getBlockType, BedBlock::getConnectedDirection, ChestBlock.FACING, byj10, bjw9, bwh.getBlockPos(), (bjx, fk) -> false);
+    public void render(final BedBlockEntity cdh, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final Material enk8 = Sheets.BED_TEXTURES[cdh.getColor().getId()];
+        final Level bqb9 = cdh.getLevel();
+        if (bqb9 != null) {
+            final BlockState cfj10 = cdh.getBlockState();
+            final DoubleBlockCombiner.NeighborCombineResult<? extends BedBlockEntity> c11 = DoubleBlockCombiner.combineWithNeigbour(BlockEntityType.BED, BedBlock::getBlockType, BedBlock::getConnectedDirection, ChestBlock.FACING, cfj10, bqb9, cdh.getBlockPos(), (bqc, fu) -> false);
             final int integer7 = c11.<Int2IntFunction>apply(new BrightnessCombiner<>()).get(integer5);
-            this.renderPiece(cyl, dqt, byj10.<BedPart>getValue(BedBlock.PART) == BedPart.HEAD, byj10.<Direction>getValue((Property<Direction>)BedBlock.FACING), eby8, integer7, integer6, false);
+            this.renderPiece(dhl, ebz, cfj10.<BedPart>getValue(BedBlock.PART) == BedPart.HEAD, cfj10.<Direction>getValue((Property<Direction>)BedBlock.FACING), enk8, integer7, integer6, false);
         }
         else {
-            this.renderPiece(cyl, dqt, true, Direction.SOUTH, eby8, integer5, integer6, false);
-            this.renderPiece(cyl, dqt, false, Direction.SOUTH, eby8, integer5, integer6, true);
+            this.renderPiece(dhl, ebz, true, Direction.SOUTH, enk8, integer5, integer6, false);
+            this.renderPiece(dhl, ebz, false, Direction.SOUTH, enk8, integer5, integer6, true);
         }
     }
     
-    private void renderPiece(final PoseStack cyl, final MultiBufferSource dqt, final boolean boolean3, final Direction fp, final Material eby, final int integer6, final int integer7, final boolean boolean8) {
+    private void renderPiece(final PoseStack dhl, final MultiBufferSource ebz, final boolean boolean3, final Direction fz, final Material enk, final int integer6, final int integer7, final boolean boolean8) {
         this.headPiece.visible = boolean3;
         this.footPiece.visible = !boolean3;
         this.legs[0].visible = !boolean3;
         this.legs[1].visible = boolean3;
         this.legs[2].visible = !boolean3;
         this.legs[3].visible = boolean3;
-        cyl.pushPose();
-        cyl.translate(0.0, 0.5625, boolean8 ? -1.0 : 0.0);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
-        cyl.translate(0.5, 0.5, 0.5);
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(180.0f + fp.toYRot()));
-        cyl.translate(-0.5, -0.5, -0.5);
-        final VertexConsumer cyo10 = eby.buffer(dqt, RenderType::entitySolid);
-        this.headPiece.render(cyl, cyo10, integer6, integer7);
-        this.footPiece.render(cyl, cyo10, integer6, integer7);
-        this.legs[0].render(cyl, cyo10, integer6, integer7);
-        this.legs[1].render(cyl, cyo10, integer6, integer7);
-        this.legs[2].render(cyl, cyo10, integer6, integer7);
-        this.legs[3].render(cyl, cyo10, integer6, integer7);
-        cyl.popPose();
+        dhl.pushPose();
+        dhl.translate(0.0, 0.5625, boolean8 ? -1.0 : 0.0);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
+        dhl.translate(0.5, 0.5, 0.5);
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(180.0f + fz.toYRot()));
+        dhl.translate(-0.5, -0.5, -0.5);
+        final VertexConsumer dhp10 = enk.buffer(ebz, RenderType::entitySolid);
+        this.headPiece.render(dhl, dhp10, integer6, integer7);
+        this.footPiece.render(dhl, dhp10, integer6, integer7);
+        this.legs[0].render(dhl, dhp10, integer6, integer7);
+        this.legs[1].render(dhl, dhp10, integer6, integer7);
+        this.legs[2].render(dhl, dhp10, integer6, integer7);
+        this.legs[3].render(dhl, dhp10, integer6, integer7);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/blockentity/BellRenderer.java b/src/net/minecraft/client/renderer/blockentity/BellRenderer.java
index 6a66f08..b1669c2 100644
--- a/src/net/minecraft/client/renderer/blockentity/BellRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/BellRenderer.java
@@ -17,40 +17,40 @@ public class BellRenderer extends BlockEntityRenderer<BellBlockEntity> {
     public static final Material BELL_RESOURCE_LOCATION;
     private final ModelPart bellBody;
     
-    public BellRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public BellRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
         (this.bellBody = new ModelPart(32, 32, 0, 0)).addBox(-3.0f, -6.0f, -3.0f, 6.0f, 7.0f, 6.0f);
         this.bellBody.setPos(8.0f, 12.0f, 8.0f);
-        final ModelPart dni3 = new ModelPart(32, 32, 0, 13);
-        dni3.addBox(4.0f, 4.0f, 4.0f, 8.0f, 2.0f, 8.0f);
-        dni3.setPos(-8.0f, -12.0f, -8.0f);
-        this.bellBody.addChild(dni3);
+        final ModelPart dyg3 = new ModelPart(32, 32, 0, 13);
+        dyg3.addBox(4.0f, 4.0f, 4.0f, 8.0f, 2.0f, 8.0f);
+        dyg3.setPos(-8.0f, -12.0f, -8.0f);
+        this.bellBody.addChild(dyg3);
     }
     
     @Override
-    public void render(final BellBlockEntity bwj, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final float float3 = bwj.ticks + float2;
+    public void render(final BellBlockEntity cdj, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final float float3 = cdj.ticks + float2;
         float float4 = 0.0f;
         float float5 = 0.0f;
-        if (bwj.shaking) {
+        if (cdj.shaking) {
             final float float6 = Mth.sin(float3 / 3.1415927f) / (4.0f + float3 / 3.0f);
-            if (bwj.clickDirection == Direction.NORTH) {
+            if (cdj.clickDirection == Direction.NORTH) {
                 float4 = -float6;
             }
-            else if (bwj.clickDirection == Direction.SOUTH) {
+            else if (cdj.clickDirection == Direction.SOUTH) {
                 float4 = float6;
             }
-            else if (bwj.clickDirection == Direction.EAST) {
+            else if (cdj.clickDirection == Direction.EAST) {
                 float5 = -float6;
             }
-            else if (bwj.clickDirection == Direction.WEST) {
+            else if (cdj.clickDirection == Direction.WEST) {
                 float5 = float6;
             }
         }
         this.bellBody.xRot = float4;
         this.bellBody.zRot = float5;
-        final VertexConsumer cyo11 = BellRenderer.BELL_RESOURCE_LOCATION.buffer(dqt, RenderType::entitySolid);
-        this.bellBody.render(cyl, cyo11, integer5, integer6);
+        final VertexConsumer dhp11 = BellRenderer.BELL_RESOURCE_LOCATION.buffer(ebz, RenderType::entitySolid);
+        this.bellBody.render(dhl, dhp11, integer5, integer6);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/blockentity/BlockEntityRenderDispatcher.java b/src/net/minecraft/client/renderer/blockentity/BlockEntityRenderDispatcher.java
index 447ad4a..ba7d5b9 100644
--- a/src/net/minecraft/client/renderer/blockentity/BlockEntityRenderDispatcher.java
+++ b/src/net/minecraft/client/renderer/blockentity/BlockEntityRenderDispatcher.java
@@ -6,6 +6,9 @@ import net.minecraft.CrashReport;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.core.Position;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
 import javax.annotation.Nullable;
@@ -70,75 +73,75 @@ public class BlockEntityRenderDispatcher {
         this.<CampfireBlockEntity>register(BlockEntityType.CAMPFIRE, new CampfireRenderer(this));
     }
     
-    private <E extends BlockEntity> void register(final BlockEntityType<E> bwm, final BlockEntityRenderer<E> dsr) {
-        this.renderers.put(bwm, dsr);
+    private <E extends BlockEntity> void register(final BlockEntityType<E> cdm, final BlockEntityRenderer<E> edx) {
+        this.renderers.put(cdm, edx);
     }
     
     @Nullable
-    public <E extends BlockEntity> BlockEntityRenderer<E> getRenderer(final E bwl) {
-        return (BlockEntityRenderer<E>)this.renderers.get(bwl.getType());
+    public <E extends BlockEntity> BlockEntityRenderer<E> getRenderer(final E cdl) {
+        return (BlockEntityRenderer<E>)this.renderers.get(cdl.getType());
     }
     
-    public void prepare(final Level bjw, final TextureManager eak, final Font dch, final Camera dbb, final HitResult cvi) {
-        if (this.level != bjw) {
-            this.setLevel(bjw);
+    public void prepare(final Level bqb, final TextureManager elw, final Font dmt, final Camera dlj, final HitResult dej) {
+        if (this.level != bqb) {
+            this.setLevel(bqb);
         }
-        this.textureManager = eak;
-        this.camera = dbb;
-        this.font = dch;
-        this.cameraHitResult = cvi;
+        this.textureManager = elw;
+        this.camera = dlj;
+        this.font = dmt;
+        this.cameraHitResult = dej;
     }
     
-    public <E extends BlockEntity> void render(final E bwl, final float float2, final PoseStack cyl, final MultiBufferSource dqt) {
-        if (bwl.distanceToSqr(this.camera.getPosition().x, this.camera.getPosition().y, this.camera.getPosition().z) >= bwl.getViewDistance()) {
+    public <E extends BlockEntity> void render(final E cdl, final float float2, final PoseStack dhl, final MultiBufferSource ebz) {
+        if (!Vec3.atCenterOf(cdl.getBlockPos()).closerThan(this.camera.getPosition(), cdl.getViewDistance())) {
             return;
         }
-        final BlockEntityRenderer<E> dsr6 = this.<E>getRenderer(bwl);
-        if (dsr6 == null) {
+        final BlockEntityRenderer<E> edx6 = this.<E>getRenderer(cdl);
+        if (edx6 == null) {
             return;
         }
-        if (!bwl.hasLevel() || !bwl.getType().isValid(bwl.getBlockState().getBlock())) {
+        if (!cdl.hasLevel() || !cdl.getType().isValid(cdl.getBlockState().getBlock())) {
             return;
         }
-        tryRender(bwl, () -> BlockEntityRenderDispatcher.<E>setupAndRender(dsr6, bwl, float2, cyl, dqt));
+        tryRender(cdl, () -> BlockEntityRenderDispatcher.<E>setupAndRender(edx6, cdl, float2, dhl, ebz));
     }
     
-    private static <T extends BlockEntity> void setupAndRender(final BlockEntityRenderer<T> dsr, final T bwl, final float float3, final PoseStack cyl, final MultiBufferSource dqt) {
-        final Level bjw7 = bwl.getLevel();
+    private static <T extends BlockEntity> void setupAndRender(final BlockEntityRenderer<T> edx, final T cdl, final float float3, final PoseStack dhl, final MultiBufferSource ebz) {
+        final Level bqb7 = cdl.getLevel();
         int integer6;
-        if (bjw7 != null) {
-            integer6 = LevelRenderer.getLightColor(bjw7, bwl.getBlockPos());
+        if (bqb7 != null) {
+            integer6 = LevelRenderer.getLightColor(bqb7, cdl.getBlockPos());
         }
         else {
             integer6 = 15728880;
         }
-        dsr.render(bwl, float3, cyl, dqt, integer6, OverlayTexture.NO_OVERLAY);
+        edx.render(cdl, float3, dhl, ebz, integer6, OverlayTexture.NO_OVERLAY);
     }
     
-    public <E extends BlockEntity> boolean renderItem(final E bwl, final PoseStack cyl, final MultiBufferSource dqt, final int integer4, final int integer5) {
-        final BlockEntityRenderer<E> dsr7 = this.<E>getRenderer(bwl);
-        if (dsr7 == null) {
+    public <E extends BlockEntity> boolean renderItem(final E cdl, final PoseStack dhl, final MultiBufferSource ebz, final int integer4, final int integer5) {
+        final BlockEntityRenderer<E> edx7 = this.<E>getRenderer(cdl);
+        if (edx7 == null) {
             return true;
         }
-        tryRender(bwl, () -> dsr7.render(bwl, 0.0f, cyl, dqt, integer4, integer5));
+        tryRender(cdl, () -> edx7.render(cdl, 0.0f, dhl, ebz, integer4, integer5));
         return false;
     }
     
-    private static void tryRender(final BlockEntity bwl, final Runnable runnable) {
+    private static void tryRender(final BlockEntity cdl, final Runnable runnable) {
         try {
             runnable.run();
         }
         catch (Throwable throwable3) {
-            final CrashReport h4 = CrashReport.forThrowable(throwable3, "Rendering Block Entity");
-            final CrashReportCategory i5 = h4.addCategory("Block Entity Details");
-            bwl.fillCrashReportCategory(i5);
-            throw new ReportedException(h4);
+            final CrashReport j4 = CrashReport.forThrowable(throwable3, "Rendering Block Entity");
+            final CrashReportCategory k5 = j4.addCategory("Block Entity Details");
+            cdl.fillCrashReportCategory(k5);
+            throw new ReportedException(j4);
         }
     }
     
-    public void setLevel(@Nullable final Level bjw) {
-        this.level = bjw;
-        if (bjw == null) {
+    public void setLevel(@Nullable final Level bqb) {
+        this.level = bqb;
+        if (bqb == null) {
             this.camera = null;
         }
     }
diff --git a/src/net/minecraft/client/renderer/blockentity/BlockEntityRenderer.java b/src/net/minecraft/client/renderer/blockentity/BlockEntityRenderer.java
index 5d10472..d82a7e6 100644
--- a/src/net/minecraft/client/renderer/blockentity/BlockEntityRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/BlockEntityRenderer.java
@@ -7,13 +7,13 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 public abstract class BlockEntityRenderer<T extends BlockEntity> {
     protected final BlockEntityRenderDispatcher renderer;
     
-    public BlockEntityRenderer(final BlockEntityRenderDispatcher dsq) {
-        this.renderer = dsq;
+    public BlockEntityRenderer(final BlockEntityRenderDispatcher edw) {
+        this.renderer = edw;
     }
     
-    public abstract void render(final T bwl, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6);
+    public abstract void render(final T cdl, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6);
     
-    public boolean shouldRenderOffScreen(final T bwl) {
+    public boolean shouldRenderOffScreen(final T cdl) {
         return false;
     }
 }
diff --git a/src/net/minecraft/client/renderer/blockentity/BrightnessCombiner.java b/src/net/minecraft/client/renderer/blockentity/BrightnessCombiner.java
index 115da95..72361f5 100644
--- a/src/net/minecraft/client/renderer/blockentity/BrightnessCombiner.java
+++ b/src/net/minecraft/client/renderer/blockentity/BrightnessCombiner.java
@@ -9,10 +9,10 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 
 public class BrightnessCombiner<S extends BlockEntity> implements DoubleBlockCombiner.Combiner<S, Int2IntFunction> {
     @Override
-    public Int2IntFunction acceptDouble(final S bwl1, final S bwl2) {
+    public Int2IntFunction acceptDouble(final S cdl1, final S cdl2) {
         return integer -> {
-            final int integer2 = LevelRenderer.getLightColor(bwl1.getLevel(), bwl1.getBlockPos());
-            final int integer3 = LevelRenderer.getLightColor(bwl2.getLevel(), bwl2.getBlockPos());
+            final int integer2 = LevelRenderer.getLightColor(cdl1.getLevel(), cdl1.getBlockPos());
+            final int integer3 = LevelRenderer.getLightColor(cdl2.getLevel(), cdl2.getBlockPos());
             final int integer4 = LightTexture.block(integer2);
             final int integer5 = LightTexture.block(integer3);
             final int integer6 = LightTexture.sky(integer2);
@@ -22,7 +22,7 @@ public class BrightnessCombiner<S extends BlockEntity> implements DoubleBlockCom
     }
     
     @Override
-    public Int2IntFunction acceptSingle(final S bwl) {
+    public Int2IntFunction acceptSingle(final S cdl) {
         return integer -> integer;
     }
     
diff --git a/src/net/minecraft/client/renderer/blockentity/CampfireRenderer.java b/src/net/minecraft/client/renderer/blockentity/CampfireRenderer.java
index 55891e2..da2e151 100644
--- a/src/net/minecraft/client/renderer/blockentity/CampfireRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/CampfireRenderer.java
@@ -14,27 +14,27 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.level.block.entity.CampfireBlockEntity;
 
 public class CampfireRenderer extends BlockEntityRenderer<CampfireBlockEntity> {
-    public CampfireRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public CampfireRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
     }
     
     @Override
-    public void render(final CampfireBlockEntity bwo, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final Direction fp8 = bwo.getBlockState().<Direction>getValue((Property<Direction>)CampfireBlock.FACING);
-        final NonNullList<ItemStack> fy9 = bwo.getItems();
-        for (int integer7 = 0; integer7 < fy9.size(); ++integer7) {
-            final ItemStack ben11 = fy9.get(integer7);
-            if (ben11 != ItemStack.EMPTY) {
-                cyl.pushPose();
-                cyl.translate(0.5, 0.44921875, 0.5);
-                final Direction fp9 = Direction.from2DDataValue((integer7 + fp8.get2DDataValue()) % 4);
-                final float float3 = -fp9.toYRot();
-                cyl.mulPose(Vector3f.YP.rotationDegrees(float3));
-                cyl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
-                cyl.translate(-0.3125, -0.3125, 0.0);
-                cyl.scale(0.375f, 0.375f, 0.375f);
-                Minecraft.getInstance().getItemRenderer().renderStatic(ben11, ItemTransforms.TransformType.FIXED, integer5, integer6, cyl, dqt);
-                cyl.popPose();
+    public void render(final CampfireBlockEntity cdo, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final Direction fz8 = cdo.getBlockState().<Direction>getValue((Property<Direction>)CampfireBlock.FACING);
+        final NonNullList<ItemStack> gi9 = cdo.getItems();
+        for (int integer7 = 0; integer7 < gi9.size(); ++integer7) {
+            final ItemStack bki11 = gi9.get(integer7);
+            if (bki11 != ItemStack.EMPTY) {
+                dhl.pushPose();
+                dhl.translate(0.5, 0.44921875, 0.5);
+                final Direction fz9 = Direction.from2DDataValue((integer7 + fz8.get2DDataValue()) % 4);
+                final float float3 = -fz9.toYRot();
+                dhl.mulPose(Vector3f.YP.rotationDegrees(float3));
+                dhl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
+                dhl.translate(-0.3125, -0.3125, 0.0);
+                dhl.scale(0.375f, 0.375f, 0.375f);
+                Minecraft.getInstance().getItemRenderer().renderStatic(bki11, ItemTransforms.TransformType.FIXED, integer5, integer6, dhl, ebz);
+                dhl.popPose();
             }
         }
     }
diff --git a/src/net/minecraft/client/renderer/blockentity/ChestRenderer.java b/src/net/minecraft/client/renderer/blockentity/ChestRenderer.java
index 05dd3d2..4793e51 100644
--- a/src/net/minecraft/client/renderer/blockentity/ChestRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/ChestRenderer.java
@@ -1,6 +1,6 @@
 package net.minecraft.client.renderer.blockentity;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.resources.model.Material;
 import net.minecraft.world.level.block.Block;
@@ -37,8 +37,8 @@ public class ChestRenderer<T extends BlockEntity> extends BlockEntityRenderer<T>
     private final ModelPart doubleRightLock;
     private boolean xmasTextures;
     
-    public ChestRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public ChestRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
         final Calendar calendar3 = Calendar.getInstance();
         if (calendar3.get(2) + 1 == 12 && calendar3.get(5) >= 24 && calendar3.get(5) <= 26) {
             this.xmasTextures = true;
@@ -64,54 +64,54 @@ public class ChestRenderer<T extends BlockEntity> extends BlockEntityRenderer<T>
     }
     
     @Override
-    public void render(final T bwl, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final Level bjw8 = ((BlockEntity)bwl).getLevel();
-        final boolean boolean9 = bjw8 != null;
-        final BlockState byj10 = boolean9 ? ((BlockEntity)bwl).getBlockState() : ((AbstractStateHolder<O, BlockState>)Blocks.CHEST.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, Direction.SOUTH);
-        final ChestType bzc11 = byj10.<ChestType>hasProperty(ChestBlock.TYPE) ? byj10.<ChestType>getValue(ChestBlock.TYPE) : ChestType.SINGLE;
-        final Block bph12 = byj10.getBlock();
-        if (!(bph12 instanceof AbstractChestBlock)) {
+    public void render(final T cdl, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final Level bqb8 = ((BlockEntity)cdl).getLevel();
+        final boolean boolean9 = bqb8 != null;
+        final BlockState cfj10 = boolean9 ? ((BlockEntity)cdl).getBlockState() : ((StateHolder<O, BlockState>)Blocks.CHEST.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, Direction.SOUTH);
+        final ChestType cgb11 = cfj10.<ChestType>hasProperty(ChestBlock.TYPE) ? cfj10.<ChestType>getValue(ChestBlock.TYPE) : ChestType.SINGLE;
+        final Block bvr12 = cfj10.getBlock();
+        if (!(bvr12 instanceof AbstractChestBlock)) {
             return;
         }
-        final AbstractChestBlock<?> bog13 = bph12;
-        final boolean boolean10 = bzc11 != ChestType.SINGLE;
-        cyl.pushPose();
-        final float float3 = byj10.<Direction>getValue((Property<Direction>)ChestBlock.FACING).toYRot();
-        cyl.translate(0.5, 0.5, 0.5);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(-float3));
-        cyl.translate(-0.5, -0.5, -0.5);
+        final AbstractChestBlock<?> buq13 = bvr12;
+        final boolean boolean10 = cgb11 != ChestType.SINGLE;
+        dhl.pushPose();
+        final float float3 = cfj10.<Direction>getValue((Property<Direction>)ChestBlock.FACING).toYRot();
+        dhl.translate(0.5, 0.5, 0.5);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(-float3));
+        dhl.translate(-0.5, -0.5, -0.5);
         DoubleBlockCombiner.NeighborCombineResult<? extends ChestBlockEntity> c16;
         if (boolean9) {
-            c16 = bog13.combine(byj10, bjw8, ((BlockEntity)bwl).getBlockPos(), true);
+            c16 = buq13.combine(cfj10, bqb8, ((BlockEntity)cdl).getBlockPos(), true);
         }
         else {
             c16 = DoubleBlockCombiner.Combiner::acceptNone;
         }
-        float float4 = c16.<Float2FloatFunction>apply(ChestBlock.opennessCombiner((LidBlockEntity)bwl)).get(float2);
+        float float4 = c16.<Float2FloatFunction>apply(ChestBlock.opennessCombiner((LidBlockEntity)cdl)).get(float2);
         float4 = 1.0f - float4;
         float4 = 1.0f - float4 * float4 * float4;
         final int integer7 = c16.<Int2IntFunction>apply(new BrightnessCombiner<>()).applyAsInt(integer5);
-        final Material eby19 = Sheets.chooseMaterial((BlockEntity)bwl, bzc11, this.xmasTextures);
-        final VertexConsumer cyo20 = eby19.buffer(dqt, RenderType::entityCutout);
+        final Material enk19 = Sheets.chooseMaterial((BlockEntity)cdl, cgb11, this.xmasTextures);
+        final VertexConsumer dhp20 = enk19.buffer(ebz, RenderType::entityCutout);
         if (boolean10) {
-            if (bzc11 == ChestType.LEFT) {
-                this.render(cyl, cyo20, this.doubleRightLid, this.doubleRightLock, this.doubleRightBottom, float4, integer7, integer6);
+            if (cgb11 == ChestType.LEFT) {
+                this.render(dhl, dhp20, this.doubleRightLid, this.doubleRightLock, this.doubleRightBottom, float4, integer7, integer6);
             }
             else {
-                this.render(cyl, cyo20, this.doubleLeftLid, this.doubleLeftLock, this.doubleLeftBottom, float4, integer7, integer6);
+                this.render(dhl, dhp20, this.doubleLeftLid, this.doubleLeftLock, this.doubleLeftBottom, float4, integer7, integer6);
             }
         }
         else {
-            this.render(cyl, cyo20, this.lid, this.lock, this.bottom, float4, integer7, integer6);
+            this.render(dhl, dhp20, this.lid, this.lock, this.bottom, float4, integer7, integer6);
         }
-        cyl.popPose();
+        dhl.popPose();
     }
     
-    private void render(final PoseStack cyl, final VertexConsumer cyo, final ModelPart dni3, final ModelPart dni4, final ModelPart dni5, final float float6, final int integer7, final int integer8) {
-        dni3.xRot = -(float6 * 1.5707964f);
-        dni4.xRot = dni3.xRot;
-        dni3.render(cyl, cyo, integer7, integer8);
-        dni4.render(cyl, cyo, integer7, integer8);
-        dni5.render(cyl, cyo, integer7, integer8);
+    private void render(final PoseStack dhl, final VertexConsumer dhp, final ModelPart dyg3, final ModelPart dyg4, final ModelPart dyg5, final float float6, final int integer7, final int integer8) {
+        dyg3.xRot = -(float6 * 1.5707964f);
+        dyg4.xRot = dyg3.xRot;
+        dyg3.render(dhl, dhp, integer7, integer8);
+        dyg4.render(dhl, dhp, integer7, integer8);
+        dyg5.render(dhl, dhp, integer7, integer8);
     }
 }
diff --git a/src/net/minecraft/client/renderer/blockentity/ConduitRenderer.java b/src/net/minecraft/client/renderer/blockentity/ConduitRenderer.java
index c1c03e0..4674dd8 100644
--- a/src/net/minecraft/client/renderer/blockentity/ConduitRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/ConduitRenderer.java
@@ -27,8 +27,8 @@ public class ConduitRenderer extends BlockEntityRenderer<ConduitBlockEntity> {
     private final ModelPart shell;
     private final ModelPart cage;
     
-    public ConduitRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public ConduitRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
         (this.eye = new ModelPart(16, 16, 0, 0)).addBox(-4.0f, -4.0f, 0.0f, 8.0f, 8.0f, 0.0f, 0.01f);
         (this.wind = new ModelPart(64, 32, 0, 0)).addBox(-8.0f, -8.0f, -8.0f, 16.0f, 16.0f, 16.0f);
         (this.shell = new ModelPart(32, 16, 0, 0)).addBox(-3.0f, -3.0f, -3.0f, 6.0f, 6.0f, 6.0f);
@@ -36,59 +36,59 @@ public class ConduitRenderer extends BlockEntityRenderer<ConduitBlockEntity> {
     }
     
     @Override
-    public void render(final ConduitBlockEntity bws, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final float float3 = bws.tickCount + float2;
-        if (!bws.isActive()) {
-            final float float4 = bws.getActiveRotation(0.0f);
-            final VertexConsumer cyo10 = ConduitRenderer.SHELL_TEXTURE.buffer(dqt, RenderType::entitySolid);
-            cyl.pushPose();
-            cyl.translate(0.5, 0.5, 0.5);
-            cyl.mulPose(Vector3f.YP.rotationDegrees(float4));
-            this.shell.render(cyl, cyo10, integer5, integer6);
-            cyl.popPose();
+    public void render(final ConduitBlockEntity cds, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final float float3 = cds.tickCount + float2;
+        if (!cds.isActive()) {
+            final float float4 = cds.getActiveRotation(0.0f);
+            final VertexConsumer dhp10 = ConduitRenderer.SHELL_TEXTURE.buffer(ebz, RenderType::entitySolid);
+            dhl.pushPose();
+            dhl.translate(0.5, 0.5, 0.5);
+            dhl.mulPose(Vector3f.YP.rotationDegrees(float4));
+            this.shell.render(dhl, dhp10, integer5, integer6);
+            dhl.popPose();
             return;
         }
-        final float float4 = bws.getActiveRotation(float2) * 57.295776f;
+        final float float4 = cds.getActiveRotation(float2) * 57.295776f;
         float float5 = Mth.sin(float3 * 0.1f) / 2.0f + 0.5f;
         float5 += float5 * float5;
-        cyl.pushPose();
-        cyl.translate(0.5, 0.3f + float5 * 0.2f, 0.5);
-        final Vector3f e11 = new Vector3f(0.5f, 1.0f, 0.5f);
-        e11.normalize();
-        cyl.mulPose(new Quaternion(e11, float4, true));
-        this.cage.render(cyl, ConduitRenderer.ACTIVE_SHELL_TEXTURE.buffer(dqt, RenderType::entityCutoutNoCull), integer5, integer6);
-        cyl.popPose();
-        final int integer7 = bws.tickCount / 66 % 3;
-        cyl.pushPose();
-        cyl.translate(0.5, 0.5, 0.5);
+        dhl.pushPose();
+        dhl.translate(0.5, 0.3f + float5 * 0.2f, 0.5);
+        final Vector3f g11 = new Vector3f(0.5f, 1.0f, 0.5f);
+        g11.normalize();
+        dhl.mulPose(new Quaternion(g11, float4, true));
+        this.cage.render(dhl, ConduitRenderer.ACTIVE_SHELL_TEXTURE.buffer(ebz, RenderType::entityCutoutNoCull), integer5, integer6);
+        dhl.popPose();
+        final int integer7 = cds.tickCount / 66 % 3;
+        dhl.pushPose();
+        dhl.translate(0.5, 0.5, 0.5);
         if (integer7 == 1) {
-            cyl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
+            dhl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
         }
         else if (integer7 == 2) {
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
         }
-        final VertexConsumer cyo11 = ((integer7 == 1) ? ConduitRenderer.VERTICAL_WIND_TEXTURE : ConduitRenderer.WIND_TEXTURE).buffer(dqt, RenderType::entityCutoutNoCull);
-        this.wind.render(cyl, cyo11, integer5, integer6);
-        cyl.popPose();
-        cyl.pushPose();
-        cyl.translate(0.5, 0.5, 0.5);
-        cyl.scale(0.875f, 0.875f, 0.875f);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(180.0f));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
-        this.wind.render(cyl, cyo11, integer5, integer6);
-        cyl.popPose();
-        final Camera dbb14 = this.renderer.camera;
-        cyl.pushPose();
-        cyl.translate(0.5, 0.3f + float5 * 0.2f, 0.5);
-        cyl.scale(0.5f, 0.5f, 0.5f);
-        final float float6 = -dbb14.getYRot();
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float6));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(dbb14.getXRot()));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
+        final VertexConsumer dhp11 = ((integer7 == 1) ? ConduitRenderer.VERTICAL_WIND_TEXTURE : ConduitRenderer.WIND_TEXTURE).buffer(ebz, RenderType::entityCutoutNoCull);
+        this.wind.render(dhl, dhp11, integer5, integer6);
+        dhl.popPose();
+        dhl.pushPose();
+        dhl.translate(0.5, 0.5, 0.5);
+        dhl.scale(0.875f, 0.875f, 0.875f);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(180.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
+        this.wind.render(dhl, dhp11, integer5, integer6);
+        dhl.popPose();
+        final Camera dlj14 = this.renderer.camera;
+        dhl.pushPose();
+        dhl.translate(0.5, 0.3f + float5 * 0.2f, 0.5);
+        dhl.scale(0.5f, 0.5f, 0.5f);
+        final float float6 = -dlj14.getYRot();
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float6));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(dlj14.getXRot()));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
         final float float7 = 1.3333334f;
-        cyl.scale(1.3333334f, 1.3333334f, 1.3333334f);
-        this.eye.render(cyl, (bws.isHunting() ? ConduitRenderer.OPEN_EYE_TEXTURE : ConduitRenderer.CLOSED_EYE_TEXTURE).buffer(dqt, RenderType::entityCutoutNoCull), integer5, integer6);
-        cyl.popPose();
+        dhl.scale(1.3333334f, 1.3333334f, 1.3333334f);
+        this.eye.render(dhl, (cds.isHunting() ? ConduitRenderer.OPEN_EYE_TEXTURE : ConduitRenderer.CLOSED_EYE_TEXTURE).buffer(ebz, RenderType::entityCutoutNoCull), integer5, integer6);
+        dhl.popPose();
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/blockentity/EnchantTableRenderer.java b/src/net/minecraft/client/renderer/blockentity/EnchantTableRenderer.java
index ef5838a..3025db7 100644
--- a/src/net/minecraft/client/renderer/blockentity/EnchantTableRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/EnchantTableRenderer.java
@@ -17,33 +17,33 @@ public class EnchantTableRenderer extends BlockEntityRenderer<EnchantmentTableBl
     public static final Material BOOK_LOCATION;
     private final BookModel bookModel;
     
-    public EnchantTableRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public EnchantTableRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
         this.bookModel = new BookModel();
     }
     
     @Override
-    public void render(final EnchantmentTableBlockEntity bww, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        cyl.pushPose();
-        cyl.translate(0.5, 0.75, 0.5);
-        final float float3 = bww.time + float2;
-        cyl.translate(0.0, 0.1f + Mth.sin(float3 * 0.1f) * 0.01f, 0.0);
+    public void render(final EnchantmentTableBlockEntity cdw, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        dhl.pushPose();
+        dhl.translate(0.5, 0.75, 0.5);
+        final float float3 = cdw.time + float2;
+        dhl.translate(0.0, 0.1f + Mth.sin(float3 * 0.1f) * 0.01f, 0.0);
         float float4;
-        for (float4 = bww.rot - bww.oRot; float4 >= 3.1415927f; float4 -= 6.2831855f) {}
+        for (float4 = cdw.rot - cdw.oRot; float4 >= 3.1415927f; float4 -= 6.2831855f) {}
         while (float4 < -3.1415927f) {
             float4 += 6.2831855f;
         }
-        final float float5 = bww.oRot + float4 * float2;
-        cyl.mulPose(Vector3f.YP.rotation(-float5));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(80.0f));
-        final float float6 = Mth.lerp(float2, bww.oFlip, bww.flip);
+        final float float5 = cdw.oRot + float4 * float2;
+        dhl.mulPose(Vector3f.YP.rotation(-float5));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(80.0f));
+        final float float6 = Mth.lerp(float2, cdw.oFlip, cdw.flip);
         final float float7 = Mth.frac(float6 + 0.25f) * 1.6f - 0.3f;
         final float float8 = Mth.frac(float6 + 0.75f) * 1.6f - 0.3f;
-        final float float9 = Mth.lerp(float2, bww.oOpen, bww.open);
+        final float float9 = Mth.lerp(float2, cdw.oOpen, cdw.open);
         this.bookModel.setupAnim(float3, Mth.clamp(float7, 0.0f, 1.0f), Mth.clamp(float8, 0.0f, 1.0f), float9);
-        final VertexConsumer cyo15 = EnchantTableRenderer.BOOK_LOCATION.buffer(dqt, RenderType::entitySolid);
-        this.bookModel.render(cyl, cyo15, integer5, integer6, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.popPose();
+        final VertexConsumer dhp15 = EnchantTableRenderer.BOOK_LOCATION.buffer(ebz, RenderType::entitySolid);
+        this.bookModel.render(dhl, dhp15, integer5, integer6, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.popPose();
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/blockentity/LecternRenderer.java b/src/net/minecraft/client/renderer/blockentity/LecternRenderer.java
index 6a40dbf..2383cf9 100644
--- a/src/net/minecraft/client/renderer/blockentity/LecternRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/LecternRenderer.java
@@ -16,26 +16,26 @@ import net.minecraft.world.level.block.entity.LecternBlockEntity;
 public class LecternRenderer extends BlockEntityRenderer<LecternBlockEntity> {
     private final BookModel bookModel;
     
-    public LecternRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public LecternRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
         this.bookModel = new BookModel();
     }
     
     @Override
-    public void render(final LecternBlockEntity bxd, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final BlockState byj8 = bxd.getBlockState();
-        if (!byj8.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
+    public void render(final LecternBlockEntity ced, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final BlockState cfj8 = ced.getBlockState();
+        if (!cfj8.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
             return;
         }
-        cyl.pushPose();
-        cyl.translate(0.5, 1.0625, 0.5);
-        final float float3 = byj8.<Direction>getValue((Property<Direction>)LecternBlock.FACING).getClockWise().toYRot();
-        cyl.mulPose(Vector3f.YP.rotationDegrees(-float3));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(67.5f));
-        cyl.translate(0.0, -0.125, 0.0);
+        dhl.pushPose();
+        dhl.translate(0.5, 1.0625, 0.5);
+        final float float3 = cfj8.<Direction>getValue((Property<Direction>)LecternBlock.FACING).getClockWise().toYRot();
+        dhl.mulPose(Vector3f.YP.rotationDegrees(-float3));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(67.5f));
+        dhl.translate(0.0, -0.125, 0.0);
         this.bookModel.setupAnim(0.0f, 0.1f, 0.9f, 1.2f);
-        final VertexConsumer cyo10 = EnchantTableRenderer.BOOK_LOCATION.buffer(dqt, RenderType::entitySolid);
-        this.bookModel.render(cyl, cyo10, integer5, integer6, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.popPose();
+        final VertexConsumer dhp10 = EnchantTableRenderer.BOOK_LOCATION.buffer(ebz, RenderType::entitySolid);
+        this.bookModel.render(dhl, dhp10, integer5, integer6, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/blockentity/PistonHeadRenderer.java b/src/net/minecraft/client/renderer/blockentity/PistonHeadRenderer.java
index ed9200b..722ad13 100644
--- a/src/net/minecraft/client/renderer/blockentity/PistonHeadRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/PistonHeadRenderer.java
@@ -1,6 +1,6 @@
 package net.minecraft.client.renderer.blockentity;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.renderer.RenderType;
@@ -25,50 +25,50 @@ import net.minecraft.world.level.block.piston.PistonMovingBlockEntity;
 public class PistonHeadRenderer extends BlockEntityRenderer<PistonMovingBlockEntity> {
     private final BlockRenderDispatcher blockRenderer;
     
-    public PistonHeadRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public PistonHeadRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
         this.blockRenderer = Minecraft.getInstance().getBlockRenderer();
     }
     
     @Override
-    public void render(final PistonMovingBlockEntity byf, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final Level bjw8 = byf.getLevel();
-        if (bjw8 == null) {
+    public void render(final PistonMovingBlockEntity cff, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final Level bqb8 = cff.getLevel();
+        if (bqb8 == null) {
             return;
         }
-        final BlockPos fk9 = byf.getBlockPos().relative(byf.getMovementDirection().getOpposite());
-        BlockState byj10 = byf.getMovedState();
-        if (byj10.isAir() || byf.getProgress(float2) >= 1.0f) {
+        final BlockPos fu9 = cff.getBlockPos().relative(cff.getMovementDirection().getOpposite());
+        BlockState cfj10 = cff.getMovedState();
+        if (cfj10.isAir() || cff.getProgress(float2) >= 1.0f) {
             return;
         }
         ModelBlockRenderer.enableCaching();
-        cyl.pushPose();
-        cyl.translate(byf.getXOff(float2), byf.getYOff(float2), byf.getZOff(float2));
-        if (byj10.getBlock() == Blocks.PISTON_HEAD && byf.getProgress(float2) <= 4.0f) {
-            byj10 = ((AbstractStateHolder<O, BlockState>)byj10).<Comparable, Boolean>setValue((Property<Comparable>)PistonHeadBlock.SHORT, true);
-            this.renderBlock(fk9, byj10, cyl, dqt, bjw8, false, integer6);
+        dhl.pushPose();
+        dhl.translate(cff.getXOff(float2), cff.getYOff(float2), cff.getZOff(float2));
+        if (cfj10.is(Blocks.PISTON_HEAD) && cff.getProgress(float2) <= 4.0f) {
+            cfj10 = ((StateHolder<O, BlockState>)cfj10).<Comparable, Boolean>setValue((Property<Comparable>)PistonHeadBlock.SHORT, cff.getProgress(float2) <= 0.5f);
+            this.renderBlock(fu9, cfj10, dhl, ebz, bqb8, false, integer6);
         }
-        else if (byf.isSourcePiston() && !byf.isExtending()) {
-            final PistonType bzl11 = (byj10.getBlock() == Blocks.STICKY_PISTON) ? PistonType.STICKY : PistonType.DEFAULT;
-            BlockState byj11 = (((AbstractStateHolder<O, BlockState>)Blocks.PISTON_HEAD.defaultBlockState()).setValue(PistonHeadBlock.TYPE, bzl11)).<Comparable, Comparable>setValue((Property<Comparable>)PistonHeadBlock.FACING, (Comparable)byj10.<V>getValue((Property<V>)PistonBaseBlock.FACING));
-            byj11 = ((AbstractStateHolder<O, BlockState>)byj11).<Comparable, Boolean>setValue((Property<Comparable>)PistonHeadBlock.SHORT, byf.getProgress(float2) >= 0.5f);
-            this.renderBlock(fk9, byj11, cyl, dqt, bjw8, false, integer6);
-            final BlockPos fk10 = fk9.relative(byf.getMovementDirection());
-            cyl.popPose();
-            cyl.pushPose();
-            byj10 = ((AbstractStateHolder<O, BlockState>)byj10).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, true);
-            this.renderBlock(fk10, byj10, cyl, dqt, bjw8, true, integer6);
+        else if (cff.isSourcePiston() && !cff.isExtending()) {
+            final PistonType cgk11 = cfj10.is(Blocks.STICKY_PISTON) ? PistonType.STICKY : PistonType.DEFAULT;
+            BlockState cfj11 = (((StateHolder<O, BlockState>)Blocks.PISTON_HEAD.defaultBlockState()).setValue(PistonHeadBlock.TYPE, cgk11)).<Comparable, Comparable>setValue((Property<Comparable>)PistonHeadBlock.FACING, (Comparable)cfj10.<V>getValue((Property<V>)PistonBaseBlock.FACING));
+            cfj11 = ((StateHolder<O, BlockState>)cfj11).<Comparable, Boolean>setValue((Property<Comparable>)PistonHeadBlock.SHORT, cff.getProgress(float2) >= 0.5f);
+            this.renderBlock(fu9, cfj11, dhl, ebz, bqb8, false, integer6);
+            final BlockPos fu10 = fu9.relative(cff.getMovementDirection());
+            dhl.popPose();
+            dhl.pushPose();
+            cfj10 = ((StateHolder<O, BlockState>)cfj10).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, true);
+            this.renderBlock(fu10, cfj10, dhl, ebz, bqb8, true, integer6);
         }
         else {
-            this.renderBlock(fk9, byj10, cyl, dqt, bjw8, false, integer6);
+            this.renderBlock(fu9, cfj10, dhl, ebz, bqb8, false, integer6);
         }
-        cyl.popPose();
+        dhl.popPose();
         ModelBlockRenderer.clearCache();
     }
     
-    private void renderBlock(final BlockPos fk, final BlockState byj, final PoseStack cyl, final MultiBufferSource dqt, final Level bjw, final boolean boolean6, final int integer) {
-        final RenderType drb9 = ItemBlockRenderTypes.getChunkRenderType(byj);
-        final VertexConsumer cyo10 = dqt.getBuffer(drb9);
-        this.blockRenderer.getModelRenderer().tesselateBlock(bjw, this.blockRenderer.getBlockModel(byj), byj, fk, cyl, cyo10, boolean6, new Random(), byj.getSeed(fk), integer);
+    private void renderBlock(final BlockPos fu, final BlockState cfj, final PoseStack dhl, final MultiBufferSource ebz, final Level bqb, final boolean boolean6, final int integer) {
+        final RenderType ech9 = ItemBlockRenderTypes.getMovingBlockRenderType(cfj);
+        final VertexConsumer dhp10 = ebz.getBuffer(ech9);
+        this.blockRenderer.getModelRenderer().tesselateBlock(bqb, this.blockRenderer.getBlockModel(cfj), cfj, fu, dhl, dhp10, boolean6, new Random(), cfj.getSeed(fu), integer);
     }
 }
diff --git a/src/net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer.java b/src/net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer.java
index c618e80..6e2d839 100644
--- a/src/net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer.java
@@ -19,40 +19,40 @@ import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
 public class ShulkerBoxRenderer extends BlockEntityRenderer<ShulkerBoxBlockEntity> {
     private final ShulkerModel<?> model;
     
-    public ShulkerBoxRenderer(final ShulkerModel<?> dmm, final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
-        this.model = dmm;
+    public ShulkerBoxRenderer(final ShulkerModel<?> dxj, final BlockEntityRenderDispatcher edw) {
+        super(edw);
+        this.model = dxj;
     }
     
     @Override
-    public void render(final ShulkerBoxBlockEntity bxg, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        Direction fp8 = Direction.UP;
-        if (bxg.hasLevel()) {
-            final BlockState byj9 = bxg.getLevel().getBlockState(bxg.getBlockPos());
-            if (byj9.getBlock() instanceof ShulkerBoxBlock) {
-                fp8 = byj9.<Direction>getValue(ShulkerBoxBlock.FACING);
+    public void render(final ShulkerBoxBlockEntity ceg, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        Direction fz8 = Direction.UP;
+        if (ceg.hasLevel()) {
+            final BlockState cfj9 = ceg.getLevel().getBlockState(ceg.getBlockPos());
+            if (cfj9.getBlock() instanceof ShulkerBoxBlock) {
+                fz8 = cfj9.<Direction>getValue(ShulkerBoxBlock.FACING);
             }
         }
-        final DyeColor bdj10 = bxg.getColor();
-        Material eby9;
-        if (bdj10 == null) {
-            eby9 = Sheets.DEFAULT_SHULKER_TEXTURE_LOCATION;
+        final DyeColor bje10 = ceg.getColor();
+        Material enk9;
+        if (bje10 == null) {
+            enk9 = Sheets.DEFAULT_SHULKER_TEXTURE_LOCATION;
         }
         else {
-            eby9 = Sheets.SHULKER_TEXTURE_LOCATION.get(bdj10.getId());
+            enk9 = Sheets.SHULKER_TEXTURE_LOCATION.get(bje10.getId());
         }
-        cyl.pushPose();
-        cyl.translate(0.5, 0.5, 0.5);
+        dhl.pushPose();
+        dhl.translate(0.5, 0.5, 0.5);
         final float float3 = 0.9995f;
-        cyl.scale(0.9995f, 0.9995f, 0.9995f);
-        cyl.mulPose(fp8.getRotation());
-        cyl.scale(1.0f, -1.0f, -1.0f);
-        cyl.translate(0.0, -1.0, 0.0);
-        final VertexConsumer cyo12 = eby9.buffer(dqt, RenderType::entityCutoutNoCull);
-        this.model.getBase().render(cyl, cyo12, integer5, integer6);
-        cyl.translate(0.0, -bxg.getProgress(float2) * 0.5f, 0.0);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(270.0f * bxg.getProgress(float2)));
-        this.model.getLid().render(cyl, cyo12, integer5, integer6);
-        cyl.popPose();
+        dhl.scale(0.9995f, 0.9995f, 0.9995f);
+        dhl.mulPose(fz8.getRotation());
+        dhl.scale(1.0f, -1.0f, -1.0f);
+        dhl.translate(0.0, -1.0, 0.0);
+        final VertexConsumer dhp12 = enk9.buffer(ebz, RenderType::entityCutoutNoCull);
+        this.model.getBase().render(dhl, dhp12, integer5, integer6);
+        dhl.translate(0.0, -ceg.getProgress(float2) * 0.5f, 0.0);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(270.0f * ceg.getProgress(float2)));
+        this.model.getLid().render(dhl, dhp12, integer5, integer6);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/blockentity/SignRenderer.java b/src/net/minecraft/client/renderer/blockentity/SignRenderer.java
index d09c68b..80ab7b4 100644
--- a/src/net/minecraft/client/renderer/blockentity/SignRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/SignRenderer.java
@@ -13,8 +13,8 @@ import net.minecraft.client.gui.Font;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.resources.model.Material;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.network.chat.Component;
-import net.minecraft.client.gui.components.ComponentRenderUtils;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.Style;
 import com.mojang.blaze3d.platform.NativeImage;
 import net.minecraft.world.level.block.WallSignBlock;
 import net.minecraft.core.Direction;
@@ -28,69 +28,70 @@ import net.minecraft.world.level.block.entity.SignBlockEntity;
 public class SignRenderer extends BlockEntityRenderer<SignBlockEntity> {
     private final SignModel signModel;
     
-    public SignRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public SignRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
         this.signModel = new SignModel();
     }
     
     @Override
-    public void render(final SignBlockEntity bxh, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final BlockState byj8 = bxh.getBlockState();
-        cyl.pushPose();
+    public void render(final SignBlockEntity ceh, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final BlockState cfj8 = ceh.getBlockState();
+        dhl.pushPose();
         final float float3 = 0.6666667f;
-        if (byj8.getBlock() instanceof StandingSignBlock) {
-            cyl.translate(0.5, 0.5, 0.5);
-            final float float4 = -(byj8.<Integer>getValue((Property<Integer>)StandingSignBlock.ROTATION) * 360 / 16.0f);
-            cyl.mulPose(Vector3f.YP.rotationDegrees(float4));
+        if (cfj8.getBlock() instanceof StandingSignBlock) {
+            dhl.translate(0.5, 0.5, 0.5);
+            final float float4 = -(cfj8.<Integer>getValue((Property<Integer>)StandingSignBlock.ROTATION) * 360 / 16.0f);
+            dhl.mulPose(Vector3f.YP.rotationDegrees(float4));
             this.signModel.stick.visible = true;
         }
         else {
-            cyl.translate(0.5, 0.5, 0.5);
-            final float float4 = -byj8.<Direction>getValue((Property<Direction>)WallSignBlock.FACING).toYRot();
-            cyl.mulPose(Vector3f.YP.rotationDegrees(float4));
-            cyl.translate(0.0, -0.3125, -0.4375);
+            dhl.translate(0.5, 0.5, 0.5);
+            final float float4 = -cfj8.<Direction>getValue((Property<Direction>)WallSignBlock.FACING).toYRot();
+            dhl.mulPose(Vector3f.YP.rotationDegrees(float4));
+            dhl.translate(0.0, -0.3125, -0.4375);
             this.signModel.stick.visible = false;
         }
-        cyl.pushPose();
-        cyl.scale(0.6666667f, -0.6666667f, -0.6666667f);
-        final Material eby10 = getMaterial(byj8.getBlock());
-        final VertexConsumer cyo11 = eby10.buffer(dqt, this.signModel::renderType);
-        this.signModel.sign.render(cyl, cyo11, integer5, integer6);
-        this.signModel.stick.render(cyl, cyo11, integer5, integer6);
-        cyl.popPose();
-        final Font dch12 = this.renderer.getFont();
+        dhl.pushPose();
+        dhl.scale(0.6666667f, -0.6666667f, -0.6666667f);
+        final Material enk10 = getMaterial(cfj8.getBlock());
+        final VertexConsumer dhp11 = enk10.buffer(ebz, this.signModel::renderType);
+        this.signModel.sign.render(dhl, dhp11, integer5, integer6);
+        this.signModel.stick.render(dhl, dhp11, integer5, integer6);
+        dhl.popPose();
+        final Font dmt12 = this.renderer.getFont();
         final float float5 = 0.010416667f;
-        cyl.translate(0.0, 0.3333333432674408, 0.046666666865348816);
-        cyl.scale(0.010416667f, -0.010416667f, 0.010416667f);
-        final int integer7 = bxh.getColor().getTextColor();
+        dhl.translate(0.0, 0.3333333432674408, 0.046666666865348816);
+        dhl.scale(0.010416667f, -0.010416667f, 0.010416667f);
+        final int integer7 = ceh.getColor().getTextColor();
         final double double15 = 0.4;
         final int integer8 = (int)(NativeImage.getR(integer7) * 0.4);
         final int integer9 = (int)(NativeImage.getG(integer7) * 0.4);
         final int integer10 = (int)(NativeImage.getB(integer7) * 0.4);
         final int integer11 = NativeImage.combine(0, integer10, integer9, integer8);
-        for (int integer12 = 0; integer12 < 4; ++integer12) {
-            final List<Component> list3;
-            final String string22 = bxh.getRenderMessage(integer12, lf -> {
-                list3 = ComponentRenderUtils.wrapComponents(lf, 90, dch12, false, true);
-                return list3.isEmpty() ? "" : list3.get(0).getColoredString();
+        final int integer12 = 20;
+        for (int integer13 = 0; integer13 < 4; ++integer13) {
+            final List<FormattedText> list3;
+            final FormattedText mu2 = ceh.getRenderMessage(integer13, mu -> {
+                list3 = dmt12.getSplitter().splitLines(mu, 90, Style.EMPTY);
+                return list3.isEmpty() ? FormattedText.EMPTY : list3.get(0);
             });
-            if (string22 != null) {
-                final float float6 = (float)(-dch12.width(string22) / 2);
-                dch12.drawInBatch(string22, float6, (float)(integer12 * 10 - bxh.messages.length * 5), integer11, false, cyl.last().pose(), dqt, false, 0, integer5);
+            if (mu2 != null) {
+                final float float6 = (float)(-dmt12.width(mu2) / 2);
+                dmt12.drawInBatch(mu2, float6, (float)(integer13 * 10 - 20), integer11, false, dhl.last().pose(), ebz, false, 0, integer5);
             }
         }
-        cyl.popPose();
+        dhl.popPose();
     }
     
-    public static Material getMaterial(final Block bph) {
-        WoodType bzs2;
-        if (bph instanceof SignBlock) {
-            bzs2 = ((SignBlock)bph).type();
+    public static Material getMaterial(final Block bvr) {
+        WoodType cgs2;
+        if (bvr instanceof SignBlock) {
+            cgs2 = ((SignBlock)bvr).type();
         }
         else {
-            bzs2 = WoodType.OAK;
+            cgs2 = WoodType.OAK;
         }
-        return Sheets.signTexture(bzs2);
+        return Sheets.signTexture(cgs2);
     }
     
     public static final class SignModel extends Model {
@@ -104,9 +105,9 @@ public class SignRenderer extends BlockEntityRenderer<SignBlockEntity> {
         }
         
         @Override
-        public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-            this.sign.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
-            this.stick.render(cyl, cyo, integer3, integer4, float5, float6, float7, float8);
+        public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+            this.sign.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
+            this.stick.render(dhl, dhp, integer3, integer4, float5, float6, float7, float8);
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/blockentity/SkullBlockRenderer.java b/src/net/minecraft/client/renderer/blockentity/SkullBlockRenderer.java
index fd843d9..7736187 100644
--- a/src/net/minecraft/client/renderer/blockentity/SkullBlockRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/SkullBlockRenderer.java
@@ -32,80 +32,64 @@ public class SkullBlockRenderer extends BlockEntityRenderer<SkullBlockEntity> {
     private static final Map<SkullBlock.Type, SkullModel> MODEL_BY_TYPE;
     private static final Map<SkullBlock.Type, ResourceLocation> SKIN_BY_TYPE;
     
-    public SkullBlockRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public SkullBlockRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
     }
     
     @Override
-    public void render(final SkullBlockEntity bxi, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        final float float3 = bxi.getMouthAnimation(float2);
-        final BlockState byj9 = bxi.getBlockState();
-        final boolean boolean10 = byj9.getBlock() instanceof WallSkullBlock;
-        final Direction fp11 = boolean10 ? byj9.<Direction>getValue((Property<Direction>)WallSkullBlock.FACING) : null;
-        final float float4 = 22.5f * (boolean10 ? ((2 + fp11.get2DDataValue()) * 4) : byj9.<Integer>getValue((Property<Integer>)SkullBlock.ROTATION));
-        renderSkull(fp11, float4, ((AbstractSkullBlock)byj9.getBlock()).getType(), bxi.getOwnerProfile(), float3, cyl, dqt, integer5);
+    public void render(final SkullBlockEntity cei, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        final float float3 = cei.getMouthAnimation(float2);
+        final BlockState cfj9 = cei.getBlockState();
+        final boolean boolean10 = cfj9.getBlock() instanceof WallSkullBlock;
+        final Direction fz11 = boolean10 ? cfj9.<Direction>getValue((Property<Direction>)WallSkullBlock.FACING) : null;
+        final float float4 = 22.5f * (boolean10 ? ((2 + fz11.get2DDataValue()) * 4) : cfj9.<Integer>getValue((Property<Integer>)SkullBlock.ROTATION));
+        renderSkull(fz11, float4, ((AbstractSkullBlock)cfj9.getBlock()).getType(), cei.getOwnerProfile(), float3, dhl, ebz, integer5);
     }
     
-    public static void renderSkull(@Nullable final Direction fp, final float float2, final SkullBlock.Type a, @Nullable final GameProfile gameProfile, final float float5, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final SkullModel dmp9 = SkullBlockRenderer.MODEL_BY_TYPE.get(a);
-        cyl.pushPose();
-        if (fp == null) {
-            cyl.translate(0.5, 0.0, 0.5);
+    public static void renderSkull(@Nullable final Direction fz, final float float2, final SkullBlock.Type a, @Nullable final GameProfile gameProfile, final float float5, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final SkullModel dxm9 = SkullBlockRenderer.MODEL_BY_TYPE.get(a);
+        dhl.pushPose();
+        if (fz == null) {
+            dhl.translate(0.5, 0.0, 0.5);
         }
         else {
-            switch (fp) {
-                case NORTH: {
-                    cyl.translate(0.5, 0.25, 0.7400000095367432);
-                    break;
-                }
-                case SOUTH: {
-                    cyl.translate(0.5, 0.25, 0.25999999046325684);
-                    break;
-                }
-                case WEST: {
-                    cyl.translate(0.7400000095367432, 0.25, 0.5);
-                    break;
-                }
-                default: {
-                    cyl.translate(0.25999999046325684, 0.25, 0.5);
-                    break;
-                }
-            }
+            final float float6 = 0.25f;
+            dhl.translate(0.5f - fz.getStepX() * 0.25f, 0.25, 0.5f - fz.getStepZ() * 0.25f);
         }
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        final VertexConsumer cyo10 = dqt.getBuffer(getRenderType(a, gameProfile));
-        dmp9.setupAnim(float5, float2, 0.0f);
-        dmp9.renderToBuffer(cyl, cyo10, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.popPose();
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        final VertexConsumer dhp10 = ebz.getBuffer(getRenderType(a, gameProfile));
+        dxm9.setupAnim(float5, float2, 0.0f);
+        dxm9.renderToBuffer(dhl, dhp10, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.popPose();
     }
     
     private static RenderType getRenderType(final SkullBlock.Type a, @Nullable final GameProfile gameProfile) {
-        final ResourceLocation sm3 = SkullBlockRenderer.SKIN_BY_TYPE.get(a);
+        final ResourceLocation uh3 = SkullBlockRenderer.SKIN_BY_TYPE.get(a);
         if (a != SkullBlock.Types.PLAYER || gameProfile == null) {
-            return RenderType.entityCutoutNoCull(sm3);
+            return RenderType.entityCutoutNoCullZOffset(uh3);
         }
-        final Minecraft dbn4 = Minecraft.getInstance();
-        final Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> map5 = dbn4.getSkinManager().getInsecureSkinInformation(gameProfile);
+        final Minecraft dlx4 = Minecraft.getInstance();
+        final Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> map5 = dlx4.getSkinManager().getInsecureSkinInformation(gameProfile);
         if (map5.containsKey(MinecraftProfileTexture.Type.SKIN)) {
-            return RenderType.entityTranslucent(dbn4.getSkinManager().registerTexture(map5.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN));
+            return RenderType.entityTranslucent(dlx4.getSkinManager().registerTexture(map5.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN));
         }
         return RenderType.entityCutoutNoCull(DefaultPlayerSkin.getDefaultSkin(Player.createPlayerUUID(gameProfile)));
     }
     
     static {
-        final SkullModel dmp2;
-        final HumanoidHeadModel dmp3;
-        final DragonHeadModel dng4;
+        final SkullModel dxm2;
+        final HumanoidHeadModel dxm3;
+        final DragonHeadModel dye4;
         MODEL_BY_TYPE = Util.<Map<SkullBlock.Type, SkullModel>>make(Maps.newHashMap(), hashMap -> {
-            dmp2 = new SkullModel(0, 0, 64, 32);
-            dmp3 = new HumanoidHeadModel();
-            dng4 = new DragonHeadModel(0.0f);
-            hashMap.put(SkullBlock.Types.SKELETON, (DragonHeadModel)dmp2);
-            hashMap.put(SkullBlock.Types.WITHER_SKELETON, (DragonHeadModel)dmp2);
-            hashMap.put(SkullBlock.Types.PLAYER, (DragonHeadModel)dmp3);
-            hashMap.put(SkullBlock.Types.ZOMBIE, (DragonHeadModel)dmp3);
-            hashMap.put(SkullBlock.Types.CREEPER, (DragonHeadModel)dmp2);
-            hashMap.put(SkullBlock.Types.DRAGON, dng4);
+            dxm2 = new SkullModel(0, 0, 64, 32);
+            dxm3 = new HumanoidHeadModel();
+            dye4 = new DragonHeadModel(0.0f);
+            hashMap.put(SkullBlock.Types.SKELETON, (DragonHeadModel)dxm2);
+            hashMap.put(SkullBlock.Types.WITHER_SKELETON, (DragonHeadModel)dxm2);
+            hashMap.put(SkullBlock.Types.PLAYER, (DragonHeadModel)dxm3);
+            hashMap.put(SkullBlock.Types.ZOMBIE, (DragonHeadModel)dxm3);
+            hashMap.put(SkullBlock.Types.CREEPER, (DragonHeadModel)dxm2);
+            hashMap.put(SkullBlock.Types.DRAGON, dye4);
             return;
         });
         SKIN_BY_TYPE = Util.<Map<SkullBlock.Type, ResourceLocation>>make(Maps.newHashMap(), hashMap -> {
diff --git a/src/net/minecraft/client/renderer/blockentity/SpawnerRenderer.java b/src/net/minecraft/client/renderer/blockentity/SpawnerRenderer.java
index 1eb5175..62297c0 100644
--- a/src/net/minecraft/client/renderer/blockentity/SpawnerRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/SpawnerRenderer.java
@@ -11,29 +11,29 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
 
 public class SpawnerRenderer extends BlockEntityRenderer<SpawnerBlockEntity> {
-    public SpawnerRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public SpawnerRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
     }
     
     @Override
-    public void render(final SpawnerBlockEntity bxk, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        cyl.pushPose();
-        cyl.translate(0.5, 0.0, 0.5);
-        final BaseSpawner bjd8 = bxk.getSpawner();
-        final Entity akq9 = bjd8.getOrCreateDisplayEntity();
-        if (akq9 != null) {
+    public void render(final SpawnerBlockEntity cek, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        dhl.pushPose();
+        dhl.translate(0.5, 0.0, 0.5);
+        final BaseSpawner bpd8 = cek.getSpawner();
+        final Entity aom9 = bpd8.getOrCreateDisplayEntity();
+        if (aom9 != null) {
             float float3 = 0.53125f;
-            final float float4 = Math.max(akq9.getBbWidth(), akq9.getBbHeight());
+            final float float4 = Math.max(aom9.getBbWidth(), aom9.getBbHeight());
             if (float4 > 1.0) {
                 float3 /= float4;
             }
-            cyl.translate(0.0, 0.4000000059604645, 0.0);
-            cyl.mulPose(Vector3f.YP.rotationDegrees((float)Mth.lerp(float2, bjd8.getoSpin(), bjd8.getSpin()) * 10.0f));
-            cyl.translate(0.0, -0.20000000298023224, 0.0);
-            cyl.mulPose(Vector3f.XP.rotationDegrees(-30.0f));
-            cyl.scale(float3, float3, float3);
-            Minecraft.getInstance().getEntityRenderDispatcher().<Entity>render(akq9, 0.0, 0.0, 0.0, 0.0f, float2, cyl, dqt, integer5);
+            dhl.translate(0.0, 0.4000000059604645, 0.0);
+            dhl.mulPose(Vector3f.YP.rotationDegrees((float)Mth.lerp(float2, bpd8.getoSpin(), bpd8.getSpin()) * 10.0f));
+            dhl.translate(0.0, -0.20000000298023224, 0.0);
+            dhl.mulPose(Vector3f.XP.rotationDegrees(-30.0f));
+            dhl.scale(float3, float3, float3);
+            Minecraft.getInstance().getEntityRenderDispatcher().<Entity>render(aom9, 0.0, 0.0, 0.0, 0.0f, float2, dhl, ebz, integer5);
         }
-        cyl.popPose();
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/blockentity/StructureBlockRenderer.java b/src/net/minecraft/client/renderer/blockentity/StructureBlockRenderer.java
index 0d54446..2540bd5 100644
--- a/src/net/minecraft/client/renderer/blockentity/StructureBlockRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/StructureBlockRenderer.java
@@ -17,43 +17,43 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.level.block.entity.StructureBlockEntity;
 
 public class StructureBlockRenderer extends BlockEntityRenderer<StructureBlockEntity> {
-    public StructureBlockRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public StructureBlockRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
     }
     
     @Override
-    public void render(final StructureBlockEntity bxl, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
+    public void render(final StructureBlockEntity cel, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
         if (!Minecraft.getInstance().player.canUseGameMasterBlocks() && !Minecraft.getInstance().player.isSpectator()) {
             return;
         }
-        final BlockPos fk8 = bxl.getStructurePos();
-        final BlockPos fk9 = bxl.getStructureSize();
-        if (fk9.getX() < 1 || fk9.getY() < 1 || fk9.getZ() < 1) {
+        final BlockPos fu8 = cel.getStructurePos();
+        final BlockPos fu9 = cel.getStructureSize();
+        if (fu9.getX() < 1 || fu9.getY() < 1 || fu9.getZ() < 1) {
             return;
         }
-        if (bxl.getMode() != StructureMode.SAVE && bxl.getMode() != StructureMode.LOAD) {
+        if (cel.getMode() != StructureMode.SAVE && cel.getMode() != StructureMode.LOAD) {
             return;
         }
-        final double double10 = fk8.getX();
-        final double double11 = fk8.getZ();
-        final double double12 = fk8.getY();
-        final double double13 = double12 + fk9.getY();
+        final double double10 = fu8.getX();
+        final double double11 = fu8.getZ();
+        final double double12 = fu8.getY();
+        final double double13 = double12 + fu9.getY();
         double double14 = 0.0;
         double double15 = 0.0;
-        switch (bxl.getMirror()) {
+        switch (cel.getMirror()) {
             case LEFT_RIGHT: {
-                double14 = fk9.getX();
-                double15 = -fk9.getZ();
+                double14 = fu9.getX();
+                double15 = -fu9.getZ();
                 break;
             }
             case FRONT_BACK: {
-                double14 = -fk9.getX();
-                double15 = fk9.getZ();
+                double14 = -fu9.getX();
+                double15 = fu9.getZ();
                 break;
             }
             default: {
-                double14 = fk9.getX();
-                double15 = fk9.getZ();
+                double14 = fu9.getX();
+                double15 = fu9.getZ();
                 break;
             }
         }
@@ -61,7 +61,7 @@ public class StructureBlockRenderer extends BlockEntityRenderer<StructureBlockEn
         double double17 = 0.0;
         double double18 = 0.0;
         double double19 = 0.0;
-        switch (bxl.getRotation()) {
+        switch (cel.getRotation()) {
             case CLOCKWISE_90: {
                 double16 = ((double15 < 0.0) ? double10 : (double10 + 1.0));
                 double17 = ((double14 < 0.0) ? (double11 + 1.0) : double11);
@@ -94,47 +94,47 @@ public class StructureBlockRenderer extends BlockEntityRenderer<StructureBlockEn
         final float float3 = 1.0f;
         final float float4 = 0.9f;
         final float float5 = 0.5f;
-        final VertexConsumer cyo33 = dqt.getBuffer(RenderType.lines());
-        if (bxl.getMode() == StructureMode.SAVE || bxl.getShowBoundingBox()) {
-            LevelRenderer.renderLineBox(cyl, cyo33, double16, double12, double17, double18, double13, double19, 0.9f, 0.9f, 0.9f, 1.0f, 0.5f, 0.5f, 0.5f);
+        final VertexConsumer dhp33 = ebz.getBuffer(RenderType.lines());
+        if (cel.getMode() == StructureMode.SAVE || cel.getShowBoundingBox()) {
+            LevelRenderer.renderLineBox(dhl, dhp33, double16, double12, double17, double18, double13, double19, 0.9f, 0.9f, 0.9f, 1.0f, 0.5f, 0.5f, 0.5f);
         }
-        if (bxl.getMode() == StructureMode.SAVE && bxl.getShowAir()) {
-            this.renderInvisibleBlocks(bxl, cyo33, fk8, true, cyl);
-            this.renderInvisibleBlocks(bxl, cyo33, fk8, false, cyl);
+        if (cel.getMode() == StructureMode.SAVE && cel.getShowAir()) {
+            this.renderInvisibleBlocks(cel, dhp33, fu8, true, dhl);
+            this.renderInvisibleBlocks(cel, dhp33, fu8, false, dhl);
         }
     }
     
-    private void renderInvisibleBlocks(final StructureBlockEntity bxl, final VertexConsumer cyo, final BlockPos fk, final boolean boolean4, final PoseStack cyl) {
-        final BlockGetter bjg7 = bxl.getLevel();
-        final BlockPos fk2 = bxl.getBlockPos();
-        final BlockPos fk3 = fk2.offset(fk);
-        for (final BlockPos fk4 : BlockPos.betweenClosed(fk3, fk3.offset(bxl.getStructureSize()).offset(-1, -1, -1))) {
-            final BlockState byj12 = bjg7.getBlockState(fk4);
-            final boolean boolean5 = byj12.isAir();
-            final boolean boolean6 = byj12.getBlock() == Blocks.STRUCTURE_VOID;
+    private void renderInvisibleBlocks(final StructureBlockEntity cel, final VertexConsumer dhp, final BlockPos fu, final boolean boolean4, final PoseStack dhl) {
+        final BlockGetter bpg7 = cel.getLevel();
+        final BlockPos fu2 = cel.getBlockPos();
+        final BlockPos fu3 = fu2.offset(fu);
+        for (final BlockPos fu4 : BlockPos.betweenClosed(fu3, fu3.offset(cel.getStructureSize()).offset(-1, -1, -1))) {
+            final BlockState cfj12 = bpg7.getBlockState(fu4);
+            final boolean boolean5 = cfj12.isAir();
+            final boolean boolean6 = cfj12.is(Blocks.STRUCTURE_VOID);
             if (boolean5 || boolean6) {
                 final float float15 = boolean5 ? 0.05f : 0.0f;
-                final double double16 = fk4.getX() - fk2.getX() + 0.45f - float15;
-                final double double17 = fk4.getY() - fk2.getY() + 0.45f - float15;
-                final double double18 = fk4.getZ() - fk2.getZ() + 0.45f - float15;
-                final double double19 = fk4.getX() - fk2.getX() + 0.55f + float15;
-                final double double20 = fk4.getY() - fk2.getY() + 0.55f + float15;
-                final double double21 = fk4.getZ() - fk2.getZ() + 0.55f + float15;
+                final double double16 = fu4.getX() - fu2.getX() + 0.45f - float15;
+                final double double17 = fu4.getY() - fu2.getY() + 0.45f - float15;
+                final double double18 = fu4.getZ() - fu2.getZ() + 0.45f - float15;
+                final double double19 = fu4.getX() - fu2.getX() + 0.55f + float15;
+                final double double20 = fu4.getY() - fu2.getY() + 0.55f + float15;
+                final double double21 = fu4.getZ() - fu2.getZ() + 0.55f + float15;
                 if (boolean4) {
-                    LevelRenderer.renderLineBox(cyl, cyo, double16, double17, double18, double19, double20, double21, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f);
+                    LevelRenderer.renderLineBox(dhl, dhp, double16, double17, double18, double19, double20, double21, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f);
                 }
                 else if (boolean5) {
-                    LevelRenderer.renderLineBox(cyl, cyo, double16, double17, double18, double19, double20, double21, 0.5f, 0.5f, 1.0f, 1.0f, 0.5f, 0.5f, 1.0f);
+                    LevelRenderer.renderLineBox(dhl, dhp, double16, double17, double18, double19, double20, double21, 0.5f, 0.5f, 1.0f, 1.0f, 0.5f, 0.5f, 1.0f);
                 }
                 else {
-                    LevelRenderer.renderLineBox(cyl, cyo, double16, double17, double18, double19, double20, double21, 1.0f, 0.25f, 0.25f, 1.0f, 1.0f, 0.25f, 0.25f);
+                    LevelRenderer.renderLineBox(dhl, dhp, double16, double17, double18, double19, double20, double21, 1.0f, 0.25f, 0.25f, 1.0f, 1.0f, 0.25f, 0.25f);
                 }
             }
         }
     }
     
     @Override
-    public boolean shouldRenderOffScreen(final StructureBlockEntity bxl) {
+    public boolean shouldRenderOffScreen(final StructureBlockEntity cel) {
         return true;
     }
 }
diff --git a/src/net/minecraft/client/renderer/blockentity/TheEndGatewayRenderer.java b/src/net/minecraft/client/renderer/blockentity/TheEndGatewayRenderer.java
index 37a8a32..c48cc70 100644
--- a/src/net/minecraft/client/renderer/blockentity/TheEndGatewayRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/TheEndGatewayRenderer.java
@@ -12,23 +12,23 @@ import net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity;
 public class TheEndGatewayRenderer extends TheEndPortalRenderer<TheEndGatewayBlockEntity> {
     private static final ResourceLocation BEAM_LOCATION;
     
-    public TheEndGatewayRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public TheEndGatewayRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
     }
     
     @Override
-    public void render(final TheEndGatewayBlockEntity bxm, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
-        if (bxm.isSpawning() || bxm.isCoolingDown()) {
-            float float3 = bxm.isSpawning() ? bxm.getSpawnPercent(float2) : bxm.getCooldownPercent(float2);
-            final double double9 = bxm.isSpawning() ? 256.0 : 50.0;
+    public void render(final TheEndGatewayBlockEntity cem, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
+        if (cem.isSpawning() || cem.isCoolingDown()) {
+            float float3 = cem.isSpawning() ? cem.getSpawnPercent(float2) : cem.getCooldownPercent(float2);
+            final double double9 = cem.isSpawning() ? 256.0 : 50.0;
             float3 = Mth.sin(float3 * 3.1415927f);
             final int integer7 = Mth.floor(float3 * double9);
-            final float[] arr12 = bxm.isSpawning() ? DyeColor.MAGENTA.getTextureDiffuseColors() : DyeColor.PURPLE.getTextureDiffuseColors();
-            final long long13 = bxm.getLevel().getGameTime();
-            BeaconRenderer.renderBeaconBeam(cyl, dqt, TheEndGatewayRenderer.BEAM_LOCATION, float2, float3, long13, 0, integer7, arr12, 0.15f, 0.175f);
-            BeaconRenderer.renderBeaconBeam(cyl, dqt, TheEndGatewayRenderer.BEAM_LOCATION, float2, float3, long13, 0, -integer7, arr12, 0.15f, 0.175f);
+            final float[] arr12 = cem.isSpawning() ? DyeColor.MAGENTA.getTextureDiffuseColors() : DyeColor.PURPLE.getTextureDiffuseColors();
+            final long long13 = cem.getLevel().getGameTime();
+            BeaconRenderer.renderBeaconBeam(dhl, ebz, TheEndGatewayRenderer.BEAM_LOCATION, float2, float3, long13, 0, integer7, arr12, 0.15f, 0.175f);
+            BeaconRenderer.renderBeaconBeam(dhl, ebz, TheEndGatewayRenderer.BEAM_LOCATION, float2, float3, long13, 0, -integer7, arr12, 0.15f, 0.175f);
         }
-        super.render(bxm, float2, cyl, dqt, integer5, integer6);
+        super.render(cem, float2, dhl, ebz, integer5, integer6);
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/blockentity/TheEndPortalRenderer.java b/src/net/minecraft/client/renderer/blockentity/TheEndPortalRenderer.java
index d6c0dc8..185255a 100644
--- a/src/net/minecraft/client/renderer/blockentity/TheEndPortalRenderer.java
+++ b/src/net/minecraft/client/renderer/blockentity/TheEndPortalRenderer.java
@@ -22,41 +22,41 @@ public class TheEndPortalRenderer<T extends TheEndPortalBlockEntity> extends Blo
     private static final Random RANDOM;
     private static final List<RenderType> RENDER_TYPES;
     
-    public TheEndPortalRenderer(final BlockEntityRenderDispatcher dsq) {
-        super(dsq);
+    public TheEndPortalRenderer(final BlockEntityRenderDispatcher edw) {
+        super(edw);
     }
     
     @Override
-    public void render(final T bxn, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final int integer5, final int integer6) {
+    public void render(final T cen, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final int integer5, final int integer6) {
         TheEndPortalRenderer.RANDOM.setSeed(31100L);
-        final double double8 = bxn.getBlockPos().distSqr(this.renderer.camera.getPosition(), true);
+        final double double8 = cen.getBlockPos().distSqr(this.renderer.camera.getPosition(), true);
         final int integer7 = this.getPasses(double8);
         final float float3 = this.getOffset();
-        final Matrix4f b12 = cyl.last().pose();
-        this.renderCube(bxn, float3, 0.15f, b12, dqt.getBuffer(TheEndPortalRenderer.RENDER_TYPES.get(0)));
+        final Matrix4f b12 = dhl.last().pose();
+        this.renderCube(cen, float3, 0.15f, b12, ebz.getBuffer(TheEndPortalRenderer.RENDER_TYPES.get(0)));
         for (int integer8 = 1; integer8 < integer7; ++integer8) {
-            this.renderCube(bxn, float3, 2.0f / (18 - integer8), b12, dqt.getBuffer(TheEndPortalRenderer.RENDER_TYPES.get(integer8)));
+            this.renderCube(cen, float3, 2.0f / (18 - integer8), b12, ebz.getBuffer(TheEndPortalRenderer.RENDER_TYPES.get(integer8)));
         }
     }
     
-    private void renderCube(final T bxn, final float float2, final float float3, final Matrix4f b, final VertexConsumer cyo) {
+    private void renderCube(final T cen, final float float2, final float float3, final Matrix4f b, final VertexConsumer dhp) {
         final float float4 = (TheEndPortalRenderer.RANDOM.nextFloat() * 0.5f + 0.1f) * float3;
         final float float5 = (TheEndPortalRenderer.RANDOM.nextFloat() * 0.5f + 0.4f) * float3;
         final float float6 = (TheEndPortalRenderer.RANDOM.nextFloat() * 0.5f + 0.5f) * float3;
-        this.renderFace(bxn, b, cyo, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, float4, float5, float6, Direction.SOUTH);
-        this.renderFace(bxn, b, cyo, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, float4, float5, float6, Direction.NORTH);
-        this.renderFace(bxn, b, cyo, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, float4, float5, float6, Direction.EAST);
-        this.renderFace(bxn, b, cyo, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, float4, float5, float6, Direction.WEST);
-        this.renderFace(bxn, b, cyo, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, float4, float5, float6, Direction.DOWN);
-        this.renderFace(bxn, b, cyo, 0.0f, 1.0f, float2, float2, 1.0f, 1.0f, 0.0f, 0.0f, float4, float5, float6, Direction.UP);
+        this.renderFace(cen, b, dhp, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, float4, float5, float6, Direction.SOUTH);
+        this.renderFace(cen, b, dhp, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, float4, float5, float6, Direction.NORTH);
+        this.renderFace(cen, b, dhp, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, float4, float5, float6, Direction.EAST);
+        this.renderFace(cen, b, dhp, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, float4, float5, float6, Direction.WEST);
+        this.renderFace(cen, b, dhp, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, float4, float5, float6, Direction.DOWN);
+        this.renderFace(cen, b, dhp, 0.0f, 1.0f, float2, float2, 1.0f, 1.0f, 0.0f, 0.0f, float4, float5, float6, Direction.UP);
     }
     
-    private void renderFace(final T bxn, final Matrix4f b, final VertexConsumer cyo, final float float4, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10, final float float11, final float float12, final float float13, final float float14, final Direction fp) {
-        if (bxn.shouldRenderFace(fp)) {
-            cyo.vertex(b, float4, float6, float8).color(float12, float13, float14, 1.0f).endVertex();
-            cyo.vertex(b, float5, float6, float9).color(float12, float13, float14, 1.0f).endVertex();
-            cyo.vertex(b, float5, float7, float10).color(float12, float13, float14, 1.0f).endVertex();
-            cyo.vertex(b, float4, float7, float11).color(float12, float13, float14, 1.0f).endVertex();
+    private void renderFace(final T cen, final Matrix4f b, final VertexConsumer dhp, final float float4, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10, final float float11, final float float12, final float float13, final float float14, final Direction fz) {
+        if (cen.shouldRenderFace(fz)) {
+            dhp.vertex(b, float4, float6, float8).color(float12, float13, float14, 1.0f).endVertex();
+            dhp.vertex(b, float5, float6, float9).color(float12, float13, float14, 1.0f).endVertex();
+            dhp.vertex(b, float5, float7, float10).color(float12, float13, float14, 1.0f).endVertex();
+            dhp.vertex(b, float4, float7, float11).color(float12, float13, float14, 1.0f).endVertex();
         }
     }
     
diff --git a/src/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java b/src/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
index abd51b7..9fc4991 100644
--- a/src/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
+++ b/src/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
@@ -73,17 +73,17 @@ public class ChunkRenderDispatcher {
     private final LevelRenderer renderer;
     private Vec3 camera;
     
-    public ChunkRenderDispatcher(final Level bjw, final LevelRenderer dqr, final Executor executor, final boolean boolean4, final ChunkBufferBuilderPack dqi) {
+    public ChunkRenderDispatcher(final Level bqb, final LevelRenderer ebx, final Executor executor, final boolean boolean4, final ChunkBufferBuilderPack ebm) {
         this.toBatch = Queues.<RenderChunk.ChunkCompileTask>newPriorityQueue();
         this.toUpload = Queues.newConcurrentLinkedQueue();
         this.camera = Vec3.ZERO;
-        this.level = bjw;
-        this.renderer = dqr;
+        this.level = bqb;
+        this.renderer = ebx;
         final int integer7 = Math.max(1, (int)(Runtime.getRuntime().maxMemory() * 0.3) / (RenderType.chunkBufferLayers().stream().mapToInt(RenderType::bufferSize).sum() * 4) - 1);
         final int integer8 = Runtime.getRuntime().availableProcessors();
         final int integer9 = boolean4 ? integer8 : Math.min(integer8, 4);
         final int integer10 = Math.max(1, Math.min(integer9, integer7));
-        this.fixedBuffers = dqi;
+        this.fixedBuffers = ebm;
         final List<ChunkBufferBuilderPack> list11 = Lists.newArrayListWithExpectedSize(integer10);
         try {
             for (int integer11 = 0; integer11 < integer10; ++integer11) {
@@ -103,8 +103,8 @@ public class ChunkRenderDispatcher {
         (this.mailbox = ProcessorMailbox.create(executor, "Chunk Renderer")).tell(this::runTask);
     }
     
-    public void setLevel(final Level bjw) {
-        this.level = bjw;
+    public void setLevel(final Level bqb) {
+        this.level = bqb;
     }
     
     private void runTask() {
@@ -115,15 +115,15 @@ public class ChunkRenderDispatcher {
         if (a2 == null) {
             return;
         }
-        final ChunkBufferBuilderPack dqi3 = this.freeBuffers.poll();
+        final ChunkBufferBuilderPack ebm3 = this.freeBuffers.poll();
         this.toBatchCount = this.toBatch.size();
         this.freeBufferCount = this.freeBuffers.size();
-        CrashReport h5;
+        CrashReport j5;
         final ChunkBufferBuilderPack chunkBufferBuilderPack;
-        CompletableFuture.runAsync(() -> {}, this.executor).thenCompose(void3 -> a2.doTask(dqi3)).whenComplete((a, throwable) -> {
+        CompletableFuture.runAsync(() -> {}, this.executor).thenCompose(void3 -> a2.doTask(ebm3)).whenComplete((a, throwable) -> {
             if (throwable != null) {
-                h5 = CrashReport.forThrowable(throwable, "Batching chunks");
-                Minecraft.getInstance().delayCrash(Minecraft.getInstance().fillReport(h5));
+                j5 = CrashReport.forThrowable(throwable, "Batching chunks");
+                Minecraft.getInstance().delayCrash(Minecraft.getInstance().fillReport(j5));
             }
             else {
                 this.mailbox.tell(() -> {
@@ -145,8 +145,8 @@ public class ChunkRenderDispatcher {
         return String.format("pC: %03d, pU: %02d, aB: %02d", this.toBatchCount, this.toUpload.size(), this.freeBufferCount);
     }
     
-    public void setCamera(final Vec3 cvl) {
-        this.camera = cvl;
+    public void setCamera(final Vec3 dem) {
+        this.camera = dem;
     }
     
     public Vec3 getCameraPosition() {
@@ -179,12 +179,12 @@ public class ChunkRenderDispatcher {
         });
     }
     
-    public CompletableFuture<Void> uploadChunkLayer(final BufferBuilder cyg, final VertexBuffer cyn) {
-        return CompletableFuture.runAsync(() -> {}, this.toUpload::add).<Void>thenCompose(void3 -> this.doUploadChunkLayer(cyg, cyn));
+    public CompletableFuture<Void> uploadChunkLayer(final BufferBuilder dhg, final VertexBuffer dho) {
+        return CompletableFuture.runAsync(() -> {}, this.toUpload::add).<Void>thenCompose(void3 -> this.doUploadChunkLayer(dhg, dho));
     }
     
-    private CompletableFuture<Void> doUploadChunkLayer(final BufferBuilder cyg, final VertexBuffer cyn) {
-        return cyn.uploadLater(cyg);
+    private CompletableFuture<Void> doUploadChunkLayer(final BufferBuilder dhg, final VertexBuffer dho) {
+        return dho.uploadLater(dhg);
     }
     
     private void clearBatchQueue() {
@@ -229,7 +229,7 @@ public class ChunkRenderDispatcher {
         public RenderChunk() {
             this.compiled = new AtomicReference<CompiledChunk>(CompiledChunk.UNCOMPILED);
             this.globalBlockEntities = Sets.newHashSet();
-            this.buffers = RenderType.chunkBufferLayers().stream().collect(Collectors.toMap(drb -> drb, drb -> new VertexBuffer(DefaultVertexFormat.BLOCK)));
+            this.buffers = RenderType.chunkBufferLayers().stream().collect(Collectors.toMap(ech -> ech, ech -> new VertexBuffer(DefaultVertexFormat.BLOCK)));
             this.lastFrame = -1;
             this.dirty = true;
             this.origin = new BlockPos.MutableBlockPos(-1, -1, -1);
@@ -241,8 +241,8 @@ public class ChunkRenderDispatcher {
             });
         }
         
-        private boolean doesChunkExistAt(final BlockPos fk) {
-            return ChunkRenderDispatcher.this.level.getChunk(fk.getX() >> 4, fk.getZ() >> 4, ChunkStatus.FULL, false) != null;
+        private boolean doesChunkExistAt(final BlockPos fu) {
+            return ChunkRenderDispatcher.this.level.getChunk(fu.getX() >> 4, fu.getZ() >> 4, ChunkStatus.FULL, false) != null;
         }
         
         public boolean hasAllNeighbors() {
@@ -258,8 +258,8 @@ public class ChunkRenderDispatcher {
             return true;
         }
         
-        public VertexBuffer getBuffer(final RenderType drb) {
-            return this.buffers.get(drb);
+        public VertexBuffer getBuffer(final RenderType ech) {
+            return this.buffers.get(ech);
         }
         
         public void setOrigin(final int integer1, final int integer2, final int integer3) {
@@ -269,21 +269,21 @@ public class ChunkRenderDispatcher {
             this.reset();
             this.origin.set(integer1, integer2, integer3);
             this.bb = new AABB(integer1, integer2, integer3, integer1 + 16, integer2 + 16, integer3 + 16);
-            for (final Direction fp8 : Direction.values()) {
-                this.relativeOrigins[fp8.ordinal()].set(this.origin).move(fp8, 16);
+            for (final Direction fz8 : Direction.values()) {
+                this.relativeOrigins[fz8.ordinal()].set(this.origin).move(fz8, 16);
             }
         }
         
         protected double getDistToPlayerSqr() {
-            final Camera dbb2 = Minecraft.getInstance().gameRenderer.getMainCamera();
-            final double double3 = this.bb.minX + 8.0 - dbb2.getPosition().x;
-            final double double4 = this.bb.minY + 8.0 - dbb2.getPosition().y;
-            final double double5 = this.bb.minZ + 8.0 - dbb2.getPosition().z;
+            final Camera dlj2 = Minecraft.getInstance().gameRenderer.getMainCamera();
+            final double double3 = this.bb.minX + 8.0 - dlj2.getPosition().x;
+            final double double4 = this.bb.minY + 8.0 - dlj2.getPosition().y;
+            final double double5 = this.bb.minZ + 8.0 - dlj2.getPosition().z;
             return double3 * double3 + double4 * double4 + double5 * double5;
         }
         
-        private void beginLayer(final BufferBuilder cyg) {
-            cyg.begin(7, DefaultVertexFormat.BLOCK);
+        private void beginLayer(final BufferBuilder dhg) {
+            dhg.begin(7, DefaultVertexFormat.BLOCK);
         }
         
         public CompiledChunk getCompiledChunk() {
@@ -324,19 +324,19 @@ public class ChunkRenderDispatcher {
             return this.dirty && this.playerChanged;
         }
         
-        public BlockPos getRelativeOrigin(final Direction fp) {
-            return this.relativeOrigins[fp.ordinal()];
+        public BlockPos getRelativeOrigin(final Direction fz) {
+            return this.relativeOrigins[fz.ordinal()];
         }
         
-        public boolean resortTransparency(final RenderType drb, final ChunkRenderDispatcher dth) {
+        public boolean resortTransparency(final RenderType ech, final ChunkRenderDispatcher een) {
             final CompiledChunk b4 = this.getCompiledChunk();
             if (this.lastResortTransparencyTask != null) {
                 this.lastResortTransparencyTask.cancel();
             }
-            if (!b4.hasLayer.contains(drb)) {
+            if (!b4.hasLayer.contains(ech)) {
                 return false;
             }
-            dth.schedule(this.lastResortTransparencyTask = new ResortTransparencyTask(this.getDistToPlayerSqr(), b4));
+            een.schedule(this.lastResortTransparencyTask = new ResortTransparencyTask(this.getDistToPlayerSqr(), b4));
             return true;
         }
         
@@ -353,15 +353,15 @@ public class ChunkRenderDispatcher {
         
         public ChunkCompileTask createCompileTask() {
             this.cancelTasks();
-            final BlockPos fk2 = this.origin.immutable();
+            final BlockPos fu2 = this.origin.immutable();
             final int integer3 = 1;
-            final RenderChunkRegion dti4 = RenderChunkRegion.createIfNotEmpty(ChunkRenderDispatcher.this.level, fk2.offset(-1, -1, -1), fk2.offset(16, 16, 16), 1);
-            return this.lastRebuildTask = new RebuildTask(this.getDistToPlayerSqr(), dti4);
+            final RenderChunkRegion eeo4 = RenderChunkRegion.createIfNotEmpty(ChunkRenderDispatcher.this.level, fu2.offset(-1, -1, -1), fu2.offset(16, 16, 16), 1);
+            return this.lastRebuildTask = new RebuildTask(this.getDistToPlayerSqr(), eeo4);
         }
         
-        public void rebuildChunkAsync(final ChunkRenderDispatcher dth) {
+        public void rebuildChunkAsync(final ChunkRenderDispatcher een) {
             final ChunkCompileTask a3 = this.createCompileTask();
-            dth.schedule(a3);
+            een.schedule(a3);
         }
         
         private void updateGlobalBlockEntities(final Set<BlockEntity> set) {
@@ -383,13 +383,13 @@ public class ChunkRenderDispatcher {
             @Nullable
             protected RenderChunkRegion region;
             
-            public RebuildTask(final double double2, @Nullable final RenderChunkRegion dti) {
+            public RebuildTask(final double double2, @Nullable final RenderChunkRegion eeo) {
                 super(double2);
-                this.region = dti;
+                this.region = eeo;
             }
             
             @Override
-            public CompletableFuture<ChunkTaskResult> doTask(final ChunkBufferBuilderPack dqi) {
+            public CompletableFuture<ChunkTaskResult> doTask(final ChunkBufferBuilderPack ebm) {
                 if (this.isCancelled.get()) {
                     return CompletableFuture.<ChunkTaskResult>completedFuture(ChunkTaskResult.CANCELLED);
                 }
@@ -402,18 +402,18 @@ public class ChunkRenderDispatcher {
                 if (this.isCancelled.get()) {
                     return CompletableFuture.<ChunkTaskResult>completedFuture(ChunkTaskResult.CANCELLED);
                 }
-                final Vec3 cvl3 = ChunkRenderDispatcher.this.getCameraPosition();
-                final float float4 = (float)cvl3.x;
-                final float float5 = (float)cvl3.y;
-                final float float6 = (float)cvl3.z;
+                final Vec3 dem3 = ChunkRenderDispatcher.this.getCameraPosition();
+                final float float4 = (float)dem3.x;
+                final float float5 = (float)dem3.y;
+                final float float6 = (float)dem3.z;
                 final CompiledChunk b7 = new CompiledChunk();
-                final Set<BlockEntity> set8 = this.compile(float4, float5, float6, b7, dqi);
+                final Set<BlockEntity> set8 = this.compile(float4, float5, float6, b7, ebm);
                 RenderChunk.this.updateGlobalBlockEntities(set8);
                 if (this.isCancelled.get()) {
                     return CompletableFuture.<ChunkTaskResult>completedFuture(ChunkTaskResult.CANCELLED);
                 }
                 final List<CompletableFuture<Void>> list9 = Lists.newArrayList();
-                b7.hasLayer.forEach(drb -> list9.add(ChunkRenderDispatcher.this.uploadChunkLayer(dqi.builder(drb), RenderChunk.this.getBuffer(drb))));
+                b7.hasLayer.forEach(ech -> list9.add(ChunkRenderDispatcher.this.uploadChunkLayer(ebm.builder(ech), RenderChunk.this.getBuffer(ech))));
                 final CompiledChunk newValue;
                 return Util.sequence(list9).<ChunkTaskResult>handle((list, throwable) -> {
                     if (throwable != null && !(throwable instanceof CancellationException) && !(throwable instanceof InterruptedException)) {
@@ -429,76 +429,76 @@ public class ChunkRenderDispatcher {
                 });
             }
             
-            private Set<BlockEntity> compile(final float float1, final float float2, final float float3, final CompiledChunk b, final ChunkBufferBuilderPack dqi) {
+            private Set<BlockEntity> compile(final float float1, final float float2, final float float3, final CompiledChunk b, final ChunkBufferBuilderPack ebm) {
                 final int integer7 = 1;
-                final BlockPos fk8 = RenderChunk.this.origin.immutable();
-                final BlockPos fk9 = fk8.offset(15, 15, 15);
-                final VisGraph dtj10 = new VisGraph();
+                final BlockPos fu8 = RenderChunk.this.origin.immutable();
+                final BlockPos fu9 = fu8.offset(15, 15, 15);
+                final VisGraph eep10 = new VisGraph();
                 final Set<BlockEntity> set11 = Sets.newHashSet();
-                final RenderChunkRegion dti12 = this.region;
+                final RenderChunkRegion eeo12 = this.region;
                 this.region = null;
-                final PoseStack cyl13 = new PoseStack();
-                if (dti12 != null) {
+                final PoseStack dhl13 = new PoseStack();
+                if (eeo12 != null) {
                     ModelBlockRenderer.enableCaching();
                     final Random random14 = new Random();
-                    final BlockRenderDispatcher drk15 = Minecraft.getInstance().getBlockRenderer();
-                    for (final BlockPos fk10 : BlockPos.betweenClosed(fk8, fk9)) {
-                        final BlockState byj18 = dti12.getBlockState(fk10);
-                        final Block bph19 = byj18.getBlock();
-                        if (byj18.isSolidRender(dti12, fk10)) {
-                            dtj10.setOpaque(fk10);
+                    final BlockRenderDispatcher ecq15 = Minecraft.getInstance().getBlockRenderer();
+                    for (final BlockPos fu10 : BlockPos.betweenClosed(fu8, fu9)) {
+                        final BlockState cfj18 = eeo12.getBlockState(fu10);
+                        final Block bvr19 = cfj18.getBlock();
+                        if (cfj18.isSolidRender(eeo12, fu10)) {
+                            eep10.setOpaque(fu10);
                         }
-                        if (bph19.isEntityBlock()) {
-                            final BlockEntity bwl20 = dti12.getBlockEntity(fk10, LevelChunk.EntityCreationType.CHECK);
-                            if (bwl20 != null) {
-                                this.<BlockEntity>handleBlockEntity(b, set11, bwl20);
+                        if (bvr19.isEntityBlock()) {
+                            final BlockEntity cdl20 = eeo12.getBlockEntity(fu10, LevelChunk.EntityCreationType.CHECK);
+                            if (cdl20 != null) {
+                                this.<BlockEntity>handleBlockEntity(b, set11, cdl20);
                             }
                         }
-                        final FluidState coj20 = dti12.getFluidState(fk10);
-                        if (!coj20.isEmpty()) {
-                            final RenderType drb21 = ItemBlockRenderTypes.getRenderLayer(coj20);
-                            final BufferBuilder cyg22 = dqi.builder(drb21);
-                            if (b.hasLayer.add(drb21)) {
-                                RenderChunk.this.beginLayer(cyg22);
+                        final FluidState cxa20 = eeo12.getFluidState(fu10);
+                        if (!cxa20.isEmpty()) {
+                            final RenderType ech21 = ItemBlockRenderTypes.getRenderLayer(cxa20);
+                            final BufferBuilder dhg22 = ebm.builder(ech21);
+                            if (b.hasLayer.add(ech21)) {
+                                RenderChunk.this.beginLayer(dhg22);
                             }
-                            if (drk15.renderLiquid(fk10, dti12, cyg22, coj20)) {
+                            if (ecq15.renderLiquid(fu10, eeo12, dhg22, cxa20)) {
                                 b.isCompletelyEmpty = false;
-                                b.hasBlocks.add(drb21);
+                                b.hasBlocks.add(ech21);
                             }
                         }
-                        if (byj18.getRenderShape() != RenderShape.INVISIBLE) {
-                            final RenderType drb21 = ItemBlockRenderTypes.getChunkRenderType(byj18);
-                            final BufferBuilder cyg22 = dqi.builder(drb21);
-                            if (b.hasLayer.add(drb21)) {
-                                RenderChunk.this.beginLayer(cyg22);
+                        if (cfj18.getRenderShape() != RenderShape.INVISIBLE) {
+                            final RenderType ech21 = ItemBlockRenderTypes.getChunkRenderType(cfj18);
+                            final BufferBuilder dhg22 = ebm.builder(ech21);
+                            if (b.hasLayer.add(ech21)) {
+                                RenderChunk.this.beginLayer(dhg22);
                             }
-                            cyl13.pushPose();
-                            cyl13.translate(fk10.getX() & 0xF, fk10.getY() & 0xF, fk10.getZ() & 0xF);
-                            if (drk15.renderBatched(byj18, fk10, dti12, cyl13, cyg22, true, random14)) {
+                            dhl13.pushPose();
+                            dhl13.translate(fu10.getX() & 0xF, fu10.getY() & 0xF, fu10.getZ() & 0xF);
+                            if (ecq15.renderBatched(cfj18, fu10, eeo12, dhl13, dhg22, true, random14)) {
                                 b.isCompletelyEmpty = false;
-                                b.hasBlocks.add(drb21);
+                                b.hasBlocks.add(ech21);
                             }
-                            cyl13.popPose();
+                            dhl13.popPose();
                         }
                     }
                     if (b.hasBlocks.contains(RenderType.translucent())) {
-                        final BufferBuilder cyg23 = dqi.builder(RenderType.translucent());
-                        cyg23.sortQuads(float1 - fk8.getX(), float2 - fk8.getY(), float3 - fk8.getZ());
-                        b.transparencyState = cyg23.getState();
+                        final BufferBuilder dhg23 = ebm.builder(RenderType.translucent());
+                        dhg23.sortQuads(float1 - fu8.getX(), float2 - fu8.getY(), float3 - fu8.getZ());
+                        b.transparencyState = dhg23.getState();
                     }
-                    b.hasLayer.stream().map(dqi::builder).forEach(BufferBuilder::end);
+                    b.hasLayer.stream().map(ebm::builder).forEach(BufferBuilder::end);
                     ModelBlockRenderer.clearCache();
                 }
-                b.visibilitySet = dtj10.resolve();
+                b.visibilitySet = eep10.resolve();
                 return set11;
             }
             
-            private <E extends BlockEntity> void handleBlockEntity(final CompiledChunk b, final Set<BlockEntity> set, final E bwl) {
-                final BlockEntityRenderer<E> dsr5 = BlockEntityRenderDispatcher.instance.<E>getRenderer(bwl);
-                if (dsr5 != null) {
-                    b.renderableBlockEntities.add(bwl);
-                    if (dsr5.shouldRenderOffScreen(bwl)) {
-                        set.add(bwl);
+            private <E extends BlockEntity> void handleBlockEntity(final CompiledChunk b, final Set<BlockEntity> set, final E cdl) {
+                final BlockEntityRenderer<E> edx5 = BlockEntityRenderDispatcher.instance.<E>getRenderer(cdl);
+                if (edx5 != null) {
+                    b.renderableBlockEntities.add(cdl);
+                    if (edx5.shouldRenderOffScreen(cdl)) {
+                        set.add(cdl);
                     }
                 }
             }
@@ -521,7 +521,7 @@ public class ChunkRenderDispatcher {
             }
             
             @Override
-            public CompletableFuture<ChunkTaskResult> doTask(final ChunkBufferBuilderPack dqi) {
+            public CompletableFuture<ChunkTaskResult> doTask(final ChunkBufferBuilderPack ebm) {
                 if (this.isCancelled.get()) {
                     return CompletableFuture.<ChunkTaskResult>completedFuture(ChunkTaskResult.CANCELLED);
                 }
@@ -532,24 +532,24 @@ public class ChunkRenderDispatcher {
                 if (this.isCancelled.get()) {
                     return CompletableFuture.<ChunkTaskResult>completedFuture(ChunkTaskResult.CANCELLED);
                 }
-                final Vec3 cvl3 = ChunkRenderDispatcher.this.getCameraPosition();
-                final float float4 = (float)cvl3.x;
-                final float float5 = (float)cvl3.y;
-                final float float6 = (float)cvl3.z;
+                final Vec3 dem3 = ChunkRenderDispatcher.this.getCameraPosition();
+                final float float4 = (float)dem3.x;
+                final float float5 = (float)dem3.y;
+                final float float6 = (float)dem3.z;
                 final BufferBuilder.State b7 = this.compiledChunk.transparencyState;
                 if (b7 == null || !this.compiledChunk.hasBlocks.contains(RenderType.translucent())) {
                     return CompletableFuture.<ChunkTaskResult>completedFuture(ChunkTaskResult.CANCELLED);
                 }
-                final BufferBuilder cyg8 = dqi.builder(RenderType.translucent());
-                RenderChunk.this.beginLayer(cyg8);
-                cyg8.restoreState(b7);
-                cyg8.sortQuads(float4 - RenderChunk.this.origin.getX(), float5 - RenderChunk.this.origin.getY(), float6 - RenderChunk.this.origin.getZ());
-                this.compiledChunk.transparencyState = cyg8.getState();
-                cyg8.end();
+                final BufferBuilder dhg8 = ebm.builder(RenderType.translucent());
+                RenderChunk.this.beginLayer(dhg8);
+                dhg8.restoreState(b7);
+                dhg8.sortQuads(float4 - RenderChunk.this.origin.getX(), float5 - RenderChunk.this.origin.getY(), float6 - RenderChunk.this.origin.getZ());
+                this.compiledChunk.transparencyState = dhg8.getState();
+                dhg8.end();
                 if (this.isCancelled.get()) {
                     return CompletableFuture.<ChunkTaskResult>completedFuture(ChunkTaskResult.CANCELLED);
                 }
-                final CompletableFuture<ChunkTaskResult> completableFuture9 = ChunkRenderDispatcher.this.uploadChunkLayer(dqi.builder(RenderType.translucent()), RenderChunk.this.getBuffer(RenderType.translucent())).<ChunkTaskResult>thenApply(void1 -> ChunkTaskResult.CANCELLED);
+                final CompletableFuture<ChunkTaskResult> completableFuture9 = ChunkRenderDispatcher.this.uploadChunkLayer(ebm.builder(RenderType.translucent()), RenderChunk.this.getBuffer(RenderType.translucent())).<ChunkTaskResult>thenApply(void1 -> ChunkTaskResult.CANCELLED);
                 return completableFuture9.<ChunkTaskResult>handle((a, throwable) -> {
                     if (throwable != null && !(throwable instanceof CancellationException) && !(throwable instanceof InterruptedException)) {
                         Minecraft.getInstance().delayCrash(CrashReport.forThrowable(throwable, "Rendering chunk"));
@@ -573,7 +573,7 @@ public class ChunkRenderDispatcher {
                 this.distAtCreation = double2;
             }
             
-            public abstract CompletableFuture<ChunkTaskResult> doTask(final ChunkBufferBuilderPack dqi);
+            public abstract CompletableFuture<ChunkTaskResult> doTask(final ChunkBufferBuilderPack ebm);
             
             public abstract void cancel();
             
@@ -611,22 +611,22 @@ public class ChunkRenderDispatcher {
             return this.isCompletelyEmpty;
         }
         
-        public boolean isEmpty(final RenderType drb) {
-            return !this.hasBlocks.contains(drb);
+        public boolean isEmpty(final RenderType ech) {
+            return !this.hasBlocks.contains(ech);
         }
         
         public List<BlockEntity> getRenderableBlockEntities() {
             return this.renderableBlockEntities;
         }
         
-        public boolean facesCanSeeEachother(final Direction fp1, final Direction fp2) {
-            return this.visibilitySet.visibilityBetween(fp1, fp2);
+        public boolean facesCanSeeEachother(final Direction fz1, final Direction fz2) {
+            return this.visibilitySet.visibilityBetween(fz1, fz2);
         }
         
         static {
             UNCOMPILED = new CompiledChunk() {
                 @Override
-                public boolean facesCanSeeEachother(final Direction fp1, final Direction fp2) {
+                public boolean facesCanSeeEachother(final Direction fz1, final Direction fz2) {
                     return false;
                 }
             };
diff --git a/src/net/minecraft/client/renderer/chunk/RenderChunkRegion.java b/src/net/minecraft/client/renderer/chunk/RenderChunkRegion.java
index 3c3070f..3a88d35 100644
--- a/src/net/minecraft/client/renderer/chunk/RenderChunkRegion.java
+++ b/src/net/minecraft/client/renderer/chunk/RenderChunkRegion.java
@@ -3,6 +3,7 @@ package net.minecraft.client.renderer.chunk;
 import net.minecraft.world.level.ColorResolver;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.core.Direction;
 import java.util.Iterator;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.Level;
@@ -25,58 +26,61 @@ public class RenderChunkRegion implements BlockAndTintGetter {
     protected final Level level;
     
     @Nullable
-    public static RenderChunkRegion createIfNotEmpty(final Level bjw, final BlockPos fk2, final BlockPos fk3, final int integer) {
-        final int integer2 = fk2.getX() - integer >> 4;
-        final int integer3 = fk2.getZ() - integer >> 4;
-        final int integer4 = fk3.getX() + integer >> 4;
-        final int integer5 = fk3.getZ() + integer >> 4;
+    public static RenderChunkRegion createIfNotEmpty(final Level bqb, final BlockPos fu2, final BlockPos fu3, final int integer) {
+        final int integer2 = fu2.getX() - integer >> 4;
+        final int integer3 = fu2.getZ() - integer >> 4;
+        final int integer4 = fu3.getX() + integer >> 4;
+        final int integer5 = fu3.getZ() + integer >> 4;
         final LevelChunk[][] arr9 = new LevelChunk[integer4 - integer2 + 1][integer5 - integer3 + 1];
         for (int integer6 = integer2; integer6 <= integer4; ++integer6) {
             for (int integer7 = integer3; integer7 <= integer5; ++integer7) {
-                arr9[integer6 - integer2][integer7 - integer3] = bjw.getChunk(integer6, integer7);
+                arr9[integer6 - integer2][integer7 - integer3] = bqb.getChunk(integer6, integer7);
             }
         }
-        boolean boolean10 = true;
-        for (int integer7 = fk2.getX() >> 4; integer7 <= fk3.getX() >> 4; ++integer7) {
-            for (int integer8 = fk2.getZ() >> 4; integer8 <= fk3.getZ() >> 4; ++integer8) {
-                final LevelChunk cal13 = arr9[integer7 - integer2][integer8 - integer3];
-                if (!cal13.isYSpaceEmpty(fk2.getY(), fk3.getY())) {
-                    boolean10 = false;
+        if (isAllEmpty(fu2, fu3, integer2, integer3, arr9)) {
+            return null;
+        }
+        int integer6 = 1;
+        final BlockPos fu4 = fu2.offset(-1, -1, -1);
+        final BlockPos fu5 = fu3.offset(1, 1, 1);
+        return new RenderChunkRegion(bqb, integer2, integer3, arr9, fu4, fu5);
+    }
+    
+    public static boolean isAllEmpty(final BlockPos fu1, final BlockPos fu2, final int integer3, final int integer4, final LevelChunk[][] arr) {
+        for (int integer5 = fu1.getX() >> 4; integer5 <= fu2.getX() >> 4; ++integer5) {
+            for (int integer6 = fu1.getZ() >> 4; integer6 <= fu2.getZ() >> 4; ++integer6) {
+                final LevelChunk chj8 = arr[integer5 - integer3][integer6 - integer4];
+                if (!chj8.isYSpaceEmpty(fu1.getY(), fu2.getY())) {
+                    return false;
                 }
             }
         }
-        if (boolean10) {
-            return null;
-        }
-        int integer7 = 1;
-        final BlockPos fk4 = fk2.offset(-1, -1, -1);
-        final BlockPos fk5 = fk3.offset(1, 1, 1);
-        return new RenderChunkRegion(bjw, integer2, integer3, arr9, fk4, fk5);
+        return true;
     }
     
-    public RenderChunkRegion(final Level bjw, final int integer2, final int integer3, final LevelChunk[][] arr, final BlockPos fk5, final BlockPos fk6) {
-        this.level = bjw;
+    public RenderChunkRegion(final Level bqb, final int integer2, final int integer3, final LevelChunk[][] arr, final BlockPos fu5, final BlockPos fu6) {
+        this.level = bqb;
         this.centerX = integer2;
         this.centerZ = integer3;
         this.chunks = arr;
-        this.start = fk5;
-        this.xLength = fk6.getX() - fk5.getX() + 1;
-        this.yLength = fk6.getY() - fk5.getY() + 1;
-        this.zLength = fk6.getZ() - fk5.getZ() + 1;
+        this.start = fu5;
+        this.xLength = fu6.getX() - fu5.getX() + 1;
+        this.yLength = fu6.getY() - fu5.getY() + 1;
+        this.zLength = fu6.getZ() - fu5.getZ() + 1;
         this.blockStates = new BlockState[this.xLength * this.yLength * this.zLength];
         this.fluidStates = new FluidState[this.xLength * this.yLength * this.zLength];
-        for (final BlockPos fk7 : BlockPos.betweenClosed(fk5, fk6)) {
-            final int integer4 = (fk7.getX() >> 4) - integer2;
-            final int integer5 = (fk7.getZ() >> 4) - integer3;
-            final LevelChunk cal12 = arr[integer4][integer5];
-            final int integer6 = this.index(fk7);
-            this.blockStates[integer6] = cal12.getBlockState(fk7);
-            this.fluidStates[integer6] = cal12.getFluidState(fk7);
+        for (final BlockPos fu7 : BlockPos.betweenClosed(fu5, fu6)) {
+            final int integer4 = (fu7.getX() >> 4) - integer2;
+            final int integer5 = (fu7.getZ() >> 4) - integer3;
+            final LevelChunk chj12 = arr[integer4][integer5];
+            final int integer6 = this.index(fu7);
+            this.blockStates[integer6] = chj12.getBlockState(fu7);
+            this.fluidStates[integer6] = chj12.getFluidState(fu7);
         }
     }
     
-    protected final int index(final BlockPos fk) {
-        return this.index(fk.getX(), fk.getY(), fk.getZ());
+    protected final int index(final BlockPos fu) {
+        return this.index(fu.getX(), fu.getY(), fu.getZ());
     }
     
     protected int index(final int integer1, final int integer2, final int integer3) {
@@ -87,13 +91,18 @@ public class RenderChunkRegion implements BlockAndTintGetter {
     }
     
     @Override
-    public BlockState getBlockState(final BlockPos fk) {
-        return this.blockStates[this.index(fk)];
+    public BlockState getBlockState(final BlockPos fu) {
+        return this.blockStates[this.index(fu)];
     }
     
     @Override
-    public FluidState getFluidState(final BlockPos fk) {
-        return this.fluidStates[this.index(fk)];
+    public FluidState getFluidState(final BlockPos fu) {
+        return this.fluidStates[this.index(fu)];
+    }
+    
+    @Override
+    public float getShade(final Direction fz, final boolean boolean2) {
+        return this.level.getShade(fz, boolean2);
     }
     
     @Override
@@ -103,19 +112,19 @@ public class RenderChunkRegion implements BlockAndTintGetter {
     
     @Nullable
     @Override
-    public BlockEntity getBlockEntity(final BlockPos fk) {
-        return this.getBlockEntity(fk, LevelChunk.EntityCreationType.IMMEDIATE);
+    public BlockEntity getBlockEntity(final BlockPos fu) {
+        return this.getBlockEntity(fu, LevelChunk.EntityCreationType.IMMEDIATE);
     }
     
     @Nullable
-    public BlockEntity getBlockEntity(final BlockPos fk, final LevelChunk.EntityCreationType a) {
-        final int integer4 = (fk.getX() >> 4) - this.centerX;
-        final int integer5 = (fk.getZ() >> 4) - this.centerZ;
-        return this.chunks[integer4][integer5].getBlockEntity(fk, a);
+    public BlockEntity getBlockEntity(final BlockPos fu, final LevelChunk.EntityCreationType a) {
+        final int integer4 = (fu.getX() >> 4) - this.centerX;
+        final int integer5 = (fu.getZ() >> 4) - this.centerZ;
+        return this.chunks[integer4][integer5].getBlockEntity(fu, a);
     }
     
     @Override
-    public int getBlockTint(final BlockPos fk, final ColorResolver colorResolver) {
-        return this.level.getBlockTint(fk, colorResolver);
+    public int getBlockTint(final BlockPos fu, final ColorResolver colorResolver) {
+        return this.level.getBlockTint(fu, colorResolver);
     }
 }
diff --git a/src/net/minecraft/client/renderer/chunk/VisGraph.java b/src/net/minecraft/client/renderer/chunk/VisGraph.java
index a4dd333..34693d8 100644
--- a/src/net/minecraft/client/renderer/chunk/VisGraph.java
+++ b/src/net/minecraft/client/renderer/chunk/VisGraph.java
@@ -23,13 +23,13 @@ public class VisGraph {
         this.empty = 4096;
     }
     
-    public void setOpaque(final BlockPos fk) {
-        this.bitSet.set(getIndex(fk), true);
+    public void setOpaque(final BlockPos fu) {
+        this.bitSet.set(getIndex(fu), true);
         --this.empty;
     }
     
-    private static int getIndex(final BlockPos fk) {
-        return getIndex(fk.getX() & 0xF, fk.getY() & 0xF, fk.getZ() & 0xF);
+    private static int getIndex(final BlockPos fu) {
+        return getIndex(fu.getX() & 0xF, fu.getY() & 0xF, fu.getZ() & 0xF);
     }
     
     private static int getIndex(final int integer1, final int integer2, final int integer3) {
@@ -37,25 +37,21 @@ public class VisGraph {
     }
     
     public VisibilitySet resolve() {
-        final VisibilitySet dtk2 = new VisibilitySet();
+        final VisibilitySet eeq2 = new VisibilitySet();
         if (4096 - this.empty < 256) {
-            dtk2.setAll(true);
+            eeq2.setAll(true);
         }
         else if (this.empty == 0) {
-            dtk2.setAll(false);
+            eeq2.setAll(false);
         }
         else {
             for (final int integer6 : VisGraph.INDEX_OF_EDGES) {
                 if (!this.bitSet.get(integer6)) {
-                    dtk2.add(this.floodFill(integer6));
+                    eeq2.add(this.floodFill(integer6));
                 }
             }
         }
-        return dtk2;
-    }
-    
-    public Set<Direction> floodFill(final BlockPos fk) {
-        return this.floodFill(getIndex(fk));
+        return eeq2;
     }
     
     private Set<Direction> floodFill(final int integer) {
@@ -66,8 +62,8 @@ public class VisGraph {
         while (!intPriorityQueue4.isEmpty()) {
             final int integer2 = intPriorityQueue4.dequeueInt();
             this.addEdges(integer2, set3);
-            for (final Direction fp9 : VisGraph.DIRECTIONS) {
-                final int integer3 = this.getNeighborIndexAtFace(integer2, fp9);
+            for (final Direction fz9 : VisGraph.DIRECTIONS) {
+                final int integer3 = this.getNeighborIndexAtFace(integer2, fz9);
                 if (integer3 >= 0 && !this.bitSet.get(integer3)) {
                     this.bitSet.set(integer3, true);
                     intPriorityQueue4.enqueue(integer3);
@@ -101,8 +97,8 @@ public class VisGraph {
         }
     }
     
-    private int getNeighborIndexAtFace(final int integer, final Direction fp) {
-        switch (fp) {
+    private int getNeighborIndexAtFace(final int integer, final Direction fz) {
+        switch (fz) {
             case DOWN: {
                 if ((integer >> 8 & 0xF) == 0x0) {
                     return -1;
diff --git a/src/net/minecraft/client/renderer/chunk/VisibilitySet.java b/src/net/minecraft/client/renderer/chunk/VisibilitySet.java
index d25f506..bfe0583 100644
--- a/src/net/minecraft/client/renderer/chunk/VisibilitySet.java
+++ b/src/net/minecraft/client/renderer/chunk/VisibilitySet.java
@@ -14,42 +14,42 @@ public class VisibilitySet {
     }
     
     public void add(final Set<Direction> set) {
-        for (final Direction fp4 : set) {
-            for (final Direction fp5 : set) {
-                this.set(fp4, fp5, true);
+        for (final Direction fz4 : set) {
+            for (final Direction fz5 : set) {
+                this.set(fz4, fz5, true);
             }
         }
     }
     
-    public void set(final Direction fp1, final Direction fp2, final boolean boolean3) {
-        this.data.set(fp1.ordinal() + fp2.ordinal() * VisibilitySet.FACINGS, boolean3);
-        this.data.set(fp2.ordinal() + fp1.ordinal() * VisibilitySet.FACINGS, boolean3);
+    public void set(final Direction fz1, final Direction fz2, final boolean boolean3) {
+        this.data.set(fz1.ordinal() + fz2.ordinal() * VisibilitySet.FACINGS, boolean3);
+        this.data.set(fz2.ordinal() + fz1.ordinal() * VisibilitySet.FACINGS, boolean3);
     }
     
     public void setAll(final boolean boolean1) {
         this.data.set(0, this.data.size(), boolean1);
     }
     
-    public boolean visibilityBetween(final Direction fp1, final Direction fp2) {
-        return this.data.get(fp1.ordinal() + fp2.ordinal() * VisibilitySet.FACINGS);
+    public boolean visibilityBetween(final Direction fz1, final Direction fz2) {
+        return this.data.get(fz1.ordinal() + fz2.ordinal() * VisibilitySet.FACINGS);
     }
     
     @Override
     public String toString() {
         final StringBuilder stringBuilder2 = new StringBuilder();
         stringBuilder2.append(' ');
-        for (final Direction fp6 : Direction.values()) {
-            stringBuilder2.append(' ').append(fp6.toString().toUpperCase().charAt(0));
+        for (final Direction fz6 : Direction.values()) {
+            stringBuilder2.append(' ').append(fz6.toString().toUpperCase().charAt(0));
         }
         stringBuilder2.append('\n');
-        for (final Direction fp6 : Direction.values()) {
-            stringBuilder2.append(fp6.toString().toUpperCase().charAt(0));
-            for (final Direction fp7 : Direction.values()) {
-                if (fp6 == fp7) {
+        for (final Direction fz6 : Direction.values()) {
+            stringBuilder2.append(fz6.toString().toUpperCase().charAt(0));
+            for (final Direction fz7 : Direction.values()) {
+                if (fz6 == fz7) {
                     stringBuilder2.append("  ");
                 }
                 else {
-                    final boolean boolean11 = this.visibilityBetween(fp6, fp7);
+                    final boolean boolean11 = this.visibilityBetween(fz6, fz7);
                     stringBuilder2.append(' ').append(boolean11 ? 'Y' : 'n');
                 }
             }
diff --git a/src/net/minecraft/client/renderer/culling/Frustum.java b/src/net/minecraft/client/renderer/culling/Frustum.java
index 9b9a9c5..ab2227c 100644
--- a/src/net/minecraft/client/renderer/culling/Frustum.java
+++ b/src/net/minecraft/client/renderer/culling/Frustum.java
@@ -34,14 +34,14 @@ public class Frustum {
     }
     
     private void getPlane(final Matrix4f b, final int integer2, final int integer3, final int integer4, final int integer5) {
-        final Vector4f f7 = new Vector4f((float)integer2, (float)integer3, (float)integer4, 1.0f);
-        f7.transform(b);
-        f7.normalize();
-        this.frustumData[integer5] = f7;
+        final Vector4f h7 = new Vector4f((float)integer2, (float)integer3, (float)integer4, 1.0f);
+        h7.transform(b);
+        h7.normalize();
+        this.frustumData[integer5] = h7;
     }
     
-    public boolean isVisible(final AABB cvf) {
-        return this.cubeInFrustum(cvf.minX, cvf.minY, cvf.minZ, cvf.maxX, cvf.maxY, cvf.maxZ);
+    public boolean isVisible(final AABB deg) {
+        return this.cubeInFrustum(deg.minX, deg.minY, deg.minZ, deg.maxX, deg.maxY, deg.maxZ);
     }
     
     private boolean cubeInFrustum(final double double1, final double double2, final double double3, final double double4, final double double5, final double double6) {
@@ -56,15 +56,15 @@ public class Frustum {
     
     private boolean cubeInFrustum(final float float1, final float float2, final float float3, final float float4, final float float5, final float float6) {
         for (int integer8 = 0; integer8 < 6; ++integer8) {
-            final Vector4f f9 = this.frustumData[integer8];
-            if (f9.dot(new Vector4f(float1, float2, float3, 1.0f)) <= 0.0f) {
-                if (f9.dot(new Vector4f(float4, float2, float3, 1.0f)) <= 0.0f) {
-                    if (f9.dot(new Vector4f(float1, float5, float3, 1.0f)) <= 0.0f) {
-                        if (f9.dot(new Vector4f(float4, float5, float3, 1.0f)) <= 0.0f) {
-                            if (f9.dot(new Vector4f(float1, float2, float6, 1.0f)) <= 0.0f) {
-                                if (f9.dot(new Vector4f(float4, float2, float6, 1.0f)) <= 0.0f) {
-                                    if (f9.dot(new Vector4f(float1, float5, float6, 1.0f)) <= 0.0f) {
-                                        if (f9.dot(new Vector4f(float4, float5, float6, 1.0f)) <= 0.0f) {
+            final Vector4f h9 = this.frustumData[integer8];
+            if (h9.dot(new Vector4f(float1, float2, float3, 1.0f)) <= 0.0f) {
+                if (h9.dot(new Vector4f(float4, float2, float3, 1.0f)) <= 0.0f) {
+                    if (h9.dot(new Vector4f(float1, float5, float3, 1.0f)) <= 0.0f) {
+                        if (h9.dot(new Vector4f(float4, float5, float3, 1.0f)) <= 0.0f) {
+                            if (h9.dot(new Vector4f(float1, float2, float6, 1.0f)) <= 0.0f) {
+                                if (h9.dot(new Vector4f(float4, float2, float6, 1.0f)) <= 0.0f) {
+                                    if (h9.dot(new Vector4f(float1, float5, float6, 1.0f)) <= 0.0f) {
+                                        if (h9.dot(new Vector4f(float4, float5, float6, 1.0f)) <= 0.0f) {
                                             return false;
                                         }
                                     }
diff --git a/src/net/minecraft/client/renderer/debug/BeeDebugRenderer.java b/src/net/minecraft/client/renderer/debug/BeeDebugRenderer.java
index f0484fe..dc6b941 100644
--- a/src/net/minecraft/client/renderer/debug/BeeDebugRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/BeeDebugRenderer.java
@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.function.Function;
-import net.minecraft.network.protocol.game.DebugMobNameGenerator;
+import net.minecraft.network.protocol.game.DebugEntityNameGenerator;
 import java.util.Iterator;
 import java.util.Collection;
 import com.google.common.collect.Sets;
@@ -34,10 +34,10 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     private final Map<UUID, BeeInfo> beeInfosPerEntity;
     private UUID lastLookedAtUuid;
     
-    public BeeDebugRenderer(final Minecraft dbn) {
+    public BeeDebugRenderer(final Minecraft dlx) {
         this.hives = Maps.newHashMap();
         this.beeInfosPerEntity = Maps.newHashMap();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
     @Override
@@ -56,7 +56,7 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
         RenderSystem.pushMatrix();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
@@ -82,7 +82,7 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     }
     
     private void doRender() {
-        final BlockPos fk3 = this.getCamera().getBlockPosition();
+        final BlockPos fu3 = this.getCamera().getBlockPosition();
         this.beeInfosPerEntity.values().forEach(a -> {
             if (this.isPlayerCloseEnoughToMob(a)) {
                 this.renderBeeInfo(a);
@@ -90,9 +90,9 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
             return;
         });
         this.renderFlowerInfos();
-        for (final BlockPos fk4 : this.hives.keySet()) {
-            if (fk3.closerThan(fk4, 30.0)) {
-                highlightHive(fk4);
+        for (final BlockPos fu4 : this.hives.keySet()) {
+            if (fu3.closerThan(fu4, 30.0)) {
+                highlightHive(fu4);
             }
         }
         final Map<BlockPos, Set<UUID>> map3 = this.createHiveBlacklistMap();
@@ -106,55 +106,45 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
             }
             return;
         });
-        this.getGhostHives().forEach((fk2, list) -> {
-            if (fk3.closerThan(fk2, 30.0)) {
-                this.renderGhostHive(fk2, list);
+        this.getGhostHives().forEach((fu2, list) -> {
+            if (fu3.closerThan(fu2, 30.0)) {
+                this.renderGhostHive(fu2, list);
             }
         });
     }
     
     private Map<BlockPos, Set<UUID>> createHiveBlacklistMap() {
         final Map<BlockPos, Set<UUID>> map2 = Maps.newHashMap();
-        this.beeInfosPerEntity.values().forEach(a -> a.blacklistedHives.forEach(fk -> addBeeToSetInMap(map2, a, fk)));
+        this.beeInfosPerEntity.values().forEach(a -> a.blacklistedHives.forEach(fu -> map2.computeIfAbsent(fu, fu -> Sets.newHashSet()).add(a.getUuid())));
         return map2;
     }
     
     private void renderFlowerInfos() {
         final Map<BlockPos, Set<UUID>> map2 = Maps.newHashMap();
-        final Map<K, Set<UUID>> map3;
-        Set<UUID> set3;
-        this.beeInfosPerEntity.values().stream().filter(BeeInfo::hasFlower).forEach(a -> {
-            set3 = map3.get(a.flowerPos);
-            if (set3 == null) {
-                set3 = Sets.newHashSet();
-                map3.put((K)a.flowerPos, set3);
-            }
-            set3.add(a.getUuid());
-            return;
-        });
-        final BlockPos fk2;
-        final Set<UUID> set4;
-        final Set<String> set5;
+        this.beeInfosPerEntity.values().stream().filter(BeeInfo::hasFlower).forEach(a -> map2.computeIfAbsent(a.flowerPos, fu -> Sets.newHashSet()).add(a.getUuid()));
+        final BlockPos fu2;
+        final Set<UUID> set3;
+        final Set<String> set4;
         int integer5;
         final String string;
-        final BlockPos fk3;
+        final BlockPos fu3;
         final int integer6;
         final String string2;
-        final BlockPos fk4;
+        final BlockPos fu4;
         final int integer7;
         final float float6;
         map2.entrySet().forEach(entry -> {
-            fk2 = entry.getKey();
-            set4 = (Set<UUID>)entry.getValue();
-            set5 = set4.stream().map(DebugMobNameGenerator::getMobName).collect(Collectors.toSet());
+            fu2 = entry.getKey();
+            set3 = (Set<UUID>)entry.getValue();
+            set4 = set3.stream().map(DebugEntityNameGenerator::getEntityName).collect(Collectors.toSet());
             integer5 = 1;
-            set5.toString();
+            set4.toString();
             integer5++;
-            renderTextOverPos(string, fk3, integer6, -256);
+            renderTextOverPos(string, fu3, integer6, -256);
             integer5++;
-            renderTextOverPos(string2, fk4, integer7, -1);
+            renderTextOverPos(string2, fu4, integer7, -1);
             float6 = 0.05f;
-            renderTransparentFilledBox(fk2, 0.05f, 0.8f, 0.8f, 0.0f, 0.3f);
+            renderTransparentFilledBox(fu2, 0.05f, 0.8f, 0.8f, 0.0f, 0.3f);
         });
     }
     
@@ -165,34 +155,25 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         if (collection.size() > 3) {
             return "" + collection.size() + " bees";
         }
-        return collection.stream().map(DebugMobNameGenerator::getMobName).collect(Collectors.toSet()).toString();
+        return collection.stream().map(DebugEntityNameGenerator::getEntityName).collect(Collectors.toSet()).toString();
     }
     
-    private static void addBeeToSetInMap(final Map<BlockPos, Set<UUID>> map, final BeeInfo a, final BlockPos fk) {
-        Set<UUID> set4 = map.get(fk);
-        if (set4 == null) {
-            set4 = Sets.newHashSet();
-            map.put(fk, set4);
-        }
-        set4.add(a.getUuid());
-    }
-    
-    private static void highlightHive(final BlockPos fk) {
+    private static void highlightHive(final BlockPos fu) {
         final float float2 = 0.05f;
-        renderTransparentFilledBox(fk, 0.05f, 0.2f, 0.2f, 1.0f, 0.3f);
+        renderTransparentFilledBox(fu, 0.05f, 0.2f, 0.2f, 1.0f, 0.3f);
     }
     
-    private void renderGhostHive(final BlockPos fk, final List<String> list) {
+    private void renderGhostHive(final BlockPos fu, final List<String> list) {
         final float float4 = 0.05f;
-        renderTransparentFilledBox(fk, 0.05f, 0.2f, 0.2f, 1.0f, 0.3f);
-        renderTextOverPos("" + list, fk, 0, -256);
-        renderTextOverPos("Ghost Hive", fk, 1, -65536);
+        renderTransparentFilledBox(fu, 0.05f, 0.2f, 0.2f, 1.0f, 0.3f);
+        renderTextOverPos("" + list, fu, 0, -256);
+        renderTextOverPos("Ghost Hive", fu, 1, -65536);
     }
     
-    private static void renderTransparentFilledBox(final BlockPos fk, final float float2, final float float3, final float float4, final float float5, final float float6) {
+    private static void renderTransparentFilledBox(final BlockPos fu, final float float2, final float float3, final float float4, final float float5, final float float6) {
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        DebugRenderer.renderFilledBox(fk, float2, float3, float4, float5, float6);
+        DebugRenderer.renderFilledBox(fu, float2, float3, float4, float5, float6);
     }
     
     private void renderHiveInfo(final HiveInfo b, final Collection<UUID> collection) {
@@ -249,26 +230,26 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     }
     
     private static void renderTextOverHive(final String string, final HiveInfo b, final int integer3, final int integer4) {
-        final BlockPos fk5 = b.pos;
-        renderTextOverPos(string, fk5, integer3, integer4);
+        final BlockPos fu5 = b.pos;
+        renderTextOverPos(string, fu5, integer3, integer4);
     }
     
-    private static void renderTextOverPos(final String string, final BlockPos fk, final int integer3, final int integer4) {
+    private static void renderTextOverPos(final String string, final BlockPos fu, final int integer3, final int integer4) {
         final double double5 = 1.3;
         final double double6 = 0.2;
-        final double double7 = fk.getX() + 0.5;
-        final double double8 = fk.getY() + 1.3 + integer3 * 0.2;
-        final double double9 = fk.getZ() + 0.5;
+        final double double7 = fu.getX() + 0.5;
+        final double double8 = fu.getY() + 1.3 + integer3 * 0.2;
+        final double double9 = fu.getZ() + 0.5;
         DebugRenderer.renderFloatingText(string, double7, double8, double9, integer4, 0.02f, true, 0.0f, true);
     }
     
-    private static void renderTextOverMob(final Position fz, final int integer2, final String string, final int integer4, final float float5) {
+    private static void renderTextOverMob(final Position gj, final int integer2, final String string, final int integer4, final float float5) {
         final double double6 = 2.4;
         final double double7 = 0.25;
-        final BlockPos fk10 = new BlockPos(fz);
-        final double double8 = fk10.getX() + 0.5;
-        final double double9 = fz.y() + 2.4 + integer2 * 0.25;
-        final double double10 = fk10.getZ() + 0.5;
+        final BlockPos fu10 = new BlockPos(gj);
+        final double double8 = fu10.getX() + 0.5;
+        final double double9 = gj.y() + 2.4 + integer2 * 0.25;
+        final double double10 = fu10.getZ() + 0.5;
         final float float6 = 0.5f;
         DebugRenderer.renderFloatingText(string, double8, double9, double10, integer4, float5, false, 0.5f, true);
     }
@@ -277,10 +258,10 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         return this.minecraft.gameRenderer.getMainCamera();
     }
     
-    private String getPosDescription(final BeeInfo a, final BlockPos fk) {
-        final float float4 = Mth.sqrt(fk.distSqr(a.pos.x(), a.pos.y(), a.pos.z(), true));
+    private String getPosDescription(final BeeInfo a, final BlockPos fu) {
+        final float float4 = Mth.sqrt(fu.distSqr(a.pos.x(), a.pos.y(), a.pos.z(), true));
         final double double5 = Math.round(float4 * 10.0f) / 10.0;
-        return fk.toShortString() + " (dist " + double5 + ")";
+        return fu.toShortString() + " (dist " + double5 + ")";
     }
     
     private boolean isBeeSelected(final BeeInfo a) {
@@ -288,33 +269,28 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     }
     
     private boolean isPlayerCloseEnoughToMob(final BeeInfo a) {
-        final Player ayj3 = this.minecraft.player;
-        final BlockPos fk4 = new BlockPos(ayj3.getX(), a.pos.y(), ayj3.getZ());
-        final BlockPos fk5 = new BlockPos(a.pos);
-        return fk4.closerThan(fk5, 30.0);
+        final Player bec3 = this.minecraft.player;
+        final BlockPos fu4 = new BlockPos(bec3.getX(), a.pos.y(), bec3.getZ());
+        final BlockPos fu5 = new BlockPos(a.pos);
+        return fu4.closerThan(fu5, 30.0);
     }
     
-    private Collection<UUID> getHiveMembers(final BlockPos fk) {
-        return this.beeInfosPerEntity.values().stream().filter(a -> a.hasHive(fk)).map(BeeInfo::getUuid).collect(Collectors.toSet());
+    private Collection<UUID> getHiveMembers(final BlockPos fu) {
+        return this.beeInfosPerEntity.values().stream().filter(a -> a.hasHive(fu)).map(BeeInfo::getUuid).collect(Collectors.toSet());
     }
     
     private Map<BlockPos, List<String>> getGhostHives() {
         final Map<BlockPos, List<String>> map2 = Maps.newHashMap();
         for (final BeeInfo a4 : this.beeInfosPerEntity.values()) {
             if (a4.hivePos != null && !this.hives.containsKey(a4.hivePos)) {
-                List<String> list5 = map2.get(a4.hivePos);
-                if (list5 == null) {
-                    list5 = Lists.newArrayList();
-                    map2.put(a4.hivePos, list5);
-                }
-                list5.add(a4.getName());
+                map2.computeIfAbsent(a4.hivePos, fu -> Lists.newArrayList()).add(a4.getName());
             }
         }
         return map2;
     }
     
     private void updateLastLookedAtUuid() {
-        DebugRenderer.getTargetedEntity(this.minecraft.getCameraEntity(), 8).ifPresent(akq -> this.lastLookedAtUuid = akq.getUUID());
+        DebugRenderer.getTargetedEntity(this.minecraft.getCameraEntity(), 8).ifPresent(aom -> this.lastLookedAtUuid = aom.getUUID());
     }
     
     public static class HiveInfo {
@@ -325,8 +301,8 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         public final boolean sedated;
         public final long lastSeen;
         
-        public HiveInfo(final BlockPos fk, final String string, final int integer3, final int integer4, final boolean boolean5, final long long6) {
-            this.pos = fk;
+        public HiveInfo(final BlockPos fu, final String string, final int integer3, final int integer4, final boolean boolean5, final long long6) {
+            this.pos = fu;
             this.hiveType = string;
             this.occupantCount = integer3;
             this.honeyLevel = integer4;
@@ -349,20 +325,20 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         public final List<String> goals;
         public final Set<BlockPos> blacklistedHives;
         
-        public BeeInfo(final UUID uUID, final int integer2, final Position fz, final Path cqq, final BlockPos fk5, final BlockPos fk6, final int integer7) {
+        public BeeInfo(final UUID uUID, final int integer2, final Position gj, final Path czf, final BlockPos fu5, final BlockPos fu6, final int integer7) {
             this.goals = Lists.newArrayList();
             this.blacklistedHives = Sets.newHashSet();
             this.uuid = uUID;
             this.id = integer2;
-            this.pos = fz;
-            this.path = cqq;
-            this.hivePos = fk5;
-            this.flowerPos = fk6;
+            this.pos = gj;
+            this.path = czf;
+            this.hivePos = fu5;
+            this.flowerPos = fu6;
             this.travelTicks = integer7;
         }
         
-        public boolean hasHive(final BlockPos fk) {
-            return this.hivePos != null && this.hivePos.equals(fk);
+        public boolean hasHive(final BlockPos fu) {
+            return this.hivePos != null && this.hivePos.equals(fu);
         }
         
         public UUID getUuid() {
@@ -370,7 +346,7 @@ public class BeeDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         }
         
         public String getName() {
-            return DebugMobNameGenerator.getMobName(this.uuid);
+            return DebugEntityNameGenerator.getEntityName(this.uuid);
         }
         
         @Override
diff --git a/src/net/minecraft/client/renderer/debug/VillageDebugRenderer.java b/src/net/minecraft/client/renderer/debug/BrainDebugRenderer.java
similarity index 59%
rename from src/net/minecraft/client/renderer/debug/VillageDebugRenderer.java
rename to src/net/minecraft/client/renderer/debug/BrainDebugRenderer.java
index 38d6865..031bede 100644
--- a/src/net/minecraft/client/renderer/debug/VillageDebugRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/BrainDebugRenderer.java
@@ -1,54 +1,52 @@
 package net.minecraft.client.renderer.debug;
 
 import java.util.function.Predicate;
-import javax.annotation.Nullable;
+import com.google.common.collect.Sets;
 import net.minecraft.world.level.pathfinder.Path;
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.world.entity.Entity;
+import com.google.common.collect.Iterables;
 import java.util.Collection;
 import net.minecraft.world.entity.player.Player;
 import java.util.Objects;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.function.Function;
-import net.minecraft.network.protocol.game.DebugMobNameGenerator;
+import net.minecraft.network.protocol.game.DebugEntityNameGenerator;
 import net.minecraft.core.Position;
 import com.google.common.collect.Lists;
+import java.util.Set;
 import java.util.List;
 import java.util.Iterator;
 import net.minecraft.core.Vec3i;
+import net.minecraft.world.entity.Entity;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.google.common.collect.Sets;
 import com.google.common.collect.Maps;
+import javax.annotation.Nullable;
 import java.util.UUID;
-import net.minecraft.core.SectionPos;
-import java.util.Set;
 import net.minecraft.core.BlockPos;
 import java.util.Map;
 import net.minecraft.client.Minecraft;
 import org.apache.logging.log4j.Logger;
 
-public class VillageDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
+public class BrainDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     private static final Logger LOGGER;
     private final Minecraft minecraft;
     private final Map<BlockPos, PoiInfo> pois;
-    private final Set<SectionPos> villageSections;
     private final Map<UUID, BrainDump> brainDumpsPerEntity;
+    @Nullable
     private UUID lastLookedAtUuid;
     
-    public VillageDebugRenderer(final Minecraft dbn) {
+    public BrainDebugRenderer(final Minecraft dlx) {
         this.pois = Maps.newHashMap();
-        this.villageSections = Sets.newHashSet();
         this.brainDumpsPerEntity = Maps.newHashMap();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
     @Override
     public void clear() {
         this.pois.clear();
-        this.villageSections.clear();
         this.brainDumpsPerEntity.clear();
         this.lastLookedAtUuid = null;
     }
@@ -57,37 +55,30 @@ public class VillageDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         this.pois.put(b.pos, b);
     }
     
-    public void removePoi(final BlockPos fk) {
-        this.pois.remove(fk);
+    public void removePoi(final BlockPos fu) {
+        this.pois.remove(fu);
     }
     
-    public void setFreeTicketCount(final BlockPos fk, final int integer) {
-        final PoiInfo b4 = this.pois.get(fk);
+    public void setFreeTicketCount(final BlockPos fu, final int integer) {
+        final PoiInfo b4 = this.pois.get(fu);
         if (b4 == null) {
-            VillageDebugRenderer.LOGGER.warn("Strange, setFreeTicketCount was called for an unknown POI: " + fk);
+            BrainDebugRenderer.LOGGER.warn("Strange, setFreeTicketCount was called for an unknown POI: " + fu);
             return;
         }
         b4.freeTicketCount = integer;
     }
     
-    public void setVillageSection(final SectionPos gd) {
-        this.villageSections.add(gd);
-    }
-    
-    public void setNotVillageSection(final SectionPos gd) {
-        this.villageSections.remove(gd);
-    }
-    
     public void addOrUpdateBrainDump(final BrainDump a) {
         this.brainDumpsPerEntity.put(a.uuid, a);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
         RenderSystem.pushMatrix();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.disableTexture();
+        this.clearRemovedEntities();
         this.doRender(double3, double4, double5);
         RenderSystem.enableTexture();
         RenderSystem.disableBlend();
@@ -97,69 +88,72 @@ public class VillageDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         }
     }
     
-    private void doRender(final double double1, final double double2, final double double3) {
-        final BlockPos fk3 = new BlockPos(double1, double2, double3);
-        this.villageSections.forEach(gd -> {
-            if (fk3.closerThan(gd.center(), 60.0)) {
-                highlightVillageSection(gd);
-            }
-            return;
+    private void clearRemovedEntities() {
+        final Entity aom3;
+        this.brainDumpsPerEntity.entrySet().removeIf(entry -> {
+            aom3 = this.minecraft.level.getEntity(entry.getValue().id);
+            return aom3 == null || aom3.removed;
         });
+    }
+    
+    private void doRender(final double double1, final double double2, final double double3) {
+        final BlockPos fu3 = new BlockPos(double1, double2, double3);
         this.brainDumpsPerEntity.values().forEach(a -> {
             if (this.isPlayerCloseEnoughToMob(a)) {
-                this.renderVillagerInfo(a, double1, double2, double3);
+                this.renderBrainInfo(a, double1, double2, double3);
             }
             return;
         });
-        for (final BlockPos fk4 : this.pois.keySet()) {
-            if (fk3.closerThan(fk4, 30.0)) {
-                highlightPoi(fk4);
+        for (final BlockPos fu4 : this.pois.keySet()) {
+            if (fu3.closerThan(fu4, 30.0)) {
+                highlightPoi(fu4);
             }
         }
         this.pois.values().forEach(b -> {
-            if (fk3.closerThan(b.pos, 30.0)) {
+            if (fu3.closerThan(b.pos, 30.0)) {
                 this.renderPoiInfo(b);
             }
             return;
         });
-        this.getGhostPois().forEach((fk2, list) -> {
-            if (fk3.closerThan(fk2, 30.0)) {
-                this.renderGhostPoi(fk2, list);
+        this.getGhostPois().forEach((fu2, list) -> {
+            if (fu3.closerThan(fu2, 30.0)) {
+                this.renderGhostPoi(fu2, list);
             }
         });
     }
     
-    private static void highlightVillageSection(final SectionPos gd) {
-        final float float2 = 1.0f;
-        final BlockPos fk3 = gd.center();
-        final BlockPos fk4 = fk3.offset(-1.0, -1.0, -1.0);
-        final BlockPos fk5 = fk3.offset(1.0, 1.0, 1.0);
-        DebugRenderer.renderFilledBox(fk4, fk5, 0.2f, 1.0f, 0.2f, 0.15f);
-    }
-    
-    private static void highlightPoi(final BlockPos fk) {
+    private static void highlightPoi(final BlockPos fu) {
         final float float2 = 0.05f;
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        DebugRenderer.renderFilledBox(fk, 0.05f, 0.2f, 0.2f, 1.0f, 0.3f);
+        DebugRenderer.renderFilledBox(fu, 0.05f, 0.2f, 0.2f, 1.0f, 0.3f);
     }
     
-    private void renderGhostPoi(final BlockPos fk, final List<String> list) {
+    private void renderGhostPoi(final BlockPos fu, final List<String> list) {
         final float float4 = 0.05f;
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        DebugRenderer.renderFilledBox(fk, 0.05f, 0.2f, 0.2f, 1.0f, 0.3f);
-        renderTextOverPos("" + list, fk, 0, -256);
-        renderTextOverPos("Ghost POI", fk, 1, -65536);
+        DebugRenderer.renderFilledBox(fu, 0.05f, 0.2f, 0.2f, 1.0f, 0.3f);
+        renderTextOverPos("" + list, fu, 0, -256);
+        renderTextOverPos("Ghost POI", fu, 1, -65536);
     }
     
     private void renderPoiInfo(final PoiInfo b) {
         int integer3 = 0;
-        if (this.getTicketHolderNames(b).size() < 4) {
-            renderTextOverPoi("" + this.getTicketHolderNames(b), b, integer3, -256);
+        final Set<String> set4 = this.getTicketHolderNames(b);
+        if (set4.size() < 4) {
+            renderTextOverPoi("Owners: " + set4, b, integer3, -256);
         }
         else {
-            renderTextOverPoi("" + this.getTicketHolderNames(b).size() + " ticket holders", b, integer3, -256);
+            renderTextOverPoi("" + set4.size() + " ticket holders", b, integer3, -256);
+        }
+        ++integer3;
+        final Set<String> set5 = this.getPotentialTicketHolderNames(b);
+        if (set5.size() < 4) {
+            renderTextOverPoi("Candidates: " + set5, b, integer3, -23296);
+        }
+        else {
+            renderTextOverPoi("" + set5.size() + " potential owners", b, integer3, -23296);
         }
         ++integer3;
         renderTextOverPoi("Free tickets: " + b.freeTicketCount, b, integer3, -256);
@@ -173,13 +167,18 @@ public class VillageDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         }
     }
     
-    private void renderVillagerInfo(final BrainDump a, final double double2, final double double3, final double double4) {
-        final boolean boolean9 = this.isVillagerSelected(a);
+    private void renderBrainInfo(final BrainDump a, final double double2, final double double3, final double double4) {
+        final boolean boolean9 = this.isMobSelected(a);
         int integer10 = 0;
         renderTextOverMob(a.pos, integer10, a.name, -1, 0.03f);
         ++integer10;
         if (boolean9) {
-            renderTextOverMob(a.pos, integer10, a.profession + " " + a.xp + "xp", -1, 0.02f);
+            renderTextOverMob(a.pos, integer10, a.profession + " " + a.xp + " xp", -1, 0.02f);
+            ++integer10;
+        }
+        if (boolean9) {
+            final int integer11 = (a.health < a.maxHealth) ? -23296 : -1;
+            renderTextOverMob(a.pos, integer10, "health: " + String.format("%.1f", a.health) + " / " + String.format("%.1f", a.maxHealth), integer11, 0.02f);
             ++integer10;
         }
         if (boolean9 && !a.inventory.equals("")) {
@@ -225,60 +224,63 @@ public class VillageDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     }
     
     private static void renderTextOverPoi(final String string, final PoiInfo b, final int integer3, final int integer4) {
-        final BlockPos fk5 = b.pos;
-        renderTextOverPos(string, fk5, integer3, integer4);
+        final BlockPos fu5 = b.pos;
+        renderTextOverPos(string, fu5, integer3, integer4);
     }
     
-    private static void renderTextOverPos(final String string, final BlockPos fk, final int integer3, final int integer4) {
+    private static void renderTextOverPos(final String string, final BlockPos fu, final int integer3, final int integer4) {
         final double double5 = 1.3;
         final double double6 = 0.2;
-        final double double7 = fk.getX() + 0.5;
-        final double double8 = fk.getY() + 1.3 + integer3 * 0.2;
-        final double double9 = fk.getZ() + 0.5;
+        final double double7 = fu.getX() + 0.5;
+        final double double8 = fu.getY() + 1.3 + integer3 * 0.2;
+        final double double9 = fu.getZ() + 0.5;
         DebugRenderer.renderFloatingText(string, double7, double8, double9, integer4, 0.02f, true, 0.0f, true);
     }
     
-    private static void renderTextOverMob(final Position fz, final int integer2, final String string, final int integer4, final float float5) {
+    private static void renderTextOverMob(final Position gj, final int integer2, final String string, final int integer4, final float float5) {
         final double double6 = 2.4;
         final double double7 = 0.25;
-        final BlockPos fk10 = new BlockPos(fz);
-        final double double8 = fk10.getX() + 0.5;
-        final double double9 = fz.y() + 2.4 + integer2 * 0.25;
-        final double double10 = fk10.getZ() + 0.5;
+        final BlockPos fu10 = new BlockPos(gj);
+        final double double8 = fu10.getX() + 0.5;
+        final double double9 = gj.y() + 2.4 + integer2 * 0.25;
+        final double double10 = fu10.getZ() + 0.5;
         final float float6 = 0.5f;
         DebugRenderer.renderFloatingText(string, double8, double9, double10, integer4, float5, false, 0.5f, true);
     }
     
     private Set<String> getTicketHolderNames(final PoiInfo b) {
-        return this.getTicketHolders(b.pos).stream().map(DebugMobNameGenerator::getMobName).collect(Collectors.toSet());
+        return this.getTicketHolders(b.pos).stream().map(DebugEntityNameGenerator::getEntityName).collect(Collectors.toSet());
     }
     
-    private boolean isVillagerSelected(final BrainDump a) {
+    private Set<String> getPotentialTicketHolderNames(final PoiInfo b) {
+        return this.getPotentialTicketHolders(b.pos).stream().map(DebugEntityNameGenerator::getEntityName).collect(Collectors.toSet());
+    }
+    
+    private boolean isMobSelected(final BrainDump a) {
         return Objects.equals(this.lastLookedAtUuid, a.uuid);
     }
     
     private boolean isPlayerCloseEnoughToMob(final BrainDump a) {
-        final Player ayj3 = this.minecraft.player;
-        final BlockPos fk4 = new BlockPos(ayj3.getX(), a.pos.y(), ayj3.getZ());
-        final BlockPos fk5 = new BlockPos(a.pos);
-        return fk4.closerThan(fk5, 30.0);
+        final Player bec3 = this.minecraft.player;
+        final BlockPos fu4 = new BlockPos(bec3.getX(), a.pos.y(), bec3.getZ());
+        final BlockPos fu5 = new BlockPos(a.pos);
+        return fu4.closerThan(fu5, 30.0);
     }
     
-    private Collection<UUID> getTicketHolders(final BlockPos fk) {
-        return this.brainDumpsPerEntity.values().stream().filter(a -> a.hasPoi(fk)).map(BrainDump::getUuid).collect(Collectors.toSet());
+    private Collection<UUID> getTicketHolders(final BlockPos fu) {
+        return this.brainDumpsPerEntity.values().stream().filter(a -> a.hasPoi(fu)).map(BrainDump::getUuid).collect(Collectors.toSet());
+    }
+    
+    private Collection<UUID> getPotentialTicketHolders(final BlockPos fu) {
+        return this.brainDumpsPerEntity.values().stream().filter(a -> a.hasPotentialPoi(fu)).map(BrainDump::getUuid).collect(Collectors.toSet());
     }
     
     private Map<BlockPos, List<String>> getGhostPois() {
         final Map<BlockPos, List<String>> map2 = Maps.newHashMap();
         for (final BrainDump a4 : this.brainDumpsPerEntity.values()) {
-            for (final BlockPos fk6 : a4.pois) {
-                if (!this.pois.containsKey(fk6)) {
-                    List<String> list7 = map2.get(fk6);
-                    if (list7 == null) {
-                        list7 = Lists.newArrayList();
-                        map2.put(fk6, list7);
-                    }
-                    list7.add(a4.name);
+            for (final BlockPos fu6 : Iterables.<BlockPos>concat(a4.pois, a4.potentialPois)) {
+                if (!this.pois.containsKey(fu6)) {
+                    map2.computeIfAbsent(fu6, fu -> Lists.newArrayList()).add(a4.name);
                 }
             }
         }
@@ -286,7 +288,7 @@ public class VillageDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     }
     
     private void updateLastLookedAtUuid() {
-        DebugRenderer.getTargetedEntity(this.minecraft.getCameraEntity(), 8).ifPresent(akq -> this.lastLookedAtUuid = akq.getUUID());
+        DebugRenderer.getTargetedEntity(this.minecraft.getCameraEntity(), 8).ifPresent(aom -> this.lastLookedAtUuid = aom.getUUID());
     }
     
     static {
@@ -298,8 +300,8 @@ public class VillageDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         public String type;
         public int freeTicketCount;
         
-        public PoiInfo(final BlockPos fk, final String string, final int integer) {
-            this.pos = fk;
+        public PoiInfo(final BlockPos fu, final String string, final int integer) {
+            this.pos = fu;
             this.type = string;
             this.freeTicketCount = integer;
         }
@@ -311,6 +313,8 @@ public class VillageDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         public final String name;
         public final String profession;
         public final int xp;
+        public final float health;
+        public final float maxHealth;
         public final Position pos;
         public final String inventory;
         public final Path path;
@@ -320,26 +324,34 @@ public class VillageDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         public final List<String> memories;
         public final List<String> gossips;
         public final Set<BlockPos> pois;
+        public final Set<BlockPos> potentialPois;
         
-        public BrainDump(final UUID uUID, final int integer2, final String string3, final String string4, final int integer5, final Position fz, final String string7, @Nullable final Path cqq, final boolean boolean9) {
+        public BrainDump(final UUID uUID, final int integer2, final String string3, final String string4, final int integer5, final float float6, final float float7, final Position gj, final String string9, @Nullable final Path czf, final boolean boolean11) {
             this.activities = Lists.newArrayList();
             this.behaviors = Lists.newArrayList();
             this.memories = Lists.newArrayList();
             this.gossips = Lists.newArrayList();
             this.pois = Sets.newHashSet();
+            this.potentialPois = Sets.newHashSet();
             this.uuid = uUID;
             this.id = integer2;
             this.name = string3;
             this.profession = string4;
             this.xp = integer5;
-            this.pos = fz;
-            this.inventory = string7;
-            this.path = cqq;
-            this.wantsGolem = boolean9;
+            this.health = float6;
+            this.maxHealth = float7;
+            this.pos = gj;
+            this.inventory = string9;
+            this.path = czf;
+            this.wantsGolem = boolean11;
         }
         
-        private boolean hasPoi(final BlockPos fk) {
-            return this.pois.stream().anyMatch(fk::equals);
+        private boolean hasPoi(final BlockPos fu) {
+            return this.pois.stream().anyMatch(fu::equals);
+        }
+        
+        private boolean hasPotentialPoi(final BlockPos fu) {
+            return this.potentialPois.contains(fu);
         }
         
         public UUID getUuid() {
diff --git a/src/net/minecraft/client/renderer/debug/CaveDebugRenderer.java b/src/net/minecraft/client/renderer/debug/CaveDebugRenderer.java
index 89d0ad2..bde80d9 100644
--- a/src/net/minecraft/client/renderer/debug/CaveDebugRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/CaveDebugRenderer.java
@@ -26,41 +26,41 @@ public class CaveDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         this.startPoses = Lists.newArrayList();
     }
     
-    public void addTunnel(final BlockPos fk, final List<BlockPos> list2, final List<Float> list3) {
+    public void addTunnel(final BlockPos fu, final List<BlockPos> list2, final List<Float> list3) {
         for (int integer5 = 0; integer5 < list2.size(); ++integer5) {
-            this.tunnelsList.put(list2.get(integer5), fk);
+            this.tunnelsList.put(list2.get(integer5), fu);
             this.thicknessMap.put(list2.get(integer5), list3.get(integer5));
         }
-        this.startPoses.add(fk);
+        this.startPoses.add(fu);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
         RenderSystem.pushMatrix();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.disableTexture();
-        final BlockPos fk10 = new BlockPos(double3, 0.0, double5);
-        final Tesselator cym11 = Tesselator.getInstance();
-        final BufferBuilder cyg12 = cym11.getBuilder();
-        cyg12.begin(5, DefaultVertexFormat.POSITION_COLOR);
+        final BlockPos fu10 = new BlockPos(double3, 0.0, double5);
+        final Tesselator dhn11 = Tesselator.getInstance();
+        final BufferBuilder dhg12 = dhn11.getBuilder();
+        dhg12.begin(5, DefaultVertexFormat.POSITION_COLOR);
         for (final Map.Entry<BlockPos, BlockPos> entry14 : this.tunnelsList.entrySet()) {
-            final BlockPos fk11 = entry14.getKey();
-            final BlockPos fk12 = entry14.getValue();
-            final float float17 = fk12.getX() * 128 % 256 / 256.0f;
-            final float float18 = fk12.getY() * 128 % 256 / 256.0f;
-            final float float19 = fk12.getZ() * 128 % 256 / 256.0f;
-            final float float20 = this.thicknessMap.get(fk11);
-            if (fk10.closerThan(fk11, 160.0)) {
-                LevelRenderer.addChainedFilledBoxVertices(cyg12, fk11.getX() + 0.5f - double3 - float20, fk11.getY() + 0.5f - double4 - float20, fk11.getZ() + 0.5f - double5 - float20, fk11.getX() + 0.5f - double3 + float20, fk11.getY() + 0.5f - double4 + float20, fk11.getZ() + 0.5f - double5 + float20, float17, float18, float19, 0.5f);
+            final BlockPos fu11 = entry14.getKey();
+            final BlockPos fu12 = entry14.getValue();
+            final float float17 = fu12.getX() * 128 % 256 / 256.0f;
+            final float float18 = fu12.getY() * 128 % 256 / 256.0f;
+            final float float19 = fu12.getZ() * 128 % 256 / 256.0f;
+            final float float20 = this.thicknessMap.get(fu11);
+            if (fu10.closerThan(fu11, 160.0)) {
+                LevelRenderer.addChainedFilledBoxVertices(dhg12, fu11.getX() + 0.5f - double3 - float20, fu11.getY() + 0.5f - double4 - float20, fu11.getZ() + 0.5f - double5 - float20, fu11.getX() + 0.5f - double3 + float20, fu11.getY() + 0.5f - double4 + float20, fu11.getZ() + 0.5f - double5 + float20, float17, float18, float19, 0.5f);
             }
         }
-        for (final BlockPos fk13 : this.startPoses) {
-            if (fk10.closerThan(fk13, 160.0)) {
-                LevelRenderer.addChainedFilledBoxVertices(cyg12, fk13.getX() - double3, fk13.getY() - double4, fk13.getZ() - double5, fk13.getX() + 1.0f - double3, fk13.getY() + 1.0f - double4, fk13.getZ() + 1.0f - double5, 1.0f, 1.0f, 1.0f, 1.0f);
+        for (final BlockPos fu13 : this.startPoses) {
+            if (fu10.closerThan(fu13, 160.0)) {
+                LevelRenderer.addChainedFilledBoxVertices(dhg12, fu13.getX() - double3, fu13.getY() - double4, fu13.getZ() - double5, fu13.getX() + 1.0f - double3, fu13.getY() + 1.0f - double4, fu13.getZ() + 1.0f - double5, 1.0f, 1.0f, 1.0f, 1.0f);
             }
         }
-        cym11.end();
+        dhn11.end();
         RenderSystem.enableDepthTest();
         RenderSystem.enableTexture();
         RenderSystem.popMatrix();
diff --git a/src/net/minecraft/client/renderer/debug/ChunkBorderRenderer.java b/src/net/minecraft/client/renderer/debug/ChunkBorderRenderer.java
index 4acc58c..01f9ef5 100644
--- a/src/net/minecraft/client/renderer/debug/ChunkBorderRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/ChunkBorderRenderer.java
@@ -12,87 +12,87 @@ import net.minecraft.client.Minecraft;
 public class ChunkBorderRenderer implements DebugRenderer.SimpleDebugRenderer {
     private final Minecraft minecraft;
     
-    public ChunkBorderRenderer(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public ChunkBorderRenderer(final Minecraft dlx) {
+        this.minecraft = dlx;
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
         RenderSystem.enableDepthTest();
         RenderSystem.shadeModel(7425);
         RenderSystem.enableAlphaTest();
         RenderSystem.defaultAlphaFunc();
-        final Entity akq10 = this.minecraft.gameRenderer.getMainCamera().getEntity();
-        final Tesselator cym11 = Tesselator.getInstance();
-        final BufferBuilder cyg12 = cym11.getBuilder();
+        final Entity aom10 = this.minecraft.gameRenderer.getMainCamera().getEntity();
+        final Tesselator dhn11 = Tesselator.getInstance();
+        final BufferBuilder dhg12 = dhn11.getBuilder();
         final double double6 = 0.0 - double4;
         final double double7 = 256.0 - double4;
         RenderSystem.disableTexture();
         RenderSystem.disableBlend();
-        final double double8 = (akq10.xChunk << 4) - double3;
-        final double double9 = (akq10.zChunk << 4) - double5;
+        final double double8 = (aom10.xChunk << 4) - double3;
+        final double double9 = (aom10.zChunk << 4) - double5;
         RenderSystem.lineWidth(1.0f);
-        cyg12.begin(3, DefaultVertexFormat.POSITION_COLOR);
+        dhg12.begin(3, DefaultVertexFormat.POSITION_COLOR);
         for (int integer21 = -16; integer21 <= 32; integer21 += 16) {
             for (int integer22 = -16; integer22 <= 32; integer22 += 16) {
-                cyg12.vertex(double8 + integer21, double6, double9 + integer22).color(1.0f, 0.0f, 0.0f, 0.0f).endVertex();
-                cyg12.vertex(double8 + integer21, double6, double9 + integer22).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                cyg12.vertex(double8 + integer21, double7, double9 + integer22).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                cyg12.vertex(double8 + integer21, double7, double9 + integer22).color(1.0f, 0.0f, 0.0f, 0.0f).endVertex();
+                dhg12.vertex(double8 + integer21, double6, double9 + integer22).color(1.0f, 0.0f, 0.0f, 0.0f).endVertex();
+                dhg12.vertex(double8 + integer21, double6, double9 + integer22).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                dhg12.vertex(double8 + integer21, double7, double9 + integer22).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                dhg12.vertex(double8 + integer21, double7, double9 + integer22).color(1.0f, 0.0f, 0.0f, 0.0f).endVertex();
             }
         }
         for (int integer21 = 2; integer21 < 16; integer21 += 2) {
-            cyg12.vertex(double8 + integer21, double6, double9).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
-            cyg12.vertex(double8 + integer21, double6, double9).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8 + integer21, double7, double9).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8 + integer21, double7, double9).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
-            cyg12.vertex(double8 + integer21, double6, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
-            cyg12.vertex(double8 + integer21, double6, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8 + integer21, double7, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8 + integer21, double7, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
+            dhg12.vertex(double8 + integer21, double6, double9).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
+            dhg12.vertex(double8 + integer21, double6, double9).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8 + integer21, double7, double9).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8 + integer21, double7, double9).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
+            dhg12.vertex(double8 + integer21, double6, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
+            dhg12.vertex(double8 + integer21, double6, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8 + integer21, double7, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8 + integer21, double7, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
         }
         for (int integer21 = 2; integer21 < 16; integer21 += 2) {
-            cyg12.vertex(double8, double6, double9 + integer21).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
-            cyg12.vertex(double8, double6, double9 + integer21).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8, double7, double9 + integer21).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8, double7, double9 + integer21).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
-            cyg12.vertex(double8 + 16.0, double6, double9 + integer21).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
-            cyg12.vertex(double8 + 16.0, double6, double9 + integer21).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8 + 16.0, double7, double9 + integer21).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8 + 16.0, double7, double9 + integer21).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
+            dhg12.vertex(double8, double6, double9 + integer21).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
+            dhg12.vertex(double8, double6, double9 + integer21).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8, double7, double9 + integer21).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8, double7, double9 + integer21).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
+            dhg12.vertex(double8 + 16.0, double6, double9 + integer21).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
+            dhg12.vertex(double8 + 16.0, double6, double9 + integer21).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8 + 16.0, double7, double9 + integer21).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8 + 16.0, double7, double9 + integer21).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
         }
         for (int integer21 = 0; integer21 <= 256; integer21 += 2) {
             final double double10 = integer21 - double4;
-            cyg12.vertex(double8, double10, double9).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
-            cyg12.vertex(double8, double10, double9).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8, double10, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8 + 16.0, double10, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8 + 16.0, double10, double9).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8, double10, double9).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
-            cyg12.vertex(double8, double10, double9).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
+            dhg12.vertex(double8, double10, double9).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
+            dhg12.vertex(double8, double10, double9).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8, double10, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8 + 16.0, double10, double9 + 16.0).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8 + 16.0, double10, double9).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8, double10, double9).color(1.0f, 1.0f, 0.0f, 1.0f).endVertex();
+            dhg12.vertex(double8, double10, double9).color(1.0f, 1.0f, 0.0f, 0.0f).endVertex();
         }
-        cym11.end();
+        dhn11.end();
         RenderSystem.lineWidth(2.0f);
-        cyg12.begin(3, DefaultVertexFormat.POSITION_COLOR);
+        dhg12.begin(3, DefaultVertexFormat.POSITION_COLOR);
         for (int integer21 = 0; integer21 <= 16; integer21 += 16) {
             for (int integer22 = 0; integer22 <= 16; integer22 += 16) {
-                cyg12.vertex(double8 + integer21, double6, double9 + integer22).color(0.25f, 0.25f, 1.0f, 0.0f).endVertex();
-                cyg12.vertex(double8 + integer21, double6, double9 + integer22).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
-                cyg12.vertex(double8 + integer21, double7, double9 + integer22).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
-                cyg12.vertex(double8 + integer21, double7, double9 + integer22).color(0.25f, 0.25f, 1.0f, 0.0f).endVertex();
+                dhg12.vertex(double8 + integer21, double6, double9 + integer22).color(0.25f, 0.25f, 1.0f, 0.0f).endVertex();
+                dhg12.vertex(double8 + integer21, double6, double9 + integer22).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
+                dhg12.vertex(double8 + integer21, double7, double9 + integer22).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
+                dhg12.vertex(double8 + integer21, double7, double9 + integer22).color(0.25f, 0.25f, 1.0f, 0.0f).endVertex();
             }
         }
         for (int integer21 = 0; integer21 <= 256; integer21 += 16) {
             final double double10 = integer21 - double4;
-            cyg12.vertex(double8, double10, double9).color(0.25f, 0.25f, 1.0f, 0.0f).endVertex();
-            cyg12.vertex(double8, double10, double9).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
-            cyg12.vertex(double8, double10, double9 + 16.0).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
-            cyg12.vertex(double8 + 16.0, double10, double9 + 16.0).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
-            cyg12.vertex(double8 + 16.0, double10, double9).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
-            cyg12.vertex(double8, double10, double9).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
-            cyg12.vertex(double8, double10, double9).color(0.25f, 0.25f, 1.0f, 0.0f).endVertex();
+            dhg12.vertex(double8, double10, double9).color(0.25f, 0.25f, 1.0f, 0.0f).endVertex();
+            dhg12.vertex(double8, double10, double9).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
+            dhg12.vertex(double8, double10, double9 + 16.0).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
+            dhg12.vertex(double8 + 16.0, double10, double9 + 16.0).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
+            dhg12.vertex(double8 + 16.0, double10, double9).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
+            dhg12.vertex(double8, double10, double9).color(0.25f, 0.25f, 1.0f, 1.0f).endVertex();
+            dhg12.vertex(double8, double10, double9).color(0.25f, 0.25f, 1.0f, 0.0f).endVertex();
         }
-        cym11.end();
+        dhn11.end();
         RenderSystem.lineWidth(1.0f);
         RenderSystem.enableBlend();
         RenderSystem.enableTexture();
diff --git a/src/net/minecraft/client/renderer/debug/ChunkDebugRenderer.java b/src/net/minecraft/client/renderer/debug/ChunkDebugRenderer.java
index ec7397a..42617bf 100644
--- a/src/net/minecraft/client/renderer/debug/ChunkDebugRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/ChunkDebugRenderer.java
@@ -1,10 +1,11 @@
 package net.minecraft.client.renderer.debug;
 
 import net.minecraft.server.level.ServerChunkCache;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.client.multiplayer.ClientChunkCache;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.client.multiplayer.ClientLevel;
 import com.google.common.collect.ImmutableMap;
 import java.util.concurrent.CompletableFuture;
@@ -26,19 +27,19 @@ public class ChunkDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     @Nullable
     private ChunkData data;
     
-    public ChunkDebugRenderer(final Minecraft dbn) {
+    public ChunkDebugRenderer(final Minecraft dlx) {
         this.lastUpdateTime = Double.MIN_VALUE;
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
         final double double6 = (double)Util.getNanos();
         if (double6 - this.lastUpdateTime > 3.0E9) {
             this.lastUpdateTime = double6;
-            final IntegratedServer edm12 = this.minecraft.getSingleplayerServer();
-            if (edm12 != null) {
-                this.data = new ChunkData(edm12, double3, double5);
+            final IntegratedServer eoz12 = this.minecraft.getSingleplayerServer();
+            if (eoz12 != null) {
+                this.data = new ChunkData(eoz12, double3, double5);
             }
             else {
                 this.data = null;
@@ -53,15 +54,15 @@ public class ChunkDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
             final Map<ChunkPos, String> map12 = this.data.serverData.getNow(null);
             final double double7 = this.minecraft.gameRenderer.getMainCamera().getPosition().y * 0.85;
             for (final Map.Entry<ChunkPos, String> entry16 : this.data.clientData.entrySet()) {
-                final ChunkPos bjh17 = entry16.getKey();
+                final ChunkPos bph17 = entry16.getKey();
                 String string18 = entry16.getValue();
                 if (map12 != null) {
-                    string18 += map12.get(bjh17);
+                    string18 += map12.get(bph17);
                 }
                 final String[] arr19 = string18.split("\n");
                 int integer20 = 0;
                 for (final String string19 : arr19) {
-                    DebugRenderer.renderFloatingText(string19, (bjh17.x << 4) + 8, double7 + integer20, (bjh17.z << 4) + 8, -1, 0.15f);
+                    DebugRenderer.renderFloatingText(string19, (bph17.x << 4) + 8, double7 + integer20, (bph17.z << 4) + 8, -1, 0.15f);
                     integer20 -= 2;
                 }
             }
@@ -75,54 +76,55 @@ public class ChunkDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
         private final Map<ChunkPos, String> clientData;
         private final CompletableFuture<Map<ChunkPos, String>> serverData;
         
-        private ChunkData(final IntegratedServer edm, final double double3, final double double4) {
-            final ClientLevel dno8 = ChunkDebugRenderer.this.minecraft.level;
-            final DimensionType cbi9 = ChunkDebugRenderer.this.minecraft.level.dimension.getType();
-            if (edm.getLevel(cbi9) != null) {
-                final ServerLevel xd10 = edm.getLevel(cbi9);
-            }
-            else {
-                final ServerLevel xd10 = null;
-            }
-            final int integer11 = (int)double3 >> 4;
-            final int integer12 = (int)double4 >> 4;
-            final ImmutableMap.Builder<ChunkPos, String> builder13 = ImmutableMap.<ChunkPos, String>builder();
-            final ClientChunkCache dnm14 = dno8.getChunkSource();
-            for (int integer13 = integer11 - 12; integer13 <= integer11 + 12; ++integer13) {
-                for (int integer14 = integer12 - 12; integer14 <= integer12 + 12; ++integer14) {
-                    final ChunkPos bjh17 = new ChunkPos(integer13, integer14);
-                    String string18 = "";
-                    final LevelChunk cal19 = dnm14.getChunk(integer13, integer14, false);
-                    string18 += "Client: ";
-                    if (cal19 == null) {
-                        string18 += "0n/a\n";
+        private ChunkData(final IntegratedServer eoz, final double double3, final double double4) {
+            final ClientLevel dym8 = ChunkDebugRenderer.this.minecraft.level;
+            final ResourceKey<Level> ug9 = dym8.dimension();
+            final int integer10 = (int)double3 >> 4;
+            final int integer11 = (int)double4 >> 4;
+            final ImmutableMap.Builder<ChunkPos, String> builder12 = ImmutableMap.<ChunkPos, String>builder();
+            final ClientChunkCache dyk13 = dym8.getChunkSource();
+            for (int integer12 = integer10 - 12; integer12 <= integer10 + 12; ++integer12) {
+                for (int integer13 = integer11 - 12; integer13 <= integer11 + 12; ++integer13) {
+                    final ChunkPos bph16 = new ChunkPos(integer12, integer13);
+                    String string17 = "";
+                    final LevelChunk chj18 = dyk13.getChunk(integer12, integer13, false);
+                    string17 += "Client: ";
+                    if (chj18 == null) {
+                        string17 += "0n/a\n";
                     }
                     else {
-                        string18 += (cal19.isEmpty() ? " E" : "");
-                        string18 += "\n";
+                        string17 += (chj18.isEmpty() ? " E" : "");
+                        string17 += "\n";
                     }
-                    builder13.put(bjh17, string18);
+                    builder12.put(bph16, string17);
                 }
             }
-            this.clientData = builder13.build();
-            final ImmutableMap.Builder<ChunkPos, String> builder14;
-            final ServerLevel serverLevel;
-            final ServerChunkCache xb6;
+            this.clientData = builder12.build();
+            final ResourceKey<Level> ug10;
+            final ServerLevel zd6;
+            ImmutableMap.Builder<ChunkPos, String> builder13;
+            ServerChunkCache zb8;
             final int n;
-            int integer15;
+            int integer14;
             final int n2;
-            int integer16;
-            ChunkPos bjh18;
-            this.serverData = edm.submit(() -> {
-                builder14 = ImmutableMap.<ChunkPos, String>builder();
-                xb6 = serverLevel.getChunkSource();
-                for (integer15 = n - 12; integer15 <= n + 12; ++integer15) {
-                    for (integer16 = n2 - 12; integer16 <= n2 + 12; ++integer16) {
-                        bjh18 = new ChunkPos(integer15, integer16);
-                        builder14.put(bjh18, "Server: " + xb6.getChunkDebugData(bjh18));
-                    }
+            int integer15;
+            ChunkPos bph17;
+            this.serverData = eoz.<Map<ChunkPos, String>>submit(() -> {
+                zd6 = eoz.getLevel(ug10);
+                if (zd6 == null) {
+                    return ImmutableMap.of();
+                }
+                else {
+                    builder13 = ImmutableMap.<ChunkPos, String>builder();
+                    zb8 = zd6.getChunkSource();
+                    for (integer14 = n - 12; integer14 <= n + 12; ++integer14) {
+                        for (integer15 = n2 - 12; integer15 <= n2 + 12; ++integer15) {
+                            bph17 = new ChunkPos(integer14, integer15);
+                            builder13.put(bph17, "Server: " + zb8.getChunkDebugData(bph17));
+                        }
+                    }
+                    return (ImmutableMap<Object, Object>)builder13.build();
                 }
-                return builder14.build();
             });
         }
     }
diff --git a/src/net/minecraft/client/renderer/debug/CollisionBoxRenderer.java b/src/net/minecraft/client/renderer/debug/CollisionBoxRenderer.java
index 7197196..8db7a42 100644
--- a/src/net/minecraft/client/renderer/debug/CollisionBoxRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/CollisionBoxRenderer.java
@@ -2,11 +2,11 @@ package net.minecraft.client.renderer.debug;
 
 import java.util.Iterator;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.RenderType;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.Util;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -20,23 +20,23 @@ public class CollisionBoxRenderer implements DebugRenderer.SimpleDebugRenderer {
     private double lastUpdateTime;
     private List<VoxelShape> shapes;
     
-    public CollisionBoxRenderer(final Minecraft dbn) {
+    public CollisionBoxRenderer(final Minecraft dlx) {
         this.lastUpdateTime = Double.MIN_VALUE;
         this.shapes = Collections.<VoxelShape>emptyList();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
         final double double6 = (double)Util.getNanos();
         if (double6 - this.lastUpdateTime > 1.0E8) {
             this.lastUpdateTime = double6;
-            final Entity akq12 = this.minecraft.gameRenderer.getMainCamera().getEntity();
-            this.shapes = akq12.level.getCollisions(akq12, akq12.getBoundingBox().inflate(6.0), Collections.<Entity>emptySet()).collect(Collectors.toList());
+            final Entity aom12 = this.minecraft.gameRenderer.getMainCamera().getEntity();
+            this.shapes = aom12.level.getCollisions(aom12, aom12.getBoundingBox().inflate(6.0), aom -> true).collect(Collectors.toList());
         }
-        final VertexConsumer cyo12 = dqt.getBuffer(RenderType.lines());
-        for (final VoxelShape cwf14 : this.shapes) {
-            LevelRenderer.renderVoxelShape(cyl, cyo12, cwf14, -double3, -double4, -double5, 1.0f, 1.0f, 1.0f, 1.0f);
+        final VertexConsumer dhp12 = ebz.getBuffer(RenderType.lines());
+        for (final VoxelShape dfg14 : this.shapes) {
+            LevelRenderer.renderVoxelShape(dhl, dhp12, dfg14, -double3, -double4, -double5, 1.0f, 1.0f, 1.0f, 1.0f);
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/debug/DebugRenderer.java b/src/net/minecraft/client/renderer/debug/DebugRenderer.java
index a929bd1..432375e 100644
--- a/src/net/minecraft/client/renderer/debug/DebugRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/DebugRenderer.java
@@ -35,30 +35,32 @@ public class DebugRenderer {
     public final SimpleDebugRenderer worldGenAttemptRenderer;
     public final SimpleDebugRenderer solidFaceRenderer;
     public final SimpleDebugRenderer chunkRenderer;
-    public final VillageDebugRenderer villageDebugRenderer;
+    public final BrainDebugRenderer brainDebugRenderer;
+    public final VillageSectionsDebugRenderer villageSectionsDebugRenderer;
     public final BeeDebugRenderer beeDebugRenderer;
     public final RaidDebugRenderer raidDebugRenderer;
     public final GoalSelectorDebugRenderer goalSelectorRenderer;
     public final GameTestDebugRenderer gameTestDebugRenderer;
     private boolean renderChunkborder;
     
-    public DebugRenderer(final Minecraft dbn) {
+    public DebugRenderer(final Minecraft dlx) {
         this.pathfindingRenderer = new PathfindingRenderer();
-        this.waterDebugRenderer = new WaterDebugRenderer(dbn);
-        this.chunkBorderRenderer = new ChunkBorderRenderer(dbn);
-        this.heightMapRenderer = new HeightMapRenderer(dbn);
-        this.collisionBoxRenderer = new CollisionBoxRenderer(dbn);
-        this.neighborsUpdateRenderer = new NeighborsUpdateRenderer(dbn);
+        this.waterDebugRenderer = new WaterDebugRenderer(dlx);
+        this.chunkBorderRenderer = new ChunkBorderRenderer(dlx);
+        this.heightMapRenderer = new HeightMapRenderer(dlx);
+        this.collisionBoxRenderer = new CollisionBoxRenderer(dlx);
+        this.neighborsUpdateRenderer = new NeighborsUpdateRenderer(dlx);
         this.caveRenderer = new CaveDebugRenderer();
-        this.structureRenderer = new StructureRenderer(dbn);
-        this.lightDebugRenderer = new LightDebugRenderer(dbn);
+        this.structureRenderer = new StructureRenderer(dlx);
+        this.lightDebugRenderer = new LightDebugRenderer(dlx);
         this.worldGenAttemptRenderer = new WorldGenAttemptRenderer();
-        this.solidFaceRenderer = new SolidFaceRenderer(dbn);
-        this.chunkRenderer = new ChunkDebugRenderer(dbn);
-        this.villageDebugRenderer = new VillageDebugRenderer(dbn);
-        this.beeDebugRenderer = new BeeDebugRenderer(dbn);
-        this.raidDebugRenderer = new RaidDebugRenderer(dbn);
-        this.goalSelectorRenderer = new GoalSelectorDebugRenderer(dbn);
+        this.solidFaceRenderer = new SolidFaceRenderer(dlx);
+        this.chunkRenderer = new ChunkDebugRenderer(dlx);
+        this.brainDebugRenderer = new BrainDebugRenderer(dlx);
+        this.villageSectionsDebugRenderer = new VillageSectionsDebugRenderer();
+        this.beeDebugRenderer = new BeeDebugRenderer(dlx);
+        this.raidDebugRenderer = new RaidDebugRenderer(dlx);
+        this.goalSelectorRenderer = new GoalSelectorDebugRenderer(dlx);
         this.gameTestDebugRenderer = new GameTestDebugRenderer();
     }
     
@@ -75,7 +77,8 @@ public class DebugRenderer {
         this.worldGenAttemptRenderer.clear();
         this.solidFaceRenderer.clear();
         this.chunkRenderer.clear();
-        this.villageDebugRenderer.clear();
+        this.brainDebugRenderer.clear();
+        this.villageSectionsDebugRenderer.clear();
         this.beeDebugRenderer.clear();
         this.raidDebugRenderer.clear();
         this.goalSelectorRenderer.clear();
@@ -86,63 +89,63 @@ public class DebugRenderer {
         return this.renderChunkborder = !this.renderChunkborder;
     }
     
-    public void render(final PoseStack cyl, final MultiBufferSource.BufferSource a, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource.BufferSource a, final double double3, final double double4, final double double5) {
         if (this.renderChunkborder && !Minecraft.getInstance().showOnlyReducedInfo()) {
-            this.chunkBorderRenderer.render(cyl, a, double3, double4, double5);
+            this.chunkBorderRenderer.render(dhl, a, double3, double4, double5);
         }
-        this.gameTestDebugRenderer.render(cyl, a, double3, double4, double5);
+        this.gameTestDebugRenderer.render(dhl, a, double3, double4, double5);
     }
     
-    public static Optional<Entity> getTargetedEntity(@Nullable final Entity akq, final int integer) {
-        if (akq == null) {
+    public static Optional<Entity> getTargetedEntity(@Nullable final Entity aom, final int integer) {
+        if (aom == null) {
             return Optional.<Entity>empty();
         }
-        final Vec3 cvl3 = akq.getEyePosition(1.0f);
-        final Vec3 cvl4 = akq.getViewVector(1.0f).scale(integer);
-        final Vec3 cvl5 = cvl3.add(cvl4);
-        final AABB cvf6 = akq.getBoundingBox().expandTowards(cvl4).inflate(1.0);
+        final Vec3 dem3 = aom.getEyePosition(1.0f);
+        final Vec3 dem4 = aom.getViewVector(1.0f).scale(integer);
+        final Vec3 dem5 = dem3.add(dem4);
+        final AABB deg6 = aom.getBoundingBox().expandTowards(dem4).inflate(1.0);
         final int integer2 = integer * integer;
-        final Predicate<Entity> predicate8 = akq -> !akq.isSpectator() && akq.isPickable();
-        final EntityHitResult cvh9 = ProjectileUtil.getEntityHitResult(akq, cvl3, cvl5, cvf6, predicate8, integer2);
-        if (cvh9 == null) {
+        final Predicate<Entity> predicate8 = aom -> !aom.isSpectator() && aom.isPickable();
+        final EntityHitResult dei9 = ProjectileUtil.getEntityHitResult(aom, dem3, dem5, deg6, predicate8, integer2);
+        if (dei9 == null) {
             return Optional.<Entity>empty();
         }
-        if (cvl3.distanceToSqr(cvh9.getLocation()) > integer2) {
+        if (dem3.distanceToSqr(dei9.getLocation()) > integer2) {
             return Optional.<Entity>empty();
         }
-        return Optional.<Entity>of(cvh9.getEntity());
+        return Optional.<Entity>of(dei9.getEntity());
     }
     
-    public static void renderFilledBox(final BlockPos fk1, final BlockPos fk2, final float float3, final float float4, final float float5, final float float6) {
-        final Camera dbb7 = Minecraft.getInstance().gameRenderer.getMainCamera();
-        if (!dbb7.isInitialized()) {
+    public static void renderFilledBox(final BlockPos fu1, final BlockPos fu2, final float float3, final float float4, final float float5, final float float6) {
+        final Camera dlj7 = Minecraft.getInstance().gameRenderer.getMainCamera();
+        if (!dlj7.isInitialized()) {
             return;
         }
-        final Vec3 cvl8 = dbb7.getPosition().reverse();
-        final AABB cvf9 = new AABB(fk1, fk2).move(cvl8);
-        renderFilledBox(cvf9, float3, float4, float5, float6);
+        final Vec3 dem8 = dlj7.getPosition().reverse();
+        final AABB deg9 = new AABB(fu1, fu2).move(dem8);
+        renderFilledBox(deg9, float3, float4, float5, float6);
     }
     
-    public static void renderFilledBox(final BlockPos fk, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        final Camera dbb7 = Minecraft.getInstance().gameRenderer.getMainCamera();
-        if (!dbb7.isInitialized()) {
+    public static void renderFilledBox(final BlockPos fu, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        final Camera dlj7 = Minecraft.getInstance().gameRenderer.getMainCamera();
+        if (!dlj7.isInitialized()) {
             return;
         }
-        final Vec3 cvl8 = dbb7.getPosition().reverse();
-        final AABB cvf9 = new AABB(fk).move(cvl8).inflate(float2);
-        renderFilledBox(cvf9, float3, float4, float5, float6);
+        final Vec3 dem8 = dlj7.getPosition().reverse();
+        final AABB deg9 = new AABB(fu).move(dem8).inflate(float2);
+        renderFilledBox(deg9, float3, float4, float5, float6);
     }
     
-    public static void renderFilledBox(final AABB cvf, final float float2, final float float3, final float float4, final float float5) {
-        renderFilledBox(cvf.minX, cvf.minY, cvf.minZ, cvf.maxX, cvf.maxY, cvf.maxZ, float2, float3, float4, float5);
+    public static void renderFilledBox(final AABB deg, final float float2, final float float3, final float float4, final float float5) {
+        renderFilledBox(deg.minX, deg.minY, deg.minZ, deg.maxX, deg.maxY, deg.maxZ, float2, float3, float4, float5);
     }
     
     public static void renderFilledBox(final double double1, final double double2, final double double3, final double double4, final double double5, final double double6, final float float7, final float float8, final float float9, final float float10) {
-        final Tesselator cym17 = Tesselator.getInstance();
-        final BufferBuilder cyg18 = cym17.getBuilder();
-        cyg18.begin(5, DefaultVertexFormat.POSITION_COLOR);
-        LevelRenderer.addChainedFilledBoxVertices(cyg18, double1, double2, double3, double4, double5, double6, float7, float8, float9, float10);
-        cym17.end();
+        final Tesselator dhn17 = Tesselator.getInstance();
+        final BufferBuilder dhg18 = dhn17.getBuilder();
+        dhg18.begin(5, DefaultVertexFormat.POSITION_COLOR);
+        LevelRenderer.addChainedFilledBoxVertices(dhg18, double1, double2, double3, double4, double5, double6, float7, float8, float9, float10);
+        dhn17.end();
     }
     
     public static void renderFloatingText(final String string, final int integer2, final int integer3, final int integer4, final int integer5) {
@@ -158,19 +161,19 @@ public class DebugRenderer {
     }
     
     public static void renderFloatingText(final String string, final double double2, final double double3, final double double4, final int integer, final float float6, final boolean boolean7, final float float8, final boolean boolean9) {
-        final Minecraft dbn13 = Minecraft.getInstance();
-        final Camera dbb14 = dbn13.gameRenderer.getMainCamera();
-        if (!dbb14.isInitialized() || dbn13.getEntityRenderDispatcher().options == null) {
+        final Minecraft dlx13 = Minecraft.getInstance();
+        final Camera dlj14 = dlx13.gameRenderer.getMainCamera();
+        if (!dlj14.isInitialized() || dlx13.getEntityRenderDispatcher().options == null) {
             return;
         }
-        final Font dch15 = dbn13.font;
-        final double double5 = dbb14.getPosition().x;
-        final double double6 = dbb14.getPosition().y;
-        final double double7 = dbb14.getPosition().z;
+        final Font dmt15 = dlx13.font;
+        final double double5 = dlj14.getPosition().x;
+        final double double6 = dlj14.getPosition().y;
+        final double double7 = dlj14.getPosition().z;
         RenderSystem.pushMatrix();
         RenderSystem.translatef((float)(double2 - double5), (float)(double3 - double6) + 0.07f, (float)(double4 - double7));
         RenderSystem.normal3f(0.0f, 1.0f, 0.0f);
-        RenderSystem.multMatrix(new Matrix4f(dbb14.rotation()));
+        RenderSystem.multMatrix(new Matrix4f(dlj14.rotation()));
         RenderSystem.scalef(float6, -float6, float6);
         RenderSystem.enableTexture();
         if (boolean9) {
@@ -181,11 +184,11 @@ public class DebugRenderer {
         }
         RenderSystem.depthMask(true);
         RenderSystem.scalef(-1.0f, 1.0f, 1.0f);
-        float float9 = boolean7 ? (-dch15.width(string) / 2.0f) : 0.0f;
+        float float9 = boolean7 ? (-dmt15.width(string) / 2.0f) : 0.0f;
         float9 -= float8 / float6;
         RenderSystem.enableAlphaTest();
         final MultiBufferSource.BufferSource a23 = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        dch15.drawInBatch(string, float9, 0.0f, integer, false, Transformation.identity().getMatrix(), a23, boolean9, 0, 15728880);
+        dmt15.drawInBatch(string, float9, 0.0f, integer, false, Transformation.identity().getMatrix(), a23, boolean9, 0, 15728880);
         a23.endBatch();
         RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.enableDepthTest();
@@ -193,7 +196,7 @@ public class DebugRenderer {
     }
     
     public interface SimpleDebugRenderer {
-        void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5);
+        void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5);
         
         default void clear() {
         }
diff --git a/src/net/minecraft/client/renderer/debug/GameTestDebugRenderer.java b/src/net/minecraft/client/renderer/debug/GameTestDebugRenderer.java
index 3e122cb..7734b6b 100644
--- a/src/net/minecraft/client/renderer/debug/GameTestDebugRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/GameTestDebugRenderer.java
@@ -17,8 +17,8 @@ public class GameTestDebugRenderer implements DebugRenderer.SimpleDebugRenderer
         this.markers = Maps.newHashMap();
     }
     
-    public void addMarker(final BlockPos fk, final int integer2, final String string, final int integer4) {
-        this.markers.put(fk, new Marker(integer2, string, Util.getMillis() + integer4));
+    public void addMarker(final BlockPos fu, final int integer2, final String string, final int integer4) {
+        this.markers.put(fu, new Marker(integer2, string, Util.getMillis() + integer4));
     }
     
     @Override
@@ -27,23 +27,23 @@ public class GameTestDebugRenderer implements DebugRenderer.SimpleDebugRenderer
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
         final long long10 = Util.getMillis();
         this.markers.entrySet().removeIf(entry -> long10 > entry.getValue().removeAtTime);
         this.markers.forEach(this::renderMarker);
     }
     
-    private void renderMarker(final BlockPos fk, final Marker a) {
+    private void renderMarker(final BlockPos fu, final Marker a) {
         RenderSystem.pushMatrix();
         RenderSystem.enableBlend();
         RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
         RenderSystem.color4f(0.0f, 1.0f, 0.0f, 0.75f);
         RenderSystem.disableTexture();
-        DebugRenderer.renderFilledBox(fk, 0.02f, a.getR(), a.getG(), a.getB(), a.getA());
+        DebugRenderer.renderFilledBox(fu, 0.02f, a.getR(), a.getG(), a.getB(), a.getA());
         if (!a.text.isEmpty()) {
-            final double double4 = fk.getX() + 0.5;
-            final double double5 = fk.getY() + 1.2;
-            final double double6 = fk.getZ() + 0.5;
+            final double double4 = fu.getX() + 0.5;
+            final double double5 = fu.getY() + 1.2;
+            final double double6 = fu.getZ() + 0.5;
             DebugRenderer.renderFloatingText(a.text, double4, double5, double6, -1, 0.01f, true, 0.0f, true);
         }
         RenderSystem.enableTexture();
diff --git a/src/net/minecraft/client/renderer/debug/GoalSelectorDebugRenderer.java b/src/net/minecraft/client/renderer/debug/GoalSelectorDebugRenderer.java
index dfd4126..8176587 100644
--- a/src/net/minecraft/client/renderer/debug/GoalSelectorDebugRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/GoalSelectorDebugRenderer.java
@@ -24,19 +24,19 @@ public class GoalSelectorDebugRenderer implements DebugRenderer.SimpleDebugRende
         this.goalSelectors.put(integer, list);
     }
     
-    public GoalSelectorDebugRenderer(final Minecraft dbn) {
+    public GoalSelectorDebugRenderer(final Minecraft dlx) {
         this.goalSelectors = Maps.newHashMap();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
-        final Camera dbb10 = this.minecraft.gameRenderer.getMainCamera();
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
+        final Camera dlj10 = this.minecraft.gameRenderer.getMainCamera();
         RenderSystem.pushMatrix();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.disableTexture();
-        final BlockPos fk11 = new BlockPos(dbb10.getPosition().x, 0.0, dbb10.getPosition().z);
+        final BlockPos fu11 = new BlockPos(dlj10.getPosition().x, 0.0, dlj10.getPosition().z);
         int integer4;
         DebugGoal a5;
         final Vec3i vec3i;
@@ -68,8 +68,8 @@ public class GoalSelectorDebugRenderer implements DebugRenderer.SimpleDebugRende
         public final String name;
         public final boolean isRunning;
         
-        public DebugGoal(final BlockPos fk, final int integer, final String string, final boolean boolean4) {
-            this.pos = fk;
+        public DebugGoal(final BlockPos fu, final int integer, final String string, final boolean boolean4) {
+            this.pos = fu;
             this.priority = integer;
             this.name = string;
             this.isRunning = boolean4;
diff --git a/src/net/minecraft/client/renderer/debug/HeightMapRenderer.java b/src/net/minecraft/client/renderer/debug/HeightMapRenderer.java
index 5dfb699..bdb2009 100644
--- a/src/net/minecraft/client/renderer/debug/HeightMapRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/HeightMapRenderer.java
@@ -1,10 +1,14 @@
 package net.minecraft.client.renderer.debug;
 
+import com.mojang.math.Vector3f;
+import net.minecraft.world.level.ChunkPos;
 import java.util.Iterator;
+import net.minecraft.world.level.chunk.ChunkAccess;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.world.level.levelgen.Heightmap;
+import java.util.Map;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.Tesselator;
 import net.minecraft.core.BlockPos;
@@ -16,32 +20,67 @@ import net.minecraft.client.Minecraft;
 public class HeightMapRenderer implements DebugRenderer.SimpleDebugRenderer {
     private final Minecraft minecraft;
     
-    public HeightMapRenderer(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public HeightMapRenderer(final Minecraft dlx) {
+        this.minecraft = dlx;
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
-        final LevelAccessor bjx10 = this.minecraft.level;
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
+        final LevelAccessor bqc10 = this.minecraft.level;
         RenderSystem.pushMatrix();
-        RenderSystem.enableBlend();
-        RenderSystem.defaultBlendFunc();
+        RenderSystem.disableBlend();
         RenderSystem.disableTexture();
-        final BlockPos fk11 = new BlockPos(double3, 0.0, double5);
-        final Tesselator cym12 = Tesselator.getInstance();
-        final BufferBuilder cyg13 = cym12.getBuilder();
-        cyg13.begin(5, DefaultVertexFormat.POSITION_COLOR);
-        for (final BlockPos fk12 : BlockPos.betweenClosed(fk11.offset(-40, 0, -40), fk11.offset(40, 0, 40))) {
-            final int integer16 = bjx10.getHeight(Heightmap.Types.WORLD_SURFACE_WG, fk12.getX(), fk12.getZ());
-            if (bjx10.getBlockState(fk12.offset(0, integer16, 0).below()).isAir()) {
-                LevelRenderer.addChainedFilledBoxVertices(cyg13, fk12.getX() + 0.25f - double3, integer16 - double4, fk12.getZ() + 0.25f - double5, fk12.getX() + 0.75f - double3, integer16 + 0.09375 - double4, fk12.getZ() + 0.75f - double5, 0.0f, 0.0f, 1.0f, 0.5f);
-            }
-            else {
-                LevelRenderer.addChainedFilledBoxVertices(cyg13, fk12.getX() + 0.25f - double3, integer16 - double4, fk12.getZ() + 0.25f - double5, fk12.getX() + 0.75f - double3, integer16 + 0.09375 - double4, fk12.getZ() + 0.75f - double5, 0.0f, 1.0f, 0.0f, 0.5f);
+        RenderSystem.enableDepthTest();
+        final BlockPos fu11 = new BlockPos(double3, 0.0, double5);
+        final Tesselator dhn12 = Tesselator.getInstance();
+        final BufferBuilder dhg13 = dhn12.getBuilder();
+        dhg13.begin(5, DefaultVertexFormat.POSITION_COLOR);
+        for (int integer14 = -32; integer14 <= 32; integer14 += 16) {
+            for (int integer15 = -32; integer15 <= 32; integer15 += 16) {
+                final ChunkAccess cgy16 = bqc10.getChunk(fu11.offset(integer14, 0, integer15));
+                for (final Map.Entry<Heightmap.Types, Heightmap> entry18 : cgy16.getHeightmaps()) {
+                    final Heightmap.Types a19 = entry18.getKey();
+                    final ChunkPos bph20 = cgy16.getPos();
+                    final Vector3f g21 = this.getColor(a19);
+                    for (int integer16 = 0; integer16 < 16; ++integer16) {
+                        for (int integer17 = 0; integer17 < 16; ++integer17) {
+                            final int integer18 = bph20.x * 16 + integer16;
+                            final int integer19 = bph20.z * 16 + integer17;
+                            final float float26 = (float)(bqc10.getHeight(a19, integer18, integer19) + a19.ordinal() * 0.09375f - double4);
+                            LevelRenderer.addChainedFilledBoxVertices(dhg13, integer18 + 0.25f - double3, float26, integer19 + 0.25f - double5, integer18 + 0.75f - double3, float26 + 0.09375f, integer19 + 0.75f - double5, g21.x(), g21.y(), g21.z(), 1.0f);
+                        }
+                    }
+                }
             }
         }
-        cym12.end();
+        dhn12.end();
         RenderSystem.enableTexture();
         RenderSystem.popMatrix();
     }
+    
+    private Vector3f getColor(final Heightmap.Types a) {
+        switch (a) {
+            case WORLD_SURFACE_WG: {
+                return new Vector3f(1.0f, 1.0f, 0.0f);
+            }
+            case OCEAN_FLOOR_WG: {
+                return new Vector3f(1.0f, 0.0f, 1.0f);
+            }
+            case WORLD_SURFACE: {
+                return new Vector3f(0.0f, 0.7f, 0.0f);
+            }
+            case OCEAN_FLOOR: {
+                return new Vector3f(0.0f, 0.0f, 0.5f);
+            }
+            case MOTION_BLOCKING: {
+                return new Vector3f(0.0f, 0.3f, 0.3f);
+            }
+            case MOTION_BLOCKING_NO_LEAVES: {
+                return new Vector3f(0.0f, 0.5f, 0.5f);
+            }
+            default: {
+                return new Vector3f(0.0f, 0.0f, 0.0f);
+            }
+        }
+    }
 }
diff --git a/src/net/minecraft/client/renderer/debug/LightDebugRenderer.java b/src/net/minecraft/client/renderer/debug/LightDebugRenderer.java
index 2d11a64..58c1eb5 100644
--- a/src/net/minecraft/client/renderer/debug/LightDebugRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/LightDebugRenderer.java
@@ -16,29 +16,29 @@ import net.minecraft.client.Minecraft;
 public class LightDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     private final Minecraft minecraft;
     
-    public LightDebugRenderer(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public LightDebugRenderer(final Minecraft dlx) {
+        this.minecraft = dlx;
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
-        final Level bjw10 = this.minecraft.level;
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
+        final Level bqb10 = this.minecraft.level;
         RenderSystem.pushMatrix();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.disableTexture();
-        final BlockPos fk11 = new BlockPos(double3, double4, double5);
+        final BlockPos fu11 = new BlockPos(double3, double4, double5);
         final LongSet longSet12 = (LongSet)new LongOpenHashSet();
-        for (final BlockPos fk12 : BlockPos.betweenClosed(fk11.offset(-10, -10, -10), fk11.offset(10, 10, 10))) {
-            final int integer15 = bjw10.getBrightness(LightLayer.SKY, fk12);
+        for (final BlockPos fu12 : BlockPos.betweenClosed(fu11.offset(-10, -10, -10), fu11.offset(10, 10, 10))) {
+            final int integer15 = bqb10.getBrightness(LightLayer.SKY, fu12);
             final float float16 = (15 - integer15) / 15.0f * 0.5f + 0.16f;
             final int integer16 = Mth.hsvToRgb(float16, 0.9f, 0.9f);
-            final long long18 = SectionPos.blockToSection(fk12.asLong());
+            final long long18 = SectionPos.blockToSection(fu12.asLong());
             if (longSet12.add(long18)) {
-                DebugRenderer.renderFloatingText(bjw10.getChunkSource().getLightEngine().getDebugData(LightLayer.SKY, SectionPos.of(long18)), SectionPos.x(long18) * 16 + 8, SectionPos.y(long18) * 16 + 8, SectionPos.z(long18) * 16 + 8, 16711680, 0.3f);
+                DebugRenderer.renderFloatingText(bqb10.getChunkSource().getLightEngine().getDebugData(LightLayer.SKY, SectionPos.of(long18)), SectionPos.x(long18) * 16 + 8, SectionPos.y(long18) * 16 + 8, SectionPos.z(long18) * 16 + 8, 16711680, 0.3f);
             }
             if (integer15 != 15) {
-                DebugRenderer.renderFloatingText(String.valueOf(integer15), fk12.getX() + 0.5, fk12.getY() + 0.25, fk12.getZ() + 0.5, integer16);
+                DebugRenderer.renderFloatingText(String.valueOf(integer15), fu12.getX() + 0.5, fu12.getY() + 0.25, fu12.getZ() + 0.5, integer16);
             }
         }
         RenderSystem.enableTexture();
diff --git a/src/net/minecraft/client/renderer/debug/NeighborsUpdateRenderer.java b/src/net/minecraft/client/renderer/debug/NeighborsUpdateRenderer.java
index 49e9423..c67285b 100644
--- a/src/net/minecraft/client/renderer/debug/NeighborsUpdateRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/NeighborsUpdateRenderer.java
@@ -20,32 +20,25 @@ public class NeighborsUpdateRenderer implements DebugRenderer.SimpleDebugRendere
     private final Minecraft minecraft;
     private final Map<Long, Map<BlockPos, Integer>> lastUpdate;
     
-    NeighborsUpdateRenderer(final Minecraft dbn) {
+    NeighborsUpdateRenderer(final Minecraft dlx) {
         this.lastUpdate = Maps.newTreeMap(Ordering.<Comparable>natural().reverse());
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
-    public void addUpdate(final long long1, final BlockPos fk) {
-        Map<BlockPos, Integer> map5 = this.lastUpdate.get(long1);
-        if (map5 == null) {
-            map5 = Maps.newHashMap();
-            this.lastUpdate.put(long1, map5);
-        }
-        Integer integer6 = map5.get(fk);
-        if (integer6 == null) {
-            integer6 = 0;
-        }
-        map5.put(fk, integer6 + 1);
+    public void addUpdate(final long long1, final BlockPos fu) {
+        final Map<BlockPos, Integer> map5 = this.lastUpdate.computeIfAbsent(Long.valueOf(long1), long1 -> Maps.newHashMap());
+        final int integer6 = map5.getOrDefault(fu, 0);
+        map5.put(fu, integer6 + 1);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
         final long long10 = this.minecraft.level.getGameTime();
         final int integer12 = 200;
         final double double6 = 0.0025;
         final Set<BlockPos> set15 = Sets.newHashSet();
         final Map<BlockPos, Integer> map16 = Maps.newHashMap();
-        final VertexConsumer cyo17 = dqt.getBuffer(RenderType.lines());
+        final VertexConsumer dhp17 = ebz.getBuffer(RenderType.lines());
         final Iterator<Map.Entry<Long, Map<BlockPos, Integer>>> iterator18 = this.lastUpdate.entrySet().iterator();
         while (iterator18.hasNext()) {
             final Map.Entry<Long, Map<BlockPos, Integer>> entry19 = iterator18.next();
@@ -57,20 +50,20 @@ public class NeighborsUpdateRenderer implements DebugRenderer.SimpleDebugRendere
             }
             else {
                 for (final Map.Entry<BlockPos, Integer> entry20 : map17.entrySet()) {
-                    final BlockPos fk26 = entry20.getKey();
+                    final BlockPos fu26 = entry20.getKey();
                     final Integer integer13 = entry20.getValue();
-                    if (set15.add(fk26)) {
-                        final AABB cvf28 = new AABB(BlockPos.ZERO).inflate(0.002).deflate(0.0025 * long12).move(fk26.getX(), fk26.getY(), fk26.getZ()).move(-double3, -double4, -double5);
-                        LevelRenderer.renderLineBox(cyo17, cvf28.minX, cvf28.minY, cvf28.minZ, cvf28.maxX, cvf28.maxY, cvf28.maxZ, 1.0f, 1.0f, 1.0f, 1.0f);
-                        map16.put(fk26, integer13);
+                    if (set15.add(fu26)) {
+                        final AABB deg28 = new AABB(BlockPos.ZERO).inflate(0.002).deflate(0.0025 * long12).move(fu26.getX(), fu26.getY(), fu26.getZ()).move(-double3, -double4, -double5);
+                        LevelRenderer.renderLineBox(dhl, dhp17, deg28.minX, deg28.minY, deg28.minZ, deg28.maxX, deg28.maxY, deg28.maxZ, 1.0f, 1.0f, 1.0f, 1.0f);
+                        map16.put(fu26, integer13);
                     }
                 }
             }
         }
         for (final Map.Entry<BlockPos, Integer> entry21 : map16.entrySet()) {
-            final BlockPos fk27 = entry21.getKey();
+            final BlockPos fu27 = entry21.getKey();
             final Integer integer14 = entry21.getValue();
-            DebugRenderer.renderFloatingText(String.valueOf(integer14), fk27.getX(), fk27.getY(), fk27.getZ(), -1);
+            DebugRenderer.renderFloatingText(String.valueOf(integer14), fu27.getX(), fu27.getY(), fu27.getZ(), -1);
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/debug/PathfindingRenderer.java b/src/net/minecraft/client/renderer/debug/PathfindingRenderer.java
index f6f315c..4351008 100644
--- a/src/net/minecraft/client/renderer/debug/PathfindingRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/PathfindingRenderer.java
@@ -28,22 +28,22 @@ public class PathfindingRenderer implements DebugRenderer.SimpleDebugRenderer {
         this.creationMap = Maps.newHashMap();
     }
     
-    public void addPath(final int integer, final Path cqq, final float float3) {
-        this.pathMap.put(integer, cqq);
+    public void addPath(final int integer, final Path czf, final float float3) {
+        this.pathMap.put(integer, czf);
         this.creationMap.put(integer, Util.getMillis());
         this.pathMaxDist.put(integer, float3);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
         if (this.pathMap.isEmpty()) {
             return;
         }
         final long long10 = Util.getMillis();
         for (final Integer integer13 : this.pathMap.keySet()) {
-            final Path cqq14 = this.pathMap.get(integer13);
+            final Path czf14 = this.pathMap.get(integer13);
             final float float15 = this.pathMaxDist.get(integer13);
-            renderPath(cqq14, float15, true, true, double3, double4, double5);
+            renderPath(czf14, float15, true, true, double3, double4, double5);
         }
         for (final Integer integer14 : this.creationMap.keySet().<Integer>toArray(new Integer[0])) {
             if (long10 - this.creationMap.get(integer14) > 5000L) {
@@ -53,75 +53,75 @@ public class PathfindingRenderer implements DebugRenderer.SimpleDebugRenderer {
         }
     }
     
-    public static void renderPath(final Path cqq, final float float2, final boolean boolean3, final boolean boolean4, final double double5, final double double6, final double double7) {
+    public static void renderPath(final Path czf, final float float2, final boolean boolean3, final boolean boolean4, final double double5, final double double6, final double double7) {
         RenderSystem.pushMatrix();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.color4f(0.0f, 1.0f, 0.0f, 0.75f);
         RenderSystem.disableTexture();
         RenderSystem.lineWidth(6.0f);
-        doRenderPath(cqq, float2, boolean3, boolean4, double5, double6, double7);
+        doRenderPath(czf, float2, boolean3, boolean4, double5, double6, double7);
         RenderSystem.enableTexture();
         RenderSystem.disableBlend();
         RenderSystem.popMatrix();
     }
     
-    private static void doRenderPath(final Path cqq, final float float2, final boolean boolean3, final boolean boolean4, final double double5, final double double6, final double double7) {
-        renderPathLine(cqq, double5, double6, double7);
-        final BlockPos fk11 = cqq.getTarget();
-        if (distanceToCamera(fk11, double5, double6, double7) <= 80.0f) {
-            DebugRenderer.renderFilledBox(new AABB(fk11.getX() + 0.25f, fk11.getY() + 0.25f, fk11.getZ() + 0.25, fk11.getX() + 0.75f, fk11.getY() + 0.75f, fk11.getZ() + 0.75f).move(-double5, -double6, -double7), 0.0f, 1.0f, 0.0f, 0.5f);
-            for (int integer12 = 0; integer12 < cqq.getSize(); ++integer12) {
-                final Node cqo13 = cqq.get(integer12);
-                if (distanceToCamera(cqo13.asBlockPos(), double5, double6, double7) <= 80.0f) {
-                    final float float3 = (integer12 == cqq.getIndex()) ? 1.0f : 0.0f;
-                    final float float4 = (integer12 == cqq.getIndex()) ? 0.0f : 1.0f;
-                    DebugRenderer.renderFilledBox(new AABB(cqo13.x + 0.5f - float2, cqo13.y + 0.01f * integer12, cqo13.z + 0.5f - float2, cqo13.x + 0.5f + float2, cqo13.y + 0.25f + 0.01f * integer12, cqo13.z + 0.5f + float2).move(-double5, -double6, -double7), float3, 0.0f, float4, 0.5f);
+    private static void doRenderPath(final Path czf, final float float2, final boolean boolean3, final boolean boolean4, final double double5, final double double6, final double double7) {
+        renderPathLine(czf, double5, double6, double7);
+        final BlockPos fu11 = czf.getTarget();
+        if (distanceToCamera(fu11, double5, double6, double7) <= 80.0f) {
+            DebugRenderer.renderFilledBox(new AABB(fu11.getX() + 0.25f, fu11.getY() + 0.25f, fu11.getZ() + 0.25, fu11.getX() + 0.75f, fu11.getY() + 0.75f, fu11.getZ() + 0.75f).move(-double5, -double6, -double7), 0.0f, 1.0f, 0.0f, 0.5f);
+            for (int integer12 = 0; integer12 < czf.getSize(); ++integer12) {
+                final Node czd13 = czf.get(integer12);
+                if (distanceToCamera(czd13.asBlockPos(), double5, double6, double7) <= 80.0f) {
+                    final float float3 = (integer12 == czf.getIndex()) ? 1.0f : 0.0f;
+                    final float float4 = (integer12 == czf.getIndex()) ? 0.0f : 1.0f;
+                    DebugRenderer.renderFilledBox(new AABB(czd13.x + 0.5f - float2, czd13.y + 0.01f * integer12, czd13.z + 0.5f - float2, czd13.x + 0.5f + float2, czd13.y + 0.25f + 0.01f * integer12, czd13.z + 0.5f + float2).move(-double5, -double6, -double7), float3, 0.0f, float4, 0.5f);
                 }
             }
         }
         if (boolean3) {
-            for (final Node cqo14 : cqq.getClosedSet()) {
-                if (distanceToCamera(cqo14.asBlockPos(), double5, double6, double7) <= 80.0f) {
-                    DebugRenderer.renderFilledBox(new AABB(cqo14.x + 0.5f - float2 / 2.0f, cqo14.y + 0.01f, cqo14.z + 0.5f - float2 / 2.0f, cqo14.x + 0.5f + float2 / 2.0f, cqo14.y + 0.1, cqo14.z + 0.5f + float2 / 2.0f).move(-double5, -double6, -double7), 1.0f, 0.8f, 0.8f, 0.5f);
+            for (final Node czd14 : czf.getClosedSet()) {
+                if (distanceToCamera(czd14.asBlockPos(), double5, double6, double7) <= 80.0f) {
+                    DebugRenderer.renderFilledBox(new AABB(czd14.x + 0.5f - float2 / 2.0f, czd14.y + 0.01f, czd14.z + 0.5f - float2 / 2.0f, czd14.x + 0.5f + float2 / 2.0f, czd14.y + 0.1, czd14.z + 0.5f + float2 / 2.0f).move(-double5, -double6, -double7), 1.0f, 0.8f, 0.8f, 0.5f);
                 }
             }
-            for (final Node cqo14 : cqq.getOpenSet()) {
-                if (distanceToCamera(cqo14.asBlockPos(), double5, double6, double7) <= 80.0f) {
-                    DebugRenderer.renderFilledBox(new AABB(cqo14.x + 0.5f - float2 / 2.0f, cqo14.y + 0.01f, cqo14.z + 0.5f - float2 / 2.0f, cqo14.x + 0.5f + float2 / 2.0f, cqo14.y + 0.1, cqo14.z + 0.5f + float2 / 2.0f).move(-double5, -double6, -double7), 0.8f, 1.0f, 1.0f, 0.5f);
+            for (final Node czd14 : czf.getOpenSet()) {
+                if (distanceToCamera(czd14.asBlockPos(), double5, double6, double7) <= 80.0f) {
+                    DebugRenderer.renderFilledBox(new AABB(czd14.x + 0.5f - float2 / 2.0f, czd14.y + 0.01f, czd14.z + 0.5f - float2 / 2.0f, czd14.x + 0.5f + float2 / 2.0f, czd14.y + 0.1, czd14.z + 0.5f + float2 / 2.0f).move(-double5, -double6, -double7), 0.8f, 1.0f, 1.0f, 0.5f);
                 }
             }
         }
         if (boolean4) {
-            for (int integer12 = 0; integer12 < cqq.getSize(); ++integer12) {
-                final Node cqo13 = cqq.get(integer12);
-                if (distanceToCamera(cqo13.asBlockPos(), double5, double6, double7) <= 80.0f) {
-                    DebugRenderer.renderFloatingText(String.format("%s", cqo13.type), cqo13.x + 0.5, cqo13.y + 0.75, cqo13.z + 0.5, -1);
-                    DebugRenderer.renderFloatingText(String.format(Locale.ROOT, "%.2f", cqo13.costMalus), cqo13.x + 0.5, cqo13.y + 0.25, cqo13.z + 0.5, -1);
+            for (int integer12 = 0; integer12 < czf.getSize(); ++integer12) {
+                final Node czd13 = czf.get(integer12);
+                if (distanceToCamera(czd13.asBlockPos(), double5, double6, double7) <= 80.0f) {
+                    DebugRenderer.renderFloatingText(String.format("%s", czd13.type), czd13.x + 0.5, czd13.y + 0.75, czd13.z + 0.5, -1, 0.02f, true, 0.0f, true);
+                    DebugRenderer.renderFloatingText(String.format(Locale.ROOT, "%.2f", czd13.costMalus), czd13.x + 0.5, czd13.y + 0.25, czd13.z + 0.5, -1, 0.02f, true, 0.0f, true);
                 }
             }
         }
     }
     
-    public static void renderPathLine(final Path cqq, final double double2, final double double3, final double double4) {
-        final Tesselator cym8 = Tesselator.getInstance();
-        final BufferBuilder cyg9 = cym8.getBuilder();
-        cyg9.begin(3, DefaultVertexFormat.POSITION_COLOR);
-        for (int integer10 = 0; integer10 < cqq.getSize(); ++integer10) {
-            final Node cqo11 = cqq.get(integer10);
-            if (distanceToCamera(cqo11.asBlockPos(), double2, double3, double4) <= 80.0f) {
-                final float float12 = integer10 / (float)cqq.getSize() * 0.33f;
+    public static void renderPathLine(final Path czf, final double double2, final double double3, final double double4) {
+        final Tesselator dhn8 = Tesselator.getInstance();
+        final BufferBuilder dhg9 = dhn8.getBuilder();
+        dhg9.begin(3, DefaultVertexFormat.POSITION_COLOR);
+        for (int integer10 = 0; integer10 < czf.getSize(); ++integer10) {
+            final Node czd11 = czf.get(integer10);
+            if (distanceToCamera(czd11.asBlockPos(), double2, double3, double4) <= 80.0f) {
+                final float float12 = integer10 / (float)czf.getSize() * 0.33f;
                 final int integer11 = (integer10 == 0) ? 0 : Mth.hsvToRgb(float12, 0.9f, 0.9f);
                 final int integer12 = integer11 >> 16 & 0xFF;
                 final int integer13 = integer11 >> 8 & 0xFF;
                 final int integer14 = integer11 & 0xFF;
-                cyg9.vertex(cqo11.x - double2 + 0.5, cqo11.y - double3 + 0.5, cqo11.z - double4 + 0.5).color(integer12, integer13, integer14, 255).endVertex();
+                dhg9.vertex(czd11.x - double2 + 0.5, czd11.y - double3 + 0.5, czd11.z - double4 + 0.5).color(integer12, integer13, integer14, 255).endVertex();
             }
         }
-        cym8.end();
+        dhn8.end();
     }
     
-    private static float distanceToCamera(final BlockPos fk, final double double2, final double double3, final double double4) {
-        return (float)(Math.abs(fk.getX() - double2) + Math.abs(fk.getY() - double3) + Math.abs(fk.getZ() - double4));
+    private static float distanceToCamera(final BlockPos fu, final double double2, final double double3, final double double4) {
+        return (float)(Math.abs(fu.getX() - double2) + Math.abs(fu.getY() - double3) + Math.abs(fu.getZ() - double4));
     }
 }
diff --git a/src/net/minecraft/client/renderer/debug/RaidDebugRenderer.java b/src/net/minecraft/client/renderer/debug/RaidDebugRenderer.java
index 100a0a0..b0e8263 100644
--- a/src/net/minecraft/client/renderer/debug/RaidDebugRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/RaidDebugRenderer.java
@@ -14,9 +14,9 @@ public class RaidDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     private final Minecraft minecraft;
     private Collection<BlockPos> raidCenters;
     
-    public RaidDebugRenderer(final Minecraft dbn) {
+    public RaidDebugRenderer(final Minecraft dlx) {
         this.raidCenters = Lists.newArrayList();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
     public void setRaidCenters(final Collection<BlockPos> collection) {
@@ -24,25 +24,25 @@ public class RaidDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
-        final BlockPos fk10 = this.getCamera().getBlockPosition();
-        for (final BlockPos fk11 : this.raidCenters) {
-            if (fk10.closerThan(fk11, 160.0)) {
-                highlightRaidCenter(fk11);
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
+        final BlockPos fu10 = this.getCamera().getBlockPosition();
+        for (final BlockPos fu11 : this.raidCenters) {
+            if (fu10.closerThan(fu11, 160.0)) {
+                highlightRaidCenter(fu11);
             }
         }
     }
     
-    private static void highlightRaidCenter(final BlockPos fk) {
-        DebugRenderer.renderFilledBox(fk.offset(-0.5, -0.5, -0.5), fk.offset(1.5, 1.5, 1.5), 1.0f, 0.0f, 0.0f, 0.15f);
+    private static void highlightRaidCenter(final BlockPos fu) {
+        DebugRenderer.renderFilledBox(fu.offset(-0.5, -0.5, -0.5), fu.offset(1.5, 1.5, 1.5), 1.0f, 0.0f, 0.0f, 0.15f);
         final int integer2 = -65536;
-        renderTextOverBlock("Raid center", fk, -65536);
+        renderTextOverBlock("Raid center", fu, -65536);
     }
     
-    private static void renderTextOverBlock(final String string, final BlockPos fk, final int integer) {
-        final double double4 = fk.getX() + 0.5;
-        final double double5 = fk.getY() + 1.3;
-        final double double6 = fk.getZ() + 0.5;
+    private static void renderTextOverBlock(final String string, final BlockPos fu, final int integer) {
+        final double double4 = fu.getX() + 0.5;
+        final double double5 = fu.getY() + 1.3;
+        final double double6 = fu.getZ() + 0.5;
         DebugRenderer.renderFloatingText(string, double4, double5, double6, integer, 0.04f, true, 0.0f, true);
     }
     
diff --git a/src/net/minecraft/client/renderer/debug/SolidFaceRenderer.java b/src/net/minecraft/client/renderer/debug/SolidFaceRenderer.java
index a215287..0e4c134 100644
--- a/src/net/minecraft/client/renderer/debug/SolidFaceRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/SolidFaceRenderer.java
@@ -19,96 +19,96 @@ import net.minecraft.client.Minecraft;
 public class SolidFaceRenderer implements DebugRenderer.SimpleDebugRenderer {
     private final Minecraft minecraft;
     
-    public SolidFaceRenderer(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public SolidFaceRenderer(final Minecraft dlx) {
+        this.minecraft = dlx;
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
-        final BlockGetter bjg10 = this.minecraft.player.level;
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
+        final BlockGetter bpg10 = this.minecraft.player.level;
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.lineWidth(2.0f);
         RenderSystem.disableTexture();
         RenderSystem.depthMask(false);
-        final BlockPos fk11 = new BlockPos(double3, double4, double5);
-        for (final BlockPos fk12 : BlockPos.betweenClosed(fk11.offset(-6, -6, -6), fk11.offset(6, 6, 6))) {
-            final BlockState byj14 = bjg10.getBlockState(fk12);
-            if (byj14.getBlock() == Blocks.AIR) {
+        final BlockPos fu11 = new BlockPos(double3, double4, double5);
+        for (final BlockPos fu12 : BlockPos.betweenClosed(fu11.offset(-6, -6, -6), fu11.offset(6, 6, 6))) {
+            final BlockState cfj14 = bpg10.getBlockState(fu12);
+            if (cfj14.is(Blocks.AIR)) {
                 continue;
             }
-            final VoxelShape cwf15 = byj14.getShape(bjg10, fk12);
-            for (final AABB cvf17 : cwf15.toAabbs()) {
-                final AABB cvf18 = cvf17.move(fk12).inflate(0.002).move(-double3, -double4, -double5);
-                final double double6 = cvf18.minX;
-                final double double7 = cvf18.minY;
-                final double double8 = cvf18.minZ;
-                final double double9 = cvf18.maxX;
-                final double double10 = cvf18.maxY;
-                final double double11 = cvf18.maxZ;
+            final VoxelShape dfg15 = cfj14.getShape(bpg10, fu12);
+            for (final AABB deg17 : dfg15.toAabbs()) {
+                final AABB deg18 = deg17.move(fu12).inflate(0.002).move(-double3, -double4, -double5);
+                final double double6 = deg18.minX;
+                final double double7 = deg18.minY;
+                final double double8 = deg18.minZ;
+                final double double9 = deg18.maxX;
+                final double double10 = deg18.maxY;
+                final double double11 = deg18.maxZ;
                 final float float31 = 1.0f;
                 final float float32 = 0.0f;
                 final float float33 = 0.0f;
                 final float float34 = 0.5f;
-                if (byj14.isFaceSturdy(bjg10, fk12, Direction.WEST)) {
-                    final Tesselator cym35 = Tesselator.getInstance();
-                    final BufferBuilder cyg36 = cym35.getBuilder();
-                    cyg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
-                    cyg36.vertex(double6, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double6, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double6, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double6, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cym35.end();
+                if (cfj14.isFaceSturdy(bpg10, fu12, Direction.WEST)) {
+                    final Tesselator dhn35 = Tesselator.getInstance();
+                    final BufferBuilder dhg36 = dhn35.getBuilder();
+                    dhg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
+                    dhg36.vertex(double6, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double6, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double6, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double6, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhn35.end();
                 }
-                if (byj14.isFaceSturdy(bjg10, fk12, Direction.SOUTH)) {
-                    final Tesselator cym35 = Tesselator.getInstance();
-                    final BufferBuilder cyg36 = cym35.getBuilder();
-                    cyg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
-                    cyg36.vertex(double6, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double6, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double9, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double9, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cym35.end();
+                if (cfj14.isFaceSturdy(bpg10, fu12, Direction.SOUTH)) {
+                    final Tesselator dhn35 = Tesselator.getInstance();
+                    final BufferBuilder dhg36 = dhn35.getBuilder();
+                    dhg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
+                    dhg36.vertex(double6, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double6, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double9, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double9, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhn35.end();
                 }
-                if (byj14.isFaceSturdy(bjg10, fk12, Direction.EAST)) {
-                    final Tesselator cym35 = Tesselator.getInstance();
-                    final BufferBuilder cyg36 = cym35.getBuilder();
-                    cyg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
-                    cyg36.vertex(double9, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double9, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double9, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double9, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cym35.end();
+                if (cfj14.isFaceSturdy(bpg10, fu12, Direction.EAST)) {
+                    final Tesselator dhn35 = Tesselator.getInstance();
+                    final BufferBuilder dhg36 = dhn35.getBuilder();
+                    dhg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
+                    dhg36.vertex(double9, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double9, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double9, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double9, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhn35.end();
                 }
-                if (byj14.isFaceSturdy(bjg10, fk12, Direction.NORTH)) {
-                    final Tesselator cym35 = Tesselator.getInstance();
-                    final BufferBuilder cyg36 = cym35.getBuilder();
-                    cyg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
-                    cyg36.vertex(double9, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double9, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double6, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double6, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cym35.end();
+                if (cfj14.isFaceSturdy(bpg10, fu12, Direction.NORTH)) {
+                    final Tesselator dhn35 = Tesselator.getInstance();
+                    final BufferBuilder dhg36 = dhn35.getBuilder();
+                    dhg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
+                    dhg36.vertex(double9, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double9, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double6, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double6, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhn35.end();
                 }
-                if (byj14.isFaceSturdy(bjg10, fk12, Direction.DOWN)) {
-                    final Tesselator cym35 = Tesselator.getInstance();
-                    final BufferBuilder cyg36 = cym35.getBuilder();
-                    cyg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
-                    cyg36.vertex(double6, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double9, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double6, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double9, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cym35.end();
+                if (cfj14.isFaceSturdy(bpg10, fu12, Direction.DOWN)) {
+                    final Tesselator dhn35 = Tesselator.getInstance();
+                    final BufferBuilder dhg36 = dhn35.getBuilder();
+                    dhg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
+                    dhg36.vertex(double6, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double9, double7, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double6, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double9, double7, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhn35.end();
                 }
-                if (byj14.isFaceSturdy(bjg10, fk12, Direction.UP)) {
-                    final Tesselator cym35 = Tesselator.getInstance();
-                    final BufferBuilder cyg36 = cym35.getBuilder();
-                    cyg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
-                    cyg36.vertex(double6, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double6, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double9, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cyg36.vertex(double9, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
-                    cym35.end();
+                if (cfj14.isFaceSturdy(bpg10, fu12, Direction.UP)) {
+                    final Tesselator dhn35 = Tesselator.getInstance();
+                    final BufferBuilder dhg36 = dhn35.getBuilder();
+                    dhg36.begin(5, DefaultVertexFormat.POSITION_COLOR);
+                    dhg36.vertex(double6, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double6, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double9, double10, double8).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhg36.vertex(double9, double10, double11).color(1.0f, 0.0f, 0.0f, 0.5f).endVertex();
+                    dhn35.end();
                 }
             }
         }
diff --git a/src/net/minecraft/client/renderer/debug/StructureRenderer.java b/src/net/minecraft/client/renderer/debug/StructureRenderer.java
index 115b235..3612cbf 100644
--- a/src/net/minecraft/client/renderer/debug/StructureRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/StructureRenderer.java
@@ -22,58 +22,58 @@ public class StructureRenderer implements DebugRenderer.SimpleDebugRenderer {
     private final Map<DimensionType, Map<String, BoundingBox>> postPiecesBoxes;
     private final Map<DimensionType, Map<String, Boolean>> startPiecesMap;
     
-    public StructureRenderer(final Minecraft dbn) {
+    public StructureRenderer(final Minecraft dlx) {
         this.postMainBoxes = Maps.newIdentityHashMap();
         this.postPiecesBoxes = Maps.newIdentityHashMap();
         this.startPiecesMap = Maps.newIdentityHashMap();
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
-        final Camera dbb10 = this.minecraft.gameRenderer.getMainCamera();
-        final LevelAccessor bjx11 = this.minecraft.level;
-        final DimensionType cbi12 = bjx11.getDimension().getType();
-        final BlockPos fk13 = new BlockPos(dbb10.getPosition().x, 0.0, dbb10.getPosition().z);
-        final VertexConsumer cyo14 = dqt.getBuffer(RenderType.lines());
-        if (this.postMainBoxes.containsKey(cbi12)) {
-            for (final BoundingBox clb16 : this.postMainBoxes.get(cbi12).values()) {
-                if (fk13.closerThan(clb16.getCenter(), 500.0)) {
-                    LevelRenderer.renderLineBox(cyo14, clb16.x0 - double3, clb16.y0 - double4, clb16.z0 - double5, clb16.x1 + 1 - double3, clb16.y1 + 1 - double4, clb16.z1 + 1 - double5, 1.0f, 1.0f, 1.0f, 1.0f);
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
+        final Camera dlj10 = this.minecraft.gameRenderer.getMainCamera();
+        final LevelAccessor bqc11 = this.minecraft.level;
+        final DimensionType cif12 = bqc11.dimensionType();
+        final BlockPos fu13 = new BlockPos(dlj10.getPosition().x, 0.0, dlj10.getPosition().z);
+        final VertexConsumer dhp14 = ebz.getBuffer(RenderType.lines());
+        if (this.postMainBoxes.containsKey(cif12)) {
+            for (final BoundingBox ctd16 : this.postMainBoxes.get(cif12).values()) {
+                if (fu13.closerThan(ctd16.getCenter(), 500.0)) {
+                    LevelRenderer.renderLineBox(dhl, dhp14, ctd16.x0 - double3, ctd16.y0 - double4, ctd16.z0 - double5, ctd16.x1 + 1 - double3, ctd16.y1 + 1 - double4, ctd16.z1 + 1 - double5, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f);
                 }
             }
         }
-        if (this.postPiecesBoxes.containsKey(cbi12)) {
-            for (final Map.Entry<String, BoundingBox> entry16 : this.postPiecesBoxes.get(cbi12).entrySet()) {
+        if (this.postPiecesBoxes.containsKey(cif12)) {
+            for (final Map.Entry<String, BoundingBox> entry16 : this.postPiecesBoxes.get(cif12).entrySet()) {
                 final String string17 = entry16.getKey();
-                final BoundingBox clb17 = entry16.getValue();
-                final Boolean boolean19 = this.startPiecesMap.get(cbi12).get(string17);
-                if (fk13.closerThan(clb17.getCenter(), 500.0)) {
+                final BoundingBox ctd17 = entry16.getValue();
+                final Boolean boolean19 = this.startPiecesMap.get(cif12).get(string17);
+                if (fu13.closerThan(ctd17.getCenter(), 500.0)) {
                     if (boolean19) {
-                        LevelRenderer.renderLineBox(cyo14, clb17.x0 - double3, clb17.y0 - double4, clb17.z0 - double5, clb17.x1 + 1 - double3, clb17.y1 + 1 - double4, clb17.z1 + 1 - double5, 0.0f, 1.0f, 0.0f, 1.0f);
+                        LevelRenderer.renderLineBox(dhl, dhp14, ctd17.x0 - double3, ctd17.y0 - double4, ctd17.z0 - double5, ctd17.x1 + 1 - double3, ctd17.y1 + 1 - double4, ctd17.z1 + 1 - double5, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f);
                     }
                     else {
-                        LevelRenderer.renderLineBox(cyo14, clb17.x0 - double3, clb17.y0 - double4, clb17.z0 - double5, clb17.x1 + 1 - double3, clb17.y1 + 1 - double4, clb17.z1 + 1 - double5, 0.0f, 0.0f, 1.0f, 1.0f);
+                        LevelRenderer.renderLineBox(dhl, dhp14, ctd17.x0 - double3, ctd17.y0 - double4, ctd17.z0 - double5, ctd17.x1 + 1 - double3, ctd17.y1 + 1 - double4, ctd17.z1 + 1 - double5, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f);
                     }
                 }
             }
         }
     }
     
-    public void addBoundingBox(final BoundingBox clb, final List<BoundingBox> list2, final List<Boolean> list3, final DimensionType cbi) {
-        if (!this.postMainBoxes.containsKey(cbi)) {
-            this.postMainBoxes.put(cbi, Maps.newHashMap());
+    public void addBoundingBox(final BoundingBox ctd, final List<BoundingBox> list2, final List<Boolean> list3, final DimensionType cif) {
+        if (!this.postMainBoxes.containsKey(cif)) {
+            this.postMainBoxes.put(cif, Maps.newHashMap());
         }
-        if (!this.postPiecesBoxes.containsKey(cbi)) {
-            this.postPiecesBoxes.put(cbi, Maps.newHashMap());
-            this.startPiecesMap.put(cbi, Maps.newHashMap());
+        if (!this.postPiecesBoxes.containsKey(cif)) {
+            this.postPiecesBoxes.put(cif, Maps.newHashMap());
+            this.startPiecesMap.put(cif, Maps.newHashMap());
         }
-        this.postMainBoxes.get(cbi).put(clb.toString(), clb);
+        this.postMainBoxes.get(cif).put(ctd.toString(), ctd);
         for (int integer6 = 0; integer6 < list2.size(); ++integer6) {
-            final BoundingBox clb2 = list2.get(integer6);
+            final BoundingBox ctd2 = list2.get(integer6);
             final Boolean boolean8 = list3.get(integer6);
-            this.postPiecesBoxes.get(cbi).put(clb2.toString(), clb2);
-            this.startPiecesMap.get(cbi).put(clb2.toString(), boolean8);
+            this.postPiecesBoxes.get(cif).put(ctd2.toString(), ctd2);
+            this.startPiecesMap.get(cif).put(ctd2.toString(), boolean8);
         }
     }
     
diff --git a/src/net/minecraft/client/renderer/debug/VillageSectionsDebugRenderer.java b/src/net/minecraft/client/renderer/debug/VillageSectionsDebugRenderer.java
new file mode 100644
index 0000000..c1c265b
--- /dev/null
+++ b/src/net/minecraft/client/renderer/debug/VillageSectionsDebugRenderer.java
@@ -0,0 +1,60 @@
+package net.minecraft.client.renderer.debug;
+
+import net.minecraft.core.Vec3i;
+import net.minecraft.core.BlockPos;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.renderer.MultiBufferSource;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.google.common.collect.Sets;
+import net.minecraft.core.SectionPos;
+import java.util.Set;
+
+public class VillageSectionsDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
+    private final Set<SectionPos> villageSections;
+    
+    VillageSectionsDebugRenderer() {
+        this.villageSections = Sets.newHashSet();
+    }
+    
+    @Override
+    public void clear() {
+        this.villageSections.clear();
+    }
+    
+    public void setVillageSection(final SectionPos go) {
+        this.villageSections.add(go);
+    }
+    
+    public void setNotVillageSection(final SectionPos go) {
+        this.villageSections.remove(go);
+    }
+    
+    @Override
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
+        RenderSystem.pushMatrix();
+        RenderSystem.enableBlend();
+        RenderSystem.defaultBlendFunc();
+        RenderSystem.disableTexture();
+        this.doRender(double3, double4, double5);
+        RenderSystem.enableTexture();
+        RenderSystem.disableBlend();
+        RenderSystem.popMatrix();
+    }
+    
+    private void doRender(final double double1, final double double2, final double double3) {
+        final BlockPos fu8 = new BlockPos(double1, double2, double3);
+        this.villageSections.forEach(go -> {
+            if (fu8.closerThan(go.center(), 60.0)) {
+                highlightVillageSection(go);
+            }
+        });
+    }
+    
+    private static void highlightVillageSection(final SectionPos go) {
+        final float float2 = 1.0f;
+        final BlockPos fu3 = go.center();
+        final BlockPos fu4 = fu3.offset(-1.0, -1.0, -1.0);
+        final BlockPos fu5 = fu3.offset(1.0, 1.0, 1.0);
+        DebugRenderer.renderFilledBox(fu4, fu5, 0.2f, 1.0f, 0.2f, 0.15f);
+    }
+}
diff --git a/src/net/minecraft/client/renderer/debug/WaterDebugRenderer.java b/src/net/minecraft/client/renderer/debug/WaterDebugRenderer.java
index 101d5aa..22652b0 100644
--- a/src/net/minecraft/client/renderer/debug/WaterDebugRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/WaterDebugRenderer.java
@@ -5,6 +5,8 @@ import java.util.Iterator;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.BlockPos;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -15,30 +17,30 @@ import net.minecraft.client.Minecraft;
 public class WaterDebugRenderer implements DebugRenderer.SimpleDebugRenderer {
     private final Minecraft minecraft;
     
-    public WaterDebugRenderer(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public WaterDebugRenderer(final Minecraft dlx) {
+        this.minecraft = dlx;
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
-        final BlockPos fk10 = this.minecraft.player.getCommandSenderBlockPosition();
-        final LevelReader bjz11 = this.minecraft.player.level;
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
+        final BlockPos fu10 = this.minecraft.player.blockPosition();
+        final LevelReader bqd11 = this.minecraft.player.level;
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.color4f(0.0f, 1.0f, 0.0f, 0.75f);
         RenderSystem.disableTexture();
         RenderSystem.lineWidth(6.0f);
-        for (final BlockPos fk11 : BlockPos.betweenClosed(fk10.offset(-10, -10, -10), fk10.offset(10, 10, 10))) {
-            final FluidState coj14 = bjz11.getFluidState(fk11);
-            if (coj14.is(FluidTags.WATER)) {
-                final double double6 = fk11.getY() + coj14.getHeight(bjz11, fk11);
-                DebugRenderer.renderFilledBox(new AABB(fk11.getX() + 0.01f, fk11.getY() + 0.01f, fk11.getZ() + 0.01f, fk11.getX() + 0.99f, double6, fk11.getZ() + 0.99f).move(-double3, -double4, -double5), 1.0f, 1.0f, 1.0f, 0.2f);
+        for (final BlockPos fu11 : BlockPos.betweenClosed(fu10.offset(-10, -10, -10), fu10.offset(10, 10, 10))) {
+            final FluidState cxa14 = bqd11.getFluidState(fu11);
+            if (cxa14.is(FluidTags.WATER)) {
+                final double double6 = fu11.getY() + cxa14.getHeight(bqd11, fu11);
+                DebugRenderer.renderFilledBox(new AABB(fu11.getX() + 0.01f, fu11.getY() + 0.01f, fu11.getZ() + 0.01f, fu11.getX() + 0.99f, double6, fu11.getZ() + 0.99f).move(-double3, -double4, -double5), 1.0f, 1.0f, 1.0f, 0.2f);
             }
         }
-        for (final BlockPos fk11 : BlockPos.betweenClosed(fk10.offset(-10, -10, -10), fk10.offset(10, 10, 10))) {
-            final FluidState coj14 = bjz11.getFluidState(fk11);
-            if (coj14.is(FluidTags.WATER)) {
-                DebugRenderer.renderFloatingText(String.valueOf(coj14.getAmount()), fk11.getX() + 0.5, fk11.getY() + coj14.getHeight(bjz11, fk11), fk11.getZ() + 0.5, -16777216);
+        for (final BlockPos fu11 : BlockPos.betweenClosed(fu10.offset(-10, -10, -10), fu10.offset(10, 10, 10))) {
+            final FluidState cxa14 = bqd11.getFluidState(fu11);
+            if (cxa14.is(FluidTags.WATER)) {
+                DebugRenderer.renderFloatingText(String.valueOf(cxa14.getAmount()), fu11.getX() + 0.5, fu11.getY() + cxa14.getHeight(bqd11, fu11), fu11.getZ() + 0.5, -16777216);
             }
         }
         RenderSystem.enableTexture();
diff --git a/src/net/minecraft/client/renderer/debug/WorldGenAttemptRenderer.java b/src/net/minecraft/client/renderer/debug/WorldGenAttemptRenderer.java
index 338ecb8..2019d05 100644
--- a/src/net/minecraft/client/renderer/debug/WorldGenAttemptRenderer.java
+++ b/src/net/minecraft/client/renderer/debug/WorldGenAttemptRenderer.java
@@ -28,8 +28,8 @@ public class WorldGenAttemptRenderer implements DebugRenderer.SimpleDebugRendere
         this.blues = Lists.newArrayList();
     }
     
-    public void addPos(final BlockPos fk, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        this.toRender.add(fk);
+    public void addPos(final BlockPos fu, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        this.toRender.add(fu);
         this.scales.add(float2);
         this.alphas.add(float6);
         this.reds.add(float3);
@@ -38,21 +38,21 @@ public class WorldGenAttemptRenderer implements DebugRenderer.SimpleDebugRendere
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final double double3, final double double4, final double double5) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final double double3, final double double4, final double double5) {
         RenderSystem.pushMatrix();
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.disableTexture();
-        final Tesselator cym10 = Tesselator.getInstance();
-        final BufferBuilder cyg11 = cym10.getBuilder();
-        cyg11.begin(5, DefaultVertexFormat.POSITION_COLOR);
+        final Tesselator dhn10 = Tesselator.getInstance();
+        final BufferBuilder dhg11 = dhn10.getBuilder();
+        dhg11.begin(5, DefaultVertexFormat.POSITION_COLOR);
         for (int integer12 = 0; integer12 < this.toRender.size(); ++integer12) {
-            final BlockPos fk13 = this.toRender.get(integer12);
+            final BlockPos fu13 = this.toRender.get(integer12);
             final Float float14 = this.scales.get(integer12);
             final float float15 = float14 / 2.0f;
-            LevelRenderer.addChainedFilledBoxVertices(cyg11, fk13.getX() + 0.5f - float15 - double3, fk13.getY() + 0.5f - float15 - double4, fk13.getZ() + 0.5f - float15 - double5, fk13.getX() + 0.5f + float15 - double3, fk13.getY() + 0.5f + float15 - double4, fk13.getZ() + 0.5f + float15 - double5, this.reds.get(integer12), this.greens.get(integer12), this.blues.get(integer12), this.alphas.get(integer12));
+            LevelRenderer.addChainedFilledBoxVertices(dhg11, fu13.getX() + 0.5f - float15 - double3, fu13.getY() + 0.5f - float15 - double4, fu13.getZ() + 0.5f - float15 - double5, fu13.getX() + 0.5f + float15 - double3, fu13.getY() + 0.5f + float15 - double4, fu13.getZ() + 0.5f + float15 - double5, this.reds.get(integer12), this.greens.get(integer12), this.blues.get(integer12), this.alphas.get(integer12));
         }
-        cym10.end();
+        dhn10.end();
         RenderSystem.enableTexture();
         RenderSystem.popMatrix();
     }
diff --git a/src/net/minecraft/client/renderer/entity/AbstractHorseRenderer.java b/src/net/minecraft/client/renderer/entity/AbstractHorseRenderer.java
index 1c18285..853d139 100644
--- a/src/net/minecraft/client/renderer/entity/AbstractHorseRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/AbstractHorseRenderer.java
@@ -8,14 +8,14 @@ import net.minecraft.world.entity.animal.horse.AbstractHorse;
 public abstract class AbstractHorseRenderer<T extends AbstractHorse, M extends HorseModel<T>> extends MobRenderer<T, M> {
     private final float scale;
     
-    public AbstractHorseRenderer(final EntityRenderDispatcher dvf, final M dlh, final float float3) {
-        super(dvf, dlh, 0.75f);
+    public AbstractHorseRenderer(final EntityRenderDispatcher egm, final M dwd, final float float3) {
+        super(egm, dwd, 0.75f);
         this.scale = float3;
     }
     
     @Override
-    protected void scale(final T aue, final PoseStack cyl, final float float3) {
-        cyl.scale(this.scale, this.scale, this.scale);
-        super.scale(aue, cyl, float3);
+    protected void scale(final T azm, final PoseStack dhl, final float float3) {
+        dhl.scale(this.scale, this.scale, this.scale);
+        super.scale(azm, dhl, float3);
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/AbstractZombieRenderer.java b/src/net/minecraft/client/renderer/entity/AbstractZombieRenderer.java
index 6e86865..67a6c10 100644
--- a/src/net/minecraft/client/renderer/entity/AbstractZombieRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/AbstractZombieRenderer.java
@@ -2,7 +2,6 @@ package net.minecraft.client.renderer.entity;
 
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.Mob;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.entity.layers.RenderLayer;
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.world.entity.LivingEntity;
@@ -14,22 +13,19 @@ import net.minecraft.world.entity.monster.Zombie;
 public abstract class AbstractZombieRenderer<T extends Zombie, M extends ZombieModel<T>> extends HumanoidMobRenderer<T, M> {
     private static final ResourceLocation ZOMBIE_LOCATION;
     
-    protected AbstractZombieRenderer(final EntityRenderDispatcher dvf, final M dne2, final M dne3, final M dne4) {
-        super(dvf, dne2, 0.5f);
-        this.addLayer((RenderLayer<T, M>)new HumanoidArmorLayer((RenderLayerParent<LivingEntity, HumanoidModel>)this, dne3, dne4));
+    protected AbstractZombieRenderer(final EntityRenderDispatcher egm, final M dyc2, final M dyc3, final M dyc4) {
+        super(egm, dyc2, 0.5f);
+        this.addLayer((RenderLayer<T, M>)new HumanoidArmorLayer((RenderLayerParent<LivingEntity, HumanoidModel>)this, dyc3, dyc4));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Zombie axp) {
+    public ResourceLocation getTextureLocation(final Zombie bcu) {
         return AbstractZombieRenderer.ZOMBIE_LOCATION;
     }
     
     @Override
-    protected void setupRotations(final T axp, final PoseStack cyl, final float float3, float float4, final float float5) {
-        if (axp.isUnderWaterConverting()) {
-            float4 += (float)(Math.cos(axp.tickCount * 3.25) * 3.141592653589793 * 0.25);
-        }
-        super.setupRotations(axp, cyl, float3, float4, float5);
+    protected boolean isShaking(final T bcu) {
+        return bcu.isUnderWaterConverting();
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/AreaEffectCloudRenderer.java b/src/net/minecraft/client/renderer/entity/AreaEffectCloudRenderer.java
index 9df620c..bda6606 100644
--- a/src/net/minecraft/client/renderer/entity/AreaEffectCloudRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/AreaEffectCloudRenderer.java
@@ -6,12 +6,12 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.AreaEffectCloud;
 
 public class AreaEffectCloudRenderer extends EntityRenderer<AreaEffectCloud> {
-    public AreaEffectCloudRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public AreaEffectCloudRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final AreaEffectCloud akp) {
+    public ResourceLocation getTextureLocation(final AreaEffectCloud aol) {
         return TextureAtlas.LOCATION_BLOCKS;
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/ArmorStandRenderer.java b/src/net/minecraft/client/renderer/entity/ArmorStandRenderer.java
index 85be9a5..928cae8 100644
--- a/src/net/minecraft/client/renderer/entity/ArmorStandRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ArmorStandRenderer.java
@@ -21,8 +21,8 @@ import net.minecraft.world.entity.decoration.ArmorStand;
 public class ArmorStandRenderer extends LivingEntityRenderer<ArmorStand, ArmorStandArmorModel> {
     public static final ResourceLocation DEFAULT_SKIN_LOCATION;
     
-    public ArmorStandRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new ArmorStandModel(), 0.0f);
+    public ArmorStandRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new ArmorStandModel(), 0.0f);
         this.addLayer((RenderLayer<ArmorStand, ArmorStandArmorModel>)new HumanoidArmorLayer((RenderLayerParent<LivingEntity, HumanoidModel>)this, new ArmorStandArmorModel(0.5f), new ArmorStandArmorModel(1.0f)));
         this.addLayer(new ItemInHandLayer<ArmorStand, ArmorStandArmorModel>(this));
         this.addLayer(new ElytraLayer<ArmorStand, ArmorStandArmorModel>(this));
@@ -30,38 +30,38 @@ public class ArmorStandRenderer extends LivingEntityRenderer<ArmorStand, ArmorSt
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final ArmorStand avp) {
+    public ResourceLocation getTextureLocation(final ArmorStand bay) {
         return ArmorStandRenderer.DEFAULT_SKIN_LOCATION;
     }
     
     @Override
-    protected void setupRotations(final ArmorStand avp, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float4));
-        final float float6 = avp.level.getGameTime() - avp.lastHit + float5;
+    protected void setupRotations(final ArmorStand bay, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float4));
+        final float float6 = bay.level.getGameTime() - bay.lastHit + float5;
         if (float6 < 5.0f) {
-            cyl.mulPose(Vector3f.YP.rotationDegrees(Mth.sin(float6 / 1.5f * 3.1415927f) * 3.0f));
+            dhl.mulPose(Vector3f.YP.rotationDegrees(Mth.sin(float6 / 1.5f * 3.1415927f) * 3.0f));
         }
     }
     
     @Override
-    protected boolean shouldShowName(final ArmorStand avp) {
-        final double double3 = this.entityRenderDispatcher.distanceToSqr(avp);
-        final float float5 = avp.isCrouching() ? 32.0f : 64.0f;
-        return double3 < float5 * float5 && avp.isCustomNameVisible();
+    protected boolean shouldShowName(final ArmorStand bay) {
+        final double double3 = this.entityRenderDispatcher.distanceToSqr(bay);
+        final float float5 = bay.isCrouching() ? 32.0f : 64.0f;
+        return double3 < float5 * float5 && bay.isCustomNameVisible();
     }
     
     @Nullable
     @Override
-    protected RenderType getRenderType(final ArmorStand avp, final boolean boolean2, final boolean boolean3) {
-        if (!avp.isMarker()) {
-            return super.getRenderType(avp, boolean2, boolean3);
+    protected RenderType getRenderType(final ArmorStand bay, final boolean boolean2, final boolean boolean3, final boolean boolean4) {
+        if (!bay.isMarker()) {
+            return super.getRenderType(bay, boolean2, boolean3, boolean4);
         }
-        final ResourceLocation sm5 = this.getTextureLocation(avp);
+        final ResourceLocation uh6 = this.getTextureLocation(bay);
         if (boolean3) {
-            return RenderType.entityTranslucent(sm5, false);
+            return RenderType.entityTranslucent(uh6, false);
         }
         if (boolean2) {
-            return RenderType.entityCutoutNoCull(sm5, false);
+            return RenderType.entityCutoutNoCull(uh6, false);
         }
         return null;
     }
diff --git a/src/net/minecraft/client/renderer/entity/ArrowRenderer.java b/src/net/minecraft/client/renderer/entity/ArrowRenderer.java
index e2d4999..5262bf0 100644
--- a/src/net/minecraft/client/renderer/entity/ArrowRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ArrowRenderer.java
@@ -13,15 +13,15 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 
 public abstract class ArrowRenderer<T extends AbstractArrow> extends EntityRenderer<T> {
-    public ArrowRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public ArrowRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    public void render(final T ayn, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.mulPose(Vector3f.YP.rotationDegrees(Mth.lerp(float3, ayn.yRotO, ayn.yRot) - 90.0f));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(Mth.lerp(float3, ayn.xRotO, ayn.xRot)));
+    public void render(final T beg, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        dhl.mulPose(Vector3f.YP.rotationDegrees(Mth.lerp(float3, beg.yRotO, beg.yRot) - 90.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(Mth.lerp(float3, beg.xRotO, beg.xRot)));
         final int integer2 = 0;
         final float float4 = 0.0f;
         final float float5 = 0.5f;
@@ -32,38 +32,38 @@ public abstract class ArrowRenderer<T extends AbstractArrow> extends EntityRende
         final float float10 = 0.15625f;
         final float float11 = 0.3125f;
         final float float12 = 0.05625f;
-        final float float13 = ayn.shakeTime - float3;
+        final float float13 = beg.shakeTime - float3;
         if (float13 > 0.0f) {
             final float float14 = -Mth.sin(float13 * 3.0f) * float13;
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(float14));
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(float14));
         }
-        cyl.mulPose(Vector3f.XP.rotationDegrees(45.0f));
-        cyl.scale(0.05625f, 0.05625f, 0.05625f);
-        cyl.translate(-4.0, 0.0, 0.0);
-        final VertexConsumer cyo19 = dqt.getBuffer(RenderType.entityCutout(this.getTextureLocation(ayn)));
-        final PoseStack.Pose a20 = cyl.last();
+        dhl.mulPose(Vector3f.XP.rotationDegrees(45.0f));
+        dhl.scale(0.05625f, 0.05625f, 0.05625f);
+        dhl.translate(-4.0, 0.0, 0.0);
+        final VertexConsumer dhp19 = ebz.getBuffer(RenderType.entityCutout(this.getTextureLocation(beg)));
+        final PoseStack.Pose a20 = dhl.last();
         final Matrix4f b21 = a20.pose();
         final Matrix3f a21 = a20.normal();
-        this.vertex(b21, a21, cyo19, -7, -2, -2, 0.0f, 0.15625f, -1, 0, 0, integer);
-        this.vertex(b21, a21, cyo19, -7, -2, 2, 0.15625f, 0.15625f, -1, 0, 0, integer);
-        this.vertex(b21, a21, cyo19, -7, 2, 2, 0.15625f, 0.3125f, -1, 0, 0, integer);
-        this.vertex(b21, a21, cyo19, -7, 2, -2, 0.0f, 0.3125f, -1, 0, 0, integer);
-        this.vertex(b21, a21, cyo19, -7, 2, -2, 0.0f, 0.15625f, 1, 0, 0, integer);
-        this.vertex(b21, a21, cyo19, -7, 2, 2, 0.15625f, 0.15625f, 1, 0, 0, integer);
-        this.vertex(b21, a21, cyo19, -7, -2, 2, 0.15625f, 0.3125f, 1, 0, 0, integer);
-        this.vertex(b21, a21, cyo19, -7, -2, -2, 0.0f, 0.3125f, 1, 0, 0, integer);
+        this.vertex(b21, a21, dhp19, -7, -2, -2, 0.0f, 0.15625f, -1, 0, 0, integer);
+        this.vertex(b21, a21, dhp19, -7, -2, 2, 0.15625f, 0.15625f, -1, 0, 0, integer);
+        this.vertex(b21, a21, dhp19, -7, 2, 2, 0.15625f, 0.3125f, -1, 0, 0, integer);
+        this.vertex(b21, a21, dhp19, -7, 2, -2, 0.0f, 0.3125f, -1, 0, 0, integer);
+        this.vertex(b21, a21, dhp19, -7, 2, -2, 0.0f, 0.15625f, 1, 0, 0, integer);
+        this.vertex(b21, a21, dhp19, -7, 2, 2, 0.15625f, 0.15625f, 1, 0, 0, integer);
+        this.vertex(b21, a21, dhp19, -7, -2, 2, 0.15625f, 0.3125f, 1, 0, 0, integer);
+        this.vertex(b21, a21, dhp19, -7, -2, -2, 0.0f, 0.3125f, 1, 0, 0, integer);
         for (int integer3 = 0; integer3 < 4; ++integer3) {
-            cyl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
-            this.vertex(b21, a21, cyo19, -8, -2, 0, 0.0f, 0.0f, 0, 1, 0, integer);
-            this.vertex(b21, a21, cyo19, 8, -2, 0, 0.5f, 0.0f, 0, 1, 0, integer);
-            this.vertex(b21, a21, cyo19, 8, 2, 0, 0.5f, 0.15625f, 0, 1, 0, integer);
-            this.vertex(b21, a21, cyo19, -8, 2, 0, 0.0f, 0.15625f, 0, 1, 0, integer);
+            dhl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
+            this.vertex(b21, a21, dhp19, -8, -2, 0, 0.0f, 0.0f, 0, 1, 0, integer);
+            this.vertex(b21, a21, dhp19, 8, -2, 0, 0.5f, 0.0f, 0, 1, 0, integer);
+            this.vertex(b21, a21, dhp19, 8, 2, 0, 0.5f, 0.15625f, 0, 1, 0, integer);
+            this.vertex(b21, a21, dhp19, -8, 2, 0, 0.0f, 0.15625f, 0, 1, 0, integer);
         }
-        cyl.popPose();
-        super.render(ayn, float2, float3, cyl, dqt, integer);
+        dhl.popPose();
+        super.render(beg, float2, float3, dhl, ebz, integer);
     }
     
-    public void vertex(final Matrix4f b, final Matrix3f a, final VertexConsumer cyo, final int integer4, final int integer5, final int integer6, final float float7, final float float8, final int integer9, final int integer10, final int integer11, final int integer12) {
-        cyo.vertex(b, (float)integer4, (float)integer5, (float)integer6).color(255, 255, 255, 255).uv(float7, float8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer12).normal(a, (float)integer9, (float)integer11, (float)integer10).endVertex();
+    public void vertex(final Matrix4f b, final Matrix3f a, final VertexConsumer dhp, final int integer4, final int integer5, final int integer6, final float float7, final float float8, final int integer9, final int integer10, final int integer11, final int integer12) {
+        dhp.vertex(b, (float)integer4, (float)integer5, (float)integer6).color(255, 255, 255, 255).uv(float7, float8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer12).normal(a, (float)integer9, (float)integer11, (float)integer10).endVertex();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/BatRenderer.java b/src/net/minecraft/client/renderer/entity/BatRenderer.java
index c4ac2a8..2b7e233 100644
--- a/src/net/minecraft/client/renderer/entity/BatRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/BatRenderer.java
@@ -11,29 +11,29 @@ import net.minecraft.world.entity.ambient.Bat;
 public class BatRenderer extends MobRenderer<Bat, BatModel> {
     private static final ResourceLocation BAT_LOCATION;
     
-    public BatRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new BatModel(), 0.25f);
+    public BatRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new BatModel(), 0.25f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Bat asx) {
+    public ResourceLocation getTextureLocation(final Bat ayf) {
         return BatRenderer.BAT_LOCATION;
     }
     
     @Override
-    protected void scale(final Bat asx, final PoseStack cyl, final float float3) {
-        cyl.scale(0.35f, 0.35f, 0.35f);
+    protected void scale(final Bat ayf, final PoseStack dhl, final float float3) {
+        dhl.scale(0.35f, 0.35f, 0.35f);
     }
     
     @Override
-    protected void setupRotations(final Bat asx, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        if (asx.isResting()) {
-            cyl.translate(0.0, -0.10000000149011612, 0.0);
+    protected void setupRotations(final Bat ayf, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        if (ayf.isResting()) {
+            dhl.translate(0.0, -0.10000000149011612, 0.0);
         }
         else {
-            cyl.translate(0.0, Mth.cos(float3 * 0.3f) * 0.1f, 0.0);
+            dhl.translate(0.0, Mth.cos(float3 * 0.3f) * 0.1f, 0.0);
         }
-        super.setupRotations(asx, cyl, float3, float4, float5);
+        super.setupRotations(ayf, dhl, float3, float4, float5);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/BeeRenderer.java b/src/net/minecraft/client/renderer/entity/BeeRenderer.java
index 6932621..8fc15e5 100644
--- a/src/net/minecraft/client/renderer/entity/BeeRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/BeeRenderer.java
@@ -11,20 +11,20 @@ public class BeeRenderer extends MobRenderer<Bee, BeeModel<Bee>> {
     private static final ResourceLocation BEE_TEXTURE;
     private static final ResourceLocation NECTAR_BEE_TEXTURE;
     
-    public BeeRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new BeeModel(), 0.4f);
+    public BeeRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new BeeModel(), 0.4f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Bee atd) {
-        if (atd.isAngry()) {
-            if (atd.hasNectar()) {
+    public ResourceLocation getTextureLocation(final Bee ayl) {
+        if (ayl.isAngry()) {
+            if (ayl.hasNectar()) {
                 return BeeRenderer.ANGRY_NECTAR_BEE_TEXTURE;
             }
             return BeeRenderer.ANGRY_BEE_TEXTURE;
         }
         else {
-            if (atd.hasNectar()) {
+            if (ayl.hasNectar()) {
                 return BeeRenderer.NECTAR_BEE_TEXTURE;
             }
             return BeeRenderer.BEE_TEXTURE;
diff --git a/src/net/minecraft/client/renderer/entity/BlazeRenderer.java b/src/net/minecraft/client/renderer/entity/BlazeRenderer.java
index e4c32fd..6436dda 100644
--- a/src/net/minecraft/client/renderer/entity/BlazeRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/BlazeRenderer.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.renderer.entity;
 
 import net.minecraft.world.entity.Entity;
+import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.model.BlazeModel;
 import net.minecraft.world.entity.monster.Blaze;
@@ -8,16 +9,16 @@ import net.minecraft.world.entity.monster.Blaze;
 public class BlazeRenderer extends MobRenderer<Blaze, BlazeModel<Blaze>> {
     private static final ResourceLocation BLAZE_LOCATION;
     
-    public BlazeRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new BlazeModel(), 0.5f);
+    public BlazeRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new BlazeModel(), 0.5f);
     }
     
-    protected int getBlockLightLevel(final Blaze awg, final float float2) {
+    protected int getBlockLightLevel(final Blaze bbl, final BlockPos fu) {
         return 15;
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Blaze awg) {
+    public ResourceLocation getTextureLocation(final Blaze bbl) {
         return BlazeRenderer.BLAZE_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/BoatRenderer.java b/src/net/minecraft/client/renderer/entity/BoatRenderer.java
index 14bece5..0dc795b 100644
--- a/src/net/minecraft/client/renderer/entity/BoatRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/BoatRenderer.java
@@ -17,43 +17,45 @@ public class BoatRenderer extends EntityRenderer<Boat> {
     private static final ResourceLocation[] BOAT_TEXTURE_LOCATIONS;
     protected final BoatModel model;
     
-    public BoatRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public BoatRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.model = new BoatModel();
         this.shadowRadius = 0.8f;
     }
     
     @Override
-    public void render(final Boat azz, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.translate(0.0, 0.375, 0.0);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float2));
-        final float float4 = azz.getHurtTime() - float3;
-        float float5 = azz.getDamage() - float3;
+    public void render(final Boat bft, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        dhl.translate(0.0, 0.375, 0.0);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float2));
+        final float float4 = bft.getHurtTime() - float3;
+        float float5 = bft.getDamage() - float3;
         if (float5 < 0.0f) {
             float5 = 0.0f;
         }
         if (float4 > 0.0f) {
-            cyl.mulPose(Vector3f.XP.rotationDegrees(Mth.sin(float4) * float4 * float5 / 10.0f * azz.getHurtDir()));
+            dhl.mulPose(Vector3f.XP.rotationDegrees(Mth.sin(float4) * float4 * float5 / 10.0f * bft.getHurtDir()));
         }
-        final float float6 = azz.getBubbleAngle(float3);
+        final float float6 = bft.getBubbleAngle(float3);
         if (!Mth.equal(float6, 0.0f)) {
-            cyl.mulPose(new Quaternion(new Vector3f(1.0f, 0.0f, 1.0f), azz.getBubbleAngle(float3), true));
+            dhl.mulPose(new Quaternion(new Vector3f(1.0f, 0.0f, 1.0f), bft.getBubbleAngle(float3), true));
         }
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(90.0f));
-        this.model.setupAnim(azz, float3, 0.0f, -0.1f, 0.0f, 0.0f);
-        final VertexConsumer cyo11 = dqt.getBuffer(this.model.renderType(this.getTextureLocation(azz)));
-        this.model.renderToBuffer(cyl, cyo11, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        final VertexConsumer cyo12 = dqt.getBuffer(RenderType.waterMask());
-        this.model.waterPatch().render(cyl, cyo12, integer, OverlayTexture.NO_OVERLAY);
-        cyl.popPose();
-        super.render(azz, float2, float3, cyl, dqt, integer);
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(90.0f));
+        this.model.setupAnim(bft, float3, 0.0f, -0.1f, 0.0f, 0.0f);
+        final VertexConsumer dhp11 = ebz.getBuffer(this.model.renderType(this.getTextureLocation(bft)));
+        this.model.renderToBuffer(dhl, dhp11, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        if (!bft.isUnderWater()) {
+            final VertexConsumer dhp12 = ebz.getBuffer(RenderType.waterMask());
+            this.model.waterPatch().render(dhl, dhp12, integer, OverlayTexture.NO_OVERLAY);
+        }
+        dhl.popPose();
+        super.render(bft, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Boat azz) {
-        return BoatRenderer.BOAT_TEXTURE_LOCATIONS[azz.getBoatType().ordinal()];
+    public ResourceLocation getTextureLocation(final Boat bft) {
+        return BoatRenderer.BOAT_TEXTURE_LOCATIONS[bft.getBoatType().ordinal()];
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/CatRenderer.java b/src/net/minecraft/client/renderer/entity/CatRenderer.java
index ffe814a..ddc544d 100644
--- a/src/net/minecraft/client/renderer/entity/CatRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/CatRenderer.java
@@ -1,12 +1,12 @@
 package net.minecraft.client.renderer.entity;
 
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import java.util.Iterator;
 import java.util.List;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import com.mojang.math.Vector3f;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -17,34 +17,34 @@ import net.minecraft.client.model.CatModel;
 import net.minecraft.world.entity.animal.Cat;
 
 public class CatRenderer extends MobRenderer<Cat, CatModel<Cat>> {
-    public CatRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new CatModel(0.0f), 0.4f);
+    public CatRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new CatModel(0.0f), 0.4f);
         this.addLayer(new CatCollarLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Cat ate) {
-        return ate.getResourceLocation();
+    public ResourceLocation getTextureLocation(final Cat aym) {
+        return aym.getResourceLocation();
     }
     
     @Override
-    protected void scale(final Cat ate, final PoseStack cyl, final float float3) {
-        super.scale(ate, cyl, float3);
-        cyl.scale(0.8f, 0.8f, 0.8f);
+    protected void scale(final Cat aym, final PoseStack dhl, final float float3) {
+        super.scale(aym, dhl, float3);
+        dhl.scale(0.8f, 0.8f, 0.8f);
     }
     
     @Override
-    protected void setupRotations(final Cat ate, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        super.setupRotations(ate, cyl, float3, float4, float5);
-        final float float6 = ate.getLieDownAmount(float5);
+    protected void setupRotations(final Cat aym, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        super.setupRotations(aym, dhl, float3, float4, float5);
+        final float float6 = aym.getLieDownAmount(float5);
         if (float6 > 0.0f) {
-            cyl.translate(0.4f * float6, 0.15f * float6, 0.1f * float6);
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(Mth.rotLerp(float6, 0.0f, 90.0f)));
-            final BlockPos fk8 = new BlockPos(ate);
-            final List<Player> list9 = ate.level.<Player>getEntitiesOfClass(Player.class, new AABB(fk8).inflate(2.0, 2.0, 2.0));
-            for (final Player ayj11 : list9) {
-                if (ayj11.isSleeping()) {
-                    cyl.translate(0.15f * float6, 0.0, 0.0);
+            dhl.translate(0.4f * float6, 0.15f * float6, 0.1f * float6);
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(Mth.rotLerp(float6, 0.0f, 90.0f)));
+            final BlockPos fu8 = aym.blockPosition();
+            final List<Player> list9 = aym.level.<Player>getEntitiesOfClass(Player.class, new AABB(fu8).inflate(2.0, 2.0, 2.0));
+            for (final Player bec11 : list9) {
+                if (bec11.isSleeping()) {
+                    dhl.translate(0.15f * float6, 0.0, 0.0);
                     break;
                 }
             }
diff --git a/src/net/minecraft/client/renderer/entity/CaveSpiderRenderer.java b/src/net/minecraft/client/renderer/entity/CaveSpiderRenderer.java
index 8f9d00e..73ae9b1 100644
--- a/src/net/minecraft/client/renderer/entity/CaveSpiderRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/CaveSpiderRenderer.java
@@ -10,17 +10,17 @@ import net.minecraft.world.entity.monster.CaveSpider;
 public class CaveSpiderRenderer extends SpiderRenderer<CaveSpider> {
     private static final ResourceLocation CAVE_SPIDER_LOCATION;
     
-    public CaveSpiderRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public CaveSpiderRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.shadowRadius *= 0.7f;
     }
     
-    protected void scale(final CaveSpider awh, final PoseStack cyl, final float float3) {
-        cyl.scale(0.7f, 0.7f, 0.7f);
+    protected void scale(final CaveSpider bbm, final PoseStack dhl, final float float3) {
+        dhl.scale(0.7f, 0.7f, 0.7f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final CaveSpider awh) {
+    public ResourceLocation getTextureLocation(final CaveSpider bbm) {
         return CaveSpiderRenderer.CAVE_SPIDER_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/ChestedHorseRenderer.java b/src/net/minecraft/client/renderer/entity/ChestedHorseRenderer.java
index ad7dc3a..92ceb22 100644
--- a/src/net/minecraft/client/renderer/entity/ChestedHorseRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ChestedHorseRenderer.java
@@ -13,13 +13,13 @@ import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
 public class ChestedHorseRenderer<T extends AbstractChestedHorse> extends AbstractHorseRenderer<T, ChestedHorseModel<T>> {
     private static final Map<EntityType<?>, ResourceLocation> MAP;
     
-    public ChestedHorseRenderer(final EntityRenderDispatcher dvf, final float float2) {
-        super(dvf, new ChestedHorseModel(0.0f), float2);
+    public ChestedHorseRenderer(final EntityRenderDispatcher egm, final float float2) {
+        super(egm, new ChestedHorseModel(0.0f), float2);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final T aud) {
-        return ChestedHorseRenderer.MAP.get(aud.getType());
+    public ResourceLocation getTextureLocation(final T azl) {
+        return ChestedHorseRenderer.MAP.get(azl.getType());
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/ChickenRenderer.java b/src/net/minecraft/client/renderer/entity/ChickenRenderer.java
index d6d37ff..df37fb5 100644
--- a/src/net/minecraft/client/renderer/entity/ChickenRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ChickenRenderer.java
@@ -10,19 +10,19 @@ import net.minecraft.world.entity.animal.Chicken;
 public class ChickenRenderer extends MobRenderer<Chicken, ChickenModel<Chicken>> {
     private static final ResourceLocation CHICKEN_LOCATION;
     
-    public ChickenRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new ChickenModel(), 0.3f);
+    public ChickenRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new ChickenModel(), 0.3f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Chicken atf) {
+    public ResourceLocation getTextureLocation(final Chicken ayn) {
         return ChickenRenderer.CHICKEN_LOCATION;
     }
     
     @Override
-    protected float getBob(final Chicken atf, final float float2) {
-        final float float3 = Mth.lerp(float2, atf.oFlap, atf.flap);
-        final float float4 = Mth.lerp(float2, atf.oFlapSpeed, atf.flapSpeed);
+    protected float getBob(final Chicken ayn, final float float2) {
+        final float float3 = Mth.lerp(float2, ayn.oFlap, ayn.flap);
+        final float float4 = Mth.lerp(float2, ayn.oFlapSpeed, ayn.flapSpeed);
         return (Mth.sin(float3) + 1.0f) * float4;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/CodRenderer.java b/src/net/minecraft/client/renderer/entity/CodRenderer.java
index a8b25d8..f2ba963 100644
--- a/src/net/minecraft/client/renderer/entity/CodRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/CodRenderer.java
@@ -12,23 +12,23 @@ import net.minecraft.world.entity.animal.Cod;
 public class CodRenderer extends MobRenderer<Cod, CodModel<Cod>> {
     private static final ResourceLocation COD_LOCATION;
     
-    public CodRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new CodModel(), 0.3f);
+    public CodRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new CodModel(), 0.3f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Cod atg) {
+    public ResourceLocation getTextureLocation(final Cod ayo) {
         return CodRenderer.COD_LOCATION;
     }
     
     @Override
-    protected void setupRotations(final Cod atg, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        super.setupRotations(atg, cyl, float3, float4, float5);
+    protected void setupRotations(final Cod ayo, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        super.setupRotations(ayo, dhl, float3, float4, float5);
         final float float6 = 4.3f * Mth.sin(0.6f * float3);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float6));
-        if (!atg.isInWater()) {
-            cyl.translate(0.10000000149011612, 0.10000000149011612, -0.10000000149011612);
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float6));
+        if (!ayo.isInWater()) {
+            dhl.translate(0.10000000149011612, 0.10000000149011612, -0.10000000149011612);
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
         }
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/CowRenderer.java b/src/net/minecraft/client/renderer/entity/CowRenderer.java
index 7f116f1..6c090a9 100644
--- a/src/net/minecraft/client/renderer/entity/CowRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/CowRenderer.java
@@ -8,12 +8,12 @@ import net.minecraft.world.entity.animal.Cow;
 public class CowRenderer extends MobRenderer<Cow, CowModel<Cow>> {
     private static final ResourceLocation COW_LOCATION;
     
-    public CowRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new CowModel(), 0.7f);
+    public CowRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new CowModel(), 0.7f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Cow ath) {
+    public ResourceLocation getTextureLocation(final Cow ayp) {
         return CowRenderer.COW_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/CreeperRenderer.java b/src/net/minecraft/client/renderer/entity/CreeperRenderer.java
index c39eeb3..f343449 100644
--- a/src/net/minecraft/client/renderer/entity/CreeperRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/CreeperRenderer.java
@@ -13,26 +13,26 @@ import net.minecraft.world.entity.monster.Creeper;
 public class CreeperRenderer extends MobRenderer<Creeper, CreeperModel<Creeper>> {
     private static final ResourceLocation CREEPER_LOCATION;
     
-    public CreeperRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new CreeperModel(), 0.5f);
+    public CreeperRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new CreeperModel(), 0.5f);
         this.addLayer(new CreeperPowerLayer(this));
     }
     
     @Override
-    protected void scale(final Creeper awi, final PoseStack cyl, final float float3) {
-        float float4 = awi.getSwelling(float3);
+    protected void scale(final Creeper bbn, final PoseStack dhl, final float float3) {
+        float float4 = bbn.getSwelling(float3);
         final float float5 = 1.0f + Mth.sin(float4 * 100.0f) * float4 * 0.01f;
         float4 = Mth.clamp(float4, 0.0f, 1.0f);
         float4 *= float4;
         float4 *= float4;
         final float float6 = (1.0f + float4 * 0.4f) * float5;
         final float float7 = (1.0f + float4 * 0.1f) / float5;
-        cyl.scale(float6, float7, float6);
+        dhl.scale(float6, float7, float6);
     }
     
     @Override
-    protected float getWhiteOverlayProgress(final Creeper awi, final float float2) {
-        final float float3 = awi.getSwelling(float2);
+    protected float getWhiteOverlayProgress(final Creeper bbn, final float float2) {
+        final float float3 = bbn.getSwelling(float2);
         if ((int)(float3 * 10.0f) % 2 == 0) {
             return 0.0f;
         }
@@ -40,7 +40,7 @@ public class CreeperRenderer extends MobRenderer<Creeper, CreeperModel<Creeper>>
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Creeper awi) {
+    public ResourceLocation getTextureLocation(final Creeper bbn) {
         return CreeperRenderer.CREEPER_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/DolphinRenderer.java b/src/net/minecraft/client/renderer/entity/DolphinRenderer.java
index 5d87668..74b4d06 100644
--- a/src/net/minecraft/client/renderer/entity/DolphinRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/DolphinRenderer.java
@@ -10,13 +10,13 @@ import net.minecraft.world.entity.animal.Dolphin;
 public class DolphinRenderer extends MobRenderer<Dolphin, DolphinModel<Dolphin>> {
     private static final ResourceLocation DOLPHIN_LOCATION;
     
-    public DolphinRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new DolphinModel(), 0.7f);
+    public DolphinRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new DolphinModel(), 0.7f);
         this.addLayer(new DolphinCarryingItemLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Dolphin ati) {
+    public ResourceLocation getTextureLocation(final Dolphin ayq) {
         return DolphinRenderer.DOLPHIN_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/DragonFireballRenderer.java b/src/net/minecraft/client/renderer/entity/DragonFireballRenderer.java
index 2c8c286..ff7a052 100644
--- a/src/net/minecraft/client/renderer/entity/DragonFireballRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/DragonFireballRenderer.java
@@ -8,6 +8,7 @@ import com.mojang.math.Matrix4f;
 import com.mojang.math.Vector3f;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.core.BlockPos;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.projectile.DragonFireball;
@@ -16,39 +17,39 @@ public class DragonFireballRenderer extends EntityRenderer<DragonFireball> {
     private static final ResourceLocation TEXTURE_LOCATION;
     private static final RenderType RENDER_TYPE;
     
-    public DragonFireballRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public DragonFireballRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    protected int getBlockLightLevel(final DragonFireball ayq, final float float2) {
+    protected int getBlockLightLevel(final DragonFireball bej, final BlockPos fu) {
         return 15;
     }
     
     @Override
-    public void render(final DragonFireball ayq, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.scale(2.0f, 2.0f, 2.0f);
-        cyl.mulPose(this.entityRenderDispatcher.cameraOrientation());
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
-        final PoseStack.Pose a8 = cyl.last();
+    public void render(final DragonFireball bej, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        dhl.scale(2.0f, 2.0f, 2.0f);
+        dhl.mulPose(this.entityRenderDispatcher.cameraOrientation());
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
+        final PoseStack.Pose a8 = dhl.last();
         final Matrix4f b9 = a8.pose();
         final Matrix3f a9 = a8.normal();
-        final VertexConsumer cyo11 = dqt.getBuffer(DragonFireballRenderer.RENDER_TYPE);
-        vertex(cyo11, b9, a9, integer, 0.0f, 0, 0, 1);
-        vertex(cyo11, b9, a9, integer, 1.0f, 0, 1, 1);
-        vertex(cyo11, b9, a9, integer, 1.0f, 1, 1, 0);
-        vertex(cyo11, b9, a9, integer, 0.0f, 1, 0, 0);
-        cyl.popPose();
-        super.render(ayq, float2, float3, cyl, dqt, integer);
+        final VertexConsumer dhp11 = ebz.getBuffer(DragonFireballRenderer.RENDER_TYPE);
+        vertex(dhp11, b9, a9, integer, 0.0f, 0, 0, 1);
+        vertex(dhp11, b9, a9, integer, 1.0f, 0, 1, 1);
+        vertex(dhp11, b9, a9, integer, 1.0f, 1, 1, 0);
+        vertex(dhp11, b9, a9, integer, 0.0f, 1, 0, 0);
+        dhl.popPose();
+        super.render(bej, float2, float3, dhl, ebz, integer);
     }
     
-    private static void vertex(final VertexConsumer cyo, final Matrix4f b, final Matrix3f a, final int integer4, final float float5, final int integer6, final int integer7, final int integer8) {
-        cyo.vertex(b, float5 - 0.5f, integer6 - 0.25f, 0.0f).color(255, 255, 255, 255).uv((float)integer7, (float)integer8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer4).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
+    private static void vertex(final VertexConsumer dhp, final Matrix4f b, final Matrix3f a, final int integer4, final float float5, final int integer6, final int integer7, final int integer8) {
+        dhp.vertex(b, float5 - 0.5f, integer6 - 0.25f, 0.0f).color(255, 255, 255, 255).uv((float)integer7, (float)integer8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer4).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final DragonFireball ayq) {
+    public ResourceLocation getTextureLocation(final DragonFireball bej) {
         return DragonFireballRenderer.TEXTURE_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/DrownedRenderer.java b/src/net/minecraft/client/renderer/entity/DrownedRenderer.java
index 67dcc8b..0d6d4c2 100644
--- a/src/net/minecraft/client/renderer/entity/DrownedRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/DrownedRenderer.java
@@ -4,8 +4,8 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.util.Mth;
 import com.mojang.math.Vector3f;
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.renderer.entity.layers.RenderLayer;
 import net.minecraft.world.entity.monster.Zombie;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
 import net.minecraft.client.renderer.entity.layers.DrownedOuterLayer;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.model.DrownedModel;
@@ -14,22 +14,22 @@ import net.minecraft.world.entity.monster.Drowned;
 public class DrownedRenderer extends AbstractZombieRenderer<Drowned, DrownedModel<Drowned>> {
     private static final ResourceLocation DROWNED_LOCATION;
     
-    public DrownedRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new DrownedModel(0.0f, 0.0f, 64, 64), new DrownedModel(0.5f, true), new DrownedModel(1.0f, true));
-        this.addLayer((RenderLayer<Drowned, DrownedModel<Drowned>>)new DrownedOuterLayer((RenderLayerParent<Zombie, DrownedModel<Zombie>>)this));
+    public DrownedRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new DrownedModel(0.0f, 0.0f, 64, 64), new DrownedModel(0.5f, true), new DrownedModel(1.0f, true));
+        this.addLayer((RenderLayer<Drowned, DrownedModel<Drowned>>)new DrownedOuterLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Zombie axp) {
+    public ResourceLocation getTextureLocation(final Zombie bcu) {
         return DrownedRenderer.DROWNED_LOCATION;
     }
     
     @Override
-    protected void setupRotations(final Drowned awk, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        super.setupRotations(awk, cyl, float3, float4, float5);
-        final float float6 = awk.getSwimAmount(float5);
+    protected void setupRotations(final Drowned bbp, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        super.setupRotations(bbp, dhl, float3, float4, float5);
+        final float float6 = bbp.getSwimAmount(float5);
         if (float6 > 0.0f) {
-            cyl.mulPose(Vector3f.XP.rotationDegrees(Mth.lerp(float6, awk.xRot, -10.0f - awk.xRot)));
+            dhl.mulPose(Vector3f.XP.rotationDegrees(Mth.lerp(float6, bbp.xRot, -10.0f - bbp.xRot)));
         }
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/ElderGuardianRenderer.java b/src/net/minecraft/client/renderer/entity/ElderGuardianRenderer.java
index ba9c6ac..764cf1e 100644
--- a/src/net/minecraft/client/renderer/entity/ElderGuardianRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ElderGuardianRenderer.java
@@ -10,17 +10,17 @@ import net.minecraft.resources.ResourceLocation;
 public class ElderGuardianRenderer extends GuardianRenderer {
     public static final ResourceLocation GUARDIAN_ELDER_LOCATION;
     
-    public ElderGuardianRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, 1.2f);
+    public ElderGuardianRenderer(final EntityRenderDispatcher egm) {
+        super(egm, 1.2f);
     }
     
     @Override
-    protected void scale(final Guardian aws, final PoseStack cyl, final float float3) {
-        cyl.scale(ElderGuardian.ELDER_SIZE_SCALE, ElderGuardian.ELDER_SIZE_SCALE, ElderGuardian.ELDER_SIZE_SCALE);
+    protected void scale(final Guardian bbx, final PoseStack dhl, final float float3) {
+        dhl.scale(ElderGuardian.ELDER_SIZE_SCALE, ElderGuardian.ELDER_SIZE_SCALE, ElderGuardian.ELDER_SIZE_SCALE);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Guardian aws) {
+    public ResourceLocation getTextureLocation(final Guardian bbx) {
         return ElderGuardianRenderer.GUARDIAN_ELDER_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/EndCrystalRenderer.java b/src/net/minecraft/client/renderer/entity/EndCrystalRenderer.java
index d84ec4c..0a67587 100644
--- a/src/net/minecraft/client/renderer/entity/EndCrystalRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/EndCrystalRenderer.java
@@ -23,8 +23,8 @@ public class EndCrystalRenderer extends EntityRenderer<EndCrystal> {
     private final ModelPart glass;
     private final ModelPart base;
     
-    public EndCrystalRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public EndCrystalRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.shadowRadius = 0.5f;
         (this.glass = new ModelPart(64, 32, 0, 0)).addBox(-4.0f, -4.0f, -4.0f, 8.0f, 8.0f, 8.0f);
         (this.cube = new ModelPart(64, 32, 32, 0)).addBox(-4.0f, -4.0f, -4.0f, 8.0f, 8.0f, 8.0f);
@@ -32,62 +32,62 @@ public class EndCrystalRenderer extends EntityRenderer<EndCrystal> {
     }
     
     @Override
-    public void render(final EndCrystal aur, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        final float float4 = getY(aur, float3);
-        final float float5 = (aur.time + float3) * 3.0f;
-        final VertexConsumer cyo10 = dqt.getBuffer(EndCrystalRenderer.RENDER_TYPE);
-        cyl.pushPose();
-        cyl.scale(2.0f, 2.0f, 2.0f);
-        cyl.translate(0.0, -0.5, 0.0);
+    public void render(final EndCrystal bab, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        final float float4 = getY(bab, float3);
+        final float float5 = (bab.time + float3) * 3.0f;
+        final VertexConsumer dhp10 = ebz.getBuffer(EndCrystalRenderer.RENDER_TYPE);
+        dhl.pushPose();
+        dhl.scale(2.0f, 2.0f, 2.0f);
+        dhl.translate(0.0, -0.5, 0.0);
         final int integer2 = OverlayTexture.NO_OVERLAY;
-        if (aur.showsBottom()) {
-            this.base.render(cyl, cyo10, integer, integer2);
+        if (bab.showsBottom()) {
+            this.base.render(dhl, dhp10, integer, integer2);
         }
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float5));
-        cyl.translate(0.0, 1.5f + float4 / 2.0f, 0.0);
-        cyl.mulPose(new Quaternion(new Vector3f(EndCrystalRenderer.SIN_45, 0.0f, EndCrystalRenderer.SIN_45), 60.0f, true));
-        this.glass.render(cyl, cyo10, integer, integer2);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float5));
+        dhl.translate(0.0, 1.5f + float4 / 2.0f, 0.0);
+        dhl.mulPose(new Quaternion(new Vector3f(EndCrystalRenderer.SIN_45, 0.0f, EndCrystalRenderer.SIN_45), 60.0f, true));
+        this.glass.render(dhl, dhp10, integer, integer2);
         final float float6 = 0.875f;
-        cyl.scale(0.875f, 0.875f, 0.875f);
-        cyl.mulPose(new Quaternion(new Vector3f(EndCrystalRenderer.SIN_45, 0.0f, EndCrystalRenderer.SIN_45), 60.0f, true));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float5));
-        this.glass.render(cyl, cyo10, integer, integer2);
-        cyl.scale(0.875f, 0.875f, 0.875f);
-        cyl.mulPose(new Quaternion(new Vector3f(EndCrystalRenderer.SIN_45, 0.0f, EndCrystalRenderer.SIN_45), 60.0f, true));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float5));
-        this.cube.render(cyl, cyo10, integer, integer2);
-        cyl.popPose();
-        cyl.popPose();
-        final BlockPos fk13 = aur.getBeamTarget();
-        if (fk13 != null) {
-            final float float7 = fk13.getX() + 0.5f;
-            final float float8 = fk13.getY() + 0.5f;
-            final float float9 = fk13.getZ() + 0.5f;
-            final float float10 = (float)(float7 - aur.getX());
-            final float float11 = (float)(float8 - aur.getY());
-            final float float12 = (float)(float9 - aur.getZ());
-            cyl.translate(float10, float11, float12);
-            EnderDragonRenderer.renderCrystalBeams(-float10, -float11 + float4, -float12, float3, aur.time, cyl, dqt, integer);
+        dhl.scale(0.875f, 0.875f, 0.875f);
+        dhl.mulPose(new Quaternion(new Vector3f(EndCrystalRenderer.SIN_45, 0.0f, EndCrystalRenderer.SIN_45), 60.0f, true));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float5));
+        this.glass.render(dhl, dhp10, integer, integer2);
+        dhl.scale(0.875f, 0.875f, 0.875f);
+        dhl.mulPose(new Quaternion(new Vector3f(EndCrystalRenderer.SIN_45, 0.0f, EndCrystalRenderer.SIN_45), 60.0f, true));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float5));
+        this.cube.render(dhl, dhp10, integer, integer2);
+        dhl.popPose();
+        dhl.popPose();
+        final BlockPos fu13 = bab.getBeamTarget();
+        if (fu13 != null) {
+            final float float7 = fu13.getX() + 0.5f;
+            final float float8 = fu13.getY() + 0.5f;
+            final float float9 = fu13.getZ() + 0.5f;
+            final float float10 = (float)(float7 - bab.getX());
+            final float float11 = (float)(float8 - bab.getY());
+            final float float12 = (float)(float9 - bab.getZ());
+            dhl.translate(float10, float11, float12);
+            EnderDragonRenderer.renderCrystalBeams(-float10, -float11 + float4, -float12, float3, bab.time, dhl, ebz, integer);
         }
-        super.render(aur, float2, float3, cyl, dqt, integer);
+        super.render(bab, float2, float3, dhl, ebz, integer);
     }
     
-    public static float getY(final EndCrystal aur, final float float2) {
-        final float float3 = aur.time + float2;
+    public static float getY(final EndCrystal bab, final float float2) {
+        final float float3 = bab.time + float2;
         float float4 = Mth.sin(float3 * 0.2f) / 2.0f + 0.5f;
         float4 = (float4 * float4 + float4) * 0.4f;
         return float4 - 1.4f;
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final EndCrystal aur) {
+    public ResourceLocation getTextureLocation(final EndCrystal bab) {
         return EndCrystalRenderer.END_CRYSTAL_LOCATION;
     }
     
     @Override
-    public boolean shouldRender(final EndCrystal aur, final Frustum dtm, final double double3, final double double4, final double double5) {
-        return super.shouldRender(aur, dtm, double3, double4, double5) || aur.getBeamTarget() != null;
+    public boolean shouldRender(final EndCrystal bab, final Frustum ees, final double double3, final double double4, final double double5) {
+        return super.shouldRender(bab, ees, double3, double4, double5) || bab.getBeamTarget() != null;
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/EnderDragonRenderer.java b/src/net/minecraft/client/renderer/entity/EnderDragonRenderer.java
index 8c26699..f1caf19 100644
--- a/src/net/minecraft/client/renderer/entity/EnderDragonRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/EnderDragonRenderer.java
@@ -30,133 +30,130 @@ public class EnderDragonRenderer extends EntityRenderer<EnderDragon> {
     private static final float HALF_SQRT_3;
     private final DragonModel model;
     
-    public EnderDragonRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public EnderDragonRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.model = new DragonModel();
         this.shadowRadius = 0.5f;
     }
     
     @Override
-    public void render(final EnderDragon aus, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        final float float4 = (float)aus.getLatencyPos(7, float3)[0];
-        final float float5 = (float)(aus.getLatencyPos(5, float3)[1] - aus.getLatencyPos(10, float3)[1]);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(-float4));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(float5 * 10.0f));
-        cyl.translate(0.0, 0.0, 1.0);
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        cyl.translate(0.0, -1.5010000467300415, 0.0);
-        final boolean boolean10 = aus.hurtTime > 0;
-        this.model.prepareMobModel(aus, 0.0f, 0.0f, float3);
-        if (aus.dragonDeathTime > 0) {
-            final float float6 = aus.dragonDeathTime / 200.0f;
-            final VertexConsumer cyo12 = dqt.getBuffer(RenderType.entityAlpha(EnderDragonRenderer.DRAGON_EXPLODING_LOCATION, float6));
-            this.model.renderToBuffer(cyl, cyo12, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-            final VertexConsumer cyo13 = dqt.getBuffer(EnderDragonRenderer.DECAL);
-            this.model.renderToBuffer(cyl, cyo13, integer, OverlayTexture.pack(0.0f, boolean10), 1.0f, 1.0f, 1.0f, 1.0f);
+    public void render(final EnderDragon bac, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        final float float4 = (float)bac.getLatencyPos(7, float3)[0];
+        final float float5 = (float)(bac.getLatencyPos(5, float3)[1] - bac.getLatencyPos(10, float3)[1]);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(-float4));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(float5 * 10.0f));
+        dhl.translate(0.0, 0.0, 1.0);
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        dhl.translate(0.0, -1.5010000467300415, 0.0);
+        final boolean boolean10 = bac.hurtTime > 0;
+        this.model.prepareMobModel(bac, 0.0f, 0.0f, float3);
+        if (bac.dragonDeathTime > 0) {
+            final float float6 = bac.dragonDeathTime / 200.0f;
+            final VertexConsumer dhp12 = ebz.getBuffer(RenderType.dragonExplosionAlpha(EnderDragonRenderer.DRAGON_EXPLODING_LOCATION, float6));
+            this.model.renderToBuffer(dhl, dhp12, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+            final VertexConsumer dhp13 = ebz.getBuffer(EnderDragonRenderer.DECAL);
+            this.model.renderToBuffer(dhl, dhp13, integer, OverlayTexture.pack(0.0f, boolean10), 1.0f, 1.0f, 1.0f, 1.0f);
         }
         else {
-            final VertexConsumer cyo14 = dqt.getBuffer(EnderDragonRenderer.RENDER_TYPE);
-            this.model.renderToBuffer(cyl, cyo14, integer, OverlayTexture.pack(0.0f, boolean10), 1.0f, 1.0f, 1.0f, 1.0f);
+            final VertexConsumer dhp14 = ebz.getBuffer(EnderDragonRenderer.RENDER_TYPE);
+            this.model.renderToBuffer(dhl, dhp14, integer, OverlayTexture.pack(0.0f, boolean10), 1.0f, 1.0f, 1.0f, 1.0f);
         }
-        final VertexConsumer cyo14 = dqt.getBuffer(EnderDragonRenderer.EYES);
-        this.model.renderToBuffer(cyl, cyo14, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        if (aus.dragonDeathTime > 0) {
-            final float float7 = (aus.dragonDeathTime + float3) / 200.0f;
-            float float8 = 0.0f;
-            if (float7 > 0.8f) {
-                float8 = (float7 - 0.8f) / 0.2f;
-            }
+        final VertexConsumer dhp14 = ebz.getBuffer(EnderDragonRenderer.EYES);
+        this.model.renderToBuffer(dhl, dhp14, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        if (bac.dragonDeathTime > 0) {
+            final float float7 = (bac.dragonDeathTime + float3) / 200.0f;
+            final float float8 = Math.min((float7 > 0.8f) ? ((float7 - 0.8f) / 0.2f) : 0.0f, 1.0f);
             final Random random14 = new Random(432L);
-            final VertexConsumer cyo15 = dqt.getBuffer(RenderType.lightning());
-            cyl.pushPose();
-            cyl.translate(0.0, -1.0, -2.0);
+            final VertexConsumer dhp15 = ebz.getBuffer(RenderType.lightning());
+            dhl.pushPose();
+            dhl.translate(0.0, -1.0, -2.0);
             for (int integer2 = 0; integer2 < (float7 + float7 * float7) / 2.0f * 60.0f; ++integer2) {
-                cyl.mulPose(Vector3f.XP.rotationDegrees(random14.nextFloat() * 360.0f));
-                cyl.mulPose(Vector3f.YP.rotationDegrees(random14.nextFloat() * 360.0f));
-                cyl.mulPose(Vector3f.ZP.rotationDegrees(random14.nextFloat() * 360.0f));
-                cyl.mulPose(Vector3f.XP.rotationDegrees(random14.nextFloat() * 360.0f));
-                cyl.mulPose(Vector3f.YP.rotationDegrees(random14.nextFloat() * 360.0f));
-                cyl.mulPose(Vector3f.ZP.rotationDegrees(random14.nextFloat() * 360.0f + float7 * 90.0f));
+                dhl.mulPose(Vector3f.XP.rotationDegrees(random14.nextFloat() * 360.0f));
+                dhl.mulPose(Vector3f.YP.rotationDegrees(random14.nextFloat() * 360.0f));
+                dhl.mulPose(Vector3f.ZP.rotationDegrees(random14.nextFloat() * 360.0f));
+                dhl.mulPose(Vector3f.XP.rotationDegrees(random14.nextFloat() * 360.0f));
+                dhl.mulPose(Vector3f.YP.rotationDegrees(random14.nextFloat() * 360.0f));
+                dhl.mulPose(Vector3f.ZP.rotationDegrees(random14.nextFloat() * 360.0f + float7 * 90.0f));
                 final float float9 = random14.nextFloat() * 20.0f + 5.0f + float8 * 10.0f;
                 final float float10 = random14.nextFloat() * 2.0f + 1.0f + float8 * 2.0f;
-                final Matrix4f b19 = cyl.last().pose();
+                final Matrix4f b19 = dhl.last().pose();
                 final int integer3 = (int)(255.0f * (1.0f - float8));
-                vertex01(cyo15, b19, integer3);
-                vertex2(cyo15, b19, float9, float10);
-                vertex3(cyo15, b19, float9, float10);
-                vertex01(cyo15, b19, integer3);
-                vertex3(cyo15, b19, float9, float10);
-                vertex4(cyo15, b19, float9, float10);
-                vertex01(cyo15, b19, integer3);
-                vertex4(cyo15, b19, float9, float10);
-                vertex2(cyo15, b19, float9, float10);
+                vertex01(dhp15, b19, integer3);
+                vertex2(dhp15, b19, float9, float10);
+                vertex3(dhp15, b19, float9, float10);
+                vertex01(dhp15, b19, integer3);
+                vertex3(dhp15, b19, float9, float10);
+                vertex4(dhp15, b19, float9, float10);
+                vertex01(dhp15, b19, integer3);
+                vertex4(dhp15, b19, float9, float10);
+                vertex2(dhp15, b19, float9, float10);
             }
-            cyl.popPose();
+            dhl.popPose();
         }
-        cyl.popPose();
-        if (aus.nearestCrystal != null) {
-            cyl.pushPose();
-            final float float7 = (float)(aus.nearestCrystal.getX() - Mth.lerp(float3, aus.xo, aus.getX()));
-            final float float8 = (float)(aus.nearestCrystal.getY() - Mth.lerp(float3, aus.yo, aus.getY()));
-            final float float11 = (float)(aus.nearestCrystal.getZ() - Mth.lerp(float3, aus.zo, aus.getZ()));
-            renderCrystalBeams(float7, float8 + EndCrystalRenderer.getY(aus.nearestCrystal, float3), float11, float3, aus.tickCount, cyl, dqt, integer);
-            cyl.popPose();
+        dhl.popPose();
+        if (bac.nearestCrystal != null) {
+            dhl.pushPose();
+            final float float7 = (float)(bac.nearestCrystal.getX() - Mth.lerp(float3, bac.xo, bac.getX()));
+            final float float8 = (float)(bac.nearestCrystal.getY() - Mth.lerp(float3, bac.yo, bac.getY()));
+            final float float11 = (float)(bac.nearestCrystal.getZ() - Mth.lerp(float3, bac.zo, bac.getZ()));
+            renderCrystalBeams(float7, float8 + EndCrystalRenderer.getY(bac.nearestCrystal, float3), float11, float3, bac.tickCount, dhl, ebz, integer);
+            dhl.popPose();
         }
-        super.render(aus, float2, float3, cyl, dqt, integer);
+        super.render(bac, float2, float3, dhl, ebz, integer);
     }
     
-    private static void vertex01(final VertexConsumer cyo, final Matrix4f b, final int integer) {
-        cyo.vertex(b, 0.0f, 0.0f, 0.0f).color(255, 255, 255, integer).endVertex();
-        cyo.vertex(b, 0.0f, 0.0f, 0.0f).color(255, 255, 255, integer).endVertex();
+    private static void vertex01(final VertexConsumer dhp, final Matrix4f b, final int integer) {
+        dhp.vertex(b, 0.0f, 0.0f, 0.0f).color(255, 255, 255, integer).endVertex();
+        dhp.vertex(b, 0.0f, 0.0f, 0.0f).color(255, 255, 255, integer).endVertex();
     }
     
-    private static void vertex2(final VertexConsumer cyo, final Matrix4f b, final float float3, final float float4) {
-        cyo.vertex(b, -EnderDragonRenderer.HALF_SQRT_3 * float4, float3, -0.5f * float4).color(255, 0, 255, 0).endVertex();
+    private static void vertex2(final VertexConsumer dhp, final Matrix4f b, final float float3, final float float4) {
+        dhp.vertex(b, -EnderDragonRenderer.HALF_SQRT_3 * float4, float3, -0.5f * float4).color(255, 0, 255, 0).endVertex();
     }
     
-    private static void vertex3(final VertexConsumer cyo, final Matrix4f b, final float float3, final float float4) {
-        cyo.vertex(b, EnderDragonRenderer.HALF_SQRT_3 * float4, float3, -0.5f * float4).color(255, 0, 255, 0).endVertex();
+    private static void vertex3(final VertexConsumer dhp, final Matrix4f b, final float float3, final float float4) {
+        dhp.vertex(b, EnderDragonRenderer.HALF_SQRT_3 * float4, float3, -0.5f * float4).color(255, 0, 255, 0).endVertex();
     }
     
-    private static void vertex4(final VertexConsumer cyo, final Matrix4f b, final float float3, final float float4) {
-        cyo.vertex(b, 0.0f, float3, 1.0f * float4).color(255, 0, 255, 0).endVertex();
+    private static void vertex4(final VertexConsumer dhp, final Matrix4f b, final float float3, final float float4) {
+        dhp.vertex(b, 0.0f, float3, 1.0f * float4).color(255, 0, 255, 0).endVertex();
     }
     
-    public static void renderCrystalBeams(final float float1, final float float2, final float float3, final float float4, final int integer5, final PoseStack cyl, final MultiBufferSource dqt, final int integer8) {
+    public static void renderCrystalBeams(final float float1, final float float2, final float float3, final float float4, final int integer5, final PoseStack dhl, final MultiBufferSource ebz, final int integer8) {
         final float float5 = Mth.sqrt(float1 * float1 + float3 * float3);
         final float float6 = Mth.sqrt(float1 * float1 + float2 * float2 + float3 * float3);
-        cyl.pushPose();
-        cyl.translate(0.0, 2.0, 0.0);
-        cyl.mulPose(Vector3f.YP.rotation((float)(-Math.atan2(float3, float1)) - 1.5707964f));
-        cyl.mulPose(Vector3f.XP.rotation((float)(-Math.atan2(float5, float2)) - 1.5707964f));
-        final VertexConsumer cyo11 = dqt.getBuffer(EnderDragonRenderer.BEAM);
+        dhl.pushPose();
+        dhl.translate(0.0, 2.0, 0.0);
+        dhl.mulPose(Vector3f.YP.rotation((float)(-Math.atan2(float3, float1)) - 1.5707964f));
+        dhl.mulPose(Vector3f.XP.rotation((float)(-Math.atan2(float5, float2)) - 1.5707964f));
+        final VertexConsumer dhp11 = ebz.getBuffer(EnderDragonRenderer.BEAM);
         final float float7 = 0.0f - (integer5 + float4) * 0.01f;
         final float float8 = Mth.sqrt(float1 * float1 + float2 * float2 + float3 * float3) / 32.0f - (integer5 + float4) * 0.01f;
         final int integer9 = 8;
         float float9 = 0.0f;
         float float10 = 0.75f;
         float float11 = 0.0f;
-        final PoseStack.Pose a18 = cyl.last();
+        final PoseStack.Pose a18 = dhl.last();
         final Matrix4f b19 = a18.pose();
         final Matrix3f a19 = a18.normal();
         for (int integer10 = 1; integer10 <= 8; ++integer10) {
             final float float12 = Mth.sin(integer10 * 6.2831855f / 8.0f) * 0.75f;
             final float float13 = Mth.cos(integer10 * 6.2831855f / 8.0f) * 0.75f;
             final float float14 = integer10 / 8.0f;
-            cyo11.vertex(b19, float9 * 0.2f, float10 * 0.2f, 0.0f).color(0, 0, 0, 255).uv(float11, float7).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer8).normal(a19, 0.0f, -1.0f, 0.0f).endVertex();
-            cyo11.vertex(b19, float9, float10, float6).color(255, 255, 255, 255).uv(float11, float8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer8).normal(a19, 0.0f, -1.0f, 0.0f).endVertex();
-            cyo11.vertex(b19, float12, float13, float6).color(255, 255, 255, 255).uv(float14, float8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer8).normal(a19, 0.0f, -1.0f, 0.0f).endVertex();
-            cyo11.vertex(b19, float12 * 0.2f, float13 * 0.2f, 0.0f).color(0, 0, 0, 255).uv(float14, float7).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer8).normal(a19, 0.0f, -1.0f, 0.0f).endVertex();
+            dhp11.vertex(b19, float9 * 0.2f, float10 * 0.2f, 0.0f).color(0, 0, 0, 255).uv(float11, float7).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer8).normal(a19, 0.0f, -1.0f, 0.0f).endVertex();
+            dhp11.vertex(b19, float9, float10, float6).color(255, 255, 255, 255).uv(float11, float8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer8).normal(a19, 0.0f, -1.0f, 0.0f).endVertex();
+            dhp11.vertex(b19, float12, float13, float6).color(255, 255, 255, 255).uv(float14, float8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer8).normal(a19, 0.0f, -1.0f, 0.0f).endVertex();
+            dhp11.vertex(b19, float12 * 0.2f, float13 * 0.2f, 0.0f).color(0, 0, 0, 255).uv(float14, float7).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer8).normal(a19, 0.0f, -1.0f, 0.0f).endVertex();
             float9 = float12;
             float10 = float13;
             float11 = float14;
         }
-        cyl.popPose();
+        dhl.popPose();
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final EnderDragon aus) {
+    public ResourceLocation getTextureLocation(final EnderDragon bac) {
         return EnderDragonRenderer.DRAGON_LOCATION;
     }
     
@@ -272,24 +269,24 @@ public class EnderDragonRenderer extends EntityRenderer<EnderDragon> {
         }
         
         @Override
-        public void prepareMobModel(final EnderDragon aus, final float float2, final float float3, final float float4) {
-            this.entity = aus;
+        public void prepareMobModel(final EnderDragon bac, final float float2, final float float3, final float float4) {
+            this.entity = bac;
             this.a = float4;
         }
         
         @Override
-        public void setupAnim(final EnderDragon aus, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        public void setupAnim(final EnderDragon bac, final float float2, final float float3, final float float4, final float float5, final float float6) {
         }
         
         @Override
-        public void renderToBuffer(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
-            cyl.pushPose();
+        public void renderToBuffer(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final float float6, final float float7, final float float8) {
+            dhl.pushPose();
             final float float9 = Mth.lerp(this.a, this.entity.oFlapTime, this.entity.flapTime);
             this.jaw.xRot = (float)(Math.sin(float9 * 6.2831855f) + 1.0) * 0.2f;
             float float10 = (float)(Math.sin(float9 * 6.2831855f - 1.0f) + 1.0);
             float10 = (float10 * float10 + float10 * 2.0f) * 0.05f;
-            cyl.translate(0.0, float10 - 2.0f, -3.0);
-            cyl.mulPose(Vector3f.XP.rotationDegrees(float10 * 2.0f));
+            dhl.translate(0.0, float10 - 2.0f, -3.0);
+            dhl.mulPose(Vector3f.XP.rotationDegrees(float10 * 2.0f));
             float float11 = 0.0f;
             float float12 = 20.0f;
             float float13 = -12.0f;
@@ -310,7 +307,7 @@ public class EnderDragonRenderer extends EntityRenderer<EnderDragon> {
                 float12 += (float)(Math.sin(this.neck.xRot) * 10.0);
                 float13 -= (float)(Math.cos(this.neck.yRot) * Math.cos(this.neck.xRot) * 10.0);
                 float11 -= (float)(Math.sin(this.neck.yRot) * Math.cos(this.neck.xRot) * 10.0);
-                this.neck.render(cyl, cyo, integer3, integer4);
+                this.neck.render(dhl, dhp, integer3, integer4);
             }
             this.head.y = float12;
             this.head.z = float13;
@@ -319,13 +316,13 @@ public class EnderDragonRenderer extends EntityRenderer<EnderDragon> {
             this.head.yRot = Mth.rotWrap(arr18[0] - arr16[0]) * 0.017453292f;
             this.head.xRot = Mth.rotWrap(this.entity.getHeadPartYOffset(6, arr16, arr18)) * 0.017453292f * 1.5f * 5.0f;
             this.head.zRot = -Mth.rotWrap(arr18[0] - float16) * 0.017453292f;
-            this.head.render(cyl, cyo, integer3, integer4);
-            cyl.pushPose();
-            cyl.translate(0.0, 1.0, 0.0);
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(-float15 * 1.5f));
-            cyl.translate(0.0, -1.0, 0.0);
+            this.head.render(dhl, dhp, integer3, integer4);
+            dhl.pushPose();
+            dhl.translate(0.0, 1.0, 0.0);
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(-float15 * 1.5f));
+            dhl.translate(0.0, -1.0, 0.0);
             this.body.zRot = 0.0f;
-            this.body.render(cyl, cyo, integer3, integer4);
+            this.body.render(dhl, dhp, integer3, integer4);
             final float float19 = float9 * 6.2831855f;
             this.leftWing.xRot = 0.125f - (float)Math.cos(float19) * 0.2f;
             this.leftWing.yRot = -0.25f;
@@ -335,9 +332,9 @@ public class EnderDragonRenderer extends EntityRenderer<EnderDragon> {
             this.rightWing.yRot = -this.leftWing.yRot;
             this.rightWing.zRot = -this.leftWing.zRot;
             this.rightWingTip.zRot = -this.leftWingTip.zRot;
-            this.renderSide(cyl, cyo, integer3, integer4, float10, this.leftWing, this.leftFrontLeg, this.leftFrontLegTip, this.leftFrontFoot, this.leftRearLeg, this.leftRearLegTip, this.leftRearFoot);
-            this.renderSide(cyl, cyo, integer3, integer4, float10, this.rightWing, this.rightFrontLeg, this.rightFrontLegTip, this.rightFrontFoot, this.rightRearLeg, this.rightRearLegTip, this.rightRearFoot);
-            cyl.popPose();
+            this.renderSide(dhl, dhp, integer3, integer4, float10, this.leftWing, this.leftFrontLeg, this.leftFrontLegTip, this.leftFrontFoot, this.leftRearLeg, this.leftRearLegTip, this.leftRearFoot);
+            this.renderSide(dhl, dhp, integer3, integer4, float10, this.rightWing, this.rightFrontLeg, this.rightFrontLegTip, this.rightFrontFoot, this.rightRearLeg, this.rightRearLegTip, this.rightRearFoot);
+            dhl.popPose();
             float float18 = -(float)Math.sin(float9 * 6.2831855f) * 0.0f;
             float17 = float9 * 6.2831855f;
             float12 = 10.0f;
@@ -356,21 +353,21 @@ public class EnderDragonRenderer extends EntityRenderer<EnderDragon> {
                 float12 += (float)(Math.sin(this.neck.xRot) * 10.0);
                 float13 -= (float)(Math.cos(this.neck.yRot) * Math.cos(this.neck.xRot) * 10.0);
                 float11 -= (float)(Math.sin(this.neck.yRot) * Math.cos(this.neck.xRot) * 10.0);
-                this.neck.render(cyl, cyo, integer3, integer4);
+                this.neck.render(dhl, dhp, integer3, integer4);
             }
-            cyl.popPose();
+            dhl.popPose();
         }
         
-        private void renderSide(final PoseStack cyl, final VertexConsumer cyo, final int integer3, final int integer4, final float float5, final ModelPart dni6, final ModelPart dni7, final ModelPart dni8, final ModelPart dni9, final ModelPart dni10, final ModelPart dni11, final ModelPart dni12) {
-            dni10.xRot = 1.0f + float5 * 0.1f;
-            dni11.xRot = 0.5f + float5 * 0.1f;
-            dni12.xRot = 0.75f + float5 * 0.1f;
-            dni7.xRot = 1.3f + float5 * 0.1f;
-            dni8.xRot = -0.5f - float5 * 0.1f;
-            dni9.xRot = 0.75f + float5 * 0.1f;
-            dni6.render(cyl, cyo, integer3, integer4);
-            dni7.render(cyl, cyo, integer3, integer4);
-            dni10.render(cyl, cyo, integer3, integer4);
+        private void renderSide(final PoseStack dhl, final VertexConsumer dhp, final int integer3, final int integer4, final float float5, final ModelPart dyg6, final ModelPart dyg7, final ModelPart dyg8, final ModelPart dyg9, final ModelPart dyg10, final ModelPart dyg11, final ModelPart dyg12) {
+            dyg10.xRot = 1.0f + float5 * 0.1f;
+            dyg11.xRot = 0.5f + float5 * 0.1f;
+            dyg12.xRot = 0.75f + float5 * 0.1f;
+            dyg7.xRot = 1.3f + float5 * 0.1f;
+            dyg8.xRot = -0.5f - float5 * 0.1f;
+            dyg9.xRot = 0.75f + float5 * 0.1f;
+            dyg6.render(dhl, dhp, integer3, integer4);
+            dyg7.render(dhl, dhp, integer3, integer4);
+            dyg10.render(dhl, dhp, integer3, integer4);
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/EndermanRenderer.java b/src/net/minecraft/client/renderer/entity/EndermanRenderer.java
index 357dd4e..9f30060 100644
--- a/src/net/minecraft/client/renderer/entity/EndermanRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/EndermanRenderer.java
@@ -19,32 +19,32 @@ public class EndermanRenderer extends MobRenderer<EnderMan, EndermanModel<EnderM
     private static final ResourceLocation ENDERMAN_LOCATION;
     private final Random random;
     
-    public EndermanRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new EndermanModel(0.0f), 0.5f);
+    public EndermanRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new EndermanModel(0.0f), 0.5f);
         this.random = new Random();
         this.addLayer((RenderLayer<EnderMan, EndermanModel<EnderMan>>)new EnderEyesLayer((RenderLayerParent<LivingEntity, EndermanModel<LivingEntity>>)this));
         this.addLayer(new CarriedBlockLayer(this));
     }
     
     @Override
-    public void render(final EnderMan awm, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final BlockState byj8 = awm.getCarriedBlock();
-        final EndermanModel<EnderMan> dky9 = ((LivingEntityRenderer<T, EndermanModel<EnderMan>>)this).getModel();
-        dky9.carrying = (byj8 != null);
-        dky9.creepy = awm.isCreepy();
-        super.render(awm, float2, float3, cyl, dqt, integer);
+    public void render(final EnderMan bbr, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final BlockState cfj8 = bbr.getCarriedBlock();
+        final EndermanModel<EnderMan> dvt9 = ((LivingEntityRenderer<T, EndermanModel<EnderMan>>)this).getModel();
+        dvt9.carrying = (cfj8 != null);
+        dvt9.creepy = bbr.isCreepy();
+        super.render(bbr, float2, float3, dhl, ebz, integer);
     }
     
-    public Vec3 getRenderOffset(final EnderMan awm, final float float2) {
-        if (awm.isCreepy()) {
+    public Vec3 getRenderOffset(final EnderMan bbr, final float float2) {
+        if (bbr.isCreepy()) {
             final double double4 = 0.02;
             return new Vec3(this.random.nextGaussian() * 0.02, 0.0, this.random.nextGaussian() * 0.02);
         }
-        return super.getRenderOffset((T)awm, float2);
+        return super.getRenderOffset((T)bbr, float2);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final EnderMan awm) {
+    public ResourceLocation getTextureLocation(final EnderMan bbr) {
         return EndermanRenderer.ENDERMAN_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/EndermiteRenderer.java b/src/net/minecraft/client/renderer/entity/EndermiteRenderer.java
index e11daa0..4442ad0 100644
--- a/src/net/minecraft/client/renderer/entity/EndermiteRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/EndermiteRenderer.java
@@ -9,17 +9,17 @@ import net.minecraft.world.entity.monster.Endermite;
 public class EndermiteRenderer extends MobRenderer<Endermite, EndermiteModel<Endermite>> {
     private static final ResourceLocation ENDERMITE_LOCATION;
     
-    public EndermiteRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new EndermiteModel(), 0.3f);
+    public EndermiteRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new EndermiteModel(), 0.3f);
     }
     
     @Override
-    protected float getFlipDegrees(final Endermite awn) {
+    protected float getFlipDegrees(final Endermite bbs) {
         return 180.0f;
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Endermite awn) {
+    public ResourceLocation getTextureLocation(final Endermite bbs) {
         return EndermiteRenderer.ENDERMITE_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/EntityRenderDispatcher.java b/src/net/minecraft/client/renderer/entity/EntityRenderDispatcher.java
index a93558b..23fa95a 100644
--- a/src/net/minecraft/client/renderer/entity/EntityRenderDispatcher.java
+++ b/src/net/minecraft/client/renderer/entity/EntityRenderDispatcher.java
@@ -33,10 +33,12 @@ import net.minecraft.client.player.AbstractClientPlayer;
 import java.util.Iterator;
 import net.minecraft.core.Registry;
 import com.google.common.collect.Maps;
+import net.minecraft.world.entity.monster.Strider;
 import net.minecraft.world.entity.monster.ZombieVillager;
-import net.minecraft.world.entity.monster.PigZombie;
+import net.minecraft.world.entity.monster.ZombifiedPiglin;
 import net.minecraft.world.entity.monster.Zombie;
 import net.minecraft.world.entity.animal.horse.ZombieHorse;
+import net.minecraft.world.entity.monster.Zoglin;
 import net.minecraft.world.entity.animal.Wolf;
 import net.minecraft.world.entity.projectile.WitherSkull;
 import net.minecraft.world.entity.monster.WitherSkeleton;
@@ -74,6 +76,7 @@ import net.minecraft.world.entity.animal.Pufferfish;
 import net.minecraft.world.entity.projectile.ThrownPotion;
 import net.minecraft.world.entity.animal.PolarBear;
 import net.minecraft.world.entity.monster.Pillager;
+import net.minecraft.world.entity.monster.piglin.Piglin;
 import net.minecraft.world.entity.animal.Pig;
 import net.minecraft.world.entity.monster.Phantom;
 import net.minecraft.world.entity.animal.Parrot;
@@ -86,21 +89,22 @@ import net.minecraft.world.entity.vehicle.Minecart;
 import net.minecraft.world.entity.monster.MagmaCube;
 import net.minecraft.world.entity.projectile.LlamaSpit;
 import net.minecraft.world.entity.animal.horse.Llama;
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.world.entity.LightningBolt;
 import net.minecraft.world.entity.decoration.LeashFenceKnotEntity;
-import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.decoration.ItemFrame;
+import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.monster.Illusioner;
 import net.minecraft.world.entity.monster.Husk;
 import net.minecraft.world.entity.animal.horse.Horse;
 import net.minecraft.world.entity.vehicle.MinecartHopper;
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
 import net.minecraft.world.entity.monster.Guardian;
 import net.minecraft.world.entity.monster.Giant;
 import net.minecraft.world.entity.monster.Ghast;
 import net.minecraft.world.entity.vehicle.MinecartFurnace;
 import net.minecraft.world.entity.animal.Fox;
-import net.minecraft.world.entity.fishing.FishingHook;
+import net.minecraft.world.entity.projectile.FishingHook;
 import net.minecraft.world.entity.projectile.FireworkRocketEntity;
 import net.minecraft.world.entity.projectile.LargeFireball;
 import net.minecraft.world.entity.item.FallingBlockEntity;
@@ -163,15 +167,15 @@ public class EntityRenderDispatcher {
     private boolean shouldRenderShadow;
     private boolean renderHitBoxes;
     
-    public <E extends Entity> int getPackedLightCoords(final E akq, final float float2) {
-        return this.<E>getRenderer(akq).getPackedLightCoords(akq, float2);
+    public <E extends Entity> int getPackedLightCoords(final E aom, final float float2) {
+        return this.<E>getRenderer(aom).getPackedLightCoords(aom, float2);
     }
     
-    private <T extends Entity> void register(final EntityType<T> aku, final EntityRenderer<? super T> dvg) {
-        this.renderers.put(aku, dvg);
+    private <T extends Entity> void register(final EntityType<T> aoq, final EntityRenderer<? super T> egn) {
+        this.renderers.put(aoq, egn);
     }
     
-    private void registerRenderers(final ItemRenderer dvz, final ReloadableResourceManager yz) {
+    private void registerRenderers(final ItemRenderer ehh, final ReloadableResourceManager aba) {
         this.<AreaEffectCloud>register(EntityType.AREA_EFFECT_CLOUD, new AreaEffectCloudRenderer(this));
         this.<ArmorStand>register(EntityType.ARMOR_STAND, new ArmorStandRenderer(this));
         this.<Arrow>register(EntityType.ARROW, new TippableArrowRenderer(this));
@@ -191,34 +195,35 @@ public class EntityRenderDispatcher {
         this.<Donkey>register(EntityType.DONKEY, new ChestedHorseRenderer(this, 0.87f));
         this.<DragonFireball>register(EntityType.DRAGON_FIREBALL, new DragonFireballRenderer(this));
         this.<Drowned>register(EntityType.DROWNED, new DrownedRenderer(this));
-        this.<ThrownEgg>register(EntityType.EGG, new ThrownItemRenderer<>(this, dvz));
+        this.<ThrownEgg>register(EntityType.EGG, new ThrownItemRenderer<>(this, ehh));
         this.<ElderGuardian>register(EntityType.ELDER_GUARDIAN, new ElderGuardianRenderer(this));
         this.<EndCrystal>register(EntityType.END_CRYSTAL, new EndCrystalRenderer(this));
         this.<EnderDragon>register(EntityType.ENDER_DRAGON, new EnderDragonRenderer(this));
         this.<EnderMan>register(EntityType.ENDERMAN, new EndermanRenderer(this));
         this.<Endermite>register(EntityType.ENDERMITE, new EndermiteRenderer(this));
-        this.<ThrownEnderpearl>register(EntityType.ENDER_PEARL, new ThrownItemRenderer<>(this, dvz));
+        this.<ThrownEnderpearl>register(EntityType.ENDER_PEARL, new ThrownItemRenderer<>(this, ehh));
         this.<EvokerFangs>register(EntityType.EVOKER_FANGS, new EvokerFangsRenderer(this));
         this.<Evoker>register(EntityType.EVOKER, new EvokerRenderer(this));
-        this.<ThrownExperienceBottle>register(EntityType.EXPERIENCE_BOTTLE, new ThrownItemRenderer<>(this, dvz));
+        this.<ThrownExperienceBottle>register(EntityType.EXPERIENCE_BOTTLE, new ThrownItemRenderer<>(this, ehh));
         this.<ExperienceOrb>register(EntityType.EXPERIENCE_ORB, new ExperienceOrbRenderer(this));
-        this.<EyeOfEnder>register(EntityType.EYE_OF_ENDER, new ThrownItemRenderer<>(this, dvz, 1.0f, true));
+        this.<EyeOfEnder>register(EntityType.EYE_OF_ENDER, new ThrownItemRenderer<>(this, ehh, 1.0f, true));
         this.<FallingBlockEntity>register(EntityType.FALLING_BLOCK, new FallingBlockRenderer(this));
-        this.<LargeFireball>register(EntityType.FIREBALL, new ThrownItemRenderer<>(this, dvz, 3.0f, true));
-        this.<FireworkRocketEntity>register(EntityType.FIREWORK_ROCKET, new FireworkEntityRenderer(this, dvz));
+        this.<LargeFireball>register(EntityType.FIREBALL, new ThrownItemRenderer<>(this, ehh, 3.0f, true));
+        this.<FireworkRocketEntity>register(EntityType.FIREWORK_ROCKET, new FireworkEntityRenderer(this, ehh));
         this.<FishingHook>register(EntityType.FISHING_BOBBER, new FishingHookRenderer(this));
         this.<Fox>register(EntityType.FOX, new FoxRenderer(this));
         this.<MinecartFurnace>register(EntityType.FURNACE_MINECART, new MinecartRenderer<>(this));
         this.<Ghast>register(EntityType.GHAST, new GhastRenderer(this));
         this.<Giant>register(EntityType.GIANT, new GiantMobRenderer(this, 6.0f));
         this.<Guardian>register(EntityType.GUARDIAN, new GuardianRenderer(this));
+        this.<Hoglin>register(EntityType.HOGLIN, new HoglinRenderer(this));
         this.<MinecartHopper>register(EntityType.HOPPER_MINECART, new MinecartRenderer<>(this));
         this.<Horse>register(EntityType.HORSE, new HorseRenderer(this));
         this.<Husk>register(EntityType.HUSK, new HuskRenderer(this));
         this.<Illusioner>register(EntityType.ILLUSIONER, new IllusionerRenderer(this));
         this.<IronGolem>register(EntityType.IRON_GOLEM, new IronGolemRenderer(this));
-        this.<ItemFrame>register(EntityType.ITEM_FRAME, new ItemFrameRenderer(this, dvz));
-        this.<ItemEntity>register(EntityType.ITEM, new ItemEntityRenderer(this, dvz));
+        this.<ItemEntity>register(EntityType.ITEM, new ItemEntityRenderer(this, ehh));
+        this.<ItemFrame>register(EntityType.ITEM_FRAME, new ItemFrameRenderer(this, ehh));
         this.<LeashFenceKnotEntity>register(EntityType.LEASH_KNOT, new LeashKnotRenderer(this));
         this.<LightningBolt>register(EntityType.LIGHTNING_BOLT, new LightningBoltRenderer(this));
         this.<Llama>register(EntityType.LLAMA, new LlamaRenderer(this));
@@ -233,9 +238,10 @@ public class EntityRenderDispatcher {
         this.<Parrot>register(EntityType.PARROT, new ParrotRenderer(this));
         this.<Phantom>register(EntityType.PHANTOM, new PhantomRenderer(this));
         this.<Pig>register(EntityType.PIG, new PigRenderer(this));
+        this.<Piglin>register(EntityType.PIGLIN, new PiglinRenderer(this, false));
         this.<Pillager>register(EntityType.PILLAGER, new PillagerRenderer(this));
         this.<PolarBear>register(EntityType.POLAR_BEAR, new PolarBearRenderer(this));
-        this.<ThrownPotion>register(EntityType.POTION, new ThrownItemRenderer<>(this, dvz));
+        this.<ThrownPotion>register(EntityType.POTION, new ThrownItemRenderer<>(this, ehh));
         this.<Pufferfish>register(EntityType.PUFFERFISH, new PufferfishRenderer(this));
         this.<Rabbit>register(EntityType.RABBIT, new RabbitRenderer(this));
         this.<Ravager>register(EntityType.RAVAGER, new RavagerRenderer(this));
@@ -247,8 +253,8 @@ public class EntityRenderDispatcher {
         this.<SkeletonHorse>register(EntityType.SKELETON_HORSE, new UndeadHorseRenderer(this));
         this.<Skeleton>register(EntityType.SKELETON, new SkeletonRenderer(this));
         this.<Slime>register(EntityType.SLIME, new SlimeRenderer(this));
-        this.<SmallFireball>register(EntityType.SMALL_FIREBALL, new ThrownItemRenderer<>(this, dvz, 0.75f, true));
-        this.<Snowball>register(EntityType.SNOWBALL, new ThrownItemRenderer<>(this, dvz));
+        this.<SmallFireball>register(EntityType.SMALL_FIREBALL, new ThrownItemRenderer<>(this, ehh, 0.75f, true));
+        this.<Snowball>register(EntityType.SNOWBALL, new ThrownItemRenderer<>(this, ehh));
         this.<SnowGolem>register(EntityType.SNOW_GOLEM, new SnowGolemRenderer(this));
         this.<MinecartSpawner>register(EntityType.SPAWNER_MINECART, new MinecartRenderer<>(this));
         this.<SpectralArrow>register(EntityType.SPECTRAL_ARROW, new SpectralArrowRenderer(this));
@@ -262,7 +268,7 @@ public class EntityRenderDispatcher {
         this.<TropicalFish>register(EntityType.TROPICAL_FISH, new TropicalFishRenderer(this));
         this.<Turtle>register(EntityType.TURTLE, new TurtleRenderer(this));
         this.<Vex>register(EntityType.VEX, new VexRenderer(this));
-        this.<Villager>register(EntityType.VILLAGER, new VillagerRenderer(this, yz));
+        this.<Villager>register(EntityType.VILLAGER, new VillagerRenderer(this, aba));
         this.<Vindicator>register(EntityType.VINDICATOR, new VindicatorRenderer(this));
         this.<WanderingTrader>register(EntityType.WANDERING_TRADER, new WanderingTraderRenderer(this));
         this.<Witch>register(EntityType.WITCH, new WitchRenderer(this));
@@ -270,54 +276,56 @@ public class EntityRenderDispatcher {
         this.<WitherSkeleton>register(EntityType.WITHER_SKELETON, new WitherSkeletonRenderer(this));
         this.<WitherSkull>register(EntityType.WITHER_SKULL, new WitherSkullRenderer(this));
         this.<Wolf>register(EntityType.WOLF, new WolfRenderer(this));
+        this.<Zoglin>register(EntityType.ZOGLIN, new ZoglinRenderer(this));
         this.<ZombieHorse>register(EntityType.ZOMBIE_HORSE, new UndeadHorseRenderer(this));
         this.<Zombie>register(EntityType.ZOMBIE, new ZombieRenderer(this));
-        this.<PigZombie>register(EntityType.ZOMBIE_PIGMAN, new PigZombieRenderer(this));
-        this.<ZombieVillager>register(EntityType.ZOMBIE_VILLAGER, new ZombieVillagerRenderer(this, yz));
+        this.<ZombifiedPiglin>register(EntityType.ZOMBIFIED_PIGLIN, new PiglinRenderer(this, true));
+        this.<ZombieVillager>register(EntityType.ZOMBIE_VILLAGER, new ZombieVillagerRenderer(this, aba));
+        this.<Strider>register(EntityType.STRIDER, new StriderRenderer(this));
     }
     
-    public EntityRenderDispatcher(final TextureManager eak, final ItemRenderer dvz, final ReloadableResourceManager yz, final Font dch, final Options dbr) {
+    public EntityRenderDispatcher(final TextureManager elw, final ItemRenderer ehh, final ReloadableResourceManager aba, final Font dmt, final Options dmb) {
         this.renderers = Maps.newHashMap();
         this.playerRenderers = Maps.newHashMap();
         this.shouldRenderShadow = true;
-        this.textureManager = eak;
-        this.font = dch;
-        this.options = dbr;
-        this.registerRenderers(dvz, yz);
+        this.textureManager = elw;
+        this.font = dmt;
+        this.options = dmb;
+        this.registerRenderers(ehh, aba);
         this.defaultPlayerRenderer = new PlayerRenderer(this);
         this.playerRenderers.put("default", this.defaultPlayerRenderer);
         this.playerRenderers.put("slim", new PlayerRenderer(this, true));
-        for (final EntityType<?> aku8 : Registry.ENTITY_TYPE) {
-            if (aku8 == EntityType.PLAYER) {
+        for (final EntityType<?> aoq8 : Registry.ENTITY_TYPE) {
+            if (aoq8 == EntityType.PLAYER) {
                 continue;
             }
-            if (!this.renderers.containsKey(aku8)) {
-                throw new IllegalStateException("No renderer registered for " + Registry.ENTITY_TYPE.getKey(aku8));
+            if (!this.renderers.containsKey(aoq8)) {
+                throw new IllegalStateException("No renderer registered for " + Registry.ENTITY_TYPE.getKey(aoq8));
             }
         }
     }
     
-    public <T extends Entity> EntityRenderer<? super T> getRenderer(final T akq) {
-        if (!(akq instanceof AbstractClientPlayer)) {
-            return this.renderers.get(akq.getType());
+    public <T extends Entity> EntityRenderer<? super T> getRenderer(final T aom) {
+        if (!(aom instanceof AbstractClientPlayer)) {
+            return this.renderers.get(aom.getType());
         }
-        final String string3 = ((AbstractClientPlayer)akq).getModelName();
-        final PlayerRenderer dzt4 = this.playerRenderers.get(string3);
-        if (dzt4 != null) {
-            return dzt4;
+        final String string3 = ((AbstractClientPlayer)aom).getModelName();
+        final PlayerRenderer eld4 = this.playerRenderers.get(string3);
+        if (eld4 != null) {
+            return eld4;
         }
         return this.defaultPlayerRenderer;
     }
     
-    public void prepare(final Level bjw, final Camera dbb, final Entity akq) {
-        this.level = bjw;
-        this.camera = dbb;
-        this.cameraOrientation = dbb.rotation();
-        this.crosshairPickEntity = akq;
+    public void prepare(final Level bqb, final Camera dlj, final Entity aom) {
+        this.level = bqb;
+        this.camera = dlj;
+        this.cameraOrientation = dlj.rotation();
+        this.crosshairPickEntity = aom;
     }
     
-    public void overrideCameraOrientation(final Quaternion c) {
-        this.cameraOrientation = c;
+    public void overrideCameraOrientation(final Quaternion d) {
+        this.cameraOrientation = d;
     }
     
     public void setRenderShadow(final boolean boolean1) {
@@ -332,203 +340,203 @@ public class EntityRenderDispatcher {
         return this.renderHitBoxes;
     }
     
-    public <E extends Entity> boolean shouldRender(final E akq, final Frustum dtm, final double double3, final double double4, final double double5) {
-        final EntityRenderer<? super E> dvg10 = this.<E>getRenderer(akq);
-        return dvg10.shouldRender(akq, dtm, double3, double4, double5);
+    public <E extends Entity> boolean shouldRender(final E aom, final Frustum ees, final double double3, final double double4, final double double5) {
+        final EntityRenderer<? super E> egn10 = this.<E>getRenderer(aom);
+        return egn10.shouldRender(aom, ees, double3, double4, double5);
     }
     
-    public <E extends Entity> void render(final E akq, final double double2, final double double3, final double double4, final float float5, final float float6, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final EntityRenderer<? super E> dvg14 = this.<E>getRenderer(akq);
+    public <E extends Entity> void render(final E aom, final double double2, final double double3, final double double4, final float float5, final float float6, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final EntityRenderer<? super E> egn14 = this.<E>getRenderer(aom);
         try {
-            final Vec3 cvl15 = dvg14.getRenderOffset(akq, float6);
-            final double double5 = double2 + cvl15.x();
-            final double double6 = double3 + cvl15.y();
-            final double double7 = double4 + cvl15.z();
-            cyl.pushPose();
-            cyl.translate(double5, double6, double7);
-            dvg14.render(akq, float5, float6, cyl, dqt, integer);
-            if (akq.displayFireAnimation()) {
-                this.renderFlame(cyl, dqt, akq);
+            final Vec3 dem15 = egn14.getRenderOffset(aom, float6);
+            final double double5 = double2 + dem15.x();
+            final double double6 = double3 + dem15.y();
+            final double double7 = double4 + dem15.z();
+            dhl.pushPose();
+            dhl.translate(double5, double6, double7);
+            egn14.render(aom, float5, float6, dhl, ebz, integer);
+            if (aom.displayFireAnimation()) {
+                this.renderFlame(dhl, ebz, aom);
             }
-            cyl.translate(-cvl15.x(), -cvl15.y(), -cvl15.z());
-            if (this.options.entityShadows && this.shouldRenderShadow && dvg14.shadowRadius > 0.0f && !akq.isInvisible()) {
-                final double double8 = this.distanceToSqr(akq.getX(), akq.getY(), akq.getZ());
-                final float float7 = (float)((1.0 - double8 / 256.0) * dvg14.shadowStrength);
+            dhl.translate(-dem15.x(), -dem15.y(), -dem15.z());
+            if (this.options.entityShadows && this.shouldRenderShadow && egn14.shadowRadius > 0.0f && !aom.isInvisible()) {
+                final double double8 = this.distanceToSqr(aom.getX(), aom.getY(), aom.getZ());
+                final float float7 = (float)((1.0 - double8 / 256.0) * egn14.shadowStrength);
                 if (float7 > 0.0f) {
-                    renderShadow(cyl, dqt, akq, float7, float6, this.level, dvg14.shadowRadius);
+                    renderShadow(dhl, ebz, aom, float7, float6, this.level, egn14.shadowRadius);
                 }
             }
-            if (this.renderHitBoxes && !akq.isInvisible() && !Minecraft.getInstance().showOnlyReducedInfo()) {
-                this.renderHitbox(cyl, dqt.getBuffer(RenderType.lines()), akq, float6);
+            if (this.renderHitBoxes && !aom.isInvisible() && !Minecraft.getInstance().showOnlyReducedInfo()) {
+                this.renderHitbox(dhl, ebz.getBuffer(RenderType.lines()), aom, float6);
             }
-            cyl.popPose();
+            dhl.popPose();
         }
         catch (Throwable throwable15) {
-            final CrashReport h16 = CrashReport.forThrowable(throwable15, "Rendering entity in world");
-            final CrashReportCategory i17 = h16.addCategory("Entity being rendered");
-            akq.fillCrashReportCategory(i17);
-            final CrashReportCategory i18 = h16.addCategory("Renderer details");
-            i18.setDetail("Assigned renderer", dvg14);
-            i18.setDetail("Location", CrashReportCategory.formatLocation(double2, double3, double4));
-            i18.setDetail("Rotation", float5);
-            i18.setDetail("Delta", float6);
-            throw new ReportedException(h16);
+            final CrashReport j16 = CrashReport.forThrowable(throwable15, "Rendering entity in world");
+            final CrashReportCategory k17 = j16.addCategory("Entity being rendered");
+            aom.fillCrashReportCategory(k17);
+            final CrashReportCategory k18 = j16.addCategory("Renderer details");
+            k18.setDetail("Assigned renderer", egn14);
+            k18.setDetail("Location", CrashReportCategory.formatLocation(double2, double3, double4));
+            k18.setDetail("Rotation", float5);
+            k18.setDetail("Delta", float6);
+            throw new ReportedException(j16);
         }
     }
     
-    private void renderHitbox(final PoseStack cyl, final VertexConsumer cyo, final Entity akq, final float float4) {
-        final float float5 = akq.getBbWidth() / 2.0f;
-        this.renderBox(cyl, cyo, akq, 1.0f, 1.0f, 1.0f);
-        if (akq instanceof EnderDragon) {
-            final double double7 = akq.getX() - Mth.lerp(float4, akq.xOld, akq.getX());
-            final double double8 = akq.getY() - Mth.lerp(float4, akq.yOld, akq.getY());
-            final double double9 = akq.getZ() - Mth.lerp(float4, akq.zOld, akq.getZ());
-            for (final EnderDragonPart auq16 : ((EnderDragon)akq).getSubEntities()) {
-                cyl.pushPose();
-                final double double10 = double7 + Mth.lerp(float4, auq16.xOld, auq16.getX());
-                final double double11 = double8 + Mth.lerp(float4, auq16.yOld, auq16.getY());
-                final double double12 = double9 + Mth.lerp(float4, auq16.zOld, auq16.getZ());
-                cyl.translate(double10, double11, double12);
-                this.renderBox(cyl, cyo, auq16, 0.25f, 1.0f, 0.0f);
-                cyl.popPose();
+    private void renderHitbox(final PoseStack dhl, final VertexConsumer dhp, final Entity aom, final float float4) {
+        final float float5 = aom.getBbWidth() / 2.0f;
+        this.renderBox(dhl, dhp, aom, 1.0f, 1.0f, 1.0f);
+        if (aom instanceof EnderDragon) {
+            final double double7 = -Mth.lerp(float4, aom.xOld, aom.getX());
+            final double double8 = -Mth.lerp(float4, aom.yOld, aom.getY());
+            final double double9 = -Mth.lerp(float4, aom.zOld, aom.getZ());
+            for (final EnderDragonPart baa16 : ((EnderDragon)aom).getSubEntities()) {
+                dhl.pushPose();
+                final double double10 = double7 + Mth.lerp(float4, baa16.xOld, baa16.getX());
+                final double double11 = double8 + Mth.lerp(float4, baa16.yOld, baa16.getY());
+                final double double12 = double9 + Mth.lerp(float4, baa16.zOld, baa16.getZ());
+                dhl.translate(double10, double11, double12);
+                this.renderBox(dhl, dhp, baa16, 0.25f, 1.0f, 0.0f);
+                dhl.popPose();
             }
         }
-        if (akq instanceof LivingEntity) {
+        if (aom instanceof LivingEntity) {
             final float float6 = 0.01f;
-            LevelRenderer.renderLineBox(cyl, cyo, -float5, akq.getEyeHeight() - 0.01f, -float5, float5, akq.getEyeHeight() + 0.01f, float5, 1.0f, 0.0f, 0.0f, 1.0f);
+            LevelRenderer.renderLineBox(dhl, dhp, -float5, aom.getEyeHeight() - 0.01f, -float5, float5, aom.getEyeHeight() + 0.01f, float5, 1.0f, 0.0f, 0.0f, 1.0f);
         }
-        final Vec3 cvl7 = akq.getViewVector(float4);
-        final Matrix4f b8 = cyl.last().pose();
-        cyo.vertex(b8, 0.0f, akq.getEyeHeight(), 0.0f).color(0, 0, 255, 255).endVertex();
-        cyo.vertex(b8, (float)(cvl7.x * 2.0), (float)(akq.getEyeHeight() + cvl7.y * 2.0), (float)(cvl7.z * 2.0)).color(0, 0, 255, 255).endVertex();
+        final Vec3 dem7 = aom.getViewVector(float4);
+        final Matrix4f b8 = dhl.last().pose();
+        dhp.vertex(b8, 0.0f, aom.getEyeHeight(), 0.0f).color(0, 0, 255, 255).endVertex();
+        dhp.vertex(b8, (float)(dem7.x * 2.0), (float)(aom.getEyeHeight() + dem7.y * 2.0), (float)(dem7.z * 2.0)).color(0, 0, 255, 255).endVertex();
     }
     
-    private void renderBox(final PoseStack cyl, final VertexConsumer cyo, final Entity akq, final float float4, final float float5, final float float6) {
-        final AABB cvf8 = akq.getBoundingBox().move(-akq.getX(), -akq.getY(), -akq.getZ());
-        LevelRenderer.renderLineBox(cyl, cyo, cvf8, float4, float5, float6, 1.0f);
+    private void renderBox(final PoseStack dhl, final VertexConsumer dhp, final Entity aom, final float float4, final float float5, final float float6) {
+        final AABB deg8 = aom.getBoundingBox().move(-aom.getX(), -aom.getY(), -aom.getZ());
+        LevelRenderer.renderLineBox(dhl, dhp, deg8, float4, float5, float6, 1.0f);
     }
     
-    private void renderFlame(final PoseStack cyl, final MultiBufferSource dqt, final Entity akq) {
-        final TextureAtlasSprite eaj5 = ModelBakery.FIRE_0.sprite();
-        final TextureAtlasSprite eaj6 = ModelBakery.FIRE_1.sprite();
-        cyl.pushPose();
-        final float float7 = akq.getBbWidth() * 1.4f;
-        cyl.scale(float7, float7, float7);
+    private void renderFlame(final PoseStack dhl, final MultiBufferSource ebz, final Entity aom) {
+        final TextureAtlasSprite elv5 = ModelBakery.FIRE_0.sprite();
+        final TextureAtlasSprite elv6 = ModelBakery.FIRE_1.sprite();
+        dhl.pushPose();
+        final float float7 = aom.getBbWidth() * 1.4f;
+        dhl.scale(float7, float7, float7);
         float float8 = 0.5f;
         final float float9 = 0.0f;
-        float float10 = akq.getBbHeight() / float7;
+        float float10 = aom.getBbHeight() / float7;
         float float11 = 0.0f;
-        cyl.mulPose(Vector3f.YP.rotationDegrees(-this.camera.getYRot()));
-        cyl.translate(0.0, 0.0, -0.3f + (int)float10 * 0.02f);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(-this.camera.getYRot()));
+        dhl.translate(0.0, 0.0, -0.3f + (int)float10 * 0.02f);
         float float12 = 0.0f;
         int integer13 = 0;
-        final VertexConsumer cyo14 = dqt.getBuffer(Sheets.cutoutBlockSheet());
-        final PoseStack.Pose a15 = cyl.last();
+        final VertexConsumer dhp14 = ebz.getBuffer(Sheets.cutoutBlockSheet());
+        final PoseStack.Pose a15 = dhl.last();
         while (float10 > 0.0f) {
-            final TextureAtlasSprite eaj7 = (integer13 % 2 == 0) ? eaj5 : eaj6;
-            float float13 = eaj7.getU0();
-            final float float14 = eaj7.getV0();
-            float float15 = eaj7.getU1();
-            final float float16 = eaj7.getV1();
+            final TextureAtlasSprite elv7 = (integer13 % 2 == 0) ? elv5 : elv6;
+            float float13 = elv7.getU0();
+            final float float14 = elv7.getV0();
+            float float15 = elv7.getU1();
+            final float float16 = elv7.getV1();
             if (integer13 / 2 % 2 == 0) {
                 final float float17 = float15;
                 float15 = float13;
                 float13 = float17;
             }
-            fireVertex(a15, cyo14, float8 - 0.0f, 0.0f - float11, float12, float15, float16);
-            fireVertex(a15, cyo14, -float8 - 0.0f, 0.0f - float11, float12, float13, float16);
-            fireVertex(a15, cyo14, -float8 - 0.0f, 1.4f - float11, float12, float13, float14);
-            fireVertex(a15, cyo14, float8 - 0.0f, 1.4f - float11, float12, float15, float14);
+            fireVertex(a15, dhp14, float8 - 0.0f, 0.0f - float11, float12, float15, float16);
+            fireVertex(a15, dhp14, -float8 - 0.0f, 0.0f - float11, float12, float13, float16);
+            fireVertex(a15, dhp14, -float8 - 0.0f, 1.4f - float11, float12, float13, float14);
+            fireVertex(a15, dhp14, float8 - 0.0f, 1.4f - float11, float12, float15, float14);
             float10 -= 0.45f;
             float11 -= 0.45f;
             float8 *= 0.9f;
             float12 += 0.03f;
             ++integer13;
         }
-        cyl.popPose();
+        dhl.popPose();
     }
     
-    private static void fireVertex(final PoseStack.Pose a, final VertexConsumer cyo, final float float3, final float float4, final float float5, final float float6, final float float7) {
-        cyo.vertex(a.pose(), float3, float4, float5).color(255, 255, 255, 255).uv(float6, float7).overlayCoords(0, 10).uv2(240).normal(a.normal(), 0.0f, 1.0f, 0.0f).endVertex();
+    private static void fireVertex(final PoseStack.Pose a, final VertexConsumer dhp, final float float3, final float float4, final float float5, final float float6, final float float7) {
+        dhp.vertex(a.pose(), float3, float4, float5).color(255, 255, 255, 255).uv(float6, float7).overlayCoords(0, 10).uv2(240).normal(a.normal(), 0.0f, 1.0f, 0.0f).endVertex();
     }
     
-    private static void renderShadow(final PoseStack cyl, final MultiBufferSource dqt, final Entity akq, final float float4, final float float5, final LevelReader bjz, final float float7) {
+    private static void renderShadow(final PoseStack dhl, final MultiBufferSource ebz, final Entity aom, final float float4, final float float5, final LevelReader bqd, final float float7) {
         float float8 = float7;
-        if (akq instanceof Mob) {
-            final Mob ala9 = (Mob)akq;
-            if (ala9.isBaby()) {
+        if (aom instanceof Mob) {
+            final Mob aoz9 = (Mob)aom;
+            if (aoz9.isBaby()) {
                 float8 *= 0.5f;
             }
         }
-        final double double9 = Mth.lerp(float5, akq.xOld, akq.getX());
-        final double double10 = Mth.lerp(float5, akq.yOld, akq.getY());
-        final double double11 = Mth.lerp(float5, akq.zOld, akq.getZ());
+        final double double9 = Mth.lerp(float5, aom.xOld, aom.getX());
+        final double double10 = Mth.lerp(float5, aom.yOld, aom.getY());
+        final double double11 = Mth.lerp(float5, aom.zOld, aom.getZ());
         final int integer15 = Mth.floor(double9 - float8);
         final int integer16 = Mth.floor(double9 + float8);
         final int integer17 = Mth.floor(double10 - float8);
         final int integer18 = Mth.floor(double10);
         final int integer19 = Mth.floor(double11 - float8);
         final int integer20 = Mth.floor(double11 + float8);
-        final PoseStack.Pose a21 = cyl.last();
-        final VertexConsumer cyo22 = dqt.getBuffer(EntityRenderDispatcher.SHADOW_RENDER_TYPE);
-        for (final BlockPos fk24 : BlockPos.betweenClosed(new BlockPos(integer15, integer17, integer19), new BlockPos(integer16, integer18, integer20))) {
-            renderBlockShadow(a21, cyo22, bjz, fk24, double9, double10, double11, float8, float4);
+        final PoseStack.Pose a21 = dhl.last();
+        final VertexConsumer dhp22 = ebz.getBuffer(EntityRenderDispatcher.SHADOW_RENDER_TYPE);
+        for (final BlockPos fu24 : BlockPos.betweenClosed(new BlockPos(integer15, integer17, integer19), new BlockPos(integer16, integer18, integer20))) {
+            renderBlockShadow(a21, dhp22, bqd, fu24, double9, double10, double11, float8, float4);
         }
     }
     
-    private static void renderBlockShadow(final PoseStack.Pose a, final VertexConsumer cyo, final LevelReader bjz, final BlockPos fk, final double double5, final double double6, final double double7, final float float8, final float float9) {
-        final BlockPos fk2 = fk.below();
-        final BlockState byj14 = bjz.getBlockState(fk2);
-        if (byj14.getRenderShape() == RenderShape.INVISIBLE || bjz.getMaxLocalRawBrightness(fk) <= 3) {
+    private static void renderBlockShadow(final PoseStack.Pose a, final VertexConsumer dhp, final LevelReader bqd, final BlockPos fu, final double double5, final double double6, final double double7, final float float8, final float float9) {
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj14 = bqd.getBlockState(fu2);
+        if (cfj14.getRenderShape() == RenderShape.INVISIBLE || bqd.getMaxLocalRawBrightness(fu) <= 3) {
             return;
         }
-        if (!byj14.isCollisionShapeFullBlock(bjz, fk2)) {
+        if (!cfj14.isCollisionShapeFullBlock(bqd, fu2)) {
             return;
         }
-        final VoxelShape cwf15 = byj14.getShape(bjz, fk.below());
-        if (cwf15.isEmpty()) {
+        final VoxelShape dfg15 = cfj14.getShape(bqd, fu.below());
+        if (dfg15.isEmpty()) {
             return;
         }
-        float float10 = (float)((float9 - (double6 - fk.getY()) / 2.0) * 0.5 * bjz.getBrightness(fk));
+        float float10 = (float)((float9 - (double6 - fu.getY()) / 2.0) * 0.5 * bqd.getBrightness(fu));
         if (float10 >= 0.0f) {
             if (float10 > 1.0f) {
                 float10 = 1.0f;
             }
-            final AABB cvf17 = cwf15.bounds();
-            final double double8 = fk.getX() + cvf17.minX;
-            final double double9 = fk.getX() + cvf17.maxX;
-            final double double10 = fk.getY() + cvf17.minY;
-            final double double11 = fk.getZ() + cvf17.minZ;
-            final double double12 = fk.getZ() + cvf17.maxZ;
+            final AABB deg17 = dfg15.bounds();
+            final double double8 = fu.getX() + deg17.minX;
+            final double double9 = fu.getX() + deg17.maxX;
+            final double double10 = fu.getY() + deg17.minY;
+            final double double11 = fu.getZ() + deg17.minZ;
+            final double double12 = fu.getZ() + deg17.maxZ;
             final float float11 = (float)(double8 - double5);
             final float float12 = (float)(double9 - double5);
-            final float float13 = (float)(double10 - double6 + 0.015625);
+            final float float13 = (float)(double10 - double6);
             final float float14 = (float)(double11 - double7);
             final float float15 = (float)(double12 - double7);
             final float float16 = -float11 / 2.0f / float8 + 0.5f;
             final float float17 = -float12 / 2.0f / float8 + 0.5f;
             final float float18 = -float14 / 2.0f / float8 + 0.5f;
             final float float19 = -float15 / 2.0f / float8 + 0.5f;
-            shadowVertex(a, cyo, float10, float11, float13, float14, float16, float18);
-            shadowVertex(a, cyo, float10, float11, float13, float15, float16, float19);
-            shadowVertex(a, cyo, float10, float12, float13, float15, float17, float19);
-            shadowVertex(a, cyo, float10, float12, float13, float14, float17, float18);
+            shadowVertex(a, dhp, float10, float11, float13, float14, float16, float18);
+            shadowVertex(a, dhp, float10, float11, float13, float15, float16, float19);
+            shadowVertex(a, dhp, float10, float12, float13, float15, float17, float19);
+            shadowVertex(a, dhp, float10, float12, float13, float14, float17, float18);
         }
     }
     
-    private static void shadowVertex(final PoseStack.Pose a, final VertexConsumer cyo, final float float3, final float float4, final float float5, final float float6, final float float7, final float float8) {
-        cyo.vertex(a.pose(), float4, float5, float6).color(1.0f, 1.0f, 1.0f, float3).uv(float7, float8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(15728880).normal(a.normal(), 0.0f, 1.0f, 0.0f).endVertex();
+    private static void shadowVertex(final PoseStack.Pose a, final VertexConsumer dhp, final float float3, final float float4, final float float5, final float float6, final float float7, final float float8) {
+        dhp.vertex(a.pose(), float4, float5, float6).color(1.0f, 1.0f, 1.0f, float3).uv(float7, float8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(15728880).normal(a.normal(), 0.0f, 1.0f, 0.0f).endVertex();
     }
     
-    public void setLevel(@Nullable final Level bjw) {
-        this.level = bjw;
-        if (bjw == null) {
+    public void setLevel(@Nullable final Level bqb) {
+        this.level = bqb;
+        if (bqb == null) {
             this.camera = null;
         }
     }
     
-    public double distanceToSqr(final Entity akq) {
-        return this.camera.getPosition().distanceToSqr(akq.position());
+    public double distanceToSqr(final Entity aom) {
+        return this.camera.getPosition().distanceToSqr(aom.position());
     }
     
     public double distanceToSqr(final double double1, final double double2, final double double3) {
@@ -544,6 +552,6 @@ public class EntityRenderDispatcher {
     }
     
     static {
-        SHADOW_RENDER_TYPE = RenderType.entityNoOutline(new ResourceLocation("textures/misc/shadow.png"));
+        SHADOW_RENDER_TYPE = RenderType.entityShadow(new ResourceLocation("textures/misc/shadow.png"));
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/EntityRenderer.java b/src/net/minecraft/client/renderer/entity/EntityRenderer.java
index f742fd5..0688ede 100644
--- a/src/net/minecraft/client/renderer/entity/EntityRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/EntityRenderer.java
@@ -1,7 +1,9 @@
 package net.minecraft.client.renderer.entity;
 
 import com.mojang.math.Matrix4f;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
 import net.minecraft.client.gui.Font;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -9,9 +11,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.client.renderer.culling.Frustum;
+import net.minecraft.world.level.LightLayer;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.entity.Entity;
 
 public abstract class EntityRenderer<T extends Entity> {
@@ -19,79 +21,84 @@ public abstract class EntityRenderer<T extends Entity> {
     protected float shadowRadius;
     protected float shadowStrength;
     
-    protected EntityRenderer(final EntityRenderDispatcher dvf) {
+    protected EntityRenderer(final EntityRenderDispatcher egm) {
         this.shadowStrength = 1.0f;
-        this.entityRenderDispatcher = dvf;
+        this.entityRenderDispatcher = egm;
     }
     
-    public final int getPackedLightCoords(final T akq, final float float2) {
-        return LightTexture.pack(this.getBlockLightLevel(akq, float2), akq.level.getBrightness(LightLayer.SKY, new BlockPos(akq.getEyePosition(float2))));
+    public final int getPackedLightCoords(final T aom, final float float2) {
+        final BlockPos fu4 = new BlockPos(aom.getEyePosition(float2));
+        return LightTexture.pack(this.getBlockLightLevel(aom, fu4), this.getSkyLightLevel(aom, fu4));
     }
     
-    protected int getBlockLightLevel(final T akq, final float float2) {
-        if (akq.isOnFire()) {
+    protected int getSkyLightLevel(final T aom, final BlockPos fu) {
+        return aom.level.getBrightness(LightLayer.SKY, fu);
+    }
+    
+    protected int getBlockLightLevel(final T aom, final BlockPos fu) {
+        if (aom.isOnFire()) {
             return 15;
         }
-        return akq.level.getBrightness(LightLayer.BLOCK, new BlockPos(akq.getEyePosition(float2)));
+        return aom.level.getBrightness(LightLayer.BLOCK, fu);
     }
     
-    public boolean shouldRender(final T akq, final Frustum dtm, final double double3, final double double4, final double double5) {
-        if (!akq.shouldRender(double3, double4, double5)) {
+    public boolean shouldRender(final T aom, final Frustum ees, final double double3, final double double4, final double double5) {
+        if (!aom.shouldRender(double3, double4, double5)) {
             return false;
         }
-        if (akq.noCulling) {
+        if (aom.noCulling) {
             return true;
         }
-        AABB cvf10 = akq.getBoundingBoxForCulling().inflate(0.5);
-        if (cvf10.hasNaN() || cvf10.getSize() == 0.0) {
-            cvf10 = new AABB(akq.getX() - 2.0, akq.getY() - 2.0, akq.getZ() - 2.0, akq.getX() + 2.0, akq.getY() + 2.0, akq.getZ() + 2.0);
+        AABB deg10 = aom.getBoundingBoxForCulling().inflate(0.5);
+        if (deg10.hasNaN() || deg10.getSize() == 0.0) {
+            deg10 = new AABB(aom.getX() - 2.0, aom.getY() - 2.0, aom.getZ() - 2.0, aom.getX() + 2.0, aom.getY() + 2.0, aom.getZ() + 2.0);
         }
-        return dtm.isVisible(cvf10);
+        return ees.isVisible(deg10);
     }
     
-    public Vec3 getRenderOffset(final T akq, final float float2) {
+    public Vec3 getRenderOffset(final T aom, final float float2) {
         return Vec3.ZERO;
     }
     
-    public void render(final T akq, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        if (!this.shouldShowName(akq)) {
+    public void render(final T aom, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        if (!this.shouldShowName(aom)) {
             return;
         }
-        this.renderNameTag(akq, akq.getDisplayName().getColoredString(), cyl, dqt, integer);
+        this.renderNameTag(aom, aom.getDisplayName(), dhl, ebz, integer);
     }
     
-    protected boolean shouldShowName(final T akq) {
-        return akq.shouldShowName() && akq.hasCustomName();
+    protected boolean shouldShowName(final T aom) {
+        return aom.shouldShowName() && aom.hasCustomName();
     }
     
-    public abstract ResourceLocation getTextureLocation(final T akq);
+    public abstract ResourceLocation getTextureLocation(final T aom);
     
     public Font getFont() {
         return this.entityRenderDispatcher.getFont();
     }
     
-    protected void renderNameTag(final T akq, final String string, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final double double7 = this.entityRenderDispatcher.distanceToSqr(akq);
+    protected void renderNameTag(final T aom, final Component mr, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final double double7 = this.entityRenderDispatcher.distanceToSqr(aom);
         if (double7 > 4096.0) {
             return;
         }
-        final boolean boolean9 = !akq.isDiscrete();
-        final float float10 = akq.getBbHeight() + 0.5f;
-        final int integer2 = "deadmau5".equals(string) ? -10 : 0;
-        cyl.pushPose();
-        cyl.translate(0.0, float10, 0.0);
-        cyl.mulPose(this.entityRenderDispatcher.cameraOrientation());
-        cyl.scale(-0.025f, -0.025f, 0.025f);
-        final Matrix4f b12 = cyl.last().pose();
+        final boolean boolean9 = !aom.isDiscrete();
+        final float float10 = aom.getBbHeight() + 0.5f;
+        final int integer2 = "deadmau5".equals(mr.getString()) ? -10 : 0;
+        dhl.pushPose();
+        dhl.translate(0.0, float10, 0.0);
+        dhl.mulPose(this.entityRenderDispatcher.cameraOrientation());
+        dhl.scale(-0.025f, -0.025f, 0.025f);
+        final Matrix4f b12 = dhl.last().pose();
         final float float11 = Minecraft.getInstance().options.getBackgroundOpacity(0.25f);
         final int integer3 = (int)(float11 * 255.0f) << 24;
-        final Font dch15 = this.getFont();
-        final float float12 = (float)(-dch15.width(string) / 2);
-        dch15.drawInBatch(string, float12, (float)integer2, 553648127, false, b12, dqt, boolean9, integer3, integer);
+        final Font dmt15 = this.getFont();
+        final float float12 = (float)(-dmt15.width(mr) / 2);
+        dmt15.drawInBatch(mr, float12, (float)integer2, 553648127, false, b12, ebz, boolean9, integer3, integer);
         if (boolean9) {
-            dch15.drawInBatch(string, float12, (float)integer2, -1, false, b12, dqt, false, 0, integer);
+            dmt15.drawInBatch(mr, float12, (float)integer2, -1, false, b12, ebz, false, 0, integer);
         }
-        cyl.popPose();
+        dhl.popPose();
     }
     
     public EntityRenderDispatcher getDispatcher() {
diff --git a/src/net/minecraft/client/renderer/entity/EvokerFangsRenderer.java b/src/net/minecraft/client/renderer/entity/EvokerFangsRenderer.java
index 6d2078c..1b86bfc 100644
--- a/src/net/minecraft/client/renderer/entity/EvokerFangsRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/EvokerFangsRenderer.java
@@ -14,14 +14,14 @@ public class EvokerFangsRenderer extends EntityRenderer<EvokerFangs> {
     private static final ResourceLocation TEXTURE_LOCATION;
     private final EvokerFangsModel<EvokerFangs> model;
     
-    public EvokerFangsRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public EvokerFangsRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.model = new EvokerFangsModel<EvokerFangs>();
     }
     
     @Override
-    public void render(final EvokerFangs ayr, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final float float4 = ayr.getAnimationProgress(float3);
+    public void render(final EvokerFangs bek, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final float float4 = bek.getAnimationProgress(float3);
         if (float4 == 0.0f) {
             return;
         }
@@ -29,21 +29,21 @@ public class EvokerFangsRenderer extends EntityRenderer<EvokerFangs> {
         if (float4 > 0.9f) {
             float5 *= (float)((1.0 - float4) / 0.10000000149011612);
         }
-        cyl.pushPose();
-        cyl.mulPose(Vector3f.YP.rotationDegrees(90.0f - ayr.yRot));
-        cyl.scale(-float5, -float5, float5);
+        dhl.pushPose();
+        dhl.mulPose(Vector3f.YP.rotationDegrees(90.0f - bek.yRot));
+        dhl.scale(-float5, -float5, float5);
         final float float6 = 0.03125f;
-        cyl.translate(0.0, -0.6259999871253967, 0.0);
-        cyl.scale(0.5f, 0.5f, 0.5f);
-        this.model.setupAnim(ayr, float4, 0.0f, 0.0f, ayr.yRot, ayr.xRot);
-        final VertexConsumer cyo11 = dqt.getBuffer(this.model.renderType(EvokerFangsRenderer.TEXTURE_LOCATION));
-        this.model.renderToBuffer(cyl, cyo11, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.popPose();
-        super.render(ayr, float2, float3, cyl, dqt, integer);
+        dhl.translate(0.0, -0.6259999871253967, 0.0);
+        dhl.scale(0.5f, 0.5f, 0.5f);
+        this.model.setupAnim(bek, float4, 0.0f, 0.0f, bek.yRot, bek.xRot);
+        final VertexConsumer dhp11 = ebz.getBuffer(this.model.renderType(EvokerFangsRenderer.TEXTURE_LOCATION));
+        this.model.renderToBuffer(dhl, dhp11, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.popPose();
+        super.render(bek, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final EvokerFangs ayr) {
+    public ResourceLocation getTextureLocation(final EvokerFangs bek) {
         return EvokerFangsRenderer.TEXTURE_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/EvokerRenderer.java b/src/net/minecraft/client/renderer/entity/EvokerRenderer.java
index 54811a1..d08d17e 100644
--- a/src/net/minecraft/client/renderer/entity/EvokerRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/EvokerRenderer.java
@@ -13,19 +13,19 @@ import net.minecraft.world.entity.monster.SpellcasterIllager;
 public class EvokerRenderer<T extends SpellcasterIllager> extends IllagerRenderer<T> {
     private static final ResourceLocation EVOKER_ILLAGER;
     
-    public EvokerRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new IllagerModel(0.0f, 0.0f, 64, 64), 0.5f);
+    public EvokerRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new IllagerModel(0.0f, 0.0f, 64, 64), 0.5f);
         this.addLayer((RenderLayer<T, IllagerModel<T>>)new ItemInHandLayer<T, IllagerModel<T>>(this) {
             @Override
-            public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T axi, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-                if (axi.isCastingSpell()) {
-                    super.render(cyl, dqt, integer, axi, float5, float6, float7, float8, float9, float10);
+            public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T bcl, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+                if (bcl.isCastingSpell()) {
+                    super.render(dhl, ebz, integer, bcl, float5, float6, float7, float8, float9, float10);
                 }
             }
         });
     }
     
-    public ResourceLocation getTextureLocation(final T axi) {
+    public ResourceLocation getTextureLocation(final T bcl) {
         return EvokerRenderer.EVOKER_ILLAGER;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.java b/src/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.java
index bdef461..655e458 100644
--- a/src/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.java
@@ -9,6 +9,7 @@ import com.mojang.math.Vector3f;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.util.Mth;
+import net.minecraft.core.BlockPos;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.ExperienceOrb;
@@ -17,21 +18,21 @@ public class ExperienceOrbRenderer extends EntityRenderer<ExperienceOrb> {
     private static final ResourceLocation EXPERIENCE_ORB_LOCATION;
     private static final RenderType RENDER_TYPE;
     
-    public ExperienceOrbRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public ExperienceOrbRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.shadowRadius = 0.15f;
         this.shadowStrength = 0.75f;
     }
     
     @Override
-    protected int getBlockLightLevel(final ExperienceOrb akw, final float float2) {
-        return Mth.clamp(super.getBlockLightLevel(akw, float2) + 7, 0, 15);
+    protected int getBlockLightLevel(final ExperienceOrb aos, final BlockPos fu) {
+        return Mth.clamp(super.getBlockLightLevel(aos, fu) + 7, 0, 15);
     }
     
     @Override
-    public void render(final ExperienceOrb akw, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        final int integer2 = akw.getIcon();
+    public void render(final ExperienceOrb aos, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        final int integer2 = aos.getIcon();
         final float float4 = (integer2 % 4 * 16 + 0) / 64.0f;
         final float float5 = (integer2 % 4 * 16 + 16) / 64.0f;
         final float float6 = (integer2 / 4 * 16 + 0) / 64.0f;
@@ -40,38 +41,38 @@ public class ExperienceOrbRenderer extends EntityRenderer<ExperienceOrb> {
         final float float9 = 0.5f;
         final float float10 = 0.25f;
         final float float11 = 255.0f;
-        final float float12 = (akw.tickCount + float3) / 2.0f;
+        final float float12 = (aos.tickCount + float3) / 2.0f;
         final int integer3 = (int)((Mth.sin(float12 + 0.0f) + 1.0f) * 0.5f * 255.0f);
         final int integer4 = 255;
         final int integer5 = (int)((Mth.sin(float12 + 4.1887903f) + 1.0f) * 0.1f * 255.0f);
-        cyl.translate(0.0, 0.10000000149011612, 0.0);
-        cyl.mulPose(this.entityRenderDispatcher.cameraOrientation());
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
+        dhl.translate(0.0, 0.10000000149011612, 0.0);
+        dhl.mulPose(this.entityRenderDispatcher.cameraOrientation());
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
         final float float13 = 0.3f;
-        cyl.scale(0.3f, 0.3f, 0.3f);
-        final VertexConsumer cyo22 = dqt.getBuffer(ExperienceOrbRenderer.RENDER_TYPE);
-        final PoseStack.Pose a23 = cyl.last();
+        dhl.scale(0.3f, 0.3f, 0.3f);
+        final VertexConsumer dhp22 = ebz.getBuffer(ExperienceOrbRenderer.RENDER_TYPE);
+        final PoseStack.Pose a23 = dhl.last();
         final Matrix4f b24 = a23.pose();
         final Matrix3f a24 = a23.normal();
-        vertex(cyo22, b24, a24, -0.5f, -0.25f, integer3, 255, integer5, float4, float7, integer);
-        vertex(cyo22, b24, a24, 0.5f, -0.25f, integer3, 255, integer5, float5, float7, integer);
-        vertex(cyo22, b24, a24, 0.5f, 0.75f, integer3, 255, integer5, float5, float6, integer);
-        vertex(cyo22, b24, a24, -0.5f, 0.75f, integer3, 255, integer5, float4, float6, integer);
-        cyl.popPose();
-        super.render(akw, float2, float3, cyl, dqt, integer);
+        vertex(dhp22, b24, a24, -0.5f, -0.25f, integer3, 255, integer5, float4, float7, integer);
+        vertex(dhp22, b24, a24, 0.5f, -0.25f, integer3, 255, integer5, float5, float7, integer);
+        vertex(dhp22, b24, a24, 0.5f, 0.75f, integer3, 255, integer5, float5, float6, integer);
+        vertex(dhp22, b24, a24, -0.5f, 0.75f, integer3, 255, integer5, float4, float6, integer);
+        dhl.popPose();
+        super.render(aos, float2, float3, dhl, ebz, integer);
     }
     
-    private static void vertex(final VertexConsumer cyo, final Matrix4f b, final Matrix3f a, final float float4, final float float5, final int integer6, final int integer7, final int integer8, final float float9, final float float10, final int integer11) {
-        cyo.vertex(b, float4, float5, 0.0f).color(integer6, integer7, integer8, 128).uv(float9, float10).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer11).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
+    private static void vertex(final VertexConsumer dhp, final Matrix4f b, final Matrix3f a, final float float4, final float float5, final int integer6, final int integer7, final int integer8, final float float9, final float float10, final int integer11) {
+        dhp.vertex(b, float4, float5, 0.0f).color(integer6, integer7, integer8, 128).uv(float9, float10).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer11).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final ExperienceOrb akw) {
+    public ResourceLocation getTextureLocation(final ExperienceOrb aos) {
         return ExperienceOrbRenderer.EXPERIENCE_ORB_LOCATION;
     }
     
     static {
         EXPERIENCE_ORB_LOCATION = new ResourceLocation("textures/entity/experience_orb.png");
-        RENDER_TYPE = RenderType.entityTranslucent(ExperienceOrbRenderer.EXPERIENCE_ORB_LOCATION);
+        RENDER_TYPE = RenderType.itemEntityTranslucentCull(ExperienceOrbRenderer.EXPERIENCE_ORB_LOCATION);
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/FallingBlockRenderer.java b/src/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
index 63615a7..27d9358 100644
--- a/src/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
@@ -1,5 +1,6 @@
 package net.minecraft.client.renderer.entity;
 
+import net.minecraft.world.entity.Entity;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
@@ -10,7 +11,6 @@ import net.minecraft.client.renderer.texture.OverlayTexture;
 import java.util.Random;
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.Minecraft;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -18,32 +18,32 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.entity.item.FallingBlockEntity;
 
 public class FallingBlockRenderer extends EntityRenderer<FallingBlockEntity> {
-    public FallingBlockRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public FallingBlockRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.shadowRadius = 0.5f;
     }
     
     @Override
-    public void render(final FallingBlockEntity awa, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final BlockState byj8 = awa.getBlockState();
-        if (byj8.getRenderShape() != RenderShape.MODEL) {
+    public void render(final FallingBlockEntity bbf, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final BlockState cfj8 = bbf.getBlockState();
+        if (cfj8.getRenderShape() != RenderShape.MODEL) {
             return;
         }
-        final Level bjw9 = awa.getLevel();
-        if (byj8 == bjw9.getBlockState(new BlockPos(awa)) || byj8.getRenderShape() == RenderShape.INVISIBLE) {
+        final Level bqb9 = bbf.getLevel();
+        if (cfj8 == bqb9.getBlockState(bbf.blockPosition()) || cfj8.getRenderShape() == RenderShape.INVISIBLE) {
             return;
         }
-        cyl.pushPose();
-        final BlockPos fk10 = new BlockPos(awa.getX(), awa.getBoundingBox().maxY, awa.getZ());
-        cyl.translate(-0.5, 0.0, -0.5);
-        final BlockRenderDispatcher drk11 = Minecraft.getInstance().getBlockRenderer();
-        drk11.getModelRenderer().tesselateBlock(bjw9, drk11.getBlockModel(byj8), byj8, fk10, cyl, dqt.getBuffer(ItemBlockRenderTypes.getChunkRenderType(byj8)), false, new Random(), byj8.getSeed(awa.getStartPos()), OverlayTexture.NO_OVERLAY);
-        cyl.popPose();
-        super.render(awa, float2, float3, cyl, dqt, integer);
+        dhl.pushPose();
+        final BlockPos fu10 = new BlockPos(bbf.getX(), bbf.getBoundingBox().maxY, bbf.getZ());
+        dhl.translate(-0.5, 0.0, -0.5);
+        final BlockRenderDispatcher ecq11 = Minecraft.getInstance().getBlockRenderer();
+        ecq11.getModelRenderer().tesselateBlock(bqb9, ecq11.getBlockModel(cfj8), cfj8, fu10, dhl, ebz.getBuffer(ItemBlockRenderTypes.getMovingBlockRenderType(cfj8)), false, new Random(), cfj8.getSeed(bbf.getStartPos()), OverlayTexture.NO_OVERLAY);
+        dhl.popPose();
+        super.render(bbf, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final FallingBlockEntity awa) {
+    public ResourceLocation getTextureLocation(final FallingBlockEntity bbf) {
         return TextureAtlas.LOCATION_BLOCKS;
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/FireworkEntityRenderer.java b/src/net/minecraft/client/renderer/entity/FireworkEntityRenderer.java
index cb9109d..bef5f8a 100644
--- a/src/net/minecraft/client/renderer/entity/FireworkEntityRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/FireworkEntityRenderer.java
@@ -13,28 +13,28 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity;
 public class FireworkEntityRenderer extends EntityRenderer<FireworkRocketEntity> {
     private final ItemRenderer itemRenderer;
     
-    public FireworkEntityRenderer(final EntityRenderDispatcher dvf, final ItemRenderer dvz) {
-        super(dvf);
-        this.itemRenderer = dvz;
+    public FireworkEntityRenderer(final EntityRenderDispatcher egm, final ItemRenderer ehh) {
+        super(egm);
+        this.itemRenderer = ehh;
     }
     
     @Override
-    public void render(final FireworkRocketEntity ayu, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.mulPose(this.entityRenderDispatcher.cameraOrientation());
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
-        if (ayu.isShotAtAngle()) {
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
-            cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
-            cyl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
+    public void render(final FireworkRocketEntity ben, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        dhl.mulPose(this.entityRenderDispatcher.cameraOrientation());
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
+        if (ben.isShotAtAngle()) {
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
+            dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
+            dhl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
         }
-        this.itemRenderer.renderStatic(ayu.getItem(), ItemTransforms.TransformType.GROUND, integer, OverlayTexture.NO_OVERLAY, cyl, dqt);
-        cyl.popPose();
-        super.render(ayu, float2, float3, cyl, dqt, integer);
+        this.itemRenderer.renderStatic(ben.getItem(), ItemTransforms.TransformType.GROUND, integer, OverlayTexture.NO_OVERLAY, dhl, ebz);
+        dhl.popPose();
+        super.render(ben, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final FireworkRocketEntity ayu) {
+    public ResourceLocation getTextureLocation(final FireworkRocketEntity ben) {
         return TextureAtlas.LOCATION_BLOCKS;
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/FishingHookRenderer.java b/src/net/minecraft/client/renderer/entity/FishingHookRenderer.java
index 65db3b6..8eccda8 100644
--- a/src/net/minecraft/client/renderer/entity/FishingHookRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/FishingHookRenderer.java
@@ -17,44 +17,44 @@ import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.fishing.FishingHook;
+import net.minecraft.world.entity.projectile.FishingHook;
 
 public class FishingHookRenderer extends EntityRenderer<FishingHook> {
     private static final ResourceLocation TEXTURE_LOCATION;
     private static final RenderType RENDER_TYPE;
     
-    public FishingHookRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public FishingHookRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    public void render(final FishingHook avw, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final Player ayj8 = avw.getOwner();
-        if (ayj8 == null) {
+    public void render(final FishingHook beo, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final Player bec8 = beo.getPlayerOwner();
+        if (bec8 == null) {
             return;
         }
-        cyl.pushPose();
-        cyl.pushPose();
-        cyl.scale(0.5f, 0.5f, 0.5f);
-        cyl.mulPose(this.entityRenderDispatcher.cameraOrientation());
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
-        final PoseStack.Pose a9 = cyl.last();
+        dhl.pushPose();
+        dhl.pushPose();
+        dhl.scale(0.5f, 0.5f, 0.5f);
+        dhl.mulPose(this.entityRenderDispatcher.cameraOrientation());
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
+        final PoseStack.Pose a9 = dhl.last();
         final Matrix4f b10 = a9.pose();
         final Matrix3f a10 = a9.normal();
-        final VertexConsumer cyo12 = dqt.getBuffer(FishingHookRenderer.RENDER_TYPE);
-        vertex(cyo12, b10, a10, integer, 0.0f, 0, 0, 1);
-        vertex(cyo12, b10, a10, integer, 1.0f, 0, 1, 1);
-        vertex(cyo12, b10, a10, integer, 1.0f, 1, 1, 0);
-        vertex(cyo12, b10, a10, integer, 0.0f, 1, 0, 0);
-        cyl.popPose();
-        int integer2 = (ayj8.getMainArm() == HumanoidArm.RIGHT) ? 1 : -1;
-        final ItemStack ben14 = ayj8.getMainHandItem();
-        if (ben14.getItem() != Items.FISHING_ROD) {
+        final VertexConsumer dhp12 = ebz.getBuffer(FishingHookRenderer.RENDER_TYPE);
+        vertex(dhp12, b10, a10, integer, 0.0f, 0, 0, 1);
+        vertex(dhp12, b10, a10, integer, 1.0f, 0, 1, 1);
+        vertex(dhp12, b10, a10, integer, 1.0f, 1, 1, 0);
+        vertex(dhp12, b10, a10, integer, 0.0f, 1, 0, 0);
+        dhl.popPose();
+        int integer2 = (bec8.getMainArm() == HumanoidArm.RIGHT) ? 1 : -1;
+        final ItemStack bki14 = bec8.getMainHandItem();
+        if (bki14.getItem() != Items.FISHING_ROD) {
             integer2 = -integer2;
         }
-        final float float4 = ayj8.getAttackAnim(float3);
+        final float float4 = bec8.getAttackAnim(float3);
         final float float5 = Mth.sin(Mth.sqrt(float4) * 3.1415927f);
-        final float float6 = Mth.lerp(float3, ayj8.yBodyRotO, ayj8.yBodyRot) * 0.017453292f;
+        final float float6 = Mth.lerp(float3, bec8.yBodyRotO, bec8.yBodyRot) * 0.017453292f;
         final double double18 = Mth.sin(float6);
         final double double19 = Mth.cos(float6);
         final double double20 = integer2 * 0.35;
@@ -63,56 +63,56 @@ public class FishingHookRenderer extends EntityRenderer<FishingHook> {
         double double23;
         double double24;
         float float7;
-        if ((this.entityRenderDispatcher.options != null && this.entityRenderDispatcher.options.thirdPersonView > 0) || ayj8 != Minecraft.getInstance().player) {
-            double22 = Mth.lerp(float3, ayj8.xo, ayj8.getX()) - double19 * double20 - double18 * 0.8;
-            double23 = ayj8.yo + ayj8.getEyeHeight() + (ayj8.getY() - ayj8.yo) * float3 - 0.45;
-            double24 = Mth.lerp(float3, ayj8.zo, ayj8.getZ()) - double18 * double20 + double19 * 0.8;
-            float7 = (ayj8.isCrouching() ? -0.1875f : 0.0f);
+        if ((this.entityRenderDispatcher.options != null && this.entityRenderDispatcher.options.thirdPersonView > 0) || bec8 != Minecraft.getInstance().player) {
+            double22 = Mth.lerp(float3, bec8.xo, bec8.getX()) - double19 * double20 - double18 * 0.8;
+            double23 = bec8.yo + bec8.getEyeHeight() + (bec8.getY() - bec8.yo) * float3 - 0.45;
+            double24 = Mth.lerp(float3, bec8.zo, bec8.getZ()) - double18 * double20 + double19 * 0.8;
+            float7 = (bec8.isCrouching() ? -0.1875f : 0.0f);
         }
         else {
             double double25 = this.entityRenderDispatcher.options.fov;
             double25 /= 100.0;
-            Vec3 cvl35 = new Vec3(integer2 * -0.36 * double25, -0.045 * double25, 0.4);
-            cvl35 = cvl35.xRot(-Mth.lerp(float3, ayj8.xRotO, ayj8.xRot) * 0.017453292f);
-            cvl35 = cvl35.yRot(-Mth.lerp(float3, ayj8.yRotO, ayj8.yRot) * 0.017453292f);
-            cvl35 = cvl35.yRot(float5 * 0.5f);
-            cvl35 = cvl35.xRot(-float5 * 0.7f);
-            double22 = Mth.lerp(float3, ayj8.xo, ayj8.getX()) + cvl35.x;
-            double23 = Mth.lerp(float3, ayj8.yo, ayj8.getY()) + cvl35.y;
-            double24 = Mth.lerp(float3, ayj8.zo, ayj8.getZ()) + cvl35.z;
-            float7 = ayj8.getEyeHeight();
+            Vec3 dem35 = new Vec3(integer2 * -0.36 * double25, -0.045 * double25, 0.4);
+            dem35 = dem35.xRot(-Mth.lerp(float3, bec8.xRotO, bec8.xRot) * 0.017453292f);
+            dem35 = dem35.yRot(-Mth.lerp(float3, bec8.yRotO, bec8.yRot) * 0.017453292f);
+            dem35 = dem35.yRot(float5 * 0.5f);
+            dem35 = dem35.xRot(-float5 * 0.7f);
+            double22 = Mth.lerp(float3, bec8.xo, bec8.getX()) + dem35.x;
+            double23 = Mth.lerp(float3, bec8.yo, bec8.getY()) + dem35.y;
+            double24 = Mth.lerp(float3, bec8.zo, bec8.getZ()) + dem35.z;
+            float7 = bec8.getEyeHeight();
         }
-        double double25 = Mth.lerp(float3, avw.xo, avw.getX());
-        final double double26 = Mth.lerp(float3, avw.yo, avw.getY()) + 0.25;
-        final double double27 = Mth.lerp(float3, avw.zo, avw.getZ());
+        double double25 = Mth.lerp(float3, beo.xo, beo.getX());
+        final double double26 = Mth.lerp(float3, beo.yo, beo.getY()) + 0.25;
+        final double double27 = Mth.lerp(float3, beo.zo, beo.getZ());
         final float float8 = (float)(double22 - double25);
         final float float9 = (float)(double23 - double26) + float7;
         final float float10 = (float)(double24 - double27);
-        final VertexConsumer cyo13 = dqt.getBuffer(RenderType.lines());
-        final Matrix4f b11 = cyl.last().pose();
+        final VertexConsumer dhp13 = ebz.getBuffer(RenderType.lines());
+        final Matrix4f b11 = dhl.last().pose();
         final int integer3 = 16;
         for (int integer4 = 0; integer4 < 16; ++integer4) {
-            stringVertex(float8, float9, float10, cyo13, b11, fraction(integer4, 16));
-            stringVertex(float8, float9, float10, cyo13, b11, fraction(integer4 + 1, 16));
+            stringVertex(float8, float9, float10, dhp13, b11, fraction(integer4, 16));
+            stringVertex(float8, float9, float10, dhp13, b11, fraction(integer4 + 1, 16));
         }
-        cyl.popPose();
-        super.render(avw, float2, float3, cyl, dqt, integer);
+        dhl.popPose();
+        super.render(beo, float2, float3, dhl, ebz, integer);
     }
     
     private static float fraction(final int integer1, final int integer2) {
         return integer1 / (float)integer2;
     }
     
-    private static void vertex(final VertexConsumer cyo, final Matrix4f b, final Matrix3f a, final int integer4, final float float5, final int integer6, final int integer7, final int integer8) {
-        cyo.vertex(b, float5 - 0.5f, integer6 - 0.5f, 0.0f).color(255, 255, 255, 255).uv((float)integer7, (float)integer8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer4).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
+    private static void vertex(final VertexConsumer dhp, final Matrix4f b, final Matrix3f a, final int integer4, final float float5, final int integer6, final int integer7, final int integer8) {
+        dhp.vertex(b, float5 - 0.5f, integer6 - 0.5f, 0.0f).color(255, 255, 255, 255).uv((float)integer7, (float)integer8).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer4).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
     }
     
-    private static void stringVertex(final float float1, final float float2, final float float3, final VertexConsumer cyo, final Matrix4f b, final float float6) {
-        cyo.vertex(b, float1 * float6, float2 * (float6 * float6 + float6) * 0.5f + 0.25f, float3 * float6).color(0, 0, 0, 255).endVertex();
+    private static void stringVertex(final float float1, final float float2, final float float3, final VertexConsumer dhp, final Matrix4f b, final float float6) {
+        dhp.vertex(b, float1 * float6, float2 * (float6 * float6 + float6) * 0.5f + 0.25f, float3 * float6).color(0, 0, 0, 255).endVertex();
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final FishingHook avw) {
+    public ResourceLocation getTextureLocation(final FishingHook beo) {
         return FishingHookRenderer.TEXTURE_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/FoxRenderer.java b/src/net/minecraft/client/renderer/entity/FoxRenderer.java
index c680578..4298610 100644
--- a/src/net/minecraft/client/renderer/entity/FoxRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/FoxRenderer.java
@@ -17,26 +17,26 @@ public class FoxRenderer extends MobRenderer<Fox, FoxModel<Fox>> {
     private static final ResourceLocation SNOW_FOX_TEXTURE;
     private static final ResourceLocation SNOW_FOX_SLEEP_TEXTURE;
     
-    public FoxRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new FoxModel(), 0.4f);
+    public FoxRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new FoxModel(), 0.4f);
         this.addLayer(new FoxHeldItemLayer(this));
     }
     
     @Override
-    protected void setupRotations(final Fox atk, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        super.setupRotations(atk, cyl, float3, float4, float5);
-        if (atk.isPouncing() || atk.isFaceplanted()) {
-            final float float6 = -Mth.lerp(float5, atk.xRotO, atk.xRot);
-            cyl.mulPose(Vector3f.XP.rotationDegrees(float6));
+    protected void setupRotations(final Fox ays, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        super.setupRotations(ays, dhl, float3, float4, float5);
+        if (ays.isPouncing() || ays.isFaceplanted()) {
+            final float float6 = -Mth.lerp(float5, ays.xRotO, ays.xRot);
+            dhl.mulPose(Vector3f.XP.rotationDegrees(float6));
         }
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Fox atk) {
-        if (atk.getFoxType() == Fox.Type.RED) {
-            return atk.isSleeping() ? FoxRenderer.RED_FOX_SLEEP_TEXTURE : FoxRenderer.RED_FOX_TEXTURE;
+    public ResourceLocation getTextureLocation(final Fox ays) {
+        if (ays.getFoxType() == Fox.Type.RED) {
+            return ays.isSleeping() ? FoxRenderer.RED_FOX_SLEEP_TEXTURE : FoxRenderer.RED_FOX_TEXTURE;
         }
-        return atk.isSleeping() ? FoxRenderer.SNOW_FOX_SLEEP_TEXTURE : FoxRenderer.SNOW_FOX_TEXTURE;
+        return ays.isSleeping() ? FoxRenderer.SNOW_FOX_SLEEP_TEXTURE : FoxRenderer.SNOW_FOX_TEXTURE;
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/GhastRenderer.java b/src/net/minecraft/client/renderer/entity/GhastRenderer.java
index 8d5b896..758d517 100644
--- a/src/net/minecraft/client/renderer/entity/GhastRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/GhastRenderer.java
@@ -11,24 +11,24 @@ public class GhastRenderer extends MobRenderer<Ghast, GhastModel<Ghast>> {
     private static final ResourceLocation GHAST_LOCATION;
     private static final ResourceLocation GHAST_SHOOTING_LOCATION;
     
-    public GhastRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new GhastModel(), 1.5f);
+    public GhastRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new GhastModel(), 1.5f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Ghast awq) {
-        if (awq.isCharging()) {
+    public ResourceLocation getTextureLocation(final Ghast bbv) {
+        if (bbv.isCharging()) {
             return GhastRenderer.GHAST_SHOOTING_LOCATION;
         }
         return GhastRenderer.GHAST_LOCATION;
     }
     
     @Override
-    protected void scale(final Ghast awq, final PoseStack cyl, final float float3) {
+    protected void scale(final Ghast bbv, final PoseStack dhl, final float float3) {
         final float float4 = 1.0f;
         final float float5 = 4.5f;
         final float float6 = 4.5f;
-        cyl.scale(4.5f, 4.5f, 4.5f);
+        dhl.scale(4.5f, 4.5f, 4.5f);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/GiantMobRenderer.java b/src/net/minecraft/client/renderer/entity/GiantMobRenderer.java
index 255fb77..7e9d8e2 100644
--- a/src/net/minecraft/client/renderer/entity/GiantMobRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/GiantMobRenderer.java
@@ -15,20 +15,20 @@ public class GiantMobRenderer extends MobRenderer<Giant, HumanoidModel<Giant>> {
     private static final ResourceLocation ZOMBIE_LOCATION;
     private final float scale;
     
-    public GiantMobRenderer(final EntityRenderDispatcher dvf, final float float2) {
-        super(dvf, new GiantZombieModel(), 0.5f * float2);
+    public GiantMobRenderer(final EntityRenderDispatcher egm, final float float2) {
+        super(egm, new GiantZombieModel(), 0.5f * float2);
         this.scale = float2;
         this.addLayer(new ItemInHandLayer<Giant, HumanoidModel<Giant>>(this));
         this.addLayer((RenderLayer<Giant, HumanoidModel<Giant>>)new HumanoidArmorLayer((RenderLayerParent<LivingEntity, HumanoidModel>)this, new GiantZombieModel(0.5f, true), new GiantZombieModel(1.0f, true)));
     }
     
     @Override
-    protected void scale(final Giant awr, final PoseStack cyl, final float float3) {
-        cyl.scale(this.scale, this.scale, this.scale);
+    protected void scale(final Giant bbw, final PoseStack dhl, final float float3) {
+        dhl.scale(this.scale, this.scale, this.scale);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Giant awr) {
+    public ResourceLocation getTextureLocation(final Giant bbw) {
         return GiantMobRenderer.ZOMBIE_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/GuardianRenderer.java b/src/net/minecraft/client/renderer/entity/GuardianRenderer.java
index 8ab6c4c..d99bc1b 100644
--- a/src/net/minecraft/client/renderer/entity/GuardianRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/GuardianRenderer.java
@@ -24,57 +24,57 @@ public class GuardianRenderer extends MobRenderer<Guardian, GuardianModel> {
     private static final ResourceLocation GUARDIAN_BEAM_LOCATION;
     private static final RenderType BEAM_RENDER_TYPE;
     
-    public GuardianRenderer(final EntityRenderDispatcher dvf) {
-        this(dvf, 0.5f);
+    public GuardianRenderer(final EntityRenderDispatcher egm) {
+        this(egm, 0.5f);
     }
     
-    protected GuardianRenderer(final EntityRenderDispatcher dvf, final float float2) {
-        super(dvf, new GuardianModel(), float2);
+    protected GuardianRenderer(final EntityRenderDispatcher egm, final float float2) {
+        super(egm, new GuardianModel(), float2);
     }
     
     @Override
-    public boolean shouldRender(final Guardian aws, final Frustum dtm, final double double3, final double double4, final double double5) {
-        if (super.shouldRender(aws, dtm, double3, double4, double5)) {
+    public boolean shouldRender(final Guardian bbx, final Frustum ees, final double double3, final double double4, final double double5) {
+        if (super.shouldRender(bbx, ees, double3, double4, double5)) {
             return true;
         }
-        if (aws.hasActiveAttackTarget()) {
-            final LivingEntity akz10 = aws.getActiveAttackTarget();
-            if (akz10 != null) {
-                final Vec3 cvl11 = this.getPosition(akz10, akz10.getBbHeight() * 0.5, 1.0f);
-                final Vec3 cvl12 = this.getPosition(aws, aws.getEyeHeight(), 1.0f);
-                return dtm.isVisible(new AABB(cvl12.x, cvl12.y, cvl12.z, cvl11.x, cvl11.y, cvl11.z));
+        if (bbx.hasActiveAttackTarget()) {
+            final LivingEntity aoy10 = bbx.getActiveAttackTarget();
+            if (aoy10 != null) {
+                final Vec3 dem11 = this.getPosition(aoy10, aoy10.getBbHeight() * 0.5, 1.0f);
+                final Vec3 dem12 = this.getPosition(bbx, bbx.getEyeHeight(), 1.0f);
+                return ees.isVisible(new AABB(dem12.x, dem12.y, dem12.z, dem11.x, dem11.y, dem11.z));
             }
         }
         return false;
     }
     
-    private Vec3 getPosition(final LivingEntity akz, final double double2, final float float3) {
-        final double double3 = Mth.lerp(float3, akz.xOld, akz.getX());
-        final double double4 = Mth.lerp(float3, akz.yOld, akz.getY()) + double2;
-        final double double5 = Mth.lerp(float3, akz.zOld, akz.getZ());
+    private Vec3 getPosition(final LivingEntity aoy, final double double2, final float float3) {
+        final double double3 = Mth.lerp(float3, aoy.xOld, aoy.getX());
+        final double double4 = Mth.lerp(float3, aoy.yOld, aoy.getY()) + double2;
+        final double double5 = Mth.lerp(float3, aoy.zOld, aoy.getZ());
         return new Vec3(double3, double4, double5);
     }
     
     @Override
-    public void render(final Guardian aws, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        super.render(aws, float2, float3, cyl, dqt, integer);
-        final LivingEntity akz8 = aws.getActiveAttackTarget();
-        if (akz8 != null) {
-            final float float4 = aws.getAttackAnimationScale(float3);
-            final float float5 = aws.level.getGameTime() + float3;
+    public void render(final Guardian bbx, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        super.render(bbx, float2, float3, dhl, ebz, integer);
+        final LivingEntity aoy8 = bbx.getActiveAttackTarget();
+        if (aoy8 != null) {
+            final float float4 = bbx.getAttackAnimationScale(float3);
+            final float float5 = bbx.level.getGameTime() + float3;
             final float float6 = float5 * 0.5f % 1.0f;
-            final float float7 = aws.getEyeHeight();
-            cyl.pushPose();
-            cyl.translate(0.0, float7, 0.0);
-            final Vec3 cvl13 = this.getPosition(akz8, akz8.getBbHeight() * 0.5, float3);
-            final Vec3 cvl14 = this.getPosition(aws, float7, float3);
-            Vec3 cvl15 = cvl13.subtract(cvl14);
-            final float float8 = (float)(cvl15.length() + 1.0);
-            cvl15 = cvl15.normalize();
-            final float float9 = (float)Math.acos(cvl15.y);
-            final float float10 = (float)Math.atan2(cvl15.z, cvl15.x);
-            cyl.mulPose(Vector3f.YP.rotationDegrees((1.5707964f - float10) * 57.295776f));
-            cyl.mulPose(Vector3f.XP.rotationDegrees(float9 * 57.295776f));
+            final float float7 = bbx.getEyeHeight();
+            dhl.pushPose();
+            dhl.translate(0.0, float7, 0.0);
+            final Vec3 dem13 = this.getPosition(aoy8, aoy8.getBbHeight() * 0.5, float3);
+            final Vec3 dem14 = this.getPosition(bbx, float7, float3);
+            Vec3 dem15 = dem13.subtract(dem14);
+            final float float8 = (float)(dem15.length() + 1.0);
+            dem15 = dem15.normalize();
+            final float float9 = (float)Math.acos(dem15.y);
+            final float float10 = (float)Math.atan2(dem15.z, dem15.x);
+            dhl.mulPose(Vector3f.YP.rotationDegrees((1.5707964f - float10) * 57.295776f));
+            dhl.mulPose(Vector3f.XP.rotationDegrees(float9 * 57.295776f));
             final int integer2 = 1;
             final float float11 = float5 * 0.05f * -1.5f;
             final float float12 = float4 * float4;
@@ -104,36 +104,36 @@ public class GuardianRenderer extends MobRenderer<Guardian, GuardianModel> {
             final float float33 = 0.4999f;
             final float float34 = -1.0f + float6;
             final float float35 = float8 * 2.5f + float34;
-            final VertexConsumer cyo48 = dqt.getBuffer(GuardianRenderer.BEAM_RENDER_TYPE);
-            final PoseStack.Pose a49 = cyl.last();
+            final VertexConsumer dhp48 = ebz.getBuffer(GuardianRenderer.BEAM_RENDER_TYPE);
+            final PoseStack.Pose a49 = dhl.last();
             final Matrix4f b50 = a49.pose();
             final Matrix3f a50 = a49.normal();
-            vertex(cyo48, b50, a50, float23, float31, float24, integer3, integer4, integer5, 0.4999f, float35);
-            vertex(cyo48, b50, a50, float23, 0.0f, float24, integer3, integer4, integer5, 0.4999f, float34);
-            vertex(cyo48, b50, a50, float25, 0.0f, float26, integer3, integer4, integer5, 0.0f, float34);
-            vertex(cyo48, b50, a50, float25, float31, float26, integer3, integer4, integer5, 0.0f, float35);
-            vertex(cyo48, b50, a50, float27, float31, float28, integer3, integer4, integer5, 0.4999f, float35);
-            vertex(cyo48, b50, a50, float27, 0.0f, float28, integer3, integer4, integer5, 0.4999f, float34);
-            vertex(cyo48, b50, a50, float29, 0.0f, float30, integer3, integer4, integer5, 0.0f, float34);
-            vertex(cyo48, b50, a50, float29, float31, float30, integer3, integer4, integer5, 0.0f, float35);
+            vertex(dhp48, b50, a50, float23, float31, float24, integer3, integer4, integer5, 0.4999f, float35);
+            vertex(dhp48, b50, a50, float23, 0.0f, float24, integer3, integer4, integer5, 0.4999f, float34);
+            vertex(dhp48, b50, a50, float25, 0.0f, float26, integer3, integer4, integer5, 0.0f, float34);
+            vertex(dhp48, b50, a50, float25, float31, float26, integer3, integer4, integer5, 0.0f, float35);
+            vertex(dhp48, b50, a50, float27, float31, float28, integer3, integer4, integer5, 0.4999f, float35);
+            vertex(dhp48, b50, a50, float27, 0.0f, float28, integer3, integer4, integer5, 0.4999f, float34);
+            vertex(dhp48, b50, a50, float29, 0.0f, float30, integer3, integer4, integer5, 0.0f, float34);
+            vertex(dhp48, b50, a50, float29, float31, float30, integer3, integer4, integer5, 0.0f, float35);
             float float36 = 0.0f;
-            if (aws.tickCount % 2 == 0) {
+            if (bbx.tickCount % 2 == 0) {
                 float36 = 0.5f;
             }
-            vertex(cyo48, b50, a50, float15, float31, float16, integer3, integer4, integer5, 0.5f, float36 + 0.5f);
-            vertex(cyo48, b50, a50, float17, float31, float18, integer3, integer4, integer5, 1.0f, float36 + 0.5f);
-            vertex(cyo48, b50, a50, float21, float31, float22, integer3, integer4, integer5, 1.0f, float36);
-            vertex(cyo48, b50, a50, float19, float31, float20, integer3, integer4, integer5, 0.5f, float36);
-            cyl.popPose();
+            vertex(dhp48, b50, a50, float15, float31, float16, integer3, integer4, integer5, 0.5f, float36 + 0.5f);
+            vertex(dhp48, b50, a50, float17, float31, float18, integer3, integer4, integer5, 1.0f, float36 + 0.5f);
+            vertex(dhp48, b50, a50, float21, float31, float22, integer3, integer4, integer5, 1.0f, float36);
+            vertex(dhp48, b50, a50, float19, float31, float20, integer3, integer4, integer5, 0.5f, float36);
+            dhl.popPose();
         }
     }
     
-    private static void vertex(final VertexConsumer cyo, final Matrix4f b, final Matrix3f a, final float float4, final float float5, final float float6, final int integer7, final int integer8, final int integer9, final float float10, final float float11) {
-        cyo.vertex(b, float4, float5, float6).color(integer7, integer8, integer9, 255).uv(float10, float11).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(15728880).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
+    private static void vertex(final VertexConsumer dhp, final Matrix4f b, final Matrix3f a, final float float4, final float float5, final float float6, final int integer7, final int integer8, final int integer9, final float float10, final float float11) {
+        dhp.vertex(b, float4, float5, float6).color(integer7, integer8, integer9, 255).uv(float10, float11).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(15728880).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Guardian aws) {
+    public ResourceLocation getTextureLocation(final Guardian bbx) {
         return GuardianRenderer.GUARDIAN_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/HoglinRenderer.java b/src/net/minecraft/client/renderer/entity/HoglinRenderer.java
new file mode 100644
index 0000000..6aba03a
--- /dev/null
+++ b/src/net/minecraft/client/renderer/entity/HoglinRenderer.java
@@ -0,0 +1,29 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.model.HoglinModel;
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
+
+public class HoglinRenderer extends MobRenderer<Hoglin, HoglinModel<Hoglin>> {
+    private static final ResourceLocation HOGLIN_LOCATION;
+    
+    public HoglinRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new HoglinModel(), 0.7f);
+    }
+    
+    @Override
+    public ResourceLocation getTextureLocation(final Hoglin bcx) {
+        return HoglinRenderer.HOGLIN_LOCATION;
+    }
+    
+    @Override
+    protected boolean isShaking(final Hoglin bcx) {
+        return bcx.isConverting();
+    }
+    
+    static {
+        HOGLIN_LOCATION = new ResourceLocation("textures/entity/hoglin/hoglin.png");
+    }
+}
diff --git a/src/net/minecraft/client/renderer/entity/HorseRenderer.java b/src/net/minecraft/client/renderer/entity/HorseRenderer.java
index e0f4544..bc2ac85 100644
--- a/src/net/minecraft/client/renderer/entity/HorseRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/HorseRenderer.java
@@ -1,38 +1,41 @@
 package net.minecraft.client.renderer.entity;
 
+import net.minecraft.Util;
 import com.google.common.collect.Maps;
+import java.util.EnumMap;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.client.renderer.texture.AbstractTexture;
-import net.minecraft.client.renderer.texture.LayeredTexture;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.entity.layers.RenderLayer;
 import net.minecraft.client.renderer.entity.layers.HorseArmorLayer;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
+import net.minecraft.client.renderer.entity.layers.HorseMarkingLayer;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.animal.horse.Variant;
 import java.util.Map;
 import net.minecraft.client.model.HorseModel;
 import net.minecraft.world.entity.animal.horse.Horse;
 
 public final class HorseRenderer extends AbstractHorseRenderer<Horse, HorseModel<Horse>> {
-    private static final Map<String, ResourceLocation> LAYERED_LOCATION_CACHE;
+    private static final Map<Variant, ResourceLocation> LOCATION_BY_VARIANT;
     
-    public HorseRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new HorseModel(0.0f), 1.1f);
+    public HorseRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new HorseModel(0.0f), 1.1f);
+        this.addLayer(new HorseMarkingLayer(this));
         this.addLayer(new HorseArmorLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Horse aug) {
-        final String string3 = aug.getLayeredTextureHashName();
-        ResourceLocation sm4 = HorseRenderer.LAYERED_LOCATION_CACHE.get(string3);
-        if (sm4 == null) {
-            sm4 = new ResourceLocation(string3);
-            Minecraft.getInstance().getTextureManager().register(sm4, new LayeredTexture(aug.getLayeredTextureLayers()));
-            HorseRenderer.LAYERED_LOCATION_CACHE.put(string3, sm4);
-        }
-        return sm4;
+    public ResourceLocation getTextureLocation(final Horse azo) {
+        return HorseRenderer.LOCATION_BY_VARIANT.get(azo.getVariant());
     }
     
     static {
-        LAYERED_LOCATION_CACHE = Maps.newHashMap();
+        LOCATION_BY_VARIANT = Util.<Map<Variant, ResourceLocation>>make(Maps.newEnumMap(Variant.class), enumMap -> {
+            enumMap.put(Variant.WHITE, new ResourceLocation("textures/entity/horse/horse_white.png"));
+            enumMap.put(Variant.CREAMY, new ResourceLocation("textures/entity/horse/horse_creamy.png"));
+            enumMap.put(Variant.CHESTNUT, new ResourceLocation("textures/entity/horse/horse_chestnut.png"));
+            enumMap.put(Variant.BROWN, new ResourceLocation("textures/entity/horse/horse_brown.png"));
+            enumMap.put(Variant.BLACK, new ResourceLocation("textures/entity/horse/horse_black.png"));
+            enumMap.put(Variant.GRAY, new ResourceLocation("textures/entity/horse/horse_gray.png"));
+            enumMap.put(Variant.DARKBROWN, new ResourceLocation("textures/entity/horse/horse_darkbrown.png"));
+        });
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/HumanoidMobRenderer.java b/src/net/minecraft/client/renderer/entity/HumanoidMobRenderer.java
index a737356..ab7f470 100644
--- a/src/net/minecraft/client/renderer/entity/HumanoidMobRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/HumanoidMobRenderer.java
@@ -12,15 +12,19 @@ import net.minecraft.world.entity.Mob;
 public class HumanoidMobRenderer<T extends Mob, M extends HumanoidModel<T>> extends MobRenderer<T, M> {
     private static final ResourceLocation DEFAULT_LOCATION;
     
-    public HumanoidMobRenderer(final EntityRenderDispatcher dvf, final M dlj, final float float3) {
-        super(dvf, dlj, float3);
-        this.addLayer(new CustomHeadLayer<T, M>(this));
+    public HumanoidMobRenderer(final EntityRenderDispatcher egm, final M dwf, final float float3) {
+        this(egm, dwf, float3, 1.0f, 1.0f, 1.0f);
+    }
+    
+    public HumanoidMobRenderer(final EntityRenderDispatcher egm, final M dwf, final float float3, final float float4, final float float5, final float float6) {
+        super(egm, dwf, float3);
+        this.addLayer(new CustomHeadLayer<T, M>(this, float4, float5, float6));
         this.addLayer(new ElytraLayer<T, M>(this));
         this.addLayer(new ItemInHandLayer<T, M>(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final T ala) {
+    public ResourceLocation getTextureLocation(final T aoz) {
         return HumanoidMobRenderer.DEFAULT_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/HuskRenderer.java b/src/net/minecraft/client/renderer/entity/HuskRenderer.java
index d4f33b7..573d16c 100644
--- a/src/net/minecraft/client/renderer/entity/HuskRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/HuskRenderer.java
@@ -10,19 +10,19 @@ import net.minecraft.resources.ResourceLocation;
 public class HuskRenderer extends ZombieRenderer {
     private static final ResourceLocation HUSK_LOCATION;
     
-    public HuskRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public HuskRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    protected void scale(final Zombie axp, final PoseStack cyl, final float float3) {
+    protected void scale(final Zombie bcu, final PoseStack dhl, final float float3) {
         final float float4 = 1.0625f;
-        cyl.scale(1.0625f, 1.0625f, 1.0625f);
-        super.scale(axp, cyl, float3);
+        dhl.scale(1.0625f, 1.0625f, 1.0625f);
+        super.scale(bcu, dhl, float3);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Zombie axp) {
+    public ResourceLocation getTextureLocation(final Zombie bcu) {
         return HuskRenderer.HUSK_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/IllagerRenderer.java b/src/net/minecraft/client/renderer/entity/IllagerRenderer.java
index baa05df..c5ccfaa 100644
--- a/src/net/minecraft/client/renderer/entity/IllagerRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/IllagerRenderer.java
@@ -8,14 +8,14 @@ import net.minecraft.client.model.IllagerModel;
 import net.minecraft.world.entity.monster.AbstractIllager;
 
 public abstract class IllagerRenderer<T extends AbstractIllager> extends MobRenderer<T, IllagerModel<T>> {
-    protected IllagerRenderer(final EntityRenderDispatcher dvf, final IllagerModel<T> dlk, final float float3) {
-        super(dvf, dlk, float3);
+    protected IllagerRenderer(final EntityRenderDispatcher egm, final IllagerModel<T> dwg, final float float3) {
+        super(egm, dwg, float3);
         this.addLayer(new CustomHeadLayer<T, IllagerModel<T>>(this));
     }
     
     @Override
-    protected void scale(final T awe, final PoseStack cyl, final float float3) {
+    protected void scale(final T bbj, final PoseStack dhl, final float float3) {
         final float float4 = 0.9375f;
-        cyl.scale(0.9375f, 0.9375f, 0.9375f);
+        dhl.scale(0.9375f, 0.9375f, 0.9375f);
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/IllusionerRenderer.java b/src/net/minecraft/client/renderer/entity/IllusionerRenderer.java
index daae08a..90182dc 100644
--- a/src/net/minecraft/client/renderer/entity/IllusionerRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/IllusionerRenderer.java
@@ -16,40 +16,40 @@ import net.minecraft.world.entity.monster.Illusioner;
 public class IllusionerRenderer extends IllagerRenderer<Illusioner> {
     private static final ResourceLocation ILLUSIONER;
     
-    public IllusionerRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new IllagerModel(0.0f, 0.0f, 64, 64), 0.5f);
+    public IllusionerRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new IllagerModel(0.0f, 0.0f, 64, 64), 0.5f);
         this.addLayer((RenderLayer<T, IllagerModel<T>>)new ItemInHandLayer<Illusioner, IllagerModel<Illusioner>>(this) {
             @Override
-            public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Illusioner awu, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-                if (awu.isCastingSpell() || awu.isAggressive()) {
-                    super.render(cyl, dqt, integer, awu, float5, float6, float7, float8, float9, float10);
+            public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Illusioner bbz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+                if (bbz.isCastingSpell() || bbz.isAggressive()) {
+                    super.render(dhl, ebz, integer, bbz, float5, float6, float7, float8, float9, float10);
                 }
             }
         });
         ((IllagerModel)this.model).getHat().visible = true;
     }
     
-    public ResourceLocation getTextureLocation(final Illusioner awu) {
+    public ResourceLocation getTextureLocation(final Illusioner bbz) {
         return IllusionerRenderer.ILLUSIONER;
     }
     
-    public void render(final Illusioner awu, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        if (awu.isInvisible()) {
-            final Vec3[] arr8 = awu.getIllusionOffsets(float3);
-            final float float4 = ((LivingEntityRenderer<T, M>)this).getBob((T)awu, float3);
+    public void render(final Illusioner bbz, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        if (bbz.isInvisible()) {
+            final Vec3[] arr8 = bbz.getIllusionOffsets(float3);
+            final float float4 = ((LivingEntityRenderer<T, M>)this).getBob((T)bbz, float3);
             for (int integer2 = 0; integer2 < arr8.length; ++integer2) {
-                cyl.pushPose();
-                cyl.translate(arr8[integer2].x + Mth.cos(integer2 + float4 * 0.5f) * 0.025, arr8[integer2].y + Mth.cos(integer2 + float4 * 0.75f) * 0.0125, arr8[integer2].z + Mth.cos(integer2 + float4 * 0.7f) * 0.025);
-                super.render((T)awu, float2, float3, cyl, dqt, integer);
-                cyl.popPose();
+                dhl.pushPose();
+                dhl.translate(arr8[integer2].x + Mth.cos(integer2 + float4 * 0.5f) * 0.025, arr8[integer2].y + Mth.cos(integer2 + float4 * 0.75f) * 0.0125, arr8[integer2].z + Mth.cos(integer2 + float4 * 0.7f) * 0.025);
+                super.render((T)bbz, float2, float3, dhl, ebz, integer);
+                dhl.popPose();
             }
         }
         else {
-            super.render((T)awu, float2, float3, cyl, dqt, integer);
+            super.render((T)bbz, float2, float3, dhl, ebz, integer);
         }
     }
     
-    protected boolean isBodyVisible(final Illusioner awu) {
+    protected boolean isBodyVisible(final Illusioner bbz) {
         return true;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/IronGolemRenderer.java b/src/net/minecraft/client/renderer/entity/IronGolemRenderer.java
index 4d37bce..c71e64e 100644
--- a/src/net/minecraft/client/renderer/entity/IronGolemRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/IronGolemRenderer.java
@@ -14,27 +14,27 @@ import net.minecraft.world.entity.animal.IronGolem;
 public class IronGolemRenderer extends MobRenderer<IronGolem, IronGolemModel<IronGolem>> {
     private static final ResourceLocation GOLEM_LOCATION;
     
-    public IronGolemRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new IronGolemModel(), 0.7f);
+    public IronGolemRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new IronGolemModel(), 0.7f);
         this.addLayer(new IronGolemCrackinessLayer(this));
         this.addLayer(new IronGolemFlowerLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final IronGolem atl) {
+    public ResourceLocation getTextureLocation(final IronGolem ayt) {
         return IronGolemRenderer.GOLEM_LOCATION;
     }
     
     @Override
-    protected void setupRotations(final IronGolem atl, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        super.setupRotations(atl, cyl, float3, float4, float5);
-        if (atl.animationSpeed < 0.01) {
+    protected void setupRotations(final IronGolem ayt, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        super.setupRotations(ayt, dhl, float3, float4, float5);
+        if (ayt.animationSpeed < 0.01) {
             return;
         }
         final float float6 = 13.0f;
-        final float float7 = atl.animationPosition - atl.animationSpeed * (1.0f - float5) + 6.0f;
+        final float float7 = ayt.animationPosition - ayt.animationSpeed * (1.0f - float5) + 6.0f;
         final float float8 = (Math.abs(float7 % 13.0f - 6.5f) - 3.25f) / 3.25f;
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(6.5f * float8));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(6.5f * float8));
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/ItemEntityRenderer.java b/src/net/minecraft/client/renderer/entity/ItemEntityRenderer.java
index c36ac0f..ee6777e 100644
--- a/src/net/minecraft/client/renderer/entity/ItemEntityRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ItemEntityRenderer.java
@@ -20,82 +20,82 @@ public class ItemEntityRenderer extends EntityRenderer<ItemEntity> {
     private final ItemRenderer itemRenderer;
     private final Random random;
     
-    public ItemEntityRenderer(final EntityRenderDispatcher dvf, final ItemRenderer dvz) {
-        super(dvf);
+    public ItemEntityRenderer(final EntityRenderDispatcher egm, final ItemRenderer ehh) {
+        super(egm);
         this.random = new Random();
-        this.itemRenderer = dvz;
+        this.itemRenderer = ehh;
         this.shadowRadius = 0.15f;
         this.shadowStrength = 0.75f;
     }
     
-    private int getRenderAmount(final ItemStack ben) {
+    private int getRenderAmount(final ItemStack bki) {
         int integer3 = 1;
-        if (ben.getCount() > 48) {
+        if (bki.getCount() > 48) {
             integer3 = 5;
         }
-        else if (ben.getCount() > 32) {
+        else if (bki.getCount() > 32) {
             integer3 = 4;
         }
-        else if (ben.getCount() > 16) {
+        else if (bki.getCount() > 16) {
             integer3 = 3;
         }
-        else if (ben.getCount() > 1) {
+        else if (bki.getCount() > 1) {
             integer3 = 2;
         }
         return integer3;
     }
     
     @Override
-    public void render(final ItemEntity awb, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        final ItemStack ben8 = awb.getItem();
-        final int integer2 = ben8.isEmpty() ? 187 : (Item.getId(ben8.getItem()) + ben8.getDamageValue());
+    public void render(final ItemEntity bbg, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        final ItemStack bki8 = bbg.getItem();
+        final int integer2 = bki8.isEmpty() ? 187 : (Item.getId(bki8.getItem()) + bki8.getDamageValue());
         this.random.setSeed(integer2);
-        final BakedModel ebv10 = this.itemRenderer.getModel(ben8, awb.level, null);
-        final boolean boolean11 = ebv10.isGui3d();
-        final int integer3 = this.getRenderAmount(ben8);
+        final BakedModel enh10 = this.itemRenderer.getModel(bki8, bbg.level, null);
+        final boolean boolean11 = enh10.isGui3d();
+        final int integer3 = this.getRenderAmount(bki8);
         final float float4 = 0.25f;
-        final float float5 = Mth.sin((awb.getAge() + float3) / 10.0f + awb.bobOffs) * 0.1f + 0.1f;
-        final float float6 = ebv10.getTransforms().getTransform(ItemTransforms.TransformType.GROUND).scale.y();
-        cyl.translate(0.0, float5 + 0.25f * float6, 0.0);
-        final float float7 = (awb.getAge() + float3) / 20.0f + awb.bobOffs;
-        cyl.mulPose(Vector3f.YP.rotation(float7));
-        final float float8 = ebv10.getTransforms().ground.scale.x();
-        final float float9 = ebv10.getTransforms().ground.scale.y();
-        final float float10 = ebv10.getTransforms().ground.scale.z();
+        final float float5 = Mth.sin((bbg.getAge() + float3) / 10.0f + bbg.bobOffs) * 0.1f + 0.1f;
+        final float float6 = enh10.getTransforms().getTransform(ItemTransforms.TransformType.GROUND).scale.y();
+        dhl.translate(0.0, float5 + 0.25f * float6, 0.0);
+        final float float7 = bbg.getSpin(float3);
+        dhl.mulPose(Vector3f.YP.rotation(float7));
+        final float float8 = enh10.getTransforms().ground.scale.x();
+        final float float9 = enh10.getTransforms().ground.scale.y();
+        final float float10 = enh10.getTransforms().ground.scale.z();
         if (!boolean11) {
             final float float11 = -0.0f * (integer3 - 1) * 0.5f * float8;
             final float float12 = -0.0f * (integer3 - 1) * 0.5f * float9;
             final float float13 = -0.09375f * (integer3 - 1) * 0.5f * float10;
-            cyl.translate(float11, float12, float13);
+            dhl.translate(float11, float12, float13);
         }
         for (int integer4 = 0; integer4 < integer3; ++integer4) {
-            cyl.pushPose();
+            dhl.pushPose();
             if (integer4 > 0) {
                 if (boolean11) {
                     final float float12 = (this.random.nextFloat() * 2.0f - 1.0f) * 0.15f;
                     final float float13 = (this.random.nextFloat() * 2.0f - 1.0f) * 0.15f;
                     final float float14 = (this.random.nextFloat() * 2.0f - 1.0f) * 0.15f;
-                    cyl.translate(float12, float13, float14);
+                    dhl.translate(float12, float13, float14);
                 }
                 else {
                     final float float12 = (this.random.nextFloat() * 2.0f - 1.0f) * 0.15f * 0.5f;
                     final float float13 = (this.random.nextFloat() * 2.0f - 1.0f) * 0.15f * 0.5f;
-                    cyl.translate(float12, float13, 0.0);
+                    dhl.translate(float12, float13, 0.0);
                 }
             }
-            this.itemRenderer.render(ben8, ItemTransforms.TransformType.GROUND, false, cyl, dqt, integer, OverlayTexture.NO_OVERLAY, ebv10);
-            cyl.popPose();
+            this.itemRenderer.render(bki8, ItemTransforms.TransformType.GROUND, false, dhl, ebz, integer, OverlayTexture.NO_OVERLAY, enh10);
+            dhl.popPose();
             if (!boolean11) {
-                cyl.translate(0.0f * float8, 0.0f * float9, 0.09375f * float10);
+                dhl.translate(0.0f * float8, 0.0f * float9, 0.09375f * float10);
             }
         }
-        cyl.popPose();
-        super.render(awb, float2, float3, cyl, dqt, integer);
+        dhl.popPose();
+        super.render(bbg, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final ItemEntity awb) {
+    public ResourceLocation getTextureLocation(final ItemEntity bbg) {
         return TextureAtlas.LOCATION_BLOCKS;
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/ItemFrameRenderer.java b/src/net/minecraft/client/renderer/entity/ItemFrameRenderer.java
index 4db6de2..a071e30 100644
--- a/src/net/minecraft/client/renderer/entity/ItemFrameRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ItemFrameRenderer.java
@@ -1,5 +1,6 @@
 package net.minecraft.client.renderer.entity;
 
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.resources.ResourceLocation;
@@ -28,78 +29,86 @@ public class ItemFrameRenderer extends EntityRenderer<ItemFrame> {
     private final Minecraft minecraft;
     private final ItemRenderer itemRenderer;
     
-    public ItemFrameRenderer(final EntityRenderDispatcher dvf, final ItemRenderer dvz) {
-        super(dvf);
+    public ItemFrameRenderer(final EntityRenderDispatcher egm, final ItemRenderer ehh) {
+        super(egm);
         this.minecraft = Minecraft.getInstance();
-        this.itemRenderer = dvz;
+        this.itemRenderer = ehh;
     }
     
     @Override
-    public void render(final ItemFrame avr, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        super.render(avr, float2, float3, cyl, dqt, integer);
-        cyl.pushPose();
-        final Direction fp8 = avr.getDirection();
-        final Vec3 cvl9 = this.getRenderOffset(avr, float3);
-        cyl.translate(-cvl9.x(), -cvl9.y(), -cvl9.z());
+    public void render(final ItemFrame bba, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        super.render(bba, float2, float3, dhl, ebz, integer);
+        dhl.pushPose();
+        final Direction fz8 = bba.getDirection();
+        final Vec3 dem9 = this.getRenderOffset(bba, float3);
+        dhl.translate(-dem9.x(), -dem9.y(), -dem9.z());
         final double double10 = 0.46875;
-        cyl.translate(fp8.getStepX() * 0.46875, fp8.getStepY() * 0.46875, fp8.getStepZ() * 0.46875);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(avr.xRot));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f - avr.yRot));
-        final BlockRenderDispatcher drk12 = this.minecraft.getBlockRenderer();
-        final ModelManager eca13 = drk12.getBlockModelShaper().getModelManager();
-        final ModelResourceLocation ecb14 = (avr.getItem().getItem() == Items.FILLED_MAP) ? ItemFrameRenderer.MAP_FRAME_LOCATION : ItemFrameRenderer.FRAME_LOCATION;
-        cyl.pushPose();
-        cyl.translate(-0.5, -0.5, -0.5);
-        drk12.getModelRenderer().renderModel(cyl.last(), dqt.getBuffer(Sheets.solidBlockSheet()), null, eca13.getModel(ecb14), 1.0f, 1.0f, 1.0f, integer, OverlayTexture.NO_OVERLAY);
-        cyl.popPose();
-        final ItemStack ben15 = avr.getItem();
-        if (!ben15.isEmpty()) {
-            final boolean boolean16 = ben15.getItem() == Items.FILLED_MAP;
-            cyl.translate(0.0, 0.0, 0.4375);
-            final int integer2 = boolean16 ? (avr.getRotation() % 4 * 2) : avr.getRotation();
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(integer2 * 360.0f / 8.0f));
-            if (boolean16) {
-                cyl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
+        dhl.translate(fz8.getStepX() * 0.46875, fz8.getStepY() * 0.46875, fz8.getStepZ() * 0.46875);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(bba.xRot));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f - bba.yRot));
+        final boolean boolean12 = bba.isInvisible();
+        if (!boolean12) {
+            final BlockRenderDispatcher ecq13 = this.minecraft.getBlockRenderer();
+            final ModelManager enm14 = ecq13.getBlockModelShaper().getModelManager();
+            final ModelResourceLocation enn15 = (bba.getItem().getItem() == Items.FILLED_MAP) ? ItemFrameRenderer.MAP_FRAME_LOCATION : ItemFrameRenderer.FRAME_LOCATION;
+            dhl.pushPose();
+            dhl.translate(-0.5, -0.5, -0.5);
+            ecq13.getModelRenderer().renderModel(dhl.last(), ebz.getBuffer(Sheets.solidBlockSheet()), null, enm14.getModel(enn15), 1.0f, 1.0f, 1.0f, integer, OverlayTexture.NO_OVERLAY);
+            dhl.popPose();
+        }
+        final ItemStack bki13 = bba.getItem();
+        if (!bki13.isEmpty()) {
+            final boolean boolean13 = bki13.getItem() == Items.FILLED_MAP;
+            if (boolean12) {
+                dhl.translate(0.0, 0.0, 0.5);
+            }
+            else {
+                dhl.translate(0.0, 0.0, 0.4375);
+            }
+            final int integer2 = boolean13 ? (bba.getRotation() % 4 * 2) : bba.getRotation();
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(integer2 * 360.0f / 8.0f));
+            if (boolean13) {
+                dhl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
                 final float float4 = 0.0078125f;
-                cyl.scale(0.0078125f, 0.0078125f, 0.0078125f);
-                cyl.translate(-64.0, -64.0, 0.0);
-                final MapItemSavedData crg19 = MapItem.getOrCreateSavedData(ben15, avr.level);
-                cyl.translate(0.0, 0.0, -1.0);
-                if (crg19 != null) {
-                    this.minecraft.gameRenderer.getMapRenderer().render(cyl, dqt, crg19, true, integer);
+                dhl.scale(0.0078125f, 0.0078125f, 0.0078125f);
+                dhl.translate(-64.0, -64.0, 0.0);
+                final MapItemSavedData czv17 = MapItem.getOrCreateSavedData(bki13, bba.level);
+                dhl.translate(0.0, 0.0, -1.0);
+                if (czv17 != null) {
+                    this.minecraft.gameRenderer.getMapRenderer().render(dhl, ebz, czv17, true, integer);
                 }
             }
             else {
-                cyl.scale(0.5f, 0.5f, 0.5f);
-                this.itemRenderer.renderStatic(ben15, ItemTransforms.TransformType.FIXED, integer, OverlayTexture.NO_OVERLAY, cyl, dqt);
+                dhl.scale(0.5f, 0.5f, 0.5f);
+                this.itemRenderer.renderStatic(bki13, ItemTransforms.TransformType.FIXED, integer, OverlayTexture.NO_OVERLAY, dhl, ebz);
             }
         }
-        cyl.popPose();
+        dhl.popPose();
     }
     
     @Override
-    public Vec3 getRenderOffset(final ItemFrame avr, final float float2) {
-        return new Vec3(avr.getDirection().getStepX() * 0.3f, -0.25, avr.getDirection().getStepZ() * 0.3f);
+    public Vec3 getRenderOffset(final ItemFrame bba, final float float2) {
+        return new Vec3(bba.getDirection().getStepX() * 0.3f, -0.25, bba.getDirection().getStepZ() * 0.3f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final ItemFrame avr) {
+    public ResourceLocation getTextureLocation(final ItemFrame bba) {
         return TextureAtlas.LOCATION_BLOCKS;
     }
     
     @Override
-    protected boolean shouldShowName(final ItemFrame avr) {
-        if (!Minecraft.renderNames() || avr.getItem().isEmpty() || !avr.getItem().hasCustomHoverName() || this.entityRenderDispatcher.crosshairPickEntity != avr) {
+    protected boolean shouldShowName(final ItemFrame bba) {
+        if (!Minecraft.renderNames() || bba.getItem().isEmpty() || !bba.getItem().hasCustomHoverName() || this.entityRenderDispatcher.crosshairPickEntity != bba) {
             return false;
         }
-        final double double3 = this.entityRenderDispatcher.distanceToSqr(avr);
-        final float float5 = avr.isDiscrete() ? 32.0f : 64.0f;
+        final double double3 = this.entityRenderDispatcher.distanceToSqr(bba);
+        final float float5 = bba.isDiscrete() ? 32.0f : 64.0f;
         return double3 < float5 * float5;
     }
     
     @Override
-    protected void renderNameTag(final ItemFrame avr, final String string, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        super.renderNameTag(avr, avr.getItem().getHoverName().getColoredString(), cyl, dqt, integer);
+    protected void renderNameTag(final ItemFrame bba, final Component mr, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        super.renderNameTag(bba, bba.getItem().getHoverName(), dhl, ebz, integer);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/ItemRenderer.java b/src/net/minecraft/client/renderer/entity/ItemRenderer.java
index d0e0b1f..f2490aa 100644
--- a/src/net/minecraft/client/renderer/entity/ItemRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ItemRenderer.java
@@ -17,16 +17,20 @@ import net.minecraft.client.Minecraft;
 import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.entity.LivingEntity;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.Level;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import java.util.List;
+import com.mojang.blaze3d.vertex.SheetedDecalTextureGenerator;
 import com.mojang.blaze3d.vertex.VertexMultiConsumer;
 import net.minecraft.client.renderer.RenderType;
-import java.util.Objects;
-import net.minecraft.client.renderer.Sheets;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
+import net.minecraft.world.level.block.StainedGlassPaneBlock;
+import net.minecraft.world.level.block.HalfTransparentBlock;
+import net.minecraft.world.item.BlockItem;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
 import net.minecraft.world.item.Items;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -58,121 +62,160 @@ public class ItemRenderer implements ResourceManagerReloadListener {
     private final TextureManager textureManager;
     private final ItemColors itemColors;
     
-    public ItemRenderer(final TextureManager eak, final ModelManager eca, final ItemColors dcf) {
-        this.textureManager = eak;
-        this.itemModelShaper = new ItemModelShaper(eca);
-        for (final Item bei6 : Registry.ITEM) {
-            if (!ItemRenderer.IGNORED.contains(bei6)) {
-                this.itemModelShaper.register(bei6, new ModelResourceLocation(Registry.ITEM.getKey(bei6), "inventory"));
+    public ItemRenderer(final TextureManager elw, final ModelManager enm, final ItemColors dmr) {
+        this.textureManager = elw;
+        this.itemModelShaper = new ItemModelShaper(enm);
+        for (final Item bke6 : Registry.ITEM) {
+            if (!ItemRenderer.IGNORED.contains(bke6)) {
+                this.itemModelShaper.register(bke6, new ModelResourceLocation(Registry.ITEM.getKey(bke6), "inventory"));
             }
         }
-        this.itemColors = dcf;
+        this.itemColors = dmr;
     }
     
     public ItemModelShaper getItemModelShaper() {
         return this.itemModelShaper;
     }
     
-    private void renderModelLists(final BakedModel ebv, final ItemStack ben, final int integer3, final int integer4, final PoseStack cyl, final VertexConsumer cyo) {
+    private void renderModelLists(final BakedModel enh, final ItemStack bki, final int integer3, final int integer4, final PoseStack dhl, final VertexConsumer dhp) {
         final Random random8 = new Random();
         final long long9 = 42L;
-        for (final Direction fp14 : Direction.values()) {
+        for (final Direction fz14 : Direction.values()) {
             random8.setSeed(42L);
-            this.renderQuadList(cyl, cyo, ebv.getQuads(null, fp14, random8), ben, integer3, integer4);
+            this.renderQuadList(dhl, dhp, enh.getQuads(null, fz14, random8), bki, integer3, integer4);
         }
         random8.setSeed(42L);
-        this.renderQuadList(cyl, cyo, ebv.getQuads(null, null, random8), ben, integer3, integer4);
+        this.renderQuadList(dhl, dhp, enh.getQuads(null, null, random8), bki, integer3, integer4);
     }
     
-    public void render(final ItemStack ben, final ItemTransforms.TransformType b, final boolean boolean3, final PoseStack cyl, final MultiBufferSource dqt, final int integer6, final int integer7, BakedModel ebv) {
-        if (ben.isEmpty()) {
+    public void render(final ItemStack bki, final ItemTransforms.TransformType b, final boolean boolean3, final PoseStack dhl, final MultiBufferSource ebz, final int integer6, final int integer7, BakedModel enh) {
+        if (bki.isEmpty()) {
             return;
         }
-        cyl.pushPose();
-        final boolean boolean4 = b == ItemTransforms.TransformType.GUI;
-        final boolean boolean5 = boolean4 || b == ItemTransforms.TransformType.GROUND || b == ItemTransforms.TransformType.FIXED;
-        if (ben.getItem() == Items.TRIDENT && boolean5) {
-            ebv = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation("minecraft:trident#inventory"));
+        dhl.pushPose();
+        final boolean boolean4 = b == ItemTransforms.TransformType.GUI || b == ItemTransforms.TransformType.GROUND || b == ItemTransforms.TransformType.FIXED;
+        if (bki.getItem() == Items.TRIDENT && boolean4) {
+            enh = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation("minecraft:trident#inventory"));
         }
-        ebv.getTransforms().getTransform(b).apply(boolean3, cyl);
-        cyl.translate(-0.5, -0.5, -0.5);
-        if (ebv.isCustomRenderer() || (ben.getItem() == Items.TRIDENT && !boolean5)) {
-            BlockEntityWithoutLevelRenderer.instance.renderByItem(ben, cyl, dqt, integer6, integer7);
+        enh.getTransforms().getTransform(b).apply(boolean3, dhl);
+        dhl.translate(-0.5, -0.5, -0.5);
+        if (enh.isCustomRenderer() || (bki.getItem() == Items.TRIDENT && !boolean4)) {
+            BlockEntityWithoutLevelRenderer.instance.renderByItem(bki, b, dhl, ebz, integer6, integer7);
         }
         else {
-            final RenderType drb12 = ItemBlockRenderTypes.getRenderType(ben);
-            RenderType drb13;
-            if (boolean4 && Objects.equals(drb12, Sheets.translucentBlockSheet())) {
-                drb13 = Sheets.translucentCullBlockSheet();
+            boolean boolean5;
+            if (b != ItemTransforms.TransformType.GUI && !b.firstPerson() && bki.getItem() instanceof BlockItem) {
+                final Block bvr12 = ((BlockItem)bki.getItem()).getBlock();
+                boolean5 = (!(bvr12 instanceof HalfTransparentBlock) && !(bvr12 instanceof StainedGlassPaneBlock));
             }
             else {
-                drb13 = drb12;
+                boolean5 = true;
             }
-            final VertexConsumer cyo14 = getFoilBuffer(dqt, drb13, true, ben.hasFoil());
-            this.renderModelLists(ebv, ben, integer6, integer7, cyl, cyo14);
+            final RenderType ech12 = ItemBlockRenderTypes.getRenderType(bki, boolean5);
+            VertexConsumer dhp13;
+            if (bki.getItem() == Items.COMPASS && bki.hasFoil()) {
+                dhl.pushPose();
+                final PoseStack.Pose a14 = dhl.last();
+                if (b == ItemTransforms.TransformType.GUI) {
+                    a14.pose().multiply(0.5f);
+                }
+                else if (b.firstPerson()) {
+                    a14.pose().multiply(0.75f);
+                }
+                if (boolean5) {
+                    dhp13 = getCompassFoilBufferDirect(ebz, ech12, a14);
+                }
+                else {
+                    dhp13 = getCompassFoilBuffer(ebz, ech12, a14);
+                }
+                dhl.popPose();
+            }
+            else if (boolean5) {
+                dhp13 = getFoilBufferDirect(ebz, ech12, true, bki.hasFoil());
+            }
+            else {
+                dhp13 = getFoilBuffer(ebz, ech12, true, bki.hasFoil());
+            }
+            this.renderModelLists(enh, bki, integer6, integer7, dhl, dhp13);
         }
-        cyl.popPose();
+        dhl.popPose();
     }
     
-    public static VertexConsumer getFoilBuffer(final MultiBufferSource dqt, final RenderType drb, final boolean boolean3, final boolean boolean4) {
+    public static VertexConsumer getArmorFoilBuffer(final MultiBufferSource ebz, final RenderType ech, final boolean boolean3, final boolean boolean4) {
         if (boolean4) {
-            return VertexMultiConsumer.create(dqt.getBuffer(boolean3 ? RenderType.glint() : RenderType.entityGlint()), dqt.getBuffer(drb));
+            return VertexMultiConsumer.create(ebz.getBuffer(boolean3 ? RenderType.armorGlint() : RenderType.armorEntityGlint()), ebz.getBuffer(ech));
         }
-        return dqt.getBuffer(drb);
+        return ebz.getBuffer(ech);
     }
     
-    private void renderQuadList(final PoseStack cyl, final VertexConsumer cyo, final List<BakedQuad> list, final ItemStack ben, final int integer5, final int integer6) {
-        final boolean boolean8 = !ben.isEmpty();
-        final PoseStack.Pose a9 = cyl.last();
-        for (final BakedQuad drn11 : list) {
+    public static VertexConsumer getCompassFoilBuffer(final MultiBufferSource ebz, final RenderType ech, final PoseStack.Pose a) {
+        return VertexMultiConsumer.create(new SheetedDecalTextureGenerator(ebz.getBuffer(RenderType.glint()), a.pose(), a.normal()), ebz.getBuffer(ech));
+    }
+    
+    public static VertexConsumer getCompassFoilBufferDirect(final MultiBufferSource ebz, final RenderType ech, final PoseStack.Pose a) {
+        return VertexMultiConsumer.create(new SheetedDecalTextureGenerator(ebz.getBuffer(RenderType.glintDirect()), a.pose(), a.normal()), ebz.getBuffer(ech));
+    }
+    
+    public static VertexConsumer getFoilBuffer(final MultiBufferSource ebz, final RenderType ech, final boolean boolean3, final boolean boolean4) {
+        if (boolean4) {
+            return VertexMultiConsumer.create(ebz.getBuffer(boolean3 ? RenderType.glint() : RenderType.entityGlint()), ebz.getBuffer(ech));
+        }
+        return ebz.getBuffer(ech);
+    }
+    
+    public static VertexConsumer getFoilBufferDirect(final MultiBufferSource ebz, final RenderType ech, final boolean boolean3, final boolean boolean4) {
+        if (boolean4) {
+            return VertexMultiConsumer.create(ebz.getBuffer(boolean3 ? RenderType.glintDirect() : RenderType.entityGlintDirect()), ebz.getBuffer(ech));
+        }
+        return ebz.getBuffer(ech);
+    }
+    
+    private void renderQuadList(final PoseStack dhl, final VertexConsumer dhp, final List<BakedQuad> list, final ItemStack bki, final int integer5, final int integer6) {
+        final boolean boolean8 = !bki.isEmpty();
+        final PoseStack.Pose a9 = dhl.last();
+        for (final BakedQuad ect11 : list) {
             int integer7 = -1;
-            if (boolean8 && drn11.isTinted()) {
-                integer7 = this.itemColors.getColor(ben, drn11.getTintIndex());
+            if (boolean8 && ect11.isTinted()) {
+                integer7 = this.itemColors.getColor(bki, ect11.getTintIndex());
             }
             final float float13 = (integer7 >> 16 & 0xFF) / 255.0f;
             final float float14 = (integer7 >> 8 & 0xFF) / 255.0f;
             final float float15 = (integer7 & 0xFF) / 255.0f;
-            cyo.putBulkData(a9, drn11, float13, float14, float15, integer5, integer6);
+            dhp.putBulkData(a9, ect11, float13, float14, float15, integer5, integer6);
         }
     }
     
-    public BakedModel getModel(final ItemStack ben, @Nullable final Level bjw, @Nullable final LivingEntity akz) {
-        final Item bei6 = ben.getItem();
-        BakedModel ebv5;
-        if (bei6 == Items.TRIDENT) {
-            ebv5 = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation("minecraft:trident_in_hand#inventory"));
+    public BakedModel getModel(final ItemStack bki, @Nullable final Level bqb, @Nullable final LivingEntity aoy) {
+        final Item bke6 = bki.getItem();
+        BakedModel enh5;
+        if (bke6 == Items.TRIDENT) {
+            enh5 = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation("minecraft:trident_in_hand#inventory"));
         }
         else {
-            ebv5 = this.itemModelShaper.getItemModel(ben);
+            enh5 = this.itemModelShaper.getItemModel(bki);
         }
-        if (!bei6.hasProperties()) {
-            return ebv5;
-        }
-        return this.resolveOverrides(ebv5, ben, bjw, akz);
+        final ClientLevel dym7 = (bqb instanceof ClientLevel) ? ((ClientLevel)bqb) : null;
+        final BakedModel enh6 = enh5.getOverrides().resolve(enh5, bki, dym7, aoy);
+        return (enh6 == null) ? this.itemModelShaper.getModelManager().getMissingModel() : enh6;
     }
     
-    private BakedModel resolveOverrides(final BakedModel ebv, final ItemStack ben, @Nullable final Level bjw, @Nullable final LivingEntity akz) {
-        final BakedModel ebv2 = ebv.getOverrides().resolve(ebv, ben, bjw, akz);
-        return (ebv2 == null) ? this.itemModelShaper.getModelManager().getMissingModel() : ebv2;
+    public void renderStatic(final ItemStack bki, final ItemTransforms.TransformType b, final int integer3, final int integer4, final PoseStack dhl, final MultiBufferSource ebz) {
+        this.renderStatic(null, bki, b, false, dhl, ebz, null, integer3, integer4);
     }
     
-    public void renderStatic(final ItemStack ben, final ItemTransforms.TransformType b, final int integer3, final int integer4, final PoseStack cyl, final MultiBufferSource dqt) {
-        this.renderStatic(null, ben, b, false, cyl, dqt, null, integer3, integer4);
-    }
-    
-    public void renderStatic(@Nullable final LivingEntity akz, final ItemStack ben, final ItemTransforms.TransformType b, final boolean boolean4, final PoseStack cyl, final MultiBufferSource dqt, @Nullable final Level bjw, final int integer8, final int integer9) {
-        if (ben.isEmpty()) {
+    public void renderStatic(@Nullable final LivingEntity aoy, final ItemStack bki, final ItemTransforms.TransformType b, final boolean boolean4, final PoseStack dhl, final MultiBufferSource ebz, @Nullable final Level bqb, final int integer8, final int integer9) {
+        if (bki.isEmpty()) {
             return;
         }
-        final BakedModel ebv11 = this.getModel(ben, bjw, akz);
-        this.render(ben, b, boolean4, cyl, dqt, integer8, integer9, ebv11);
+        final BakedModel enh11 = this.getModel(bki, bqb, aoy);
+        this.render(bki, b, boolean4, dhl, ebz, integer8, integer9, enh11);
     }
     
-    public void renderGuiItem(final ItemStack ben, final int integer2, final int integer3) {
-        this.renderGuiItem(ben, integer2, integer3, this.getModel(ben, null, null));
+    public void renderGuiItem(final ItemStack bki, final int integer2, final int integer3) {
+        this.renderGuiItem(bki, integer2, integer3, this.getModel(bki, null, null));
     }
     
-    protected void renderGuiItem(final ItemStack ben, final int integer2, final int integer3, final BakedModel ebv) {
+    protected void renderGuiItem(final ItemStack bki, final int integer2, final int integer3, final BakedModel enh) {
         RenderSystem.pushMatrix();
         this.textureManager.bind(TextureAtlas.LOCATION_BLOCKS);
         this.textureManager.getTexture(TextureAtlas.LOCATION_BLOCKS).setFilter(false, false);
@@ -186,13 +229,13 @@ public class ItemRenderer implements ResourceManagerReloadListener {
         RenderSystem.translatef(8.0f, 8.0f, 0.0f);
         RenderSystem.scalef(1.0f, -1.0f, 1.0f);
         RenderSystem.scalef(16.0f, 16.0f, 16.0f);
-        final PoseStack cyl6 = new PoseStack();
+        final PoseStack dhl6 = new PoseStack();
         final MultiBufferSource.BufferSource a7 = Minecraft.getInstance().renderBuffers().bufferSource();
-        final boolean boolean8 = !ebv.usesBlockLight();
+        final boolean boolean8 = !enh.usesBlockLight();
         if (boolean8) {
             Lighting.setupForFlatItems();
         }
-        this.render(ben, ItemTransforms.TransformType.GUI, false, cyl6, a7, 15728880, OverlayTexture.NO_OVERLAY, ebv);
+        this.render(bki, ItemTransforms.TransformType.GUI, false, dhl6, a7, 15728880, OverlayTexture.NO_OVERLAY, enh);
         a7.endBatch();
         RenderSystem.enableDepthTest();
         if (boolean8) {
@@ -203,91 +246,99 @@ public class ItemRenderer implements ResourceManagerReloadListener {
         RenderSystem.popMatrix();
     }
     
-    public void renderAndDecorateItem(final ItemStack ben, final int integer2, final int integer3) {
-        this.renderAndDecorateItem(Minecraft.getInstance().player, ben, integer2, integer3);
+    public void renderAndDecorateItem(final ItemStack bki, final int integer2, final int integer3) {
+        this.tryRenderGuiItem(Minecraft.getInstance().player, bki, integer2, integer3);
     }
     
-    public void renderAndDecorateItem(@Nullable final LivingEntity akz, final ItemStack ben, final int integer3, final int integer4) {
-        if (ben.isEmpty()) {
+    public void renderAndDecorateFakeItem(final ItemStack bki, final int integer2, final int integer3) {
+        this.tryRenderGuiItem(null, bki, integer2, integer3);
+    }
+    
+    public void renderAndDecorateItem(final LivingEntity aoy, final ItemStack bki, final int integer3, final int integer4) {
+        this.tryRenderGuiItem(aoy, bki, integer3, integer4);
+    }
+    
+    private void tryRenderGuiItem(@Nullable final LivingEntity aoy, final ItemStack bki, final int integer3, final int integer4) {
+        if (bki.isEmpty()) {
             return;
         }
         this.blitOffset += 50.0f;
         try {
-            this.renderGuiItem(ben, integer3, integer4, this.getModel(ben, null, akz));
+            this.renderGuiItem(bki, integer3, integer4, this.getModel(bki, null, aoy));
         }
         catch (Throwable throwable6) {
-            final CrashReport h7 = CrashReport.forThrowable(throwable6, "Rendering item");
-            final CrashReportCategory i8 = h7.addCategory("Item being rendered");
-            i8.setDetail("Item Type", () -> String.valueOf(ben.getItem()));
-            i8.setDetail("Item Damage", () -> String.valueOf(ben.getDamageValue()));
-            i8.setDetail("Item NBT", () -> String.valueOf(ben.getTag()));
-            i8.setDetail("Item Foil", () -> String.valueOf(ben.hasFoil()));
-            throw new ReportedException(h7);
+            final CrashReport j7 = CrashReport.forThrowable(throwable6, "Rendering item");
+            final CrashReportCategory k8 = j7.addCategory("Item being rendered");
+            k8.setDetail("Item Type", () -> String.valueOf(bki.getItem()));
+            k8.setDetail("Item Damage", () -> String.valueOf(bki.getDamageValue()));
+            k8.setDetail("Item NBT", () -> String.valueOf(bki.getTag()));
+            k8.setDetail("Item Foil", () -> String.valueOf(bki.hasFoil()));
+            throw new ReportedException(j7);
         }
         this.blitOffset -= 50.0f;
     }
     
-    public void renderGuiItemDecorations(final Font dch, final ItemStack ben, final int integer3, final int integer4) {
-        this.renderGuiItemDecorations(dch, ben, integer3, integer4, null);
+    public void renderGuiItemDecorations(final Font dmt, final ItemStack bki, final int integer3, final int integer4) {
+        this.renderGuiItemDecorations(dmt, bki, integer3, integer4, null);
     }
     
-    public void renderGuiItemDecorations(final Font dch, final ItemStack ben, final int integer3, final int integer4, @Nullable final String string) {
-        if (ben.isEmpty()) {
+    public void renderGuiItemDecorations(final Font dmt, final ItemStack bki, final int integer3, final int integer4, @Nullable final String string) {
+        if (bki.isEmpty()) {
             return;
         }
-        final PoseStack cyl7 = new PoseStack();
-        if (ben.getCount() != 1 || string != null) {
-            final String string2 = (string == null) ? String.valueOf(ben.getCount()) : string;
-            cyl7.translate(0.0, 0.0, this.blitOffset + 200.0f);
+        final PoseStack dhl7 = new PoseStack();
+        if (bki.getCount() != 1 || string != null) {
+            final String string2 = (string == null) ? String.valueOf(bki.getCount()) : string;
+            dhl7.translate(0.0, 0.0, this.blitOffset + 200.0f);
             final MultiBufferSource.BufferSource a9 = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-            dch.drawInBatch(string2, (float)(integer3 + 19 - 2 - dch.width(string2)), (float)(integer4 + 6 + 3), 16777215, true, cyl7.last().pose(), a9, false, 0, 15728880);
+            dmt.drawInBatch(string2, (float)(integer3 + 19 - 2 - dmt.width(string2)), (float)(integer4 + 6 + 3), 16777215, true, dhl7.last().pose(), a9, false, 0, 15728880);
             a9.endBatch();
         }
-        if (ben.isDamaged()) {
+        if (bki.isDamaged()) {
             RenderSystem.disableDepthTest();
             RenderSystem.disableTexture();
             RenderSystem.disableAlphaTest();
             RenderSystem.disableBlend();
-            final Tesselator cym8 = Tesselator.getInstance();
-            final BufferBuilder cyg9 = cym8.getBuilder();
-            final float float10 = (float)ben.getDamageValue();
-            final float float11 = (float)ben.getMaxDamage();
+            final Tesselator dhn8 = Tesselator.getInstance();
+            final BufferBuilder dhg9 = dhn8.getBuilder();
+            final float float10 = (float)bki.getDamageValue();
+            final float float11 = (float)bki.getMaxDamage();
             final float float12 = Math.max(0.0f, (float11 - float10) / float11);
             final int integer5 = Math.round(13.0f - float10 * 13.0f / float11);
             final int integer6 = Mth.hsvToRgb(float12 / 3.0f, 1.0f, 1.0f);
-            this.fillRect(cyg9, integer3 + 2, integer4 + 13, 13, 2, 0, 0, 0, 255);
-            this.fillRect(cyg9, integer3 + 2, integer4 + 13, integer5, 1, integer6 >> 16 & 0xFF, integer6 >> 8 & 0xFF, integer6 & 0xFF, 255);
+            this.fillRect(dhg9, integer3 + 2, integer4 + 13, 13, 2, 0, 0, 0, 255);
+            this.fillRect(dhg9, integer3 + 2, integer4 + 13, integer5, 1, integer6 >> 16 & 0xFF, integer6 >> 8 & 0xFF, integer6 & 0xFF, 255);
             RenderSystem.enableBlend();
             RenderSystem.enableAlphaTest();
             RenderSystem.enableTexture();
             RenderSystem.enableDepthTest();
         }
-        final LocalPlayer dqb8 = Minecraft.getInstance().player;
-        final float float13 = (dqb8 == null) ? 0.0f : dqb8.getCooldowns().getCooldownPercent(ben.getItem(), Minecraft.getInstance().getFrameTime());
+        final LocalPlayer ebf8 = Minecraft.getInstance().player;
+        final float float13 = (ebf8 == null) ? 0.0f : ebf8.getCooldowns().getCooldownPercent(bki.getItem(), Minecraft.getInstance().getFrameTime());
         if (float13 > 0.0f) {
             RenderSystem.disableDepthTest();
             RenderSystem.disableTexture();
             RenderSystem.enableBlend();
             RenderSystem.defaultBlendFunc();
-            final Tesselator cym9 = Tesselator.getInstance();
-            final BufferBuilder cyg10 = cym9.getBuilder();
-            this.fillRect(cyg10, integer3, integer4 + Mth.floor(16.0f * (1.0f - float13)), 16, Mth.ceil(16.0f * float13), 255, 255, 255, 127);
+            final Tesselator dhn9 = Tesselator.getInstance();
+            final BufferBuilder dhg10 = dhn9.getBuilder();
+            this.fillRect(dhg10, integer3, integer4 + Mth.floor(16.0f * (1.0f - float13)), 16, Mth.ceil(16.0f * float13), 255, 255, 255, 127);
             RenderSystem.enableTexture();
             RenderSystem.enableDepthTest();
         }
     }
     
-    private void fillRect(final BufferBuilder cyg, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
-        cyg.begin(7, DefaultVertexFormat.POSITION_COLOR);
-        cyg.vertex(integer2 + 0, integer3 + 0, 0.0).color(integer6, integer7, integer8, integer9).endVertex();
-        cyg.vertex(integer2 + 0, integer3 + integer5, 0.0).color(integer6, integer7, integer8, integer9).endVertex();
-        cyg.vertex(integer2 + integer4, integer3 + integer5, 0.0).color(integer6, integer7, integer8, integer9).endVertex();
-        cyg.vertex(integer2 + integer4, integer3 + 0, 0.0).color(integer6, integer7, integer8, integer9).endVertex();
+    private void fillRect(final BufferBuilder dhg, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
+        dhg.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        dhg.vertex(integer2 + 0, integer3 + 0, 0.0).color(integer6, integer7, integer8, integer9).endVertex();
+        dhg.vertex(integer2 + 0, integer3 + integer5, 0.0).color(integer6, integer7, integer8, integer9).endVertex();
+        dhg.vertex(integer2 + integer4, integer3 + integer5, 0.0).color(integer6, integer7, integer8, integer9).endVertex();
+        dhg.vertex(integer2 + integer4, integer3 + 0, 0.0).color(integer6, integer7, integer8, integer9).endVertex();
         Tesselator.getInstance().end();
     }
     
     @Override
-    public void onResourceManagerReload(final ResourceManager zb) {
+    public void onResourceManagerReload(final ResourceManager abc) {
         this.itemModelShaper.rebuildCache();
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/LeashKnotRenderer.java b/src/net/minecraft/client/renderer/entity/LeashKnotRenderer.java
index 8a7c0df..92ff4ea 100644
--- a/src/net/minecraft/client/renderer/entity/LeashKnotRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/LeashKnotRenderer.java
@@ -13,24 +13,24 @@ public class LeashKnotRenderer extends EntityRenderer<LeashFenceKnotEntity> {
     private static final ResourceLocation KNOT_LOCATION;
     private final LeashKnotModel<LeashFenceKnotEntity> model;
     
-    public LeashKnotRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public LeashKnotRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.model = new LeashKnotModel<LeashFenceKnotEntity>();
     }
     
     @Override
-    public void render(final LeashFenceKnotEntity avs, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        this.model.setupAnim(avs, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
-        final VertexConsumer cyo8 = dqt.getBuffer(this.model.renderType(LeashKnotRenderer.KNOT_LOCATION));
-        this.model.renderToBuffer(cyl, cyo8, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.popPose();
-        super.render(avs, float2, float3, cyl, dqt, integer);
+    public void render(final LeashFenceKnotEntity bbb, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        this.model.setupAnim(bbb, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
+        final VertexConsumer dhp8 = ebz.getBuffer(this.model.renderType(LeashKnotRenderer.KNOT_LOCATION));
+        this.model.renderToBuffer(dhl, dhp8, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.popPose();
+        super.render(bbb, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final LeashFenceKnotEntity avs) {
+    public ResourceLocation getTextureLocation(final LeashFenceKnotEntity bbb) {
         return LeashKnotRenderer.KNOT_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/LightningBoltRenderer.java b/src/net/minecraft/client/renderer/entity/LightningBoltRenderer.java
index 9bfa323..ca1db5b 100644
--- a/src/net/minecraft/client/renderer/entity/LightningBoltRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/LightningBoltRenderer.java
@@ -9,30 +9,30 @@ import net.minecraft.client.renderer.RenderType;
 import java.util.Random;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.world.entity.LightningBolt;
 
 public class LightningBoltRenderer extends EntityRenderer<LightningBolt> {
-    public LightningBoltRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public LightningBoltRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    public void render(final LightningBolt avy, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
+    public void render(final LightningBolt aox, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
         final float[] arr8 = new float[8];
         final float[] arr9 = new float[8];
         float float4 = 0.0f;
         float float5 = 0.0f;
-        final Random random12 = new Random(avy.seed);
+        final Random random12 = new Random(aox.seed);
         for (int integer2 = 7; integer2 >= 0; --integer2) {
             arr8[integer2] = float4;
             arr9[integer2] = float5;
             float4 += random12.nextInt(11) - 5;
             float5 += random12.nextInt(11) - 5;
         }
-        final VertexConsumer cyo12 = dqt.getBuffer(RenderType.lightning());
-        final Matrix4f b13 = cyl.last().pose();
+        final VertexConsumer dhp12 = ebz.getBuffer(RenderType.lightning());
+        final Matrix4f b13 = dhl.last().pose();
         for (int integer3 = 0; integer3 < 4; ++integer3) {
-            final Random random13 = new Random(avy.seed);
+            final Random random13 = new Random(aox.seed);
             for (int integer4 = 0; integer4 < 3; ++integer4) {
                 int integer5 = 7;
                 int integer6 = 0;
@@ -67,24 +67,24 @@ public class LightningBoltRenderer extends EntityRenderer<LightningBolt> {
                     if (integer4 == 0) {
                         float15 *= (integer7 - 1) * 0.1f + 1.0f;
                     }
-                    quad(b13, cyo12, float6, float7, integer7, float8, float9, 0.45f, 0.45f, 0.5f, float14, float15, false, false, true, false);
-                    quad(b13, cyo12, float6, float7, integer7, float8, float9, 0.45f, 0.45f, 0.5f, float14, float15, true, false, true, true);
-                    quad(b13, cyo12, float6, float7, integer7, float8, float9, 0.45f, 0.45f, 0.5f, float14, float15, true, true, false, true);
-                    quad(b13, cyo12, float6, float7, integer7, float8, float9, 0.45f, 0.45f, 0.5f, float14, float15, false, true, false, false);
+                    quad(b13, dhp12, float6, float7, integer7, float8, float9, 0.45f, 0.45f, 0.5f, float14, float15, false, false, true, false);
+                    quad(b13, dhp12, float6, float7, integer7, float8, float9, 0.45f, 0.45f, 0.5f, float14, float15, true, false, true, true);
+                    quad(b13, dhp12, float6, float7, integer7, float8, float9, 0.45f, 0.45f, 0.5f, float14, float15, true, true, false, true);
+                    quad(b13, dhp12, float6, float7, integer7, float8, float9, 0.45f, 0.45f, 0.5f, float14, float15, false, true, false, false);
                 }
             }
         }
     }
     
-    private static void quad(final Matrix4f b, final VertexConsumer cyo, final float float3, final float float4, final int integer, final float float6, final float float7, final float float8, final float float9, final float float10, final float float11, final float float12, final boolean boolean13, final boolean boolean14, final boolean boolean15, final boolean boolean16) {
-        cyo.vertex(b, float3 + (boolean13 ? float12 : (-float12)), (float)(integer * 16), float4 + (boolean14 ? float12 : (-float12))).color(float8, float9, float10, 0.3f).endVertex();
-        cyo.vertex(b, float6 + (boolean13 ? float11 : (-float11)), (float)((integer + 1) * 16), float7 + (boolean14 ? float11 : (-float11))).color(float8, float9, float10, 0.3f).endVertex();
-        cyo.vertex(b, float6 + (boolean15 ? float11 : (-float11)), (float)((integer + 1) * 16), float7 + (boolean16 ? float11 : (-float11))).color(float8, float9, float10, 0.3f).endVertex();
-        cyo.vertex(b, float3 + (boolean15 ? float12 : (-float12)), (float)(integer * 16), float4 + (boolean16 ? float12 : (-float12))).color(float8, float9, float10, 0.3f).endVertex();
+    private static void quad(final Matrix4f b, final VertexConsumer dhp, final float float3, final float float4, final int integer, final float float6, final float float7, final float float8, final float float9, final float float10, final float float11, final float float12, final boolean boolean13, final boolean boolean14, final boolean boolean15, final boolean boolean16) {
+        dhp.vertex(b, float3 + (boolean13 ? float12 : (-float12)), (float)(integer * 16), float4 + (boolean14 ? float12 : (-float12))).color(float8, float9, float10, 0.3f).endVertex();
+        dhp.vertex(b, float6 + (boolean13 ? float11 : (-float11)), (float)((integer + 1) * 16), float7 + (boolean14 ? float11 : (-float11))).color(float8, float9, float10, 0.3f).endVertex();
+        dhp.vertex(b, float6 + (boolean15 ? float11 : (-float11)), (float)((integer + 1) * 16), float7 + (boolean16 ? float11 : (-float11))).color(float8, float9, float10, 0.3f).endVertex();
+        dhp.vertex(b, float3 + (boolean15 ? float12 : (-float12)), (float)(integer * 16), float4 + (boolean16 ? float12 : (-float12))).color(float8, float9, float10, 0.3f).endVertex();
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final LightningBolt avy) {
+    public ResourceLocation getTextureLocation(final LightningBolt aox) {
         return TextureAtlas.LOCATION_BLOCKS;
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/LivingEntityRenderer.java b/src/net/minecraft/client/renderer/entity/LivingEntityRenderer.java
index e719deb..05978e3 100644
--- a/src/net/minecraft/client/renderer/entity/LivingEntityRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/LivingEntityRenderer.java
@@ -3,7 +3,6 @@ package net.minecraft.client.renderer.entity;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.scores.Team;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.PlayerModelPart;
 import net.minecraft.ChatFormatting;
 import com.mojang.math.Vector3f;
@@ -14,6 +13,7 @@ import java.util.Iterator;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.core.Direction;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.entity.Pose;
@@ -32,15 +32,15 @@ public abstract class LivingEntityRenderer<T extends LivingEntity, M extends Ent
     protected M model;
     protected final List<RenderLayer<T, M>> layers;
     
-    public LivingEntityRenderer(final EntityRenderDispatcher dvf, final M dla, final float float3) {
-        super(dvf);
+    public LivingEntityRenderer(final EntityRenderDispatcher egm, final M dvv, final float float3) {
+        super(egm);
         this.layers = Lists.newArrayList();
-        this.model = dla;
+        this.model = dvv;
         this.shadowRadius = float3;
     }
     
-    protected final boolean addLayer(final RenderLayer<T, M> dzd) {
-        return this.layers.add(dzd);
+    protected final boolean addLayer(final RenderLayer<T, M> ekm) {
+        return this.layers.add(ekm);
     }
     
     @Override
@@ -49,17 +49,17 @@ public abstract class LivingEntityRenderer<T extends LivingEntity, M extends Ent
     }
     
     @Override
-    public void render(final T akz, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        this.model.attackTime = this.getAttackAnim(akz, float3);
-        this.model.riding = akz.isPassenger();
-        this.model.young = akz.isBaby();
-        float float4 = Mth.rotLerp(float3, akz.yBodyRotO, akz.yBodyRot);
-        final float float5 = Mth.rotLerp(float3, akz.yHeadRotO, akz.yHeadRot);
+    public void render(final T aoy, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        this.model.attackTime = this.getAttackAnim(aoy, float3);
+        this.model.riding = aoy.isPassenger();
+        this.model.young = aoy.isBaby();
+        float float4 = Mth.rotLerp(float3, aoy.yBodyRotO, aoy.yBodyRot);
+        final float float5 = Mth.rotLerp(float3, aoy.yHeadRotO, aoy.yHeadRot);
         float float6 = float5 - float4;
-        if (akz.isPassenger() && akz.getVehicle() instanceof LivingEntity) {
-            final LivingEntity akz2 = (LivingEntity)akz.getVehicle();
-            float4 = Mth.rotLerp(float3, akz2.yBodyRotO, akz2.yBodyRot);
+        if (aoy.isPassenger() && aoy.getVehicle() instanceof LivingEntity) {
+            final LivingEntity aoy2 = (LivingEntity)aoy.getVehicle();
+            float4 = Mth.rotLerp(float3, aoy2.yBodyRotO, aoy2.yBodyRot);
             float6 = float5 - float4;
             float float7 = Mth.wrapDegrees(float6);
             if (float7 < -85.0f) {
@@ -74,75 +74,77 @@ public abstract class LivingEntityRenderer<T extends LivingEntity, M extends Ent
             }
             float6 = float5 - float4;
         }
-        final float float8 = Mth.lerp(float3, akz.xRotO, akz.xRot);
-        if (akz.getPose() == Pose.SLEEPING) {
-            final Direction fp12 = akz.getBedOrientation();
-            if (fp12 != null) {
-                final float float9 = akz.getEyeHeight(Pose.STANDING) - 0.1f;
-                cyl.translate(-fp12.getStepX() * float9, 0.0, -fp12.getStepZ() * float9);
+        final float float8 = Mth.lerp(float3, aoy.xRotO, aoy.xRot);
+        if (aoy.getPose() == Pose.SLEEPING) {
+            final Direction fz12 = aoy.getBedOrientation();
+            if (fz12 != null) {
+                final float float9 = aoy.getEyeHeight(Pose.STANDING) - 0.1f;
+                dhl.translate(-fz12.getStepX() * float9, 0.0, -fz12.getStepZ() * float9);
             }
         }
-        float float7 = this.getBob(akz, float3);
-        this.setupRotations(akz, cyl, float7, float4, float3);
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        this.scale(akz, cyl, float3);
-        cyl.translate(0.0, -1.5010000467300415, 0.0);
+        float float7 = this.getBob(aoy, float3);
+        this.setupRotations(aoy, dhl, float7, float4, float3);
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        this.scale(aoy, dhl, float3);
+        dhl.translate(0.0, -1.5010000467300415, 0.0);
         float float9 = 0.0f;
         float float10 = 0.0f;
-        if (!akz.isPassenger() && akz.isAlive()) {
-            float9 = Mth.lerp(float3, akz.animationSpeedOld, akz.animationSpeed);
-            float10 = akz.animationPosition - akz.animationSpeed * (1.0f - float3);
-            if (akz.isBaby()) {
+        if (!aoy.isPassenger() && aoy.isAlive()) {
+            float9 = Mth.lerp(float3, aoy.animationSpeedOld, aoy.animationSpeed);
+            float10 = aoy.animationPosition - aoy.animationSpeed * (1.0f - float3);
+            if (aoy.isBaby()) {
                 float10 *= 3.0f;
             }
             if (float9 > 1.0f) {
                 float9 = 1.0f;
             }
         }
-        this.model.prepareMobModel(akz, float10, float9, float3);
-        this.model.setupAnim(akz, float10, float9, float7, float6, float8);
-        final boolean boolean15 = this.isBodyVisible(akz);
-        final boolean boolean16 = !boolean15 && !akz.isInvisibleTo(Minecraft.getInstance().player);
-        final RenderType drb17 = this.getRenderType(akz, boolean15, boolean16);
-        if (drb17 != null) {
-            final VertexConsumer cyo18 = dqt.getBuffer(drb17);
-            final int integer2 = getOverlayCoords(akz, this.getWhiteOverlayProgress(akz, float3));
-            this.model.renderToBuffer(cyl, cyo18, integer, integer2, 1.0f, 1.0f, 1.0f, boolean16 ? 0.15f : 1.0f);
+        this.model.prepareMobModel(aoy, float10, float9, float3);
+        this.model.setupAnim(aoy, float10, float9, float7, float6, float8);
+        final Minecraft dlx15 = Minecraft.getInstance();
+        final boolean boolean16 = this.isBodyVisible(aoy);
+        final boolean boolean17 = !boolean16 && !aoy.isInvisibleTo(dlx15.player);
+        final boolean boolean18 = dlx15.shouldEntityAppearGlowing(aoy);
+        final RenderType ech19 = this.getRenderType(aoy, boolean16, boolean17, boolean18);
+        if (ech19 != null) {
+            final VertexConsumer dhp20 = ebz.getBuffer(ech19);
+            final int integer2 = getOverlayCoords(aoy, this.getWhiteOverlayProgress(aoy, float3));
+            this.model.renderToBuffer(dhl, dhp20, integer, integer2, 1.0f, 1.0f, 1.0f, boolean17 ? 0.15f : 1.0f);
         }
-        if (!akz.isSpectator()) {
-            for (final RenderLayer<T, M> dzd19 : this.layers) {
-                dzd19.render(cyl, dqt, integer, akz, float10, float9, float3, float7, float6, float8);
+        if (!aoy.isSpectator()) {
+            for (final RenderLayer<T, M> ekm21 : this.layers) {
+                ekm21.render(dhl, ebz, integer, aoy, float10, float9, float3, float7, float6, float8);
             }
         }
-        cyl.popPose();
-        super.render(akz, float2, float3, cyl, dqt, integer);
+        dhl.popPose();
+        super.render(aoy, float2, float3, dhl, ebz, integer);
     }
     
     @Nullable
-    protected RenderType getRenderType(final T akz, final boolean boolean2, final boolean boolean3) {
-        final ResourceLocation sm5 = this.getTextureLocation(akz);
+    protected RenderType getRenderType(final T aoy, final boolean boolean2, final boolean boolean3, final boolean boolean4) {
+        final ResourceLocation uh6 = this.getTextureLocation(aoy);
         if (boolean3) {
-            return RenderType.entityTranslucent(sm5);
+            return RenderType.itemEntityTranslucentCull(uh6);
         }
         if (boolean2) {
-            return this.model.renderType(sm5);
+            return this.model.renderType(uh6);
         }
-        if (akz.isGlowing()) {
-            return RenderType.outline(sm5);
+        if (boolean4) {
+            return RenderType.outline(uh6);
         }
         return null;
     }
     
-    public static int getOverlayCoords(final LivingEntity akz, final float float2) {
-        return OverlayTexture.pack(OverlayTexture.u(float2), OverlayTexture.v(akz.hurtTime > 0 || akz.deathTime > 0));
+    public static int getOverlayCoords(final LivingEntity aoy, final float float2) {
+        return OverlayTexture.pack(OverlayTexture.u(float2), OverlayTexture.v(aoy.hurtTime > 0 || aoy.deathTime > 0));
     }
     
-    protected boolean isBodyVisible(final T akz) {
-        return !akz.isInvisible();
+    protected boolean isBodyVisible(final T aoy) {
+        return !aoy.isInvisible();
     }
     
-    private static float sleepDirectionToRotation(final Direction fp) {
-        switch (fp) {
+    private static float sleepDirectionToRotation(final Direction fz) {
+        switch (fz) {
             case SOUTH: {
                 return 90.0f;
             }
@@ -161,73 +163,80 @@ public abstract class LivingEntityRenderer<T extends LivingEntity, M extends Ent
         }
     }
     
-    protected void setupRotations(final T akz, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        final Pose alj7 = akz.getPose();
-        if (alj7 != Pose.SLEEPING) {
-            cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float4));
+    protected boolean isShaking(final T aoy) {
+        return false;
+    }
+    
+    protected void setupRotations(final T aoy, final PoseStack dhl, final float float3, float float4, final float float5) {
+        if (this.isShaking(aoy)) {
+            float4 += (float)(Math.cos(aoy.tickCount * 3.25) * 3.141592653589793 * 0.4000000059604645);
         }
-        if (akz.deathTime > 0) {
-            float float6 = (akz.deathTime + float5 - 1.0f) / 20.0f * 1.6f;
+        final Pose apj7 = aoy.getPose();
+        if (apj7 != Pose.SLEEPING) {
+            dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float4));
+        }
+        if (aoy.deathTime > 0) {
+            float float6 = (aoy.deathTime + float5 - 1.0f) / 20.0f * 1.6f;
             float6 = Mth.sqrt(float6);
             if (float6 > 1.0f) {
                 float6 = 1.0f;
             }
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(float6 * this.getFlipDegrees(akz)));
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(float6 * this.getFlipDegrees(aoy)));
         }
-        else if (akz.isAutoSpinAttack()) {
-            cyl.mulPose(Vector3f.XP.rotationDegrees(-90.0f - akz.xRot));
-            cyl.mulPose(Vector3f.YP.rotationDegrees((akz.tickCount + float5) * -75.0f));
+        else if (aoy.isAutoSpinAttack()) {
+            dhl.mulPose(Vector3f.XP.rotationDegrees(-90.0f - aoy.xRot));
+            dhl.mulPose(Vector3f.YP.rotationDegrees((aoy.tickCount + float5) * -75.0f));
         }
-        else if (alj7 == Pose.SLEEPING) {
-            final Direction fp8 = akz.getBedOrientation();
-            final float float7 = (fp8 != null) ? sleepDirectionToRotation(fp8) : float4;
-            cyl.mulPose(Vector3f.YP.rotationDegrees(float7));
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(this.getFlipDegrees(akz)));
-            cyl.mulPose(Vector3f.YP.rotationDegrees(270.0f));
+        else if (apj7 == Pose.SLEEPING) {
+            final Direction fz8 = aoy.getBedOrientation();
+            final float float7 = (fz8 != null) ? sleepDirectionToRotation(fz8) : float4;
+            dhl.mulPose(Vector3f.YP.rotationDegrees(float7));
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(this.getFlipDegrees(aoy)));
+            dhl.mulPose(Vector3f.YP.rotationDegrees(270.0f));
         }
-        else if (akz.hasCustomName() || akz instanceof Player) {
-            final String string8 = ChatFormatting.stripFormatting(akz.getName().getString());
-            if (("Dinnerbone".equals(string8) || "Grumm".equals(string8)) && (!(akz instanceof Player) || ((Player)akz).isModelPartShown(PlayerModelPart.CAPE))) {
-                cyl.translate(0.0, akz.getBbHeight() + 0.1f, 0.0);
-                cyl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
+        else if (aoy.hasCustomName() || aoy instanceof Player) {
+            final String string8 = ChatFormatting.stripFormatting(aoy.getName().getString());
+            if (("Dinnerbone".equals(string8) || "Grumm".equals(string8)) && (!(aoy instanceof Player) || ((Player)aoy).isModelPartShown(PlayerModelPart.CAPE))) {
+                dhl.translate(0.0, aoy.getBbHeight() + 0.1f, 0.0);
+                dhl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
             }
         }
     }
     
-    protected float getAttackAnim(final T akz, final float float2) {
-        return akz.getAttackAnim(float2);
+    protected float getAttackAnim(final T aoy, final float float2) {
+        return aoy.getAttackAnim(float2);
     }
     
-    protected float getBob(final T akz, final float float2) {
-        return akz.tickCount + float2;
+    protected float getBob(final T aoy, final float float2) {
+        return aoy.tickCount + float2;
     }
     
-    protected float getFlipDegrees(final T akz) {
+    protected float getFlipDegrees(final T aoy) {
         return 90.0f;
     }
     
-    protected float getWhiteOverlayProgress(final T akz, final float float2) {
+    protected float getWhiteOverlayProgress(final T aoy, final float float2) {
         return 0.0f;
     }
     
-    protected void scale(final T akz, final PoseStack cyl, final float float3) {
+    protected void scale(final T aoy, final PoseStack dhl, final float float3) {
     }
     
     @Override
-    protected boolean shouldShowName(final T akz) {
-        final double double3 = this.entityRenderDispatcher.distanceToSqr(akz);
-        final float float5 = akz.isDiscrete() ? 32.0f : 64.0f;
+    protected boolean shouldShowName(final T aoy) {
+        final double double3 = this.entityRenderDispatcher.distanceToSqr(aoy);
+        final float float5 = aoy.isDiscrete() ? 32.0f : 64.0f;
         if (double3 >= float5 * float5) {
             return false;
         }
-        final Minecraft dbn6 = Minecraft.getInstance();
-        final LocalPlayer dqb7 = dbn6.player;
-        final boolean boolean8 = !akz.isInvisibleTo(dqb7);
-        if (akz != dqb7) {
-            final Team cwn9 = akz.getTeam();
-            final Team cwn10 = dqb7.getTeam();
-            if (cwn9 != null) {
-                final Team.Visibility b11 = cwn9.getNameTagVisibility();
+        final Minecraft dlx6 = Minecraft.getInstance();
+        final LocalPlayer ebf7 = dlx6.player;
+        final boolean boolean8 = !aoy.isInvisibleTo(ebf7);
+        if (aoy != ebf7) {
+            final Team dfo9 = aoy.getTeam();
+            final Team dfo10 = ebf7.getTeam();
+            if (dfo9 != null) {
+                final Team.Visibility b11 = dfo9.getNameTagVisibility();
                 switch (b11) {
                     case ALWAYS: {
                         return boolean8;
@@ -236,10 +245,10 @@ public abstract class LivingEntityRenderer<T extends LivingEntity, M extends Ent
                         return false;
                     }
                     case HIDE_FOR_OTHER_TEAMS: {
-                        return (cwn10 == null) ? boolean8 : (cwn9.isAlliedTo(cwn10) && (cwn9.canSeeFriendlyInvisibles() || boolean8));
+                        return (dfo10 == null) ? boolean8 : (dfo9.isAlliedTo(dfo10) && (dfo9.canSeeFriendlyInvisibles() || boolean8));
                     }
                     case HIDE_FOR_OWN_TEAM: {
-                        return (cwn10 == null) ? boolean8 : (!cwn9.isAlliedTo(cwn10) && boolean8);
+                        return (dfo10 == null) ? boolean8 : (!dfo9.isAlliedTo(dfo10) && boolean8);
                     }
                     default: {
                         return true;
@@ -247,7 +256,7 @@ public abstract class LivingEntityRenderer<T extends LivingEntity, M extends Ent
                 }
             }
         }
-        return Minecraft.renderNames() && akz != dbn6.getCameraEntity() && boolean8 && !akz.isVehicle();
+        return Minecraft.renderNames() && aoy != dlx6.getCameraEntity() && boolean8 && !aoy.isVehicle();
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/LlamaRenderer.java b/src/net/minecraft/client/renderer/entity/LlamaRenderer.java
index d934893..88eeb94 100644
--- a/src/net/minecraft/client/renderer/entity/LlamaRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/LlamaRenderer.java
@@ -10,14 +10,14 @@ import net.minecraft.world.entity.animal.horse.Llama;
 public class LlamaRenderer extends MobRenderer<Llama, LlamaModel<Llama>> {
     private static final ResourceLocation[] LLAMA_LOCATIONS;
     
-    public LlamaRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new LlamaModel(0.0f), 0.7f);
+    public LlamaRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new LlamaModel(0.0f), 0.7f);
         this.addLayer(new LlamaDecorLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Llama auh) {
-        return LlamaRenderer.LLAMA_LOCATIONS[auh.getVariant()];
+    public ResourceLocation getTextureLocation(final Llama azp) {
+        return LlamaRenderer.LLAMA_LOCATIONS[azp.getVariant()];
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/LlamaSpitRenderer.java b/src/net/minecraft/client/renderer/entity/LlamaSpitRenderer.java
index e3459ca..cbde9b2 100644
--- a/src/net/minecraft/client/renderer/entity/LlamaSpitRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/LlamaSpitRenderer.java
@@ -15,26 +15,26 @@ public class LlamaSpitRenderer extends EntityRenderer<LlamaSpit> {
     private static final ResourceLocation LLAMA_SPIT_LOCATION;
     private final LlamaSpitModel<LlamaSpit> model;
     
-    public LlamaSpitRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public LlamaSpitRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.model = new LlamaSpitModel<LlamaSpit>();
     }
     
     @Override
-    public void render(final LlamaSpit ayx, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.translate(0.0, 0.15000000596046448, 0.0);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(Mth.lerp(float3, ayx.yRotO, ayx.yRot) - 90.0f));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(Mth.lerp(float3, ayx.xRotO, ayx.xRot)));
-        this.model.setupAnim(ayx, float3, 0.0f, -0.1f, 0.0f, 0.0f);
-        final VertexConsumer cyo8 = dqt.getBuffer(this.model.renderType(LlamaSpitRenderer.LLAMA_SPIT_LOCATION));
-        this.model.renderToBuffer(cyl, cyo8, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.popPose();
-        super.render(ayx, float2, float3, cyl, dqt, integer);
+    public void render(final LlamaSpit ber, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        dhl.translate(0.0, 0.15000000596046448, 0.0);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(Mth.lerp(float3, ber.yRotO, ber.yRot) - 90.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(Mth.lerp(float3, ber.xRotO, ber.xRot)));
+        this.model.setupAnim(ber, float3, 0.0f, -0.1f, 0.0f, 0.0f);
+        final VertexConsumer dhp8 = ebz.getBuffer(this.model.renderType(LlamaSpitRenderer.LLAMA_SPIT_LOCATION));
+        this.model.renderToBuffer(dhl, dhp8, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.popPose();
+        super.render(ber, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final LlamaSpit ayx) {
+    public ResourceLocation getTextureLocation(final LlamaSpit ber) {
         return LlamaSpitRenderer.LLAMA_SPIT_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/MagmaCubeRenderer.java b/src/net/minecraft/client/renderer/entity/MagmaCubeRenderer.java
index 6b3b1e9..6d5be41 100644
--- a/src/net/minecraft/client/renderer/entity/MagmaCubeRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/MagmaCubeRenderer.java
@@ -4,6 +4,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.util.Mth;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.model.LavaSlimeModel;
 import net.minecraft.world.entity.monster.MagmaCube;
@@ -11,25 +12,25 @@ import net.minecraft.world.entity.monster.MagmaCube;
 public class MagmaCubeRenderer extends MobRenderer<MagmaCube, LavaSlimeModel<MagmaCube>> {
     private static final ResourceLocation MAGMACUBE_LOCATION;
     
-    public MagmaCubeRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new LavaSlimeModel(), 0.25f);
+    public MagmaCubeRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new LavaSlimeModel(), 0.25f);
     }
     
-    protected int getBlockLightLevel(final MagmaCube awv, final float float2) {
+    protected int getBlockLightLevel(final MagmaCube bca, final BlockPos fu) {
         return 15;
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final MagmaCube awv) {
+    public ResourceLocation getTextureLocation(final MagmaCube bca) {
         return MagmaCubeRenderer.MAGMACUBE_LOCATION;
     }
     
     @Override
-    protected void scale(final MagmaCube awv, final PoseStack cyl, final float float3) {
-        final int integer5 = awv.getSize();
-        final float float4 = Mth.lerp(float3, awv.oSquish, awv.squish) / (integer5 * 0.5f + 1.0f);
+    protected void scale(final MagmaCube bca, final PoseStack dhl, final float float3) {
+        final int integer5 = bca.getSize();
+        final float float4 = Mth.lerp(float3, bca.oSquish, bca.squish) / (integer5 * 0.5f + 1.0f);
         final float float5 = 1.0f / (float4 + 1.0f);
-        cyl.scale(float5 * integer5, 1.0f / float5 * integer5, float5 * integer5);
+        dhl.scale(float5 * integer5, 1.0f / float5 * integer5, float5 * integer5);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/MinecartRenderer.java b/src/net/minecraft/client/renderer/entity/MinecartRenderer.java
index 8a59f6c..dc466b6 100644
--- a/src/net/minecraft/client/renderer/entity/MinecartRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/MinecartRenderer.java
@@ -20,81 +20,81 @@ public class MinecartRenderer<T extends AbstractMinecart> extends EntityRenderer
     private static final ResourceLocation MINECART_LOCATION;
     protected final EntityModel<T> model;
     
-    public MinecartRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public MinecartRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.model = new MinecartModel<T>();
         this.shadowRadius = 0.7f;
     }
     
     @Override
-    public void render(final T azx, float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        super.render(azx, float2, float3, cyl, dqt, integer);
-        cyl.pushPose();
-        long long8 = azx.getId() * 493286711L;
+    public void render(final T bfr, float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        super.render(bfr, float2, float3, dhl, ebz, integer);
+        dhl.pushPose();
+        long long8 = bfr.getId() * 493286711L;
         long8 = long8 * long8 * 4392167121L + long8 * 98761L;
         final float float4 = (((long8 >> 16 & 0x7L) + 0.5f) / 8.0f - 0.5f) * 0.004f;
         final float float5 = (((long8 >> 20 & 0x7L) + 0.5f) / 8.0f - 0.5f) * 0.004f;
         final float float6 = (((long8 >> 24 & 0x7L) + 0.5f) / 8.0f - 0.5f) * 0.004f;
-        cyl.translate(float4, float5, float6);
-        final double double13 = Mth.lerp(float3, azx.xOld, azx.getX());
-        final double double14 = Mth.lerp(float3, azx.yOld, azx.getY());
-        final double double15 = Mth.lerp(float3, azx.zOld, azx.getZ());
+        dhl.translate(float4, float5, float6);
+        final double double13 = Mth.lerp(float3, bfr.xOld, bfr.getX());
+        final double double14 = Mth.lerp(float3, bfr.yOld, bfr.getY());
+        final double double15 = Mth.lerp(float3, bfr.zOld, bfr.getZ());
         final double double16 = 0.30000001192092896;
-        final Vec3 cvl21 = azx.getPos(double13, double14, double15);
-        float float7 = Mth.lerp(float3, azx.xRotO, azx.xRot);
-        if (cvl21 != null) {
-            Vec3 cvl22 = azx.getPosOffs(double13, double14, double15, 0.30000001192092896);
-            Vec3 cvl23 = azx.getPosOffs(double13, double14, double15, -0.30000001192092896);
-            if (cvl22 == null) {
-                cvl22 = cvl21;
+        final Vec3 dem21 = bfr.getPos(double13, double14, double15);
+        float float7 = Mth.lerp(float3, bfr.xRotO, bfr.xRot);
+        if (dem21 != null) {
+            Vec3 dem22 = bfr.getPosOffs(double13, double14, double15, 0.30000001192092896);
+            Vec3 dem23 = bfr.getPosOffs(double13, double14, double15, -0.30000001192092896);
+            if (dem22 == null) {
+                dem22 = dem21;
             }
-            if (cvl23 == null) {
-                cvl23 = cvl21;
+            if (dem23 == null) {
+                dem23 = dem21;
             }
-            cyl.translate(cvl21.x - double13, (cvl22.y + cvl23.y) / 2.0 - double14, cvl21.z - double15);
-            Vec3 cvl24 = cvl23.add(-cvl22.x, -cvl22.y, -cvl22.z);
-            if (cvl24.length() != 0.0) {
-                cvl24 = cvl24.normalize();
-                float2 = (float)(Math.atan2(cvl24.z, cvl24.x) * 180.0 / 3.141592653589793);
-                float7 = (float)(Math.atan(cvl24.y) * 73.0);
+            dhl.translate(dem21.x - double13, (dem22.y + dem23.y) / 2.0 - double14, dem21.z - double15);
+            Vec3 dem24 = dem23.add(-dem22.x, -dem22.y, -dem22.z);
+            if (dem24.length() != 0.0) {
+                dem24 = dem24.normalize();
+                float2 = (float)(Math.atan2(dem24.z, dem24.x) * 180.0 / 3.141592653589793);
+                float7 = (float)(Math.atan(dem24.y) * 73.0);
             }
         }
-        cyl.translate(0.0, 0.375, 0.0);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float2));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(-float7));
-        final float float8 = azx.getHurtTime() - float3;
-        float float9 = azx.getDamage() - float3;
+        dhl.translate(0.0, 0.375, 0.0);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float2));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(-float7));
+        final float float8 = bfr.getHurtTime() - float3;
+        float float9 = bfr.getDamage() - float3;
         if (float9 < 0.0f) {
             float9 = 0.0f;
         }
         if (float8 > 0.0f) {
-            cyl.mulPose(Vector3f.XP.rotationDegrees(Mth.sin(float8) * float8 * float9 / 10.0f * azx.getHurtDir()));
+            dhl.mulPose(Vector3f.XP.rotationDegrees(Mth.sin(float8) * float8 * float9 / 10.0f * bfr.getHurtDir()));
         }
-        final int integer2 = azx.getDisplayOffset();
-        final BlockState byj26 = azx.getDisplayBlockState();
-        if (byj26.getRenderShape() != RenderShape.INVISIBLE) {
-            cyl.pushPose();
+        final int integer2 = bfr.getDisplayOffset();
+        final BlockState cfj26 = bfr.getDisplayBlockState();
+        if (cfj26.getRenderShape() != RenderShape.INVISIBLE) {
+            dhl.pushPose();
             final float float10 = 0.75f;
-            cyl.scale(0.75f, 0.75f, 0.75f);
-            cyl.translate(-0.5, (integer2 - 8) / 16.0f, 0.5);
-            cyl.mulPose(Vector3f.YP.rotationDegrees(90.0f));
-            this.renderMinecartContents(azx, float3, byj26, cyl, dqt, integer);
-            cyl.popPose();
+            dhl.scale(0.75f, 0.75f, 0.75f);
+            dhl.translate(-0.5, (integer2 - 8) / 16.0f, 0.5);
+            dhl.mulPose(Vector3f.YP.rotationDegrees(90.0f));
+            this.renderMinecartContents(bfr, float3, cfj26, dhl, ebz, integer);
+            dhl.popPose();
         }
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        this.model.setupAnim(azx, 0.0f, 0.0f, -0.1f, 0.0f, 0.0f);
-        final VertexConsumer cyo27 = dqt.getBuffer(this.model.renderType(this.getTextureLocation(azx)));
-        this.model.renderToBuffer(cyl, cyo27, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.popPose();
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        this.model.setupAnim(bfr, 0.0f, 0.0f, -0.1f, 0.0f, 0.0f);
+        final VertexConsumer dhp27 = ebz.getBuffer(this.model.renderType(this.getTextureLocation(bfr)));
+        this.model.renderToBuffer(dhl, dhp27, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.popPose();
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final T azx) {
+    public ResourceLocation getTextureLocation(final T bfr) {
         return MinecartRenderer.MINECART_LOCATION;
     }
     
-    protected void renderMinecartContents(final T azx, final float float2, final BlockState byj, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        Minecraft.getInstance().getBlockRenderer().renderSingleBlock(byj, cyl, dqt, integer, OverlayTexture.NO_OVERLAY);
+    protected void renderMinecartContents(final T bfr, final float float2, final BlockState cfj, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        Minecraft.getInstance().getBlockRenderer().renderSingleBlock(cfj, dhl, ebz, integer, OverlayTexture.NO_OVERLAY);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/MobRenderer.java b/src/net/minecraft/client/renderer/entity/MobRenderer.java
index 3bd0f3b..fbf5612 100644
--- a/src/net/minecraft/client/renderer/entity/MobRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/MobRenderer.java
@@ -4,8 +4,9 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.client.renderer.LightTexture;
 import com.mojang.math.Matrix4f;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.LightLayer;
+import net.minecraft.core.BlockPos;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.entity.decoration.HangingEntity;
 import net.minecraft.util.Mth;
@@ -17,87 +18,90 @@ import net.minecraft.client.model.EntityModel;
 import net.minecraft.world.entity.Mob;
 
 public abstract class MobRenderer<T extends Mob, M extends EntityModel<T>> extends LivingEntityRenderer<T, M> {
-    public MobRenderer(final EntityRenderDispatcher dvf, final M dla, final float float3) {
-        super(dvf, dla, float3);
+    public MobRenderer(final EntityRenderDispatcher egm, final M dvv, final float float3) {
+        super(egm, dvv, float3);
     }
     
     @Override
-    protected boolean shouldShowName(final T ala) {
-        return super.shouldShowName(ala) && (ala.shouldShowName() || (ala.hasCustomName() && ala == this.entityRenderDispatcher.crosshairPickEntity));
+    protected boolean shouldShowName(final T aoz) {
+        return super.shouldShowName(aoz) && (aoz.shouldShowName() || (aoz.hasCustomName() && aoz == this.entityRenderDispatcher.crosshairPickEntity));
     }
     
-    public boolean shouldRender(final T ala, final Frustum dtm, final double double3, final double double4, final double double5) {
-        if (super.shouldRender((T)ala, dtm, double3, double4, double5)) {
+    public boolean shouldRender(final T aoz, final Frustum ees, final double double3, final double double4, final double double5) {
+        if (super.shouldRender((T)aoz, ees, double3, double4, double5)) {
             return true;
         }
-        final Entity akq10 = ala.getLeashHolder();
-        return akq10 != null && dtm.isVisible(akq10.getBoundingBoxForCulling());
+        final Entity aom10 = aoz.getLeashHolder();
+        return aom10 != null && ees.isVisible(aom10.getBoundingBoxForCulling());
     }
     
     @Override
-    public void render(final T ala, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        super.render(ala, float2, float3, cyl, dqt, integer);
-        final Entity akq8 = ala.getLeashHolder();
-        if (akq8 == null) {
+    public void render(final T aoz, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        super.render(aoz, float2, float3, dhl, ebz, integer);
+        final Entity aom8 = aoz.getLeashHolder();
+        if (aom8 == null) {
             return;
         }
-        this.<Entity>renderLeash(ala, float3, cyl, dqt, akq8);
+        this.<Entity>renderLeash(aoz, float3, dhl, ebz, aom8);
     }
     
-    private <E extends Entity> void renderLeash(final T ala, final float float2, final PoseStack cyl, final MultiBufferSource dqt, final E akq) {
-        cyl.pushPose();
-        final double double7 = Mth.lerp(float2 * 0.5f, akq.yRot, akq.yRotO) * 0.017453292f;
-        final double double8 = Mth.lerp(float2 * 0.5f, akq.xRot, akq.xRotO) * 0.017453292f;
+    private <E extends Entity> void renderLeash(final T aoz, final float float2, final PoseStack dhl, final MultiBufferSource ebz, final E aom) {
+        dhl.pushPose();
+        final double double7 = Mth.lerp(float2 * 0.5f, aom.yRot, aom.yRotO) * 0.017453292f;
+        final double double8 = Mth.lerp(float2 * 0.5f, aom.xRot, aom.xRotO) * 0.017453292f;
         double double9 = Math.cos(double7);
         double double10 = Math.sin(double7);
         double double11 = Math.sin(double8);
-        if (akq instanceof HangingEntity) {
+        if (aom instanceof HangingEntity) {
             double9 = 0.0;
             double10 = 0.0;
             double11 = -1.0;
         }
         final double double12 = Math.cos(double8);
-        final double double13 = Mth.lerp(float2, akq.xo, akq.getX()) - double9 * 0.7 - double10 * 0.5 * double12;
-        final double double14 = Mth.lerp(float2, akq.yo + akq.getEyeHeight() * 0.7, akq.getY() + akq.getEyeHeight() * 0.7) - double11 * 0.5 - 0.25;
-        final double double15 = Mth.lerp(float2, akq.zo, akq.getZ()) - double10 * 0.7 + double9 * 0.5 * double12;
-        final double double16 = Mth.lerp(float2, ala.yBodyRot, ala.yBodyRotO) * 0.017453292f + 1.5707963267948966;
-        double9 = Math.cos(double16) * ala.getBbWidth() * 0.4;
-        double10 = Math.sin(double16) * ala.getBbWidth() * 0.4;
-        final double double17 = Mth.lerp(float2, ala.xo, ala.getX()) + double9;
-        final double double18 = Mth.lerp(float2, ala.yo, ala.getY());
-        final double double19 = Mth.lerp(float2, ala.zo, ala.getZ()) + double10;
-        cyl.translate(double9, -(1.6 - ala.getBbHeight()) * 0.5, double10);
+        final double double13 = Mth.lerp(float2, aom.xo, aom.getX()) - double9 * 0.7 - double10 * 0.5 * double12;
+        final double double14 = Mth.lerp(float2, aom.yo + aom.getEyeHeight() * 0.7, aom.getY() + aom.getEyeHeight() * 0.7) - double11 * 0.5 - 0.25;
+        final double double15 = Mth.lerp(float2, aom.zo, aom.getZ()) - double10 * 0.7 + double9 * 0.5 * double12;
+        final double double16 = Mth.lerp(float2, aoz.yBodyRot, aoz.yBodyRotO) * 0.017453292f + 1.5707963267948966;
+        final Vec3 dem27 = aoz.getLeashOffset();
+        double9 = Math.cos(double16) * dem27.z + Math.sin(double16) * dem27.x;
+        double10 = Math.sin(double16) * dem27.z - Math.cos(double16) * dem27.x;
+        final double double17 = Mth.lerp(float2, aoz.xo, aoz.getX()) + double9;
+        final double double18 = Mth.lerp(float2, aoz.yo, aoz.getY()) + dem27.y;
+        final double double19 = Mth.lerp(float2, aoz.zo, aoz.getZ()) + double10;
+        dhl.translate(double9, dem27.y, double10);
         final float float3 = (float)(double13 - double17);
         final float float4 = (float)(double14 - double18);
         final float float5 = (float)(double15 - double19);
         final float float6 = 0.025f;
-        final VertexConsumer cyo37 = dqt.getBuffer(RenderType.leash());
-        final Matrix4f b38 = cyl.last().pose();
+        final VertexConsumer dhp38 = ebz.getBuffer(RenderType.leash());
+        final Matrix4f b39 = dhl.last().pose();
         final float float7 = Mth.fastInvSqrt(float3 * float3 + float5 * float5) * 0.025f / 2.0f;
         final float float8 = float5 * float7;
         final float float9 = float3 * float7;
-        final int integer42 = this.getBlockLightLevel((T)ala, float2);
-        final int integer43 = this.entityRenderDispatcher.<E>getRenderer(akq).getBlockLightLevel(akq, float2);
-        final int integer44 = ala.level.getBrightness(LightLayer.SKY, new BlockPos(ala.getEyePosition(float2)));
-        final int integer45 = ala.level.getBrightness(LightLayer.SKY, new BlockPos(akq.getEyePosition(float2)));
-        renderSide(cyo37, b38, float3, float4, float5, integer42, integer43, integer44, integer45, 0.025f, 0.025f, float8, float9);
-        renderSide(cyo37, b38, float3, float4, float5, integer42, integer43, integer44, integer45, 0.025f, 0.0f, float8, float9);
-        cyl.popPose();
+        final BlockPos fu43 = new BlockPos(aoz.getEyePosition(float2));
+        final BlockPos fu44 = new BlockPos(aom.getEyePosition(float2));
+        final int integer45 = this.getBlockLightLevel((T)aoz, fu43);
+        final int integer46 = this.entityRenderDispatcher.<E>getRenderer(aom).getBlockLightLevel(aom, fu44);
+        final int integer47 = aoz.level.getBrightness(LightLayer.SKY, fu43);
+        final int integer48 = aoz.level.getBrightness(LightLayer.SKY, fu44);
+        renderSide(dhp38, b39, float3, float4, float5, integer45, integer46, integer47, integer48, 0.025f, 0.025f, float8, float9);
+        renderSide(dhp38, b39, float3, float4, float5, integer45, integer46, integer47, integer48, 0.025f, 0.0f, float8, float9);
+        dhl.popPose();
     }
     
-    public static void renderSide(final VertexConsumer cyo, final Matrix4f b, final float float3, final float float4, final float float5, final int integer6, final int integer7, final int integer8, final int integer9, final float float10, final float float11, final float float12, final float float13) {
+    public static void renderSide(final VertexConsumer dhp, final Matrix4f b, final float float3, final float float4, final float float5, final int integer6, final int integer7, final int integer8, final int integer9, final float float10, final float float11, final float float12, final float float13) {
         final int integer10 = 24;
         for (int integer11 = 0; integer11 < 24; ++integer11) {
             final float float14 = integer11 / 23.0f;
             final int integer12 = (int)Mth.lerp(float14, (float)integer6, (float)integer7);
             final int integer13 = (int)Mth.lerp(float14, (float)integer8, (float)integer9);
             final int integer14 = LightTexture.pack(integer12, integer13);
-            addVertexPair(cyo, b, integer14, float3, float4, float5, float10, float11, 24, integer11, false, float12, float13);
-            addVertexPair(cyo, b, integer14, float3, float4, float5, float10, float11, 24, integer11 + 1, true, float12, float13);
+            addVertexPair(dhp, b, integer14, float3, float4, float5, float10, float11, 24, integer11, false, float12, float13);
+            addVertexPair(dhp, b, integer14, float3, float4, float5, float10, float11, 24, integer11 + 1, true, float12, float13);
         }
     }
     
-    public static void addVertexPair(final VertexConsumer cyo, final Matrix4f b, final int integer3, final float float4, final float float5, final float float6, final float float7, final float float8, final int integer9, final int integer10, final boolean boolean11, final float float12, final float float13) {
+    public static void addVertexPair(final VertexConsumer dhp, final Matrix4f b, final int integer3, final float float4, final float float5, final float float6, final float float7, final float float8, final int integer9, final int integer10, final boolean boolean11, final float float12, final float float13) {
         float float14 = 0.5f;
         float float15 = 0.4f;
         float float16 = 0.3f;
@@ -108,14 +112,14 @@ public abstract class MobRenderer<T extends Mob, M extends EntityModel<T>> exten
         }
         final float float17 = integer10 / (float)integer9;
         final float float18 = float4 * float17;
-        final float float19 = float5 * (float17 * float17 + float17) * 0.5f + (integer9 - (float)integer10) / (integer9 * 0.75f) + 0.125f;
+        final float float19 = (float5 > 0.0f) ? (float5 * float17 * float17) : (float5 - float5 * (1.0f - float17) * (1.0f - float17));
         final float float20 = float6 * float17;
         if (!boolean11) {
-            cyo.vertex(b, float18 + float12, float19 + float7 - float8, float20 - float13).color(float14, float15, float16, 1.0f).uv2(integer3).endVertex();
+            dhp.vertex(b, float18 + float12, float19 + float7 - float8, float20 - float13).color(float14, float15, float16, 1.0f).uv2(integer3).endVertex();
         }
-        cyo.vertex(b, float18 - float12, float19 + float8, float20 + float13).color(float14, float15, float16, 1.0f).uv2(integer3).endVertex();
+        dhp.vertex(b, float18 - float12, float19 + float8, float20 + float13).color(float14, float15, float16, 1.0f).uv2(integer3).endVertex();
         if (boolean11) {
-            cyo.vertex(b, float18 + float12, float19 + float7 - float8, float20 - float13).color(float14, float15, float16, 1.0f).uv2(integer3).endVertex();
+            dhp.vertex(b, float18 + float12, float19 + float7 - float8, float20 - float13).color(float14, float15, float16, 1.0f).uv2(integer3).endVertex();
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/MushroomCowRenderer.java b/src/net/minecraft/client/renderer/entity/MushroomCowRenderer.java
index 2c9f239..fca7b82 100644
--- a/src/net/minecraft/client/renderer/entity/MushroomCowRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/MushroomCowRenderer.java
@@ -14,14 +14,14 @@ import net.minecraft.world.entity.animal.MushroomCow;
 public class MushroomCowRenderer extends MobRenderer<MushroomCow, CowModel<MushroomCow>> {
     private static final Map<MushroomCow.MushroomType, ResourceLocation> TEXTURES;
     
-    public MushroomCowRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new CowModel(), 0.7f);
+    public MushroomCowRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new CowModel(), 0.7f);
         this.addLayer((RenderLayer<MushroomCow, CowModel<MushroomCow>>)new MushroomCowMushroomLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final MushroomCow atm) {
-        return MushroomCowRenderer.TEXTURES.get(atm.getMushroomType());
+    public ResourceLocation getTextureLocation(final MushroomCow ayu) {
+        return MushroomCowRenderer.TEXTURES.get(ayu.getMushroomType());
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/OcelotRenderer.java b/src/net/minecraft/client/renderer/entity/OcelotRenderer.java
index 50eee92..c063e6e 100644
--- a/src/net/minecraft/client/renderer/entity/OcelotRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/OcelotRenderer.java
@@ -8,12 +8,12 @@ import net.minecraft.world.entity.animal.Ocelot;
 public class OcelotRenderer extends MobRenderer<Ocelot, OcelotModel<Ocelot>> {
     private static final ResourceLocation CAT_OCELOT_LOCATION;
     
-    public OcelotRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new OcelotModel(0.0f), 0.4f);
+    public OcelotRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new OcelotModel(0.0f), 0.4f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Ocelot atn) {
+    public ResourceLocation getTextureLocation(final Ocelot ayv) {
         return OcelotRenderer.CAT_OCELOT_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/PaintingRenderer.java b/src/net/minecraft/client/renderer/entity/PaintingRenderer.java
index 56ca25a..d709668 100644
--- a/src/net/minecraft/client/renderer/entity/PaintingRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/PaintingRenderer.java
@@ -22,48 +22,48 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.entity.decoration.Painting;
 
 public class PaintingRenderer extends EntityRenderer<Painting> {
-    public PaintingRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public PaintingRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    public void render(final Painting avu, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float2));
-        final Motive avt8 = avu.motive;
+    public void render(final Painting bbd, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float2));
+        final Motive bbc8 = bbd.motive;
         final float float4 = 0.0625f;
-        cyl.scale(0.0625f, 0.0625f, 0.0625f);
-        final VertexConsumer cyo10 = dqt.getBuffer(RenderType.entitySolid(this.getTextureLocation(avu)));
-        final PaintingTextureManager eay11 = Minecraft.getInstance().getPaintingTextures();
-        this.renderPainting(cyl, cyo10, avu, avt8.getWidth(), avt8.getHeight(), eay11.get(avt8), eay11.getBackSprite());
-        cyl.popPose();
-        super.render(avu, float2, float3, cyl, dqt, integer);
+        dhl.scale(0.0625f, 0.0625f, 0.0625f);
+        final VertexConsumer dhp10 = ebz.getBuffer(RenderType.entitySolid(this.getTextureLocation(bbd)));
+        final PaintingTextureManager emk11 = Minecraft.getInstance().getPaintingTextures();
+        this.renderPainting(dhl, dhp10, bbd, bbc8.getWidth(), bbc8.getHeight(), emk11.get(bbc8), emk11.getBackSprite());
+        dhl.popPose();
+        super.render(bbd, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Painting avu) {
+    public ResourceLocation getTextureLocation(final Painting bbd) {
         return Minecraft.getInstance().getPaintingTextures().getBackSprite().atlas().location();
     }
     
-    private void renderPainting(final PoseStack cyl, final VertexConsumer cyo, final Painting avu, final int integer4, final int integer5, final TextureAtlasSprite eaj6, final TextureAtlasSprite eaj7) {
-        final PoseStack.Pose a9 = cyl.last();
+    private void renderPainting(final PoseStack dhl, final VertexConsumer dhp, final Painting bbd, final int integer4, final int integer5, final TextureAtlasSprite elv6, final TextureAtlasSprite elv7) {
+        final PoseStack.Pose a9 = dhl.last();
         final Matrix4f b10 = a9.pose();
         final Matrix3f a10 = a9.normal();
         final float float12 = -integer4 / 2.0f;
         final float float13 = -integer5 / 2.0f;
         final float float14 = 0.5f;
-        final float float15 = eaj7.getU0();
-        final float float16 = eaj7.getU1();
-        final float float17 = eaj7.getV0();
-        final float float18 = eaj7.getV1();
-        final float float19 = eaj7.getU0();
-        final float float20 = eaj7.getU1();
-        final float float21 = eaj7.getV0();
-        final float float22 = eaj7.getV(1.0);
-        final float float23 = eaj7.getU0();
-        final float float24 = eaj7.getU(1.0);
-        final float float25 = eaj7.getV0();
-        final float float26 = eaj7.getV1();
+        final float float15 = elv7.getU0();
+        final float float16 = elv7.getU1();
+        final float float17 = elv7.getV0();
+        final float float18 = elv7.getV1();
+        final float float19 = elv7.getU0();
+        final float float20 = elv7.getU1();
+        final float float21 = elv7.getV0();
+        final float float22 = elv7.getV(1.0);
+        final float float23 = elv7.getU0();
+        final float float24 = elv7.getU(1.0);
+        final float float25 = elv7.getV0();
+        final float float26 = elv7.getV1();
         final int integer6 = integer4 / 16;
         final int integer7 = integer5 / 16;
         final double double29 = 16.0 / integer6;
@@ -74,56 +74,56 @@ public class PaintingRenderer extends EntityRenderer<Painting> {
                 final float float28 = float12 + integer8 * 16;
                 final float float29 = float13 + (integer9 + 1) * 16;
                 final float float30 = float13 + integer9 * 16;
-                int integer10 = Mth.floor(avu.getX());
-                final int integer11 = Mth.floor(avu.getY() + (float29 + float30) / 2.0f / 16.0f);
-                int integer12 = Mth.floor(avu.getZ());
-                final Direction fp42 = avu.getDirection();
-                if (fp42 == Direction.NORTH) {
-                    integer10 = Mth.floor(avu.getX() + (float27 + float28) / 2.0f / 16.0f);
+                int integer10 = Mth.floor(bbd.getX());
+                final int integer11 = Mth.floor(bbd.getY() + (float29 + float30) / 2.0f / 16.0f);
+                int integer12 = Mth.floor(bbd.getZ());
+                final Direction fz42 = bbd.getDirection();
+                if (fz42 == Direction.NORTH) {
+                    integer10 = Mth.floor(bbd.getX() + (float27 + float28) / 2.0f / 16.0f);
                 }
-                if (fp42 == Direction.WEST) {
-                    integer12 = Mth.floor(avu.getZ() - (float27 + float28) / 2.0f / 16.0f);
+                if (fz42 == Direction.WEST) {
+                    integer12 = Mth.floor(bbd.getZ() - (float27 + float28) / 2.0f / 16.0f);
                 }
-                if (fp42 == Direction.SOUTH) {
-                    integer10 = Mth.floor(avu.getX() - (float27 + float28) / 2.0f / 16.0f);
+                if (fz42 == Direction.SOUTH) {
+                    integer10 = Mth.floor(bbd.getX() - (float27 + float28) / 2.0f / 16.0f);
                 }
-                if (fp42 == Direction.EAST) {
-                    integer12 = Mth.floor(avu.getZ() + (float27 + float28) / 2.0f / 16.0f);
+                if (fz42 == Direction.EAST) {
+                    integer12 = Mth.floor(bbd.getZ() + (float27 + float28) / 2.0f / 16.0f);
                 }
-                final int integer13 = LevelRenderer.getLightColor(avu.level, new BlockPos(integer10, integer11, integer12));
-                final float float31 = eaj6.getU(double29 * (integer6 - integer8));
-                final float float32 = eaj6.getU(double29 * (integer6 - (integer8 + 1)));
-                final float float33 = eaj6.getV(double30 * (integer7 - integer9));
-                final float float34 = eaj6.getV(double30 * (integer7 - (integer9 + 1)));
-                this.vertex(b10, a10, cyo, float27, float30, float32, float33, -0.5f, 0, 0, -1, integer13);
-                this.vertex(b10, a10, cyo, float28, float30, float31, float33, -0.5f, 0, 0, -1, integer13);
-                this.vertex(b10, a10, cyo, float28, float29, float31, float34, -0.5f, 0, 0, -1, integer13);
-                this.vertex(b10, a10, cyo, float27, float29, float32, float34, -0.5f, 0, 0, -1, integer13);
-                this.vertex(b10, a10, cyo, float27, float29, float15, float17, 0.5f, 0, 0, 1, integer13);
-                this.vertex(b10, a10, cyo, float28, float29, float16, float17, 0.5f, 0, 0, 1, integer13);
-                this.vertex(b10, a10, cyo, float28, float30, float16, float18, 0.5f, 0, 0, 1, integer13);
-                this.vertex(b10, a10, cyo, float27, float30, float15, float18, 0.5f, 0, 0, 1, integer13);
-                this.vertex(b10, a10, cyo, float27, float29, float19, float21, -0.5f, 0, 1, 0, integer13);
-                this.vertex(b10, a10, cyo, float28, float29, float20, float21, -0.5f, 0, 1, 0, integer13);
-                this.vertex(b10, a10, cyo, float28, float29, float20, float22, 0.5f, 0, 1, 0, integer13);
-                this.vertex(b10, a10, cyo, float27, float29, float19, float22, 0.5f, 0, 1, 0, integer13);
-                this.vertex(b10, a10, cyo, float27, float30, float19, float21, 0.5f, 0, -1, 0, integer13);
-                this.vertex(b10, a10, cyo, float28, float30, float20, float21, 0.5f, 0, -1, 0, integer13);
-                this.vertex(b10, a10, cyo, float28, float30, float20, float22, -0.5f, 0, -1, 0, integer13);
-                this.vertex(b10, a10, cyo, float27, float30, float19, float22, -0.5f, 0, -1, 0, integer13);
-                this.vertex(b10, a10, cyo, float27, float29, float24, float25, 0.5f, -1, 0, 0, integer13);
-                this.vertex(b10, a10, cyo, float27, float30, float24, float26, 0.5f, -1, 0, 0, integer13);
-                this.vertex(b10, a10, cyo, float27, float30, float23, float26, -0.5f, -1, 0, 0, integer13);
-                this.vertex(b10, a10, cyo, float27, float29, float23, float25, -0.5f, -1, 0, 0, integer13);
-                this.vertex(b10, a10, cyo, float28, float29, float24, float25, -0.5f, 1, 0, 0, integer13);
-                this.vertex(b10, a10, cyo, float28, float30, float24, float26, -0.5f, 1, 0, 0, integer13);
-                this.vertex(b10, a10, cyo, float28, float30, float23, float26, 0.5f, 1, 0, 0, integer13);
-                this.vertex(b10, a10, cyo, float28, float29, float23, float25, 0.5f, 1, 0, 0, integer13);
+                final int integer13 = LevelRenderer.getLightColor(bbd.level, new BlockPos(integer10, integer11, integer12));
+                final float float31 = elv6.getU(double29 * (integer6 - integer8));
+                final float float32 = elv6.getU(double29 * (integer6 - (integer8 + 1)));
+                final float float33 = elv6.getV(double30 * (integer7 - integer9));
+                final float float34 = elv6.getV(double30 * (integer7 - (integer9 + 1)));
+                this.vertex(b10, a10, dhp, float27, float30, float32, float33, -0.5f, 0, 0, -1, integer13);
+                this.vertex(b10, a10, dhp, float28, float30, float31, float33, -0.5f, 0, 0, -1, integer13);
+                this.vertex(b10, a10, dhp, float28, float29, float31, float34, -0.5f, 0, 0, -1, integer13);
+                this.vertex(b10, a10, dhp, float27, float29, float32, float34, -0.5f, 0, 0, -1, integer13);
+                this.vertex(b10, a10, dhp, float27, float29, float15, float17, 0.5f, 0, 0, 1, integer13);
+                this.vertex(b10, a10, dhp, float28, float29, float16, float17, 0.5f, 0, 0, 1, integer13);
+                this.vertex(b10, a10, dhp, float28, float30, float16, float18, 0.5f, 0, 0, 1, integer13);
+                this.vertex(b10, a10, dhp, float27, float30, float15, float18, 0.5f, 0, 0, 1, integer13);
+                this.vertex(b10, a10, dhp, float27, float29, float19, float21, -0.5f, 0, 1, 0, integer13);
+                this.vertex(b10, a10, dhp, float28, float29, float20, float21, -0.5f, 0, 1, 0, integer13);
+                this.vertex(b10, a10, dhp, float28, float29, float20, float22, 0.5f, 0, 1, 0, integer13);
+                this.vertex(b10, a10, dhp, float27, float29, float19, float22, 0.5f, 0, 1, 0, integer13);
+                this.vertex(b10, a10, dhp, float27, float30, float19, float21, 0.5f, 0, -1, 0, integer13);
+                this.vertex(b10, a10, dhp, float28, float30, float20, float21, 0.5f, 0, -1, 0, integer13);
+                this.vertex(b10, a10, dhp, float28, float30, float20, float22, -0.5f, 0, -1, 0, integer13);
+                this.vertex(b10, a10, dhp, float27, float30, float19, float22, -0.5f, 0, -1, 0, integer13);
+                this.vertex(b10, a10, dhp, float27, float29, float24, float25, 0.5f, -1, 0, 0, integer13);
+                this.vertex(b10, a10, dhp, float27, float30, float24, float26, 0.5f, -1, 0, 0, integer13);
+                this.vertex(b10, a10, dhp, float27, float30, float23, float26, -0.5f, -1, 0, 0, integer13);
+                this.vertex(b10, a10, dhp, float27, float29, float23, float25, -0.5f, -1, 0, 0, integer13);
+                this.vertex(b10, a10, dhp, float28, float29, float24, float25, -0.5f, 1, 0, 0, integer13);
+                this.vertex(b10, a10, dhp, float28, float30, float24, float26, -0.5f, 1, 0, 0, integer13);
+                this.vertex(b10, a10, dhp, float28, float30, float23, float26, 0.5f, 1, 0, 0, integer13);
+                this.vertex(b10, a10, dhp, float28, float29, float23, float25, 0.5f, 1, 0, 0, integer13);
             }
         }
     }
     
-    private void vertex(final Matrix4f b, final Matrix3f a, final VertexConsumer cyo, final float float4, final float float5, final float float6, final float float7, final float float8, final int integer9, final int integer10, final int integer11, final int integer12) {
-        cyo.vertex(b, float4, float5, float8).color(255, 255, 255, 255).uv(float6, float7).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer12).normal(a, (float)integer9, (float)integer10, (float)integer11).endVertex();
+    private void vertex(final Matrix4f b, final Matrix3f a, final VertexConsumer dhp, final float float4, final float float5, final float float6, final float float7, final float float8, final int integer9, final int integer10, final int integer11, final int integer12) {
+        dhp.vertex(b, float4, float5, float8).color(255, 255, 255, 255).uv(float6, float7).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer12).normal(a, (float)integer9, (float)integer10, (float)integer11).endVertex();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/PandaRenderer.java b/src/net/minecraft/client/renderer/entity/PandaRenderer.java
index 41edc0b..f4ce857 100644
--- a/src/net/minecraft/client/renderer/entity/PandaRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/PandaRenderer.java
@@ -18,74 +18,74 @@ import net.minecraft.world.entity.animal.Panda;
 public class PandaRenderer extends MobRenderer<Panda, PandaModel<Panda>> {
     private static final Map<Panda.Gene, ResourceLocation> TEXTURES;
     
-    public PandaRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new PandaModel(9, 0.0f), 0.9f);
+    public PandaRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new PandaModel(9, 0.0f), 0.9f);
         this.addLayer(new PandaHoldsItemLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Panda ato) {
-        return PandaRenderer.TEXTURES.getOrDefault(ato.getVariant(), PandaRenderer.TEXTURES.get(Panda.Gene.NORMAL));
+    public ResourceLocation getTextureLocation(final Panda ayw) {
+        return PandaRenderer.TEXTURES.getOrDefault(ayw.getVariant(), PandaRenderer.TEXTURES.get(Panda.Gene.NORMAL));
     }
     
     @Override
-    protected void setupRotations(final Panda ato, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        super.setupRotations(ato, cyl, float3, float4, float5);
-        if (ato.rollCounter > 0) {
-            final int integer7 = ato.rollCounter;
+    protected void setupRotations(final Panda ayw, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        super.setupRotations(ayw, dhl, float3, float4, float5);
+        if (ayw.rollCounter > 0) {
+            final int integer7 = ayw.rollCounter;
             final int integer8 = integer7 + 1;
             final float float6 = 7.0f;
-            final float float7 = ato.isBaby() ? 0.3f : 0.8f;
+            final float float7 = ayw.isBaby() ? 0.3f : 0.8f;
             if (integer7 < 8) {
                 final float float8 = 90 * integer7 / 7.0f;
                 final float float9 = 90 * integer8 / 7.0f;
                 final float float10 = this.getAngle(float8, float9, integer8, float5, 8.0f);
-                cyl.translate(0.0, (float7 + 0.2f) * (float10 / 90.0f), 0.0);
-                cyl.mulPose(Vector3f.XP.rotationDegrees(-float10));
+                dhl.translate(0.0, (float7 + 0.2f) * (float10 / 90.0f), 0.0);
+                dhl.mulPose(Vector3f.XP.rotationDegrees(-float10));
             }
             else if (integer7 < 16) {
                 final float float8 = (integer7 - 8.0f) / 7.0f;
                 final float float9 = 90.0f + 90.0f * float8;
                 final float float11 = 90.0f + 90.0f * (integer8 - 8.0f) / 7.0f;
                 final float float10 = this.getAngle(float9, float11, integer8, float5, 16.0f);
-                cyl.translate(0.0, float7 + 0.2f + (float7 - 0.2f) * (float10 - 90.0f) / 90.0f, 0.0);
-                cyl.mulPose(Vector3f.XP.rotationDegrees(-float10));
+                dhl.translate(0.0, float7 + 0.2f + (float7 - 0.2f) * (float10 - 90.0f) / 90.0f, 0.0);
+                dhl.mulPose(Vector3f.XP.rotationDegrees(-float10));
             }
             else if (integer7 < 24.0f) {
                 final float float8 = (integer7 - 16.0f) / 7.0f;
                 final float float9 = 180.0f + 90.0f * float8;
                 final float float11 = 180.0f + 90.0f * (integer8 - 16.0f) / 7.0f;
                 final float float10 = this.getAngle(float9, float11, integer8, float5, 24.0f);
-                cyl.translate(0.0, float7 + float7 * (270.0f - float10) / 90.0f, 0.0);
-                cyl.mulPose(Vector3f.XP.rotationDegrees(-float10));
+                dhl.translate(0.0, float7 + float7 * (270.0f - float10) / 90.0f, 0.0);
+                dhl.mulPose(Vector3f.XP.rotationDegrees(-float10));
             }
             else if (integer7 < 32) {
                 final float float8 = (integer7 - 24.0f) / 7.0f;
                 final float float9 = 270.0f + 90.0f * float8;
                 final float float11 = 270.0f + 90.0f * (integer8 - 24.0f) / 7.0f;
                 final float float10 = this.getAngle(float9, float11, integer8, float5, 32.0f);
-                cyl.translate(0.0, float7 * ((360.0f - float10) / 90.0f), 0.0);
-                cyl.mulPose(Vector3f.XP.rotationDegrees(-float10));
+                dhl.translate(0.0, float7 * ((360.0f - float10) / 90.0f), 0.0);
+                dhl.mulPose(Vector3f.XP.rotationDegrees(-float10));
             }
         }
-        final float float12 = ato.getSitAmount(float5);
+        final float float12 = ayw.getSitAmount(float5);
         if (float12 > 0.0f) {
-            cyl.translate(0.0, 0.8f * float12, 0.0);
-            cyl.mulPose(Vector3f.XP.rotationDegrees(Mth.lerp(float12, ato.xRot, ato.xRot + 90.0f)));
-            cyl.translate(0.0, -1.0f * float12, 0.0);
-            if (ato.isScared()) {
-                final float float13 = (float)(Math.cos(ato.tickCount * 1.25) * 3.141592653589793 * 0.05000000074505806);
-                cyl.mulPose(Vector3f.YP.rotationDegrees(float13));
-                if (ato.isBaby()) {
-                    cyl.translate(0.0, 0.800000011920929, 0.550000011920929);
+            dhl.translate(0.0, 0.8f * float12, 0.0);
+            dhl.mulPose(Vector3f.XP.rotationDegrees(Mth.lerp(float12, ayw.xRot, ayw.xRot + 90.0f)));
+            dhl.translate(0.0, -1.0f * float12, 0.0);
+            if (ayw.isScared()) {
+                final float float13 = (float)(Math.cos(ayw.tickCount * 1.25) * 3.141592653589793 * 0.05000000074505806);
+                dhl.mulPose(Vector3f.YP.rotationDegrees(float13));
+                if (ayw.isBaby()) {
+                    dhl.translate(0.0, 0.800000011920929, 0.550000011920929);
                 }
             }
         }
-        final float float13 = ato.getLieOnBackAmount(float5);
+        final float float13 = ayw.getLieOnBackAmount(float5);
         if (float13 > 0.0f) {
-            final float float6 = ato.isBaby() ? 0.5f : 1.3f;
-            cyl.translate(0.0, float6 * float13, 0.0);
-            cyl.mulPose(Vector3f.XP.rotationDegrees(Mth.lerp(float13, ato.xRot, ato.xRot + 180.0f)));
+            final float float6 = ayw.isBaby() ? 0.5f : 1.3f;
+            dhl.translate(0.0, float6 * float13, 0.0);
+            dhl.mulPose(Vector3f.XP.rotationDegrees(Mth.lerp(float13, ayw.xRot, ayw.xRot + 180.0f)));
         }
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/ParrotRenderer.java b/src/net/minecraft/client/renderer/entity/ParrotRenderer.java
index 01d4321..7e00a0d 100644
--- a/src/net/minecraft/client/renderer/entity/ParrotRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ParrotRenderer.java
@@ -10,18 +10,18 @@ import net.minecraft.world.entity.animal.Parrot;
 public class ParrotRenderer extends MobRenderer<Parrot, ParrotModel> {
     public static final ResourceLocation[] PARROT_LOCATIONS;
     
-    public ParrotRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new ParrotModel(), 0.3f);
+    public ParrotRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new ParrotModel(), 0.3f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Parrot atp) {
-        return ParrotRenderer.PARROT_LOCATIONS[atp.getVariant()];
+    public ResourceLocation getTextureLocation(final Parrot ayx) {
+        return ParrotRenderer.PARROT_LOCATIONS[ayx.getVariant()];
     }
     
-    public float getBob(final Parrot atp, final float float2) {
-        final float float3 = Mth.lerp(float2, atp.oFlap, atp.flap);
-        final float float4 = Mth.lerp(float2, atp.oFlapSpeed, atp.flapSpeed);
+    public float getBob(final Parrot ayx, final float float2) {
+        final float float3 = Mth.lerp(float2, ayx.oFlap, ayx.flap);
+        final float float4 = Mth.lerp(float2, ayx.oFlapSpeed, ayx.flapSpeed);
         return (Mth.sin(float3) + 1.0f) * float4;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/PhantomRenderer.java b/src/net/minecraft/client/renderer/entity/PhantomRenderer.java
index dd295c5..f0d4145 100644
--- a/src/net/minecraft/client/renderer/entity/PhantomRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/PhantomRenderer.java
@@ -13,28 +13,28 @@ import net.minecraft.world.entity.monster.Phantom;
 public class PhantomRenderer extends MobRenderer<Phantom, PhantomModel<Phantom>> {
     private static final ResourceLocation PHANTOM_LOCATION;
     
-    public PhantomRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new PhantomModel(), 0.75f);
+    public PhantomRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new PhantomModel(), 0.75f);
         this.addLayer((RenderLayer<Phantom, PhantomModel<Phantom>>)new PhantomEyesLayer((RenderLayerParent<Entity, PhantomModel<Entity>>)this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Phantom awy) {
+    public ResourceLocation getTextureLocation(final Phantom bcd) {
         return PhantomRenderer.PHANTOM_LOCATION;
     }
     
     @Override
-    protected void scale(final Phantom awy, final PoseStack cyl, final float float3) {
-        final int integer5 = awy.getPhantomSize();
+    protected void scale(final Phantom bcd, final PoseStack dhl, final float float3) {
+        final int integer5 = bcd.getPhantomSize();
         final float float4 = 1.0f + 0.15f * integer5;
-        cyl.scale(float4, float4, float4);
-        cyl.translate(0.0, 1.3125, 0.1875);
+        dhl.scale(float4, float4, float4);
+        dhl.translate(0.0, 1.3125, 0.1875);
     }
     
     @Override
-    protected void setupRotations(final Phantom awy, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        super.setupRotations(awy, cyl, float3, float4, float5);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(awy.xRot));
+    protected void setupRotations(final Phantom bcd, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        super.setupRotations(bcd, dhl, float3, float4, float5);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(bcd.xRot));
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/PigRenderer.java b/src/net/minecraft/client/renderer/entity/PigRenderer.java
index 0ca448c..87347b4 100644
--- a/src/net/minecraft/client/renderer/entity/PigRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/PigRenderer.java
@@ -2,7 +2,7 @@ package net.minecraft.client.renderer.entity;
 
 import net.minecraft.world.entity.Entity;
 import net.minecraft.client.renderer.entity.layers.RenderLayer;
-import net.minecraft.client.renderer.entity.layers.PigSaddleLayer;
+import net.minecraft.client.renderer.entity.layers.SaddleLayer;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.model.PigModel;
 import net.minecraft.world.entity.animal.Pig;
@@ -10,13 +10,13 @@ import net.minecraft.world.entity.animal.Pig;
 public class PigRenderer extends MobRenderer<Pig, PigModel<Pig>> {
     private static final ResourceLocation PIG_LOCATION;
     
-    public PigRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new PigModel(), 0.7f);
-        this.addLayer(new PigSaddleLayer(this));
+    public PigRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new PigModel(), 0.7f);
+        this.addLayer(new SaddleLayer<Pig, PigModel<Pig>>(this, new PigModel<Pig>(0.5f), new ResourceLocation("textures/entity/pig/pig_saddle.png")));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Pig atq) {
+    public ResourceLocation getTextureLocation(final Pig ayy) {
         return PigRenderer.PIG_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/PigZombieRenderer.java b/src/net/minecraft/client/renderer/entity/PigZombieRenderer.java
deleted file mode 100644
index 46b5373..0000000
--- a/src/net/minecraft/client/renderer/entity/PigZombieRenderer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package net.minecraft.client.renderer.entity;
-
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.client.renderer.entity.layers.RenderLayer;
-import net.minecraft.client.model.HumanoidModel;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.client.model.ZombieModel;
-import net.minecraft.world.entity.monster.PigZombie;
-
-public class PigZombieRenderer extends HumanoidMobRenderer<PigZombie, ZombieModel<PigZombie>> {
-    private static final ResourceLocation ZOMBIE_PIGMAN_LOCATION;
-    
-    public PigZombieRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new ZombieModel(0.0f, false), 0.5f);
-        this.addLayer((RenderLayer<PigZombie, ZombieModel<PigZombie>>)new HumanoidArmorLayer((RenderLayerParent<LivingEntity, HumanoidModel>)this, new ZombieModel(0.5f, true), new ZombieModel(1.0f, true)));
-    }
-    
-    @Override
-    public ResourceLocation getTextureLocation(final PigZombie awz) {
-        return PigZombieRenderer.ZOMBIE_PIGMAN_LOCATION;
-    }
-    
-    static {
-        ZOMBIE_PIGMAN_LOCATION = new ResourceLocation("textures/entity/zombie_pigman.png");
-    }
-}
diff --git a/src/net/minecraft/client/renderer/entity/PiglinRenderer.java b/src/net/minecraft/client/renderer/entity/PiglinRenderer.java
new file mode 100644
index 0000000..63f2945
--- /dev/null
+++ b/src/net/minecraft/client/renderer/entity/PiglinRenderer.java
@@ -0,0 +1,44 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.monster.piglin.Piglin;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer;
+import net.minecraft.client.model.HumanoidModel;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.model.PiglinModel;
+import net.minecraft.world.entity.Mob;
+
+public class PiglinRenderer extends HumanoidMobRenderer<Mob, PiglinModel<Mob>> {
+    private static final ResourceLocation PIGLIN_LOCATION;
+    private static final ResourceLocation ZOMBIFIED_PIGLIN_LOCATION;
+    
+    public PiglinRenderer(final EntityRenderDispatcher egm, final boolean boolean2) {
+        super(egm, createModel(boolean2), 0.5f, 1.0019531f, 1.0f, 1.0019531f);
+        this.addLayer((RenderLayer<Mob, PiglinModel<Mob>>)new HumanoidArmorLayer((RenderLayerParent<LivingEntity, HumanoidModel>)this, new HumanoidModel(0.5f), new HumanoidModel(1.02f)));
+    }
+    
+    private static PiglinModel<Mob> createModel(final boolean boolean1) {
+        final PiglinModel<Mob> dwv2 = new PiglinModel<Mob>(0.0f, 64, 64);
+        if (boolean1) {
+            dwv2.earLeft.visible = false;
+        }
+        return dwv2;
+    }
+    
+    @Override
+    public ResourceLocation getTextureLocation(final Mob aoz) {
+        return (aoz instanceof Piglin) ? PiglinRenderer.PIGLIN_LOCATION : PiglinRenderer.ZOMBIFIED_PIGLIN_LOCATION;
+    }
+    
+    @Override
+    protected boolean isShaking(final Mob aoz) {
+        return aoz instanceof Piglin && ((Piglin)aoz).isConverting();
+    }
+    
+    static {
+        PIGLIN_LOCATION = new ResourceLocation("textures/entity/piglin/piglin.png");
+        ZOMBIFIED_PIGLIN_LOCATION = new ResourceLocation("textures/entity/piglin/zombified_piglin.png");
+    }
+}
diff --git a/src/net/minecraft/client/renderer/entity/PillagerRenderer.java b/src/net/minecraft/client/renderer/entity/PillagerRenderer.java
index 7972b51..ee819ac 100644
--- a/src/net/minecraft/client/renderer/entity/PillagerRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/PillagerRenderer.java
@@ -11,12 +11,12 @@ import net.minecraft.world.entity.monster.Pillager;
 public class PillagerRenderer extends IllagerRenderer<Pillager> {
     private static final ResourceLocation PILLAGER;
     
-    public PillagerRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new IllagerModel(0.0f, 0.0f, 64, 64), 0.5f);
+    public PillagerRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new IllagerModel(0.0f, 0.0f, 64, 64), 0.5f);
         this.addLayer((RenderLayer<T, IllagerModel<T>>)new ItemInHandLayer<AbstractIllager, IllagerModel<T>>(this));
     }
     
-    public ResourceLocation getTextureLocation(final Pillager axa) {
+    public ResourceLocation getTextureLocation(final Pillager bce) {
         return PillagerRenderer.PILLAGER;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/PolarBearRenderer.java b/src/net/minecraft/client/renderer/entity/PolarBearRenderer.java
index ac9fa9f..16bcef1 100644
--- a/src/net/minecraft/client/renderer/entity/PolarBearRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/PolarBearRenderer.java
@@ -10,19 +10,19 @@ import net.minecraft.world.entity.animal.PolarBear;
 public class PolarBearRenderer extends MobRenderer<PolarBear, PolarBearModel<PolarBear>> {
     private static final ResourceLocation BEAR_LOCATION;
     
-    public PolarBearRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new PolarBearModel(), 0.9f);
+    public PolarBearRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new PolarBearModel(), 0.9f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final PolarBear atr) {
+    public ResourceLocation getTextureLocation(final PolarBear ayz) {
         return PolarBearRenderer.BEAR_LOCATION;
     }
     
     @Override
-    protected void scale(final PolarBear atr, final PoseStack cyl, final float float3) {
-        cyl.scale(1.2f, 1.2f, 1.2f);
-        super.scale(atr, cyl, float3);
+    protected void scale(final PolarBear ayz, final PoseStack dhl, final float float3) {
+        dhl.scale(1.2f, 1.2f, 1.2f);
+        super.scale(ayz, dhl, float3);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/PufferfishRenderer.java b/src/net/minecraft/client/renderer/entity/PufferfishRenderer.java
index 7ac4bb7..f20f77d 100644
--- a/src/net/minecraft/client/renderer/entity/PufferfishRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/PufferfishRenderer.java
@@ -20,8 +20,8 @@ public class PufferfishRenderer extends MobRenderer<Pufferfish, EntityModel<Puff
     private final PufferfishMidModel<Pufferfish> mid;
     private final PufferfishBigModel<Pufferfish> big;
     
-    public PufferfishRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new PufferfishBigModel(), 0.2f);
+    public PufferfishRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new PufferfishBigModel(), 0.2f);
         this.small = new PufferfishSmallModel<Pufferfish>();
         this.mid = new PufferfishMidModel<Pufferfish>();
         this.big = new PufferfishBigModel<Pufferfish>();
@@ -29,13 +29,13 @@ public class PufferfishRenderer extends MobRenderer<Pufferfish, EntityModel<Puff
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Pufferfish ats) {
+    public ResourceLocation getTextureLocation(final Pufferfish aza) {
         return PufferfishRenderer.PUFFER_LOCATION;
     }
     
     @Override
-    public void render(final Pufferfish ats, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final int integer2 = ats.getPuffState();
+    public void render(final Pufferfish aza, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final int integer2 = aza.getPuffState();
         if (integer2 != this.puffStateO) {
             if (integer2 == 0) {
                 this.model = (M)this.small;
@@ -49,13 +49,13 @@ public class PufferfishRenderer extends MobRenderer<Pufferfish, EntityModel<Puff
         }
         this.puffStateO = integer2;
         this.shadowRadius = 0.1f + 0.1f * integer2;
-        super.render(ats, float2, float3, cyl, dqt, integer);
+        super.render(aza, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    protected void setupRotations(final Pufferfish ats, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        cyl.translate(0.0, Mth.cos(float3 * 0.05f) * 0.08f, 0.0);
-        super.setupRotations(ats, cyl, float3, float4, float5);
+    protected void setupRotations(final Pufferfish aza, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        dhl.translate(0.0, Mth.cos(float3 * 0.05f) * 0.08f, 0.0);
+        super.setupRotations(aza, dhl, float3, float4, float5);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/RabbitRenderer.java b/src/net/minecraft/client/renderer/entity/RabbitRenderer.java
index 279b434..2ff7feb 100644
--- a/src/net/minecraft/client/renderer/entity/RabbitRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/RabbitRenderer.java
@@ -16,17 +16,17 @@ public class RabbitRenderer extends MobRenderer<Rabbit, RabbitModel<Rabbit>> {
     private static final ResourceLocation RABBIT_TOAST_LOCATION;
     private static final ResourceLocation RABBIT_EVIL_LOCATION;
     
-    public RabbitRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new RabbitModel(), 0.3f);
+    public RabbitRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new RabbitModel(), 0.3f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Rabbit att) {
-        final String string3 = ChatFormatting.stripFormatting(att.getName().getString());
+    public ResourceLocation getTextureLocation(final Rabbit azb) {
+        final String string3 = ChatFormatting.stripFormatting(azb.getName().getString());
         if (string3 != null && "Toast".equals(string3)) {
             return RabbitRenderer.RABBIT_TOAST_LOCATION;
         }
-        switch (att.getRabbitType()) {
+        switch (azb.getRabbitType()) {
             default: {
                 return RabbitRenderer.RABBIT_BROWN_LOCATION;
             }
diff --git a/src/net/minecraft/client/renderer/entity/RavagerRenderer.java b/src/net/minecraft/client/renderer/entity/RavagerRenderer.java
index 135fcba..527ad1d 100644
--- a/src/net/minecraft/client/renderer/entity/RavagerRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/RavagerRenderer.java
@@ -8,12 +8,12 @@ import net.minecraft.world.entity.monster.Ravager;
 public class RavagerRenderer extends MobRenderer<Ravager, RavagerModel> {
     private static final ResourceLocation TEXTURE_LOCATION;
     
-    public RavagerRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new RavagerModel(), 1.1f);
+    public RavagerRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new RavagerModel(), 1.1f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Ravager axc) {
+    public ResourceLocation getTextureLocation(final Ravager bcg) {
         return RavagerRenderer.TEXTURE_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/RenderLayerParent.java b/src/net/minecraft/client/renderer/entity/RenderLayerParent.java
index 0676b54..eccb622 100644
--- a/src/net/minecraft/client/renderer/entity/RenderLayerParent.java
+++ b/src/net/minecraft/client/renderer/entity/RenderLayerParent.java
@@ -7,5 +7,5 @@ import net.minecraft.world.entity.Entity;
 public interface RenderLayerParent<T extends Entity, M extends EntityModel<T>> {
     M getModel();
     
-    ResourceLocation getTextureLocation(final T akq);
+    ResourceLocation getTextureLocation(final T aom);
 }
diff --git a/src/net/minecraft/client/renderer/entity/SalmonRenderer.java b/src/net/minecraft/client/renderer/entity/SalmonRenderer.java
index 9d5575e..d003a78 100644
--- a/src/net/minecraft/client/renderer/entity/SalmonRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/SalmonRenderer.java
@@ -12,30 +12,30 @@ import net.minecraft.world.entity.animal.Salmon;
 public class SalmonRenderer extends MobRenderer<Salmon, SalmonModel<Salmon>> {
     private static final ResourceLocation SALMON_LOCATION;
     
-    public SalmonRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new SalmonModel(), 0.4f);
+    public SalmonRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new SalmonModel(), 0.4f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Salmon atu) {
+    public ResourceLocation getTextureLocation(final Salmon azc) {
         return SalmonRenderer.SALMON_LOCATION;
     }
     
     @Override
-    protected void setupRotations(final Salmon atu, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        super.setupRotations(atu, cyl, float3, float4, float5);
+    protected void setupRotations(final Salmon azc, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        super.setupRotations(azc, dhl, float3, float4, float5);
         float float6 = 1.0f;
         float float7 = 1.0f;
-        if (!atu.isInWater()) {
+        if (!azc.isInWater()) {
             float6 = 1.3f;
             float7 = 1.7f;
         }
         final float float8 = float6 * 4.3f * Mth.sin(float7 * 0.6f * float3);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float8));
-        cyl.translate(0.0, 0.0, -0.4000000059604645);
-        if (!atu.isInWater()) {
-            cyl.translate(0.20000000298023224, 0.10000000149011612, 0.0);
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float8));
+        dhl.translate(0.0, 0.0, -0.4000000059604645);
+        if (!azc.isInWater()) {
+            dhl.translate(0.20000000298023224, 0.10000000149011612, 0.0);
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
         }
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/SheepRenderer.java b/src/net/minecraft/client/renderer/entity/SheepRenderer.java
index 7b82b17..4be873c 100644
--- a/src/net/minecraft/client/renderer/entity/SheepRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/SheepRenderer.java
@@ -10,13 +10,13 @@ import net.minecraft.world.entity.animal.Sheep;
 public class SheepRenderer extends MobRenderer<Sheep, SheepModel<Sheep>> {
     private static final ResourceLocation SHEEP_LOCATION;
     
-    public SheepRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new SheepModel(), 0.7f);
+    public SheepRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new SheepModel(), 0.7f);
         this.addLayer(new SheepFurLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Sheep atv) {
+    public ResourceLocation getTextureLocation(final Sheep azd) {
         return SheepRenderer.SHEEP_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/ShulkerBulletRenderer.java b/src/net/minecraft/client/renderer/entity/ShulkerBulletRenderer.java
index d2b70be..cd3dac6 100644
--- a/src/net/minecraft/client/renderer/entity/ShulkerBulletRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ShulkerBulletRenderer.java
@@ -7,6 +7,7 @@ import com.mojang.math.Vector3f;
 import net.minecraft.util.Mth;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.core.BlockPos;
 import net.minecraft.client.model.ShulkerBulletModel;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
@@ -17,39 +18,39 @@ public class ShulkerBulletRenderer extends EntityRenderer<ShulkerBullet> {
     private static final RenderType RENDER_TYPE;
     private final ShulkerBulletModel<ShulkerBullet> model;
     
-    public ShulkerBulletRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public ShulkerBulletRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.model = new ShulkerBulletModel<ShulkerBullet>();
     }
     
     @Override
-    protected int getBlockLightLevel(final ShulkerBullet aza, final float float2) {
+    protected int getBlockLightLevel(final ShulkerBullet beu, final BlockPos fu) {
         return 15;
     }
     
     @Override
-    public void render(final ShulkerBullet aza, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        final float float4 = Mth.rotlerp(aza.yRotO, aza.yRot, float3);
-        final float float5 = Mth.lerp(float3, aza.xRotO, aza.xRot);
-        final float float6 = aza.tickCount + float3;
-        cyl.translate(0.0, 0.15000000596046448, 0.0);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(Mth.sin(float6 * 0.1f) * 180.0f));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(Mth.cos(float6 * 0.1f) * 180.0f));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(Mth.sin(float6 * 0.15f) * 360.0f));
-        cyl.scale(-0.5f, -0.5f, 0.5f);
-        this.model.setupAnim(aza, 0.0f, 0.0f, 0.0f, float4, float5);
-        final VertexConsumer cyo11 = dqt.getBuffer(this.model.renderType(ShulkerBulletRenderer.TEXTURE_LOCATION));
-        this.model.renderToBuffer(cyl, cyo11, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.scale(1.5f, 1.5f, 1.5f);
-        final VertexConsumer cyo12 = dqt.getBuffer(ShulkerBulletRenderer.RENDER_TYPE);
-        this.model.renderToBuffer(cyl, cyo12, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 0.15f);
-        cyl.popPose();
-        super.render(aza, float2, float3, cyl, dqt, integer);
+    public void render(final ShulkerBullet beu, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        final float float4 = Mth.rotlerp(beu.yRotO, beu.yRot, float3);
+        final float float5 = Mth.lerp(float3, beu.xRotO, beu.xRot);
+        final float float6 = beu.tickCount + float3;
+        dhl.translate(0.0, 0.15000000596046448, 0.0);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(Mth.sin(float6 * 0.1f) * 180.0f));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(Mth.cos(float6 * 0.1f) * 180.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(Mth.sin(float6 * 0.15f) * 360.0f));
+        dhl.scale(-0.5f, -0.5f, 0.5f);
+        this.model.setupAnim(beu, 0.0f, 0.0f, 0.0f, float4, float5);
+        final VertexConsumer dhp11 = ebz.getBuffer(this.model.renderType(ShulkerBulletRenderer.TEXTURE_LOCATION));
+        this.model.renderToBuffer(dhl, dhp11, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.scale(1.5f, 1.5f, 1.5f);
+        final VertexConsumer dhp12 = ebz.getBuffer(ShulkerBulletRenderer.RENDER_TYPE);
+        this.model.renderToBuffer(dhl, dhp12, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 0.15f);
+        dhl.popPose();
+        super.render(beu, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final ShulkerBullet aza) {
+    public ResourceLocation getTextureLocation(final ShulkerBullet beu) {
         return ShulkerBulletRenderer.TEXTURE_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/ShulkerRenderer.java b/src/net/minecraft/client/renderer/entity/ShulkerRenderer.java
index b0221f4..98b514f 100644
--- a/src/net/minecraft/client/renderer/entity/ShulkerRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ShulkerRenderer.java
@@ -21,35 +21,35 @@ public class ShulkerRenderer extends MobRenderer<Shulker, ShulkerModel<Shulker>>
     public static final ResourceLocation DEFAULT_TEXTURE_LOCATION;
     public static final ResourceLocation[] TEXTURE_LOCATION;
     
-    public ShulkerRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new ShulkerModel(), 0.0f);
+    public ShulkerRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new ShulkerModel(), 0.0f);
         this.addLayer(new ShulkerHeadLayer(this));
     }
     
-    public Vec3 getRenderOffset(final Shulker axe, final float float2) {
-        final int integer4 = axe.getClientSideTeleportInterpolation();
-        if (integer4 > 0 && axe.hasValidInterpolationPositions()) {
-            final BlockPos fk5 = axe.getAttachPosition();
-            final BlockPos fk6 = axe.getOldAttachPosition();
+    public Vec3 getRenderOffset(final Shulker bch, final float float2) {
+        final int integer4 = bch.getClientSideTeleportInterpolation();
+        if (integer4 > 0 && bch.hasValidInterpolationPositions()) {
+            final BlockPos fu5 = bch.getAttachPosition();
+            final BlockPos fu6 = bch.getOldAttachPosition();
             double double7 = (integer4 - float2) / 6.0;
             double7 *= double7;
-            final double double8 = (fk5.getX() - fk6.getX()) * double7;
-            final double double9 = (fk5.getY() - fk6.getY()) * double7;
-            final double double10 = (fk5.getZ() - fk6.getZ()) * double7;
+            final double double8 = (fu5.getX() - fu6.getX()) * double7;
+            final double double9 = (fu5.getY() - fu6.getY()) * double7;
+            final double double10 = (fu5.getZ() - fu6.getZ()) * double7;
             return new Vec3(-double8, -double9, -double10);
         }
-        return super.getRenderOffset((T)axe, float2);
+        return super.getRenderOffset((T)bch, float2);
     }
     
     @Override
-    public boolean shouldRender(final Shulker axe, final Frustum dtm, final double double3, final double double4, final double double5) {
-        if (super.shouldRender(axe, dtm, double3, double4, double5)) {
+    public boolean shouldRender(final Shulker bch, final Frustum ees, final double double3, final double double4, final double double5) {
+        if (super.shouldRender(bch, ees, double3, double4, double5)) {
             return true;
         }
-        if (axe.getClientSideTeleportInterpolation() > 0 && axe.hasValidInterpolationPositions()) {
-            final Vec3 cvl10 = new Vec3(axe.getAttachPosition());
-            final Vec3 cvl11 = new Vec3(axe.getOldAttachPosition());
-            if (dtm.isVisible(new AABB(cvl11.x, cvl11.y, cvl11.z, cvl10.x, cvl10.y, cvl10.z))) {
+        if (bch.getClientSideTeleportInterpolation() > 0 && bch.hasValidInterpolationPositions()) {
+            final Vec3 dem10 = Vec3.atLowerCornerOf(bch.getAttachPosition());
+            final Vec3 dem11 = Vec3.atLowerCornerOf(bch.getOldAttachPosition());
+            if (ees.isVisible(new AABB(dem11.x, dem11.y, dem11.z, dem10.x, dem10.y, dem10.z))) {
                 return true;
             }
         }
@@ -57,32 +57,26 @@ public class ShulkerRenderer extends MobRenderer<Shulker, ShulkerModel<Shulker>>
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Shulker axe) {
-        if (axe.getColor() == null) {
+    public ResourceLocation getTextureLocation(final Shulker bch) {
+        if (bch.getColor() == null) {
             return ShulkerRenderer.DEFAULT_TEXTURE_LOCATION;
         }
-        return ShulkerRenderer.TEXTURE_LOCATION[axe.getColor().getId()];
+        return ShulkerRenderer.TEXTURE_LOCATION[bch.getColor().getId()];
     }
     
     @Override
-    protected void setupRotations(final Shulker axe, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        super.setupRotations(axe, cyl, float3, float4, float5);
-        cyl.translate(0.0, 0.5, 0.0);
-        cyl.mulPose(axe.getAttachFace().getOpposite().getRotation());
-        cyl.translate(0.0, -0.5, 0.0);
-    }
-    
-    @Override
-    protected void scale(final Shulker axe, final PoseStack cyl, final float float3) {
-        final float float4 = 0.999f;
-        cyl.scale(0.999f, 0.999f, 0.999f);
+    protected void setupRotations(final Shulker bch, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        super.setupRotations(bch, dhl, float3, float4 + 180.0f, float5);
+        dhl.translate(0.0, 0.5, 0.0);
+        dhl.mulPose(bch.getAttachFace().getOpposite().getRotation());
+        dhl.translate(0.0, -0.5, 0.0);
     }
     
     static {
         DEFAULT_TEXTURE_LOCATION = new ResourceLocation("textures/" + Sheets.DEFAULT_SHULKER_TEXTURE_LOCATION.texture().getPath() + ".png");
         final ResourceLocation resourceLocation;
-        TEXTURE_LOCATION = Sheets.SHULKER_TEXTURE_LOCATION.stream().map(eby -> {
-            new ResourceLocation("textures/" + eby.texture().getPath() + ".png");
+        TEXTURE_LOCATION = Sheets.SHULKER_TEXTURE_LOCATION.stream().map(enk -> {
+            new ResourceLocation("textures/" + enk.texture().getPath() + ".png");
             return resourceLocation;
         }).<ResourceLocation>toArray(ResourceLocation[]::new);
     }
diff --git a/src/net/minecraft/client/renderer/entity/SilverfishRenderer.java b/src/net/minecraft/client/renderer/entity/SilverfishRenderer.java
index 3dbebca..1b6b17c 100644
--- a/src/net/minecraft/client/renderer/entity/SilverfishRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/SilverfishRenderer.java
@@ -9,17 +9,17 @@ import net.minecraft.world.entity.monster.Silverfish;
 public class SilverfishRenderer extends MobRenderer<Silverfish, SilverfishModel<Silverfish>> {
     private static final ResourceLocation SILVERFISH_LOCATION;
     
-    public SilverfishRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new SilverfishModel(), 0.3f);
+    public SilverfishRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new SilverfishModel(), 0.3f);
     }
     
     @Override
-    protected float getFlipDegrees(final Silverfish axf) {
+    protected float getFlipDegrees(final Silverfish bci) {
         return 180.0f;
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Silverfish axf) {
+    public ResourceLocation getTextureLocation(final Silverfish bci) {
         return SilverfishRenderer.SILVERFISH_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/SkeletonRenderer.java b/src/net/minecraft/client/renderer/entity/SkeletonRenderer.java
index f37b281..dab98a8 100644
--- a/src/net/minecraft/client/renderer/entity/SkeletonRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/SkeletonRenderer.java
@@ -2,11 +2,10 @@ package net.minecraft.client.renderer.entity;
 
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.Mob;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer;
-import net.minecraft.client.renderer.entity.layers.RenderLayer;
-import net.minecraft.client.renderer.entity.layers.ItemInHandLayer;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.model.SkeletonModel;
 import net.minecraft.world.entity.monster.AbstractSkeleton;
@@ -14,14 +13,13 @@ import net.minecraft.world.entity.monster.AbstractSkeleton;
 public class SkeletonRenderer extends HumanoidMobRenderer<AbstractSkeleton, SkeletonModel<AbstractSkeleton>> {
     private static final ResourceLocation SKELETON_LOCATION;
     
-    public SkeletonRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new SkeletonModel(), 0.5f);
-        this.addLayer(new ItemInHandLayer<AbstractSkeleton, SkeletonModel<AbstractSkeleton>>(this));
+    public SkeletonRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new SkeletonModel(), 0.5f);
         this.addLayer((RenderLayer<AbstractSkeleton, SkeletonModel<AbstractSkeleton>>)new HumanoidArmorLayer((RenderLayerParent<LivingEntity, HumanoidModel>)this, new SkeletonModel(0.5f, true), new SkeletonModel(1.0f, true)));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final AbstractSkeleton awf) {
+    public ResourceLocation getTextureLocation(final AbstractSkeleton bbk) {
         return SkeletonRenderer.SKELETON_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/SlimeRenderer.java b/src/net/minecraft/client/renderer/entity/SlimeRenderer.java
index a00896c..2dbafe2 100644
--- a/src/net/minecraft/client/renderer/entity/SlimeRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/SlimeRenderer.java
@@ -15,30 +15,30 @@ import net.minecraft.world.entity.monster.Slime;
 public class SlimeRenderer extends MobRenderer<Slime, SlimeModel<Slime>> {
     private static final ResourceLocation SLIME_LOCATION;
     
-    public SlimeRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new SlimeModel(16), 0.25f);
+    public SlimeRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new SlimeModel(16), 0.25f);
         this.addLayer((RenderLayer<Slime, SlimeModel<Slime>>)new SlimeOuterLayer((RenderLayerParent<LivingEntity, SlimeModel<LivingEntity>>)this));
     }
     
     @Override
-    public void render(final Slime axh, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        this.shadowRadius = 0.25f * axh.getSize();
-        super.render(axh, float2, float3, cyl, dqt, integer);
+    public void render(final Slime bck, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        this.shadowRadius = 0.25f * bck.getSize();
+        super.render(bck, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    protected void scale(final Slime axh, final PoseStack cyl, final float float3) {
+    protected void scale(final Slime bck, final PoseStack dhl, final float float3) {
         final float float4 = 0.999f;
-        cyl.scale(0.999f, 0.999f, 0.999f);
-        cyl.translate(0.0, 0.0010000000474974513, 0.0);
-        final float float5 = (float)axh.getSize();
-        final float float6 = Mth.lerp(float3, axh.oSquish, axh.squish) / (float5 * 0.5f + 1.0f);
+        dhl.scale(0.999f, 0.999f, 0.999f);
+        dhl.translate(0.0, 0.0010000000474974513, 0.0);
+        final float float5 = (float)bck.getSize();
+        final float float6 = Mth.lerp(float3, bck.oSquish, bck.squish) / (float5 * 0.5f + 1.0f);
         final float float7 = 1.0f / (float6 + 1.0f);
-        cyl.scale(float7 * float5, 1.0f / float7 * float5, float7 * float5);
+        dhl.scale(float7 * float5, 1.0f / float7 * float5, float7 * float5);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Slime axh) {
+    public ResourceLocation getTextureLocation(final Slime bck) {
         return SlimeRenderer.SLIME_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/SnowGolemRenderer.java b/src/net/minecraft/client/renderer/entity/SnowGolemRenderer.java
index a403bba..f369391 100644
--- a/src/net/minecraft/client/renderer/entity/SnowGolemRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/SnowGolemRenderer.java
@@ -10,13 +10,13 @@ import net.minecraft.world.entity.animal.SnowGolem;
 public class SnowGolemRenderer extends MobRenderer<SnowGolem, SnowGolemModel<SnowGolem>> {
     private static final ResourceLocation SNOW_GOLEM_LOCATION;
     
-    public SnowGolemRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new SnowGolemModel(), 0.5f);
+    public SnowGolemRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new SnowGolemModel(), 0.5f);
         this.addLayer(new SnowGolemHeadLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final SnowGolem atx) {
+    public ResourceLocation getTextureLocation(final SnowGolem azf) {
         return SnowGolemRenderer.SNOW_GOLEM_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/SpectralArrowRenderer.java b/src/net/minecraft/client/renderer/entity/SpectralArrowRenderer.java
index e8dffba..4704dc1 100644
--- a/src/net/minecraft/client/renderer/entity/SpectralArrowRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/SpectralArrowRenderer.java
@@ -7,12 +7,12 @@ import net.minecraft.world.entity.projectile.SpectralArrow;
 public class SpectralArrowRenderer extends ArrowRenderer<SpectralArrow> {
     public static final ResourceLocation SPECTRAL_ARROW_LOCATION;
     
-    public SpectralArrowRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public SpectralArrowRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final SpectralArrow azd) {
+    public ResourceLocation getTextureLocation(final SpectralArrow bex) {
         return SpectralArrowRenderer.SPECTRAL_ARROW_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/SpiderRenderer.java b/src/net/minecraft/client/renderer/entity/SpiderRenderer.java
index c6a164e..a293ac6 100644
--- a/src/net/minecraft/client/renderer/entity/SpiderRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/SpiderRenderer.java
@@ -11,18 +11,18 @@ import net.minecraft.world.entity.monster.Spider;
 public class SpiderRenderer<T extends Spider> extends MobRenderer<T, SpiderModel<T>> {
     private static final ResourceLocation SPIDER_LOCATION;
     
-    public SpiderRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new SpiderModel(), 0.8f);
+    public SpiderRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new SpiderModel(), 0.8f);
         this.addLayer(new SpiderEyesLayer<T, SpiderModel<T>>(this));
     }
     
     @Override
-    protected float getFlipDegrees(final T axj) {
+    protected float getFlipDegrees(final T bcm) {
         return 180.0f;
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final T axj) {
+    public ResourceLocation getTextureLocation(final T bcm) {
         return SpiderRenderer.SPIDER_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/SquidRenderer.java b/src/net/minecraft/client/renderer/entity/SquidRenderer.java
index 2c42171..c7637bf 100644
--- a/src/net/minecraft/client/renderer/entity/SquidRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/SquidRenderer.java
@@ -12,29 +12,29 @@ import net.minecraft.world.entity.animal.Squid;
 public class SquidRenderer extends MobRenderer<Squid, SquidModel<Squid>> {
     private static final ResourceLocation SQUID_LOCATION;
     
-    public SquidRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new SquidModel(), 0.7f);
+    public SquidRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new SquidModel(), 0.7f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Squid aty) {
+    public ResourceLocation getTextureLocation(final Squid azg) {
         return SquidRenderer.SQUID_LOCATION;
     }
     
     @Override
-    protected void setupRotations(final Squid aty, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        final float float6 = Mth.lerp(float5, aty.xBodyRotO, aty.xBodyRot);
-        final float float7 = Mth.lerp(float5, aty.zBodyRotO, aty.zBodyRot);
-        cyl.translate(0.0, 0.5, 0.0);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float4));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(float6));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float7));
-        cyl.translate(0.0, -1.2000000476837158, 0.0);
+    protected void setupRotations(final Squid azg, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        final float float6 = Mth.lerp(float5, azg.xBodyRotO, azg.xBodyRot);
+        final float float7 = Mth.lerp(float5, azg.zBodyRotO, azg.zBodyRot);
+        dhl.translate(0.0, 0.5, 0.0);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float4));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(float6));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float7));
+        dhl.translate(0.0, -1.2000000476837158, 0.0);
     }
     
     @Override
-    protected float getBob(final Squid aty, final float float2) {
-        return Mth.lerp(float2, aty.oldTentacleAngle, aty.tentacleAngle);
+    protected float getBob(final Squid azg, final float float2) {
+        return Mth.lerp(float2, azg.oldTentacleAngle, azg.tentacleAngle);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/StrayRenderer.java b/src/net/minecraft/client/renderer/entity/StrayRenderer.java
index cb0ba67..a09bf92 100644
--- a/src/net/minecraft/client/renderer/entity/StrayRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/StrayRenderer.java
@@ -11,13 +11,13 @@ import net.minecraft.resources.ResourceLocation;
 public class StrayRenderer extends SkeletonRenderer {
     private static final ResourceLocation STRAY_SKELETON_LOCATION;
     
-    public StrayRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public StrayRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.addLayer(new StrayClothingLayer<AbstractSkeleton, SkeletonModel<AbstractSkeleton>>(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final AbstractSkeleton awf) {
+    public ResourceLocation getTextureLocation(final AbstractSkeleton bbk) {
         return StrayRenderer.STRAY_SKELETON_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/StriderRenderer.java b/src/net/minecraft/client/renderer/entity/StriderRenderer.java
new file mode 100644
index 0000000..63e5dfa
--- /dev/null
+++ b/src/net/minecraft/client/renderer/entity/StriderRenderer.java
@@ -0,0 +1,48 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
+import net.minecraft.client.renderer.entity.layers.SaddleLayer;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.model.StriderModel;
+import net.minecraft.world.entity.monster.Strider;
+
+public class StriderRenderer extends MobRenderer<Strider, StriderModel<Strider>> {
+    private static final ResourceLocation STRIDER_LOCATION;
+    private static final ResourceLocation COLD_LOCATION;
+    
+    public StriderRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new StriderModel(), 0.5f);
+        this.addLayer(new SaddleLayer<Strider, StriderModel<Strider>>(this, new StriderModel<Strider>(), new ResourceLocation("textures/entity/strider/strider_saddle.png")));
+    }
+    
+    @Override
+    public ResourceLocation getTextureLocation(final Strider bco) {
+        return bco.isSuffocating() ? StriderRenderer.COLD_LOCATION : StriderRenderer.STRIDER_LOCATION;
+    }
+    
+    @Override
+    protected void scale(final Strider bco, final PoseStack dhl, final float float3) {
+        float float4 = 0.9375f;
+        if (bco.isBaby()) {
+            float4 *= 0.5f;
+            this.shadowRadius = 0.25f;
+        }
+        else {
+            this.shadowRadius = 0.5f;
+        }
+        dhl.scale(float4, float4, float4);
+    }
+    
+    @Override
+    protected boolean isShaking(final Strider bco) {
+        return bco.isSuffocating();
+    }
+    
+    static {
+        STRIDER_LOCATION = new ResourceLocation("textures/entity/strider/strider.png");
+        COLD_LOCATION = new ResourceLocation("textures/entity/strider/strider_cold.png");
+    }
+}
diff --git a/src/net/minecraft/client/renderer/entity/ThrownItemRenderer.java b/src/net/minecraft/client/renderer/entity/ThrownItemRenderer.java
index e0f3d16..1afb015 100644
--- a/src/net/minecraft/client/renderer/entity/ThrownItemRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ThrownItemRenderer.java
@@ -8,41 +8,45 @@ import net.minecraft.world.entity.projectile.ItemSupplier;
 import com.mojang.math.Vector3f;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.core.BlockPos;
 
 public class ThrownItemRenderer<T extends Entity> extends EntityRenderer<T> {
     private final ItemRenderer itemRenderer;
     private final float scale;
     private final boolean fullBright;
     
-    public ThrownItemRenderer(final EntityRenderDispatcher dvf, final ItemRenderer dvz, final float float3, final boolean boolean4) {
-        super(dvf);
-        this.itemRenderer = dvz;
+    public ThrownItemRenderer(final EntityRenderDispatcher egm, final ItemRenderer ehh, final float float3, final boolean boolean4) {
+        super(egm);
+        this.itemRenderer = ehh;
         this.scale = float3;
         this.fullBright = boolean4;
     }
     
-    public ThrownItemRenderer(final EntityRenderDispatcher dvf, final ItemRenderer dvz) {
-        this(dvf, dvz, 1.0f, false);
+    public ThrownItemRenderer(final EntityRenderDispatcher egm, final ItemRenderer ehh) {
+        this(egm, ehh, 1.0f, false);
     }
     
     @Override
-    protected int getBlockLightLevel(final T akq, final float float2) {
-        return this.fullBright ? 15 : super.getBlockLightLevel(akq, float2);
+    protected int getBlockLightLevel(final T aom, final BlockPos fu) {
+        return this.fullBright ? 15 : super.getBlockLightLevel(aom, fu);
     }
     
     @Override
-    public void render(final T akq, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.scale(this.scale, this.scale, this.scale);
-        cyl.mulPose(this.entityRenderDispatcher.cameraOrientation());
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
-        this.itemRenderer.renderStatic(((ItemSupplier)akq).getItem(), ItemTransforms.TransformType.GROUND, integer, OverlayTexture.NO_OVERLAY, cyl, dqt);
-        cyl.popPose();
-        super.render(akq, float2, float3, cyl, dqt, integer);
+    public void render(final T aom, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        if (((Entity)aom).tickCount < 2 && this.entityRenderDispatcher.camera.getEntity().distanceToSqr((Entity)aom) < 12.25) {
+            return;
+        }
+        dhl.pushPose();
+        dhl.scale(this.scale, this.scale, this.scale);
+        dhl.mulPose(this.entityRenderDispatcher.cameraOrientation());
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
+        this.itemRenderer.renderStatic(((ItemSupplier)aom).getItem(), ItemTransforms.TransformType.GROUND, integer, OverlayTexture.NO_OVERLAY, dhl, ebz);
+        dhl.popPose();
+        super.render(aom, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Entity akq) {
+    public ResourceLocation getTextureLocation(final Entity aom) {
         return TextureAtlas.LOCATION_BLOCKS;
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/ThrownTridentRenderer.java b/src/net/minecraft/client/renderer/entity/ThrownTridentRenderer.java
index fc5d011..b411029 100644
--- a/src/net/minecraft/client/renderer/entity/ThrownTridentRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ThrownTridentRenderer.java
@@ -15,24 +15,24 @@ public class ThrownTridentRenderer extends EntityRenderer<ThrownTrident> {
     public static final ResourceLocation TRIDENT_LOCATION;
     private final TridentModel model;
     
-    public ThrownTridentRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public ThrownTridentRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.model = new TridentModel();
     }
     
     @Override
-    public void render(final ThrownTrident azk, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.mulPose(Vector3f.YP.rotationDegrees(Mth.lerp(float3, azk.yRotO, azk.yRot) - 90.0f));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(Mth.lerp(float3, azk.xRotO, azk.xRot) + 90.0f));
-        final VertexConsumer cyo8 = ItemRenderer.getFoilBuffer(dqt, this.model.renderType(this.getTextureLocation(azk)), false, azk.isFoil());
-        this.model.renderToBuffer(cyl, cyo8, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.popPose();
-        super.render(azk, float2, float3, cyl, dqt, integer);
+    public void render(final ThrownTrident bfe, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        dhl.mulPose(Vector3f.YP.rotationDegrees(Mth.lerp(float3, bfe.yRotO, bfe.yRot) - 90.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(Mth.lerp(float3, bfe.xRotO, bfe.xRot) + 90.0f));
+        final VertexConsumer dhp8 = ItemRenderer.getFoilBufferDirect(ebz, this.model.renderType(this.getTextureLocation(bfe)), false, bfe.isFoil());
+        this.model.renderToBuffer(dhl, dhp8, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.popPose();
+        super.render(bfe, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final ThrownTrident azk) {
+    public ResourceLocation getTextureLocation(final ThrownTrident bfe) {
         return ThrownTridentRenderer.TRIDENT_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/TippableArrowRenderer.java b/src/net/minecraft/client/renderer/entity/TippableArrowRenderer.java
index 8b84663..0b8de26 100644
--- a/src/net/minecraft/client/renderer/entity/TippableArrowRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/TippableArrowRenderer.java
@@ -8,13 +8,13 @@ public class TippableArrowRenderer extends ArrowRenderer<Arrow> {
     public static final ResourceLocation NORMAL_ARROW_LOCATION;
     public static final ResourceLocation TIPPED_ARROW_LOCATION;
     
-    public TippableArrowRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public TippableArrowRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Arrow ayp) {
-        return (ayp.getColor() > 0) ? TippableArrowRenderer.TIPPED_ARROW_LOCATION : TippableArrowRenderer.NORMAL_ARROW_LOCATION;
+    public ResourceLocation getTextureLocation(final Arrow bei) {
+        return (bei.getColor() > 0) ? TippableArrowRenderer.TIPPED_ARROW_LOCATION : TippableArrowRenderer.NORMAL_ARROW_LOCATION;
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/TntMinecartRenderer.java b/src/net/minecraft/client/renderer/entity/TntMinecartRenderer.java
index 2d1db5a..4fdc45e 100644
--- a/src/net/minecraft/client/renderer/entity/TntMinecartRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/TntMinecartRenderer.java
@@ -10,25 +10,25 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.entity.vehicle.MinecartTNT;
 
 public class TntMinecartRenderer extends MinecartRenderer<MinecartTNT> {
-    public TntMinecartRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public TntMinecartRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    protected void renderMinecartContents(final MinecartTNT bag, final float float2, final BlockState byj, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final int integer2 = bag.getFuse();
+    protected void renderMinecartContents(final MinecartTNT bgb, final float float2, final BlockState cfj, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final int integer2 = bgb.getFuse();
         if (integer2 > -1 && integer2 - float2 + 1.0f < 10.0f) {
             float float3 = 1.0f - (integer2 - float2 + 1.0f) / 10.0f;
             float3 = Mth.clamp(float3, 0.0f, 1.0f);
             float3 *= float3;
             float3 *= float3;
             final float float4 = 1.0f + float3 * 0.3f;
-            cyl.scale(float4, float4, float4);
+            dhl.scale(float4, float4, float4);
         }
-        renderWhiteSolidBlock(byj, cyl, dqt, integer, integer2 > -1 && integer2 / 5 % 2 == 0);
+        renderWhiteSolidBlock(cfj, dhl, ebz, integer, integer2 > -1 && integer2 / 5 % 2 == 0);
     }
     
-    public static void renderWhiteSolidBlock(final BlockState byj, final PoseStack cyl, final MultiBufferSource dqt, final int integer, final boolean boolean5) {
+    public static void renderWhiteSolidBlock(final BlockState cfj, final PoseStack dhl, final MultiBufferSource ebz, final int integer, final boolean boolean5) {
         int integer2;
         if (boolean5) {
             integer2 = OverlayTexture.pack(OverlayTexture.u(1.0f), 10);
@@ -36,6 +36,6 @@ public class TntMinecartRenderer extends MinecartRenderer<MinecartTNT> {
         else {
             integer2 = OverlayTexture.NO_OVERLAY;
         }
-        Minecraft.getInstance().getBlockRenderer().renderSingleBlock(byj, cyl, dqt, integer, integer2);
+        Minecraft.getInstance().getBlockRenderer().renderSingleBlock(cfj, dhl, ebz, integer, integer2);
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/TntRenderer.java b/src/net/minecraft/client/renderer/entity/TntRenderer.java
index 0da9dc2..3af8bea 100644
--- a/src/net/minecraft/client/renderer/entity/TntRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/TntRenderer.java
@@ -11,33 +11,33 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.world.entity.item.PrimedTnt;
 
 public class TntRenderer extends EntityRenderer<PrimedTnt> {
-    public TntRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public TntRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.shadowRadius = 0.5f;
     }
     
     @Override
-    public void render(final PrimedTnt awc, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.translate(0.0, 0.5, 0.0);
-        if (awc.getLife() - float3 + 1.0f < 10.0f) {
-            float float4 = 1.0f - (awc.getLife() - float3 + 1.0f) / 10.0f;
+    public void render(final PrimedTnt bbh, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        dhl.translate(0.0, 0.5, 0.0);
+        if (bbh.getLife() - float3 + 1.0f < 10.0f) {
+            float float4 = 1.0f - (bbh.getLife() - float3 + 1.0f) / 10.0f;
             float4 = Mth.clamp(float4, 0.0f, 1.0f);
             float4 *= float4;
             float4 *= float4;
             final float float5 = 1.0f + float4 * 0.3f;
-            cyl.scale(float5, float5, float5);
+            dhl.scale(float5, float5, float5);
         }
-        cyl.mulPose(Vector3f.YP.rotationDegrees(-90.0f));
-        cyl.translate(-0.5, -0.5, 0.5);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(90.0f));
-        TntMinecartRenderer.renderWhiteSolidBlock(Blocks.TNT.defaultBlockState(), cyl, dqt, integer, awc.getLife() / 5 % 2 == 0);
-        cyl.popPose();
-        super.render(awc, float2, float3, cyl, dqt, integer);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(-90.0f));
+        dhl.translate(-0.5, -0.5, 0.5);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(90.0f));
+        TntMinecartRenderer.renderWhiteSolidBlock(Blocks.TNT.defaultBlockState(), dhl, ebz, integer, bbh.getLife() / 5 % 2 == 0);
+        dhl.popPose();
+        super.render(bbh, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final PrimedTnt awc) {
+    public ResourceLocation getTextureLocation(final PrimedTnt bbh) {
         return TextureAtlas.LOCATION_BLOCKS;
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/TropicalFishRenderer.java b/src/net/minecraft/client/renderer/entity/TropicalFishRenderer.java
index 7e46932..351a3d0 100644
--- a/src/net/minecraft/client/renderer/entity/TropicalFishRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/TropicalFishRenderer.java
@@ -20,36 +20,36 @@ public class TropicalFishRenderer extends MobRenderer<TropicalFish, EntityModel<
     private final TropicalFishModelA<TropicalFish> modelA;
     private final TropicalFishModelB<TropicalFish> modelB;
     
-    public TropicalFishRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new TropicalFishModelA(0.0f), 0.15f);
+    public TropicalFishRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new TropicalFishModelA(0.0f), 0.15f);
         this.modelA = new TropicalFishModelA<TropicalFish>(0.0f);
         this.modelB = new TropicalFishModelB<TropicalFish>(0.0f);
         this.addLayer(new TropicalFishPatternLayer(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final TropicalFish atz) {
-        return atz.getBaseTextureLocation();
+    public ResourceLocation getTextureLocation(final TropicalFish azh) {
+        return azh.getBaseTextureLocation();
     }
     
     @Override
-    public void render(final TropicalFish atz, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final ColorableListModel<TropicalFish> dks8 = (ColorableListModel<TropicalFish>)((atz.getBaseVariant() == 0) ? this.modelA : this.modelB);
-        this.model = (M)dks8;
-        final float[] arr9 = atz.getBaseColor();
-        dks8.setColor(arr9[0], arr9[1], arr9[2]);
-        super.render(atz, float2, float3, cyl, dqt, integer);
-        dks8.setColor(1.0f, 1.0f, 1.0f);
+    public void render(final TropicalFish azh, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final ColorableListModel<TropicalFish> dvn8 = (ColorableListModel<TropicalFish>)((azh.getBaseVariant() == 0) ? this.modelA : this.modelB);
+        this.model = (M)dvn8;
+        final float[] arr9 = azh.getBaseColor();
+        dvn8.setColor(arr9[0], arr9[1], arr9[2]);
+        super.render(azh, float2, float3, dhl, ebz, integer);
+        dvn8.setColor(1.0f, 1.0f, 1.0f);
     }
     
     @Override
-    protected void setupRotations(final TropicalFish atz, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        super.setupRotations(atz, cyl, float3, float4, float5);
+    protected void setupRotations(final TropicalFish azh, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        super.setupRotations(azh, dhl, float3, float4, float5);
         final float float6 = 4.3f * Mth.sin(0.6f * float3);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float6));
-        if (!atz.isInWater()) {
-            cyl.translate(0.20000000298023224, 0.10000000149011612, 0.0);
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float6));
+        if (!azh.isInWater()) {
+            dhl.translate(0.20000000298023224, 0.10000000149011612, 0.0);
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/TurtleRenderer.java b/src/net/minecraft/client/renderer/entity/TurtleRenderer.java
index 6b0ec42..76bd7d5 100644
--- a/src/net/minecraft/client/renderer/entity/TurtleRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/TurtleRenderer.java
@@ -12,20 +12,20 @@ import net.minecraft.world.entity.animal.Turtle;
 public class TurtleRenderer extends MobRenderer<Turtle, TurtleModel<Turtle>> {
     private static final ResourceLocation TURTLE_LOCATION;
     
-    public TurtleRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new TurtleModel(0.0f), 0.7f);
+    public TurtleRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new TurtleModel(0.0f), 0.7f);
     }
     
     @Override
-    public void render(final Turtle aua, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        if (aua.isBaby()) {
+    public void render(final Turtle azi, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        if (azi.isBaby()) {
             this.shadowRadius *= 0.5f;
         }
-        super.render(aua, float2, float3, cyl, dqt, integer);
+        super.render(azi, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Turtle aua) {
+    public ResourceLocation getTextureLocation(final Turtle azi) {
         return TurtleRenderer.TURTLE_LOCATION;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/UndeadHorseRenderer.java b/src/net/minecraft/client/renderer/entity/UndeadHorseRenderer.java
index 7c97ed8..29107ce 100644
--- a/src/net/minecraft/client/renderer/entity/UndeadHorseRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/UndeadHorseRenderer.java
@@ -13,13 +13,13 @@ import net.minecraft.world.entity.animal.horse.AbstractHorse;
 public class UndeadHorseRenderer extends AbstractHorseRenderer<AbstractHorse, HorseModel<AbstractHorse>> {
     private static final Map<EntityType<?>, ResourceLocation> MAP;
     
-    public UndeadHorseRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new HorseModel(0.0f), 1.0f);
+    public UndeadHorseRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new HorseModel(0.0f), 1.0f);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final AbstractHorse aue) {
-        return UndeadHorseRenderer.MAP.get(aue.getType());
+    public ResourceLocation getTextureLocation(final AbstractHorse azm) {
+        return UndeadHorseRenderer.MAP.get(azm.getType());
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/VexRenderer.java b/src/net/minecraft/client/renderer/entity/VexRenderer.java
index 1b9856a..8f0d78b 100644
--- a/src/net/minecraft/client/renderer/entity/VexRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/VexRenderer.java
@@ -4,6 +4,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Mob;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.model.VexModel;
 import net.minecraft.world.entity.monster.Vex;
@@ -12,25 +13,25 @@ public class VexRenderer extends HumanoidMobRenderer<Vex, VexModel> {
     private static final ResourceLocation VEX_LOCATION;
     private static final ResourceLocation VEX_CHARGING_LOCATION;
     
-    public VexRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new VexModel(), 0.3f);
+    public VexRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new VexModel(), 0.3f);
     }
     
-    protected int getBlockLightLevel(final Vex axl, final float float2) {
+    protected int getBlockLightLevel(final Vex bcp, final BlockPos fu) {
         return 15;
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Vex axl) {
-        if (axl.isCharging()) {
+    public ResourceLocation getTextureLocation(final Vex bcp) {
+        if (bcp.isCharging()) {
             return VexRenderer.VEX_CHARGING_LOCATION;
         }
         return VexRenderer.VEX_LOCATION;
     }
     
     @Override
-    protected void scale(final Vex axl, final PoseStack cyl, final float float3) {
-        cyl.scale(0.4f, 0.4f, 0.4f);
+    protected void scale(final Vex bcp, final PoseStack dhl, final float float3) {
+        dhl.scale(0.4f, 0.4f, 0.4f);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/VillagerRenderer.java b/src/net/minecraft/client/renderer/entity/VillagerRenderer.java
index 4411fc6..67ae04b 100644
--- a/src/net/minecraft/client/renderer/entity/VillagerRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/VillagerRenderer.java
@@ -15,29 +15,29 @@ import net.minecraft.world.entity.npc.Villager;
 public class VillagerRenderer extends MobRenderer<Villager, VillagerModel<Villager>> {
     private static final ResourceLocation VILLAGER_BASE_SKIN;
     
-    public VillagerRenderer(final EntityRenderDispatcher dvf, final ReloadableResourceManager yz) {
-        super(dvf, new VillagerModel(0.0f), 0.5f);
+    public VillagerRenderer(final EntityRenderDispatcher egm, final ReloadableResourceManager aba) {
+        super(egm, new VillagerModel(0.0f), 0.5f);
         this.addLayer(new CustomHeadLayer<Villager, VillagerModel<Villager>>(this));
-        this.addLayer(new VillagerProfessionLayer<Villager, VillagerModel<Villager>>(this, yz, "villager"));
+        this.addLayer(new VillagerProfessionLayer<Villager, VillagerModel<Villager>>(this, aba, "villager"));
         this.addLayer(new CrossedArmsItemLayer<Villager, VillagerModel<Villager>>(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Villager axw) {
+    public ResourceLocation getTextureLocation(final Villager bdp) {
         return VillagerRenderer.VILLAGER_BASE_SKIN;
     }
     
     @Override
-    protected void scale(final Villager axw, final PoseStack cyl, final float float3) {
+    protected void scale(final Villager bdp, final PoseStack dhl, final float float3) {
         float float4 = 0.9375f;
-        if (axw.isBaby()) {
+        if (bdp.isBaby()) {
             float4 *= 0.5;
             this.shadowRadius = 0.25f;
         }
         else {
             this.shadowRadius = 0.5f;
         }
-        cyl.scale(float4, float4, float4);
+        dhl.scale(float4, float4, float4);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/VindicatorRenderer.java b/src/net/minecraft/client/renderer/entity/VindicatorRenderer.java
index f6b159f..6276a4f 100644
--- a/src/net/minecraft/client/renderer/entity/VindicatorRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/VindicatorRenderer.java
@@ -13,19 +13,19 @@ import net.minecraft.world.entity.monster.Vindicator;
 public class VindicatorRenderer extends IllagerRenderer<Vindicator> {
     private static final ResourceLocation VINDICATOR;
     
-    public VindicatorRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new IllagerModel(0.0f, 0.0f, 64, 64), 0.5f);
+    public VindicatorRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new IllagerModel(0.0f, 0.0f, 64, 64), 0.5f);
         this.addLayer((RenderLayer<T, IllagerModel<T>>)new ItemInHandLayer<Vindicator, IllagerModel<Vindicator>>(this) {
             @Override
-            public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Vindicator axm, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-                if (axm.isAggressive()) {
-                    super.render(cyl, dqt, integer, axm, float5, float6, float7, float8, float9, float10);
+            public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Vindicator bcq, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+                if (bcq.isAggressive()) {
+                    super.render(dhl, ebz, integer, bcq, float5, float6, float7, float8, float9, float10);
                 }
             }
         });
     }
     
-    public ResourceLocation getTextureLocation(final Vindicator axm) {
+    public ResourceLocation getTextureLocation(final Vindicator bcq) {
         return VindicatorRenderer.VINDICATOR;
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/WanderingTraderRenderer.java b/src/net/minecraft/client/renderer/entity/WanderingTraderRenderer.java
index 2169fa0..a97526b 100644
--- a/src/net/minecraft/client/renderer/entity/WanderingTraderRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/WanderingTraderRenderer.java
@@ -13,21 +13,21 @@ import net.minecraft.world.entity.npc.WanderingTrader;
 public class WanderingTraderRenderer extends MobRenderer<WanderingTrader, VillagerModel<WanderingTrader>> {
     private static final ResourceLocation VILLAGER_BASE_SKIN;
     
-    public WanderingTraderRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new VillagerModel(0.0f), 0.5f);
+    public WanderingTraderRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new VillagerModel(0.0f), 0.5f);
         this.addLayer(new CustomHeadLayer<WanderingTrader, VillagerModel<WanderingTrader>>(this));
         this.addLayer(new CrossedArmsItemLayer<WanderingTrader, VillagerModel<WanderingTrader>>(this));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final WanderingTrader ayc) {
+    public ResourceLocation getTextureLocation(final WanderingTrader bdv) {
         return WanderingTraderRenderer.VILLAGER_BASE_SKIN;
     }
     
     @Override
-    protected void scale(final WanderingTrader ayc, final PoseStack cyl, final float float3) {
+    protected void scale(final WanderingTrader bdv, final PoseStack dhl, final float float3) {
         final float float4 = 0.9375f;
-        cyl.scale(0.9375f, 0.9375f, 0.9375f);
+        dhl.scale(0.9375f, 0.9375f, 0.9375f);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/WitchRenderer.java b/src/net/minecraft/client/renderer/entity/WitchRenderer.java
index 0671e9b..b54f56b 100644
--- a/src/net/minecraft/client/renderer/entity/WitchRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/WitchRenderer.java
@@ -14,26 +14,26 @@ import net.minecraft.world.entity.monster.Witch;
 public class WitchRenderer extends MobRenderer<Witch, WitchModel<Witch>> {
     private static final ResourceLocation WITCH_LOCATION;
     
-    public WitchRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new WitchModel(0.0f), 0.5f);
+    public WitchRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new WitchModel(0.0f), 0.5f);
         this.addLayer((RenderLayer<Witch, WitchModel<Witch>>)new WitchItemLayer((RenderLayerParent<LivingEntity, WitchModel<LivingEntity>>)this));
     }
     
     @Override
-    public void render(final Witch axn, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        ((WitchModel)this.model).setHoldingItem(!axn.getMainHandItem().isEmpty());
-        super.render(axn, float2, float3, cyl, dqt, integer);
+    public void render(final Witch bcr, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        ((WitchModel)this.model).setHoldingItem(!bcr.getMainHandItem().isEmpty());
+        super.render(bcr, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Witch axn) {
+    public ResourceLocation getTextureLocation(final Witch bcr) {
         return WitchRenderer.WITCH_LOCATION;
     }
     
     @Override
-    protected void scale(final Witch axn, final PoseStack cyl, final float float3) {
+    protected void scale(final Witch bcr, final PoseStack dhl, final float float3) {
         final float float4 = 0.9375f;
-        cyl.scale(0.9375f, 0.9375f, 0.9375f);
+        dhl.scale(0.9375f, 0.9375f, 0.9375f);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/WitherBossRenderer.java b/src/net/minecraft/client/renderer/entity/WitherBossRenderer.java
index aa80741..a9f8c1b 100644
--- a/src/net/minecraft/client/renderer/entity/WitherBossRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/WitherBossRenderer.java
@@ -3,6 +3,7 @@ package net.minecraft.client.renderer.entity;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.core.BlockPos;
 import net.minecraft.client.renderer.entity.layers.RenderLayer;
 import net.minecraft.client.renderer.entity.layers.WitherArmorLayer;
 import net.minecraft.resources.ResourceLocation;
@@ -13,18 +14,18 @@ public class WitherBossRenderer extends MobRenderer<WitherBoss, WitherBossModel<
     private static final ResourceLocation WITHER_INVULNERABLE_LOCATION;
     private static final ResourceLocation WITHER_LOCATION;
     
-    public WitherBossRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new WitherBossModel(0.0f), 1.0f);
+    public WitherBossRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new WitherBossModel(0.0f), 1.0f);
         this.addLayer(new WitherArmorLayer(this));
     }
     
-    protected int getBlockLightLevel(final WitherBoss avn, final float float2) {
+    protected int getBlockLightLevel(final WitherBoss baw, final BlockPos fu) {
         return 15;
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final WitherBoss avn) {
-        final int integer3 = avn.getInvulnerableTicks();
+    public ResourceLocation getTextureLocation(final WitherBoss baw) {
+        final int integer3 = baw.getInvulnerableTicks();
         if (integer3 <= 0 || (integer3 <= 80 && integer3 / 5 % 2 == 1)) {
             return WitherBossRenderer.WITHER_LOCATION;
         }
@@ -32,13 +33,13 @@ public class WitherBossRenderer extends MobRenderer<WitherBoss, WitherBossModel<
     }
     
     @Override
-    protected void scale(final WitherBoss avn, final PoseStack cyl, final float float3) {
+    protected void scale(final WitherBoss baw, final PoseStack dhl, final float float3) {
         float float4 = 2.0f;
-        final int integer6 = avn.getInvulnerableTicks();
+        final int integer6 = baw.getInvulnerableTicks();
         if (integer6 > 0) {
             float4 -= (integer6 - float3) / 220.0f * 0.5f;
         }
-        cyl.scale(float4, float4, float4);
+        dhl.scale(float4, float4, float4);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/WitherSkeletonRenderer.java b/src/net/minecraft/client/renderer/entity/WitherSkeletonRenderer.java
index 7544a38..45b51b7 100644
--- a/src/net/minecraft/client/renderer/entity/WitherSkeletonRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/WitherSkeletonRenderer.java
@@ -10,18 +10,18 @@ import net.minecraft.resources.ResourceLocation;
 public class WitherSkeletonRenderer extends SkeletonRenderer {
     private static final ResourceLocation WITHER_SKELETON_LOCATION;
     
-    public WitherSkeletonRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public WitherSkeletonRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final AbstractSkeleton awf) {
+    public ResourceLocation getTextureLocation(final AbstractSkeleton bbk) {
         return WitherSkeletonRenderer.WITHER_SKELETON_LOCATION;
     }
     
     @Override
-    protected void scale(final AbstractSkeleton awf, final PoseStack cyl, final float float3) {
-        cyl.scale(1.2f, 1.2f, 1.2f);
+    protected void scale(final AbstractSkeleton bbk, final PoseStack dhl, final float float3) {
+        dhl.scale(1.2f, 1.2f, 1.2f);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/WitherSkullRenderer.java b/src/net/minecraft/client/renderer/entity/WitherSkullRenderer.java
index 7ef8e7c..511473a 100644
--- a/src/net/minecraft/client/renderer/entity/WitherSkullRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/WitherSkullRenderer.java
@@ -6,6 +6,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.util.Mth;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.core.BlockPos;
 import net.minecraft.client.model.SkullModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.projectile.WitherSkull;
@@ -15,32 +16,32 @@ public class WitherSkullRenderer extends EntityRenderer<WitherSkull> {
     private static final ResourceLocation WITHER_LOCATION;
     private final SkullModel model;
     
-    public WitherSkullRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf);
+    public WitherSkullRenderer(final EntityRenderDispatcher egm) {
+        super(egm);
         this.model = new SkullModel();
     }
     
     @Override
-    protected int getBlockLightLevel(final WitherSkull azl, final float float2) {
+    protected int getBlockLightLevel(final WitherSkull bff, final BlockPos fu) {
         return 15;
     }
     
     @Override
-    public void render(final WitherSkull azl, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        cyl.pushPose();
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        final float float4 = Mth.rotlerp(azl.yRotO, azl.yRot, float3);
-        final float float5 = Mth.lerp(float3, azl.xRotO, azl.xRot);
-        final VertexConsumer cyo10 = dqt.getBuffer(this.model.renderType(this.getTextureLocation(azl)));
+    public void render(final WitherSkull bff, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        dhl.pushPose();
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        final float float4 = Mth.rotlerp(bff.yRotO, bff.yRot, float3);
+        final float float5 = Mth.lerp(float3, bff.xRotO, bff.xRot);
+        final VertexConsumer dhp10 = ebz.getBuffer(this.model.renderType(this.getTextureLocation(bff)));
         this.model.setupAnim(0.0f, float4, float5);
-        this.model.renderToBuffer(cyl, cyo10, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.popPose();
-        super.render(azl, float2, float3, cyl, dqt, integer);
+        this.model.renderToBuffer(dhl, dhp10, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.popPose();
+        super.render(bff, float2, float3, dhl, ebz, integer);
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final WitherSkull azl) {
-        return azl.isDangerous() ? WitherSkullRenderer.WITHER_INVULNERABLE_LOCATION : WitherSkullRenderer.WITHER_LOCATION;
+    public ResourceLocation getTextureLocation(final WitherSkull bff) {
+        return bff.isDangerous() ? WitherSkullRenderer.WITHER_INVULNERABLE_LOCATION : WitherSkullRenderer.WITHER_LOCATION;
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/WolfRenderer.java b/src/net/minecraft/client/renderer/entity/WolfRenderer.java
index 720572c..da9df84 100644
--- a/src/net/minecraft/client/renderer/entity/WolfRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/WolfRenderer.java
@@ -3,6 +3,7 @@ package net.minecraft.client.renderer.entity;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Mob;
+import net.minecraft.util.Mth;
 import net.minecraft.client.renderer.MultiBufferSource;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.entity.layers.RenderLayer;
@@ -16,34 +17,34 @@ public class WolfRenderer extends MobRenderer<Wolf, WolfModel<Wolf>> {
     private static final ResourceLocation WOLF_TAME_LOCATION;
     private static final ResourceLocation WOLF_ANGRY_LOCATION;
     
-    public WolfRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new WolfModel(), 0.5f);
+    public WolfRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new WolfModel(), 0.5f);
         this.addLayer(new WolfCollarLayer(this));
     }
     
     @Override
-    protected float getBob(final Wolf auc, final float float2) {
-        return auc.getTailAngle();
+    protected float getBob(final Wolf azk, final float float2) {
+        return azk.getTailAngle();
     }
     
     @Override
-    public void render(final Wolf auc, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        if (auc.isWet()) {
-            final float float4 = auc.getBrightness() * auc.getWetShade(float3);
+    public void render(final Wolf azk, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        if (azk.isWet()) {
+            final float float4 = Mth.clamp(azk.getBrightness() * azk.getWetShade(float3), 0.0f, 1.0f);
             ((WolfModel)this.model).setColor(float4, float4, float4);
         }
-        super.render(auc, float2, float3, cyl, dqt, integer);
-        if (auc.isWet()) {
+        super.render(azk, float2, float3, dhl, ebz, integer);
+        if (azk.isWet()) {
             ((WolfModel)this.model).setColor(1.0f, 1.0f, 1.0f);
         }
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final Wolf auc) {
-        if (auc.isTame()) {
+    public ResourceLocation getTextureLocation(final Wolf azk) {
+        if (azk.isTame()) {
             return WolfRenderer.WOLF_TAME_LOCATION;
         }
-        if (auc.isAngry()) {
+        if (azk.isAngry()) {
             return WolfRenderer.WOLF_ANGRY_LOCATION;
         }
         return WolfRenderer.WOLF_LOCATION;
diff --git a/src/net/minecraft/client/renderer/entity/ZoglinRenderer.java b/src/net/minecraft/client/renderer/entity/ZoglinRenderer.java
new file mode 100644
index 0000000..b53725f
--- /dev/null
+++ b/src/net/minecraft/client/renderer/entity/ZoglinRenderer.java
@@ -0,0 +1,23 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.model.HoglinModel;
+import net.minecraft.world.entity.monster.Zoglin;
+
+public class ZoglinRenderer extends MobRenderer<Zoglin, HoglinModel<Zoglin>> {
+    private static final ResourceLocation ZOGLIN_LOCATION;
+    
+    public ZoglinRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new HoglinModel(), 0.7f);
+    }
+    
+    @Override
+    public ResourceLocation getTextureLocation(final Zoglin bct) {
+        return ZoglinRenderer.ZOGLIN_LOCATION;
+    }
+    
+    static {
+        ZOGLIN_LOCATION = new ResourceLocation("textures/entity/hoglin/zoglin.png");
+    }
+}
diff --git a/src/net/minecraft/client/renderer/entity/ZombieRenderer.java b/src/net/minecraft/client/renderer/entity/ZombieRenderer.java
index 67c9204..217f13b 100644
--- a/src/net/minecraft/client/renderer/entity/ZombieRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ZombieRenderer.java
@@ -4,7 +4,7 @@ import net.minecraft.client.model.ZombieModel;
 import net.minecraft.world.entity.monster.Zombie;
 
 public class ZombieRenderer extends AbstractZombieRenderer<Zombie, ZombieModel<Zombie>> {
-    public ZombieRenderer(final EntityRenderDispatcher dvf) {
-        super(dvf, new ZombieModel(0.0f, false), new ZombieModel(0.5f, true), new ZombieModel(1.0f, true));
+    public ZombieRenderer(final EntityRenderDispatcher egm) {
+        super(egm, new ZombieModel(0.0f, false), new ZombieModel(0.5f, true), new ZombieModel(1.0f, true));
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/ZombieVillagerRenderer.java b/src/net/minecraft/client/renderer/entity/ZombieVillagerRenderer.java
index 7b26480..b0b4d76 100644
--- a/src/net/minecraft/client/renderer/entity/ZombieVillagerRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/ZombieVillagerRenderer.java
@@ -2,7 +2,6 @@ package net.minecraft.client.renderer.entity;
 
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.Mob;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.entity.layers.VillagerProfessionLayer;
 import net.minecraft.client.renderer.entity.layers.RenderLayer;
 import net.minecraft.client.model.HumanoidModel;
@@ -16,23 +15,20 @@ import net.minecraft.world.entity.monster.ZombieVillager;
 public class ZombieVillagerRenderer extends HumanoidMobRenderer<ZombieVillager, ZombieVillagerModel<ZombieVillager>> {
     private static final ResourceLocation ZOMBIE_VILLAGER_LOCATION;
     
-    public ZombieVillagerRenderer(final EntityRenderDispatcher dvf, final ReloadableResourceManager yz) {
-        super(dvf, new ZombieVillagerModel(0.0f, false), 0.5f);
+    public ZombieVillagerRenderer(final EntityRenderDispatcher egm, final ReloadableResourceManager aba) {
+        super(egm, new ZombieVillagerModel(0.0f, false), 0.5f);
         this.addLayer((RenderLayer<ZombieVillager, ZombieVillagerModel<ZombieVillager>>)new HumanoidArmorLayer((RenderLayerParent<LivingEntity, HumanoidModel>)this, new ZombieVillagerModel(0.5f, true), new ZombieVillagerModel(1.0f, true)));
-        this.addLayer(new VillagerProfessionLayer<ZombieVillager, ZombieVillagerModel<ZombieVillager>>(this, yz, "zombie_villager"));
+        this.addLayer(new VillagerProfessionLayer<ZombieVillager, ZombieVillagerModel<ZombieVillager>>(this, aba, "zombie_villager"));
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final ZombieVillager axq) {
+    public ResourceLocation getTextureLocation(final ZombieVillager bcv) {
         return ZombieVillagerRenderer.ZOMBIE_VILLAGER_LOCATION;
     }
     
     @Override
-    protected void setupRotations(final ZombieVillager axq, final PoseStack cyl, final float float3, float float4, final float float5) {
-        if (axq.isConverting()) {
-            float4 += (float)(Math.cos(axq.tickCount * 3.25) * 3.141592653589793 * 0.25);
-        }
-        super.setupRotations(axq, cyl, float3, float4, float5);
+    protected boolean isShaking(final ZombieVillager bcv) {
+        return bcv.isConverting();
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/layers/AbstractArmorLayer.java b/src/net/minecraft/client/renderer/entity/layers/AbstractArmorLayer.java
deleted file mode 100644
index 062bcdf..0000000
--- a/src/net/minecraft/client/renderer/entity/layers/AbstractArmorLayer.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package net.minecraft.client.renderer.entity.layers;
-
-import com.google.common.collect.Maps;
-import net.minecraft.world.entity.Entity;
-import java.util.function.Function;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.client.renderer.entity.ItemRenderer;
-import net.minecraft.client.renderer.RenderType;
-import javax.annotation.Nullable;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.DyeableArmorItem;
-import net.minecraft.world.item.ArmorItem;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.client.renderer.MultiBufferSource;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.renderer.entity.RenderLayerParent;
-import net.minecraft.resources.ResourceLocation;
-import java.util.Map;
-import net.minecraft.client.model.HumanoidModel;
-import net.minecraft.world.entity.LivingEntity;
-
-public abstract class AbstractArmorLayer<T extends LivingEntity, M extends HumanoidModel<T>, A extends HumanoidModel<T>> extends RenderLayer<T, M> {
-    protected final A innerModel;
-    protected final A outerModel;
-    private static final Map<String, ResourceLocation> ARMOR_LOCATION_CACHE;
-    
-    protected AbstractArmorLayer(final RenderLayerParent<T, M> dwv, final A dlj2, final A dlj3) {
-        super(dwv);
-        this.innerModel = dlj2;
-        this.outerModel = dlj3;
-    }
-    
-    @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        this.renderArmorPiece(cyl, dqt, akz, float5, float6, float7, float8, float9, float10, EquipmentSlot.CHEST, integer);
-        this.renderArmorPiece(cyl, dqt, akz, float5, float6, float7, float8, float9, float10, EquipmentSlot.LEGS, integer);
-        this.renderArmorPiece(cyl, dqt, akz, float5, float6, float7, float8, float9, float10, EquipmentSlot.FEET, integer);
-        this.renderArmorPiece(cyl, dqt, akz, float5, float6, float7, float8, float9, float10, EquipmentSlot.HEAD, integer);
-    }
-    
-    private void renderArmorPiece(final PoseStack cyl, final MultiBufferSource dqt, final T akz, final float float4, final float float5, final float float6, final float float7, final float float8, final float float9, final EquipmentSlot akv, final int integer) {
-        final ItemStack ben13 = akz.getItemBySlot(akv);
-        if (!(ben13.getItem() instanceof ArmorItem)) {
-            return;
-        }
-        final ArmorItem bcg14 = (ArmorItem)ben13.getItem();
-        if (bcg14.getSlot() != akv) {
-            return;
-        }
-        final A dlj15 = this.getArmorModel(akv);
-        this.getParentModel().copyPropertiesTo(dlj15);
-        dlj15.prepareMobModel(akz, float4, float5, float6);
-        this.setPartVisibility(dlj15, akv);
-        dlj15.setupAnim(akz, float4, float5, float7, float8, float9);
-        final boolean boolean16 = this.usesInnerModel(akv);
-        final boolean boolean17 = ben13.hasFoil();
-        if (bcg14 instanceof DyeableArmorItem) {
-            final int integer2 = ((DyeableArmorItem)bcg14).getColor(ben13);
-            final float float10 = (integer2 >> 16 & 0xFF) / 255.0f;
-            final float float11 = (integer2 >> 8 & 0xFF) / 255.0f;
-            final float float12 = (integer2 & 0xFF) / 255.0f;
-            this.renderModel(cyl, dqt, integer, bcg14, boolean17, dlj15, boolean16, float10, float11, float12, null);
-            this.renderModel(cyl, dqt, integer, bcg14, boolean17, dlj15, boolean16, 1.0f, 1.0f, 1.0f, "overlay");
-        }
-        else {
-            this.renderModel(cyl, dqt, integer, bcg14, boolean17, dlj15, boolean16, 1.0f, 1.0f, 1.0f, null);
-        }
-    }
-    
-    private void renderModel(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final ArmorItem bcg, final boolean boolean5, final A dlj, final boolean boolean7, final float float8, final float float9, final float float10, @Nullable final String string) {
-        final VertexConsumer cyo13 = ItemRenderer.getFoilBuffer(dqt, RenderType.entityCutoutNoCull(this.getArmorLocation(bcg, boolean7, string)), false, boolean5);
-        dlj.renderToBuffer(cyl, cyo13, integer, OverlayTexture.NO_OVERLAY, float8, float9, float10, 1.0f);
-    }
-    
-    public A getArmorModel(final EquipmentSlot akv) {
-        return this.usesInnerModel(akv) ? this.innerModel : this.outerModel;
-    }
-    
-    private boolean usesInnerModel(final EquipmentSlot akv) {
-        return akv == EquipmentSlot.LEGS;
-    }
-    
-    private ResourceLocation getArmorLocation(final ArmorItem bcg, final boolean boolean2, @Nullable final String string) {
-        final String string2 = "textures/models/armor/" + bcg.getMaterial().getName() + "_layer_" + (boolean2 ? 2 : 1) + ((string == null) ? "" : ("_" + string)) + ".png";
-        return AbstractArmorLayer.ARMOR_LOCATION_CACHE.computeIfAbsent(string2, ResourceLocation::new);
-    }
-    
-    protected abstract void setPartVisibility(final A dlj, final EquipmentSlot akv);
-    
-    protected abstract void hideAllArmor(final A dlj);
-    
-    static {
-        ARMOR_LOCATION_CACHE = Maps.newHashMap();
-    }
-}
diff --git a/src/net/minecraft/client/renderer/entity/layers/ArrowLayer.java b/src/net/minecraft/client/renderer/entity/layers/ArrowLayer.java
index b6bda08..40113d5 100644
--- a/src/net/minecraft/client/renderer/entity/layers/ArrowLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/ArrowLayer.java
@@ -14,24 +14,24 @@ public class ArrowLayer<T extends LivingEntity, M extends PlayerModel<T>> extend
     private final EntityRenderDispatcher dispatcher;
     private Arrow arrow;
     
-    public ArrowLayer(final LivingEntityRenderer<T, M> dwc) {
-        super(dwc);
-        this.dispatcher = dwc.getDispatcher();
+    public ArrowLayer(final LivingEntityRenderer<T, M> ehk) {
+        super(ehk);
+        this.dispatcher = ehk.getDispatcher();
     }
     
     @Override
-    protected int numStuck(final T akz) {
-        return akz.getArrowCount();
+    protected int numStuck(final T aoy) {
+        return aoy.getArrowCount();
     }
     
     @Override
-    protected void renderStuckItem(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Entity akq, final float float5, final float float6, final float float7, final float float8) {
+    protected void renderStuckItem(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Entity aom, final float float5, final float float6, final float float7, final float float8) {
         final float float9 = Mth.sqrt(float5 * float5 + float7 * float7);
-        this.arrow = new Arrow(akq.level, akq.getX(), akq.getY(), akq.getZ());
+        this.arrow = new Arrow(aom.level, aom.getX(), aom.getY(), aom.getZ());
         this.arrow.yRot = (float)(Math.atan2(float5, float7) * 57.2957763671875);
         this.arrow.xRot = (float)(Math.atan2(float6, float9) * 57.2957763671875);
         this.arrow.yRotO = this.arrow.yRot;
         this.arrow.xRotO = this.arrow.xRot;
-        this.dispatcher.<Arrow>render(this.arrow, 0.0, 0.0, 0.0, 0.0f, float8, cyl, dqt, integer);
+        this.dispatcher.<Arrow>render(this.arrow, 0.0, 0.0, 0.0, 0.0f, float8, dhl, ebz, integer);
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/BeeStingerLayer.java b/src/net/minecraft/client/renderer/entity/layers/BeeStingerLayer.java
index a290b61..2dbad33 100644
--- a/src/net/minecraft/client/renderer/entity/layers/BeeStingerLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/BeeStingerLayer.java
@@ -18,46 +18,46 @@ import net.minecraft.world.entity.LivingEntity;
 public class BeeStingerLayer<T extends LivingEntity, M extends PlayerModel<T>> extends StuckInBodyLayer<T, M> {
     private static final ResourceLocation BEE_STINGER_LOCATION;
     
-    public BeeStingerLayer(final LivingEntityRenderer<T, M> dwc) {
-        super(dwc);
+    public BeeStingerLayer(final LivingEntityRenderer<T, M> ehk) {
+        super(ehk);
     }
     
     @Override
-    protected int numStuck(final T akz) {
-        return akz.getStingerCount();
+    protected int numStuck(final T aoy) {
+        return aoy.getStingerCount();
     }
     
     @Override
-    protected void renderStuckItem(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Entity akq, final float float5, final float float6, final float float7, final float float8) {
+    protected void renderStuckItem(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Entity aom, final float float5, final float float6, final float float7, final float float8) {
         final float float9 = Mth.sqrt(float5 * float5 + float7 * float7);
         final float float10 = (float)(Math.atan2(float5, float7) * 57.2957763671875);
         final float float11 = (float)(Math.atan2(float6, float9) * 57.2957763671875);
-        cyl.translate(0.0, 0.0, 0.0);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float10 - 90.0f));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(float11));
+        dhl.translate(0.0, 0.0, 0.0);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float10 - 90.0f));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(float11));
         final float float12 = 0.0f;
         final float float13 = 0.125f;
         final float float14 = 0.0f;
         final float float15 = 0.0625f;
         final float float16 = 0.03125f;
-        cyl.mulPose(Vector3f.XP.rotationDegrees(45.0f));
-        cyl.scale(0.03125f, 0.03125f, 0.03125f);
-        cyl.translate(2.5, 0.0, 0.0);
-        final VertexConsumer cyo18 = dqt.getBuffer(RenderType.entityCutoutNoCull(BeeStingerLayer.BEE_STINGER_LOCATION));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(45.0f));
+        dhl.scale(0.03125f, 0.03125f, 0.03125f);
+        dhl.translate(2.5, 0.0, 0.0);
+        final VertexConsumer dhp18 = ebz.getBuffer(RenderType.entityCutoutNoCull(BeeStingerLayer.BEE_STINGER_LOCATION));
         for (int integer2 = 0; integer2 < 4; ++integer2) {
-            cyl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
-            final PoseStack.Pose a20 = cyl.last();
+            dhl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
+            final PoseStack.Pose a20 = dhl.last();
             final Matrix4f b21 = a20.pose();
             final Matrix3f a21 = a20.normal();
-            vertex(cyo18, b21, a21, -4.5f, -1, 0.0f, 0.0f, integer);
-            vertex(cyo18, b21, a21, 4.5f, -1, 0.125f, 0.0f, integer);
-            vertex(cyo18, b21, a21, 4.5f, 1, 0.125f, 0.0625f, integer);
-            vertex(cyo18, b21, a21, -4.5f, 1, 0.0f, 0.0625f, integer);
+            vertex(dhp18, b21, a21, -4.5f, -1, 0.0f, 0.0f, integer);
+            vertex(dhp18, b21, a21, 4.5f, -1, 0.125f, 0.0f, integer);
+            vertex(dhp18, b21, a21, 4.5f, 1, 0.125f, 0.0625f, integer);
+            vertex(dhp18, b21, a21, -4.5f, 1, 0.0f, 0.0625f, integer);
         }
     }
     
-    private static void vertex(final VertexConsumer cyo, final Matrix4f b, final Matrix3f a, final float float4, final int integer5, final float float6, final float float7, final int integer8) {
-        cyo.vertex(b, float4, (float)integer5, 0.0f).color(255, 255, 255, 255).uv(float6, float7).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer8).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
+    private static void vertex(final VertexConsumer dhp, final Matrix4f b, final Matrix3f a, final float float4, final int integer5, final float float6, final float float7, final int integer8) {
+        dhp.vertex(b, float4, (float)integer5, 0.0f).color(255, 255, 255, 255).uv(float6, float7).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(integer8).normal(a, 0.0f, 1.0f, 0.0f).endVertex();
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/layers/CapeLayer.java b/src/net/minecraft/client/renderer/entity/layers/CapeLayer.java
index 3c8f5d0..55fe3f5 100644
--- a/src/net/minecraft/client/renderer/entity/layers/CapeLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/CapeLayer.java
@@ -17,25 +17,25 @@ import net.minecraft.client.model.PlayerModel;
 import net.minecraft.client.player.AbstractClientPlayer;
 
 public class CapeLayer extends RenderLayer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {
-    public CapeLayer(final RenderLayerParent<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> dwv) {
-        super(dwv);
+    public CapeLayer(final RenderLayerParent<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final AbstractClientPlayer dpy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (!dpy.isCapeLoaded() || dpy.isInvisible() || !dpy.isModelPartShown(PlayerModelPart.CAPE) || dpy.getCloakTextureLocation() == null) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final AbstractClientPlayer ebc, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (!ebc.isCapeLoaded() || ebc.isInvisible() || !ebc.isModelPartShown(PlayerModelPart.CAPE) || ebc.getCloakTextureLocation() == null) {
             return;
         }
-        final ItemStack ben12 = dpy.getItemBySlot(EquipmentSlot.CHEST);
-        if (ben12.getItem() == Items.ELYTRA) {
+        final ItemStack bki12 = ebc.getItemBySlot(EquipmentSlot.CHEST);
+        if (bki12.getItem() == Items.ELYTRA) {
             return;
         }
-        cyl.pushPose();
-        cyl.translate(0.0, 0.0, 0.125);
-        final double double13 = Mth.lerp(float7, dpy.xCloakO, dpy.xCloak) - Mth.lerp(float7, dpy.xo, dpy.getX());
-        final double double14 = Mth.lerp(float7, dpy.yCloakO, dpy.yCloak) - Mth.lerp(float7, dpy.yo, dpy.getY());
-        final double double15 = Mth.lerp(float7, dpy.zCloakO, dpy.zCloak) - Mth.lerp(float7, dpy.zo, dpy.getZ());
-        final float float11 = dpy.yBodyRotO + (dpy.yBodyRot - dpy.yBodyRotO);
+        dhl.pushPose();
+        dhl.translate(0.0, 0.0, 0.125);
+        final double double13 = Mth.lerp(float7, ebc.xCloakO, ebc.xCloak) - Mth.lerp(float7, ebc.xo, ebc.getX());
+        final double double14 = Mth.lerp(float7, ebc.yCloakO, ebc.yCloak) - Mth.lerp(float7, ebc.yo, ebc.getY());
+        final double double15 = Mth.lerp(float7, ebc.zCloakO, ebc.zCloak) - Mth.lerp(float7, ebc.zo, ebc.getZ());
+        final float float11 = ebc.yBodyRotO + (ebc.yBodyRot - ebc.yBodyRotO);
         final double double16 = Mth.sin(float11 * 0.017453292f);
         final double double17 = -Mth.cos(float11 * 0.017453292f);
         float float12 = (float)double14 * 10.0f;
@@ -47,16 +47,16 @@ public class CapeLayer extends RenderLayer<AbstractClientPlayer, PlayerModel<Abs
         if (float13 < 0.0f) {
             float13 = 0.0f;
         }
-        final float float15 = Mth.lerp(float7, dpy.oBob, dpy.bob);
-        float12 += Mth.sin(Mth.lerp(float7, dpy.walkDistO, dpy.walkDist) * 6.0f) * 32.0f * float15;
-        if (dpy.isCrouching()) {
+        final float float15 = Mth.lerp(float7, ebc.oBob, ebc.bob);
+        float12 += Mth.sin(Mth.lerp(float7, ebc.walkDistO, ebc.walkDist) * 6.0f) * 32.0f * float15;
+        if (ebc.isCrouching()) {
             float12 += 25.0f;
         }
-        cyl.mulPose(Vector3f.XP.rotationDegrees(6.0f + float13 / 2.0f + float12));
-        cyl.mulPose(Vector3f.ZP.rotationDegrees(float14 / 2.0f));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float14 / 2.0f));
-        final VertexConsumer cyo28 = dqt.getBuffer(RenderType.entitySolid(dpy.getCloakTextureLocation()));
-        ((RenderLayer<T, PlayerModel>)this).getParentModel().renderCloak(cyl, cyo28, integer, OverlayTexture.NO_OVERLAY);
-        cyl.popPose();
+        dhl.mulPose(Vector3f.XP.rotationDegrees(6.0f + float13 / 2.0f + float12));
+        dhl.mulPose(Vector3f.ZP.rotationDegrees(float14 / 2.0f));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f - float14 / 2.0f));
+        final VertexConsumer dhp28 = ebz.getBuffer(RenderType.entitySolid(ebc.getCloakTextureLocation()));
+        ((RenderLayer<T, PlayerModel>)this).getParentModel().renderCloak(dhl, dhp28, integer, OverlayTexture.NO_OVERLAY);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/CarriedBlockLayer.java b/src/net/minecraft/client/renderer/entity/layers/CarriedBlockLayer.java
index b377c55..9c653a5 100644
--- a/src/net/minecraft/client/renderer/entity/layers/CarriedBlockLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/CarriedBlockLayer.java
@@ -12,25 +12,25 @@ import net.minecraft.client.model.EndermanModel;
 import net.minecraft.world.entity.monster.EnderMan;
 
 public class CarriedBlockLayer extends RenderLayer<EnderMan, EndermanModel<EnderMan>> {
-    public CarriedBlockLayer(final RenderLayerParent<EnderMan, EndermanModel<EnderMan>> dwv) {
-        super(dwv);
+    public CarriedBlockLayer(final RenderLayerParent<EnderMan, EndermanModel<EnderMan>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final EnderMan awm, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final BlockState byj12 = awm.getCarriedBlock();
-        if (byj12 == null) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final EnderMan bbr, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final BlockState cfj12 = bbr.getCarriedBlock();
+        if (cfj12 == null) {
             return;
         }
-        cyl.pushPose();
-        cyl.translate(0.0, 0.6875, -0.75);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(20.0f));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(45.0f));
-        cyl.translate(0.25, 0.1875, 0.25);
+        dhl.pushPose();
+        dhl.translate(0.0, 0.6875, -0.75);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(20.0f));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(45.0f));
+        dhl.translate(0.25, 0.1875, 0.25);
         final float float11 = 0.5f;
-        cyl.scale(-0.5f, -0.5f, 0.5f);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(90.0f));
-        Minecraft.getInstance().getBlockRenderer().renderSingleBlock(byj12, cyl, dqt, integer, OverlayTexture.NO_OVERLAY);
-        cyl.popPose();
+        dhl.scale(-0.5f, -0.5f, 0.5f);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(90.0f));
+        Minecraft.getInstance().getBlockRenderer().renderSingleBlock(cfj12, dhl, ebz, integer, OverlayTexture.NO_OVERLAY);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/CatCollarLayer.java b/src/net/minecraft/client/renderer/entity/layers/CatCollarLayer.java
index 7095433..1cf97e7 100644
--- a/src/net/minecraft/client/renderer/entity/layers/CatCollarLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/CatCollarLayer.java
@@ -13,18 +13,18 @@ public class CatCollarLayer extends RenderLayer<Cat, CatModel<Cat>> {
     private static final ResourceLocation CAT_COLLAR_LOCATION;
     private final CatModel<Cat> catModel;
     
-    public CatCollarLayer(final RenderLayerParent<Cat, CatModel<Cat>> dwv) {
-        super(dwv);
+    public CatCollarLayer(final RenderLayerParent<Cat, CatModel<Cat>> eid) {
+        super(eid);
         this.catModel = new CatModel<Cat>(0.01f);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Cat ate, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (!ate.isTame()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Cat aym, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (!aym.isTame()) {
             return;
         }
-        final float[] arr12 = ate.getCollarColor().getTextureDiffuseColors();
-        RenderLayer.<Cat>coloredCutoutModelCopyLayerRender(((RenderLayer<T, EntityModel<Cat>>)this).getParentModel(), this.catModel, CatCollarLayer.CAT_COLLAR_LOCATION, cyl, dqt, integer, ate, float5, float6, float8, float9, float10, float7, arr12[0], arr12[1], arr12[2]);
+        final float[] arr12 = aym.getCollarColor().getTextureDiffuseColors();
+        RenderLayer.<Cat>coloredCutoutModelCopyLayerRender(((RenderLayer<T, EntityModel<Cat>>)this).getParentModel(), this.catModel, CatCollarLayer.CAT_COLLAR_LOCATION, dhl, ebz, integer, aym, float5, float6, float8, float9, float10, float7, arr12[0], arr12[1], arr12[2]);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/layers/CreeperPowerLayer.java b/src/net/minecraft/client/renderer/entity/layers/CreeperPowerLayer.java
index 2627c45..b7aa7b2 100644
--- a/src/net/minecraft/client/renderer/entity/layers/CreeperPowerLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/CreeperPowerLayer.java
@@ -10,8 +10,8 @@ public class CreeperPowerLayer extends EnergySwirlLayer<Creeper, CreeperModel<Cr
     private static final ResourceLocation POWER_LOCATION;
     private final CreeperModel<Creeper> model;
     
-    public CreeperPowerLayer(final RenderLayerParent<Creeper, CreeperModel<Creeper>> dwv) {
-        super(dwv);
+    public CreeperPowerLayer(final RenderLayerParent<Creeper, CreeperModel<Creeper>> eid) {
+        super(eid);
         this.model = new CreeperModel<Creeper>(2.0f);
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/layers/CrossedArmsItemLayer.java b/src/net/minecraft/client/renderer/entity/layers/CrossedArmsItemLayer.java
index 108f357..d704a85 100644
--- a/src/net/minecraft/client/renderer/entity/layers/CrossedArmsItemLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/CrossedArmsItemLayer.java
@@ -13,17 +13,17 @@ import net.minecraft.client.model.EntityModel;
 import net.minecraft.world.entity.LivingEntity;
 
 public class CrossedArmsItemLayer<T extends LivingEntity, M extends EntityModel<T>> extends RenderLayer<T, M> {
-    public CrossedArmsItemLayer(final RenderLayerParent<T, M> dwv) {
-        super(dwv);
+    public CrossedArmsItemLayer(final RenderLayerParent<T, M> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        cyl.pushPose();
-        cyl.translate(0.0, 0.4000000059604645, -0.4000000059604645);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(180.0f));
-        final ItemStack ben12 = akz.getItemBySlot(EquipmentSlot.MAINHAND);
-        Minecraft.getInstance().getItemInHandRenderer().renderItem(akz, ben12, ItemTransforms.TransformType.GROUND, false, cyl, dqt, integer);
-        cyl.popPose();
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        dhl.pushPose();
+        dhl.translate(0.0, 0.4000000059604645, -0.4000000059604645);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(180.0f));
+        final ItemStack bki12 = aoy.getItemBySlot(EquipmentSlot.MAINHAND);
+        Minecraft.getInstance().getItemInHandRenderer().renderItem(aoy, bki12, ItemTransforms.TransformType.GROUND, false, dhl, ebz, integer);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/CustomHeadLayer.java b/src/net/minecraft/client/renderer/entity/layers/CustomHeadLayer.java
index ab7c2ce..6352c02 100644
--- a/src/net/minecraft/client/renderer/entity/layers/CustomHeadLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/CustomHeadLayer.java
@@ -28,60 +28,72 @@ import net.minecraft.client.renderer.entity.RenderLayerParent;
 import net.minecraft.world.entity.LivingEntity;
 
 public class CustomHeadLayer<T extends LivingEntity, M extends EntityModel> extends RenderLayer<T, M> {
-    public CustomHeadLayer(final RenderLayerParent<T, M> dwv) {
-        super(dwv);
+    private final float scaleX;
+    private final float scaleY;
+    private final float scaleZ;
+    
+    public CustomHeadLayer(final RenderLayerParent<T, M> eid) {
+        this(eid, 1.0f, 1.0f, 1.0f);
+    }
+    
+    public CustomHeadLayer(final RenderLayerParent<T, M> eid, final float float2, final float float3, final float float4) {
+        super(eid);
+        this.scaleX = float2;
+        this.scaleY = float3;
+        this.scaleZ = float4;
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final ItemStack ben12 = akz.getItemBySlot(EquipmentSlot.HEAD);
-        if (ben12.isEmpty()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final ItemStack bki12 = aoy.getItemBySlot(EquipmentSlot.HEAD);
+        if (bki12.isEmpty()) {
             return;
         }
-        final Item bei13 = ben12.getItem();
-        cyl.pushPose();
-        final boolean boolean14 = akz instanceof Villager || akz instanceof ZombieVillager;
-        if (akz.isBaby() && !(akz instanceof Villager)) {
+        final Item bke13 = bki12.getItem();
+        dhl.pushPose();
+        dhl.scale(this.scaleX, this.scaleY, this.scaleZ);
+        final boolean boolean14 = aoy instanceof Villager || aoy instanceof ZombieVillager;
+        if (aoy.isBaby() && !(aoy instanceof Villager)) {
             final float float11 = 2.0f;
             final float float12 = 1.4f;
-            cyl.translate(0.0, 0.03125, 0.0);
-            cyl.scale(0.7f, 0.7f, 0.7f);
-            cyl.translate(0.0, 1.0, 0.0);
+            dhl.translate(0.0, 0.03125, 0.0);
+            dhl.scale(0.7f, 0.7f, 0.7f);
+            dhl.translate(0.0, 1.0, 0.0);
         }
-        this.getParentModel().getHead().translateAndRotate(cyl);
-        if (bei13 instanceof BlockItem && ((BlockItem)bei13).getBlock() instanceof AbstractSkullBlock) {
+        this.getParentModel().getHead().translateAndRotate(dhl);
+        if (bke13 instanceof BlockItem && ((BlockItem)bke13).getBlock() instanceof AbstractSkullBlock) {
             final float float11 = 1.1875f;
-            cyl.scale(1.1875f, -1.1875f, -1.1875f);
+            dhl.scale(1.1875f, -1.1875f, -1.1875f);
             if (boolean14) {
-                cyl.translate(0.0, 0.0625, 0.0);
+                dhl.translate(0.0, 0.0625, 0.0);
             }
             GameProfile gameProfile16 = null;
-            if (ben12.hasTag()) {
-                final CompoundTag jt17 = ben12.getTag();
-                if (jt17.contains("SkullOwner", 10)) {
-                    gameProfile16 = NbtUtils.readGameProfile(jt17.getCompound("SkullOwner"));
+            if (bki12.hasTag()) {
+                final CompoundTag le17 = bki12.getTag();
+                if (le17.contains("SkullOwner", 10)) {
+                    gameProfile16 = NbtUtils.readGameProfile(le17.getCompound("SkullOwner"));
                 }
-                else if (jt17.contains("SkullOwner", 8)) {
-                    final String string18 = jt17.getString("SkullOwner");
+                else if (le17.contains("SkullOwner", 8)) {
+                    final String string18 = le17.getString("SkullOwner");
                     if (!StringUtils.isBlank((CharSequence)string18)) {
                         gameProfile16 = SkullBlockEntity.updateGameprofile(new GameProfile((UUID)null, string18));
-                        jt17.put("SkullOwner", NbtUtils.writeGameProfile(new CompoundTag(), gameProfile16));
+                        le17.put("SkullOwner", NbtUtils.writeGameProfile(new CompoundTag(), gameProfile16));
                     }
                 }
             }
-            cyl.translate(-0.5, 0.0, -0.5);
-            SkullBlockRenderer.renderSkull(null, 180.0f, ((AbstractSkullBlock)((BlockItem)bei13).getBlock()).getType(), gameProfile16, float5, cyl, dqt, integer);
+            dhl.translate(-0.5, 0.0, -0.5);
+            SkullBlockRenderer.renderSkull(null, 180.0f, ((AbstractSkullBlock)((BlockItem)bke13).getBlock()).getType(), gameProfile16, float5, dhl, ebz, integer);
         }
-        else if (!(bei13 instanceof ArmorItem) || ((ArmorItem)bei13).getSlot() != EquipmentSlot.HEAD) {
+        else if (!(bke13 instanceof ArmorItem) || ((ArmorItem)bke13).getSlot() != EquipmentSlot.HEAD) {
             final float float11 = 0.625f;
-            cyl.translate(0.0, -0.25, 0.0);
-            cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
-            cyl.scale(0.625f, -0.625f, -0.625f);
+            dhl.translate(0.0, -0.25, 0.0);
+            dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
+            dhl.scale(0.625f, -0.625f, -0.625f);
             if (boolean14) {
-                cyl.translate(0.0, 0.1875, 0.0);
+                dhl.translate(0.0, 0.1875, 0.0);
             }
-            Minecraft.getInstance().getItemInHandRenderer().renderItem(akz, ben12, ItemTransforms.TransformType.HEAD, false, cyl, dqt, integer);
+            Minecraft.getInstance().getItemInHandRenderer().renderItem(aoy, bki12, ItemTransforms.TransformType.HEAD, false, dhl, ebz, integer);
         }
-        cyl.popPose();
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/Deadmau5EarsLayer.java b/src/net/minecraft/client/renderer/entity/layers/Deadmau5EarsLayer.java
index 6579148..e89b049 100644
--- a/src/net/minecraft/client/renderer/entity/layers/Deadmau5EarsLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/Deadmau5EarsLayer.java
@@ -14,31 +14,31 @@ import net.minecraft.client.model.PlayerModel;
 import net.minecraft.client.player.AbstractClientPlayer;
 
 public class Deadmau5EarsLayer extends RenderLayer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {
-    public Deadmau5EarsLayer(final RenderLayerParent<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> dwv) {
-        super(dwv);
+    public Deadmau5EarsLayer(final RenderLayerParent<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final AbstractClientPlayer dpy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (!"deadmau5".equals(dpy.getName().getString()) || !dpy.isSkinLoaded() || dpy.isInvisible()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final AbstractClientPlayer ebc, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (!"deadmau5".equals(ebc.getName().getString()) || !ebc.isSkinLoaded() || ebc.isInvisible()) {
             return;
         }
-        final VertexConsumer cyo12 = dqt.getBuffer(RenderType.entitySolid(dpy.getSkinTextureLocation()));
-        final int integer2 = LivingEntityRenderer.getOverlayCoords(dpy, 0.0f);
+        final VertexConsumer dhp12 = ebz.getBuffer(RenderType.entitySolid(ebc.getSkinTextureLocation()));
+        final int integer2 = LivingEntityRenderer.getOverlayCoords(ebc, 0.0f);
         for (int integer3 = 0; integer3 < 2; ++integer3) {
-            final float float11 = Mth.lerp(float7, dpy.yRotO, dpy.yRot) - Mth.lerp(float7, dpy.yBodyRotO, dpy.yBodyRot);
-            final float float12 = Mth.lerp(float7, dpy.xRotO, dpy.xRot);
-            cyl.pushPose();
-            cyl.mulPose(Vector3f.YP.rotationDegrees(float11));
-            cyl.mulPose(Vector3f.XP.rotationDegrees(float12));
-            cyl.translate(0.375f * (integer3 * 2 - 1), 0.0, 0.0);
-            cyl.translate(0.0, -0.375, 0.0);
-            cyl.mulPose(Vector3f.XP.rotationDegrees(-float12));
-            cyl.mulPose(Vector3f.YP.rotationDegrees(-float11));
+            final float float11 = Mth.lerp(float7, ebc.yRotO, ebc.yRot) - Mth.lerp(float7, ebc.yBodyRotO, ebc.yBodyRot);
+            final float float12 = Mth.lerp(float7, ebc.xRotO, ebc.xRot);
+            dhl.pushPose();
+            dhl.mulPose(Vector3f.YP.rotationDegrees(float11));
+            dhl.mulPose(Vector3f.XP.rotationDegrees(float12));
+            dhl.translate(0.375f * (integer3 * 2 - 1), 0.0, 0.0);
+            dhl.translate(0.0, -0.375, 0.0);
+            dhl.mulPose(Vector3f.XP.rotationDegrees(-float12));
+            dhl.mulPose(Vector3f.YP.rotationDegrees(-float11));
             final float float13 = 1.3333334f;
-            cyl.scale(1.3333334f, 1.3333334f, 1.3333334f);
-            ((RenderLayer<T, PlayerModel>)this).getParentModel().renderEars(cyl, cyo12, integer, integer2);
-            cyl.popPose();
+            dhl.scale(1.3333334f, 1.3333334f, 1.3333334f);
+            ((RenderLayer<T, PlayerModel>)this).getParentModel().renderEars(dhl, dhp12, integer, integer2);
+            dhl.popPose();
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/DolphinCarryingItemLayer.java b/src/net/minecraft/client/renderer/entity/layers/DolphinCarryingItemLayer.java
index 8384c44..9348126 100644
--- a/src/net/minecraft/client/renderer/entity/layers/DolphinCarryingItemLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/DolphinCarryingItemLayer.java
@@ -14,25 +14,25 @@ import net.minecraft.client.model.DolphinModel;
 import net.minecraft.world.entity.animal.Dolphin;
 
 public class DolphinCarryingItemLayer extends RenderLayer<Dolphin, DolphinModel<Dolphin>> {
-    public DolphinCarryingItemLayer(final RenderLayerParent<Dolphin, DolphinModel<Dolphin>> dwv) {
-        super(dwv);
+    public DolphinCarryingItemLayer(final RenderLayerParent<Dolphin, DolphinModel<Dolphin>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Dolphin ati, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final boolean boolean12 = ati.getMainArm() == HumanoidArm.RIGHT;
-        cyl.pushPose();
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Dolphin ayq, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final boolean boolean12 = ayq.getMainArm() == HumanoidArm.RIGHT;
+        dhl.pushPose();
         final float float11 = 1.0f;
         final float float12 = -1.0f;
-        final float float13 = Mth.abs(ati.xRot) / 60.0f;
-        if (ati.xRot < 0.0f) {
-            cyl.translate(0.0, 1.0f - float13 * 0.5f, -1.0f + float13 * 0.5f);
+        final float float13 = Mth.abs(ayq.xRot) / 60.0f;
+        if (ayq.xRot < 0.0f) {
+            dhl.translate(0.0, 1.0f - float13 * 0.5f, -1.0f + float13 * 0.5f);
         }
         else {
-            cyl.translate(0.0, 1.0f + float13 * 0.8f, -1.0f + float13 * 0.2f);
+            dhl.translate(0.0, 1.0f + float13 * 0.8f, -1.0f + float13 * 0.2f);
         }
-        final ItemStack ben16 = boolean12 ? ati.getMainHandItem() : ati.getOffhandItem();
-        Minecraft.getInstance().getItemInHandRenderer().renderItem(ati, ben16, ItemTransforms.TransformType.GROUND, false, cyl, dqt, integer);
-        cyl.popPose();
+        final ItemStack bki16 = boolean12 ? ayq.getMainHandItem() : ayq.getOffhandItem();
+        Minecraft.getInstance().getItemInHandRenderer().renderItem(ayq, bki16, ItemTransforms.TransformType.GROUND, false, dhl, ebz, integer);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/DrownedOuterLayer.java b/src/net/minecraft/client/renderer/entity/layers/DrownedOuterLayer.java
index 15de223..3c082f6 100644
--- a/src/net/minecraft/client/renderer/entity/layers/DrownedOuterLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/DrownedOuterLayer.java
@@ -7,20 +7,20 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.entity.RenderLayerParent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.model.DrownedModel;
-import net.minecraft.world.entity.monster.Zombie;
+import net.minecraft.world.entity.monster.Drowned;
 
-public class DrownedOuterLayer<T extends Zombie> extends RenderLayer<T, DrownedModel<T>> {
+public class DrownedOuterLayer<T extends Drowned> extends RenderLayer<T, DrownedModel<T>> {
     private static final ResourceLocation DROWNED_OUTER_LAYER_LOCATION;
     private final DrownedModel<T> model;
     
-    public DrownedOuterLayer(final RenderLayerParent<T, DrownedModel<T>> dwv) {
-        super(dwv);
+    public DrownedOuterLayer(final RenderLayerParent<T, DrownedModel<T>> eid) {
+        super(eid);
         this.model = new DrownedModel<T>(0.25f, 0.0f, 64, 64);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T axp, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        RenderLayer.<T>coloredCutoutModelCopyLayerRender(this.getParentModel(), this.model, DrownedOuterLayer.DROWNED_OUTER_LAYER_LOCATION, cyl, dqt, integer, axp, float5, float6, float8, float9, float10, float7, 1.0f, 1.0f, 1.0f);
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T bbp, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        RenderLayer.<T>coloredCutoutModelCopyLayerRender(this.getParentModel(), this.model, DrownedOuterLayer.DROWNED_OUTER_LAYER_LOCATION, dhl, ebz, integer, bbp, float5, float6, float8, float9, float10, float7, 1.0f, 1.0f, 1.0f);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/layers/ElytraLayer.java b/src/net/minecraft/client/renderer/entity/layers/ElytraLayer.java
index 04ffabf..81f4cca 100644
--- a/src/net/minecraft/client/renderer/entity/layers/ElytraLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/ElytraLayer.java
@@ -21,40 +21,40 @@ public class ElytraLayer<T extends LivingEntity, M extends EntityModel<T>> exten
     private static final ResourceLocation WINGS_LOCATION;
     private final ElytraModel<T> elytraModel;
     
-    public ElytraLayer(final RenderLayerParent<T, M> dwv) {
-        super(dwv);
+    public ElytraLayer(final RenderLayerParent<T, M> eid) {
+        super(eid);
         this.elytraModel = new ElytraModel<T>();
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final ItemStack ben12 = akz.getItemBySlot(EquipmentSlot.CHEST);
-        if (ben12.getItem() != Items.ELYTRA) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final ItemStack bki12 = aoy.getItemBySlot(EquipmentSlot.CHEST);
+        if (bki12.getItem() != Items.ELYTRA) {
             return;
         }
-        ResourceLocation sm13;
-        if (akz instanceof AbstractClientPlayer) {
-            final AbstractClientPlayer dpy14 = (AbstractClientPlayer)akz;
-            if (dpy14.isElytraLoaded() && dpy14.getElytraTextureLocation() != null) {
-                sm13 = dpy14.getElytraTextureLocation();
+        ResourceLocation uh13;
+        if (aoy instanceof AbstractClientPlayer) {
+            final AbstractClientPlayer ebc14 = (AbstractClientPlayer)aoy;
+            if (ebc14.isElytraLoaded() && ebc14.getElytraTextureLocation() != null) {
+                uh13 = ebc14.getElytraTextureLocation();
             }
-            else if (dpy14.isCapeLoaded() && dpy14.getCloakTextureLocation() != null && dpy14.isModelPartShown(PlayerModelPart.CAPE)) {
-                sm13 = dpy14.getCloakTextureLocation();
+            else if (ebc14.isCapeLoaded() && ebc14.getCloakTextureLocation() != null && ebc14.isModelPartShown(PlayerModelPart.CAPE)) {
+                uh13 = ebc14.getCloakTextureLocation();
             }
             else {
-                sm13 = ElytraLayer.WINGS_LOCATION;
+                uh13 = ElytraLayer.WINGS_LOCATION;
             }
         }
         else {
-            sm13 = ElytraLayer.WINGS_LOCATION;
+            uh13 = ElytraLayer.WINGS_LOCATION;
         }
-        cyl.pushPose();
-        cyl.translate(0.0, 0.0, 0.125);
+        dhl.pushPose();
+        dhl.translate(0.0, 0.0, 0.125);
         this.getParentModel().copyPropertiesTo(this.elytraModel);
-        this.elytraModel.setupAnim(akz, float5, float6, float8, float9, float10);
-        final VertexConsumer cyo14 = ItemRenderer.getFoilBuffer(dqt, this.elytraModel.renderType(sm13), false, ben12.hasFoil());
-        this.elytraModel.renderToBuffer(cyl, cyo14, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-        cyl.popPose();
+        this.elytraModel.setupAnim(aoy, float5, float6, float8, float9, float10);
+        final VertexConsumer dhp14 = ItemRenderer.getFoilBufferDirect(ebz, this.elytraModel.renderType(uh13), false, bki12.hasFoil());
+        this.elytraModel.renderToBuffer(dhl, dhp14, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        dhl.popPose();
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/layers/EnderEyesLayer.java b/src/net/minecraft/client/renderer/entity/layers/EnderEyesLayer.java
index 55d9e28..4ad0c4b 100644
--- a/src/net/minecraft/client/renderer/entity/layers/EnderEyesLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/EnderEyesLayer.java
@@ -9,8 +9,8 @@ import net.minecraft.world.entity.LivingEntity;
 public class EnderEyesLayer<T extends LivingEntity> extends EyesLayer<T, EndermanModel<T>> {
     private static final RenderType ENDERMAN_EYES;
     
-    public EnderEyesLayer(final RenderLayerParent<T, EndermanModel<T>> dwv) {
-        super(dwv);
+    public EnderEyesLayer(final RenderLayerParent<T, EndermanModel<T>> eid) {
+        super(eid);
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/entity/layers/EnergySwirlLayer.java b/src/net/minecraft/client/renderer/entity/layers/EnergySwirlLayer.java
index 8c1a8bd..3562c69 100644
--- a/src/net/minecraft/client/renderer/entity/layers/EnergySwirlLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/EnergySwirlLayer.java
@@ -11,22 +11,22 @@ import net.minecraft.client.renderer.entity.RenderLayerParent;
 import net.minecraft.client.model.EntityModel;
 
 public abstract class EnergySwirlLayer<T extends Entity, M extends EntityModel<T>> extends RenderLayer<T, M> {
-    public EnergySwirlLayer(final RenderLayerParent<T, M> dwv) {
-        super(dwv);
+    public EnergySwirlLayer(final RenderLayerParent<T, M> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akq, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (!((PowerableMob)akq).isPowered()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aom, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (!((PowerableMob)aom).isPowered()) {
             return;
         }
-        final float float11 = ((Entity)akq).tickCount + float7;
-        final EntityModel<T> dla13 = this.model();
-        dla13.prepareMobModel(akq, float5, float6, float7);
-        this.getParentModel().copyPropertiesTo(dla13);
-        final VertexConsumer cyo14 = dqt.getBuffer(RenderType.energySwirl(this.getTextureLocation(), this.xOffset(float11), float11 * 0.01f));
-        dla13.setupAnim(akq, float5, float6, float8, float9, float10);
-        dla13.renderToBuffer(cyl, cyo14, integer, OverlayTexture.NO_OVERLAY, 0.5f, 0.5f, 0.5f, 1.0f);
+        final float float11 = ((Entity)aom).tickCount + float7;
+        final EntityModel<T> dvv13 = this.model();
+        dvv13.prepareMobModel(aom, float5, float6, float7);
+        this.getParentModel().copyPropertiesTo(dvv13);
+        final VertexConsumer dhp14 = ebz.getBuffer(RenderType.energySwirl(this.getTextureLocation(), this.xOffset(float11), float11 * 0.01f));
+        dvv13.setupAnim(aom, float5, float6, float8, float9, float10);
+        dvv13.renderToBuffer(dhl, dhp14, integer, OverlayTexture.NO_OVERLAY, 0.5f, 0.5f, 0.5f, 1.0f);
     }
     
     protected abstract float xOffset(final float float1);
diff --git a/src/net/minecraft/client/renderer/entity/layers/EyesLayer.java b/src/net/minecraft/client/renderer/entity/layers/EyesLayer.java
index 90e4629..f342637 100644
--- a/src/net/minecraft/client/renderer/entity/layers/EyesLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/EyesLayer.java
@@ -10,14 +10,14 @@ import net.minecraft.client.model.EntityModel;
 import net.minecraft.world.entity.Entity;
 
 public abstract class EyesLayer<T extends Entity, M extends EntityModel<T>> extends RenderLayer<T, M> {
-    public EyesLayer(final RenderLayerParent<T, M> dwv) {
-        super(dwv);
+    public EyesLayer(final RenderLayerParent<T, M> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akq, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final VertexConsumer cyo12 = dqt.getBuffer(this.renderType());
-        this.getParentModel().renderToBuffer(cyl, cyo12, 15728640, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aom, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final VertexConsumer dhp12 = ebz.getBuffer(this.renderType());
+        this.getParentModel().renderToBuffer(dhl, dhp12, 15728640, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
     }
     
     public abstract RenderType renderType();
diff --git a/src/net/minecraft/client/renderer/entity/layers/FoxHeldItemLayer.java b/src/net/minecraft/client/renderer/entity/layers/FoxHeldItemLayer.java
index 04564bc..81f63ad 100644
--- a/src/net/minecraft/client/renderer/entity/layers/FoxHeldItemLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/FoxHeldItemLayer.java
@@ -14,45 +14,45 @@ import net.minecraft.client.model.FoxModel;
 import net.minecraft.world.entity.animal.Fox;
 
 public class FoxHeldItemLayer extends RenderLayer<Fox, FoxModel<Fox>> {
-    public FoxHeldItemLayer(final RenderLayerParent<Fox, FoxModel<Fox>> dwv) {
-        super(dwv);
+    public FoxHeldItemLayer(final RenderLayerParent<Fox, FoxModel<Fox>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Fox atk, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final boolean boolean12 = atk.isSleeping();
-        final boolean boolean13 = atk.isBaby();
-        cyl.pushPose();
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Fox ays, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final boolean boolean12 = ays.isSleeping();
+        final boolean boolean13 = ays.isBaby();
+        dhl.pushPose();
         if (boolean13) {
             final float float11 = 0.75f;
-            cyl.scale(0.75f, 0.75f, 0.75f);
-            cyl.translate(0.0, 0.5, 0.20937499403953552);
+            dhl.scale(0.75f, 0.75f, 0.75f);
+            dhl.translate(0.0, 0.5, 0.20937499403953552);
         }
-        cyl.translate(((RenderLayer<T, FoxModel>)this).getParentModel().head.x / 16.0f, ((RenderLayer<T, FoxModel>)this).getParentModel().head.y / 16.0f, ((RenderLayer<T, FoxModel>)this).getParentModel().head.z / 16.0f);
-        final float float11 = atk.getHeadRollAngle(float7);
-        cyl.mulPose(Vector3f.ZP.rotation(float11));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(float9));
-        cyl.mulPose(Vector3f.XP.rotationDegrees(float10));
-        if (atk.isBaby()) {
+        dhl.translate(((RenderLayer<T, FoxModel>)this).getParentModel().head.x / 16.0f, ((RenderLayer<T, FoxModel>)this).getParentModel().head.y / 16.0f, ((RenderLayer<T, FoxModel>)this).getParentModel().head.z / 16.0f);
+        final float float11 = ays.getHeadRollAngle(float7);
+        dhl.mulPose(Vector3f.ZP.rotation(float11));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(float9));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(float10));
+        if (ays.isBaby()) {
             if (boolean12) {
-                cyl.translate(0.4000000059604645, 0.25999999046325684, 0.15000000596046448);
+                dhl.translate(0.4000000059604645, 0.25999999046325684, 0.15000000596046448);
             }
             else {
-                cyl.translate(0.05999999865889549, 0.25999999046325684, -0.5);
+                dhl.translate(0.05999999865889549, 0.25999999046325684, -0.5);
             }
         }
         else if (boolean12) {
-            cyl.translate(0.46000000834465027, 0.25999999046325684, 0.2199999988079071);
+            dhl.translate(0.46000000834465027, 0.25999999046325684, 0.2199999988079071);
         }
         else {
-            cyl.translate(0.05999999865889549, 0.27000001072883606, -0.5);
+            dhl.translate(0.05999999865889549, 0.27000001072883606, -0.5);
         }
-        cyl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
+        dhl.mulPose(Vector3f.XP.rotationDegrees(90.0f));
         if (boolean12) {
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(90.0f));
         }
-        final ItemStack ben15 = atk.getItemBySlot(EquipmentSlot.MAINHAND);
-        Minecraft.getInstance().getItemInHandRenderer().renderItem(atk, ben15, ItemTransforms.TransformType.GROUND, false, cyl, dqt, integer);
-        cyl.popPose();
+        final ItemStack bki15 = ays.getItemBySlot(EquipmentSlot.MAINHAND);
+        Minecraft.getInstance().getItemInHandRenderer().renderItem(ays, bki15, ItemTransforms.TransformType.GROUND, false, dhl, ebz, integer);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/HorseArmorLayer.java b/src/net/minecraft/client/renderer/entity/layers/HorseArmorLayer.java
index 09b3259..0187349 100644
--- a/src/net/minecraft/client/renderer/entity/layers/HorseArmorLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/HorseArmorLayer.java
@@ -17,26 +17,26 @@ import net.minecraft.world.entity.animal.horse.Horse;
 public class HorseArmorLayer extends RenderLayer<Horse, HorseModel<Horse>> {
     private final HorseModel<Horse> model;
     
-    public HorseArmorLayer(final RenderLayerParent<Horse, HorseModel<Horse>> dwv) {
-        super(dwv);
+    public HorseArmorLayer(final RenderLayerParent<Horse, HorseModel<Horse>> eid) {
+        super(eid);
         this.model = new HorseModel<Horse>(0.1f);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Horse aug, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final ItemStack ben12 = aug.getArmor();
-        if (!(ben12.getItem() instanceof HorseArmorItem)) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Horse azo, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final ItemStack bki12 = azo.getArmor();
+        if (!(bki12.getItem() instanceof HorseArmorItem)) {
             return;
         }
-        final HorseArmorItem beh13 = (HorseArmorItem)ben12.getItem();
+        final HorseArmorItem bkd13 = (HorseArmorItem)bki12.getItem();
         ((RenderLayer<T, HorseModel<Horse>>)this).getParentModel().copyPropertiesTo(this.model);
-        this.model.prepareMobModel(aug, float5, float6, float7);
-        this.model.setupAnim(aug, float5, float6, float8, float9, float10);
+        this.model.prepareMobModel(azo, float5, float6, float7);
+        this.model.setupAnim(azo, float5, float6, float8, float9, float10);
         float float11;
         float float12;
         float float13;
-        if (beh13 instanceof DyeableHorseArmorItem) {
-            final int integer2 = ((DyeableHorseArmorItem)beh13).getColor(ben12);
+        if (bkd13 instanceof DyeableHorseArmorItem) {
+            final int integer2 = ((DyeableHorseArmorItem)bkd13).getColor(bki12);
             float11 = (integer2 >> 16 & 0xFF) / 255.0f;
             float12 = (integer2 >> 8 & 0xFF) / 255.0f;
             float13 = (integer2 & 0xFF) / 255.0f;
@@ -46,7 +46,7 @@ public class HorseArmorLayer extends RenderLayer<Horse, HorseModel<Horse>> {
             float12 = 1.0f;
             float13 = 1.0f;
         }
-        final VertexConsumer cyo17 = dqt.getBuffer(RenderType.entityCutoutNoCull(beh13.getTexture()));
-        this.model.renderToBuffer(cyl, cyo17, integer, OverlayTexture.NO_OVERLAY, float11, float12, float13, 1.0f);
+        final VertexConsumer dhp17 = ebz.getBuffer(RenderType.entityCutoutNoCull(bkd13.getTexture()));
+        this.model.renderToBuffer(dhl, dhp17, integer, OverlayTexture.NO_OVERLAY, float11, float12, float13, 1.0f);
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/HorseMarkingLayer.java b/src/net/minecraft/client/renderer/entity/layers/HorseMarkingLayer.java
new file mode 100644
index 0000000..4465b66
--- /dev/null
+++ b/src/net/minecraft/client/renderer/entity/layers/HorseMarkingLayer.java
@@ -0,0 +1,46 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.Util;
+import com.google.common.collect.Maps;
+import java.util.EnumMap;
+import net.minecraft.world.entity.Entity;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.MultiBufferSource;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.entity.RenderLayerParent;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.animal.horse.Markings;
+import java.util.Map;
+import net.minecraft.client.model.HorseModel;
+import net.minecraft.world.entity.animal.horse.Horse;
+
+public class HorseMarkingLayer extends RenderLayer<Horse, HorseModel<Horse>> {
+    private static final Map<Markings, ResourceLocation> LOCATION_BY_MARKINGS;
+    
+    public HorseMarkingLayer(final RenderLayerParent<Horse, HorseModel<Horse>> eid) {
+        super(eid);
+    }
+    
+    @Override
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Horse azo, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final ResourceLocation uh12 = HorseMarkingLayer.LOCATION_BY_MARKINGS.get(azo.getMarkings());
+        if (uh12 == null || azo.isInvisible()) {
+            return;
+        }
+        final VertexConsumer dhp13 = ebz.getBuffer(RenderType.entityTranslucent(uh12));
+        ((RenderLayer<T, HorseModel>)this).getParentModel().renderToBuffer(dhl, dhp13, integer, LivingEntityRenderer.getOverlayCoords(azo, 0.0f), 1.0f, 1.0f, 1.0f, 1.0f);
+    }
+    
+    static {
+        LOCATION_BY_MARKINGS = Util.<Map<Markings, ResourceLocation>>make(Maps.newEnumMap(Markings.class), enumMap -> {
+            enumMap.put(Markings.NONE, null);
+            enumMap.put(Markings.WHITE, new ResourceLocation("textures/entity/horse/horse_markings_white.png"));
+            enumMap.put(Markings.WHITE_FIELD, new ResourceLocation("textures/entity/horse/horse_markings_whitefield.png"));
+            enumMap.put(Markings.WHITE_DOTS, new ResourceLocation("textures/entity/horse/horse_markings_whitedots.png"));
+            enumMap.put(Markings.BLACK_DOTS, new ResourceLocation("textures/entity/horse/horse_markings_blackdots.png"));
+        });
+    }
+}
diff --git a/src/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.java b/src/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.java
index afdb373..b63363c 100644
--- a/src/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.java
@@ -1,46 +1,117 @@
 package net.minecraft.client.renderer.entity.layers;
 
+import com.google.common.collect.Maps;
+import net.minecraft.world.entity.Entity;
+import java.util.function.Function;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.client.renderer.texture.OverlayTexture;
+import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.renderer.RenderType;
+import javax.annotation.Nullable;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.DyeableArmorItem;
+import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.client.renderer.MultiBufferSource;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.entity.RenderLayerParent;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Map;
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.world.entity.LivingEntity;
 
-public class HumanoidArmorLayer<T extends LivingEntity, M extends HumanoidModel<T>, A extends HumanoidModel<T>> extends AbstractArmorLayer<T, M, A> {
-    public HumanoidArmorLayer(final RenderLayerParent<T, M> dwv, final A dlj2, final A dlj3) {
-        super(dwv, dlj2, dlj3);
+public class HumanoidArmorLayer<T extends LivingEntity, M extends HumanoidModel<T>, A extends HumanoidModel<T>> extends RenderLayer<T, M> {
+    private static final Map<String, ResourceLocation> ARMOR_LOCATION_CACHE;
+    private final A innerModel;
+    private final A outerModel;
+    
+    public HumanoidArmorLayer(final RenderLayerParent<T, M> eid, final A dwf2, final A dwf3) {
+        super(eid);
+        this.innerModel = dwf2;
+        this.outerModel = dwf3;
     }
     
     @Override
-    protected void setPartVisibility(final A dlj, final EquipmentSlot akv) {
-        this.hideAllArmor(dlj);
-        switch (akv) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        this.renderArmorPiece(dhl, ebz, aoy, EquipmentSlot.CHEST, integer, this.getArmorModel(EquipmentSlot.CHEST));
+        this.renderArmorPiece(dhl, ebz, aoy, EquipmentSlot.LEGS, integer, this.getArmorModel(EquipmentSlot.LEGS));
+        this.renderArmorPiece(dhl, ebz, aoy, EquipmentSlot.FEET, integer, this.getArmorModel(EquipmentSlot.FEET));
+        this.renderArmorPiece(dhl, ebz, aoy, EquipmentSlot.HEAD, integer, this.getArmorModel(EquipmentSlot.HEAD));
+    }
+    
+    private void renderArmorPiece(final PoseStack dhl, final MultiBufferSource ebz, final T aoy, final EquipmentSlot aor, final int integer, final A dwf) {
+        final ItemStack bki8 = aoy.getItemBySlot(aor);
+        if (!(bki8.getItem() instanceof ArmorItem)) {
+            return;
+        }
+        final ArmorItem bid9 = (ArmorItem)bki8.getItem();
+        if (bid9.getSlot() != aor) {
+            return;
+        }
+        this.getParentModel().copyPropertiesTo(dwf);
+        this.setPartVisibility(dwf, aor);
+        final boolean boolean10 = this.usesInnerModel(aor);
+        final boolean boolean11 = bki8.hasFoil();
+        if (bid9 instanceof DyeableArmorItem) {
+            final int integer2 = ((DyeableArmorItem)bid9).getColor(bki8);
+            final float float13 = (integer2 >> 16 & 0xFF) / 255.0f;
+            final float float14 = (integer2 >> 8 & 0xFF) / 255.0f;
+            final float float15 = (integer2 & 0xFF) / 255.0f;
+            this.renderModel(dhl, ebz, integer, bid9, boolean11, dwf, boolean10, float13, float14, float15, null);
+            this.renderModel(dhl, ebz, integer, bid9, boolean11, dwf, boolean10, 1.0f, 1.0f, 1.0f, "overlay");
+        }
+        else {
+            this.renderModel(dhl, ebz, integer, bid9, boolean11, dwf, boolean10, 1.0f, 1.0f, 1.0f, null);
+        }
+    }
+    
+    protected void setPartVisibility(final A dwf, final EquipmentSlot aor) {
+        dwf.setAllVisible(false);
+        switch (aor) {
             case HEAD: {
-                dlj.head.visible = true;
-                dlj.hat.visible = true;
+                dwf.head.visible = true;
+                dwf.hat.visible = true;
                 break;
             }
             case CHEST: {
-                dlj.body.visible = true;
-                dlj.rightArm.visible = true;
-                dlj.leftArm.visible = true;
+                dwf.body.visible = true;
+                dwf.rightArm.visible = true;
+                dwf.leftArm.visible = true;
                 break;
             }
             case LEGS: {
-                dlj.body.visible = true;
-                dlj.rightLeg.visible = true;
-                dlj.leftLeg.visible = true;
+                dwf.body.visible = true;
+                dwf.rightLeg.visible = true;
+                dwf.leftLeg.visible = true;
                 break;
             }
             case FEET: {
-                dlj.rightLeg.visible = true;
-                dlj.leftLeg.visible = true;
+                dwf.rightLeg.visible = true;
+                dwf.leftLeg.visible = true;
                 break;
             }
         }
     }
     
-    @Override
-    protected void hideAllArmor(final A dlj) {
-        dlj.setAllVisible(false);
+    private void renderModel(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final ArmorItem bid, final boolean boolean5, final A dwf, final boolean boolean7, final float float8, final float float9, final float float10, @Nullable final String string) {
+        final VertexConsumer dhp13 = ItemRenderer.getArmorFoilBuffer(ebz, RenderType.armorCutoutNoCull(this.getArmorLocation(bid, boolean7, string)), false, boolean5);
+        dwf.renderToBuffer(dhl, dhp13, integer, OverlayTexture.NO_OVERLAY, float8, float9, float10, 1.0f);
+    }
+    
+    private A getArmorModel(final EquipmentSlot aor) {
+        return this.usesInnerModel(aor) ? this.innerModel : this.outerModel;
+    }
+    
+    private boolean usesInnerModel(final EquipmentSlot aor) {
+        return aor == EquipmentSlot.LEGS;
+    }
+    
+    private ResourceLocation getArmorLocation(final ArmorItem bid, final boolean boolean2, @Nullable final String string) {
+        final String string2 = "textures/models/armor/" + bid.getMaterial().getName() + "_layer_" + (boolean2 ? 2 : 1) + ((string == null) ? "" : ("_" + string)) + ".png";
+        return HumanoidArmorLayer.ARMOR_LOCATION_CACHE.computeIfAbsent(string2, ResourceLocation::new);
+    }
+    
+    static {
+        ARMOR_LOCATION_CACHE = Maps.newHashMap();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/IronGolemCrackinessLayer.java b/src/net/minecraft/client/renderer/entity/layers/IronGolemCrackinessLayer.java
index bcdbbef..c210252 100644
--- a/src/net/minecraft/client/renderer/entity/layers/IronGolemCrackinessLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/IronGolemCrackinessLayer.java
@@ -14,21 +14,21 @@ import net.minecraft.world.entity.animal.IronGolem;
 public class IronGolemCrackinessLayer extends RenderLayer<IronGolem, IronGolemModel<IronGolem>> {
     private static final Map<IronGolem.Crackiness, ResourceLocation> resourceLocations;
     
-    public IronGolemCrackinessLayer(final RenderLayerParent<IronGolem, IronGolemModel<IronGolem>> dwv) {
-        super(dwv);
+    public IronGolemCrackinessLayer(final RenderLayerParent<IronGolem, IronGolemModel<IronGolem>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final IronGolem atl, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (atl.isInvisible()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final IronGolem ayt, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (ayt.isInvisible()) {
             return;
         }
-        final IronGolem.Crackiness a12 = atl.getCrackiness();
+        final IronGolem.Crackiness a12 = ayt.getCrackiness();
         if (a12 == IronGolem.Crackiness.NONE) {
             return;
         }
-        final ResourceLocation sm13 = IronGolemCrackinessLayer.resourceLocations.get(a12);
-        RenderLayer.<IronGolem>renderColoredCutoutModel(((RenderLayer<T, EntityModel<IronGolem>>)this).getParentModel(), sm13, cyl, dqt, integer, atl, 1.0f, 1.0f, 1.0f);
+        final ResourceLocation uh13 = IronGolemCrackinessLayer.resourceLocations.get(a12);
+        RenderLayer.<IronGolem>renderColoredCutoutModel(((RenderLayer<T, EntityModel<IronGolem>>)this).getParentModel(), uh13, dhl, ebz, integer, ayt, 1.0f, 1.0f, 1.0f);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/layers/IronGolemFlowerLayer.java b/src/net/minecraft/client/renderer/entity/layers/IronGolemFlowerLayer.java
index 1044232..db96ac6 100644
--- a/src/net/minecraft/client/renderer/entity/layers/IronGolemFlowerLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/IronGolemFlowerLayer.java
@@ -13,25 +13,25 @@ import net.minecraft.client.model.IronGolemModel;
 import net.minecraft.world.entity.animal.IronGolem;
 
 public class IronGolemFlowerLayer extends RenderLayer<IronGolem, IronGolemModel<IronGolem>> {
-    public IronGolemFlowerLayer(final RenderLayerParent<IronGolem, IronGolemModel<IronGolem>> dwv) {
-        super(dwv);
+    public IronGolemFlowerLayer(final RenderLayerParent<IronGolem, IronGolemModel<IronGolem>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final IronGolem atl, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (atl.getOfferFlowerTick() == 0) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final IronGolem ayt, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (ayt.getOfferFlowerTick() == 0) {
             return;
         }
-        cyl.pushPose();
-        final ModelPart dni12 = ((RenderLayer<T, IronGolemModel>)this).getParentModel().getFlowerHoldingArm();
-        dni12.translateAndRotate(cyl);
-        cyl.translate(-1.1875, 1.0625, -0.9375);
-        cyl.translate(0.5, 0.5, 0.5);
+        dhl.pushPose();
+        final ModelPart dyg12 = ((RenderLayer<T, IronGolemModel>)this).getParentModel().getFlowerHoldingArm();
+        dyg12.translateAndRotate(dhl);
+        dhl.translate(-1.1875, 1.0625, -0.9375);
+        dhl.translate(0.5, 0.5, 0.5);
         final float float11 = 0.5f;
-        cyl.scale(0.5f, 0.5f, 0.5f);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(-90.0f));
-        cyl.translate(-0.5, -0.5, -0.5);
-        Minecraft.getInstance().getBlockRenderer().renderSingleBlock(Blocks.POPPY.defaultBlockState(), cyl, dqt, integer, OverlayTexture.NO_OVERLAY);
-        cyl.popPose();
+        dhl.scale(0.5f, 0.5f, 0.5f);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(-90.0f));
+        dhl.translate(-0.5, -0.5, -0.5);
+        Minecraft.getInstance().getBlockRenderer().renderSingleBlock(Blocks.POPPY.defaultBlockState(), dhl, ebz, integer, OverlayTexture.NO_OVERLAY);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/ItemInHandLayer.java b/src/net/minecraft/client/renderer/entity/layers/ItemInHandLayer.java
index d944f86..05e1827 100644
--- a/src/net/minecraft/client/renderer/entity/layers/ItemInHandLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/ItemInHandLayer.java
@@ -13,40 +13,40 @@ import net.minecraft.client.renderer.entity.RenderLayerParent;
 import net.minecraft.world.entity.LivingEntity;
 
 public class ItemInHandLayer<T extends LivingEntity, M extends EntityModel> extends RenderLayer<T, M> {
-    public ItemInHandLayer(final RenderLayerParent<T, M> dwv) {
-        super(dwv);
+    public ItemInHandLayer(final RenderLayerParent<T, M> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final boolean boolean12 = akz.getMainArm() == HumanoidArm.RIGHT;
-        final ItemStack ben13 = boolean12 ? akz.getOffhandItem() : akz.getMainHandItem();
-        final ItemStack ben14 = boolean12 ? akz.getMainHandItem() : akz.getOffhandItem();
-        if (ben13.isEmpty() && ben14.isEmpty()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final boolean boolean12 = aoy.getMainArm() == HumanoidArm.RIGHT;
+        final ItemStack bki13 = boolean12 ? aoy.getOffhandItem() : aoy.getMainHandItem();
+        final ItemStack bki14 = boolean12 ? aoy.getMainHandItem() : aoy.getOffhandItem();
+        if (bki13.isEmpty() && bki14.isEmpty()) {
             return;
         }
-        cyl.pushPose();
+        dhl.pushPose();
         if (((net.minecraft.client.model.EntityModel)this.getParentModel()).young) {
             final float float11 = 0.5f;
-            cyl.translate(0.0, 0.75, 0.0);
-            cyl.scale(0.5f, 0.5f, 0.5f);
+            dhl.translate(0.0, 0.75, 0.0);
+            dhl.scale(0.5f, 0.5f, 0.5f);
         }
-        this.renderArmWithItem(akz, ben14, ItemTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, HumanoidArm.RIGHT, cyl, dqt, integer);
-        this.renderArmWithItem(akz, ben13, ItemTransforms.TransformType.THIRD_PERSON_LEFT_HAND, HumanoidArm.LEFT, cyl, dqt, integer);
-        cyl.popPose();
+        this.renderArmWithItem(aoy, bki14, ItemTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, HumanoidArm.RIGHT, dhl, ebz, integer);
+        this.renderArmWithItem(aoy, bki13, ItemTransforms.TransformType.THIRD_PERSON_LEFT_HAND, HumanoidArm.LEFT, dhl, ebz, integer);
+        dhl.popPose();
     }
     
-    private void renderArmWithItem(final LivingEntity akz, final ItemStack ben, final ItemTransforms.TransformType b, final HumanoidArm aky, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        if (ben.isEmpty()) {
+    private void renderArmWithItem(final LivingEntity aoy, final ItemStack bki, final ItemTransforms.TransformType b, final HumanoidArm aou, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        if (bki.isEmpty()) {
             return;
         }
-        cyl.pushPose();
-        this.getParentModel().translateToHand(aky, cyl);
-        cyl.mulPose(Vector3f.XP.rotationDegrees(-90.0f));
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
-        final boolean boolean9 = aky == HumanoidArm.LEFT;
-        cyl.translate((boolean9 ? -1 : 1) / 16.0f, 0.125, -0.625);
-        Minecraft.getInstance().getItemInHandRenderer().renderItem(akz, ben, b, boolean9, cyl, dqt, integer);
-        cyl.popPose();
+        dhl.pushPose();
+        this.getParentModel().translateToHand(aou, dhl);
+        dhl.mulPose(Vector3f.XP.rotationDegrees(-90.0f));
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
+        final boolean boolean9 = aou == HumanoidArm.LEFT;
+        dhl.translate((boolean9 ? -1 : 1) / 16.0f, 0.125, -0.625);
+        Minecraft.getInstance().getItemInHandRenderer().renderItem(aoy, bki, b, boolean9, dhl, ebz, integer);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/LlamaDecorLayer.java b/src/net/minecraft/client/renderer/entity/layers/LlamaDecorLayer.java
index 60279b8..beafc7b 100644
--- a/src/net/minecraft/client/renderer/entity/layers/LlamaDecorLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/LlamaDecorLayer.java
@@ -18,28 +18,28 @@ public class LlamaDecorLayer extends RenderLayer<Llama, LlamaModel<Llama>> {
     private static final ResourceLocation TRADER_LLAMA;
     private final LlamaModel<Llama> model;
     
-    public LlamaDecorLayer(final RenderLayerParent<Llama, LlamaModel<Llama>> dwv) {
-        super(dwv);
+    public LlamaDecorLayer(final RenderLayerParent<Llama, LlamaModel<Llama>> eid) {
+        super(eid);
         this.model = new LlamaModel<Llama>(0.5f);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Llama auh, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final DyeColor bdj12 = auh.getSwag();
-        ResourceLocation sm13;
-        if (bdj12 != null) {
-            sm13 = LlamaDecorLayer.TEXTURE_LOCATION[bdj12.getId()];
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Llama azp, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final DyeColor bje12 = azp.getSwag();
+        ResourceLocation uh13;
+        if (bje12 != null) {
+            uh13 = LlamaDecorLayer.TEXTURE_LOCATION[bje12.getId()];
         }
         else {
-            if (!auh.isTraderLlama()) {
+            if (!azp.isTraderLlama()) {
                 return;
             }
-            sm13 = LlamaDecorLayer.TRADER_LLAMA;
+            uh13 = LlamaDecorLayer.TRADER_LLAMA;
         }
         ((RenderLayer<T, LlamaModel<Llama>>)this).getParentModel().copyPropertiesTo(this.model);
-        this.model.setupAnim(auh, float5, float6, float8, float9, float10);
-        final VertexConsumer cyo14 = dqt.getBuffer(RenderType.entityCutoutNoCull(sm13));
-        this.model.renderToBuffer(cyl, cyo14, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+        this.model.setupAnim(azp, float5, float6, float8, float9, float10);
+        final VertexConsumer dhp14 = ebz.getBuffer(RenderType.entityCutoutNoCull(uh13));
+        this.model.renderToBuffer(dhl, dhp14, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/layers/MushroomCowMushroomLayer.java b/src/net/minecraft/client/renderer/entity/layers/MushroomCowMushroomLayer.java
index aef9466..65a7b21 100644
--- a/src/net/minecraft/client/renderer/entity/layers/MushroomCowMushroomLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/MushroomCowMushroomLayer.java
@@ -14,41 +14,41 @@ import net.minecraft.client.model.CowModel;
 import net.minecraft.world.entity.animal.MushroomCow;
 
 public class MushroomCowMushroomLayer<T extends MushroomCow> extends RenderLayer<T, CowModel<T>> {
-    public MushroomCowMushroomLayer(final RenderLayerParent<T, CowModel<T>> dwv) {
-        super(dwv);
+    public MushroomCowMushroomLayer(final RenderLayerParent<T, CowModel<T>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T atm, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (atm.isBaby() || atm.isInvisible()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T ayu, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (ayu.isBaby() || ayu.isInvisible()) {
             return;
         }
-        final BlockRenderDispatcher drk12 = Minecraft.getInstance().getBlockRenderer();
-        final BlockState byj13 = atm.getMushroomType().getBlockState();
-        final int integer2 = LivingEntityRenderer.getOverlayCoords(atm, 0.0f);
-        cyl.pushPose();
-        cyl.translate(0.20000000298023224, -0.3499999940395355, 0.5);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(-48.0f));
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        cyl.translate(-0.5, -0.5, -0.5);
-        drk12.renderSingleBlock(byj13, cyl, dqt, integer, integer2);
-        cyl.popPose();
-        cyl.pushPose();
-        cyl.translate(0.20000000298023224, -0.3499999940395355, 0.5);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(42.0f));
-        cyl.translate(0.10000000149011612, 0.0, -0.6000000238418579);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(-48.0f));
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        cyl.translate(-0.5, -0.5, -0.5);
-        drk12.renderSingleBlock(byj13, cyl, dqt, integer, integer2);
-        cyl.popPose();
-        cyl.pushPose();
-        this.getParentModel().getHead().translateAndRotate(cyl);
-        cyl.translate(0.0, -0.699999988079071, -0.20000000298023224);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(-78.0f));
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        cyl.translate(-0.5, -0.5, -0.5);
-        drk12.renderSingleBlock(byj13, cyl, dqt, integer, integer2);
-        cyl.popPose();
+        final BlockRenderDispatcher ecq12 = Minecraft.getInstance().getBlockRenderer();
+        final BlockState cfj13 = ayu.getMushroomType().getBlockState();
+        final int integer2 = LivingEntityRenderer.getOverlayCoords(ayu, 0.0f);
+        dhl.pushPose();
+        dhl.translate(0.20000000298023224, -0.3499999940395355, 0.5);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(-48.0f));
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        dhl.translate(-0.5, -0.5, -0.5);
+        ecq12.renderSingleBlock(cfj13, dhl, ebz, integer, integer2);
+        dhl.popPose();
+        dhl.pushPose();
+        dhl.translate(0.20000000298023224, -0.3499999940395355, 0.5);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(42.0f));
+        dhl.translate(0.10000000149011612, 0.0, -0.6000000238418579);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(-48.0f));
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        dhl.translate(-0.5, -0.5, -0.5);
+        ecq12.renderSingleBlock(cfj13, dhl, ebz, integer, integer2);
+        dhl.popPose();
+        dhl.pushPose();
+        this.getParentModel().getHead().translateAndRotate(dhl);
+        dhl.translate(0.0, -0.699999988079071, -0.20000000298023224);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(-78.0f));
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        dhl.translate(-0.5, -0.5, -0.5);
+        ecq12.renderSingleBlock(cfj13, dhl, ebz, integer, integer2);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/PandaHoldsItemLayer.java b/src/net/minecraft/client/renderer/entity/layers/PandaHoldsItemLayer.java
index f5f6828..2b7e33e 100644
--- a/src/net/minecraft/client/renderer/entity/layers/PandaHoldsItemLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/PandaHoldsItemLayer.java
@@ -14,25 +14,25 @@ import net.minecraft.client.model.PandaModel;
 import net.minecraft.world.entity.animal.Panda;
 
 public class PandaHoldsItemLayer extends RenderLayer<Panda, PandaModel<Panda>> {
-    public PandaHoldsItemLayer(final RenderLayerParent<Panda, PandaModel<Panda>> dwv) {
-        super(dwv);
+    public PandaHoldsItemLayer(final RenderLayerParent<Panda, PandaModel<Panda>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Panda ato, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final ItemStack ben12 = ato.getItemBySlot(EquipmentSlot.MAINHAND);
-        if (!ato.isSitting() || ato.isScared()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Panda ayw, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final ItemStack bki12 = ayw.getItemBySlot(EquipmentSlot.MAINHAND);
+        if (!ayw.isSitting() || ayw.isScared()) {
             return;
         }
         float float11 = -0.6f;
         float float12 = 1.4f;
-        if (ato.isEating()) {
+        if (ayw.isEating()) {
             float11 -= 0.2f * Mth.sin(float8 * 0.6f) + 0.2f;
             float12 -= 0.09f * Mth.sin(float8 * 0.6f);
         }
-        cyl.pushPose();
-        cyl.translate(0.10000000149011612, float12, float11);
-        Minecraft.getInstance().getItemInHandRenderer().renderItem(ato, ben12, ItemTransforms.TransformType.GROUND, false, cyl, dqt, integer);
-        cyl.popPose();
+        dhl.pushPose();
+        dhl.translate(0.10000000149011612, float12, float11);
+        Minecraft.getInstance().getItemInHandRenderer().renderItem(ayw, bki12, ItemTransforms.TransformType.GROUND, false, dhl, ebz, integer);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/ParrotOnShoulderLayer.java b/src/net/minecraft/client/renderer/entity/layers/ParrotOnShoulderLayer.java
index 3fabd47..7cf81ae 100644
--- a/src/net/minecraft/client/renderer/entity/layers/ParrotOnShoulderLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/ParrotOnShoulderLayer.java
@@ -16,27 +16,27 @@ import net.minecraft.world.entity.player.Player;
 public class ParrotOnShoulderLayer<T extends Player> extends RenderLayer<T, PlayerModel<T>> {
     private final ParrotModel model;
     
-    public ParrotOnShoulderLayer(final RenderLayerParent<T, PlayerModel<T>> dwv) {
-        super(dwv);
+    public ParrotOnShoulderLayer(final RenderLayerParent<T, PlayerModel<T>> eid) {
+        super(eid);
         this.model = new ParrotModel();
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T ayj, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        this.render(cyl, dqt, integer, ayj, float5, float6, float9, float10, true);
-        this.render(cyl, dqt, integer, ayj, float5, float6, float9, float10, false);
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T bec, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        this.render(dhl, ebz, integer, bec, float5, float6, float9, float10, true);
+        this.render(dhl, ebz, integer, bec, float5, float6, float9, float10, false);
     }
     
-    private void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T ayj, final float float5, final float float6, final float float7, final float float8, final boolean boolean9) {
-        final CompoundTag jt11 = boolean9 ? ayj.getShoulderEntityLeft() : ayj.getShoulderEntityRight();
+    private void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T bec, final float float5, final float float6, final float float7, final float float8, final boolean boolean9) {
+        final CompoundTag le11 = boolean9 ? bec.getShoulderEntityLeft() : bec.getShoulderEntityRight();
         final CompoundTag compoundTag;
-        final VertexConsumer cyo13;
-        EntityType.byString(jt11.getString("id")).filter(aku -> aku == EntityType.PARROT).ifPresent(aku -> {
-            cyl.pushPose();
-            cyl.translate(boolean9 ? 0.4000000059604645 : -0.4000000059604645, ayj.isCrouching() ? -1.2999999523162842 : -1.5, 0.0);
-            cyo13 = dqt.getBuffer(this.model.renderType(ParrotRenderer.PARROT_LOCATIONS[compoundTag.getInt("Variant")]));
-            this.model.renderOnShoulder(cyl, cyo13, integer, OverlayTexture.NO_OVERLAY, float5, float6, float7, float8, ayj.tickCount);
-            cyl.popPose();
+        final VertexConsumer dhp13;
+        EntityType.byString(le11.getString("id")).filter(aoq -> aoq == EntityType.PARROT).ifPresent(aoq -> {
+            dhl.pushPose();
+            dhl.translate(boolean9 ? 0.4000000059604645 : -0.4000000059604645, bec.isCrouching() ? -1.2999999523162842 : -1.5, 0.0);
+            dhp13 = ebz.getBuffer(this.model.renderType(ParrotRenderer.PARROT_LOCATIONS[compoundTag.getInt("Variant")]));
+            this.model.renderOnShoulder(dhl, dhp13, integer, OverlayTexture.NO_OVERLAY, float5, float6, float7, float8, bec.tickCount);
+            dhl.popPose();
         });
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/PhantomEyesLayer.java b/src/net/minecraft/client/renderer/entity/layers/PhantomEyesLayer.java
index 3bc768d..0814894 100644
--- a/src/net/minecraft/client/renderer/entity/layers/PhantomEyesLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/PhantomEyesLayer.java
@@ -9,8 +9,8 @@ import net.minecraft.world.entity.Entity;
 public class PhantomEyesLayer<T extends Entity> extends EyesLayer<T, PhantomModel<T>> {
     private static final RenderType PHANTOM_EYES;
     
-    public PhantomEyesLayer(final RenderLayerParent<T, PhantomModel<T>> dwv) {
-        super(dwv);
+    public PhantomEyesLayer(final RenderLayerParent<T, PhantomModel<T>> eid) {
+        super(eid);
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/entity/layers/PigSaddleLayer.java b/src/net/minecraft/client/renderer/entity/layers/PigSaddleLayer.java
deleted file mode 100644
index 64be63f..0000000
--- a/src/net/minecraft/client/renderer/entity/layers/PigSaddleLayer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.minecraft.client.renderer.entity.layers;
-
-import net.minecraft.world.entity.Entity;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.model.EntityModel;
-import net.minecraft.client.renderer.MultiBufferSource;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.renderer.entity.RenderLayerParent;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.client.model.PigModel;
-import net.minecraft.world.entity.animal.Pig;
-
-public class PigSaddleLayer extends RenderLayer<Pig, PigModel<Pig>> {
-    private static final ResourceLocation SADDLE_LOCATION;
-    private final PigModel<Pig> model;
-    
-    public PigSaddleLayer(final RenderLayerParent<Pig, PigModel<Pig>> dwv) {
-        super(dwv);
-        this.model = new PigModel<Pig>(0.5f);
-    }
-    
-    @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Pig atq, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (!atq.hasSaddle()) {
-            return;
-        }
-        ((RenderLayer<T, PigModel<Pig>>)this).getParentModel().copyPropertiesTo(this.model);
-        this.model.prepareMobModel(atq, float5, float6, float7);
-        this.model.setupAnim(atq, float5, float6, float8, float9, float10);
-        final VertexConsumer cyo12 = dqt.getBuffer(RenderType.entityCutoutNoCull(PigSaddleLayer.SADDLE_LOCATION));
-        this.model.renderToBuffer(cyl, cyo12, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
-    }
-    
-    static {
-        SADDLE_LOCATION = new ResourceLocation("textures/entity/pig/pig_saddle.png");
-    }
-}
diff --git a/src/net/minecraft/client/renderer/entity/layers/RenderLayer.java b/src/net/minecraft/client/renderer/entity/layers/RenderLayer.java
index e6d12df..4b4c875 100644
--- a/src/net/minecraft/client/renderer/entity/layers/RenderLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/RenderLayer.java
@@ -14,31 +14,31 @@ import net.minecraft.world.entity.Entity;
 public abstract class RenderLayer<T extends Entity, M extends EntityModel<T>> {
     private final RenderLayerParent<T, M> renderer;
     
-    public RenderLayer(final RenderLayerParent<T, M> dwv) {
-        this.renderer = dwv;
+    public RenderLayer(final RenderLayerParent<T, M> eid) {
+        this.renderer = eid;
     }
     
-    protected static <T extends LivingEntity> void coloredCutoutModelCopyLayerRender(final EntityModel<T> dla1, final EntityModel<T> dla2, final ResourceLocation sm, final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float8, final float float9, final float float10, final float float11, final float float12, final float float13, final float float14, final float float15, final float float16) {
-        if (!akz.isInvisible()) {
-            dla1.copyPropertiesTo(dla2);
-            dla2.prepareMobModel(akz, float8, float9, float13);
-            dla2.setupAnim(akz, float8, float9, float10, float11, float12);
-            RenderLayer.<T>renderColoredCutoutModel(dla2, sm, cyl, dqt, integer, akz, float14, float15, float16);
+    protected static <T extends LivingEntity> void coloredCutoutModelCopyLayerRender(final EntityModel<T> dvv1, final EntityModel<T> dvv2, final ResourceLocation uh, final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float8, final float float9, final float float10, final float float11, final float float12, final float float13, final float float14, final float float15, final float float16) {
+        if (!aoy.isInvisible()) {
+            dvv1.copyPropertiesTo(dvv2);
+            dvv2.prepareMobModel(aoy, float8, float9, float13);
+            dvv2.setupAnim(aoy, float8, float9, float10, float11, float12);
+            RenderLayer.<T>renderColoredCutoutModel(dvv2, uh, dhl, ebz, integer, aoy, float14, float15, float16);
         }
     }
     
-    protected static <T extends LivingEntity> void renderColoredCutoutModel(final EntityModel<T> dla, final ResourceLocation sm, final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float7, final float float8, final float float9) {
-        final VertexConsumer cyo10 = dqt.getBuffer(RenderType.entityCutoutNoCull(sm));
-        dla.renderToBuffer(cyl, cyo10, integer, LivingEntityRenderer.getOverlayCoords(akz, 0.0f), float7, float8, float9, 1.0f);
+    protected static <T extends LivingEntity> void renderColoredCutoutModel(final EntityModel<T> dvv, final ResourceLocation uh, final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float7, final float float8, final float float9) {
+        final VertexConsumer dhp10 = ebz.getBuffer(RenderType.entityCutoutNoCull(uh));
+        dvv.renderToBuffer(dhl, dhp10, integer, LivingEntityRenderer.getOverlayCoords(aoy, 0.0f), float7, float8, float9, 1.0f);
     }
     
     public M getParentModel() {
         return this.renderer.getModel();
     }
     
-    protected ResourceLocation getTextureLocation(final T akq) {
-        return this.renderer.getTextureLocation(akq);
+    protected ResourceLocation getTextureLocation(final T aom) {
+        return this.renderer.getTextureLocation(aom);
     }
     
-    public abstract void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akq, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10);
+    public abstract void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aom, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10);
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/SaddleLayer.java b/src/net/minecraft/client/renderer/entity/layers/SaddleLayer.java
new file mode 100644
index 0000000..76a1929
--- /dev/null
+++ b/src/net/minecraft/client/renderer/entity/layers/SaddleLayer.java
@@ -0,0 +1,34 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.client.renderer.texture.OverlayTexture;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.world.entity.Saddleable;
+import net.minecraft.client.renderer.MultiBufferSource;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.entity.RenderLayerParent;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.model.EntityModel;
+
+public class SaddleLayer<T extends Entity, M extends EntityModel<T>> extends RenderLayer<T, M> {
+    private final ResourceLocation textureLocation;
+    private final M model;
+    
+    public SaddleLayer(final RenderLayerParent<T, M> eid, final M dvv, final ResourceLocation uh) {
+        super(eid);
+        this.model = dvv;
+        this.textureLocation = uh;
+    }
+    
+    @Override
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aom, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (!((Saddleable)aom).isSaddled()) {
+            return;
+        }
+        this.getParentModel().copyPropertiesTo(this.model);
+        this.model.prepareMobModel(aom, float5, float6, float7);
+        this.model.setupAnim(aom, float5, float6, float8, float9, float10);
+        final VertexConsumer dhp12 = ebz.getBuffer(RenderType.entityCutoutNoCull(this.textureLocation));
+        this.model.renderToBuffer(dhl, dhp12, integer, OverlayTexture.NO_OVERLAY, 1.0f, 1.0f, 1.0f, 1.0f);
+    }
+}
diff --git a/src/net/minecraft/client/renderer/entity/layers/SheepFurLayer.java b/src/net/minecraft/client/renderer/entity/layers/SheepFurLayer.java
index b048721..73961aa 100644
--- a/src/net/minecraft/client/renderer/entity/layers/SheepFurLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/SheepFurLayer.java
@@ -15,26 +15,26 @@ public class SheepFurLayer extends RenderLayer<Sheep, SheepModel<Sheep>> {
     private static final ResourceLocation SHEEP_FUR_LOCATION;
     private final SheepFurModel<Sheep> model;
     
-    public SheepFurLayer(final RenderLayerParent<Sheep, SheepModel<Sheep>> dwv) {
-        super(dwv);
+    public SheepFurLayer(final RenderLayerParent<Sheep, SheepModel<Sheep>> eid) {
+        super(eid);
         this.model = new SheepFurModel<Sheep>();
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Sheep atv, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (atv.isSheared() || atv.isInvisible()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Sheep azd, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (azd.isSheared() || azd.isInvisible()) {
             return;
         }
         float float12;
         float float13;
         float float14;
-        if (atv.hasCustomName() && "jeb_".equals(atv.getName().getContents())) {
+        if (azd.hasCustomName() && "jeb_".equals(azd.getName().getContents())) {
             final int integer2 = 25;
-            final int integer3 = atv.tickCount / 25 + atv.getId();
+            final int integer3 = azd.tickCount / 25 + azd.getId();
             final int integer4 = DyeColor.values().length;
             final int integer5 = integer3 % integer4;
             final int integer6 = (integer3 + 1) % integer4;
-            final float float11 = (atv.tickCount % 25 + float7) / 25.0f;
+            final float float11 = (azd.tickCount % 25 + float7) / 25.0f;
             final float[] arr21 = Sheep.getColorArray(DyeColor.byId(integer5));
             final float[] arr22 = Sheep.getColorArray(DyeColor.byId(integer6));
             float12 = arr21[0] * (1.0f - float11) + arr22[0] * float11;
@@ -42,12 +42,12 @@ public class SheepFurLayer extends RenderLayer<Sheep, SheepModel<Sheep>> {
             float14 = arr21[2] * (1.0f - float11) + arr22[2] * float11;
         }
         else {
-            final float[] arr23 = Sheep.getColorArray(atv.getColor());
+            final float[] arr23 = Sheep.getColorArray(azd.getColor());
             float12 = arr23[0];
             float13 = arr23[1];
             float14 = arr23[2];
         }
-        RenderLayer.<Sheep>coloredCutoutModelCopyLayerRender(((RenderLayer<T, EntityModel<Sheep>>)this).getParentModel(), this.model, SheepFurLayer.SHEEP_FUR_LOCATION, cyl, dqt, integer, atv, float5, float6, float8, float9, float10, float7, float12, float13, float14);
+        RenderLayer.<Sheep>coloredCutoutModelCopyLayerRender(((RenderLayer<T, EntityModel<Sheep>>)this).getParentModel(), this.model, SheepFurLayer.SHEEP_FUR_LOCATION, dhl, ebz, integer, azd, float5, float6, float8, float9, float10, float7, float12, float13, float14);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/layers/ShulkerHeadLayer.java b/src/net/minecraft/client/renderer/entity/layers/ShulkerHeadLayer.java
index c65b1e6..91b91d2 100644
--- a/src/net/minecraft/client/renderer/entity/layers/ShulkerHeadLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/ShulkerHeadLayer.java
@@ -4,7 +4,6 @@ import net.minecraft.world.entity.Entity;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.DyeColor;
-import net.minecraft.client.model.geom.ModelPart;
 import com.mojang.math.Quaternion;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;
@@ -17,33 +16,24 @@ import net.minecraft.client.model.ShulkerModel;
 import net.minecraft.world.entity.monster.Shulker;
 
 public class ShulkerHeadLayer extends RenderLayer<Shulker, ShulkerModel<Shulker>> {
-    public ShulkerHeadLayer(final RenderLayerParent<Shulker, ShulkerModel<Shulker>> dwv) {
-        super(dwv);
+    public ShulkerHeadLayer(final RenderLayerParent<Shulker, ShulkerModel<Shulker>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Shulker axe, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        cyl.pushPose();
-        cyl.translate(0.0, 1.0, 0.0);
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        final Quaternion c12 = axe.getAttachFace().getOpposite().getRotation();
-        c12.conj();
-        cyl.mulPose(c12);
-        cyl.scale(-1.0f, -1.0f, 1.0f);
-        cyl.translate(0.0, -1.0, 0.0);
-        final ModelPart dni13 = ((RenderLayer<T, ShulkerModel>)this).getParentModel().getHead();
-        dni13.yRot = float9 * 0.017453292f;
-        dni13.xRot = float10 * 0.017453292f;
-        final DyeColor bdj14 = axe.getColor();
-        ResourceLocation sm15;
-        if (bdj14 == null) {
-            sm15 = ShulkerRenderer.DEFAULT_TEXTURE_LOCATION;
-        }
-        else {
-            sm15 = ShulkerRenderer.TEXTURE_LOCATION[bdj14.getId()];
-        }
-        final VertexConsumer cyo16 = dqt.getBuffer(RenderType.entitySolid(sm15));
-        dni13.render(cyl, cyo16, integer, LivingEntityRenderer.getOverlayCoords(axe, 0.0f));
-        cyl.popPose();
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Shulker bch, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        dhl.pushPose();
+        dhl.translate(0.0, 1.0, 0.0);
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        final Quaternion d12 = bch.getAttachFace().getOpposite().getRotation();
+        d12.conj();
+        dhl.mulPose(d12);
+        dhl.scale(-1.0f, -1.0f, 1.0f);
+        dhl.translate(0.0, -1.0, 0.0);
+        final DyeColor bje13 = bch.getColor();
+        final ResourceLocation uh14 = (bje13 == null) ? ShulkerRenderer.DEFAULT_TEXTURE_LOCATION : ShulkerRenderer.TEXTURE_LOCATION[bje13.getId()];
+        final VertexConsumer dhp15 = ebz.getBuffer(RenderType.entitySolid(uh14));
+        ((RenderLayer<T, ShulkerModel>)this).getParentModel().getHead().render(dhl, dhp15, integer, LivingEntityRenderer.getOverlayCoords(bch, 0.0f));
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/SlimeOuterLayer.java b/src/net/minecraft/client/renderer/entity/layers/SlimeOuterLayer.java
index 4b0c47a..07d3cbc 100644
--- a/src/net/minecraft/client/renderer/entity/layers/SlimeOuterLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/SlimeOuterLayer.java
@@ -14,20 +14,20 @@ import net.minecraft.world.entity.LivingEntity;
 public class SlimeOuterLayer<T extends LivingEntity> extends RenderLayer<T, SlimeModel<T>> {
     private final EntityModel<T> model;
     
-    public SlimeOuterLayer(final RenderLayerParent<T, SlimeModel<T>> dwv) {
-        super(dwv);
+    public SlimeOuterLayer(final RenderLayerParent<T, SlimeModel<T>> eid) {
+        super(eid);
         this.model = new SlimeModel<T>(0);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (akz.isInvisible()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (aoy.isInvisible()) {
             return;
         }
         this.getParentModel().copyPropertiesTo(this.model);
-        this.model.prepareMobModel(akz, float5, float6, float7);
-        this.model.setupAnim(akz, float5, float6, float8, float9, float10);
-        final VertexConsumer cyo12 = dqt.getBuffer(RenderType.entityTranslucent(this.getTextureLocation(akz)));
-        this.model.renderToBuffer(cyl, cyo12, integer, LivingEntityRenderer.getOverlayCoords(akz, 0.0f), 1.0f, 1.0f, 1.0f, 1.0f);
+        this.model.prepareMobModel(aoy, float5, float6, float7);
+        this.model.setupAnim(aoy, float5, float6, float8, float9, float10);
+        final VertexConsumer dhp12 = ebz.getBuffer(RenderType.entityTranslucent(this.getTextureLocation(aoy)));
+        this.model.renderToBuffer(dhl, dhp12, integer, LivingEntityRenderer.getOverlayCoords(aoy, 0.0f), 1.0f, 1.0f, 1.0f, 1.0f);
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/SnowGolemHeadLayer.java b/src/net/minecraft/client/renderer/entity/layers/SnowGolemHeadLayer.java
index 9fd17fe..0a5f624 100644
--- a/src/net/minecraft/client/renderer/entity/layers/SnowGolemHeadLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/SnowGolemHeadLayer.java
@@ -16,23 +16,23 @@ import net.minecraft.client.model.SnowGolemModel;
 import net.minecraft.world.entity.animal.SnowGolem;
 
 public class SnowGolemHeadLayer extends RenderLayer<SnowGolem, SnowGolemModel<SnowGolem>> {
-    public SnowGolemHeadLayer(final RenderLayerParent<SnowGolem, SnowGolemModel<SnowGolem>> dwv) {
-        super(dwv);
+    public SnowGolemHeadLayer(final RenderLayerParent<SnowGolem, SnowGolemModel<SnowGolem>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final SnowGolem atx, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (atx.isInvisible() || !atx.hasPumpkin()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final SnowGolem azf, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (azf.isInvisible() || !azf.hasPumpkin()) {
             return;
         }
-        cyl.pushPose();
-        ((RenderLayer<T, SnowGolemModel>)this).getParentModel().getHead().translateAndRotate(cyl);
+        dhl.pushPose();
+        ((RenderLayer<T, SnowGolemModel>)this).getParentModel().getHead().translateAndRotate(dhl);
         final float float11 = 0.625f;
-        cyl.translate(0.0, -0.34375, 0.0);
-        cyl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
-        cyl.scale(0.625f, -0.625f, -0.625f);
-        final ItemStack ben13 = new ItemStack(Blocks.CARVED_PUMPKIN);
-        Minecraft.getInstance().getItemRenderer().renderStatic(atx, ben13, ItemTransforms.TransformType.HEAD, false, cyl, dqt, atx.level, integer, LivingEntityRenderer.getOverlayCoords(atx, 0.0f));
-        cyl.popPose();
+        dhl.translate(0.0, -0.34375, 0.0);
+        dhl.mulPose(Vector3f.YP.rotationDegrees(180.0f));
+        dhl.scale(0.625f, -0.625f, -0.625f);
+        final ItemStack bki13 = new ItemStack(Blocks.CARVED_PUMPKIN);
+        Minecraft.getInstance().getItemRenderer().renderStatic(azf, bki13, ItemTransforms.TransformType.HEAD, false, dhl, ebz, azf.level, integer, LivingEntityRenderer.getOverlayCoords(azf, 0.0f));
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/SpiderEyesLayer.java b/src/net/minecraft/client/renderer/entity/layers/SpiderEyesLayer.java
index e12ee55..b63ca7d 100644
--- a/src/net/minecraft/client/renderer/entity/layers/SpiderEyesLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/SpiderEyesLayer.java
@@ -9,8 +9,8 @@ import net.minecraft.world.entity.Entity;
 public class SpiderEyesLayer<T extends Entity, M extends SpiderModel<T>> extends EyesLayer<T, M> {
     private static final RenderType SPIDER_EYES;
     
-    public SpiderEyesLayer(final RenderLayerParent<T, M> dwv) {
-        super(dwv);
+    public SpiderEyesLayer(final RenderLayerParent<T, M> eid) {
+        super(eid);
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/entity/layers/SpinAttackEffectLayer.java b/src/net/minecraft/client/renderer/entity/layers/SpinAttackEffectLayer.java
index 5de1382..be61d34 100644
--- a/src/net/minecraft/client/renderer/entity/layers/SpinAttackEffectLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/SpinAttackEffectLayer.java
@@ -17,26 +17,26 @@ public class SpinAttackEffectLayer<T extends LivingEntity> extends RenderLayer<T
     public static final ResourceLocation TEXTURE;
     private final ModelPart box;
     
-    public SpinAttackEffectLayer(final RenderLayerParent<T, PlayerModel<T>> dwv) {
-        super(dwv);
+    public SpinAttackEffectLayer(final RenderLayerParent<T, PlayerModel<T>> eid) {
+        super(eid);
         (this.box = new ModelPart(64, 64, 0, 0)).addBox(-8.0f, -16.0f, -8.0f, 16.0f, 32.0f, 16.0f);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (!akz.isAutoSpinAttack()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (!aoy.isAutoSpinAttack()) {
             return;
         }
-        final VertexConsumer cyo12 = dqt.getBuffer(RenderType.entityCutoutNoCull(SpinAttackEffectLayer.TEXTURE));
+        final VertexConsumer dhp12 = ebz.getBuffer(RenderType.entityCutoutNoCull(SpinAttackEffectLayer.TEXTURE));
         for (int integer2 = 0; integer2 < 3; ++integer2) {
-            cyl.pushPose();
+            dhl.pushPose();
             final float float11 = float8 * -(45 + integer2 * 5);
-            cyl.mulPose(Vector3f.YP.rotationDegrees(float11));
+            dhl.mulPose(Vector3f.YP.rotationDegrees(float11));
             final float float12 = 0.75f * integer2;
-            cyl.scale(float12, float12, float12);
-            cyl.translate(0.0, -0.2f + 0.6f * integer2, 0.0);
-            this.box.render(cyl, cyo12, integer, OverlayTexture.NO_OVERLAY);
-            cyl.popPose();
+            dhl.scale(float12, float12, float12);
+            dhl.translate(0.0, -0.2f + 0.6f * integer2, 0.0);
+            this.box.render(dhl, dhp12, integer, OverlayTexture.NO_OVERLAY);
+            dhl.popPose();
         }
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/layers/StrayClothingLayer.java b/src/net/minecraft/client/renderer/entity/layers/StrayClothingLayer.java
index 63b518b..91a86a8 100644
--- a/src/net/minecraft/client/renderer/entity/layers/StrayClothingLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/StrayClothingLayer.java
@@ -12,14 +12,14 @@ public class StrayClothingLayer<T extends Mob, M extends EntityModel<T>> extends
     private static final ResourceLocation STRAY_CLOTHES_LOCATION;
     private final SkeletonModel<T> layerModel;
     
-    public StrayClothingLayer(final RenderLayerParent<T, M> dwv) {
-        super(dwv);
+    public StrayClothingLayer(final RenderLayerParent<T, M> eid) {
+        super(eid);
         this.layerModel = new SkeletonModel<T>(0.25f, true);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T ala, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        RenderLayer.<T>coloredCutoutModelCopyLayerRender(this.getParentModel(), this.layerModel, StrayClothingLayer.STRAY_CLOTHES_LOCATION, cyl, dqt, integer, ala, float5, float6, float8, float9, float10, float7, 1.0f, 1.0f, 1.0f);
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        RenderLayer.<T>coloredCutoutModelCopyLayerRender(this.getParentModel(), this.layerModel, StrayClothingLayer.STRAY_CLOTHES_LOCATION, dhl, ebz, integer, aoz, float5, float6, float8, float9, float10, float7, 1.0f, 1.0f, 1.0f);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/layers/StuckInBodyLayer.java b/src/net/minecraft/client/renderer/entity/layers/StuckInBodyLayer.java
index 5d823ba..16cb145 100644
--- a/src/net/minecraft/client/renderer/entity/layers/StuckInBodyLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/StuckInBodyLayer.java
@@ -12,38 +12,38 @@ import net.minecraft.client.model.PlayerModel;
 import net.minecraft.world.entity.LivingEntity;
 
 public abstract class StuckInBodyLayer<T extends LivingEntity, M extends PlayerModel<T>> extends RenderLayer<T, M> {
-    public StuckInBodyLayer(final LivingEntityRenderer<T, M> dwc) {
-        super(dwc);
+    public StuckInBodyLayer(final LivingEntityRenderer<T, M> ehk) {
+        super(ehk);
     }
     
-    protected abstract int numStuck(final T akz);
+    protected abstract int numStuck(final T aoy);
     
-    protected abstract void renderStuckItem(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Entity akq, final float float5, final float float6, final float float7, final float float8);
+    protected abstract void renderStuckItem(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Entity aom, final float float5, final float float6, final float float7, final float float8);
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final int integer2 = this.numStuck(akz);
-        final Random random13 = new Random(akz.getId());
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final int integer2 = this.numStuck(aoy);
+        final Random random13 = new Random(aoy.getId());
         if (integer2 <= 0) {
             return;
         }
         for (int integer3 = 0; integer3 < integer2; ++integer3) {
-            cyl.pushPose();
-            final ModelPart dni15 = this.getParentModel().getRandomModelPart(random13);
-            final ModelPart.Cube a16 = dni15.getRandomCube(random13);
-            dni15.translateAndRotate(cyl);
+            dhl.pushPose();
+            final ModelPart dyg15 = this.getParentModel().getRandomModelPart(random13);
+            final ModelPart.Cube a16 = dyg15.getRandomCube(random13);
+            dyg15.translateAndRotate(dhl);
             float float11 = random13.nextFloat();
             float float12 = random13.nextFloat();
             float float13 = random13.nextFloat();
             final float float14 = Mth.lerp(float11, a16.minX, a16.maxX) / 16.0f;
             final float float15 = Mth.lerp(float12, a16.minY, a16.maxY) / 16.0f;
             final float float16 = Mth.lerp(float13, a16.minZ, a16.maxZ) / 16.0f;
-            cyl.translate(float14, float15, float16);
+            dhl.translate(float14, float15, float16);
             float11 = -1.0f * (float11 * 2.0f - 1.0f);
             float12 = -1.0f * (float12 * 2.0f - 1.0f);
             float13 = -1.0f * (float13 * 2.0f - 1.0f);
-            this.renderStuckItem(cyl, dqt, integer, akz, float11, float12, float13, float7);
-            cyl.popPose();
+            this.renderStuckItem(dhl, ebz, integer, aoy, float11, float12, float13, float7);
+            dhl.popPose();
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/TropicalFishPatternLayer.java b/src/net/minecraft/client/renderer/entity/layers/TropicalFishPatternLayer.java
index 8dd2c7b..8bfea6a 100644
--- a/src/net/minecraft/client/renderer/entity/layers/TropicalFishPatternLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/TropicalFishPatternLayer.java
@@ -13,16 +13,16 @@ public class TropicalFishPatternLayer extends RenderLayer<TropicalFish, EntityMo
     private final TropicalFishModelA<TropicalFish> modelA;
     private final TropicalFishModelB<TropicalFish> modelB;
     
-    public TropicalFishPatternLayer(final RenderLayerParent<TropicalFish, EntityModel<TropicalFish>> dwv) {
-        super(dwv);
+    public TropicalFishPatternLayer(final RenderLayerParent<TropicalFish, EntityModel<TropicalFish>> eid) {
+        super(eid);
         this.modelA = new TropicalFishModelA<TropicalFish>(0.008f);
         this.modelB = new TropicalFishModelB<TropicalFish>(0.008f);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final TropicalFish atz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final EntityModel<TropicalFish> dla12 = (EntityModel<TropicalFish>)((atz.getBaseVariant() == 0) ? this.modelA : this.modelB);
-        final float[] arr13 = atz.getPatternColor();
-        RenderLayer.<TropicalFish>coloredCutoutModelCopyLayerRender(((RenderLayer<T, EntityModel<TropicalFish>>)this).getParentModel(), dla12, atz.getPatternTextureLocation(), cyl, dqt, integer, atz, float5, float6, float8, float9, float10, float7, arr13[0], arr13[1], arr13[2]);
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final TropicalFish azh, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final EntityModel<TropicalFish> dvv12 = (EntityModel<TropicalFish>)((azh.getBaseVariant() == 0) ? this.modelA : this.modelB);
+        final float[] arr13 = azh.getPatternColor();
+        RenderLayer.<TropicalFish>coloredCutoutModelCopyLayerRender(((RenderLayer<T, EntityModel<TropicalFish>>)this).getParentModel(), dvv12, azh.getPatternTextureLocation(), dhl, ebz, integer, azh, float5, float6, float8, float9, float10, float7, arr13[0], arr13[1], arr13[2]);
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/VillagerProfessionLayer.java b/src/net/minecraft/client/renderer/entity/layers/VillagerProfessionLayer.java
index 0c3a974..dc23e85 100644
--- a/src/net/minecraft/client/renderer/entity/layers/VillagerProfessionLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/VillagerProfessionLayer.java
@@ -34,56 +34,56 @@ public class VillagerProfessionLayer<T extends LivingEntity, M extends EntityMod
     private final ReloadableResourceManager resourceManager;
     private final String path;
     
-    public VillagerProfessionLayer(final RenderLayerParent<T, M> dwv, final ReloadableResourceManager yz, final String string) {
-        super(dwv);
+    public VillagerProfessionLayer(final RenderLayerParent<T, M> eid, final ReloadableResourceManager aba, final String string) {
+        super(eid);
         this.typeHatCache = (Object2ObjectMap<VillagerType, VillagerMetaDataSection.Hat>)new Object2ObjectOpenHashMap();
         this.professionHatCache = (Object2ObjectMap<VillagerProfession, VillagerMetaDataSection.Hat>)new Object2ObjectOpenHashMap();
-        this.resourceManager = yz;
+        this.resourceManager = aba;
         this.path = string;
-        yz.registerReloadListener(this);
+        aba.registerReloadListener(this);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (((Entity)akz).isInvisible()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (((Entity)aoy).isInvisible()) {
             return;
         }
-        final VillagerData axx12 = ((VillagerDataHolder)akz).getVillagerData();
-        final VillagerType ayb13 = axx12.getType();
-        final VillagerProfession axz14 = axx12.getProfession();
-        final VillagerMetaDataSection.Hat a15 = this.<VillagerType>getHatData(this.typeHatCache, "type", Registry.VILLAGER_TYPE, ayb13);
-        final VillagerMetaDataSection.Hat a16 = this.<VillagerProfession>getHatData(this.professionHatCache, "profession", Registry.VILLAGER_PROFESSION, axz14);
-        final M dla17 = this.getParentModel();
-        ((VillagerHeadModel)dla17).hatVisible(a16 == VillagerMetaDataSection.Hat.NONE || (a16 == VillagerMetaDataSection.Hat.PARTIAL && a15 != VillagerMetaDataSection.Hat.FULL));
-        final ResourceLocation sm18 = this.getResourceLocation("type", Registry.VILLAGER_TYPE.getKey(ayb13));
-        RenderLayer.<T>renderColoredCutoutModel((net.minecraft.client.model.EntityModel<T>)dla17, sm18, cyl, dqt, integer, akz, 1.0f, 1.0f, 1.0f);
-        ((VillagerHeadModel)dla17).hatVisible(true);
-        if (axz14 != VillagerProfession.NONE && !((LivingEntity)akz).isBaby()) {
-            final ResourceLocation sm19 = this.getResourceLocation("profession", Registry.VILLAGER_PROFESSION.getKey(axz14));
-            RenderLayer.<T>renderColoredCutoutModel((net.minecraft.client.model.EntityModel<T>)dla17, sm19, cyl, dqt, integer, akz, 1.0f, 1.0f, 1.0f);
-            if (axz14 != VillagerProfession.NITWIT) {
-                final ResourceLocation sm20 = this.getResourceLocation("profession_level", (ResourceLocation)VillagerProfessionLayer.LEVEL_LOCATIONS.get(Mth.clamp(axx12.getLevel(), 1, VillagerProfessionLayer.LEVEL_LOCATIONS.size())));
-                RenderLayer.<T>renderColoredCutoutModel((net.minecraft.client.model.EntityModel<T>)dla17, sm20, cyl, dqt, integer, akz, 1.0f, 1.0f, 1.0f);
+        final VillagerData bdq12 = ((VillagerDataHolder)aoy).getVillagerData();
+        final VillagerType bdu13 = bdq12.getType();
+        final VillagerProfession bds14 = bdq12.getProfession();
+        final VillagerMetaDataSection.Hat a15 = this.<VillagerType>getHatData(this.typeHatCache, "type", Registry.VILLAGER_TYPE, bdu13);
+        final VillagerMetaDataSection.Hat a16 = this.<VillagerProfession>getHatData(this.professionHatCache, "profession", Registry.VILLAGER_PROFESSION, bds14);
+        final M dvv17 = this.getParentModel();
+        ((VillagerHeadModel)dvv17).hatVisible(a16 == VillagerMetaDataSection.Hat.NONE || (a16 == VillagerMetaDataSection.Hat.PARTIAL && a15 != VillagerMetaDataSection.Hat.FULL));
+        final ResourceLocation uh18 = this.getResourceLocation("type", Registry.VILLAGER_TYPE.getKey(bdu13));
+        RenderLayer.<T>renderColoredCutoutModel((net.minecraft.client.model.EntityModel<T>)dvv17, uh18, dhl, ebz, integer, aoy, 1.0f, 1.0f, 1.0f);
+        ((VillagerHeadModel)dvv17).hatVisible(true);
+        if (bds14 != VillagerProfession.NONE && !((LivingEntity)aoy).isBaby()) {
+            final ResourceLocation uh19 = this.getResourceLocation("profession", Registry.VILLAGER_PROFESSION.getKey(bds14));
+            RenderLayer.<T>renderColoredCutoutModel((net.minecraft.client.model.EntityModel<T>)dvv17, uh19, dhl, ebz, integer, aoy, 1.0f, 1.0f, 1.0f);
+            if (bds14 != VillagerProfession.NITWIT) {
+                final ResourceLocation uh20 = this.getResourceLocation("profession_level", (ResourceLocation)VillagerProfessionLayer.LEVEL_LOCATIONS.get(Mth.clamp(bdq12.getLevel(), 1, VillagerProfessionLayer.LEVEL_LOCATIONS.size())));
+                RenderLayer.<T>renderColoredCutoutModel((net.minecraft.client.model.EntityModel<T>)dvv17, uh20, dhl, ebz, integer, aoy, 1.0f, 1.0f, 1.0f);
             }
         }
     }
     
-    private ResourceLocation getResourceLocation(final String string, final ResourceLocation sm) {
-        return new ResourceLocation(sm.getNamespace(), "textures/entity/" + this.path + "/" + string + "/" + sm.getPath() + ".png");
+    private ResourceLocation getResourceLocation(final String string, final ResourceLocation uh) {
+        return new ResourceLocation(uh.getNamespace(), "textures/entity/" + this.path + "/" + string + "/" + uh.getPath() + ".png");
     }
     
-    public <K> VillagerMetaDataSection.Hat getHatData(final Object2ObjectMap<K, VillagerMetaDataSection.Hat> object2ObjectMap, final String string, final DefaultedRegistry<K> fo, final K object) {
-        Resource za6;
-        VillagerMetaDataSection ebl8;
+    public <K> VillagerMetaDataSection.Hat getHatData(final Object2ObjectMap<K, VillagerMetaDataSection.Hat> object2ObjectMap, final String string, final DefaultedRegistry<K> fy, final K object) {
+        Resource abb6;
+        VillagerMetaDataSection emx8;
         final VillagerMetaDataSection.Hat hat;
         final Throwable t2;
         return (VillagerMetaDataSection.Hat)object2ObjectMap.computeIfAbsent(object, object4 -> {
             try {
-                za6 = this.resourceManager.getResource(this.getResourceLocation(string, fo.getKey(object)));
+                abb6 = this.resourceManager.getResource(this.getResourceLocation(string, fy.getKey(object)));
                 try {
-                    ebl8 = za6.<VillagerMetaDataSection>getMetadata((MetadataSectionSerializer<VillagerMetaDataSection>)VillagerMetaDataSection.SERIALIZER);
-                    if (ebl8 != null) {
-                        ebl8.getHat();
+                    emx8 = abb6.<VillagerMetaDataSection>getMetadata((MetadataSectionSerializer<VillagerMetaDataSection>)VillagerMetaDataSection.SERIALIZER);
+                    if (emx8 != null) {
+                        emx8.getHat();
                         return hat;
                     }
                 }
@@ -91,17 +91,17 @@ public class VillagerProfessionLayer<T extends LivingEntity, M extends EntityMod
                     throw t;
                 }
                 finally {
-                    if (za6 != null) {
+                    if (abb6 != null) {
                         if (t2 != null) {
                             try {
-                                za6.close();
+                                abb6.close();
                             }
                             catch (Throwable exception) {
                                 t2.addSuppressed(exception);
                             }
                         }
                         else {
-                            za6.close();
+                            abb6.close();
                         }
                     }
                 }
@@ -112,7 +112,7 @@ public class VillagerProfessionLayer<T extends LivingEntity, M extends EntityMod
     }
     
     @Override
-    public void onResourceManagerReload(final ResourceManager zb) {
+    public void onResourceManagerReload(final ResourceManager abc) {
         this.professionHatCache.clear();
         this.typeHatCache.clear();
     }
diff --git a/src/net/minecraft/client/renderer/entity/layers/WitchItemLayer.java b/src/net/minecraft/client/renderer/entity/layers/WitchItemLayer.java
index 4cbe008..839e91e 100644
--- a/src/net/minecraft/client/renderer/entity/layers/WitchItemLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/WitchItemLayer.java
@@ -11,24 +11,24 @@ import net.minecraft.client.model.WitchModel;
 import net.minecraft.world.entity.LivingEntity;
 
 public class WitchItemLayer<T extends LivingEntity> extends CrossedArmsItemLayer<T, WitchModel<T>> {
-    public WitchItemLayer(final RenderLayerParent<T, WitchModel<T>> dwv) {
-        super(dwv);
+    public WitchItemLayer(final RenderLayerParent<T, WitchModel<T>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final T akz, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        final ItemStack ben12 = akz.getMainHandItem();
-        cyl.pushPose();
-        if (ben12.getItem() == Items.POTION) {
-            this.getParentModel().getHead().translateAndRotate(cyl);
-            this.getParentModel().getNose().translateAndRotate(cyl);
-            cyl.translate(0.0625, 0.25, 0.0);
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
-            cyl.mulPose(Vector3f.XP.rotationDegrees(140.0f));
-            cyl.mulPose(Vector3f.ZP.rotationDegrees(10.0f));
-            cyl.translate(0.0, -0.4000000059604645, 0.4000000059604645);
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final T aoy, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        final ItemStack bki12 = aoy.getMainHandItem();
+        dhl.pushPose();
+        if (bki12.getItem() == Items.POTION) {
+            this.getParentModel().getHead().translateAndRotate(dhl);
+            this.getParentModel().getNose().translateAndRotate(dhl);
+            dhl.translate(0.0625, 0.25, 0.0);
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(180.0f));
+            dhl.mulPose(Vector3f.XP.rotationDegrees(140.0f));
+            dhl.mulPose(Vector3f.ZP.rotationDegrees(10.0f));
+            dhl.translate(0.0, -0.4000000059604645, 0.4000000059604645);
         }
-        super.render(cyl, dqt, integer, akz, float5, float6, float7, float8, float9, float10);
-        cyl.popPose();
+        super.render(dhl, ebz, integer, aoy, float5, float6, float7, float8, float9, float10);
+        dhl.popPose();
     }
 }
diff --git a/src/net/minecraft/client/renderer/entity/layers/WitherArmorLayer.java b/src/net/minecraft/client/renderer/entity/layers/WitherArmorLayer.java
index f1d4b9f..ceff92a 100644
--- a/src/net/minecraft/client/renderer/entity/layers/WitherArmorLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/WitherArmorLayer.java
@@ -11,8 +11,8 @@ public class WitherArmorLayer extends EnergySwirlLayer<WitherBoss, WitherBossMod
     private static final ResourceLocation WITHER_ARMOR_LOCATION;
     private final WitherBossModel<WitherBoss> model;
     
-    public WitherArmorLayer(final RenderLayerParent<WitherBoss, WitherBossModel<WitherBoss>> dwv) {
-        super(dwv);
+    public WitherArmorLayer(final RenderLayerParent<WitherBoss, WitherBossModel<WitherBoss>> eid) {
+        super(eid);
         this.model = new WitherBossModel<WitherBoss>(0.5f);
     }
     
diff --git a/src/net/minecraft/client/renderer/entity/layers/WolfCollarLayer.java b/src/net/minecraft/client/renderer/entity/layers/WolfCollarLayer.java
index 9e25aef..2c78669 100644
--- a/src/net/minecraft/client/renderer/entity/layers/WolfCollarLayer.java
+++ b/src/net/minecraft/client/renderer/entity/layers/WolfCollarLayer.java
@@ -12,17 +12,17 @@ import net.minecraft.world.entity.animal.Wolf;
 public class WolfCollarLayer extends RenderLayer<Wolf, WolfModel<Wolf>> {
     private static final ResourceLocation WOLF_COLLAR_LOCATION;
     
-    public WolfCollarLayer(final RenderLayerParent<Wolf, WolfModel<Wolf>> dwv) {
-        super(dwv);
+    public WolfCollarLayer(final RenderLayerParent<Wolf, WolfModel<Wolf>> eid) {
+        super(eid);
     }
     
     @Override
-    public void render(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final Wolf auc, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
-        if (!auc.isTame() || auc.isInvisible()) {
+    public void render(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final Wolf azk, final float float5, final float float6, final float float7, final float float8, final float float9, final float float10) {
+        if (!azk.isTame() || azk.isInvisible()) {
             return;
         }
-        final float[] arr12 = auc.getCollarColor().getTextureDiffuseColors();
-        RenderLayer.<Wolf>renderColoredCutoutModel(((RenderLayer<T, EntityModel<Wolf>>)this).getParentModel(), WolfCollarLayer.WOLF_COLLAR_LOCATION, cyl, dqt, integer, auc, arr12[0], arr12[1], arr12[2]);
+        final float[] arr12 = azk.getCollarColor().getTextureDiffuseColors();
+        RenderLayer.<Wolf>renderColoredCutoutModel(((RenderLayer<T, EntityModel<Wolf>>)this).getParentModel(), WolfCollarLayer.WOLF_COLLAR_LOCATION, dhl, ebz, integer, azk, arr12[0], arr12[1], arr12[2]);
     }
     
     static {
diff --git a/src/net/minecraft/client/renderer/entity/player/PlayerRenderer.java b/src/net/minecraft/client/renderer/entity/player/PlayerRenderer.java
index 92ce370..17c15ca 100644
--- a/src/net/minecraft/client/renderer/entity/player/PlayerRenderer.java
+++ b/src/net/minecraft/client/renderer/entity/player/PlayerRenderer.java
@@ -8,12 +8,14 @@ import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.world.scores.Score;
 import net.minecraft.world.scores.Objective;
 import net.minecraft.world.scores.Scoreboard;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.CrossbowItem;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.UseAnim;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.PlayerModelPart;
@@ -41,12 +43,12 @@ import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;
 
 public class PlayerRenderer extends LivingEntityRenderer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {
-    public PlayerRenderer(final EntityRenderDispatcher dvf) {
-        this(dvf, false);
+    public PlayerRenderer(final EntityRenderDispatcher egm) {
+        this(egm, false);
     }
     
-    public PlayerRenderer(final EntityRenderDispatcher dvf, final boolean boolean2) {
-        super(dvf, new PlayerModel(0.0f, boolean2), 0.5f);
+    public PlayerRenderer(final EntityRenderDispatcher egm, final boolean boolean2) {
+        super(egm, new PlayerModel(0.0f, boolean2), 0.5f);
         this.addLayer((RenderLayer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>>)new HumanoidArmorLayer((RenderLayerParent<LivingEntity, HumanoidModel>)this, new HumanoidModel(0.5f), new HumanoidModel(1.0f)));
         this.addLayer(new ItemInHandLayer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>>(this));
         this.addLayer(new ArrowLayer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>>(this));
@@ -60,165 +62,156 @@ public class PlayerRenderer extends LivingEntityRenderer<AbstractClientPlayer, P
     }
     
     @Override
-    public void render(final AbstractClientPlayer dpy, final float float2, final float float3, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        this.setModelProperties(dpy);
-        super.render(dpy, float2, float3, cyl, dqt, integer);
+    public void render(final AbstractClientPlayer ebc, final float float2, final float float3, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        this.setModelProperties(ebc);
+        super.render(ebc, float2, float3, dhl, ebz, integer);
     }
     
-    public Vec3 getRenderOffset(final AbstractClientPlayer dpy, final float float2) {
-        if (dpy.isCrouching()) {
+    public Vec3 getRenderOffset(final AbstractClientPlayer ebc, final float float2) {
+        if (ebc.isCrouching()) {
             return new Vec3(0.0, -0.125, 0.0);
         }
-        return super.getRenderOffset((T)dpy, float2);
+        return super.getRenderOffset((T)ebc, float2);
     }
     
-    private void setModelProperties(final AbstractClientPlayer dpy) {
-        final PlayerModel<AbstractClientPlayer> dlz3 = ((LivingEntityRenderer<T, PlayerModel<AbstractClientPlayer>>)this).getModel();
-        if (dpy.isSpectator()) {
-            dlz3.setAllVisible(false);
-            dlz3.head.visible = true;
-            dlz3.hat.visible = true;
+    private void setModelProperties(final AbstractClientPlayer ebc) {
+        final PlayerModel<AbstractClientPlayer> dww3 = ((LivingEntityRenderer<T, PlayerModel<AbstractClientPlayer>>)this).getModel();
+        if (ebc.isSpectator()) {
+            dww3.setAllVisible(false);
+            dww3.head.visible = true;
+            dww3.hat.visible = true;
         }
         else {
-            final ItemStack ben4 = dpy.getMainHandItem();
-            final ItemStack ben5 = dpy.getOffhandItem();
-            dlz3.setAllVisible(true);
-            dlz3.hat.visible = dpy.isModelPartShown(PlayerModelPart.HAT);
-            dlz3.jacket.visible = dpy.isModelPartShown(PlayerModelPart.JACKET);
-            dlz3.leftPants.visible = dpy.isModelPartShown(PlayerModelPart.LEFT_PANTS_LEG);
-            dlz3.rightPants.visible = dpy.isModelPartShown(PlayerModelPart.RIGHT_PANTS_LEG);
-            dlz3.leftSleeve.visible = dpy.isModelPartShown(PlayerModelPart.LEFT_SLEEVE);
-            dlz3.rightSleeve.visible = dpy.isModelPartShown(PlayerModelPart.RIGHT_SLEEVE);
-            dlz3.crouching = dpy.isCrouching();
-            final HumanoidModel.ArmPose a6 = this.getArmPose(dpy, ben4, ben5, InteractionHand.MAIN_HAND);
-            final HumanoidModel.ArmPose a7 = this.getArmPose(dpy, ben4, ben5, InteractionHand.OFF_HAND);
-            if (dpy.getMainArm() == HumanoidArm.RIGHT) {
-                dlz3.rightArmPose = a6;
-                dlz3.leftArmPose = a7;
+            dww3.setAllVisible(true);
+            dww3.hat.visible = ebc.isModelPartShown(PlayerModelPart.HAT);
+            dww3.jacket.visible = ebc.isModelPartShown(PlayerModelPart.JACKET);
+            dww3.leftPants.visible = ebc.isModelPartShown(PlayerModelPart.LEFT_PANTS_LEG);
+            dww3.rightPants.visible = ebc.isModelPartShown(PlayerModelPart.RIGHT_PANTS_LEG);
+            dww3.leftSleeve.visible = ebc.isModelPartShown(PlayerModelPart.LEFT_SLEEVE);
+            dww3.rightSleeve.visible = ebc.isModelPartShown(PlayerModelPart.RIGHT_SLEEVE);
+            dww3.crouching = ebc.isCrouching();
+            final HumanoidModel.ArmPose a4 = getArmPose(ebc, InteractionHand.MAIN_HAND);
+            HumanoidModel.ArmPose a5 = getArmPose(ebc, InteractionHand.OFF_HAND);
+            if (a4.isTwoHanded()) {
+                a5 = (ebc.getOffhandItem().isEmpty() ? HumanoidModel.ArmPose.EMPTY : HumanoidModel.ArmPose.ITEM);
+            }
+            if (ebc.getMainArm() == HumanoidArm.RIGHT) {
+                dww3.rightArmPose = a4;
+                dww3.leftArmPose = a5;
             }
             else {
-                dlz3.rightArmPose = a7;
-                dlz3.leftArmPose = a6;
+                dww3.rightArmPose = a5;
+                dww3.leftArmPose = a4;
             }
         }
     }
     
-    private HumanoidModel.ArmPose getArmPose(final AbstractClientPlayer dpy, final ItemStack ben2, final ItemStack ben3, final InteractionHand ajk) {
-        HumanoidModel.ArmPose a6 = HumanoidModel.ArmPose.EMPTY;
-        final ItemStack ben4 = (ajk == InteractionHand.MAIN_HAND) ? ben2 : ben3;
-        if (!ben4.isEmpty()) {
-            a6 = HumanoidModel.ArmPose.ITEM;
-            if (dpy.getUseItemRemainingTicks() > 0) {
-                final UseAnim bfy8 = ben4.getUseAnimation();
-                if (bfy8 == UseAnim.BLOCK) {
-                    a6 = HumanoidModel.ArmPose.BLOCK;
-                }
-                else if (bfy8 == UseAnim.BOW) {
-                    a6 = HumanoidModel.ArmPose.BOW_AND_ARROW;
-                }
-                else if (bfy8 == UseAnim.SPEAR) {
-                    a6 = HumanoidModel.ArmPose.THROW_SPEAR;
-                }
-                else if (bfy8 == UseAnim.CROSSBOW && ajk == dpy.getUsedItemHand()) {
-                    a6 = HumanoidModel.ArmPose.CROSSBOW_CHARGE;
-                }
+    private static HumanoidModel.ArmPose getArmPose(final AbstractClientPlayer ebc, final InteractionHand anf) {
+        final ItemStack bki3 = ebc.getItemInHand(anf);
+        if (bki3.isEmpty()) {
+            return HumanoidModel.ArmPose.EMPTY;
+        }
+        if (ebc.getUsedItemHand() == anf && ebc.getUseItemRemainingTicks() > 0) {
+            final UseAnim blu4 = bki3.getUseAnimation();
+            if (blu4 == UseAnim.BLOCK) {
+                return HumanoidModel.ArmPose.BLOCK;
             }
-            else {
-                final boolean boolean8 = ben2.getItem() == Items.CROSSBOW;
-                final boolean boolean9 = CrossbowItem.isCharged(ben2);
-                final boolean boolean10 = ben3.getItem() == Items.CROSSBOW;
-                final boolean boolean11 = CrossbowItem.isCharged(ben3);
-                if (boolean8 && boolean9) {
-                    a6 = HumanoidModel.ArmPose.CROSSBOW_HOLD;
-                }
-                if (boolean10 && boolean11 && ben2.getItem().getUseAnimation(ben2) == UseAnim.NONE) {
-                    a6 = HumanoidModel.ArmPose.CROSSBOW_HOLD;
-                }
+            if (blu4 == UseAnim.BOW) {
+                return HumanoidModel.ArmPose.BOW_AND_ARROW;
+            }
+            if (blu4 == UseAnim.SPEAR) {
+                return HumanoidModel.ArmPose.THROW_SPEAR;
+            }
+            if (blu4 == UseAnim.CROSSBOW && anf == ebc.getUsedItemHand()) {
+                return HumanoidModel.ArmPose.CROSSBOW_CHARGE;
             }
         }
-        return a6;
+        else if (!ebc.swinging && bki3.getItem() == Items.CROSSBOW && CrossbowItem.isCharged(bki3)) {
+            return HumanoidModel.ArmPose.CROSSBOW_HOLD;
+        }
+        return HumanoidModel.ArmPose.ITEM;
     }
     
     @Override
-    public ResourceLocation getTextureLocation(final AbstractClientPlayer dpy) {
-        return dpy.getSkinTextureLocation();
+    public ResourceLocation getTextureLocation(final AbstractClientPlayer ebc) {
+        return ebc.getSkinTextureLocation();
     }
     
     @Override
-    protected void scale(final AbstractClientPlayer dpy, final PoseStack cyl, final float float3) {
+    protected void scale(final AbstractClientPlayer ebc, final PoseStack dhl, final float float3) {
         final float float4 = 0.9375f;
-        cyl.scale(0.9375f, 0.9375f, 0.9375f);
+        dhl.scale(0.9375f, 0.9375f, 0.9375f);
     }
     
-    protected void renderNameTag(final AbstractClientPlayer dpy, final String string, final PoseStack cyl, final MultiBufferSource dqt, final int integer) {
-        final double double7 = this.entityRenderDispatcher.distanceToSqr(dpy);
-        cyl.pushPose();
+    protected void renderNameTag(final AbstractClientPlayer ebc, final Component mr, final PoseStack dhl, final MultiBufferSource ebz, final int integer) {
+        final double double7 = this.entityRenderDispatcher.distanceToSqr(ebc);
+        dhl.pushPose();
         if (double7 < 100.0) {
-            final Scoreboard cwl9 = dpy.getScoreboard();
-            final Objective cwi10 = cwl9.getDisplayObjective(2);
-            if (cwi10 != null) {
-                final Score cwk11 = cwl9.getOrCreatePlayerScore(dpy.getScoreboardName(), cwi10);
-                super.renderNameTag((T)dpy, cwk11.getScore() + " " + cwi10.getDisplayName().getColoredString(), cyl, dqt, integer);
+            final Scoreboard dfm9 = ebc.getScoreboard();
+            final Objective dfj10 = dfm9.getDisplayObjective(2);
+            if (dfj10 != null) {
+                final Score dfl11 = dfm9.getOrCreatePlayerScore(ebc.getScoreboardName(), dfj10);
+                super.renderNameTag((T)ebc, new TextComponent(Integer.toString(dfl11.getScore())).append(" ").append(dfj10.getDisplayName()), dhl, ebz, integer);
                 final double double8 = 0.0;
                 this.getFont().getClass();
-                cyl.translate(double8, 9.0f * 1.15f * 0.025f, 0.0);
+                dhl.translate(double8, 9.0f * 1.15f * 0.025f, 0.0);
             }
         }
-        super.renderNameTag((T)dpy, string, cyl, dqt, integer);
-        cyl.popPose();
+        super.renderNameTag((T)ebc, mr, dhl, ebz, integer);
+        dhl.popPose();
     }
     
-    public void renderRightHand(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final AbstractClientPlayer dpy) {
-        this.renderHand(cyl, dqt, integer, dpy, ((PlayerModel)this.model).rightArm, ((PlayerModel)this.model).rightSleeve);
+    public void renderRightHand(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final AbstractClientPlayer ebc) {
+        this.renderHand(dhl, ebz, integer, ebc, ((PlayerModel)this.model).rightArm, ((PlayerModel)this.model).rightSleeve);
     }
     
-    public void renderLeftHand(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final AbstractClientPlayer dpy) {
-        this.renderHand(cyl, dqt, integer, dpy, ((PlayerModel)this.model).leftArm, ((PlayerModel)this.model).leftSleeve);
+    public void renderLeftHand(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final AbstractClientPlayer ebc) {
+        this.renderHand(dhl, ebz, integer, ebc, ((PlayerModel)this.model).leftArm, ((PlayerModel)this.model).leftSleeve);
     }
     
-    private void renderHand(final PoseStack cyl, final MultiBufferSource dqt, final int integer, final AbstractClientPlayer dpy, final ModelPart dni5, final ModelPart dni6) {
-        final PlayerModel<AbstractClientPlayer> dlz8 = ((LivingEntityRenderer<T, PlayerModel<AbstractClientPlayer>>)this).getModel();
-        this.setModelProperties(dpy);
-        dlz8.attackTime = 0.0f;
-        dlz8.crouching = false;
-        dlz8.setupAnim(dpy, dlz8.swimAmount = 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
-        dni5.xRot = 0.0f;
-        dni5.render(cyl, dqt.getBuffer(RenderType.entitySolid(dpy.getSkinTextureLocation())), integer, OverlayTexture.NO_OVERLAY);
-        dni6.xRot = 0.0f;
-        dni6.render(cyl, dqt.getBuffer(RenderType.entityTranslucent(dpy.getSkinTextureLocation())), integer, OverlayTexture.NO_OVERLAY);
+    private void renderHand(final PoseStack dhl, final MultiBufferSource ebz, final int integer, final AbstractClientPlayer ebc, final ModelPart dyg5, final ModelPart dyg6) {
+        final PlayerModel<AbstractClientPlayer> dww8 = ((LivingEntityRenderer<T, PlayerModel<AbstractClientPlayer>>)this).getModel();
+        this.setModelProperties(ebc);
+        dww8.attackTime = 0.0f;
+        dww8.crouching = false;
+        dww8.setupAnim(ebc, dww8.swimAmount = 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
+        dyg5.xRot = 0.0f;
+        dyg5.render(dhl, ebz.getBuffer(RenderType.entitySolid(ebc.getSkinTextureLocation())), integer, OverlayTexture.NO_OVERLAY);
+        dyg6.xRot = 0.0f;
+        dyg6.render(dhl, ebz.getBuffer(RenderType.entityTranslucent(ebc.getSkinTextureLocation())), integer, OverlayTexture.NO_OVERLAY);
     }
     
     @Override
-    protected void setupRotations(final AbstractClientPlayer dpy, final PoseStack cyl, final float float3, final float float4, final float float5) {
-        final float float6 = dpy.getSwimAmount(float5);
-        if (dpy.isFallFlying()) {
-            super.setupRotations(dpy, cyl, float3, float4, float5);
-            final float float7 = dpy.getFallFlyingTicks() + float5;
+    protected void setupRotations(final AbstractClientPlayer ebc, final PoseStack dhl, final float float3, final float float4, final float float5) {
+        final float float6 = ebc.getSwimAmount(float5);
+        if (ebc.isFallFlying()) {
+            super.setupRotations(ebc, dhl, float3, float4, float5);
+            final float float7 = ebc.getFallFlyingTicks() + float5;
             final float float8 = Mth.clamp(float7 * float7 / 100.0f, 0.0f, 1.0f);
-            if (!dpy.isAutoSpinAttack()) {
-                cyl.mulPose(Vector3f.XP.rotationDegrees(float8 * (-90.0f - dpy.xRot)));
+            if (!ebc.isAutoSpinAttack()) {
+                dhl.mulPose(Vector3f.XP.rotationDegrees(float8 * (-90.0f - ebc.xRot)));
             }
-            final Vec3 cvl10 = dpy.getViewVector(float5);
-            final Vec3 cvl11 = dpy.getDeltaMovement();
-            final double double12 = Entity.getHorizontalDistanceSqr(cvl11);
-            final double double13 = Entity.getHorizontalDistanceSqr(cvl10);
+            final Vec3 dem10 = ebc.getViewVector(float5);
+            final Vec3 dem11 = ebc.getDeltaMovement();
+            final double double12 = Entity.getHorizontalDistanceSqr(dem11);
+            final double double13 = Entity.getHorizontalDistanceSqr(dem10);
             if (double12 > 0.0 && double13 > 0.0) {
-                final double double14 = (cvl11.x * cvl10.x + cvl11.z * cvl10.z) / (Math.sqrt(double12) * Math.sqrt(double13));
-                final double double15 = cvl11.x * cvl10.z - cvl11.z * cvl10.x;
-                cyl.mulPose(Vector3f.YP.rotation((float)(Math.signum(double15) * Math.acos(double14))));
+                final double double14 = (dem11.x * dem10.x + dem11.z * dem10.z) / (Math.sqrt(double12) * Math.sqrt(double13));
+                final double double15 = dem11.x * dem10.z - dem11.z * dem10.x;
+                dhl.mulPose(Vector3f.YP.rotation((float)(Math.signum(double15) * Math.acos(double14))));
             }
         }
         else if (float6 > 0.0f) {
-            super.setupRotations(dpy, cyl, float3, float4, float5);
-            final float float7 = dpy.isInWater() ? (-90.0f - dpy.xRot) : -90.0f;
+            super.setupRotations(ebc, dhl, float3, float4, float5);
+            final float float7 = ebc.isInWater() ? (-90.0f - ebc.xRot) : -90.0f;
             final float float8 = Mth.lerp(float6, 0.0f, float7);
-            cyl.mulPose(Vector3f.XP.rotationDegrees(float8));
-            if (dpy.isVisuallySwimming()) {
-                cyl.translate(0.0, -1.0, 0.30000001192092896);
+            dhl.mulPose(Vector3f.XP.rotationDegrees(float8));
+            if (ebc.isVisuallySwimming()) {
+                dhl.translate(0.0, -1.0, 0.30000001192092896);
             }
         }
         else {
-            super.setupRotations(dpy, cyl, float3, float4, float5);
+            super.setupRotations(ebc, dhl, float3, float4, float5);
         }
     }
 }
diff --git a/src/net/minecraft/client/renderer/item/ItemProperties.java b/src/net/minecraft/client/renderer/item/ItemProperties.java
new file mode 100644
index 0000000..a42bf12
--- /dev/null
+++ b/src/net/minecraft/client/renderer/item/ItemProperties.java
@@ -0,0 +1,266 @@
+package net.minecraft.client.renderer.item;
+
+import net.minecraft.core.Direction;
+import net.minecraft.resources.ResourceKey;
+import java.util.Optional;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.entity.decoration.ItemFrame;
+import net.minecraft.world.item.CompassItem;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.Level;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.HumanoidArm;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.CrossbowItem;
+import net.minecraft.world.item.ElytraItem;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.FishingRodItem;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.world.item.ItemStack;
+import javax.annotation.Nullable;
+import com.google.common.collect.Maps;
+import net.minecraft.world.item.Item;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Map;
+
+public class ItemProperties {
+    private static final Map<ResourceLocation, ItemPropertyFunction> GENERIC_PROPERTIES;
+    private static final ResourceLocation DAMAGED;
+    private static final ResourceLocation DAMAGE;
+    private static final ItemPropertyFunction PROPERTY_DAMAGED;
+    private static final ItemPropertyFunction PROPERTY_DAMAGE;
+    private static final Map<Item, Map<ResourceLocation, ItemPropertyFunction>> PROPERTIES;
+    
+    private static ItemPropertyFunction registerGeneric(final ResourceLocation uh, final ItemPropertyFunction elg) {
+        ItemProperties.GENERIC_PROPERTIES.put(uh, elg);
+        return elg;
+    }
+    
+    private static void register(final Item bke, final ResourceLocation uh, final ItemPropertyFunction elg) {
+        ItemProperties.PROPERTIES.computeIfAbsent(bke, bke -> Maps.newHashMap()).put(uh, elg);
+    }
+    
+    @Nullable
+    public static ItemPropertyFunction getProperty(final Item bke, final ResourceLocation uh) {
+        if (bke.getMaxDamage() > 0) {
+            if (ItemProperties.DAMAGE.equals(uh)) {
+                return ItemProperties.PROPERTY_DAMAGE;
+            }
+            if (ItemProperties.DAMAGED.equals(uh)) {
+                return ItemProperties.PROPERTY_DAMAGED;
+            }
+        }
+        final ItemPropertyFunction elg3 = ItemProperties.GENERIC_PROPERTIES.get(uh);
+        if (elg3 != null) {
+            return elg3;
+        }
+        final Map<ResourceLocation, ItemPropertyFunction> map4 = ItemProperties.PROPERTIES.get(bke);
+        if (map4 == null) {
+            return null;
+        }
+        return map4.get(uh);
+    }
+    
+    static {
+        GENERIC_PROPERTIES = Maps.newHashMap();
+        DAMAGED = new ResourceLocation("damaged");
+        DAMAGE = new ResourceLocation("damage");
+        PROPERTY_DAMAGED = ((bki, dym, aoy) -> bki.isDamaged() ? 1.0f : 0.0f);
+        PROPERTY_DAMAGE = ((bki, dym, aoy) -> Mth.clamp(bki.getDamageValue() / (float)bki.getMaxDamage(), 0.0f, 1.0f));
+        PROPERTIES = Maps.newHashMap();
+        registerGeneric(new ResourceLocation("lefthanded"), (bki, dym, aoy) -> (aoy == null || aoy.getMainArm() == HumanoidArm.RIGHT) ? 0.0f : 1.0f);
+        registerGeneric(new ResourceLocation("cooldown"), (bki, dym, aoy) -> (aoy instanceof Player) ? aoy.getCooldowns().getCooldownPercent(bki.getItem(), 0.0f) : 0.0f);
+        registerGeneric(new ResourceLocation("custom_model_data"), (bki, dym, aoy) -> bki.hasTag() ? ((float)bki.getTag().getInt("CustomModelData")) : 0.0f);
+        register(Items.BOW, new ResourceLocation("pull"), (bki, dym, aoy) -> {
+            if (aoy == null) {
+                return 0.0f;
+            }
+            else if (aoy.getUseItem() != bki) {
+                return 0.0f;
+            }
+            else {
+                return (bki.getUseDuration() - aoy.getUseItemRemainingTicks()) / 20.0f;
+            }
+        });
+        register(Items.BOW, new ResourceLocation("pulling"), (bki, dym, aoy) -> (aoy != null && aoy.isUsingItem() && aoy.getUseItem() == bki) ? 1.0f : 0.0f);
+        register(Items.CLOCK, new ResourceLocation("time"), new ItemPropertyFunction() {
+            private double rotation;
+            private double rota;
+            private long lastUpdateTick;
+            
+            @Override
+            public float call(final ItemStack bki, @Nullable ClientLevel dym, @Nullable final LivingEntity aoy) {
+                final Entity aom5 = (aoy != null) ? aoy : bki.getEntityRepresentation();
+                if (aom5 == null) {
+                    return 0.0f;
+                }
+                if (dym == null && aom5.level instanceof ClientLevel) {
+                    dym = (ClientLevel)aom5.level;
+                }
+                if (dym == null) {
+                    return 0.0f;
+                }
+                double double6;
+                if (dym.dimensionType().natural()) {
+                    double6 = dym.getTimeOfDay(1.0f);
+                }
+                else {
+                    double6 = Math.random();
+                }
+                double6 = this.wobble(dym, double6);
+                return (float)double6;
+            }
+            
+            private double wobble(final Level bqb, final double double2) {
+                if (bqb.getGameTime() != this.lastUpdateTick) {
+                    this.lastUpdateTick = bqb.getGameTime();
+                    double double3 = double2 - this.rotation;
+                    double3 = Mth.positiveModulo(double3 + 0.5, 1.0) - 0.5;
+                    this.rota += double3 * 0.1;
+                    this.rota *= 0.9;
+                    this.rotation = Mth.positiveModulo(this.rotation + this.rota, 1.0);
+                }
+                return this.rotation;
+            }
+        });
+        register(Items.COMPASS, new ResourceLocation("angle"), new ItemPropertyFunction() {
+            private final CompassWobble wobble = new CompassWobble();
+            private final CompassWobble wobbleRandom = new CompassWobble();
+            
+            @Override
+            public float call(final ItemStack bki, @Nullable ClientLevel dym, @Nullable final LivingEntity aoy) {
+                final Entity aom5 = (aoy != null) ? aoy : bki.getEntityRepresentation();
+                if (aom5 == null) {
+                    return 0.0f;
+                }
+                if (dym == null && aom5.level instanceof ClientLevel) {
+                    dym = (ClientLevel)aom5.level;
+                }
+                final BlockPos fu6 = CompassItem.isLodestoneCompass(bki) ? this.getLodestonePosition(dym, bki.getOrCreateTag()) : this.getSpawnPosition(dym);
+                final long long7 = dym.getGameTime();
+                if (fu6 == null || aom5.position().distanceToSqr(fu6.getX() + 0.5, aom5.position().y(), fu6.getZ() + 0.5) < 9.999999747378752E-6) {
+                    if (this.wobbleRandom.shouldUpdate(long7)) {
+                        this.wobbleRandom.update(long7, Math.random());
+                    }
+                    final double double9 = this.wobbleRandom.rotation + bki.hashCode() / 2.14748365E9f;
+                    return Mth.positiveModulo((float)double9, 1.0f);
+                }
+                final boolean boolean9 = aoy instanceof Player && ((Player)aoy).isLocalPlayer();
+                double double10 = 0.0;
+                if (boolean9) {
+                    double10 = aoy.yRot;
+                }
+                else if (aom5 instanceof ItemFrame) {
+                    double10 = this.getFrameRotation((ItemFrame)aom5);
+                }
+                else if (aom5 instanceof ItemEntity) {
+                    double10 = 180.0f - ((ItemEntity)aom5).getSpin(0.5f) / 6.2831855f * 360.0f;
+                }
+                else if (aoy != null) {
+                    double10 = aoy.yBodyRot;
+                }
+                double10 = Mth.positiveModulo(double10 / 360.0, 1.0);
+                final double double11 = this.getAngleTo(Vec3.atCenterOf(fu6), aom5) / 6.2831854820251465;
+                double double12;
+                if (boolean9) {
+                    if (this.wobble.shouldUpdate(long7)) {
+                        this.wobble.update(long7, 0.5 - (double10 - 0.25));
+                    }
+                    double12 = double11 + this.wobble.rotation;
+                }
+                else {
+                    double12 = 0.5 - (double10 - 0.25 - double11);
+                }
+                return Mth.positiveModulo((float)double12, 1.0f);
+            }
+            
+            @Nullable
+            private BlockPos getSpawnPosition(final ClientLevel dym) {
+                return dym.dimensionType().natural() ? dym.getSharedSpawnPos() : null;
+            }
+            
+            @Nullable
+            private BlockPos getLodestonePosition(final Level bqb, final CompoundTag le) {
+                final boolean boolean4 = le.contains("LodestonePos");
+                final boolean boolean5 = le.contains("LodestoneDimension");
+                if (boolean4 && boolean5) {
+                    final Optional<ResourceKey<Level>> optional6 = CompassItem.getLodestoneDimension(le);
+                    if (optional6.isPresent() && bqb.dimension() == optional6.get()) {
+                        return NbtUtils.readBlockPos(le.getCompound("LodestonePos"));
+                    }
+                }
+                return null;
+            }
+            
+            private double getFrameRotation(final ItemFrame bba) {
+                final Direction fz3 = bba.getDirection();
+                final int integer4 = fz3.getAxis().isVertical() ? (90 * fz3.getAxisDirection().getStep()) : 0;
+                return Mth.wrapDegrees(180 + fz3.get2DDataValue() * 90 + bba.getRotation() * 45 + integer4);
+            }
+            
+            private double getAngleTo(final Vec3 dem, final Entity aom) {
+                return Math.atan2(dem.z() - aom.getZ(), dem.x() - aom.getX());
+            }
+        });
+        register(Items.CROSSBOW, new ResourceLocation("pull"), (bki, dym, aoy) -> {
+            if (aoy == null) {
+                return 0.0f;
+            }
+            else if (CrossbowItem.isCharged(bki)) {
+                return 0.0f;
+            }
+            else {
+                return (bki.getUseDuration() - aoy.getUseItemRemainingTicks()) / (float)CrossbowItem.getChargeDuration(bki);
+            }
+        });
+        register(Items.CROSSBOW, new ResourceLocation("pulling"), (bki, dym, aoy) -> (aoy != null && aoy.isUsingItem() && aoy.getUseItem() == bki && !CrossbowItem.isCharged(bki)) ? 1.0f : 0.0f);
+        register(Items.CROSSBOW, new ResourceLocation("charged"), (bki, dym, aoy) -> (aoy != null && CrossbowItem.isCharged(bki)) ? 1.0f : 0.0f);
+        register(Items.CROSSBOW, new ResourceLocation("firework"), (bki, dym, aoy) -> (aoy != null && CrossbowItem.isCharged(bki) && CrossbowItem.containsChargedProjectile(bki, Items.FIREWORK_ROCKET)) ? 1.0f : 0.0f);
+        register(Items.ELYTRA, new ResourceLocation("broken"), (bki, dym, aoy) -> ElytraItem.isFlyEnabled(bki) ? 0.0f : 1.0f);
+        boolean boolean4;
+        boolean boolean5;
+        register(Items.FISHING_ROD, new ResourceLocation("cast"), (bki, dym, aoy) -> {
+            if (aoy == null) {
+                return 0.0f;
+            }
+            else {
+                boolean4 = (aoy.getMainHandItem() == bki);
+                boolean5 = (aoy.getOffhandItem() == bki);
+                if (aoy.getMainHandItem().getItem() instanceof FishingRodItem) {
+                    boolean5 = false;
+                }
+                return ((boolean4 || boolean5) && aoy instanceof Player && aoy.fishing != null) ? 1.0f : 0.0f;
+            }
+        });
+        register(Items.SHIELD, new ResourceLocation("blocking"), (bki, dym, aoy) -> (aoy != null && aoy.isUsingItem() && aoy.getUseItem() == bki) ? 1.0f : 0.0f);
+        register(Items.TRIDENT, new ResourceLocation("throwing"), (bki, dym, aoy) -> (aoy != null && aoy.isUsingItem() && aoy.getUseItem() == bki) ? 1.0f : 0.0f);
+    }
+    
+    static class CompassWobble {
+        private double rotation;
+        private double deltaRotation;
+        private long lastUpdateTick;
+        
+        private CompassWobble() {
+        }
+        
+        private boolean shouldUpdate(final long long1) {
+            return this.lastUpdateTick != long1;
+        }
+        
+        private void update(final long long1, final double double2) {
+            this.lastUpdateTick = long1;
+            double double3 = double2 - this.rotation;
+            double3 = Mth.positiveModulo(double3 + 0.5, 1.0) - 0.5;
+            this.deltaRotation += double3 * 0.1;
+            this.deltaRotation *= 0.8;
+            this.rotation = Mth.positiveModulo(this.rotation + this.deltaRotation, 1.0);
+        }
+    }
+}
diff --git a/src/net/minecraft/client/renderer/item/ItemPropertyFunction.java b/src/net/minecraft/client/renderer/item/ItemPropertyFunction.java
new file mode 100644
index 0000000..18c2640
--- /dev/null
+++ b/src/net/minecraft/client/renderer/item/ItemPropertyFunction.java
@@ -0,0 +1,10 @@
+package net.minecraft.client.renderer.item;
+
+import net.minecraft.world.entity.LivingEntity;
+import javax.annotation.Nullable;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.world.item.ItemStack;
+
+public interface ItemPropertyFunction {
+    float call(final ItemStack bki, @Nullable final ClientLevel dym, @Nullable final LivingEntity aoy);
+}
diff --git a/src/net/minecraft/client/renderer/texture/AbstractTexture.java b/src/net/minecraft/client/renderer/texture/AbstractTexture.java
index c562029..62f0315 100644
--- a/src/net/minecraft/client/renderer/texture/AbstractTexture.java
+++ b/src/net/minecraft/client/renderer/texture/AbstractTexture.java
@@ -58,7 +58,7 @@ public abstract class AbstractTexture {
         }
     }
     
-    public abstract void load(final ResourceManager zb) throws IOException;
+    public abstract void load(final ResourceManager abc) throws IOException;
     
     public void bind() {
         if (!RenderSystem.isOnRenderThreadOrInit()) {
@@ -69,7 +69,7 @@ public abstract class AbstractTexture {
         }
     }
     
-    public void reset(final TextureManager eak, final ResourceManager zb, final ResourceLocation sm, final Executor executor) {
-        eak.register(sm, this);
+    public void reset(final TextureManager elw, final ResourceManager abc, final ResourceLocation uh, final Executor executor) {
+        elw.register(uh, this);
     }
 }
diff --git a/src/net/minecraft/client/renderer/texture/AtlasSet.java b/src/net/minecraft/client/renderer/texture/AtlasSet.java
index 17ca06f..d6d7013 100644
--- a/src/net/minecraft/client/renderer/texture/AtlasSet.java
+++ b/src/net/minecraft/client/renderer/texture/AtlasSet.java
@@ -14,12 +14,12 @@ public class AtlasSet implements AutoCloseable {
         this.atlases = collection.stream().collect(Collectors.toMap(TextureAtlas::location, Function.<TextureAtlas>identity()));
     }
     
-    public TextureAtlas getAtlas(final ResourceLocation sm) {
-        return this.atlases.get(sm);
+    public TextureAtlas getAtlas(final ResourceLocation uh) {
+        return this.atlases.get(uh);
     }
     
-    public TextureAtlasSprite getSprite(final Material eby) {
-        return this.atlases.get(eby.atlasLocation()).getSprite(eby.texture());
+    public TextureAtlasSprite getSprite(final Material enk) {
+        return this.atlases.get(enk.atlasLocation()).getSprite(enk.texture());
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/texture/DynamicTexture.java b/src/net/minecraft/client/renderer/texture/DynamicTexture.java
index 208227f..220f2d6 100644
--- a/src/net/minecraft/client/renderer/texture/DynamicTexture.java
+++ b/src/net/minecraft/client/renderer/texture/DynamicTexture.java
@@ -10,8 +10,8 @@ import com.mojang.blaze3d.platform.NativeImage;
 public class DynamicTexture extends AbstractTexture implements AutoCloseable {
     private NativeImage pixels;
     
-    public DynamicTexture(final NativeImage cxr) {
-        this.pixels = cxr;
+    public DynamicTexture(final NativeImage dgs) {
+        this.pixels = dgs;
         if (!RenderSystem.isOnRenderThread()) {
             RenderSystem.recordRenderCall(() -> {
                 TextureUtil.prepareImage(this.getId(), this.pixels.getWidth(), this.pixels.getHeight());
@@ -31,7 +31,7 @@ public class DynamicTexture extends AbstractTexture implements AutoCloseable {
     }
     
     @Override
-    public void load(final ResourceManager zb) throws IOException {
+    public void load(final ResourceManager abc) throws IOException {
     }
     
     public void upload() {
@@ -44,9 +44,9 @@ public class DynamicTexture extends AbstractTexture implements AutoCloseable {
         return this.pixels;
     }
     
-    public void setPixels(final NativeImage cxr) throws Exception {
+    public void setPixels(final NativeImage dgs) throws Exception {
         this.pixels.close();
-        this.pixels = cxr;
+        this.pixels = dgs;
     }
     
     @Override
diff --git a/src/net/minecraft/client/renderer/texture/HttpTexture.java b/src/net/minecraft/client/renderer/texture/HttpTexture.java
index 7e415dd..256c75a 100644
--- a/src/net/minecraft/client/renderer/texture/HttpTexture.java
+++ b/src/net/minecraft/client/renderer/texture/HttpTexture.java
@@ -31,40 +31,40 @@ public class HttpTexture extends SimpleTexture {
     private CompletableFuture<?> future;
     private boolean uploaded;
     
-    public HttpTexture(@Nullable final File file, final String string, final ResourceLocation sm, final boolean boolean4, @Nullable final Runnable runnable) {
-        super(sm);
+    public HttpTexture(@Nullable final File file, final String string, final ResourceLocation uh, final boolean boolean4, @Nullable final Runnable runnable) {
+        super(uh);
         this.file = file;
         this.urlString = string;
         this.processLegacySkin = boolean4;
         this.onDownloaded = runnable;
     }
     
-    private void loadCallback(final NativeImage cxr) {
+    private void loadCallback(final NativeImage dgs) {
         if (this.onDownloaded != null) {
             this.onDownloaded.run();
         }
         Minecraft.getInstance().execute(() -> {
             this.uploaded = true;
             if (!RenderSystem.isOnRenderThread()) {
-                RenderSystem.recordRenderCall(() -> this.upload(cxr));
+                RenderSystem.recordRenderCall(() -> this.upload(dgs));
             }
             else {
-                this.upload(cxr);
+                this.upload(dgs);
             }
         });
     }
     
-    private void upload(final NativeImage cxr) {
-        TextureUtil.prepareImage(this.getId(), cxr.getWidth(), cxr.getHeight());
-        cxr.upload(0, 0, 0, true);
+    private void upload(final NativeImage dgs) {
+        TextureUtil.prepareImage(this.getId(), dgs.getWidth(), dgs.getHeight());
+        dgs.upload(0, 0, 0, true);
     }
     
     @Override
-    public void load(final ResourceManager zb) throws IOException {
+    public void load(final ResourceManager abc) throws IOException {
         Minecraft.getInstance().execute(() -> {
             if (!this.uploaded) {
                 try {
-                    super.load(zb);
+                    super.load(abc);
                 }
                 catch (IOException iOException3) {
                     HttpTexture.LOGGER.warn("Failed to load texture: {}", this.location, iOException3);
@@ -76,22 +76,22 @@ public class HttpTexture extends SimpleTexture {
         if (this.future != null) {
             return;
         }
-        NativeImage cxr3;
+        NativeImage dgs3;
         if (this.file != null && this.file.isFile()) {
             HttpTexture.LOGGER.debug("Loading http texture from local cache ({})", this.file);
             final FileInputStream fileInputStream4 = new FileInputStream(this.file);
-            cxr3 = this.load(fileInputStream4);
+            dgs3 = this.load(fileInputStream4);
         }
         else {
-            cxr3 = null;
+            dgs3 = null;
         }
-        if (cxr3 != null) {
-            this.loadCallback(cxr3);
+        if (dgs3 != null) {
+            this.loadCallback(dgs3);
             return;
         }
         HttpURLConnection httpURLConnection2;
         InputStream inputStream3;
-        NativeImage cxr4;
+        NativeImage dgs4;
         this.future = CompletableFuture.runAsync(() -> {
             httpURLConnection2 = null;
             HttpTexture.LOGGER.debug("Downloading http texture from {} to {}", this.urlString, this.file);
@@ -109,9 +109,9 @@ public class HttpTexture extends SimpleTexture {
                         inputStream3 = httpURLConnection2.getInputStream();
                     }
                     Minecraft.getInstance().execute(() -> {
-                        cxr4 = this.load(inputStream3);
-                        if (cxr4 != null) {
-                            this.loadCallback(cxr4);
+                        dgs4 = this.load(inputStream3);
+                        if (dgs4 != null) {
+                            this.loadCallback(dgs4);
                         }
                     });
                 }
@@ -129,53 +129,53 @@ public class HttpTexture extends SimpleTexture {
     
     @Nullable
     private NativeImage load(final InputStream inputStream) {
-        NativeImage cxr3 = null;
+        NativeImage dgs3 = null;
         try {
-            cxr3 = NativeImage.read(inputStream);
+            dgs3 = NativeImage.read(inputStream);
             if (this.processLegacySkin) {
-                cxr3 = processLegacySkin(cxr3);
+                dgs3 = processLegacySkin(dgs3);
             }
         }
         catch (IOException iOException4) {
             HttpTexture.LOGGER.warn("Error while loading the skin texture", (Throwable)iOException4);
         }
-        return cxr3;
+        return dgs3;
     }
     
-    private static NativeImage processLegacySkin(NativeImage cxr) {
-        final boolean boolean2 = cxr.getHeight() == 32;
+    private static NativeImage processLegacySkin(NativeImage dgs) {
+        final boolean boolean2 = dgs.getHeight() == 32;
         if (boolean2) {
-            final NativeImage cxr2 = new NativeImage(64, 64, true);
-            cxr2.copyFrom(cxr);
-            cxr.close();
-            cxr = cxr2;
-            cxr.fillRect(0, 32, 64, 32, 0);
-            cxr.copyRect(4, 16, 16, 32, 4, 4, true, false);
-            cxr.copyRect(8, 16, 16, 32, 4, 4, true, false);
-            cxr.copyRect(0, 20, 24, 32, 4, 12, true, false);
-            cxr.copyRect(4, 20, 16, 32, 4, 12, true, false);
-            cxr.copyRect(8, 20, 8, 32, 4, 12, true, false);
-            cxr.copyRect(12, 20, 16, 32, 4, 12, true, false);
-            cxr.copyRect(44, 16, -8, 32, 4, 4, true, false);
-            cxr.copyRect(48, 16, -8, 32, 4, 4, true, false);
-            cxr.copyRect(40, 20, 0, 32, 4, 12, true, false);
-            cxr.copyRect(44, 20, -8, 32, 4, 12, true, false);
-            cxr.copyRect(48, 20, -16, 32, 4, 12, true, false);
-            cxr.copyRect(52, 20, -8, 32, 4, 12, true, false);
+            final NativeImage dgs2 = new NativeImage(64, 64, true);
+            dgs2.copyFrom(dgs);
+            dgs.close();
+            dgs = dgs2;
+            dgs.fillRect(0, 32, 64, 32, 0);
+            dgs.copyRect(4, 16, 16, 32, 4, 4, true, false);
+            dgs.copyRect(8, 16, 16, 32, 4, 4, true, false);
+            dgs.copyRect(0, 20, 24, 32, 4, 12, true, false);
+            dgs.copyRect(4, 20, 16, 32, 4, 12, true, false);
+            dgs.copyRect(8, 20, 8, 32, 4, 12, true, false);
+            dgs.copyRect(12, 20, 16, 32, 4, 12, true, false);
+            dgs.copyRect(44, 16, -8, 32, 4, 4, true, false);
+            dgs.copyRect(48, 16, -8, 32, 4, 4, true, false);
+            dgs.copyRect(40, 20, 0, 32, 4, 12, true, false);
+            dgs.copyRect(44, 20, -8, 32, 4, 12, true, false);
+            dgs.copyRect(48, 20, -16, 32, 4, 12, true, false);
+            dgs.copyRect(52, 20, -8, 32, 4, 12, true, false);
         }
-        setNoAlpha(cxr, 0, 0, 32, 16);
+        setNoAlpha(dgs, 0, 0, 32, 16);
         if (boolean2) {
-            doNotchTransparencyHack(cxr, 32, 0, 64, 32);
+            doNotchTransparencyHack(dgs, 32, 0, 64, 32);
         }
-        setNoAlpha(cxr, 0, 16, 64, 32);
-        setNoAlpha(cxr, 16, 48, 48, 64);
-        return cxr;
+        setNoAlpha(dgs, 0, 16, 64, 32);
+        setNoAlpha(dgs, 16, 48, 48, 64);
+        return dgs;
     }
     
-    private static void doNotchTransparencyHack(final NativeImage cxr, final int integer2, final int integer3, final int integer4, final int integer5) {
+    private static void doNotchTransparencyHack(final NativeImage dgs, final int integer2, final int integer3, final int integer4, final int integer5) {
         for (int integer6 = integer2; integer6 < integer4; ++integer6) {
             for (int integer7 = integer3; integer7 < integer5; ++integer7) {
-                final int integer8 = cxr.getPixelRGBA(integer6, integer7);
+                final int integer8 = dgs.getPixelRGBA(integer6, integer7);
                 if ((integer8 >> 24 & 0xFF) < 128) {
                     return;
                 }
@@ -183,15 +183,15 @@ public class HttpTexture extends SimpleTexture {
         }
         for (int integer6 = integer2; integer6 < integer4; ++integer6) {
             for (int integer7 = integer3; integer7 < integer5; ++integer7) {
-                cxr.setPixelRGBA(integer6, integer7, cxr.getPixelRGBA(integer6, integer7) & 0xFFFFFF);
+                dgs.setPixelRGBA(integer6, integer7, dgs.getPixelRGBA(integer6, integer7) & 0xFFFFFF);
             }
         }
     }
     
-    private static void setNoAlpha(final NativeImage cxr, final int integer2, final int integer3, final int integer4, final int integer5) {
+    private static void setNoAlpha(final NativeImage dgs, final int integer2, final int integer3, final int integer4, final int integer5) {
         for (int integer6 = integer2; integer6 < integer4; ++integer6) {
             for (int integer7 = integer3; integer7 < integer5; ++integer7) {
-                cxr.setPixelRGBA(integer6, integer7, cxr.getPixelRGBA(integer6, integer7) | 0xFF000000);
+                dgs.setPixelRGBA(integer6, integer7, dgs.getPixelRGBA(integer6, integer7) | 0xFF000000);
             }
         }
     }
diff --git a/src/net/minecraft/client/renderer/texture/LayeredTexture.java b/src/net/minecraft/client/renderer/texture/LayeredTexture.java
deleted file mode 100644
index 4959d85..0000000
--- a/src/net/minecraft/client/renderer/texture/LayeredTexture.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package net.minecraft.client.renderer.texture;
-
-import org.apache.logging.log4j.LogManager;
-import com.mojang.blaze3d.platform.TextureUtil;
-import net.minecraft.server.packs.resources.Resource;
-import java.util.Iterator;
-import java.io.IOException;
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.platform.NativeImage;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ResourceManager;
-import com.google.common.collect.Lists;
-import java.util.List;
-import org.apache.logging.log4j.Logger;
-
-public class LayeredTexture extends AbstractTexture {
-    private static final Logger LOGGER;
-    public final List<String> layerPaths;
-    
-    public LayeredTexture(final String... arr) {
-        this.layerPaths = Lists.<String>newArrayList(arr);
-        if (this.layerPaths.isEmpty()) {
-            throw new IllegalStateException("Layered texture with no layers.");
-        }
-    }
-    
-    @Override
-    public void load(final ResourceManager zb) throws IOException {
-        final Iterator<String> iterator3 = this.layerPaths.iterator();
-        final String string4 = iterator3.next();
-        try (final Resource za5 = zb.getResource(new ResourceLocation(string4))) {
-            final NativeImage cxr7 = NativeImage.read(za5.getInputStream());
-            while (iterator3.hasNext()) {
-                final String string5 = iterator3.next();
-                if (string5 == null) {
-                    continue;
-                }
-                try (final Resource za6 = zb.getResource(new ResourceLocation(string5));
-                     final NativeImage cxr8 = NativeImage.read(za6.getInputStream())) {
-                    for (int integer13 = 0; integer13 < cxr8.getHeight(); ++integer13) {
-                        for (int integer14 = 0; integer14 < cxr8.getWidth(); ++integer14) {
-                            cxr7.blendPixel(integer14, integer13, cxr8.getPixelRGBA(integer14, integer13));
-                        }
-                    }
-                }
-            }
-            if (!RenderSystem.isOnRenderThreadOrInit()) {
-                RenderSystem.recordRenderCall(() -> this.doLoad(cxr7));
-            }
-            else {
-                this.doLoad(cxr7);
-            }
-        }
-        catch (IOException iOException5) {
-            LayeredTexture.LOGGER.error("Couldn't load layered image", (Throwable)iOException5);
-        }
-    }
-    
-    private void doLoad(final NativeImage cxr) {
-        TextureUtil.prepareImage(this.getId(), cxr.getWidth(), cxr.getHeight());
-        cxr.upload(0, 0, 0, true);
-    }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-    }
-}
diff --git a/src/net/minecraft/client/renderer/texture/MipmapGenerator.java b/src/net/minecraft/client/renderer/texture/MipmapGenerator.java
index 960f3cf..4331429 100644
--- a/src/net/minecraft/client/renderer/texture/MipmapGenerator.java
+++ b/src/net/minecraft/client/renderer/texture/MipmapGenerator.java
@@ -6,31 +6,31 @@ import com.mojang.blaze3d.platform.NativeImage;
 public class MipmapGenerator {
     private static final float[] POW22;
     
-    public static NativeImage[] generateMipLevels(final NativeImage cxr, final int integer) {
+    public static NativeImage[] generateMipLevels(final NativeImage dgs, final int integer) {
         final NativeImage[] arr3 = new NativeImage[integer + 1];
-        arr3[0] = cxr;
+        arr3[0] = dgs;
         if (integer > 0) {
             boolean boolean4 = false;
         Label_0072:
-            for (int integer2 = 0; integer2 < cxr.getWidth(); ++integer2) {
-                for (int integer3 = 0; integer3 < cxr.getHeight(); ++integer3) {
-                    if (cxr.getPixelRGBA(integer2, integer3) >> 24 == 0) {
+            for (int integer2 = 0; integer2 < dgs.getWidth(); ++integer2) {
+                for (int integer3 = 0; integer3 < dgs.getHeight(); ++integer3) {
+                    if (dgs.getPixelRGBA(integer2, integer3) >> 24 == 0) {
                         boolean4 = true;
                         break Label_0072;
                     }
                 }
             }
             for (int integer2 = 1; integer2 <= integer; ++integer2) {
-                final NativeImage cxr2 = arr3[integer2 - 1];
-                final NativeImage cxr3 = new NativeImage(cxr2.getWidth() >> 1, cxr2.getHeight() >> 1, false);
-                final int integer4 = cxr3.getWidth();
-                final int integer5 = cxr3.getHeight();
+                final NativeImage dgs2 = arr3[integer2 - 1];
+                final NativeImage dgs3 = new NativeImage(dgs2.getWidth() >> 1, dgs2.getHeight() >> 1, false);
+                final int integer4 = dgs3.getWidth();
+                final int integer5 = dgs3.getHeight();
                 for (int integer6 = 0; integer6 < integer4; ++integer6) {
                     for (int integer7 = 0; integer7 < integer5; ++integer7) {
-                        cxr3.setPixelRGBA(integer6, integer7, alphaBlend(cxr2.getPixelRGBA(integer6 * 2 + 0, integer7 * 2 + 0), cxr2.getPixelRGBA(integer6 * 2 + 1, integer7 * 2 + 0), cxr2.getPixelRGBA(integer6 * 2 + 0, integer7 * 2 + 1), cxr2.getPixelRGBA(integer6 * 2 + 1, integer7 * 2 + 1), boolean4));
+                        dgs3.setPixelRGBA(integer6, integer7, alphaBlend(dgs2.getPixelRGBA(integer6 * 2 + 0, integer7 * 2 + 0), dgs2.getPixelRGBA(integer6 * 2 + 1, integer7 * 2 + 0), dgs2.getPixelRGBA(integer6 * 2 + 0, integer7 * 2 + 1), dgs2.getPixelRGBA(integer6 * 2 + 1, integer7 * 2 + 1), boolean4));
                     }
                 }
-                arr3[integer2] = cxr3;
+                arr3[integer2] = dgs3;
             }
         }
         return arr3;
diff --git a/src/net/minecraft/client/renderer/texture/MissingTextureAtlasSprite.java b/src/net/minecraft/client/renderer/texture/MissingTextureAtlasSprite.java
index 65b5751..d5d14bb 100644
--- a/src/net/minecraft/client/renderer/texture/MissingTextureAtlasSprite.java
+++ b/src/net/minecraft/client/renderer/texture/MissingTextureAtlasSprite.java
@@ -17,12 +17,12 @@ public final class MissingTextureAtlasSprite extends TextureAtlasSprite {
     private static final LazyLoadedValue<NativeImage> MISSING_IMAGE_DATA;
     private static final Info INFO;
     
-    private MissingTextureAtlasSprite(final TextureAtlas eai, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        super(eai, MissingTextureAtlasSprite.INFO, integer2, integer3, integer4, integer5, integer6, MissingTextureAtlasSprite.MISSING_IMAGE_DATA.get());
+    private MissingTextureAtlasSprite(final TextureAtlas elu, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        super(elu, MissingTextureAtlasSprite.INFO, integer2, integer3, integer4, integer5, integer6, MissingTextureAtlasSprite.MISSING_IMAGE_DATA.get());
     }
     
-    public static MissingTextureAtlasSprite newInstance(final TextureAtlas eai, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        return new MissingTextureAtlasSprite(eai, integer2, integer3, integer4, integer5, integer6);
+    public static MissingTextureAtlasSprite newInstance(final TextureAtlas elu, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        return new MissingTextureAtlasSprite(elu, integer2, integer3, integer4, integer5, integer6);
     }
     
     public static ResourceLocation getLocation() {
@@ -50,27 +50,27 @@ public final class MissingTextureAtlasSprite extends TextureAtlasSprite {
     
     static {
         MISSING_TEXTURE_LOCATION = new ResourceLocation("missingno");
-        final NativeImage cxr1;
+        final NativeImage dgs1;
         final int integer2;
         final int integer3;
         int integer4;
         int integer5;
         MISSING_IMAGE_DATA = new LazyLoadedValue<NativeImage>(() -> {
-            cxr1 = new NativeImage(16, 16, false);
+            dgs1 = new NativeImage(16, 16, false);
             integer2 = -16777216;
             integer3 = -524040;
             for (integer4 = 0; integer4 < 16; ++integer4) {
                 for (integer5 = 0; integer5 < 16; ++integer5) {
                     if (integer4 < 8 ^ integer5 < 8) {
-                        cxr1.setPixelRGBA(integer5, integer4, -524040);
+                        dgs1.setPixelRGBA(integer5, integer4, -524040);
                     }
                     else {
-                        cxr1.setPixelRGBA(integer5, integer4, -16777216);
+                        dgs1.setPixelRGBA(integer5, integer4, -16777216);
                     }
                 }
             }
-            cxr1.untrack();
-            return cxr1;
+            dgs1.untrack();
+            return dgs1;
         });
         INFO = new Info(MissingTextureAtlasSprite.MISSING_TEXTURE_LOCATION, 16, 16, new AnimationMetadataSection(Lists.<AnimationFrame>newArrayList(new AnimationFrame(0, -1)), 16, 16, 1, false));
     }
diff --git a/src/net/minecraft/client/renderer/texture/OverlayTexture.java b/src/net/minecraft/client/renderer/texture/OverlayTexture.java
index 5565738..bfe71ad 100644
--- a/src/net/minecraft/client/renderer/texture/OverlayTexture.java
+++ b/src/net/minecraft/client/renderer/texture/OverlayTexture.java
@@ -9,15 +9,15 @@ public class OverlayTexture implements AutoCloseable {
     
     public OverlayTexture() {
         this.texture = new DynamicTexture(16, 16, false);
-        final NativeImage cxr2 = this.texture.getPixels();
+        final NativeImage dgs2 = this.texture.getPixels();
         for (int integer3 = 0; integer3 < 16; ++integer3) {
             for (int integer4 = 0; integer4 < 16; ++integer4) {
                 if (integer3 < 8) {
-                    cxr2.setPixelRGBA(integer4, integer3, -1308622593);
+                    dgs2.setPixelRGBA(integer4, integer3, -1308622593);
                 }
                 else {
                     final int integer5 = (int)((1.0f - integer4 / 15.0f * 0.75f) * 255.0f);
-                    cxr2.setPixelRGBA(integer4, integer3, integer5 << 24 | 0xFFFFFF);
+                    dgs2.setPixelRGBA(integer4, integer3, integer5 << 24 | 0xFFFFFF);
                 }
             }
         }
@@ -29,7 +29,7 @@ public class OverlayTexture implements AutoCloseable {
         RenderSystem.scalef(0.06666667f, 0.06666667f, 0.06666667f);
         RenderSystem.matrixMode(5888);
         this.texture.bind();
-        cxr2.upload(0, 0, 0, 0, 0, cxr2.getWidth(), cxr2.getHeight(), false, true, false, false);
+        dgs2.upload(0, 0, 0, 0, 0, dgs2.getWidth(), dgs2.getHeight(), false, true, false, false);
         RenderSystem.activeTexture(33984);
     }
     
diff --git a/src/net/minecraft/client/renderer/texture/PreloadedTexture.java b/src/net/minecraft/client/renderer/texture/PreloadedTexture.java
index 98fcf1d..1ac34db 100644
--- a/src/net/minecraft/client/renderer/texture/PreloadedTexture.java
+++ b/src/net/minecraft/client/renderer/texture/PreloadedTexture.java
@@ -12,19 +12,19 @@ public class PreloadedTexture extends SimpleTexture {
     @Nullable
     private CompletableFuture<TextureImage> future;
     
-    public PreloadedTexture(final ResourceManager zb, final ResourceLocation sm, final Executor executor) {
-        super(sm);
-        this.future = CompletableFuture.<TextureImage>supplyAsync(() -> TextureImage.load(zb, sm), executor);
+    public PreloadedTexture(final ResourceManager abc, final ResourceLocation uh, final Executor executor) {
+        super(uh);
+        this.future = CompletableFuture.<TextureImage>supplyAsync(() -> TextureImage.load(abc, uh), executor);
     }
     
     @Override
-    protected TextureImage getTextureImage(final ResourceManager zb) {
+    protected TextureImage getTextureImage(final ResourceManager abc) {
         if (this.future != null) {
             final TextureImage a3 = this.future.join();
             this.future = null;
             return a3;
         }
-        return TextureImage.load(zb, this.location);
+        return TextureImage.load(abc, this.location);
     }
     
     public CompletableFuture<Void> getFuture() {
@@ -32,8 +32,8 @@ public class PreloadedTexture extends SimpleTexture {
     }
     
     @Override
-    public void reset(final TextureManager eak, final ResourceManager zb, final ResourceLocation sm, final Executor executor) {
-        (this.future = CompletableFuture.<TextureImage>supplyAsync(() -> TextureImage.load(zb, this.location), Util.backgroundExecutor())).thenRunAsync(() -> eak.register(this.location, this), executor(executor));
+    public void reset(final TextureManager elw, final ResourceManager abc, final ResourceLocation uh, final Executor executor) {
+        (this.future = CompletableFuture.<TextureImage>supplyAsync(() -> TextureImage.load(abc, this.location), Util.backgroundExecutor())).thenRunAsync(() -> elw.register(this.location, this), executor(executor));
     }
     
     private static Executor executor(final Executor executor) {
diff --git a/src/net/minecraft/client/renderer/texture/SimpleTexture.java b/src/net/minecraft/client/renderer/texture/SimpleTexture.java
index 47b5a42..71a231c 100644
--- a/src/net/minecraft/client/renderer/texture/SimpleTexture.java
+++ b/src/net/minecraft/client/renderer/texture/SimpleTexture.java
@@ -18,41 +18,41 @@ public class SimpleTexture extends AbstractTexture {
     private static final Logger LOGGER;
     protected final ResourceLocation location;
     
-    public SimpleTexture(final ResourceLocation sm) {
-        this.location = sm;
+    public SimpleTexture(final ResourceLocation uh) {
+        this.location = uh;
     }
     
     @Override
-    public void load(final ResourceManager zb) throws IOException {
-        final TextureImage a3 = this.getTextureImage(zb);
+    public void load(final ResourceManager abc) throws IOException {
+        final TextureImage a3 = this.getTextureImage(abc);
         a3.throwIfError();
-        final TextureMetadataSection ebs6 = a3.getTextureMetadata();
+        final TextureMetadataSection ene6 = a3.getTextureMetadata();
         boolean boolean4;
         boolean boolean5;
-        if (ebs6 != null) {
-            boolean4 = ebs6.isBlur();
-            boolean5 = ebs6.isClamp();
+        if (ene6 != null) {
+            boolean4 = ene6.isBlur();
+            boolean5 = ene6.isClamp();
         }
         else {
             boolean4 = false;
             boolean5 = false;
         }
-        final NativeImage cxr7 = a3.getImage();
+        final NativeImage dgs7 = a3.getImage();
         if (!RenderSystem.isOnRenderThreadOrInit()) {
-            RenderSystem.recordRenderCall(() -> this.doLoad(cxr7, boolean4, boolean5));
+            RenderSystem.recordRenderCall(() -> this.doLoad(dgs7, boolean4, boolean5));
         }
         else {
-            this.doLoad(cxr7, boolean4, boolean5);
+            this.doLoad(dgs7, boolean4, boolean5);
         }
     }
     
-    private void doLoad(final NativeImage cxr, final boolean boolean2, final boolean boolean3) {
-        TextureUtil.prepareImage(this.getId(), 0, cxr.getWidth(), cxr.getHeight());
-        cxr.upload(0, 0, 0, 0, 0, cxr.getWidth(), cxr.getHeight(), boolean2, boolean3, false, true);
+    private void doLoad(final NativeImage dgs, final boolean boolean2, final boolean boolean3) {
+        TextureUtil.prepareImage(this.getId(), 0, dgs.getWidth(), dgs.getHeight());
+        dgs.upload(0, 0, 0, 0, 0, dgs.getWidth(), dgs.getHeight(), boolean2, boolean3, false, true);
     }
     
-    protected TextureImage getTextureImage(final ResourceManager zb) {
-        return TextureImage.load(zb, this.location);
+    protected TextureImage getTextureImage(final ResourceManager abc) {
+        return TextureImage.load(abc, this.location);
     }
     
     static {
@@ -73,23 +73,23 @@ public class SimpleTexture extends AbstractTexture {
             this.image = null;
         }
         
-        public TextureImage(@Nullable final TextureMetadataSection ebs, final NativeImage cxr) {
+        public TextureImage(@Nullable final TextureMetadataSection ene, final NativeImage dgs) {
             this.exception = null;
-            this.metadata = ebs;
-            this.image = cxr;
+            this.metadata = ene;
+            this.image = dgs;
         }
         
-        public static TextureImage load(final ResourceManager zb, final ResourceLocation sm) {
-            try (final Resource za3 = zb.getResource(sm)) {
-                final NativeImage cxr5 = NativeImage.read(za3.getInputStream());
-                TextureMetadataSection ebs6 = null;
+        public static TextureImage load(final ResourceManager abc, final ResourceLocation uh) {
+            try (final Resource abb3 = abc.getResource(uh)) {
+                final NativeImage dgs5 = NativeImage.read(abb3.getInputStream());
+                TextureMetadataSection ene6 = null;
                 try {
-                    ebs6 = za3.<TextureMetadataSection>getMetadata((MetadataSectionSerializer<TextureMetadataSection>)TextureMetadataSection.SERIALIZER);
+                    ene6 = abb3.<TextureMetadataSection>getMetadata((MetadataSectionSerializer<TextureMetadataSection>)TextureMetadataSection.SERIALIZER);
                 }
                 catch (RuntimeException runtimeException7) {
-                    SimpleTexture.LOGGER.warn("Failed reading metadata of: {}", sm, runtimeException7);
+                    SimpleTexture.LOGGER.warn("Failed reading metadata of: {}", uh, runtimeException7);
                 }
-                return new TextureImage(ebs6, cxr5);
+                return new TextureImage(ene6, dgs5);
             }
             catch (IOException iOException3) {
                 return new TextureImage(iOException3);
diff --git a/src/net/minecraft/client/renderer/texture/TextureAtlas.java b/src/net/minecraft/client/renderer/texture/TextureAtlas.java
index 8ab71ae..12219c6 100644
--- a/src/net/minecraft/client/renderer/texture/TextureAtlas.java
+++ b/src/net/minecraft/client/renderer/texture/TextureAtlas.java
@@ -47,16 +47,16 @@ public class TextureAtlas extends AbstractTexture implements Tickable {
     private final ResourceLocation location;
     private final int maxSupportedTextureSize;
     
-    public TextureAtlas(final ResourceLocation sm) {
+    public TextureAtlas(final ResourceLocation uh) {
         this.animatedTextures = Lists.newArrayList();
         this.sprites = Sets.newHashSet();
         this.texturesByName = Maps.newHashMap();
-        this.location = sm;
+        this.location = uh;
         this.maxSupportedTextureSize = RenderSystem.maxSupportedTextureSize();
     }
     
     @Override
-    public void load(final ResourceManager zb) throws IOException {
+    public void load(final ResourceManager abc) throws IOException {
     }
     
     public void reload(final Preparations a) {
@@ -65,28 +65,28 @@ public class TextureAtlas extends AbstractTexture implements Tickable {
         TextureAtlas.LOGGER.info("Created: {}x{}x{} {}-atlas", a.width, a.height, a.mipLevel, this.location);
         TextureUtil.prepareImage(this.getId(), a.mipLevel, a.width, a.height);
         this.clearTextureData();
-        for (final TextureAtlasSprite eaj4 : a.regions) {
-            this.texturesByName.put(eaj4.getName(), eaj4);
+        for (final TextureAtlasSprite elv4 : a.regions) {
+            this.texturesByName.put(elv4.getName(), elv4);
             try {
-                eaj4.uploadFirstFrame();
+                elv4.uploadFirstFrame();
             }
             catch (Throwable throwable5) {
-                final CrashReport h6 = CrashReport.forThrowable(throwable5, "Stitching texture atlas");
-                final CrashReportCategory i7 = h6.addCategory("Texture being stitched together");
-                i7.setDetail("Atlas path", this.location);
-                i7.setDetail("Sprite", eaj4);
-                throw new ReportedException(h6);
+                final CrashReport j6 = CrashReport.forThrowable(throwable5, "Stitching texture atlas");
+                final CrashReportCategory k7 = j6.addCategory("Texture being stitched together");
+                k7.setDetail("Atlas path", this.location);
+                k7.setDetail("Sprite", elv4);
+                throw new ReportedException(j6);
             }
-            if (eaj4.isAnimation()) {
-                this.animatedTextures.add(eaj4);
+            if (elv4.isAnimation()) {
+                this.animatedTextures.add(elv4);
             }
         }
     }
     
-    public Preparations prepareToStitch(final ResourceManager zb, final Stream<ResourceLocation> stream, final ProfilerFiller aio, final int integer) {
-        aio.push("preparing");
-        final Set<ResourceLocation> set6 = stream.peek(sm -> {
-            if (sm == null) {
+    public Preparations prepareToStitch(final ResourceManager abc, final Stream<ResourceLocation> stream, final ProfilerFiller ami, final int integer) {
+        ami.push("preparing");
+        final Set<ResourceLocation> set6 = stream.peek(uh -> {
+            if (uh == null) {
                 throw new IllegalArgumentException("Location cannot be null!");
             }
             else {
@@ -94,18 +94,18 @@ public class TextureAtlas extends AbstractTexture implements Tickable {
             }
         }).collect(Collectors.toSet());
         final int integer2 = this.maxSupportedTextureSize;
-        final Stitcher eag8 = new Stitcher(integer2, integer2, integer);
+        final Stitcher els8 = new Stitcher(integer2, integer2, integer);
         int integer3 = Integer.MAX_VALUE;
         int integer4 = 1 << integer;
-        aio.popPush("extracting_frames");
-        for (final TextureAtlasSprite.Info a2 : this.getBasicSpriteInfos(zb, set6)) {
+        ami.popPush("extracting_frames");
+        for (final TextureAtlasSprite.Info a2 : this.getBasicSpriteInfos(abc, set6)) {
             integer3 = Math.min(integer3, Math.min(a2.width(), a2.height()));
             final int integer5 = Math.min(Integer.lowestOneBit(a2.width()), Integer.lowestOneBit(a2.height()));
             if (integer5 < integer4) {
                 TextureAtlas.LOGGER.warn("Texture {} with size {}x{} limits mip level from {} to {}", a2.name(), a2.width(), a2.height(), Mth.log2(integer4), Mth.log2(integer5));
                 integer4 = integer5;
             }
-            eag8.registerSprite(a2);
+            els8.registerSprite(a2);
         }
         final int integer6 = Math.min(integer3, integer4);
         final int integer7 = Mth.log2(integer6);
@@ -117,79 +117,79 @@ public class TextureAtlas extends AbstractTexture implements Tickable {
         else {
             integer5 = integer;
         }
-        aio.popPush("register");
-        eag8.registerSprite(MissingTextureAtlasSprite.info());
-        aio.popPush("stitching");
+        ami.popPush("register");
+        els8.registerSprite(MissingTextureAtlasSprite.info());
+        ami.popPush("stitching");
         try {
-            eag8.stitch();
+            els8.stitch();
         }
-        catch (StitcherException eah14) {
-            final CrashReport h15 = CrashReport.forThrowable(eah14, "Stitching");
-            final CrashReportCategory i16 = h15.addCategory("Stitcher");
-            i16.setDetail("Sprites", eah14.getAllSprites().stream().map(a -> String.format("%s[%dx%d]", a.name(), a.width(), a.height())).collect(Collectors.joining(",")));
-            i16.setDetail("Max Texture Size", integer2);
-            throw new ReportedException(h15);
+        catch (StitcherException elt14) {
+            final CrashReport j15 = CrashReport.forThrowable(elt14, "Stitching");
+            final CrashReportCategory k16 = j15.addCategory("Stitcher");
+            k16.setDetail("Sprites", elt14.getAllSprites().stream().map(a -> String.format("%s[%dx%d]", a.name(), a.width(), a.height())).collect(Collectors.joining(",")));
+            k16.setDetail("Max Texture Size", integer2);
+            throw new ReportedException(j15);
         }
-        aio.popPush("loading");
-        final List<TextureAtlasSprite> list14 = this.getLoadedSprites(zb, eag8, integer5);
-        aio.pop();
-        return new Preparations(set6, eag8.getWidth(), eag8.getHeight(), integer5, list14);
+        ami.popPush("loading");
+        final List<TextureAtlasSprite> list14 = this.getLoadedSprites(abc, els8, integer5);
+        ami.pop();
+        return new Preparations(set6, els8.getWidth(), els8.getHeight(), integer5, list14);
     }
     
-    private Collection<TextureAtlasSprite.Info> getBasicSpriteInfos(final ResourceManager zb, final Set<ResourceLocation> set) {
+    private Collection<TextureAtlasSprite.Info> getBasicSpriteInfos(final ResourceManager abc, final Set<ResourceLocation> set) {
         final List<CompletableFuture<?>> list4 = Lists.newArrayList();
         final ConcurrentLinkedQueue<TextureAtlasSprite.Info> concurrentLinkedQueue5 = new ConcurrentLinkedQueue<TextureAtlasSprite.Info>();
-        for (final ResourceLocation sm7 : set) {
-            if (MissingTextureAtlasSprite.getLocation().equals(sm7)) {
+        for (final ResourceLocation uh7 : set) {
+            if (MissingTextureAtlasSprite.getLocation().equals(uh7)) {
                 continue;
             }
             final ResourceLocation resourceLocation;
-            final ResourceLocation sm8;
-            Resource za7;
-            PngInfo cxs9;
-            AnimationMetadataSection ebj10;
+            final ResourceLocation uh8;
+            Resource abb7;
+            PngInfo dgt9;
+            AnimationMetadataSection emv10;
             Pair<Integer, Integer> pair11;
             TextureAtlasSprite.Info a6;
             final Throwable t2;
             final ConcurrentLinkedQueue<TextureAtlasSprite.Info> concurrentLinkedQueue6;
             list4.add(CompletableFuture.runAsync(() -> {
-                sm8 = this.getResourceLocation(resourceLocation);
+                uh8 = this.getResourceLocation(resourceLocation);
                 try {
-                    za7 = zb.getResource(sm8);
+                    abb7 = abc.getResource(uh8);
                     try {
-                        cxs9 = new PngInfo(za7.toString(), za7.getInputStream());
-                        ebj10 = za7.<AnimationMetadataSection>getMetadata((MetadataSectionSerializer<AnimationMetadataSection>)AnimationMetadataSection.SERIALIZER);
-                        if (ebj10 == null) {
-                            ebj10 = AnimationMetadataSection.EMPTY;
+                        dgt9 = new PngInfo(abb7.toString(), abb7.getInputStream());
+                        emv10 = abb7.<AnimationMetadataSection>getMetadata((MetadataSectionSerializer<AnimationMetadataSection>)AnimationMetadataSection.SERIALIZER);
+                        if (emv10 == null) {
+                            emv10 = AnimationMetadataSection.EMPTY;
                         }
-                        pair11 = ebj10.getFrameSize(cxs9.width, cxs9.height);
-                        a6 = new TextureAtlasSprite.Info(resourceLocation, (int)pair11.getFirst(), (int)pair11.getSecond(), ebj10);
+                        pair11 = emv10.getFrameSize(dgt9.width, dgt9.height);
+                        a6 = new TextureAtlasSprite.Info(resourceLocation, (int)pair11.getFirst(), (int)pair11.getSecond(), emv10);
                     }
                     catch (Throwable t) {
                         throw t;
                     }
                     finally {
-                        if (za7 != null) {
+                        if (abb7 != null) {
                             if (t2 != null) {
                                 try {
-                                    za7.close();
+                                    abb7.close();
                                 }
                                 catch (Throwable exception) {
                                     t2.addSuppressed(exception);
                                 }
                             }
                             else {
-                                za7.close();
+                                abb7.close();
                             }
                         }
                     }
                 }
                 catch (RuntimeException runtimeException7) {
-                    TextureAtlas.LOGGER.error("Unable to parse metadata from {} : {}", sm8, runtimeException7);
+                    TextureAtlas.LOGGER.error("Unable to parse metadata from {} : {}", uh8, runtimeException7);
                     return;
                 }
                 catch (IOException iOException7) {
-                    TextureAtlas.LOGGER.error("Using missing texture, unable to load {} : {}", sm8, iOException7);
+                    TextureAtlas.LOGGER.error("Using missing texture, unable to load {} : {}", uh8, iOException7);
                     return;
                 }
                 concurrentLinkedQueue6.add(a6);
@@ -200,24 +200,24 @@ public class TextureAtlas extends AbstractTexture implements Tickable {
         return concurrentLinkedQueue5;
     }
     
-    private List<TextureAtlasSprite> getLoadedSprites(final ResourceManager zb, final Stitcher eag, final int integer) {
+    private List<TextureAtlasSprite> getLoadedSprites(final ResourceManager abc, final Stitcher els, final int integer) {
         final ConcurrentLinkedQueue<TextureAtlasSprite> concurrentLinkedQueue5 = new ConcurrentLinkedQueue<TextureAtlasSprite>();
         final List<CompletableFuture<?>> list6 = Lists.newArrayList();
-        MissingTextureAtlasSprite eac11;
+        MissingTextureAtlasSprite elo11;
         final ConcurrentLinkedQueue<MissingTextureAtlasSprite> concurrentLinkedQueue6;
         final List<CompletableFuture<Void>> list7;
-        TextureAtlasSprite eaj10;
+        TextureAtlasSprite elv10;
         final ConcurrentLinkedQueue<TextureAtlasSprite> concurrentLinkedQueue7;
-        eag.gatherSprites((a, integer6, integer7, integer8, integer9) -> {
+        els.gatherSprites((a, integer6, integer7, integer8, integer9) -> {
             if (a == MissingTextureAtlasSprite.info()) {
-                eac11 = MissingTextureAtlasSprite.newInstance(this, integer, integer6, integer7, integer8, integer9);
-                concurrentLinkedQueue6.add(eac11);
+                elo11 = MissingTextureAtlasSprite.newInstance(this, integer, integer6, integer7, integer8, integer9);
+                concurrentLinkedQueue6.add(elo11);
             }
             else {
                 list7.add(CompletableFuture.runAsync(() -> {
-                    eaj10 = this.load(zb, a, integer6, integer7, integer, integer8, integer9);
-                    if (eaj10 != null) {
-                        concurrentLinkedQueue7.add(eaj10);
+                    elv10 = this.load(abc, a, integer6, integer7, integer, integer8, integer9);
+                    if (elv10 != null) {
+                        concurrentLinkedQueue7.add(elv10);
                     }
                 }, Util.backgroundExecutor()));
             }
@@ -228,30 +228,30 @@ public class TextureAtlas extends AbstractTexture implements Tickable {
     }
     
     @Nullable
-    private TextureAtlasSprite load(final ResourceManager zb, final TextureAtlasSprite.Info a, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7) {
-        final ResourceLocation sm9 = this.getResourceLocation(a.name());
-        try (final Resource za10 = zb.getResource(sm9)) {
-            final NativeImage cxr12 = NativeImage.read(za10.getInputStream());
-            return new TextureAtlasSprite(this, a, integer5, integer3, integer4, integer6, integer7, cxr12);
+    private TextureAtlasSprite load(final ResourceManager abc, final TextureAtlasSprite.Info a, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7) {
+        final ResourceLocation uh9 = this.getResourceLocation(a.name());
+        try (final Resource abb10 = abc.getResource(uh9)) {
+            final NativeImage dgs12 = NativeImage.read(abb10.getInputStream());
+            return new TextureAtlasSprite(this, a, integer5, integer3, integer4, integer6, integer7, dgs12);
         }
         catch (RuntimeException runtimeException10) {
-            TextureAtlas.LOGGER.error("Unable to parse metadata from {}", sm9, runtimeException10);
+            TextureAtlas.LOGGER.error("Unable to parse metadata from {}", uh9, runtimeException10);
             return null;
         }
         catch (IOException iOException10) {
-            TextureAtlas.LOGGER.error("Using missing texture, unable to load {}", sm9, iOException10);
+            TextureAtlas.LOGGER.error("Using missing texture, unable to load {}", uh9, iOException10);
             return null;
         }
     }
     
-    private ResourceLocation getResourceLocation(final ResourceLocation sm) {
-        return new ResourceLocation(sm.getNamespace(), String.format("textures/%s%s", sm.getPath(), ".png"));
+    private ResourceLocation getResourceLocation(final ResourceLocation uh) {
+        return new ResourceLocation(uh.getNamespace(), String.format("textures/%s%s", uh.getPath(), ".png"));
     }
     
     public void cycleAnimationFrames() {
         this.bind();
-        for (final TextureAtlasSprite eaj3 : this.animatedTextures) {
-            eaj3.cycleFrames();
+        for (final TextureAtlasSprite elv3 : this.animatedTextures) {
+            elv3.cycleFrames();
         }
     }
     
@@ -265,17 +265,17 @@ public class TextureAtlas extends AbstractTexture implements Tickable {
         }
     }
     
-    public TextureAtlasSprite getSprite(final ResourceLocation sm) {
-        final TextureAtlasSprite eaj3 = this.texturesByName.get(sm);
-        if (eaj3 == null) {
+    public TextureAtlasSprite getSprite(final ResourceLocation uh) {
+        final TextureAtlasSprite elv3 = this.texturesByName.get(uh);
+        if (elv3 == null) {
             return this.texturesByName.get(MissingTextureAtlasSprite.getLocation());
         }
-        return eaj3;
+        return elv3;
     }
     
     public void clearTextureData() {
-        for (final TextureAtlasSprite eaj3 : this.texturesByName.values()) {
-            eaj3.close();
+        for (final TextureAtlasSprite elv3 : this.texturesByName.values()) {
+            elv3.close();
         }
         this.texturesByName.clear();
         this.animatedTextures.clear();
diff --git a/src/net/minecraft/client/renderer/texture/TextureAtlasSprite.java b/src/net/minecraft/client/renderer/texture/TextureAtlasSprite.java
index 50104cb..e95a2bf 100644
--- a/src/net/minecraft/client/renderer/texture/TextureAtlasSprite.java
+++ b/src/net/minecraft/client/renderer/texture/TextureAtlasSprite.java
@@ -34,9 +34,9 @@ public class TextureAtlasSprite implements AutoCloseable {
     private int frame;
     private int subFrame;
     
-    protected TextureAtlasSprite(final TextureAtlas eai, final Info a, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final NativeImage cxr) {
-        this.atlas = eai;
-        AnimationMetadataSection ebj10 = a.metadata;
+    protected TextureAtlasSprite(final TextureAtlas elu, final Info a, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final NativeImage dgs) {
+        this.atlas = elu;
+        AnimationMetadataSection emv10 = a.metadata;
         final int integer8 = a.width;
         final int integer9 = a.height;
         this.x = integer6;
@@ -45,15 +45,15 @@ public class TextureAtlasSprite implements AutoCloseable {
         this.u1 = (integer6 + integer8) / (float)integer4;
         this.v0 = integer7 / (float)integer5;
         this.v1 = (integer7 + integer9) / (float)integer5;
-        final int integer10 = cxr.getWidth() / ebj10.getFrameWidth(integer8);
-        final int integer11 = cxr.getHeight() / ebj10.getFrameHeight(integer9);
-        if (ebj10.getFrameCount() > 0) {
-            final int integer12 = ebj10.getUniqueFrameIndices().stream().max(Integer::compareTo).get() + 1;
+        final int integer10 = dgs.getWidth() / emv10.getFrameWidth(integer8);
+        final int integer11 = dgs.getHeight() / emv10.getFrameHeight(integer9);
+        if (emv10.getFrameCount() > 0) {
+            final int integer12 = emv10.getUniqueFrameIndices().stream().max(Integer::compareTo).get() + 1;
             this.framesX = new int[integer12];
             this.framesY = new int[integer12];
             Arrays.fill(this.framesX, -1);
             Arrays.fill(this.framesY, -1);
-            for (final int integer13 : ebj10.getUniqueFrameIndices()) {
+            for (final int integer13 : emv10.getUniqueFrameIndices()) {
                 if (integer13 >= integer10 * integer11) {
                     throw new RuntimeException("invalid frameindex " + integer13);
                 }
@@ -76,39 +76,39 @@ public class TextureAtlasSprite implements AutoCloseable {
                     list15.add(new AnimationFrame(integer15, -1));
                 }
             }
-            ebj10 = new AnimationMetadataSection(list15, integer8, integer9, ebj10.getDefaultFrameTime(), ebj10.isInterpolatedFrames());
+            emv10 = new AnimationMetadataSection(list15, integer8, integer9, emv10.getDefaultFrameTime(), emv10.isInterpolatedFrames());
         }
-        this.info = new Info(a.name, integer8, integer9, ebj10);
-        this.metadata = ebj10;
+        this.info = new Info(a.name, integer8, integer9, emv10);
+        this.metadata = emv10;
         try {
             try {
-                this.mainImage = MipmapGenerator.generateMipLevels(cxr, integer3);
+                this.mainImage = MipmapGenerator.generateMipLevels(dgs, integer3);
             }
             catch (Throwable throwable15) {
-                final CrashReport h16 = CrashReport.forThrowable(throwable15, "Generating mipmaps for frame");
-                final CrashReportCategory i17 = h16.addCategory("Frame being iterated");
+                final CrashReport j16 = CrashReport.forThrowable(throwable15, "Generating mipmaps for frame");
+                final CrashReportCategory k17 = j16.addCategory("Frame being iterated");
                 final StringBuilder stringBuilder2;
-                i17.setDetail("First frame", () -> {
+                k17.setDetail("First frame", () -> {
                     stringBuilder2 = new StringBuilder();
                     if (stringBuilder2.length() > 0) {
                         stringBuilder2.append(", ");
                     }
-                    stringBuilder2.append(cxr.getWidth()).append("x").append(cxr.getHeight());
+                    stringBuilder2.append(dgs.getWidth()).append("x").append(dgs.getHeight());
                     return stringBuilder2.toString();
                 });
-                throw new ReportedException(h16);
+                throw new ReportedException(j16);
             }
         }
         catch (Throwable throwable15) {
-            final CrashReport h16 = CrashReport.forThrowable(throwable15, "Applying mipmap");
-            final CrashReportCategory i17 = h16.addCategory("Sprite being mipmapped");
-            i17.setDetail("Sprite name", () -> this.getName().toString());
-            i17.setDetail("Sprite size", () -> this.getWidth() + " x " + this.getHeight());
-            i17.setDetail("Sprite frames", () -> this.getFrameCount() + " frames");
-            i17.setDetail("Mipmap levels", integer3);
-            throw new ReportedException(h16);
+            final CrashReport j16 = CrashReport.forThrowable(throwable15, "Applying mipmap");
+            final CrashReportCategory k17 = j16.addCategory("Sprite being mipmapped");
+            k17.setDetail("Sprite name", () -> this.getName().toString());
+            k17.setDetail("Sprite size", () -> this.getWidth() + " x " + this.getHeight());
+            k17.setDetail("Sprite frames", () -> this.getFrameCount() + " frames");
+            k17.setDetail("Mipmap levels", integer3);
+            throw new ReportedException(j16);
         }
-        if (ebj10.isInterpolatedFrames()) {
+        if (emv10.isInterpolatedFrames()) {
             this.interpolationData = new InterpolationData(a, integer3);
         }
         else {
@@ -176,9 +176,9 @@ public class TextureAtlasSprite implements AutoCloseable {
     
     @Override
     public void close() {
-        for (final NativeImage cxr5 : this.mainImage) {
-            if (cxr5 != null) {
-                cxr5.close();
+        for (final NativeImage dgs5 : this.mainImage) {
+            if (dgs5 != null) {
+                dgs5.close();
             }
         }
         if (this.interpolationData != null) {
@@ -236,8 +236,8 @@ public class TextureAtlasSprite implements AutoCloseable {
         return this.metadata.getFrameCount() > 1;
     }
     
-    public VertexConsumer wrap(final VertexConsumer cyo) {
-        return new SpriteCoordinateExpander(cyo, this);
+    public VertexConsumer wrap(final VertexConsumer dhp) {
+        return new SpriteCoordinateExpander(dhp, this);
     }
     
     public static final class Info {
@@ -246,11 +246,11 @@ public class TextureAtlasSprite implements AutoCloseable {
         private final int height;
         private final AnimationMetadataSection metadata;
         
-        public Info(final ResourceLocation sm, final int integer2, final int integer3, final AnimationMetadataSection ebj) {
-            this.name = sm;
+        public Info(final ResourceLocation uh, final int integer2, final int integer3, final AnimationMetadataSection emv) {
+            this.name = uh;
             this.width = integer2;
             this.height = integer3;
-            this.metadata = ebj;
+            this.metadata = emv;
         }
         
         public ResourceLocation name() {
@@ -313,9 +313,9 @@ public class TextureAtlasSprite implements AutoCloseable {
         
         @Override
         public void close() {
-            for (final NativeImage cxr5 : this.activeFrame) {
-                if (cxr5 != null) {
-                    cxr5.close();
+            for (final NativeImage dgs5 : this.activeFrame) {
+                if (dgs5 != null) {
+                    dgs5.close();
                 }
             }
         }
diff --git a/src/net/minecraft/client/renderer/texture/TextureManager.java b/src/net/minecraft/client/renderer/texture/TextureManager.java
index 719abb3..81dd358 100644
--- a/src/net/minecraft/client/renderer/texture/TextureManager.java
+++ b/src/net/minecraft/client/renderer/texture/TextureManager.java
@@ -27,7 +27,7 @@ import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 
-public class TextureManager implements Tickable, AutoCloseable, PreparableReloadListener {
+public class TextureManager implements PreparableReloadListener, Tickable, AutoCloseable {
     private static final Logger LOGGER;
     public static final ResourceLocation INTENTIONAL_MISSING_TEXTURE;
     private final Map<ResourceLocation, AbstractTexture> byPath;
@@ -35,72 +35,72 @@ public class TextureManager implements Tickable, AutoCloseable, PreparableReload
     private final Map<String, Integer> prefixRegister;
     private final ResourceManager resourceManager;
     
-    public TextureManager(final ResourceManager zb) {
+    public TextureManager(final ResourceManager abc) {
         this.byPath = Maps.newHashMap();
         this.tickableTextures = Sets.newHashSet();
         this.prefixRegister = Maps.newHashMap();
-        this.resourceManager = zb;
+        this.resourceManager = abc;
     }
     
-    public void bind(final ResourceLocation sm) {
+    public void bind(final ResourceLocation uh) {
         if (!RenderSystem.isOnRenderThread()) {
-            RenderSystem.recordRenderCall(() -> this._bind(sm));
+            RenderSystem.recordRenderCall(() -> this._bind(uh));
         }
         else {
-            this._bind(sm);
+            this._bind(uh);
         }
     }
     
-    private void _bind(final ResourceLocation sm) {
-        AbstractTexture dzw3 = this.byPath.get(sm);
-        if (dzw3 == null) {
-            dzw3 = new SimpleTexture(sm);
-            this.register(sm, dzw3);
+    private void _bind(final ResourceLocation uh) {
+        AbstractTexture elj3 = this.byPath.get(uh);
+        if (elj3 == null) {
+            elj3 = new SimpleTexture(uh);
+            this.register(uh, elj3);
         }
-        dzw3.bind();
+        elj3.bind();
     }
     
-    public void register(final ResourceLocation sm, AbstractTexture dzw) {
-        dzw = this.loadTexture(sm, dzw);
-        final AbstractTexture dzw2 = this.byPath.put(sm, dzw);
-        if (dzw2 != dzw) {
-            if (dzw2 != null && dzw2 != MissingTextureAtlasSprite.getTexture()) {
-                dzw2.releaseId();
-                this.tickableTextures.remove(dzw2);
+    public void register(final ResourceLocation uh, AbstractTexture elj) {
+        elj = this.loadTexture(uh, elj);
+        final AbstractTexture elj2 = this.byPath.put(uh, elj);
+        if (elj2 != elj) {
+            if (elj2 != null && elj2 != MissingTextureAtlasSprite.getTexture()) {
+                elj2.releaseId();
+                this.tickableTextures.remove(elj2);
             }
-            if (dzw instanceof Tickable) {
-                this.tickableTextures.add((Tickable)dzw);
+            if (elj instanceof Tickable) {
+                this.tickableTextures.add((Tickable)elj);
             }
         }
     }
     
-    private AbstractTexture loadTexture(final ResourceLocation sm, final AbstractTexture dzw) {
+    private AbstractTexture loadTexture(final ResourceLocation uh, final AbstractTexture elj) {
         try {
-            dzw.load(this.resourceManager);
-            return dzw;
+            elj.load(this.resourceManager);
+            return elj;
         }
         catch (IOException iOException4) {
-            if (sm != TextureManager.INTENTIONAL_MISSING_TEXTURE) {
-                TextureManager.LOGGER.warn("Failed to load texture: {}", sm, iOException4);
+            if (uh != TextureManager.INTENTIONAL_MISSING_TEXTURE) {
+                TextureManager.LOGGER.warn("Failed to load texture: {}", uh, iOException4);
             }
             return MissingTextureAtlasSprite.getTexture();
         }
         catch (Throwable throwable4) {
-            final CrashReport h5 = CrashReport.forThrowable(throwable4, "Registering texture");
-            final CrashReportCategory i6 = h5.addCategory("Resource location being registered");
-            final AbstractTexture dzw2 = dzw;
-            i6.setDetail("Resource location", sm);
-            i6.setDetail("Texture object class", () -> dzw2.getClass().getName());
-            throw new ReportedException(h5);
+            final CrashReport j5 = CrashReport.forThrowable(throwable4, "Registering texture");
+            final CrashReportCategory k6 = j5.addCategory("Resource location being registered");
+            final AbstractTexture elj2 = elj;
+            k6.setDetail("Resource location", uh);
+            k6.setDetail("Texture object class", () -> elj2.getClass().getName());
+            throw new ReportedException(j5);
         }
     }
     
     @Nullable
-    public AbstractTexture getTexture(final ResourceLocation sm) {
-        return this.byPath.get(sm);
+    public AbstractTexture getTexture(final ResourceLocation uh) {
+        return this.byPath.get(uh);
     }
     
-    public ResourceLocation register(final String string, final DynamicTexture dzy) {
+    public ResourceLocation register(final String string, final DynamicTexture ell) {
         Integer integer4 = this.prefixRegister.get(string);
         if (integer4 == null) {
             integer4 = 1;
@@ -109,16 +109,16 @@ public class TextureManager implements Tickable, AutoCloseable, PreparableReload
             ++integer4;
         }
         this.prefixRegister.put(string, integer4);
-        final ResourceLocation sm5 = new ResourceLocation(String.format("dynamic/%s_%d", string, integer4));
-        this.register(sm5, dzy);
-        return sm5;
+        final ResourceLocation uh5 = new ResourceLocation(String.format("dynamic/%s_%d", string, integer4));
+        this.register(uh5, ell);
+        return uh5;
     }
     
-    public CompletableFuture<Void> preload(final ResourceLocation sm, final Executor executor) {
-        if (!this.byPath.containsKey(sm)) {
-            final PreloadedTexture eae4 = new PreloadedTexture(this.resourceManager, sm, executor);
-            this.byPath.put(sm, eae4);
-            return eae4.getFuture().thenRunAsync(() -> this.register(sm, eae4), TextureManager::execute);
+    public CompletableFuture<Void> preload(final ResourceLocation uh, final Executor executor) {
+        if (!this.byPath.containsKey(uh)) {
+            final PreloadedTexture elq4 = new PreloadedTexture(this.resourceManager, uh, executor);
+            this.byPath.put(uh, elq4);
+            return elq4.getFuture().thenRunAsync(() -> this.register(uh, elq4), TextureManager::execute);
         }
         return CompletableFuture.<Void>completedFuture((Void)null);
     }
@@ -129,15 +129,15 @@ public class TextureManager implements Tickable, AutoCloseable, PreparableReload
     
     @Override
     public void tick() {
-        for (final Tickable eal3 : this.tickableTextures) {
-            eal3.tick();
+        for (final Tickable elx3 : this.tickableTextures) {
+            elx3.tick();
         }
     }
     
-    public void release(final ResourceLocation sm) {
-        final AbstractTexture dzw3 = this.getTexture(sm);
-        if (dzw3 != null) {
-            TextureUtil.releaseTextureId(dzw3.getId());
+    public void release(final ResourceLocation uh) {
+        final AbstractTexture elj3 = this.getTexture(uh);
+        if (elj3 != null) {
+            TextureUtil.releaseTextureId(elj3.getId());
         }
     }
     
@@ -150,24 +150,24 @@ public class TextureManager implements Tickable, AutoCloseable, PreparableReload
     }
     
     @Override
-    public CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager zb, final ProfilerFiller aio3, final ProfilerFiller aio4, final Executor executor5, final Executor executor6) {
+    public CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager abc, final ProfilerFiller ami3, final ProfilerFiller ami4, final Executor executor5, final Executor executor6) {
         final Iterator<Map.Entry<ResourceLocation, AbstractTexture>> iterator5;
         Map.Entry<ResourceLocation, AbstractTexture> entry6;
-        ResourceLocation sm7;
-        AbstractTexture dzw8;
+        ResourceLocation uh7;
+        AbstractTexture elj8;
         return CompletableFuture.allOf(TitleScreen.preloadResources(this, executor5), this.preload(AbstractWidget.WIDGETS_LOCATION, executor5)).thenCompose(a::wait).thenAcceptAsync(void3 -> {
             MissingTextureAtlasSprite.getTexture();
             RealmsMainScreen.updateTeaserImages(this.resourceManager);
             iterator5 = this.byPath.entrySet().iterator();
             while (iterator5.hasNext()) {
                 entry6 = iterator5.next();
-                sm7 = entry6.getKey();
-                dzw8 = entry6.getValue();
-                if (dzw8 == MissingTextureAtlasSprite.getTexture() && !sm7.equals(MissingTextureAtlasSprite.getLocation())) {
+                uh7 = entry6.getKey();
+                elj8 = entry6.getValue();
+                if (elj8 == MissingTextureAtlasSprite.getTexture() && !uh7.equals(MissingTextureAtlasSprite.getLocation())) {
                     iterator5.remove();
                 }
                 else {
-                    dzw8.reset(this, zb, sm7, executor6);
+                    elj8.reset(this, abc, uh7, executor6);
                 }
             }
         }, runnable -> RenderSystem.recordRenderCall(runnable::run));
diff --git a/src/net/minecraft/client/resources/AssetIndex.java b/src/net/minecraft/client/resources/AssetIndex.java
index 95a4b21..530920c 100644
--- a/src/net/minecraft/client/resources/AssetIndex.java
+++ b/src/net/minecraft/client/resources/AssetIndex.java
@@ -71,8 +71,8 @@ public class AssetIndex {
     }
     
     @Nullable
-    public File getFile(final ResourceLocation sm) {
-        return this.namespacedFiles.get(sm);
+    public File getFile(final ResourceLocation uh) {
+        return this.namespacedFiles.get(uh);
     }
     
     @Nullable
@@ -83,9 +83,9 @@ public class AssetIndex {
     public Collection<ResourceLocation> getFiles(final String string1, final String string2, final int integer, final Predicate<String> predicate) {
         final String string3;
         final boolean b;
-        return this.namespacedFiles.keySet().stream().filter(sm -> {
-            string3 = sm.getPath();
-            if (sm.getNamespace().equals(string2) && !string3.endsWith(".mcmeta")) {
+        return this.namespacedFiles.keySet().stream().filter(uh -> {
+            string3 = uh.getPath();
+            if (uh.getNamespace().equals(string2) && !string3.endsWith(".mcmeta")) {
                 if (string3.startsWith(string1 + "/") && predicate.test(string3)) {
                     return b;
                 }
diff --git a/src/net/minecraft/client/resources/ClientPackSource.java b/src/net/minecraft/client/resources/ClientPackSource.java
index 4bf38c1..60da057 100644
--- a/src/net/minecraft/client/resources/ClientPackSource.java
+++ b/src/net/minecraft/client/resources/ClientPackSource.java
@@ -1,5 +1,4 @@
 java.lang.StackOverflowError
-	at java.base/java.util.Collections$SetFromMap.contains(Collections.java:5564)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:21)
 	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
 	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
@@ -1023,3 +1022,4 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
 	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
diff --git a/src/net/minecraft/client/resources/DefaultClientResourcePack.java b/src/net/minecraft/client/resources/DefaultClientPackResources.java
similarity index 63%
rename from src/net/minecraft/client/resources/DefaultClientResourcePack.java
rename to src/net/minecraft/client/resources/DefaultClientPackResources.java
index 86cfe96..58762c5 100644
--- a/src/net/minecraft/client/resources/DefaultClientResourcePack.java
+++ b/src/net/minecraft/client/resources/DefaultClientPackResources.java
@@ -9,21 +9,21 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.VanillaPack;
+import net.minecraft.server.packs.VanillaPackResources;
 
-public class DefaultClientResourcePack extends VanillaPack {
+public class DefaultClientPackResources extends VanillaPackResources {
     private final AssetIndex assetIndex;
     
-    public DefaultClientResourcePack(final AssetIndex ean) {
+    public DefaultClientPackResources(final AssetIndex elz) {
         super("minecraft", "realms");
-        this.assetIndex = ean;
+        this.assetIndex = elz;
     }
     
     @Nullable
     @Override
-    protected InputStream getResourceAsStream(final PackType yf, final ResourceLocation sm) {
-        if (yf == PackType.CLIENT_RESOURCES) {
-            final File file4 = this.assetIndex.getFile(sm);
+    protected InputStream getResourceAsStream(final PackType aaf, final ResourceLocation uh) {
+        if (aaf == PackType.CLIENT_RESOURCES) {
+            final File file4 = this.assetIndex.getFile(uh);
             if (file4 != null && file4.exists()) {
                 try {
                     return new FileInputStream(file4);
@@ -31,18 +31,18 @@ public class DefaultClientResourcePack extends VanillaPack {
                 catch (FileNotFoundException ex) {}
             }
         }
-        return super.getResourceAsStream(yf, sm);
+        return super.getResourceAsStream(aaf, uh);
     }
     
     @Override
-    public boolean hasResource(final PackType yf, final ResourceLocation sm) {
-        if (yf == PackType.CLIENT_RESOURCES) {
-            final File file4 = this.assetIndex.getFile(sm);
+    public boolean hasResource(final PackType aaf, final ResourceLocation uh) {
+        if (aaf == PackType.CLIENT_RESOURCES) {
+            final File file4 = this.assetIndex.getFile(uh);
             if (file4 != null && file4.exists()) {
                 return true;
             }
         }
-        return super.hasResource(yf, sm);
+        return super.hasResource(aaf, uh);
     }
     
     @Nullable
@@ -59,8 +59,8 @@ public class DefaultClientResourcePack extends VanillaPack {
     }
     
     @Override
-    public Collection<ResourceLocation> getResources(final PackType yf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
-        final Collection<ResourceLocation> collection7 = super.getResources(yf, string2, string3, integer, predicate);
+    public Collection<ResourceLocation> getResources(final PackType aaf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
+        final Collection<ResourceLocation> collection7 = super.getResources(aaf, string2, string3, integer, predicate);
         collection7.addAll(this.assetIndex.getFiles(string3, string2, integer, predicate));
         return collection7;
     }
diff --git a/src/net/minecraft/client/resources/DirectAssetIndex.java b/src/net/minecraft/client/resources/DirectAssetIndex.java
index a7f35c1..01698fc 100644
--- a/src/net/minecraft/client/resources/DirectAssetIndex.java
+++ b/src/net/minecraft/client/resources/DirectAssetIndex.java
@@ -24,8 +24,8 @@ public class DirectAssetIndex extends AssetIndex {
     }
     
     @Override
-    public File getFile(final ResourceLocation sm) {
-        return new File(this.assetsDirectory, sm.toString().replace(':', '/'));
+    public File getFile(final ResourceLocation uh) {
+        return new File(this.assetsDirectory, uh.toString().replace(':', '/'));
     }
     
     @Override
diff --git a/src/net/minecraft/client/resources/FoliageColorReloadListener.java b/src/net/minecraft/client/resources/FoliageColorReloadListener.java
index 4de69c7..f1a85ef 100644
--- a/src/net/minecraft/client/resources/FoliageColorReloadListener.java
+++ b/src/net/minecraft/client/resources/FoliageColorReloadListener.java
@@ -11,9 +11,9 @@ public class FoliageColorReloadListener extends SimplePreparableReloadListener<i
     private static final ResourceLocation LOCATION;
     
     @Override
-    protected int[] prepare(final ResourceManager zb, final ProfilerFiller aio) {
+    protected int[] prepare(final ResourceManager abc, final ProfilerFiller ami) {
         try {
-            return LegacyStuffWrapper.getPixels(zb, FoliageColorReloadListener.LOCATION);
+            return LegacyStuffWrapper.getPixels(abc, FoliageColorReloadListener.LOCATION);
         }
         catch (IOException iOException4) {
             throw new IllegalStateException("Failed to load foliage color texture", iOException4);
@@ -21,7 +21,7 @@ public class FoliageColorReloadListener extends SimplePreparableReloadListener<i
     }
     
     @Override
-    protected void apply(final int[] arr, final ResourceManager zb, final ProfilerFiller aio) {
+    protected void apply(final int[] arr, final ResourceManager abc, final ProfilerFiller ami) {
         FoliageColor.init(arr);
     }
     
diff --git a/src/net/minecraft/client/resources/GrassColorReloadListener.java b/src/net/minecraft/client/resources/GrassColorReloadListener.java
index 137ef9a..8ab68c0 100644
--- a/src/net/minecraft/client/resources/GrassColorReloadListener.java
+++ b/src/net/minecraft/client/resources/GrassColorReloadListener.java
@@ -11,9 +11,9 @@ public class GrassColorReloadListener extends SimplePreparableReloadListener<int
     private static final ResourceLocation LOCATION;
     
     @Override
-    protected int[] prepare(final ResourceManager zb, final ProfilerFiller aio) {
+    protected int[] prepare(final ResourceManager abc, final ProfilerFiller ami) {
         try {
-            return LegacyStuffWrapper.getPixels(zb, GrassColorReloadListener.LOCATION);
+            return LegacyStuffWrapper.getPixels(abc, GrassColorReloadListener.LOCATION);
         }
         catch (IOException iOException4) {
             throw new IllegalStateException("Failed to load grass color texture", iOException4);
@@ -21,7 +21,7 @@ public class GrassColorReloadListener extends SimplePreparableReloadListener<int
     }
     
     @Override
-    protected void apply(final int[] arr, final ResourceManager zb, final ProfilerFiller aio) {
+    protected void apply(final int[] arr, final ResourceManager abc, final ProfilerFiller ami) {
         GrassColor.init(arr);
     }
     
diff --git a/src/net/minecraft/client/resources/LegacyPackResourcesAdapter.java b/src/net/minecraft/client/resources/LegacyPackResourcesAdapter.java
new file mode 100644
index 0000000..3e6f2fc
--- /dev/null
+++ b/src/net/minecraft/client/resources/LegacyPackResourcesAdapter.java
@@ -0,0 +1,950 @@
+package net.minecraft.client.resources;
+
+import net.minecraft.Util;
+import java.util.function.BiConsumer;
+import com.google.common.collect.ImmutableMap;
+import javax.annotation.Nullable;
+import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
+import java.util.Set;
+import java.util.Collections;
+import java.util.Collection;
+import java.util.function.Predicate;
+import net.minecraft.server.packs.PackType;
+import java.io.IOException;
+import java.io.InputStream;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Map;
+import net.minecraft.server.packs.PackResources;
+
+public class LegacyPackResourcesAdapter implements PackResources {
+    private final PackResources source;
+    private final Map<ResourceLocation, ResourceLocation> patches;
+    public static final Map<ResourceLocation, ResourceLocation> V3;
+    
+    private static ResourceLocation toMetaLocation(final ResourceLocation uh) {
+        return new ResourceLocation(uh.getNamespace(), uh.getPath() + ".mcmeta");
+    }
+    
+    public LegacyPackResourcesAdapter(final PackResources aae, final Map<ResourceLocation, ResourceLocation> map) {
+        this.source = aae;
+        this.patches = map;
+    }
+    
+    private ResourceLocation map(final ResourceLocation uh) {
+        return this.patches.getOrDefault(uh, uh);
+    }
+    
+    @Override
+    public InputStream getRootResource(final String string) throws IOException {
+        return this.source.getRootResource(string);
+    }
+    
+    @Override
+    public InputStream getResource(final PackType aaf, final ResourceLocation uh) throws IOException {
+        return this.source.getResource(aaf, this.map(uh));
+    }
+    
+    @Override
+    public Collection<ResourceLocation> getResources(final PackType aaf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
+        return Collections.emptyList();
+    }
+    
+    @Override
+    public boolean hasResource(final PackType aaf, final ResourceLocation uh) {
+        return this.source.hasResource(aaf, this.map(uh));
+    }
+    
+    @Override
+    public Set<String> getNamespaces(final PackType aaf) {
+        return this.source.getNamespaces(aaf);
+    }
+    
+    @Nullable
+    @Override
+    public <T> T getMetadataSection(final MetadataSectionSerializer<T> aai) throws IOException {
+        return this.source.<T>getMetadataSection(aai);
+    }
+    
+    @Override
+    public String getName() {
+        return this.source.getName();
+    }
+    
+    @Override
+    public void close() {
+        this.source.close();
+    }
+    
+    static {
+        final ImmutableMap.Builder<ResourceLocation, ResourceLocation> builder1;
+        final ResourceLocation uh4;
+        final ResourceLocation uh5;
+        final ImmutableMap.Builder<ResourceLocation, ResourceLocation> builder2;
+        final BiConsumer<String, String> biConsumer2;
+        V3 = Util.<ImmutableMap<ResourceLocation, ResourceLocation>>make(() -> {
+            builder1 = ImmutableMap.<ResourceLocation, ResourceLocation>builder();
+            biConsumer2 = ((string2, string3) -> {
+                uh4 = new ResourceLocation(string2);
+                uh5 = new ResourceLocation(string3);
+                builder2.put(uh4, uh5);
+                builder2.put(toMetaLocation(uh4), toMetaLocation(uh5));
+                return;
+            });
+            biConsumer2.accept("textures/block/melon_stem.png", "textures/block/pumpkin_stem.png");
+            biConsumer2.accept("textures/block/anvil.png", "textures/blocks/anvil_base.png");
+            biConsumer2.accept("textures/block/anvil_top.png", "textures/blocks/anvil_top_damaged_0.png");
+            biConsumer2.accept("textures/block/chipped_anvil_top.png", "textures/blocks/anvil_top_damaged_1.png");
+            biConsumer2.accept("textures/block/damaged_anvil_top.png", "textures/blocks/anvil_top_damaged_2.png");
+            biConsumer2.accept("textures/block/beacon.png", "textures/blocks/beacon.png");
+            biConsumer2.accept("textures/block/bedrock.png", "textures/blocks/bedrock.png");
+            biConsumer2.accept("textures/block/beetroots_stage0.png", "textures/blocks/beetroots_stage_0.png");
+            biConsumer2.accept("textures/block/beetroots_stage1.png", "textures/blocks/beetroots_stage_1.png");
+            biConsumer2.accept("textures/block/beetroots_stage2.png", "textures/blocks/beetroots_stage_2.png");
+            biConsumer2.accept("textures/block/beetroots_stage3.png", "textures/blocks/beetroots_stage_3.png");
+            biConsumer2.accept("textures/block/bone_block_side.png", "textures/blocks/bone_block_side.png");
+            biConsumer2.accept("textures/block/bone_block_top.png", "textures/blocks/bone_block_top.png");
+            biConsumer2.accept("textures/block/bookshelf.png", "textures/blocks/bookshelf.png");
+            biConsumer2.accept("textures/block/brewing_stand.png", "textures/blocks/brewing_stand.png");
+            biConsumer2.accept("textures/block/brewing_stand_base.png", "textures/blocks/brewing_stand_base.png");
+            biConsumer2.accept("textures/block/bricks.png", "textures/blocks/brick.png");
+            biConsumer2.accept("textures/block/cactus_bottom.png", "textures/blocks/cactus_bottom.png");
+            biConsumer2.accept("textures/block/cactus_side.png", "textures/blocks/cactus_side.png");
+            biConsumer2.accept("textures/block/cactus_top.png", "textures/blocks/cactus_top.png");
+            biConsumer2.accept("textures/block/cake_bottom.png", "textures/blocks/cake_bottom.png");
+            biConsumer2.accept("textures/block/cake_inner.png", "textures/blocks/cake_inner.png");
+            biConsumer2.accept("textures/block/cake_side.png", "textures/blocks/cake_side.png");
+            biConsumer2.accept("textures/block/cake_top.png", "textures/blocks/cake_top.png");
+            biConsumer2.accept("textures/block/carrots_stage0.png", "textures/blocks/carrots_stage_0.png");
+            biConsumer2.accept("textures/block/carrots_stage1.png", "textures/blocks/carrots_stage_1.png");
+            biConsumer2.accept("textures/block/carrots_stage2.png", "textures/blocks/carrots_stage_2.png");
+            biConsumer2.accept("textures/block/carrots_stage3.png", "textures/blocks/carrots_stage_3.png");
+            biConsumer2.accept("textures/block/cauldron_bottom.png", "textures/blocks/cauldron_bottom.png");
+            biConsumer2.accept("textures/block/cauldron_inner.png", "textures/blocks/cauldron_inner.png");
+            biConsumer2.accept("textures/block/cauldron_side.png", "textures/blocks/cauldron_side.png");
+            biConsumer2.accept("textures/block/cauldron_top.png", "textures/blocks/cauldron_top.png");
+            biConsumer2.accept("textures/block/chain_command_block_back.png", "textures/blocks/chain_command_block_back.png");
+            biConsumer2.accept("textures/block/chain_command_block_conditional.png", "textures/blocks/chain_command_block_conditional.png");
+            biConsumer2.accept("textures/block/chain_command_block_front.png", "textures/blocks/chain_command_block_front.png");
+            biConsumer2.accept("textures/block/chain_command_block_side.png", "textures/blocks/chain_command_block_side.png");
+            biConsumer2.accept("textures/block/chorus_flower.png", "textures/blocks/chorus_flower.png");
+            biConsumer2.accept("textures/block/chorus_flower_dead.png", "textures/blocks/chorus_flower_dead.png");
+            biConsumer2.accept("textures/block/chorus_plant.png", "textures/blocks/chorus_plant.png");
+            biConsumer2.accept("textures/block/clay.png", "textures/blocks/clay.png");
+            biConsumer2.accept("textures/block/coal_block.png", "textures/blocks/coal_block.png");
+            biConsumer2.accept("textures/block/coal_ore.png", "textures/blocks/coal_ore.png");
+            biConsumer2.accept("textures/block/coarse_dirt.png", "textures/blocks/coarse_dirt.png");
+            biConsumer2.accept("textures/block/cobblestone.png", "textures/blocks/cobblestone.png");
+            biConsumer2.accept("textures/block/mossy_cobblestone.png", "textures/blocks/cobblestone_mossy.png");
+            biConsumer2.accept("textures/block/cocoa_stage0.png", "textures/blocks/cocoa_stage_0.png");
+            biConsumer2.accept("textures/block/cocoa_stage1.png", "textures/blocks/cocoa_stage_1.png");
+            biConsumer2.accept("textures/block/cocoa_stage2.png", "textures/blocks/cocoa_stage_2.png");
+            biConsumer2.accept("textures/block/command_block_back.png", "textures/blocks/command_block_back.png");
+            biConsumer2.accept("textures/block/command_block_conditional.png", "textures/blocks/command_block_conditional.png");
+            biConsumer2.accept("textures/block/command_block_front.png", "textures/blocks/command_block_front.png");
+            biConsumer2.accept("textures/block/command_block_side.png", "textures/blocks/command_block_side.png");
+            biConsumer2.accept("textures/block/comparator.png", "textures/blocks/comparator_off.png");
+            biConsumer2.accept("textures/block/comparator_on.png", "textures/blocks/comparator_on.png");
+            biConsumer2.accept("textures/block/black_concrete.png", "textures/blocks/concrete_black.png");
+            biConsumer2.accept("textures/block/blue_concrete.png", "textures/blocks/concrete_blue.png");
+            biConsumer2.accept("textures/block/brown_concrete.png", "textures/blocks/concrete_brown.png");
+            biConsumer2.accept("textures/block/cyan_concrete.png", "textures/blocks/concrete_cyan.png");
+            biConsumer2.accept("textures/block/gray_concrete.png", "textures/blocks/concrete_gray.png");
+            biConsumer2.accept("textures/block/green_concrete.png", "textures/blocks/concrete_green.png");
+            biConsumer2.accept("textures/block/light_blue_concrete.png", "textures/blocks/concrete_light_blue.png");
+            biConsumer2.accept("textures/block/lime_concrete.png", "textures/blocks/concrete_lime.png");
+            biConsumer2.accept("textures/block/magenta_concrete.png", "textures/blocks/concrete_magenta.png");
+            biConsumer2.accept("textures/block/orange_concrete.png", "textures/blocks/concrete_orange.png");
+            biConsumer2.accept("textures/block/pink_concrete.png", "textures/blocks/concrete_pink.png");
+            biConsumer2.accept("textures/block/black_concrete_powder.png", "textures/blocks/concrete_powder_black.png");
+            biConsumer2.accept("textures/block/blue_concrete_powder.png", "textures/blocks/concrete_powder_blue.png");
+            biConsumer2.accept("textures/block/brown_concrete_powder.png", "textures/blocks/concrete_powder_brown.png");
+            biConsumer2.accept("textures/block/cyan_concrete_powder.png", "textures/blocks/concrete_powder_cyan.png");
+            biConsumer2.accept("textures/block/gray_concrete_powder.png", "textures/blocks/concrete_powder_gray.png");
+            biConsumer2.accept("textures/block/green_concrete_powder.png", "textures/blocks/concrete_powder_green.png");
+            biConsumer2.accept("textures/block/light_blue_concrete_powder.png", "textures/blocks/concrete_powder_light_blue.png");
+            biConsumer2.accept("textures/block/lime_concrete_powder.png", "textures/blocks/concrete_powder_lime.png");
+            biConsumer2.accept("textures/block/magenta_concrete_powder.png", "textures/blocks/concrete_powder_magenta.png");
+            biConsumer2.accept("textures/block/orange_concrete_powder.png", "textures/blocks/concrete_powder_orange.png");
+            biConsumer2.accept("textures/block/pink_concrete_powder.png", "textures/blocks/concrete_powder_pink.png");
+            biConsumer2.accept("textures/block/purple_concrete_powder.png", "textures/blocks/concrete_powder_purple.png");
+            biConsumer2.accept("textures/block/red_concrete_powder.png", "textures/blocks/concrete_powder_red.png");
+            biConsumer2.accept("textures/block/light_gray_concrete_powder.png", "textures/blocks/concrete_powder_silver.png");
+            biConsumer2.accept("textures/block/white_concrete_powder.png", "textures/blocks/concrete_powder_white.png");
+            biConsumer2.accept("textures/block/yellow_concrete_powder.png", "textures/blocks/concrete_powder_yellow.png");
+            biConsumer2.accept("textures/block/purple_concrete.png", "textures/blocks/concrete_purple.png");
+            biConsumer2.accept("textures/block/red_concrete.png", "textures/blocks/concrete_red.png");
+            biConsumer2.accept("textures/block/light_gray_concrete.png", "textures/blocks/concrete_silver.png");
+            biConsumer2.accept("textures/block/white_concrete.png", "textures/blocks/concrete_white.png");
+            biConsumer2.accept("textures/block/yellow_concrete.png", "textures/blocks/concrete_yellow.png");
+            biConsumer2.accept("textures/block/crafting_table_front.png", "textures/blocks/crafting_table_front.png");
+            biConsumer2.accept("textures/block/crafting_table_side.png", "textures/blocks/crafting_table_side.png");
+            biConsumer2.accept("textures/block/crafting_table_top.png", "textures/blocks/crafting_table_top.png");
+            biConsumer2.accept("textures/block/daylight_detector_inverted_top.png", "textures/blocks/daylight_detector_inverted_top.png");
+            biConsumer2.accept("textures/block/daylight_detector_side.png", "textures/blocks/daylight_detector_side.png");
+            biConsumer2.accept("textures/block/daylight_detector_top.png", "textures/blocks/daylight_detector_top.png");
+            biConsumer2.accept("textures/block/dead_bush.png", "textures/blocks/deadbush.png");
+            biConsumer2.accept("textures/block/debug.png", "textures/blocks/debug.png");
+            biConsumer2.accept("textures/block/debug2.png", "textures/blocks/debug2.png");
+            biConsumer2.accept("textures/block/destroy_stage_0.png", "textures/blocks/destroy_stage_0.png");
+            biConsumer2.accept("textures/block/destroy_stage_1.png", "textures/blocks/destroy_stage_1.png");
+            biConsumer2.accept("textures/block/destroy_stage_2.png", "textures/blocks/destroy_stage_2.png");
+            biConsumer2.accept("textures/block/destroy_stage_3.png", "textures/blocks/destroy_stage_3.png");
+            biConsumer2.accept("textures/block/destroy_stage_4.png", "textures/blocks/destroy_stage_4.png");
+            biConsumer2.accept("textures/block/destroy_stage_5.png", "textures/blocks/destroy_stage_5.png");
+            biConsumer2.accept("textures/block/destroy_stage_6.png", "textures/blocks/destroy_stage_6.png");
+            biConsumer2.accept("textures/block/destroy_stage_7.png", "textures/blocks/destroy_stage_7.png");
+            biConsumer2.accept("textures/block/destroy_stage_8.png", "textures/blocks/destroy_stage_8.png");
+            biConsumer2.accept("textures/block/destroy_stage_9.png", "textures/blocks/destroy_stage_9.png");
+            biConsumer2.accept("textures/block/diamond_block.png", "textures/blocks/diamond_block.png");
+            biConsumer2.accept("textures/block/diamond_ore.png", "textures/blocks/diamond_ore.png");
+            biConsumer2.accept("textures/block/dirt.png", "textures/blocks/dirt.png");
+            biConsumer2.accept("textures/block/podzol_side.png", "textures/blocks/dirt_podzol_side.png");
+            biConsumer2.accept("textures/block/podzol_top.png", "textures/blocks/dirt_podzol_top.png");
+            biConsumer2.accept("textures/block/dispenser_front.png", "textures/blocks/dispenser_front_horizontal.png");
+            biConsumer2.accept("textures/block/dispenser_front_vertical.png", "textures/blocks/dispenser_front_vertical.png");
+            biConsumer2.accept("textures/block/acacia_door_bottom.png", "textures/blocks/door_acacia_lower.png");
+            biConsumer2.accept("textures/block/acacia_door_top.png", "textures/blocks/door_acacia_upper.png");
+            biConsumer2.accept("textures/block/birch_door_bottom.png", "textures/blocks/door_birch_lower.png");
+            biConsumer2.accept("textures/block/birch_door_top.png", "textures/blocks/door_birch_upper.png");
+            biConsumer2.accept("textures/block/dark_oak_door_bottom.png", "textures/blocks/door_dark_oak_lower.png");
+            biConsumer2.accept("textures/block/dark_oak_door_top.png", "textures/blocks/door_dark_oak_upper.png");
+            biConsumer2.accept("textures/block/iron_door_bottom.png", "textures/blocks/door_iron_lower.png");
+            biConsumer2.accept("textures/block/iron_door_top.png", "textures/blocks/door_iron_upper.png");
+            biConsumer2.accept("textures/block/jungle_door_bottom.png", "textures/blocks/door_jungle_lower.png");
+            biConsumer2.accept("textures/block/jungle_door_top.png", "textures/blocks/door_jungle_upper.png");
+            biConsumer2.accept("textures/block/spruce_door_bottom.png", "textures/blocks/door_spruce_lower.png");
+            biConsumer2.accept("textures/block/spruce_door_top.png", "textures/blocks/door_spruce_upper.png");
+            biConsumer2.accept("textures/block/oak_door_bottom.png", "textures/blocks/door_wood_lower.png");
+            biConsumer2.accept("textures/block/oak_door_top.png", "textures/blocks/door_wood_upper.png");
+            biConsumer2.accept("textures/block/large_fern_bottom.png", "textures/blocks/double_plant_fern_bottom.png");
+            biConsumer2.accept("textures/block/large_fern_top.png", "textures/blocks/double_plant_fern_top.png");
+            biConsumer2.accept("textures/block/tall_grass_bottom.png", "textures/blocks/double_plant_grass_bottom.png");
+            biConsumer2.accept("textures/block/tall_grass_top.png", "textures/blocks/double_plant_grass_top.png");
+            biConsumer2.accept("textures/block/peony_bottom.png", "textures/blocks/double_plant_paeonia_bottom.png");
+            biConsumer2.accept("textures/block/peony_top.png", "textures/blocks/double_plant_paeonia_top.png");
+            biConsumer2.accept("textures/block/rose_bush_bottom.png", "textures/blocks/double_plant_rose_bottom.png");
+            biConsumer2.accept("textures/block/rose_bush_top.png", "textures/blocks/double_plant_rose_top.png");
+            biConsumer2.accept("textures/block/sunflower_back.png", "textures/blocks/double_plant_sunflower_back.png");
+            biConsumer2.accept("textures/block/sunflower_bottom.png", "textures/blocks/double_plant_sunflower_bottom.png");
+            biConsumer2.accept("textures/block/sunflower_front.png", "textures/blocks/double_plant_sunflower_front.png");
+            biConsumer2.accept("textures/block/sunflower_top.png", "textures/blocks/double_plant_sunflower_top.png");
+            biConsumer2.accept("textures/block/lilac_bottom.png", "textures/blocks/double_plant_syringa_bottom.png");
+            biConsumer2.accept("textures/block/lilac_top.png", "textures/blocks/double_plant_syringa_top.png");
+            biConsumer2.accept("textures/block/dragon_egg.png", "textures/blocks/dragon_egg.png");
+            biConsumer2.accept("textures/block/dropper_front.png", "textures/blocks/dropper_front_horizontal.png");
+            biConsumer2.accept("textures/block/dropper_front_vertical.png", "textures/blocks/dropper_front_vertical.png");
+            biConsumer2.accept("textures/block/emerald_block.png", "textures/blocks/emerald_block.png");
+            biConsumer2.accept("textures/block/emerald_ore.png", "textures/blocks/emerald_ore.png");
+            biConsumer2.accept("textures/block/enchanting_table_bottom.png", "textures/blocks/enchanting_table_bottom.png");
+            biConsumer2.accept("textures/block/enchanting_table_side.png", "textures/blocks/enchanting_table_side.png");
+            biConsumer2.accept("textures/block/enchanting_table_top.png", "textures/blocks/enchanting_table_top.png");
+            biConsumer2.accept("textures/block/end_stone_bricks.png", "textures/blocks/end_bricks.png");
+            biConsumer2.accept("textures/block/end_rod.png", "textures/blocks/end_rod.png");
+            biConsumer2.accept("textures/block/end_stone.png", "textures/blocks/end_stone.png");
+            biConsumer2.accept("textures/block/end_portal_frame_eye.png", "textures/blocks/endframe_eye.png");
+            biConsumer2.accept("textures/block/end_portal_frame_side.png", "textures/blocks/endframe_side.png");
+            biConsumer2.accept("textures/block/end_portal_frame_top.png", "textures/blocks/endframe_top.png");
+            biConsumer2.accept("textures/block/farmland.png", "textures/blocks/farmland_dry.png");
+            biConsumer2.accept("textures/block/farmland_moist.png", "textures/blocks/farmland_wet.png");
+            biConsumer2.accept("textures/block/fern.png", "textures/blocks/fern.png");
+            biConsumer2.accept("textures/block/fire_0.png", "textures/blocks/fire_layer_0.png");
+            biConsumer2.accept("textures/block/fire_1.png", "textures/blocks/fire_layer_1.png");
+            biConsumer2.accept("textures/block/allium.png", "textures/blocks/flower_allium.png");
+            biConsumer2.accept("textures/block/blue_orchid.png", "textures/blocks/flower_blue_orchid.png");
+            biConsumer2.accept("textures/block/dandelion.png", "textures/blocks/flower_dandelion.png");
+            biConsumer2.accept("textures/block/azure_bluet.png", "textures/blocks/flower_houstonia.png");
+            biConsumer2.accept("textures/block/oxeye_daisy.png", "textures/blocks/flower_oxeye_daisy.png");
+            biConsumer2.accept("textures/block/flower_pot.png", "textures/blocks/flower_pot.png");
+            biConsumer2.accept("textures/block/poppy.png", "textures/blocks/flower_rose.png");
+            biConsumer2.accept("textures/block/orange_tulip.png", "textures/blocks/flower_tulip_orange.png");
+            biConsumer2.accept("textures/block/pink_tulip.png", "textures/blocks/flower_tulip_pink.png");
+            biConsumer2.accept("textures/block/red_tulip.png", "textures/blocks/flower_tulip_red.png");
+            biConsumer2.accept("textures/block/white_tulip.png", "textures/blocks/flower_tulip_white.png");
+            biConsumer2.accept("textures/block/frosted_ice_0.png", "textures/blocks/frosted_ice_0.png");
+            biConsumer2.accept("textures/block/frosted_ice_1.png", "textures/blocks/frosted_ice_1.png");
+            biConsumer2.accept("textures/block/frosted_ice_2.png", "textures/blocks/frosted_ice_2.png");
+            biConsumer2.accept("textures/block/frosted_ice_3.png", "textures/blocks/frosted_ice_3.png");
+            biConsumer2.accept("textures/block/furnace_front.png", "textures/blocks/furnace_front_off.png");
+            biConsumer2.accept("textures/block/furnace_front_on.png", "textures/blocks/furnace_front_on.png");
+            biConsumer2.accept("textures/block/furnace_side.png", "textures/blocks/furnace_side.png");
+            biConsumer2.accept("textures/block/furnace_top.png", "textures/blocks/furnace_top.png");
+            biConsumer2.accept("textures/block/glass.png", "textures/blocks/glass.png");
+            biConsumer2.accept("textures/block/black_stained_glass.png", "textures/blocks/glass_black.png");
+            biConsumer2.accept("textures/block/blue_stained_glass.png", "textures/blocks/glass_blue.png");
+            biConsumer2.accept("textures/block/brown_stained_glass.png", "textures/blocks/glass_brown.png");
+            biConsumer2.accept("textures/block/cyan_stained_glass.png", "textures/blocks/glass_cyan.png");
+            biConsumer2.accept("textures/block/gray_stained_glass.png", "textures/blocks/glass_gray.png");
+            biConsumer2.accept("textures/block/green_stained_glass.png", "textures/blocks/glass_green.png");
+            biConsumer2.accept("textures/block/light_blue_stained_glass.png", "textures/blocks/glass_light_blue.png");
+            biConsumer2.accept("textures/block/lime_stained_glass.png", "textures/blocks/glass_lime.png");
+            biConsumer2.accept("textures/block/magenta_stained_glass.png", "textures/blocks/glass_magenta.png");
+            biConsumer2.accept("textures/block/orange_stained_glass.png", "textures/blocks/glass_orange.png");
+            biConsumer2.accept("textures/block/glass_pane_top.png", "textures/blocks/glass_pane_top.png");
+            biConsumer2.accept("textures/block/black_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_black.png");
+            biConsumer2.accept("textures/block/blue_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_blue.png");
+            biConsumer2.accept("textures/block/brown_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_brown.png");
+            biConsumer2.accept("textures/block/cyan_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_cyan.png");
+            biConsumer2.accept("textures/block/gray_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_gray.png");
+            biConsumer2.accept("textures/block/green_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_green.png");
+            biConsumer2.accept("textures/block/light_blue_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_light_blue.png");
+            biConsumer2.accept("textures/block/lime_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_lime.png");
+            biConsumer2.accept("textures/block/magenta_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_magenta.png");
+            biConsumer2.accept("textures/block/orange_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_orange.png");
+            biConsumer2.accept("textures/block/pink_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_pink.png");
+            biConsumer2.accept("textures/block/purple_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_purple.png");
+            biConsumer2.accept("textures/block/red_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_red.png");
+            biConsumer2.accept("textures/block/light_gray_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_silver.png");
+            biConsumer2.accept("textures/block/white_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_white.png");
+            biConsumer2.accept("textures/block/yellow_stained_glass_pane_top.png", "textures/blocks/glass_pane_top_yellow.png");
+            biConsumer2.accept("textures/block/pink_stained_glass.png", "textures/blocks/glass_pink.png");
+            biConsumer2.accept("textures/block/purple_stained_glass.png", "textures/blocks/glass_purple.png");
+            biConsumer2.accept("textures/block/red_stained_glass.png", "textures/blocks/glass_red.png");
+            biConsumer2.accept("textures/block/light_gray_stained_glass.png", "textures/blocks/glass_silver.png");
+            biConsumer2.accept("textures/block/white_stained_glass.png", "textures/blocks/glass_white.png");
+            biConsumer2.accept("textures/block/yellow_stained_glass.png", "textures/blocks/glass_yellow.png");
+            biConsumer2.accept("textures/block/black_glazed_terracotta.png", "textures/blocks/glazed_terracotta_black.png");
+            biConsumer2.accept("textures/block/blue_glazed_terracotta.png", "textures/blocks/glazed_terracotta_blue.png");
+            biConsumer2.accept("textures/block/brown_glazed_terracotta.png", "textures/blocks/glazed_terracotta_brown.png");
+            biConsumer2.accept("textures/block/cyan_glazed_terracotta.png", "textures/blocks/glazed_terracotta_cyan.png");
+            biConsumer2.accept("textures/block/gray_glazed_terracotta.png", "textures/blocks/glazed_terracotta_gray.png");
+            biConsumer2.accept("textures/block/green_glazed_terracotta.png", "textures/blocks/glazed_terracotta_green.png");
+            biConsumer2.accept("textures/block/light_blue_glazed_terracotta.png", "textures/blocks/glazed_terracotta_light_blue.png");
+            biConsumer2.accept("textures/block/lime_glazed_terracotta.png", "textures/blocks/glazed_terracotta_lime.png");
+            biConsumer2.accept("textures/block/magenta_glazed_terracotta.png", "textures/blocks/glazed_terracotta_magenta.png");
+            biConsumer2.accept("textures/block/orange_glazed_terracotta.png", "textures/blocks/glazed_terracotta_orange.png");
+            biConsumer2.accept("textures/block/pink_glazed_terracotta.png", "textures/blocks/glazed_terracotta_pink.png");
+            biConsumer2.accept("textures/block/purple_glazed_terracotta.png", "textures/blocks/glazed_terracotta_purple.png");
+            biConsumer2.accept("textures/block/red_glazed_terracotta.png", "textures/blocks/glazed_terracotta_red.png");
+            biConsumer2.accept("textures/block/light_gray_glazed_terracotta.png", "textures/blocks/glazed_terracotta_silver.png");
+            biConsumer2.accept("textures/block/white_glazed_terracotta.png", "textures/blocks/glazed_terracotta_white.png");
+            biConsumer2.accept("textures/block/yellow_glazed_terracotta.png", "textures/blocks/glazed_terracotta_yellow.png");
+            biConsumer2.accept("textures/block/glowstone.png", "textures/blocks/glowstone.png");
+            biConsumer2.accept("textures/block/gold_block.png", "textures/blocks/gold_block.png");
+            biConsumer2.accept("textures/block/gold_ore.png", "textures/blocks/gold_ore.png");
+            biConsumer2.accept("textures/block/grass_path_side.png", "textures/blocks/grass_path_side.png");
+            biConsumer2.accept("textures/block/grass_path_top.png", "textures/blocks/grass_path_top.png");
+            biConsumer2.accept("textures/block/grass_block_side.png", "textures/blocks/grass_side.png");
+            biConsumer2.accept("textures/block/grass_block_side_overlay.png", "textures/blocks/grass_side_overlay.png");
+            biConsumer2.accept("textures/block/grass_block_snow.png", "textures/blocks/grass_side_snowed.png");
+            biConsumer2.accept("textures/block/grass_block_top.png", "textures/blocks/grass_top.png");
+            biConsumer2.accept("textures/block/gravel.png", "textures/blocks/gravel.png");
+            biConsumer2.accept("textures/block/terracotta.png", "textures/blocks/hardened_clay.png");
+            biConsumer2.accept("textures/block/black_terracotta.png", "textures/blocks/hardened_clay_stained_black.png");
+            biConsumer2.accept("textures/block/blue_terracotta.png", "textures/blocks/hardened_clay_stained_blue.png");
+            biConsumer2.accept("textures/block/brown_terracotta.png", "textures/blocks/hardened_clay_stained_brown.png");
+            biConsumer2.accept("textures/block/cyan_terracotta.png", "textures/blocks/hardened_clay_stained_cyan.png");
+            biConsumer2.accept("textures/block/gray_terracotta.png", "textures/blocks/hardened_clay_stained_gray.png");
+            biConsumer2.accept("textures/block/green_terracotta.png", "textures/blocks/hardened_clay_stained_green.png");
+            biConsumer2.accept("textures/block/light_blue_terracotta.png", "textures/blocks/hardened_clay_stained_light_blue.png");
+            biConsumer2.accept("textures/block/lime_terracotta.png", "textures/blocks/hardened_clay_stained_lime.png");
+            biConsumer2.accept("textures/block/magenta_terracotta.png", "textures/blocks/hardened_clay_stained_magenta.png");
+            biConsumer2.accept("textures/block/orange_terracotta.png", "textures/blocks/hardened_clay_stained_orange.png");
+            biConsumer2.accept("textures/block/pink_terracotta.png", "textures/blocks/hardened_clay_stained_pink.png");
+            biConsumer2.accept("textures/block/purple_terracotta.png", "textures/blocks/hardened_clay_stained_purple.png");
+            biConsumer2.accept("textures/block/red_terracotta.png", "textures/blocks/hardened_clay_stained_red.png");
+            biConsumer2.accept("textures/block/light_gray_terracotta.png", "textures/blocks/hardened_clay_stained_silver.png");
+            biConsumer2.accept("textures/block/white_terracotta.png", "textures/blocks/hardened_clay_stained_white.png");
+            biConsumer2.accept("textures/block/yellow_terracotta.png", "textures/blocks/hardened_clay_stained_yellow.png");
+            biConsumer2.accept("textures/block/hay_block_side.png", "textures/blocks/hay_block_side.png");
+            biConsumer2.accept("textures/block/hay_block_top.png", "textures/blocks/hay_block_top.png");
+            biConsumer2.accept("textures/block/hopper_inside.png", "textures/blocks/hopper_inside.png");
+            biConsumer2.accept("textures/block/hopper_outside.png", "textures/blocks/hopper_outside.png");
+            biConsumer2.accept("textures/block/hopper_top.png", "textures/blocks/hopper_top.png");
+            biConsumer2.accept("textures/block/ice.png", "textures/blocks/ice.png");
+            biConsumer2.accept("textures/block/packed_ice.png", "textures/blocks/ice_packed.png");
+            biConsumer2.accept("textures/block/iron_bars.png", "textures/blocks/iron_bars.png");
+            biConsumer2.accept("textures/block/iron_block.png", "textures/blocks/iron_block.png");
+            biConsumer2.accept("textures/block/iron_ore.png", "textures/blocks/iron_ore.png");
+            biConsumer2.accept("textures/block/iron_trapdoor.png", "textures/blocks/iron_trapdoor.png");
+            biConsumer2.accept("textures/block/item_frame.png", "textures/blocks/itemframe_background.png");
+            biConsumer2.accept("textures/block/jukebox_side.png", "textures/blocks/jukebox_side.png");
+            biConsumer2.accept("textures/block/jukebox_top.png", "textures/blocks/jukebox_top.png");
+            biConsumer2.accept("textures/block/ladder.png", "textures/blocks/ladder.png");
+            biConsumer2.accept("textures/block/lapis_block.png", "textures/blocks/lapis_block.png");
+            biConsumer2.accept("textures/block/lapis_ore.png", "textures/blocks/lapis_ore.png");
+            biConsumer2.accept("textures/block/lava_flow.png", "textures/blocks/lava_flow.png");
+            biConsumer2.accept("textures/block/lava_still.png", "textures/blocks/lava_still.png");
+            biConsumer2.accept("textures/block/acacia_leaves.png", "textures/blocks/leaves_acacia.png");
+            biConsumer2.accept("textures/block/dark_oak_leaves.png", "textures/blocks/leaves_big_oak.png");
+            biConsumer2.accept("textures/block/birch_leaves.png", "textures/blocks/leaves_birch.png");
+            biConsumer2.accept("textures/block/jungle_leaves.png", "textures/blocks/leaves_jungle.png");
+            biConsumer2.accept("textures/block/oak_leaves.png", "textures/blocks/leaves_oak.png");
+            biConsumer2.accept("textures/block/spruce_leaves.png", "textures/blocks/leaves_spruce.png");
+            biConsumer2.accept("textures/block/lever.png", "textures/blocks/lever.png");
+            biConsumer2.accept("textures/block/acacia_log.png", "textures/blocks/log_acacia.png");
+            biConsumer2.accept("textures/block/acacia_log_top.png", "textures/blocks/log_acacia_top.png");
+            biConsumer2.accept("textures/block/dark_oak_log.png", "textures/blocks/log_big_oak.png");
+            biConsumer2.accept("textures/block/dark_oak_log_top.png", "textures/blocks/log_big_oak_top.png");
+            biConsumer2.accept("textures/block/birch_log.png", "textures/blocks/log_birch.png");
+            biConsumer2.accept("textures/block/birch_log_top.png", "textures/blocks/log_birch_top.png");
+            biConsumer2.accept("textures/block/jungle_log.png", "textures/blocks/log_jungle.png");
+            biConsumer2.accept("textures/block/jungle_log_top.png", "textures/blocks/log_jungle_top.png");
+            biConsumer2.accept("textures/block/oak_log.png", "textures/blocks/log_oak.png");
+            biConsumer2.accept("textures/block/oak_log_top.png", "textures/blocks/log_oak_top.png");
+            biConsumer2.accept("textures/block/spruce_log.png", "textures/blocks/log_spruce.png");
+            biConsumer2.accept("textures/block/spruce_log_top.png", "textures/blocks/log_spruce_top.png");
+            biConsumer2.accept("textures/block/magma.png", "textures/blocks/magma.png");
+            biConsumer2.accept("textures/block/melon_side.png", "textures/blocks/melon_side.png");
+            biConsumer2.accept("textures/block/attached_melon_stem.png", "textures/blocks/melon_stem_connected.png");
+            biConsumer2.accept("textures/blocks/pumpkin_stem_disconnected.png", "textures/blocks/melon_stem_disconnected.png");
+            biConsumer2.accept("textures/block/melon_top.png", "textures/blocks/melon_top.png");
+            biConsumer2.accept("textures/block/spawner.png", "textures/blocks/mob_spawner.png");
+            biConsumer2.accept("textures/block/mushroom_block_inside.png", "textures/blocks/mushroom_block_inside.png");
+            biConsumer2.accept("textures/block/brown_mushroom_block.png", "textures/blocks/mushroom_block_skin_brown.png");
+            biConsumer2.accept("textures/block/red_mushroom_block.png", "textures/blocks/mushroom_block_skin_red.png");
+            biConsumer2.accept("textures/block/mushroom_stem.png", "textures/blocks/mushroom_block_skin_stem.png");
+            biConsumer2.accept("textures/block/brown_mushroom.png", "textures/blocks/mushroom_brown.png");
+            biConsumer2.accept("textures/block/red_mushroom.png", "textures/blocks/mushroom_red.png");
+            biConsumer2.accept("textures/block/mycelium_side.png", "textures/blocks/mycelium_side.png");
+            biConsumer2.accept("textures/block/mycelium_top.png", "textures/blocks/mycelium_top.png");
+            biConsumer2.accept("textures/block/nether_bricks.png", "textures/blocks/nether_brick.png");
+            biConsumer2.accept("textures/block/nether_wart_block.png", "textures/blocks/nether_wart_block.png");
+            biConsumer2.accept("textures/block/nether_wart_stage0.png", "textures/blocks/nether_wart_stage_0.png");
+            biConsumer2.accept("textures/block/nether_wart_stage1.png", "textures/blocks/nether_wart_stage_1.png");
+            biConsumer2.accept("textures/block/nether_wart_stage2.png", "textures/blocks/nether_wart_stage_2.png");
+            biConsumer2.accept("textures/block/netherrack.png", "textures/blocks/netherrack.png");
+            biConsumer2.accept("textures/block/note_block.png", "textures/blocks/noteblock.png");
+            biConsumer2.accept("textures/block/observer_back.png", "textures/blocks/observer_back.png");
+            biConsumer2.accept("textures/block/observer_back_on.png", "textures/blocks/observer_back_lit.png");
+            biConsumer2.accept("textures/block/observer_front.png", "textures/blocks/observer_front.png");
+            biConsumer2.accept("textures/block/observer_side.png", "textures/blocks/observer_side.png");
+            biConsumer2.accept("textures/block/observer_top.png", "textures/blocks/observer_top.png");
+            biConsumer2.accept("textures/block/obsidian.png", "textures/blocks/obsidian.png");
+            biConsumer2.accept("textures/block/piston_bottom.png", "textures/blocks/piston_bottom.png");
+            biConsumer2.accept("textures/block/piston_inner.png", "textures/blocks/piston_inner.png");
+            biConsumer2.accept("textures/block/piston_side.png", "textures/blocks/piston_side.png");
+            biConsumer2.accept("textures/block/piston_top.png", "textures/blocks/piston_top_normal.png");
+            biConsumer2.accept("textures/block/piston_top_sticky.png", "textures/blocks/piston_top_sticky.png");
+            biConsumer2.accept("textures/block/acacia_planks.png", "textures/blocks/planks_acacia.png");
+            biConsumer2.accept("textures/block/dark_oak_planks.png", "textures/blocks/planks_big_oak.png");
+            biConsumer2.accept("textures/block/birch_planks.png", "textures/blocks/planks_birch.png");
+            biConsumer2.accept("textures/block/jungle_planks.png", "textures/blocks/planks_jungle.png");
+            biConsumer2.accept("textures/block/oak_planks.png", "textures/blocks/planks_oak.png");
+            biConsumer2.accept("textures/block/spruce_planks.png", "textures/blocks/planks_spruce.png");
+            biConsumer2.accept("textures/block/nether_portal.png", "textures/blocks/portal.png");
+            biConsumer2.accept("textures/block/potatoes_stage0.png", "textures/blocks/potatoes_stage_0.png");
+            biConsumer2.accept("textures/block/potatoes_stage1.png", "textures/blocks/potatoes_stage_1.png");
+            biConsumer2.accept("textures/block/potatoes_stage2.png", "textures/blocks/potatoes_stage_2.png");
+            biConsumer2.accept("textures/block/potatoes_stage3.png", "textures/blocks/potatoes_stage_3.png");
+            biConsumer2.accept("textures/block/prismarine_bricks.png", "textures/blocks/prismarine_bricks.png");
+            biConsumer2.accept("textures/block/dark_prismarine.png", "textures/blocks/prismarine_dark.png");
+            biConsumer2.accept("textures/block/prismarine.png", "textures/blocks/prismarine_rough.png");
+            biConsumer2.accept("textures/block/carved_pumpkin.png", "textures/blocks/pumpkin_face_off.png");
+            biConsumer2.accept("textures/block/jack_o_lantern.png", "textures/blocks/pumpkin_face_on.png");
+            biConsumer2.accept("textures/block/pumpkin_side.png", "textures/blocks/pumpkin_side.png");
+            biConsumer2.accept("textures/block/attached_pumpkin_stem.png", "textures/blocks/pumpkin_stem_connected.png");
+            biConsumer2.accept("textures/block/pumpkin_top.png", "textures/blocks/pumpkin_top.png");
+            biConsumer2.accept("textures/block/purpur_block.png", "textures/blocks/purpur_block.png");
+            biConsumer2.accept("textures/block/purpur_pillar.png", "textures/blocks/purpur_pillar.png");
+            biConsumer2.accept("textures/block/purpur_pillar_top.png", "textures/blocks/purpur_pillar_top.png");
+            biConsumer2.accept("textures/block/quartz_block_bottom.png", "textures/blocks/quartz_block_bottom.png");
+            biConsumer2.accept("textures/block/chiseled_quartz_block.png", "textures/blocks/quartz_block_chiseled.png");
+            biConsumer2.accept("textures/block/chiseled_quartz_block_top.png", "textures/blocks/quartz_block_chiseled_top.png");
+            biConsumer2.accept("textures/block/quartz_pillar.png", "textures/blocks/quartz_block_lines.png");
+            biConsumer2.accept("textures/block/quartz_pillar_top.png", "textures/blocks/quartz_block_lines_top.png");
+            biConsumer2.accept("textures/block/quartz_block_side.png", "textures/blocks/quartz_block_side.png");
+            biConsumer2.accept("textures/block/quartz_block_top.png", "textures/blocks/quartz_block_top.png");
+            biConsumer2.accept("textures/block/nether_quartz_ore.png", "textures/blocks/quartz_ore.png");
+            biConsumer2.accept("textures/block/activator_rail.png", "textures/blocks/rail_activator.png");
+            biConsumer2.accept("textures/block/activator_rail_on.png", "textures/blocks/rail_activator_powered.png");
+            biConsumer2.accept("textures/block/detector_rail.png", "textures/blocks/rail_detector.png");
+            biConsumer2.accept("textures/block/detector_rail_on.png", "textures/blocks/rail_detector_powered.png");
+            biConsumer2.accept("textures/block/powered_rail.png", "textures/blocks/rail_golden.png");
+            biConsumer2.accept("textures/block/powered_rail_on.png", "textures/blocks/rail_golden_powered.png");
+            biConsumer2.accept("textures/block/rail.png", "textures/blocks/rail_normal.png");
+            biConsumer2.accept("textures/block/rail_corner.png", "textures/blocks/rail_normal_turned.png");
+            biConsumer2.accept("textures/block/red_nether_bricks.png", "textures/blocks/red_nether_brick.png");
+            biConsumer2.accept("textures/block/red_sand.png", "textures/blocks/red_sand.png");
+            biConsumer2.accept("textures/block/red_sandstone_bottom.png", "textures/blocks/red_sandstone_bottom.png");
+            biConsumer2.accept("textures/block/chiseled_red_sandstone.png", "textures/blocks/red_sandstone_carved.png");
+            biConsumer2.accept("textures/block/red_sandstone.png", "textures/blocks/red_sandstone_normal.png");
+            biConsumer2.accept("textures/block/cut_red_sandstone.png", "textures/blocks/red_sandstone_smooth.png");
+            biConsumer2.accept("textures/block/red_sandstone_top.png", "textures/blocks/red_sandstone_top.png");
+            biConsumer2.accept("textures/block/redstone_block.png", "textures/blocks/redstone_block.png");
+            biConsumer2.accept("textures/block/redstone_dust_dot.png", "textures/blocks/redstone_dust_dot.png");
+            biConsumer2.accept("textures/block/redstone_dust_line0.png", "textures/blocks/redstone_dust_line0.png");
+            biConsumer2.accept("textures/block/redstone_dust_line1.png", "textures/blocks/redstone_dust_line1.png");
+            biConsumer2.accept("textures/block/redstone_dust_overlay.png", "textures/blocks/redstone_dust_overlay.png");
+            biConsumer2.accept("textures/block/redstone_lamp.png", "textures/blocks/redstone_lamp_off.png");
+            biConsumer2.accept("textures/block/redstone_lamp_on.png", "textures/blocks/redstone_lamp_on.png");
+            biConsumer2.accept("textures/block/redstone_ore.png", "textures/blocks/redstone_ore.png");
+            biConsumer2.accept("textures/block/redstone_torch_off.png", "textures/blocks/redstone_torch_off.png");
+            biConsumer2.accept("textures/block/redstone_torch.png", "textures/blocks/redstone_torch_on.png");
+            biConsumer2.accept("textures/block/sugar_cane.png", "textures/blocks/reeds.png");
+            biConsumer2.accept("textures/block/repeater.png", "textures/blocks/repeater_off.png");
+            biConsumer2.accept("textures/block/repeater_on.png", "textures/blocks/repeater_on.png");
+            biConsumer2.accept("textures/block/repeating_command_block_back.png", "textures/blocks/repeating_command_block_back.png");
+            biConsumer2.accept("textures/block/repeating_command_block_conditional.png", "textures/blocks/repeating_command_block_conditional.png");
+            biConsumer2.accept("textures/block/repeating_command_block_front.png", "textures/blocks/repeating_command_block_front.png");
+            biConsumer2.accept("textures/block/repeating_command_block_side.png", "textures/blocks/repeating_command_block_side.png");
+            biConsumer2.accept("textures/block/sand.png", "textures/blocks/sand.png");
+            biConsumer2.accept("textures/block/sandstone_bottom.png", "textures/blocks/sandstone_bottom.png");
+            biConsumer2.accept("textures/block/chiseled_sandstone.png", "textures/blocks/sandstone_carved.png");
+            biConsumer2.accept("textures/block/sandstone.png", "textures/blocks/sandstone_normal.png");
+            biConsumer2.accept("textures/block/cut_sandstone.png", "textures/blocks/sandstone_smooth.png");
+            biConsumer2.accept("textures/block/sandstone_top.png", "textures/blocks/sandstone_top.png");
+            biConsumer2.accept("textures/block/acacia_sapling.png", "textures/blocks/sapling_acacia.png");
+            biConsumer2.accept("textures/block/birch_sapling.png", "textures/blocks/sapling_birch.png");
+            biConsumer2.accept("textures/block/jungle_sapling.png", "textures/blocks/sapling_jungle.png");
+            biConsumer2.accept("textures/block/oak_sapling.png", "textures/blocks/sapling_oak.png");
+            biConsumer2.accept("textures/block/dark_oak_sapling.png", "textures/blocks/sapling_roofed_oak.png");
+            biConsumer2.accept("textures/block/spruce_sapling.png", "textures/blocks/sapling_spruce.png");
+            biConsumer2.accept("textures/block/sea_lantern.png", "textures/blocks/sea_lantern.png");
+            biConsumer2.accept("textures/block/black_shulker_box.png", "textures/blocks/shulker_top_black.png");
+            biConsumer2.accept("textures/block/blue_shulker_box.png", "textures/blocks/shulker_top_blue.png");
+            biConsumer2.accept("textures/block/brown_shulker_box.png", "textures/blocks/shulker_top_brown.png");
+            biConsumer2.accept("textures/block/cyan_shulker_box.png", "textures/blocks/shulker_top_cyan.png");
+            biConsumer2.accept("textures/block/gray_shulker_box.png", "textures/blocks/shulker_top_gray.png");
+            biConsumer2.accept("textures/block/green_shulker_box.png", "textures/blocks/shulker_top_green.png");
+            biConsumer2.accept("textures/block/light_blue_shulker_box.png", "textures/blocks/shulker_top_light_blue.png");
+            biConsumer2.accept("textures/block/lime_shulker_box.png", "textures/blocks/shulker_top_lime.png");
+            biConsumer2.accept("textures/block/magenta_shulker_box.png", "textures/blocks/shulker_top_magenta.png");
+            biConsumer2.accept("textures/block/orange_shulker_box.png", "textures/blocks/shulker_top_orange.png");
+            biConsumer2.accept("textures/block/pink_shulker_box.png", "textures/blocks/shulker_top_pink.png");
+            biConsumer2.accept("textures/block/purple_shulker_box.png", "textures/blocks/shulker_top_purple.png");
+            biConsumer2.accept("textures/block/red_shulker_box.png", "textures/blocks/shulker_top_red.png");
+            biConsumer2.accept("textures/block/light_gray_shulker_box.png", "textures/blocks/shulker_top_silver.png");
+            biConsumer2.accept("textures/block/white_shulker_box.png", "textures/blocks/shulker_top_white.png");
+            biConsumer2.accept("textures/block/yellow_shulker_box.png", "textures/blocks/shulker_top_yellow.png");
+            biConsumer2.accept("textures/block/slime_block.png", "textures/blocks/slime.png");
+            biConsumer2.accept("textures/block/snow.png", "textures/blocks/snow.png");
+            biConsumer2.accept("textures/block/soul_sand.png", "textures/blocks/soul_sand.png");
+            biConsumer2.accept("textures/block/sponge.png", "textures/blocks/sponge.png");
+            biConsumer2.accept("textures/block/wet_sponge.png", "textures/blocks/sponge_wet.png");
+            biConsumer2.accept("textures/block/stone.png", "textures/blocks/stone.png");
+            biConsumer2.accept("textures/block/andesite.png", "textures/blocks/stone_andesite.png");
+            biConsumer2.accept("textures/block/polished_andesite.png", "textures/blocks/stone_andesite_smooth.png");
+            biConsumer2.accept("textures/block/diorite.png", "textures/blocks/stone_diorite.png");
+            biConsumer2.accept("textures/block/polished_diorite.png", "textures/blocks/stone_diorite_smooth.png");
+            biConsumer2.accept("textures/block/granite.png", "textures/blocks/stone_granite.png");
+            biConsumer2.accept("textures/block/polished_granite.png", "textures/blocks/stone_granite_smooth.png");
+            biConsumer2.accept("textures/block/stone_slab_side.png", "textures/blocks/stone_slab_side.png");
+            biConsumer2.accept("textures/block/stone_slab_top.png", "textures/blocks/stone_slab_top.png");
+            biConsumer2.accept("textures/block/stone_bricks.png", "textures/blocks/stonebrick.png");
+            biConsumer2.accept("textures/block/chiseled_stone_bricks.png", "textures/blocks/stonebrick_carved.png");
+            biConsumer2.accept("textures/block/cracked_stone_bricks.png", "textures/blocks/stonebrick_cracked.png");
+            biConsumer2.accept("textures/block/mossy_stone_bricks.png", "textures/blocks/stonebrick_mossy.png");
+            biConsumer2.accept("textures/block/structure_block.png", "textures/blocks/structure_block.png");
+            biConsumer2.accept("textures/block/structure_block_corner.png", "textures/blocks/structure_block_corner.png");
+            biConsumer2.accept("textures/block/structure_block_data.png", "textures/blocks/structure_block_data.png");
+            biConsumer2.accept("textures/block/structure_block_load.png", "textures/blocks/structure_block_load.png");
+            biConsumer2.accept("textures/block/structure_block_save.png", "textures/blocks/structure_block_save.png");
+            biConsumer2.accept("textures/block/grass.png", "textures/blocks/tallgrass.png");
+            biConsumer2.accept("textures/block/tnt_bottom.png", "textures/blocks/tnt_bottom.png");
+            biConsumer2.accept("textures/block/tnt_side.png", "textures/blocks/tnt_side.png");
+            biConsumer2.accept("textures/block/tnt_top.png", "textures/blocks/tnt_top.png");
+            biConsumer2.accept("textures/block/torch.png", "textures/blocks/torch_on.png");
+            biConsumer2.accept("textures/block/oak_trapdoor.png", "textures/blocks/trapdoor.png");
+            biConsumer2.accept("textures/block/tripwire.png", "textures/blocks/trip_wire.png");
+            biConsumer2.accept("textures/block/tripwire_hook.png", "textures/blocks/trip_wire_source.png");
+            biConsumer2.accept("textures/block/vine.png", "textures/blocks/vine.png");
+            biConsumer2.accept("textures/block/water_flow.png", "textures/blocks/water_flow.png");
+            biConsumer2.accept("textures/block/water_overlay.png", "textures/blocks/water_overlay.png");
+            biConsumer2.accept("textures/block/water_still.png", "textures/blocks/water_still.png");
+            biConsumer2.accept("textures/block/lily_pad.png", "textures/blocks/waterlily.png");
+            biConsumer2.accept("textures/block/cobweb.png", "textures/blocks/web.png");
+            biConsumer2.accept("textures/block/wheat_stage0.png", "textures/blocks/wheat_stage_0.png");
+            biConsumer2.accept("textures/block/wheat_stage1.png", "textures/blocks/wheat_stage_1.png");
+            biConsumer2.accept("textures/block/wheat_stage2.png", "textures/blocks/wheat_stage_2.png");
+            biConsumer2.accept("textures/block/wheat_stage3.png", "textures/blocks/wheat_stage_3.png");
+            biConsumer2.accept("textures/block/wheat_stage4.png", "textures/blocks/wheat_stage_4.png");
+            biConsumer2.accept("textures/block/wheat_stage5.png", "textures/blocks/wheat_stage_5.png");
+            biConsumer2.accept("textures/block/wheat_stage6.png", "textures/blocks/wheat_stage_6.png");
+            biConsumer2.accept("textures/block/wheat_stage7.png", "textures/blocks/wheat_stage_7.png");
+            biConsumer2.accept("textures/block/black_wool.png", "textures/blocks/wool_colored_black.png");
+            biConsumer2.accept("textures/block/blue_wool.png", "textures/blocks/wool_colored_blue.png");
+            biConsumer2.accept("textures/block/brown_wool.png", "textures/blocks/wool_colored_brown.png");
+            biConsumer2.accept("textures/block/cyan_wool.png", "textures/blocks/wool_colored_cyan.png");
+            biConsumer2.accept("textures/block/gray_wool.png", "textures/blocks/wool_colored_gray.png");
+            biConsumer2.accept("textures/block/green_wool.png", "textures/blocks/wool_colored_green.png");
+            biConsumer2.accept("textures/block/light_blue_wool.png", "textures/blocks/wool_colored_light_blue.png");
+            biConsumer2.accept("textures/block/lime_wool.png", "textures/blocks/wool_colored_lime.png");
+            biConsumer2.accept("textures/block/magenta_wool.png", "textures/blocks/wool_colored_magenta.png");
+            biConsumer2.accept("textures/block/orange_wool.png", "textures/blocks/wool_colored_orange.png");
+            biConsumer2.accept("textures/block/pink_wool.png", "textures/blocks/wool_colored_pink.png");
+            biConsumer2.accept("textures/block/purple_wool.png", "textures/blocks/wool_colored_purple.png");
+            biConsumer2.accept("textures/block/red_wool.png", "textures/blocks/wool_colored_red.png");
+            biConsumer2.accept("textures/block/light_gray_wool.png", "textures/blocks/wool_colored_silver.png");
+            biConsumer2.accept("textures/block/white_wool.png", "textures/blocks/wool_colored_white.png");
+            biConsumer2.accept("textures/block/yellow_wool.png", "textures/blocks/wool_colored_yellow.png");
+            biConsumer2.accept("textures/entity/bed/light_gray.png", "textures/entity/bed/silver.png");
+            biConsumer2.accept("textures/entity/boat/acacia.png", "textures/entity/boat/boat_acacia.png");
+            biConsumer2.accept("textures/entity/boat/birch.png", "textures/entity/boat/boat_birch.png");
+            biConsumer2.accept("textures/entity/boat/dark_oak.png", "textures/entity/boat/boat_darkoak.png");
+            biConsumer2.accept("textures/entity/boat/jungle.png", "textures/entity/boat/boat_jungle.png");
+            biConsumer2.accept("textures/entity/boat/oak.png", "textures/entity/boat/boat_oak.png");
+            biConsumer2.accept("textures/entity/boat/spruce.png", "textures/entity/boat/boat_spruce.png");
+            biConsumer2.accept("textures/block/conduit.png", "textures/entity/conduit/break_particle.png");
+            biConsumer2.accept("textures/entity/end_crystal/end_crystal.png", "textures/entity/endercrystal/endercrystal.png");
+            biConsumer2.accept("textures/entity/end_crystal/end_crystal_beam.png", "textures/entity/endercrystal/endercrystal_beam.png");
+            biConsumer2.accept("textures/entity/illager/evoker_fangs.png", "textures/entity/illager/fangs.png");
+            biConsumer2.accept("textures/entity/illager/illusioner.png", "textures/entity/illager/illusionist.png");
+            biConsumer2.accept("textures/entity/llama/decor/black.png", "textures/entity/llama/decor/decor_black.png");
+            biConsumer2.accept("textures/entity/llama/decor/blue.png", "textures/entity/llama/decor/decor_blue.png");
+            biConsumer2.accept("textures/entity/llama/decor/brown.png", "textures/entity/llama/decor/decor_brown.png");
+            biConsumer2.accept("textures/entity/llama/decor/cyan.png", "textures/entity/llama/decor/decor_cyan.png");
+            biConsumer2.accept("textures/entity/llama/decor/gray.png", "textures/entity/llama/decor/decor_gray.png");
+            biConsumer2.accept("textures/entity/llama/decor/green.png", "textures/entity/llama/decor/decor_green.png");
+            biConsumer2.accept("textures/entity/llama/decor/light_blue.png", "textures/entity/llama/decor/decor_light_blue.png");
+            biConsumer2.accept("textures/entity/llama/decor/lime.png", "textures/entity/llama/decor/decor_lime.png");
+            biConsumer2.accept("textures/entity/llama/decor/magenta.png", "textures/entity/llama/decor/decor_magenta.png");
+            biConsumer2.accept("textures/entity/llama/decor/orange.png", "textures/entity/llama/decor/decor_orange.png");
+            biConsumer2.accept("textures/entity/llama/decor/pink.png", "textures/entity/llama/decor/decor_pink.png");
+            biConsumer2.accept("textures/entity/llama/decor/purple.png", "textures/entity/llama/decor/decor_purple.png");
+            biConsumer2.accept("textures/entity/llama/decor/red.png", "textures/entity/llama/decor/decor_red.png");
+            biConsumer2.accept("textures/entity/llama/decor/light_gray.png", "textures/entity/llama/decor/decor_silver.png");
+            biConsumer2.accept("textures/entity/llama/decor/white.png", "textures/entity/llama/decor/decor_white.png");
+            biConsumer2.accept("textures/entity/llama/decor/yellow.png", "textures/entity/llama/decor/decor_yellow.png");
+            biConsumer2.accept("textures/entity/llama/brown.png", "textures/entity/llama/llama_brown.png");
+            biConsumer2.accept("textures/entity/llama/creamy.png", "textures/entity/llama/llama_creamy.png");
+            biConsumer2.accept("textures/entity/llama/gray.png", "textures/entity/llama/llama_gray.png");
+            biConsumer2.accept("textures/entity/llama/white.png", "textures/entity/llama/llama_white.png");
+            biConsumer2.accept("textures/entity/shulker/shulker.png", "textures/entity/shulker/shulker_purple.png");
+            biConsumer2.accept("textures/entity/shulker/shulker_light_gray.png", "textures/entity/shulker/shulker_silver.png");
+            biConsumer2.accept("textures/entity/snow_golem.png", "textures/entity/snowman.png");
+            biConsumer2.accept("textures/item/acacia_boat.png", "textures/items/acacia_boat.png");
+            biConsumer2.accept("textures/item/apple.png", "textures/items/apple.png");
+            biConsumer2.accept("textures/item/golden_apple.png", "textures/items/apple_golden.png");
+            biConsumer2.accept("textures/item/arrow.png", "textures/items/arrow.png");
+            biConsumer2.accept("textures/item/barrier.png", "textures/items/barrier.png");
+            biConsumer2.accept("textures/item/cooked_beef.png", "textures/items/beef_cooked.png");
+            biConsumer2.accept("textures/item/beef.png", "textures/items/beef_raw.png");
+            biConsumer2.accept("textures/item/beetroot.png", "textures/items/beetroot.png");
+            biConsumer2.accept("textures/item/beetroot_seeds.png", "textures/items/beetroot_seeds.png");
+            biConsumer2.accept("textures/item/beetroot_soup.png", "textures/items/beetroot_soup.png");
+            biConsumer2.accept("textures/item/birch_boat.png", "textures/items/birch_boat.png");
+            biConsumer2.accept("textures/item/blaze_powder.png", "textures/items/blaze_powder.png");
+            biConsumer2.accept("textures/item/blaze_rod.png", "textures/items/blaze_rod.png");
+            biConsumer2.accept("textures/item/bone.png", "textures/items/bone.png");
+            biConsumer2.accept("textures/item/enchanted_book.png", "textures/items/book_enchanted.png");
+            biConsumer2.accept("textures/item/book.png", "textures/items/book_normal.png");
+            biConsumer2.accept("textures/item/writable_book.png", "textures/items/book_writable.png");
+            biConsumer2.accept("textures/item/written_book.png", "textures/items/book_written.png");
+            biConsumer2.accept("textures/item/bow_pulling_0.png", "textures/items/bow_pulling_0.png");
+            biConsumer2.accept("textures/item/bow_pulling_1.png", "textures/items/bow_pulling_1.png");
+            biConsumer2.accept("textures/item/bow_pulling_2.png", "textures/items/bow_pulling_2.png");
+            biConsumer2.accept("textures/item/bow.png", "textures/items/bow_standby.png");
+            biConsumer2.accept("textures/item/bowl.png", "textures/items/bowl.png");
+            biConsumer2.accept("textures/item/bread.png", "textures/items/bread.png");
+            biConsumer2.accept("textures/item/brewing_stand.png", "textures/items/brewing_stand.png");
+            biConsumer2.accept("textures/item/brick.png", "textures/items/brick.png");
+            biConsumer2.accept("textures/item/broken_elytra.png", "textures/items/broken_elytra.png");
+            biConsumer2.accept("textures/item/bucket.png", "textures/items/bucket_empty.png");
+            biConsumer2.accept("textures/item/lava_bucket.png", "textures/items/bucket_lava.png");
+            biConsumer2.accept("textures/item/milk_bucket.png", "textures/items/bucket_milk.png");
+            biConsumer2.accept("textures/item/water_bucket.png", "textures/items/bucket_water.png");
+            biConsumer2.accept("textures/item/cake.png", "textures/items/cake.png");
+            biConsumer2.accept("textures/item/carrot.png", "textures/items/carrot.png");
+            biConsumer2.accept("textures/item/golden_carrot.png", "textures/items/carrot_golden.png");
+            biConsumer2.accept("textures/item/carrot_on_a_stick.png", "textures/items/carrot_on_a_stick.png");
+            biConsumer2.accept("textures/item/cauldron.png", "textures/items/cauldron.png");
+            biConsumer2.accept("textures/item/chainmail_boots.png", "textures/items/chainmail_boots.png");
+            biConsumer2.accept("textures/item/chainmail_chestplate.png", "textures/items/chainmail_chestplate.png");
+            biConsumer2.accept("textures/item/chainmail_helmet.png", "textures/items/chainmail_helmet.png");
+            biConsumer2.accept("textures/item/chainmail_leggings.png", "textures/items/chainmail_leggings.png");
+            biConsumer2.accept("textures/item/charcoal.png", "textures/items/charcoal.png");
+            biConsumer2.accept("textures/item/cooked_chicken.png", "textures/items/chicken_cooked.png");
+            biConsumer2.accept("textures/item/chicken.png", "textures/items/chicken_raw.png");
+            biConsumer2.accept("textures/item/chorus_fruit.png", "textures/items/chorus_fruit.png");
+            biConsumer2.accept("textures/item/popped_chorus_fruit.png", "textures/items/chorus_fruit_popped.png");
+            biConsumer2.accept("textures/item/clay_ball.png", "textures/items/clay_ball.png");
+            biConsumer2.accept("textures/item/clock_00.png", "textures/items/clock_00.png");
+            biConsumer2.accept("textures/item/clock_01.png", "textures/items/clock_01.png");
+            biConsumer2.accept("textures/item/clock_02.png", "textures/items/clock_02.png");
+            biConsumer2.accept("textures/item/clock_03.png", "textures/items/clock_03.png");
+            biConsumer2.accept("textures/item/clock_04.png", "textures/items/clock_04.png");
+            biConsumer2.accept("textures/item/clock_05.png", "textures/items/clock_05.png");
+            biConsumer2.accept("textures/item/clock_06.png", "textures/items/clock_06.png");
+            biConsumer2.accept("textures/item/clock_07.png", "textures/items/clock_07.png");
+            biConsumer2.accept("textures/item/clock_08.png", "textures/items/clock_08.png");
+            biConsumer2.accept("textures/item/clock_09.png", "textures/items/clock_09.png");
+            biConsumer2.accept("textures/item/clock_10.png", "textures/items/clock_10.png");
+            biConsumer2.accept("textures/item/clock_11.png", "textures/items/clock_11.png");
+            biConsumer2.accept("textures/item/clock_12.png", "textures/items/clock_12.png");
+            biConsumer2.accept("textures/item/clock_13.png", "textures/items/clock_13.png");
+            biConsumer2.accept("textures/item/clock_14.png", "textures/items/clock_14.png");
+            biConsumer2.accept("textures/item/clock_15.png", "textures/items/clock_15.png");
+            biConsumer2.accept("textures/item/clock_16.png", "textures/items/clock_16.png");
+            biConsumer2.accept("textures/item/clock_17.png", "textures/items/clock_17.png");
+            biConsumer2.accept("textures/item/clock_18.png", "textures/items/clock_18.png");
+            biConsumer2.accept("textures/item/clock_19.png", "textures/items/clock_19.png");
+            biConsumer2.accept("textures/item/clock_20.png", "textures/items/clock_20.png");
+            biConsumer2.accept("textures/item/clock_21.png", "textures/items/clock_21.png");
+            biConsumer2.accept("textures/item/clock_22.png", "textures/items/clock_22.png");
+            biConsumer2.accept("textures/item/clock_23.png", "textures/items/clock_23.png");
+            biConsumer2.accept("textures/item/clock_24.png", "textures/items/clock_24.png");
+            biConsumer2.accept("textures/item/clock_25.png", "textures/items/clock_25.png");
+            biConsumer2.accept("textures/item/clock_26.png", "textures/items/clock_26.png");
+            biConsumer2.accept("textures/item/clock_27.png", "textures/items/clock_27.png");
+            biConsumer2.accept("textures/item/clock_28.png", "textures/items/clock_28.png");
+            biConsumer2.accept("textures/item/clock_29.png", "textures/items/clock_29.png");
+            biConsumer2.accept("textures/item/clock_30.png", "textures/items/clock_30.png");
+            biConsumer2.accept("textures/item/clock_31.png", "textures/items/clock_31.png");
+            biConsumer2.accept("textures/item/clock_32.png", "textures/items/clock_32.png");
+            biConsumer2.accept("textures/item/clock_33.png", "textures/items/clock_33.png");
+            biConsumer2.accept("textures/item/clock_34.png", "textures/items/clock_34.png");
+            biConsumer2.accept("textures/item/clock_35.png", "textures/items/clock_35.png");
+            biConsumer2.accept("textures/item/clock_36.png", "textures/items/clock_36.png");
+            biConsumer2.accept("textures/item/clock_37.png", "textures/items/clock_37.png");
+            biConsumer2.accept("textures/item/clock_38.png", "textures/items/clock_38.png");
+            biConsumer2.accept("textures/item/clock_39.png", "textures/items/clock_39.png");
+            biConsumer2.accept("textures/item/clock_40.png", "textures/items/clock_40.png");
+            biConsumer2.accept("textures/item/clock_41.png", "textures/items/clock_41.png");
+            biConsumer2.accept("textures/item/clock_42.png", "textures/items/clock_42.png");
+            biConsumer2.accept("textures/item/clock_43.png", "textures/items/clock_43.png");
+            biConsumer2.accept("textures/item/clock_44.png", "textures/items/clock_44.png");
+            biConsumer2.accept("textures/item/clock_45.png", "textures/items/clock_45.png");
+            biConsumer2.accept("textures/item/clock_46.png", "textures/items/clock_46.png");
+            biConsumer2.accept("textures/item/clock_47.png", "textures/items/clock_47.png");
+            biConsumer2.accept("textures/item/clock_48.png", "textures/items/clock_48.png");
+            biConsumer2.accept("textures/item/clock_49.png", "textures/items/clock_49.png");
+            biConsumer2.accept("textures/item/clock_50.png", "textures/items/clock_50.png");
+            biConsumer2.accept("textures/item/clock_51.png", "textures/items/clock_51.png");
+            biConsumer2.accept("textures/item/clock_52.png", "textures/items/clock_52.png");
+            biConsumer2.accept("textures/item/clock_53.png", "textures/items/clock_53.png");
+            biConsumer2.accept("textures/item/clock_54.png", "textures/items/clock_54.png");
+            biConsumer2.accept("textures/item/clock_55.png", "textures/items/clock_55.png");
+            biConsumer2.accept("textures/item/clock_56.png", "textures/items/clock_56.png");
+            biConsumer2.accept("textures/item/clock_57.png", "textures/items/clock_57.png");
+            biConsumer2.accept("textures/item/clock_58.png", "textures/items/clock_58.png");
+            biConsumer2.accept("textures/item/clock_59.png", "textures/items/clock_59.png");
+            biConsumer2.accept("textures/item/clock_60.png", "textures/items/clock_60.png");
+            biConsumer2.accept("textures/item/clock_61.png", "textures/items/clock_61.png");
+            biConsumer2.accept("textures/item/clock_62.png", "textures/items/clock_62.png");
+            biConsumer2.accept("textures/item/clock_63.png", "textures/items/clock_63.png");
+            biConsumer2.accept("textures/item/coal.png", "textures/items/coal.png");
+            biConsumer2.accept("textures/item/comparator.png", "textures/items/comparator.png");
+            biConsumer2.accept("textures/item/compass_00.png", "textures/items/compass_00.png");
+            biConsumer2.accept("textures/item/compass_01.png", "textures/items/compass_01.png");
+            biConsumer2.accept("textures/item/compass_02.png", "textures/items/compass_02.png");
+            biConsumer2.accept("textures/item/compass_03.png", "textures/items/compass_03.png");
+            biConsumer2.accept("textures/item/compass_04.png", "textures/items/compass_04.png");
+            biConsumer2.accept("textures/item/compass_05.png", "textures/items/compass_05.png");
+            biConsumer2.accept("textures/item/compass_06.png", "textures/items/compass_06.png");
+            biConsumer2.accept("textures/item/compass_07.png", "textures/items/compass_07.png");
+            biConsumer2.accept("textures/item/compass_08.png", "textures/items/compass_08.png");
+            biConsumer2.accept("textures/item/compass_09.png", "textures/items/compass_09.png");
+            biConsumer2.accept("textures/item/compass_10.png", "textures/items/compass_10.png");
+            biConsumer2.accept("textures/item/compass_11.png", "textures/items/compass_11.png");
+            biConsumer2.accept("textures/item/compass_12.png", "textures/items/compass_12.png");
+            biConsumer2.accept("textures/item/compass_13.png", "textures/items/compass_13.png");
+            biConsumer2.accept("textures/item/compass_14.png", "textures/items/compass_14.png");
+            biConsumer2.accept("textures/item/compass_15.png", "textures/items/compass_15.png");
+            biConsumer2.accept("textures/item/compass_16.png", "textures/items/compass_16.png");
+            biConsumer2.accept("textures/item/compass_17.png", "textures/items/compass_17.png");
+            biConsumer2.accept("textures/item/compass_18.png", "textures/items/compass_18.png");
+            biConsumer2.accept("textures/item/compass_19.png", "textures/items/compass_19.png");
+            biConsumer2.accept("textures/item/compass_20.png", "textures/items/compass_20.png");
+            biConsumer2.accept("textures/item/compass_21.png", "textures/items/compass_21.png");
+            biConsumer2.accept("textures/item/compass_22.png", "textures/items/compass_22.png");
+            biConsumer2.accept("textures/item/compass_23.png", "textures/items/compass_23.png");
+            biConsumer2.accept("textures/item/compass_24.png", "textures/items/compass_24.png");
+            biConsumer2.accept("textures/item/compass_25.png", "textures/items/compass_25.png");
+            biConsumer2.accept("textures/item/compass_26.png", "textures/items/compass_26.png");
+            biConsumer2.accept("textures/item/compass_27.png", "textures/items/compass_27.png");
+            biConsumer2.accept("textures/item/compass_28.png", "textures/items/compass_28.png");
+            biConsumer2.accept("textures/item/compass_29.png", "textures/items/compass_29.png");
+            biConsumer2.accept("textures/item/compass_30.png", "textures/items/compass_30.png");
+            biConsumer2.accept("textures/item/compass_31.png", "textures/items/compass_31.png");
+            biConsumer2.accept("textures/item/cookie.png", "textures/items/cookie.png");
+            biConsumer2.accept("textures/item/dark_oak_boat.png", "textures/items/dark_oak_boat.png");
+            biConsumer2.accept("textures/item/diamond.png", "textures/items/diamond.png");
+            biConsumer2.accept("textures/item/diamond_axe.png", "textures/items/diamond_axe.png");
+            biConsumer2.accept("textures/item/diamond_boots.png", "textures/items/diamond_boots.png");
+            biConsumer2.accept("textures/item/diamond_chestplate.png", "textures/items/diamond_chestplate.png");
+            biConsumer2.accept("textures/item/diamond_helmet.png", "textures/items/diamond_helmet.png");
+            biConsumer2.accept("textures/item/diamond_hoe.png", "textures/items/diamond_hoe.png");
+            biConsumer2.accept("textures/item/diamond_horse_armor.png", "textures/items/diamond_horse_armor.png");
+            biConsumer2.accept("textures/item/diamond_leggings.png", "textures/items/diamond_leggings.png");
+            biConsumer2.accept("textures/item/diamond_pickaxe.png", "textures/items/diamond_pickaxe.png");
+            biConsumer2.accept("textures/item/diamond_shovel.png", "textures/items/diamond_shovel.png");
+            biConsumer2.accept("textures/item/diamond_sword.png", "textures/items/diamond_sword.png");
+            biConsumer2.accept("textures/item/acacia_door.png", "textures/items/door_acacia.png");
+            biConsumer2.accept("textures/item/birch_door.png", "textures/items/door_birch.png");
+            biConsumer2.accept("textures/item/dark_oak_door.png", "textures/items/door_dark_oak.png");
+            biConsumer2.accept("textures/item/iron_door.png", "textures/items/door_iron.png");
+            biConsumer2.accept("textures/item/jungle_door.png", "textures/items/door_jungle.png");
+            biConsumer2.accept("textures/item/spruce_door.png", "textures/items/door_spruce.png");
+            biConsumer2.accept("textures/item/oak_door.png", "textures/items/door_wood.png");
+            biConsumer2.accept("textures/item/dragon_breath.png", "textures/items/dragon_breath.png");
+            biConsumer2.accept("textures/item/ink_sac.png", "textures/items/dye_powder_black.png");
+            biConsumer2.accept("textures/item/lapis_lazuli.png", "textures/items/dye_powder_blue.png");
+            biConsumer2.accept("textures/item/cocoa_beans.png", "textures/items/dye_powder_brown.png");
+            biConsumer2.accept("textures/item/cyan_dye.png", "textures/items/dye_powder_cyan.png");
+            biConsumer2.accept("textures/item/gray_dye.png", "textures/items/dye_powder_gray.png");
+            biConsumer2.accept("textures/item/green_dye.png", "textures/items/dye_powder_green.png");
+            biConsumer2.accept("textures/item/light_blue_dye.png", "textures/items/dye_powder_light_blue.png");
+            biConsumer2.accept("textures/item/lime_dye.png", "textures/items/dye_powder_lime.png");
+            biConsumer2.accept("textures/item/magenta_dye.png", "textures/items/dye_powder_magenta.png");
+            biConsumer2.accept("textures/item/orange_dye.png", "textures/items/dye_powder_orange.png");
+            biConsumer2.accept("textures/item/pink_dye.png", "textures/items/dye_powder_pink.png");
+            biConsumer2.accept("textures/item/purple_dye.png", "textures/items/dye_powder_purple.png");
+            biConsumer2.accept("textures/item/red_dye.png", "textures/items/dye_powder_red.png");
+            biConsumer2.accept("textures/item/light_gray_dye.png", "textures/items/dye_powder_silver.png");
+            biConsumer2.accept("textures/item/bone_meal.png", "textures/items/dye_powder_white.png");
+            biConsumer2.accept("textures/item/yellow_dye.png", "textures/items/dye_powder_yellow.png");
+            biConsumer2.accept("textures/item/egg.png", "textures/items/egg.png");
+            biConsumer2.accept("textures/item/elytra.png", "textures/items/elytra.png");
+            biConsumer2.accept("textures/item/emerald.png", "textures/items/emerald.png");
+            biConsumer2.accept("textures/item/empty_armor_slot_boots.png", "textures/items/empty_armor_slot_boots.png");
+            biConsumer2.accept("textures/item/empty_armor_slot_chestplate.png", "textures/items/empty_armor_slot_chestplate.png");
+            biConsumer2.accept("textures/item/empty_armor_slot_helmet.png", "textures/items/empty_armor_slot_helmet.png");
+            biConsumer2.accept("textures/item/empty_armor_slot_leggings.png", "textures/items/empty_armor_slot_leggings.png");
+            biConsumer2.accept("textures/item/empty_armor_slot_shield.png", "textures/items/empty_armor_slot_shield.png");
+            biConsumer2.accept("textures/item/end_crystal.png", "textures/items/end_crystal.png");
+            biConsumer2.accept("textures/item/ender_eye.png", "textures/items/ender_eye.png");
+            biConsumer2.accept("textures/item/ender_pearl.png", "textures/items/ender_pearl.png");
+            biConsumer2.accept("textures/item/experience_bottle.png", "textures/items/experience_bottle.png");
+            biConsumer2.accept("textures/item/feather.png", "textures/items/feather.png");
+            biConsumer2.accept("textures/item/fire_charge.png", "textures/items/fireball.png");
+            biConsumer2.accept("textures/item/firework_rocket.png", "textures/items/fireworks.png");
+            biConsumer2.accept("textures/item/firework_star.png", "textures/items/fireworks_charge.png");
+            biConsumer2.accept("textures/item/firework_star_overlay.png", "textures/items/fireworks_charge_overlay.png");
+            biConsumer2.accept("textures/item/tropical_fish.png", "textures/items/fish_clownfish_raw.png");
+            biConsumer2.accept("textures/item/cooked_cod.png", "textures/items/fish_cod_cooked.png");
+            biConsumer2.accept("textures/item/cod.png", "textures/items/fish_cod_raw.png");
+            biConsumer2.accept("textures/item/pufferfish.png", "textures/items/fish_pufferfish_raw.png");
+            biConsumer2.accept("textures/item/cooked_salmon.png", "textures/items/fish_salmon_cooked.png");
+            biConsumer2.accept("textures/item/salmon.png", "textures/items/fish_salmon_raw.png");
+            biConsumer2.accept("textures/item/fishing_rod_cast.png", "textures/items/fishing_rod_cast.png");
+            biConsumer2.accept("textures/item/fishing_rod.png", "textures/items/fishing_rod_uncast.png");
+            biConsumer2.accept("textures/item/flint.png", "textures/items/flint.png");
+            biConsumer2.accept("textures/item/flint_and_steel.png", "textures/items/flint_and_steel.png");
+            biConsumer2.accept("textures/item/flower_pot.png", "textures/items/flower_pot.png");
+            biConsumer2.accept("textures/item/ghast_tear.png", "textures/items/ghast_tear.png");
+            biConsumer2.accept("textures/item/glowstone_dust.png", "textures/items/glowstone_dust.png");
+            biConsumer2.accept("textures/item/golden_axe.png", "textures/items/gold_axe.png");
+            biConsumer2.accept("textures/item/golden_boots.png", "textures/items/gold_boots.png");
+            biConsumer2.accept("textures/item/golden_chestplate.png", "textures/items/gold_chestplate.png");
+            biConsumer2.accept("textures/item/golden_helmet.png", "textures/items/gold_helmet.png");
+            biConsumer2.accept("textures/item/golden_hoe.png", "textures/items/gold_hoe.png");
+            biConsumer2.accept("textures/item/golden_horse_armor.png", "textures/items/gold_horse_armor.png");
+            biConsumer2.accept("textures/item/gold_ingot.png", "textures/items/gold_ingot.png");
+            biConsumer2.accept("textures/item/golden_leggings.png", "textures/items/gold_leggings.png");
+            biConsumer2.accept("textures/item/gold_nugget.png", "textures/items/gold_nugget.png");
+            biConsumer2.accept("textures/item/golden_pickaxe.png", "textures/items/gold_pickaxe.png");
+            biConsumer2.accept("textures/item/golden_shovel.png", "textures/items/gold_shovel.png");
+            biConsumer2.accept("textures/item/golden_sword.png", "textures/items/gold_sword.png");
+            biConsumer2.accept("textures/item/gunpowder.png", "textures/items/gunpowder.png");
+            biConsumer2.accept("textures/item/hopper.png", "textures/items/hopper.png");
+            biConsumer2.accept("textures/item/iron_axe.png", "textures/items/iron_axe.png");
+            biConsumer2.accept("textures/item/iron_boots.png", "textures/items/iron_boots.png");
+            biConsumer2.accept("textures/item/iron_chestplate.png", "textures/items/iron_chestplate.png");
+            biConsumer2.accept("textures/item/iron_helmet.png", "textures/items/iron_helmet.png");
+            biConsumer2.accept("textures/item/iron_hoe.png", "textures/items/iron_hoe.png");
+            biConsumer2.accept("textures/item/iron_horse_armor.png", "textures/items/iron_horse_armor.png");
+            biConsumer2.accept("textures/item/iron_ingot.png", "textures/items/iron_ingot.png");
+            biConsumer2.accept("textures/item/iron_leggings.png", "textures/items/iron_leggings.png");
+            biConsumer2.accept("textures/item/iron_nugget.png", "textures/items/iron_nugget.png");
+            biConsumer2.accept("textures/item/iron_pickaxe.png", "textures/items/iron_pickaxe.png");
+            biConsumer2.accept("textures/item/iron_shovel.png", "textures/items/iron_shovel.png");
+            biConsumer2.accept("textures/item/iron_sword.png", "textures/items/iron_sword.png");
+            biConsumer2.accept("textures/item/item_frame.png", "textures/items/item_frame.png");
+            biConsumer2.accept("textures/item/jungle_boat.png", "textures/items/jungle_boat.png");
+            biConsumer2.accept("textures/item/knowledge_book.png", "textures/items/knowledge_book.png");
+            biConsumer2.accept("textures/item/lead.png", "textures/items/lead.png");
+            biConsumer2.accept("textures/item/leather.png", "textures/items/leather.png");
+            biConsumer2.accept("textures/item/leather_boots.png", "textures/items/leather_boots.png");
+            biConsumer2.accept("textures/item/leather_boots_overlay.png", "textures/items/leather_boots_overlay.png");
+            biConsumer2.accept("textures/item/leather_chestplate.png", "textures/items/leather_chestplate.png");
+            biConsumer2.accept("textures/item/leather_chestplate_overlay.png", "textures/items/leather_chestplate_overlay.png");
+            biConsumer2.accept("textures/item/leather_helmet.png", "textures/items/leather_helmet.png");
+            biConsumer2.accept("textures/item/leather_helmet_overlay.png", "textures/items/leather_helmet_overlay.png");
+            biConsumer2.accept("textures/item/leather_leggings.png", "textures/items/leather_leggings.png");
+            biConsumer2.accept("textures/item/leather_leggings_overlay.png", "textures/items/leather_leggings_overlay.png");
+            biConsumer2.accept("textures/item/magma_cream.png", "textures/items/magma_cream.png");
+            biConsumer2.accept("textures/item/map.png", "textures/items/map_empty.png");
+            biConsumer2.accept("textures/item/filled_map.png", "textures/items/map_filled.png");
+            biConsumer2.accept("textures/item/filled_map_markings.png", "textures/items/map_filled_markings.png");
+            biConsumer2.accept("textures/item/melon_slice.png", "textures/items/melon.png");
+            biConsumer2.accept("textures/item/glistering_melon_slice.png", "textures/items/melon_speckled.png");
+            biConsumer2.accept("textures/item/chest_minecart.png", "textures/items/minecart_chest.png");
+            biConsumer2.accept("textures/item/command_block_minecart.png", "textures/items/minecart_command_block.png");
+            biConsumer2.accept("textures/item/furnace_minecart.png", "textures/items/minecart_furnace.png");
+            biConsumer2.accept("textures/item/hopper_minecart.png", "textures/items/minecart_hopper.png");
+            biConsumer2.accept("textures/item/minecart.png", "textures/items/minecart_normal.png");
+            biConsumer2.accept("textures/item/tnt_minecart.png", "textures/items/minecart_tnt.png");
+            biConsumer2.accept("textures/item/mushroom_stew.png", "textures/items/mushroom_stew.png");
+            biConsumer2.accept("textures/item/cooked_mutton.png", "textures/items/mutton_cooked.png");
+            biConsumer2.accept("textures/item/mutton.png", "textures/items/mutton_raw.png");
+            biConsumer2.accept("textures/item/name_tag.png", "textures/items/name_tag.png");
+            biConsumer2.accept("textures/item/nether_star.png", "textures/items/nether_star.png");
+            biConsumer2.accept("textures/item/nether_wart.png", "textures/items/nether_wart.png");
+            biConsumer2.accept("textures/item/nether_brick.png", "textures/items/netherbrick.png");
+            biConsumer2.accept("textures/item/oak_boat.png", "textures/items/oak_boat.png");
+            biConsumer2.accept("textures/item/painting.png", "textures/items/painting.png");
+            biConsumer2.accept("textures/item/paper.png", "textures/items/paper.png");
+            biConsumer2.accept("textures/item/cooked_porkchop.png", "textures/items/porkchop_cooked.png");
+            biConsumer2.accept("textures/item/porkchop.png", "textures/items/porkchop_raw.png");
+            biConsumer2.accept("textures/item/potato.png", "textures/items/potato.png");
+            biConsumer2.accept("textures/item/baked_potato.png", "textures/items/potato_baked.png");
+            biConsumer2.accept("textures/item/poisonous_potato.png", "textures/items/potato_poisonous.png");
+            biConsumer2.accept("textures/item/potion.png", "textures/items/potion_bottle_drinkable.png");
+            biConsumer2.accept("textures/item/glass_bottle.png", "textures/items/potion_bottle_empty.png");
+            biConsumer2.accept("textures/item/lingering_potion.png", "textures/items/potion_bottle_lingering.png");
+            biConsumer2.accept("textures/item/splash_potion.png", "textures/items/potion_bottle_splash.png");
+            biConsumer2.accept("textures/item/potion_overlay.png", "textures/items/potion_overlay.png");
+            biConsumer2.accept("textures/item/prismarine_crystals.png", "textures/items/prismarine_crystals.png");
+            biConsumer2.accept("textures/item/prismarine_shard.png", "textures/items/prismarine_shard.png");
+            biConsumer2.accept("textures/item/pumpkin_pie.png", "textures/items/pumpkin_pie.png");
+            biConsumer2.accept("textures/item/quartz.png", "textures/items/quartz.png");
+            biConsumer2.accept("textures/item/cooked_rabbit.png", "textures/items/rabbit_cooked.png");
+            biConsumer2.accept("textures/item/rabbit_foot.png", "textures/items/rabbit_foot.png");
+            biConsumer2.accept("textures/item/rabbit_hide.png", "textures/items/rabbit_hide.png");
+            biConsumer2.accept("textures/item/rabbit.png", "textures/items/rabbit_raw.png");
+            biConsumer2.accept("textures/item/rabbit_stew.png", "textures/items/rabbit_stew.png");
+            biConsumer2.accept("textures/item/music_disc_11.png", "textures/items/record_11.png");
+            biConsumer2.accept("textures/item/music_disc_13.png", "textures/items/record_13.png");
+            biConsumer2.accept("textures/item/music_disc_blocks.png", "textures/items/record_blocks.png");
+            biConsumer2.accept("textures/item/music_disc_cat.png", "textures/items/record_cat.png");
+            biConsumer2.accept("textures/item/music_disc_chirp.png", "textures/items/record_chirp.png");
+            biConsumer2.accept("textures/item/music_disc_far.png", "textures/items/record_far.png");
+            biConsumer2.accept("textures/item/music_disc_mall.png", "textures/items/record_mall.png");
+            biConsumer2.accept("textures/item/music_disc_mellohi.png", "textures/items/record_mellohi.png");
+            biConsumer2.accept("textures/item/music_disc_stal.png", "textures/items/record_stal.png");
+            biConsumer2.accept("textures/item/music_disc_strad.png", "textures/items/record_strad.png");
+            biConsumer2.accept("textures/item/music_disc_wait.png", "textures/items/record_wait.png");
+            biConsumer2.accept("textures/item/music_disc_ward.png", "textures/items/record_ward.png");
+            biConsumer2.accept("textures/item/redstone.png", "textures/items/redstone_dust.png");
+            biConsumer2.accept("textures/item/sugar_cane.png", "textures/items/reeds.png");
+            biConsumer2.accept("textures/item/repeater.png", "textures/items/repeater.png");
+            biConsumer2.accept("textures/item/rotten_flesh.png", "textures/items/rotten_flesh.png");
+            biConsumer2.accept("textures/item/ruby.png", "textures/items/ruby.png");
+            biConsumer2.accept("textures/item/saddle.png", "textures/items/saddle.png");
+            biConsumer2.accept("textures/item/melon_seeds.png", "textures/items/seeds_melon.png");
+            biConsumer2.accept("textures/item/pumpkin_seeds.png", "textures/items/seeds_pumpkin.png");
+            biConsumer2.accept("textures/item/wheat_seeds.png", "textures/items/seeds_wheat.png");
+            biConsumer2.accept("textures/item/shears.png", "textures/items/shears.png");
+            biConsumer2.accept("textures/item/shulker_shell.png", "textures/items/shulker_shell.png");
+            biConsumer2.accept("textures/item/sign.png", "textures/items/sign.png");
+            biConsumer2.accept("textures/item/slime_ball.png", "textures/items/slimeball.png");
+            biConsumer2.accept("textures/item/snowball.png", "textures/items/snowball.png");
+            biConsumer2.accept("textures/item/spawn_egg.png", "textures/items/spawn_egg.png");
+            biConsumer2.accept("textures/item/spawn_egg_overlay.png", "textures/items/spawn_egg_overlay.png");
+            biConsumer2.accept("textures/item/spectral_arrow.png", "textures/items/spectral_arrow.png");
+            biConsumer2.accept("textures/item/spider_eye.png", "textures/items/spider_eye.png");
+            biConsumer2.accept("textures/item/fermented_spider_eye.png", "textures/items/spider_eye_fermented.png");
+            biConsumer2.accept("textures/item/spruce_boat.png", "textures/items/spruce_boat.png");
+            biConsumer2.accept("textures/item/stick.png", "textures/items/stick.png");
+            biConsumer2.accept("textures/item/stone_axe.png", "textures/items/stone_axe.png");
+            biConsumer2.accept("textures/item/stone_hoe.png", "textures/items/stone_hoe.png");
+            biConsumer2.accept("textures/item/stone_pickaxe.png", "textures/items/stone_pickaxe.png");
+            biConsumer2.accept("textures/item/stone_shovel.png", "textures/items/stone_shovel.png");
+            biConsumer2.accept("textures/item/stone_sword.png", "textures/items/stone_sword.png");
+            biConsumer2.accept("textures/item/string.png", "textures/items/string.png");
+            biConsumer2.accept("textures/item/structure_void.png", "textures/items/structure_void.png");
+            biConsumer2.accept("textures/item/sugar.png", "textures/items/sugar.png");
+            biConsumer2.accept("textures/item/tipped_arrow_base.png", "textures/items/tipped_arrow_base.png");
+            biConsumer2.accept("textures/item/tipped_arrow_head.png", "textures/items/tipped_arrow_head.png");
+            biConsumer2.accept("textures/item/totem_of_undying.png", "textures/items/totem.png");
+            biConsumer2.accept("textures/item/wheat.png", "textures/items/wheat.png");
+            biConsumer2.accept("textures/item/wooden_axe.png", "textures/items/wood_axe.png");
+            biConsumer2.accept("textures/item/wooden_hoe.png", "textures/items/wood_hoe.png");
+            biConsumer2.accept("textures/item/wooden_pickaxe.png", "textures/items/wood_pickaxe.png");
+            biConsumer2.accept("textures/item/wooden_shovel.png", "textures/items/wood_shovel.png");
+            biConsumer2.accept("textures/item/wooden_sword.png", "textures/items/wood_sword.png");
+            biConsumer2.accept("textures/item/armor_stand.png", "textures/items/wooden_armorstand.png");
+            return builder1.build();
+        });
+    }
+}
diff --git a/src/net/minecraft/client/resources/LegacyResourcePackAdapter.java b/src/net/minecraft/client/resources/LegacyResourcePackAdapter.java
deleted file mode 100644
index e6424de..0000000
--- a/src/net/minecraft/client/resources/LegacyResourcePackAdapter.java
+++ /dev/null
@@ -1,944 +0,0 @@
-package net.minecraft.client.resources;
-
-import net.minecraft.Util;
-import javax.annotation.Nullable;
-import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
-import java.util.Set;
-import java.util.Collections;
-import java.util.Collection;
-import java.util.function.Predicate;
-import net.minecraft.server.packs.PackType;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.resources.ResourceLocation;
-import java.util.Map;
-import net.minecraft.server.packs.Pack;
-
-public class LegacyResourcePackAdapter implements Pack {
-    private final Pack source;
-    private final Map<ResourceLocation, ResourceLocation> patches;
-    public static final Map<ResourceLocation, ResourceLocation> V3;
-    
-    private static ResourceLocation toMetaLocation(final ResourceLocation sm) {
-        return new ResourceLocation(sm.getNamespace(), sm.getPath() + ".mcmeta");
-    }
-    
-    public LegacyResourcePackAdapter(final Pack ye, final Map<ResourceLocation, ResourceLocation> map) {
-        this.source = ye;
-        final ImmutableMap.Builder<ResourceLocation, ResourceLocation> builder4 = ImmutableMap.<ResourceLocation, ResourceLocation>builder();
-        for (final Map.Entry<ResourceLocation, ResourceLocation> entry6 : map.entrySet()) {
-            builder4.put(entry6);
-            builder4.put(toMetaLocation(entry6.getKey()), toMetaLocation(entry6.getValue()));
-        }
-        this.patches = builder4.build();
-    }
-    
-    private ResourceLocation map(final ResourceLocation sm) {
-        return this.patches.getOrDefault(sm, sm);
-    }
-    
-    @Override
-    public InputStream getRootResource(final String string) throws IOException {
-        return this.source.getRootResource(string);
-    }
-    
-    @Override
-    public InputStream getResource(final PackType yf, final ResourceLocation sm) throws IOException {
-        return this.source.getResource(yf, this.map(sm));
-    }
-    
-    @Override
-    public Collection<ResourceLocation> getResources(final PackType yf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
-        return Collections.emptyList();
-    }
-    
-    @Override
-    public boolean hasResource(final PackType yf, final ResourceLocation sm) {
-        return this.source.hasResource(yf, this.map(sm));
-    }
-    
-    @Override
-    public Set<String> getNamespaces(final PackType yf) {
-        return this.source.getNamespaces(yf);
-    }
-    
-    @Nullable
-    @Override
-    public <T> T getMetadataSection(final MetadataSectionSerializer<T> yi) throws IOException {
-        return this.source.<T>getMetadataSection(yi);
-    }
-    
-    @Override
-    public String getName() {
-        return this.source.getName();
-    }
-    
-    @Override
-    public void close() throws IOException {
-        this.source.close();
-    }
-    
-    static {
-        final ImmutableMap.Builder<ResourceLocation, ResourceLocation> builder1;
-        V3 = Util.<ImmutableMap<ResourceLocation, ResourceLocation>>make(() -> {
-            builder1 = ImmutableMap.<ResourceLocation, ResourceLocation>builder();
-            builder1.put(new ResourceLocation("textures/block/melon_stem.png"), new ResourceLocation("textures/block/pumpkin_stem.png"));
-            builder1.put(new ResourceLocation("textures/block/anvil.png"), new ResourceLocation("textures/blocks/anvil_base.png"));
-            builder1.put(new ResourceLocation("textures/block/anvil_top.png"), new ResourceLocation("textures/blocks/anvil_top_damaged_0.png"));
-            builder1.put(new ResourceLocation("textures/block/chipped_anvil_top.png"), new ResourceLocation("textures/blocks/anvil_top_damaged_1.png"));
-            builder1.put(new ResourceLocation("textures/block/damaged_anvil_top.png"), new ResourceLocation("textures/blocks/anvil_top_damaged_2.png"));
-            builder1.put(new ResourceLocation("textures/block/beacon.png"), new ResourceLocation("textures/blocks/beacon.png"));
-            builder1.put(new ResourceLocation("textures/block/bedrock.png"), new ResourceLocation("textures/blocks/bedrock.png"));
-            builder1.put(new ResourceLocation("textures/block/beetroots_stage0.png"), new ResourceLocation("textures/blocks/beetroots_stage_0.png"));
-            builder1.put(new ResourceLocation("textures/block/beetroots_stage1.png"), new ResourceLocation("textures/blocks/beetroots_stage_1.png"));
-            builder1.put(new ResourceLocation("textures/block/beetroots_stage2.png"), new ResourceLocation("textures/blocks/beetroots_stage_2.png"));
-            builder1.put(new ResourceLocation("textures/block/beetroots_stage3.png"), new ResourceLocation("textures/blocks/beetroots_stage_3.png"));
-            builder1.put(new ResourceLocation("textures/block/bone_block_side.png"), new ResourceLocation("textures/blocks/bone_block_side.png"));
-            builder1.put(new ResourceLocation("textures/block/bone_block_top.png"), new ResourceLocation("textures/blocks/bone_block_top.png"));
-            builder1.put(new ResourceLocation("textures/block/bookshelf.png"), new ResourceLocation("textures/blocks/bookshelf.png"));
-            builder1.put(new ResourceLocation("textures/block/brewing_stand.png"), new ResourceLocation("textures/blocks/brewing_stand.png"));
-            builder1.put(new ResourceLocation("textures/block/brewing_stand_base.png"), new ResourceLocation("textures/blocks/brewing_stand_base.png"));
-            builder1.put(new ResourceLocation("textures/block/bricks.png"), new ResourceLocation("textures/blocks/brick.png"));
-            builder1.put(new ResourceLocation("textures/block/cactus_bottom.png"), new ResourceLocation("textures/blocks/cactus_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/cactus_side.png"), new ResourceLocation("textures/blocks/cactus_side.png"));
-            builder1.put(new ResourceLocation("textures/block/cactus_top.png"), new ResourceLocation("textures/blocks/cactus_top.png"));
-            builder1.put(new ResourceLocation("textures/block/cake_bottom.png"), new ResourceLocation("textures/blocks/cake_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/cake_inner.png"), new ResourceLocation("textures/blocks/cake_inner.png"));
-            builder1.put(new ResourceLocation("textures/block/cake_side.png"), new ResourceLocation("textures/blocks/cake_side.png"));
-            builder1.put(new ResourceLocation("textures/block/cake_top.png"), new ResourceLocation("textures/blocks/cake_top.png"));
-            builder1.put(new ResourceLocation("textures/block/carrots_stage0.png"), new ResourceLocation("textures/blocks/carrots_stage_0.png"));
-            builder1.put(new ResourceLocation("textures/block/carrots_stage1.png"), new ResourceLocation("textures/blocks/carrots_stage_1.png"));
-            builder1.put(new ResourceLocation("textures/block/carrots_stage2.png"), new ResourceLocation("textures/blocks/carrots_stage_2.png"));
-            builder1.put(new ResourceLocation("textures/block/carrots_stage3.png"), new ResourceLocation("textures/blocks/carrots_stage_3.png"));
-            builder1.put(new ResourceLocation("textures/block/cauldron_bottom.png"), new ResourceLocation("textures/blocks/cauldron_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/cauldron_inner.png"), new ResourceLocation("textures/blocks/cauldron_inner.png"));
-            builder1.put(new ResourceLocation("textures/block/cauldron_side.png"), new ResourceLocation("textures/blocks/cauldron_side.png"));
-            builder1.put(new ResourceLocation("textures/block/cauldron_top.png"), new ResourceLocation("textures/blocks/cauldron_top.png"));
-            builder1.put(new ResourceLocation("textures/block/chain_command_block_back.png"), new ResourceLocation("textures/blocks/chain_command_block_back.png"));
-            builder1.put(new ResourceLocation("textures/block/chain_command_block_conditional.png"), new ResourceLocation("textures/blocks/chain_command_block_conditional.png"));
-            builder1.put(new ResourceLocation("textures/block/chain_command_block_front.png"), new ResourceLocation("textures/blocks/chain_command_block_front.png"));
-            builder1.put(new ResourceLocation("textures/block/chain_command_block_side.png"), new ResourceLocation("textures/blocks/chain_command_block_side.png"));
-            builder1.put(new ResourceLocation("textures/block/chorus_flower.png"), new ResourceLocation("textures/blocks/chorus_flower.png"));
-            builder1.put(new ResourceLocation("textures/block/chorus_flower_dead.png"), new ResourceLocation("textures/blocks/chorus_flower_dead.png"));
-            builder1.put(new ResourceLocation("textures/block/chorus_plant.png"), new ResourceLocation("textures/blocks/chorus_plant.png"));
-            builder1.put(new ResourceLocation("textures/block/clay.png"), new ResourceLocation("textures/blocks/clay.png"));
-            builder1.put(new ResourceLocation("textures/block/coal_block.png"), new ResourceLocation("textures/blocks/coal_block.png"));
-            builder1.put(new ResourceLocation("textures/block/coal_ore.png"), new ResourceLocation("textures/blocks/coal_ore.png"));
-            builder1.put(new ResourceLocation("textures/block/coarse_dirt.png"), new ResourceLocation("textures/blocks/coarse_dirt.png"));
-            builder1.put(new ResourceLocation("textures/block/cobblestone.png"), new ResourceLocation("textures/blocks/cobblestone.png"));
-            builder1.put(new ResourceLocation("textures/block/mossy_cobblestone.png"), new ResourceLocation("textures/blocks/cobblestone_mossy.png"));
-            builder1.put(new ResourceLocation("textures/block/cocoa_stage0.png"), new ResourceLocation("textures/blocks/cocoa_stage_0.png"));
-            builder1.put(new ResourceLocation("textures/block/cocoa_stage1.png"), new ResourceLocation("textures/blocks/cocoa_stage_1.png"));
-            builder1.put(new ResourceLocation("textures/block/cocoa_stage2.png"), new ResourceLocation("textures/blocks/cocoa_stage_2.png"));
-            builder1.put(new ResourceLocation("textures/block/command_block_back.png"), new ResourceLocation("textures/blocks/command_block_back.png"));
-            builder1.put(new ResourceLocation("textures/block/command_block_conditional.png"), new ResourceLocation("textures/blocks/command_block_conditional.png"));
-            builder1.put(new ResourceLocation("textures/block/command_block_front.png"), new ResourceLocation("textures/blocks/command_block_front.png"));
-            builder1.put(new ResourceLocation("textures/block/command_block_side.png"), new ResourceLocation("textures/blocks/command_block_side.png"));
-            builder1.put(new ResourceLocation("textures/block/comparator.png"), new ResourceLocation("textures/blocks/comparator_off.png"));
-            builder1.put(new ResourceLocation("textures/block/comparator_on.png"), new ResourceLocation("textures/blocks/comparator_on.png"));
-            builder1.put(new ResourceLocation("textures/block/black_concrete.png"), new ResourceLocation("textures/blocks/concrete_black.png"));
-            builder1.put(new ResourceLocation("textures/block/blue_concrete.png"), new ResourceLocation("textures/blocks/concrete_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/brown_concrete.png"), new ResourceLocation("textures/blocks/concrete_brown.png"));
-            builder1.put(new ResourceLocation("textures/block/cyan_concrete.png"), new ResourceLocation("textures/blocks/concrete_cyan.png"));
-            builder1.put(new ResourceLocation("textures/block/gray_concrete.png"), new ResourceLocation("textures/blocks/concrete_gray.png"));
-            builder1.put(new ResourceLocation("textures/block/green_concrete.png"), new ResourceLocation("textures/blocks/concrete_green.png"));
-            builder1.put(new ResourceLocation("textures/block/light_blue_concrete.png"), new ResourceLocation("textures/blocks/concrete_light_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/lime_concrete.png"), new ResourceLocation("textures/blocks/concrete_lime.png"));
-            builder1.put(new ResourceLocation("textures/block/magenta_concrete.png"), new ResourceLocation("textures/blocks/concrete_magenta.png"));
-            builder1.put(new ResourceLocation("textures/block/orange_concrete.png"), new ResourceLocation("textures/blocks/concrete_orange.png"));
-            builder1.put(new ResourceLocation("textures/block/pink_concrete.png"), new ResourceLocation("textures/blocks/concrete_pink.png"));
-            builder1.put(new ResourceLocation("textures/block/black_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_black.png"));
-            builder1.put(new ResourceLocation("textures/block/blue_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/brown_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_brown.png"));
-            builder1.put(new ResourceLocation("textures/block/cyan_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_cyan.png"));
-            builder1.put(new ResourceLocation("textures/block/gray_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_gray.png"));
-            builder1.put(new ResourceLocation("textures/block/green_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_green.png"));
-            builder1.put(new ResourceLocation("textures/block/light_blue_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_light_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/lime_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_lime.png"));
-            builder1.put(new ResourceLocation("textures/block/magenta_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_magenta.png"));
-            builder1.put(new ResourceLocation("textures/block/orange_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_orange.png"));
-            builder1.put(new ResourceLocation("textures/block/pink_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_pink.png"));
-            builder1.put(new ResourceLocation("textures/block/purple_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_purple.png"));
-            builder1.put(new ResourceLocation("textures/block/red_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_red.png"));
-            builder1.put(new ResourceLocation("textures/block/light_gray_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_silver.png"));
-            builder1.put(new ResourceLocation("textures/block/white_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_white.png"));
-            builder1.put(new ResourceLocation("textures/block/yellow_concrete_powder.png"), new ResourceLocation("textures/blocks/concrete_powder_yellow.png"));
-            builder1.put(new ResourceLocation("textures/block/purple_concrete.png"), new ResourceLocation("textures/blocks/concrete_purple.png"));
-            builder1.put(new ResourceLocation("textures/block/red_concrete.png"), new ResourceLocation("textures/blocks/concrete_red.png"));
-            builder1.put(new ResourceLocation("textures/block/light_gray_concrete.png"), new ResourceLocation("textures/blocks/concrete_silver.png"));
-            builder1.put(new ResourceLocation("textures/block/white_concrete.png"), new ResourceLocation("textures/blocks/concrete_white.png"));
-            builder1.put(new ResourceLocation("textures/block/yellow_concrete.png"), new ResourceLocation("textures/blocks/concrete_yellow.png"));
-            builder1.put(new ResourceLocation("textures/block/crafting_table_front.png"), new ResourceLocation("textures/blocks/crafting_table_front.png"));
-            builder1.put(new ResourceLocation("textures/block/crafting_table_side.png"), new ResourceLocation("textures/blocks/crafting_table_side.png"));
-            builder1.put(new ResourceLocation("textures/block/crafting_table_top.png"), new ResourceLocation("textures/blocks/crafting_table_top.png"));
-            builder1.put(new ResourceLocation("textures/block/daylight_detector_inverted_top.png"), new ResourceLocation("textures/blocks/daylight_detector_inverted_top.png"));
-            builder1.put(new ResourceLocation("textures/block/daylight_detector_side.png"), new ResourceLocation("textures/blocks/daylight_detector_side.png"));
-            builder1.put(new ResourceLocation("textures/block/daylight_detector_top.png"), new ResourceLocation("textures/blocks/daylight_detector_top.png"));
-            builder1.put(new ResourceLocation("textures/block/dead_bush.png"), new ResourceLocation("textures/blocks/deadbush.png"));
-            builder1.put(new ResourceLocation("textures/block/debug.png"), new ResourceLocation("textures/blocks/debug.png"));
-            builder1.put(new ResourceLocation("textures/block/debug2.png"), new ResourceLocation("textures/blocks/debug2.png"));
-            builder1.put(new ResourceLocation("textures/block/destroy_stage_0.png"), new ResourceLocation("textures/blocks/destroy_stage_0.png"));
-            builder1.put(new ResourceLocation("textures/block/destroy_stage_1.png"), new ResourceLocation("textures/blocks/destroy_stage_1.png"));
-            builder1.put(new ResourceLocation("textures/block/destroy_stage_2.png"), new ResourceLocation("textures/blocks/destroy_stage_2.png"));
-            builder1.put(new ResourceLocation("textures/block/destroy_stage_3.png"), new ResourceLocation("textures/blocks/destroy_stage_3.png"));
-            builder1.put(new ResourceLocation("textures/block/destroy_stage_4.png"), new ResourceLocation("textures/blocks/destroy_stage_4.png"));
-            builder1.put(new ResourceLocation("textures/block/destroy_stage_5.png"), new ResourceLocation("textures/blocks/destroy_stage_5.png"));
-            builder1.put(new ResourceLocation("textures/block/destroy_stage_6.png"), new ResourceLocation("textures/blocks/destroy_stage_6.png"));
-            builder1.put(new ResourceLocation("textures/block/destroy_stage_7.png"), new ResourceLocation("textures/blocks/destroy_stage_7.png"));
-            builder1.put(new ResourceLocation("textures/block/destroy_stage_8.png"), new ResourceLocation("textures/blocks/destroy_stage_8.png"));
-            builder1.put(new ResourceLocation("textures/block/destroy_stage_9.png"), new ResourceLocation("textures/blocks/destroy_stage_9.png"));
-            builder1.put(new ResourceLocation("textures/block/diamond_block.png"), new ResourceLocation("textures/blocks/diamond_block.png"));
-            builder1.put(new ResourceLocation("textures/block/diamond_ore.png"), new ResourceLocation("textures/blocks/diamond_ore.png"));
-            builder1.put(new ResourceLocation("textures/block/dirt.png"), new ResourceLocation("textures/blocks/dirt.png"));
-            builder1.put(new ResourceLocation("textures/block/podzol_side.png"), new ResourceLocation("textures/blocks/dirt_podzol_side.png"));
-            builder1.put(new ResourceLocation("textures/block/podzol_top.png"), new ResourceLocation("textures/blocks/dirt_podzol_top.png"));
-            builder1.put(new ResourceLocation("textures/block/dispenser_front.png"), new ResourceLocation("textures/blocks/dispenser_front_horizontal.png"));
-            builder1.put(new ResourceLocation("textures/block/dispenser_front_vertical.png"), new ResourceLocation("textures/blocks/dispenser_front_vertical.png"));
-            builder1.put(new ResourceLocation("textures/block/acacia_door_bottom.png"), new ResourceLocation("textures/blocks/door_acacia_lower.png"));
-            builder1.put(new ResourceLocation("textures/block/acacia_door_top.png"), new ResourceLocation("textures/blocks/door_acacia_upper.png"));
-            builder1.put(new ResourceLocation("textures/block/birch_door_bottom.png"), new ResourceLocation("textures/blocks/door_birch_lower.png"));
-            builder1.put(new ResourceLocation("textures/block/birch_door_top.png"), new ResourceLocation("textures/blocks/door_birch_upper.png"));
-            builder1.put(new ResourceLocation("textures/block/dark_oak_door_bottom.png"), new ResourceLocation("textures/blocks/door_dark_oak_lower.png"));
-            builder1.put(new ResourceLocation("textures/block/dark_oak_door_top.png"), new ResourceLocation("textures/blocks/door_dark_oak_upper.png"));
-            builder1.put(new ResourceLocation("textures/block/iron_door_bottom.png"), new ResourceLocation("textures/blocks/door_iron_lower.png"));
-            builder1.put(new ResourceLocation("textures/block/iron_door_top.png"), new ResourceLocation("textures/blocks/door_iron_upper.png"));
-            builder1.put(new ResourceLocation("textures/block/jungle_door_bottom.png"), new ResourceLocation("textures/blocks/door_jungle_lower.png"));
-            builder1.put(new ResourceLocation("textures/block/jungle_door_top.png"), new ResourceLocation("textures/blocks/door_jungle_upper.png"));
-            builder1.put(new ResourceLocation("textures/block/spruce_door_bottom.png"), new ResourceLocation("textures/blocks/door_spruce_lower.png"));
-            builder1.put(new ResourceLocation("textures/block/spruce_door_top.png"), new ResourceLocation("textures/blocks/door_spruce_upper.png"));
-            builder1.put(new ResourceLocation("textures/block/oak_door_bottom.png"), new ResourceLocation("textures/blocks/door_wood_lower.png"));
-            builder1.put(new ResourceLocation("textures/block/oak_door_top.png"), new ResourceLocation("textures/blocks/door_wood_upper.png"));
-            builder1.put(new ResourceLocation("textures/block/large_fern_bottom.png"), new ResourceLocation("textures/blocks/double_plant_fern_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/large_fern_top.png"), new ResourceLocation("textures/blocks/double_plant_fern_top.png"));
-            builder1.put(new ResourceLocation("textures/block/tall_grass_bottom.png"), new ResourceLocation("textures/blocks/double_plant_grass_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/tall_grass_top.png"), new ResourceLocation("textures/blocks/double_plant_grass_top.png"));
-            builder1.put(new ResourceLocation("textures/block/peony_bottom.png"), new ResourceLocation("textures/blocks/double_plant_paeonia_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/peony_top.png"), new ResourceLocation("textures/blocks/double_plant_paeonia_top.png"));
-            builder1.put(new ResourceLocation("textures/block/rose_bush_bottom.png"), new ResourceLocation("textures/blocks/double_plant_rose_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/rose_bush_top.png"), new ResourceLocation("textures/blocks/double_plant_rose_top.png"));
-            builder1.put(new ResourceLocation("textures/block/sunflower_back.png"), new ResourceLocation("textures/blocks/double_plant_sunflower_back.png"));
-            builder1.put(new ResourceLocation("textures/block/sunflower_bottom.png"), new ResourceLocation("textures/blocks/double_plant_sunflower_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/sunflower_front.png"), new ResourceLocation("textures/blocks/double_plant_sunflower_front.png"));
-            builder1.put(new ResourceLocation("textures/block/sunflower_top.png"), new ResourceLocation("textures/blocks/double_plant_sunflower_top.png"));
-            builder1.put(new ResourceLocation("textures/block/lilac_bottom.png"), new ResourceLocation("textures/blocks/double_plant_syringa_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/lilac_top.png"), new ResourceLocation("textures/blocks/double_plant_syringa_top.png"));
-            builder1.put(new ResourceLocation("textures/block/dragon_egg.png"), new ResourceLocation("textures/blocks/dragon_egg.png"));
-            builder1.put(new ResourceLocation("textures/block/dropper_front.png"), new ResourceLocation("textures/blocks/dropper_front_horizontal.png"));
-            builder1.put(new ResourceLocation("textures/block/dropper_front_vertical.png"), new ResourceLocation("textures/blocks/dropper_front_vertical.png"));
-            builder1.put(new ResourceLocation("textures/block/emerald_block.png"), new ResourceLocation("textures/blocks/emerald_block.png"));
-            builder1.put(new ResourceLocation("textures/block/emerald_ore.png"), new ResourceLocation("textures/blocks/emerald_ore.png"));
-            builder1.put(new ResourceLocation("textures/block/enchanting_table_bottom.png"), new ResourceLocation("textures/blocks/enchanting_table_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/enchanting_table_side.png"), new ResourceLocation("textures/blocks/enchanting_table_side.png"));
-            builder1.put(new ResourceLocation("textures/block/enchanting_table_top.png"), new ResourceLocation("textures/blocks/enchanting_table_top.png"));
-            builder1.put(new ResourceLocation("textures/block/end_stone_bricks.png"), new ResourceLocation("textures/blocks/end_bricks.png"));
-            builder1.put(new ResourceLocation("textures/block/end_rod.png"), new ResourceLocation("textures/blocks/end_rod.png"));
-            builder1.put(new ResourceLocation("textures/block/end_stone.png"), new ResourceLocation("textures/blocks/end_stone.png"));
-            builder1.put(new ResourceLocation("textures/block/end_portal_frame_eye.png"), new ResourceLocation("textures/blocks/endframe_eye.png"));
-            builder1.put(new ResourceLocation("textures/block/end_portal_frame_side.png"), new ResourceLocation("textures/blocks/endframe_side.png"));
-            builder1.put(new ResourceLocation("textures/block/end_portal_frame_top.png"), new ResourceLocation("textures/blocks/endframe_top.png"));
-            builder1.put(new ResourceLocation("textures/block/farmland.png"), new ResourceLocation("textures/blocks/farmland_dry.png"));
-            builder1.put(new ResourceLocation("textures/block/farmland_moist.png"), new ResourceLocation("textures/blocks/farmland_wet.png"));
-            builder1.put(new ResourceLocation("textures/block/fern.png"), new ResourceLocation("textures/blocks/fern.png"));
-            builder1.put(new ResourceLocation("textures/block/fire_0.png"), new ResourceLocation("textures/blocks/fire_layer_0.png"));
-            builder1.put(new ResourceLocation("textures/block/fire_1.png"), new ResourceLocation("textures/blocks/fire_layer_1.png"));
-            builder1.put(new ResourceLocation("textures/block/allium.png"), new ResourceLocation("textures/blocks/flower_allium.png"));
-            builder1.put(new ResourceLocation("textures/block/blue_orchid.png"), new ResourceLocation("textures/blocks/flower_blue_orchid.png"));
-            builder1.put(new ResourceLocation("textures/block/dandelion.png"), new ResourceLocation("textures/blocks/flower_dandelion.png"));
-            builder1.put(new ResourceLocation("textures/block/azure_bluet.png"), new ResourceLocation("textures/blocks/flower_houstonia.png"));
-            builder1.put(new ResourceLocation("textures/block/oxeye_daisy.png"), new ResourceLocation("textures/blocks/flower_oxeye_daisy.png"));
-            builder1.put(new ResourceLocation("textures/block/flower_pot.png"), new ResourceLocation("textures/blocks/flower_pot.png"));
-            builder1.put(new ResourceLocation("textures/block/poppy.png"), new ResourceLocation("textures/blocks/flower_rose.png"));
-            builder1.put(new ResourceLocation("textures/block/orange_tulip.png"), new ResourceLocation("textures/blocks/flower_tulip_orange.png"));
-            builder1.put(new ResourceLocation("textures/block/pink_tulip.png"), new ResourceLocation("textures/blocks/flower_tulip_pink.png"));
-            builder1.put(new ResourceLocation("textures/block/red_tulip.png"), new ResourceLocation("textures/blocks/flower_tulip_red.png"));
-            builder1.put(new ResourceLocation("textures/block/white_tulip.png"), new ResourceLocation("textures/blocks/flower_tulip_white.png"));
-            builder1.put(new ResourceLocation("textures/block/frosted_ice_0.png"), new ResourceLocation("textures/blocks/frosted_ice_0.png"));
-            builder1.put(new ResourceLocation("textures/block/frosted_ice_1.png"), new ResourceLocation("textures/blocks/frosted_ice_1.png"));
-            builder1.put(new ResourceLocation("textures/block/frosted_ice_2.png"), new ResourceLocation("textures/blocks/frosted_ice_2.png"));
-            builder1.put(new ResourceLocation("textures/block/frosted_ice_3.png"), new ResourceLocation("textures/blocks/frosted_ice_3.png"));
-            builder1.put(new ResourceLocation("textures/block/furnace_front.png"), new ResourceLocation("textures/blocks/furnace_front_off.png"));
-            builder1.put(new ResourceLocation("textures/block/furnace_front_on.png"), new ResourceLocation("textures/blocks/furnace_front_on.png"));
-            builder1.put(new ResourceLocation("textures/block/furnace_side.png"), new ResourceLocation("textures/blocks/furnace_side.png"));
-            builder1.put(new ResourceLocation("textures/block/furnace_top.png"), new ResourceLocation("textures/blocks/furnace_top.png"));
-            builder1.put(new ResourceLocation("textures/block/glass.png"), new ResourceLocation("textures/blocks/glass.png"));
-            builder1.put(new ResourceLocation("textures/block/black_stained_glass.png"), new ResourceLocation("textures/blocks/glass_black.png"));
-            builder1.put(new ResourceLocation("textures/block/blue_stained_glass.png"), new ResourceLocation("textures/blocks/glass_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/brown_stained_glass.png"), new ResourceLocation("textures/blocks/glass_brown.png"));
-            builder1.put(new ResourceLocation("textures/block/cyan_stained_glass.png"), new ResourceLocation("textures/blocks/glass_cyan.png"));
-            builder1.put(new ResourceLocation("textures/block/gray_stained_glass.png"), new ResourceLocation("textures/blocks/glass_gray.png"));
-            builder1.put(new ResourceLocation("textures/block/green_stained_glass.png"), new ResourceLocation("textures/blocks/glass_green.png"));
-            builder1.put(new ResourceLocation("textures/block/light_blue_stained_glass.png"), new ResourceLocation("textures/blocks/glass_light_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/lime_stained_glass.png"), new ResourceLocation("textures/blocks/glass_lime.png"));
-            builder1.put(new ResourceLocation("textures/block/magenta_stained_glass.png"), new ResourceLocation("textures/blocks/glass_magenta.png"));
-            builder1.put(new ResourceLocation("textures/block/orange_stained_glass.png"), new ResourceLocation("textures/blocks/glass_orange.png"));
-            builder1.put(new ResourceLocation("textures/block/glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top.png"));
-            builder1.put(new ResourceLocation("textures/block/black_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_black.png"));
-            builder1.put(new ResourceLocation("textures/block/blue_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/brown_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_brown.png"));
-            builder1.put(new ResourceLocation("textures/block/cyan_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_cyan.png"));
-            builder1.put(new ResourceLocation("textures/block/gray_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_gray.png"));
-            builder1.put(new ResourceLocation("textures/block/green_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_green.png"));
-            builder1.put(new ResourceLocation("textures/block/light_blue_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_light_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/lime_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_lime.png"));
-            builder1.put(new ResourceLocation("textures/block/magenta_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_magenta.png"));
-            builder1.put(new ResourceLocation("textures/block/orange_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_orange.png"));
-            builder1.put(new ResourceLocation("textures/block/pink_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_pink.png"));
-            builder1.put(new ResourceLocation("textures/block/purple_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_purple.png"));
-            builder1.put(new ResourceLocation("textures/block/red_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_red.png"));
-            builder1.put(new ResourceLocation("textures/block/light_gray_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_silver.png"));
-            builder1.put(new ResourceLocation("textures/block/white_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_white.png"));
-            builder1.put(new ResourceLocation("textures/block/yellow_stained_glass_pane_top.png"), new ResourceLocation("textures/blocks/glass_pane_top_yellow.png"));
-            builder1.put(new ResourceLocation("textures/block/pink_stained_glass.png"), new ResourceLocation("textures/blocks/glass_pink.png"));
-            builder1.put(new ResourceLocation("textures/block/purple_stained_glass.png"), new ResourceLocation("textures/blocks/glass_purple.png"));
-            builder1.put(new ResourceLocation("textures/block/red_stained_glass.png"), new ResourceLocation("textures/blocks/glass_red.png"));
-            builder1.put(new ResourceLocation("textures/block/light_gray_stained_glass.png"), new ResourceLocation("textures/blocks/glass_silver.png"));
-            builder1.put(new ResourceLocation("textures/block/white_stained_glass.png"), new ResourceLocation("textures/blocks/glass_white.png"));
-            builder1.put(new ResourceLocation("textures/block/yellow_stained_glass.png"), new ResourceLocation("textures/blocks/glass_yellow.png"));
-            builder1.put(new ResourceLocation("textures/block/black_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_black.png"));
-            builder1.put(new ResourceLocation("textures/block/blue_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/brown_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_brown.png"));
-            builder1.put(new ResourceLocation("textures/block/cyan_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_cyan.png"));
-            builder1.put(new ResourceLocation("textures/block/gray_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_gray.png"));
-            builder1.put(new ResourceLocation("textures/block/green_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_green.png"));
-            builder1.put(new ResourceLocation("textures/block/light_blue_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_light_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/lime_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_lime.png"));
-            builder1.put(new ResourceLocation("textures/block/magenta_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_magenta.png"));
-            builder1.put(new ResourceLocation("textures/block/orange_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_orange.png"));
-            builder1.put(new ResourceLocation("textures/block/pink_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_pink.png"));
-            builder1.put(new ResourceLocation("textures/block/purple_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_purple.png"));
-            builder1.put(new ResourceLocation("textures/block/red_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_red.png"));
-            builder1.put(new ResourceLocation("textures/block/light_gray_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_silver.png"));
-            builder1.put(new ResourceLocation("textures/block/white_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_white.png"));
-            builder1.put(new ResourceLocation("textures/block/yellow_glazed_terracotta.png"), new ResourceLocation("textures/blocks/glazed_terracotta_yellow.png"));
-            builder1.put(new ResourceLocation("textures/block/glowstone.png"), new ResourceLocation("textures/blocks/glowstone.png"));
-            builder1.put(new ResourceLocation("textures/block/gold_block.png"), new ResourceLocation("textures/blocks/gold_block.png"));
-            builder1.put(new ResourceLocation("textures/block/gold_ore.png"), new ResourceLocation("textures/blocks/gold_ore.png"));
-            builder1.put(new ResourceLocation("textures/block/grass_path_side.png"), new ResourceLocation("textures/blocks/grass_path_side.png"));
-            builder1.put(new ResourceLocation("textures/block/grass_path_top.png"), new ResourceLocation("textures/blocks/grass_path_top.png"));
-            builder1.put(new ResourceLocation("textures/block/grass_block_side.png"), new ResourceLocation("textures/blocks/grass_side.png"));
-            builder1.put(new ResourceLocation("textures/block/grass_block_side_overlay.png"), new ResourceLocation("textures/blocks/grass_side_overlay.png"));
-            builder1.put(new ResourceLocation("textures/block/grass_block_snow.png"), new ResourceLocation("textures/blocks/grass_side_snowed.png"));
-            builder1.put(new ResourceLocation("textures/block/grass_block_top.png"), new ResourceLocation("textures/blocks/grass_top.png"));
-            builder1.put(new ResourceLocation("textures/block/gravel.png"), new ResourceLocation("textures/blocks/gravel.png"));
-            builder1.put(new ResourceLocation("textures/block/terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay.png"));
-            builder1.put(new ResourceLocation("textures/block/black_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_black.png"));
-            builder1.put(new ResourceLocation("textures/block/blue_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/brown_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_brown.png"));
-            builder1.put(new ResourceLocation("textures/block/cyan_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_cyan.png"));
-            builder1.put(new ResourceLocation("textures/block/gray_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_gray.png"));
-            builder1.put(new ResourceLocation("textures/block/green_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_green.png"));
-            builder1.put(new ResourceLocation("textures/block/light_blue_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_light_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/lime_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_lime.png"));
-            builder1.put(new ResourceLocation("textures/block/magenta_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_magenta.png"));
-            builder1.put(new ResourceLocation("textures/block/orange_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_orange.png"));
-            builder1.put(new ResourceLocation("textures/block/pink_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_pink.png"));
-            builder1.put(new ResourceLocation("textures/block/purple_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_purple.png"));
-            builder1.put(new ResourceLocation("textures/block/red_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_red.png"));
-            builder1.put(new ResourceLocation("textures/block/light_gray_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_silver.png"));
-            builder1.put(new ResourceLocation("textures/block/white_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_white.png"));
-            builder1.put(new ResourceLocation("textures/block/yellow_terracotta.png"), new ResourceLocation("textures/blocks/hardened_clay_stained_yellow.png"));
-            builder1.put(new ResourceLocation("textures/block/hay_block_side.png"), new ResourceLocation("textures/blocks/hay_block_side.png"));
-            builder1.put(new ResourceLocation("textures/block/hay_block_top.png"), new ResourceLocation("textures/blocks/hay_block_top.png"));
-            builder1.put(new ResourceLocation("textures/block/hopper_inside.png"), new ResourceLocation("textures/blocks/hopper_inside.png"));
-            builder1.put(new ResourceLocation("textures/block/hopper_outside.png"), new ResourceLocation("textures/blocks/hopper_outside.png"));
-            builder1.put(new ResourceLocation("textures/block/hopper_top.png"), new ResourceLocation("textures/blocks/hopper_top.png"));
-            builder1.put(new ResourceLocation("textures/block/ice.png"), new ResourceLocation("textures/blocks/ice.png"));
-            builder1.put(new ResourceLocation("textures/block/packed_ice.png"), new ResourceLocation("textures/blocks/ice_packed.png"));
-            builder1.put(new ResourceLocation("textures/block/iron_bars.png"), new ResourceLocation("textures/blocks/iron_bars.png"));
-            builder1.put(new ResourceLocation("textures/block/iron_block.png"), new ResourceLocation("textures/blocks/iron_block.png"));
-            builder1.put(new ResourceLocation("textures/block/iron_ore.png"), new ResourceLocation("textures/blocks/iron_ore.png"));
-            builder1.put(new ResourceLocation("textures/block/iron_trapdoor.png"), new ResourceLocation("textures/blocks/iron_trapdoor.png"));
-            builder1.put(new ResourceLocation("textures/block/item_frame.png"), new ResourceLocation("textures/blocks/itemframe_background.png"));
-            builder1.put(new ResourceLocation("textures/block/jukebox_side.png"), new ResourceLocation("textures/blocks/jukebox_side.png"));
-            builder1.put(new ResourceLocation("textures/block/jukebox_top.png"), new ResourceLocation("textures/blocks/jukebox_top.png"));
-            builder1.put(new ResourceLocation("textures/block/ladder.png"), new ResourceLocation("textures/blocks/ladder.png"));
-            builder1.put(new ResourceLocation("textures/block/lapis_block.png"), new ResourceLocation("textures/blocks/lapis_block.png"));
-            builder1.put(new ResourceLocation("textures/block/lapis_ore.png"), new ResourceLocation("textures/blocks/lapis_ore.png"));
-            builder1.put(new ResourceLocation("textures/block/lava_flow.png"), new ResourceLocation("textures/blocks/lava_flow.png"));
-            builder1.put(new ResourceLocation("textures/block/lava_still.png"), new ResourceLocation("textures/blocks/lava_still.png"));
-            builder1.put(new ResourceLocation("textures/block/acacia_leaves.png"), new ResourceLocation("textures/blocks/leaves_acacia.png"));
-            builder1.put(new ResourceLocation("textures/block/dark_oak_leaves.png"), new ResourceLocation("textures/blocks/leaves_big_oak.png"));
-            builder1.put(new ResourceLocation("textures/block/birch_leaves.png"), new ResourceLocation("textures/blocks/leaves_birch.png"));
-            builder1.put(new ResourceLocation("textures/block/jungle_leaves.png"), new ResourceLocation("textures/blocks/leaves_jungle.png"));
-            builder1.put(new ResourceLocation("textures/block/oak_leaves.png"), new ResourceLocation("textures/blocks/leaves_oak.png"));
-            builder1.put(new ResourceLocation("textures/block/spruce_leaves.png"), new ResourceLocation("textures/blocks/leaves_spruce.png"));
-            builder1.put(new ResourceLocation("textures/block/lever.png"), new ResourceLocation("textures/blocks/lever.png"));
-            builder1.put(new ResourceLocation("textures/block/acacia_log.png"), new ResourceLocation("textures/blocks/log_acacia.png"));
-            builder1.put(new ResourceLocation("textures/block/acacia_log_top.png"), new ResourceLocation("textures/blocks/log_acacia_top.png"));
-            builder1.put(new ResourceLocation("textures/block/dark_oak_log.png"), new ResourceLocation("textures/blocks/log_big_oak.png"));
-            builder1.put(new ResourceLocation("textures/block/dark_oak_log_top.png"), new ResourceLocation("textures/blocks/log_big_oak_top.png"));
-            builder1.put(new ResourceLocation("textures/block/birch_log.png"), new ResourceLocation("textures/blocks/log_birch.png"));
-            builder1.put(new ResourceLocation("textures/block/birch_log_top.png"), new ResourceLocation("textures/blocks/log_birch_top.png"));
-            builder1.put(new ResourceLocation("textures/block/jungle_log.png"), new ResourceLocation("textures/blocks/log_jungle.png"));
-            builder1.put(new ResourceLocation("textures/block/jungle_log_top.png"), new ResourceLocation("textures/blocks/log_jungle_top.png"));
-            builder1.put(new ResourceLocation("textures/block/oak_log.png"), new ResourceLocation("textures/blocks/log_oak.png"));
-            builder1.put(new ResourceLocation("textures/block/oak_log_top.png"), new ResourceLocation("textures/blocks/log_oak_top.png"));
-            builder1.put(new ResourceLocation("textures/block/spruce_log.png"), new ResourceLocation("textures/blocks/log_spruce.png"));
-            builder1.put(new ResourceLocation("textures/block/spruce_log_top.png"), new ResourceLocation("textures/blocks/log_spruce_top.png"));
-            builder1.put(new ResourceLocation("textures/block/magma.png"), new ResourceLocation("textures/blocks/magma.png"));
-            builder1.put(new ResourceLocation("textures/block/melon_side.png"), new ResourceLocation("textures/blocks/melon_side.png"));
-            builder1.put(new ResourceLocation("textures/block/attached_melon_stem.png"), new ResourceLocation("textures/blocks/melon_stem_connected.png"));
-            builder1.put(new ResourceLocation("textures/blocks/pumpkin_stem_disconnected.png"), new ResourceLocation("textures/blocks/melon_stem_disconnected.png"));
-            builder1.put(new ResourceLocation("textures/block/melon_top.png"), new ResourceLocation("textures/blocks/melon_top.png"));
-            builder1.put(new ResourceLocation("textures/block/spawner.png"), new ResourceLocation("textures/blocks/mob_spawner.png"));
-            builder1.put(new ResourceLocation("textures/block/mushroom_block_inside.png"), new ResourceLocation("textures/blocks/mushroom_block_inside.png"));
-            builder1.put(new ResourceLocation("textures/block/brown_mushroom_block.png"), new ResourceLocation("textures/blocks/mushroom_block_skin_brown.png"));
-            builder1.put(new ResourceLocation("textures/block/red_mushroom_block.png"), new ResourceLocation("textures/blocks/mushroom_block_skin_red.png"));
-            builder1.put(new ResourceLocation("textures/block/mushroom_stem.png"), new ResourceLocation("textures/blocks/mushroom_block_skin_stem.png"));
-            builder1.put(new ResourceLocation("textures/block/brown_mushroom.png"), new ResourceLocation("textures/blocks/mushroom_brown.png"));
-            builder1.put(new ResourceLocation("textures/block/red_mushroom.png"), new ResourceLocation("textures/blocks/mushroom_red.png"));
-            builder1.put(new ResourceLocation("textures/block/mycelium_side.png"), new ResourceLocation("textures/blocks/mycelium_side.png"));
-            builder1.put(new ResourceLocation("textures/block/mycelium_top.png"), new ResourceLocation("textures/blocks/mycelium_top.png"));
-            builder1.put(new ResourceLocation("textures/block/nether_bricks.png"), new ResourceLocation("textures/blocks/nether_brick.png"));
-            builder1.put(new ResourceLocation("textures/block/nether_wart_block.png"), new ResourceLocation("textures/blocks/nether_wart_block.png"));
-            builder1.put(new ResourceLocation("textures/block/nether_wart_stage0.png"), new ResourceLocation("textures/blocks/nether_wart_stage_0.png"));
-            builder1.put(new ResourceLocation("textures/block/nether_wart_stage1.png"), new ResourceLocation("textures/blocks/nether_wart_stage_1.png"));
-            builder1.put(new ResourceLocation("textures/block/nether_wart_stage2.png"), new ResourceLocation("textures/blocks/nether_wart_stage_2.png"));
-            builder1.put(new ResourceLocation("textures/block/netherrack.png"), new ResourceLocation("textures/blocks/netherrack.png"));
-            builder1.put(new ResourceLocation("textures/block/note_block.png"), new ResourceLocation("textures/blocks/noteblock.png"));
-            builder1.put(new ResourceLocation("textures/block/observer_back.png"), new ResourceLocation("textures/blocks/observer_back.png"));
-            builder1.put(new ResourceLocation("textures/block/observer_back_on.png"), new ResourceLocation("textures/blocks/observer_back_lit.png"));
-            builder1.put(new ResourceLocation("textures/block/observer_front.png"), new ResourceLocation("textures/blocks/observer_front.png"));
-            builder1.put(new ResourceLocation("textures/block/observer_side.png"), new ResourceLocation("textures/blocks/observer_side.png"));
-            builder1.put(new ResourceLocation("textures/block/observer_top.png"), new ResourceLocation("textures/blocks/observer_top.png"));
-            builder1.put(new ResourceLocation("textures/block/obsidian.png"), new ResourceLocation("textures/blocks/obsidian.png"));
-            builder1.put(new ResourceLocation("textures/block/piston_bottom.png"), new ResourceLocation("textures/blocks/piston_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/piston_inner.png"), new ResourceLocation("textures/blocks/piston_inner.png"));
-            builder1.put(new ResourceLocation("textures/block/piston_side.png"), new ResourceLocation("textures/blocks/piston_side.png"));
-            builder1.put(new ResourceLocation("textures/block/piston_top.png"), new ResourceLocation("textures/blocks/piston_top_normal.png"));
-            builder1.put(new ResourceLocation("textures/block/piston_top_sticky.png"), new ResourceLocation("textures/blocks/piston_top_sticky.png"));
-            builder1.put(new ResourceLocation("textures/block/acacia_planks.png"), new ResourceLocation("textures/blocks/planks_acacia.png"));
-            builder1.put(new ResourceLocation("textures/block/dark_oak_planks.png"), new ResourceLocation("textures/blocks/planks_big_oak.png"));
-            builder1.put(new ResourceLocation("textures/block/birch_planks.png"), new ResourceLocation("textures/blocks/planks_birch.png"));
-            builder1.put(new ResourceLocation("textures/block/jungle_planks.png"), new ResourceLocation("textures/blocks/planks_jungle.png"));
-            builder1.put(new ResourceLocation("textures/block/oak_planks.png"), new ResourceLocation("textures/blocks/planks_oak.png"));
-            builder1.put(new ResourceLocation("textures/block/spruce_planks.png"), new ResourceLocation("textures/blocks/planks_spruce.png"));
-            builder1.put(new ResourceLocation("textures/block/nether_portal.png"), new ResourceLocation("textures/blocks/portal.png"));
-            builder1.put(new ResourceLocation("textures/block/potatoes_stage0.png"), new ResourceLocation("textures/blocks/potatoes_stage_0.png"));
-            builder1.put(new ResourceLocation("textures/block/potatoes_stage1.png"), new ResourceLocation("textures/blocks/potatoes_stage_1.png"));
-            builder1.put(new ResourceLocation("textures/block/potatoes_stage2.png"), new ResourceLocation("textures/blocks/potatoes_stage_2.png"));
-            builder1.put(new ResourceLocation("textures/block/potatoes_stage3.png"), new ResourceLocation("textures/blocks/potatoes_stage_3.png"));
-            builder1.put(new ResourceLocation("textures/block/prismarine_bricks.png"), new ResourceLocation("textures/blocks/prismarine_bricks.png"));
-            builder1.put(new ResourceLocation("textures/block/dark_prismarine.png"), new ResourceLocation("textures/blocks/prismarine_dark.png"));
-            builder1.put(new ResourceLocation("textures/block/prismarine.png"), new ResourceLocation("textures/blocks/prismarine_rough.png"));
-            builder1.put(new ResourceLocation("textures/block/carved_pumpkin.png"), new ResourceLocation("textures/blocks/pumpkin_face_off.png"));
-            builder1.put(new ResourceLocation("textures/block/jack_o_lantern.png"), new ResourceLocation("textures/blocks/pumpkin_face_on.png"));
-            builder1.put(new ResourceLocation("textures/block/pumpkin_side.png"), new ResourceLocation("textures/blocks/pumpkin_side.png"));
-            builder1.put(new ResourceLocation("textures/block/attached_pumpkin_stem.png"), new ResourceLocation("textures/blocks/pumpkin_stem_connected.png"));
-            builder1.put(new ResourceLocation("textures/block/pumpkin_top.png"), new ResourceLocation("textures/blocks/pumpkin_top.png"));
-            builder1.put(new ResourceLocation("textures/block/purpur_block.png"), new ResourceLocation("textures/blocks/purpur_block.png"));
-            builder1.put(new ResourceLocation("textures/block/purpur_pillar.png"), new ResourceLocation("textures/blocks/purpur_pillar.png"));
-            builder1.put(new ResourceLocation("textures/block/purpur_pillar_top.png"), new ResourceLocation("textures/blocks/purpur_pillar_top.png"));
-            builder1.put(new ResourceLocation("textures/block/quartz_block_bottom.png"), new ResourceLocation("textures/blocks/quartz_block_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/chiseled_quartz_block.png"), new ResourceLocation("textures/blocks/quartz_block_chiseled.png"));
-            builder1.put(new ResourceLocation("textures/block/chiseled_quartz_block_top.png"), new ResourceLocation("textures/blocks/quartz_block_chiseled_top.png"));
-            builder1.put(new ResourceLocation("textures/block/quartz_pillar.png"), new ResourceLocation("textures/blocks/quartz_block_lines.png"));
-            builder1.put(new ResourceLocation("textures/block/quartz_pillar_top.png"), new ResourceLocation("textures/blocks/quartz_block_lines_top.png"));
-            builder1.put(new ResourceLocation("textures/block/quartz_block_side.png"), new ResourceLocation("textures/blocks/quartz_block_side.png"));
-            builder1.put(new ResourceLocation("textures/block/quartz_block_top.png"), new ResourceLocation("textures/blocks/quartz_block_top.png"));
-            builder1.put(new ResourceLocation("textures/block/nether_quartz_ore.png"), new ResourceLocation("textures/blocks/quartz_ore.png"));
-            builder1.put(new ResourceLocation("textures/block/activator_rail.png"), new ResourceLocation("textures/blocks/rail_activator.png"));
-            builder1.put(new ResourceLocation("textures/block/activator_rail_on.png"), new ResourceLocation("textures/blocks/rail_activator_powered.png"));
-            builder1.put(new ResourceLocation("textures/block/detector_rail.png"), new ResourceLocation("textures/blocks/rail_detector.png"));
-            builder1.put(new ResourceLocation("textures/block/detector_rail_on.png"), new ResourceLocation("textures/blocks/rail_detector_powered.png"));
-            builder1.put(new ResourceLocation("textures/block/powered_rail.png"), new ResourceLocation("textures/blocks/rail_golden.png"));
-            builder1.put(new ResourceLocation("textures/block/powered_rail_on.png"), new ResourceLocation("textures/blocks/rail_golden_powered.png"));
-            builder1.put(new ResourceLocation("textures/block/rail.png"), new ResourceLocation("textures/blocks/rail_normal.png"));
-            builder1.put(new ResourceLocation("textures/block/rail_corner.png"), new ResourceLocation("textures/blocks/rail_normal_turned.png"));
-            builder1.put(new ResourceLocation("textures/block/red_nether_bricks.png"), new ResourceLocation("textures/blocks/red_nether_brick.png"));
-            builder1.put(new ResourceLocation("textures/block/red_sand.png"), new ResourceLocation("textures/blocks/red_sand.png"));
-            builder1.put(new ResourceLocation("textures/block/red_sandstone_bottom.png"), new ResourceLocation("textures/blocks/red_sandstone_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/chiseled_red_sandstone.png"), new ResourceLocation("textures/blocks/red_sandstone_carved.png"));
-            builder1.put(new ResourceLocation("textures/block/red_sandstone.png"), new ResourceLocation("textures/blocks/red_sandstone_normal.png"));
-            builder1.put(new ResourceLocation("textures/block/cut_red_sandstone.png"), new ResourceLocation("textures/blocks/red_sandstone_smooth.png"));
-            builder1.put(new ResourceLocation("textures/block/red_sandstone_top.png"), new ResourceLocation("textures/blocks/red_sandstone_top.png"));
-            builder1.put(new ResourceLocation("textures/block/redstone_block.png"), new ResourceLocation("textures/blocks/redstone_block.png"));
-            builder1.put(new ResourceLocation("textures/block/redstone_dust_dot.png"), new ResourceLocation("textures/blocks/redstone_dust_dot.png"));
-            builder1.put(new ResourceLocation("textures/block/redstone_dust_line0.png"), new ResourceLocation("textures/blocks/redstone_dust_line0.png"));
-            builder1.put(new ResourceLocation("textures/block/redstone_dust_line1.png"), new ResourceLocation("textures/blocks/redstone_dust_line1.png"));
-            builder1.put(new ResourceLocation("textures/block/redstone_dust_overlay.png"), new ResourceLocation("textures/blocks/redstone_dust_overlay.png"));
-            builder1.put(new ResourceLocation("textures/block/redstone_lamp.png"), new ResourceLocation("textures/blocks/redstone_lamp_off.png"));
-            builder1.put(new ResourceLocation("textures/block/redstone_lamp_on.png"), new ResourceLocation("textures/blocks/redstone_lamp_on.png"));
-            builder1.put(new ResourceLocation("textures/block/redstone_ore.png"), new ResourceLocation("textures/blocks/redstone_ore.png"));
-            builder1.put(new ResourceLocation("textures/block/redstone_torch_off.png"), new ResourceLocation("textures/blocks/redstone_torch_off.png"));
-            builder1.put(new ResourceLocation("textures/block/redstone_torch.png"), new ResourceLocation("textures/blocks/redstone_torch_on.png"));
-            builder1.put(new ResourceLocation("textures/block/sugar_cane.png"), new ResourceLocation("textures/blocks/reeds.png"));
-            builder1.put(new ResourceLocation("textures/block/repeater.png"), new ResourceLocation("textures/blocks/repeater_off.png"));
-            builder1.put(new ResourceLocation("textures/block/repeater_on.png"), new ResourceLocation("textures/blocks/repeater_on.png"));
-            builder1.put(new ResourceLocation("textures/block/repeating_command_block_back.png"), new ResourceLocation("textures/blocks/repeating_command_block_back.png"));
-            builder1.put(new ResourceLocation("textures/block/repeating_command_block_conditional.png"), new ResourceLocation("textures/blocks/repeating_command_block_conditional.png"));
-            builder1.put(new ResourceLocation("textures/block/repeating_command_block_front.png"), new ResourceLocation("textures/blocks/repeating_command_block_front.png"));
-            builder1.put(new ResourceLocation("textures/block/repeating_command_block_side.png"), new ResourceLocation("textures/blocks/repeating_command_block_side.png"));
-            builder1.put(new ResourceLocation("textures/block/sand.png"), new ResourceLocation("textures/blocks/sand.png"));
-            builder1.put(new ResourceLocation("textures/block/sandstone_bottom.png"), new ResourceLocation("textures/blocks/sandstone_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/chiseled_sandstone.png"), new ResourceLocation("textures/blocks/sandstone_carved.png"));
-            builder1.put(new ResourceLocation("textures/block/sandstone.png"), new ResourceLocation("textures/blocks/sandstone_normal.png"));
-            builder1.put(new ResourceLocation("textures/block/cut_sandstone.png"), new ResourceLocation("textures/blocks/sandstone_smooth.png"));
-            builder1.put(new ResourceLocation("textures/block/sandstone_top.png"), new ResourceLocation("textures/blocks/sandstone_top.png"));
-            builder1.put(new ResourceLocation("textures/block/acacia_sapling.png"), new ResourceLocation("textures/blocks/sapling_acacia.png"));
-            builder1.put(new ResourceLocation("textures/block/birch_sapling.png"), new ResourceLocation("textures/blocks/sapling_birch.png"));
-            builder1.put(new ResourceLocation("textures/block/jungle_sapling.png"), new ResourceLocation("textures/blocks/sapling_jungle.png"));
-            builder1.put(new ResourceLocation("textures/block/oak_sapling.png"), new ResourceLocation("textures/blocks/sapling_oak.png"));
-            builder1.put(new ResourceLocation("textures/block/dark_oak_sapling.png"), new ResourceLocation("textures/blocks/sapling_roofed_oak.png"));
-            builder1.put(new ResourceLocation("textures/block/spruce_sapling.png"), new ResourceLocation("textures/blocks/sapling_spruce.png"));
-            builder1.put(new ResourceLocation("textures/block/sea_lantern.png"), new ResourceLocation("textures/blocks/sea_lantern.png"));
-            builder1.put(new ResourceLocation("textures/block/black_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_black.png"));
-            builder1.put(new ResourceLocation("textures/block/blue_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/brown_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_brown.png"));
-            builder1.put(new ResourceLocation("textures/block/cyan_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_cyan.png"));
-            builder1.put(new ResourceLocation("textures/block/gray_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_gray.png"));
-            builder1.put(new ResourceLocation("textures/block/green_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_green.png"));
-            builder1.put(new ResourceLocation("textures/block/light_blue_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_light_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/lime_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_lime.png"));
-            builder1.put(new ResourceLocation("textures/block/magenta_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_magenta.png"));
-            builder1.put(new ResourceLocation("textures/block/orange_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_orange.png"));
-            builder1.put(new ResourceLocation("textures/block/pink_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_pink.png"));
-            builder1.put(new ResourceLocation("textures/block/purple_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_purple.png"));
-            builder1.put(new ResourceLocation("textures/block/red_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_red.png"));
-            builder1.put(new ResourceLocation("textures/block/light_gray_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_silver.png"));
-            builder1.put(new ResourceLocation("textures/block/white_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_white.png"));
-            builder1.put(new ResourceLocation("textures/block/yellow_shulker_box.png"), new ResourceLocation("textures/blocks/shulker_top_yellow.png"));
-            builder1.put(new ResourceLocation("textures/block/slime_block.png"), new ResourceLocation("textures/blocks/slime.png"));
-            builder1.put(new ResourceLocation("textures/block/snow.png"), new ResourceLocation("textures/blocks/snow.png"));
-            builder1.put(new ResourceLocation("textures/block/soul_sand.png"), new ResourceLocation("textures/blocks/soul_sand.png"));
-            builder1.put(new ResourceLocation("textures/block/sponge.png"), new ResourceLocation("textures/blocks/sponge.png"));
-            builder1.put(new ResourceLocation("textures/block/wet_sponge.png"), new ResourceLocation("textures/blocks/sponge_wet.png"));
-            builder1.put(new ResourceLocation("textures/block/stone.png"), new ResourceLocation("textures/blocks/stone.png"));
-            builder1.put(new ResourceLocation("textures/block/andesite.png"), new ResourceLocation("textures/blocks/stone_andesite.png"));
-            builder1.put(new ResourceLocation("textures/block/polished_andesite.png"), new ResourceLocation("textures/blocks/stone_andesite_smooth.png"));
-            builder1.put(new ResourceLocation("textures/block/diorite.png"), new ResourceLocation("textures/blocks/stone_diorite.png"));
-            builder1.put(new ResourceLocation("textures/block/polished_diorite.png"), new ResourceLocation("textures/blocks/stone_diorite_smooth.png"));
-            builder1.put(new ResourceLocation("textures/block/granite.png"), new ResourceLocation("textures/blocks/stone_granite.png"));
-            builder1.put(new ResourceLocation("textures/block/polished_granite.png"), new ResourceLocation("textures/blocks/stone_granite_smooth.png"));
-            builder1.put(new ResourceLocation("textures/block/stone_slab_side.png"), new ResourceLocation("textures/blocks/stone_slab_side.png"));
-            builder1.put(new ResourceLocation("textures/block/stone_slab_top.png"), new ResourceLocation("textures/blocks/stone_slab_top.png"));
-            builder1.put(new ResourceLocation("textures/block/stone_bricks.png"), new ResourceLocation("textures/blocks/stonebrick.png"));
-            builder1.put(new ResourceLocation("textures/block/chiseled_stone_bricks.png"), new ResourceLocation("textures/blocks/stonebrick_carved.png"));
-            builder1.put(new ResourceLocation("textures/block/cracked_stone_bricks.png"), new ResourceLocation("textures/blocks/stonebrick_cracked.png"));
-            builder1.put(new ResourceLocation("textures/block/mossy_stone_bricks.png"), new ResourceLocation("textures/blocks/stonebrick_mossy.png"));
-            builder1.put(new ResourceLocation("textures/block/structure_block.png"), new ResourceLocation("textures/blocks/structure_block.png"));
-            builder1.put(new ResourceLocation("textures/block/structure_block_corner.png"), new ResourceLocation("textures/blocks/structure_block_corner.png"));
-            builder1.put(new ResourceLocation("textures/block/structure_block_data.png"), new ResourceLocation("textures/blocks/structure_block_data.png"));
-            builder1.put(new ResourceLocation("textures/block/structure_block_load.png"), new ResourceLocation("textures/blocks/structure_block_load.png"));
-            builder1.put(new ResourceLocation("textures/block/structure_block_save.png"), new ResourceLocation("textures/blocks/structure_block_save.png"));
-            builder1.put(new ResourceLocation("textures/block/grass.png"), new ResourceLocation("textures/blocks/tallgrass.png"));
-            builder1.put(new ResourceLocation("textures/block/tnt_bottom.png"), new ResourceLocation("textures/blocks/tnt_bottom.png"));
-            builder1.put(new ResourceLocation("textures/block/tnt_side.png"), new ResourceLocation("textures/blocks/tnt_side.png"));
-            builder1.put(new ResourceLocation("textures/block/tnt_top.png"), new ResourceLocation("textures/blocks/tnt_top.png"));
-            builder1.put(new ResourceLocation("textures/block/torch.png"), new ResourceLocation("textures/blocks/torch_on.png"));
-            builder1.put(new ResourceLocation("textures/block/oak_trapdoor.png"), new ResourceLocation("textures/blocks/trapdoor.png"));
-            builder1.put(new ResourceLocation("textures/block/tripwire.png"), new ResourceLocation("textures/blocks/trip_wire.png"));
-            builder1.put(new ResourceLocation("textures/block/tripwire_hook.png"), new ResourceLocation("textures/blocks/trip_wire_source.png"));
-            builder1.put(new ResourceLocation("textures/block/vine.png"), new ResourceLocation("textures/blocks/vine.png"));
-            builder1.put(new ResourceLocation("textures/block/water_flow.png"), new ResourceLocation("textures/blocks/water_flow.png"));
-            builder1.put(new ResourceLocation("textures/block/water_overlay.png"), new ResourceLocation("textures/blocks/water_overlay.png"));
-            builder1.put(new ResourceLocation("textures/block/water_still.png"), new ResourceLocation("textures/blocks/water_still.png"));
-            builder1.put(new ResourceLocation("textures/block/lily_pad.png"), new ResourceLocation("textures/blocks/waterlily.png"));
-            builder1.put(new ResourceLocation("textures/block/cobweb.png"), new ResourceLocation("textures/blocks/web.png"));
-            builder1.put(new ResourceLocation("textures/block/wheat_stage0.png"), new ResourceLocation("textures/blocks/wheat_stage_0.png"));
-            builder1.put(new ResourceLocation("textures/block/wheat_stage1.png"), new ResourceLocation("textures/blocks/wheat_stage_1.png"));
-            builder1.put(new ResourceLocation("textures/block/wheat_stage2.png"), new ResourceLocation("textures/blocks/wheat_stage_2.png"));
-            builder1.put(new ResourceLocation("textures/block/wheat_stage3.png"), new ResourceLocation("textures/blocks/wheat_stage_3.png"));
-            builder1.put(new ResourceLocation("textures/block/wheat_stage4.png"), new ResourceLocation("textures/blocks/wheat_stage_4.png"));
-            builder1.put(new ResourceLocation("textures/block/wheat_stage5.png"), new ResourceLocation("textures/blocks/wheat_stage_5.png"));
-            builder1.put(new ResourceLocation("textures/block/wheat_stage6.png"), new ResourceLocation("textures/blocks/wheat_stage_6.png"));
-            builder1.put(new ResourceLocation("textures/block/wheat_stage7.png"), new ResourceLocation("textures/blocks/wheat_stage_7.png"));
-            builder1.put(new ResourceLocation("textures/block/black_wool.png"), new ResourceLocation("textures/blocks/wool_colored_black.png"));
-            builder1.put(new ResourceLocation("textures/block/blue_wool.png"), new ResourceLocation("textures/blocks/wool_colored_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/brown_wool.png"), new ResourceLocation("textures/blocks/wool_colored_brown.png"));
-            builder1.put(new ResourceLocation("textures/block/cyan_wool.png"), new ResourceLocation("textures/blocks/wool_colored_cyan.png"));
-            builder1.put(new ResourceLocation("textures/block/gray_wool.png"), new ResourceLocation("textures/blocks/wool_colored_gray.png"));
-            builder1.put(new ResourceLocation("textures/block/green_wool.png"), new ResourceLocation("textures/blocks/wool_colored_green.png"));
-            builder1.put(new ResourceLocation("textures/block/light_blue_wool.png"), new ResourceLocation("textures/blocks/wool_colored_light_blue.png"));
-            builder1.put(new ResourceLocation("textures/block/lime_wool.png"), new ResourceLocation("textures/blocks/wool_colored_lime.png"));
-            builder1.put(new ResourceLocation("textures/block/magenta_wool.png"), new ResourceLocation("textures/blocks/wool_colored_magenta.png"));
-            builder1.put(new ResourceLocation("textures/block/orange_wool.png"), new ResourceLocation("textures/blocks/wool_colored_orange.png"));
-            builder1.put(new ResourceLocation("textures/block/pink_wool.png"), new ResourceLocation("textures/blocks/wool_colored_pink.png"));
-            builder1.put(new ResourceLocation("textures/block/purple_wool.png"), new ResourceLocation("textures/blocks/wool_colored_purple.png"));
-            builder1.put(new ResourceLocation("textures/block/red_wool.png"), new ResourceLocation("textures/blocks/wool_colored_red.png"));
-            builder1.put(new ResourceLocation("textures/block/light_gray_wool.png"), new ResourceLocation("textures/blocks/wool_colored_silver.png"));
-            builder1.put(new ResourceLocation("textures/block/white_wool.png"), new ResourceLocation("textures/blocks/wool_colored_white.png"));
-            builder1.put(new ResourceLocation("textures/block/yellow_wool.png"), new ResourceLocation("textures/blocks/wool_colored_yellow.png"));
-            builder1.put(new ResourceLocation("textures/entity/bed/light_gray.png"), new ResourceLocation("textures/entity/bed/silver.png"));
-            builder1.put(new ResourceLocation("textures/entity/boat/acacia.png"), new ResourceLocation("textures/entity/boat/boat_acacia.png"));
-            builder1.put(new ResourceLocation("textures/entity/boat/birch.png"), new ResourceLocation("textures/entity/boat/boat_birch.png"));
-            builder1.put(new ResourceLocation("textures/entity/boat/dark_oak.png"), new ResourceLocation("textures/entity/boat/boat_darkoak.png"));
-            builder1.put(new ResourceLocation("textures/entity/boat/jungle.png"), new ResourceLocation("textures/entity/boat/boat_jungle.png"));
-            builder1.put(new ResourceLocation("textures/entity/boat/oak.png"), new ResourceLocation("textures/entity/boat/boat_oak.png"));
-            builder1.put(new ResourceLocation("textures/entity/boat/spruce.png"), new ResourceLocation("textures/entity/boat/boat_spruce.png"));
-            builder1.put(new ResourceLocation("textures/block/conduit.png"), new ResourceLocation("textures/entity/conduit/break_particle.png"));
-            builder1.put(new ResourceLocation("textures/entity/end_crystal/end_crystal.png"), new ResourceLocation("textures/entity/endercrystal/endercrystal.png"));
-            builder1.put(new ResourceLocation("textures/entity/end_crystal/end_crystal_beam.png"), new ResourceLocation("textures/entity/endercrystal/endercrystal_beam.png"));
-            builder1.put(new ResourceLocation("textures/entity/illager/evoker_fangs.png"), new ResourceLocation("textures/entity/illager/fangs.png"));
-            builder1.put(new ResourceLocation("textures/entity/illager/illusioner.png"), new ResourceLocation("textures/entity/illager/illusionist.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/black.png"), new ResourceLocation("textures/entity/llama/decor/decor_black.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/blue.png"), new ResourceLocation("textures/entity/llama/decor/decor_blue.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/brown.png"), new ResourceLocation("textures/entity/llama/decor/decor_brown.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/cyan.png"), new ResourceLocation("textures/entity/llama/decor/decor_cyan.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/gray.png"), new ResourceLocation("textures/entity/llama/decor/decor_gray.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/green.png"), new ResourceLocation("textures/entity/llama/decor/decor_green.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/light_blue.png"), new ResourceLocation("textures/entity/llama/decor/decor_light_blue.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/lime.png"), new ResourceLocation("textures/entity/llama/decor/decor_lime.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/magenta.png"), new ResourceLocation("textures/entity/llama/decor/decor_magenta.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/orange.png"), new ResourceLocation("textures/entity/llama/decor/decor_orange.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/pink.png"), new ResourceLocation("textures/entity/llama/decor/decor_pink.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/purple.png"), new ResourceLocation("textures/entity/llama/decor/decor_purple.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/red.png"), new ResourceLocation("textures/entity/llama/decor/decor_red.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/light_gray.png"), new ResourceLocation("textures/entity/llama/decor/decor_silver.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/white.png"), new ResourceLocation("textures/entity/llama/decor/decor_white.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/decor/yellow.png"), new ResourceLocation("textures/entity/llama/decor/decor_yellow.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/brown.png"), new ResourceLocation("textures/entity/llama/llama_brown.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/creamy.png"), new ResourceLocation("textures/entity/llama/llama_creamy.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/gray.png"), new ResourceLocation("textures/entity/llama/llama_gray.png"));
-            builder1.put(new ResourceLocation("textures/entity/llama/white.png"), new ResourceLocation("textures/entity/llama/llama_white.png"));
-            builder1.put(new ResourceLocation("textures/entity/shulker/shulker.png"), new ResourceLocation("textures/entity/shulker/shulker_purple.png"));
-            builder1.put(new ResourceLocation("textures/entity/shulker/shulker_light_gray.png"), new ResourceLocation("textures/entity/shulker/shulker_silver.png"));
-            builder1.put(new ResourceLocation("textures/entity/snow_golem.png"), new ResourceLocation("textures/entity/snowman.png"));
-            builder1.put(new ResourceLocation("textures/item/acacia_boat.png"), new ResourceLocation("textures/items/acacia_boat.png"));
-            builder1.put(new ResourceLocation("textures/item/apple.png"), new ResourceLocation("textures/items/apple.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_apple.png"), new ResourceLocation("textures/items/apple_golden.png"));
-            builder1.put(new ResourceLocation("textures/item/arrow.png"), new ResourceLocation("textures/items/arrow.png"));
-            builder1.put(new ResourceLocation("textures/item/barrier.png"), new ResourceLocation("textures/items/barrier.png"));
-            builder1.put(new ResourceLocation("textures/item/cooked_beef.png"), new ResourceLocation("textures/items/beef_cooked.png"));
-            builder1.put(new ResourceLocation("textures/item/beef.png"), new ResourceLocation("textures/items/beef_raw.png"));
-            builder1.put(new ResourceLocation("textures/item/beetroot.png"), new ResourceLocation("textures/items/beetroot.png"));
-            builder1.put(new ResourceLocation("textures/item/beetroot_seeds.png"), new ResourceLocation("textures/items/beetroot_seeds.png"));
-            builder1.put(new ResourceLocation("textures/item/beetroot_soup.png"), new ResourceLocation("textures/items/beetroot_soup.png"));
-            builder1.put(new ResourceLocation("textures/item/birch_boat.png"), new ResourceLocation("textures/items/birch_boat.png"));
-            builder1.put(new ResourceLocation("textures/item/blaze_powder.png"), new ResourceLocation("textures/items/blaze_powder.png"));
-            builder1.put(new ResourceLocation("textures/item/blaze_rod.png"), new ResourceLocation("textures/items/blaze_rod.png"));
-            builder1.put(new ResourceLocation("textures/item/bone.png"), new ResourceLocation("textures/items/bone.png"));
-            builder1.put(new ResourceLocation("textures/item/enchanted_book.png"), new ResourceLocation("textures/items/book_enchanted.png"));
-            builder1.put(new ResourceLocation("textures/item/book.png"), new ResourceLocation("textures/items/book_normal.png"));
-            builder1.put(new ResourceLocation("textures/item/writable_book.png"), new ResourceLocation("textures/items/book_writable.png"));
-            builder1.put(new ResourceLocation("textures/item/written_book.png"), new ResourceLocation("textures/items/book_written.png"));
-            builder1.put(new ResourceLocation("textures/item/bow_pulling_0.png"), new ResourceLocation("textures/items/bow_pulling_0.png"));
-            builder1.put(new ResourceLocation("textures/item/bow_pulling_1.png"), new ResourceLocation("textures/items/bow_pulling_1.png"));
-            builder1.put(new ResourceLocation("textures/item/bow_pulling_2.png"), new ResourceLocation("textures/items/bow_pulling_2.png"));
-            builder1.put(new ResourceLocation("textures/item/bow.png"), new ResourceLocation("textures/items/bow_standby.png"));
-            builder1.put(new ResourceLocation("textures/item/bowl.png"), new ResourceLocation("textures/items/bowl.png"));
-            builder1.put(new ResourceLocation("textures/item/bread.png"), new ResourceLocation("textures/items/bread.png"));
-            builder1.put(new ResourceLocation("textures/item/brewing_stand.png"), new ResourceLocation("textures/items/brewing_stand.png"));
-            builder1.put(new ResourceLocation("textures/item/brick.png"), new ResourceLocation("textures/items/brick.png"));
-            builder1.put(new ResourceLocation("textures/item/broken_elytra.png"), new ResourceLocation("textures/items/broken_elytra.png"));
-            builder1.put(new ResourceLocation("textures/item/bucket.png"), new ResourceLocation("textures/items/bucket_empty.png"));
-            builder1.put(new ResourceLocation("textures/item/lava_bucket.png"), new ResourceLocation("textures/items/bucket_lava.png"));
-            builder1.put(new ResourceLocation("textures/item/milk_bucket.png"), new ResourceLocation("textures/items/bucket_milk.png"));
-            builder1.put(new ResourceLocation("textures/item/water_bucket.png"), new ResourceLocation("textures/items/bucket_water.png"));
-            builder1.put(new ResourceLocation("textures/item/cake.png"), new ResourceLocation("textures/items/cake.png"));
-            builder1.put(new ResourceLocation("textures/item/carrot.png"), new ResourceLocation("textures/items/carrot.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_carrot.png"), new ResourceLocation("textures/items/carrot_golden.png"));
-            builder1.put(new ResourceLocation("textures/item/carrot_on_a_stick.png"), new ResourceLocation("textures/items/carrot_on_a_stick.png"));
-            builder1.put(new ResourceLocation("textures/item/cauldron.png"), new ResourceLocation("textures/items/cauldron.png"));
-            builder1.put(new ResourceLocation("textures/item/chainmail_boots.png"), new ResourceLocation("textures/items/chainmail_boots.png"));
-            builder1.put(new ResourceLocation("textures/item/chainmail_chestplate.png"), new ResourceLocation("textures/items/chainmail_chestplate.png"));
-            builder1.put(new ResourceLocation("textures/item/chainmail_helmet.png"), new ResourceLocation("textures/items/chainmail_helmet.png"));
-            builder1.put(new ResourceLocation("textures/item/chainmail_leggings.png"), new ResourceLocation("textures/items/chainmail_leggings.png"));
-            builder1.put(new ResourceLocation("textures/item/charcoal.png"), new ResourceLocation("textures/items/charcoal.png"));
-            builder1.put(new ResourceLocation("textures/item/cooked_chicken.png"), new ResourceLocation("textures/items/chicken_cooked.png"));
-            builder1.put(new ResourceLocation("textures/item/chicken.png"), new ResourceLocation("textures/items/chicken_raw.png"));
-            builder1.put(new ResourceLocation("textures/item/chorus_fruit.png"), new ResourceLocation("textures/items/chorus_fruit.png"));
-            builder1.put(new ResourceLocation("textures/item/popped_chorus_fruit.png"), new ResourceLocation("textures/items/chorus_fruit_popped.png"));
-            builder1.put(new ResourceLocation("textures/item/clay_ball.png"), new ResourceLocation("textures/items/clay_ball.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_00.png"), new ResourceLocation("textures/items/clock_00.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_01.png"), new ResourceLocation("textures/items/clock_01.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_02.png"), new ResourceLocation("textures/items/clock_02.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_03.png"), new ResourceLocation("textures/items/clock_03.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_04.png"), new ResourceLocation("textures/items/clock_04.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_05.png"), new ResourceLocation("textures/items/clock_05.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_06.png"), new ResourceLocation("textures/items/clock_06.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_07.png"), new ResourceLocation("textures/items/clock_07.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_08.png"), new ResourceLocation("textures/items/clock_08.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_09.png"), new ResourceLocation("textures/items/clock_09.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_10.png"), new ResourceLocation("textures/items/clock_10.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_11.png"), new ResourceLocation("textures/items/clock_11.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_12.png"), new ResourceLocation("textures/items/clock_12.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_13.png"), new ResourceLocation("textures/items/clock_13.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_14.png"), new ResourceLocation("textures/items/clock_14.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_15.png"), new ResourceLocation("textures/items/clock_15.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_16.png"), new ResourceLocation("textures/items/clock_16.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_17.png"), new ResourceLocation("textures/items/clock_17.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_18.png"), new ResourceLocation("textures/items/clock_18.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_19.png"), new ResourceLocation("textures/items/clock_19.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_20.png"), new ResourceLocation("textures/items/clock_20.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_21.png"), new ResourceLocation("textures/items/clock_21.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_22.png"), new ResourceLocation("textures/items/clock_22.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_23.png"), new ResourceLocation("textures/items/clock_23.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_24.png"), new ResourceLocation("textures/items/clock_24.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_25.png"), new ResourceLocation("textures/items/clock_25.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_26.png"), new ResourceLocation("textures/items/clock_26.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_27.png"), new ResourceLocation("textures/items/clock_27.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_28.png"), new ResourceLocation("textures/items/clock_28.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_29.png"), new ResourceLocation("textures/items/clock_29.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_30.png"), new ResourceLocation("textures/items/clock_30.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_31.png"), new ResourceLocation("textures/items/clock_31.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_32.png"), new ResourceLocation("textures/items/clock_32.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_33.png"), new ResourceLocation("textures/items/clock_33.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_34.png"), new ResourceLocation("textures/items/clock_34.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_35.png"), new ResourceLocation("textures/items/clock_35.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_36.png"), new ResourceLocation("textures/items/clock_36.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_37.png"), new ResourceLocation("textures/items/clock_37.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_38.png"), new ResourceLocation("textures/items/clock_38.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_39.png"), new ResourceLocation("textures/items/clock_39.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_40.png"), new ResourceLocation("textures/items/clock_40.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_41.png"), new ResourceLocation("textures/items/clock_41.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_42.png"), new ResourceLocation("textures/items/clock_42.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_43.png"), new ResourceLocation("textures/items/clock_43.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_44.png"), new ResourceLocation("textures/items/clock_44.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_45.png"), new ResourceLocation("textures/items/clock_45.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_46.png"), new ResourceLocation("textures/items/clock_46.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_47.png"), new ResourceLocation("textures/items/clock_47.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_48.png"), new ResourceLocation("textures/items/clock_48.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_49.png"), new ResourceLocation("textures/items/clock_49.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_50.png"), new ResourceLocation("textures/items/clock_50.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_51.png"), new ResourceLocation("textures/items/clock_51.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_52.png"), new ResourceLocation("textures/items/clock_52.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_53.png"), new ResourceLocation("textures/items/clock_53.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_54.png"), new ResourceLocation("textures/items/clock_54.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_55.png"), new ResourceLocation("textures/items/clock_55.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_56.png"), new ResourceLocation("textures/items/clock_56.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_57.png"), new ResourceLocation("textures/items/clock_57.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_58.png"), new ResourceLocation("textures/items/clock_58.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_59.png"), new ResourceLocation("textures/items/clock_59.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_60.png"), new ResourceLocation("textures/items/clock_60.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_61.png"), new ResourceLocation("textures/items/clock_61.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_62.png"), new ResourceLocation("textures/items/clock_62.png"));
-            builder1.put(new ResourceLocation("textures/item/clock_63.png"), new ResourceLocation("textures/items/clock_63.png"));
-            builder1.put(new ResourceLocation("textures/item/coal.png"), new ResourceLocation("textures/items/coal.png"));
-            builder1.put(new ResourceLocation("textures/item/comparator.png"), new ResourceLocation("textures/items/comparator.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_00.png"), new ResourceLocation("textures/items/compass_00.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_01.png"), new ResourceLocation("textures/items/compass_01.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_02.png"), new ResourceLocation("textures/items/compass_02.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_03.png"), new ResourceLocation("textures/items/compass_03.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_04.png"), new ResourceLocation("textures/items/compass_04.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_05.png"), new ResourceLocation("textures/items/compass_05.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_06.png"), new ResourceLocation("textures/items/compass_06.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_07.png"), new ResourceLocation("textures/items/compass_07.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_08.png"), new ResourceLocation("textures/items/compass_08.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_09.png"), new ResourceLocation("textures/items/compass_09.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_10.png"), new ResourceLocation("textures/items/compass_10.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_11.png"), new ResourceLocation("textures/items/compass_11.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_12.png"), new ResourceLocation("textures/items/compass_12.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_13.png"), new ResourceLocation("textures/items/compass_13.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_14.png"), new ResourceLocation("textures/items/compass_14.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_15.png"), new ResourceLocation("textures/items/compass_15.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_16.png"), new ResourceLocation("textures/items/compass_16.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_17.png"), new ResourceLocation("textures/items/compass_17.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_18.png"), new ResourceLocation("textures/items/compass_18.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_19.png"), new ResourceLocation("textures/items/compass_19.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_20.png"), new ResourceLocation("textures/items/compass_20.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_21.png"), new ResourceLocation("textures/items/compass_21.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_22.png"), new ResourceLocation("textures/items/compass_22.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_23.png"), new ResourceLocation("textures/items/compass_23.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_24.png"), new ResourceLocation("textures/items/compass_24.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_25.png"), new ResourceLocation("textures/items/compass_25.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_26.png"), new ResourceLocation("textures/items/compass_26.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_27.png"), new ResourceLocation("textures/items/compass_27.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_28.png"), new ResourceLocation("textures/items/compass_28.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_29.png"), new ResourceLocation("textures/items/compass_29.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_30.png"), new ResourceLocation("textures/items/compass_30.png"));
-            builder1.put(new ResourceLocation("textures/item/compass_31.png"), new ResourceLocation("textures/items/compass_31.png"));
-            builder1.put(new ResourceLocation("textures/item/cookie.png"), new ResourceLocation("textures/items/cookie.png"));
-            builder1.put(new ResourceLocation("textures/item/dark_oak_boat.png"), new ResourceLocation("textures/items/dark_oak_boat.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond.png"), new ResourceLocation("textures/items/diamond.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond_axe.png"), new ResourceLocation("textures/items/diamond_axe.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond_boots.png"), new ResourceLocation("textures/items/diamond_boots.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond_chestplate.png"), new ResourceLocation("textures/items/diamond_chestplate.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond_helmet.png"), new ResourceLocation("textures/items/diamond_helmet.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond_hoe.png"), new ResourceLocation("textures/items/diamond_hoe.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond_horse_armor.png"), new ResourceLocation("textures/items/diamond_horse_armor.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond_leggings.png"), new ResourceLocation("textures/items/diamond_leggings.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond_pickaxe.png"), new ResourceLocation("textures/items/diamond_pickaxe.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond_shovel.png"), new ResourceLocation("textures/items/diamond_shovel.png"));
-            builder1.put(new ResourceLocation("textures/item/diamond_sword.png"), new ResourceLocation("textures/items/diamond_sword.png"));
-            builder1.put(new ResourceLocation("textures/item/acacia_door.png"), new ResourceLocation("textures/items/door_acacia.png"));
-            builder1.put(new ResourceLocation("textures/item/birch_door.png"), new ResourceLocation("textures/items/door_birch.png"));
-            builder1.put(new ResourceLocation("textures/item/dark_oak_door.png"), new ResourceLocation("textures/items/door_dark_oak.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_door.png"), new ResourceLocation("textures/items/door_iron.png"));
-            builder1.put(new ResourceLocation("textures/item/jungle_door.png"), new ResourceLocation("textures/items/door_jungle.png"));
-            builder1.put(new ResourceLocation("textures/item/spruce_door.png"), new ResourceLocation("textures/items/door_spruce.png"));
-            builder1.put(new ResourceLocation("textures/item/oak_door.png"), new ResourceLocation("textures/items/door_wood.png"));
-            builder1.put(new ResourceLocation("textures/item/dragon_breath.png"), new ResourceLocation("textures/items/dragon_breath.png"));
-            builder1.put(new ResourceLocation("textures/item/ink_sac.png"), new ResourceLocation("textures/items/dye_powder_black.png"));
-            builder1.put(new ResourceLocation("textures/item/lapis_lazuli.png"), new ResourceLocation("textures/items/dye_powder_blue.png"));
-            builder1.put(new ResourceLocation("textures/item/cocoa_beans.png"), new ResourceLocation("textures/items/dye_powder_brown.png"));
-            builder1.put(new ResourceLocation("textures/item/cyan_dye.png"), new ResourceLocation("textures/items/dye_powder_cyan.png"));
-            builder1.put(new ResourceLocation("textures/item/gray_dye.png"), new ResourceLocation("textures/items/dye_powder_gray.png"));
-            builder1.put(new ResourceLocation("textures/item/green_dye.png"), new ResourceLocation("textures/items/dye_powder_green.png"));
-            builder1.put(new ResourceLocation("textures/item/light_blue_dye.png"), new ResourceLocation("textures/items/dye_powder_light_blue.png"));
-            builder1.put(new ResourceLocation("textures/item/lime_dye.png"), new ResourceLocation("textures/items/dye_powder_lime.png"));
-            builder1.put(new ResourceLocation("textures/item/magenta_dye.png"), new ResourceLocation("textures/items/dye_powder_magenta.png"));
-            builder1.put(new ResourceLocation("textures/item/orange_dye.png"), new ResourceLocation("textures/items/dye_powder_orange.png"));
-            builder1.put(new ResourceLocation("textures/item/pink_dye.png"), new ResourceLocation("textures/items/dye_powder_pink.png"));
-            builder1.put(new ResourceLocation("textures/item/purple_dye.png"), new ResourceLocation("textures/items/dye_powder_purple.png"));
-            builder1.put(new ResourceLocation("textures/item/red_dye.png"), new ResourceLocation("textures/items/dye_powder_red.png"));
-            builder1.put(new ResourceLocation("textures/item/light_gray_dye.png"), new ResourceLocation("textures/items/dye_powder_silver.png"));
-            builder1.put(new ResourceLocation("textures/item/bone_meal.png"), new ResourceLocation("textures/items/dye_powder_white.png"));
-            builder1.put(new ResourceLocation("textures/item/yellow_dye.png"), new ResourceLocation("textures/items/dye_powder_yellow.png"));
-            builder1.put(new ResourceLocation("textures/item/egg.png"), new ResourceLocation("textures/items/egg.png"));
-            builder1.put(new ResourceLocation("textures/item/elytra.png"), new ResourceLocation("textures/items/elytra.png"));
-            builder1.put(new ResourceLocation("textures/item/emerald.png"), new ResourceLocation("textures/items/emerald.png"));
-            builder1.put(new ResourceLocation("textures/item/empty_armor_slot_boots.png"), new ResourceLocation("textures/items/empty_armor_slot_boots.png"));
-            builder1.put(new ResourceLocation("textures/item/empty_armor_slot_chestplate.png"), new ResourceLocation("textures/items/empty_armor_slot_chestplate.png"));
-            builder1.put(new ResourceLocation("textures/item/empty_armor_slot_helmet.png"), new ResourceLocation("textures/items/empty_armor_slot_helmet.png"));
-            builder1.put(new ResourceLocation("textures/item/empty_armor_slot_leggings.png"), new ResourceLocation("textures/items/empty_armor_slot_leggings.png"));
-            builder1.put(new ResourceLocation("textures/item/empty_armor_slot_shield.png"), new ResourceLocation("textures/items/empty_armor_slot_shield.png"));
-            builder1.put(new ResourceLocation("textures/item/end_crystal.png"), new ResourceLocation("textures/items/end_crystal.png"));
-            builder1.put(new ResourceLocation("textures/item/ender_eye.png"), new ResourceLocation("textures/items/ender_eye.png"));
-            builder1.put(new ResourceLocation("textures/item/ender_pearl.png"), new ResourceLocation("textures/items/ender_pearl.png"));
-            builder1.put(new ResourceLocation("textures/item/experience_bottle.png"), new ResourceLocation("textures/items/experience_bottle.png"));
-            builder1.put(new ResourceLocation("textures/item/feather.png"), new ResourceLocation("textures/items/feather.png"));
-            builder1.put(new ResourceLocation("textures/item/fire_charge.png"), new ResourceLocation("textures/items/fireball.png"));
-            builder1.put(new ResourceLocation("textures/item/firework_rocket.png"), new ResourceLocation("textures/items/fireworks.png"));
-            builder1.put(new ResourceLocation("textures/item/firework_star.png"), new ResourceLocation("textures/items/fireworks_charge.png"));
-            builder1.put(new ResourceLocation("textures/item/firework_star_overlay.png"), new ResourceLocation("textures/items/fireworks_charge_overlay.png"));
-            builder1.put(new ResourceLocation("textures/item/tropical_fish.png"), new ResourceLocation("textures/items/fish_clownfish_raw.png"));
-            builder1.put(new ResourceLocation("textures/item/cooked_cod.png"), new ResourceLocation("textures/items/fish_cod_cooked.png"));
-            builder1.put(new ResourceLocation("textures/item/cod.png"), new ResourceLocation("textures/items/fish_cod_raw.png"));
-            builder1.put(new ResourceLocation("textures/item/pufferfish.png"), new ResourceLocation("textures/items/fish_pufferfish_raw.png"));
-            builder1.put(new ResourceLocation("textures/item/cooked_salmon.png"), new ResourceLocation("textures/items/fish_salmon_cooked.png"));
-            builder1.put(new ResourceLocation("textures/item/salmon.png"), new ResourceLocation("textures/items/fish_salmon_raw.png"));
-            builder1.put(new ResourceLocation("textures/item/fishing_rod_cast.png"), new ResourceLocation("textures/items/fishing_rod_cast.png"));
-            builder1.put(new ResourceLocation("textures/item/fishing_rod.png"), new ResourceLocation("textures/items/fishing_rod_uncast.png"));
-            builder1.put(new ResourceLocation("textures/item/flint.png"), new ResourceLocation("textures/items/flint.png"));
-            builder1.put(new ResourceLocation("textures/item/flint_and_steel.png"), new ResourceLocation("textures/items/flint_and_steel.png"));
-            builder1.put(new ResourceLocation("textures/item/flower_pot.png"), new ResourceLocation("textures/items/flower_pot.png"));
-            builder1.put(new ResourceLocation("textures/item/ghast_tear.png"), new ResourceLocation("textures/items/ghast_tear.png"));
-            builder1.put(new ResourceLocation("textures/item/glowstone_dust.png"), new ResourceLocation("textures/items/glowstone_dust.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_axe.png"), new ResourceLocation("textures/items/gold_axe.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_boots.png"), new ResourceLocation("textures/items/gold_boots.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_chestplate.png"), new ResourceLocation("textures/items/gold_chestplate.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_helmet.png"), new ResourceLocation("textures/items/gold_helmet.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_hoe.png"), new ResourceLocation("textures/items/gold_hoe.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_horse_armor.png"), new ResourceLocation("textures/items/gold_horse_armor.png"));
-            builder1.put(new ResourceLocation("textures/item/gold_ingot.png"), new ResourceLocation("textures/items/gold_ingot.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_leggings.png"), new ResourceLocation("textures/items/gold_leggings.png"));
-            builder1.put(new ResourceLocation("textures/item/gold_nugget.png"), new ResourceLocation("textures/items/gold_nugget.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_pickaxe.png"), new ResourceLocation("textures/items/gold_pickaxe.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_shovel.png"), new ResourceLocation("textures/items/gold_shovel.png"));
-            builder1.put(new ResourceLocation("textures/item/golden_sword.png"), new ResourceLocation("textures/items/gold_sword.png"));
-            builder1.put(new ResourceLocation("textures/item/gunpowder.png"), new ResourceLocation("textures/items/gunpowder.png"));
-            builder1.put(new ResourceLocation("textures/item/hopper.png"), new ResourceLocation("textures/items/hopper.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_axe.png"), new ResourceLocation("textures/items/iron_axe.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_boots.png"), new ResourceLocation("textures/items/iron_boots.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_chestplate.png"), new ResourceLocation("textures/items/iron_chestplate.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_helmet.png"), new ResourceLocation("textures/items/iron_helmet.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_hoe.png"), new ResourceLocation("textures/items/iron_hoe.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_horse_armor.png"), new ResourceLocation("textures/items/iron_horse_armor.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_ingot.png"), new ResourceLocation("textures/items/iron_ingot.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_leggings.png"), new ResourceLocation("textures/items/iron_leggings.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_nugget.png"), new ResourceLocation("textures/items/iron_nugget.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_pickaxe.png"), new ResourceLocation("textures/items/iron_pickaxe.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_shovel.png"), new ResourceLocation("textures/items/iron_shovel.png"));
-            builder1.put(new ResourceLocation("textures/item/iron_sword.png"), new ResourceLocation("textures/items/iron_sword.png"));
-            builder1.put(new ResourceLocation("textures/item/item_frame.png"), new ResourceLocation("textures/items/item_frame.png"));
-            builder1.put(new ResourceLocation("textures/item/jungle_boat.png"), new ResourceLocation("textures/items/jungle_boat.png"));
-            builder1.put(new ResourceLocation("textures/item/knowledge_book.png"), new ResourceLocation("textures/items/knowledge_book.png"));
-            builder1.put(new ResourceLocation("textures/item/lead.png"), new ResourceLocation("textures/items/lead.png"));
-            builder1.put(new ResourceLocation("textures/item/leather.png"), new ResourceLocation("textures/items/leather.png"));
-            builder1.put(new ResourceLocation("textures/item/leather_boots.png"), new ResourceLocation("textures/items/leather_boots.png"));
-            builder1.put(new ResourceLocation("textures/item/leather_boots_overlay.png"), new ResourceLocation("textures/items/leather_boots_overlay.png"));
-            builder1.put(new ResourceLocation("textures/item/leather_chestplate.png"), new ResourceLocation("textures/items/leather_chestplate.png"));
-            builder1.put(new ResourceLocation("textures/item/leather_chestplate_overlay.png"), new ResourceLocation("textures/items/leather_chestplate_overlay.png"));
-            builder1.put(new ResourceLocation("textures/item/leather_helmet.png"), new ResourceLocation("textures/items/leather_helmet.png"));
-            builder1.put(new ResourceLocation("textures/item/leather_helmet_overlay.png"), new ResourceLocation("textures/items/leather_helmet_overlay.png"));
-            builder1.put(new ResourceLocation("textures/item/leather_leggings.png"), new ResourceLocation("textures/items/leather_leggings.png"));
-            builder1.put(new ResourceLocation("textures/item/leather_leggings_overlay.png"), new ResourceLocation("textures/items/leather_leggings_overlay.png"));
-            builder1.put(new ResourceLocation("textures/item/magma_cream.png"), new ResourceLocation("textures/items/magma_cream.png"));
-            builder1.put(new ResourceLocation("textures/item/map.png"), new ResourceLocation("textures/items/map_empty.png"));
-            builder1.put(new ResourceLocation("textures/item/filled_map.png"), new ResourceLocation("textures/items/map_filled.png"));
-            builder1.put(new ResourceLocation("textures/item/filled_map_markings.png"), new ResourceLocation("textures/items/map_filled_markings.png"));
-            builder1.put(new ResourceLocation("textures/item/melon_slice.png"), new ResourceLocation("textures/items/melon.png"));
-            builder1.put(new ResourceLocation("textures/item/glistering_melon_slice.png"), new ResourceLocation("textures/items/melon_speckled.png"));
-            builder1.put(new ResourceLocation("textures/item/chest_minecart.png"), new ResourceLocation("textures/items/minecart_chest.png"));
-            builder1.put(new ResourceLocation("textures/item/command_block_minecart.png"), new ResourceLocation("textures/items/minecart_command_block.png"));
-            builder1.put(new ResourceLocation("textures/item/furnace_minecart.png"), new ResourceLocation("textures/items/minecart_furnace.png"));
-            builder1.put(new ResourceLocation("textures/item/hopper_minecart.png"), new ResourceLocation("textures/items/minecart_hopper.png"));
-            builder1.put(new ResourceLocation("textures/item/minecart.png"), new ResourceLocation("textures/items/minecart_normal.png"));
-            builder1.put(new ResourceLocation("textures/item/tnt_minecart.png"), new ResourceLocation("textures/items/minecart_tnt.png"));
-            builder1.put(new ResourceLocation("textures/item/mushroom_stew.png"), new ResourceLocation("textures/items/mushroom_stew.png"));
-            builder1.put(new ResourceLocation("textures/item/cooked_mutton.png"), new ResourceLocation("textures/items/mutton_cooked.png"));
-            builder1.put(new ResourceLocation("textures/item/mutton.png"), new ResourceLocation("textures/items/mutton_raw.png"));
-            builder1.put(new ResourceLocation("textures/item/name_tag.png"), new ResourceLocation("textures/items/name_tag.png"));
-            builder1.put(new ResourceLocation("textures/item/nether_star.png"), new ResourceLocation("textures/items/nether_star.png"));
-            builder1.put(new ResourceLocation("textures/item/nether_wart.png"), new ResourceLocation("textures/items/nether_wart.png"));
-            builder1.put(new ResourceLocation("textures/item/nether_brick.png"), new ResourceLocation("textures/items/netherbrick.png"));
-            builder1.put(new ResourceLocation("textures/item/oak_boat.png"), new ResourceLocation("textures/items/oak_boat.png"));
-            builder1.put(new ResourceLocation("textures/item/painting.png"), new ResourceLocation("textures/items/painting.png"));
-            builder1.put(new ResourceLocation("textures/item/paper.png"), new ResourceLocation("textures/items/paper.png"));
-            builder1.put(new ResourceLocation("textures/item/cooked_porkchop.png"), new ResourceLocation("textures/items/porkchop_cooked.png"));
-            builder1.put(new ResourceLocation("textures/item/porkchop.png"), new ResourceLocation("textures/items/porkchop_raw.png"));
-            builder1.put(new ResourceLocation("textures/item/potato.png"), new ResourceLocation("textures/items/potato.png"));
-            builder1.put(new ResourceLocation("textures/item/baked_potato.png"), new ResourceLocation("textures/items/potato_baked.png"));
-            builder1.put(new ResourceLocation("textures/item/poisonous_potato.png"), new ResourceLocation("textures/items/potato_poisonous.png"));
-            builder1.put(new ResourceLocation("textures/item/potion.png"), new ResourceLocation("textures/items/potion_bottle_drinkable.png"));
-            builder1.put(new ResourceLocation("textures/item/glass_bottle.png"), new ResourceLocation("textures/items/potion_bottle_empty.png"));
-            builder1.put(new ResourceLocation("textures/item/lingering_potion.png"), new ResourceLocation("textures/items/potion_bottle_lingering.png"));
-            builder1.put(new ResourceLocation("textures/item/splash_potion.png"), new ResourceLocation("textures/items/potion_bottle_splash.png"));
-            builder1.put(new ResourceLocation("textures/item/potion_overlay.png"), new ResourceLocation("textures/items/potion_overlay.png"));
-            builder1.put(new ResourceLocation("textures/item/prismarine_crystals.png"), new ResourceLocation("textures/items/prismarine_crystals.png"));
-            builder1.put(new ResourceLocation("textures/item/prismarine_shard.png"), new ResourceLocation("textures/items/prismarine_shard.png"));
-            builder1.put(new ResourceLocation("textures/item/pumpkin_pie.png"), new ResourceLocation("textures/items/pumpkin_pie.png"));
-            builder1.put(new ResourceLocation("textures/item/quartz.png"), new ResourceLocation("textures/items/quartz.png"));
-            builder1.put(new ResourceLocation("textures/item/cooked_rabbit.png"), new ResourceLocation("textures/items/rabbit_cooked.png"));
-            builder1.put(new ResourceLocation("textures/item/rabbit_foot.png"), new ResourceLocation("textures/items/rabbit_foot.png"));
-            builder1.put(new ResourceLocation("textures/item/rabbit_hide.png"), new ResourceLocation("textures/items/rabbit_hide.png"));
-            builder1.put(new ResourceLocation("textures/item/rabbit.png"), new ResourceLocation("textures/items/rabbit_raw.png"));
-            builder1.put(new ResourceLocation("textures/item/rabbit_stew.png"), new ResourceLocation("textures/items/rabbit_stew.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_11.png"), new ResourceLocation("textures/items/record_11.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_13.png"), new ResourceLocation("textures/items/record_13.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_blocks.png"), new ResourceLocation("textures/items/record_blocks.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_cat.png"), new ResourceLocation("textures/items/record_cat.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_chirp.png"), new ResourceLocation("textures/items/record_chirp.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_far.png"), new ResourceLocation("textures/items/record_far.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_mall.png"), new ResourceLocation("textures/items/record_mall.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_mellohi.png"), new ResourceLocation("textures/items/record_mellohi.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_stal.png"), new ResourceLocation("textures/items/record_stal.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_strad.png"), new ResourceLocation("textures/items/record_strad.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_wait.png"), new ResourceLocation("textures/items/record_wait.png"));
-            builder1.put(new ResourceLocation("textures/item/music_disc_ward.png"), new ResourceLocation("textures/items/record_ward.png"));
-            builder1.put(new ResourceLocation("textures/item/redstone.png"), new ResourceLocation("textures/items/redstone_dust.png"));
-            builder1.put(new ResourceLocation("textures/item/sugar_cane.png"), new ResourceLocation("textures/items/reeds.png"));
-            builder1.put(new ResourceLocation("textures/item/repeater.png"), new ResourceLocation("textures/items/repeater.png"));
-            builder1.put(new ResourceLocation("textures/item/rotten_flesh.png"), new ResourceLocation("textures/items/rotten_flesh.png"));
-            builder1.put(new ResourceLocation("textures/item/ruby.png"), new ResourceLocation("textures/items/ruby.png"));
-            builder1.put(new ResourceLocation("textures/item/saddle.png"), new ResourceLocation("textures/items/saddle.png"));
-            builder1.put(new ResourceLocation("textures/item/melon_seeds.png"), new ResourceLocation("textures/items/seeds_melon.png"));
-            builder1.put(new ResourceLocation("textures/item/pumpkin_seeds.png"), new ResourceLocation("textures/items/seeds_pumpkin.png"));
-            builder1.put(new ResourceLocation("textures/item/wheat_seeds.png"), new ResourceLocation("textures/items/seeds_wheat.png"));
-            builder1.put(new ResourceLocation("textures/item/shears.png"), new ResourceLocation("textures/items/shears.png"));
-            builder1.put(new ResourceLocation("textures/item/shulker_shell.png"), new ResourceLocation("textures/items/shulker_shell.png"));
-            builder1.put(new ResourceLocation("textures/item/sign.png"), new ResourceLocation("textures/items/sign.png"));
-            builder1.put(new ResourceLocation("textures/item/slime_ball.png"), new ResourceLocation("textures/items/slimeball.png"));
-            builder1.put(new ResourceLocation("textures/item/snowball.png"), new ResourceLocation("textures/items/snowball.png"));
-            builder1.put(new ResourceLocation("textures/item/spawn_egg.png"), new ResourceLocation("textures/items/spawn_egg.png"));
-            builder1.put(new ResourceLocation("textures/item/spawn_egg_overlay.png"), new ResourceLocation("textures/items/spawn_egg_overlay.png"));
-            builder1.put(new ResourceLocation("textures/item/spectral_arrow.png"), new ResourceLocation("textures/items/spectral_arrow.png"));
-            builder1.put(new ResourceLocation("textures/item/spider_eye.png"), new ResourceLocation("textures/items/spider_eye.png"));
-            builder1.put(new ResourceLocation("textures/item/fermented_spider_eye.png"), new ResourceLocation("textures/items/spider_eye_fermented.png"));
-            builder1.put(new ResourceLocation("textures/item/spruce_boat.png"), new ResourceLocation("textures/items/spruce_boat.png"));
-            builder1.put(new ResourceLocation("textures/item/stick.png"), new ResourceLocation("textures/items/stick.png"));
-            builder1.put(new ResourceLocation("textures/item/stone_axe.png"), new ResourceLocation("textures/items/stone_axe.png"));
-            builder1.put(new ResourceLocation("textures/item/stone_hoe.png"), new ResourceLocation("textures/items/stone_hoe.png"));
-            builder1.put(new ResourceLocation("textures/item/stone_pickaxe.png"), new ResourceLocation("textures/items/stone_pickaxe.png"));
-            builder1.put(new ResourceLocation("textures/item/stone_shovel.png"), new ResourceLocation("textures/items/stone_shovel.png"));
-            builder1.put(new ResourceLocation("textures/item/stone_sword.png"), new ResourceLocation("textures/items/stone_sword.png"));
-            builder1.put(new ResourceLocation("textures/item/string.png"), new ResourceLocation("textures/items/string.png"));
-            builder1.put(new ResourceLocation("textures/item/structure_void.png"), new ResourceLocation("textures/items/structure_void.png"));
-            builder1.put(new ResourceLocation("textures/item/sugar.png"), new ResourceLocation("textures/items/sugar.png"));
-            builder1.put(new ResourceLocation("textures/item/tipped_arrow_base.png"), new ResourceLocation("textures/items/tipped_arrow_base.png"));
-            builder1.put(new ResourceLocation("textures/item/tipped_arrow_head.png"), new ResourceLocation("textures/items/tipped_arrow_head.png"));
-            builder1.put(new ResourceLocation("textures/item/totem_of_undying.png"), new ResourceLocation("textures/items/totem.png"));
-            builder1.put(new ResourceLocation("textures/item/wheat.png"), new ResourceLocation("textures/items/wheat.png"));
-            builder1.put(new ResourceLocation("textures/item/wooden_axe.png"), new ResourceLocation("textures/items/wood_axe.png"));
-            builder1.put(new ResourceLocation("textures/item/wooden_hoe.png"), new ResourceLocation("textures/items/wood_hoe.png"));
-            builder1.put(new ResourceLocation("textures/item/wooden_pickaxe.png"), new ResourceLocation("textures/items/wood_pickaxe.png"));
-            builder1.put(new ResourceLocation("textures/item/wooden_shovel.png"), new ResourceLocation("textures/items/wood_shovel.png"));
-            builder1.put(new ResourceLocation("textures/item/wooden_sword.png"), new ResourceLocation("textures/items/wood_sword.png"));
-            builder1.put(new ResourceLocation("textures/item/armor_stand.png"), new ResourceLocation("textures/items/wooden_armorstand.png"));
-            return builder1.build();
-        });
-    }
-}
diff --git a/src/net/minecraft/client/resources/LegacyStuffWrapper.java b/src/net/minecraft/client/resources/LegacyStuffWrapper.java
index 7d7ac9d..54d586e 100644
--- a/src/net/minecraft/client/resources/LegacyStuffWrapper.java
+++ b/src/net/minecraft/client/resources/LegacyStuffWrapper.java
@@ -8,10 +8,10 @@ import net.minecraft.server.packs.resources.ResourceManager;
 
 public class LegacyStuffWrapper {
     @Deprecated
-    public static int[] getPixels(final ResourceManager zb, final ResourceLocation sm) throws IOException {
-        try (final Resource za3 = zb.getResource(sm);
-             final NativeImage cxr5 = NativeImage.read(za3.getInputStream())) {
-            return cxr5.makePixelArray();
+    public static int[] getPixels(final ResourceManager abc, final ResourceLocation uh) throws IOException {
+        try (final Resource abb3 = abc.getResource(uh);
+             final NativeImage dgs5 = NativeImage.read(abb3.getInputStream())) {
+            return dgs5.makePixelArray();
         }
     }
 }
diff --git a/src/net/minecraft/client/resources/MobEffectTextureManager.java b/src/net/minecraft/client/resources/MobEffectTextureManager.java
index 94bd7d6..6417a1d 100644
--- a/src/net/minecraft/client/resources/MobEffectTextureManager.java
+++ b/src/net/minecraft/client/resources/MobEffectTextureManager.java
@@ -8,8 +8,8 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.client.renderer.texture.TextureManager;
 
 public class MobEffectTextureManager extends TextureAtlasHolder {
-    public MobEffectTextureManager(final TextureManager eak) {
-        super(eak, new ResourceLocation("textures/atlas/mob_effects.png"), "mob_effect");
+    public MobEffectTextureManager(final TextureManager elw) {
+        super(elw, new ResourceLocation("textures/atlas/mob_effects.png"), "mob_effect");
     }
     
     @Override
@@ -17,7 +17,7 @@ public class MobEffectTextureManager extends TextureAtlasHolder {
         return Registry.MOB_EFFECT.keySet().stream();
     }
     
-    public TextureAtlasSprite get(final MobEffect aki) {
-        return this.getSprite(Registry.MOB_EFFECT.getKey(aki));
+    public TextureAtlasSprite get(final MobEffect aoe) {
+        return this.getSprite(Registry.MOB_EFFECT.getKey(aoe));
     }
 }
diff --git a/src/net/minecraft/client/resources/PackAdapterV4.java b/src/net/minecraft/client/resources/PackResourcesAdapterV4.java
similarity index 54%
rename from src/net/minecraft/client/resources/PackAdapterV4.java
rename to src/net/minecraft/client/resources/PackResourcesAdapterV4.java
index a73b8a4..a73f88d 100644
--- a/src/net/minecraft/client/resources/PackAdapterV4.java
+++ b/src/net/minecraft/client/resources/PackResourcesAdapterV4.java
@@ -21,9 +21,9 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.properties.ChestType;
 import com.mojang.datafixers.util.Pair;
 import java.util.Map;
-import net.minecraft.server.packs.Pack;
+import net.minecraft.server.packs.PackResources;
 
-public class PackAdapterV4 implements Pack {
+public class PackResourcesAdapterV4 implements PackResources {
     private static final Map<String, Pair<ChestType, ResourceLocation>> CHESTS;
     private static final List<String> PATTERNS;
     private static final Set<String> SHIELDS;
@@ -31,10 +31,10 @@ public class PackAdapterV4 implements Pack {
     public static final ResourceLocation SHIELD_BASE;
     public static final ResourceLocation BANNER_BASE;
     public static final ResourceLocation OLD_IRON_GOLEM_LOCATION;
-    private final Pack pack;
+    private final PackResources pack;
     
-    public PackAdapterV4(final Pack ye) {
-        this.pack = ye;
+    public PackResourcesAdapterV4(final PackResources aae) {
+        this.pack = aae;
     }
     
     @Override
@@ -43,99 +43,99 @@ public class PackAdapterV4 implements Pack {
     }
     
     @Override
-    public boolean hasResource(final PackType yf, final ResourceLocation sm) {
-        if (!"minecraft".equals(sm.getNamespace())) {
-            return this.pack.hasResource(yf, sm);
+    public boolean hasResource(final PackType aaf, final ResourceLocation uh) {
+        if (!"minecraft".equals(uh.getNamespace())) {
+            return this.pack.hasResource(aaf, uh);
         }
-        final String string4 = sm.getPath();
+        final String string4 = uh.getPath();
         if ("textures/misc/enchanted_item_glint.png".equals(string4)) {
             return false;
         }
         if ("textures/entity/iron_golem/iron_golem.png".equals(string4)) {
-            return this.pack.hasResource(yf, PackAdapterV4.OLD_IRON_GOLEM_LOCATION);
+            return this.pack.hasResource(aaf, PackResourcesAdapterV4.OLD_IRON_GOLEM_LOCATION);
         }
         if ("textures/entity/conduit/wind.png".equals(string4) || "textures/entity/conduit/wind_vertical.png".equals(string4)) {
             return false;
         }
-        if (PackAdapterV4.SHIELDS.contains(string4)) {
-            return this.pack.hasResource(yf, PackAdapterV4.SHIELD_BASE) && this.pack.hasResource(yf, sm);
+        if (PackResourcesAdapterV4.SHIELDS.contains(string4)) {
+            return this.pack.hasResource(aaf, PackResourcesAdapterV4.SHIELD_BASE) && this.pack.hasResource(aaf, uh);
         }
-        if (PackAdapterV4.BANNERS.contains(string4)) {
-            return this.pack.hasResource(yf, PackAdapterV4.BANNER_BASE) && this.pack.hasResource(yf, sm);
+        if (PackResourcesAdapterV4.BANNERS.contains(string4)) {
+            return this.pack.hasResource(aaf, PackResourcesAdapterV4.BANNER_BASE) && this.pack.hasResource(aaf, uh);
         }
-        final Pair<ChestType, ResourceLocation> pair5 = PackAdapterV4.CHESTS.get(string4);
-        return (pair5 != null && this.pack.hasResource(yf, (ResourceLocation)pair5.getSecond())) || this.pack.hasResource(yf, sm);
+        final Pair<ChestType, ResourceLocation> pair5 = PackResourcesAdapterV4.CHESTS.get(string4);
+        return (pair5 != null && this.pack.hasResource(aaf, (ResourceLocation)pair5.getSecond())) || this.pack.hasResource(aaf, uh);
     }
     
     @Override
-    public InputStream getResource(final PackType yf, final ResourceLocation sm) throws IOException {
-        if (!"minecraft".equals(sm.getNamespace())) {
-            return this.pack.getResource(yf, sm);
+    public InputStream getResource(final PackType aaf, final ResourceLocation uh) throws IOException {
+        if (!"minecraft".equals(uh.getNamespace())) {
+            return this.pack.getResource(aaf, uh);
         }
-        final String string4 = sm.getPath();
+        final String string4 = uh.getPath();
         if ("textures/entity/iron_golem/iron_golem.png".equals(string4)) {
-            return this.pack.getResource(yf, PackAdapterV4.OLD_IRON_GOLEM_LOCATION);
+            return this.pack.getResource(aaf, PackResourcesAdapterV4.OLD_IRON_GOLEM_LOCATION);
         }
-        if (PackAdapterV4.SHIELDS.contains(string4)) {
-            final InputStream inputStream5 = fixPattern(this.pack.getResource(yf, PackAdapterV4.SHIELD_BASE), this.pack.getResource(yf, sm), 64, 2, 2, 12, 22);
+        if (PackResourcesAdapterV4.SHIELDS.contains(string4)) {
+            final InputStream inputStream5 = fixPattern(this.pack.getResource(aaf, PackResourcesAdapterV4.SHIELD_BASE), this.pack.getResource(aaf, uh), 64, 2, 2, 12, 22);
             if (inputStream5 != null) {
                 return inputStream5;
             }
         }
-        else if (PackAdapterV4.BANNERS.contains(string4)) {
-            final InputStream inputStream5 = fixPattern(this.pack.getResource(yf, PackAdapterV4.BANNER_BASE), this.pack.getResource(yf, sm), 64, 0, 0, 42, 41);
+        else if (PackResourcesAdapterV4.BANNERS.contains(string4)) {
+            final InputStream inputStream5 = fixPattern(this.pack.getResource(aaf, PackResourcesAdapterV4.BANNER_BASE), this.pack.getResource(aaf, uh), 64, 0, 0, 42, 41);
             if (inputStream5 != null) {
                 return inputStream5;
             }
         }
         else {
             if ("textures/entity/enderdragon/dragon.png".equals(string4) || "textures/entity/enderdragon/dragon_exploding.png".equals(string4)) {
-                try (final NativeImage cxr5 = NativeImage.read(this.pack.getResource(yf, sm))) {
-                    for (int integer7 = cxr5.getWidth() / 256, integer8 = 88 * integer7; integer8 < 200 * integer7; ++integer8) {
+                try (final NativeImage dgs5 = NativeImage.read(this.pack.getResource(aaf, uh))) {
+                    for (int integer7 = dgs5.getWidth() / 256, integer8 = 88 * integer7; integer8 < 200 * integer7; ++integer8) {
                         for (int integer9 = 56 * integer7; integer9 < 112 * integer7; ++integer9) {
-                            cxr5.setPixelRGBA(integer9, integer8, 0);
+                            dgs5.setPixelRGBA(integer9, integer8, 0);
                         }
                     }
-                    return new ByteArrayInputStream(cxr5.asByteArray());
+                    return new ByteArrayInputStream(dgs5.asByteArray());
                 }
             }
             if ("textures/entity/conduit/closed_eye.png".equals(string4) || "textures/entity/conduit/open_eye.png".equals(string4)) {
-                return fixConduitEyeTexture(this.pack.getResource(yf, sm));
+                return fixConduitEyeTexture(this.pack.getResource(aaf, uh));
             }
-            final Pair<ChestType, ResourceLocation> pair5 = PackAdapterV4.CHESTS.get(string4);
+            final Pair<ChestType, ResourceLocation> pair5 = PackResourcesAdapterV4.CHESTS.get(string4);
             if (pair5 != null) {
-                final ChestType bzc6 = (ChestType)pair5.getFirst();
-                final InputStream inputStream6 = this.pack.getResource(yf, (ResourceLocation)pair5.getSecond());
-                if (bzc6 == ChestType.SINGLE) {
+                final ChestType cgb6 = (ChestType)pair5.getFirst();
+                final InputStream inputStream6 = this.pack.getResource(aaf, (ResourceLocation)pair5.getSecond());
+                if (cgb6 == ChestType.SINGLE) {
                     return fixSingleChest(inputStream6);
                 }
-                if (bzc6 == ChestType.LEFT) {
+                if (cgb6 == ChestType.LEFT) {
                     return fixLeftChest(inputStream6);
                 }
-                if (bzc6 == ChestType.RIGHT) {
+                if (cgb6 == ChestType.RIGHT) {
                     return fixRightChest(inputStream6);
                 }
             }
         }
-        return this.pack.getResource(yf, sm);
+        return this.pack.getResource(aaf, uh);
     }
     
     @Nullable
     public static InputStream fixPattern(final InputStream inputStream1, final InputStream inputStream2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7) throws IOException {
-        try (final NativeImage cxr8 = NativeImage.read(inputStream1);
-             final NativeImage cxr9 = NativeImage.read(inputStream2)) {
-            final int integer8 = cxr8.getWidth();
-            final int integer9 = cxr8.getHeight();
-            if (integer8 == cxr9.getWidth() && integer9 == cxr9.getHeight()) {
-                try (final NativeImage cxr10 = new NativeImage(integer8, integer9, true)) {
+        try (final NativeImage dgs8 = NativeImage.read(inputStream1);
+             final NativeImage dgs9 = NativeImage.read(inputStream2)) {
+            final int integer8 = dgs8.getWidth();
+            final int integer9 = dgs8.getHeight();
+            if (integer8 == dgs9.getWidth() && integer9 == dgs9.getHeight()) {
+                try (final NativeImage dgs10 = new NativeImage(integer8, integer9, true)) {
                     for (int integer10 = integer8 / integer3, integer11 = integer5 * integer10; integer11 < integer7 * integer10; ++integer11) {
                         for (int integer12 = integer4 * integer10; integer12 < integer6 * integer10; ++integer12) {
-                            final int integer13 = NativeImage.getR(cxr9.getPixelRGBA(integer12, integer11));
-                            final int integer14 = cxr8.getPixelRGBA(integer12, integer11);
-                            cxr10.setPixelRGBA(integer12, integer11, NativeImage.combine(integer13, NativeImage.getB(integer14), NativeImage.getG(integer14), NativeImage.getR(integer14)));
+                            final int integer13 = NativeImage.getR(dgs9.getPixelRGBA(integer12, integer11));
+                            final int integer14 = dgs8.getPixelRGBA(integer12, integer11);
+                            dgs10.setPixelRGBA(integer12, integer11, NativeImage.combine(integer13, NativeImage.getB(integer14), NativeImage.getG(integer14), NativeImage.getR(integer14)));
                         }
                     }
-                    return new ByteArrayInputStream(cxr10.asByteArray());
+                    return new ByteArrayInputStream(dgs10.asByteArray());
                 }
             }
         }
@@ -143,111 +143,111 @@ public class PackAdapterV4 implements Pack {
     }
     
     public static InputStream fixConduitEyeTexture(final InputStream inputStream) throws IOException {
-        try (final NativeImage cxr2 = NativeImage.read(inputStream)) {
-            final int integer4 = cxr2.getWidth();
-            final int integer5 = cxr2.getHeight();
-            try (final NativeImage cxr3 = new NativeImage(2 * integer4, 2 * integer5, true)) {
-                copyRect(cxr2, cxr3, 0, 0, 0, 0, integer4, integer5, 1, false, false);
-                return new ByteArrayInputStream(cxr3.asByteArray());
+        try (final NativeImage dgs2 = NativeImage.read(inputStream)) {
+            final int integer4 = dgs2.getWidth();
+            final int integer5 = dgs2.getHeight();
+            try (final NativeImage dgs3 = new NativeImage(2 * integer4, 2 * integer5, true)) {
+                copyRect(dgs2, dgs3, 0, 0, 0, 0, integer4, integer5, 1, false, false);
+                return new ByteArrayInputStream(dgs3.asByteArray());
             }
         }
     }
     
     public static InputStream fixLeftChest(final InputStream inputStream) throws IOException {
-        try (final NativeImage cxr2 = NativeImage.read(inputStream)) {
-            final int integer4 = cxr2.getWidth();
-            final int integer5 = cxr2.getHeight();
-            try (final NativeImage cxr3 = new NativeImage(integer4 / 2, integer5, true)) {
+        try (final NativeImage dgs2 = NativeImage.read(inputStream)) {
+            final int integer4 = dgs2.getWidth();
+            final int integer5 = dgs2.getHeight();
+            try (final NativeImage dgs3 = new NativeImage(integer4 / 2, integer5, true)) {
                 final int integer6 = integer5 / 64;
-                copyRect(cxr2, cxr3, 29, 0, 29, 0, 15, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 59, 0, 14, 0, 15, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 29, 14, 43, 14, 15, 5, integer6, true, true);
-                copyRect(cxr2, cxr3, 44, 14, 29, 14, 14, 5, integer6, true, true);
-                copyRect(cxr2, cxr3, 58, 14, 14, 14, 15, 5, integer6, true, true);
-                copyRect(cxr2, cxr3, 29, 19, 29, 19, 15, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 59, 19, 14, 19, 15, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 29, 33, 43, 33, 15, 10, integer6, true, true);
-                copyRect(cxr2, cxr3, 44, 33, 29, 33, 14, 10, integer6, true, true);
-                copyRect(cxr2, cxr3, 58, 33, 14, 33, 15, 10, integer6, true, true);
-                copyRect(cxr2, cxr3, 2, 0, 2, 0, 1, 1, integer6, false, true);
-                copyRect(cxr2, cxr3, 4, 0, 1, 0, 1, 1, integer6, false, true);
-                copyRect(cxr2, cxr3, 2, 1, 3, 1, 1, 4, integer6, true, true);
-                copyRect(cxr2, cxr3, 3, 1, 2, 1, 1, 4, integer6, true, true);
-                copyRect(cxr2, cxr3, 4, 1, 1, 1, 1, 4, integer6, true, true);
-                return new ByteArrayInputStream(cxr3.asByteArray());
+                copyRect(dgs2, dgs3, 29, 0, 29, 0, 15, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 59, 0, 14, 0, 15, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 29, 14, 43, 14, 15, 5, integer6, true, true);
+                copyRect(dgs2, dgs3, 44, 14, 29, 14, 14, 5, integer6, true, true);
+                copyRect(dgs2, dgs3, 58, 14, 14, 14, 15, 5, integer6, true, true);
+                copyRect(dgs2, dgs3, 29, 19, 29, 19, 15, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 59, 19, 14, 19, 15, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 29, 33, 43, 33, 15, 10, integer6, true, true);
+                copyRect(dgs2, dgs3, 44, 33, 29, 33, 14, 10, integer6, true, true);
+                copyRect(dgs2, dgs3, 58, 33, 14, 33, 15, 10, integer6, true, true);
+                copyRect(dgs2, dgs3, 2, 0, 2, 0, 1, 1, integer6, false, true);
+                copyRect(dgs2, dgs3, 4, 0, 1, 0, 1, 1, integer6, false, true);
+                copyRect(dgs2, dgs3, 2, 1, 3, 1, 1, 4, integer6, true, true);
+                copyRect(dgs2, dgs3, 3, 1, 2, 1, 1, 4, integer6, true, true);
+                copyRect(dgs2, dgs3, 4, 1, 1, 1, 1, 4, integer6, true, true);
+                return new ByteArrayInputStream(dgs3.asByteArray());
             }
         }
     }
     
     public static InputStream fixRightChest(final InputStream inputStream) throws IOException {
-        try (final NativeImage cxr2 = NativeImage.read(inputStream)) {
-            final int integer4 = cxr2.getWidth();
-            final int integer5 = cxr2.getHeight();
-            try (final NativeImage cxr3 = new NativeImage(integer4 / 2, integer5, true)) {
+        try (final NativeImage dgs2 = NativeImage.read(inputStream)) {
+            final int integer4 = dgs2.getWidth();
+            final int integer5 = dgs2.getHeight();
+            try (final NativeImage dgs3 = new NativeImage(integer4 / 2, integer5, true)) {
                 final int integer6 = integer5 / 64;
-                copyRect(cxr2, cxr3, 14, 0, 29, 0, 15, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 44, 0, 14, 0, 15, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 0, 14, 0, 14, 14, 5, integer6, true, true);
-                copyRect(cxr2, cxr3, 14, 14, 43, 14, 15, 5, integer6, true, true);
-                copyRect(cxr2, cxr3, 73, 14, 14, 14, 15, 5, integer6, true, true);
-                copyRect(cxr2, cxr3, 14, 19, 29, 19, 15, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 44, 19, 14, 19, 15, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 0, 33, 0, 33, 14, 10, integer6, true, true);
-                copyRect(cxr2, cxr3, 14, 33, 43, 33, 15, 10, integer6, true, true);
-                copyRect(cxr2, cxr3, 73, 33, 14, 33, 15, 10, integer6, true, true);
-                copyRect(cxr2, cxr3, 1, 0, 2, 0, 1, 1, integer6, false, true);
-                copyRect(cxr2, cxr3, 3, 0, 1, 0, 1, 1, integer6, false, true);
-                copyRect(cxr2, cxr3, 0, 1, 0, 1, 1, 4, integer6, true, true);
-                copyRect(cxr2, cxr3, 1, 1, 3, 1, 1, 4, integer6, true, true);
-                copyRect(cxr2, cxr3, 5, 1, 1, 1, 1, 4, integer6, true, true);
-                return new ByteArrayInputStream(cxr3.asByteArray());
+                copyRect(dgs2, dgs3, 14, 0, 29, 0, 15, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 44, 0, 14, 0, 15, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 0, 14, 0, 14, 14, 5, integer6, true, true);
+                copyRect(dgs2, dgs3, 14, 14, 43, 14, 15, 5, integer6, true, true);
+                copyRect(dgs2, dgs3, 73, 14, 14, 14, 15, 5, integer6, true, true);
+                copyRect(dgs2, dgs3, 14, 19, 29, 19, 15, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 44, 19, 14, 19, 15, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 0, 33, 0, 33, 14, 10, integer6, true, true);
+                copyRect(dgs2, dgs3, 14, 33, 43, 33, 15, 10, integer6, true, true);
+                copyRect(dgs2, dgs3, 73, 33, 14, 33, 15, 10, integer6, true, true);
+                copyRect(dgs2, dgs3, 1, 0, 2, 0, 1, 1, integer6, false, true);
+                copyRect(dgs2, dgs3, 3, 0, 1, 0, 1, 1, integer6, false, true);
+                copyRect(dgs2, dgs3, 0, 1, 0, 1, 1, 4, integer6, true, true);
+                copyRect(dgs2, dgs3, 1, 1, 3, 1, 1, 4, integer6, true, true);
+                copyRect(dgs2, dgs3, 5, 1, 1, 1, 1, 4, integer6, true, true);
+                return new ByteArrayInputStream(dgs3.asByteArray());
             }
         }
     }
     
     public static InputStream fixSingleChest(final InputStream inputStream) throws IOException {
-        try (final NativeImage cxr2 = NativeImage.read(inputStream)) {
-            final int integer4 = cxr2.getWidth();
-            final int integer5 = cxr2.getHeight();
-            try (final NativeImage cxr3 = new NativeImage(integer4, integer5, true)) {
+        try (final NativeImage dgs2 = NativeImage.read(inputStream)) {
+            final int integer4 = dgs2.getWidth();
+            final int integer5 = dgs2.getHeight();
+            try (final NativeImage dgs3 = new NativeImage(integer4, integer5, true)) {
                 final int integer6 = integer5 / 64;
-                copyRect(cxr2, cxr3, 14, 0, 28, 0, 14, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 28, 0, 14, 0, 14, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 0, 14, 0, 14, 14, 5, integer6, true, true);
-                copyRect(cxr2, cxr3, 14, 14, 42, 14, 14, 5, integer6, true, true);
-                copyRect(cxr2, cxr3, 28, 14, 28, 14, 14, 5, integer6, true, true);
-                copyRect(cxr2, cxr3, 42, 14, 14, 14, 14, 5, integer6, true, true);
-                copyRect(cxr2, cxr3, 14, 19, 28, 19, 14, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 28, 19, 14, 19, 14, 14, integer6, false, true);
-                copyRect(cxr2, cxr3, 0, 33, 0, 33, 14, 10, integer6, true, true);
-                copyRect(cxr2, cxr3, 14, 33, 42, 33, 14, 10, integer6, true, true);
-                copyRect(cxr2, cxr3, 28, 33, 28, 33, 14, 10, integer6, true, true);
-                copyRect(cxr2, cxr3, 42, 33, 14, 33, 14, 10, integer6, true, true);
-                copyRect(cxr2, cxr3, 1, 0, 3, 0, 2, 1, integer6, false, true);
-                copyRect(cxr2, cxr3, 3, 0, 1, 0, 2, 1, integer6, false, true);
-                copyRect(cxr2, cxr3, 0, 1, 0, 1, 1, 4, integer6, true, true);
-                copyRect(cxr2, cxr3, 1, 1, 4, 1, 2, 4, integer6, true, true);
-                copyRect(cxr2, cxr3, 3, 1, 3, 1, 1, 4, integer6, true, true);
-                copyRect(cxr2, cxr3, 4, 1, 1, 1, 2, 4, integer6, true, true);
-                return new ByteArrayInputStream(cxr3.asByteArray());
+                copyRect(dgs2, dgs3, 14, 0, 28, 0, 14, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 28, 0, 14, 0, 14, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 0, 14, 0, 14, 14, 5, integer6, true, true);
+                copyRect(dgs2, dgs3, 14, 14, 42, 14, 14, 5, integer6, true, true);
+                copyRect(dgs2, dgs3, 28, 14, 28, 14, 14, 5, integer6, true, true);
+                copyRect(dgs2, dgs3, 42, 14, 14, 14, 14, 5, integer6, true, true);
+                copyRect(dgs2, dgs3, 14, 19, 28, 19, 14, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 28, 19, 14, 19, 14, 14, integer6, false, true);
+                copyRect(dgs2, dgs3, 0, 33, 0, 33, 14, 10, integer6, true, true);
+                copyRect(dgs2, dgs3, 14, 33, 42, 33, 14, 10, integer6, true, true);
+                copyRect(dgs2, dgs3, 28, 33, 28, 33, 14, 10, integer6, true, true);
+                copyRect(dgs2, dgs3, 42, 33, 14, 33, 14, 10, integer6, true, true);
+                copyRect(dgs2, dgs3, 1, 0, 3, 0, 2, 1, integer6, false, true);
+                copyRect(dgs2, dgs3, 3, 0, 1, 0, 2, 1, integer6, false, true);
+                copyRect(dgs2, dgs3, 0, 1, 0, 1, 1, 4, integer6, true, true);
+                copyRect(dgs2, dgs3, 1, 1, 4, 1, 2, 4, integer6, true, true);
+                copyRect(dgs2, dgs3, 3, 1, 3, 1, 1, 4, integer6, true, true);
+                copyRect(dgs2, dgs3, 4, 1, 1, 1, 2, 4, integer6, true, true);
+                return new ByteArrayInputStream(dgs3.asByteArray());
             }
         }
     }
     
     @Override
-    public Collection<ResourceLocation> getResources(final PackType yf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
-        return this.pack.getResources(yf, string2, string3, integer, predicate);
+    public Collection<ResourceLocation> getResources(final PackType aaf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
+        return this.pack.getResources(aaf, string2, string3, integer, predicate);
     }
     
     @Override
-    public Set<String> getNamespaces(final PackType yf) {
-        return this.pack.getNamespaces(yf);
+    public Set<String> getNamespaces(final PackType aaf) {
+        return this.pack.getNamespaces(aaf);
     }
     
     @Nullable
     @Override
-    public <T> T getMetadataSection(final MetadataSectionSerializer<T> yi) throws IOException {
-        return this.pack.<T>getMetadataSection(yi);
+    public <T> T getMetadataSection(final MetadataSectionSerializer<T> aai) throws IOException {
+        return this.pack.<T>getMetadataSection(aai);
     }
     
     @Override
@@ -256,11 +256,11 @@ public class PackAdapterV4 implements Pack {
     }
     
     @Override
-    public void close() throws IOException {
+    public void close() {
         this.pack.close();
     }
     
-    private static void copyRect(final NativeImage cxr1, final NativeImage cxr2, int integer3, int integer4, int integer5, int integer6, int integer7, int integer8, final int integer9, final boolean boolean10, final boolean boolean11) {
+    private static void copyRect(final NativeImage dgs1, final NativeImage dgs2, int integer3, int integer4, int integer5, int integer6, int integer7, int integer8, final int integer9, final boolean boolean10, final boolean boolean11) {
         integer8 *= integer9;
         integer7 *= integer9;
         integer5 *= integer9;
@@ -269,7 +269,7 @@ public class PackAdapterV4 implements Pack {
         integer4 *= integer9;
         for (int integer10 = 0; integer10 < integer8; ++integer10) {
             for (int integer11 = 0; integer11 < integer7; ++integer11) {
-                cxr2.setPixelRGBA(integer5 + integer11, integer6 + integer10, cxr1.getPixelRGBA(integer3 + (boolean10 ? (integer7 - 1 - integer11) : integer11), integer4 + (boolean11 ? (integer8 - 1 - integer10) : integer10)));
+                dgs2.setPixelRGBA(integer5 + integer11, integer6 + integer10, dgs1.getPixelRGBA(integer3 + (boolean10 ? (integer7 - 1 - integer11) : integer11), integer4 + (boolean11 ? (integer8 - 1 - integer10) : integer10)));
             }
         }
     }
@@ -319,8 +319,8 @@ public class PackAdapterV4 implements Pack {
             return;
         });
         PATTERNS = Lists.<String>newArrayList("base", "border", "bricks", "circle", "creeper", "cross", "curly_border", "diagonal_left", "diagonal_right", "diagonal_up_left", "diagonal_up_right", "flower", "globe", "gradient", "gradient_up", "half_horizontal", "half_horizontal_bottom", "half_vertical", "half_vertical_right", "mojang", "rhombus", "skull", "small_stripes", "square_bottom_left", "square_bottom_right", "square_top_left", "square_top_right", "straight_cross", "stripe_bottom", "stripe_center", "stripe_downleft", "stripe_downright", "stripe_left", "stripe_middle", "stripe_right", "stripe_top", "triangle_bottom", "triangle_top", "triangles_bottom", "triangles_top");
-        SHIELDS = PackAdapterV4.PATTERNS.stream().map(string -> "textures/entity/shield/" + string + ".png").collect(Collectors.toSet());
-        BANNERS = PackAdapterV4.PATTERNS.stream().map(string -> "textures/entity/banner/" + string + ".png").collect(Collectors.toSet());
+        SHIELDS = PackResourcesAdapterV4.PATTERNS.stream().map(string -> "textures/entity/shield/" + string + ".png").collect(Collectors.toSet());
+        BANNERS = PackResourcesAdapterV4.PATTERNS.stream().map(string -> "textures/entity/banner/" + string + ".png").collect(Collectors.toSet());
         SHIELD_BASE = new ResourceLocation("textures/entity/shield_base.png");
         BANNER_BASE = new ResourceLocation("textures/entity/banner_base.png");
         OLD_IRON_GOLEM_LOCATION = new ResourceLocation("textures/entity/iron_golem.png");
diff --git a/src/net/minecraft/client/resources/PaintingTextureManager.java b/src/net/minecraft/client/resources/PaintingTextureManager.java
index ee5a839..b869caa 100644
--- a/src/net/minecraft/client/resources/PaintingTextureManager.java
+++ b/src/net/minecraft/client/resources/PaintingTextureManager.java
@@ -10,8 +10,8 @@ import net.minecraft.resources.ResourceLocation;
 public class PaintingTextureManager extends TextureAtlasHolder {
     private static final ResourceLocation BACK_SPRITE_LOCATION;
     
-    public PaintingTextureManager(final TextureManager eak) {
-        super(eak, new ResourceLocation("textures/atlas/paintings.png"), "painting");
+    public PaintingTextureManager(final TextureManager elw) {
+        super(elw, new ResourceLocation("textures/atlas/paintings.png"), "painting");
     }
     
     @Override
@@ -19,8 +19,8 @@ public class PaintingTextureManager extends TextureAtlasHolder {
         return Stream.<ResourceLocation>concat(Registry.MOTIVE.keySet().stream(), Stream.of((T)PaintingTextureManager.BACK_SPRITE_LOCATION));
     }
     
-    public TextureAtlasSprite get(final Motive avt) {
-        return this.getSprite(Registry.MOTIVE.getKey(avt));
+    public TextureAtlasSprite get(final Motive bbc) {
+        return this.getSprite(Registry.MOTIVE.getKey(bbc));
     }
     
     public TextureAtlasSprite getBackSprite() {
diff --git a/src/net/minecraft/client/resources/ResourcePack.java b/src/net/minecraft/client/resources/ResourcePack.java
new file mode 100644
index 0000000..a37a9c9
--- /dev/null
+++ b/src/net/minecraft/client/resources/ResourcePack.java
@@ -0,0 +1,64 @@
+package net.minecraft.client.resources;
+
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import java.io.InputStream;
+import java.io.IOException;
+import net.minecraft.server.packs.repository.PackCompatibility;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.packs.repository.PackSource;
+import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
+import net.minecraft.server.packs.PackResources;
+import java.util.function.Supplier;
+import net.minecraft.resources.ResourceLocation;
+import javax.annotation.Nullable;
+import com.mojang.blaze3d.platform.NativeImage;
+import net.minecraft.server.packs.repository.Pack;
+
+public class ResourcePack extends Pack {
+    @Nullable
+    private NativeImage icon;
+    @Nullable
+    private ResourceLocation iconLocation;
+    
+    public ResourcePack(final String string, final boolean boolean2, final Supplier<PackResources> supplier, final PackResources aae, final PackMetadataSection aaj, final Position b, final PackSource aas) {
+        super(string, boolean2, supplier, aae, aaj, b, aas);
+        this.icon = readIcon(aae);
+    }
+    
+    public ResourcePack(final String string, final boolean boolean2, final Supplier<PackResources> supplier, final Component mr4, final Component mr5, final PackCompatibility aaq, final Position b, final boolean boolean8, final PackSource aas, @Nullable final NativeImage dgs) {
+        super(string, boolean2, supplier, mr4, mr5, aaq, b, boolean8, aas);
+        this.icon = dgs;
+    }
+    
+    @Nullable
+    public static NativeImage readIcon(final PackResources aae) {
+        try (final InputStream inputStream2 = aae.getRootResource("pack.png")) {
+            return NativeImage.read(inputStream2);
+        }
+        catch (IOException | IllegalArgumentException ex) {
+            return null;
+        }
+    }
+    
+    public void bindIcon(final TextureManager elw) {
+        if (this.iconLocation == null) {
+            if (this.icon == null) {
+                this.iconLocation = new ResourceLocation("textures/misc/unknown_pack.png");
+            }
+            else {
+                this.iconLocation = elw.register("texturepackicon", new DynamicTexture(this.icon));
+            }
+        }
+        elw.bind(this.iconLocation);
+    }
+    
+    @Override
+    public void close() {
+        super.close();
+        if (this.icon != null) {
+            this.icon.close();
+            this.icon = null;
+        }
+    }
+}
diff --git a/src/net/minecraft/client/resources/SkinManager.java b/src/net/minecraft/client/resources/SkinManager.java
index 25efb56..9494caf 100644
--- a/src/net/minecraft/client/resources/SkinManager.java
+++ b/src/net/minecraft/client/resources/SkinManager.java
@@ -30,8 +30,8 @@ public class SkinManager {
     private final MinecraftSessionService sessionService;
     private final LoadingCache<GameProfile, Map<MinecraftProfileTexture.Type, MinecraftProfileTexture>> insecureSkinCache;
     
-    public SkinManager(final TextureManager eak, final File file, final MinecraftSessionService minecraftSessionService) {
-        this.textureManager = eak;
+    public SkinManager(final TextureManager elw, final File file, final MinecraftSessionService minecraftSessionService) {
+        this.textureManager = elw;
         this.skinsDirectory = file;
         this.sessionService = minecraftSessionService;
         this.insecureSkinCache = CacheBuilder.newBuilder().expireAfterAccess(15L, TimeUnit.SECONDS).<GameProfile, Map<MinecraftProfileTexture.Type, MinecraftProfileTexture>>build(new CacheLoader<GameProfile, Map<MinecraftProfileTexture.Type, MinecraftProfileTexture>>() {
@@ -53,26 +53,26 @@ public class SkinManager {
     
     public ResourceLocation registerTexture(final MinecraftProfileTexture minecraftProfileTexture, final MinecraftProfileTexture.Type type, @Nullable final SkinTextureCallback a) {
         final String string5 = Hashing.sha1().hashUnencodedChars(minecraftProfileTexture.getHash()).toString();
-        final ResourceLocation sm6 = new ResourceLocation("skins/" + string5);
-        final AbstractTexture dzw7 = this.textureManager.getTexture(sm6);
-        if (dzw7 != null) {
+        final ResourceLocation uh6 = new ResourceLocation("skins/" + string5);
+        final AbstractTexture elj7 = this.textureManager.getTexture(uh6);
+        if (elj7 != null) {
             if (a != null) {
-                a.onSkinTextureAvailable(type, sm6, minecraftProfileTexture);
+                a.onSkinTextureAvailable(type, uh6, minecraftProfileTexture);
             }
         }
         else {
             final File file8 = new File(this.skinsDirectory, (string5.length() > 2) ? string5.substring(0, 2) : "xx");
             final File file9 = new File(file8, string5);
-            final ResourceLocation sm7;
-            final HttpTexture dzz10 = new HttpTexture(file9, minecraftProfileTexture.getUrl(), DefaultPlayerSkin.getDefaultSkin(), type == MinecraftProfileTexture.Type.SKIN, () -> {
+            final ResourceLocation uh7;
+            final HttpTexture elm10 = new HttpTexture(file9, minecraftProfileTexture.getUrl(), DefaultPlayerSkin.getDefaultSkin(), type == MinecraftProfileTexture.Type.SKIN, () -> {
                 if (a != null) {
-                    a.onSkinTextureAvailable(type, sm7, minecraftProfileTexture);
+                    a.onSkinTextureAvailable(type, uh7, minecraftProfileTexture);
                 }
                 return;
             });
-            this.textureManager.register(sm6, dzz10);
+            this.textureManager.register(uh6, elm10);
         }
-        return sm6;
+        return uh6;
     }
     
     public void registerSkins(final GameProfile gameProfile, final SkinTextureCallback a, final boolean boolean3) {
@@ -113,6 +113,6 @@ public class SkinManager {
     }
     
     public interface SkinTextureCallback {
-        void onSkinTextureAvailable(final MinecraftProfileTexture.Type type, final ResourceLocation sm, final MinecraftProfileTexture minecraftProfileTexture);
+        void onSkinTextureAvailable(final MinecraftProfileTexture.Type type, final ResourceLocation uh, final MinecraftProfileTexture minecraftProfileTexture);
     }
 }
diff --git a/src/net/minecraft/client/resources/SplashManager.java b/src/net/minecraft/client/resources/SplashManager.java
index b14116f..595b74a 100644
--- a/src/net/minecraft/client/resources/SplashManager.java
+++ b/src/net/minecraft/client/resources/SplashManager.java
@@ -31,15 +31,15 @@ public class SplashManager extends SimplePreparableReloadListener<List<String>>
     private final List<String> splashes;
     private final User user;
     
-    public SplashManager(final User dbz) {
+    public SplashManager(final User dml) {
         this.splashes = Lists.newArrayList();
-        this.user = dbz;
+        this.user = dml;
     }
     
     @Override
-    protected List<String> prepare(final ResourceManager zb, final ProfilerFiller aio) {
-        try (final Resource za4 = Minecraft.getInstance().getResourceManager().getResource(SplashManager.SPLASHES_LOCATION);
-             final BufferedReader bufferedReader6 = new BufferedReader(new InputStreamReader(za4.getInputStream(), StandardCharsets.UTF_8))) {
+    protected List<String> prepare(final ResourceManager abc, final ProfilerFiller ami) {
+        try (final Resource abb4 = Minecraft.getInstance().getResourceManager().getResource(SplashManager.SPLASHES_LOCATION);
+             final BufferedReader bufferedReader6 = new BufferedReader(new InputStreamReader(abb4.getInputStream(), StandardCharsets.UTF_8))) {
             return bufferedReader6.lines().map(String::trim).filter(string -> string.hashCode() != 125780783).collect(Collectors.toList());
         }
         catch (IOException iOException4) {
@@ -48,7 +48,7 @@ public class SplashManager extends SimplePreparableReloadListener<List<String>>
     }
     
     @Override
-    protected void apply(final List<String> list, final ResourceManager zb, final ProfilerFiller aio) {
+    protected void apply(final List<String> list, final ResourceManager abc, final ProfilerFiller ami) {
         this.splashes.clear();
         this.splashes.addAll(list);
     }
diff --git a/src/net/minecraft/client/resources/TextureAtlasHolder.java b/src/net/minecraft/client/resources/TextureAtlasHolder.java
index b92f0cb..90e9d68 100644
--- a/src/net/minecraft/client/resources/TextureAtlasHolder.java
+++ b/src/net/minecraft/client/resources/TextureAtlasHolder.java
@@ -15,39 +15,39 @@ public abstract class TextureAtlasHolder extends SimplePreparableReloadListener<
     private final TextureAtlas textureAtlas;
     private final String prefix;
     
-    public TextureAtlasHolder(final TextureManager eak, final ResourceLocation sm, final String string) {
+    public TextureAtlasHolder(final TextureManager elw, final ResourceLocation uh, final String string) {
         this.prefix = string;
-        this.textureAtlas = new TextureAtlas(sm);
-        eak.register(this.textureAtlas.location(), this.textureAtlas);
+        this.textureAtlas = new TextureAtlas(uh);
+        elw.register(this.textureAtlas.location(), this.textureAtlas);
     }
     
     protected abstract Stream<ResourceLocation> getResourcesToLoad();
     
-    protected TextureAtlasSprite getSprite(final ResourceLocation sm) {
-        return this.textureAtlas.getSprite(this.resolveLocation(sm));
+    protected TextureAtlasSprite getSprite(final ResourceLocation uh) {
+        return this.textureAtlas.getSprite(this.resolveLocation(uh));
     }
     
-    private ResourceLocation resolveLocation(final ResourceLocation sm) {
-        return new ResourceLocation(sm.getNamespace(), this.prefix + "/" + sm.getPath());
+    private ResourceLocation resolveLocation(final ResourceLocation uh) {
+        return new ResourceLocation(uh.getNamespace(), this.prefix + "/" + uh.getPath());
     }
     
     @Override
-    protected TextureAtlas.Preparations prepare(final ResourceManager zb, final ProfilerFiller aio) {
-        aio.startTick();
-        aio.push("stitching");
-        final TextureAtlas.Preparations a4 = this.textureAtlas.prepareToStitch(zb, this.getResourcesToLoad().<ResourceLocation>map(this::resolveLocation), aio, 0);
-        aio.pop();
-        aio.endTick();
+    protected TextureAtlas.Preparations prepare(final ResourceManager abc, final ProfilerFiller ami) {
+        ami.startTick();
+        ami.push("stitching");
+        final TextureAtlas.Preparations a4 = this.textureAtlas.prepareToStitch(abc, this.getResourcesToLoad().<ResourceLocation>map(this::resolveLocation), ami, 0);
+        ami.pop();
+        ami.endTick();
         return a4;
     }
     
     @Override
-    protected void apply(final TextureAtlas.Preparations a, final ResourceManager zb, final ProfilerFiller aio) {
-        aio.startTick();
-        aio.push("upload");
+    protected void apply(final TextureAtlas.Preparations a, final ResourceManager abc, final ProfilerFiller ami) {
+        ami.startTick();
+        ami.push("upload");
         this.textureAtlas.reload(a);
-        aio.pop();
-        aio.endTick();
+        ami.pop();
+        ami.endTick();
     }
     
     @Override
diff --git a/src/net/minecraft/client/resources/UnopenedResourcePack.java b/src/net/minecraft/client/resources/UnopenedResourcePack.java
deleted file mode 100644
index bdc3333..0000000
--- a/src/net/minecraft/client/resources/UnopenedResourcePack.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.minecraft.client.resources;
-
-import net.minecraft.client.renderer.texture.DynamicTexture;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.server.packs.repository.PackCompatibility;
-import net.minecraft.network.chat.Component;
-import java.io.InputStream;
-import java.io.IOException;
-import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
-import net.minecraft.server.packs.Pack;
-import java.util.function.Supplier;
-import net.minecraft.resources.ResourceLocation;
-import javax.annotation.Nullable;
-import com.mojang.blaze3d.platform.NativeImage;
-import net.minecraft.server.packs.repository.UnopenedPack;
-
-public class UnopenedResourcePack extends UnopenedPack {
-    @Nullable
-    private NativeImage icon;
-    @Nullable
-    private ResourceLocation iconLocation;
-    
-    public UnopenedResourcePack(final String string, final boolean boolean2, final Supplier<Pack> supplier, final Pack ye, final PackMetadataSection yj, final Position a) {
-        super(string, boolean2, supplier, ye, yj, a);
-        NativeImage cxr8 = null;
-        try (final InputStream inputStream9 = ye.getRootResource("pack.png")) {
-            cxr8 = NativeImage.read(inputStream9);
-        }
-        catch (IOException ex) {}
-        catch (IllegalArgumentException ex2) {}
-        this.icon = cxr8;
-    }
-    
-    public UnopenedResourcePack(final String string, final boolean boolean2, final Supplier<Pack> supplier, final Component lf4, final Component lf5, final PackCompatibility yp, final Position a, final boolean boolean8, @Nullable final NativeImage cxr) {
-        super(string, boolean2, supplier, lf4, lf5, yp, a, boolean8);
-        this.icon = cxr;
-    }
-    
-    public void bindIcon(final TextureManager eak) {
-        if (this.iconLocation == null) {
-            if (this.icon == null) {
-                this.iconLocation = new ResourceLocation("textures/misc/unknown_pack.png");
-            }
-            else {
-                this.iconLocation = eak.register("texturepackicon", new DynamicTexture(this.icon));
-            }
-        }
-        eak.bind(this.iconLocation);
-    }
-    
-    @Override
-    public void close() {
-        super.close();
-        if (this.icon != null) {
-            this.icon.close();
-            this.icon = null;
-        }
-    }
-}
diff --git a/src/net/minecraft/client/resources/language/ClientLanguage.java b/src/net/minecraft/client/resources/language/ClientLanguage.java
new file mode 100644
index 0000000..d422206
--- /dev/null
+++ b/src/net/minecraft/client/resources/language/ClientLanguage.java
@@ -0,0 +1,121 @@
+package net.minecraft.client.resources.language;
+
+import org.apache.logging.log4j.LogManager;
+import com.ibm.icu.text.ArabicShapingException;
+import com.ibm.icu.text.Bidi;
+import com.ibm.icu.text.ArabicShaping;
+import java.util.regex.Matcher;
+import java.io.InputStream;
+import java.io.IOException;
+import net.minecraft.server.packs.resources.Resource;
+import java.util.Iterator;
+import com.google.common.collect.ImmutableMap;
+import java.io.FileNotFoundException;
+import net.minecraft.resources.ResourceLocation;
+import com.google.common.collect.Maps;
+import java.util.List;
+import net.minecraft.server.packs.resources.ResourceManager;
+import java.util.Map;
+import java.util.regex.Pattern;
+import org.apache.logging.log4j.Logger;
+import net.minecraft.locale.Language;
+
+public class ClientLanguage extends Language {
+    private static final Logger LOGGER;
+    private static final Pattern FORMAT_PATTERN;
+    private final Map<String, String> storage;
+    private final boolean requiresReordering;
+    
+    private ClientLanguage(final Map<String, String> map, final boolean boolean2) {
+        this.storage = map;
+        this.requiresReordering = boolean2;
+    }
+    
+    public static ClientLanguage loadFrom(final ResourceManager abc, final List<LanguageInfo> list) {
+        final Map<String, String> map3 = Maps.newHashMap();
+        boolean boolean4 = false;
+        for (final LanguageInfo emr6 : list) {
+            boolean4 |= emr6.isBidirectional();
+            final String string7 = String.format("lang/%s.json", emr6.getCode());
+            for (final String string8 : abc.getNamespaces()) {
+                try {
+                    final ResourceLocation uh10 = new ResourceLocation(string8, string7);
+                    appendFrom(abc.getResources(uh10), map3);
+                }
+                catch (FileNotFoundException ex) {}
+                catch (Exception exception10) {
+                    ClientLanguage.LOGGER.warn("Skipped language file: {}:{} ({})", string8, string7, exception10.toString());
+                }
+            }
+        }
+        return new ClientLanguage(ImmutableMap.copyOf(map3), boolean4);
+    }
+    
+    private static void appendFrom(final List<Resource> list, final Map<String, String> map) {
+        for (final Resource abb4 : list) {
+            try (final InputStream inputStream5 = abb4.getInputStream()) {
+                Language.loadFromJson(inputStream5, map::put);
+            }
+            catch (IOException iOException5) {
+                ClientLanguage.LOGGER.warn("Failed to load translations from {}", abb4, iOException5);
+            }
+        }
+    }
+    
+    @Override
+    public String getOrDefault(final String string) {
+        return this.storage.getOrDefault(string, string);
+    }
+    
+    @Override
+    public boolean has(final String string) {
+        return this.storage.containsKey(string);
+    }
+    
+    @Override
+    public boolean requiresReordering() {
+        return this.requiresReordering;
+    }
+    
+    @Override
+    public String reorder(String string, final boolean boolean2) {
+        if (!this.requiresReordering) {
+            return string;
+        }
+        if (boolean2 && string.indexOf(37) != -1) {
+            string = wrapFormatCodes(string);
+        }
+        return this.reorder(string);
+    }
+    
+    public static String wrapFormatCodes(final String string) {
+        final Matcher matcher2 = ClientLanguage.FORMAT_PATTERN.matcher(string);
+        final StringBuffer stringBuffer3 = new StringBuffer();
+        int integer4 = 1;
+        while (matcher2.find()) {
+            final String string2 = matcher2.group(1);
+            final String string3 = (string2 != null) ? string2 : Integer.toString(integer4++);
+            final String string4 = matcher2.group(2);
+            final String string5 = Matcher.quoteReplacement("\u2066%" + string3 + "$" + string4 + "\u2069");
+            matcher2.appendReplacement(stringBuffer3, string5);
+        }
+        matcher2.appendTail(stringBuffer3);
+        return stringBuffer3.toString();
+    }
+    
+    private String reorder(final String string) {
+        try {
+            final Bidi bidi3 = new Bidi(new ArabicShaping(8).shape(string), 127);
+            bidi3.setReorderingMode(0);
+            return bidi3.writeReordered(10);
+        }
+        catch (ArabicShapingException ex) {
+            return string;
+        }
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+        FORMAT_PATTERN = Pattern.compile("%(?:(\\d+)\\$)?([A-Za-z])");
+    }
+}
diff --git a/src/net/minecraft/client/resources/language/I18n.java b/src/net/minecraft/client/resources/language/I18n.java
index 5830e0d..759187d 100644
--- a/src/net/minecraft/client/resources/language/I18n.java
+++ b/src/net/minecraft/client/resources/language/I18n.java
@@ -1,17 +1,30 @@
 package net.minecraft.client.resources.language;
 
+import java.util.IllegalFormatException;
+import net.minecraft.locale.Language;
+
 public class I18n {
-    private static Locale locale;
+    private static volatile Language language;
     
-    static void setLocale(final Locale ebg) {
-        I18n.locale = ebg;
+    static void setLanguage(final Language kz) {
+        I18n.language = kz;
     }
     
     public static String get(final String string, final Object... arr) {
-        return I18n.locale.get(string, arr);
+        final String string2 = I18n.language.getOrDefault(string);
+        try {
+            return String.format(string2, arr);
+        }
+        catch (IllegalFormatException illegalFormatException4) {
+            return "Format error: " + string2;
+        }
     }
     
     public static boolean exists(final String string) {
-        return I18n.locale.has(string);
+        return I18n.language.has(string);
+    }
+    
+    static {
+        I18n.language = Language.getInstance();
     }
 }
diff --git a/src/net/minecraft/client/resources/language/Language.java b/src/net/minecraft/client/resources/language/LanguageInfo.java
similarity index 67%
rename from src/net/minecraft/client/resources/language/Language.java
rename to src/net/minecraft/client/resources/language/LanguageInfo.java
index 6b72b7f..8d7bf46 100644
--- a/src/net/minecraft/client/resources/language/Language.java
+++ b/src/net/minecraft/client/resources/language/LanguageInfo.java
@@ -1,12 +1,14 @@
 package net.minecraft.client.resources.language;
 
-public class Language implements com.mojang.bridge.game.Language, Comparable<Language> {
+import com.mojang.bridge.game.Language;
+
+public class LanguageInfo implements Language, Comparable<LanguageInfo> {
     private final String code;
     private final String region;
     private final String name;
     private final boolean bidirectional;
     
-    public Language(final String string1, final String string2, final String string3, final boolean boolean4) {
+    public LanguageInfo(final String string1, final String string2, final String string3, final boolean boolean4) {
         this.code = string1;
         this.region = string2;
         this.name = string3;
@@ -36,7 +38,7 @@ public class Language implements com.mojang.bridge.game.Language, Comparable<Lan
     
     @Override
     public boolean equals(final Object object) {
-        return this == object || (object instanceof Language && this.code.equals(((Language)object).code));
+        return this == object || (object instanceof LanguageInfo && this.code.equals(((LanguageInfo)object).code));
     }
     
     @Override
@@ -44,7 +46,7 @@ public class Language implements com.mojang.bridge.game.Language, Comparable<Lan
         return this.code.hashCode();
     }
     
-    public int compareTo(final Language ebe) {
-        return this.code.compareTo(ebe.code);
+    public int compareTo(final LanguageInfo emr) {
+        return this.code.compareTo(emr.code);
     }
 }
diff --git a/src/net/minecraft/client/resources/language/LanguageManager.java b/src/net/minecraft/client/resources/language/LanguageManager.java
index 2a8fae5..ff6bc82 100644
--- a/src/net/minecraft/client/resources/language/LanguageManager.java
+++ b/src/net/minecraft/client/resources/language/LanguageManager.java
@@ -3,86 +3,96 @@ package net.minecraft.client.resources.language;
 import org.apache.logging.log4j.LogManager;
 import com.google.common.collect.Sets;
 import java.util.SortedSet;
+import java.util.List;
+import net.minecraft.locale.Language;
 import com.google.common.collect.Lists;
 import net.minecraft.server.packs.resources.ResourceManager;
 import java.util.Iterator;
 import java.io.IOException;
 import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
 import net.minecraft.client.resources.metadata.language.LanguageMetadataSection;
-import net.minecraft.server.packs.Pack;
-import java.util.List;
 import com.google.common.collect.Maps;
+import net.minecraft.server.packs.PackResources;
+import java.util.stream.Stream;
+import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
 
 public class LanguageManager implements ResourceManagerReloadListener {
     private static final Logger LOGGER;
-    protected static final Locale LOCALE;
+    private static final LanguageInfo DEFAULT_LANGUAGE;
+    private Map<String, LanguageInfo> languages;
     private String currentCode;
-    private final Map<String, Language> languages;
+    private LanguageInfo currentLanguage;
     
     public LanguageManager(final String string) {
-        this.languages = Maps.newHashMap();
+        this.languages = ImmutableMap.<String, LanguageInfo>of("en_us", LanguageManager.DEFAULT_LANGUAGE);
+        this.currentLanguage = LanguageManager.DEFAULT_LANGUAGE;
         this.currentCode = string;
-        I18n.setLocale(LanguageManager.LOCALE);
     }
     
-    public void reload(final List<Pack> list) {
-        this.languages.clear();
-        for (final Pack ye4 : list) {
+    private static Map<String, LanguageInfo> extractLanguages(final Stream<PackResources> stream) {
+        final Map<String, LanguageInfo> map2 = Maps.newHashMap();
+        LanguageMetadataSection ena3;
+        final Iterator<LanguageInfo> iterator;
+        LanguageInfo emr5;
+        final Map<String, LanguageInfo> map3;
+        final Exception ex;
+        Exception exception3;
+        stream.forEach(aae -> {
             try {
-                final LanguageMetadataSection ebo5 = ye4.<LanguageMetadataSection>getMetadataSection((MetadataSectionSerializer<LanguageMetadataSection>)LanguageMetadataSection.SERIALIZER);
-                if (ebo5 == null) {
-                    continue;
-                }
-                for (final Language ebe7 : ebo5.getLanguages()) {
-                    if (!this.languages.containsKey(ebe7.getCode())) {
-                        this.languages.put(ebe7.getCode(), ebe7);
+                ena3 = aae.<LanguageMetadataSection>getMetadataSection((MetadataSectionSerializer<LanguageMetadataSection>)LanguageMetadataSection.SERIALIZER);
+                if (ena3 != null) {
+                    ena3.getLanguages().iterator();
+                    while (iterator.hasNext()) {
+                        emr5 = iterator.next();
+                        map3.putIfAbsent(emr5.getCode(), emr5);
                     }
                 }
             }
             catch (RuntimeException | IOException ex2) {
-                final Exception ex;
-                final Exception exception5 = ex;
-                LanguageManager.LOGGER.warn("Unable to parse language metadata section of resourcepack: {}", ye4.getName(), exception5);
+                exception3 = ex;
+                LanguageManager.LOGGER.warn("Unable to parse language metadata section of resourcepack: {}", aae.getName(), exception3);
             }
-        }
+            return;
+        });
+        return ImmutableMap.copyOf(map2);
     }
     
     @Override
-    public void onResourceManagerReload(final ResourceManager zb) {
-        final List<String> list3 = Lists.<String>newArrayList("en_us");
-        if (!"en_us".equals(this.currentCode)) {
-            list3.add(this.currentCode);
+    public void onResourceManagerReload(final ResourceManager abc) {
+        this.languages = extractLanguages(abc.listPacks());
+        final LanguageInfo emr3 = this.languages.getOrDefault("en_us", LanguageManager.DEFAULT_LANGUAGE);
+        this.currentLanguage = this.languages.getOrDefault(this.currentCode, emr3);
+        final List<LanguageInfo> list4 = Lists.<LanguageInfo>newArrayList(emr3);
+        if (this.currentLanguage != emr3) {
+            list4.add(this.currentLanguage);
         }
-        LanguageManager.LOCALE.loadFrom(zb, list3);
-        net.minecraft.locale.Language.forceData(LanguageManager.LOCALE.storage);
+        final ClientLanguage emp5 = ClientLanguage.loadFrom(abc, list4);
+        I18n.setLanguage(emp5);
+        Language.inject(emp5);
     }
     
-    public boolean isBidirectional() {
-        return this.getSelected() != null && this.getSelected().isBidirectional();
+    public void setSelected(final LanguageInfo emr) {
+        this.currentCode = emr.getCode();
+        this.currentLanguage = emr;
     }
     
-    public void setSelected(final Language ebe) {
-        this.currentCode = ebe.getCode();
+    public LanguageInfo getSelected() {
+        return this.currentLanguage;
     }
     
-    public Language getSelected() {
-        final String string2 = this.languages.containsKey(this.currentCode) ? this.currentCode : "en_us";
-        return this.languages.get(string2);
-    }
-    
-    public SortedSet<Language> getLanguages() {
+    public SortedSet<LanguageInfo> getLanguages() {
         return Sets.newTreeSet(this.languages.values());
     }
     
-    public Language getLanguage(final String string) {
+    public LanguageInfo getLanguage(final String string) {
         return this.languages.get(string);
     }
     
     static {
         LOGGER = LogManager.getLogger();
-        LOCALE = new Locale();
+        DEFAULT_LANGUAGE = new LanguageInfo("en_us", "US", "English", false);
     }
 }
diff --git a/src/net/minecraft/client/resources/language/Locale.java b/src/net/minecraft/client/resources/language/Locale.java
deleted file mode 100644
index 84905a4..0000000
--- a/src/net/minecraft/client/resources/language/Locale.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package net.minecraft.client.resources.language;
-
-import org.apache.logging.log4j.LogManager;
-import java.util.IllegalFormatException;
-import com.google.gson.JsonObject;
-import net.minecraft.util.GsonHelper;
-import java.io.Reader;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import com.google.gson.JsonElement;
-import java.io.InputStream;
-import org.apache.commons.io.IOUtils;
-import net.minecraft.server.packs.resources.Resource;
-import java.util.Iterator;
-import java.io.FileNotFoundException;
-import net.minecraft.resources.ResourceLocation;
-import java.util.List;
-import net.minecraft.server.packs.resources.ResourceManager;
-import com.google.common.collect.Maps;
-import java.util.Map;
-import java.util.regex.Pattern;
-import org.apache.logging.log4j.Logger;
-import com.google.gson.Gson;
-
-public class Locale {
-    private static final Gson GSON;
-    private static final Logger LOGGER;
-    private static final Pattern UNSUPPORTED_FORMAT_PATTERN;
-    protected final Map<String, String> storage;
-    
-    public Locale() {
-        this.storage = Maps.newHashMap();
-    }
-    
-    public synchronized void loadFrom(final ResourceManager zb, final List<String> list) {
-        this.storage.clear();
-        for (final String string5 : list) {
-            final String string6 = String.format("lang/%s.json", string5);
-            for (final String string7 : zb.getNamespaces()) {
-                try {
-                    final ResourceLocation sm9 = new ResourceLocation(string7, string6);
-                    this.appendFrom(zb.getResources(sm9));
-                }
-                catch (FileNotFoundException ex) {}
-                catch (Exception exception9) {
-                    Locale.LOGGER.warn("Skipped language file: {}:{} ({})", string7, string6, exception9.toString());
-                }
-            }
-        }
-    }
-    
-    private void appendFrom(final List<Resource> list) {
-        for (final Resource za4 : list) {
-            final InputStream inputStream5 = za4.getInputStream();
-            try {
-                this.appendFrom(inputStream5);
-            }
-            finally {
-                IOUtils.closeQuietly(inputStream5);
-            }
-        }
-    }
-    
-    private void appendFrom(final InputStream inputStream) {
-        final JsonElement jsonElement3 = Locale.GSON.<JsonElement>fromJson(new InputStreamReader(inputStream, StandardCharsets.UTF_8), JsonElement.class);
-        final JsonObject jsonObject4 = GsonHelper.convertToJsonObject(jsonElement3, "strings");
-        for (final Map.Entry<String, JsonElement> entry6 : jsonObject4.entrySet()) {
-            final String string7 = Locale.UNSUPPORTED_FORMAT_PATTERN.matcher(GsonHelper.convertToString(entry6.getValue(), entry6.getKey())).replaceAll("%$1s");
-            this.storage.put(entry6.getKey(), string7);
-        }
-    }
-    
-    private String getOrDefault(final String string) {
-        final String string2 = this.storage.get(string);
-        return (string2 == null) ? string : string2;
-    }
-    
-    public String get(final String string, final Object[] arr) {
-        final String string2 = this.getOrDefault(string);
-        try {
-            return String.format(string2, arr);
-        }
-        catch (IllegalFormatException illegalFormatException5) {
-            return "Format error: " + string2;
-        }
-    }
-    
-    public boolean has(final String string) {
-        return this.storage.containsKey(string);
-    }
-    
-    static {
-        GSON = new Gson();
-        LOGGER = LogManager.getLogger();
-        UNSUPPORTED_FORMAT_PATTERN = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]");
-    }
-}
diff --git a/src/net/minecraft/client/resources/metadata/animation/AnimationMetadataSection.java b/src/net/minecraft/client/resources/metadata/animation/AnimationMetadataSection.java
index fc2c65f..db0c735 100644
--- a/src/net/minecraft/client/resources/metadata/animation/AnimationMetadataSection.java
+++ b/src/net/minecraft/client/resources/metadata/animation/AnimationMetadataSection.java
@@ -79,11 +79,11 @@ public class AnimationMetadataSection {
     }
     
     public int getFrameTime(final int integer) {
-        final AnimationFrame ebi3 = this.getFrame(integer);
-        if (ebi3.isTimeUnknown()) {
+        final AnimationFrame emu3 = this.getFrame(integer);
+        if (emu3.isTimeUnknown()) {
             return this.defaultFrameTime;
         }
-        return ebi3.getTime();
+        return emu3.getTime();
     }
     
     public int getFrameIndex(final int integer) {
@@ -92,8 +92,8 @@ public class AnimationMetadataSection {
     
     public Set<Integer> getUniqueFrameIndices() {
         final Set<Integer> set2 = Sets.newHashSet();
-        for (final AnimationFrame ebi4 : this.frames) {
-            set2.add(ebi4.getIndex());
+        for (final AnimationFrame emu4 : this.frames) {
+            set2.add(emu4.getIndex());
         }
         return set2;
     }
diff --git a/src/net/minecraft/client/resources/metadata/animation/AnimationMetadataSectionSerializer.java b/src/net/minecraft/client/resources/metadata/animation/AnimationMetadataSectionSerializer.java
index 671fbb0..b43fa7e 100644
--- a/src/net/minecraft/client/resources/metadata/animation/AnimationMetadataSectionSerializer.java
+++ b/src/net/minecraft/client/resources/metadata/animation/AnimationMetadataSectionSerializer.java
@@ -23,9 +23,9 @@ public class AnimationMetadataSectionSerializer implements MetadataSectionSerial
                 final JsonArray jsonArray5 = GsonHelper.getAsJsonArray(jsonObject, "frames");
                 for (int integer5 = 0; integer5 < jsonArray5.size(); ++integer5) {
                     final JsonElement jsonElement7 = jsonArray5.get(integer5);
-                    final AnimationFrame ebi8 = this.getFrame(integer5, jsonElement7);
-                    if (ebi8 != null) {
-                        list3.add(ebi8);
+                    final AnimationFrame emu8 = this.getFrame(integer5, jsonElement7);
+                    if (emu8 != null) {
+                        list3.add(emu8);
                     }
                 }
             }
diff --git a/src/net/minecraft/client/resources/metadata/language/LanguageMetadataSection.java b/src/net/minecraft/client/resources/metadata/language/LanguageMetadataSection.java
index 4c37e1c..437877c 100644
--- a/src/net/minecraft/client/resources/metadata/language/LanguageMetadataSection.java
+++ b/src/net/minecraft/client/resources/metadata/language/LanguageMetadataSection.java
@@ -1,17 +1,17 @@
 package net.minecraft.client.resources.metadata.language;
 
-import net.minecraft.client.resources.language.Language;
+import net.minecraft.client.resources.language.LanguageInfo;
 import java.util.Collection;
 
 public class LanguageMetadataSection {
     public static final LanguageMetadataSectionSerializer SERIALIZER;
-    private final Collection<Language> languages;
+    private final Collection<LanguageInfo> languages;
     
-    public LanguageMetadataSection(final Collection<Language> collection) {
+    public LanguageMetadataSection(final Collection<LanguageInfo> collection) {
         this.languages = collection;
     }
     
-    public Collection<Language> getLanguages() {
+    public Collection<LanguageInfo> getLanguages() {
         return this.languages;
     }
     
diff --git a/src/net/minecraft/client/resources/metadata/language/LanguageMetadataSectionSerializer.java b/src/net/minecraft/client/resources/metadata/language/LanguageMetadataSectionSerializer.java
index 9595f6d..2a85606 100644
--- a/src/net/minecraft/client/resources/metadata/language/LanguageMetadataSectionSerializer.java
+++ b/src/net/minecraft/client/resources/metadata/language/LanguageMetadataSectionSerializer.java
@@ -3,7 +3,7 @@ package net.minecraft.client.resources.metadata.language;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Collection;
-import net.minecraft.client.resources.language.Language;
+import net.minecraft.client.resources.language.LanguageInfo;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonElement;
@@ -15,7 +15,7 @@ import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
 public class LanguageMetadataSectionSerializer implements MetadataSectionSerializer<LanguageMetadataSection> {
     @Override
     public LanguageMetadataSection fromJson(final JsonObject jsonObject) {
-        final Set<Language> set3 = Sets.newHashSet();
+        final Set<LanguageInfo> set3 = Sets.newHashSet();
         for (final Map.Entry<String, JsonElement> entry5 : jsonObject.entrySet()) {
             final String string6 = entry5.getKey();
             if (string6.length() > 16) {
@@ -31,7 +31,7 @@ public class LanguageMetadataSectionSerializer implements MetadataSectionSeriali
             if (string8.isEmpty()) {
                 throw new JsonParseException("Invalid language->'" + string6 + "'->name: empty value");
             }
-            if (!set3.add(new Language(string6, string7, string8, boolean10))) {
+            if (!set3.add(new LanguageInfo(string6, string7, string8, boolean10))) {
                 throw new JsonParseException("Duplicate language->'" + string6 + "' defined");
             }
         }
diff --git a/src/net/minecraft/client/resources/model/BakedModel.java b/src/net/minecraft/client/resources/model/BakedModel.java
index 73cafef..e34c9ef 100644
--- a/src/net/minecraft/client/resources/model/BakedModel.java
+++ b/src/net/minecraft/client/resources/model/BakedModel.java
@@ -11,7 +11,7 @@ import javax.annotation.Nullable;
 import net.minecraft.world.level.block.state.BlockState;
 
 public interface BakedModel {
-    List<BakedQuad> getQuads(@Nullable final BlockState byj, @Nullable final Direction fp, final Random random);
+    List<BakedQuad> getQuads(@Nullable final BlockState cfj, @Nullable final Direction fz, final Random random);
     
     boolean useAmbientOcclusion();
     
diff --git a/src/net/minecraft/client/resources/model/BlockModelRotation.java b/src/net/minecraft/client/resources/model/BlockModelRotation.java
index 6482a23..660f64c 100644
--- a/src/net/minecraft/client/resources/model/BlockModelRotation.java
+++ b/src/net/minecraft/client/resources/model/BlockModelRotation.java
@@ -2,10 +2,11 @@ package net.minecraft.client.resources.model;
 
 import java.util.stream.Collectors;
 import java.util.Arrays;
-import com.mojang.math.Transformation;
 import net.minecraft.util.Mth;
-import com.mojang.math.Vector3f;
 import com.mojang.math.Quaternion;
+import com.mojang.math.Vector3f;
+import com.mojang.math.OctahedralGroup;
+import com.mojang.math.Transformation;
 import java.util.Map;
 
 public enum BlockModelRotation implements ModelState {
@@ -27,10 +28,9 @@ public enum BlockModelRotation implements ModelState {
     X270_Y270(270, 270);
     
     private static final Map<Integer, BlockModelRotation> BY_INDEX;
+    private final Transformation transformation;
+    private final OctahedralGroup actualRotation;
     private final int index;
-    private final Quaternion rotation;
-    private final int xSteps;
-    private final int ySteps;
     
     private static int getIndex(final int integer1, final int integer2) {
         return integer1 * 360 + integer2;
@@ -38,16 +38,22 @@ public enum BlockModelRotation implements ModelState {
     
     private BlockModelRotation(final int integer3, final int integer4) {
         this.index = getIndex(integer3, integer4);
-        final Quaternion c6 = new Quaternion(new Vector3f(0.0f, 1.0f, 0.0f), (float)(-integer4), true);
-        c6.mul(new Quaternion(new Vector3f(1.0f, 0.0f, 0.0f), (float)(-integer3), true));
-        this.rotation = c6;
-        this.xSteps = Mth.abs(integer3 / 90);
-        this.ySteps = Mth.abs(integer4 / 90);
+        final Quaternion d6 = new Quaternion(new Vector3f(0.0f, 1.0f, 0.0f), (float)(-integer4), true);
+        d6.mul(new Quaternion(new Vector3f(1.0f, 0.0f, 0.0f), (float)(-integer3), true));
+        OctahedralGroup c7 = OctahedralGroup.IDENTITY;
+        for (int integer5 = 0; integer5 < integer4; integer5 += 90) {
+            c7 = c7.compose(OctahedralGroup.ROT_90_Y_NEG);
+        }
+        for (int integer5 = 0; integer5 < integer3; integer5 += 90) {
+            c7 = c7.compose(OctahedralGroup.ROT_90_X_NEG);
+        }
+        this.transformation = new Transformation(null, d6, null, null);
+        this.actualRotation = c7;
     }
     
     @Override
     public Transformation getRotation() {
-        return new Transformation(null, this.rotation, null, null);
+        return this.transformation;
     }
     
     public static BlockModelRotation by(final int integer1, final int integer2) {
@@ -55,6 +61,6 @@ public enum BlockModelRotation implements ModelState {
     }
     
     static {
-        BY_INDEX = Arrays.<BlockModelRotation>stream(values()).collect(Collectors.toMap(ebw -> ebw.index, ebw -> ebw));
+        BY_INDEX = Arrays.<BlockModelRotation>stream(values()).collect(Collectors.toMap(eni -> eni.index, eni -> eni));
     }
 }
diff --git a/src/net/minecraft/client/resources/model/BuiltInModel.java b/src/net/minecraft/client/resources/model/BuiltInModel.java
index f6b2da1..4defaad 100644
--- a/src/net/minecraft/client/resources/model/BuiltInModel.java
+++ b/src/net/minecraft/client/resources/model/BuiltInModel.java
@@ -17,15 +17,15 @@ public class BuiltInModel implements BakedModel {
     private final TextureAtlasSprite particleTexture;
     private final boolean usesBlockLight;
     
-    public BuiltInModel(final ItemTransforms drz, final ItemOverrides drx, final TextureAtlasSprite eaj, final boolean boolean4) {
-        this.itemTransforms = drz;
-        this.overrides = drx;
-        this.particleTexture = eaj;
+    public BuiltInModel(final ItemTransforms edf, final ItemOverrides edd, final TextureAtlasSprite elv, final boolean boolean4) {
+        this.itemTransforms = edf;
+        this.overrides = edd;
+        this.particleTexture = elv;
         this.usesBlockLight = boolean4;
     }
     
     @Override
-    public List<BakedQuad> getQuads(@Nullable final BlockState byj, @Nullable final Direction fp, final Random random) {
+    public List<BakedQuad> getQuads(@Nullable final BlockState cfj, @Nullable final Direction fz, final Random random) {
         return Collections.<BakedQuad>emptyList();
     }
     
diff --git a/src/net/minecraft/client/resources/model/Material.java b/src/net/minecraft/client/resources/model/Material.java
index 58231c8..83d4769 100644
--- a/src/net/minecraft/client/resources/model/Material.java
+++ b/src/net/minecraft/client/resources/model/Material.java
@@ -1,6 +1,7 @@
 package net.minecraft.client.resources.model;
 
 import java.util.Objects;
+import net.minecraft.client.renderer.entity.ItemRenderer;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import java.util.function.Function;
@@ -16,9 +17,9 @@ public class Material {
     @Nullable
     private RenderType renderType;
     
-    public Material(final ResourceLocation sm1, final ResourceLocation sm2) {
-        this.atlasLocation = sm1;
-        this.texture = sm2;
+    public Material(final ResourceLocation uh1, final ResourceLocation uh2) {
+        this.atlasLocation = uh1;
+        this.texture = uh2;
     }
     
     public ResourceLocation atlasLocation() {
@@ -40,8 +41,12 @@ public class Material {
         return this.renderType;
     }
     
-    public VertexConsumer buffer(final MultiBufferSource dqt, final Function<ResourceLocation, RenderType> function) {
-        return this.sprite().wrap(dqt.getBuffer(this.renderType(function)));
+    public VertexConsumer buffer(final MultiBufferSource ebz, final Function<ResourceLocation, RenderType> function) {
+        return this.sprite().wrap(ebz.getBuffer(this.renderType(function)));
+    }
+    
+    public VertexConsumer buffer(final MultiBufferSource ebz, final Function<ResourceLocation, RenderType> function, final boolean boolean3) {
+        return this.sprite().wrap(ItemRenderer.getFoilBufferDirect(ebz, this.renderType(function), true, boolean3));
     }
     
     @Override
@@ -52,8 +57,8 @@ public class Material {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final Material eby3 = (Material)object;
-        return this.atlasLocation.equals(eby3.atlasLocation) && this.texture.equals(eby3.texture);
+        final Material enk3 = (Material)object;
+        return this.atlasLocation.equals(enk3.atlasLocation) && this.texture.equals(enk3.texture);
     }
     
     @Override
diff --git a/src/net/minecraft/client/resources/model/ModelBakery.java b/src/net/minecraft/client/resources/model/ModelBakery.java
index 19780e3..7a182f4 100644
--- a/src/net/minecraft/client/resources/model/ModelBakery.java
+++ b/src/net/minecraft/client/resources/model/ModelBakery.java
@@ -104,7 +104,7 @@ public class ModelBakery {
     private int nextModelGroup;
     private final Object2IntMap<BlockState> modelGroups;
     
-    public ModelBakery(final ResourceManager zb, final BlockColors dcb, final ProfilerFiller aio, final int integer) {
+    public ModelBakery(final ResourceManager abc, final BlockColors dmn, final ProfilerFiller ami, final int integer) {
         this.loadingStack = Sets.newHashSet();
         this.context = new BlockModelDefinition.Context();
         this.unbakedCache = Maps.newHashMap();
@@ -113,9 +113,9 @@ public class ModelBakery {
         this.bakedTopLevelModels = Maps.newHashMap();
         this.nextModelGroup = 1;
         this.modelGroups = Util.make((Object2IntMap)new Object2IntOpenHashMap(), object2IntOpenHashMap -> object2IntOpenHashMap.defaultReturnValue(-1));
-        this.resourceManager = zb;
-        this.blockColors = dcb;
-        aio.push("missing_model");
+        this.resourceManager = abc;
+        this.blockColors = dmn;
+        ami.push("missing_model");
         try {
             this.unbakedCache.put(ModelBakery.MISSING_MODEL_LOCATION, this.loadBlockModel(ModelBakery.MISSING_MODEL_LOCATION));
             this.loadTopLevel(ModelBakery.MISSING_MODEL_LOCATION);
@@ -124,78 +124,78 @@ public class ModelBakery {
             ModelBakery.LOGGER.error("Error loading missing model, should never happen :(", (Throwable)iOException6);
             throw new RuntimeException(iOException6);
         }
-        aio.popPush("static_definitions");
-        ModelBakery.STATIC_DEFINITIONS.forEach((sm, byk) -> byk.getPossibleStates().forEach(byj -> this.loadTopLevel(BlockModelShaper.stateToModelLocation(sm, byj))));
-        aio.popPush("blocks");
-        for (final Block bph7 : Registry.BLOCK) {
-            bph7.getStateDefinition().getPossibleStates().forEach(byj -> this.loadTopLevel(BlockModelShaper.stateToModelLocation(byj)));
+        ami.popPush("static_definitions");
+        ModelBakery.STATIC_DEFINITIONS.forEach((uh, cfk) -> cfk.getPossibleStates().forEach(cfj -> this.loadTopLevel(BlockModelShaper.stateToModelLocation(uh, cfj))));
+        ami.popPush("blocks");
+        for (final Block bvr7 : Registry.BLOCK) {
+            bvr7.getStateDefinition().getPossibleStates().forEach(cfj -> this.loadTopLevel(BlockModelShaper.stateToModelLocation(cfj)));
         }
-        aio.popPush("items");
-        for (final ResourceLocation sm2 : Registry.ITEM.keySet()) {
-            this.loadTopLevel(new ModelResourceLocation(sm2, "inventory"));
+        ami.popPush("items");
+        for (final ResourceLocation uh2 : Registry.ITEM.keySet()) {
+            this.loadTopLevel(new ModelResourceLocation(uh2, "inventory"));
         }
-        aio.popPush("special");
+        ami.popPush("special");
         this.loadTopLevel(new ModelResourceLocation("minecraft:trident_in_hand#inventory"));
-        aio.popPush("textures");
+        ami.popPush("textures");
         final Set<Pair<String, String>> set6 = Sets.newLinkedHashSet();
-        final Set<Material> set7 = this.topLevelModels.values().stream().flatMap(ecf -> ecf.getMaterials(this::getModel, set6).stream()).collect(Collectors.toSet());
+        final Set<Material> set7 = this.topLevelModels.values().stream().flatMap(enr -> enr.getMaterials(this::getModel, set6).stream()).collect(Collectors.toSet());
         set7.addAll(ModelBakery.UNREFERENCED_TEXTURES);
         set6.stream().filter(pair -> !((String)pair.getSecond()).equals(ModelBakery.MISSING_MODEL_LOCATION_STRING)).forEach(pair -> ModelBakery.LOGGER.warn("Unable to resolve texture reference: {} in {}", pair.getFirst(), pair.getSecond()));
         final Map<ResourceLocation, List<Material>> map8 = set7.stream().collect(Collectors.groupingBy(Material::atlasLocation));
-        aio.popPush("stitching");
+        ami.popPush("stitching");
         this.atlasPreparations = Maps.newHashMap();
         for (final Map.Entry<ResourceLocation, List<Material>> entry10 : map8.entrySet()) {
-            final TextureAtlas eai11 = new TextureAtlas(entry10.getKey());
-            final TextureAtlas.Preparations a12 = eai11.prepareToStitch(this.resourceManager, entry10.getValue().stream().<ResourceLocation>map(Material::texture), aio, integer);
-            this.atlasPreparations.put(entry10.getKey(), (Pair<TextureAtlas, TextureAtlas.Preparations>)Pair.of(eai11, a12));
+            final TextureAtlas elu11 = new TextureAtlas(entry10.getKey());
+            final TextureAtlas.Preparations a12 = elu11.prepareToStitch(this.resourceManager, entry10.getValue().stream().<ResourceLocation>map(Material::texture), ami, integer);
+            this.atlasPreparations.put(entry10.getKey(), (Pair<TextureAtlas, TextureAtlas.Preparations>)Pair.of(elu11, a12));
         }
-        aio.pop();
+        ami.pop();
     }
     
-    public AtlasSet uploadTextures(final TextureManager eak, final ProfilerFiller aio) {
-        aio.push("atlas");
+    public AtlasSet uploadTextures(final TextureManager elw, final ProfilerFiller ami) {
+        ami.push("atlas");
         for (final Pair<TextureAtlas, TextureAtlas.Preparations> pair5 : this.atlasPreparations.values()) {
-            final TextureAtlas eai6 = (TextureAtlas)pair5.getFirst();
+            final TextureAtlas elu6 = (TextureAtlas)pair5.getFirst();
             final TextureAtlas.Preparations a7 = (TextureAtlas.Preparations)pair5.getSecond();
-            eai6.reload(a7);
-            eak.register(eai6.location(), eai6);
-            eak.bind(eai6.location());
-            eai6.updateFilter(a7);
+            elu6.reload(a7);
+            elw.register(elu6.location(), elu6);
+            elw.bind(elu6.location());
+            elu6.updateFilter(a7);
         }
         this.atlasSet = new AtlasSet(this.atlasPreparations.values().stream().map(Pair::getFirst).collect(Collectors.toList()));
-        aio.popPush("baking");
-        BakedModel ebv3;
-        this.topLevelModels.keySet().forEach(sm -> {
-            ebv3 = null;
+        ami.popPush("baking");
+        BakedModel enh3;
+        this.topLevelModels.keySet().forEach(uh -> {
+            enh3 = null;
             try {
-                ebv3 = this.bake(sm, BlockModelRotation.X0_Y0);
+                enh3 = this.bake(uh, BlockModelRotation.X0_Y0);
             }
             catch (Exception exception4) {
-                ModelBakery.LOGGER.warn("Unable to bake model: '{}': {}", sm, exception4);
+                ModelBakery.LOGGER.warn("Unable to bake model: '{}': {}", uh, exception4);
             }
-            if (ebv3 != null) {
-                this.bakedTopLevelModels.put(sm, ebv3);
+            if (enh3 != null) {
+                this.bakedTopLevelModels.put(uh, enh3);
             }
             return;
         });
-        aio.pop();
+        ami.pop();
         return this.atlasSet;
     }
     
-    private static Predicate<BlockState> predicate(final StateDefinition<Block, BlockState> byk, final String string) {
+    private static Predicate<BlockState> predicate(final StateDefinition<Block, BlockState> cfk, final String string) {
         final Map<Property<?>, Comparable<?>> map3 = Maps.newHashMap();
         for (final String string2 : ModelBakery.COMMA_SPLITTER.split(string)) {
             final Iterator<String> iterator6 = ModelBakery.EQUAL_SPLITTER.split(string2).iterator();
             if (iterator6.hasNext()) {
                 final String string3 = iterator6.next();
-                final Property<?> bzm8 = byk.getProperty(string3);
-                if (bzm8 != null && iterator6.hasNext()) {
+                final Property<?> cgl8 = cfk.getProperty(string3);
+                if (cgl8 != null && iterator6.hasNext()) {
                     final String string4 = iterator6.next();
-                    final Comparable<?> comparable10 = ModelBakery.<Comparable<?>>getValueHelper(bzm8, string4);
+                    final Comparable<?> comparable10 = ModelBakery.<Comparable<?>>getValueHelper(cgl8, string4);
                     if (comparable10 == null) {
-                        throw new RuntimeException("Unknown value: '" + string4 + "' for blockstate property: '" + string3 + "' " + bzm8.getPossibleValues());
+                        throw new RuntimeException("Unknown value: '" + string4 + "' for blockstate property: '" + string3 + "' " + cgl8.getPossibleValues());
                     }
-                    map3.put(bzm8, comparable10);
+                    map3.put(cgl8, comparable10);
                 }
                 else {
                     if (!string3.isEmpty()) {
@@ -205,20 +205,20 @@ public class ModelBakery {
                 }
             }
         }
-        final Block bph4 = byk.getOwner();
+        final Block bvr4 = cfk.getOwner();
         final Block block;
         final Map<Property<?>, Comparable<?>> map4;
         final Iterator<Map.Entry<Property<?>, Comparable<?>>> iterator8;
         Map.Entry<Property<?>, Comparable<?>> entry5;
-        return byj -> {
-            if (byj == null || block != byj.getBlock()) {
+        return cfj -> {
+            if (cfj == null || block != cfj.getBlock()) {
                 return false;
             }
             else {
                 map4.entrySet().iterator();
                 while (iterator8.hasNext()) {
                     entry5 = iterator8.next();
-                    if (!Objects.equals(byj.getValue(entry5.getKey()), entry5.getValue())) {
+                    if (!Objects.equals(cfj.getValue(entry5.getKey()), entry5.getValue())) {
                         return false;
                     }
                 }
@@ -228,42 +228,42 @@ public class ModelBakery {
     }
     
     @Nullable
-    static <T extends Comparable<T>> T getValueHelper(final Property<T> bzm, final String string) {
-        return bzm.getValue(string).orElse(null);
+    static <T extends Comparable<T>> T getValueHelper(final Property<T> cgl, final String string) {
+        return cgl.getValue(string).orElse(null);
     }
     
-    public UnbakedModel getModel(final ResourceLocation sm) {
-        if (this.unbakedCache.containsKey(sm)) {
-            return this.unbakedCache.get(sm);
+    public UnbakedModel getModel(final ResourceLocation uh) {
+        if (this.unbakedCache.containsKey(uh)) {
+            return this.unbakedCache.get(uh);
         }
-        if (this.loadingStack.contains(sm)) {
-            throw new IllegalStateException("Circular reference while loading " + sm);
+        if (this.loadingStack.contains(uh)) {
+            throw new IllegalStateException("Circular reference while loading " + uh);
         }
-        this.loadingStack.add(sm);
-        final UnbakedModel ecf3 = this.unbakedCache.get(ModelBakery.MISSING_MODEL_LOCATION);
+        this.loadingStack.add(uh);
+        final UnbakedModel enr3 = this.unbakedCache.get(ModelBakery.MISSING_MODEL_LOCATION);
         while (!this.loadingStack.isEmpty()) {
-            final ResourceLocation sm2 = this.loadingStack.iterator().next();
+            final ResourceLocation uh2 = this.loadingStack.iterator().next();
             try {
-                if (!this.unbakedCache.containsKey(sm2)) {
-                    this.loadModel(sm2);
+                if (!this.unbakedCache.containsKey(uh2)) {
+                    this.loadModel(uh2);
                 }
             }
             catch (BlockStateDefinitionException a5) {
                 ModelBakery.LOGGER.warn(a5.getMessage());
-                this.unbakedCache.put(sm2, ecf3);
+                this.unbakedCache.put(uh2, enr3);
             }
             catch (Exception exception5) {
-                ModelBakery.LOGGER.warn("Unable to load model: '{}' referenced from: {}: {}", sm2, sm, exception5);
-                this.unbakedCache.put(sm2, ecf3);
+                ModelBakery.LOGGER.warn("Unable to load model: '{}' referenced from: {}: {}", uh2, uh, exception5);
+                this.unbakedCache.put(uh2, enr3);
             }
             finally {
-                this.loadingStack.remove(sm2);
+                this.loadingStack.remove(uh2);
             }
         }
-        return this.unbakedCache.getOrDefault(sm, ecf3);
+        return this.unbakedCache.getOrDefault(uh, enr3);
     }
     
-    private void loadModel(final ResourceLocation sm) throws Exception {
+    private void loadModel(final ResourceLocation uh) throws Exception {
         // 
         // This method could not be decompiled.
         // 
@@ -272,129 +272,129 @@ public class ModelBakery {
         //     1: instanceof      Lnet/minecraft/client/resources/model/ModelResourceLocation;
         //     4: ifne            18
         //     7: aload_0         /* this */
-        //     8: aload_1         /* sm */
+        //     8: aload_1         /* uh */
         //     9: aload_0         /* this */
-        //    10: aload_1         /* sm */
+        //    10: aload_1         /* uh */
         //    11: invokespecial   net/minecraft/client/resources/model/ModelBakery.loadBlockModel:(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/block/model/BlockModel;
         //    14: invokespecial   net/minecraft/client/resources/model/ModelBakery.cacheAndQueueDependencies:(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/resources/model/UnbakedModel;)V
         //    17: return         
-        //    18: aload_1         /* sm */
+        //    18: aload_1         /* uh */
         //    19: checkcast       Lnet/minecraft/client/resources/model/ModelResourceLocation;
-        //    22: astore_2        /* ecb3 */
-        //    23: aload_2         /* ecb3 */
+        //    22: astore_2        /* enn3 */
+        //    23: aload_2         /* enn3 */
         //    24: invokevirtual   net/minecraft/client/resources/model/ModelResourceLocation.getVariant:()Ljava/lang/String;
         //    27: ldc_w           "inventory"
         //    30: invokestatic    java/util/Objects.equals:(Ljava/lang/Object;Ljava/lang/Object;)Z
         //    33: ifeq            101
         //    36: new             Lnet/minecraft/resources/ResourceLocation;
         //    39: dup            
-        //    40: aload_1         /* sm */
+        //    40: aload_1         /* uh */
         //    41: invokevirtual   net/minecraft/resources/ResourceLocation.getNamespace:()Ljava/lang/String;
         //    44: new             Ljava/lang/StringBuilder;
         //    47: dup            
         //    48: invokespecial   java/lang/StringBuilder.<init>:()V
         //    51: ldc_w           "item/"
         //    54: invokevirtual   java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
-        //    57: aload_1         /* sm */
+        //    57: aload_1         /* uh */
         //    58: invokevirtual   net/minecraft/resources/ResourceLocation.getPath:()Ljava/lang/String;
         //    61: invokevirtual   java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
         //    64: invokevirtual   java/lang/StringBuilder.toString:()Ljava/lang/String;
         //    67: invokespecial   net/minecraft/resources/ResourceLocation.<init>:(Ljava/lang/String;Ljava/lang/String;)V
-        //    70: astore_3        /* sm4 */
+        //    70: astore_3        /* uh4 */
         //    71: aload_0         /* this */
-        //    72: aload_3         /* sm4 */
+        //    72: aload_3         /* uh4 */
         //    73: invokespecial   net/minecraft/client/resources/model/ModelBakery.loadBlockModel:(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/block/model/BlockModel;
-        //    76: astore          drs5
+        //    76: astore          ecy5
         //    78: aload_0         /* this */
-        //    79: aload_2         /* ecb3 */
-        //    80: aload           drs5
+        //    79: aload_2         /* enn3 */
+        //    80: aload           ecy5
         //    82: invokespecial   net/minecraft/client/resources/model/ModelBakery.cacheAndQueueDependencies:(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/resources/model/UnbakedModel;)V
         //    85: aload_0         /* this */
         //    86: getfield        net/minecraft/client/resources/model/ModelBakery.unbakedCache:Ljava/util/Map;
-        //    89: aload_3         /* sm4 */
-        //    90: aload           drs5
+        //    89: aload_3         /* uh4 */
+        //    90: aload           ecy5
         //    92: invokeinterface java/util/Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
         //    97: pop            
         //    98: goto            641
         //   101: new             Lnet/minecraft/resources/ResourceLocation;
         //   104: dup            
-        //   105: aload_1         /* sm */
+        //   105: aload_1         /* uh */
         //   106: invokevirtual   net/minecraft/resources/ResourceLocation.getNamespace:()Ljava/lang/String;
-        //   109: aload_1         /* sm */
+        //   109: aload_1         /* uh */
         //   110: invokevirtual   net/minecraft/resources/ResourceLocation.getPath:()Ljava/lang/String;
         //   113: invokespecial   net/minecraft/resources/ResourceLocation.<init>:(Ljava/lang/String;Ljava/lang/String;)V
-        //   116: astore_3        /* sm4 */
+        //   116: astore_3        /* uh4 */
         //   117: getstatic       net/minecraft/client/resources/model/ModelBakery.STATIC_DEFINITIONS:Ljava/util/Map;
-        //   120: aload_3         /* sm4 */
+        //   120: aload_3         /* uh4 */
         //   121: invokeinterface java/util/Map.get:(Ljava/lang/Object;)Ljava/lang/Object;
         //   126: invokestatic    java/util/Optional.ofNullable:(Ljava/lang/Object;)Ljava/util/Optional;
-        //   129: aload_3         /* sm4 */
+        //   129: aload_3         /* uh4 */
         //   130: invokedynamic   BootstrapMethod #11, get:(Lnet/minecraft/resources/ResourceLocation;)Ljava/util/function/Supplier;
         //   135: invokevirtual   java/util/Optional.orElseGet:(Ljava/util/function/Supplier;)Ljava/lang/Object;
         //   138: checkcast       Lnet/minecraft/world/level/block/state/StateDefinition;
-        //   141: astore          byk5
+        //   141: astore          cfk5
         //   143: aload_0         /* this */
         //   144: getfield        net/minecraft/client/resources/model/ModelBakery.context:Lnet/minecraft/client/renderer/block/model/BlockModelDefinition$Context;
-        //   147: aload           byk5
+        //   147: aload           cfk5
         //   149: invokevirtual   net/minecraft/client/renderer/block/model/BlockModelDefinition$Context.setDefinition:(Lnet/minecraft/world/level/block/state/StateDefinition;)V
         //   152: aload_0         /* this */
         //   153: getfield        net/minecraft/client/resources/model/ModelBakery.blockColors:Lnet/minecraft/client/color/block/BlockColors;
-        //   156: aload           byk5
+        //   156: aload           cfk5
         //   158: invokevirtual   net/minecraft/world/level/block/state/StateDefinition.getOwner:()Ljava/lang/Object;
         //   161: checkcast       Lnet/minecraft/world/level/block/Block;
         //   164: invokevirtual   net/minecraft/client/color/block/BlockColors.getColoringProperties:(Lnet/minecraft/world/level/block/Block;)Ljava/util/Set;
         //   167: invokestatic    com/google/common/collect/ImmutableList.copyOf:(Ljava/util/Collection;)Lcom/google/common/collect/ImmutableList;
         //   170: astore          list6
-        //   172: aload           byk5
+        //   172: aload           cfk5
         //   174: invokevirtual   net/minecraft/world/level/block/state/StateDefinition.getPossibleStates:()Lcom/google/common/collect/ImmutableList;
         //   177: astore          immutableList7
         //   179: invokestatic    com/google/common/collect/Maps.newHashMap:()Ljava/util/HashMap;
         //   182: astore          map8
         //   184: aload           immutableList7
         //   186: aload           map8
-        //   188: aload_3         /* sm4 */
+        //   188: aload_3         /* uh4 */
         //   189: invokedynamic   BootstrapMethod #12, accept:(Ljava/util/Map;Lnet/minecraft/resources/ResourceLocation;)Ljava/util/function/Consumer;
         //   194: invokevirtual   com/google/common/collect/ImmutableList.forEach:(Ljava/util/function/Consumer;)V
         //   197: invokestatic    com/google/common/collect/Maps.newHashMap:()Ljava/util/HashMap;
         //   200: astore          map9
         //   202: new             Lnet/minecraft/resources/ResourceLocation;
         //   205: dup            
-        //   206: aload_1         /* sm */
+        //   206: aload_1         /* uh */
         //   207: invokevirtual   net/minecraft/resources/ResourceLocation.getNamespace:()Ljava/lang/String;
         //   210: new             Ljava/lang/StringBuilder;
         //   213: dup            
         //   214: invokespecial   java/lang/StringBuilder.<init>:()V
         //   217: ldc_w           "blockstates/"
         //   220: invokevirtual   java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
-        //   223: aload_1         /* sm */
+        //   223: aload_1         /* uh */
         //   224: invokevirtual   net/minecraft/resources/ResourceLocation.getPath:()Ljava/lang/String;
         //   227: invokevirtual   java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
         //   230: ldc_w           ".json"
         //   233: invokevirtual   java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
         //   236: invokevirtual   java/lang/StringBuilder.toString:()Ljava/lang/String;
         //   239: invokespecial   net/minecraft/resources/ResourceLocation.<init>:(Ljava/lang/String;Ljava/lang/String;)V
-        //   242: astore          sm10
+        //   242: astore          uh10
         //   244: aload_0         /* this */
         //   245: getfield        net/minecraft/client/resources/model/ModelBakery.unbakedCache:Ljava/util/Map;
         //   248: getstatic       net/minecraft/client/resources/model/ModelBakery.MISSING_MODEL_LOCATION:Lnet/minecraft/client/resources/model/ModelResourceLocation;
         //   251: invokeinterface java/util/Map.get:(Ljava/lang/Object;)Ljava/lang/Object;
         //   256: checkcast       Lnet/minecraft/client/resources/model/UnbakedModel;
-        //   259: astore          ecf11
+        //   259: astore          enr11
         //   261: new             Lnet/minecraft/client/resources/model/ModelBakery$ModelGroupKey;
         //   264: dup            
-        //   265: aload           ecf11
+        //   265: aload           enr11
         //   267: invokestatic    com/google/common/collect/ImmutableList.of:(Ljava/lang/Object;)Lcom/google/common/collect/ImmutableList;
         //   270: invokestatic    com/google/common/collect/ImmutableList.of:()Lcom/google/common/collect/ImmutableList;
         //   273: invokespecial   net/minecraft/client/resources/model/ModelBakery$ModelGroupKey.<init>:(Ljava/util/List;Ljava/util/List;)V
         //   276: astore          b12
-        //   278: aload           ecf11
+        //   278: aload           enr11
         //   280: aload           b12
         //   282: invokedynamic   BootstrapMethod #13, get:(Lnet/minecraft/client/resources/model/ModelBakery$ModelGroupKey;)Ljava/util/function/Supplier;
         //   287: invokestatic    com/mojang/datafixers/util/Pair.of:(Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Pair;
         //   290: astore          pair13
         //   292: aload_0         /* this */
         //   293: getfield        net/minecraft/client/resources/model/ModelBakery.resourceManager:Lnet/minecraft/server/packs/resources/ResourceManager;
-        //   296: aload           sm10
+        //   296: aload           uh10
         //   298: invokeinterface net/minecraft/server/packs/resources/ResourceManager.getResources:(Lnet/minecraft/resources/ResourceLocation;)Ljava/util/List;
         //   303: invokeinterface java/util/List.stream:()Ljava/util/stream/Stream;
         //   308: aload_0         /* this */
@@ -408,7 +408,7 @@ public class ModelBakery {
         //   335: astore          iOException15
         //   337: getstatic       net/minecraft/client/resources/model/ModelBakery.LOGGER:Lorg/apache/logging/log4j/Logger;
         //   340: ldc_w           "Exception loading blockstate definition: {}: {}"
-        //   343: aload           sm10
+        //   343: aload           uh10
         //   345: aload           iOException15
         //   347: invokeinterface org/apache/logging/log4j/Logger.warn:(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
         //   352: invokestatic    com/google/common/collect/Maps.newHashMap:()Ljava/util/HashMap;
@@ -416,7 +416,7 @@ public class ModelBakery {
         //   357: aload           map8
         //   359: aload_0         /* this */
         //   360: aload           map9
-        //   362: aload           sm10
+        //   362: aload           uh10
         //   364: aload           pair13
         //   366: aload           map16
         //   368: invokedynamic   BootstrapMethod #15, accept:(Lnet/minecraft/client/resources/model/ModelBakery;Ljava/util/Map;Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/datafixers/util/Pair;Ljava/util/Map;)Ljava/util/function/BiConsumer;
@@ -439,34 +439,34 @@ public class ModelBakery {
         //   423: aload           pair16
         //   425: invokevirtual   com/mojang/datafixers/util/Pair.getSecond:()Ljava/lang/Object;
         //   428: checkcast       Lnet/minecraft/client/renderer/block/model/BlockModelDefinition;
-        //   431: astore          drt17
+        //   431: astore          ecz17
         //   433: invokestatic    com/google/common/collect/Maps.newIdentityHashMap:()Ljava/util/IdentityHashMap;
         //   436: astore          map18
-        //   438: aload           drt17
+        //   438: aload           ecz17
         //   440: invokevirtual   net/minecraft/client/renderer/block/model/BlockModelDefinition.isMultiPart:()Z
         //   443: ifeq            472
-        //   446: aload           drt17
+        //   446: aload           ecz17
         //   448: invokevirtual   net/minecraft/client/renderer/block/model/BlockModelDefinition.getMultiPart:()Lnet/minecraft/client/renderer/block/model/multipart/MultiPart;
-        //   451: astore          dsf19
+        //   451: astore          edl19
         //   453: aload           immutableList7
         //   455: aload           map18
-        //   457: aload           dsf19
+        //   457: aload           edl19
         //   459: aload           list6
         //   461: invokedynamic   BootstrapMethod #17, accept:(Ljava/util/Map;Lnet/minecraft/client/renderer/block/model/multipart/MultiPart;Ljava/util/List;)Ljava/util/function/Consumer;
         //   466: invokevirtual   com/google/common/collect/ImmutableList.forEach:(Ljava/util/function/Consumer;)V
         //   469: goto            475
         //   472: aconst_null    
-        //   473: astore          dsf19
-        //   475: aload           drt17
+        //   473: astore          edl19
+        //   475: aload           ecz17
         //   477: invokevirtual   net/minecraft/client/renderer/block/model/BlockModelDefinition.getVariants:()Ljava/util/Map;
         //   480: aload           immutableList7
-        //   482: aload           byk5
+        //   482: aload           cfk5
         //   484: aload           map18
         //   486: aload           list6
-        //   488: aload           dsf19
+        //   488: aload           edl19
         //   490: aload           pair13
-        //   492: aload           drt17
-        //   494: aload           sm10
+        //   492: aload           ecz17
+        //   494: aload           uh10
         //   496: aload           pair16
         //   498: invokedynamic   BootstrapMethod #18, accept:(Lcom/google/common/collect/ImmutableList;Lnet/minecraft/world/level/block/state/StateDefinition;Ljava/util/Map;Ljava/util/List;Lnet/minecraft/client/renderer/block/model/multipart/MultiPart;Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/client/renderer/block/model/BlockModelDefinition;Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/datafixers/util/Pair;)Ljava/util/function/BiConsumer;
         //   503: invokeinterface java/util/Map.forEach:(Ljava/util/function/BiConsumer;)V
@@ -479,7 +479,7 @@ public class ModelBakery {
         //   525: aload           map8
         //   527: aload_0         /* this */
         //   528: aload           map9
-        //   530: aload           sm10
+        //   530: aload           uh10
         //   532: aload           pair13
         //   534: aload           map14
         //   536: invokedynamic   BootstrapMethod #15, accept:(Lnet/minecraft/client/resources/model/ModelBakery;Ljava/util/Map;Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/datafixers/util/Pair;Ljava/util/Map;)Ljava/util/function/BiConsumer;
@@ -500,7 +500,7 @@ public class ModelBakery {
         //   577: anewarray       Ljava/lang/Object;
         //   580: dup            
         //   581: iconst_0       
-        //   582: aload           sm10
+        //   582: aload           uh10
         //   584: aastore        
         //   585: dup            
         //   586: iconst_1       
@@ -515,7 +515,7 @@ public class ModelBakery {
         //   604: aload           map8
         //   606: aload_0         /* this */
         //   607: aload           map9
-        //   609: aload           sm10
+        //   609: aload           uh10
         //   611: aload           pair13
         //   613: aload           map21
         //   615: invokedynamic   BootstrapMethod #15, accept:(Lnet/minecraft/client/resources/model/ModelBakery;Ljava/util/Map;Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/datafixers/util/Pair;Ljava/util/Map;)Ljava/util/function/BiConsumer;
@@ -532,7 +532,7 @@ public class ModelBakery {
         //    MethodParameters:
         //  Name  Flags  
         //  ----  -----
-        //  sm    
+        //  uh    
         //    StackMapTable: 00 0C 12 FB 00 52 FF 00 E9 00 0D 07 00 02 00 00 00 00 00 00 07 02 22 07 02 22 07 01 2D 00 00 07 01 B7 00 01 07 00 72 FF 00 38 00 0E 07 00 02 00 00 00 07 00 1E 07 01 1C 07 01 1C 07 02 22 07 02 22 07 01 2D 00 00 07 01 B7 07 01 A8 00 00 FF 00 08 00 0F 07 00 02 00 00 00 07 00 1E 07 01 1C 07 01 1C 07 02 22 07 02 22 07 01 2D 00 00 07 01 B7 00 07 00 FF 00 00 FE 00 46 07 01 B7 07 00 0F 07 03 3F FC 00 02 07 03 41 FF 00 2C 00 0D 07 00 02 00 00 00 00 00 00 07 02 22 07 02 22 07 01 2D 00 00 07 01 B7 00 00 69 07 00 0A 44 07 02 7D 5D 07 02 A4 FF 00 2B 00 00 00 00
         //    Exceptions:
         //  Try           Handler
@@ -583,48 +583,48 @@ public class ModelBakery {
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    private void cacheAndQueueDependencies(final ResourceLocation sm, final UnbakedModel ecf) {
-        this.unbakedCache.put(sm, ecf);
-        this.loadingStack.addAll(ecf.getDependencies());
+    private void cacheAndQueueDependencies(final ResourceLocation uh, final UnbakedModel enr) {
+        this.unbakedCache.put(uh, enr);
+        this.loadingStack.addAll(enr.getDependencies());
     }
     
-    private void loadTopLevel(final ModelResourceLocation ecb) {
-        final UnbakedModel ecf3 = this.getModel(ecb);
-        this.unbakedCache.put(ecb, ecf3);
-        this.topLevelModels.put(ecb, ecf3);
+    private void loadTopLevel(final ModelResourceLocation enn) {
+        final UnbakedModel enr3 = this.getModel(enn);
+        this.unbakedCache.put(enn, enr3);
+        this.topLevelModels.put(enn, enr3);
     }
     
     private void registerModelGroup(final Iterable<BlockState> iterable) {
         final int integer3 = this.nextModelGroup++;
-        iterable.forEach(byj -> this.modelGroups.put(byj, integer3));
+        iterable.forEach(cfj -> this.modelGroups.put(cfj, integer3));
     }
     
     @Nullable
-    public BakedModel bake(final ResourceLocation sm, final ModelState ecc) {
-        final Triple<ResourceLocation, Transformation, Boolean> triple4 = (Triple<ResourceLocation, Transformation, Boolean>)Triple.of(sm, ecc.getRotation(), ecc.isUvLocked());
+    public BakedModel bake(final ResourceLocation uh, final ModelState eno) {
+        final Triple<ResourceLocation, Transformation, Boolean> triple4 = (Triple<ResourceLocation, Transformation, Boolean>)Triple.of(uh, eno.getRotation(), eno.isUvLocked());
         if (this.bakedCache.containsKey(triple4)) {
             return this.bakedCache.get(triple4);
         }
         if (this.atlasSet == null) {
             throw new IllegalStateException("bake called too early");
         }
-        final UnbakedModel ecf5 = this.getModel(sm);
-        if (ecf5 instanceof BlockModel) {
-            final BlockModel drs6 = (BlockModel)ecf5;
-            if (drs6.getRootModel() == ModelBakery.GENERATION_MARKER) {
-                return ModelBakery.ITEM_MODEL_GENERATOR.generateBlockModel(this.atlasSet::getSprite, drs6).bake(this, drs6, this.atlasSet::getSprite, ecc, sm, false);
+        final UnbakedModel enr5 = this.getModel(uh);
+        if (enr5 instanceof BlockModel) {
+            final BlockModel ecy6 = (BlockModel)enr5;
+            if (ecy6.getRootModel() == ModelBakery.GENERATION_MARKER) {
+                return ModelBakery.ITEM_MODEL_GENERATOR.generateBlockModel(this.atlasSet::getSprite, ecy6).bake(this, ecy6, this.atlasSet::getSprite, eno, uh, false);
             }
         }
-        final BakedModel ebv6 = ecf5.bake(this, this.atlasSet::getSprite, ecc, sm);
-        this.bakedCache.put(triple4, ebv6);
-        return ebv6;
+        final BakedModel enh6 = enr5.bake(this, this.atlasSet::getSprite, eno, uh);
+        this.bakedCache.put(triple4, enh6);
+        return enh6;
     }
     
-    private BlockModel loadBlockModel(final ResourceLocation sm) throws IOException {
+    private BlockModel loadBlockModel(final ResourceLocation uh) throws IOException {
         Reader reader3 = null;
-        Resource za4 = null;
+        Resource abb4 = null;
         try {
-            final String string5 = sm.getPath();
+            final String string5 = uh.getPath();
             if ("builtin/generated".equals(string5)) {
                 return ModelBakery.GENERATION_MARKER;
             }
@@ -635,21 +635,21 @@ public class ModelBakery {
                 final String string6 = string5.substring("builtin/".length());
                 final String string7 = ModelBakery.BUILTIN_MODELS.get(string6);
                 if (string7 == null) {
-                    throw new FileNotFoundException(sm.toString());
+                    throw new FileNotFoundException(uh.toString());
                 }
                 reader3 = new StringReader(string7);
             }
             else {
-                za4 = this.resourceManager.getResource(new ResourceLocation(sm.getNamespace(), "models/" + sm.getPath() + ".json"));
-                reader3 = new InputStreamReader(za4.getInputStream(), StandardCharsets.UTF_8);
+                abb4 = this.resourceManager.getResource(new ResourceLocation(uh.getNamespace(), "models/" + uh.getPath() + ".json"));
+                reader3 = new InputStreamReader(abb4.getInputStream(), StandardCharsets.UTF_8);
             }
-            final BlockModel drs6 = BlockModel.fromStream(reader3);
-            drs6.name = sm.toString();
-            return drs6;
+            final BlockModel ecy6 = BlockModel.fromStream(reader3);
+            ecy6.name = uh.toString();
+            return ecy6;
         }
         finally {
             IOUtils.closeQuietly(reader3);
-            IOUtils.closeQuietly((Closeable)za4);
+            IOUtils.closeQuietly((Closeable)abb4);
         }
     }
     
@@ -836,21 +836,22 @@ public class ModelBakery {
         //   476: invokestatic    net/minecraft/world/level/block/state/properties/BooleanProperty.create:(Ljava/lang/String;)Lnet/minecraft/world/level/block/state/properties/BooleanProperty;
         //   479: aastore        
         //   480: invokevirtual   net/minecraft/world/level/block/state/StateDefinition$Builder.add:([Lnet/minecraft/world/level/block/state/properties/Property;)Lnet/minecraft/world/level/block/state/StateDefinition$Builder;
-        //   483: invokedynamic   BootstrapMethod #35, create:()Lnet/minecraft/world/level/block/state/StateDefinition$Factory;
-        //   488: invokevirtual   net/minecraft/world/level/block/state/StateDefinition$Builder.create:(Lnet/minecraft/world/level/block/state/StateDefinition$Factory;)Lnet/minecraft/world/level/block/state/StateDefinition;
-        //   491: putstatic       net/minecraft/client/resources/model/ModelBakery.ITEM_FRAME_FAKE_DEFINITION:Lnet/minecraft/world/level/block/state/StateDefinition;
-        //   494: new             Lnet/minecraft/client/renderer/block/model/ItemModelGenerator;
-        //   497: dup            
-        //   498: invokespecial   net/minecraft/client/renderer/block/model/ItemModelGenerator.<init>:()V
-        //   501: putstatic       net/minecraft/client/resources/model/ModelBakery.ITEM_MODEL_GENERATOR:Lnet/minecraft/client/renderer/block/model/ItemModelGenerator;
-        //   504: new             Lnet/minecraft/resources/ResourceLocation;
-        //   507: dup            
-        //   508: ldc_w           "item_frame"
-        //   511: invokespecial   net/minecraft/resources/ResourceLocation.<init>:(Ljava/lang/String;)V
-        //   514: getstatic       net/minecraft/client/resources/model/ModelBakery.ITEM_FRAME_FAKE_DEFINITION:Lnet/minecraft/world/level/block/state/StateDefinition;
-        //   517: invokestatic    com/google/common/collect/ImmutableMap.of:(Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableMap;
-        //   520: putstatic       net/minecraft/client/resources/model/ModelBakery.STATIC_DEFINITIONS:Ljava/util/Map;
-        //   523: return         
+        //   483: invokedynamic   BootstrapMethod #35, apply:()Ljava/util/function/Function;
+        //   488: invokedynamic   BootstrapMethod #36, create:()Lnet/minecraft/world/level/block/state/StateDefinition$Factory;
+        //   493: invokevirtual   net/minecraft/world/level/block/state/StateDefinition$Builder.create:(Ljava/util/function/Function;Lnet/minecraft/world/level/block/state/StateDefinition$Factory;)Lnet/minecraft/world/level/block/state/StateDefinition;
+        //   496: putstatic       net/minecraft/client/resources/model/ModelBakery.ITEM_FRAME_FAKE_DEFINITION:Lnet/minecraft/world/level/block/state/StateDefinition;
+        //   499: new             Lnet/minecraft/client/renderer/block/model/ItemModelGenerator;
+        //   502: dup            
+        //   503: invokespecial   net/minecraft/client/renderer/block/model/ItemModelGenerator.<init>:()V
+        //   506: putstatic       net/minecraft/client/resources/model/ModelBakery.ITEM_MODEL_GENERATOR:Lnet/minecraft/client/renderer/block/model/ItemModelGenerator;
+        //   509: new             Lnet/minecraft/resources/ResourceLocation;
+        //   512: dup            
+        //   513: ldc_w           "item_frame"
+        //   516: invokespecial   net/minecraft/resources/ResourceLocation.<init>:(Ljava/lang/String;)V
+        //   519: getstatic       net/minecraft/client/resources/model/ModelBakery.ITEM_FRAME_FAKE_DEFINITION:Lnet/minecraft/world/level/block/state/StateDefinition;
+        //   522: invokestatic    com/google/common/collect/ImmutableMap.of:(Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableMap;
+        //   525: putstatic       net/minecraft/client/resources/model/ModelBakery.STATIC_DEFINITIONS:Ljava/util/Map;
+        //   528: return         
         // 
         // The error that occurred was:
         // 
@@ -946,20 +947,20 @@ public class ModelBakery {
             return 31 * this.models.hashCode() + this.coloringValues.hashCode();
         }
         
-        public static ModelGroupKey create(final BlockState byj, final MultiPart dsf, final Collection<Property<?>> collection) {
-            final StateDefinition<Block, BlockState> byk4 = byj.getBlock().getStateDefinition();
-            final List<UnbakedModel> list5 = dsf.getSelectors().stream().filter(dsh -> dsh.getPredicate(byk4).test(byj)).map(Selector::getVariant).collect(ImmutableList.toImmutableList());
-            final List<Object> list6 = getColoringValues(byj, collection);
+        public static ModelGroupKey create(final BlockState cfj, final MultiPart edl, final Collection<Property<?>> collection) {
+            final StateDefinition<Block, BlockState> cfk4 = cfj.getBlock().getStateDefinition();
+            final List<UnbakedModel> list5 = edl.getSelectors().stream().filter(edn -> edn.getPredicate(cfk4).test(cfj)).map(Selector::getVariant).collect(ImmutableList.toImmutableList());
+            final List<Object> list6 = getColoringValues(cfj, collection);
             return new ModelGroupKey(list5, list6);
         }
         
-        public static ModelGroupKey create(final BlockState byj, final UnbakedModel ecf, final Collection<Property<?>> collection) {
-            final List<Object> list4 = getColoringValues(byj, collection);
-            return new ModelGroupKey(ImmutableList.<UnbakedModel>of(ecf), list4);
+        public static ModelGroupKey create(final BlockState cfj, final UnbakedModel enr, final Collection<Property<?>> collection) {
+            final List<Object> list4 = getColoringValues(cfj, collection);
+            return new ModelGroupKey(ImmutableList.<UnbakedModel>of(enr), list4);
         }
         
-        private static List<Object> getColoringValues(final BlockState byj, final Collection<Property<?>> collection) {
-            return collection.stream().map(byj::getValue).collect(ImmutableList.toImmutableList());
+        private static List<Object> getColoringValues(final BlockState cfj, final Collection<Property<?>> collection) {
+            return collection.stream().map(cfj::getValue).collect(ImmutableList.toImmutableList());
         }
     }
 }
diff --git a/src/net/minecraft/client/resources/model/ModelManager.java b/src/net/minecraft/client/resources/model/ModelManager.java
index b251ec2..f8e6847 100644
--- a/src/net/minecraft/client/resources/model/ModelManager.java
+++ b/src/net/minecraft/client/resources/model/ModelManager.java
@@ -9,6 +9,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.renderer.block.BlockModelShaper;
+import javax.annotation.Nullable;
 import net.minecraft.client.renderer.texture.AtlasSet;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
@@ -16,6 +17,7 @@ import net.minecraft.server.packs.resources.SimplePreparableReloadListener;
 
 public class ModelManager extends SimplePreparableReloadListener<ModelBakery> implements AutoCloseable {
     private Map<ResourceLocation, BakedModel> bakedRegistry;
+    @Nullable
     private AtlasSet atlases;
     private final BlockModelShaper blockModelShaper;
     private final TextureManager textureManager;
@@ -24,15 +26,15 @@ public class ModelManager extends SimplePreparableReloadListener<ModelBakery> im
     private BakedModel missingModel;
     private Object2IntMap<BlockState> modelGroups;
     
-    public ModelManager(final TextureManager eak, final BlockColors dcb, final int integer) {
-        this.textureManager = eak;
-        this.blockColors = dcb;
+    public ModelManager(final TextureManager elw, final BlockColors dmn, final int integer) {
+        this.textureManager = elw;
+        this.blockColors = dmn;
         this.maxMipmapLevels = integer;
         this.blockModelShaper = new BlockModelShaper(this);
     }
     
-    public BakedModel getModel(final ModelResourceLocation ecb) {
-        return this.bakedRegistry.getOrDefault(ecb, this.missingModel);
+    public BakedModel getModel(final ModelResourceLocation enn) {
+        return this.bakedRegistry.getOrDefault(enn, this.missingModel);
     }
     
     public BakedModel getMissingModel() {
@@ -44,53 +46,55 @@ public class ModelManager extends SimplePreparableReloadListener<ModelBakery> im
     }
     
     @Override
-    protected ModelBakery prepare(final ResourceManager zb, final ProfilerFiller aio) {
-        aio.startTick();
-        final ModelBakery ebz4 = new ModelBakery(zb, this.blockColors, aio, this.maxMipmapLevels);
-        aio.endTick();
-        return ebz4;
+    protected ModelBakery prepare(final ResourceManager abc, final ProfilerFiller ami) {
+        ami.startTick();
+        final ModelBakery enl4 = new ModelBakery(abc, this.blockColors, ami, this.maxMipmapLevels);
+        ami.endTick();
+        return enl4;
     }
     
     @Override
-    protected void apply(final ModelBakery ebz, final ResourceManager zb, final ProfilerFiller aio) {
-        aio.startTick();
-        aio.push("upload");
+    protected void apply(final ModelBakery enl, final ResourceManager abc, final ProfilerFiller ami) {
+        ami.startTick();
+        ami.push("upload");
         if (this.atlases != null) {
             this.atlases.close();
         }
-        this.atlases = ebz.uploadTextures(this.textureManager, aio);
-        this.bakedRegistry = ebz.getBakedTopLevelModels();
-        this.modelGroups = ebz.getModelGroups();
+        this.atlases = enl.uploadTextures(this.textureManager, ami);
+        this.bakedRegistry = enl.getBakedTopLevelModels();
+        this.modelGroups = enl.getModelGroups();
         this.missingModel = this.bakedRegistry.get(ModelBakery.MISSING_MODEL_LOCATION);
-        aio.popPush("cache");
+        ami.popPush("cache");
         this.blockModelShaper.rebuildCache();
-        aio.pop();
-        aio.endTick();
+        ami.pop();
+        ami.endTick();
     }
     
-    public boolean requiresRender(final BlockState byj1, final BlockState byj2) {
-        if (byj1 == byj2) {
+    public boolean requiresRender(final BlockState cfj1, final BlockState cfj2) {
+        if (cfj1 == cfj2) {
             return false;
         }
-        final int integer4 = this.modelGroups.getInt(byj1);
+        final int integer4 = this.modelGroups.getInt(cfj1);
         if (integer4 != -1) {
-            final int integer5 = this.modelGroups.getInt(byj2);
+            final int integer5 = this.modelGroups.getInt(cfj2);
             if (integer4 == integer5) {
-                final FluidState coj6 = byj1.getFluidState();
-                final FluidState coj7 = byj2.getFluidState();
-                return coj6 != coj7;
+                final FluidState cxa6 = cfj1.getFluidState();
+                final FluidState cxa7 = cfj2.getFluidState();
+                return cxa6 != cxa7;
             }
         }
         return true;
     }
     
-    public TextureAtlas getAtlas(final ResourceLocation sm) {
-        return this.atlases.getAtlas(sm);
+    public TextureAtlas getAtlas(final ResourceLocation uh) {
+        return this.atlases.getAtlas(uh);
     }
     
     @Override
     public void close() {
-        this.atlases.close();
+        if (this.atlases != null) {
+            this.atlases.close();
+        }
     }
     
     public void updateMaxMipLevel(final int integer) {
diff --git a/src/net/minecraft/client/resources/model/ModelResourceLocation.java b/src/net/minecraft/client/resources/model/ModelResourceLocation.java
index 44e9442..437c334 100644
--- a/src/net/minecraft/client/resources/model/ModelResourceLocation.java
+++ b/src/net/minecraft/client/resources/model/ModelResourceLocation.java
@@ -15,8 +15,8 @@ public class ModelResourceLocation extends ResourceLocation {
         this(decompose(string));
     }
     
-    public ModelResourceLocation(final ResourceLocation sm, final String string) {
-        this(sm.toString(), string);
+    public ModelResourceLocation(final ResourceLocation uh, final String string) {
+        this(uh.toString(), string);
     }
     
     public ModelResourceLocation(final String string1, final String string2) {
@@ -47,8 +47,8 @@ public class ModelResourceLocation extends ResourceLocation {
             return true;
         }
         if (object instanceof ModelResourceLocation && super.equals(object)) {
-            final ModelResourceLocation ecb3 = (ModelResourceLocation)object;
-            return this.variant.equals(ecb3.variant);
+            final ModelResourceLocation enn3 = (ModelResourceLocation)object;
+            return this.variant.equals(enn3.variant);
         }
         return false;
     }
diff --git a/src/net/minecraft/client/resources/model/MultiPartBakedModel.java b/src/net/minecraft/client/resources/model/MultiPartBakedModel.java
index 64ba316..80ce22e 100644
--- a/src/net/minecraft/client/resources/model/MultiPartBakedModel.java
+++ b/src/net/minecraft/client/resources/model/MultiPartBakedModel.java
@@ -33,36 +33,36 @@ public class MultiPartBakedModel implements BakedModel {
     public MultiPartBakedModel(final List<Pair<Predicate<BlockState>, BakedModel>> list) {
         this.selectorCache = (Map<BlockState, BitSet>)new Object2ObjectOpenCustomHashMap((Hash.Strategy)Util.identityStrategy());
         this.selectors = list;
-        final BakedModel ebv3 = (BakedModel)list.iterator().next().getRight();
-        this.hasAmbientOcclusion = ebv3.useAmbientOcclusion();
-        this.isGui3d = ebv3.isGui3d();
-        this.usesBlockLight = ebv3.usesBlockLight();
-        this.particleIcon = ebv3.getParticleIcon();
-        this.transforms = ebv3.getTransforms();
-        this.overrides = ebv3.getOverrides();
+        final BakedModel enh3 = (BakedModel)list.iterator().next().getRight();
+        this.hasAmbientOcclusion = enh3.useAmbientOcclusion();
+        this.isGui3d = enh3.isGui3d();
+        this.usesBlockLight = enh3.usesBlockLight();
+        this.particleIcon = enh3.getParticleIcon();
+        this.transforms = enh3.getTransforms();
+        this.overrides = enh3.getOverrides();
     }
     
     @Override
-    public List<BakedQuad> getQuads(@Nullable final BlockState byj, @Nullable final Direction fp, final Random random) {
-        if (byj == null) {
+    public List<BakedQuad> getQuads(@Nullable final BlockState cfj, @Nullable final Direction fz, final Random random) {
+        if (cfj == null) {
             return Collections.<BakedQuad>emptyList();
         }
-        BitSet bitSet5 = this.selectorCache.get(byj);
+        BitSet bitSet5 = this.selectorCache.get(cfj);
         if (bitSet5 == null) {
             bitSet5 = new BitSet();
             for (int integer6 = 0; integer6 < this.selectors.size(); ++integer6) {
                 final Pair<Predicate<BlockState>, BakedModel> pair7 = this.selectors.get(integer6);
-                if (((Predicate)pair7.getLeft()).test(byj)) {
+                if (((Predicate)pair7.getLeft()).test(cfj)) {
                     bitSet5.set(integer6);
                 }
             }
-            this.selectorCache.put(byj, bitSet5);
+            this.selectorCache.put(cfj, bitSet5);
         }
         final List<BakedQuad> list6 = Lists.newArrayList();
         final long long7 = random.nextLong();
         for (int integer7 = 0; integer7 < bitSet5.length(); ++integer7) {
             if (bitSet5.get(integer7)) {
-                list6.addAll(((BakedModel)this.selectors.get(integer7).getRight()).getQuads(byj, fp, new Random(long7)));
+                list6.addAll(((BakedModel)this.selectors.get(integer7).getRight()).getQuads(cfj, fz, new Random(long7)));
             }
         }
         return list6;
@@ -110,8 +110,8 @@ public class MultiPartBakedModel implements BakedModel {
             this.selectors = Lists.newArrayList();
         }
         
-        public void add(final Predicate<BlockState> predicate, final BakedModel ebv) {
-            this.selectors.add((Pair<Predicate<BlockState>, BakedModel>)Pair.of(predicate, ebv));
+        public void add(final Predicate<BlockState> predicate, final BakedModel enh) {
+            this.selectors.add((Pair<Predicate<BlockState>, BakedModel>)Pair.of(predicate, enh));
         }
         
         public BakedModel build() {
diff --git a/src/net/minecraft/client/resources/model/SimpleBakedModel.java b/src/net/minecraft/client/resources/model/SimpleBakedModel.java
index 6e358a1..b689f1a 100644
--- a/src/net/minecraft/client/resources/model/SimpleBakedModel.java
+++ b/src/net/minecraft/client/resources/model/SimpleBakedModel.java
@@ -24,20 +24,20 @@ public class SimpleBakedModel implements BakedModel {
     protected final ItemTransforms transforms;
     protected final ItemOverrides overrides;
     
-    public SimpleBakedModel(final List<BakedQuad> list, final Map<Direction, List<BakedQuad>> map, final boolean boolean3, final boolean boolean4, final boolean boolean5, final TextureAtlasSprite eaj, final ItemTransforms drz, final ItemOverrides drx) {
+    public SimpleBakedModel(final List<BakedQuad> list, final Map<Direction, List<BakedQuad>> map, final boolean boolean3, final boolean boolean4, final boolean boolean5, final TextureAtlasSprite elv, final ItemTransforms edf, final ItemOverrides edd) {
         this.unculledFaces = list;
         this.culledFaces = map;
         this.hasAmbientOcclusion = boolean3;
         this.isGui3d = boolean5;
         this.usesBlockLight = boolean4;
-        this.particleIcon = eaj;
-        this.transforms = drz;
-        this.overrides = drx;
+        this.particleIcon = elv;
+        this.transforms = edf;
+        this.overrides = edd;
     }
     
     @Override
-    public List<BakedQuad> getQuads(@Nullable final BlockState byj, @Nullable final Direction fp, final Random random) {
-        return (fp == null) ? this.unculledFaces : this.culledFaces.get(fp);
+    public List<BakedQuad> getQuads(@Nullable final BlockState cfj, @Nullable final Direction fz, final Random random) {
+        return (fz == null) ? this.unculledFaces : this.culledFaces.get(fz);
     }
     
     @Override
@@ -85,35 +85,35 @@ public class SimpleBakedModel implements BakedModel {
         private final boolean isGui3d;
         private final ItemTransforms transforms;
         
-        public Builder(final BlockModel drs, final ItemOverrides drx, final boolean boolean3) {
-            this(drs.hasAmbientOcclusion(), drs.getGuiLight().lightLikeBlock(), boolean3, drs.getTransforms(), drx);
+        public Builder(final BlockModel ecy, final ItemOverrides edd, final boolean boolean3) {
+            this(ecy.hasAmbientOcclusion(), ecy.getGuiLight().lightLikeBlock(), boolean3, ecy.getTransforms(), edd);
         }
         
-        private Builder(final boolean boolean1, final boolean boolean2, final boolean boolean3, final ItemTransforms drz, final ItemOverrides drx) {
+        private Builder(final boolean boolean1, final boolean boolean2, final boolean boolean3, final ItemTransforms edf, final ItemOverrides edd) {
             this.unculledFaces = Lists.newArrayList();
             this.culledFaces = Maps.newEnumMap(Direction.class);
-            for (final Direction fp10 : Direction.values()) {
-                this.culledFaces.put(fp10, Lists.newArrayList());
+            for (final Direction fz10 : Direction.values()) {
+                this.culledFaces.put(fz10, Lists.newArrayList());
             }
-            this.overrides = drx;
+            this.overrides = edd;
             this.hasAmbientOcclusion = boolean1;
             this.usesBlockLight = boolean2;
             this.isGui3d = boolean3;
-            this.transforms = drz;
+            this.transforms = edf;
         }
         
-        public Builder addCulledFace(final Direction fp, final BakedQuad drn) {
-            this.culledFaces.get(fp).add(drn);
+        public Builder addCulledFace(final Direction fz, final BakedQuad ect) {
+            this.culledFaces.get(fz).add(ect);
             return this;
         }
         
-        public Builder addUnculledFace(final BakedQuad drn) {
-            this.unculledFaces.add(drn);
+        public Builder addUnculledFace(final BakedQuad ect) {
+            this.unculledFaces.add(ect);
             return this;
         }
         
-        public Builder particle(final TextureAtlasSprite eaj) {
-            this.particleIcon = eaj;
+        public Builder particle(final TextureAtlasSprite elv) {
+            this.particleIcon = elv;
             return this;
         }
         
diff --git a/src/net/minecraft/client/resources/model/UnbakedModel.java b/src/net/minecraft/client/resources/model/UnbakedModel.java
index f523e56..3383003 100644
--- a/src/net/minecraft/client/resources/model/UnbakedModel.java
+++ b/src/net/minecraft/client/resources/model/UnbakedModel.java
@@ -14,5 +14,5 @@ public interface UnbakedModel {
     Collection<Material> getMaterials(final Function<ResourceLocation, UnbakedModel> function, final Set<Pair<String, String>> set);
     
     @Nullable
-    BakedModel bake(final ModelBakery ebz, final Function<Material, TextureAtlasSprite> function, final ModelState ecc, final ResourceLocation sm);
+    BakedModel bake(final ModelBakery enl, final Function<Material, TextureAtlasSprite> function, final ModelState eno, final ResourceLocation uh);
 }
diff --git a/src/net/minecraft/client/resources/model/WeightedBakedModel.java b/src/net/minecraft/client/resources/model/WeightedBakedModel.java
index eb4f688..d221b16 100644
--- a/src/net/minecraft/client/resources/model/WeightedBakedModel.java
+++ b/src/net/minecraft/client/resources/model/WeightedBakedModel.java
@@ -24,8 +24,8 @@ public class WeightedBakedModel implements BakedModel {
     }
     
     @Override
-    public List<BakedQuad> getQuads(@Nullable final BlockState byj, @Nullable final Direction fp, final Random random) {
-        return WeighedRandom.<WeightedModel>getWeightedItem(this.list, Math.abs((int)random.nextLong()) % this.totalWeight).model.getQuads(byj, fp, random);
+    public List<BakedQuad> getQuads(@Nullable final BlockState cfj, @Nullable final Direction fz, final Random random) {
+        return WeighedRandom.<WeightedModel>getWeightedItem(this.list, Math.abs((int)random.nextLong()) % this.totalWeight).model.getQuads(cfj, fz, random);
     }
     
     @Override
@@ -70,9 +70,9 @@ public class WeightedBakedModel implements BakedModel {
             this.list = Lists.newArrayList();
         }
         
-        public Builder add(@Nullable final BakedModel ebv, final int integer) {
-            if (ebv != null) {
-                this.list.add(new WeightedModel(ebv, integer));
+        public Builder add(@Nullable final BakedModel enh, final int integer) {
+            if (enh != null) {
+                this.list.add(new WeightedModel(enh, integer));
             }
             return this;
         }
@@ -92,9 +92,9 @@ public class WeightedBakedModel implements BakedModel {
     static class WeightedModel extends WeighedRandom.WeighedRandomItem {
         protected final BakedModel model;
         
-        public WeightedModel(final BakedModel ebv, final int integer) {
+        public WeightedModel(final BakedModel enh, final int integer) {
             super(integer);
-            this.model = ebv;
+            this.model = enh;
         }
     }
 }
diff --git a/src/net/minecraft/client/resources/sounds/AbstractSoundInstance.java b/src/net/minecraft/client/resources/sounds/AbstractSoundInstance.java
index 3af9ec9..b55f32c 100644
--- a/src/net/minecraft/client/resources/sounds/AbstractSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/AbstractSoundInstance.java
@@ -1,39 +1,36 @@
 package net.minecraft.client.resources.sounds;
 
+import net.minecraft.client.sounds.WeighedSoundEvents;
 import net.minecraft.client.sounds.SoundManager;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
-import javax.annotation.Nullable;
-import net.minecraft.client.sounds.WeighedSoundEvents;
 
 public abstract class AbstractSoundInstance implements SoundInstance {
     protected Sound sound;
-    @Nullable
-    private WeighedSoundEvents soundEvent;
     protected final SoundSource source;
     protected final ResourceLocation location;
     protected float volume;
     protected float pitch;
-    protected float x;
-    protected float y;
-    protected float z;
+    protected double x;
+    protected double y;
+    protected double z;
     protected boolean looping;
     protected int delay;
     protected Attenuation attenuation;
     protected boolean priority;
     protected boolean relative;
     
-    protected AbstractSoundInstance(final SoundEvent aah, final SoundSource aaj) {
-        this(aah.getLocation(), aaj);
+    protected AbstractSoundInstance(final SoundEvent ack, final SoundSource acm) {
+        this(ack.getLocation(), acm);
     }
     
-    protected AbstractSoundInstance(final ResourceLocation sm, final SoundSource aaj) {
+    protected AbstractSoundInstance(final ResourceLocation uh, final SoundSource acm) {
         this.volume = 1.0f;
         this.pitch = 1.0f;
         this.attenuation = Attenuation.LINEAR;
-        this.location = sm;
-        this.source = aaj;
+        this.location = uh;
+        this.source = acm;
     }
     
     @Override
@@ -42,15 +39,15 @@ public abstract class AbstractSoundInstance implements SoundInstance {
     }
     
     @Override
-    public WeighedSoundEvents resolve(final SoundManager edz) {
-        this.soundEvent = edz.getSoundEvent(this.location);
-        if (this.soundEvent == null) {
+    public WeighedSoundEvents resolve(final SoundManager epn) {
+        final WeighedSoundEvents epo3 = epn.getSoundEvent(this.location);
+        if (epo3 == null) {
             this.sound = SoundManager.EMPTY_SOUND;
         }
         else {
-            this.sound = this.soundEvent.getSound();
+            this.sound = epo3.getSound();
         }
-        return this.soundEvent;
+        return epo3;
     }
     
     @Override
@@ -84,17 +81,17 @@ public abstract class AbstractSoundInstance implements SoundInstance {
     }
     
     @Override
-    public float getX() {
+    public double getX() {
         return this.x;
     }
     
     @Override
-    public float getY() {
+    public double getY() {
         return this.y;
     }
     
     @Override
-    public float getZ() {
+    public double getZ() {
         return this.z;
     }
     
@@ -107,4 +104,9 @@ public abstract class AbstractSoundInstance implements SoundInstance {
     public boolean isRelative() {
         return this.relative;
     }
+    
+    @Override
+    public String toString() {
+        return "SoundInstance[" + this.location + "]";
+    }
 }
diff --git a/src/net/minecraft/client/resources/sounds/AbstractTickableSoundInstance.java b/src/net/minecraft/client/resources/sounds/AbstractTickableSoundInstance.java
index fb5beaf..110e5f3 100644
--- a/src/net/minecraft/client/resources/sounds/AbstractTickableSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/AbstractTickableSoundInstance.java
@@ -4,14 +4,19 @@ import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvent;
 
 public abstract class AbstractTickableSoundInstance extends AbstractSoundInstance implements TickableSoundInstance {
-    protected boolean stopped;
+    private boolean stopped;
     
-    protected AbstractTickableSoundInstance(final SoundEvent aah, final SoundSource aaj) {
-        super(aah, aaj);
+    protected AbstractTickableSoundInstance(final SoundEvent ack, final SoundSource acm) {
+        super(ack, acm);
     }
     
     @Override
     public boolean isStopped() {
         return this.stopped;
     }
+    
+    protected final void stop() {
+        this.stopped = true;
+        this.looping = false;
+    }
 }
diff --git a/src/net/minecraft/client/resources/sounds/BeeAggressiveSoundInstance.java b/src/net/minecraft/client/resources/sounds/BeeAggressiveSoundInstance.java
index 5f937bc..e995991 100644
--- a/src/net/minecraft/client/resources/sounds/BeeAggressiveSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/BeeAggressiveSoundInstance.java
@@ -5,8 +5,8 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.animal.Bee;
 
 public class BeeAggressiveSoundInstance extends BeeSoundInstance {
-    public BeeAggressiveSoundInstance(final Bee atd) {
-        super(atd, SoundEvents.BEE_LOOP_AGGRESSIVE, SoundSource.NEUTRAL);
+    public BeeAggressiveSoundInstance(final Bee ayl) {
+        super(ayl, SoundEvents.BEE_LOOP_AGGRESSIVE, SoundSource.NEUTRAL);
         this.delay = 0;
     }
     
diff --git a/src/net/minecraft/client/resources/sounds/BeeFlyingSoundInstance.java b/src/net/minecraft/client/resources/sounds/BeeFlyingSoundInstance.java
index e25b900..f66d969 100644
--- a/src/net/minecraft/client/resources/sounds/BeeFlyingSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/BeeFlyingSoundInstance.java
@@ -5,8 +5,8 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.animal.Bee;
 
 public class BeeFlyingSoundInstance extends BeeSoundInstance {
-    public BeeFlyingSoundInstance(final Bee atd) {
-        super(atd, SoundEvents.BEE_LOOP, SoundSource.NEUTRAL);
+    public BeeFlyingSoundInstance(final Bee ayl) {
+        super(ayl, SoundEvents.BEE_LOOP, SoundSource.NEUTRAL);
     }
     
     @Override
diff --git a/src/net/minecraft/client/resources/sounds/BeeSoundInstance.java b/src/net/minecraft/client/resources/sounds/BeeSoundInstance.java
index 63ce6d3..0a45dc3 100644
--- a/src/net/minecraft/client/resources/sounds/BeeSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/BeeSoundInstance.java
@@ -11,12 +11,12 @@ public abstract class BeeSoundInstance extends AbstractTickableSoundInstance {
     protected final Bee bee;
     private boolean hasSwitched;
     
-    public BeeSoundInstance(final Bee atd, final SoundEvent aah, final SoundSource aaj) {
-        super(aah, aaj);
-        this.bee = atd;
-        this.x = (float)atd.getX();
-        this.y = (float)atd.getY();
-        this.z = (float)atd.getZ();
+    public BeeSoundInstance(final Bee ayl, final SoundEvent ack, final SoundSource acm) {
+        super(ack, acm);
+        this.bee = ayl;
+        this.x = (float)ayl.getX();
+        this.y = (float)ayl.getY();
+        this.z = (float)ayl.getZ();
         this.looping = true;
         this.delay = 0;
         this.volume = 0.0f;
@@ -25,12 +25,12 @@ public abstract class BeeSoundInstance extends AbstractTickableSoundInstance {
     @Override
     public void tick() {
         final boolean boolean2 = this.shouldSwitchSounds();
-        if (boolean2 && !this.stopped) {
+        if (boolean2 && !this.isStopped()) {
             Minecraft.getInstance().getSoundManager().queueTickingSound(this.getAlternativeSoundInstance());
             this.hasSwitched = true;
         }
         if (this.bee.removed || this.hasSwitched) {
-            this.stopped = true;
+            this.stop();
             return;
         }
         this.x = (float)this.bee.getX();
@@ -66,6 +66,11 @@ public abstract class BeeSoundInstance extends AbstractTickableSoundInstance {
         return true;
     }
     
+    @Override
+    public boolean canPlaySound() {
+        return !this.bee.isSilent();
+    }
+    
     protected abstract AbstractTickableSoundInstance getAlternativeSoundInstance();
     
     protected abstract boolean shouldSwitchSounds();
diff --git a/src/net/minecraft/client/resources/sounds/BiomeAmbientSoundsHandler.java b/src/net/minecraft/client/resources/sounds/BiomeAmbientSoundsHandler.java
new file mode 100644
index 0000000..f1a2def
--- /dev/null
+++ b/src/net/minecraft/client/resources/sounds/BiomeAmbientSoundsHandler.java
@@ -0,0 +1,143 @@
+package net.minecraft.client.resources.sounds;
+
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.level.Level;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.LightLayer;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.biome.AmbientAdditionsSettings;
+import net.minecraft.world.level.biome.AmbientMoodSettings;
+import java.util.Optional;
+import net.minecraft.world.level.biome.Biome;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import java.util.Random;
+import net.minecraft.world.level.biome.BiomeManager;
+import net.minecraft.client.sounds.SoundManager;
+import net.minecraft.client.player.LocalPlayer;
+
+public class BiomeAmbientSoundsHandler implements AmbientSoundHandler {
+    private final LocalPlayer player;
+    private final SoundManager soundManager;
+    private final BiomeManager biomeManager;
+    private final Random random;
+    private Object2ObjectArrayMap<Biome, LoopSoundInstance> loopSounds;
+    private Optional<AmbientMoodSettings> moodSettings;
+    private Optional<AmbientAdditionsSettings> additionsSettings;
+    private float moodiness;
+    private Biome previousBiome;
+    
+    public BiomeAmbientSoundsHandler(final LocalPlayer ebf, final SoundManager epn, final BiomeManager brg) {
+        this.loopSounds = (Object2ObjectArrayMap<Biome, LoopSoundInstance>)new Object2ObjectArrayMap();
+        this.moodSettings = Optional.<AmbientMoodSettings>empty();
+        this.additionsSettings = Optional.<AmbientAdditionsSettings>empty();
+        this.random = ebf.level.getRandom();
+        this.player = ebf;
+        this.soundManager = epn;
+        this.biomeManager = brg;
+    }
+    
+    public float getMoodiness() {
+        return this.moodiness;
+    }
+    
+    @Override
+    public void tick() {
+        this.loopSounds.values().removeIf(AbstractTickableSoundInstance::isStopped);
+        final Biome bre2 = this.biomeManager.getNoiseBiomeAtPosition(this.player.getX(), this.player.getY(), this.player.getZ());
+        if (bre2 != this.previousBiome) {
+            this.previousBiome = bre2;
+            this.moodSettings = bre2.getAmbientMood();
+            this.additionsSettings = bre2.getAmbientAdditions();
+            this.loopSounds.values().forEach(LoopSoundInstance::fadeOut);
+            final LoopSoundInstance loopSoundInstance;
+            bre2.getAmbientLoop().ifPresent(ack -> loopSoundInstance = (LoopSoundInstance)this.loopSounds.compute(bre2, (bre, a) -> {
+                if (a == null) {
+                    a = new LoopSoundInstance(ack);
+                    this.soundManager.play(a);
+                }
+                a.fadeIn();
+                return a;
+            }));
+        }
+        this.additionsSettings.ifPresent(bqv -> {
+            if (this.random.nextDouble() < bqv.getTickChance()) {
+                this.soundManager.play(SimpleSoundInstance.forAmbientAddition(bqv.getSoundEvent()));
+            }
+            return;
+        });
+        final Level bqb3;
+        final int integer4;
+        final BlockPos fu5;
+        final int integer5;
+        double double7;
+        double double8;
+        double double9;
+        double double10;
+        double double11;
+        double double12;
+        double double13;
+        double double14;
+        SimpleSoundInstance eoi23;
+        this.moodSettings.ifPresent(bqw -> {
+            bqb3 = this.player.level;
+            integer4 = bqw.getBlockSearchExtent() * 2 + 1;
+            fu5 = new BlockPos(this.player.getX() + this.random.nextInt(integer4) - bqw.getBlockSearchExtent(), this.player.getEyeY() + this.random.nextInt(integer4) - bqw.getBlockSearchExtent(), this.player.getZ() + this.random.nextInt(integer4) - bqw.getBlockSearchExtent());
+            integer5 = bqb3.getBrightness(LightLayer.SKY, fu5);
+            if (integer5 > 0) {
+                this.moodiness -= integer5 / (float)bqb3.getMaxLightLevel() * 0.001f;
+            }
+            else {
+                this.moodiness -= (bqb3.getBrightness(LightLayer.BLOCK, fu5) - 1) / (float)bqw.getTickDelay();
+            }
+            if (this.moodiness >= 1.0f) {
+                double7 = fu5.getX() + 0.5;
+                double8 = fu5.getY() + 0.5;
+                double9 = fu5.getZ() + 0.5;
+                double10 = double7 - this.player.getX();
+                double11 = double8 - this.player.getEyeY();
+                double12 = double9 - this.player.getZ();
+                double13 = Mth.sqrt(double10 * double10 + double11 * double11 + double12 * double12);
+                double14 = double13 + bqw.getSoundPositionOffset();
+                eoi23 = SimpleSoundInstance.forAmbientMood(bqw.getSoundEvent(), this.player.getX() + double10 / double13 * double14, this.player.getEyeY() + double11 / double13 * double14, this.player.getZ() + double12 / double13 * double14);
+                this.soundManager.play(eoi23);
+                this.moodiness = 0.0f;
+            }
+            else {
+                this.moodiness = Math.max(this.moodiness, 0.0f);
+            }
+        });
+    }
+    
+    public static class LoopSoundInstance extends AbstractTickableSoundInstance {
+        private int fadeDirection;
+        private int fade;
+        
+        public LoopSoundInstance(final SoundEvent ack) {
+            super(ack, SoundSource.AMBIENT);
+            this.looping = true;
+            this.delay = 0;
+            this.volume = 1.0f;
+            this.relative = true;
+        }
+        
+        @Override
+        public void tick() {
+            if (this.fade < 0) {
+                this.stop();
+            }
+            this.fade += this.fadeDirection;
+            this.volume = Mth.clamp(this.fade / 40.0f, 0.0f, 1.0f);
+        }
+        
+        public void fadeOut() {
+            this.fade = Math.min(this.fade, 40);
+            this.fadeDirection = -1;
+        }
+        
+        public void fadeIn() {
+            this.fade = Math.max(0, this.fade);
+            this.fadeDirection = 1;
+        }
+    }
+}
diff --git a/src/net/minecraft/client/resources/sounds/BubbleColumnAmbientSoundHandler.java b/src/net/minecraft/client/resources/sounds/BubbleColumnAmbientSoundHandler.java
index 29643f4..b85c078 100644
--- a/src/net/minecraft/client/resources/sounds/BubbleColumnAmbientSoundHandler.java
+++ b/src/net/minecraft/client/resources/sounds/BubbleColumnAmbientSoundHandler.java
@@ -1,11 +1,11 @@
 package net.minecraft.client.resources.sounds;
 
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.Level;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.BubbleColumnBlock;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.client.player.LocalPlayer;
 
 public class BubbleColumnAmbientSoundHandler implements AmbientSoundHandler {
@@ -13,18 +13,18 @@ public class BubbleColumnAmbientSoundHandler implements AmbientSoundHandler {
     private boolean wasInBubbleColumn;
     private boolean firstTick;
     
-    public BubbleColumnAmbientSoundHandler(final LocalPlayer dqb) {
+    public BubbleColumnAmbientSoundHandler(final LocalPlayer ebf) {
         this.firstTick = true;
-        this.player = dqb;
+        this.player = ebf;
     }
     
     @Override
     public void tick() {
-        final Level bjw2 = this.player.level;
-        final BlockState byj3 = bjw2.containsBlock(this.player.getBoundingBox().inflate(0.0, -0.4000000059604645, 0.0).deflate(0.001), Blocks.BUBBLE_COLUMN);
-        if (byj3 != null) {
-            if (!this.wasInBubbleColumn && !this.firstTick && byj3.getBlock() == Blocks.BUBBLE_COLUMN && !this.player.isSpectator()) {
-                final boolean boolean4 = byj3.<Boolean>getValue((Property<Boolean>)BubbleColumnBlock.DRAG_DOWN);
+        final Level bqb2 = this.player.level;
+        final BlockState cfj2 = bqb2.getBlockStatesIfLoaded(this.player.getBoundingBox().inflate(0.0, -0.4000000059604645, 0.0).deflate(0.001)).filter(cfj -> cfj.is(Blocks.BUBBLE_COLUMN)).findFirst().orElse(null);
+        if (cfj2 != null) {
+            if (!this.wasInBubbleColumn && !this.firstTick && cfj2.is(Blocks.BUBBLE_COLUMN) && !this.player.isSpectator()) {
+                final boolean boolean4 = cfj2.<Boolean>getValue((Property<Boolean>)BubbleColumnBlock.DRAG_DOWN);
                 if (boolean4) {
                     this.player.playSound(SoundEvents.BUBBLE_COLUMN_WHIRLPOOL_INSIDE, 1.0f, 1.0f);
                 }
diff --git a/src/net/minecraft/client/resources/sounds/ElytraOnPlayerSoundInstance.java b/src/net/minecraft/client/resources/sounds/ElytraOnPlayerSoundInstance.java
index b5c5e35..ecc3e27 100644
--- a/src/net/minecraft/client/resources/sounds/ElytraOnPlayerSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/ElytraOnPlayerSoundInstance.java
@@ -9,9 +9,9 @@ public class ElytraOnPlayerSoundInstance extends AbstractTickableSoundInstance {
     private final LocalPlayer player;
     private int time;
     
-    public ElytraOnPlayerSoundInstance(final LocalPlayer dqb) {
+    public ElytraOnPlayerSoundInstance(final LocalPlayer ebf) {
         super(SoundEvents.ELYTRA_FLYING, SoundSource.PLAYERS);
-        this.player = dqb;
+        this.player = ebf;
         this.looping = true;
         this.delay = 0;
         this.volume = 0.1f;
@@ -21,7 +21,7 @@ public class ElytraOnPlayerSoundInstance extends AbstractTickableSoundInstance {
     public void tick() {
         ++this.time;
         if (this.player.removed || (this.time > 20 && !this.player.isFallFlying())) {
-            this.stopped = true;
+            this.stop();
             return;
         }
         this.x = (float)this.player.getX();
diff --git a/src/net/minecraft/client/resources/sounds/EntityBoundSoundInstance.java b/src/net/minecraft/client/resources/sounds/EntityBoundSoundInstance.java
index 6f82212..06c0f70 100644
--- a/src/net/minecraft/client/resources/sounds/EntityBoundSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/EntityBoundSoundInstance.java
@@ -7,24 +7,29 @@ import net.minecraft.world.entity.Entity;
 public class EntityBoundSoundInstance extends AbstractTickableSoundInstance {
     private final Entity entity;
     
-    public EntityBoundSoundInstance(final SoundEvent aah, final SoundSource aaj, final Entity akq) {
-        this(aah, aaj, 1.0f, 1.0f, akq);
+    public EntityBoundSoundInstance(final SoundEvent ack, final SoundSource acm, final Entity aom) {
+        this(ack, acm, 1.0f, 1.0f, aom);
     }
     
-    public EntityBoundSoundInstance(final SoundEvent aah, final SoundSource aaj, final float float3, final float float4, final Entity akq) {
-        super(aah, aaj);
+    public EntityBoundSoundInstance(final SoundEvent ack, final SoundSource acm, final float float3, final float float4, final Entity aom) {
+        super(ack, acm);
         this.volume = float3;
         this.pitch = float4;
-        this.entity = akq;
+        this.entity = aom;
         this.x = (float)this.entity.getX();
         this.y = (float)this.entity.getY();
         this.z = (float)this.entity.getZ();
     }
     
+    @Override
+    public boolean canPlaySound() {
+        return !this.entity.isSilent();
+    }
+    
     @Override
     public void tick() {
         if (this.entity.removed) {
-            this.stopped = true;
+            this.stop();
             return;
         }
         this.x = (float)this.entity.getX();
diff --git a/src/net/minecraft/client/resources/sounds/GuardianAttackSoundInstance.java b/src/net/minecraft/client/resources/sounds/GuardianAttackSoundInstance.java
index 3cb1eae..3b4f948 100644
--- a/src/net/minecraft/client/resources/sounds/GuardianAttackSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/GuardianAttackSoundInstance.java
@@ -7,18 +7,23 @@ import net.minecraft.world.entity.monster.Guardian;
 public class GuardianAttackSoundInstance extends AbstractTickableSoundInstance {
     private final Guardian guardian;
     
-    public GuardianAttackSoundInstance(final Guardian aws) {
+    public GuardianAttackSoundInstance(final Guardian bbx) {
         super(SoundEvents.GUARDIAN_ATTACK, SoundSource.HOSTILE);
-        this.guardian = aws;
+        this.guardian = bbx;
         this.attenuation = SoundInstance.Attenuation.NONE;
         this.looping = true;
         this.delay = 0;
     }
     
+    @Override
+    public boolean canPlaySound() {
+        return !this.guardian.isSilent();
+    }
+    
     @Override
     public void tick() {
         if (this.guardian.removed || this.guardian.getTarget() != null) {
-            this.stopped = true;
+            this.stop();
             return;
         }
         this.x = (float)this.guardian.getX();
diff --git a/src/net/minecraft/client/resources/sounds/MinecartSoundInstance.java b/src/net/minecraft/client/resources/sounds/MinecartSoundInstance.java
index 474e2a7..1788b8b 100644
--- a/src/net/minecraft/client/resources/sounds/MinecartSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/MinecartSoundInstance.java
@@ -10,16 +10,21 @@ public class MinecartSoundInstance extends AbstractTickableSoundInstance {
     private final AbstractMinecart minecart;
     private float pitch;
     
-    public MinecartSoundInstance(final AbstractMinecart azx) {
+    public MinecartSoundInstance(final AbstractMinecart bfr) {
         super(SoundEvents.MINECART_RIDING, SoundSource.NEUTRAL);
         this.pitch = 0.0f;
-        this.minecart = azx;
+        this.minecart = bfr;
         this.looping = true;
         this.delay = 0;
         this.volume = 0.0f;
-        this.x = (float)azx.getX();
-        this.y = (float)azx.getY();
-        this.z = (float)azx.getZ();
+        this.x = (float)bfr.getX();
+        this.y = (float)bfr.getY();
+        this.z = (float)bfr.getZ();
+    }
+    
+    @Override
+    public boolean canPlaySound() {
+        return !this.minecart.isSilent();
     }
     
     @Override
@@ -30,7 +35,7 @@ public class MinecartSoundInstance extends AbstractTickableSoundInstance {
     @Override
     public void tick() {
         if (this.minecart.removed) {
-            this.stopped = true;
+            this.stop();
             return;
         }
         this.x = (float)this.minecart.getX();
diff --git a/src/net/minecraft/client/resources/sounds/RidingMinecartSoundInstance.java b/src/net/minecraft/client/resources/sounds/RidingMinecartSoundInstance.java
index 7dcf1dc..69d2fdf 100644
--- a/src/net/minecraft/client/resources/sounds/RidingMinecartSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/RidingMinecartSoundInstance.java
@@ -11,16 +11,21 @@ public class RidingMinecartSoundInstance extends AbstractTickableSoundInstance {
     private final Player player;
     private final AbstractMinecart minecart;
     
-    public RidingMinecartSoundInstance(final Player ayj, final AbstractMinecart azx) {
+    public RidingMinecartSoundInstance(final Player bec, final AbstractMinecart bfr) {
         super(SoundEvents.MINECART_INSIDE, SoundSource.NEUTRAL);
-        this.player = ayj;
-        this.minecart = azx;
+        this.player = bec;
+        this.minecart = bfr;
         this.attenuation = SoundInstance.Attenuation.NONE;
         this.looping = true;
         this.delay = 0;
         this.volume = 0.0f;
     }
     
+    @Override
+    public boolean canPlaySound() {
+        return !this.minecart.isSilent();
+    }
+    
     @Override
     public boolean canStartSilent() {
         return true;
@@ -29,7 +34,7 @@ public class RidingMinecartSoundInstance extends AbstractTickableSoundInstance {
     @Override
     public void tick() {
         if (this.minecart.removed || !this.player.isPassenger() || this.player.getVehicle() != this.minecart) {
-            this.stopped = true;
+            this.stop();
             return;
         }
         final float float2 = Mth.sqrt(Entity.getHorizontalDistanceSqr(this.minecart.getDeltaMovement()));
diff --git a/src/net/minecraft/client/resources/sounds/SimpleSoundInstance.java b/src/net/minecraft/client/resources/sounds/SimpleSoundInstance.java
index 3b4d165..6b34cd7 100644
--- a/src/net/minecraft/client/resources/sounds/SimpleSoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/SimpleSoundInstance.java
@@ -6,41 +6,53 @@ import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvent;
 
 public class SimpleSoundInstance extends AbstractSoundInstance {
-    public SimpleSoundInstance(final SoundEvent aah, final SoundSource aaj, final float float3, final float float4, final BlockPos fk) {
-        this(aah, aaj, float3, float4, fk.getX() + 0.5f, fk.getY() + 0.5f, fk.getZ() + 0.5f);
+    public SimpleSoundInstance(final SoundEvent ack, final SoundSource acm, final float float3, final float float4, final BlockPos fu) {
+        this(ack, acm, float3, float4, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5);
     }
     
-    public static SimpleSoundInstance forUI(final SoundEvent aah, final float float2) {
-        return forUI(aah, float2, 0.25f);
+    public static SimpleSoundInstance forUI(final SoundEvent ack, final float float2) {
+        return forUI(ack, float2, 0.25f);
     }
     
-    public static SimpleSoundInstance forUI(final SoundEvent aah, final float float2, final float float3) {
-        return new SimpleSoundInstance(aah.getLocation(), SoundSource.MASTER, float3, float2, false, 0, SoundInstance.Attenuation.NONE, 0.0f, 0.0f, 0.0f, true);
+    public static SimpleSoundInstance forUI(final SoundEvent ack, final float float2, final float float3) {
+        return new SimpleSoundInstance(ack.getLocation(), SoundSource.MASTER, float3, float2, false, 0, SoundInstance.Attenuation.NONE, 0.0, 0.0, 0.0, true);
     }
     
-    public static SimpleSoundInstance forMusic(final SoundEvent aah) {
-        return new SimpleSoundInstance(aah.getLocation(), SoundSource.MUSIC, 1.0f, 1.0f, false, 0, SoundInstance.Attenuation.NONE, 0.0f, 0.0f, 0.0f, true);
+    public static SimpleSoundInstance forMusic(final SoundEvent ack) {
+        return new SimpleSoundInstance(ack.getLocation(), SoundSource.MUSIC, 1.0f, 1.0f, false, 0, SoundInstance.Attenuation.NONE, 0.0, 0.0, 0.0, true);
     }
     
-    public static SimpleSoundInstance forRecord(final SoundEvent aah, final float float2, final float float3, final float float4) {
-        return new SimpleSoundInstance(aah, SoundSource.RECORDS, 4.0f, 1.0f, false, 0, SoundInstance.Attenuation.LINEAR, float2, float3, float4);
+    public static SimpleSoundInstance forRecord(final SoundEvent ack, final double double2, final double double3, final double double4) {
+        return new SimpleSoundInstance(ack, SoundSource.RECORDS, 4.0f, 1.0f, false, 0, SoundInstance.Attenuation.LINEAR, double2, double3, double4);
     }
     
-    public SimpleSoundInstance(final SoundEvent aah, final SoundSource aaj, final float float3, final float float4, final float float5, final float float6, final float float7) {
-        this(aah, aaj, float3, float4, false, 0, SoundInstance.Attenuation.LINEAR, float5, float6, float7);
+    public static SimpleSoundInstance forLocalAmbience(final SoundEvent ack, final float float2, final float float3) {
+        return new SimpleSoundInstance(ack.getLocation(), SoundSource.AMBIENT, float3, float2, false, 0, SoundInstance.Attenuation.NONE, 0.0, 0.0, 0.0, true);
     }
     
-    private SimpleSoundInstance(final SoundEvent aah, final SoundSource aaj, final float float3, final float float4, final boolean boolean5, final int integer, final SoundInstance.Attenuation a, final float float8, final float float9, final float float10) {
-        this(aah.getLocation(), aaj, float3, float4, boolean5, integer, a, float8, float9, float10, false);
+    public static SimpleSoundInstance forAmbientAddition(final SoundEvent ack) {
+        return forLocalAmbience(ack, 1.0f, 1.0f);
     }
     
-    public SimpleSoundInstance(final ResourceLocation sm, final SoundSource aaj, final float float3, final float float4, final boolean boolean5, final int integer, final SoundInstance.Attenuation a, final float float8, final float float9, final float float10, final boolean boolean11) {
-        super(sm, aaj);
+    public static SimpleSoundInstance forAmbientMood(final SoundEvent ack, final double double2, final double double3, final double double4) {
+        return new SimpleSoundInstance(ack, SoundSource.AMBIENT, 1.0f, 1.0f, false, 0, SoundInstance.Attenuation.LINEAR, double2, double3, double4);
+    }
+    
+    public SimpleSoundInstance(final SoundEvent ack, final SoundSource acm, final float float3, final float float4, final double double5, final double double6, final double double7) {
+        this(ack, acm, float3, float4, false, 0, SoundInstance.Attenuation.LINEAR, double5, double6, double7);
+    }
+    
+    private SimpleSoundInstance(final SoundEvent ack, final SoundSource acm, final float float3, final float float4, final boolean boolean5, final int integer, final SoundInstance.Attenuation a, final double double8, final double double9, final double double10) {
+        this(ack.getLocation(), acm, float3, float4, boolean5, integer, a, double8, double9, double10, false);
+    }
+    
+    public SimpleSoundInstance(final ResourceLocation uh, final SoundSource acm, final float float3, final float float4, final boolean boolean5, final int integer, final SoundInstance.Attenuation a, final double double8, final double double9, final double double10, final boolean boolean11) {
+        super(uh, acm);
         this.volume = float3;
         this.pitch = float4;
-        this.x = float8;
-        this.y = float9;
-        this.z = float10;
+        this.x = double8;
+        this.y = double9;
+        this.z = double10;
         this.looping = boolean5;
         this.delay = integer;
         this.attenuation = a;
diff --git a/src/net/minecraft/client/resources/sounds/Sound.java b/src/net/minecraft/client/resources/sounds/Sound.java
index 2d23338..26aeea3 100644
--- a/src/net/minecraft/client/resources/sounds/Sound.java
+++ b/src/net/minecraft/client/resources/sounds/Sound.java
@@ -52,9 +52,9 @@ public class Sound implements Weighted<Sound> {
     }
     
     @Override
-    public void preloadIfRequired(final SoundEngine edw) {
+    public void preloadIfRequired(final SoundEngine epk) {
         if (this.preload) {
-            edw.requestPreload(this);
+            epk.requestPreload(this);
         }
     }
     
@@ -74,6 +74,11 @@ public class Sound implements Weighted<Sound> {
         return this.attenuationDistance;
     }
     
+    @Override
+    public String toString() {
+        return "Sound[" + this.location + "]";
+    }
+    
     public enum Type {
         FILE("file"), 
         SOUND_EVENT("event");
diff --git a/src/net/minecraft/client/resources/sounds/SoundInstance.java b/src/net/minecraft/client/resources/sounds/SoundInstance.java
index 679c082..2a67e09 100644
--- a/src/net/minecraft/client/resources/sounds/SoundInstance.java
+++ b/src/net/minecraft/client/resources/sounds/SoundInstance.java
@@ -10,7 +10,7 @@ public interface SoundInstance {
     ResourceLocation getLocation();
     
     @Nullable
-    WeighedSoundEvents resolve(final SoundManager edz);
+    WeighedSoundEvents resolve(final SoundManager epn);
     
     Sound getSound();
     
@@ -26,11 +26,11 @@ public interface SoundInstance {
     
     float getPitch();
     
-    float getX();
+    double getX();
     
-    float getY();
+    double getY();
     
-    float getZ();
+    double getZ();
     
     Attenuation getAttenuation();
     
@@ -38,6 +38,10 @@ public interface SoundInstance {
         return false;
     }
     
+    default boolean canPlaySound() {
+        return true;
+    }
+    
     public enum Attenuation {
         NONE, 
         LINEAR;
diff --git a/src/net/minecraft/client/resources/sounds/UnderwaterAmbientSoundHandler.java b/src/net/minecraft/client/resources/sounds/UnderwaterAmbientSoundHandler.java
index 53b939a..045295f 100644
--- a/src/net/minecraft/client/resources/sounds/UnderwaterAmbientSoundHandler.java
+++ b/src/net/minecraft/client/resources/sounds/UnderwaterAmbientSoundHandler.java
@@ -7,29 +7,29 @@ import net.minecraft.client.player.LocalPlayer;
 public class UnderwaterAmbientSoundHandler implements AmbientSoundHandler {
     private final LocalPlayer player;
     private final SoundManager soundManager;
-    private int tick_delay;
+    private int tickDelay;
     
-    public UnderwaterAmbientSoundHandler(final LocalPlayer dqb, final SoundManager edz) {
-        this.tick_delay = 0;
-        this.player = dqb;
-        this.soundManager = edz;
+    public UnderwaterAmbientSoundHandler(final LocalPlayer ebf, final SoundManager epn) {
+        this.tickDelay = 0;
+        this.player = ebf;
+        this.soundManager = epn;
     }
     
     @Override
     public void tick() {
-        --this.tick_delay;
-        if (this.tick_delay <= 0 && this.player.isUnderWater()) {
+        --this.tickDelay;
+        if (this.tickDelay <= 0 && this.player.isUnderWater()) {
             final float float2 = this.player.level.random.nextFloat();
             if (float2 < 1.0E-4f) {
-                this.tick_delay = 0;
+                this.tickDelay = 0;
                 this.soundManager.play(new UnderwaterAmbientSoundInstances.SubSound(this.player, SoundEvents.AMBIENT_UNDERWATER_LOOP_ADDITIONS_ULTRA_RARE));
             }
             else if (float2 < 0.001f) {
-                this.tick_delay = 0;
+                this.tickDelay = 0;
                 this.soundManager.play(new UnderwaterAmbientSoundInstances.SubSound(this.player, SoundEvents.AMBIENT_UNDERWATER_LOOP_ADDITIONS_RARE));
             }
             else if (float2 < 0.01f) {
-                this.tick_delay = 0;
+                this.tickDelay = 0;
                 this.soundManager.play(new UnderwaterAmbientSoundInstances.SubSound(this.player, SoundEvents.AMBIENT_UNDERWATER_LOOP_ADDITIONS));
             }
         }
diff --git a/src/net/minecraft/client/resources/sounds/UnderwaterAmbientSoundInstances.java b/src/net/minecraft/client/resources/sounds/UnderwaterAmbientSoundInstances.java
index 2b8c039..159aa31 100644
--- a/src/net/minecraft/client/resources/sounds/UnderwaterAmbientSoundInstances.java
+++ b/src/net/minecraft/client/resources/sounds/UnderwaterAmbientSoundInstances.java
@@ -9,9 +9,9 @@ public class UnderwaterAmbientSoundInstances {
     public static class SubSound extends AbstractTickableSoundInstance {
         private final LocalPlayer player;
         
-        protected SubSound(final LocalPlayer dqb, final SoundEvent aah) {
-            super(aah, SoundSource.AMBIENT);
-            this.player = dqb;
+        protected SubSound(final LocalPlayer ebf, final SoundEvent ack) {
+            super(ack, SoundSource.AMBIENT);
+            this.player = ebf;
             this.looping = false;
             this.delay = 0;
             this.volume = 1.0f;
@@ -22,7 +22,7 @@ public class UnderwaterAmbientSoundInstances {
         @Override
         public void tick() {
             if (this.player.removed || !this.player.isUnderWater()) {
-                this.stopped = true;
+                this.stop();
             }
         }
     }
@@ -31,9 +31,9 @@ public class UnderwaterAmbientSoundInstances {
         private final LocalPlayer player;
         private int fade;
         
-        public UnderwaterAmbientSoundInstance(final LocalPlayer dqb) {
+        public UnderwaterAmbientSoundInstance(final LocalPlayer ebf) {
             super(SoundEvents.AMBIENT_UNDERWATER_LOOP, SoundSource.AMBIENT);
-            this.player = dqb;
+            this.player = ebf;
             this.looping = true;
             this.delay = 0;
             this.volume = 1.0f;
@@ -44,7 +44,7 @@ public class UnderwaterAmbientSoundInstances {
         @Override
         public void tick() {
             if (this.player.removed || this.fade < 0) {
-                this.stopped = true;
+                this.stop();
                 return;
             }
             if (this.player.isUnderWater()) {
diff --git a/src/net/minecraft/client/searchtree/ReloadableIdSearchTree.java b/src/net/minecraft/client/searchtree/ReloadableIdSearchTree.java
index 2970bba..e9c3dcd 100644
--- a/src/net/minecraft/client/searchtree/ReloadableIdSearchTree.java
+++ b/src/net/minecraft/client/searchtree/ReloadableIdSearchTree.java
@@ -54,9 +54,9 @@ public class ReloadableIdSearchTree<T> implements MutableSearchTree<T> {
     }
     
     protected void index(final T object) {
-        this.idGetter.apply(object).forEach(sm -> {
-            this.namespaceTree.add(object, sm.getNamespace().toLowerCase(Locale.ROOT));
-            this.pathTree.add(object, sm.getPath().toLowerCase(Locale.ROOT));
+        this.idGetter.apply(object).forEach(uh -> {
+            this.namespaceTree.add(object, uh.getNamespace().toLowerCase(Locale.ROOT));
+            this.pathTree.add(object, uh.getPath().toLowerCase(Locale.ROOT));
         });
     }
     
diff --git a/src/net/minecraft/client/searchtree/SearchRegistry.java b/src/net/minecraft/client/searchtree/SearchRegistry.java
index 2eacec9..a20a913 100644
--- a/src/net/minecraft/client/searchtree/SearchRegistry.java
+++ b/src/net/minecraft/client/searchtree/SearchRegistry.java
@@ -19,14 +19,14 @@ public class SearchRegistry implements ResourceManagerReloadListener {
     }
     
     @Override
-    public void onResourceManagerReload(final ResourceManager zb) {
-        for (final MutableSearchTree<?> ede4 : this.searchTrees.values()) {
-            ede4.refresh();
+    public void onResourceManagerReload(final ResourceManager abc) {
+        for (final MutableSearchTree<?> eor4 : this.searchTrees.values()) {
+            eor4.refresh();
         }
     }
     
-    public <T> void register(final Key<T> a, final MutableSearchTree<T> ede) {
-        this.searchTrees.put(a, ede);
+    public <T> void register(final Key<T> a, final MutableSearchTree<T> eor) {
+        this.searchTrees.put(a, eor);
     }
     
     public <T> MutableSearchTree<T> getTree(final Key<T> a) {
diff --git a/src/net/minecraft/client/server/IntegratedPlayerList.java b/src/net/minecraft/client/server/IntegratedPlayerList.java
index c9024b7..fcb3613 100644
--- a/src/net/minecraft/client/server/IntegratedPlayerList.java
+++ b/src/net/minecraft/client/server/IntegratedPlayerList.java
@@ -6,29 +6,31 @@ import com.mojang.authlib.GameProfile;
 import java.net.SocketAddress;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.storage.PlayerDataStorage;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.players.PlayerList;
 
 public class IntegratedPlayerList extends PlayerList {
     private CompoundTag playerData;
     
-    public IntegratedPlayerList(final IntegratedServer edm) {
-        super(edm, 8);
+    public IntegratedPlayerList(final IntegratedServer eoz, final RegistryAccess.RegistryHolder a, final PlayerDataStorage dai) {
+        super(eoz, a, dai, 8);
         this.setViewDistance(10);
     }
     
     @Override
-    protected void save(final ServerPlayer xe) {
-        if (xe.getName().getString().equals(this.getServer().getSingleplayerName())) {
-            this.playerData = xe.saveWithoutId(new CompoundTag());
+    protected void save(final ServerPlayer ze) {
+        if (ze.getName().getString().equals(this.getServer().getSingleplayerName())) {
+            this.playerData = ze.saveWithoutId(new CompoundTag());
         }
-        super.save(xe);
+        super.save(ze);
     }
     
     @Override
     public Component canPlayerLogin(final SocketAddress socketAddress, final GameProfile gameProfile) {
         if (gameProfile.getName().equalsIgnoreCase(this.getServer().getSingleplayerName()) && this.getPlayerByName(gameProfile.getName()) != null) {
-            return new TranslatableComponent("multiplayer.disconnect.name_taken", new Object[0]);
+            return new TranslatableComponent("multiplayer.disconnect.name_taken");
         }
         return super.canPlayerLogin(socketAddress, gameProfile);
     }
diff --git a/src/net/minecraft/client/server/IntegratedServer.java b/src/net/minecraft/client/server/IntegratedServer.java
index 2529ef9..863cabd 100644
--- a/src/net/minecraft/client/server/IntegratedServer.java
+++ b/src/net/minecraft/client/server/IntegratedServer.java
@@ -6,35 +6,31 @@ import com.mojang.authlib.GameProfile;
 import java.util.ArrayList;
 import com.google.common.collect.Lists;
 import java.util.Iterator;
+import java.io.IOException;
 import net.minecraft.server.level.ServerPlayer;
 import java.net.InetAddress;
+import net.minecraft.world.level.GameType;
 import net.minecraft.world.Snooper;
 import net.minecraft.client.ClientBrandRetriever;
 import java.util.Optional;
 import net.minecraft.CrashReport;
-import net.minecraft.world.Difficulty;
-import net.minecraft.world.level.GameType;
-import net.minecraft.util.profiling.GameProfiler;
+import java.io.File;
+import net.minecraft.util.profiling.ProfilerFiller;
 import java.util.function.BooleanSupplier;
-import java.io.IOException;
 import net.minecraft.util.Crypt;
 import net.minecraft.SharedConstants;
-import net.minecraft.server.level.progress.ChunkProgressListener;
-import net.minecraft.world.level.storage.LevelStorage;
-import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.storage.LevelData;
-import com.google.gson.JsonElement;
-import net.minecraft.world.level.LevelType;
 import net.minecraft.server.players.PlayerList;
-import net.minecraft.commands.Commands;
-import java.io.File;
 import net.minecraft.server.level.progress.ChunkProgressListenerFactory;
 import net.minecraft.server.players.GameProfileCache;
 import com.mojang.authlib.GameProfileRepository;
 import com.mojang.authlib.minecraft.MinecraftSessionService;
-import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import net.minecraft.world.level.storage.WorldData;
+import net.minecraft.server.ServerResources;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.world.level.storage.LevelStorageSource;
+import net.minecraft.core.RegistryAccess;
 import java.util.UUID;
-import net.minecraft.world.level.LevelSettings;
 import net.minecraft.client.Minecraft;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.server.MinecraftServer;
@@ -42,70 +38,43 @@ import net.minecraft.server.MinecraftServer;
 public class IntegratedServer extends MinecraftServer {
     private static final Logger LOGGER;
     private final Minecraft minecraft;
-    private final LevelSettings settings;
     private boolean paused;
     private int publishedPort;
     private LanServerPinger lanPinger;
     private UUID uuid;
     
-    public IntegratedServer(final Minecraft dbn, final String string2, final String string3, final LevelSettings bka, final YggdrasilAuthenticationService yggdrasilAuthenticationService, final MinecraftSessionService minecraftSessionService, final GameProfileRepository gameProfileRepository, final GameProfileCache zk, final ChunkProgressListenerFactory xn) {
-        super(new File(dbn.gameDirectory, "saves"), dbn.getProxy(), dbn.getFixerUpper(), new Commands(false), yggdrasilAuthenticationService, minecraftSessionService, gameProfileRepository, zk, xn, string2);
+    public IntegratedServer(final Thread thread, final Minecraft dlx, final RegistryAccess.RegistryHolder a, final LevelStorageSource.LevelStorageAccess a, final PackRepository<Pack> aar, final ServerResources uw, final WorldData dal, final MinecraftSessionService minecraftSessionService, final GameProfileRepository gameProfileRepository, final GameProfileCache abl, final ChunkProgressListenerFactory zn) {
+        super(thread, a, a, dal, aar, dlx.getProxy(), dlx.getFixerUpper(), uw, minecraftSessionService, gameProfileRepository, abl, zn);
         this.publishedPort = -1;
-        this.setSingleplayerName(dbn.getUser().getName());
-        this.setLevelName(string3);
-        this.setDemo(dbn.isDemo());
-        this.setBonusChest(bka.hasStartingBonusItems());
+        this.setSingleplayerName(dlx.getUser().getName());
+        this.setDemo(dlx.isDemo());
         this.setMaxBuildHeight(256);
-        this.setPlayerList(new IntegratedPlayerList(this));
-        this.minecraft = dbn;
-        this.settings = (this.isDemo() ? MinecraftServer.DEMO_SETTINGS : bka);
+        this.setPlayerList(new IntegratedPlayerList(this, this.registryHolder, this.playerDataStorage));
+        this.minecraft = dlx;
     }
     
-    public void loadLevel(final String string1, final String string2, final long long3, final LevelType bkd, final JsonElement jsonElement) {
-        this.ensureLevelConversion(string1);
-        final LevelStorage crn8 = this.getStorageSource().selectLevel(string1, this);
-        this.detectBundledResources(this.getLevelIdName(), crn8);
-        LevelData crm9 = crn8.prepareLevel();
-        if (crm9 == null) {
-            crm9 = new LevelData(this.settings, string2);
-        }
-        else {
-            crm9.setLevelName(string2);
-        }
-        crm9.setModdedInfo(this.getServerModName(), this.getModdedStatus().isPresent());
-        this.loadDataPacks(crn8.getFolder(), crm9);
-        final ChunkProgressListener xm10 = this.progressListenerFactory.create(11);
-        this.createLevels(crn8, crm9, this.settings, xm10);
-        if (this.getLevel(DimensionType.OVERWORLD).getLevelData().getDifficulty() == null) {
-            this.setDifficulty(this.minecraft.options.difficulty, true);
-        }
-        this.prepareLevels(xm10);
-    }
-    
-    public boolean initServer() throws IOException {
+    public boolean initServer() {
         IntegratedServer.LOGGER.info("Starting integrated minecraft server version " + SharedConstants.getCurrentVersion().getName());
         this.setUsesAuthentication(true);
-        this.setAnimals(true);
-        this.setNpcsEnabled(true);
         this.setPvpAllowed(true);
         this.setFlightAllowed(true);
         IntegratedServer.LOGGER.info("Generating keypair");
         this.setKeyPair(Crypt.generateKeyPair());
-        this.loadLevel(this.getLevelIdName(), this.getLevelName(), this.settings.getSeed(), this.settings.getLevelType(), this.settings.getLevelTypeOptions());
-        this.setMotd(this.getSingleplayerName() + " - " + this.getLevel(DimensionType.OVERWORLD).getLevelData().getLevelName());
+        this.loadLevel();
+        this.setMotd(this.getSingleplayerName() + " - " + this.getWorldData().getLevelName());
         return true;
     }
     
     public void tickServer(final BooleanSupplier booleanSupplier) {
         final boolean boolean3 = this.paused;
         this.paused = (Minecraft.getInstance().getConnection() != null && Minecraft.getInstance().isPaused());
-        final GameProfiler aik4 = this.getProfiler();
+        final ProfilerFiller ami4 = this.getProfiler();
         if (!boolean3 && this.paused) {
-            aik4.push("autoSave");
+            ami4.push("autoSave");
             IntegratedServer.LOGGER.info("Saving and pausing game...");
             this.getPlayerList().saveAll();
             this.saveAllChunks(false, false, false);
-            aik4.pop();
+            ami4.pop();
         }
         if (this.paused) {
             return;
@@ -118,26 +87,6 @@ public class IntegratedServer extends MinecraftServer {
         }
     }
     
-    @Override
-    public boolean canGenerateStructures() {
-        return false;
-    }
-    
-    @Override
-    public GameType getDefaultGameType() {
-        return this.settings.getGameType();
-    }
-    
-    @Override
-    public Difficulty getDefaultDifficulty() {
-        return this.minecraft.level.getLevelData().getDifficulty();
-    }
-    
-    @Override
-    public boolean isHardcore() {
-        return this.settings.isHardcore();
-    }
-    
     @Override
     public boolean shouldRconBroadcast() {
         return true;
@@ -163,16 +112,16 @@ public class IntegratedServer extends MinecraftServer {
         return false;
     }
     
-    public void onServerCrash(final CrashReport h) {
-        this.minecraft.delayCrash(h);
+    public void onServerCrash(final CrashReport j) {
+        this.minecraft.delayCrash(j);
     }
     
     @Override
-    public CrashReport fillReport(CrashReport h) {
-        h = super.fillReport(h);
-        h.getSystemDetails().setDetail("Type", "Integrated Server (map_client.txt)");
-        h.getSystemDetails().setDetail("Is Modded", () -> this.getModdedStatus().orElse("Probably not. Jar signature remains and both client + server brands are untouched."));
-        return h;
+    public CrashReport fillReport(CrashReport j) {
+        j = super.fillReport(j);
+        j.getSystemDetails().setDetail("Type", "Integrated Server (map_client.txt)");
+        j.getSystemDetails().setDetail("Is Modded", () -> this.getModdedStatus().orElse("Probably not. Jar signature remains and both client + server brands are untouched."));
+        return j;
     }
     
     @Override
@@ -192,24 +141,24 @@ public class IntegratedServer extends MinecraftServer {
     }
     
     @Override
-    public void populateSnooper(final Snooper ajs) {
-        super.populateSnooper(ajs);
-        ajs.setDynamicData("snooper_partner", this.minecraft.getSnooper().getToken());
+    public void populateSnooper(final Snooper ano) {
+        super.populateSnooper(ano);
+        ano.setDynamicData("snooper_partner", this.minecraft.getSnooper().getToken());
     }
     
     @Override
-    public boolean publishServer(final GameType bjt, final boolean boolean2, final int integer) {
+    public boolean publishServer(final GameType bpy, final boolean boolean2, final int integer) {
         try {
             this.getConnection().startTcpServerListener(null, integer);
             IntegratedServer.LOGGER.info("Started serving on {}", integer);
             this.publishedPort = integer;
             (this.lanPinger = new LanServerPinger(this.getMotd(), integer + "")).start();
-            this.getPlayerList().setOverrideGameMode(bjt);
+            this.getPlayerList().setOverrideGameMode(bpy);
             this.getPlayerList().setAllowCheatsForAllPlayers(boolean2);
             final int integer2 = this.getProfilePermissions(this.minecraft.player.getGameProfile());
             this.minecraft.player.setPermissionLevel(integer2);
-            for (final ServerPlayer xe7 : this.getPlayerList().getPlayers()) {
-                this.getCommands().sendCommands(xe7);
+            for (final ServerPlayer ze7 : this.getPlayerList().getPlayers()) {
+                this.getCommands().sendCommands(ze7);
             }
             return true;
         }
@@ -230,14 +179,14 @@ public class IntegratedServer extends MinecraftServer {
     public void halt(final boolean boolean1) {
         final ArrayList<Object> list2;
         final Iterator<ServerPlayer> iterator;
-        ServerPlayer xe4;
+        ServerPlayer ze4;
         this.executeBlocking(() -> {
             list2 = Lists.newArrayList(this.getPlayerList().getPlayers());
             list2.iterator();
             while (iterator.hasNext()) {
-                xe4 = iterator.next();
-                if (!xe4.getUUID().equals(this.uuid)) {
-                    this.getPlayerList().remove(xe4);
+                ze4 = iterator.next();
+                if (!ze4.getUUID().equals(this.uuid)) {
+                    this.getPlayerList().remove(ze4);
                 }
             }
             return;
@@ -260,9 +209,9 @@ public class IntegratedServer extends MinecraftServer {
     }
     
     @Override
-    public void setDefaultGameMode(final GameType bjt) {
-        super.setDefaultGameMode(bjt);
-        this.getPlayerList().setOverrideGameMode(bjt);
+    public void setDefaultGameType(final GameType bpy) {
+        super.setDefaultGameType(bpy);
+        this.getPlayerList().setOverrideGameMode(bpy);
     }
     
     @Override
@@ -289,6 +238,16 @@ public class IntegratedServer extends MinecraftServer {
         return gameProfile.getName().equalsIgnoreCase(this.getSingleplayerName());
     }
     
+    @Override
+    public int getScaledTrackingDistance(final int integer) {
+        return (int)(this.minecraft.options.entityDistanceScaling * integer);
+    }
+    
+    @Override
+    public boolean forceSynchronousWrites() {
+        return this.minecraft.options.syncWrites;
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
     }
diff --git a/src/net/minecraft/client/server/LanServerDetection.java b/src/net/minecraft/client/server/LanServerDetection.java
index bc81f47..4e6be04 100644
--- a/src/net/minecraft/client/server/LanServerDetection.java
+++ b/src/net/minecraft/client/server/LanServerDetection.java
@@ -52,9 +52,9 @@ public class LanServerDetection {
             }
             string3 = inetAddress.getHostAddress() + ":" + string3;
             boolean boolean6 = false;
-            for (final LanServer edn8 : this.servers) {
-                if (edn8.getAddress().equals(string3)) {
-                    edn8.updatePingTime();
+            for (final LanServer epa8 : this.servers) {
+                if (epa8.getAddress().equals(string3)) {
+                    epa8.updatePingTime();
                     boolean6 = true;
                     break;
                 }
diff --git a/src/net/minecraft/client/sounds/AudioStream.java b/src/net/minecraft/client/sounds/AudioStream.java
index a5b3561..b7c47eb 100644
--- a/src/net/minecraft/client/sounds/AudioStream.java
+++ b/src/net/minecraft/client/sounds/AudioStream.java
@@ -1,6 +1,5 @@
 package net.minecraft.client.sounds;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import javax.sound.sampled.AudioFormat;
@@ -9,8 +8,5 @@ import java.io.Closeable;
 public interface AudioStream extends Closeable {
     AudioFormat getFormat();
     
-    ByteBuffer readAll() throws IOException;
-    
-    @Nullable
     ByteBuffer read(final int integer) throws IOException;
 }
diff --git a/src/net/minecraft/client/sounds/ChannelAccess.java b/src/net/minecraft/client/sounds/ChannelAccess.java
index feb0a49..ab0b866 100644
--- a/src/net/minecraft/client/sounds/ChannelAccess.java
+++ b/src/net/minecraft/client/sounds/ChannelAccess.java
@@ -1,11 +1,13 @@
 package net.minecraft.client.sounds;
 
+import javax.annotation.Nullable;
 import java.util.Iterator;
 import java.util.function.Predicate;
 import java.util.Objects;
 import java.util.stream.Stream;
 import java.util.function.Consumer;
 import com.mojang.blaze3d.audio.Channel;
+import java.util.concurrent.CompletableFuture;
 import com.google.common.collect.Sets;
 import java.util.concurrent.Executor;
 import com.mojang.blaze3d.audio.Library;
@@ -16,25 +18,30 @@ public class ChannelAccess {
     private final Library library;
     private final Executor executor;
     
-    public ChannelAccess(final Library cwt, final Executor executor) {
+    public ChannelAccess(final Library dfu, final Executor executor) {
         this.channels = Sets.<ChannelHandle>newIdentityHashSet();
-        this.library = cwt;
+        this.library = dfu;
         this.executor = executor;
     }
     
-    public ChannelHandle createHandle(final Library.Pool c) {
-        final ChannelHandle a3 = new ChannelHandle();
-        final Channel cws4;
-        final ChannelHandle a4;
+    public CompletableFuture<ChannelHandle> createHandle(final Library.Pool c) {
+        final CompletableFuture<ChannelHandle> completableFuture3 = new CompletableFuture<ChannelHandle>();
+        final Channel dft4;
+        ChannelHandle a5;
+        final CompletableFuture<ChannelHandle> completableFuture4;
         this.executor.execute(() -> {
-            cws4 = this.library.acquireChannel(c);
-            if (cws4 != null) {
-                a4.channel = cws4;
-                this.channels.add(a4);
+            dft4 = this.library.acquireChannel(c);
+            if (dft4 != null) {
+                a5 = new ChannelHandle(dft4);
+                this.channels.add(a5);
+                completableFuture4.complete(a5);
+            }
+            else {
+                completableFuture4.complete(null);
             }
             return;
         });
-        return a3;
+        return completableFuture3;
     }
     
     public void executeOnChannels(final Consumer<Stream<Channel>> consumer) {
@@ -63,6 +70,7 @@ public class ChannelAccess {
     }
     
     public class ChannelHandle {
+        @Nullable
         private Channel channel;
         private boolean stopped;
         
@@ -70,6 +78,10 @@ public class ChannelAccess {
             return this.stopped;
         }
         
+        public ChannelHandle(final Channel dft) {
+            this.channel = dft;
+        }
+        
         public void execute(final Consumer<Channel> consumer) {
             ChannelAccess.this.executor.execute(() -> {
                 if (this.channel != null) {
diff --git a/src/net/minecraft/client/sounds/LoopingAudioStream.java b/src/net/minecraft/client/sounds/LoopingAudioStream.java
new file mode 100644
index 0000000..fa940ce
--- /dev/null
+++ b/src/net/minecraft/client/sounds/LoopingAudioStream.java
@@ -0,0 +1,58 @@
+package net.minecraft.client.sounds;
+
+import java.io.FilterInputStream;
+import java.nio.ByteBuffer;
+import javax.sound.sampled.AudioFormat;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.BufferedInputStream;
+
+public class LoopingAudioStream implements AudioStream {
+    private final AudioStreamProvider provider;
+    private AudioStream stream;
+    private final BufferedInputStream bufferedInputStream;
+    
+    public LoopingAudioStream(final AudioStreamProvider a, final InputStream inputStream) throws IOException {
+        this.provider = a;
+        (this.bufferedInputStream = new BufferedInputStream(inputStream)).mark(Integer.MAX_VALUE);
+        this.stream = a.create(new NoCloseBuffer((InputStream)this.bufferedInputStream));
+    }
+    
+    @Override
+    public AudioFormat getFormat() {
+        return this.stream.getFormat();
+    }
+    
+    @Override
+    public ByteBuffer read(final int integer) throws IOException {
+        ByteBuffer byteBuffer3 = this.stream.read(integer);
+        if (!byteBuffer3.hasRemaining()) {
+            this.stream.close();
+            this.bufferedInputStream.reset();
+            this.stream = this.provider.create(new NoCloseBuffer((InputStream)this.bufferedInputStream));
+            byteBuffer3 = this.stream.read(integer);
+        }
+        return byteBuffer3;
+    }
+    
+    @Override
+    public void close() throws IOException {
+        this.stream.close();
+        this.bufferedInputStream.close();
+    }
+    
+    static class NoCloseBuffer extends FilterInputStream {
+        private NoCloseBuffer(final InputStream inputStream) {
+            super(inputStream);
+        }
+        
+        @Override
+        public void close() {
+        }
+    }
+    
+    @FunctionalInterface
+    public interface AudioStreamProvider {
+        AudioStream create(final InputStream inputStream) throws IOException;
+    }
+}
diff --git a/src/net/minecraft/client/sounds/MusicManager.java b/src/net/minecraft/client/sounds/MusicManager.java
index b5fa453..63e1948 100644
--- a/src/net/minecraft/client/sounds/MusicManager.java
+++ b/src/net/minecraft/client/sounds/MusicManager.java
@@ -1,9 +1,9 @@
 package net.minecraft.client.sounds;
 
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundEvent;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
+import net.minecraft.sounds.Music;
 import net.minecraft.util.Mth;
+import javax.annotation.Nullable;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.Minecraft;
 import java.util.Random;
@@ -11,36 +11,39 @@ import java.util.Random;
 public class MusicManager {
     private final Random random;
     private final Minecraft minecraft;
+    @Nullable
     private SoundInstance currentMusic;
     private int nextSongDelay;
     
-    public MusicManager(final Minecraft dbn) {
+    public MusicManager(final Minecraft dlx) {
         this.random = new Random();
         this.nextSongDelay = 100;
-        this.minecraft = dbn;
+        this.minecraft = dlx;
     }
     
     public void tick() {
-        final Music a2 = this.minecraft.getSituationalMusic();
+        final Music aci2 = this.minecraft.getSituationalMusic();
         if (this.currentMusic != null) {
-            if (!a2.getEvent().getLocation().equals(this.currentMusic.getLocation())) {
+            if (!aci2.getEvent().getLocation().equals(this.currentMusic.getLocation()) && aci2.replaceCurrentMusic()) {
                 this.minecraft.getSoundManager().stop(this.currentMusic);
-                this.nextSongDelay = Mth.nextInt(this.random, 0, a2.getMinDelay() / 2);
+                this.nextSongDelay = Mth.nextInt(this.random, 0, aci2.getMinDelay() / 2);
             }
             if (!this.minecraft.getSoundManager().isActive(this.currentMusic)) {
                 this.currentMusic = null;
-                this.nextSongDelay = Math.min(Mth.nextInt(this.random, a2.getMinDelay(), a2.getMaxDelay()), this.nextSongDelay);
+                this.nextSongDelay = Math.min(this.nextSongDelay, Mth.nextInt(this.random, aci2.getMinDelay(), aci2.getMaxDelay()));
             }
         }
-        this.nextSongDelay = Math.min(this.nextSongDelay, a2.getMaxDelay());
+        this.nextSongDelay = Math.min(this.nextSongDelay, aci2.getMaxDelay());
         if (this.currentMusic == null && this.nextSongDelay-- <= 0) {
-            this.startPlaying(a2);
+            this.startPlaying(aci2);
         }
     }
     
-    public void startPlaying(final Music a) {
-        this.currentMusic = SimpleSoundInstance.forMusic(a.getEvent());
-        this.minecraft.getSoundManager().play(this.currentMusic);
+    public void startPlaying(final Music aci) {
+        this.currentMusic = SimpleSoundInstance.forMusic(aci.getEvent());
+        if (this.currentMusic.getSound() != SoundManager.EMPTY_SOUND) {
+            this.minecraft.getSoundManager().play(this.currentMusic);
+        }
         this.nextSongDelay = Integer.MAX_VALUE;
     }
     
@@ -48,44 +51,11 @@ public class MusicManager {
         if (this.currentMusic != null) {
             this.minecraft.getSoundManager().stop(this.currentMusic);
             this.currentMusic = null;
-            this.nextSongDelay = 0;
         }
+        this.nextSongDelay += 100;
     }
     
-    public boolean isPlayingMusic(final Music a) {
-        return this.currentMusic != null && a.getEvent().getLocation().equals(this.currentMusic.getLocation());
-    }
-    
-    public enum Music {
-        MENU(SoundEvents.MUSIC_MENU, 20, 600), 
-        GAME(SoundEvents.MUSIC_GAME, 12000, 24000), 
-        CREATIVE(SoundEvents.MUSIC_CREATIVE, 1200, 3600), 
-        CREDITS(SoundEvents.MUSIC_CREDITS, 0, 0), 
-        NETHER(SoundEvents.MUSIC_NETHER, 1200, 3600), 
-        END_BOSS(SoundEvents.MUSIC_DRAGON, 0, 0), 
-        END(SoundEvents.MUSIC_END, 6000, 24000), 
-        UNDER_WATER(SoundEvents.MUSIC_UNDER_WATER, 12000, 24000);
-        
-        private final SoundEvent event;
-        private final int minDelay;
-        private final int maxDelay;
-        
-        private Music(final SoundEvent aah, final int integer4, final int integer5) {
-            this.event = aah;
-            this.minDelay = integer4;
-            this.maxDelay = integer5;
-        }
-        
-        public SoundEvent getEvent() {
-            return this.event;
-        }
-        
-        public int getMinDelay() {
-            return this.minDelay;
-        }
-        
-        public int getMaxDelay() {
-            return this.maxDelay;
-        }
+    public boolean isPlayingMusic(final Music aci) {
+        return this.currentMusic != null && aci.getEvent().getLocation().equals(this.currentMusic.getLocation());
     }
 }
diff --git a/src/net/minecraft/client/sounds/SoundBufferLibrary.java b/src/net/minecraft/client/sounds/SoundBufferLibrary.java
index 4323f2c..90feda3 100644
--- a/src/net/minecraft/client/sounds/SoundBufferLibrary.java
+++ b/src/net/minecraft/client/sounds/SoundBufferLibrary.java
@@ -21,47 +21,47 @@ public class SoundBufferLibrary {
     private final ResourceManager resourceManager;
     private final Map<ResourceLocation, CompletableFuture<SoundBuffer>> cache;
     
-    public SoundBufferLibrary(final ResourceManager zb) {
+    public SoundBufferLibrary(final ResourceManager abc) {
         this.cache = Maps.newHashMap();
-        this.resourceManager = zb;
+        this.resourceManager = abc;
     }
     
-    public CompletableFuture<SoundBuffer> getCompleteBuffer(final ResourceLocation sm) {
-        Resource za3;
+    public CompletableFuture<SoundBuffer> getCompleteBuffer(final ResourceLocation uh) {
+        Resource abb3;
         InputStream inputStream5;
-        AudioStream eds7;
+        OggAudioStream dfw7;
         ByteBuffer byteBuffer9;
         SoundBuffer soundBuffer;
         final Throwable t2;
         final Throwable t4;
         final Throwable t6;
-        return this.cache.computeIfAbsent(sm, sm -> CompletableFuture.<SoundBuffer>supplyAsync(() -> {
+        return this.cache.computeIfAbsent(uh, uh -> CompletableFuture.<SoundBuffer>supplyAsync(() -> {
             try {
-                za3 = this.resourceManager.getResource(sm);
+                abb3 = this.resourceManager.getResource(uh);
                 try {
-                    inputStream5 = za3.getInputStream();
+                    inputStream5 = abb3.getInputStream();
                     try {
-                        eds7 = new OggAudioStream(inputStream5);
+                        dfw7 = new OggAudioStream(inputStream5);
                         try {
-                            byteBuffer9 = eds7.readAll();
-                            soundBuffer = new SoundBuffer(byteBuffer9, eds7.getFormat());
+                            byteBuffer9 = dfw7.readAll();
+                            soundBuffer = new SoundBuffer(byteBuffer9, dfw7.getFormat());
                             return soundBuffer;
                         }
                         catch (Throwable t) {
                             throw t;
                         }
                         finally {
-                            if (eds7 != null) {
+                            if (dfw7 != null) {
                                 if (t2 != null) {
                                     try {
-                                        eds7.close();
+                                        dfw7.close();
                                     }
                                     catch (Throwable exception) {
                                         t2.addSuppressed(exception);
                                     }
                                 }
                                 else {
-                                    eds7.close();
+                                    dfw7.close();
                                 }
                             }
                         }
@@ -89,17 +89,17 @@ public class SoundBufferLibrary {
                     throw t5;
                 }
                 finally {
-                    if (za3 != null) {
+                    if (abb3 != null) {
                         if (t6 != null) {
                             try {
-                                za3.close();
+                                abb3.close();
                             }
                             catch (Throwable exception3) {
                                 t6.addSuppressed(exception3);
                             }
                         }
                         else {
-                            za3.close();
+                            abb3.close();
                         }
                     }
                 }
@@ -110,17 +110,26 @@ public class SoundBufferLibrary {
         }, Util.backgroundExecutor()));
     }
     
-    public CompletableFuture<AudioStream> getStream(final ResourceLocation sm) {
-        Resource za3;
-        InputStream inputStream4;
-        return CompletableFuture.supplyAsync(() -> {
+    public CompletableFuture<AudioStream> getStream(final ResourceLocation uh, final boolean boolean2) {
+        Resource abb4;
+        InputStream inputStream5;
+        final Object o3;
+        return CompletableFuture.<AudioStream>supplyAsync(() -> {
             try {
-                za3 = this.resourceManager.getResource(sm);
-                inputStream4 = za3.getInputStream();
-                return new OggAudioStream(inputStream4);
+                abb4 = this.resourceManager.getResource(uh);
+                inputStream5 = abb4.getInputStream();
+                if (boolean2) {
+                    // new(net.minecraft.client.sounds.LoopingAudioStream.class)
+                    new LoopingAudioStream(OggAudioStream::new, inputStream5);
+                }
+                else {
+                    // new(com.mojang.blaze3d.audio.OggAudioStream.class)
+                    new OggAudioStream(inputStream5);
+                }
+                return o3;
             }
-            catch (IOException iOException3) {
-                throw new CompletionException(iOException3);
+            catch (IOException iOException4) {
+                throw new CompletionException(iOException4);
             }
         }, Util.backgroundExecutor());
     }
@@ -131,6 +140,6 @@ public class SoundBufferLibrary {
     }
     
     public CompletableFuture<?> preload(final Collection<Sound> collection) {
-        return CompletableFuture.allOf(collection.stream().map(ecw -> this.getCompleteBuffer(ecw.getPath())).<CompletableFuture<?>>toArray(CompletableFuture[]::new));
+        return CompletableFuture.allOf(collection.stream().map(eoj -> this.getCompleteBuffer(eoj.getPath())).<CompletableFuture<?>>toArray(CompletableFuture[]::new));
     }
 }
diff --git a/src/net/minecraft/client/sounds/SoundEngine.java b/src/net/minecraft/client/sounds/SoundEngine.java
index 46a4ef1..fe13a30 100644
--- a/src/net/minecraft/client/sounds/SoundEngine.java
+++ b/src/net/minecraft/client/sounds/SoundEngine.java
@@ -5,13 +5,14 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.MarkerManager;
 import com.mojang.blaze3d.audio.SoundBuffer;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
 import com.mojang.math.Vector3f;
 import net.minecraft.client.Camera;
 import net.minecraft.util.Mth;
+import java.util.concurrent.CompletableFuture;
 import net.minecraft.world.phys.Vec3;
 import java.util.function.Consumer;
 import com.mojang.blaze3d.audio.Channel;
+import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.Iterator;
 import net.minecraft.sounds.SoundEvent;
@@ -58,7 +59,7 @@ public class SoundEngine {
     private final List<TickableSoundInstance> queuedTickableSounds;
     private final List<Sound> preloadQueue;
     
-    public SoundEngine(final SoundManager edz, final Options dbr, final ResourceManager zb) {
+    public SoundEngine(final SoundManager epn, final Options dmb, final ResourceManager abc) {
         this.library = new Library();
         this.listener = this.library.getListener();
         this.executor = new SoundEngineExecutor();
@@ -71,18 +72,18 @@ public class SoundEngine {
         this.listeners = Lists.newArrayList();
         this.queuedTickableSounds = Lists.newArrayList();
         this.preloadQueue = Lists.newArrayList();
-        this.soundManager = edz;
-        this.options = dbr;
-        this.soundBuffers = new SoundBufferLibrary(zb);
+        this.soundManager = epn;
+        this.options = dmb;
+        this.soundBuffers = new SoundBufferLibrary(abc);
     }
     
     public void reload() {
         SoundEngine.ONLY_WARN_ONCE.clear();
-        for (final SoundEvent aah3 : Registry.SOUND_EVENT) {
-            final ResourceLocation sm4 = aah3.getLocation();
-            if (this.soundManager.getSoundEvent(sm4) == null) {
-                SoundEngine.LOGGER.warn("Missing sound for event: {}", Registry.SOUND_EVENT.getKey(aah3));
-                SoundEngine.ONLY_WARN_ONCE.add(sm4);
+        for (final SoundEvent ack3 : Registry.SOUND_EVENT) {
+            final ResourceLocation uh4 = ack3.getLocation();
+            if (this.soundManager.getSoundEvent(uh4) == null) {
+                SoundEngine.LOGGER.warn("Missing sound for event: {}", Registry.SOUND_EVENT.getKey(ack3));
+                SoundEngine.ONLY_WARN_ONCE.add(uh4);
             }
         }
         this.destroy();
@@ -106,31 +107,31 @@ public class SoundEngine {
         }
     }
     
-    private float getVolume(final SoundSource aaj) {
-        if (aaj == null || aaj == SoundSource.MASTER) {
+    private float getVolume(@Nullable final SoundSource acm) {
+        if (acm == null || acm == SoundSource.MASTER) {
             return 1.0f;
         }
-        return this.options.getSoundSourceVolume(aaj);
+        return this.options.getSoundSourceVolume(acm);
     }
     
-    public void updateCategoryVolume(final SoundSource aaj, final float float2) {
+    public void updateCategoryVolume(final SoundSource acm, final float float2) {
         if (!this.loaded) {
             return;
         }
-        if (aaj == SoundSource.MASTER) {
+        if (acm == SoundSource.MASTER) {
             this.listener.setGain(float2);
             return;
         }
         final float float3;
         final float volume;
-        this.instanceToChannel.forEach((ecz, a) -> {
-            float3 = this.calculateVolume(ecz);
-            a.execute(cws -> {
+        this.instanceToChannel.forEach((eom, a) -> {
+            float3 = this.calculateVolume(eom);
+            a.execute(dft -> {
                 if (volume <= 0.0f) {
-                    cws.stop();
+                    dft.stop();
                 }
                 else {
-                    cws.setVolume(volume);
+                    dft.setVolume(volume);
                 }
             });
         });
@@ -145,9 +146,9 @@ public class SoundEngine {
         }
     }
     
-    public void stop(final SoundInstance ecz) {
+    public void stop(final SoundInstance eom) {
         if (this.loaded) {
-            final ChannelAccess.ChannelHandle a3 = this.instanceToChannel.get(ecz);
+            final ChannelAccess.ChannelHandle a3 = this.instanceToChannel.get(eom);
             if (a3 != null) {
                 a3.execute(Channel::stop);
             }
@@ -168,12 +169,12 @@ public class SoundEngine {
         }
     }
     
-    public void addEventListener(final SoundEventListener edy) {
-        this.listeners.add(edy);
+    public void addEventListener(final SoundEventListener epm) {
+        this.listeners.add(epm);
     }
     
-    public void removeEventListener(final SoundEventListener edy) {
-        this.listeners.remove(edy);
+    public void removeEventListener(final SoundEventListener epm) {
+        this.listeners.remove(epm);
     }
     
     public void tick(final boolean boolean1) {
@@ -185,28 +186,31 @@ public class SoundEngine {
     
     private void tickNonPaused() {
         ++this.tickCount;
-        this.queuedTickableSounds.forEach(this::play);
+        this.queuedTickableSounds.stream().filter(SoundInstance::canPlaySound).forEach(this::play);
         this.queuedTickableSounds.clear();
-        for (final TickableSoundInstance eda3 : this.tickingSounds) {
-            eda3.tick();
-            if (eda3.isStopped()) {
-                this.stop(eda3);
+        for (final TickableSoundInstance eon3 : this.tickingSounds) {
+            if (!eon3.canPlaySound()) {
+                this.stop(eon3);
+            }
+            eon3.tick();
+            if (eon3.isStopped()) {
+                this.stop(eon3);
             }
             else {
-                final float float4 = this.calculateVolume(eda3);
-                final float float5 = this.calculatePitch(eda3);
-                final Vec3 cvl6 = new Vec3(eda3.getX(), eda3.getY(), eda3.getZ());
-                final ChannelAccess.ChannelHandle a7 = this.instanceToChannel.get(eda3);
+                final float float4 = this.calculateVolume(eon3);
+                final float float5 = this.calculatePitch(eon3);
+                final Vec3 dem6 = new Vec3(eon3.getX(), eon3.getY(), eon3.getZ());
+                final ChannelAccess.ChannelHandle a7 = this.instanceToChannel.get(eon3);
                 if (a7 == null) {
                     continue;
                 }
                 final float volume;
                 final float pitch;
                 final Vec3 selfPosition;
-                a7.execute(cws -> {
-                    cws.setVolume(volume);
-                    cws.setPitch(pitch);
-                    cws.setSelfPosition(selfPosition);
+                a7.execute(dft -> {
+                    dft.setVolume(volume);
+                    dft.setPitch(pitch);
+                    dft.setSelfPosition(selfPosition);
                     return;
                 });
             }
@@ -215,8 +219,8 @@ public class SoundEngine {
         while (iterator2.hasNext()) {
             final Map.Entry<SoundInstance, ChannelAccess.ChannelHandle> entry3 = iterator2.next();
             final ChannelAccess.ChannelHandle a8 = entry3.getValue();
-            final SoundInstance ecz5 = entry3.getKey();
-            final float float6 = this.options.getSoundSourceVolume(ecz5.getSource());
+            final SoundInstance eom5 = entry3.getKey();
+            final float float6 = this.options.getSoundSourceVolume(eom5.getSource());
             if (float6 <= 0.0f) {
                 a8.execute(Channel::stop);
                 iterator2.remove();
@@ -225,143 +229,170 @@ public class SoundEngine {
                 if (!a8.isStopped()) {
                     continue;
                 }
-                final int integer7 = this.soundDeleteTime.get(ecz5);
+                final int integer7 = this.soundDeleteTime.get(eom5);
                 if (integer7 > this.tickCount) {
                     continue;
                 }
-                final int integer8 = ecz5.getDelay();
-                if (ecz5.isLooping() && integer8 > 0) {
-                    this.queuedSounds.put(ecz5, this.tickCount + integer8);
+                if (shouldLoopManually(eom5)) {
+                    this.queuedSounds.put(eom5, this.tickCount + eom5.getDelay());
                 }
                 iterator2.remove();
                 SoundEngine.LOGGER.debug(SoundEngine.MARKER, "Removed channel {} because it's not playing anymore", a8);
-                this.soundDeleteTime.remove(ecz5);
+                this.soundDeleteTime.remove(eom5);
                 try {
-                    this.instanceBySource.remove(ecz5.getSource(), ecz5);
+                    this.instanceBySource.remove(eom5.getSource(), eom5);
                 }
                 catch (RuntimeException ex) {}
-                if (!(ecz5 instanceof TickableSoundInstance)) {
+                if (!(eom5 instanceof TickableSoundInstance)) {
                     continue;
                 }
-                this.tickingSounds.remove(ecz5);
+                this.tickingSounds.remove(eom5);
             }
         }
         final Iterator<Map.Entry<SoundInstance, Integer>> iterator3 = this.queuedSounds.entrySet().iterator();
         while (iterator3.hasNext()) {
             final Map.Entry<SoundInstance, Integer> entry4 = iterator3.next();
             if (this.tickCount >= entry4.getValue()) {
-                final SoundInstance ecz5 = entry4.getKey();
-                if (ecz5 instanceof TickableSoundInstance) {
-                    ((TickableSoundInstance)ecz5).tick();
+                final SoundInstance eom5 = entry4.getKey();
+                if (eom5 instanceof TickableSoundInstance) {
+                    ((TickableSoundInstance)eom5).tick();
                 }
-                this.play(ecz5);
+                this.play(eom5);
                 iterator3.remove();
             }
         }
     }
     
-    public boolean isActive(final SoundInstance ecz) {
-        return this.loaded && ((this.soundDeleteTime.containsKey(ecz) && this.soundDeleteTime.get(ecz) <= this.tickCount) || this.instanceToChannel.containsKey(ecz));
+    private static boolean requiresManualLooping(final SoundInstance eom) {
+        return eom.getDelay() > 0;
     }
     
-    public void play(final SoundInstance ecz) {
+    private static boolean shouldLoopManually(final SoundInstance eom) {
+        return eom.isLooping() && requiresManualLooping(eom);
+    }
+    
+    private static boolean shouldLoopAutomatically(final SoundInstance eom) {
+        return eom.isLooping() && !requiresManualLooping(eom);
+    }
+    
+    public boolean isActive(final SoundInstance eom) {
+        return this.loaded && ((this.soundDeleteTime.containsKey(eom) && this.soundDeleteTime.get(eom) <= this.tickCount) || this.instanceToChannel.containsKey(eom));
+    }
+    
+    public void play(final SoundInstance eom) {
         if (!this.loaded) {
             return;
         }
-        final WeighedSoundEvents eea3 = ecz.resolve(this.soundManager);
-        final ResourceLocation sm4 = ecz.getLocation();
-        if (eea3 == null) {
-            if (SoundEngine.ONLY_WARN_ONCE.add(sm4)) {
-                SoundEngine.LOGGER.warn(SoundEngine.MARKER, "Unable to play unknown soundEvent: {}", sm4);
+        if (!eom.canPlaySound()) {
+            return;
+        }
+        final WeighedSoundEvents epo3 = eom.resolve(this.soundManager);
+        final ResourceLocation uh4 = eom.getLocation();
+        if (epo3 == null) {
+            if (SoundEngine.ONLY_WARN_ONCE.add(uh4)) {
+                SoundEngine.LOGGER.warn(SoundEngine.MARKER, "Unable to play unknown soundEvent: {}", uh4);
             }
             return;
         }
+        final Sound eoj5 = eom.getSound();
+        if (eoj5 == SoundManager.EMPTY_SOUND) {
+            if (SoundEngine.ONLY_WARN_ONCE.add(uh4)) {
+                SoundEngine.LOGGER.warn(SoundEngine.MARKER, "Unable to play empty soundEvent: {}", uh4);
+            }
+            return;
+        }
+        final float float6 = eom.getVolume();
+        final float float7 = Math.max(float6, 1.0f) * eoj5.getAttenuationDistance();
+        final SoundSource acm8 = eom.getSource();
+        final float float8 = this.calculateVolume(eom);
+        final float float9 = this.calculatePitch(eom);
+        final SoundInstance.Attenuation a11 = eom.getAttenuation();
+        final boolean boolean12 = eom.isRelative();
+        if (float8 == 0.0f && !eom.canStartSilent()) {
+            SoundEngine.LOGGER.debug(SoundEngine.MARKER, "Skipped playing sound {}, volume was zero.", eoj5.getLocation());
+            return;
+        }
+        final Vec3 dem13 = new Vec3(eom.getX(), eom.getY(), eom.getZ());
         if (!this.listeners.isEmpty()) {
-            for (final SoundEventListener edy6 : this.listeners) {
-                edy6.onPlaySound(ecz, eea3);
+            final boolean boolean13 = boolean12 || a11 == SoundInstance.Attenuation.NONE || this.listener.getListenerPosition().distanceToSqr(dem13) < float7 * float7;
+            if (boolean13) {
+                for (final SoundEventListener epm16 : this.listeners) {
+                    epm16.onPlaySound(eom, epo3);
+                }
+            }
+            else {
+                SoundEngine.LOGGER.debug(SoundEngine.MARKER, "Did not notify listeners of soundEvent: {}, it is too far away to hear", uh4);
             }
         }
         if (this.listener.getGain() <= 0.0f) {
-            SoundEngine.LOGGER.debug(SoundEngine.MARKER, "Skipped playing soundEvent: {}, master volume was zero", sm4);
+            SoundEngine.LOGGER.debug(SoundEngine.MARKER, "Skipped playing soundEvent: {}, master volume was zero", uh4);
             return;
         }
-        final Sound ecw5 = ecz.getSound();
-        if (ecw5 == SoundManager.EMPTY_SOUND) {
-            if (SoundEngine.ONLY_WARN_ONCE.add(sm4)) {
-                SoundEngine.LOGGER.warn(SoundEngine.MARKER, "Unable to play empty soundEvent: {}", sm4);
-            }
+        final boolean boolean13 = shouldLoopAutomatically(eom);
+        final boolean boolean14 = eoj5.shouldStream();
+        final CompletableFuture<ChannelAccess.ChannelHandle> completableFuture16 = this.channelAccess.createHandle(eoj5.shouldStream() ? Library.Pool.STREAMING : Library.Pool.STATIC);
+        final ChannelAccess.ChannelHandle a12 = completableFuture16.join();
+        if (a12 == null) {
+            SoundEngine.LOGGER.warn("Failed to create new sound handle");
             return;
         }
-        final float float6 = ecz.getVolume();
-        final float float7 = Math.max(float6, 1.0f) * ecw5.getAttenuationDistance();
-        final SoundSource aaj8 = ecz.getSource();
-        final float float8 = this.calculateVolume(ecz);
-        final float float9 = this.calculatePitch(ecz);
-        final SoundInstance.Attenuation a11 = ecz.getAttenuation();
-        final boolean boolean12 = ecz.isRelative();
-        if (float8 == 0.0f && !ecz.canStartSilent()) {
-            SoundEngine.LOGGER.debug(SoundEngine.MARKER, "Skipped playing sound {}, volume was zero.", ecw5.getLocation());
-            return;
-        }
-        final boolean boolean13 = ecz.isLooping() && ecz.getDelay() == 0;
-        final Vec3 cvl14 = new Vec3(ecz.getX(), ecz.getY(), ecz.getZ());
-        final ChannelAccess.ChannelHandle a12 = this.channelAccess.createHandle(ecw5.shouldStream() ? Library.Pool.STREAMING : Library.Pool.STATIC);
-        SoundEngine.LOGGER.debug(SoundEngine.MARKER, "Playing sound {} for event {}", ecw5.getLocation(), sm4);
-        this.soundDeleteTime.put(ecz, this.tickCount + 20);
-        this.instanceToChannel.put(ecz, a12);
-        this.instanceBySource.put(aaj8, ecz);
+        SoundEngine.LOGGER.debug(SoundEngine.MARKER, "Playing sound {} for event {}", eoj5.getLocation(), uh4);
+        this.soundDeleteTime.put(eom, this.tickCount + 20);
+        this.instanceToChannel.put(eom, a12);
+        this.instanceBySource.put(acm8, eom);
         final float pitch;
         final float volume;
         final SoundInstance.Attenuation attenuation;
         final float float10;
-        final boolean looping;
+        final boolean b;
+        final boolean b2;
         final Vec3 selfPosition;
         final boolean relative;
-        a12.execute(cws -> {
-            cws.setPitch(pitch);
-            cws.setVolume(volume);
+        a12.execute(dft -> {
+            dft.setPitch(pitch);
+            dft.setVolume(volume);
             if (attenuation == SoundInstance.Attenuation.LINEAR) {
-                cws.linearAttenuation(float10);
+                dft.linearAttenuation(float10);
             }
             else {
-                cws.disableAttenuation();
+                dft.disableAttenuation();
             }
-            cws.setLooping(looping);
-            cws.setSelfPosition(selfPosition);
-            cws.setRelative(relative);
+            dft.setLooping(b && !b2);
+            dft.setSelfPosition(selfPosition);
+            dft.setRelative(relative);
             return;
         });
-        if (!ecw5.shouldStream()) {
-            this.soundBuffers.getCompleteBuffer(ecw5.getPath()).thenAccept(cwx -> a12.execute(cws -> {
-                cws.attachStaticBuffer(cwx);
-                cws.play();
+        if (!boolean14) {
+            this.soundBuffers.getCompleteBuffer(eoj5.getPath()).thenAccept(dfy -> a12.execute(dft -> {
+                dft.attachStaticBuffer(dfy);
+                dft.play();
             }));
         }
         else {
-            this.soundBuffers.getStream(ecw5.getPath()).thenAccept(eds -> a12.execute(cws -> {
-                cws.attachBufferStream(eds);
-                cws.play();
+            this.soundBuffers.getStream(eoj5.getPath(), boolean13).thenAccept(epf -> a12.execute(dft -> {
+                dft.attachBufferStream(epf);
+                dft.play();
             }));
         }
-        if (ecz instanceof TickableSoundInstance) {
-            this.tickingSounds.add((TickableSoundInstance)ecz);
+        if (eom instanceof TickableSoundInstance) {
+            this.tickingSounds.add((TickableSoundInstance)eom);
         }
     }
     
-    public void queueTickingSound(final TickableSoundInstance eda) {
-        this.queuedTickableSounds.add(eda);
+    public void queueTickingSound(final TickableSoundInstance eon) {
+        this.queuedTickableSounds.add(eon);
     }
     
-    public void requestPreload(final Sound ecw) {
-        this.preloadQueue.add(ecw);
+    public void requestPreload(final Sound eoj) {
+        this.preloadQueue.add(eoj);
     }
     
-    private float calculatePitch(final SoundInstance ecz) {
-        return Mth.clamp(ecz.getPitch(), 0.5f, 2.0f);
+    private float calculatePitch(final SoundInstance eom) {
+        return Mth.clamp(eom.getPitch(), 0.5f, 2.0f);
     }
     
-    private float calculateVolume(final SoundInstance ecz) {
-        return Mth.clamp(ecz.getVolume() * this.getVolume(ecz.getSource()), 0.0f, 1.0f);
+    private float calculateVolume(final SoundInstance eom) {
+        return Mth.clamp(eom.getVolume() * this.getVolume(eom.getSource()), 0.0f, 1.0f);
     }
     
     public void pause() {
@@ -376,41 +407,41 @@ public class SoundEngine {
         }
     }
     
-    public void playDelayed(final SoundInstance ecz, final int integer) {
-        this.queuedSounds.put(ecz, this.tickCount + integer);
+    public void playDelayed(final SoundInstance eom, final int integer) {
+        this.queuedSounds.put(eom, this.tickCount + integer);
     }
     
-    public void updateSource(final Camera dbb) {
-        if (!this.loaded || !dbb.isInitialized()) {
+    public void updateSource(final Camera dlj) {
+        if (!this.loaded || !dlj.isInitialized()) {
             return;
         }
-        final Vec3 cvl3 = dbb.getPosition();
-        final Vector3f e4 = dbb.getLookVector();
-        final Vector3f e5 = dbb.getUpVector();
+        final Vec3 dem3 = dlj.getPosition();
+        final Vector3f g4 = dlj.getLookVector();
+        final Vector3f g5 = dlj.getUpVector();
         final Vec3 listenerPosition;
-        final Vector3f e6;
-        final Vector3f e7;
+        final Vector3f g6;
+        final Vector3f g7;
         this.executor.execute(() -> {
             this.listener.setListenerPosition(listenerPosition);
-            this.listener.setListenerOrientation(e6, e7);
+            this.listener.setListenerOrientation(g6, g7);
         });
     }
     
-    public void stop(@Nullable final ResourceLocation sm, @Nullable final SoundSource aaj) {
-        if (aaj != null) {
-            for (final SoundInstance ecz5 : this.instanceBySource.get(aaj)) {
-                if (sm == null || ecz5.getLocation().equals(sm)) {
-                    this.stop(ecz5);
+    public void stop(@Nullable final ResourceLocation uh, @Nullable final SoundSource acm) {
+        if (acm != null) {
+            for (final SoundInstance eom5 : this.instanceBySource.get(acm)) {
+                if (uh == null || eom5.getLocation().equals(uh)) {
+                    this.stop(eom5);
                 }
             }
         }
-        else if (sm == null) {
+        else if (uh == null) {
             this.stopAll();
         }
         else {
-            for (final SoundInstance ecz5 : this.instanceToChannel.keySet()) {
-                if (ecz5.getLocation().equals(sm)) {
-                    this.stop(ecz5);
+            for (final SoundInstance eom5 : this.instanceToChannel.keySet()) {
+                if (eom5.getLocation().equals(uh)) {
+                    this.stop(eom5);
                 }
             }
         }
diff --git a/src/net/minecraft/client/sounds/SoundEventListener.java b/src/net/minecraft/client/sounds/SoundEventListener.java
index 7ac2268..1fc0d44 100644
--- a/src/net/minecraft/client/sounds/SoundEventListener.java
+++ b/src/net/minecraft/client/sounds/SoundEventListener.java
@@ -3,5 +3,5 @@ package net.minecraft.client.sounds;
 import net.minecraft.client.resources.sounds.SoundInstance;
 
 public interface SoundEventListener {
-    void onPlaySound(final SoundInstance ecz, final WeighedSoundEvents eea);
+    void onPlaySound(final SoundInstance eom, final WeighedSoundEvents epo);
 }
diff --git a/src/net/minecraft/client/sounds/SoundManager.java b/src/net/minecraft/client/sounds/SoundManager.java
index 5791fb7..b88f2ad 100644
--- a/src/net/minecraft/client/sounds/SoundManager.java
+++ b/src/net/minecraft/client/sounds/SoundManager.java
@@ -1,5 +1,6 @@
 package net.minecraft.client.sounds;
 
+import java.lang.reflect.Type;
 import net.minecraft.client.resources.sounds.SoundEventRegistrationSerializer;
 import net.minecraft.network.chat.Component;
 import com.google.gson.GsonBuilder;
@@ -10,28 +11,26 @@ import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.TickableSoundInstance;
 import java.util.Collection;
 import javax.annotation.Nullable;
-import org.apache.commons.io.IOUtils;
-import java.lang.reflect.Type;
-import java.io.Reader;
-import net.minecraft.util.GsonHelper;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.io.InputStream;
 import net.minecraft.core.Registry;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.TranslatableComponent;
+import java.io.Reader;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Iterator;
 import java.io.IOException;
-import net.minecraft.client.resources.sounds.SoundEventRegistration;
+import net.minecraft.util.GsonHelper;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.util.profiling.ProfilerFiller;
 import com.google.common.collect.Maps;
 import net.minecraft.client.Options;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.resources.sounds.SoundEventRegistration;
 import java.util.Map;
-import java.lang.reflect.ParameterizedType;
+import com.google.gson.reflect.TypeToken;
 import com.google.gson.Gson;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.client.resources.sounds.Sound;
@@ -41,112 +40,103 @@ public class SoundManager extends SimplePreparableReloadListener<Preparations> {
     public static final Sound EMPTY_SOUND;
     private static final Logger LOGGER;
     private static final Gson GSON;
-    private static final ParameterizedType SOUND_EVENT_REGISTRATION_TYPE;
+    private static final TypeToken<Map<String, SoundEventRegistration>> SOUND_EVENT_REGISTRATION_TYPE;
     private final Map<ResourceLocation, WeighedSoundEvents> registry;
     private final SoundEngine soundEngine;
     
-    public SoundManager(final ResourceManager zb, final Options dbr) {
+    public SoundManager(final ResourceManager abc, final Options dmb) {
         this.registry = Maps.newHashMap();
-        this.soundEngine = new SoundEngine(this, dbr, zb);
+        this.soundEngine = new SoundEngine(this, dmb, abc);
     }
     
     @Override
-    protected Preparations prepare(final ResourceManager zb, final ProfilerFiller aio) {
+    protected Preparations prepare(final ResourceManager abc, final ProfilerFiller ami) {
         final Preparations a4 = new Preparations();
-        aio.startTick();
-        for (final String string6 : zb.getNamespaces()) {
-            aio.push(string6);
+        ami.startTick();
+        for (final String string6 : abc.getNamespaces()) {
+            ami.push(string6);
             try {
-                final List<Resource> list7 = zb.getResources(new ResourceLocation(string6, "sounds.json"));
-                for (final Resource za9 : list7) {
-                    aio.push(za9.getSourceName());
-                    try {
-                        aio.push("parse");
-                        final Map<String, SoundEventRegistration> map10 = getEventFromJson(za9.getInputStream());
-                        aio.popPush("register");
-                        for (final Map.Entry<String, SoundEventRegistration> entry12 : map10.entrySet()) {
-                            a4.handleRegistration(new ResourceLocation(string6, entry12.getKey()), entry12.getValue(), zb);
+                final List<Resource> list7 = abc.getResources(new ResourceLocation(string6, "sounds.json"));
+                for (final Resource abb9 : list7) {
+                    ami.push(abb9.getSourceName());
+                    try (final InputStream inputStream10 = abb9.getInputStream();
+                         final Reader reader12 = new InputStreamReader(inputStream10, StandardCharsets.UTF_8)) {
+                        ami.push("parse");
+                        final Map<String, SoundEventRegistration> map14 = GsonHelper.<Map<String, SoundEventRegistration>>fromJson(SoundManager.GSON, reader12, SoundManager.SOUND_EVENT_REGISTRATION_TYPE);
+                        ami.popPush("register");
+                        for (final Map.Entry<String, SoundEventRegistration> entry16 : map14.entrySet()) {
+                            a4.handleRegistration(new ResourceLocation(string6, entry16.getKey()), entry16.getValue(), abc);
                         }
-                        aio.pop();
+                        ami.pop();
                     }
                     catch (RuntimeException runtimeException10) {
-                        SoundManager.LOGGER.warn("Invalid sounds.json in resourcepack: '{}'", za9.getSourceName(), runtimeException10);
+                        SoundManager.LOGGER.warn("Invalid sounds.json in resourcepack: '{}'", abb9.getSourceName(), runtimeException10);
                     }
-                    aio.pop();
+                    ami.pop();
                 }
             }
             catch (IOException ex) {}
-            aio.pop();
+            ami.pop();
         }
-        aio.endTick();
+        ami.endTick();
         return a4;
     }
     
     @Override
-    protected void apply(final Preparations a, final ResourceManager zb, final ProfilerFiller aio) {
+    protected void apply(final Preparations a, final ResourceManager abc, final ProfilerFiller ami) {
         a.apply(this.registry, this.soundEngine);
-        for (final ResourceLocation sm6 : this.registry.keySet()) {
-            final WeighedSoundEvents eea7 = this.registry.get(sm6);
-            if (eea7.getSubtitle() instanceof TranslatableComponent) {
-                final String string8 = ((TranslatableComponent)eea7.getSubtitle()).getKey();
+        for (final ResourceLocation uh6 : this.registry.keySet()) {
+            final WeighedSoundEvents epo7 = this.registry.get(uh6);
+            if (epo7.getSubtitle() instanceof TranslatableComponent) {
+                final String string8 = ((TranslatableComponent)epo7.getSubtitle()).getKey();
                 if (I18n.exists(string8)) {
                     continue;
                 }
-                SoundManager.LOGGER.debug("Missing subtitle {} for event: {}", string8, sm6);
+                SoundManager.LOGGER.debug("Missing subtitle {} for event: {}", string8, uh6);
             }
         }
         if (SoundManager.LOGGER.isDebugEnabled()) {
-            for (final ResourceLocation sm6 : this.registry.keySet()) {
-                if (!Registry.SOUND_EVENT.containsKey(sm6)) {
-                    SoundManager.LOGGER.debug("Not having sound event for: {}", sm6);
+            for (final ResourceLocation uh6 : this.registry.keySet()) {
+                if (!Registry.SOUND_EVENT.containsKey(uh6)) {
+                    SoundManager.LOGGER.debug("Not having sound event for: {}", uh6);
                 }
             }
         }
         this.soundEngine.reload();
     }
     
-    @Nullable
-    protected static Map<String, SoundEventRegistration> getEventFromJson(final InputStream inputStream) {
-        try {
-            return GsonHelper.<Map<String, SoundEventRegistration>>fromJson(SoundManager.GSON, new InputStreamReader(inputStream, StandardCharsets.UTF_8), SoundManager.SOUND_EVENT_REGISTRATION_TYPE);
-        }
-        finally {
-            IOUtils.closeQuietly(inputStream);
-        }
-    }
-    
-    private static boolean validateSoundResource(final Sound ecw, final ResourceLocation sm, final ResourceManager zb) {
-        final ResourceLocation sm2 = ecw.getPath();
-        if (!zb.hasResource(sm2)) {
-            SoundManager.LOGGER.warn("File {} does not exist, cannot add it to event {}", sm2, sm);
+    private static boolean validateSoundResource(final Sound eoj, final ResourceLocation uh, final ResourceManager abc) {
+        final ResourceLocation uh2 = eoj.getPath();
+        if (!abc.hasResource(uh2)) {
+            SoundManager.LOGGER.warn("File {} does not exist, cannot add it to event {}", uh2, uh);
             return false;
         }
         return true;
     }
     
     @Nullable
-    public WeighedSoundEvents getSoundEvent(final ResourceLocation sm) {
-        return this.registry.get(sm);
+    public WeighedSoundEvents getSoundEvent(final ResourceLocation uh) {
+        return this.registry.get(uh);
     }
     
     public Collection<ResourceLocation> getAvailableSounds() {
         return this.registry.keySet();
     }
     
-    public void queueTickingSound(final TickableSoundInstance eda) {
-        this.soundEngine.queueTickingSound(eda);
+    public void queueTickingSound(final TickableSoundInstance eon) {
+        this.soundEngine.queueTickingSound(eon);
     }
     
-    public void play(final SoundInstance ecz) {
-        this.soundEngine.play(ecz);
+    public void play(final SoundInstance eom) {
+        this.soundEngine.play(eom);
     }
     
-    public void playDelayed(final SoundInstance ecz, final int integer) {
-        this.soundEngine.playDelayed(ecz, integer);
+    public void playDelayed(final SoundInstance eom, final int integer) {
+        this.soundEngine.playDelayed(eom, integer);
     }
     
-    public void updateSource(final Camera dbb) {
-        this.soundEngine.updateSource(dbb);
+    public void updateSource(final Camera dlj) {
+        this.soundEngine.updateSource(dlj);
     }
     
     public void pause() {
@@ -169,31 +159,31 @@ public class SoundManager extends SimplePreparableReloadListener<Preparations> {
         this.soundEngine.resume();
     }
     
-    public void updateSourceVolume(final SoundSource aaj, final float float2) {
-        if (aaj == SoundSource.MASTER && float2 <= 0.0f) {
+    public void updateSourceVolume(final SoundSource acm, final float float2) {
+        if (acm == SoundSource.MASTER && float2 <= 0.0f) {
             this.stop();
         }
-        this.soundEngine.updateCategoryVolume(aaj, float2);
+        this.soundEngine.updateCategoryVolume(acm, float2);
     }
     
-    public void stop(final SoundInstance ecz) {
-        this.soundEngine.stop(ecz);
+    public void stop(final SoundInstance eom) {
+        this.soundEngine.stop(eom);
     }
     
-    public boolean isActive(final SoundInstance ecz) {
-        return this.soundEngine.isActive(ecz);
+    public boolean isActive(final SoundInstance eom) {
+        return this.soundEngine.isActive(eom);
     }
     
-    public void addListener(final SoundEventListener edy) {
-        this.soundEngine.addEventListener(edy);
+    public void addListener(final SoundEventListener epm) {
+        this.soundEngine.addEventListener(epm);
     }
     
-    public void removeListener(final SoundEventListener edy) {
-        this.soundEngine.removeEventListener(edy);
+    public void removeListener(final SoundEventListener epm) {
+        this.soundEngine.removeEventListener(epm);
     }
     
-    public void stop(@Nullable final ResourceLocation sm, @Nullable final SoundSource aaj) {
-        this.soundEngine.stop(sm, aaj);
+    public void stop(@Nullable final ResourceLocation uh, @Nullable final SoundSource acm) {
+        this.soundEngine.stop(uh, acm);
     }
     
     public String getDebugString() {
@@ -204,22 +194,7 @@ public class SoundManager extends SimplePreparableReloadListener<Preparations> {
         EMPTY_SOUND = new Sound("meta:missing_sound", 1.0f, 1.0f, 1, Sound.Type.FILE, false, false, 16);
         LOGGER = LogManager.getLogger();
         GSON = new GsonBuilder().registerTypeHierarchyAdapter(Component.class, new Component.Serializer()).registerTypeAdapter(SoundEventRegistration.class, new SoundEventRegistrationSerializer()).create();
-        SOUND_EVENT_REGISTRATION_TYPE = new ParameterizedType() {
-            @Override
-            public Type[] getActualTypeArguments() {
-                return new Type[] { String.class, SoundEventRegistration.class };
-            }
-            
-            @Override
-            public Type getRawType() {
-                return Map.class;
-            }
-            
-            @Override
-            public Type getOwnerType() {
-                return null;
-            }
-        };
+        SOUND_EVENT_REGISTRATION_TYPE = new TypeToken<Map<String, SoundEventRegistration>>() {};
     }
     
     public static class Preparations {
@@ -229,69 +204,69 @@ public class SoundManager extends SimplePreparableReloadListener<Preparations> {
             this.registry = Maps.newHashMap();
         }
         
-        private void handleRegistration(final ResourceLocation sm, final SoundEventRegistration ecx, final ResourceManager zb) {
-            WeighedSoundEvents eea5 = this.registry.get(sm);
-            final boolean boolean6 = eea5 == null;
-            if (boolean6 || ecx.isReplace()) {
+        private void handleRegistration(final ResourceLocation uh, final SoundEventRegistration eok, final ResourceManager abc) {
+            WeighedSoundEvents epo5 = this.registry.get(uh);
+            final boolean boolean6 = epo5 == null;
+            if (boolean6 || eok.isReplace()) {
                 if (!boolean6) {
-                    SoundManager.LOGGER.debug("Replaced sound event location {}", sm);
+                    SoundManager.LOGGER.debug("Replaced sound event location {}", uh);
                 }
-                eea5 = new WeighedSoundEvents(sm, ecx.getSubtitle());
-                this.registry.put(sm, eea5);
+                epo5 = new WeighedSoundEvents(uh, eok.getSubtitle());
+                this.registry.put(uh, epo5);
             }
-            for (final Sound ecw8 : ecx.getSounds()) {
-                final ResourceLocation sm2 = ecw8.getLocation();
-                Weighted<Sound> eeb10 = null;
-                switch (ecw8.getType()) {
+            for (final Sound eoj8 : eok.getSounds()) {
+                final ResourceLocation uh2 = eoj8.getLocation();
+                Weighted<Sound> epp10 = null;
+                switch (eoj8.getType()) {
                     case FILE: {
-                        if (!validateSoundResource(ecw8, sm, zb)) {
+                        if (!validateSoundResource(eoj8, uh, abc)) {
                             continue;
                         }
-                        eeb10 = ecw8;
+                        epp10 = eoj8;
                         break;
                     }
                     case SOUND_EVENT: {
-                        eeb10 = new Weighted<Sound>() {
+                        epp10 = new Weighted<Sound>() {
                             @Override
                             public int getWeight() {
-                                final WeighedSoundEvents eea2 = Preparations.this.registry.get(sm2);
-                                return (eea2 == null) ? 0 : eea2.getWeight();
+                                final WeighedSoundEvents epo2 = Preparations.this.registry.get(uh2);
+                                return (epo2 == null) ? 0 : epo2.getWeight();
                             }
                             
                             @Override
                             public Sound getSound() {
-                                final WeighedSoundEvents eea2 = Preparations.this.registry.get(sm2);
-                                if (eea2 == null) {
+                                final WeighedSoundEvents epo2 = Preparations.this.registry.get(uh2);
+                                if (epo2 == null) {
                                     return SoundManager.EMPTY_SOUND;
                                 }
-                                final Sound ecw3 = eea2.getSound();
-                                return new Sound(ecw3.getLocation().toString(), ecw3.getVolume() * ecw8.getVolume(), ecw3.getPitch() * ecw8.getPitch(), ecw8.getWeight(), Sound.Type.FILE, ecw3.shouldStream() || ecw8.shouldStream(), ecw3.shouldPreload(), ecw3.getAttenuationDistance());
+                                final Sound eoj3 = epo2.getSound();
+                                return new Sound(eoj3.getLocation().toString(), eoj3.getVolume() * eoj8.getVolume(), eoj3.getPitch() * eoj8.getPitch(), eoj8.getWeight(), Sound.Type.FILE, eoj3.shouldStream() || eoj8.shouldStream(), eoj3.shouldPreload(), eoj3.getAttenuationDistance());
                             }
                             
                             @Override
-                            public void preloadIfRequired(final SoundEngine edw) {
-                                final WeighedSoundEvents eea3 = Preparations.this.registry.get(sm2);
-                                if (eea3 == null) {
+                            public void preloadIfRequired(final SoundEngine epk) {
+                                final WeighedSoundEvents epo3 = Preparations.this.registry.get(uh2);
+                                if (epo3 == null) {
                                     return;
                                 }
-                                eea3.preloadIfRequired(edw);
+                                epo3.preloadIfRequired(epk);
                             }
                         };
                         break;
                     }
                     default: {
-                        throw new IllegalStateException("Unknown SoundEventRegistration type: " + ecw8.getType());
+                        throw new IllegalStateException("Unknown SoundEventRegistration type: " + eoj8.getType());
                     }
                 }
-                eea5.addSound(eeb10);
+                epo5.addSound(epp10);
             }
         }
         
-        public void apply(final Map<ResourceLocation, WeighedSoundEvents> map, final SoundEngine edw) {
+        public void apply(final Map<ResourceLocation, WeighedSoundEvents> map, final SoundEngine epk) {
             map.clear();
             for (final Map.Entry<ResourceLocation, WeighedSoundEvents> entry5 : this.registry.entrySet()) {
                 map.put(entry5.getKey(), entry5.getValue());
-                entry5.getValue().preloadIfRequired(edw);
+                entry5.getValue().preloadIfRequired(epk);
             }
         }
     }
diff --git a/src/net/minecraft/client/sounds/WeighedSoundEvents.java b/src/net/minecraft/client/sounds/WeighedSoundEvents.java
index 9609f4f..e2dd55e 100644
--- a/src/net/minecraft/client/sounds/WeighedSoundEvents.java
+++ b/src/net/minecraft/client/sounds/WeighedSoundEvents.java
@@ -14,20 +14,21 @@ public class WeighedSoundEvents implements Weighted<Sound> {
     private final List<Weighted<Sound>> list;
     private final Random random;
     private final ResourceLocation location;
+    @Nullable
     private final Component subtitle;
     
-    public WeighedSoundEvents(final ResourceLocation sm, @Nullable final String string) {
+    public WeighedSoundEvents(final ResourceLocation uh, @Nullable final String string) {
         this.list = Lists.newArrayList();
         this.random = new Random();
-        this.location = sm;
-        this.subtitle = ((string == null) ? null : new TranslatableComponent(string, new Object[0]));
+        this.location = uh;
+        this.subtitle = ((string == null) ? null : new TranslatableComponent(string));
     }
     
     @Override
     public int getWeight() {
         int integer2 = 0;
-        for (final Weighted<Sound> eeb4 : this.list) {
-            integer2 += eeb4.getWeight();
+        for (final Weighted<Sound> epp4 : this.list) {
+            integer2 += epp4.getWeight();
         }
         return integer2;
     }
@@ -39,17 +40,17 @@ public class WeighedSoundEvents implements Weighted<Sound> {
             return SoundManager.EMPTY_SOUND;
         }
         int integer3 = this.random.nextInt(integer2);
-        for (final Weighted<Sound> eeb5 : this.list) {
-            integer3 -= eeb5.getWeight();
+        for (final Weighted<Sound> epp5 : this.list) {
+            integer3 -= epp5.getWeight();
             if (integer3 < 0) {
-                return eeb5.getSound();
+                return epp5.getSound();
             }
         }
         return SoundManager.EMPTY_SOUND;
     }
     
-    public void addSound(final Weighted<Sound> eeb) {
-        this.list.add(eeb);
+    public void addSound(final Weighted<Sound> epp) {
+        this.list.add(epp);
     }
     
     @Nullable
@@ -58,9 +59,9 @@ public class WeighedSoundEvents implements Weighted<Sound> {
     }
     
     @Override
-    public void preloadIfRequired(final SoundEngine edw) {
-        for (final Weighted<Sound> eeb4 : this.list) {
-            eeb4.preloadIfRequired(edw);
+    public void preloadIfRequired(final SoundEngine epk) {
+        for (final Weighted<Sound> epp4 : this.list) {
+            epp4.preloadIfRequired(epk);
         }
     }
 }
diff --git a/src/net/minecraft/client/sounds/Weighted.java b/src/net/minecraft/client/sounds/Weighted.java
index 769c908..2f4e426 100644
--- a/src/net/minecraft/client/sounds/Weighted.java
+++ b/src/net/minecraft/client/sounds/Weighted.java
@@ -5,5 +5,5 @@ public interface Weighted<T> {
     
     T getSound();
     
-    void preloadIfRequired(final SoundEngine edw);
+    void preloadIfRequired(final SoundEngine epk);
 }
diff --git a/src/net/minecraft/client/tutorial/CompletedTutorialStepInstance.java b/src/net/minecraft/client/tutorial/CompletedTutorialStepInstance.java
index 81d6aca..b91cf1f 100644
--- a/src/net/minecraft/client/tutorial/CompletedTutorialStepInstance.java
+++ b/src/net/minecraft/client/tutorial/CompletedTutorialStepInstance.java
@@ -3,7 +3,7 @@ package net.minecraft.client.tutorial;
 public class CompletedTutorialStepInstance implements TutorialStepInstance {
     private final Tutorial tutorial;
     
-    public CompletedTutorialStepInstance(final Tutorial eej) {
-        this.tutorial = eej;
+    public CompletedTutorialStepInstance(final Tutorial epx) {
+        this.tutorial = epx;
     }
 }
diff --git a/src/net/minecraft/client/tutorial/CraftPlanksTutorialStep.java b/src/net/minecraft/client/tutorial/CraftPlanksTutorialStep.java
index 5669584..c215341 100644
--- a/src/net/minecraft/client/tutorial/CraftPlanksTutorialStep.java
+++ b/src/net/minecraft/client/tutorial/CraftPlanksTutorialStep.java
@@ -4,11 +4,11 @@ import net.minecraft.network.chat.TranslatableComponent;
 import java.util.Iterator;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
-import net.minecraft.tags.Tag;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.gui.components.toasts.Toast;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.level.GameType;
 import net.minecraft.client.gui.components.toasts.TutorialToast;
@@ -21,8 +21,8 @@ public class CraftPlanksTutorialStep implements TutorialStepInstance {
     private TutorialToast toast;
     private int timeWaiting;
     
-    public CraftPlanksTutorialStep(final Tutorial eej) {
-        this.tutorial = eej;
+    public CraftPlanksTutorialStep(final Tutorial epx) {
+        this.tutorial = epx;
     }
     
     @Override
@@ -33,13 +33,13 @@ public class CraftPlanksTutorialStep implements TutorialStepInstance {
             return;
         }
         if (this.timeWaiting == 1) {
-            final LocalPlayer dqb2 = this.tutorial.getMinecraft().player;
-            if (dqb2 != null) {
-                if (dqb2.inventory.contains(ItemTags.PLANKS)) {
+            final LocalPlayer ebf2 = this.tutorial.getMinecraft().player;
+            if (ebf2 != null) {
+                if (ebf2.inventory.contains(ItemTags.PLANKS)) {
                     this.tutorial.setStep(TutorialSteps.NONE);
                     return;
                 }
-                if (hasCraftedPlanksPreviously(dqb2, ItemTags.PLANKS)) {
+                if (hasCraftedPlanksPreviously(ebf2, ItemTags.PLANKS)) {
                     this.tutorial.setStep(TutorialSteps.NONE);
                     return;
                 }
@@ -60,16 +60,16 @@ public class CraftPlanksTutorialStep implements TutorialStepInstance {
     }
     
     @Override
-    public void onGetItem(final ItemStack ben) {
-        final Item bei3 = ben.getItem();
-        if (ItemTags.PLANKS.contains(bei3)) {
+    public void onGetItem(final ItemStack bki) {
+        final Item bke3 = bki.getItem();
+        if (ItemTags.PLANKS.contains(bke3)) {
             this.tutorial.setStep(TutorialSteps.NONE);
         }
     }
     
-    public static boolean hasCraftedPlanksPreviously(final LocalPlayer dqb, final Tag<Item> aaz) {
-        for (final Item bei4 : aaz.getValues()) {
-            if (dqb.getStats().getValue(Stats.ITEM_CRAFTED.get(bei4)) > 0) {
+    public static boolean hasCraftedPlanksPreviously(final LocalPlayer ebf, final Tag<Item> adf) {
+        for (final Item bke4 : adf.getValues()) {
+            if (ebf.getStats().getValue(Stats.ITEM_CRAFTED.get(bke4)) > 0) {
                 return true;
             }
         }
@@ -77,7 +77,7 @@ public class CraftPlanksTutorialStep implements TutorialStepInstance {
     }
     
     static {
-        CRAFT_TITLE = new TranslatableComponent("tutorial.craft_planks.title", new Object[0]);
-        CRAFT_DESCRIPTION = new TranslatableComponent("tutorial.craft_planks.description", new Object[0]);
+        CRAFT_TITLE = new TranslatableComponent("tutorial.craft_planks.title");
+        CRAFT_DESCRIPTION = new TranslatableComponent("tutorial.craft_planks.description");
     }
 }
diff --git a/src/net/minecraft/client/tutorial/FindTreeTutorialStepInstance.java b/src/net/minecraft/client/tutorial/FindTreeTutorialStepInstance.java
index 33e712d..edfee58 100644
--- a/src/net/minecraft/client/tutorial/FindTreeTutorialStepInstance.java
+++ b/src/net/minecraft/client/tutorial/FindTreeTutorialStepInstance.java
@@ -28,8 +28,8 @@ public class FindTreeTutorialStepInstance implements TutorialStepInstance {
     private TutorialToast toast;
     private int timeWaiting;
     
-    public FindTreeTutorialStepInstance(final Tutorial eej) {
-        this.tutorial = eej;
+    public FindTreeTutorialStepInstance(final Tutorial epx) {
+        this.tutorial = epx;
     }
     
     @Override
@@ -40,15 +40,15 @@ public class FindTreeTutorialStepInstance implements TutorialStepInstance {
             return;
         }
         if (this.timeWaiting == 1) {
-            final LocalPlayer dqb2 = this.tutorial.getMinecraft().player;
-            if (dqb2 != null) {
-                for (final Block bph4 : FindTreeTutorialStepInstance.TREE_BLOCKS) {
-                    if (dqb2.inventory.contains(new ItemStack(bph4))) {
+            final LocalPlayer ebf2 = this.tutorial.getMinecraft().player;
+            if (ebf2 != null) {
+                for (final Block bvr4 : FindTreeTutorialStepInstance.TREE_BLOCKS) {
+                    if (ebf2.inventory.contains(new ItemStack(bvr4))) {
                         this.tutorial.setStep(TutorialSteps.CRAFT_PLANKS);
                         return;
                     }
                 }
-                if (hasPunchedTreesPreviously(dqb2)) {
+                if (hasPunchedTreesPreviously(ebf2)) {
                     this.tutorial.setStep(TutorialSteps.CRAFT_PLANKS);
                     return;
                 }
@@ -69,27 +69,27 @@ public class FindTreeTutorialStepInstance implements TutorialStepInstance {
     }
     
     @Override
-    public void onLookAt(final ClientLevel dno, final HitResult cvi) {
-        if (cvi.getType() == HitResult.Type.BLOCK) {
-            final BlockState byj4 = dno.getBlockState(((BlockHitResult)cvi).getBlockPos());
-            if (FindTreeTutorialStepInstance.TREE_BLOCKS.contains(byj4.getBlock())) {
+    public void onLookAt(final ClientLevel dym, final HitResult dej) {
+        if (dej.getType() == HitResult.Type.BLOCK) {
+            final BlockState cfj4 = dym.getBlockState(((BlockHitResult)dej).getBlockPos());
+            if (FindTreeTutorialStepInstance.TREE_BLOCKS.contains(cfj4.getBlock())) {
                 this.tutorial.setStep(TutorialSteps.PUNCH_TREE);
             }
         }
     }
     
     @Override
-    public void onGetItem(final ItemStack ben) {
-        for (final Block bph4 : FindTreeTutorialStepInstance.TREE_BLOCKS) {
-            if (ben.getItem() == bph4.asItem()) {
+    public void onGetItem(final ItemStack bki) {
+        for (final Block bvr4 : FindTreeTutorialStepInstance.TREE_BLOCKS) {
+            if (bki.getItem() == bvr4.asItem()) {
                 this.tutorial.setStep(TutorialSteps.CRAFT_PLANKS);
             }
         }
     }
     
-    public static boolean hasPunchedTreesPreviously(final LocalPlayer dqb) {
-        for (final Block bph3 : FindTreeTutorialStepInstance.TREE_BLOCKS) {
-            if (dqb.getStats().getValue(Stats.BLOCK_MINED.get(bph3)) > 0) {
+    public static boolean hasPunchedTreesPreviously(final LocalPlayer ebf) {
+        for (final Block bvr3 : FindTreeTutorialStepInstance.TREE_BLOCKS) {
+            if (ebf.getStats().getValue(Stats.BLOCK_MINED.get(bvr3)) > 0) {
                 return true;
             }
         }
@@ -97,8 +97,8 @@ public class FindTreeTutorialStepInstance implements TutorialStepInstance {
     }
     
     static {
-        TREE_BLOCKS = Sets.<Block>newHashSet(Blocks.OAK_LOG, Blocks.SPRUCE_LOG, Blocks.BIRCH_LOG, Blocks.JUNGLE_LOG, Blocks.ACACIA_LOG, Blocks.DARK_OAK_LOG, Blocks.OAK_WOOD, Blocks.SPRUCE_WOOD, Blocks.BIRCH_WOOD, Blocks.JUNGLE_WOOD, Blocks.ACACIA_WOOD, Blocks.DARK_OAK_WOOD, Blocks.OAK_LEAVES, Blocks.SPRUCE_LEAVES, Blocks.BIRCH_LEAVES, Blocks.JUNGLE_LEAVES, Blocks.ACACIA_LEAVES, Blocks.DARK_OAK_LEAVES);
-        TITLE = new TranslatableComponent("tutorial.find_tree.title", new Object[0]);
-        DESCRIPTION = new TranslatableComponent("tutorial.find_tree.description", new Object[0]);
+        TREE_BLOCKS = Sets.<Block>newHashSet(Blocks.OAK_LOG, Blocks.SPRUCE_LOG, Blocks.BIRCH_LOG, Blocks.JUNGLE_LOG, Blocks.ACACIA_LOG, Blocks.DARK_OAK_LOG, Blocks.WARPED_STEM, Blocks.CRIMSON_STEM, Blocks.OAK_WOOD, Blocks.SPRUCE_WOOD, Blocks.BIRCH_WOOD, Blocks.JUNGLE_WOOD, Blocks.ACACIA_WOOD, Blocks.DARK_OAK_WOOD, Blocks.WARPED_HYPHAE, Blocks.CRIMSON_HYPHAE, Blocks.OAK_LEAVES, Blocks.SPRUCE_LEAVES, Blocks.BIRCH_LEAVES, Blocks.JUNGLE_LEAVES, Blocks.ACACIA_LEAVES, Blocks.DARK_OAK_LEAVES, Blocks.NETHER_WART_BLOCK, Blocks.WARPED_WART_BLOCK);
+        TITLE = new TranslatableComponent("tutorial.find_tree.title");
+        DESCRIPTION = new TranslatableComponent("tutorial.find_tree.description");
     }
 }
diff --git a/src/net/minecraft/client/tutorial/MovementTutorialStepInstance.java b/src/net/minecraft/client/tutorial/MovementTutorialStepInstance.java
index 3788392..cd22184 100644
--- a/src/net/minecraft/client/tutorial/MovementTutorialStepInstance.java
+++ b/src/net/minecraft/client/tutorial/MovementTutorialStepInstance.java
@@ -23,10 +23,10 @@ public class MovementTutorialStepInstance implements TutorialStepInstance {
     private int moveCompleted;
     private int lookCompleted;
     
-    public MovementTutorialStepInstance(final Tutorial eej) {
+    public MovementTutorialStepInstance(final Tutorial epx) {
         this.moveCompleted = -1;
         this.lookCompleted = -1;
-        this.tutorial = eej;
+        this.tutorial = epx;
     }
     
     @Override
@@ -93,8 +93,8 @@ public class MovementTutorialStepInstance implements TutorialStepInstance {
     }
     
     @Override
-    public void onInput(final Input dpz) {
-        if (dpz.up || dpz.down || dpz.left || dpz.right || dpz.jumping) {
+    public void onInput(final Input ebd) {
+        if (ebd.up || ebd.down || ebd.left || ebd.right || ebd.jumping) {
             this.moved = true;
         }
     }
@@ -109,7 +109,7 @@ public class MovementTutorialStepInstance implements TutorialStepInstance {
     static {
         MOVE_TITLE = new TranslatableComponent("tutorial.move.title", new Object[] { Tutorial.key("forward"), Tutorial.key("left"), Tutorial.key("back"), Tutorial.key("right") });
         MOVE_DESCRIPTION = new TranslatableComponent("tutorial.move.description", new Object[] { Tutorial.key("jump") });
-        LOOK_TITLE = new TranslatableComponent("tutorial.look.title", new Object[0]);
-        LOOK_DESCRIPTION = new TranslatableComponent("tutorial.look.description", new Object[0]);
+        LOOK_TITLE = new TranslatableComponent("tutorial.look.title");
+        LOOK_DESCRIPTION = new TranslatableComponent("tutorial.look.description");
     }
 }
diff --git a/src/net/minecraft/client/tutorial/OpenInventoryTutorialStep.java b/src/net/minecraft/client/tutorial/OpenInventoryTutorialStep.java
index fd59419..a04a1f1 100644
--- a/src/net/minecraft/client/tutorial/OpenInventoryTutorialStep.java
+++ b/src/net/minecraft/client/tutorial/OpenInventoryTutorialStep.java
@@ -13,8 +13,8 @@ public class OpenInventoryTutorialStep implements TutorialStepInstance {
     private TutorialToast toast;
     private int timeWaiting;
     
-    public OpenInventoryTutorialStep(final Tutorial eej) {
-        this.tutorial = eej;
+    public OpenInventoryTutorialStep(final Tutorial epx) {
+        this.tutorial = epx;
     }
     
     @Override
@@ -44,7 +44,7 @@ public class OpenInventoryTutorialStep implements TutorialStepInstance {
     }
     
     static {
-        TITLE = new TranslatableComponent("tutorial.open_inventory.title", new Object[0]);
+        TITLE = new TranslatableComponent("tutorial.open_inventory.title");
         DESCRIPTION = new TranslatableComponent("tutorial.open_inventory.description", new Object[] { Tutorial.key("inventory") });
     }
 }
diff --git a/src/net/minecraft/client/tutorial/PunchTreeTutorialStepInstance.java b/src/net/minecraft/client/tutorial/PunchTreeTutorialStepInstance.java
index 17ec39c..ffcdd57 100644
--- a/src/net/minecraft/client/tutorial/PunchTreeTutorialStepInstance.java
+++ b/src/net/minecraft/client/tutorial/PunchTreeTutorialStepInstance.java
@@ -2,12 +2,15 @@ package net.minecraft.client.tutorial;
 
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.gui.components.toasts.Toast;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.level.GameType;
 import net.minecraft.client.gui.components.toasts.TutorialToast;
@@ -21,8 +24,8 @@ public class PunchTreeTutorialStepInstance implements TutorialStepInstance {
     private int timeWaiting;
     private int resetCount;
     
-    public PunchTreeTutorialStepInstance(final Tutorial eej) {
-        this.tutorial = eej;
+    public PunchTreeTutorialStepInstance(final Tutorial epx) {
+        this.tutorial = epx;
     }
     
     @Override
@@ -33,13 +36,13 @@ public class PunchTreeTutorialStepInstance implements TutorialStepInstance {
             return;
         }
         if (this.timeWaiting == 1) {
-            final LocalPlayer dqb2 = this.tutorial.getMinecraft().player;
-            if (dqb2 != null) {
-                if (dqb2.inventory.contains(ItemTags.LOGS)) {
+            final LocalPlayer ebf2 = this.tutorial.getMinecraft().player;
+            if (ebf2 != null) {
+                if (ebf2.inventory.contains(ItemTags.LOGS)) {
                     this.tutorial.setStep(TutorialSteps.CRAFT_PLANKS);
                     return;
                 }
-                if (FindTreeTutorialStepInstance.hasPunchedTreesPreviously(dqb2)) {
+                if (FindTreeTutorialStepInstance.hasPunchedTreesPreviously(ebf2)) {
                     this.tutorial.setStep(TutorialSteps.CRAFT_PLANKS);
                     return;
                 }
@@ -60,8 +63,8 @@ public class PunchTreeTutorialStepInstance implements TutorialStepInstance {
     }
     
     @Override
-    public void onDestroyBlock(final ClientLevel dno, final BlockPos fk, final BlockState byj, final float float4) {
-        final boolean boolean6 = byj.is(BlockTags.LOGS);
+    public void onDestroyBlock(final ClientLevel dym, final BlockPos fu, final BlockState cfj, final float float4) {
+        final boolean boolean6 = cfj.is(BlockTags.LOGS);
         if (boolean6 && float4 > 0.0f) {
             if (this.toast != null) {
                 this.toast.updateProgress(float4);
@@ -79,14 +82,14 @@ public class PunchTreeTutorialStepInstance implements TutorialStepInstance {
     }
     
     @Override
-    public void onGetItem(final ItemStack ben) {
-        if (ItemTags.LOGS.contains(ben.getItem())) {
+    public void onGetItem(final ItemStack bki) {
+        if (ItemTags.LOGS.contains(bki.getItem())) {
             this.tutorial.setStep(TutorialSteps.CRAFT_PLANKS);
         }
     }
     
     static {
-        TITLE = new TranslatableComponent("tutorial.punch_tree.title", new Object[0]);
+        TITLE = new TranslatableComponent("tutorial.punch_tree.title");
         DESCRIPTION = new TranslatableComponent("tutorial.punch_tree.description", new Object[] { Tutorial.key("attack") });
     }
 }
diff --git a/src/net/minecraft/client/tutorial/Tutorial.java b/src/net/minecraft/client/tutorial/Tutorial.java
index 2596b4c..75a6806 100644
--- a/src/net/minecraft/client/tutorial/Tutorial.java
+++ b/src/net/minecraft/client/tutorial/Tutorial.java
@@ -18,13 +18,13 @@ public class Tutorial {
     @Nullable
     private TutorialStepInstance instance;
     
-    public Tutorial(final Minecraft dbn) {
-        this.minecraft = dbn;
+    public Tutorial(final Minecraft dlx) {
+        this.minecraft = dlx;
     }
     
-    public void onInput(final Input dpz) {
+    public void onInput(final Input ebd) {
         if (this.instance != null) {
-            this.instance.onInput(dpz);
+            this.instance.onInput(ebd);
         }
     }
     
@@ -34,15 +34,15 @@ public class Tutorial {
         }
     }
     
-    public void onLookAt(@Nullable final ClientLevel dno, @Nullable final HitResult cvi) {
-        if (this.instance != null && cvi != null && dno != null) {
-            this.instance.onLookAt(dno, cvi);
+    public void onLookAt(@Nullable final ClientLevel dym, @Nullable final HitResult dej) {
+        if (this.instance != null && dej != null && dym != null) {
+            this.instance.onLookAt(dym, dej);
         }
     }
     
-    public void onDestroyBlock(final ClientLevel dno, final BlockPos fk, final BlockState byj, final float float4) {
+    public void onDestroyBlock(final ClientLevel dym, final BlockPos fu, final BlockState cfj, final float float4) {
         if (this.instance != null) {
-            this.instance.onDestroyBlock(dno, fk, byj, float4);
+            this.instance.onDestroyBlock(dym, fu, cfj, float4);
         }
     }
     
@@ -52,9 +52,9 @@ public class Tutorial {
         }
     }
     
-    public void onGetItem(final ItemStack ben) {
+    public void onGetItem(final ItemStack bki) {
         if (this.instance != null) {
-            this.instance.onGetItem(ben);
+            this.instance.onGetItem(bki);
         }
     }
     
@@ -87,12 +87,12 @@ public class Tutorial {
         }
     }
     
-    public void setStep(final TutorialSteps eel) {
-        this.minecraft.options.tutorialStep = eel;
+    public void setStep(final TutorialSteps epz) {
+        this.minecraft.options.tutorialStep = epz;
         this.minecraft.options.save();
         if (this.instance != null) {
             this.instance.clear();
-            this.instance = eel.create(this);
+            this.instance = epz.create(this);
         }
     }
     
diff --git a/src/net/minecraft/client/tutorial/TutorialStepInstance.java b/src/net/minecraft/client/tutorial/TutorialStepInstance.java
index ea4e117..bb13b37 100644
--- a/src/net/minecraft/client/tutorial/TutorialStepInstance.java
+++ b/src/net/minecraft/client/tutorial/TutorialStepInstance.java
@@ -14,21 +14,21 @@ public interface TutorialStepInstance {
     default void tick() {
     }
     
-    default void onInput(final Input dpz) {
+    default void onInput(final Input ebd) {
     }
     
     default void onMouse(final double double1, final double double2) {
     }
     
-    default void onLookAt(final ClientLevel dno, final HitResult cvi) {
+    default void onLookAt(final ClientLevel dym, final HitResult dej) {
     }
     
-    default void onDestroyBlock(final ClientLevel dno, final BlockPos fk, final BlockState byj, final float float4) {
+    default void onDestroyBlock(final ClientLevel dym, final BlockPos fu, final BlockState cfj, final float float4) {
     }
     
     default void onOpenInventory() {
     }
     
-    default void onGetItem(final ItemStack ben) {
+    default void onGetItem(final ItemStack bki) {
     }
 }
diff --git a/src/net/minecraft/client/tutorial/TutorialSteps.java b/src/net/minecraft/client/tutorial/TutorialSteps.java
index 8608bc1..8229817 100644
--- a/src/net/minecraft/client/tutorial/TutorialSteps.java
+++ b/src/net/minecraft/client/tutorial/TutorialSteps.java
@@ -18,8 +18,8 @@ public enum TutorialSteps {
         this.constructor = function;
     }
     
-    public TutorialStepInstance create(final Tutorial eej) {
-        return (TutorialStepInstance)this.constructor.apply(eej);
+    public TutorialStepInstance create(final Tutorial epx) {
+        return (TutorialStepInstance)this.constructor.apply(epx);
     }
     
     public String getName() {
@@ -27,9 +27,9 @@ public enum TutorialSteps {
     }
     
     public static TutorialSteps getByName(final String string) {
-        for (final TutorialSteps eel5 : values()) {
-            if (eel5.name.equals(string)) {
-                return eel5;
+        for (final TutorialSteps epz5 : values()) {
+            if (epz5.name.equals(string)) {
+                return epz5;
             }
         }
         return TutorialSteps.NONE;
diff --git a/src/net/minecraft/commands/BrigadierExceptions.java b/src/net/minecraft/commands/BrigadierExceptions.java
index 79ca728..0db8e1a 100644
--- a/src/net/minecraft/commands/BrigadierExceptions.java
+++ b/src/net/minecraft/commands/BrigadierExceptions.java
@@ -158,8 +158,8 @@ public class BrigadierExceptions implements BuiltInExceptionProvider {
             new TranslatableComponent("argument.literal.incorrect", new Object[] { object });
             return translatableComponent;
         });
-        READER_EXPECTED_START_OF_QUOTE = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.quote.expected.start", new Object[0]));
-        READER_EXPECTED_END_OF_QUOTE = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.quote.expected.end", new Object[0]));
+        READER_EXPECTED_START_OF_QUOTE = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.quote.expected.start"));
+        READER_EXPECTED_END_OF_QUOTE = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.quote.expected.end"));
         final TranslatableComponent translatableComponent2;
         READER_INVALID_ESCAPE = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("parsing.quote.escape", new Object[] { object });
@@ -175,34 +175,34 @@ public class BrigadierExceptions implements BuiltInExceptionProvider {
             new TranslatableComponent("parsing.int.invalid", new Object[] { object });
             return translatableComponent4;
         });
-        READER_EXPECTED_INT = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.int.expected", new Object[0]));
+        READER_EXPECTED_INT = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.int.expected"));
         final TranslatableComponent translatableComponent5;
         READER_INVALID_LONG = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("parsing.long.invalid", new Object[] { object });
             return translatableComponent5;
         });
-        READER_EXPECTED_LONG = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.long.expected", new Object[0]));
+        READER_EXPECTED_LONG = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.long.expected"));
         final TranslatableComponent translatableComponent6;
         READER_INVALID_DOUBLE = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("parsing.double.invalid", new Object[] { object });
             return translatableComponent6;
         });
-        READER_EXPECTED_DOUBLE = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.double.expected", new Object[0]));
+        READER_EXPECTED_DOUBLE = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.double.expected"));
         final TranslatableComponent translatableComponent7;
         READER_INVALID_FLOAT = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("parsing.float.invalid", new Object[] { object });
             return translatableComponent7;
         });
-        READER_EXPECTED_FLOAT = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.float.expected", new Object[0]));
-        READER_EXPECTED_BOOL = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.bool.expected", new Object[0]));
+        READER_EXPECTED_FLOAT = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.float.expected"));
+        READER_EXPECTED_BOOL = new SimpleCommandExceptionType((Message)new TranslatableComponent("parsing.bool.expected"));
         final TranslatableComponent translatableComponent8;
         READER_EXPECTED_SYMBOL = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("parsing.expected", new Object[] { object });
             return translatableComponent8;
         });
-        DISPATCHER_UNKNOWN_COMMAND = new SimpleCommandExceptionType((Message)new TranslatableComponent("command.unknown.command", new Object[0]));
-        DISPATCHER_UNKNOWN_ARGUMENT = new SimpleCommandExceptionType((Message)new TranslatableComponent("command.unknown.argument", new Object[0]));
-        DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR = new SimpleCommandExceptionType((Message)new TranslatableComponent("command.expected.separator", new Object[0]));
+        DISPATCHER_UNKNOWN_COMMAND = new SimpleCommandExceptionType((Message)new TranslatableComponent("command.unknown.command"));
+        DISPATCHER_UNKNOWN_ARGUMENT = new SimpleCommandExceptionType((Message)new TranslatableComponent("command.unknown.argument"));
+        DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR = new SimpleCommandExceptionType((Message)new TranslatableComponent("command.expected.separator"));
         final TranslatableComponent translatableComponent9;
         DISPATCHER_PARSE_EXCEPTION = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("command.exception", new Object[] { object });
diff --git a/src/net/minecraft/commands/CommandFunction.java b/src/net/minecraft/commands/CommandFunction.java
index e88536b..1f91970 100644
--- a/src/net/minecraft/commands/CommandFunction.java
+++ b/src/net/minecraft/commands/CommandFunction.java
@@ -3,20 +3,21 @@ package net.minecraft.commands;
 import java.util.Optional;
 import javax.annotation.Nullable;
 import java.util.ArrayDeque;
+import net.minecraft.server.ServerFunctionManager;
 import com.mojang.brigadier.ParseResults;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.StringReader;
 import com.google.common.collect.Lists;
 import java.util.List;
-import net.minecraft.server.ServerFunctionManager;
+import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.resources.ResourceLocation;
 
 public class CommandFunction {
     private final Entry[] entries;
     private final ResourceLocation id;
     
-    public CommandFunction(final ResourceLocation sm, final Entry[] arr) {
-        this.id = sm;
+    public CommandFunction(final ResourceLocation uh, final Entry[] arr) {
+        this.id = uh;
         this.entries = arr;
     }
     
@@ -28,38 +29,38 @@ public class CommandFunction {
         return this.entries;
     }
     
-    public static CommandFunction fromLines(final ResourceLocation sm, final ServerFunctionManager sy, final List<String> list) {
+    public static CommandFunction fromLines(final ResourceLocation uh, final CommandDispatcher<CommandSourceStack> commandDispatcher, final CommandSourceStack cz, final List<String> list) {
         final List<Entry> list2 = Lists.newArrayListWithCapacity(list.size());
-        for (int integer5 = 0; integer5 < list.size(); ++integer5) {
-            final int integer6 = integer5 + 1;
-            final String string7 = list.get(integer5).trim();
-            final StringReader stringReader8 = new StringReader(string7);
-            if (stringReader8.canRead()) {
-                if (stringReader8.peek() != '#') {
-                    if (stringReader8.peek() == '/') {
-                        stringReader8.skip();
-                        if (stringReader8.peek() == '/') {
-                            throw new IllegalArgumentException("Unknown or invalid command '" + string7 + "' on line " + integer6 + " (if you intended to make a comment, use '#' not '//')");
+        for (int integer6 = 0; integer6 < list.size(); ++integer6) {
+            final int integer7 = integer6 + 1;
+            final String string8 = list.get(integer6).trim();
+            final StringReader stringReader9 = new StringReader(string8);
+            if (stringReader9.canRead()) {
+                if (stringReader9.peek() != '#') {
+                    if (stringReader9.peek() == '/') {
+                        stringReader9.skip();
+                        if (stringReader9.peek() == '/') {
+                            throw new IllegalArgumentException("Unknown or invalid command '" + string8 + "' on line " + integer7 + " (if you intended to make a comment, use '#' not '//')");
                         }
-                        final String string8 = stringReader8.readUnquotedString();
-                        throw new IllegalArgumentException("Unknown or invalid command '" + string7 + "' on line " + integer6 + " (did you mean '" + string8 + "'? Do not use a preceding forwards slash.)");
+                        final String string9 = stringReader9.readUnquotedString();
+                        throw new IllegalArgumentException("Unknown or invalid command '" + string8 + "' on line " + integer7 + " (did you mean '" + string9 + "'? Do not use a preceding forwards slash.)");
                     }
                     else {
                         try {
-                            final ParseResults<CommandSourceStack> parseResults9 = (ParseResults<CommandSourceStack>)sy.getServer().getCommands().getDispatcher().parse(stringReader8, sy.getCompilationContext());
-                            if (parseResults9.getReader().canRead()) {
-                                throw Commands.<CommandSourceStack>getParseException(parseResults9);
+                            final ParseResults<CommandSourceStack> parseResults10 = (ParseResults<CommandSourceStack>)commandDispatcher.parse(stringReader9, cz);
+                            if (parseResults10.getReader().canRead()) {
+                                throw Commands.<CommandSourceStack>getParseException(parseResults10);
                             }
-                            list2.add(new CommandEntry(parseResults9));
+                            list2.add(new CommandEntry(parseResults10));
                         }
-                        catch (CommandSyntaxException commandSyntaxException9) {
-                            throw new IllegalArgumentException("Whilst parsing command on line " + integer6 + ": " + commandSyntaxException9.getMessage());
+                        catch (CommandSyntaxException commandSyntaxException10) {
+                            throw new IllegalArgumentException("Whilst parsing command on line " + integer7 + ": " + commandSyntaxException10.getMessage());
                         }
                     }
                 }
             }
         }
-        return new CommandFunction(sm, list2.<Entry>toArray(new Entry[0]));
+        return new CommandFunction(uh, list2.<Entry>toArray(new Entry[0]));
     }
     
     public static class CommandEntry implements Entry {
@@ -70,8 +71,8 @@ public class CommandFunction {
         }
         
         @Override
-        public void execute(final ServerFunctionManager sy, final CommandSourceStack cq, final ArrayDeque<ServerFunctionManager.QueuedCommand> arrayDeque, final int integer) throws CommandSyntaxException {
-            sy.getDispatcher().execute(new ParseResults(this.parse.getContext().withSource(cq), this.parse.getReader(), this.parse.getExceptions()));
+        public void execute(final ServerFunctionManager uu, final CommandSourceStack cz, final ArrayDeque<ServerFunctionManager.QueuedCommand> arrayDeque, final int integer) throws CommandSyntaxException {
+            uu.getDispatcher().execute(new ParseResults(this.parse.getContext().withSource(cz), this.parse.getReader(), this.parse.getExceptions()));
         }
         
         @Override
@@ -83,22 +84,22 @@ public class CommandFunction {
     public static class FunctionEntry implements Entry {
         private final CacheableFunction function;
         
-        public FunctionEntry(final CommandFunction cn) {
-            this.function = new CacheableFunction(cn);
+        public FunctionEntry(final CommandFunction cw) {
+            this.function = new CacheableFunction(cw);
         }
         
         @Override
-        public void execute(final ServerFunctionManager sy, final CommandSourceStack cq, final ArrayDeque<ServerFunctionManager.QueuedCommand> arrayDeque, final int integer) {
+        public void execute(final ServerFunctionManager uu, final CommandSourceStack cz, final ArrayDeque<ServerFunctionManager.QueuedCommand> arrayDeque, final int integer) {
             final Entry[] arr6;
             final int integer2;
             final int integer3;
             int integer4;
-            this.function.get(sy).ifPresent(cn -> {
-                arr6 = cn.getEntries();
+            this.function.get(uu).ifPresent(cw -> {
+                arr6 = cw.getEntries();
                 integer2 = integer - arrayDeque.size();
                 integer3 = Math.min(arr6.length, integer2);
                 for (integer4 = integer3 - 1; integer4 >= 0; --integer4) {
-                    arrayDeque.addFirst(new ServerFunctionManager.QueuedCommand(sy, cq, arr6[integer4]));
+                    arrayDeque.addFirst(new ServerFunctionManager.QueuedCommand(uu, cz, arr6[integer4]));
                 }
             });
         }
@@ -116,22 +117,22 @@ public class CommandFunction {
         private boolean resolved;
         private Optional<CommandFunction> function;
         
-        public CacheableFunction(@Nullable final ResourceLocation sm) {
+        public CacheableFunction(@Nullable final ResourceLocation uh) {
             this.function = Optional.<CommandFunction>empty();
-            this.id = sm;
+            this.id = uh;
         }
         
-        public CacheableFunction(final CommandFunction cn) {
+        public CacheableFunction(final CommandFunction cw) {
             this.function = Optional.<CommandFunction>empty();
             this.resolved = true;
             this.id = null;
-            this.function = Optional.<CommandFunction>of(cn);
+            this.function = Optional.<CommandFunction>of(cw);
         }
         
-        public Optional<CommandFunction> get(final ServerFunctionManager sy) {
+        public Optional<CommandFunction> get(final ServerFunctionManager uu) {
             if (!this.resolved) {
                 if (this.id != null) {
-                    this.function = sy.get(this.id);
+                    this.function = uu.get(this.id);
                 }
                 this.resolved = true;
             }
@@ -140,7 +141,7 @@ public class CommandFunction {
         
         @Nullable
         public ResourceLocation getId() {
-            return this.function.<ResourceLocation>map(cn -> cn.id).orElse(this.id);
+            return this.function.<ResourceLocation>map(cw -> cw.id).orElse(this.id);
         }
         
         static {
@@ -149,6 +150,6 @@ public class CommandFunction {
     }
     
     public interface Entry {
-        void execute(final ServerFunctionManager sy, final CommandSourceStack cq, final ArrayDeque<ServerFunctionManager.QueuedCommand> arrayDeque, final int integer) throws CommandSyntaxException;
+        void execute(final ServerFunctionManager uu, final CommandSourceStack cz, final ArrayDeque<ServerFunctionManager.QueuedCommand> arrayDeque, final int integer) throws CommandSyntaxException;
     }
 }
diff --git a/src/net/minecraft/commands/CommandRuntimeException.java b/src/net/minecraft/commands/CommandRuntimeException.java
index 0b0a829..1894aaf 100644
--- a/src/net/minecraft/commands/CommandRuntimeException.java
+++ b/src/net/minecraft/commands/CommandRuntimeException.java
@@ -6,9 +6,9 @@ import net.minecraft.network.chat.Component;
 public class CommandRuntimeException extends RuntimeException {
     private final Component message;
     
-    public CommandRuntimeException(final Component lf) {
-        super(lf.getContents(), null, CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES, CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES);
-        this.message = lf;
+    public CommandRuntimeException(final Component mr) {
+        super(mr.getString(), null, CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES, CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES);
+        this.message = mr;
     }
     
     public Component getComponent() {
diff --git a/src/net/minecraft/commands/CommandSource.java b/src/net/minecraft/commands/CommandSource.java
index e94f506..f65f74e 100644
--- a/src/net/minecraft/commands/CommandSource.java
+++ b/src/net/minecraft/commands/CommandSource.java
@@ -1,11 +1,12 @@
 package net.minecraft.commands;
 
+import java.util.UUID;
 import net.minecraft.network.chat.Component;
 
 public interface CommandSource {
     public static final CommandSource NULL = new CommandSource() {
         @Override
-        public void sendMessage(final Component lf) {
+        public void sendMessage(final Component mr, final UUID uUID) {
         }
         
         @Override
@@ -24,7 +25,7 @@ public interface CommandSource {
         }
     };
     
-    void sendMessage(final Component lf);
+    void sendMessage(final Component mr, final UUID uUID);
     
     boolean acceptsSuccess();
     
diff --git a/src/net/minecraft/commands/CommandSourceStack.java b/src/net/minecraft/commands/CommandSourceStack.java
index 9e37785..3e4665a 100644
--- a/src/net/minecraft/commands/CommandSourceStack.java
+++ b/src/net/minecraft/commands/CommandSourceStack.java
@@ -1,6 +1,9 @@
 package net.minecraft.commands;
 
 import com.mojang.brigadier.Message;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import java.util.Set;
 import com.mojang.brigadier.suggestion.Suggestions;
 import java.util.concurrent.CompletableFuture;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
@@ -15,6 +18,7 @@ import java.util.Iterator;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.Util;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.Mth;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -47,44 +51,44 @@ public class CommandSourceStack implements SharedSuggestionProvider {
     private final EntityAnchorArgument.Anchor anchor;
     private final Vec2 rotation;
     
-    public CommandSourceStack(final CommandSource cp, final Vec3 cvl, final Vec2 cvk, final ServerLevel xd, final int integer, final String string, final Component lf, final MinecraftServer minecraftServer, @Nullable final Entity akq) {
-        this(cp, cvl, cvk, xd, integer, string, lf, minecraftServer, akq, false, (ResultConsumer<CommandSourceStack>)((commandContext, boolean2, integer) -> {}), EntityAnchorArgument.Anchor.FEET);
+    public CommandSourceStack(final CommandSource cy, final Vec3 dem, final Vec2 del, final ServerLevel zd, final int integer, final String string, final Component mr, final MinecraftServer minecraftServer, @Nullable final Entity aom) {
+        this(cy, dem, del, zd, integer, string, mr, minecraftServer, aom, false, (ResultConsumer<CommandSourceStack>)((commandContext, boolean2, integer) -> {}), EntityAnchorArgument.Anchor.FEET);
     }
     
-    protected CommandSourceStack(final CommandSource cp, final Vec3 cvl, final Vec2 cvk, final ServerLevel xd, final int integer, final String string, final Component lf, final MinecraftServer minecraftServer, @Nullable final Entity akq, final boolean boolean10, final ResultConsumer<CommandSourceStack> resultConsumer, final EntityAnchorArgument.Anchor a) {
-        this.source = cp;
-        this.worldPosition = cvl;
-        this.level = xd;
+    protected CommandSourceStack(final CommandSource cy, final Vec3 dem, final Vec2 del, final ServerLevel zd, final int integer, final String string, final Component mr, final MinecraftServer minecraftServer, @Nullable final Entity aom, final boolean boolean10, final ResultConsumer<CommandSourceStack> resultConsumer, final EntityAnchorArgument.Anchor a) {
+        this.source = cy;
+        this.worldPosition = dem;
+        this.level = zd;
         this.silent = boolean10;
-        this.entity = akq;
+        this.entity = aom;
         this.permissionLevel = integer;
         this.textName = string;
-        this.displayName = lf;
+        this.displayName = mr;
         this.server = minecraftServer;
         this.consumer = resultConsumer;
         this.anchor = a;
-        this.rotation = cvk;
+        this.rotation = del;
     }
     
-    public CommandSourceStack withEntity(final Entity akq) {
-        if (this.entity == akq) {
+    public CommandSourceStack withEntity(final Entity aom) {
+        if (this.entity == aom) {
             return this;
         }
-        return new CommandSourceStack(this.source, this.worldPosition, this.rotation, this.level, this.permissionLevel, akq.getName().getString(), akq.getDisplayName(), this.server, akq, this.silent, this.consumer, this.anchor);
+        return new CommandSourceStack(this.source, this.worldPosition, this.rotation, this.level, this.permissionLevel, aom.getName().getString(), aom.getDisplayName(), this.server, aom, this.silent, this.consumer, this.anchor);
     }
     
-    public CommandSourceStack withPosition(final Vec3 cvl) {
-        if (this.worldPosition.equals(cvl)) {
+    public CommandSourceStack withPosition(final Vec3 dem) {
+        if (this.worldPosition.equals(dem)) {
             return this;
         }
-        return new CommandSourceStack(this.source, cvl, this.rotation, this.level, this.permissionLevel, this.textName, this.displayName, this.server, this.entity, this.silent, this.consumer, this.anchor);
+        return new CommandSourceStack(this.source, dem, this.rotation, this.level, this.permissionLevel, this.textName, this.displayName, this.server, this.entity, this.silent, this.consumer, this.anchor);
     }
     
-    public CommandSourceStack withRotation(final Vec2 cvk) {
-        if (this.rotation.equals(cvk)) {
+    public CommandSourceStack withRotation(final Vec2 del) {
+        if (this.rotation.equals(del)) {
             return this;
         }
-        return new CommandSourceStack(this.source, this.worldPosition, cvk, this.level, this.permissionLevel, this.textName, this.displayName, this.server, this.entity, this.silent, this.consumer, this.anchor);
+        return new CommandSourceStack(this.source, this.worldPosition, del, this.level, this.permissionLevel, this.textName, this.displayName, this.server, this.entity, this.silent, this.consumer, this.anchor);
     }
     
     public CommandSourceStack withCallback(final ResultConsumer<CommandSourceStack> resultConsumer) {
@@ -127,22 +131,22 @@ public class CommandSourceStack implements SharedSuggestionProvider {
         return new CommandSourceStack(this.source, this.worldPosition, this.rotation, this.level, this.permissionLevel, this.textName, this.displayName, this.server, this.entity, this.silent, this.consumer, a);
     }
     
-    public CommandSourceStack withLevel(final ServerLevel xd) {
-        if (xd == this.level) {
+    public CommandSourceStack withLevel(final ServerLevel zd) {
+        if (zd == this.level) {
             return this;
         }
-        return new CommandSourceStack(this.source, this.worldPosition, this.rotation, xd, this.permissionLevel, this.textName, this.displayName, this.server, this.entity, this.silent, this.consumer, this.anchor);
+        return new CommandSourceStack(this.source, this.worldPosition, this.rotation, zd, this.permissionLevel, this.textName, this.displayName, this.server, this.entity, this.silent, this.consumer, this.anchor);
     }
     
-    public CommandSourceStack facing(final Entity akq, final EntityAnchorArgument.Anchor a) throws CommandSyntaxException {
-        return this.facing(a.apply(akq));
+    public CommandSourceStack facing(final Entity aom, final EntityAnchorArgument.Anchor a) throws CommandSyntaxException {
+        return this.facing(a.apply(aom));
     }
     
-    public CommandSourceStack facing(final Vec3 cvl) throws CommandSyntaxException {
-        final Vec3 cvl2 = this.anchor.apply(this);
-        final double double4 = cvl.x - cvl2.x;
-        final double double5 = cvl.y - cvl2.y;
-        final double double6 = cvl.z - cvl2.z;
+    public CommandSourceStack facing(final Vec3 dem) throws CommandSyntaxException {
+        final Vec3 dem2 = this.anchor.apply(this);
+        final double double4 = dem.x - dem2.x;
+        final double double5 = dem.y - dem2.y;
+        final double double6 = dem.z - dem2.z;
         final double double7 = Mth.sqrt(double4 * double4 + double6 * double6);
         final float float12 = Mth.wrapDegrees((float)(-(Mth.atan2(double5, double7) * 57.2957763671875)));
         final float float13 = Mth.wrapDegrees((float)(Mth.atan2(double6, double4) * 57.2957763671875) - 90.0f);
@@ -201,32 +205,32 @@ public class CommandSourceStack implements SharedSuggestionProvider {
         return this.anchor;
     }
     
-    public void sendSuccess(final Component lf, final boolean boolean2) {
+    public void sendSuccess(final Component mr, final boolean boolean2) {
         if (this.source.acceptsSuccess() && !this.silent) {
-            this.source.sendMessage(lf);
+            this.source.sendMessage(mr, Util.NIL_UUID);
         }
         if (boolean2 && this.source.shouldInformAdmins() && !this.silent) {
-            this.broadcastToAdmins(lf);
+            this.broadcastToAdmins(mr);
         }
     }
     
-    private void broadcastToAdmins(final Component lf) {
-        final Component lf2 = new TranslatableComponent("chat.type.admin", new Object[] { this.getDisplayName(), lf }).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC);
+    private void broadcastToAdmins(final Component mr) {
+        final Component mr2 = new TranslatableComponent("chat.type.admin", new Object[] { this.getDisplayName(), mr }).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC);
         if (this.server.getGameRules().getBoolean(GameRules.RULE_SENDCOMMANDFEEDBACK)) {
-            for (final ServerPlayer xe5 : this.server.getPlayerList().getPlayers()) {
-                if (xe5 != this.source && this.server.getPlayerList().isOp(xe5.getGameProfile())) {
-                    xe5.sendMessage(lf2);
+            for (final ServerPlayer ze5 : this.server.getPlayerList().getPlayers()) {
+                if (ze5 != this.source && this.server.getPlayerList().isOp(ze5.getGameProfile())) {
+                    ze5.sendMessage(mr2, Util.NIL_UUID);
                 }
             }
         }
         if (this.source != this.server && this.server.getGameRules().getBoolean(GameRules.RULE_LOGADMINCOMMANDS)) {
-            this.server.sendMessage(lf2);
+            this.server.sendMessage(mr2, Util.NIL_UUID);
         }
     }
     
-    public void sendFailure(final Component lf) {
+    public void sendFailure(final Component mr) {
         if (this.source.acceptsFailure() && !this.silent) {
-            this.source.sendMessage(new TextComponent("").append(lf).withStyle(ChatFormatting.RED));
+            this.source.sendMessage(new TextComponent("").append(mr).withStyle(ChatFormatting.RED), Util.NIL_UUID);
         }
     }
     
@@ -261,8 +265,13 @@ public class CommandSourceStack implements SharedSuggestionProvider {
         return null;
     }
     
+    @Override
+    public Set<ResourceKey<Level>> levels() {
+        return this.server.levelKeys();
+    }
+    
     static {
-        ERROR_NOT_PLAYER = new SimpleCommandExceptionType((Message)new TranslatableComponent("permissions.requires.player", new Object[0]));
-        ERROR_NOT_ENTITY = new SimpleCommandExceptionType((Message)new TranslatableComponent("permissions.requires.entity", new Object[0]));
+        ERROR_NOT_PLAYER = new SimpleCommandExceptionType((Message)new TranslatableComponent("permissions.requires.player"));
+        ERROR_NOT_ENTITY = new SimpleCommandExceptionType((Message)new TranslatableComponent("permissions.requires.entity"));
     }
 }
diff --git a/src/net/minecraft/commands/Commands.java b/src/net/minecraft/commands/Commands.java
index 301ff0e..40bd954 100644
--- a/src/net/minecraft/commands/Commands.java
+++ b/src/net/minecraft/commands/Commands.java
@@ -21,16 +21,18 @@ import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
 import com.google.common.collect.Maps;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.Util;
 import net.minecraft.network.chat.HoverEvent;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.ComponentUtils;
 import com.mojang.brigadier.StringReader;
+import net.minecraft.server.commands.PublishCommand;
 import net.minecraft.server.commands.WhitelistCommand;
 import net.minecraft.server.commands.StopCommand;
 import net.minecraft.server.commands.SetPlayerIdleTimeoutCommand;
@@ -70,11 +72,11 @@ import net.minecraft.server.commands.SayCommand;
 import net.minecraft.server.commands.ReplaceItemCommand;
 import net.minecraft.server.commands.RecipeCommand;
 import net.minecraft.server.commands.ReloadCommand;
-import net.minecraft.server.commands.PublishCommand;
 import net.minecraft.server.commands.PlaySoundCommand;
 import net.minecraft.server.commands.ParticleCommand;
 import net.minecraft.server.commands.MsgCommand;
 import net.minecraft.server.commands.LootCommand;
+import net.minecraft.server.commands.LocateBiomeCommand;
 import net.minecraft.server.commands.LocateCommand;
 import net.minecraft.server.commands.ListPlayersCommand;
 import net.minecraft.server.commands.KillCommand;
@@ -99,6 +101,7 @@ import net.minecraft.server.commands.CloneCommands;
 import net.minecraft.server.commands.ClearInventoryCommands;
 import net.minecraft.server.commands.BossBarCommands;
 import net.minecraft.server.commands.ExecuteCommand;
+import net.minecraft.server.commands.AttributeCommand;
 import net.minecraft.server.commands.AdvancementCommands;
 import com.mojang.brigadier.CommandDispatcher;
 import org.apache.logging.log4j.Logger;
@@ -107,8 +110,9 @@ public class Commands {
     private static final Logger LOGGER;
     private final CommandDispatcher<CommandSourceStack> dispatcher;
     
-    public Commands(final boolean boolean1) {
+    public Commands(final CommandSelection a) {
         AdvancementCommands.register(this.dispatcher = (CommandDispatcher<CommandSourceStack>)new CommandDispatcher());
+        AttributeCommand.register(this.dispatcher);
         ExecuteCommand.register(this.dispatcher);
         BossBarCommands.register(this.dispatcher);
         ClearInventoryCommands.register(this.dispatcher);
@@ -133,18 +137,18 @@ public class Commands {
         KillCommand.register(this.dispatcher);
         ListPlayersCommand.register(this.dispatcher);
         LocateCommand.register(this.dispatcher);
+        LocateBiomeCommand.register(this.dispatcher);
         LootCommand.register(this.dispatcher);
         MsgCommand.register(this.dispatcher);
         ParticleCommand.register(this.dispatcher);
         PlaySoundCommand.register(this.dispatcher);
-        PublishCommand.register(this.dispatcher);
         ReloadCommand.register(this.dispatcher);
         RecipeCommand.register(this.dispatcher);
         ReplaceItemCommand.register(this.dispatcher);
         SayCommand.register(this.dispatcher);
         ScheduleCommand.register(this.dispatcher);
         ScoreboardCommand.register(this.dispatcher);
-        SeedCommand.register(this.dispatcher);
+        SeedCommand.register(this.dispatcher, a != CommandSelection.INTEGRATED);
         SetBlockCommand.register(this.dispatcher);
         SetSpawnCommand.register(this.dispatcher);
         SetWorldSpawnCommand.register(this.dispatcher);
@@ -165,7 +169,7 @@ public class Commands {
         if (SharedConstants.IS_RUNNING_IN_IDE) {
             TestCommand.register(this.dispatcher);
         }
-        if (boolean1) {
+        if (a.includeDedicated) {
             BanIpCommands.register(this.dispatcher);
             BanListCommands.register(this.dispatcher);
             BanPlayerCommands.register(this.dispatcher);
@@ -180,75 +184,78 @@ public class Commands {
             StopCommand.register(this.dispatcher);
             WhitelistCommand.register(this.dispatcher);
         }
+        if (a.includeIntegrated) {
+            PublishCommand.register(this.dispatcher);
+        }
         this.dispatcher.findAmbiguities((commandNode1, commandNode2, commandNode3, collection) -> Commands.LOGGER.warn("Ambiguity between arguments {} and {} with inputs: {}", this.dispatcher.getPath(commandNode2), this.dispatcher.getPath(commandNode3), collection));
         this.dispatcher.setConsumer((commandContext, boolean2, integer) -> ((CommandSourceStack)commandContext.getSource()).onCommandComplete((CommandContext<CommandSourceStack>)commandContext, boolean2, integer));
     }
     
-    public int performCommand(final CommandSourceStack cq, final String string) {
+    public int performCommand(final CommandSourceStack cz, final String string) {
         final StringReader stringReader4 = new StringReader(string);
         if (stringReader4.canRead() && stringReader4.peek() == '/') {
             stringReader4.skip();
         }
-        cq.getServer().getProfiler().push(string);
+        cz.getServer().getProfiler().push(string);
         try {
-            return this.dispatcher.execute(stringReader4, cq);
+            return this.dispatcher.execute(stringReader4, cz);
         }
-        catch (CommandRuntimeException co5) {
-            cq.sendFailure(co5.getComponent());
+        catch (CommandRuntimeException cx5) {
+            cz.sendFailure(cx5.getComponent());
             return 0;
         }
         catch (CommandSyntaxException commandSyntaxException5) {
-            cq.sendFailure(ComponentUtils.fromMessage(commandSyntaxException5.getRawMessage()));
+            cz.sendFailure(ComponentUtils.fromMessage(commandSyntaxException5.getRawMessage()));
             if (commandSyntaxException5.getInput() != null && commandSyntaxException5.getCursor() >= 0) {
                 final int integer6 = Math.min(commandSyntaxException5.getInput().length(), commandSyntaxException5.getCursor());
-                final Component lf7 = new TextComponent("").withStyle(ChatFormatting.GRAY).withStyle(ln -> ln.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, string)));
+                final MutableComponent mx7 = new TextComponent("").withStyle(ChatFormatting.GRAY).withStyle(nb -> nb.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, string)));
                 if (integer6 > 10) {
-                    lf7.append("...");
+                    mx7.append("...");
                 }
-                lf7.append(commandSyntaxException5.getInput().substring(Math.max(0, integer6 - 10), integer6));
+                mx7.append(commandSyntaxException5.getInput().substring(Math.max(0, integer6 - 10), integer6));
                 if (integer6 < commandSyntaxException5.getInput().length()) {
-                    final Component lf8 = new TextComponent(commandSyntaxException5.getInput().substring(integer6)).withStyle(ChatFormatting.RED, ChatFormatting.UNDERLINE);
-                    lf7.append(lf8);
+                    final Component mr8 = new TextComponent(commandSyntaxException5.getInput().substring(integer6)).withStyle(ChatFormatting.RED, ChatFormatting.UNDERLINE);
+                    mx7.append(mr8);
                 }
-                lf7.append(new TranslatableComponent("command.context.here", new Object[0]).withStyle(ChatFormatting.RED, ChatFormatting.ITALIC));
-                cq.sendFailure(lf7);
+                mx7.append(new TranslatableComponent("command.context.here").withStyle(ChatFormatting.RED, ChatFormatting.ITALIC));
+                cz.sendFailure(mx7);
             }
             return 0;
         }
         catch (Exception exception5) {
-            final Component lf9 = new TextComponent((exception5.getMessage() == null) ? exception5.getClass().getName() : exception5.getMessage());
+            final MutableComponent mx8 = new TextComponent((exception5.getMessage() == null) ? exception5.getClass().getName() : exception5.getMessage());
             if (Commands.LOGGER.isDebugEnabled()) {
                 Commands.LOGGER.error("Command exception: {}", string, exception5);
                 final StackTraceElement[] arr7 = exception5.getStackTrace();
                 for (int integer7 = 0; integer7 < Math.min(arr7.length, 3); ++integer7) {
-                    lf9.append("\n\n").append(arr7[integer7].getMethodName()).append("\n ").append(arr7[integer7].getFileName()).append(":").append(String.valueOf(arr7[integer7].getLineNumber()));
+                    mx8.append("\n\n").append(arr7[integer7].getMethodName()).append("\n ").append(arr7[integer7].getFileName()).append(":").append(String.valueOf(arr7[integer7].getLineNumber()));
                 }
             }
-            cq.sendFailure(new TranslatableComponent("command.failed", new Object[0]).withStyle(ln -> ln.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, lf9))));
+            cz.sendFailure(new TranslatableComponent("command.failed").withStyle(nb -> nb.withHoverEvent(new HoverEvent((HoverEvent.Action<T>)HoverEvent.Action.SHOW_TEXT, (T)mx8))));
             if (SharedConstants.IS_RUNNING_IN_IDE) {
-                cq.sendFailure(new TextComponent(Util.describeError(exception5)));
+                cz.sendFailure(new TextComponent(Util.describeError(exception5)));
                 Commands.LOGGER.error("'" + string + "' threw an exception", (Throwable)exception5);
             }
             return 0;
         }
         finally {
-            cq.getServer().getProfiler().pop();
+            cz.getServer().getProfiler().pop();
         }
     }
     
-    public void sendCommands(final ServerPlayer xe) {
+    public void sendCommands(final ServerPlayer ze) {
         final Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> map3 = Maps.newHashMap();
         final RootCommandNode<SharedSuggestionProvider> rootCommandNode4 = (RootCommandNode<SharedSuggestionProvider>)new RootCommandNode();
         map3.put((CommandNode<CommandSourceStack>)this.dispatcher.getRoot(), (CommandNode<SharedSuggestionProvider>)rootCommandNode4);
-        this.fillUsableCommands((CommandNode<CommandSourceStack>)this.dispatcher.getRoot(), (CommandNode<SharedSuggestionProvider>)rootCommandNode4, xe.createCommandSourceStack(), map3);
-        xe.connection.send(new ClientboundCommandsPacket(rootCommandNode4));
+        this.fillUsableCommands((CommandNode<CommandSourceStack>)this.dispatcher.getRoot(), (CommandNode<SharedSuggestionProvider>)rootCommandNode4, ze.createCommandSourceStack(), map3);
+        ze.connection.send(new ClientboundCommandsPacket(rootCommandNode4));
     }
     
-    private void fillUsableCommands(final CommandNode<CommandSourceStack> commandNode1, final CommandNode<SharedSuggestionProvider> commandNode2, final CommandSourceStack cq, final Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> map) {
+    private void fillUsableCommands(final CommandNode<CommandSourceStack> commandNode1, final CommandNode<SharedSuggestionProvider> commandNode2, final CommandSourceStack cz, final Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> map) {
         for (final CommandNode<CommandSourceStack> commandNode3 : commandNode1.getChildren()) {
-            if (commandNode3.canUse(cq)) {
+            if (commandNode3.canUse(cz)) {
                 final ArgumentBuilder<SharedSuggestionProvider, ?> argumentBuilder8 = commandNode3.createBuilder();
-                argumentBuilder8.requires(cs -> true);
+                argumentBuilder8.requires(db -> true);
                 if (argumentBuilder8.getCommand() != null) {
                     argumentBuilder8.executes(commandContext -> 0);
                 }
@@ -267,7 +274,7 @@ public class Commands {
                 if (commandNode3.getChildren().isEmpty()) {
                     continue;
                 }
-                this.fillUsableCommands(commandNode3, commandNode4, cq, map);
+                this.fillUsableCommands(commandNode3, commandNode4, cz, map);
             }
         }
     }
@@ -280,10 +287,10 @@ public class Commands {
         return (RequiredArgumentBuilder<CommandSourceStack, T>)RequiredArgumentBuilder.argument(string, (ArgumentType)argumentType);
     }
     
-    public static Predicate<String> createValidator(final ParseFunction a) {
+    public static Predicate<String> createValidator(final ParseFunction b) {
         return string -> {
             try {
-                a.parse(new StringReader(string));
+                b.parse(new StringReader(string));
                 return true;
             }
             catch (CommandSyntaxException commandSyntaxException3) {
@@ -314,6 +321,20 @@ public class Commands {
         LOGGER = LogManager.getLogger();
     }
     
+    public enum CommandSelection {
+        ALL(true, true), 
+        DEDICATED(false, true), 
+        INTEGRATED(true, false);
+        
+        private final boolean includeIntegrated;
+        private final boolean includeDedicated;
+        
+        private CommandSelection(final boolean boolean3, final boolean boolean4) {
+            this.includeIntegrated = boolean3;
+            this.includeDedicated = boolean4;
+        }
+    }
+    
     @FunctionalInterface
     public interface ParseFunction {
         void parse(final StringReader stringReader) throws CommandSyntaxException;
diff --git a/src/net/minecraft/commands/SharedSuggestionProvider.java b/src/net/minecraft/commands/SharedSuggestionProvider.java
index 22b56b2..72e17f8 100644
--- a/src/net/minecraft/commands/SharedSuggestionProvider.java
+++ b/src/net/minecraft/commands/SharedSuggestionProvider.java
@@ -9,6 +9,9 @@ import com.google.common.base.Strings;
 import java.util.Iterator;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import java.util.Set;
 import com.mojang.brigadier.suggestion.Suggestions;
 import java.util.concurrent.CompletableFuture;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
@@ -41,21 +44,23 @@ public interface SharedSuggestionProvider {
         return Collections.<TextCoordinates>singleton(TextCoordinates.DEFAULT_GLOBAL);
     }
     
+    Set<ResourceKey<Level>> levels();
+    
     boolean hasPermission(final int integer);
     
     default <T> void filterResources(final Iterable<T> iterable, final String string, final Function<T, ResourceLocation> function, final Consumer<T> consumer) {
         final boolean boolean5 = string.indexOf(58) > -1;
         for (final T object7 : iterable) {
-            final ResourceLocation sm8 = function.apply(object7);
+            final ResourceLocation uh8 = function.apply(object7);
             if (boolean5) {
-                final String string2 = sm8.toString();
-                if (!string2.startsWith(string)) {
+                final String string2 = uh8.toString();
+                if (!matchesSubStr(string, string2)) {
                     continue;
                 }
                 consumer.accept(object7);
             }
             else {
-                if (!sm8.getNamespace().startsWith(string) && (!sm8.getNamespace().equals("minecraft") || !sm8.getPath().startsWith(string))) {
+                if (!matchesSubStr(string, uh8.getNamespace()) && (!uh8.getNamespace().equals("minecraft") || !matchesSubStr(string, uh8.getPath()))) {
                     continue;
                 }
                 consumer.accept(object7);
@@ -78,13 +83,13 @@ public interface SharedSuggestionProvider {
     
     default CompletableFuture<Suggestions> suggestResource(final Iterable<ResourceLocation> iterable, final SuggestionsBuilder suggestionsBuilder, final String string) {
         final String string2 = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
-        SharedSuggestionProvider.<ResourceLocation>filterResources(iterable, string2, string, sm -> sm, sm -> suggestionsBuilder.suggest(string + sm));
+        SharedSuggestionProvider.<ResourceLocation>filterResources(iterable, string2, string, uh -> uh, uh -> suggestionsBuilder.suggest(string + uh));
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
     default CompletableFuture<Suggestions> suggestResource(final Iterable<ResourceLocation> iterable, final SuggestionsBuilder suggestionsBuilder) {
         final String string3 = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
-        SharedSuggestionProvider.<ResourceLocation>filterResources(iterable, string3, sm -> sm, sm -> suggestionsBuilder.suggest(sm.toString()));
+        SharedSuggestionProvider.<ResourceLocation>filterResources(iterable, string3, uh -> uh, uh -> suggestionsBuilder.suggest(uh.toString()));
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
@@ -165,7 +170,7 @@ public interface SharedSuggestionProvider {
     default CompletableFuture<Suggestions> suggest(final Iterable<String> iterable, final SuggestionsBuilder suggestionsBuilder) {
         final String string3 = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
         for (final String string4 : iterable) {
-            if (string4.toLowerCase(Locale.ROOT).startsWith(string3)) {
+            if (matchesSubStr(string3, string4.toLowerCase(Locale.ROOT))) {
                 suggestionsBuilder.suggest(string4);
             }
         }
@@ -174,20 +179,30 @@ public interface SharedSuggestionProvider {
     
     default CompletableFuture<Suggestions> suggest(final Stream<String> stream, final SuggestionsBuilder suggestionsBuilder) {
         final String string3 = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
-        stream.filter(string2 -> string2.toLowerCase(Locale.ROOT).startsWith(string3)).forEach(suggestionsBuilder::suggest);
+        stream.filter(string2 -> matchesSubStr(string3, string2.toLowerCase(Locale.ROOT))).forEach(suggestionsBuilder::suggest);
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
     default CompletableFuture<Suggestions> suggest(final String[] arr, final SuggestionsBuilder suggestionsBuilder) {
         final String string3 = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
         for (final String string4 : arr) {
-            if (string4.toLowerCase(Locale.ROOT).startsWith(string3)) {
+            if (matchesSubStr(string3, string4.toLowerCase(Locale.ROOT))) {
                 suggestionsBuilder.suggest(string4);
             }
         }
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
+    default boolean matchesSubStr(final String string1, final String string2) {
+        for (int integer3 = 0; !string2.startsWith(string1, integer3); ++integer3) {
+            integer3 = string2.indexOf(95, integer3);
+            if (integer3 < 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
     public static class TextCoordinates {
         public static final TextCoordinates DEFAULT_LOCAL;
         public static final TextCoordinates DEFAULT_GLOBAL;
diff --git a/src/net/minecraft/commands/arguments/ColorArgument.java b/src/net/minecraft/commands/arguments/ColorArgument.java
index 2e0004e..b4e01e7 100644
--- a/src/net/minecraft/commands/arguments/ColorArgument.java
+++ b/src/net/minecraft/commands/arguments/ColorArgument.java
@@ -33,11 +33,11 @@ public class ColorArgument implements ArgumentType<ChatFormatting> {
     
     public ChatFormatting parse(final StringReader stringReader) throws CommandSyntaxException {
         final String string3 = stringReader.readUnquotedString();
-        final ChatFormatting g4 = ChatFormatting.getByName(string3);
-        if (g4 == null || g4.isFormat()) {
+        final ChatFormatting i4 = ChatFormatting.getByName(string3);
+        if (i4 == null || i4.isFormat()) {
             throw ColorArgument.ERROR_INVALID_VALUE.create(string3);
         }
-        return g4;
+        return i4;
     }
     
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
diff --git a/src/net/minecraft/commands/arguments/ComponentArgument.java b/src/net/minecraft/commands/arguments/ComponentArgument.java
index 899c79a..52ea198 100644
--- a/src/net/minecraft/commands/arguments/ComponentArgument.java
+++ b/src/net/minecraft/commands/arguments/ComponentArgument.java
@@ -31,11 +31,11 @@ public class ComponentArgument implements ArgumentType<Component> {
     
     public Component parse(final StringReader stringReader) throws CommandSyntaxException {
         try {
-            final Component lf3 = Component.Serializer.fromJson(stringReader);
-            if (lf3 == null) {
+            final Component mr3 = Component.Serializer.fromJson(stringReader);
+            if (mr3 == null) {
                 throw ComponentArgument.ERROR_INVALID_JSON.createWithContext((ImmutableStringReader)stringReader, "empty");
             }
-            return lf3;
+            return mr3;
         }
         catch (JsonParseException jsonParseException3) {
             final String string4 = (jsonParseException3.getCause() != null) ? jsonParseException3.getCause().getMessage() : jsonParseException3.getMessage();
diff --git a/src/net/minecraft/commands/arguments/DimensionArgument.java b/src/net/minecraft/commands/arguments/DimensionArgument.java
new file mode 100644
index 0000000..63dbb6c
--- /dev/null
+++ b/src/net/minecraft/commands/arguments/DimensionArgument.java
@@ -0,0 +1,67 @@
+package net.minecraft.commands.arguments;
+
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.brigadier.Message;
+import net.minecraft.world.level.Level;
+import net.minecraft.core.Registry;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.commands.CommandSourceStack;
+import java.util.function.Function;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.commands.SharedSuggestionProvider;
+import com.mojang.brigadier.suggestion.Suggestions;
+import java.util.concurrent.CompletableFuture;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
+import java.util.Collection;
+import net.minecraft.resources.ResourceLocation;
+import com.mojang.brigadier.arguments.ArgumentType;
+
+public class DimensionArgument implements ArgumentType<ResourceLocation> {
+    private static final Collection<String> EXAMPLES;
+    private static final DynamicCommandExceptionType ERROR_INVALID_VALUE;
+    
+    public ResourceLocation parse(final StringReader stringReader) throws CommandSyntaxException {
+        return ResourceLocation.read(stringReader);
+    }
+    
+    public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
+        if (commandContext.getSource() instanceof SharedSuggestionProvider) {
+            return SharedSuggestionProvider.suggestResource(((SharedSuggestionProvider)commandContext.getSource()).levels().stream().<ResourceLocation>map(ResourceKey::location), suggestionsBuilder);
+        }
+        return (CompletableFuture<Suggestions>)Suggestions.empty();
+    }
+    
+    public Collection<String> getExamples() {
+        return DimensionArgument.EXAMPLES;
+    }
+    
+    public static DimensionArgument dimension() {
+        return new DimensionArgument();
+    }
+    
+    public static ServerLevel getDimension(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
+        final ResourceLocation uh3 = (ResourceLocation)commandContext.getArgument(string, (Class)ResourceLocation.class);
+        final ResourceKey<Level> ug4 = ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, uh3);
+        final ServerLevel zd5 = ((CommandSourceStack)commandContext.getSource()).getServer().getLevel(ug4);
+        if (zd5 == null) {
+            throw DimensionArgument.ERROR_INVALID_VALUE.create(uh3);
+        }
+        return zd5;
+    }
+    
+    static {
+        EXAMPLES = Stream.<ResourceKey>of((ResourceKey[])new ResourceKey[] { Level.OVERWORLD, Level.NETHER }).map(ug -> ug.location().toString()).collect(Collectors.toList());
+        final TranslatableComponent translatableComponent;
+        ERROR_INVALID_VALUE = new DynamicCommandExceptionType(object -> {
+            new TranslatableComponent("argument.dimension.invalid", new Object[] { object });
+            return translatableComponent;
+        });
+    }
+}
diff --git a/src/net/minecraft/commands/arguments/DimensionTypeArgument.java b/src/net/minecraft/commands/arguments/DimensionTypeArgument.java
deleted file mode 100644
index 21bd657..0000000
--- a/src/net/minecraft/commands/arguments/DimensionTypeArgument.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package net.minecraft.commands.arguments;
-
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import net.minecraft.network.chat.TranslatableComponent;
-import com.mojang.brigadier.Message;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.SharedSuggestionProvider;
-import java.util.function.Function;
-import com.google.common.collect.Streams;
-import com.mojang.brigadier.suggestion.Suggestions;
-import java.util.concurrent.CompletableFuture;
-import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import com.mojang.brigadier.StringReader;
-import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
-import java.util.Collection;
-import net.minecraft.world.level.dimension.DimensionType;
-import com.mojang.brigadier.arguments.ArgumentType;
-
-public class DimensionTypeArgument implements ArgumentType<DimensionType> {
-    private static final Collection<String> EXAMPLES;
-    public static final DynamicCommandExceptionType ERROR_INVALID_VALUE;
-    
-    public DimensionType parse(final StringReader stringReader) throws CommandSyntaxException {
-        final ResourceLocation sm3 = ResourceLocation.read(stringReader);
-        return Registry.DIMENSION_TYPE.getOptional(sm3).<Throwable>orElseThrow(() -> DimensionTypeArgument.ERROR_INVALID_VALUE.create(sm3));
-    }
-    
-    public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
-        return SharedSuggestionProvider.suggestResource(Streams.<DimensionType>stream(DimensionType.getAllTypes()).<ResourceLocation>map(DimensionType::getName), suggestionsBuilder);
-    }
-    
-    public Collection<String> getExamples() {
-        return DimensionTypeArgument.EXAMPLES;
-    }
-    
-    public static DimensionTypeArgument dimension() {
-        return new DimensionTypeArgument();
-    }
-    
-    public static DimensionType getDimension(final CommandContext<CommandSourceStack> commandContext, final String string) {
-        return (DimensionType)commandContext.getArgument(string, (Class)DimensionType.class);
-    }
-    
-    static {
-        EXAMPLES = Stream.<DimensionType>of(new DimensionType[] { DimensionType.OVERWORLD, DimensionType.NETHER }).map(cbi -> DimensionType.getName(cbi).toString()).collect(Collectors.toList());
-        final TranslatableComponent translatableComponent;
-        ERROR_INVALID_VALUE = new DynamicCommandExceptionType(object -> {
-            new TranslatableComponent("argument.dimension.invalid", new Object[] { object });
-            return translatableComponent;
-        });
-    }
-}
diff --git a/src/net/minecraft/commands/arguments/EntityAnchorArgument.java b/src/net/minecraft/commands/arguments/EntityAnchorArgument.java
index e44311d..032c689 100644
--- a/src/net/minecraft/commands/arguments/EntityAnchorArgument.java
+++ b/src/net/minecraft/commands/arguments/EntityAnchorArgument.java
@@ -65,8 +65,8 @@ public class EntityAnchorArgument implements ArgumentType<Anchor> {
     }
     
     public enum Anchor {
-        FEET("feet", (cvl, akq) -> cvl), 
-        EYES("eyes", (cvl, akq) -> new Vec3(cvl.x, cvl.y + akq.getEyeHeight(), cvl.z));
+        FEET("feet", (dem, aom) -> dem), 
+        EYES("eyes", (dem, aom) -> new Vec3(dem.x, dem.y + aom.getEyeHeight(), dem.z));
         
         private static final Map<String, Anchor> BY_NAME;
         private final String name;
@@ -82,16 +82,16 @@ public class EntityAnchorArgument implements ArgumentType<Anchor> {
             return Anchor.BY_NAME.get(string);
         }
         
-        public Vec3 apply(final Entity akq) {
-            return this.transform.apply(akq.position(), akq);
+        public Vec3 apply(final Entity aom) {
+            return this.transform.apply(aom.position(), aom);
         }
         
-        public Vec3 apply(final CommandSourceStack cq) {
-            final Entity akq3 = cq.getEntity();
-            if (akq3 == null) {
-                return cq.getPosition();
+        public Vec3 apply(final CommandSourceStack cz) {
+            final Entity aom3 = cz.getEntity();
+            if (aom3 == null) {
+                return cz.getPosition();
             }
-            return this.transform.apply(cq.getPosition(), akq3);
+            return this.transform.apply(cz.getPosition(), aom3);
         }
         
         static {
diff --git a/src/net/minecraft/commands/arguments/EntityArgument.java b/src/net/minecraft/commands/arguments/EntityArgument.java
index a98573a..ef19257 100644
--- a/src/net/minecraft/commands/arguments/EntityArgument.java
+++ b/src/net/minecraft/commands/arguments/EntityArgument.java
@@ -91,9 +91,9 @@ public class EntityArgument implements ArgumentType<EntitySelector> {
     
     public EntitySelector parse(final StringReader stringReader) throws CommandSyntaxException {
         final int integer3 = 0;
-        final EntitySelectorParser eq4 = new EntitySelectorParser(stringReader);
-        final EntitySelector ep5 = eq4.parse();
-        if (ep5.getMaxResults() > 1 && this.single) {
+        final EntitySelectorParser fa4 = new EntitySelectorParser(stringReader);
+        final EntitySelector ez5 = fa4.parse();
+        if (ez5.getMaxResults() > 1 && this.single) {
             if (this.playersOnly) {
                 stringReader.setCursor(0);
                 throw EntityArgument.ERROR_NOT_SINGLE_PLAYER.createWithContext((ImmutableStringReader)stringReader);
@@ -102,11 +102,11 @@ public class EntityArgument implements ArgumentType<EntitySelector> {
             throw EntityArgument.ERROR_NOT_SINGLE_ENTITY.createWithContext((ImmutableStringReader)stringReader);
         }
         else {
-            if (ep5.includesEntities() && this.playersOnly && !ep5.isSelfSelector()) {
+            if (ez5.includesEntities() && this.playersOnly && !ez5.isSelfSelector()) {
                 stringReader.setCursor(0);
                 throw EntityArgument.ERROR_ONLY_PLAYERS_ALLOWED.createWithContext((ImmutableStringReader)stringReader);
             }
-            return ep5;
+            return ez5;
         }
     }
     
@@ -114,16 +114,16 @@ public class EntityArgument implements ArgumentType<EntitySelector> {
         if (commandContext.getSource() instanceof SharedSuggestionProvider) {
             final StringReader stringReader4 = new StringReader(suggestionsBuilder.getInput());
             stringReader4.setCursor(suggestionsBuilder.getStart());
-            final SharedSuggestionProvider cs5 = (SharedSuggestionProvider)commandContext.getSource();
-            final EntitySelectorParser eq6 = new EntitySelectorParser(stringReader4, cs5.hasPermission(2));
+            final SharedSuggestionProvider db5 = (SharedSuggestionProvider)commandContext.getSource();
+            final EntitySelectorParser fa6 = new EntitySelectorParser(stringReader4, db5.hasPermission(2));
             try {
-                eq6.parse();
+                fa6.parse();
             }
             catch (CommandSyntaxException ex) {}
             final SharedSuggestionProvider sharedSuggestionProvider;
             final Collection<String> collection4;
             final Iterable<String> iterable5;
-            return eq6.fillSuggestions(suggestionsBuilder, suggestionsBuilder -> {
+            return fa6.fillSuggestions(suggestionsBuilder, suggestionsBuilder -> {
                 collection4 = sharedSuggestionProvider.getOnlinePlayerNames();
                 iterable5 = (Iterable<String>)(this.playersOnly ? collection4 : Iterables.concat(collection4, sharedSuggestionProvider.getSelectedEntities()));
                 SharedSuggestionProvider.suggest(iterable5, suggestionsBuilder);
@@ -139,37 +139,37 @@ public class EntityArgument implements ArgumentType<EntitySelector> {
     
     static {
         EXAMPLES = Arrays.<String>asList("Player", "0123", "@e", "@e[type=foo]", "dd12be42-52a9-4a91-a8a1-11c01849e498");
-        ERROR_NOT_SINGLE_ENTITY = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.toomany", new Object[0]));
-        ERROR_NOT_SINGLE_PLAYER = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.player.toomany", new Object[0]));
-        ERROR_ONLY_PLAYERS_ALLOWED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.player.entities", new Object[0]));
-        NO_ENTITIES_FOUND = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.notfound.entity", new Object[0]));
-        NO_PLAYERS_FOUND = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.notfound.player", new Object[0]));
-        ERROR_SELECTORS_NOT_ALLOWED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.selector.not_allowed", new Object[0]));
+        ERROR_NOT_SINGLE_ENTITY = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.toomany"));
+        ERROR_NOT_SINGLE_PLAYER = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.player.toomany"));
+        ERROR_ONLY_PLAYERS_ALLOWED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.player.entities"));
+        NO_ENTITIES_FOUND = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.notfound.entity"));
+        NO_PLAYERS_FOUND = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.notfound.player"));
+        ERROR_SELECTORS_NOT_ALLOWED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.selector.not_allowed"));
     }
     
     public static class Serializer implements ArgumentSerializer<EntityArgument> {
         @Override
-        public void serializeToNetwork(final EntityArgument cy, final FriendlyByteBuf kv) {
+        public void serializeToNetwork(final EntityArgument dh, final FriendlyByteBuf mg) {
             byte byte4 = 0;
-            if (cy.single) {
+            if (dh.single) {
                 byte4 |= 0x1;
             }
-            if (cy.playersOnly) {
+            if (dh.playersOnly) {
                 byte4 |= 0x2;
             }
-            kv.writeByte(byte4);
+            mg.writeByte(byte4);
         }
         
         @Override
-        public EntityArgument deserializeFromNetwork(final FriendlyByteBuf kv) {
-            final byte byte3 = kv.readByte();
+        public EntityArgument deserializeFromNetwork(final FriendlyByteBuf mg) {
+            final byte byte3 = mg.readByte();
             return new EntityArgument((byte3 & 0x1) != 0x0, (byte3 & 0x2) != 0x0);
         }
         
         @Override
-        public void serializeToJson(final EntityArgument cy, final JsonObject jsonObject) {
-            jsonObject.addProperty("amount", cy.single ? "single" : "multiple");
-            jsonObject.addProperty("type", cy.playersOnly ? "players" : "entities");
+        public void serializeToJson(final EntityArgument dh, final JsonObject jsonObject) {
+            jsonObject.addProperty("amount", dh.single ? "single" : "multiple");
+            jsonObject.addProperty("type", dh.playersOnly ? "players" : "entities");
         }
     }
 }
diff --git a/src/net/minecraft/commands/arguments/EntitySummonArgument.java b/src/net/minecraft/commands/arguments/EntitySummonArgument.java
index c1df23a..3ca0ab2 100644
--- a/src/net/minecraft/commands/arguments/EntitySummonArgument.java
+++ b/src/net/minecraft/commands/arguments/EntitySummonArgument.java
@@ -26,9 +26,9 @@ public class EntitySummonArgument implements ArgumentType<ResourceLocation> {
         return verifyCanSummon((ResourceLocation)commandContext.getArgument(string, (Class)ResourceLocation.class));
     }
     
-    private static ResourceLocation verifyCanSummon(final ResourceLocation sm) throws CommandSyntaxException {
-        Registry.ENTITY_TYPE.getOptional(sm).filter(EntityType::canSummon).<Throwable>orElseThrow(() -> EntitySummonArgument.ERROR_UNKNOWN_ENTITY.create(sm));
-        return sm;
+    private static ResourceLocation verifyCanSummon(final ResourceLocation uh) throws CommandSyntaxException {
+        Registry.ENTITY_TYPE.getOptional(uh).filter(EntityType::canSummon).<Throwable>orElseThrow(() -> EntitySummonArgument.ERROR_UNKNOWN_ENTITY.create(uh));
+        return uh;
     }
     
     public ResourceLocation parse(final StringReader stringReader) throws CommandSyntaxException {
diff --git a/src/net/minecraft/commands/arguments/GameProfileArgument.java b/src/net/minecraft/commands/arguments/GameProfileArgument.java
index 52ac97c..57fa6fa 100644
--- a/src/net/minecraft/commands/arguments/GameProfileArgument.java
+++ b/src/net/minecraft/commands/arguments/GameProfileArgument.java
@@ -43,8 +43,8 @@ public class GameProfileArgument implements ArgumentType<Result> {
             }
             final String string4 = stringReader.getString().substring(integer3, stringReader.getCursor());
             final GameProfile gameProfile3;
-            return cq -> {
-                gameProfile3 = cq.getServer().getProfileCache().get(string4);
+            return cz -> {
+                gameProfile3 = cz.getServer().getProfileCache().get(string4);
                 if (gameProfile3 == null) {
                     throw GameProfileArgument.ERROR_UNKNOWN_PLAYER.create();
                 }
@@ -53,24 +53,24 @@ public class GameProfileArgument implements ArgumentType<Result> {
                 }
             };
         }
-        final EntitySelectorParser eq3 = new EntitySelectorParser(stringReader);
-        final EntitySelector ep4 = eq3.parse();
-        if (ep4.includesEntities()) {
+        final EntitySelectorParser fa3 = new EntitySelectorParser(stringReader);
+        final EntitySelector ez4 = fa3.parse();
+        if (ez4.includesEntities()) {
             throw EntityArgument.ERROR_ONLY_PLAYERS_ALLOWED.create();
         }
-        return new SelectorResult(ep4);
+        return new SelectorResult(ez4);
     }
     
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
         if (commandContext.getSource() instanceof SharedSuggestionProvider) {
             final StringReader stringReader4 = new StringReader(suggestionsBuilder.getInput());
             stringReader4.setCursor(suggestionsBuilder.getStart());
-            final EntitySelectorParser eq5 = new EntitySelectorParser(stringReader4);
+            final EntitySelectorParser fa5 = new EntitySelectorParser(stringReader4);
             try {
-                eq5.parse();
+                fa5.parse();
             }
             catch (CommandSyntaxException ex) {}
-            return eq5.fillSuggestions(suggestionsBuilder, suggestionsBuilder -> SharedSuggestionProvider.suggest(((SharedSuggestionProvider)commandContext.getSource()).getOnlinePlayerNames(), suggestionsBuilder));
+            return fa5.fillSuggestions(suggestionsBuilder, suggestionsBuilder -> SharedSuggestionProvider.suggest(((SharedSuggestionProvider)commandContext.getSource()).getOnlinePlayerNames(), suggestionsBuilder));
         }
         return (CompletableFuture<Suggestions>)Suggestions.empty();
     }
@@ -81,25 +81,25 @@ public class GameProfileArgument implements ArgumentType<Result> {
     
     static {
         EXAMPLES = Arrays.<String>asList("Player", "0123", "dd12be42-52a9-4a91-a8a1-11c01849e498", "@e");
-        ERROR_UNKNOWN_PLAYER = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.player.unknown", new Object[0]));
+        ERROR_UNKNOWN_PLAYER = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.player.unknown"));
     }
     
     public static class SelectorResult implements Result {
         private final EntitySelector selector;
         
-        public SelectorResult(final EntitySelector ep) {
-            this.selector = ep;
+        public SelectorResult(final EntitySelector ez) {
+            this.selector = ez;
         }
         
         @Override
-        public Collection<GameProfile> getNames(final CommandSourceStack cq) throws CommandSyntaxException {
-            final List<ServerPlayer> list3 = this.selector.findPlayers(cq);
+        public Collection<GameProfile> getNames(final CommandSourceStack cz) throws CommandSyntaxException {
+            final List<ServerPlayer> list3 = this.selector.findPlayers(cz);
             if (list3.isEmpty()) {
                 throw EntityArgument.NO_PLAYERS_FOUND.create();
             }
             final List<GameProfile> list4 = Lists.newArrayList();
-            for (final ServerPlayer xe6 : list3) {
-                list4.add(xe6.getGameProfile());
+            for (final ServerPlayer ze6 : list3) {
+                list4.add(ze6.getGameProfile());
             }
             return list4;
         }
@@ -107,6 +107,6 @@ public class GameProfileArgument implements ArgumentType<Result> {
     
     @FunctionalInterface
     public interface Result {
-        Collection<GameProfile> getNames(final CommandSourceStack cq) throws CommandSyntaxException;
+        Collection<GameProfile> getNames(final CommandSourceStack cz) throws CommandSyntaxException;
     }
 }
diff --git a/src/net/minecraft/commands/arguments/ItemEnchantmentArgument.java b/src/net/minecraft/commands/arguments/ItemEnchantmentArgument.java
index e0936a3..d6d9ca2 100644
--- a/src/net/minecraft/commands/arguments/ItemEnchantmentArgument.java
+++ b/src/net/minecraft/commands/arguments/ItemEnchantmentArgument.java
@@ -31,8 +31,8 @@ public class ItemEnchantmentArgument implements ArgumentType<Enchantment> {
     }
     
     public Enchantment parse(final StringReader stringReader) throws CommandSyntaxException {
-        final ResourceLocation sm3 = ResourceLocation.read(stringReader);
-        return Registry.ENCHANTMENT.getOptional(sm3).<Throwable>orElseThrow(() -> ItemEnchantmentArgument.ERROR_UNKNOWN_ENCHANTMENT.create(sm3));
+        final ResourceLocation uh3 = ResourceLocation.read(stringReader);
+        return Registry.ENCHANTMENT.getOptional(uh3).<Throwable>orElseThrow(() -> ItemEnchantmentArgument.ERROR_UNKNOWN_ENCHANTMENT.create(uh3));
     }
     
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
diff --git a/src/net/minecraft/commands/arguments/MessageArgument.java b/src/net/minecraft/commands/arguments/MessageArgument.java
index 8af4f28..46eabb8 100644
--- a/src/net/minecraft/commands/arguments/MessageArgument.java
+++ b/src/net/minecraft/commands/arguments/MessageArgument.java
@@ -5,6 +5,7 @@ import net.minecraft.commands.arguments.selector.EntitySelector;
 import java.util.List;
 import net.minecraft.commands.arguments.selector.EntitySelectorParser;
 import com.google.common.collect.Lists;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
 import java.util.Arrays;
 import com.mojang.brigadier.StringReader;
@@ -47,26 +48,26 @@ public class MessageArgument implements ArgumentType<Message> {
             this.parts = arr;
         }
         
-        public Component toComponent(final CommandSourceStack cq, final boolean boolean2) throws CommandSyntaxException {
+        public Component toComponent(final CommandSourceStack cz, final boolean boolean2) throws CommandSyntaxException {
             if (this.parts.length == 0 || !boolean2) {
                 return new TextComponent(this.text);
             }
-            final Component lf4 = new TextComponent(this.text.substring(0, this.parts[0].getStart()));
+            final MutableComponent mx4 = new TextComponent(this.text.substring(0, this.parts[0].getStart()));
             int integer5 = this.parts[0].getStart();
             for (final Part b9 : this.parts) {
-                final Component lf5 = b9.toComponent(cq);
+                final Component mr10 = b9.toComponent(cz);
                 if (integer5 < b9.getStart()) {
-                    lf4.append(this.text.substring(integer5, b9.getStart()));
+                    mx4.append(this.text.substring(integer5, b9.getStart()));
                 }
-                if (lf5 != null) {
-                    lf4.append(lf5);
+                if (mr10 != null) {
+                    mx4.append(mr10);
                 }
                 integer5 = b9.getEnd();
             }
             if (integer5 < this.text.length()) {
-                lf4.append(this.text.substring(integer5, this.text.length()));
+                mx4.append(this.text.substring(integer5, this.text.length()));
             }
-            return lf4;
+            return mx4;
         }
         
         public static Message parseText(final StringReader stringReader, final boolean boolean2) throws CommandSyntaxException {
@@ -80,10 +81,10 @@ public class MessageArgument implements ArgumentType<Message> {
             while (stringReader.canRead()) {
                 if (stringReader.peek() == '@') {
                     final int integer6 = stringReader.getCursor();
-                    EntitySelector ep7;
+                    EntitySelector ez7;
                     try {
-                        final EntitySelectorParser eq8 = new EntitySelectorParser(stringReader);
-                        ep7 = eq8.parse();
+                        final EntitySelectorParser fa8 = new EntitySelectorParser(stringReader);
+                        ez7 = fa8.parse();
                     }
                     catch (CommandSyntaxException commandSyntaxException8) {
                         if (commandSyntaxException8.getType() == EntitySelectorParser.ERROR_MISSING_SELECTOR_TYPE || commandSyntaxException8.getType() == EntitySelectorParser.ERROR_UNKNOWN_SELECTOR_TYPE) {
@@ -92,7 +93,7 @@ public class MessageArgument implements ArgumentType<Message> {
                         }
                         throw commandSyntaxException8;
                     }
-                    list4.add(new Part(integer6 - integer5, stringReader.getCursor() - integer5, ep7));
+                    list4.add(new Part(integer6 - integer5, stringReader.getCursor() - integer5, ez7));
                 }
                 else {
                     stringReader.skip();
@@ -107,10 +108,10 @@ public class MessageArgument implements ArgumentType<Message> {
         private final int end;
         private final EntitySelector selector;
         
-        public Part(final int integer1, final int integer2, final EntitySelector ep) {
+        public Part(final int integer1, final int integer2, final EntitySelector ez) {
             this.start = integer1;
             this.end = integer2;
-            this.selector = ep;
+            this.selector = ez;
         }
         
         public int getStart() {
@@ -122,8 +123,8 @@ public class MessageArgument implements ArgumentType<Message> {
         }
         
         @Nullable
-        public Component toComponent(final CommandSourceStack cq) throws CommandSyntaxException {
-            return EntitySelector.joinNames(this.selector.findEntities(cq));
+        public Component toComponent(final CommandSourceStack cz) throws CommandSyntaxException {
+            return EntitySelector.joinNames(this.selector.findEntities(cz));
         }
     }
 }
diff --git a/src/net/minecraft/commands/arguments/MobEffectArgument.java b/src/net/minecraft/commands/arguments/MobEffectArgument.java
index f4776b5..9721a62 100644
--- a/src/net/minecraft/commands/arguments/MobEffectArgument.java
+++ b/src/net/minecraft/commands/arguments/MobEffectArgument.java
@@ -31,8 +31,8 @@ public class MobEffectArgument implements ArgumentType<MobEffect> {
     }
     
     public MobEffect parse(final StringReader stringReader) throws CommandSyntaxException {
-        final ResourceLocation sm3 = ResourceLocation.read(stringReader);
-        return Registry.MOB_EFFECT.getOptional(sm3).<Throwable>orElseThrow(() -> MobEffectArgument.ERROR_UNKNOWN_EFFECT.create(sm3));
+        final ResourceLocation uh3 = ResourceLocation.read(stringReader);
+        return Registry.MOB_EFFECT.getOptional(uh3).<Throwable>orElseThrow(() -> MobEffectArgument.ERROR_UNKNOWN_EFFECT.create(uh3));
     }
     
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
diff --git a/src/net/minecraft/commands/arguments/NbtPathArgument.java b/src/net/minecraft/commands/arguments/NbtPathArgument.java
index 0396331..aede7d4 100644
--- a/src/net/minecraft/commands/arguments/NbtPathArgument.java
+++ b/src/net/minecraft/commands/arguments/NbtPathArgument.java
@@ -72,16 +72,16 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
                 if (!boolean2) {
                     throw NbtPathArgument.ERROR_INVALID_NODE.createWithContext((ImmutableStringReader)stringReader);
                 }
-                final CompoundTag jt3 = new TagParser(stringReader).readStruct();
-                return new MatchRootObjectNode(jt3);
+                final CompoundTag le3 = new TagParser(stringReader).readStruct();
+                return new MatchRootObjectNode(le3);
             }
             case '[': {
                 stringReader.skip();
                 final int integer3 = stringReader.peek();
                 if (integer3 == 123) {
-                    final CompoundTag jt4 = new TagParser(stringReader).readStruct();
+                    final CompoundTag le4 = new TagParser(stringReader).readStruct();
                     stringReader.expect(']');
-                    return new MatchElementNode(jt4);
+                    return new MatchElementNode(le4);
                 }
                 if (integer3 == 93) {
                     stringReader.skip();
@@ -104,8 +104,8 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
     
     private static Node readObjectNode(final StringReader stringReader, final String string) throws CommandSyntaxException {
         if (stringReader.canRead() && stringReader.peek() == '{') {
-            final CompoundTag jt3 = new TagParser(stringReader).readStruct();
-            return new MatchObjectNode(string, jt3);
+            final CompoundTag le3 = new TagParser(stringReader).readStruct();
+            return new MatchObjectNode(string, le3);
         }
         return new CompoundChildNode(string);
     }
@@ -129,13 +129,13 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         return character != ' ' && character != '\"' && character != '[' && character != ']' && character != '.' && character != '{' && character != '}';
     }
     
-    private static Predicate<Tag> createTagPredicate(final CompoundTag jt) {
-        return kj -> NbtUtils.compareNbt(jt, kj, true);
+    private static Predicate<Tag> createTagPredicate(final CompoundTag le) {
+        return lu -> NbtUtils.compareNbt(le, lu, true);
     }
     
     static {
         EXAMPLES = Arrays.<String>asList("foo", "foo.bar", "foo[0]", "[0]", "[]", "{foo=bar}");
-        ERROR_INVALID_NODE = new SimpleCommandExceptionType((Message)new TranslatableComponent("arguments.nbtpath.node.invalid", new Object[0]));
+        ERROR_INVALID_NODE = new SimpleCommandExceptionType((Message)new TranslatableComponent("arguments.nbtpath.node.invalid"));
         final TranslatableComponent translatableComponent;
         ERROR_NOTHING_FOUND = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("arguments.nbtpath.nothing_found", new Object[] { object });
@@ -154,8 +154,8 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
             this.nodeToOriginalPosition = object2IntMap;
         }
         
-        public List<Tag> get(final Tag kj) throws CommandSyntaxException {
-            List<Tag> list3 = Collections.<Tag>singletonList(kj);
+        public List<Tag> get(final Tag lu) throws CommandSyntaxException {
+            List<Tag> list3 = Collections.<Tag>singletonList(lu);
             for (final Node i7 : this.nodes) {
                 list3 = i7.get(list3);
                 if (list3.isEmpty()) {
@@ -165,8 +165,8 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
             return list3;
         }
         
-        public int countMatching(final Tag kj) {
-            List<Tag> list3 = Collections.<Tag>singletonList(kj);
+        public int countMatching(final Tag lu) {
+            List<Tag> list3 = Collections.<Tag>singletonList(lu);
             for (final Node i7 : this.nodes) {
                 list3 = i7.get(list3);
                 if (list3.isEmpty()) {
@@ -176,8 +176,8 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
             return list3.size();
         }
         
-        private List<Tag> getOrCreateParents(final Tag kj) throws CommandSyntaxException {
-            List<Tag> list3 = Collections.<Tag>singletonList(kj);
+        private List<Tag> getOrCreateParents(final Tag lu) throws CommandSyntaxException {
+            List<Tag> list3 = Collections.<Tag>singletonList(lu);
             for (int integer4 = 0; integer4 < this.nodes.length - 1; ++integer4) {
                 final Node i5 = this.nodes[integer4];
                 final int integer5 = integer4 + 1;
@@ -189,8 +189,8 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
             return list3;
         }
         
-        public List<Tag> getOrCreate(final Tag kj, final Supplier<Tag> supplier) throws CommandSyntaxException {
-            final List<Tag> list4 = this.getOrCreateParents(kj);
+        public List<Tag> getOrCreate(final Tag lu, final Supplier<Tag> supplier) throws CommandSyntaxException {
+            final List<Tag> list4 = this.getOrCreateParents(lu);
             final Node i5 = this.nodes[this.nodes.length - 1];
             return i5.getOrCreate(list4, supplier);
         }
@@ -199,14 +199,14 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
             return list.stream().<Integer>map(function).reduce(Integer.valueOf(0), (integer1, integer2) -> integer1 + integer2);
         }
         
-        public int set(final Tag kj, final Supplier<Tag> supplier) throws CommandSyntaxException {
-            final List<Tag> list4 = this.getOrCreateParents(kj);
+        public int set(final Tag lu, final Supplier<Tag> supplier) throws CommandSyntaxException {
+            final List<Tag> list4 = this.getOrCreateParents(lu);
             final Node i5 = this.nodes[this.nodes.length - 1];
-            return apply(list4, kj -> i5.setTag(kj, supplier));
+            return apply(list4, lu -> i5.setTag(lu, supplier));
         }
         
-        public int remove(final Tag kj) {
-            List<Tag> list3 = Collections.<Tag>singletonList(kj);
+        public int remove(final Tag lu) {
+            List<Tag> list3 = Collections.<Tag>singletonList(lu);
             for (int integer4 = 0; integer4 < this.nodes.length - 1; ++integer4) {
                 list3 = this.nodes[integer4].get(list3);
             }
@@ -226,28 +226,28 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
     }
     
     interface Node {
-        void getTag(final Tag kj, final List<Tag> list);
+        void getTag(final Tag lu, final List<Tag> list);
         
-        void getOrCreateTag(final Tag kj, final Supplier<Tag> supplier, final List<Tag> list);
+        void getOrCreateTag(final Tag lu, final Supplier<Tag> supplier, final List<Tag> list);
         
         Tag createPreferredParentTag();
         
-        int setTag(final Tag kj, final Supplier<Tag> supplier);
+        int setTag(final Tag lu, final Supplier<Tag> supplier);
         
-        int removeTag(final Tag kj);
+        int removeTag(final Tag lu);
         
         default List<Tag> get(final List<Tag> list) {
             return this.collect(list, this::getTag);
         }
         
         default List<Tag> getOrCreate(final List<Tag> list, final Supplier<Tag> supplier) {
-            return this.collect(list, (kj, list) -> this.getOrCreateTag(kj, supplier, list));
+            return this.collect(list, (lu, list) -> this.getOrCreateTag(lu, supplier, list));
         }
         
         default List<Tag> collect(final List<Tag> list, final BiConsumer<Tag, List<Tag>> biConsumer) {
             final List<Tag> list2 = Lists.newArrayList();
-            for (final Tag kj6 : list) {
-                biConsumer.accept(kj6, list2);
+            for (final Tag lu6 : list) {
+                biConsumer.accept(lu6, list2);
             }
             return list2;
         }
@@ -261,28 +261,28 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public void getTag(final Tag kj, final List<Tag> list) {
-            if (kj instanceof CompoundTag) {
-                final Tag kj2 = ((CompoundTag)kj).get(this.name);
-                if (kj2 != null) {
-                    list.add(kj2);
+        public void getTag(final Tag lu, final List<Tag> list) {
+            if (lu instanceof CompoundTag) {
+                final Tag lu2 = ((CompoundTag)lu).get(this.name);
+                if (lu2 != null) {
+                    list.add(lu2);
                 }
             }
         }
         
         @Override
-        public void getOrCreateTag(final Tag kj, final Supplier<Tag> supplier, final List<Tag> list) {
-            if (kj instanceof CompoundTag) {
-                final CompoundTag jt5 = (CompoundTag)kj;
-                Tag kj2;
-                if (jt5.contains(this.name)) {
-                    kj2 = jt5.get(this.name);
+        public void getOrCreateTag(final Tag lu, final Supplier<Tag> supplier, final List<Tag> list) {
+            if (lu instanceof CompoundTag) {
+                final CompoundTag le5 = (CompoundTag)lu;
+                Tag lu2;
+                if (le5.contains(this.name)) {
+                    lu2 = le5.get(this.name);
                 }
                 else {
-                    kj2 = supplier.get();
-                    jt5.put(this.name, kj2);
+                    lu2 = supplier.get();
+                    le5.put(this.name, lu2);
                 }
-                list.add(kj2);
+                list.add(lu2);
             }
         }
         
@@ -292,12 +292,12 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public int setTag(final Tag kj, final Supplier<Tag> supplier) {
-            if (kj instanceof CompoundTag) {
-                final CompoundTag jt4 = (CompoundTag)kj;
-                final Tag kj2 = supplier.get();
-                final Tag kj3 = jt4.put(this.name, kj2);
-                if (!kj2.equals(kj3)) {
+        public int setTag(final Tag lu, final Supplier<Tag> supplier) {
+            if (lu instanceof CompoundTag) {
+                final CompoundTag le4 = (CompoundTag)lu;
+                final Tag lu2 = supplier.get();
+                final Tag lu3 = le4.put(this.name, lu2);
+                if (!lu2.equals(lu3)) {
                     return 1;
                 }
             }
@@ -305,11 +305,11 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public int removeTag(final Tag kj) {
-            if (kj instanceof CompoundTag) {
-                final CompoundTag jt3 = (CompoundTag)kj;
-                if (jt3.contains(this.name)) {
-                    jt3.remove(this.name);
+        public int removeTag(final Tag lu) {
+            if (lu instanceof CompoundTag) {
+                final CompoundTag le3 = (CompoundTag)lu;
+                if (le3.contains(this.name)) {
+                    le3.remove(this.name);
                     return 1;
                 }
             }
@@ -325,20 +325,20 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public void getTag(final Tag kj, final List<Tag> list) {
-            if (kj instanceof CollectionTag) {
-                final CollectionTag<?> js4 = kj;
-                final int integer5 = js4.size();
+        public void getTag(final Tag lu, final List<Tag> list) {
+            if (lu instanceof CollectionTag) {
+                final CollectionTag<?> ld4 = lu;
+                final int integer5 = ld4.size();
                 final int integer6 = (this.index < 0) ? (integer5 + this.index) : this.index;
                 if (0 <= integer6 && integer6 < integer5) {
-                    list.add(js4.get(integer6));
+                    list.add(ld4.get(integer6));
                 }
             }
         }
         
         @Override
-        public void getOrCreateTag(final Tag kj, final Supplier<Tag> supplier, final List<Tag> list) {
-            this.getTag(kj, list);
+        public void getOrCreateTag(final Tag lu, final Supplier<Tag> supplier, final List<Tag> list) {
+            this.getTag(lu, list);
         }
         
         @Override
@@ -347,15 +347,15 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public int setTag(final Tag kj, final Supplier<Tag> supplier) {
-            if (kj instanceof CollectionTag) {
-                final CollectionTag<?> js4 = kj;
-                final int integer5 = js4.size();
+        public int setTag(final Tag lu, final Supplier<Tag> supplier) {
+            if (lu instanceof CollectionTag) {
+                final CollectionTag<?> ld4 = lu;
+                final int integer5 = ld4.size();
                 final int integer6 = (this.index < 0) ? (integer5 + this.index) : this.index;
                 if (0 <= integer6 && integer6 < integer5) {
-                    final Tag kj2 = js4.get(integer6);
-                    final Tag kj3 = supplier.get();
-                    if (!kj3.equals(kj2) && js4.setTag(integer6, kj3)) {
+                    final Tag lu2 = ld4.get(integer6);
+                    final Tag lu3 = supplier.get();
+                    if (!lu3.equals(lu2) && ld4.setTag(integer6, lu3)) {
                         return 1;
                     }
                 }
@@ -364,13 +364,13 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public int removeTag(final Tag kj) {
-            if (kj instanceof CollectionTag) {
-                final CollectionTag<?> js3 = kj;
-                final int integer4 = js3.size();
+        public int removeTag(final Tag lu) {
+            if (lu instanceof CollectionTag) {
+                final CollectionTag<?> ld3 = lu;
+                final int integer4 = ld3.size();
                 final int integer5 = (this.index < 0) ? (integer4 + this.index) : this.index;
                 if (0 <= integer5 && integer5 < integer4) {
-                    js3.remove(integer5);
+                    ld3.remove(integer5);
                     return 1;
                 }
             }
@@ -382,34 +382,34 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         private final CompoundTag pattern;
         private final Predicate<Tag> predicate;
         
-        public MatchElementNode(final CompoundTag jt) {
-            this.pattern = jt;
-            this.predicate = createTagPredicate(jt);
+        public MatchElementNode(final CompoundTag le) {
+            this.pattern = le;
+            this.predicate = createTagPredicate(le);
         }
         
         @Override
-        public void getTag(final Tag kj, final List<Tag> list) {
-            if (kj instanceof ListTag) {
-                final ListTag jz4 = (ListTag)kj;
-                jz4.stream().filter(this.predicate).forEach(list::add);
+        public void getTag(final Tag lu, final List<Tag> list) {
+            if (lu instanceof ListTag) {
+                final ListTag lk4 = (ListTag)lu;
+                lk4.stream().filter(this.predicate).forEach(list::add);
             }
         }
         
         @Override
-        public void getOrCreateTag(final Tag kj, final Supplier<Tag> supplier, final List<Tag> list) {
+        public void getOrCreateTag(final Tag lu, final Supplier<Tag> supplier, final List<Tag> list) {
             final MutableBoolean mutableBoolean5 = new MutableBoolean();
-            if (kj instanceof ListTag) {
-                final ListTag jz6 = (ListTag)kj;
+            if (lu instanceof ListTag) {
+                final ListTag lk6 = (ListTag)lu;
                 final MutableBoolean mutableBoolean6;
-                jz6.stream().filter(this.predicate).forEach(kj -> {
-                    list.add(kj);
+                lk6.stream().filter(this.predicate).forEach(lu -> {
+                    list.add(lu);
                     mutableBoolean6.setTrue();
                     return;
                 });
                 if (mutableBoolean5.isFalse()) {
-                    final CompoundTag jt7 = this.pattern.copy();
-                    ((AbstractList<CompoundTag>)jz6).add(jt7);
-                    list.add(jt7);
+                    final CompoundTag le7 = this.pattern.copy();
+                    ((AbstractList<CompoundTag>)lk6).add(le7);
+                    list.add(le7);
                 }
             }
         }
@@ -420,21 +420,21 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public int setTag(final Tag kj, final Supplier<Tag> supplier) {
+        public int setTag(final Tag lu, final Supplier<Tag> supplier) {
             int integer4 = 0;
-            if (kj instanceof ListTag) {
-                final ListTag jz5 = (ListTag)kj;
-                final int integer5 = jz5.size();
+            if (lu instanceof ListTag) {
+                final ListTag lk5 = (ListTag)lu;
+                final int integer5 = lk5.size();
                 if (integer5 == 0) {
-                    jz5.add(supplier.get());
+                    lk5.add(supplier.get());
                     ++integer4;
                 }
                 else {
                     for (int integer6 = 0; integer6 < integer5; ++integer6) {
-                        final Tag kj2 = jz5.get(integer6);
-                        if (this.predicate.test(kj2)) {
-                            final Tag kj3 = supplier.get();
-                            if (!kj3.equals(kj2) && jz5.setTag(integer6, kj3)) {
+                        final Tag lu2 = lk5.get(integer6);
+                        if (this.predicate.test(lu2)) {
+                            final Tag lu3 = supplier.get();
+                            if (!lu3.equals(lu2) && lk5.setTag(integer6, lu3)) {
                                 ++integer4;
                             }
                         }
@@ -445,13 +445,13 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public int removeTag(final Tag kj) {
+        public int removeTag(final Tag lu) {
             int integer3 = 0;
-            if (kj instanceof ListTag) {
-                final ListTag jz4 = (ListTag)kj;
-                for (int integer4 = jz4.size() - 1; integer4 >= 0; --integer4) {
-                    if (this.predicate.test(jz4.get(integer4))) {
-                        jz4.remove(integer4);
+            if (lu instanceof ListTag) {
+                final ListTag lk4 = (ListTag)lu;
+                for (int integer4 = lk4.size() - 1; integer4 >= 0; --integer4) {
+                    if (this.predicate.test(lk4.get(integer4))) {
+                        lk4.remove(integer4);
                         ++integer3;
                     }
                 }
@@ -467,24 +467,24 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public void getTag(final Tag kj, final List<Tag> list) {
-            if (kj instanceof CollectionTag) {
-                list.addAll(kj);
+        public void getTag(final Tag lu, final List<Tag> list) {
+            if (lu instanceof CollectionTag) {
+                list.addAll(lu);
             }
         }
         
         @Override
-        public void getOrCreateTag(final Tag kj, final Supplier<Tag> supplier, final List<Tag> list) {
-            if (kj instanceof CollectionTag) {
-                final CollectionTag<?> js5 = kj;
-                if (js5.isEmpty()) {
-                    final Tag kj2 = supplier.get();
-                    if (js5.addTag(0, kj2)) {
-                        list.add(kj2);
+        public void getOrCreateTag(final Tag lu, final Supplier<Tag> supplier, final List<Tag> list) {
+            if (lu instanceof CollectionTag) {
+                final CollectionTag<?> ld5 = lu;
+                if (ld5.isEmpty()) {
+                    final Tag lu2 = supplier.get();
+                    if (ld5.addTag(0, lu2)) {
+                        list.add(lu2);
                     }
                 }
                 else {
-                    list.addAll(js5);
+                    list.addAll(ld5);
                 }
             }
         }
@@ -495,38 +495,38 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public int setTag(final Tag kj, final Supplier<Tag> supplier) {
-            if (!(kj instanceof CollectionTag)) {
+        public int setTag(final Tag lu, final Supplier<Tag> supplier) {
+            if (!(lu instanceof CollectionTag)) {
                 return 0;
             }
-            final CollectionTag<?> js4 = kj;
-            final int integer5 = js4.size();
+            final CollectionTag<?> ld4 = lu;
+            final int integer5 = ld4.size();
             if (integer5 == 0) {
-                js4.addTag(0, supplier.get());
+                ld4.addTag(0, supplier.get());
                 return 1;
             }
-            final Tag kj2 = supplier.get();
-            final int integer6 = integer5 - (int)js4.stream().filter(kj2::equals).count();
+            final Tag lu2 = supplier.get();
+            final int integer6 = integer5 - (int)ld4.stream().filter(lu2::equals).count();
             if (integer6 == 0) {
                 return 0;
             }
-            js4.clear();
-            if (!js4.addTag(0, kj2)) {
+            ld4.clear();
+            if (!ld4.addTag(0, lu2)) {
                 return 0;
             }
             for (int integer7 = 1; integer7 < integer5; ++integer7) {
-                js4.addTag(integer7, supplier.get());
+                ld4.addTag(integer7, supplier.get());
             }
             return integer6;
         }
         
         @Override
-        public int removeTag(final Tag kj) {
-            if (kj instanceof CollectionTag) {
-                final CollectionTag<?> js3 = kj;
-                final int integer4 = js3.size();
+        public int removeTag(final Tag lu) {
+            if (lu instanceof CollectionTag) {
+                final CollectionTag<?> ld3 = lu;
+                final int integer4 = ld3.size();
                 if (integer4 > 0) {
-                    js3.clear();
+                    ld3.clear();
                     return integer4;
                 }
             }
@@ -543,34 +543,34 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         private final CompoundTag pattern;
         private final Predicate<Tag> predicate;
         
-        public MatchObjectNode(final String string, final CompoundTag jt) {
+        public MatchObjectNode(final String string, final CompoundTag le) {
             this.name = string;
-            this.pattern = jt;
-            this.predicate = createTagPredicate(jt);
+            this.pattern = le;
+            this.predicate = createTagPredicate(le);
         }
         
         @Override
-        public void getTag(final Tag kj, final List<Tag> list) {
-            if (kj instanceof CompoundTag) {
-                final Tag kj2 = ((CompoundTag)kj).get(this.name);
-                if (this.predicate.test(kj2)) {
-                    list.add(kj2);
+        public void getTag(final Tag lu, final List<Tag> list) {
+            if (lu instanceof CompoundTag) {
+                final Tag lu2 = ((CompoundTag)lu).get(this.name);
+                if (this.predicate.test(lu2)) {
+                    list.add(lu2);
                 }
             }
         }
         
         @Override
-        public void getOrCreateTag(final Tag kj, final Supplier<Tag> supplier, final List<Tag> list) {
-            if (kj instanceof CompoundTag) {
-                final CompoundTag jt5 = (CompoundTag)kj;
-                Tag kj2 = jt5.get(this.name);
-                if (kj2 == null) {
-                    kj2 = this.pattern.copy();
-                    jt5.put(this.name, kj2);
-                    list.add(kj2);
+        public void getOrCreateTag(final Tag lu, final Supplier<Tag> supplier, final List<Tag> list) {
+            if (lu instanceof CompoundTag) {
+                final CompoundTag le5 = (CompoundTag)lu;
+                Tag lu2 = le5.get(this.name);
+                if (lu2 == null) {
+                    lu2 = this.pattern.copy();
+                    le5.put(this.name, lu2);
+                    list.add(lu2);
                 }
-                else if (this.predicate.test(kj2)) {
-                    list.add(kj2);
+                else if (this.predicate.test(lu2)) {
+                    list.add(lu2);
                 }
             }
         }
@@ -581,14 +581,14 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public int setTag(final Tag kj, final Supplier<Tag> supplier) {
-            if (kj instanceof CompoundTag) {
-                final CompoundTag jt4 = (CompoundTag)kj;
-                final Tag kj2 = jt4.get(this.name);
-                if (this.predicate.test(kj2)) {
-                    final Tag kj3 = supplier.get();
-                    if (!kj3.equals(kj2)) {
-                        jt4.put(this.name, kj3);
+        public int setTag(final Tag lu, final Supplier<Tag> supplier) {
+            if (lu instanceof CompoundTag) {
+                final CompoundTag le4 = (CompoundTag)lu;
+                final Tag lu2 = le4.get(this.name);
+                if (this.predicate.test(lu2)) {
+                    final Tag lu3 = supplier.get();
+                    if (!lu3.equals(lu2)) {
+                        le4.put(this.name, lu3);
                         return 1;
                     }
                 }
@@ -597,12 +597,12 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public int removeTag(final Tag kj) {
-            if (kj instanceof CompoundTag) {
-                final CompoundTag jt3 = (CompoundTag)kj;
-                final Tag kj2 = jt3.get(this.name);
-                if (this.predicate.test(kj2)) {
-                    jt3.remove(this.name);
+        public int removeTag(final Tag lu) {
+            if (lu instanceof CompoundTag) {
+                final CompoundTag le3 = (CompoundTag)lu;
+                final Tag lu2 = le3.get(this.name);
+                if (this.predicate.test(lu2)) {
+                    le3.remove(this.name);
                     return 1;
                 }
             }
@@ -613,20 +613,20 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
     static class MatchRootObjectNode implements Node {
         private final Predicate<Tag> predicate;
         
-        public MatchRootObjectNode(final CompoundTag jt) {
-            this.predicate = createTagPredicate(jt);
+        public MatchRootObjectNode(final CompoundTag le) {
+            this.predicate = createTagPredicate(le);
         }
         
         @Override
-        public void getTag(final Tag kj, final List<Tag> list) {
-            if (kj instanceof CompoundTag && this.predicate.test(kj)) {
-                list.add(kj);
+        public void getTag(final Tag lu, final List<Tag> list) {
+            if (lu instanceof CompoundTag && this.predicate.test(lu)) {
+                list.add(lu);
             }
         }
         
         @Override
-        public void getOrCreateTag(final Tag kj, final Supplier<Tag> supplier, final List<Tag> list) {
-            this.getTag(kj, list);
+        public void getOrCreateTag(final Tag lu, final Supplier<Tag> supplier, final List<Tag> list) {
+            this.getTag(lu, list);
         }
         
         @Override
@@ -635,12 +635,12 @@ public class NbtPathArgument implements ArgumentType<NbtPath> {
         }
         
         @Override
-        public int setTag(final Tag kj, final Supplier<Tag> supplier) {
+        public int setTag(final Tag lu, final Supplier<Tag> supplier) {
             return 0;
         }
         
         @Override
-        public int removeTag(final Tag kj) {
+        public int removeTag(final Tag lu) {
             return 0;
         }
     }
diff --git a/src/net/minecraft/commands/arguments/ObjectiveArgument.java b/src/net/minecraft/commands/arguments/ObjectiveArgument.java
index 88146f1..3c1a94a 100644
--- a/src/net/minecraft/commands/arguments/ObjectiveArgument.java
+++ b/src/net/minecraft/commands/arguments/ObjectiveArgument.java
@@ -29,20 +29,20 @@ public class ObjectiveArgument implements ArgumentType<String> {
     
     public static Objective getObjective(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
         final String string2 = (String)commandContext.getArgument(string, (Class)String.class);
-        final Scoreboard cwl4 = ((CommandSourceStack)commandContext.getSource()).getServer().getScoreboard();
-        final Objective cwi5 = cwl4.getObjective(string2);
-        if (cwi5 == null) {
+        final Scoreboard dfm4 = ((CommandSourceStack)commandContext.getSource()).getServer().getScoreboard();
+        final Objective dfj5 = dfm4.getObjective(string2);
+        if (dfj5 == null) {
             throw ObjectiveArgument.ERROR_OBJECTIVE_NOT_FOUND.create(string2);
         }
-        return cwi5;
+        return dfj5;
     }
     
     public static Objective getWritableObjective(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
-        final Objective cwi3 = getObjective(commandContext, string);
-        if (cwi3.getCriteria().isReadOnly()) {
-            throw ObjectiveArgument.ERROR_OBJECTIVE_READ_ONLY.create(cwi3.getName());
+        final Objective dfj3 = getObjective(commandContext, string);
+        if (dfj3.getCriteria().isReadOnly()) {
+            throw ObjectiveArgument.ERROR_OBJECTIVE_READ_ONLY.create(dfj3.getName());
         }
-        return cwi3;
+        return dfj3;
     }
     
     public String parse(final StringReader stringReader) throws CommandSyntaxException {
@@ -58,8 +58,8 @@ public class ObjectiveArgument implements ArgumentType<String> {
             return SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getScoreboard().getObjectiveNames(), suggestionsBuilder);
         }
         if (commandContext.getSource() instanceof SharedSuggestionProvider) {
-            final SharedSuggestionProvider cs4 = (SharedSuggestionProvider)commandContext.getSource();
-            return cs4.customSuggestion((CommandContext<SharedSuggestionProvider>)commandContext, suggestionsBuilder);
+            final SharedSuggestionProvider db4 = (SharedSuggestionProvider)commandContext.getSource();
+            return db4.customSuggestion((CommandContext<SharedSuggestionProvider>)commandContext, suggestionsBuilder);
         }
         return (CompletableFuture<Suggestions>)Suggestions.empty();
     }
diff --git a/src/net/minecraft/commands/arguments/ObjectiveCriteriaArgument.java b/src/net/minecraft/commands/arguments/ObjectiveCriteriaArgument.java
index 4309151..dc26601 100644
--- a/src/net/minecraft/commands/arguments/ObjectiveCriteriaArgument.java
+++ b/src/net/minecraft/commands/arguments/ObjectiveCriteriaArgument.java
@@ -53,17 +53,17 @@ public class ObjectiveCriteriaArgument implements ArgumentType<ObjectiveCriteria
     
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
         final List<String> list4 = Lists.newArrayList(ObjectiveCriteria.CRITERIA_BY_NAME.keySet());
-        for (final StatType<?> aaq6 : Registry.STAT_TYPE) {
-            for (final Object object8 : aaq6.getRegistry()) {
-                final String string9 = this.getName(aaq6, object8);
+        for (final StatType<?> act6 : Registry.STAT_TYPE) {
+            for (final Object object8 : act6.getRegistry()) {
+                final String string9 = this.getName(act6, object8);
                 list4.add(string9);
             }
         }
         return SharedSuggestionProvider.suggest(list4, suggestionsBuilder);
     }
     
-    public <T> String getName(final StatType<T> aaq, final Object object) {
-        return Stat.buildName((StatType<Object>)aaq, object);
+    public <T> String getName(final StatType<T> act, final Object object) {
+        return Stat.buildName((StatType<Object>)act, object);
     }
     
     public Collection<String> getExamples() {
diff --git a/src/net/minecraft/commands/arguments/OperationArgument.java b/src/net/minecraft/commands/arguments/OperationArgument.java
index 50a1d1e..5a1d181 100644
--- a/src/net/minecraft/commands/arguments/OperationArgument.java
+++ b/src/net/minecraft/commands/arguments/OperationArgument.java
@@ -52,10 +52,10 @@ public class OperationArgument implements ArgumentType<Operation> {
     private static Operation getOperation(final String string) throws CommandSyntaxException {
         if (string.equals("><")) {
             final int integer3;
-            return (cwk1, cwk2) -> {
-                integer3 = cwk1.getScore();
-                cwk1.setScore(cwk2.getScore());
-                cwk2.setScore(integer3);
+            return (dfl1, dfl2) -> {
+                integer3 = dfl1.getScore();
+                dfl1.setScore(dfl2.getScore());
+                dfl2.setScore(integer3);
                 return;
             };
         }
@@ -110,21 +110,21 @@ public class OperationArgument implements ArgumentType<Operation> {
     
     static {
         EXAMPLES = Arrays.<String>asList("=", ">", "<");
-        ERROR_INVALID_OPERATION = new SimpleCommandExceptionType((Message)new TranslatableComponent("arguments.operation.invalid", new Object[0]));
-        ERROR_DIVIDE_BY_ZERO = new SimpleCommandExceptionType((Message)new TranslatableComponent("arguments.operation.div0", new Object[0]));
+        ERROR_INVALID_OPERATION = new SimpleCommandExceptionType((Message)new TranslatableComponent("arguments.operation.invalid"));
+        ERROR_DIVIDE_BY_ZERO = new SimpleCommandExceptionType((Message)new TranslatableComponent("arguments.operation.div0"));
     }
     
     @FunctionalInterface
     interface SimpleOperation extends Operation {
         int apply(final int integer1, final int integer2) throws CommandSyntaxException;
         
-        default void apply(final Score cwk1, final Score cwk2) throws CommandSyntaxException {
-            cwk1.setScore(this.apply(cwk1.getScore(), cwk2.getScore()));
+        default void apply(final Score dfl1, final Score dfl2) throws CommandSyntaxException {
+            dfl1.setScore(this.apply(dfl1.getScore(), dfl2.getScore()));
         }
     }
     
     @FunctionalInterface
     public interface Operation {
-        void apply(final Score cwk1, final Score cwk2) throws CommandSyntaxException;
+        void apply(final Score dfl1, final Score dfl2) throws CommandSyntaxException;
     }
 }
diff --git a/src/net/minecraft/commands/arguments/ParticleArgument.java b/src/net/minecraft/commands/arguments/ParticleArgument.java
index 0e18538..5ff75ac 100644
--- a/src/net/minecraft/commands/arguments/ParticleArgument.java
+++ b/src/net/minecraft/commands/arguments/ParticleArgument.java
@@ -40,13 +40,13 @@ public class ParticleArgument implements ArgumentType<ParticleOptions> {
     }
     
     public static ParticleOptions readParticle(final StringReader stringReader) throws CommandSyntaxException {
-        final ResourceLocation sm2 = ResourceLocation.read(stringReader);
-        final ParticleType<?> gu3 = Registry.PARTICLE_TYPE.getOptional(sm2).<Throwable>orElseThrow(() -> ParticleArgument.ERROR_UNKNOWN_PARTICLE.create(sm2));
-        return ParticleArgument.<ParticleOptions>readParticle(stringReader, gu3);
+        final ResourceLocation uh2 = ResourceLocation.read(stringReader);
+        final ParticleType<?> hg3 = Registry.PARTICLE_TYPE.getOptional(uh2).<Throwable>orElseThrow(() -> ParticleArgument.ERROR_UNKNOWN_PARTICLE.create(uh2));
+        return ParticleArgument.<ParticleOptions>readParticle(stringReader, hg3);
     }
     
-    private static <T extends ParticleOptions> T readParticle(final StringReader stringReader, final ParticleType<T> gu) throws CommandSyntaxException {
-        return gu.getDeserializer().fromCommand(gu, stringReader);
+    private static <T extends ParticleOptions> T readParticle(final StringReader stringReader, final ParticleType<T> hg) throws CommandSyntaxException {
+        return hg.getDeserializer().fromCommand(hg, stringReader);
     }
     
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
diff --git a/src/net/minecraft/commands/arguments/RangeArgument.java b/src/net/minecraft/commands/arguments/RangeArgument.java
index 1169518..0c0c35d 100644
--- a/src/net/minecraft/commands/arguments/RangeArgument.java
+++ b/src/net/minecraft/commands/arguments/RangeArgument.java
@@ -38,7 +38,7 @@ public interface RangeArgument<T extends MinMaxBounds<?>> extends ArgumentType<T
         
         public static class Serializer extends RangeArgument.Serializer<Ints> {
             @Override
-            public Ints deserializeFromNetwork(final FriendlyByteBuf kv) {
+            public Ints deserializeFromNetwork(final FriendlyByteBuf mg) {
                 return new Ints();
             }
         }
@@ -61,7 +61,7 @@ public interface RangeArgument<T extends MinMaxBounds<?>> extends ArgumentType<T
         
         public static class Serializer extends RangeArgument.Serializer<Floats> {
             @Override
-            public Floats deserializeFromNetwork(final FriendlyByteBuf kv) {
+            public Floats deserializeFromNetwork(final FriendlyByteBuf mg) {
                 return new Floats();
             }
         }
@@ -69,11 +69,11 @@ public interface RangeArgument<T extends MinMaxBounds<?>> extends ArgumentType<T
     
     public abstract static class Serializer<T extends RangeArgument<?>> implements ArgumentSerializer<T> {
         @Override
-        public void serializeToNetwork(final T dk, final FriendlyByteBuf kv) {
+        public void serializeToNetwork(final T du, final FriendlyByteBuf mg) {
         }
         
         @Override
-        public void serializeToJson(final T dk, final JsonObject jsonObject) {
+        public void serializeToJson(final T du, final JsonObject jsonObject) {
         }
     }
 }
diff --git a/src/net/minecraft/commands/arguments/ResourceLocationArgument.java b/src/net/minecraft/commands/arguments/ResourceLocationArgument.java
index a9fa434..be8a4d8 100644
--- a/src/net/minecraft/commands/arguments/ResourceLocationArgument.java
+++ b/src/net/minecraft/commands/arguments/ResourceLocationArgument.java
@@ -4,6 +4,8 @@ import java.util.Arrays;
 import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.brigadier.Message;
 import com.mojang.brigadier.StringReader;
+import net.minecraft.core.Registry;
+import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.level.storage.loot.PredicateManager;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 import net.minecraft.world.item.crafting.RecipeManager;
@@ -22,34 +24,40 @@ public class ResourceLocationArgument implements ArgumentType<ResourceLocation>
     private static final DynamicCommandExceptionType ERROR_UNKNOWN_ADVANCEMENT;
     private static final DynamicCommandExceptionType ERROR_UNKNOWN_RECIPE;
     private static final DynamicCommandExceptionType ERROR_UNKNOWN_PREDICATE;
+    private static final DynamicCommandExceptionType ERROR_UNKNOWN_ATTRIBUTE;
     
     public static ResourceLocationArgument id() {
         return new ResourceLocationArgument();
     }
     
     public static Advancement getAdvancement(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
-        final ResourceLocation sm3 = (ResourceLocation)commandContext.getArgument(string, (Class)ResourceLocation.class);
-        final Advancement u4 = ((CommandSourceStack)commandContext.getSource()).getServer().getAdvancements().getAdvancement(sm3);
-        if (u4 == null) {
-            throw ResourceLocationArgument.ERROR_UNKNOWN_ADVANCEMENT.create(sm3);
+        final ResourceLocation uh3 = (ResourceLocation)commandContext.getArgument(string, (Class)ResourceLocation.class);
+        final Advancement w4 = ((CommandSourceStack)commandContext.getSource()).getServer().getAdvancements().getAdvancement(uh3);
+        if (w4 == null) {
+            throw ResourceLocationArgument.ERROR_UNKNOWN_ADVANCEMENT.create(uh3);
         }
-        return u4;
+        return w4;
     }
     
     public static Recipe<?> getRecipe(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
-        final RecipeManager bgx3 = ((CommandSourceStack)commandContext.getSource()).getServer().getRecipeManager();
-        final ResourceLocation sm4 = (ResourceLocation)commandContext.getArgument(string, (Class)ResourceLocation.class);
-        return bgx3.byKey(sm4).<Throwable>orElseThrow(() -> ResourceLocationArgument.ERROR_UNKNOWN_RECIPE.create(sm4));
+        final RecipeManager bmv3 = ((CommandSourceStack)commandContext.getSource()).getServer().getRecipeManager();
+        final ResourceLocation uh4 = (ResourceLocation)commandContext.getArgument(string, (Class)ResourceLocation.class);
+        return bmv3.byKey(uh4).<Throwable>orElseThrow(() -> ResourceLocationArgument.ERROR_UNKNOWN_RECIPE.create(uh4));
     }
     
     public static LootItemCondition getPredicate(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
-        final ResourceLocation sm3 = (ResourceLocation)commandContext.getArgument(string, (Class)ResourceLocation.class);
-        final PredicateManager csc4 = ((CommandSourceStack)commandContext.getSource()).getServer().getPredicateManager();
-        final LootItemCondition cum5 = csc4.get(sm3);
-        if (cum5 == null) {
-            throw ResourceLocationArgument.ERROR_UNKNOWN_PREDICATE.create(sm3);
+        final ResourceLocation uh3 = (ResourceLocation)commandContext.getArgument(string, (Class)ResourceLocation.class);
+        final PredicateManager day4 = ((CommandSourceStack)commandContext.getSource()).getServer().getPredicateManager();
+        final LootItemCondition ddm5 = day4.get(uh3);
+        if (ddm5 == null) {
+            throw ResourceLocationArgument.ERROR_UNKNOWN_PREDICATE.create(uh3);
         }
-        return cum5;
+        return ddm5;
+    }
+    
+    public static Attribute getAttribute(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
+        final ResourceLocation uh3 = (ResourceLocation)commandContext.getArgument(string, (Class)ResourceLocation.class);
+        return Registry.ATTRIBUTE.getOptional(uh3).<Throwable>orElseThrow(() -> ResourceLocationArgument.ERROR_UNKNOWN_ATTRIBUTE.create(uh3));
     }
     
     public static ResourceLocation getId(final CommandContext<CommandSourceStack> commandContext, final String string) {
@@ -81,5 +89,10 @@ public class ResourceLocationArgument implements ArgumentType<ResourceLocation>
             new TranslatableComponent("predicate.unknown", new Object[] { object });
             return translatableComponent3;
         });
+        final TranslatableComponent translatableComponent4;
+        ERROR_UNKNOWN_ATTRIBUTE = new DynamicCommandExceptionType(object -> {
+            new TranslatableComponent("attribute.unknown", new Object[] { object });
+            return translatableComponent4;
+        });
     }
 }
diff --git a/src/net/minecraft/commands/arguments/ScoreHolderArgument.java b/src/net/minecraft/commands/arguments/ScoreHolderArgument.java
index b73d325..aeb6a78 100644
--- a/src/net/minecraft/commands/arguments/ScoreHolderArgument.java
+++ b/src/net/minecraft/commands/arguments/ScoreHolderArgument.java
@@ -66,12 +66,12 @@ public class ScoreHolderArgument implements ArgumentType<Result> {
     
     public Result parse(final StringReader stringReader) throws CommandSyntaxException {
         if (stringReader.canRead() && stringReader.peek() == '@') {
-            final EntitySelectorParser eq3 = new EntitySelectorParser(stringReader);
-            final EntitySelector ep4 = eq3.parse();
-            if (!this.multiple && ep4.getMaxResults() > 1) {
+            final EntitySelectorParser fa3 = new EntitySelectorParser(stringReader);
+            final EntitySelector ez4 = fa3.parse();
+            if (!this.multiple && ez4.getMaxResults() > 1) {
                 throw EntityArgument.ERROR_NOT_SINGLE_ENTITY.create();
             }
-            return new SelectorResult(ep4);
+            return new SelectorResult(ez4);
         }
         else {
             final int integer3 = stringReader.getCursor();
@@ -81,7 +81,7 @@ public class ScoreHolderArgument implements ArgumentType<Result> {
             final String string4 = stringReader.getString().substring(integer3, stringReader.getCursor());
             if (string4.equals("*")) {
                 final Collection<String> collection3;
-                return (cq, supplier) -> {
+                return (cz, supplier) -> {
                     collection3 = supplier.get();
                     if (collection3.isEmpty()) {
                         throw ScoreHolderArgument.ERROR_NO_RESULTS.create();
@@ -92,7 +92,7 @@ public class ScoreHolderArgument implements ArgumentType<Result> {
                 };
             }
             final Collection<String> collection4 = Collections.<String>singleton(string4);
-            return (cq, supplier) -> collection4;
+            return (cz, supplier) -> collection4;
         }
     }
     
@@ -104,33 +104,33 @@ public class ScoreHolderArgument implements ArgumentType<Result> {
         SUGGEST_SCORE_HOLDERS = ((commandContext, suggestionsBuilder) -> {
             final StringReader stringReader3 = new StringReader(suggestionsBuilder.getInput());
             stringReader3.setCursor(suggestionsBuilder.getStart());
-            final EntitySelectorParser eq4 = new EntitySelectorParser(stringReader3);
+            final EntitySelectorParser fa4 = new EntitySelectorParser(stringReader3);
             try {
-                eq4.parse();
+                fa4.parse();
             }
             catch (CommandSyntaxException ex) {}
-            return eq4.fillSuggestions(suggestionsBuilder, suggestionsBuilder -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getOnlinePlayerNames(), suggestionsBuilder));
+            return fa4.fillSuggestions(suggestionsBuilder, suggestionsBuilder -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getOnlinePlayerNames(), suggestionsBuilder));
         });
         EXAMPLES = Arrays.<String>asList("Player", "0123", "*", "@e");
-        ERROR_NO_RESULTS = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.scoreHolder.empty", new Object[0]));
+        ERROR_NO_RESULTS = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.scoreHolder.empty"));
     }
     
     public static class SelectorResult implements Result {
         private final EntitySelector selector;
         
-        public SelectorResult(final EntitySelector ep) {
-            this.selector = ep;
+        public SelectorResult(final EntitySelector ez) {
+            this.selector = ez;
         }
         
         @Override
-        public Collection<String> getNames(final CommandSourceStack cq, final Supplier<Collection<String>> supplier) throws CommandSyntaxException {
-            final List<? extends Entity> list4 = this.selector.findEntities(cq);
+        public Collection<String> getNames(final CommandSourceStack cz, final Supplier<Collection<String>> supplier) throws CommandSyntaxException {
+            final List<? extends Entity> list4 = this.selector.findEntities(cz);
             if (list4.isEmpty()) {
                 throw EntityArgument.NO_ENTITIES_FOUND.create();
             }
             final List<String> list5 = Lists.newArrayList();
-            for (final Entity akq7 : list4) {
-                list5.add(akq7.getScoreboardName());
+            for (final Entity aom7 : list4) {
+                list5.add(aom7.getScoreboardName());
             }
             return list5;
         }
@@ -138,29 +138,29 @@ public class ScoreHolderArgument implements ArgumentType<Result> {
     
     public static class Serializer implements ArgumentSerializer<ScoreHolderArgument> {
         @Override
-        public void serializeToNetwork(final ScoreHolderArgument dm, final FriendlyByteBuf kv) {
+        public void serializeToNetwork(final ScoreHolderArgument dw, final FriendlyByteBuf mg) {
             byte byte4 = 0;
-            if (dm.multiple) {
+            if (dw.multiple) {
                 byte4 |= 0x1;
             }
-            kv.writeByte(byte4);
+            mg.writeByte(byte4);
         }
         
         @Override
-        public ScoreHolderArgument deserializeFromNetwork(final FriendlyByteBuf kv) {
-            final byte byte3 = kv.readByte();
+        public ScoreHolderArgument deserializeFromNetwork(final FriendlyByteBuf mg) {
+            final byte byte3 = mg.readByte();
             final boolean boolean4 = (byte3 & 0x1) != 0x0;
             return new ScoreHolderArgument(boolean4);
         }
         
         @Override
-        public void serializeToJson(final ScoreHolderArgument dm, final JsonObject jsonObject) {
-            jsonObject.addProperty("amount", dm.multiple ? "multiple" : "single");
+        public void serializeToJson(final ScoreHolderArgument dw, final JsonObject jsonObject) {
+            jsonObject.addProperty("amount", dw.multiple ? "multiple" : "single");
         }
     }
     
     @FunctionalInterface
     public interface Result {
-        Collection<String> getNames(final CommandSourceStack cq, final Supplier<Collection<String>> supplier) throws CommandSyntaxException;
+        Collection<String> getNames(final CommandSourceStack cz, final Supplier<Collection<String>> supplier) throws CommandSyntaxException;
     }
 }
diff --git a/src/net/minecraft/commands/arguments/TeamArgument.java b/src/net/minecraft/commands/arguments/TeamArgument.java
index 268e6bf..935f492 100644
--- a/src/net/minecraft/commands/arguments/TeamArgument.java
+++ b/src/net/minecraft/commands/arguments/TeamArgument.java
@@ -27,12 +27,12 @@ public class TeamArgument implements ArgumentType<String> {
     
     public static PlayerTeam getTeam(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
         final String string2 = (String)commandContext.getArgument(string, (Class)String.class);
-        final Scoreboard cwl4 = ((CommandSourceStack)commandContext.getSource()).getServer().getScoreboard();
-        final PlayerTeam cwj5 = cwl4.getPlayerTeam(string2);
-        if (cwj5 == null) {
+        final Scoreboard dfm4 = ((CommandSourceStack)commandContext.getSource()).getServer().getScoreboard();
+        final PlayerTeam dfk5 = dfm4.getPlayerTeam(string2);
+        if (dfk5 == null) {
             throw TeamArgument.ERROR_TEAM_NOT_FOUND.create(string2);
         }
-        return cwj5;
+        return dfk5;
     }
     
     public String parse(final StringReader stringReader) throws CommandSyntaxException {
diff --git a/src/net/minecraft/commands/arguments/TimeArgument.java b/src/net/minecraft/commands/arguments/TimeArgument.java
index afa81c8..dd583ea 100644
--- a/src/net/minecraft/commands/arguments/TimeArgument.java
+++ b/src/net/minecraft/commands/arguments/TimeArgument.java
@@ -58,7 +58,7 @@ public class TimeArgument implements ArgumentType<Integer> {
     
     static {
         EXAMPLES = Arrays.<String>asList("0d", "0s", "0t", "0");
-        ERROR_INVALID_UNIT = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.time.invalid_unit", new Object[0]));
+        ERROR_INVALID_UNIT = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.time.invalid_unit"));
         final TranslatableComponent translatableComponent;
         ERROR_INVALID_TICK_COUNT = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("argument.time.invalid_tick_count", new Object[] { object });
diff --git a/src/net/minecraft/commands/arguments/UuidArgument.java b/src/net/minecraft/commands/arguments/UuidArgument.java
new file mode 100644
index 0000000..40c3d28
--- /dev/null
+++ b/src/net/minecraft/commands/arguments/UuidArgument.java
@@ -0,0 +1,54 @@
+package net.minecraft.commands.arguments;
+
+import java.util.Arrays;
+import com.mojang.brigadier.Message;
+import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import java.util.regex.Matcher;
+import com.mojang.brigadier.StringReader;
+import net.minecraft.commands.CommandSourceStack;
+import com.mojang.brigadier.context.CommandContext;
+import java.util.regex.Pattern;
+import java.util.Collection;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import java.util.UUID;
+import com.mojang.brigadier.arguments.ArgumentType;
+
+public class UuidArgument implements ArgumentType<UUID> {
+    public static final SimpleCommandExceptionType ERROR_INVALID_UUID;
+    private static final Collection<String> EXAMPLES;
+    private static final Pattern ALLOWED_CHARACTERS;
+    
+    public static UUID getUuid(final CommandContext<CommandSourceStack> commandContext, final String string) {
+        return (UUID)commandContext.getArgument(string, (Class)UUID.class);
+    }
+    
+    public static UuidArgument uuid() {
+        return new UuidArgument();
+    }
+    
+    public UUID parse(final StringReader stringReader) throws CommandSyntaxException {
+        final String string3 = stringReader.getRemaining();
+        final Matcher matcher4 = UuidArgument.ALLOWED_CHARACTERS.matcher(string3);
+        if (matcher4.find()) {
+            final String string4 = matcher4.group(1);
+            try {
+                final UUID uUID6 = UUID.fromString(string4);
+                stringReader.setCursor(stringReader.getCursor() + string4.length());
+                return uUID6;
+            }
+            catch (IllegalArgumentException ex) {}
+        }
+        throw UuidArgument.ERROR_INVALID_UUID.create();
+    }
+    
+    public Collection<String> getExamples() {
+        return UuidArgument.EXAMPLES;
+    }
+    
+    static {
+        ERROR_INVALID_UUID = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.uuid.invalid"));
+        EXAMPLES = Arrays.<String>asList("dd12be42-52a9-4a91-a8a1-11c01849e498");
+        ALLOWED_CHARACTERS = Pattern.compile("^([-A-Fa-f0-9]+)");
+    }
+}
diff --git a/src/net/minecraft/commands/arguments/blocks/BlockInput.java b/src/net/minecraft/commands/arguments/blocks/BlockInput.java
index fbef9c7..a1a5466 100644
--- a/src/net/minecraft/commands/arguments/blocks/BlockInput.java
+++ b/src/net/minecraft/commands/arguments/blocks/BlockInput.java
@@ -1,5 +1,7 @@
 package net.minecraft.commands.arguments.blocks;
 
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -20,10 +22,10 @@ public class BlockInput implements Predicate<BlockInWorld> {
     @Nullable
     private final CompoundTag tag;
     
-    public BlockInput(final BlockState byj, final Set<Property<?>> set, @Nullable final CompoundTag jt) {
-        this.state = byj;
+    public BlockInput(final BlockState cfj, final Set<Property<?>> set, @Nullable final CompoundTag le) {
+        this.state = cfj;
         this.properties = set;
-        this.tag = jt;
+        this.tag = le;
     }
     
     public BlockState getState() {
@@ -31,35 +33,39 @@ public class BlockInput implements Predicate<BlockInWorld> {
     }
     
     @Override
-    public boolean test(final BlockInWorld byn) {
-        final BlockState byj3 = byn.getState();
-        if (byj3.getBlock() != this.state.getBlock()) {
+    public boolean test(final BlockInWorld cfn) {
+        final BlockState cfj3 = cfn.getState();
+        if (!cfj3.is(this.state.getBlock())) {
             return false;
         }
-        for (final Property<?> bzm5 : this.properties) {
-            if (byj3.getValue(bzm5) != this.state.getValue(bzm5)) {
+        for (final Property<?> cgl5 : this.properties) {
+            if (cfj3.getValue(cgl5) != this.state.getValue(cgl5)) {
                 return false;
             }
         }
         if (this.tag != null) {
-            final BlockEntity bwl4 = byn.getEntity();
-            return bwl4 != null && NbtUtils.compareNbt(this.tag, bwl4.save(new CompoundTag()), true);
+            final BlockEntity cdl4 = cfn.getEntity();
+            return cdl4 != null && NbtUtils.compareNbt(this.tag, cdl4.save(new CompoundTag()), true);
         }
         return true;
     }
     
-    public boolean place(final ServerLevel xd, final BlockPos fk, final int integer) {
-        if (!xd.setBlock(fk, this.state, integer)) {
+    public boolean place(final ServerLevel zd, final BlockPos fu, final int integer) {
+        BlockState cfj5 = Block.updateFromNeighbourShapes(this.state, zd, fu);
+        if (cfj5.isAir()) {
+            cfj5 = this.state;
+        }
+        if (!zd.setBlock(fu, cfj5, integer)) {
             return false;
         }
         if (this.tag != null) {
-            final BlockEntity bwl5 = xd.getBlockEntity(fk);
-            if (bwl5 != null) {
-                final CompoundTag jt6 = this.tag.copy();
-                jt6.putInt("x", fk.getX());
-                jt6.putInt("y", fk.getY());
-                jt6.putInt("z", fk.getZ());
-                bwl5.load(jt6);
+            final BlockEntity cdl6 = zd.getBlockEntity(fu);
+            if (cdl6 != null) {
+                final CompoundTag le7 = this.tag.copy();
+                le7.putInt("x", fu.getX());
+                le7.putInt("y", fu.getY());
+                le7.putInt("z", fu.getZ());
+                cdl6.load(cfj5, le7);
             }
         }
         return true;
diff --git a/src/net/minecraft/commands/arguments/blocks/BlockPredicateArgument.java b/src/net/minecraft/commands/arguments/blocks/BlockPredicateArgument.java
index 79d6db2..28922c5 100644
--- a/src/net/minecraft/commands/arguments/blocks/BlockPredicateArgument.java
+++ b/src/net/minecraft/commands/arguments/blocks/BlockPredicateArgument.java
@@ -13,6 +13,7 @@ import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.brigadier.Message;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.tags.TagManager;
+import net.minecraft.tags.BlockTags;
 import com.mojang.brigadier.suggestion.Suggestions;
 import java.util.concurrent.CompletableFuture;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
@@ -38,22 +39,22 @@ public class BlockPredicateArgument implements ArgumentType<Result> {
     }
     
     public Result parse(final StringReader stringReader) throws CommandSyntaxException {
-        final BlockStateParser dv3 = new BlockStateParser(stringReader, true).parse(true);
-        if (dv3.getState() != null) {
-            final BlockPredicate a4 = new BlockPredicate(dv3.getState(), dv3.getProperties().keySet(), dv3.getNbt());
-            return abb -> a4;
+        final BlockStateParser ef3 = new BlockStateParser(stringReader, true).parse(true);
+        if (ef3.getState() != null) {
+            final BlockPredicate a4 = new BlockPredicate(ef3.getState(), ef3.getProperties().keySet(), ef3.getNbt());
+            return adh -> a4;
         }
-        final ResourceLocation sm4 = dv3.getTag();
-        final ResourceLocation sm5;
-        final Tag<Object> aaz4;
+        final ResourceLocation uh4 = ef3.getTag();
+        final ResourceLocation uh5;
+        final Tag<Object> adf4;
         final BlockStateParser blockStateParser;
-        return abb -> {
-            aaz4 = abb.getBlocks().getTag(sm5);
-            if (aaz4 == null) {
-                throw BlockPredicateArgument.ERROR_UNKNOWN_TAG.create(sm5.toString());
+        return adh -> {
+            adf4 = adh.getBlocks().getTag(uh5);
+            if (adf4 == null) {
+                throw BlockPredicateArgument.ERROR_UNKNOWN_TAG.create(uh5.toString());
             }
             else {
-                return new TagPredicate((Tag)aaz4, (Map)blockStateParser.getVagueProperties(), blockStateParser.getNbt());
+                return new TagPredicate((Tag)adf4, (Map)blockStateParser.getVagueProperties(), blockStateParser.getNbt());
             }
         };
     }
@@ -65,12 +66,12 @@ public class BlockPredicateArgument implements ArgumentType<Result> {
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
         final StringReader stringReader4 = new StringReader(suggestionsBuilder.getInput());
         stringReader4.setCursor(suggestionsBuilder.getStart());
-        final BlockStateParser dv5 = new BlockStateParser(stringReader4, true);
+        final BlockStateParser ef5 = new BlockStateParser(stringReader4, true);
         try {
-            dv5.parse(true);
+            ef5.parse(true);
         }
         catch (CommandSyntaxException ex) {}
-        return dv5.fillSuggestions(suggestionsBuilder);
+        return ef5.fillSuggestions(suggestionsBuilder, BlockTags.getAllTags());
     }
     
     public Collection<String> getExamples() {
@@ -92,26 +93,26 @@ public class BlockPredicateArgument implements ArgumentType<Result> {
         @Nullable
         private final CompoundTag nbt;
         
-        public BlockPredicate(final BlockState byj, final Set<Property<?>> set, @Nullable final CompoundTag jt) {
-            this.state = byj;
+        public BlockPredicate(final BlockState cfj, final Set<Property<?>> set, @Nullable final CompoundTag le) {
+            this.state = cfj;
             this.properties = set;
-            this.nbt = jt;
+            this.nbt = le;
         }
         
         @Override
-        public boolean test(final BlockInWorld byn) {
-            final BlockState byj3 = byn.getState();
-            if (byj3.getBlock() != this.state.getBlock()) {
+        public boolean test(final BlockInWorld cfn) {
+            final BlockState cfj3 = cfn.getState();
+            if (!cfj3.is(this.state.getBlock())) {
                 return false;
             }
-            for (final Property<?> bzm5 : this.properties) {
-                if (byj3.getValue(bzm5) != this.state.getValue(bzm5)) {
+            for (final Property<?> cgl5 : this.properties) {
+                if (cfj3.getValue(cgl5) != this.state.getValue(cgl5)) {
                     return false;
                 }
             }
             if (this.nbt != null) {
-                final BlockEntity bwl4 = byn.getEntity();
-                return bwl4 != null && NbtUtils.compareNbt(this.nbt, bwl4.save(new CompoundTag()), true);
+                final BlockEntity cdl4 = cfn.getEntity();
+                return cdl4 != null && NbtUtils.compareNbt(this.nbt, cdl4.save(new CompoundTag()), true);
             }
             return true;
         }
@@ -123,40 +124,40 @@ public class BlockPredicateArgument implements ArgumentType<Result> {
         private final CompoundTag nbt;
         private final Map<String, String> vagueProperties;
         
-        private TagPredicate(final Tag<Block> aaz, final Map<String, String> map, @Nullable final CompoundTag jt) {
-            this.tag = aaz;
+        private TagPredicate(final Tag<Block> adf, final Map<String, String> map, @Nullable final CompoundTag le) {
+            this.tag = adf;
             this.vagueProperties = map;
-            this.nbt = jt;
+            this.nbt = le;
         }
         
         @Override
-        public boolean test(final BlockInWorld byn) {
-            final BlockState byj3 = byn.getState();
-            if (!byj3.is(this.tag)) {
+        public boolean test(final BlockInWorld cfn) {
+            final BlockState cfj3 = cfn.getState();
+            if (!cfj3.is(this.tag)) {
                 return false;
             }
             for (final Map.Entry<String, String> entry5 : this.vagueProperties.entrySet()) {
-                final Property<?> bzm6 = byj3.getBlock().getStateDefinition().getProperty(entry5.getKey());
-                if (bzm6 == null) {
+                final Property<?> cgl6 = cfj3.getBlock().getStateDefinition().getProperty(entry5.getKey());
+                if (cgl6 == null) {
                     return false;
                 }
-                final Comparable<?> comparable7 = bzm6.getValue(entry5.getValue()).orElse(null);
+                final Comparable<?> comparable7 = cgl6.getValue(entry5.getValue()).orElse(null);
                 if (comparable7 == null) {
                     return false;
                 }
-                if (byj3.getValue(bzm6) != comparable7) {
+                if (cfj3.getValue(cgl6) != comparable7) {
                     return false;
                 }
             }
             if (this.nbt != null) {
-                final BlockEntity bwl4 = byn.getEntity();
-                return bwl4 != null && NbtUtils.compareNbt(this.nbt, bwl4.save(new CompoundTag()), true);
+                final BlockEntity cdl4 = cfn.getEntity();
+                return cdl4 != null && NbtUtils.compareNbt(this.nbt, cdl4.save(new CompoundTag()), true);
             }
             return true;
         }
     }
     
     public interface Result {
-        Predicate<BlockInWorld> create(final TagManager abb) throws CommandSyntaxException;
+        Predicate<BlockInWorld> create(final TagManager adh) throws CommandSyntaxException;
     }
 }
diff --git a/src/net/minecraft/commands/arguments/blocks/BlockStateArgument.java b/src/net/minecraft/commands/arguments/blocks/BlockStateArgument.java
index 0c06be6..5c7ea87 100644
--- a/src/net/minecraft/commands/arguments/blocks/BlockStateArgument.java
+++ b/src/net/minecraft/commands/arguments/blocks/BlockStateArgument.java
@@ -1,6 +1,7 @@
 package net.minecraft.commands.arguments.blocks;
 
 import java.util.Arrays;
+import net.minecraft.tags.BlockTags;
 import com.mojang.brigadier.suggestion.Suggestions;
 import java.util.concurrent.CompletableFuture;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
@@ -19,8 +20,8 @@ public class BlockStateArgument implements ArgumentType<BlockInput> {
     }
     
     public BlockInput parse(final StringReader stringReader) throws CommandSyntaxException {
-        final BlockStateParser dv3 = new BlockStateParser(stringReader, false).parse(true);
-        return new BlockInput(dv3.getState(), dv3.getProperties().keySet(), dv3.getNbt());
+        final BlockStateParser ef3 = new BlockStateParser(stringReader, false).parse(true);
+        return new BlockInput(ef3.getState(), ef3.getProperties().keySet(), ef3.getNbt());
     }
     
     public static BlockInput getBlock(final CommandContext<CommandSourceStack> commandContext, final String string) {
@@ -30,12 +31,12 @@ public class BlockStateArgument implements ArgumentType<BlockInput> {
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
         final StringReader stringReader4 = new StringReader(suggestionsBuilder.getInput());
         stringReader4.setCursor(suggestionsBuilder.getStart());
-        final BlockStateParser dv5 = new BlockStateParser(stringReader4, false);
+        final BlockStateParser ef5 = new BlockStateParser(stringReader4, false);
         try {
-            dv5.parse(true);
+            ef5.parse(true);
         }
         catch (CommandSyntaxException ex) {}
-        return dv5.fillSuggestions(suggestionsBuilder);
+        return ef5.fillSuggestions(suggestionsBuilder, BlockTags.getAllTags());
     }
     
     public Collection<String> getExamples() {
diff --git a/src/net/minecraft/commands/arguments/blocks/BlockStateParser.java b/src/net/minecraft/commands/arguments/blocks/BlockStateParser.java
index 25c32d3..061954e 100644
--- a/src/net/minecraft/commands/arguments/blocks/BlockStateParser.java
+++ b/src/net/minecraft/commands/arguments/blocks/BlockStateParser.java
@@ -1,6 +1,6 @@
 package net.minecraft.commands.arguments.blocks;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.brigadier.Message;
 import com.google.common.collect.UnmodifiableIterator;
@@ -10,7 +10,6 @@ import com.mojang.brigadier.ImmutableStringReader;
 import net.minecraft.core.Registry;
 import net.minecraft.commands.SharedSuggestionProvider;
 import net.minecraft.tags.Tag;
-import net.minecraft.tags.BlockTags;
 import java.util.Iterator;
 import java.util.Locale;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -18,7 +17,6 @@ import com.google.common.collect.Maps;
 import javax.annotation.Nullable;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.properties.Property;
@@ -26,8 +24,10 @@ import java.util.Map;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.suggestion.Suggestions;
 import java.util.concurrent.CompletableFuture;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.TagCollection;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import java.util.function.Function;
+import java.util.function.BiFunction;
 import com.mojang.brigadier.exceptions.Dynamic3CommandExceptionType;
 import com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
@@ -41,7 +41,7 @@ public class BlockStateParser {
     public static final Dynamic3CommandExceptionType ERROR_INVALID_VALUE;
     public static final Dynamic2CommandExceptionType ERROR_EXPECTED_VALUE;
     public static final SimpleCommandExceptionType ERROR_EXPECTED_END_OF_PROPERTIES;
-    private static final Function<SuggestionsBuilder, CompletableFuture<Suggestions>> SUGGEST_NOTHING;
+    private static final BiFunction<SuggestionsBuilder, TagCollection<Block>, CompletableFuture<Suggestions>> SUGGEST_NOTHING;
     private final StringReader reader;
     private final boolean forTesting;
     private final Map<Property<?>, Comparable<?>> properties;
@@ -53,7 +53,7 @@ public class BlockStateParser {
     private CompoundTag nbt;
     private ResourceLocation tag;
     private int tagCursor;
-    private Function<SuggestionsBuilder, CompletableFuture<Suggestions>> suggestions;
+    private BiFunction<SuggestionsBuilder, TagCollection<Block>, CompletableFuture<Suggestions>> suggestions;
     
     public BlockStateParser(final StringReader stringReader, final boolean boolean2) {
         this.properties = Maps.newHashMap();
@@ -109,39 +109,39 @@ public class BlockStateParser {
         return this;
     }
     
-    private CompletableFuture<Suggestions> suggestPropertyNameOrEnd(final SuggestionsBuilder suggestionsBuilder) {
+    private CompletableFuture<Suggestions> suggestPropertyNameOrEnd(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
         if (suggestionsBuilder.getRemaining().isEmpty()) {
             suggestionsBuilder.suggest(String.valueOf(']'));
         }
-        return this.suggestPropertyName(suggestionsBuilder);
+        return this.suggestPropertyName(suggestionsBuilder, adg);
     }
     
-    private CompletableFuture<Suggestions> suggestVaguePropertyNameOrEnd(final SuggestionsBuilder suggestionsBuilder) {
+    private CompletableFuture<Suggestions> suggestVaguePropertyNameOrEnd(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
         if (suggestionsBuilder.getRemaining().isEmpty()) {
             suggestionsBuilder.suggest(String.valueOf(']'));
         }
-        return this.suggestVaguePropertyName(suggestionsBuilder);
+        return this.suggestVaguePropertyName(suggestionsBuilder, adg);
     }
     
-    private CompletableFuture<Suggestions> suggestPropertyName(final SuggestionsBuilder suggestionsBuilder) {
-        final String string3 = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
-        for (final Property<?> bzm5 : this.state.getProperties()) {
-            if (!this.properties.containsKey(bzm5) && bzm5.getName().startsWith(string3)) {
-                suggestionsBuilder.suggest(bzm5.getName() + '=');
+    private CompletableFuture<Suggestions> suggestPropertyName(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
+        final String string4 = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
+        for (final Property<?> cgl6 : this.state.getProperties()) {
+            if (!this.properties.containsKey(cgl6) && cgl6.getName().startsWith(string4)) {
+                suggestionsBuilder.suggest(cgl6.getName() + '=');
             }
         }
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
-    private CompletableFuture<Suggestions> suggestVaguePropertyName(final SuggestionsBuilder suggestionsBuilder) {
-        final String string3 = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
+    private CompletableFuture<Suggestions> suggestVaguePropertyName(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
+        final String string4 = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
         if (this.tag != null && !this.tag.getPath().isEmpty()) {
-            final Tag<Block> aaz4 = BlockTags.getAllTags().getTag(this.tag);
-            if (aaz4 != null) {
-                for (final Block bph6 : aaz4.getValues()) {
-                    for (final Property<?> bzm8 : bph6.getStateDefinition().getProperties()) {
-                        if (!this.vagueProperties.containsKey(bzm8.getName()) && bzm8.getName().startsWith(string3)) {
-                            suggestionsBuilder.suggest(bzm8.getName() + '=');
+            final Tag<Block> adf5 = adg.getTag(this.tag);
+            if (adf5 != null) {
+                for (final Block bvr7 : adf5.getValues()) {
+                    for (final Property<?> cgl9 : bvr7.getStateDefinition().getProperties()) {
+                        if (!this.vagueProperties.containsKey(cgl9.getName()) && cgl9.getName().startsWith(string4)) {
+                            suggestionsBuilder.suggest(cgl9.getName() + '=');
                         }
                     }
                 }
@@ -150,22 +150,22 @@ public class BlockStateParser {
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
-    private CompletableFuture<Suggestions> suggestOpenNbt(final SuggestionsBuilder suggestionsBuilder) {
-        if (suggestionsBuilder.getRemaining().isEmpty() && this.hasBlockEntity()) {
+    private CompletableFuture<Suggestions> suggestOpenNbt(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
+        if (suggestionsBuilder.getRemaining().isEmpty() && this.hasBlockEntity(adg)) {
             suggestionsBuilder.suggest(String.valueOf('{'));
         }
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
-    private boolean hasBlockEntity() {
+    private boolean hasBlockEntity(final TagCollection<Block> adg) {
         if (this.state != null) {
             return this.state.getBlock().isEntityBlock();
         }
         if (this.tag != null) {
-            final Tag<Block> aaz2 = BlockTags.getAllTags().getTag(this.tag);
-            if (aaz2 != null) {
-                for (final Block bph4 : aaz2.getValues()) {
-                    if (bph4.isEntityBlock()) {
+            final Tag<Block> adf3 = adg.getTag(this.tag);
+            if (adf3 != null) {
+                for (final Block bvr5 : adf3.getValues()) {
+                    if (bvr5.isEntityBlock()) {
                         return true;
                     }
                 }
@@ -174,14 +174,14 @@ public class BlockStateParser {
         return false;
     }
     
-    private CompletableFuture<Suggestions> suggestEquals(final SuggestionsBuilder suggestionsBuilder) {
+    private CompletableFuture<Suggestions> suggestEquals(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
         if (suggestionsBuilder.getRemaining().isEmpty()) {
             suggestionsBuilder.suggest(String.valueOf('='));
         }
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
-    private CompletableFuture<Suggestions> suggestNextPropertyOrEnd(final SuggestionsBuilder suggestionsBuilder) {
+    private CompletableFuture<Suggestions> suggestNextPropertyOrEnd(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
         if (suggestionsBuilder.getRemaining().isEmpty()) {
             suggestionsBuilder.suggest(String.valueOf(']'));
         }
@@ -191,32 +191,32 @@ public class BlockStateParser {
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
-    private static <T extends Comparable<T>> SuggestionsBuilder addSuggestions(final SuggestionsBuilder suggestionsBuilder, final Property<T> bzm) {
-        for (final T comparable4 : bzm.getPossibleValues()) {
+    private static <T extends Comparable<T>> SuggestionsBuilder addSuggestions(final SuggestionsBuilder suggestionsBuilder, final Property<T> cgl) {
+        for (final T comparable4 : cgl.getPossibleValues()) {
             if (comparable4 instanceof Integer) {
                 suggestionsBuilder.suggest((int)comparable4);
             }
             else {
-                suggestionsBuilder.suggest(bzm.getName(comparable4));
+                suggestionsBuilder.suggest(cgl.getName(comparable4));
             }
         }
         return suggestionsBuilder;
     }
     
-    private CompletableFuture<Suggestions> suggestVaguePropertyValue(final SuggestionsBuilder suggestionsBuilder, final String string) {
-        boolean boolean4 = false;
+    private CompletableFuture<Suggestions> suggestVaguePropertyValue(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg, final String string) {
+        boolean boolean5 = false;
         if (this.tag != null && !this.tag.getPath().isEmpty()) {
-            final Tag<Block> aaz5 = BlockTags.getAllTags().getTag(this.tag);
-            if (aaz5 != null) {
-                for (final Block bph7 : aaz5.getValues()) {
-                    final Property<?> bzm8 = bph7.getStateDefinition().getProperty(string);
-                    if (bzm8 != null) {
-                        BlockStateParser.addSuggestions(suggestionsBuilder, bzm8);
+            final Tag<Block> adf6 = adg.getTag(this.tag);
+            if (adf6 != null) {
+                for (final Block bvr8 : adf6.getValues()) {
+                    final Property<?> cgl9 = bvr8.getStateDefinition().getProperty(string);
+                    if (cgl9 != null) {
+                        BlockStateParser.addSuggestions(suggestionsBuilder, cgl9);
                     }
-                    if (!boolean4) {
-                        for (final Property<?> bzm9 : bph7.getStateDefinition().getProperties()) {
-                            if (!this.vagueProperties.containsKey(bzm9.getName())) {
-                                boolean4 = true;
+                    if (!boolean5) {
+                        for (final Property<?> cgl10 : bvr8.getStateDefinition().getProperties()) {
+                            if (!this.vagueProperties.containsKey(cgl10.getName())) {
+                                boolean5 = true;
                                 break;
                             }
                         }
@@ -224,38 +224,38 @@ public class BlockStateParser {
                 }
             }
         }
-        if (boolean4) {
+        if (boolean5) {
             suggestionsBuilder.suggest(String.valueOf(','));
         }
         suggestionsBuilder.suggest(String.valueOf(']'));
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
-    private CompletableFuture<Suggestions> suggestOpenVaguePropertiesOrNbt(final SuggestionsBuilder suggestionsBuilder) {
+    private CompletableFuture<Suggestions> suggestOpenVaguePropertiesOrNbt(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
         if (suggestionsBuilder.getRemaining().isEmpty()) {
-            final Tag<Block> aaz3 = BlockTags.getAllTags().getTag(this.tag);
-            if (aaz3 != null) {
-                boolean boolean4 = false;
+            final Tag<Block> adf4 = adg.getTag(this.tag);
+            if (adf4 != null) {
                 boolean boolean5 = false;
-                for (final Block bph7 : aaz3.getValues()) {
-                    boolean4 |= !bph7.getStateDefinition().getProperties().isEmpty();
-                    boolean5 |= bph7.isEntityBlock();
-                    if (boolean4 && boolean5) {
+                boolean boolean6 = false;
+                for (final Block bvr8 : adf4.getValues()) {
+                    boolean5 |= !bvr8.getStateDefinition().getProperties().isEmpty();
+                    boolean6 |= bvr8.isEntityBlock();
+                    if (boolean5 && boolean6) {
                         break;
                     }
                 }
-                if (boolean4) {
+                if (boolean5) {
                     suggestionsBuilder.suggest(String.valueOf('['));
                 }
-                if (boolean5) {
+                if (boolean6) {
                     suggestionsBuilder.suggest(String.valueOf('{'));
                 }
             }
         }
-        return this.suggestTag(suggestionsBuilder);
+        return this.suggestTag(suggestionsBuilder, adg);
     }
     
-    private CompletableFuture<Suggestions> suggestOpenPropertiesOrNbt(final SuggestionsBuilder suggestionsBuilder) {
+    private CompletableFuture<Suggestions> suggestOpenPropertiesOrNbt(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
         if (suggestionsBuilder.getRemaining().isEmpty()) {
             if (!this.state.getBlock().getStateDefinition().getProperties().isEmpty()) {
                 suggestionsBuilder.suggest(String.valueOf('['));
@@ -267,13 +267,13 @@ public class BlockStateParser {
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
-    private CompletableFuture<Suggestions> suggestTag(final SuggestionsBuilder suggestionsBuilder) {
-        return SharedSuggestionProvider.suggestResource(BlockTags.getAllTags().getAvailableTags(), suggestionsBuilder.createOffset(this.tagCursor).add(suggestionsBuilder));
+    private CompletableFuture<Suggestions> suggestTag(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
+        return SharedSuggestionProvider.suggestResource(adg.getAvailableTags(), suggestionsBuilder.createOffset(this.tagCursor).add(suggestionsBuilder));
     }
     
-    private CompletableFuture<Suggestions> suggestBlockIdOrTag(final SuggestionsBuilder suggestionsBuilder) {
+    private CompletableFuture<Suggestions> suggestBlockIdOrTag(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
         if (this.forTesting) {
-            SharedSuggestionProvider.suggestResource(BlockTags.getAllTags().getAvailableTags(), suggestionsBuilder, String.valueOf('#'));
+            SharedSuggestionProvider.suggestResource(adg.getAvailableTags(), suggestionsBuilder, String.valueOf('#'));
         }
         SharedSuggestionProvider.suggestResource(Registry.BLOCK.keySet(), suggestionsBuilder);
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
@@ -282,12 +282,12 @@ public class BlockStateParser {
     public void readBlock() throws CommandSyntaxException {
         final int integer2 = this.reader.getCursor();
         this.id = ResourceLocation.read(this.reader);
-        final Block bph3 = Registry.BLOCK.getOptional(this.id).<Throwable>orElseThrow(() -> {
+        final Block bvr3 = Registry.BLOCK.getOptional(this.id).<Throwable>orElseThrow(() -> {
             this.reader.setCursor(integer2);
             return BlockStateParser.ERROR_UNKNOWN_BLOCK.createWithContext((ImmutableStringReader)this.reader, this.id.toString());
         });
-        this.definition = bph3.getStateDefinition();
-        this.state = bph3.defaultBlockState();
+        this.definition = bvr3.getStateDefinition();
+        this.state = bvr3.defaultBlockState();
     }
     
     public void readTag() throws CommandSyntaxException {
@@ -308,12 +308,12 @@ public class BlockStateParser {
             this.reader.skipWhitespace();
             final int integer2 = this.reader.getCursor();
             final String string3 = this.reader.readString();
-            final Property<?> bzm4 = this.definition.getProperty(string3);
-            if (bzm4 == null) {
+            final Property<?> cgl4 = this.definition.getProperty(string3);
+            if (cgl4 == null) {
                 this.reader.setCursor(integer2);
                 throw BlockStateParser.ERROR_UNKNOWN_PROPERTY.createWithContext((ImmutableStringReader)this.reader, this.id.toString(), string3);
             }
-            if (this.properties.containsKey(bzm4)) {
+            if (this.properties.containsKey(cgl4)) {
                 this.reader.setCursor(integer2);
                 throw BlockStateParser.ERROR_DUPLICATE_PROPERTY.createWithContext((ImmutableStringReader)this.reader, this.id.toString(), string3);
             }
@@ -324,9 +324,9 @@ public class BlockStateParser {
             }
             this.reader.skip();
             this.reader.skipWhitespace();
-            this.suggestions = (Function<SuggestionsBuilder, CompletableFuture<Suggestions>>)(suggestionsBuilder -> BlockStateParser.<Comparable>addSuggestions(suggestionsBuilder, bzm4).buildFuture());
+            this.suggestions = (BiFunction<SuggestionsBuilder, TagCollection<Block>, CompletableFuture<Suggestions>>)((suggestionsBuilder, adg) -> BlockStateParser.<Comparable>addSuggestions(suggestionsBuilder, cgl4).buildFuture());
             final int integer3 = this.reader.getCursor();
-            this.setValue(bzm4, this.reader.readString(), integer3);
+            this.setValue(cgl4, this.reader.readString(), integer3);
             this.suggestions = this::suggestNextPropertyOrEnd;
             this.reader.skipWhitespace();
             if (!this.reader.canRead()) {
@@ -370,7 +370,7 @@ public class BlockStateParser {
             }
             this.reader.skip();
             this.reader.skipWhitespace();
-            this.suggestions = (Function<SuggestionsBuilder, CompletableFuture<Suggestions>>)(suggestionsBuilder -> this.suggestVaguePropertyValue(suggestionsBuilder, string4));
+            this.suggestions = (BiFunction<SuggestionsBuilder, TagCollection<Block>, CompletableFuture<Suggestions>>)((suggestionsBuilder, adg) -> this.suggestVaguePropertyValue(suggestionsBuilder, adg, string4));
             integer2 = this.reader.getCursor();
             final String string5 = this.reader.readString();
             this.vagueProperties.put(string4, string5);
@@ -404,23 +404,23 @@ public class BlockStateParser {
         this.nbt = new TagParser(this.reader).readStruct();
     }
     
-    private <T extends Comparable<T>> void setValue(final Property<T> bzm, final String string, final int integer) throws CommandSyntaxException {
-        final Optional<T> optional5 = bzm.getValue(string);
+    private <T extends Comparable<T>> void setValue(final Property<T> cgl, final String string, final int integer) throws CommandSyntaxException {
+        final Optional<T> optional5 = cgl.getValue(string);
         if (optional5.isPresent()) {
-            this.state = ((AbstractStateHolder<O, BlockState>)this.state).<T, T>setValue(bzm, optional5.get());
-            this.properties.put(bzm, optional5.get());
+            this.state = ((StateHolder<O, BlockState>)this.state).<T, T>setValue(cgl, optional5.get());
+            this.properties.put(cgl, optional5.get());
             return;
         }
         this.reader.setCursor(integer);
-        throw BlockStateParser.ERROR_INVALID_VALUE.createWithContext((ImmutableStringReader)this.reader, this.id.toString(), bzm.getName(), string);
+        throw BlockStateParser.ERROR_INVALID_VALUE.createWithContext((ImmutableStringReader)this.reader, this.id.toString(), cgl.getName(), string);
     }
     
-    public static String serialize(final BlockState byj) {
-        final StringBuilder stringBuilder2 = new StringBuilder(Registry.BLOCK.getKey(byj.getBlock()).toString());
-        if (!byj.getProperties().isEmpty()) {
+    public static String serialize(final BlockState cfj) {
+        final StringBuilder stringBuilder2 = new StringBuilder(Registry.BLOCK.getKey(cfj.getBlock()).toString());
+        if (!cfj.getProperties().isEmpty()) {
             stringBuilder2.append('[');
             boolean boolean3 = false;
-            for (final Map.Entry<Property<?>, Comparable<?>> entry5 : byj.getValues().entrySet()) {
+            for (final Map.Entry<Property<?>, Comparable<?>> entry5 : cfj.getValues().entrySet()) {
                 if (boolean3) {
                     stringBuilder2.append(',');
                 }
@@ -432,14 +432,14 @@ public class BlockStateParser {
         return stringBuilder2.toString();
     }
     
-    private static <T extends Comparable<T>> void appendProperty(final StringBuilder stringBuilder, final Property<T> bzm, final Comparable<?> comparable) {
-        stringBuilder.append(bzm.getName());
+    private static <T extends Comparable<T>> void appendProperty(final StringBuilder stringBuilder, final Property<T> cgl, final Comparable<?> comparable) {
+        stringBuilder.append(cgl.getName());
         stringBuilder.append('=');
-        stringBuilder.append(bzm.getName((T)comparable));
+        stringBuilder.append(cgl.getName((T)comparable));
     }
     
-    public CompletableFuture<Suggestions> fillSuggestions(final SuggestionsBuilder suggestionsBuilder) {
-        return this.suggestions.apply(suggestionsBuilder.createOffset(this.reader.getCursor()));
+    public CompletableFuture<Suggestions> fillSuggestions(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Block> adg) {
+        return this.suggestions.apply(suggestionsBuilder.createOffset(this.reader.getCursor()), adg);
     }
     
     public Map<String, String> getVagueProperties() {
@@ -447,7 +447,7 @@ public class BlockStateParser {
     }
     
     static {
-        ERROR_NO_TAGS_ALLOWED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.block.tag.disallowed", new Object[0]));
+        ERROR_NO_TAGS_ALLOWED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.block.tag.disallowed"));
         final TranslatableComponent translatableComponent;
         ERROR_UNKNOWN_BLOCK = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("argument.block.id.invalid", new Object[] { object });
@@ -457,7 +457,7 @@ public class BlockStateParser {
         ERROR_DUPLICATE_PROPERTY = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("argument.block.property.duplicate", new Object[] { object2, object1 }));
         ERROR_INVALID_VALUE = new Dynamic3CommandExceptionType((object1, object2, object3) -> new TranslatableComponent("argument.block.property.invalid", new Object[] { object1, object3, object2 }));
         ERROR_EXPECTED_VALUE = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("argument.block.property.novalue", new Object[] { object1, object2 }));
-        ERROR_EXPECTED_END_OF_PROPERTIES = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.block.property.unclosed", new Object[0]));
-        SUGGEST_NOTHING = SuggestionsBuilder::buildFuture;
+        ERROR_EXPECTED_END_OF_PROPERTIES = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.block.property.unclosed"));
+        SUGGEST_NOTHING = ((suggestionsBuilder, adg) -> suggestionsBuilder.buildFuture());
     }
 }
diff --git a/src/net/minecraft/commands/arguments/coordinates/BlockPosArgument.java b/src/net/minecraft/commands/arguments/coordinates/BlockPosArgument.java
index 53b802e..98aa470 100644
--- a/src/net/minecraft/commands/arguments/coordinates/BlockPosArgument.java
+++ b/src/net/minecraft/commands/arguments/coordinates/BlockPosArgument.java
@@ -29,15 +29,15 @@ public class BlockPosArgument implements ArgumentType<Coordinates> {
     }
     
     public static BlockPos getLoadedBlockPos(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
-        final BlockPos fk3 = ((Coordinates)commandContext.getArgument(string, (Class)Coordinates.class)).getBlockPos((CommandSourceStack)commandContext.getSource());
-        if (!((CommandSourceStack)commandContext.getSource()).getLevel().hasChunkAt(fk3)) {
+        final BlockPos fu3 = ((Coordinates)commandContext.getArgument(string, (Class)Coordinates.class)).getBlockPos((CommandSourceStack)commandContext.getSource());
+        if (!((CommandSourceStack)commandContext.getSource()).getLevel().hasChunkAt(fu3)) {
             throw BlockPosArgument.ERROR_NOT_LOADED.create();
         }
         ((CommandSourceStack)commandContext.getSource()).getLevel();
-        if (!Level.isInWorldBounds(fk3)) {
+        if (!Level.isInWorldBounds(fu3)) {
             throw BlockPosArgument.ERROR_OUT_OF_WORLD.create();
         }
-        return fk3;
+        return fu3;
     }
     
     public static BlockPos getOrLoadBlockPos(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
@@ -72,7 +72,7 @@ public class BlockPosArgument implements ArgumentType<Coordinates> {
     
     static {
         EXAMPLES = Arrays.<String>asList("0 0 0", "~ ~ ~", "^ ^ ^", "^1 ^ ^-5", "~0.5 ~1 ~-5");
-        ERROR_NOT_LOADED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos.unloaded", new Object[0]));
-        ERROR_OUT_OF_WORLD = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos.outofworld", new Object[0]));
+        ERROR_NOT_LOADED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos.unloaded"));
+        ERROR_OUT_OF_WORLD = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos.outofworld"));
     }
 }
diff --git a/src/net/minecraft/commands/arguments/coordinates/ColumnPosArgument.java b/src/net/minecraft/commands/arguments/coordinates/ColumnPosArgument.java
index bacc8b4..cab76a6 100644
--- a/src/net/minecraft/commands/arguments/coordinates/ColumnPosArgument.java
+++ b/src/net/minecraft/commands/arguments/coordinates/ColumnPosArgument.java
@@ -29,8 +29,8 @@ public class ColumnPosArgument implements ArgumentType<Coordinates> {
     }
     
     public static ColumnPos getColumnPos(final CommandContext<CommandSourceStack> commandContext, final String string) {
-        final BlockPos fk3 = ((Coordinates)commandContext.getArgument(string, (Class)Coordinates.class)).getBlockPos((CommandSourceStack)commandContext.getSource());
-        return new ColumnPos(fk3.getX(), fk3.getZ());
+        final BlockPos fu3 = ((Coordinates)commandContext.getArgument(string, (Class)Coordinates.class)).getBlockPos((CommandSourceStack)commandContext.getSource());
+        return new ColumnPos(fu3.getX(), fu3.getZ());
     }
     
     public Coordinates parse(final StringReader stringReader) throws CommandSyntaxException {
@@ -38,14 +38,14 @@ public class ColumnPosArgument implements ArgumentType<Coordinates> {
         if (!stringReader.canRead()) {
             throw ColumnPosArgument.ERROR_NOT_COMPLETE.createWithContext((ImmutableStringReader)stringReader);
         }
-        final WorldCoordinate ef4 = WorldCoordinate.parseInt(stringReader);
+        final WorldCoordinate ep4 = WorldCoordinate.parseInt(stringReader);
         if (!stringReader.canRead() || stringReader.peek() != ' ') {
             stringReader.setCursor(integer3);
             throw ColumnPosArgument.ERROR_NOT_COMPLETE.createWithContext((ImmutableStringReader)stringReader);
         }
         stringReader.skip();
-        final WorldCoordinate ef5 = WorldCoordinate.parseInt(stringReader);
-        return new WorldCoordinates(ef4, new WorldCoordinate(true, 0.0), ef5);
+        final WorldCoordinate ep5 = WorldCoordinate.parseInt(stringReader);
+        return new WorldCoordinates(ep4, new WorldCoordinate(true, 0.0), ep5);
     }
     
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
@@ -69,6 +69,6 @@ public class ColumnPosArgument implements ArgumentType<Coordinates> {
     
     static {
         EXAMPLES = Arrays.<String>asList("0 0", "~ ~", "~1 ~-2", "^ ^", "^-1 ^0");
-        ERROR_NOT_COMPLETE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos2d.incomplete", new Object[0]));
+        ERROR_NOT_COMPLETE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos2d.incomplete"));
     }
 }
diff --git a/src/net/minecraft/commands/arguments/coordinates/Coordinates.java b/src/net/minecraft/commands/arguments/coordinates/Coordinates.java
index 2bd0e50..773e9d8 100644
--- a/src/net/minecraft/commands/arguments/coordinates/Coordinates.java
+++ b/src/net/minecraft/commands/arguments/coordinates/Coordinates.java
@@ -6,12 +6,12 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.commands.CommandSourceStack;
 
 public interface Coordinates {
-    Vec3 getPosition(final CommandSourceStack cq);
+    Vec3 getPosition(final CommandSourceStack cz);
     
-    Vec2 getRotation(final CommandSourceStack cq);
+    Vec2 getRotation(final CommandSourceStack cz);
     
-    default BlockPos getBlockPos(final CommandSourceStack cq) {
-        return new BlockPos(this.getPosition(cq));
+    default BlockPos getBlockPos(final CommandSourceStack cz) {
+        return new BlockPos(this.getPosition(cz));
     }
     
     boolean isXRelative();
diff --git a/src/net/minecraft/commands/arguments/coordinates/LocalCoordinates.java b/src/net/minecraft/commands/arguments/coordinates/LocalCoordinates.java
index f56e2a1..dcf7a4a 100644
--- a/src/net/minecraft/commands/arguments/coordinates/LocalCoordinates.java
+++ b/src/net/minecraft/commands/arguments/coordinates/LocalCoordinates.java
@@ -21,26 +21,26 @@ public class LocalCoordinates implements Coordinates {
     }
     
     @Override
-    public Vec3 getPosition(final CommandSourceStack cq) {
-        final Vec2 cvk3 = cq.getRotation();
-        final Vec3 cvl4 = cq.getAnchor().apply(cq);
-        final float float5 = Mth.cos((cvk3.y + 90.0f) * 0.017453292f);
-        final float float6 = Mth.sin((cvk3.y + 90.0f) * 0.017453292f);
-        final float float7 = Mth.cos(-cvk3.x * 0.017453292f);
-        final float float8 = Mth.sin(-cvk3.x * 0.017453292f);
-        final float float9 = Mth.cos((-cvk3.x + 90.0f) * 0.017453292f);
-        final float float10 = Mth.sin((-cvk3.x + 90.0f) * 0.017453292f);
-        final Vec3 cvl5 = new Vec3(float5 * float7, float8, float6 * float7);
-        final Vec3 cvl6 = new Vec3(float5 * float9, float10, float6 * float9);
-        final Vec3 cvl7 = cvl5.cross(cvl6).scale(-1.0);
-        final double double14 = cvl5.x * this.forwards + cvl6.x * this.up + cvl7.x * this.left;
-        final double double15 = cvl5.y * this.forwards + cvl6.y * this.up + cvl7.y * this.left;
-        final double double16 = cvl5.z * this.forwards + cvl6.z * this.up + cvl7.z * this.left;
-        return new Vec3(cvl4.x + double14, cvl4.y + double15, cvl4.z + double16);
+    public Vec3 getPosition(final CommandSourceStack cz) {
+        final Vec2 del3 = cz.getRotation();
+        final Vec3 dem4 = cz.getAnchor().apply(cz);
+        final float float5 = Mth.cos((del3.y + 90.0f) * 0.017453292f);
+        final float float6 = Mth.sin((del3.y + 90.0f) * 0.017453292f);
+        final float float7 = Mth.cos(-del3.x * 0.017453292f);
+        final float float8 = Mth.sin(-del3.x * 0.017453292f);
+        final float float9 = Mth.cos((-del3.x + 90.0f) * 0.017453292f);
+        final float float10 = Mth.sin((-del3.x + 90.0f) * 0.017453292f);
+        final Vec3 dem5 = new Vec3(float5 * float7, float8, float6 * float7);
+        final Vec3 dem6 = new Vec3(float5 * float9, float10, float6 * float9);
+        final Vec3 dem7 = dem5.cross(dem6).scale(-1.0);
+        final double double14 = dem5.x * this.forwards + dem6.x * this.up + dem7.x * this.left;
+        final double double15 = dem5.y * this.forwards + dem6.y * this.up + dem7.y * this.left;
+        final double double16 = dem5.z * this.forwards + dem6.z * this.up + dem7.z * this.left;
+        return new Vec3(dem4.x + double14, dem4.y + double15, dem4.z + double16);
     }
     
     @Override
-    public Vec2 getRotation(final CommandSourceStack cq) {
+    public Vec2 getRotation(final CommandSourceStack cz) {
         return Vec2.ZERO;
     }
     
@@ -97,8 +97,8 @@ public class LocalCoordinates implements Coordinates {
         if (!(object instanceof LocalCoordinates)) {
             return false;
         }
-        final LocalCoordinates ea3 = (LocalCoordinates)object;
-        return this.left == ea3.left && this.up == ea3.up && this.forwards == ea3.forwards;
+        final LocalCoordinates ek3 = (LocalCoordinates)object;
+        return this.left == ek3.left && this.up == ek3.up && this.forwards == ek3.forwards;
     }
     
     @Override
diff --git a/src/net/minecraft/commands/arguments/coordinates/RotationArgument.java b/src/net/minecraft/commands/arguments/coordinates/RotationArgument.java
index e2ad9a6..00771fa 100644
--- a/src/net/minecraft/commands/arguments/coordinates/RotationArgument.java
+++ b/src/net/minecraft/commands/arguments/coordinates/RotationArgument.java
@@ -29,14 +29,14 @@ public class RotationArgument implements ArgumentType<Coordinates> {
         if (!stringReader.canRead()) {
             throw RotationArgument.ERROR_NOT_COMPLETE.createWithContext((ImmutableStringReader)stringReader);
         }
-        final WorldCoordinate ef4 = WorldCoordinate.parseDouble(stringReader, false);
+        final WorldCoordinate ep4 = WorldCoordinate.parseDouble(stringReader, false);
         if (!stringReader.canRead() || stringReader.peek() != ' ') {
             stringReader.setCursor(integer3);
             throw RotationArgument.ERROR_NOT_COMPLETE.createWithContext((ImmutableStringReader)stringReader);
         }
         stringReader.skip();
-        final WorldCoordinate ef5 = WorldCoordinate.parseDouble(stringReader, false);
-        return new WorldCoordinates(ef5, ef4, new WorldCoordinate(true, 0.0));
+        final WorldCoordinate ep5 = WorldCoordinate.parseDouble(stringReader, false);
+        return new WorldCoordinates(ep5, ep4, new WorldCoordinate(true, 0.0));
     }
     
     public Collection<String> getExamples() {
@@ -45,6 +45,6 @@ public class RotationArgument implements ArgumentType<Coordinates> {
     
     static {
         EXAMPLES = Arrays.<String>asList("0 0", "~ ~", "~-5 ~5");
-        ERROR_NOT_COMPLETE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.rotation.incomplete", new Object[0]));
+        ERROR_NOT_COMPLETE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.rotation.incomplete"));
     }
 }
diff --git a/src/net/minecraft/commands/arguments/coordinates/SwizzleArgument.java b/src/net/minecraft/commands/arguments/coordinates/SwizzleArgument.java
index f0e6b7a..d9ae09b 100644
--- a/src/net/minecraft/commands/arguments/coordinates/SwizzleArgument.java
+++ b/src/net/minecraft/commands/arguments/coordinates/SwizzleArgument.java
@@ -61,6 +61,6 @@ public class SwizzleArgument implements ArgumentType<EnumSet<Direction.Axis>> {
     
     static {
         EXAMPLES = Arrays.<String>asList("xyz", "x");
-        ERROR_INVALID = new SimpleCommandExceptionType((Message)new TranslatableComponent("arguments.swizzle.invalid", new Object[0]));
+        ERROR_INVALID = new SimpleCommandExceptionType((Message)new TranslatableComponent("arguments.swizzle.invalid"));
     }
 }
diff --git a/src/net/minecraft/commands/arguments/coordinates/Vec2Argument.java b/src/net/minecraft/commands/arguments/coordinates/Vec2Argument.java
index 3b3aba4..3d7eadc 100644
--- a/src/net/minecraft/commands/arguments/coordinates/Vec2Argument.java
+++ b/src/net/minecraft/commands/arguments/coordinates/Vec2Argument.java
@@ -34,8 +34,8 @@ public class Vec2Argument implements ArgumentType<Coordinates> {
     }
     
     public static Vec2 getVec2(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
-        final Vec3 cvl3 = ((Coordinates)commandContext.getArgument(string, (Class)Coordinates.class)).getPosition((CommandSourceStack)commandContext.getSource());
-        return new Vec2((float)cvl3.x, (float)cvl3.z);
+        final Vec3 dem3 = ((Coordinates)commandContext.getArgument(string, (Class)Coordinates.class)).getPosition((CommandSourceStack)commandContext.getSource());
+        return new Vec2((float)dem3.x, (float)dem3.z);
     }
     
     public Coordinates parse(final StringReader stringReader) throws CommandSyntaxException {
@@ -43,14 +43,14 @@ public class Vec2Argument implements ArgumentType<Coordinates> {
         if (!stringReader.canRead()) {
             throw Vec2Argument.ERROR_NOT_COMPLETE.createWithContext((ImmutableStringReader)stringReader);
         }
-        final WorldCoordinate ef4 = WorldCoordinate.parseDouble(stringReader, this.centerCorrect);
+        final WorldCoordinate ep4 = WorldCoordinate.parseDouble(stringReader, this.centerCorrect);
         if (!stringReader.canRead() || stringReader.peek() != ' ') {
             stringReader.setCursor(integer3);
             throw Vec2Argument.ERROR_NOT_COMPLETE.createWithContext((ImmutableStringReader)stringReader);
         }
         stringReader.skip();
-        final WorldCoordinate ef5 = WorldCoordinate.parseDouble(stringReader, this.centerCorrect);
-        return new WorldCoordinates(ef4, new WorldCoordinate(true, 0.0), ef5);
+        final WorldCoordinate ep5 = WorldCoordinate.parseDouble(stringReader, this.centerCorrect);
+        return new WorldCoordinates(ep4, new WorldCoordinate(true, 0.0), ep5);
     }
     
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
@@ -74,6 +74,6 @@ public class Vec2Argument implements ArgumentType<Coordinates> {
     
     static {
         EXAMPLES = Arrays.<String>asList("0 0", "~ ~", "0.1 -0.5", "~1 ~-2");
-        ERROR_NOT_COMPLETE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos2d.incomplete", new Object[0]));
+        ERROR_NOT_COMPLETE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos2d.incomplete"));
     }
 }
diff --git a/src/net/minecraft/commands/arguments/coordinates/Vec3Argument.java b/src/net/minecraft/commands/arguments/coordinates/Vec3Argument.java
index 6f8f9a2..8c86e90 100644
--- a/src/net/minecraft/commands/arguments/coordinates/Vec3Argument.java
+++ b/src/net/minecraft/commands/arguments/coordinates/Vec3Argument.java
@@ -72,7 +72,7 @@ public class Vec3Argument implements ArgumentType<Coordinates> {
     
     static {
         EXAMPLES = Arrays.<String>asList("0 0 0", "~ ~ ~", "^ ^ ^", "^1 ^ ^-5", "0.1 -0.5 .9", "~0.5 ~1 ~-5");
-        ERROR_NOT_COMPLETE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos3d.incomplete", new Object[0]));
-        ERROR_MIXED_TYPE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos.mixed", new Object[0]));
+        ERROR_NOT_COMPLETE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos3d.incomplete"));
+        ERROR_MIXED_TYPE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos.mixed"));
     }
 }
diff --git a/src/net/minecraft/commands/arguments/coordinates/WorldCoordinate.java b/src/net/minecraft/commands/arguments/coordinates/WorldCoordinate.java
index f7ef66c..0ac3c5b 100644
--- a/src/net/minecraft/commands/arguments/coordinates/WorldCoordinate.java
+++ b/src/net/minecraft/commands/arguments/coordinates/WorldCoordinate.java
@@ -83,8 +83,8 @@ public class WorldCoordinate {
         if (!(object instanceof WorldCoordinate)) {
             return false;
         }
-        final WorldCoordinate ef3 = (WorldCoordinate)object;
-        return this.relative == ef3.relative && Double.compare(ef3.value, this.value) == 0;
+        final WorldCoordinate ep3 = (WorldCoordinate)object;
+        return this.relative == ep3.relative && Double.compare(ep3.value, this.value) == 0;
     }
     
     @Override
@@ -100,7 +100,7 @@ public class WorldCoordinate {
     }
     
     static {
-        ERROR_EXPECTED_DOUBLE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos.missing.double", new Object[0]));
-        ERROR_EXPECTED_INT = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos.missing.int", new Object[0]));
+        ERROR_EXPECTED_DOUBLE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos.missing.double"));
+        ERROR_EXPECTED_INT = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.pos.missing.int"));
     }
 }
diff --git a/src/net/minecraft/commands/arguments/coordinates/WorldCoordinates.java b/src/net/minecraft/commands/arguments/coordinates/WorldCoordinates.java
index 9a9fa4b..604d98d 100644
--- a/src/net/minecraft/commands/arguments/coordinates/WorldCoordinates.java
+++ b/src/net/minecraft/commands/arguments/coordinates/WorldCoordinates.java
@@ -12,22 +12,22 @@ public class WorldCoordinates implements Coordinates {
     private final WorldCoordinate y;
     private final WorldCoordinate z;
     
-    public WorldCoordinates(final WorldCoordinate ef1, final WorldCoordinate ef2, final WorldCoordinate ef3) {
-        this.x = ef1;
-        this.y = ef2;
-        this.z = ef3;
+    public WorldCoordinates(final WorldCoordinate ep1, final WorldCoordinate ep2, final WorldCoordinate ep3) {
+        this.x = ep1;
+        this.y = ep2;
+        this.z = ep3;
     }
     
     @Override
-    public Vec3 getPosition(final CommandSourceStack cq) {
-        final Vec3 cvl3 = cq.getPosition();
-        return new Vec3(this.x.get(cvl3.x), this.y.get(cvl3.y), this.z.get(cvl3.z));
+    public Vec3 getPosition(final CommandSourceStack cz) {
+        final Vec3 dem3 = cz.getPosition();
+        return new Vec3(this.x.get(dem3.x), this.y.get(dem3.y), this.z.get(dem3.z));
     }
     
     @Override
-    public Vec2 getRotation(final CommandSourceStack cq) {
-        final Vec2 cvk3 = cq.getRotation();
-        return new Vec2((float)this.x.get(cvk3.x), (float)this.y.get(cvk3.y));
+    public Vec2 getRotation(final CommandSourceStack cz) {
+        final Vec2 del3 = cz.getRotation();
+        return new Vec2((float)this.x.get(del3.x), (float)this.y.get(del3.y));
     }
     
     @Override
@@ -53,44 +53,44 @@ public class WorldCoordinates implements Coordinates {
         if (!(object instanceof WorldCoordinates)) {
             return false;
         }
-        final WorldCoordinates eg3 = (WorldCoordinates)object;
-        return this.x.equals(eg3.x) && this.y.equals(eg3.y) && this.z.equals(eg3.z);
+        final WorldCoordinates eq3 = (WorldCoordinates)object;
+        return this.x.equals(eq3.x) && this.y.equals(eq3.y) && this.z.equals(eq3.z);
     }
     
     public static WorldCoordinates parseInt(final StringReader stringReader) throws CommandSyntaxException {
         final int integer2 = stringReader.getCursor();
-        final WorldCoordinate ef3 = WorldCoordinate.parseInt(stringReader);
+        final WorldCoordinate ep3 = WorldCoordinate.parseInt(stringReader);
         if (!stringReader.canRead() || stringReader.peek() != ' ') {
             stringReader.setCursor(integer2);
             throw Vec3Argument.ERROR_NOT_COMPLETE.createWithContext((ImmutableStringReader)stringReader);
         }
         stringReader.skip();
-        final WorldCoordinate ef4 = WorldCoordinate.parseInt(stringReader);
+        final WorldCoordinate ep4 = WorldCoordinate.parseInt(stringReader);
         if (!stringReader.canRead() || stringReader.peek() != ' ') {
             stringReader.setCursor(integer2);
             throw Vec3Argument.ERROR_NOT_COMPLETE.createWithContext((ImmutableStringReader)stringReader);
         }
         stringReader.skip();
-        final WorldCoordinate ef5 = WorldCoordinate.parseInt(stringReader);
-        return new WorldCoordinates(ef3, ef4, ef5);
+        final WorldCoordinate ep5 = WorldCoordinate.parseInt(stringReader);
+        return new WorldCoordinates(ep3, ep4, ep5);
     }
     
     public static WorldCoordinates parseDouble(final StringReader stringReader, final boolean boolean2) throws CommandSyntaxException {
         final int integer3 = stringReader.getCursor();
-        final WorldCoordinate ef4 = WorldCoordinate.parseDouble(stringReader, boolean2);
+        final WorldCoordinate ep4 = WorldCoordinate.parseDouble(stringReader, boolean2);
         if (!stringReader.canRead() || stringReader.peek() != ' ') {
             stringReader.setCursor(integer3);
             throw Vec3Argument.ERROR_NOT_COMPLETE.createWithContext((ImmutableStringReader)stringReader);
         }
         stringReader.skip();
-        final WorldCoordinate ef5 = WorldCoordinate.parseDouble(stringReader, false);
+        final WorldCoordinate ep5 = WorldCoordinate.parseDouble(stringReader, false);
         if (!stringReader.canRead() || stringReader.peek() != ' ') {
             stringReader.setCursor(integer3);
             throw Vec3Argument.ERROR_NOT_COMPLETE.createWithContext((ImmutableStringReader)stringReader);
         }
         stringReader.skip();
-        final WorldCoordinate ef6 = WorldCoordinate.parseDouble(stringReader, boolean2);
-        return new WorldCoordinates(ef4, ef5, ef6);
+        final WorldCoordinate ep6 = WorldCoordinate.parseDouble(stringReader, boolean2);
+        return new WorldCoordinates(ep4, ep5, ep6);
     }
     
     public static WorldCoordinates current() {
diff --git a/src/net/minecraft/commands/arguments/item/FunctionArgument.java b/src/net/minecraft/commands/arguments/item/FunctionArgument.java
index fcdb95d..8461074 100644
--- a/src/net/minecraft/commands/arguments/item/FunctionArgument.java
+++ b/src/net/minecraft/commands/arguments/item/FunctionArgument.java
@@ -5,6 +5,7 @@ import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.brigadier.Message;
 import java.util.Collections;
 import com.mojang.datafixers.util.Either;
+import com.mojang.datafixers.util.Pair;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.tags.Tag;
 import net.minecraft.commands.CommandFunction;
@@ -28,51 +29,51 @@ public class FunctionArgument implements ArgumentType<Result> {
     public Result parse(final StringReader stringReader) throws CommandSyntaxException {
         if (stringReader.canRead() && stringReader.peek() == '#') {
             stringReader.skip();
-            final ResourceLocation sm3 = ResourceLocation.read(stringReader);
+            final ResourceLocation uh3 = ResourceLocation.read(stringReader);
             return new Result() {
                 @Override
                 public Collection<CommandFunction> create(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
-                    final Tag<CommandFunction> aaz3 = getFunctionTag(commandContext, sm3);
-                    return aaz3.getValues();
+                    final Tag<CommandFunction> adf3 = getFunctionTag(commandContext, uh3);
+                    return adf3.getValues();
                 }
                 
                 @Override
-                public Either<CommandFunction, Tag<CommandFunction>> unwrap(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
-                    return (Either<CommandFunction, Tag<CommandFunction>>)Either.right(getFunctionTag(commandContext, sm3));
+                public Pair<ResourceLocation, Either<CommandFunction, Tag<CommandFunction>>> unwrap(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
+                    return (Pair<ResourceLocation, Either<CommandFunction, Tag<CommandFunction>>>)Pair.of(uh3, Either.right((Object)getFunctionTag(commandContext, uh3)));
                 }
             };
         }
-        final ResourceLocation sm3 = ResourceLocation.read(stringReader);
+        final ResourceLocation uh3 = ResourceLocation.read(stringReader);
         return new Result() {
             @Override
             public Collection<CommandFunction> create(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
-                return Collections.<CommandFunction>singleton(getFunction(commandContext, sm3));
+                return Collections.<CommandFunction>singleton(getFunction(commandContext, uh3));
             }
             
             @Override
-            public Either<CommandFunction, Tag<CommandFunction>> unwrap(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
-                return (Either<CommandFunction, Tag<CommandFunction>>)Either.left(getFunction(commandContext, sm3));
+            public Pair<ResourceLocation, Either<CommandFunction, Tag<CommandFunction>>> unwrap(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
+                return (Pair<ResourceLocation, Either<CommandFunction, Tag<CommandFunction>>>)Pair.of(uh3, Either.left((Object)getFunction(commandContext, uh3)));
             }
         };
     }
     
-    private static CommandFunction getFunction(final CommandContext<CommandSourceStack> commandContext, final ResourceLocation sm) throws CommandSyntaxException {
-        return ((CommandSourceStack)commandContext.getSource()).getServer().getFunctions().get(sm).<Throwable>orElseThrow(() -> FunctionArgument.ERROR_UNKNOWN_FUNCTION.create(sm.toString()));
+    private static CommandFunction getFunction(final CommandContext<CommandSourceStack> commandContext, final ResourceLocation uh) throws CommandSyntaxException {
+        return ((CommandSourceStack)commandContext.getSource()).getServer().getFunctions().get(uh).<Throwable>orElseThrow(() -> FunctionArgument.ERROR_UNKNOWN_FUNCTION.create(uh.toString()));
     }
     
-    private static Tag<CommandFunction> getFunctionTag(final CommandContext<CommandSourceStack> commandContext, final ResourceLocation sm) throws CommandSyntaxException {
-        final Tag<CommandFunction> aaz3 = ((CommandSourceStack)commandContext.getSource()).getServer().getFunctions().getTags().getTag(sm);
-        if (aaz3 == null) {
-            throw FunctionArgument.ERROR_UNKNOWN_TAG.create(sm.toString());
+    private static Tag<CommandFunction> getFunctionTag(final CommandContext<CommandSourceStack> commandContext, final ResourceLocation uh) throws CommandSyntaxException {
+        final Tag<CommandFunction> adf3 = ((CommandSourceStack)commandContext.getSource()).getServer().getFunctions().getTag(uh);
+        if (adf3 == null) {
+            throw FunctionArgument.ERROR_UNKNOWN_TAG.create(uh.toString());
         }
-        return aaz3;
+        return adf3;
     }
     
     public static Collection<CommandFunction> getFunctions(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
         return ((Result)commandContext.getArgument(string, (Class)Result.class)).create(commandContext);
     }
     
-    public static Either<CommandFunction, Tag<CommandFunction>> getFunctionOrTag(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
+    public static Pair<ResourceLocation, Either<CommandFunction, Tag<CommandFunction>>> getFunctionOrTag(final CommandContext<CommandSourceStack> commandContext, final String string) throws CommandSyntaxException {
         return ((Result)commandContext.getArgument(string, (Class)Result.class)).unwrap(commandContext);
     }
     
@@ -97,6 +98,6 @@ public class FunctionArgument implements ArgumentType<Result> {
     public interface Result {
         Collection<CommandFunction> create(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException;
         
-        Either<CommandFunction, Tag<CommandFunction>> unwrap(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException;
+        Pair<ResourceLocation, Either<CommandFunction, Tag<CommandFunction>>> unwrap(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException;
     }
 }
diff --git a/src/net/minecraft/commands/arguments/item/ItemArgument.java b/src/net/minecraft/commands/arguments/item/ItemArgument.java
index 89119d3..ad1901e 100644
--- a/src/net/minecraft/commands/arguments/item/ItemArgument.java
+++ b/src/net/minecraft/commands/arguments/item/ItemArgument.java
@@ -1,6 +1,7 @@
 package net.minecraft.commands.arguments.item;
 
 import java.util.Arrays;
+import net.minecraft.tags.ItemTags;
 import com.mojang.brigadier.suggestion.Suggestions;
 import java.util.concurrent.CompletableFuture;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
@@ -18,8 +19,8 @@ public class ItemArgument implements ArgumentType<ItemInput> {
     }
     
     public ItemInput parse(final StringReader stringReader) throws CommandSyntaxException {
-        final ItemParser el3 = new ItemParser(stringReader, false).parse();
-        return new ItemInput(el3.getItem(), el3.getNbt());
+        final ItemParser ev3 = new ItemParser(stringReader, false).parse();
+        return new ItemInput(ev3.getItem(), ev3.getNbt());
     }
     
     public static <S> ItemInput getItem(final CommandContext<S> commandContext, final String string) {
@@ -29,12 +30,12 @@ public class ItemArgument implements ArgumentType<ItemInput> {
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
         final StringReader stringReader4 = new StringReader(suggestionsBuilder.getInput());
         stringReader4.setCursor(suggestionsBuilder.getStart());
-        final ItemParser el5 = new ItemParser(stringReader4, false);
+        final ItemParser ev5 = new ItemParser(stringReader4, false);
         try {
-            el5.parse();
+            ev5.parse();
         }
         catch (CommandSyntaxException ex) {}
-        return el5.fillSuggestions(suggestionsBuilder);
+        return ev5.fillSuggestions(suggestionsBuilder, ItemTags.getAllTags());
     }
     
     public Collection<String> getExamples() {
diff --git a/src/net/minecraft/commands/arguments/item/ItemInput.java b/src/net/minecraft/commands/arguments/item/ItemInput.java
index 3e2d367..98d64e4 100644
--- a/src/net/minecraft/commands/arguments/item/ItemInput.java
+++ b/src/net/minecraft/commands/arguments/item/ItemInput.java
@@ -20,9 +20,9 @@ public class ItemInput implements Predicate<ItemStack> {
     @Nullable
     private final CompoundTag tag;
     
-    public ItemInput(final Item bei, @Nullable final CompoundTag jt) {
-        this.item = bei;
-        this.tag = jt;
+    public ItemInput(final Item bke, @Nullable final CompoundTag le) {
+        this.item = bke;
+        this.tag = le;
     }
     
     public Item getItem() {
@@ -30,19 +30,19 @@ public class ItemInput implements Predicate<ItemStack> {
     }
     
     @Override
-    public boolean test(final ItemStack ben) {
-        return ben.getItem() == this.item && NbtUtils.compareNbt(this.tag, ben.getTag(), true);
+    public boolean test(final ItemStack bki) {
+        return bki.getItem() == this.item && NbtUtils.compareNbt(this.tag, bki.getTag(), true);
     }
     
     public ItemStack createItemStack(final int integer, final boolean boolean2) throws CommandSyntaxException {
-        final ItemStack ben4 = new ItemStack(this.item, integer);
+        final ItemStack bki4 = new ItemStack(this.item, integer);
         if (this.tag != null) {
-            ben4.setTag(this.tag);
+            bki4.setTag(this.tag);
         }
-        if (boolean2 && integer > ben4.getMaxStackSize()) {
-            throw ItemInput.ERROR_STACK_TOO_BIG.create(Registry.ITEM.getKey(this.item), ben4.getMaxStackSize());
+        if (boolean2 && integer > bki4.getMaxStackSize()) {
+            throw ItemInput.ERROR_STACK_TOO_BIG.create(Registry.ITEM.getKey(this.item), bki4.getMaxStackSize());
         }
-        return ben4;
+        return bki4;
     }
     
     public String serialize() {
diff --git a/src/net/minecraft/commands/arguments/item/ItemParser.java b/src/net/minecraft/commands/arguments/item/ItemParser.java
index 6c5b8b1..f278b27 100644
--- a/src/net/minecraft/commands/arguments/item/ItemParser.java
+++ b/src/net/minecraft/commands/arguments/item/ItemParser.java
@@ -3,7 +3,6 @@ package net.minecraft.commands.arguments.item;
 import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.brigadier.Message;
 import net.minecraft.commands.SharedSuggestionProvider;
-import net.minecraft.tags.ItemTags;
 import net.minecraft.nbt.TagParser;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.ImmutableStringReader;
@@ -12,21 +11,22 @@ import com.google.common.collect.Maps;
 import net.minecraft.resources.ResourceLocation;
 import javax.annotation.Nullable;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.state.properties.Property;
 import java.util.Map;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.suggestion.Suggestions;
 import java.util.concurrent.CompletableFuture;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.TagCollection;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import java.util.function.Function;
+import java.util.function.BiFunction;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 
 public class ItemParser {
     public static final SimpleCommandExceptionType ERROR_NO_TAGS_ALLOWED;
     public static final DynamicCommandExceptionType ERROR_UNKNOWN_ITEM;
-    private static final Function<SuggestionsBuilder, CompletableFuture<Suggestions>> SUGGEST_NOTHING;
+    private static final BiFunction<SuggestionsBuilder, TagCollection<Item>, CompletableFuture<Suggestions>> SUGGEST_NOTHING;
     private final StringReader reader;
     private final boolean forTesting;
     private final Map<Property<?>, Comparable<?>> properties;
@@ -35,7 +35,7 @@ public class ItemParser {
     private CompoundTag nbt;
     private ResourceLocation tag;
     private int tagCursor;
-    private Function<SuggestionsBuilder, CompletableFuture<Suggestions>> suggestions;
+    private BiFunction<SuggestionsBuilder, TagCollection<Item>, CompletableFuture<Suggestions>> suggestions;
     
     public ItemParser(final StringReader stringReader, final boolean boolean2) {
         this.properties = Maps.newHashMap();
@@ -60,10 +60,10 @@ public class ItemParser {
     
     public void readItem() throws CommandSyntaxException {
         final int integer2 = this.reader.getCursor();
-        final ResourceLocation sm3 = ResourceLocation.read(this.reader);
+        final ResourceLocation uh3 = ResourceLocation.read(this.reader);
         final int cursor;
         final ResourceLocation resourceLocation;
-        this.item = Registry.ITEM.getOptional(sm3).<Throwable>orElseThrow(() -> {
+        this.item = Registry.ITEM.getOptional(uh3).<Throwable>orElseThrow(() -> {
             this.reader.setCursor(cursor);
             return ItemParser.ERROR_UNKNOWN_ITEM.createWithContext((ImmutableStringReader)this.reader, resourceLocation.toString());
         });
@@ -99,35 +99,35 @@ public class ItemParser {
         return this;
     }
     
-    private CompletableFuture<Suggestions> suggestOpenNbt(final SuggestionsBuilder suggestionsBuilder) {
+    private CompletableFuture<Suggestions> suggestOpenNbt(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Item> adg) {
         if (suggestionsBuilder.getRemaining().isEmpty()) {
             suggestionsBuilder.suggest(String.valueOf('{'));
         }
         return (CompletableFuture<Suggestions>)suggestionsBuilder.buildFuture();
     }
     
-    private CompletableFuture<Suggestions> suggestTag(final SuggestionsBuilder suggestionsBuilder) {
-        return SharedSuggestionProvider.suggestResource(ItemTags.getAllTags().getAvailableTags(), suggestionsBuilder.createOffset(this.tagCursor));
+    private CompletableFuture<Suggestions> suggestTag(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Item> adg) {
+        return SharedSuggestionProvider.suggestResource(adg.getAvailableTags(), suggestionsBuilder.createOffset(this.tagCursor));
     }
     
-    private CompletableFuture<Suggestions> suggestItemIdOrTag(final SuggestionsBuilder suggestionsBuilder) {
+    private CompletableFuture<Suggestions> suggestItemIdOrTag(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Item> adg) {
         if (this.forTesting) {
-            SharedSuggestionProvider.suggestResource(ItemTags.getAllTags().getAvailableTags(), suggestionsBuilder, String.valueOf('#'));
+            SharedSuggestionProvider.suggestResource(adg.getAvailableTags(), suggestionsBuilder, String.valueOf('#'));
         }
         return SharedSuggestionProvider.suggestResource(Registry.ITEM.keySet(), suggestionsBuilder);
     }
     
-    public CompletableFuture<Suggestions> fillSuggestions(final SuggestionsBuilder suggestionsBuilder) {
-        return this.suggestions.apply(suggestionsBuilder.createOffset(this.reader.getCursor()));
+    public CompletableFuture<Suggestions> fillSuggestions(final SuggestionsBuilder suggestionsBuilder, final TagCollection<Item> adg) {
+        return this.suggestions.apply(suggestionsBuilder.createOffset(this.reader.getCursor()), adg);
     }
     
     static {
-        ERROR_NO_TAGS_ALLOWED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.item.tag.disallowed", new Object[0]));
+        ERROR_NO_TAGS_ALLOWED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.item.tag.disallowed"));
         final TranslatableComponent translatableComponent;
         ERROR_UNKNOWN_ITEM = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("argument.item.id.invalid", new Object[] { object });
             return translatableComponent;
         });
-        SUGGEST_NOTHING = SuggestionsBuilder::buildFuture;
+        SUGGEST_NOTHING = ((suggestionsBuilder, adg) -> suggestionsBuilder.buildFuture());
     }
 }
diff --git a/src/net/minecraft/commands/arguments/item/ItemPredicateArgument.java b/src/net/minecraft/commands/arguments/item/ItemPredicateArgument.java
index d292c5b..a90fd3a 100644
--- a/src/net/minecraft/commands/arguments/item/ItemPredicateArgument.java
+++ b/src/net/minecraft/commands/arguments/item/ItemPredicateArgument.java
@@ -6,6 +6,7 @@ import net.minecraft.nbt.CompoundTag;
 import java.util.Arrays;
 import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.brigadier.Message;
+import net.minecraft.tags.ItemTags;
 import com.mojang.brigadier.suggestion.Suggestions;
 import java.util.concurrent.CompletableFuture;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
@@ -31,22 +32,22 @@ public class ItemPredicateArgument implements ArgumentType<Result> {
     }
     
     public Result parse(final StringReader stringReader) throws CommandSyntaxException {
-        final ItemParser el3 = new ItemParser(stringReader, true).parse();
-        if (el3.getItem() != null) {
-            final ItemPredicate a4 = new ItemPredicate(el3.getItem(), el3.getNbt());
+        final ItemParser ev3 = new ItemParser(stringReader, true).parse();
+        if (ev3.getItem() != null) {
+            final ItemPredicate a4 = new ItemPredicate(ev3.getItem(), ev3.getNbt());
             return commandContext -> a4;
         }
-        final ResourceLocation sm4 = el3.getTag();
-        final ResourceLocation sm5;
-        final Tag<Object> aaz4;
+        final ResourceLocation uh4 = ev3.getTag();
+        final ResourceLocation uh5;
+        final Tag<Object> adf4;
         final ItemParser itemParser;
         return commandContext -> {
-            aaz4 = (Tag<Object>)((CommandSourceStack)commandContext.getSource()).getServer().getTags().getItems().getTag(sm5);
-            if (aaz4 == null) {
-                throw ItemPredicateArgument.ERROR_UNKNOWN_TAG.create(sm5.toString());
+            adf4 = (Tag<Object>)((CommandSourceStack)commandContext.getSource()).getServer().getTags().getItems().getTag(uh5);
+            if (adf4 == null) {
+                throw ItemPredicateArgument.ERROR_UNKNOWN_TAG.create(uh5.toString());
             }
             else {
-                return new TagPredicate((Tag<Item>)aaz4, itemParser.getNbt());
+                return new TagPredicate((Tag<Item>)adf4, itemParser.getNbt());
             }
         };
     }
@@ -58,12 +59,12 @@ public class ItemPredicateArgument implements ArgumentType<Result> {
     public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> commandContext, final SuggestionsBuilder suggestionsBuilder) {
         final StringReader stringReader4 = new StringReader(suggestionsBuilder.getInput());
         stringReader4.setCursor(suggestionsBuilder.getStart());
-        final ItemParser el5 = new ItemParser(stringReader4, true);
+        final ItemParser ev5 = new ItemParser(stringReader4, true);
         try {
-            el5.parse();
+            ev5.parse();
         }
         catch (CommandSyntaxException ex) {}
-        return el5.fillSuggestions(suggestionsBuilder);
+        return ev5.fillSuggestions(suggestionsBuilder, ItemTags.getAllTags());
     }
     
     public Collection<String> getExamples() {
@@ -84,14 +85,14 @@ public class ItemPredicateArgument implements ArgumentType<Result> {
         @Nullable
         private final CompoundTag nbt;
         
-        public ItemPredicate(final Item bei, @Nullable final CompoundTag jt) {
-            this.item = bei;
-            this.nbt = jt;
+        public ItemPredicate(final Item bke, @Nullable final CompoundTag le) {
+            this.item = bke;
+            this.nbt = le;
         }
         
         @Override
-        public boolean test(final ItemStack ben) {
-            return ben.getItem() == this.item && NbtUtils.compareNbt(this.nbt, ben.getTag(), true);
+        public boolean test(final ItemStack bki) {
+            return bki.getItem() == this.item && NbtUtils.compareNbt(this.nbt, bki.getTag(), true);
         }
     }
     
@@ -100,14 +101,14 @@ public class ItemPredicateArgument implements ArgumentType<Result> {
         @Nullable
         private final CompoundTag nbt;
         
-        public TagPredicate(final Tag<Item> aaz, @Nullable final CompoundTag jt) {
-            this.tag = aaz;
-            this.nbt = jt;
+        public TagPredicate(final Tag<Item> adf, @Nullable final CompoundTag le) {
+            this.tag = adf;
+            this.nbt = le;
         }
         
         @Override
-        public boolean test(final ItemStack ben) {
-            return this.tag.contains(ben.getItem()) && NbtUtils.compareNbt(this.nbt, ben.getTag(), true);
+        public boolean test(final ItemStack bki) {
+            return this.tag.contains(bki.getItem()) && NbtUtils.compareNbt(this.nbt, bki.getTag(), true);
         }
     }
     
diff --git a/src/net/minecraft/commands/arguments/selector/EntitySelector.java b/src/net/minecraft/commands/arguments/selector/EntitySelector.java
index 0c2c5f4..4867e84 100644
--- a/src/net/minecraft/commands/arguments/selector/EntitySelector.java
+++ b/src/net/minecraft/commands/arguments/selector/EntitySelector.java
@@ -1,7 +1,7 @@
 package net.minecraft.commands.arguments.selector;
 
 import net.minecraft.network.chat.ComponentUtils;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import java.util.Collection;
 import java.util.Iterator;
 import net.minecraft.server.level.ServerLevel;
@@ -42,19 +42,19 @@ public class EntitySelector {
     private final EntityType<?> type;
     private final boolean usesSelector;
     
-    public EntitySelector(final int integer, final boolean boolean2, final boolean boolean3, final Predicate<Entity> predicate, final MinMaxBounds.Floats c, final Function<Vec3, Vec3> function, @Nullable final AABB cvf, final BiConsumer<Vec3, List<? extends Entity>> biConsumer, final boolean boolean9, @Nullable final String string, @Nullable final UUID uUID, @Nullable final EntityType<?> aku, final boolean boolean13) {
+    public EntitySelector(final int integer, final boolean boolean2, final boolean boolean3, final Predicate<Entity> predicate, final MinMaxBounds.Floats c, final Function<Vec3, Vec3> function, @Nullable final AABB deg, final BiConsumer<Vec3, List<? extends Entity>> biConsumer, final boolean boolean9, @Nullable final String string, @Nullable final UUID uUID, @Nullable final EntityType<?> aoq, final boolean boolean13) {
         this.maxResults = integer;
         this.includesEntities = boolean2;
         this.worldLimited = boolean3;
         this.predicate = predicate;
         this.range = c;
         this.position = function;
-        this.aabb = cvf;
+        this.aabb = deg;
         this.order = biConsumer;
         this.currentEntity = boolean9;
         this.playerName = string;
         this.entityUUID = uUID;
-        this.type = aku;
+        this.type = aoq;
         this.usesSelector = boolean13;
     }
     
@@ -74,15 +74,15 @@ public class EntitySelector {
         return this.worldLimited;
     }
     
-    private void checkPermissions(final CommandSourceStack cq) throws CommandSyntaxException {
-        if (this.usesSelector && !cq.hasPermission(2)) {
+    private void checkPermissions(final CommandSourceStack cz) throws CommandSyntaxException {
+        if (this.usesSelector && !cz.hasPermission(2)) {
             throw EntityArgument.ERROR_SELECTORS_NOT_ALLOWED.create();
         }
     }
     
-    public Entity findSingleEntity(final CommandSourceStack cq) throws CommandSyntaxException {
-        this.checkPermissions(cq);
-        final List<? extends Entity> list3 = this.findEntities(cq);
+    public Entity findSingleEntity(final CommandSourceStack cz) throws CommandSyntaxException {
+        this.checkPermissions(cz);
+        final List<? extends Entity> list3 = this.findEntities(cz);
         if (list3.isEmpty()) {
             throw EntityArgument.NO_ENTITIES_FOUND.create();
         }
@@ -92,131 +92,131 @@ public class EntitySelector {
         return (Entity)list3.get(0);
     }
     
-    public List<? extends Entity> findEntities(final CommandSourceStack cq) throws CommandSyntaxException {
-        this.checkPermissions(cq);
+    public List<? extends Entity> findEntities(final CommandSourceStack cz) throws CommandSyntaxException {
+        this.checkPermissions(cz);
         if (!this.includesEntities) {
-            return this.findPlayers(cq);
+            return this.findPlayers(cz);
         }
         if (this.playerName != null) {
-            final ServerPlayer xe3 = cq.getServer().getPlayerList().getPlayerByName(this.playerName);
-            if (xe3 == null) {
+            final ServerPlayer ze3 = cz.getServer().getPlayerList().getPlayerByName(this.playerName);
+            if (ze3 == null) {
                 return Collections.emptyList();
             }
-            return Lists.<ServerPlayer>newArrayList(xe3);
+            return Lists.<ServerPlayer>newArrayList(ze3);
         }
         else {
             if (this.entityUUID != null) {
-                for (final ServerLevel xd4 : cq.getServer().getAllLevels()) {
-                    final Entity akq5 = xd4.getEntity(this.entityUUID);
-                    if (akq5 != null) {
-                        return Lists.<Entity>newArrayList(akq5);
+                for (final ServerLevel zd4 : cz.getServer().getAllLevels()) {
+                    final Entity aom5 = zd4.getEntity(this.entityUUID);
+                    if (aom5 != null) {
+                        return Lists.<Entity>newArrayList(aom5);
                     }
                 }
                 return Collections.emptyList();
             }
-            final Vec3 cvl3 = this.position.apply(cq.getPosition());
-            final Predicate<Entity> predicate4 = this.getPredicate(cvl3);
+            final Vec3 dem3 = this.position.apply(cz.getPosition());
+            final Predicate<Entity> predicate4 = this.getPredicate(dem3);
             if (!this.currentEntity) {
                 final List<Entity> list5 = Lists.newArrayList();
                 if (this.isWorldLimited()) {
-                    this.addEntities(list5, cq.getLevel(), cvl3, predicate4);
+                    this.addEntities(list5, cz.getLevel(), dem3, predicate4);
                 }
                 else {
-                    for (final ServerLevel xd5 : cq.getServer().getAllLevels()) {
-                        this.addEntities(list5, xd5, cvl3, predicate4);
+                    for (final ServerLevel zd5 : cz.getServer().getAllLevels()) {
+                        this.addEntities(list5, zd5, dem3, predicate4);
                     }
                 }
-                return this.sortAndLimit(cvl3, list5);
+                return this.sortAndLimit(dem3, list5);
             }
-            if (cq.getEntity() != null && predicate4.test(cq.getEntity())) {
-                return Lists.<Entity>newArrayList(cq.getEntity());
+            if (cz.getEntity() != null && predicate4.test(cz.getEntity())) {
+                return Lists.<Entity>newArrayList(cz.getEntity());
             }
             return Collections.emptyList();
         }
     }
     
-    private void addEntities(final List<Entity> list, final ServerLevel xd, final Vec3 cvl, final Predicate<Entity> predicate) {
+    private void addEntities(final List<Entity> list, final ServerLevel zd, final Vec3 dem, final Predicate<Entity> predicate) {
         if (this.aabb != null) {
-            list.addAll(xd.getEntities(this.type, this.aabb.move(cvl), predicate));
+            list.addAll(zd.getEntities(this.type, this.aabb.move(dem), predicate));
         }
         else {
-            list.addAll(xd.getEntities(this.type, predicate));
+            list.addAll(zd.getEntities(this.type, predicate));
         }
     }
     
-    public ServerPlayer findSinglePlayer(final CommandSourceStack cq) throws CommandSyntaxException {
-        this.checkPermissions(cq);
-        final List<ServerPlayer> list3 = this.findPlayers(cq);
+    public ServerPlayer findSinglePlayer(final CommandSourceStack cz) throws CommandSyntaxException {
+        this.checkPermissions(cz);
+        final List<ServerPlayer> list3 = this.findPlayers(cz);
         if (list3.size() != 1) {
             throw EntityArgument.NO_PLAYERS_FOUND.create();
         }
         return list3.get(0);
     }
     
-    public List<ServerPlayer> findPlayers(final CommandSourceStack cq) throws CommandSyntaxException {
-        this.checkPermissions(cq);
+    public List<ServerPlayer> findPlayers(final CommandSourceStack cz) throws CommandSyntaxException {
+        this.checkPermissions(cz);
         if (this.playerName != null) {
-            final ServerPlayer xe3 = cq.getServer().getPlayerList().getPlayerByName(this.playerName);
-            if (xe3 == null) {
+            final ServerPlayer ze3 = cz.getServer().getPlayerList().getPlayerByName(this.playerName);
+            if (ze3 == null) {
                 return Collections.<ServerPlayer>emptyList();
             }
-            return Lists.<ServerPlayer>newArrayList(xe3);
+            return Lists.<ServerPlayer>newArrayList(ze3);
         }
         else if (this.entityUUID != null) {
-            final ServerPlayer xe3 = cq.getServer().getPlayerList().getPlayer(this.entityUUID);
-            if (xe3 == null) {
+            final ServerPlayer ze3 = cz.getServer().getPlayerList().getPlayer(this.entityUUID);
+            if (ze3 == null) {
                 return Collections.<ServerPlayer>emptyList();
             }
-            return Lists.<ServerPlayer>newArrayList(xe3);
+            return Lists.<ServerPlayer>newArrayList(ze3);
         }
         else {
-            final Vec3 cvl3 = this.position.apply(cq.getPosition());
-            final Predicate<Entity> predicate4 = this.getPredicate(cvl3);
+            final Vec3 dem3 = this.position.apply(cz.getPosition());
+            final Predicate<Entity> predicate4 = this.getPredicate(dem3);
             if (this.currentEntity) {
-                if (cq.getEntity() instanceof ServerPlayer) {
-                    final ServerPlayer xe4 = (ServerPlayer)cq.getEntity();
-                    if (predicate4.test(xe4)) {
-                        return Lists.<ServerPlayer>newArrayList(xe4);
+                if (cz.getEntity() instanceof ServerPlayer) {
+                    final ServerPlayer ze4 = (ServerPlayer)cz.getEntity();
+                    if (predicate4.test(ze4)) {
+                        return Lists.<ServerPlayer>newArrayList(ze4);
                     }
                 }
                 return Collections.<ServerPlayer>emptyList();
             }
             List<ServerPlayer> list5;
             if (this.isWorldLimited()) {
-                list5 = cq.getLevel().getPlayers(predicate4::test);
+                list5 = cz.getLevel().getPlayers(predicate4::test);
             }
             else {
                 list5 = Lists.newArrayList();
-                for (final ServerPlayer xe5 : cq.getServer().getPlayerList().getPlayers()) {
-                    if (predicate4.test(xe5)) {
-                        list5.add(xe5);
+                for (final ServerPlayer ze5 : cz.getServer().getPlayerList().getPlayers()) {
+                    if (predicate4.test(ze5)) {
+                        list5.add(ze5);
                     }
                 }
             }
-            return this.<ServerPlayer>sortAndLimit(cvl3, list5);
+            return this.<ServerPlayer>sortAndLimit(dem3, list5);
         }
     }
     
-    private Predicate<Entity> getPredicate(final Vec3 cvl) {
+    private Predicate<Entity> getPredicate(final Vec3 dem) {
         Predicate<Entity> predicate3 = this.predicate;
         if (this.aabb != null) {
-            final AABB cvf4 = this.aabb.move(cvl);
-            predicate3 = predicate3.and(akq -> cvf4.intersects(akq.getBoundingBox()));
+            final AABB deg4 = this.aabb.move(dem);
+            predicate3 = predicate3.and(aom -> deg4.intersects(aom.getBoundingBox()));
         }
         if (!this.range.isAny()) {
-            predicate3 = predicate3.and(akq -> this.range.matchesSqr(akq.distanceToSqr(cvl)));
+            predicate3 = predicate3.and(aom -> this.range.matchesSqr(aom.distanceToSqr(dem)));
         }
         return predicate3;
     }
     
-    private <T extends Entity> List<T> sortAndLimit(final Vec3 cvl, final List<T> list) {
+    private <T extends Entity> List<T> sortAndLimit(final Vec3 dem, final List<T> list) {
         if (list.size() > 1) {
-            this.order.accept(cvl, list);
+            this.order.accept(dem, list);
         }
         return list.subList(0, Math.min(this.maxResults, list.size()));
     }
     
-    public static Component joinNames(final List<? extends Entity> list) {
+    public static MutableComponent joinNames(final List<? extends Entity> list) {
         return ComponentUtils.formatList(list, Entity::getDisplayName);
     }
 }
diff --git a/src/net/minecraft/commands/arguments/selector/EntitySelectorParser.java b/src/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
index b08934a..abae6a3 100644
--- a/src/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
+++ b/src/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
@@ -97,7 +97,7 @@ public class EntitySelectorParser {
         this.level = MinMaxBounds.Ints.ANY;
         this.rotX = WrappedMinMaxBounds.ANY;
         this.rotY = WrappedMinMaxBounds.ANY;
-        this.predicate = (akq -> true);
+        this.predicate = (aom -> true);
         this.order = EntitySelectorParser.ORDER_ARBITRARY;
         this.suggestions = EntitySelectorParser.SUGGEST_NOTHING;
         this.reader = stringReader;
@@ -105,29 +105,29 @@ public class EntitySelectorParser {
     }
     
     public EntitySelector getSelector() {
-        AABB cvf2;
+        AABB deg2;
         if (this.deltaX != null || this.deltaY != null || this.deltaZ != null) {
-            cvf2 = this.createAabb((this.deltaX == null) ? 0.0 : ((double)this.deltaX), (this.deltaY == null) ? 0.0 : ((double)this.deltaY), (this.deltaZ == null) ? 0.0 : ((double)this.deltaZ));
+            deg2 = this.createAabb((this.deltaX == null) ? 0.0 : ((double)this.deltaX), (this.deltaY == null) ? 0.0 : ((double)this.deltaY), (this.deltaZ == null) ? 0.0 : ((double)this.deltaZ));
         }
         else if (this.distance.getMax() != null) {
             final float float3 = this.distance.getMax();
-            cvf2 = new AABB(-float3, -float3, -float3, float3 + 1.0f, float3 + 1.0f, float3 + 1.0f);
+            deg2 = new AABB(-float3, -float3, -float3, float3 + 1.0f, float3 + 1.0f, float3 + 1.0f);
         }
         else {
-            cvf2 = null;
+            deg2 = null;
         }
         Function<Vec3, Vec3> function3;
         if (this.x == null && this.y == null && this.z == null) {
-            function3 = (Function<Vec3, Vec3>)(cvl -> cvl);
+            function3 = (Function<Vec3, Vec3>)(dem -> dem);
         }
         else {
             final Vec3 vec3;
-            function3 = (Function<Vec3, Vec3>)(cvl -> {
-                new Vec3((this.x == null) ? cvl.x : this.x, (this.y == null) ? cvl.y : this.y, (this.z == null) ? cvl.z : this.z);
+            function3 = (Function<Vec3, Vec3>)(dem -> {
+                new Vec3((this.x == null) ? dem.x : this.x, (this.y == null) ? dem.y : this.y, (this.z == null) ? dem.z : this.z);
                 return vec3;
             });
         }
-        return new EntitySelector(this.maxResults, this.includesEntities, this.worldLimited, this.predicate, this.distance, function3, cvf2, this.order, this.currentEntity, this.playerName, this.entityUUID, this.type, this.usesSelectors);
+        return new EntitySelector(this.maxResults, this.includesEntities, this.worldLimited, this.predicate, this.distance, function3, deg2, this.order, this.currentEntity, this.playerName, this.entityUUID, this.type, this.usesSelectors);
     }
     
     private AABB createAabb(final double double1, final double double2, final double double3) {
@@ -145,24 +145,24 @@ public class EntitySelectorParser {
     
     private void finalizePredicates() {
         if (this.rotX != WrappedMinMaxBounds.ANY) {
-            this.predicate = this.predicate.and(this.createRotationPredicate(this.rotX, akq -> akq.xRot));
+            this.predicate = this.predicate.and(this.createRotationPredicate(this.rotX, aom -> aom.xRot));
         }
         if (this.rotY != WrappedMinMaxBounds.ANY) {
-            this.predicate = this.predicate.and(this.createRotationPredicate(this.rotY, akq -> akq.yRot));
+            this.predicate = this.predicate.and(this.createRotationPredicate(this.rotY, aom -> aom.yRot));
         }
         if (!this.level.isAny()) {
-            this.predicate = this.predicate.and(akq -> akq instanceof ServerPlayer && this.level.matches(akq.experienceLevel));
+            this.predicate = this.predicate.and(aom -> aom instanceof ServerPlayer && this.level.matches(aom.experienceLevel));
         }
     }
     
-    private Predicate<Entity> createRotationPredicate(final WrappedMinMaxBounds cj, final ToDoubleFunction<Entity> toDoubleFunction) {
-        final double double4 = Mth.wrapDegrees((cj.getMin() == null) ? 0.0f : ((float)cj.getMin()));
-        final double double5 = Mth.wrapDegrees((cj.getMax() == null) ? 359.0f : ((float)cj.getMax()));
+    private Predicate<Entity> createRotationPredicate(final WrappedMinMaxBounds cs, final ToDoubleFunction<Entity> toDoubleFunction) {
+        final double double4 = Mth.wrapDegrees((cs.getMin() == null) ? 0.0f : ((float)cs.getMin()));
+        final double double5 = Mth.wrapDegrees((cs.getMax() == null) ? 359.0f : ((float)cs.getMax()));
         final double double6;
         final double n;
         final double n2;
-        return akq -> {
-            double6 = Mth.wrapDegrees(toDoubleFunction.applyAsDouble(akq));
+        return aom -> {
+            double6 = Mth.wrapDegrees(toDoubleFunction.applyAsDouble(aom));
             if (n > n2) {
                 return double6 >= n || double6 <= n2;
             }
@@ -335,16 +335,16 @@ public class EntitySelectorParser {
         return this.rotX;
     }
     
-    public void setRotX(final WrappedMinMaxBounds cj) {
-        this.rotX = cj;
+    public void setRotX(final WrappedMinMaxBounds cs) {
+        this.rotX = cs;
     }
     
     public WrappedMinMaxBounds getRotY() {
         return this.rotY;
     }
     
-    public void setRotY(final WrappedMinMaxBounds cj) {
-        this.rotY = cj;
+    public void setRotY(final WrappedMinMaxBounds cs) {
+        this.rotY = cs;
     }
     
     @Nullable
@@ -431,11 +431,11 @@ public class EntitySelectorParser {
     }
     
     private static void fillSelectorSuggestions(final SuggestionsBuilder suggestionsBuilder) {
-        suggestionsBuilder.suggest("@p", (Message)new TranslatableComponent("argument.entity.selector.nearestPlayer", new Object[0]));
-        suggestionsBuilder.suggest("@a", (Message)new TranslatableComponent("argument.entity.selector.allPlayers", new Object[0]));
-        suggestionsBuilder.suggest("@r", (Message)new TranslatableComponent("argument.entity.selector.randomPlayer", new Object[0]));
-        suggestionsBuilder.suggest("@s", (Message)new TranslatableComponent("argument.entity.selector.self", new Object[0]));
-        suggestionsBuilder.suggest("@e", (Message)new TranslatableComponent("argument.entity.selector.allEntities", new Object[0]));
+        suggestionsBuilder.suggest("@p", (Message)new TranslatableComponent("argument.entity.selector.nearestPlayer"));
+        suggestionsBuilder.suggest("@a", (Message)new TranslatableComponent("argument.entity.selector.allPlayers"));
+        suggestionsBuilder.suggest("@r", (Message)new TranslatableComponent("argument.entity.selector.randomPlayer"));
+        suggestionsBuilder.suggest("@s", (Message)new TranslatableComponent("argument.entity.selector.self"));
+        suggestionsBuilder.suggest("@e", (Message)new TranslatableComponent("argument.entity.selector.allEntities"));
     }
     
     private CompletableFuture<Suggestions> suggestNameOrSelector(final SuggestionsBuilder suggestionsBuilder, final Consumer<SuggestionsBuilder> consumer) {
@@ -553,8 +553,8 @@ public class EntitySelectorParser {
         this.hasTeamNotEquals = boolean1;
     }
     
-    public void limitToType(final EntityType<?> aku) {
-        this.type = aku;
+    public void limitToType(final EntityType<?> aoq) {
+        this.type = aoq;
     }
     
     public void setTypeLimitedInversely() {
@@ -586,24 +586,24 @@ public class EntitySelectorParser {
     }
     
     static {
-        ERROR_INVALID_NAME_OR_UUID = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.invalid", new Object[0]));
+        ERROR_INVALID_NAME_OR_UUID = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.invalid"));
         final TranslatableComponent translatableComponent;
         ERROR_UNKNOWN_SELECTOR_TYPE = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("argument.entity.selector.unknown", new Object[] { object });
             return translatableComponent;
         });
-        ERROR_SELECTORS_NOT_ALLOWED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.selector.not_allowed", new Object[0]));
-        ERROR_MISSING_SELECTOR_TYPE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.selector.missing", new Object[0]));
-        ERROR_EXPECTED_END_OF_OPTIONS = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.options.unterminated", new Object[0]));
+        ERROR_SELECTORS_NOT_ALLOWED = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.selector.not_allowed"));
+        ERROR_MISSING_SELECTOR_TYPE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.selector.missing"));
+        ERROR_EXPECTED_END_OF_OPTIONS = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.options.unterminated"));
         final TranslatableComponent translatableComponent2;
         ERROR_EXPECTED_OPTION_VALUE = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("argument.entity.options.valueless", new Object[] { object });
             return translatableComponent2;
         });
-        ORDER_ARBITRARY = ((cvl, list) -> {});
-        ORDER_NEAREST = ((cvl, list) -> list.sort((akq2, akq3) -> Doubles.compare(akq2.distanceToSqr(cvl), akq3.distanceToSqr(cvl))));
-        ORDER_FURTHEST = ((cvl, list) -> list.sort((akq2, akq3) -> Doubles.compare(akq3.distanceToSqr(cvl), akq2.distanceToSqr(cvl))));
-        ORDER_RANDOM = ((cvl, list) -> Collections.shuffle(list));
+        ORDER_ARBITRARY = ((dem, list) -> {});
+        ORDER_NEAREST = ((dem, list) -> list.sort((aom2, aom3) -> Doubles.compare(aom2.distanceToSqr(dem), aom3.distanceToSqr(dem))));
+        ORDER_FURTHEST = ((dem, list) -> list.sort((aom2, aom3) -> Doubles.compare(aom3.distanceToSqr(dem), aom2.distanceToSqr(dem))));
+        ORDER_RANDOM = ((dem, list) -> Collections.shuffle(list));
         SUGGEST_NOTHING = ((suggestionsBuilder, consumer) -> suggestionsBuilder.buildFuture());
     }
 }
diff --git a/src/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java b/src/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
index 3487000..f81c9f2 100644
--- a/src/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
+++ b/src/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
@@ -66,8 +66,8 @@ public class EntitySelectorOptions {
     public static final DynamicCommandExceptionType ERROR_GAME_MODE_INVALID;
     public static final DynamicCommandExceptionType ERROR_ENTITY_TYPE_INVALID;
     
-    private static void register(final String string, final Modifier a, final Predicate<EntitySelectorParser> predicate, final Component lf) {
-        EntitySelectorOptions.OPTIONS.put(string, new Option(a, (Predicate)predicate, lf));
+    private static void register(final String string, final Modifier a, final Predicate<EntitySelectorParser> predicate, final Component mr) {
+        EntitySelectorOptions.OPTIONS.put(string, new Option(a, (Predicate)predicate, mr));
     }
     
     public static void bootStrap() {
@@ -85,211 +85,169 @@ public class EntitySelectorOptions {
         //    24: new             Lnet/minecraft/network/chat/TranslatableComponent;
         //    27: dup            
         //    28: ldc             "argument.entity.options.name.description"
-        //    30: iconst_0       
-        //    31: anewarray       Ljava/lang/Object;
-        //    34: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //    37: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //    40: ldc             "distance"
-        //    42: invokedynamic   BootstrapMethod #2, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //    47: invokedynamic   BootstrapMethod #3, test:()Ljava/util/function/Predicate;
-        //    52: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //    55: dup            
-        //    56: ldc             "argument.entity.options.distance.description"
-        //    58: iconst_0       
-        //    59: anewarray       Ljava/lang/Object;
-        //    62: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //    65: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //    68: ldc             "level"
-        //    70: invokedynamic   BootstrapMethod #4, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //    75: invokedynamic   BootstrapMethod #5, test:()Ljava/util/function/Predicate;
-        //    80: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //    83: dup            
-        //    84: ldc             "argument.entity.options.level.description"
-        //    86: iconst_0       
-        //    87: anewarray       Ljava/lang/Object;
-        //    90: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //    93: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //    96: ldc             "x"
-        //    98: invokedynamic   BootstrapMethod #6, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   103: invokedynamic   BootstrapMethod #7, test:()Ljava/util/function/Predicate;
-        //   108: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   111: dup            
-        //   112: ldc             "argument.entity.options.x.description"
-        //   114: iconst_0       
-        //   115: anewarray       Ljava/lang/Object;
-        //   118: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   121: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   124: ldc             "y"
-        //   126: invokedynamic   BootstrapMethod #8, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   131: invokedynamic   BootstrapMethod #9, test:()Ljava/util/function/Predicate;
-        //   136: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   139: dup            
-        //   140: ldc             "argument.entity.options.y.description"
-        //   142: iconst_0       
-        //   143: anewarray       Ljava/lang/Object;
-        //   146: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   149: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   152: ldc             "z"
-        //   154: invokedynamic   BootstrapMethod #10, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   159: invokedynamic   BootstrapMethod #11, test:()Ljava/util/function/Predicate;
-        //   164: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   167: dup            
-        //   168: ldc             "argument.entity.options.z.description"
-        //   170: iconst_0       
-        //   171: anewarray       Ljava/lang/Object;
-        //   174: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
+        //    30: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //    33: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //    36: ldc             "distance"
+        //    38: invokedynamic   BootstrapMethod #2, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //    43: invokedynamic   BootstrapMethod #3, test:()Ljava/util/function/Predicate;
+        //    48: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //    51: dup            
+        //    52: ldc             "argument.entity.options.distance.description"
+        //    54: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //    57: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //    60: ldc             "level"
+        //    62: invokedynamic   BootstrapMethod #4, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //    67: invokedynamic   BootstrapMethod #5, test:()Ljava/util/function/Predicate;
+        //    72: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //    75: dup            
+        //    76: ldc             "argument.entity.options.level.description"
+        //    78: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //    81: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //    84: ldc             "x"
+        //    86: invokedynamic   BootstrapMethod #6, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //    91: invokedynamic   BootstrapMethod #7, test:()Ljava/util/function/Predicate;
+        //    96: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //    99: dup            
+        //   100: ldc             "argument.entity.options.x.description"
+        //   102: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   105: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   108: ldc             "y"
+        //   110: invokedynamic   BootstrapMethod #8, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   115: invokedynamic   BootstrapMethod #9, test:()Ljava/util/function/Predicate;
+        //   120: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   123: dup            
+        //   124: ldc             "argument.entity.options.y.description"
+        //   126: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   129: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   132: ldc             "z"
+        //   134: invokedynamic   BootstrapMethod #10, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   139: invokedynamic   BootstrapMethod #11, test:()Ljava/util/function/Predicate;
+        //   144: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   147: dup            
+        //   148: ldc             "argument.entity.options.z.description"
+        //   150: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   153: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   156: ldc             "dx"
+        //   158: invokedynamic   BootstrapMethod #12, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   163: invokedynamic   BootstrapMethod #13, test:()Ljava/util/function/Predicate;
+        //   168: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   171: dup            
+        //   172: ldc             "argument.entity.options.dx.description"
+        //   174: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
         //   177: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   180: ldc             "dx"
-        //   182: invokedynamic   BootstrapMethod #12, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   187: invokedynamic   BootstrapMethod #13, test:()Ljava/util/function/Predicate;
+        //   180: ldc             "dy"
+        //   182: invokedynamic   BootstrapMethod #14, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   187: invokedynamic   BootstrapMethod #15, test:()Ljava/util/function/Predicate;
         //   192: new             Lnet/minecraft/network/chat/TranslatableComponent;
         //   195: dup            
-        //   196: ldc             "argument.entity.options.dx.description"
-        //   198: iconst_0       
-        //   199: anewarray       Ljava/lang/Object;
-        //   202: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   205: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   208: ldc             "dy"
-        //   210: invokedynamic   BootstrapMethod #14, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   215: invokedynamic   BootstrapMethod #15, test:()Ljava/util/function/Predicate;
-        //   220: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   223: dup            
-        //   224: ldc             "argument.entity.options.dy.description"
-        //   226: iconst_0       
-        //   227: anewarray       Ljava/lang/Object;
-        //   230: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   233: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   236: ldc             "dz"
-        //   238: invokedynamic   BootstrapMethod #16, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   243: invokedynamic   BootstrapMethod #17, test:()Ljava/util/function/Predicate;
-        //   248: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   251: dup            
-        //   252: ldc             "argument.entity.options.dz.description"
-        //   254: iconst_0       
-        //   255: anewarray       Ljava/lang/Object;
-        //   258: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   261: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   264: ldc             "x_rotation"
-        //   266: invokedynamic   BootstrapMethod #18, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   271: invokedynamic   BootstrapMethod #19, test:()Ljava/util/function/Predicate;
-        //   276: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   279: dup            
-        //   280: ldc             "argument.entity.options.x_rotation.description"
-        //   282: iconst_0       
-        //   283: anewarray       Ljava/lang/Object;
-        //   286: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   289: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   292: ldc             "y_rotation"
-        //   294: invokedynamic   BootstrapMethod #20, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   299: invokedynamic   BootstrapMethod #21, test:()Ljava/util/function/Predicate;
-        //   304: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   307: dup            
-        //   308: ldc_w           "argument.entity.options.y_rotation.description"
-        //   311: iconst_0       
-        //   312: anewarray       Ljava/lang/Object;
-        //   315: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   318: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   321: ldc_w           "limit"
-        //   324: invokedynamic   BootstrapMethod #22, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   329: invokedynamic   BootstrapMethod #23, test:()Ljava/util/function/Predicate;
-        //   334: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   337: dup            
-        //   338: ldc_w           "argument.entity.options.limit.description"
-        //   341: iconst_0       
-        //   342: anewarray       Ljava/lang/Object;
-        //   345: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   348: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   351: ldc_w           "sort"
-        //   354: invokedynamic   BootstrapMethod #24, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   359: invokedynamic   BootstrapMethod #25, test:()Ljava/util/function/Predicate;
-        //   364: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   367: dup            
-        //   368: ldc_w           "argument.entity.options.sort.description"
-        //   371: iconst_0       
-        //   372: anewarray       Ljava/lang/Object;
-        //   375: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
+        //   196: ldc             "argument.entity.options.dy.description"
+        //   198: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   201: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   204: ldc             "dz"
+        //   206: invokedynamic   BootstrapMethod #16, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   211: invokedynamic   BootstrapMethod #17, test:()Ljava/util/function/Predicate;
+        //   216: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   219: dup            
+        //   220: ldc             "argument.entity.options.dz.description"
+        //   222: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   225: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   228: ldc             "x_rotation"
+        //   230: invokedynamic   BootstrapMethod #18, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   235: invokedynamic   BootstrapMethod #19, test:()Ljava/util/function/Predicate;
+        //   240: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   243: dup            
+        //   244: ldc             "argument.entity.options.x_rotation.description"
+        //   246: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   249: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   252: ldc             "y_rotation"
+        //   254: invokedynamic   BootstrapMethod #20, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   259: invokedynamic   BootstrapMethod #21, test:()Ljava/util/function/Predicate;
+        //   264: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   267: dup            
+        //   268: ldc_w           "argument.entity.options.y_rotation.description"
+        //   271: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   274: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   277: ldc_w           "limit"
+        //   280: invokedynamic   BootstrapMethod #22, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   285: invokedynamic   BootstrapMethod #23, test:()Ljava/util/function/Predicate;
+        //   290: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   293: dup            
+        //   294: ldc_w           "argument.entity.options.limit.description"
+        //   297: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   300: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   303: ldc_w           "sort"
+        //   306: invokedynamic   BootstrapMethod #24, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   311: invokedynamic   BootstrapMethod #25, test:()Ljava/util/function/Predicate;
+        //   316: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   319: dup            
+        //   320: ldc_w           "argument.entity.options.sort.description"
+        //   323: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   326: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   329: ldc_w           "gamemode"
+        //   332: invokedynamic   BootstrapMethod #26, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   337: invokedynamic   BootstrapMethod #27, test:()Ljava/util/function/Predicate;
+        //   342: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   345: dup            
+        //   346: ldc_w           "argument.entity.options.gamemode.description"
+        //   349: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   352: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   355: ldc_w           "team"
+        //   358: invokedynamic   BootstrapMethod #28, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   363: invokedynamic   BootstrapMethod #29, test:()Ljava/util/function/Predicate;
+        //   368: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   371: dup            
+        //   372: ldc_w           "argument.entity.options.team.description"
+        //   375: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
         //   378: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   381: ldc_w           "gamemode"
-        //   384: invokedynamic   BootstrapMethod #26, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   389: invokedynamic   BootstrapMethod #27, test:()Ljava/util/function/Predicate;
+        //   381: ldc_w           "type"
+        //   384: invokedynamic   BootstrapMethod #30, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   389: invokedynamic   BootstrapMethod #31, test:()Ljava/util/function/Predicate;
         //   394: new             Lnet/minecraft/network/chat/TranslatableComponent;
         //   397: dup            
-        //   398: ldc_w           "argument.entity.options.gamemode.description"
-        //   401: iconst_0       
-        //   402: anewarray       Ljava/lang/Object;
-        //   405: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   408: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   411: ldc_w           "team"
-        //   414: invokedynamic   BootstrapMethod #28, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   419: invokedynamic   BootstrapMethod #29, test:()Ljava/util/function/Predicate;
-        //   424: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   427: dup            
-        //   428: ldc_w           "argument.entity.options.team.description"
-        //   431: iconst_0       
-        //   432: anewarray       Ljava/lang/Object;
-        //   435: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   438: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   441: ldc_w           "type"
-        //   444: invokedynamic   BootstrapMethod #30, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   449: invokedynamic   BootstrapMethod #31, test:()Ljava/util/function/Predicate;
-        //   454: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   457: dup            
-        //   458: ldc_w           "argument.entity.options.type.description"
-        //   461: iconst_0       
-        //   462: anewarray       Ljava/lang/Object;
-        //   465: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   468: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   471: ldc_w           "tag"
-        //   474: invokedynamic   BootstrapMethod #32, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   479: invokedynamic   BootstrapMethod #33, test:()Ljava/util/function/Predicate;
-        //   484: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   487: dup            
-        //   488: ldc_w           "argument.entity.options.tag.description"
-        //   491: iconst_0       
-        //   492: anewarray       Ljava/lang/Object;
-        //   495: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   498: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   501: ldc_w           "nbt"
-        //   504: invokedynamic   BootstrapMethod #34, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   509: invokedynamic   BootstrapMethod #35, test:()Ljava/util/function/Predicate;
-        //   514: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   517: dup            
-        //   518: ldc_w           "argument.entity.options.nbt.description"
-        //   521: iconst_0       
-        //   522: anewarray       Ljava/lang/Object;
-        //   525: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   528: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   531: ldc_w           "scores"
-        //   534: invokedynamic   BootstrapMethod #36, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   539: invokedynamic   BootstrapMethod #37, test:()Ljava/util/function/Predicate;
-        //   544: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   547: dup            
-        //   548: ldc_w           "argument.entity.options.scores.description"
-        //   551: iconst_0       
-        //   552: anewarray       Ljava/lang/Object;
-        //   555: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   558: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   561: ldc_w           "advancements"
-        //   564: invokedynamic   BootstrapMethod #38, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   569: invokedynamic   BootstrapMethod #39, test:()Ljava/util/function/Predicate;
-        //   574: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   577: dup            
-        //   578: ldc_w           "argument.entity.options.advancements.description"
-        //   581: iconst_0       
-        //   582: anewarray       Ljava/lang/Object;
-        //   585: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   588: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   591: ldc_w           "predicate"
-        //   594: invokedynamic   BootstrapMethod #40, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
-        //   599: invokedynamic   BootstrapMethod #41, test:()Ljava/util/function/Predicate;
-        //   604: new             Lnet/minecraft/network/chat/TranslatableComponent;
-        //   607: dup            
-        //   608: ldc_w           "argument.entity.options.predicate.description"
-        //   611: iconst_0       
-        //   612: anewarray       Ljava/lang/Object;
-        //   615: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;[Ljava/lang/Object;)V
-        //   618: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
-        //   621: return         
+        //   398: ldc_w           "argument.entity.options.type.description"
+        //   401: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   404: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   407: ldc_w           "tag"
+        //   410: invokedynamic   BootstrapMethod #32, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   415: invokedynamic   BootstrapMethod #33, test:()Ljava/util/function/Predicate;
+        //   420: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   423: dup            
+        //   424: ldc_w           "argument.entity.options.tag.description"
+        //   427: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   430: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   433: ldc_w           "nbt"
+        //   436: invokedynamic   BootstrapMethod #34, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   441: invokedynamic   BootstrapMethod #35, test:()Ljava/util/function/Predicate;
+        //   446: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   449: dup            
+        //   450: ldc_w           "argument.entity.options.nbt.description"
+        //   453: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   456: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   459: ldc_w           "scores"
+        //   462: invokedynamic   BootstrapMethod #36, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   467: invokedynamic   BootstrapMethod #37, test:()Ljava/util/function/Predicate;
+        //   472: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   475: dup            
+        //   476: ldc_w           "argument.entity.options.scores.description"
+        //   479: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   482: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   485: ldc_w           "advancements"
+        //   488: invokedynamic   BootstrapMethod #38, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   493: invokedynamic   BootstrapMethod #39, test:()Ljava/util/function/Predicate;
+        //   498: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   501: dup            
+        //   502: ldc_w           "argument.entity.options.advancements.description"
+        //   505: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   508: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   511: ldc_w           "predicate"
+        //   514: invokedynamic   BootstrapMethod #40, handle:()Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;
+        //   519: invokedynamic   BootstrapMethod #41, test:()Ljava/util/function/Predicate;
+        //   524: new             Lnet/minecraft/network/chat/TranslatableComponent;
+        //   527: dup            
+        //   528: ldc_w           "argument.entity.options.predicate.description"
+        //   531: invokespecial   net/minecraft/network/chat/TranslatableComponent.<init>:(Ljava/lang/String;)V
+        //   534: invokestatic    net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.register:(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V
+        //   537: return         
         //    StackMapTable: 00 01 0C
         // 
         // The error that occurred was:
@@ -334,22 +292,22 @@ public class EntitySelectorOptions {
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    public static Modifier get(final EntitySelectorParser eq, final String string, final int integer) throws CommandSyntaxException {
+    public static Modifier get(final EntitySelectorParser fa, final String string, final int integer) throws CommandSyntaxException {
         final Option b4 = EntitySelectorOptions.OPTIONS.get(string);
         if (b4 == null) {
-            eq.getReader().setCursor(integer);
-            throw EntitySelectorOptions.ERROR_UNKNOWN_OPTION.createWithContext((ImmutableStringReader)eq.getReader(), string);
+            fa.getReader().setCursor(integer);
+            throw EntitySelectorOptions.ERROR_UNKNOWN_OPTION.createWithContext((ImmutableStringReader)fa.getReader(), string);
         }
-        if (b4.predicate.test(eq)) {
+        if (b4.predicate.test(fa)) {
             return b4.modifier;
         }
-        throw EntitySelectorOptions.ERROR_INAPPLICABLE_OPTION.createWithContext((ImmutableStringReader)eq.getReader(), string);
+        throw EntitySelectorOptions.ERROR_INAPPLICABLE_OPTION.createWithContext((ImmutableStringReader)fa.getReader(), string);
     }
     
-    public static void suggestNames(final EntitySelectorParser eq, final SuggestionsBuilder suggestionsBuilder) {
+    public static void suggestNames(final EntitySelectorParser fa, final SuggestionsBuilder suggestionsBuilder) {
         final String string3 = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
         for (final Map.Entry<String, Option> entry5 : EntitySelectorOptions.OPTIONS.entrySet()) {
-            if (entry5.getValue().predicate.test(eq) && entry5.getKey().toLowerCase(Locale.ROOT).startsWith(string3)) {
+            if (entry5.getValue().predicate.test(fa) && entry5.getKey().toLowerCase(Locale.ROOT).startsWith(string3)) {
                 suggestionsBuilder.suggest(entry5.getKey() + '=', (Message)entry5.getValue().description);
             }
         }
@@ -367,9 +325,9 @@ public class EntitySelectorOptions {
             new TranslatableComponent("argument.entity.options.inapplicable", new Object[] { object });
             return translatableComponent2;
         });
-        ERROR_RANGE_NEGATIVE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.options.distance.negative", new Object[0]));
-        ERROR_LEVEL_NEGATIVE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.options.level.negative", new Object[0]));
-        ERROR_LIMIT_TOO_SMALL = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.options.limit.toosmall", new Object[0]));
+        ERROR_RANGE_NEGATIVE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.options.distance.negative"));
+        ERROR_LEVEL_NEGATIVE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.options.level.negative"));
+        ERROR_LIMIT_TOO_SMALL = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.entity.options.limit.toosmall"));
         final TranslatableComponent translatableComponent3;
         ERROR_SORT_UNKNOWN = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("argument.entity.options.sort.irreversible", new Object[] { object });
@@ -392,14 +350,14 @@ public class EntitySelectorOptions {
         public final Predicate<EntitySelectorParser> predicate;
         public final Component description;
         
-        private Option(final Modifier a, final Predicate<EntitySelectorParser> predicate, final Component lf) {
+        private Option(final Modifier a, final Predicate<EntitySelectorParser> predicate, final Component mr) {
             this.modifier = a;
             this.predicate = predicate;
-            this.description = lf;
+            this.description = mr;
         }
     }
     
     public interface Modifier {
-        void handle(final EntitySelectorParser eq) throws CommandSyntaxException;
+        void handle(final EntitySelectorParser fa) throws CommandSyntaxException;
     }
 }
diff --git a/src/net/minecraft/commands/synchronization/ArgumentSerializer.java b/src/net/minecraft/commands/synchronization/ArgumentSerializer.java
index f73f464..831e60e 100644
--- a/src/net/minecraft/commands/synchronization/ArgumentSerializer.java
+++ b/src/net/minecraft/commands/synchronization/ArgumentSerializer.java
@@ -5,9 +5,9 @@ import net.minecraft.network.FriendlyByteBuf;
 import com.mojang.brigadier.arguments.ArgumentType;
 
 public interface ArgumentSerializer<T extends ArgumentType<?>> {
-    void serializeToNetwork(final T argumentType, final FriendlyByteBuf kv);
+    void serializeToNetwork(final T argumentType, final FriendlyByteBuf mg);
     
-    T deserializeFromNetwork(final FriendlyByteBuf kv);
+    T deserializeFromNetwork(final FriendlyByteBuf mg);
     
     void serializeToJson(final T argumentType, final JsonObject jsonObject);
 }
diff --git a/src/net/minecraft/commands/synchronization/ArgumentTypes.java b/src/net/minecraft/commands/synchronization/ArgumentTypes.java
index 477fdac..74e63a2 100644
--- a/src/net/minecraft/commands/synchronization/ArgumentTypes.java
+++ b/src/net/minecraft/commands/synchronization/ArgumentTypes.java
@@ -17,8 +17,9 @@ import javax.annotation.Nullable;
 import net.minecraft.gametest.framework.TestClassNameArgument;
 import net.minecraft.gametest.framework.TestFunctionArgument;
 import net.minecraft.SharedConstants;
+import net.minecraft.commands.arguments.UuidArgument;
 import net.minecraft.commands.arguments.TimeArgument;
-import net.minecraft.commands.arguments.DimensionTypeArgument;
+import net.minecraft.commands.arguments.DimensionArgument;
 import net.minecraft.commands.arguments.EntitySummonArgument;
 import net.minecraft.commands.arguments.ItemEnchantmentArgument;
 import net.minecraft.commands.arguments.RangeArgument;
@@ -64,17 +65,17 @@ public class ArgumentTypes {
     private static final Map<Class<?>, Entry<?>> BY_CLASS;
     private static final Map<ResourceLocation, Entry<?>> BY_NAME;
     
-    public static <T extends ArgumentType<?>> void register(final String string, final Class<T> class2, final ArgumentSerializer<T> ew) {
-        final ResourceLocation sm4 = new ResourceLocation(string);
+    public static <T extends ArgumentType<?>> void register(final String string, final Class<T> class2, final ArgumentSerializer<T> fg) {
+        final ResourceLocation uh4 = new ResourceLocation(string);
         if (ArgumentTypes.BY_CLASS.containsKey(class2)) {
             throw new IllegalArgumentException("Class " + class2.getName() + " already has a serializer!");
         }
-        if (ArgumentTypes.BY_NAME.containsKey(sm4)) {
-            throw new IllegalArgumentException("'" + sm4 + "' is already a registered serializer!");
+        if (ArgumentTypes.BY_NAME.containsKey(uh4)) {
+            throw new IllegalArgumentException("'" + uh4 + "' is already a registered serializer!");
         }
-        final Entry<T> a5 = new Entry<T>((Class)class2, (ArgumentSerializer)ew, sm4);
+        final Entry<T> a5 = new Entry<T>((Class)class2, (ArgumentSerializer)fg, uh4);
         ArgumentTypes.BY_CLASS.put(class2, a5);
-        ArgumentTypes.BY_NAME.put(sm4, a5);
+        ArgumentTypes.BY_NAME.put(uh4, a5);
     }
     
     public static void bootStrap() {
@@ -113,8 +114,9 @@ public class ArgumentTypes {
         ArgumentTypes.<ArgumentType>register("float_range", (Class<ArgumentType>)RangeArgument.Floats.class, (ArgumentSerializer<ArgumentType>)new RangeArgument.Floats.Serializer());
         ArgumentTypes.<ArgumentType>register("item_enchantment", (Class<ArgumentType>)ItemEnchantmentArgument.class, new EmptyArgumentSerializer<ArgumentType>((Supplier<ArgumentType>)ItemEnchantmentArgument::enchantment));
         ArgumentTypes.<ArgumentType>register("entity_summon", (Class<ArgumentType>)EntitySummonArgument.class, new EmptyArgumentSerializer<ArgumentType>((Supplier<ArgumentType>)EntitySummonArgument::id));
-        ArgumentTypes.<ArgumentType>register("dimension", (Class<ArgumentType>)DimensionTypeArgument.class, new EmptyArgumentSerializer<ArgumentType>((Supplier<ArgumentType>)DimensionTypeArgument::dimension));
+        ArgumentTypes.<ArgumentType>register("dimension", (Class<ArgumentType>)DimensionArgument.class, new EmptyArgumentSerializer<ArgumentType>((Supplier<ArgumentType>)DimensionArgument::dimension));
         ArgumentTypes.<ArgumentType>register("time", (Class<ArgumentType>)TimeArgument.class, new EmptyArgumentSerializer<ArgumentType>((Supplier<ArgumentType>)TimeArgument::time));
+        ArgumentTypes.<ArgumentType>register("uuid", (Class<ArgumentType>)UuidArgument.class, new EmptyArgumentSerializer<ArgumentType>((Supplier<ArgumentType>)UuidArgument::uuid));
         if (SharedConstants.IS_RUNNING_IN_IDE) {
             ArgumentTypes.<ArgumentType>register("test_argument", (Class<ArgumentType>)TestFunctionArgument.class, new EmptyArgumentSerializer<ArgumentType>((Supplier<ArgumentType>)TestFunctionArgument::testFunctionArgument));
             ArgumentTypes.<ArgumentType>register("test_class", (Class<ArgumentType>)TestClassNameArgument.class, new EmptyArgumentSerializer<ArgumentType>((Supplier<ArgumentType>)TestClassNameArgument::testClassName));
@@ -122,8 +124,8 @@ public class ArgumentTypes {
     }
     
     @Nullable
-    private static Entry<?> get(final ResourceLocation sm) {
-        return ArgumentTypes.BY_NAME.get(sm);
+    private static Entry<?> get(final ResourceLocation uh) {
+        return ArgumentTypes.BY_NAME.get(uh);
     }
     
     @Nullable
@@ -131,26 +133,26 @@ public class ArgumentTypes {
         return ArgumentTypes.BY_CLASS.get(argumentType.getClass());
     }
     
-    public static <T extends ArgumentType<?>> void serialize(final FriendlyByteBuf kv, final T argumentType) {
+    public static <T extends ArgumentType<?>> void serialize(final FriendlyByteBuf mg, final T argumentType) {
         final Entry<T> a3 = (Entry<T>)get(argumentType);
         if (a3 == null) {
             ArgumentTypes.LOGGER.error("Could not serialize {} ({}) - will not be sent to client!", argumentType, argumentType.getClass());
-            kv.writeResourceLocation(new ResourceLocation(""));
+            mg.writeResourceLocation(new ResourceLocation(""));
             return;
         }
-        kv.writeResourceLocation(a3.name);
-        a3.serializer.serializeToNetwork(argumentType, kv);
+        mg.writeResourceLocation(a3.name);
+        a3.serializer.serializeToNetwork(argumentType, mg);
     }
     
     @Nullable
-    public static ArgumentType<?> deserialize(final FriendlyByteBuf kv) {
-        final ResourceLocation sm2 = kv.readResourceLocation();
-        final Entry<?> a3 = get(sm2);
+    public static ArgumentType<?> deserialize(final FriendlyByteBuf mg) {
+        final ResourceLocation uh2 = mg.readResourceLocation();
+        final Entry<?> a3 = get(uh2);
         if (a3 == null) {
-            ArgumentTypes.LOGGER.error("Could not deserialize {}", sm2);
+            ArgumentTypes.LOGGER.error("Could not deserialize {}", uh2);
             return null;
         }
-        return a3.serializer.deserializeFromNetwork(kv);
+        return a3.serializer.deserializeFromNetwork(mg);
     }
     
     private static <T extends ArgumentType<?>> void serializeToJson(final JsonObject jsonObject, final T argumentType) {
@@ -219,10 +221,10 @@ public class ArgumentTypes {
         public final ArgumentSerializer<T> serializer;
         public final ResourceLocation name;
         
-        private Entry(final Class<T> class1, final ArgumentSerializer<T> ew, final ResourceLocation sm) {
+        private Entry(final Class<T> class1, final ArgumentSerializer<T> fg, final ResourceLocation uh) {
             this.clazz = class1;
-            this.serializer = ew;
-            this.name = sm;
+            this.serializer = fg;
+            this.name = uh;
         }
     }
 }
diff --git a/src/net/minecraft/commands/synchronization/EmptyArgumentSerializer.java b/src/net/minecraft/commands/synchronization/EmptyArgumentSerializer.java
index 36a736a..cefc1f1 100644
--- a/src/net/minecraft/commands/synchronization/EmptyArgumentSerializer.java
+++ b/src/net/minecraft/commands/synchronization/EmptyArgumentSerializer.java
@@ -13,11 +13,11 @@ public class EmptyArgumentSerializer<T extends ArgumentType<?>> implements Argum
     }
     
     @Override
-    public void serializeToNetwork(final T argumentType, final FriendlyByteBuf kv) {
+    public void serializeToNetwork(final T argumentType, final FriendlyByteBuf mg) {
     }
     
     @Override
-    public T deserializeFromNetwork(final FriendlyByteBuf kv) {
+    public T deserializeFromNetwork(final FriendlyByteBuf mg) {
         return this.constructor.get();
     }
     
diff --git a/src/net/minecraft/commands/synchronization/SuggestionProviders.java b/src/net/minecraft/commands/synchronization/SuggestionProviders.java
index aafbd0f..57dde63 100644
--- a/src/net/minecraft/commands/synchronization/SuggestionProviders.java
+++ b/src/net/minecraft/commands/synchronization/SuggestionProviders.java
@@ -23,18 +23,19 @@ public class SuggestionProviders {
     public static final SuggestionProvider<SharedSuggestionProvider> ASK_SERVER;
     public static final SuggestionProvider<CommandSourceStack> ALL_RECIPES;
     public static final SuggestionProvider<CommandSourceStack> AVAILABLE_SOUNDS;
+    public static final SuggestionProvider<CommandSourceStack> AVAILABLE_BIOMES;
     public static final SuggestionProvider<CommandSourceStack> SUMMONABLE_ENTITIES;
     
-    public static <S extends SharedSuggestionProvider> SuggestionProvider<S> register(final ResourceLocation sm, final SuggestionProvider<SharedSuggestionProvider> suggestionProvider) {
-        if (SuggestionProviders.PROVIDERS_BY_NAME.containsKey(sm)) {
-            throw new IllegalArgumentException("A command suggestion provider is already registered with the name " + sm);
+    public static <S extends SharedSuggestionProvider> SuggestionProvider<S> register(final ResourceLocation uh, final SuggestionProvider<SharedSuggestionProvider> suggestionProvider) {
+        if (SuggestionProviders.PROVIDERS_BY_NAME.containsKey(uh)) {
+            throw new IllegalArgumentException("A command suggestion provider is already registered with the name " + uh);
         }
-        SuggestionProviders.PROVIDERS_BY_NAME.put(sm, suggestionProvider);
-        return (SuggestionProvider<S>)new Wrapper(sm, suggestionProvider);
+        SuggestionProviders.PROVIDERS_BY_NAME.put(uh, suggestionProvider);
+        return (SuggestionProvider<S>)new Wrapper(uh, suggestionProvider);
     }
     
-    public static SuggestionProvider<SharedSuggestionProvider> getProvider(final ResourceLocation sm) {
-        return SuggestionProviders.PROVIDERS_BY_NAME.getOrDefault(sm, SuggestionProviders.ASK_SERVER);
+    public static SuggestionProvider<SharedSuggestionProvider> getProvider(final ResourceLocation uh) {
+        return SuggestionProviders.PROVIDERS_BY_NAME.getOrDefault(uh, SuggestionProviders.ASK_SERVER);
     }
     
     public static ResourceLocation getName(final SuggestionProvider<SharedSuggestionProvider> suggestionProvider) {
@@ -57,16 +58,17 @@ public class SuggestionProviders {
         ASK_SERVER = SuggestionProviders.<SharedSuggestionProvider>register(SuggestionProviders.DEFAULT_NAME, (SuggestionProvider<SharedSuggestionProvider>)((commandContext, suggestionsBuilder) -> ((SharedSuggestionProvider)commandContext.getSource()).customSuggestion((CommandContext<SharedSuggestionProvider>)commandContext, suggestionsBuilder)));
         ALL_RECIPES = SuggestionProviders.<CommandSourceStack>register(new ResourceLocation("all_recipes"), (SuggestionProvider<SharedSuggestionProvider>)((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggestResource(((SharedSuggestionProvider)commandContext.getSource()).getRecipeNames(), suggestionsBuilder)));
         AVAILABLE_SOUNDS = SuggestionProviders.<CommandSourceStack>register(new ResourceLocation("available_sounds"), (SuggestionProvider<SharedSuggestionProvider>)((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggestResource(((SharedSuggestionProvider)commandContext.getSource()).getAvailableSoundEvents(), suggestionsBuilder)));
-        SUMMONABLE_ENTITIES = SuggestionProviders.<CommandSourceStack>register(new ResourceLocation("summonable_entities"), (SuggestionProvider<SharedSuggestionProvider>)((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.<EntityType<?>>suggestResource(Registry.ENTITY_TYPE.stream().filter(EntityType::canSummon), suggestionsBuilder, EntityType::getKey, aku -> new TranslatableComponent(Util.makeDescriptionId("entity", EntityType.getKey(aku)), new Object[0]))));
+        AVAILABLE_BIOMES = SuggestionProviders.<CommandSourceStack>register(new ResourceLocation("available_biomes"), (SuggestionProvider<SharedSuggestionProvider>)((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggestResource(Registry.BIOME.keySet(), suggestionsBuilder)));
+        SUMMONABLE_ENTITIES = SuggestionProviders.<CommandSourceStack>register(new ResourceLocation("summonable_entities"), (SuggestionProvider<SharedSuggestionProvider>)((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.<EntityType<?>>suggestResource(Registry.ENTITY_TYPE.stream().filter(EntityType::canSummon), suggestionsBuilder, EntityType::getKey, aoq -> new TranslatableComponent(Util.makeDescriptionId("entity", EntityType.getKey(aoq))))));
     }
     
     public static class Wrapper implements SuggestionProvider<SharedSuggestionProvider> {
         private final SuggestionProvider<SharedSuggestionProvider> delegate;
         private final ResourceLocation name;
         
-        public Wrapper(final ResourceLocation sm, final SuggestionProvider<SharedSuggestionProvider> suggestionProvider) {
+        public Wrapper(final ResourceLocation uh, final SuggestionProvider<SharedSuggestionProvider> suggestionProvider) {
             this.delegate = suggestionProvider;
-            this.name = sm;
+            this.name = uh;
         }
         
         public CompletableFuture<Suggestions> getSuggestions(final CommandContext<SharedSuggestionProvider> commandContext, final SuggestionsBuilder suggestionsBuilder) throws CommandSyntaxException {
diff --git a/src/net/minecraft/commands/synchronization/brigadier/DoubleArgumentSerializer.java b/src/net/minecraft/commands/synchronization/brigadier/DoubleArgumentSerializer.java
index d1c270e..ca17e15 100644
--- a/src/net/minecraft/commands/synchronization/brigadier/DoubleArgumentSerializer.java
+++ b/src/net/minecraft/commands/synchronization/brigadier/DoubleArgumentSerializer.java
@@ -8,23 +8,23 @@ import net.minecraft.commands.synchronization.ArgumentSerializer;
 
 public class DoubleArgumentSerializer implements ArgumentSerializer<DoubleArgumentType> {
     @Override
-    public void serializeToNetwork(final DoubleArgumentType doubleArgumentType, final FriendlyByteBuf kv) {
+    public void serializeToNetwork(final DoubleArgumentType doubleArgumentType, final FriendlyByteBuf mg) {
         final boolean boolean4 = doubleArgumentType.getMinimum() != -1.7976931348623157E308;
         final boolean boolean5 = doubleArgumentType.getMaximum() != Double.MAX_VALUE;
-        kv.writeByte(BrigadierArgumentSerializers.createNumberFlags(boolean4, boolean5));
+        mg.writeByte(BrigadierArgumentSerializers.createNumberFlags(boolean4, boolean5));
         if (boolean4) {
-            kv.writeDouble(doubleArgumentType.getMinimum());
+            mg.writeDouble(doubleArgumentType.getMinimum());
         }
         if (boolean5) {
-            kv.writeDouble(doubleArgumentType.getMaximum());
+            mg.writeDouble(doubleArgumentType.getMaximum());
         }
     }
     
     @Override
-    public DoubleArgumentType deserializeFromNetwork(final FriendlyByteBuf kv) {
-        final byte byte3 = kv.readByte();
-        final double double4 = BrigadierArgumentSerializers.numberHasMin(byte3) ? kv.readDouble() : -1.7976931348623157E308;
-        final double double5 = BrigadierArgumentSerializers.numberHasMax(byte3) ? kv.readDouble() : Double.MAX_VALUE;
+    public DoubleArgumentType deserializeFromNetwork(final FriendlyByteBuf mg) {
+        final byte byte3 = mg.readByte();
+        final double double4 = BrigadierArgumentSerializers.numberHasMin(byte3) ? mg.readDouble() : -1.7976931348623157E308;
+        final double double5 = BrigadierArgumentSerializers.numberHasMax(byte3) ? mg.readDouble() : Double.MAX_VALUE;
         return DoubleArgumentType.doubleArg(double4, double5);
     }
     
diff --git a/src/net/minecraft/commands/synchronization/brigadier/FloatArgumentSerializer.java b/src/net/minecraft/commands/synchronization/brigadier/FloatArgumentSerializer.java
index 0b1cdfb..ff89f37 100644
--- a/src/net/minecraft/commands/synchronization/brigadier/FloatArgumentSerializer.java
+++ b/src/net/minecraft/commands/synchronization/brigadier/FloatArgumentSerializer.java
@@ -8,23 +8,23 @@ import net.minecraft.commands.synchronization.ArgumentSerializer;
 
 public class FloatArgumentSerializer implements ArgumentSerializer<FloatArgumentType> {
     @Override
-    public void serializeToNetwork(final FloatArgumentType floatArgumentType, final FriendlyByteBuf kv) {
+    public void serializeToNetwork(final FloatArgumentType floatArgumentType, final FriendlyByteBuf mg) {
         final boolean boolean4 = floatArgumentType.getMinimum() != -3.4028235E38f;
         final boolean boolean5 = floatArgumentType.getMaximum() != Float.MAX_VALUE;
-        kv.writeByte(BrigadierArgumentSerializers.createNumberFlags(boolean4, boolean5));
+        mg.writeByte(BrigadierArgumentSerializers.createNumberFlags(boolean4, boolean5));
         if (boolean4) {
-            kv.writeFloat(floatArgumentType.getMinimum());
+            mg.writeFloat(floatArgumentType.getMinimum());
         }
         if (boolean5) {
-            kv.writeFloat(floatArgumentType.getMaximum());
+            mg.writeFloat(floatArgumentType.getMaximum());
         }
     }
     
     @Override
-    public FloatArgumentType deserializeFromNetwork(final FriendlyByteBuf kv) {
-        final byte byte3 = kv.readByte();
-        final float float4 = BrigadierArgumentSerializers.numberHasMin(byte3) ? kv.readFloat() : -3.4028235E38f;
-        final float float5 = BrigadierArgumentSerializers.numberHasMax(byte3) ? kv.readFloat() : Float.MAX_VALUE;
+    public FloatArgumentType deserializeFromNetwork(final FriendlyByteBuf mg) {
+        final byte byte3 = mg.readByte();
+        final float float4 = BrigadierArgumentSerializers.numberHasMin(byte3) ? mg.readFloat() : -3.4028235E38f;
+        final float float5 = BrigadierArgumentSerializers.numberHasMax(byte3) ? mg.readFloat() : Float.MAX_VALUE;
         return FloatArgumentType.floatArg(float4, float5);
     }
     
diff --git a/src/net/minecraft/commands/synchronization/brigadier/IntegerArgumentSerializer.java b/src/net/minecraft/commands/synchronization/brigadier/IntegerArgumentSerializer.java
index d6f6a44..36bcd02 100644
--- a/src/net/minecraft/commands/synchronization/brigadier/IntegerArgumentSerializer.java
+++ b/src/net/minecraft/commands/synchronization/brigadier/IntegerArgumentSerializer.java
@@ -8,23 +8,23 @@ import net.minecraft.commands.synchronization.ArgumentSerializer;
 
 public class IntegerArgumentSerializer implements ArgumentSerializer<IntegerArgumentType> {
     @Override
-    public void serializeToNetwork(final IntegerArgumentType integerArgumentType, final FriendlyByteBuf kv) {
+    public void serializeToNetwork(final IntegerArgumentType integerArgumentType, final FriendlyByteBuf mg) {
         final boolean boolean4 = integerArgumentType.getMinimum() != Integer.MIN_VALUE;
         final boolean boolean5 = integerArgumentType.getMaximum() != Integer.MAX_VALUE;
-        kv.writeByte(BrigadierArgumentSerializers.createNumberFlags(boolean4, boolean5));
+        mg.writeByte(BrigadierArgumentSerializers.createNumberFlags(boolean4, boolean5));
         if (boolean4) {
-            kv.writeInt(integerArgumentType.getMinimum());
+            mg.writeInt(integerArgumentType.getMinimum());
         }
         if (boolean5) {
-            kv.writeInt(integerArgumentType.getMaximum());
+            mg.writeInt(integerArgumentType.getMaximum());
         }
     }
     
     @Override
-    public IntegerArgumentType deserializeFromNetwork(final FriendlyByteBuf kv) {
-        final byte byte3 = kv.readByte();
-        final int integer4 = BrigadierArgumentSerializers.numberHasMin(byte3) ? kv.readInt() : Integer.MIN_VALUE;
-        final int integer5 = BrigadierArgumentSerializers.numberHasMax(byte3) ? kv.readInt() : Integer.MAX_VALUE;
+    public IntegerArgumentType deserializeFromNetwork(final FriendlyByteBuf mg) {
+        final byte byte3 = mg.readByte();
+        final int integer4 = BrigadierArgumentSerializers.numberHasMin(byte3) ? mg.readInt() : Integer.MIN_VALUE;
+        final int integer5 = BrigadierArgumentSerializers.numberHasMax(byte3) ? mg.readInt() : Integer.MAX_VALUE;
         return IntegerArgumentType.integer(integer4, integer5);
     }
     
diff --git a/src/net/minecraft/commands/synchronization/brigadier/LongArgumentSerializer.java b/src/net/minecraft/commands/synchronization/brigadier/LongArgumentSerializer.java
index ebc8789..c6d3b9f 100644
--- a/src/net/minecraft/commands/synchronization/brigadier/LongArgumentSerializer.java
+++ b/src/net/minecraft/commands/synchronization/brigadier/LongArgumentSerializer.java
@@ -8,23 +8,23 @@ import net.minecraft.commands.synchronization.ArgumentSerializer;
 
 public class LongArgumentSerializer implements ArgumentSerializer<LongArgumentType> {
     @Override
-    public void serializeToNetwork(final LongArgumentType longArgumentType, final FriendlyByteBuf kv) {
+    public void serializeToNetwork(final LongArgumentType longArgumentType, final FriendlyByteBuf mg) {
         final boolean boolean4 = longArgumentType.getMinimum() != Long.MIN_VALUE;
         final boolean boolean5 = longArgumentType.getMaximum() != Long.MAX_VALUE;
-        kv.writeByte(BrigadierArgumentSerializers.createNumberFlags(boolean4, boolean5));
+        mg.writeByte(BrigadierArgumentSerializers.createNumberFlags(boolean4, boolean5));
         if (boolean4) {
-            kv.writeLong(longArgumentType.getMinimum());
+            mg.writeLong(longArgumentType.getMinimum());
         }
         if (boolean5) {
-            kv.writeLong(longArgumentType.getMaximum());
+            mg.writeLong(longArgumentType.getMaximum());
         }
     }
     
     @Override
-    public LongArgumentType deserializeFromNetwork(final FriendlyByteBuf kv) {
-        final byte byte3 = kv.readByte();
-        final long long4 = BrigadierArgumentSerializers.numberHasMin(byte3) ? kv.readLong() : Long.MIN_VALUE;
-        final long long5 = BrigadierArgumentSerializers.numberHasMax(byte3) ? kv.readLong() : Long.MAX_VALUE;
+    public LongArgumentType deserializeFromNetwork(final FriendlyByteBuf mg) {
+        final byte byte3 = mg.readByte();
+        final long long4 = BrigadierArgumentSerializers.numberHasMin(byte3) ? mg.readLong() : Long.MIN_VALUE;
+        final long long5 = BrigadierArgumentSerializers.numberHasMax(byte3) ? mg.readLong() : Long.MAX_VALUE;
         return LongArgumentType.longArg(long4, long5);
     }
     
diff --git a/src/net/minecraft/commands/synchronization/brigadier/StringArgumentSerializer.java b/src/net/minecraft/commands/synchronization/brigadier/StringArgumentSerializer.java
index 89a51a8..3e2a923 100644
--- a/src/net/minecraft/commands/synchronization/brigadier/StringArgumentSerializer.java
+++ b/src/net/minecraft/commands/synchronization/brigadier/StringArgumentSerializer.java
@@ -8,13 +8,13 @@ import net.minecraft.commands.synchronization.ArgumentSerializer;
 
 public class StringArgumentSerializer implements ArgumentSerializer<StringArgumentType> {
     @Override
-    public void serializeToNetwork(final StringArgumentType stringArgumentType, final FriendlyByteBuf kv) {
-        kv.writeEnum(stringArgumentType.getType());
+    public void serializeToNetwork(final StringArgumentType stringArgumentType, final FriendlyByteBuf mg) {
+        mg.writeEnum(stringArgumentType.getType());
     }
     
     @Override
-    public StringArgumentType deserializeFromNetwork(final FriendlyByteBuf kv) {
-        final StringArgumentType.StringType stringType3 = kv.<StringArgumentType.StringType>readEnum(StringArgumentType.StringType.class);
+    public StringArgumentType deserializeFromNetwork(final FriendlyByteBuf mg) {
+        final StringArgumentType.StringType stringType3 = mg.<StringArgumentType.StringType>readEnum(StringArgumentType.StringType.class);
         switch (stringType3) {
             case SINGLE_WORD: {
                 return StringArgumentType.word();
diff --git a/src/net/minecraft/core/BlockMath.java b/src/net/minecraft/core/BlockMath.java
index df9c4b6..41d12dc 100644
--- a/src/net/minecraft/core/BlockMath.java
+++ b/src/net/minecraft/core/BlockMath.java
@@ -16,84 +16,84 @@ public class BlockMath {
     public static final EnumMap<Direction, Transformation> vanillaUvTransformLocalToGlobal;
     public static final EnumMap<Direction, Transformation> vanillaUvTransformGlobalToLocal;
     
-    public static Transformation blockCenterToCorner(final Transformation d) {
+    public static Transformation blockCenterToCorner(final Transformation f) {
         final Matrix4f b2 = Matrix4f.createTranslateMatrix(0.5f, 0.5f, 0.5f);
-        b2.multiply(d.getMatrix());
+        b2.multiply(f.getMatrix());
         b2.multiply(Matrix4f.createTranslateMatrix(-0.5f, -0.5f, -0.5f));
         return new Transformation(b2);
     }
     
-    public static Transformation getUVLockTransform(final Transformation d, final Direction fp, final Supplier<String> supplier) {
-        final Direction fp2 = Direction.rotate(d.getMatrix(), fp);
-        final Transformation d2 = d.inverse();
-        if (d2 == null) {
+    public static Transformation getUVLockTransform(final Transformation f, final Direction fz, final Supplier<String> supplier) {
+        final Direction fz2 = Direction.rotate(f.getMatrix(), fz);
+        final Transformation f2 = f.inverse();
+        if (f2 == null) {
             BlockMath.LOGGER.warn((String)supplier.get());
             return new Transformation(null, null, new Vector3f(0.0f, 0.0f, 0.0f), null);
         }
-        final Transformation d3 = BlockMath.vanillaUvTransformGlobalToLocal.get(fp).compose(d2).compose(BlockMath.vanillaUvTransformLocalToGlobal.get(fp2));
-        return blockCenterToCorner(d3);
+        final Transformation f3 = BlockMath.vanillaUvTransformGlobalToLocal.get(fz).compose(f2).compose(BlockMath.vanillaUvTransformLocalToGlobal.get(fz2));
+        return blockCenterToCorner(f3);
     }
     
     static {
         LOGGER = LogManager.getLogger();
         final Direction east;
-        final Quaternion c2;
+        final Quaternion d2;
         final Transformation value;
-        final Object e1;
+        final Object g1;
         final Direction west;
-        final Quaternion c3;
+        final Quaternion d3;
         final Transformation value2;
-        final Object e2;
+        final Object g2;
         final Direction north;
-        final Quaternion c4;
+        final Quaternion d4;
         final Transformation value3;
-        final Object e3;
+        final Object g3;
         final Direction up;
-        final Quaternion c5;
+        final Quaternion d5;
         final Transformation value4;
-        final Object e4;
+        final Object g4;
         final Direction down;
-        final Quaternion c6;
+        final Quaternion d6;
         final Transformation value5;
-        final Object e5;
+        final Object g5;
         vanillaUvTransformLocalToGlobal = Util.<EnumMap<Direction, Transformation>>make(Maps.<Direction, Transformation>newEnumMap(Direction.class), enumMap -> {
             enumMap.put(Direction.SOUTH, Transformation.identity());
             east = Direction.EAST;
             // new(com.mojang.math.Transformation.class)
             new Quaternion(new Vector3f(0.0f, 1.0f, 0.0f), 90.0f, true);
-            new Transformation((Vector3f)e1, c2, null, null);
+            new Transformation((Vector3f)g1, d2, null, null);
             enumMap.put(east, value);
             west = Direction.WEST;
             // new(com.mojang.math.Transformation.class)
             new Quaternion(new Vector3f(0.0f, 1.0f, 0.0f), -90.0f, true);
-            new Transformation((Vector3f)e2, c3, null, null);
+            new Transformation((Vector3f)g2, d3, null, null);
             enumMap.put(west, value2);
             north = Direction.NORTH;
             // new(com.mojang.math.Transformation.class)
             new Quaternion(new Vector3f(0.0f, 1.0f, 0.0f), 180.0f, true);
-            new Transformation((Vector3f)e3, c4, null, null);
+            new Transformation((Vector3f)g3, d4, null, null);
             enumMap.put(north, value3);
             up = Direction.UP;
             // new(com.mojang.math.Transformation.class)
             new Quaternion(new Vector3f(1.0f, 0.0f, 0.0f), -90.0f, true);
-            new Transformation((Vector3f)e4, c5, null, null);
+            new Transformation((Vector3f)g4, d5, null, null);
             enumMap.put(up, value4);
             down = Direction.DOWN;
             // new(com.mojang.math.Transformation.class)
             new Quaternion(new Vector3f(1.0f, 0.0f, 0.0f), 90.0f, true);
-            new Transformation((Vector3f)e5, c6, null, null);
+            new Transformation((Vector3f)g5, d6, null, null);
             enumMap.put(down, value5);
             return;
         });
         final Direction[] array;
         int length;
         int i = 0;
-        Direction fp5;
+        Direction fz5;
         vanillaUvTransformGlobalToLocal = Util.<EnumMap<Direction, Transformation>>make(Maps.<Direction, Transformation>newEnumMap(Direction.class), enumMap -> {
             Direction.values();
             for (length = array.length; i < length; ++i) {
-                fp5 = array[i];
-                enumMap.put(fp5, BlockMath.vanillaUvTransformLocalToGlobal.get(fp5).inverse());
+                fz5 = array[i];
+                enumMap.put(fz5, BlockMath.vanillaUvTransformLocalToGlobal.get(fz5).inverse());
             }
         });
     }
diff --git a/src/net/minecraft/core/BlockPos.java b/src/net/minecraft/core/BlockPos.java
index b76f26b..97ba837 100644
--- a/src/net/minecraft/core/BlockPos.java
+++ b/src/net/minecraft/core/BlockPos.java
@@ -1,29 +1,28 @@
 package net.minecraft.core;
 
-import com.google.common.collect.Lists;
-import java.util.List;
-import net.minecraft.util.Mth;
 import org.apache.logging.log4j.LogManager;
-import java.util.Iterator;
-import com.google.common.collect.AbstractIterator;
-import java.util.stream.StreamSupport;
-import java.util.function.Consumer;
-import java.util.Spliterators;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.stream.Stream;
-import net.minecraft.world.level.block.Rotation;
+import net.minecraft.Util;
+import com.mojang.serialization.DataResult;
 import java.util.stream.IntStream;
-import com.mojang.datafixers.types.DynamicOps;
-import java.util.Spliterator;
-import com.mojang.datafixers.Dynamic;
+import java.util.Iterator;
+import net.minecraft.util.Mth;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import java.util.stream.StreamSupport;
+import java.util.stream.Stream;
+import java.util.Optional;
+import java.util.function.Predicate;
+import com.google.common.collect.AbstractIterator;
+import java.util.Random;
+import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.entity.Entity;
 import org.apache.logging.log4j.Logger;
+import com.mojang.serialization.Codec;
 import javax.annotation.concurrent.Immutable;
-import net.minecraft.util.Serializable;
 
 @Immutable
-public class BlockPos extends Vec3i implements Serializable {
+public class BlockPos extends Vec3i {
+    public static final Codec<BlockPos> CODEC;
     private static final Logger LOGGER;
     public static final BlockPos ZERO;
     private static final int PACKED_X_LENGTH;
@@ -43,38 +42,20 @@ public class BlockPos extends Vec3i implements Serializable {
         super(double1, double2, double3);
     }
     
-    public BlockPos(final Entity akq) {
-        this(akq.getX(), akq.getY(), akq.getZ());
+    public BlockPos(final Vec3 dem) {
+        this(dem.x, dem.y, dem.z);
     }
     
-    public BlockPos(final Vec3 cvl) {
-        this(cvl.x, cvl.y, cvl.z);
+    public BlockPos(final Position gj) {
+        this(gj.x(), gj.y(), gj.z());
     }
     
-    public BlockPos(final Position fz) {
-        this(fz.x(), fz.y(), fz.z());
+    public BlockPos(final Vec3i gr) {
+        this(gr.getX(), gr.getY(), gr.getZ());
     }
     
-    public BlockPos(final Vec3i gg) {
-        this(gg.getX(), gg.getY(), gg.getZ());
-    }
-    
-    public static <T> BlockPos deserialize(final Dynamic<T> dynamic) {
-        final Spliterator.OfInt ofInt2 = dynamic.asIntStream().spliterator();
-        final int[] arr3 = new int[3];
-        if (ofInt2.tryAdvance(integer -> arr3[0] = integer) && ofInt2.tryAdvance(integer -> arr3[1] = integer)) {
-            ofInt2.tryAdvance(integer -> arr3[2] = integer);
-        }
-        return new BlockPos(arr3[0], arr3[1], arr3[2]);
-    }
-    
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)dynamicOps.createIntList(IntStream.of(this.getX(), this.getY(), this.getZ()));
-    }
-    
-    public static long offset(final long long1, final Direction fp) {
-        return offset(long1, fp.getStepX(), fp.getStepY(), fp.getStepZ());
+    public static long offset(final long long1, final Direction fz) {
+        return offset(long1, fz.getStepX(), fz.getStepY(), fz.getStepZ());
     }
     
     public static long offset(final long long1, final int integer2, final int integer3, final int integer4) {
@@ -97,6 +78,10 @@ public class BlockPos extends Vec3i implements Serializable {
         return new BlockPos(getX(long1), getY(long1), getZ(long1));
     }
     
+    public long asLong() {
+        return asLong(this.getX(), this.getY(), this.getZ());
+    }
+    
     public static long asLong(final int integer1, final int integer2, final int integer3) {
         long long4 = 0L;
         long4 |= ((long)integer1 & BlockPos.PACKED_X_MASK) << BlockPos.X_OFFSET;
@@ -109,10 +94,6 @@ public class BlockPos extends Vec3i implements Serializable {
         return long1 & 0xFFFFFFFFFFFFFFF0L;
     }
     
-    public long asLong() {
-        return asLong(this.getX(), this.getY(), this.getZ());
-    }
-    
     public BlockPos offset(final double double1, final double double2, final double double3) {
         if (double1 == 0.0 && double2 == 0.0 && double3 == 0.0) {
             return this;
@@ -127,12 +108,12 @@ public class BlockPos extends Vec3i implements Serializable {
         return new BlockPos(this.getX() + integer1, this.getY() + integer2, this.getZ() + integer3);
     }
     
-    public BlockPos offset(final Vec3i gg) {
-        return this.offset(gg.getX(), gg.getY(), gg.getZ());
+    public BlockPos offset(final Vec3i gr) {
+        return this.offset(gr.getX(), gr.getY(), gr.getZ());
     }
     
-    public BlockPos subtract(final Vec3i gg) {
-        return this.offset(-gg.getX(), -gg.getY(), -gg.getZ());
+    public BlockPos subtract(final Vec3i gr) {
+        return this.offset(-gr.getX(), -gr.getY(), -gr.getZ());
     }
     
     public BlockPos above() {
@@ -185,20 +166,20 @@ public class BlockPos extends Vec3i implements Serializable {
         return this.relative(Direction.EAST, integer);
     }
     
-    public BlockPos relative(final Direction fp) {
-        return new BlockPos(this.getX() + fp.getStepX(), this.getY() + fp.getStepY(), this.getZ() + fp.getStepZ());
+    public BlockPos relative(final Direction fz) {
+        return new BlockPos(this.getX() + fz.getStepX(), this.getY() + fz.getStepY(), this.getZ() + fz.getStepZ());
     }
     
     @Override
-    public BlockPos relative(final Direction fp, final int integer) {
+    public BlockPos relative(final Direction fz, final int integer) {
         if (integer == 0) {
             return this;
         }
-        return new BlockPos(this.getX() + fp.getStepX() * integer, this.getY() + fp.getStepY() * integer, this.getZ() + fp.getStepZ() * integer);
+        return new BlockPos(this.getX() + fz.getStepX() * integer, this.getY() + fz.getStepY() * integer, this.getZ() + fz.getStepZ() * integer);
     }
     
-    public BlockPos rotate(final Rotation btu) {
-        switch (btu) {
+    public BlockPos rotate(final Rotation cap) {
+        switch (cap) {
             default: {
                 return this;
             }
@@ -215,66 +196,176 @@ public class BlockPos extends Vec3i implements Serializable {
     }
     
     @Override
-    public BlockPos cross(final Vec3i gg) {
-        return new BlockPos(this.getY() * gg.getZ() - this.getZ() * gg.getY(), this.getZ() * gg.getX() - this.getX() * gg.getZ(), this.getX() * gg.getY() - this.getY() * gg.getX());
+    public BlockPos cross(final Vec3i gr) {
+        return new BlockPos(this.getY() * gr.getZ() - this.getZ() * gr.getY(), this.getZ() * gr.getX() - this.getX() * gr.getZ(), this.getX() * gr.getY() - this.getY() * gr.getX());
     }
     
     public BlockPos immutable() {
         return this;
     }
     
-    public static Iterable<BlockPos> betweenClosed(final BlockPos fk1, final BlockPos fk2) {
-        return betweenClosed(Math.min(fk1.getX(), fk2.getX()), Math.min(fk1.getY(), fk2.getY()), Math.min(fk1.getZ(), fk2.getZ()), Math.max(fk1.getX(), fk2.getX()), Math.max(fk1.getY(), fk2.getY()), Math.max(fk1.getZ(), fk2.getZ()));
+    public MutableBlockPos mutable() {
+        return new MutableBlockPos(this.getX(), this.getY(), this.getZ());
     }
     
-    public static Stream<BlockPos> betweenClosedStream(final BlockPos fk1, final BlockPos fk2) {
-        return betweenClosedStream(Math.min(fk1.getX(), fk2.getX()), Math.min(fk1.getY(), fk2.getY()), Math.min(fk1.getZ(), fk2.getZ()), Math.max(fk1.getX(), fk2.getX()), Math.max(fk1.getY(), fk2.getY()), Math.max(fk1.getZ(), fk2.getZ()));
-    }
-    
-    public static Stream<BlockPos> betweenClosedStream(final BoundingBox clb) {
-        return betweenClosedStream(Math.min(clb.x0, clb.x1), Math.min(clb.y0, clb.y1), Math.min(clb.z0, clb.z1), Math.max(clb.x0, clb.x1), Math.max(clb.y0, clb.y1), Math.max(clb.z0, clb.z1));
-    }
-    
-    public static Stream<BlockPos> betweenClosedStream(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        return StreamSupport.<BlockPos>stream((Spliterator<BlockPos>)new Spliterators.AbstractSpliterator<BlockPos>((long)((integer4 - integer1 + 1) * (integer5 - integer2 + 1) * (integer6 - integer3 + 1)), 64) {
-            final Cursor3D cursor = new Cursor3D(integer1, integer2, integer3, integer4, integer5, integer6);
-            final MutableBlockPos nextPos = new MutableBlockPos();
-            
-            @Override
-            public boolean tryAdvance(final Consumer<? super BlockPos> consumer) {
-                if (this.cursor.advance()) {
-                    consumer.accept(this.nextPos.set(this.cursor.nextX(), this.cursor.nextY(), this.cursor.nextZ()));
-                    return true;
-                }
-                return false;
-            }
-        }, false);
-    }
-    
-    public static Iterable<BlockPos> betweenClosed(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+    public static Iterable<BlockPos> randomBetweenClosed(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
+        final int integer9 = integer6 - integer3 + 1;
+        final int integer10 = integer7 - integer4 + 1;
+        final int integer11 = integer8 - integer5 + 1;
         return () -> new AbstractIterator<BlockPos>() {
-            final Cursor3D cursor;
             final MutableBlockPos nextPos;
+            int counter;
+            final /* synthetic */ int val$limit;
             final /* synthetic */ int val$minX;
+            final /* synthetic */ Random val$random;
+            final /* synthetic */ int val$width;
             final /* synthetic */ int val$minY;
+            final /* synthetic */ int val$height;
             final /* synthetic */ int val$minZ;
-            final /* synthetic */ int val$maxX;
-            final /* synthetic */ int val$maxY;
-            final /* synthetic */ int val$maxZ;
+            final /* synthetic */ int val$depth;
             
             {
-                this.cursor = new Cursor3D(this.val$minX, this.val$minY, this.val$minZ, this.val$maxX, this.val$maxY, this.val$maxZ);
                 this.nextPos = new MutableBlockPos();
+                this.counter = this.val$limit;
             }
             
             @Override
             protected BlockPos computeNext() {
-                return this.cursor.advance() ? this.nextPos.set(this.cursor.nextX(), this.cursor.nextY(), this.cursor.nextZ()) : this.endOfData();
+                if (this.counter <= 0) {
+                    return this.endOfData();
+                }
+                final BlockPos fu2 = this.nextPos.set(this.val$minX + this.val$random.nextInt(this.val$width), this.val$minY + this.val$random.nextInt(this.val$height), this.val$minZ + this.val$random.nextInt(this.val$depth));
+                --this.counter;
+                return fu2;
+            }
+        };
+    }
+    
+    public static Iterable<BlockPos> withinManhattan(final BlockPos fu, final int integer2, final int integer3, final int integer4) {
+        final int integer5 = integer2 + integer3 + integer4;
+        final int integer6 = fu.getX();
+        final int integer7 = fu.getY();
+        final int integer8 = fu.getZ();
+        return () -> new AbstractIterator<BlockPos>() {
+            private final MutableBlockPos cursor;
+            private int currentDepth;
+            private int maxX;
+            private int maxY;
+            private int x;
+            private int y;
+            private boolean zMirror;
+            final /* synthetic */ int val$originZ;
+            final /* synthetic */ int val$maxDepth;
+            final /* synthetic */ int val$reachX;
+            final /* synthetic */ int val$reachY;
+            final /* synthetic */ int val$reachZ;
+            final /* synthetic */ int val$originX;
+            final /* synthetic */ int val$originY;
+            
+            {
+                this.cursor = new MutableBlockPos();
+            }
+            
+            @Override
+            protected BlockPos computeNext() {
+                if (this.zMirror) {
+                    this.zMirror = false;
+                    this.cursor.setZ(this.val$originZ - (this.cursor.getZ() - this.val$originZ));
+                    return this.cursor;
+                }
+                BlockPos fu2 = null;
+                while (fu2 == null) {
+                    if (this.y > this.maxY) {
+                        ++this.x;
+                        if (this.x > this.maxX) {
+                            ++this.currentDepth;
+                            if (this.currentDepth > this.val$maxDepth) {
+                                return this.endOfData();
+                            }
+                            this.maxX = Math.min(this.val$reachX, this.currentDepth);
+                            this.x = -this.maxX;
+                        }
+                        this.maxY = Math.min(this.val$reachY, this.currentDepth - Math.abs(this.x));
+                        this.y = -this.maxY;
+                    }
+                    final int integer3 = this.x;
+                    final int integer4 = this.y;
+                    final int integer5 = this.currentDepth - Math.abs(integer3) - Math.abs(integer4);
+                    if (integer5 <= this.val$reachZ) {
+                        this.zMirror = (integer5 != 0);
+                        fu2 = this.cursor.set(this.val$originX + integer3, this.val$originY + integer4, this.val$originZ + integer5);
+                    }
+                    ++this.y;
+                }
+                return fu2;
+            }
+        };
+    }
+    
+    public static Optional<BlockPos> findClosestMatch(final BlockPos fu, final int integer2, final int integer3, final Predicate<BlockPos> predicate) {
+        return withinManhattanStream(fu, integer2, integer3, integer2).filter(predicate).findFirst();
+    }
+    
+    public static Stream<BlockPos> withinManhattanStream(final BlockPos fu, final int integer2, final int integer3, final int integer4) {
+        return StreamSupport.<BlockPos>stream(withinManhattan(fu, integer2, integer3, integer4).spliterator(), false);
+    }
+    
+    public static Iterable<BlockPos> betweenClosed(final BlockPos fu1, final BlockPos fu2) {
+        return betweenClosed(Math.min(fu1.getX(), fu2.getX()), Math.min(fu1.getY(), fu2.getY()), Math.min(fu1.getZ(), fu2.getZ()), Math.max(fu1.getX(), fu2.getX()), Math.max(fu1.getY(), fu2.getY()), Math.max(fu1.getZ(), fu2.getZ()));
+    }
+    
+    public static Stream<BlockPos> betweenClosedStream(final BlockPos fu1, final BlockPos fu2) {
+        return StreamSupport.<BlockPos>stream(betweenClosed(fu1, fu2).spliterator(), false);
+    }
+    
+    public static Stream<BlockPos> betweenClosedStream(final BoundingBox ctd) {
+        return betweenClosedStream(Math.min(ctd.x0, ctd.x1), Math.min(ctd.y0, ctd.y1), Math.min(ctd.z0, ctd.z1), Math.max(ctd.x0, ctd.x1), Math.max(ctd.y0, ctd.y1), Math.max(ctd.z0, ctd.z1));
+    }
+    
+    public static Stream<BlockPos> betweenClosedStream(final AABB deg) {
+        return betweenClosedStream(Mth.floor(deg.minX), Mth.floor(deg.minY), Mth.floor(deg.minZ), Mth.floor(deg.maxX), Mth.floor(deg.maxY), Mth.floor(deg.maxZ));
+    }
+    
+    public static Stream<BlockPos> betweenClosedStream(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        return StreamSupport.<BlockPos>stream(betweenClosed(integer1, integer2, integer3, integer4, integer5, integer6).spliterator(), false);
+    }
+    
+    public static Iterable<BlockPos> betweenClosed(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        final int integer7 = integer4 - integer1 + 1;
+        final int integer8 = integer5 - integer2 + 1;
+        final int integer9 = integer6 - integer3 + 1;
+        final int integer10 = integer7 * integer8 * integer9;
+        return () -> new AbstractIterator<BlockPos>() {
+            private final MutableBlockPos cursor;
+            private int index;
+            final /* synthetic */ int val$end;
+            final /* synthetic */ int val$width;
+            final /* synthetic */ int val$height;
+            final /* synthetic */ int val$minX;
+            final /* synthetic */ int val$minY;
+            final /* synthetic */ int val$minZ;
+            
+            {
+                this.cursor = new MutableBlockPos();
+            }
+            
+            @Override
+            protected BlockPos computeNext() {
+                if (this.index == this.val$end) {
+                    return this.endOfData();
+                }
+                final int integer2 = this.index % this.val$width;
+                final int integer3 = this.index / this.val$width;
+                final int integer4 = integer3 % this.val$height;
+                final int integer5 = integer3 / this.val$height;
+                ++this.index;
+                return this.cursor.set(this.val$minX + integer2, this.val$minY + integer4, this.val$minZ + integer5);
             }
         };
     }
     
     static {
+        CODEC = Codec.INT_STREAM.comapFlatMap(intStream -> Util.fixedSize(intStream, 3).map(arr -> new BlockPos(arr[0], arr[1], arr[2])), fu -> IntStream.of(fu.getX(), fu.getY(), fu.getZ())).stable();
         LOGGER = LogManager.getLogger();
         ZERO = new BlockPos(0, 0, 0);
         PACKED_X_LENGTH = 1 + Mth.log2(Mth.smallestEncompassingPowerOfTwo(30000000));
@@ -288,33 +379,18 @@ public class BlockPos extends Vec3i implements Serializable {
     }
     
     public static class MutableBlockPos extends BlockPos {
-        protected int x;
-        protected int y;
-        protected int z;
-        
         public MutableBlockPos() {
             this(0, 0, 0);
         }
         
-        public MutableBlockPos(final BlockPos fk) {
-            this(fk.getX(), fk.getY(), fk.getZ());
-        }
-        
         public MutableBlockPos(final int integer1, final int integer2, final int integer3) {
-            super(0, 0, 0);
-            this.x = integer1;
-            this.y = integer2;
-            this.z = integer3;
+            super(integer1, integer2, integer3);
         }
         
         public MutableBlockPos(final double double1, final double double2, final double double3) {
             this(Mth.floor(double1), Mth.floor(double2), Mth.floor(double3));
         }
         
-        public MutableBlockPos(final Entity akq) {
-            this(akq.getX(), akq.getY(), akq.getZ());
-        }
-        
         @Override
         public BlockPos offset(final double double1, final double double2, final double double3) {
             return super.offset(double1, double2, double3).immutable();
@@ -326,79 +402,85 @@ public class BlockPos extends Vec3i implements Serializable {
         }
         
         @Override
-        public BlockPos relative(final Direction fp, final int integer) {
-            return super.relative(fp, integer).immutable();
+        public BlockPos relative(final Direction fz, final int integer) {
+            return super.relative(fz, integer).immutable();
         }
         
         @Override
-        public BlockPos rotate(final Rotation btu) {
-            return super.rotate(btu).immutable();
-        }
-        
-        @Override
-        public int getX() {
-            return this.x;
-        }
-        
-        @Override
-        public int getY() {
-            return this.y;
-        }
-        
-        @Override
-        public int getZ() {
-            return this.z;
+        public BlockPos rotate(final Rotation cap) {
+            return super.rotate(cap).immutable();
         }
         
         public MutableBlockPos set(final int integer1, final int integer2, final int integer3) {
-            this.x = integer1;
-            this.y = integer2;
-            this.z = integer3;
+            this.setX(integer1);
+            this.setY(integer2);
+            this.setZ(integer3);
             return this;
         }
         
-        public MutableBlockPos set(final Entity akq) {
-            return this.set(akq.getX(), akq.getY(), akq.getZ());
-        }
-        
         public MutableBlockPos set(final double double1, final double double2, final double double3) {
             return this.set(Mth.floor(double1), Mth.floor(double2), Mth.floor(double3));
         }
         
-        public MutableBlockPos set(final Vec3i gg) {
-            return this.set(gg.getX(), gg.getY(), gg.getZ());
+        public MutableBlockPos set(final Vec3i gr) {
+            return this.set(gr.getX(), gr.getY(), gr.getZ());
         }
         
         public MutableBlockPos set(final long long1) {
             return this.set(BlockPos.getX(long1), BlockPos.getY(long1), BlockPos.getZ(long1));
         }
         
-        public MutableBlockPos set(final AxisCycle fi, final int integer2, final int integer3, final int integer4) {
-            return this.set(fi.cycle(integer2, integer3, integer4, Direction.Axis.X), fi.cycle(integer2, integer3, integer4, Direction.Axis.Y), fi.cycle(integer2, integer3, integer4, Direction.Axis.Z));
+        public MutableBlockPos set(final AxisCycle fs, final int integer2, final int integer3, final int integer4) {
+            return this.set(fs.cycle(integer2, integer3, integer4, Direction.Axis.X), fs.cycle(integer2, integer3, integer4, Direction.Axis.Y), fs.cycle(integer2, integer3, integer4, Direction.Axis.Z));
         }
         
-        public MutableBlockPos move(final Direction fp) {
-            return this.move(fp, 1);
+        public MutableBlockPos setWithOffset(final Vec3i gr, final Direction fz) {
+            return this.set(gr.getX() + fz.getStepX(), gr.getY() + fz.getStepY(), gr.getZ() + fz.getStepZ());
         }
         
-        public MutableBlockPos move(final Direction fp, final int integer) {
-            return this.set(this.x + fp.getStepX() * integer, this.y + fp.getStepY() * integer, this.z + fp.getStepZ() * integer);
+        public MutableBlockPos setWithOffset(final Vec3i gr, final int integer2, final int integer3, final int integer4) {
+            return this.set(gr.getX() + integer2, gr.getY() + integer3, gr.getZ() + integer4);
+        }
+        
+        public MutableBlockPos move(final Direction fz) {
+            return this.move(fz, 1);
+        }
+        
+        public MutableBlockPos move(final Direction fz, final int integer) {
+            return this.set(this.getX() + fz.getStepX() * integer, this.getY() + fz.getStepY() * integer, this.getZ() + fz.getStepZ() * integer);
         }
         
         public MutableBlockPos move(final int integer1, final int integer2, final int integer3) {
-            return this.set(this.x + integer1, this.y + integer2, this.z + integer3);
+            return this.set(this.getX() + integer1, this.getY() + integer2, this.getZ() + integer3);
+        }
+        
+        public MutableBlockPos clamp(final Direction.Axis a, final int integer2, final int integer3) {
+            switch (a) {
+                case X: {
+                    return this.set(Mth.clamp(this.getX(), integer2, integer3), this.getY(), this.getZ());
+                }
+                case Y: {
+                    return this.set(this.getX(), Mth.clamp(this.getY(), integer2, integer3), this.getZ());
+                }
+                case Z: {
+                    return this.set(this.getX(), this.getY(), Mth.clamp(this.getZ(), integer2, integer3));
+                }
+                default: {
+                    throw new IllegalStateException("Unable to clamp axis " + a);
+                }
+            }
         }
         
         public void setX(final int integer) {
-            this.x = integer;
+            super.setX(integer);
         }
         
         public void setY(final int integer) {
-            this.y = integer;
+            super.setY(integer);
         }
         
         public void setZ(final int integer) {
-            this.z = integer;
+            super.setZ(integer);
         }
         
         @Override
@@ -406,88 +488,4 @@ public class BlockPos extends Vec3i implements Serializable {
             return new BlockPos(this);
         }
     }
-    
-    public static final class PooledMutableBlockPos extends MutableBlockPos implements AutoCloseable {
-        private boolean free;
-        private static final List<PooledMutableBlockPos> POOL;
-        
-        private PooledMutableBlockPos(final int integer1, final int integer2, final int integer3) {
-            super(integer1, integer2, integer3);
-        }
-        
-        public static PooledMutableBlockPos acquire() {
-            return acquire(0, 0, 0);
-        }
-        
-        public static PooledMutableBlockPos acquire(final Entity akq) {
-            return acquire(akq.getX(), akq.getY(), akq.getZ());
-        }
-        
-        public static PooledMutableBlockPos acquire(final double double1, final double double2, final double double3) {
-            return acquire(Mth.floor(double1), Mth.floor(double2), Mth.floor(double3));
-        }
-        
-        public static PooledMutableBlockPos acquire(final int integer1, final int integer2, final int integer3) {
-            synchronized (PooledMutableBlockPos.POOL) {
-                if (!PooledMutableBlockPos.POOL.isEmpty()) {
-                    final PooledMutableBlockPos b5 = PooledMutableBlockPos.POOL.remove(PooledMutableBlockPos.POOL.size() - 1);
-                    if (b5 != null && b5.free) {
-                        b5.free = false;
-                        b5.set(integer1, integer2, integer3);
-                        return b5;
-                    }
-                }
-            }
-            return new PooledMutableBlockPos(integer1, integer2, integer3);
-        }
-        
-        @Override
-        public PooledMutableBlockPos set(final int integer1, final int integer2, final int integer3) {
-            return (PooledMutableBlockPos)super.set(integer1, integer2, integer3);
-        }
-        
-        @Override
-        public PooledMutableBlockPos set(final Entity akq) {
-            return (PooledMutableBlockPos)super.set(akq);
-        }
-        
-        @Override
-        public PooledMutableBlockPos set(final double double1, final double double2, final double double3) {
-            return (PooledMutableBlockPos)super.set(double1, double2, double3);
-        }
-        
-        @Override
-        public PooledMutableBlockPos set(final Vec3i gg) {
-            return (PooledMutableBlockPos)super.set(gg);
-        }
-        
-        @Override
-        public PooledMutableBlockPos move(final Direction fp) {
-            return (PooledMutableBlockPos)super.move(fp);
-        }
-        
-        @Override
-        public PooledMutableBlockPos move(final Direction fp, final int integer) {
-            return (PooledMutableBlockPos)super.move(fp, integer);
-        }
-        
-        @Override
-        public PooledMutableBlockPos move(final int integer1, final int integer2, final int integer3) {
-            return (PooledMutableBlockPos)super.move(integer1, integer2, integer3);
-        }
-        
-        @Override
-        public void close() {
-            synchronized (PooledMutableBlockPos.POOL) {
-                if (PooledMutableBlockPos.POOL.size() < 100) {
-                    PooledMutableBlockPos.POOL.add(this);
-                }
-                this.free = true;
-            }
-        }
-        
-        static {
-            POOL = Lists.newArrayList();
-        }
-    }
 }
diff --git a/src/net/minecraft/core/BlockSourceImpl.java b/src/net/minecraft/core/BlockSourceImpl.java
index 71bf459..9d0be94 100644
--- a/src/net/minecraft/core/BlockSourceImpl.java
+++ b/src/net/minecraft/core/BlockSourceImpl.java
@@ -8,9 +8,9 @@ public class BlockSourceImpl implements BlockSource {
     private final Level level;
     private final BlockPos pos;
     
-    public BlockSourceImpl(final Level bjw, final BlockPos fk) {
-        this.level = bjw;
-        this.pos = fk;
+    public BlockSourceImpl(final Level bqb, final BlockPos fu) {
+        this.level = bqb;
+        this.pos = fu;
     }
     
     @Override
diff --git a/src/net/minecraft/core/Cursor3D.java b/src/net/minecraft/core/Cursor3D.java
index 1d3eac4..5a44c1d 100644
--- a/src/net/minecraft/core/Cursor3D.java
+++ b/src/net/minecraft/core/Cursor3D.java
@@ -1,72 +1,61 @@
 package net.minecraft.core;
 
 public class Cursor3D {
-    private final int minX;
-    private final int minY;
-    private final int minZ;
-    private final int maxX;
-    private final int maxY;
-    private final int maxZ;
+    private int originX;
+    private int originY;
+    private int originZ;
+    private int width;
+    private int height;
+    private int depth;
+    private int end;
+    private int index;
     private int x;
     private int y;
     private int z;
-    private boolean started;
     
     public Cursor3D(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.minX = integer1;
-        this.minY = integer2;
-        this.minZ = integer3;
-        this.maxX = integer4;
-        this.maxY = integer5;
-        this.maxZ = integer6;
+        this.originX = integer1;
+        this.originY = integer2;
+        this.originZ = integer3;
+        this.width = integer4 - integer1 + 1;
+        this.height = integer5 - integer2 + 1;
+        this.depth = integer6 - integer3 + 1;
+        this.end = this.width * this.height * this.depth;
     }
     
     public boolean advance() {
-        if (!this.started) {
-            this.x = this.minX;
-            this.y = this.minY;
-            this.z = this.minZ;
-            return this.started = true;
-        }
-        if (this.x == this.maxX && this.y == this.maxY && this.z == this.maxZ) {
+        if (this.index == this.end) {
             return false;
         }
-        if (this.x < this.maxX) {
-            ++this.x;
-        }
-        else if (this.y < this.maxY) {
-            this.x = this.minX;
-            ++this.y;
-        }
-        else if (this.z < this.maxZ) {
-            this.x = this.minX;
-            this.y = this.minY;
-            ++this.z;
-        }
+        this.x = this.index % this.width;
+        final int integer2 = this.index / this.width;
+        this.y = integer2 % this.height;
+        this.z = integer2 / this.height;
+        ++this.index;
         return true;
     }
     
     public int nextX() {
-        return this.x;
+        return this.originX + this.x;
     }
     
     public int nextY() {
-        return this.y;
+        return this.originY + this.y;
     }
     
     public int nextZ() {
-        return this.z;
+        return this.originZ + this.z;
     }
     
     public int getNextType() {
         int integer2 = 0;
-        if (this.x == this.minX || this.x == this.maxX) {
+        if (this.x == 0 || this.x == this.width - 1) {
             ++integer2;
         }
-        if (this.y == this.minY || this.y == this.maxY) {
+        if (this.y == 0 || this.y == this.height - 1) {
             ++integer2;
         }
-        if (this.z == this.minZ || this.z == this.maxZ) {
+        if (this.z == 0 || this.z == this.depth - 1) {
             ++integer2;
         }
         return integer2;
diff --git a/src/net/minecraft/core/DefaultedRegistry.java b/src/net/minecraft/core/DefaultedRegistry.java
index 981b298..af1d39d 100644
--- a/src/net/minecraft/core/DefaultedRegistry.java
+++ b/src/net/minecraft/core/DefaultedRegistry.java
@@ -3,22 +3,25 @@ package net.minecraft.core;
 import java.util.Random;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 
 public class DefaultedRegistry<T> extends MappedRegistry<T> {
     private final ResourceLocation defaultKey;
     private T defaultValue;
     
-    public DefaultedRegistry(final String string) {
+    public DefaultedRegistry(final String string, final ResourceKey<Registry<T>> ug, final Lifecycle lifecycle) {
+        super(ug, lifecycle);
         this.defaultKey = new ResourceLocation(string);
     }
     
     @Override
-    public <V extends T> V registerMapping(final int integer, final ResourceLocation sm, final V object) {
-        if (this.defaultKey.equals(sm)) {
+    public <V extends T> V registerMapping(final int integer, final ResourceKey<T> ug, final V object) {
+        if (this.defaultKey.equals(ug.location())) {
             this.defaultValue = object;
         }
-        return super.<V>registerMapping(integer, sm, object);
+        return super.<V>registerMapping(integer, ug, object);
     }
     
     @Override
@@ -30,14 +33,14 @@ public class DefaultedRegistry<T> extends MappedRegistry<T> {
     @Nonnull
     @Override
     public ResourceLocation getKey(final T object) {
-        final ResourceLocation sm3 = super.getKey(object);
-        return (sm3 == null) ? this.defaultKey : sm3;
+        final ResourceLocation uh3 = super.getKey(object);
+        return (uh3 == null) ? this.defaultKey : uh3;
     }
     
     @Nonnull
     @Override
-    public T get(@Nullable final ResourceLocation sm) {
-        final T object3 = super.get(sm);
+    public T get(@Nullable final ResourceLocation uh) {
+        final T object3 = super.get(uh);
         return (object3 == null) ? this.defaultValue : object3;
     }
     
diff --git a/src/net/minecraft/core/Direction.java b/src/net/minecraft/core/Direction.java
index aaafe08..99588f7 100644
--- a/src/net/minecraft/core/Direction.java
+++ b/src/net/minecraft/core/Direction.java
@@ -1,7 +1,9 @@
 package net.minecraft.core;
 
+import java.util.stream.Stream;
 import com.google.common.collect.Iterators;
 import java.util.Iterator;
+import com.mojang.serialization.Codec;
 import java.util.function.Predicate;
 import java.util.stream.Collector;
 import java.util.function.Supplier;
@@ -10,6 +12,7 @@ import java.util.Comparator;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.Arrays;
+import net.minecraft.Util;
 import java.util.Random;
 import java.util.Locale;
 import javax.annotation.Nullable;
@@ -44,19 +47,19 @@ public enum Direction implements StringRepresentable {
     private static final Direction[] BY_2D_DATA;
     private static final Long2ObjectMap<Direction> BY_NORMAL;
     
-    private Direction(final int integer3, final int integer4, final int integer5, final String string6, final AxisDirection b, final Axis a, final Vec3i gg) {
+    private Direction(final int integer3, final int integer4, final int integer5, final String string6, final AxisDirection b, final Axis a, final Vec3i gr) {
         this.data3d = integer3;
         this.data2d = integer5;
         this.oppositeIndex = integer4;
         this.name = string6;
         this.axis = a;
         this.axisDirection = b;
-        this.normal = gg;
+        this.normal = gr;
     }
     
-    public static Direction[] orderedByNearest(final Entity akq) {
-        final float float2 = akq.getViewXRot(1.0f) * 0.017453292f;
-        final float float3 = -akq.getViewYRot(1.0f) * 0.017453292f;
+    public static Direction[] orderedByNearest(final Entity aom) {
+        final float float2 = aom.getViewXRot(1.0f) * 0.017453292f;
+        final float float3 = -aom.getViewYRot(1.0f) * 0.017453292f;
         final float float4 = Mth.sin(float2);
         final float float5 = Mth.cos(float2);
         final float float6 = Mth.sin(float3);
@@ -69,42 +72,42 @@ public enum Direction implements StringRepresentable {
         final float float10 = boolean10 ? float7 : (-float7);
         final float float11 = float8 * float5;
         final float float12 = float10 * float5;
-        final Direction fp16 = boolean8 ? Direction.EAST : Direction.WEST;
-        final Direction fp17 = boolean9 ? Direction.UP : Direction.DOWN;
-        final Direction fp18 = boolean10 ? Direction.SOUTH : Direction.NORTH;
+        final Direction fz16 = boolean8 ? Direction.EAST : Direction.WEST;
+        final Direction fz17 = boolean9 ? Direction.UP : Direction.DOWN;
+        final Direction fz18 = boolean10 ? Direction.SOUTH : Direction.NORTH;
         if (float8 > float10) {
             if (float9 > float11) {
-                return makeDirectionArray(fp17, fp16, fp18);
+                return makeDirectionArray(fz17, fz16, fz18);
             }
             if (float12 > float9) {
-                return makeDirectionArray(fp16, fp18, fp17);
+                return makeDirectionArray(fz16, fz18, fz17);
             }
-            return makeDirectionArray(fp16, fp17, fp18);
+            return makeDirectionArray(fz16, fz17, fz18);
         }
         else {
             if (float9 > float12) {
-                return makeDirectionArray(fp17, fp18, fp16);
+                return makeDirectionArray(fz17, fz18, fz16);
             }
             if (float11 > float9) {
-                return makeDirectionArray(fp18, fp16, fp17);
+                return makeDirectionArray(fz18, fz16, fz17);
             }
-            return makeDirectionArray(fp18, fp17, fp16);
+            return makeDirectionArray(fz18, fz17, fz16);
         }
     }
     
-    private static Direction[] makeDirectionArray(final Direction fp1, final Direction fp2, final Direction fp3) {
-        return new Direction[] { fp1, fp2, fp3, fp3.getOpposite(), fp2.getOpposite(), fp1.getOpposite() };
+    private static Direction[] makeDirectionArray(final Direction fz1, final Direction fz2, final Direction fz3) {
+        return new Direction[] { fz1, fz2, fz3, fz3.getOpposite(), fz2.getOpposite(), fz1.getOpposite() };
     }
     
-    public static Direction rotate(final Matrix4f b, final Direction fp) {
-        final Vec3i gg3 = fp.getNormal();
-        final Vector4f f4 = new Vector4f((float)gg3.getX(), (float)gg3.getY(), (float)gg3.getZ(), 0.0f);
-        f4.transform(b);
-        return getNearest(f4.x(), f4.y(), f4.z());
+    public static Direction rotate(final Matrix4f b, final Direction fz) {
+        final Vec3i gr3 = fz.getNormal();
+        final Vector4f h4 = new Vector4f((float)gr3.getX(), (float)gr3.getY(), (float)gr3.getZ(), 0.0f);
+        h4.transform(b);
+        return getNearest(h4.x(), h4.y(), h4.z());
     }
     
     public Quaternion getRotation() {
-        final Quaternion c2 = Vector3f.XP.rotationDegrees(90.0f);
+        final Quaternion d2 = Vector3f.XP.rotationDegrees(90.0f);
         switch (this) {
             case DOWN: {
                 return Vector3f.XP.rotationDegrees(180.0f);
@@ -113,19 +116,19 @@ public enum Direction implements StringRepresentable {
                 return Quaternion.ONE.copy();
             }
             case NORTH: {
-                c2.mul(Vector3f.ZP.rotationDegrees(180.0f));
-                return c2;
+                d2.mul(Vector3f.ZP.rotationDegrees(180.0f));
+                return d2;
             }
             case SOUTH: {
-                return c2;
+                return d2;
             }
             case WEST: {
-                c2.mul(Vector3f.ZP.rotationDegrees(90.0f));
-                return c2;
+                d2.mul(Vector3f.ZP.rotationDegrees(90.0f));
+                return d2;
             }
             default: {
-                c2.mul(Vector3f.ZP.rotationDegrees(-90.0f));
-                return c2;
+                d2.mul(Vector3f.ZP.rotationDegrees(-90.0f));
+                return d2;
             }
         }
     }
@@ -253,8 +256,8 @@ public enum Direction implements StringRepresentable {
         return (float)((this.data2d & 0x3) * 90);
     }
     
-    public static Direction getRandomFace(final Random random) {
-        return values()[random.nextInt(values().length)];
+    public static Direction getRandom(final Random random) {
+        return Util.<Direction>getRandom(Direction.VALUES, random);
     }
     
     public static Direction getNearest(final double double1, final double double2, final double double3) {
@@ -262,16 +265,16 @@ public enum Direction implements StringRepresentable {
     }
     
     public static Direction getNearest(final float float1, final float float2, final float float3) {
-        Direction fp4 = Direction.NORTH;
+        Direction fz4 = Direction.NORTH;
         float float4 = Float.MIN_VALUE;
-        for (final Direction fp5 : Direction.VALUES) {
-            final float float5 = float1 * fp5.normal.getX() + float2 * fp5.normal.getY() + float3 * fp5.normal.getZ();
+        for (final Direction fz5 : Direction.VALUES) {
+            final float float5 = float1 * fz5.normal.getX() + float2 * fz5.normal.getY() + float3 * fz5.normal.getZ();
             if (float5 > float4) {
                 float4 = float5;
-                fp4 = fp5;
+                fz4 = fz5;
             }
         }
-        return fp4;
+        return fz4;
     }
     
     @Override
@@ -285,9 +288,9 @@ public enum Direction implements StringRepresentable {
     }
     
     public static Direction get(final AxisDirection b, final Axis a) {
-        for (final Direction fp6 : values()) {
-            if (fp6.getAxisDirection() == b && fp6.getAxis() == a) {
-                return fp6;
+        for (final Direction fz6 : Direction.VALUES) {
+            if (fz6.getAxisDirection() == b && fz6.getAxis() == a) {
+                return fz6;
             }
         }
         throw new IllegalArgumentException("No such direction: " + b + " " + a);
@@ -299,10 +302,10 @@ public enum Direction implements StringRepresentable {
     
     static {
         VALUES = values();
-        BY_NAME = Arrays.<Direction>stream(Direction.VALUES).collect(Collectors.toMap(Direction::getName, fp -> fp));
-        BY_3D_DATA = Arrays.<Direction>stream(Direction.VALUES).sorted(Comparator.comparingInt(fp -> fp.data3d)).<Direction>toArray(Direction[]::new);
-        BY_2D_DATA = Arrays.<Direction>stream(Direction.VALUES).filter(fp -> fp.getAxis().isHorizontal()).sorted(Comparator.comparingInt(fp -> fp.data2d)).<Direction>toArray(Direction[]::new);
-        BY_NORMAL = Arrays.<Direction>stream(Direction.VALUES).collect(Collectors.toMap(fp -> new BlockPos(fp.getNormal()).asLong(), fp -> fp, (fp1, fp2) -> {
+        BY_NAME = Arrays.<Direction>stream(Direction.VALUES).collect(Collectors.toMap(Direction::getName, fz -> fz));
+        BY_3D_DATA = Arrays.<Direction>stream(Direction.VALUES).sorted(Comparator.comparingInt(fz -> fz.data3d)).<Direction>toArray(Direction[]::new);
+        BY_2D_DATA = Arrays.<Direction>stream(Direction.VALUES).filter(fz -> fz.getAxis().isHorizontal()).sorted(Comparator.comparingInt(fz -> fz.data2d)).<Direction>toArray(Direction[]::new);
+        BY_NORMAL = Arrays.<Direction>stream(Direction.VALUES).collect(Collectors.toMap(fz -> new BlockPos(fz.getNormal()).asLong(), fz -> fz, (fz1, fz2) -> {
             throw new IllegalArgumentException("Duplicate keys");
         }, (Supplier<R>)Long2ObjectOpenHashMap::new));
     }
@@ -342,6 +345,8 @@ public enum Direction implements StringRepresentable {
             }
         };
         
+        private static final Axis[] VALUES;
+        public static final Codec<Axis> CODEC;
         private static final Map<String, Axis> BY_NAME;
         private final String name;
         
@@ -371,13 +376,13 @@ public enum Direction implements StringRepresentable {
             return this.name;
         }
         
-        public static Axis getRandomAxis(final Random random) {
-            return values()[random.nextInt(values().length)];
+        public static Axis getRandom(final Random random) {
+            return Util.<Axis>getRandom(Axis.VALUES, random);
         }
         
         @Override
-        public boolean test(@Nullable final Direction fp) {
-            return fp != null && fp.getAxis() == this;
+        public boolean test(@Nullable final Direction fz) {
+            return fz != null && fz.getAxis() == this;
         }
         
         public Plane getPlane() {
@@ -405,7 +410,9 @@ public enum Direction implements StringRepresentable {
         public abstract double choose(final double double1, final double double2, final double double3);
         
         static {
-            BY_NAME = Arrays.<Axis>stream(values()).collect(Collectors.toMap(Axis::getName, a -> a));
+            VALUES = values();
+            CODEC = StringRepresentable.<Axis>fromEnum(Axis::values, Axis::byName);
+            BY_NAME = Arrays.<Axis>stream(Axis.VALUES).collect(Collectors.toMap(Axis::getName, a -> a));
         }
     }
     
@@ -429,6 +436,10 @@ public enum Direction implements StringRepresentable {
         public String toString() {
             return this.name;
         }
+        
+        public AxisDirection opposite() {
+            return (this == AxisDirection.POSITIVE) ? AxisDirection.NEGATIVE : AxisDirection.POSITIVE;
+        }
     }
     
     public enum Plane implements Iterable<Direction>, Predicate<Direction> {
@@ -444,17 +455,21 @@ public enum Direction implements StringRepresentable {
         }
         
         public Direction getRandomDirection(final Random random) {
-            return this.faces[random.nextInt(this.faces.length)];
+            return Util.<Direction>getRandom(this.faces, random);
         }
         
         @Override
-        public boolean test(@Nullable final Direction fp) {
-            return fp != null && fp.getAxis().getPlane() == this;
+        public boolean test(@Nullable final Direction fz) {
+            return fz != null && fz.getAxis().getPlane() == this;
         }
         
         @Override
         public Iterator<Direction> iterator() {
             return Iterators.<Direction>forArray(this.faces);
         }
+        
+        public Stream<Direction> stream() {
+            return Arrays.<Direction>stream(this.faces);
+        }
     }
 }
diff --git a/src/net/minecraft/core/FrontAndTop.java b/src/net/minecraft/core/FrontAndTop.java
new file mode 100644
index 0000000..e00ffae
--- /dev/null
+++ b/src/net/minecraft/core/FrontAndTop.java
@@ -0,0 +1,60 @@
+package net.minecraft.core;
+
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import net.minecraft.util.StringRepresentable;
+
+public enum FrontAndTop implements StringRepresentable {
+    DOWN_EAST("down_east", Direction.DOWN, Direction.EAST), 
+    DOWN_NORTH("down_north", Direction.DOWN, Direction.NORTH), 
+    DOWN_SOUTH("down_south", Direction.DOWN, Direction.SOUTH), 
+    DOWN_WEST("down_west", Direction.DOWN, Direction.WEST), 
+    UP_EAST("up_east", Direction.UP, Direction.EAST), 
+    UP_NORTH("up_north", Direction.UP, Direction.NORTH), 
+    UP_SOUTH("up_south", Direction.UP, Direction.SOUTH), 
+    UP_WEST("up_west", Direction.UP, Direction.WEST), 
+    WEST_UP("west_up", Direction.WEST, Direction.UP), 
+    EAST_UP("east_up", Direction.EAST, Direction.UP), 
+    NORTH_UP("north_up", Direction.NORTH, Direction.UP), 
+    SOUTH_UP("south_up", Direction.SOUTH, Direction.UP);
+    
+    private static final Int2ObjectMap<FrontAndTop> LOOKUP_TOP_FRONT;
+    private final String name;
+    private final Direction top;
+    private final Direction front;
+    
+    private static int lookupKey(final Direction fz1, final Direction fz2) {
+        return fz1.ordinal() << 3 | fz2.ordinal();
+    }
+    
+    private FrontAndTop(final String string3, final Direction fz4, final Direction fz5) {
+        this.name = string3;
+        this.front = fz4;
+        this.top = fz5;
+    }
+    
+    @Override
+    public String getSerializedName() {
+        return this.name;
+    }
+    
+    public static FrontAndTop fromFrontAndTop(final Direction fz1, final Direction fz2) {
+        final int integer3 = lookupKey(fz2, fz1);
+        return (FrontAndTop)FrontAndTop.LOOKUP_TOP_FRONT.get(integer3);
+    }
+    
+    public Direction front() {
+        return this.front;
+    }
+    
+    public Direction top() {
+        return this.top;
+    }
+    
+    static {
+        LOOKUP_TOP_FRONT = (Int2ObjectMap)new Int2ObjectOpenHashMap(values().length);
+        for (final FrontAndTop gb4 : values()) {
+            FrontAndTop.LOOKUP_TOP_FRONT.put(lookupKey(gb4.top, gb4.front), gb4);
+        }
+    }
+}
diff --git a/src/net/minecraft/core/GlobalPos.java b/src/net/minecraft/core/GlobalPos.java
index 3b62b9b..850422d 100644
--- a/src/net/minecraft/core/GlobalPos.java
+++ b/src/net/minecraft/core/GlobalPos.java
@@ -1,33 +1,30 @@
 package net.minecraft.core;
 
-import java.util.Optional;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
-import java.util.Objects;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
 import java.util.function.Function;
-import com.mojang.datafixers.Dynamic;
-import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.util.Serializable;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.Objects;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import com.mojang.serialization.Codec;
 
-public final class GlobalPos implements Serializable {
-    private final DimensionType dimension;
+public final class GlobalPos {
+    public static final Codec<GlobalPos> CODEC;
+    private final ResourceKey<Level> dimension;
     private final BlockPos pos;
     
-    private GlobalPos(final DimensionType cbi, final BlockPos fk) {
-        this.dimension = cbi;
-        this.pos = fk;
+    private GlobalPos(final ResourceKey<Level> ug, final BlockPos fu) {
+        this.dimension = ug;
+        this.pos = fu;
     }
     
-    public static GlobalPos of(final DimensionType cbi, final BlockPos fk) {
-        return new GlobalPos(cbi, fk);
+    public static GlobalPos of(final ResourceKey<Level> ug, final BlockPos fu) {
+        return new GlobalPos(ug, fu);
     }
     
-    public static GlobalPos of(final Dynamic<?> dynamic) {
-        return dynamic.get("dimension").map((Function)DimensionType::of).<GlobalPos>flatMap(cbi -> dynamic.get("pos").map((Function)BlockPos::deserialize).map(fk -> new GlobalPos(cbi, fk))).<Throwable>orElseThrow(() -> new IllegalArgumentException("Could not parse GlobalPos"));
-    }
-    
-    public DimensionType dimension() {
+    public ResourceKey<Level> dimension() {
         return this.dimension;
     }
     
@@ -43,8 +40,8 @@ public final class GlobalPos implements Serializable {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final GlobalPos fr3 = (GlobalPos)object;
-        return Objects.equals(this.dimension, fr3.dimension) && Objects.equals(this.pos, fr3.pos);
+        final GlobalPos gc3 = (GlobalPos)object;
+        return Objects.equals(this.dimension, gc3.dimension) && Objects.equals(this.pos, gc3.pos);
     }
     
     @Override
@@ -52,13 +49,12 @@ public final class GlobalPos implements Serializable {
         return Objects.hash(this.dimension, this.pos);
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("dimension"), this.dimension.<V>serialize((com.mojang.datafixers.types.DynamicOps<V>)dynamicOps), dynamicOps.createString("pos"), this.pos.<V>serialize((com.mojang.datafixers.types.DynamicOps<V>)dynamicOps)));
-    }
-    
     @Override
     public String toString() {
         return this.dimension.toString() + " " + this.pos;
     }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Level.RESOURCE_KEY_CODEC.fieldOf("dimension").forGetter((Function)GlobalPos::dimension), (App)BlockPos.CODEC.fieldOf("pos").forGetter((Function)GlobalPos::pos)).apply(instance, (BiFunction)GlobalPos::of));
+    }
 }
diff --git a/src/net/minecraft/core/MapFiller.java b/src/net/minecraft/core/MapFiller.java
deleted file mode 100644
index 6f107aa..0000000
--- a/src/net/minecraft/core/MapFiller.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package net.minecraft.core;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import com.google.common.collect.Maps;
-import java.util.Map;
-
-public class MapFiller {
-    public static <K, V> Map<K, V> linkedHashMapFrom(final Iterable<K> iterable1, final Iterable<V> iterable2) {
-        return MapFiller.<K, V>from(iterable1, iterable2, Maps.newLinkedHashMap());
-    }
-    
-    public static <K, V> Map<K, V> from(final Iterable<K> iterable1, final Iterable<V> iterable2, final Map<K, V> map) {
-        final Iterator<V> iterator4 = iterable2.iterator();
-        for (final K object6 : iterable1) {
-            map.put(object6, iterator4.next());
-        }
-        if (iterator4.hasNext()) {
-            throw new NoSuchElementException();
-        }
-        return map;
-    }
-}
diff --git a/src/net/minecraft/core/MappedRegistry.java b/src/net/minecraft/core/MappedRegistry.java
index f22795d..7e3d0e3 100644
--- a/src/net/minecraft/core/MappedRegistry.java
+++ b/src/net/minecraft/core/MappedRegistry.java
@@ -1,15 +1,30 @@
 package net.minecraft.core;
 
 import org.apache.logging.log4j.LogManager;
+import java.util.List;
+import java.util.function.Consumer;
+import com.google.common.collect.ImmutableMap;
+import java.util.function.Function;
+import net.minecraft.resources.RegistryDataPackCodec;
+import com.google.common.collect.ImmutableList;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.util.Codecs;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import java.util.Collection;
+import net.minecraft.Util;
 import java.util.Random;
+import java.util.Map;
 import java.util.Collections;
-import java.util.Set;
-import java.util.Optional;
 import java.util.Iterator;
+import java.util.Optional;
 import javax.annotation.Nullable;
 import org.apache.commons.lang3.Validate;
+import com.google.common.collect.Sets;
 import com.google.common.collect.HashBiMap;
+import com.mojang.serialization.Lifecycle;
+import java.util.Set;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import com.google.common.collect.BiMap;
 import net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap;
@@ -19,24 +34,30 @@ public class MappedRegistry<T> extends WritableRegistry<T> {
     protected static final Logger LOGGER;
     protected final CrudeIncrementalIntIdentityHashBiMap<T> map;
     protected final BiMap<ResourceLocation, T> storage;
+    private final BiMap<ResourceKey<T>, T> keyStorage;
+    private final Set<ResourceKey<T>> persistent;
     protected Object[] randomCache;
     private int nextId;
     
-    public MappedRegistry() {
+    public MappedRegistry(final ResourceKey<Registry<T>> ug, final Lifecycle lifecycle) {
+        super(ug, lifecycle);
         this.map = new CrudeIncrementalIntIdentityHashBiMap<T>(256);
         this.storage = HashBiMap.create();
+        this.keyStorage = HashBiMap.create();
+        this.persistent = Sets.<ResourceKey<T>>newIdentityHashSet();
     }
     
     @Override
-    public <V extends T> V registerMapping(final int integer, final ResourceLocation sm, final V object) {
+    public <V extends T> V registerMapping(final int integer, final ResourceKey<T> ug, final V object) {
         this.map.addMapping(object, integer);
-        Validate.notNull(sm);
+        Validate.notNull(ug);
         Validate.notNull(object);
         this.randomCache = null;
-        if (this.storage.containsKey(sm)) {
-            MappedRegistry.LOGGER.debug("Adding duplicate key '{}' to registry", sm);
+        if (this.keyStorage.containsKey(ug)) {
+            MappedRegistry.LOGGER.debug("Adding duplicate key '{}' to registry", ug);
         }
-        this.storage.put(sm, object);
+        this.storage.put(ug.location(), object);
+        this.keyStorage.put(ug, object);
         if (this.nextId <= integer) {
             this.nextId = integer + 1;
         }
@@ -44,8 +65,8 @@ public class MappedRegistry<T> extends WritableRegistry<T> {
     }
     
     @Override
-    public <V extends T> V register(final ResourceLocation sm, final V object) {
-        return this.<V>registerMapping(this.nextId, sm, object);
+    public <V extends T> V register(final ResourceKey<T> ug, final V object) {
+        return this.<V>registerMapping(this.nextId, ug, object);
     }
     
     @Nullable
@@ -54,6 +75,11 @@ public class MappedRegistry<T> extends WritableRegistry<T> {
         return this.storage.inverse().get(object);
     }
     
+    @Override
+    public Optional<ResourceKey<T>> getResourceKey(final T object) {
+        return Optional.<ResourceKey<T>>ofNullable(this.keyStorage.inverse().get(object));
+    }
+    
     @Override
     public int getId(@Nullable final T object) {
         return this.map.getId(object);
@@ -61,24 +87,28 @@ public class MappedRegistry<T> extends WritableRegistry<T> {
     
     @Nullable
     @Override
+    public T get(@Nullable final ResourceKey<T> ug) {
+        return this.keyStorage.get(ug);
+    }
+    
+    @Nullable
     public T byId(final int integer) {
         return this.map.byId(integer);
     }
     
-    @Override
     public Iterator<T> iterator() {
         return this.map.iterator();
     }
     
     @Nullable
     @Override
-    public T get(@Nullable final ResourceLocation sm) {
-        return this.storage.get(sm);
+    public T get(@Nullable final ResourceLocation uh) {
+        return this.storage.get(uh);
     }
     
     @Override
-    public Optional<T> getOptional(@Nullable final ResourceLocation sm) {
-        return Optional.<T>ofNullable(this.storage.get(sm));
+    public Optional<T> getOptional(@Nullable final ResourceLocation uh) {
+        return Optional.<T>ofNullable(this.storage.get(uh));
     }
     
     @Override
@@ -86,13 +116,11 @@ public class MappedRegistry<T> extends WritableRegistry<T> {
         return Collections.<ResourceLocation>unmodifiableSet(this.storage.keySet());
     }
     
-    @Override
-    public boolean isEmpty() {
-        return this.storage.isEmpty();
+    public Set<Map.Entry<ResourceKey<T>, T>> entrySet() {
+        return Collections.<ResourceKey<T>, T>unmodifiableMap(this.keyStorage).entrySet();
     }
     
     @Nullable
-    @Override
     public T getRandom(final Random random) {
         if (this.randomCache == null) {
             final Collection<?> collection3 = this.storage.values();
@@ -101,12 +129,76 @@ public class MappedRegistry<T> extends WritableRegistry<T> {
             }
             this.randomCache = collection3.toArray(new Object[collection3.size()]);
         }
-        return (T)this.randomCache[random.nextInt(this.randomCache.length)];
+        return Util.<T>getRandom(this.randomCache, random);
     }
     
     @Override
-    public boolean containsKey(final ResourceLocation sm) {
-        return this.storage.containsKey(sm);
+    public boolean containsKey(final ResourceLocation uh) {
+        return this.storage.containsKey(uh);
+    }
+    
+    @Override
+    public boolean containsId(final int integer) {
+        return this.map.contains(integer);
+    }
+    
+    @Override
+    public boolean persistent(final ResourceKey<T> ug) {
+        return this.persistent.contains(ug);
+    }
+    
+    @Override
+    public void setPersistent(final ResourceKey<T> ug) {
+        this.persistent.add(ug);
+    }
+    
+    public static <T> Codec<MappedRegistry<T>> networkCodec(final ResourceKey<Registry<T>> ug, final Lifecycle lifecycle, final MapCodec<T> mapCodec) {
+        final MappedRegistry<T> gh2;
+        final Iterator<Pair> iterator;
+        Pair<ResourceKey<T>, T> pair6;
+        final ImmutableList.Builder<Pair<ResourceKey<T>, T>> builder2;
+        final Iterator<T> iterator2;
+        T object4;
+        return (Codec<MappedRegistry<T>>)Codecs.<T>withName(ug, mapCodec).codec().listOf().xmap(list -> {
+            gh2 = (MappedRegistry<T>)new MappedRegistry<>((ResourceKey<Registry<T>>)ug, lifecycle);
+            list.iterator();
+            while (iterator.hasNext()) {
+                pair6 = (Pair<ResourceKey<T>, T>)iterator.next();
+                gh2.register((ResourceKey<T>)pair6.getFirst(), pair6.getSecond());
+            }
+            return gh2;
+        }, gh -> {
+            builder2 = ImmutableList.<Pair<ResourceKey<T>, T>>builder();
+            gh.map.iterator();
+            while (iterator2.hasNext()) {
+                object4 = iterator2.next();
+                builder2.add((Pair<ResourceKey<T>, T>)Pair.of(gh.getResourceKey(object4).get(), object4));
+            }
+            return builder2.build();
+        });
+    }
+    
+    public static <T> Codec<MappedRegistry<T>> dataPackCodec(final ResourceKey<Registry<T>> ug, final Lifecycle lifecycle, final MapCodec<T> mapCodec) {
+        return RegistryDataPackCodec.create(ug, lifecycle, mapCodec);
+    }
+    
+    public static <T> Codec<MappedRegistry<T>> directCodec(final ResourceKey<Registry<T>> ug, final Lifecycle lifecycle, final MapCodec<T> mapCodec) {
+        final MappedRegistry<T> gh2;
+        final MappedRegistry<Object> mappedRegistry;
+        final ImmutableMap.Builder<ResourceKey<T>, T> builder2;
+        return (Codec<MappedRegistry<T>>)Codec.unboundedMap(ResourceLocation.CODEC.xmap((Function)ResourceKey.<T>elementKey(ug), (Function)ResourceKey::location), mapCodec.codec()).xmap(map -> {
+            gh2 = (MappedRegistry<T>)new MappedRegistry<>((ResourceKey<Registry<T>>)ug, lifecycle);
+            map.forEach((ug, object) -> {
+                mappedRegistry.registerMapping(mappedRegistry.nextId, ug, object);
+                mappedRegistry.setPersistent(ug);
+                return;
+            });
+            return gh2;
+        }, gh -> {
+            builder2 = ImmutableMap.<ResourceKey<T>, T>builder();
+            gh.keyStorage.entrySet().stream().filter(entry -> gh.persistent(entry.getKey())).forEach(builder2::put);
+            return builder2.build();
+        });
     }
     
     static {
diff --git a/src/net/minecraft/core/Registry.java b/src/net/minecraft/core/Registry.java
index f8b9ed3..d00ac1e 100644
--- a/src/net/minecraft/core/Registry.java
+++ b/src/net/minecraft/core/Registry.java
@@ -1,5 +1,7 @@
 package net.minecraft.core;
 
+import com.google.common.collect.Maps;
+import org.apache.logging.log4j.LogManager;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.effect.MobEffects;
@@ -9,16 +11,29 @@ import net.minecraft.world.item.Items;
 import net.minecraft.world.item.alchemy.Potions;
 import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.world.level.levelgen.structure.StructureFeatureIO;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.stats.Stats;
+import net.minecraft.world.level.storage.loot.entries.LootPoolEntries;
+import net.minecraft.world.level.storage.loot.functions.LootItemFunctions;
+import net.minecraft.world.level.storage.loot.predicates.LootItemConditions;
 import org.apache.commons.lang3.Validate;
 import net.minecraft.SharedConstants;
 import java.util.stream.StreamSupport;
-import java.util.stream.Stream;
-import java.util.Random;
 import java.util.Set;
 import java.util.Optional;
 import javax.annotation.Nullable;
+import java.util.stream.Stream;
+import java.util.function.Function;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.world.level.dimension.LevelStem;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
+import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType;
+import net.minecraft.world.level.storage.loot.entries.LootPoolEntryType;
 import net.minecraft.world.entity.schedule.Activity;
 import net.minecraft.world.entity.schedule.Schedule;
 import net.minecraft.world.entity.ai.sensing.SensorType;
@@ -27,23 +42,25 @@ import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraft.world.entity.npc.VillagerType;
 import net.minecraft.stats.StatType;
+import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType;
+import net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType;
 import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType;
 import net.minecraft.world.level.levelgen.feature.StructurePieceType;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.entity.decoration.Motive;
-import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.chunk.ChunkGeneratorType;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.biome.BiomeSourceType;
-import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.biome.BiomeSource;
 import net.minecraft.core.particles.ParticleType;
+import net.minecraft.world.level.levelgen.feature.featuresize.FeatureSizeType;
 import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType;
+import net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType;
 import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType;
 import net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType;
 import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType;
@@ -60,15 +77,70 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.resources.ResourceKey;
 import java.util.function.Supplier;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
 import org.apache.logging.log4j.Logger;
+import com.mojang.serialization.Keyable;
+import com.mojang.serialization.Codec;
 
-public abstract class Registry<T> implements IdMap<T> {
+public abstract class Registry<T> implements Codec<T>, Keyable, IdMap<T> {
     protected static final Logger LOGGER;
     private static final Map<ResourceLocation, Supplier<?>> LOADERS;
-    public static final WritableRegistry<WritableRegistry<?>> REGISTRY;
+    public static final ResourceLocation ROOT_REGISTRY_NAME;
+    protected static final WritableRegistry<WritableRegistry<?>> WRITABLE_REGISTRY;
+    public static final Registry<? extends Registry<?>> REGISTRY;
+    public static final ResourceKey<Registry<SoundEvent>> SOUND_EVENT_REGISTRY;
+    public static final ResourceKey<Registry<Fluid>> FLUID_REGISTRY;
+    public static final ResourceKey<Registry<MobEffect>> MOB_EFFECT_REGISTRY;
+    public static final ResourceKey<Registry<Block>> BLOCK_REGISTRY;
+    public static final ResourceKey<Registry<Enchantment>> ENCHANTMENT_REGISTRY;
+    public static final ResourceKey<Registry<EntityType<?>>> ENTITY_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<Item>> ITEM_REGISTRY;
+    public static final ResourceKey<Registry<Potion>> POTION_REGISTRY;
+    public static final ResourceKey<Registry<WorldCarver<?>>> CARVER_REGISTRY;
+    public static final ResourceKey<Registry<SurfaceBuilder<?>>> SURFACE_BUILDER_REGISTRY;
+    public static final ResourceKey<Registry<Feature<?>>> FEATURE_REGISTRY;
+    public static final ResourceKey<Registry<FeatureDecorator<?>>> DECORATOR_REGISTRY;
+    public static final ResourceKey<Registry<Biome>> BIOME_REGISTRY;
+    public static final ResourceKey<Registry<BlockStateProviderType<?>>> BLOCK_STATE_PROVIDER_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<BlockPlacerType<?>>> BLOCK_PLACER_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<FoliagePlacerType<?>>> FOLIAGE_PLACER_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<TrunkPlacerType<?>>> TRUNK_PLACER_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<TreeDecoratorType<?>>> TREE_DECORATOR_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<FeatureSizeType<?>>> FEATURE_SIZE_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<ParticleType<?>>> PARTICLE_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<Codec<? extends BiomeSource>>> BIOME_SOURCE_REGISTRY;
+    public static final ResourceKey<Registry<Codec<? extends ChunkGenerator>>> CHUNK_GENERATOR_REGISTRY;
+    public static final ResourceKey<Registry<BlockEntityType<?>>> BLOCK_ENTITY_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<Motive>> MOTIVE_REGISTRY;
+    public static final ResourceKey<Registry<ResourceLocation>> CUSTOM_STAT_REGISTRY;
+    public static final ResourceKey<Registry<ChunkStatus>> CHUNK_STATUS_REGISTRY;
+    public static final ResourceKey<Registry<StructureFeature<?>>> STRUCTURE_FEATURE_REGISTRY;
+    public static final ResourceKey<Registry<StructurePieceType>> STRUCTURE_PIECE_REGISTRY;
+    public static final ResourceKey<Registry<RuleTestType<?>>> RULE_TEST_REGISTRY;
+    public static final ResourceKey<Registry<PosRuleTestType<?>>> POS_RULE_TEST_REGISTRY;
+    public static final ResourceKey<Registry<StructureProcessorType<?>>> STRUCTURE_PROCESSOR_REGISTRY;
+    public static final ResourceKey<Registry<StructurePoolElementType<?>>> STRUCTURE_POOL_ELEMENT_REGISTRY;
+    public static final ResourceKey<Registry<MenuType<?>>> MENU_REGISTRY;
+    public static final ResourceKey<Registry<RecipeType<?>>> RECIPE_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<RecipeSerializer<?>>> RECIPE_SERIALIZER_REGISTRY;
+    public static final ResourceKey<Registry<Attribute>> ATTRIBUTE_REGISTRY;
+    public static final ResourceKey<Registry<StatType<?>>> STAT_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<VillagerType>> VILLAGER_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<VillagerProfession>> VILLAGER_PROFESSION_REGISTRY;
+    public static final ResourceKey<Registry<PoiType>> POINT_OF_INTEREST_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<MemoryModuleType<?>>> MEMORY_MODULE_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<SensorType<?>>> SENSOR_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<Schedule>> SCHEDULE_REGISTRY;
+    public static final ResourceKey<Registry<Activity>> ACTIVITY_REGISTRY;
+    public static final ResourceKey<Registry<LootPoolEntryType>> LOOT_ENTRY_REGISTRY;
+    public static final ResourceKey<Registry<LootItemFunctionType>> LOOT_FUNCTION_REGISTRY;
+    public static final ResourceKey<Registry<LootItemConditionType>> LOOT_ITEM_REGISTRY;
+    public static final ResourceKey<Registry<DimensionType>> DIMENSION_TYPE_REGISTRY;
+    public static final ResourceKey<Registry<Level>> DIMENSION_REGISTRY;
+    public static final ResourceKey<Registry<LevelStem>> LEVEL_STEM_REGISTRY;
     public static final Registry<SoundEvent> SOUND_EVENT;
     public static final DefaultedRegistry<Fluid> FLUID;
     public static final Registry<MobEffect> MOB_EFFECT;
@@ -85,23 +157,26 @@ public abstract class Registry<T> implements IdMap<T> {
     public static final Registry<BlockStateProviderType<?>> BLOCKSTATE_PROVIDER_TYPES;
     public static final Registry<BlockPlacerType<?>> BLOCK_PLACER_TYPES;
     public static final Registry<FoliagePlacerType<?>> FOLIAGE_PLACER_TYPES;
+    public static final Registry<TrunkPlacerType<?>> TRUNK_PLACER_TYPES;
     public static final Registry<TreeDecoratorType<?>> TREE_DECORATOR_TYPES;
-    public static final Registry<ParticleType<? extends ParticleOptions>> PARTICLE_TYPE;
-    public static final Registry<BiomeSourceType<?, ?>> BIOME_SOURCE_TYPE;
+    public static final Registry<FeatureSizeType<?>> FEATURE_SIZE_TYPES;
+    public static final Registry<ParticleType<?>> PARTICLE_TYPE;
+    public static final Registry<Codec<? extends BiomeSource>> BIOME_SOURCE;
+    public static final Registry<Codec<? extends ChunkGenerator>> CHUNK_GENERATOR;
     public static final Registry<BlockEntityType<?>> BLOCK_ENTITY_TYPE;
-    public static final Registry<ChunkGeneratorType<?, ?>> CHUNK_GENERATOR_TYPE;
-    public static final Registry<DimensionType> DIMENSION_TYPE;
     public static final DefaultedRegistry<Motive> MOTIVE;
     public static final Registry<ResourceLocation> CUSTOM_STAT;
     public static final DefaultedRegistry<ChunkStatus> CHUNK_STATUS;
     public static final Registry<StructureFeature<?>> STRUCTURE_FEATURE;
     public static final Registry<StructurePieceType> STRUCTURE_PIECE;
-    public static final Registry<RuleTestType> RULE_TEST;
-    public static final Registry<StructureProcessorType> STRUCTURE_PROCESSOR;
-    public static final Registry<StructurePoolElementType> STRUCTURE_POOL_ELEMENT;
+    public static final Registry<RuleTestType<?>> RULE_TEST;
+    public static final Registry<PosRuleTestType<?>> POS_RULE_TEST;
+    public static final Registry<StructureProcessorType<?>> STRUCTURE_PROCESSOR;
+    public static final Registry<StructurePoolElementType<?>> STRUCTURE_POOL_ELEMENT;
     public static final Registry<MenuType<?>> MENU;
     public static final Registry<RecipeType<?>> RECIPE_TYPE;
     public static final Registry<RecipeSerializer<?>> RECIPE_SERIALIZER;
+    public static final Registry<Attribute> ATTRIBUTE;
     public static final Registry<StatType<?>> STAT_TYPE;
     public static final DefaultedRegistry<VillagerType> VILLAGER_TYPE;
     public static final DefaultedRegistry<VillagerProfession> VILLAGER_PROFESSION;
@@ -110,251 +185,32 @@ public abstract class Registry<T> implements IdMap<T> {
     public static final DefaultedRegistry<SensorType<?>> SENSOR_TYPE;
     public static final Registry<Schedule> SCHEDULE;
     public static final Registry<Activity> ACTIVITY;
+    public static final Registry<LootPoolEntryType> LOOT_POOL_ENTRY_TYPE;
+    public static final Registry<LootItemFunctionType> LOOT_FUNCTION_TYPE;
+    public static final Registry<LootItemConditionType> LOOT_CONDITION_TYPE;
+    private final ResourceKey<Registry<T>> key;
+    private final Lifecycle lifecycle;
     
-    private static <T> Registry<T> registerSimple(final String string, final Supplier<T> supplier) {
-        return Registry.<T, MappedRegistry<T>>internalRegister(string, new MappedRegistry<T>(), supplier);
+    private static <T> ResourceKey<Registry<T>> createRegistryKey(final String string) {
+        return ResourceKey.<T>createRegistryKey(new ResourceLocation(string));
     }
     
-    private static <T> DefaultedRegistry<T> registerDefaulted(final String string1, final String string2, final Supplier<T> supplier) {
-        return Registry.<T, DefaultedRegistry<T>>internalRegister(string1, new DefaultedRegistry<T>(string2), supplier);
-    }
-    
-    private static <T, R extends WritableRegistry<T>> R internalRegister(final String string, final R gh, final Supplier<T> supplier) {
-        final ResourceLocation sm4 = new ResourceLocation(string);
-        Registry.LOADERS.put(sm4, supplier);
-        return Registry.REGISTRY.<R>register(sm4, gh);
-    }
-    
-    @Nullable
-    public abstract ResourceLocation getKey(final T object);
-    
-    public abstract int getId(@Nullable final T object);
-    
-    @Nullable
-    public abstract T get(@Nullable final ResourceLocation sm);
-    
-    public abstract Optional<T> getOptional(@Nullable final ResourceLocation sm);
-    
-    public abstract Set<ResourceLocation> keySet();
-    
-    @Nullable
-    public abstract T getRandom(final Random random);
-    
-    public Stream<T> stream() {
-        return StreamSupport.<T>stream(this.spliterator(), false);
-    }
-    
-    public abstract boolean containsKey(final ResourceLocation sm);
-    
-    public static <T> T register(final Registry<? super T> gb, final String string, final T object) {
-        return Registry.<T>register(gb, new ResourceLocation(string), object);
-    }
-    
-    public static <T> T register(final Registry<? super T> gb, final ResourceLocation sm, final T object) {
-        return ((WritableRegistry)gb).<T>register(sm, object);
-    }
-    
-    public static <T> T registerMapping(final Registry<? super T> gb, final int integer, final String string, final T object) {
-        return ((WritableRegistry)gb).<T>registerMapping(integer, new ResourceLocation(string), object);
-    }
-    
-    static {
+    private static <T extends WritableRegistry<?>> void checkRegistry(final WritableRegistry<T> gs) {
         // 
         // This method could not be decompiled.
         // 
         // Original Bytecode:
         // 
-        //     3: putstatic       net/minecraft/core/Registry.LOGGER:Lorg/apache/logging/log4j/Logger;
-        //     6: invokestatic    com/google/common/collect/Maps.newLinkedHashMap:()Ljava/util/LinkedHashMap;
-        //     9: putstatic       net/minecraft/core/Registry.LOADERS:Ljava/util/Map;
-        //    12: new             Lnet/minecraft/core/MappedRegistry;
-        //    15: dup            
-        //    16: invokespecial   net/minecraft/core/MappedRegistry.<init>:()V
-        //    19: putstatic       net/minecraft/core/Registry.REGISTRY:Lnet/minecraft/core/WritableRegistry;
-        //    22: ldc_w           "sound_event"
-        //    25: invokedynamic   BootstrapMethod #0, get:()Ljava/util/function/Supplier;
-        //    30: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //    33: putstatic       net/minecraft/core/Registry.SOUND_EVENT:Lnet/minecraft/core/Registry;
-        //    36: ldc_w           "fluid"
-        //    39: ldc_w           "empty"
-        //    42: invokedynamic   BootstrapMethod #1, get:()Ljava/util/function/Supplier;
-        //    47: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //    50: putstatic       net/minecraft/core/Registry.FLUID:Lnet/minecraft/core/DefaultedRegistry;
-        //    53: ldc_w           "mob_effect"
-        //    56: invokedynamic   BootstrapMethod #2, get:()Ljava/util/function/Supplier;
-        //    61: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //    64: putstatic       net/minecraft/core/Registry.MOB_EFFECT:Lnet/minecraft/core/Registry;
-        //    67: ldc_w           "block"
-        //    70: ldc_w           "air"
-        //    73: invokedynamic   BootstrapMethod #3, get:()Ljava/util/function/Supplier;
-        //    78: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //    81: putstatic       net/minecraft/core/Registry.BLOCK:Lnet/minecraft/core/DefaultedRegistry;
-        //    84: ldc_w           "enchantment"
-        //    87: invokedynamic   BootstrapMethod #4, get:()Ljava/util/function/Supplier;
-        //    92: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //    95: putstatic       net/minecraft/core/Registry.ENCHANTMENT:Lnet/minecraft/core/Registry;
-        //    98: ldc_w           "entity_type"
-        //   101: ldc_w           "pig"
-        //   104: invokedynamic   BootstrapMethod #5, get:()Ljava/util/function/Supplier;
-        //   109: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //   112: putstatic       net/minecraft/core/Registry.ENTITY_TYPE:Lnet/minecraft/core/DefaultedRegistry;
-        //   115: ldc_w           "item"
-        //   118: ldc_w           "air"
-        //   121: invokedynamic   BootstrapMethod #6, get:()Ljava/util/function/Supplier;
-        //   126: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //   129: putstatic       net/minecraft/core/Registry.ITEM:Lnet/minecraft/core/DefaultedRegistry;
-        //   132: ldc_w           "potion"
-        //   135: ldc_w           "empty"
-        //   138: invokedynamic   BootstrapMethod #7, get:()Ljava/util/function/Supplier;
-        //   143: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //   146: putstatic       net/minecraft/core/Registry.POTION:Lnet/minecraft/core/DefaultedRegistry;
-        //   149: ldc_w           "carver"
-        //   152: invokedynamic   BootstrapMethod #8, get:()Ljava/util/function/Supplier;
-        //   157: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   160: putstatic       net/minecraft/core/Registry.CARVER:Lnet/minecraft/core/Registry;
-        //   163: ldc_w           "surface_builder"
-        //   166: invokedynamic   BootstrapMethod #9, get:()Ljava/util/function/Supplier;
-        //   171: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   174: putstatic       net/minecraft/core/Registry.SURFACE_BUILDER:Lnet/minecraft/core/Registry;
-        //   177: ldc_w           "feature"
-        //   180: invokedynamic   BootstrapMethod #10, get:()Ljava/util/function/Supplier;
-        //   185: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   188: putstatic       net/minecraft/core/Registry.FEATURE:Lnet/minecraft/core/Registry;
-        //   191: ldc_w           "decorator"
-        //   194: invokedynamic   BootstrapMethod #11, get:()Ljava/util/function/Supplier;
-        //   199: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   202: putstatic       net/minecraft/core/Registry.DECORATOR:Lnet/minecraft/core/Registry;
-        //   205: ldc_w           "biome"
-        //   208: invokedynamic   BootstrapMethod #12, get:()Ljava/util/function/Supplier;
-        //   213: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   216: putstatic       net/minecraft/core/Registry.BIOME:Lnet/minecraft/core/Registry;
-        //   219: ldc_w           "block_state_provider_type"
-        //   222: invokedynamic   BootstrapMethod #13, get:()Ljava/util/function/Supplier;
-        //   227: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   230: putstatic       net/minecraft/core/Registry.BLOCKSTATE_PROVIDER_TYPES:Lnet/minecraft/core/Registry;
-        //   233: ldc_w           "block_placer_type"
-        //   236: invokedynamic   BootstrapMethod #14, get:()Ljava/util/function/Supplier;
-        //   241: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   244: putstatic       net/minecraft/core/Registry.BLOCK_PLACER_TYPES:Lnet/minecraft/core/Registry;
-        //   247: ldc_w           "foliage_placer_type"
-        //   250: invokedynamic   BootstrapMethod #15, get:()Ljava/util/function/Supplier;
-        //   255: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   258: putstatic       net/minecraft/core/Registry.FOLIAGE_PLACER_TYPES:Lnet/minecraft/core/Registry;
-        //   261: ldc_w           "tree_decorator_type"
-        //   264: invokedynamic   BootstrapMethod #16, get:()Ljava/util/function/Supplier;
-        //   269: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   272: putstatic       net/minecraft/core/Registry.TREE_DECORATOR_TYPES:Lnet/minecraft/core/Registry;
-        //   275: ldc_w           "particle_type"
-        //   278: invokedynamic   BootstrapMethod #17, get:()Ljava/util/function/Supplier;
-        //   283: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   286: putstatic       net/minecraft/core/Registry.PARTICLE_TYPE:Lnet/minecraft/core/Registry;
-        //   289: ldc_w           "biome_source_type"
-        //   292: invokedynamic   BootstrapMethod #18, get:()Ljava/util/function/Supplier;
-        //   297: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   300: putstatic       net/minecraft/core/Registry.BIOME_SOURCE_TYPE:Lnet/minecraft/core/Registry;
-        //   303: ldc_w           "block_entity_type"
-        //   306: invokedynamic   BootstrapMethod #19, get:()Ljava/util/function/Supplier;
-        //   311: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   314: putstatic       net/minecraft/core/Registry.BLOCK_ENTITY_TYPE:Lnet/minecraft/core/Registry;
-        //   317: ldc_w           "chunk_generator_type"
-        //   320: invokedynamic   BootstrapMethod #20, get:()Ljava/util/function/Supplier;
-        //   325: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   328: putstatic       net/minecraft/core/Registry.CHUNK_GENERATOR_TYPE:Lnet/minecraft/core/Registry;
-        //   331: ldc_w           "dimension_type"
-        //   334: invokedynamic   BootstrapMethod #21, get:()Ljava/util/function/Supplier;
-        //   339: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   342: putstatic       net/minecraft/core/Registry.DIMENSION_TYPE:Lnet/minecraft/core/Registry;
-        //   345: ldc_w           "motive"
-        //   348: ldc_w           "kebab"
-        //   351: invokedynamic   BootstrapMethod #22, get:()Ljava/util/function/Supplier;
-        //   356: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //   359: putstatic       net/minecraft/core/Registry.MOTIVE:Lnet/minecraft/core/DefaultedRegistry;
-        //   362: ldc_w           "custom_stat"
-        //   365: invokedynamic   BootstrapMethod #23, get:()Ljava/util/function/Supplier;
-        //   370: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   373: putstatic       net/minecraft/core/Registry.CUSTOM_STAT:Lnet/minecraft/core/Registry;
-        //   376: ldc_w           "chunk_status"
-        //   379: ldc_w           "empty"
-        //   382: invokedynamic   BootstrapMethod #24, get:()Ljava/util/function/Supplier;
-        //   387: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //   390: putstatic       net/minecraft/core/Registry.CHUNK_STATUS:Lnet/minecraft/core/DefaultedRegistry;
-        //   393: ldc_w           "structure_feature"
-        //   396: invokedynamic   BootstrapMethod #25, get:()Ljava/util/function/Supplier;
-        //   401: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   404: putstatic       net/minecraft/core/Registry.STRUCTURE_FEATURE:Lnet/minecraft/core/Registry;
-        //   407: ldc_w           "structure_piece"
-        //   410: invokedynamic   BootstrapMethod #26, get:()Ljava/util/function/Supplier;
-        //   415: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   418: putstatic       net/minecraft/core/Registry.STRUCTURE_PIECE:Lnet/minecraft/core/Registry;
-        //   421: ldc_w           "rule_test"
-        //   424: invokedynamic   BootstrapMethod #27, get:()Ljava/util/function/Supplier;
-        //   429: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   432: putstatic       net/minecraft/core/Registry.RULE_TEST:Lnet/minecraft/core/Registry;
-        //   435: ldc_w           "structure_processor"
-        //   438: invokedynamic   BootstrapMethod #28, get:()Ljava/util/function/Supplier;
-        //   443: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   446: putstatic       net/minecraft/core/Registry.STRUCTURE_PROCESSOR:Lnet/minecraft/core/Registry;
-        //   449: ldc_w           "structure_pool_element"
-        //   452: invokedynamic   BootstrapMethod #29, get:()Ljava/util/function/Supplier;
-        //   457: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   460: putstatic       net/minecraft/core/Registry.STRUCTURE_POOL_ELEMENT:Lnet/minecraft/core/Registry;
-        //   463: ldc_w           "menu"
-        //   466: invokedynamic   BootstrapMethod #30, get:()Ljava/util/function/Supplier;
-        //   471: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   474: putstatic       net/minecraft/core/Registry.MENU:Lnet/minecraft/core/Registry;
-        //   477: ldc_w           "recipe_type"
-        //   480: invokedynamic   BootstrapMethod #31, get:()Ljava/util/function/Supplier;
-        //   485: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   488: putstatic       net/minecraft/core/Registry.RECIPE_TYPE:Lnet/minecraft/core/Registry;
-        //   491: ldc_w           "recipe_serializer"
-        //   494: invokedynamic   BootstrapMethod #32, get:()Ljava/util/function/Supplier;
-        //   499: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   502: putstatic       net/minecraft/core/Registry.RECIPE_SERIALIZER:Lnet/minecraft/core/Registry;
-        //   505: ldc_w           "stat_type"
-        //   508: invokedynamic   BootstrapMethod #33, get:()Ljava/util/function/Supplier;
-        //   513: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   516: putstatic       net/minecraft/core/Registry.STAT_TYPE:Lnet/minecraft/core/Registry;
-        //   519: ldc_w           "villager_type"
-        //   522: ldc_w           "plains"
-        //   525: invokedynamic   BootstrapMethod #34, get:()Ljava/util/function/Supplier;
-        //   530: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //   533: putstatic       net/minecraft/core/Registry.VILLAGER_TYPE:Lnet/minecraft/core/DefaultedRegistry;
-        //   536: ldc_w           "villager_profession"
-        //   539: ldc_w           "none"
-        //   542: invokedynamic   BootstrapMethod #35, get:()Ljava/util/function/Supplier;
-        //   547: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //   550: putstatic       net/minecraft/core/Registry.VILLAGER_PROFESSION:Lnet/minecraft/core/DefaultedRegistry;
-        //   553: ldc_w           "point_of_interest_type"
-        //   556: ldc_w           "unemployed"
-        //   559: invokedynamic   BootstrapMethod #36, get:()Ljava/util/function/Supplier;
-        //   564: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //   567: putstatic       net/minecraft/core/Registry.POINT_OF_INTEREST_TYPE:Lnet/minecraft/core/DefaultedRegistry;
-        //   570: ldc_w           "memory_module_type"
-        //   573: ldc_w           "dummy"
-        //   576: invokedynamic   BootstrapMethod #37, get:()Ljava/util/function/Supplier;
-        //   581: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //   584: putstatic       net/minecraft/core/Registry.MEMORY_MODULE_TYPE:Lnet/minecraft/core/DefaultedRegistry;
-        //   587: ldc_w           "sensor_type"
-        //   590: ldc_w           "dummy"
-        //   593: invokedynamic   BootstrapMethod #38, get:()Ljava/util/function/Supplier;
-        //   598: invokestatic    net/minecraft/core/Registry.registerDefaulted:(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/DefaultedRegistry;
-        //   601: putstatic       net/minecraft/core/Registry.SENSOR_TYPE:Lnet/minecraft/core/DefaultedRegistry;
-        //   604: ldc_w           "schedule"
-        //   607: invokedynamic   BootstrapMethod #39, get:()Ljava/util/function/Supplier;
-        //   612: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   615: putstatic       net/minecraft/core/Registry.SCHEDULE:Lnet/minecraft/core/Registry;
-        //   618: ldc_w           "activity"
-        //   621: invokedynamic   BootstrapMethod #40, get:()Ljava/util/function/Supplier;
-        //   626: invokestatic    net/minecraft/core/Registry.registerSimple:(Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/core/Registry;
-        //   629: putstatic       net/minecraft/core/Registry.ACTIVITY:Lnet/minecraft/core/Registry;
-        //   632: getstatic       net/minecraft/core/Registry.LOADERS:Ljava/util/Map;
-        //   635: invokeinterface java/util/Map.entrySet:()Ljava/util/Set;
-        //   640: invokedynamic   BootstrapMethod #41, accept:()Ljava/util/function/Consumer;
-        //   645: invokeinterface java/util/Set.forEach:(Ljava/util/function/Consumer;)V
-        //   650: getstatic       net/minecraft/core/Registry.REGISTRY:Lnet/minecraft/core/WritableRegistry;
-        //   653: invokedynamic   BootstrapMethod #42, accept:()Ljava/util/function/Consumer;
-        //   658: invokevirtual   net/minecraft/core/WritableRegistry.forEach:(Ljava/util/function/Consumer;)V
-        //   661: return         
+        //     1: aload_0         /* gs */
+        //     2: invokedynamic   BootstrapMethod #0, accept:(Lnet/minecraft/core/WritableRegistry;)Ljava/util/function/Consumer;
+        //     7: invokevirtual   net/minecraft/core/WritableRegistry.forEach:(Ljava/util/function/Consumer;)V
+        //    10: return         
+        //    Signature:
+        //  <T:Lnet/minecraft/core/WritableRegistry<*>;>(Lnet/minecraft/core/WritableRegistry<TT;>;)V
+        //    MethodParameters:
+        //  Name  Flags  
+        //  ----  -----
+        //  gs    
         // 
         // The error that occurred was:
         // 
@@ -391,4 +247,228 @@ public abstract class Registry<T> implements IdMap<T> {
         // 
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
+    
+    private static <T> Registry<T> registerSimple(final ResourceKey<Registry<T>> ug, final Supplier<T> supplier) {
+        return Registry.<T>registerSimple(ug, Lifecycle.experimental(), supplier);
+    }
+    
+    private static <T> DefaultedRegistry<T> registerDefaulted(final ResourceKey<Registry<T>> ug, final String string, final Supplier<T> supplier) {
+        return Registry.<T>registerDefaulted(ug, string, Lifecycle.experimental(), supplier);
+    }
+    
+    private static <T> Registry<T> registerSimple(final ResourceKey<Registry<T>> ug, final Lifecycle lifecycle, final Supplier<T> supplier) {
+        return Registry.<T, MappedRegistry<T>>internalRegister(ug, new MappedRegistry<T>(ug, lifecycle), supplier);
+    }
+    
+    private static <T> DefaultedRegistry<T> registerDefaulted(final ResourceKey<Registry<T>> ug, final String string, final Lifecycle lifecycle, final Supplier<T> supplier) {
+        return Registry.<T, DefaultedRegistry<T>>internalRegister(ug, new DefaultedRegistry<T>(string, ug, lifecycle), supplier);
+    }
+    
+    private static <T, R extends WritableRegistry<T>> R internalRegister(final ResourceKey<Registry<T>> ug, final R gs, final Supplier<T> supplier) {
+        final ResourceLocation uh4 = ug.location();
+        Registry.LOADERS.put(uh4, supplier);
+        final WritableRegistry<R> gs2 = (WritableRegistry<R>)Registry.WRITABLE_REGISTRY;
+        return gs2.<R>register((ResourceKey<R>)ug, gs);
+    }
+    
+    protected Registry(final ResourceKey<Registry<T>> ug, final Lifecycle lifecycle) {
+        this.key = ug;
+        this.lifecycle = lifecycle;
+    }
+    
+    @Override
+    public String toString() {
+        return "Registry[" + this.key + " (" + this.lifecycle + ")]";
+    }
+    
+    public <U> DataResult<Pair<T, U>> decode(final DynamicOps<U> dynamicOps, final U object) {
+        if (dynamicOps.compressMaps()) {
+            final int integer3;
+            T object2;
+            return (DataResult<Pair<T, U>>)dynamicOps.getNumberValue(object).flatMap(number -> {
+                integer3 = number.intValue();
+                if (!this.containsId(integer3)) {
+                    return DataResult.error("Unknown registry id: " + number);
+                }
+                else {
+                    object2 = this.byId(integer3);
+                    return DataResult.success(object2, this.lifecycle);
+                }
+            }).map(object -> Pair.of(object, dynamicOps.empty()));
+        }
+        return (DataResult<Pair<T, U>>)ResourceLocation.CODEC.decode((DynamicOps)dynamicOps, object).addLifecycle(this.lifecycle).flatMap(pair -> {
+            if (!this.containsKey((ResourceLocation)pair.getFirst())) {
+                return DataResult.error("Unknown registry key: " + pair.getFirst());
+            }
+            else {
+                return DataResult.success(pair.mapFirst((Function)this::get), this.lifecycle);
+            }
+        });
+    }
+    
+    public <U> DataResult<U> encode(final T object1, final DynamicOps<U> dynamicOps, final U object3) {
+        final ResourceLocation uh5 = this.getKey(object1);
+        if (uh5 == null) {
+            return (DataResult<U>)DataResult.error("Unknown registry element " + object1);
+        }
+        if (dynamicOps.compressMaps()) {
+            return (DataResult<U>)dynamicOps.mergeToPrimitive(object3, dynamicOps.createInt(this.getId(object1))).setLifecycle(this.lifecycle);
+        }
+        return (DataResult<U>)dynamicOps.mergeToPrimitive(object3, dynamicOps.createString(uh5.toString())).setLifecycle(this.lifecycle);
+    }
+    
+    public <U> Stream<U> keys(final DynamicOps<U> dynamicOps) {
+        return this.keySet().stream().<U>map(uh -> dynamicOps.createString(uh.toString()));
+    }
+    
+    @Nullable
+    public abstract ResourceLocation getKey(final T object);
+    
+    public abstract Optional<ResourceKey<T>> getResourceKey(final T object);
+    
+    public abstract int getId(@Nullable final T object);
+    
+    @Nullable
+    public abstract T get(@Nullable final ResourceKey<T> ug);
+    
+    @Nullable
+    public abstract T get(@Nullable final ResourceLocation uh);
+    
+    public abstract Optional<T> getOptional(@Nullable final ResourceLocation uh);
+    
+    public abstract Set<ResourceLocation> keySet();
+    
+    public Stream<T> stream() {
+        return StreamSupport.<T>stream(this.spliterator(), false);
+    }
+    
+    public abstract boolean containsKey(final ResourceLocation uh);
+    
+    public abstract boolean persistent(final ResourceKey<T> ug);
+    
+    public abstract boolean containsId(final int integer);
+    
+    public static <T> T register(final Registry<? super T> gl, final String string, final T object) {
+        return Registry.register(gl, new ResourceLocation(string), object);
+    }
+    
+    public static <V, T extends V> T register(final Registry<V> gl, final ResourceLocation uh, final T object) {
+        return ((WritableRegistry)gl).<T>register(ResourceKey.<V>create(gl.key, uh), object);
+    }
+    
+    public static <V, T extends V> T registerMapping(final Registry<V> gl, final int integer, final String string, final T object) {
+        return ((WritableRegistry)gl).<T>registerMapping(integer, ResourceKey.<V>create(gl.key, new ResourceLocation(string)), object);
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+        LOADERS = Maps.newLinkedHashMap();
+        ROOT_REGISTRY_NAME = new ResourceLocation("root");
+        WRITABLE_REGISTRY = new MappedRegistry<WritableRegistry<?>>(Registry.<WritableRegistry<?>>createRegistryKey("root"), Lifecycle.experimental());
+        REGISTRY = Registry.WRITABLE_REGISTRY;
+        SOUND_EVENT_REGISTRY = Registry.<SoundEvent>createRegistryKey("sound_event");
+        FLUID_REGISTRY = Registry.<Fluid>createRegistryKey("fluid");
+        MOB_EFFECT_REGISTRY = Registry.<MobEffect>createRegistryKey("mob_effect");
+        BLOCK_REGISTRY = Registry.<Block>createRegistryKey("block");
+        ENCHANTMENT_REGISTRY = Registry.<Enchantment>createRegistryKey("enchantment");
+        ENTITY_TYPE_REGISTRY = Registry.<EntityType<?>>createRegistryKey("entity_type");
+        ITEM_REGISTRY = Registry.<Item>createRegistryKey("item");
+        POTION_REGISTRY = Registry.<Potion>createRegistryKey("potion");
+        CARVER_REGISTRY = Registry.<WorldCarver<?>>createRegistryKey("carver");
+        SURFACE_BUILDER_REGISTRY = Registry.<SurfaceBuilder<?>>createRegistryKey("surface_builder");
+        FEATURE_REGISTRY = Registry.<Feature<?>>createRegistryKey("feature");
+        DECORATOR_REGISTRY = Registry.<FeatureDecorator<?>>createRegistryKey("decorator");
+        BIOME_REGISTRY = Registry.<Biome>createRegistryKey("biome");
+        BLOCK_STATE_PROVIDER_TYPE_REGISTRY = Registry.<BlockStateProviderType<?>>createRegistryKey("block_state_provider_type");
+        BLOCK_PLACER_TYPE_REGISTRY = Registry.<BlockPlacerType<?>>createRegistryKey("block_placer_type");
+        FOLIAGE_PLACER_TYPE_REGISTRY = Registry.<FoliagePlacerType<?>>createRegistryKey("foliage_placer_type");
+        TRUNK_PLACER_TYPE_REGISTRY = Registry.<TrunkPlacerType<?>>createRegistryKey("trunk_placer_type");
+        TREE_DECORATOR_TYPE_REGISTRY = Registry.<TreeDecoratorType<?>>createRegistryKey("tree_decorator_type");
+        FEATURE_SIZE_TYPE_REGISTRY = Registry.<FeatureSizeType<?>>createRegistryKey("feature_size_type");
+        PARTICLE_TYPE_REGISTRY = Registry.<ParticleType<?>>createRegistryKey("particle_type");
+        BIOME_SOURCE_REGISTRY = Registry.<Codec<? extends BiomeSource>>createRegistryKey("biome_source");
+        CHUNK_GENERATOR_REGISTRY = Registry.<Codec<? extends ChunkGenerator>>createRegistryKey("chunk_generator");
+        BLOCK_ENTITY_TYPE_REGISTRY = Registry.<BlockEntityType<?>>createRegistryKey("block_entity_type");
+        MOTIVE_REGISTRY = Registry.<Motive>createRegistryKey("motive");
+        CUSTOM_STAT_REGISTRY = Registry.<ResourceLocation>createRegistryKey("custom_stat");
+        CHUNK_STATUS_REGISTRY = Registry.<ChunkStatus>createRegistryKey("chunk_status");
+        STRUCTURE_FEATURE_REGISTRY = Registry.<StructureFeature<?>>createRegistryKey("structure_feature");
+        STRUCTURE_PIECE_REGISTRY = Registry.<StructurePieceType>createRegistryKey("structure_piece");
+        RULE_TEST_REGISTRY = Registry.<RuleTestType<?>>createRegistryKey("rule_test");
+        POS_RULE_TEST_REGISTRY = Registry.<PosRuleTestType<?>>createRegistryKey("pos_rule_test");
+        STRUCTURE_PROCESSOR_REGISTRY = Registry.<StructureProcessorType<?>>createRegistryKey("structure_processor");
+        STRUCTURE_POOL_ELEMENT_REGISTRY = Registry.<StructurePoolElementType<?>>createRegistryKey("structure_pool_element");
+        MENU_REGISTRY = Registry.<MenuType<?>>createRegistryKey("menu");
+        RECIPE_TYPE_REGISTRY = Registry.<RecipeType<?>>createRegistryKey("recipe_type");
+        RECIPE_SERIALIZER_REGISTRY = Registry.<RecipeSerializer<?>>createRegistryKey("recipe_serializer");
+        ATTRIBUTE_REGISTRY = Registry.<Attribute>createRegistryKey("attribute");
+        STAT_TYPE_REGISTRY = Registry.<StatType<?>>createRegistryKey("stat_type");
+        VILLAGER_TYPE_REGISTRY = Registry.<VillagerType>createRegistryKey("villager_type");
+        VILLAGER_PROFESSION_REGISTRY = Registry.<VillagerProfession>createRegistryKey("villager_profession");
+        POINT_OF_INTEREST_TYPE_REGISTRY = Registry.<PoiType>createRegistryKey("point_of_interest_type");
+        MEMORY_MODULE_TYPE_REGISTRY = Registry.<MemoryModuleType<?>>createRegistryKey("memory_module_type");
+        SENSOR_TYPE_REGISTRY = Registry.<SensorType<?>>createRegistryKey("sensor_type");
+        SCHEDULE_REGISTRY = Registry.<Schedule>createRegistryKey("schedule");
+        ACTIVITY_REGISTRY = Registry.<Activity>createRegistryKey("activity");
+        LOOT_ENTRY_REGISTRY = Registry.<LootPoolEntryType>createRegistryKey("loot_pool_entry_type");
+        LOOT_FUNCTION_REGISTRY = Registry.<LootItemFunctionType>createRegistryKey("loot_function_type");
+        LOOT_ITEM_REGISTRY = Registry.<LootItemConditionType>createRegistryKey("loot_condition_type");
+        DIMENSION_TYPE_REGISTRY = Registry.<DimensionType>createRegistryKey("dimension_type");
+        DIMENSION_REGISTRY = Registry.<Level>createRegistryKey("dimension");
+        LEVEL_STEM_REGISTRY = Registry.<LevelStem>createRegistryKey("dimension");
+        SOUND_EVENT = Registry.<SoundEvent>registerSimple(Registry.SOUND_EVENT_REGISTRY, () -> SoundEvents.ITEM_PICKUP);
+        FLUID = Registry.<Fluid>registerDefaulted(Registry.FLUID_REGISTRY, "empty", () -> Fluids.EMPTY);
+        MOB_EFFECT = Registry.<MobEffect>registerSimple(Registry.MOB_EFFECT_REGISTRY, () -> MobEffects.LUCK);
+        BLOCK = Registry.<Block>registerDefaulted(Registry.BLOCK_REGISTRY, "air", () -> Blocks.AIR);
+        ENCHANTMENT = Registry.<Enchantment>registerSimple(Registry.ENCHANTMENT_REGISTRY, () -> Enchantments.BLOCK_FORTUNE);
+        ENTITY_TYPE = Registry.<EntityType<?>>registerDefaulted(Registry.ENTITY_TYPE_REGISTRY, "pig", () -> EntityType.PIG);
+        ITEM = Registry.<Item>registerDefaulted(Registry.ITEM_REGISTRY, "air", () -> Items.AIR);
+        POTION = Registry.<Potion>registerDefaulted(Registry.POTION_REGISTRY, "empty", () -> Potions.EMPTY);
+        CARVER = Registry.<WorldCarver<?>>registerSimple(Registry.CARVER_REGISTRY, () -> WorldCarver.CAVE);
+        SURFACE_BUILDER = Registry.<SurfaceBuilder<?>>registerSimple(Registry.SURFACE_BUILDER_REGISTRY, () -> SurfaceBuilder.DEFAULT);
+        FEATURE = Registry.<Feature<?>>registerSimple(Registry.FEATURE_REGISTRY, () -> Feature.ORE);
+        DECORATOR = Registry.<FeatureDecorator<?>>registerSimple(Registry.DECORATOR_REGISTRY, () -> FeatureDecorator.NOPE);
+        BIOME = Registry.<Biome>registerSimple(Registry.BIOME_REGISTRY, () -> Biomes.DEFAULT);
+        BLOCKSTATE_PROVIDER_TYPES = Registry.<BlockStateProviderType<?>>registerSimple(Registry.BLOCK_STATE_PROVIDER_TYPE_REGISTRY, () -> BlockStateProviderType.SIMPLE_STATE_PROVIDER);
+        BLOCK_PLACER_TYPES = Registry.<BlockPlacerType<?>>registerSimple(Registry.BLOCK_PLACER_TYPE_REGISTRY, () -> BlockPlacerType.SIMPLE_BLOCK_PLACER);
+        FOLIAGE_PLACER_TYPES = Registry.<FoliagePlacerType<?>>registerSimple(Registry.FOLIAGE_PLACER_TYPE_REGISTRY, () -> FoliagePlacerType.BLOB_FOLIAGE_PLACER);
+        TRUNK_PLACER_TYPES = Registry.<TrunkPlacerType<?>>registerSimple(Registry.TRUNK_PLACER_TYPE_REGISTRY, () -> TrunkPlacerType.STRAIGHT_TRUNK_PLACER);
+        TREE_DECORATOR_TYPES = Registry.<TreeDecoratorType<?>>registerSimple(Registry.TREE_DECORATOR_TYPE_REGISTRY, () -> TreeDecoratorType.LEAVE_VINE);
+        FEATURE_SIZE_TYPES = Registry.<FeatureSizeType<?>>registerSimple(Registry.FEATURE_SIZE_TYPE_REGISTRY, () -> FeatureSizeType.TWO_LAYERS_FEATURE_SIZE);
+        PARTICLE_TYPE = Registry.<ParticleType<?>>registerSimple(Registry.PARTICLE_TYPE_REGISTRY, () -> ParticleTypes.BLOCK);
+        BIOME_SOURCE = Registry.<Codec<? extends BiomeSource>>registerSimple(Registry.BIOME_SOURCE_REGISTRY, Lifecycle.stable(), () -> BiomeSource.CODEC);
+        CHUNK_GENERATOR = Registry.<Codec<? extends ChunkGenerator>>registerSimple(Registry.CHUNK_GENERATOR_REGISTRY, Lifecycle.stable(), () -> ChunkGenerator.CODEC);
+        BLOCK_ENTITY_TYPE = Registry.<BlockEntityType<?>>registerSimple(Registry.BLOCK_ENTITY_TYPE_REGISTRY, () -> BlockEntityType.FURNACE);
+        MOTIVE = Registry.<Motive>registerDefaulted(Registry.MOTIVE_REGISTRY, "kebab", () -> Motive.KEBAB);
+        CUSTOM_STAT = Registry.<ResourceLocation>registerSimple(Registry.CUSTOM_STAT_REGISTRY, () -> Stats.JUMP);
+        CHUNK_STATUS = Registry.<ChunkStatus>registerDefaulted(Registry.CHUNK_STATUS_REGISTRY, "empty", () -> ChunkStatus.EMPTY);
+        STRUCTURE_FEATURE = Registry.<StructureFeature<?>>registerSimple(Registry.STRUCTURE_FEATURE_REGISTRY, () -> StructureFeature.MINESHAFT);
+        STRUCTURE_PIECE = Registry.<StructurePieceType>registerSimple(Registry.STRUCTURE_PIECE_REGISTRY, () -> StructurePieceType.MINE_SHAFT_ROOM);
+        RULE_TEST = Registry.<RuleTestType<?>>registerSimple(Registry.RULE_TEST_REGISTRY, () -> RuleTestType.ALWAYS_TRUE_TEST);
+        POS_RULE_TEST = Registry.<PosRuleTestType<?>>registerSimple(Registry.POS_RULE_TEST_REGISTRY, () -> PosRuleTestType.ALWAYS_TRUE_TEST);
+        STRUCTURE_PROCESSOR = Registry.<StructureProcessorType<?>>registerSimple(Registry.STRUCTURE_PROCESSOR_REGISTRY, () -> StructureProcessorType.BLOCK_IGNORE);
+        STRUCTURE_POOL_ELEMENT = Registry.<StructurePoolElementType<?>>registerSimple(Registry.STRUCTURE_POOL_ELEMENT_REGISTRY, () -> StructurePoolElementType.EMPTY);
+        MENU = Registry.<MenuType<?>>registerSimple(Registry.MENU_REGISTRY, () -> MenuType.ANVIL);
+        RECIPE_TYPE = Registry.<RecipeType<?>>registerSimple(Registry.RECIPE_TYPE_REGISTRY, () -> RecipeType.CRAFTING);
+        RECIPE_SERIALIZER = Registry.<RecipeSerializer<?>>registerSimple(Registry.RECIPE_SERIALIZER_REGISTRY, () -> RecipeSerializer.SHAPELESS_RECIPE);
+        ATTRIBUTE = Registry.<Attribute>registerSimple(Registry.ATTRIBUTE_REGISTRY, () -> Attributes.LUCK);
+        STAT_TYPE = Registry.<StatType<?>>registerSimple(Registry.STAT_TYPE_REGISTRY, () -> Stats.ITEM_USED);
+        VILLAGER_TYPE = Registry.<VillagerType>registerDefaulted(Registry.VILLAGER_TYPE_REGISTRY, "plains", () -> VillagerType.PLAINS);
+        VILLAGER_PROFESSION = Registry.<VillagerProfession>registerDefaulted(Registry.VILLAGER_PROFESSION_REGISTRY, "none", () -> VillagerProfession.NONE);
+        POINT_OF_INTEREST_TYPE = Registry.<PoiType>registerDefaulted(Registry.POINT_OF_INTEREST_TYPE_REGISTRY, "unemployed", () -> PoiType.UNEMPLOYED);
+        MEMORY_MODULE_TYPE = Registry.<MemoryModuleType<?>>registerDefaulted(Registry.MEMORY_MODULE_TYPE_REGISTRY, "dummy", () -> MemoryModuleType.DUMMY);
+        SENSOR_TYPE = Registry.<SensorType<?>>registerDefaulted(Registry.SENSOR_TYPE_REGISTRY, "dummy", () -> SensorType.DUMMY);
+        SCHEDULE = Registry.<Schedule>registerSimple(Registry.SCHEDULE_REGISTRY, () -> Schedule.EMPTY);
+        ACTIVITY = Registry.<Activity>registerSimple(Registry.ACTIVITY_REGISTRY, () -> Activity.IDLE);
+        LOOT_POOL_ENTRY_TYPE = Registry.<LootPoolEntryType>registerSimple(Registry.LOOT_ENTRY_REGISTRY, () -> LootPoolEntries.EMPTY);
+        LOOT_FUNCTION_TYPE = Registry.<LootItemFunctionType>registerSimple(Registry.LOOT_FUNCTION_REGISTRY, () -> LootItemFunctions.SET_COUNT);
+        LOOT_CONDITION_TYPE = Registry.<LootItemConditionType>registerSimple(Registry.LOOT_ITEM_REGISTRY, () -> LootItemConditions.INVERTED);
+        Registry.LOADERS.forEach((uh, supplier) -> {
+            if (supplier.get() == null) {
+                Registry.LOGGER.error("Unable to bootstrap registry '{}'", uh);
+            }
+            return;
+        });
+        Registry.<WritableRegistry<?>>checkRegistry(Registry.WRITABLE_REGISTRY);
+    }
 }
diff --git a/src/net/minecraft/core/RegistryAccess.java b/src/net/minecraft/core/RegistryAccess.java
new file mode 100644
index 0000000..fe90657
--- /dev/null
+++ b/src/net/minecraft/core/RegistryAccess.java
@@ -0,0 +1,53 @@
+package net.minecraft.core;
+
+import java.util.function.Function;
+import java.util.Objects;
+import com.mojang.serialization.Lifecycle;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.dimension.DimensionType;
+import java.util.Optional;
+import net.minecraft.resources.ResourceKey;
+
+public interface RegistryAccess {
+     <E> Optional<WritableRegistry<E>> registry(final ResourceKey<Registry<E>> ug);
+    
+    Registry<DimensionType> dimensionTypes();
+    
+    default RegistryHolder builtin() {
+        return DimensionType.registerBuiltin(new RegistryHolder());
+    }
+    
+    public static final class RegistryHolder implements RegistryAccess {
+        public static final Codec<RegistryHolder> CODEC;
+        private final MappedRegistry<DimensionType> dimensionTypes;
+        
+        public RegistryHolder() {
+            this(new MappedRegistry<DimensionType>(Registry.DIMENSION_TYPE_REGISTRY, Lifecycle.experimental()));
+        }
+        
+        private RegistryHolder(final MappedRegistry<DimensionType> gh) {
+            this.dimensionTypes = gh;
+        }
+        
+        public void registerDimension(final ResourceKey<DimensionType> ug, final DimensionType cif) {
+            this.dimensionTypes.<DimensionType>register(ug, cif);
+        }
+        
+        @Override
+        public <E> Optional<WritableRegistry<E>> registry(final ResourceKey<Registry<E>> ug) {
+            if (Objects.equals(ug, Registry.DIMENSION_TYPE_REGISTRY)) {
+                return Optional.<WritableRegistry<E>>of((WritableRegistry<E>)this.dimensionTypes);
+            }
+            return Optional.<WritableRegistry<E>>empty();
+        }
+        
+        @Override
+        public Registry<DimensionType> dimensionTypes() {
+            return this.dimensionTypes;
+        }
+        
+        static {
+            CODEC = MappedRegistry.<DimensionType>networkCodec(Registry.DIMENSION_TYPE_REGISTRY, Lifecycle.experimental(), DimensionType.DIRECT_CODEC).xmap((Function)RegistryHolder::new, a -> a.dimensionTypes).fieldOf("dimension").codec();
+        }
+    }
+}
diff --git a/src/net/minecraft/core/Rotations.java b/src/net/minecraft/core/Rotations.java
index 1a3a56b..68e1472 100644
--- a/src/net/minecraft/core/Rotations.java
+++ b/src/net/minecraft/core/Rotations.java
@@ -15,16 +15,16 @@ public class Rotations {
         this.z = ((Float.isInfinite(float3) || Float.isNaN(float3)) ? 0.0f : (float3 % 360.0f));
     }
     
-    public Rotations(final ListTag jz) {
-        this(jz.getFloat(0), jz.getFloat(1), jz.getFloat(2));
+    public Rotations(final ListTag lk) {
+        this(lk.getFloat(0), lk.getFloat(1), lk.getFloat(2));
     }
     
     public ListTag save() {
-        final ListTag jz2 = new ListTag();
-        ((AbstractList<FloatTag>)jz2).add(FloatTag.valueOf(this.x));
-        ((AbstractList<FloatTag>)jz2).add(FloatTag.valueOf(this.y));
-        ((AbstractList<FloatTag>)jz2).add(FloatTag.valueOf(this.z));
-        return jz2;
+        final ListTag lk2 = new ListTag();
+        ((AbstractList<FloatTag>)lk2).add(FloatTag.valueOf(this.x));
+        ((AbstractList<FloatTag>)lk2).add(FloatTag.valueOf(this.y));
+        ((AbstractList<FloatTag>)lk2).add(FloatTag.valueOf(this.z));
+        return lk2;
     }
     
     @Override
@@ -32,8 +32,8 @@ public class Rotations {
         if (!(object instanceof Rotations)) {
             return false;
         }
-        final Rotations gc3 = (Rotations)object;
-        return this.x == gc3.x && this.y == gc3.y && this.z == gc3.z;
+        final Rotations gn3 = (Rotations)object;
+        return this.x == gn3.x && this.y == gn3.y && this.z == gn3.z;
     }
     
     public float getX() {
diff --git a/src/net/minecraft/core/SectionPos.java b/src/net/minecraft/core/SectionPos.java
index ba99500..a5c8f44 100644
--- a/src/net/minecraft/core/SectionPos.java
+++ b/src/net/minecraft/core/SectionPos.java
@@ -18,24 +18,24 @@ public class SectionPos extends Vec3i {
         return new SectionPos(integer1, integer2, integer3);
     }
     
-    public static SectionPos of(final BlockPos fk) {
-        return new SectionPos(blockToSectionCoord(fk.getX()), blockToSectionCoord(fk.getY()), blockToSectionCoord(fk.getZ()));
+    public static SectionPos of(final BlockPos fu) {
+        return new SectionPos(blockToSectionCoord(fu.getX()), blockToSectionCoord(fu.getY()), blockToSectionCoord(fu.getZ()));
     }
     
-    public static SectionPos of(final ChunkPos bjh, final int integer) {
-        return new SectionPos(bjh.x, integer, bjh.z);
+    public static SectionPos of(final ChunkPos bph, final int integer) {
+        return new SectionPos(bph.x, integer, bph.z);
     }
     
-    public static SectionPos of(final Entity akq) {
-        return new SectionPos(blockToSectionCoord(Mth.floor(akq.getX())), blockToSectionCoord(Mth.floor(akq.getY())), blockToSectionCoord(Mth.floor(akq.getZ())));
+    public static SectionPos of(final Entity aom) {
+        return new SectionPos(blockToSectionCoord(Mth.floor(aom.getX())), blockToSectionCoord(Mth.floor(aom.getY())), blockToSectionCoord(Mth.floor(aom.getZ())));
     }
     
     public static SectionPos of(final long long1) {
         return new SectionPos(x(long1), y(long1), z(long1));
     }
     
-    public static long offset(final long long1, final Direction fp) {
-        return offset(long1, fp.getStepX(), fp.getStepY(), fp.getStepZ());
+    public static long offset(final long long1, final Direction fz) {
+        return offset(long1, fz.getStepX(), fz.getStepY(), fz.getStepZ());
     }
     
     public static long offset(final long long1, final int integer2, final int integer3, final int integer4) {
@@ -50,10 +50,10 @@ public class SectionPos extends Vec3i {
         return integer & 0xF;
     }
     
-    public static short sectionRelativePos(final BlockPos fk) {
-        final int integer2 = sectionRelative(fk.getX());
-        final int integer3 = sectionRelative(fk.getY());
-        final int integer4 = sectionRelative(fk.getZ());
+    public static short sectionRelativePos(final BlockPos fu) {
+        final int integer2 = sectionRelative(fu.getX());
+        final int integer3 = sectionRelative(fu.getY());
+        final int integer4 = sectionRelative(fu.getZ());
         return (short)(integer2 << 8 | integer4 << 4 | integer3);
     }
     
@@ -146,16 +146,16 @@ public class SectionPos extends Vec3i {
         return BlockPos.betweenClosedStream(this.minBlockX(), this.minBlockY(), this.minBlockZ(), this.maxBlockX(), this.maxBlockY(), this.maxBlockZ());
     }
     
-    public static Stream<SectionPos> cube(final SectionPos gd, final int integer) {
-        final int integer2 = gd.x();
-        final int integer3 = gd.y();
-        final int integer4 = gd.z();
+    public static Stream<SectionPos> cube(final SectionPos go, final int integer) {
+        final int integer2 = go.x();
+        final int integer3 = go.y();
+        final int integer4 = go.z();
         return betweenClosedStream(integer2 - integer, integer3 - integer, integer4 - integer, integer2 + integer, integer3 + integer, integer4 + integer);
     }
     
-    public static Stream<SectionPos> aroundChunk(final ChunkPos bjh, final int integer) {
-        final int integer2 = bjh.x;
-        final int integer3 = bjh.z;
+    public static Stream<SectionPos> aroundChunk(final ChunkPos bph, final int integer) {
+        final int integer2 = bph.x;
+        final int integer3 = bph.z;
         return betweenClosedStream(integer2 - integer, 0, integer3 - integer, integer2 + integer, 15, integer3 + integer);
     }
     
diff --git a/src/net/minecraft/core/SerializableLong.java b/src/net/minecraft/core/SerializableLong.java
deleted file mode 100644
index a4482ff..0000000
--- a/src/net/minecraft/core/SerializableLong.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package net.minecraft.core;
-
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.util.Serializable;
-
-public final class SerializableLong implements Serializable {
-    private final long value;
-    
-    private SerializableLong(final long long1) {
-        this.value = long1;
-    }
-    
-    public long value() {
-        return this.value;
-    }
-    
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)dynamicOps.createLong(this.value);
-    }
-    
-    public static SerializableLong of(final Dynamic<?> dynamic) {
-        return new SerializableLong(dynamic.asNumber((Number)0).longValue());
-    }
-    
-    public static SerializableLong of(final long long1) {
-        return new SerializableLong(long1);
-    }
-    
-    @Override
-    public boolean equals(final Object object) {
-        if (this == object) {
-            return true;
-        }
-        if (object == null || this.getClass() != object.getClass()) {
-            return false;
-        }
-        final SerializableLong ge3 = (SerializableLong)object;
-        return this.value == ge3.value;
-    }
-    
-    @Override
-    public int hashCode() {
-        return Long.hashCode(this.value);
-    }
-    
-    @Override
-    public String toString() {
-        return Long.toString(this.value);
-    }
-}
diff --git a/src/net/minecraft/core/SerializableUUID.java b/src/net/minecraft/core/SerializableUUID.java
new file mode 100644
index 0000000..2e558f4
--- /dev/null
+++ b/src/net/minecraft/core/SerializableUUID.java
@@ -0,0 +1,31 @@
+package net.minecraft.core;
+
+import java.util.function.Function;
+import net.minecraft.Util;
+import com.mojang.serialization.DataResult;
+import java.util.Arrays;
+import java.util.stream.IntStream;
+import java.util.UUID;
+import com.mojang.serialization.Codec;
+
+public final class SerializableUUID {
+    public static final Codec<UUID> CODEC;
+    
+    public static UUID uuidFromIntArray(final int[] arr) {
+        return new UUID((long)arr[0] << 32 | ((long)arr[1] & 0xFFFFFFFFL), (long)arr[2] << 32 | ((long)arr[3] & 0xFFFFFFFFL));
+    }
+    
+    public static int[] uuidToIntArray(final UUID uUID) {
+        final long long2 = uUID.getMostSignificantBits();
+        final long long3 = uUID.getLeastSignificantBits();
+        return leastMostToIntArray(long2, long3);
+    }
+    
+    private static int[] leastMostToIntArray(final long long1, final long long2) {
+        return new int[] { (int)(long1 >> 32), (int)long1, (int)(long2 >> 32), (int)long2 };
+    }
+    
+    static {
+        CODEC = Codec.INT_STREAM.comapFlatMap(intStream -> Util.fixedSize(intStream, 4).map((Function)SerializableUUID::uuidFromIntArray), uUID -> Arrays.stream(uuidToIntArray(uUID)));
+    }
+}
diff --git a/src/net/minecraft/core/Vec3i.java b/src/net/minecraft/core/Vec3i.java
index aa1857b..8e2260f 100644
--- a/src/net/minecraft/core/Vec3i.java
+++ b/src/net/minecraft/core/Vec3i.java
@@ -1,18 +1,20 @@
 package net.minecraft.core;
 
+import net.minecraft.Util;
+import com.mojang.serialization.DataResult;
+import java.util.stream.IntStream;
 import com.google.common.base.MoreObjects;
 import net.minecraft.util.Mth;
+import com.mojang.serialization.Codec;
 import javax.annotation.concurrent.Immutable;
 
 @Immutable
 public class Vec3i implements Comparable<Vec3i> {
+    public static final Codec<Vec3i> CODEC;
     public static final Vec3i ZERO;
-    @Deprecated
-    private final int x;
-    @Deprecated
-    private final int y;
-    @Deprecated
-    private final int z;
+    private int x;
+    private int y;
+    private int z;
     
     public Vec3i(final int integer1, final int integer2, final int integer3) {
         this.x = integer1;
@@ -32,8 +34,8 @@ public class Vec3i implements Comparable<Vec3i> {
         if (!(object instanceof Vec3i)) {
             return false;
         }
-        final Vec3i gg3 = (Vec3i)object;
-        return this.getX() == gg3.getX() && this.getY() == gg3.getY() && this.getZ() == gg3.getZ();
+        final Vec3i gr3 = (Vec3i)object;
+        return this.getX() == gr3.getX() && this.getY() == gr3.getY() && this.getZ() == gr3.getZ();
     }
     
     @Override
@@ -42,14 +44,14 @@ public class Vec3i implements Comparable<Vec3i> {
     }
     
     @Override
-    public int compareTo(final Vec3i gg) {
-        if (this.getY() != gg.getY()) {
-            return this.getY() - gg.getY();
+    public int compareTo(final Vec3i gr) {
+        if (this.getY() != gr.getY()) {
+            return this.getY() - gr.getY();
         }
-        if (this.getZ() == gg.getZ()) {
-            return this.getX() - gg.getX();
+        if (this.getZ() == gr.getZ()) {
+            return this.getX() - gr.getX();
         }
-        return this.getZ() - gg.getZ();
+        return this.getZ() - gr.getZ();
     }
     
     public int getX() {
@@ -64,6 +66,18 @@ public class Vec3i implements Comparable<Vec3i> {
         return this.z;
     }
     
+    protected void setX(final int integer) {
+        this.x = integer;
+    }
+    
+    protected void setY(final int integer) {
+        this.y = integer;
+    }
+    
+    protected void setZ(final int integer) {
+        this.z = integer;
+    }
+    
     public Vec3i below() {
         return this.below(1);
     }
@@ -72,31 +86,31 @@ public class Vec3i implements Comparable<Vec3i> {
         return this.relative(Direction.DOWN, integer);
     }
     
-    public Vec3i relative(final Direction fp, final int integer) {
+    public Vec3i relative(final Direction fz, final int integer) {
         if (integer == 0) {
             return this;
         }
-        return new Vec3i(this.getX() + fp.getStepX() * integer, this.getY() + fp.getStepY() * integer, this.getZ() + fp.getStepZ() * integer);
+        return new Vec3i(this.getX() + fz.getStepX() * integer, this.getY() + fz.getStepY() * integer, this.getZ() + fz.getStepZ() * integer);
     }
     
-    public Vec3i cross(final Vec3i gg) {
-        return new Vec3i(this.getY() * gg.getZ() - this.getZ() * gg.getY(), this.getZ() * gg.getX() - this.getX() * gg.getZ(), this.getX() * gg.getY() - this.getY() * gg.getX());
+    public Vec3i cross(final Vec3i gr) {
+        return new Vec3i(this.getY() * gr.getZ() - this.getZ() * gr.getY(), this.getZ() * gr.getX() - this.getX() * gr.getZ(), this.getX() * gr.getY() - this.getY() * gr.getX());
     }
     
-    public boolean closerThan(final Vec3i gg, final double double2) {
-        return this.distSqr(gg.getX(), gg.getY(), gg.getZ(), false) < double2 * double2;
+    public boolean closerThan(final Vec3i gr, final double double2) {
+        return this.distSqr(gr.getX(), gr.getY(), gr.getZ(), false) < double2 * double2;
     }
     
-    public boolean closerThan(final Position fz, final double double2) {
-        return this.distSqr(fz.x(), fz.y(), fz.z(), true) < double2 * double2;
+    public boolean closerThan(final Position gj, final double double2) {
+        return this.distSqr(gj.x(), gj.y(), gj.z(), true) < double2 * double2;
     }
     
-    public double distSqr(final Vec3i gg) {
-        return this.distSqr(gg.getX(), gg.getY(), gg.getZ(), true);
+    public double distSqr(final Vec3i gr) {
+        return this.distSqr(gr.getX(), gr.getY(), gr.getZ(), true);
     }
     
-    public double distSqr(final Position fz, final boolean boolean2) {
-        return this.distSqr(fz.x(), fz.y(), fz.z(), boolean2);
+    public double distSqr(final Position gj, final boolean boolean2) {
+        return this.distSqr(gj.x(), gj.y(), gj.z(), boolean2);
     }
     
     public double distSqr(final double double1, final double double2, final double double3, final boolean boolean4) {
@@ -107,10 +121,10 @@ public class Vec3i implements Comparable<Vec3i> {
         return double5 * double5 + double6 * double6 + double7 * double7;
     }
     
-    public int distManhattan(final Vec3i gg) {
-        final float float3 = (float)Math.abs(gg.getX() - this.getX());
-        final float float4 = (float)Math.abs(gg.getY() - this.getY());
-        final float float5 = (float)Math.abs(gg.getZ() - this.getZ());
+    public int distManhattan(final Vec3i gr) {
+        final float float3 = (float)Math.abs(gr.getX() - this.getX());
+        final float float4 = (float)Math.abs(gr.getY() - this.getY());
+        final float float5 = (float)Math.abs(gr.getZ() - this.getZ());
         return (int)(float3 + float4 + float5);
     }
     
@@ -124,6 +138,7 @@ public class Vec3i implements Comparable<Vec3i> {
     }
     
     static {
+        CODEC = Codec.INT_STREAM.comapFlatMap(intStream -> Util.fixedSize(intStream, 3).map(arr -> new Vec3i(arr[0], arr[1], arr[2])), gr -> IntStream.of(gr.getX(), gr.getY(), gr.getZ()));
         ZERO = new Vec3i(0, 0, 0);
     }
 }
diff --git a/src/net/minecraft/core/WritableRegistry.java b/src/net/minecraft/core/WritableRegistry.java
index 680ba7f..9c4629e 100644
--- a/src/net/minecraft/core/WritableRegistry.java
+++ b/src/net/minecraft/core/WritableRegistry.java
@@ -1,11 +1,16 @@
 package net.minecraft.core;
 
-import net.minecraft.resources.ResourceLocation;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.resources.ResourceKey;
 
 public abstract class WritableRegistry<T> extends Registry<T> {
-    public abstract <V extends T> V registerMapping(final int integer, final ResourceLocation sm, final V object);
+    public WritableRegistry(final ResourceKey<Registry<T>> ug, final Lifecycle lifecycle) {
+        super(ug, lifecycle);
+    }
     
-    public abstract <V extends T> V register(final ResourceLocation sm, final V object);
+    public abstract <V extends T> V registerMapping(final int integer, final ResourceKey<T> ug, final V object);
     
-    public abstract boolean isEmpty();
+    public abstract <V extends T> V register(final ResourceKey<T> ug, final V object);
+    
+    public abstract void setPersistent(final ResourceKey<T> ug);
 }
diff --git a/src/net/minecraft/core/dispenser/AbstractProjectileDispenseBehavior.java b/src/net/minecraft/core/dispenser/AbstractProjectileDispenseBehavior.java
index d2e9976..da7429a 100644
--- a/src/net/minecraft/core/dispenser/AbstractProjectileDispenseBehavior.java
+++ b/src/net/minecraft/core/dispenser/AbstractProjectileDispenseBehavior.java
@@ -11,23 +11,23 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.BlockSource;
 
 public abstract class AbstractProjectileDispenseBehavior extends DefaultDispenseItemBehavior {
-    public ItemStack execute(final BlockSource fl, final ItemStack ben) {
-        final Level bjw4 = fl.getLevel();
-        final Position fz5 = DispenserBlock.getDispensePosition(fl);
-        final Direction fp6 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-        final Projectile ayy7 = this.getProjectile(bjw4, fz5, ben);
-        ayy7.shoot(fp6.getStepX(), fp6.getStepY() + 0.1f, fp6.getStepZ(), this.getPower(), this.getUncertainty());
-        bjw4.addFreshEntity((Entity)ayy7);
-        ben.shrink(1);
-        return ben;
+    public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+        final Level bqb4 = fv.getLevel();
+        final Position gj5 = DispenserBlock.getDispensePosition(fv);
+        final Direction fz6 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+        final Projectile bes7 = this.getProjectile(bqb4, gj5, bki);
+        bes7.shoot(fz6.getStepX(), fz6.getStepY() + 0.1f, fz6.getStepZ(), this.getPower(), this.getUncertainty());
+        bqb4.addFreshEntity(bes7);
+        bki.shrink(1);
+        return bki;
     }
     
     @Override
-    protected void playSound(final BlockSource fl) {
-        fl.getLevel().levelEvent(1002, fl.getPos(), 0);
+    protected void playSound(final BlockSource fv) {
+        fv.getLevel().levelEvent(1002, fv.getPos(), 0);
     }
     
-    protected abstract Projectile getProjectile(final Level bjw, final Position fz, final ItemStack ben);
+    protected abstract Projectile getProjectile(final Level bqb, final Position gj, final ItemStack bki);
     
     protected float getUncertainty() {
         return 6.0f;
diff --git a/src/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java b/src/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
index edfaa7e..86ed608 100644
--- a/src/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
+++ b/src/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
@@ -3,6 +3,8 @@ package net.minecraft.core.dispenser;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.DispenserBlock;
@@ -20,33 +22,33 @@ public class BoatDispenseItemBehavior extends DefaultDispenseItemBehavior {
         this.type = b;
     }
     
-    public ItemStack execute(final BlockSource fl, final ItemStack ben) {
-        final Direction fp4 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-        final Level bjw5 = fl.getLevel();
-        final double double6 = fl.x() + fp4.getStepX() * 1.125f;
-        final double double7 = fl.y() + fp4.getStepY() * 1.125f;
-        final double double8 = fl.z() + fp4.getStepZ() * 1.125f;
-        final BlockPos fk12 = fl.getPos().relative(fp4);
+    public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+        final Direction fz4 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+        final Level bqb5 = fv.getLevel();
+        final double double6 = fv.x() + fz4.getStepX() * 1.125f;
+        final double double7 = fv.y() + fz4.getStepY() * 1.125f;
+        final double double8 = fv.z() + fz4.getStepZ() * 1.125f;
+        final BlockPos fu12 = fv.getPos().relative(fz4);
         double double9;
-        if (bjw5.getFluidState(fk12).is(FluidTags.WATER)) {
+        if (bqb5.getFluidState(fu12).is(FluidTags.WATER)) {
             double9 = 1.0;
         }
         else {
-            if (!bjw5.getBlockState(fk12).isAir() || !bjw5.getFluidState(fk12.below()).is(FluidTags.WATER)) {
-                return this.defaultDispenseItemBehavior.dispense(fl, ben);
+            if (!bqb5.getBlockState(fu12).isAir() || !bqb5.getFluidState(fu12.below()).is(FluidTags.WATER)) {
+                return this.defaultDispenseItemBehavior.dispense(fv, bki);
             }
             double9 = 0.0;
         }
-        final Boat azz15 = new Boat(bjw5, double6, double7 + double9, double8);
-        azz15.setType(this.type);
-        azz15.yRot = fp4.toYRot();
-        bjw5.addFreshEntity(azz15);
-        ben.shrink(1);
-        return ben;
+        final Boat bft15 = new Boat(bqb5, double6, double7 + double9, double8);
+        bft15.setType(this.type);
+        bft15.yRot = fz4.toYRot();
+        bqb5.addFreshEntity(bft15);
+        bki.shrink(1);
+        return bki;
     }
     
     @Override
-    protected void playSound(final BlockSource fl) {
-        fl.getLevel().levelEvent(1000, fl.getPos(), 0);
+    protected void playSound(final BlockSource fv) {
+        fv.getLevel().levelEvent(1000, fv.getPos(), 0);
     }
 }
diff --git a/src/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java b/src/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
index 2a4eab7..f5ea36d 100644
--- a/src/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
+++ b/src/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
@@ -12,42 +12,42 @@ import net.minecraft.core.BlockSource;
 
 public class DefaultDispenseItemBehavior implements DispenseItemBehavior {
     @Override
-    public final ItemStack dispense(final BlockSource fl, final ItemStack ben) {
-        final ItemStack ben2 = this.execute(fl, ben);
-        this.playSound(fl);
-        this.playAnimation(fl, fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
-        return ben2;
+    public final ItemStack dispense(final BlockSource fv, final ItemStack bki) {
+        final ItemStack bki2 = this.execute(fv, bki);
+        this.playSound(fv);
+        this.playAnimation(fv, fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+        return bki2;
     }
     
-    protected ItemStack execute(final BlockSource fl, final ItemStack ben) {
-        final Direction fp4 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-        final Position fz5 = DispenserBlock.getDispensePosition(fl);
-        final ItemStack ben2 = ben.split(1);
-        spawnItem(fl.getLevel(), ben2, 6, fp4, fz5);
-        return ben;
+    protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+        final Direction fz4 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+        final Position gj5 = DispenserBlock.getDispensePosition(fv);
+        final ItemStack bki2 = bki.split(1);
+        spawnItem(fv.getLevel(), bki2, 6, fz4, gj5);
+        return bki;
     }
     
-    public static void spawnItem(final Level bjw, final ItemStack ben, final int integer, final Direction fp, final Position fz) {
-        final double double6 = fz.x();
-        double double7 = fz.y();
-        final double double8 = fz.z();
-        if (fp.getAxis() == Direction.Axis.Y) {
+    public static void spawnItem(final Level bqb, final ItemStack bki, final int integer, final Direction fz, final Position gj) {
+        final double double6 = gj.x();
+        double double7 = gj.y();
+        final double double8 = gj.z();
+        if (fz.getAxis() == Direction.Axis.Y) {
             double7 -= 0.125;
         }
         else {
             double7 -= 0.15625;
         }
-        final ItemEntity awb12 = new ItemEntity(bjw, double6, double7, double8, ben);
-        final double double9 = bjw.random.nextDouble() * 0.1 + 0.2;
-        awb12.setDeltaMovement(bjw.random.nextGaussian() * 0.007499999832361937 * integer + fp.getStepX() * double9, bjw.random.nextGaussian() * 0.007499999832361937 * integer + 0.20000000298023224, bjw.random.nextGaussian() * 0.007499999832361937 * integer + fp.getStepZ() * double9);
-        bjw.addFreshEntity(awb12);
+        final ItemEntity bbg12 = new ItemEntity(bqb, double6, double7, double8, bki);
+        final double double9 = bqb.random.nextDouble() * 0.1 + 0.2;
+        bbg12.setDeltaMovement(bqb.random.nextGaussian() * 0.007499999832361937 * integer + fz.getStepX() * double9, bqb.random.nextGaussian() * 0.007499999832361937 * integer + 0.20000000298023224, bqb.random.nextGaussian() * 0.007499999832361937 * integer + fz.getStepZ() * double9);
+        bqb.addFreshEntity(bbg12);
     }
     
-    protected void playSound(final BlockSource fl) {
-        fl.getLevel().levelEvent(1000, fl.getPos(), 0);
+    protected void playSound(final BlockSource fv) {
+        fv.getLevel().levelEvent(1000, fv.getPos(), 0);
     }
     
-    protected void playAnimation(final BlockSource fl, final Direction fp) {
-        fl.getLevel().levelEvent(2000, fl.getPos(), fp.get3DDataValue());
+    protected void playAnimation(final BlockSource fv, final Direction fz) {
+        fv.getLevel().levelEvent(2000, fv.getPos(), fz.get3DDataValue());
     }
 }
diff --git a/src/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/net/minecraft/core/dispenser/DispenseItemBehavior.java
index b30fcb9..fb4ad92 100644
--- a/src/net/minecraft/core/dispenser/DispenseItemBehavior.java
+++ b/src/net/minecraft/core/dispenser/DispenseItemBehavior.java
@@ -1,14 +1,13 @@
 package net.minecraft.core.dispenser;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import java.util.Iterator;
-import java.util.List;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.entity.animal.Sheep;
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.block.RespawnAnchorBlock;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.item.alchemy.PotionUtils;
 import net.minecraft.world.item.alchemy.Potions;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.level.block.BeehiveBlock;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.ShulkerBoxBlock;
@@ -20,16 +19,16 @@ import net.minecraft.world.level.block.entity.SkullBlockEntity;
 import net.minecraft.world.level.block.SkullBlock;
 import net.minecraft.world.level.block.WitherSkullBlock;
 import net.minecraft.world.item.ArmorItem;
-import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.item.PrimedTnt;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.item.BoneMealItem;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.block.TntBlock;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.item.FlintAndSteelItem;
+import net.minecraft.world.level.block.CampfireBlock;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.BaseFireBlock;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.block.Block;
@@ -44,6 +43,14 @@ import net.minecraft.world.entity.vehicle.Boat;
 import java.util.Random;
 import net.minecraft.world.entity.projectile.SmallFireball;
 import net.minecraft.world.entity.projectile.FireworkRocketEntity;
+import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
+import java.util.Iterator;
+import net.minecraft.world.entity.animal.horse.AbstractHorse;
+import java.util.List;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.entity.Saddleable;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.decoration.ArmorStand;
@@ -71,52 +78,52 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.BlockSource;
 
 public interface DispenseItemBehavior {
-    public static final DispenseItemBehavior NOOP = (fl, ben) -> ben;
+    public static final DispenseItemBehavior NOOP = (fv, bki) -> bki;
     
-    ItemStack dispense(final BlockSource fl, final ItemStack ben);
+    ItemStack dispense(final BlockSource fv, final ItemStack bki);
     
     default void bootStrap() {
         DispenserBlock.registerBehavior(Items.ARROW, new AbstractProjectileDispenseBehavior() {
             @Override
-            protected Projectile getProjectile(final Level bjw, final Position fz, final ItemStack ben) {
-                final Arrow ayp5 = new Arrow(bjw, fz.x(), fz.y(), fz.z());
-                ayp5.pickup = AbstractArrow.Pickup.ALLOWED;
-                return ayp5;
+            protected Projectile getProjectile(final Level bqb, final Position gj, final ItemStack bki) {
+                final Arrow bei5 = new Arrow(bqb, gj.x(), gj.y(), gj.z());
+                bei5.pickup = AbstractArrow.Pickup.ALLOWED;
+                return bei5;
             }
         });
         DispenserBlock.registerBehavior(Items.TIPPED_ARROW, new AbstractProjectileDispenseBehavior() {
             @Override
-            protected Projectile getProjectile(final Level bjw, final Position fz, final ItemStack ben) {
-                final Arrow ayp5 = new Arrow(bjw, fz.x(), fz.y(), fz.z());
-                ayp5.setEffectsFromItem(ben);
-                ayp5.pickup = AbstractArrow.Pickup.ALLOWED;
-                return ayp5;
+            protected Projectile getProjectile(final Level bqb, final Position gj, final ItemStack bki) {
+                final Arrow bei5 = new Arrow(bqb, gj.x(), gj.y(), gj.z());
+                bei5.setEffectsFromItem(bki);
+                bei5.pickup = AbstractArrow.Pickup.ALLOWED;
+                return bei5;
             }
         });
         DispenserBlock.registerBehavior(Items.SPECTRAL_ARROW, new AbstractProjectileDispenseBehavior() {
             @Override
-            protected Projectile getProjectile(final Level bjw, final Position fz, final ItemStack ben) {
-                final AbstractArrow ayn5 = new SpectralArrow(bjw, fz.x(), fz.y(), fz.z());
-                ayn5.pickup = AbstractArrow.Pickup.ALLOWED;
-                return ayn5;
+            protected Projectile getProjectile(final Level bqb, final Position gj, final ItemStack bki) {
+                final AbstractArrow beg5 = new SpectralArrow(bqb, gj.x(), gj.y(), gj.z());
+                beg5.pickup = AbstractArrow.Pickup.ALLOWED;
+                return beg5;
             }
         });
         DispenserBlock.registerBehavior(Items.EGG, new AbstractProjectileDispenseBehavior() {
             @Override
-            protected Projectile getProjectile(final Level bjw, final Position fz, final ItemStack ben) {
-                return Util.<ThrownEgg>make(new ThrownEgg(bjw, fz.x(), fz.y(), fz.z()), azg -> azg.setItem(ben));
+            protected Projectile getProjectile(final Level bqb, final Position gj, final ItemStack bki) {
+                return Util.<ThrownEgg>make(new ThrownEgg(bqb, gj.x(), gj.y(), gj.z()), bfa -> bfa.setItem(bki));
             }
         });
         DispenserBlock.registerBehavior(Items.SNOWBALL, new AbstractProjectileDispenseBehavior() {
             @Override
-            protected Projectile getProjectile(final Level bjw, final Position fz, final ItemStack ben) {
-                return Util.<Snowball>make(new Snowball(bjw, fz.x(), fz.y(), fz.z()), azc -> azc.setItem(ben));
+            protected Projectile getProjectile(final Level bqb, final Position gj, final ItemStack bki) {
+                return Util.<Snowball>make(new Snowball(bqb, gj.x(), gj.y(), gj.z()), bew -> bew.setItem(bki));
             }
         });
         DispenserBlock.registerBehavior(Items.EXPERIENCE_BOTTLE, new AbstractProjectileDispenseBehavior() {
             @Override
-            protected Projectile getProjectile(final Level bjw, final Position fz, final ItemStack ben) {
-                return Util.<ThrownExperienceBottle>make(new ThrownExperienceBottle(bjw, fz.x(), fz.y(), fz.z()), azi -> azi.setItem(ben));
+            protected Projectile getProjectile(final Level bqb, final Position gj, final ItemStack bki) {
+                return Util.<ThrownExperienceBottle>make(new ThrownExperienceBottle(bqb, gj.x(), gj.y(), gj.z()), bfc -> bfc.setItem(bki));
             }
             
             @Override
@@ -131,11 +138,11 @@ public interface DispenseItemBehavior {
         });
         DispenserBlock.registerBehavior(Items.SPLASH_POTION, new DispenseItemBehavior() {
             @Override
-            public ItemStack dispense(final BlockSource fl, final ItemStack ben) {
+            public ItemStack dispense(final BlockSource fv, final ItemStack bki) {
                 return new AbstractProjectileDispenseBehavior() {
                     @Override
-                    protected Projectile getProjectile(final Level bjw, final Position fz, final ItemStack ben) {
-                        return Util.<ThrownPotion>make(new ThrownPotion(bjw, fz.x(), fz.y(), fz.z()), azj -> azj.setItem(ben));
+                    protected Projectile getProjectile(final Level bqb, final Position gj, final ItemStack bki) {
+                        return Util.<ThrownPotion>make(new ThrownPotion(bqb, gj.x(), gj.y(), gj.z()), bfd -> bfd.setItem(bki));
                     }
                     
                     @Override
@@ -147,16 +154,16 @@ public interface DispenseItemBehavior {
                     protected float getPower() {
                         return super.getPower() * 1.25f;
                     }
-                }.dispense(fl, ben);
+                }.dispense(fv, bki);
             }
         });
         DispenserBlock.registerBehavior(Items.LINGERING_POTION, new DispenseItemBehavior() {
             @Override
-            public ItemStack dispense(final BlockSource fl, final ItemStack ben) {
+            public ItemStack dispense(final BlockSource fv, final ItemStack bki) {
                 return new AbstractProjectileDispenseBehavior() {
                     @Override
-                    protected Projectile getProjectile(final Level bjw, final Position fz, final ItemStack ben) {
-                        return Util.<ThrownPotion>make(new ThrownPotion(bjw, fz.x(), fz.y(), fz.z()), azj -> azj.setItem(ben));
+                    protected Projectile getProjectile(final Level bqb, final Position gj, final ItemStack bki) {
+                        return Util.<ThrownPotion>make(new ThrownPotion(bqb, gj.x(), gj.y(), gj.z()), bfd -> bfd.setItem(bki));
                     }
                     
                     @Override
@@ -168,75 +175,141 @@ public interface DispenseItemBehavior {
                     protected float getPower() {
                         return super.getPower() * 1.25f;
                     }
-                }.dispense(fl, ben);
+                }.dispense(fv, bki);
             }
         });
-        final DefaultDispenseItemBehavior gk1 = new DefaultDispenseItemBehavior() {
-            public ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final Direction fp4 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-                final EntityType<?> aku5 = ((SpawnEggItem)ben.getItem()).getType(ben.getTag());
-                aku5.spawn(fl.getLevel(), ben, null, fl.getPos().relative(fp4), MobSpawnType.DISPENSER, fp4 != Direction.UP, false);
-                ben.shrink(1);
-                return ben;
+        final DefaultDispenseItemBehavior gv1 = new DefaultDispenseItemBehavior() {
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final Direction fz4 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+                final EntityType<?> aoq5 = ((SpawnEggItem)bki.getItem()).getType(bki.getTag());
+                aoq5.spawn(fv.getLevel(), bki, null, fv.getPos().relative(fz4), MobSpawnType.DISPENSER, fz4 != Direction.UP, false);
+                bki.shrink(1);
+                return bki;
             }
         };
-        for (final SpawnEggItem bfl3 : SpawnEggItem.eggs()) {
-            DispenserBlock.registerBehavior(bfl3, gk1);
+        for (final SpawnEggItem blh3 : SpawnEggItem.eggs()) {
+            DispenserBlock.registerBehavior(blh3, gv1);
         }
         DispenserBlock.registerBehavior(Items.ARMOR_STAND, new DefaultDispenseItemBehavior() {
-            public ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final Direction fp4 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-                final BlockPos fk5 = fl.getPos().relative(fp4);
-                final Level bjw6 = fl.getLevel();
-                final ArmorStand avp7 = new ArmorStand(bjw6, fk5.getX() + 0.5, fk5.getY(), fk5.getZ() + 0.5);
-                EntityType.updateCustomEntityTag(bjw6, null, avp7, ben.getTag());
-                avp7.yRot = fp4.toYRot();
-                bjw6.addFreshEntity(avp7);
-                ben.shrink(1);
-                return ben;
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final Direction fz4 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+                final BlockPos fu5 = fv.getPos().relative(fz4);
+                final Level bqb6 = fv.getLevel();
+                final ArmorStand bay7 = new ArmorStand(bqb6, fu5.getX() + 0.5, fu5.getY(), fu5.getZ() + 0.5);
+                EntityType.updateCustomEntityTag(bqb6, null, bay7, bki.getTag());
+                bay7.yRot = fz4.toYRot();
+                bqb6.addFreshEntity(bay7);
+                bki.shrink(1);
+                return bki;
+            }
+        });
+        DispenserBlock.registerBehavior(Items.SADDLE, new OptionalDispenseItemBehavior() {
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final BlockPos fu4 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+                Saddleable apm2;
+                final List<LivingEntity> list5 = fv.getLevel().<LivingEntity>getEntitiesOfClass(LivingEntity.class, new AABB(fu4), aoy -> {
+                    if (aoy instanceof Saddleable) {
+                        apm2 = aoy;
+                        return !apm2.isSaddled() && apm2.isSaddleable();
+                    }
+                    else {
+                        return false;
+                    }
+                });
+                if (!list5.isEmpty()) {
+                    ((Saddleable)list5.get(0)).equipSaddle(SoundSource.BLOCKS);
+                    bki.shrink(1);
+                    this.setSuccess(true);
+                    return bki;
+                }
+                return super.execute(fv, bki);
+            }
+        });
+        final DefaultDispenseItemBehavior gv2 = new OptionalDispenseItemBehavior() {
+            @Override
+            protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final BlockPos fu4 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+                final List<AbstractHorse> list5 = fv.getLevel().<AbstractHorse>getEntitiesOfClass(AbstractHorse.class, new AABB(fu4), azm -> azm.isAlive() && azm.canWearArmor());
+                for (final AbstractHorse azm2 : list5) {
+                    if (azm2.isArmor(bki) && !azm2.isWearingArmor() && azm2.isTamed()) {
+                        azm2.setSlot(401, bki.split(1));
+                        this.setSuccess(true);
+                        return bki;
+                    }
+                }
+                return super.execute(fv, bki);
+            }
+        };
+        DispenserBlock.registerBehavior(Items.LEATHER_HORSE_ARMOR, gv2);
+        DispenserBlock.registerBehavior(Items.IRON_HORSE_ARMOR, gv2);
+        DispenserBlock.registerBehavior(Items.GOLDEN_HORSE_ARMOR, gv2);
+        DispenserBlock.registerBehavior(Items.DIAMOND_HORSE_ARMOR, gv2);
+        DispenserBlock.registerBehavior(Items.WHITE_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.ORANGE_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.CYAN_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.BLUE_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.BROWN_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.BLACK_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.GRAY_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.GREEN_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.LIGHT_BLUE_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.LIGHT_GRAY_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.LIME_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.MAGENTA_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.PINK_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.PURPLE_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.RED_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.YELLOW_CARPET, gv2);
+        DispenserBlock.registerBehavior(Items.CHEST, new OptionalDispenseItemBehavior() {
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final BlockPos fu4 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+                final List<AbstractChestedHorse> list5 = fv.getLevel().<AbstractChestedHorse>getEntitiesOfClass(AbstractChestedHorse.class, new AABB(fu4), azl -> azl.isAlive() && !azl.hasChest());
+                for (final AbstractChestedHorse azl2 : list5) {
+                    if (azl2.isTamed() && azl2.setSlot(499, bki)) {
+                        bki.shrink(1);
+                        this.setSuccess(true);
+                        return bki;
+                    }
+                }
+                return super.execute(fv, bki);
             }
         });
         DispenserBlock.registerBehavior(Items.FIREWORK_ROCKET, new DefaultDispenseItemBehavior() {
-            public ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final Direction fp4 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-                final double double5 = fp4.getStepX();
-                final double double6 = fp4.getStepY();
-                final double double7 = fp4.getStepZ();
-                final double double8 = fl.x() + double5;
-                final double double9 = fl.getPos().getY() + 0.2f;
-                final double double10 = fl.z() + double7;
-                final FireworkRocketEntity ayu17 = new FireworkRocketEntity(fl.getLevel(), ben, double8, double9, double10, true);
-                ayu17.shoot(double5, double6, double7, 0.5f, 1.0f);
-                fl.getLevel().addFreshEntity(ayu17);
-                ben.shrink(1);
-                return ben;
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final Direction fz4 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+                final FireworkRocketEntity ben5 = new FireworkRocketEntity(fv.getLevel(), bki, fv.x(), fv.y(), fv.x(), true);
+                DispenseItemBehavior.setEntityPokingOutOfBlock(fv, ben5, fz4);
+                ben5.shoot(fz4.getStepX(), fz4.getStepY(), fz4.getStepZ(), 0.5f, 1.0f);
+                fv.getLevel().addFreshEntity(ben5);
+                bki.shrink(1);
+                return bki;
             }
             
             @Override
-            protected void playSound(final BlockSource fl) {
-                fl.getLevel().levelEvent(1004, fl.getPos(), 0);
+            protected void playSound(final BlockSource fv) {
+                fv.getLevel().levelEvent(1004, fv.getPos(), 0);
             }
         });
         DispenserBlock.registerBehavior(Items.FIRE_CHARGE, new DefaultDispenseItemBehavior() {
-            public ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final Direction fp4 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-                final Position fz5 = DispenserBlock.getDispensePosition(fl);
-                final double double6 = fz5.x() + fp4.getStepX() * 0.3f;
-                final double double7 = fz5.y() + fp4.getStepY() * 0.3f;
-                final double double8 = fz5.z() + fp4.getStepZ() * 0.3f;
-                final Level bjw12 = fl.getLevel();
-                final Random random13 = bjw12.random;
-                final double double9 = random13.nextGaussian() * 0.05 + fp4.getStepX();
-                final double double10 = random13.nextGaussian() * 0.05 + fp4.getStepY();
-                final double double11 = random13.nextGaussian() * 0.05 + fp4.getStepZ();
-                bjw12.addFreshEntity(Util.<SmallFireball>make(new SmallFireball(bjw12, double6, double7, double8, double9, double10, double11), azb -> azb.setItem(ben)));
-                ben.shrink(1);
-                return ben;
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final Direction fz4 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+                final Position gj5 = DispenserBlock.getDispensePosition(fv);
+                final double double6 = gj5.x() + fz4.getStepX() * 0.3f;
+                final double double7 = gj5.y() + fz4.getStepY() * 0.3f;
+                final double double8 = gj5.z() + fz4.getStepZ() * 0.3f;
+                final Level bqb12 = fv.getLevel();
+                final Random random13 = bqb12.random;
+                final double double9 = random13.nextGaussian() * 0.05 + fz4.getStepX();
+                final double double10 = random13.nextGaussian() * 0.05 + fz4.getStepY();
+                final double double11 = random13.nextGaussian() * 0.05 + fz4.getStepZ();
+                bqb12.addFreshEntity(Util.<SmallFireball>make(new SmallFireball(bqb12, double6, double7, double8, double9, double10, double11), bev -> bev.setItem(bki)));
+                bki.shrink(1);
+                return bki;
             }
             
             @Override
-            protected void playSound(final BlockSource fl) {
-                fl.getLevel().levelEvent(1018, fl.getPos(), 0);
+            protected void playSound(final BlockSource fv) {
+                fv.getLevel().levelEvent(1018, fv.getPos(), 0);
             }
         });
         DispenserBlock.registerBehavior(Items.OAK_BOAT, new BoatDispenseItemBehavior(Boat.Type.OAK));
@@ -245,230 +318,218 @@ public interface DispenseItemBehavior {
         DispenserBlock.registerBehavior(Items.JUNGLE_BOAT, new BoatDispenseItemBehavior(Boat.Type.JUNGLE));
         DispenserBlock.registerBehavior(Items.DARK_OAK_BOAT, new BoatDispenseItemBehavior(Boat.Type.DARK_OAK));
         DispenserBlock.registerBehavior(Items.ACACIA_BOAT, new BoatDispenseItemBehavior(Boat.Type.ACACIA));
-        final DispenseItemBehavior gl2 = new DefaultDispenseItemBehavior() {
+        final DispenseItemBehavior gw3 = new DefaultDispenseItemBehavior() {
             private final DefaultDispenseItemBehavior defaultDispenseItemBehavior = new DefaultDispenseItemBehavior();
             
-            public ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final BucketItem bcx4 = (BucketItem)ben.getItem();
-                final BlockPos fk5 = fl.getPos().relative(fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
-                final Level bjw6 = fl.getLevel();
-                if (bcx4.emptyBucket(null, bjw6, fk5, null)) {
-                    bcx4.checkExtraContent(bjw6, ben, fk5);
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final BucketItem biu4 = (BucketItem)bki.getItem();
+                final BlockPos fu5 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+                final Level bqb6 = fv.getLevel();
+                if (biu4.emptyBucket(null, bqb6, fu5, null)) {
+                    biu4.checkExtraContent(bqb6, bki, fu5);
                     return new ItemStack(Items.BUCKET);
                 }
-                return this.defaultDispenseItemBehavior.dispense(fl, ben);
+                return this.defaultDispenseItemBehavior.dispense(fv, bki);
             }
         };
-        DispenserBlock.registerBehavior(Items.LAVA_BUCKET, gl2);
-        DispenserBlock.registerBehavior(Items.WATER_BUCKET, gl2);
-        DispenserBlock.registerBehavior(Items.SALMON_BUCKET, gl2);
-        DispenserBlock.registerBehavior(Items.COD_BUCKET, gl2);
-        DispenserBlock.registerBehavior(Items.PUFFERFISH_BUCKET, gl2);
-        DispenserBlock.registerBehavior(Items.TROPICAL_FISH_BUCKET, gl2);
+        DispenserBlock.registerBehavior(Items.LAVA_BUCKET, gw3);
+        DispenserBlock.registerBehavior(Items.WATER_BUCKET, gw3);
+        DispenserBlock.registerBehavior(Items.SALMON_BUCKET, gw3);
+        DispenserBlock.registerBehavior(Items.COD_BUCKET, gw3);
+        DispenserBlock.registerBehavior(Items.PUFFERFISH_BUCKET, gw3);
+        DispenserBlock.registerBehavior(Items.TROPICAL_FISH_BUCKET, gw3);
         DispenserBlock.registerBehavior(Items.BUCKET, new DefaultDispenseItemBehavior() {
             private final DefaultDispenseItemBehavior defaultDispenseItemBehavior = new DefaultDispenseItemBehavior();
             
-            public ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final LevelAccessor bjx4 = fl.getLevel();
-                final BlockPos fk5 = fl.getPos().relative(fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
-                final BlockState byj6 = bjx4.getBlockState(fk5);
-                final Block bph7 = byj6.getBlock();
-                if (!(bph7 instanceof BucketPickup)) {
-                    return super.execute(fl, ben);
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final LevelAccessor bqc4 = fv.getLevel();
+                final BlockPos fu5 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+                final BlockState cfj6 = bqc4.getBlockState(fu5);
+                final Block bvr7 = cfj6.getBlock();
+                if (!(bvr7 instanceof BucketPickup)) {
+                    return super.execute(fv, bki);
                 }
-                final Fluid coi9 = ((BucketPickup)bph7).takeLiquid(bjx4, fk5, byj6);
-                if (!(coi9 instanceof FlowingFluid)) {
-                    return super.execute(fl, ben);
+                final Fluid cwz9 = ((BucketPickup)bvr7).takeLiquid(bqc4, fu5, cfj6);
+                if (!(cwz9 instanceof FlowingFluid)) {
+                    return super.execute(fv, bki);
                 }
-                final Item bei8 = coi9.getBucket();
-                ben.shrink(1);
-                if (ben.isEmpty()) {
-                    return new ItemStack(bei8);
+                final Item bke8 = cwz9.getBucket();
+                bki.shrink(1);
+                if (bki.isEmpty()) {
+                    return new ItemStack(bke8);
                 }
-                if (fl.<DispenserBlockEntity>getEntity().addItem(new ItemStack(bei8)) < 0) {
-                    this.defaultDispenseItemBehavior.dispense(fl, new ItemStack(bei8));
+                if (fv.<DispenserBlockEntity>getEntity().addItem(new ItemStack(bke8)) < 0) {
+                    this.defaultDispenseItemBehavior.dispense(fv, new ItemStack(bke8));
                 }
-                return ben;
+                return bki;
             }
         });
         DispenserBlock.registerBehavior(Items.FLINT_AND_STEEL, new OptionalDispenseItemBehavior() {
             @Override
-            protected ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final Level bjw4 = fl.getLevel();
-                this.success = true;
-                final BlockPos fk5 = fl.getPos().relative(fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
-                final BlockState byj6 = bjw4.getBlockState(fk5);
-                if (FlintAndSteelItem.canUse(byj6, bjw4, fk5)) {
-                    bjw4.setBlockAndUpdate(fk5, Blocks.FIRE.defaultBlockState());
+            protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final Level bqb4 = fv.getLevel();
+                this.setSuccess(true);
+                final BlockPos fu5 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+                final BlockState cfj6 = bqb4.getBlockState(fu5);
+                if (BaseFireBlock.canBePlacedAt(bqb4, fu5)) {
+                    bqb4.setBlockAndUpdate(fu5, BaseFireBlock.getState(bqb4, fu5));
                 }
-                else if (FlintAndSteelItem.canLightCampFire(byj6)) {
-                    bjw4.setBlockAndUpdate(fk5, ((AbstractStateHolder<O, BlockState>)byj6).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.LIT, true));
+                else if (CampfireBlock.canLight(cfj6)) {
+                    bqb4.setBlockAndUpdate(fu5, ((StateHolder<O, BlockState>)cfj6).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.LIT, true));
                 }
-                else if (byj6.getBlock() instanceof TntBlock) {
-                    TntBlock.explode(bjw4, fk5);
-                    bjw4.removeBlock(fk5, false);
+                else if (cfj6.getBlock() instanceof TntBlock) {
+                    TntBlock.explode(bqb4, fu5);
+                    bqb4.removeBlock(fu5, false);
                 }
                 else {
-                    this.success = false;
+                    this.setSuccess(false);
                 }
-                if (this.success && ben.hurt(1, bjw4.random, null)) {
-                    ben.setCount(0);
+                if (this.isSuccess() && bki.hurt(1, bqb4.random, null)) {
+                    bki.setCount(0);
                 }
-                return ben;
+                return bki;
             }
         });
         DispenserBlock.registerBehavior(Items.BONE_MEAL, new OptionalDispenseItemBehavior() {
             @Override
-            protected ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                this.success = true;
-                final Level bjw4 = fl.getLevel();
-                final BlockPos fk5 = fl.getPos().relative(fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
-                if (BoneMealItem.growCrop(ben, bjw4, fk5) || BoneMealItem.growWaterPlant(ben, bjw4, fk5, null)) {
-                    if (!bjw4.isClientSide) {
-                        bjw4.levelEvent(2005, fk5, 0);
+            protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                this.setSuccess(true);
+                final Level bqb4 = fv.getLevel();
+                final BlockPos fu5 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+                if (BoneMealItem.growCrop(bki, bqb4, fu5) || BoneMealItem.growWaterPlant(bki, bqb4, fu5, null)) {
+                    if (!bqb4.isClientSide) {
+                        bqb4.levelEvent(2005, fu5, 0);
                     }
                 }
                 else {
-                    this.success = false;
+                    this.setSuccess(false);
                 }
-                return ben;
+                return bki;
             }
         });
         DispenserBlock.registerBehavior(Blocks.TNT, new DefaultDispenseItemBehavior() {
             @Override
-            protected ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final Level bjw4 = fl.getLevel();
-                final BlockPos fk5 = fl.getPos().relative(fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
-                final PrimedTnt awc6 = new PrimedTnt(bjw4, fk5.getX() + 0.5, fk5.getY(), fk5.getZ() + 0.5, null);
-                bjw4.addFreshEntity(awc6);
-                bjw4.playSound(null, awc6.getX(), awc6.getY(), awc6.getZ(), SoundEvents.TNT_PRIMED, SoundSource.BLOCKS, 1.0f, 1.0f);
-                ben.shrink(1);
-                return ben;
+            protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final Level bqb4 = fv.getLevel();
+                final BlockPos fu5 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+                final PrimedTnt bbh6 = new PrimedTnt(bqb4, fu5.getX() + 0.5, fu5.getY(), fu5.getZ() + 0.5, null);
+                bqb4.addFreshEntity(bbh6);
+                bqb4.playSound(null, bbh6.getX(), bbh6.getY(), bbh6.getZ(), SoundEvents.TNT_PRIMED, SoundSource.BLOCKS, 1.0f, 1.0f);
+                bki.shrink(1);
+                return bki;
             }
         });
-        final DispenseItemBehavior gl3 = new OptionalDispenseItemBehavior() {
+        final DispenseItemBehavior gw4 = new OptionalDispenseItemBehavior() {
             @Override
-            protected ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                this.success = ArmorItem.dispenseArmor(fl, ben);
-                return ben;
+            protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                this.setSuccess(ArmorItem.dispenseArmor(fv, bki));
+                return bki;
             }
         };
-        DispenserBlock.registerBehavior(Items.CREEPER_HEAD, gl3);
-        DispenserBlock.registerBehavior(Items.ZOMBIE_HEAD, gl3);
-        DispenserBlock.registerBehavior(Items.DRAGON_HEAD, gl3);
-        DispenserBlock.registerBehavior(Items.SKELETON_SKULL, gl3);
-        DispenserBlock.registerBehavior(Items.PLAYER_HEAD, gl3);
+        DispenserBlock.registerBehavior(Items.CREEPER_HEAD, gw4);
+        DispenserBlock.registerBehavior(Items.ZOMBIE_HEAD, gw4);
+        DispenserBlock.registerBehavior(Items.DRAGON_HEAD, gw4);
+        DispenserBlock.registerBehavior(Items.SKELETON_SKULL, gw4);
+        DispenserBlock.registerBehavior(Items.PLAYER_HEAD, gw4);
         DispenserBlock.registerBehavior(Items.WITHER_SKELETON_SKULL, new OptionalDispenseItemBehavior() {
             @Override
-            protected ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final Level bjw4 = fl.getLevel();
-                final Direction fp5 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-                final BlockPos fk6 = fl.getPos().relative(fp5);
-                if (bjw4.isEmptyBlock(fk6) && WitherSkullBlock.canSpawnMob(bjw4, fk6, ben)) {
-                    bjw4.setBlock(fk6, ((AbstractStateHolder<O, BlockState>)Blocks.WITHER_SKELETON_SKULL.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SkullBlock.ROTATION, (fp5.getAxis() == Direction.Axis.Y) ? 0 : (fp5.getOpposite().get2DDataValue() * 4)), 3);
-                    final BlockEntity bwl7 = bjw4.getBlockEntity(fk6);
-                    if (bwl7 instanceof SkullBlockEntity) {
-                        WitherSkullBlock.checkSpawn(bjw4, fk6, (SkullBlockEntity)bwl7);
+            protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final Level bqb4 = fv.getLevel();
+                final Direction fz5 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+                final BlockPos fu6 = fv.getPos().relative(fz5);
+                if (bqb4.isEmptyBlock(fu6) && WitherSkullBlock.canSpawnMob(bqb4, fu6, bki)) {
+                    bqb4.setBlock(fu6, ((StateHolder<O, BlockState>)Blocks.WITHER_SKELETON_SKULL.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SkullBlock.ROTATION, (fz5.getAxis() == Direction.Axis.Y) ? 0 : (fz5.getOpposite().get2DDataValue() * 4)), 3);
+                    final BlockEntity cdl7 = bqb4.getBlockEntity(fu6);
+                    if (cdl7 instanceof SkullBlockEntity) {
+                        WitherSkullBlock.checkSpawn(bqb4, fu6, (SkullBlockEntity)cdl7);
                     }
-                    ben.shrink(1);
-                    this.success = true;
+                    bki.shrink(1);
+                    this.setSuccess(true);
                 }
                 else {
-                    this.success = ArmorItem.dispenseArmor(fl, ben);
+                    this.setSuccess(ArmorItem.dispenseArmor(fv, bki));
                 }
-                return ben;
+                return bki;
             }
         });
         DispenserBlock.registerBehavior(Blocks.CARVED_PUMPKIN, new OptionalDispenseItemBehavior() {
             @Override
-            protected ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final Level bjw4 = fl.getLevel();
-                final BlockPos fk5 = fl.getPos().relative(fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
-                final CarvedPumpkinBlock bpu6 = (CarvedPumpkinBlock)Blocks.CARVED_PUMPKIN;
-                if (bjw4.isEmptyBlock(fk5) && bpu6.canSpawnGolem(bjw4, fk5)) {
-                    if (!bjw4.isClientSide) {
-                        bjw4.setBlock(fk5, bpu6.defaultBlockState(), 3);
+            protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final Level bqb4 = fv.getLevel();
+                final BlockPos fu5 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+                final CarvedPumpkinBlock bwe6 = (CarvedPumpkinBlock)Blocks.CARVED_PUMPKIN;
+                if (bqb4.isEmptyBlock(fu5) && bwe6.canSpawnGolem(bqb4, fu5)) {
+                    if (!bqb4.isClientSide) {
+                        bqb4.setBlock(fu5, bwe6.defaultBlockState(), 3);
                     }
-                    ben.shrink(1);
-                    this.success = true;
+                    bki.shrink(1);
+                    this.setSuccess(true);
                 }
                 else {
-                    this.success = ArmorItem.dispenseArmor(fl, ben);
+                    this.setSuccess(ArmorItem.dispenseArmor(fv, bki));
                 }
-                return ben;
+                return bki;
             }
         });
         DispenserBlock.registerBehavior(Blocks.SHULKER_BOX.asItem(), new ShulkerBoxDispenseBehavior());
-        for (final DyeColor bdj7 : DyeColor.values()) {
-            DispenserBlock.registerBehavior(ShulkerBoxBlock.getBlockByColor(bdj7).asItem(), new ShulkerBoxDispenseBehavior());
+        for (final DyeColor bje8 : DyeColor.values()) {
+            DispenserBlock.registerBehavior(ShulkerBoxBlock.getBlockByColor(bje8).asItem(), new ShulkerBoxDispenseBehavior());
         }
         DispenserBlock.registerBehavior(Items.GLASS_BOTTLE.asItem(), new OptionalDispenseItemBehavior() {
             private final DefaultDispenseItemBehavior defaultDispenseItemBehavior = new DefaultDispenseItemBehavior();
             
-            private ItemStack takeLiquid(final BlockSource fl, final ItemStack ben2, final ItemStack ben3) {
-                ben2.shrink(1);
-                if (ben2.isEmpty()) {
-                    return ben3.copy();
+            private ItemStack takeLiquid(final BlockSource fv, final ItemStack bki2, final ItemStack bki3) {
+                bki2.shrink(1);
+                if (bki2.isEmpty()) {
+                    return bki3.copy();
                 }
-                if (fl.<DispenserBlockEntity>getEntity().addItem(ben3.copy()) < 0) {
-                    this.defaultDispenseItemBehavior.dispense(fl, ben3.copy());
+                if (fv.<DispenserBlockEntity>getEntity().addItem(bki3.copy()) < 0) {
+                    this.defaultDispenseItemBehavior.dispense(fv, bki3.copy());
                 }
-                return ben2;
+                return bki2;
             }
             
-            public ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                this.success = false;
-                final LevelAccessor bjx4 = fl.getLevel();
-                final BlockPos fk5 = fl.getPos().relative(fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
-                final BlockState byj6 = bjx4.getBlockState(fk5);
-                final Block bph7 = byj6.getBlock();
-                if (bph7.is(BlockTags.BEEHIVES) && byj6.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL) >= 5) {
-                    ((BeehiveBlock)byj6.getBlock()).releaseBeesAndResetHoneyLevel(bjx4.getLevel(), byj6, fk5, null, BeehiveBlockEntity.BeeReleaseStatus.BEE_RELEASED);
-                    this.success = true;
-                    return this.takeLiquid(fl, ben, new ItemStack(Items.HONEY_BOTTLE));
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                this.setSuccess(false);
+                final LevelAccessor bqc4 = fv.getLevel();
+                final BlockPos fu5 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+                final BlockState cfj6 = bqc4.getBlockState(fu5);
+                if (cfj6.is(BlockTags.BEEHIVES, a -> a.<Comparable>hasProperty((Property<Comparable>)BeehiveBlock.HONEY_LEVEL)) && cfj6.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL) >= 5) {
+                    ((BeehiveBlock)cfj6.getBlock()).releaseBeesAndResetHoneyLevel(bqc4.getLevel(), cfj6, fu5, null, BeehiveBlockEntity.BeeReleaseStatus.BEE_RELEASED);
+                    this.setSuccess(true);
+                    return this.takeLiquid(fv, bki, new ItemStack(Items.HONEY_BOTTLE));
                 }
-                if (bjx4.getFluidState(fk5).is(FluidTags.WATER)) {
-                    this.success = true;
-                    return this.takeLiquid(fl, ben, PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER));
+                if (bqc4.getFluidState(fu5).is(FluidTags.WATER)) {
+                    this.setSuccess(true);
+                    return this.takeLiquid(fv, bki, PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER));
                 }
-                return super.execute(fl, ben);
+                return super.execute(fv, bki);
             }
         });
-        DispenserBlock.registerBehavior(Items.SHEARS.asItem(), new OptionalDispenseItemBehavior() {
-            @Override
-            protected ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final Level bjw4 = fl.getLevel();
-                if (!bjw4.isClientSide()) {
-                    this.success = false;
-                    final BlockPos fk5 = fl.getPos().relative(fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
-                    final List<Sheep> list6 = bjw4.<Sheep>getEntitiesOfClass(Sheep.class, new AABB(fk5));
-                    for (final Sheep atv8 : list6) {
-                        if (atv8.isAlive() && !atv8.isSheared() && !atv8.isBaby()) {
-                            atv8.shear();
-                            if (ben.hurt(1, bjw4.random, null)) {
-                                ben.setCount(0);
-                            }
-                            this.success = true;
-                            break;
-                        }
+        DispenserBlock.registerBehavior(Items.GLOWSTONE, new OptionalDispenseItemBehavior() {
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final Direction fz4 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+                final BlockPos fu5 = fv.getPos().relative(fz4);
+                final Level bqb6 = fv.getLevel();
+                final BlockState cfj7 = bqb6.getBlockState(fu5);
+                this.setSuccess(true);
+                if (cfj7.is(Blocks.RESPAWN_ANCHOR)) {
+                    if (cfj7.<Integer>getValue((Property<Integer>)RespawnAnchorBlock.CHARGE) != 4) {
+                        RespawnAnchorBlock.charge(bqb6, fu5, cfj7);
+                        bki.shrink(1);
                     }
-                    if (!this.success) {
-                        final BlockState byj7 = bjw4.getBlockState(fk5);
-                        if (byj7.is(BlockTags.BEEHIVES)) {
-                            final int integer8 = byj7.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL);
-                            if (integer8 >= 5) {
-                                if (ben.hurt(1, bjw4.random, null)) {
-                                    ben.setCount(0);
-                                }
-                                BeehiveBlock.dropHoneycomb(bjw4, fk5);
-                                ((BeehiveBlock)byj7.getBlock()).releaseBeesAndResetHoneyLevel(bjw4, byj7, fk5, null, BeehiveBlockEntity.BeeReleaseStatus.BEE_RELEASED);
-                                this.success = true;
-                            }
-                        }
+                    else {
+                        this.setSuccess(false);
                     }
+                    return bki;
                 }
-                return ben;
+                return super.execute(fv, bki);
             }
         });
+        DispenserBlock.registerBehavior(Items.SHEARS.asItem(), new ShearsDispenseItemBehavior());
+    }
+    
+    default void setEntityPokingOutOfBlock(final BlockSource fv, final Entity aom, final Direction fz) {
+        aom.setPos(fv.x() + fz.getStepX() * (0.5000099999997474 - aom.getBbWidth() / 2.0), fv.y() + fz.getStepY() * (0.5000099999997474 - aom.getBbHeight() / 2.0) - aom.getBbHeight() / 2.0, fv.z() + fz.getStepZ() * (0.5000099999997474 - aom.getBbWidth() / 2.0));
     }
 }
diff --git a/src/net/minecraft/core/dispenser/OptionalDispenseItemBehavior.java b/src/net/minecraft/core/dispenser/OptionalDispenseItemBehavior.java
index dabad72..8b312fd 100644
--- a/src/net/minecraft/core/dispenser/OptionalDispenseItemBehavior.java
+++ b/src/net/minecraft/core/dispenser/OptionalDispenseItemBehavior.java
@@ -3,14 +3,22 @@ package net.minecraft.core.dispenser;
 import net.minecraft.core.BlockSource;
 
 public abstract class OptionalDispenseItemBehavior extends DefaultDispenseItemBehavior {
-    protected boolean success;
+    private boolean success;
     
     public OptionalDispenseItemBehavior() {
         this.success = true;
     }
     
+    public boolean isSuccess() {
+        return this.success;
+    }
+    
+    public void setSuccess(final boolean boolean1) {
+        this.success = boolean1;
+    }
+    
     @Override
-    protected void playSound(final BlockSource fl) {
-        fl.getLevel().levelEvent(this.success ? 1000 : 1001, fl.getPos(), 0);
+    protected void playSound(final BlockSource fv) {
+        fv.getLevel().levelEvent(this.isSuccess() ? 1000 : 1001, fv.getPos(), 0);
     }
 }
diff --git a/src/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java b/src/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
new file mode 100644
index 0000000..af5a202
--- /dev/null
+++ b/src/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
@@ -0,0 +1,71 @@
+package net.minecraft.core.dispenser;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.world.entity.Shearable;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.EntitySelector;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.block.BeehiveBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.DispenserBlock;
+import net.minecraft.core.Direction;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.core.BlockSource;
+
+public class ShearsDispenseItemBehavior extends OptionalDispenseItemBehavior {
+    @Override
+    protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+        final Level bqb4 = fv.getLevel();
+        if (!bqb4.isClientSide()) {
+            final BlockPos fu5 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+            this.setSuccess(tryShearBeehive((ServerLevel)bqb4, fu5) || tryShearLivingEntity((ServerLevel)bqb4, fu5));
+            if (this.isSuccess() && bki.hurt(1, bqb4.getRandom(), null)) {
+                bki.setCount(0);
+            }
+        }
+        return bki;
+    }
+    
+    private static boolean tryShearBeehive(final ServerLevel zd, final BlockPos fu) {
+        final BlockState cfj3 = zd.getBlockState(fu);
+        if (cfj3.is(BlockTags.BEEHIVES)) {
+            final int integer4 = cfj3.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL);
+            if (integer4 >= 5) {
+                zd.playSound(null, fu, SoundEvents.BEEHIVE_SHEAR, SoundSource.BLOCKS, 1.0f, 1.0f);
+                BeehiveBlock.dropHoneycomb(zd, fu);
+                ((BeehiveBlock)cfj3.getBlock()).releaseBeesAndResetHoneyLevel(zd, cfj3, fu, null, BeehiveBlockEntity.BeeReleaseStatus.BEE_RELEASED);
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    private static boolean tryShearLivingEntity(final ServerLevel zd, final BlockPos fu) {
+        final List<LivingEntity> list3 = zd.<LivingEntity>getEntitiesOfClass(LivingEntity.class, new AABB(fu), EntitySelector.NO_SPECTATORS);
+        for (final LivingEntity aoy5 : list3) {
+            if (aoy5 instanceof Shearable) {
+                final Shearable apn6 = (Shearable)aoy5;
+                if (apn6.readyForShearing()) {
+                    apn6.shear(SoundSource.BLOCKS);
+                    return true;
+                }
+                continue;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/net/minecraft/core/dispenser/ShulkerBoxDispenseBehavior.java b/src/net/minecraft/core/dispenser/ShulkerBoxDispenseBehavior.java
index e162d20..42c3830 100644
--- a/src/net/minecraft/core/dispenser/ShulkerBoxDispenseBehavior.java
+++ b/src/net/minecraft/core/dispenser/ShulkerBoxDispenseBehavior.java
@@ -2,7 +2,6 @@ package net.minecraft.core.dispenser;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.item.DirectionalPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
@@ -14,15 +13,15 @@ import net.minecraft.core.BlockSource;
 
 public class ShulkerBoxDispenseBehavior extends OptionalDispenseItemBehavior {
     @Override
-    protected ItemStack execute(final BlockSource fl, final ItemStack ben) {
-        this.success = false;
-        final Item bei4 = ben.getItem();
-        if (bei4 instanceof BlockItem) {
-            final Direction fp5 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-            final BlockPos fk6 = fl.getPos().relative(fp5);
-            final Direction fp6 = fl.getLevel().isEmptyBlock(fk6.below()) ? fp5 : Direction.UP;
-            this.success = (((BlockItem)bei4).place(new DirectionalPlaceContext(fl.getLevel(), fk6, fp5, ben, fp6)) == InteractionResult.SUCCESS);
+    protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+        this.setSuccess(false);
+        final Item bke4 = bki.getItem();
+        if (bke4 instanceof BlockItem) {
+            final Direction fz5 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+            final BlockPos fu6 = fv.getPos().relative(fz5);
+            final Direction fz6 = fv.getLevel().isEmptyBlock(fu6.below()) ? fz5 : Direction.UP;
+            this.setSuccess(((BlockItem)bke4).place(new DirectionalPlaceContext(fv.getLevel(), fu6, fz5, bki, fz6)).consumesAction());
         }
-        return ben;
+        return bki;
     }
 }
diff --git a/src/net/minecraft/core/particles/BlockParticleOption.java b/src/net/minecraft/core/particles/BlockParticleOption.java
index 2dfa794..30970a5 100644
--- a/src/net/minecraft/core/particles/BlockParticleOption.java
+++ b/src/net/minecraft/core/particles/BlockParticleOption.java
@@ -6,6 +6,7 @@ import net.minecraft.commands.arguments.blocks.BlockStateParser;
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.network.FriendlyByteBuf;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.block.state.BlockState;
 
 public class BlockParticleOption implements ParticleOptions {
@@ -13,14 +14,18 @@ public class BlockParticleOption implements ParticleOptions {
     private final ParticleType<BlockParticleOption> type;
     private final BlockState state;
     
-    public BlockParticleOption(final ParticleType<BlockParticleOption> gu, final BlockState byj) {
-        this.type = gu;
-        this.state = byj;
+    public static Codec<BlockParticleOption> codec(final ParticleType<BlockParticleOption> hg) {
+        return (Codec<BlockParticleOption>)BlockState.CODEC.xmap(cfj -> new BlockParticleOption(hg, cfj), hc -> hc.state);
+    }
+    
+    public BlockParticleOption(final ParticleType<BlockParticleOption> hg, final BlockState cfj) {
+        this.type = hg;
+        this.state = cfj;
     }
     
     @Override
-    public void writeToNetwork(final FriendlyByteBuf kv) {
-        kv.writeVarInt(Block.BLOCK_STATE_REGISTRY.getId(this.state));
+    public void writeToNetwork(final FriendlyByteBuf mg) {
+        mg.writeVarInt(Block.BLOCK_STATE_REGISTRY.getId(this.state));
     }
     
     @Override
@@ -40,14 +45,14 @@ public class BlockParticleOption implements ParticleOptions {
     static {
         DESERIALIZER = new Deserializer<BlockParticleOption>() {
             @Override
-            public BlockParticleOption fromCommand(final ParticleType<BlockParticleOption> gu, final StringReader stringReader) throws CommandSyntaxException {
+            public BlockParticleOption fromCommand(final ParticleType<BlockParticleOption> hg, final StringReader stringReader) throws CommandSyntaxException {
                 stringReader.expect(' ');
-                return new BlockParticleOption(gu, new BlockStateParser(stringReader, false).parse(false).getState());
+                return new BlockParticleOption(hg, new BlockStateParser(stringReader, false).parse(false).getState());
             }
             
             @Override
-            public BlockParticleOption fromNetwork(final ParticleType<BlockParticleOption> gu, final FriendlyByteBuf kv) {
-                return new BlockParticleOption(gu, Block.BLOCK_STATE_REGISTRY.byId(kv.readVarInt()));
+            public BlockParticleOption fromNetwork(final ParticleType<BlockParticleOption> hg, final FriendlyByteBuf mg) {
+                return new BlockParticleOption(hg, Block.BLOCK_STATE_REGISTRY.byId(mg.readVarInt()));
             }
         };
     }
diff --git a/src/net/minecraft/core/particles/DustParticleOptions.java b/src/net/minecraft/core/particles/DustParticleOptions.java
index 96397e4..8ee86a1 100644
--- a/src/net/minecraft/core/particles/DustParticleOptions.java
+++ b/src/net/minecraft/core/particles/DustParticleOptions.java
@@ -2,13 +2,18 @@ package net.minecraft.core.particles;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.StringReader;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.Registry;
 import java.util.Locale;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.util.Mth;
+import com.mojang.serialization.Codec;
 
 public class DustParticleOptions implements ParticleOptions {
     public static final DustParticleOptions REDSTONE;
+    public static final Codec<DustParticleOptions> CODEC;
     public static final Deserializer<DustParticleOptions> DESERIALIZER;
     private final float r;
     private final float g;
@@ -23,11 +28,11 @@ public class DustParticleOptions implements ParticleOptions {
     }
     
     @Override
-    public void writeToNetwork(final FriendlyByteBuf kv) {
-        kv.writeFloat(this.r);
-        kv.writeFloat(this.g);
-        kv.writeFloat(this.b);
-        kv.writeFloat(this.scale);
+    public void writeToNetwork(final FriendlyByteBuf mg) {
+        mg.writeFloat(this.r);
+        mg.writeFloat(this.g);
+        mg.writeFloat(this.b);
+        mg.writeFloat(this.scale);
     }
     
     @Override
@@ -58,9 +63,10 @@ public class DustParticleOptions implements ParticleOptions {
     
     static {
         REDSTONE = new DustParticleOptions(1.0f, 0.0f, 0.0f, 1.0f);
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.FLOAT.fieldOf("r").forGetter(hd -> hd.r), (App)Codec.FLOAT.fieldOf("g").forGetter(hd -> hd.g), (App)Codec.FLOAT.fieldOf("b").forGetter(hd -> hd.b), (App)Codec.FLOAT.fieldOf("scale").forGetter(hd -> hd.scale)).apply(instance, DustParticleOptions::new));
         DESERIALIZER = new Deserializer<DustParticleOptions>() {
             @Override
-            public DustParticleOptions fromCommand(final ParticleType<DustParticleOptions> gu, final StringReader stringReader) throws CommandSyntaxException {
+            public DustParticleOptions fromCommand(final ParticleType<DustParticleOptions> hg, final StringReader stringReader) throws CommandSyntaxException {
                 stringReader.expect(' ');
                 final float float4 = (float)stringReader.readDouble();
                 stringReader.expect(' ');
@@ -73,8 +79,8 @@ public class DustParticleOptions implements ParticleOptions {
             }
             
             @Override
-            public DustParticleOptions fromNetwork(final ParticleType<DustParticleOptions> gu, final FriendlyByteBuf kv) {
-                return new DustParticleOptions(kv.readFloat(), kv.readFloat(), kv.readFloat(), kv.readFloat());
+            public DustParticleOptions fromNetwork(final ParticleType<DustParticleOptions> hg, final FriendlyByteBuf mg) {
+                return new DustParticleOptions(mg.readFloat(), mg.readFloat(), mg.readFloat(), mg.readFloat());
             }
         };
     }
diff --git a/src/net/minecraft/core/particles/ItemParticleOption.java b/src/net/minecraft/core/particles/ItemParticleOption.java
index a050ac7..ba62dbc 100644
--- a/src/net/minecraft/core/particles/ItemParticleOption.java
+++ b/src/net/minecraft/core/particles/ItemParticleOption.java
@@ -6,6 +6,7 @@ import com.mojang.brigadier.StringReader;
 import net.minecraft.commands.arguments.item.ItemInput;
 import net.minecraft.core.Registry;
 import net.minecraft.network.FriendlyByteBuf;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.item.ItemStack;
 
 public class ItemParticleOption implements ParticleOptions {
@@ -13,14 +14,18 @@ public class ItemParticleOption implements ParticleOptions {
     private final ParticleType<ItemParticleOption> type;
     private final ItemStack itemStack;
     
-    public ItemParticleOption(final ParticleType<ItemParticleOption> gu, final ItemStack ben) {
-        this.type = gu;
-        this.itemStack = ben;
+    public static Codec<ItemParticleOption> codec(final ParticleType<ItemParticleOption> hg) {
+        return (Codec<ItemParticleOption>)ItemStack.CODEC.xmap(bki -> new ItemParticleOption(hg, bki), he -> he.itemStack);
+    }
+    
+    public ItemParticleOption(final ParticleType<ItemParticleOption> hg, final ItemStack bki) {
+        this.type = hg;
+        this.itemStack = bki;
     }
     
     @Override
-    public void writeToNetwork(final FriendlyByteBuf kv) {
-        kv.writeItem(this.itemStack);
+    public void writeToNetwork(final FriendlyByteBuf mg) {
+        mg.writeItem(this.itemStack);
     }
     
     @Override
@@ -40,16 +45,16 @@ public class ItemParticleOption implements ParticleOptions {
     static {
         DESERIALIZER = new Deserializer<ItemParticleOption>() {
             @Override
-            public ItemParticleOption fromCommand(final ParticleType<ItemParticleOption> gu, final StringReader stringReader) throws CommandSyntaxException {
+            public ItemParticleOption fromCommand(final ParticleType<ItemParticleOption> hg, final StringReader stringReader) throws CommandSyntaxException {
                 stringReader.expect(' ');
-                final ItemParser el4 = new ItemParser(stringReader, false).parse();
-                final ItemStack ben5 = new ItemInput(el4.getItem(), el4.getNbt()).createItemStack(1, false);
-                return new ItemParticleOption(gu, ben5);
+                final ItemParser ev4 = new ItemParser(stringReader, false).parse();
+                final ItemStack bki5 = new ItemInput(ev4.getItem(), ev4.getNbt()).createItemStack(1, false);
+                return new ItemParticleOption(hg, bki5);
             }
             
             @Override
-            public ItemParticleOption fromNetwork(final ParticleType<ItemParticleOption> gu, final FriendlyByteBuf kv) {
-                return new ItemParticleOption(gu, kv.readItem());
+            public ItemParticleOption fromNetwork(final ParticleType<ItemParticleOption> hg, final FriendlyByteBuf mg) {
+                return new ItemParticleOption(hg, mg.readItem());
             }
         };
     }
diff --git a/src/net/minecraft/core/particles/ParticleOptions.java b/src/net/minecraft/core/particles/ParticleOptions.java
index df0a3b1..d2116a1 100644
--- a/src/net/minecraft/core/particles/ParticleOptions.java
+++ b/src/net/minecraft/core/particles/ParticleOptions.java
@@ -7,13 +7,14 @@ import net.minecraft.network.FriendlyByteBuf;
 public interface ParticleOptions {
     ParticleType<?> getType();
     
-    void writeToNetwork(final FriendlyByteBuf kv);
+    void writeToNetwork(final FriendlyByteBuf mg);
     
     String writeToString();
     
+    @Deprecated
     public interface Deserializer<T extends ParticleOptions> {
-        T fromCommand(final ParticleType<T> gu, final StringReader stringReader) throws CommandSyntaxException;
+        T fromCommand(final ParticleType<T> hg, final StringReader stringReader) throws CommandSyntaxException;
         
-        T fromNetwork(final ParticleType<T> gu, final FriendlyByteBuf kv);
+        T fromNetwork(final ParticleType<T> hg, final FriendlyByteBuf mg);
     }
 }
diff --git a/src/net/minecraft/core/particles/ParticleType.java b/src/net/minecraft/core/particles/ParticleType.java
index a6b3826..dc8ec6c 100644
--- a/src/net/minecraft/core/particles/ParticleType.java
+++ b/src/net/minecraft/core/particles/ParticleType.java
@@ -1,6 +1,8 @@
 package net.minecraft.core.particles;
 
-public class ParticleType<T extends ParticleOptions> {
+import com.mojang.serialization.Codec;
+
+public abstract class ParticleType<T extends ParticleOptions> {
     private final boolean overrideLimiter;
     private final ParticleOptions.Deserializer<T> deserializer;
     
@@ -16,4 +18,6 @@ public class ParticleType<T extends ParticleOptions> {
     public ParticleOptions.Deserializer<T> getDeserializer() {
         return this.deserializer;
     }
+    
+    public abstract Codec<T> codec();
 }
diff --git a/src/net/minecraft/core/particles/ParticleTypes.java b/src/net/minecraft/core/particles/ParticleTypes.java
index 8610f6d..d2ca4ca 100644
--- a/src/net/minecraft/core/particles/ParticleTypes.java
+++ b/src/net/minecraft/core/particles/ParticleTypes.java
@@ -1,6 +1,8 @@
 package net.minecraft.core.particles;
 
+import java.util.function.Function;
 import net.minecraft.core.Registry;
+import com.mojang.serialization.Codec;
 
 public class ParticleTypes {
     public static final SimpleParticleType AMBIENT_ENTITY_EFFECT;
@@ -30,6 +32,8 @@ public class ParticleTypes {
     public static final SimpleParticleType FIREWORK;
     public static final SimpleParticleType FISHING;
     public static final SimpleParticleType FLAME;
+    public static final SimpleParticleType SOUL_FIRE_FLAME;
+    public static final SimpleParticleType SOUL;
     public static final SimpleParticleType FLASH;
     public static final SimpleParticleType HAPPY_VILLAGER;
     public static final SimpleParticleType COMPOSTER;
@@ -65,20 +69,34 @@ public class ParticleTypes {
     public static final SimpleParticleType FALLING_HONEY;
     public static final SimpleParticleType LANDING_HONEY;
     public static final SimpleParticleType FALLING_NECTAR;
+    public static final SimpleParticleType ASH;
+    public static final SimpleParticleType CRIMSON_SPORE;
+    public static final SimpleParticleType WARPED_SPORE;
+    public static final SimpleParticleType DRIPPING_OBSIDIAN_TEAR;
+    public static final SimpleParticleType FALLING_OBSIDIAN_TEAR;
+    public static final SimpleParticleType LANDING_OBSIDIAN_TEAR;
+    public static final SimpleParticleType REVERSE_PORTAL;
+    public static final SimpleParticleType WHITE_ASH;
+    public static final Codec<ParticleOptions> CODEC;
     
     private static SimpleParticleType register(final String string, final boolean boolean2) {
         return Registry.<SimpleParticleType>register(Registry.PARTICLE_TYPE, string, new SimpleParticleType(boolean2));
     }
     
-    private static <T extends ParticleOptions> ParticleType<T> register(final String string, final ParticleOptions.Deserializer<T> a) {
-        return Registry.<ParticleType<T>>register(Registry.PARTICLE_TYPE, string, new ParticleType<T>(false, a));
+    private static <T extends ParticleOptions> ParticleType<T> register(final String string, final ParticleOptions.Deserializer<T> a, final Function<ParticleType<T>, Codec<T>> function) {
+        return Registry.register(Registry.PARTICLE_TYPE, string, new ParticleType<T>(false, a) {
+            @Override
+            public Codec<T> codec() {
+                return (Codec<T>)function.apply(this);
+            }
+        });
     }
     
     static {
         AMBIENT_ENTITY_EFFECT = register("ambient_entity_effect", false);
         ANGRY_VILLAGER = register("angry_villager", false);
         BARRIER = register("barrier", false);
-        BLOCK = ParticleTypes.<BlockParticleOption>register("block", BlockParticleOption.DESERIALIZER);
+        BLOCK = ParticleTypes.<BlockParticleOption>register("block", BlockParticleOption.DESERIALIZER, BlockParticleOption::codec);
         BUBBLE = register("bubble", false);
         CLOUD = register("cloud", false);
         CRIT = register("crit", false);
@@ -89,7 +107,7 @@ public class ParticleTypes {
         LANDING_LAVA = register("landing_lava", false);
         DRIPPING_WATER = register("dripping_water", false);
         FALLING_WATER = register("falling_water", false);
-        DUST = ParticleTypes.<DustParticleOptions>register("dust", DustParticleOptions.DESERIALIZER);
+        DUST = ParticleTypes.<DustParticleOptions>register("dust", DustParticleOptions.DESERIALIZER, hg -> DustParticleOptions.CODEC);
         EFFECT = register("effect", false);
         ELDER_GUARDIAN = register("elder_guardian", true);
         ENCHANTED_HIT = register("enchanted_hit", false);
@@ -98,16 +116,18 @@ public class ParticleTypes {
         ENTITY_EFFECT = register("entity_effect", false);
         EXPLOSION_EMITTER = register("explosion_emitter", true);
         EXPLOSION = register("explosion", true);
-        FALLING_DUST = ParticleTypes.<BlockParticleOption>register("falling_dust", BlockParticleOption.DESERIALIZER);
+        FALLING_DUST = ParticleTypes.<BlockParticleOption>register("falling_dust", BlockParticleOption.DESERIALIZER, BlockParticleOption::codec);
         FIREWORK = register("firework", false);
         FISHING = register("fishing", false);
         FLAME = register("flame", false);
+        SOUL_FIRE_FLAME = register("soul_fire_flame", false);
+        SOUL = register("soul", false);
         FLASH = register("flash", false);
         HAPPY_VILLAGER = register("happy_villager", false);
         COMPOSTER = register("composter", false);
         HEART = register("heart", false);
         INSTANT_EFFECT = register("instant_effect", false);
-        ITEM = ParticleTypes.<ItemParticleOption>register("item", ItemParticleOption.DESERIALIZER);
+        ITEM = ParticleTypes.<ItemParticleOption>register("item", ItemParticleOption.DESERIALIZER, ItemParticleOption::codec);
         ITEM_SLIME = register("item_slime", false);
         ITEM_SNOWBALL = register("item_snowball", false);
         LARGE_SMOKE = register("large_smoke", false);
@@ -137,5 +157,14 @@ public class ParticleTypes {
         FALLING_HONEY = register("falling_honey", false);
         LANDING_HONEY = register("landing_honey", false);
         FALLING_NECTAR = register("falling_nectar", false);
+        ASH = register("ash", false);
+        CRIMSON_SPORE = register("crimson_spore", false);
+        WARPED_SPORE = register("warped_spore", false);
+        DRIPPING_OBSIDIAN_TEAR = register("dripping_obsidian_tear", false);
+        FALLING_OBSIDIAN_TEAR = register("falling_obsidian_tear", false);
+        LANDING_OBSIDIAN_TEAR = register("landing_obsidian_tear", false);
+        REVERSE_PORTAL = register("reverse_portal", false);
+        WHITE_ASH = register("white_ash", false);
+        CODEC = Registry.PARTICLE_TYPE.dispatch("type", (Function)ParticleOptions::getType, (Function)ParticleType::codec);
     }
 }
diff --git a/src/net/minecraft/core/particles/SimpleParticleType.java b/src/net/minecraft/core/particles/SimpleParticleType.java
index df634ba..17b08d5 100644
--- a/src/net/minecraft/core/particles/SimpleParticleType.java
+++ b/src/net/minecraft/core/particles/SimpleParticleType.java
@@ -4,21 +4,30 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.StringReader;
 import net.minecraft.core.Registry;
 import net.minecraft.network.FriendlyByteBuf;
+import java.util.function.Supplier;
+import com.mojang.serialization.Codec;
 
 public class SimpleParticleType extends ParticleType<SimpleParticleType> implements ParticleOptions {
     private static final Deserializer<SimpleParticleType> DESERIALIZER;
+    private final Codec<SimpleParticleType> codec;
     
     protected SimpleParticleType(final boolean boolean1) {
         super(boolean1, SimpleParticleType.DESERIALIZER);
+        this.codec = (Codec<SimpleParticleType>)Codec.unit((Supplier)this::getType);
     }
     
     @Override
-    public ParticleType<SimpleParticleType> getType() {
+    public SimpleParticleType getType() {
         return this;
     }
     
     @Override
-    public void writeToNetwork(final FriendlyByteBuf kv) {
+    public Codec<SimpleParticleType> codec() {
+        return this.codec;
+    }
+    
+    @Override
+    public void writeToNetwork(final FriendlyByteBuf mg) {
     }
     
     @Override
@@ -29,13 +38,13 @@ public class SimpleParticleType extends ParticleType<SimpleParticleType> impleme
     static {
         DESERIALIZER = new Deserializer<SimpleParticleType>() {
             @Override
-            public SimpleParticleType fromCommand(final ParticleType<SimpleParticleType> gu, final StringReader stringReader) throws CommandSyntaxException {
-                return (SimpleParticleType)gu;
+            public SimpleParticleType fromCommand(final ParticleType<SimpleParticleType> hg, final StringReader stringReader) throws CommandSyntaxException {
+                return (SimpleParticleType)hg;
             }
             
             @Override
-            public SimpleParticleType fromNetwork(final ParticleType<SimpleParticleType> gu, final FriendlyByteBuf kv) {
-                return (SimpleParticleType)gu;
+            public SimpleParticleType fromNetwork(final ParticleType<SimpleParticleType> hg, final FriendlyByteBuf mg) {
+                return (SimpleParticleType)hg;
             }
         };
     }
diff --git a/src/net/minecraft/data/DataGenerator.java b/src/net/minecraft/data/DataGenerator.java
index 88006b3..d69bcf8 100644
--- a/src/net/minecraft/data/DataGenerator.java
+++ b/src/net/minecraft/data/DataGenerator.java
@@ -33,24 +33,24 @@ public class DataGenerator {
     }
     
     public void run() throws IOException {
-        final HashCache ha2 = new HashCache(this.outputFolder, "cache");
-        ha2.keep(this.getOutputFolder().resolve("version.json"));
+        final HashCache hm2 = new HashCache(this.outputFolder, "cache");
+        hm2.keep(this.getOutputFolder().resolve("version.json"));
         final Stopwatch stopwatch3 = Stopwatch.createStarted();
         final Stopwatch stopwatch4 = Stopwatch.createUnstarted();
-        for (final DataProvider gz6 : this.providers) {
-            DataGenerator.LOGGER.info("Starting provider: {}", gz6.getName());
+        for (final DataProvider hl6 : this.providers) {
+            DataGenerator.LOGGER.info("Starting provider: {}", hl6.getName());
             stopwatch4.start();
-            gz6.run(ha2);
+            hl6.run(hm2);
             stopwatch4.stop();
-            DataGenerator.LOGGER.info("{} finished after {} ms", gz6.getName(), stopwatch4.elapsed(TimeUnit.MILLISECONDS));
+            DataGenerator.LOGGER.info("{} finished after {} ms", hl6.getName(), stopwatch4.elapsed(TimeUnit.MILLISECONDS));
             stopwatch4.reset();
         }
         DataGenerator.LOGGER.info("All providers took: {} ms", stopwatch3.elapsed(TimeUnit.MILLISECONDS));
-        ha2.purgeStaleAndWrite();
+        hm2.purgeStaleAndWrite();
     }
     
-    public void addProvider(final DataProvider gz) {
-        this.providers.add(gz);
+    public void addProvider(final DataProvider hl) {
+        this.providers.add(hl);
     }
     
     static {
diff --git a/src/net/minecraft/data/DataProvider.java b/src/net/minecraft/data/DataProvider.java
index 1a96da7..46e9c2f 100644
--- a/src/net/minecraft/data/DataProvider.java
+++ b/src/net/minecraft/data/DataProvider.java
@@ -16,19 +16,19 @@ import com.google.common.hash.HashFunction;
 public interface DataProvider {
     public static final HashFunction SHA1 = Hashing.sha1();
     
-    void run(final HashCache ha) throws IOException;
+    void run(final HashCache hm) throws IOException;
     
     String getName();
     
-    default void save(final Gson gson, final HashCache ha, final JsonElement jsonElement, final Path path) throws IOException {
+    default void save(final Gson gson, final HashCache hm, final JsonElement jsonElement, final Path path) throws IOException {
         final String string5 = gson.toJson(jsonElement);
         final String string6 = DataProvider.SHA1.hashUnencodedChars(string5).toString();
-        if (!Objects.equals(ha.getHash(path), string6) || !Files.exists(path)) {
+        if (!Objects.equals(hm.getHash(path), string6) || !Files.exists(path)) {
             Files.createDirectories(path.getParent(), new FileAttribute[0]);
             try (final BufferedWriter bufferedWriter7 = Files.newBufferedWriter(path)) {
                 bufferedWriter7.write(string5);
             }
         }
-        ha.putNew(path, string6);
+        hm.putNew(path, string6);
     }
 }
diff --git a/src/net/minecraft/data/Main.java b/src/net/minecraft/data/Main.java
index 0436535..4c8da4b 100644
--- a/src/net/minecraft/data/Main.java
+++ b/src/net/minecraft/data/Main.java
@@ -11,6 +11,7 @@ import net.minecraft.data.tags.EntityTypeTagsProvider;
 import net.minecraft.data.tags.ItemTagsProvider;
 import net.minecraft.data.tags.BlockTagsProvider;
 import net.minecraft.data.tags.FluidTagsProvider;
+import net.minecraft.data.models.ModelProvider;
 import net.minecraft.data.structures.StructureUpdater;
 import net.minecraft.data.structures.SnbtToNbt;
 import java.io.IOException;
@@ -49,32 +50,36 @@ public class Main {
         final boolean boolean17 = boolean14 || optionSet12.has(optionSpec6);
         final boolean boolean18 = boolean14 || optionSet12.has(optionSpec7);
         final boolean boolean19 = boolean14 || optionSet12.has(optionSpec8);
-        final DataGenerator gy20 = createStandardGenerator(path13, optionSet12.<String>valuesOf(optionSpec11).stream().map(string -> Paths.get(string)).collect(Collectors.toList()), boolean15, boolean16, boolean17, boolean18, boolean19);
-        gy20.run();
+        final DataGenerator hk20 = createStandardGenerator(path13, optionSet12.<String>valuesOf(optionSpec11).stream().map(string -> Paths.get(string)).collect(Collectors.toList()), boolean15, boolean16, boolean17, boolean18, boolean19);
+        hk20.run();
     }
     
     public static DataGenerator createStandardGenerator(final Path path, final Collection<Path> collection, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6, final boolean boolean7) {
-        final DataGenerator gy8 = new DataGenerator(path, collection);
+        final DataGenerator hk8 = new DataGenerator(path, collection);
         if (boolean3 || boolean4) {
-            gy8.addProvider(new SnbtToNbt(gy8).addFilter(new StructureUpdater()));
+            hk8.addProvider(new SnbtToNbt(hk8).addFilter(new StructureUpdater()));
+        }
+        if (boolean3) {
+            hk8.addProvider(new ModelProvider(hk8));
         }
         if (boolean4) {
-            gy8.addProvider(new FluidTagsProvider(gy8));
-            gy8.addProvider(new BlockTagsProvider(gy8));
-            gy8.addProvider(new ItemTagsProvider(gy8));
-            gy8.addProvider(new EntityTypeTagsProvider(gy8));
-            gy8.addProvider(new RecipeProvider(gy8));
-            gy8.addProvider(new AdvancementProvider(gy8));
-            gy8.addProvider(new LootTableProvider(gy8));
+            hk8.addProvider(new FluidTagsProvider(hk8));
+            final BlockTagsProvider jr9 = new BlockTagsProvider(hk8);
+            hk8.addProvider(jr9);
+            hk8.addProvider(new ItemTagsProvider(hk8, jr9));
+            hk8.addProvider(new EntityTypeTagsProvider(hk8));
+            hk8.addProvider(new RecipeProvider(hk8));
+            hk8.addProvider(new AdvancementProvider(hk8));
+            hk8.addProvider(new LootTableProvider(hk8));
         }
         if (boolean5) {
-            gy8.addProvider(new NbtToSnbt(gy8));
+            hk8.addProvider(new NbtToSnbt(hk8));
         }
         if (boolean6) {
-            gy8.addProvider(new BlockListReport(gy8));
-            gy8.addProvider(new RegistryDumpReport(gy8));
-            gy8.addProvider(new CommandsReport(gy8));
+            hk8.addProvider(new BlockListReport(hk8));
+            hk8.addProvider(new RegistryDumpReport(hk8));
+            hk8.addProvider(new CommandsReport(hk8));
         }
-        return gy8;
+        return hk8;
     }
 }
diff --git a/src/net/minecraft/data/advancements/AdvancementProvider.java b/src/net/minecraft/data/advancements/AdvancementProvider.java
index 0a1de94..5475e5a 100644
--- a/src/net/minecraft/data/advancements/AdvancementProvider.java
+++ b/src/net/minecraft/data/advancements/AdvancementProvider.java
@@ -22,13 +22,13 @@ public class AdvancementProvider implements DataProvider {
     private final DataGenerator generator;
     private final List<Consumer<Consumer<Advancement>>> tabs;
     
-    public AdvancementProvider(final DataGenerator gy) {
+    public AdvancementProvider(final DataGenerator hk) {
         this.tabs = ImmutableList.<Consumer<Consumer<Advancement>>>of(new TheEndAdvancements(), new HusbandryAdvancements(), new AdventureAdvancements(), new NetherAdvancements(), new StoryAdvancements());
-        this.generator = gy;
+        this.generator = hk;
     }
     
     @Override
-    public void run(final HashCache ha) throws IOException {
+    public void run(final HashCache hm) throws IOException {
         // 
         // This method could not be decompiled.
         // 
@@ -41,7 +41,7 @@ public class AdvancementProvider implements DataProvider {
         //    11: astore_3        /* set4 */
         //    12: aload_3         /* set4 */
         //    13: aload_2         /* path3 */
-        //    14: aload_1         /* ha */
+        //    14: aload_1         /* hm */
         //    15: invokedynamic   BootstrapMethod #0, accept:(Ljava/util/Set;Ljava/nio/file/Path;Lnet/minecraft/data/HashCache;)Ljava/util/function/Consumer;
         //    20: astore          consumer5
         //    22: aload_0         /* this */
@@ -65,7 +65,7 @@ public class AdvancementProvider implements DataProvider {
         //    MethodParameters:
         //  Name  Flags  
         //  ----  -----
-        //  ha    
+        //  hm    
         //    StackMapTable: 00 02 FF 00 21 00 06 00 00 00 00 07 00 68 07 00 6A 00 00 FF 00 21 00 00 00 00
         // 
         // The error that occurred was:
@@ -104,8 +104,8 @@ public class AdvancementProvider implements DataProvider {
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    private static Path createPath(final Path path, final Advancement u) {
-        return path.resolve("data/" + u.getId().getNamespace() + "/advancements/" + u.getId().getPath() + ".json");
+    private static Path createPath(final Path path, final Advancement w) {
+        return path.resolve("data/" + w.getId().getNamespace() + "/advancements/" + w.getId().getPath() + ".json");
     }
     
     @Override
diff --git a/src/net/minecraft/data/advancements/AdventureAdvancements.java b/src/net/minecraft/data/advancements/AdventureAdvancements.java
index 7565242..b2a337f 100644
--- a/src/net/minecraft/data/advancements/AdventureAdvancements.java
+++ b/src/net/minecraft/data/advancements/AdventureAdvancements.java
@@ -3,6 +3,7 @@ package net.minecraft.data.advancements;
 import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.advancements.critereon.LocationPredicate;
 import net.minecraft.core.Registry;
+import net.minecraft.advancements.critereon.TargetBlockTrigger;
 import net.minecraft.advancements.critereon.SlideDownBlockTrigger;
 import net.minecraft.advancements.critereon.EntityEquipmentPredicate;
 import net.minecraft.world.entity.raid.Raid;
@@ -14,6 +15,7 @@ import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.advancements.critereon.SummonedEntityTrigger;
 import net.minecraft.advancements.critereon.ChanneledLightningTrigger;
 import net.minecraft.advancements.critereon.PlayerHurtEntityTrigger;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.EntityTypeTags;
 import net.minecraft.advancements.critereon.EntityPredicate;
 import net.minecraft.advancements.critereon.DamageSourcePredicate;
@@ -42,43 +44,44 @@ public class AdventureAdvancements implements Consumer<Consumer<Advancement>> {
     
     @Override
     public void accept(final Consumer<Advancement> consumer) {
-        final Advancement u3 = Advancement.Builder.advancement().display(Items.MAP, new TranslatableComponent("advancements.adventure.root.title", new Object[0]), new TranslatableComponent("advancements.adventure.root.description", new Object[0]), new ResourceLocation("textures/gui/advancements/backgrounds/adventure.png"), FrameType.TASK, false, false, false).requirements(RequirementsStrategy.OR).addCriterion("killed_something", KilledTrigger.TriggerInstance.playerKilledEntity()).addCriterion("killed_by_something", KilledTrigger.TriggerInstance.entityKilledPlayer()).save(consumer, "adventure/root");
-        final Advancement u4 = Advancement.Builder.advancement().parent(u3).display(Blocks.RED_BED, new TranslatableComponent("advancements.adventure.sleep_in_bed.title", new Object[0]), new TranslatableComponent("advancements.adventure.sleep_in_bed.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("slept_in_bed", LocationTrigger.TriggerInstance.sleptInBed()).save(consumer, "adventure/sleep_in_bed");
-        final Advancement u5 = this.addBiomes(Advancement.Builder.advancement()).parent(u4).display(Items.DIAMOND_BOOTS, new TranslatableComponent("advancements.adventure.adventuring_time.title", new Object[0]), new TranslatableComponent("advancements.adventure.adventuring_time.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(500)).save(consumer, "adventure/adventuring_time");
-        final Advancement u6 = Advancement.Builder.advancement().parent(u3).display(Items.EMERALD, new TranslatableComponent("advancements.adventure.trade.title", new Object[0]), new TranslatableComponent("advancements.adventure.trade.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("traded", TradeTrigger.TriggerInstance.tradedWithVillager()).save(consumer, "adventure/trade");
-        final Advancement u7 = this.addMobsToKill(Advancement.Builder.advancement()).parent(u3).display(Items.IRON_SWORD, new TranslatableComponent("advancements.adventure.kill_a_mob.title", new Object[0]), new TranslatableComponent("advancements.adventure.kill_a_mob.description", new Object[0]), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).save(consumer, "adventure/kill_a_mob");
-        final Advancement u8 = this.addMobsToKill(Advancement.Builder.advancement()).parent(u7).display(Items.DIAMOND_SWORD, new TranslatableComponent("advancements.adventure.kill_all_mobs.title", new Object[0]), new TranslatableComponent("advancements.adventure.kill_all_mobs.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).save(consumer, "adventure/kill_all_mobs");
-        final Advancement u9 = Advancement.Builder.advancement().parent(u7).display(Items.BOW, new TranslatableComponent("advancements.adventure.shoot_arrow.title", new Object[0]), new TranslatableComponent("advancements.adventure.shoot_arrow.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("shot_arrow", PlayerHurtEntityTrigger.TriggerInstance.playerHurtEntity(DamagePredicate.Builder.damageInstance().type(DamageSourcePredicate.Builder.damageType().isProjectile(true).direct(EntityPredicate.Builder.entity().of(EntityTypeTags.ARROWS))))).save(consumer, "adventure/shoot_arrow");
-        final Advancement u10 = Advancement.Builder.advancement().parent(u7).display(Items.TRIDENT, new TranslatableComponent("advancements.adventure.throw_trident.title", new Object[0]), new TranslatableComponent("advancements.adventure.throw_trident.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("shot_trident", PlayerHurtEntityTrigger.TriggerInstance.playerHurtEntity(DamagePredicate.Builder.damageInstance().type(DamageSourcePredicate.Builder.damageType().isProjectile(true).direct(EntityPredicate.Builder.entity().of(EntityType.TRIDENT))))).save(consumer, "adventure/throw_trident");
-        final Advancement u11 = Advancement.Builder.advancement().parent(u10).display(Items.TRIDENT, new TranslatableComponent("advancements.adventure.very_very_frightening.title", new Object[0]), new TranslatableComponent("advancements.adventure.very_very_frightening.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("struck_villager", ChanneledLightningTrigger.TriggerInstance.channeledLightning(EntityPredicate.Builder.entity().of(EntityType.VILLAGER).build())).save(consumer, "adventure/very_very_frightening");
-        final Advancement u12 = Advancement.Builder.advancement().parent(u6).display(Blocks.CARVED_PUMPKIN, new TranslatableComponent("advancements.adventure.summon_iron_golem.title", new Object[0]), new TranslatableComponent("advancements.adventure.summon_iron_golem.description", new Object[0]), null, FrameType.GOAL, true, true, false).addCriterion("summoned_golem", SummonedEntityTrigger.TriggerInstance.summonedEntity(EntityPredicate.Builder.entity().of(EntityType.IRON_GOLEM))).save(consumer, "adventure/summon_iron_golem");
-        final Advancement u13 = Advancement.Builder.advancement().parent(u9).display(Items.ARROW, new TranslatableComponent("advancements.adventure.sniper_duel.title", new Object[0]), new TranslatableComponent("advancements.adventure.sniper_duel.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(50)).addCriterion("killed_skeleton", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityType.SKELETON).distance(DistancePredicate.horizontal(MinMaxBounds.Floats.atLeast(50.0f))), DamageSourcePredicate.Builder.damageType().isProjectile(true))).save(consumer, "adventure/sniper_duel");
-        final Advancement u14 = Advancement.Builder.advancement().parent(u7).display(Items.TOTEM_OF_UNDYING, new TranslatableComponent("advancements.adventure.totem_of_undying.title", new Object[0]), new TranslatableComponent("advancements.adventure.totem_of_undying.description", new Object[0]), null, FrameType.GOAL, true, true, false).addCriterion("used_totem", UsedTotemTrigger.TriggerInstance.usedTotem(Items.TOTEM_OF_UNDYING)).save(consumer, "adventure/totem_of_undying");
-        final Advancement u15 = Advancement.Builder.advancement().parent(u3).display(Items.CROSSBOW, new TranslatableComponent("advancements.adventure.ol_betsy.title", new Object[0]), new TranslatableComponent("advancements.adventure.ol_betsy.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("shot_crossbow", ShotCrossbowTrigger.TriggerInstance.shotCrossbow(Items.CROSSBOW)).save(consumer, "adventure/ol_betsy");
-        final Advancement u16 = Advancement.Builder.advancement().parent(u15).display(Items.CROSSBOW, new TranslatableComponent("advancements.adventure.whos_the_pillager_now.title", new Object[0]), new TranslatableComponent("advancements.adventure.whos_the_pillager_now.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("kill_pillager", KilledByCrossbowTrigger.TriggerInstance.crossbowKilled(EntityPredicate.Builder.entity().of(EntityType.PILLAGER))).save(consumer, "adventure/whos_the_pillager_now");
-        final Advancement u17 = Advancement.Builder.advancement().parent(u15).display(Items.CROSSBOW, new TranslatableComponent("advancements.adventure.two_birds_one_arrow.title", new Object[0]), new TranslatableComponent("advancements.adventure.two_birds_one_arrow.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(65)).addCriterion("two_birds", KilledByCrossbowTrigger.TriggerInstance.crossbowKilled(EntityPredicate.Builder.entity().of(EntityType.PHANTOM), EntityPredicate.Builder.entity().of(EntityType.PHANTOM))).save(consumer, "adventure/two_birds_one_arrow");
-        final Advancement u18 = Advancement.Builder.advancement().parent(u15).display(Items.CROSSBOW, new TranslatableComponent("advancements.adventure.arbalistic.title", new Object[0]), new TranslatableComponent("advancements.adventure.arbalistic.description", new Object[0]), null, FrameType.CHALLENGE, true, true, true).rewards(AdvancementRewards.Builder.experience(85)).addCriterion("arbalistic", KilledByCrossbowTrigger.TriggerInstance.crossbowKilled(MinMaxBounds.Ints.exactly(5))).save(consumer, "adventure/arbalistic");
-        final Advancement u19 = Advancement.Builder.advancement().parent(u3).display(Raid.getLeaderBannerInstance(), new TranslatableComponent("advancements.adventure.voluntary_exile.title", new Object[0]), new TranslatableComponent("advancements.adventure.voluntary_exile.description", new Object[0]), null, FrameType.TASK, true, true, true).addCriterion("voluntary_exile", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityTypeTags.RAIDERS).equipment(EntityEquipmentPredicate.CAPTAIN))).save(consumer, "adventure/voluntary_exile");
-        final Advancement u20 = Advancement.Builder.advancement().parent(u19).display(Raid.getLeaderBannerInstance(), new TranslatableComponent("advancements.adventure.hero_of_the_village.title", new Object[0]), new TranslatableComponent("advancements.adventure.hero_of_the_village.description", new Object[0]), null, FrameType.CHALLENGE, true, true, true).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("hero_of_the_village", LocationTrigger.TriggerInstance.raidWon()).save(consumer, "adventure/hero_of_the_village");
-        final Advancement u21 = Advancement.Builder.advancement().parent(u3).display(Blocks.HONEY_BLOCK.asItem(), new TranslatableComponent("advancements.adventure.honey_block_slide.title", new Object[0]), new TranslatableComponent("advancements.adventure.honey_block_slide.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("honey_block_slide", SlideDownBlockTrigger.TriggerInstance.slidesDownBlock(Blocks.HONEY_BLOCK)).save(consumer, "adventure/honey_block_slide");
+        final Advancement w3 = Advancement.Builder.advancement().display(Items.MAP, new TranslatableComponent("advancements.adventure.root.title"), new TranslatableComponent("advancements.adventure.root.description"), new ResourceLocation("textures/gui/advancements/backgrounds/adventure.png"), FrameType.TASK, false, false, false).requirements(RequirementsStrategy.OR).addCriterion("killed_something", KilledTrigger.TriggerInstance.playerKilledEntity()).addCriterion("killed_by_something", KilledTrigger.TriggerInstance.entityKilledPlayer()).save(consumer, "adventure/root");
+        final Advancement w4 = Advancement.Builder.advancement().parent(w3).display(Blocks.RED_BED, new TranslatableComponent("advancements.adventure.sleep_in_bed.title"), new TranslatableComponent("advancements.adventure.sleep_in_bed.description"), null, FrameType.TASK, true, true, false).addCriterion("slept_in_bed", LocationTrigger.TriggerInstance.sleptInBed()).save(consumer, "adventure/sleep_in_bed");
+        addBiomes(Advancement.Builder.advancement(), AdventureAdvancements.EXPLORABLE_BIOMES).parent(w4).display(Items.DIAMOND_BOOTS, new TranslatableComponent("advancements.adventure.adventuring_time.title"), new TranslatableComponent("advancements.adventure.adventuring_time.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(500)).save(consumer, "adventure/adventuring_time");
+        final Advancement w5 = Advancement.Builder.advancement().parent(w3).display(Items.EMERALD, new TranslatableComponent("advancements.adventure.trade.title"), new TranslatableComponent("advancements.adventure.trade.description"), null, FrameType.TASK, true, true, false).addCriterion("traded", TradeTrigger.TriggerInstance.tradedWithVillager()).save(consumer, "adventure/trade");
+        final Advancement w6 = this.addMobsToKill(Advancement.Builder.advancement()).parent(w3).display(Items.IRON_SWORD, new TranslatableComponent("advancements.adventure.kill_a_mob.title"), new TranslatableComponent("advancements.adventure.kill_a_mob.description"), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).save(consumer, "adventure/kill_a_mob");
+        this.addMobsToKill(Advancement.Builder.advancement()).parent(w6).display(Items.DIAMOND_SWORD, new TranslatableComponent("advancements.adventure.kill_all_mobs.title"), new TranslatableComponent("advancements.adventure.kill_all_mobs.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).save(consumer, "adventure/kill_all_mobs");
+        final Advancement w7 = Advancement.Builder.advancement().parent(w6).display(Items.BOW, new TranslatableComponent("advancements.adventure.shoot_arrow.title"), new TranslatableComponent("advancements.adventure.shoot_arrow.description"), null, FrameType.TASK, true, true, false).addCriterion("shot_arrow", PlayerHurtEntityTrigger.TriggerInstance.playerHurtEntity(DamagePredicate.Builder.damageInstance().type(DamageSourcePredicate.Builder.damageType().isProjectile(true).direct(EntityPredicate.Builder.entity().of(EntityTypeTags.ARROWS))))).save(consumer, "adventure/shoot_arrow");
+        final Advancement w8 = Advancement.Builder.advancement().parent(w6).display(Items.TRIDENT, new TranslatableComponent("advancements.adventure.throw_trident.title"), new TranslatableComponent("advancements.adventure.throw_trident.description"), null, FrameType.TASK, true, true, false).addCriterion("shot_trident", PlayerHurtEntityTrigger.TriggerInstance.playerHurtEntity(DamagePredicate.Builder.damageInstance().type(DamageSourcePredicate.Builder.damageType().isProjectile(true).direct(EntityPredicate.Builder.entity().of(EntityType.TRIDENT))))).save(consumer, "adventure/throw_trident");
+        Advancement.Builder.advancement().parent(w8).display(Items.TRIDENT, new TranslatableComponent("advancements.adventure.very_very_frightening.title"), new TranslatableComponent("advancements.adventure.very_very_frightening.description"), null, FrameType.TASK, true, true, false).addCriterion("struck_villager", ChanneledLightningTrigger.TriggerInstance.channeledLightning(EntityPredicate.Builder.entity().of(EntityType.VILLAGER).build())).save(consumer, "adventure/very_very_frightening");
+        Advancement.Builder.advancement().parent(w5).display(Blocks.CARVED_PUMPKIN, new TranslatableComponent("advancements.adventure.summon_iron_golem.title"), new TranslatableComponent("advancements.adventure.summon_iron_golem.description"), null, FrameType.GOAL, true, true, false).addCriterion("summoned_golem", SummonedEntityTrigger.TriggerInstance.summonedEntity(EntityPredicate.Builder.entity().of(EntityType.IRON_GOLEM))).save(consumer, "adventure/summon_iron_golem");
+        Advancement.Builder.advancement().parent(w7).display(Items.ARROW, new TranslatableComponent("advancements.adventure.sniper_duel.title"), new TranslatableComponent("advancements.adventure.sniper_duel.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(50)).addCriterion("killed_skeleton", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityType.SKELETON).distance(DistancePredicate.horizontal(MinMaxBounds.Floats.atLeast(50.0f))), DamageSourcePredicate.Builder.damageType().isProjectile(true))).save(consumer, "adventure/sniper_duel");
+        Advancement.Builder.advancement().parent(w6).display(Items.TOTEM_OF_UNDYING, new TranslatableComponent("advancements.adventure.totem_of_undying.title"), new TranslatableComponent("advancements.adventure.totem_of_undying.description"), null, FrameType.GOAL, true, true, false).addCriterion("used_totem", UsedTotemTrigger.TriggerInstance.usedTotem(Items.TOTEM_OF_UNDYING)).save(consumer, "adventure/totem_of_undying");
+        final Advancement w9 = Advancement.Builder.advancement().parent(w3).display(Items.CROSSBOW, new TranslatableComponent("advancements.adventure.ol_betsy.title"), new TranslatableComponent("advancements.adventure.ol_betsy.description"), null, FrameType.TASK, true, true, false).addCriterion("shot_crossbow", ShotCrossbowTrigger.TriggerInstance.shotCrossbow(Items.CROSSBOW)).save(consumer, "adventure/ol_betsy");
+        Advancement.Builder.advancement().parent(w9).display(Items.CROSSBOW, new TranslatableComponent("advancements.adventure.whos_the_pillager_now.title"), new TranslatableComponent("advancements.adventure.whos_the_pillager_now.description"), null, FrameType.TASK, true, true, false).addCriterion("kill_pillager", KilledByCrossbowTrigger.TriggerInstance.crossbowKilled(EntityPredicate.Builder.entity().of(EntityType.PILLAGER))).save(consumer, "adventure/whos_the_pillager_now");
+        Advancement.Builder.advancement().parent(w9).display(Items.CROSSBOW, new TranslatableComponent("advancements.adventure.two_birds_one_arrow.title"), new TranslatableComponent("advancements.adventure.two_birds_one_arrow.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(65)).addCriterion("two_birds", KilledByCrossbowTrigger.TriggerInstance.crossbowKilled(EntityPredicate.Builder.entity().of(EntityType.PHANTOM), EntityPredicate.Builder.entity().of(EntityType.PHANTOM))).save(consumer, "adventure/two_birds_one_arrow");
+        Advancement.Builder.advancement().parent(w9).display(Items.CROSSBOW, new TranslatableComponent("advancements.adventure.arbalistic.title"), new TranslatableComponent("advancements.adventure.arbalistic.description"), null, FrameType.CHALLENGE, true, true, true).rewards(AdvancementRewards.Builder.experience(85)).addCriterion("arbalistic", KilledByCrossbowTrigger.TriggerInstance.crossbowKilled(MinMaxBounds.Ints.exactly(5))).save(consumer, "adventure/arbalistic");
+        final Advancement w10 = Advancement.Builder.advancement().parent(w3).display(Raid.getLeaderBannerInstance(), new TranslatableComponent("advancements.adventure.voluntary_exile.title"), new TranslatableComponent("advancements.adventure.voluntary_exile.description"), null, FrameType.TASK, true, true, true).addCriterion("voluntary_exile", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityTypeTags.RAIDERS).equipment(EntityEquipmentPredicate.CAPTAIN))).save(consumer, "adventure/voluntary_exile");
+        Advancement.Builder.advancement().parent(w10).display(Raid.getLeaderBannerInstance(), new TranslatableComponent("advancements.adventure.hero_of_the_village.title"), new TranslatableComponent("advancements.adventure.hero_of_the_village.description"), null, FrameType.CHALLENGE, true, true, true).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("hero_of_the_village", LocationTrigger.TriggerInstance.raidWon()).save(consumer, "adventure/hero_of_the_village");
+        Advancement.Builder.advancement().parent(w3).display(Blocks.HONEY_BLOCK.asItem(), new TranslatableComponent("advancements.adventure.honey_block_slide.title"), new TranslatableComponent("advancements.adventure.honey_block_slide.description"), null, FrameType.TASK, true, true, false).addCriterion("honey_block_slide", SlideDownBlockTrigger.TriggerInstance.slidesDownBlock(Blocks.HONEY_BLOCK)).save(consumer, "adventure/honey_block_slide");
+        Advancement.Builder.advancement().parent(w7).display(Blocks.TARGET.asItem(), new TranslatableComponent("advancements.adventure.bullseye.title"), new TranslatableComponent("advancements.adventure.bullseye.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(50)).addCriterion("bullseye", TargetBlockTrigger.TriggerInstance.targetHit(MinMaxBounds.Ints.exactly(15), EntityPredicate.Composite.wrap(EntityPredicate.Builder.entity().distance(DistancePredicate.horizontal(MinMaxBounds.Floats.atLeast(30.0f))).build()))).save(consumer, "adventure/bullseye");
     }
     
     private Advancement.Builder addMobsToKill(final Advancement.Builder a) {
-        for (final EntityType<?> aku6 : AdventureAdvancements.MOBS_TO_KILL) {
-            a.addCriterion(Registry.ENTITY_TYPE.getKey(aku6).toString(), KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(aku6)));
+        for (final EntityType<?> aoq6 : AdventureAdvancements.MOBS_TO_KILL) {
+            a.addCriterion(Registry.ENTITY_TYPE.getKey(aoq6).toString(), KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(aoq6)));
         }
         return a;
     }
     
-    private Advancement.Builder addBiomes(final Advancement.Builder a) {
-        for (final Biome bkt6 : AdventureAdvancements.EXPLORABLE_BIOMES) {
-            a.addCriterion(Registry.BIOME.getKey(bkt6).toString(), LocationTrigger.TriggerInstance.located(LocationPredicate.inBiome(bkt6)));
+    protected static Advancement.Builder addBiomes(final Advancement.Builder a, final Biome[] arr) {
+        for (final Biome bre6 : arr) {
+            a.addCriterion(Registry.BIOME.getKey(bre6).toString(), LocationTrigger.TriggerInstance.located(LocationPredicate.inBiome(bre6)));
         }
         return a;
     }
     
     static {
         EXPLORABLE_BIOMES = new Biome[] { Biomes.BIRCH_FOREST_HILLS, Biomes.RIVER, Biomes.SWAMP, Biomes.DESERT, Biomes.WOODED_HILLS, Biomes.GIANT_TREE_TAIGA_HILLS, Biomes.SNOWY_TAIGA, Biomes.BADLANDS, Biomes.FOREST, Biomes.STONE_SHORE, Biomes.SNOWY_TUNDRA, Biomes.TAIGA_HILLS, Biomes.SNOWY_MOUNTAINS, Biomes.WOODED_BADLANDS_PLATEAU, Biomes.SAVANNA, Biomes.PLAINS, Biomes.FROZEN_RIVER, Biomes.GIANT_TREE_TAIGA, Biomes.SNOWY_BEACH, Biomes.JUNGLE_HILLS, Biomes.JUNGLE_EDGE, Biomes.MUSHROOM_FIELD_SHORE, Biomes.MOUNTAINS, Biomes.DESERT_HILLS, Biomes.JUNGLE, Biomes.BEACH, Biomes.SAVANNA_PLATEAU, Biomes.SNOWY_TAIGA_HILLS, Biomes.BADLANDS_PLATEAU, Biomes.DARK_FOREST, Biomes.TAIGA, Biomes.BIRCH_FOREST, Biomes.MUSHROOM_FIELDS, Biomes.WOODED_MOUNTAINS, Biomes.WARM_OCEAN, Biomes.LUKEWARM_OCEAN, Biomes.COLD_OCEAN, Biomes.DEEP_LUKEWARM_OCEAN, Biomes.DEEP_COLD_OCEAN, Biomes.DEEP_FROZEN_OCEAN, Biomes.BAMBOO_JUNGLE, Biomes.BAMBOO_JUNGLE_HILLS };
-        MOBS_TO_KILL = new EntityType[] { EntityType.CAVE_SPIDER, EntityType.SPIDER, EntityType.ZOMBIE_PIGMAN, EntityType.ENDERMAN, EntityType.BLAZE, EntityType.CREEPER, EntityType.EVOKER, EntityType.GHAST, EntityType.GUARDIAN, EntityType.HUSK, EntityType.MAGMA_CUBE, EntityType.SHULKER, EntityType.SILVERFISH, EntityType.SKELETON, EntityType.SLIME, EntityType.STRAY, EntityType.VINDICATOR, EntityType.WITCH, EntityType.WITHER_SKELETON, EntityType.ZOMBIE, EntityType.ZOMBIE_VILLAGER, EntityType.PHANTOM, EntityType.DROWNED, EntityType.PILLAGER, EntityType.RAVAGER };
+        MOBS_TO_KILL = new EntityType[] { EntityType.BLAZE, EntityType.CAVE_SPIDER, EntityType.CREEPER, EntityType.DROWNED, EntityType.ELDER_GUARDIAN, EntityType.ENDER_DRAGON, EntityType.ENDERMAN, EntityType.ENDERMITE, EntityType.EVOKER, EntityType.GHAST, EntityType.GUARDIAN, EntityType.HOGLIN, EntityType.HUSK, EntityType.MAGMA_CUBE, EntityType.PHANTOM, EntityType.PIGLIN, EntityType.PILLAGER, EntityType.RAVAGER, EntityType.SHULKER, EntityType.SILVERFISH, EntityType.SKELETON, EntityType.SLIME, EntityType.SPIDER, EntityType.STRAY, EntityType.VEX, EntityType.VINDICATOR, EntityType.WITCH, EntityType.WITHER_SKELETON, EntityType.WITHER, EntityType.ZOGLIN, EntityType.ZOMBIE_VILLAGER, EntityType.ZOMBIE, EntityType.ZOMBIFIED_PIGLIN };
     }
 }
diff --git a/src/net/minecraft/data/advancements/HusbandryAdvancements.java b/src/net/minecraft/data/advancements/HusbandryAdvancements.java
index a28dfa0..2430182 100644
--- a/src/net/minecraft/data/advancements/HusbandryAdvancements.java
+++ b/src/net/minecraft/data/advancements/HusbandryAdvancements.java
@@ -7,14 +7,17 @@ import net.minecraft.advancements.critereon.EntityPredicate;
 import net.minecraft.core.Registry;
 import net.minecraft.advancements.critereon.BeeNestDestroyedTrigger;
 import net.minecraft.advancements.critereon.EnchantmentPredicate;
+import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger;
+import net.minecraft.advancements.critereon.ItemPredicate;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.advancements.critereon.BlockPredicate;
+import net.minecraft.advancements.critereon.LocationPredicate;
 import net.minecraft.advancements.critereon.TameAnimalTrigger;
-import net.minecraft.advancements.critereon.ItemDurabilityTrigger;
-import net.minecraft.advancements.critereon.MinMaxBounds;
-import net.minecraft.advancements.critereon.ItemPredicate;
+import net.minecraft.advancements.critereon.InventoryChangeTrigger;
 import net.minecraft.advancements.AdvancementRewards;
 import net.minecraft.advancements.critereon.BredAnimalsTrigger;
 import net.minecraft.advancements.critereon.PlacedBlockTrigger;
@@ -41,55 +44,56 @@ public class HusbandryAdvancements implements Consumer<Consumer<Advancement>> {
     
     @Override
     public void accept(final Consumer<Advancement> consumer) {
-        final Advancement u3 = Advancement.Builder.advancement().display(Blocks.HAY_BLOCK, new TranslatableComponent("advancements.husbandry.root.title", new Object[0]), new TranslatableComponent("advancements.husbandry.root.description", new Object[0]), new ResourceLocation("textures/gui/advancements/backgrounds/husbandry.png"), FrameType.TASK, false, false, false).addCriterion("consumed_item", ConsumeItemTrigger.TriggerInstance.usedItem()).save(consumer, "husbandry/root");
-        final Advancement u4 = Advancement.Builder.advancement().parent(u3).display(Items.WHEAT, new TranslatableComponent("advancements.husbandry.plant_seed.title", new Object[0]), new TranslatableComponent("advancements.husbandry.plant_seed.description", new Object[0]), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).addCriterion("wheat", PlacedBlockTrigger.TriggerInstance.placedBlock(Blocks.WHEAT)).addCriterion("pumpkin_stem", PlacedBlockTrigger.TriggerInstance.placedBlock(Blocks.PUMPKIN_STEM)).addCriterion("melon_stem", PlacedBlockTrigger.TriggerInstance.placedBlock(Blocks.MELON_STEM)).addCriterion("beetroots", PlacedBlockTrigger.TriggerInstance.placedBlock(Blocks.BEETROOTS)).addCriterion("nether_wart", PlacedBlockTrigger.TriggerInstance.placedBlock(Blocks.NETHER_WART)).save(consumer, "husbandry/plant_seed");
-        final Advancement u5 = Advancement.Builder.advancement().parent(u3).display(Items.WHEAT, new TranslatableComponent("advancements.husbandry.breed_an_animal.title", new Object[0]), new TranslatableComponent("advancements.husbandry.breed_an_animal.description", new Object[0]), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).addCriterion("bred", BredAnimalsTrigger.TriggerInstance.bredAnimals()).save(consumer, "husbandry/breed_an_animal");
-        final Advancement u6 = this.addFood(Advancement.Builder.advancement()).parent(u4).display(Items.APPLE, new TranslatableComponent("advancements.husbandry.balanced_diet.title", new Object[0]), new TranslatableComponent("advancements.husbandry.balanced_diet.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).save(consumer, "husbandry/balanced_diet");
-        final Advancement u7 = Advancement.Builder.advancement().parent(u4).display(Items.DIAMOND_HOE, new TranslatableComponent("advancements.husbandry.break_diamond_hoe.title", new Object[0]), new TranslatableComponent("advancements.husbandry.break_diamond_hoe.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("broke_hoe", ItemDurabilityTrigger.TriggerInstance.changedDurability(ItemPredicate.Builder.item().of(Items.DIAMOND_HOE).build(), MinMaxBounds.Ints.exactly(0))).save(consumer, "husbandry/break_diamond_hoe");
-        final Advancement u8 = Advancement.Builder.advancement().parent(u3).display(Items.LEAD, new TranslatableComponent("advancements.husbandry.tame_an_animal.title", new Object[0]), new TranslatableComponent("advancements.husbandry.tame_an_animal.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("tamed_animal", TameAnimalTrigger.TriggerInstance.tamedAnimal()).save(consumer, "husbandry/tame_an_animal");
-        final Advancement u9 = this.addBreedable(Advancement.Builder.advancement()).parent(u5).display(Items.GOLDEN_CARROT, new TranslatableComponent("advancements.husbandry.breed_all_animals.title", new Object[0]), new TranslatableComponent("advancements.husbandry.breed_all_animals.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).save(consumer, "husbandry/bred_all_animals");
-        final Advancement u10 = this.addFish(Advancement.Builder.advancement()).parent(u3).requirements(RequirementsStrategy.OR).display(Items.FISHING_ROD, new TranslatableComponent("advancements.husbandry.fishy_business.title", new Object[0]), new TranslatableComponent("advancements.husbandry.fishy_business.description", new Object[0]), null, FrameType.TASK, true, true, false).save(consumer, "husbandry/fishy_business");
-        final Advancement u11 = this.addFishBuckets(Advancement.Builder.advancement()).parent(u10).requirements(RequirementsStrategy.OR).display(Items.PUFFERFISH_BUCKET, new TranslatableComponent("advancements.husbandry.tactical_fishing.title", new Object[0]), new TranslatableComponent("advancements.husbandry.tactical_fishing.description", new Object[0]), null, FrameType.TASK, true, true, false).save(consumer, "husbandry/tactical_fishing");
-        final Advancement u12 = this.addCatVariants(Advancement.Builder.advancement()).parent(u8).display(Items.COD, new TranslatableComponent("advancements.husbandry.complete_catalogue.title", new Object[0]), new TranslatableComponent("advancements.husbandry.complete_catalogue.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(50)).save(consumer, "husbandry/complete_catalogue");
-        final Advancement u13 = Advancement.Builder.advancement().parent(u3).addCriterion("safely_harvest_honey", ItemUsedOnBlockTrigger.TriggerInstance.safelyHarvestedHoney(BlockPredicate.Builder.block().of(BlockTags.BEEHIVES), ItemPredicate.Builder.item().of(Items.GLASS_BOTTLE))).display(Items.HONEY_BOTTLE, new TranslatableComponent("advancements.husbandry.safely_harvest_honey.title", new Object[0]), new TranslatableComponent("advancements.husbandry.safely_harvest_honey.description", new Object[0]), null, FrameType.TASK, true, true, false).save(consumer, "husbandry/safely_harvest_honey");
-        final Advancement u14 = Advancement.Builder.advancement().parent(u3).addCriterion("silk_touch_nest", BeeNestDestroyedTrigger.TriggerInstance.destroyedBeeNest(Blocks.BEE_NEST, ItemPredicate.Builder.item().hasEnchantment(new EnchantmentPredicate(Enchantments.SILK_TOUCH, MinMaxBounds.Ints.atLeast(1))), MinMaxBounds.Ints.exactly(3))).display(Blocks.BEE_NEST, new TranslatableComponent("advancements.husbandry.silk_touch_nest.title", new Object[0]), new TranslatableComponent("advancements.husbandry.silk_touch_nest.description", new Object[0]), null, FrameType.TASK, true, true, false).save(consumer, "husbandry/silk_touch_nest");
+        final Advancement w3 = Advancement.Builder.advancement().display(Blocks.HAY_BLOCK, new TranslatableComponent("advancements.husbandry.root.title"), new TranslatableComponent("advancements.husbandry.root.description"), new ResourceLocation("textures/gui/advancements/backgrounds/husbandry.png"), FrameType.TASK, false, false, false).addCriterion("consumed_item", ConsumeItemTrigger.TriggerInstance.usedItem()).save(consumer, "husbandry/root");
+        final Advancement w4 = Advancement.Builder.advancement().parent(w3).display(Items.WHEAT, new TranslatableComponent("advancements.husbandry.plant_seed.title"), new TranslatableComponent("advancements.husbandry.plant_seed.description"), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).addCriterion("wheat", PlacedBlockTrigger.TriggerInstance.placedBlock(Blocks.WHEAT)).addCriterion("pumpkin_stem", PlacedBlockTrigger.TriggerInstance.placedBlock(Blocks.PUMPKIN_STEM)).addCriterion("melon_stem", PlacedBlockTrigger.TriggerInstance.placedBlock(Blocks.MELON_STEM)).addCriterion("beetroots", PlacedBlockTrigger.TriggerInstance.placedBlock(Blocks.BEETROOTS)).addCriterion("nether_wart", PlacedBlockTrigger.TriggerInstance.placedBlock(Blocks.NETHER_WART)).save(consumer, "husbandry/plant_seed");
+        final Advancement w5 = Advancement.Builder.advancement().parent(w3).display(Items.WHEAT, new TranslatableComponent("advancements.husbandry.breed_an_animal.title"), new TranslatableComponent("advancements.husbandry.breed_an_animal.description"), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).addCriterion("bred", BredAnimalsTrigger.TriggerInstance.bredAnimals()).save(consumer, "husbandry/breed_an_animal");
+        this.addFood(Advancement.Builder.advancement()).parent(w4).display(Items.APPLE, new TranslatableComponent("advancements.husbandry.balanced_diet.title"), new TranslatableComponent("advancements.husbandry.balanced_diet.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).save(consumer, "husbandry/balanced_diet");
+        Advancement.Builder.advancement().parent(w4).display(Items.NETHERITE_HOE, new TranslatableComponent("advancements.husbandry.netherite_hoe.title"), new TranslatableComponent("advancements.husbandry.netherite_hoe.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("netherite_hoe", InventoryChangeTrigger.TriggerInstance.hasItems(Items.NETHERITE_HOE)).save(consumer, "husbandry/obtain_netherite_hoe");
+        final Advancement w6 = Advancement.Builder.advancement().parent(w3).display(Items.LEAD, new TranslatableComponent("advancements.husbandry.tame_an_animal.title"), new TranslatableComponent("advancements.husbandry.tame_an_animal.description"), null, FrameType.TASK, true, true, false).addCriterion("tamed_animal", TameAnimalTrigger.TriggerInstance.tamedAnimal()).save(consumer, "husbandry/tame_an_animal");
+        this.addBreedable(Advancement.Builder.advancement()).parent(w5).display(Items.GOLDEN_CARROT, new TranslatableComponent("advancements.husbandry.breed_all_animals.title"), new TranslatableComponent("advancements.husbandry.breed_all_animals.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).save(consumer, "husbandry/bred_all_animals");
+        final Advancement w7 = this.addFish(Advancement.Builder.advancement()).parent(w3).requirements(RequirementsStrategy.OR).display(Items.FISHING_ROD, new TranslatableComponent("advancements.husbandry.fishy_business.title"), new TranslatableComponent("advancements.husbandry.fishy_business.description"), null, FrameType.TASK, true, true, false).save(consumer, "husbandry/fishy_business");
+        this.addFishBuckets(Advancement.Builder.advancement()).parent(w7).requirements(RequirementsStrategy.OR).display(Items.PUFFERFISH_BUCKET, new TranslatableComponent("advancements.husbandry.tactical_fishing.title"), new TranslatableComponent("advancements.husbandry.tactical_fishing.description"), null, FrameType.TASK, true, true, false).save(consumer, "husbandry/tactical_fishing");
+        this.addCatVariants(Advancement.Builder.advancement()).parent(w6).display(Items.COD, new TranslatableComponent("advancements.husbandry.complete_catalogue.title"), new TranslatableComponent("advancements.husbandry.complete_catalogue.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(50)).save(consumer, "husbandry/complete_catalogue");
+        Advancement.Builder.advancement().parent(w3).addCriterion("safely_harvest_honey", ItemUsedOnBlockTrigger.TriggerInstance.itemUsedOnBlock(LocationPredicate.Builder.location().setBlock(BlockPredicate.Builder.block().of(BlockTags.BEEHIVES).build()).setSmokey(true), ItemPredicate.Builder.item().of(Items.GLASS_BOTTLE))).display(Items.HONEY_BOTTLE, new TranslatableComponent("advancements.husbandry.safely_harvest_honey.title"), new TranslatableComponent("advancements.husbandry.safely_harvest_honey.description"), null, FrameType.TASK, true, true, false).save(consumer, "husbandry/safely_harvest_honey");
+        Advancement.Builder.advancement().parent(w3).addCriterion("silk_touch_nest", BeeNestDestroyedTrigger.TriggerInstance.destroyedBeeNest(Blocks.BEE_NEST, ItemPredicate.Builder.item().hasEnchantment(new EnchantmentPredicate(Enchantments.SILK_TOUCH, MinMaxBounds.Ints.atLeast(1))), MinMaxBounds.Ints.exactly(3))).display(Blocks.BEE_NEST, new TranslatableComponent("advancements.husbandry.silk_touch_nest.title"), new TranslatableComponent("advancements.husbandry.silk_touch_nest.description"), null, FrameType.TASK, true, true, false).save(consumer, "husbandry/silk_touch_nest");
     }
     
     private Advancement.Builder addFood(final Advancement.Builder a) {
-        for (final Item bei6 : HusbandryAdvancements.EDIBLE_ITEMS) {
-            a.addCriterion(Registry.ITEM.getKey(bei6).getPath(), ConsumeItemTrigger.TriggerInstance.usedItem(bei6));
+        for (final Item bke6 : HusbandryAdvancements.EDIBLE_ITEMS) {
+            a.addCriterion(Registry.ITEM.getKey(bke6).getPath(), ConsumeItemTrigger.TriggerInstance.usedItem(bke6));
         }
         return a;
     }
     
     private Advancement.Builder addBreedable(final Advancement.Builder a) {
-        for (final EntityType<?> aku6 : HusbandryAdvancements.BREEDABLE_ANIMALS) {
-            a.addCriterion(EntityType.getKey(aku6).toString(), BredAnimalsTrigger.TriggerInstance.bredAnimals(EntityPredicate.Builder.entity().of(aku6)));
+        for (final EntityType<?> aoq6 : HusbandryAdvancements.BREEDABLE_ANIMALS) {
+            a.addCriterion(EntityType.getKey(aoq6).toString(), BredAnimalsTrigger.TriggerInstance.bredAnimals(EntityPredicate.Builder.entity().of(aoq6)));
         }
+        a.addCriterion(EntityType.getKey(EntityType.TURTLE).toString(), BredAnimalsTrigger.TriggerInstance.bredAnimals(EntityPredicate.Builder.entity().of(EntityType.TURTLE).build(), EntityPredicate.Builder.entity().of(EntityType.TURTLE).build(), EntityPredicate.ANY));
         return a;
     }
     
     private Advancement.Builder addFishBuckets(final Advancement.Builder a) {
-        for (final Item bei6 : HusbandryAdvancements.FISH_BUCKETS) {
-            a.addCriterion(Registry.ITEM.getKey(bei6).getPath(), FilledBucketTrigger.TriggerInstance.filledBucket(ItemPredicate.Builder.item().of(bei6).build()));
+        for (final Item bke6 : HusbandryAdvancements.FISH_BUCKETS) {
+            a.addCriterion(Registry.ITEM.getKey(bke6).getPath(), FilledBucketTrigger.TriggerInstance.filledBucket(ItemPredicate.Builder.item().of(bke6).build()));
         }
         return a;
     }
     
     private Advancement.Builder addFish(final Advancement.Builder a) {
-        for (final Item bei6 : HusbandryAdvancements.FISH) {
-            a.addCriterion(Registry.ITEM.getKey(bei6).getPath(), FishingRodHookedTrigger.TriggerInstance.fishedItem(ItemPredicate.ANY, EntityPredicate.ANY, ItemPredicate.Builder.item().of(bei6).build()));
+        for (final Item bke6 : HusbandryAdvancements.FISH) {
+            a.addCriterion(Registry.ITEM.getKey(bke6).getPath(), FishingRodHookedTrigger.TriggerInstance.fishedItem(ItemPredicate.ANY, EntityPredicate.ANY, ItemPredicate.Builder.item().of(bke6).build()));
         }
         return a;
     }
     
     private Advancement.Builder addCatVariants(final Advancement.Builder a) {
-        Cat.TEXTURE_BY_TYPE.forEach((integer, sm) -> a.addCriterion(sm.getPath(), TameAnimalTrigger.TriggerInstance.tamedAnimal(EntityPredicate.Builder.entity().of(sm).build())));
+        Cat.TEXTURE_BY_TYPE.forEach((integer, uh) -> a.addCriterion(uh.getPath(), TameAnimalTrigger.TriggerInstance.tamedAnimal(EntityPredicate.Builder.entity().of(uh).build())));
         return a;
     }
     
     static {
-        BREEDABLE_ANIMALS = new EntityType[] { EntityType.HORSE, EntityType.SHEEP, EntityType.COW, EntityType.MOOSHROOM, EntityType.PIG, EntityType.CHICKEN, EntityType.WOLF, EntityType.OCELOT, EntityType.RABBIT, EntityType.LLAMA, EntityType.TURTLE, EntityType.CAT, EntityType.PANDA, EntityType.FOX, EntityType.BEE };
+        BREEDABLE_ANIMALS = new EntityType[] { EntityType.HORSE, EntityType.DONKEY, EntityType.MULE, EntityType.SHEEP, EntityType.COW, EntityType.MOOSHROOM, EntityType.PIG, EntityType.CHICKEN, EntityType.WOLF, EntityType.OCELOT, EntityType.RABBIT, EntityType.LLAMA, EntityType.CAT, EntityType.PANDA, EntityType.FOX, EntityType.BEE, EntityType.HOGLIN, EntityType.STRIDER };
         FISH = new Item[] { Items.COD, Items.TROPICAL_FISH, Items.PUFFERFISH, Items.SALMON };
         FISH_BUCKETS = new Item[] { Items.COD_BUCKET, Items.TROPICAL_FISH_BUCKET, Items.PUFFERFISH_BUCKET, Items.SALMON_BUCKET };
         EDIBLE_ITEMS = new Item[] { Items.APPLE, Items.MUSHROOM_STEW, Items.BREAD, Items.PORKCHOP, Items.COOKED_PORKCHOP, Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE, Items.COD, Items.SALMON, Items.TROPICAL_FISH, Items.PUFFERFISH, Items.COOKED_COD, Items.COOKED_SALMON, Items.COOKIE, Items.MELON_SLICE, Items.BEEF, Items.COOKED_BEEF, Items.CHICKEN, Items.COOKED_CHICKEN, Items.ROTTEN_FLESH, Items.SPIDER_EYE, Items.CARROT, Items.POTATO, Items.BAKED_POTATO, Items.POISONOUS_POTATO, Items.GOLDEN_CARROT, Items.PUMPKIN_PIE, Items.RABBIT, Items.COOKED_RABBIT, Items.RABBIT_STEW, Items.MUTTON, Items.COOKED_MUTTON, Items.CHORUS_FRUIT, Items.BEETROOT, Items.BEETROOT_SOUP, Items.DRIED_KELP, Items.SUSPICIOUS_STEW, Items.SWEET_BERRIES, Items.HONEY_BOTTLE };
diff --git a/src/net/minecraft/data/advancements/NetherAdvancements.java b/src/net/minecraft/data/advancements/NetherAdvancements.java
index 7641508..f8e4949 100644
--- a/src/net/minecraft/data/advancements/NetherAdvancements.java
+++ b/src/net/minecraft/data/advancements/NetherAdvancements.java
@@ -1,5 +1,26 @@
 package net.minecraft.data.advancements;
 
+import net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition;
+import net.minecraft.advancements.critereon.EntityEquipmentPredicate;
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.advancements.critereon.PlayerInteractTrigger;
+import net.minecraft.world.entity.monster.piglin.PiglinAi;
+import net.minecraft.advancements.critereon.ItemPickedUpByEntityTrigger;
+import net.minecraft.advancements.critereon.EntityFlagsPredicate;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.ItemTags;
+import net.minecraft.advancements.critereon.LootTableTrigger;
+import net.minecraft.advancements.RequirementsStrategy;
+import net.minecraft.advancements.critereon.ItemDurabilityTrigger;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.RespawnAnchorBlock;
+import net.minecraft.advancements.critereon.StatePropertiesPredicate;
+import net.minecraft.advancements.critereon.ItemUsedOnBlockTrigger;
+import net.minecraft.advancements.critereon.ItemPredicate;
+import net.minecraft.advancements.critereon.BlockPredicate;
 import net.minecraft.advancements.critereon.EffectsChangedTrigger;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.advancements.critereon.MobEffectsPredicate;
@@ -11,42 +32,60 @@ import net.minecraft.advancements.critereon.NetherTravelTrigger;
 import net.minecraft.advancements.critereon.DistancePredicate;
 import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.advancements.critereon.LocationTrigger;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.advancements.critereon.LocationPredicate;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.advancements.critereon.KilledTrigger;
 import net.minecraft.advancements.critereon.DamageSourcePredicate;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.advancements.critereon.EntityPredicate;
 import net.minecraft.advancements.AdvancementRewards;
 import net.minecraft.world.item.Items;
 import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.advancements.critereon.ChangeDimensionTrigger;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.advancements.FrameType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.advancements.critereon.EntityPredicate;
+import net.minecraft.world.level.biome.Biome;
 import net.minecraft.advancements.Advancement;
 import java.util.function.Consumer;
 
 public class NetherAdvancements implements Consumer<Consumer<Advancement>> {
+    private static final Biome[] EXPLORABLE_BIOMES;
+    private static final EntityPredicate.Composite DISTRACT_PIGLIN_PLAYER_ARMOR_PREDICATE;
+    
     @Override
     public void accept(final Consumer<Advancement> consumer) {
-        final Advancement u3 = Advancement.Builder.advancement().display(Blocks.RED_NETHER_BRICKS, new TranslatableComponent("advancements.nether.root.title", new Object[0]), new TranslatableComponent("advancements.nether.root.description", new Object[0]), new ResourceLocation("textures/gui/advancements/backgrounds/nether.png"), FrameType.TASK, false, false, false).addCriterion("entered_nether", ChangeDimensionTrigger.TriggerInstance.changedDimensionTo(DimensionType.NETHER)).save(consumer, "nether/root");
-        final Advancement u4 = Advancement.Builder.advancement().parent(u3).display(Items.FIRE_CHARGE, new TranslatableComponent("advancements.nether.return_to_sender.title", new Object[0]), new TranslatableComponent("advancements.nether.return_to_sender.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(50)).addCriterion("killed_ghast", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityType.GHAST), DamageSourcePredicate.Builder.damageType().isProjectile(true).direct(EntityPredicate.Builder.entity().of(EntityType.FIREBALL)))).save(consumer, "nether/return_to_sender");
-        final Advancement u5 = Advancement.Builder.advancement().parent(u3).display(Blocks.NETHER_BRICKS, new TranslatableComponent("advancements.nether.find_fortress.title", new Object[0]), new TranslatableComponent("advancements.nether.find_fortress.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("fortress", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(Feature.NETHER_BRIDGE))).save(consumer, "nether/find_fortress");
-        final Advancement u6 = Advancement.Builder.advancement().parent(u3).display(Items.MAP, new TranslatableComponent("advancements.nether.fast_travel.title", new Object[0]), new TranslatableComponent("advancements.nether.fast_travel.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("travelled", NetherTravelTrigger.TriggerInstance.travelledThroughNether(DistancePredicate.horizontal(MinMaxBounds.Floats.atLeast(7000.0f)))).save(consumer, "nether/fast_travel");
-        final Advancement u7 = Advancement.Builder.advancement().parent(u4).display(Items.GHAST_TEAR, new TranslatableComponent("advancements.nether.uneasy_alliance.title", new Object[0]), new TranslatableComponent("advancements.nether.uneasy_alliance.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("killed_ghast", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityType.GHAST).located(LocationPredicate.inDimension(DimensionType.OVERWORLD)))).save(consumer, "nether/uneasy_alliance");
-        final Advancement u8 = Advancement.Builder.advancement().parent(u5).display(Blocks.WITHER_SKELETON_SKULL, new TranslatableComponent("advancements.nether.get_wither_skull.title", new Object[0]), new TranslatableComponent("advancements.nether.get_wither_skull.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("wither_skull", InventoryChangeTrigger.TriggerInstance.hasItem(Blocks.WITHER_SKELETON_SKULL)).save(consumer, "nether/get_wither_skull");
-        final Advancement u9 = Advancement.Builder.advancement().parent(u8).display(Items.NETHER_STAR, new TranslatableComponent("advancements.nether.summon_wither.title", new Object[0]), new TranslatableComponent("advancements.nether.summon_wither.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("summoned", SummonedEntityTrigger.TriggerInstance.summonedEntity(EntityPredicate.Builder.entity().of(EntityType.WITHER))).save(consumer, "nether/summon_wither");
-        final Advancement u10 = Advancement.Builder.advancement().parent(u5).display(Items.BLAZE_ROD, new TranslatableComponent("advancements.nether.obtain_blaze_rod.title", new Object[0]), new TranslatableComponent("advancements.nether.obtain_blaze_rod.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("blaze_rod", InventoryChangeTrigger.TriggerInstance.hasItem(Items.BLAZE_ROD)).save(consumer, "nether/obtain_blaze_rod");
-        final Advancement u11 = Advancement.Builder.advancement().parent(u9).display(Blocks.BEACON, new TranslatableComponent("advancements.nether.create_beacon.title", new Object[0]), new TranslatableComponent("advancements.nether.create_beacon.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("beacon", ConstructBeaconTrigger.TriggerInstance.constructedBeacon(MinMaxBounds.Ints.atLeast(1))).save(consumer, "nether/create_beacon");
-        final Advancement u12 = Advancement.Builder.advancement().parent(u11).display(Blocks.BEACON, new TranslatableComponent("advancements.nether.create_full_beacon.title", new Object[0]), new TranslatableComponent("advancements.nether.create_full_beacon.description", new Object[0]), null, FrameType.GOAL, true, true, false).addCriterion("beacon", ConstructBeaconTrigger.TriggerInstance.constructedBeacon(MinMaxBounds.Ints.exactly(4))).save(consumer, "nether/create_full_beacon");
-        final Advancement u13 = Advancement.Builder.advancement().parent(u10).display(Items.POTION, new TranslatableComponent("advancements.nether.brew_potion.title", new Object[0]), new TranslatableComponent("advancements.nether.brew_potion.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("potion", BrewedPotionTrigger.TriggerInstance.brewedPotion()).save(consumer, "nether/brew_potion");
-        final Advancement u14 = Advancement.Builder.advancement().parent(u13).display(Items.MILK_BUCKET, new TranslatableComponent("advancements.nether.all_potions.title", new Object[0]), new TranslatableComponent("advancements.nether.all_potions.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("all_effects", EffectsChangedTrigger.TriggerInstance.hasEffects(MobEffectsPredicate.effects().and(MobEffects.MOVEMENT_SPEED).and(MobEffects.MOVEMENT_SLOWDOWN).and(MobEffects.DAMAGE_BOOST).and(MobEffects.JUMP).and(MobEffects.REGENERATION).and(MobEffects.FIRE_RESISTANCE).and(MobEffects.WATER_BREATHING).and(MobEffects.INVISIBILITY).and(MobEffects.NIGHT_VISION).and(MobEffects.WEAKNESS).and(MobEffects.POISON).and(MobEffects.SLOW_FALLING).and(MobEffects.DAMAGE_RESISTANCE))).save(consumer, "nether/all_potions");
-        final Advancement u15 = Advancement.Builder.advancement().parent(u14).display(Items.BUCKET, new TranslatableComponent("advancements.nether.all_effects.title", new Object[0]), new TranslatableComponent("advancements.nether.all_effects.description", new Object[0]), null, FrameType.CHALLENGE, true, true, true).rewards(AdvancementRewards.Builder.experience(1000)).addCriterion("all_effects", EffectsChangedTrigger.TriggerInstance.hasEffects(MobEffectsPredicate.effects().and(MobEffects.MOVEMENT_SPEED).and(MobEffects.MOVEMENT_SLOWDOWN).and(MobEffects.DAMAGE_BOOST).and(MobEffects.JUMP).and(MobEffects.REGENERATION).and(MobEffects.FIRE_RESISTANCE).and(MobEffects.WATER_BREATHING).and(MobEffects.INVISIBILITY).and(MobEffects.NIGHT_VISION).and(MobEffects.WEAKNESS).and(MobEffects.POISON).and(MobEffects.WITHER).and(MobEffects.DIG_SPEED).and(MobEffects.DIG_SLOWDOWN).and(MobEffects.LEVITATION).and(MobEffects.GLOWING).and(MobEffects.ABSORPTION).and(MobEffects.HUNGER).and(MobEffects.CONFUSION).and(MobEffects.DAMAGE_RESISTANCE).and(MobEffects.SLOW_FALLING).and(MobEffects.CONDUIT_POWER).and(MobEffects.DOLPHINS_GRACE).and(MobEffects.BLINDNESS).and(MobEffects.BAD_OMEN).and(MobEffects.HERO_OF_THE_VILLAGE))).save(consumer, "nether/all_effects");
+        final Advancement w3 = Advancement.Builder.advancement().display(Blocks.RED_NETHER_BRICKS, new TranslatableComponent("advancements.nether.root.title"), new TranslatableComponent("advancements.nether.root.description"), new ResourceLocation("textures/gui/advancements/backgrounds/nether.png"), FrameType.TASK, false, false, false).addCriterion("entered_nether", ChangeDimensionTrigger.TriggerInstance.changedDimensionTo(Level.NETHER)).save(consumer, "nether/root");
+        final Advancement w4 = Advancement.Builder.advancement().parent(w3).display(Items.FIRE_CHARGE, new TranslatableComponent("advancements.nether.return_to_sender.title"), new TranslatableComponent("advancements.nether.return_to_sender.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(50)).addCriterion("killed_ghast", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityType.GHAST), DamageSourcePredicate.Builder.damageType().isProjectile(true).direct(EntityPredicate.Builder.entity().of(EntityType.FIREBALL)))).save(consumer, "nether/return_to_sender");
+        final Advancement w5 = Advancement.Builder.advancement().parent(w3).display(Blocks.NETHER_BRICKS, new TranslatableComponent("advancements.nether.find_fortress.title"), new TranslatableComponent("advancements.nether.find_fortress.description"), null, FrameType.TASK, true, true, false).addCriterion("fortress", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(StructureFeature.NETHER_BRIDGE))).save(consumer, "nether/find_fortress");
+        Advancement.Builder.advancement().parent(w3).display(Items.MAP, new TranslatableComponent("advancements.nether.fast_travel.title"), new TranslatableComponent("advancements.nether.fast_travel.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("travelled", NetherTravelTrigger.TriggerInstance.travelledThroughNether(DistancePredicate.horizontal(MinMaxBounds.Floats.atLeast(7000.0f)))).save(consumer, "nether/fast_travel");
+        Advancement.Builder.advancement().parent(w4).display(Items.GHAST_TEAR, new TranslatableComponent("advancements.nether.uneasy_alliance.title"), new TranslatableComponent("advancements.nether.uneasy_alliance.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("killed_ghast", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityType.GHAST).located(LocationPredicate.inDimension(Level.OVERWORLD)))).save(consumer, "nether/uneasy_alliance");
+        final Advancement w6 = Advancement.Builder.advancement().parent(w5).display(Blocks.WITHER_SKELETON_SKULL, new TranslatableComponent("advancements.nether.get_wither_skull.title"), new TranslatableComponent("advancements.nether.get_wither_skull.description"), null, FrameType.TASK, true, true, false).addCriterion("wither_skull", InventoryChangeTrigger.TriggerInstance.hasItems(Blocks.WITHER_SKELETON_SKULL)).save(consumer, "nether/get_wither_skull");
+        final Advancement w7 = Advancement.Builder.advancement().parent(w6).display(Items.NETHER_STAR, new TranslatableComponent("advancements.nether.summon_wither.title"), new TranslatableComponent("advancements.nether.summon_wither.description"), null, FrameType.TASK, true, true, false).addCriterion("summoned", SummonedEntityTrigger.TriggerInstance.summonedEntity(EntityPredicate.Builder.entity().of(EntityType.WITHER))).save(consumer, "nether/summon_wither");
+        final Advancement w8 = Advancement.Builder.advancement().parent(w5).display(Items.BLAZE_ROD, new TranslatableComponent("advancements.nether.obtain_blaze_rod.title"), new TranslatableComponent("advancements.nether.obtain_blaze_rod.description"), null, FrameType.TASK, true, true, false).addCriterion("blaze_rod", InventoryChangeTrigger.TriggerInstance.hasItems(Items.BLAZE_ROD)).save(consumer, "nether/obtain_blaze_rod");
+        final Advancement w9 = Advancement.Builder.advancement().parent(w7).display(Blocks.BEACON, new TranslatableComponent("advancements.nether.create_beacon.title"), new TranslatableComponent("advancements.nether.create_beacon.description"), null, FrameType.TASK, true, true, false).addCriterion("beacon", ConstructBeaconTrigger.TriggerInstance.constructedBeacon(MinMaxBounds.Ints.atLeast(1))).save(consumer, "nether/create_beacon");
+        Advancement.Builder.advancement().parent(w9).display(Blocks.BEACON, new TranslatableComponent("advancements.nether.create_full_beacon.title"), new TranslatableComponent("advancements.nether.create_full_beacon.description"), null, FrameType.GOAL, true, true, false).addCriterion("beacon", ConstructBeaconTrigger.TriggerInstance.constructedBeacon(MinMaxBounds.Ints.exactly(4))).save(consumer, "nether/create_full_beacon");
+        final Advancement w10 = Advancement.Builder.advancement().parent(w8).display(Items.POTION, new TranslatableComponent("advancements.nether.brew_potion.title"), new TranslatableComponent("advancements.nether.brew_potion.description"), null, FrameType.TASK, true, true, false).addCriterion("potion", BrewedPotionTrigger.TriggerInstance.brewedPotion()).save(consumer, "nether/brew_potion");
+        final Advancement w11 = Advancement.Builder.advancement().parent(w10).display(Items.MILK_BUCKET, new TranslatableComponent("advancements.nether.all_potions.title"), new TranslatableComponent("advancements.nether.all_potions.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("all_effects", EffectsChangedTrigger.TriggerInstance.hasEffects(MobEffectsPredicate.effects().and(MobEffects.MOVEMENT_SPEED).and(MobEffects.MOVEMENT_SLOWDOWN).and(MobEffects.DAMAGE_BOOST).and(MobEffects.JUMP).and(MobEffects.REGENERATION).and(MobEffects.FIRE_RESISTANCE).and(MobEffects.WATER_BREATHING).and(MobEffects.INVISIBILITY).and(MobEffects.NIGHT_VISION).and(MobEffects.WEAKNESS).and(MobEffects.POISON).and(MobEffects.SLOW_FALLING).and(MobEffects.DAMAGE_RESISTANCE))).save(consumer, "nether/all_potions");
+        Advancement.Builder.advancement().parent(w11).display(Items.BUCKET, new TranslatableComponent("advancements.nether.all_effects.title"), new TranslatableComponent("advancements.nether.all_effects.description"), null, FrameType.CHALLENGE, true, true, true).rewards(AdvancementRewards.Builder.experience(1000)).addCriterion("all_effects", EffectsChangedTrigger.TriggerInstance.hasEffects(MobEffectsPredicate.effects().and(MobEffects.MOVEMENT_SPEED).and(MobEffects.MOVEMENT_SLOWDOWN).and(MobEffects.DAMAGE_BOOST).and(MobEffects.JUMP).and(MobEffects.REGENERATION).and(MobEffects.FIRE_RESISTANCE).and(MobEffects.WATER_BREATHING).and(MobEffects.INVISIBILITY).and(MobEffects.NIGHT_VISION).and(MobEffects.WEAKNESS).and(MobEffects.POISON).and(MobEffects.WITHER).and(MobEffects.DIG_SPEED).and(MobEffects.DIG_SLOWDOWN).and(MobEffects.LEVITATION).and(MobEffects.GLOWING).and(MobEffects.ABSORPTION).and(MobEffects.HUNGER).and(MobEffects.CONFUSION).and(MobEffects.DAMAGE_RESISTANCE).and(MobEffects.SLOW_FALLING).and(MobEffects.CONDUIT_POWER).and(MobEffects.DOLPHINS_GRACE).and(MobEffects.BLINDNESS).and(MobEffects.BAD_OMEN).and(MobEffects.HERO_OF_THE_VILLAGE))).save(consumer, "nether/all_effects");
+        final Advancement w12 = Advancement.Builder.advancement().parent(w3).display(Items.ANCIENT_DEBRIS, new TranslatableComponent("advancements.nether.obtain_ancient_debris.title"), new TranslatableComponent("advancements.nether.obtain_ancient_debris.description"), null, FrameType.TASK, true, true, false).addCriterion("ancient_debris", InventoryChangeTrigger.TriggerInstance.hasItems(Items.ANCIENT_DEBRIS)).save(consumer, "nether/obtain_ancient_debris");
+        Advancement.Builder.advancement().parent(w12).display(Items.NETHERITE_CHESTPLATE, new TranslatableComponent("advancements.nether.netherite_armor.title"), new TranslatableComponent("advancements.nether.netherite_armor.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(100)).addCriterion("netherite_armor", InventoryChangeTrigger.TriggerInstance.hasItems(Items.NETHERITE_HELMET, Items.NETHERITE_CHESTPLATE, Items.NETHERITE_LEGGINGS, Items.NETHERITE_BOOTS)).save(consumer, "nether/netherite_armor");
+        Advancement.Builder.advancement().parent(w12).display(Items.LODESTONE, new TranslatableComponent("advancements.nether.use_lodestone.title"), new TranslatableComponent("advancements.nether.use_lodestone.description"), null, FrameType.TASK, true, true, false).addCriterion("use_lodestone", ItemUsedOnBlockTrigger.TriggerInstance.itemUsedOnBlock(LocationPredicate.Builder.location().setBlock(BlockPredicate.Builder.block().of(Blocks.LODESTONE).build()), ItemPredicate.Builder.item().of(Items.COMPASS))).save(consumer, "nether/use_lodestone");
+        final Advancement w13 = Advancement.Builder.advancement().parent(w3).display(Items.CRYING_OBSIDIAN, new TranslatableComponent("advancements.nether.obtain_crying_obsidian.title"), new TranslatableComponent("advancements.nether.obtain_crying_obsidian.description"), null, FrameType.TASK, true, true, false).addCriterion("crying_obsidian", InventoryChangeTrigger.TriggerInstance.hasItems(Items.CRYING_OBSIDIAN)).save(consumer, "nether/obtain_crying_obsidian");
+        Advancement.Builder.advancement().parent(w13).display(Items.RESPAWN_ANCHOR, new TranslatableComponent("advancements.nether.charge_respawn_anchor.title"), new TranslatableComponent("advancements.nether.charge_respawn_anchor.description"), null, FrameType.TASK, true, true, false).addCriterion("charge_respawn_anchor", ItemUsedOnBlockTrigger.TriggerInstance.itemUsedOnBlock(LocationPredicate.Builder.location().setBlock(BlockPredicate.Builder.block().of(Blocks.RESPAWN_ANCHOR).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(RespawnAnchorBlock.CHARGE, 4).build()).build()), ItemPredicate.Builder.item().of(Blocks.GLOWSTONE))).save(consumer, "nether/charge_respawn_anchor");
+        final Advancement w14 = Advancement.Builder.advancement().parent(w3).display(Items.WARPED_FUNGUS_ON_A_STICK, new TranslatableComponent("advancements.nether.ride_strider.title"), new TranslatableComponent("advancements.nether.ride_strider.description"), null, FrameType.TASK, true, true, false).addCriterion("used_warped_fungus_on_a_stick", ItemDurabilityTrigger.TriggerInstance.changedDurability(EntityPredicate.Composite.wrap(EntityPredicate.Builder.entity().vehicle(EntityPredicate.Builder.entity().of(EntityType.STRIDER).build()).build()), ItemPredicate.Builder.item().of(Items.WARPED_FUNGUS_ON_A_STICK).build(), MinMaxBounds.Ints.ANY)).save(consumer, "nether/ride_strider");
+        AdventureAdvancements.addBiomes(Advancement.Builder.advancement(), NetherAdvancements.EXPLORABLE_BIOMES).parent(w14).display(Items.NETHERITE_BOOTS, new TranslatableComponent("advancements.nether.explore_nether.title"), new TranslatableComponent("advancements.nether.explore_nether.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(500)).save(consumer, "nether/explore_nether");
+        final Advancement w15 = Advancement.Builder.advancement().parent(w3).display(Items.POLISHED_BLACKSTONE_BRICKS, new TranslatableComponent("advancements.nether.find_bastion.title"), new TranslatableComponent("advancements.nether.find_bastion.description"), null, FrameType.TASK, true, true, false).addCriterion("bastion", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(StructureFeature.BASTION_REMNANT))).save(consumer, "nether/find_bastion");
+        Advancement.Builder.advancement().parent(w15).display(Blocks.CHEST, new TranslatableComponent("advancements.nether.loot_bastion.title"), new TranslatableComponent("advancements.nether.loot_bastion.description"), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).addCriterion("loot_bastion_other", LootTableTrigger.TriggerInstance.lootTableUsed(new ResourceLocation("minecraft:chests/bastion_other"))).addCriterion("loot_bastion_treasure", LootTableTrigger.TriggerInstance.lootTableUsed(new ResourceLocation("minecraft:chests/bastion_treasure"))).addCriterion("loot_bastion_hoglin_stable", LootTableTrigger.TriggerInstance.lootTableUsed(new ResourceLocation("minecraft:chests/bastion_hoglin_stable"))).addCriterion("loot_bastion_bridge", LootTableTrigger.TriggerInstance.lootTableUsed(new ResourceLocation("minecraft:chests/bastion_bridge"))).save(consumer, "nether/loot_bastion");
+        Advancement.Builder.advancement().parent(w3).requirements(RequirementsStrategy.OR).display(Items.GOLD_INGOT, new TranslatableComponent("advancements.nether.distract_piglin.title"), new TranslatableComponent("advancements.nether.distract_piglin.description"), null, FrameType.TASK, true, true, false).addCriterion("distract_piglin", ItemPickedUpByEntityTrigger.TriggerInstance.itemPickedUpByEntity(NetherAdvancements.DISTRACT_PIGLIN_PLAYER_ARMOR_PREDICATE, ItemPredicate.Builder.item().of(ItemTags.PIGLIN_LOVED), EntityPredicate.Composite.wrap(EntityPredicate.Builder.entity().of(EntityType.PIGLIN).flags(EntityFlagsPredicate.Builder.flags().setIsBaby(false).build()).build()))).addCriterion("distract_piglin_directly", PlayerInteractTrigger.TriggerInstance.itemUsedOnEntity(NetherAdvancements.DISTRACT_PIGLIN_PLAYER_ARMOR_PREDICATE, ItemPredicate.Builder.item().of(PiglinAi.BARTERING_ITEM), EntityPredicate.Composite.wrap(EntityPredicate.Builder.entity().of(EntityType.PIGLIN).flags(EntityFlagsPredicate.Builder.flags().setIsBaby(false).build()).build()))).save(consumer, "nether/distract_piglin");
+    }
+    
+    static {
+        EXPLORABLE_BIOMES = new Biome[] { Biomes.NETHER_WASTES, Biomes.SOUL_SAND_VALLEY, Biomes.WARPED_FOREST, Biomes.CRIMSON_FOREST, Biomes.BASALT_DELTAS };
+        DISTRACT_PIGLIN_PLAYER_ARMOR_PREDICATE = EntityPredicate.Composite.create(LootItemEntityPropertyCondition.hasProperties(LootContext.EntityTarget.THIS, EntityPredicate.Builder.entity().equipment(EntityEquipmentPredicate.Builder.equipment().head(ItemPredicate.Builder.item().of(Items.GOLDEN_HELMET).build()).build())).invert().build(), LootItemEntityPropertyCondition.hasProperties(LootContext.EntityTarget.THIS, EntityPredicate.Builder.entity().equipment(EntityEquipmentPredicate.Builder.equipment().chest(ItemPredicate.Builder.item().of(Items.GOLDEN_CHESTPLATE).build()).build())).invert().build(), LootItemEntityPropertyCondition.hasProperties(LootContext.EntityTarget.THIS, EntityPredicate.Builder.entity().equipment(EntityEquipmentPredicate.Builder.equipment().legs(ItemPredicate.Builder.item().of(Items.GOLDEN_LEGGINGS).build()).build())).invert().build(), LootItemEntityPropertyCondition.hasProperties(LootContext.EntityTarget.THIS, EntityPredicate.Builder.entity().equipment(EntityEquipmentPredicate.Builder.equipment().feet(ItemPredicate.Builder.item().of(Items.GOLDEN_BOOTS).build()).build())).invert().build());
     }
 }
diff --git a/src/net/minecraft/data/advancements/StoryAdvancements.java b/src/net/minecraft/data/advancements/StoryAdvancements.java
index 39b7f67..3aeba6a 100644
--- a/src/net/minecraft/data/advancements/StoryAdvancements.java
+++ b/src/net/minecraft/data/advancements/StoryAdvancements.java
@@ -1,17 +1,20 @@
 package net.minecraft.data.advancements;
 
 import net.minecraft.advancements.critereon.LocationTrigger;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.advancements.critereon.LocationPredicate;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.advancements.critereon.CuredZombieVillagerTrigger;
 import net.minecraft.advancements.critereon.ChangeDimensionTrigger;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
 import net.minecraft.advancements.critereon.EntityHurtPlayerTrigger;
 import net.minecraft.advancements.critereon.DamageSourcePredicate;
 import net.minecraft.advancements.critereon.DamagePredicate;
 import net.minecraft.advancements.critereon.EnchantedItemTrigger;
 import net.minecraft.advancements.RequirementsStrategy;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.ItemTags;
+import net.minecraft.advancements.critereon.ItemPredicate;
 import net.minecraft.world.item.Items;
 import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.advancements.critereon.InventoryChangeTrigger;
@@ -27,21 +30,21 @@ import java.util.function.Consumer;
 public class StoryAdvancements implements Consumer<Consumer<Advancement>> {
     @Override
     public void accept(final Consumer<Advancement> consumer) {
-        final Advancement u3 = Advancement.Builder.advancement().display(Blocks.GRASS_BLOCK, new TranslatableComponent("advancements.story.root.title", new Object[0]), new TranslatableComponent("advancements.story.root.description", new Object[0]), new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"), FrameType.TASK, false, false, false).addCriterion("crafting_table", InventoryChangeTrigger.TriggerInstance.hasItem(Blocks.CRAFTING_TABLE)).save(consumer, "story/root");
-        final Advancement u4 = Advancement.Builder.advancement().parent(u3).display(Items.WOODEN_PICKAXE, new TranslatableComponent("advancements.story.mine_stone.title", new Object[0]), new TranslatableComponent("advancements.story.mine_stone.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("get_stone", InventoryChangeTrigger.TriggerInstance.hasItem(Blocks.COBBLESTONE)).save(consumer, "story/mine_stone");
-        final Advancement u5 = Advancement.Builder.advancement().parent(u4).display(Items.STONE_PICKAXE, new TranslatableComponent("advancements.story.upgrade_tools.title", new Object[0]), new TranslatableComponent("advancements.story.upgrade_tools.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("stone_pickaxe", InventoryChangeTrigger.TriggerInstance.hasItem(Items.STONE_PICKAXE)).save(consumer, "story/upgrade_tools");
-        final Advancement u6 = Advancement.Builder.advancement().parent(u5).display(Items.IRON_INGOT, new TranslatableComponent("advancements.story.smelt_iron.title", new Object[0]), new TranslatableComponent("advancements.story.smelt_iron.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("iron", InventoryChangeTrigger.TriggerInstance.hasItem(Items.IRON_INGOT)).save(consumer, "story/smelt_iron");
-        final Advancement u7 = Advancement.Builder.advancement().parent(u6).display(Items.IRON_PICKAXE, new TranslatableComponent("advancements.story.iron_tools.title", new Object[0]), new TranslatableComponent("advancements.story.iron_tools.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("iron_pickaxe", InventoryChangeTrigger.TriggerInstance.hasItem(Items.IRON_PICKAXE)).save(consumer, "story/iron_tools");
-        final Advancement u8 = Advancement.Builder.advancement().parent(u7).display(Items.DIAMOND, new TranslatableComponent("advancements.story.mine_diamond.title", new Object[0]), new TranslatableComponent("advancements.story.mine_diamond.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("diamond", InventoryChangeTrigger.TriggerInstance.hasItem(Items.DIAMOND)).save(consumer, "story/mine_diamond");
-        final Advancement u9 = Advancement.Builder.advancement().parent(u6).display(Items.LAVA_BUCKET, new TranslatableComponent("advancements.story.lava_bucket.title", new Object[0]), new TranslatableComponent("advancements.story.lava_bucket.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("lava_bucket", InventoryChangeTrigger.TriggerInstance.hasItem(Items.LAVA_BUCKET)).save(consumer, "story/lava_bucket");
-        final Advancement u10 = Advancement.Builder.advancement().parent(u6).display(Items.IRON_CHESTPLATE, new TranslatableComponent("advancements.story.obtain_armor.title", new Object[0]), new TranslatableComponent("advancements.story.obtain_armor.description", new Object[0]), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).addCriterion("iron_helmet", InventoryChangeTrigger.TriggerInstance.hasItem(Items.IRON_HELMET)).addCriterion("iron_chestplate", InventoryChangeTrigger.TriggerInstance.hasItem(Items.IRON_CHESTPLATE)).addCriterion("iron_leggings", InventoryChangeTrigger.TriggerInstance.hasItem(Items.IRON_LEGGINGS)).addCriterion("iron_boots", InventoryChangeTrigger.TriggerInstance.hasItem(Items.IRON_BOOTS)).save(consumer, "story/obtain_armor");
-        final Advancement u11 = Advancement.Builder.advancement().parent(u8).display(Items.ENCHANTED_BOOK, new TranslatableComponent("advancements.story.enchant_item.title", new Object[0]), new TranslatableComponent("advancements.story.enchant_item.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("enchanted_item", EnchantedItemTrigger.TriggerInstance.enchantedItem()).save(consumer, "story/enchant_item");
-        final Advancement u12 = Advancement.Builder.advancement().parent(u9).display(Blocks.OBSIDIAN, new TranslatableComponent("advancements.story.form_obsidian.title", new Object[0]), new TranslatableComponent("advancements.story.form_obsidian.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("obsidian", InventoryChangeTrigger.TriggerInstance.hasItem(Blocks.OBSIDIAN)).save(consumer, "story/form_obsidian");
-        final Advancement u13 = Advancement.Builder.advancement().parent(u10).display(Items.SHIELD, new TranslatableComponent("advancements.story.deflect_arrow.title", new Object[0]), new TranslatableComponent("advancements.story.deflect_arrow.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("deflected_projectile", EntityHurtPlayerTrigger.TriggerInstance.entityHurtPlayer(DamagePredicate.Builder.damageInstance().type(DamageSourcePredicate.Builder.damageType().isProjectile(true)).blocked(true))).save(consumer, "story/deflect_arrow");
-        final Advancement u14 = Advancement.Builder.advancement().parent(u8).display(Items.DIAMOND_CHESTPLATE, new TranslatableComponent("advancements.story.shiny_gear.title", new Object[0]), new TranslatableComponent("advancements.story.shiny_gear.description", new Object[0]), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).addCriterion("diamond_helmet", InventoryChangeTrigger.TriggerInstance.hasItem(Items.DIAMOND_HELMET)).addCriterion("diamond_chestplate", InventoryChangeTrigger.TriggerInstance.hasItem(Items.DIAMOND_CHESTPLATE)).addCriterion("diamond_leggings", InventoryChangeTrigger.TriggerInstance.hasItem(Items.DIAMOND_LEGGINGS)).addCriterion("diamond_boots", InventoryChangeTrigger.TriggerInstance.hasItem(Items.DIAMOND_BOOTS)).save(consumer, "story/shiny_gear");
-        final Advancement u15 = Advancement.Builder.advancement().parent(u12).display(Items.FLINT_AND_STEEL, new TranslatableComponent("advancements.story.enter_the_nether.title", new Object[0]), new TranslatableComponent("advancements.story.enter_the_nether.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("entered_nether", ChangeDimensionTrigger.TriggerInstance.changedDimensionTo(DimensionType.NETHER)).save(consumer, "story/enter_the_nether");
-        final Advancement u16 = Advancement.Builder.advancement().parent(u15).display(Items.GOLDEN_APPLE, new TranslatableComponent("advancements.story.cure_zombie_villager.title", new Object[0]), new TranslatableComponent("advancements.story.cure_zombie_villager.description", new Object[0]), null, FrameType.GOAL, true, true, false).addCriterion("cured_zombie", CuredZombieVillagerTrigger.TriggerInstance.curedZombieVillager()).save(consumer, "story/cure_zombie_villager");
-        final Advancement u17 = Advancement.Builder.advancement().parent(u15).display(Items.ENDER_EYE, new TranslatableComponent("advancements.story.follow_ender_eye.title", new Object[0]), new TranslatableComponent("advancements.story.follow_ender_eye.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("in_stronghold", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(Feature.STRONGHOLD))).save(consumer, "story/follow_ender_eye");
-        final Advancement u18 = Advancement.Builder.advancement().parent(u17).display(Blocks.END_STONE, new TranslatableComponent("advancements.story.enter_the_end.title", new Object[0]), new TranslatableComponent("advancements.story.enter_the_end.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("entered_end", ChangeDimensionTrigger.TriggerInstance.changedDimensionTo(DimensionType.THE_END)).save(consumer, "story/enter_the_end");
+        final Advancement w3 = Advancement.Builder.advancement().display(Blocks.GRASS_BLOCK, new TranslatableComponent("advancements.story.root.title"), new TranslatableComponent("advancements.story.root.description"), new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"), FrameType.TASK, false, false, false).addCriterion("crafting_table", InventoryChangeTrigger.TriggerInstance.hasItems(Blocks.CRAFTING_TABLE)).save(consumer, "story/root");
+        final Advancement w4 = Advancement.Builder.advancement().parent(w3).display(Items.WOODEN_PICKAXE, new TranslatableComponent("advancements.story.mine_stone.title"), new TranslatableComponent("advancements.story.mine_stone.description"), null, FrameType.TASK, true, true, false).addCriterion("get_stone", InventoryChangeTrigger.TriggerInstance.hasItems(ItemPredicate.Builder.item().of(ItemTags.STONE_TOOL_MATERIALS).build())).save(consumer, "story/mine_stone");
+        final Advancement w5 = Advancement.Builder.advancement().parent(w4).display(Items.STONE_PICKAXE, new TranslatableComponent("advancements.story.upgrade_tools.title"), new TranslatableComponent("advancements.story.upgrade_tools.description"), null, FrameType.TASK, true, true, false).addCriterion("stone_pickaxe", InventoryChangeTrigger.TriggerInstance.hasItems(Items.STONE_PICKAXE)).save(consumer, "story/upgrade_tools");
+        final Advancement w6 = Advancement.Builder.advancement().parent(w5).display(Items.IRON_INGOT, new TranslatableComponent("advancements.story.smelt_iron.title"), new TranslatableComponent("advancements.story.smelt_iron.description"), null, FrameType.TASK, true, true, false).addCriterion("iron", InventoryChangeTrigger.TriggerInstance.hasItems(Items.IRON_INGOT)).save(consumer, "story/smelt_iron");
+        final Advancement w7 = Advancement.Builder.advancement().parent(w6).display(Items.IRON_PICKAXE, new TranslatableComponent("advancements.story.iron_tools.title"), new TranslatableComponent("advancements.story.iron_tools.description"), null, FrameType.TASK, true, true, false).addCriterion("iron_pickaxe", InventoryChangeTrigger.TriggerInstance.hasItems(Items.IRON_PICKAXE)).save(consumer, "story/iron_tools");
+        final Advancement w8 = Advancement.Builder.advancement().parent(w7).display(Items.DIAMOND, new TranslatableComponent("advancements.story.mine_diamond.title"), new TranslatableComponent("advancements.story.mine_diamond.description"), null, FrameType.TASK, true, true, false).addCriterion("diamond", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIAMOND)).save(consumer, "story/mine_diamond");
+        final Advancement w9 = Advancement.Builder.advancement().parent(w6).display(Items.LAVA_BUCKET, new TranslatableComponent("advancements.story.lava_bucket.title"), new TranslatableComponent("advancements.story.lava_bucket.description"), null, FrameType.TASK, true, true, false).addCriterion("lava_bucket", InventoryChangeTrigger.TriggerInstance.hasItems(Items.LAVA_BUCKET)).save(consumer, "story/lava_bucket");
+        final Advancement w10 = Advancement.Builder.advancement().parent(w6).display(Items.IRON_CHESTPLATE, new TranslatableComponent("advancements.story.obtain_armor.title"), new TranslatableComponent("advancements.story.obtain_armor.description"), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).addCriterion("iron_helmet", InventoryChangeTrigger.TriggerInstance.hasItems(Items.IRON_HELMET)).addCriterion("iron_chestplate", InventoryChangeTrigger.TriggerInstance.hasItems(Items.IRON_CHESTPLATE)).addCriterion("iron_leggings", InventoryChangeTrigger.TriggerInstance.hasItems(Items.IRON_LEGGINGS)).addCriterion("iron_boots", InventoryChangeTrigger.TriggerInstance.hasItems(Items.IRON_BOOTS)).save(consumer, "story/obtain_armor");
+        Advancement.Builder.advancement().parent(w8).display(Items.ENCHANTED_BOOK, new TranslatableComponent("advancements.story.enchant_item.title"), new TranslatableComponent("advancements.story.enchant_item.description"), null, FrameType.TASK, true, true, false).addCriterion("enchanted_item", EnchantedItemTrigger.TriggerInstance.enchantedItem()).save(consumer, "story/enchant_item");
+        final Advancement w11 = Advancement.Builder.advancement().parent(w9).display(Blocks.OBSIDIAN, new TranslatableComponent("advancements.story.form_obsidian.title"), new TranslatableComponent("advancements.story.form_obsidian.description"), null, FrameType.TASK, true, true, false).addCriterion("obsidian", InventoryChangeTrigger.TriggerInstance.hasItems(Blocks.OBSIDIAN)).save(consumer, "story/form_obsidian");
+        Advancement.Builder.advancement().parent(w10).display(Items.SHIELD, new TranslatableComponent("advancements.story.deflect_arrow.title"), new TranslatableComponent("advancements.story.deflect_arrow.description"), null, FrameType.TASK, true, true, false).addCriterion("deflected_projectile", EntityHurtPlayerTrigger.TriggerInstance.entityHurtPlayer(DamagePredicate.Builder.damageInstance().type(DamageSourcePredicate.Builder.damageType().isProjectile(true)).blocked(true))).save(consumer, "story/deflect_arrow");
+        Advancement.Builder.advancement().parent(w8).display(Items.DIAMOND_CHESTPLATE, new TranslatableComponent("advancements.story.shiny_gear.title"), new TranslatableComponent("advancements.story.shiny_gear.description"), null, FrameType.TASK, true, true, false).requirements(RequirementsStrategy.OR).addCriterion("diamond_helmet", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIAMOND_HELMET)).addCriterion("diamond_chestplate", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIAMOND_CHESTPLATE)).addCriterion("diamond_leggings", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIAMOND_LEGGINGS)).addCriterion("diamond_boots", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIAMOND_BOOTS)).save(consumer, "story/shiny_gear");
+        final Advancement w12 = Advancement.Builder.advancement().parent(w11).display(Items.FLINT_AND_STEEL, new TranslatableComponent("advancements.story.enter_the_nether.title"), new TranslatableComponent("advancements.story.enter_the_nether.description"), null, FrameType.TASK, true, true, false).addCriterion("entered_nether", ChangeDimensionTrigger.TriggerInstance.changedDimensionTo(Level.NETHER)).save(consumer, "story/enter_the_nether");
+        Advancement.Builder.advancement().parent(w12).display(Items.GOLDEN_APPLE, new TranslatableComponent("advancements.story.cure_zombie_villager.title"), new TranslatableComponent("advancements.story.cure_zombie_villager.description"), null, FrameType.GOAL, true, true, false).addCriterion("cured_zombie", CuredZombieVillagerTrigger.TriggerInstance.curedZombieVillager()).save(consumer, "story/cure_zombie_villager");
+        final Advancement w13 = Advancement.Builder.advancement().parent(w12).display(Items.ENDER_EYE, new TranslatableComponent("advancements.story.follow_ender_eye.title"), new TranslatableComponent("advancements.story.follow_ender_eye.description"), null, FrameType.TASK, true, true, false).addCriterion("in_stronghold", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(StructureFeature.STRONGHOLD))).save(consumer, "story/follow_ender_eye");
+        Advancement.Builder.advancement().parent(w13).display(Blocks.END_STONE, new TranslatableComponent("advancements.story.enter_the_end.title"), new TranslatableComponent("advancements.story.enter_the_end.description"), null, FrameType.TASK, true, true, false).addCriterion("entered_end", ChangeDimensionTrigger.TriggerInstance.changedDimensionTo(Level.END)).save(consumer, "story/enter_the_end");
     }
 }
diff --git a/src/net/minecraft/data/advancements/TheEndAdvancements.java b/src/net/minecraft/data/advancements/TheEndAdvancements.java
index 4089ebd..b847b2e 100644
--- a/src/net/minecraft/data/advancements/TheEndAdvancements.java
+++ b/src/net/minecraft/data/advancements/TheEndAdvancements.java
@@ -6,9 +6,8 @@ import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.advancements.AdvancementRewards;
 import net.minecraft.advancements.critereon.InventoryChangeTrigger;
 import net.minecraft.advancements.critereon.LocationTrigger;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.advancements.critereon.LocationPredicate;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.advancements.critereon.SummonedEntityTrigger;
 import net.minecraft.advancements.critereon.EnterBlockTrigger;
 import net.minecraft.world.item.Items;
@@ -17,7 +16,7 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.advancements.critereon.EntityPredicate;
 import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.advancements.critereon.ChangeDimensionTrigger;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.advancements.FrameType;
@@ -30,14 +29,14 @@ import java.util.function.Consumer;
 public class TheEndAdvancements implements Consumer<Consumer<Advancement>> {
     @Override
     public void accept(final Consumer<Advancement> consumer) {
-        final Advancement u3 = Advancement.Builder.advancement().display(Blocks.END_STONE, new TranslatableComponent("advancements.end.root.title", new Object[0]), new TranslatableComponent("advancements.end.root.description", new Object[0]), new ResourceLocation("textures/gui/advancements/backgrounds/end.png"), FrameType.TASK, false, false, false).addCriterion("entered_end", ChangeDimensionTrigger.TriggerInstance.changedDimensionTo(DimensionType.THE_END)).save(consumer, "end/root");
-        final Advancement u4 = Advancement.Builder.advancement().parent(u3).display(Blocks.DRAGON_HEAD, new TranslatableComponent("advancements.end.kill_dragon.title", new Object[0]), new TranslatableComponent("advancements.end.kill_dragon.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("killed_dragon", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityType.ENDER_DRAGON))).save(consumer, "end/kill_dragon");
-        final Advancement u5 = Advancement.Builder.advancement().parent(u4).display(Items.ENDER_PEARL, new TranslatableComponent("advancements.end.enter_end_gateway.title", new Object[0]), new TranslatableComponent("advancements.end.enter_end_gateway.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("entered_end_gateway", EnterBlockTrigger.TriggerInstance.entersBlock(Blocks.END_GATEWAY)).save(consumer, "end/enter_end_gateway");
-        final Advancement u6 = Advancement.Builder.advancement().parent(u4).display(Items.END_CRYSTAL, new TranslatableComponent("advancements.end.respawn_dragon.title", new Object[0]), new TranslatableComponent("advancements.end.respawn_dragon.description", new Object[0]), null, FrameType.GOAL, true, true, false).addCriterion("summoned_dragon", SummonedEntityTrigger.TriggerInstance.summonedEntity(EntityPredicate.Builder.entity().of(EntityType.ENDER_DRAGON))).save(consumer, "end/respawn_dragon");
-        final Advancement u7 = Advancement.Builder.advancement().parent(u5).display(Blocks.PURPUR_BLOCK, new TranslatableComponent("advancements.end.find_end_city.title", new Object[0]), new TranslatableComponent("advancements.end.find_end_city.description", new Object[0]), null, FrameType.TASK, true, true, false).addCriterion("in_city", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(Feature.END_CITY))).save(consumer, "end/find_end_city");
-        final Advancement u8 = Advancement.Builder.advancement().parent(u4).display(Items.DRAGON_BREATH, new TranslatableComponent("advancements.end.dragon_breath.title", new Object[0]), new TranslatableComponent("advancements.end.dragon_breath.description", new Object[0]), null, FrameType.GOAL, true, true, false).addCriterion("dragon_breath", InventoryChangeTrigger.TriggerInstance.hasItem(Items.DRAGON_BREATH)).save(consumer, "end/dragon_breath");
-        final Advancement u9 = Advancement.Builder.advancement().parent(u7).display(Items.SHULKER_SHELL, new TranslatableComponent("advancements.end.levitate.title", new Object[0]), new TranslatableComponent("advancements.end.levitate.description", new Object[0]), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(50)).addCriterion("levitated", LevitationTrigger.TriggerInstance.levitated(DistancePredicate.vertical(MinMaxBounds.Floats.atLeast(50.0f)))).save(consumer, "end/levitate");
-        final Advancement u10 = Advancement.Builder.advancement().parent(u7).display(Items.ELYTRA, new TranslatableComponent("advancements.end.elytra.title", new Object[0]), new TranslatableComponent("advancements.end.elytra.description", new Object[0]), null, FrameType.GOAL, true, true, false).addCriterion("elytra", InventoryChangeTrigger.TriggerInstance.hasItem(Items.ELYTRA)).save(consumer, "end/elytra");
-        final Advancement u11 = Advancement.Builder.advancement().parent(u4).display(Blocks.DRAGON_EGG, new TranslatableComponent("advancements.end.dragon_egg.title", new Object[0]), new TranslatableComponent("advancements.end.dragon_egg.description", new Object[0]), null, FrameType.GOAL, true, true, false).addCriterion("dragon_egg", InventoryChangeTrigger.TriggerInstance.hasItem(Blocks.DRAGON_EGG)).save(consumer, "end/dragon_egg");
+        final Advancement w3 = Advancement.Builder.advancement().display(Blocks.END_STONE, new TranslatableComponent("advancements.end.root.title"), new TranslatableComponent("advancements.end.root.description"), new ResourceLocation("textures/gui/advancements/backgrounds/end.png"), FrameType.TASK, false, false, false).addCriterion("entered_end", ChangeDimensionTrigger.TriggerInstance.changedDimensionTo(Level.END)).save(consumer, "end/root");
+        final Advancement w4 = Advancement.Builder.advancement().parent(w3).display(Blocks.DRAGON_HEAD, new TranslatableComponent("advancements.end.kill_dragon.title"), new TranslatableComponent("advancements.end.kill_dragon.description"), null, FrameType.TASK, true, true, false).addCriterion("killed_dragon", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityType.ENDER_DRAGON))).save(consumer, "end/kill_dragon");
+        final Advancement w5 = Advancement.Builder.advancement().parent(w4).display(Items.ENDER_PEARL, new TranslatableComponent("advancements.end.enter_end_gateway.title"), new TranslatableComponent("advancements.end.enter_end_gateway.description"), null, FrameType.TASK, true, true, false).addCriterion("entered_end_gateway", EnterBlockTrigger.TriggerInstance.entersBlock(Blocks.END_GATEWAY)).save(consumer, "end/enter_end_gateway");
+        Advancement.Builder.advancement().parent(w4).display(Items.END_CRYSTAL, new TranslatableComponent("advancements.end.respawn_dragon.title"), new TranslatableComponent("advancements.end.respawn_dragon.description"), null, FrameType.GOAL, true, true, false).addCriterion("summoned_dragon", SummonedEntityTrigger.TriggerInstance.summonedEntity(EntityPredicate.Builder.entity().of(EntityType.ENDER_DRAGON))).save(consumer, "end/respawn_dragon");
+        final Advancement w6 = Advancement.Builder.advancement().parent(w5).display(Blocks.PURPUR_BLOCK, new TranslatableComponent("advancements.end.find_end_city.title"), new TranslatableComponent("advancements.end.find_end_city.description"), null, FrameType.TASK, true, true, false).addCriterion("in_city", LocationTrigger.TriggerInstance.located(LocationPredicate.inFeature(StructureFeature.END_CITY))).save(consumer, "end/find_end_city");
+        Advancement.Builder.advancement().parent(w4).display(Items.DRAGON_BREATH, new TranslatableComponent("advancements.end.dragon_breath.title"), new TranslatableComponent("advancements.end.dragon_breath.description"), null, FrameType.GOAL, true, true, false).addCriterion("dragon_breath", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DRAGON_BREATH)).save(consumer, "end/dragon_breath");
+        Advancement.Builder.advancement().parent(w6).display(Items.SHULKER_SHELL, new TranslatableComponent("advancements.end.levitate.title"), new TranslatableComponent("advancements.end.levitate.description"), null, FrameType.CHALLENGE, true, true, false).rewards(AdvancementRewards.Builder.experience(50)).addCriterion("levitated", LevitationTrigger.TriggerInstance.levitated(DistancePredicate.vertical(MinMaxBounds.Floats.atLeast(50.0f)))).save(consumer, "end/levitate");
+        Advancement.Builder.advancement().parent(w6).display(Items.ELYTRA, new TranslatableComponent("advancements.end.elytra.title"), new TranslatableComponent("advancements.end.elytra.description"), null, FrameType.GOAL, true, true, false).addCriterion("elytra", InventoryChangeTrigger.TriggerInstance.hasItems(Items.ELYTRA)).save(consumer, "end/elytra");
+        Advancement.Builder.advancement().parent(w4).display(Blocks.DRAGON_EGG, new TranslatableComponent("advancements.end.dragon_egg.title"), new TranslatableComponent("advancements.end.dragon_egg.description"), null, FrameType.GOAL, true, true, false).addCriterion("dragon_egg", InventoryChangeTrigger.TriggerInstance.hasItems(Blocks.DRAGON_EGG)).save(consumer, "end/dragon_egg");
     }
 }
diff --git a/src/net/minecraft/data/info/BlockListReport.java b/src/net/minecraft/data/info/BlockListReport.java
index 7dcf853..da61ce0 100644
--- a/src/net/minecraft/data/info/BlockListReport.java
+++ b/src/net/minecraft/data/info/BlockListReport.java
@@ -24,49 +24,49 @@ public class BlockListReport implements DataProvider {
     private static final Gson GSON;
     private final DataGenerator generator;
     
-    public BlockListReport(final DataGenerator gy) {
-        this.generator = gy;
+    public BlockListReport(final DataGenerator hk) {
+        this.generator = hk;
     }
     
     @Override
-    public void run(final HashCache ha) throws IOException {
+    public void run(final HashCache hm) throws IOException {
         final JsonObject jsonObject3 = new JsonObject();
-        for (final Block bph5 : Registry.BLOCK) {
-            final ResourceLocation sm6 = Registry.BLOCK.getKey(bph5);
+        for (final Block bvr5 : Registry.BLOCK) {
+            final ResourceLocation uh6 = Registry.BLOCK.getKey(bvr5);
             final JsonObject jsonObject4 = new JsonObject();
-            final StateDefinition<Block, BlockState> byk8 = bph5.getStateDefinition();
-            if (!byk8.getProperties().isEmpty()) {
+            final StateDefinition<Block, BlockState> cfk8 = bvr5.getStateDefinition();
+            if (!cfk8.getProperties().isEmpty()) {
                 final JsonObject jsonObject5 = new JsonObject();
-                for (final Property<?> bzm11 : byk8.getProperties()) {
+                for (final Property<?> cgl11 : cfk8.getProperties()) {
                     final JsonArray jsonArray12 = new JsonArray();
-                    for (final Comparable<?> comparable14 : bzm11.getPossibleValues()) {
-                        jsonArray12.add(Util.getPropertyName(bzm11, comparable14));
+                    for (final Comparable<?> comparable14 : cgl11.getPossibleValues()) {
+                        jsonArray12.add(Util.getPropertyName(cgl11, comparable14));
                     }
-                    jsonObject5.add(bzm11.getName(), jsonArray12);
+                    jsonObject5.add(cgl11.getName(), jsonArray12);
                 }
                 jsonObject4.add("properties", jsonObject5);
             }
             final JsonArray jsonArray13 = new JsonArray();
-            for (final BlockState byj11 : byk8.getPossibleStates()) {
+            for (final BlockState cfj11 : cfk8.getPossibleStates()) {
                 final JsonObject jsonObject6 = new JsonObject();
                 final JsonObject jsonObject7 = new JsonObject();
-                for (final Property<?> bzm12 : byk8.getProperties()) {
-                    jsonObject7.addProperty(bzm12.getName(), Util.getPropertyName(bzm12, byj11.getValue(bzm12)));
+                for (final Property<?> cgl12 : cfk8.getProperties()) {
+                    jsonObject7.addProperty(cgl12.getName(), Util.getPropertyName(cgl12, cfj11.getValue(cgl12)));
                 }
                 if (jsonObject7.size() > 0) {
                     jsonObject6.add("properties", jsonObject7);
                 }
-                jsonObject6.addProperty("id", Block.getId(byj11));
-                if (byj11 == bph5.defaultBlockState()) {
+                jsonObject6.addProperty("id", Block.getId(cfj11));
+                if (cfj11 == bvr5.defaultBlockState()) {
                     jsonObject6.addProperty("default", true);
                 }
                 jsonArray13.add(jsonObject6);
             }
             jsonObject4.add("states", jsonArray13);
-            jsonObject3.add(sm6.toString(), jsonObject4);
+            jsonObject3.add(uh6.toString(), jsonObject4);
         }
         final Path path4 = this.generator.getOutputFolder().resolve("reports/blocks.json");
-        DataProvider.save(BlockListReport.GSON, ha, jsonObject3, path4);
+        DataProvider.save(BlockListReport.GSON, hm, jsonObject3, path4);
     }
     
     @Override
diff --git a/src/net/minecraft/data/info/CommandsReport.java b/src/net/minecraft/data/info/CommandsReport.java
index 2be3232..c731b44 100644
--- a/src/net/minecraft/data/info/CommandsReport.java
+++ b/src/net/minecraft/data/info/CommandsReport.java
@@ -4,23 +4,11 @@ import com.google.gson.GsonBuilder;
 import java.io.IOException;
 import com.mojang.brigadier.CommandDispatcher;
 import java.nio.file.Path;
-import com.mojang.authlib.GameProfileRepository;
-import com.mojang.authlib.minecraft.MinecraftSessionService;
 import com.google.gson.JsonElement;
 import com.mojang.brigadier.tree.CommandNode;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.synchronization.ArgumentTypes;
-import net.minecraft.server.dedicated.DedicatedServer;
-import net.minecraft.server.level.progress.LoggerChunkProgressListener;
-import net.minecraft.util.datafix.DataFixers;
-import net.minecraft.server.dedicated.DedicatedServerSettings;
-import java.nio.file.Paths;
-import net.minecraft.server.players.GameProfileCache;
-import net.minecraft.server.MinecraftServer;
-import java.io.File;
-import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
-import java.util.UUID;
-import java.net.Proxy;
+import net.minecraft.commands.Commands;
 import net.minecraft.data.HashCache;
 import net.minecraft.data.DataGenerator;
 import com.google.gson.Gson;
@@ -30,22 +18,15 @@ public class CommandsReport implements DataProvider {
     private static final Gson GSON;
     private final DataGenerator generator;
     
-    public CommandsReport(final DataGenerator gy) {
-        this.generator = gy;
+    public CommandsReport(final DataGenerator hk) {
+        this.generator = hk;
     }
     
     @Override
-    public void run(final HashCache ha) throws IOException {
-        final YggdrasilAuthenticationService yggdrasilAuthenticationService3 = new YggdrasilAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString());
-        final MinecraftSessionService minecraftSessionService4 = yggdrasilAuthenticationService3.createMinecraftSessionService();
-        final GameProfileRepository gameProfileRepository5 = yggdrasilAuthenticationService3.createProfileRepository();
-        final File file6 = new File(this.generator.getOutputFolder().toFile(), "tmp");
-        final GameProfileCache zk7 = new GameProfileCache(gameProfileRepository5, new File(file6, MinecraftServer.USERID_CACHE_FILE.getName()));
-        final DedicatedServerSettings wf8 = new DedicatedServerSettings(Paths.get("server.properties"));
-        final MinecraftServer minecraftServer9 = new DedicatedServer(file6, wf8, DataFixers.getDataFixer(), yggdrasilAuthenticationService3, minecraftSessionService4, gameProfileRepository5, zk7, LoggerChunkProgressListener::new, wf8.getProperties().levelName);
-        final Path path10 = this.generator.getOutputFolder().resolve("reports/commands.json");
-        final CommandDispatcher<CommandSourceStack> commandDispatcher11 = minecraftServer9.getCommands().getDispatcher();
-        DataProvider.save(CommandsReport.GSON, ha, ArgumentTypes.<CommandSourceStack>serializeNodeToJson(commandDispatcher11, (com.mojang.brigadier.tree.CommandNode<CommandSourceStack>)commandDispatcher11.getRoot()), path10);
+    public void run(final HashCache hm) throws IOException {
+        final Path path3 = this.generator.getOutputFolder().resolve("reports/commands.json");
+        final CommandDispatcher<CommandSourceStack> commandDispatcher4 = new Commands(Commands.CommandSelection.ALL).getDispatcher();
+        DataProvider.save(CommandsReport.GSON, hm, ArgumentTypes.<CommandSourceStack>serializeNodeToJson(commandDispatcher4, (com.mojang.brigadier.tree.CommandNode<CommandSourceStack>)commandDispatcher4.getRoot()), path3);
     }
     
     @Override
diff --git a/src/net/minecraft/data/info/RegistryDumpReport.java b/src/net/minecraft/data/info/RegistryDumpReport.java
index 4cb2533..7020c8f 100644
--- a/src/net/minecraft/data/info/RegistryDumpReport.java
+++ b/src/net/minecraft/data/info/RegistryDumpReport.java
@@ -7,7 +7,6 @@ import net.minecraft.core.DefaultedRegistry;
 import java.io.IOException;
 import java.nio.file.Path;
 import com.google.gson.JsonElement;
-import net.minecraft.core.WritableRegistry;
 import net.minecraft.core.Registry;
 import com.google.gson.JsonObject;
 import net.minecraft.data.HashCache;
@@ -19,33 +18,33 @@ public class RegistryDumpReport implements DataProvider {
     private static final Gson GSON;
     private final DataGenerator generator;
     
-    public RegistryDumpReport(final DataGenerator gy) {
-        this.generator = gy;
+    public RegistryDumpReport(final DataGenerator hk) {
+        this.generator = hk;
     }
     
     @Override
-    public void run(final HashCache ha) throws IOException {
+    public void run(final HashCache hm) throws IOException {
         final JsonObject jsonObject3 = new JsonObject();
-        Registry.REGISTRY.keySet().forEach(sm -> jsonObject3.add(sm.toString(), RegistryDumpReport.dumpRegistry(Registry.REGISTRY.get(sm))));
+        Registry.REGISTRY.keySet().forEach(uh -> jsonObject3.add(uh.toString(), RegistryDumpReport.dumpRegistry((Registry<Object>)Registry.REGISTRY.get(uh))));
         final Path path4 = this.generator.getOutputFolder().resolve("reports/registries.json");
-        DataProvider.save(RegistryDumpReport.GSON, ha, jsonObject3, path4);
+        DataProvider.save(RegistryDumpReport.GSON, hm, jsonObject3, path4);
     }
     
-    private static <T> JsonElement dumpRegistry(final WritableRegistry<T> gh) {
+    private static <T> JsonElement dumpRegistry(final Registry<T> gl) {
         final JsonObject jsonObject2 = new JsonObject();
-        if (gh instanceof DefaultedRegistry) {
-            final ResourceLocation sm3 = ((DefaultedRegistry)gh).getDefaultKey();
-            jsonObject2.addProperty("default", sm3.toString());
+        if (gl instanceof DefaultedRegistry) {
+            final ResourceLocation uh3 = ((DefaultedRegistry)gl).getDefaultKey();
+            jsonObject2.addProperty("default", uh3.toString());
         }
-        final int integer3 = Registry.REGISTRY.getId(gh);
+        final int integer3 = Registry.REGISTRY.getId(gl);
         jsonObject2.addProperty("protocol_id", integer3);
         final JsonObject jsonObject3 = new JsonObject();
-        for (final ResourceLocation sm4 : gh.keySet()) {
-            final T object7 = gh.get(sm4);
-            final int integer4 = gh.getId(object7);
+        for (final ResourceLocation uh4 : gl.keySet()) {
+            final T object7 = gl.get(uh4);
+            final int integer4 = gl.getId(object7);
             final JsonObject jsonObject4 = new JsonObject();
             jsonObject4.addProperty("protocol_id", integer4);
-            jsonObject3.add(sm4.toString(), jsonObject4);
+            jsonObject3.add(uh4.toString(), jsonObject4);
         }
         jsonObject2.add("entries", jsonObject3);
         return jsonObject2;
diff --git a/src/net/minecraft/data/loot/BlockLoot.java b/src/net/minecraft/data/loot/BlockLoot.java
index 0e92ef4..cb80c46 100644
--- a/src/net/minecraft/data/loot/BlockLoot.java
+++ b/src/net/minecraft/data/loot/BlockLoot.java
@@ -1,6 +1,4 @@
 java.lang.StackOverflowError
-	at java.base/java.util.Collections$SetFromMap.contains(Collections.java:5564)
-	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:21)
 	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
 	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
@@ -1023,3 +1021,5 @@ java.lang.StackOverflowError
 	at com.strobel.assembler.metadata.MetadataHelper$SameTypeVisitor.visitClassType(MetadataHelper.java:2386)
 	at com.strobel.assembler.metadata.MetadataHelper$SameTypeVisitor.visitParameterizedType(MetadataHelper.java:2440)
 	at com.strobel.assembler.metadata.MetadataHelper$SameTypeVisitor.visitParameterizedType(MetadataHelper.java:2322)
+	at com.strobel.assembler.metadata.ParameterizedType.accept(ParameterizedType.java:103)
+	at com.strobel.assembler.metadata.MetadataHelper$SameTypeVisitor.visit(MetadataHelper.java:2336)
diff --git a/src/net/minecraft/data/loot/ChestLoot.java b/src/net/minecraft/data/loot/ChestLoot.java
index 256cf87..459e172 100644
--- a/src/net/minecraft/data/loot/ChestLoot.java
+++ b/src/net/minecraft/data/loot/ChestLoot.java
@@ -1,25 +1,5 @@
 package net.minecraft.data.loot;
 
-import net.minecraft.world.level.storage.loot.entries.LootPoolSingletonContainer;
-import net.minecraft.world.effect.MobEffects;
-import net.minecraft.world.level.storage.loot.functions.SetStewEffectFunction;
-import net.minecraft.world.level.saveddata.maps.MapDecoration;
-import net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction;
-import net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction;
-import net.minecraft.world.level.storage.loot.RandomValueBounds;
-import net.minecraft.world.level.storage.loot.entries.EmptyLootItem;
-import net.minecraft.world.level.storage.loot.functions.LootItemFunction;
-import net.minecraft.world.level.storage.loot.functions.EnchantRandomlyFunction;
-import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer;
-import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.level.storage.loot.entries.LootItem;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.storage.loot.RandomIntGenerator;
-import net.minecraft.world.level.storage.loot.ConstantIntValue;
-import net.minecraft.world.level.storage.loot.LootPool;
-import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.resources.ResourceLocation;
 import java.util.function.BiConsumer;
@@ -28,41 +8,4847 @@ import java.util.function.Consumer;
 public class ChestLoot implements Consumer<BiConsumer<ResourceLocation, LootTable.Builder>> {
     @Override
     public void accept(final BiConsumer<ResourceLocation, LootTable.Builder> biConsumer) {
-        biConsumer.accept(BuiltInLootTables.ABANDONED_MINESHAFT, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootItem.lootTableItem(Items.GOLDEN_APPLE).setWeight(20)).add(LootItem.lootTableItem(Items.ENCHANTED_GOLDEN_APPLE)).add(LootItem.lootTableItem(Items.NAME_TAG).setWeight(30)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BOOK).setWeight(10)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment())).add(LootItem.lootTableItem(Items.IRON_PICKAXE).setWeight(5)).add(EmptyLootItem.emptyItem().setWeight(5))).withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 4.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.REDSTONE).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(4.0f, 9.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.LAPIS_LAZULI).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(4.0f, 9.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(3.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.MELON_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.PUMPKIN_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BEETROOT_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f))))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(3)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.RAIL).setWeight(20)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(4.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.POWERED_RAIL).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.DETECTOR_RAIL).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.ACTIVATOR_RAIL).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.TORCH).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 16.0f))))));
-        biConsumer.accept(BuiltInLootTables.BURIED_TREASURE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootItem.lootTableItem(Items.HEART_OF_THE_SEA))).withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(5.0f, 8.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(20)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.TNT).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f))))).withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 3.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(4.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.PRISMARINE_CRYSTALS).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f))))).withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(0.0f, 1.0f)).add(LootItem.lootTableItem(Items.LEATHER_CHESTPLATE)).add(LootItem.lootTableItem(Items.IRON_SWORD))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(2)).add(LootItem.lootTableItem(Items.COOKED_COD).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f)))).add(LootItem.lootTableItem(Items.COOKED_SALMON).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f))))));
-        biConsumer.accept(BuiltInLootTables.DESERT_PYRAMID, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 4.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BONE).setWeight(25)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(4.0f, 6.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.SPIDER_EYE).setWeight(25)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.ROTTEN_FLESH).setWeight(25)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(3.0f, 7.0f)))).add(LootItem.lootTableItem(Items.SADDLE).setWeight(20)).add(LootItem.lootTableItem(Items.IRON_HORSE_ARMOR).setWeight(15)).add(LootItem.lootTableItem(Items.GOLDEN_HORSE_ARMOR).setWeight(10)).add(LootItem.lootTableItem(Items.DIAMOND_HORSE_ARMOR).setWeight(5)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BOOK).setWeight(20)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment())).add(LootItem.lootTableItem(Items.GOLDEN_APPLE).setWeight(20)).add(LootItem.lootTableItem(Items.ENCHANTED_GOLDEN_APPLE).setWeight(2)).add(EmptyLootItem.emptyItem().setWeight(15))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(4)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BONE).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GUNPOWDER).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.ROTTEN_FLESH).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.STRING).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.SAND).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f))))));
-        biConsumer.accept(BuiltInLootTables.END_CITY_TREASURE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 6.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(4.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 6.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BEETROOT_SEEDS).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 10.0f)))).add(LootItem.lootTableItem(Items.SADDLE).setWeight(3)).add(LootItem.lootTableItem(Items.IRON_HORSE_ARMOR)).add(LootItem.lootTableItem(Items.GOLDEN_HORSE_ARMOR)).add(LootItem.lootTableItem(Items.DIAMOND_HORSE_ARMOR)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND_SWORD).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND_BOOTS).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND_CHESTPLATE).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND_LEGGINGS).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND_HELMET).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND_PICKAXE).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND_SHOVEL).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_SWORD).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_BOOTS).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_CHESTPLATE).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_LEGGINGS).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_HELMET).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_PICKAXE).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_SHOVEL).setWeight(3)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(RandomValueBounds.between(20.0f, 39.0f)).allowTreasure()))));
-        biConsumer.accept(BuiltInLootTables.IGLOO_CHEST, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 8.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.APPLE).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_NUGGET).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.STONE_AXE).setWeight(2)).add(LootItem.lootTableItem(Items.ROTTEN_FLESH).setWeight(10)).add(LootItem.lootTableItem(Items.EMERALD)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 3.0f))))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootItem.lootTableItem(Items.GOLDEN_APPLE))));
-        biConsumer.accept(BuiltInLootTables.JUNGLE_TEMPLE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 6.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.BAMBOO).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BONE).setWeight(20)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(4.0f, 6.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.ROTTEN_FLESH).setWeight(16)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(3.0f, 7.0f)))).add(LootItem.lootTableItem(Items.SADDLE).setWeight(3)).add(LootItem.lootTableItem(Items.IRON_HORSE_ARMOR)).add(LootItem.lootTableItem(Items.GOLDEN_HORSE_ARMOR)).add(LootItem.lootTableItem(Items.DIAMOND_HORSE_ARMOR)).add(LootItem.lootTableItem(Items.BOOK).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(ConstantIntValue.exactly(30)).allowTreasure()))));
-        biConsumer.accept(BuiltInLootTables.JUNGLE_TEMPLE_DISPENSER, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 2.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.ARROW).setWeight(30)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 7.0f))))));
-        biConsumer.accept(BuiltInLootTables.NETHER_BRIDGE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 4.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.GOLDEN_SWORD).setWeight(5)).add(LootItem.lootTableItem(Items.GOLDEN_CHESTPLATE).setWeight(5)).add(LootItem.lootTableItem(Items.FLINT_AND_STEEL).setWeight(5)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.NETHER_WART).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(3.0f, 7.0f)))).add(LootItem.lootTableItem(Items.SADDLE).setWeight(10)).add(LootItem.lootTableItem(Items.GOLDEN_HORSE_ARMOR).setWeight(8)).add(LootItem.lootTableItem(Items.IRON_HORSE_ARMOR).setWeight(5)).add(LootItem.lootTableItem(Items.DIAMOND_HORSE_ARMOR).setWeight(3)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.OBSIDIAN).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f))))));
-        biConsumer.accept(BuiltInLootTables.PILLAGER_OUTPOST, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(0.0f, 1.0f)).add(LootItem.lootTableItem(Items.CROSSBOW))).withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 3.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT).setWeight(7)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(3.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.POTATO).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.CARROT).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(3.0f, 5.0f))))).withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 3.0f)).add(LootItem.lootTableItem(Blocks.DARK_OAK_LOG).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 3.0f))))).withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 3.0f)).add(LootItem.lootTableItem(Items.EXPERIENCE_BOTTLE).setWeight(7)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.STRING).setWeight(4)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 6.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.ARROW).setWeight(4)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.TRIPWIRE_HOOK).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BOOK).setWeight(1)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment()))));
-        biConsumer.accept(BuiltInLootTables.SHIPWRECK_MAP, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootItem.lootTableItem(Items.MAP).apply((LootItemFunction.Builder)ExplorationMapFunction.makeExplorationMap().setDestination("buried_treasure").setMapDecoration(MapDecoration.Type.RED_X).setZoom((byte)1).setSkipKnownStructures(false)))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(3)).add(LootItem.lootTableItem(Items.COMPASS)).add(LootItem.lootTableItem(Items.MAP)).add(LootItem.lootTableItem(Items.CLOCK)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.PAPER).setWeight(20)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 10.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.FEATHER).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BOOK).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f))))));
-        biConsumer.accept(BuiltInLootTables.SHIPWRECK_SUPPLY, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(3.0f, 10.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.PAPER).setWeight(8)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 12.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.POTATO).setWeight(7)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 6.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.POISONOUS_POTATO).setWeight(7)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 6.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.CARROT).setWeight(7)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(4.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT).setWeight(7)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(8.0f, 21.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.SUSPICIOUS_STEW).setWeight(10)).apply((LootItemFunction.Builder)SetStewEffectFunction.stewEffect().withEffect(MobEffects.NIGHT_VISION, RandomValueBounds.between(7.0f, 10.0f)).withEffect(MobEffects.JUMP, RandomValueBounds.between(7.0f, 10.0f)).withEffect(MobEffects.WEAKNESS, RandomValueBounds.between(6.0f, 8.0f)).withEffect(MobEffects.BLINDNESS, RandomValueBounds.between(5.0f, 7.0f)).withEffect(MobEffects.POISON, RandomValueBounds.between(10.0f, 20.0f)).withEffect(MobEffects.SATURATION, RandomValueBounds.between(7.0f, 10.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(6)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.ROTTEN_FLESH).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(5.0f, 24.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.PUMPKIN).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.BAMBOO).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GUNPOWDER).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(LootItem.lootTableItem(Blocks.TNT).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.LEATHER_HELMET).setWeight(3)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.LEATHER_CHESTPLATE).setWeight(3)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.LEATHER_LEGGINGS).setWeight(3)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.LEATHER_BOOTS).setWeight(3)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment()))));
-        biConsumer.accept(BuiltInLootTables.SHIPWRECK_TREASURE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(3.0f, 6.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(90)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(40)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(LootItem.lootTableItem(Items.DIAMOND).setWeight(5)).add(LootItem.lootTableItem(Items.EXPERIENCE_BOTTLE).setWeight(5))).withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 5.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_NUGGET).setWeight(50)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 10.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_NUGGET).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 10.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.LAPIS_LAZULI).setWeight(20)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 10.0f))))));
-        biConsumer.accept(BuiltInLootTables.SIMPLE_DUNGEON, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 3.0f)).add(LootItem.lootTableItem(Items.SADDLE).setWeight(20)).add(LootItem.lootTableItem(Items.GOLDEN_APPLE).setWeight(15)).add(LootItem.lootTableItem(Items.ENCHANTED_GOLDEN_APPLE).setWeight(2)).add(LootItem.lootTableItem(Items.MUSIC_DISC_13).setWeight(15)).add(LootItem.lootTableItem(Items.MUSIC_DISC_CAT).setWeight(15)).add(LootItem.lootTableItem(Items.NAME_TAG).setWeight(20)).add(LootItem.lootTableItem(Items.GOLDEN_HORSE_ARMOR).setWeight(10)).add(LootItem.lootTableItem(Items.IRON_HORSE_ARMOR).setWeight(15)).add(LootItem.lootTableItem(Items.DIAMOND_HORSE_ARMOR).setWeight(5)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BOOK).setWeight(10)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment()))).withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 4.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(LootItem.lootTableItem(Items.BREAD).setWeight(20)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT).setWeight(20)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(LootItem.lootTableItem(Items.BUCKET).setWeight(10)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.REDSTONE).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.MELON_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.PUMPKIN_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BEETROOT_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f))))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(3)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BONE).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GUNPOWDER).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.ROTTEN_FLESH).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.STRING).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f))))));
-        biConsumer.accept(BuiltInLootTables.SPAWN_BONUS_CHEST, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootItem.lootTableItem(Items.STONE_AXE)).add(LootItem.lootTableItem(Items.WOODEN_AXE).setWeight(3))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootItem.lootTableItem(Items.STONE_PICKAXE)).add(LootItem.lootTableItem(Items.WOODEN_PICKAXE).setWeight(3))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(3)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.APPLE).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.SALMON).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f))))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(4)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.STICK).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 12.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.OAK_PLANKS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 12.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.OAK_LOG).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.SPRUCE_LOG).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.BIRCH_LOG).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.JUNGLE_LOG).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.ACACIA_LOG).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.DARK_OAK_LOG).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f))))));
-        biConsumer.accept(BuiltInLootTables.STRONGHOLD_CORRIDOR, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 3.0f)).add(LootItem.lootTableItem(Items.ENDER_PEARL).setWeight(10)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.REDSTONE).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(4.0f, 9.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.APPLE).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.IRON_PICKAXE).setWeight(5)).add(LootItem.lootTableItem(Items.IRON_SWORD).setWeight(5)).add(LootItem.lootTableItem(Items.IRON_CHESTPLATE).setWeight(5)).add(LootItem.lootTableItem(Items.IRON_HELMET).setWeight(5)).add(LootItem.lootTableItem(Items.IRON_LEGGINGS).setWeight(5)).add(LootItem.lootTableItem(Items.IRON_BOOTS).setWeight(5)).add(LootItem.lootTableItem(Items.GOLDEN_APPLE)).add(LootItem.lootTableItem(Items.SADDLE)).add(LootItem.lootTableItem(Items.IRON_HORSE_ARMOR)).add(LootItem.lootTableItem(Items.GOLDEN_HORSE_ARMOR)).add(LootItem.lootTableItem(Items.DIAMOND_HORSE_ARMOR)).add(LootItem.lootTableItem(Items.BOOK).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(ConstantIntValue.exactly(30)).allowTreasure()))));
-        biConsumer.accept(BuiltInLootTables.STRONGHOLD_CROSSING, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 4.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.REDSTONE).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(4.0f, 9.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(3.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.APPLE).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.IRON_PICKAXE)).add(LootItem.lootTableItem(Items.BOOK).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(ConstantIntValue.exactly(30)).allowTreasure()))));
-        biConsumer.accept(BuiltInLootTables.STRONGHOLD_LIBRARY, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 10.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BOOK).setWeight(20)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.PAPER).setWeight(20)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 7.0f)))).add(LootItem.lootTableItem(Items.MAP)).add(LootItem.lootTableItem(Items.COMPASS)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BOOK).setWeight(10)).apply((LootItemFunction.Builder)EnchantWithLevelsFunction.enchantWithLevels(ConstantIntValue.exactly(30)).allowTreasure()))));
-        biConsumer.accept(BuiltInLootTables.UNDERWATER_RUIN_BIG, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 8.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_NUGGET).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.EMERALD)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 3.0f))))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootItem.lootTableItem(Items.GOLDEN_APPLE)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BOOK).setWeight(5)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment())).add(LootItem.lootTableItem(Items.LEATHER_CHESTPLATE)).add(LootItem.lootTableItem(Items.GOLDEN_HELMET)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.FISHING_ROD).setWeight(5)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.MAP).setWeight(10)).apply((LootItemFunction.Builder)ExplorationMapFunction.makeExplorationMap().setDestination("buried_treasure").setMapDecoration(MapDecoration.Type.RED_X).setZoom((byte)1).setSkipKnownStructures(false)))));
-        biConsumer.accept(BuiltInLootTables.UNDERWATER_RUIN_SMALL, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(2.0f, 8.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(LootItem.lootTableItem(Items.STONE_AXE).setWeight(2)).add(LootItem.lootTableItem(Items.ROTTEN_FLESH).setWeight(5)).add(LootItem.lootTableItem(Items.EMERALD)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 3.0f))))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootItem.lootTableItem(Items.LEATHER_CHESTPLATE)).add(LootItem.lootTableItem(Items.GOLDEN_HELMET)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.FISHING_ROD).setWeight(5)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment())).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.MAP).setWeight(5)).apply((LootItemFunction.Builder)ExplorationMapFunction.makeExplorationMap().setDestination("buried_treasure").setMapDecoration(MapDecoration.Type.RED_X).setZoom((byte)1).setSkipKnownStructures(false)))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_WEAPONSMITH, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(3.0f, 8.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.APPLE).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.IRON_PICKAXE).setWeight(5)).add(LootItem.lootTableItem(Items.IRON_SWORD).setWeight(5)).add(LootItem.lootTableItem(Items.IRON_CHESTPLATE).setWeight(5)).add(LootItem.lootTableItem(Items.IRON_HELMET).setWeight(5)).add(LootItem.lootTableItem(Items.IRON_LEGGINGS).setWeight(5)).add(LootItem.lootTableItem(Items.IRON_BOOTS).setWeight(5)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.OBSIDIAN).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(3.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.OAK_SAPLING).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(3.0f, 7.0f)))).add(LootItem.lootTableItem(Items.SADDLE).setWeight(3)).add(LootItem.lootTableItem(Items.IRON_HORSE_ARMOR)).add(LootItem.lootTableItem(Items.GOLDEN_HORSE_ARMOR)).add(LootItem.lootTableItem(Items.DIAMOND_HORSE_ARMOR))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_TOOLSMITH, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(3.0f, 8.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.DIAMOND).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.IRON_PICKAXE).setWeight(5)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.STICK).setWeight(20)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.IRON_SHOVEL).setWeight(5))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_CARTOGRAPHER, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 5.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.MAP).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.PAPER).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(LootItem.lootTableItem(Items.COMPASS).setWeight(5)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.STICK).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f))))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_MASON, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 5.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.CLAY_BALL).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.FLOWER_POT).setWeight(1)).add(LootItem.lootTableItem(Blocks.STONE).setWeight(2)).add(LootItem.lootTableItem(Blocks.STONE_BRICKS).setWeight(2)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(4)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(LootItem.lootTableItem(Items.YELLOW_DYE).setWeight(1)).add(LootItem.lootTableItem(Blocks.SMOOTH_STONE).setWeight(1)).add(LootItem.lootTableItem(Items.EMERALD).setWeight(1))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_ARMORER, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 5.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(4)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(LootItem.lootTableItem(Items.IRON_HELMET).setWeight(1)).add(LootItem.lootTableItem(Items.EMERALD).setWeight(1))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_SHEPHERD, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 5.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.WHITE_WOOL).setWeight(6)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.BLACK_WOOL).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.GRAY_WOOL).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.BROWN_WOOL).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.LIGHT_GRAY_WOOL).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.EMERALD).setWeight(1)).add(LootItem.lootTableItem(Items.SHEARS).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT).setWeight(6)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 6.0f))))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_BUTCHER, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 5.0f)).add(LootItem.lootTableItem(Items.EMERALD).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.PORKCHOP).setWeight(6)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT).setWeight(6)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BEEF).setWeight(6)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.MUTTON).setWeight(6)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f))))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_FLETCHER, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 5.0f)).add(LootItem.lootTableItem(Items.EMERALD).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.ARROW).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.FEATHER).setWeight(6)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EGG).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.FLINT).setWeight(6)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.STICK).setWeight(6)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f))))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_FISHER, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 5.0f)).add(LootItem.lootTableItem(Items.EMERALD).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COD).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.SALMON).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WATER_BUCKET).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BARREL).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT_SEEDS).setWeight(3)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f))))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_TANNERY, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 5.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.LEATHER).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.LEATHER_CHESTPLATE).setWeight(2)).add(LootItem.lootTableItem(Items.LEATHER_BOOTS).setWeight(2)).add(LootItem.lootTableItem(Items.LEATHER_HELMET).setWeight(2)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(LootItem.lootTableItem(Items.LEATHER_LEGGINGS).setWeight(2)).add(LootItem.lootTableItem(Items.SADDLE).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f))))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_TEMPLE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(3.0f, 8.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.REDSTONE).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(7)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.ROTTEN_FLESH).setWeight(7)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.LAPIS_LAZULI).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f))))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_PLAINS_HOUSE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(3.0f, 8.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_NUGGET).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.DANDELION).setWeight(2)).add(LootItem.lootTableItem(Items.POPPY).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.POTATO).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.APPLE).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(LootItem.lootTableItem(Items.BOOK).setWeight(1)).add(LootItem.lootTableItem(Items.FEATHER).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.OAK_SAPLING).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f))))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_TAIGA_HOUSE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(3.0f, 8.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_NUGGET).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(LootItem.lootTableItem(Items.FERN).setWeight(2)).add(LootItem.lootTableItem(Items.LARGE_FERN).setWeight(2)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.POTATO).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.SWEET_BERRIES).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.PUMPKIN_SEEDS).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(LootItem.lootTableItem(Items.PUMPKIN_PIE).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.SPRUCE_SAPLING).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(LootItem.lootTableItem(Items.SPRUCE_SIGN).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.SPRUCE_LOG).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f))))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_SAVANNA_HOUSE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(3.0f, 8.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_NUGGET).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(LootItem.lootTableItem(Items.GRASS).setWeight(5)).add(LootItem.lootTableItem(Items.TALL_GRASS).setWeight(5)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.ACACIA_SAPLING).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f)))).add(LootItem.lootTableItem(Items.SADDLE).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.TORCH).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 2.0f)))).add(LootItem.lootTableItem(Items.BUCKET).setWeight(1))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_SNOWY_HOUSE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(3.0f, 8.0f)).add(LootItem.lootTableItem(Blocks.BLUE_ICE).setWeight(1)).add(LootItem.lootTableItem(Blocks.SNOW_BLOCK).setWeight(4)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.POTATO).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BEETROOT_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 5.0f)))).add(LootItem.lootTableItem(Items.BEETROOT_SOUP).setWeight(1)).add(LootItem.lootTableItem(Items.FURNACE).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.SNOWBALL).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f))))));
-        biConsumer.accept(BuiltInLootTables.VILLAGE_DESERT_HOUSE, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(3.0f, 8.0f)).add(LootItem.lootTableItem(Items.CLAY_BALL).setWeight(1)).add(LootItem.lootTableItem(Items.GREEN_DYE).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.CACTUS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 7.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BREAD).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(LootItem.lootTableItem(Items.BOOK).setWeight(1)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Blocks.DEAD_BUSH).setWeight(2)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.EMERALD).setWeight(1)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 3.0f))))));
-        biConsumer.accept(BuiltInLootTables.WOODLAND_MANSION, LootTable.lootTable().withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 3.0f)).add(LootItem.lootTableItem(Items.LEAD).setWeight(20)).add(LootItem.lootTableItem(Items.GOLDEN_APPLE).setWeight(15)).add(LootItem.lootTableItem(Items.ENCHANTED_GOLDEN_APPLE).setWeight(2)).add(LootItem.lootTableItem(Items.MUSIC_DISC_13).setWeight(15)).add(LootItem.lootTableItem(Items.MUSIC_DISC_CAT).setWeight(15)).add(LootItem.lootTableItem(Items.NAME_TAG).setWeight(20)).add(LootItem.lootTableItem(Items.CHAINMAIL_CHESTPLATE).setWeight(10)).add(LootItem.lootTableItem(Items.DIAMOND_HOE).setWeight(15)).add(LootItem.lootTableItem(Items.DIAMOND_CHESTPLATE).setWeight(5)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BOOK).setWeight(10)).apply((LootItemFunction.Builder)EnchantRandomlyFunction.randomApplicableEnchantment()))).withPool(LootPool.lootPool().setRolls(RandomValueBounds.between(1.0f, 4.0f)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.IRON_INGOT).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GOLD_INGOT).setWeight(5)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(LootItem.lootTableItem(Items.BREAD).setWeight(20)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.WHEAT).setWeight(20)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(LootItem.lootTableItem(Items.BUCKET).setWeight(10)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.REDSTONE).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.COAL).setWeight(15)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.MELON_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.PUMPKIN_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BEETROOT_SEEDS).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(2.0f, 4.0f))))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(3)).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.BONE).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.GUNPOWDER).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.ROTTEN_FLESH).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f)))).add(((LootPoolSingletonContainer.Builder<LootPoolEntryContainer.Builder<?>>)LootItem.lootTableItem(Items.STRING).setWeight(10)).apply((LootItemFunction.Builder)SetItemCountFunction.setCount(RandomValueBounds.between(1.0f, 8.0f))))));
+        // 
+        // This method could not be decompiled.
+        // 
+        // Original Bytecode:
+        // 
+        //     1: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.ABANDONED_MINESHAFT:Lnet/minecraft/resources/ResourceLocation;
+        //     4: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //     7: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    10: iconst_1       
+        //    11: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //    14: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    17: getstatic       net/minecraft/world/item/Items.GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        //    20: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    23: bipush          20
+        //    25: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    28: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    31: getstatic       net/minecraft/world/item/Items.ENCHANTED_GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        //    34: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    37: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    40: getstatic       net/minecraft/world/item/Items.NAME_TAG:Lnet/minecraft/world/item/Item;
+        //    43: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    46: bipush          30
+        //    48: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    51: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    54: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //    57: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    60: bipush          10
+        //    62: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    65: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //    68: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    71: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    74: getstatic       net/minecraft/world/item/Items.IRON_PICKAXE:Lnet/minecraft/world/item/Item;
+        //    77: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    80: iconst_5       
+        //    81: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    84: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    87: invokestatic    net/minecraft/world/level/storage/loot/entries/EmptyLootItem.emptyItem:()Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    90: iconst_5       
+        //    91: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    94: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    97: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   100: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   103: fconst_2       
+        //   104: ldc             4.0
+        //   106: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   109: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   112: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //   115: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   118: bipush          10
+        //   120: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   123: fconst_1       
+        //   124: ldc             5.0
+        //   126: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   129: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   132: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   135: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   138: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //   141: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   144: iconst_5       
+        //   145: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   148: fconst_1       
+        //   149: ldc             3.0
+        //   151: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   154: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   157: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   160: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   163: getstatic       net/minecraft/world/item/Items.REDSTONE:Lnet/minecraft/world/item/Item;
+        //   166: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   169: iconst_5       
+        //   170: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   173: ldc             4.0
+        //   175: ldc             9.0
+        //   177: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   180: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   183: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   186: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   189: getstatic       net/minecraft/world/item/Items.LAPIS_LAZULI:Lnet/minecraft/world/item/Item;
+        //   192: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   195: iconst_5       
+        //   196: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   199: ldc             4.0
+        //   201: ldc             9.0
+        //   203: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   206: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   209: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   212: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   215: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //   218: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   221: iconst_3       
+        //   222: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   225: fconst_1       
+        //   226: fconst_2       
+        //   227: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   230: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   233: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   236: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   239: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //   242: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   245: bipush          10
+        //   247: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   250: ldc             3.0
+        //   252: ldc             8.0
+        //   254: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   257: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   260: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   263: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   266: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //   269: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   272: bipush          15
+        //   274: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   277: fconst_1       
+        //   278: ldc             3.0
+        //   280: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   283: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   286: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   289: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   292: getstatic       net/minecraft/world/item/Items.MELON_SEEDS:Lnet/minecraft/world/item/Item;
+        //   295: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   298: bipush          10
+        //   300: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   303: fconst_2       
+        //   304: ldc             4.0
+        //   306: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   309: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   312: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   315: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   318: getstatic       net/minecraft/world/item/Items.PUMPKIN_SEEDS:Lnet/minecraft/world/item/Item;
+        //   321: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   324: bipush          10
+        //   326: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   329: fconst_2       
+        //   330: ldc             4.0
+        //   332: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   335: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   338: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   341: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   344: getstatic       net/minecraft/world/item/Items.BEETROOT_SEEDS:Lnet/minecraft/world/item/Item;
+        //   347: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   350: bipush          10
+        //   352: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   355: fconst_2       
+        //   356: ldc             4.0
+        //   358: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   361: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   364: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   367: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   370: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   373: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   376: iconst_3       
+        //   377: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   380: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   383: getstatic       net/minecraft/world/level/block/Blocks.RAIL:Lnet/minecraft/world/level/block/Block;
+        //   386: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   389: bipush          20
+        //   391: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   394: ldc             4.0
+        //   396: ldc             8.0
+        //   398: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   401: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   404: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   407: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   410: getstatic       net/minecraft/world/level/block/Blocks.POWERED_RAIL:Lnet/minecraft/world/level/block/Block;
+        //   413: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   416: iconst_5       
+        //   417: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   420: fconst_1       
+        //   421: ldc             4.0
+        //   423: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   426: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   429: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   432: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   435: getstatic       net/minecraft/world/level/block/Blocks.DETECTOR_RAIL:Lnet/minecraft/world/level/block/Block;
+        //   438: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   441: iconst_5       
+        //   442: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   445: fconst_1       
+        //   446: ldc             4.0
+        //   448: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   451: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   454: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   457: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   460: getstatic       net/minecraft/world/level/block/Blocks.ACTIVATOR_RAIL:Lnet/minecraft/world/level/block/Block;
+        //   463: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   466: iconst_5       
+        //   467: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   470: fconst_1       
+        //   471: ldc             4.0
+        //   473: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   476: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   479: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   482: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   485: getstatic       net/minecraft/world/level/block/Blocks.TORCH:Lnet/minecraft/world/level/block/Block;
+        //   488: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   491: bipush          15
+        //   493: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   496: fconst_1       
+        //   497: ldc             16.0
+        //   499: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   502: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   505: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   508: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   511: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   514: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //   519: aload_1         /* biConsumer */
+        //   520: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.BASTION_BRIDGE:Lnet/minecraft/resources/ResourceLocation;
+        //   523: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   526: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   529: iconst_1       
+        //   530: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   533: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   536: getstatic       net/minecraft/world/level/block/Blocks.LODESTONE:Lnet/minecraft/world/level/block/Block;
+        //   539: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   542: iconst_1       
+        //   543: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   546: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   549: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   552: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   555: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   558: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   561: fconst_1       
+        //   562: fconst_2       
+        //   563: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   566: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   569: getstatic       net/minecraft/world/item/Items.CROSSBOW:Lnet/minecraft/world/item/Item;
+        //   572: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   575: ldc             0.1
+        //   577: ldc             0.5
+        //   579: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   582: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   585: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   588: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   591: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   594: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   597: getstatic       net/minecraft/world/item/Items.SPECTRAL_ARROW:Lnet/minecraft/world/item/Item;
+        //   600: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   603: fconst_2       
+        //   604: ldc             12.0
+        //   606: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   609: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   612: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   615: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   618: getstatic       net/minecraft/world/level/block/Blocks.GILDED_BLACKSTONE:Lnet/minecraft/world/level/block/Block;
+        //   621: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   624: ldc             5.0
+        //   626: ldc             8.0
+        //   628: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   631: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   634: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   637: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   640: getstatic       net/minecraft/world/level/block/Blocks.CRYING_OBSIDIAN:Lnet/minecraft/world/level/block/Block;
+        //   643: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   646: ldc             3.0
+        //   648: ldc             8.0
+        //   650: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   653: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   656: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   659: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   662: getstatic       net/minecraft/world/level/block/Blocks.GOLD_BLOCK:Lnet/minecraft/world/level/block/Block;
+        //   665: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   668: iconst_1       
+        //   669: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   672: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   675: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   678: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   681: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //   684: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   687: fconst_2       
+        //   688: ldc             8.0
+        //   690: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   693: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   696: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   699: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   702: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //   705: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   708: fconst_2       
+        //   709: ldc             8.0
+        //   711: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   714: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   717: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   720: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   723: getstatic       net/minecraft/world/item/Items.GOLDEN_SWORD:Lnet/minecraft/world/item/Item;
+        //   726: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   729: iconst_1       
+        //   730: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   733: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   736: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   739: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   742: getstatic       net/minecraft/world/item/Items.GOLDEN_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //   745: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   748: iconst_1       
+        //   749: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   752: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   755: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   758: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   761: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   764: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   767: getstatic       net/minecraft/world/item/Items.GOLDEN_HELMET:Lnet/minecraft/world/item/Item;
+        //   770: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   773: iconst_1       
+        //   774: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   777: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   780: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   783: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   786: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   789: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   792: getstatic       net/minecraft/world/item/Items.GOLDEN_LEGGINGS:Lnet/minecraft/world/item/Item;
+        //   795: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   798: iconst_1       
+        //   799: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   802: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   805: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   808: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   811: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   814: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   817: getstatic       net/minecraft/world/item/Items.GOLDEN_BOOTS:Lnet/minecraft/world/item/Item;
+        //   820: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   823: iconst_1       
+        //   824: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   827: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   830: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   833: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   836: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   839: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   842: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   845: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   848: fconst_2       
+        //   849: ldc             4.0
+        //   851: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   854: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   857: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
+        //   860: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   863: fconst_1       
+        //   864: ldc_w           6.0
+        //   867: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   870: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   873: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   876: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   879: getstatic       net/minecraft/world/item/Items.LEATHER:Lnet/minecraft/world/item/Item;
+        //   882: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   885: fconst_1       
+        //   886: ldc             3.0
+        //   888: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   891: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   894: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   897: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   900: getstatic       net/minecraft/world/item/Items.ARROW:Lnet/minecraft/world/item/Item;
+        //   903: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   906: ldc             5.0
+        //   908: ldc_w           17.0
+        //   911: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   914: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   917: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   920: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   923: getstatic       net/minecraft/world/item/Items.IRON_NUGGET:Lnet/minecraft/world/item/Item;
+        //   926: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   929: fconst_2       
+        //   930: ldc_w           6.0
+        //   933: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   936: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   939: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   942: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   945: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
+        //   948: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   951: fconst_2       
+        //   952: ldc_w           6.0
+        //   955: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   958: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   961: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   964: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   967: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   970: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //   975: aload_1         /* biConsumer */
+        //   976: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.BASTION_HOGLIN_STABLE:Lnet/minecraft/resources/ResourceLocation;
+        //   979: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   982: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   985: iconst_1       
+        //   986: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   989: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   992: getstatic       net/minecraft/world/item/Items.DIAMOND_SHOVEL:Lnet/minecraft/world/item/Item;
+        //   995: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   998: iconst_5       
+        //   999: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1002: ldc_w           0.15
+        //  1005: ldc_w           0.45
+        //  1008: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1011: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1014: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1017: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1020: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1023: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1026: getstatic       net/minecraft/world/item/Items.NETHERITE_SCRAP:Lnet/minecraft/world/item/Item;
+        //  1029: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1032: iconst_2       
+        //  1033: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1036: iconst_1       
+        //  1037: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1040: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1043: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1046: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1049: getstatic       net/minecraft/world/item/Items.ANCIENT_DEBRIS:Lnet/minecraft/world/item/Item;
+        //  1052: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1055: iconst_3       
+        //  1056: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1059: iconst_1       
+        //  1060: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1063: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1066: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1069: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1072: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        //  1075: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1078: bipush          10
+        //  1080: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1083: iconst_1       
+        //  1084: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1087: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1090: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1093: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1096: getstatic       net/minecraft/world/level/block/Blocks.GOLD_BLOCK:Lnet/minecraft/world/level/block/Block;
+        //  1099: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1102: bipush          25
+        //  1104: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1107: fconst_2       
+        //  1108: ldc             4.0
+        //  1110: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1113: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1116: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1119: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1122: getstatic       net/minecraft/world/item/Items.GOLDEN_HOE:Lnet/minecraft/world/item/Item;
+        //  1125: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1128: bipush          15
+        //  1130: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1133: iconst_1       
+        //  1134: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1137: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1140: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1143: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1146: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1149: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1152: invokestatic    net/minecraft/world/level/storage/loot/entries/EmptyLootItem.emptyItem:()Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1155: bipush          45
+        //  1157: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1160: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1163: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  1166: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1169: ldc             3.0
+        //  1171: ldc             4.0
+        //  1173: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1176: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1179: getstatic       net/minecraft/world/level/block/Blocks.GLOWSTONE:Lnet/minecraft/world/level/block/Block;
+        //  1182: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1185: fconst_1       
+        //  1186: ldc             5.0
+        //  1188: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1191: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1194: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1197: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1200: getstatic       net/minecraft/world/level/block/Blocks.GILDED_BLACKSTONE:Lnet/minecraft/world/level/block/Block;
+        //  1203: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1206: fconst_1       
+        //  1207: ldc             5.0
+        //  1209: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1212: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1215: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1218: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1221: getstatic       net/minecraft/world/level/block/Blocks.SOUL_SAND:Lnet/minecraft/world/level/block/Block;
+        //  1224: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1227: fconst_2       
+        //  1228: ldc_w           7.0
+        //  1231: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1234: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1237: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1240: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1243: getstatic       net/minecraft/world/level/block/Blocks.CRIMSON_NYLIUM:Lnet/minecraft/world/level/block/Block;
+        //  1246: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1249: fconst_2       
+        //  1250: ldc_w           7.0
+        //  1253: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1256: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1259: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1262: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1265: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
+        //  1268: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1271: fconst_2       
+        //  1272: ldc             8.0
+        //  1274: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1277: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1280: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1283: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1286: getstatic       net/minecraft/world/item/Items.LEATHER:Lnet/minecraft/world/item/Item;
+        //  1289: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1292: fconst_1       
+        //  1293: ldc             3.0
+        //  1295: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1298: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1301: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1304: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1307: getstatic       net/minecraft/world/item/Items.ARROW:Lnet/minecraft/world/item/Item;
+        //  1310: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1313: ldc             5.0
+        //  1315: ldc_w           17.0
+        //  1318: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1321: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1324: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1327: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1330: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
+        //  1333: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1336: ldc             3.0
+        //  1338: ldc             8.0
+        //  1340: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1343: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1346: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1349: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1352: getstatic       net/minecraft/world/item/Items.PORKCHOP:Lnet/minecraft/world/item/Item;
+        //  1355: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1358: fconst_2       
+        //  1359: ldc             5.0
+        //  1361: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1364: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1367: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1370: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1373: getstatic       net/minecraft/world/item/Items.COOKED_PORKCHOP:Lnet/minecraft/world/item/Item;
+        //  1376: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1379: fconst_2       
+        //  1380: ldc             5.0
+        //  1382: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1385: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1388: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1391: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1394: getstatic       net/minecraft/world/level/block/Blocks.CRIMSON_FUNGUS:Lnet/minecraft/world/level/block/Block;
+        //  1397: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1400: fconst_2       
+        //  1401: ldc_w           7.0
+        //  1404: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1407: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1410: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1413: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1416: getstatic       net/minecraft/world/level/block/Blocks.CRIMSON_ROOTS:Lnet/minecraft/world/level/block/Block;
+        //  1419: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1422: fconst_2       
+        //  1423: ldc_w           7.0
+        //  1426: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1429: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1432: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1435: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1438: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  1441: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  1446: aload_1         /* biConsumer */
+        //  1447: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.BASTION_OTHER:Lnet/minecraft/resources/ResourceLocation;
+        //  1450: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  1453: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1456: iconst_1       
+        //  1457: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1460: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1463: getstatic       net/minecraft/world/item/Items.CROSSBOW:Lnet/minecraft/world/item/Item;
+        //  1466: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1469: bipush          12
+        //  1471: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1474: ldc             0.1
+        //  1476: ldc             0.5
+        //  1478: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1481: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1484: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1487: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1490: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1493: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1496: getstatic       net/minecraft/world/item/Items.ANCIENT_DEBRIS:Lnet/minecraft/world/item/Item;
+        //  1499: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1502: iconst_2       
+        //  1503: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1506: iconst_1       
+        //  1507: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1510: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1513: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1516: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1519: getstatic       net/minecraft/world/item/Items.NETHERITE_SCRAP:Lnet/minecraft/world/item/Item;
+        //  1522: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1525: iconst_2       
+        //  1526: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1529: iconst_1       
+        //  1530: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1533: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1536: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1539: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1542: getstatic       net/minecraft/world/item/Items.SPECTRAL_ARROW:Lnet/minecraft/world/item/Item;
+        //  1545: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1548: bipush          16
+        //  1550: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1553: fconst_2       
+        //  1554: ldc_w           15.0
+        //  1557: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1560: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1563: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1566: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1569: getstatic       net/minecraft/world/item/Items.PIGLIN_BANNER_PATTERN:Lnet/minecraft/world/item/Item;
+        //  1572: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1575: iconst_5       
+        //  1576: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1579: iconst_1       
+        //  1580: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1583: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1586: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1589: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1592: getstatic       net/minecraft/world/item/Items.MUSIC_DISC_PIGSTEP:Lnet/minecraft/world/item/Item;
+        //  1595: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1598: iconst_3       
+        //  1599: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1602: iconst_1       
+        //  1603: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1606: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1609: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1612: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1615: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  1618: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1621: bipush          10
+        //  1623: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1626: new             Lnet/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder;
+        //  1629: dup            
+        //  1630: invokespecial   net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder.<init>:()V
+        //  1633: getstatic       net/minecraft/world/item/enchantment/Enchantments.SOUL_SPEED:Lnet/minecraft/world/item/enchantment/Enchantment;
+        //  1636: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder.withEnchantment:(Lnet/minecraft/world/item/enchantment/Enchantment;)Lnet/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder;
+        //  1639: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1642: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1645: invokestatic    net/minecraft/world/level/storage/loot/entries/EmptyLootItem.emptyItem:()Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1648: bipush          50
+        //  1650: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1653: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1656: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  1659: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1662: iconst_2       
+        //  1663: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1666: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1669: getstatic       net/minecraft/world/item/Items.GOLDEN_BOOTS:Lnet/minecraft/world/item/Item;
+        //  1672: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1675: iconst_1       
+        //  1676: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1679: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1682: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1685: new             Lnet/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder;
+        //  1688: dup            
+        //  1689: invokespecial   net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder.<init>:()V
+        //  1692: getstatic       net/minecraft/world/item/enchantment/Enchantments.SOUL_SPEED:Lnet/minecraft/world/item/enchantment/Enchantment;
+        //  1695: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder.withEnchantment:(Lnet/minecraft/world/item/enchantment/Enchantment;)Lnet/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder;
+        //  1698: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1701: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1704: getstatic       net/minecraft/world/level/block/Blocks.GOLD_BLOCK:Lnet/minecraft/world/level/block/Block;
+        //  1707: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1710: iconst_1       
+        //  1711: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1714: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1717: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1720: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1723: getstatic       net/minecraft/world/item/Items.CROSSBOW:Lnet/minecraft/world/item/Item;
+        //  1726: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1729: iconst_1       
+        //  1730: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1733: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1736: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1739: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1742: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  1745: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1748: fconst_1       
+        //  1749: ldc_w           6.0
+        //  1752: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1755: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1758: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1761: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1764: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  1767: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1770: fconst_1       
+        //  1771: ldc_w           6.0
+        //  1774: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1777: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1780: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1783: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1786: getstatic       net/minecraft/world/item/Items.GOLDEN_SWORD:Lnet/minecraft/world/item/Item;
+        //  1789: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1792: iconst_1       
+        //  1793: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1796: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1799: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1802: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1805: getstatic       net/minecraft/world/item/Items.GOLDEN_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  1808: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1811: iconst_1       
+        //  1812: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1815: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1818: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1821: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1824: getstatic       net/minecraft/world/item/Items.GOLDEN_HELMET:Lnet/minecraft/world/item/Item;
+        //  1827: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1830: iconst_1       
+        //  1831: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1834: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1837: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1840: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1843: getstatic       net/minecraft/world/item/Items.GOLDEN_LEGGINGS:Lnet/minecraft/world/item/Item;
+        //  1846: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1849: iconst_1       
+        //  1850: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1853: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1856: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1859: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1862: getstatic       net/minecraft/world/item/Items.GOLDEN_BOOTS:Lnet/minecraft/world/item/Item;
+        //  1865: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1868: iconst_1       
+        //  1869: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  1872: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1875: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1878: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1881: invokestatic    net/minecraft/world/level/storage/loot/entries/EmptyLootItem.emptyItem:()Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1884: iconst_2       
+        //  1885: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1888: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1891: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  1894: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1897: ldc             3.0
+        //  1899: ldc             5.0
+        //  1901: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1904: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1907: getstatic       net/minecraft/world/level/block/Blocks.CRYING_OBSIDIAN:Lnet/minecraft/world/level/block/Block;
+        //  1910: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1913: fconst_1       
+        //  1914: ldc             5.0
+        //  1916: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1919: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1922: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1925: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1928: getstatic       net/minecraft/world/level/block/Blocks.GILDED_BLACKSTONE:Lnet/minecraft/world/level/block/Block;
+        //  1931: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1934: fconst_1       
+        //  1935: ldc             5.0
+        //  1937: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1940: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1943: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1946: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1949: getstatic       net/minecraft/world/level/block/Blocks.CHAIN:Lnet/minecraft/world/level/block/Block;
+        //  1952: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1955: fconst_2       
+        //  1956: ldc_w           10.0
+        //  1959: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1962: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1965: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1968: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1971: getstatic       net/minecraft/world/item/Items.MAGMA_CREAM:Lnet/minecraft/world/item/Item;
+        //  1974: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1977: fconst_2       
+        //  1978: ldc_w           6.0
+        //  1981: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  1984: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  1987: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1990: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  1993: getstatic       net/minecraft/world/level/block/Blocks.BONE_BLOCK:Lnet/minecraft/world/level/block/Block;
+        //  1996: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  1999: ldc             3.0
+        //  2001: ldc_w           6.0
+        //  2004: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2007: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2010: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2013: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2016: getstatic       net/minecraft/world/item/Items.IRON_NUGGET:Lnet/minecraft/world/item/Item;
+        //  2019: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2022: fconst_2       
+        //  2023: ldc             8.0
+        //  2025: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2028: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2031: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2034: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2037: getstatic       net/minecraft/world/level/block/Blocks.OBSIDIAN:Lnet/minecraft/world/level/block/Block;
+        //  2040: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2043: ldc             4.0
+        //  2045: ldc_w           6.0
+        //  2048: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2051: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2054: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2057: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2060: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
+        //  2063: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2066: fconst_2       
+        //  2067: ldc             8.0
+        //  2069: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2072: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2075: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2078: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2081: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
+        //  2084: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2087: ldc             4.0
+        //  2089: ldc_w           6.0
+        //  2092: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2095: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2098: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2101: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2104: getstatic       net/minecraft/world/item/Items.ARROW:Lnet/minecraft/world/item/Item;
+        //  2107: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2110: iconst_2       
+        //  2111: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2114: ldc             5.0
+        //  2116: ldc_w           17.0
+        //  2119: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2122: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2125: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2128: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2131: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  2134: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  2139: aload_1         /* biConsumer */
+        //  2140: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.BASTION_TREASURE:Lnet/minecraft/resources/ResourceLocation;
+        //  2143: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  2146: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2149: fconst_1       
+        //  2150: fconst_2       
+        //  2151: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2154: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2157: getstatic       net/minecraft/world/item/Items.NETHERITE_INGOT:Lnet/minecraft/world/item/Item;
+        //  2160: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2163: bipush          10
+        //  2165: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2168: iconst_1       
+        //  2169: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  2172: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2175: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2178: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2181: getstatic       net/minecraft/world/level/block/Blocks.ANCIENT_DEBRIS:Lnet/minecraft/world/level/block/Block;
+        //  2184: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2187: bipush          14
+        //  2189: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2192: iconst_1       
+        //  2193: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  2196: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2199: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2202: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2205: getstatic       net/minecraft/world/item/Items.NETHERITE_SCRAP:Lnet/minecraft/world/item/Item;
+        //  2208: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2211: bipush          10
+        //  2213: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2216: iconst_1       
+        //  2217: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  2220: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2223: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2226: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2229: getstatic       net/minecraft/world/level/block/Blocks.ANCIENT_DEBRIS:Lnet/minecraft/world/level/block/Block;
+        //  2232: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2235: iconst_1       
+        //  2236: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2239: iconst_2       
+        //  2240: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  2243: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2246: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2249: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2252: getstatic       net/minecraft/world/item/Items.DIAMOND_SWORD:Lnet/minecraft/world/item/Item;
+        //  2255: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2258: bipush          10
+        //  2260: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2263: ldc_w           0.2
+        //  2266: ldc_w           0.65
+        //  2269: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2272: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2275: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2278: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2281: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2284: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2287: getstatic       net/minecraft/world/item/Items.DIAMOND_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  2290: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2293: bipush          6
+        //  2295: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2298: ldc_w           0.2
+        //  2301: ldc_w           0.65
+        //  2304: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2307: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2310: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2313: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2316: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2319: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2322: getstatic       net/minecraft/world/item/Items.DIAMOND_HELMET:Lnet/minecraft/world/item/Item;
+        //  2325: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2328: bipush          6
+        //  2330: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2333: ldc_w           0.2
+        //  2336: ldc_w           0.65
+        //  2339: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2342: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2345: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2348: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2351: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2354: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2357: getstatic       net/minecraft/world/item/Items.DIAMOND_LEGGINGS:Lnet/minecraft/world/item/Item;
+        //  2360: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2363: bipush          6
+        //  2365: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2368: ldc_w           0.2
+        //  2371: ldc_w           0.65
+        //  2374: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2377: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2380: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2383: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2386: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2389: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2392: getstatic       net/minecraft/world/item/Items.DIAMOND_BOOTS:Lnet/minecraft/world/item/Item;
+        //  2395: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2398: bipush          6
+        //  2400: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2403: ldc_w           0.2
+        //  2406: ldc_w           0.65
+        //  2409: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2412: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2415: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2418: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2421: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2424: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2427: getstatic       net/minecraft/world/item/Items.DIAMOND_SWORD:Lnet/minecraft/world/item/Item;
+        //  2430: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2433: bipush          6
+        //  2435: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2438: ldc_w           0.2
+        //  2441: ldc_w           0.65
+        //  2444: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2447: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2450: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2453: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2456: getstatic       net/minecraft/world/item/Items.DIAMOND_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  2459: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2462: iconst_5       
+        //  2463: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2466: ldc_w           0.2
+        //  2469: ldc_w           0.65
+        //  2472: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2475: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2478: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2481: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2484: getstatic       net/minecraft/world/item/Items.DIAMOND_HELMET:Lnet/minecraft/world/item/Item;
+        //  2487: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2490: iconst_5       
+        //  2491: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2494: ldc_w           0.2
+        //  2497: ldc_w           0.65
+        //  2500: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2503: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2506: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2509: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2512: getstatic       net/minecraft/world/item/Items.DIAMOND_BOOTS:Lnet/minecraft/world/item/Item;
+        //  2515: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2518: iconst_5       
+        //  2519: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2522: ldc_w           0.2
+        //  2525: ldc_w           0.65
+        //  2528: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2531: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2534: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2537: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2540: getstatic       net/minecraft/world/item/Items.DIAMOND_LEGGINGS:Lnet/minecraft/world/item/Item;
+        //  2543: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2546: iconst_5       
+        //  2547: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2550: ldc_w           0.2
+        //  2553: ldc_w           0.65
+        //  2556: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2559: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2562: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2565: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2568: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //  2571: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2574: iconst_5       
+        //  2575: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2578: fconst_1       
+        //  2579: ldc             3.0
+        //  2581: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2584: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2587: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2590: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2593: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  2596: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2599: fconst_2       
+        //  2600: ldc             4.0
+        //  2602: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2605: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2608: getstatic       net/minecraft/world/item/Items.SPECTRAL_ARROW:Lnet/minecraft/world/item/Item;
+        //  2611: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2614: ldc             5.0
+        //  2616: ldc_w           21.0
+        //  2619: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2622: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2625: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2628: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2631: getstatic       net/minecraft/world/level/block/Blocks.GOLD_BLOCK:Lnet/minecraft/world/level/block/Block;
+        //  2634: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2637: fconst_2       
+        //  2638: ldc             5.0
+        //  2640: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2643: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2646: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2649: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2652: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  2655: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2658: ldc             3.0
+        //  2660: ldc             9.0
+        //  2662: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2665: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2668: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2671: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2674: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  2677: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2680: ldc             3.0
+        //  2682: ldc             9.0
+        //  2684: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2687: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2690: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2693: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2696: getstatic       net/minecraft/world/level/block/Blocks.CRYING_OBSIDIAN:Lnet/minecraft/world/level/block/Block;
+        //  2699: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2702: fconst_1       
+        //  2703: ldc             5.0
+        //  2705: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2708: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2711: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2714: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2717: getstatic       net/minecraft/world/item/Items.QUARTZ:Lnet/minecraft/world/item/Item;
+        //  2720: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2723: ldc             8.0
+        //  2725: ldc_w           23.0
+        //  2728: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2731: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2734: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2737: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2740: getstatic       net/minecraft/world/level/block/Blocks.GILDED_BLACKSTONE:Lnet/minecraft/world/level/block/Block;
+        //  2743: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2746: fconst_1       
+        //  2747: ldc             5.0
+        //  2749: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2752: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2755: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2758: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2761: getstatic       net/minecraft/world/item/Items.MAGMA_CREAM:Lnet/minecraft/world/item/Item;
+        //  2764: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2767: fconst_2       
+        //  2768: ldc             8.0
+        //  2770: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2773: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2776: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2779: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2782: getstatic       net/minecraft/world/item/Items.IRON_NUGGET:Lnet/minecraft/world/item/Item;
+        //  2785: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2788: ldc             8.0
+        //  2790: ldc             16.0
+        //  2792: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2795: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2798: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2801: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2804: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  2807: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  2812: aload_1         /* biConsumer */
+        //  2813: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.BURIED_TREASURE:Lnet/minecraft/resources/ResourceLocation;
+        //  2816: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  2819: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2822: iconst_1       
+        //  2823: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  2826: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2829: getstatic       net/minecraft/world/item/Items.HEART_OF_THE_SEA:Lnet/minecraft/world/item/Item;
+        //  2832: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2835: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2838: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  2841: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2844: ldc             5.0
+        //  2846: ldc             8.0
+        //  2848: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2851: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2854: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  2857: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2860: bipush          20
+        //  2862: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2865: fconst_1       
+        //  2866: ldc             4.0
+        //  2868: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2871: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2874: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2877: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2880: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  2883: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2886: bipush          10
+        //  2888: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2891: fconst_1       
+        //  2892: ldc             4.0
+        //  2894: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2897: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2900: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2903: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2906: getstatic       net/minecraft/world/level/block/Blocks.TNT:Lnet/minecraft/world/level/block/Block;
+        //  2909: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2912: iconst_5       
+        //  2913: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2916: fconst_1       
+        //  2917: fconst_2       
+        //  2918: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2921: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2924: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2927: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2930: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  2933: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2936: fconst_1       
+        //  2937: ldc             3.0
+        //  2939: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2942: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2945: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  2948: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2951: iconst_5       
+        //  2952: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2955: ldc             4.0
+        //  2957: ldc             8.0
+        //  2959: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2962: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2965: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2968: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2971: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //  2974: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2977: iconst_5       
+        //  2978: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2981: fconst_1       
+        //  2982: fconst_2       
+        //  2983: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  2986: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  2989: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  2992: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  2995: getstatic       net/minecraft/world/item/Items.PRISMARINE_CRYSTALS:Lnet/minecraft/world/item/Item;
+        //  2998: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3001: iconst_5       
+        //  3002: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3005: fconst_1       
+        //  3006: ldc             5.0
+        //  3008: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3011: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3014: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3017: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3020: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3023: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3026: fconst_0       
+        //  3027: fconst_1       
+        //  3028: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3031: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3034: getstatic       net/minecraft/world/item/Items.LEATHER_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  3037: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3040: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3043: getstatic       net/minecraft/world/item/Items.IRON_SWORD:Lnet/minecraft/world/item/Item;
+        //  3046: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3049: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3052: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3055: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3058: iconst_2       
+        //  3059: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  3062: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3065: getstatic       net/minecraft/world/item/Items.COOKED_COD:Lnet/minecraft/world/item/Item;
+        //  3068: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3071: fconst_2       
+        //  3072: ldc             4.0
+        //  3074: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3077: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3080: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3083: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3086: getstatic       net/minecraft/world/item/Items.COOKED_SALMON:Lnet/minecraft/world/item/Item;
+        //  3089: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3092: fconst_2       
+        //  3093: ldc             4.0
+        //  3095: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3098: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3101: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3104: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3107: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3110: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  3115: aload_1         /* biConsumer */
+        //  3116: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.DESERT_PYRAMID:Lnet/minecraft/resources/ResourceLocation;
+        //  3119: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3122: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3125: fconst_2       
+        //  3126: ldc             4.0
+        //  3128: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3131: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3134: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //  3137: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3140: iconst_5       
+        //  3141: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3144: fconst_1       
+        //  3145: ldc             3.0
+        //  3147: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3150: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3153: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3156: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3159: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  3162: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3165: bipush          15
+        //  3167: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3170: fconst_1       
+        //  3171: ldc             5.0
+        //  3173: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3176: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3179: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3182: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3185: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  3188: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3191: bipush          15
+        //  3193: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3196: fconst_2       
+        //  3197: ldc_w           7.0
+        //  3200: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3203: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3206: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3209: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3212: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  3215: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3218: bipush          15
+        //  3220: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3223: fconst_1       
+        //  3224: ldc             3.0
+        //  3226: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3229: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3232: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3235: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3238: getstatic       net/minecraft/world/item/Items.BONE:Lnet/minecraft/world/item/Item;
+        //  3241: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3244: bipush          25
+        //  3246: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3249: ldc             4.0
+        //  3251: ldc_w           6.0
+        //  3254: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3257: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3260: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3263: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3266: getstatic       net/minecraft/world/item/Items.SPIDER_EYE:Lnet/minecraft/world/item/Item;
+        //  3269: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3272: bipush          25
+        //  3274: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3277: fconst_1       
+        //  3278: ldc             3.0
+        //  3280: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3283: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3286: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3289: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3292: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  3295: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3298: bipush          25
+        //  3300: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3303: ldc             3.0
+        //  3305: ldc_w           7.0
+        //  3308: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3311: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3314: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3317: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3320: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        //  3323: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3326: bipush          20
+        //  3328: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3331: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3334: getstatic       net/minecraft/world/item/Items.IRON_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  3337: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3340: bipush          15
+        //  3342: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3345: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3348: getstatic       net/minecraft/world/item/Items.GOLDEN_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  3351: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3354: bipush          10
+        //  3356: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3359: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3362: getstatic       net/minecraft/world/item/Items.DIAMOND_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  3365: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3368: iconst_5       
+        //  3369: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3372: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3375: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  3378: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3381: bipush          20
+        //  3383: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3386: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3389: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3392: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3395: getstatic       net/minecraft/world/item/Items.GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        //  3398: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3401: bipush          20
+        //  3403: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3406: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3409: getstatic       net/minecraft/world/item/Items.ENCHANTED_GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        //  3412: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3415: iconst_2       
+        //  3416: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3419: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3422: invokestatic    net/minecraft/world/level/storage/loot/entries/EmptyLootItem.emptyItem:()Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3425: bipush          15
+        //  3427: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3430: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3433: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3436: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3439: iconst_4       
+        //  3440: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  3443: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3446: getstatic       net/minecraft/world/item/Items.BONE:Lnet/minecraft/world/item/Item;
+        //  3449: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3452: bipush          10
+        //  3454: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3457: fconst_1       
+        //  3458: ldc             8.0
+        //  3460: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3463: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3466: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3469: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3472: getstatic       net/minecraft/world/item/Items.GUNPOWDER:Lnet/minecraft/world/item/Item;
+        //  3475: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3478: bipush          10
+        //  3480: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3483: fconst_1       
+        //  3484: ldc             8.0
+        //  3486: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3489: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3492: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3495: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3498: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  3501: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3504: bipush          10
+        //  3506: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3509: fconst_1       
+        //  3510: ldc             8.0
+        //  3512: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3515: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3518: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3521: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3524: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
+        //  3527: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3530: bipush          10
+        //  3532: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3535: fconst_1       
+        //  3536: ldc             8.0
+        //  3538: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3541: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3544: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3547: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3550: getstatic       net/minecraft/world/level/block/Blocks.SAND:Lnet/minecraft/world/level/block/Block;
+        //  3553: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3556: bipush          10
+        //  3558: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3561: fconst_1       
+        //  3562: ldc             8.0
+        //  3564: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3567: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3570: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3573: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3576: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3579: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  3584: aload_1         /* biConsumer */
+        //  3585: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.END_CITY_TREASURE:Lnet/minecraft/resources/ResourceLocation;
+        //  3588: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3591: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3594: fconst_2       
+        //  3595: ldc_w           6.0
+        //  3598: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3601: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3604: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //  3607: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3610: iconst_5       
+        //  3611: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3614: fconst_2       
+        //  3615: ldc_w           7.0
+        //  3618: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3621: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3624: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3627: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3630: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  3633: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3636: bipush          10
+        //  3638: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3641: ldc             4.0
+        //  3643: ldc             8.0
+        //  3645: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3648: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3651: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3654: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3657: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  3660: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3663: bipush          15
+        //  3665: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3668: fconst_2       
+        //  3669: ldc_w           7.0
+        //  3672: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3675: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3678: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3681: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3684: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  3687: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3690: iconst_2       
+        //  3691: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3694: fconst_2       
+        //  3695: ldc_w           6.0
+        //  3698: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3701: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3704: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3707: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3710: getstatic       net/minecraft/world/item/Items.BEETROOT_SEEDS:Lnet/minecraft/world/item/Item;
+        //  3713: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3716: iconst_5       
+        //  3717: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3720: fconst_1       
+        //  3721: ldc_w           10.0
+        //  3724: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3727: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3730: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3733: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3736: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        //  3739: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3742: iconst_3       
+        //  3743: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3746: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3749: getstatic       net/minecraft/world/item/Items.IRON_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  3752: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3755: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3758: getstatic       net/minecraft/world/item/Items.GOLDEN_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  3761: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3764: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3767: getstatic       net/minecraft/world/item/Items.DIAMOND_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  3770: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3773: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3776: getstatic       net/minecraft/world/item/Items.DIAMOND_SWORD:Lnet/minecraft/world/item/Item;
+        //  3779: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3782: iconst_3       
+        //  3783: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3786: ldc_w           20.0
+        //  3789: ldc_w           39.0
+        //  3792: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3795: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3798: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3801: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3804: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3807: getstatic       net/minecraft/world/item/Items.DIAMOND_BOOTS:Lnet/minecraft/world/item/Item;
+        //  3810: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3813: iconst_3       
+        //  3814: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3817: ldc_w           20.0
+        //  3820: ldc_w           39.0
+        //  3823: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3826: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3829: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3832: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3835: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3838: getstatic       net/minecraft/world/item/Items.DIAMOND_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  3841: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3844: iconst_3       
+        //  3845: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3848: ldc_w           20.0
+        //  3851: ldc_w           39.0
+        //  3854: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3857: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3860: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3863: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3866: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3869: getstatic       net/minecraft/world/item/Items.DIAMOND_LEGGINGS:Lnet/minecraft/world/item/Item;
+        //  3872: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3875: iconst_3       
+        //  3876: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3879: ldc_w           20.0
+        //  3882: ldc_w           39.0
+        //  3885: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3888: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3891: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3894: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3897: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3900: getstatic       net/minecraft/world/item/Items.DIAMOND_HELMET:Lnet/minecraft/world/item/Item;
+        //  3903: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3906: iconst_3       
+        //  3907: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3910: ldc_w           20.0
+        //  3913: ldc_w           39.0
+        //  3916: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3919: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3922: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3925: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3928: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3931: getstatic       net/minecraft/world/item/Items.DIAMOND_PICKAXE:Lnet/minecraft/world/item/Item;
+        //  3934: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3937: iconst_3       
+        //  3938: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3941: ldc_w           20.0
+        //  3944: ldc_w           39.0
+        //  3947: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3950: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3953: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3956: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3959: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3962: getstatic       net/minecraft/world/item/Items.DIAMOND_SHOVEL:Lnet/minecraft/world/item/Item;
+        //  3965: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3968: iconst_3       
+        //  3969: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3972: ldc_w           20.0
+        //  3975: ldc_w           39.0
+        //  3978: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3981: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3984: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  3987: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3990: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3993: getstatic       net/minecraft/world/item/Items.IRON_SWORD:Lnet/minecraft/world/item/Item;
+        //  3996: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3999: iconst_3       
+        //  4000: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4003: ldc_w           20.0
+        //  4006: ldc_w           39.0
+        //  4009: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4012: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4015: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4018: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4021: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4024: getstatic       net/minecraft/world/item/Items.IRON_BOOTS:Lnet/minecraft/world/item/Item;
+        //  4027: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4030: iconst_3       
+        //  4031: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4034: ldc_w           20.0
+        //  4037: ldc_w           39.0
+        //  4040: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4043: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4046: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4049: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4052: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4055: getstatic       net/minecraft/world/item/Items.IRON_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  4058: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4061: iconst_3       
+        //  4062: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4065: ldc_w           20.0
+        //  4068: ldc_w           39.0
+        //  4071: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4074: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4077: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4080: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4083: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4086: getstatic       net/minecraft/world/item/Items.IRON_LEGGINGS:Lnet/minecraft/world/item/Item;
+        //  4089: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4092: iconst_3       
+        //  4093: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4096: ldc_w           20.0
+        //  4099: ldc_w           39.0
+        //  4102: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4105: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4108: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4111: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4114: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4117: getstatic       net/minecraft/world/item/Items.IRON_HELMET:Lnet/minecraft/world/item/Item;
+        //  4120: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4123: iconst_3       
+        //  4124: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4127: ldc_w           20.0
+        //  4130: ldc_w           39.0
+        //  4133: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4136: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4139: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4142: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4145: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4148: getstatic       net/minecraft/world/item/Items.IRON_PICKAXE:Lnet/minecraft/world/item/Item;
+        //  4151: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4154: iconst_3       
+        //  4155: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4158: ldc_w           20.0
+        //  4161: ldc_w           39.0
+        //  4164: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4167: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4170: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4173: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4176: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4179: getstatic       net/minecraft/world/item/Items.IRON_SHOVEL:Lnet/minecraft/world/item/Item;
+        //  4182: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4185: iconst_3       
+        //  4186: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4189: ldc_w           20.0
+        //  4192: ldc_w           39.0
+        //  4195: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4198: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4201: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4204: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4207: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4210: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4213: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  4218: aload_1         /* biConsumer */
+        //  4219: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.IGLOO_CHEST:Lnet/minecraft/resources/ResourceLocation;
+        //  4222: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4225: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4228: fconst_2       
+        //  4229: ldc             8.0
+        //  4231: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4234: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4237: getstatic       net/minecraft/world/item/Items.APPLE:Lnet/minecraft/world/item/Item;
+        //  4240: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4243: bipush          15
+        //  4245: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4248: fconst_1       
+        //  4249: ldc             3.0
+        //  4251: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4254: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4257: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4260: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4263: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //  4266: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4269: bipush          15
+        //  4271: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4274: fconst_1       
+        //  4275: ldc             4.0
+        //  4277: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4280: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4283: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4286: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4289: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
+        //  4292: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4295: bipush          10
+        //  4297: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4300: fconst_1       
+        //  4301: ldc             3.0
+        //  4303: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4306: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4309: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4312: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4315: getstatic       net/minecraft/world/item/Items.STONE_AXE:Lnet/minecraft/world/item/Item;
+        //  4318: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4321: iconst_2       
+        //  4322: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4325: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4328: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  4331: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4334: bipush          10
+        //  4336: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4339: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4342: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  4345: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4348: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4351: getstatic       net/minecraft/world/item/Items.WHEAT:Lnet/minecraft/world/item/Item;
+        //  4354: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4357: bipush          10
+        //  4359: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4362: fconst_2       
+        //  4363: ldc             3.0
+        //  4365: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4368: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4371: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4374: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4377: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4380: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4383: iconst_1       
+        //  4384: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4387: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4390: getstatic       net/minecraft/world/item/Items.GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        //  4393: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4396: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4399: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4402: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  4407: aload_1         /* biConsumer */
+        //  4408: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.JUNGLE_TEMPLE:Lnet/minecraft/resources/ResourceLocation;
+        //  4411: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4414: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4417: fconst_2       
+        //  4418: ldc_w           6.0
+        //  4421: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4424: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4427: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //  4430: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4433: iconst_3       
+        //  4434: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4437: fconst_1       
+        //  4438: ldc             3.0
+        //  4440: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4443: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4446: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4449: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4452: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  4455: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4458: bipush          10
+        //  4460: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4463: fconst_1       
+        //  4464: ldc             5.0
+        //  4466: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4469: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4472: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4475: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4478: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  4481: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4484: bipush          15
+        //  4486: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4489: fconst_2       
+        //  4490: ldc_w           7.0
+        //  4493: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4496: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4499: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4502: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4505: getstatic       net/minecraft/world/level/block/Blocks.BAMBOO:Lnet/minecraft/world/level/block/Block;
+        //  4508: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4511: bipush          15
+        //  4513: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4516: fconst_1       
+        //  4517: ldc             3.0
+        //  4519: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4522: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4525: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4528: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4531: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  4534: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4537: iconst_2       
+        //  4538: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4541: fconst_1       
+        //  4542: ldc             3.0
+        //  4544: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4547: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4550: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4553: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4556: getstatic       net/minecraft/world/item/Items.BONE:Lnet/minecraft/world/item/Item;
+        //  4559: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4562: bipush          20
+        //  4564: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4567: ldc             4.0
+        //  4569: ldc_w           6.0
+        //  4572: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4575: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4578: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4581: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4584: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  4587: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4590: bipush          16
+        //  4592: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4595: ldc             3.0
+        //  4597: ldc_w           7.0
+        //  4600: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4603: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4606: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4609: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4612: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        //  4615: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4618: iconst_3       
+        //  4619: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4622: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4625: getstatic       net/minecraft/world/item/Items.IRON_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  4628: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4631: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4634: getstatic       net/minecraft/world/item/Items.GOLDEN_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  4637: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4640: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4643: getstatic       net/minecraft/world/item/Items.DIAMOND_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  4646: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4649: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4652: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  4655: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4658: bipush          30
+        //  4660: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4663: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4666: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  4669: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4672: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4675: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4678: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  4683: aload_1         /* biConsumer */
+        //  4684: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.JUNGLE_TEMPLE_DISPENSER:Lnet/minecraft/resources/ResourceLocation;
+        //  4687: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4690: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4693: fconst_1       
+        //  4694: fconst_2       
+        //  4695: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4698: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4701: getstatic       net/minecraft/world/item/Items.ARROW:Lnet/minecraft/world/item/Item;
+        //  4704: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4707: bipush          30
+        //  4709: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4712: fconst_2       
+        //  4713: ldc_w           7.0
+        //  4716: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4719: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4722: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4725: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4728: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4731: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  4736: aload_1         /* biConsumer */
+        //  4737: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.NETHER_BRIDGE:Lnet/minecraft/resources/ResourceLocation;
+        //  4740: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4743: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4746: fconst_2       
+        //  4747: ldc             4.0
+        //  4749: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4752: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4755: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //  4758: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4761: iconst_5       
+        //  4762: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4765: fconst_1       
+        //  4766: ldc             3.0
+        //  4768: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4771: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4774: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4777: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4780: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  4783: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4786: iconst_5       
+        //  4787: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4790: fconst_1       
+        //  4791: ldc             5.0
+        //  4793: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4796: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4799: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4802: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4805: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  4808: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4811: bipush          15
+        //  4813: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4816: fconst_1       
+        //  4817: ldc             3.0
+        //  4819: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4822: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4825: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4828: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4831: getstatic       net/minecraft/world/item/Items.GOLDEN_SWORD:Lnet/minecraft/world/item/Item;
+        //  4834: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4837: iconst_5       
+        //  4838: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4841: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4844: getstatic       net/minecraft/world/item/Items.GOLDEN_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  4847: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4850: iconst_5       
+        //  4851: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4854: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4857: getstatic       net/minecraft/world/item/Items.FLINT_AND_STEEL:Lnet/minecraft/world/item/Item;
+        //  4860: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4863: iconst_5       
+        //  4864: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4867: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4870: getstatic       net/minecraft/world/item/Items.NETHER_WART:Lnet/minecraft/world/item/Item;
+        //  4873: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4876: iconst_5       
+        //  4877: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4880: ldc             3.0
+        //  4882: ldc_w           7.0
+        //  4885: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4888: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4891: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4894: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4897: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        //  4900: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4903: bipush          10
+        //  4905: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4908: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4911: getstatic       net/minecraft/world/item/Items.GOLDEN_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  4914: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4917: bipush          8
+        //  4919: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4922: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4925: getstatic       net/minecraft/world/item/Items.IRON_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  4928: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4931: iconst_5       
+        //  4932: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4935: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4938: getstatic       net/minecraft/world/item/Items.DIAMOND_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  4941: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4944: iconst_3       
+        //  4945: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4948: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4951: getstatic       net/minecraft/world/level/block/Blocks.OBSIDIAN:Lnet/minecraft/world/level/block/Block;
+        //  4954: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4957: iconst_2       
+        //  4958: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4961: fconst_2       
+        //  4962: ldc             4.0
+        //  4964: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4967: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4970: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4973: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4976: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4979: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  4984: aload_1         /* biConsumer */
+        //  4985: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.PILLAGER_OUTPOST:Lnet/minecraft/resources/ResourceLocation;
+        //  4988: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4991: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4994: fconst_0       
+        //  4995: fconst_1       
+        //  4996: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4999: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5002: getstatic       net/minecraft/world/item/Items.CROSSBOW:Lnet/minecraft/world/item/Item;
+        //  5005: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5008: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5011: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5014: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5017: fconst_2       
+        //  5018: ldc             3.0
+        //  5020: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5023: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5026: getstatic       net/minecraft/world/item/Items.WHEAT:Lnet/minecraft/world/item/Item;
+        //  5029: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5032: bipush          7
+        //  5034: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5037: ldc             3.0
+        //  5039: ldc             5.0
+        //  5041: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5044: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5047: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5050: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5053: getstatic       net/minecraft/world/item/Items.POTATO:Lnet/minecraft/world/item/Item;
+        //  5056: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5059: iconst_5       
+        //  5060: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5063: fconst_2       
+        //  5064: ldc             5.0
+        //  5066: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5069: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5072: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5075: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5078: getstatic       net/minecraft/world/item/Items.CARROT:Lnet/minecraft/world/item/Item;
+        //  5081: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5084: iconst_5       
+        //  5085: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5088: ldc             3.0
+        //  5090: ldc             5.0
+        //  5092: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5095: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5098: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5101: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5104: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5107: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5110: fconst_1       
+        //  5111: ldc             3.0
+        //  5113: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5116: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5119: getstatic       net/minecraft/world/level/block/Blocks.DARK_OAK_LOG:Lnet/minecraft/world/level/block/Block;
+        //  5122: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5125: fconst_2       
+        //  5126: ldc             3.0
+        //  5128: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5131: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5134: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5137: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5140: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5143: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5146: fconst_2       
+        //  5147: ldc             3.0
+        //  5149: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5152: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5155: getstatic       net/minecraft/world/item/Items.EXPERIENCE_BOTTLE:Lnet/minecraft/world/item/Item;
+        //  5158: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5161: bipush          7
+        //  5163: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5166: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5169: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
+        //  5172: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5175: iconst_4       
+        //  5176: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5179: fconst_1       
+        //  5180: ldc_w           6.0
+        //  5183: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5186: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5189: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5192: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5195: getstatic       net/minecraft/world/item/Items.ARROW:Lnet/minecraft/world/item/Item;
+        //  5198: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5201: iconst_4       
+        //  5202: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5205: fconst_2       
+        //  5206: ldc_w           7.0
+        //  5209: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5212: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5215: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5218: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5221: getstatic       net/minecraft/world/item/Items.TRIPWIRE_HOOK:Lnet/minecraft/world/item/Item;
+        //  5224: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5227: iconst_3       
+        //  5228: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5231: fconst_1       
+        //  5232: ldc             3.0
+        //  5234: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5237: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5240: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5243: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5246: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  5249: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5252: iconst_3       
+        //  5253: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5256: fconst_1       
+        //  5257: ldc             3.0
+        //  5259: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5262: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5265: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5268: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5271: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  5274: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5277: iconst_1       
+        //  5278: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5281: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5284: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5287: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5290: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5293: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  5298: aload_1         /* biConsumer */
+        //  5299: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.SHIPWRECK_MAP:Lnet/minecraft/resources/ResourceLocation;
+        //  5302: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5305: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5308: iconst_1       
+        //  5309: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  5312: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5315: getstatic       net/minecraft/world/item/Items.MAP:Lnet/minecraft/world/item/Item;
+        //  5318: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5321: invokestatic    net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.makeExplorationMap:()Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  5324: getstatic       net/minecraft/world/level/levelgen/feature/StructureFeature.BURIED_TREASURE:Lnet/minecraft/world/level/levelgen/feature/StructureFeature;
+        //  5327: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setDestination:(Lnet/minecraft/world/level/levelgen/feature/StructureFeature;)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  5330: getstatic       net/minecraft/world/level/saveddata/maps/MapDecoration$Type.RED_X:Lnet/minecraft/world/level/saveddata/maps/MapDecoration$Type;
+        //  5333: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setMapDecoration:(Lnet/minecraft/world/level/saveddata/maps/MapDecoration$Type;)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  5336: iconst_1       
+        //  5337: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setZoom:(B)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  5340: iconst_0       
+        //  5341: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setSkipKnownStructures:(Z)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  5344: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5347: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5350: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5353: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5356: iconst_3       
+        //  5357: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  5360: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5363: getstatic       net/minecraft/world/item/Items.COMPASS:Lnet/minecraft/world/item/Item;
+        //  5366: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5369: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5372: getstatic       net/minecraft/world/item/Items.MAP:Lnet/minecraft/world/item/Item;
+        //  5375: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5378: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5381: getstatic       net/minecraft/world/item/Items.CLOCK:Lnet/minecraft/world/item/Item;
+        //  5384: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5387: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5390: getstatic       net/minecraft/world/item/Items.PAPER:Lnet/minecraft/world/item/Item;
+        //  5393: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5396: bipush          20
+        //  5398: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5401: fconst_1       
+        //  5402: ldc_w           10.0
+        //  5405: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5408: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5411: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5414: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5417: getstatic       net/minecraft/world/item/Items.FEATHER:Lnet/minecraft/world/item/Item;
+        //  5420: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5423: bipush          10
+        //  5425: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5428: fconst_1       
+        //  5429: ldc             5.0
+        //  5431: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5434: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5437: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5440: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5443: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  5446: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5449: iconst_5       
+        //  5450: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5453: fconst_1       
+        //  5454: ldc             5.0
+        //  5456: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5459: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5462: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5465: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5468: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5471: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  5476: aload_1         /* biConsumer */
+        //  5477: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.SHIPWRECK_SUPPLY:Lnet/minecraft/resources/ResourceLocation;
+        //  5480: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5483: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5486: ldc             3.0
+        //  5488: ldc_w           10.0
+        //  5491: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5494: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5497: getstatic       net/minecraft/world/item/Items.PAPER:Lnet/minecraft/world/item/Item;
+        //  5500: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5503: bipush          8
+        //  5505: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5508: fconst_1       
+        //  5509: ldc             12.0
+        //  5511: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5514: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5517: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5520: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5523: getstatic       net/minecraft/world/item/Items.POTATO:Lnet/minecraft/world/item/Item;
+        //  5526: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5529: bipush          7
+        //  5531: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5534: fconst_2       
+        //  5535: ldc_w           6.0
+        //  5538: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5541: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5544: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5547: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5550: getstatic       net/minecraft/world/item/Items.POISONOUS_POTATO:Lnet/minecraft/world/item/Item;
+        //  5553: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5556: bipush          7
+        //  5558: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5561: fconst_2       
+        //  5562: ldc_w           6.0
+        //  5565: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5568: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5571: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5574: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5577: getstatic       net/minecraft/world/item/Items.CARROT:Lnet/minecraft/world/item/Item;
+        //  5580: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5583: bipush          7
+        //  5585: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5588: ldc             4.0
+        //  5590: ldc             8.0
+        //  5592: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5595: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5598: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5601: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5604: getstatic       net/minecraft/world/item/Items.WHEAT:Lnet/minecraft/world/item/Item;
+        //  5607: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5610: bipush          7
+        //  5612: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5615: ldc             8.0
+        //  5617: ldc_w           21.0
+        //  5620: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5623: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5626: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5629: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5632: getstatic       net/minecraft/world/item/Items.SUSPICIOUS_STEW:Lnet/minecraft/world/item/Item;
+        //  5635: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5638: bipush          10
+        //  5640: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5643: invokestatic    net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction.stewEffect:()Lnet/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder;
+        //  5646: getstatic       net/minecraft/world/effect/MobEffects.NIGHT_VISION:Lnet/minecraft/world/effect/MobEffect;
+        //  5649: ldc_w           7.0
+        //  5652: ldc_w           10.0
+        //  5655: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5658: invokevirtual   net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder.withEffect:(Lnet/minecraft/world/effect/MobEffect;Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder;
+        //  5661: getstatic       net/minecraft/world/effect/MobEffects.JUMP:Lnet/minecraft/world/effect/MobEffect;
+        //  5664: ldc_w           7.0
+        //  5667: ldc_w           10.0
+        //  5670: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5673: invokevirtual   net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder.withEffect:(Lnet/minecraft/world/effect/MobEffect;Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder;
+        //  5676: getstatic       net/minecraft/world/effect/MobEffects.WEAKNESS:Lnet/minecraft/world/effect/MobEffect;
+        //  5679: ldc_w           6.0
+        //  5682: ldc             8.0
+        //  5684: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5687: invokevirtual   net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder.withEffect:(Lnet/minecraft/world/effect/MobEffect;Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder;
+        //  5690: getstatic       net/minecraft/world/effect/MobEffects.BLINDNESS:Lnet/minecraft/world/effect/MobEffect;
+        //  5693: ldc             5.0
+        //  5695: ldc_w           7.0
+        //  5698: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5701: invokevirtual   net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder.withEffect:(Lnet/minecraft/world/effect/MobEffect;Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder;
+        //  5704: getstatic       net/minecraft/world/effect/MobEffects.POISON:Lnet/minecraft/world/effect/MobEffect;
+        //  5707: ldc_w           10.0
+        //  5710: ldc_w           20.0
+        //  5713: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5716: invokevirtual   net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder.withEffect:(Lnet/minecraft/world/effect/MobEffect;Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder;
+        //  5719: getstatic       net/minecraft/world/effect/MobEffects.SATURATION:Lnet/minecraft/world/effect/MobEffect;
+        //  5722: ldc_w           7.0
+        //  5725: ldc_w           10.0
+        //  5728: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5731: invokevirtual   net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder.withEffect:(Lnet/minecraft/world/effect/MobEffect;Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/SetStewEffectFunction$Builder;
+        //  5734: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5737: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5740: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //  5743: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5746: bipush          6
+        //  5748: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5751: fconst_2       
+        //  5752: ldc             8.0
+        //  5754: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5757: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5760: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5763: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5766: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  5769: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5772: iconst_5       
+        //  5773: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5776: ldc             5.0
+        //  5778: ldc_w           24.0
+        //  5781: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5784: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5787: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5790: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5793: getstatic       net/minecraft/world/level/block/Blocks.PUMPKIN:Lnet/minecraft/world/level/block/Block;
+        //  5796: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5799: iconst_2       
+        //  5800: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5803: fconst_1       
+        //  5804: ldc             3.0
+        //  5806: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5809: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5812: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5815: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5818: getstatic       net/minecraft/world/level/block/Blocks.BAMBOO:Lnet/minecraft/world/level/block/Block;
+        //  5821: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5824: iconst_2       
+        //  5825: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5828: fconst_1       
+        //  5829: ldc             3.0
+        //  5831: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5834: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5837: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5840: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5843: getstatic       net/minecraft/world/item/Items.GUNPOWDER:Lnet/minecraft/world/item/Item;
+        //  5846: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5849: iconst_3       
+        //  5850: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5853: fconst_1       
+        //  5854: ldc             5.0
+        //  5856: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5859: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5862: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5865: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5868: getstatic       net/minecraft/world/level/block/Blocks.TNT:Lnet/minecraft/world/level/block/Block;
+        //  5871: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5874: fconst_1       
+        //  5875: fconst_2       
+        //  5876: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5879: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5882: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5885: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5888: getstatic       net/minecraft/world/item/Items.LEATHER_HELMET:Lnet/minecraft/world/item/Item;
+        //  5891: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5894: iconst_3       
+        //  5895: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5898: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5901: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5904: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5907: getstatic       net/minecraft/world/item/Items.LEATHER_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  5910: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5913: iconst_3       
+        //  5914: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5917: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5920: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5923: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5926: getstatic       net/minecraft/world/item/Items.LEATHER_LEGGINGS:Lnet/minecraft/world/item/Item;
+        //  5929: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5932: iconst_3       
+        //  5933: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5936: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5939: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5942: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5945: getstatic       net/minecraft/world/item/Items.LEATHER_BOOTS:Lnet/minecraft/world/item/Item;
+        //  5948: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5951: iconst_3       
+        //  5952: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5955: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  5958: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5961: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5964: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5967: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  5972: aload_1         /* biConsumer */
+        //  5973: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.SHIPWRECK_TREASURE:Lnet/minecraft/resources/ResourceLocation;
+        //  5976: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5979: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5982: ldc             3.0
+        //  5984: ldc_w           6.0
+        //  5987: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  5990: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5993: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  5996: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5999: bipush          90
+        //  6001: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6004: fconst_1       
+        //  6005: ldc             5.0
+        //  6007: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6010: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6013: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6016: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6019: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  6022: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6025: bipush          10
+        //  6027: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6030: fconst_1       
+        //  6031: ldc             5.0
+        //  6033: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6036: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6039: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6042: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6045: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  6048: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6051: bipush          40
+        //  6053: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6056: fconst_1       
+        //  6057: ldc             5.0
+        //  6059: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6062: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6065: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6068: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6071: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //  6074: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6077: iconst_5       
+        //  6078: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6081: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6084: getstatic       net/minecraft/world/item/Items.EXPERIENCE_BOTTLE:Lnet/minecraft/world/item/Item;
+        //  6087: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6090: iconst_5       
+        //  6091: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6094: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6097: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  6100: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6103: fconst_2       
+        //  6104: ldc             5.0
+        //  6106: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6109: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6112: getstatic       net/minecraft/world/item/Items.IRON_NUGGET:Lnet/minecraft/world/item/Item;
+        //  6115: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6118: bipush          50
+        //  6120: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6123: fconst_1       
+        //  6124: ldc_w           10.0
+        //  6127: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6130: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6133: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6136: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6139: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
+        //  6142: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6145: bipush          10
+        //  6147: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6150: fconst_1       
+        //  6151: ldc_w           10.0
+        //  6154: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6157: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6160: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6163: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6166: getstatic       net/minecraft/world/item/Items.LAPIS_LAZULI:Lnet/minecraft/world/item/Item;
+        //  6169: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6172: bipush          20
+        //  6174: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6177: fconst_1       
+        //  6178: ldc_w           10.0
+        //  6181: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6184: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6187: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6190: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6193: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  6196: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  6201: aload_1         /* biConsumer */
+        //  6202: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.SIMPLE_DUNGEON:Lnet/minecraft/resources/ResourceLocation;
+        //  6205: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  6208: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6211: fconst_1       
+        //  6212: ldc             3.0
+        //  6214: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6217: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6220: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        //  6223: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6226: bipush          20
+        //  6228: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6231: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6234: getstatic       net/minecraft/world/item/Items.GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        //  6237: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6240: bipush          15
+        //  6242: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6245: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6248: getstatic       net/minecraft/world/item/Items.ENCHANTED_GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        //  6251: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6254: iconst_2       
+        //  6255: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6258: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6261: getstatic       net/minecraft/world/item/Items.MUSIC_DISC_13:Lnet/minecraft/world/item/Item;
+        //  6264: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6267: bipush          15
+        //  6269: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6272: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6275: getstatic       net/minecraft/world/item/Items.MUSIC_DISC_CAT:Lnet/minecraft/world/item/Item;
+        //  6278: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6281: bipush          15
+        //  6283: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6286: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6289: getstatic       net/minecraft/world/item/Items.NAME_TAG:Lnet/minecraft/world/item/Item;
+        //  6292: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6295: bipush          20
+        //  6297: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6300: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6303: getstatic       net/minecraft/world/item/Items.GOLDEN_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  6306: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6309: bipush          10
+        //  6311: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6314: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6317: getstatic       net/minecraft/world/item/Items.IRON_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  6320: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6323: bipush          15
+        //  6325: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6328: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6331: getstatic       net/minecraft/world/item/Items.DIAMOND_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  6334: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6337: iconst_5       
+        //  6338: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6341: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6344: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  6347: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6350: bipush          10
+        //  6352: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6355: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6358: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6361: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6364: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  6367: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6370: fconst_1       
+        //  6371: ldc             4.0
+        //  6373: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6376: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6379: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  6382: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6385: bipush          10
+        //  6387: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6390: fconst_1       
+        //  6391: ldc             4.0
+        //  6393: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6396: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6399: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6402: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6405: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  6408: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6411: iconst_5       
+        //  6412: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6415: fconst_1       
+        //  6416: ldc             4.0
+        //  6418: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6421: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6424: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6427: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6430: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //  6433: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6436: bipush          20
+        //  6438: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6441: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6444: getstatic       net/minecraft/world/item/Items.WHEAT:Lnet/minecraft/world/item/Item;
+        //  6447: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6450: bipush          20
+        //  6452: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6455: fconst_1       
+        //  6456: ldc             4.0
+        //  6458: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6461: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6464: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6467: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6470: getstatic       net/minecraft/world/item/Items.BUCKET:Lnet/minecraft/world/item/Item;
+        //  6473: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6476: bipush          10
+        //  6478: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6481: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6484: getstatic       net/minecraft/world/item/Items.REDSTONE:Lnet/minecraft/world/item/Item;
+        //  6487: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6490: bipush          15
+        //  6492: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6495: fconst_1       
+        //  6496: ldc             4.0
+        //  6498: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6501: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6504: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6507: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6510: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //  6513: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6516: bipush          15
+        //  6518: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6521: fconst_1       
+        //  6522: ldc             4.0
+        //  6524: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6527: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6530: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6533: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6536: getstatic       net/minecraft/world/item/Items.MELON_SEEDS:Lnet/minecraft/world/item/Item;
+        //  6539: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6542: bipush          10
+        //  6544: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6547: fconst_2       
+        //  6548: ldc             4.0
+        //  6550: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6553: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6556: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6559: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6562: getstatic       net/minecraft/world/item/Items.PUMPKIN_SEEDS:Lnet/minecraft/world/item/Item;
+        //  6565: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6568: bipush          10
+        //  6570: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6573: fconst_2       
+        //  6574: ldc             4.0
+        //  6576: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6579: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6582: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6585: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6588: getstatic       net/minecraft/world/item/Items.BEETROOT_SEEDS:Lnet/minecraft/world/item/Item;
+        //  6591: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6594: bipush          10
+        //  6596: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6599: fconst_2       
+        //  6600: ldc             4.0
+        //  6602: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6605: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6608: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6611: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6614: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  6617: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6620: iconst_3       
+        //  6621: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  6624: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6627: getstatic       net/minecraft/world/item/Items.BONE:Lnet/minecraft/world/item/Item;
+        //  6630: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6633: bipush          10
+        //  6635: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6638: fconst_1       
+        //  6639: ldc             8.0
+        //  6641: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6644: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6647: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6650: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6653: getstatic       net/minecraft/world/item/Items.GUNPOWDER:Lnet/minecraft/world/item/Item;
+        //  6656: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6659: bipush          10
+        //  6661: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6664: fconst_1       
+        //  6665: ldc             8.0
+        //  6667: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6670: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6673: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6676: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6679: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  6682: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6685: bipush          10
+        //  6687: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6690: fconst_1       
+        //  6691: ldc             8.0
+        //  6693: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6696: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6699: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6702: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6705: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
+        //  6708: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6711: bipush          10
+        //  6713: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6716: fconst_1       
+        //  6717: ldc             8.0
+        //  6719: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6722: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6725: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6728: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6731: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  6734: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  6739: aload_1         /* biConsumer */
+        //  6740: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.SPAWN_BONUS_CHEST:Lnet/minecraft/resources/ResourceLocation;
+        //  6743: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  6746: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6749: iconst_1       
+        //  6750: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  6753: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6756: getstatic       net/minecraft/world/item/Items.STONE_AXE:Lnet/minecraft/world/item/Item;
+        //  6759: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6762: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6765: getstatic       net/minecraft/world/item/Items.WOODEN_AXE:Lnet/minecraft/world/item/Item;
+        //  6768: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6771: iconst_3       
+        //  6772: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6775: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6778: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  6781: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6784: iconst_1       
+        //  6785: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  6788: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6791: getstatic       net/minecraft/world/item/Items.STONE_PICKAXE:Lnet/minecraft/world/item/Item;
+        //  6794: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6797: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6800: getstatic       net/minecraft/world/item/Items.WOODEN_PICKAXE:Lnet/minecraft/world/item/Item;
+        //  6803: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6806: iconst_3       
+        //  6807: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6810: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6813: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  6816: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6819: iconst_3       
+        //  6820: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  6823: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6826: getstatic       net/minecraft/world/item/Items.APPLE:Lnet/minecraft/world/item/Item;
+        //  6829: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6832: iconst_5       
+        //  6833: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6836: fconst_1       
+        //  6837: fconst_2       
+        //  6838: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6841: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6844: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6847: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6850: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //  6853: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6856: iconst_3       
+        //  6857: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6860: fconst_1       
+        //  6861: fconst_2       
+        //  6862: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6865: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6868: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6871: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6874: getstatic       net/minecraft/world/item/Items.SALMON:Lnet/minecraft/world/item/Item;
+        //  6877: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6880: iconst_3       
+        //  6881: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6884: fconst_1       
+        //  6885: fconst_2       
+        //  6886: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6889: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6892: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6895: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6898: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  6901: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6904: iconst_4       
+        //  6905: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  6908: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6911: getstatic       net/minecraft/world/item/Items.STICK:Lnet/minecraft/world/item/Item;
+        //  6914: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6917: bipush          10
+        //  6919: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6922: fconst_1       
+        //  6923: ldc             12.0
+        //  6925: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6928: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6931: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6934: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6937: getstatic       net/minecraft/world/level/block/Blocks.OAK_PLANKS:Lnet/minecraft/world/level/block/Block;
+        //  6940: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6943: bipush          10
+        //  6945: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6948: fconst_1       
+        //  6949: ldc             12.0
+        //  6951: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6954: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6957: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6960: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6963: getstatic       net/minecraft/world/level/block/Blocks.OAK_LOG:Lnet/minecraft/world/level/block/Block;
+        //  6966: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6969: iconst_3       
+        //  6970: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6973: fconst_1       
+        //  6974: ldc             3.0
+        //  6976: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  6979: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  6982: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6985: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  6988: getstatic       net/minecraft/world/level/block/Blocks.SPRUCE_LOG:Lnet/minecraft/world/level/block/Block;
+        //  6991: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6994: iconst_3       
+        //  6995: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  6998: fconst_1       
+        //  6999: ldc             3.0
+        //  7001: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7004: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7007: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7010: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7013: getstatic       net/minecraft/world/level/block/Blocks.BIRCH_LOG:Lnet/minecraft/world/level/block/Block;
+        //  7016: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7019: iconst_3       
+        //  7020: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7023: fconst_1       
+        //  7024: ldc             3.0
+        //  7026: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7029: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7032: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7035: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7038: getstatic       net/minecraft/world/level/block/Blocks.JUNGLE_LOG:Lnet/minecraft/world/level/block/Block;
+        //  7041: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7044: iconst_3       
+        //  7045: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7048: fconst_1       
+        //  7049: ldc             3.0
+        //  7051: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7054: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7057: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7060: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7063: getstatic       net/minecraft/world/level/block/Blocks.ACACIA_LOG:Lnet/minecraft/world/level/block/Block;
+        //  7066: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7069: iconst_3       
+        //  7070: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7073: fconst_1       
+        //  7074: ldc             3.0
+        //  7076: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7079: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7082: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7085: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7088: getstatic       net/minecraft/world/level/block/Blocks.DARK_OAK_LOG:Lnet/minecraft/world/level/block/Block;
+        //  7091: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7094: iconst_3       
+        //  7095: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7098: fconst_1       
+        //  7099: ldc             3.0
+        //  7101: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7104: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7107: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7110: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7113: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  7116: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  7121: aload_1         /* biConsumer */
+        //  7122: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.STRONGHOLD_CORRIDOR:Lnet/minecraft/resources/ResourceLocation;
+        //  7125: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  7128: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7131: fconst_2       
+        //  7132: ldc             3.0
+        //  7134: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7137: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7140: getstatic       net/minecraft/world/item/Items.ENDER_PEARL:Lnet/minecraft/world/item/Item;
+        //  7143: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7146: bipush          10
+        //  7148: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7151: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7154: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //  7157: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7160: iconst_3       
+        //  7161: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7164: fconst_1       
+        //  7165: ldc             3.0
+        //  7167: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7170: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7173: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7176: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7179: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  7182: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7185: bipush          10
+        //  7187: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7190: fconst_1       
+        //  7191: ldc             5.0
+        //  7193: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7196: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7199: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7202: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7205: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  7208: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7211: iconst_5       
+        //  7212: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7215: fconst_1       
+        //  7216: ldc             3.0
+        //  7218: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7221: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7224: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7227: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7230: getstatic       net/minecraft/world/item/Items.REDSTONE:Lnet/minecraft/world/item/Item;
+        //  7233: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7236: iconst_5       
+        //  7237: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7240: ldc             4.0
+        //  7242: ldc             9.0
+        //  7244: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7247: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7250: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7253: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7256: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //  7259: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7262: bipush          15
+        //  7264: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7267: fconst_1       
+        //  7268: ldc             3.0
+        //  7270: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7273: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7276: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7279: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7282: getstatic       net/minecraft/world/item/Items.APPLE:Lnet/minecraft/world/item/Item;
+        //  7285: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7288: bipush          15
+        //  7290: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7293: fconst_1       
+        //  7294: ldc             3.0
+        //  7296: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7299: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7302: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7305: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7308: getstatic       net/minecraft/world/item/Items.IRON_PICKAXE:Lnet/minecraft/world/item/Item;
+        //  7311: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7314: iconst_5       
+        //  7315: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7318: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7321: getstatic       net/minecraft/world/item/Items.IRON_SWORD:Lnet/minecraft/world/item/Item;
+        //  7324: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7327: iconst_5       
+        //  7328: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7331: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7334: getstatic       net/minecraft/world/item/Items.IRON_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  7337: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7340: iconst_5       
+        //  7341: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7344: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7347: getstatic       net/minecraft/world/item/Items.IRON_HELMET:Lnet/minecraft/world/item/Item;
+        //  7350: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7353: iconst_5       
+        //  7354: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7357: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7360: getstatic       net/minecraft/world/item/Items.IRON_LEGGINGS:Lnet/minecraft/world/item/Item;
+        //  7363: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7366: iconst_5       
+        //  7367: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7370: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7373: getstatic       net/minecraft/world/item/Items.IRON_BOOTS:Lnet/minecraft/world/item/Item;
+        //  7376: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7379: iconst_5       
+        //  7380: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7383: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7386: getstatic       net/minecraft/world/item/Items.GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        //  7389: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7392: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7395: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        //  7398: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7401: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7404: getstatic       net/minecraft/world/item/Items.IRON_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  7407: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7410: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7413: getstatic       net/minecraft/world/item/Items.GOLDEN_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  7416: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7419: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7422: getstatic       net/minecraft/world/item/Items.DIAMOND_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  7425: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7428: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7431: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  7434: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7437: bipush          30
+        //  7439: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  7442: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  7445: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  7448: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7451: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7454: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  7457: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  7462: aload_1         /* biConsumer */
+        //  7463: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.STRONGHOLD_CROSSING:Lnet/minecraft/resources/ResourceLocation;
+        //  7466: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  7469: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7472: fconst_1       
+        //  7473: ldc             4.0
+        //  7475: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7478: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7481: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  7484: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7487: bipush          10
+        //  7489: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7492: fconst_1       
+        //  7493: ldc             5.0
+        //  7495: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7498: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7501: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7504: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7507: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  7510: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7513: iconst_5       
+        //  7514: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7517: fconst_1       
+        //  7518: ldc             3.0
+        //  7520: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7523: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7526: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7529: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7532: getstatic       net/minecraft/world/item/Items.REDSTONE:Lnet/minecraft/world/item/Item;
+        //  7535: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7538: iconst_5       
+        //  7539: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7542: ldc             4.0
+        //  7544: ldc             9.0
+        //  7546: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7549: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7552: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7555: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7558: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //  7561: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7564: bipush          10
+        //  7566: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7569: ldc             3.0
+        //  7571: ldc             8.0
+        //  7573: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7576: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7579: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7582: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7585: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //  7588: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7591: bipush          15
+        //  7593: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7596: fconst_1       
+        //  7597: ldc             3.0
+        //  7599: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7602: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7605: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7608: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7611: getstatic       net/minecraft/world/item/Items.APPLE:Lnet/minecraft/world/item/Item;
+        //  7614: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7617: bipush          15
+        //  7619: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7622: fconst_1       
+        //  7623: ldc             3.0
+        //  7625: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7628: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7631: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7634: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7637: getstatic       net/minecraft/world/item/Items.IRON_PICKAXE:Lnet/minecraft/world/item/Item;
+        //  7640: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7643: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7646: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  7649: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7652: bipush          30
+        //  7654: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  7657: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  7660: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  7663: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7666: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7669: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  7672: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  7677: aload_1         /* biConsumer */
+        //  7678: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.STRONGHOLD_LIBRARY:Lnet/minecraft/resources/ResourceLocation;
+        //  7681: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  7684: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7687: fconst_2       
+        //  7688: ldc_w           10.0
+        //  7691: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7694: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7697: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  7700: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7703: bipush          20
+        //  7705: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7708: fconst_1       
+        //  7709: ldc             3.0
+        //  7711: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7714: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7717: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7720: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7723: getstatic       net/minecraft/world/item/Items.PAPER:Lnet/minecraft/world/item/Item;
+        //  7726: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7729: bipush          20
+        //  7731: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7734: fconst_2       
+        //  7735: ldc_w           7.0
+        //  7738: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7741: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7744: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7747: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7750: getstatic       net/minecraft/world/item/Items.MAP:Lnet/minecraft/world/item/Item;
+        //  7753: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7756: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7759: getstatic       net/minecraft/world/item/Items.COMPASS:Lnet/minecraft/world/item/Item;
+        //  7762: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7765: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7768: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  7771: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7774: bipush          10
+        //  7776: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7779: bipush          30
+        //  7781: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  7784: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  7787: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //  7790: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7793: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7796: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  7799: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  7804: aload_1         /* biConsumer */
+        //  7805: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.UNDERWATER_RUIN_BIG:Lnet/minecraft/resources/ResourceLocation;
+        //  7808: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  7811: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7814: fconst_2       
+        //  7815: ldc             8.0
+        //  7817: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7820: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7823: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //  7826: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7829: bipush          10
+        //  7831: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7834: fconst_1       
+        //  7835: ldc             4.0
+        //  7837: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7840: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7843: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7846: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7849: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
+        //  7852: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7855: bipush          10
+        //  7857: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7860: fconst_1       
+        //  7861: ldc             3.0
+        //  7863: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7866: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7869: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7872: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7875: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  7878: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7881: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7884: getstatic       net/minecraft/world/item/Items.WHEAT:Lnet/minecraft/world/item/Item;
+        //  7887: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7890: bipush          10
+        //  7892: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7895: fconst_2       
+        //  7896: ldc             3.0
+        //  7898: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  7901: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7904: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7907: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7910: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  7913: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7916: iconst_1       
+        //  7917: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  7920: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7923: getstatic       net/minecraft/world/item/Items.GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        //  7926: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7929: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7932: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //  7935: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7938: iconst_5       
+        //  7939: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7942: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7945: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7948: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7951: getstatic       net/minecraft/world/item/Items.LEATHER_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  7954: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7957: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7960: getstatic       net/minecraft/world/item/Items.GOLDEN_HELMET:Lnet/minecraft/world/item/Item;
+        //  7963: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7966: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7969: getstatic       net/minecraft/world/item/Items.FISHING_ROD:Lnet/minecraft/world/item/Item;
+        //  7972: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7975: iconst_5       
+        //  7976: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7979: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  7982: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7985: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  7988: getstatic       net/minecraft/world/item/Items.MAP:Lnet/minecraft/world/item/Item;
+        //  7991: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7994: bipush          10
+        //  7996: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  7999: invokestatic    net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.makeExplorationMap:()Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  8002: getstatic       net/minecraft/world/level/levelgen/feature/StructureFeature.BURIED_TREASURE:Lnet/minecraft/world/level/levelgen/feature/StructureFeature;
+        //  8005: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setDestination:(Lnet/minecraft/world/level/levelgen/feature/StructureFeature;)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  8008: getstatic       net/minecraft/world/level/saveddata/maps/MapDecoration$Type.RED_X:Lnet/minecraft/world/level/saveddata/maps/MapDecoration$Type;
+        //  8011: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setMapDecoration:(Lnet/minecraft/world/level/saveddata/maps/MapDecoration$Type;)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  8014: iconst_1       
+        //  8015: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setZoom:(B)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  8018: iconst_0       
+        //  8019: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setSkipKnownStructures:(Z)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  8022: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8025: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8028: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8031: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  8036: aload_1         /* biConsumer */
+        //  8037: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.UNDERWATER_RUIN_SMALL:Lnet/minecraft/resources/ResourceLocation;
+        //  8040: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8043: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8046: fconst_2       
+        //  8047: ldc             8.0
+        //  8049: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8052: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8055: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //  8058: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8061: bipush          10
+        //  8063: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8066: fconst_1       
+        //  8067: ldc             4.0
+        //  8069: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8072: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8075: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8078: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8081: getstatic       net/minecraft/world/item/Items.STONE_AXE:Lnet/minecraft/world/item/Item;
+        //  8084: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8087: iconst_2       
+        //  8088: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8091: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8094: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  8097: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8100: iconst_5       
+        //  8101: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8104: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8107: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  8110: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8113: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8116: getstatic       net/minecraft/world/item/Items.WHEAT:Lnet/minecraft/world/item/Item;
+        //  8119: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8122: bipush          10
+        //  8124: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8127: fconst_2       
+        //  8128: ldc             3.0
+        //  8130: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8133: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8136: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8139: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8142: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8145: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8148: iconst_1       
+        //  8149: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  8152: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8155: getstatic       net/minecraft/world/item/Items.LEATHER_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  8158: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8161: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8164: getstatic       net/minecraft/world/item/Items.GOLDEN_HELMET:Lnet/minecraft/world/item/Item;
+        //  8167: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8170: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8173: getstatic       net/minecraft/world/item/Items.FISHING_ROD:Lnet/minecraft/world/item/Item;
+        //  8176: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8179: iconst_5       
+        //  8180: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8183: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8186: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8189: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8192: getstatic       net/minecraft/world/item/Items.MAP:Lnet/minecraft/world/item/Item;
+        //  8195: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8198: iconst_5       
+        //  8199: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8202: invokestatic    net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.makeExplorationMap:()Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  8205: getstatic       net/minecraft/world/level/levelgen/feature/StructureFeature.BURIED_TREASURE:Lnet/minecraft/world/level/levelgen/feature/StructureFeature;
+        //  8208: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setDestination:(Lnet/minecraft/world/level/levelgen/feature/StructureFeature;)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  8211: getstatic       net/minecraft/world/level/saveddata/maps/MapDecoration$Type.RED_X:Lnet/minecraft/world/level/saveddata/maps/MapDecoration$Type;
+        //  8214: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setMapDecoration:(Lnet/minecraft/world/level/saveddata/maps/MapDecoration$Type;)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  8217: iconst_1       
+        //  8218: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setZoom:(B)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  8221: iconst_0       
+        //  8222: invokevirtual   net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder.setSkipKnownStructures:(Z)Lnet/minecraft/world/level/storage/loot/functions/ExplorationMapFunction$Builder;
+        //  8225: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8228: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8231: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8234: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  8239: aload_1         /* biConsumer */
+        //  8240: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_WEAPONSMITH:Lnet/minecraft/resources/ResourceLocation;
+        //  8243: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8246: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8249: ldc             3.0
+        //  8251: ldc             8.0
+        //  8253: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8256: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8259: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //  8262: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8265: iconst_3       
+        //  8266: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8269: fconst_1       
+        //  8270: ldc             3.0
+        //  8272: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8275: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8278: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8281: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8284: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  8287: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8290: bipush          10
+        //  8292: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8295: fconst_1       
+        //  8296: ldc             5.0
+        //  8298: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8301: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8304: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8307: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8310: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  8313: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8316: iconst_5       
+        //  8317: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8320: fconst_1       
+        //  8321: ldc             3.0
+        //  8323: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8326: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8329: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8332: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8335: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //  8338: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8341: bipush          15
+        //  8343: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8346: fconst_1       
+        //  8347: ldc             3.0
+        //  8349: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8352: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8355: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8358: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8361: getstatic       net/minecraft/world/item/Items.APPLE:Lnet/minecraft/world/item/Item;
+        //  8364: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8367: bipush          15
+        //  8369: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8372: fconst_1       
+        //  8373: ldc             3.0
+        //  8375: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8378: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8381: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8384: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8387: getstatic       net/minecraft/world/item/Items.IRON_PICKAXE:Lnet/minecraft/world/item/Item;
+        //  8390: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8393: iconst_5       
+        //  8394: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8397: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8400: getstatic       net/minecraft/world/item/Items.IRON_SWORD:Lnet/minecraft/world/item/Item;
+        //  8403: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8406: iconst_5       
+        //  8407: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8410: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8413: getstatic       net/minecraft/world/item/Items.IRON_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  8416: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8419: iconst_5       
+        //  8420: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8423: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8426: getstatic       net/minecraft/world/item/Items.IRON_HELMET:Lnet/minecraft/world/item/Item;
+        //  8429: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8432: iconst_5       
+        //  8433: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8436: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8439: getstatic       net/minecraft/world/item/Items.IRON_LEGGINGS:Lnet/minecraft/world/item/Item;
+        //  8442: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8445: iconst_5       
+        //  8446: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8449: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8452: getstatic       net/minecraft/world/item/Items.IRON_BOOTS:Lnet/minecraft/world/item/Item;
+        //  8455: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8458: iconst_5       
+        //  8459: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8462: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8465: getstatic       net/minecraft/world/level/block/Blocks.OBSIDIAN:Lnet/minecraft/world/level/block/Block;
+        //  8468: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8471: iconst_5       
+        //  8472: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8475: ldc             3.0
+        //  8477: ldc_w           7.0
+        //  8480: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8483: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8486: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8489: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8492: getstatic       net/minecraft/world/level/block/Blocks.OAK_SAPLING:Lnet/minecraft/world/level/block/Block;
+        //  8495: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8498: iconst_5       
+        //  8499: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8502: ldc             3.0
+        //  8504: ldc_w           7.0
+        //  8507: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8510: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8513: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8516: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8519: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        //  8522: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8525: iconst_3       
+        //  8526: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8529: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8532: getstatic       net/minecraft/world/item/Items.IRON_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  8535: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8538: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8541: getstatic       net/minecraft/world/item/Items.GOLDEN_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  8544: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8547: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8550: getstatic       net/minecraft/world/item/Items.DIAMOND_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        //  8553: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8556: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8559: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8562: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  8567: aload_1         /* biConsumer */
+        //  8568: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_TOOLSMITH:Lnet/minecraft/resources/ResourceLocation;
+        //  8571: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8574: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8577: ldc             3.0
+        //  8579: ldc             8.0
+        //  8581: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8584: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8587: getstatic       net/minecraft/world/item/Items.DIAMOND:Lnet/minecraft/world/item/Item;
+        //  8590: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8593: iconst_1       
+        //  8594: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8597: fconst_1       
+        //  8598: ldc             3.0
+        //  8600: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8603: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8606: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8609: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8612: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  8615: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8618: iconst_5       
+        //  8619: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8622: fconst_1       
+        //  8623: ldc             5.0
+        //  8625: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8628: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8631: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8634: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8637: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        //  8640: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8643: iconst_1       
+        //  8644: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8647: fconst_1       
+        //  8648: ldc             3.0
+        //  8650: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8653: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8656: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8659: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8662: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //  8665: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8668: bipush          15
+        //  8670: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8673: fconst_1       
+        //  8674: ldc             3.0
+        //  8676: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8679: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8682: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8685: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8688: getstatic       net/minecraft/world/item/Items.IRON_PICKAXE:Lnet/minecraft/world/item/Item;
+        //  8691: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8694: iconst_5       
+        //  8695: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8698: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8701: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //  8704: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8707: iconst_1       
+        //  8708: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8711: fconst_1       
+        //  8712: ldc             3.0
+        //  8714: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8717: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8720: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8723: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8726: getstatic       net/minecraft/world/item/Items.STICK:Lnet/minecraft/world/item/Item;
+        //  8729: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8732: bipush          20
+        //  8734: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8737: fconst_1       
+        //  8738: ldc             3.0
+        //  8740: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8743: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8746: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8749: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8752: getstatic       net/minecraft/world/item/Items.IRON_SHOVEL:Lnet/minecraft/world/item/Item;
+        //  8755: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8758: iconst_5       
+        //  8759: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8762: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8765: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8768: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  8773: aload_1         /* biConsumer */
+        //  8774: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_CARTOGRAPHER:Lnet/minecraft/resources/ResourceLocation;
+        //  8777: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8780: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8783: fconst_1       
+        //  8784: ldc             5.0
+        //  8786: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8789: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8792: getstatic       net/minecraft/world/item/Items.MAP:Lnet/minecraft/world/item/Item;
+        //  8795: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8798: bipush          10
+        //  8800: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8803: fconst_1       
+        //  8804: ldc             3.0
+        //  8806: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8809: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8812: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8815: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8818: getstatic       net/minecraft/world/item/Items.PAPER:Lnet/minecraft/world/item/Item;
+        //  8821: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8824: bipush          15
+        //  8826: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8829: fconst_1       
+        //  8830: ldc             5.0
+        //  8832: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8835: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8838: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8841: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8844: getstatic       net/minecraft/world/item/Items.COMPASS:Lnet/minecraft/world/item/Item;
+        //  8847: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8850: iconst_5       
+        //  8851: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8854: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8857: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //  8860: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8863: bipush          15
+        //  8865: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8868: fconst_1       
+        //  8869: ldc             4.0
+        //  8871: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8874: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8877: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8880: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8883: getstatic       net/minecraft/world/item/Items.STICK:Lnet/minecraft/world/item/Item;
+        //  8886: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8889: iconst_5       
+        //  8890: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8893: fconst_1       
+        //  8894: fconst_2       
+        //  8895: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8898: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8901: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8904: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8907: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8910: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  8915: aload_1         /* biConsumer */
+        //  8916: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_MASON:Lnet/minecraft/resources/ResourceLocation;
+        //  8919: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  8922: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8925: fconst_1       
+        //  8926: ldc             5.0
+        //  8928: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8931: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8934: getstatic       net/minecraft/world/item/Items.CLAY_BALL:Lnet/minecraft/world/item/Item;
+        //  8937: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8940: iconst_1       
+        //  8941: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8944: fconst_1       
+        //  8945: ldc             3.0
+        //  8947: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  8950: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  8953: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8956: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8959: getstatic       net/minecraft/world/item/Items.FLOWER_POT:Lnet/minecraft/world/item/Item;
+        //  8962: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8965: iconst_1       
+        //  8966: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8969: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8972: getstatic       net/minecraft/world/level/block/Blocks.STONE:Lnet/minecraft/world/level/block/Block;
+        //  8975: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8978: iconst_2       
+        //  8979: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8982: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8985: getstatic       net/minecraft/world/level/block/Blocks.STONE_BRICKS:Lnet/minecraft/world/level/block/Block;
+        //  8988: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8991: iconst_2       
+        //  8992: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  8995: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  8998: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //  9001: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9004: iconst_4       
+        //  9005: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9008: fconst_1       
+        //  9009: ldc             4.0
+        //  9011: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9014: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9017: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9020: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9023: getstatic       net/minecraft/world/item/Items.YELLOW_DYE:Lnet/minecraft/world/item/Item;
+        //  9026: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9029: iconst_1       
+        //  9030: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9033: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9036: getstatic       net/minecraft/world/level/block/Blocks.SMOOTH_STONE:Lnet/minecraft/world/level/block/Block;
+        //  9039: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9042: iconst_1       
+        //  9043: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9046: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9049: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  9052: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9055: iconst_1       
+        //  9056: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9059: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9062: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9065: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  9070: aload_1         /* biConsumer */
+        //  9071: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_ARMORER:Lnet/minecraft/resources/ResourceLocation;
+        //  9074: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9077: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9080: fconst_1       
+        //  9081: ldc             5.0
+        //  9083: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9086: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9089: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  9092: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9095: iconst_2       
+        //  9096: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9099: fconst_1       
+        //  9100: ldc             3.0
+        //  9102: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9105: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9108: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9111: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9114: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //  9117: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9120: iconst_4       
+        //  9121: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9124: fconst_1       
+        //  9125: ldc             4.0
+        //  9127: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9130: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9133: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9136: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9139: getstatic       net/minecraft/world/item/Items.IRON_HELMET:Lnet/minecraft/world/item/Item;
+        //  9142: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9145: iconst_1       
+        //  9146: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9149: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9152: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  9155: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9158: iconst_1       
+        //  9159: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9162: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9165: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9168: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  9173: aload_1         /* biConsumer */
+        //  9174: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_SHEPHERD:Lnet/minecraft/resources/ResourceLocation;
+        //  9177: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9180: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9183: fconst_1       
+        //  9184: ldc             5.0
+        //  9186: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9189: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9192: getstatic       net/minecraft/world/level/block/Blocks.WHITE_WOOL:Lnet/minecraft/world/level/block/Block;
+        //  9195: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9198: bipush          6
+        //  9200: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9203: fconst_1       
+        //  9204: ldc             8.0
+        //  9206: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9209: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9212: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9215: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9218: getstatic       net/minecraft/world/level/block/Blocks.BLACK_WOOL:Lnet/minecraft/world/level/block/Block;
+        //  9221: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9224: iconst_3       
+        //  9225: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9228: fconst_1       
+        //  9229: ldc             3.0
+        //  9231: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9234: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9237: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9240: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9243: getstatic       net/minecraft/world/level/block/Blocks.GRAY_WOOL:Lnet/minecraft/world/level/block/Block;
+        //  9246: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9249: iconst_2       
+        //  9250: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9253: fconst_1       
+        //  9254: ldc             3.0
+        //  9256: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9259: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9262: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9265: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9268: getstatic       net/minecraft/world/level/block/Blocks.BROWN_WOOL:Lnet/minecraft/world/level/block/Block;
+        //  9271: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9274: iconst_2       
+        //  9275: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9278: fconst_1       
+        //  9279: ldc             3.0
+        //  9281: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9284: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9287: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9290: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9293: getstatic       net/minecraft/world/level/block/Blocks.LIGHT_GRAY_WOOL:Lnet/minecraft/world/level/block/Block;
+        //  9296: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9299: iconst_2       
+        //  9300: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9303: fconst_1       
+        //  9304: ldc             3.0
+        //  9306: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9309: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9312: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9315: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9318: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  9321: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9324: iconst_1       
+        //  9325: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9328: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9331: getstatic       net/minecraft/world/item/Items.SHEARS:Lnet/minecraft/world/item/Item;
+        //  9334: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9337: iconst_1       
+        //  9338: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9341: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9344: getstatic       net/minecraft/world/item/Items.WHEAT:Lnet/minecraft/world/item/Item;
+        //  9347: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9350: bipush          6
+        //  9352: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9355: fconst_1       
+        //  9356: ldc_w           6.0
+        //  9359: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9362: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9365: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9368: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9371: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9374: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  9379: aload_1         /* biConsumer */
+        //  9380: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_BUTCHER:Lnet/minecraft/resources/ResourceLocation;
+        //  9383: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9386: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9389: fconst_1       
+        //  9390: ldc             5.0
+        //  9392: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9395: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9398: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  9401: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9404: iconst_1       
+        //  9405: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9408: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9411: getstatic       net/minecraft/world/item/Items.PORKCHOP:Lnet/minecraft/world/item/Item;
+        //  9414: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9417: bipush          6
+        //  9419: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9422: fconst_1       
+        //  9423: ldc             3.0
+        //  9425: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9428: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9431: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9434: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9437: getstatic       net/minecraft/world/item/Items.WHEAT:Lnet/minecraft/world/item/Item;
+        //  9440: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9443: bipush          6
+        //  9445: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9448: fconst_1       
+        //  9449: ldc             3.0
+        //  9451: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9454: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9457: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9460: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9463: getstatic       net/minecraft/world/item/Items.BEEF:Lnet/minecraft/world/item/Item;
+        //  9466: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9469: bipush          6
+        //  9471: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9474: fconst_1       
+        //  9475: ldc             3.0
+        //  9477: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9480: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9483: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9486: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9489: getstatic       net/minecraft/world/item/Items.MUTTON:Lnet/minecraft/world/item/Item;
+        //  9492: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9495: bipush          6
+        //  9497: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9500: fconst_1       
+        //  9501: ldc             3.0
+        //  9503: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9506: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9509: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9512: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9515: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //  9518: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9521: iconst_3       
+        //  9522: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9525: fconst_1       
+        //  9526: ldc             3.0
+        //  9528: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9531: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9534: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9537: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9540: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9543: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  9548: aload_1         /* biConsumer */
+        //  9549: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_FLETCHER:Lnet/minecraft/resources/ResourceLocation;
+        //  9552: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9555: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9558: fconst_1       
+        //  9559: ldc             5.0
+        //  9561: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9564: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9567: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  9570: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9573: iconst_1       
+        //  9574: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9577: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9580: getstatic       net/minecraft/world/item/Items.ARROW:Lnet/minecraft/world/item/Item;
+        //  9583: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9586: iconst_2       
+        //  9587: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9590: fconst_1       
+        //  9591: ldc             3.0
+        //  9593: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9596: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9599: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9602: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9605: getstatic       net/minecraft/world/item/Items.FEATHER:Lnet/minecraft/world/item/Item;
+        //  9608: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9611: bipush          6
+        //  9613: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9616: fconst_1       
+        //  9617: ldc             3.0
+        //  9619: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9622: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9625: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9628: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9631: getstatic       net/minecraft/world/item/Items.EGG:Lnet/minecraft/world/item/Item;
+        //  9634: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9637: iconst_2       
+        //  9638: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9641: fconst_1       
+        //  9642: ldc             3.0
+        //  9644: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9647: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9650: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9653: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9656: getstatic       net/minecraft/world/item/Items.FLINT:Lnet/minecraft/world/item/Item;
+        //  9659: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9662: bipush          6
+        //  9664: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9667: fconst_1       
+        //  9668: ldc             3.0
+        //  9670: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9673: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9676: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9679: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9682: getstatic       net/minecraft/world/item/Items.STICK:Lnet/minecraft/world/item/Item;
+        //  9685: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9688: bipush          6
+        //  9690: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9693: fconst_1       
+        //  9694: ldc             3.0
+        //  9696: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9699: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9702: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9705: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9708: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9711: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  9716: aload_1         /* biConsumer */
+        //  9717: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_FISHER:Lnet/minecraft/resources/ResourceLocation;
+        //  9720: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9723: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9726: fconst_1       
+        //  9727: ldc             5.0
+        //  9729: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9732: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9735: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  9738: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9741: iconst_1       
+        //  9742: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9745: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9748: getstatic       net/minecraft/world/item/Items.COD:Lnet/minecraft/world/item/Item;
+        //  9751: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9754: iconst_2       
+        //  9755: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9758: fconst_1       
+        //  9759: ldc             3.0
+        //  9761: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9764: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9767: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9770: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9773: getstatic       net/minecraft/world/item/Items.SALMON:Lnet/minecraft/world/item/Item;
+        //  9776: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9779: iconst_1       
+        //  9780: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9783: fconst_1       
+        //  9784: ldc             3.0
+        //  9786: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9789: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9792: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9795: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9798: getstatic       net/minecraft/world/item/Items.WATER_BUCKET:Lnet/minecraft/world/item/Item;
+        //  9801: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9804: iconst_1       
+        //  9805: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9808: fconst_1       
+        //  9809: ldc             3.0
+        //  9811: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9814: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9817: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9820: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9823: getstatic       net/minecraft/world/item/Items.BARREL:Lnet/minecraft/world/item/Item;
+        //  9826: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9829: iconst_1       
+        //  9830: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9833: fconst_1       
+        //  9834: ldc             3.0
+        //  9836: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9839: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9842: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9845: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9848: getstatic       net/minecraft/world/item/Items.WHEAT_SEEDS:Lnet/minecraft/world/item/Item;
+        //  9851: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9854: iconst_3       
+        //  9855: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9858: fconst_1       
+        //  9859: ldc             3.0
+        //  9861: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9864: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9867: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9870: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9873: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //  9876: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9879: iconst_2       
+        //  9880: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9883: fconst_1       
+        //  9884: ldc             3.0
+        //  9886: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9889: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9892: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9895: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9898: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9901: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  9906: aload_1         /* biConsumer */
+        //  9907: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_TANNERY:Lnet/minecraft/resources/ResourceLocation;
+        //  9910: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  9913: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9916: fconst_1       
+        //  9917: ldc             5.0
+        //  9919: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9922: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9925: getstatic       net/minecraft/world/item/Items.LEATHER:Lnet/minecraft/world/item/Item;
+        //  9928: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9931: iconst_1       
+        //  9932: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9935: fconst_1       
+        //  9936: ldc             3.0
+        //  9938: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  9941: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  9944: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9947: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9950: getstatic       net/minecraft/world/item/Items.LEATHER_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        //  9953: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9956: iconst_2       
+        //  9957: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9960: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9963: getstatic       net/minecraft/world/item/Items.LEATHER_BOOTS:Lnet/minecraft/world/item/Item;
+        //  9966: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9969: iconst_2       
+        //  9970: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9973: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9976: getstatic       net/minecraft/world/item/Items.LEATHER_HELMET:Lnet/minecraft/world/item/Item;
+        //  9979: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9982: iconst_2       
+        //  9983: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9986: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  9989: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        //  9992: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9995: iconst_5       
+        //  9996: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  9999: fconst_1       
+        // 10000: ldc             4.0
+        // 10002: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10005: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10008: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10011: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10014: getstatic       net/minecraft/world/item/Items.LEATHER_LEGGINGS:Lnet/minecraft/world/item/Item;
+        // 10017: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10020: iconst_2       
+        // 10021: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10024: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10027: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        // 10030: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10033: iconst_1       
+        // 10034: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10037: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10040: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        // 10043: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10046: iconst_1       
+        // 10047: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10050: fconst_1       
+        // 10051: ldc             4.0
+        // 10053: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10056: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10059: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10062: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10065: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 10068: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        // 10073: aload_1         /* biConsumer */
+        // 10074: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_TEMPLE:Lnet/minecraft/resources/ResourceLocation;
+        // 10077: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 10080: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10083: ldc             3.0
+        // 10085: ldc             8.0
+        // 10087: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10090: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10093: getstatic       net/minecraft/world/item/Items.REDSTONE:Lnet/minecraft/world/item/Item;
+        // 10096: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10099: iconst_2       
+        // 10100: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10103: fconst_1       
+        // 10104: ldc             4.0
+        // 10106: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10109: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10112: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10115: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10118: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        // 10121: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10124: bipush          7
+        // 10126: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10129: fconst_1       
+        // 10130: ldc             4.0
+        // 10132: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10135: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10138: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10141: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10144: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        // 10147: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10150: bipush          7
+        // 10152: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10155: fconst_1       
+        // 10156: ldc             4.0
+        // 10158: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10161: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10164: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10167: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10170: getstatic       net/minecraft/world/item/Items.LAPIS_LAZULI:Lnet/minecraft/world/item/Item;
+        // 10173: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10176: iconst_1       
+        // 10177: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10180: fconst_1       
+        // 10181: ldc             4.0
+        // 10183: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10186: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10189: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10192: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10195: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        // 10198: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10201: iconst_1       
+        // 10202: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10205: fconst_1       
+        // 10206: ldc             4.0
+        // 10208: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10211: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10214: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10217: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10220: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        // 10223: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10226: iconst_1       
+        // 10227: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10230: fconst_1       
+        // 10231: ldc             4.0
+        // 10233: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10236: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10239: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10242: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10245: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 10248: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        // 10253: aload_1         /* biConsumer */
+        // 10254: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_PLAINS_HOUSE:Lnet/minecraft/resources/ResourceLocation;
+        // 10257: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 10260: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10263: ldc             3.0
+        // 10265: ldc             8.0
+        // 10267: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10270: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10273: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
+        // 10276: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10279: iconst_1       
+        // 10280: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10283: fconst_1       
+        // 10284: ldc             3.0
+        // 10286: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10289: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10292: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10295: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10298: getstatic       net/minecraft/world/item/Items.DANDELION:Lnet/minecraft/world/item/Item;
+        // 10301: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10304: iconst_2       
+        // 10305: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10308: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10311: getstatic       net/minecraft/world/item/Items.POPPY:Lnet/minecraft/world/item/Item;
+        // 10314: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10317: iconst_1       
+        // 10318: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10321: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10324: getstatic       net/minecraft/world/item/Items.POTATO:Lnet/minecraft/world/item/Item;
+        // 10327: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10330: bipush          10
+        // 10332: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10335: fconst_1       
+        // 10336: ldc_w           7.0
+        // 10339: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10342: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10345: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10348: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10351: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        // 10354: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10357: bipush          10
+        // 10359: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10362: fconst_1       
+        // 10363: ldc             4.0
+        // 10365: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10368: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10371: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10374: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10377: getstatic       net/minecraft/world/item/Items.APPLE:Lnet/minecraft/world/item/Item;
+        // 10380: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10383: bipush          10
+        // 10385: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10388: fconst_1       
+        // 10389: ldc             5.0
+        // 10391: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10394: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10397: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10400: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10403: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        // 10406: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10409: iconst_1       
+        // 10410: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10413: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10416: getstatic       net/minecraft/world/item/Items.FEATHER:Lnet/minecraft/world/item/Item;
+        // 10419: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10422: iconst_1       
+        // 10423: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10426: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10429: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        // 10432: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10435: iconst_2       
+        // 10436: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10439: fconst_1       
+        // 10440: ldc             4.0
+        // 10442: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10445: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10448: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10451: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10454: getstatic       net/minecraft/world/level/block/Blocks.OAK_SAPLING:Lnet/minecraft/world/level/block/Block;
+        // 10457: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10460: iconst_5       
+        // 10461: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10464: fconst_1       
+        // 10465: fconst_2       
+        // 10466: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10469: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10472: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10475: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10478: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 10481: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        // 10486: aload_1         /* biConsumer */
+        // 10487: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_TAIGA_HOUSE:Lnet/minecraft/resources/ResourceLocation;
+        // 10490: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 10493: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10496: ldc             3.0
+        // 10498: ldc             8.0
+        // 10500: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10503: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10506: getstatic       net/minecraft/world/item/Items.IRON_NUGGET:Lnet/minecraft/world/item/Item;
+        // 10509: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10512: iconst_1       
+        // 10513: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10516: fconst_1       
+        // 10517: ldc             5.0
+        // 10519: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10522: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10525: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10528: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10531: getstatic       net/minecraft/world/item/Items.FERN:Lnet/minecraft/world/item/Item;
+        // 10534: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10537: iconst_2       
+        // 10538: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10541: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10544: getstatic       net/minecraft/world/item/Items.LARGE_FERN:Lnet/minecraft/world/item/Item;
+        // 10547: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10550: iconst_2       
+        // 10551: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10554: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10557: getstatic       net/minecraft/world/item/Items.POTATO:Lnet/minecraft/world/item/Item;
+        // 10560: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10563: bipush          10
+        // 10565: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10568: fconst_1       
+        // 10569: ldc_w           7.0
+        // 10572: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10575: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10578: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10581: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10584: getstatic       net/minecraft/world/item/Items.SWEET_BERRIES:Lnet/minecraft/world/item/Item;
+        // 10587: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10590: iconst_5       
+        // 10591: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10594: fconst_1       
+        // 10595: ldc_w           7.0
+        // 10598: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10601: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10604: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10607: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10610: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        // 10613: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10616: bipush          10
+        // 10618: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10621: fconst_1       
+        // 10622: ldc             4.0
+        // 10624: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10627: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10630: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10633: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10636: getstatic       net/minecraft/world/item/Items.PUMPKIN_SEEDS:Lnet/minecraft/world/item/Item;
+        // 10639: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10642: iconst_5       
+        // 10643: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10646: fconst_1       
+        // 10647: ldc             5.0
+        // 10649: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10652: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10655: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10658: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10661: getstatic       net/minecraft/world/item/Items.PUMPKIN_PIE:Lnet/minecraft/world/item/Item;
+        // 10664: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10667: iconst_1       
+        // 10668: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10671: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10674: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        // 10677: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10680: iconst_2       
+        // 10681: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10684: fconst_1       
+        // 10685: ldc             4.0
+        // 10687: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10690: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10693: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10696: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10699: getstatic       net/minecraft/world/level/block/Blocks.SPRUCE_SAPLING:Lnet/minecraft/world/level/block/Block;
+        // 10702: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10705: iconst_5       
+        // 10706: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10709: fconst_1       
+        // 10710: ldc             5.0
+        // 10712: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10715: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10718: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10721: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10724: getstatic       net/minecraft/world/item/Items.SPRUCE_SIGN:Lnet/minecraft/world/item/Item;
+        // 10727: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10730: iconst_1       
+        // 10731: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10734: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10737: getstatic       net/minecraft/world/item/Items.SPRUCE_LOG:Lnet/minecraft/world/item/Item;
+        // 10740: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10743: bipush          10
+        // 10745: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10748: fconst_1       
+        // 10749: ldc             5.0
+        // 10751: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10754: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10757: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10760: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10763: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 10766: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        // 10771: aload_1         /* biConsumer */
+        // 10772: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_SAVANNA_HOUSE:Lnet/minecraft/resources/ResourceLocation;
+        // 10775: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 10778: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10781: ldc             3.0
+        // 10783: ldc             8.0
+        // 10785: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10788: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10791: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
+        // 10794: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10797: iconst_1       
+        // 10798: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10801: fconst_1       
+        // 10802: ldc             3.0
+        // 10804: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10807: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10810: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10813: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10816: getstatic       net/minecraft/world/item/Items.GRASS:Lnet/minecraft/world/item/Item;
+        // 10819: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10822: iconst_5       
+        // 10823: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10826: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10829: getstatic       net/minecraft/world/item/Items.TALL_GRASS:Lnet/minecraft/world/item/Item;
+        // 10832: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10835: iconst_5       
+        // 10836: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10839: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10842: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        // 10845: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10848: bipush          10
+        // 10850: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10853: fconst_1       
+        // 10854: ldc             4.0
+        // 10856: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10859: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10862: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10865: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10868: getstatic       net/minecraft/world/item/Items.WHEAT_SEEDS:Lnet/minecraft/world/item/Item;
+        // 10871: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10874: bipush          10
+        // 10876: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10879: fconst_1       
+        // 10880: ldc             5.0
+        // 10882: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10885: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10888: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10891: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10894: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        // 10897: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10900: iconst_2       
+        // 10901: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10904: fconst_1       
+        // 10905: ldc             4.0
+        // 10907: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10910: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10913: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10916: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10919: getstatic       net/minecraft/world/level/block/Blocks.ACACIA_SAPLING:Lnet/minecraft/world/level/block/Block;
+        // 10922: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10925: bipush          10
+        // 10927: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10930: fconst_1       
+        // 10931: fconst_2       
+        // 10932: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10935: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10938: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10941: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10944: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        // 10947: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10950: iconst_1       
+        // 10951: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10954: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10957: getstatic       net/minecraft/world/level/block/Blocks.TORCH:Lnet/minecraft/world/level/block/Block;
+        // 10960: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10963: iconst_1       
+        // 10964: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10967: fconst_1       
+        // 10968: fconst_2       
+        // 10969: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 10972: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 10975: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10978: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10981: getstatic       net/minecraft/world/item/Items.BUCKET:Lnet/minecraft/world/item/Item;
+        // 10984: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10987: iconst_1       
+        // 10988: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 10991: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 10994: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 10997: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        // 11002: aload_1         /* biConsumer */
+        // 11003: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_SNOWY_HOUSE:Lnet/minecraft/resources/ResourceLocation;
+        // 11006: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 11009: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11012: ldc             3.0
+        // 11014: ldc             8.0
+        // 11016: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11019: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11022: getstatic       net/minecraft/world/level/block/Blocks.BLUE_ICE:Lnet/minecraft/world/level/block/Block;
+        // 11025: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11028: iconst_1       
+        // 11029: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11032: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11035: getstatic       net/minecraft/world/level/block/Blocks.SNOW_BLOCK:Lnet/minecraft/world/level/block/Block;
+        // 11038: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11041: iconst_4       
+        // 11042: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11045: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11048: getstatic       net/minecraft/world/item/Items.POTATO:Lnet/minecraft/world/item/Item;
+        // 11051: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11054: bipush          10
+        // 11056: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11059: fconst_1       
+        // 11060: ldc_w           7.0
+        // 11063: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11066: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11069: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11072: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11075: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        // 11078: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11081: bipush          10
+        // 11083: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11086: fconst_1       
+        // 11087: ldc             4.0
+        // 11089: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11092: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11095: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11098: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11101: getstatic       net/minecraft/world/item/Items.BEETROOT_SEEDS:Lnet/minecraft/world/item/Item;
+        // 11104: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11107: bipush          10
+        // 11109: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11112: fconst_1       
+        // 11113: ldc             5.0
+        // 11115: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11118: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11121: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11124: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11127: getstatic       net/minecraft/world/item/Items.BEETROOT_SOUP:Lnet/minecraft/world/item/Item;
+        // 11130: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11133: iconst_1       
+        // 11134: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11137: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11140: getstatic       net/minecraft/world/item/Items.FURNACE:Lnet/minecraft/world/item/Item;
+        // 11143: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11146: iconst_1       
+        // 11147: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11150: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11153: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        // 11156: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11159: iconst_1       
+        // 11160: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11163: fconst_1       
+        // 11164: ldc             4.0
+        // 11166: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11169: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11172: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11175: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11178: getstatic       net/minecraft/world/item/Items.SNOWBALL:Lnet/minecraft/world/item/Item;
+        // 11181: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11184: bipush          10
+        // 11186: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11189: fconst_1       
+        // 11190: ldc_w           7.0
+        // 11193: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11196: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11199: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11202: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11205: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        // 11208: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11211: iconst_5       
+        // 11212: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11215: fconst_1       
+        // 11216: ldc             4.0
+        // 11218: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11221: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11224: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11227: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11230: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 11233: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        // 11238: aload_1         /* biConsumer */
+        // 11239: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.VILLAGE_DESERT_HOUSE:Lnet/minecraft/resources/ResourceLocation;
+        // 11242: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 11245: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11248: ldc             3.0
+        // 11250: ldc             8.0
+        // 11252: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11255: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11258: getstatic       net/minecraft/world/item/Items.CLAY_BALL:Lnet/minecraft/world/item/Item;
+        // 11261: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11264: iconst_1       
+        // 11265: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11268: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11271: getstatic       net/minecraft/world/item/Items.GREEN_DYE:Lnet/minecraft/world/item/Item;
+        // 11274: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11277: iconst_1       
+        // 11278: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11281: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11284: getstatic       net/minecraft/world/level/block/Blocks.CACTUS:Lnet/minecraft/world/level/block/Block;
+        // 11287: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11290: bipush          10
+        // 11292: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11295: fconst_1       
+        // 11296: ldc             4.0
+        // 11298: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11301: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11304: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11307: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11310: getstatic       net/minecraft/world/item/Items.WHEAT:Lnet/minecraft/world/item/Item;
+        // 11313: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11316: bipush          10
+        // 11318: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11321: fconst_1       
+        // 11322: ldc_w           7.0
+        // 11325: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11328: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11331: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11334: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11337: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        // 11340: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11343: bipush          10
+        // 11345: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11348: fconst_1       
+        // 11349: ldc             4.0
+        // 11351: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11354: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11357: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11360: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11363: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        // 11366: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11369: iconst_1       
+        // 11370: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11373: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11376: getstatic       net/minecraft/world/level/block/Blocks.DEAD_BUSH:Lnet/minecraft/world/level/block/Block;
+        // 11379: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11382: iconst_2       
+        // 11383: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11386: fconst_1       
+        // 11387: ldc             3.0
+        // 11389: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11392: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11395: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11398: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11401: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        // 11404: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11407: iconst_1       
+        // 11408: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11411: fconst_1       
+        // 11412: ldc             3.0
+        // 11414: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11417: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11420: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11423: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11426: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 11429: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        // 11434: aload_1         /* biConsumer */
+        // 11435: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.WOODLAND_MANSION:Lnet/minecraft/resources/ResourceLocation;
+        // 11438: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 11441: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11444: fconst_1       
+        // 11445: ldc             3.0
+        // 11447: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11450: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11453: getstatic       net/minecraft/world/item/Items.LEAD:Lnet/minecraft/world/item/Item;
+        // 11456: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11459: bipush          20
+        // 11461: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11464: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11467: getstatic       net/minecraft/world/item/Items.GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        // 11470: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11473: bipush          15
+        // 11475: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11478: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11481: getstatic       net/minecraft/world/item/Items.ENCHANTED_GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        // 11484: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11487: iconst_2       
+        // 11488: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11491: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11494: getstatic       net/minecraft/world/item/Items.MUSIC_DISC_13:Lnet/minecraft/world/item/Item;
+        // 11497: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11500: bipush          15
+        // 11502: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11505: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11508: getstatic       net/minecraft/world/item/Items.MUSIC_DISC_CAT:Lnet/minecraft/world/item/Item;
+        // 11511: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11514: bipush          15
+        // 11516: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11519: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11522: getstatic       net/minecraft/world/item/Items.NAME_TAG:Lnet/minecraft/world/item/Item;
+        // 11525: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11528: bipush          20
+        // 11530: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11533: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11536: getstatic       net/minecraft/world/item/Items.CHAINMAIL_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        // 11539: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11542: bipush          10
+        // 11544: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11547: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11550: getstatic       net/minecraft/world/item/Items.DIAMOND_HOE:Lnet/minecraft/world/item/Item;
+        // 11553: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11556: bipush          15
+        // 11558: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11561: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11564: getstatic       net/minecraft/world/item/Items.DIAMOND_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        // 11567: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11570: iconst_5       
+        // 11571: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11574: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11577: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        // 11580: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11583: bipush          10
+        // 11585: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11588: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11591: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11594: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11597: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 11600: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11603: fconst_1       
+        // 11604: ldc             4.0
+        // 11606: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11609: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11612: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        // 11615: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11618: bipush          10
+        // 11620: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11623: fconst_1       
+        // 11624: ldc             4.0
+        // 11626: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11629: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11632: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11635: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11638: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        // 11641: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11644: iconst_5       
+        // 11645: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11648: fconst_1       
+        // 11649: ldc             4.0
+        // 11651: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11654: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11657: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11660: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11663: getstatic       net/minecraft/world/item/Items.BREAD:Lnet/minecraft/world/item/Item;
+        // 11666: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11669: bipush          20
+        // 11671: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11674: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11677: getstatic       net/minecraft/world/item/Items.WHEAT:Lnet/minecraft/world/item/Item;
+        // 11680: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11683: bipush          20
+        // 11685: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11688: fconst_1       
+        // 11689: ldc             4.0
+        // 11691: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11694: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11697: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11700: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11703: getstatic       net/minecraft/world/item/Items.BUCKET:Lnet/minecraft/world/item/Item;
+        // 11706: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11709: bipush          10
+        // 11711: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11714: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11717: getstatic       net/minecraft/world/item/Items.REDSTONE:Lnet/minecraft/world/item/Item;
+        // 11720: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11723: bipush          15
+        // 11725: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11728: fconst_1       
+        // 11729: ldc             4.0
+        // 11731: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11734: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11737: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11740: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11743: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        // 11746: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11749: bipush          15
+        // 11751: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11754: fconst_1       
+        // 11755: ldc             4.0
+        // 11757: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11760: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11763: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11766: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11769: getstatic       net/minecraft/world/item/Items.MELON_SEEDS:Lnet/minecraft/world/item/Item;
+        // 11772: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11775: bipush          10
+        // 11777: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11780: fconst_2       
+        // 11781: ldc             4.0
+        // 11783: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11786: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11789: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11792: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11795: getstatic       net/minecraft/world/item/Items.PUMPKIN_SEEDS:Lnet/minecraft/world/item/Item;
+        // 11798: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11801: bipush          10
+        // 11803: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11806: fconst_2       
+        // 11807: ldc             4.0
+        // 11809: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11812: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11815: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11818: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11821: getstatic       net/minecraft/world/item/Items.BEETROOT_SEEDS:Lnet/minecraft/world/item/Item;
+        // 11824: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11827: bipush          10
+        // 11829: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11832: fconst_2       
+        // 11833: ldc             4.0
+        // 11835: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11838: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11841: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11844: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11847: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 11850: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11853: iconst_3       
+        // 11854: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        // 11857: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11860: getstatic       net/minecraft/world/item/Items.BONE:Lnet/minecraft/world/item/Item;
+        // 11863: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11866: bipush          10
+        // 11868: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11871: fconst_1       
+        // 11872: ldc             8.0
+        // 11874: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11877: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11880: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11883: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11886: getstatic       net/minecraft/world/item/Items.GUNPOWDER:Lnet/minecraft/world/item/Item;
+        // 11889: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11892: bipush          10
+        // 11894: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11897: fconst_1       
+        // 11898: ldc             8.0
+        // 11900: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11903: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11906: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11909: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11912: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        // 11915: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11918: bipush          10
+        // 11920: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11923: fconst_1       
+        // 11924: ldc             8.0
+        // 11926: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11929: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11932: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11935: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11938: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
+        // 11941: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11944: bipush          10
+        // 11946: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11949: fconst_1       
+        // 11950: ldc             8.0
+        // 11952: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11955: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 11958: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11961: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11964: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 11967: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        // 11972: aload_1         /* biConsumer */
+        // 11973: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.RUINED_PORTAL:Lnet/minecraft/resources/ResourceLocation;
+        // 11976: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 11979: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11982: ldc             4.0
+        // 11984: ldc             8.0
+        // 11986: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 11989: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 11992: getstatic       net/minecraft/world/item/Items.OBSIDIAN:Lnet/minecraft/world/item/Item;
+        // 11995: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 11998: bipush          40
+        // 12000: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12003: fconst_1       
+        // 12004: fconst_2       
+        // 12005: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 12008: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12011: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12014: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12017: getstatic       net/minecraft/world/item/Items.FLINT:Lnet/minecraft/world/item/Item;
+        // 12020: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12023: bipush          40
+        // 12025: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12028: fconst_1       
+        // 12029: ldc             4.0
+        // 12031: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 12034: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12037: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12040: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12043: getstatic       net/minecraft/world/item/Items.IRON_NUGGET:Lnet/minecraft/world/item/Item;
+        // 12046: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12049: bipush          40
+        // 12051: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12054: ldc             9.0
+        // 12056: ldc_w           18.0
+        // 12059: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 12062: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12065: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12068: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12071: getstatic       net/minecraft/world/item/Items.FLINT_AND_STEEL:Lnet/minecraft/world/item/Item;
+        // 12074: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12077: bipush          40
+        // 12079: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12082: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12085: getstatic       net/minecraft/world/item/Items.FIRE_CHARGE:Lnet/minecraft/world/item/Item;
+        // 12088: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12091: bipush          40
+        // 12093: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12096: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12099: getstatic       net/minecraft/world/item/Items.GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        // 12102: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12105: bipush          15
+        // 12107: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12110: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12113: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
+        // 12116: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12119: bipush          15
+        // 12121: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12124: ldc             4.0
+        // 12126: ldc_w           24.0
+        // 12129: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 12132: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12135: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12138: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12141: getstatic       net/minecraft/world/item/Items.GOLDEN_SWORD:Lnet/minecraft/world/item/Item;
+        // 12144: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12147: bipush          15
+        // 12149: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12152: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12155: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12158: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12161: getstatic       net/minecraft/world/item/Items.GOLDEN_AXE:Lnet/minecraft/world/item/Item;
+        // 12164: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12167: bipush          15
+        // 12169: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12172: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12175: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12178: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12181: getstatic       net/minecraft/world/item/Items.GOLDEN_HOE:Lnet/minecraft/world/item/Item;
+        // 12184: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12187: bipush          15
+        // 12189: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12192: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12195: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12198: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12201: getstatic       net/minecraft/world/item/Items.GOLDEN_SHOVEL:Lnet/minecraft/world/item/Item;
+        // 12204: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12207: bipush          15
+        // 12209: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12212: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12215: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12218: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12221: getstatic       net/minecraft/world/item/Items.GOLDEN_PICKAXE:Lnet/minecraft/world/item/Item;
+        // 12224: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12227: bipush          15
+        // 12229: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12232: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12235: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12238: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12241: getstatic       net/minecraft/world/item/Items.GOLDEN_BOOTS:Lnet/minecraft/world/item/Item;
+        // 12244: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12247: bipush          15
+        // 12249: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12252: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12255: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12258: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12261: getstatic       net/minecraft/world/item/Items.GOLDEN_CHESTPLATE:Lnet/minecraft/world/item/Item;
+        // 12264: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12267: bipush          15
+        // 12269: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12272: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12275: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12278: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12281: getstatic       net/minecraft/world/item/Items.GOLDEN_HELMET:Lnet/minecraft/world/item/Item;
+        // 12284: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12287: bipush          15
+        // 12289: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12292: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12295: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12298: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12301: getstatic       net/minecraft/world/item/Items.GOLDEN_LEGGINGS:Lnet/minecraft/world/item/Item;
+        // 12304: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12307: bipush          15
+        // 12309: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12312: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.randomApplicableEnchantment:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12315: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12318: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12321: getstatic       net/minecraft/world/item/Items.GLISTERING_MELON_SLICE:Lnet/minecraft/world/item/Item;
+        // 12324: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12327: iconst_5       
+        // 12328: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12331: ldc             4.0
+        // 12333: ldc             12.0
+        // 12335: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 12338: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12341: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12344: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12347: getstatic       net/minecraft/world/item/Items.GOLDEN_HORSE_ARMOR:Lnet/minecraft/world/item/Item;
+        // 12350: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12353: iconst_5       
+        // 12354: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12357: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12360: getstatic       net/minecraft/world/item/Items.LIGHT_WEIGHTED_PRESSURE_PLATE:Lnet/minecraft/world/item/Item;
+        // 12363: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12366: iconst_5       
+        // 12367: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12370: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12373: getstatic       net/minecraft/world/item/Items.GOLDEN_CARROT:Lnet/minecraft/world/item/Item;
+        // 12376: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12379: iconst_5       
+        // 12380: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12383: ldc             4.0
+        // 12385: ldc             12.0
+        // 12387: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 12390: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12393: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12396: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12399: getstatic       net/minecraft/world/item/Items.CLOCK:Lnet/minecraft/world/item/Item;
+        // 12402: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12405: iconst_5       
+        // 12406: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12409: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12412: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
+        // 12415: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12418: iconst_5       
+        // 12419: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12422: fconst_2       
+        // 12423: ldc             8.0
+        // 12425: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 12428: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12431: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12434: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12437: getstatic       net/minecraft/world/item/Items.BELL:Lnet/minecraft/world/item/Item;
+        // 12440: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12443: iconst_1       
+        // 12444: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12447: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12450: getstatic       net/minecraft/world/item/Items.ENCHANTED_GOLDEN_APPLE:Lnet/minecraft/world/item/Item;
+        // 12453: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12456: iconst_1       
+        // 12457: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12460: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12463: getstatic       net/minecraft/world/item/Items.GOLD_BLOCK:Lnet/minecraft/world/item/Item;
+        // 12466: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12469: iconst_1       
+        // 12470: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12473: fconst_1       
+        // 12474: fconst_2       
+        // 12475: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        // 12478: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        // 12481: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        // 12484: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        // 12487: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        // 12490: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        // 12495: return         
+        //    Signature:
+        //  (Ljava/util/function/BiConsumer<Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;>;)V
+        //    MethodParameters:
+        //  Name        Flags  
+        //  ----------  -----
+        //  biConsumer  
+        // 
+        // The error that occurred was:
+        // 
+        // java.lang.UnsupportedOperationException: The requested operation is not supported.
+        //     at com.strobel.util.ContractUtils.unsupported(ContractUtils.java:27)
+        //     at com.strobel.assembler.metadata.TypeReference.getRawType(TypeReference.java:276)
+        //     at com.strobel.assembler.metadata.TypeReference.getRawType(TypeReference.java:271)
+        //     at com.strobel.assembler.metadata.TypeReference.makeGenericType(TypeReference.java:150)
+        //     at com.strobel.assembler.metadata.TypeSubstitutionVisitor.visitParameterizedType(TypeSubstitutionVisitor.java:187)
+        //     at com.strobel.assembler.metadata.TypeSubstitutionVisitor.visitParameterizedType(TypeSubstitutionVisitor.java:25)
+        //     at com.strobel.assembler.metadata.ParameterizedType.accept(ParameterizedType.java:103)
+        //     at com.strobel.assembler.metadata.TypeSubstitutionVisitor.visit(TypeSubstitutionVisitor.java:39)
+        //     at com.strobel.assembler.metadata.TypeSubstitutionVisitor.visitMethod(TypeSubstitutionVisitor.java:276)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2591)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2695)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2695)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2515)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:672)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypesForVariables(TypeAnalysis.java:586)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:397)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.run(TypeAnalysis.java:96)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:109)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:42)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:214)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
+        //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
+        //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
+        //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
+        //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
+        //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
+        //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
+        //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
+        //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.helpCC(ForkJoinPool.java:1115)
+        //     at java.base/java.util.concurrent.ForkJoinPool.externalHelpComplete(ForkJoinPool.java:1957)
+        //     at java.base/java.util.concurrent.ForkJoinTask.tryExternalHelp(ForkJoinTask.java:378)
+        //     at java.base/java.util.concurrent.ForkJoinTask.externalAwaitDone(ForkJoinTask.java:323)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doInvoke(ForkJoinTask.java:412)
+        //     at java.base/java.util.concurrent.ForkJoinTask.invoke(ForkJoinTask.java:736)
+        //     at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateParallel(ReduceOps.java:919)
+        //     at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:233)
+        //     at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:578)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompile(EnigmaProject.java:233)
+        //     at cuchaz.enigma.command.DecompileCommand.run(DecompileCommand.java:35)
+        //     at cuchaz.enigma.CommandMain.main(CommandMain.java:43)
+        // 
+        throw new IllegalStateException("An error occurred while decompiling this method.");
     }
 }
diff --git a/src/net/minecraft/data/loot/EntityLoot.java b/src/net/minecraft/data/loot/EntityLoot.java
index 541b533..eb42b9f 100644
--- a/src/net/minecraft/data/loot/EntityLoot.java
+++ b/src/net/minecraft/data/loot/EntityLoot.java
@@ -30,8 +30,8 @@ public class EntityLoot implements Consumer<BiConsumer<ResourceLocation, LootTab
         this.map = Maps.newHashMap();
     }
     
-    private static LootTable.Builder createSheepTable(final ItemLike bjv) {
-        return LootTable.lootTable().withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootItem.lootTableItem(bjv))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootTableReference.lootTableReference(EntityType.SHEEP.getDefaultLootTable())));
+    private static LootTable.Builder createSheepTable(final ItemLike bqa) {
+        return LootTable.lootTable().withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootItem.lootTableItem(bqa))).withPool(LootPool.lootPool().setRolls(ConstantIntValue.exactly(1)).add(LootTableReference.lootTableReference(EntityType.SHEEP.getDefaultLootTable())));
     }
     
     @Override
@@ -273,12 +273,12 @@ public class EntityLoot implements Consumer<BiConsumer<ResourceLocation, LootTab
         //   586: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
         //   589: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
         //   592: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   595: getstatic       net/minecraft/tags/ItemTags.MUSIC_DISCS:Lnet/minecraft/tags/Tag;
+        //   595: getstatic       net/minecraft/tags/ItemTags.CREEPER_DROP_MUSIC_DISCS:Lnet/minecraft/tags/Tag$Named;
         //   598: invokestatic    net/minecraft/world/level/storage/loot/entries/TagEntry.expandTag:(Lnet/minecraft/tags/Tag;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
         //   601: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
         //   604: getstatic       net/minecraft/world/level/storage/loot/LootContext$EntityTarget.KILLER:Lnet/minecraft/world/level/storage/loot/LootContext$EntityTarget;
         //   607: invokestatic    net/minecraft/advancements/critereon/EntityPredicate$Builder.entity:()Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;
-        //   610: getstatic       net/minecraft/tags/EntityTypeTags.SKELETONS:Lnet/minecraft/tags/Tag;
+        //   610: getstatic       net/minecraft/tags/EntityTypeTags.SKELETONS:Lnet/minecraft/tags/Tag$Named;
         //   613: invokevirtual   net/minecraft/advancements/critereon/EntityPredicate$Builder.of:(Lnet/minecraft/tags/Tag;)Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;
         //   616: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemEntityPropertyCondition.hasProperties:(Lnet/minecraft/world/level/storage/loot/LootContext$EntityTarget;Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
         //   619: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
@@ -1473,337 +1473,339 @@ public class EntityLoot implements Consumer<BiConsumer<ResourceLocation, LootTab
         //  3660: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
         //  3663: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
         //  3666: aload_0         /* this */
-        //  3667: getstatic       net/minecraft/world/entity/EntityType.TRADER_LLAMA:Lnet/minecraft/world/entity/EntityType;
+        //  3667: getstatic       net/minecraft/world/entity/EntityType.STRIDER:Lnet/minecraft/world/entity/EntityType;
         //  3670: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
         //  3673: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
         //  3676: iconst_1       
         //  3677: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
         //  3680: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3683: getstatic       net/minecraft/world/item/Items.LEATHER:Lnet/minecraft/world/item/Item;
+        //  3683: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
         //  3686: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3689: fconst_0       
-        //  3690: fconst_2       
-        //  3691: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  3694: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  3697: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3700: fconst_0       
-        //  3701: fconst_1       
-        //  3702: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  3705: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  3708: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3711: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3714: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3717: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  3720: aload_0         /* this */
-        //  3721: getstatic       net/minecraft/world/entity/EntityType.TROPICAL_FISH:Lnet/minecraft/world/entity/EntityType;
-        //  3724: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3727: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3730: iconst_1       
-        //  3731: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  3734: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3737: getstatic       net/minecraft/world/item/Items.TROPICAL_FISH:Lnet/minecraft/world/item/Item;
-        //  3740: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3743: iconst_1       
-        //  3744: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  3747: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  3750: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3753: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3756: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3759: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3762: iconst_1       
-        //  3763: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  3766: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3769: getstatic       net/minecraft/world/item/Items.BONE_MEAL:Lnet/minecraft/world/item/Item;
-        //  3772: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3775: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3778: ldc             0.05
-        //  3780: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceCondition.randomChance:(F)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //  3783: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3786: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3789: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  3792: aload_0         /* this */
-        //  3793: getstatic       net/minecraft/world/entity/EntityType.TURTLE:Lnet/minecraft/world/entity/EntityType;
-        //  3796: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3799: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3802: iconst_1       
-        //  3803: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  3806: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3809: getstatic       net/minecraft/world/level/block/Blocks.SEAGRASS:Lnet/minecraft/world/level/block/Block;
-        //  3812: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3815: iconst_3       
-        //  3816: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3819: fconst_0       
-        //  3820: fconst_2       
-        //  3821: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  3824: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  3827: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3830: fconst_0       
-        //  3831: fconst_1       
-        //  3832: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  3835: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  3838: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3841: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3844: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3847: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3850: iconst_1       
-        //  3851: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  3854: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3857: getstatic       net/minecraft/world/item/Items.BOWL:Lnet/minecraft/world/item/Item;
-        //  3860: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3863: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3866: invokestatic    net/minecraft/advancements/critereon/DamageSourcePredicate$Builder.damageType:()Lnet/minecraft/advancements/critereon/DamageSourcePredicate$Builder;
-        //  3869: iconst_1       
-        //  3870: invokestatic    java/lang/Boolean.valueOf:(Z)Ljava/lang/Boolean;
-        //  3873: invokevirtual   net/minecraft/advancements/critereon/DamageSourcePredicate$Builder.isLightning:(Ljava/lang/Boolean;)Lnet/minecraft/advancements/critereon/DamageSourcePredicate$Builder;
-        //  3876: invokestatic    net/minecraft/world/level/storage/loot/predicates/DamageSourceCondition.hasDamageSource:(Lnet/minecraft/advancements/critereon/DamageSourcePredicate$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //  3879: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3882: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3885: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  3888: aload_0         /* this */
-        //  3889: getstatic       net/minecraft/world/entity/EntityType.VEX:Lnet/minecraft/world/entity/EntityType;
-        //  3892: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3895: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  3898: aload_0         /* this */
-        //  3899: getstatic       net/minecraft/world/entity/EntityType.VILLAGER:Lnet/minecraft/world/entity/EntityType;
-        //  3902: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3905: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  3908: aload_0         /* this */
-        //  3909: getstatic       net/minecraft/world/entity/EntityType.WANDERING_TRADER:Lnet/minecraft/world/entity/EntityType;
-        //  3912: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3915: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  3918: aload_0         /* this */
-        //  3919: getstatic       net/minecraft/world/entity/EntityType.VINDICATOR:Lnet/minecraft/world/entity/EntityType;
-        //  3922: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3925: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3928: iconst_1       
-        //  3929: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  3932: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3935: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
-        //  3938: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3941: fconst_0       
-        //  3942: fconst_1       
-        //  3943: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  3946: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  3949: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3952: fconst_0       
-        //  3953: fconst_1       
-        //  3954: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  3957: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  3960: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  3963: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3966: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.killedByPlayer:()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //  3969: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3972: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3975: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  3978: aload_0         /* this */
-        //  3979: getstatic       net/minecraft/world/entity/EntityType.WITCH:Lnet/minecraft/world/entity/EntityType;
-        //  3982: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  3985: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3988: fconst_1       
-        //  3989: ldc_w           3.0
-        //  3992: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  3995: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  3998: getstatic       net/minecraft/world/item/Items.GLOWSTONE_DUST:Lnet/minecraft/world/item/Item;
-        //  4001: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4004: fconst_0       
-        //  4005: fconst_2       
-        //  4006: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4009: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4012: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4015: fconst_0       
-        //  4016: fconst_1       
-        //  4017: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4020: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4023: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4026: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4029: getstatic       net/minecraft/world/item/Items.SUGAR:Lnet/minecraft/world/item/Item;
-        //  4032: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4035: fconst_0       
-        //  4036: fconst_2       
-        //  4037: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4040: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4043: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4046: fconst_0       
-        //  4047: fconst_1       
+        //  3689: fconst_2       
+        //  3690: ldc_w           5.0
+        //  3693: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3696: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3699: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3702: fconst_0       
+        //  3703: fconst_1       
+        //  3704: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3707: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  3710: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3713: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3716: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3719: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  3722: aload_0         /* this */
+        //  3723: getstatic       net/minecraft/world/entity/EntityType.TRADER_LLAMA:Lnet/minecraft/world/entity/EntityType;
+        //  3726: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3729: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3732: iconst_1       
+        //  3733: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  3736: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3739: getstatic       net/minecraft/world/item/Items.LEATHER:Lnet/minecraft/world/item/Item;
+        //  3742: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3745: fconst_0       
+        //  3746: fconst_2       
+        //  3747: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3750: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3753: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3756: fconst_0       
+        //  3757: fconst_1       
+        //  3758: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3761: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  3764: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3767: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3770: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3773: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  3776: aload_0         /* this */
+        //  3777: getstatic       net/minecraft/world/entity/EntityType.TROPICAL_FISH:Lnet/minecraft/world/entity/EntityType;
+        //  3780: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3783: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3786: iconst_1       
+        //  3787: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  3790: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3793: getstatic       net/minecraft/world/item/Items.TROPICAL_FISH:Lnet/minecraft/world/item/Item;
+        //  3796: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3799: iconst_1       
+        //  3800: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  3803: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3806: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3809: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3812: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3815: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3818: iconst_1       
+        //  3819: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  3822: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3825: getstatic       net/minecraft/world/item/Items.BONE_MEAL:Lnet/minecraft/world/item/Item;
+        //  3828: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3831: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3834: ldc             0.05
+        //  3836: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceCondition.randomChance:(F)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //  3839: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3842: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3845: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  3848: aload_0         /* this */
+        //  3849: getstatic       net/minecraft/world/entity/EntityType.TURTLE:Lnet/minecraft/world/entity/EntityType;
+        //  3852: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3855: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3858: iconst_1       
+        //  3859: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  3862: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3865: getstatic       net/minecraft/world/level/block/Blocks.SEAGRASS:Lnet/minecraft/world/level/block/Block;
+        //  3868: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3871: iconst_3       
+        //  3872: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3875: fconst_0       
+        //  3876: fconst_2       
+        //  3877: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3880: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  3883: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3886: fconst_0       
+        //  3887: fconst_1       
+        //  3888: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  3891: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  3894: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3897: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3900: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3903: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3906: iconst_1       
+        //  3907: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  3910: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3913: getstatic       net/minecraft/world/item/Items.BOWL:Lnet/minecraft/world/item/Item;
+        //  3916: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3919: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3922: invokestatic    net/minecraft/advancements/critereon/DamageSourcePredicate$Builder.damageType:()Lnet/minecraft/advancements/critereon/DamageSourcePredicate$Builder;
+        //  3925: iconst_1       
+        //  3926: invokestatic    java/lang/Boolean.valueOf:(Z)Ljava/lang/Boolean;
+        //  3929: invokevirtual   net/minecraft/advancements/critereon/DamageSourcePredicate$Builder.isLightning:(Ljava/lang/Boolean;)Lnet/minecraft/advancements/critereon/DamageSourcePredicate$Builder;
+        //  3932: invokestatic    net/minecraft/world/level/storage/loot/predicates/DamageSourceCondition.hasDamageSource:(Lnet/minecraft/advancements/critereon/DamageSourcePredicate$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //  3935: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3938: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3941: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  3944: aload_0         /* this */
+        //  3945: getstatic       net/minecraft/world/entity/EntityType.VEX:Lnet/minecraft/world/entity/EntityType;
+        //  3948: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3951: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  3954: aload_0         /* this */
+        //  3955: getstatic       net/minecraft/world/entity/EntityType.VILLAGER:Lnet/minecraft/world/entity/EntityType;
+        //  3958: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3961: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  3964: aload_0         /* this */
+        //  3965: getstatic       net/minecraft/world/entity/EntityType.WANDERING_TRADER:Lnet/minecraft/world/entity/EntityType;
+        //  3968: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3971: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  3974: aload_0         /* this */
+        //  3975: getstatic       net/minecraft/world/entity/EntityType.VINDICATOR:Lnet/minecraft/world/entity/EntityType;
+        //  3978: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  3981: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3984: iconst_1       
+        //  3985: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  3988: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  3991: getstatic       net/minecraft/world/item/Items.EMERALD:Lnet/minecraft/world/item/Item;
+        //  3994: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  3997: fconst_0       
+        //  3998: fconst_1       
+        //  3999: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4002: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4005: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4008: fconst_0       
+        //  4009: fconst_1       
+        //  4010: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4013: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4016: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4019: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4022: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.killedByPlayer:()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //  4025: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4028: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4031: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  4034: aload_0         /* this */
+        //  4035: getstatic       net/minecraft/world/entity/EntityType.WITCH:Lnet/minecraft/world/entity/EntityType;
+        //  4038: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4041: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4044: fconst_1       
+        //  4045: ldc_w           3.0
         //  4048: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4051: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4054: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4057: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4060: getstatic       net/minecraft/world/item/Items.REDSTONE:Lnet/minecraft/world/item/Item;
-        //  4063: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4066: fconst_0       
-        //  4067: fconst_2       
-        //  4068: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4071: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4074: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4077: fconst_0       
-        //  4078: fconst_1       
-        //  4079: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4082: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4085: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4088: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4091: getstatic       net/minecraft/world/item/Items.SPIDER_EYE:Lnet/minecraft/world/item/Item;
-        //  4094: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4097: fconst_0       
-        //  4098: fconst_2       
-        //  4099: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4102: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4105: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4108: fconst_0       
-        //  4109: fconst_1       
-        //  4110: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4113: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4116: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4119: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4122: getstatic       net/minecraft/world/item/Items.GLASS_BOTTLE:Lnet/minecraft/world/item/Item;
-        //  4125: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4128: fconst_0       
-        //  4129: fconst_2       
-        //  4130: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4133: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4136: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4139: fconst_0       
-        //  4140: fconst_1       
-        //  4141: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4144: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4147: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4150: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4153: getstatic       net/minecraft/world/item/Items.GUNPOWDER:Lnet/minecraft/world/item/Item;
-        //  4156: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4159: fconst_0       
-        //  4160: fconst_2       
-        //  4161: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4164: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4167: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4170: fconst_0       
-        //  4171: fconst_1       
-        //  4172: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4175: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4178: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4181: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4184: getstatic       net/minecraft/world/item/Items.STICK:Lnet/minecraft/world/item/Item;
-        //  4187: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4190: iconst_2       
-        //  4191: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4194: fconst_0       
-        //  4195: fconst_2       
-        //  4196: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4199: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4202: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4205: fconst_0       
-        //  4206: fconst_1       
-        //  4207: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4210: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4213: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4216: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4219: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4222: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  4225: aload_0         /* this */
-        //  4226: getstatic       net/minecraft/world/entity/EntityType.WITHER:Lnet/minecraft/world/entity/EntityType;
-        //  4229: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4232: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  4235: aload_0         /* this */
-        //  4236: getstatic       net/minecraft/world/entity/EntityType.WITHER_SKELETON:Lnet/minecraft/world/entity/EntityType;
-        //  4239: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4242: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4245: iconst_1       
-        //  4246: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  4249: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4252: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
-        //  4255: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4258: ldc             -1.0
-        //  4260: fconst_1       
-        //  4261: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4264: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4267: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4270: fconst_0       
-        //  4271: fconst_1       
-        //  4272: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4275: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4278: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4281: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4284: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4287: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4290: iconst_1       
-        //  4291: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  4294: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4297: getstatic       net/minecraft/world/item/Items.BONE:Lnet/minecraft/world/item/Item;
-        //  4300: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4303: fconst_0       
-        //  4304: fconst_2       
-        //  4305: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4308: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4311: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4314: fconst_0       
-        //  4315: fconst_1       
-        //  4316: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4319: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4322: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4325: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4328: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4331: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4334: iconst_1       
-        //  4335: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  4338: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4341: getstatic       net/minecraft/world/level/block/Blocks.WITHER_SKELETON_SKULL:Lnet/minecraft/world/level/block/Block;
-        //  4344: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4347: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4350: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.killedByPlayer:()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //  4353: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4356: ldc_w           0.025
-        //  4359: ldc_w           0.01
-        //  4362: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceWithLootingCondition.randomChanceAndLootingBoost:(FF)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //  4365: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4368: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4371: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  4374: aload_0         /* this */
-        //  4375: getstatic       net/minecraft/world/entity/EntityType.WOLF:Lnet/minecraft/world/entity/EntityType;
-        //  4378: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4381: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  4384: aload_0         /* this */
-        //  4385: getstatic       net/minecraft/world/entity/EntityType.ZOMBIE:Lnet/minecraft/world/entity/EntityType;
-        //  4388: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4391: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4394: iconst_1       
-        //  4395: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  4398: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4401: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
-        //  4404: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4407: fconst_0       
-        //  4408: fconst_2       
-        //  4409: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4412: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4415: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4418: fconst_0       
-        //  4419: fconst_1       
-        //  4420: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4423: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4426: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4429: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4432: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4435: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4438: iconst_1       
-        //  4439: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  4442: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4445: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
-        //  4448: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4451: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4454: getstatic       net/minecraft/world/item/Items.CARROT:Lnet/minecraft/world/item/Item;
-        //  4457: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4460: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4463: getstatic       net/minecraft/world/item/Items.POTATO:Lnet/minecraft/world/item/Item;
-        //  4466: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4469: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4472: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.killedByPlayer:()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //  4475: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4478: ldc_w           0.025
-        //  4481: ldc_w           0.01
-        //  4484: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceWithLootingCondition.randomChanceAndLootingBoost:(FF)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //  4487: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4051: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4054: getstatic       net/minecraft/world/item/Items.GLOWSTONE_DUST:Lnet/minecraft/world/item/Item;
+        //  4057: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4060: fconst_0       
+        //  4061: fconst_2       
+        //  4062: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4065: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4068: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4071: fconst_0       
+        //  4072: fconst_1       
+        //  4073: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4076: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4079: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4082: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4085: getstatic       net/minecraft/world/item/Items.SUGAR:Lnet/minecraft/world/item/Item;
+        //  4088: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4091: fconst_0       
+        //  4092: fconst_2       
+        //  4093: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4096: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4099: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4102: fconst_0       
+        //  4103: fconst_1       
+        //  4104: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4107: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4110: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4113: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4116: getstatic       net/minecraft/world/item/Items.REDSTONE:Lnet/minecraft/world/item/Item;
+        //  4119: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4122: fconst_0       
+        //  4123: fconst_2       
+        //  4124: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4127: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4130: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4133: fconst_0       
+        //  4134: fconst_1       
+        //  4135: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4138: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4141: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4144: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4147: getstatic       net/minecraft/world/item/Items.SPIDER_EYE:Lnet/minecraft/world/item/Item;
+        //  4150: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4153: fconst_0       
+        //  4154: fconst_2       
+        //  4155: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4158: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4161: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4164: fconst_0       
+        //  4165: fconst_1       
+        //  4166: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4169: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4172: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4175: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4178: getstatic       net/minecraft/world/item/Items.GLASS_BOTTLE:Lnet/minecraft/world/item/Item;
+        //  4181: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4184: fconst_0       
+        //  4185: fconst_2       
+        //  4186: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4189: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4192: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4195: fconst_0       
+        //  4196: fconst_1       
+        //  4197: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4200: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4203: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4206: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4209: getstatic       net/minecraft/world/item/Items.GUNPOWDER:Lnet/minecraft/world/item/Item;
+        //  4212: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4215: fconst_0       
+        //  4216: fconst_2       
+        //  4217: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4220: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4223: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4226: fconst_0       
+        //  4227: fconst_1       
+        //  4228: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4231: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4234: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4237: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4240: getstatic       net/minecraft/world/item/Items.STICK:Lnet/minecraft/world/item/Item;
+        //  4243: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4246: iconst_2       
+        //  4247: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4250: fconst_0       
+        //  4251: fconst_2       
+        //  4252: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4255: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4258: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4261: fconst_0       
+        //  4262: fconst_1       
+        //  4263: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4266: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4269: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4272: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4275: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4278: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  4281: aload_0         /* this */
+        //  4282: getstatic       net/minecraft/world/entity/EntityType.WITHER:Lnet/minecraft/world/entity/EntityType;
+        //  4285: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4288: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  4291: aload_0         /* this */
+        //  4292: getstatic       net/minecraft/world/entity/EntityType.WITHER_SKELETON:Lnet/minecraft/world/entity/EntityType;
+        //  4295: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4298: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4301: iconst_1       
+        //  4302: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4305: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4308: getstatic       net/minecraft/world/item/Items.COAL:Lnet/minecraft/world/item/Item;
+        //  4311: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4314: ldc             -1.0
+        //  4316: fconst_1       
+        //  4317: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4320: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4323: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4326: fconst_0       
+        //  4327: fconst_1       
+        //  4328: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4331: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4334: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4337: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4340: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4343: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4346: iconst_1       
+        //  4347: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4350: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4353: getstatic       net/minecraft/world/item/Items.BONE:Lnet/minecraft/world/item/Item;
+        //  4356: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4359: fconst_0       
+        //  4360: fconst_2       
+        //  4361: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4364: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4367: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4370: fconst_0       
+        //  4371: fconst_1       
+        //  4372: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4375: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4378: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4381: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4384: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4387: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4390: iconst_1       
+        //  4391: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4394: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4397: getstatic       net/minecraft/world/level/block/Blocks.WITHER_SKELETON_SKULL:Lnet/minecraft/world/level/block/Block;
+        //  4400: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4403: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4406: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.killedByPlayer:()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //  4409: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4412: ldc_w           0.025
+        //  4415: ldc_w           0.01
+        //  4418: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceWithLootingCondition.randomChanceAndLootingBoost:(FF)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //  4421: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4424: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4427: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  4430: aload_0         /* this */
+        //  4431: getstatic       net/minecraft/world/entity/EntityType.WOLF:Lnet/minecraft/world/entity/EntityType;
+        //  4434: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4437: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  4440: aload_0         /* this */
+        //  4441: getstatic       net/minecraft/world/entity/EntityType.ZOGLIN:Lnet/minecraft/world/entity/EntityType;
+        //  4444: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4447: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4450: iconst_1       
+        //  4451: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4454: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4457: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  4460: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4463: fconst_1       
+        //  4464: ldc_w           3.0
+        //  4467: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4470: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4473: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4476: fconst_0       
+        //  4477: fconst_1       
+        //  4478: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4481: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4484: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4487: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
         //  4490: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
         //  4493: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
         //  4496: aload_0         /* this */
-        //  4497: getstatic       net/minecraft/world/entity/EntityType.ZOMBIE_HORSE:Lnet/minecraft/world/entity/EntityType;
+        //  4497: getstatic       net/minecraft/world/entity/EntityType.ZOMBIE:Lnet/minecraft/world/entity/EntityType;
         //  4500: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
         //  4503: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
         //  4506: iconst_1       
@@ -1823,93 +1825,93 @@ public class EntityLoot implements Consumer<BiConsumer<ResourceLocation, LootTab
         //  4538: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
         //  4541: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
         //  4544: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4547: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  4550: aload_0         /* this */
-        //  4551: getstatic       net/minecraft/world/entity/EntityType.ZOMBIE_PIGMAN:Lnet/minecraft/world/entity/EntityType;
-        //  4554: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4557: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4560: iconst_1       
-        //  4561: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  4564: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4567: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
-        //  4570: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4573: fconst_0       
-        //  4574: fconst_1       
-        //  4575: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4578: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4581: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4584: fconst_0       
-        //  4585: fconst_1       
-        //  4586: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4589: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4592: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4595: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4598: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4601: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4604: iconst_1       
-        //  4605: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  4608: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4611: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
-        //  4614: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4617: fconst_0       
-        //  4618: fconst_1       
-        //  4619: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4622: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4625: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4628: fconst_0       
-        //  4629: fconst_1       
-        //  4630: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4633: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4636: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4639: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4642: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4645: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4648: iconst_1       
-        //  4649: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  4652: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4655: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
-        //  4658: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4661: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4664: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.killedByPlayer:()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //  4667: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4670: ldc_w           0.025
-        //  4673: ldc_w           0.01
-        //  4676: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceWithLootingCondition.randomChanceAndLootingBoost:(FF)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //  4679: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4682: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4685: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  4688: aload_0         /* this */
-        //  4689: getstatic       net/minecraft/world/entity/EntityType.ZOMBIE_VILLAGER:Lnet/minecraft/world/entity/EntityType;
-        //  4692: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4695: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4698: iconst_1       
-        //  4699: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  4702: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4705: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
-        //  4708: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4711: fconst_0       
-        //  4712: fconst_2       
-        //  4713: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4716: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //  4719: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4722: fconst_0       
-        //  4723: fconst_1       
-        //  4724: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //  4727: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
-        //  4730: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4733: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4736: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4739: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4742: iconst_1       
-        //  4743: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //  4746: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4749: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
-        //  4752: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4755: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4758: getstatic       net/minecraft/world/item/Items.CARROT:Lnet/minecraft/world/item/Item;
-        //  4761: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //  4764: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //  4767: getstatic       net/minecraft/world/item/Items.POTATO:Lnet/minecraft/world/item/Item;
+        //  4547: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4550: iconst_1       
+        //  4551: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4554: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4557: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  4560: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4563: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4566: getstatic       net/minecraft/world/item/Items.CARROT:Lnet/minecraft/world/item/Item;
+        //  4569: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4572: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4575: getstatic       net/minecraft/world/item/Items.POTATO:Lnet/minecraft/world/item/Item;
+        //  4578: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4581: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4584: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.killedByPlayer:()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //  4587: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4590: ldc_w           0.025
+        //  4593: ldc_w           0.01
+        //  4596: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceWithLootingCondition.randomChanceAndLootingBoost:(FF)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //  4599: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4602: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4605: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  4608: aload_0         /* this */
+        //  4609: getstatic       net/minecraft/world/entity/EntityType.ZOMBIE_HORSE:Lnet/minecraft/world/entity/EntityType;
+        //  4612: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4615: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4618: iconst_1       
+        //  4619: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4622: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4625: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  4628: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4631: fconst_0       
+        //  4632: fconst_2       
+        //  4633: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4636: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4639: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4642: fconst_0       
+        //  4643: fconst_1       
+        //  4644: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4647: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4650: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4653: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4656: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4659: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  4662: aload_0         /* this */
+        //  4663: getstatic       net/minecraft/world/entity/EntityType.ZOMBIFIED_PIGLIN:Lnet/minecraft/world/entity/EntityType;
+        //  4666: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4669: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4672: iconst_1       
+        //  4673: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4676: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4679: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  4682: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4685: fconst_0       
+        //  4686: fconst_1       
+        //  4687: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4690: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4693: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4696: fconst_0       
+        //  4697: fconst_1       
+        //  4698: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4701: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4704: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4707: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4710: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4713: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4716: iconst_1       
+        //  4717: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4720: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4723: getstatic       net/minecraft/world/item/Items.GOLD_NUGGET:Lnet/minecraft/world/item/Item;
+        //  4726: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4729: fconst_0       
+        //  4730: fconst_1       
+        //  4731: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4734: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4737: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4740: fconst_0       
+        //  4741: fconst_1       
+        //  4742: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4745: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4748: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4751: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4754: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4757: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4760: iconst_1       
+        //  4761: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4764: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4767: getstatic       net/minecraft/world/item/Items.GOLD_INGOT:Lnet/minecraft/world/item/Item;
         //  4770: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
         //  4773: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
         //  4776: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.killedByPlayer:()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
@@ -1920,107 +1922,199 @@ public class EntityLoot implements Consumer<BiConsumer<ResourceLocation, LootTab
         //  4791: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
         //  4794: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
         //  4797: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
-        //  4800: invokestatic    com/google/common/collect/Sets.newHashSet:()Ljava/util/HashSet;
-        //  4803: astore_2        /* set3 */
-        //  4804: getstatic       net/minecraft/core/Registry.ENTITY_TYPE:Lnet/minecraft/core/DefaultedRegistry;
-        //  4807: invokevirtual   net/minecraft/core/DefaultedRegistry.iterator:()Ljava/util/Iterator;
-        //  4810: astore_3       
-        //  4811: aload_3        
-        //  4812: invokeinterface java/util/Iterator.hasNext:()Z
-        //  4817: ifeq            5008
-        //  4820: aload_3        
-        //  4821: invokeinterface java/util/Iterator.next:()Ljava/lang/Object;
-        //  4826: checkcast       Lnet/minecraft/world/entity/EntityType;
-        //  4829: astore          aku5
-        //  4831: aload           aku5
-        //  4833: invokevirtual   net/minecraft/world/entity/EntityType.getDefaultLootTable:()Lnet/minecraft/resources/ResourceLocation;
-        //  4836: astore          sm6
-        //  4838: getstatic       net/minecraft/data/loot/EntityLoot.SPECIAL_LOOT_TABLE_TYPES:Ljava/util/Set;
-        //  4841: aload           aku5
-        //  4843: invokeinterface java/util/Set.contains:(Ljava/lang/Object;)Z
-        //  4848: ifne            4862
-        //  4851: aload           aku5
-        //  4853: invokevirtual   net/minecraft/world/entity/EntityType.getCategory:()Lnet/minecraft/world/entity/MobCategory;
-        //  4856: getstatic       net/minecraft/world/entity/MobCategory.MISC:Lnet/minecraft/world/entity/MobCategory;
-        //  4859: if_acmpeq       4949
-        //  4862: aload           sm6
-        //  4864: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.EMPTY:Lnet/minecraft/resources/ResourceLocation;
-        //  4867: if_acmpeq       5005
-        //  4870: aload_2         /* set3 */
-        //  4871: aload           sm6
-        //  4873: invokeinterface java/util/Set.add:(Ljava/lang/Object;)Z
-        //  4878: ifeq            5005
-        //  4881: aload_0         /* this */
-        //  4882: getfield        net/minecraft/data/loot/EntityLoot.map:Ljava/util/Map;
-        //  4885: aload           sm6
-        //  4887: invokeinterface java/util/Map.remove:(Ljava/lang/Object;)Ljava/lang/Object;
-        //  4892: checkcast       Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //  4895: astore          a7
-        //  4897: aload           a7
-        //  4899: ifnonnull       4936
-        //  4902: new             Ljava/lang/IllegalStateException;
-        //  4905: dup            
-        //  4906: ldc_w           "Missing loottable '%s' for '%s'"
-        //  4909: iconst_2       
-        //  4910: anewarray       Ljava/lang/Object;
-        //  4913: dup            
-        //  4914: iconst_0       
-        //  4915: aload           sm6
-        //  4917: aastore        
-        //  4918: dup            
-        //  4919: iconst_1       
-        //  4920: getstatic       net/minecraft/core/Registry.ENTITY_TYPE:Lnet/minecraft/core/DefaultedRegistry;
-        //  4923: aload           aku5
-        //  4925: invokevirtual   net/minecraft/core/DefaultedRegistry.getKey:(Ljava/lang/Object;)Lnet/minecraft/resources/ResourceLocation;
-        //  4928: aastore        
-        //  4929: invokestatic    java/lang/String.format:(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-        //  4932: invokespecial   java/lang/IllegalStateException.<init>:(Ljava/lang/String;)V
-        //  4935: athrow         
-        //  4936: aload_1         /* biConsumer */
-        //  4937: aload           sm6
-        //  4939: aload           a7
-        //  4941: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
-        //  4946: goto            5005
-        //  4949: aload           sm6
-        //  4951: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.EMPTY:Lnet/minecraft/resources/ResourceLocation;
-        //  4954: if_acmpeq       5005
-        //  4957: aload_0         /* this */
-        //  4958: getfield        net/minecraft/data/loot/EntityLoot.map:Ljava/util/Map;
-        //  4961: aload           sm6
-        //  4963: invokeinterface java/util/Map.remove:(Ljava/lang/Object;)Ljava/lang/Object;
-        //  4968: ifnull          5005
-        //  4971: new             Ljava/lang/IllegalStateException;
-        //  4974: dup            
-        //  4975: ldc_w           "Weird loottable '%s' for '%s', not a LivingEntity so should not have loot"
-        //  4978: iconst_2       
-        //  4979: anewarray       Ljava/lang/Object;
-        //  4982: dup            
-        //  4983: iconst_0       
-        //  4984: aload           sm6
-        //  4986: aastore        
-        //  4987: dup            
-        //  4988: iconst_1       
-        //  4989: getstatic       net/minecraft/core/Registry.ENTITY_TYPE:Lnet/minecraft/core/DefaultedRegistry;
-        //  4992: aload           aku5
-        //  4994: invokevirtual   net/minecraft/core/DefaultedRegistry.getKey:(Ljava/lang/Object;)Lnet/minecraft/resources/ResourceLocation;
-        //  4997: aastore        
-        //  4998: invokestatic    java/lang/String.format:(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-        //  5001: invokespecial   java/lang/IllegalStateException.<init>:(Ljava/lang/String;)V
-        //  5004: athrow         
-        //  5005: goto            4811
-        //  5008: aload_0         /* this */
-        //  5009: getfield        net/minecraft/data/loot/EntityLoot.map:Ljava/util/Map;
-        //  5012: aload_1         /* biConsumer */
-        //  5013: invokedynamic   BootstrapMethod #1, accept:(Ljava/util/function/BiConsumer;)Ljava/util/function/BiConsumer;
-        //  5018: invokeinterface java/util/Map.forEach:(Ljava/util/function/BiConsumer;)V
-        //  5023: return         
+        //  4800: aload_0         /* this */
+        //  4801: getstatic       net/minecraft/world/entity/EntityType.HOGLIN:Lnet/minecraft/world/entity/EntityType;
+        //  4804: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4807: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4810: iconst_1       
+        //  4811: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4814: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4817: getstatic       net/minecraft/world/item/Items.PORKCHOP:Lnet/minecraft/world/item/Item;
+        //  4820: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4823: fconst_2       
+        //  4824: ldc_w           4.0
+        //  4827: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4830: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4833: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4836: invokestatic    net/minecraft/world/level/storage/loot/functions/SmeltItemFunction.smelted:()Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4839: getstatic       net/minecraft/world/level/storage/loot/LootContext$EntityTarget.THIS:Lnet/minecraft/world/level/storage/loot/LootContext$EntityTarget;
+        //  4842: getstatic       net/minecraft/data/loot/EntityLoot.ENTITY_ON_FIRE:Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;
+        //  4845: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemEntityPropertyCondition.hasProperties:(Lnet/minecraft/world/level/storage/loot/LootContext$EntityTarget;Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //  4848: invokevirtual   net/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4851: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4854: fconst_0       
+        //  4855: fconst_1       
+        //  4856: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4859: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4862: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4865: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4868: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4871: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4874: iconst_1       
+        //  4875: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4878: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4881: getstatic       net/minecraft/world/item/Items.LEATHER:Lnet/minecraft/world/item/Item;
+        //  4884: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4887: fconst_0       
+        //  4888: fconst_1       
+        //  4889: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4892: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4895: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4898: fconst_0       
+        //  4899: fconst_1       
+        //  4900: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4903: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4906: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4909: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4912: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4915: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  4918: aload_0         /* this */
+        //  4919: getstatic       net/minecraft/world/entity/EntityType.PIGLIN:Lnet/minecraft/world/entity/EntityType;
+        //  4922: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4925: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  4928: aload_0         /* this */
+        //  4929: getstatic       net/minecraft/world/entity/EntityType.ZOMBIE_VILLAGER:Lnet/minecraft/world/entity/EntityType;
+        //  4932: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4935: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4938: iconst_1       
+        //  4939: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4942: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4945: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //  4948: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4951: fconst_0       
+        //  4952: fconst_2       
+        //  4953: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4956: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //  4959: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4962: fconst_0       
+        //  4963: fconst_1       
+        //  4964: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //  4967: invokestatic    net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.lootingMultiplier:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootingEnchantFunction$Builder;
+        //  4970: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4973: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4976: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  4979: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4982: iconst_1       
+        //  4983: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //  4986: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4989: getstatic       net/minecraft/world/item/Items.IRON_INGOT:Lnet/minecraft/world/item/Item;
+        //  4992: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  4995: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  4998: getstatic       net/minecraft/world/item/Items.CARROT:Lnet/minecraft/world/item/Item;
+        //  5001: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5004: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5007: getstatic       net/minecraft/world/item/Items.POTATO:Lnet/minecraft/world/item/Item;
+        //  5010: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //  5013: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5016: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.killedByPlayer:()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //  5019: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5022: ldc_w           0.025
+        //  5025: ldc_w           0.01
+        //  5028: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceWithLootingCondition.randomChanceAndLootingBoost:(FF)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //  5031: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //  5034: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5037: invokespecial   net/minecraft/data/loot/EntityLoot.add:(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V
+        //  5040: invokestatic    com/google/common/collect/Sets.newHashSet:()Ljava/util/HashSet;
+        //  5043: astore_2        /* set3 */
+        //  5044: getstatic       net/minecraft/core/Registry.ENTITY_TYPE:Lnet/minecraft/core/DefaultedRegistry;
+        //  5047: invokevirtual   net/minecraft/core/DefaultedRegistry.iterator:()Ljava/util/Iterator;
+        //  5050: astore_3       
+        //  5051: aload_3        
+        //  5052: invokeinterface java/util/Iterator.hasNext:()Z
+        //  5057: ifeq            5248
+        //  5060: aload_3        
+        //  5061: invokeinterface java/util/Iterator.next:()Ljava/lang/Object;
+        //  5066: checkcast       Lnet/minecraft/world/entity/EntityType;
+        //  5069: astore          aoq5
+        //  5071: aload           aoq5
+        //  5073: invokevirtual   net/minecraft/world/entity/EntityType.getDefaultLootTable:()Lnet/minecraft/resources/ResourceLocation;
+        //  5076: astore          uh6
+        //  5078: getstatic       net/minecraft/data/loot/EntityLoot.SPECIAL_LOOT_TABLE_TYPES:Ljava/util/Set;
+        //  5081: aload           aoq5
+        //  5083: invokeinterface java/util/Set.contains:(Ljava/lang/Object;)Z
+        //  5088: ifne            5102
+        //  5091: aload           aoq5
+        //  5093: invokevirtual   net/minecraft/world/entity/EntityType.getCategory:()Lnet/minecraft/world/entity/MobCategory;
+        //  5096: getstatic       net/minecraft/world/entity/MobCategory.MISC:Lnet/minecraft/world/entity/MobCategory;
+        //  5099: if_acmpeq       5189
+        //  5102: aload           uh6
+        //  5104: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.EMPTY:Lnet/minecraft/resources/ResourceLocation;
+        //  5107: if_acmpeq       5245
+        //  5110: aload_2         /* set3 */
+        //  5111: aload           uh6
+        //  5113: invokeinterface java/util/Set.add:(Ljava/lang/Object;)Z
+        //  5118: ifeq            5245
+        //  5121: aload_0         /* this */
+        //  5122: getfield        net/minecraft/data/loot/EntityLoot.map:Ljava/util/Map;
+        //  5125: aload           uh6
+        //  5127: invokeinterface java/util/Map.remove:(Ljava/lang/Object;)Ljava/lang/Object;
+        //  5132: checkcast       Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //  5135: astore          a7
+        //  5137: aload           a7
+        //  5139: ifnonnull       5176
+        //  5142: new             Ljava/lang/IllegalStateException;
+        //  5145: dup            
+        //  5146: ldc_w           "Missing loottable '%s' for '%s'"
+        //  5149: iconst_2       
+        //  5150: anewarray       Ljava/lang/Object;
+        //  5153: dup            
+        //  5154: iconst_0       
+        //  5155: aload           uh6
+        //  5157: aastore        
+        //  5158: dup            
+        //  5159: iconst_1       
+        //  5160: getstatic       net/minecraft/core/Registry.ENTITY_TYPE:Lnet/minecraft/core/DefaultedRegistry;
+        //  5163: aload           aoq5
+        //  5165: invokevirtual   net/minecraft/core/DefaultedRegistry.getKey:(Ljava/lang/Object;)Lnet/minecraft/resources/ResourceLocation;
+        //  5168: aastore        
+        //  5169: invokestatic    java/lang/String.format:(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+        //  5172: invokespecial   java/lang/IllegalStateException.<init>:(Ljava/lang/String;)V
+        //  5175: athrow         
+        //  5176: aload_1         /* biConsumer */
+        //  5177: aload           uh6
+        //  5179: aload           a7
+        //  5181: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //  5186: goto            5245
+        //  5189: aload           uh6
+        //  5191: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.EMPTY:Lnet/minecraft/resources/ResourceLocation;
+        //  5194: if_acmpeq       5245
+        //  5197: aload_0         /* this */
+        //  5198: getfield        net/minecraft/data/loot/EntityLoot.map:Ljava/util/Map;
+        //  5201: aload           uh6
+        //  5203: invokeinterface java/util/Map.remove:(Ljava/lang/Object;)Ljava/lang/Object;
+        //  5208: ifnull          5245
+        //  5211: new             Ljava/lang/IllegalStateException;
+        //  5214: dup            
+        //  5215: ldc_w           "Weird loottable '%s' for '%s', not a LivingEntity so should not have loot"
+        //  5218: iconst_2       
+        //  5219: anewarray       Ljava/lang/Object;
+        //  5222: dup            
+        //  5223: iconst_0       
+        //  5224: aload           uh6
+        //  5226: aastore        
+        //  5227: dup            
+        //  5228: iconst_1       
+        //  5229: getstatic       net/minecraft/core/Registry.ENTITY_TYPE:Lnet/minecraft/core/DefaultedRegistry;
+        //  5232: aload           aoq5
+        //  5234: invokevirtual   net/minecraft/core/DefaultedRegistry.getKey:(Ljava/lang/Object;)Lnet/minecraft/resources/ResourceLocation;
+        //  5237: aastore        
+        //  5238: invokestatic    java/lang/String.format:(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+        //  5241: invokespecial   java/lang/IllegalStateException.<init>:(Ljava/lang/String;)V
+        //  5244: athrow         
+        //  5245: goto            5051
+        //  5248: aload_0         /* this */
+        //  5249: getfield        net/minecraft/data/loot/EntityLoot.map:Ljava/util/Map;
+        //  5252: aload_1         /* biConsumer */
+        //  5253: invokedynamic   BootstrapMethod #1, accept:(Ljava/util/function/BiConsumer;)Ljava/util/function/BiConsumer;
+        //  5258: invokeinterface java/util/Map.forEach:(Ljava/util/function/BiConsumer;)V
+        //  5263: return         
         //    Signature:
         //  (Ljava/util/function/BiConsumer<Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;>;)V
         //    MethodParameters:
         //  Name        Flags  
         //  ----------  -----
         //  biConsumer  
-        //    StackMapTable: 00 06 FD 12 CB 07 03 1B 07 03 1D FD 00 32 07 00 7A 07 03 39 FF 00 49 00 07 07 00 02 07 03 57 07 03 1B 07 03 1D 00 07 03 39 07 00 0F 00 00 FF 00 0C 00 06 07 00 02 07 03 57 07 03 1B 07 03 1D 07 00 7A 07 03 39 00 00 F9 00 37 F9 00 02
+        //    StackMapTable: 00 06 FD 13 BB 07 03 2D 07 03 2F FD 00 32 07 00 7F 07 03 4B FF 00 49 00 07 07 00 02 07 03 69 07 03 2D 07 03 2F 00 07 03 4B 07 00 0F 00 00 FF 00 0C 00 06 07 00 02 07 03 69 07 03 2D 07 03 2F 07 00 7F 07 03 4B 00 00 F9 00 37 F9 00 02
         // 
         // The error that occurred was:
         // 
@@ -2086,12 +2180,12 @@ public class EntityLoot implements Consumer<BiConsumer<ResourceLocation, LootTab
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    private void add(final EntityType<?> aku, final LootTable.Builder a) {
-        this.add(aku.getDefaultLootTable(), a);
+    private void add(final EntityType<?> aoq, final LootTable.Builder a) {
+        this.add(aoq.getDefaultLootTable(), a);
     }
     
-    private void add(final ResourceLocation sm, final LootTable.Builder a) {
-        this.map.put(sm, a);
+    private void add(final ResourceLocation uh, final LootTable.Builder a) {
+        this.map.put(uh, a);
     }
     
     static {
diff --git a/src/net/minecraft/data/loot/FishingLoot.java b/src/net/minecraft/data/loot/FishingLoot.java
index fec1f1d..b8df184 100644
--- a/src/net/minecraft/data/loot/FishingLoot.java
+++ b/src/net/minecraft/data/loot/FishingLoot.java
@@ -45,198 +45,207 @@ public class FishingLoot implements Consumer<BiConsumer<ResourceLocation, LootTa
         //    43: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
         //    46: iconst_2       
         //    47: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setQuality:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //    50: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //    53: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.FISHING_FISH:Lnet/minecraft/resources/ResourceLocation;
-        //    56: invokestatic    net/minecraft/world/level/storage/loot/entries/LootTableReference.lootTableReference:(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //    59: bipush          85
-        //    61: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //    64: iconst_m1      
-        //    65: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setQuality:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //    68: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //    71: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //    74: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
-        //    79: aload_1         /* biConsumer */
-        //    80: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.FISHING_FISH:Lnet/minecraft/resources/ResourceLocation;
-        //    83: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //    86: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //    89: getstatic       net/minecraft/world/item/Items.COD:Lnet/minecraft/world/item/Item;
-        //    92: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //    95: bipush          60
-        //    97: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   100: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   103: getstatic       net/minecraft/world/item/Items.SALMON:Lnet/minecraft/world/item/Item;
-        //   106: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   109: bipush          25
-        //   111: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   114: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   117: getstatic       net/minecraft/world/item/Items.TROPICAL_FISH:Lnet/minecraft/world/item/Item;
-        //   120: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   123: iconst_2       
-        //   124: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   127: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   130: getstatic       net/minecraft/world/item/Items.PUFFERFISH:Lnet/minecraft/world/item/Item;
-        //   133: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   136: bipush          13
-        //   138: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   141: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   144: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //   147: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
-        //   152: aload_1         /* biConsumer */
-        //   153: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.FISHING_JUNK:Lnet/minecraft/resources/ResourceLocation;
-        //   156: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //   159: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   162: getstatic       net/minecraft/world/item/Items.LEATHER_BOOTS:Lnet/minecraft/world/item/Item;
-        //   165: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   168: bipush          10
-        //   170: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   173: fconst_0       
-        //   174: ldc             0.9
-        //   176: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //   179: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //   182: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   185: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   188: getstatic       net/minecraft/world/item/Items.LEATHER:Lnet/minecraft/world/item/Item;
-        //   191: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   194: bipush          10
-        //   196: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   199: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   202: getstatic       net/minecraft/world/item/Items.BONE:Lnet/minecraft/world/item/Item;
-        //   205: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   208: bipush          10
-        //   210: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   213: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   216: getstatic       net/minecraft/world/item/Items.POTION:Lnet/minecraft/world/item/Item;
-        //   219: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   222: bipush          10
-        //   224: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   227: new             Lnet/minecraft/nbt/CompoundTag;
-        //   230: dup            
-        //   231: invokespecial   net/minecraft/nbt/CompoundTag.<init>:()V
-        //   234: invokedynamic   BootstrapMethod #0, accept:()Ljava/util/function/Consumer;
-        //   239: invokestatic    net/minecraft/Util.make:(Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object;
-        //   242: checkcast       Lnet/minecraft/nbt/CompoundTag;
-        //   245: invokestatic    net/minecraft/world/level/storage/loot/functions/SetNbtFunction.setTag:(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //   248: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   251: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   254: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
-        //   257: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   260: iconst_5       
-        //   261: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   264: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   267: getstatic       net/minecraft/world/item/Items.FISHING_ROD:Lnet/minecraft/world/item/Item;
-        //   270: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   273: iconst_2       
-        //   274: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   277: fconst_0       
-        //   278: ldc             0.9
-        //   280: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //   283: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //   286: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   289: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   292: getstatic       net/minecraft/world/item/Items.BOWL:Lnet/minecraft/world/item/Item;
-        //   295: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   298: bipush          10
-        //   300: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   303: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   306: getstatic       net/minecraft/world/item/Items.STICK:Lnet/minecraft/world/item/Item;
-        //   309: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   312: iconst_5       
-        //   313: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   316: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   319: getstatic       net/minecraft/world/item/Items.INK_SAC:Lnet/minecraft/world/item/Item;
-        //   322: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   325: iconst_1       
-        //   326: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   329: bipush          10
-        //   331: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //   334: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //   337: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   340: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   343: getstatic       net/minecraft/world/level/block/Blocks.TRIPWIRE_HOOK:Lnet/minecraft/world/level/block/Block;
-        //   346: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   349: bipush          10
-        //   351: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   354: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   357: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
-        //   360: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   363: bipush          10
-        //   365: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   368: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   371: getstatic       net/minecraft/world/level/block/Blocks.BAMBOO:Lnet/minecraft/world/level/block/Block;
-        //   374: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   377: getstatic       net/minecraft/data/loot/FishingLoot.IN_JUNGLE:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //   380: getstatic       net/minecraft/data/loot/FishingLoot.IN_JUNGLE_HILLS:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //   383: invokeinterface net/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
-        //   388: getstatic       net/minecraft/data/loot/FishingLoot.IN_JUNGLE_EDGE:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //   391: invokevirtual   net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
-        //   394: getstatic       net/minecraft/data/loot/FishingLoot.IN_BAMBOO_JUNGLE:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //   397: invokevirtual   net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
-        //   400: getstatic       net/minecraft/data/loot/FishingLoot.IN_MODIFIED_JUNGLE:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //   403: invokevirtual   net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
-        //   406: getstatic       net/minecraft/data/loot/FishingLoot.IN_MODIFIED_JUNGLE_EDGE:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //   409: invokevirtual   net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
-        //   412: getstatic       net/minecraft/data/loot/FishingLoot.IN_BAMBOO_JUNGLE_HILLS:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
-        //   415: invokevirtual   net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
-        //   418: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;
-        //   421: checkcast       Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   424: bipush          10
-        //   426: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   429: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   432: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //   435: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
-        //   440: aload_1         /* biConsumer */
-        //   441: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.FISHING_TREASURE:Lnet/minecraft/resources/ResourceLocation;
-        //   444: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //   447: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   450: getstatic       net/minecraft/world/level/block/Blocks.LILY_PAD:Lnet/minecraft/world/level/block/Block;
-        //   453: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   456: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   459: getstatic       net/minecraft/world/item/Items.NAME_TAG:Lnet/minecraft/world/item/Item;
-        //   462: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   465: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   468: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
-        //   471: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   474: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   477: getstatic       net/minecraft/world/item/Items.BOW:Lnet/minecraft/world/item/Item;
-        //   480: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   483: fconst_0       
-        //   484: ldc_w           0.25
-        //   487: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //   490: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //   493: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   496: bipush          30
-        //   498: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //   501: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
-        //   504: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
-        //   507: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   510: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   513: getstatic       net/minecraft/world/item/Items.FISHING_ROD:Lnet/minecraft/world/item/Item;
-        //   516: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   519: fconst_0       
-        //   520: ldc_w           0.25
-        //   523: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
-        //   526: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
-        //   529: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   532: bipush          30
-        //   534: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //   537: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
-        //   540: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
-        //   543: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   546: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   549: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
-        //   552: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   555: bipush          30
-        //   557: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
-        //   560: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
-        //   563: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
-        //   566: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   569: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   572: getstatic       net/minecraft/world/item/Items.NAUTILUS_SHELL:Lnet/minecraft/world/item/Item;
-        //   575: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
-        //   578: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
-        //   581: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
-        //   584: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
-        //   589: return         
+        //    50: getstatic       net/minecraft/world/level/storage/loot/LootContext$EntityTarget.THIS:Lnet/minecraft/world/level/storage/loot/LootContext$EntityTarget;
+        //    53: invokestatic    net/minecraft/advancements/critereon/EntityPredicate$Builder.entity:()Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;
+        //    56: iconst_1       
+        //    57: invokestatic    net/minecraft/advancements/critereon/FishingHookPredicate.inOpenWater:(Z)Lnet/minecraft/advancements/critereon/FishingHookPredicate;
+        //    60: invokevirtual   net/minecraft/advancements/critereon/EntityPredicate$Builder.fishingHook:(Lnet/minecraft/advancements/critereon/FishingHookPredicate;)Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;
+        //    63: invokestatic    net/minecraft/world/level/storage/loot/predicates/LootItemEntityPropertyCondition.hasProperties:(Lnet/minecraft/world/level/storage/loot/LootContext$EntityTarget;Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //    66: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;
+        //    69: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    72: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.FISHING_FISH:Lnet/minecraft/resources/ResourceLocation;
+        //    75: invokestatic    net/minecraft/world/level/storage/loot/entries/LootTableReference.lootTableReference:(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    78: bipush          85
+        //    80: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    83: iconst_m1      
+        //    84: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setQuality:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    87: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    90: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //    93: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //    98: aload_1         /* biConsumer */
+        //    99: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.FISHING_FISH:Lnet/minecraft/resources/ResourceLocation;
+        //   102: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   105: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   108: getstatic       net/minecraft/world/item/Items.COD:Lnet/minecraft/world/item/Item;
+        //   111: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   114: bipush          60
+        //   116: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   119: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   122: getstatic       net/minecraft/world/item/Items.SALMON:Lnet/minecraft/world/item/Item;
+        //   125: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   128: bipush          25
+        //   130: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   133: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   136: getstatic       net/minecraft/world/item/Items.TROPICAL_FISH:Lnet/minecraft/world/item/Item;
+        //   139: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   142: iconst_2       
+        //   143: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   146: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   149: getstatic       net/minecraft/world/item/Items.PUFFERFISH:Lnet/minecraft/world/item/Item;
+        //   152: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   155: bipush          13
+        //   157: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   160: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   163: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   166: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //   171: aload_1         /* biConsumer */
+        //   172: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.FISHING_JUNK:Lnet/minecraft/resources/ResourceLocation;
+        //   175: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   178: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   181: getstatic       net/minecraft/world/level/block/Blocks.LILY_PAD:Lnet/minecraft/world/level/block/Block;
+        //   184: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   187: bipush          17
+        //   189: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   192: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   195: getstatic       net/minecraft/world/item/Items.LEATHER_BOOTS:Lnet/minecraft/world/item/Item;
+        //   198: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   201: bipush          10
+        //   203: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   206: fconst_0       
+        //   207: ldc             0.9
+        //   209: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   212: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   215: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   218: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   221: getstatic       net/minecraft/world/item/Items.LEATHER:Lnet/minecraft/world/item/Item;
+        //   224: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   227: bipush          10
+        //   229: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   232: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   235: getstatic       net/minecraft/world/item/Items.BONE:Lnet/minecraft/world/item/Item;
+        //   238: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   241: bipush          10
+        //   243: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   246: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   249: getstatic       net/minecraft/world/item/Items.POTION:Lnet/minecraft/world/item/Item;
+        //   252: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   255: bipush          10
+        //   257: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   260: new             Lnet/minecraft/nbt/CompoundTag;
+        //   263: dup            
+        //   264: invokespecial   net/minecraft/nbt/CompoundTag.<init>:()V
+        //   267: invokedynamic   BootstrapMethod #0, accept:()Ljava/util/function/Consumer;
+        //   272: invokestatic    net/minecraft/Util.make:(Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object;
+        //   275: checkcast       Lnet/minecraft/nbt/CompoundTag;
+        //   278: invokestatic    net/minecraft/world/level/storage/loot/functions/SetNbtFunction.setTag:(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   281: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   284: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   287: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
+        //   290: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   293: iconst_5       
+        //   294: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   297: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   300: getstatic       net/minecraft/world/item/Items.FISHING_ROD:Lnet/minecraft/world/item/Item;
+        //   303: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   306: iconst_2       
+        //   307: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   310: fconst_0       
+        //   311: ldc             0.9
+        //   313: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   316: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   319: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   322: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   325: getstatic       net/minecraft/world/item/Items.BOWL:Lnet/minecraft/world/item/Item;
+        //   328: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   331: bipush          10
+        //   333: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   336: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   339: getstatic       net/minecraft/world/item/Items.STICK:Lnet/minecraft/world/item/Item;
+        //   342: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   345: iconst_5       
+        //   346: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   349: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   352: getstatic       net/minecraft/world/item/Items.INK_SAC:Lnet/minecraft/world/item/Item;
+        //   355: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   358: iconst_1       
+        //   359: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   362: bipush          10
+        //   364: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   367: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   370: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   373: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   376: getstatic       net/minecraft/world/level/block/Blocks.TRIPWIRE_HOOK:Lnet/minecraft/world/level/block/Block;
+        //   379: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   382: bipush          10
+        //   384: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   387: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   390: getstatic       net/minecraft/world/item/Items.ROTTEN_FLESH:Lnet/minecraft/world/item/Item;
+        //   393: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   396: bipush          10
+        //   398: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   401: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   404: getstatic       net/minecraft/world/level/block/Blocks.BAMBOO:Lnet/minecraft/world/level/block/Block;
+        //   407: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   410: getstatic       net/minecraft/data/loot/FishingLoot.IN_JUNGLE:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //   413: getstatic       net/minecraft/data/loot/FishingLoot.IN_JUNGLE_HILLS:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //   416: invokeinterface net/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
+        //   421: getstatic       net/minecraft/data/loot/FishingLoot.IN_JUNGLE_EDGE:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //   424: invokevirtual   net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
+        //   427: getstatic       net/minecraft/data/loot/FishingLoot.IN_BAMBOO_JUNGLE:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //   430: invokevirtual   net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
+        //   433: getstatic       net/minecraft/data/loot/FishingLoot.IN_MODIFIED_JUNGLE:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //   436: invokevirtual   net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
+        //   439: getstatic       net/minecraft/data/loot/FishingLoot.IN_MODIFIED_JUNGLE_EDGE:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //   442: invokevirtual   net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
+        //   445: getstatic       net/minecraft/data/loot/FishingLoot.IN_BAMBOO_JUNGLE_HILLS:Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
+        //   448: invokevirtual   net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder.or:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition$Builder;
+        //   451: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.when:(Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;
+        //   454: checkcast       Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   457: bipush          10
+        //   459: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   462: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   465: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   468: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //   473: aload_1         /* biConsumer */
+        //   474: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.FISHING_TREASURE:Lnet/minecraft/resources/ResourceLocation;
+        //   477: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   480: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   483: getstatic       net/minecraft/world/item/Items.NAME_TAG:Lnet/minecraft/world/item/Item;
+        //   486: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   489: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   492: getstatic       net/minecraft/world/item/Items.SADDLE:Lnet/minecraft/world/item/Item;
+        //   495: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   498: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   501: getstatic       net/minecraft/world/item/Items.BOW:Lnet/minecraft/world/item/Item;
+        //   504: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   507: fconst_0       
+        //   508: ldc_w           0.25
+        //   511: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   514: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   517: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   520: bipush          30
+        //   522: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   525: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //   528: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //   531: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   534: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   537: getstatic       net/minecraft/world/item/Items.FISHING_ROD:Lnet/minecraft/world/item/Item;
+        //   540: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   543: fconst_0       
+        //   544: ldc_w           0.25
+        //   547: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   550: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.setDamage:(Lnet/minecraft/world/level/storage/loot/RandomValueBounds;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   553: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   556: bipush          30
+        //   558: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   561: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //   564: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //   567: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   570: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   573: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //   576: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   579: bipush          30
+        //   581: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //   584: invokestatic    net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.enchantWithLevels:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //   587: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder.allowTreasure:()Lnet/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction$Builder;
+        //   590: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   593: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   596: getstatic       net/minecraft/world/item/Items.NAUTILUS_SHELL:Lnet/minecraft/world/item/Item;
+        //   599: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   602: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   605: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   608: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //   613: return         
         //    Signature:
         //  (Ljava/util/function/BiConsumer<Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;>;)V
         //    MethodParameters:
diff --git a/src/net/minecraft/data/loot/LootTableProvider.java b/src/net/minecraft/data/loot/LootTableProvider.java
index f252cee..2da8563 100644
--- a/src/net/minecraft/data/loot/LootTableProvider.java
+++ b/src/net/minecraft/data/loot/LootTableProvider.java
@@ -30,13 +30,13 @@ public class LootTableProvider implements DataProvider {
     private final DataGenerator generator;
     private final List<Pair<Supplier<Consumer<BiConsumer<ResourceLocation, LootTable.Builder>>>, LootContextParamSet>> subProviders;
     
-    public LootTableProvider(final DataGenerator gy) {
-        this.subProviders = ImmutableList.of(Pair.of(FishingLoot::new, LootContextParamSets.FISHING), Pair.of(ChestLoot::new, LootContextParamSets.CHEST), Pair.of(EntityLoot::new, LootContextParamSets.ENTITY), Pair.of(BlockLoot::new, LootContextParamSets.BLOCK), Pair.of(GiftLoot::new, LootContextParamSets.GIFT));
-        this.generator = gy;
+    public LootTableProvider(final DataGenerator hk) {
+        this.subProviders = ImmutableList.of(Pair.of(FishingLoot::new, LootContextParamSets.FISHING), Pair.of(ChestLoot::new, LootContextParamSets.CHEST), Pair.of(EntityLoot::new, LootContextParamSets.ENTITY), Pair.of(BlockLoot::new, LootContextParamSets.BLOCK), Pair.of(PiglinBarterLoot::new, LootContextParamSets.PIGLIN_BARTER), Pair.of(GiftLoot::new, LootContextParamSets.GIFT));
+        this.generator = hk;
     }
     
     @Override
-    public void run(final HashCache ha) {
+    public void run(final HashCache hm) {
         // 
         // This method could not be decompiled.
         // 
@@ -50,16 +50,16 @@ public class LootTableProvider implements DataProvider {
         //    12: aload_0         /* this */
         //    13: getfield        net/minecraft/data/loot/LootTableProvider.subProviders:Ljava/util/List;
         //    16: aload_3         /* map4 */
-        //    17: invokedynamic   BootstrapMethod #5, accept:(Ljava/util/Map;)Ljava/util/function/Consumer;
+        //    17: invokedynamic   BootstrapMethod #6, accept:(Ljava/util/Map;)Ljava/util/function/Consumer;
         //    22: invokeinterface java/util/List.forEach:(Ljava/util/function/Consumer;)V
         //    27: new             Lnet/minecraft/world/level/storage/loot/ValidationContext;
         //    30: dup            
         //    31: getstatic       net/minecraft/world/level/storage/loot/parameters/LootContextParamSets.ALL_PARAMS:Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;
-        //    34: invokedynamic   BootstrapMethod #6, apply:()Ljava/util/function/Function;
+        //    34: invokedynamic   BootstrapMethod #7, apply:()Ljava/util/function/Function;
         //    39: aload_3         /* map4 */
-        //    40: invokedynamic   BootstrapMethod #7, apply:(Ljava/util/Map;)Ljava/util/function/Function;
+        //    40: invokedynamic   BootstrapMethod #8, apply:(Ljava/util/Map;)Ljava/util/function/Function;
         //    45: invokespecial   net/minecraft/world/level/storage/loot/ValidationContext.<init>:(Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;Ljava/util/function/Function;Ljava/util/function/Function;)V
-        //    48: astore          csg5
+        //    48: astore          dbe5
         //    50: invokestatic    net/minecraft/world/level/storage/loot/BuiltInLootTables.all:()Ljava/util/Set;
         //    53: aload_3         /* map4 */
         //    54: invokeinterface java/util/Map.keySet:()Ljava/util/Set;
@@ -74,30 +74,30 @@ public class LootTableProvider implements DataProvider {
         //    83: aload           6
         //    85: invokeinterface java/util/Iterator.next:()Ljava/lang/Object;
         //    90: checkcast       Lnet/minecraft/resources/ResourceLocation;
-        //    93: astore          sm8
-        //    95: aload           csg5
+        //    93: astore          uh8
+        //    95: aload           dbe5
         //    97: new             Ljava/lang/StringBuilder;
         //   100: dup            
         //   101: invokespecial   java/lang/StringBuilder.<init>:()V
         //   104: ldc             "Missing built-in table: "
         //   106: invokevirtual   java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
-        //   109: aload           sm8
+        //   109: aload           uh8
         //   111: invokevirtual   java/lang/StringBuilder.append:(Ljava/lang/Object;)Ljava/lang/StringBuilder;
         //   114: invokevirtual   java/lang/StringBuilder.toString:()Ljava/lang/String;
         //   117: invokevirtual   net/minecraft/world/level/storage/loot/ValidationContext.reportProblem:(Ljava/lang/String;)V
         //   120: goto            73
         //   123: aload_3         /* map4 */
-        //   124: aload           csg5
-        //   126: invokedynamic   BootstrapMethod #8, accept:(Lnet/minecraft/world/level/storage/loot/ValidationContext;)Ljava/util/function/BiConsumer;
+        //   124: aload           dbe5
+        //   126: invokedynamic   BootstrapMethod #9, accept:(Lnet/minecraft/world/level/storage/loot/ValidationContext;)Ljava/util/function/BiConsumer;
         //   131: invokeinterface java/util/Map.forEach:(Ljava/util/function/BiConsumer;)V
-        //   136: aload           csg5
+        //   136: aload           dbe5
         //   138: invokevirtual   net/minecraft/world/level/storage/loot/ValidationContext.getProblems:()Lcom/google/common/collect/Multimap;
         //   141: astore          multimap7
         //   143: aload           multimap7
         //   145: invokeinterface com/google/common/collect/Multimap.isEmpty:()Z
         //   150: ifne            176
         //   153: aload           multimap7
-        //   155: invokedynamic   BootstrapMethod #9, accept:()Ljava/util/function/BiConsumer;
+        //   155: invokedynamic   BootstrapMethod #10, accept:()Ljava/util/function/BiConsumer;
         //   160: invokeinterface com/google/common/collect/Multimap.forEach:(Ljava/util/function/BiConsumer;)V
         //   165: new             Ljava/lang/IllegalStateException;
         //   168: dup            
@@ -106,15 +106,15 @@ public class LootTableProvider implements DataProvider {
         //   175: athrow         
         //   176: aload_3         /* map4 */
         //   177: aload_2         /* path3 */
-        //   178: aload_1         /* ha */
-        //   179: invokedynamic   BootstrapMethod #10, accept:(Ljava/nio/file/Path;Lnet/minecraft/data/HashCache;)Ljava/util/function/BiConsumer;
+        //   178: aload_1         /* hm */
+        //   179: invokedynamic   BootstrapMethod #11, accept:(Ljava/nio/file/Path;Lnet/minecraft/data/HashCache;)Ljava/util/function/BiConsumer;
         //   184: invokeinterface java/util/Map.forEach:(Ljava/util/function/BiConsumer;)V
         //   189: return         
         //    MethodParameters:
         //  Name  Flags  
         //  ----  -----
-        //  ha    
-        //    StackMapTable: 00 03 FF 00 49 00 07 00 07 00 C4 07 00 C6 07 00 C8 07 00 93 00 07 00 CA 00 00 F9 00 31 FA 00 34
+        //  hm    
+        //    StackMapTable: 00 03 FF 00 49 00 07 00 07 00 CC 07 00 CE 07 00 D0 07 00 9B 00 07 00 D2 00 00 F9 00 31 FA 00 34
         // 
         // The error that occurred was:
         // 
@@ -152,8 +152,8 @@ public class LootTableProvider implements DataProvider {
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    private static Path createPath(final Path path, final ResourceLocation sm) {
-        return path.resolve("data/" + sm.getNamespace() + "/loot_tables/" + sm.getPath() + ".json");
+    private static Path createPath(final Path path, final ResourceLocation uh) {
+        return path.resolve("data/" + uh.getNamespace() + "/loot_tables/" + uh.getPath() + ".json");
     }
     
     @Override
diff --git a/src/net/minecraft/data/loot/PiglinBarterLoot.java b/src/net/minecraft/data/loot/PiglinBarterLoot.java
new file mode 100644
index 0000000..eedb085
--- /dev/null
+++ b/src/net/minecraft/data/loot/PiglinBarterLoot.java
@@ -0,0 +1,331 @@
+package net.minecraft.data.loot;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.storage.loot.LootTable;
+import net.minecraft.resources.ResourceLocation;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+public class PiglinBarterLoot implements Consumer<BiConsumer<ResourceLocation, LootTable.Builder>> {
+    @Override
+    public void accept(final BiConsumer<ResourceLocation, LootTable.Builder> biConsumer) {
+        // 
+        // This method could not be decompiled.
+        // 
+        // Original Bytecode:
+        // 
+        //     1: getstatic       net/minecraft/world/level/storage/loot/BuiltInLootTables.PIGLIN_BARTERING:Lnet/minecraft/resources/ResourceLocation;
+        //     4: invokestatic    net/minecraft/world/level/storage/loot/LootTable.lootTable:()Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //     7: invokestatic    net/minecraft/world/level/storage/loot/LootPool.lootPool:()Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    10: iconst_1       
+        //    11: invokestatic    net/minecraft/world/level/storage/loot/ConstantIntValue.exactly:(I)Lnet/minecraft/world/level/storage/loot/ConstantIntValue;
+        //    14: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.setRolls:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    17: getstatic       net/minecraft/world/item/Items.BOOK:Lnet/minecraft/world/item/Item;
+        //    20: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    23: iconst_5       
+        //    24: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    27: new             Lnet/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder;
+        //    30: dup            
+        //    31: invokespecial   net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder.<init>:()V
+        //    34: getstatic       net/minecraft/world/item/enchantment/Enchantments.SOUL_SPEED:Lnet/minecraft/world/item/enchantment/Enchantment;
+        //    37: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder.withEnchantment:(Lnet/minecraft/world/item/enchantment/Enchantment;)Lnet/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder;
+        //    40: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    43: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    46: getstatic       net/minecraft/world/item/Items.IRON_BOOTS:Lnet/minecraft/world/item/Item;
+        //    49: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    52: bipush          8
+        //    54: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    57: new             Lnet/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder;
+        //    60: dup            
+        //    61: invokespecial   net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder.<init>:()V
+        //    64: getstatic       net/minecraft/world/item/enchantment/Enchantments.SOUL_SPEED:Lnet/minecraft/world/item/enchantment/Enchantment;
+        //    67: invokevirtual   net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder.withEnchantment:(Lnet/minecraft/world/item/enchantment/Enchantment;)Lnet/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction$Builder;
+        //    70: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    73: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //    76: getstatic       net/minecraft/world/item/Items.POTION:Lnet/minecraft/world/item/Item;
+        //    79: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    82: bipush          10
+        //    84: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //    87: new             Lnet/minecraft/nbt/CompoundTag;
+        //    90: dup            
+        //    91: invokespecial   net/minecraft/nbt/CompoundTag.<init>:()V
+        //    94: invokedynamic   BootstrapMethod #0, accept:()Ljava/util/function/Consumer;
+        //    99: invokestatic    net/minecraft/Util.make:(Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object;
+        //   102: checkcast       Lnet/minecraft/nbt/CompoundTag;
+        //   105: invokestatic    net/minecraft/world/level/storage/loot/functions/SetNbtFunction.setTag:(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   108: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   111: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   114: getstatic       net/minecraft/world/item/Items.SPLASH_POTION:Lnet/minecraft/world/item/Item;
+        //   117: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   120: bipush          10
+        //   122: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   125: new             Lnet/minecraft/nbt/CompoundTag;
+        //   128: dup            
+        //   129: invokespecial   net/minecraft/nbt/CompoundTag.<init>:()V
+        //   132: invokedynamic   BootstrapMethod #1, accept:()Ljava/util/function/Consumer;
+        //   137: invokestatic    net/minecraft/Util.make:(Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object;
+        //   140: checkcast       Lnet/minecraft/nbt/CompoundTag;
+        //   143: invokestatic    net/minecraft/world/level/storage/loot/functions/SetNbtFunction.setTag:(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   146: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   149: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   152: getstatic       net/minecraft/world/item/Items.IRON_NUGGET:Lnet/minecraft/world/item/Item;
+        //   155: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   158: bipush          10
+        //   160: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   163: ldc             9.0
+        //   165: ldc             36.0
+        //   167: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   170: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   173: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   176: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   179: getstatic       net/minecraft/world/item/Items.QUARTZ:Lnet/minecraft/world/item/Item;
+        //   182: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   185: bipush          20
+        //   187: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   190: ldc             8.0
+        //   192: ldc             16.0
+        //   194: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   197: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   200: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   203: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   206: getstatic       net/minecraft/world/item/Items.GLOWSTONE_DUST:Lnet/minecraft/world/item/Item;
+        //   209: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   212: bipush          20
+        //   214: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   217: ldc             5.0
+        //   219: ldc             12.0
+        //   221: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   224: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   227: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   230: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   233: getstatic       net/minecraft/world/item/Items.MAGMA_CREAM:Lnet/minecraft/world/item/Item;
+        //   236: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   239: bipush          20
+        //   241: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   244: fconst_2       
+        //   245: ldc             6.0
+        //   247: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   250: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   253: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   256: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   259: getstatic       net/minecraft/world/item/Items.ENDER_PEARL:Lnet/minecraft/world/item/Item;
+        //   262: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   265: bipush          20
+        //   267: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   270: ldc             4.0
+        //   272: ldc             8.0
+        //   274: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   277: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   280: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   283: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   286: getstatic       net/minecraft/world/item/Items.STRING:Lnet/minecraft/world/item/Item;
+        //   289: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   292: bipush          20
+        //   294: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   297: ldc             8.0
+        //   299: ldc             24.0
+        //   301: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   304: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   307: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   310: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   313: getstatic       net/minecraft/world/item/Items.FIRE_CHARGE:Lnet/minecraft/world/item/Item;
+        //   316: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   319: bipush          40
+        //   321: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   324: fconst_1       
+        //   325: ldc             5.0
+        //   327: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   330: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   333: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   336: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   339: getstatic       net/minecraft/world/item/Items.GRAVEL:Lnet/minecraft/world/item/Item;
+        //   342: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   345: bipush          40
+        //   347: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   350: ldc             8.0
+        //   352: ldc             16.0
+        //   354: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   357: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   360: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   363: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   366: getstatic       net/minecraft/world/item/Items.LEATHER:Lnet/minecraft/world/item/Item;
+        //   369: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   372: bipush          40
+        //   374: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   377: ldc             4.0
+        //   379: ldc             10.0
+        //   381: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   384: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   387: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   390: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   393: getstatic       net/minecraft/world/item/Items.NETHER_BRICK:Lnet/minecraft/world/item/Item;
+        //   396: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   399: bipush          40
+        //   401: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   404: ldc             4.0
+        //   406: ldc             16.0
+        //   408: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   411: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   414: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   417: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   420: getstatic       net/minecraft/world/item/Items.OBSIDIAN:Lnet/minecraft/world/item/Item;
+        //   423: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   426: bipush          40
+        //   428: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   431: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   434: getstatic       net/minecraft/world/item/Items.CRYING_OBSIDIAN:Lnet/minecraft/world/item/Item;
+        //   437: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   440: bipush          40
+        //   442: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   445: fconst_1       
+        //   446: ldc             3.0
+        //   448: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   451: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   454: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   457: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   460: getstatic       net/minecraft/world/item/Items.SOUL_SAND:Lnet/minecraft/world/item/Item;
+        //   463: invokestatic    net/minecraft/world/level/storage/loot/entries/LootItem.lootTableItem:(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   466: bipush          40
+        //   468: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.setWeight:(I)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   471: ldc             4.0
+        //   473: ldc             16.0
+        //   475: invokestatic    net/minecraft/world/level/storage/loot/RandomValueBounds.between:(FF)Lnet/minecraft/world/level/storage/loot/RandomValueBounds;
+        //   478: invokestatic    net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.setCount:(Lnet/minecraft/world/level/storage/loot/RandomIntGenerator;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder;
+        //   481: invokevirtual   net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder.apply:(Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder;)Lnet/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer$Builder;
+        //   484: invokevirtual   net/minecraft/world/level/storage/loot/LootPool$Builder.add:(Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder;
+        //   487: invokevirtual   net/minecraft/world/level/storage/loot/LootTable$Builder.withPool:(Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
+        //   490: invokeinterface java/util/function/BiConsumer.accept:(Ljava/lang/Object;Ljava/lang/Object;)V
+        //   495: return         
+        //    Signature:
+        //  (Ljava/util/function/BiConsumer<Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;>;)V
+        //    MethodParameters:
+        //  Name        Flags  
+        //  ----------  -----
+        //  biConsumer  
+        // 
+        // The error that occurred was:
+        // 
+        // java.lang.UnsupportedOperationException: The requested operation is not supported.
+        //     at com.strobel.util.ContractUtils.unsupported(ContractUtils.java:27)
+        //     at com.strobel.assembler.metadata.TypeReference.getRawType(TypeReference.java:276)
+        //     at com.strobel.assembler.metadata.TypeReference.getRawType(TypeReference.java:271)
+        //     at com.strobel.assembler.metadata.TypeReference.makeGenericType(TypeReference.java:150)
+        //     at com.strobel.assembler.metadata.TypeSubstitutionVisitor.visitParameterizedType(TypeSubstitutionVisitor.java:187)
+        //     at com.strobel.assembler.metadata.TypeSubstitutionVisitor.visitParameterizedType(TypeSubstitutionVisitor.java:25)
+        //     at com.strobel.assembler.metadata.ParameterizedType.accept(ParameterizedType.java:103)
+        //     at com.strobel.assembler.metadata.TypeSubstitutionVisitor.visit(TypeSubstitutionVisitor.java:39)
+        //     at com.strobel.assembler.metadata.TypeSubstitutionVisitor.visitMethod(TypeSubstitutionVisitor.java:276)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2591)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2695)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2463)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2695)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:770)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:766)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferCall(TypeAnalysis.java:2515)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.doInferTypeForExpression(TypeAnalysis.java:1029)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypeForExpression(TypeAnalysis.java:803)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:672)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.inferTypesForVariables(TypeAnalysis.java:586)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:397)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.run(TypeAnalysis.java:96)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:109)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:42)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:214)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
+        //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
+        //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
+        //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
+        //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
+        //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
+        //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
+        //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
+        //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
+        //     at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
+        //     at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
+        //     at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:177)
+        // 
+        throw new IllegalStateException("An error occurred while decompiling this method.");
+    }
+}
diff --git a/src/net/minecraft/data/models/BlockModelGenerators.java b/src/net/minecraft/data/models/BlockModelGenerators.java
new file mode 100644
index 0000000..65844d8
--- /dev/null
+++ b/src/net/minecraft/data/models/BlockModelGenerators.java
@@ -0,0 +1,1727 @@
+package net.minecraft.data.models;
+
+import javax.annotation.Nullable;
+import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.core.FrontAndTop;
+import net.minecraft.world.level.block.state.properties.StructureMode;
+import net.minecraft.data.models.blockstates.VariantProperty;
+import net.minecraft.world.level.block.state.properties.PistonType;
+import java.util.Arrays;
+import java.util.function.UnaryOperator;
+import com.google.common.collect.ImmutableList;
+import java.util.function.BiFunction;
+import net.minecraft.world.level.block.state.properties.ComparatorMode;
+import net.minecraft.world.level.block.state.properties.RedstoneSide;
+import net.minecraft.world.level.block.state.properties.BellAttachType;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import net.minecraft.world.level.block.state.properties.BambooLeaves;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.List;
+import net.minecraft.data.models.model.TextureSlot;
+import net.minecraft.world.level.block.state.properties.RailShape;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.properties.SlabType;
+import java.util.function.Function;
+import net.minecraft.data.models.model.ModelTemplate;
+import net.minecraft.world.level.block.state.properties.StairsShape;
+import net.minecraft.world.level.block.state.properties.Half;
+import net.minecraft.world.level.block.state.properties.WallSide;
+import net.minecraft.data.models.blockstates.Condition;
+import net.minecraft.data.models.blockstates.MultiPartGenerator;
+import net.minecraft.world.level.block.state.properties.DoorHingeSide;
+import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
+import net.minecraft.world.level.block.state.properties.AttachFace;
+import net.minecraft.data.models.model.TexturedModel;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
+import net.minecraft.data.models.blockstates.MultiVariantGenerator;
+import net.minecraft.data.models.blockstates.VariantProperties;
+import net.minecraft.data.models.blockstates.Variant;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.data.models.blockstates.PropertyDispatch;
+import net.minecraft.world.item.Items;
+import net.minecraft.data.models.model.TextureMapping;
+import net.minecraft.data.models.model.ModelTemplates;
+import net.minecraft.data.models.model.DelegatedModel;
+import net.minecraft.data.models.model.ModelLocationUtils;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.item.Item;
+import com.google.gson.JsonElement;
+import java.util.function.Supplier;
+import net.minecraft.resources.ResourceLocation;
+import java.util.function.BiConsumer;
+import net.minecraft.data.models.blockstates.BlockStateGenerator;
+import java.util.function.Consumer;
+
+public class BlockModelGenerators {
+    private final Consumer<BlockStateGenerator> blockStateOutput;
+    private final BiConsumer<ResourceLocation, Supplier<JsonElement>> modelOutput;
+    private final Consumer<Item> skippedAutoModelsOutput;
+    
+    public BlockModelGenerators(final Consumer<BlockStateGenerator> consumer1, final BiConsumer<ResourceLocation, Supplier<JsonElement>> biConsumer, final Consumer<Item> consumer3) {
+        this.blockStateOutput = consumer1;
+        this.modelOutput = biConsumer;
+        this.skippedAutoModelsOutput = consumer3;
+    }
+    
+    private void skipAutoItemBlock(final Block bvr) {
+        this.skippedAutoModelsOutput.accept(bvr.asItem());
+    }
+    
+    private void delegateItemModel(final Block bvr, final ResourceLocation uh) {
+        this.modelOutput.accept(ModelLocationUtils.getModelLocation(bvr.asItem()), new DelegatedModel(uh));
+    }
+    
+    private void delegateItemModel(final Item bke, final ResourceLocation uh) {
+        this.modelOutput.accept(ModelLocationUtils.getModelLocation(bke), new DelegatedModel(uh));
+    }
+    
+    private void createSimpleFlatItemModel(final Item bke) {
+        ModelTemplates.FLAT_ITEM.create(ModelLocationUtils.getModelLocation(bke), TextureMapping.layer0(bke), this.modelOutput);
+    }
+    
+    private void createSimpleFlatItemModel(final Block bvr) {
+        final Item bke3 = bvr.asItem();
+        if (bke3 != Items.AIR) {
+            ModelTemplates.FLAT_ITEM.create(ModelLocationUtils.getModelLocation(bke3), TextureMapping.layer0(bvr), this.modelOutput);
+        }
+    }
+    
+    private void createSimpleFlatItemModel(final Block bvr, final String string) {
+        final Item bke4 = bvr.asItem();
+        ModelTemplates.FLAT_ITEM.create(ModelLocationUtils.getModelLocation(bke4), TextureMapping.layer0(TextureMapping.getBlockTexture(bvr, string)), this.modelOutput);
+    }
+    
+    private static PropertyDispatch createHorizontalFacingDispatch() {
+        return PropertyDispatch.<Direction>property((Property<Direction>)BlockStateProperties.HORIZONTAL_FACING).select(Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.NORTH, Variant.variant());
+    }
+    
+    private static PropertyDispatch createHorizontalFacingDispatchAlt() {
+        return PropertyDispatch.<Direction>property((Property<Direction>)BlockStateProperties.HORIZONTAL_FACING).select(Direction.SOUTH, Variant.variant()).select(Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.NORTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270));
+    }
+    
+    private static PropertyDispatch createTorchHorizontalDispatch() {
+        return PropertyDispatch.<Direction>property((Property<Direction>)BlockStateProperties.HORIZONTAL_FACING).select(Direction.EAST, Variant.variant()).select(Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.NORTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270));
+    }
+    
+    private static PropertyDispatch createFacingDispatch() {
+        return PropertyDispatch.<Direction>property((Property<Direction>)BlockStateProperties.FACING).select(Direction.DOWN, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90)).select(Direction.UP, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270)).select(Direction.NORTH, Variant.variant()).select(Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90));
+    }
+    
+    private static MultiVariantGenerator createRotatedVariant(final Block bvr, final ResourceLocation uh) {
+        return MultiVariantGenerator.multiVariant(bvr, createRotatedVariants(uh));
+    }
+    
+    private static Variant[] createRotatedVariants(final ResourceLocation uh) {
+        return new Variant[] { Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270) };
+    }
+    
+    private static MultiVariantGenerator createRotatedVariant(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3) {
+        return MultiVariantGenerator.multiVariant(bvr, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180));
+    }
+    
+    private static PropertyDispatch createBooleanModelDispatch(final BooleanProperty cga, final ResourceLocation uh2, final ResourceLocation uh3) {
+        return PropertyDispatch.<Boolean>property((Property<Boolean>)cga).select(true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3));
+    }
+    
+    private void createRotatedMirroredVariantBlock(final Block bvr) {
+        final ResourceLocation uh3 = TexturedModel.CUBE.create(bvr, this.modelOutput);
+        final ResourceLocation uh4 = TexturedModel.CUBE_MIRRORED.create(bvr, this.modelOutput);
+        this.blockStateOutput.accept(createRotatedVariant(bvr, uh3, uh4));
+    }
+    
+    private void createRotatedVariantBlock(final Block bvr) {
+        final ResourceLocation uh3 = TexturedModel.CUBE.create(bvr, this.modelOutput);
+        this.blockStateOutput.accept(createRotatedVariant(bvr, uh3));
+    }
+    
+    private static BlockStateGenerator createButton(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3) {
+        return MultiVariantGenerator.multiVariant(bvr).with(PropertyDispatch.<Boolean>property((Property<Boolean>)BlockStateProperties.POWERED).select(false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3))).with(PropertyDispatch.<AttachFace, Direction>properties(BlockStateProperties.ATTACH_FACE, (Property<Direction>)BlockStateProperties.HORIZONTAL_FACING).select(AttachFace.FLOOR, Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(AttachFace.FLOOR, Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(AttachFace.FLOOR, Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(AttachFace.FLOOR, Direction.NORTH, Variant.variant()).select(AttachFace.WALL, Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(AttachFace.WALL, Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(AttachFace.WALL, Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(AttachFace.WALL, Direction.NORTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(AttachFace.CEILING, Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180)).select(AttachFace.CEILING, Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180)).select(AttachFace.CEILING, Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180)).select(AttachFace.CEILING, Direction.NORTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180)));
+    }
+    
+    private static PropertyDispatch.C4<Direction, DoubleBlockHalf, DoorHingeSide, Boolean> configureDoorHalf(final PropertyDispatch.C4<Direction, DoubleBlockHalf, DoorHingeSide, Boolean> d, final DoubleBlockHalf cgf, final ResourceLocation uh3, final ResourceLocation uh4) {
+        return d.select(Direction.EAST, cgf, DoorHingeSide.LEFT, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(Direction.SOUTH, cgf, DoorHingeSide.LEFT, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.WEST, cgf, DoorHingeSide.LEFT, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.NORTH, cgf, DoorHingeSide.LEFT, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.EAST, cgf, DoorHingeSide.RIGHT, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).select(Direction.SOUTH, cgf, DoorHingeSide.RIGHT, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.WEST, cgf, DoorHingeSide.RIGHT, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.NORTH, cgf, DoorHingeSide.RIGHT, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.EAST, cgf, DoorHingeSide.LEFT, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.SOUTH, cgf, DoorHingeSide.LEFT, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.WEST, cgf, DoorHingeSide.LEFT, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.NORTH, cgf, DoorHingeSide.LEFT, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).select(Direction.EAST, cgf, DoorHingeSide.RIGHT, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.SOUTH, cgf, DoorHingeSide.RIGHT, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(Direction.WEST, cgf, DoorHingeSide.RIGHT, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.NORTH, cgf, DoorHingeSide.RIGHT, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180));
+    }
+    
+    private static BlockStateGenerator createDoor(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3, final ResourceLocation uh4, final ResourceLocation uh5) {
+        return MultiVariantGenerator.multiVariant(bvr).with(configureDoorHalf(configureDoorHalf(PropertyDispatch.<Direction, DoubleBlockHalf, DoorHingeSide, Boolean>properties((Property<Direction>)BlockStateProperties.HORIZONTAL_FACING, BlockStateProperties.DOUBLE_BLOCK_HALF, BlockStateProperties.DOOR_HINGE, (Property<Boolean>)BlockStateProperties.OPEN), DoubleBlockHalf.LOWER, uh2, uh3), DoubleBlockHalf.UPPER, uh4, uh5));
+    }
+    
+    private static BlockStateGenerator createFence(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3) {
+        return MultiPartGenerator.multiPart(bvr).with(Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.EAST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.SOUTH, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.WEST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true));
+    }
+    
+    private static BlockStateGenerator createWall(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3, final ResourceLocation uh4) {
+        return MultiPartGenerator.multiPart(bvr).with(Condition.condition().<Boolean>term(BlockStateProperties.UP, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).with(Condition.condition().<WallSide>term(BlockStateProperties.NORTH_WALL, WallSide.LOW), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<WallSide>term(BlockStateProperties.EAST_WALL, WallSide.LOW), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<WallSide>term(BlockStateProperties.SOUTH_WALL, WallSide.LOW), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<WallSide>term(BlockStateProperties.WEST_WALL, WallSide.LOW), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<WallSide>term(BlockStateProperties.NORTH_WALL, WallSide.TALL), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<WallSide>term(BlockStateProperties.EAST_WALL, WallSide.TALL), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<WallSide>term(BlockStateProperties.SOUTH_WALL, WallSide.TALL), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<WallSide>term(BlockStateProperties.WEST_WALL, WallSide.TALL), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true));
+    }
+    
+    private static BlockStateGenerator createFenceGate(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3, final ResourceLocation uh4, final ResourceLocation uh5) {
+        return MultiVariantGenerator.multiVariant(bvr, Variant.variant().<Boolean>with(VariantProperties.UV_LOCK, true)).with(createHorizontalFacingDispatchAlt()).with(PropertyDispatch.<Boolean, Boolean>properties((Property<Boolean>)BlockStateProperties.IN_WALL, (Property<Boolean>)BlockStateProperties.OPEN).select(false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5)).select(false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)));
+    }
+    
+    private static BlockStateGenerator createStairs(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3, final ResourceLocation uh4) {
+        return MultiVariantGenerator.multiVariant(bvr).with(PropertyDispatch.<Direction, Half, StairsShape>properties((Property<Direction>)BlockStateProperties.HORIZONTAL_FACING, BlockStateProperties.HALF, BlockStateProperties.STAIRS_SHAPE).select(Direction.EAST, Half.BOTTOM, StairsShape.STRAIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(Direction.WEST, Half.BOTTOM, StairsShape.STRAIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.SOUTH, Half.BOTTOM, StairsShape.STRAIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.NORTH, Half.BOTTOM, StairsShape.STRAIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.EAST, Half.BOTTOM, StairsShape.OUTER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).select(Direction.WEST, Half.BOTTOM, StairsShape.OUTER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.SOUTH, Half.BOTTOM, StairsShape.OUTER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.NORTH, Half.BOTTOM, StairsShape.OUTER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.EAST, Half.BOTTOM, StairsShape.OUTER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.WEST, Half.BOTTOM, StairsShape.OUTER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.SOUTH, Half.BOTTOM, StairsShape.OUTER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).select(Direction.NORTH, Half.BOTTOM, StairsShape.OUTER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.EAST, Half.BOTTOM, StairsShape.INNER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(Direction.WEST, Half.BOTTOM, StairsShape.INNER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.SOUTH, Half.BOTTOM, StairsShape.INNER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.NORTH, Half.BOTTOM, StairsShape.INNER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.EAST, Half.BOTTOM, StairsShape.INNER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.WEST, Half.BOTTOM, StairsShape.INNER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.SOUTH, Half.BOTTOM, StairsShape.INNER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(Direction.NORTH, Half.BOTTOM, StairsShape.INNER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.EAST, Half.TOP, StairsShape.STRAIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.WEST, Half.TOP, StairsShape.STRAIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.SOUTH, Half.TOP, StairsShape.STRAIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.NORTH, Half.TOP, StairsShape.STRAIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.EAST, Half.TOP, StairsShape.OUTER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.WEST, Half.TOP, StairsShape.OUTER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.SOUTH, Half.TOP, StairsShape.OUTER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.NORTH, Half.TOP, StairsShape.OUTER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.EAST, Half.TOP, StairsShape.OUTER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.WEST, Half.TOP, StairsShape.OUTER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.SOUTH, Half.TOP, StairsShape.OUTER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.NORTH, Half.TOP, StairsShape.OUTER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.EAST, Half.TOP, StairsShape.INNER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.WEST, Half.TOP, StairsShape.INNER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.SOUTH, Half.TOP, StairsShape.INNER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.NORTH, Half.TOP, StairsShape.INNER_RIGHT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.EAST, Half.TOP, StairsShape.INNER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.WEST, Half.TOP, StairsShape.INNER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.SOUTH, Half.TOP, StairsShape.INNER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).select(Direction.NORTH, Half.TOP, StairsShape.INNER_LEFT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)));
+    }
+    
+    private static BlockStateGenerator createOrientableTrapdoor(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3, final ResourceLocation uh4) {
+        return MultiVariantGenerator.multiVariant(bvr).with(PropertyDispatch.<Direction, Half, Boolean>properties((Property<Direction>)BlockStateProperties.HORIZONTAL_FACING, BlockStateProperties.HALF, (Property<Boolean>)BlockStateProperties.OPEN).select(Direction.NORTH, Half.BOTTOM, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(Direction.SOUTH, Half.BOTTOM, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.EAST, Half.BOTTOM, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.WEST, Half.BOTTOM, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.NORTH, Half.TOP, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(Direction.SOUTH, Half.TOP, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.EAST, Half.TOP, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.WEST, Half.TOP, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.NORTH, Half.BOTTOM, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).select(Direction.SOUTH, Half.BOTTOM, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.EAST, Half.BOTTOM, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.WEST, Half.BOTTOM, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.NORTH, Half.TOP, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.SOUTH, Half.TOP, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R0)).select(Direction.EAST, Half.TOP, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.WEST, Half.TOP, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)));
+    }
+    
+    private static BlockStateGenerator createTrapdoor(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3, final ResourceLocation uh4) {
+        return MultiVariantGenerator.multiVariant(bvr).with(PropertyDispatch.<Direction, Half, Boolean>properties((Property<Direction>)BlockStateProperties.HORIZONTAL_FACING, BlockStateProperties.HALF, (Property<Boolean>)BlockStateProperties.OPEN).select(Direction.NORTH, Half.BOTTOM, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(Direction.SOUTH, Half.BOTTOM, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(Direction.EAST, Half.BOTTOM, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(Direction.WEST, Half.BOTTOM, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(Direction.NORTH, Half.TOP, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(Direction.SOUTH, Half.TOP, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(Direction.EAST, Half.TOP, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(Direction.WEST, Half.TOP, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(Direction.NORTH, Half.BOTTOM, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).select(Direction.SOUTH, Half.BOTTOM, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.EAST, Half.BOTTOM, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.WEST, Half.BOTTOM, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.NORTH, Half.TOP, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).select(Direction.SOUTH, Half.TOP, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.EAST, Half.TOP, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.WEST, Half.TOP, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)));
+    }
+    
+    private static MultiVariantGenerator createSimpleBlock(final Block bvr, final ResourceLocation uh) {
+        return MultiVariantGenerator.multiVariant(bvr, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh));
+    }
+    
+    private static PropertyDispatch createRotatedPillar() {
+        return PropertyDispatch.<Direction.Axis>property(BlockStateProperties.AXIS).select(Direction.Axis.Y, Variant.variant()).select(Direction.Axis.Z, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90)).select(Direction.Axis.X, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90));
+    }
+    
+    private static BlockStateGenerator createAxisAlignedPillarBlock(final Block bvr, final ResourceLocation uh) {
+        return MultiVariantGenerator.multiVariant(bvr, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh)).with(createRotatedPillar());
+    }
+    
+    private void createAxisAlignedPillarBlock(final Block bvr, final TexturedModel.Provider a) {
+        final ResourceLocation uh4 = a.create(bvr, this.modelOutput);
+        this.blockStateOutput.accept(createAxisAlignedPillarBlock(bvr, uh4));
+    }
+    
+    private void createHorizontallyRotatedBlock(final Block bvr, final TexturedModel.Provider a) {
+        final ResourceLocation uh4 = a.create(bvr, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).with(createHorizontalFacingDispatch()));
+    }
+    
+    private static BlockStateGenerator createRotatedPillarWithHorizontalVariant(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3) {
+        return MultiVariantGenerator.multiVariant(bvr).with(PropertyDispatch.<Direction.Axis>property(BlockStateProperties.AXIS).select(Direction.Axis.Y, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(Direction.Axis.Z, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90)).select(Direction.Axis.X, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)));
+    }
+    
+    private void createRotatedPillarWithHorizontalVariant(final Block bvr, final TexturedModel.Provider a2, final TexturedModel.Provider a3) {
+        final ResourceLocation uh5 = a2.create(bvr, this.modelOutput);
+        final ResourceLocation uh6 = a3.create(bvr, this.modelOutput);
+        this.blockStateOutput.accept(createRotatedPillarWithHorizontalVariant(bvr, uh5, uh6));
+    }
+    
+    private ResourceLocation createSuffixedVariant(final Block bvr, final String string, final ModelTemplate iw, final Function<ResourceLocation, TextureMapping> function) {
+        return iw.createWithSuffix(bvr, string, function.apply(TextureMapping.getBlockTexture(bvr, string)), this.modelOutput);
+    }
+    
+    private static BlockStateGenerator createPressurePlate(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3) {
+        return MultiVariantGenerator.multiVariant(bvr).with(createBooleanModelDispatch(BlockStateProperties.POWERED, uh3, uh2));
+    }
+    
+    private static BlockStateGenerator createSlab(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3, final ResourceLocation uh4) {
+        return MultiVariantGenerator.multiVariant(bvr).with(PropertyDispatch.<SlabType>property(BlockStateProperties.SLAB_TYPE).select(SlabType.BOTTOM, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(SlabType.TOP, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(SlabType.DOUBLE, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)));
+    }
+    
+    private void createTrivialCube(final Block bvr) {
+        this.createTrivialBlock(bvr, TexturedModel.CUBE);
+    }
+    
+    private void createTrivialBlock(final Block bvr, final TexturedModel.Provider a) {
+        this.blockStateOutput.accept(createSimpleBlock(bvr, a.create(bvr, this.modelOutput)));
+    }
+    
+    private void createTrivialBlock(final Block bvr, final TextureMapping iy, final ModelTemplate iw) {
+        final ResourceLocation uh5 = iw.create(bvr, iy, this.modelOutput);
+        this.blockStateOutput.accept(createSimpleBlock(bvr, uh5));
+    }
+    
+    private BlockFamilyProvider family(final Block bvr, final TexturedModel ja) {
+        return new BlockFamilyProvider(ja.getMapping()).fullBlock(bvr, ja.getTemplate());
+    }
+    
+    private BlockFamilyProvider family(final Block bvr, final TexturedModel.Provider a) {
+        final TexturedModel ja4 = a.get(bvr);
+        return new BlockFamilyProvider(ja4.getMapping()).fullBlock(bvr, ja4.getTemplate());
+    }
+    
+    private BlockFamilyProvider family(final Block bvr) {
+        return this.family(bvr, TexturedModel.CUBE);
+    }
+    
+    private BlockFamilyProvider family(final TextureMapping iy) {
+        return new BlockFamilyProvider(iy);
+    }
+    
+    private void createDoor(final Block bvr) {
+        final TextureMapping iy3 = TextureMapping.door(bvr);
+        final ResourceLocation uh4 = ModelTemplates.DOOR_BOTTOM.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh5 = ModelTemplates.DOOR_BOTTOM_HINGE.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh6 = ModelTemplates.DOOR_TOP.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh7 = ModelTemplates.DOOR_TOP_HINGE.create(bvr, iy3, this.modelOutput);
+        this.createSimpleFlatItemModel(bvr.asItem());
+        this.blockStateOutput.accept(createDoor(bvr, uh4, uh5, uh6, uh7));
+    }
+    
+    private void createOrientableTrapdoor(final Block bvr) {
+        final TextureMapping iy3 = TextureMapping.defaultTexture(bvr);
+        final ResourceLocation uh4 = ModelTemplates.ORIENTABLE_TRAPDOOR_TOP.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh5 = ModelTemplates.ORIENTABLE_TRAPDOOR_BOTTOM.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh6 = ModelTemplates.ORIENTABLE_TRAPDOOR_OPEN.create(bvr, iy3, this.modelOutput);
+        this.blockStateOutput.accept(createOrientableTrapdoor(bvr, uh4, uh5, uh6));
+        this.delegateItemModel(bvr, uh5);
+    }
+    
+    private void createTrapdoor(final Block bvr) {
+        final TextureMapping iy3 = TextureMapping.defaultTexture(bvr);
+        final ResourceLocation uh4 = ModelTemplates.TRAPDOOR_TOP.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh5 = ModelTemplates.TRAPDOOR_BOTTOM.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh6 = ModelTemplates.TRAPDOOR_OPEN.create(bvr, iy3, this.modelOutput);
+        this.blockStateOutput.accept(createTrapdoor(bvr, uh4, uh5, uh6));
+        this.delegateItemModel(bvr, uh5);
+    }
+    
+    private WoodProvider woodProvider(final Block bvr) {
+        return new WoodProvider(TextureMapping.logColumn(bvr));
+    }
+    
+    private void createNonTemplateModelBlock(final Block bvr) {
+        this.createNonTemplateModelBlock(bvr, bvr);
+    }
+    
+    private void createNonTemplateModelBlock(final Block bvr1, final Block bvr2) {
+        this.blockStateOutput.accept(createSimpleBlock(bvr1, ModelLocationUtils.getModelLocation(bvr2)));
+    }
+    
+    private void createCrossBlockWithDefaultItem(final Block bvr, final TintState c) {
+        this.createSimpleFlatItemModel(bvr);
+        this.createCrossBlock(bvr, c);
+    }
+    
+    private void createCrossBlockWithDefaultItem(final Block bvr, final TintState c, final TextureMapping iy) {
+        this.createSimpleFlatItemModel(bvr);
+        this.createCrossBlock(bvr, c, iy);
+    }
+    
+    private void createCrossBlock(final Block bvr, final TintState c) {
+        final TextureMapping iy4 = TextureMapping.cross(bvr);
+        this.createCrossBlock(bvr, c, iy4);
+    }
+    
+    private void createCrossBlock(final Block bvr, final TintState c, final TextureMapping iy) {
+        final ResourceLocation uh5 = c.getCross().create(bvr, iy, this.modelOutput);
+        this.blockStateOutput.accept(createSimpleBlock(bvr, uh5));
+    }
+    
+    private void createPlant(final Block bvr1, final Block bvr2, final TintState c) {
+        this.createCrossBlockWithDefaultItem(bvr1, c);
+        final TextureMapping iy5 = TextureMapping.plant(bvr1);
+        final ResourceLocation uh6 = c.getCrossPot().create(bvr2, iy5, this.modelOutput);
+        this.blockStateOutput.accept(createSimpleBlock(bvr2, uh6));
+    }
+    
+    private void createCoralFans(final Block bvr1, final Block bvr2) {
+        final TexturedModel ja4 = TexturedModel.CORAL_FAN.get(bvr1);
+        final ResourceLocation uh5 = ja4.create(bvr1, this.modelOutput);
+        this.blockStateOutput.accept(createSimpleBlock(bvr1, uh5));
+        final ResourceLocation uh6 = ModelTemplates.CORAL_WALL_FAN.create(bvr2, ja4.getMapping(), this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr2, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6)).with(createHorizontalFacingDispatch()));
+        this.createSimpleFlatItemModel(bvr1);
+    }
+    
+    private void createStems(final Block bvr1, final Block bvr2) {
+        this.createSimpleFlatItemModel(bvr1.asItem());
+        final TextureMapping iy4 = TextureMapping.stem(bvr1);
+        final TextureMapping iy5 = TextureMapping.attachedStem(bvr1, bvr2);
+        final ResourceLocation uh6 = ModelTemplates.ATTACHED_STEM.create(bvr2, iy5, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr2, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6)).with(PropertyDispatch.<Direction>property((Property<Direction>)BlockStateProperties.HORIZONTAL_FACING).select(Direction.WEST, Variant.variant()).select(Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.NORTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180))));
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr1).with(PropertyDispatch.<Comparable>property((Property<Comparable>)BlockStateProperties.AGE_7).generate(integer -> Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelTemplates.STEMS[integer].create(bvr1, iy4, this.modelOutput)))));
+    }
+    
+    private void createCoral(final Block bvr1, final Block bvr2, final Block bvr3, final Block bvr4, final Block bvr5, final Block bvr6, final Block bvr7, final Block bvr8) {
+        this.createCrossBlockWithDefaultItem(bvr1, TintState.NOT_TINTED);
+        this.createCrossBlockWithDefaultItem(bvr2, TintState.NOT_TINTED);
+        this.createTrivialCube(bvr3);
+        this.createTrivialCube(bvr4);
+        this.createCoralFans(bvr5, bvr7);
+        this.createCoralFans(bvr6, bvr8);
+    }
+    
+    private void createDoublePlant(final Block bvr, final TintState c) {
+        this.createSimpleFlatItemModel(bvr, "_top");
+        final ResourceLocation uh4 = this.createSuffixedVariant(bvr, "_top", c.getCross(), TextureMapping::cross);
+        final ResourceLocation uh5 = this.createSuffixedVariant(bvr, "_bottom", c.getCross(), TextureMapping::cross);
+        this.createDoubleBlock(bvr, uh4, uh5);
+    }
+    
+    private void createSunflower() {
+        this.createSimpleFlatItemModel(Blocks.SUNFLOWER, "_front");
+        final ResourceLocation uh2 = ModelLocationUtils.getModelLocation(Blocks.SUNFLOWER, "_top");
+        final ResourceLocation uh3 = this.createSuffixedVariant(Blocks.SUNFLOWER, "_bottom", TintState.NOT_TINTED.getCross(), TextureMapping::cross);
+        this.createDoubleBlock(Blocks.SUNFLOWER, uh2, uh3);
+    }
+    
+    private void createTallSeagrass() {
+        final ResourceLocation uh2 = this.createSuffixedVariant(Blocks.TALL_SEAGRASS, "_top", ModelTemplates.SEAGRASS, TextureMapping::defaultTexture);
+        final ResourceLocation uh3 = this.createSuffixedVariant(Blocks.TALL_SEAGRASS, "_bottom", ModelTemplates.SEAGRASS, TextureMapping::defaultTexture);
+        this.createDoubleBlock(Blocks.TALL_SEAGRASS, uh2, uh3);
+    }
+    
+    private void createDoubleBlock(final Block bvr, final ResourceLocation uh2, final ResourceLocation uh3) {
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(PropertyDispatch.<DoubleBlockHalf>property(BlockStateProperties.DOUBLE_BLOCK_HALF).select(DoubleBlockHalf.LOWER, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(DoubleBlockHalf.UPPER, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2))));
+    }
+    
+    private void createPassiveRail(final Block bvr) {
+        final TextureMapping iy3 = TextureMapping.rail(bvr);
+        final TextureMapping iy4 = TextureMapping.rail(TextureMapping.getBlockTexture(bvr, "_corner"));
+        final ResourceLocation uh5 = ModelTemplates.RAIL_FLAT.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh6 = ModelTemplates.RAIL_CURVED.create(bvr, iy4, this.modelOutput);
+        final ResourceLocation uh7 = ModelTemplates.RAIL_RAISED_NE.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh8 = ModelTemplates.RAIL_RAISED_SW.create(bvr, iy3, this.modelOutput);
+        this.createSimpleFlatItemModel(bvr);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(PropertyDispatch.<RailShape>property(BlockStateProperties.RAIL_SHAPE).select(RailShape.NORTH_SOUTH, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5)).select(RailShape.EAST_WEST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(RailShape.ASCENDING_EAST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh7).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(RailShape.ASCENDING_WEST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh8).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(RailShape.ASCENDING_NORTH, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh7)).select(RailShape.ASCENDING_SOUTH, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh8)).select(RailShape.SOUTH_EAST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6)).select(RailShape.SOUTH_WEST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(RailShape.NORTH_WEST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(RailShape.NORTH_EAST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270))));
+    }
+    
+    private void createActiveRail(final Block bvr) {
+        final ResourceLocation uh3 = this.createSuffixedVariant(bvr, "", ModelTemplates.RAIL_FLAT, TextureMapping::rail);
+        final ResourceLocation uh4 = this.createSuffixedVariant(bvr, "", ModelTemplates.RAIL_RAISED_NE, TextureMapping::rail);
+        final ResourceLocation uh5 = this.createSuffixedVariant(bvr, "", ModelTemplates.RAIL_RAISED_SW, TextureMapping::rail);
+        final ResourceLocation uh6 = this.createSuffixedVariant(bvr, "_on", ModelTemplates.RAIL_FLAT, TextureMapping::rail);
+        final ResourceLocation uh7 = this.createSuffixedVariant(bvr, "_on", ModelTemplates.RAIL_RAISED_NE, TextureMapping::rail);
+        final ResourceLocation uh8 = this.createSuffixedVariant(bvr, "_on", ModelTemplates.RAIL_RAISED_SW, TextureMapping::rail);
+        final ResourceLocation resourceLocation;
+        final ResourceLocation resourceLocation2;
+        final ResourceLocation resourceLocation3;
+        final ResourceLocation resourceLocation4;
+        final ResourceLocation resourceLocation5;
+        final ResourceLocation resourceLocation6;
+        final PropertyDispatch io9 = PropertyDispatch.<Comparable, RailShape>properties((Property<Comparable>)BlockStateProperties.POWERED, BlockStateProperties.RAIL_SHAPE_STRAIGHT).generate((boolean7, cgm) -> {
+            switch (cgm) {
+                case NORTH_SOUTH: {
+                    return Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, boolean7 ? resourceLocation : resourceLocation2);
+                }
+                case EAST_WEST: {
+                    return Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, boolean7 ? resourceLocation : resourceLocation2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90);
+                }
+                case ASCENDING_EAST: {
+                    return Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, boolean7 ? resourceLocation3 : resourceLocation4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90);
+                }
+                case ASCENDING_WEST: {
+                    return Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, boolean7 ? resourceLocation5 : resourceLocation6).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90);
+                }
+                case ASCENDING_NORTH: {
+                    return Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, boolean7 ? resourceLocation3 : resourceLocation4);
+                }
+                case ASCENDING_SOUTH: {
+                    return Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, boolean7 ? resourceLocation5 : resourceLocation6);
+                }
+                default: {
+                    throw new UnsupportedOperationException("Fix you generator!");
+                }
+            }
+        });
+        this.createSimpleFlatItemModel(bvr);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(io9));
+    }
+    
+    private BlockEntityModelGenerator blockEntityModels(final ResourceLocation uh, final Block bvr) {
+        return new BlockEntityModelGenerator(uh, bvr);
+    }
+    
+    private BlockEntityModelGenerator blockEntityModels(final Block bvr1, final Block bvr2) {
+        return new BlockEntityModelGenerator(ModelLocationUtils.getModelLocation(bvr1), bvr2);
+    }
+    
+    private void createAirLikeBlock(final Block bvr, final Item bke) {
+        final ResourceLocation uh4 = ModelTemplates.PARTICLE_ONLY.create(bvr, TextureMapping.particleFromItem(bke), this.modelOutput);
+        this.blockStateOutput.accept(createSimpleBlock(bvr, uh4));
+    }
+    
+    private void createAirLikeBlock(final Block bvr, final ResourceLocation uh) {
+        final ResourceLocation uh2 = ModelTemplates.PARTICLE_ONLY.create(bvr, TextureMapping.particle(uh), this.modelOutput);
+        this.blockStateOutput.accept(createSimpleBlock(bvr, uh2));
+    }
+    
+    private void createWoolBlocks(final Block bvr1, final Block bvr2) {
+        this.createTrivialBlock(bvr1, TexturedModel.CUBE);
+        final ResourceLocation uh4 = TexturedModel.CARPET.get(bvr1).create(bvr2, this.modelOutput);
+        this.blockStateOutput.accept(createSimpleBlock(bvr2, uh4));
+    }
+    
+    private void createColoredBlockWithRandomRotations(final TexturedModel.Provider a, final Block... arr) {
+        for (final Block bvr7 : arr) {
+            final ResourceLocation uh8 = a.create(bvr7, this.modelOutput);
+            this.blockStateOutput.accept(createRotatedVariant(bvr7, uh8));
+        }
+    }
+    
+    private void createColoredBlockWithStateRotations(final TexturedModel.Provider a, final Block... arr) {
+        for (final Block bvr7 : arr) {
+            final ResourceLocation uh8 = a.create(bvr7, this.modelOutput);
+            this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr7, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh8)).with(createHorizontalFacingDispatchAlt()));
+        }
+    }
+    
+    private void createGlassBlocks(final Block bvr1, final Block bvr2) {
+        this.createTrivialCube(bvr1);
+        final TextureMapping iy4 = TextureMapping.pane(bvr1, bvr2);
+        final ResourceLocation uh5 = ModelTemplates.STAINED_GLASS_PANE_POST.create(bvr2, iy4, this.modelOutput);
+        final ResourceLocation uh6 = ModelTemplates.STAINED_GLASS_PANE_SIDE.create(bvr2, iy4, this.modelOutput);
+        final ResourceLocation uh7 = ModelTemplates.STAINED_GLASS_PANE_SIDE_ALT.create(bvr2, iy4, this.modelOutput);
+        final ResourceLocation uh8 = ModelTemplates.STAINED_GLASS_PANE_NOSIDE.create(bvr2, iy4, this.modelOutput);
+        final ResourceLocation uh9 = ModelTemplates.STAINED_GLASS_PANE_NOSIDE_ALT.create(bvr2, iy4, this.modelOutput);
+        final Item bke10 = bvr2.asItem();
+        ModelTemplates.FLAT_ITEM.create(ModelLocationUtils.getModelLocation(bke10), TextureMapping.layer0(bvr1), this.modelOutput);
+        this.blockStateOutput.accept(MultiPartGenerator.multiPart(bvr2).with(Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6)).with(Condition.condition().<Boolean>term(BlockStateProperties.EAST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).with(Condition.condition().<Boolean>term(BlockStateProperties.SOUTH, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh7)).with(Condition.condition().<Boolean>term(BlockStateProperties.WEST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh7).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh8)).with(Condition.condition().<Boolean>term(BlockStateProperties.EAST, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh9)).with(Condition.condition().<Boolean>term(BlockStateProperties.SOUTH, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh9).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).with(Condition.condition().<Boolean>term(BlockStateProperties.WEST, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh8).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)));
+    }
+    
+    private void createCommandBlock(final Block bvr) {
+        final TextureMapping iy3 = TextureMapping.commandBlock(bvr);
+        final ResourceLocation uh2 = ModelTemplates.COMMAND_BLOCK.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh3 = this.createSuffixedVariant(bvr, "_conditional", ModelTemplates.COMMAND_BLOCK, uh -> iy3.copyAndUpdate(TextureSlot.SIDE, uh));
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(createBooleanModelDispatch(BlockStateProperties.CONDITIONAL, uh3, uh2)).with(createFacingDispatch()));
+    }
+    
+    private void createAnvil(final Block bvr) {
+        final ResourceLocation uh3 = TexturedModel.ANVIL.create(bvr, this.modelOutput);
+        this.blockStateOutput.accept(createSimpleBlock(bvr, uh3).with(createHorizontalFacingDispatchAlt()));
+    }
+    
+    private List<Variant> createBambooModels(final int integer) {
+        final String string3 = "_age" + integer;
+        return IntStream.range(1, 5).mapToObj(integer -> Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.BAMBOO, integer + string3))).collect(Collectors.toList());
+    }
+    
+    private void createBamboo() {
+        this.skipAutoItemBlock(Blocks.BAMBOO);
+        this.blockStateOutput.accept(MultiPartGenerator.multiPart(Blocks.BAMBOO).with(Condition.condition().<Integer>term(BlockStateProperties.AGE_1, 0), this.createBambooModels(0)).with(Condition.condition().<Integer>term(BlockStateProperties.AGE_1, 1), this.createBambooModels(1)).with(Condition.condition().<BambooLeaves>term(BlockStateProperties.BAMBOO_LEAVES, BambooLeaves.SMALL), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.BAMBOO, "_small_leaves"))).with(Condition.condition().<BambooLeaves>term(BlockStateProperties.BAMBOO_LEAVES, BambooLeaves.LARGE), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.BAMBOO, "_large_leaves"))));
+    }
+    
+    private PropertyDispatch createColumnWithFacing() {
+        return PropertyDispatch.<Direction>property((Property<Direction>)BlockStateProperties.FACING).select(Direction.DOWN, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180)).select(Direction.UP, Variant.variant()).select(Direction.NORTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90)).select(Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90));
+    }
+    
+    private void createBarrel() {
+        final ResourceLocation uh2 = TextureMapping.getBlockTexture(Blocks.BARREL, "_top_open");
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.BARREL).with(this.createColumnWithFacing()).with(PropertyDispatch.<Boolean>property((Property<Boolean>)BlockStateProperties.OPEN).select(false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TexturedModel.CUBE_TOP_BOTTOM.create(Blocks.BARREL, this.modelOutput))).select(true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TexturedModel.CUBE_TOP_BOTTOM.get(Blocks.BARREL).updateTextures(iy -> iy.put(TextureSlot.TOP, uh2)).createWithSuffix(Blocks.BARREL, "_open", this.modelOutput)))));
+    }
+    
+    private static <T extends Comparable<T>> PropertyDispatch createEmptyOrFullDispatch(final Property<T> cgl, final T comparable, final ResourceLocation uh3, final ResourceLocation uh4) {
+        final Variant iq5 = Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3);
+        final Variant iq6 = Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4);
+        final boolean boolean5;
+        final Object o;
+        final Object o2;
+        return PropertyDispatch.<T>property(cgl).generate(comparable4 -> {
+            boolean5 = (comparable4.compareTo(comparable) >= 0);
+            return boolean5 ? o : o2;
+        });
+    }
+    
+    private void createBeeNest(final Block bvr, final Function<Block, TextureMapping> function) {
+        final TextureMapping iy4 = function.apply(bvr).copyForced(TextureSlot.SIDE, TextureSlot.PARTICLE);
+        final TextureMapping iy5 = iy4.copyAndUpdate(TextureSlot.FRONT, TextureMapping.getBlockTexture(bvr, "_front_honey"));
+        final ResourceLocation uh6 = ModelTemplates.CUBE_ORIENTABLE_TOP_BOTTOM.create(bvr, iy4, this.modelOutput);
+        final ResourceLocation uh7 = ModelTemplates.CUBE_ORIENTABLE_TOP_BOTTOM.createWithSuffix(bvr, "_honey", iy5, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(createHorizontalFacingDispatch()).with(BlockModelGenerators.<Integer>createEmptyOrFullDispatch(BlockStateProperties.LEVEL_HONEY, 5, uh7, uh6)));
+    }
+    
+    private void createCropBlock(final Block bvr, final Property<Integer> cgl, final int... arr) {
+        if (cgl.getPossibleValues().size() != arr.length) {
+            throw new IllegalArgumentException();
+        }
+        final Int2ObjectMap<ResourceLocation> int2ObjectMap5 = (Int2ObjectMap<ResourceLocation>)new Int2ObjectOpenHashMap();
+        final int integer2;
+        final Int2ObjectMap int2ObjectMap6;
+        final ResourceLocation uh7;
+        final PropertyDispatch io6 = PropertyDispatch.<Integer>property(cgl).generate(integer -> {
+            integer2 = arr[integer];
+            uh7 = (ResourceLocation)int2ObjectMap6.computeIfAbsent(integer2, integer3 -> this.createSuffixedVariant(bvr, "_stage" + integer2, ModelTemplates.CROP, TextureMapping::crop));
+            return Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh7);
+        });
+        this.createSimpleFlatItemModel(bvr.asItem());
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(io6));
+    }
+    
+    private void createBell() {
+        final ResourceLocation uh2 = ModelLocationUtils.getModelLocation(Blocks.BELL, "_floor");
+        final ResourceLocation uh3 = ModelLocationUtils.getModelLocation(Blocks.BELL, "_ceiling");
+        final ResourceLocation uh4 = ModelLocationUtils.getModelLocation(Blocks.BELL, "_wall");
+        final ResourceLocation uh5 = ModelLocationUtils.getModelLocation(Blocks.BELL, "_between_walls");
+        this.createSimpleFlatItemModel(Items.BELL);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.BELL).with(PropertyDispatch.<Direction, BellAttachType>properties((Property<Direction>)BlockStateProperties.HORIZONTAL_FACING, BlockStateProperties.BELL_ATTACHMENT).select(Direction.NORTH, BellAttachType.FLOOR, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(Direction.SOUTH, BellAttachType.FLOOR, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.EAST, BellAttachType.FLOOR, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.WEST, BellAttachType.FLOOR, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.NORTH, BellAttachType.CEILING, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(Direction.SOUTH, BellAttachType.CEILING, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.EAST, BellAttachType.CEILING, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.WEST, BellAttachType.CEILING, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.NORTH, BellAttachType.SINGLE_WALL, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.SOUTH, BellAttachType.SINGLE_WALL, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.EAST, BellAttachType.SINGLE_WALL, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).select(Direction.WEST, BellAttachType.SINGLE_WALL, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.SOUTH, BellAttachType.DOUBLE_WALL, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.NORTH, BellAttachType.DOUBLE_WALL, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(Direction.EAST, BellAttachType.DOUBLE_WALL, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5)).select(Direction.WEST, BellAttachType.DOUBLE_WALL, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180))));
+    }
+    
+    private void createGrindstone() {
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.GRINDSTONE, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.GRINDSTONE))).with(PropertyDispatch.<AttachFace, Direction>properties(BlockStateProperties.ATTACH_FACE, (Property<Direction>)BlockStateProperties.HORIZONTAL_FACING).select(AttachFace.FLOOR, Direction.NORTH, Variant.variant()).select(AttachFace.FLOOR, Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(AttachFace.FLOOR, Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(AttachFace.FLOOR, Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(AttachFace.WALL, Direction.NORTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90)).select(AttachFace.WALL, Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(AttachFace.WALL, Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(AttachFace.WALL, Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(AttachFace.CEILING, Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180)).select(AttachFace.CEILING, Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(AttachFace.CEILING, Direction.NORTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(AttachFace.CEILING, Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270))));
+    }
+    
+    private void createFurnace(final Block bvr, final TexturedModel.Provider a) {
+        final ResourceLocation uh4 = a.create(bvr, this.modelOutput);
+        final ResourceLocation uh5 = TextureMapping.getBlockTexture(bvr, "_front_on");
+        final ResourceLocation uh6 = a.get(bvr).updateTextures(iy -> iy.put(TextureSlot.FRONT, uh5)).createWithSuffix(bvr, "_on", this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(createBooleanModelDispatch(BlockStateProperties.LIT, uh6, uh4)).with(createHorizontalFacingDispatch()));
+    }
+    
+    private void createCampfires(final Block... arr) {
+        final ResourceLocation uh3 = ModelLocationUtils.decorateBlockModelLocation("campfire_off");
+        for (final Block bvr7 : arr) {
+            final ResourceLocation uh4 = ModelTemplates.CAMPFIRE.create(bvr7, TextureMapping.campfire(bvr7), this.modelOutput);
+            this.createSimpleFlatItemModel(bvr7.asItem());
+            this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr7).with(createBooleanModelDispatch(BlockStateProperties.LIT, uh4, uh3)).with(createHorizontalFacingDispatchAlt()));
+        }
+    }
+    
+    private void createBookshelf() {
+        final TextureMapping iy2 = TextureMapping.column(TextureMapping.getBlockTexture(Blocks.BOOKSHELF), TextureMapping.getBlockTexture(Blocks.OAK_PLANKS));
+        final ResourceLocation uh3 = ModelTemplates.CUBE_COLUMN.create(Blocks.BOOKSHELF, iy2, this.modelOutput);
+        this.blockStateOutput.accept(createSimpleBlock(Blocks.BOOKSHELF, uh3));
+    }
+    
+    private void createRedstoneWire() {
+        this.createSimpleFlatItemModel(Items.REDSTONE);
+        this.blockStateOutput.accept(MultiPartGenerator.multiPart(Blocks.REDSTONE_WIRE).with(Condition.or(Condition.condition().<RedstoneSide>term(BlockStateProperties.NORTH_REDSTONE, RedstoneSide.NONE).<RedstoneSide>term(BlockStateProperties.EAST_REDSTONE, RedstoneSide.NONE).<RedstoneSide>term(BlockStateProperties.SOUTH_REDSTONE, RedstoneSide.NONE).<RedstoneSide>term(BlockStateProperties.WEST_REDSTONE, RedstoneSide.NONE), Condition.condition().<RedstoneSide>term(BlockStateProperties.NORTH_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP).<RedstoneSide>term(BlockStateProperties.EAST_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP), Condition.condition().<RedstoneSide>term(BlockStateProperties.EAST_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP).<RedstoneSide>term(BlockStateProperties.SOUTH_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP), Condition.condition().<RedstoneSide>term(BlockStateProperties.SOUTH_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP).<RedstoneSide>term(BlockStateProperties.WEST_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP), Condition.condition().<RedstoneSide>term(BlockStateProperties.WEST_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP).<RedstoneSide>term(BlockStateProperties.NORTH_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP)), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.decorateBlockModelLocation("redstone_dust_dot"))).with(Condition.condition().<RedstoneSide>term(BlockStateProperties.NORTH_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.decorateBlockModelLocation("redstone_dust_side0"))).with(Condition.condition().<RedstoneSide>term(BlockStateProperties.SOUTH_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.decorateBlockModelLocation("redstone_dust_side_alt0"))).with(Condition.condition().<RedstoneSide>term(BlockStateProperties.EAST_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.decorateBlockModelLocation("redstone_dust_side_alt1")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).with(Condition.condition().<RedstoneSide>term(BlockStateProperties.WEST_REDSTONE, RedstoneSide.SIDE, RedstoneSide.UP), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.decorateBlockModelLocation("redstone_dust_side1")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).with(Condition.condition().<RedstoneSide>term(BlockStateProperties.NORTH_REDSTONE, RedstoneSide.UP), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.decorateBlockModelLocation("redstone_dust_up"))).with(Condition.condition().<RedstoneSide>term(BlockStateProperties.EAST_REDSTONE, RedstoneSide.UP), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.decorateBlockModelLocation("redstone_dust_up")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).with(Condition.condition().<RedstoneSide>term(BlockStateProperties.SOUTH_REDSTONE, RedstoneSide.UP), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.decorateBlockModelLocation("redstone_dust_up")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).with(Condition.condition().<RedstoneSide>term(BlockStateProperties.WEST_REDSTONE, RedstoneSide.UP), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.decorateBlockModelLocation("redstone_dust_up")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)));
+    }
+    
+    private void createComparator() {
+        this.createSimpleFlatItemModel(Items.COMPARATOR);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.COMPARATOR).with(createHorizontalFacingDispatchAlt()).with(PropertyDispatch.<ComparatorMode, Boolean>properties(BlockStateProperties.MODE_COMPARATOR, (Property<Boolean>)BlockStateProperties.POWERED).select(ComparatorMode.COMPARE, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.COMPARATOR))).select(ComparatorMode.COMPARE, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.COMPARATOR, "_on"))).select(ComparatorMode.SUBTRACT, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.COMPARATOR, "_subtract"))).select(ComparatorMode.SUBTRACT, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.COMPARATOR, "_on_subtract")))));
+    }
+    
+    private void createSmoothStoneSlab() {
+        final TextureMapping iy2 = TextureMapping.cube(Blocks.SMOOTH_STONE);
+        final TextureMapping iy3 = TextureMapping.column(TextureMapping.getBlockTexture(Blocks.SMOOTH_STONE_SLAB, "_side"), iy2.get(TextureSlot.TOP));
+        final ResourceLocation uh4 = ModelTemplates.SLAB_BOTTOM.create(Blocks.SMOOTH_STONE_SLAB, iy3, this.modelOutput);
+        final ResourceLocation uh5 = ModelTemplates.SLAB_TOP.create(Blocks.SMOOTH_STONE_SLAB, iy3, this.modelOutput);
+        final ResourceLocation uh6 = ModelTemplates.CUBE_COLUMN.createWithOverride(Blocks.SMOOTH_STONE_SLAB, "_double", iy3, this.modelOutput);
+        this.blockStateOutput.accept(createSlab(Blocks.SMOOTH_STONE_SLAB, uh4, uh5, uh6));
+        this.blockStateOutput.accept(createSimpleBlock(Blocks.SMOOTH_STONE, ModelTemplates.CUBE_ALL.create(Blocks.SMOOTH_STONE, iy2, this.modelOutput)));
+    }
+    
+    private void createBrewingStand() {
+        this.createSimpleFlatItemModel(Items.BREWING_STAND);
+        this.blockStateOutput.accept(MultiPartGenerator.multiPart(Blocks.BREWING_STAND).with(Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.BREWING_STAND))).with(Condition.condition().<Boolean>term(BlockStateProperties.HAS_BOTTLE_0, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.BREWING_STAND, "_bottle0"))).with(Condition.condition().<Boolean>term(BlockStateProperties.HAS_BOTTLE_1, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.BREWING_STAND, "_bottle1"))).with(Condition.condition().<Boolean>term(BlockStateProperties.HAS_BOTTLE_2, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.BREWING_STAND, "_bottle2"))).with(Condition.condition().<Boolean>term(BlockStateProperties.HAS_BOTTLE_0, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.BREWING_STAND, "_empty0"))).with(Condition.condition().<Boolean>term(BlockStateProperties.HAS_BOTTLE_1, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.BREWING_STAND, "_empty1"))).with(Condition.condition().<Boolean>term(BlockStateProperties.HAS_BOTTLE_2, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.BREWING_STAND, "_empty2"))));
+    }
+    
+    private void createMushroomBlock(final Block bvr) {
+        final ResourceLocation uh3 = ModelTemplates.SINGLE_FACE.create(bvr, TextureMapping.defaultTexture(bvr), this.modelOutput);
+        final ResourceLocation uh4 = ModelLocationUtils.decorateBlockModelLocation("mushroom_block_inside");
+        this.blockStateOutput.accept(MultiPartGenerator.multiPart(bvr).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).with(Condition.condition().<Boolean>term(BlockStateProperties.EAST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.SOUTH, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.WEST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.UP, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.DOWN, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).with(Condition.condition().<Boolean>term(BlockStateProperties.EAST, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, false)).with(Condition.condition().<Boolean>term(BlockStateProperties.SOUTH, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, false)).with(Condition.condition().<Boolean>term(BlockStateProperties.WEST, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, false)).with(Condition.condition().<Boolean>term(BlockStateProperties.UP, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, false)).with(Condition.condition().<Boolean>term(BlockStateProperties.DOWN, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, false)));
+        this.delegateItemModel(bvr, TexturedModel.CUBE.createWithSuffix(bvr, "_inventory", this.modelOutput));
+    }
+    
+    private void createCakeBlock() {
+        this.createSimpleFlatItemModel(Items.CAKE);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.CAKE).with(PropertyDispatch.<Integer>property((Property<Integer>)BlockStateProperties.BITES).select(0, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAKE))).select(1, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAKE, "_slice1"))).select(2, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAKE, "_slice2"))).select(3, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAKE, "_slice3"))).select(4, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAKE, "_slice4"))).select(5, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAKE, "_slice5"))).select(6, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAKE, "_slice6")))));
+    }
+    
+    private void createCartographyTable() {
+        final TextureMapping iy2 = new TextureMapping().put(TextureSlot.PARTICLE, TextureMapping.getBlockTexture(Blocks.CARTOGRAPHY_TABLE, "_side3")).put(TextureSlot.DOWN, TextureMapping.getBlockTexture(Blocks.DARK_OAK_PLANKS)).put(TextureSlot.UP, TextureMapping.getBlockTexture(Blocks.CARTOGRAPHY_TABLE, "_top")).put(TextureSlot.NORTH, TextureMapping.getBlockTexture(Blocks.CARTOGRAPHY_TABLE, "_side3")).put(TextureSlot.EAST, TextureMapping.getBlockTexture(Blocks.CARTOGRAPHY_TABLE, "_side3")).put(TextureSlot.SOUTH, TextureMapping.getBlockTexture(Blocks.CARTOGRAPHY_TABLE, "_side1")).put(TextureSlot.WEST, TextureMapping.getBlockTexture(Blocks.CARTOGRAPHY_TABLE, "_side2"));
+        this.blockStateOutput.accept(createSimpleBlock(Blocks.CARTOGRAPHY_TABLE, ModelTemplates.CUBE.create(Blocks.CARTOGRAPHY_TABLE, iy2, this.modelOutput)));
+    }
+    
+    private void createSmithingTable() {
+        final TextureMapping iy2 = new TextureMapping().put(TextureSlot.PARTICLE, TextureMapping.getBlockTexture(Blocks.SMITHING_TABLE, "_front")).put(TextureSlot.DOWN, TextureMapping.getBlockTexture(Blocks.SMITHING_TABLE, "_bottom")).put(TextureSlot.UP, TextureMapping.getBlockTexture(Blocks.SMITHING_TABLE, "_top")).put(TextureSlot.NORTH, TextureMapping.getBlockTexture(Blocks.SMITHING_TABLE, "_front")).put(TextureSlot.SOUTH, TextureMapping.getBlockTexture(Blocks.SMITHING_TABLE, "_front")).put(TextureSlot.EAST, TextureMapping.getBlockTexture(Blocks.SMITHING_TABLE, "_side")).put(TextureSlot.WEST, TextureMapping.getBlockTexture(Blocks.SMITHING_TABLE, "_side"));
+        this.blockStateOutput.accept(createSimpleBlock(Blocks.SMITHING_TABLE, ModelTemplates.CUBE.create(Blocks.SMITHING_TABLE, iy2, this.modelOutput)));
+    }
+    
+    private void createCraftingTableLike(final Block bvr1, final Block bvr2, final BiFunction<Block, Block, TextureMapping> biFunction) {
+        final TextureMapping iy5 = biFunction.apply(bvr1, bvr2);
+        this.blockStateOutput.accept(createSimpleBlock(bvr1, ModelTemplates.CUBE.create(bvr1, iy5, this.modelOutput)));
+    }
+    
+    private void createPumpkins() {
+        final TextureMapping iy2 = TextureMapping.column(Blocks.PUMPKIN);
+        this.blockStateOutput.accept(createSimpleBlock(Blocks.PUMPKIN, ModelLocationUtils.getModelLocation(Blocks.PUMPKIN)));
+        this.createPumpkinVariant(Blocks.CARVED_PUMPKIN, iy2);
+        this.createPumpkinVariant(Blocks.JACK_O_LANTERN, iy2);
+    }
+    
+    private void createPumpkinVariant(final Block bvr, final TextureMapping iy) {
+        final ResourceLocation uh4 = ModelTemplates.CUBE_ORIENTABLE.create(bvr, iy.copyAndUpdate(TextureSlot.FRONT, TextureMapping.getBlockTexture(bvr)), this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).with(createHorizontalFacingDispatch()));
+    }
+    
+    private void createCauldron() {
+        this.createSimpleFlatItemModel(Items.CAULDRON);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.CAULDRON).with(PropertyDispatch.<Integer>property((Property<Integer>)BlockStateProperties.LEVEL_CAULDRON).select(0, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAULDRON))).select(1, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAULDRON, "_level1"))).select(2, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAULDRON, "_level2"))).select(3, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.CAULDRON, "_level3")))));
+    }
+    
+    private void createChiseledSandsone(final Block bvr1, final Block bvr2) {
+        final TextureMapping iy4 = new TextureMapping().put(TextureSlot.END, TextureMapping.getBlockTexture(bvr2, "_top")).put(TextureSlot.SIDE, TextureMapping.getBlockTexture(bvr1));
+        this.createTrivialBlock(bvr1, iy4, ModelTemplates.CUBE_COLUMN);
+    }
+    
+    private void createChorusFlower() {
+        final TextureMapping iy2 = TextureMapping.defaultTexture(Blocks.CHORUS_FLOWER);
+        final ResourceLocation uh2 = ModelTemplates.CHORUS_FLOWER.create(Blocks.CHORUS_FLOWER, iy2, this.modelOutput);
+        final ResourceLocation uh3 = this.createSuffixedVariant(Blocks.CHORUS_FLOWER, "_dead", ModelTemplates.CHORUS_FLOWER, uh -> iy2.copyAndUpdate(TextureSlot.TEXTURE, uh));
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.CHORUS_FLOWER).with(BlockModelGenerators.<Integer>createEmptyOrFullDispatch(BlockStateProperties.AGE_5, 5, uh3, uh2)));
+    }
+    
+    private void createDispenserBlock(final Block bvr) {
+        final TextureMapping iy3 = new TextureMapping().put(TextureSlot.TOP, TextureMapping.getBlockTexture(Blocks.FURNACE, "_top")).put(TextureSlot.SIDE, TextureMapping.getBlockTexture(Blocks.FURNACE, "_side")).put(TextureSlot.FRONT, TextureMapping.getBlockTexture(bvr, "_front"));
+        final TextureMapping iy4 = new TextureMapping().put(TextureSlot.SIDE, TextureMapping.getBlockTexture(Blocks.FURNACE, "_top")).put(TextureSlot.FRONT, TextureMapping.getBlockTexture(bvr, "_front_vertical"));
+        final ResourceLocation uh5 = ModelTemplates.CUBE_ORIENTABLE.create(bvr, iy3, this.modelOutput);
+        final ResourceLocation uh6 = ModelTemplates.CUBE_ORIENTABLE_VERTICAL.create(bvr, iy4, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(PropertyDispatch.<Direction>property((Property<Direction>)BlockStateProperties.FACING).select(Direction.DOWN, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180)).select(Direction.UP, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6)).select(Direction.NORTH, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5)).select(Direction.EAST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.SOUTH, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.WEST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270))));
+    }
+    
+    private void createEndPortalFrame() {
+        final ResourceLocation uh2 = ModelLocationUtils.getModelLocation(Blocks.END_PORTAL_FRAME);
+        final ResourceLocation uh3 = ModelLocationUtils.getModelLocation(Blocks.END_PORTAL_FRAME, "_filled");
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.END_PORTAL_FRAME).with(PropertyDispatch.<Boolean>property((Property<Boolean>)BlockStateProperties.EYE).select(false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3))).with(createHorizontalFacingDispatchAlt()));
+    }
+    
+    private void createChorusPlant() {
+        final ResourceLocation uh2 = ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_side");
+        final ResourceLocation uh3 = ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside");
+        final ResourceLocation uh4 = ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside1");
+        final ResourceLocation uh5 = ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside2");
+        final ResourceLocation uh6 = ModelLocationUtils.getModelLocation(Blocks.CHORUS_PLANT, "_noside3");
+        this.blockStateOutput.accept(MultiPartGenerator.multiPart(Blocks.CHORUS_PLANT).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).with(Condition.condition().<Boolean>term(BlockStateProperties.EAST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.SOUTH, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.WEST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.UP, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.DOWN, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<Integer>with(VariantProperties.WEIGHT, 2), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6)).with(Condition.condition().<Boolean>term(BlockStateProperties.EAST, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<Integer>with(VariantProperties.WEIGHT, 2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.SOUTH, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<Integer>with(VariantProperties.WEIGHT, 2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.WEST, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<Integer>with(VariantProperties.WEIGHT, 2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.UP, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<Integer>with(VariantProperties.WEIGHT, 2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270).<Boolean>with(VariantProperties.UV_LOCK, true)).with(Condition.condition().<Boolean>term(BlockStateProperties.DOWN, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<Integer>with(VariantProperties.WEIGHT, 2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<Boolean>with(VariantProperties.UV_LOCK, true)));
+    }
+    
+    private void createComposter() {
+        this.blockStateOutput.accept(MultiPartGenerator.multiPart(Blocks.COMPOSTER).with(Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.COMPOSTER))).with(Condition.condition().<Integer>term(BlockStateProperties.LEVEL_COMPOSTER, 1), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.COMPOSTER, "_contents1"))).with(Condition.condition().<Integer>term(BlockStateProperties.LEVEL_COMPOSTER, 2), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.COMPOSTER, "_contents2"))).with(Condition.condition().<Integer>term(BlockStateProperties.LEVEL_COMPOSTER, 3), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.COMPOSTER, "_contents3"))).with(Condition.condition().<Integer>term(BlockStateProperties.LEVEL_COMPOSTER, 4), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.COMPOSTER, "_contents4"))).with(Condition.condition().<Integer>term(BlockStateProperties.LEVEL_COMPOSTER, 5), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.COMPOSTER, "_contents5"))).with(Condition.condition().<Integer>term(BlockStateProperties.LEVEL_COMPOSTER, 6), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.COMPOSTER, "_contents6"))).with(Condition.condition().<Integer>term(BlockStateProperties.LEVEL_COMPOSTER, 7), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.COMPOSTER, "_contents7"))).with(Condition.condition().<Integer>term(BlockStateProperties.LEVEL_COMPOSTER, 8), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.COMPOSTER, "_contents_ready"))));
+    }
+    
+    private void createNyliumBlock(final Block bvr) {
+        final TextureMapping iy3 = new TextureMapping().put(TextureSlot.BOTTOM, TextureMapping.getBlockTexture(Blocks.NETHERRACK)).put(TextureSlot.TOP, TextureMapping.getBlockTexture(bvr)).put(TextureSlot.SIDE, TextureMapping.getBlockTexture(bvr, "_side"));
+        this.blockStateOutput.accept(createSimpleBlock(bvr, ModelTemplates.CUBE_BOTTOM_TOP.create(bvr, iy3, this.modelOutput)));
+    }
+    
+    private void createDaylightDetector() {
+        final ResourceLocation uh2 = TextureMapping.getBlockTexture(Blocks.DAYLIGHT_DETECTOR, "_side");
+        final TextureMapping iy3 = new TextureMapping().put(TextureSlot.TOP, TextureMapping.getBlockTexture(Blocks.DAYLIGHT_DETECTOR, "_top")).put(TextureSlot.SIDE, uh2);
+        final TextureMapping iy4 = new TextureMapping().put(TextureSlot.TOP, TextureMapping.getBlockTexture(Blocks.DAYLIGHT_DETECTOR, "_inverted_top")).put(TextureSlot.SIDE, uh2);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.DAYLIGHT_DETECTOR).with(PropertyDispatch.<Boolean>property((Property<Boolean>)BlockStateProperties.INVERTED).select(false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelTemplates.DAYLIGHT_DETECTOR.create(Blocks.DAYLIGHT_DETECTOR, iy3, this.modelOutput))).select(true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelTemplates.DAYLIGHT_DETECTOR.create(ModelLocationUtils.getModelLocation(Blocks.DAYLIGHT_DETECTOR, "_inverted"), iy4, this.modelOutput)))));
+    }
+    
+    private void createEndRod() {
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.END_ROD, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.END_ROD))).with(this.createColumnWithFacing()));
+    }
+    
+    private void createFarmland() {
+        final TextureMapping iy2 = new TextureMapping().put(TextureSlot.DIRT, TextureMapping.getBlockTexture(Blocks.DIRT)).put(TextureSlot.TOP, TextureMapping.getBlockTexture(Blocks.FARMLAND));
+        final TextureMapping iy3 = new TextureMapping().put(TextureSlot.DIRT, TextureMapping.getBlockTexture(Blocks.DIRT)).put(TextureSlot.TOP, TextureMapping.getBlockTexture(Blocks.FARMLAND, "_moist"));
+        final ResourceLocation uh4 = ModelTemplates.FARMLAND.create(Blocks.FARMLAND, iy2, this.modelOutput);
+        final ResourceLocation uh5 = ModelTemplates.FARMLAND.create(TextureMapping.getBlockTexture(Blocks.FARMLAND, "_moist"), iy3, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.FARMLAND).with(BlockModelGenerators.<Integer>createEmptyOrFullDispatch(BlockStateProperties.MOISTURE, 7, uh5, uh4)));
+    }
+    
+    private List<ResourceLocation> createFloorFireModels(final Block bvr) {
+        final ResourceLocation uh3 = ModelTemplates.FIRE_FLOOR.create(ModelLocationUtils.getModelLocation(bvr, "_floor0"), TextureMapping.fire0(bvr), this.modelOutput);
+        final ResourceLocation uh4 = ModelTemplates.FIRE_FLOOR.create(ModelLocationUtils.getModelLocation(bvr, "_floor1"), TextureMapping.fire1(bvr), this.modelOutput);
+        return ImmutableList.<ResourceLocation>of(uh3, uh4);
+    }
+    
+    private List<ResourceLocation> createSideFireModels(final Block bvr) {
+        final ResourceLocation uh3 = ModelTemplates.FIRE_SIDE.create(ModelLocationUtils.getModelLocation(bvr, "_side0"), TextureMapping.fire0(bvr), this.modelOutput);
+        final ResourceLocation uh4 = ModelTemplates.FIRE_SIDE.create(ModelLocationUtils.getModelLocation(bvr, "_side1"), TextureMapping.fire1(bvr), this.modelOutput);
+        final ResourceLocation uh5 = ModelTemplates.FIRE_SIDE_ALT.create(ModelLocationUtils.getModelLocation(bvr, "_side_alt0"), TextureMapping.fire0(bvr), this.modelOutput);
+        final ResourceLocation uh6 = ModelTemplates.FIRE_SIDE_ALT.create(ModelLocationUtils.getModelLocation(bvr, "_side_alt1"), TextureMapping.fire1(bvr), this.modelOutput);
+        return ImmutableList.<ResourceLocation>of(uh3, uh4, uh5, uh6);
+    }
+    
+    private List<ResourceLocation> createTopFireModels(final Block bvr) {
+        final ResourceLocation uh3 = ModelTemplates.FIRE_UP.create(ModelLocationUtils.getModelLocation(bvr, "_up0"), TextureMapping.fire0(bvr), this.modelOutput);
+        final ResourceLocation uh4 = ModelTemplates.FIRE_UP.create(ModelLocationUtils.getModelLocation(bvr, "_up1"), TextureMapping.fire1(bvr), this.modelOutput);
+        final ResourceLocation uh5 = ModelTemplates.FIRE_UP_ALT.create(ModelLocationUtils.getModelLocation(bvr, "_up_alt0"), TextureMapping.fire0(bvr), this.modelOutput);
+        final ResourceLocation uh6 = ModelTemplates.FIRE_UP_ALT.create(ModelLocationUtils.getModelLocation(bvr, "_up_alt1"), TextureMapping.fire1(bvr), this.modelOutput);
+        return ImmutableList.<ResourceLocation>of(uh3, uh4, uh5, uh6);
+    }
+    
+    private static List<Variant> wrapModels(final List<ResourceLocation> list, final UnaryOperator<Variant> unaryOperator) {
+        return list.stream().map(uh -> Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh)).map(unaryOperator).collect(Collectors.toList());
+    }
+    
+    private void createFire() {
+        final Condition il2 = Condition.condition().<Boolean>term(BlockStateProperties.NORTH, false).<Boolean>term(BlockStateProperties.EAST, false).<Boolean>term(BlockStateProperties.SOUTH, false).<Boolean>term(BlockStateProperties.WEST, false).<Boolean>term(BlockStateProperties.UP, false);
+        final List<ResourceLocation> list3 = this.createFloorFireModels(Blocks.FIRE);
+        final List<ResourceLocation> list4 = this.createSideFireModels(Blocks.FIRE);
+        final List<ResourceLocation> list5 = this.createTopFireModels(Blocks.FIRE);
+        this.blockStateOutput.accept(MultiPartGenerator.multiPart(Blocks.FIRE).with(il2, wrapModels(list3, iq -> iq)).with(Condition.or(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, true), il2), wrapModels(list4, iq -> iq)).with(Condition.or(Condition.condition().<Boolean>term(BlockStateProperties.EAST, true), il2), wrapModels(list4, iq -> iq.<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90))).with(Condition.or(Condition.condition().<Boolean>term(BlockStateProperties.SOUTH, true), il2), wrapModels(list4, iq -> iq.<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180))).with(Condition.or(Condition.condition().<Boolean>term(BlockStateProperties.WEST, true), il2), wrapModels(list4, iq -> iq.<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270))).with(Condition.condition().<Boolean>term(BlockStateProperties.UP, true), wrapModels(list5, iq -> iq)));
+    }
+    
+    private void createSoulFire() {
+        final List<ResourceLocation> list2 = this.createFloorFireModels(Blocks.SOUL_FIRE);
+        final List<ResourceLocation> list3 = this.createSideFireModels(Blocks.SOUL_FIRE);
+        this.blockStateOutput.accept(MultiPartGenerator.multiPart(Blocks.SOUL_FIRE).with(wrapModels(list2, iq -> iq)).with(wrapModels(list3, iq -> iq)).with(wrapModels(list3, iq -> iq.<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90))).with(wrapModels(list3, iq -> iq.<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180))).with(wrapModels(list3, iq -> iq.<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270))));
+    }
+    
+    private void createLantern(final Block bvr) {
+        final ResourceLocation uh3 = TexturedModel.LANTERN.create(bvr, this.modelOutput);
+        final ResourceLocation uh4 = TexturedModel.HANGING_LANTERN.create(bvr, this.modelOutput);
+        this.createSimpleFlatItemModel(bvr.asItem());
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(createBooleanModelDispatch(BlockStateProperties.HANGING, uh4, uh3)));
+    }
+    
+    private void createFrostedIce() {
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.FROSTED_ICE).with(PropertyDispatch.<Integer>property((Property<Integer>)BlockStateProperties.AGE_3).select(0, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, this.createSuffixedVariant(Blocks.FROSTED_ICE, "_0", ModelTemplates.CUBE_ALL, TextureMapping::cube))).select(1, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, this.createSuffixedVariant(Blocks.FROSTED_ICE, "_1", ModelTemplates.CUBE_ALL, TextureMapping::cube))).select(2, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, this.createSuffixedVariant(Blocks.FROSTED_ICE, "_2", ModelTemplates.CUBE_ALL, TextureMapping::cube))).select(3, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, this.createSuffixedVariant(Blocks.FROSTED_ICE, "_3", ModelTemplates.CUBE_ALL, TextureMapping::cube)))));
+    }
+    
+    private void createGrassBlocks() {
+        final ResourceLocation uh2 = TextureMapping.getBlockTexture(Blocks.DIRT);
+        final TextureMapping iy2 = new TextureMapping().put(TextureSlot.BOTTOM, uh2).copyForced(TextureSlot.BOTTOM, TextureSlot.PARTICLE).put(TextureSlot.TOP, TextureMapping.getBlockTexture(Blocks.GRASS_BLOCK, "_top")).put(TextureSlot.SIDE, TextureMapping.getBlockTexture(Blocks.GRASS_BLOCK, "_snow"));
+        final Variant iq4 = Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelTemplates.CUBE_BOTTOM_TOP.createWithSuffix(Blocks.GRASS_BLOCK, "_snow", iy2, this.modelOutput));
+        this.createGrassLikeBlock(Blocks.GRASS_BLOCK, ModelLocationUtils.getModelLocation(Blocks.GRASS_BLOCK), iq4);
+        final ResourceLocation uh3 = TexturedModel.CUBE_TOP_BOTTOM.get(Blocks.MYCELIUM).updateTextures(iy -> iy.put(TextureSlot.BOTTOM, uh2)).create(Blocks.MYCELIUM, this.modelOutput);
+        this.createGrassLikeBlock(Blocks.MYCELIUM, uh3, iq4);
+        final ResourceLocation uh4 = TexturedModel.CUBE_TOP_BOTTOM.get(Blocks.PODZOL).updateTextures(iy -> iy.put(TextureSlot.BOTTOM, uh2)).create(Blocks.PODZOL, this.modelOutput);
+        this.createGrassLikeBlock(Blocks.PODZOL, uh4, iq4);
+    }
+    
+    private void createGrassLikeBlock(final Block bvr, final ResourceLocation uh, final Variant iq) {
+        final List<Variant> list5 = Arrays.<Variant>asList(createRotatedVariants(uh));
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(PropertyDispatch.<Boolean>property((Property<Boolean>)BlockStateProperties.SNOWY).select(true, iq).select(false, list5)));
+    }
+    
+    private void createCocoa() {
+        this.createSimpleFlatItemModel(Items.COCOA_BEANS);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.COCOA).with(PropertyDispatch.<Integer>property((Property<Integer>)BlockStateProperties.AGE_2).select(0, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.COCOA, "_stage0"))).select(1, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.COCOA, "_stage1"))).select(2, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.COCOA, "_stage2")))).with(createHorizontalFacingDispatchAlt()));
+    }
+    
+    private void createGrassPath() {
+        this.blockStateOutput.accept(createRotatedVariant(Blocks.GRASS_PATH, ModelLocationUtils.getModelLocation(Blocks.GRASS_PATH)));
+    }
+    
+    private void createWeightedPressurePlate(final Block bvr1, final Block bvr2) {
+        final TextureMapping iy4 = TextureMapping.defaultTexture(bvr2);
+        final ResourceLocation uh5 = ModelTemplates.PRESSURE_PLATE_UP.create(bvr1, iy4, this.modelOutput);
+        final ResourceLocation uh6 = ModelTemplates.PRESSURE_PLATE_DOWN.create(bvr1, iy4, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr1).with(BlockModelGenerators.<Integer>createEmptyOrFullDispatch(BlockStateProperties.POWER, 1, uh6, uh5)));
+    }
+    
+    private void createHopper() {
+        final ResourceLocation uh2 = ModelLocationUtils.getModelLocation(Blocks.HOPPER);
+        final ResourceLocation uh3 = ModelLocationUtils.getModelLocation(Blocks.HOPPER, "_side");
+        this.createSimpleFlatItemModel(Items.HOPPER);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.HOPPER).with(PropertyDispatch.<Direction>property((Property<Direction>)BlockStateProperties.FACING_HOPPER).select(Direction.DOWN, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).select(Direction.NORTH, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).select(Direction.EAST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(Direction.SOUTH, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(Direction.WEST, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270))));
+    }
+    
+    private void copyModel(final Block bvr1, final Block bvr2) {
+        final ResourceLocation uh4 = ModelLocationUtils.getModelLocation(bvr1);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr2, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)));
+        this.delegateItemModel(bvr2, uh4);
+    }
+    
+    private void createIronBars() {
+        final ResourceLocation uh2 = ModelLocationUtils.getModelLocation(Blocks.IRON_BARS, "_post_ends");
+        final ResourceLocation uh3 = ModelLocationUtils.getModelLocation(Blocks.IRON_BARS, "_post");
+        final ResourceLocation uh4 = ModelLocationUtils.getModelLocation(Blocks.IRON_BARS, "_cap");
+        final ResourceLocation uh5 = ModelLocationUtils.getModelLocation(Blocks.IRON_BARS, "_cap_alt");
+        final ResourceLocation uh6 = ModelLocationUtils.getModelLocation(Blocks.IRON_BARS, "_side");
+        final ResourceLocation uh7 = ModelLocationUtils.getModelLocation(Blocks.IRON_BARS, "_side_alt");
+        this.blockStateOutput.accept(MultiPartGenerator.multiPart(Blocks.IRON_BARS).with(Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, false).<Boolean>term(BlockStateProperties.EAST, false).<Boolean>term(BlockStateProperties.SOUTH, false).<Boolean>term(BlockStateProperties.WEST, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh3)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, true).<Boolean>term(BlockStateProperties.EAST, false).<Boolean>term(BlockStateProperties.SOUTH, false).<Boolean>term(BlockStateProperties.WEST, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, false).<Boolean>term(BlockStateProperties.EAST, true).<Boolean>term(BlockStateProperties.SOUTH, false).<Boolean>term(BlockStateProperties.WEST, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh4).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, false).<Boolean>term(BlockStateProperties.EAST, false).<Boolean>term(BlockStateProperties.SOUTH, true).<Boolean>term(BlockStateProperties.WEST, false), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, false).<Boolean>term(BlockStateProperties.EAST, false).<Boolean>term(BlockStateProperties.SOUTH, false).<Boolean>term(BlockStateProperties.WEST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh5).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).with(Condition.condition().<Boolean>term(BlockStateProperties.NORTH, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6)).with(Condition.condition().<Boolean>term(BlockStateProperties.EAST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).with(Condition.condition().<Boolean>term(BlockStateProperties.SOUTH, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh7)).with(Condition.condition().<Boolean>term(BlockStateProperties.WEST, true), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh7).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)));
+        this.createSimpleFlatItemModel(Blocks.IRON_BARS);
+    }
+    
+    private void createNonTemplateHorizontalBlock(final Block bvr) {
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(bvr))).with(createHorizontalFacingDispatch()));
+    }
+    
+    private void createLever() {
+        final ResourceLocation uh2 = ModelLocationUtils.getModelLocation(Blocks.LEVER);
+        final ResourceLocation uh3 = ModelLocationUtils.getModelLocation(Blocks.LEVER, "_on");
+        this.createSimpleFlatItemModel(Blocks.LEVER);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.LEVER).with(createBooleanModelDispatch(BlockStateProperties.POWERED, uh2, uh3)).with(PropertyDispatch.<AttachFace, Direction>properties(BlockStateProperties.ATTACH_FACE, (Property<Direction>)BlockStateProperties.HORIZONTAL_FACING).select(AttachFace.CEILING, Direction.NORTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(AttachFace.CEILING, Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(AttachFace.CEILING, Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180)).select(AttachFace.CEILING, Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(AttachFace.FLOOR, Direction.NORTH, Variant.variant()).select(AttachFace.FLOOR, Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(AttachFace.FLOOR, Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(AttachFace.FLOOR, Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(AttachFace.WALL, Direction.NORTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90)).select(AttachFace.WALL, Direction.EAST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(AttachFace.WALL, Direction.SOUTH, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(AttachFace.WALL, Direction.WEST, Variant.variant().<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270))));
+    }
+    
+    private void createLilyPad() {
+        this.createSimpleFlatItemModel(Blocks.LILY_PAD);
+        this.blockStateOutput.accept(createRotatedVariant(Blocks.LILY_PAD, ModelLocationUtils.getModelLocation(Blocks.LILY_PAD)));
+    }
+    
+    private void createNetherPortalBlock() {
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.NETHER_PORTAL).with(PropertyDispatch.<Direction.Axis>property(BlockStateProperties.HORIZONTAL_AXIS).select(Direction.Axis.X, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.NETHER_PORTAL, "_ns"))).select(Direction.Axis.Z, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.NETHER_PORTAL, "_ew")))));
+    }
+    
+    private void createNetherrack() {
+        final ResourceLocation uh2 = TexturedModel.CUBE.create(Blocks.NETHERRACK, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.NETHERRACK, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R180), Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh2).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270).<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270)));
+    }
+    
+    private void createObserver() {
+        final ResourceLocation uh2 = ModelLocationUtils.getModelLocation(Blocks.OBSERVER);
+        final ResourceLocation uh3 = ModelLocationUtils.getModelLocation(Blocks.OBSERVER, "_on");
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.OBSERVER).with(createBooleanModelDispatch(BlockStateProperties.POWERED, uh3, uh2)).with(createFacingDispatch()));
+    }
+    
+    private void createPistons() {
+        final TextureMapping iy2 = new TextureMapping().put(TextureSlot.BOTTOM, TextureMapping.getBlockTexture(Blocks.PISTON, "_bottom")).put(TextureSlot.SIDE, TextureMapping.getBlockTexture(Blocks.PISTON, "_side"));
+        final ResourceLocation uh3 = TextureMapping.getBlockTexture(Blocks.PISTON, "_top_sticky");
+        final ResourceLocation uh4 = TextureMapping.getBlockTexture(Blocks.PISTON, "_top");
+        final TextureMapping iy3 = iy2.copyAndUpdate(TextureSlot.PLATFORM, uh3);
+        final TextureMapping iy4 = iy2.copyAndUpdate(TextureSlot.PLATFORM, uh4);
+        final ResourceLocation uh5 = ModelLocationUtils.getModelLocation(Blocks.PISTON, "_base");
+        this.createPistonVariant(Blocks.PISTON, uh5, iy4);
+        this.createPistonVariant(Blocks.STICKY_PISTON, uh5, iy3);
+        final ResourceLocation uh6 = ModelTemplates.CUBE_BOTTOM_TOP.createWithSuffix(Blocks.PISTON, "_inventory", iy2.copyAndUpdate(TextureSlot.TOP, uh4), this.modelOutput);
+        final ResourceLocation uh7 = ModelTemplates.CUBE_BOTTOM_TOP.createWithSuffix(Blocks.STICKY_PISTON, "_inventory", iy2.copyAndUpdate(TextureSlot.TOP, uh3), this.modelOutput);
+        this.delegateItemModel(Blocks.PISTON, uh6);
+        this.delegateItemModel(Blocks.STICKY_PISTON, uh7);
+    }
+    
+    private void createPistonVariant(final Block bvr, final ResourceLocation uh, final TextureMapping iy) {
+        final ResourceLocation uh2 = ModelTemplates.PISTON.create(bvr, iy, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr).with(createBooleanModelDispatch(BlockStateProperties.EXTENDED, uh, uh2)).with(createFacingDispatch()));
+    }
+    
+    private void createPistonHeads() {
+        final TextureMapping iy2 = new TextureMapping().put(TextureSlot.UNSTICKY, TextureMapping.getBlockTexture(Blocks.PISTON, "_top")).put(TextureSlot.SIDE, TextureMapping.getBlockTexture(Blocks.PISTON, "_side"));
+        final TextureMapping iy3 = iy2.copyAndUpdate(TextureSlot.PLATFORM, TextureMapping.getBlockTexture(Blocks.PISTON, "_top_sticky"));
+        final TextureMapping iy4 = iy2.copyAndUpdate(TextureSlot.PLATFORM, TextureMapping.getBlockTexture(Blocks.PISTON, "_top"));
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.PISTON_HEAD).with(PropertyDispatch.<Boolean, PistonType>properties((Property<Boolean>)BlockStateProperties.SHORT, BlockStateProperties.PISTON_TYPE).select(false, PistonType.DEFAULT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelTemplates.PISTON_HEAD.createWithSuffix(Blocks.PISTON, "_head", iy4, this.modelOutput))).select(false, PistonType.STICKY, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelTemplates.PISTON_HEAD.createWithSuffix(Blocks.PISTON, "_head_sticky", iy3, this.modelOutput))).select(true, PistonType.DEFAULT, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelTemplates.PISTON_HEAD_SHORT.createWithSuffix(Blocks.PISTON, "_head_short", iy4, this.modelOutput))).select(true, PistonType.STICKY, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelTemplates.PISTON_HEAD_SHORT.createWithSuffix(Blocks.PISTON, "_head_short_sticky", iy3, this.modelOutput)))).with(createFacingDispatch()));
+    }
+    
+    private void createScaffolding() {
+        final ResourceLocation uh2 = ModelLocationUtils.getModelLocation(Blocks.SCAFFOLDING, "_stable");
+        final ResourceLocation uh3 = ModelLocationUtils.getModelLocation(Blocks.SCAFFOLDING, "_unstable");
+        this.delegateItemModel(Blocks.SCAFFOLDING, uh2);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.SCAFFOLDING).with(createBooleanModelDispatch(BlockStateProperties.BOTTOM, uh3, uh2)));
+    }
+    
+    private void createRedstoneLamp() {
+        final ResourceLocation uh2 = TexturedModel.CUBE.create(Blocks.REDSTONE_LAMP, this.modelOutput);
+        final ResourceLocation uh3 = this.createSuffixedVariant(Blocks.REDSTONE_LAMP, "_on", ModelTemplates.CUBE_ALL, TextureMapping::cube);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.REDSTONE_LAMP).with(createBooleanModelDispatch(BlockStateProperties.LIT, uh3, uh2)));
+    }
+    
+    private void createNormalTorch(final Block bvr1, final Block bvr2) {
+        final TextureMapping iy4 = TextureMapping.torch(bvr1);
+        this.blockStateOutput.accept(createSimpleBlock(bvr1, ModelTemplates.TORCH.create(bvr1, iy4, this.modelOutput)));
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(bvr2, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelTemplates.WALL_TORCH.create(bvr2, iy4, this.modelOutput))).with(createTorchHorizontalDispatch()));
+        this.createSimpleFlatItemModel(bvr1);
+        this.skipAutoItemBlock(bvr2);
+    }
+    
+    private void createRedstoneTorch() {
+        final TextureMapping iy2 = TextureMapping.torch(Blocks.REDSTONE_TORCH);
+        final TextureMapping iy3 = TextureMapping.torch(TextureMapping.getBlockTexture(Blocks.REDSTONE_TORCH, "_off"));
+        final ResourceLocation uh4 = ModelTemplates.TORCH.create(Blocks.REDSTONE_TORCH, iy2, this.modelOutput);
+        final ResourceLocation uh5 = ModelTemplates.TORCH.createWithSuffix(Blocks.REDSTONE_TORCH, "_off", iy3, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.REDSTONE_TORCH).with(createBooleanModelDispatch(BlockStateProperties.LIT, uh4, uh5)));
+        final ResourceLocation uh6 = ModelTemplates.WALL_TORCH.create(Blocks.REDSTONE_WALL_TORCH, iy2, this.modelOutput);
+        final ResourceLocation uh7 = ModelTemplates.WALL_TORCH.createWithSuffix(Blocks.REDSTONE_WALL_TORCH, "_off", iy3, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.REDSTONE_WALL_TORCH).with(createBooleanModelDispatch(BlockStateProperties.LIT, uh6, uh7)).with(createTorchHorizontalDispatch()));
+        this.createSimpleFlatItemModel(Blocks.REDSTONE_TORCH);
+        this.skipAutoItemBlock(Blocks.REDSTONE_WALL_TORCH);
+    }
+    
+    private void createRepeater() {
+        this.createSimpleFlatItemModel(Items.REPEATER);
+        final StringBuilder stringBuilder4;
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.REPEATER).with(PropertyDispatch.<Integer, Boolean, Boolean>properties((Property<Integer>)BlockStateProperties.DELAY, (Property<Boolean>)BlockStateProperties.LOCKED, (Property<Boolean>)BlockStateProperties.POWERED).generate((integer, boolean2, boolean3) -> {
+            stringBuilder4 = new StringBuilder();
+            stringBuilder4.append('_').append(integer).append("tick");
+            if (boolean3) {
+                stringBuilder4.append("_on");
+            }
+            if (boolean2) {
+                stringBuilder4.append("_locked");
+            }
+            return Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.REPEATER, stringBuilder4.toString()));
+        })).with(createHorizontalFacingDispatchAlt()));
+    }
+    
+    private void createSeaPickle() {
+        this.createSimpleFlatItemModel(Items.SEA_PICKLE);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.SEA_PICKLE).with(PropertyDispatch.<Integer, Boolean>properties((Property<Integer>)BlockStateProperties.PICKLES, (Property<Boolean>)BlockStateProperties.WATERLOGGED).select(1, false, Arrays.<Variant>asList(createRotatedVariants(ModelLocationUtils.decorateBlockModelLocation("dead_sea_pickle")))).select(2, false, Arrays.<Variant>asList(createRotatedVariants(ModelLocationUtils.decorateBlockModelLocation("two_dead_sea_pickles")))).select(3, false, Arrays.<Variant>asList(createRotatedVariants(ModelLocationUtils.decorateBlockModelLocation("three_dead_sea_pickles")))).select(4, false, Arrays.<Variant>asList(createRotatedVariants(ModelLocationUtils.decorateBlockModelLocation("four_dead_sea_pickles")))).select(1, true, Arrays.<Variant>asList(createRotatedVariants(ModelLocationUtils.decorateBlockModelLocation("sea_pickle")))).select(2, true, Arrays.<Variant>asList(createRotatedVariants(ModelLocationUtils.decorateBlockModelLocation("two_sea_pickles")))).select(3, true, Arrays.<Variant>asList(createRotatedVariants(ModelLocationUtils.decorateBlockModelLocation("three_sea_pickles")))).select(4, true, Arrays.<Variant>asList(createRotatedVariants(ModelLocationUtils.decorateBlockModelLocation("four_sea_pickles"))))));
+    }
+    
+    private void createSnowBlocks() {
+        final TextureMapping iy2 = TextureMapping.cube(Blocks.SNOW);
+        final ResourceLocation uh3 = ModelTemplates.CUBE_ALL.create(Blocks.SNOW_BLOCK, iy2, this.modelOutput);
+        final VariantProperty<ResourceLocation> model;
+        ResourceLocation modelLocation;
+        final ResourceLocation resourceLocation;
+        final Variant variant;
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.SNOW).with(PropertyDispatch.<Comparable>property((Property<Comparable>)BlockStateProperties.LAYERS).generate(integer -> {
+            Variant.variant();
+            model = VariantProperties.MODEL;
+            if (integer < 8) {
+                modelLocation = ModelLocationUtils.getModelLocation(Blocks.SNOW, "_height" + integer * 2);
+            }
+            else {
+                modelLocation = resourceLocation;
+            }
+            return variant.<ResourceLocation>with(model, modelLocation);
+        })));
+        this.delegateItemModel(Blocks.SNOW, ModelLocationUtils.getModelLocation(Blocks.SNOW, "_height2"));
+        this.blockStateOutput.accept(createSimpleBlock(Blocks.SNOW_BLOCK, uh3));
+    }
+    
+    private void createStonecutter() {
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.STONECUTTER, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.STONECUTTER))).with(createHorizontalFacingDispatch()));
+    }
+    
+    private void createStructureBlock() {
+        final ResourceLocation uh2 = TexturedModel.CUBE.create(Blocks.STRUCTURE_BLOCK, this.modelOutput);
+        this.delegateItemModel(Blocks.STRUCTURE_BLOCK, uh2);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.STRUCTURE_BLOCK).with(PropertyDispatch.<StructureMode>property(BlockStateProperties.STRUCTUREBLOCK_MODE).generate(cgq -> Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, this.createSuffixedVariant(Blocks.STRUCTURE_BLOCK, "_" + cgq.getSerializedName(), ModelTemplates.CUBE_ALL, TextureMapping::cube)))));
+    }
+    
+    private void createSweetBerryBush() {
+        this.createSimpleFlatItemModel(Items.SWEET_BERRIES);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.SWEET_BERRY_BUSH).with(PropertyDispatch.<Integer>property((Property<Integer>)BlockStateProperties.AGE_3).generate(integer -> Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, this.createSuffixedVariant(Blocks.SWEET_BERRY_BUSH, "_stage" + integer, ModelTemplates.CROSS, TextureMapping::cross)))));
+    }
+    
+    private void createTripwire() {
+        this.createSimpleFlatItemModel(Items.STRING);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.TRIPWIRE).with(PropertyDispatch.<Boolean, Boolean, Boolean, Boolean, Boolean>properties((Property<Boolean>)BlockStateProperties.ATTACHED, (Property<Boolean>)BlockStateProperties.EAST, (Property<Boolean>)BlockStateProperties.NORTH, (Property<Boolean>)BlockStateProperties.SOUTH, (Property<Boolean>)BlockStateProperties.WEST).select(false, false, false, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_ns"))).select(false, true, false, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_n")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(false, false, true, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_n"))).select(false, false, false, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_n")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(false, false, false, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_n")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(false, true, true, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_ne"))).select(false, true, false, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_ne")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(false, false, false, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_ne")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(false, false, true, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_ne")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(false, false, true, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_ns"))).select(false, true, false, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_ns")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(false, true, true, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_nse"))).select(false, true, false, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_nse")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(false, false, true, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_nse")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(false, true, true, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_nse")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(false, true, true, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_nsew"))).select(true, false, false, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_ns"))).select(true, false, true, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_n"))).select(true, false, false, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_n")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(true, true, false, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_n")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(true, false, false, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_n")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(true, true, true, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_ne"))).select(true, true, false, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_ne")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(true, false, false, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_ne")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(true, false, true, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_ne")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(true, false, true, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_ns"))).select(true, true, false, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_ns")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(true, true, true, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_nse"))).select(true, true, false, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_nse")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(true, false, true, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_nse")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(true, true, true, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_nse")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(true, true, true, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.TRIPWIRE, "_attached_nsew")))));
+    }
+    
+    private void createTripwireHook() {
+        this.createSimpleFlatItemModel(Blocks.TRIPWIRE_HOOK);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.TRIPWIRE_HOOK).with(PropertyDispatch.<Boolean, Boolean>properties((Property<Boolean>)BlockStateProperties.ATTACHED, (Property<Boolean>)BlockStateProperties.POWERED).generate((boolean1, boolean2) -> Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, TextureMapping.getBlockTexture(Blocks.TRIPWIRE_HOOK, (boolean1 ? "_attached" : "") + (boolean2 ? "_on" : ""))))).with(createHorizontalFacingDispatch()));
+    }
+    
+    private ResourceLocation createTurtleEggModel(final int integer, final String string, final TextureMapping iy) {
+        switch (integer) {
+            case 1: {
+                return ModelTemplates.TURTLE_EGG.create(ModelLocationUtils.decorateBlockModelLocation(string + "turtle_egg"), iy, this.modelOutput);
+            }
+            case 2: {
+                return ModelTemplates.TWO_TURTLE_EGGS.create(ModelLocationUtils.decorateBlockModelLocation("two_" + string + "turtle_eggs"), iy, this.modelOutput);
+            }
+            case 3: {
+                return ModelTemplates.THREE_TURTLE_EGGS.create(ModelLocationUtils.decorateBlockModelLocation("three_" + string + "turtle_eggs"), iy, this.modelOutput);
+            }
+            case 4: {
+                return ModelTemplates.FOUR_TURTLE_EGGS.create(ModelLocationUtils.decorateBlockModelLocation("four_" + string + "turtle_eggs"), iy, this.modelOutput);
+            }
+            default: {
+                throw new UnsupportedOperationException();
+            }
+        }
+    }
+    
+    private ResourceLocation createTurtleEggModel(final Integer integer1, final Integer integer2) {
+        switch (integer2) {
+            case 0: {
+                return this.createTurtleEggModel(integer1, "", TextureMapping.cube(TextureMapping.getBlockTexture(Blocks.TURTLE_EGG)));
+            }
+            case 1: {
+                return this.createTurtleEggModel(integer1, "slightly_cracked_", TextureMapping.cube(TextureMapping.getBlockTexture(Blocks.TURTLE_EGG, "_slightly_cracked")));
+            }
+            case 2: {
+                return this.createTurtleEggModel(integer1, "very_cracked_", TextureMapping.cube(TextureMapping.getBlockTexture(Blocks.TURTLE_EGG, "_very_cracked")));
+            }
+            default: {
+                throw new UnsupportedOperationException();
+            }
+        }
+    }
+    
+    private void createTurtleEgg() {
+        this.createSimpleFlatItemModel(Items.TURTLE_EGG);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.TURTLE_EGG).with(PropertyDispatch.<Integer, Integer>properties((Property<Integer>)BlockStateProperties.EGGS, (Property<Integer>)BlockStateProperties.HATCH).generateList((integer1, integer2) -> Arrays.<Variant>asList(createRotatedVariants(this.createTurtleEggModel(integer1, integer2))))));
+    }
+    
+    private void createVine() {
+        this.createSimpleFlatItemModel(Blocks.VINE);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.VINE).with(PropertyDispatch.<Boolean, Boolean, Boolean, Boolean, Boolean>properties((Property<Boolean>)BlockStateProperties.EAST, (Property<Boolean>)BlockStateProperties.NORTH, (Property<Boolean>)BlockStateProperties.SOUTH, (Property<Boolean>)BlockStateProperties.UP, (Property<Boolean>)BlockStateProperties.WEST).select(false, false, false, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_1"))).select(false, false, true, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_1"))).select(false, false, false, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_1")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(false, true, false, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_1")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(true, false, false, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_1")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(true, true, false, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2"))).select(true, false, true, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(false, false, true, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(false, true, false, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(true, false, false, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2_opposite"))).select(false, true, true, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2_opposite")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(true, true, true, false, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_3"))).select(true, false, true, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_3")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(false, true, true, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_3")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(true, true, false, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_3")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(true, true, true, false, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_4"))).select(false, false, false, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_u"))).select(false, false, true, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_1u"))).select(false, false, false, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_1u")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(false, true, false, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_1u")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(true, false, false, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_1u")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(true, true, false, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2u"))).select(true, false, true, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2u")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(false, false, true, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2u")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(false, true, false, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2u")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(true, false, false, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2u_opposite"))).select(false, true, true, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_2u_opposite")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(true, true, true, true, false, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_3u"))).select(true, false, true, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_3u")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)).select(false, true, true, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_3u")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)).select(true, true, false, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_3u")).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)).select(true, true, true, true, true, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.VINE, "_4u")))));
+    }
+    
+    private void createMagmaBlock() {
+        this.blockStateOutput.accept(createSimpleBlock(Blocks.MAGMA_BLOCK, ModelTemplates.CUBE_ALL.create(Blocks.MAGMA_BLOCK, TextureMapping.cube(ModelLocationUtils.decorateBlockModelLocation("magma")), this.modelOutput)));
+    }
+    
+    private void createShulkerBox(final Block bvr) {
+        this.createTrivialBlock(bvr, TexturedModel.PARTICLE_ONLY);
+        ModelTemplates.SHULKER_BOX_INVENTORY.create(ModelLocationUtils.getModelLocation(bvr.asItem()), TextureMapping.particle(bvr), this.modelOutput);
+    }
+    
+    private void createGrowingPlant(final Block bvr1, final Block bvr2, final TintState c) {
+        this.createCrossBlock(bvr1, c);
+        this.createCrossBlock(bvr2, c);
+    }
+    
+    private void createBedItem(final Block bvr1, final Block bvr2) {
+        ModelTemplates.BED_INVENTORY.create(ModelLocationUtils.getModelLocation(bvr1.asItem()), TextureMapping.particle(bvr2), this.modelOutput);
+    }
+    
+    private void createInfestedStone() {
+        final ResourceLocation uh2 = ModelLocationUtils.getModelLocation(Blocks.STONE);
+        final ResourceLocation uh3 = ModelLocationUtils.getModelLocation(Blocks.STONE, "_mirrored");
+        this.blockStateOutput.accept(createRotatedVariant(Blocks.INFESTED_STONE, uh2, uh3));
+        this.delegateItemModel(Blocks.INFESTED_STONE, uh2);
+    }
+    
+    private void createNetherRoots(final Block bvr1, final Block bvr2) {
+        this.createCrossBlockWithDefaultItem(bvr1, TintState.NOT_TINTED);
+        final TextureMapping iy4 = TextureMapping.plant(TextureMapping.getBlockTexture(bvr1, "_pot"));
+        final ResourceLocation uh5 = TintState.NOT_TINTED.getCrossPot().create(bvr2, iy4, this.modelOutput);
+        this.blockStateOutput.accept(createSimpleBlock(bvr2, uh5));
+    }
+    
+    private void createRespawnAnchor() {
+        final ResourceLocation uh2 = TextureMapping.getBlockTexture(Blocks.RESPAWN_ANCHOR, "_bottom");
+        final ResourceLocation uh3 = TextureMapping.getBlockTexture(Blocks.RESPAWN_ANCHOR, "_top_off");
+        final ResourceLocation uh4 = TextureMapping.getBlockTexture(Blocks.RESPAWN_ANCHOR, "_top");
+        final ResourceLocation[] arr5 = new ResourceLocation[5];
+        for (int integer2 = 0; integer2 < 5; ++integer2) {
+            final TextureMapping iy7 = new TextureMapping().put(TextureSlot.BOTTOM, uh2).put(TextureSlot.TOP, (integer2 == 0) ? uh3 : uh4).put(TextureSlot.SIDE, TextureMapping.getBlockTexture(Blocks.RESPAWN_ANCHOR, "_side" + integer2));
+            arr5[integer2] = ModelTemplates.CUBE_BOTTOM_TOP.createWithSuffix(Blocks.RESPAWN_ANCHOR, "_" + integer2, iy7, this.modelOutput);
+        }
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.RESPAWN_ANCHOR).with(PropertyDispatch.<Comparable>property((Property<Comparable>)BlockStateProperties.RESPAWN_ANCHOR_CHARGES).generate(integer -> Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, arr5[integer]))));
+        this.delegateItemModel(Items.RESPAWN_ANCHOR, arr5[0]);
+    }
+    
+    private Variant applyRotation(final FrontAndTop gb, final Variant iq) {
+        switch (gb) {
+            case DOWN_NORTH: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90);
+            }
+            case DOWN_SOUTH: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180);
+            }
+            case DOWN_WEST: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270);
+            }
+            case DOWN_EAST: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R90).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90);
+            }
+            case UP_NORTH: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180);
+            }
+            case UP_SOUTH: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270);
+            }
+            case UP_WEST: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90);
+            }
+            case UP_EAST: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.X_ROT, VariantProperties.Rotation.R270).<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270);
+            }
+            case NORTH_UP: {
+                return iq;
+            }
+            case SOUTH_UP: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180);
+            }
+            case WEST_UP: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270);
+            }
+            case EAST_UP: {
+                return iq.<VariantProperties.Rotation>with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90);
+            }
+            default: {
+                throw new UnsupportedOperationException("Rotation " + gb + " can't be expressed with existing x and y values");
+            }
+        }
+    }
+    
+    private void createJigsaw() {
+        final ResourceLocation uh2 = TextureMapping.getBlockTexture(Blocks.JIGSAW, "_top");
+        final ResourceLocation uh3 = TextureMapping.getBlockTexture(Blocks.JIGSAW, "_bottom");
+        final ResourceLocation uh4 = TextureMapping.getBlockTexture(Blocks.JIGSAW, "_side");
+        final ResourceLocation uh5 = TextureMapping.getBlockTexture(Blocks.JIGSAW, "_lock");
+        final TextureMapping iy6 = new TextureMapping().put(TextureSlot.DOWN, uh4).put(TextureSlot.WEST, uh4).put(TextureSlot.EAST, uh4).put(TextureSlot.PARTICLE, uh2).put(TextureSlot.NORTH, uh2).put(TextureSlot.SOUTH, uh3).put(TextureSlot.UP, uh5);
+        final ResourceLocation uh6 = ModelTemplates.CUBE_DIRECTIONAL.create(Blocks.JIGSAW, iy6, this.modelOutput);
+        this.blockStateOutput.accept(MultiVariantGenerator.multiVariant(Blocks.JIGSAW, Variant.variant().<ResourceLocation>with(VariantProperties.MODEL, uh6)).with(PropertyDispatch.<FrontAndTop>property(BlockStateProperties.ORIENTATION).generate(gb -> this.applyRotation(gb, Variant.variant()))));
+    }
+    
+    public void run() {
+        this.createNonTemplateModelBlock(Blocks.AIR);
+        this.createNonTemplateModelBlock(Blocks.CAVE_AIR, Blocks.AIR);
+        this.createNonTemplateModelBlock(Blocks.VOID_AIR, Blocks.AIR);
+        this.createNonTemplateModelBlock(Blocks.BEACON);
+        this.createNonTemplateModelBlock(Blocks.CACTUS);
+        this.createNonTemplateModelBlock(Blocks.BUBBLE_COLUMN, Blocks.WATER);
+        this.createNonTemplateModelBlock(Blocks.DRAGON_EGG);
+        this.createNonTemplateModelBlock(Blocks.DRIED_KELP_BLOCK);
+        this.createNonTemplateModelBlock(Blocks.ENCHANTING_TABLE);
+        this.createNonTemplateModelBlock(Blocks.FLOWER_POT);
+        this.createSimpleFlatItemModel(Items.FLOWER_POT);
+        this.createNonTemplateModelBlock(Blocks.HONEY_BLOCK);
+        this.createNonTemplateModelBlock(Blocks.WATER);
+        this.createNonTemplateModelBlock(Blocks.LAVA);
+        this.createNonTemplateModelBlock(Blocks.SLIME_BLOCK);
+        this.createNonTemplateModelBlock(Blocks.CHAIN);
+        this.createSimpleFlatItemModel(Items.CHAIN);
+        this.createNonTemplateModelBlock(Blocks.POTTED_BAMBOO);
+        this.createNonTemplateModelBlock(Blocks.POTTED_CACTUS);
+        this.createAirLikeBlock(Blocks.BARRIER, Items.BARRIER);
+        this.createSimpleFlatItemModel(Items.BARRIER);
+        this.createAirLikeBlock(Blocks.STRUCTURE_VOID, Items.STRUCTURE_VOID);
+        this.createSimpleFlatItemModel(Items.STRUCTURE_VOID);
+        this.createAirLikeBlock(Blocks.MOVING_PISTON, TextureMapping.getBlockTexture(Blocks.PISTON, "_side"));
+        this.createTrivialBlock(Blocks.COAL_ORE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.COAL_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.DIAMOND_ORE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.DIAMOND_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.EMERALD_ORE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.EMERALD_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.GOLD_ORE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.NETHER_GOLD_ORE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.GOLD_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.IRON_ORE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.IRON_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.ANCIENT_DEBRIS, TexturedModel.COLUMN);
+        this.createTrivialBlock(Blocks.NETHERITE_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.LAPIS_ORE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.LAPIS_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.NETHER_QUARTZ_ORE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.REDSTONE_ORE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.REDSTONE_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.GILDED_BLACKSTONE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.BLUE_ICE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.CHISELED_NETHER_BRICKS, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.CLAY, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.COARSE_DIRT, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.CRACKED_NETHER_BRICKS, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.CRACKED_STONE_BRICKS, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.CRYING_OBSIDIAN, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.END_STONE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.GLOWSTONE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.GRAVEL, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.HONEYCOMB_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.ICE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.JUKEBOX, TexturedModel.CUBE_TOP);
+        this.createTrivialBlock(Blocks.LODESTONE, TexturedModel.COLUMN);
+        this.createTrivialBlock(Blocks.MELON, TexturedModel.COLUMN);
+        this.createTrivialBlock(Blocks.NETHER_WART_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.NOTE_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.PACKED_ICE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.OBSIDIAN, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.QUARTZ_BRICKS, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.SEA_LANTERN, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.SHROOMLIGHT, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.SOUL_SAND, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.SOUL_SOIL, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.SPAWNER, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.SPONGE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.SEAGRASS, TexturedModel.SEAGRASS);
+        this.createSimpleFlatItemModel(Items.SEAGRASS);
+        this.createTrivialBlock(Blocks.TNT, TexturedModel.CUBE_TOP_BOTTOM);
+        this.createTrivialBlock(Blocks.TARGET, TexturedModel.COLUMN);
+        this.createTrivialBlock(Blocks.WARPED_WART_BLOCK, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.WET_SPONGE, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS, TexturedModel.CUBE);
+        this.createTrivialBlock(Blocks.CHISELED_QUARTZ_BLOCK, TexturedModel.COLUMN.updateTexture(iy -> iy.put(TextureSlot.SIDE, TextureMapping.getBlockTexture(Blocks.CHISELED_QUARTZ_BLOCK))));
+        this.createTrivialBlock(Blocks.CHISELED_STONE_BRICKS, TexturedModel.CUBE);
+        this.createChiseledSandsone(Blocks.CHISELED_SANDSTONE, Blocks.SANDSTONE);
+        this.createChiseledSandsone(Blocks.CHISELED_RED_SANDSTONE, Blocks.RED_SANDSTONE);
+        this.createTrivialBlock(Blocks.CHISELED_POLISHED_BLACKSTONE, TexturedModel.CUBE);
+        this.createWeightedPressurePlate(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE, Blocks.GOLD_BLOCK);
+        this.createWeightedPressurePlate(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE, Blocks.IRON_BLOCK);
+        this.createBookshelf();
+        this.createBrewingStand();
+        this.createCakeBlock();
+        this.createCampfires(Blocks.CAMPFIRE, Blocks.SOUL_CAMPFIRE);
+        this.createCartographyTable();
+        this.createCauldron();
+        this.createChorusFlower();
+        this.createChorusPlant();
+        this.createComposter();
+        this.createDaylightDetector();
+        this.createEndPortalFrame();
+        this.createEndRod();
+        this.createFarmland();
+        this.createFire();
+        this.createSoulFire();
+        this.createFrostedIce();
+        this.createGrassBlocks();
+        this.createCocoa();
+        this.createGrassPath();
+        this.createGrindstone();
+        this.createHopper();
+        this.createIronBars();
+        this.createLever();
+        this.createLilyPad();
+        this.createNetherPortalBlock();
+        this.createNetherrack();
+        this.createObserver();
+        this.createPistons();
+        this.createPistonHeads();
+        this.createScaffolding();
+        this.createRedstoneTorch();
+        this.createRedstoneLamp();
+        this.createRepeater();
+        this.createSeaPickle();
+        this.createSmithingTable();
+        this.createSnowBlocks();
+        this.createStonecutter();
+        this.createStructureBlock();
+        this.createSweetBerryBush();
+        this.createTripwire();
+        this.createTripwireHook();
+        this.createTurtleEgg();
+        this.createVine();
+        this.createMagmaBlock();
+        this.createJigsaw();
+        this.createNonTemplateHorizontalBlock(Blocks.LADDER);
+        this.createSimpleFlatItemModel(Blocks.LADDER);
+        this.createNonTemplateHorizontalBlock(Blocks.LECTERN);
+        this.createNormalTorch(Blocks.TORCH, Blocks.WALL_TORCH);
+        this.createNormalTorch(Blocks.SOUL_TORCH, Blocks.SOUL_WALL_TORCH);
+        this.createCraftingTableLike(Blocks.CRAFTING_TABLE, Blocks.OAK_PLANKS, TextureMapping::craftingTable);
+        this.createCraftingTableLike(Blocks.FLETCHING_TABLE, Blocks.BIRCH_PLANKS, TextureMapping::fletchingTable);
+        this.createNyliumBlock(Blocks.CRIMSON_NYLIUM);
+        this.createNyliumBlock(Blocks.WARPED_NYLIUM);
+        this.createDispenserBlock(Blocks.DISPENSER);
+        this.createDispenserBlock(Blocks.DROPPER);
+        this.createLantern(Blocks.LANTERN);
+        this.createLantern(Blocks.SOUL_LANTERN);
+        this.createAxisAlignedPillarBlock(Blocks.BASALT, TexturedModel.COLUMN);
+        this.createAxisAlignedPillarBlock(Blocks.POLISHED_BASALT, TexturedModel.COLUMN);
+        this.createAxisAlignedPillarBlock(Blocks.BONE_BLOCK, TexturedModel.COLUMN);
+        this.createRotatedVariantBlock(Blocks.DIRT);
+        this.createRotatedVariantBlock(Blocks.SAND);
+        this.createRotatedVariantBlock(Blocks.RED_SAND);
+        this.createRotatedMirroredVariantBlock(Blocks.BEDROCK);
+        this.createRotatedPillarWithHorizontalVariant(Blocks.HAY_BLOCK, TexturedModel.COLUMN, TexturedModel.COLUMN_HORIZONTAL);
+        this.createRotatedPillarWithHorizontalVariant(Blocks.PURPUR_PILLAR, TexturedModel.COLUMN_ALT, TexturedModel.COLUMN_HORIZONTAL_ALT);
+        this.createRotatedPillarWithHorizontalVariant(Blocks.QUARTZ_PILLAR, TexturedModel.COLUMN_ALT, TexturedModel.COLUMN_HORIZONTAL_ALT);
+        this.createHorizontallyRotatedBlock(Blocks.LOOM, TexturedModel.ORIENTABLE);
+        this.createPumpkins();
+        this.createBeeNest(Blocks.BEE_NEST, TextureMapping::orientableCube);
+        this.createBeeNest(Blocks.BEEHIVE, TextureMapping::orientableCubeSameEnds);
+        this.createCropBlock(Blocks.BEETROOTS, BlockStateProperties.AGE_3, 0, 1, 2, 3);
+        this.createCropBlock(Blocks.CARROTS, BlockStateProperties.AGE_7, 0, 0, 1, 1, 2, 2, 2, 3);
+        this.createCropBlock(Blocks.NETHER_WART, BlockStateProperties.AGE_3, 0, 1, 1, 2);
+        this.createCropBlock(Blocks.POTATOES, BlockStateProperties.AGE_7, 0, 0, 1, 1, 2, 2, 2, 3);
+        this.createCropBlock(Blocks.WHEAT, BlockStateProperties.AGE_7, 0, 1, 2, 3, 4, 5, 6, 7);
+        this.blockEntityModels(ModelLocationUtils.decorateBlockModelLocation("banner"), Blocks.OAK_PLANKS).createWithCustomBlockItemModel(ModelTemplates.BANNER_INVENTORY, Blocks.WHITE_BANNER, Blocks.ORANGE_BANNER, Blocks.MAGENTA_BANNER, Blocks.LIGHT_BLUE_BANNER, Blocks.YELLOW_BANNER, Blocks.LIME_BANNER, Blocks.PINK_BANNER, Blocks.GRAY_BANNER, Blocks.LIGHT_GRAY_BANNER, Blocks.CYAN_BANNER, Blocks.PURPLE_BANNER, Blocks.BLUE_BANNER, Blocks.BROWN_BANNER, Blocks.GREEN_BANNER, Blocks.RED_BANNER, Blocks.BLACK_BANNER).createWithoutBlockItem(Blocks.WHITE_WALL_BANNER, Blocks.ORANGE_WALL_BANNER, Blocks.MAGENTA_WALL_BANNER, Blocks.LIGHT_BLUE_WALL_BANNER, Blocks.YELLOW_WALL_BANNER, Blocks.LIME_WALL_BANNER, Blocks.PINK_WALL_BANNER, Blocks.GRAY_WALL_BANNER, Blocks.LIGHT_GRAY_WALL_BANNER, Blocks.CYAN_WALL_BANNER, Blocks.PURPLE_WALL_BANNER, Blocks.BLUE_WALL_BANNER, Blocks.BROWN_WALL_BANNER, Blocks.GREEN_WALL_BANNER, Blocks.RED_WALL_BANNER, Blocks.BLACK_WALL_BANNER);
+        this.blockEntityModels(ModelLocationUtils.decorateBlockModelLocation("bed"), Blocks.OAK_PLANKS).createWithoutBlockItem(Blocks.WHITE_BED, Blocks.ORANGE_BED, Blocks.MAGENTA_BED, Blocks.LIGHT_BLUE_BED, Blocks.YELLOW_BED, Blocks.LIME_BED, Blocks.PINK_BED, Blocks.GRAY_BED, Blocks.LIGHT_GRAY_BED, Blocks.CYAN_BED, Blocks.PURPLE_BED, Blocks.BLUE_BED, Blocks.BROWN_BED, Blocks.GREEN_BED, Blocks.RED_BED, Blocks.BLACK_BED);
+        this.createBedItem(Blocks.WHITE_BED, Blocks.WHITE_WOOL);
+        this.createBedItem(Blocks.ORANGE_BED, Blocks.ORANGE_WOOL);
+        this.createBedItem(Blocks.MAGENTA_BED, Blocks.MAGENTA_WOOL);
+        this.createBedItem(Blocks.LIGHT_BLUE_BED, Blocks.LIGHT_BLUE_WOOL);
+        this.createBedItem(Blocks.YELLOW_BED, Blocks.YELLOW_WOOL);
+        this.createBedItem(Blocks.LIME_BED, Blocks.LIME_WOOL);
+        this.createBedItem(Blocks.PINK_BED, Blocks.PINK_WOOL);
+        this.createBedItem(Blocks.GRAY_BED, Blocks.GRAY_WOOL);
+        this.createBedItem(Blocks.LIGHT_GRAY_BED, Blocks.LIGHT_GRAY_WOOL);
+        this.createBedItem(Blocks.CYAN_BED, Blocks.CYAN_WOOL);
+        this.createBedItem(Blocks.PURPLE_BED, Blocks.PURPLE_WOOL);
+        this.createBedItem(Blocks.BLUE_BED, Blocks.BLUE_WOOL);
+        this.createBedItem(Blocks.BROWN_BED, Blocks.BROWN_WOOL);
+        this.createBedItem(Blocks.GREEN_BED, Blocks.GREEN_WOOL);
+        this.createBedItem(Blocks.RED_BED, Blocks.RED_WOOL);
+        this.createBedItem(Blocks.BLACK_BED, Blocks.BLACK_WOOL);
+        this.blockEntityModels(ModelLocationUtils.decorateBlockModelLocation("skull"), Blocks.SOUL_SAND).createWithCustomBlockItemModel(ModelTemplates.SKULL_INVENTORY, Blocks.CREEPER_HEAD, Blocks.PLAYER_HEAD, Blocks.ZOMBIE_HEAD, Blocks.SKELETON_SKULL, Blocks.WITHER_SKELETON_SKULL).create(Blocks.DRAGON_HEAD).createWithoutBlockItem(Blocks.CREEPER_WALL_HEAD, Blocks.DRAGON_WALL_HEAD, Blocks.PLAYER_WALL_HEAD, Blocks.ZOMBIE_WALL_HEAD, Blocks.SKELETON_WALL_SKULL, Blocks.WITHER_SKELETON_WALL_SKULL);
+        this.createShulkerBox(Blocks.SHULKER_BOX);
+        this.createShulkerBox(Blocks.WHITE_SHULKER_BOX);
+        this.createShulkerBox(Blocks.ORANGE_SHULKER_BOX);
+        this.createShulkerBox(Blocks.MAGENTA_SHULKER_BOX);
+        this.createShulkerBox(Blocks.LIGHT_BLUE_SHULKER_BOX);
+        this.createShulkerBox(Blocks.YELLOW_SHULKER_BOX);
+        this.createShulkerBox(Blocks.LIME_SHULKER_BOX);
+        this.createShulkerBox(Blocks.PINK_SHULKER_BOX);
+        this.createShulkerBox(Blocks.GRAY_SHULKER_BOX);
+        this.createShulkerBox(Blocks.LIGHT_GRAY_SHULKER_BOX);
+        this.createShulkerBox(Blocks.CYAN_SHULKER_BOX);
+        this.createShulkerBox(Blocks.PURPLE_SHULKER_BOX);
+        this.createShulkerBox(Blocks.BLUE_SHULKER_BOX);
+        this.createShulkerBox(Blocks.BROWN_SHULKER_BOX);
+        this.createShulkerBox(Blocks.GREEN_SHULKER_BOX);
+        this.createShulkerBox(Blocks.RED_SHULKER_BOX);
+        this.createShulkerBox(Blocks.BLACK_SHULKER_BOX);
+        this.createTrivialBlock(Blocks.CONDUIT, TexturedModel.PARTICLE_ONLY);
+        this.skipAutoItemBlock(Blocks.CONDUIT);
+        this.blockEntityModels(ModelLocationUtils.decorateBlockModelLocation("chest"), Blocks.OAK_PLANKS).createWithoutBlockItem(Blocks.CHEST, Blocks.TRAPPED_CHEST);
+        this.blockEntityModels(ModelLocationUtils.decorateBlockModelLocation("ender_chest"), Blocks.OBSIDIAN).createWithoutBlockItem(Blocks.ENDER_CHEST);
+        this.blockEntityModels(Blocks.END_PORTAL, Blocks.OBSIDIAN).create(Blocks.END_PORTAL, Blocks.END_GATEWAY);
+        this.createTrivialCube(Blocks.WHITE_CONCRETE);
+        this.createTrivialCube(Blocks.ORANGE_CONCRETE);
+        this.createTrivialCube(Blocks.MAGENTA_CONCRETE);
+        this.createTrivialCube(Blocks.LIGHT_BLUE_CONCRETE);
+        this.createTrivialCube(Blocks.YELLOW_CONCRETE);
+        this.createTrivialCube(Blocks.LIME_CONCRETE);
+        this.createTrivialCube(Blocks.PINK_CONCRETE);
+        this.createTrivialCube(Blocks.GRAY_CONCRETE);
+        this.createTrivialCube(Blocks.LIGHT_GRAY_CONCRETE);
+        this.createTrivialCube(Blocks.CYAN_CONCRETE);
+        this.createTrivialCube(Blocks.PURPLE_CONCRETE);
+        this.createTrivialCube(Blocks.BLUE_CONCRETE);
+        this.createTrivialCube(Blocks.BROWN_CONCRETE);
+        this.createTrivialCube(Blocks.GREEN_CONCRETE);
+        this.createTrivialCube(Blocks.RED_CONCRETE);
+        this.createTrivialCube(Blocks.BLACK_CONCRETE);
+        this.createColoredBlockWithRandomRotations(TexturedModel.CUBE, Blocks.WHITE_CONCRETE_POWDER, Blocks.ORANGE_CONCRETE_POWDER, Blocks.MAGENTA_CONCRETE_POWDER, Blocks.LIGHT_BLUE_CONCRETE_POWDER, Blocks.YELLOW_CONCRETE_POWDER, Blocks.LIME_CONCRETE_POWDER, Blocks.PINK_CONCRETE_POWDER, Blocks.GRAY_CONCRETE_POWDER, Blocks.LIGHT_GRAY_CONCRETE_POWDER, Blocks.CYAN_CONCRETE_POWDER, Blocks.PURPLE_CONCRETE_POWDER, Blocks.BLUE_CONCRETE_POWDER, Blocks.BROWN_CONCRETE_POWDER, Blocks.GREEN_CONCRETE_POWDER, Blocks.RED_CONCRETE_POWDER, Blocks.BLACK_CONCRETE_POWDER);
+        this.createTrivialCube(Blocks.TERRACOTTA);
+        this.createTrivialCube(Blocks.WHITE_TERRACOTTA);
+        this.createTrivialCube(Blocks.ORANGE_TERRACOTTA);
+        this.createTrivialCube(Blocks.MAGENTA_TERRACOTTA);
+        this.createTrivialCube(Blocks.LIGHT_BLUE_TERRACOTTA);
+        this.createTrivialCube(Blocks.YELLOW_TERRACOTTA);
+        this.createTrivialCube(Blocks.LIME_TERRACOTTA);
+        this.createTrivialCube(Blocks.PINK_TERRACOTTA);
+        this.createTrivialCube(Blocks.GRAY_TERRACOTTA);
+        this.createTrivialCube(Blocks.LIGHT_GRAY_TERRACOTTA);
+        this.createTrivialCube(Blocks.CYAN_TERRACOTTA);
+        this.createTrivialCube(Blocks.PURPLE_TERRACOTTA);
+        this.createTrivialCube(Blocks.BLUE_TERRACOTTA);
+        this.createTrivialCube(Blocks.BROWN_TERRACOTTA);
+        this.createTrivialCube(Blocks.GREEN_TERRACOTTA);
+        this.createTrivialCube(Blocks.RED_TERRACOTTA);
+        this.createTrivialCube(Blocks.BLACK_TERRACOTTA);
+        this.createGlassBlocks(Blocks.GLASS, Blocks.GLASS_PANE);
+        this.createGlassBlocks(Blocks.WHITE_STAINED_GLASS, Blocks.WHITE_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.ORANGE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.MAGENTA_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.YELLOW_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.LIME_STAINED_GLASS, Blocks.LIME_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.PINK_STAINED_GLASS, Blocks.PINK_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.GRAY_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.CYAN_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.PURPLE_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.BLUE_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.BROWN_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.GREEN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.RED_STAINED_GLASS, Blocks.RED_STAINED_GLASS_PANE);
+        this.createGlassBlocks(Blocks.BLACK_STAINED_GLASS, Blocks.BLACK_STAINED_GLASS_PANE);
+        this.createColoredBlockWithStateRotations(TexturedModel.GLAZED_TERRACOTTA, Blocks.WHITE_GLAZED_TERRACOTTA, Blocks.ORANGE_GLAZED_TERRACOTTA, Blocks.MAGENTA_GLAZED_TERRACOTTA, Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA, Blocks.YELLOW_GLAZED_TERRACOTTA, Blocks.LIME_GLAZED_TERRACOTTA, Blocks.PINK_GLAZED_TERRACOTTA, Blocks.GRAY_GLAZED_TERRACOTTA, Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA, Blocks.CYAN_GLAZED_TERRACOTTA, Blocks.PURPLE_GLAZED_TERRACOTTA, Blocks.BLUE_GLAZED_TERRACOTTA, Blocks.BROWN_GLAZED_TERRACOTTA, Blocks.GREEN_GLAZED_TERRACOTTA, Blocks.RED_GLAZED_TERRACOTTA, Blocks.BLACK_GLAZED_TERRACOTTA);
+        this.createWoolBlocks(Blocks.WHITE_WOOL, Blocks.WHITE_CARPET);
+        this.createWoolBlocks(Blocks.ORANGE_WOOL, Blocks.ORANGE_CARPET);
+        this.createWoolBlocks(Blocks.MAGENTA_WOOL, Blocks.MAGENTA_CARPET);
+        this.createWoolBlocks(Blocks.LIGHT_BLUE_WOOL, Blocks.LIGHT_BLUE_CARPET);
+        this.createWoolBlocks(Blocks.YELLOW_WOOL, Blocks.YELLOW_CARPET);
+        this.createWoolBlocks(Blocks.LIME_WOOL, Blocks.LIME_CARPET);
+        this.createWoolBlocks(Blocks.PINK_WOOL, Blocks.PINK_CARPET);
+        this.createWoolBlocks(Blocks.GRAY_WOOL, Blocks.GRAY_CARPET);
+        this.createWoolBlocks(Blocks.LIGHT_GRAY_WOOL, Blocks.LIGHT_GRAY_CARPET);
+        this.createWoolBlocks(Blocks.CYAN_WOOL, Blocks.CYAN_CARPET);
+        this.createWoolBlocks(Blocks.PURPLE_WOOL, Blocks.PURPLE_CARPET);
+        this.createWoolBlocks(Blocks.BLUE_WOOL, Blocks.BLUE_CARPET);
+        this.createWoolBlocks(Blocks.BROWN_WOOL, Blocks.BROWN_CARPET);
+        this.createWoolBlocks(Blocks.GREEN_WOOL, Blocks.GREEN_CARPET);
+        this.createWoolBlocks(Blocks.RED_WOOL, Blocks.RED_CARPET);
+        this.createWoolBlocks(Blocks.BLACK_WOOL, Blocks.BLACK_CARPET);
+        this.createPlant(Blocks.FERN, Blocks.POTTED_FERN, TintState.TINTED);
+        this.createPlant(Blocks.DANDELION, Blocks.POTTED_DANDELION, TintState.NOT_TINTED);
+        this.createPlant(Blocks.POPPY, Blocks.POTTED_POPPY, TintState.NOT_TINTED);
+        this.createPlant(Blocks.BLUE_ORCHID, Blocks.POTTED_BLUE_ORCHID, TintState.NOT_TINTED);
+        this.createPlant(Blocks.ALLIUM, Blocks.POTTED_ALLIUM, TintState.NOT_TINTED);
+        this.createPlant(Blocks.AZURE_BLUET, Blocks.POTTED_AZURE_BLUET, TintState.NOT_TINTED);
+        this.createPlant(Blocks.RED_TULIP, Blocks.POTTED_RED_TULIP, TintState.NOT_TINTED);
+        this.createPlant(Blocks.ORANGE_TULIP, Blocks.POTTED_ORANGE_TULIP, TintState.NOT_TINTED);
+        this.createPlant(Blocks.WHITE_TULIP, Blocks.POTTED_WHITE_TULIP, TintState.NOT_TINTED);
+        this.createPlant(Blocks.PINK_TULIP, Blocks.POTTED_PINK_TULIP, TintState.NOT_TINTED);
+        this.createPlant(Blocks.OXEYE_DAISY, Blocks.POTTED_OXEYE_DAISY, TintState.NOT_TINTED);
+        this.createPlant(Blocks.CORNFLOWER, Blocks.POTTED_CORNFLOWER, TintState.NOT_TINTED);
+        this.createPlant(Blocks.LILY_OF_THE_VALLEY, Blocks.POTTED_LILY_OF_THE_VALLEY, TintState.NOT_TINTED);
+        this.createPlant(Blocks.WITHER_ROSE, Blocks.POTTED_WITHER_ROSE, TintState.NOT_TINTED);
+        this.createPlant(Blocks.RED_MUSHROOM, Blocks.POTTED_RED_MUSHROOM, TintState.NOT_TINTED);
+        this.createPlant(Blocks.BROWN_MUSHROOM, Blocks.POTTED_BROWN_MUSHROOM, TintState.NOT_TINTED);
+        this.createPlant(Blocks.DEAD_BUSH, Blocks.POTTED_DEAD_BUSH, TintState.NOT_TINTED);
+        this.createMushroomBlock(Blocks.BROWN_MUSHROOM_BLOCK);
+        this.createMushroomBlock(Blocks.RED_MUSHROOM_BLOCK);
+        this.createMushroomBlock(Blocks.MUSHROOM_STEM);
+        this.createCrossBlockWithDefaultItem(Blocks.GRASS, TintState.TINTED);
+        this.createCrossBlock(Blocks.SUGAR_CANE, TintState.TINTED);
+        this.createSimpleFlatItemModel(Items.SUGAR_CANE);
+        this.createGrowingPlant(Blocks.KELP, Blocks.KELP_PLANT, TintState.TINTED);
+        this.createSimpleFlatItemModel(Items.KELP);
+        this.skipAutoItemBlock(Blocks.KELP_PLANT);
+        this.createGrowingPlant(Blocks.WEEPING_VINES, Blocks.WEEPING_VINES_PLANT, TintState.NOT_TINTED);
+        this.createGrowingPlant(Blocks.TWISTING_VINES, Blocks.TWISTING_VINES_PLANT, TintState.NOT_TINTED);
+        this.createSimpleFlatItemModel(Blocks.WEEPING_VINES, "_plant");
+        this.skipAutoItemBlock(Blocks.WEEPING_VINES_PLANT);
+        this.createSimpleFlatItemModel(Blocks.TWISTING_VINES, "_plant");
+        this.skipAutoItemBlock(Blocks.TWISTING_VINES_PLANT);
+        this.createCrossBlockWithDefaultItem(Blocks.BAMBOO_SAPLING, TintState.TINTED, TextureMapping.cross(TextureMapping.getBlockTexture(Blocks.BAMBOO, "_stage0")));
+        this.createBamboo();
+        this.createCrossBlockWithDefaultItem(Blocks.COBWEB, TintState.NOT_TINTED);
+        this.createDoublePlant(Blocks.LILAC, TintState.NOT_TINTED);
+        this.createDoublePlant(Blocks.ROSE_BUSH, TintState.NOT_TINTED);
+        this.createDoublePlant(Blocks.PEONY, TintState.NOT_TINTED);
+        this.createDoublePlant(Blocks.TALL_GRASS, TintState.TINTED);
+        this.createDoublePlant(Blocks.LARGE_FERN, TintState.TINTED);
+        this.createSunflower();
+        this.createTallSeagrass();
+        this.createCoral(Blocks.TUBE_CORAL, Blocks.DEAD_TUBE_CORAL, Blocks.TUBE_CORAL_BLOCK, Blocks.DEAD_TUBE_CORAL_BLOCK, Blocks.TUBE_CORAL_FAN, Blocks.DEAD_TUBE_CORAL_FAN, Blocks.TUBE_CORAL_WALL_FAN, Blocks.DEAD_TUBE_CORAL_WALL_FAN);
+        this.createCoral(Blocks.BRAIN_CORAL, Blocks.DEAD_BRAIN_CORAL, Blocks.BRAIN_CORAL_BLOCK, Blocks.DEAD_BRAIN_CORAL_BLOCK, Blocks.BRAIN_CORAL_FAN, Blocks.DEAD_BRAIN_CORAL_FAN, Blocks.BRAIN_CORAL_WALL_FAN, Blocks.DEAD_BRAIN_CORAL_WALL_FAN);
+        this.createCoral(Blocks.BUBBLE_CORAL, Blocks.DEAD_BUBBLE_CORAL, Blocks.BUBBLE_CORAL_BLOCK, Blocks.DEAD_BUBBLE_CORAL_BLOCK, Blocks.BUBBLE_CORAL_FAN, Blocks.DEAD_BUBBLE_CORAL_FAN, Blocks.BUBBLE_CORAL_WALL_FAN, Blocks.DEAD_BUBBLE_CORAL_WALL_FAN);
+        this.createCoral(Blocks.FIRE_CORAL, Blocks.DEAD_FIRE_CORAL, Blocks.FIRE_CORAL_BLOCK, Blocks.DEAD_FIRE_CORAL_BLOCK, Blocks.FIRE_CORAL_FAN, Blocks.DEAD_FIRE_CORAL_FAN, Blocks.FIRE_CORAL_WALL_FAN, Blocks.DEAD_FIRE_CORAL_WALL_FAN);
+        this.createCoral(Blocks.HORN_CORAL, Blocks.DEAD_HORN_CORAL, Blocks.HORN_CORAL_BLOCK, Blocks.DEAD_HORN_CORAL_BLOCK, Blocks.HORN_CORAL_FAN, Blocks.DEAD_HORN_CORAL_FAN, Blocks.HORN_CORAL_WALL_FAN, Blocks.DEAD_HORN_CORAL_WALL_FAN);
+        this.createStems(Blocks.MELON_STEM, Blocks.ATTACHED_MELON_STEM);
+        this.createStems(Blocks.PUMPKIN_STEM, Blocks.ATTACHED_PUMPKIN_STEM);
+        this.family(Blocks.ACACIA_PLANKS).button(Blocks.ACACIA_BUTTON).fence(Blocks.ACACIA_FENCE).fenceGate(Blocks.ACACIA_FENCE_GATE).pressurePlate(Blocks.ACACIA_PRESSURE_PLATE).sign(Blocks.ACACIA_SIGN, Blocks.ACACIA_WALL_SIGN).slab(Blocks.ACACIA_SLAB).stairs(Blocks.ACACIA_STAIRS);
+        this.createDoor(Blocks.ACACIA_DOOR);
+        this.createOrientableTrapdoor(Blocks.ACACIA_TRAPDOOR);
+        this.woodProvider(Blocks.ACACIA_LOG).logWithHorizontal(Blocks.ACACIA_LOG).wood(Blocks.ACACIA_WOOD);
+        this.woodProvider(Blocks.STRIPPED_ACACIA_LOG).logWithHorizontal(Blocks.STRIPPED_ACACIA_LOG).wood(Blocks.STRIPPED_ACACIA_WOOD);
+        this.createPlant(Blocks.ACACIA_SAPLING, Blocks.POTTED_ACACIA_SAPLING, TintState.NOT_TINTED);
+        this.createTrivialBlock(Blocks.ACACIA_LEAVES, TexturedModel.LEAVES);
+        this.family(Blocks.BIRCH_PLANKS).button(Blocks.BIRCH_BUTTON).fence(Blocks.BIRCH_FENCE).fenceGate(Blocks.BIRCH_FENCE_GATE).pressurePlate(Blocks.BIRCH_PRESSURE_PLATE).sign(Blocks.BIRCH_SIGN, Blocks.BIRCH_WALL_SIGN).slab(Blocks.BIRCH_SLAB).stairs(Blocks.BIRCH_STAIRS);
+        this.createDoor(Blocks.BIRCH_DOOR);
+        this.createOrientableTrapdoor(Blocks.BIRCH_TRAPDOOR);
+        this.woodProvider(Blocks.BIRCH_LOG).logWithHorizontal(Blocks.BIRCH_LOG).wood(Blocks.BIRCH_WOOD);
+        this.woodProvider(Blocks.STRIPPED_BIRCH_LOG).logWithHorizontal(Blocks.STRIPPED_BIRCH_LOG).wood(Blocks.STRIPPED_BIRCH_WOOD);
+        this.createPlant(Blocks.BIRCH_SAPLING, Blocks.POTTED_BIRCH_SAPLING, TintState.NOT_TINTED);
+        this.createTrivialBlock(Blocks.BIRCH_LEAVES, TexturedModel.LEAVES);
+        this.family(Blocks.OAK_PLANKS).button(Blocks.OAK_BUTTON).fence(Blocks.OAK_FENCE).fenceGate(Blocks.OAK_FENCE_GATE).pressurePlate(Blocks.OAK_PRESSURE_PLATE).sign(Blocks.OAK_SIGN, Blocks.OAK_WALL_SIGN).slab(Blocks.OAK_SLAB).slab(Blocks.PETRIFIED_OAK_SLAB).stairs(Blocks.OAK_STAIRS);
+        this.createDoor(Blocks.OAK_DOOR);
+        this.createTrapdoor(Blocks.OAK_TRAPDOOR);
+        this.woodProvider(Blocks.OAK_LOG).logWithHorizontal(Blocks.OAK_LOG).wood(Blocks.OAK_WOOD);
+        this.woodProvider(Blocks.STRIPPED_OAK_LOG).logWithHorizontal(Blocks.STRIPPED_OAK_LOG).wood(Blocks.STRIPPED_OAK_WOOD);
+        this.createPlant(Blocks.OAK_SAPLING, Blocks.POTTED_OAK_SAPLING, TintState.NOT_TINTED);
+        this.createTrivialBlock(Blocks.OAK_LEAVES, TexturedModel.LEAVES);
+        this.family(Blocks.SPRUCE_PLANKS).button(Blocks.SPRUCE_BUTTON).fence(Blocks.SPRUCE_FENCE).fenceGate(Blocks.SPRUCE_FENCE_GATE).pressurePlate(Blocks.SPRUCE_PRESSURE_PLATE).sign(Blocks.SPRUCE_SIGN, Blocks.SPRUCE_WALL_SIGN).slab(Blocks.SPRUCE_SLAB).stairs(Blocks.SPRUCE_STAIRS);
+        this.createDoor(Blocks.SPRUCE_DOOR);
+        this.createOrientableTrapdoor(Blocks.SPRUCE_TRAPDOOR);
+        this.woodProvider(Blocks.SPRUCE_LOG).logWithHorizontal(Blocks.SPRUCE_LOG).wood(Blocks.SPRUCE_WOOD);
+        this.woodProvider(Blocks.STRIPPED_SPRUCE_LOG).logWithHorizontal(Blocks.STRIPPED_SPRUCE_LOG).wood(Blocks.STRIPPED_SPRUCE_WOOD);
+        this.createPlant(Blocks.SPRUCE_SAPLING, Blocks.POTTED_SPRUCE_SAPLING, TintState.NOT_TINTED);
+        this.createTrivialBlock(Blocks.SPRUCE_LEAVES, TexturedModel.LEAVES);
+        this.family(Blocks.DARK_OAK_PLANKS).button(Blocks.DARK_OAK_BUTTON).fence(Blocks.DARK_OAK_FENCE).fenceGate(Blocks.DARK_OAK_FENCE_GATE).pressurePlate(Blocks.DARK_OAK_PRESSURE_PLATE).sign(Blocks.DARK_OAK_SIGN, Blocks.DARK_OAK_WALL_SIGN).slab(Blocks.DARK_OAK_SLAB).stairs(Blocks.DARK_OAK_STAIRS);
+        this.createDoor(Blocks.DARK_OAK_DOOR);
+        this.createTrapdoor(Blocks.DARK_OAK_TRAPDOOR);
+        this.woodProvider(Blocks.DARK_OAK_LOG).logWithHorizontal(Blocks.DARK_OAK_LOG).wood(Blocks.DARK_OAK_WOOD);
+        this.woodProvider(Blocks.STRIPPED_DARK_OAK_LOG).logWithHorizontal(Blocks.STRIPPED_DARK_OAK_LOG).wood(Blocks.STRIPPED_DARK_OAK_WOOD);
+        this.createPlant(Blocks.DARK_OAK_SAPLING, Blocks.POTTED_DARK_OAK_SAPLING, TintState.NOT_TINTED);
+        this.createTrivialBlock(Blocks.DARK_OAK_LEAVES, TexturedModel.LEAVES);
+        this.family(Blocks.JUNGLE_PLANKS).button(Blocks.JUNGLE_BUTTON).fence(Blocks.JUNGLE_FENCE).fenceGate(Blocks.JUNGLE_FENCE_GATE).pressurePlate(Blocks.JUNGLE_PRESSURE_PLATE).sign(Blocks.JUNGLE_SIGN, Blocks.JUNGLE_WALL_SIGN).slab(Blocks.JUNGLE_SLAB).stairs(Blocks.JUNGLE_STAIRS);
+        this.createDoor(Blocks.JUNGLE_DOOR);
+        this.createOrientableTrapdoor(Blocks.JUNGLE_TRAPDOOR);
+        this.woodProvider(Blocks.JUNGLE_LOG).logWithHorizontal(Blocks.JUNGLE_LOG).wood(Blocks.JUNGLE_WOOD);
+        this.woodProvider(Blocks.STRIPPED_JUNGLE_LOG).logWithHorizontal(Blocks.STRIPPED_JUNGLE_LOG).wood(Blocks.STRIPPED_JUNGLE_WOOD);
+        this.createPlant(Blocks.JUNGLE_SAPLING, Blocks.POTTED_JUNGLE_SAPLING, TintState.NOT_TINTED);
+        this.createTrivialBlock(Blocks.JUNGLE_LEAVES, TexturedModel.LEAVES);
+        this.family(Blocks.CRIMSON_PLANKS).button(Blocks.CRIMSON_BUTTON).fence(Blocks.CRIMSON_FENCE).fenceGate(Blocks.CRIMSON_FENCE_GATE).pressurePlate(Blocks.CRIMSON_PRESSURE_PLATE).sign(Blocks.CRIMSON_SIGN, Blocks.CRIMSON_WALL_SIGN).slab(Blocks.CRIMSON_SLAB).stairs(Blocks.CRIMSON_STAIRS);
+        this.createDoor(Blocks.CRIMSON_DOOR);
+        this.createOrientableTrapdoor(Blocks.CRIMSON_TRAPDOOR);
+        this.woodProvider(Blocks.CRIMSON_STEM).log(Blocks.CRIMSON_STEM).wood(Blocks.CRIMSON_HYPHAE);
+        this.woodProvider(Blocks.STRIPPED_CRIMSON_STEM).log(Blocks.STRIPPED_CRIMSON_STEM).wood(Blocks.STRIPPED_CRIMSON_HYPHAE);
+        this.createPlant(Blocks.CRIMSON_FUNGUS, Blocks.POTTED_CRIMSON_FUNGUS, TintState.NOT_TINTED);
+        this.createNetherRoots(Blocks.CRIMSON_ROOTS, Blocks.POTTED_CRIMSON_ROOTS);
+        this.family(Blocks.WARPED_PLANKS).button(Blocks.WARPED_BUTTON).fence(Blocks.WARPED_FENCE).fenceGate(Blocks.WARPED_FENCE_GATE).pressurePlate(Blocks.WARPED_PRESSURE_PLATE).sign(Blocks.WARPED_SIGN, Blocks.WARPED_WALL_SIGN).slab(Blocks.WARPED_SLAB).stairs(Blocks.WARPED_STAIRS);
+        this.createDoor(Blocks.WARPED_DOOR);
+        this.createOrientableTrapdoor(Blocks.WARPED_TRAPDOOR);
+        this.woodProvider(Blocks.WARPED_STEM).log(Blocks.WARPED_STEM).wood(Blocks.WARPED_HYPHAE);
+        this.woodProvider(Blocks.STRIPPED_WARPED_STEM).log(Blocks.STRIPPED_WARPED_STEM).wood(Blocks.STRIPPED_WARPED_HYPHAE);
+        this.createPlant(Blocks.WARPED_FUNGUS, Blocks.POTTED_WARPED_FUNGUS, TintState.NOT_TINTED);
+        this.createNetherRoots(Blocks.WARPED_ROOTS, Blocks.POTTED_WARPED_ROOTS);
+        this.createCrossBlock(Blocks.NETHER_SPROUTS, TintState.NOT_TINTED);
+        this.createSimpleFlatItemModel(Items.NETHER_SPROUTS);
+        final ResourceLocation uh3;
+        final ResourceLocation uh4;
+        this.family(TextureMapping.cube(Blocks.STONE)).fullBlock(iy -> {
+            uh3 = ModelTemplates.CUBE_ALL.create(Blocks.STONE, iy, this.modelOutput);
+            uh4 = ModelTemplates.CUBE_MIRRORED_ALL.create(Blocks.STONE, iy, this.modelOutput);
+            this.blockStateOutput.accept(createRotatedVariant(Blocks.STONE, uh3, uh4));
+            return uh3;
+        }).slab(Blocks.STONE_SLAB).pressurePlate(Blocks.STONE_PRESSURE_PLATE).button(Blocks.STONE_BUTTON).stairs(Blocks.STONE_STAIRS);
+        this.createDoor(Blocks.IRON_DOOR);
+        this.createTrapdoor(Blocks.IRON_TRAPDOOR);
+        this.family(Blocks.STONE_BRICKS).wall(Blocks.STONE_BRICK_WALL).stairs(Blocks.STONE_BRICK_STAIRS).slab(Blocks.STONE_BRICK_SLAB);
+        this.family(Blocks.MOSSY_STONE_BRICKS).wall(Blocks.MOSSY_STONE_BRICK_WALL).stairs(Blocks.MOSSY_STONE_BRICK_STAIRS).slab(Blocks.MOSSY_STONE_BRICK_SLAB);
+        this.family(Blocks.COBBLESTONE).wall(Blocks.COBBLESTONE_WALL).stairs(Blocks.COBBLESTONE_STAIRS).slab(Blocks.COBBLESTONE_SLAB);
+        this.family(Blocks.MOSSY_COBBLESTONE).wall(Blocks.MOSSY_COBBLESTONE_WALL).stairs(Blocks.MOSSY_COBBLESTONE_STAIRS).slab(Blocks.MOSSY_COBBLESTONE_SLAB);
+        this.family(Blocks.PRISMARINE).wall(Blocks.PRISMARINE_WALL).stairs(Blocks.PRISMARINE_STAIRS).slab(Blocks.PRISMARINE_SLAB);
+        this.family(Blocks.PRISMARINE_BRICKS).stairs(Blocks.PRISMARINE_BRICK_STAIRS).slab(Blocks.PRISMARINE_BRICK_SLAB);
+        this.family(Blocks.DARK_PRISMARINE).stairs(Blocks.DARK_PRISMARINE_STAIRS).slab(Blocks.DARK_PRISMARINE_SLAB);
+        this.family(Blocks.SANDSTONE, TexturedModel.TOP_BOTTOM_WITH_WALL).wall(Blocks.SANDSTONE_WALL).stairs(Blocks.SANDSTONE_STAIRS).slab(Blocks.SANDSTONE_SLAB);
+        this.family(Blocks.SMOOTH_SANDSTONE, TexturedModel.createAllSame(TextureMapping.getBlockTexture(Blocks.SANDSTONE, "_top"))).slab(Blocks.SMOOTH_SANDSTONE_SLAB).stairs(Blocks.SMOOTH_SANDSTONE_STAIRS);
+        this.family(Blocks.CUT_SANDSTONE, TexturedModel.COLUMN.get(Blocks.SANDSTONE).updateTextures(iy -> iy.put(TextureSlot.SIDE, TextureMapping.getBlockTexture(Blocks.CUT_SANDSTONE)))).slab(Blocks.CUT_SANDSTONE_SLAB);
+        this.family(Blocks.RED_SANDSTONE, TexturedModel.TOP_BOTTOM_WITH_WALL).wall(Blocks.RED_SANDSTONE_WALL).stairs(Blocks.RED_SANDSTONE_STAIRS).slab(Blocks.RED_SANDSTONE_SLAB);
+        this.family(Blocks.SMOOTH_RED_SANDSTONE, TexturedModel.createAllSame(TextureMapping.getBlockTexture(Blocks.RED_SANDSTONE, "_top"))).slab(Blocks.SMOOTH_RED_SANDSTONE_SLAB).stairs(Blocks.SMOOTH_RED_SANDSTONE_STAIRS);
+        this.family(Blocks.CUT_RED_SANDSTONE, TexturedModel.COLUMN.get(Blocks.RED_SANDSTONE).updateTextures(iy -> iy.put(TextureSlot.SIDE, TextureMapping.getBlockTexture(Blocks.CUT_RED_SANDSTONE)))).slab(Blocks.CUT_RED_SANDSTONE_SLAB);
+        this.family(Blocks.BRICKS).wall(Blocks.BRICK_WALL).stairs(Blocks.BRICK_STAIRS).slab(Blocks.BRICK_SLAB);
+        this.family(Blocks.NETHER_BRICKS).fence(Blocks.NETHER_BRICK_FENCE).wall(Blocks.NETHER_BRICK_WALL).stairs(Blocks.NETHER_BRICK_STAIRS).slab(Blocks.NETHER_BRICK_SLAB);
+        this.family(Blocks.PURPUR_BLOCK).stairs(Blocks.PURPUR_STAIRS).slab(Blocks.PURPUR_SLAB);
+        this.family(Blocks.DIORITE).wall(Blocks.DIORITE_WALL).stairs(Blocks.DIORITE_STAIRS).slab(Blocks.DIORITE_SLAB);
+        this.family(Blocks.POLISHED_DIORITE).stairs(Blocks.POLISHED_DIORITE_STAIRS).slab(Blocks.POLISHED_DIORITE_SLAB);
+        this.family(Blocks.GRANITE).wall(Blocks.GRANITE_WALL).stairs(Blocks.GRANITE_STAIRS).slab(Blocks.GRANITE_SLAB);
+        this.family(Blocks.POLISHED_GRANITE).stairs(Blocks.POLISHED_GRANITE_STAIRS).slab(Blocks.POLISHED_GRANITE_SLAB);
+        this.family(Blocks.ANDESITE).wall(Blocks.ANDESITE_WALL).stairs(Blocks.ANDESITE_STAIRS).slab(Blocks.ANDESITE_SLAB);
+        this.family(Blocks.POLISHED_ANDESITE).stairs(Blocks.POLISHED_ANDESITE_STAIRS).slab(Blocks.POLISHED_ANDESITE_SLAB);
+        this.family(Blocks.END_STONE_BRICKS).wall(Blocks.END_STONE_BRICK_WALL).stairs(Blocks.END_STONE_BRICK_STAIRS).slab(Blocks.END_STONE_BRICK_SLAB);
+        this.family(Blocks.QUARTZ_BLOCK, TexturedModel.COLUMN).stairs(Blocks.QUARTZ_STAIRS).slab(Blocks.QUARTZ_SLAB);
+        this.family(Blocks.SMOOTH_QUARTZ, TexturedModel.createAllSame(TextureMapping.getBlockTexture(Blocks.QUARTZ_BLOCK, "_bottom"))).stairs(Blocks.SMOOTH_QUARTZ_STAIRS).slab(Blocks.SMOOTH_QUARTZ_SLAB);
+        this.family(Blocks.RED_NETHER_BRICKS).slab(Blocks.RED_NETHER_BRICK_SLAB).stairs(Blocks.RED_NETHER_BRICK_STAIRS).wall(Blocks.RED_NETHER_BRICK_WALL);
+        this.family(Blocks.BLACKSTONE, TexturedModel.COLUMN_WITH_WALL).wall(Blocks.BLACKSTONE_WALL).stairs(Blocks.BLACKSTONE_STAIRS).slab(Blocks.BLACKSTONE_SLAB);
+        this.family(Blocks.POLISHED_BLACKSTONE_BRICKS).wall(Blocks.POLISHED_BLACKSTONE_BRICK_WALL).stairs(Blocks.POLISHED_BLACKSTONE_BRICK_STAIRS).slab(Blocks.POLISHED_BLACKSTONE_BRICK_SLAB);
+        this.family(Blocks.POLISHED_BLACKSTONE).wall(Blocks.POLISHED_BLACKSTONE_WALL).pressurePlate(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE).button(Blocks.POLISHED_BLACKSTONE_BUTTON).stairs(Blocks.POLISHED_BLACKSTONE_STAIRS).slab(Blocks.POLISHED_BLACKSTONE_SLAB);
+        this.createSmoothStoneSlab();
+        this.createPassiveRail(Blocks.RAIL);
+        this.createActiveRail(Blocks.POWERED_RAIL);
+        this.createActiveRail(Blocks.DETECTOR_RAIL);
+        this.createActiveRail(Blocks.ACTIVATOR_RAIL);
+        this.createComparator();
+        this.createCommandBlock(Blocks.COMMAND_BLOCK);
+        this.createCommandBlock(Blocks.REPEATING_COMMAND_BLOCK);
+        this.createCommandBlock(Blocks.CHAIN_COMMAND_BLOCK);
+        this.createAnvil(Blocks.ANVIL);
+        this.createAnvil(Blocks.CHIPPED_ANVIL);
+        this.createAnvil(Blocks.DAMAGED_ANVIL);
+        this.createBarrel();
+        this.createBell();
+        this.createFurnace(Blocks.FURNACE, TexturedModel.ORIENTABLE_ONLY_TOP);
+        this.createFurnace(Blocks.BLAST_FURNACE, TexturedModel.ORIENTABLE_ONLY_TOP);
+        this.createFurnace(Blocks.SMOKER, TexturedModel.ORIENTABLE);
+        this.createRedstoneWire();
+        this.createRespawnAnchor();
+        this.copyModel(Blocks.CHISELED_STONE_BRICKS, Blocks.INFESTED_CHISELED_STONE_BRICKS);
+        this.copyModel(Blocks.COBBLESTONE, Blocks.INFESTED_COBBLESTONE);
+        this.copyModel(Blocks.CRACKED_STONE_BRICKS, Blocks.INFESTED_CRACKED_STONE_BRICKS);
+        this.copyModel(Blocks.MOSSY_STONE_BRICKS, Blocks.INFESTED_MOSSY_STONE_BRICKS);
+        this.createInfestedStone();
+        this.copyModel(Blocks.STONE_BRICKS, Blocks.INFESTED_STONE_BRICKS);
+        SpawnEggItem.eggs().forEach(blh -> this.delegateItemModel(blh, ModelLocationUtils.decorateItemModelLocation("template_spawn_egg")));
+    }
+    
+    class BlockFamilyProvider {
+        private final TextureMapping mapping;
+        @Nullable
+        private ResourceLocation fullBlock;
+        
+        public BlockFamilyProvider(final TextureMapping iy) {
+            this.mapping = iy;
+        }
+        
+        public BlockFamilyProvider fullBlock(final Block bvr, final ModelTemplate iw) {
+            this.fullBlock = iw.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createSimpleBlock(bvr, this.fullBlock));
+            return this;
+        }
+        
+        public BlockFamilyProvider fullBlock(final Function<TextureMapping, ResourceLocation> function) {
+            this.fullBlock = function.apply(this.mapping);
+            return this;
+        }
+        
+        public BlockFamilyProvider button(final Block bvr) {
+            final ResourceLocation uh3 = ModelTemplates.BUTTON.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh4 = ModelTemplates.BUTTON_PRESSED.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createButton(bvr, uh3, uh4));
+            final ResourceLocation uh5 = ModelTemplates.BUTTON_INVENTORY.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.delegateItemModel(bvr, uh5);
+            return this;
+        }
+        
+        public BlockFamilyProvider wall(final Block bvr) {
+            final ResourceLocation uh3 = ModelTemplates.WALL_POST.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh4 = ModelTemplates.WALL_LOW_SIDE.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh5 = ModelTemplates.WALL_TALL_SIDE.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createWall(bvr, uh3, uh4, uh5));
+            final ResourceLocation uh6 = ModelTemplates.WALL_INVENTORY.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.delegateItemModel(bvr, uh6);
+            return this;
+        }
+        
+        public BlockFamilyProvider fence(final Block bvr) {
+            final ResourceLocation uh3 = ModelTemplates.FENCE_POST.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh4 = ModelTemplates.FENCE_SIDE.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createFence(bvr, uh3, uh4));
+            final ResourceLocation uh5 = ModelTemplates.FENCE_INVENTORY.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.delegateItemModel(bvr, uh5);
+            return this;
+        }
+        
+        public BlockFamilyProvider fenceGate(final Block bvr) {
+            final ResourceLocation uh3 = ModelTemplates.FENCE_GATE_OPEN.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh4 = ModelTemplates.FENCE_GATE_CLOSED.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh5 = ModelTemplates.FENCE_GATE_WALL_OPEN.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh6 = ModelTemplates.FENCE_GATE_WALL_CLOSED.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createFenceGate(bvr, uh3, uh4, uh5, uh6));
+            return this;
+        }
+        
+        public BlockFamilyProvider pressurePlate(final Block bvr) {
+            final ResourceLocation uh3 = ModelTemplates.PRESSURE_PLATE_UP.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh4 = ModelTemplates.PRESSURE_PLATE_DOWN.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createPressurePlate(bvr, uh3, uh4));
+            return this;
+        }
+        
+        public BlockFamilyProvider sign(final Block bvr1, final Block bvr2) {
+            final ResourceLocation uh4 = ModelTemplates.PARTICLE_ONLY.create(bvr1, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createSimpleBlock(bvr1, uh4));
+            BlockModelGenerators.this.blockStateOutput.accept(createSimpleBlock(bvr2, uh4));
+            BlockModelGenerators.this.createSimpleFlatItemModel(bvr1.asItem());
+            BlockModelGenerators.this.skipAutoItemBlock(bvr2);
+            return this;
+        }
+        
+        public BlockFamilyProvider slab(final Block bvr) {
+            if (this.fullBlock == null) {
+                throw new IllegalStateException("Full block not generated yet");
+            }
+            final ResourceLocation uh3 = ModelTemplates.SLAB_BOTTOM.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh4 = ModelTemplates.SLAB_TOP.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createSlab(bvr, uh3, uh4, this.fullBlock));
+            return this;
+        }
+        
+        public BlockFamilyProvider stairs(final Block bvr) {
+            final ResourceLocation uh3 = ModelTemplates.STAIRS_INNER.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh4 = ModelTemplates.STAIRS_STRAIGHT.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh5 = ModelTemplates.STAIRS_OUTER.create(bvr, this.mapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createStairs(bvr, uh3, uh4, uh5));
+            return this;
+        }
+    }
+    
+    class WoodProvider {
+        private final TextureMapping logMapping;
+        
+        public WoodProvider(final TextureMapping iy) {
+            this.logMapping = iy;
+        }
+        
+        public WoodProvider wood(final Block bvr) {
+            final TextureMapping iy3 = this.logMapping.copyAndUpdate(TextureSlot.END, this.logMapping.get(TextureSlot.SIDE));
+            final ResourceLocation uh4 = ModelTemplates.CUBE_COLUMN.create(bvr, iy3, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createAxisAlignedPillarBlock(bvr, uh4));
+            return this;
+        }
+        
+        public WoodProvider log(final Block bvr) {
+            final ResourceLocation uh3 = ModelTemplates.CUBE_COLUMN.create(bvr, this.logMapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createAxisAlignedPillarBlock(bvr, uh3));
+            return this;
+        }
+        
+        public WoodProvider logWithHorizontal(final Block bvr) {
+            final ResourceLocation uh3 = ModelTemplates.CUBE_COLUMN.create(bvr, this.logMapping, BlockModelGenerators.this.modelOutput);
+            final ResourceLocation uh4 = ModelTemplates.CUBE_COLUMN_HORIZONTAL.create(bvr, this.logMapping, BlockModelGenerators.this.modelOutput);
+            BlockModelGenerators.this.blockStateOutput.accept(createRotatedPillarWithHorizontalVariant(bvr, uh3, uh4));
+            return this;
+        }
+    }
+    
+    enum TintState {
+        TINTED, 
+        NOT_TINTED;
+        
+        public ModelTemplate getCross() {
+            return (this == TintState.TINTED) ? ModelTemplates.TINTED_CROSS : ModelTemplates.CROSS;
+        }
+        
+        public ModelTemplate getCrossPot() {
+            return (this == TintState.TINTED) ? ModelTemplates.TINTED_FLOWER_POT_CROSS : ModelTemplates.FLOWER_POT_CROSS;
+        }
+    }
+    
+    class BlockEntityModelGenerator {
+        private final ResourceLocation baseModel;
+        
+        public BlockEntityModelGenerator(final ResourceLocation uh, final Block bvr) {
+            this.baseModel = ModelTemplates.PARTICLE_ONLY.create(uh, TextureMapping.particle(bvr), BlockModelGenerators.this.modelOutput);
+        }
+        
+        public BlockEntityModelGenerator create(final Block... arr) {
+            for (final Block bvr6 : arr) {
+                BlockModelGenerators.this.blockStateOutput.accept(createSimpleBlock(bvr6, this.baseModel));
+            }
+            return this;
+        }
+        
+        public BlockEntityModelGenerator createWithoutBlockItem(final Block... arr) {
+            for (final Block bvr6 : arr) {
+                BlockModelGenerators.this.skipAutoItemBlock(bvr6);
+            }
+            return this.create(arr);
+        }
+        
+        public BlockEntityModelGenerator createWithCustomBlockItemModel(final ModelTemplate iw, final Block... arr) {
+            for (final Block bvr7 : arr) {
+                iw.create(ModelLocationUtils.getModelLocation(bvr7.asItem()), TextureMapping.particle(bvr7), BlockModelGenerators.this.modelOutput);
+            }
+            return this.create(arr);
+        }
+    }
+}
diff --git a/src/net/minecraft/data/models/ItemModelGenerators.java b/src/net/minecraft/data/models/ItemModelGenerators.java
new file mode 100644
index 0000000..a00948c
--- /dev/null
+++ b/src/net/minecraft/data/models/ItemModelGenerators.java
@@ -0,0 +1,264 @@
+package net.minecraft.data.models;
+
+import net.minecraft.data.models.model.ModelTemplates;
+import net.minecraft.world.item.Items;
+import net.minecraft.data.models.model.TextureMapping;
+import net.minecraft.data.models.model.ModelLocationUtils;
+import net.minecraft.data.models.model.ModelTemplate;
+import net.minecraft.world.item.Item;
+import com.google.gson.JsonElement;
+import java.util.function.Supplier;
+import net.minecraft.resources.ResourceLocation;
+import java.util.function.BiConsumer;
+
+public class ItemModelGenerators {
+    private final BiConsumer<ResourceLocation, Supplier<JsonElement>> output;
+    
+    public ItemModelGenerators(final BiConsumer<ResourceLocation, Supplier<JsonElement>> biConsumer) {
+        this.output = biConsumer;
+    }
+    
+    private void generateFlatItem(final Item bke, final ModelTemplate iw) {
+        iw.create(ModelLocationUtils.getModelLocation(bke), TextureMapping.layer0(bke), this.output);
+    }
+    
+    private void generateFlatItem(final Item bke, final String string, final ModelTemplate iw) {
+        iw.create(ModelLocationUtils.getModelLocation(bke, string), TextureMapping.layer0(TextureMapping.getItemTexture(bke, string)), this.output);
+    }
+    
+    private void generateFlatItem(final Item bke1, final Item bke2, final ModelTemplate iw) {
+        iw.create(ModelLocationUtils.getModelLocation(bke1), TextureMapping.layer0(bke2), this.output);
+    }
+    
+    public void run() {
+        this.generateFlatItem(Items.ACACIA_BOAT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.APPLE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.ARMOR_STAND, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.ARROW, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BAKED_POTATO, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BAMBOO, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.BEEF, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BEETROOT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BEETROOT_SOUP, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BIRCH_BOAT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BLACK_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BLAZE_POWDER, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BLAZE_ROD, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.BLUE_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BONE_MEAL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BOOK, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BOWL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BREAD, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BRICK, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BROWN_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.BUCKET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CARROT_ON_A_STICK, ModelTemplates.FLAT_HANDHELD_ROD_ITEM);
+        this.generateFlatItem(Items.WARPED_FUNGUS_ON_A_STICK, ModelTemplates.FLAT_HANDHELD_ROD_ITEM);
+        this.generateFlatItem(Items.CHAINMAIL_BOOTS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CHAINMAIL_CHESTPLATE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CHAINMAIL_HELMET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CHAINMAIL_LEGGINGS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CHARCOAL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CHEST_MINECART, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CHICKEN, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CHORUS_FRUIT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CLAY_BALL, ModelTemplates.FLAT_ITEM);
+        for (int integer2 = 1; integer2 < 64; ++integer2) {
+            this.generateFlatItem(Items.CLOCK, String.format("_%02d", integer2), ModelTemplates.FLAT_ITEM);
+        }
+        this.generateFlatItem(Items.COAL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.COD_BUCKET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.COMMAND_BLOCK_MINECART, ModelTemplates.FLAT_ITEM);
+        for (int integer2 = 0; integer2 < 32; ++integer2) {
+            if (integer2 != 16) {
+                this.generateFlatItem(Items.COMPASS, String.format("_%02d", integer2), ModelTemplates.FLAT_ITEM);
+            }
+        }
+        this.generateFlatItem(Items.COOKED_BEEF, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.COOKED_CHICKEN, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.COOKED_COD, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.COOKED_MUTTON, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.COOKED_PORKCHOP, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.COOKED_RABBIT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.COOKED_SALMON, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.COOKIE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CREEPER_BANNER_PATTERN, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.CYAN_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.DARK_OAK_BOAT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.DIAMOND, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.DIAMOND_AXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.DIAMOND_BOOTS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.DIAMOND_CHESTPLATE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.DIAMOND_HELMET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.DIAMOND_HOE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.DIAMOND_HORSE_ARMOR, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.DIAMOND_LEGGINGS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.DIAMOND_PICKAXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.DIAMOND_SHOVEL, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.DIAMOND_SWORD, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.DRAGON_BREATH, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.DRIED_KELP, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.EGG, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.EMERALD, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.ENCHANTED_BOOK, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.ENDER_EYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.ENDER_PEARL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.END_CRYSTAL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.EXPERIENCE_BOTTLE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.FERMENTED_SPIDER_EYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.FIREWORK_ROCKET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.FIRE_CHARGE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.FLINT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.FLINT_AND_STEEL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.FLOWER_BANNER_PATTERN, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.FURNACE_MINECART, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GHAST_TEAR, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GLASS_BOTTLE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GLISTERING_MELON_SLICE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GLOBE_BANNER_PATTER, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GLOWSTONE_DUST, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GOLDEN_APPLE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GOLDEN_AXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.GOLDEN_BOOTS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GOLDEN_CARROT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GOLDEN_CHESTPLATE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GOLDEN_HELMET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GOLDEN_HOE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.GOLDEN_HORSE_ARMOR, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GOLDEN_LEGGINGS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GOLDEN_PICKAXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.GOLDEN_SHOVEL, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.GOLDEN_SWORD, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.GOLD_INGOT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GOLD_NUGGET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GRAY_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GREEN_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.GUNPOWDER, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.HEART_OF_THE_SEA, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.HONEYCOMB, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.HONEY_BOTTLE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.HOPPER_MINECART, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.INK_SAC, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.IRON_AXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.IRON_BOOTS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.IRON_CHESTPLATE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.IRON_HELMET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.IRON_HOE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.IRON_HORSE_ARMOR, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.IRON_INGOT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.IRON_LEGGINGS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.IRON_NUGGET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.IRON_PICKAXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.IRON_SHOVEL, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.IRON_SWORD, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.ITEM_FRAME, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.JUNGLE_BOAT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.KNOWLEDGE_BOOK, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.LAPIS_LAZULI, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.LAVA_BUCKET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.LEATHER, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.LEATHER_HORSE_ARMOR, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.LIGHT_BLUE_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.LIGHT_GRAY_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.LIME_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MAGENTA_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MAGMA_CREAM, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MAP, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MELON_SLICE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MILK_BUCKET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MINECART, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MOJANG_BANNER_PATTERN, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSHROOM_STEW, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_11, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_13, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_BLOCKS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_CAT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_CHIRP, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_FAR, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_MALL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_MELLOHI, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_PIGSTEP, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_STAL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_STRAD, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_WAIT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUSIC_DISC_WARD, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.MUTTON, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.NAME_TAG, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.NAUTILUS_SHELL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.NETHERITE_AXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.NETHERITE_BOOTS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.NETHERITE_CHESTPLATE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.NETHERITE_HELMET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.NETHERITE_HOE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.NETHERITE_INGOT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.NETHERITE_LEGGINGS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.NETHERITE_PICKAXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.NETHERITE_SCRAP, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.NETHERITE_SHOVEL, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.NETHERITE_SWORD, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.NETHER_BRICK, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.NETHER_STAR, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.OAK_BOAT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.ORANGE_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PAINTING, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PAPER, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PHANTOM_MEMBRANE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PIGLIN_BANNER_PATTERN, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PINK_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.POISONOUS_POTATO, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.POPPED_CHORUS_FRUIT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PORKCHOP, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PRISMARINE_CRYSTALS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PRISMARINE_SHARD, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PUFFERFISH, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PUFFERFISH_BUCKET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PUMPKIN_PIE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.PURPLE_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.QUARTZ, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.RABBIT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.RABBIT_FOOT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.RABBIT_HIDE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.RABBIT_STEW, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.RED_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.ROTTEN_FLESH, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SADDLE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SALMON, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SALMON_BUCKET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SCUTE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SHEARS, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SHULKER_SHELL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SKULL_BANNER_PATTERN, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SLIME_BALL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SNOWBALL, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SPECTRAL_ARROW, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SPIDER_EYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SPRUCE_BOAT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.STICK, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.STONE_AXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.STONE_HOE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.STONE_PICKAXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.STONE_SHOVEL, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.STONE_SWORD, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.SUGAR, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.SUSPICIOUS_STEW, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.TNT_MINECART, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.TOTEM_OF_UNDYING, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.TRIDENT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.TROPICAL_FISH, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.TROPICAL_FISH_BUCKET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.TURTLE_HELMET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.WATER_BUCKET, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.WHEAT, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.WHITE_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.WOODEN_AXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.WOODEN_HOE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.WOODEN_PICKAXE, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.WOODEN_SHOVEL, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.WOODEN_SWORD, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.WRITABLE_BOOK, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.WRITTEN_BOOK, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.YELLOW_DYE, ModelTemplates.FLAT_ITEM);
+        this.generateFlatItem(Items.DEBUG_STICK, Items.STICK, ModelTemplates.FLAT_HANDHELD_ITEM);
+        this.generateFlatItem(Items.ENCHANTED_GOLDEN_APPLE, Items.GOLDEN_APPLE, ModelTemplates.FLAT_ITEM);
+    }
+}
diff --git a/src/net/minecraft/data/models/ModelProvider.java b/src/net/minecraft/data/models/ModelProvider.java
new file mode 100644
index 0000000..d0453f3
--- /dev/null
+++ b/src/net/minecraft/data/models/ModelProvider.java
@@ -0,0 +1,185 @@
+package net.minecraft.data.models;
+
+import com.google.gson.GsonBuilder;
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.data.models.blockstates.BlockStateGenerator;
+import net.minecraft.data.models.model.DelegatedModel;
+import net.minecraft.data.models.model.ModelLocationUtils;
+import net.minecraft.world.item.Item;
+import java.util.Set;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.block.Block;
+import java.util.function.BiFunction;
+import com.google.gson.JsonElement;
+import java.util.function.Supplier;
+import java.util.Map;
+import java.nio.file.Path;
+import net.minecraft.data.HashCache;
+import net.minecraft.data.DataGenerator;
+import com.google.gson.Gson;
+import org.apache.logging.log4j.Logger;
+import net.minecraft.data.DataProvider;
+
+public class ModelProvider implements DataProvider {
+    private static final Logger LOGGER;
+    private static final Gson GSON;
+    private final DataGenerator generator;
+    
+    public ModelProvider(final DataGenerator hk) {
+        this.generator = hk;
+    }
+    
+    @Override
+    public void run(final HashCache hm) {
+        // 
+        // This method could not be decompiled.
+        // 
+        // Original Bytecode:
+        // 
+        //     1: getfield        net/minecraft/data/models/ModelProvider.generator:Lnet/minecraft/data/DataGenerator;
+        //     4: invokevirtual   net/minecraft/data/DataGenerator.getOutputFolder:()Ljava/nio/file/Path;
+        //     7: astore_2        /* path3 */
+        //     8: invokestatic    com/google/common/collect/Maps.newHashMap:()Ljava/util/HashMap;
+        //    11: astore_3        /* map4 */
+        //    12: aload_3         /* map4 */
+        //    13: invokedynamic   BootstrapMethod #0, accept:(Ljava/util/Map;)Ljava/util/function/Consumer;
+        //    18: astore          consumer5
+        //    20: invokestatic    com/google/common/collect/Maps.newHashMap:()Ljava/util/HashMap;
+        //    23: astore          map6
+        //    25: invokestatic    com/google/common/collect/Sets.newHashSet:()Ljava/util/HashSet;
+        //    28: astore          set7
+        //    30: aload           map6
+        //    32: invokedynamic   BootstrapMethod #1, accept:(Ljava/util/Map;)Ljava/util/function/BiConsumer;
+        //    37: astore          biConsumer8
+        //    39: aload           set7
+        //    41: invokedynamic   BootstrapMethod #2, accept:(Ljava/util/Set;)Ljava/util/function/Consumer;
+        //    46: astore          consumer9
+        //    48: new             Lnet/minecraft/data/models/BlockModelGenerators;
+        //    51: dup            
+        //    52: aload           consumer5
+        //    54: aload           biConsumer8
+        //    56: aload           consumer9
+        //    58: invokespecial   net/minecraft/data/models/BlockModelGenerators.<init>:(Ljava/util/function/Consumer;Ljava/util/function/BiConsumer;Ljava/util/function/Consumer;)V
+        //    61: invokevirtual   net/minecraft/data/models/BlockModelGenerators.run:()V
+        //    64: new             Lnet/minecraft/data/models/ItemModelGenerators;
+        //    67: dup            
+        //    68: aload           biConsumer8
+        //    70: invokespecial   net/minecraft/data/models/ItemModelGenerators.<init>:(Ljava/util/function/BiConsumer;)V
+        //    73: invokevirtual   net/minecraft/data/models/ItemModelGenerators.run:()V
+        //    76: getstatic       net/minecraft/core/Registry.BLOCK:Lnet/minecraft/core/DefaultedRegistry;
+        //    79: invokevirtual   net/minecraft/core/DefaultedRegistry.stream:()Ljava/util/stream/Stream;
+        //    82: aload_3         /* map4 */
+        //    83: invokedynamic   BootstrapMethod #3, test:(Ljava/util/Map;)Ljava/util/function/Predicate;
+        //    88: invokeinterface java/util/stream/Stream.filter:(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;
+        //    93: invokestatic    java/util/stream/Collectors.toList:()Ljava/util/stream/Collector;
+        //    96: invokeinterface java/util/stream/Stream.collect:(Ljava/util/stream/Collector;)Ljava/lang/Object;
+        //   101: checkcast       Ljava/util/List;
+        //   104: astore          list10
+        //   106: aload           list10
+        //   108: invokeinterface java/util/List.isEmpty:()Z
+        //   113: ifne            144
+        //   116: new             Ljava/lang/IllegalStateException;
+        //   119: dup            
+        //   120: new             Ljava/lang/StringBuilder;
+        //   123: dup            
+        //   124: invokespecial   java/lang/StringBuilder.<init>:()V
+        //   127: ldc             "Missing blockstate definitions for: "
+        //   129: invokevirtual   java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
+        //   132: aload           list10
+        //   134: invokevirtual   java/lang/StringBuilder.append:(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+        //   137: invokevirtual   java/lang/StringBuilder.toString:()Ljava/lang/String;
+        //   140: invokespecial   java/lang/IllegalStateException.<init>:(Ljava/lang/String;)V
+        //   143: athrow         
+        //   144: getstatic       net/minecraft/core/Registry.BLOCK:Lnet/minecraft/core/DefaultedRegistry;
+        //   147: aload           set7
+        //   149: aload           map6
+        //   151: invokedynamic   BootstrapMethod #4, accept:(Ljava/util/Set;Ljava/util/Map;)Ljava/util/function/Consumer;
+        //   156: invokevirtual   net/minecraft/core/DefaultedRegistry.forEach:(Ljava/util/function/Consumer;)V
+        //   159: aload_0         /* this */
+        //   160: aload_1         /* hm */
+        //   161: aload_2         /* path3 */
+        //   162: aload_3         /* map4 */
+        //   163: invokedynamic   BootstrapMethod #5, apply:()Ljava/util/function/BiFunction;
+        //   168: invokespecial   net/minecraft/data/models/ModelProvider.saveCollection:(Lnet/minecraft/data/HashCache;Ljava/nio/file/Path;Ljava/util/Map;Ljava/util/function/BiFunction;)V
+        //   171: aload_0         /* this */
+        //   172: aload_1         /* hm */
+        //   173: aload_2         /* path3 */
+        //   174: aload           map6
+        //   176: invokedynamic   BootstrapMethod #6, apply:()Ljava/util/function/BiFunction;
+        //   181: invokespecial   net/minecraft/data/models/ModelProvider.saveCollection:(Lnet/minecraft/data/HashCache;Ljava/nio/file/Path;Ljava/util/Map;Ljava/util/function/BiFunction;)V
+        //   184: return         
+        //    MethodParameters:
+        //  Name  Flags  
+        //  ----  -----
+        //  hm    
+        //    StackMapTable: 00 01 FF 00 90 00 07 07 00 02 07 00 AF 07 00 B1 07 00 B3 00 07 00 B3 07 00 B5 00 00
+        // 
+        // The error that occurred was:
+        // 
+        // java.lang.IllegalStateException: Could not infer any expression.
+        //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:374)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.run(TypeAnalysis.java:96)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:344)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:42)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:214)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
+        //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
+        //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
+        //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
+        //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
+        //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
+        //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
+        //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
+        //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
+        //     at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
+        //     at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
+        //     at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:177)
+        // 
+        throw new IllegalStateException("An error occurred while decompiling this method.");
+    }
+    
+    private <T> void saveCollection(final HashCache hm, final Path path, final Map<T, ? extends Supplier<JsonElement>> map, final BiFunction<Path, T, Path> biFunction) {
+        final Path path2;
+        map.forEach((object, supplier) -> {
+            path2 = biFunction.apply(path, object);
+            try {
+                DataProvider.save(ModelProvider.GSON, hm, supplier.get(), path2);
+            }
+            catch (Exception exception7) {
+                ModelProvider.LOGGER.error("Couldn't save {}", path2, exception7);
+            }
+        });
+    }
+    
+    private static Path createBlockStatePath(final Path path, final Block bvr) {
+        final ResourceLocation uh3 = Registry.BLOCK.getKey(bvr);
+        return path.resolve("assets/" + uh3.getNamespace() + "/blockstates/" + uh3.getPath() + ".json");
+    }
+    
+    private static Path createModelPath(final Path path, final ResourceLocation uh) {
+        return path.resolve("assets/" + uh.getNamespace() + "/models/" + uh.getPath() + ".json");
+    }
+    
+    @Override
+    public String getName() {
+        return "Block State Definitions";
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+        GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
+    }
+}
diff --git a/src/net/minecraft/data/models/blockstates/BlockStateGenerator.java b/src/net/minecraft/data/models/blockstates/BlockStateGenerator.java
new file mode 100644
index 0000000..5132227
--- /dev/null
+++ b/src/net/minecraft/data/models/blockstates/BlockStateGenerator.java
@@ -0,0 +1,9 @@
+package net.minecraft.data.models.blockstates;
+
+import net.minecraft.world.level.block.Block;
+import com.google.gson.JsonElement;
+import java.util.function.Supplier;
+
+public interface BlockStateGenerator extends Supplier<JsonElement> {
+    Block getBlock();
+}
diff --git a/src/net/minecraft/data/models/blockstates/Condition.java b/src/net/minecraft/data/models/blockstates/Condition.java
new file mode 100644
index 0000000..af09472
--- /dev/null
+++ b/src/net/minecraft/data/models/blockstates/Condition.java
@@ -0,0 +1,113 @@
+package net.minecraft.data.models.blockstates;
+
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import com.google.common.collect.Maps;
+import net.minecraft.world.level.block.state.properties.Property;
+import java.util.Map;
+import com.google.gson.JsonObject;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import com.google.gson.JsonArray;
+import java.util.List;
+import java.util.Arrays;
+import net.minecraft.world.level.block.state.StateDefinition;
+import com.google.gson.JsonElement;
+import java.util.function.Supplier;
+
+public interface Condition extends Supplier<JsonElement> {
+    void validate(final StateDefinition<?, ?> cfk);
+    
+    default TerminalCondition condition() {
+        return new TerminalCondition();
+    }
+    
+    default Condition or(final Condition... arr) {
+        return new CompositeCondition(Operation.OR, (List)Arrays.<Condition>asList(arr));
+    }
+    
+    public enum Operation {
+        AND("AND"), 
+        OR("OR");
+        
+        private final String id;
+        
+        private Operation(final String string3) {
+            this.id = string3;
+        }
+    }
+    
+    public static class CompositeCondition implements Condition {
+        private final Operation operation;
+        private final List<Condition> subconditions;
+        
+        private CompositeCondition(final Operation b, final List<Condition> list) {
+            this.operation = b;
+            this.subconditions = list;
+        }
+        
+        @Override
+        public void validate(final StateDefinition<?, ?> cfk) {
+            this.subconditions.forEach(il -> il.validate(cfk));
+        }
+        
+        @Override
+        public JsonElement get() {
+            final JsonArray jsonArray2 = new JsonArray();
+            this.subconditions.stream().map(Supplier::get).forEach(jsonArray2::add);
+            final JsonObject jsonObject3 = new JsonObject();
+            jsonObject3.add(this.operation.id, jsonArray2);
+            return jsonObject3;
+        }
+    }
+    
+    public static class TerminalCondition implements Condition {
+        private final Map<Property<?>, String> terms;
+        
+        public TerminalCondition() {
+            this.terms = Maps.newHashMap();
+        }
+        
+        private static <T extends Comparable<T>> String joinValues(final Property<T> cgl, final Stream<T> stream) {
+            return stream.map(cgl::getName).collect(Collectors.joining("|"));
+        }
+        
+        private static <T extends Comparable<T>> String getTerm(final Property<T> cgl, final T comparable, final T[] arr) {
+            return TerminalCondition.<T>joinValues(cgl, Stream.<T>concat(Stream.of((T)comparable), Stream.of((T[])arr)));
+        }
+        
+        private <T extends Comparable<T>> void putValue(final Property<T> cgl, final String string) {
+            final String string2 = this.terms.put(cgl, string);
+            if (string2 != null) {
+                throw new IllegalStateException("Tried to replace " + cgl + " value from " + string2 + " to " + string);
+            }
+        }
+        
+        public final <T extends Comparable<T>> TerminalCondition term(final Property<T> cgl, final T comparable) {
+            this.<T>putValue(cgl, cgl.getName(comparable));
+            return this;
+        }
+        
+        @SafeVarargs
+        public final <T extends Comparable<T>> TerminalCondition term(final Property<T> cgl, final T comparable, final T... arr) {
+            this.<T>putValue(cgl, TerminalCondition.<T>getTerm(cgl, comparable, arr));
+            return this;
+        }
+        
+        @Override
+        public JsonElement get() {
+            final JsonObject jsonObject2 = new JsonObject();
+            this.terms.forEach((cgl, string) -> jsonObject2.addProperty(cgl.getName(), string));
+            return jsonObject2;
+        }
+        
+        @Override
+        public void validate(final StateDefinition<?, ?> cfk) {
+            final List<Property<?>> list3 = this.terms.keySet().stream().filter(cgl -> cfk.getProperty(cgl.getName()) != cgl).collect(Collectors.toList());
+            if (!list3.isEmpty()) {
+                throw new IllegalStateException("Properties " + list3 + " are missing from " + cfk);
+            }
+        }
+    }
+}
diff --git a/src/net/minecraft/data/models/blockstates/MultiPartGenerator.java b/src/net/minecraft/data/models/blockstates/MultiPartGenerator.java
new file mode 100644
index 0000000..554219c
--- /dev/null
+++ b/src/net/minecraft/data/models/blockstates/MultiPartGenerator.java
@@ -0,0 +1,107 @@
+package net.minecraft.data.models.blockstates;
+
+import java.util.function.Supplier;
+import net.minecraft.world.level.block.state.BlockState;
+import com.google.gson.JsonObject;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import com.google.gson.JsonArray;
+import net.minecraft.world.level.block.state.StateDefinition;
+import com.google.gson.JsonElement;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.world.level.block.Block;
+
+public class MultiPartGenerator implements BlockStateGenerator {
+    private final Block block;
+    private final List<Entry> parts;
+    
+    private MultiPartGenerator(final Block bvr) {
+        this.parts = Lists.newArrayList();
+        this.block = bvr;
+    }
+    
+    @Override
+    public Block getBlock() {
+        return this.block;
+    }
+    
+    public static MultiPartGenerator multiPart(final Block bvr) {
+        return new MultiPartGenerator(bvr);
+    }
+    
+    public MultiPartGenerator with(final List<Variant> list) {
+        this.parts.add(new Entry((List)list));
+        return this;
+    }
+    
+    public MultiPartGenerator with(final Variant iq) {
+        return this.with(ImmutableList.<Variant>of(iq));
+    }
+    
+    public MultiPartGenerator with(final Condition il, final List<Variant> list) {
+        this.parts.add(new ConditionalEntry(il, (List)list));
+        return this;
+    }
+    
+    public MultiPartGenerator with(final Condition il, final Variant... arr) {
+        return this.with(il, ImmutableList.<Variant>copyOf(arr));
+    }
+    
+    public MultiPartGenerator with(final Condition il, final Variant iq) {
+        return this.with(il, ImmutableList.<Variant>of(iq));
+    }
+    
+    @Override
+    public JsonElement get() {
+        final StateDefinition<Block, BlockState> cfk2 = this.block.getStateDefinition();
+        this.parts.forEach(b -> b.validate(cfk2));
+        final JsonArray jsonArray3 = new JsonArray();
+        this.parts.stream().map(Entry::get).forEach(jsonArray3::add);
+        final JsonObject jsonObject4 = new JsonObject();
+        jsonObject4.add("multipart", jsonArray3);
+        return jsonObject4;
+    }
+    
+    static class Entry implements Supplier<JsonElement> {
+        private final List<Variant> variants;
+        
+        private Entry(final List<Variant> list) {
+            this.variants = list;
+        }
+        
+        public void validate(final StateDefinition<?, ?> cfk) {
+        }
+        
+        public void decorate(final JsonObject jsonObject) {
+        }
+        
+        @Override
+        public JsonElement get() {
+            final JsonObject jsonObject2 = new JsonObject();
+            this.decorate(jsonObject2);
+            jsonObject2.add("apply", Variant.convertList(this.variants));
+            return jsonObject2;
+        }
+    }
+    
+    static class ConditionalEntry extends Entry {
+        private final Condition condition;
+        
+        private ConditionalEntry(final Condition il, final List<Variant> list) {
+            super((List)list);
+            this.condition = il;
+        }
+        
+        @Override
+        public void validate(final StateDefinition<?, ?> cfk) {
+            this.condition.validate(cfk);
+        }
+        
+        @Override
+        public void decorate(final JsonObject jsonObject) {
+            jsonObject.add("when", this.condition.get());
+        }
+    }
+}
diff --git a/src/net/minecraft/data/models/blockstates/MultiVariantGenerator.java b/src/net/minecraft/data/models/blockstates/MultiVariantGenerator.java
new file mode 100644
index 0000000..dd5ed3e
--- /dev/null
+++ b/src/net/minecraft/data/models/blockstates/MultiVariantGenerator.java
@@ -0,0 +1,134 @@
+package net.minecraft.data.models.blockstates;
+
+import com.google.common.collect.ImmutableList;
+import java.util.Map;
+import java.util.Iterator;
+import net.minecraft.Util;
+import java.util.function.BiConsumer;
+import com.google.gson.JsonObject;
+import java.util.TreeMap;
+import java.util.stream.Stream;
+import com.mojang.datafixers.util.Pair;
+import com.google.gson.JsonElement;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import net.minecraft.world.level.block.state.properties.Property;
+import java.util.Set;
+import java.util.List;
+import net.minecraft.world.level.block.Block;
+
+public class MultiVariantGenerator implements BlockStateGenerator {
+    private final Block block;
+    private final List<Variant> baseVariants;
+    private final Set<Property<?>> seenProperties;
+    private final List<PropertyDispatch> declaredPropertySets;
+    
+    private MultiVariantGenerator(final Block bvr, final List<Variant> list) {
+        this.seenProperties = Sets.newHashSet();
+        this.declaredPropertySets = Lists.newArrayList();
+        this.block = bvr;
+        this.baseVariants = list;
+    }
+    
+    public MultiVariantGenerator with(final PropertyDispatch io) {
+        // 
+        // This method could not be decompiled.
+        // 
+        // Original Bytecode:
+        // 
+        //     1: invokevirtual   net/minecraft/data/models/blockstates/PropertyDispatch.getDefinedProperties:()Ljava/util/List;
+        //     4: aload_0         /* this */
+        //     5: invokedynamic   BootstrapMethod #0, accept:(Lnet/minecraft/data/models/blockstates/MultiVariantGenerator;)Ljava/util/function/Consumer;
+        //    10: invokeinterface java/util/List.forEach:(Ljava/util/function/Consumer;)V
+        //    15: aload_0         /* this */
+        //    16: getfield        net/minecraft/data/models/blockstates/MultiVariantGenerator.declaredPropertySets:Ljava/util/List;
+        //    19: aload_1         /* io */
+        //    20: invokeinterface java/util/List.add:(Ljava/lang/Object;)Z
+        //    25: pop            
+        //    26: aload_0         /* this */
+        //    27: areturn        
+        //    MethodParameters:
+        //  Name  Flags  
+        //  ----  -----
+        //  io    
+        // 
+        // The error that occurred was:
+        // 
+        // java.lang.IllegalStateException: Could not infer any expression.
+        //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:374)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.run(TypeAnalysis.java:96)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:344)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:42)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:214)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
+        //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
+        //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
+        //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
+        //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
+        //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
+        //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
+        //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
+        //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
+        //     at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
+        //     at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
+        //     at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:177)
+        // 
+        throw new IllegalStateException("An error occurred while decompiling this method.");
+    }
+    
+    @Override
+    public JsonElement get() {
+        Stream<Pair<Selector, List<Variant>>> stream2 = Stream.<Pair<Selector, List<Variant>>>of(Pair.of(Selector.empty(), this.baseVariants));
+        for (final PropertyDispatch io4 : this.declaredPropertySets) {
+            final Map<Selector, List<Variant>> map5 = io4.getEntries();
+            final Selector ip3;
+            final List<Variant> list4;
+            stream2 = stream2.<Pair<Selector, List<Variant>>>flatMap(pair -> map5.entrySet().stream().map(entry -> {
+                ip3 = ((Selector)pair.getFirst()).extend(entry.getKey());
+                list4 = mergeVariants((List<Variant>)pair.getSecond(), (List<Variant>)entry.getValue());
+                return Pair.of(ip3, list4);
+            }));
+        }
+        final Map<String, JsonElement> map6 = new TreeMap<String, JsonElement>();
+        final JsonElement jsonElement;
+        stream2.forEach(pair -> jsonElement = map6.put(((Selector)pair.getFirst()).getKey(), Variant.convertList((List<Variant>)pair.getSecond())));
+        final JsonObject jsonObject2 = new JsonObject();
+        jsonObject2.add("variants", Util.<JsonObject>make(new JsonObject(), jsonObject -> map6.forEach(jsonObject::add)));
+        return jsonObject2;
+    }
+    
+    private static List<Variant> mergeVariants(final List<Variant> list1, final List<Variant> list2) {
+        final ImmutableList.Builder<Variant> builder3 = ImmutableList.<Variant>builder();
+        list1.forEach(iq -> list2.forEach(iq3 -> builder3.add(Variant.merge(iq, iq3))));
+        return builder3.build();
+    }
+    
+    @Override
+    public Block getBlock() {
+        return this.block;
+    }
+    
+    public static MultiVariantGenerator multiVariant(final Block bvr) {
+        return new MultiVariantGenerator(bvr, ImmutableList.<Variant>of(Variant.variant()));
+    }
+    
+    public static MultiVariantGenerator multiVariant(final Block bvr, final Variant iq) {
+        return new MultiVariantGenerator(bvr, ImmutableList.<Variant>of(iq));
+    }
+    
+    public static MultiVariantGenerator multiVariant(final Block bvr, final Variant... arr) {
+        return new MultiVariantGenerator(bvr, ImmutableList.<Variant>copyOf(arr));
+    }
+}
diff --git a/src/net/minecraft/data/models/blockstates/PropertyDispatch.java b/src/net/minecraft/data/models/blockstates/PropertyDispatch.java
new file mode 100644
index 0000000..25918a9
--- /dev/null
+++ b/src/net/minecraft/data/models/blockstates/PropertyDispatch.java
@@ -0,0 +1,224 @@
+package net.minecraft.data.models.blockstates;
+
+import java.util.function.BiFunction;
+import java.util.Collections;
+import com.google.common.collect.ImmutableList;
+import java.util.Iterator;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.function.Function;
+import net.minecraft.world.level.block.state.properties.Property;
+import java.util.stream.Stream;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
+
+public abstract class PropertyDispatch {
+    private final Map<Selector, List<Variant>> values;
+    
+    public PropertyDispatch() {
+        this.values = Maps.newHashMap();
+    }
+    
+    protected void putValue(final Selector ip, final List<Variant> list) {
+        final List<Variant> list2 = this.values.put(ip, list);
+        if (list2 != null) {
+            throw new IllegalStateException("Value " + ip + " is already defined");
+        }
+    }
+    
+    Map<Selector, List<Variant>> getEntries() {
+        this.verifyComplete();
+        return ImmutableMap.copyOf(this.values);
+    }
+    
+    private void verifyComplete() {
+        final List<Property<?>> list2 = this.getDefinedProperties();
+        Stream<Selector> stream3 = Stream.<Selector>of(Selector.empty());
+        for (final Property<?> cgl5 : list2) {
+            stream3 = stream3.<Selector>flatMap(ip -> cgl5.getAllValues().map(ip::extend));
+        }
+        final List<Selector> list3 = stream3.filter(ip -> !this.values.containsKey(ip)).collect(Collectors.toList());
+        if (!list3.isEmpty()) {
+            throw new IllegalStateException("Missing definition for properties: " + list3);
+        }
+    }
+    
+    abstract List<Property<?>> getDefinedProperties();
+    
+    public static <T1 extends Comparable<T1>> C1<T1> property(final Property<T1> cgl) {
+        return new C1<T1>((Property)cgl);
+    }
+    
+    public static <T1 extends Comparable<T1>, T2 extends Comparable<T2>> C2<T1, T2> properties(final Property<T1> cgl1, final Property<T2> cgl2) {
+        return new C2<T1, T2>((Property)cgl1, (Property)cgl2);
+    }
+    
+    public static <T1 extends Comparable<T1>, T2 extends Comparable<T2>, T3 extends Comparable<T3>> C3<T1, T2, T3> properties(final Property<T1> cgl1, final Property<T2> cgl2, final Property<T3> cgl3) {
+        return new C3<T1, T2, T3>((Property)cgl1, (Property)cgl2, (Property)cgl3);
+    }
+    
+    public static <T1 extends Comparable<T1>, T2 extends Comparable<T2>, T3 extends Comparable<T3>, T4 extends Comparable<T4>> C4<T1, T2, T3, T4> properties(final Property<T1> cgl1, final Property<T2> cgl2, final Property<T3> cgl3, final Property<T4> cgl4) {
+        return new C4<T1, T2, T3, T4>((Property)cgl1, (Property)cgl2, (Property)cgl3, (Property)cgl4);
+    }
+    
+    public static <T1 extends Comparable<T1>, T2 extends Comparable<T2>, T3 extends Comparable<T3>, T4 extends Comparable<T4>, T5 extends Comparable<T5>> C5<T1, T2, T3, T4, T5> properties(final Property<T1> cgl1, final Property<T2> cgl2, final Property<T3> cgl3, final Property<T4> cgl4, final Property<T5> cgl5) {
+        return new C5<T1, T2, T3, T4, T5>((Property)cgl1, (Property)cgl2, (Property)cgl3, (Property)cgl4, (Property)cgl5);
+    }
+    
+    public static class C1<T1 extends Comparable<T1>> extends PropertyDispatch {
+        private final Property<T1> property1;
+        
+        private C1(final Property<T1> cgl) {
+            this.property1 = cgl;
+        }
+        
+        public List<Property<?>> getDefinedProperties() {
+            return ImmutableList.of(this.property1);
+        }
+        
+        public C1<T1> select(final T1 comparable, final List<Variant> list) {
+            final Selector ip4 = Selector.of(this.property1.value(comparable));
+            this.putValue(ip4, list);
+            return this;
+        }
+        
+        public C1<T1> select(final T1 comparable, final Variant iq) {
+            return this.select(comparable, Collections.<Variant>singletonList(iq));
+        }
+        
+        public PropertyDispatch generate(final Function<T1, Variant> function) {
+            this.property1.getPossibleValues().forEach(comparable -> this.select((T1)comparable, function.apply((T1)comparable)));
+            return this;
+        }
+    }
+    
+    public static class C2<T1 extends Comparable<T1>, T2 extends Comparable<T2>> extends PropertyDispatch {
+        private final Property<T1> property1;
+        private final Property<T2> property2;
+        
+        private C2(final Property<T1> cgl1, final Property<T2> cgl2) {
+            this.property1 = cgl1;
+            this.property2 = cgl2;
+        }
+        
+        public List<Property<?>> getDefinedProperties() {
+            return ImmutableList.of(this.property1, (Property<T1>)this.property2);
+        }
+        
+        public C2<T1, T2> select(final T1 comparable1, final T2 comparable2, final List<Variant> list) {
+            final Selector ip5 = Selector.of(this.property1.value(comparable1), this.property2.value(comparable2));
+            this.putValue(ip5, list);
+            return this;
+        }
+        
+        public C2<T1, T2> select(final T1 comparable1, final T2 comparable2, final Variant iq) {
+            return this.select(comparable1, comparable2, Collections.<Variant>singletonList(iq));
+        }
+        
+        public PropertyDispatch generate(final BiFunction<T1, T2, Variant> biFunction) {
+            this.property1.getPossibleValues().forEach(comparable -> this.property2.getPossibleValues().forEach(comparable3 -> this.select((T1)comparable, (T2)comparable3, biFunction.apply((T1)comparable, (T2)comparable3))));
+            return this;
+        }
+        
+        public PropertyDispatch generateList(final BiFunction<T1, T2, List<Variant>> biFunction) {
+            this.property1.getPossibleValues().forEach(comparable -> this.property2.getPossibleValues().forEach(comparable3 -> this.select((T1)comparable, (T2)comparable3, biFunction.apply((T1)comparable, (T2)comparable3))));
+            return this;
+        }
+    }
+    
+    public static class C3<T1 extends Comparable<T1>, T2 extends Comparable<T2>, T3 extends Comparable<T3>> extends PropertyDispatch {
+        private final Property<T1> property1;
+        private final Property<T2> property2;
+        private final Property<T3> property3;
+        
+        private C3(final Property<T1> cgl1, final Property<T2> cgl2, final Property<T3> cgl3) {
+            this.property1 = cgl1;
+            this.property2 = cgl2;
+            this.property3 = cgl3;
+        }
+        
+        public List<Property<?>> getDefinedProperties() {
+            return ImmutableList.of(this.property1, (Property<T1>)this.property2, (Property<T1>)this.property3);
+        }
+        
+        public C3<T1, T2, T3> select(final T1 comparable1, final T2 comparable2, final T3 comparable3, final List<Variant> list) {
+            final Selector ip6 = Selector.of(this.property1.value(comparable1), this.property2.value(comparable2), this.property3.value(comparable3));
+            this.putValue(ip6, list);
+            return this;
+        }
+        
+        public C3<T1, T2, T3> select(final T1 comparable1, final T2 comparable2, final T3 comparable3, final Variant iq) {
+            return this.select(comparable1, comparable2, comparable3, Collections.<Variant>singletonList(iq));
+        }
+        
+        public PropertyDispatch generate(final TriFunction<T1, T2, T3, Variant> h) {
+            this.property1.getPossibleValues().forEach(comparable -> this.property2.getPossibleValues().forEach(comparable3 -> this.property3.getPossibleValues().forEach(comparable4 -> this.select((T1)comparable, (T2)comparable3, (T3)comparable4, h.apply((T1)comparable, (T2)comparable3, (T3)comparable4)))));
+            return this;
+        }
+    }
+    
+    public static class C4<T1 extends Comparable<T1>, T2 extends Comparable<T2>, T3 extends Comparable<T3>, T4 extends Comparable<T4>> extends PropertyDispatch {
+        private final Property<T1> property1;
+        private final Property<T2> property2;
+        private final Property<T3> property3;
+        private final Property<T4> property4;
+        
+        private C4(final Property<T1> cgl1, final Property<T2> cgl2, final Property<T3> cgl3, final Property<T4> cgl4) {
+            this.property1 = cgl1;
+            this.property2 = cgl2;
+            this.property3 = cgl3;
+            this.property4 = cgl4;
+        }
+        
+        public List<Property<?>> getDefinedProperties() {
+            return ImmutableList.of(this.property1, (Property<T1>)this.property2, (Property<T1>)this.property3, (Property<T1>)this.property4);
+        }
+        
+        public C4<T1, T2, T3, T4> select(final T1 comparable1, final T2 comparable2, final T3 comparable3, final T4 comparable4, final List<Variant> list) {
+            final Selector ip7 = Selector.of(this.property1.value(comparable1), this.property2.value(comparable2), this.property3.value(comparable3), this.property4.value(comparable4));
+            this.putValue(ip7, list);
+            return this;
+        }
+        
+        public C4<T1, T2, T3, T4> select(final T1 comparable1, final T2 comparable2, final T3 comparable3, final T4 comparable4, final Variant iq) {
+            return this.select(comparable1, comparable2, comparable3, comparable4, Collections.<Variant>singletonList(iq));
+        }
+    }
+    
+    public static class C5<T1 extends Comparable<T1>, T2 extends Comparable<T2>, T3 extends Comparable<T3>, T4 extends Comparable<T4>, T5 extends Comparable<T5>> extends PropertyDispatch {
+        private final Property<T1> property1;
+        private final Property<T2> property2;
+        private final Property<T3> property3;
+        private final Property<T4> property4;
+        private final Property<T5> property5;
+        
+        private C5(final Property<T1> cgl1, final Property<T2> cgl2, final Property<T3> cgl3, final Property<T4> cgl4, final Property<T5> cgl5) {
+            this.property1 = cgl1;
+            this.property2 = cgl2;
+            this.property3 = cgl3;
+            this.property4 = cgl4;
+            this.property5 = cgl5;
+        }
+        
+        public List<Property<?>> getDefinedProperties() {
+            return ImmutableList.of(this.property1, (Property<T1>)this.property2, (Property<T1>)this.property3, (Property<T1>)this.property4, (Property<T1>)this.property5);
+        }
+        
+        public C5<T1, T2, T3, T4, T5> select(final T1 comparable1, final T2 comparable2, final T3 comparable3, final T4 comparable4, final T5 comparable5, final List<Variant> list) {
+            final Selector ip8 = Selector.of(this.property1.value(comparable1), this.property2.value(comparable2), this.property3.value(comparable3), this.property4.value(comparable4), this.property5.value(comparable5));
+            this.putValue(ip8, list);
+            return this;
+        }
+        
+        public C5<T1, T2, T3, T4, T5> select(final T1 comparable1, final T2 comparable2, final T3 comparable3, final T4 comparable4, final T5 comparable5, final Variant iq) {
+            return this.select(comparable1, comparable2, comparable3, comparable4, comparable5, Collections.<Variant>singletonList(iq));
+        }
+    }
+    
+    @FunctionalInterface
+    public interface TriFunction<P1, P2, P3, R> {
+        R apply(final P1 object1, final P2 object2, final P3 object3);
+    }
+}
diff --git a/src/net/minecraft/data/models/blockstates/Selector.java b/src/net/minecraft/data/models/blockstates/Selector.java
new file mode 100644
index 0000000..5ff6781
--- /dev/null
+++ b/src/net/minecraft/data/models/blockstates/Selector.java
@@ -0,0 +1,59 @@
+package net.minecraft.data.models.blockstates;
+
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.function.Function;
+import com.google.common.collect.ImmutableList;
+import java.util.List;
+import net.minecraft.world.level.block.state.properties.Property;
+import java.util.Comparator;
+
+public final class Selector {
+    private static final Selector EMPTY;
+    private static final Comparator<Property.Value<?>> COMPARE_BY_NAME;
+    private final List<Property.Value<?>> values;
+    
+    public Selector extend(final Property.Value<?> a) {
+        return new Selector(ImmutableList.<Property.Value<?>>builder().addAll(this.values).add(a).build());
+    }
+    
+    public Selector extend(final Selector ip) {
+        return new Selector((List<Property.Value<?>>)ImmutableList.builder().addAll(this.values).addAll(ip.values).build());
+    }
+    
+    private Selector(final List<Property.Value<?>> list) {
+        this.values = list;
+    }
+    
+    public static Selector empty() {
+        return Selector.EMPTY;
+    }
+    
+    public static Selector of(final Property.Value<?>... arr) {
+        return new Selector(ImmutableList.<Property.Value<?>>copyOf(arr));
+    }
+    
+    @Override
+    public boolean equals(final Object object) {
+        return this == object || (object instanceof Selector && this.values.equals(((Selector)object).values));
+    }
+    
+    @Override
+    public int hashCode() {
+        return this.values.hashCode();
+    }
+    
+    public String getKey() {
+        return this.values.stream().sorted(Selector.COMPARE_BY_NAME).map(Property.Value::toString).collect(Collectors.joining(","));
+    }
+    
+    @Override
+    public String toString() {
+        return this.getKey();
+    }
+    
+    static {
+        EMPTY = new Selector(ImmutableList.of());
+        COMPARE_BY_NAME = Comparator.<Property.Value<?>, Comparable>comparing(a -> a.getProperty().getName());
+    }
+}
diff --git a/src/net/minecraft/data/models/blockstates/Variant.java b/src/net/minecraft/data/models/blockstates/Variant.java
new file mode 100644
index 0000000..f88299a
--- /dev/null
+++ b/src/net/minecraft/data/models/blockstates/Variant.java
@@ -0,0 +1,52 @@
+package net.minecraft.data.models.blockstates;
+
+import com.google.gson.JsonArray;
+import java.util.List;
+import com.google.gson.JsonObject;
+import com.google.common.collect.Maps;
+import java.util.Map;
+import com.google.gson.JsonElement;
+import java.util.function.Supplier;
+
+public class Variant implements Supplier<JsonElement> {
+    private final Map<VariantProperty<?>, VariantProperty.Value> values;
+    
+    public Variant() {
+        this.values = Maps.newLinkedHashMap();
+    }
+    
+    public <T> Variant with(final VariantProperty<T> is, final T object) {
+        final VariantProperty.Value a4 = this.values.put(is, is.withValue(object));
+        if (a4 != null) {
+            throw new IllegalStateException("Replacing value of " + a4 + " with " + object);
+        }
+        return this;
+    }
+    
+    public static Variant variant() {
+        return new Variant();
+    }
+    
+    public static Variant merge(final Variant iq1, final Variant iq2) {
+        final Variant iq3 = new Variant();
+        iq3.values.putAll(iq1.values);
+        iq3.values.putAll(iq2.values);
+        return iq3;
+    }
+    
+    @Override
+    public JsonElement get() {
+        final JsonObject jsonObject2 = new JsonObject();
+        this.values.values().forEach(a -> a.addToVariant(jsonObject2));
+        return jsonObject2;
+    }
+    
+    public static JsonElement convertList(final List<Variant> list) {
+        if (list.size() == 1) {
+            return list.get(0).get();
+        }
+        final JsonArray jsonArray2 = new JsonArray();
+        list.forEach(iq -> jsonArray2.add(iq.get()));
+        return jsonArray2;
+    }
+}
diff --git a/src/net/minecraft/data/models/blockstates/VariantProperties.java b/src/net/minecraft/data/models/blockstates/VariantProperties.java
new file mode 100644
index 0000000..48a50fb
--- /dev/null
+++ b/src/net/minecraft/data/models/blockstates/VariantProperties.java
@@ -0,0 +1,35 @@
+package net.minecraft.data.models.blockstates;
+
+import java.util.function.Function;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonElement;
+import net.minecraft.resources.ResourceLocation;
+
+public class VariantProperties {
+    public static final VariantProperty<Rotation> X_ROT;
+    public static final VariantProperty<Rotation> Y_ROT;
+    public static final VariantProperty<ResourceLocation> MODEL;
+    public static final VariantProperty<Boolean> UV_LOCK;
+    public static final VariantProperty<Integer> WEIGHT;
+    
+    static {
+        X_ROT = new VariantProperty<Rotation>("x", a -> new JsonPrimitive(a.value));
+        Y_ROT = new VariantProperty<Rotation>("y", a -> new JsonPrimitive(a.value));
+        MODEL = new VariantProperty<ResourceLocation>("model", uh -> new JsonPrimitive(uh.toString()));
+        UV_LOCK = new VariantProperty<Boolean>("uvlock", (Function<Boolean, JsonElement>)JsonPrimitive::new);
+        WEIGHT = new VariantProperty<Integer>("weight", (Function<Integer, JsonElement>)JsonPrimitive::new);
+    }
+    
+    public enum Rotation {
+        R0(0), 
+        R90(90), 
+        R180(180), 
+        R270(270);
+        
+        private final int value;
+        
+        private Rotation(final int integer3) {
+            this.value = integer3;
+        }
+    }
+}
diff --git a/src/net/minecraft/data/models/blockstates/VariantProperty.java b/src/net/minecraft/data/models/blockstates/VariantProperty.java
new file mode 100644
index 0000000..0e6e1e4
--- /dev/null
+++ b/src/net/minecraft/data/models/blockstates/VariantProperty.java
@@ -0,0 +1,41 @@
+package net.minecraft.data.models.blockstates;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
+import java.util.function.Function;
+
+public class VariantProperty<T> {
+    private final String key;
+    private final Function<T, JsonElement> serializer;
+    
+    public VariantProperty(final String string, final Function<T, JsonElement> function) {
+        this.key = string;
+        this.serializer = function;
+    }
+    
+    public Value withValue(final T object) {
+        return new Value(object);
+    }
+    
+    @Override
+    public String toString() {
+        return this.key;
+    }
+    
+    public class Value {
+        private final T value;
+        
+        public Value(final T object) {
+            this.value = object;
+        }
+        
+        public void addToVariant(final JsonObject jsonObject) {
+            jsonObject.add(VariantProperty.this.key, VariantProperty.this.serializer.apply(this.value));
+        }
+        
+        @Override
+        public String toString() {
+            return VariantProperty.this.key + "=" + this.value;
+        }
+    }
+}
diff --git a/src/net/minecraft/data/models/model/DelegatedModel.java b/src/net/minecraft/data/models/model/DelegatedModel.java
new file mode 100644
index 0000000..11a70a4
--- /dev/null
+++ b/src/net/minecraft/data/models/model/DelegatedModel.java
@@ -0,0 +1,21 @@
+package net.minecraft.data.models.model;
+
+import com.google.gson.JsonObject;
+import net.minecraft.resources.ResourceLocation;
+import com.google.gson.JsonElement;
+import java.util.function.Supplier;
+
+public class DelegatedModel implements Supplier<JsonElement> {
+    private final ResourceLocation parent;
+    
+    public DelegatedModel(final ResourceLocation uh) {
+        this.parent = uh;
+    }
+    
+    @Override
+    public JsonElement get() {
+        final JsonObject jsonObject2 = new JsonObject();
+        jsonObject2.addProperty("parent", this.parent.toString());
+        return jsonObject2;
+    }
+}
diff --git a/src/net/minecraft/data/models/model/ModelLocationUtils.java b/src/net/minecraft/data/models/model/ModelLocationUtils.java
new file mode 100644
index 0000000..63cdce7
--- /dev/null
+++ b/src/net/minecraft/data/models/model/ModelLocationUtils.java
@@ -0,0 +1,37 @@
+package net.minecraft.data.models.model;
+
+import net.minecraft.world.item.Item;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.resources.ResourceLocation;
+
+public class ModelLocationUtils {
+    @Deprecated
+    public static ResourceLocation decorateBlockModelLocation(final String string) {
+        return new ResourceLocation("minecraft", "block/" + string);
+    }
+    
+    public static ResourceLocation decorateItemModelLocation(final String string) {
+        return new ResourceLocation("minecraft", "item/" + string);
+    }
+    
+    public static ResourceLocation getModelLocation(final Block bvr, final String string) {
+        final ResourceLocation uh3 = Registry.BLOCK.getKey(bvr);
+        return new ResourceLocation(uh3.getNamespace(), "block/" + uh3.getPath() + string);
+    }
+    
+    public static ResourceLocation getModelLocation(final Block bvr) {
+        final ResourceLocation uh2 = Registry.BLOCK.getKey(bvr);
+        return new ResourceLocation(uh2.getNamespace(), "block/" + uh2.getPath());
+    }
+    
+    public static ResourceLocation getModelLocation(final Item bke) {
+        final ResourceLocation uh2 = Registry.ITEM.getKey(bke);
+        return new ResourceLocation(uh2.getNamespace(), "item/" + uh2.getPath());
+    }
+    
+    public static ResourceLocation getModelLocation(final Item bke, final String string) {
+        final ResourceLocation uh3 = Registry.ITEM.getKey(bke);
+        return new ResourceLocation(uh3.getNamespace(), "item/" + uh3.getPath() + string);
+    }
+}
diff --git a/src/net/minecraft/data/models/model/ModelTemplate.java b/src/net/minecraft/data/models/model/ModelTemplate.java
new file mode 100644
index 0000000..21a81cc
--- /dev/null
+++ b/src/net/minecraft/data/models/model/ModelTemplate.java
@@ -0,0 +1,63 @@
+package net.minecraft.data.models.model;
+
+import java.util.stream.Collector;
+import com.google.common.collect.ImmutableMap;
+import java.util.function.Function;
+import com.google.common.collect.Streams;
+import java.util.stream.Stream;
+import java.util.Map;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
+import java.util.function.Supplier;
+import java.util.function.BiConsumer;
+import net.minecraft.world.level.block.Block;
+import com.google.common.collect.ImmutableSet;
+import java.util.Set;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Optional;
+
+public class ModelTemplate {
+    private final Optional<ResourceLocation> model;
+    private final Set<TextureSlot> requiredSlots;
+    private Optional<String> suffix;
+    
+    public ModelTemplate(final Optional<ResourceLocation> optional1, final Optional<String> optional2, final TextureSlot... arr) {
+        this.model = optional1;
+        this.suffix = optional2;
+        this.requiredSlots = ImmutableSet.<TextureSlot>copyOf(arr);
+    }
+    
+    public ResourceLocation create(final Block bvr, final TextureMapping iy, final BiConsumer<ResourceLocation, Supplier<JsonElement>> biConsumer) {
+        return this.create(ModelLocationUtils.getModelLocation(bvr, this.suffix.orElse("")), iy, biConsumer);
+    }
+    
+    public ResourceLocation createWithSuffix(final Block bvr, final String string, final TextureMapping iy, final BiConsumer<ResourceLocation, Supplier<JsonElement>> biConsumer) {
+        return this.create(ModelLocationUtils.getModelLocation(bvr, string + this.suffix.orElse("")), iy, biConsumer);
+    }
+    
+    public ResourceLocation createWithOverride(final Block bvr, final String string, final TextureMapping iy, final BiConsumer<ResourceLocation, Supplier<JsonElement>> biConsumer) {
+        return this.create(ModelLocationUtils.getModelLocation(bvr, string), iy, biConsumer);
+    }
+    
+    public ResourceLocation create(final ResourceLocation uh, final TextureMapping iy, final BiConsumer<ResourceLocation, Supplier<JsonElement>> biConsumer) {
+        final Map<TextureSlot, ResourceLocation> map5 = this.createMap(iy);
+        final JsonObject jsonObject3;
+        final Map map6;
+        JsonObject jsonObject4;
+        biConsumer.accept(uh, () -> {
+            jsonObject3 = new JsonObject();
+            this.model.ifPresent(uh -> jsonObject3.addProperty("parent", uh.toString()));
+            if (!map6.isEmpty()) {
+                jsonObject4 = new JsonObject();
+                map6.forEach((iz, uh) -> jsonObject4.addProperty(iz.getId(), uh.toString()));
+                jsonObject3.add("textures", jsonObject4);
+            }
+            return jsonObject3;
+        });
+        return uh;
+    }
+    
+    private Map<TextureSlot, ResourceLocation> createMap(final TextureMapping iy) {
+        return Streams.concat(new Stream[] { this.requiredSlots.stream(), iy.getForced() }).collect(ImmutableMap.toImmutableMap(Function.identity(), iy::get));
+    }
+}
diff --git a/src/net/minecraft/data/models/model/ModelTemplates.java b/src/net/minecraft/data/models/model/ModelTemplates.java
new file mode 100644
index 0000000..cd66836
--- /dev/null
+++ b/src/net/minecraft/data/models/model/ModelTemplates.java
@@ -0,0 +1,217 @@
+package net.minecraft.data.models.model;
+
+import java.util.stream.IntStream;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Optional;
+
+public class ModelTemplates {
+    public static final ModelTemplate CUBE;
+    public static final ModelTemplate CUBE_DIRECTIONAL;
+    public static final ModelTemplate CUBE_ALL;
+    public static final ModelTemplate CUBE_MIRRORED_ALL;
+    public static final ModelTemplate CUBE_COLUMN;
+    public static final ModelTemplate CUBE_COLUMN_HORIZONTAL;
+    public static final ModelTemplate CUBE_TOP;
+    public static final ModelTemplate CUBE_BOTTOM_TOP;
+    public static final ModelTemplate CUBE_ORIENTABLE;
+    public static final ModelTemplate CUBE_ORIENTABLE_TOP_BOTTOM;
+    public static final ModelTemplate CUBE_ORIENTABLE_VERTICAL;
+    public static final ModelTemplate BUTTON;
+    public static final ModelTemplate BUTTON_PRESSED;
+    public static final ModelTemplate BUTTON_INVENTORY;
+    public static final ModelTemplate DOOR_BOTTOM;
+    public static final ModelTemplate DOOR_BOTTOM_HINGE;
+    public static final ModelTemplate DOOR_TOP;
+    public static final ModelTemplate DOOR_TOP_HINGE;
+    public static final ModelTemplate FENCE_POST;
+    public static final ModelTemplate FENCE_SIDE;
+    public static final ModelTemplate FENCE_INVENTORY;
+    public static final ModelTemplate WALL_POST;
+    public static final ModelTemplate WALL_LOW_SIDE;
+    public static final ModelTemplate WALL_TALL_SIDE;
+    public static final ModelTemplate WALL_INVENTORY;
+    public static final ModelTemplate FENCE_GATE_CLOSED;
+    public static final ModelTemplate FENCE_GATE_OPEN;
+    public static final ModelTemplate FENCE_GATE_WALL_CLOSED;
+    public static final ModelTemplate FENCE_GATE_WALL_OPEN;
+    public static final ModelTemplate PRESSURE_PLATE_UP;
+    public static final ModelTemplate PRESSURE_PLATE_DOWN;
+    public static final ModelTemplate PARTICLE_ONLY;
+    public static final ModelTemplate SLAB_BOTTOM;
+    public static final ModelTemplate SLAB_TOP;
+    public static final ModelTemplate LEAVES;
+    public static final ModelTemplate STAIRS_STRAIGHT;
+    public static final ModelTemplate STAIRS_INNER;
+    public static final ModelTemplate STAIRS_OUTER;
+    public static final ModelTemplate TRAPDOOR_TOP;
+    public static final ModelTemplate TRAPDOOR_BOTTOM;
+    public static final ModelTemplate TRAPDOOR_OPEN;
+    public static final ModelTemplate ORIENTABLE_TRAPDOOR_TOP;
+    public static final ModelTemplate ORIENTABLE_TRAPDOOR_BOTTOM;
+    public static final ModelTemplate ORIENTABLE_TRAPDOOR_OPEN;
+    public static final ModelTemplate CROSS;
+    public static final ModelTemplate TINTED_CROSS;
+    public static final ModelTemplate FLOWER_POT_CROSS;
+    public static final ModelTemplate TINTED_FLOWER_POT_CROSS;
+    public static final ModelTemplate RAIL_FLAT;
+    public static final ModelTemplate RAIL_CURVED;
+    public static final ModelTemplate RAIL_RAISED_NE;
+    public static final ModelTemplate RAIL_RAISED_SW;
+    public static final ModelTemplate CARPET;
+    public static final ModelTemplate CORAL_FAN;
+    public static final ModelTemplate CORAL_WALL_FAN;
+    public static final ModelTemplate GLAZED_TERRACOTTA;
+    public static final ModelTemplate CHORUS_FLOWER;
+    public static final ModelTemplate DAYLIGHT_DETECTOR;
+    public static final ModelTemplate STAINED_GLASS_PANE_NOSIDE;
+    public static final ModelTemplate STAINED_GLASS_PANE_NOSIDE_ALT;
+    public static final ModelTemplate STAINED_GLASS_PANE_POST;
+    public static final ModelTemplate STAINED_GLASS_PANE_SIDE;
+    public static final ModelTemplate STAINED_GLASS_PANE_SIDE_ALT;
+    public static final ModelTemplate COMMAND_BLOCK;
+    public static final ModelTemplate ANVIL;
+    public static final ModelTemplate[] STEMS;
+    public static final ModelTemplate ATTACHED_STEM;
+    public static final ModelTemplate CROP;
+    public static final ModelTemplate FARMLAND;
+    public static final ModelTemplate FIRE_FLOOR;
+    public static final ModelTemplate FIRE_SIDE;
+    public static final ModelTemplate FIRE_SIDE_ALT;
+    public static final ModelTemplate FIRE_UP;
+    public static final ModelTemplate FIRE_UP_ALT;
+    public static final ModelTemplate CAMPFIRE;
+    public static final ModelTemplate LANTERN;
+    public static final ModelTemplate HANGING_LANTERN;
+    public static final ModelTemplate TORCH;
+    public static final ModelTemplate WALL_TORCH;
+    public static final ModelTemplate PISTON;
+    public static final ModelTemplate PISTON_HEAD;
+    public static final ModelTemplate PISTON_HEAD_SHORT;
+    public static final ModelTemplate SEAGRASS;
+    public static final ModelTemplate TURTLE_EGG;
+    public static final ModelTemplate TWO_TURTLE_EGGS;
+    public static final ModelTemplate THREE_TURTLE_EGGS;
+    public static final ModelTemplate FOUR_TURTLE_EGGS;
+    public static final ModelTemplate SINGLE_FACE;
+    public static final ModelTemplate FLAT_ITEM;
+    public static final ModelTemplate FLAT_HANDHELD_ITEM;
+    public static final ModelTemplate FLAT_HANDHELD_ROD_ITEM;
+    public static final ModelTemplate SHULKER_BOX_INVENTORY;
+    public static final ModelTemplate BED_INVENTORY;
+    public static final ModelTemplate BANNER_INVENTORY;
+    public static final ModelTemplate SKULL_INVENTORY;
+    
+    private static ModelTemplate create(final TextureSlot... arr) {
+        return new ModelTemplate(Optional.<ResourceLocation>empty(), Optional.<String>empty(), arr);
+    }
+    
+    private static ModelTemplate create(final String string, final TextureSlot... arr) {
+        return new ModelTemplate(Optional.<ResourceLocation>of(new ResourceLocation("minecraft", "block/" + string)), Optional.<String>empty(), arr);
+    }
+    
+    private static ModelTemplate createItem(final String string, final TextureSlot... arr) {
+        return new ModelTemplate(Optional.<ResourceLocation>of(new ResourceLocation("minecraft", "item/" + string)), Optional.<String>empty(), arr);
+    }
+    
+    private static ModelTemplate create(final String string1, final String string2, final TextureSlot... arr) {
+        return new ModelTemplate(Optional.<ResourceLocation>of(new ResourceLocation("minecraft", "block/" + string1)), Optional.<String>of(string2), arr);
+    }
+    
+    static {
+        CUBE = create("cube", TextureSlot.PARTICLE, TextureSlot.NORTH, TextureSlot.SOUTH, TextureSlot.EAST, TextureSlot.WEST, TextureSlot.UP, TextureSlot.DOWN);
+        CUBE_DIRECTIONAL = create("cube_directional", TextureSlot.PARTICLE, TextureSlot.NORTH, TextureSlot.SOUTH, TextureSlot.EAST, TextureSlot.WEST, TextureSlot.UP, TextureSlot.DOWN);
+        CUBE_ALL = create("cube_all", TextureSlot.ALL);
+        CUBE_MIRRORED_ALL = create("cube_mirrored_all", "_mirrored", TextureSlot.ALL);
+        CUBE_COLUMN = create("cube_column", TextureSlot.END, TextureSlot.SIDE);
+        CUBE_COLUMN_HORIZONTAL = create("cube_column_horizontal", "_horizontal", TextureSlot.END, TextureSlot.SIDE);
+        CUBE_TOP = create("cube_top", TextureSlot.TOP, TextureSlot.SIDE);
+        CUBE_BOTTOM_TOP = create("cube_bottom_top", TextureSlot.TOP, TextureSlot.BOTTOM, TextureSlot.SIDE);
+        CUBE_ORIENTABLE = create("orientable", TextureSlot.TOP, TextureSlot.FRONT, TextureSlot.SIDE);
+        CUBE_ORIENTABLE_TOP_BOTTOM = create("orientable_with_bottom", TextureSlot.TOP, TextureSlot.BOTTOM, TextureSlot.SIDE, TextureSlot.FRONT);
+        CUBE_ORIENTABLE_VERTICAL = create("orientable_vertical", "_vertical", TextureSlot.FRONT, TextureSlot.SIDE);
+        BUTTON = create("button", TextureSlot.TEXTURE);
+        BUTTON_PRESSED = create("button_pressed", "_pressed", TextureSlot.TEXTURE);
+        BUTTON_INVENTORY = create("button_inventory", "_inventory", TextureSlot.TEXTURE);
+        DOOR_BOTTOM = create("door_bottom", "_bottom", TextureSlot.TOP, TextureSlot.BOTTOM);
+        DOOR_BOTTOM_HINGE = create("door_bottom_rh", "_bottom_hinge", TextureSlot.TOP, TextureSlot.BOTTOM);
+        DOOR_TOP = create("door_top", "_top", TextureSlot.TOP, TextureSlot.BOTTOM);
+        DOOR_TOP_HINGE = create("door_top_rh", "_top_hinge", TextureSlot.TOP, TextureSlot.BOTTOM);
+        FENCE_POST = create("fence_post", "_post", TextureSlot.TEXTURE);
+        FENCE_SIDE = create("fence_side", "_side", TextureSlot.TEXTURE);
+        FENCE_INVENTORY = create("fence_inventory", "_inventory", TextureSlot.TEXTURE);
+        WALL_POST = create("template_wall_post", "_post", TextureSlot.WALL);
+        WALL_LOW_SIDE = create("template_wall_side", "_side", TextureSlot.WALL);
+        WALL_TALL_SIDE = create("template_wall_side_tall", "_side_tall", TextureSlot.WALL);
+        WALL_INVENTORY = create("wall_inventory", "_inventory", TextureSlot.WALL);
+        FENCE_GATE_CLOSED = create("template_fence_gate", TextureSlot.TEXTURE);
+        FENCE_GATE_OPEN = create("template_fence_gate_open", "_open", TextureSlot.TEXTURE);
+        FENCE_GATE_WALL_CLOSED = create("template_fence_gate_wall", "_wall", TextureSlot.TEXTURE);
+        FENCE_GATE_WALL_OPEN = create("template_fence_gate_wall_open", "_wall_open", TextureSlot.TEXTURE);
+        PRESSURE_PLATE_UP = create("pressure_plate_up", TextureSlot.TEXTURE);
+        PRESSURE_PLATE_DOWN = create("pressure_plate_down", "_down", TextureSlot.TEXTURE);
+        PARTICLE_ONLY = create(TextureSlot.PARTICLE);
+        SLAB_BOTTOM = create("slab", TextureSlot.BOTTOM, TextureSlot.TOP, TextureSlot.SIDE);
+        SLAB_TOP = create("slab_top", "_top", TextureSlot.BOTTOM, TextureSlot.TOP, TextureSlot.SIDE);
+        LEAVES = create("leaves", TextureSlot.ALL);
+        STAIRS_STRAIGHT = create("stairs", TextureSlot.BOTTOM, TextureSlot.TOP, TextureSlot.SIDE);
+        STAIRS_INNER = create("inner_stairs", "_inner", TextureSlot.BOTTOM, TextureSlot.TOP, TextureSlot.SIDE);
+        STAIRS_OUTER = create("outer_stairs", "_outer", TextureSlot.BOTTOM, TextureSlot.TOP, TextureSlot.SIDE);
+        TRAPDOOR_TOP = create("template_trapdoor_top", "_top", TextureSlot.TEXTURE);
+        TRAPDOOR_BOTTOM = create("template_trapdoor_bottom", "_bottom", TextureSlot.TEXTURE);
+        TRAPDOOR_OPEN = create("template_trapdoor_open", "_open", TextureSlot.TEXTURE);
+        ORIENTABLE_TRAPDOOR_TOP = create("template_orientable_trapdoor_top", "_top", TextureSlot.TEXTURE);
+        ORIENTABLE_TRAPDOOR_BOTTOM = create("template_orientable_trapdoor_bottom", "_bottom", TextureSlot.TEXTURE);
+        ORIENTABLE_TRAPDOOR_OPEN = create("template_orientable_trapdoor_open", "_open", TextureSlot.TEXTURE);
+        CROSS = create("cross", TextureSlot.CROSS);
+        TINTED_CROSS = create("tinted_cross", TextureSlot.CROSS);
+        FLOWER_POT_CROSS = create("flower_pot_cross", TextureSlot.PLANT);
+        TINTED_FLOWER_POT_CROSS = create("tinted_flower_pot_cross", TextureSlot.PLANT);
+        RAIL_FLAT = create("rail_flat", TextureSlot.RAIL);
+        RAIL_CURVED = create("rail_curved", "_corner", TextureSlot.RAIL);
+        RAIL_RAISED_NE = create("template_rail_raised_ne", "_raised_ne", TextureSlot.RAIL);
+        RAIL_RAISED_SW = create("template_rail_raised_sw", "_raised_sw", TextureSlot.RAIL);
+        CARPET = create("carpet", TextureSlot.WOOL);
+        CORAL_FAN = create("coral_fan", TextureSlot.FAN);
+        CORAL_WALL_FAN = create("coral_wall_fan", TextureSlot.FAN);
+        GLAZED_TERRACOTTA = create("template_glazed_terracotta", TextureSlot.PATTERN);
+        CHORUS_FLOWER = create("template_chorus_flower", TextureSlot.TEXTURE);
+        DAYLIGHT_DETECTOR = create("template_daylight_detector", TextureSlot.TOP, TextureSlot.SIDE);
+        STAINED_GLASS_PANE_NOSIDE = create("template_glass_pane_noside", "_noside", TextureSlot.PANE);
+        STAINED_GLASS_PANE_NOSIDE_ALT = create("template_glass_pane_noside_alt", "_noside_alt", TextureSlot.PANE);
+        STAINED_GLASS_PANE_POST = create("template_glass_pane_post", "_post", TextureSlot.PANE, TextureSlot.EDGE);
+        STAINED_GLASS_PANE_SIDE = create("template_glass_pane_side", "_side", TextureSlot.PANE, TextureSlot.EDGE);
+        STAINED_GLASS_PANE_SIDE_ALT = create("template_glass_pane_side_alt", "_side_alt", TextureSlot.PANE, TextureSlot.EDGE);
+        COMMAND_BLOCK = create("template_command_block", TextureSlot.FRONT, TextureSlot.BACK, TextureSlot.SIDE);
+        ANVIL = create("template_anvil", TextureSlot.TOP);
+        STEMS = IntStream.range(0, 8).mapToObj(integer -> create("stem_growth" + integer, "_stage" + integer, TextureSlot.STEM)).<ModelTemplate>toArray(ModelTemplate[]::new);
+        ATTACHED_STEM = create("stem_fruit", TextureSlot.STEM, TextureSlot.UPPER_STEM);
+        CROP = create("crop", TextureSlot.CROP);
+        FARMLAND = create("template_farmland", TextureSlot.DIRT, TextureSlot.TOP);
+        FIRE_FLOOR = create("template_fire_floor", TextureSlot.FIRE);
+        FIRE_SIDE = create("template_fire_side", TextureSlot.FIRE);
+        FIRE_SIDE_ALT = create("template_fire_side_alt", TextureSlot.FIRE);
+        FIRE_UP = create("template_fire_up", TextureSlot.FIRE);
+        FIRE_UP_ALT = create("template_fire_up_alt", TextureSlot.FIRE);
+        CAMPFIRE = create("template_campfire", TextureSlot.FIRE, TextureSlot.LIT_LOG);
+        LANTERN = create("template_lantern", TextureSlot.LANTERN);
+        HANGING_LANTERN = create("template_hanging_lantern", "_hanging", TextureSlot.LANTERN);
+        TORCH = create("template_torch", TextureSlot.TORCH);
+        WALL_TORCH = create("template_torch_wall", TextureSlot.TORCH);
+        PISTON = create("template_piston", TextureSlot.PLATFORM, TextureSlot.BOTTOM, TextureSlot.SIDE);
+        PISTON_HEAD = create("template_piston_head", TextureSlot.PLATFORM, TextureSlot.SIDE, TextureSlot.UNSTICKY);
+        PISTON_HEAD_SHORT = create("template_piston_head_short", TextureSlot.PLATFORM, TextureSlot.SIDE, TextureSlot.UNSTICKY);
+        SEAGRASS = create("template_seagrass", TextureSlot.TEXTURE);
+        TURTLE_EGG = create("template_turtle_egg", TextureSlot.ALL);
+        TWO_TURTLE_EGGS = create("template_two_turtle_eggs", TextureSlot.ALL);
+        THREE_TURTLE_EGGS = create("template_three_turtle_eggs", TextureSlot.ALL);
+        FOUR_TURTLE_EGGS = create("template_four_turtle_eggs", TextureSlot.ALL);
+        SINGLE_FACE = create("template_single_face", TextureSlot.TEXTURE);
+        FLAT_ITEM = createItem("generated", TextureSlot.LAYER0);
+        FLAT_HANDHELD_ITEM = createItem("handheld", TextureSlot.LAYER0);
+        FLAT_HANDHELD_ROD_ITEM = createItem("handheld_rod", TextureSlot.LAYER0);
+        SHULKER_BOX_INVENTORY = createItem("template_shulker_box", TextureSlot.PARTICLE);
+        BED_INVENTORY = createItem("template_bed", TextureSlot.PARTICLE);
+        BANNER_INVENTORY = createItem("template_banner");
+        SKULL_INVENTORY = createItem("template_skull");
+    }
+}
diff --git a/src/net/minecraft/data/models/model/TextureMapping.java b/src/net/minecraft/data/models/model/TextureMapping.java
new file mode 100644
index 0000000..e7bf178
--- /dev/null
+++ b/src/net/minecraft/data/models/model/TextureMapping.java
@@ -0,0 +1,259 @@
+package net.minecraft.data.models.model;
+
+import net.minecraft.core.Registry;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+import java.util.Collection;
+import java.util.stream.Stream;
+import com.google.common.collect.Sets;
+import com.google.common.collect.Maps;
+import java.util.Set;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Map;
+
+public class TextureMapping {
+    private final Map<TextureSlot, ResourceLocation> slots;
+    private final Set<TextureSlot> forcedSlots;
+    
+    public TextureMapping() {
+        this.slots = Maps.newHashMap();
+        this.forcedSlots = Sets.newHashSet();
+    }
+    
+    public TextureMapping put(final TextureSlot iz, final ResourceLocation uh) {
+        this.slots.put(iz, uh);
+        return this;
+    }
+    
+    public Stream<TextureSlot> getForced() {
+        return this.forcedSlots.stream();
+    }
+    
+    public TextureMapping copyForced(final TextureSlot iz1, final TextureSlot iz2) {
+        this.slots.put(iz2, this.slots.get(iz1));
+        this.forcedSlots.add(iz2);
+        return this;
+    }
+    
+    public ResourceLocation get(final TextureSlot iz) {
+        for (TextureSlot iz2 = iz; iz2 != null; iz2 = iz2.getParent()) {
+            final ResourceLocation uh4 = this.slots.get(iz2);
+            if (uh4 != null) {
+                return uh4;
+            }
+        }
+        throw new IllegalStateException("Can't find texture for slot " + iz);
+    }
+    
+    public TextureMapping copyAndUpdate(final TextureSlot iz, final ResourceLocation uh) {
+        final TextureMapping iy4 = new TextureMapping();
+        iy4.slots.putAll(this.slots);
+        iy4.forcedSlots.addAll(this.forcedSlots);
+        iy4.put(iz, uh);
+        return iy4;
+    }
+    
+    public static TextureMapping cube(final Block bvr) {
+        final ResourceLocation uh2 = getBlockTexture(bvr);
+        return cube(uh2);
+    }
+    
+    public static TextureMapping defaultTexture(final Block bvr) {
+        final ResourceLocation uh2 = getBlockTexture(bvr);
+        return defaultTexture(uh2);
+    }
+    
+    public static TextureMapping defaultTexture(final ResourceLocation uh) {
+        return new TextureMapping().put(TextureSlot.TEXTURE, uh);
+    }
+    
+    public static TextureMapping cube(final ResourceLocation uh) {
+        return new TextureMapping().put(TextureSlot.ALL, uh);
+    }
+    
+    public static TextureMapping cross(final Block bvr) {
+        return singleSlot(TextureSlot.CROSS, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping cross(final ResourceLocation uh) {
+        return singleSlot(TextureSlot.CROSS, uh);
+    }
+    
+    public static TextureMapping plant(final Block bvr) {
+        return singleSlot(TextureSlot.PLANT, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping plant(final ResourceLocation uh) {
+        return singleSlot(TextureSlot.PLANT, uh);
+    }
+    
+    public static TextureMapping rail(final Block bvr) {
+        return singleSlot(TextureSlot.RAIL, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping rail(final ResourceLocation uh) {
+        return singleSlot(TextureSlot.RAIL, uh);
+    }
+    
+    public static TextureMapping wool(final Block bvr) {
+        return singleSlot(TextureSlot.WOOL, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping stem(final Block bvr) {
+        return singleSlot(TextureSlot.STEM, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping attachedStem(final Block bvr1, final Block bvr2) {
+        return new TextureMapping().put(TextureSlot.STEM, getBlockTexture(bvr1)).put(TextureSlot.UPPER_STEM, getBlockTexture(bvr2));
+    }
+    
+    public static TextureMapping pattern(final Block bvr) {
+        return singleSlot(TextureSlot.PATTERN, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping fan(final Block bvr) {
+        return singleSlot(TextureSlot.FAN, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping crop(final ResourceLocation uh) {
+        return singleSlot(TextureSlot.CROP, uh);
+    }
+    
+    public static TextureMapping pane(final Block bvr1, final Block bvr2) {
+        return new TextureMapping().put(TextureSlot.PANE, getBlockTexture(bvr1)).put(TextureSlot.EDGE, getBlockTexture(bvr2, "_top"));
+    }
+    
+    public static TextureMapping singleSlot(final TextureSlot iz, final ResourceLocation uh) {
+        return new TextureMapping().put(iz, uh);
+    }
+    
+    public static TextureMapping column(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.SIDE, getBlockTexture(bvr, "_side")).put(TextureSlot.END, getBlockTexture(bvr, "_top"));
+    }
+    
+    public static TextureMapping cubeTop(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.SIDE, getBlockTexture(bvr, "_side")).put(TextureSlot.TOP, getBlockTexture(bvr, "_top"));
+    }
+    
+    public static TextureMapping logColumn(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.SIDE, getBlockTexture(bvr)).put(TextureSlot.END, getBlockTexture(bvr, "_top"));
+    }
+    
+    public static TextureMapping column(final ResourceLocation uh1, final ResourceLocation uh2) {
+        return new TextureMapping().put(TextureSlot.SIDE, uh1).put(TextureSlot.END, uh2);
+    }
+    
+    public static TextureMapping cubeBottomTop(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.SIDE, getBlockTexture(bvr, "_side")).put(TextureSlot.TOP, getBlockTexture(bvr, "_top")).put(TextureSlot.BOTTOM, getBlockTexture(bvr, "_bottom"));
+    }
+    
+    public static TextureMapping cubeBottomTopWithWall(final Block bvr) {
+        final ResourceLocation uh2 = getBlockTexture(bvr);
+        return new TextureMapping().put(TextureSlot.WALL, uh2).put(TextureSlot.SIDE, uh2).put(TextureSlot.TOP, getBlockTexture(bvr, "_top")).put(TextureSlot.BOTTOM, getBlockTexture(bvr, "_bottom"));
+    }
+    
+    public static TextureMapping columnWithWall(final Block bvr) {
+        final ResourceLocation uh2 = getBlockTexture(bvr);
+        return new TextureMapping().put(TextureSlot.WALL, uh2).put(TextureSlot.SIDE, uh2).put(TextureSlot.END, getBlockTexture(bvr, "_top"));
+    }
+    
+    public static TextureMapping door(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.TOP, getBlockTexture(bvr, "_top")).put(TextureSlot.BOTTOM, getBlockTexture(bvr, "_bottom"));
+    }
+    
+    public static TextureMapping particle(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.PARTICLE, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping particle(final ResourceLocation uh) {
+        return new TextureMapping().put(TextureSlot.PARTICLE, uh);
+    }
+    
+    public static TextureMapping fire0(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.FIRE, getBlockTexture(bvr, "_0"));
+    }
+    
+    public static TextureMapping fire1(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.FIRE, getBlockTexture(bvr, "_1"));
+    }
+    
+    public static TextureMapping lantern(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.LANTERN, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping torch(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.TORCH, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping torch(final ResourceLocation uh) {
+        return new TextureMapping().put(TextureSlot.TORCH, uh);
+    }
+    
+    public static TextureMapping particleFromItem(final Item bke) {
+        return new TextureMapping().put(TextureSlot.PARTICLE, getItemTexture(bke));
+    }
+    
+    public static TextureMapping commandBlock(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.SIDE, getBlockTexture(bvr, "_side")).put(TextureSlot.FRONT, getBlockTexture(bvr, "_front")).put(TextureSlot.BACK, getBlockTexture(bvr, "_back"));
+    }
+    
+    public static TextureMapping orientableCube(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.SIDE, getBlockTexture(bvr, "_side")).put(TextureSlot.FRONT, getBlockTexture(bvr, "_front")).put(TextureSlot.TOP, getBlockTexture(bvr, "_top")).put(TextureSlot.BOTTOM, getBlockTexture(bvr, "_bottom"));
+    }
+    
+    public static TextureMapping orientableCubeOnlyTop(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.SIDE, getBlockTexture(bvr, "_side")).put(TextureSlot.FRONT, getBlockTexture(bvr, "_front")).put(TextureSlot.TOP, getBlockTexture(bvr, "_top"));
+    }
+    
+    public static TextureMapping orientableCubeSameEnds(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.SIDE, getBlockTexture(bvr, "_side")).put(TextureSlot.FRONT, getBlockTexture(bvr, "_front")).put(TextureSlot.END, getBlockTexture(bvr, "_end"));
+    }
+    
+    public static TextureMapping top(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.TOP, getBlockTexture(bvr, "_top"));
+    }
+    
+    public static TextureMapping craftingTable(final Block bvr1, final Block bvr2) {
+        return new TextureMapping().put(TextureSlot.PARTICLE, getBlockTexture(bvr1, "_front")).put(TextureSlot.DOWN, getBlockTexture(bvr2)).put(TextureSlot.UP, getBlockTexture(bvr1, "_top")).put(TextureSlot.NORTH, getBlockTexture(bvr1, "_front")).put(TextureSlot.EAST, getBlockTexture(bvr1, "_side")).put(TextureSlot.SOUTH, getBlockTexture(bvr1, "_side")).put(TextureSlot.WEST, getBlockTexture(bvr1, "_front"));
+    }
+    
+    public static TextureMapping fletchingTable(final Block bvr1, final Block bvr2) {
+        return new TextureMapping().put(TextureSlot.PARTICLE, getBlockTexture(bvr1, "_front")).put(TextureSlot.DOWN, getBlockTexture(bvr2)).put(TextureSlot.UP, getBlockTexture(bvr1, "_top")).put(TextureSlot.NORTH, getBlockTexture(bvr1, "_front")).put(TextureSlot.SOUTH, getBlockTexture(bvr1, "_front")).put(TextureSlot.EAST, getBlockTexture(bvr1, "_side")).put(TextureSlot.WEST, getBlockTexture(bvr1, "_side"));
+    }
+    
+    public static TextureMapping campfire(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.LIT_LOG, getBlockTexture(bvr, "_log_lit")).put(TextureSlot.FIRE, getBlockTexture(bvr, "_fire"));
+    }
+    
+    public static TextureMapping layer0(final Item bke) {
+        return new TextureMapping().put(TextureSlot.LAYER0, getItemTexture(bke));
+    }
+    
+    public static TextureMapping layer0(final Block bvr) {
+        return new TextureMapping().put(TextureSlot.LAYER0, getBlockTexture(bvr));
+    }
+    
+    public static TextureMapping layer0(final ResourceLocation uh) {
+        return new TextureMapping().put(TextureSlot.LAYER0, uh);
+    }
+    
+    public static ResourceLocation getBlockTexture(final Block bvr) {
+        final ResourceLocation uh2 = Registry.BLOCK.getKey(bvr);
+        return new ResourceLocation(uh2.getNamespace(), "block/" + uh2.getPath());
+    }
+    
+    public static ResourceLocation getBlockTexture(final Block bvr, final String string) {
+        final ResourceLocation uh3 = Registry.BLOCK.getKey(bvr);
+        return new ResourceLocation(uh3.getNamespace(), "block/" + uh3.getPath() + string);
+    }
+    
+    public static ResourceLocation getItemTexture(final Item bke) {
+        final ResourceLocation uh2 = Registry.ITEM.getKey(bke);
+        return new ResourceLocation(uh2.getNamespace(), "item/" + uh2.getPath());
+    }
+    
+    public static ResourceLocation getItemTexture(final Item bke, final String string) {
+        final ResourceLocation uh3 = Registry.ITEM.getKey(bke);
+        return new ResourceLocation(uh3.getNamespace(), "item/" + uh3.getPath() + string);
+    }
+}
diff --git a/src/net/minecraft/data/models/model/TextureSlot.java b/src/net/minecraft/data/models/model/TextureSlot.java
new file mode 100644
index 0000000..b22bd44
--- /dev/null
+++ b/src/net/minecraft/data/models/model/TextureSlot.java
@@ -0,0 +1,109 @@
+package net.minecraft.data.models.model;
+
+import javax.annotation.Nullable;
+
+public final class TextureSlot {
+    public static final TextureSlot ALL;
+    public static final TextureSlot TEXTURE;
+    public static final TextureSlot PARTICLE;
+    public static final TextureSlot END;
+    public static final TextureSlot BOTTOM;
+    public static final TextureSlot TOP;
+    public static final TextureSlot FRONT;
+    public static final TextureSlot BACK;
+    public static final TextureSlot SIDE;
+    public static final TextureSlot NORTH;
+    public static final TextureSlot SOUTH;
+    public static final TextureSlot EAST;
+    public static final TextureSlot WEST;
+    public static final TextureSlot UP;
+    public static final TextureSlot DOWN;
+    public static final TextureSlot CROSS;
+    public static final TextureSlot PLANT;
+    public static final TextureSlot WALL;
+    public static final TextureSlot RAIL;
+    public static final TextureSlot WOOL;
+    public static final TextureSlot PATTERN;
+    public static final TextureSlot PANE;
+    public static final TextureSlot EDGE;
+    public static final TextureSlot FAN;
+    public static final TextureSlot STEM;
+    public static final TextureSlot UPPER_STEM;
+    public static final TextureSlot CROP;
+    public static final TextureSlot DIRT;
+    public static final TextureSlot FIRE;
+    public static final TextureSlot LANTERN;
+    public static final TextureSlot PLATFORM;
+    public static final TextureSlot UNSTICKY;
+    public static final TextureSlot TORCH;
+    public static final TextureSlot LAYER0;
+    public static final TextureSlot LIT_LOG;
+    private final String id;
+    @Nullable
+    private final TextureSlot parent;
+    
+    private static TextureSlot create(final String string) {
+        return new TextureSlot(string, null);
+    }
+    
+    private static TextureSlot create(final String string, final TextureSlot iz) {
+        return new TextureSlot(string, iz);
+    }
+    
+    private TextureSlot(final String string, @Nullable final TextureSlot iz) {
+        this.id = string;
+        this.parent = iz;
+    }
+    
+    public String getId() {
+        return this.id;
+    }
+    
+    @Nullable
+    public TextureSlot getParent() {
+        return this.parent;
+    }
+    
+    @Override
+    public String toString() {
+        return "#" + this.id;
+    }
+    
+    static {
+        ALL = create("all");
+        TEXTURE = create("texture", TextureSlot.ALL);
+        PARTICLE = create("particle", TextureSlot.TEXTURE);
+        END = create("end", TextureSlot.ALL);
+        BOTTOM = create("bottom", TextureSlot.END);
+        TOP = create("top", TextureSlot.END);
+        FRONT = create("front", TextureSlot.ALL);
+        BACK = create("back", TextureSlot.ALL);
+        SIDE = create("side", TextureSlot.ALL);
+        NORTH = create("north", TextureSlot.SIDE);
+        SOUTH = create("south", TextureSlot.SIDE);
+        EAST = create("east", TextureSlot.SIDE);
+        WEST = create("west", TextureSlot.SIDE);
+        UP = create("up");
+        DOWN = create("down");
+        CROSS = create("cross");
+        PLANT = create("plant");
+        WALL = create("wall", TextureSlot.ALL);
+        RAIL = create("rail");
+        WOOL = create("wool");
+        PATTERN = create("pattern");
+        PANE = create("pane");
+        EDGE = create("edge");
+        FAN = create("fan");
+        STEM = create("stem");
+        UPPER_STEM = create("upperstem");
+        CROP = create("crop");
+        DIRT = create("dirt");
+        FIRE = create("fire");
+        LANTERN = create("lantern");
+        PLATFORM = create("platform");
+        UNSTICKY = create("unsticky");
+        TORCH = create("torch");
+        LAYER0 = create("layer0");
+        LIT_LOG = create("lit_log");
+    }
+}
diff --git a/src/net/minecraft/data/models/model/TexturedModel.java b/src/net/minecraft/data/models/model/TexturedModel.java
new file mode 100644
index 0000000..f36af5e
--- /dev/null
+++ b/src/net/minecraft/data/models/model/TexturedModel.java
@@ -0,0 +1,110 @@
+package net.minecraft.data.models.model;
+
+import java.util.function.Function;
+import com.google.gson.JsonElement;
+import java.util.function.Supplier;
+import net.minecraft.resources.ResourceLocation;
+import java.util.function.BiConsumer;
+import net.minecraft.world.level.block.Block;
+import java.util.function.Consumer;
+
+public class TexturedModel {
+    public static final Provider CUBE;
+    public static final Provider CUBE_MIRRORED;
+    public static final Provider COLUMN;
+    public static final Provider COLUMN_HORIZONTAL;
+    public static final Provider CUBE_TOP_BOTTOM;
+    public static final Provider CUBE_TOP;
+    public static final Provider ORIENTABLE_ONLY_TOP;
+    public static final Provider ORIENTABLE;
+    public static final Provider CARPET;
+    public static final Provider GLAZED_TERRACOTTA;
+    public static final Provider CORAL_FAN;
+    public static final Provider PARTICLE_ONLY;
+    public static final Provider ANVIL;
+    public static final Provider LEAVES;
+    public static final Provider LANTERN;
+    public static final Provider HANGING_LANTERN;
+    public static final Provider SEAGRASS;
+    public static final Provider COLUMN_ALT;
+    public static final Provider COLUMN_HORIZONTAL_ALT;
+    public static final Provider TOP_BOTTOM_WITH_WALL;
+    public static final Provider COLUMN_WITH_WALL;
+    private final TextureMapping mapping;
+    private final ModelTemplate template;
+    
+    private TexturedModel(final TextureMapping iy, final ModelTemplate iw) {
+        this.mapping = iy;
+        this.template = iw;
+    }
+    
+    public ModelTemplate getTemplate() {
+        return this.template;
+    }
+    
+    public TextureMapping getMapping() {
+        return this.mapping;
+    }
+    
+    public TexturedModel updateTextures(final Consumer<TextureMapping> consumer) {
+        consumer.accept(this.mapping);
+        return this;
+    }
+    
+    public ResourceLocation create(final Block bvr, final BiConsumer<ResourceLocation, Supplier<JsonElement>> biConsumer) {
+        return this.template.create(bvr, this.mapping, biConsumer);
+    }
+    
+    public ResourceLocation createWithSuffix(final Block bvr, final String string, final BiConsumer<ResourceLocation, Supplier<JsonElement>> biConsumer) {
+        return this.template.createWithSuffix(bvr, string, this.mapping, biConsumer);
+    }
+    
+    private static Provider createDefault(final Function<Block, TextureMapping> function, final ModelTemplate iw) {
+        return bvr -> new TexturedModel(function.apply(bvr), iw);
+    }
+    
+    public static TexturedModel createAllSame(final ResourceLocation uh) {
+        return new TexturedModel(TextureMapping.cube(uh), ModelTemplates.CUBE_ALL);
+    }
+    
+    static {
+        CUBE = createDefault(TextureMapping::cube, ModelTemplates.CUBE_ALL);
+        CUBE_MIRRORED = createDefault(TextureMapping::cube, ModelTemplates.CUBE_MIRRORED_ALL);
+        COLUMN = createDefault(TextureMapping::column, ModelTemplates.CUBE_COLUMN);
+        COLUMN_HORIZONTAL = createDefault(TextureMapping::column, ModelTemplates.CUBE_COLUMN_HORIZONTAL);
+        CUBE_TOP_BOTTOM = createDefault(TextureMapping::cubeBottomTop, ModelTemplates.CUBE_BOTTOM_TOP);
+        CUBE_TOP = createDefault(TextureMapping::cubeTop, ModelTemplates.CUBE_TOP);
+        ORIENTABLE_ONLY_TOP = createDefault(TextureMapping::orientableCubeOnlyTop, ModelTemplates.CUBE_ORIENTABLE);
+        ORIENTABLE = createDefault(TextureMapping::orientableCube, ModelTemplates.CUBE_ORIENTABLE_TOP_BOTTOM);
+        CARPET = createDefault(TextureMapping::wool, ModelTemplates.CARPET);
+        GLAZED_TERRACOTTA = createDefault(TextureMapping::pattern, ModelTemplates.GLAZED_TERRACOTTA);
+        CORAL_FAN = createDefault(TextureMapping::fan, ModelTemplates.CORAL_FAN);
+        PARTICLE_ONLY = createDefault(TextureMapping::particle, ModelTemplates.PARTICLE_ONLY);
+        ANVIL = createDefault(TextureMapping::top, ModelTemplates.ANVIL);
+        LEAVES = createDefault(TextureMapping::cube, ModelTemplates.LEAVES);
+        LANTERN = createDefault(TextureMapping::lantern, ModelTemplates.LANTERN);
+        HANGING_LANTERN = createDefault(TextureMapping::lantern, ModelTemplates.HANGING_LANTERN);
+        SEAGRASS = createDefault(TextureMapping::defaultTexture, ModelTemplates.SEAGRASS);
+        COLUMN_ALT = createDefault(TextureMapping::logColumn, ModelTemplates.CUBE_COLUMN);
+        COLUMN_HORIZONTAL_ALT = createDefault(TextureMapping::logColumn, ModelTemplates.CUBE_COLUMN_HORIZONTAL);
+        TOP_BOTTOM_WITH_WALL = createDefault(TextureMapping::cubeBottomTopWithWall, ModelTemplates.CUBE_BOTTOM_TOP);
+        COLUMN_WITH_WALL = createDefault(TextureMapping::columnWithWall, ModelTemplates.CUBE_COLUMN);
+    }
+    
+    @FunctionalInterface
+    public interface Provider {
+        TexturedModel get(final Block bvr);
+        
+        default ResourceLocation create(final Block bvr, final BiConsumer<ResourceLocation, Supplier<JsonElement>> biConsumer) {
+            return this.get(bvr).create(bvr, biConsumer);
+        }
+        
+        default ResourceLocation createWithSuffix(final Block bvr, final String string, final BiConsumer<ResourceLocation, Supplier<JsonElement>> biConsumer) {
+            return this.get(bvr).createWithSuffix(bvr, string, biConsumer);
+        }
+        
+        default Provider updateTexture(final Consumer<TextureMapping> consumer) {
+            return bvr -> this.get(bvr).updateTextures(consumer);
+        }
+    }
+}
diff --git a/src/net/minecraft/data/recipes/RecipeProvider.java b/src/net/minecraft/data/recipes/RecipeProvider.java
index 3b4a937..d09aa75 100644
--- a/src/net/minecraft/data/recipes/RecipeProvider.java
+++ b/src/net/minecraft/data/recipes/RecipeProvider.java
@@ -3,11 +3,10 @@ package net.minecraft.data.recipes;
 import com.google.gson.GsonBuilder;
 import org.apache.logging.log4j.LogManager;
 import java.util.Set;
-import net.minecraft.tags.Tag;
 import net.minecraft.advancements.critereon.StatePropertiesPredicate;
 import net.minecraft.advancements.critereon.EnterBlockTrigger;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.item.Item;
+import net.minecraft.core.Registry;
 import net.minecraft.world.item.crafting.SimpleCookingSerializer;
 import net.minecraft.world.item.crafting.SimpleRecipeSerializer;
 import net.minecraft.world.item.crafting.RecipeSerializer;
@@ -15,10 +14,13 @@ import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.advancements.critereon.InventoryChangeTrigger;
 import net.minecraft.advancements.critereon.ItemPredicate;
 import net.minecraft.advancements.critereon.MinMaxBounds;
-import net.minecraft.tags.ItemTags;
-import net.minecraft.world.item.Items;
+import net.minecraft.advancements.critereon.EntityPredicate;
 import net.minecraft.advancements.CriterionTriggerInstance;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.world.level.block.Blocks;
 import java.util.function.Consumer;
 import java.io.BufferedWriter;
@@ -42,12 +44,12 @@ public class RecipeProvider implements DataProvider {
     private static final Gson GSON;
     private final DataGenerator generator;
     
-    public RecipeProvider(final DataGenerator gy) {
-        this.generator = gy;
+    public RecipeProvider(final DataGenerator hk) {
+        this.generator = hk;
     }
     
     @Override
-    public void run(final HashCache ha) throws IOException {
+    public void run(final HashCache hm) throws IOException {
         // 
         // This method could not be decompiled.
         // 
@@ -58,33 +60,30 @@ public class RecipeProvider implements DataProvider {
         //     7: astore_2        /* path3 */
         //     8: invokestatic    com/google/common/collect/Sets.newHashSet:()Ljava/util/HashSet;
         //    11: astore_3        /* set4 */
-        //    12: aload_0         /* this */
-        //    13: aload_0         /* this */
-        //    14: aload_3         /* set4 */
-        //    15: aload_1         /* ha */
-        //    16: aload_2         /* path3 */
-        //    17: invokedynamic   BootstrapMethod #0, accept:(Lnet/minecraft/data/recipes/RecipeProvider;Ljava/util/Set;Lnet/minecraft/data/HashCache;Ljava/nio/file/Path;)Ljava/util/function/Consumer;
-        //    22: invokespecial   net/minecraft/data/recipes/RecipeProvider.buildShapelessRecipes:(Ljava/util/function/Consumer;)V
-        //    25: aload_0         /* this */
-        //    26: aload_1         /* ha */
-        //    27: invokestatic    net/minecraft/advancements/Advancement$Builder.advancement:()Lnet/minecraft/advancements/Advancement$Builder;
-        //    30: ldc             "impossible"
-        //    32: new             Lnet/minecraft/advancements/critereon/ImpossibleTrigger$TriggerInstance;
-        //    35: dup            
-        //    36: invokespecial   net/minecraft/advancements/critereon/ImpossibleTrigger$TriggerInstance.<init>:()V
-        //    39: invokevirtual   net/minecraft/advancements/Advancement$Builder.addCriterion:(Ljava/lang/String;Lnet/minecraft/advancements/CriterionTriggerInstance;)Lnet/minecraft/advancements/Advancement$Builder;
-        //    42: invokevirtual   net/minecraft/advancements/Advancement$Builder.serializeToJson:()Lcom/google/gson/JsonObject;
-        //    45: aload_2         /* path3 */
-        //    46: ldc             "data/minecraft/advancements/recipes/root.json"
-        //    48: invokeinterface java/nio/file/Path.resolve:(Ljava/lang/String;)Ljava/nio/file/Path;
-        //    53: invokespecial   net/minecraft/data/recipes/RecipeProvider.saveAdvancement:(Lnet/minecraft/data/HashCache;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V
-        //    56: return         
+        //    12: aload_3         /* set4 */
+        //    13: aload_1         /* hm */
+        //    14: aload_2         /* path3 */
+        //    15: invokedynamic   BootstrapMethod #0, accept:(Ljava/util/Set;Lnet/minecraft/data/HashCache;Ljava/nio/file/Path;)Ljava/util/function/Consumer;
+        //    20: invokestatic    net/minecraft/data/recipes/RecipeProvider.buildShapelessRecipes:(Ljava/util/function/Consumer;)V
+        //    23: aload_1         /* hm */
+        //    24: invokestatic    net/minecraft/advancements/Advancement$Builder.advancement:()Lnet/minecraft/advancements/Advancement$Builder;
+        //    27: ldc             "impossible"
+        //    29: new             Lnet/minecraft/advancements/critereon/ImpossibleTrigger$TriggerInstance;
+        //    32: dup            
+        //    33: invokespecial   net/minecraft/advancements/critereon/ImpossibleTrigger$TriggerInstance.<init>:()V
+        //    36: invokevirtual   net/minecraft/advancements/Advancement$Builder.addCriterion:(Ljava/lang/String;Lnet/minecraft/advancements/CriterionTriggerInstance;)Lnet/minecraft/advancements/Advancement$Builder;
+        //    39: invokevirtual   net/minecraft/advancements/Advancement$Builder.serializeToJson:()Lcom/google/gson/JsonObject;
+        //    42: aload_2         /* path3 */
+        //    43: ldc             "data/minecraft/advancements/recipes/root.json"
+        //    45: invokeinterface java/nio/file/Path.resolve:(Ljava/lang/String;)Ljava/nio/file/Path;
+        //    50: invokestatic    net/minecraft/data/recipes/RecipeProvider.saveAdvancement:(Lnet/minecraft/data/HashCache;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V
+        //    53: return         
         //    Exceptions:
         //  throws java.io.IOException
         //    MethodParameters:
         //  Name  Flags  
         //  ----  -----
-        //  ha    
+        //  hm    
         // 
         // The error that occurred was:
         // 
@@ -122,624 +121,675 @@ public class RecipeProvider implements DataProvider {
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    private void saveRecipe(final HashCache ha, final JsonObject jsonObject, final Path path) {
+    private static void saveRecipe(final HashCache hm, final JsonObject jsonObject, final Path path) {
         try {
-            final String string5 = RecipeProvider.GSON.toJson(jsonObject);
-            final String string6 = RecipeProvider.SHA1.hashUnencodedChars(string5).toString();
-            if (!Objects.equals(ha.getHash(path), string6) || !Files.exists(path)) {
+            final String string4 = RecipeProvider.GSON.toJson(jsonObject);
+            final String string5 = RecipeProvider.SHA1.hashUnencodedChars(string4).toString();
+            if (!Objects.equals(hm.getHash(path), string5) || !Files.exists(path)) {
                 Files.createDirectories(path.getParent(), new FileAttribute[0]);
-                try (final BufferedWriter bufferedWriter7 = Files.newBufferedWriter(path)) {
-                    bufferedWriter7.write(string5);
+                try (final BufferedWriter bufferedWriter6 = Files.newBufferedWriter(path)) {
+                    bufferedWriter6.write(string4);
                 }
             }
-            ha.putNew(path, string6);
+            hm.putNew(path, string5);
         }
-        catch (IOException iOException5) {
-            RecipeProvider.LOGGER.error("Couldn't save recipe {}", path, iOException5);
+        catch (IOException iOException4) {
+            RecipeProvider.LOGGER.error("Couldn't save recipe {}", path, iOException4);
         }
     }
     
-    private void saveAdvancement(final HashCache ha, final JsonObject jsonObject, final Path path) {
+    private static void saveAdvancement(final HashCache hm, final JsonObject jsonObject, final Path path) {
         try {
-            final String string5 = RecipeProvider.GSON.toJson(jsonObject);
-            final String string6 = RecipeProvider.SHA1.hashUnencodedChars(string5).toString();
-            if (!Objects.equals(ha.getHash(path), string6) || !Files.exists(path)) {
+            final String string4 = RecipeProvider.GSON.toJson(jsonObject);
+            final String string5 = RecipeProvider.SHA1.hashUnencodedChars(string4).toString();
+            if (!Objects.equals(hm.getHash(path), string5) || !Files.exists(path)) {
                 Files.createDirectories(path.getParent(), new FileAttribute[0]);
-                try (final BufferedWriter bufferedWriter7 = Files.newBufferedWriter(path)) {
-                    bufferedWriter7.write(string5);
+                try (final BufferedWriter bufferedWriter6 = Files.newBufferedWriter(path)) {
+                    bufferedWriter6.write(string4);
                 }
             }
-            ha.putNew(path, string6);
+            hm.putNew(path, string5);
         }
-        catch (IOException iOException5) {
-            RecipeProvider.LOGGER.error("Couldn't save recipe advancement {}", path, iOException5);
+        catch (IOException iOException4) {
+            RecipeProvider.LOGGER.error("Couldn't save recipe advancement {}", path, iOException4);
         }
     }
     
-    private void buildShapelessRecipes(final Consumer<FinishedRecipe> consumer) {
-        ShapedRecipeBuilder.shaped(Blocks.ACACIA_WOOD, 3).define('#', Blocks.ACACIA_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.ACACIA_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STRIPPED_ACACIA_WOOD, 3).define('#', Blocks.STRIPPED_ACACIA_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.STRIPPED_ACACIA_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.ACACIA_BOAT).define('#', Blocks.ACACIA_PLANKS).pattern("# #").pattern("###").group("boat").unlocks("in_water", this.insideOf(Blocks.WATER)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.ACACIA_BUTTON).requires(Blocks.ACACIA_PLANKS).group("wooden_button").unlocks("has_planks", this.has(Blocks.ACACIA_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ACACIA_DOOR, 3).define('#', Blocks.ACACIA_PLANKS).pattern("##").pattern("##").pattern("##").group("wooden_door").unlocks("has_planks", this.has(Blocks.ACACIA_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ACACIA_FENCE, 3).define('#', Items.STICK).define('W', Blocks.ACACIA_PLANKS).pattern("W#W").pattern("W#W").group("wooden_fence").unlocks("has_planks", this.has(Blocks.ACACIA_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ACACIA_FENCE_GATE).define('#', Items.STICK).define('W', Blocks.ACACIA_PLANKS).pattern("#W#").pattern("#W#").group("wooden_fence_gate").unlocks("has_planks", this.has(Blocks.ACACIA_PLANKS)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.ACACIA_PLANKS, 4).requires(ItemTags.ACACIA_LOGS).group("planks").unlocks("has_logs", this.has(ItemTags.ACACIA_LOGS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ACACIA_PRESSURE_PLATE).define('#', Blocks.ACACIA_PLANKS).pattern("##").group("wooden_pressure_plate").unlocks("has_planks", this.has(Blocks.ACACIA_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ACACIA_SLAB, 6).define('#', Blocks.ACACIA_PLANKS).pattern("###").group("wooden_slab").unlocks("has_planks", this.has(Blocks.ACACIA_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ACACIA_STAIRS, 4).define('#', Blocks.ACACIA_PLANKS).pattern("#  ").pattern("## ").pattern("###").group("wooden_stairs").unlocks("has_planks", this.has(Blocks.ACACIA_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ACACIA_TRAPDOOR, 2).define('#', Blocks.ACACIA_PLANKS).pattern("###").pattern("###").group("wooden_trapdoor").unlocks("has_planks", this.has(Blocks.ACACIA_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ACTIVATOR_RAIL, 6).define('#', Blocks.REDSTONE_TORCH).define('S', Items.STICK).define('X', Items.IRON_INGOT).pattern("XSX").pattern("X#X").pattern("XSX").unlocks("has_rail", this.has(Blocks.RAIL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.ANDESITE, 2).requires(Blocks.DIORITE).requires(Blocks.COBBLESTONE).unlocks("has_stone", this.has(Blocks.DIORITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ANVIL).define('I', Blocks.IRON_BLOCK).define('i', Items.IRON_INGOT).pattern("III").pattern(" i ").pattern("iii").unlocks("has_iron_block", this.has(Blocks.IRON_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.ARMOR_STAND).define('/', Items.STICK).define('_', Blocks.SMOOTH_STONE_SLAB).pattern("///").pattern(" / ").pattern("/_/").unlocks("has_stone_slab", this.has(Blocks.SMOOTH_STONE_SLAB)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.ARROW, 4).define('#', Items.STICK).define('X', Items.FLINT).define('Y', Items.FEATHER).pattern("X").pattern("#").pattern("Y").unlocks("has_feather", this.has(Items.FEATHER)).unlocks("has_flint", this.has(Items.FLINT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BARREL, 1).define('P', ItemTags.PLANKS).define('S', ItemTags.WOODEN_SLABS).pattern("PSP").pattern("P P").pattern("PSP").unlocks("has_planks", this.has(ItemTags.PLANKS)).unlocks("has_wood_slab", this.has(ItemTags.WOODEN_SLABS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BEACON).define('S', Items.NETHER_STAR).define('G', Blocks.GLASS).define('O', Blocks.OBSIDIAN).pattern("GGG").pattern("GSG").pattern("OOO").unlocks("has_nether_star", this.has(Items.NETHER_STAR)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BEEHIVE).define('P', ItemTags.PLANKS).define('H', Items.HONEYCOMB).pattern("PPP").pattern("HHH").pattern("PPP").unlocks("has_honeycomb", this.has(Items.HONEYCOMB)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BEETROOT_SOUP).requires(Items.BOWL).requires(Items.BEETROOT, 6).unlocks("has_beetroot", this.has(Items.BEETROOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BIRCH_WOOD, 3).define('#', Blocks.BIRCH_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.BIRCH_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STRIPPED_BIRCH_WOOD, 3).define('#', Blocks.STRIPPED_BIRCH_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.STRIPPED_BIRCH_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BIRCH_BOAT).define('#', Blocks.BIRCH_PLANKS).pattern("# #").pattern("###").group("boat").unlocks("in_water", this.insideOf(Blocks.WATER)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.BIRCH_BUTTON).requires(Blocks.BIRCH_PLANKS).group("wooden_button").unlocks("has_planks", this.has(Blocks.BIRCH_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BIRCH_DOOR, 3).define('#', Blocks.BIRCH_PLANKS).pattern("##").pattern("##").pattern("##").group("wooden_door").unlocks("has_planks", this.has(Blocks.BIRCH_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BIRCH_FENCE, 3).define('#', Items.STICK).define('W', Blocks.BIRCH_PLANKS).pattern("W#W").pattern("W#W").group("wooden_fence").unlocks("has_planks", this.has(Blocks.BIRCH_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BIRCH_FENCE_GATE).define('#', Items.STICK).define('W', Blocks.BIRCH_PLANKS).pattern("#W#").pattern("#W#").group("wooden_fence_gate").unlocks("has_planks", this.has(Blocks.BIRCH_PLANKS)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.BIRCH_PLANKS, 4).requires(ItemTags.BIRCH_LOGS).group("planks").unlocks("has_log", this.has(ItemTags.BIRCH_LOGS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BIRCH_PRESSURE_PLATE).define('#', Blocks.BIRCH_PLANKS).pattern("##").group("wooden_pressure_plate").unlocks("has_planks", this.has(Blocks.BIRCH_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BIRCH_SLAB, 6).define('#', Blocks.BIRCH_PLANKS).pattern("###").group("wooden_slab").unlocks("has_planks", this.has(Blocks.BIRCH_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BIRCH_STAIRS, 4).define('#', Blocks.BIRCH_PLANKS).pattern("#  ").pattern("## ").pattern("###").group("wooden_stairs").unlocks("has_planks", this.has(Blocks.BIRCH_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BIRCH_TRAPDOOR, 2).define('#', Blocks.BIRCH_PLANKS).pattern("###").pattern("###").group("wooden_trapdoor").unlocks("has_planks", this.has(Blocks.BIRCH_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BLACK_BANNER).define('#', Blocks.BLACK_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_black_wool", this.has(Blocks.BLACK_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BLACK_BED).define('#', Blocks.BLACK_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_black_wool", this.has(Blocks.BLACK_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BLACK_BED).requires(Items.WHITE_BED).requires(Items.BLACK_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "black_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.BLACK_CARPET, 3).define('#', Blocks.BLACK_WOOL).pattern("##").group("carpet").unlocks("has_black_wool", this.has(Blocks.BLACK_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BLACK_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.BLACK_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_black_dye", this.has(Items.BLACK_DYE)).save(consumer, "black_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.BLACK_CONCRETE_POWDER, 8).requires(Items.BLACK_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BLACK_DYE).requires(Items.INK_SAC).group("black_dye").unlocks("has_ink_sac", this.has(Items.INK_SAC)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BLACK_DYE).requires(Blocks.WITHER_ROSE).group("black_dye").unlocks("has_black_flower", this.has(Blocks.WITHER_ROSE)).save(consumer, "black_dye_from_wither_rose");
-        ShapedRecipeBuilder.shaped(Blocks.BLACK_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.BLACK_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BLACK_STAINED_GLASS_PANE, 16).define('#', Blocks.BLACK_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BLACK_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.BLACK_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_black_dye", this.has(Items.BLACK_DYE)).save(consumer, "black_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.BLACK_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.BLACK_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.BLACK_WOOL).requires(Items.BLACK_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BLAZE_POWDER, 2).requires(Items.BLAZE_ROD).unlocks("has_blaze_rod", this.has(Items.BLAZE_ROD)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BLUE_BANNER).define('#', Blocks.BLUE_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_blue_wool", this.has(Blocks.BLUE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BLUE_BED).define('#', Blocks.BLUE_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_blue_wool", this.has(Blocks.BLUE_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BLUE_BED).requires(Items.WHITE_BED).requires(Items.BLUE_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "blue_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.BLUE_CARPET, 3).define('#', Blocks.BLUE_WOOL).pattern("##").group("carpet").unlocks("has_blue_wool", this.has(Blocks.BLUE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BLUE_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.BLUE_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_blue_dye", this.has(Items.BLUE_DYE)).save(consumer, "blue_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.BLUE_CONCRETE_POWDER, 8).requires(Items.BLUE_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BLUE_DYE).requires(Items.LAPIS_LAZULI).group("blue_dye").unlocks("has_lapis_lazuli", this.has(Items.LAPIS_LAZULI)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BLUE_DYE).requires(Blocks.CORNFLOWER).group("blue_dye").unlocks("has_blue_flower", this.has(Blocks.CORNFLOWER)).save(consumer, "blue_dye_from_cornflower");
-        ShapedRecipeBuilder.shaped(Blocks.BLUE_ICE).define('#', Blocks.PACKED_ICE).pattern("###").pattern("###").pattern("###").unlocks("has_packed_ice", this.has(Blocks.PACKED_ICE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BLUE_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.BLUE_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BLUE_STAINED_GLASS_PANE, 16).define('#', Blocks.BLUE_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BLUE_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.BLUE_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_blue_dye", this.has(Items.BLUE_DYE)).save(consumer, "blue_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.BLUE_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.BLUE_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.BLUE_WOOL).requires(Items.BLUE_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.OAK_BOAT).define('#', Blocks.OAK_PLANKS).pattern("# #").pattern("###").group("boat").unlocks("in_water", this.insideOf(Blocks.WATER)).save(consumer);
-        final Item bei3 = Items.BONE_MEAL;
-        ShapedRecipeBuilder.shaped(Blocks.BONE_BLOCK).define('X', Items.BONE_MEAL).pattern("XXX").pattern("XXX").pattern("XXX").unlocks("has_bonemeal", this.has(bei3)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BONE_MEAL, 3).requires(Items.BONE).group("bonemeal").unlocks("has_bone", this.has(Items.BONE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BONE_MEAL, 9).requires(Blocks.BONE_BLOCK).group("bonemeal").unlocks("has_bone_block", this.has(Blocks.BONE_BLOCK)).save(consumer, "bone_meal_from_bone_block");
-        ShapelessRecipeBuilder.shapeless(Items.BOOK).requires(Items.PAPER, 3).requires(Items.LEATHER).unlocks("has_paper", this.has(Items.PAPER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BOOKSHELF).define('#', ItemTags.PLANKS).define('X', Items.BOOK).pattern("###").pattern("XXX").pattern("###").unlocks("has_book", this.has(Items.BOOK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BOW).define('#', Items.STICK).define('X', Items.STRING).pattern(" #X").pattern("# X").pattern(" #X").unlocks("has_string", this.has(Items.STRING)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BOWL, 4).define('#', ItemTags.PLANKS).pattern("# #").pattern(" # ").unlocks("has_brown_mushroom", this.has(Blocks.BROWN_MUSHROOM)).unlocks("has_red_mushroom", this.has(Blocks.RED_MUSHROOM)).unlocks("has_mushroom_stew", this.has(Items.MUSHROOM_STEW)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BREAD).define('#', Items.WHEAT).pattern("###").unlocks("has_wheat", this.has(Items.WHEAT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BREWING_STAND).define('B', Items.BLAZE_ROD).define('#', Blocks.COBBLESTONE).pattern(" B ").pattern("###").unlocks("has_blaze_rod", this.has(Items.BLAZE_ROD)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BRICKS).define('#', Items.BRICK).pattern("##").pattern("##").unlocks("has_brick", this.has(Items.BRICK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BRICK_SLAB, 6).define('#', Blocks.BRICKS).pattern("###").unlocks("has_brick_block", this.has(Blocks.BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BRICK_STAIRS, 4).define('#', Blocks.BRICKS).pattern("#  ").pattern("## ").pattern("###").unlocks("has_brick_block", this.has(Blocks.BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BROWN_BANNER).define('#', Blocks.BROWN_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_brown_wool", this.has(Blocks.BROWN_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BROWN_BED).define('#', Blocks.BROWN_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_brown_wool", this.has(Blocks.BROWN_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BROWN_BED).requires(Items.WHITE_BED).requires(Items.BROWN_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "brown_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.BROWN_CARPET, 3).define('#', Blocks.BROWN_WOOL).pattern("##").group("carpet").unlocks("has_brown_wool", this.has(Blocks.BROWN_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BROWN_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.BROWN_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_brown_dye", this.has(Items.BROWN_DYE)).save(consumer, "brown_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.BROWN_CONCRETE_POWDER, 8).requires(Items.BROWN_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.BROWN_DYE).requires(Items.COCOA_BEANS).group("brown_dye").unlocks("has_cocoa_beans", this.has(Items.COCOA_BEANS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BROWN_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.BROWN_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BROWN_STAINED_GLASS_PANE, 16).define('#', Blocks.BROWN_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BROWN_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.BROWN_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_brown_dye", this.has(Items.BROWN_DYE)).save(consumer, "brown_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.BROWN_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.BROWN_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.BROWN_WOOL).requires(Items.BROWN_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BUCKET).define('#', Items.IRON_INGOT).pattern("# #").pattern(" # ").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CAKE).define('A', Items.MILK_BUCKET).define('B', Items.SUGAR).define('C', Items.WHEAT).define('E', Items.EGG).pattern("AAA").pattern("BEB").pattern("CCC").unlocks("has_egg", this.has(Items.EGG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CAMPFIRE).define('L', ItemTags.LOGS).define('S', Items.STICK).define('C', ItemTags.COALS).pattern(" S ").pattern("SCS").pattern("LLL").unlocks("has_stick", this.has(Items.STICK)).unlocks("has_coal", this.has(ItemTags.COALS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.CARROT_ON_A_STICK).define('#', Items.FISHING_ROD).define('X', Items.CARROT).pattern("# ").pattern(" X").unlocks("has_carrot", this.has(Items.CARROT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CAULDRON).define('#', Items.IRON_INGOT).pattern("# #").pattern("# #").pattern("###").unlocks("has_water_bucket", this.has(Items.WATER_BUCKET)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.COMPOSTER).define('#', ItemTags.WOODEN_SLABS).pattern("# #").pattern("# #").pattern("###").unlocks("has_wood_slab", this.has(ItemTags.WOODEN_SLABS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CHEST).define('#', ItemTags.PLANKS).pattern("###").pattern("# #").pattern("###").unlocks("has_lots_of_items", new InventoryChangeTrigger.TriggerInstance(MinMaxBounds.Ints.atLeast(10), MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, new ItemPredicate[0])).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.CHEST_MINECART).define('A', Blocks.CHEST).define('B', Items.MINECART).pattern("A").pattern("B").unlocks("has_minecart", this.has(Items.MINECART)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CHISELED_QUARTZ_BLOCK).define('#', Blocks.QUARTZ_SLAB).pattern("#").pattern("#").unlocks("has_chiseled_quartz_block", this.has(Blocks.CHISELED_QUARTZ_BLOCK)).unlocks("has_quartz_block", this.has(Blocks.QUARTZ_BLOCK)).unlocks("has_quartz_pillar", this.has(Blocks.QUARTZ_PILLAR)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CHISELED_STONE_BRICKS).define('#', Blocks.STONE_BRICK_SLAB).pattern("#").pattern("#").unlocks("has_stone_bricks", this.has(ItemTags.STONE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CLAY).define('#', Items.CLAY_BALL).pattern("##").pattern("##").unlocks("has_clay_ball", this.has(Items.CLAY_BALL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.CLOCK).define('#', Items.GOLD_INGOT).define('X', Items.REDSTONE).pattern(" # ").pattern("#X#").pattern(" # ").unlocks("has_redstone", this.has(Items.REDSTONE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.COAL, 9).requires(Blocks.COAL_BLOCK).unlocks("has_coal_block", this.has(Blocks.COAL_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.COAL_BLOCK).define('#', Items.COAL).pattern("###").pattern("###").pattern("###").unlocks("has_coal", this.has(Items.COAL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.COARSE_DIRT, 4).define('D', Blocks.DIRT).define('G', Blocks.GRAVEL).pattern("DG").pattern("GD").unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.COBBLESTONE_SLAB, 6).define('#', Blocks.COBBLESTONE).pattern("###").unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.COBBLESTONE_WALL, 6).define('#', Blocks.COBBLESTONE).pattern("###").pattern("###").unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.COMPARATOR).define('#', Blocks.REDSTONE_TORCH).define('X', Items.QUARTZ).define('I', Blocks.STONE).pattern(" # ").pattern("#X#").pattern("III").unlocks("has_quartz", this.has(Items.QUARTZ)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.COMPASS).define('#', Items.IRON_INGOT).define('X', Items.REDSTONE).pattern(" # ").pattern("#X#").pattern(" # ").unlocks("has_redstone", this.has(Items.REDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.COOKIE, 8).define('#', Items.WHEAT).define('X', Items.COCOA_BEANS).pattern("#X#").unlocks("has_cocoa", this.has(Items.COCOA_BEANS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CRAFTING_TABLE).define('#', ItemTags.PLANKS).pattern("##").pattern("##").unlocks("has_planks", this.has(ItemTags.PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.CROSSBOW).define('~', Items.STRING).define('#', Items.STICK).define('&', Items.IRON_INGOT).define('$', Blocks.TRIPWIRE_HOOK).pattern("#&#").pattern("~$~").pattern(" # ").unlocks("has_string", this.has(Items.STRING)).unlocks("has_stick", this.has(Items.STICK)).unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).unlocks("has_tripwire_hook", this.has(Blocks.TRIPWIRE_HOOK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LOOM).define('#', ItemTags.PLANKS).define('@', Items.STRING).pattern("@@").pattern("##").unlocks("has_string", this.has(Items.STRING)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CHISELED_RED_SANDSTONE).define('#', Blocks.RED_SANDSTONE_SLAB).pattern("#").pattern("#").unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).unlocks("has_chiseled_red_sandstone", this.has(Blocks.CHISELED_RED_SANDSTONE)).unlocks("has_cut_red_sandstone", this.has(Blocks.CUT_RED_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CHISELED_SANDSTONE).define('#', Blocks.SANDSTONE_SLAB).pattern("#").pattern("#").unlocks("has_stone_slab", this.has(Blocks.SANDSTONE_SLAB)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.CYAN_BANNER).define('#', Blocks.CYAN_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_cyan_wool", this.has(Blocks.CYAN_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.CYAN_BED).define('#', Blocks.CYAN_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_cyan_wool", this.has(Blocks.CYAN_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.CYAN_BED).requires(Items.WHITE_BED).requires(Items.CYAN_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "cyan_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.CYAN_CARPET, 3).define('#', Blocks.CYAN_WOOL).pattern("##").group("carpet").unlocks("has_cyan_wool", this.has(Blocks.CYAN_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CYAN_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.CYAN_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_cyan_dye", this.has(Items.CYAN_DYE)).save(consumer, "cyan_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.CYAN_CONCRETE_POWDER, 8).requires(Items.CYAN_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.CYAN_DYE, 2).requires(Items.BLUE_DYE).requires(Items.GREEN_DYE).unlocks("has_green_dye", this.has(Items.GREEN_DYE)).unlocks("has_blue_dye", this.has(Items.BLUE_DYE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CYAN_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.CYAN_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CYAN_STAINED_GLASS_PANE, 16).define('#', Blocks.CYAN_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CYAN_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.CYAN_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_cyan_dye", this.has(Items.CYAN_DYE)).save(consumer, "cyan_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.CYAN_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.CYAN_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.CYAN_WOOL).requires(Items.CYAN_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_OAK_WOOD, 3).define('#', Blocks.DARK_OAK_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.DARK_OAK_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STRIPPED_DARK_OAK_WOOD, 3).define('#', Blocks.STRIPPED_DARK_OAK_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.STRIPPED_DARK_OAK_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DARK_OAK_BOAT).define('#', Blocks.DARK_OAK_PLANKS).pattern("# #").pattern("###").group("boat").unlocks("in_water", this.insideOf(Blocks.WATER)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.DARK_OAK_BUTTON).requires(Blocks.DARK_OAK_PLANKS).group("wooden_button").unlocks("has_planks", this.has(Blocks.DARK_OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_OAK_DOOR, 3).define('#', Blocks.DARK_OAK_PLANKS).pattern("##").pattern("##").pattern("##").group("wooden_door").unlocks("has_planks", this.has(Blocks.DARK_OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_OAK_FENCE, 3).define('#', Items.STICK).define('W', Blocks.DARK_OAK_PLANKS).pattern("W#W").pattern("W#W").group("wooden_fence").unlocks("has_planks", this.has(Blocks.DARK_OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_OAK_FENCE_GATE).define('#', Items.STICK).define('W', Blocks.DARK_OAK_PLANKS).pattern("#W#").pattern("#W#").group("wooden_fence_gate").unlocks("has_planks", this.has(Blocks.DARK_OAK_PLANKS)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.DARK_OAK_PLANKS, 4).requires(ItemTags.DARK_OAK_LOGS).group("planks").unlocks("has_logs", this.has(ItemTags.DARK_OAK_LOGS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_OAK_PRESSURE_PLATE).define('#', Blocks.DARK_OAK_PLANKS).pattern("##").group("wooden_pressure_plate").unlocks("has_planks", this.has(Blocks.DARK_OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_OAK_SLAB, 6).define('#', Blocks.DARK_OAK_PLANKS).pattern("###").group("wooden_slab").unlocks("has_planks", this.has(Blocks.DARK_OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_OAK_STAIRS, 4).define('#', Blocks.DARK_OAK_PLANKS).pattern("#  ").pattern("## ").pattern("###").group("wooden_stairs").unlocks("has_planks", this.has(Blocks.DARK_OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_OAK_TRAPDOOR, 2).define('#', Blocks.DARK_OAK_PLANKS).pattern("###").pattern("###").group("wooden_trapdoor").unlocks("has_planks", this.has(Blocks.DARK_OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_PRISMARINE).define('S', Items.PRISMARINE_SHARD).define('I', Items.BLACK_DYE).pattern("SSS").pattern("SIS").pattern("SSS").unlocks("has_prismarine_shard", this.has(Items.PRISMARINE_SHARD)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_STAIRS, 4).define('#', Blocks.PRISMARINE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_prismarine", this.has(Blocks.PRISMARINE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_BRICK_STAIRS, 4).define('#', Blocks.PRISMARINE_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlocks("has_prismarine_bricks", this.has(Blocks.PRISMARINE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_PRISMARINE_STAIRS, 4).define('#', Blocks.DARK_PRISMARINE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_dark_prismarine", this.has(Blocks.DARK_PRISMARINE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DAYLIGHT_DETECTOR).define('Q', Items.QUARTZ).define('G', Blocks.GLASS).define('W', Ingredient.of(ItemTags.WOODEN_SLABS)).pattern("GGG").pattern("QQQ").pattern("WWW").unlocks("has_quartz", this.has(Items.QUARTZ)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DETECTOR_RAIL, 6).define('R', Items.REDSTONE).define('#', Blocks.STONE_PRESSURE_PLATE).define('X', Items.IRON_INGOT).pattern("X X").pattern("X#X").pattern("XRX").unlocks("has_rail", this.has(Blocks.RAIL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.DIAMOND, 9).requires(Blocks.DIAMOND_BLOCK).unlocks("has_diamond_block", this.has(Blocks.DIAMOND_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DIAMOND_AXE).define('#', Items.STICK).define('X', Items.DIAMOND).pattern("XX").pattern("X#").pattern(" #").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DIAMOND_BLOCK).define('#', Items.DIAMOND).pattern("###").pattern("###").pattern("###").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DIAMOND_BOOTS).define('X', Items.DIAMOND).pattern("X X").pattern("X X").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DIAMOND_CHESTPLATE).define('X', Items.DIAMOND).pattern("X X").pattern("XXX").pattern("XXX").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DIAMOND_HELMET).define('X', Items.DIAMOND).pattern("XXX").pattern("X X").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DIAMOND_HOE).define('#', Items.STICK).define('X', Items.DIAMOND).pattern("XX").pattern(" #").pattern(" #").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DIAMOND_LEGGINGS).define('X', Items.DIAMOND).pattern("XXX").pattern("X X").pattern("X X").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DIAMOND_PICKAXE).define('#', Items.STICK).define('X', Items.DIAMOND).pattern("XXX").pattern(" # ").pattern(" # ").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DIAMOND_SHOVEL).define('#', Items.STICK).define('X', Items.DIAMOND).pattern("X").pattern("#").pattern("#").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DIAMOND_SWORD).define('#', Items.STICK).define('X', Items.DIAMOND).pattern("X").pattern("X").pattern("#").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DIORITE, 2).define('Q', Items.QUARTZ).define('C', Blocks.COBBLESTONE).pattern("CQ").pattern("QC").unlocks("has_quartz", this.has(Items.QUARTZ)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DISPENSER).define('R', Items.REDSTONE).define('#', Blocks.COBBLESTONE).define('X', Items.BOW).pattern("###").pattern("#X#").pattern("#R#").unlocks("has_bow", this.has(Items.BOW)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DROPPER).define('R', Items.REDSTONE).define('#', Blocks.COBBLESTONE).pattern("###").pattern("# #").pattern("#R#").unlocks("has_redstone", this.has(Items.REDSTONE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.EMERALD, 9).requires(Blocks.EMERALD_BLOCK).unlocks("has_emerald_block", this.has(Blocks.EMERALD_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.EMERALD_BLOCK).define('#', Items.EMERALD).pattern("###").pattern("###").pattern("###").unlocks("has_emerald", this.has(Items.EMERALD)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ENCHANTING_TABLE).define('B', Items.BOOK).define('#', Blocks.OBSIDIAN).define('D', Items.DIAMOND).pattern(" B ").pattern("D#D").pattern("###").unlocks("has_obsidian", this.has(Blocks.OBSIDIAN)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ENDER_CHEST).define('#', Blocks.OBSIDIAN).define('E', Items.ENDER_EYE).pattern("###").pattern("#E#").pattern("###").unlocks("has_ender_eye", this.has(Items.ENDER_EYE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.ENDER_EYE).requires(Items.ENDER_PEARL).requires(Items.BLAZE_POWDER).unlocks("has_blaze_powder", this.has(Items.BLAZE_POWDER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.END_STONE_BRICKS, 4).define('#', Blocks.END_STONE).pattern("##").pattern("##").unlocks("has_end_stone", this.has(Blocks.END_STONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.END_CRYSTAL).define('T', Items.GHAST_TEAR).define('E', Items.ENDER_EYE).define('G', Blocks.GLASS).pattern("GGG").pattern("GEG").pattern("GTG").unlocks("has_ender_eye", this.has(Items.ENDER_EYE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.END_ROD, 4).define('#', Items.POPPED_CHORUS_FRUIT).define('/', Items.BLAZE_ROD).pattern("/").pattern("#").unlocks("has_chorus_fruit_popped", this.has(Items.POPPED_CHORUS_FRUIT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.OAK_FENCE, 3).define('#', Items.STICK).define('W', Blocks.OAK_PLANKS).pattern("W#W").pattern("W#W").group("wooden_fence").unlocks("has_planks", this.has(Blocks.OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.OAK_FENCE_GATE).define('#', Items.STICK).define('W', Blocks.OAK_PLANKS).pattern("#W#").pattern("#W#").group("wooden_fence_gate").unlocks("has_planks", this.has(Blocks.OAK_PLANKS)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.FERMENTED_SPIDER_EYE).requires(Items.SPIDER_EYE).requires(Blocks.BROWN_MUSHROOM).requires(Items.SUGAR).unlocks("has_spider_eye", this.has(Items.SPIDER_EYE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.FIRE_CHARGE, 3).requires(Items.GUNPOWDER).requires(Items.BLAZE_POWDER).requires(Ingredient.of(Items.COAL, Items.CHARCOAL)).unlocks("has_blaze_powder", this.has(Items.BLAZE_POWDER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.FISHING_ROD).define('#', Items.STICK).define('X', Items.STRING).pattern("  #").pattern(" #X").pattern("# X").unlocks("has_string", this.has(Items.STRING)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.FLINT_AND_STEEL).requires(Items.IRON_INGOT).requires(Items.FLINT).unlocks("has_flint", this.has(Items.FLINT)).unlocks("has_obsidian", this.has(Blocks.OBSIDIAN)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.FLOWER_POT).define('#', Items.BRICK).pattern("# #").pattern(" # ").unlocks("has_brick", this.has(Items.BRICK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.FURNACE).define('#', Blocks.COBBLESTONE).pattern("###").pattern("# #").pattern("###").unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.FURNACE_MINECART).define('A', Blocks.FURNACE).define('B', Items.MINECART).pattern("A").pattern("B").unlocks("has_minecart", this.has(Items.MINECART)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GLASS_BOTTLE, 3).define('#', Blocks.GLASS).pattern("# #").pattern(" # ").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GLASS_PANE, 16).define('#', Blocks.GLASS).pattern("###").pattern("###").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GLOWSTONE).define('#', Items.GLOWSTONE_DUST).pattern("##").pattern("##").unlocks("has_glowstone_dust", this.has(Items.GLOWSTONE_DUST)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_APPLE).define('#', Items.GOLD_INGOT).define('X', Items.APPLE).pattern("###").pattern("#X#").pattern("###").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_AXE).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("XX").pattern("X#").pattern(" #").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_BOOTS).define('X', Items.GOLD_INGOT).pattern("X X").pattern("X X").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_CARROT).define('#', Items.GOLD_NUGGET).define('X', Items.CARROT).pattern("###").pattern("#X#").pattern("###").unlocks("has_gold_nugget", this.has(Items.GOLD_NUGGET)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_CHESTPLATE).define('X', Items.GOLD_INGOT).pattern("X X").pattern("XXX").pattern("XXX").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_HELMET).define('X', Items.GOLD_INGOT).pattern("XXX").pattern("X X").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_HOE).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("XX").pattern(" #").pattern(" #").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_LEGGINGS).define('X', Items.GOLD_INGOT).pattern("XXX").pattern("X X").pattern("X X").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_PICKAXE).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("XXX").pattern(" # ").pattern(" # ").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.POWERED_RAIL, 6).define('R', Items.REDSTONE).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("X X").pattern("X#X").pattern("XRX").unlocks("has_rail", this.has(Blocks.RAIL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_SHOVEL).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("X").pattern("#").pattern("#").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GOLDEN_SWORD).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("X").pattern("X").pattern("#").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GOLD_BLOCK).define('#', Items.GOLD_INGOT).pattern("###").pattern("###").pattern("###").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.GOLD_INGOT, 9).requires(Blocks.GOLD_BLOCK).group("gold_ingot").unlocks("has_gold_block", this.has(Blocks.GOLD_BLOCK)).save(consumer, "gold_ingot_from_gold_block");
-        ShapedRecipeBuilder.shaped(Items.GOLD_INGOT).define('#', Items.GOLD_NUGGET).pattern("###").pattern("###").pattern("###").group("gold_ingot").unlocks("has_gold_nugget", this.has(Items.GOLD_NUGGET)).save(consumer, "gold_ingot_from_nuggets");
-        ShapelessRecipeBuilder.shapeless(Items.GOLD_NUGGET, 9).requires(Items.GOLD_INGOT).unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.GRANITE).requires(Blocks.DIORITE).requires(Items.QUARTZ).unlocks("has_quartz", this.has(Items.QUARTZ)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GRAY_BANNER).define('#', Blocks.GRAY_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_gray_wool", this.has(Blocks.GRAY_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GRAY_BED).define('#', Blocks.GRAY_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_gray_wool", this.has(Blocks.GRAY_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.GRAY_BED).requires(Items.WHITE_BED).requires(Items.GRAY_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "gray_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.GRAY_CARPET, 3).define('#', Blocks.GRAY_WOOL).pattern("##").group("carpet").unlocks("has_gray_wool", this.has(Blocks.GRAY_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GRAY_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.GRAY_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_gray_dye", this.has(Items.GRAY_DYE)).save(consumer, "gray_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.GRAY_CONCRETE_POWDER, 8).requires(Items.GRAY_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.GRAY_DYE, 2).requires(Items.BLACK_DYE).requires(Items.WHITE_DYE).unlocks("has_white_dye", this.has(Items.WHITE_DYE)).unlocks("has_black_dye", this.has(Items.BLACK_DYE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GRAY_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.GRAY_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GRAY_STAINED_GLASS_PANE, 16).define('#', Blocks.GRAY_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GRAY_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.GRAY_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_gray_dye", this.has(Items.GRAY_DYE)).save(consumer, "gray_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.GRAY_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.GRAY_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.GRAY_WOOL).requires(Items.GRAY_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GREEN_BANNER).define('#', Blocks.GREEN_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_green_wool", this.has(Blocks.GREEN_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GREEN_BED).define('#', Blocks.GREEN_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_green_wool", this.has(Blocks.GREEN_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.GREEN_BED).requires(Items.WHITE_BED).requires(Items.GREEN_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "green_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.GREEN_CARPET, 3).define('#', Blocks.GREEN_WOOL).pattern("##").group("carpet").unlocks("has_green_wool", this.has(Blocks.GREEN_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GREEN_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.GREEN_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_green_dye", this.has(Items.GREEN_DYE)).save(consumer, "green_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.GREEN_CONCRETE_POWDER, 8).requires(Items.GREEN_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GREEN_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.GREEN_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GREEN_STAINED_GLASS_PANE, 16).define('#', Blocks.GREEN_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GREEN_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.GREEN_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_green_dye", this.has(Items.GREEN_DYE)).save(consumer, "green_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.GREEN_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.GREEN_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.GREEN_WOOL).requires(Items.GREEN_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.HAY_BLOCK).define('#', Items.WHEAT).pattern("###").pattern("###").pattern("###").unlocks("has_wheat", this.has(Items.WHEAT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE).define('#', Items.IRON_INGOT).pattern("##").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.HONEY_BOTTLE, 4).requires(Items.HONEY_BLOCK).requires(Items.GLASS_BOTTLE, 4).unlocks("has_honey_block", this.has(Blocks.HONEY_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.HONEY_BLOCK, 1).define('S', Items.HONEY_BOTTLE).pattern("SS").pattern("SS").unlocks("has_honey_bottle", this.has(Items.HONEY_BOTTLE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.HONEYCOMB_BLOCK).define('H', Items.HONEYCOMB).pattern("HH").pattern("HH").unlocks("has_honeycomb", this.has(Items.HONEYCOMB)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.HOPPER).define('C', Blocks.CHEST).define('I', Items.IRON_INGOT).pattern("I I").pattern("ICI").pattern(" I ").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.HOPPER_MINECART).define('A', Blocks.HOPPER).define('B', Items.MINECART).pattern("A").pattern("B").unlocks("has_minecart", this.has(Items.MINECART)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.IRON_AXE).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("XX").pattern("X#").pattern(" #").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.IRON_BARS, 16).define('#', Items.IRON_INGOT).pattern("###").pattern("###").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.IRON_BLOCK).define('#', Items.IRON_INGOT).pattern("###").pattern("###").pattern("###").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.IRON_BOOTS).define('X', Items.IRON_INGOT).pattern("X X").pattern("X X").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.IRON_CHESTPLATE).define('X', Items.IRON_INGOT).pattern("X X").pattern("XXX").pattern("XXX").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.IRON_DOOR, 3).define('#', Items.IRON_INGOT).pattern("##").pattern("##").pattern("##").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.IRON_HELMET).define('X', Items.IRON_INGOT).pattern("XXX").pattern("X X").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.IRON_HOE).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("XX").pattern(" #").pattern(" #").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.IRON_INGOT, 9).requires(Blocks.IRON_BLOCK).group("iron_ingot").unlocks("has_iron_block", this.has(Blocks.IRON_BLOCK)).save(consumer, "iron_ingot_from_iron_block");
-        ShapedRecipeBuilder.shaped(Items.IRON_INGOT).define('#', Items.IRON_NUGGET).pattern("###").pattern("###").pattern("###").group("iron_ingot").unlocks("has_iron_nugget", this.has(Items.IRON_NUGGET)).save(consumer, "iron_ingot_from_nuggets");
-        ShapedRecipeBuilder.shaped(Items.IRON_LEGGINGS).define('X', Items.IRON_INGOT).pattern("XXX").pattern("X X").pattern("X X").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.IRON_NUGGET, 9).requires(Items.IRON_INGOT).unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.IRON_PICKAXE).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("XXX").pattern(" # ").pattern(" # ").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.IRON_SHOVEL).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("X").pattern("#").pattern("#").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.IRON_SWORD).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("X").pattern("X").pattern("#").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.IRON_TRAPDOOR).define('#', Items.IRON_INGOT).pattern("##").pattern("##").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.ITEM_FRAME).define('#', Items.STICK).define('X', Items.LEATHER).pattern("###").pattern("#X#").pattern("###").unlocks("has_leather", this.has(Items.LEATHER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.JUKEBOX).define('#', ItemTags.PLANKS).define('X', Items.DIAMOND).pattern("###").pattern("#X#").pattern("###").unlocks("has_diamond", this.has(Items.DIAMOND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.JUNGLE_WOOD, 3).define('#', Blocks.JUNGLE_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.JUNGLE_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STRIPPED_JUNGLE_WOOD, 3).define('#', Blocks.STRIPPED_JUNGLE_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.STRIPPED_JUNGLE_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.JUNGLE_BOAT).define('#', Blocks.JUNGLE_PLANKS).pattern("# #").pattern("###").group("boat").unlocks("in_water", this.insideOf(Blocks.WATER)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.JUNGLE_BUTTON).requires(Blocks.JUNGLE_PLANKS).group("wooden_button").unlocks("has_planks", this.has(Blocks.JUNGLE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.JUNGLE_DOOR, 3).define('#', Blocks.JUNGLE_PLANKS).pattern("##").pattern("##").pattern("##").group("wooden_door").unlocks("has_planks", this.has(Blocks.JUNGLE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.JUNGLE_FENCE, 3).define('#', Items.STICK).define('W', Blocks.JUNGLE_PLANKS).pattern("W#W").pattern("W#W").group("wooden_fence").unlocks("has_planks", this.has(Blocks.JUNGLE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.JUNGLE_FENCE_GATE).define('#', Items.STICK).define('W', Blocks.JUNGLE_PLANKS).pattern("#W#").pattern("#W#").group("wooden_fence_gate").unlocks("has_planks", this.has(Blocks.JUNGLE_PLANKS)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.JUNGLE_PLANKS, 4).requires(ItemTags.JUNGLE_LOGS).group("planks").unlocks("has_log", this.has(ItemTags.JUNGLE_LOGS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.JUNGLE_PRESSURE_PLATE).define('#', Blocks.JUNGLE_PLANKS).pattern("##").group("wooden_pressure_plate").unlocks("has_planks", this.has(Blocks.JUNGLE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.JUNGLE_SLAB, 6).define('#', Blocks.JUNGLE_PLANKS).pattern("###").group("wooden_slab").unlocks("has_planks", this.has(Blocks.JUNGLE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.JUNGLE_STAIRS, 4).define('#', Blocks.JUNGLE_PLANKS).pattern("#  ").pattern("## ").pattern("###").group("wooden_stairs").unlocks("has_planks", this.has(Blocks.JUNGLE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.JUNGLE_TRAPDOOR, 2).define('#', Blocks.JUNGLE_PLANKS).pattern("###").pattern("###").group("wooden_trapdoor").unlocks("has_planks", this.has(Blocks.JUNGLE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LADDER, 3).define('#', Items.STICK).pattern("# #").pattern("###").pattern("# #").unlocks("has_stick", this.has(Items.STICK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LAPIS_BLOCK).define('#', Items.LAPIS_LAZULI).pattern("###").pattern("###").pattern("###").unlocks("has_lapis", this.has(Items.LAPIS_LAZULI)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.LAPIS_LAZULI, 9).requires(Blocks.LAPIS_BLOCK).unlocks("has_lapis_block", this.has(Blocks.LAPIS_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LEAD, 2).define('~', Items.STRING).define('O', Items.SLIME_BALL).pattern("~~ ").pattern("~O ").pattern("  ~").unlocks("has_slime_ball", this.has(Items.SLIME_BALL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LEATHER).define('#', Items.RABBIT_HIDE).pattern("##").pattern("##").unlocks("has_rabbit_hide", this.has(Items.RABBIT_HIDE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LEATHER_BOOTS).define('X', Items.LEATHER).pattern("X X").pattern("X X").unlocks("has_leather", this.has(Items.LEATHER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LEATHER_CHESTPLATE).define('X', Items.LEATHER).pattern("X X").pattern("XXX").pattern("XXX").unlocks("has_leather", this.has(Items.LEATHER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LEATHER_HELMET).define('X', Items.LEATHER).pattern("XXX").pattern("X X").unlocks("has_leather", this.has(Items.LEATHER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LEATHER_LEGGINGS).define('X', Items.LEATHER).pattern("XXX").pattern("X X").pattern("X X").unlocks("has_leather", this.has(Items.LEATHER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LEATHER_HORSE_ARMOR).define('X', Items.LEATHER).pattern("X X").pattern("XXX").pattern("X X").unlocks("has_leather", this.has(Items.LEATHER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LECTERN).define('S', ItemTags.WOODEN_SLABS).define('B', Blocks.BOOKSHELF).pattern("SSS").pattern(" B ").pattern(" S ").unlocks("has_book", this.has(Items.BOOK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LEVER).define('#', Blocks.COBBLESTONE).define('X', Items.STICK).pattern("X").pattern("#").unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LIGHT_BLUE_BANNER).define('#', Blocks.LIGHT_BLUE_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_light_blue_wool", this.has(Blocks.LIGHT_BLUE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LIGHT_BLUE_BED).define('#', Blocks.LIGHT_BLUE_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_light_blue_wool", this.has(Blocks.LIGHT_BLUE_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.LIGHT_BLUE_BED).requires(Items.WHITE_BED).requires(Items.LIGHT_BLUE_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "light_blue_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_BLUE_CARPET, 3).define('#', Blocks.LIGHT_BLUE_WOOL).pattern("##").group("carpet").unlocks("has_light_blue_wool", this.has(Blocks.LIGHT_BLUE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_BLUE_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.LIGHT_BLUE_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_light_blue_dye", this.has(Items.LIGHT_BLUE_DYE)).save(consumer, "light_blue_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.LIGHT_BLUE_CONCRETE_POWDER, 8).requires(Items.LIGHT_BLUE_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.LIGHT_BLUE_DYE).requires(Blocks.BLUE_ORCHID).group("light_blue_dye").unlocks("has_red_flower", this.has(Blocks.BLUE_ORCHID)).save(consumer, "light_blue_dye_from_blue_orchid");
-        ShapelessRecipeBuilder.shapeless(Items.LIGHT_BLUE_DYE, 2).requires(Items.BLUE_DYE).requires(Items.WHITE_DYE).group("light_blue_dye").unlocks("has_blue_dye", this.has(Items.BLUE_DYE)).unlocks("has_white_dye", this.has(Items.WHITE_DYE)).save(consumer, "light_blue_dye_from_blue_white_dye");
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_BLUE_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.LIGHT_BLUE_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, 16).define('#', Blocks.LIGHT_BLUE_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.LIGHT_BLUE_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_light_blue_dye", this.has(Items.LIGHT_BLUE_DYE)).save(consumer, "light_blue_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_BLUE_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.LIGHT_BLUE_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.LIGHT_BLUE_WOOL).requires(Items.LIGHT_BLUE_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LIGHT_GRAY_BANNER).define('#', Blocks.LIGHT_GRAY_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_light_gray_wool", this.has(Blocks.LIGHT_GRAY_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LIGHT_GRAY_BED).define('#', Blocks.LIGHT_GRAY_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_light_gray_wool", this.has(Blocks.LIGHT_GRAY_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_BED).requires(Items.WHITE_BED).requires(Items.LIGHT_GRAY_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "light_gray_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_GRAY_CARPET, 3).define('#', Blocks.LIGHT_GRAY_WOOL).pattern("##").group("carpet").unlocks("has_light_gray_wool", this.has(Blocks.LIGHT_GRAY_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_GRAY_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.LIGHT_GRAY_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_light_gray_dye", this.has(Items.LIGHT_GRAY_DYE)).save(consumer, "light_gray_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.LIGHT_GRAY_CONCRETE_POWDER, 8).requires(Items.LIGHT_GRAY_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_DYE).requires(Blocks.AZURE_BLUET).group("light_gray_dye").unlocks("has_red_flower", this.has(Blocks.AZURE_BLUET)).save(consumer, "light_gray_dye_from_azure_bluet");
-        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_DYE, 2).requires(Items.GRAY_DYE).requires(Items.WHITE_DYE).group("light_gray_dye").unlocks("has_gray_dye", this.has(Items.GRAY_DYE)).unlocks("has_white_dye", this.has(Items.WHITE_DYE)).save(consumer, "light_gray_dye_from_gray_white_dye");
-        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_DYE, 3).requires(Items.BLACK_DYE).requires(Items.WHITE_DYE, 2).group("light_gray_dye").unlocks("has_white_dye", this.has(Items.WHITE_DYE)).unlocks("has_black_dye", this.has(Items.BLACK_DYE)).save(consumer, "light_gray_dye_from_black_white_dye");
-        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_DYE).requires(Blocks.OXEYE_DAISY).group("light_gray_dye").unlocks("has_red_flower", this.has(Blocks.OXEYE_DAISY)).save(consumer, "light_gray_dye_from_oxeye_daisy");
-        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_DYE).requires(Blocks.WHITE_TULIP).group("light_gray_dye").unlocks("has_red_flower", this.has(Blocks.WHITE_TULIP)).save(consumer, "light_gray_dye_from_white_tulip");
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_GRAY_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.LIGHT_GRAY_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_GRAY_STAINED_GLASS_PANE, 16).define('#', Blocks.LIGHT_GRAY_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_GRAY_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.LIGHT_GRAY_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_light_gray_dye", this.has(Items.LIGHT_GRAY_DYE)).save(consumer, "light_gray_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_GRAY_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.LIGHT_GRAY_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.LIGHT_GRAY_WOOL).requires(Items.LIGHT_GRAY_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE).define('#', Items.GOLD_INGOT).pattern("##").unlocks("has_gold_ingot", this.has(Items.GOLD_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LIME_BANNER).define('#', Blocks.LIME_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_lime_wool", this.has(Blocks.LIME_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.LIME_BED).define('#', Blocks.LIME_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_lime_wool", this.has(Blocks.LIME_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.LIME_BED).requires(Items.WHITE_BED).requires(Items.LIME_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "lime_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.LIME_CARPET, 3).define('#', Blocks.LIME_WOOL).pattern("##").group("carpet").unlocks("has_lime_wool", this.has(Blocks.LIME_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIME_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.LIME_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_lime_dye", this.has(Items.LIME_DYE)).save(consumer, "lime_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.LIME_CONCRETE_POWDER, 8).requires(Items.LIME_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.LIME_DYE, 2).requires(Items.GREEN_DYE).requires(Items.WHITE_DYE).unlocks("has_green_dye", this.has(Items.GREEN_DYE)).unlocks("has_white_dye", this.has(Items.WHITE_DYE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIME_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.LIME_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIME_STAINED_GLASS_PANE, 16).define('#', Blocks.LIME_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LIME_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.LIME_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_lime_dye", this.has(Items.LIME_DYE)).save(consumer, "lime_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.LIME_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.LIME_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.LIME_WOOL).requires(Items.LIME_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.JACK_O_LANTERN).define('A', Blocks.CARVED_PUMPKIN).define('B', Blocks.TORCH).pattern("A").pattern("B").unlocks("has_carved_pumpkin", this.has(Blocks.CARVED_PUMPKIN)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.MAGENTA_BANNER).define('#', Blocks.MAGENTA_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_magenta_wool", this.has(Blocks.MAGENTA_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.MAGENTA_BED).define('#', Blocks.MAGENTA_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_magenta_wool", this.has(Blocks.MAGENTA_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_BED).requires(Items.WHITE_BED).requires(Items.MAGENTA_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "magenta_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.MAGENTA_CARPET, 3).define('#', Blocks.MAGENTA_WOOL).pattern("##").group("carpet").unlocks("has_magenta_wool", this.has(Blocks.MAGENTA_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MAGENTA_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.MAGENTA_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_magenta_dye", this.has(Items.MAGENTA_DYE)).save(consumer, "magenta_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.MAGENTA_CONCRETE_POWDER, 8).requires(Items.MAGENTA_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_DYE).requires(Blocks.ALLIUM).group("magenta_dye").unlocks("has_red_flower", this.has(Blocks.ALLIUM)).save(consumer, "magenta_dye_from_allium");
-        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_DYE, 4).requires(Items.BLUE_DYE).requires(Items.RED_DYE, 2).requires(Items.WHITE_DYE).group("magenta_dye").unlocks("has_blue_dye", this.has(Items.BLUE_DYE)).unlocks("has_rose_red", this.has(Items.RED_DYE)).unlocks("has_white_dye", this.has(Items.WHITE_DYE)).save(consumer, "magenta_dye_from_blue_red_white_dye");
-        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_DYE, 3).requires(Items.BLUE_DYE).requires(Items.RED_DYE).requires(Items.PINK_DYE).group("magenta_dye").unlocks("has_pink_dye", this.has(Items.PINK_DYE)).unlocks("has_blue_dye", this.has(Items.BLUE_DYE)).unlocks("has_red_dye", this.has(Items.RED_DYE)).save(consumer, "magenta_dye_from_blue_red_pink");
-        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_DYE, 2).requires(Blocks.LILAC).group("magenta_dye").unlocks("has_double_plant", this.has(Blocks.LILAC)).save(consumer, "magenta_dye_from_lilac");
-        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_DYE, 2).requires(Items.PURPLE_DYE).requires(Items.PINK_DYE).group("magenta_dye").unlocks("has_pink_dye", this.has(Items.PINK_DYE)).unlocks("has_purple_dye", this.has(Items.PURPLE_DYE)).save(consumer, "magenta_dye_from_purple_and_pink");
-        ShapedRecipeBuilder.shaped(Blocks.MAGENTA_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.MAGENTA_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MAGENTA_STAINED_GLASS_PANE, 16).define('#', Blocks.MAGENTA_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MAGENTA_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.MAGENTA_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_magenta_dye", this.has(Items.MAGENTA_DYE)).save(consumer, "magenta_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.MAGENTA_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.MAGENTA_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.MAGENTA_WOOL).requires(Items.MAGENTA_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MAGMA_BLOCK).define('#', Items.MAGMA_CREAM).pattern("##").pattern("##").unlocks("has_magma_cream", this.has(Items.MAGMA_CREAM)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.MAGMA_CREAM).requires(Items.BLAZE_POWDER).requires(Items.SLIME_BALL).unlocks("has_blaze_powder", this.has(Items.BLAZE_POWDER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.MAP).define('#', Items.PAPER).define('X', Items.COMPASS).pattern("###").pattern("#X#").pattern("###").unlocks("has_compass", this.has(Items.COMPASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MELON).define('M', Items.MELON_SLICE).pattern("MMM").pattern("MMM").pattern("MMM").unlocks("has_melon", this.has(Items.MELON_SLICE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.MELON_SEEDS).requires(Items.MELON_SLICE).unlocks("has_melon", this.has(Items.MELON_SLICE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.MINECART).define('#', Items.IRON_INGOT).pattern("# #").pattern("###").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.MOSSY_COBBLESTONE).requires(Blocks.COBBLESTONE).requires(Blocks.VINE).unlocks("has_vine", this.has(Blocks.VINE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MOSSY_COBBLESTONE_WALL, 6).define('#', Blocks.MOSSY_COBBLESTONE).pattern("###").pattern("###").unlocks("has_mossy_cobblestone", this.has(Blocks.MOSSY_COBBLESTONE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.MOSSY_STONE_BRICKS).requires(Blocks.STONE_BRICKS).requires(Blocks.VINE).unlocks("has_mossy_cobblestone", this.has(Blocks.MOSSY_COBBLESTONE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.MUSHROOM_STEW).requires(Blocks.BROWN_MUSHROOM).requires(Blocks.RED_MUSHROOM).requires(Items.BOWL).unlocks("has_mushroom_stew", this.has(Items.MUSHROOM_STEW)).unlocks("has_bowl", this.has(Items.BOWL)).unlocks("has_brown_mushroom", this.has(Blocks.BROWN_MUSHROOM)).unlocks("has_red_mushroom", this.has(Blocks.RED_MUSHROOM)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.NETHER_BRICKS).define('N', Items.NETHER_BRICK).pattern("NN").pattern("NN").unlocks("has_netherbrick", this.has(Items.NETHER_BRICK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.NETHER_BRICK_FENCE, 6).define('#', Blocks.NETHER_BRICKS).define('-', Items.NETHER_BRICK).pattern("#-#").pattern("#-#").unlocks("has_nether_brick", this.has(Blocks.NETHER_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.NETHER_BRICK_SLAB, 6).define('#', Blocks.NETHER_BRICKS).pattern("###").unlocks("has_nether_brick", this.has(Blocks.NETHER_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.NETHER_BRICK_STAIRS, 4).define('#', Blocks.NETHER_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlocks("has_nether_brick", this.has(Blocks.NETHER_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.NETHER_WART_BLOCK).define('#', Items.NETHER_WART).pattern("###").pattern("###").pattern("###").unlocks("has_nether_wart", this.has(Items.NETHER_WART)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.NOTE_BLOCK).define('#', ItemTags.PLANKS).define('X', Items.REDSTONE).pattern("###").pattern("#X#").pattern("###").unlocks("has_redstone", this.has(Items.REDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.OAK_WOOD, 3).define('#', Blocks.OAK_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.OAK_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STRIPPED_OAK_WOOD, 3).define('#', Blocks.STRIPPED_OAK_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.STRIPPED_OAK_LOG)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.OAK_BUTTON).requires(Blocks.OAK_PLANKS).group("wooden_button").unlocks("has_planks", this.has(Blocks.OAK_PLANKS)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.OAK_PLANKS, 4).requires(ItemTags.OAK_LOGS).group("planks").unlocks("has_log", this.has(ItemTags.OAK_LOGS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.OAK_PRESSURE_PLATE).define('#', Blocks.OAK_PLANKS).pattern("##").group("wooden_pressure_plate").unlocks("has_planks", this.has(Blocks.OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.OAK_SLAB, 6).define('#', Blocks.OAK_PLANKS).pattern("###").group("wooden_slab").unlocks("has_planks", this.has(Blocks.OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.OAK_STAIRS, 4).define('#', Blocks.OAK_PLANKS).pattern("#  ").pattern("## ").pattern("###").group("wooden_stairs").unlocks("has_planks", this.has(Blocks.OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.OAK_TRAPDOOR, 2).define('#', Blocks.OAK_PLANKS).pattern("###").pattern("###").group("wooden_trapdoor").unlocks("has_planks", this.has(Blocks.OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.OBSERVER).define('Q', Items.QUARTZ).define('R', Items.REDSTONE).define('#', Blocks.COBBLESTONE).pattern("###").pattern("RRQ").pattern("###").unlocks("has_quartz", this.has(Items.QUARTZ)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.ORANGE_BANNER).define('#', Blocks.ORANGE_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_orange_wool", this.has(Blocks.ORANGE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.ORANGE_BED).define('#', Blocks.ORANGE_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_orange_wool", this.has(Blocks.ORANGE_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.ORANGE_BED).requires(Items.WHITE_BED).requires(Items.ORANGE_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "orange_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.ORANGE_CARPET, 3).define('#', Blocks.ORANGE_WOOL).pattern("##").group("carpet").unlocks("has_orange_wool", this.has(Blocks.ORANGE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ORANGE_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.ORANGE_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_oramge_dye", this.has(Items.ORANGE_DYE)).save(consumer, "orange_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.ORANGE_CONCRETE_POWDER, 8).requires(Items.ORANGE_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.ORANGE_DYE).requires(Blocks.ORANGE_TULIP).group("orange_dye").unlocks("has_red_flower", this.has(Blocks.ORANGE_TULIP)).save(consumer, "orange_dye_from_orange_tulip");
-        ShapelessRecipeBuilder.shapeless(Items.ORANGE_DYE, 2).requires(Items.RED_DYE).requires(Items.YELLOW_DYE).group("orange_dye").unlocks("has_red_dye", this.has(Items.RED_DYE)).unlocks("has_yellow_dye", this.has(Items.YELLOW_DYE)).save(consumer, "orange_dye_from_red_yellow");
-        ShapedRecipeBuilder.shaped(Blocks.ORANGE_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.ORANGE_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ORANGE_STAINED_GLASS_PANE, 16).define('#', Blocks.ORANGE_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ORANGE_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.ORANGE_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_orange_dye", this.has(Items.ORANGE_DYE)).save(consumer, "orange_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.ORANGE_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.ORANGE_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.ORANGE_WOOL).requires(Items.ORANGE_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.PAINTING).define('#', Items.STICK).define('X', Ingredient.of(ItemTags.WOOL)).pattern("###").pattern("#X#").pattern("###").unlocks("has_wool", this.has(ItemTags.WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.PAPER, 3).define('#', Blocks.SUGAR_CANE).pattern("###").unlocks("has_reeds", this.has(Blocks.SUGAR_CANE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.QUARTZ_PILLAR, 2).define('#', Blocks.QUARTZ_BLOCK).pattern("#").pattern("#").unlocks("has_chiseled_quartz_block", this.has(Blocks.CHISELED_QUARTZ_BLOCK)).unlocks("has_quartz_block", this.has(Blocks.QUARTZ_BLOCK)).unlocks("has_quartz_pillar", this.has(Blocks.QUARTZ_PILLAR)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.PACKED_ICE).requires(Blocks.ICE, 9).unlocks("has_ice", this.has(Blocks.ICE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.PINK_BANNER).define('#', Blocks.PINK_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_pink_wool", this.has(Blocks.PINK_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.PINK_BED).define('#', Blocks.PINK_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_pink_wool", this.has(Blocks.PINK_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.PINK_BED).requires(Items.WHITE_BED).requires(Items.PINK_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "pink_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.PINK_CARPET, 3).define('#', Blocks.PINK_WOOL).pattern("##").group("carpet").unlocks("has_pink_wool", this.has(Blocks.PINK_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PINK_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.PINK_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_pink_dye", this.has(Items.PINK_DYE)).save(consumer, "pink_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.PINK_CONCRETE_POWDER, 8).requires(Items.PINK_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.PINK_DYE, 2).requires(Blocks.PEONY).group("pink_dye").unlocks("has_double_plant", this.has(Blocks.PEONY)).save(consumer, "pink_dye_from_peony");
-        ShapelessRecipeBuilder.shapeless(Items.PINK_DYE).requires(Blocks.PINK_TULIP).group("pink_dye").unlocks("has_red_flower", this.has(Blocks.PINK_TULIP)).save(consumer, "pink_dye_from_pink_tulip");
-        ShapelessRecipeBuilder.shapeless(Items.PINK_DYE, 2).requires(Items.RED_DYE).requires(Items.WHITE_DYE).group("pink_dye").unlocks("has_white_dye", this.has(Items.WHITE_DYE)).unlocks("has_red_dye", this.has(Items.RED_DYE)).save(consumer, "pink_dye_from_red_white_dye");
-        ShapedRecipeBuilder.shaped(Blocks.PINK_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.PINK_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PINK_STAINED_GLASS_PANE, 16).define('#', Blocks.PINK_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PINK_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.PINK_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_pink_dye", this.has(Items.PINK_DYE)).save(consumer, "pink_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.PINK_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.PINK_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.PINK_WOOL).requires(Items.PINK_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PISTON).define('R', Items.REDSTONE).define('#', Blocks.COBBLESTONE).define('T', ItemTags.PLANKS).define('X', Items.IRON_INGOT).pattern("TTT").pattern("#X#").pattern("#R#").unlocks("has_redstone", this.has(Items.REDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.POLISHED_GRANITE, 4).define('S', Blocks.GRANITE).pattern("SS").pattern("SS").unlocks("has_stone", this.has(Blocks.GRANITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.POLISHED_DIORITE, 4).define('S', Blocks.DIORITE).pattern("SS").pattern("SS").unlocks("has_stone", this.has(Blocks.DIORITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.POLISHED_ANDESITE, 4).define('S', Blocks.ANDESITE).pattern("SS").pattern("SS").unlocks("has_stone", this.has(Blocks.ANDESITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE).define('S', Items.PRISMARINE_SHARD).pattern("SS").pattern("SS").unlocks("has_prismarine_shard", this.has(Items.PRISMARINE_SHARD)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_BRICKS).define('S', Items.PRISMARINE_SHARD).pattern("SSS").pattern("SSS").pattern("SSS").unlocks("has_prismarine_shard", this.has(Items.PRISMARINE_SHARD)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_SLAB, 6).define('#', Blocks.PRISMARINE).pattern("###").unlocks("has_prismarine", this.has(Blocks.PRISMARINE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_BRICK_SLAB, 6).define('#', Blocks.PRISMARINE_BRICKS).pattern("###").unlocks("has_prismarine_bricks", this.has(Blocks.PRISMARINE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DARK_PRISMARINE_SLAB, 6).define('#', Blocks.DARK_PRISMARINE).pattern("###").unlocks("has_dark_prismarine", this.has(Blocks.DARK_PRISMARINE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.PUMPKIN_PIE).requires(Blocks.PUMPKIN).requires(Items.SUGAR).requires(Items.EGG).unlocks("has_carved_pumpkin", this.has(Blocks.CARVED_PUMPKIN)).unlocks("has_pumpkin", this.has(Blocks.PUMPKIN)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.PUMPKIN_SEEDS, 4).requires(Blocks.PUMPKIN).unlocks("has_pumpkin", this.has(Blocks.PUMPKIN)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.PURPLE_BANNER).define('#', Blocks.PURPLE_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_purple_wool", this.has(Blocks.PURPLE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.PURPLE_BED).define('#', Blocks.PURPLE_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_purple_wool", this.has(Blocks.PURPLE_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.PURPLE_BED).requires(Items.WHITE_BED).requires(Items.PURPLE_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "purple_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.PURPLE_CARPET, 3).define('#', Blocks.PURPLE_WOOL).pattern("##").group("carpet").unlocks("has_purple_wool", this.has(Blocks.PURPLE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PURPLE_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.PURPLE_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_purple_dye", this.has(Items.PURPLE_DYE)).save(consumer, "purple_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.PURPLE_CONCRETE_POWDER, 8).requires(Items.PURPLE_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.PURPLE_DYE, 2).requires(Items.BLUE_DYE).requires(Items.RED_DYE).unlocks("has_blue_dye", this.has(Items.BLUE_DYE)).unlocks("has_red_dye", this.has(Items.RED_DYE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SHULKER_BOX).define('#', Blocks.CHEST).define('-', Items.SHULKER_SHELL).pattern("-").pattern("#").pattern("-").unlocks("has_shulker_shell", this.has(Items.SHULKER_SHELL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PURPLE_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.PURPLE_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PURPLE_STAINED_GLASS_PANE, 16).define('#', Blocks.PURPLE_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PURPLE_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.PURPLE_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_purple_dye", this.has(Items.PURPLE_DYE)).save(consumer, "purple_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.PURPLE_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.PURPLE_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.PURPLE_WOOL).requires(Items.PURPLE_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PURPUR_BLOCK, 4).define('F', Items.POPPED_CHORUS_FRUIT).pattern("FF").pattern("FF").unlocks("has_chorus_fruit_popped", this.has(Items.POPPED_CHORUS_FRUIT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PURPUR_PILLAR).define('#', Blocks.PURPUR_SLAB).pattern("#").pattern("#").unlocks("has_purpur_block", this.has(Blocks.PURPUR_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PURPUR_SLAB, 6).define('#', Ingredient.of(Blocks.PURPUR_BLOCK, Blocks.PURPUR_PILLAR)).pattern("###").unlocks("has_purpur_block", this.has(Blocks.PURPUR_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PURPUR_STAIRS, 4).define('#', Ingredient.of(Blocks.PURPUR_BLOCK, Blocks.PURPUR_PILLAR)).pattern("#  ").pattern("## ").pattern("###").unlocks("has_purpur_block", this.has(Blocks.PURPUR_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.QUARTZ_BLOCK).define('#', Items.QUARTZ).pattern("##").pattern("##").unlocks("has_quartz", this.has(Items.QUARTZ)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.QUARTZ_SLAB, 6).define('#', Ingredient.of(Blocks.CHISELED_QUARTZ_BLOCK, Blocks.QUARTZ_BLOCK, Blocks.QUARTZ_PILLAR)).pattern("###").unlocks("has_chiseled_quartz_block", this.has(Blocks.CHISELED_QUARTZ_BLOCK)).unlocks("has_quartz_block", this.has(Blocks.QUARTZ_BLOCK)).unlocks("has_quartz_pillar", this.has(Blocks.QUARTZ_PILLAR)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.QUARTZ_STAIRS, 4).define('#', Ingredient.of(Blocks.CHISELED_QUARTZ_BLOCK, Blocks.QUARTZ_BLOCK, Blocks.QUARTZ_PILLAR)).pattern("#  ").pattern("## ").pattern("###").unlocks("has_chiseled_quartz_block", this.has(Blocks.CHISELED_QUARTZ_BLOCK)).unlocks("has_quartz_block", this.has(Blocks.QUARTZ_BLOCK)).unlocks("has_quartz_pillar", this.has(Blocks.QUARTZ_PILLAR)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.RABBIT_STEW).requires(Items.BAKED_POTATO).requires(Items.COOKED_RABBIT).requires(Items.BOWL).requires(Items.CARROT).requires(Blocks.BROWN_MUSHROOM).group("rabbit_stew").unlocks("has_cooked_rabbit", this.has(Items.COOKED_RABBIT)).save(consumer, "rabbit_stew_from_brown_mushroom");
-        ShapelessRecipeBuilder.shapeless(Items.RABBIT_STEW).requires(Items.BAKED_POTATO).requires(Items.COOKED_RABBIT).requires(Items.BOWL).requires(Items.CARROT).requires(Blocks.RED_MUSHROOM).group("rabbit_stew").unlocks("has_cooked_rabbit", this.has(Items.COOKED_RABBIT)).save(consumer, "rabbit_stew_from_red_mushroom");
-        ShapedRecipeBuilder.shaped(Blocks.RAIL, 16).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("X X").pattern("X#X").pattern("X X").unlocks("has_minecart", this.has(Items.MINECART)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.REDSTONE, 9).requires(Blocks.REDSTONE_BLOCK).unlocks("has_redstone_block", this.has(Blocks.REDSTONE_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.REDSTONE_BLOCK).define('#', Items.REDSTONE).pattern("###").pattern("###").pattern("###").unlocks("has_redstone", this.has(Items.REDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.REDSTONE_LAMP).define('R', Items.REDSTONE).define('G', Blocks.GLOWSTONE).pattern(" R ").pattern("RGR").pattern(" R ").unlocks("has_glowstone", this.has(Blocks.GLOWSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.REDSTONE_TORCH).define('#', Items.STICK).define('X', Items.REDSTONE).pattern("X").pattern("#").unlocks("has_redstone", this.has(Items.REDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.RED_BANNER).define('#', Blocks.RED_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_red_wool", this.has(Blocks.RED_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.RED_BED).define('#', Blocks.RED_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_red_wool", this.has(Blocks.RED_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.RED_BED).requires(Items.WHITE_BED).requires(Items.RED_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "red_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.RED_CARPET, 3).define('#', Blocks.RED_WOOL).pattern("##").group("carpet").unlocks("has_red_wool", this.has(Blocks.RED_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.RED_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_red_dye", this.has(Items.RED_DYE)).save(consumer, "red_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.RED_CONCRETE_POWDER, 8).requires(Items.RED_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.RED_DYE).requires(Items.BEETROOT).group("red_dye").unlocks("has_beetroot", this.has(Items.BEETROOT)).save(consumer, "red_dye_from_beetroot");
-        ShapelessRecipeBuilder.shapeless(Items.RED_DYE).requires(Blocks.POPPY).group("red_dye").unlocks("has_red_flower", this.has(Blocks.POPPY)).save(consumer, "red_dye_from_poppy");
-        ShapelessRecipeBuilder.shapeless(Items.RED_DYE, 2).requires(Blocks.ROSE_BUSH).group("red_dye").unlocks("has_double_plant", this.has(Blocks.ROSE_BUSH)).save(consumer, "red_dye_from_rose_bush");
-        ShapelessRecipeBuilder.shapeless(Items.RED_DYE).requires(Blocks.RED_TULIP).group("red_dye").unlocks("has_red_flower", this.has(Blocks.RED_TULIP)).save(consumer, "red_dye_from_tulip");
-        ShapedRecipeBuilder.shaped(Blocks.RED_NETHER_BRICKS).define('W', Items.NETHER_WART).define('N', Items.NETHER_BRICK).pattern("NW").pattern("WN").unlocks("has_nether_wart", this.has(Items.NETHER_WART)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_SANDSTONE).define('#', Blocks.RED_SAND).pattern("##").pattern("##").unlocks("has_sand", this.has(Blocks.RED_SAND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_SANDSTONE_SLAB, 6).define('#', Ingredient.of(Blocks.RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE)).pattern("###").unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).unlocks("has_chiseled_red_sandstone", this.has(Blocks.CHISELED_RED_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CUT_RED_SANDSTONE_SLAB, 6).define('#', Blocks.CUT_RED_SANDSTONE).pattern("###").unlocks("has_cut_red_sandstone", this.has(Blocks.CUT_RED_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_SANDSTONE_STAIRS, 4).define('#', Ingredient.of(Blocks.RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE)).pattern("#  ").pattern("## ").pattern("###").unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).unlocks("has_chiseled_red_sandstone", this.has(Blocks.CHISELED_RED_SANDSTONE)).unlocks("has_cut_red_sandstone", this.has(Blocks.CUT_RED_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.RED_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_STAINED_GLASS_PANE, 16).define('#', Blocks.RED_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.RED_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_red_dye", this.has(Items.RED_DYE)).save(consumer, "red_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.RED_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.RED_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.RED_WOOL).requires(Items.RED_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.REPEATER).define('#', Blocks.REDSTONE_TORCH).define('X', Items.REDSTONE).define('I', Blocks.STONE).pattern("#X#").pattern("III").unlocks("has_redstone_torch", this.has(Blocks.REDSTONE_TORCH)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SANDSTONE).define('#', Blocks.SAND).pattern("##").pattern("##").unlocks("has_sand", this.has(Blocks.SAND)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SANDSTONE_SLAB, 6).define('#', Ingredient.of(Blocks.SANDSTONE, Blocks.CHISELED_SANDSTONE)).pattern("###").unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).unlocks("has_chiseled_sandstone", this.has(Blocks.CHISELED_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CUT_SANDSTONE_SLAB, 6).define('#', Blocks.CUT_SANDSTONE).pattern("###").unlocks("has_cut_sandstone", this.has(Blocks.CUT_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SANDSTONE_STAIRS, 4).define('#', Ingredient.of(Blocks.SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.CUT_SANDSTONE)).pattern("#  ").pattern("## ").pattern("###").unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).unlocks("has_chiseled_sandstone", this.has(Blocks.CHISELED_SANDSTONE)).unlocks("has_cut_sandstone", this.has(Blocks.CUT_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SEA_LANTERN).define('S', Items.PRISMARINE_SHARD).define('C', Items.PRISMARINE_CRYSTALS).pattern("SCS").pattern("CCC").pattern("SCS").unlocks("has_prismarine_crystals", this.has(Items.PRISMARINE_CRYSTALS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.SHEARS).define('#', Items.IRON_INGOT).pattern(" #").pattern("# ").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.SHIELD).define('W', ItemTags.PLANKS).define('o', Items.IRON_INGOT).pattern("WoW").pattern("WWW").pattern(" W ").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.OAK_SIGN, 3).define('#', Items.OAK_PLANKS).define('X', Items.STICK).pattern("###").pattern("###").pattern(" X ").unlocks("has_oak_planks", this.has(Items.OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.SPRUCE_SIGN, 3).define('#', Items.SPRUCE_PLANKS).define('X', Items.STICK).pattern("###").pattern("###").pattern(" X ").unlocks("has_spruce_planks", this.has(Items.SPRUCE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.BIRCH_SIGN, 3).define('#', Items.BIRCH_PLANKS).define('X', Items.STICK).pattern("###").pattern("###").pattern(" X ").unlocks("has_birch_planks", this.has(Items.BIRCH_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.ACACIA_SIGN, 3).define('#', Items.ACACIA_PLANKS).define('X', Items.STICK).pattern("###").pattern("###").pattern(" X ").unlocks("has_acacia_planks", this.has(Items.ACACIA_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.JUNGLE_SIGN, 3).define('#', Items.JUNGLE_PLANKS).define('X', Items.STICK).pattern("###").pattern("###").pattern(" X ").unlocks("has_jungle_planks", this.has(Items.JUNGLE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.DARK_OAK_SIGN, 3).define('#', Items.DARK_OAK_PLANKS).define('X', Items.STICK).pattern("###").pattern("###").pattern(" X ").unlocks("has_dark_oak_planks", this.has(Items.DARK_OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SLIME_BLOCK).define('#', Items.SLIME_BALL).pattern("###").pattern("###").pattern("###").unlocks("has_slime_ball", this.has(Items.SLIME_BALL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.SLIME_BALL, 9).requires(Blocks.SLIME_BLOCK).unlocks("has_slime", this.has(Blocks.SLIME_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CUT_RED_SANDSTONE, 4).define('#', Blocks.RED_SANDSTONE).pattern("##").pattern("##").unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CUT_SANDSTONE, 4).define('#', Blocks.SANDSTONE).pattern("##").pattern("##").unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SNOW_BLOCK).define('#', Items.SNOWBALL).pattern("##").pattern("##").unlocks("has_snowball", this.has(Items.SNOWBALL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SNOW, 6).define('#', Blocks.SNOW_BLOCK).pattern("###").unlocks("has_snowball", this.has(Items.SNOWBALL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.GLISTERING_MELON_SLICE).define('#', Items.GOLD_NUGGET).define('X', Items.MELON_SLICE).pattern("###").pattern("#X#").pattern("###").unlocks("has_melon", this.has(Items.MELON_SLICE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.SPECTRAL_ARROW, 2).define('#', Items.GLOWSTONE_DUST).define('X', Items.ARROW).pattern(" # ").pattern("#X#").pattern(" # ").unlocks("has_glowstone_dust", this.has(Items.GLOWSTONE_DUST)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SPRUCE_WOOD, 3).define('#', Blocks.SPRUCE_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.SPRUCE_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STRIPPED_SPRUCE_WOOD, 3).define('#', Blocks.STRIPPED_SPRUCE_LOG).pattern("##").pattern("##").group("bark").unlocks("has_log", this.has(Blocks.STRIPPED_SPRUCE_LOG)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.SPRUCE_BOAT).define('#', Blocks.SPRUCE_PLANKS).pattern("# #").pattern("###").group("boat").unlocks("in_water", this.insideOf(Blocks.WATER)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.SPRUCE_BUTTON).requires(Blocks.SPRUCE_PLANKS).group("wooden_button").unlocks("has_planks", this.has(Blocks.SPRUCE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SPRUCE_DOOR, 3).define('#', Blocks.SPRUCE_PLANKS).pattern("##").pattern("##").pattern("##").group("wooden_door").unlocks("has_planks", this.has(Blocks.SPRUCE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SPRUCE_FENCE, 3).define('#', Items.STICK).define('W', Blocks.SPRUCE_PLANKS).pattern("W#W").pattern("W#W").group("wooden_fence").unlocks("has_planks", this.has(Blocks.SPRUCE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SPRUCE_FENCE_GATE).define('#', Items.STICK).define('W', Blocks.SPRUCE_PLANKS).pattern("#W#").pattern("#W#").group("wooden_fence_gate").unlocks("has_planks", this.has(Blocks.SPRUCE_PLANKS)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.SPRUCE_PLANKS, 4).requires(ItemTags.SPRUCE_LOGS).group("planks").unlocks("has_log", this.has(ItemTags.SPRUCE_LOGS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SPRUCE_PRESSURE_PLATE).define('#', Blocks.SPRUCE_PLANKS).pattern("##").group("wooden_pressure_plate").unlocks("has_planks", this.has(Blocks.SPRUCE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SPRUCE_SLAB, 6).define('#', Blocks.SPRUCE_PLANKS).pattern("###").group("wooden_slab").unlocks("has_planks", this.has(Blocks.SPRUCE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SPRUCE_STAIRS, 4).define('#', Blocks.SPRUCE_PLANKS).pattern("#  ").pattern("## ").pattern("###").group("wooden_stairs").unlocks("has_planks", this.has(Blocks.SPRUCE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SPRUCE_TRAPDOOR, 2).define('#', Blocks.SPRUCE_PLANKS).pattern("###").pattern("###").group("wooden_trapdoor").unlocks("has_planks", this.has(Blocks.SPRUCE_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.STICK, 4).define('#', ItemTags.PLANKS).pattern("#").pattern("#").group("sticks").unlocks("has_planks", this.has(ItemTags.PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.STICK, 1).define('#', Blocks.BAMBOO).pattern("#").pattern("#").group("sticks").unlocks("has_bamboo", this.has(Blocks.BAMBOO)).save(consumer, "stick_from_bamboo_item");
-        ShapedRecipeBuilder.shaped(Blocks.STICKY_PISTON).define('P', Blocks.PISTON).define('S', Items.SLIME_BALL).pattern("S").pattern("P").unlocks("has_slime_ball", this.has(Items.SLIME_BALL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STONE_BRICKS, 4).define('#', Blocks.STONE).pattern("##").pattern("##").unlocks("has_stone", this.has(Blocks.STONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.STONE_AXE).define('#', Items.STICK).define('X', Blocks.COBBLESTONE).pattern("XX").pattern("X#").pattern(" #").unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STONE_BRICK_SLAB, 6).define('#', Blocks.STONE_BRICKS).pattern("###").unlocks("has_stone_bricks", this.has(ItemTags.STONE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STONE_BRICK_STAIRS, 4).define('#', Blocks.STONE_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlocks("has_stone_bricks", this.has(ItemTags.STONE_BRICKS)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.STONE_BUTTON).requires(Blocks.STONE).unlocks("has_stone", this.has(Blocks.STONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.STONE_HOE).define('#', Items.STICK).define('X', Blocks.COBBLESTONE).pattern("XX").pattern(" #").pattern(" #").unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.STONE_PICKAXE).define('#', Items.STICK).define('X', Blocks.COBBLESTONE).pattern("XXX").pattern(" # ").pattern(" # ").unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STONE_PRESSURE_PLATE).define('#', Blocks.STONE).pattern("##").unlocks("has_stone", this.has(Blocks.STONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.STONE_SHOVEL).define('#', Items.STICK).define('X', Blocks.COBBLESTONE).pattern("X").pattern("#").pattern("#").unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STONE_SLAB, 6).define('#', Blocks.STONE).pattern("###").unlocks("has_stone", this.has(Blocks.STONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_STONE_SLAB, 6).define('#', Blocks.SMOOTH_STONE).pattern("###").unlocks("has_smooth_stone", this.has(Blocks.SMOOTH_STONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.COBBLESTONE_STAIRS, 4).define('#', Blocks.COBBLESTONE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.STONE_SWORD).define('#', Items.STICK).define('X', Blocks.COBBLESTONE).pattern("X").pattern("X").pattern("#").unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.WHITE_WOOL).define('#', Items.STRING).pattern("##").pattern("##").unlocks("has_string", this.has(Items.STRING)).save(consumer, "white_wool_from_string");
-        ShapelessRecipeBuilder.shapeless(Items.SUGAR).requires(Blocks.SUGAR_CANE).group("sugar").unlocks("has_reeds", this.has(Blocks.SUGAR_CANE)).save(consumer, "sugar_from_sugar_cane");
-        ShapelessRecipeBuilder.shapeless(Items.SUGAR, 3).requires(Items.HONEY_BOTTLE).group("sugar").unlocks("has_honey_bottle", this.has(Items.HONEY_BOTTLE)).save(consumer, "sugar_from_honey_bottle");
-        ShapedRecipeBuilder.shaped(Blocks.TNT).define('#', Ingredient.of(Blocks.SAND, Blocks.RED_SAND)).define('X', Items.GUNPOWDER).pattern("X#X").pattern("#X#").pattern("X#X").unlocks("has_gunpowder", this.has(Items.GUNPOWDER)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.TNT_MINECART).define('A', Blocks.TNT).define('B', Items.MINECART).pattern("A").pattern("B").unlocks("has_minecart", this.has(Items.MINECART)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.TORCH, 4).define('#', Items.STICK).define('X', Ingredient.of(Items.COAL, Items.CHARCOAL)).pattern("X").pattern("#").unlocks("has_stone_pickaxe", this.has(Items.STONE_PICKAXE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.LANTERN).define('#', Items.TORCH).define('X', Items.IRON_NUGGET).pattern("XXX").pattern("X#X").pattern("XXX").unlocks("has_iron_nugget", this.has(Items.IRON_NUGGET)).unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.TRAPPED_CHEST).requires(Blocks.CHEST).requires(Blocks.TRIPWIRE_HOOK).unlocks("has_tripwire_hook", this.has(Blocks.TRIPWIRE_HOOK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.TRIPWIRE_HOOK, 2).define('#', ItemTags.PLANKS).define('S', Items.STICK).define('I', Items.IRON_INGOT).pattern("I").pattern("S").pattern("#").unlocks("has_string", this.has(Items.STRING)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.TURTLE_HELMET).define('X', Items.SCUTE).pattern("XXX").pattern("X X").unlocks("has_scute", this.has(Items.SCUTE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.WHEAT, 9).requires(Blocks.HAY_BLOCK).unlocks("has_hay_block", this.has(Blocks.HAY_BLOCK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.WHITE_BANNER).define('#', Blocks.WHITE_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.WHITE_BED).define('#', Blocks.WHITE_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.WHITE_CARPET, 3).define('#', Blocks.WHITE_WOOL).pattern("##").group("carpet").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.WHITE_CONCRETE_POWDER, 8).requires(Items.WHITE_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.WHITE_DYE).requires(Items.BONE_MEAL).group("white_dye").unlocks("has_bone_meal", this.has(Items.BONE_MEAL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.WHITE_DYE).requires(Blocks.LILY_OF_THE_VALLEY).group("white_dye").unlocks("has_white_flower", this.has(Blocks.LILY_OF_THE_VALLEY)).save(consumer, "white_dye_from_lily_of_the_valley");
-        ShapedRecipeBuilder.shaped(Blocks.WHITE_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.WHITE_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.WHITE_STAINED_GLASS_PANE, 16).define('#', Blocks.WHITE_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.WHITE_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.WHITE_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_white_dye", this.has(Items.WHITE_DYE)).save(consumer, "white_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.WHITE_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.WHITE_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.WOODEN_AXE).define('#', Items.STICK).define('X', ItemTags.PLANKS).pattern("XX").pattern("X#").pattern(" #").unlocks("has_stick", this.has(Items.STICK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.OAK_DOOR, 3).define('#', Blocks.OAK_PLANKS).pattern("##").pattern("##").pattern("##").group("wooden_door").unlocks("has_planks", this.has(Blocks.OAK_PLANKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.WOODEN_HOE).define('#', Items.STICK).define('X', ItemTags.PLANKS).pattern("XX").pattern(" #").pattern(" #").unlocks("has_stick", this.has(Items.STICK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.WOODEN_PICKAXE).define('#', Items.STICK).define('X', ItemTags.PLANKS).pattern("XXX").pattern(" # ").pattern(" # ").unlocks("has_stick", this.has(Items.STICK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.WOODEN_SHOVEL).define('#', Items.STICK).define('X', ItemTags.PLANKS).pattern("X").pattern("#").pattern("#").unlocks("has_stick", this.has(Items.STICK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.WOODEN_SWORD).define('#', Items.STICK).define('X', ItemTags.PLANKS).pattern("X").pattern("X").pattern("#").unlocks("has_stick", this.has(Items.STICK)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.WRITABLE_BOOK).requires(Items.BOOK).requires(Items.INK_SAC).requires(Items.FEATHER).unlocks("has_book", this.has(Items.BOOK)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.YELLOW_BANNER).define('#', Blocks.YELLOW_WOOL).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlocks("has_yellow_wool", this.has(Blocks.YELLOW_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Items.YELLOW_BED).define('#', Blocks.YELLOW_WOOL).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlocks("has_yellow_wool", this.has(Blocks.YELLOW_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.YELLOW_BED).requires(Items.WHITE_BED).requires(Items.YELLOW_DYE).group("dyed_bed").unlocks("has_bed", this.has(Items.WHITE_BED)).save(consumer, "yellow_bed_from_white_bed");
-        ShapedRecipeBuilder.shaped(Blocks.YELLOW_CARPET, 3).define('#', Blocks.YELLOW_WOOL).pattern("##").group("carpet").unlocks("has_yellow_wool", this.has(Blocks.YELLOW_WOOL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.YELLOW_CARPET, 8).define('#', Blocks.WHITE_CARPET).define('$', Items.YELLOW_DYE).pattern("###").pattern("#$#").pattern("###").group("carpet").unlocks("has_white_carpet", this.has(Blocks.WHITE_CARPET)).unlocks("has_yellow_dye", this.has(Items.YELLOW_DYE)).save(consumer, "yellow_carpet_from_white_carpet");
-        ShapelessRecipeBuilder.shapeless(Blocks.YELLOW_CONCRETE_POWDER, 8).requires(Items.YELLOW_DYE).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlocks("has_sand", this.has(Blocks.SAND)).unlocks("has_gravel", this.has(Blocks.GRAVEL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.YELLOW_DYE).requires(Blocks.DANDELION).group("yellow_dye").unlocks("has_yellow_flower", this.has(Blocks.DANDELION)).save(consumer, "yellow_dye_from_dandelion");
-        ShapelessRecipeBuilder.shapeless(Items.YELLOW_DYE, 2).requires(Blocks.SUNFLOWER).group("yellow_dye").unlocks("has_double_plant", this.has(Blocks.SUNFLOWER)).save(consumer, "yellow_dye_from_sunflower");
-        ShapedRecipeBuilder.shaped(Blocks.YELLOW_STAINED_GLASS, 8).define('#', Blocks.GLASS).define('X', Items.YELLOW_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.YELLOW_STAINED_GLASS_PANE, 16).define('#', Blocks.YELLOW_STAINED_GLASS).pattern("###").pattern("###").group("stained_glass_pane").unlocks("has_glass", this.has(Blocks.GLASS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.YELLOW_STAINED_GLASS_PANE, 8).define('#', Blocks.GLASS_PANE).define('$', Items.YELLOW_DYE).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlocks("has_glass_pane", this.has(Blocks.GLASS_PANE)).unlocks("has_yellow_dye", this.has(Items.YELLOW_DYE)).save(consumer, "yellow_stained_glass_pane_from_glass_pane");
-        ShapedRecipeBuilder.shaped(Blocks.YELLOW_TERRACOTTA, 8).define('#', Blocks.TERRACOTTA).define('X', Items.YELLOW_DYE).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlocks("has_terracotta", this.has(Blocks.TERRACOTTA)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.YELLOW_WOOL).requires(Items.YELLOW_DYE).requires(Blocks.WHITE_WOOL).group("wool").unlocks("has_white_wool", this.has(Blocks.WHITE_WOOL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.DRIED_KELP, 9).requires(Blocks.DRIED_KELP_BLOCK).unlocks("has_dried_kelp_block", this.has(Blocks.DRIED_KELP_BLOCK)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Blocks.DRIED_KELP_BLOCK).requires(Items.DRIED_KELP, 9).unlocks("has_dried_kelp", this.has(Items.DRIED_KELP)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CONDUIT).define('#', Items.NAUTILUS_SHELL).define('X', Items.HEART_OF_THE_SEA).pattern("###").pattern("#X#").pattern("###").unlocks("has_nautilus_core", this.has(Items.HEART_OF_THE_SEA)).unlocks("has_nautilus_shell", this.has(Items.NAUTILUS_SHELL)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.POLISHED_GRANITE_STAIRS, 4).define('#', Blocks.POLISHED_GRANITE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_polished_granite", this.has(Blocks.POLISHED_GRANITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_RED_SANDSTONE_STAIRS, 4).define('#', Blocks.SMOOTH_RED_SANDSTONE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_smooth_red_sandstone", this.has(Blocks.SMOOTH_RED_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MOSSY_STONE_BRICK_STAIRS, 4).define('#', Blocks.MOSSY_STONE_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlocks("has_mossy_stone_bricks", this.has(Blocks.MOSSY_STONE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.POLISHED_DIORITE_STAIRS, 4).define('#', Blocks.POLISHED_DIORITE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_polished_diorite", this.has(Blocks.POLISHED_DIORITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MOSSY_COBBLESTONE_STAIRS, 4).define('#', Blocks.MOSSY_COBBLESTONE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_mossy_cobblestone", this.has(Blocks.MOSSY_COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.END_STONE_BRICK_STAIRS, 4).define('#', Blocks.END_STONE_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlocks("has_end_stone_bricks", this.has(Blocks.END_STONE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STONE_STAIRS, 4).define('#', Blocks.STONE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_stone", this.has(Blocks.STONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_SANDSTONE_STAIRS, 4).define('#', Blocks.SMOOTH_SANDSTONE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_smooth_sandstone", this.has(Blocks.SMOOTH_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_QUARTZ_STAIRS, 4).define('#', Blocks.SMOOTH_QUARTZ).pattern("#  ").pattern("## ").pattern("###").unlocks("has_smooth_quartz", this.has(Blocks.SMOOTH_QUARTZ)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GRANITE_STAIRS, 4).define('#', Blocks.GRANITE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_granite", this.has(Blocks.GRANITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ANDESITE_STAIRS, 4).define('#', Blocks.ANDESITE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_andesite", this.has(Blocks.ANDESITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_NETHER_BRICK_STAIRS, 4).define('#', Blocks.RED_NETHER_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlocks("has_red_nether_bricks", this.has(Blocks.RED_NETHER_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.POLISHED_ANDESITE_STAIRS, 4).define('#', Blocks.POLISHED_ANDESITE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_polished_andesite", this.has(Blocks.POLISHED_ANDESITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DIORITE_STAIRS, 4).define('#', Blocks.DIORITE).pattern("#  ").pattern("## ").pattern("###").unlocks("has_diorite", this.has(Blocks.DIORITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.POLISHED_GRANITE_SLAB, 6).define('#', Blocks.POLISHED_GRANITE).pattern("###").unlocks("has_polished_granite", this.has(Blocks.POLISHED_GRANITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_RED_SANDSTONE_SLAB, 6).define('#', Blocks.SMOOTH_RED_SANDSTONE).pattern("###").unlocks("has_smooth_red_sandstone", this.has(Blocks.SMOOTH_RED_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MOSSY_STONE_BRICK_SLAB, 6).define('#', Blocks.MOSSY_STONE_BRICKS).pattern("###").unlocks("has_mossy_stone_bricks", this.has(Blocks.MOSSY_STONE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.POLISHED_DIORITE_SLAB, 6).define('#', Blocks.POLISHED_DIORITE).pattern("###").unlocks("has_polished_diorite", this.has(Blocks.POLISHED_DIORITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MOSSY_COBBLESTONE_SLAB, 6).define('#', Blocks.MOSSY_COBBLESTONE).pattern("###").unlocks("has_mossy_cobblestone", this.has(Blocks.MOSSY_COBBLESTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.END_STONE_BRICK_SLAB, 6).define('#', Blocks.END_STONE_BRICKS).pattern("###").unlocks("has_end_stone_bricks", this.has(Blocks.END_STONE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_SANDSTONE_SLAB, 6).define('#', Blocks.SMOOTH_SANDSTONE).pattern("###").unlocks("has_smooth_sandstone", this.has(Blocks.SMOOTH_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_QUARTZ_SLAB, 6).define('#', Blocks.SMOOTH_QUARTZ).pattern("###").unlocks("has_smooth_quartz", this.has(Blocks.SMOOTH_QUARTZ)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GRANITE_SLAB, 6).define('#', Blocks.GRANITE).pattern("###").unlocks("has_granite", this.has(Blocks.GRANITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ANDESITE_SLAB, 6).define('#', Blocks.ANDESITE).pattern("###").unlocks("has_andesite", this.has(Blocks.ANDESITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_NETHER_BRICK_SLAB, 6).define('#', Blocks.RED_NETHER_BRICKS).pattern("###").unlocks("has_red_nether_bricks", this.has(Blocks.RED_NETHER_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.POLISHED_ANDESITE_SLAB, 6).define('#', Blocks.POLISHED_ANDESITE).pattern("###").unlocks("has_polished_andesite", this.has(Blocks.POLISHED_ANDESITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DIORITE_SLAB, 6).define('#', Blocks.DIORITE).pattern("###").unlocks("has_diorite", this.has(Blocks.DIORITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BRICK_WALL, 6).define('#', Blocks.BRICKS).pattern("###").pattern("###").unlocks("has_bricks", this.has(Blocks.BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_WALL, 6).define('#', Blocks.PRISMARINE).pattern("###").pattern("###").unlocks("has_prismarine", this.has(Blocks.PRISMARINE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_SANDSTONE_WALL, 6).define('#', Blocks.RED_SANDSTONE).pattern("###").pattern("###").unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.MOSSY_STONE_BRICK_WALL, 6).define('#', Blocks.MOSSY_STONE_BRICKS).pattern("###").pattern("###").unlocks("has_mossy_stone_bricks", this.has(Blocks.MOSSY_STONE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GRANITE_WALL, 6).define('#', Blocks.GRANITE).pattern("###").pattern("###").unlocks("has_granite", this.has(Blocks.GRANITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STONE_BRICK_WALL, 6).define('#', Blocks.STONE_BRICKS).pattern("###").pattern("###").unlocks("has_stone_bricks", this.has(Blocks.STONE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.NETHER_BRICK_WALL, 6).define('#', Blocks.NETHER_BRICKS).pattern("###").pattern("###").unlocks("has_nether_bricks", this.has(Blocks.NETHER_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.ANDESITE_WALL, 6).define('#', Blocks.ANDESITE).pattern("###").pattern("###").unlocks("has_andesite", this.has(Blocks.ANDESITE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.RED_NETHER_BRICK_WALL, 6).define('#', Blocks.RED_NETHER_BRICKS).pattern("###").pattern("###").unlocks("has_red_nether_bricks", this.has(Blocks.RED_NETHER_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SANDSTONE_WALL, 6).define('#', Blocks.SANDSTONE).pattern("###").pattern("###").unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.END_STONE_BRICK_WALL, 6).define('#', Blocks.END_STONE_BRICKS).pattern("###").pattern("###").unlocks("has_end_stone_bricks", this.has(Blocks.END_STONE_BRICKS)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.DIORITE_WALL, 6).define('#', Blocks.DIORITE).pattern("###").pattern("###").unlocks("has_diorite", this.has(Blocks.DIORITE)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.CREEPER_BANNER_PATTERN).requires(Items.PAPER).requires(Items.CREEPER_HEAD).unlocks("has_creeper_head", this.has(Items.CREEPER_HEAD)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.SKULL_BANNER_PATTERN).requires(Items.PAPER).requires(Items.WITHER_SKELETON_SKULL).unlocks("has_wither_skeleton_skull", this.has(Items.WITHER_SKELETON_SKULL)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.FLOWER_BANNER_PATTERN).requires(Items.PAPER).requires(Blocks.OXEYE_DAISY).unlocks("has_oxeye_daisy", this.has(Blocks.OXEYE_DAISY)).save(consumer);
-        ShapelessRecipeBuilder.shapeless(Items.MOJANG_BANNER_PATTERN).requires(Items.PAPER).requires(Items.ENCHANTED_GOLDEN_APPLE).unlocks("has_enchanted_golden_apple", this.has(Items.ENCHANTED_GOLDEN_APPLE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SCAFFOLDING, 6).define('~', Items.STRING).define('I', Blocks.BAMBOO).pattern("I~I").pattern("I I").pattern("I I").unlocks("has_bamboo", this.has(Blocks.BAMBOO)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.GRINDSTONE).define('I', Items.STICK).define('-', Blocks.STONE_SLAB).define('#', ItemTags.PLANKS).pattern("I-I").pattern("# #").unlocks("has_stone_slab", this.has(Blocks.STONE_SLAB)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.BLAST_FURNACE).define('#', Blocks.SMOOTH_STONE).define('X', Blocks.FURNACE).define('I', Items.IRON_INGOT).pattern("III").pattern("IXI").pattern("###").unlocks("has_smooth_stone", this.has(Blocks.SMOOTH_STONE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SMOKER).define('#', ItemTags.LOGS).define('X', Blocks.FURNACE).pattern(" # ").pattern("#X#").pattern(" # ").unlocks("has_furnace", this.has(Blocks.FURNACE)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.CARTOGRAPHY_TABLE).define('#', ItemTags.PLANKS).define('@', Items.PAPER).pattern("@@").pattern("##").pattern("##").unlocks("has_string", this.has(Items.STRING)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.SMITHING_TABLE).define('#', ItemTags.PLANKS).define('@', Items.IRON_INGOT).pattern("@@").pattern("##").pattern("##").unlocks("has_iron_ingot", this.has(Items.IRON_INGOT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.FLETCHING_TABLE).define('#', ItemTags.PLANKS).define('@', Items.FLINT).pattern("@@").pattern("##").pattern("##").unlocks("has_flint", this.has(Items.FLINT)).save(consumer);
-        ShapedRecipeBuilder.shaped(Blocks.STONECUTTER).define('I', Items.IRON_INGOT).define('#', Blocks.STONE).pattern(" I ").pattern("###").unlocks("has_stone", this.has(Blocks.STONE)).save(consumer);
+    private static void buildShapelessRecipes(final Consumer<FinishedRecipe> consumer) {
+        planksFromLog(consumer, Blocks.ACACIA_PLANKS, ItemTags.ACACIA_LOGS);
+        planksFromLogs(consumer, Blocks.BIRCH_PLANKS, ItemTags.BIRCH_LOGS);
+        planksFromLogs(consumer, Blocks.CRIMSON_PLANKS, ItemTags.CRIMSON_STEMS);
+        planksFromLog(consumer, Blocks.DARK_OAK_PLANKS, ItemTags.DARK_OAK_LOGS);
+        planksFromLogs(consumer, Blocks.JUNGLE_PLANKS, ItemTags.JUNGLE_LOGS);
+        planksFromLogs(consumer, Blocks.OAK_PLANKS, ItemTags.OAK_LOGS);
+        planksFromLogs(consumer, Blocks.SPRUCE_PLANKS, ItemTags.SPRUCE_LOGS);
+        planksFromLogs(consumer, Blocks.WARPED_PLANKS, ItemTags.WARPED_STEMS);
+        woodFromLogs(consumer, Blocks.ACACIA_WOOD, Blocks.ACACIA_LOG);
+        woodFromLogs(consumer, Blocks.BIRCH_WOOD, Blocks.BIRCH_LOG);
+        woodFromLogs(consumer, Blocks.DARK_OAK_WOOD, Blocks.DARK_OAK_LOG);
+        woodFromLogs(consumer, Blocks.JUNGLE_WOOD, Blocks.JUNGLE_LOG);
+        woodFromLogs(consumer, Blocks.OAK_WOOD, Blocks.OAK_LOG);
+        woodFromLogs(consumer, Blocks.SPRUCE_WOOD, Blocks.SPRUCE_LOG);
+        woodFromLogs(consumer, Blocks.CRIMSON_HYPHAE, Blocks.CRIMSON_STEM);
+        woodFromLogs(consumer, Blocks.WARPED_HYPHAE, Blocks.WARPED_STEM);
+        woodFromLogs(consumer, Blocks.STRIPPED_ACACIA_WOOD, Blocks.STRIPPED_ACACIA_LOG);
+        woodFromLogs(consumer, Blocks.STRIPPED_BIRCH_WOOD, Blocks.STRIPPED_BIRCH_LOG);
+        woodFromLogs(consumer, Blocks.STRIPPED_DARK_OAK_WOOD, Blocks.STRIPPED_DARK_OAK_LOG);
+        woodFromLogs(consumer, Blocks.STRIPPED_JUNGLE_WOOD, Blocks.STRIPPED_JUNGLE_LOG);
+        woodFromLogs(consumer, Blocks.STRIPPED_OAK_WOOD, Blocks.STRIPPED_OAK_LOG);
+        woodFromLogs(consumer, Blocks.STRIPPED_SPRUCE_WOOD, Blocks.STRIPPED_SPRUCE_LOG);
+        woodFromLogs(consumer, Blocks.STRIPPED_CRIMSON_HYPHAE, Blocks.STRIPPED_CRIMSON_STEM);
+        woodFromLogs(consumer, Blocks.STRIPPED_WARPED_HYPHAE, Blocks.STRIPPED_WARPED_STEM);
+        woodenBoat(consumer, Items.ACACIA_BOAT, Blocks.ACACIA_PLANKS);
+        woodenBoat(consumer, Items.BIRCH_BOAT, Blocks.BIRCH_PLANKS);
+        woodenBoat(consumer, Items.DARK_OAK_BOAT, Blocks.DARK_OAK_PLANKS);
+        woodenBoat(consumer, Items.JUNGLE_BOAT, Blocks.JUNGLE_PLANKS);
+        woodenBoat(consumer, Items.OAK_BOAT, Blocks.OAK_PLANKS);
+        woodenBoat(consumer, Items.SPRUCE_BOAT, Blocks.SPRUCE_PLANKS);
+        woodenButton(consumer, Blocks.ACACIA_BUTTON, Blocks.ACACIA_PLANKS);
+        woodenDoor(consumer, Blocks.ACACIA_DOOR, Blocks.ACACIA_PLANKS);
+        woodenFence(consumer, Blocks.ACACIA_FENCE, Blocks.ACACIA_PLANKS);
+        woodenFenceGate(consumer, Blocks.ACACIA_FENCE_GATE, Blocks.ACACIA_PLANKS);
+        woodenPressurePlate(consumer, Blocks.ACACIA_PRESSURE_PLATE, Blocks.ACACIA_PLANKS);
+        woodenSlab(consumer, Blocks.ACACIA_SLAB, Blocks.ACACIA_PLANKS);
+        woodenStairs(consumer, Blocks.ACACIA_STAIRS, Blocks.ACACIA_PLANKS);
+        woodenTrapdoor(consumer, Blocks.ACACIA_TRAPDOOR, Blocks.ACACIA_PLANKS);
+        woodenSign(consumer, Blocks.ACACIA_SIGN, Blocks.ACACIA_PLANKS);
+        woodenButton(consumer, Blocks.BIRCH_BUTTON, Blocks.BIRCH_PLANKS);
+        woodenDoor(consumer, Blocks.BIRCH_DOOR, Blocks.BIRCH_PLANKS);
+        woodenFence(consumer, Blocks.BIRCH_FENCE, Blocks.BIRCH_PLANKS);
+        woodenFenceGate(consumer, Blocks.BIRCH_FENCE_GATE, Blocks.BIRCH_PLANKS);
+        woodenPressurePlate(consumer, Blocks.BIRCH_PRESSURE_PLATE, Blocks.BIRCH_PLANKS);
+        woodenSlab(consumer, Blocks.BIRCH_SLAB, Blocks.BIRCH_PLANKS);
+        woodenStairs(consumer, Blocks.BIRCH_STAIRS, Blocks.BIRCH_PLANKS);
+        woodenTrapdoor(consumer, Blocks.BIRCH_TRAPDOOR, Blocks.BIRCH_PLANKS);
+        woodenSign(consumer, Blocks.BIRCH_SIGN, Blocks.BIRCH_PLANKS);
+        woodenButton(consumer, Blocks.CRIMSON_BUTTON, Blocks.CRIMSON_PLANKS);
+        woodenDoor(consumer, Blocks.CRIMSON_DOOR, Blocks.CRIMSON_PLANKS);
+        woodenFence(consumer, Blocks.CRIMSON_FENCE, Blocks.CRIMSON_PLANKS);
+        woodenFenceGate(consumer, Blocks.CRIMSON_FENCE_GATE, Blocks.CRIMSON_PLANKS);
+        woodenPressurePlate(consumer, Blocks.CRIMSON_PRESSURE_PLATE, Blocks.CRIMSON_PLANKS);
+        woodenSlab(consumer, Blocks.CRIMSON_SLAB, Blocks.CRIMSON_PLANKS);
+        woodenStairs(consumer, Blocks.CRIMSON_STAIRS, Blocks.CRIMSON_PLANKS);
+        woodenTrapdoor(consumer, Blocks.CRIMSON_TRAPDOOR, Blocks.CRIMSON_PLANKS);
+        woodenSign(consumer, Blocks.CRIMSON_SIGN, Blocks.CRIMSON_PLANKS);
+        woodenButton(consumer, Blocks.DARK_OAK_BUTTON, Blocks.DARK_OAK_PLANKS);
+        woodenDoor(consumer, Blocks.DARK_OAK_DOOR, Blocks.DARK_OAK_PLANKS);
+        woodenFence(consumer, Blocks.DARK_OAK_FENCE, Blocks.DARK_OAK_PLANKS);
+        woodenFenceGate(consumer, Blocks.DARK_OAK_FENCE_GATE, Blocks.DARK_OAK_PLANKS);
+        woodenPressurePlate(consumer, Blocks.DARK_OAK_PRESSURE_PLATE, Blocks.DARK_OAK_PLANKS);
+        woodenSlab(consumer, Blocks.DARK_OAK_SLAB, Blocks.DARK_OAK_PLANKS);
+        woodenStairs(consumer, Blocks.DARK_OAK_STAIRS, Blocks.DARK_OAK_PLANKS);
+        woodenTrapdoor(consumer, Blocks.DARK_OAK_TRAPDOOR, Blocks.DARK_OAK_PLANKS);
+        woodenSign(consumer, Blocks.DARK_OAK_SIGN, Blocks.DARK_OAK_PLANKS);
+        woodenButton(consumer, Blocks.JUNGLE_BUTTON, Blocks.JUNGLE_PLANKS);
+        woodenDoor(consumer, Blocks.JUNGLE_DOOR, Blocks.JUNGLE_PLANKS);
+        woodenFence(consumer, Blocks.JUNGLE_FENCE, Blocks.JUNGLE_PLANKS);
+        woodenFenceGate(consumer, Blocks.JUNGLE_FENCE_GATE, Blocks.JUNGLE_PLANKS);
+        woodenPressurePlate(consumer, Blocks.JUNGLE_PRESSURE_PLATE, Blocks.JUNGLE_PLANKS);
+        woodenSlab(consumer, Blocks.JUNGLE_SLAB, Blocks.JUNGLE_PLANKS);
+        woodenStairs(consumer, Blocks.JUNGLE_STAIRS, Blocks.JUNGLE_PLANKS);
+        woodenTrapdoor(consumer, Blocks.JUNGLE_TRAPDOOR, Blocks.JUNGLE_PLANKS);
+        woodenSign(consumer, Blocks.JUNGLE_SIGN, Blocks.JUNGLE_PLANKS);
+        woodenButton(consumer, Blocks.OAK_BUTTON, Blocks.OAK_PLANKS);
+        woodenDoor(consumer, Blocks.OAK_DOOR, Blocks.OAK_PLANKS);
+        woodenFence(consumer, Blocks.OAK_FENCE, Blocks.OAK_PLANKS);
+        woodenFenceGate(consumer, Blocks.OAK_FENCE_GATE, Blocks.OAK_PLANKS);
+        woodenPressurePlate(consumer, Blocks.OAK_PRESSURE_PLATE, Blocks.OAK_PLANKS);
+        woodenSlab(consumer, Blocks.OAK_SLAB, Blocks.OAK_PLANKS);
+        woodenStairs(consumer, Blocks.OAK_STAIRS, Blocks.OAK_PLANKS);
+        woodenTrapdoor(consumer, Blocks.OAK_TRAPDOOR, Blocks.OAK_PLANKS);
+        woodenSign(consumer, Blocks.OAK_SIGN, Blocks.OAK_PLANKS);
+        woodenButton(consumer, Blocks.SPRUCE_BUTTON, Blocks.SPRUCE_PLANKS);
+        woodenDoor(consumer, Blocks.SPRUCE_DOOR, Blocks.SPRUCE_PLANKS);
+        woodenFence(consumer, Blocks.SPRUCE_FENCE, Blocks.SPRUCE_PLANKS);
+        woodenFenceGate(consumer, Blocks.SPRUCE_FENCE_GATE, Blocks.SPRUCE_PLANKS);
+        woodenPressurePlate(consumer, Blocks.SPRUCE_PRESSURE_PLATE, Blocks.SPRUCE_PLANKS);
+        woodenSlab(consumer, Blocks.SPRUCE_SLAB, Blocks.SPRUCE_PLANKS);
+        woodenStairs(consumer, Blocks.SPRUCE_STAIRS, Blocks.SPRUCE_PLANKS);
+        woodenTrapdoor(consumer, Blocks.SPRUCE_TRAPDOOR, Blocks.SPRUCE_PLANKS);
+        woodenSign(consumer, Blocks.SPRUCE_SIGN, Blocks.SPRUCE_PLANKS);
+        woodenButton(consumer, Blocks.WARPED_BUTTON, Blocks.WARPED_PLANKS);
+        woodenDoor(consumer, Blocks.WARPED_DOOR, Blocks.WARPED_PLANKS);
+        woodenFence(consumer, Blocks.WARPED_FENCE, Blocks.WARPED_PLANKS);
+        woodenFenceGate(consumer, Blocks.WARPED_FENCE_GATE, Blocks.WARPED_PLANKS);
+        woodenPressurePlate(consumer, Blocks.WARPED_PRESSURE_PLATE, Blocks.WARPED_PLANKS);
+        woodenSlab(consumer, Blocks.WARPED_SLAB, Blocks.WARPED_PLANKS);
+        woodenStairs(consumer, Blocks.WARPED_STAIRS, Blocks.WARPED_PLANKS);
+        woodenTrapdoor(consumer, Blocks.WARPED_TRAPDOOR, Blocks.WARPED_PLANKS);
+        woodenSign(consumer, Blocks.WARPED_SIGN, Blocks.WARPED_PLANKS);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.BLACK_WOOL, Items.BLACK_DYE);
+        carpetFromWool(consumer, Blocks.BLACK_CARPET, Blocks.BLACK_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.BLACK_CARPET, Items.BLACK_DYE);
+        bedFromPlanksAndWool(consumer, Items.BLACK_BED, Blocks.BLACK_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.BLACK_BED, Items.BLACK_DYE);
+        banner(consumer, Items.BLACK_BANNER, Blocks.BLACK_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.BLUE_WOOL, Items.BLUE_DYE);
+        carpetFromWool(consumer, Blocks.BLUE_CARPET, Blocks.BLUE_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.BLUE_CARPET, Items.BLUE_DYE);
+        bedFromPlanksAndWool(consumer, Items.BLUE_BED, Blocks.BLUE_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.BLUE_BED, Items.BLUE_DYE);
+        banner(consumer, Items.BLUE_BANNER, Blocks.BLUE_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.BROWN_WOOL, Items.BROWN_DYE);
+        carpetFromWool(consumer, Blocks.BROWN_CARPET, Blocks.BROWN_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.BROWN_CARPET, Items.BROWN_DYE);
+        bedFromPlanksAndWool(consumer, Items.BROWN_BED, Blocks.BROWN_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.BROWN_BED, Items.BROWN_DYE);
+        banner(consumer, Items.BROWN_BANNER, Blocks.BROWN_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.CYAN_WOOL, Items.CYAN_DYE);
+        carpetFromWool(consumer, Blocks.CYAN_CARPET, Blocks.CYAN_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.CYAN_CARPET, Items.CYAN_DYE);
+        bedFromPlanksAndWool(consumer, Items.CYAN_BED, Blocks.CYAN_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.CYAN_BED, Items.CYAN_DYE);
+        banner(consumer, Items.CYAN_BANNER, Blocks.CYAN_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.GRAY_WOOL, Items.GRAY_DYE);
+        carpetFromWool(consumer, Blocks.GRAY_CARPET, Blocks.GRAY_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.GRAY_CARPET, Items.GRAY_DYE);
+        bedFromPlanksAndWool(consumer, Items.GRAY_BED, Blocks.GRAY_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.GRAY_BED, Items.GRAY_DYE);
+        banner(consumer, Items.GRAY_BANNER, Blocks.GRAY_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.GREEN_WOOL, Items.GREEN_DYE);
+        carpetFromWool(consumer, Blocks.GREEN_CARPET, Blocks.GREEN_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.GREEN_CARPET, Items.GREEN_DYE);
+        bedFromPlanksAndWool(consumer, Items.GREEN_BED, Blocks.GREEN_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.GREEN_BED, Items.GREEN_DYE);
+        banner(consumer, Items.GREEN_BANNER, Blocks.GREEN_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.LIGHT_BLUE_WOOL, Items.LIGHT_BLUE_DYE);
+        carpetFromWool(consumer, Blocks.LIGHT_BLUE_CARPET, Blocks.LIGHT_BLUE_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.LIGHT_BLUE_CARPET, Items.LIGHT_BLUE_DYE);
+        bedFromPlanksAndWool(consumer, Items.LIGHT_BLUE_BED, Blocks.LIGHT_BLUE_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.LIGHT_BLUE_BED, Items.LIGHT_BLUE_DYE);
+        banner(consumer, Items.LIGHT_BLUE_BANNER, Blocks.LIGHT_BLUE_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.LIGHT_GRAY_WOOL, Items.LIGHT_GRAY_DYE);
+        carpetFromWool(consumer, Blocks.LIGHT_GRAY_CARPET, Blocks.LIGHT_GRAY_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.LIGHT_GRAY_CARPET, Items.LIGHT_GRAY_DYE);
+        bedFromPlanksAndWool(consumer, Items.LIGHT_GRAY_BED, Blocks.LIGHT_GRAY_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.LIGHT_GRAY_BED, Items.LIGHT_GRAY_DYE);
+        banner(consumer, Items.LIGHT_GRAY_BANNER, Blocks.LIGHT_GRAY_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.LIME_WOOL, Items.LIME_DYE);
+        carpetFromWool(consumer, Blocks.LIME_CARPET, Blocks.LIME_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.LIME_CARPET, Items.LIME_DYE);
+        bedFromPlanksAndWool(consumer, Items.LIME_BED, Blocks.LIME_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.LIME_BED, Items.LIME_DYE);
+        banner(consumer, Items.LIME_BANNER, Blocks.LIME_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.MAGENTA_WOOL, Items.MAGENTA_DYE);
+        carpetFromWool(consumer, Blocks.MAGENTA_CARPET, Blocks.MAGENTA_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.MAGENTA_CARPET, Items.MAGENTA_DYE);
+        bedFromPlanksAndWool(consumer, Items.MAGENTA_BED, Blocks.MAGENTA_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.MAGENTA_BED, Items.MAGENTA_DYE);
+        banner(consumer, Items.MAGENTA_BANNER, Blocks.MAGENTA_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.ORANGE_WOOL, Items.ORANGE_DYE);
+        carpetFromWool(consumer, Blocks.ORANGE_CARPET, Blocks.ORANGE_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.ORANGE_CARPET, Items.ORANGE_DYE);
+        bedFromPlanksAndWool(consumer, Items.ORANGE_BED, Blocks.ORANGE_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.ORANGE_BED, Items.ORANGE_DYE);
+        banner(consumer, Items.ORANGE_BANNER, Blocks.ORANGE_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.PINK_WOOL, Items.PINK_DYE);
+        carpetFromWool(consumer, Blocks.PINK_CARPET, Blocks.PINK_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.PINK_CARPET, Items.PINK_DYE);
+        bedFromPlanksAndWool(consumer, Items.PINK_BED, Blocks.PINK_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.PINK_BED, Items.PINK_DYE);
+        banner(consumer, Items.PINK_BANNER, Blocks.PINK_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.PURPLE_WOOL, Items.PURPLE_DYE);
+        carpetFromWool(consumer, Blocks.PURPLE_CARPET, Blocks.PURPLE_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.PURPLE_CARPET, Items.PURPLE_DYE);
+        bedFromPlanksAndWool(consumer, Items.PURPLE_BED, Blocks.PURPLE_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.PURPLE_BED, Items.PURPLE_DYE);
+        banner(consumer, Items.PURPLE_BANNER, Blocks.PURPLE_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.RED_WOOL, Items.RED_DYE);
+        carpetFromWool(consumer, Blocks.RED_CARPET, Blocks.RED_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.RED_CARPET, Items.RED_DYE);
+        bedFromPlanksAndWool(consumer, Items.RED_BED, Blocks.RED_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.RED_BED, Items.RED_DYE);
+        banner(consumer, Items.RED_BANNER, Blocks.RED_WOOL);
+        carpetFromWool(consumer, Blocks.WHITE_CARPET, Blocks.WHITE_WOOL);
+        bedFromPlanksAndWool(consumer, Items.WHITE_BED, Blocks.WHITE_WOOL);
+        banner(consumer, Items.WHITE_BANNER, Blocks.WHITE_WOOL);
+        coloredWoolFromWhiteWoolAndDye(consumer, Blocks.YELLOW_WOOL, Items.YELLOW_DYE);
+        carpetFromWool(consumer, Blocks.YELLOW_CARPET, Blocks.YELLOW_WOOL);
+        coloredCarpetFromWhiteCarpetAndDye(consumer, Blocks.YELLOW_CARPET, Items.YELLOW_DYE);
+        bedFromPlanksAndWool(consumer, Items.YELLOW_BED, Blocks.YELLOW_WOOL);
+        bedFromWhiteBedAndDye(consumer, Items.YELLOW_BED, Items.YELLOW_DYE);
+        banner(consumer, Items.YELLOW_BANNER, Blocks.YELLOW_WOOL);
+        stainedGlassFromGlassAndDye(consumer, Blocks.BLACK_STAINED_GLASS, Items.BLACK_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.BLACK_STAINED_GLASS_PANE, Blocks.BLACK_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.BLACK_STAINED_GLASS_PANE, Items.BLACK_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.BLUE_STAINED_GLASS, Items.BLUE_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.BLUE_STAINED_GLASS_PANE, Blocks.BLUE_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.BLUE_STAINED_GLASS_PANE, Items.BLUE_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.BROWN_STAINED_GLASS, Items.BROWN_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.BROWN_STAINED_GLASS_PANE, Blocks.BROWN_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.BROWN_STAINED_GLASS_PANE, Items.BROWN_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.CYAN_STAINED_GLASS, Items.CYAN_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.CYAN_STAINED_GLASS_PANE, Blocks.CYAN_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.CYAN_STAINED_GLASS_PANE, Items.CYAN_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.GRAY_STAINED_GLASS, Items.GRAY_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.GRAY_STAINED_GLASS_PANE, Blocks.GRAY_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.GRAY_STAINED_GLASS_PANE, Items.GRAY_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.GREEN_STAINED_GLASS, Items.GREEN_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.GREEN_STAINED_GLASS_PANE, Blocks.GREEN_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.GREEN_STAINED_GLASS_PANE, Items.GREEN_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.LIGHT_BLUE_STAINED_GLASS, Items.LIGHT_BLUE_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, Blocks.LIGHT_BLUE_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, Items.LIGHT_BLUE_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.LIGHT_GRAY_STAINED_GLASS, Items.LIGHT_GRAY_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE, Blocks.LIGHT_GRAY_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE, Items.LIGHT_GRAY_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.LIME_STAINED_GLASS, Items.LIME_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.LIME_STAINED_GLASS_PANE, Blocks.LIME_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.LIME_STAINED_GLASS_PANE, Items.LIME_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.MAGENTA_STAINED_GLASS, Items.MAGENTA_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.MAGENTA_STAINED_GLASS_PANE, Blocks.MAGENTA_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.MAGENTA_STAINED_GLASS_PANE, Items.MAGENTA_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.ORANGE_STAINED_GLASS, Items.ORANGE_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.ORANGE_STAINED_GLASS_PANE, Blocks.ORANGE_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.ORANGE_STAINED_GLASS_PANE, Items.ORANGE_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.PINK_STAINED_GLASS, Items.PINK_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.PINK_STAINED_GLASS_PANE, Blocks.PINK_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.PINK_STAINED_GLASS_PANE, Items.PINK_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.PURPLE_STAINED_GLASS, Items.PURPLE_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.PURPLE_STAINED_GLASS_PANE, Blocks.PURPLE_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.PURPLE_STAINED_GLASS_PANE, Items.PURPLE_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.RED_STAINED_GLASS, Items.RED_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.RED_STAINED_GLASS_PANE, Blocks.RED_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.RED_STAINED_GLASS_PANE, Items.RED_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.WHITE_STAINED_GLASS, Items.WHITE_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.WHITE_STAINED_GLASS_PANE, Blocks.WHITE_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.WHITE_STAINED_GLASS_PANE, Items.WHITE_DYE);
+        stainedGlassFromGlassAndDye(consumer, Blocks.YELLOW_STAINED_GLASS, Items.YELLOW_DYE);
+        stainedGlassPaneFromStainedGlass(consumer, Blocks.YELLOW_STAINED_GLASS_PANE, Blocks.YELLOW_STAINED_GLASS);
+        stainedGlassPaneFromGlassPaneAndDye(consumer, Blocks.YELLOW_STAINED_GLASS_PANE, Items.YELLOW_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.BLACK_TERRACOTTA, Items.BLACK_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.BLUE_TERRACOTTA, Items.BLUE_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.BROWN_TERRACOTTA, Items.BROWN_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.CYAN_TERRACOTTA, Items.CYAN_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.GRAY_TERRACOTTA, Items.GRAY_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.GREEN_TERRACOTTA, Items.GREEN_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.LIGHT_BLUE_TERRACOTTA, Items.LIGHT_BLUE_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.LIGHT_GRAY_TERRACOTTA, Items.LIGHT_GRAY_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.LIME_TERRACOTTA, Items.LIME_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.MAGENTA_TERRACOTTA, Items.MAGENTA_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.ORANGE_TERRACOTTA, Items.ORANGE_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.PINK_TERRACOTTA, Items.PINK_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.PURPLE_TERRACOTTA, Items.PURPLE_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.RED_TERRACOTTA, Items.RED_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.WHITE_TERRACOTTA, Items.WHITE_DYE);
+        coloredTerracottaFromTerracottaAndDye(consumer, Blocks.YELLOW_TERRACOTTA, Items.YELLOW_DYE);
+        concretePowder(consumer, Blocks.BLACK_CONCRETE_POWDER, Items.BLACK_DYE);
+        concretePowder(consumer, Blocks.BLUE_CONCRETE_POWDER, Items.BLUE_DYE);
+        concretePowder(consumer, Blocks.BROWN_CONCRETE_POWDER, Items.BROWN_DYE);
+        concretePowder(consumer, Blocks.CYAN_CONCRETE_POWDER, Items.CYAN_DYE);
+        concretePowder(consumer, Blocks.GRAY_CONCRETE_POWDER, Items.GRAY_DYE);
+        concretePowder(consumer, Blocks.GREEN_CONCRETE_POWDER, Items.GREEN_DYE);
+        concretePowder(consumer, Blocks.LIGHT_BLUE_CONCRETE_POWDER, Items.LIGHT_BLUE_DYE);
+        concretePowder(consumer, Blocks.LIGHT_GRAY_CONCRETE_POWDER, Items.LIGHT_GRAY_DYE);
+        concretePowder(consumer, Blocks.LIME_CONCRETE_POWDER, Items.LIME_DYE);
+        concretePowder(consumer, Blocks.MAGENTA_CONCRETE_POWDER, Items.MAGENTA_DYE);
+        concretePowder(consumer, Blocks.ORANGE_CONCRETE_POWDER, Items.ORANGE_DYE);
+        concretePowder(consumer, Blocks.PINK_CONCRETE_POWDER, Items.PINK_DYE);
+        concretePowder(consumer, Blocks.PURPLE_CONCRETE_POWDER, Items.PURPLE_DYE);
+        concretePowder(consumer, Blocks.RED_CONCRETE_POWDER, Items.RED_DYE);
+        concretePowder(consumer, Blocks.WHITE_CONCRETE_POWDER, Items.WHITE_DYE);
+        concretePowder(consumer, Blocks.YELLOW_CONCRETE_POWDER, Items.YELLOW_DYE);
+        ShapedRecipeBuilder.shaped(Blocks.ACTIVATOR_RAIL, 6).define('#', Blocks.REDSTONE_TORCH).define('S', Items.STICK).define('X', Items.IRON_INGOT).pattern("XSX").pattern("X#X").pattern("XSX").unlockedBy("has_rail", has(Blocks.RAIL)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Blocks.ANDESITE, 2).requires(Blocks.DIORITE).requires(Blocks.COBBLESTONE).unlockedBy("has_stone", has(Blocks.DIORITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.ANVIL).define('I', Blocks.IRON_BLOCK).define('i', Items.IRON_INGOT).pattern("III").pattern(" i ").pattern("iii").unlockedBy("has_iron_block", has(Blocks.IRON_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.ARMOR_STAND).define('/', Items.STICK).define('_', Blocks.SMOOTH_STONE_SLAB).pattern("///").pattern(" / ").pattern("/_/").unlockedBy("has_stone_slab", has(Blocks.SMOOTH_STONE_SLAB)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.ARROW, 4).define('#', Items.STICK).define('X', Items.FLINT).define('Y', Items.FEATHER).pattern("X").pattern("#").pattern("Y").unlockedBy("has_feather", has(Items.FEATHER)).unlockedBy("has_flint", has(Items.FLINT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BARREL, 1).define('P', ItemTags.PLANKS).define('S', ItemTags.WOODEN_SLABS).pattern("PSP").pattern("P P").pattern("PSP").unlockedBy("has_planks", has(ItemTags.PLANKS)).unlockedBy("has_wood_slab", has(ItemTags.WOODEN_SLABS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BEACON).define('S', Items.NETHER_STAR).define('G', Blocks.GLASS).define('O', Blocks.OBSIDIAN).pattern("GGG").pattern("GSG").pattern("OOO").unlockedBy("has_nether_star", has(Items.NETHER_STAR)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BEEHIVE).define('P', ItemTags.PLANKS).define('H', Items.HONEYCOMB).pattern("PPP").pattern("HHH").pattern("PPP").unlockedBy("has_honeycomb", has(Items.HONEYCOMB)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.BEETROOT_SOUP).requires(Items.BOWL).requires(Items.BEETROOT, 6).unlockedBy("has_beetroot", has(Items.BEETROOT)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.BLACK_DYE).requires(Items.INK_SAC).group("black_dye").unlockedBy("has_ink_sac", has(Items.INK_SAC)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.BLACK_DYE).requires(Blocks.WITHER_ROSE).group("black_dye").unlockedBy("has_black_flower", has(Blocks.WITHER_ROSE)).save(consumer, "black_dye_from_wither_rose");
+        ShapelessRecipeBuilder.shapeless(Items.BLAZE_POWDER, 2).requires(Items.BLAZE_ROD).unlockedBy("has_blaze_rod", has(Items.BLAZE_ROD)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.BLUE_DYE).requires(Items.LAPIS_LAZULI).group("blue_dye").unlockedBy("has_lapis_lazuli", has(Items.LAPIS_LAZULI)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.BLUE_DYE).requires(Blocks.CORNFLOWER).group("blue_dye").unlockedBy("has_blue_flower", has(Blocks.CORNFLOWER)).save(consumer, "blue_dye_from_cornflower");
+        ShapedRecipeBuilder.shaped(Blocks.BLUE_ICE).define('#', Blocks.PACKED_ICE).pattern("###").pattern("###").pattern("###").unlockedBy("has_packed_ice", has(Blocks.PACKED_ICE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BONE_BLOCK).define('X', Items.BONE_MEAL).pattern("XXX").pattern("XXX").pattern("XXX").unlockedBy("has_bonemeal", has(Items.BONE_MEAL)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.BONE_MEAL, 3).requires(Items.BONE).group("bonemeal").unlockedBy("has_bone", has(Items.BONE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.BONE_MEAL, 9).requires(Blocks.BONE_BLOCK).group("bonemeal").unlockedBy("has_bone_block", has(Blocks.BONE_BLOCK)).save(consumer, "bone_meal_from_bone_block");
+        ShapelessRecipeBuilder.shapeless(Items.BOOK).requires(Items.PAPER, 3).requires(Items.LEATHER).unlockedBy("has_paper", has(Items.PAPER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BOOKSHELF).define('#', ItemTags.PLANKS).define('X', Items.BOOK).pattern("###").pattern("XXX").pattern("###").unlockedBy("has_book", has(Items.BOOK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.BOW).define('#', Items.STICK).define('X', Items.STRING).pattern(" #X").pattern("# X").pattern(" #X").unlockedBy("has_string", has(Items.STRING)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.BOWL, 4).define('#', ItemTags.PLANKS).pattern("# #").pattern(" # ").unlockedBy("has_brown_mushroom", has(Blocks.BROWN_MUSHROOM)).unlockedBy("has_red_mushroom", has(Blocks.RED_MUSHROOM)).unlockedBy("has_mushroom_stew", has(Items.MUSHROOM_STEW)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.BREAD).define('#', Items.WHEAT).pattern("###").unlockedBy("has_wheat", has(Items.WHEAT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BREWING_STAND).define('B', Items.BLAZE_ROD).define('#', Blocks.COBBLESTONE).pattern(" B ").pattern("###").unlockedBy("has_blaze_rod", has(Items.BLAZE_ROD)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BRICKS).define('#', Items.BRICK).pattern("##").pattern("##").unlockedBy("has_brick", has(Items.BRICK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BRICK_SLAB, 6).define('#', Blocks.BRICKS).pattern("###").unlockedBy("has_brick_block", has(Blocks.BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BRICK_STAIRS, 4).define('#', Blocks.BRICKS).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_brick_block", has(Blocks.BRICKS)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.BROWN_DYE).requires(Items.COCOA_BEANS).group("brown_dye").unlockedBy("has_cocoa_beans", has(Items.COCOA_BEANS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.BUCKET).define('#', Items.IRON_INGOT).pattern("# #").pattern(" # ").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CAKE).define('A', Items.MILK_BUCKET).define('B', Items.SUGAR).define('C', Items.WHEAT).define('E', Items.EGG).pattern("AAA").pattern("BEB").pattern("CCC").unlockedBy("has_egg", has(Items.EGG)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CAMPFIRE).define('L', ItemTags.LOGS).define('S', Items.STICK).define('C', ItemTags.COALS).pattern(" S ").pattern("SCS").pattern("LLL").unlockedBy("has_stick", has(Items.STICK)).unlockedBy("has_coal", has(ItemTags.COALS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.CARROT_ON_A_STICK).define('#', Items.FISHING_ROD).define('X', Items.CARROT).pattern("# ").pattern(" X").unlockedBy("has_carrot", has(Items.CARROT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.WARPED_FUNGUS_ON_A_STICK).define('#', Items.FISHING_ROD).define('X', Items.WARPED_FUNGUS).pattern("# ").pattern(" X").unlockedBy("has_warped_fungus", has(Items.WARPED_FUNGUS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CAULDRON).define('#', Items.IRON_INGOT).pattern("# #").pattern("# #").pattern("###").unlockedBy("has_water_bucket", has(Items.WATER_BUCKET)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.COMPOSTER).define('#', ItemTags.WOODEN_SLABS).pattern("# #").pattern("# #").pattern("###").unlockedBy("has_wood_slab", has(ItemTags.WOODEN_SLABS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CHEST).define('#', ItemTags.PLANKS).pattern("###").pattern("# #").pattern("###").unlockedBy("has_lots_of_items", new InventoryChangeTrigger.TriggerInstance(EntityPredicate.Composite.ANY, MinMaxBounds.Ints.atLeast(10), MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, new ItemPredicate[0])).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.CHEST_MINECART).define('A', Blocks.CHEST).define('B', Items.MINECART).pattern("A").pattern("B").unlockedBy("has_minecart", has(Items.MINECART)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CHISELED_NETHER_BRICKS).define('#', Blocks.NETHER_BRICK_SLAB).pattern("#").pattern("#").unlockedBy("has_nether_bricks", has(Blocks.NETHER_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CHISELED_QUARTZ_BLOCK).define('#', Blocks.QUARTZ_SLAB).pattern("#").pattern("#").unlockedBy("has_chiseled_quartz_block", has(Blocks.CHISELED_QUARTZ_BLOCK)).unlockedBy("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).unlockedBy("has_quartz_pillar", has(Blocks.QUARTZ_PILLAR)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CHISELED_STONE_BRICKS).define('#', Blocks.STONE_BRICK_SLAB).pattern("#").pattern("#").unlockedBy("has_stone_bricks", has(ItemTags.STONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CLAY).define('#', Items.CLAY_BALL).pattern("##").pattern("##").unlockedBy("has_clay_ball", has(Items.CLAY_BALL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.CLOCK).define('#', Items.GOLD_INGOT).define('X', Items.REDSTONE).pattern(" # ").pattern("#X#").pattern(" # ").unlockedBy("has_redstone", has(Items.REDSTONE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.COAL, 9).requires(Blocks.COAL_BLOCK).unlockedBy("has_coal_block", has(Blocks.COAL_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.COAL_BLOCK).define('#', Items.COAL).pattern("###").pattern("###").pattern("###").unlockedBy("has_coal", has(Items.COAL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.COARSE_DIRT, 4).define('D', Blocks.DIRT).define('G', Blocks.GRAVEL).pattern("DG").pattern("GD").unlockedBy("has_gravel", has(Blocks.GRAVEL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.COBBLESTONE_SLAB, 6).define('#', Blocks.COBBLESTONE).pattern("###").unlockedBy("has_cobblestone", has(Blocks.COBBLESTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.COBBLESTONE_WALL, 6).define('#', Blocks.COBBLESTONE).pattern("###").pattern("###").unlockedBy("has_cobblestone", has(Blocks.COBBLESTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.COMPARATOR).define('#', Blocks.REDSTONE_TORCH).define('X', Items.QUARTZ).define('I', Blocks.STONE).pattern(" # ").pattern("#X#").pattern("III").unlockedBy("has_quartz", has(Items.QUARTZ)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.COMPASS).define('#', Items.IRON_INGOT).define('X', Items.REDSTONE).pattern(" # ").pattern("#X#").pattern(" # ").unlockedBy("has_redstone", has(Items.REDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.COOKIE, 8).define('#', Items.WHEAT).define('X', Items.COCOA_BEANS).pattern("#X#").unlockedBy("has_cocoa", has(Items.COCOA_BEANS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CRAFTING_TABLE).define('#', ItemTags.PLANKS).pattern("##").pattern("##").unlockedBy("has_planks", has(ItemTags.PLANKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.CROSSBOW).define('~', Items.STRING).define('#', Items.STICK).define('&', Items.IRON_INGOT).define('$', Blocks.TRIPWIRE_HOOK).pattern("#&#").pattern("~$~").pattern(" # ").unlockedBy("has_string", has(Items.STRING)).unlockedBy("has_stick", has(Items.STICK)).unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).unlockedBy("has_tripwire_hook", has(Blocks.TRIPWIRE_HOOK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.LOOM).define('#', ItemTags.PLANKS).define('@', Items.STRING).pattern("@@").pattern("##").unlockedBy("has_string", has(Items.STRING)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CHISELED_RED_SANDSTONE).define('#', Blocks.RED_SANDSTONE_SLAB).pattern("#").pattern("#").unlockedBy("has_red_sandstone", has(Blocks.RED_SANDSTONE)).unlockedBy("has_chiseled_red_sandstone", has(Blocks.CHISELED_RED_SANDSTONE)).unlockedBy("has_cut_red_sandstone", has(Blocks.CUT_RED_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CHISELED_SANDSTONE).define('#', Blocks.SANDSTONE_SLAB).pattern("#").pattern("#").unlockedBy("has_stone_slab", has(Blocks.SANDSTONE_SLAB)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.CYAN_DYE, 2).requires(Items.BLUE_DYE).requires(Items.GREEN_DYE).unlockedBy("has_green_dye", has(Items.GREEN_DYE)).unlockedBy("has_blue_dye", has(Items.BLUE_DYE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DARK_PRISMARINE).define('S', Items.PRISMARINE_SHARD).define('I', Items.BLACK_DYE).pattern("SSS").pattern("SIS").pattern("SSS").unlockedBy("has_prismarine_shard", has(Items.PRISMARINE_SHARD)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_STAIRS, 4).define('#', Blocks.PRISMARINE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_prismarine", has(Blocks.PRISMARINE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_BRICK_STAIRS, 4).define('#', Blocks.PRISMARINE_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_prismarine_bricks", has(Blocks.PRISMARINE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DARK_PRISMARINE_STAIRS, 4).define('#', Blocks.DARK_PRISMARINE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_dark_prismarine", has(Blocks.DARK_PRISMARINE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DAYLIGHT_DETECTOR).define('Q', Items.QUARTZ).define('G', Blocks.GLASS).define('W', Ingredient.of(ItemTags.WOODEN_SLABS)).pattern("GGG").pattern("QQQ").pattern("WWW").unlockedBy("has_quartz", has(Items.QUARTZ)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DETECTOR_RAIL, 6).define('R', Items.REDSTONE).define('#', Blocks.STONE_PRESSURE_PLATE).define('X', Items.IRON_INGOT).pattern("X X").pattern("X#X").pattern("XRX").unlockedBy("has_rail", has(Blocks.RAIL)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.DIAMOND, 9).requires(Blocks.DIAMOND_BLOCK).unlockedBy("has_diamond_block", has(Blocks.DIAMOND_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.DIAMOND_AXE).define('#', Items.STICK).define('X', Items.DIAMOND).pattern("XX").pattern("X#").pattern(" #").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DIAMOND_BLOCK).define('#', Items.DIAMOND).pattern("###").pattern("###").pattern("###").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.DIAMOND_BOOTS).define('X', Items.DIAMOND).pattern("X X").pattern("X X").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.DIAMOND_CHESTPLATE).define('X', Items.DIAMOND).pattern("X X").pattern("XXX").pattern("XXX").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.DIAMOND_HELMET).define('X', Items.DIAMOND).pattern("XXX").pattern("X X").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.DIAMOND_HOE).define('#', Items.STICK).define('X', Items.DIAMOND).pattern("XX").pattern(" #").pattern(" #").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.DIAMOND_LEGGINGS).define('X', Items.DIAMOND).pattern("XXX").pattern("X X").pattern("X X").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.DIAMOND_PICKAXE).define('#', Items.STICK).define('X', Items.DIAMOND).pattern("XXX").pattern(" # ").pattern(" # ").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.DIAMOND_SHOVEL).define('#', Items.STICK).define('X', Items.DIAMOND).pattern("X").pattern("#").pattern("#").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.DIAMOND_SWORD).define('#', Items.STICK).define('X', Items.DIAMOND).pattern("X").pattern("X").pattern("#").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DIORITE, 2).define('Q', Items.QUARTZ).define('C', Blocks.COBBLESTONE).pattern("CQ").pattern("QC").unlockedBy("has_quartz", has(Items.QUARTZ)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DISPENSER).define('R', Items.REDSTONE).define('#', Blocks.COBBLESTONE).define('X', Items.BOW).pattern("###").pattern("#X#").pattern("#R#").unlockedBy("has_bow", has(Items.BOW)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DROPPER).define('R', Items.REDSTONE).define('#', Blocks.COBBLESTONE).pattern("###").pattern("# #").pattern("#R#").unlockedBy("has_redstone", has(Items.REDSTONE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.EMERALD, 9).requires(Blocks.EMERALD_BLOCK).unlockedBy("has_emerald_block", has(Blocks.EMERALD_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.EMERALD_BLOCK).define('#', Items.EMERALD).pattern("###").pattern("###").pattern("###").unlockedBy("has_emerald", has(Items.EMERALD)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.ENCHANTING_TABLE).define('B', Items.BOOK).define('#', Blocks.OBSIDIAN).define('D', Items.DIAMOND).pattern(" B ").pattern("D#D").pattern("###").unlockedBy("has_obsidian", has(Blocks.OBSIDIAN)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.ENDER_CHEST).define('#', Blocks.OBSIDIAN).define('E', Items.ENDER_EYE).pattern("###").pattern("#E#").pattern("###").unlockedBy("has_ender_eye", has(Items.ENDER_EYE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.ENDER_EYE).requires(Items.ENDER_PEARL).requires(Items.BLAZE_POWDER).unlockedBy("has_blaze_powder", has(Items.BLAZE_POWDER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.END_STONE_BRICKS, 4).define('#', Blocks.END_STONE).pattern("##").pattern("##").unlockedBy("has_end_stone", has(Blocks.END_STONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.END_CRYSTAL).define('T', Items.GHAST_TEAR).define('E', Items.ENDER_EYE).define('G', Blocks.GLASS).pattern("GGG").pattern("GEG").pattern("GTG").unlockedBy("has_ender_eye", has(Items.ENDER_EYE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.END_ROD, 4).define('#', Items.POPPED_CHORUS_FRUIT).define('/', Items.BLAZE_ROD).pattern("/").pattern("#").unlockedBy("has_chorus_fruit_popped", has(Items.POPPED_CHORUS_FRUIT)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.FERMENTED_SPIDER_EYE).requires(Items.SPIDER_EYE).requires(Blocks.BROWN_MUSHROOM).requires(Items.SUGAR).unlockedBy("has_spider_eye", has(Items.SPIDER_EYE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.FIRE_CHARGE, 3).requires(Items.GUNPOWDER).requires(Items.BLAZE_POWDER).requires(Ingredient.of(Items.COAL, Items.CHARCOAL)).unlockedBy("has_blaze_powder", has(Items.BLAZE_POWDER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.FISHING_ROD).define('#', Items.STICK).define('X', Items.STRING).pattern("  #").pattern(" #X").pattern("# X").unlockedBy("has_string", has(Items.STRING)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.FLINT_AND_STEEL).requires(Items.IRON_INGOT).requires(Items.FLINT).unlockedBy("has_flint", has(Items.FLINT)).unlockedBy("has_obsidian", has(Blocks.OBSIDIAN)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.FLOWER_POT).define('#', Items.BRICK).pattern("# #").pattern(" # ").unlockedBy("has_brick", has(Items.BRICK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.FURNACE).define('#', ItemTags.FURNACE_MATERIALS).pattern("###").pattern("# #").pattern("###").unlockedBy("has_cobblestone", has(ItemTags.FURNACE_MATERIALS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.FURNACE_MINECART).define('A', Blocks.FURNACE).define('B', Items.MINECART).pattern("A").pattern("B").unlockedBy("has_minecart", has(Items.MINECART)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GLASS_BOTTLE, 3).define('#', Blocks.GLASS).pattern("# #").pattern(" # ").unlockedBy("has_glass", has(Blocks.GLASS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.GLASS_PANE, 16).define('#', Blocks.GLASS).pattern("###").pattern("###").unlockedBy("has_glass", has(Blocks.GLASS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.GLOWSTONE).define('#', Items.GLOWSTONE_DUST).pattern("##").pattern("##").unlockedBy("has_glowstone_dust", has(Items.GLOWSTONE_DUST)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_APPLE).define('#', Items.GOLD_INGOT).define('X', Items.APPLE).pattern("###").pattern("#X#").pattern("###").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_AXE).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("XX").pattern("X#").pattern(" #").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_BOOTS).define('X', Items.GOLD_INGOT).pattern("X X").pattern("X X").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_CARROT).define('#', Items.GOLD_NUGGET).define('X', Items.CARROT).pattern("###").pattern("#X#").pattern("###").unlockedBy("has_gold_nugget", has(Items.GOLD_NUGGET)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_CHESTPLATE).define('X', Items.GOLD_INGOT).pattern("X X").pattern("XXX").pattern("XXX").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_HELMET).define('X', Items.GOLD_INGOT).pattern("XXX").pattern("X X").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_HOE).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("XX").pattern(" #").pattern(" #").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_LEGGINGS).define('X', Items.GOLD_INGOT).pattern("XXX").pattern("X X").pattern("X X").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_PICKAXE).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("XXX").pattern(" # ").pattern(" # ").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POWERED_RAIL, 6).define('R', Items.REDSTONE).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("X X").pattern("X#X").pattern("XRX").unlockedBy("has_rail", has(Blocks.RAIL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_SHOVEL).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("X").pattern("#").pattern("#").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GOLDEN_SWORD).define('#', Items.STICK).define('X', Items.GOLD_INGOT).pattern("X").pattern("X").pattern("#").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.GOLD_BLOCK).define('#', Items.GOLD_INGOT).pattern("###").pattern("###").pattern("###").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.GOLD_INGOT, 9).requires(Blocks.GOLD_BLOCK).group("gold_ingot").unlockedBy("has_gold_block", has(Blocks.GOLD_BLOCK)).save(consumer, "gold_ingot_from_gold_block");
+        ShapedRecipeBuilder.shaped(Items.GOLD_INGOT).define('#', Items.GOLD_NUGGET).pattern("###").pattern("###").pattern("###").group("gold_ingot").unlockedBy("has_gold_nugget", has(Items.GOLD_NUGGET)).save(consumer, "gold_ingot_from_nuggets");
+        ShapelessRecipeBuilder.shapeless(Items.GOLD_NUGGET, 9).requires(Items.GOLD_INGOT).unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Blocks.GRANITE).requires(Blocks.DIORITE).requires(Items.QUARTZ).unlockedBy("has_quartz", has(Items.QUARTZ)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.GRAY_DYE, 2).requires(Items.BLACK_DYE).requires(Items.WHITE_DYE).unlockedBy("has_white_dye", has(Items.WHITE_DYE)).unlockedBy("has_black_dye", has(Items.BLACK_DYE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.HAY_BLOCK).define('#', Items.WHEAT).pattern("###").pattern("###").pattern("###").unlockedBy("has_wheat", has(Items.WHEAT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE).define('#', Items.IRON_INGOT).pattern("##").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.HONEY_BOTTLE, 4).requires(Items.HONEY_BLOCK).requires(Items.GLASS_BOTTLE, 4).unlockedBy("has_honey_block", has(Blocks.HONEY_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.HONEY_BLOCK, 1).define('S', Items.HONEY_BOTTLE).pattern("SS").pattern("SS").unlockedBy("has_honey_bottle", has(Items.HONEY_BOTTLE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.HONEYCOMB_BLOCK).define('H', Items.HONEYCOMB).pattern("HH").pattern("HH").unlockedBy("has_honeycomb", has(Items.HONEYCOMB)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.HOPPER).define('C', Blocks.CHEST).define('I', Items.IRON_INGOT).pattern("I I").pattern("ICI").pattern(" I ").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.HOPPER_MINECART).define('A', Blocks.HOPPER).define('B', Items.MINECART).pattern("A").pattern("B").unlockedBy("has_minecart", has(Items.MINECART)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.IRON_AXE).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("XX").pattern("X#").pattern(" #").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.IRON_BARS, 16).define('#', Items.IRON_INGOT).pattern("###").pattern("###").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.IRON_BLOCK).define('#', Items.IRON_INGOT).pattern("###").pattern("###").pattern("###").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.IRON_BOOTS).define('X', Items.IRON_INGOT).pattern("X X").pattern("X X").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.IRON_CHESTPLATE).define('X', Items.IRON_INGOT).pattern("X X").pattern("XXX").pattern("XXX").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.IRON_DOOR, 3).define('#', Items.IRON_INGOT).pattern("##").pattern("##").pattern("##").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.IRON_HELMET).define('X', Items.IRON_INGOT).pattern("XXX").pattern("X X").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.IRON_HOE).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("XX").pattern(" #").pattern(" #").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.IRON_INGOT, 9).requires(Blocks.IRON_BLOCK).group("iron_ingot").unlockedBy("has_iron_block", has(Blocks.IRON_BLOCK)).save(consumer, "iron_ingot_from_iron_block");
+        ShapedRecipeBuilder.shaped(Items.IRON_INGOT).define('#', Items.IRON_NUGGET).pattern("###").pattern("###").pattern("###").group("iron_ingot").unlockedBy("has_iron_nugget", has(Items.IRON_NUGGET)).save(consumer, "iron_ingot_from_nuggets");
+        ShapedRecipeBuilder.shaped(Items.IRON_LEGGINGS).define('X', Items.IRON_INGOT).pattern("XXX").pattern("X X").pattern("X X").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.IRON_NUGGET, 9).requires(Items.IRON_INGOT).unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.IRON_PICKAXE).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("XXX").pattern(" # ").pattern(" # ").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.IRON_SHOVEL).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("X").pattern("#").pattern("#").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.IRON_SWORD).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("X").pattern("X").pattern("#").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.IRON_TRAPDOOR).define('#', Items.IRON_INGOT).pattern("##").pattern("##").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.ITEM_FRAME).define('#', Items.STICK).define('X', Items.LEATHER).pattern("###").pattern("#X#").pattern("###").unlockedBy("has_leather", has(Items.LEATHER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.JUKEBOX).define('#', ItemTags.PLANKS).define('X', Items.DIAMOND).pattern("###").pattern("#X#").pattern("###").unlockedBy("has_diamond", has(Items.DIAMOND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.LADDER, 3).define('#', Items.STICK).pattern("# #").pattern("###").pattern("# #").unlockedBy("has_stick", has(Items.STICK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.LAPIS_BLOCK).define('#', Items.LAPIS_LAZULI).pattern("###").pattern("###").pattern("###").unlockedBy("has_lapis", has(Items.LAPIS_LAZULI)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.LAPIS_LAZULI, 9).requires(Blocks.LAPIS_BLOCK).unlockedBy("has_lapis_block", has(Blocks.LAPIS_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.LEAD, 2).define('~', Items.STRING).define('O', Items.SLIME_BALL).pattern("~~ ").pattern("~O ").pattern("  ~").unlockedBy("has_slime_ball", has(Items.SLIME_BALL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.LEATHER).define('#', Items.RABBIT_HIDE).pattern("##").pattern("##").unlockedBy("has_rabbit_hide", has(Items.RABBIT_HIDE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.LEATHER_BOOTS).define('X', Items.LEATHER).pattern("X X").pattern("X X").unlockedBy("has_leather", has(Items.LEATHER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.LEATHER_CHESTPLATE).define('X', Items.LEATHER).pattern("X X").pattern("XXX").pattern("XXX").unlockedBy("has_leather", has(Items.LEATHER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.LEATHER_HELMET).define('X', Items.LEATHER).pattern("XXX").pattern("X X").unlockedBy("has_leather", has(Items.LEATHER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.LEATHER_LEGGINGS).define('X', Items.LEATHER).pattern("XXX").pattern("X X").pattern("X X").unlockedBy("has_leather", has(Items.LEATHER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.LEATHER_HORSE_ARMOR).define('X', Items.LEATHER).pattern("X X").pattern("XXX").pattern("X X").unlockedBy("has_leather", has(Items.LEATHER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.LECTERN).define('S', ItemTags.WOODEN_SLABS).define('B', Blocks.BOOKSHELF).pattern("SSS").pattern(" B ").pattern(" S ").unlockedBy("has_book", has(Items.BOOK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.LEVER).define('#', Blocks.COBBLESTONE).define('X', Items.STICK).pattern("X").pattern("#").unlockedBy("has_cobblestone", has(Blocks.COBBLESTONE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.LIGHT_BLUE_DYE).requires(Blocks.BLUE_ORCHID).group("light_blue_dye").unlockedBy("has_red_flower", has(Blocks.BLUE_ORCHID)).save(consumer, "light_blue_dye_from_blue_orchid");
+        ShapelessRecipeBuilder.shapeless(Items.LIGHT_BLUE_DYE, 2).requires(Items.BLUE_DYE).requires(Items.WHITE_DYE).group("light_blue_dye").unlockedBy("has_blue_dye", has(Items.BLUE_DYE)).unlockedBy("has_white_dye", has(Items.WHITE_DYE)).save(consumer, "light_blue_dye_from_blue_white_dye");
+        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_DYE).requires(Blocks.AZURE_BLUET).group("light_gray_dye").unlockedBy("has_red_flower", has(Blocks.AZURE_BLUET)).save(consumer, "light_gray_dye_from_azure_bluet");
+        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_DYE, 2).requires(Items.GRAY_DYE).requires(Items.WHITE_DYE).group("light_gray_dye").unlockedBy("has_gray_dye", has(Items.GRAY_DYE)).unlockedBy("has_white_dye", has(Items.WHITE_DYE)).save(consumer, "light_gray_dye_from_gray_white_dye");
+        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_DYE, 3).requires(Items.BLACK_DYE).requires(Items.WHITE_DYE, 2).group("light_gray_dye").unlockedBy("has_white_dye", has(Items.WHITE_DYE)).unlockedBy("has_black_dye", has(Items.BLACK_DYE)).save(consumer, "light_gray_dye_from_black_white_dye");
+        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_DYE).requires(Blocks.OXEYE_DAISY).group("light_gray_dye").unlockedBy("has_red_flower", has(Blocks.OXEYE_DAISY)).save(consumer, "light_gray_dye_from_oxeye_daisy");
+        ShapelessRecipeBuilder.shapeless(Items.LIGHT_GRAY_DYE).requires(Blocks.WHITE_TULIP).group("light_gray_dye").unlockedBy("has_red_flower", has(Blocks.WHITE_TULIP)).save(consumer, "light_gray_dye_from_white_tulip");
+        ShapedRecipeBuilder.shaped(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE).define('#', Items.GOLD_INGOT).pattern("##").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.LIME_DYE, 2).requires(Items.GREEN_DYE).requires(Items.WHITE_DYE).unlockedBy("has_green_dye", has(Items.GREEN_DYE)).unlockedBy("has_white_dye", has(Items.WHITE_DYE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.JACK_O_LANTERN).define('A', Blocks.CARVED_PUMPKIN).define('B', Blocks.TORCH).pattern("A").pattern("B").unlockedBy("has_carved_pumpkin", has(Blocks.CARVED_PUMPKIN)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_DYE).requires(Blocks.ALLIUM).group("magenta_dye").unlockedBy("has_red_flower", has(Blocks.ALLIUM)).save(consumer, "magenta_dye_from_allium");
+        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_DYE, 4).requires(Items.BLUE_DYE).requires(Items.RED_DYE, 2).requires(Items.WHITE_DYE).group("magenta_dye").unlockedBy("has_blue_dye", has(Items.BLUE_DYE)).unlockedBy("has_rose_red", has(Items.RED_DYE)).unlockedBy("has_white_dye", has(Items.WHITE_DYE)).save(consumer, "magenta_dye_from_blue_red_white_dye");
+        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_DYE, 3).requires(Items.BLUE_DYE).requires(Items.RED_DYE).requires(Items.PINK_DYE).group("magenta_dye").unlockedBy("has_pink_dye", has(Items.PINK_DYE)).unlockedBy("has_blue_dye", has(Items.BLUE_DYE)).unlockedBy("has_red_dye", has(Items.RED_DYE)).save(consumer, "magenta_dye_from_blue_red_pink");
+        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_DYE, 2).requires(Blocks.LILAC).group("magenta_dye").unlockedBy("has_double_plant", has(Blocks.LILAC)).save(consumer, "magenta_dye_from_lilac");
+        ShapelessRecipeBuilder.shapeless(Items.MAGENTA_DYE, 2).requires(Items.PURPLE_DYE).requires(Items.PINK_DYE).group("magenta_dye").unlockedBy("has_pink_dye", has(Items.PINK_DYE)).unlockedBy("has_purple_dye", has(Items.PURPLE_DYE)).save(consumer, "magenta_dye_from_purple_and_pink");
+        ShapedRecipeBuilder.shaped(Blocks.MAGMA_BLOCK).define('#', Items.MAGMA_CREAM).pattern("##").pattern("##").unlockedBy("has_magma_cream", has(Items.MAGMA_CREAM)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.MAGMA_CREAM).requires(Items.BLAZE_POWDER).requires(Items.SLIME_BALL).unlockedBy("has_blaze_powder", has(Items.BLAZE_POWDER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.MAP).define('#', Items.PAPER).define('X', Items.COMPASS).pattern("###").pattern("#X#").pattern("###").unlockedBy("has_compass", has(Items.COMPASS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.MELON).define('M', Items.MELON_SLICE).pattern("MMM").pattern("MMM").pattern("MMM").unlockedBy("has_melon", has(Items.MELON_SLICE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.MELON_SEEDS).requires(Items.MELON_SLICE).unlockedBy("has_melon", has(Items.MELON_SLICE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.MINECART).define('#', Items.IRON_INGOT).pattern("# #").pattern("###").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Blocks.MOSSY_COBBLESTONE).requires(Blocks.COBBLESTONE).requires(Blocks.VINE).unlockedBy("has_vine", has(Blocks.VINE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.MOSSY_COBBLESTONE_WALL, 6).define('#', Blocks.MOSSY_COBBLESTONE).pattern("###").pattern("###").unlockedBy("has_mossy_cobblestone", has(Blocks.MOSSY_COBBLESTONE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Blocks.MOSSY_STONE_BRICKS).requires(Blocks.STONE_BRICKS).requires(Blocks.VINE).unlockedBy("has_mossy_cobblestone", has(Blocks.MOSSY_COBBLESTONE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.MUSHROOM_STEW).requires(Blocks.BROWN_MUSHROOM).requires(Blocks.RED_MUSHROOM).requires(Items.BOWL).unlockedBy("has_mushroom_stew", has(Items.MUSHROOM_STEW)).unlockedBy("has_bowl", has(Items.BOWL)).unlockedBy("has_brown_mushroom", has(Blocks.BROWN_MUSHROOM)).unlockedBy("has_red_mushroom", has(Blocks.RED_MUSHROOM)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.NETHER_BRICKS).define('N', Items.NETHER_BRICK).pattern("NN").pattern("NN").unlockedBy("has_netherbrick", has(Items.NETHER_BRICK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.NETHER_BRICK_FENCE, 6).define('#', Blocks.NETHER_BRICKS).define('-', Items.NETHER_BRICK).pattern("#-#").pattern("#-#").unlockedBy("has_nether_brick", has(Blocks.NETHER_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.NETHER_BRICK_SLAB, 6).define('#', Blocks.NETHER_BRICKS).pattern("###").unlockedBy("has_nether_brick", has(Blocks.NETHER_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.NETHER_BRICK_STAIRS, 4).define('#', Blocks.NETHER_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_nether_brick", has(Blocks.NETHER_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.NETHER_WART_BLOCK).define('#', Items.NETHER_WART).pattern("###").pattern("###").pattern("###").unlockedBy("has_nether_wart", has(Items.NETHER_WART)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.NOTE_BLOCK).define('#', ItemTags.PLANKS).define('X', Items.REDSTONE).pattern("###").pattern("#X#").pattern("###").unlockedBy("has_redstone", has(Items.REDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.OBSERVER).define('Q', Items.QUARTZ).define('R', Items.REDSTONE).define('#', Blocks.COBBLESTONE).pattern("###").pattern("RRQ").pattern("###").unlockedBy("has_quartz", has(Items.QUARTZ)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.ORANGE_DYE).requires(Blocks.ORANGE_TULIP).group("orange_dye").unlockedBy("has_red_flower", has(Blocks.ORANGE_TULIP)).save(consumer, "orange_dye_from_orange_tulip");
+        ShapelessRecipeBuilder.shapeless(Items.ORANGE_DYE, 2).requires(Items.RED_DYE).requires(Items.YELLOW_DYE).group("orange_dye").unlockedBy("has_red_dye", has(Items.RED_DYE)).unlockedBy("has_yellow_dye", has(Items.YELLOW_DYE)).save(consumer, "orange_dye_from_red_yellow");
+        ShapedRecipeBuilder.shaped(Items.PAINTING).define('#', Items.STICK).define('X', Ingredient.of(ItemTags.WOOL)).pattern("###").pattern("#X#").pattern("###").unlockedBy("has_wool", has(ItemTags.WOOL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.PAPER, 3).define('#', Blocks.SUGAR_CANE).pattern("###").unlockedBy("has_reeds", has(Blocks.SUGAR_CANE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.QUARTZ_PILLAR, 2).define('#', Blocks.QUARTZ_BLOCK).pattern("#").pattern("#").unlockedBy("has_chiseled_quartz_block", has(Blocks.CHISELED_QUARTZ_BLOCK)).unlockedBy("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).unlockedBy("has_quartz_pillar", has(Blocks.QUARTZ_PILLAR)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Blocks.PACKED_ICE).requires(Blocks.ICE, 9).unlockedBy("has_ice", has(Blocks.ICE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.PINK_DYE, 2).requires(Blocks.PEONY).group("pink_dye").unlockedBy("has_double_plant", has(Blocks.PEONY)).save(consumer, "pink_dye_from_peony");
+        ShapelessRecipeBuilder.shapeless(Items.PINK_DYE).requires(Blocks.PINK_TULIP).group("pink_dye").unlockedBy("has_red_flower", has(Blocks.PINK_TULIP)).save(consumer, "pink_dye_from_pink_tulip");
+        ShapelessRecipeBuilder.shapeless(Items.PINK_DYE, 2).requires(Items.RED_DYE).requires(Items.WHITE_DYE).group("pink_dye").unlockedBy("has_white_dye", has(Items.WHITE_DYE)).unlockedBy("has_red_dye", has(Items.RED_DYE)).save(consumer, "pink_dye_from_red_white_dye");
+        ShapedRecipeBuilder.shaped(Blocks.PISTON).define('R', Items.REDSTONE).define('#', Blocks.COBBLESTONE).define('T', ItemTags.PLANKS).define('X', Items.IRON_INGOT).pattern("TTT").pattern("#X#").pattern("#R#").unlockedBy("has_redstone", has(Items.REDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_BASALT, 4).define('S', Blocks.BASALT).pattern("SS").pattern("SS").unlockedBy("has_basalt", has(Blocks.BASALT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_GRANITE, 4).define('S', Blocks.GRANITE).pattern("SS").pattern("SS").unlockedBy("has_stone", has(Blocks.GRANITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_DIORITE, 4).define('S', Blocks.DIORITE).pattern("SS").pattern("SS").unlockedBy("has_stone", has(Blocks.DIORITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_ANDESITE, 4).define('S', Blocks.ANDESITE).pattern("SS").pattern("SS").unlockedBy("has_stone", has(Blocks.ANDESITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE).define('S', Items.PRISMARINE_SHARD).pattern("SS").pattern("SS").unlockedBy("has_prismarine_shard", has(Items.PRISMARINE_SHARD)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_BRICKS).define('S', Items.PRISMARINE_SHARD).pattern("SSS").pattern("SSS").pattern("SSS").unlockedBy("has_prismarine_shard", has(Items.PRISMARINE_SHARD)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_SLAB, 6).define('#', Blocks.PRISMARINE).pattern("###").unlockedBy("has_prismarine", has(Blocks.PRISMARINE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_BRICK_SLAB, 6).define('#', Blocks.PRISMARINE_BRICKS).pattern("###").unlockedBy("has_prismarine_bricks", has(Blocks.PRISMARINE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DARK_PRISMARINE_SLAB, 6).define('#', Blocks.DARK_PRISMARINE).pattern("###").unlockedBy("has_dark_prismarine", has(Blocks.DARK_PRISMARINE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.PUMPKIN_PIE).requires(Blocks.PUMPKIN).requires(Items.SUGAR).requires(Items.EGG).unlockedBy("has_carved_pumpkin", has(Blocks.CARVED_PUMPKIN)).unlockedBy("has_pumpkin", has(Blocks.PUMPKIN)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.PUMPKIN_SEEDS, 4).requires(Blocks.PUMPKIN).unlockedBy("has_pumpkin", has(Blocks.PUMPKIN)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.PURPLE_DYE, 2).requires(Items.BLUE_DYE).requires(Items.RED_DYE).unlockedBy("has_blue_dye", has(Items.BLUE_DYE)).unlockedBy("has_red_dye", has(Items.RED_DYE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SHULKER_BOX).define('#', Blocks.CHEST).define('-', Items.SHULKER_SHELL).pattern("-").pattern("#").pattern("-").unlockedBy("has_shulker_shell", has(Items.SHULKER_SHELL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PURPUR_BLOCK, 4).define('F', Items.POPPED_CHORUS_FRUIT).pattern("FF").pattern("FF").unlockedBy("has_chorus_fruit_popped", has(Items.POPPED_CHORUS_FRUIT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PURPUR_PILLAR).define('#', Blocks.PURPUR_SLAB).pattern("#").pattern("#").unlockedBy("has_purpur_block", has(Blocks.PURPUR_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PURPUR_SLAB, 6).define('#', Ingredient.of(Blocks.PURPUR_BLOCK, Blocks.PURPUR_PILLAR)).pattern("###").unlockedBy("has_purpur_block", has(Blocks.PURPUR_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PURPUR_STAIRS, 4).define('#', Ingredient.of(Blocks.PURPUR_BLOCK, Blocks.PURPUR_PILLAR)).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_purpur_block", has(Blocks.PURPUR_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.QUARTZ_BLOCK).define('#', Items.QUARTZ).pattern("##").pattern("##").unlockedBy("has_quartz", has(Items.QUARTZ)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.QUARTZ_BRICKS, 4).define('#', Blocks.QUARTZ_BLOCK).pattern("##").pattern("##").unlockedBy("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.QUARTZ_SLAB, 6).define('#', Ingredient.of(Blocks.CHISELED_QUARTZ_BLOCK, Blocks.QUARTZ_BLOCK, Blocks.QUARTZ_PILLAR)).pattern("###").unlockedBy("has_chiseled_quartz_block", has(Blocks.CHISELED_QUARTZ_BLOCK)).unlockedBy("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).unlockedBy("has_quartz_pillar", has(Blocks.QUARTZ_PILLAR)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.QUARTZ_STAIRS, 4).define('#', Ingredient.of(Blocks.CHISELED_QUARTZ_BLOCK, Blocks.QUARTZ_BLOCK, Blocks.QUARTZ_PILLAR)).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_chiseled_quartz_block", has(Blocks.CHISELED_QUARTZ_BLOCK)).unlockedBy("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).unlockedBy("has_quartz_pillar", has(Blocks.QUARTZ_PILLAR)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.RABBIT_STEW).requires(Items.BAKED_POTATO).requires(Items.COOKED_RABBIT).requires(Items.BOWL).requires(Items.CARROT).requires(Blocks.BROWN_MUSHROOM).group("rabbit_stew").unlockedBy("has_cooked_rabbit", has(Items.COOKED_RABBIT)).save(consumer, "rabbit_stew_from_brown_mushroom");
+        ShapelessRecipeBuilder.shapeless(Items.RABBIT_STEW).requires(Items.BAKED_POTATO).requires(Items.COOKED_RABBIT).requires(Items.BOWL).requires(Items.CARROT).requires(Blocks.RED_MUSHROOM).group("rabbit_stew").unlockedBy("has_cooked_rabbit", has(Items.COOKED_RABBIT)).save(consumer, "rabbit_stew_from_red_mushroom");
+        ShapedRecipeBuilder.shaped(Blocks.RAIL, 16).define('#', Items.STICK).define('X', Items.IRON_INGOT).pattern("X X").pattern("X#X").pattern("X X").unlockedBy("has_minecart", has(Items.MINECART)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.REDSTONE, 9).requires(Blocks.REDSTONE_BLOCK).unlockedBy("has_redstone_block", has(Blocks.REDSTONE_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.REDSTONE_BLOCK).define('#', Items.REDSTONE).pattern("###").pattern("###").pattern("###").unlockedBy("has_redstone", has(Items.REDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.REDSTONE_LAMP).define('R', Items.REDSTONE).define('G', Blocks.GLOWSTONE).pattern(" R ").pattern("RGR").pattern(" R ").unlockedBy("has_glowstone", has(Blocks.GLOWSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.REDSTONE_TORCH).define('#', Items.STICK).define('X', Items.REDSTONE).pattern("X").pattern("#").unlockedBy("has_redstone", has(Items.REDSTONE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.RED_DYE).requires(Items.BEETROOT).group("red_dye").unlockedBy("has_beetroot", has(Items.BEETROOT)).save(consumer, "red_dye_from_beetroot");
+        ShapelessRecipeBuilder.shapeless(Items.RED_DYE).requires(Blocks.POPPY).group("red_dye").unlockedBy("has_red_flower", has(Blocks.POPPY)).save(consumer, "red_dye_from_poppy");
+        ShapelessRecipeBuilder.shapeless(Items.RED_DYE, 2).requires(Blocks.ROSE_BUSH).group("red_dye").unlockedBy("has_double_plant", has(Blocks.ROSE_BUSH)).save(consumer, "red_dye_from_rose_bush");
+        ShapelessRecipeBuilder.shapeless(Items.RED_DYE).requires(Blocks.RED_TULIP).group("red_dye").unlockedBy("has_red_flower", has(Blocks.RED_TULIP)).save(consumer, "red_dye_from_tulip");
+        ShapedRecipeBuilder.shaped(Blocks.RED_NETHER_BRICKS).define('W', Items.NETHER_WART).define('N', Items.NETHER_BRICK).pattern("NW").pattern("WN").unlockedBy("has_nether_wart", has(Items.NETHER_WART)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.RED_SANDSTONE).define('#', Blocks.RED_SAND).pattern("##").pattern("##").unlockedBy("has_sand", has(Blocks.RED_SAND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.RED_SANDSTONE_SLAB, 6).define('#', Ingredient.of(Blocks.RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE)).pattern("###").unlockedBy("has_red_sandstone", has(Blocks.RED_SANDSTONE)).unlockedBy("has_chiseled_red_sandstone", has(Blocks.CHISELED_RED_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CUT_RED_SANDSTONE_SLAB, 6).define('#', Blocks.CUT_RED_SANDSTONE).pattern("###").unlockedBy("has_cut_red_sandstone", has(Blocks.CUT_RED_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.RED_SANDSTONE_STAIRS, 4).define('#', Ingredient.of(Blocks.RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE)).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_red_sandstone", has(Blocks.RED_SANDSTONE)).unlockedBy("has_chiseled_red_sandstone", has(Blocks.CHISELED_RED_SANDSTONE)).unlockedBy("has_cut_red_sandstone", has(Blocks.CUT_RED_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.REPEATER).define('#', Blocks.REDSTONE_TORCH).define('X', Items.REDSTONE).define('I', Blocks.STONE).pattern("#X#").pattern("III").unlockedBy("has_redstone_torch", has(Blocks.REDSTONE_TORCH)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SANDSTONE).define('#', Blocks.SAND).pattern("##").pattern("##").unlockedBy("has_sand", has(Blocks.SAND)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SANDSTONE_SLAB, 6).define('#', Ingredient.of(Blocks.SANDSTONE, Blocks.CHISELED_SANDSTONE)).pattern("###").unlockedBy("has_sandstone", has(Blocks.SANDSTONE)).unlockedBy("has_chiseled_sandstone", has(Blocks.CHISELED_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CUT_SANDSTONE_SLAB, 6).define('#', Blocks.CUT_SANDSTONE).pattern("###").unlockedBy("has_cut_sandstone", has(Blocks.CUT_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SANDSTONE_STAIRS, 4).define('#', Ingredient.of(Blocks.SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.CUT_SANDSTONE)).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_sandstone", has(Blocks.SANDSTONE)).unlockedBy("has_chiseled_sandstone", has(Blocks.CHISELED_SANDSTONE)).unlockedBy("has_cut_sandstone", has(Blocks.CUT_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SEA_LANTERN).define('S', Items.PRISMARINE_SHARD).define('C', Items.PRISMARINE_CRYSTALS).pattern("SCS").pattern("CCC").pattern("SCS").unlockedBy("has_prismarine_crystals", has(Items.PRISMARINE_CRYSTALS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.SHEARS).define('#', Items.IRON_INGOT).pattern(" #").pattern("# ").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.SHIELD).define('W', ItemTags.PLANKS).define('o', Items.IRON_INGOT).pattern("WoW").pattern("WWW").pattern(" W ").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SLIME_BLOCK).define('#', Items.SLIME_BALL).pattern("###").pattern("###").pattern("###").unlockedBy("has_slime_ball", has(Items.SLIME_BALL)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.SLIME_BALL, 9).requires(Blocks.SLIME_BLOCK).unlockedBy("has_slime", has(Blocks.SLIME_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CUT_RED_SANDSTONE, 4).define('#', Blocks.RED_SANDSTONE).pattern("##").pattern("##").unlockedBy("has_red_sandstone", has(Blocks.RED_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CUT_SANDSTONE, 4).define('#', Blocks.SANDSTONE).pattern("##").pattern("##").unlockedBy("has_sandstone", has(Blocks.SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SNOW_BLOCK).define('#', Items.SNOWBALL).pattern("##").pattern("##").unlockedBy("has_snowball", has(Items.SNOWBALL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SNOW, 6).define('#', Blocks.SNOW_BLOCK).pattern("###").unlockedBy("has_snowball", has(Items.SNOWBALL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SOUL_CAMPFIRE).define('L', ItemTags.LOGS).define('S', Items.STICK).define('#', ItemTags.SOUL_FIRE_BASE_BLOCKS).pattern(" S ").pattern("S#S").pattern("LLL").unlockedBy("has_stick", has(Items.STICK)).unlockedBy("has_soul_sand", has(ItemTags.SOUL_FIRE_BASE_BLOCKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.GLISTERING_MELON_SLICE).define('#', Items.GOLD_NUGGET).define('X', Items.MELON_SLICE).pattern("###").pattern("#X#").pattern("###").unlockedBy("has_melon", has(Items.MELON_SLICE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.SPECTRAL_ARROW, 2).define('#', Items.GLOWSTONE_DUST).define('X', Items.ARROW).pattern(" # ").pattern("#X#").pattern(" # ").unlockedBy("has_glowstone_dust", has(Items.GLOWSTONE_DUST)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.STICK, 4).define('#', ItemTags.PLANKS).pattern("#").pattern("#").group("sticks").unlockedBy("has_planks", has(ItemTags.PLANKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.STICK, 1).define('#', Blocks.BAMBOO).pattern("#").pattern("#").group("sticks").unlockedBy("has_bamboo", has(Blocks.BAMBOO)).save(consumer, "stick_from_bamboo_item");
+        ShapedRecipeBuilder.shaped(Blocks.STICKY_PISTON).define('P', Blocks.PISTON).define('S', Items.SLIME_BALL).pattern("S").pattern("P").unlockedBy("has_slime_ball", has(Items.SLIME_BALL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.STONE_BRICKS, 4).define('#', Blocks.STONE).pattern("##").pattern("##").unlockedBy("has_stone", has(Blocks.STONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.STONE_AXE).define('#', Items.STICK).define('X', ItemTags.STONE_TOOL_MATERIALS).pattern("XX").pattern("X#").pattern(" #").unlockedBy("has_cobblestone", has(ItemTags.STONE_TOOL_MATERIALS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.STONE_BRICK_SLAB, 6).define('#', Blocks.STONE_BRICKS).pattern("###").unlockedBy("has_stone_bricks", has(ItemTags.STONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.STONE_BRICK_STAIRS, 4).define('#', Blocks.STONE_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_stone_bricks", has(ItemTags.STONE_BRICKS)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Blocks.STONE_BUTTON).requires(Blocks.STONE).unlockedBy("has_stone", has(Blocks.STONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.STONE_HOE).define('#', Items.STICK).define('X', ItemTags.STONE_TOOL_MATERIALS).pattern("XX").pattern(" #").pattern(" #").unlockedBy("has_cobblestone", has(ItemTags.STONE_TOOL_MATERIALS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.STONE_PICKAXE).define('#', Items.STICK).define('X', ItemTags.STONE_TOOL_MATERIALS).pattern("XXX").pattern(" # ").pattern(" # ").unlockedBy("has_cobblestone", has(ItemTags.STONE_TOOL_MATERIALS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.STONE_PRESSURE_PLATE).define('#', Blocks.STONE).pattern("##").unlockedBy("has_stone", has(Blocks.STONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.STONE_SHOVEL).define('#', Items.STICK).define('X', ItemTags.STONE_TOOL_MATERIALS).pattern("X").pattern("#").pattern("#").unlockedBy("has_cobblestone", has(ItemTags.STONE_TOOL_MATERIALS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.STONE_SLAB, 6).define('#', Blocks.STONE).pattern("###").unlockedBy("has_stone", has(Blocks.STONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_STONE_SLAB, 6).define('#', Blocks.SMOOTH_STONE).pattern("###").unlockedBy("has_smooth_stone", has(Blocks.SMOOTH_STONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.COBBLESTONE_STAIRS, 4).define('#', Blocks.COBBLESTONE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_cobblestone", has(Blocks.COBBLESTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.STONE_SWORD).define('#', Items.STICK).define('X', ItemTags.STONE_TOOL_MATERIALS).pattern("X").pattern("X").pattern("#").unlockedBy("has_cobblestone", has(ItemTags.STONE_TOOL_MATERIALS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.WHITE_WOOL).define('#', Items.STRING).pattern("##").pattern("##").unlockedBy("has_string", has(Items.STRING)).save(consumer, "white_wool_from_string");
+        ShapelessRecipeBuilder.shapeless(Items.SUGAR).requires(Blocks.SUGAR_CANE).group("sugar").unlockedBy("has_reeds", has(Blocks.SUGAR_CANE)).save(consumer, "sugar_from_sugar_cane");
+        ShapelessRecipeBuilder.shapeless(Items.SUGAR, 3).requires(Items.HONEY_BOTTLE).group("sugar").unlockedBy("has_honey_bottle", has(Items.HONEY_BOTTLE)).save(consumer, "sugar_from_honey_bottle");
+        ShapedRecipeBuilder.shaped(Blocks.TARGET).define('H', Items.HAY_BLOCK).define('R', Items.REDSTONE).pattern(" R ").pattern("RHR").pattern(" R ").unlockedBy("has_redstone", has(Items.REDSTONE)).unlockedBy("has_hay_block", has(Blocks.HAY_BLOCK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.TNT).define('#', Ingredient.of(Blocks.SAND, Blocks.RED_SAND)).define('X', Items.GUNPOWDER).pattern("X#X").pattern("#X#").pattern("X#X").unlockedBy("has_gunpowder", has(Items.GUNPOWDER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.TNT_MINECART).define('A', Blocks.TNT).define('B', Items.MINECART).pattern("A").pattern("B").unlockedBy("has_minecart", has(Items.MINECART)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.TORCH, 4).define('#', Items.STICK).define('X', Ingredient.of(Items.COAL, Items.CHARCOAL)).pattern("X").pattern("#").unlockedBy("has_stone_pickaxe", has(Items.STONE_PICKAXE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SOUL_TORCH, 4).define('X', Ingredient.of(Items.COAL, Items.CHARCOAL)).define('#', Items.STICK).define('S', ItemTags.SOUL_FIRE_BASE_BLOCKS).pattern("X").pattern("#").pattern("S").unlockedBy("has_soul_sand", has(ItemTags.SOUL_FIRE_BASE_BLOCKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.LANTERN).define('#', Items.TORCH).define('X', Items.IRON_NUGGET).pattern("XXX").pattern("X#X").pattern("XXX").unlockedBy("has_iron_nugget", has(Items.IRON_NUGGET)).unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SOUL_LANTERN).define('#', Items.SOUL_TORCH).define('X', Items.IRON_NUGGET).pattern("XXX").pattern("X#X").pattern("XXX").unlockedBy("has_soul_torch", has(Items.SOUL_TORCH)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Blocks.TRAPPED_CHEST).requires(Blocks.CHEST).requires(Blocks.TRIPWIRE_HOOK).unlockedBy("has_tripwire_hook", has(Blocks.TRIPWIRE_HOOK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.TRIPWIRE_HOOK, 2).define('#', ItemTags.PLANKS).define('S', Items.STICK).define('I', Items.IRON_INGOT).pattern("I").pattern("S").pattern("#").unlockedBy("has_string", has(Items.STRING)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.TURTLE_HELMET).define('X', Items.SCUTE).pattern("XXX").pattern("X X").unlockedBy("has_scute", has(Items.SCUTE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.WHEAT, 9).requires(Blocks.HAY_BLOCK).unlockedBy("has_hay_block", has(Blocks.HAY_BLOCK)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.WHITE_DYE).requires(Items.BONE_MEAL).group("white_dye").unlockedBy("has_bone_meal", has(Items.BONE_MEAL)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.WHITE_DYE).requires(Blocks.LILY_OF_THE_VALLEY).group("white_dye").unlockedBy("has_white_flower", has(Blocks.LILY_OF_THE_VALLEY)).save(consumer, "white_dye_from_lily_of_the_valley");
+        ShapedRecipeBuilder.shaped(Items.WOODEN_AXE).define('#', Items.STICK).define('X', ItemTags.PLANKS).pattern("XX").pattern("X#").pattern(" #").unlockedBy("has_stick", has(Items.STICK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.WOODEN_HOE).define('#', Items.STICK).define('X', ItemTags.PLANKS).pattern("XX").pattern(" #").pattern(" #").unlockedBy("has_stick", has(Items.STICK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.WOODEN_PICKAXE).define('#', Items.STICK).define('X', ItemTags.PLANKS).pattern("XXX").pattern(" # ").pattern(" # ").unlockedBy("has_stick", has(Items.STICK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.WOODEN_SHOVEL).define('#', Items.STICK).define('X', ItemTags.PLANKS).pattern("X").pattern("#").pattern("#").unlockedBy("has_stick", has(Items.STICK)).save(consumer);
+        ShapedRecipeBuilder.shaped(Items.WOODEN_SWORD).define('#', Items.STICK).define('X', ItemTags.PLANKS).pattern("X").pattern("X").pattern("#").unlockedBy("has_stick", has(Items.STICK)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.WRITABLE_BOOK).requires(Items.BOOK).requires(Items.INK_SAC).requires(Items.FEATHER).unlockedBy("has_book", has(Items.BOOK)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.YELLOW_DYE).requires(Blocks.DANDELION).group("yellow_dye").unlockedBy("has_yellow_flower", has(Blocks.DANDELION)).save(consumer, "yellow_dye_from_dandelion");
+        ShapelessRecipeBuilder.shapeless(Items.YELLOW_DYE, 2).requires(Blocks.SUNFLOWER).group("yellow_dye").unlockedBy("has_double_plant", has(Blocks.SUNFLOWER)).save(consumer, "yellow_dye_from_sunflower");
+        ShapelessRecipeBuilder.shapeless(Items.DRIED_KELP, 9).requires(Blocks.DRIED_KELP_BLOCK).unlockedBy("has_dried_kelp_block", has(Blocks.DRIED_KELP_BLOCK)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Blocks.DRIED_KELP_BLOCK).requires(Items.DRIED_KELP, 9).unlockedBy("has_dried_kelp", has(Items.DRIED_KELP)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CONDUIT).define('#', Items.NAUTILUS_SHELL).define('X', Items.HEART_OF_THE_SEA).pattern("###").pattern("#X#").pattern("###").unlockedBy("has_nautilus_core", has(Items.HEART_OF_THE_SEA)).unlockedBy("has_nautilus_shell", has(Items.NAUTILUS_SHELL)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_GRANITE_STAIRS, 4).define('#', Blocks.POLISHED_GRANITE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_polished_granite", has(Blocks.POLISHED_GRANITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_RED_SANDSTONE_STAIRS, 4).define('#', Blocks.SMOOTH_RED_SANDSTONE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_smooth_red_sandstone", has(Blocks.SMOOTH_RED_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.MOSSY_STONE_BRICK_STAIRS, 4).define('#', Blocks.MOSSY_STONE_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_mossy_stone_bricks", has(Blocks.MOSSY_STONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_DIORITE_STAIRS, 4).define('#', Blocks.POLISHED_DIORITE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_polished_diorite", has(Blocks.POLISHED_DIORITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.MOSSY_COBBLESTONE_STAIRS, 4).define('#', Blocks.MOSSY_COBBLESTONE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_mossy_cobblestone", has(Blocks.MOSSY_COBBLESTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.END_STONE_BRICK_STAIRS, 4).define('#', Blocks.END_STONE_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_end_stone_bricks", has(Blocks.END_STONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.STONE_STAIRS, 4).define('#', Blocks.STONE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_stone", has(Blocks.STONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_SANDSTONE_STAIRS, 4).define('#', Blocks.SMOOTH_SANDSTONE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_smooth_sandstone", has(Blocks.SMOOTH_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_QUARTZ_STAIRS, 4).define('#', Blocks.SMOOTH_QUARTZ).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_smooth_quartz", has(Blocks.SMOOTH_QUARTZ)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.GRANITE_STAIRS, 4).define('#', Blocks.GRANITE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_granite", has(Blocks.GRANITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.ANDESITE_STAIRS, 4).define('#', Blocks.ANDESITE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_andesite", has(Blocks.ANDESITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.RED_NETHER_BRICK_STAIRS, 4).define('#', Blocks.RED_NETHER_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_red_nether_bricks", has(Blocks.RED_NETHER_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_ANDESITE_STAIRS, 4).define('#', Blocks.POLISHED_ANDESITE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_polished_andesite", has(Blocks.POLISHED_ANDESITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DIORITE_STAIRS, 4).define('#', Blocks.DIORITE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_diorite", has(Blocks.DIORITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_GRANITE_SLAB, 6).define('#', Blocks.POLISHED_GRANITE).pattern("###").unlockedBy("has_polished_granite", has(Blocks.POLISHED_GRANITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_RED_SANDSTONE_SLAB, 6).define('#', Blocks.SMOOTH_RED_SANDSTONE).pattern("###").unlockedBy("has_smooth_red_sandstone", has(Blocks.SMOOTH_RED_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.MOSSY_STONE_BRICK_SLAB, 6).define('#', Blocks.MOSSY_STONE_BRICKS).pattern("###").unlockedBy("has_mossy_stone_bricks", has(Blocks.MOSSY_STONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_DIORITE_SLAB, 6).define('#', Blocks.POLISHED_DIORITE).pattern("###").unlockedBy("has_polished_diorite", has(Blocks.POLISHED_DIORITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.MOSSY_COBBLESTONE_SLAB, 6).define('#', Blocks.MOSSY_COBBLESTONE).pattern("###").unlockedBy("has_mossy_cobblestone", has(Blocks.MOSSY_COBBLESTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.END_STONE_BRICK_SLAB, 6).define('#', Blocks.END_STONE_BRICKS).pattern("###").unlockedBy("has_end_stone_bricks", has(Blocks.END_STONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_SANDSTONE_SLAB, 6).define('#', Blocks.SMOOTH_SANDSTONE).pattern("###").unlockedBy("has_smooth_sandstone", has(Blocks.SMOOTH_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SMOOTH_QUARTZ_SLAB, 6).define('#', Blocks.SMOOTH_QUARTZ).pattern("###").unlockedBy("has_smooth_quartz", has(Blocks.SMOOTH_QUARTZ)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.GRANITE_SLAB, 6).define('#', Blocks.GRANITE).pattern("###").unlockedBy("has_granite", has(Blocks.GRANITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.ANDESITE_SLAB, 6).define('#', Blocks.ANDESITE).pattern("###").unlockedBy("has_andesite", has(Blocks.ANDESITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.RED_NETHER_BRICK_SLAB, 6).define('#', Blocks.RED_NETHER_BRICKS).pattern("###").unlockedBy("has_red_nether_bricks", has(Blocks.RED_NETHER_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_ANDESITE_SLAB, 6).define('#', Blocks.POLISHED_ANDESITE).pattern("###").unlockedBy("has_polished_andesite", has(Blocks.POLISHED_ANDESITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DIORITE_SLAB, 6).define('#', Blocks.DIORITE).pattern("###").unlockedBy("has_diorite", has(Blocks.DIORITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BRICK_WALL, 6).define('#', Blocks.BRICKS).pattern("###").pattern("###").unlockedBy("has_bricks", has(Blocks.BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.PRISMARINE_WALL, 6).define('#', Blocks.PRISMARINE).pattern("###").pattern("###").unlockedBy("has_prismarine", has(Blocks.PRISMARINE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.RED_SANDSTONE_WALL, 6).define('#', Blocks.RED_SANDSTONE).pattern("###").pattern("###").unlockedBy("has_red_sandstone", has(Blocks.RED_SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.MOSSY_STONE_BRICK_WALL, 6).define('#', Blocks.MOSSY_STONE_BRICKS).pattern("###").pattern("###").unlockedBy("has_mossy_stone_bricks", has(Blocks.MOSSY_STONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.GRANITE_WALL, 6).define('#', Blocks.GRANITE).pattern("###").pattern("###").unlockedBy("has_granite", has(Blocks.GRANITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.STONE_BRICK_WALL, 6).define('#', Blocks.STONE_BRICKS).pattern("###").pattern("###").unlockedBy("has_stone_bricks", has(Blocks.STONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.NETHER_BRICK_WALL, 6).define('#', Blocks.NETHER_BRICKS).pattern("###").pattern("###").unlockedBy("has_nether_bricks", has(Blocks.NETHER_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.ANDESITE_WALL, 6).define('#', Blocks.ANDESITE).pattern("###").pattern("###").unlockedBy("has_andesite", has(Blocks.ANDESITE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.RED_NETHER_BRICK_WALL, 6).define('#', Blocks.RED_NETHER_BRICKS).pattern("###").pattern("###").unlockedBy("has_red_nether_bricks", has(Blocks.RED_NETHER_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SANDSTONE_WALL, 6).define('#', Blocks.SANDSTONE).pattern("###").pattern("###").unlockedBy("has_sandstone", has(Blocks.SANDSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.END_STONE_BRICK_WALL, 6).define('#', Blocks.END_STONE_BRICKS).pattern("###").pattern("###").unlockedBy("has_end_stone_bricks", has(Blocks.END_STONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.DIORITE_WALL, 6).define('#', Blocks.DIORITE).pattern("###").pattern("###").unlockedBy("has_diorite", has(Blocks.DIORITE)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.CREEPER_BANNER_PATTERN).requires(Items.PAPER).requires(Items.CREEPER_HEAD).unlockedBy("has_creeper_head", has(Items.CREEPER_HEAD)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.SKULL_BANNER_PATTERN).requires(Items.PAPER).requires(Items.WITHER_SKELETON_SKULL).unlockedBy("has_wither_skeleton_skull", has(Items.WITHER_SKELETON_SKULL)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.FLOWER_BANNER_PATTERN).requires(Items.PAPER).requires(Blocks.OXEYE_DAISY).unlockedBy("has_oxeye_daisy", has(Blocks.OXEYE_DAISY)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.MOJANG_BANNER_PATTERN).requires(Items.PAPER).requires(Items.ENCHANTED_GOLDEN_APPLE).unlockedBy("has_enchanted_golden_apple", has(Items.ENCHANTED_GOLDEN_APPLE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SCAFFOLDING, 6).define('~', Items.STRING).define('I', Blocks.BAMBOO).pattern("I~I").pattern("I I").pattern("I I").unlockedBy("has_bamboo", has(Blocks.BAMBOO)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.GRINDSTONE).define('I', Items.STICK).define('-', Blocks.STONE_SLAB).define('#', ItemTags.PLANKS).pattern("I-I").pattern("# #").unlockedBy("has_stone_slab", has(Blocks.STONE_SLAB)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BLAST_FURNACE).define('#', Blocks.SMOOTH_STONE).define('X', Blocks.FURNACE).define('I', Items.IRON_INGOT).pattern("III").pattern("IXI").pattern("###").unlockedBy("has_smooth_stone", has(Blocks.SMOOTH_STONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SMOKER).define('#', ItemTags.LOGS).define('X', Blocks.FURNACE).pattern(" # ").pattern("#X#").pattern(" # ").unlockedBy("has_furnace", has(Blocks.FURNACE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CARTOGRAPHY_TABLE).define('#', ItemTags.PLANKS).define('@', Items.PAPER).pattern("@@").pattern("##").pattern("##").unlockedBy("has_paper", has(Items.PAPER)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.SMITHING_TABLE).define('#', ItemTags.PLANKS).define('@', Items.IRON_INGOT).pattern("@@").pattern("##").pattern("##").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.FLETCHING_TABLE).define('#', ItemTags.PLANKS).define('@', Items.FLINT).pattern("@@").pattern("##").pattern("##").unlockedBy("has_flint", has(Items.FLINT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.STONECUTTER).define('I', Items.IRON_INGOT).define('#', Blocks.STONE).pattern(" I ").pattern("###").unlockedBy("has_stone", has(Blocks.STONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.LODESTONE).define('S', Items.CHISELED_STONE_BRICKS).define('#', Items.NETHERITE_INGOT).pattern("SSS").pattern("S#S").pattern("SSS").unlockedBy("has_netherite_ingot", has(Items.NETHERITE_INGOT)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.NETHERITE_BLOCK).define('#', Items.NETHERITE_INGOT).pattern("###").pattern("###").pattern("###").unlockedBy("has_netherite_ingot", has(Items.NETHERITE_INGOT)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Items.NETHERITE_INGOT, 9).requires(Blocks.NETHERITE_BLOCK).group("netherite_ingot").unlockedBy("has_netherite_block", has(Blocks.NETHERITE_BLOCK)).save(consumer, "netherite_ingot_from_netherite_block");
+        ShapelessRecipeBuilder.shapeless(Items.NETHERITE_INGOT).requires(Items.NETHERITE_SCRAP, 4).requires(Items.GOLD_INGOT, 4).group("netherite_ingot").unlockedBy("has_netherite_scrap", has(Items.NETHERITE_SCRAP)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.RESPAWN_ANCHOR).define('O', Blocks.CRYING_OBSIDIAN).define('G', Blocks.GLOWSTONE).pattern("OOO").pattern("GGG").pattern("OOO").unlockedBy("has_obsidian", has(Blocks.CRYING_OBSIDIAN)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BLACKSTONE_STAIRS, 4).define('#', Blocks.BLACKSTONE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_BLACKSTONE_STAIRS, 4).define('#', Blocks.POLISHED_BLACKSTONE).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_BLACKSTONE_BRICK_STAIRS, 4).define('#', Blocks.POLISHED_BLACKSTONE_BRICKS).pattern("#  ").pattern("## ").pattern("###").unlockedBy("has_polished_blackstone_bricks", has(Blocks.POLISHED_BLACKSTONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BLACKSTONE_SLAB, 6).define('#', Blocks.BLACKSTONE).pattern("###").unlockedBy("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_BLACKSTONE_SLAB, 6).define('#', Blocks.POLISHED_BLACKSTONE).pattern("###").unlockedBy("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_BLACKSTONE_BRICK_SLAB, 6).define('#', Blocks.POLISHED_BLACKSTONE_BRICKS).pattern("###").unlockedBy("has_polished_blackstone_bricks", has(Blocks.POLISHED_BLACKSTONE_BRICKS)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_BLACKSTONE, 4).define('S', Blocks.BLACKSTONE).pattern("SS").pattern("SS").unlockedBy("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_BLACKSTONE_BRICKS, 4).define('#', Blocks.POLISHED_BLACKSTONE).pattern("##").pattern("##").unlockedBy("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CHISELED_POLISHED_BLACKSTONE).define('#', Blocks.POLISHED_BLACKSTONE_SLAB).pattern("#").pattern("#").unlockedBy("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.BLACKSTONE_WALL, 6).define('#', Blocks.BLACKSTONE).pattern("###").pattern("###").unlockedBy("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_BLACKSTONE_WALL, 6).define('#', Blocks.POLISHED_BLACKSTONE).pattern("###").pattern("###").unlockedBy("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_BLACKSTONE_BRICK_WALL, 6).define('#', Blocks.POLISHED_BLACKSTONE_BRICKS).pattern("###").pattern("###").unlockedBy("has_polished_blackstone_bricks", has(Blocks.POLISHED_BLACKSTONE_BRICKS)).save(consumer);
+        ShapelessRecipeBuilder.shapeless(Blocks.POLISHED_BLACKSTONE_BUTTON).requires(Blocks.POLISHED_BLACKSTONE).unlockedBy("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE).define('#', Blocks.POLISHED_BLACKSTONE).pattern("##").unlockedBy("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer);
+        ShapedRecipeBuilder.shaped(Blocks.CHAIN).define('I', Items.IRON_INGOT).define('N', Items.IRON_NUGGET).pattern("N").pattern("I").pattern("N").unlockedBy("has_iron_nugget", has(Items.IRON_NUGGET)).unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(consumer);
         SpecialRecipeBuilder.special(RecipeSerializer.ARMOR_DYE).save(consumer, "armor_dye");
         SpecialRecipeBuilder.special(RecipeSerializer.BANNER_DUPLICATE).save(consumer, "banner_duplicate");
         SpecialRecipeBuilder.special(RecipeSerializer.BOOK_CLONING).save(consumer, "book_cloning");
@@ -753,191 +803,339 @@ public class RecipeProvider implements DataProvider {
         SpecialRecipeBuilder.special(RecipeSerializer.SHULKER_BOX_COLORING).save(consumer, "shulker_box_coloring");
         SpecialRecipeBuilder.special(RecipeSerializer.TIPPED_ARROW).save(consumer, "tipped_arrow");
         SpecialRecipeBuilder.special(RecipeSerializer.SUSPICIOUS_STEW).save(consumer, "suspicious_stew");
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.POTATO), Items.BAKED_POTATO, 0.35f, 200).unlocks("has_potato", this.has(Items.POTATO)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.CLAY_BALL), Items.BRICK, 0.3f, 200).unlocks("has_clay_ball", this.has(Items.CLAY_BALL)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(ItemTags.LOGS), Items.CHARCOAL, 0.15f, 200).unlocks("has_log", this.has(ItemTags.LOGS)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.CHORUS_FRUIT), Items.POPPED_CHORUS_FRUIT, 0.1f, 200).unlocks("has_chorus_fruit", this.has(Items.CHORUS_FRUIT)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.COAL_ORE.asItem()), Items.COAL, 0.1f, 200).unlocks("has_coal_ore", this.has(Blocks.COAL_ORE)).save(consumer, "coal_from_smelting");
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.BEEF), Items.COOKED_BEEF, 0.35f, 200).unlocks("has_beef", this.has(Items.BEEF)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.CHICKEN), Items.COOKED_CHICKEN, 0.35f, 200).unlocks("has_chicken", this.has(Items.CHICKEN)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.COD), Items.COOKED_COD, 0.35f, 200).unlocks("has_cod", this.has(Items.COD)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.KELP), Items.DRIED_KELP, 0.1f, 200).unlocks("has_kelp", this.has(Blocks.KELP)).save(consumer, "dried_kelp_from_smelting");
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.SALMON), Items.COOKED_SALMON, 0.35f, 200).unlocks("has_salmon", this.has(Items.SALMON)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.MUTTON), Items.COOKED_MUTTON, 0.35f, 200).unlocks("has_mutton", this.has(Items.MUTTON)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.PORKCHOP), Items.COOKED_PORKCHOP, 0.35f, 200).unlocks("has_porkchop", this.has(Items.PORKCHOP)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.RABBIT), Items.COOKED_RABBIT, 0.35f, 200).unlocks("has_rabbit", this.has(Items.RABBIT)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.DIAMOND_ORE.asItem()), Items.DIAMOND, 1.0f, 200).unlocks("has_diamond_ore", this.has(Blocks.DIAMOND_ORE)).save(consumer, "diamond_from_smelting");
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.LAPIS_ORE.asItem()), Items.LAPIS_LAZULI, 0.2f, 200).unlocks("has_lapis_ore", this.has(Blocks.LAPIS_ORE)).save(consumer, "lapis_from_smelting");
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.EMERALD_ORE.asItem()), Items.EMERALD, 1.0f, 200).unlocks("has_emerald_ore", this.has(Blocks.EMERALD_ORE)).save(consumer, "emerald_from_smelting");
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(ItemTags.SAND), Blocks.GLASS.asItem(), 0.1f, 200).unlocks("has_sand", this.has(ItemTags.SAND)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.GOLD_ORE.asItem()), Items.GOLD_INGOT, 1.0f, 200).unlocks("has_gold_ore", this.has(Blocks.GOLD_ORE)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.SEA_PICKLE.asItem()), Items.LIME_DYE, 0.1f, 200).unlocks("has_sea_pickle", this.has(Blocks.SEA_PICKLE)).save(consumer, "lime_dye_from_smelting");
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.CACTUS.asItem()), Items.GREEN_DYE, 1.0f, 200).unlocks("has_cactus", this.has(Blocks.CACTUS)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.GOLDEN_PICKAXE, Items.GOLDEN_SHOVEL, Items.GOLDEN_AXE, Items.GOLDEN_HOE, Items.GOLDEN_SWORD, Items.GOLDEN_HELMET, Items.GOLDEN_CHESTPLATE, Items.GOLDEN_LEGGINGS, Items.GOLDEN_BOOTS, Items.GOLDEN_HORSE_ARMOR), Items.GOLD_NUGGET, 0.1f, 200).unlocks("has_golden_pickaxe", this.has(Items.GOLDEN_PICKAXE)).unlocks("has_golden_shovel", this.has(Items.GOLDEN_SHOVEL)).unlocks("has_golden_axe", this.has(Items.GOLDEN_AXE)).unlocks("has_golden_hoe", this.has(Items.GOLDEN_HOE)).unlocks("has_golden_sword", this.has(Items.GOLDEN_SWORD)).unlocks("has_golden_helmet", this.has(Items.GOLDEN_HELMET)).unlocks("has_golden_chestplate", this.has(Items.GOLDEN_CHESTPLATE)).unlocks("has_golden_leggings", this.has(Items.GOLDEN_LEGGINGS)).unlocks("has_golden_boots", this.has(Items.GOLDEN_BOOTS)).unlocks("has_golden_horse_armor", this.has(Items.GOLDEN_HORSE_ARMOR)).save(consumer, "gold_nugget_from_smelting");
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.IRON_PICKAXE, Items.IRON_SHOVEL, Items.IRON_AXE, Items.IRON_HOE, Items.IRON_SWORD, Items.IRON_HELMET, Items.IRON_CHESTPLATE, Items.IRON_LEGGINGS, Items.IRON_BOOTS, Items.IRON_HORSE_ARMOR, Items.CHAINMAIL_HELMET, Items.CHAINMAIL_CHESTPLATE, Items.CHAINMAIL_LEGGINGS, Items.CHAINMAIL_BOOTS), Items.IRON_NUGGET, 0.1f, 200).unlocks("has_iron_pickaxe", this.has(Items.IRON_PICKAXE)).unlocks("has_iron_shovel", this.has(Items.IRON_SHOVEL)).unlocks("has_iron_axe", this.has(Items.IRON_AXE)).unlocks("has_iron_hoe", this.has(Items.IRON_HOE)).unlocks("has_iron_sword", this.has(Items.IRON_SWORD)).unlocks("has_iron_helmet", this.has(Items.IRON_HELMET)).unlocks("has_iron_chestplate", this.has(Items.IRON_CHESTPLATE)).unlocks("has_iron_leggings", this.has(Items.IRON_LEGGINGS)).unlocks("has_iron_boots", this.has(Items.IRON_BOOTS)).unlocks("has_iron_horse_armor", this.has(Items.IRON_HORSE_ARMOR)).unlocks("has_chainmail_helmet", this.has(Items.CHAINMAIL_HELMET)).unlocks("has_chainmail_chestplate", this.has(Items.CHAINMAIL_CHESTPLATE)).unlocks("has_chainmail_leggings", this.has(Items.CHAINMAIL_LEGGINGS)).unlocks("has_chainmail_boots", this.has(Items.CHAINMAIL_BOOTS)).save(consumer, "iron_nugget_from_smelting");
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.IRON_ORE.asItem()), Items.IRON_INGOT, 0.7f, 200).unlocks("has_iron_ore", this.has(Blocks.IRON_ORE.asItem())).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.CLAY), Blocks.TERRACOTTA.asItem(), 0.35f, 200).unlocks("has_clay_block", this.has(Blocks.CLAY)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.NETHERRACK), Items.NETHER_BRICK, 0.1f, 200).unlocks("has_netherrack", this.has(Blocks.NETHERRACK)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.NETHER_QUARTZ_ORE), Items.QUARTZ, 0.2f, 200).unlocks("has_nether_quartz_ore", this.has(Blocks.NETHER_QUARTZ_ORE)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.REDSTONE_ORE), Items.REDSTONE, 0.7f, 200).unlocks("has_redstone_ore", this.has(Blocks.REDSTONE_ORE)).save(consumer, "redstone_from_smelting");
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.WET_SPONGE), Blocks.SPONGE.asItem(), 0.15f, 200).unlocks("has_wet_sponge", this.has(Blocks.WET_SPONGE)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.COBBLESTONE), Blocks.STONE.asItem(), 0.1f, 200).unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.STONE), Blocks.SMOOTH_STONE.asItem(), 0.1f, 200).unlocks("has_stone", this.has(Blocks.STONE)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.SANDSTONE), Blocks.SMOOTH_SANDSTONE.asItem(), 0.1f, 200).unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.SMOOTH_RED_SANDSTONE.asItem(), 0.1f, 200).unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.SMOOTH_QUARTZ.asItem(), 0.1f, 200).unlocks("has_quartz_block", this.has(Blocks.QUARTZ_BLOCK)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.STONE_BRICKS), Blocks.CRACKED_STONE_BRICKS.asItem(), 0.1f, 200).unlocks("has_stone_bricks", this.has(Blocks.STONE_BRICKS)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.BLACK_TERRACOTTA), Blocks.BLACK_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_black_terracotta", this.has(Blocks.BLACK_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.BLUE_TERRACOTTA), Blocks.BLUE_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_blue_terracotta", this.has(Blocks.BLUE_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.BROWN_TERRACOTTA), Blocks.BROWN_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_brown_terracotta", this.has(Blocks.BROWN_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.CYAN_TERRACOTTA), Blocks.CYAN_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_cyan_terracotta", this.has(Blocks.CYAN_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.GRAY_TERRACOTTA), Blocks.GRAY_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_gray_terracotta", this.has(Blocks.GRAY_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.GREEN_TERRACOTTA), Blocks.GREEN_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_green_terracotta", this.has(Blocks.GREEN_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.LIGHT_BLUE_TERRACOTTA), Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_light_blue_terracotta", this.has(Blocks.LIGHT_BLUE_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.LIGHT_GRAY_TERRACOTTA), Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_light_gray_terracotta", this.has(Blocks.LIGHT_GRAY_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.LIME_TERRACOTTA), Blocks.LIME_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_lime_terracotta", this.has(Blocks.LIME_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.MAGENTA_TERRACOTTA), Blocks.MAGENTA_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_magenta_terracotta", this.has(Blocks.MAGENTA_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.ORANGE_TERRACOTTA), Blocks.ORANGE_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_orange_terracotta", this.has(Blocks.ORANGE_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.PINK_TERRACOTTA), Blocks.PINK_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_pink_terracotta", this.has(Blocks.PINK_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.PURPLE_TERRACOTTA), Blocks.PURPLE_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_purple_terracotta", this.has(Blocks.PURPLE_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.RED_TERRACOTTA), Blocks.RED_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_red_terracotta", this.has(Blocks.RED_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.WHITE_TERRACOTTA), Blocks.WHITE_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_white_terracotta", this.has(Blocks.WHITE_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.YELLOW_TERRACOTTA), Blocks.YELLOW_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlocks("has_yellow_terracotta", this.has(Blocks.YELLOW_TERRACOTTA)).save(consumer);
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.IRON_ORE.asItem()), Items.IRON_INGOT, 0.7f, 100).unlocks("has_iron_ore", this.has(Blocks.IRON_ORE.asItem())).save(consumer, "iron_ingot_from_blasting");
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.GOLD_ORE.asItem()), Items.GOLD_INGOT, 1.0f, 100).unlocks("has_gold_ore", this.has(Blocks.GOLD_ORE)).save(consumer, "gold_ingot_from_blasting");
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.DIAMOND_ORE.asItem()), Items.DIAMOND, 1.0f, 100).unlocks("has_diamond_ore", this.has(Blocks.DIAMOND_ORE)).save(consumer, "diamond_from_blasting");
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.LAPIS_ORE.asItem()), Items.LAPIS_LAZULI, 0.2f, 100).unlocks("has_lapis_ore", this.has(Blocks.LAPIS_ORE)).save(consumer, "lapis_from_blasting");
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.REDSTONE_ORE), Items.REDSTONE, 0.7f, 100).unlocks("has_redstone_ore", this.has(Blocks.REDSTONE_ORE)).save(consumer, "redstone_from_blasting");
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.COAL_ORE.asItem()), Items.COAL, 0.1f, 100).unlocks("has_coal_ore", this.has(Blocks.COAL_ORE)).save(consumer, "coal_from_blasting");
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.EMERALD_ORE.asItem()), Items.EMERALD, 1.0f, 100).unlocks("has_emerald_ore", this.has(Blocks.EMERALD_ORE)).save(consumer, "emerald_from_blasting");
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.NETHER_QUARTZ_ORE), Items.QUARTZ, 0.2f, 100).unlocks("has_nether_quartz_ore", this.has(Blocks.NETHER_QUARTZ_ORE)).save(consumer, "quartz_from_blasting");
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Items.GOLDEN_PICKAXE, Items.GOLDEN_SHOVEL, Items.GOLDEN_AXE, Items.GOLDEN_HOE, Items.GOLDEN_SWORD, Items.GOLDEN_HELMET, Items.GOLDEN_CHESTPLATE, Items.GOLDEN_LEGGINGS, Items.GOLDEN_BOOTS, Items.GOLDEN_HORSE_ARMOR), Items.GOLD_NUGGET, 0.1f, 100).unlocks("has_golden_pickaxe", this.has(Items.GOLDEN_PICKAXE)).unlocks("has_golden_shovel", this.has(Items.GOLDEN_SHOVEL)).unlocks("has_golden_axe", this.has(Items.GOLDEN_AXE)).unlocks("has_golden_hoe", this.has(Items.GOLDEN_HOE)).unlocks("has_golden_sword", this.has(Items.GOLDEN_SWORD)).unlocks("has_golden_helmet", this.has(Items.GOLDEN_HELMET)).unlocks("has_golden_chestplate", this.has(Items.GOLDEN_CHESTPLATE)).unlocks("has_golden_leggings", this.has(Items.GOLDEN_LEGGINGS)).unlocks("has_golden_boots", this.has(Items.GOLDEN_BOOTS)).unlocks("has_golden_horse_armor", this.has(Items.GOLDEN_HORSE_ARMOR)).save(consumer, "gold_nugget_from_blasting");
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Items.IRON_PICKAXE, Items.IRON_SHOVEL, Items.IRON_AXE, Items.IRON_HOE, Items.IRON_SWORD, Items.IRON_HELMET, Items.IRON_CHESTPLATE, Items.IRON_LEGGINGS, Items.IRON_BOOTS, Items.IRON_HORSE_ARMOR, Items.CHAINMAIL_HELMET, Items.CHAINMAIL_CHESTPLATE, Items.CHAINMAIL_LEGGINGS, Items.CHAINMAIL_BOOTS), Items.IRON_NUGGET, 0.1f, 100).unlocks("has_iron_pickaxe", this.has(Items.IRON_PICKAXE)).unlocks("has_iron_shovel", this.has(Items.IRON_SHOVEL)).unlocks("has_iron_axe", this.has(Items.IRON_AXE)).unlocks("has_iron_hoe", this.has(Items.IRON_HOE)).unlocks("has_iron_sword", this.has(Items.IRON_SWORD)).unlocks("has_iron_helmet", this.has(Items.IRON_HELMET)).unlocks("has_iron_chestplate", this.has(Items.IRON_CHESTPLATE)).unlocks("has_iron_leggings", this.has(Items.IRON_LEGGINGS)).unlocks("has_iron_boots", this.has(Items.IRON_BOOTS)).unlocks("has_iron_horse_armor", this.has(Items.IRON_HORSE_ARMOR)).unlocks("has_chainmail_helmet", this.has(Items.CHAINMAIL_HELMET)).unlocks("has_chainmail_chestplate", this.has(Items.CHAINMAIL_CHESTPLATE)).unlocks("has_chainmail_leggings", this.has(Items.CHAINMAIL_LEGGINGS)).unlocks("has_chainmail_boots", this.has(Items.CHAINMAIL_BOOTS)).save(consumer, "iron_nugget_from_blasting");
-        this.cookRecipes(consumer, "smoking", RecipeSerializer.SMOKING_RECIPE, 100);
-        this.cookRecipes(consumer, "campfire_cooking", RecipeSerializer.CAMPFIRE_COOKING_RECIPE, 600);
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_SLAB, 2).unlocks("has_stone", this.has(Blocks.STONE)).save(consumer, "stone_slab_from_stone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_STAIRS).unlocks("has_stone", this.has(Blocks.STONE)).save(consumer, "stone_stairs_from_stone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_BRICKS).unlocks("has_stone", this.has(Blocks.STONE)).save(consumer, "stone_bricks_from_stone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_BRICK_SLAB, 2).unlocks("has_stone", this.has(Blocks.STONE)).save(consumer, "stone_brick_slab_from_stone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_BRICK_STAIRS).unlocks("has_stone", this.has(Blocks.STONE)).save(consumer, "stone_brick_stairs_from_stone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.CHISELED_STONE_BRICKS).unlocks("has_stone", this.has(Blocks.STONE)).save(consumer, "chiseled_stone_bricks_stone_from_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_BRICK_WALL).unlocks("has_stone", this.has(Blocks.STONE)).save(consumer, "stone_brick_walls_from_stone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.CUT_SANDSTONE).unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).save(consumer, "cut_sandstone_from_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.SANDSTONE_SLAB, 2).unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).save(consumer, "sandstone_slab_from_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.CUT_SANDSTONE_SLAB, 2).unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).save(consumer, "cut_sandstone_slab_from_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.CUT_SANDSTONE), Blocks.CUT_SANDSTONE_SLAB, 2).unlocks("has_cut_sandstone", this.has(Blocks.SANDSTONE)).save(consumer, "cut_sandstone_slab_from_cut_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.SANDSTONE_STAIRS).unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).save(consumer, "sandstone_stairs_from_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.SANDSTONE_WALL).unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).save(consumer, "sandstone_wall_from_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.CHISELED_SANDSTONE).unlocks("has_sandstone", this.has(Blocks.SANDSTONE)).save(consumer, "chiseled_sandstone_from_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.CUT_RED_SANDSTONE).unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).save(consumer, "cut_red_sandstone_from_red_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.RED_SANDSTONE_SLAB, 2).unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).save(consumer, "red_sandstone_slab_from_red_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.CUT_RED_SANDSTONE_SLAB, 2).unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).save(consumer, "cut_red_sandstone_slab_from_red_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.CUT_RED_SANDSTONE), Blocks.CUT_RED_SANDSTONE_SLAB, 2).unlocks("has_cut_red_sandstone", this.has(Blocks.RED_SANDSTONE)).save(consumer, "cut_red_sandstone_slab_from_cut_red_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.RED_SANDSTONE_STAIRS).unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).save(consumer, "red_sandstone_stairs_from_red_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.RED_SANDSTONE_WALL).unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).save(consumer, "red_sandstone_wall_from_red_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.CHISELED_RED_SANDSTONE).unlocks("has_red_sandstone", this.has(Blocks.RED_SANDSTONE)).save(consumer, "chiseled_red_sandstone_from_red_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.QUARTZ_SLAB, 2).unlocks("has_quartz_block", this.has(Blocks.QUARTZ_BLOCK)).save(consumer, "quartz_slab_from_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.QUARTZ_STAIRS).unlocks("has_quartz_block", this.has(Blocks.QUARTZ_BLOCK)).save(consumer, "quartz_stairs_from_quartz_block_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.QUARTZ_PILLAR).unlocks("has_quartz_block", this.has(Blocks.QUARTZ_BLOCK)).save(consumer, "quartz_pillar_from_quartz_block_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.CHISELED_QUARTZ_BLOCK).unlocks("has_quartz_block", this.has(Blocks.QUARTZ_BLOCK)).save(consumer, "chiseled_quartz_block_from_quartz_block_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.COBBLESTONE), Blocks.COBBLESTONE_STAIRS).unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer, "cobblestone_stairs_from_cobblestone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.COBBLESTONE), Blocks.COBBLESTONE_SLAB, 2).unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer, "cobblestone_slab_from_cobblestone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.COBBLESTONE), Blocks.COBBLESTONE_WALL).unlocks("has_cobblestone", this.has(Blocks.COBBLESTONE)).save(consumer, "cobblestone_wall_from_cobblestone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE_BRICKS), Blocks.STONE_BRICK_SLAB, 2).unlocks("has_stone_bricks", this.has(Blocks.STONE_BRICKS)).save(consumer, "stone_brick_slab_from_stone_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE_BRICKS), Blocks.STONE_BRICK_STAIRS).unlocks("has_stone_bricks", this.has(Blocks.STONE_BRICKS)).save(consumer, "stone_brick_stairs_from_stone_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE_BRICKS), Blocks.STONE_BRICK_WALL).unlocks("has_stone_bricks", this.has(Blocks.STONE_BRICKS)).save(consumer, "stone_brick_wall_from_stone_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE_BRICKS), Blocks.CHISELED_STONE_BRICKS).unlocks("has_stone_bricks", this.has(Blocks.STONE_BRICKS)).save(consumer, "chiseled_stone_bricks_from_stone_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BRICKS), Blocks.BRICK_SLAB, 2).unlocks("has_bricks", this.has(Blocks.BRICKS)).save(consumer, "brick_slab_from_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BRICKS), Blocks.BRICK_STAIRS).unlocks("has_bricks", this.has(Blocks.BRICKS)).save(consumer, "brick_stairs_from_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BRICKS), Blocks.BRICK_WALL).unlocks("has_bricks", this.has(Blocks.BRICKS)).save(consumer, "brick_wall_from_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.NETHER_BRICKS), Blocks.NETHER_BRICK_SLAB, 2).unlocks("has_nether_bricks", this.has(Blocks.NETHER_BRICKS)).save(consumer, "nether_brick_slab_from_nether_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.NETHER_BRICKS), Blocks.NETHER_BRICK_STAIRS).unlocks("has_nether_bricks", this.has(Blocks.NETHER_BRICKS)).save(consumer, "nether_brick_stairs_from_nether_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.NETHER_BRICKS), Blocks.NETHER_BRICK_WALL).unlocks("has_nether_bricks", this.has(Blocks.NETHER_BRICKS)).save(consumer, "nether_brick_wall_from_nether_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_NETHER_BRICKS), Blocks.RED_NETHER_BRICK_SLAB, 2).unlocks("has_nether_bricks", this.has(Blocks.RED_NETHER_BRICKS)).save(consumer, "red_nether_brick_slab_from_red_nether_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_NETHER_BRICKS), Blocks.RED_NETHER_BRICK_STAIRS).unlocks("has_nether_bricks", this.has(Blocks.RED_NETHER_BRICKS)).save(consumer, "red_nether_brick_stairs_from_red_nether_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_NETHER_BRICKS), Blocks.RED_NETHER_BRICK_WALL).unlocks("has_nether_bricks", this.has(Blocks.RED_NETHER_BRICKS)).save(consumer, "red_nether_brick_wall_from_red_nether_bricks_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PURPUR_BLOCK), Blocks.PURPUR_SLAB, 2).unlocks("has_purpur_block", this.has(Blocks.PURPUR_BLOCK)).save(consumer, "purpur_slab_from_purpur_block_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PURPUR_BLOCK), Blocks.PURPUR_STAIRS).unlocks("has_purpur_block", this.has(Blocks.PURPUR_BLOCK)).save(consumer, "purpur_stairs_from_purpur_block_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PURPUR_BLOCK), Blocks.PURPUR_PILLAR).unlocks("has_purpur_block", this.has(Blocks.PURPUR_BLOCK)).save(consumer, "purpur_pillar_from_purpur_block_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PRISMARINE), Blocks.PRISMARINE_SLAB, 2).unlocks("has_prismarine", this.has(Blocks.PRISMARINE)).save(consumer, "prismarine_slab_from_prismarine_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PRISMARINE), Blocks.PRISMARINE_STAIRS).unlocks("has_prismarine", this.has(Blocks.PRISMARINE)).save(consumer, "prismarine_stairs_from_prismarine_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PRISMARINE), Blocks.PRISMARINE_WALL).unlocks("has_prismarine", this.has(Blocks.PRISMARINE)).save(consumer, "prismarine_wall_from_prismarine_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PRISMARINE_BRICKS), Blocks.PRISMARINE_BRICK_SLAB, 2).unlocks("has_prismarine_brick", this.has(Blocks.PRISMARINE_BRICKS)).save(consumer, "prismarine_brick_slab_from_prismarine_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PRISMARINE_BRICKS), Blocks.PRISMARINE_BRICK_STAIRS).unlocks("has_prismarine_brick", this.has(Blocks.PRISMARINE_BRICKS)).save(consumer, "prismarine_brick_stairs_from_prismarine_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DARK_PRISMARINE), Blocks.DARK_PRISMARINE_SLAB, 2).unlocks("has_dark_prismarine", this.has(Blocks.DARK_PRISMARINE)).save(consumer, "dark_prismarine_slab_from_dark_prismarine_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DARK_PRISMARINE), Blocks.DARK_PRISMARINE_STAIRS).unlocks("has_dark_prismarine", this.has(Blocks.DARK_PRISMARINE)).save(consumer, "dark_prismarine_stairs_from_dark_prismarine_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.ANDESITE_SLAB, 2).unlocks("has_andesite", this.has(Blocks.ANDESITE)).save(consumer, "andesite_slab_from_andesite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.ANDESITE_STAIRS).unlocks("has_andesite", this.has(Blocks.ANDESITE)).save(consumer, "andesite_stairs_from_andesite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.ANDESITE_WALL).unlocks("has_andesite", this.has(Blocks.ANDESITE)).save(consumer, "andesite_wall_from_andesite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.POLISHED_ANDESITE).unlocks("has_andesite", this.has(Blocks.ANDESITE)).save(consumer, "polished_andesite_from_andesite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.POLISHED_ANDESITE_SLAB, 2).unlocks("has_andesite", this.has(Blocks.ANDESITE)).save(consumer, "polished_andesite_slab_from_andesite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.POLISHED_ANDESITE_STAIRS).unlocks("has_andesite", this.has(Blocks.ANDESITE)).save(consumer, "polished_andesite_stairs_from_andesite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_ANDESITE), Blocks.POLISHED_ANDESITE_SLAB, 2).unlocks("has_polished_andesite", this.has(Blocks.POLISHED_ANDESITE)).save(consumer, "polished_andesite_slab_from_polished_andesite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_ANDESITE), Blocks.POLISHED_ANDESITE_STAIRS).unlocks("has_polished_andesite", this.has(Blocks.POLISHED_ANDESITE)).save(consumer, "polished_andesite_stairs_from_polished_andesite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.GRANITE_SLAB, 2).unlocks("has_granite", this.has(Blocks.GRANITE)).save(consumer, "granite_slab_from_granite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.GRANITE_STAIRS).unlocks("has_granite", this.has(Blocks.GRANITE)).save(consumer, "granite_stairs_from_granite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.GRANITE_WALL).unlocks("has_granite", this.has(Blocks.GRANITE)).save(consumer, "granite_wall_from_granite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.POLISHED_GRANITE).unlocks("has_granite", this.has(Blocks.GRANITE)).save(consumer, "polished_granite_from_granite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.POLISHED_GRANITE_SLAB, 2).unlocks("has_granite", this.has(Blocks.GRANITE)).save(consumer, "polished_granite_slab_from_granite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.POLISHED_GRANITE_STAIRS).unlocks("has_granite", this.has(Blocks.GRANITE)).save(consumer, "polished_granite_stairs_from_granite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_GRANITE), Blocks.POLISHED_GRANITE_SLAB, 2).unlocks("has_polished_granite", this.has(Blocks.POLISHED_GRANITE)).save(consumer, "polished_granite_slab_from_polished_granite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_GRANITE), Blocks.POLISHED_GRANITE_STAIRS).unlocks("has_polished_granite", this.has(Blocks.POLISHED_GRANITE)).save(consumer, "polished_granite_stairs_from_polished_granite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.DIORITE_SLAB, 2).unlocks("has_diorite", this.has(Blocks.DIORITE)).save(consumer, "diorite_slab_from_diorite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.DIORITE_STAIRS).unlocks("has_diorite", this.has(Blocks.DIORITE)).save(consumer, "diorite_stairs_from_diorite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.DIORITE_WALL).unlocks("has_diorite", this.has(Blocks.DIORITE)).save(consumer, "diorite_wall_from_diorite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.POLISHED_DIORITE).unlocks("has_diorite", this.has(Blocks.DIORITE)).save(consumer, "polished_diorite_from_diorite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.POLISHED_DIORITE_SLAB, 2).unlocks("has_diorite", this.has(Blocks.POLISHED_DIORITE)).save(consumer, "polished_diorite_slab_from_diorite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.POLISHED_DIORITE_STAIRS).unlocks("has_diorite", this.has(Blocks.POLISHED_DIORITE)).save(consumer, "polished_diorite_stairs_from_diorite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_DIORITE), Blocks.POLISHED_DIORITE_SLAB, 2).unlocks("has_polished_diorite", this.has(Blocks.POLISHED_DIORITE)).save(consumer, "polished_diorite_slab_from_polished_diorite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_DIORITE), Blocks.POLISHED_DIORITE_STAIRS).unlocks("has_polished_diorite", this.has(Blocks.POLISHED_DIORITE)).save(consumer, "polished_diorite_stairs_from_polished_diorite_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_STONE_BRICKS), Blocks.MOSSY_STONE_BRICK_SLAB, 2).unlocks("has_mossy_stone_bricks", this.has(Blocks.MOSSY_STONE_BRICKS)).save(consumer, "mossy_stone_brick_slab_from_mossy_stone_brick_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_STONE_BRICKS), Blocks.MOSSY_STONE_BRICK_STAIRS).unlocks("has_mossy_stone_bricks", this.has(Blocks.MOSSY_STONE_BRICKS)).save(consumer, "mossy_stone_brick_stairs_from_mossy_stone_brick_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_STONE_BRICKS), Blocks.MOSSY_STONE_BRICK_WALL).unlocks("has_mossy_stone_bricks", this.has(Blocks.MOSSY_STONE_BRICKS)).save(consumer, "mossy_stone_brick_wall_from_mossy_stone_brick_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_COBBLESTONE), Blocks.MOSSY_COBBLESTONE_SLAB, 2).unlocks("has_mossy_cobblestone", this.has(Blocks.MOSSY_COBBLESTONE)).save(consumer, "mossy_cobblestone_slab_from_mossy_cobblestone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_COBBLESTONE), Blocks.MOSSY_COBBLESTONE_STAIRS).unlocks("has_mossy_cobblestone", this.has(Blocks.MOSSY_COBBLESTONE)).save(consumer, "mossy_cobblestone_stairs_from_mossy_cobblestone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_COBBLESTONE), Blocks.MOSSY_COBBLESTONE_WALL).unlocks("has_mossy_cobblestone", this.has(Blocks.MOSSY_COBBLESTONE)).save(consumer, "mossy_cobblestone_wall_from_mossy_cobblestone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_SANDSTONE), Blocks.SMOOTH_SANDSTONE_SLAB, 2).unlocks("has_smooth_sandstone", this.has(Blocks.SMOOTH_SANDSTONE)).save(consumer, "smooth_sandstone_slab_from_smooth_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_SANDSTONE), Blocks.SMOOTH_SANDSTONE_STAIRS).unlocks("has_mossy_cobblestone", this.has(Blocks.SMOOTH_SANDSTONE)).save(consumer, "smooth_sandstone_stairs_from_smooth_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_RED_SANDSTONE), Blocks.SMOOTH_RED_SANDSTONE_SLAB, 2).unlocks("has_smooth_red_sandstone", this.has(Blocks.SMOOTH_RED_SANDSTONE)).save(consumer, "smooth_red_sandstone_slab_from_smooth_red_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_RED_SANDSTONE), Blocks.SMOOTH_RED_SANDSTONE_STAIRS).unlocks("has_smooth_red_sandstone", this.has(Blocks.SMOOTH_RED_SANDSTONE)).save(consumer, "smooth_red_sandstone_stairs_from_smooth_red_sandstone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_QUARTZ), Blocks.SMOOTH_QUARTZ_SLAB, 2).unlocks("has_smooth_quartz", this.has(Blocks.SMOOTH_QUARTZ)).save(consumer, "smooth_quartz_slab_from_smooth_quartz_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_QUARTZ), Blocks.SMOOTH_QUARTZ_STAIRS).unlocks("has_smooth_quartz", this.has(Blocks.SMOOTH_QUARTZ)).save(consumer, "smooth_quartz_stairs_from_smooth_quartz_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE_BRICKS), Blocks.END_STONE_BRICK_SLAB, 2).unlocks("has_end_stone_brick", this.has(Blocks.END_STONE_BRICKS)).save(consumer, "end_stone_brick_slab_from_end_stone_brick_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE_BRICKS), Blocks.END_STONE_BRICK_STAIRS).unlocks("has_end_stone_brick", this.has(Blocks.END_STONE_BRICKS)).save(consumer, "end_stone_brick_stairs_from_end_stone_brick_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE_BRICKS), Blocks.END_STONE_BRICK_WALL).unlocks("has_end_stone_brick", this.has(Blocks.END_STONE_BRICKS)).save(consumer, "end_stone_brick_wall_from_end_stone_brick_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE), Blocks.END_STONE_BRICKS).unlocks("has_end_stone", this.has(Blocks.END_STONE)).save(consumer, "end_stone_bricks_from_end_stone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE), Blocks.END_STONE_BRICK_SLAB, 2).unlocks("has_end_stone", this.has(Blocks.END_STONE)).save(consumer, "end_stone_brick_slab_from_end_stone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE), Blocks.END_STONE_BRICK_STAIRS).unlocks("has_end_stone", this.has(Blocks.END_STONE)).save(consumer, "end_stone_brick_stairs_from_end_stone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE), Blocks.END_STONE_BRICK_WALL).unlocks("has_end_stone", this.has(Blocks.END_STONE)).save(consumer, "end_stone_brick_wall_from_end_stone_stonecutting");
-        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_STONE), Blocks.SMOOTH_STONE_SLAB, 2).unlocks("has_smooth_stone", this.has(Blocks.SMOOTH_STONE)).save(consumer, "smooth_stone_slab_from_smooth_stone_stonecutting");
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.POTATO), Items.BAKED_POTATO, 0.35f, 200).unlockedBy("has_potato", has(Items.POTATO)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.CLAY_BALL), Items.BRICK, 0.3f, 200).unlockedBy("has_clay_ball", has(Items.CLAY_BALL)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(ItemTags.LOGS_THAT_BURN), Items.CHARCOAL, 0.15f, 200).unlockedBy("has_log", has(ItemTags.LOGS_THAT_BURN)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.CHORUS_FRUIT), Items.POPPED_CHORUS_FRUIT, 0.1f, 200).unlockedBy("has_chorus_fruit", has(Items.CHORUS_FRUIT)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.COAL_ORE.asItem()), Items.COAL, 0.1f, 200).unlockedBy("has_coal_ore", has(Blocks.COAL_ORE)).save(consumer, "coal_from_smelting");
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.BEEF), Items.COOKED_BEEF, 0.35f, 200).unlockedBy("has_beef", has(Items.BEEF)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.CHICKEN), Items.COOKED_CHICKEN, 0.35f, 200).unlockedBy("has_chicken", has(Items.CHICKEN)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.COD), Items.COOKED_COD, 0.35f, 200).unlockedBy("has_cod", has(Items.COD)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.KELP), Items.DRIED_KELP, 0.1f, 200).unlockedBy("has_kelp", has(Blocks.KELP)).save(consumer, "dried_kelp_from_smelting");
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.SALMON), Items.COOKED_SALMON, 0.35f, 200).unlockedBy("has_salmon", has(Items.SALMON)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.MUTTON), Items.COOKED_MUTTON, 0.35f, 200).unlockedBy("has_mutton", has(Items.MUTTON)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.PORKCHOP), Items.COOKED_PORKCHOP, 0.35f, 200).unlockedBy("has_porkchop", has(Items.PORKCHOP)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.RABBIT), Items.COOKED_RABBIT, 0.35f, 200).unlockedBy("has_rabbit", has(Items.RABBIT)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.DIAMOND_ORE.asItem()), Items.DIAMOND, 1.0f, 200).unlockedBy("has_diamond_ore", has(Blocks.DIAMOND_ORE)).save(consumer, "diamond_from_smelting");
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.LAPIS_ORE.asItem()), Items.LAPIS_LAZULI, 0.2f, 200).unlockedBy("has_lapis_ore", has(Blocks.LAPIS_ORE)).save(consumer, "lapis_from_smelting");
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.EMERALD_ORE.asItem()), Items.EMERALD, 1.0f, 200).unlockedBy("has_emerald_ore", has(Blocks.EMERALD_ORE)).save(consumer, "emerald_from_smelting");
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(ItemTags.SAND), Blocks.GLASS.asItem(), 0.1f, 200).unlockedBy("has_sand", has(ItemTags.SAND)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(ItemTags.GOLD_ORES), Items.GOLD_INGOT, 1.0f, 200).unlockedBy("has_gold_ore", has(ItemTags.GOLD_ORES)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.SEA_PICKLE.asItem()), Items.LIME_DYE, 0.1f, 200).unlockedBy("has_sea_pickle", has(Blocks.SEA_PICKLE)).save(consumer, "lime_dye_from_smelting");
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.CACTUS.asItem()), Items.GREEN_DYE, 1.0f, 200).unlockedBy("has_cactus", has(Blocks.CACTUS)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.GOLDEN_PICKAXE, Items.GOLDEN_SHOVEL, Items.GOLDEN_AXE, Items.GOLDEN_HOE, Items.GOLDEN_SWORD, Items.GOLDEN_HELMET, Items.GOLDEN_CHESTPLATE, Items.GOLDEN_LEGGINGS, Items.GOLDEN_BOOTS, Items.GOLDEN_HORSE_ARMOR), Items.GOLD_NUGGET, 0.1f, 200).unlockedBy("has_golden_pickaxe", has(Items.GOLDEN_PICKAXE)).unlockedBy("has_golden_shovel", has(Items.GOLDEN_SHOVEL)).unlockedBy("has_golden_axe", has(Items.GOLDEN_AXE)).unlockedBy("has_golden_hoe", has(Items.GOLDEN_HOE)).unlockedBy("has_golden_sword", has(Items.GOLDEN_SWORD)).unlockedBy("has_golden_helmet", has(Items.GOLDEN_HELMET)).unlockedBy("has_golden_chestplate", has(Items.GOLDEN_CHESTPLATE)).unlockedBy("has_golden_leggings", has(Items.GOLDEN_LEGGINGS)).unlockedBy("has_golden_boots", has(Items.GOLDEN_BOOTS)).unlockedBy("has_golden_horse_armor", has(Items.GOLDEN_HORSE_ARMOR)).save(consumer, "gold_nugget_from_smelting");
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.IRON_PICKAXE, Items.IRON_SHOVEL, Items.IRON_AXE, Items.IRON_HOE, Items.IRON_SWORD, Items.IRON_HELMET, Items.IRON_CHESTPLATE, Items.IRON_LEGGINGS, Items.IRON_BOOTS, Items.IRON_HORSE_ARMOR, Items.CHAINMAIL_HELMET, Items.CHAINMAIL_CHESTPLATE, Items.CHAINMAIL_LEGGINGS, Items.CHAINMAIL_BOOTS), Items.IRON_NUGGET, 0.1f, 200).unlockedBy("has_iron_pickaxe", has(Items.IRON_PICKAXE)).unlockedBy("has_iron_shovel", has(Items.IRON_SHOVEL)).unlockedBy("has_iron_axe", has(Items.IRON_AXE)).unlockedBy("has_iron_hoe", has(Items.IRON_HOE)).unlockedBy("has_iron_sword", has(Items.IRON_SWORD)).unlockedBy("has_iron_helmet", has(Items.IRON_HELMET)).unlockedBy("has_iron_chestplate", has(Items.IRON_CHESTPLATE)).unlockedBy("has_iron_leggings", has(Items.IRON_LEGGINGS)).unlockedBy("has_iron_boots", has(Items.IRON_BOOTS)).unlockedBy("has_iron_horse_armor", has(Items.IRON_HORSE_ARMOR)).unlockedBy("has_chainmail_helmet", has(Items.CHAINMAIL_HELMET)).unlockedBy("has_chainmail_chestplate", has(Items.CHAINMAIL_CHESTPLATE)).unlockedBy("has_chainmail_leggings", has(Items.CHAINMAIL_LEGGINGS)).unlockedBy("has_chainmail_boots", has(Items.CHAINMAIL_BOOTS)).save(consumer, "iron_nugget_from_smelting");
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.IRON_ORE.asItem()), Items.IRON_INGOT, 0.7f, 200).unlockedBy("has_iron_ore", has(Blocks.IRON_ORE.asItem())).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.CLAY), Blocks.TERRACOTTA.asItem(), 0.35f, 200).unlockedBy("has_clay_block", has(Blocks.CLAY)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.NETHERRACK), Items.NETHER_BRICK, 0.1f, 200).unlockedBy("has_netherrack", has(Blocks.NETHERRACK)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.NETHER_QUARTZ_ORE), Items.QUARTZ, 0.2f, 200).unlockedBy("has_nether_quartz_ore", has(Blocks.NETHER_QUARTZ_ORE)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.REDSTONE_ORE), Items.REDSTONE, 0.7f, 200).unlockedBy("has_redstone_ore", has(Blocks.REDSTONE_ORE)).save(consumer, "redstone_from_smelting");
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.WET_SPONGE), Blocks.SPONGE.asItem(), 0.15f, 200).unlockedBy("has_wet_sponge", has(Blocks.WET_SPONGE)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.COBBLESTONE), Blocks.STONE.asItem(), 0.1f, 200).unlockedBy("has_cobblestone", has(Blocks.COBBLESTONE)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.STONE), Blocks.SMOOTH_STONE.asItem(), 0.1f, 200).unlockedBy("has_stone", has(Blocks.STONE)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.SANDSTONE), Blocks.SMOOTH_SANDSTONE.asItem(), 0.1f, 200).unlockedBy("has_sandstone", has(Blocks.SANDSTONE)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.SMOOTH_RED_SANDSTONE.asItem(), 0.1f, 200).unlockedBy("has_red_sandstone", has(Blocks.RED_SANDSTONE)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.SMOOTH_QUARTZ.asItem(), 0.1f, 200).unlockedBy("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.STONE_BRICKS), Blocks.CRACKED_STONE_BRICKS.asItem(), 0.1f, 200).unlockedBy("has_stone_bricks", has(Blocks.STONE_BRICKS)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.BLACK_TERRACOTTA), Blocks.BLACK_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_black_terracotta", has(Blocks.BLACK_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.BLUE_TERRACOTTA), Blocks.BLUE_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_blue_terracotta", has(Blocks.BLUE_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.BROWN_TERRACOTTA), Blocks.BROWN_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_brown_terracotta", has(Blocks.BROWN_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.CYAN_TERRACOTTA), Blocks.CYAN_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_cyan_terracotta", has(Blocks.CYAN_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.GRAY_TERRACOTTA), Blocks.GRAY_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_gray_terracotta", has(Blocks.GRAY_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.GREEN_TERRACOTTA), Blocks.GREEN_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_green_terracotta", has(Blocks.GREEN_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.LIGHT_BLUE_TERRACOTTA), Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_light_blue_terracotta", has(Blocks.LIGHT_BLUE_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.LIGHT_GRAY_TERRACOTTA), Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_light_gray_terracotta", has(Blocks.LIGHT_GRAY_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.LIME_TERRACOTTA), Blocks.LIME_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_lime_terracotta", has(Blocks.LIME_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.MAGENTA_TERRACOTTA), Blocks.MAGENTA_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_magenta_terracotta", has(Blocks.MAGENTA_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.ORANGE_TERRACOTTA), Blocks.ORANGE_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_orange_terracotta", has(Blocks.ORANGE_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.PINK_TERRACOTTA), Blocks.PINK_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_pink_terracotta", has(Blocks.PINK_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.PURPLE_TERRACOTTA), Blocks.PURPLE_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_purple_terracotta", has(Blocks.PURPLE_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.RED_TERRACOTTA), Blocks.RED_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_red_terracotta", has(Blocks.RED_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.WHITE_TERRACOTTA), Blocks.WHITE_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_white_terracotta", has(Blocks.WHITE_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.YELLOW_TERRACOTTA), Blocks.YELLOW_GLAZED_TERRACOTTA.asItem(), 0.1f, 200).unlockedBy("has_yellow_terracotta", has(Blocks.YELLOW_TERRACOTTA)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.ANCIENT_DEBRIS), Items.NETHERITE_SCRAP, 2.0f, 200).unlockedBy("has_ancient_debris", has(Blocks.ANCIENT_DEBRIS)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.POLISHED_BLACKSTONE_BRICKS), Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.asItem(), 0.1f, 200).unlockedBy("has_blackstone_bricks", has(Blocks.POLISHED_BLACKSTONE_BRICKS)).save(consumer);
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(Blocks.NETHER_BRICKS), Blocks.CRACKED_NETHER_BRICKS.asItem(), 0.1f, 200).unlockedBy("has_nether_bricks", has(Blocks.NETHER_BRICKS)).save(consumer);
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.IRON_ORE.asItem()), Items.IRON_INGOT, 0.7f, 100).unlockedBy("has_iron_ore", has(Blocks.IRON_ORE.asItem())).save(consumer, "iron_ingot_from_blasting");
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(ItemTags.GOLD_ORES), Items.GOLD_INGOT, 1.0f, 100).unlockedBy("has_gold_ore", has(ItemTags.GOLD_ORES)).save(consumer, "gold_ingot_from_blasting");
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.DIAMOND_ORE.asItem()), Items.DIAMOND, 1.0f, 100).unlockedBy("has_diamond_ore", has(Blocks.DIAMOND_ORE)).save(consumer, "diamond_from_blasting");
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.LAPIS_ORE.asItem()), Items.LAPIS_LAZULI, 0.2f, 100).unlockedBy("has_lapis_ore", has(Blocks.LAPIS_ORE)).save(consumer, "lapis_from_blasting");
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.REDSTONE_ORE), Items.REDSTONE, 0.7f, 100).unlockedBy("has_redstone_ore", has(Blocks.REDSTONE_ORE)).save(consumer, "redstone_from_blasting");
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.COAL_ORE.asItem()), Items.COAL, 0.1f, 100).unlockedBy("has_coal_ore", has(Blocks.COAL_ORE)).save(consumer, "coal_from_blasting");
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.EMERALD_ORE.asItem()), Items.EMERALD, 1.0f, 100).unlockedBy("has_emerald_ore", has(Blocks.EMERALD_ORE)).save(consumer, "emerald_from_blasting");
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.NETHER_QUARTZ_ORE), Items.QUARTZ, 0.2f, 100).unlockedBy("has_nether_quartz_ore", has(Blocks.NETHER_QUARTZ_ORE)).save(consumer, "quartz_from_blasting");
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Items.GOLDEN_PICKAXE, Items.GOLDEN_SHOVEL, Items.GOLDEN_AXE, Items.GOLDEN_HOE, Items.GOLDEN_SWORD, Items.GOLDEN_HELMET, Items.GOLDEN_CHESTPLATE, Items.GOLDEN_LEGGINGS, Items.GOLDEN_BOOTS, Items.GOLDEN_HORSE_ARMOR), Items.GOLD_NUGGET, 0.1f, 100).unlockedBy("has_golden_pickaxe", has(Items.GOLDEN_PICKAXE)).unlockedBy("has_golden_shovel", has(Items.GOLDEN_SHOVEL)).unlockedBy("has_golden_axe", has(Items.GOLDEN_AXE)).unlockedBy("has_golden_hoe", has(Items.GOLDEN_HOE)).unlockedBy("has_golden_sword", has(Items.GOLDEN_SWORD)).unlockedBy("has_golden_helmet", has(Items.GOLDEN_HELMET)).unlockedBy("has_golden_chestplate", has(Items.GOLDEN_CHESTPLATE)).unlockedBy("has_golden_leggings", has(Items.GOLDEN_LEGGINGS)).unlockedBy("has_golden_boots", has(Items.GOLDEN_BOOTS)).unlockedBy("has_golden_horse_armor", has(Items.GOLDEN_HORSE_ARMOR)).save(consumer, "gold_nugget_from_blasting");
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Items.IRON_PICKAXE, Items.IRON_SHOVEL, Items.IRON_AXE, Items.IRON_HOE, Items.IRON_SWORD, Items.IRON_HELMET, Items.IRON_CHESTPLATE, Items.IRON_LEGGINGS, Items.IRON_BOOTS, Items.IRON_HORSE_ARMOR, Items.CHAINMAIL_HELMET, Items.CHAINMAIL_CHESTPLATE, Items.CHAINMAIL_LEGGINGS, Items.CHAINMAIL_BOOTS), Items.IRON_NUGGET, 0.1f, 100).unlockedBy("has_iron_pickaxe", has(Items.IRON_PICKAXE)).unlockedBy("has_iron_shovel", has(Items.IRON_SHOVEL)).unlockedBy("has_iron_axe", has(Items.IRON_AXE)).unlockedBy("has_iron_hoe", has(Items.IRON_HOE)).unlockedBy("has_iron_sword", has(Items.IRON_SWORD)).unlockedBy("has_iron_helmet", has(Items.IRON_HELMET)).unlockedBy("has_iron_chestplate", has(Items.IRON_CHESTPLATE)).unlockedBy("has_iron_leggings", has(Items.IRON_LEGGINGS)).unlockedBy("has_iron_boots", has(Items.IRON_BOOTS)).unlockedBy("has_iron_horse_armor", has(Items.IRON_HORSE_ARMOR)).unlockedBy("has_chainmail_helmet", has(Items.CHAINMAIL_HELMET)).unlockedBy("has_chainmail_chestplate", has(Items.CHAINMAIL_CHESTPLATE)).unlockedBy("has_chainmail_leggings", has(Items.CHAINMAIL_LEGGINGS)).unlockedBy("has_chainmail_boots", has(Items.CHAINMAIL_BOOTS)).save(consumer, "iron_nugget_from_blasting");
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(Blocks.ANCIENT_DEBRIS), Items.NETHERITE_SCRAP, 2.0f, 100).unlockedBy("has_ancient_debris", has(Blocks.ANCIENT_DEBRIS)).save(consumer, "netherite_scrap_from_blasting");
+        cookRecipes(consumer, "smoking", RecipeSerializer.SMOKING_RECIPE, 100);
+        cookRecipes(consumer, "campfire_cooking", RecipeSerializer.CAMPFIRE_COOKING_RECIPE, 600);
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_SLAB, 2).unlocks("has_stone", has(Blocks.STONE)).save(consumer, "stone_slab_from_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_STAIRS).unlocks("has_stone", has(Blocks.STONE)).save(consumer, "stone_stairs_from_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_BRICKS).unlocks("has_stone", has(Blocks.STONE)).save(consumer, "stone_bricks_from_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_BRICK_SLAB, 2).unlocks("has_stone", has(Blocks.STONE)).save(consumer, "stone_brick_slab_from_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_BRICK_STAIRS).unlocks("has_stone", has(Blocks.STONE)).save(consumer, "stone_brick_stairs_from_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.CHISELED_STONE_BRICKS).unlocks("has_stone", has(Blocks.STONE)).save(consumer, "chiseled_stone_bricks_stone_from_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE), Blocks.STONE_BRICK_WALL).unlocks("has_stone", has(Blocks.STONE)).save(consumer, "stone_brick_walls_from_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.CUT_SANDSTONE).unlocks("has_sandstone", has(Blocks.SANDSTONE)).save(consumer, "cut_sandstone_from_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.SANDSTONE_SLAB, 2).unlocks("has_sandstone", has(Blocks.SANDSTONE)).save(consumer, "sandstone_slab_from_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.CUT_SANDSTONE_SLAB, 2).unlocks("has_sandstone", has(Blocks.SANDSTONE)).save(consumer, "cut_sandstone_slab_from_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.CUT_SANDSTONE), Blocks.CUT_SANDSTONE_SLAB, 2).unlocks("has_cut_sandstone", has(Blocks.SANDSTONE)).save(consumer, "cut_sandstone_slab_from_cut_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.SANDSTONE_STAIRS).unlocks("has_sandstone", has(Blocks.SANDSTONE)).save(consumer, "sandstone_stairs_from_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.SANDSTONE_WALL).unlocks("has_sandstone", has(Blocks.SANDSTONE)).save(consumer, "sandstone_wall_from_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SANDSTONE), Blocks.CHISELED_SANDSTONE).unlocks("has_sandstone", has(Blocks.SANDSTONE)).save(consumer, "chiseled_sandstone_from_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.CUT_RED_SANDSTONE).unlocks("has_red_sandstone", has(Blocks.RED_SANDSTONE)).save(consumer, "cut_red_sandstone_from_red_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.RED_SANDSTONE_SLAB, 2).unlocks("has_red_sandstone", has(Blocks.RED_SANDSTONE)).save(consumer, "red_sandstone_slab_from_red_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.CUT_RED_SANDSTONE_SLAB, 2).unlocks("has_red_sandstone", has(Blocks.RED_SANDSTONE)).save(consumer, "cut_red_sandstone_slab_from_red_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.CUT_RED_SANDSTONE), Blocks.CUT_RED_SANDSTONE_SLAB, 2).unlocks("has_cut_red_sandstone", has(Blocks.RED_SANDSTONE)).save(consumer, "cut_red_sandstone_slab_from_cut_red_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.RED_SANDSTONE_STAIRS).unlocks("has_red_sandstone", has(Blocks.RED_SANDSTONE)).save(consumer, "red_sandstone_stairs_from_red_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.RED_SANDSTONE_WALL).unlocks("has_red_sandstone", has(Blocks.RED_SANDSTONE)).save(consumer, "red_sandstone_wall_from_red_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_SANDSTONE), Blocks.CHISELED_RED_SANDSTONE).unlocks("has_red_sandstone", has(Blocks.RED_SANDSTONE)).save(consumer, "chiseled_red_sandstone_from_red_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.QUARTZ_SLAB, 2).unlocks("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).save(consumer, "quartz_slab_from_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.QUARTZ_STAIRS).unlocks("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).save(consumer, "quartz_stairs_from_quartz_block_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.QUARTZ_PILLAR).unlocks("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).save(consumer, "quartz_pillar_from_quartz_block_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.CHISELED_QUARTZ_BLOCK).unlocks("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).save(consumer, "chiseled_quartz_block_from_quartz_block_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.QUARTZ_BLOCK), Blocks.QUARTZ_BRICKS).unlocks("has_quartz_block", has(Blocks.QUARTZ_BLOCK)).save(consumer, "quartz_bricks_from_quartz_block_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.COBBLESTONE), Blocks.COBBLESTONE_STAIRS).unlocks("has_cobblestone", has(Blocks.COBBLESTONE)).save(consumer, "cobblestone_stairs_from_cobblestone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.COBBLESTONE), Blocks.COBBLESTONE_SLAB, 2).unlocks("has_cobblestone", has(Blocks.COBBLESTONE)).save(consumer, "cobblestone_slab_from_cobblestone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.COBBLESTONE), Blocks.COBBLESTONE_WALL).unlocks("has_cobblestone", has(Blocks.COBBLESTONE)).save(consumer, "cobblestone_wall_from_cobblestone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE_BRICKS), Blocks.STONE_BRICK_SLAB, 2).unlocks("has_stone_bricks", has(Blocks.STONE_BRICKS)).save(consumer, "stone_brick_slab_from_stone_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE_BRICKS), Blocks.STONE_BRICK_STAIRS).unlocks("has_stone_bricks", has(Blocks.STONE_BRICKS)).save(consumer, "stone_brick_stairs_from_stone_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE_BRICKS), Blocks.STONE_BRICK_WALL).unlocks("has_stone_bricks", has(Blocks.STONE_BRICKS)).save(consumer, "stone_brick_wall_from_stone_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.STONE_BRICKS), Blocks.CHISELED_STONE_BRICKS).unlocks("has_stone_bricks", has(Blocks.STONE_BRICKS)).save(consumer, "chiseled_stone_bricks_from_stone_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BRICKS), Blocks.BRICK_SLAB, 2).unlocks("has_bricks", has(Blocks.BRICKS)).save(consumer, "brick_slab_from_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BRICKS), Blocks.BRICK_STAIRS).unlocks("has_bricks", has(Blocks.BRICKS)).save(consumer, "brick_stairs_from_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BRICKS), Blocks.BRICK_WALL).unlocks("has_bricks", has(Blocks.BRICKS)).save(consumer, "brick_wall_from_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.NETHER_BRICKS), Blocks.NETHER_BRICK_SLAB, 2).unlocks("has_nether_bricks", has(Blocks.NETHER_BRICKS)).save(consumer, "nether_brick_slab_from_nether_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.NETHER_BRICKS), Blocks.NETHER_BRICK_STAIRS).unlocks("has_nether_bricks", has(Blocks.NETHER_BRICKS)).save(consumer, "nether_brick_stairs_from_nether_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.NETHER_BRICKS), Blocks.NETHER_BRICK_WALL).unlocks("has_nether_bricks", has(Blocks.NETHER_BRICKS)).save(consumer, "nether_brick_wall_from_nether_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.NETHER_BRICKS), Blocks.CHISELED_NETHER_BRICKS).unlocks("has_nether_bricks", has(Blocks.NETHER_BRICKS)).save(consumer, "chiseled_nether_bricks_from_nether_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_NETHER_BRICKS), Blocks.RED_NETHER_BRICK_SLAB, 2).unlocks("has_nether_bricks", has(Blocks.RED_NETHER_BRICKS)).save(consumer, "red_nether_brick_slab_from_red_nether_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_NETHER_BRICKS), Blocks.RED_NETHER_BRICK_STAIRS).unlocks("has_nether_bricks", has(Blocks.RED_NETHER_BRICKS)).save(consumer, "red_nether_brick_stairs_from_red_nether_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.RED_NETHER_BRICKS), Blocks.RED_NETHER_BRICK_WALL).unlocks("has_nether_bricks", has(Blocks.RED_NETHER_BRICKS)).save(consumer, "red_nether_brick_wall_from_red_nether_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PURPUR_BLOCK), Blocks.PURPUR_SLAB, 2).unlocks("has_purpur_block", has(Blocks.PURPUR_BLOCK)).save(consumer, "purpur_slab_from_purpur_block_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PURPUR_BLOCK), Blocks.PURPUR_STAIRS).unlocks("has_purpur_block", has(Blocks.PURPUR_BLOCK)).save(consumer, "purpur_stairs_from_purpur_block_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PURPUR_BLOCK), Blocks.PURPUR_PILLAR).unlocks("has_purpur_block", has(Blocks.PURPUR_BLOCK)).save(consumer, "purpur_pillar_from_purpur_block_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PRISMARINE), Blocks.PRISMARINE_SLAB, 2).unlocks("has_prismarine", has(Blocks.PRISMARINE)).save(consumer, "prismarine_slab_from_prismarine_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PRISMARINE), Blocks.PRISMARINE_STAIRS).unlocks("has_prismarine", has(Blocks.PRISMARINE)).save(consumer, "prismarine_stairs_from_prismarine_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PRISMARINE), Blocks.PRISMARINE_WALL).unlocks("has_prismarine", has(Blocks.PRISMARINE)).save(consumer, "prismarine_wall_from_prismarine_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PRISMARINE_BRICKS), Blocks.PRISMARINE_BRICK_SLAB, 2).unlocks("has_prismarine_brick", has(Blocks.PRISMARINE_BRICKS)).save(consumer, "prismarine_brick_slab_from_prismarine_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.PRISMARINE_BRICKS), Blocks.PRISMARINE_BRICK_STAIRS).unlocks("has_prismarine_brick", has(Blocks.PRISMARINE_BRICKS)).save(consumer, "prismarine_brick_stairs_from_prismarine_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DARK_PRISMARINE), Blocks.DARK_PRISMARINE_SLAB, 2).unlocks("has_dark_prismarine", has(Blocks.DARK_PRISMARINE)).save(consumer, "dark_prismarine_slab_from_dark_prismarine_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DARK_PRISMARINE), Blocks.DARK_PRISMARINE_STAIRS).unlocks("has_dark_prismarine", has(Blocks.DARK_PRISMARINE)).save(consumer, "dark_prismarine_stairs_from_dark_prismarine_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.ANDESITE_SLAB, 2).unlocks("has_andesite", has(Blocks.ANDESITE)).save(consumer, "andesite_slab_from_andesite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.ANDESITE_STAIRS).unlocks("has_andesite", has(Blocks.ANDESITE)).save(consumer, "andesite_stairs_from_andesite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.ANDESITE_WALL).unlocks("has_andesite", has(Blocks.ANDESITE)).save(consumer, "andesite_wall_from_andesite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.POLISHED_ANDESITE).unlocks("has_andesite", has(Blocks.ANDESITE)).save(consumer, "polished_andesite_from_andesite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.POLISHED_ANDESITE_SLAB, 2).unlocks("has_andesite", has(Blocks.ANDESITE)).save(consumer, "polished_andesite_slab_from_andesite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.ANDESITE), Blocks.POLISHED_ANDESITE_STAIRS).unlocks("has_andesite", has(Blocks.ANDESITE)).save(consumer, "polished_andesite_stairs_from_andesite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_ANDESITE), Blocks.POLISHED_ANDESITE_SLAB, 2).unlocks("has_polished_andesite", has(Blocks.POLISHED_ANDESITE)).save(consumer, "polished_andesite_slab_from_polished_andesite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_ANDESITE), Blocks.POLISHED_ANDESITE_STAIRS).unlocks("has_polished_andesite", has(Blocks.POLISHED_ANDESITE)).save(consumer, "polished_andesite_stairs_from_polished_andesite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BASALT), Blocks.POLISHED_BASALT).unlocks("has_basalt", has(Blocks.BASALT)).save(consumer, "polished_basalt_from_basalt_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.GRANITE_SLAB, 2).unlocks("has_granite", has(Blocks.GRANITE)).save(consumer, "granite_slab_from_granite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.GRANITE_STAIRS).unlocks("has_granite", has(Blocks.GRANITE)).save(consumer, "granite_stairs_from_granite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.GRANITE_WALL).unlocks("has_granite", has(Blocks.GRANITE)).save(consumer, "granite_wall_from_granite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.POLISHED_GRANITE).unlocks("has_granite", has(Blocks.GRANITE)).save(consumer, "polished_granite_from_granite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.POLISHED_GRANITE_SLAB, 2).unlocks("has_granite", has(Blocks.GRANITE)).save(consumer, "polished_granite_slab_from_granite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.GRANITE), Blocks.POLISHED_GRANITE_STAIRS).unlocks("has_granite", has(Blocks.GRANITE)).save(consumer, "polished_granite_stairs_from_granite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_GRANITE), Blocks.POLISHED_GRANITE_SLAB, 2).unlocks("has_polished_granite", has(Blocks.POLISHED_GRANITE)).save(consumer, "polished_granite_slab_from_polished_granite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_GRANITE), Blocks.POLISHED_GRANITE_STAIRS).unlocks("has_polished_granite", has(Blocks.POLISHED_GRANITE)).save(consumer, "polished_granite_stairs_from_polished_granite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.DIORITE_SLAB, 2).unlocks("has_diorite", has(Blocks.DIORITE)).save(consumer, "diorite_slab_from_diorite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.DIORITE_STAIRS).unlocks("has_diorite", has(Blocks.DIORITE)).save(consumer, "diorite_stairs_from_diorite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.DIORITE_WALL).unlocks("has_diorite", has(Blocks.DIORITE)).save(consumer, "diorite_wall_from_diorite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.POLISHED_DIORITE).unlocks("has_diorite", has(Blocks.DIORITE)).save(consumer, "polished_diorite_from_diorite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.POLISHED_DIORITE_SLAB, 2).unlocks("has_diorite", has(Blocks.POLISHED_DIORITE)).save(consumer, "polished_diorite_slab_from_diorite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.DIORITE), Blocks.POLISHED_DIORITE_STAIRS).unlocks("has_diorite", has(Blocks.POLISHED_DIORITE)).save(consumer, "polished_diorite_stairs_from_diorite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_DIORITE), Blocks.POLISHED_DIORITE_SLAB, 2).unlocks("has_polished_diorite", has(Blocks.POLISHED_DIORITE)).save(consumer, "polished_diorite_slab_from_polished_diorite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_DIORITE), Blocks.POLISHED_DIORITE_STAIRS).unlocks("has_polished_diorite", has(Blocks.POLISHED_DIORITE)).save(consumer, "polished_diorite_stairs_from_polished_diorite_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_STONE_BRICKS), Blocks.MOSSY_STONE_BRICK_SLAB, 2).unlocks("has_mossy_stone_bricks", has(Blocks.MOSSY_STONE_BRICKS)).save(consumer, "mossy_stone_brick_slab_from_mossy_stone_brick_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_STONE_BRICKS), Blocks.MOSSY_STONE_BRICK_STAIRS).unlocks("has_mossy_stone_bricks", has(Blocks.MOSSY_STONE_BRICKS)).save(consumer, "mossy_stone_brick_stairs_from_mossy_stone_brick_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_STONE_BRICKS), Blocks.MOSSY_STONE_BRICK_WALL).unlocks("has_mossy_stone_bricks", has(Blocks.MOSSY_STONE_BRICKS)).save(consumer, "mossy_stone_brick_wall_from_mossy_stone_brick_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_COBBLESTONE), Blocks.MOSSY_COBBLESTONE_SLAB, 2).unlocks("has_mossy_cobblestone", has(Blocks.MOSSY_COBBLESTONE)).save(consumer, "mossy_cobblestone_slab_from_mossy_cobblestone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_COBBLESTONE), Blocks.MOSSY_COBBLESTONE_STAIRS).unlocks("has_mossy_cobblestone", has(Blocks.MOSSY_COBBLESTONE)).save(consumer, "mossy_cobblestone_stairs_from_mossy_cobblestone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.MOSSY_COBBLESTONE), Blocks.MOSSY_COBBLESTONE_WALL).unlocks("has_mossy_cobblestone", has(Blocks.MOSSY_COBBLESTONE)).save(consumer, "mossy_cobblestone_wall_from_mossy_cobblestone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_SANDSTONE), Blocks.SMOOTH_SANDSTONE_SLAB, 2).unlocks("has_smooth_sandstone", has(Blocks.SMOOTH_SANDSTONE)).save(consumer, "smooth_sandstone_slab_from_smooth_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_SANDSTONE), Blocks.SMOOTH_SANDSTONE_STAIRS).unlocks("has_mossy_cobblestone", has(Blocks.SMOOTH_SANDSTONE)).save(consumer, "smooth_sandstone_stairs_from_smooth_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_RED_SANDSTONE), Blocks.SMOOTH_RED_SANDSTONE_SLAB, 2).unlocks("has_smooth_red_sandstone", has(Blocks.SMOOTH_RED_SANDSTONE)).save(consumer, "smooth_red_sandstone_slab_from_smooth_red_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_RED_SANDSTONE), Blocks.SMOOTH_RED_SANDSTONE_STAIRS).unlocks("has_smooth_red_sandstone", has(Blocks.SMOOTH_RED_SANDSTONE)).save(consumer, "smooth_red_sandstone_stairs_from_smooth_red_sandstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_QUARTZ), Blocks.SMOOTH_QUARTZ_SLAB, 2).unlocks("has_smooth_quartz", has(Blocks.SMOOTH_QUARTZ)).save(consumer, "smooth_quartz_slab_from_smooth_quartz_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_QUARTZ), Blocks.SMOOTH_QUARTZ_STAIRS).unlocks("has_smooth_quartz", has(Blocks.SMOOTH_QUARTZ)).save(consumer, "smooth_quartz_stairs_from_smooth_quartz_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE_BRICKS), Blocks.END_STONE_BRICK_SLAB, 2).unlocks("has_end_stone_brick", has(Blocks.END_STONE_BRICKS)).save(consumer, "end_stone_brick_slab_from_end_stone_brick_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE_BRICKS), Blocks.END_STONE_BRICK_STAIRS).unlocks("has_end_stone_brick", has(Blocks.END_STONE_BRICKS)).save(consumer, "end_stone_brick_stairs_from_end_stone_brick_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE_BRICKS), Blocks.END_STONE_BRICK_WALL).unlocks("has_end_stone_brick", has(Blocks.END_STONE_BRICKS)).save(consumer, "end_stone_brick_wall_from_end_stone_brick_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE), Blocks.END_STONE_BRICKS).unlocks("has_end_stone", has(Blocks.END_STONE)).save(consumer, "end_stone_bricks_from_end_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE), Blocks.END_STONE_BRICK_SLAB, 2).unlocks("has_end_stone", has(Blocks.END_STONE)).save(consumer, "end_stone_brick_slab_from_end_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE), Blocks.END_STONE_BRICK_STAIRS).unlocks("has_end_stone", has(Blocks.END_STONE)).save(consumer, "end_stone_brick_stairs_from_end_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.END_STONE), Blocks.END_STONE_BRICK_WALL).unlocks("has_end_stone", has(Blocks.END_STONE)).save(consumer, "end_stone_brick_wall_from_end_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.SMOOTH_STONE), Blocks.SMOOTH_STONE_SLAB, 2).unlocks("has_smooth_stone", has(Blocks.SMOOTH_STONE)).save(consumer, "smooth_stone_slab_from_smooth_stone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.BLACKSTONE_SLAB, 2).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "blackstone_slab_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.BLACKSTONE_STAIRS).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "blackstone_stairs_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.BLACKSTONE_WALL).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "blackstone_wall_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.POLISHED_BLACKSTONE).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "polished_blackstone_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.POLISHED_BLACKSTONE_WALL).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "polished_blackstone_wall_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.POLISHED_BLACKSTONE_SLAB, 2).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "polished_blackstone_slab_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.POLISHED_BLACKSTONE_STAIRS).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "polished_blackstone_stairs_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.CHISELED_POLISHED_BLACKSTONE).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "chiseled_polished_blackstone_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.POLISHED_BLACKSTONE_BRICKS).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "polished_blackstone_bricks_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.POLISHED_BLACKSTONE_BRICK_SLAB, 2).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "polished_blackstone_brick_slab_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.POLISHED_BLACKSTONE_BRICK_STAIRS).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "polished_blackstone_brick_stairs_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.BLACKSTONE), Blocks.POLISHED_BLACKSTONE_BRICK_WALL).unlocks("has_blackstone", has(Blocks.BLACKSTONE)).save(consumer, "polished_blackstone_brick_wall_from_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE), Blocks.POLISHED_BLACKSTONE_SLAB, 2).unlocks("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer, "polished_blackstone_slab_from_polished_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE), Blocks.POLISHED_BLACKSTONE_STAIRS).unlocks("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer, "polished_blackstone_stairs_from_polished_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE), Blocks.POLISHED_BLACKSTONE_BRICKS).unlocks("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer, "polished_blackstone_bricks_from_polished_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE), Blocks.POLISHED_BLACKSTONE_WALL).unlocks("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer, "polished_blackstone_wall_from_polished_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE), Blocks.POLISHED_BLACKSTONE_BRICK_SLAB, 2).unlocks("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer, "polished_blackstone_brick_slab_from_polished_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE), Blocks.POLISHED_BLACKSTONE_BRICK_STAIRS).unlocks("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer, "polished_blackstone_brick_stairs_from_polished_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE), Blocks.POLISHED_BLACKSTONE_BRICK_WALL).unlocks("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer, "polished_blackstone_brick_wall_from_polished_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE), Blocks.CHISELED_POLISHED_BLACKSTONE).unlocks("has_polished_blackstone", has(Blocks.POLISHED_BLACKSTONE)).save(consumer, "chiseled_polished_blackstone_from_polished_blackstone_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE_BRICKS), Blocks.POLISHED_BLACKSTONE_BRICK_SLAB, 2).unlocks("has_polished_blackstone_bricks", has(Blocks.POLISHED_BLACKSTONE_BRICKS)).save(consumer, "polished_blackstone_brick_slab_from_polished_blackstone_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE_BRICKS), Blocks.POLISHED_BLACKSTONE_BRICK_STAIRS).unlocks("has_polished_blackstone_bricks", has(Blocks.POLISHED_BLACKSTONE_BRICKS)).save(consumer, "polished_blackstone_brick_stairs_from_polished_blackstone_bricks_stonecutting");
+        SingleItemRecipeBuilder.stonecutting(Ingredient.of(Blocks.POLISHED_BLACKSTONE_BRICKS), Blocks.POLISHED_BLACKSTONE_BRICK_WALL).unlocks("has_polished_blackstone_bricks", has(Blocks.POLISHED_BLACKSTONE_BRICKS)).save(consumer, "polished_blackstone_brick_wall_from_polished_blackstone_bricks_stonecutting");
+        netheriteSmithing(consumer, Items.DIAMOND_CHESTPLATE, Items.NETHERITE_CHESTPLATE);
+        netheriteSmithing(consumer, Items.DIAMOND_LEGGINGS, Items.NETHERITE_LEGGINGS);
+        netheriteSmithing(consumer, Items.DIAMOND_HELMET, Items.NETHERITE_HELMET);
+        netheriteSmithing(consumer, Items.DIAMOND_BOOTS, Items.NETHERITE_BOOTS);
+        netheriteSmithing(consumer, Items.DIAMOND_SWORD, Items.NETHERITE_SWORD);
+        netheriteSmithing(consumer, Items.DIAMOND_AXE, Items.NETHERITE_AXE);
+        netheriteSmithing(consumer, Items.DIAMOND_PICKAXE, Items.NETHERITE_PICKAXE);
+        netheriteSmithing(consumer, Items.DIAMOND_HOE, Items.NETHERITE_HOE);
+        netheriteSmithing(consumer, Items.DIAMOND_SHOVEL, Items.NETHERITE_SHOVEL);
     }
     
-    private void cookRecipes(final Consumer<FinishedRecipe> consumer, final String string, final SimpleCookingSerializer<?> bhf, final int integer) {
-        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.BEEF), Items.COOKED_BEEF, 0.35f, integer, bhf).unlocks("has_beef", this.has(Items.BEEF)).save(consumer, "cooked_beef_from_" + string);
-        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.CHICKEN), Items.COOKED_CHICKEN, 0.35f, integer, bhf).unlocks("has_chicken", this.has(Items.CHICKEN)).save(consumer, "cooked_chicken_from_" + string);
-        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.COD), Items.COOKED_COD, 0.35f, integer, bhf).unlocks("has_cod", this.has(Items.COD)).save(consumer, "cooked_cod_from_" + string);
-        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Blocks.KELP), Items.DRIED_KELP, 0.1f, integer, bhf).unlocks("has_kelp", this.has(Blocks.KELP)).save(consumer, "dried_kelp_from_" + string);
-        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.SALMON), Items.COOKED_SALMON, 0.35f, integer, bhf).unlocks("has_salmon", this.has(Items.SALMON)).save(consumer, "cooked_salmon_from_" + string);
-        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.MUTTON), Items.COOKED_MUTTON, 0.35f, integer, bhf).unlocks("has_mutton", this.has(Items.MUTTON)).save(consumer, "cooked_mutton_from_" + string);
-        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.PORKCHOP), Items.COOKED_PORKCHOP, 0.35f, integer, bhf).unlocks("has_porkchop", this.has(Items.PORKCHOP)).save(consumer, "cooked_porkchop_from_" + string);
-        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.POTATO), Items.BAKED_POTATO, 0.35f, integer, bhf).unlocks("has_potato", this.has(Items.POTATO)).save(consumer, "baked_potato_from_" + string);
-        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.RABBIT), Items.COOKED_RABBIT, 0.35f, integer, bhf).unlocks("has_rabbit", this.has(Items.RABBIT)).save(consumer, "cooked_rabbit_from_" + string);
+    private static void netheriteSmithing(final Consumer<FinishedRecipe> consumer, final Item bke2, final Item bke3) {
+        UpgradeRecipeBuilder.smithing(Ingredient.of(bke2), Ingredient.of(Items.NETHERITE_INGOT), bke3).unlocks("has_netherite_ingot", has(Items.NETHERITE_INGOT)).save(consumer, Registry.ITEM.getKey(bke3.asItem()).getPath() + "_smithing");
     }
     
-    private EnterBlockTrigger.TriggerInstance insideOf(final Block bph) {
-        return new EnterBlockTrigger.TriggerInstance(bph, StatePropertiesPredicate.ANY);
+    private static void planksFromLog(final Consumer<FinishedRecipe> consumer, final ItemLike bqa, final Tag<Item> adf) {
+        ShapelessRecipeBuilder.shapeless(bqa, 4).requires(adf).group("planks").unlockedBy("has_log", has(adf)).save(consumer);
     }
     
-    private InventoryChangeTrigger.TriggerInstance has(final ItemLike bjv) {
-        return this.inventoryTrigger(ItemPredicate.Builder.item().of(bjv).build());
+    private static void planksFromLogs(final Consumer<FinishedRecipe> consumer, final ItemLike bqa, final Tag<Item> adf) {
+        ShapelessRecipeBuilder.shapeless(bqa, 4).requires(adf).group("planks").unlockedBy("has_logs", has(adf)).save(consumer);
     }
     
-    private InventoryChangeTrigger.TriggerInstance has(final Tag<Item> aaz) {
-        return this.inventoryTrigger(ItemPredicate.Builder.item().of(aaz).build());
+    private static void woodFromLogs(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2, 3).define('#', bqa3).pattern("##").pattern("##").group("bark").unlockedBy("has_log", has(bqa3)).save(consumer);
     }
     
-    private InventoryChangeTrigger.TriggerInstance inventoryTrigger(final ItemPredicate... arr) {
-        return new InventoryChangeTrigger.TriggerInstance(MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, arr);
+    private static void woodenBoat(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2).define('#', bqa3).pattern("# #").pattern("###").group("boat").unlockedBy("in_water", insideOf(Blocks.WATER)).save(consumer);
+    }
+    
+    private static void woodenButton(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapelessRecipeBuilder.shapeless(bqa2).requires(bqa3).group("wooden_button").unlockedBy("has_planks", has(bqa3)).save(consumer);
+    }
+    
+    private static void woodenDoor(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2, 3).define('#', bqa3).pattern("##").pattern("##").pattern("##").group("wooden_door").unlockedBy("has_planks", has(bqa3)).save(consumer);
+    }
+    
+    private static void woodenFence(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2, 3).define('#', Items.STICK).define('W', bqa3).pattern("W#W").pattern("W#W").group("wooden_fence").unlockedBy("has_planks", has(bqa3)).save(consumer);
+    }
+    
+    private static void woodenFenceGate(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2).define('#', Items.STICK).define('W', bqa3).pattern("#W#").pattern("#W#").group("wooden_fence_gate").unlockedBy("has_planks", has(bqa3)).save(consumer);
+    }
+    
+    private static void woodenPressurePlate(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2).define('#', bqa3).pattern("##").group("wooden_pressure_plate").unlockedBy("has_planks", has(bqa3)).save(consumer);
+    }
+    
+    private static void woodenSlab(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2, 6).define('#', bqa3).pattern("###").group("wooden_slab").unlockedBy("has_planks", has(bqa3)).save(consumer);
+    }
+    
+    private static void woodenStairs(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2, 4).define('#', bqa3).pattern("#  ").pattern("## ").pattern("###").group("wooden_stairs").unlockedBy("has_planks", has(bqa3)).save(consumer);
+    }
+    
+    private static void woodenTrapdoor(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2, 2).define('#', bqa3).pattern("###").pattern("###").group("wooden_trapdoor").unlockedBy("has_planks", has(bqa3)).save(consumer);
+    }
+    
+    private static void woodenSign(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        final String string4 = Registry.ITEM.getKey(bqa3.asItem()).getPath();
+        ShapedRecipeBuilder.shaped(bqa2, 3).group("sign").define('#', bqa3).define('X', Items.STICK).pattern("###").pattern("###").pattern(" X ").unlockedBy("has_" + string4, has(bqa3)).save(consumer);
+    }
+    
+    private static void coloredWoolFromWhiteWoolAndDye(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapelessRecipeBuilder.shapeless(bqa2).requires(bqa3).requires(Blocks.WHITE_WOOL).group("wool").unlockedBy("has_white_wool", has(Blocks.WHITE_WOOL)).save(consumer);
+    }
+    
+    private static void carpetFromWool(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        final String string4 = Registry.ITEM.getKey(bqa3.asItem()).getPath();
+        ShapedRecipeBuilder.shaped(bqa2, 3).define('#', bqa3).pattern("##").group("carpet").unlockedBy("has_" + string4, has(bqa3)).save(consumer);
+    }
+    
+    private static void coloredCarpetFromWhiteCarpetAndDye(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        final String string4 = Registry.ITEM.getKey(bqa2.asItem()).getPath();
+        final String string5 = Registry.ITEM.getKey(bqa3.asItem()).getPath();
+        ShapedRecipeBuilder.shaped(bqa2, 8).define('#', Blocks.WHITE_CARPET).define('$', bqa3).pattern("###").pattern("#$#").pattern("###").group("carpet").unlockedBy("has_white_carpet", has(Blocks.WHITE_CARPET)).unlockedBy("has_" + string5, has(bqa3)).save(consumer, string4 + "_from_white_carpet");
+    }
+    
+    private static void bedFromPlanksAndWool(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        final String string4 = Registry.ITEM.getKey(bqa3.asItem()).getPath();
+        ShapedRecipeBuilder.shaped(bqa2).define('#', bqa3).define('X', ItemTags.PLANKS).pattern("###").pattern("XXX").group("bed").unlockedBy("has_" + string4, has(bqa3)).save(consumer);
+    }
+    
+    private static void bedFromWhiteBedAndDye(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        final String string4 = Registry.ITEM.getKey(bqa2.asItem()).getPath();
+        ShapelessRecipeBuilder.shapeless(bqa2).requires(Items.WHITE_BED).requires(bqa3).group("dyed_bed").unlockedBy("has_bed", has(Items.WHITE_BED)).save(consumer, string4 + "_from_white_bed");
+    }
+    
+    private static void banner(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        final String string4 = Registry.ITEM.getKey(bqa3.asItem()).getPath();
+        ShapedRecipeBuilder.shaped(bqa2).define('#', bqa3).define('|', Items.STICK).pattern("###").pattern("###").pattern(" | ").group("banner").unlockedBy("has_" + string4, has(bqa3)).save(consumer);
+    }
+    
+    private static void stainedGlassFromGlassAndDye(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2, 8).define('#', Blocks.GLASS).define('X', bqa3).pattern("###").pattern("#X#").pattern("###").group("stained_glass").unlockedBy("has_glass", has(Blocks.GLASS)).save(consumer);
+    }
+    
+    private static void stainedGlassPaneFromStainedGlass(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2, 16).define('#', bqa3).pattern("###").pattern("###").group("stained_glass_pane").unlockedBy("has_glass", has(bqa3)).save(consumer);
+    }
+    
+    private static void stainedGlassPaneFromGlassPaneAndDye(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        final String string4 = Registry.ITEM.getKey(bqa2.asItem()).getPath();
+        final String string5 = Registry.ITEM.getKey(bqa3.asItem()).getPath();
+        ShapedRecipeBuilder.shaped(bqa2, 8).define('#', Blocks.GLASS_PANE).define('$', bqa3).pattern("###").pattern("#$#").pattern("###").group("stained_glass_pane").unlockedBy("has_glass_pane", has(Blocks.GLASS_PANE)).unlockedBy("has_" + string5, has(bqa3)).save(consumer, string4 + "_from_glass_pane");
+    }
+    
+    private static void coloredTerracottaFromTerracottaAndDye(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapedRecipeBuilder.shaped(bqa2, 8).define('#', Blocks.TERRACOTTA).define('X', bqa3).pattern("###").pattern("#X#").pattern("###").group("stained_terracotta").unlockedBy("has_terracotta", has(Blocks.TERRACOTTA)).save(consumer);
+    }
+    
+    private static void concretePowder(final Consumer<FinishedRecipe> consumer, final ItemLike bqa2, final ItemLike bqa3) {
+        ShapelessRecipeBuilder.shapeless(bqa2, 8).requires(bqa3).requires(Blocks.SAND, 4).requires(Blocks.GRAVEL, 4).group("concrete_powder").unlockedBy("has_sand", has(Blocks.SAND)).unlockedBy("has_gravel", has(Blocks.GRAVEL)).save(consumer);
+    }
+    
+    private static void cookRecipes(final Consumer<FinishedRecipe> consumer, final String string, final SimpleCookingSerializer<?> bnd, final int integer) {
+        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.BEEF), Items.COOKED_BEEF, 0.35f, integer, bnd).unlockedBy("has_beef", has(Items.BEEF)).save(consumer, "cooked_beef_from_" + string);
+        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.CHICKEN), Items.COOKED_CHICKEN, 0.35f, integer, bnd).unlockedBy("has_chicken", has(Items.CHICKEN)).save(consumer, "cooked_chicken_from_" + string);
+        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.COD), Items.COOKED_COD, 0.35f, integer, bnd).unlockedBy("has_cod", has(Items.COD)).save(consumer, "cooked_cod_from_" + string);
+        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Blocks.KELP), Items.DRIED_KELP, 0.1f, integer, bnd).unlockedBy("has_kelp", has(Blocks.KELP)).save(consumer, "dried_kelp_from_" + string);
+        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.SALMON), Items.COOKED_SALMON, 0.35f, integer, bnd).unlockedBy("has_salmon", has(Items.SALMON)).save(consumer, "cooked_salmon_from_" + string);
+        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.MUTTON), Items.COOKED_MUTTON, 0.35f, integer, bnd).unlockedBy("has_mutton", has(Items.MUTTON)).save(consumer, "cooked_mutton_from_" + string);
+        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.PORKCHOP), Items.COOKED_PORKCHOP, 0.35f, integer, bnd).unlockedBy("has_porkchop", has(Items.PORKCHOP)).save(consumer, "cooked_porkchop_from_" + string);
+        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.POTATO), Items.BAKED_POTATO, 0.35f, integer, bnd).unlockedBy("has_potato", has(Items.POTATO)).save(consumer, "baked_potato_from_" + string);
+        SimpleCookingRecipeBuilder.cooking(Ingredient.of(Items.RABBIT), Items.COOKED_RABBIT, 0.35f, integer, bnd).unlockedBy("has_rabbit", has(Items.RABBIT)).save(consumer, "cooked_rabbit_from_" + string);
+    }
+    
+    private static EnterBlockTrigger.TriggerInstance insideOf(final Block bvr) {
+        return new EnterBlockTrigger.TriggerInstance(EntityPredicate.Composite.ANY, bvr, StatePropertiesPredicate.ANY);
+    }
+    
+    private static InventoryChangeTrigger.TriggerInstance has(final ItemLike bqa) {
+        return inventoryTrigger(ItemPredicate.Builder.item().of(bqa).build());
+    }
+    
+    private static InventoryChangeTrigger.TriggerInstance has(final Tag<Item> adf) {
+        return inventoryTrigger(ItemPredicate.Builder.item().of(adf).build());
+    }
+    
+    private static InventoryChangeTrigger.TriggerInstance inventoryTrigger(final ItemPredicate... arr) {
+        return new InventoryChangeTrigger.TriggerInstance(EntityPredicate.Composite.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, arr);
     }
     
     @Override
diff --git a/src/net/minecraft/data/recipes/ShapedRecipeBuilder.java b/src/net/minecraft/data/recipes/ShapedRecipeBuilder.java
index 9643736..a5f86d2 100644
--- a/src/net/minecraft/data/recipes/ShapedRecipeBuilder.java
+++ b/src/net/minecraft/data/recipes/ShapedRecipeBuilder.java
@@ -36,38 +36,38 @@ public class ShapedRecipeBuilder {
     private final Advancement.Builder advancement;
     private String group;
     
-    public ShapedRecipeBuilder(final ItemLike bjv, final int integer) {
+    public ShapedRecipeBuilder(final ItemLike bqa, final int integer) {
         this.rows = Lists.newArrayList();
         this.key = Maps.newLinkedHashMap();
         this.advancement = Advancement.Builder.advancement();
-        this.result = bjv.asItem();
+        this.result = bqa.asItem();
         this.count = integer;
     }
     
-    public static ShapedRecipeBuilder shaped(final ItemLike bjv) {
-        return shaped(bjv, 1);
+    public static ShapedRecipeBuilder shaped(final ItemLike bqa) {
+        return shaped(bqa, 1);
     }
     
-    public static ShapedRecipeBuilder shaped(final ItemLike bjv, final int integer) {
-        return new ShapedRecipeBuilder(bjv, integer);
+    public static ShapedRecipeBuilder shaped(final ItemLike bqa, final int integer) {
+        return new ShapedRecipeBuilder(bqa, integer);
     }
     
-    public ShapedRecipeBuilder define(final Character character, final Tag<Item> aaz) {
-        return this.define(character, Ingredient.of(aaz));
+    public ShapedRecipeBuilder define(final Character character, final Tag<Item> adf) {
+        return this.define(character, Ingredient.of(adf));
     }
     
-    public ShapedRecipeBuilder define(final Character character, final ItemLike bjv) {
-        return this.define(character, Ingredient.of(bjv));
+    public ShapedRecipeBuilder define(final Character character, final ItemLike bqa) {
+        return this.define(character, Ingredient.of(bqa));
     }
     
-    public ShapedRecipeBuilder define(final Character character, final Ingredient bgt) {
+    public ShapedRecipeBuilder define(final Character character, final Ingredient bmr) {
         if (this.key.containsKey(character)) {
             throw new IllegalArgumentException("Symbol '" + character + "' is already defined!");
         }
         if (character == ' ') {
             throw new IllegalArgumentException("Symbol ' ' (whitespace) is reserved and cannot be defined");
         }
-        this.key.put(character, bgt);
+        this.key.put(character, bmr);
         return this;
     }
     
@@ -79,8 +79,8 @@ public class ShapedRecipeBuilder {
         return this;
     }
     
-    public ShapedRecipeBuilder unlocks(final String string, final CriterionTriggerInstance ac) {
-        this.advancement.addCriterion(string, ac);
+    public ShapedRecipeBuilder unlockedBy(final String string, final CriterionTriggerInstance ae) {
+        this.advancement.addCriterion(string, ae);
         return this;
     }
     
@@ -94,22 +94,22 @@ public class ShapedRecipeBuilder {
     }
     
     public void save(final Consumer<FinishedRecipe> consumer, final String string) {
-        final ResourceLocation sm4 = Registry.ITEM.getKey(this.result);
-        if (new ResourceLocation(string).equals(sm4)) {
+        final ResourceLocation uh4 = Registry.ITEM.getKey(this.result);
+        if (new ResourceLocation(string).equals(uh4)) {
             throw new IllegalStateException("Shaped Recipe " + string + " should remove its 'save' argument");
         }
         this.save(consumer, new ResourceLocation(string));
     }
     
-    public void save(final Consumer<FinishedRecipe> consumer, final ResourceLocation sm) {
-        this.ensureValid(sm);
-        this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", new RecipeUnlockedTrigger.TriggerInstance(sm)).rewards(AdvancementRewards.Builder.recipe(sm)).requirements(RequirementsStrategy.OR);
-        consumer.accept(new Result(sm, this.result, this.count, (this.group == null) ? "" : this.group, this.rows, this.key, this.advancement, new ResourceLocation(sm.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + sm.getPath())));
+    public void save(final Consumer<FinishedRecipe> consumer, final ResourceLocation uh) {
+        this.ensureValid(uh);
+        this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(uh)).rewards(AdvancementRewards.Builder.recipe(uh)).requirements(RequirementsStrategy.OR);
+        consumer.accept(new Result(uh, this.result, this.count, (this.group == null) ? "" : this.group, this.rows, this.key, this.advancement, new ResourceLocation(uh.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + uh.getPath())));
     }
     
-    private void ensureValid(final ResourceLocation sm) {
+    private void ensureValid(final ResourceLocation uh) {
         if (this.rows.isEmpty()) {
-            throw new IllegalStateException("No pattern is defined for shaped recipe " + sm + "!");
+            throw new IllegalStateException("No pattern is defined for shaped recipe " + uh + "!");
         }
         final Set<Character> set3 = Sets.newHashSet(this.key.keySet());
         set3.remove(' ');
@@ -117,19 +117,19 @@ public class ShapedRecipeBuilder {
             for (int integer6 = 0; integer6 < string5.length(); ++integer6) {
                 final char character7 = string5.charAt(integer6);
                 if (!this.key.containsKey(character7) && character7 != ' ') {
-                    throw new IllegalStateException("Pattern in recipe " + sm + " uses undefined symbol '" + character7 + "'");
+                    throw new IllegalStateException("Pattern in recipe " + uh + " uses undefined symbol '" + character7 + "'");
                 }
                 set3.remove(character7);
             }
         }
         if (!set3.isEmpty()) {
-            throw new IllegalStateException("Ingredients are defined but not used in pattern for recipe " + sm);
+            throw new IllegalStateException("Ingredients are defined but not used in pattern for recipe " + uh);
         }
         if (this.rows.size() == 1 && this.rows.get(0).length() == 1) {
-            throw new IllegalStateException("Shaped recipe " + sm + " only takes in a single item - should it be a shapeless recipe instead?");
+            throw new IllegalStateException("Shaped recipe " + uh + " only takes in a single item - should it be a shapeless recipe instead?");
         }
         if (this.advancement.getCriteria().isEmpty()) {
-            throw new IllegalStateException("No way of obtaining recipe " + sm);
+            throw new IllegalStateException("No way of obtaining recipe " + uh);
         }
     }
     
@@ -147,15 +147,15 @@ public class ShapedRecipeBuilder {
         private final Advancement.Builder advancement;
         private final ResourceLocation advancementId;
         
-        public Result(final ResourceLocation sm2, final Item bei, final int integer, final String string, final List<String> list, final Map<Character, Ingredient> map, final Advancement.Builder a, final ResourceLocation sm9) {
-            this.id = sm2;
-            this.result = bei;
+        public Result(final ResourceLocation uh2, final Item bke, final int integer, final String string, final List<String> list, final Map<Character, Ingredient> map, final Advancement.Builder a, final ResourceLocation uh9) {
+            this.id = uh2;
+            this.result = bke;
             this.count = integer;
             this.group = string;
             this.pattern = list;
             this.key = map;
             this.advancement = a;
-            this.advancementId = sm9;
+            this.advancementId = uh9;
         }
         
         @Override
diff --git a/src/net/minecraft/data/recipes/ShapelessRecipeBuilder.java b/src/net/minecraft/data/recipes/ShapelessRecipeBuilder.java
index ee432a5..c2b4353 100644
--- a/src/net/minecraft/data/recipes/ShapelessRecipeBuilder.java
+++ b/src/net/minecraft/data/recipes/ShapelessRecipeBuilder.java
@@ -31,49 +31,49 @@ public class ShapelessRecipeBuilder {
     private final Advancement.Builder advancement;
     private String group;
     
-    public ShapelessRecipeBuilder(final ItemLike bjv, final int integer) {
+    public ShapelessRecipeBuilder(final ItemLike bqa, final int integer) {
         this.ingredients = Lists.newArrayList();
         this.advancement = Advancement.Builder.advancement();
-        this.result = bjv.asItem();
+        this.result = bqa.asItem();
         this.count = integer;
     }
     
-    public static ShapelessRecipeBuilder shapeless(final ItemLike bjv) {
-        return new ShapelessRecipeBuilder(bjv, 1);
+    public static ShapelessRecipeBuilder shapeless(final ItemLike bqa) {
+        return new ShapelessRecipeBuilder(bqa, 1);
     }
     
-    public static ShapelessRecipeBuilder shapeless(final ItemLike bjv, final int integer) {
-        return new ShapelessRecipeBuilder(bjv, integer);
+    public static ShapelessRecipeBuilder shapeless(final ItemLike bqa, final int integer) {
+        return new ShapelessRecipeBuilder(bqa, integer);
     }
     
-    public ShapelessRecipeBuilder requires(final Tag<Item> aaz) {
-        return this.requires(Ingredient.of(aaz));
+    public ShapelessRecipeBuilder requires(final Tag<Item> adf) {
+        return this.requires(Ingredient.of(adf));
     }
     
-    public ShapelessRecipeBuilder requires(final ItemLike bjv) {
-        return this.requires(bjv, 1);
+    public ShapelessRecipeBuilder requires(final ItemLike bqa) {
+        return this.requires(bqa, 1);
     }
     
-    public ShapelessRecipeBuilder requires(final ItemLike bjv, final int integer) {
+    public ShapelessRecipeBuilder requires(final ItemLike bqa, final int integer) {
         for (int integer2 = 0; integer2 < integer; ++integer2) {
-            this.requires(Ingredient.of(bjv));
+            this.requires(Ingredient.of(bqa));
         }
         return this;
     }
     
-    public ShapelessRecipeBuilder requires(final Ingredient bgt) {
-        return this.requires(bgt, 1);
+    public ShapelessRecipeBuilder requires(final Ingredient bmr) {
+        return this.requires(bmr, 1);
     }
     
-    public ShapelessRecipeBuilder requires(final Ingredient bgt, final int integer) {
+    public ShapelessRecipeBuilder requires(final Ingredient bmr, final int integer) {
         for (int integer2 = 0; integer2 < integer; ++integer2) {
-            this.ingredients.add(bgt);
+            this.ingredients.add(bmr);
         }
         return this;
     }
     
-    public ShapelessRecipeBuilder unlocks(final String string, final CriterionTriggerInstance ac) {
-        this.advancement.addCriterion(string, ac);
+    public ShapelessRecipeBuilder unlockedBy(final String string, final CriterionTriggerInstance ae) {
+        this.advancement.addCriterion(string, ae);
         return this;
     }
     
@@ -87,22 +87,22 @@ public class ShapelessRecipeBuilder {
     }
     
     public void save(final Consumer<FinishedRecipe> consumer, final String string) {
-        final ResourceLocation sm4 = Registry.ITEM.getKey(this.result);
-        if (new ResourceLocation(string).equals(sm4)) {
+        final ResourceLocation uh4 = Registry.ITEM.getKey(this.result);
+        if (new ResourceLocation(string).equals(uh4)) {
             throw new IllegalStateException("Shapeless Recipe " + string + " should remove its 'save' argument");
         }
         this.save(consumer, new ResourceLocation(string));
     }
     
-    public void save(final Consumer<FinishedRecipe> consumer, final ResourceLocation sm) {
-        this.ensureValid(sm);
-        this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", new RecipeUnlockedTrigger.TriggerInstance(sm)).rewards(AdvancementRewards.Builder.recipe(sm)).requirements(RequirementsStrategy.OR);
-        consumer.accept(new Result(sm, this.result, this.count, (this.group == null) ? "" : this.group, this.ingredients, this.advancement, new ResourceLocation(sm.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + sm.getPath())));
+    public void save(final Consumer<FinishedRecipe> consumer, final ResourceLocation uh) {
+        this.ensureValid(uh);
+        this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(uh)).rewards(AdvancementRewards.Builder.recipe(uh)).requirements(RequirementsStrategy.OR);
+        consumer.accept(new Result(uh, this.result, this.count, (this.group == null) ? "" : this.group, this.ingredients, this.advancement, new ResourceLocation(uh.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + uh.getPath())));
     }
     
-    private void ensureValid(final ResourceLocation sm) {
+    private void ensureValid(final ResourceLocation uh) {
         if (this.advancement.getCriteria().isEmpty()) {
-            throw new IllegalStateException("No way of obtaining recipe " + sm);
+            throw new IllegalStateException("No way of obtaining recipe " + uh);
         }
     }
     
@@ -119,14 +119,14 @@ public class ShapelessRecipeBuilder {
         private final Advancement.Builder advancement;
         private final ResourceLocation advancementId;
         
-        public Result(final ResourceLocation sm1, final Item bei, final int integer, final String string, final List<Ingredient> list, final Advancement.Builder a, final ResourceLocation sm7) {
-            this.id = sm1;
-            this.result = bei;
+        public Result(final ResourceLocation uh1, final Item bke, final int integer, final String string, final List<Ingredient> list, final Advancement.Builder a, final ResourceLocation uh7) {
+            this.id = uh1;
+            this.result = bke;
             this.count = integer;
             this.group = string;
             this.ingredients = list;
             this.advancement = a;
-            this.advancementId = sm7;
+            this.advancementId = uh7;
         }
         
         @Override
@@ -135,8 +135,8 @@ public class ShapelessRecipeBuilder {
                 jsonObject.addProperty("group", this.group);
             }
             final JsonArray jsonArray3 = new JsonArray();
-            for (final Ingredient bgt5 : this.ingredients) {
-                jsonArray3.add(bgt5.toJson());
+            for (final Ingredient bmr5 : this.ingredients) {
+                jsonArray3.add(bmr5.toJson());
             }
             jsonObject.add("ingredients", jsonArray3);
             final JsonObject jsonObject2 = new JsonObject();
diff --git a/src/net/minecraft/data/recipes/SimpleCookingRecipeBuilder.java b/src/net/minecraft/data/recipes/SimpleCookingRecipeBuilder.java
index 14ce166..bcb1351 100644
--- a/src/net/minecraft/data/recipes/SimpleCookingRecipeBuilder.java
+++ b/src/net/minecraft/data/recipes/SimpleCookingRecipeBuilder.java
@@ -26,29 +26,29 @@ public class SimpleCookingRecipeBuilder {
     private String group;
     private final SimpleCookingSerializer<?> serializer;
     
-    private SimpleCookingRecipeBuilder(final ItemLike bjv, final Ingredient bgt, final float float3, final int integer, final SimpleCookingSerializer<?> bhf) {
+    private SimpleCookingRecipeBuilder(final ItemLike bqa, final Ingredient bmr, final float float3, final int integer, final SimpleCookingSerializer<?> bnd) {
         this.advancement = Advancement.Builder.advancement();
-        this.result = bjv.asItem();
-        this.ingredient = bgt;
+        this.result = bqa.asItem();
+        this.ingredient = bmr;
         this.experience = float3;
         this.cookingTime = integer;
-        this.serializer = bhf;
+        this.serializer = bnd;
     }
     
-    public static SimpleCookingRecipeBuilder cooking(final Ingredient bgt, final ItemLike bjv, final float float3, final int integer, final SimpleCookingSerializer<?> bhf) {
-        return new SimpleCookingRecipeBuilder(bjv, bgt, float3, integer, bhf);
+    public static SimpleCookingRecipeBuilder cooking(final Ingredient bmr, final ItemLike bqa, final float float3, final int integer, final SimpleCookingSerializer<?> bnd) {
+        return new SimpleCookingRecipeBuilder(bqa, bmr, float3, integer, bnd);
     }
     
-    public static SimpleCookingRecipeBuilder blasting(final Ingredient bgt, final ItemLike bjv, final float float3, final int integer) {
-        return cooking(bgt, bjv, float3, integer, RecipeSerializer.BLASTING_RECIPE);
+    public static SimpleCookingRecipeBuilder blasting(final Ingredient bmr, final ItemLike bqa, final float float3, final int integer) {
+        return cooking(bmr, bqa, float3, integer, RecipeSerializer.BLASTING_RECIPE);
     }
     
-    public static SimpleCookingRecipeBuilder smelting(final Ingredient bgt, final ItemLike bjv, final float float3, final int integer) {
-        return cooking(bgt, bjv, float3, integer, RecipeSerializer.SMELTING_RECIPE);
+    public static SimpleCookingRecipeBuilder smelting(final Ingredient bmr, final ItemLike bqa, final float float3, final int integer) {
+        return cooking(bmr, bqa, float3, integer, RecipeSerializer.SMELTING_RECIPE);
     }
     
-    public SimpleCookingRecipeBuilder unlocks(final String string, final CriterionTriggerInstance ac) {
-        this.advancement.addCriterion(string, ac);
+    public SimpleCookingRecipeBuilder unlockedBy(final String string, final CriterionTriggerInstance ae) {
+        this.advancement.addCriterion(string, ae);
         return this;
     }
     
@@ -57,23 +57,23 @@ public class SimpleCookingRecipeBuilder {
     }
     
     public void save(final Consumer<FinishedRecipe> consumer, final String string) {
-        final ResourceLocation sm4 = Registry.ITEM.getKey(this.result);
-        final ResourceLocation sm5 = new ResourceLocation(string);
-        if (sm5.equals(sm4)) {
-            throw new IllegalStateException("Recipe " + sm5 + " should remove its 'save' argument");
+        final ResourceLocation uh4 = Registry.ITEM.getKey(this.result);
+        final ResourceLocation uh5 = new ResourceLocation(string);
+        if (uh5.equals(uh4)) {
+            throw new IllegalStateException("Recipe " + uh5 + " should remove its 'save' argument");
         }
-        this.save(consumer, sm5);
+        this.save(consumer, uh5);
     }
     
-    public void save(final Consumer<FinishedRecipe> consumer, final ResourceLocation sm) {
-        this.ensureValid(sm);
-        this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", new RecipeUnlockedTrigger.TriggerInstance(sm)).rewards(AdvancementRewards.Builder.recipe(sm)).requirements(RequirementsStrategy.OR);
-        consumer.accept(new Result(sm, (this.group == null) ? "" : this.group, this.ingredient, this.result, this.experience, this.cookingTime, this.advancement, new ResourceLocation(sm.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + sm.getPath()), this.serializer));
+    public void save(final Consumer<FinishedRecipe> consumer, final ResourceLocation uh) {
+        this.ensureValid(uh);
+        this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(uh)).rewards(AdvancementRewards.Builder.recipe(uh)).requirements(RequirementsStrategy.OR);
+        consumer.accept(new Result(uh, (this.group == null) ? "" : this.group, this.ingredient, this.result, this.experience, this.cookingTime, this.advancement, new ResourceLocation(uh.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + uh.getPath()), this.serializer));
     }
     
-    private void ensureValid(final ResourceLocation sm) {
+    private void ensureValid(final ResourceLocation uh) {
         if (this.advancement.getCriteria().isEmpty()) {
-            throw new IllegalStateException("No way of obtaining recipe " + sm);
+            throw new IllegalStateException("No way of obtaining recipe " + uh);
         }
     }
     
@@ -88,16 +88,16 @@ public class SimpleCookingRecipeBuilder {
         private final ResourceLocation advancementId;
         private final RecipeSerializer<? extends AbstractCookingRecipe> serializer;
         
-        public Result(final ResourceLocation sm1, final String string, final Ingredient bgt, final Item bei, final float float5, final int integer, final Advancement.Builder a, final ResourceLocation sm8, final RecipeSerializer<? extends AbstractCookingRecipe> bgy) {
-            this.id = sm1;
+        public Result(final ResourceLocation uh1, final String string, final Ingredient bmr, final Item bke, final float float5, final int integer, final Advancement.Builder a, final ResourceLocation uh8, final RecipeSerializer<? extends AbstractCookingRecipe> bmw) {
+            this.id = uh1;
             this.group = string;
-            this.ingredient = bgt;
-            this.result = bei;
+            this.ingredient = bmr;
+            this.result = bke;
             this.experience = float5;
             this.cookingTime = integer;
             this.advancement = a;
-            this.advancementId = sm8;
-            this.serializer = bgy;
+            this.advancementId = uh8;
+            this.serializer = bmw;
         }
         
         @Override
diff --git a/src/net/minecraft/data/recipes/SingleItemRecipeBuilder.java b/src/net/minecraft/data/recipes/SingleItemRecipeBuilder.java
index 6c2cc74..a71dfc8 100644
--- a/src/net/minecraft/data/recipes/SingleItemRecipeBuilder.java
+++ b/src/net/minecraft/data/recipes/SingleItemRecipeBuilder.java
@@ -23,44 +23,44 @@ public class SingleItemRecipeBuilder {
     private String group;
     private final RecipeSerializer<?> type;
     
-    public SingleItemRecipeBuilder(final RecipeSerializer<?> bgy, final Ingredient bgt, final ItemLike bjv, final int integer) {
+    public SingleItemRecipeBuilder(final RecipeSerializer<?> bmw, final Ingredient bmr, final ItemLike bqa, final int integer) {
         this.advancement = Advancement.Builder.advancement();
-        this.type = bgy;
-        this.result = bjv.asItem();
-        this.ingredient = bgt;
+        this.type = bmw;
+        this.result = bqa.asItem();
+        this.ingredient = bmr;
         this.count = integer;
     }
     
-    public static SingleItemRecipeBuilder stonecutting(final Ingredient bgt, final ItemLike bjv) {
-        return new SingleItemRecipeBuilder(RecipeSerializer.STONECUTTER, bgt, bjv, 1);
+    public static SingleItemRecipeBuilder stonecutting(final Ingredient bmr, final ItemLike bqa) {
+        return new SingleItemRecipeBuilder(RecipeSerializer.STONECUTTER, bmr, bqa, 1);
     }
     
-    public static SingleItemRecipeBuilder stonecutting(final Ingredient bgt, final ItemLike bjv, final int integer) {
-        return new SingleItemRecipeBuilder(RecipeSerializer.STONECUTTER, bgt, bjv, integer);
+    public static SingleItemRecipeBuilder stonecutting(final Ingredient bmr, final ItemLike bqa, final int integer) {
+        return new SingleItemRecipeBuilder(RecipeSerializer.STONECUTTER, bmr, bqa, integer);
     }
     
-    public SingleItemRecipeBuilder unlocks(final String string, final CriterionTriggerInstance ac) {
-        this.advancement.addCriterion(string, ac);
+    public SingleItemRecipeBuilder unlocks(final String string, final CriterionTriggerInstance ae) {
+        this.advancement.addCriterion(string, ae);
         return this;
     }
     
     public void save(final Consumer<FinishedRecipe> consumer, final String string) {
-        final ResourceLocation sm4 = Registry.ITEM.getKey(this.result);
-        if (new ResourceLocation(string).equals(sm4)) {
+        final ResourceLocation uh4 = Registry.ITEM.getKey(this.result);
+        if (new ResourceLocation(string).equals(uh4)) {
             throw new IllegalStateException("Single Item Recipe " + string + " should remove its 'save' argument");
         }
         this.save(consumer, new ResourceLocation(string));
     }
     
-    public void save(final Consumer<FinishedRecipe> consumer, final ResourceLocation sm) {
-        this.ensureValid(sm);
-        this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", new RecipeUnlockedTrigger.TriggerInstance(sm)).rewards(AdvancementRewards.Builder.recipe(sm)).requirements(RequirementsStrategy.OR);
-        consumer.accept(new Result(sm, this.type, (this.group == null) ? "" : this.group, this.ingredient, this.result, this.count, this.advancement, new ResourceLocation(sm.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + sm.getPath())));
+    public void save(final Consumer<FinishedRecipe> consumer, final ResourceLocation uh) {
+        this.ensureValid(uh);
+        this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(uh)).rewards(AdvancementRewards.Builder.recipe(uh)).requirements(RequirementsStrategy.OR);
+        consumer.accept(new Result(uh, this.type, (this.group == null) ? "" : this.group, this.ingredient, this.result, this.count, this.advancement, new ResourceLocation(uh.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + uh.getPath())));
     }
     
-    private void ensureValid(final ResourceLocation sm) {
+    private void ensureValid(final ResourceLocation uh) {
         if (this.advancement.getCriteria().isEmpty()) {
-            throw new IllegalStateException("No way of obtaining recipe " + sm);
+            throw new IllegalStateException("No way of obtaining recipe " + uh);
         }
     }
     
@@ -74,15 +74,15 @@ public class SingleItemRecipeBuilder {
         private final ResourceLocation advancementId;
         private final RecipeSerializer<?> type;
         
-        public Result(final ResourceLocation sm1, final RecipeSerializer<?> bgy, final String string, final Ingredient bgt, final Item bei, final int integer, final Advancement.Builder a, final ResourceLocation sm8) {
-            this.id = sm1;
-            this.type = bgy;
+        public Result(final ResourceLocation uh1, final RecipeSerializer<?> bmw, final String string, final Ingredient bmr, final Item bke, final int integer, final Advancement.Builder a, final ResourceLocation uh8) {
+            this.id = uh1;
+            this.type = bmw;
             this.group = string;
-            this.ingredient = bgt;
-            this.result = bei;
+            this.ingredient = bmr;
+            this.result = bke;
             this.count = integer;
             this.advancement = a;
-            this.advancementId = sm8;
+            this.advancementId = uh8;
         }
         
         @Override
diff --git a/src/net/minecraft/data/recipes/SpecialRecipeBuilder.java b/src/net/minecraft/data/recipes/SpecialRecipeBuilder.java
index 5964267..32c1218 100644
--- a/src/net/minecraft/data/recipes/SpecialRecipeBuilder.java
+++ b/src/net/minecraft/data/recipes/SpecialRecipeBuilder.java
@@ -10,12 +10,12 @@ import net.minecraft.world.item.crafting.SimpleRecipeSerializer;
 public class SpecialRecipeBuilder {
     private final SimpleRecipeSerializer<?> serializer;
     
-    public SpecialRecipeBuilder(final SimpleRecipeSerializer<?> bhg) {
-        this.serializer = bhg;
+    public SpecialRecipeBuilder(final SimpleRecipeSerializer<?> bne) {
+        this.serializer = bne;
     }
     
-    public static SpecialRecipeBuilder special(final SimpleRecipeSerializer<?> bhg) {
-        return new SpecialRecipeBuilder(bhg);
+    public static SpecialRecipeBuilder special(final SimpleRecipeSerializer<?> bne) {
+        return new SpecialRecipeBuilder(bne);
     }
     
     public void save(final Consumer<FinishedRecipe> consumer, final String string) {
diff --git a/src/net/minecraft/data/recipes/UpgradeRecipeBuilder.java b/src/net/minecraft/data/recipes/UpgradeRecipeBuilder.java
new file mode 100644
index 0000000..265bd7b
--- /dev/null
+++ b/src/net/minecraft/data/recipes/UpgradeRecipeBuilder.java
@@ -0,0 +1,108 @@
+package net.minecraft.data.recipes;
+
+import javax.annotation.Nullable;
+import com.google.gson.JsonElement;
+import net.minecraft.core.Registry;
+import com.google.gson.JsonObject;
+import net.minecraft.advancements.RequirementsStrategy;
+import net.minecraft.advancements.AdvancementRewards;
+import net.minecraft.advancements.critereon.RecipeUnlockedTrigger;
+import net.minecraft.resources.ResourceLocation;
+import java.util.function.Consumer;
+import net.minecraft.advancements.CriterionTriggerInstance;
+import net.minecraft.world.item.crafting.RecipeSerializer;
+import net.minecraft.advancements.Advancement;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.crafting.Ingredient;
+
+public class UpgradeRecipeBuilder {
+    private final Ingredient base;
+    private final Ingredient addition;
+    private final Item result;
+    private final Advancement.Builder advancement;
+    private final RecipeSerializer<?> type;
+    
+    public UpgradeRecipeBuilder(final RecipeSerializer<?> bmw, final Ingredient bmr2, final Ingredient bmr3, final Item bke) {
+        this.advancement = Advancement.Builder.advancement();
+        this.type = bmw;
+        this.base = bmr2;
+        this.addition = bmr3;
+        this.result = bke;
+    }
+    
+    public static UpgradeRecipeBuilder smithing(final Ingredient bmr1, final Ingredient bmr2, final Item bke) {
+        return new UpgradeRecipeBuilder(RecipeSerializer.SMITHING, bmr1, bmr2, bke);
+    }
+    
+    public UpgradeRecipeBuilder unlocks(final String string, final CriterionTriggerInstance ae) {
+        this.advancement.addCriterion(string, ae);
+        return this;
+    }
+    
+    public void save(final Consumer<FinishedRecipe> consumer, final String string) {
+        this.save(consumer, new ResourceLocation(string));
+    }
+    
+    public void save(final Consumer<FinishedRecipe> consumer, final ResourceLocation uh) {
+        this.ensureValid(uh);
+        this.advancement.parent(new ResourceLocation("recipes/root")).addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(uh)).rewards(AdvancementRewards.Builder.recipe(uh)).requirements(RequirementsStrategy.OR);
+        consumer.accept(new Result(uh, this.type, this.base, this.addition, this.result, this.advancement, new ResourceLocation(uh.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + uh.getPath())));
+    }
+    
+    private void ensureValid(final ResourceLocation uh) {
+        if (this.advancement.getCriteria().isEmpty()) {
+            throw new IllegalStateException("No way of obtaining recipe " + uh);
+        }
+    }
+    
+    public static class Result implements FinishedRecipe {
+        private final ResourceLocation id;
+        private final Ingredient base;
+        private final Ingredient addition;
+        private final Item result;
+        private final Advancement.Builder advancement;
+        private final ResourceLocation advancementId;
+        private final RecipeSerializer<?> type;
+        
+        public Result(final ResourceLocation uh1, final RecipeSerializer<?> bmw, final Ingredient bmr3, final Ingredient bmr4, final Item bke, final Advancement.Builder a, final ResourceLocation uh7) {
+            this.id = uh1;
+            this.type = bmw;
+            this.base = bmr3;
+            this.addition = bmr4;
+            this.result = bke;
+            this.advancement = a;
+            this.advancementId = uh7;
+        }
+        
+        @Override
+        public void serializeRecipeData(final JsonObject jsonObject) {
+            jsonObject.add("base", this.base.toJson());
+            jsonObject.add("addition", this.addition.toJson());
+            final JsonObject jsonObject2 = new JsonObject();
+            jsonObject2.addProperty("item", Registry.ITEM.getKey(this.result).toString());
+            jsonObject.add("result", jsonObject2);
+        }
+        
+        @Override
+        public ResourceLocation getId() {
+            return this.id;
+        }
+        
+        @Override
+        public RecipeSerializer<?> getType() {
+            return this.type;
+        }
+        
+        @Nullable
+        @Override
+        public JsonObject serializeAdvancement() {
+            return this.advancement.serializeToJson();
+        }
+        
+        @Nullable
+        @Override
+        public ResourceLocation getAdvancementId() {
+            return this.advancementId;
+        }
+    }
+}
diff --git a/src/net/minecraft/data/structures/NbtToSnbt.java b/src/net/minecraft/data/structures/NbtToSnbt.java
index cce6370..3d7ed3e 100644
--- a/src/net/minecraft/data/structures/NbtToSnbt.java
+++ b/src/net/minecraft/data/structures/NbtToSnbt.java
@@ -22,12 +22,12 @@ public class NbtToSnbt implements DataProvider {
     private static final Logger LOGGER;
     private final DataGenerator generator;
     
-    public NbtToSnbt(final DataGenerator gy) {
-        this.generator = gy;
+    public NbtToSnbt(final DataGenerator hk) {
+        this.generator = hk;
     }
     
     @Override
-    public void run(final HashCache ha) throws IOException {
+    public void run(final HashCache hm) throws IOException {
         final Path path4 = this.generator.getOutputFolder();
         for (final Path path5 : this.generator.getInputFolders()) {
             Files.walk(path5).filter(path -> path.toString().endsWith(".nbt")).forEach(path3 -> convertStructure(path3, this.getName(path5, path3), path4));
@@ -47,9 +47,9 @@ public class NbtToSnbt implements DataProvider {
     @Nullable
     public static Path convertStructure(final Path path1, final String string, final Path path3) {
         try {
-            final CompoundTag jt4 = NbtIo.readCompressed(Files.newInputStream(path1));
-            final Component lf5 = jt4.getPrettyDisplay("    ", 0);
-            final String string2 = lf5.getString() + "\n";
+            final CompoundTag le4 = NbtIo.readCompressed(Files.newInputStream(path1));
+            final Component mr5 = le4.getPrettyDisplay("    ", 0);
+            final String string2 = mr5.getString() + "\n";
             final Path path4 = path3.resolve(string + ".snbt");
             Files.createDirectories(path4.getParent(), new FileAttribute[0]);
             try (final BufferedWriter bufferedWriter8 = Files.newBufferedWriter(path4)) {
diff --git a/src/net/minecraft/data/structures/SnbtToNbt.java b/src/net/minecraft/data/structures/SnbtToNbt.java
index 9628020..82d53dd 100644
--- a/src/net/minecraft/data/structures/SnbtToNbt.java
+++ b/src/net/minecraft/data/structures/SnbtToNbt.java
@@ -4,13 +4,14 @@ import org.apache.logging.log4j.LogManager;
 import java.nio.file.OpenOption;
 import java.nio.file.attribute.FileAttribute;
 import java.nio.file.LinkOption;
-import javax.annotation.Nullable;
+import org.apache.commons.io.FileUtils;
+import java.nio.charset.StandardCharsets;
 import java.io.BufferedReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.io.OutputStream;
 import net.minecraft.nbt.NbtIo;
-import net.minecraft.nbt.TagParser;
 import java.io.ByteArrayOutputStream;
+import net.minecraft.nbt.TagParser;
 import java.io.Reader;
 import org.apache.commons.io.IOUtils;
 import java.io.IOException;
@@ -20,7 +21,6 @@ import java.util.concurrent.CompletableFuture;
 import net.minecraft.Util;
 import java.nio.file.Files;
 import java.nio.file.FileVisitOption;
-import java.nio.file.Path;
 import net.minecraft.data.HashCache;
 import java.util.Iterator;
 import net.minecraft.nbt.CompoundTag;
@@ -28,16 +28,20 @@ import com.google.common.collect.Lists;
 import java.util.List;
 import net.minecraft.data.DataGenerator;
 import org.apache.logging.log4j.Logger;
+import javax.annotation.Nullable;
+import java.nio.file.Path;
 import net.minecraft.data.DataProvider;
 
 public class SnbtToNbt implements DataProvider {
+    @Nullable
+    private static final Path dumpSnbtTo;
     private static final Logger LOGGER;
     private final DataGenerator generator;
     private final List<Filter> filters;
     
-    public SnbtToNbt(final DataGenerator gy) {
+    public SnbtToNbt(final DataGenerator hk) {
         this.filters = Lists.newArrayList();
-        this.generator = gy;
+        this.generator = hk;
     }
     
     public SnbtToNbt addFilter(final Filter a) {
@@ -45,22 +49,22 @@ public class SnbtToNbt implements DataProvider {
         return this;
     }
     
-    private CompoundTag applyFilters(final String string, final CompoundTag jt) {
-        CompoundTag jt2 = jt;
+    private CompoundTag applyFilters(final String string, final CompoundTag le) {
+        CompoundTag le2 = le;
         for (final Filter a6 : this.filters) {
-            jt2 = a6.apply(string, jt2);
+            le2 = a6.apply(string, le2);
         }
-        return jt2;
+        return le2;
     }
     
     @Override
-    public void run(final HashCache ha) throws IOException {
+    public void run(final HashCache hm) throws IOException {
         final Path path4 = this.generator.getOutputFolder();
         final List<CompletableFuture<TaskResult>> list4 = Lists.newArrayList();
         for (final Path path5 : this.generator.getInputFolders()) {
             Files.walk(path5).filter(path -> path.toString().endsWith(".snbt")).forEach(path3 -> list4.add(CompletableFuture.<TaskResult>supplyAsync(() -> this.readStructure(path3, this.getName(path5, path3)), Util.backgroundExecutor())));
         }
-        Util.sequence(list4).join().stream().filter(Objects::nonNull).forEach(b -> this.storeStructureIfChanged(ha, b, path4));
+        Util.sequence(list4).join().stream().filter(Objects::nonNull).forEach(b -> this.storeStructureIfChanged(hm, b, path4));
     }
     
     @Override
@@ -77,11 +81,19 @@ public class SnbtToNbt implements DataProvider {
     private TaskResult readStructure(final Path path, final String string) {
         try (final BufferedReader bufferedReader4 = Files.newBufferedReader(path)) {
             final String string2 = IOUtils.toString((Reader)bufferedReader4);
-            final ByteArrayOutputStream byteArrayOutputStream7 = new ByteArrayOutputStream();
-            NbtIo.writeCompressed(this.applyFilters(string, TagParser.parseTag(string2)), byteArrayOutputStream7);
-            final byte[] arr8 = byteArrayOutputStream7.toByteArray();
-            final String string3 = SnbtToNbt.SHA1.hashBytes(arr8).toString();
-            return new TaskResult(string, arr8, string3);
+            final CompoundTag le7 = this.applyFilters(string, TagParser.parseTag(string2));
+            final ByteArrayOutputStream byteArrayOutputStream8 = new ByteArrayOutputStream();
+            NbtIo.writeCompressed(le7, byteArrayOutputStream8);
+            final byte[] arr9 = byteArrayOutputStream8.toByteArray();
+            final String string3 = SnbtToNbt.SHA1.hashBytes(arr9).toString();
+            String string4;
+            if (SnbtToNbt.dumpSnbtTo != null) {
+                string4 = le7.getPrettyDisplay("    ", 0).getString() + "\n";
+            }
+            else {
+                string4 = null;
+            }
+            return new TaskResult(string, arr9, string4, string3);
         }
         catch (CommandSyntaxException commandSyntaxException4) {
             SnbtToNbt.LOGGER.error("Couldn't convert {} from SNBT to NBT at {} as it's invalid SNBT", string, path, commandSyntaxException4);
@@ -92,16 +104,25 @@ public class SnbtToNbt implements DataProvider {
         return null;
     }
     
-    private void storeStructureIfChanged(final HashCache ha, final TaskResult b, final Path path) {
+    private void storeStructureIfChanged(final HashCache hm, final TaskResult b, final Path path) {
+        if (b.snbtPayload != null) {
+            final Path path2 = SnbtToNbt.dumpSnbtTo.resolve(b.name + ".snbt");
+            try {
+                FileUtils.write(path2.toFile(), (CharSequence)b.snbtPayload, StandardCharsets.UTF_8);
+            }
+            catch (IOException iOException6) {
+                SnbtToNbt.LOGGER.error("Couldn't write structure SNBT {} at {}", b.name, path2, iOException6);
+            }
+        }
         final Path path2 = path.resolve(b.name + ".nbt");
         try {
-            if (!Objects.equals(ha.getHash(path2), b.hash) || !Files.exists(path2)) {
+            if (!Objects.equals(hm.getHash(path2), b.hash) || !Files.exists(path2)) {
                 Files.createDirectories(path2.getParent(), new FileAttribute[0]);
                 try (final OutputStream outputStream6 = Files.newOutputStream(path2)) {
                     outputStream6.write(b.payload);
                 }
             }
-            ha.putNew(path2, b.hash);
+            hm.putNew(path2, b.hash);
         }
         catch (IOException iOException6) {
             SnbtToNbt.LOGGER.error("Couldn't write structure {} at {}", b.name, path2, iOException6);
@@ -109,23 +130,27 @@ public class SnbtToNbt implements DataProvider {
     }
     
     static {
+        dumpSnbtTo = null;
         LOGGER = LogManager.getLogger();
     }
     
     static class TaskResult {
         private final String name;
         private final byte[] payload;
+        @Nullable
+        private final String snbtPayload;
         private final String hash;
         
-        public TaskResult(final String string1, final byte[] arr, final String string3) {
+        public TaskResult(final String string1, final byte[] arr, @Nullable final String string3, final String string4) {
             this.name = string1;
             this.payload = arr;
-            this.hash = string3;
+            this.snbtPayload = string3;
+            this.hash = string4;
         }
     }
     
     @FunctionalInterface
     public interface Filter {
-        CompoundTag apply(final String string, final CompoundTag jt);
+        CompoundTag apply(final String string, final CompoundTag le);
     }
 }
diff --git a/src/net/minecraft/data/structures/StructureUpdater.java b/src/net/minecraft/data/structures/StructureUpdater.java
index b94c2db..bd0e570 100644
--- a/src/net/minecraft/data/structures/StructureUpdater.java
+++ b/src/net/minecraft/data/structures/StructureUpdater.java
@@ -1,30 +1,44 @@
 package net.minecraft.data.structures;
 
+import org.apache.logging.log4j.LogManager;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.util.datafix.DataFixTypes;
 import net.minecraft.util.datafix.DataFixers;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.nbt.CompoundTag;
+import org.apache.logging.log4j.Logger;
 
 public class StructureUpdater implements SnbtToNbt.Filter {
+    private static final Logger LOGGER;
+    
     @Override
-    public CompoundTag apply(final String string, final CompoundTag jt) {
+    public CompoundTag apply(final String string, final CompoundTag le) {
         if (string.startsWith("data/minecraft/structures/")) {
-            return updateStructure(patchVersion(jt));
+            return updateStructure(string, patchVersion(le));
         }
-        return jt;
+        return le;
     }
     
-    private static CompoundTag patchVersion(final CompoundTag jt) {
-        if (!jt.contains("DataVersion", 99)) {
-            jt.putInt("DataVersion", 500);
+    private static CompoundTag patchVersion(final CompoundTag le) {
+        if (!le.contains("DataVersion", 99)) {
+            le.putInt("DataVersion", 500);
         }
-        return jt;
+        return le;
     }
     
-    private static CompoundTag updateStructure(final CompoundTag jt) {
-        final StructureTemplate cms2 = new StructureTemplate();
-        cms2.load(NbtUtils.update(DataFixers.getDataFixer(), DataFixTypes.STRUCTURE, jt, jt.getInt("DataVersion")));
-        return cms2.save(new CompoundTag());
+    private static CompoundTag updateStructure(final String string, final CompoundTag le) {
+        final StructureTemplate cve3 = new StructureTemplate();
+        final int integer4 = le.getInt("DataVersion");
+        final int integer5 = 2532;
+        if (integer4 < 2532) {
+            StructureUpdater.LOGGER.warn("SNBT Too old, do not forget to update: " + integer4 + " < " + 2532 + ": " + string);
+        }
+        final CompoundTag le2 = NbtUtils.update(DataFixers.getDataFixer(), DataFixTypes.STRUCTURE, le, integer4);
+        cve3.load(le2);
+        return cve3.save(new CompoundTag());
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
     }
 }
diff --git a/src/net/minecraft/data/tags/BlockTagsProvider.java b/src/net/minecraft/data/tags/BlockTagsProvider.java
index 341e034..6bb42a6 100644
--- a/src/net/minecraft/data/tags/BlockTagsProvider.java
+++ b/src/net/minecraft/data/tags/BlockTagsProvider.java
@@ -1,6 +1,5 @@
 package net.minecraft.data.tags;
 
-import net.minecraft.tags.TagCollection;
 import java.nio.file.Path;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Blocks;
@@ -10,22 +9,22 @@ import net.minecraft.data.DataGenerator;
 import net.minecraft.world.level.block.Block;
 
 public class BlockTagsProvider extends TagsProvider<Block> {
-    public BlockTagsProvider(final DataGenerator gy) {
-        super(gy, Registry.BLOCK);
+    public BlockTagsProvider(final DataGenerator hk) {
+        super(hk, Registry.BLOCK);
     }
     
     @Override
     protected void addTags() {
         this.tag(BlockTags.WOOL).add(Blocks.WHITE_WOOL, Blocks.ORANGE_WOOL, Blocks.MAGENTA_WOOL, Blocks.LIGHT_BLUE_WOOL, Blocks.YELLOW_WOOL, Blocks.LIME_WOOL, Blocks.PINK_WOOL, Blocks.GRAY_WOOL, Blocks.LIGHT_GRAY_WOOL, Blocks.CYAN_WOOL, Blocks.PURPLE_WOOL, Blocks.BLUE_WOOL, Blocks.BROWN_WOOL, Blocks.GREEN_WOOL, Blocks.RED_WOOL, Blocks.BLACK_WOOL);
-        this.tag(BlockTags.PLANKS).add(Blocks.OAK_PLANKS, Blocks.SPRUCE_PLANKS, Blocks.BIRCH_PLANKS, Blocks.JUNGLE_PLANKS, Blocks.ACACIA_PLANKS, Blocks.DARK_OAK_PLANKS);
+        this.tag(BlockTags.PLANKS).add(Blocks.OAK_PLANKS, Blocks.SPRUCE_PLANKS, Blocks.BIRCH_PLANKS, Blocks.JUNGLE_PLANKS, Blocks.ACACIA_PLANKS, Blocks.DARK_OAK_PLANKS, Blocks.CRIMSON_PLANKS, Blocks.WARPED_PLANKS);
         this.tag(BlockTags.STONE_BRICKS).add(Blocks.STONE_BRICKS, Blocks.MOSSY_STONE_BRICKS, Blocks.CRACKED_STONE_BRICKS, Blocks.CHISELED_STONE_BRICKS);
-        this.tag(BlockTags.WOODEN_BUTTONS).add(Blocks.OAK_BUTTON, Blocks.SPRUCE_BUTTON, Blocks.BIRCH_BUTTON, Blocks.JUNGLE_BUTTON, Blocks.ACACIA_BUTTON, Blocks.DARK_OAK_BUTTON);
-        this.tag(BlockTags.BUTTONS).addTag(BlockTags.WOODEN_BUTTONS).add(Blocks.STONE_BUTTON);
+        this.tag(BlockTags.WOODEN_BUTTONS).add(Blocks.OAK_BUTTON, Blocks.SPRUCE_BUTTON, Blocks.BIRCH_BUTTON, Blocks.JUNGLE_BUTTON, Blocks.ACACIA_BUTTON, Blocks.DARK_OAK_BUTTON, Blocks.CRIMSON_BUTTON, Blocks.WARPED_BUTTON);
+        this.tag(BlockTags.BUTTONS).addTag(BlockTags.WOODEN_BUTTONS).add(Blocks.STONE_BUTTON).add(Blocks.POLISHED_BLACKSTONE_BUTTON);
         this.tag(BlockTags.CARPETS).add(Blocks.WHITE_CARPET, Blocks.ORANGE_CARPET, Blocks.MAGENTA_CARPET, Blocks.LIGHT_BLUE_CARPET, Blocks.YELLOW_CARPET, Blocks.LIME_CARPET, Blocks.PINK_CARPET, Blocks.GRAY_CARPET, Blocks.LIGHT_GRAY_CARPET, Blocks.CYAN_CARPET, Blocks.PURPLE_CARPET, Blocks.BLUE_CARPET, Blocks.BROWN_CARPET, Blocks.GREEN_CARPET, Blocks.RED_CARPET, Blocks.BLACK_CARPET);
-        this.tag(BlockTags.WOODEN_DOORS).add(Blocks.OAK_DOOR, Blocks.SPRUCE_DOOR, Blocks.BIRCH_DOOR, Blocks.JUNGLE_DOOR, Blocks.ACACIA_DOOR, Blocks.DARK_OAK_DOOR);
-        this.tag(BlockTags.WOODEN_STAIRS).add(Blocks.OAK_STAIRS, Blocks.SPRUCE_STAIRS, Blocks.BIRCH_STAIRS, Blocks.JUNGLE_STAIRS, Blocks.ACACIA_STAIRS, Blocks.DARK_OAK_STAIRS);
-        this.tag(BlockTags.WOODEN_SLABS).add(Blocks.OAK_SLAB, Blocks.SPRUCE_SLAB, Blocks.BIRCH_SLAB, Blocks.JUNGLE_SLAB, Blocks.ACACIA_SLAB, Blocks.DARK_OAK_SLAB);
-        this.tag(BlockTags.WOODEN_FENCES).add(Blocks.OAK_FENCE, Blocks.ACACIA_FENCE, Blocks.DARK_OAK_FENCE, Blocks.SPRUCE_FENCE, Blocks.BIRCH_FENCE, Blocks.JUNGLE_FENCE);
+        this.tag(BlockTags.WOODEN_DOORS).add(Blocks.OAK_DOOR, Blocks.SPRUCE_DOOR, Blocks.BIRCH_DOOR, Blocks.JUNGLE_DOOR, Blocks.ACACIA_DOOR, Blocks.DARK_OAK_DOOR, Blocks.CRIMSON_DOOR, Blocks.WARPED_DOOR);
+        this.tag(BlockTags.WOODEN_STAIRS).add(Blocks.OAK_STAIRS, Blocks.SPRUCE_STAIRS, Blocks.BIRCH_STAIRS, Blocks.JUNGLE_STAIRS, Blocks.ACACIA_STAIRS, Blocks.DARK_OAK_STAIRS, Blocks.CRIMSON_STAIRS, Blocks.WARPED_STAIRS);
+        this.tag(BlockTags.WOODEN_SLABS).add(Blocks.OAK_SLAB, Blocks.SPRUCE_SLAB, Blocks.BIRCH_SLAB, Blocks.JUNGLE_SLAB, Blocks.ACACIA_SLAB, Blocks.DARK_OAK_SLAB, Blocks.CRIMSON_SLAB, Blocks.WARPED_SLAB);
+        this.tag(BlockTags.WOODEN_FENCES).add(Blocks.OAK_FENCE, Blocks.ACACIA_FENCE, Blocks.DARK_OAK_FENCE, Blocks.SPRUCE_FENCE, Blocks.BIRCH_FENCE, Blocks.JUNGLE_FENCE, Blocks.CRIMSON_FENCE, Blocks.WARPED_FENCE);
         this.tag(BlockTags.DOORS).addTag(BlockTags.WOODEN_DOORS).add(Blocks.IRON_DOOR);
         this.tag(BlockTags.SAPLINGS).add(Blocks.OAK_SAPLING, Blocks.SPRUCE_SAPLING, Blocks.BIRCH_SAPLING, Blocks.JUNGLE_SAPLING, Blocks.ACACIA_SAPLING, Blocks.DARK_OAK_SAPLING);
         this.tag(BlockTags.DARK_OAK_LOGS).add(Blocks.DARK_OAK_LOG, Blocks.DARK_OAK_WOOD, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.STRIPPED_DARK_OAK_WOOD);
@@ -34,16 +33,21 @@ public class BlockTagsProvider extends TagsProvider<Block> {
         this.tag(BlockTags.BIRCH_LOGS).add(Blocks.BIRCH_LOG, Blocks.BIRCH_WOOD, Blocks.STRIPPED_BIRCH_LOG, Blocks.STRIPPED_BIRCH_WOOD);
         this.tag(BlockTags.JUNGLE_LOGS).add(Blocks.JUNGLE_LOG, Blocks.JUNGLE_WOOD, Blocks.STRIPPED_JUNGLE_LOG, Blocks.STRIPPED_JUNGLE_WOOD);
         this.tag(BlockTags.SPRUCE_LOGS).add(Blocks.SPRUCE_LOG, Blocks.SPRUCE_WOOD, Blocks.STRIPPED_SPRUCE_LOG, Blocks.STRIPPED_SPRUCE_WOOD);
-        this.tag(BlockTags.LOGS).addTag(BlockTags.DARK_OAK_LOGS).addTag(BlockTags.OAK_LOGS).addTag(BlockTags.ACACIA_LOGS).addTag(BlockTags.BIRCH_LOGS).addTag(BlockTags.JUNGLE_LOGS).addTag(BlockTags.SPRUCE_LOGS);
+        this.tag(BlockTags.CRIMSON_STEMS).add(Blocks.CRIMSON_STEM, Blocks.STRIPPED_CRIMSON_STEM, Blocks.CRIMSON_HYPHAE, Blocks.STRIPPED_CRIMSON_HYPHAE);
+        this.tag(BlockTags.WARPED_STEMS).add(Blocks.WARPED_STEM, Blocks.STRIPPED_WARPED_STEM, Blocks.WARPED_HYPHAE, Blocks.STRIPPED_WARPED_HYPHAE);
+        this.tag(BlockTags.LOGS_THAT_BURN).addTag(BlockTags.DARK_OAK_LOGS).addTag(BlockTags.OAK_LOGS).addTag(BlockTags.ACACIA_LOGS).addTag(BlockTags.BIRCH_LOGS).addTag(BlockTags.JUNGLE_LOGS).addTag(BlockTags.SPRUCE_LOGS);
+        this.tag(BlockTags.LOGS).addTag(BlockTags.LOGS_THAT_BURN).addTag(BlockTags.CRIMSON_STEMS).addTag(BlockTags.WARPED_STEMS);
         this.tag(BlockTags.ANVIL).add(Blocks.ANVIL, Blocks.CHIPPED_ANVIL, Blocks.DAMAGED_ANVIL);
         this.tag(BlockTags.SMALL_FLOWERS).add(Blocks.DANDELION, Blocks.POPPY, Blocks.BLUE_ORCHID, Blocks.ALLIUM, Blocks.AZURE_BLUET, Blocks.RED_TULIP, Blocks.ORANGE_TULIP, Blocks.WHITE_TULIP, Blocks.PINK_TULIP, Blocks.OXEYE_DAISY, Blocks.CORNFLOWER, Blocks.LILY_OF_THE_VALLEY, Blocks.WITHER_ROSE);
-        this.tag(BlockTags.ENDERMAN_HOLDABLE).addTag(BlockTags.SMALL_FLOWERS).add(Blocks.GRASS_BLOCK, Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.SAND, Blocks.RED_SAND, Blocks.GRAVEL, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM, Blocks.TNT, Blocks.CACTUS, Blocks.CLAY, Blocks.PUMPKIN, Blocks.CARVED_PUMPKIN, Blocks.MELON, Blocks.MYCELIUM, Blocks.NETHERRACK);
-        this.tag(BlockTags.FLOWER_POTS).add(Blocks.FLOWER_POT, Blocks.POTTED_POPPY, Blocks.POTTED_BLUE_ORCHID, Blocks.POTTED_ALLIUM, Blocks.POTTED_AZURE_BLUET, Blocks.POTTED_RED_TULIP, Blocks.POTTED_ORANGE_TULIP, Blocks.POTTED_WHITE_TULIP, Blocks.POTTED_PINK_TULIP, Blocks.POTTED_OXEYE_DAISY, Blocks.POTTED_DANDELION, Blocks.POTTED_OAK_SAPLING, Blocks.POTTED_SPRUCE_SAPLING, Blocks.POTTED_BIRCH_SAPLING, Blocks.POTTED_JUNGLE_SAPLING, Blocks.POTTED_ACACIA_SAPLING, Blocks.POTTED_DARK_OAK_SAPLING, Blocks.POTTED_RED_MUSHROOM, Blocks.POTTED_BROWN_MUSHROOM, Blocks.POTTED_DEAD_BUSH, Blocks.POTTED_FERN, Blocks.POTTED_CACTUS, Blocks.POTTED_CORNFLOWER, Blocks.POTTED_LILY_OF_THE_VALLEY, Blocks.POTTED_WITHER_ROSE, Blocks.POTTED_BAMBOO);
+        this.tag(BlockTags.ENDERMAN_HOLDABLE).addTag(BlockTags.SMALL_FLOWERS).add(Blocks.GRASS_BLOCK, Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.SAND, Blocks.RED_SAND, Blocks.GRAVEL, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM, Blocks.TNT, Blocks.CACTUS, Blocks.CLAY, Blocks.PUMPKIN, Blocks.CARVED_PUMPKIN, Blocks.MELON, Blocks.MYCELIUM, Blocks.CRIMSON_FUNGUS, Blocks.CRIMSON_NYLIUM, Blocks.CRIMSON_ROOTS, Blocks.WARPED_FUNGUS, Blocks.WARPED_NYLIUM, Blocks.WARPED_ROOTS);
+        this.tag(BlockTags.FLOWER_POTS).add(Blocks.FLOWER_POT, Blocks.POTTED_POPPY, Blocks.POTTED_BLUE_ORCHID, Blocks.POTTED_ALLIUM, Blocks.POTTED_AZURE_BLUET, Blocks.POTTED_RED_TULIP, Blocks.POTTED_ORANGE_TULIP, Blocks.POTTED_WHITE_TULIP, Blocks.POTTED_PINK_TULIP, Blocks.POTTED_OXEYE_DAISY, Blocks.POTTED_DANDELION, Blocks.POTTED_OAK_SAPLING, Blocks.POTTED_SPRUCE_SAPLING, Blocks.POTTED_BIRCH_SAPLING, Blocks.POTTED_JUNGLE_SAPLING, Blocks.POTTED_ACACIA_SAPLING, Blocks.POTTED_DARK_OAK_SAPLING, Blocks.POTTED_RED_MUSHROOM, Blocks.POTTED_BROWN_MUSHROOM, Blocks.POTTED_DEAD_BUSH, Blocks.POTTED_FERN, Blocks.POTTED_CACTUS, Blocks.POTTED_CORNFLOWER, Blocks.POTTED_LILY_OF_THE_VALLEY, Blocks.POTTED_WITHER_ROSE, Blocks.POTTED_BAMBOO, Blocks.POTTED_CRIMSON_FUNGUS, Blocks.POTTED_WARPED_FUNGUS, Blocks.POTTED_CRIMSON_ROOTS, Blocks.POTTED_WARPED_ROOTS);
         this.tag(BlockTags.BANNERS).add(Blocks.WHITE_BANNER, Blocks.ORANGE_BANNER, Blocks.MAGENTA_BANNER, Blocks.LIGHT_BLUE_BANNER, Blocks.YELLOW_BANNER, Blocks.LIME_BANNER, Blocks.PINK_BANNER, Blocks.GRAY_BANNER, Blocks.LIGHT_GRAY_BANNER, Blocks.CYAN_BANNER, Blocks.PURPLE_BANNER, Blocks.BLUE_BANNER, Blocks.BROWN_BANNER, Blocks.GREEN_BANNER, Blocks.RED_BANNER, Blocks.BLACK_BANNER, Blocks.WHITE_WALL_BANNER, Blocks.ORANGE_WALL_BANNER, Blocks.MAGENTA_WALL_BANNER, Blocks.LIGHT_BLUE_WALL_BANNER, Blocks.YELLOW_WALL_BANNER, Blocks.LIME_WALL_BANNER, Blocks.PINK_WALL_BANNER, Blocks.GRAY_WALL_BANNER, Blocks.LIGHT_GRAY_WALL_BANNER, Blocks.CYAN_WALL_BANNER, Blocks.PURPLE_WALL_BANNER, Blocks.BLUE_WALL_BANNER, Blocks.BROWN_WALL_BANNER, Blocks.GREEN_WALL_BANNER, Blocks.RED_WALL_BANNER, Blocks.BLACK_WALL_BANNER);
-        this.tag(BlockTags.WOODEN_PRESSURE_PLATES).add(Blocks.OAK_PRESSURE_PLATE, Blocks.SPRUCE_PRESSURE_PLATE, Blocks.BIRCH_PRESSURE_PLATE, Blocks.JUNGLE_PRESSURE_PLATE, Blocks.ACACIA_PRESSURE_PLATE, Blocks.DARK_OAK_PRESSURE_PLATE);
-        this.tag(BlockTags.STAIRS).add(Blocks.OAK_STAIRS, Blocks.COBBLESTONE_STAIRS, Blocks.SPRUCE_STAIRS, Blocks.SANDSTONE_STAIRS, Blocks.ACACIA_STAIRS, Blocks.JUNGLE_STAIRS, Blocks.BIRCH_STAIRS, Blocks.DARK_OAK_STAIRS, Blocks.NETHER_BRICK_STAIRS, Blocks.STONE_BRICK_STAIRS, Blocks.BRICK_STAIRS, Blocks.PURPUR_STAIRS, Blocks.QUARTZ_STAIRS, Blocks.RED_SANDSTONE_STAIRS, Blocks.PRISMARINE_BRICK_STAIRS, Blocks.PRISMARINE_STAIRS, Blocks.DARK_PRISMARINE_STAIRS, Blocks.POLISHED_GRANITE_STAIRS, Blocks.SMOOTH_RED_SANDSTONE_STAIRS, Blocks.MOSSY_STONE_BRICK_STAIRS, Blocks.POLISHED_DIORITE_STAIRS, Blocks.MOSSY_COBBLESTONE_STAIRS, Blocks.END_STONE_BRICK_STAIRS, Blocks.STONE_STAIRS, Blocks.SMOOTH_SANDSTONE_STAIRS, Blocks.SMOOTH_QUARTZ_STAIRS, Blocks.GRANITE_STAIRS, Blocks.ANDESITE_STAIRS, Blocks.RED_NETHER_BRICK_STAIRS, Blocks.POLISHED_ANDESITE_STAIRS, Blocks.DIORITE_STAIRS);
-        this.tag(BlockTags.SLABS).add(Blocks.STONE_SLAB, Blocks.SMOOTH_STONE_SLAB, Blocks.STONE_BRICK_SLAB, Blocks.SANDSTONE_SLAB, Blocks.ACACIA_SLAB, Blocks.BIRCH_SLAB, Blocks.DARK_OAK_SLAB, Blocks.JUNGLE_SLAB, Blocks.OAK_SLAB, Blocks.SPRUCE_SLAB, Blocks.PURPUR_SLAB, Blocks.QUARTZ_SLAB, Blocks.RED_SANDSTONE_SLAB, Blocks.BRICK_SLAB, Blocks.COBBLESTONE_SLAB, Blocks.NETHER_BRICK_SLAB, Blocks.PETRIFIED_OAK_SLAB, Blocks.PRISMARINE_SLAB, Blocks.PRISMARINE_BRICK_SLAB, Blocks.DARK_PRISMARINE_SLAB, Blocks.POLISHED_GRANITE_SLAB, Blocks.SMOOTH_RED_SANDSTONE_SLAB, Blocks.MOSSY_STONE_BRICK_SLAB, Blocks.POLISHED_DIORITE_SLAB, Blocks.MOSSY_COBBLESTONE_SLAB, Blocks.END_STONE_BRICK_SLAB, Blocks.SMOOTH_SANDSTONE_SLAB, Blocks.SMOOTH_QUARTZ_SLAB, Blocks.GRANITE_SLAB, Blocks.ANDESITE_SLAB, Blocks.RED_NETHER_BRICK_SLAB, Blocks.POLISHED_ANDESITE_SLAB, Blocks.DIORITE_SLAB, Blocks.CUT_SANDSTONE_SLAB, Blocks.CUT_RED_SANDSTONE_SLAB);
-        this.tag(BlockTags.WALLS).add(Blocks.COBBLESTONE_WALL, Blocks.MOSSY_COBBLESTONE_WALL, Blocks.BRICK_WALL, Blocks.PRISMARINE_WALL, Blocks.RED_SANDSTONE_WALL, Blocks.MOSSY_STONE_BRICK_WALL, Blocks.GRANITE_WALL, Blocks.STONE_BRICK_WALL, Blocks.NETHER_BRICK_WALL, Blocks.ANDESITE_WALL, Blocks.RED_NETHER_BRICK_WALL, Blocks.SANDSTONE_WALL, Blocks.END_STONE_BRICK_WALL, Blocks.DIORITE_WALL);
+        this.tag(BlockTags.WOODEN_PRESSURE_PLATES).add(Blocks.OAK_PRESSURE_PLATE, Blocks.SPRUCE_PRESSURE_PLATE, Blocks.BIRCH_PRESSURE_PLATE, Blocks.JUNGLE_PRESSURE_PLATE, Blocks.ACACIA_PRESSURE_PLATE, Blocks.DARK_OAK_PRESSURE_PLATE, Blocks.CRIMSON_PRESSURE_PLATE, Blocks.WARPED_PRESSURE_PLATE);
+        this.tag(BlockTags.STONE_PRESSURE_PLATES).add(Blocks.STONE_PRESSURE_PLATE, Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE);
+        this.tag(BlockTags.PRESSURE_PLATES).add(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE, Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE).addTag(BlockTags.WOODEN_PRESSURE_PLATES).addTag(BlockTags.STONE_PRESSURE_PLATES);
+        this.tag(BlockTags.STAIRS).addTag(BlockTags.WOODEN_STAIRS).add(Blocks.COBBLESTONE_STAIRS, Blocks.SANDSTONE_STAIRS, Blocks.NETHER_BRICK_STAIRS, Blocks.STONE_BRICK_STAIRS, Blocks.BRICK_STAIRS, Blocks.PURPUR_STAIRS, Blocks.QUARTZ_STAIRS, Blocks.RED_SANDSTONE_STAIRS, Blocks.PRISMARINE_BRICK_STAIRS, Blocks.PRISMARINE_STAIRS, Blocks.DARK_PRISMARINE_STAIRS, Blocks.POLISHED_GRANITE_STAIRS, Blocks.SMOOTH_RED_SANDSTONE_STAIRS, Blocks.MOSSY_STONE_BRICK_STAIRS, Blocks.POLISHED_DIORITE_STAIRS, Blocks.MOSSY_COBBLESTONE_STAIRS, Blocks.END_STONE_BRICK_STAIRS, Blocks.STONE_STAIRS, Blocks.SMOOTH_SANDSTONE_STAIRS, Blocks.SMOOTH_QUARTZ_STAIRS, Blocks.GRANITE_STAIRS, Blocks.ANDESITE_STAIRS, Blocks.RED_NETHER_BRICK_STAIRS, Blocks.POLISHED_ANDESITE_STAIRS, Blocks.DIORITE_STAIRS, Blocks.BLACKSTONE_STAIRS, Blocks.POLISHED_BLACKSTONE_BRICK_STAIRS, Blocks.POLISHED_BLACKSTONE_STAIRS);
+        this.tag(BlockTags.SLABS).addTag(BlockTags.WOODEN_SLABS).add(Blocks.STONE_SLAB, Blocks.SMOOTH_STONE_SLAB, Blocks.STONE_BRICK_SLAB, Blocks.SANDSTONE_SLAB, Blocks.PURPUR_SLAB, Blocks.QUARTZ_SLAB, Blocks.RED_SANDSTONE_SLAB, Blocks.BRICK_SLAB, Blocks.COBBLESTONE_SLAB, Blocks.NETHER_BRICK_SLAB, Blocks.PETRIFIED_OAK_SLAB, Blocks.PRISMARINE_SLAB, Blocks.PRISMARINE_BRICK_SLAB, Blocks.DARK_PRISMARINE_SLAB, Blocks.POLISHED_GRANITE_SLAB, Blocks.SMOOTH_RED_SANDSTONE_SLAB, Blocks.MOSSY_STONE_BRICK_SLAB, Blocks.POLISHED_DIORITE_SLAB, Blocks.MOSSY_COBBLESTONE_SLAB, Blocks.END_STONE_BRICK_SLAB, Blocks.SMOOTH_SANDSTONE_SLAB, Blocks.SMOOTH_QUARTZ_SLAB, Blocks.GRANITE_SLAB, Blocks.ANDESITE_SLAB, Blocks.RED_NETHER_BRICK_SLAB, Blocks.POLISHED_ANDESITE_SLAB, Blocks.DIORITE_SLAB, Blocks.CUT_SANDSTONE_SLAB, Blocks.CUT_RED_SANDSTONE_SLAB, Blocks.BLACKSTONE_SLAB, Blocks.POLISHED_BLACKSTONE_BRICK_SLAB, Blocks.POLISHED_BLACKSTONE_SLAB);
+        this.tag(BlockTags.WALLS).add(Blocks.COBBLESTONE_WALL, Blocks.MOSSY_COBBLESTONE_WALL, Blocks.BRICK_WALL, Blocks.PRISMARINE_WALL, Blocks.RED_SANDSTONE_WALL, Blocks.MOSSY_STONE_BRICK_WALL, Blocks.GRANITE_WALL, Blocks.STONE_BRICK_WALL, Blocks.NETHER_BRICK_WALL, Blocks.ANDESITE_WALL, Blocks.RED_NETHER_BRICK_WALL, Blocks.SANDSTONE_WALL, Blocks.END_STONE_BRICK_WALL, Blocks.DIORITE_WALL, Blocks.BLACKSTONE_WALL, Blocks.POLISHED_BLACKSTONE_BRICK_WALL, Blocks.POLISHED_BLACKSTONE_WALL);
         this.tag(BlockTags.CORAL_PLANTS).add(Blocks.TUBE_CORAL, Blocks.BRAIN_CORAL, Blocks.BUBBLE_CORAL, Blocks.FIRE_CORAL, Blocks.HORN_CORAL);
         this.tag(BlockTags.CORALS).addTag(BlockTags.CORAL_PLANTS).add(Blocks.TUBE_CORAL_FAN, Blocks.BRAIN_CORAL_FAN, Blocks.BUBBLE_CORAL_FAN, Blocks.FIRE_CORAL_FAN, Blocks.HORN_CORAL_FAN);
         this.tag(BlockTags.WALL_CORALS).add(Blocks.TUBE_CORAL_WALL_FAN, Blocks.BRAIN_CORAL_WALL_FAN, Blocks.BUBBLE_CORAL_WALL_FAN, Blocks.FIRE_CORAL_WALL_FAN, Blocks.HORN_CORAL_WALL_FAN);
@@ -54,17 +58,18 @@ public class BlockTagsProvider extends TagsProvider<Block> {
         this.tag(BlockTags.VALID_SPAWN).add(Blocks.GRASS_BLOCK, Blocks.PODZOL);
         this.tag(BlockTags.LEAVES).add(Blocks.JUNGLE_LEAVES, Blocks.OAK_LEAVES, Blocks.SPRUCE_LEAVES, Blocks.DARK_OAK_LEAVES, Blocks.ACACIA_LEAVES, Blocks.BIRCH_LEAVES);
         this.tag(BlockTags.IMPERMEABLE).add(Blocks.GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS, Blocks.LIME_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.RED_STAINED_GLASS, Blocks.BLACK_STAINED_GLASS);
-        this.tag(BlockTags.WOODEN_TRAPDOORS).add(Blocks.ACACIA_TRAPDOOR, Blocks.BIRCH_TRAPDOOR, Blocks.DARK_OAK_TRAPDOOR, Blocks.JUNGLE_TRAPDOOR, Blocks.OAK_TRAPDOOR, Blocks.SPRUCE_TRAPDOOR);
+        this.tag(BlockTags.WOODEN_TRAPDOORS).add(Blocks.ACACIA_TRAPDOOR, Blocks.BIRCH_TRAPDOOR, Blocks.DARK_OAK_TRAPDOOR, Blocks.JUNGLE_TRAPDOOR, Blocks.OAK_TRAPDOOR, Blocks.SPRUCE_TRAPDOOR, Blocks.CRIMSON_TRAPDOOR, Blocks.WARPED_TRAPDOOR);
         this.tag(BlockTags.TRAPDOORS).addTag(BlockTags.WOODEN_TRAPDOORS).add(Blocks.IRON_TRAPDOOR);
         this.tag(BlockTags.UNDERWATER_BONEMEALS).add(Blocks.SEAGRASS).addTag(BlockTags.CORALS).addTag(BlockTags.WALL_CORALS);
-        this.tag(BlockTags.BAMBOO_PLANTABLE_ON).add(Blocks.BAMBOO).add(Blocks.BAMBOO_SAPLING).add(Blocks.GRAVEL).addTag(BlockTags.SAND).add(Blocks.DIRT).add(Blocks.GRASS_BLOCK).add(Blocks.PODZOL).add(Blocks.COARSE_DIRT).add(Blocks.MYCELIUM);
-        this.tag(BlockTags.STANDING_SIGNS).add(Blocks.OAK_SIGN, Blocks.SPRUCE_SIGN, Blocks.BIRCH_SIGN, Blocks.ACACIA_SIGN, Blocks.JUNGLE_SIGN, Blocks.DARK_OAK_SIGN);
-        this.tag(BlockTags.WALL_SIGNS).add(Blocks.OAK_WALL_SIGN, Blocks.SPRUCE_WALL_SIGN, Blocks.BIRCH_WALL_SIGN, Blocks.ACACIA_WALL_SIGN, Blocks.JUNGLE_WALL_SIGN, Blocks.DARK_OAK_WALL_SIGN);
+        this.tag(BlockTags.BAMBOO_PLANTABLE_ON).addTag(BlockTags.SAND).add(Blocks.BAMBOO, Blocks.BAMBOO_SAPLING, Blocks.GRAVEL, Blocks.DIRT, Blocks.GRASS_BLOCK, Blocks.PODZOL, Blocks.COARSE_DIRT, Blocks.MYCELIUM);
+        this.tag(BlockTags.STANDING_SIGNS).add(Blocks.OAK_SIGN, Blocks.SPRUCE_SIGN, Blocks.BIRCH_SIGN, Blocks.ACACIA_SIGN, Blocks.JUNGLE_SIGN, Blocks.DARK_OAK_SIGN, Blocks.CRIMSON_SIGN, Blocks.WARPED_SIGN);
+        this.tag(BlockTags.WALL_SIGNS).add(Blocks.OAK_WALL_SIGN, Blocks.SPRUCE_WALL_SIGN, Blocks.BIRCH_WALL_SIGN, Blocks.ACACIA_WALL_SIGN, Blocks.JUNGLE_WALL_SIGN, Blocks.DARK_OAK_WALL_SIGN, Blocks.CRIMSON_WALL_SIGN, Blocks.WARPED_WALL_SIGN);
         this.tag(BlockTags.SIGNS).addTag(BlockTags.STANDING_SIGNS).addTag(BlockTags.WALL_SIGNS);
         this.tag(BlockTags.BEDS).add(Blocks.RED_BED, Blocks.BLACK_BED, Blocks.BLUE_BED, Blocks.BROWN_BED, Blocks.CYAN_BED, Blocks.GRAY_BED, Blocks.GREEN_BED, Blocks.LIGHT_BLUE_BED, Blocks.LIGHT_GRAY_BED, Blocks.LIME_BED, Blocks.MAGENTA_BED, Blocks.ORANGE_BED, Blocks.PINK_BED, Blocks.PURPLE_BED, Blocks.WHITE_BED, Blocks.YELLOW_BED);
         this.tag(BlockTags.FENCES).addTag(BlockTags.WOODEN_FENCES).add(Blocks.NETHER_BRICK_FENCE);
-        this.tag(BlockTags.DRAGON_IMMUNE).add(Blocks.BARRIER, Blocks.BEDROCK, Blocks.END_PORTAL, Blocks.END_PORTAL_FRAME, Blocks.END_GATEWAY, Blocks.COMMAND_BLOCK, Blocks.REPEATING_COMMAND_BLOCK, Blocks.CHAIN_COMMAND_BLOCK, Blocks.STRUCTURE_BLOCK, Blocks.JIGSAW, Blocks.MOVING_PISTON, Blocks.OBSIDIAN, Blocks.END_STONE, Blocks.IRON_BARS);
+        this.tag(BlockTags.DRAGON_IMMUNE).add(Blocks.BARRIER, Blocks.BEDROCK, Blocks.END_PORTAL, Blocks.END_PORTAL_FRAME, Blocks.END_GATEWAY, Blocks.COMMAND_BLOCK, Blocks.REPEATING_COMMAND_BLOCK, Blocks.CHAIN_COMMAND_BLOCK, Blocks.STRUCTURE_BLOCK, Blocks.JIGSAW, Blocks.MOVING_PISTON, Blocks.OBSIDIAN, Blocks.CRYING_OBSIDIAN, Blocks.END_STONE, Blocks.IRON_BARS, Blocks.RESPAWN_ANCHOR);
         this.tag(BlockTags.WITHER_IMMUNE).add(Blocks.BARRIER, Blocks.BEDROCK, Blocks.END_PORTAL, Blocks.END_PORTAL_FRAME, Blocks.END_GATEWAY, Blocks.COMMAND_BLOCK, Blocks.REPEATING_COMMAND_BLOCK, Blocks.CHAIN_COMMAND_BLOCK, Blocks.STRUCTURE_BLOCK, Blocks.JIGSAW, Blocks.MOVING_PISTON);
+        this.tag(BlockTags.WITHER_SUMMON_BASE_BLOCKS).add(Blocks.SOUL_SAND, Blocks.SOUL_SOIL);
         this.tag(BlockTags.TALL_FLOWERS).add(Blocks.SUNFLOWER, Blocks.LILAC, Blocks.PEONY, Blocks.ROSE_BUSH);
         this.tag(BlockTags.FLOWERS).addTag(BlockTags.SMALL_FLOWERS).addTag(BlockTags.TALL_FLOWERS);
         this.tag(BlockTags.BEEHIVES).add(Blocks.BEE_NEST, Blocks.BEEHIVE);
@@ -72,20 +77,36 @@ public class BlockTagsProvider extends TagsProvider<Block> {
         this.tag(BlockTags.BEE_GROWABLES).addTag(BlockTags.CROPS).add(Blocks.SWEET_BERRY_BUSH);
         this.tag(BlockTags.SHULKER_BOXES).add(Blocks.SHULKER_BOX, Blocks.BLACK_SHULKER_BOX, Blocks.BLUE_SHULKER_BOX, Blocks.BROWN_SHULKER_BOX, Blocks.CYAN_SHULKER_BOX, Blocks.GRAY_SHULKER_BOX, Blocks.GREEN_SHULKER_BOX, Blocks.LIGHT_BLUE_SHULKER_BOX, Blocks.LIGHT_GRAY_SHULKER_BOX, Blocks.LIME_SHULKER_BOX, Blocks.MAGENTA_SHULKER_BOX, Blocks.ORANGE_SHULKER_BOX, Blocks.PINK_SHULKER_BOX, Blocks.PURPLE_SHULKER_BOX, Blocks.RED_SHULKER_BOX, Blocks.WHITE_SHULKER_BOX, Blocks.YELLOW_SHULKER_BOX);
         this.tag(BlockTags.PORTALS).add(Blocks.NETHER_PORTAL, Blocks.END_PORTAL, Blocks.END_GATEWAY);
+        this.tag(BlockTags.FIRE).add(Blocks.FIRE, Blocks.SOUL_FIRE);
+        this.tag(BlockTags.NYLIUM).add(Blocks.CRIMSON_NYLIUM, Blocks.WARPED_NYLIUM);
+        this.tag(BlockTags.WART_BLOCKS).add(Blocks.NETHER_WART_BLOCK, Blocks.WARPED_WART_BLOCK);
+        this.tag(BlockTags.BEACON_BASE_BLOCKS).add(Blocks.NETHERITE_BLOCK, Blocks.EMERALD_BLOCK, Blocks.DIAMOND_BLOCK, Blocks.GOLD_BLOCK, Blocks.IRON_BLOCK);
+        this.tag(BlockTags.SOUL_SPEED_BLOCKS).add(Blocks.SOUL_SAND, Blocks.SOUL_SOIL);
+        this.tag(BlockTags.WALL_POST_OVERRIDE).add(Blocks.TORCH, Blocks.SOUL_TORCH, Blocks.REDSTONE_TORCH, Blocks.TRIPWIRE).addTag(BlockTags.SIGNS).addTag(BlockTags.BANNERS).addTag(BlockTags.PRESSURE_PLATES);
+        this.tag(BlockTags.CLIMBABLE).add(Blocks.LADDER, Blocks.VINE, Blocks.SCAFFOLDING, Blocks.WEEPING_VINES, Blocks.WEEPING_VINES_PLANT, Blocks.TWISTING_VINES, Blocks.TWISTING_VINES_PLANT);
+        this.tag(BlockTags.PIGLIN_REPELLENTS).add(Blocks.SOUL_FIRE).add(Blocks.SOUL_TORCH).add(Blocks.SOUL_LANTERN).add(Blocks.SOUL_WALL_TORCH).add(Blocks.SOUL_CAMPFIRE);
+        this.tag(BlockTags.HOGLIN_REPELLENTS).add(Blocks.WARPED_FUNGUS).add(Blocks.POTTED_WARPED_FUNGUS).add(Blocks.NETHER_PORTAL).add(Blocks.RESPAWN_ANCHOR);
+        this.tag(BlockTags.GOLD_ORES).add(Blocks.GOLD_ORE, Blocks.NETHER_GOLD_ORE);
+        this.tag(BlockTags.SOUL_FIRE_BASE_BLOCKS).add(Blocks.SOUL_SAND, Blocks.SOUL_SOIL);
+        this.tag(BlockTags.NON_FLAMMABLE_WOOD).add(Blocks.WARPED_STEM, Blocks.STRIPPED_WARPED_STEM, Blocks.WARPED_HYPHAE, Blocks.STRIPPED_WARPED_HYPHAE, Blocks.CRIMSON_STEM, Blocks.STRIPPED_CRIMSON_STEM, Blocks.CRIMSON_HYPHAE, Blocks.STRIPPED_CRIMSON_HYPHAE, Blocks.CRIMSON_PLANKS, Blocks.WARPED_PLANKS, Blocks.CRIMSON_SLAB, Blocks.WARPED_SLAB, Blocks.CRIMSON_PRESSURE_PLATE, Blocks.WARPED_PRESSURE_PLATE, Blocks.CRIMSON_FENCE, Blocks.WARPED_FENCE, Blocks.CRIMSON_TRAPDOOR, Blocks.WARPED_TRAPDOOR, Blocks.CRIMSON_FENCE_GATE, Blocks.WARPED_FENCE_GATE, Blocks.CRIMSON_STAIRS, Blocks.WARPED_STAIRS, Blocks.CRIMSON_BUTTON, Blocks.WARPED_BUTTON, Blocks.CRIMSON_DOOR, Blocks.WARPED_DOOR, Blocks.CRIMSON_SIGN, Blocks.WARPED_SIGN, Blocks.CRIMSON_WALL_SIGN, Blocks.WARPED_WALL_SIGN);
+        this.tag(BlockTags.STRIDER_WARM_BLOCKS).add(Blocks.LAVA);
+        this.tag(BlockTags.CAMPFIRES).add(Blocks.CAMPFIRE, Blocks.SOUL_CAMPFIRE);
+        this.tag(BlockTags.GUARDED_BY_PIGLINS).add(Blocks.GOLD_BLOCK, Blocks.BARREL, Blocks.CHEST, Blocks.ENDER_CHEST, Blocks.GILDED_BLACKSTONE, Blocks.TRAPPED_CHEST).addTag(BlockTags.SHULKER_BOXES).addTag(BlockTags.GOLD_ORES);
+        this.tag(BlockTags.PREVENT_MOB_SPAWNING_INSIDE).addTag(BlockTags.RAILS);
+        this.tag(BlockTags.FENCE_GATES).add(Blocks.ACACIA_FENCE_GATE, Blocks.BIRCH_FENCE_GATE, Blocks.DARK_OAK_FENCE_GATE, Blocks.JUNGLE_FENCE_GATE, Blocks.OAK_FENCE_GATE, Blocks.SPRUCE_FENCE_GATE, Blocks.CRIMSON_FENCE_GATE, Blocks.WARPED_FENCE_GATE);
+        this.tag(BlockTags.UNSTABLE_BOTTOM_CENTER).addTag(BlockTags.FENCE_GATES);
+        this.tag(BlockTags.INFINIBURN_OVERWORLD).add(Blocks.NETHERRACK, Blocks.MAGMA_BLOCK);
+        this.tag(BlockTags.INFINIBURN_NETHER).addTag(BlockTags.INFINIBURN_OVERWORLD);
+        this.tag(BlockTags.INFINIBURN_END).addTag(BlockTags.INFINIBURN_OVERWORLD).add(Blocks.BEDROCK);
     }
     
     @Override
-    protected Path getPath(final ResourceLocation sm) {
-        return this.generator.getOutputFolder().resolve("data/" + sm.getNamespace() + "/tags/blocks/" + sm.getPath() + ".json");
+    protected Path getPath(final ResourceLocation uh) {
+        return this.generator.getOutputFolder().resolve("data/" + uh.getNamespace() + "/tags/blocks/" + uh.getPath() + ".json");
     }
     
     @Override
     public String getName() {
         return "Block Tags";
     }
-    
-    @Override
-    protected void useTags(final TagCollection<Block> aba) {
-        BlockTags.reset(aba);
-    }
 }
diff --git a/src/net/minecraft/data/tags/EntityTypeTagsProvider.java b/src/net/minecraft/data/tags/EntityTypeTagsProvider.java
index 6f2049c..9c2cd60 100644
--- a/src/net/minecraft/data/tags/EntityTypeTagsProvider.java
+++ b/src/net/minecraft/data/tags/EntityTypeTagsProvider.java
@@ -1,6 +1,5 @@
 package net.minecraft.data.tags;
 
-import net.minecraft.tags.TagCollection;
 import java.nio.file.Path;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.animal.Bee;
@@ -11,30 +10,26 @@ import net.minecraft.data.DataGenerator;
 import net.minecraft.world.entity.EntityType;
 
 public class EntityTypeTagsProvider extends TagsProvider<EntityType<?>> {
-    public EntityTypeTagsProvider(final DataGenerator gy) {
-        super(gy, Registry.ENTITY_TYPE);
+    public EntityTypeTagsProvider(final DataGenerator hk) {
+        super(hk, Registry.ENTITY_TYPE);
     }
     
     @Override
     protected void addTags() {
         this.tag(EntityTypeTags.SKELETONS).add(EntityType.SKELETON, EntityType.STRAY, EntityType.WITHER_SKELETON);
         this.tag(EntityTypeTags.RAIDERS).add(EntityType.EVOKER, EntityType.PILLAGER, EntityType.RAVAGER, EntityType.VINDICATOR, EntityType.ILLUSIONER, EntityType.WITCH);
-        ((TagsProvider<EntityType<Bee>>)this).tag((Tag<EntityType<Bee>>)EntityTypeTags.BEEHIVE_INHABITORS).add(EntityType.BEE);
+        ((TagsProvider<EntityType<Bee>>)this).tag((Tag.Named<EntityType<Bee>>)EntityTypeTags.BEEHIVE_INHABITORS).add(EntityType.BEE);
         this.tag(EntityTypeTags.ARROWS).add(EntityType.ARROW, EntityType.SPECTRAL_ARROW);
+        this.tag(EntityTypeTags.IMPACT_PROJECTILES).addTag(EntityTypeTags.ARROWS).add(EntityType.SNOWBALL, EntityType.FIREBALL, EntityType.SMALL_FIREBALL, EntityType.EGG, EntityType.TRIDENT, EntityType.DRAGON_FIREBALL, EntityType.WITHER_SKULL);
     }
     
     @Override
-    protected Path getPath(final ResourceLocation sm) {
-        return this.generator.getOutputFolder().resolve("data/" + sm.getNamespace() + "/tags/entity_types/" + sm.getPath() + ".json");
+    protected Path getPath(final ResourceLocation uh) {
+        return this.generator.getOutputFolder().resolve("data/" + uh.getNamespace() + "/tags/entity_types/" + uh.getPath() + ".json");
     }
     
     @Override
     public String getName() {
         return "Entity Type Tags";
     }
-    
-    @Override
-    protected void useTags(final TagCollection<EntityType<?>> aba) {
-        EntityTypeTags.reset(aba);
-    }
 }
diff --git a/src/net/minecraft/data/tags/FluidTagsProvider.java b/src/net/minecraft/data/tags/FluidTagsProvider.java
index d5c2a0d..fedc808 100644
--- a/src/net/minecraft/data/tags/FluidTagsProvider.java
+++ b/src/net/minecraft/data/tags/FluidTagsProvider.java
@@ -1,6 +1,5 @@
 package net.minecraft.data.tags;
 
-import net.minecraft.tags.TagCollection;
 import java.nio.file.Path;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.material.Fluids;
@@ -10,8 +9,8 @@ import net.minecraft.data.DataGenerator;
 import net.minecraft.world.level.material.Fluid;
 
 public class FluidTagsProvider extends TagsProvider<Fluid> {
-    public FluidTagsProvider(final DataGenerator gy) {
-        super(gy, Registry.FLUID);
+    public FluidTagsProvider(final DataGenerator hk) {
+        super(hk, Registry.FLUID);
     }
     
     @Override
@@ -21,17 +20,12 @@ public class FluidTagsProvider extends TagsProvider<Fluid> {
     }
     
     @Override
-    protected Path getPath(final ResourceLocation sm) {
-        return this.generator.getOutputFolder().resolve("data/" + sm.getNamespace() + "/tags/fluids/" + sm.getPath() + ".json");
+    protected Path getPath(final ResourceLocation uh) {
+        return this.generator.getOutputFolder().resolve("data/" + uh.getNamespace() + "/tags/fluids/" + uh.getPath() + ".json");
     }
     
     @Override
     public String getName() {
         return "Fluid Tags";
     }
-    
-    @Override
-    protected void useTags(final TagCollection<Fluid> aba) {
-        FluidTags.reset(aba);
-    }
 }
diff --git a/src/net/minecraft/data/tags/ItemTagsProvider.java b/src/net/minecraft/data/tags/ItemTagsProvider.java
index 73df660..5814b0b 100644
--- a/src/net/minecraft/data/tags/ItemTagsProvider.java
+++ b/src/net/minecraft/data/tags/ItemTagsProvider.java
@@ -1,28 +1,24 @@
 package net.minecraft.data.tags;
 
-import org.apache.logging.log4j.LogManager;
-import net.minecraft.tags.TagCollection;
 import java.nio.file.Path;
 import net.minecraft.resources.ResourceLocation;
-import java.util.List;
-import java.util.Collection;
-import com.google.common.collect.Lists;
-import java.util.Iterator;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.tags.Tag;
+import java.util.function.Consumer;
 import net.minecraft.world.item.Items;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.core.Registry;
 import net.minecraft.data.DataGenerator;
-import org.apache.logging.log4j.Logger;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import java.util.function.Function;
 import net.minecraft.world.item.Item;
 
 public class ItemTagsProvider extends TagsProvider<Item> {
-    private static final Logger LOGGER;
+    private final Function<Tag.Named<Block>, Tag.Builder> blockTags;
     
-    public ItemTagsProvider(final DataGenerator gy) {
-        super(gy, Registry.ITEM);
+    public ItemTagsProvider(final DataGenerator hk, final BlockTagsProvider jr) {
+        super(hk, Registry.ITEM);
+        this.blockTags = jr::getOrCreateRawBuilder;
     }
     
     @Override
@@ -46,6 +42,9 @@ public class ItemTagsProvider extends TagsProvider<Item> {
         this.copy(BlockTags.ACACIA_LOGS, ItemTags.ACACIA_LOGS);
         this.copy(BlockTags.SPRUCE_LOGS, ItemTags.SPRUCE_LOGS);
         this.copy(BlockTags.JUNGLE_LOGS, ItemTags.JUNGLE_LOGS);
+        this.copy(BlockTags.CRIMSON_STEMS, ItemTags.CRIMSON_STEMS);
+        this.copy(BlockTags.WARPED_STEMS, ItemTags.WARPED_STEMS);
+        this.copy(BlockTags.LOGS_THAT_BURN, ItemTags.LOGS_THAT_BURN);
         this.copy(BlockTags.LOGS, ItemTags.LOGS);
         this.copy(BlockTags.SAND, ItemTags.SAND);
         this.copy(BlockTags.SLABS, ItemTags.SLABS);
@@ -61,60 +60,38 @@ public class ItemTagsProvider extends TagsProvider<Item> {
         this.copy(BlockTags.FENCES, ItemTags.FENCES);
         this.copy(BlockTags.TALL_FLOWERS, ItemTags.TALL_FLOWERS);
         this.copy(BlockTags.FLOWERS, ItemTags.FLOWERS);
+        this.copy(BlockTags.GOLD_ORES, ItemTags.GOLD_ORES);
+        this.copy(BlockTags.SOUL_FIRE_BASE_BLOCKS, ItemTags.SOUL_FIRE_BASE_BLOCKS);
         this.tag(ItemTags.BANNERS).add(Items.WHITE_BANNER, Items.ORANGE_BANNER, Items.MAGENTA_BANNER, Items.LIGHT_BLUE_BANNER, Items.YELLOW_BANNER, Items.LIME_BANNER, Items.PINK_BANNER, Items.GRAY_BANNER, Items.LIGHT_GRAY_BANNER, Items.CYAN_BANNER, Items.PURPLE_BANNER, Items.BLUE_BANNER, Items.BROWN_BANNER, Items.GREEN_BANNER, Items.RED_BANNER, Items.BLACK_BANNER);
         this.tag(ItemTags.BOATS).add(Items.OAK_BOAT, Items.SPRUCE_BOAT, Items.BIRCH_BOAT, Items.JUNGLE_BOAT, Items.ACACIA_BOAT, Items.DARK_OAK_BOAT);
         this.tag(ItemTags.FISHES).add(Items.COD, Items.COOKED_COD, Items.SALMON, Items.COOKED_SALMON, Items.PUFFERFISH, Items.TROPICAL_FISH);
         this.copy(BlockTags.STANDING_SIGNS, ItemTags.SIGNS);
-        this.tag(ItemTags.MUSIC_DISCS).add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, Items.MUSIC_DISC_11, Items.MUSIC_DISC_WAIT);
+        this.tag(ItemTags.CREEPER_DROP_MUSIC_DISCS).add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, Items.MUSIC_DISC_11, Items.MUSIC_DISC_WAIT);
+        this.tag(ItemTags.MUSIC_DISCS).addTag(ItemTags.CREEPER_DROP_MUSIC_DISCS).add(Items.MUSIC_DISC_PIGSTEP);
         this.tag(ItemTags.COALS).add(Items.COAL, Items.CHARCOAL);
         this.tag(ItemTags.ARROWS).add(Items.ARROW, Items.TIPPED_ARROW, Items.SPECTRAL_ARROW);
         this.tag(ItemTags.LECTERN_BOOKS).add(Items.WRITTEN_BOOK, Items.WRITABLE_BOOK);
+        this.tag(ItemTags.BEACON_PAYMENT_ITEMS).add(Items.NETHERITE_INGOT, Items.EMERALD, Items.DIAMOND, Items.GOLD_INGOT, Items.IRON_INGOT);
+        this.tag(ItemTags.PIGLIN_REPELLENTS).add(Items.SOUL_TORCH).add(Items.SOUL_LANTERN).add(Items.SOUL_CAMPFIRE);
+        this.tag(ItemTags.PIGLIN_LOVED).addTag(ItemTags.GOLD_ORES).add(Items.GOLD_BLOCK, Items.GILDED_BLACKSTONE, Items.LIGHT_WEIGHTED_PRESSURE_PLATE, Items.GOLD_INGOT, Items.BELL, Items.CLOCK, Items.GOLDEN_CARROT, Items.GLISTERING_MELON_SLICE, Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE, Items.GOLDEN_HELMET, Items.GOLDEN_CHESTPLATE, Items.GOLDEN_LEGGINGS, Items.GOLDEN_BOOTS, Items.GOLDEN_HORSE_ARMOR, Items.GOLDEN_SWORD, Items.GOLDEN_PICKAXE, Items.GOLDEN_SHOVEL, Items.GOLDEN_AXE, Items.GOLDEN_HOE);
+        this.tag(ItemTags.NON_FLAMMABLE_WOOD).add(Items.WARPED_STEM, Items.STRIPPED_WARPED_STEM, Items.WARPED_HYPHAE, Items.STRIPPED_WARPED_HYPHAE, Items.CRIMSON_STEM, Items.STRIPPED_CRIMSON_STEM, Items.CRIMSON_HYPHAE, Items.STRIPPED_CRIMSON_HYPHAE, Items.CRIMSON_PLANKS, Items.WARPED_PLANKS, Items.CRIMSON_SLAB, Items.WARPED_SLAB, Items.CRIMSON_PRESSURE_PLATE, Items.WARPED_PRESSURE_PLATE, Items.CRIMSON_FENCE, Items.WARPED_FENCE, Items.CRIMSON_TRAPDOOR, Items.WARPED_TRAPDOOR, Items.CRIMSON_FENCE_GATE, Items.WARPED_FENCE_GATE, Items.CRIMSON_STAIRS, Items.WARPED_STAIRS, Items.CRIMSON_BUTTON, Items.WARPED_BUTTON, Items.CRIMSON_DOOR, Items.WARPED_DOOR, Items.CRIMSON_SIGN, Items.WARPED_SIGN);
+        this.tag(ItemTags.STONE_TOOL_MATERIALS).add(Items.COBBLESTONE, Items.BLACKSTONE);
+        this.tag(ItemTags.FURNACE_MATERIALS).add(Items.COBBLESTONE, Items.BLACKSTONE);
     }
     
-    protected void copy(final Tag<Block> aaz1, final Tag<Item> aaz2) {
-        final Tag.Builder<Item> a4 = this.tag(aaz2);
-        for (final Tag.Entry<Block> b6 : aaz1.getSource()) {
-            final Tag.Entry<Item> b7 = this.copy(b6);
-            a4.add(b7);
-        }
-    }
-    
-    private Tag.Entry<Item> copy(final Tag.Entry<Block> b) {
-        if (b instanceof Tag.TagEntry) {
-            return new Tag.TagEntry<Item>(((Tag.TagEntry)b).getId());
-        }
-        if (b instanceof Tag.ValuesEntry) {
-            final List<Item> list3 = Lists.newArrayList();
-            for (final Block bph5 : ((Tag.ValuesEntry)b).getValues()) {
-                final Item bei6 = bph5.asItem();
-                if (bei6 == Items.AIR) {
-                    ItemTagsProvider.LOGGER.warn("Itemless block copied to item tag: {}", Registry.BLOCK.getKey(bph5));
-                }
-                else {
-                    list3.add(bei6);
-                }
-            }
-            return new Tag.ValuesEntry<Item>(list3);
-        }
-        throw new UnsupportedOperationException("Unknown tag entry " + b);
+    protected void copy(final Tag.Named<Block> e1, final Tag.Named<Item> e2) {
+        final Tag.Builder a4 = this.getOrCreateRawBuilder(e2);
+        final Tag.Builder a5 = this.blockTags.apply(e1);
+        a5.getEntries().forEach(a4::add);
     }
     
     @Override
-    protected Path getPath(final ResourceLocation sm) {
-        return this.generator.getOutputFolder().resolve("data/" + sm.getNamespace() + "/tags/items/" + sm.getPath() + ".json");
+    protected Path getPath(final ResourceLocation uh) {
+        return this.generator.getOutputFolder().resolve("data/" + uh.getNamespace() + "/tags/items/" + uh.getPath() + ".json");
     }
     
     @Override
     public String getName() {
         return "Item Tags";
     }
-    
-    @Override
-    protected void useTags(final TagCollection<Item> aba) {
-        ItemTags.reset(aba);
-    }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-    }
 }
diff --git a/src/net/minecraft/data/tags/TagsProvider.java b/src/net/minecraft/data/tags/TagsProvider.java
index 1f21e2a..1d2ddb9 100644
--- a/src/net/minecraft/data/tags/TagsProvider.java
+++ b/src/net/minecraft/data/tags/TagsProvider.java
@@ -1,5 +1,6 @@
 package net.minecraft.data.tags;
 
+import java.util.stream.Stream;
 import com.google.gson.GsonBuilder;
 import org.apache.logging.log4j.LogManager;
 import java.io.BufferedWriter;
@@ -10,16 +11,17 @@ import java.nio.file.OpenOption;
 import java.nio.file.attribute.FileAttribute;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
-import java.util.Objects;
 import com.google.gson.JsonElement;
 import java.util.function.Function;
+import java.util.Objects;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.TagCollection;
-import java.util.Optional;
+import java.util.List;
+import net.minecraft.tags.SetTag;
 import net.minecraft.data.HashCache;
 import com.google.common.collect.Maps;
 import net.minecraft.tags.Tag;
+import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
 import net.minecraft.core.Registry;
 import net.minecraft.data.DataGenerator;
@@ -32,80 +34,119 @@ public abstract class TagsProvider<T> implements DataProvider {
     private static final Gson GSON;
     protected final DataGenerator generator;
     protected final Registry<T> registry;
-    protected final Map<Tag<T>, Tag.Builder<T>> builders;
+    private final Map<ResourceLocation, Tag.Builder> builders;
     
-    protected TagsProvider(final DataGenerator gy, final Registry<T> gb) {
+    protected TagsProvider(final DataGenerator hk, final Registry<T> gl) {
         this.builders = Maps.newLinkedHashMap();
-        this.generator = gy;
-        this.registry = gb;
+        this.generator = hk;
+        this.registry = gl;
     }
     
     protected abstract void addTags();
     
     @Override
-    public void run(final HashCache ha) {
+    public void run(final HashCache hm) {
         this.builders.clear();
         this.addTags();
-        final TagCollection<T> aba3 = new TagCollection<T>(sm -> Optional.empty(), "", false, "generated");
-        final Map<ResourceLocation, Tag.Builder<T>> map4 = this.builders.entrySet().stream().collect(Collectors.toMap(entry -> entry.getKey().getId(), Map.Entry::getValue));
-        aba3.load(map4);
-        final JsonObject jsonObject5;
-        final Path path6;
-        String string7;
-        String string8;
-        BufferedWriter bufferedWriter9;
+        final Tag<T> adf3 = SetTag.empty();
+        final Object o;
+        final Function<ResourceLocation, Tag<T>> function4 = (Function<ResourceLocation, Tag<T>>)(uh -> this.builders.containsKey(uh) ? o : null);
+        final Function<ResourceLocation, T> function5 = (Function<ResourceLocation, T>)(uh -> this.registry.getOptional(uh).orElse(null));
+        final List<Tag.BuilderEntry> list7;
+        final IllegalArgumentException ex;
+        JsonObject jsonObject8;
+        Path path9;
+        String string10;
+        String string11;
+        BufferedWriter bufferedWriter12;
         final Throwable t2;
-        aba3.getAllTags().forEach((sm, aaz) -> {
-            jsonObject5 = aaz.serializeToJson(this.registry::getKey);
-            path6 = this.getPath(sm);
-            try {
-                string7 = TagsProvider.GSON.toJson(jsonObject5);
-                string8 = TagsProvider.SHA1.hashUnencodedChars(string7).toString();
-                if (!Objects.equals(ha.getHash(path6), string8) || !Files.exists(path6)) {
-                    Files.createDirectories(path6.getParent(), new FileAttribute[0]);
-                    bufferedWriter9 = Files.newBufferedWriter(path6);
-                    try {
-                        bufferedWriter9.write(string7);
-                    }
-                    catch (Throwable t) {
-                        throw t;
-                    }
-                    finally {
-                        if (bufferedWriter9 != null) {
-                            if (t2 != null) {
-                                try {
-                                    bufferedWriter9.close();
+        this.builders.forEach((uh, a) -> {
+            list7 = a.<T>getUnresolvedEntries(function4, function5).collect(Collectors.toList());
+            if (!list7.isEmpty()) {
+                new IllegalArgumentException(String.format("Couldn't define tag %s as it is missing following references: %s", uh, list7.stream().map(Objects::toString).collect(Collectors.joining(","))));
+                throw ex;
+            }
+            else {
+                jsonObject8 = a.serializeToJson();
+                path9 = this.getPath(uh);
+                try {
+                    string10 = TagsProvider.GSON.toJson(jsonObject8);
+                    string11 = TagsProvider.SHA1.hashUnencodedChars(string10).toString();
+                    if (!Objects.equals(hm.getHash(path9), string11) || !Files.exists(path9)) {
+                        Files.createDirectories(path9.getParent(), new FileAttribute[0]);
+                        bufferedWriter12 = Files.newBufferedWriter(path9);
+                        try {
+                            bufferedWriter12.write(string10);
+                        }
+                        catch (Throwable t) {
+                            throw t;
+                        }
+                        finally {
+                            if (bufferedWriter12 != null) {
+                                if (t2 != null) {
+                                    try {
+                                        bufferedWriter12.close();
+                                    }
+                                    catch (Throwable exception) {
+                                        t2.addSuppressed(exception);
+                                    }
                                 }
-                                catch (Throwable exception) {
-                                    t2.addSuppressed(exception);
+                                else {
+                                    bufferedWriter12.close();
                                 }
                             }
-                            else {
-                                bufferedWriter9.close();
-                            }
                         }
                     }
+                    hm.putNew(path9, string11);
+                }
+                catch (IOException iOException10) {
+                    TagsProvider.LOGGER.error("Couldn't save tags to {}", path9, iOException10);
                 }
-                ha.putNew(path6, string8);
             }
-            catch (IOException iOException7) {
-                TagsProvider.LOGGER.error("Couldn't save tags to {}", path6, iOException7);
-            }
-            return;
         });
-        this.useTags(aba3);
     }
     
-    protected abstract void useTags(final TagCollection<T> aba);
+    protected abstract Path getPath(final ResourceLocation uh);
     
-    protected abstract Path getPath(final ResourceLocation sm);
+    protected TagAppender<T> tag(final Tag.Named<T> e) {
+        final Tag.Builder a3 = this.getOrCreateRawBuilder(e);
+        return new TagAppender<T>(a3, (Registry)this.registry, "vanilla");
+    }
     
-    protected Tag.Builder<T> tag(final Tag<T> aaz) {
-        return this.builders.computeIfAbsent(aaz, aaz -> Tag.Builder.tag());
+    protected Tag.Builder getOrCreateRawBuilder(final Tag.Named<T> e) {
+        return this.builders.computeIfAbsent(e.getName(), uh -> new Tag.Builder());
     }
     
     static {
         LOGGER = LogManager.getLogger();
         GSON = new GsonBuilder().setPrettyPrinting().create();
     }
+    
+    public static class TagAppender<T> {
+        private final Tag.Builder builder;
+        private final Registry<T> registry;
+        private final String source;
+        
+        private TagAppender(final Tag.Builder a, final Registry<T> gl, final String string) {
+            this.builder = a;
+            this.registry = gl;
+            this.source = string;
+        }
+        
+        public TagAppender<T> add(final T object) {
+            this.builder.addElement(this.registry.getKey(object), this.source);
+            return this;
+        }
+        
+        public TagAppender<T> addTag(final Tag.Named<T> e) {
+            this.builder.addTag(e.getName(), this.source);
+            return this;
+        }
+        
+        @SafeVarargs
+        public final TagAppender<T> add(final T... arr) {
+            Stream.<T>of(arr).map(this.registry::getKey).forEach(uh -> this.builder.addElement(uh, this.source));
+            return this;
+        }
+    }
 }
diff --git a/src/net/minecraft/gametest/framework/GameTestBatch.java b/src/net/minecraft/gametest/framework/GameTestBatch.java
index cb07386..20f9a8b 100644
--- a/src/net/minecraft/gametest/framework/GameTestBatch.java
+++ b/src/net/minecraft/gametest/framework/GameTestBatch.java
@@ -28,9 +28,9 @@ public class GameTestBatch {
         return this.testFunctions;
     }
     
-    public void runBeforeBatchFunction(final ServerLevel xd) {
+    public void runBeforeBatchFunction(final ServerLevel zd) {
         if (this.beforeBatchFunction != null) {
-            this.beforeBatchFunction.accept(xd);
+            this.beforeBatchFunction.accept(zd);
         }
     }
 }
diff --git a/src/net/minecraft/gametest/framework/GameTestBatchRunner.java b/src/net/minecraft/gametest/framework/GameTestBatchRunner.java
index c000504..b476734 100644
--- a/src/net/minecraft/gametest/framework/GameTestBatchRunner.java
+++ b/src/net/minecraft/gametest/framework/GameTestBatchRunner.java
@@ -1,11 +1,16 @@
 package net.minecraft.gametest.framework;
 
 import org.apache.logging.log4j.LogManager;
+import net.minecraft.world.level.block.entity.StructureBlockEntity;
 import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.AABB;
 import java.util.Iterator;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Lists;
+import net.minecraft.world.level.block.Rotation;
 import java.util.Collection;
 import com.mojang.datafixers.util.Pair;
+import java.util.Map;
 import java.util.List;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.core.BlockPos;
@@ -13,41 +18,43 @@ import org.apache.logging.log4j.Logger;
 
 public class GameTestBatchRunner {
     private static final Logger LOGGER;
-    private final BlockPos startPos;
+    private final BlockPos firstTestNorthWestCorner;
     private final ServerLevel level;
     private final GameTestTicker testTicker;
+    private final int testsPerRow;
     private final List<GameTestInfo> allTestInfos;
+    private final Map<GameTestInfo, BlockPos> northWestCorners;
     private final List<Pair<GameTestBatch, Collection<GameTestInfo>>> batches;
     private MultipleTestTracker currentBatchTracker;
     private int currentBatchIndex;
-    private BlockPos.MutableBlockPos nextTestPos;
-    private int maxDepthOnThisRow;
+    private BlockPos.MutableBlockPos nextTestNorthWestCorner;
     
-    public GameTestBatchRunner(final Collection<GameTestBatch> collection, final BlockPos fk, final ServerLevel xd, final GameTestTicker jc) {
+    public GameTestBatchRunner(final Collection<GameTestBatch> collection, final BlockPos fu, final Rotation cap, final ServerLevel zd, final GameTestTicker km, final int integer) {
         this.allTestInfos = Lists.newArrayList();
+        this.northWestCorners = Maps.newHashMap();
         this.batches = Lists.newArrayList();
         this.currentBatchIndex = 0;
-        this.maxDepthOnThisRow = 0;
-        this.nextTestPos = new BlockPos.MutableBlockPos(fk);
-        this.startPos = fk;
-        this.level = xd;
-        this.testTicker = jc;
+        this.nextTestNorthWestCorner = fu.mutable();
+        this.firstTestNorthWestCorner = fu;
+        this.level = zd;
+        this.testTicker = km;
+        this.testsPerRow = integer;
         final Collection<GameTestInfo> collection2;
         final Collection<TestFunction> collection3;
         final Iterator<TestFunction> iterator;
-        TestFunction jk7;
-        GameTestInfo iw8;
-        collection.forEach(ir -> {
+        TestFunction kv8;
+        GameTestInfo kg9;
+        collection.forEach(kb -> {
             collection2 = Lists.newArrayList();
-            collection3 = ir.getTestFunctions();
+            collection3 = kb.getTestFunctions();
             collection3.iterator();
             while (iterator.hasNext()) {
-                jk7 = iterator.next();
-                iw8 = new GameTestInfo(jk7, xd);
-                collection2.add(iw8);
-                this.allTestInfos.add(iw8);
+                kv8 = iterator.next();
+                kg9 = new GameTestInfo(kv8, cap, zd);
+                collection2.add(kg9);
+                this.allTestInfos.add(kg9);
             }
-            this.batches.add((Pair<GameTestBatch, Collection<GameTestInfo>>)Pair.of(ir, collection2));
+            this.batches.add((Pair<GameTestBatch, Collection<GameTestInfo>>)Pair.of(kb, collection2));
         });
     }
     
@@ -66,29 +73,31 @@ public class GameTestBatchRunner {
             return;
         }
         final Pair<GameTestBatch, Collection<GameTestInfo>> pair3 = this.batches.get(this.currentBatchIndex);
-        final GameTestBatch ir4 = (GameTestBatch)pair3.getFirst();
+        final GameTestBatch kb4 = (GameTestBatch)pair3.getFirst();
         final Collection<GameTestInfo> collection5 = (Collection<GameTestInfo>)pair3.getSecond();
         this.createStructuresForBatch(collection5);
-        ir4.runBeforeBatchFunction(this.level);
-        final String string6 = ir4.getName();
+        kb4.runBeforeBatchFunction(this.level);
+        final String string6 = kb4.getName();
         GameTestBatchRunner.LOGGER.info("Running test batch '" + string6 + "' (" + collection5.size() + " tests)...");
-        collection5.forEach(iw -> {
-            this.currentBatchTracker.add(iw);
-            this.currentBatchTracker.setListener(new GameTestListener() {
+        final BlockPos fu3;
+        collection5.forEach(kg -> {
+            this.currentBatchTracker.addTestToTrack(kg);
+            this.currentBatchTracker.addListener(new GameTestListener() {
                 @Override
-                public void testStructureLoaded(final GameTestInfo iw) {
+                public void testStructureLoaded(final GameTestInfo kg) {
                 }
                 
                 @Override
-                public void testFailed(final GameTestInfo iw) {
-                    GameTestBatchRunner.this.testCompleted(iw);
+                public void testFailed(final GameTestInfo kg) {
+                    GameTestBatchRunner.this.testCompleted(kg);
                 }
             });
-            GameTestRunner.runTest(iw, this.testTicker);
+            fu3 = this.northWestCorners.get(kg);
+            GameTestRunner.runTest(kg, fu3, this.testTicker);
         });
     }
     
-    private void testCompleted(final GameTestInfo iw) {
+    private void testCompleted(final GameTestInfo kg) {
         if (this.currentBatchTracker.isDone()) {
             this.runBatch(this.currentBatchIndex + 1);
         }
@@ -96,19 +105,19 @@ public class GameTestBatchRunner {
     
     private void createStructuresForBatch(final Collection<GameTestInfo> collection) {
         int integer3 = 0;
-        for (final GameTestInfo iw5 : collection) {
-            final BlockPos fk6 = new BlockPos(this.nextTestPos);
-            iw5.assignPosition(fk6);
-            StructureUtils.spawnStructure(iw5.getStructureName(), fk6, 2, this.level, true);
-            final BlockPos fk7 = iw5.getStructureSize();
-            final int integer4 = (fk7 == null) ? 1 : fk7.getX();
-            final int integer5 = (fk7 == null) ? 1 : fk7.getZ();
-            this.maxDepthOnThisRow = Math.max(this.maxDepthOnThisRow, integer5);
-            this.nextTestPos.move(integer4 + 4, 0, 0);
-            if (integer3++ % 8 == 0) {
-                this.nextTestPos.move(0, 0, this.maxDepthOnThisRow + 5);
-                this.nextTestPos.setX(this.startPos.getX());
-                this.maxDepthOnThisRow = 0;
+        AABB deg4 = new AABB(this.nextTestNorthWestCorner);
+        for (final GameTestInfo kg6 : collection) {
+            final BlockPos fu7 = new BlockPos(this.nextTestNorthWestCorner);
+            final StructureBlockEntity cel8 = StructureUtils.spawnStructure(kg6.getStructureName(), fu7, kg6.getRotation(), 2, this.level, true);
+            final AABB deg5 = StructureUtils.getStructureBounds(cel8);
+            kg6.setStructureBlockPos(cel8.getBlockPos());
+            this.northWestCorners.put(kg6, new BlockPos(this.nextTestNorthWestCorner));
+            deg4 = deg4.minmax(deg5);
+            this.nextTestNorthWestCorner.move((int)deg5.getXsize() + 5, 0, 0);
+            if (integer3++ % this.testsPerRow == this.testsPerRow - 1) {
+                this.nextTestNorthWestCorner.move(0, 0, (int)deg4.getZsize() + 6);
+                this.nextTestNorthWestCorner.setX(this.firstTestNorthWestCorner.getX());
+                deg4 = new AABB(this.nextTestNorthWestCorner);
             }
         }
     }
diff --git a/src/net/minecraft/gametest/framework/GameTestHelper.java b/src/net/minecraft/gametest/framework/GameTestHelper.java
index 2485b36..5950f8a 100644
--- a/src/net/minecraft/gametest/framework/GameTestHelper.java
+++ b/src/net/minecraft/gametest/framework/GameTestHelper.java
@@ -3,7 +3,7 @@ package net.minecraft.gametest.framework;
 public class GameTestHelper {
     private final GameTestInfo testInfo;
     
-    public GameTestHelper(final GameTestInfo iw) {
-        this.testInfo = iw;
+    public GameTestHelper(final GameTestInfo kg) {
+        this.testInfo = kg;
     }
 }
diff --git a/src/net/minecraft/gametest/framework/GameTestInfo.java b/src/net/minecraft/gametest/framework/GameTestInfo.java
index 0022c1b..6dc9ff6 100644
--- a/src/net/minecraft/gametest/framework/GameTestInfo.java
+++ b/src/net/minecraft/gametest/framework/GameTestInfo.java
@@ -4,16 +4,18 @@ import net.minecraft.world.level.block.entity.StructureBlockEntity;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
 import com.google.common.collect.Lists;
-import javax.annotation.Nullable;
+import net.minecraft.world.level.block.Rotation;
 import com.google.common.base.Stopwatch;
 import it.unimi.dsi.fastutil.objects.Object2LongMap;
 import java.util.Collection;
 import net.minecraft.server.level.ServerLevel;
+import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
 
 public class GameTestInfo {
     private final TestFunction testFunction;
-    private BlockPos testPos;
+    @Nullable
+    private BlockPos structureBlockPos;
     private final ServerLevel level;
     private final Collection<GameTestListener> listeners;
     private final int timeoutTicks;
@@ -24,28 +26,25 @@ public class GameTestInfo {
     private boolean started;
     private final Stopwatch timer;
     private boolean done;
+    private final Rotation rotation;
     @Nullable
     private Throwable error;
     
-    public GameTestInfo(final TestFunction jk, final ServerLevel xd) {
+    public GameTestInfo(final TestFunction kv, final Rotation cap, final ServerLevel zd) {
         this.listeners = Lists.newArrayList();
         this.sequences = Lists.newCopyOnWriteArrayList();
         this.runAtTickTimeMap = (Object2LongMap<Runnable>)new Object2LongOpenHashMap();
         this.started = false;
         this.timer = Stopwatch.createUnstarted();
         this.done = false;
-        this.testFunction = jk;
-        this.level = xd;
-        this.timeoutTicks = jk.getMaxTicks();
+        this.testFunction = kv;
+        this.level = zd;
+        this.timeoutTicks = kv.getMaxTicks();
+        this.rotation = kv.getRotation().getRotated(cap);
     }
     
-    public GameTestInfo(final TestFunction jk, final BlockPos fk, final ServerLevel xd) {
-        this(jk, xd);
-        this.assignPosition(fk);
-    }
-    
-    void assignPosition(final BlockPos fk) {
-        this.testPos = fk;
+    void setStructureBlockPos(final BlockPos fu) {
+        this.structureBlockPos = fu;
     }
     
     void startExecution() {
@@ -82,14 +81,14 @@ public class GameTestInfo {
                 this.fail(new GameTestTimeoutException("Didn't succeed or fail within " + this.testFunction.getMaxTicks() + " ticks"));
             }
             else {
-                this.sequences.forEach(ja -> ja.tickAndFailIfNotComplete(this.tickCount));
+                this.sequences.forEach(kk -> kk.tickAndFailIfNotComplete(this.tickCount));
                 if (this.error == null) {
                     this.fail(new GameTestTimeoutException("No sequences finished"));
                 }
             }
         }
         else {
-            this.sequences.forEach(ja -> ja.tickAndContinue(this.tickCount));
+            this.sequences.forEach(kk -> kk.tickAndContinue(this.tickCount));
         }
     }
     
@@ -110,22 +109,8 @@ public class GameTestInfo {
         return this.testFunction.getTestName();
     }
     
-    public BlockPos getTestPos() {
-        return this.testPos;
-    }
-    
-    @Nullable
-    public BlockPos getStructureSize() {
-        final StructureBlockEntity bxl2 = this.getStructureBlockEntity();
-        if (bxl2 == null) {
-            return null;
-        }
-        return bxl2.getStructureSize();
-    }
-    
-    @Nullable
-    private StructureBlockEntity getStructureBlockEntity() {
-        return (StructureBlockEntity)this.level.getBlockEntity(this.testPos);
+    public BlockPos getStructureBlockPos() {
+        return this.structureBlockPos;
     }
     
     public ServerLevel getLevel() {
@@ -158,7 +143,7 @@ public class GameTestInfo {
     public void fail(final Throwable throwable) {
         this.finish();
         this.error = throwable;
-        this.listeners.forEach(ix -> ix.testFailed(this));
+        this.listeners.forEach(kh -> kh.testFailed(this));
     }
     
     @Nullable
@@ -171,15 +156,16 @@ public class GameTestInfo {
         return this.getTestName();
     }
     
-    public void addListener(final GameTestListener ix) {
-        this.listeners.add(ix);
+    public void addListener(final GameTestListener kh) {
+        this.listeners.add(kh);
     }
     
-    public void spawnStructure(final int integer) {
-        final StructureBlockEntity bxl3 = StructureUtils.spawnStructure(this.testFunction.getStructureName(), this.testPos, integer, this.level, false);
-        bxl3.setStructureName(this.getTestName());
-        StructureUtils.addCommandBlockAndButtonToStartTest(this.testPos.offset(1, 0, -1), this.level);
-        this.listeners.forEach(ix -> ix.testStructureLoaded(this));
+    public void spawnStructure(final BlockPos fu, final int integer) {
+        final StructureBlockEntity cel4 = StructureUtils.spawnStructure(this.getStructureName(), fu, this.getRotation(), integer, this.level, false);
+        this.setStructureBlockPos(cel4.getBlockPos());
+        cel4.setStructureName(this.getTestName());
+        StructureUtils.addCommandBlockAndButtonToStartTest(this.structureBlockPos, new BlockPos(1, 0, -1), this.getRotation(), this.level);
+        this.listeners.forEach(kh -> kh.testStructureLoaded(this));
     }
     
     public boolean isRequired() {
@@ -193,4 +179,12 @@ public class GameTestInfo {
     public String getStructureName() {
         return this.testFunction.getStructureName();
     }
+    
+    public Rotation getRotation() {
+        return this.rotation;
+    }
+    
+    public TestFunction getTestFunction() {
+        return this.testFunction;
+    }
 }
diff --git a/src/net/minecraft/gametest/framework/GameTestListener.java b/src/net/minecraft/gametest/framework/GameTestListener.java
index 8bb767e..1920d57 100644
--- a/src/net/minecraft/gametest/framework/GameTestListener.java
+++ b/src/net/minecraft/gametest/framework/GameTestListener.java
@@ -1,7 +1,7 @@
 package net.minecraft.gametest.framework;
 
 public interface GameTestListener {
-    void testStructureLoaded(final GameTestInfo iw);
+    void testStructureLoaded(final GameTestInfo kg);
     
-    void testFailed(final GameTestInfo iw);
+    void testFailed(final GameTestInfo kg);
 }
diff --git a/src/net/minecraft/gametest/framework/GameTestRegistry.java b/src/net/minecraft/gametest/framework/GameTestRegistry.java
index 857d9f7..ca99646 100644
--- a/src/net/minecraft/gametest/framework/GameTestRegistry.java
+++ b/src/net/minecraft/gametest/framework/GameTestRegistry.java
@@ -17,9 +17,10 @@ public class GameTestRegistry {
     private static final Collection<TestFunction> testFunctions;
     private static final Set<String> testClassNames;
     private static final Map<String, Consumer<ServerLevel>> beforeBatchFunctions;
+    private static final Collection<TestFunction> lastFailedTests;
     
     public static Collection<TestFunction> getTestFunctionsForClassName(final String string) {
-        return GameTestRegistry.testFunctions.stream().filter(jk -> isTestFunctionPartOfClass(jk, string)).collect(Collectors.toList());
+        return GameTestRegistry.testFunctions.stream().filter(kv -> isTestFunctionPartOfClass(kv, string)).collect(Collectors.toList());
     }
     
     public static Collection<TestFunction> getAllTestFunctions() {
@@ -40,7 +41,7 @@ public class GameTestRegistry {
     }
     
     public static Optional<TestFunction> findTestFunction(final String string) {
-        return getAllTestFunctions().stream().filter(jk -> jk.getTestName().equalsIgnoreCase(string)).findFirst();
+        return getAllTestFunctions().stream().filter(kv -> kv.getTestName().equalsIgnoreCase(string)).findFirst();
     }
     
     public static TestFunction getTestFunction(final String string) {
@@ -51,13 +52,26 @@ public class GameTestRegistry {
         return optional2.get();
     }
     
-    private static boolean isTestFunctionPartOfClass(final TestFunction jk, final String string) {
-        return jk.getTestName().toLowerCase().startsWith(string.toLowerCase() + ".");
+    private static boolean isTestFunctionPartOfClass(final TestFunction kv, final String string) {
+        return kv.getTestName().toLowerCase().startsWith(string.toLowerCase() + ".");
+    }
+    
+    public static Collection<TestFunction> getLastFailedTests() {
+        return GameTestRegistry.lastFailedTests;
+    }
+    
+    public static void rememberFailedTest(final TestFunction kv) {
+        GameTestRegistry.lastFailedTests.add(kv);
+    }
+    
+    public static void forgetFailedTests() {
+        GameTestRegistry.lastFailedTests.clear();
     }
     
     static {
         testFunctions = Lists.newArrayList();
         testClassNames = Sets.newHashSet();
         beforeBatchFunctions = Maps.newHashMap();
+        lastFailedTests = Sets.newHashSet();
     }
 }
diff --git a/src/net/minecraft/gametest/framework/GameTestRunner.java b/src/net/minecraft/gametest/framework/GameTestRunner.java
index 81680bd..90afa23 100644
--- a/src/net/minecraft/gametest/framework/GameTestRunner.java
+++ b/src/net/minecraft/gametest/framework/GameTestRunner.java
@@ -1,4 +1,7 @@
 java.lang.StackOverflowError
+	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitIdentifier(DepthFirstAstVisitor.java:79)
+	at com.strobel.decompiler.languages.java.ast.Identifier.acceptVisitor(Identifier.java:75)
+	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitChildren(DepthFirstAstVisitor.java:41)
 	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitSimpleType(DepthFirstAstVisitor.java:209)
 	at com.strobel.decompiler.languages.java.ast.SimpleType.acceptVisitor(SimpleType.java:78)
 	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitChildren(DepthFirstAstVisitor.java:41)
@@ -1020,6 +1023,3 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
-	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
diff --git a/src/net/minecraft/gametest/framework/GameTestSequence.java b/src/net/minecraft/gametest/framework/GameTestSequence.java
index dc15d28..658db0e 100644
--- a/src/net/minecraft/gametest/framework/GameTestSequence.java
+++ b/src/net/minecraft/gametest/framework/GameTestSequence.java
@@ -27,14 +27,14 @@ public class GameTestSequence {
     private void tick(final long long1) {
         final Iterator<GameTestEvent> iterator4 = this.events.iterator();
         while (iterator4.hasNext()) {
-            final GameTestEvent it5 = iterator4.next();
-            it5.assertion.run();
+            final GameTestEvent kd5 = iterator4.next();
+            kd5.assertion.run();
             iterator4.remove();
             final long long2 = long1 - this.lastTick;
             final long long3 = this.lastTick;
             this.lastTick = long1;
-            if (it5.expectedDelay != null && it5.expectedDelay != long2) {
-                this.parent.fail(new GameTestAssertException("Succeeded in invalid tick: expected " + (long3 + it5.expectedDelay) + ", but current tick is " + long1));
+            if (kd5.expectedDelay != null && kd5.expectedDelay != long2) {
+                this.parent.fail(new GameTestAssertException("Succeeded in invalid tick: expected " + (long3 + kd5.expectedDelay) + ", but current tick is " + long1));
                 break;
             }
         }
diff --git a/src/net/minecraft/gametest/framework/GameTestTicker.java b/src/net/minecraft/gametest/framework/GameTestTicker.java
index 24005e0..124ebf2 100644
--- a/src/net/minecraft/gametest/framework/GameTestTicker.java
+++ b/src/net/minecraft/gametest/framework/GameTestTicker.java
@@ -11,8 +11,8 @@ public class GameTestTicker {
         this.testInfos = Lists.newCopyOnWriteArrayList();
     }
     
-    public void add(final GameTestInfo iw) {
-        this.testInfos.add(iw);
+    public void add(final GameTestInfo kg) {
+        this.testInfos.add(kg);
     }
     
     public void clear() {
diff --git a/src/net/minecraft/gametest/framework/LogTestReporter.java b/src/net/minecraft/gametest/framework/LogTestReporter.java
index 8a0af42..070e782 100644
--- a/src/net/minecraft/gametest/framework/LogTestReporter.java
+++ b/src/net/minecraft/gametest/framework/LogTestReporter.java
@@ -8,12 +8,12 @@ public class LogTestReporter implements TestReporter {
     private static final Logger LOGGER;
     
     @Override
-    public void onTestFailed(final GameTestInfo iw) {
-        if (iw.isRequired()) {
-            LogTestReporter.LOGGER.error(iw.getTestName() + " failed! " + Util.describeError(iw.getError()));
+    public void onTestFailed(final GameTestInfo kg) {
+        if (kg.isRequired()) {
+            LogTestReporter.LOGGER.error(kg.getTestName() + " failed! " + Util.describeError(kg.getError()));
         }
         else {
-            LogTestReporter.LOGGER.warn("(optional) " + iw.getTestName() + " failed. " + Util.describeError(iw.getError()));
+            LogTestReporter.LOGGER.warn("(optional) " + kg.getTestName() + " failed. " + Util.describeError(kg.getError()));
         }
     }
     
diff --git a/src/net/minecraft/gametest/framework/MultipleTestTracker.java b/src/net/minecraft/gametest/framework/MultipleTestTracker.java
index b132b69..873f3aa 100644
--- a/src/net/minecraft/gametest/framework/MultipleTestTracker.java
+++ b/src/net/minecraft/gametest/framework/MultipleTestTracker.java
@@ -1,5 +1,6 @@
 package net.minecraft.gametest.framework;
 
+import java.util.function.Consumer;
 import com.google.common.collect.Lists;
 import javax.annotation.Nullable;
 import java.util.Collection;
@@ -7,26 +8,40 @@ import java.util.Collection;
 public class MultipleTestTracker {
     private final Collection<GameTestInfo> tests;
     @Nullable
-    private GameTestListener listener;
+    private Collection<GameTestListener> listeners;
     
     public MultipleTestTracker() {
         this.tests = Lists.newArrayList();
+        this.listeners = Lists.newArrayList();
     }
     
     public MultipleTestTracker(final Collection<GameTestInfo> collection) {
-        (this.tests = Lists.newArrayList()).addAll(collection);
+        this.tests = Lists.newArrayList();
+        this.listeners = Lists.newArrayList();
+        this.tests.addAll(collection);
     }
     
-    public void add(final GameTestInfo iw) {
-        this.tests.add(iw);
-        if (this.listener != null) {
-            iw.addListener(this.listener);
-        }
+    public void addTestToTrack(final GameTestInfo kg) {
+        this.tests.add(kg);
+        this.listeners.forEach(kg::addListener);
     }
     
-    public void setListener(final GameTestListener ix) {
-        this.listener = ix;
-        this.tests.forEach(iw -> iw.addListener(ix));
+    public void addListener(final GameTestListener kh) {
+        this.listeners.add(kh);
+        this.tests.forEach(kg -> kg.addListener(kh));
+    }
+    
+    public void addFailureListener(final Consumer<GameTestInfo> consumer) {
+        this.addListener(new GameTestListener() {
+            @Override
+            public void testStructureLoaded(final GameTestInfo kg) {
+            }
+            
+            @Override
+            public void testFailed(final GameTestInfo kg) {
+                consumer.accept(kg);
+            }
+        });
     }
     
     public int getFailedRequiredCount() {
@@ -61,15 +76,15 @@ public class MultipleTestTracker {
         final StringBuffer stringBuffer2 = new StringBuffer();
         stringBuffer2.append('[');
         final StringBuffer sb;
-        this.tests.forEach(iw -> {
-            if (!iw.hasStarted()) {
+        this.tests.forEach(kg -> {
+            if (!kg.hasStarted()) {
                 sb.append(' ');
             }
-            else if (iw.hasSucceeded()) {
+            else if (kg.hasSucceeded()) {
                 sb.append('+');
             }
-            else if (iw.hasFailed()) {
-                sb.append(iw.isRequired() ? 'X' : 'x');
+            else if (kg.hasFailed()) {
+                sb.append(kg.isRequired() ? 'X' : 'x');
             }
             else {
                 sb.append('_');
diff --git a/src/net/minecraft/gametest/framework/StructureUtils.java b/src/net/minecraft/gametest/framework/StructureUtils.java
index ee6590c..d1d509b 100644
--- a/src/net/minecraft/gametest/framework/StructureUtils.java
+++ b/src/net/minecraft/gametest/framework/StructureUtils.java
@@ -1,7 +1,6 @@
 package net.minecraft.gametest.framework;
 
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.commands.arguments.blocks.BlockInput;
 import net.minecraft.world.level.block.state.properties.Property;
 import java.util.Collections;
@@ -17,7 +16,6 @@ import net.minecraft.nbt.CompoundTag;
 import java.nio.file.Path;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import java.nio.file.Paths;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.world.level.block.state.BlockState;
 import com.google.common.collect.Lists;
 import javax.annotation.Nullable;
@@ -28,103 +26,160 @@ import java.util.List;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.block.state.properties.StructureMode;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.entity.CommandBlockEntity;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import net.minecraft.world.level.block.Mirror;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.block.entity.StructureBlockEntity;
+import net.minecraft.world.level.block.Rotation;
 
 public class StructureUtils {
     public static String testStructuresDir;
     
-    public static AABB getStructureBounds(final StructureBlockEntity bxl) {
-        final BlockPos fk2 = bxl.getBlockPos().offset(bxl.getStructurePos());
-        return new AABB(fk2, fk2.offset(bxl.getStructureSize()));
-    }
-    
-    public static void addCommandBlockAndButtonToStartTest(final BlockPos fk, final ServerLevel xd) {
-        xd.setBlockAndUpdate(fk, Blocks.COMMAND_BLOCK.defaultBlockState());
-        final CommandBlockEntity bwq3 = (CommandBlockEntity)xd.getBlockEntity(fk);
-        bwq3.getCommandBlock().setCommand("test runthis");
-        xd.setBlockAndUpdate(fk.offset(0, 0, -1), Blocks.STONE_BUTTON.defaultBlockState());
-    }
-    
-    public static void createNewEmptyStructureBlock(final String string, final BlockPos fk2, final BlockPos fk3, final int integer, final ServerLevel xd) {
-        final BoundingBox clb6 = createStructureBoundingBox(fk2, fk3, integer);
-        clearSpaceForStructure(clb6, fk2.getY(), xd);
-        xd.setBlockAndUpdate(fk2, Blocks.STRUCTURE_BLOCK.defaultBlockState());
-        final StructureBlockEntity bxl7 = (StructureBlockEntity)xd.getBlockEntity(fk2);
-        bxl7.setIgnoreEntities(false);
-        bxl7.setStructureName(new ResourceLocation(string));
-        bxl7.setStructureSize(fk3);
-        bxl7.setMode(StructureMode.SAVE);
-        bxl7.setShowBoundingBox(true);
-    }
-    
-    public static StructureBlockEntity spawnStructure(final String string, final BlockPos fk, final int integer, final ServerLevel xd, final boolean boolean5) {
-        final BoundingBox clb6 = createStructureBoundingBox(fk, getStructureTemplate(string, xd).getSize(), integer);
-        forceLoadChunks(fk, xd);
-        clearSpaceForStructure(clb6, fk.getY(), xd);
-        final StructureBlockEntity bxl7 = createStructureBlock(string, fk, xd, boolean5);
-        xd.getBlockTicks().fetchTicksInArea(clb6, true, false);
-        xd.clearBlockEvents(clb6);
-        return bxl7;
-    }
-    
-    private static void forceLoadChunks(final BlockPos fk, final ServerLevel xd) {
-        final ChunkPos bjh3 = new ChunkPos(fk);
-        for (int integer4 = -1; integer4 < 4; ++integer4) {
-            for (int integer5 = -1; integer5 < 4; ++integer5) {
-                final int integer6 = bjh3.x + integer4;
-                final int integer7 = bjh3.z + integer5;
-                xd.setChunkForced(integer6, integer7, true);
+    public static Rotation getRotationForRotationSteps(final int integer) {
+        switch (integer) {
+            case 0: {
+                return Rotation.NONE;
+            }
+            case 1: {
+                return Rotation.CLOCKWISE_90;
+            }
+            case 2: {
+                return Rotation.CLOCKWISE_180;
+            }
+            case 3: {
+                return Rotation.COUNTERCLOCKWISE_90;
+            }
+            default: {
+                throw new IllegalArgumentException("rotationSteps must be a value from 0-3. Got value " + integer);
             }
         }
     }
     
-    public static void clearSpaceForStructure(final BoundingBox clb, final int integer, final ServerLevel xd) {
-        BlockPos.betweenClosedStream(clb).forEach(fk -> clearBlock(integer, fk, xd));
-        xd.getBlockTicks().fetchTicksInArea(clb, true, false);
-        xd.clearBlockEvents(clb);
-        final AABB cvf4 = new AABB(clb.x0, clb.y0, clb.z0, clb.x1, clb.y1, clb.z1);
-        final List<Entity> list5 = xd.<Entity>getEntitiesOfClass(Entity.class, cvf4, akq -> !(akq instanceof Player));
-        list5.forEach(Entity::remove);
+    public static AABB getStructureBounds(final StructureBlockEntity cel) {
+        final BlockPos fu2 = cel.getBlockPos();
+        final BlockPos fu3 = fu2.offset(cel.getStructureSize().offset(-1, -1, -1));
+        final BlockPos fu4 = StructureTemplate.transform(fu3, Mirror.NONE, cel.getRotation(), fu2);
+        return new AABB(fu2, fu4);
     }
     
-    public static BoundingBox createStructureBoundingBox(final BlockPos fk1, final BlockPos fk2, final int integer) {
-        final BlockPos fk3 = fk1.offset(-integer, -3, -integer);
-        final BlockPos fk4 = fk1.offset(fk2).offset(integer - 1, 30, integer - 1);
-        return BoundingBox.createProper(fk3.getX(), fk3.getY(), fk3.getZ(), fk4.getX(), fk4.getY(), fk4.getZ());
+    public static BoundingBox getStructureBoundingBox(final StructureBlockEntity cel) {
+        final BlockPos fu2 = cel.getBlockPos();
+        final BlockPos fu3 = fu2.offset(cel.getStructureSize().offset(-1, -1, -1));
+        final BlockPos fu4 = StructureTemplate.transform(fu3, Mirror.NONE, cel.getRotation(), fu2);
+        return new BoundingBox(fu2, fu4);
     }
     
-    public static Optional<BlockPos> findStructureBlockContainingPos(final BlockPos fk, final int integer, final ServerLevel xd) {
-        return findStructureBlocks(fk, integer, xd).stream().filter(fk3 -> doesStructureContain(fk3, fk, xd)).findFirst();
+    public static void addCommandBlockAndButtonToStartTest(final BlockPos fu1, final BlockPos fu2, final Rotation cap, final ServerLevel zd) {
+        final BlockPos fu3 = StructureTemplate.transform(fu1.offset(fu2), Mirror.NONE, cap, fu1);
+        zd.setBlockAndUpdate(fu3, Blocks.COMMAND_BLOCK.defaultBlockState());
+        final CommandBlockEntity cdq6 = (CommandBlockEntity)zd.getBlockEntity(fu3);
+        cdq6.getCommandBlock().setCommand("test runthis");
+        final BlockPos fu4 = StructureTemplate.transform(fu3.offset(0, 0, -1), Mirror.NONE, cap, fu3);
+        zd.setBlockAndUpdate(fu4, Blocks.STONE_BUTTON.defaultBlockState().rotate(cap));
+    }
+    
+    public static void createNewEmptyStructureBlock(final String string, final BlockPos fu2, final BlockPos fu3, final Rotation cap, final ServerLevel zd) {
+        final BoundingBox ctd6 = getStructureBoundingBox(fu2, fu3, cap);
+        clearSpaceForStructure(ctd6, fu2.getY(), zd);
+        zd.setBlockAndUpdate(fu2, Blocks.STRUCTURE_BLOCK.defaultBlockState());
+        final StructureBlockEntity cel7 = (StructureBlockEntity)zd.getBlockEntity(fu2);
+        cel7.setIgnoreEntities(false);
+        cel7.setStructureName(new ResourceLocation(string));
+        cel7.setStructureSize(fu3);
+        cel7.setMode(StructureMode.SAVE);
+        cel7.setShowBoundingBox(true);
+    }
+    
+    public static StructureBlockEntity spawnStructure(final String string, final BlockPos fu, final Rotation cap, final int integer, final ServerLevel zd, final boolean boolean6) {
+        final BlockPos fu2 = getStructureTemplate(string, zd).getSize();
+        final BoundingBox ctd8 = getStructureBoundingBox(fu, fu2, cap);
+        BlockPos fu3;
+        if (cap == Rotation.NONE) {
+            fu3 = fu;
+        }
+        else if (cap == Rotation.CLOCKWISE_90) {
+            fu3 = fu.offset(fu2.getZ() - 1, 0, 0);
+        }
+        else if (cap == Rotation.CLOCKWISE_180) {
+            fu3 = fu.offset(fu2.getX() - 1, 0, fu2.getZ() - 1);
+        }
+        else {
+            if (cap != Rotation.COUNTERCLOCKWISE_90) {
+                throw new IllegalArgumentException("Invalid rotation: " + cap);
+            }
+            fu3 = fu.offset(0, 0, fu2.getX() - 1);
+        }
+        forceLoadChunks(fu, zd);
+        clearSpaceForStructure(ctd8, fu.getY(), zd);
+        final StructureBlockEntity cel10 = createStructureBlock(string, fu3, cap, zd, boolean6);
+        zd.getBlockTicks().fetchTicksInArea(ctd8, true, false);
+        zd.clearBlockEvents(ctd8);
+        return cel10;
+    }
+    
+    private static void forceLoadChunks(final BlockPos fu, final ServerLevel zd) {
+        final ChunkPos bph3 = new ChunkPos(fu);
+        for (int integer4 = -1; integer4 < 4; ++integer4) {
+            for (int integer5 = -1; integer5 < 4; ++integer5) {
+                final int integer6 = bph3.x + integer4;
+                final int integer7 = bph3.z + integer5;
+                zd.setChunkForced(integer6, integer7, true);
+            }
+        }
+    }
+    
+    public static void clearSpaceForStructure(final BoundingBox ctd, final int integer, final ServerLevel zd) {
+        final BoundingBox ctd2 = new BoundingBox(ctd.x0 - 2, ctd.y0 - 3, ctd.z0 - 3, ctd.x1 + 3, ctd.y1 + 20, ctd.z1 + 3);
+        BlockPos.betweenClosedStream(ctd2).forEach(fu -> clearBlock(integer, fu, zd));
+        zd.getBlockTicks().fetchTicksInArea(ctd2, true, false);
+        zd.clearBlockEvents(ctd2);
+        final AABB deg5 = new AABB(ctd2.x0, ctd2.y0, ctd2.z0, ctd2.x1, ctd2.y1, ctd2.z1);
+        final List<Entity> list6 = zd.<Entity>getEntitiesOfClass(Entity.class, deg5, aom -> !(aom instanceof Player));
+        list6.forEach(Entity::remove);
+    }
+    
+    public static BoundingBox getStructureBoundingBox(final BlockPos fu1, final BlockPos fu2, final Rotation cap) {
+        final BlockPos fu3 = fu1.offset(fu2).offset(-1, -1, -1);
+        final BlockPos fu4 = StructureTemplate.transform(fu3, Mirror.NONE, cap, fu1);
+        final BoundingBox ctd6 = BoundingBox.createProper(fu1.getX(), fu1.getY(), fu1.getZ(), fu4.getX(), fu4.getY(), fu4.getZ());
+        final int integer7 = Math.min(ctd6.x0, ctd6.x1);
+        final int integer8 = Math.min(ctd6.z0, ctd6.z1);
+        final BlockPos fu5 = new BlockPos(fu1.getX() - integer7, 0, fu1.getZ() - integer8);
+        ctd6.move(fu5);
+        return ctd6;
+    }
+    
+    public static Optional<BlockPos> findStructureBlockContainingPos(final BlockPos fu, final int integer, final ServerLevel zd) {
+        return findStructureBlocks(fu, integer, zd).stream().filter(fu3 -> doesStructureContain(fu3, fu, zd)).findFirst();
     }
     
     @Nullable
-    public static BlockPos findNearestStructureBlock(final BlockPos fk, final int integer, final ServerLevel xd) {
-        final Comparator<BlockPos> comparator4 = Comparator.<BlockPos>comparingInt(fk2 -> fk2.distManhattan(fk));
-        final Collection<BlockPos> collection5 = findStructureBlocks(fk, integer, xd);
+    public static BlockPos findNearestStructureBlock(final BlockPos fu, final int integer, final ServerLevel zd) {
+        final Comparator<BlockPos> comparator4 = Comparator.<BlockPos>comparingInt(fu2 -> fu2.distManhattan(fu));
+        final Collection<BlockPos> collection5 = findStructureBlocks(fu, integer, zd);
         final Optional<BlockPos> optional6 = collection5.stream().min(comparator4);
         return optional6.orElse(null);
     }
     
-    public static Collection<BlockPos> findStructureBlocks(final BlockPos fk, final int integer, final ServerLevel xd) {
+    public static Collection<BlockPos> findStructureBlocks(final BlockPos fu, final int integer, final ServerLevel zd) {
         final Collection<BlockPos> collection4 = Lists.newArrayList();
-        AABB cvf5 = new AABB(fk);
-        cvf5 = cvf5.inflate(integer);
-        for (int integer2 = (int)cvf5.minX; integer2 <= (int)cvf5.maxX; ++integer2) {
-            for (int integer3 = (int)cvf5.minY; integer3 <= (int)cvf5.maxY; ++integer3) {
-                for (int integer4 = (int)cvf5.minZ; integer4 <= (int)cvf5.maxZ; ++integer4) {
-                    final BlockPos fk2 = new BlockPos(integer2, integer3, integer4);
-                    final BlockState byj10 = xd.getBlockState(fk2);
-                    if (byj10.getBlock() == Blocks.STRUCTURE_BLOCK) {
-                        collection4.add(fk2);
+        AABB deg5 = new AABB(fu);
+        deg5 = deg5.inflate(integer);
+        for (int integer2 = (int)deg5.minX; integer2 <= (int)deg5.maxX; ++integer2) {
+            for (int integer3 = (int)deg5.minY; integer3 <= (int)deg5.maxY; ++integer3) {
+                for (int integer4 = (int)deg5.minZ; integer4 <= (int)deg5.maxZ; ++integer4) {
+                    final BlockPos fu2 = new BlockPos(integer2, integer3, integer4);
+                    final BlockState cfj10 = zd.getBlockState(fu2);
+                    if (cfj10.is(Blocks.STRUCTURE_BLOCK)) {
+                        collection4.add(fu2);
                     }
                 }
             }
@@ -132,37 +187,38 @@ public class StructureUtils {
         return collection4;
     }
     
-    private static StructureTemplate getStructureTemplate(final String string, final ServerLevel xd) {
-        final StructureManager cmo3 = xd.getStructureManager();
-        final StructureTemplate cms4 = cmo3.get(new ResourceLocation(string));
-        if (cms4 != null) {
-            return cms4;
+    private static StructureTemplate getStructureTemplate(final String string, final ServerLevel zd) {
+        final StructureManager cva3 = zd.getStructureManager();
+        final StructureTemplate cve4 = cva3.get(new ResourceLocation(string));
+        if (cve4 != null) {
+            return cve4;
         }
         final String string2 = string + ".snbt";
         final Path path6 = Paths.get(StructureUtils.testStructuresDir, string2);
-        final CompoundTag jt7 = tryLoadStructure(path6);
-        if (jt7 == null) {
+        final CompoundTag le7 = tryLoadStructure(path6);
+        if (le7 == null) {
             throw new RuntimeException("Could not find structure file " + path6 + ", and the structure is not available in the world structures either.");
         }
-        return cmo3.readStructure(jt7);
+        return cva3.readStructure(le7);
     }
     
-    private static StructureBlockEntity createStructureBlock(final String string, final BlockPos fk, final ServerLevel xd, final boolean boolean4) {
-        xd.setBlockAndUpdate(fk, Blocks.STRUCTURE_BLOCK.defaultBlockState());
-        final StructureBlockEntity bxl5 = (StructureBlockEntity)xd.getBlockEntity(fk);
-        bxl5.setMode(StructureMode.LOAD);
-        bxl5.setIgnoreEntities(false);
-        bxl5.setStructureName(new ResourceLocation(string));
-        bxl5.loadStructure(boolean4);
-        if (bxl5.getStructureSize() != BlockPos.ZERO) {
-            return bxl5;
+    private static StructureBlockEntity createStructureBlock(final String string, final BlockPos fu, final Rotation cap, final ServerLevel zd, final boolean boolean5) {
+        zd.setBlockAndUpdate(fu, Blocks.STRUCTURE_BLOCK.defaultBlockState());
+        final StructureBlockEntity cel6 = (StructureBlockEntity)zd.getBlockEntity(fu);
+        cel6.setMode(StructureMode.LOAD);
+        cel6.setRotation(cap);
+        cel6.setIgnoreEntities(false);
+        cel6.setStructureName(new ResourceLocation(string));
+        cel6.loadStructure(boolean5);
+        if (cel6.getStructureSize() != BlockPos.ZERO) {
+            return cel6;
         }
-        final StructureTemplate cms6 = getStructureTemplate(string, xd);
-        bxl5.loadStructure(boolean4, cms6);
-        if (bxl5.getStructureSize() == BlockPos.ZERO) {
+        final StructureTemplate cve7 = getStructureTemplate(string, zd);
+        cel6.loadStructure(boolean5, cve7);
+        if (cel6.getStructureSize() == BlockPos.ZERO) {
             throw new RuntimeException("Failed to load structure " + string);
         }
-        return bxl5;
+        return cel6;
     }
     
     @Nullable
@@ -180,36 +236,33 @@ public class StructureUtils {
         }
     }
     
-    private static void clearBlock(final int integer, final BlockPos fk, final ServerLevel xd) {
-        final ChunkGeneratorSettings cbq5 = (ChunkGeneratorSettings)xd.getChunkSource().getGenerator().getSettings();
-        BlockState byj4;
-        if (cbq5 instanceof FlatLevelGeneratorSettings) {
-            final BlockState[] arr6 = ((FlatLevelGeneratorSettings)cbq5).getLayers();
-            if (fk.getY() < integer) {
-                byj4 = arr6[fk.getY() - 1];
-            }
-            else {
-                byj4 = Blocks.AIR.defaultBlockState();
+    private static void clearBlock(final int integer, final BlockPos fu, final ServerLevel zd) {
+        BlockState cfj4 = null;
+        final FlatLevelGeneratorSettings cra5 = FlatLevelGeneratorSettings.getDefault();
+        if (cra5 instanceof FlatLevelGeneratorSettings) {
+            final BlockState[] arr6 = cra5.getLayers();
+            if (fu.getY() < integer && fu.getY() <= arr6.length) {
+                cfj4 = arr6[fu.getY() - 1];
             }
         }
-        else if (fk.getY() == integer - 1) {
-            byj4 = xd.getBiome(fk).getSurfaceBuilderConfig().getTopMaterial();
+        else if (fu.getY() == integer - 1) {
+            cfj4 = zd.getBiome(fu).getSurfaceBuilderConfig().getTopMaterial();
         }
-        else if (fk.getY() < integer - 1) {
-            byj4 = xd.getBiome(fk).getSurfaceBuilderConfig().getUnderMaterial();
+        else if (fu.getY() < integer - 1) {
+            cfj4 = zd.getBiome(fu).getSurfaceBuilderConfig().getUnderMaterial();
         }
-        else {
-            byj4 = Blocks.AIR.defaultBlockState();
+        if (cfj4 == null) {
+            cfj4 = Blocks.AIR.defaultBlockState();
         }
-        final BlockInput ds6 = new BlockInput(byj4, Collections.<Property<?>>emptySet(), null);
-        ds6.place(xd, fk, 2);
-        xd.blockUpdated(fk, byj4.getBlock());
+        final BlockInput ec6 = new BlockInput(cfj4, Collections.<Property<?>>emptySet(), null);
+        ec6.place(zd, fu, 2);
+        zd.blockUpdated(fu, cfj4.getBlock());
     }
     
-    private static boolean doesStructureContain(final BlockPos fk1, final BlockPos fk2, final ServerLevel xd) {
-        final StructureBlockEntity bxl4 = (StructureBlockEntity)xd.getBlockEntity(fk1);
-        final AABB cvf5 = getStructureBounds(bxl4);
-        return cvf5.contains(new Vec3(fk2));
+    private static boolean doesStructureContain(final BlockPos fu1, final BlockPos fu2, final ServerLevel zd) {
+        final StructureBlockEntity cel4 = (StructureBlockEntity)zd.getBlockEntity(fu1);
+        final AABB deg5 = getStructureBounds(cel4).inflate(1.0);
+        return deg5.contains(Vec3.atCenterOf(fu2));
     }
     
     static {
diff --git a/src/net/minecraft/gametest/framework/TestCommand.java b/src/net/minecraft/gametest/framework/TestCommand.java
index ea55122..544fa75 100644
--- a/src/net/minecraft/gametest/framework/TestCommand.java
+++ b/src/net/minecraft/gametest/framework/TestCommand.java
@@ -2,6 +2,7 @@ package net.minecraft.gametest.framework;
 
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.Util;
 import java.io.OutputStream;
 import java.io.BufferedReader;
 import net.minecraft.nbt.NbtIo;
@@ -16,8 +17,11 @@ import java.nio.file.attribute.FileAttribute;
 import net.minecraft.data.structures.NbtToSnbt;
 import net.minecraft.resources.ResourceLocation;
 import java.nio.file.Paths;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 import java.util.function.Consumer;
 import net.minecraft.util.Mth;
+import net.minecraft.world.phys.AABB;
 import javax.annotation.Nullable;
 import java.util.Collection;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -40,12 +44,14 @@ import java.util.Set;
 import net.minecraft.commands.arguments.blocks.BlockInput;
 import java.util.Collections;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.core.BlockPos;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.arguments.BoolArgumentType;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import net.minecraft.commands.Commands;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.commands.CommandSourceStack;
@@ -53,192 +59,233 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class TestCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("test").then(Commands.literal("runthis").executes(commandContext -> runNearbyTest((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("runthese").executes(commandContext -> runAllNearbyTests((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("run").then(Commands.argument("testName", (com.mojang.brigadier.arguments.ArgumentType<Object>)TestFunctionArgument.testFunctionArgument()).executes(commandContext -> runTest((CommandSourceStack)commandContext.getSource(), TestFunctionArgument.getTestFunction((CommandContext<CommandSourceStack>)commandContext, "testName")))))).then(((LiteralArgumentBuilder)Commands.literal("runall").executes(commandContext -> runAllTests((CommandSourceStack)commandContext.getSource()))).then(Commands.argument("testClassName", (com.mojang.brigadier.arguments.ArgumentType<Object>)TestClassNameArgument.testClassName()).executes(commandContext -> runAllTestsInClass((CommandSourceStack)commandContext.getSource(), TestClassNameArgument.getTestClassName((CommandContext<CommandSourceStack>)commandContext, "testClassName")))))).then(Commands.literal("export").then(Commands.argument("testName", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> exportTestStructure((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "testName")))))).then(Commands.literal("import").then(Commands.argument("testName", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> importTestStructure((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "testName")))))).then(((LiteralArgumentBuilder)Commands.literal("pos").executes(commandContext -> showPos((CommandSourceStack)commandContext.getSource(), "pos"))).then(Commands.argument("var", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> showPos((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "var")))))).then(Commands.literal("create").then(((RequiredArgumentBuilder)Commands.argument("testName", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> createNewStructure((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "testName"), 5, 5, 5))).then(((RequiredArgumentBuilder)Commands.argument("width", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> createNewStructure((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "testName"), IntegerArgumentType.getInteger(commandContext, "width"), IntegerArgumentType.getInteger(commandContext, "width"), IntegerArgumentType.getInteger(commandContext, "width")))).then(Commands.argument("height", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).then(Commands.argument("depth", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> createNewStructure((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "testName"), IntegerArgumentType.getInteger(commandContext, "width"), IntegerArgumentType.getInteger(commandContext, "height"), IntegerArgumentType.getInteger(commandContext, "depth"))))))))).then(((LiteralArgumentBuilder)Commands.literal("clearall").executes(commandContext -> clearAllTests((CommandSourceStack)commandContext.getSource(), 200))).then(Commands.argument("radius", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> clearAllTests((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "radius"))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("test").then(Commands.literal("runthis").executes(commandContext -> runNearbyTest((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("runthese").executes(commandContext -> runAllNearbyTests((CommandSourceStack)commandContext.getSource())))).then(((LiteralArgumentBuilder)Commands.literal("runfailed").executes(commandContext -> runLastFailedTests((CommandSourceStack)commandContext.getSource(), false, 0, 8))).then(((RequiredArgumentBuilder)Commands.argument("onlyRequiredTests", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).executes(commandContext -> runLastFailedTests((CommandSourceStack)commandContext.getSource(), BoolArgumentType.getBool(commandContext, "onlyRequiredTests"), 0, 8))).then(((RequiredArgumentBuilder)Commands.argument("rotationSteps", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> runLastFailedTests((CommandSourceStack)commandContext.getSource(), BoolArgumentType.getBool(commandContext, "onlyRequiredTests"), IntegerArgumentType.getInteger(commandContext, "rotationSteps"), 8))).then(Commands.argument("testsPerRow", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> runLastFailedTests((CommandSourceStack)commandContext.getSource(), BoolArgumentType.getBool(commandContext, "onlyRequiredTests"), IntegerArgumentType.getInteger(commandContext, "rotationSteps"), IntegerArgumentType.getInteger(commandContext, "testsPerRow")))))))).then(Commands.literal("run").then(((RequiredArgumentBuilder)Commands.argument("testName", (com.mojang.brigadier.arguments.ArgumentType<Object>)TestFunctionArgument.testFunctionArgument()).executes(commandContext -> runTest((CommandSourceStack)commandContext.getSource(), TestFunctionArgument.getTestFunction((CommandContext<CommandSourceStack>)commandContext, "testName"), 0))).then(Commands.argument("rotationSteps", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> runTest((CommandSourceStack)commandContext.getSource(), TestFunctionArgument.getTestFunction((CommandContext<CommandSourceStack>)commandContext, "testName"), IntegerArgumentType.getInteger(commandContext, "rotationSteps"))))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("runall").executes(commandContext -> runAllTests((CommandSourceStack)commandContext.getSource(), 0, 8))).then(((RequiredArgumentBuilder)Commands.argument("testClassName", (com.mojang.brigadier.arguments.ArgumentType<Object>)TestClassNameArgument.testClassName()).executes(commandContext -> runAllTestsInClass((CommandSourceStack)commandContext.getSource(), TestClassNameArgument.getTestClassName((CommandContext<CommandSourceStack>)commandContext, "testClassName"), 0, 8))).then(((RequiredArgumentBuilder)Commands.argument("rotationSteps", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> runAllTestsInClass((CommandSourceStack)commandContext.getSource(), TestClassNameArgument.getTestClassName((CommandContext<CommandSourceStack>)commandContext, "testClassName"), IntegerArgumentType.getInteger(commandContext, "rotationSteps"), 8))).then(Commands.argument("testsPerRow", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> runAllTestsInClass((CommandSourceStack)commandContext.getSource(), TestClassNameArgument.getTestClassName((CommandContext<CommandSourceStack>)commandContext, "testClassName"), IntegerArgumentType.getInteger(commandContext, "rotationSteps"), IntegerArgumentType.getInteger(commandContext, "testsPerRow"))))))).then(((RequiredArgumentBuilder)Commands.argument("rotationSteps", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> runAllTests((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "rotationSteps"), 8))).then(Commands.argument("testsPerRow", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> runAllTests((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "rotationSteps"), IntegerArgumentType.getInteger(commandContext, "testsPerRow"))))))).then(Commands.literal("export").then(Commands.argument("testName", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> exportTestStructure((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "testName")))))).then(Commands.literal("exportthis").executes(commandContext -> exportNearestTestStructure((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("import").then(Commands.argument("testName", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> importTestStructure((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "testName")))))).then(((LiteralArgumentBuilder)Commands.literal("pos").executes(commandContext -> showPos((CommandSourceStack)commandContext.getSource(), "pos"))).then(Commands.argument("var", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> showPos((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "var")))))).then(Commands.literal("create").then(((RequiredArgumentBuilder)Commands.argument("testName", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> createNewStructure((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "testName"), 5, 5, 5))).then(((RequiredArgumentBuilder)Commands.argument("width", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> createNewStructure((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "testName"), IntegerArgumentType.getInteger(commandContext, "width"), IntegerArgumentType.getInteger(commandContext, "width"), IntegerArgumentType.getInteger(commandContext, "width")))).then(Commands.argument("height", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).then(Commands.argument("depth", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> createNewStructure((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "testName"), IntegerArgumentType.getInteger(commandContext, "width"), IntegerArgumentType.getInteger(commandContext, "height"), IntegerArgumentType.getInteger(commandContext, "depth"))))))))).then(((LiteralArgumentBuilder)Commands.literal("clearall").executes(commandContext -> clearAllTests((CommandSourceStack)commandContext.getSource(), 200))).then(Commands.argument("radius", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> clearAllTests((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "radius"))))));
     }
     
-    private static int createNewStructure(final CommandSourceStack cq, final String string, final int integer3, final int integer4, final int integer5) {
-        if (integer3 > 32 || integer4 > 32 || integer5 > 32) {
-            throw new IllegalArgumentException("The structure must be less than 32 blocks big in each axis");
+    private static int createNewStructure(final CommandSourceStack cz, final String string, final int integer3, final int integer4, final int integer5) {
+        if (integer3 > 48 || integer4 > 48 || integer5 > 48) {
+            throw new IllegalArgumentException("The structure must be less than 48 blocks big in each axis");
         }
-        final ServerLevel xd6 = cq.getLevel();
-        final BlockPos fk7 = new BlockPos(cq.getPosition());
-        final BlockPos fk8 = new BlockPos(fk7.getX(), cq.getLevel().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, fk7).getY(), fk7.getZ() + 3);
-        StructureUtils.createNewEmptyStructureBlock(string.toLowerCase(), fk8, new BlockPos(integer3, integer4, integer5), 2, xd6);
+        final ServerLevel zd6 = cz.getLevel();
+        final BlockPos fu7 = new BlockPos(cz.getPosition());
+        final BlockPos fu8 = new BlockPos(fu7.getX(), cz.getLevel().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, fu7).getY(), fu7.getZ() + 3);
+        StructureUtils.createNewEmptyStructureBlock(string.toLowerCase(), fu8, new BlockPos(integer3, integer4, integer5), Rotation.NONE, zd6);
         for (int integer6 = 0; integer6 < integer3; ++integer6) {
             for (int integer7 = 0; integer7 < integer5; ++integer7) {
-                final BlockPos fk9 = new BlockPos(fk8.getX() + integer6, fk8.getY() + 1, fk8.getZ() + integer7);
-                final Block bph12 = Blocks.POLISHED_ANDESITE;
-                final BlockInput ds13 = new BlockInput(bph12.defaultBlockState(), Collections.EMPTY_SET, null);
-                ds13.place(xd6, fk9, 2);
+                final BlockPos fu9 = new BlockPos(fu8.getX() + integer6, fu8.getY() + 1, fu8.getZ() + integer7);
+                final Block bvr12 = Blocks.POLISHED_ANDESITE;
+                final BlockInput ec13 = new BlockInput(bvr12.defaultBlockState(), Collections.EMPTY_SET, null);
+                ec13.place(zd6, fu9, 2);
             }
         }
-        StructureUtils.addCommandBlockAndButtonToStartTest(fk8.offset(1, 0, -1), xd6);
+        StructureUtils.addCommandBlockAndButtonToStartTest(fu8, new BlockPos(1, 0, -1), Rotation.NONE, zd6);
         return 0;
     }
     
-    private static int showPos(final CommandSourceStack cq, final String string) throws CommandSyntaxException {
-        final BlockHitResult cvg3 = (BlockHitResult)cq.getPlayerOrException().pick(10.0, 1.0f, false);
-        final BlockPos fk4 = cvg3.getBlockPos();
-        final ServerLevel xd5 = cq.getLevel();
-        Optional<BlockPos> optional6 = StructureUtils.findStructureBlockContainingPos(fk4, 15, xd5);
+    private static int showPos(final CommandSourceStack cz, final String string) throws CommandSyntaxException {
+        final BlockHitResult deh3 = (BlockHitResult)cz.getPlayerOrException().pick(10.0, 1.0f, false);
+        final BlockPos fu4 = deh3.getBlockPos();
+        final ServerLevel zd5 = cz.getLevel();
+        Optional<BlockPos> optional6 = StructureUtils.findStructureBlockContainingPos(fu4, 15, zd5);
         if (!optional6.isPresent()) {
-            optional6 = StructureUtils.findStructureBlockContainingPos(fk4, 200, xd5);
+            optional6 = StructureUtils.findStructureBlockContainingPos(fu4, 200, zd5);
         }
         if (!optional6.isPresent()) {
-            cq.sendFailure(new TextComponent("Can't find a structure block that contains the targeted pos " + fk4));
+            cz.sendFailure(new TextComponent("Can't find a structure block that contains the targeted pos " + fu4));
             return 0;
         }
-        final StructureBlockEntity bxl7 = (StructureBlockEntity)xd5.getBlockEntity(optional6.get());
-        final BlockPos fk5 = fk4.subtract(optional6.get());
-        final String string2 = fk5.getX() + ", " + fk5.getY() + ", " + fk5.getZ();
-        final String string3 = bxl7.getStructurePath();
-        final Component lf11 = new TextComponent(string2).setStyle(new Style().setBold(true).setColor(ChatFormatting.GREEN).setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent("Click to copy to clipboard"))).setClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, "final BlockPos " + string + " = new BlockPos(" + string2 + ");")));
-        cq.sendSuccess(new TextComponent("Position relative to " + string3 + ": ").append(lf11), false);
-        DebugPackets.sendGameTestAddMarker(xd5, new BlockPos(fk4), string2, -2147418368, 10000);
+        final StructureBlockEntity cel7 = (StructureBlockEntity)zd5.getBlockEntity(optional6.get());
+        final BlockPos fu5 = fu4.subtract(optional6.get());
+        final String string2 = fu5.getX() + ", " + fu5.getY() + ", " + fu5.getZ();
+        final String string3 = cel7.getStructurePath();
+        final Component mr11 = new TextComponent(string2).setStyle(Style.EMPTY.withBold(true).withColor(ChatFormatting.GREEN).withHoverEvent(new HoverEvent((HoverEvent.Action<T>)HoverEvent.Action.SHOW_TEXT, (T)new TextComponent("Click to copy to clipboard"))).withClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, "final BlockPos " + string + " = new BlockPos(" + string2 + ");")));
+        cz.sendSuccess(new TextComponent("Position relative to " + string3 + ": ").append(mr11), false);
+        DebugPackets.sendGameTestAddMarker(zd5, new BlockPos(fu4), string2, -2147418368, 10000);
         return 1;
     }
     
-    private static int runNearbyTest(final CommandSourceStack cq) {
-        final BlockPos fk2 = new BlockPos(cq.getPosition());
-        final ServerLevel xd3 = cq.getLevel();
-        final BlockPos fk3 = StructureUtils.findNearestStructureBlock(fk2, 15, xd3);
-        if (fk3 == null) {
-            say(xd3, "Couldn't find any structure block within 15 radius", ChatFormatting.RED);
+    private static int runNearbyTest(final CommandSourceStack cz) {
+        final BlockPos fu2 = new BlockPos(cz.getPosition());
+        final ServerLevel zd3 = cz.getLevel();
+        final BlockPos fu3 = StructureUtils.findNearestStructureBlock(fu2, 15, zd3);
+        if (fu3 == null) {
+            say(zd3, "Couldn't find any structure block within 15 radius", ChatFormatting.RED);
             return 0;
         }
-        GameTestRunner.clearMarkers(xd3);
-        runTest(xd3, fk3, null);
+        GameTestRunner.clearMarkers(zd3);
+        runTest(zd3, fu3, null);
         return 1;
     }
     
-    private static int runAllNearbyTests(final CommandSourceStack cq) {
-        final BlockPos fk2 = new BlockPos(cq.getPosition());
-        final ServerLevel xd3 = cq.getLevel();
-        final Collection<BlockPos> collection4 = StructureUtils.findStructureBlocks(fk2, 200, xd3);
+    private static int runAllNearbyTests(final CommandSourceStack cz) {
+        final BlockPos fu2 = new BlockPos(cz.getPosition());
+        final ServerLevel zd3 = cz.getLevel();
+        final Collection<BlockPos> collection4 = StructureUtils.findStructureBlocks(fu2, 200, zd3);
         if (collection4.isEmpty()) {
-            say(xd3, "Couldn't find any structure blocks within 200 block radius", ChatFormatting.RED);
+            say(zd3, "Couldn't find any structure blocks within 200 block radius", ChatFormatting.RED);
             return 1;
         }
-        GameTestRunner.clearMarkers(xd3);
-        say(cq, "Running " + collection4.size() + " tests...");
-        final MultipleTestTracker jf5 = new MultipleTestTracker();
-        collection4.forEach(fk -> runTest(xd3, fk, jf5));
+        GameTestRunner.clearMarkers(zd3);
+        say(cz, "Running " + collection4.size() + " tests...");
+        final MultipleTestTracker kq5 = new MultipleTestTracker();
+        collection4.forEach(fu -> runTest(zd3, fu, kq5));
         return 1;
     }
     
-    private static void runTest(final ServerLevel xd, final BlockPos fk, @Nullable final MultipleTestTracker jf) {
-        final StructureBlockEntity bxl4 = (StructureBlockEntity)xd.getBlockEntity(fk);
-        final String string5 = bxl4.getStructurePath();
-        final TestFunction jk6 = GameTestRegistry.getTestFunction(string5);
-        final GameTestInfo iw7 = new GameTestInfo(jk6, fk, xd);
-        if (jf != null) {
-            jf.add(iw7);
-            iw7.addListener(new TestSummaryDisplayer(xd, jf));
+    private static void runTest(final ServerLevel zd, final BlockPos fu, @Nullable final MultipleTestTracker kq) {
+        final StructureBlockEntity cel4 = (StructureBlockEntity)zd.getBlockEntity(fu);
+        final String string5 = cel4.getStructurePath();
+        final TestFunction kv6 = GameTestRegistry.getTestFunction(string5);
+        final GameTestInfo kg7 = new GameTestInfo(kv6, cel4.getRotation(), zd);
+        if (kq != null) {
+            kq.addTestToTrack(kg7);
+            kg7.addListener(new TestSummaryDisplayer(zd, kq));
         }
-        runTestPreparation(jk6, xd);
-        GameTestRunner.runTest(iw7, GameTestTicker.singleton);
+        runTestPreparation(kv6, zd);
+        final AABB deg8 = StructureUtils.getStructureBounds(cel4);
+        final BlockPos fu2 = new BlockPos(deg8.minX, deg8.minY, deg8.minZ);
+        GameTestRunner.runTest(kg7, fu2, GameTestTicker.singleton);
     }
     
-    private static void showTestSummaryIfAllDone(final ServerLevel xd, final MultipleTestTracker jf) {
-        if (jf.isDone()) {
-            say(xd, "GameTest done! " + jf.getTotalCount() + " tests were run", ChatFormatting.WHITE);
-            if (jf.hasFailedRequired()) {
-                say(xd, "" + jf.getFailedRequiredCount() + " required tests failed :(", ChatFormatting.RED);
+    private static void showTestSummaryIfAllDone(final ServerLevel zd, final MultipleTestTracker kq) {
+        if (kq.isDone()) {
+            say(zd, "GameTest done! " + kq.getTotalCount() + " tests were run", ChatFormatting.WHITE);
+            if (kq.hasFailedRequired()) {
+                say(zd, "" + kq.getFailedRequiredCount() + " required tests failed :(", ChatFormatting.RED);
             }
             else {
-                say(xd, "All required tests passed :)", ChatFormatting.GREEN);
+                say(zd, "All required tests passed :)", ChatFormatting.GREEN);
             }
-            if (jf.hasFailedOptional()) {
-                say(xd, "" + jf.getFailedOptionalCount() + " optional tests failed", ChatFormatting.GRAY);
+            if (kq.hasFailedOptional()) {
+                say(zd, "" + kq.getFailedOptionalCount() + " optional tests failed", ChatFormatting.GRAY);
             }
         }
     }
     
-    private static int clearAllTests(final CommandSourceStack cq, final int integer) {
-        final ServerLevel xd3 = cq.getLevel();
-        GameTestRunner.clearMarkers(xd3);
-        final BlockPos fk4 = new BlockPos(cq.getPosition().x, cq.getLevel().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, new BlockPos(cq.getPosition())).getY(), cq.getPosition().z);
-        GameTestRunner.clearAllTests(xd3, fk4, GameTestTicker.singleton, Mth.clamp(integer, 0, 1024));
+    private static int clearAllTests(final CommandSourceStack cz, final int integer) {
+        final ServerLevel zd3 = cz.getLevel();
+        GameTestRunner.clearMarkers(zd3);
+        final BlockPos fu4 = new BlockPos(cz.getPosition().x, cz.getLevel().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, new BlockPos(cz.getPosition())).getY(), cz.getPosition().z);
+        GameTestRunner.clearAllTests(zd3, fu4, GameTestTicker.singleton, Mth.clamp(integer, 0, 1024));
         return 1;
     }
     
-    private static int runTest(final CommandSourceStack cq, final TestFunction jk) {
-        final ServerLevel xd3 = cq.getLevel();
-        final BlockPos fk4 = new BlockPos(cq.getPosition());
-        final BlockPos fk5 = new BlockPos(fk4.getX(), cq.getLevel().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, fk4).getY(), fk4.getZ() + 3);
-        GameTestRunner.clearMarkers(xd3);
-        runTestPreparation(jk, xd3);
-        final GameTestInfo iw6 = new GameTestInfo(jk, fk5, xd3);
-        GameTestRunner.runTest(iw6, GameTestTicker.singleton);
+    private static int runTest(final CommandSourceStack cz, final TestFunction kv, final int integer) {
+        final ServerLevel zd4 = cz.getLevel();
+        final BlockPos fu5 = new BlockPos(cz.getPosition());
+        final int integer2 = cz.getLevel().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, fu5).getY();
+        final BlockPos fu6 = new BlockPos(fu5.getX(), integer2, fu5.getZ() + 3);
+        GameTestRunner.clearMarkers(zd4);
+        runTestPreparation(kv, zd4);
+        final Rotation cap8 = StructureUtils.getRotationForRotationSteps(integer);
+        final GameTestInfo kg9 = new GameTestInfo(kv, cap8, zd4);
+        GameTestRunner.runTest(kg9, fu6, GameTestTicker.singleton);
         return 1;
     }
     
-    private static void runTestPreparation(final TestFunction jk, final ServerLevel xd) {
-        final Consumer<ServerLevel> consumer3 = GameTestRegistry.getBeforeBatchFunction(jk.getBatchName());
+    private static void runTestPreparation(final TestFunction kv, final ServerLevel zd) {
+        final Consumer<ServerLevel> consumer3 = GameTestRegistry.getBeforeBatchFunction(kv.getBatchName());
         if (consumer3 != null) {
-            consumer3.accept(xd);
+            consumer3.accept(zd);
         }
     }
     
-    private static int runAllTests(final CommandSourceStack cq) {
-        GameTestRunner.clearMarkers(cq.getLevel());
-        runTests(cq, GameTestRegistry.getAllTestFunctions());
+    private static int runAllTests(final CommandSourceStack cz, final int integer2, final int integer3) {
+        GameTestRunner.clearMarkers(cz.getLevel());
+        final Collection<TestFunction> collection4 = GameTestRegistry.getAllTestFunctions();
+        say(cz, "Running all " + collection4.size() + " tests...");
+        GameTestRegistry.forgetFailedTests();
+        runTests(cz, collection4, integer2, integer3);
         return 1;
     }
     
-    private static int runAllTestsInClass(final CommandSourceStack cq, final String string) {
-        final Collection<TestFunction> collection3 = GameTestRegistry.getTestFunctionsForClassName(string);
-        GameTestRunner.clearMarkers(cq.getLevel());
-        runTests(cq, collection3);
+    private static int runAllTestsInClass(final CommandSourceStack cz, final String string, final int integer3, final int integer4) {
+        final Collection<TestFunction> collection5 = GameTestRegistry.getTestFunctionsForClassName(string);
+        GameTestRunner.clearMarkers(cz.getLevel());
+        say(cz, "Running " + collection5.size() + " tests from " + string + "...");
+        GameTestRegistry.forgetFailedTests();
+        runTests(cz, collection5, integer3, integer4);
         return 1;
     }
     
-    private static void runTests(final CommandSourceStack cq, final Collection<TestFunction> collection) {
-        final BlockPos fk3 = new BlockPos(cq.getPosition());
-        final BlockPos fk4 = new BlockPos(fk3.getX(), cq.getLevel().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, fk3).getY(), fk3.getZ() + 3);
-        final ServerLevel xd5 = cq.getLevel();
-        say(cq, "Running " + collection.size() + " tests...");
-        final Collection<GameTestInfo> collection2 = GameTestRunner.runTests(collection, fk4, xd5, GameTestTicker.singleton);
-        final MultipleTestTracker jf7 = new MultipleTestTracker(collection2);
-        jf7.setListener(new TestSummaryDisplayer(xd5, jf7));
+    private static int runLastFailedTests(final CommandSourceStack cz, final boolean boolean2, final int integer3, final int integer4) {
+        Collection<TestFunction> collection5;
+        if (boolean2) {
+            collection5 = GameTestRegistry.getLastFailedTests().stream().filter(TestFunction::isRequired).collect(Collectors.toList());
+        }
+        else {
+            collection5 = GameTestRegistry.getLastFailedTests();
+        }
+        if (collection5.isEmpty()) {
+            say(cz, "No failed tests to rerun");
+            return 0;
+        }
+        GameTestRunner.clearMarkers(cz.getLevel());
+        say(cz, "Rerunning " + collection5.size() + " failed tests (" + (boolean2 ? "only required tests" : "including optional tests") + ")");
+        runTests(cz, collection5, integer3, integer4);
+        return 1;
     }
     
-    private static void say(final CommandSourceStack cq, final String string) {
-        cq.sendSuccess(new TextComponent(string), false);
+    private static void runTests(final CommandSourceStack cz, final Collection<TestFunction> collection, final int integer3, final int integer4) {
+        final BlockPos fu5 = new BlockPos(cz.getPosition());
+        final BlockPos fu6 = new BlockPos(fu5.getX(), cz.getLevel().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, fu5).getY(), fu5.getZ() + 3);
+        final ServerLevel zd7 = cz.getLevel();
+        final Rotation cap8 = StructureUtils.getRotationForRotationSteps(integer3);
+        final Collection<GameTestInfo> collection2 = GameTestRunner.runTests(collection, fu6, cap8, zd7, GameTestTicker.singleton, integer4);
+        final MultipleTestTracker kq10 = new MultipleTestTracker(collection2);
+        kq10.addListener(new TestSummaryDisplayer(zd7, kq10));
+        kq10.addFailureListener(kg -> GameTestRegistry.rememberFailedTest(kg.getTestFunction()));
     }
     
-    private static int exportTestStructure(final CommandSourceStack cq, final String string) {
+    private static void say(final CommandSourceStack cz, final String string) {
+        cz.sendSuccess(new TextComponent(string), false);
+    }
+    
+    private static int exportNearestTestStructure(final CommandSourceStack cz) {
+        final BlockPos fu2 = new BlockPos(cz.getPosition());
+        final ServerLevel zd3 = cz.getLevel();
+        final BlockPos fu3 = StructureUtils.findNearestStructureBlock(fu2, 15, zd3);
+        if (fu3 == null) {
+            say(zd3, "Couldn't find any structure block within 15 radius", ChatFormatting.RED);
+            return 0;
+        }
+        final StructureBlockEntity cel5 = (StructureBlockEntity)zd3.getBlockEntity(fu3);
+        final String string6 = cel5.getStructurePath();
+        return exportTestStructure(cz, string6);
+    }
+    
+    private static int exportTestStructure(final CommandSourceStack cz, final String string) {
         final Path path3 = Paths.get(StructureUtils.testStructuresDir);
-        final ResourceLocation sm4 = new ResourceLocation("minecraft", string);
-        final Path path4 = cq.getLevel().getStructureManager().createPathToStructure(sm4, ".nbt");
+        final ResourceLocation uh4 = new ResourceLocation("minecraft", string);
+        final Path path4 = cz.getLevel().getStructureManager().createPathToStructure(uh4, ".nbt");
         final Path path5 = NbtToSnbt.convertStructure(path4, string, path3);
         if (path5 == null) {
-            say(cq, "Failed to export " + path4);
+            say(cz, "Failed to export " + path4);
             return 1;
         }
         try {
             Files.createDirectories(path5.getParent(), new FileAttribute[0]);
         }
         catch (IOException iOException7) {
-            say(cq, "Could not create folder " + path5.getParent());
+            say(cz, "Could not create folder " + path5.getParent());
             iOException7.printStackTrace();
             return 1;
         }
-        say(cq, "Exported to " + path5.toAbsolutePath());
+        say(cz, "Exported " + string + " to " + path5.toAbsolutePath());
         return 0;
     }
     
-    private static int importTestStructure(final CommandSourceStack cq, final String string) {
+    private static int importTestStructure(final CommandSourceStack cz, final String string) {
         final Path path3 = Paths.get(StructureUtils.testStructuresDir, string + ".snbt");
-        final ResourceLocation sm4 = new ResourceLocation("minecraft", string);
-        final Path path4 = cq.getLevel().getStructureManager().createPathToStructure(sm4, ".nbt");
+        final ResourceLocation uh4 = new ResourceLocation("minecraft", string);
+        final Path path4 = cz.getLevel().getStructureManager().createPathToStructure(uh4, ".nbt");
         try {
             final BufferedReader bufferedReader6 = Files.newBufferedReader(path3);
             final String string2 = IOUtils.toString((Reader)bufferedReader6);
             Files.createDirectories(path4.getParent(), new FileAttribute[0]);
             final OutputStream outputStream8 = Files.newOutputStream(path4);
             NbtIo.writeCompressed(TagParser.parseTag(string2), outputStream8);
-            say(cq, "Imported to " + path4.toAbsolutePath());
+            say(cz, "Imported to " + path4.toAbsolutePath());
             return 0;
         }
         catch (IOException | CommandSyntaxException ex2) {
@@ -250,11 +297,11 @@ public class TestCommand {
         }
     }
     
-    private static void say(final ServerLevel xd, final String string, final ChatFormatting g) {
-        final TextComponent lf;
-        xd.getPlayers(xe -> true).forEach(xe -> {
-            new TextComponent(g + string);
-            xe.sendMessage(lf);
+    private static void say(final ServerLevel zd, final String string, final ChatFormatting i) {
+        final TextComponent mr;
+        zd.getPlayers(ze -> true).forEach(ze -> {
+            new TextComponent(i + string);
+            ze.sendMessage(mr, Util.NIL_UUID);
         });
     }
     
@@ -262,17 +309,17 @@ public class TestCommand {
         private final ServerLevel level;
         private final MultipleTestTracker tracker;
         
-        public TestSummaryDisplayer(final ServerLevel xd, final MultipleTestTracker jf) {
-            this.level = xd;
-            this.tracker = jf;
+        public TestSummaryDisplayer(final ServerLevel zd, final MultipleTestTracker kq) {
+            this.level = zd;
+            this.tracker = kq;
         }
         
         @Override
-        public void testStructureLoaded(final GameTestInfo iw) {
+        public void testStructureLoaded(final GameTestInfo kg) {
         }
         
         @Override
-        public void testFailed(final GameTestInfo iw) {
+        public void testFailed(final GameTestInfo kg) {
             showTestSummaryIfAllDone(this.level, this.tracker);
         }
     }
diff --git a/src/net/minecraft/gametest/framework/TestFunction.java b/src/net/minecraft/gametest/framework/TestFunction.java
index c20e154..377be3d 100644
--- a/src/net/minecraft/gametest/framework/TestFunction.java
+++ b/src/net/minecraft/gametest/framework/TestFunction.java
@@ -1,5 +1,6 @@
 package net.minecraft.gametest.framework;
 
+import net.minecraft.world.level.block.Rotation;
 import java.util.function.Consumer;
 
 public class TestFunction {
@@ -10,9 +11,10 @@ public class TestFunction {
     private final Consumer<GameTestHelper> function;
     private final int maxTicks;
     private final long setupTicks;
+    private final Rotation rotation;
     
-    public void run(final GameTestHelper iv) {
-        this.function.accept(iv);
+    public void run(final GameTestHelper kf) {
+        this.function.accept(kf);
     }
     
     public String getTestName() {
@@ -43,4 +45,8 @@ public class TestFunction {
     public long getSetupTicks() {
         return this.setupTicks;
     }
+    
+    public Rotation getRotation() {
+        return this.rotation;
+    }
 }
diff --git a/src/net/minecraft/gametest/framework/TestReporter.java b/src/net/minecraft/gametest/framework/TestReporter.java
index 365981b..3c7014d 100644
--- a/src/net/minecraft/gametest/framework/TestReporter.java
+++ b/src/net/minecraft/gametest/framework/TestReporter.java
@@ -1,5 +1,5 @@
 package net.minecraft.gametest.framework;
 
 public interface TestReporter {
-    void onTestFailed(final GameTestInfo iw);
+    void onTestFailed(final GameTestInfo kg);
 }
diff --git a/src/net/minecraft/locale/Language.java b/src/net/minecraft/locale/Language.java
index 09ee2eb..245c958 100644
--- a/src/net/minecraft/locale/Language.java
+++ b/src/net/minecraft/locale/Language.java
@@ -2,77 +2,91 @@ package net.minecraft.locale;
 
 import org.apache.logging.log4j.LogManager;
 import java.util.Iterator;
-import com.google.gson.JsonObject;
-import java.io.InputStream;
-import com.google.gson.JsonParseException;
-import java.io.IOException;
-import net.minecraft.Util;
 import net.minecraft.util.GsonHelper;
+import com.google.gson.JsonElement;
 import java.io.Reader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.common.collect.Maps;
+import com.google.gson.JsonObject;
+import java.io.InputStream;
+import java.util.function.BiConsumer;
 import java.util.Map;
+import com.google.gson.JsonParseException;
+import java.io.IOException;
+import com.google.common.collect.ImmutableMap;
 import java.util.regex.Pattern;
+import com.google.gson.Gson;
 import org.apache.logging.log4j.Logger;
 
-public class Language {
+public abstract class Language {
     private static final Logger LOGGER;
+    private static final Gson GSON;
     private static final Pattern UNSUPPORTED_FORMAT_PATTERN;
-    private static final Language SINGLETON;
-    private final Map<String, String> storage;
-    private long lastUpdateTime;
+    private static volatile Language instance;
     
-    public Language() {
-        this.storage = Maps.newHashMap();
-        try (final InputStream inputStream2 = Language.class.getResourceAsStream("/assets/minecraft/lang/en_us.json")) {
-            final JsonElement jsonElement4 = new Gson().<JsonElement>fromJson(new InputStreamReader(inputStream2, StandardCharsets.UTF_8), JsonElement.class);
-            final JsonObject jsonObject5 = GsonHelper.convertToJsonObject(jsonElement4, "strings");
-            for (final Map.Entry<String, JsonElement> entry7 : jsonObject5.entrySet()) {
-                final String string8 = Language.UNSUPPORTED_FORMAT_PATTERN.matcher(GsonHelper.convertToString(entry7.getValue(), entry7.getKey())).replaceAll("%$1s");
-                this.storage.put(entry7.getKey(), string8);
-            }
-            this.lastUpdateTime = Util.getMillis();
+    private static Language loadDefault() {
+        final ImmutableMap.Builder<String, String> builder1 = ImmutableMap.<String, String>builder();
+        final BiConsumer<String, String> biConsumer2 = builder1::put;
+        try (final InputStream inputStream3 = Language.class.getResourceAsStream("/assets/minecraft/lang/en_us.json")) {
+            loadFromJson(inputStream3, biConsumer2);
         }
         catch (IOException | JsonParseException ex2) {
             final Exception ex;
-            final Exception exception2 = ex;
-            Language.LOGGER.error("Couldn't read strings from /assets/minecraft/lang/en_us.json", (Throwable)exception2);
+            final Exception exception3 = ex;
+            Language.LOGGER.error("Couldn't read strings from /assets/minecraft/lang/en_us.json", (Throwable)exception3);
+        }
+        final Map<String, String> map3 = builder1.build();
+        return new Language() {
+            @Override
+            public String getOrDefault(final String string) {
+                return map3.getOrDefault(string, string);
+            }
+            
+            @Override
+            public boolean has(final String string) {
+                return map3.containsKey(string);
+            }
+            
+            @Override
+            public boolean requiresReordering() {
+                return false;
+            }
+            
+            @Override
+            public String reorder(final String string, final boolean boolean2) {
+                return string;
+            }
+        };
+    }
+    
+    public static void loadFromJson(final InputStream inputStream, final BiConsumer<String, String> biConsumer) {
+        final JsonObject jsonObject3 = Language.GSON.<JsonObject>fromJson(new InputStreamReader(inputStream, StandardCharsets.UTF_8), JsonObject.class);
+        for (final Map.Entry<String, JsonElement> entry5 : jsonObject3.entrySet()) {
+            final String string6 = Language.UNSUPPORTED_FORMAT_PATTERN.matcher(GsonHelper.convertToString(entry5.getValue(), entry5.getKey())).replaceAll("%$1s");
+            biConsumer.accept(entry5.getKey(), string6);
         }
     }
     
     public static Language getInstance() {
-        return Language.SINGLETON;
+        return Language.instance;
     }
     
-    public static synchronized void forceData(final Map<String, String> map) {
-        Language.SINGLETON.storage.clear();
-        Language.SINGLETON.storage.putAll(map);
-        Language.SINGLETON.lastUpdateTime = Util.getMillis();
+    public static void inject(final Language kz) {
+        Language.instance = kz;
     }
     
-    public synchronized String getElement(final String string) {
-        return this.getProperty(string);
-    }
+    public abstract String getOrDefault(final String string);
     
-    private String getProperty(final String string) {
-        final String string2 = this.storage.get(string);
-        return (string2 == null) ? string : string2;
-    }
+    public abstract boolean has(final String string);
     
-    public synchronized boolean exists(final String string) {
-        return this.storage.containsKey(string);
-    }
+    public abstract boolean requiresReordering();
     
-    public long getLastUpdateTime() {
-        return this.lastUpdateTime;
-    }
+    public abstract String reorder(final String string, final boolean boolean2);
     
     static {
         LOGGER = LogManager.getLogger();
-        UNSUPPORTED_FORMAT_PATTERN = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]");
-        SINGLETON = new Language();
+        GSON = new Gson();
+        UNSUPPORTED_FORMAT_PATTERN = Pattern.compile("%(\\d+\\$)?[\\d.]*[df]");
+        Language.instance = loadDefault();
     }
 }
diff --git a/src/net/minecraft/nbt/ByteArrayTag.java b/src/net/minecraft/nbt/ByteArrayTag.java
index 78817b7..a0a35d6 100644
--- a/src/net/minecraft/nbt/ByteArrayTag.java
+++ b/src/net/minecraft/nbt/ByteArrayTag.java
@@ -2,6 +2,7 @@ package net.minecraft.nbt;
 
 import java.io.DataInput;
 import org.apache.commons.lang3.ArrayUtils;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.Component;
 import java.util.Arrays;
@@ -77,17 +78,17 @@ public class ByteArrayTag extends CollectionTag<ByteTag> {
     
     @Override
     public Component getPrettyDisplay(final String string, final int integer) {
-        final Component lf4 = new TextComponent("B").withStyle(ByteArrayTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
-        final Component lf5 = new TextComponent("[").append(lf4).append(";");
+        final Component mr4 = new TextComponent("B").withStyle(ByteArrayTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+        final MutableComponent mx5 = new TextComponent("[").append(mr4).append(";");
         for (int integer2 = 0; integer2 < this.data.length; ++integer2) {
-            final Component lf6 = new TextComponent(String.valueOf(this.data[integer2])).withStyle(ByteArrayTag.SYNTAX_HIGHLIGHTING_NUMBER);
-            lf5.append(" ").append(lf6).append(lf4);
+            final MutableComponent mx6 = new TextComponent(String.valueOf(this.data[integer2])).withStyle(ByteArrayTag.SYNTAX_HIGHLIGHTING_NUMBER);
+            mx5.append(" ").append(mx6).append(mr4);
             if (integer2 != this.data.length - 1) {
-                lf5.append(",");
+                mx5.append(",");
             }
         }
-        lf5.append("]");
-        return lf5;
+        mx5.append("]");
+        return mx5;
     }
     
     public byte[] getAsByteArray() {
@@ -105,30 +106,30 @@ public class ByteArrayTag extends CollectionTag<ByteTag> {
     }
     
     @Override
-    public ByteTag set(final int integer, final ByteTag jr) {
+    public ByteTag set(final int integer, final ByteTag lc) {
         final byte byte4 = this.data[integer];
-        this.data[integer] = jr.getAsByte();
+        this.data[integer] = lc.getAsByte();
         return ByteTag.valueOf(byte4);
     }
     
     @Override
-    public void add(final int integer, final ByteTag jr) {
-        this.data = ArrayUtils.add(this.data, integer, jr.getAsByte());
+    public void add(final int integer, final ByteTag lc) {
+        this.data = ArrayUtils.add(this.data, integer, lc.getAsByte());
     }
     
     @Override
-    public boolean setTag(final int integer, final Tag kj) {
-        if (kj instanceof NumericTag) {
-            this.data[integer] = ((NumericTag)kj).getAsByte();
+    public boolean setTag(final int integer, final Tag lu) {
+        if (lu instanceof NumericTag) {
+            this.data[integer] = ((NumericTag)lu).getAsByte();
             return true;
         }
         return false;
     }
     
     @Override
-    public boolean addTag(final int integer, final Tag kj) {
-        if (kj instanceof NumericTag) {
-            this.data = ArrayUtils.add(this.data, integer, ((NumericTag)kj).getAsByte());
+    public boolean addTag(final int integer, final Tag lu) {
+        if (lu instanceof NumericTag) {
+            this.data = ArrayUtils.add(this.data, integer, ((NumericTag)lu).getAsByte());
             return true;
         }
         return false;
@@ -141,6 +142,11 @@ public class ByteArrayTag extends CollectionTag<ByteTag> {
         return ByteTag.valueOf(byte3);
     }
     
+    @Override
+    public byte getElementType() {
+        return 1;
+    }
+    
     @Override
     public void clear() {
         this.data = new byte[0];
@@ -149,10 +155,10 @@ public class ByteArrayTag extends CollectionTag<ByteTag> {
     static {
         TYPE = new TagType<ByteArrayTag>() {
             @Override
-            public ByteArrayTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(192L);
+            public ByteArrayTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(192L);
                 final int integer2 = dataInput.readInt();
-                kc.accountBits(8L * integer2);
+                ln.accountBits(8L * integer2);
                 final byte[] arr6 = new byte[integer2];
                 dataInput.readFully(arr6);
                 return new ByteArrayTag(arr6);
diff --git a/src/net/minecraft/nbt/ByteTag.java b/src/net/minecraft/nbt/ByteTag.java
index 47307fb..619fab2 100644
--- a/src/net/minecraft/nbt/ByteTag.java
+++ b/src/net/minecraft/nbt/ByteTag.java
@@ -61,8 +61,8 @@ public class ByteTag extends NumericTag {
     
     @Override
     public Component getPrettyDisplay(final String string, final int integer) {
-        final Component lf4 = new TextComponent("b").withStyle(ByteTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
-        return new TextComponent(String.valueOf(this.data)).append(lf4).withStyle(ByteTag.SYNTAX_HIGHLIGHTING_NUMBER);
+        final Component mr4 = new TextComponent("b").withStyle(ByteTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+        return new TextComponent(String.valueOf(this.data)).append(mr4).withStyle(ByteTag.SYNTAX_HIGHLIGHTING_NUMBER);
     }
     
     @Override
@@ -103,8 +103,8 @@ public class ByteTag extends NumericTag {
     static {
         TYPE = new TagType<ByteTag>() {
             @Override
-            public ByteTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(72L);
+            public ByteTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(72L);
                 return ByteTag.valueOf(dataInput.readByte());
             }
             
diff --git a/src/net/minecraft/nbt/CollectionTag.java b/src/net/minecraft/nbt/CollectionTag.java
index 22ecca9..d599c24 100644
--- a/src/net/minecraft/nbt/CollectionTag.java
+++ b/src/net/minecraft/nbt/CollectionTag.java
@@ -4,15 +4,17 @@ import java.util.AbstractList;
 
 public abstract class CollectionTag<T extends Tag> extends AbstractList<T> implements Tag {
     @Override
-    public abstract T set(final int integer, final T kj);
+    public abstract T set(final int integer, final T lu);
     
     @Override
-    public abstract void add(final int integer, final T kj);
+    public abstract void add(final int integer, final T lu);
     
     @Override
     public abstract T remove(final int integer);
     
-    public abstract boolean setTag(final int integer, final Tag kj);
+    public abstract boolean setTag(final int integer, final Tag lu);
     
-    public abstract boolean addTag(final int integer, final Tag kj);
+    public abstract boolean addTag(final int integer, final Tag lu);
+    
+    public abstract byte getElementType();
 }
diff --git a/src/net/minecraft/nbt/CompoundTag.java b/src/net/minecraft/nbt/CompoundTag.java
index 722fb38..ac8b4aa 100644
--- a/src/net/minecraft/nbt/CompoundTag.java
+++ b/src/net/minecraft/nbt/CompoundTag.java
@@ -1,6 +1,10 @@
 package net.minecraft.nbt;
 
 import org.apache.logging.log4j.LogManager;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.network.chat.MutableComponent;
 import com.google.common.base.Strings;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.Component;
@@ -24,14 +28,16 @@ import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.regex.Pattern;
 import org.apache.logging.log4j.Logger;
+import com.mojang.serialization.Codec;
 
 public class CompoundTag implements Tag {
+    public static final Codec<CompoundTag> CODEC;
     private static final Logger LOGGER;
     private static final Pattern SIMPLE_VALUE;
     public static final TagType<CompoundTag> TYPE;
     private final Map<String, Tag> tags;
     
-    private CompoundTag(final Map<String, Tag> map) {
+    protected CompoundTag(final Map<String, Tag> map) {
         this.tags = map;
     }
     
@@ -42,8 +48,8 @@ public class CompoundTag implements Tag {
     @Override
     public void write(final DataOutput dataOutput) throws IOException {
         for (final String string4 : this.tags.keySet()) {
-            final Tag kj5 = this.tags.get(string4);
-            writeNamedTag(string4, kj5, dataOutput);
+            final Tag lu5 = this.tags.get(string4);
+            writeNamedTag(string4, lu5, dataOutput);
         }
         dataOutput.writeByte(0);
     }
@@ -67,8 +73,8 @@ public class CompoundTag implements Tag {
     }
     
     @Nullable
-    public Tag put(final String string, final Tag kj) {
-        return this.tags.put(string, kj);
+    public Tag put(final String string, final Tag lu) {
+        return this.tags.put(string, lu);
     }
     
     public void putByte(final String string, final byte byte2) {
@@ -88,21 +94,16 @@ public class CompoundTag implements Tag {
     }
     
     public void putUUID(final String string, final UUID uUID) {
-        this.putLong(string + "Most", uUID.getMostSignificantBits());
-        this.putLong(string + "Least", uUID.getLeastSignificantBits());
+        this.tags.put(string, NbtUtils.createUUID(uUID));
     }
     
     public UUID getUUID(final String string) {
-        return new UUID(this.getLong(string + "Most"), this.getLong(string + "Least"));
+        return NbtUtils.loadUUID(this.get(string));
     }
     
     public boolean hasUUID(final String string) {
-        return this.contains(string + "Most", 99) && this.contains(string + "Least", 99);
-    }
-    
-    public void removeUUID(final String string) {
-        this.remove(string + "Most");
-        this.remove(string + "Least");
+        final Tag lu3 = this.get(string);
+        return lu3 != null && lu3.getType() == IntArrayTag.TYPE && ((IntArrayTag)lu3).getAsIntArray().length == 4;
     }
     
     public void putFloat(final String string, final float float2) {
@@ -147,11 +148,11 @@ public class CompoundTag implements Tag {
     }
     
     public byte getTagType(final String string) {
-        final Tag kj3 = this.tags.get(string);
-        if (kj3 == null) {
+        final Tag lu3 = this.tags.get(string);
+        if (lu3 == null) {
             return 0;
         }
-        return kj3.getId();
+        return lu3.getId();
     }
     
     public boolean contains(final String string) {
@@ -284,9 +285,9 @@ public class CompoundTag implements Tag {
     public ListTag getList(final String string, final int integer) {
         try {
             if (this.getTagType(string) == 9) {
-                final ListTag jz4 = this.tags.get(string);
-                if (jz4.isEmpty() || jz4.getElementType() == integer) {
-                    return jz4;
+                final ListTag lk4 = this.tags.get(string);
+                if (lk4.isEmpty() || lk4.getElementType() == integer) {
+                    return lk4;
                 }
                 return new ListTag();
             }
@@ -327,13 +328,13 @@ public class CompoundTag implements Tag {
         return this.tags.isEmpty();
     }
     
-    private CrashReport createReport(final String string, final TagType<?> kl, final ClassCastException classCastException) {
-        final CrashReport h5 = CrashReport.forThrowable(classCastException, "Reading NBT data");
-        final CrashReportCategory i6 = h5.addCategory("Corrupt NBT tag", 1);
-        i6.setDetail("Tag type found", () -> this.tags.get(string).getType().getName());
-        i6.setDetail("Tag type expected", kl::getName);
-        i6.setDetail("Tag name", string);
-        return h5;
+    private CrashReport createReport(final String string, final TagType<?> lw, final ClassCastException classCastException) {
+        final CrashReport j5 = CrashReport.forThrowable(classCastException, "Reading NBT data");
+        final CrashReportCategory k6 = j5.addCategory("Corrupt NBT tag", 1);
+        k6.setDetail("Tag type found", () -> this.tags.get(string).getType().getName());
+        k6.setDetail("Tag type expected", lw::getName);
+        k6.setDetail("Tag name", string);
+        return j5;
     }
     
     @Override
@@ -352,50 +353,50 @@ public class CompoundTag implements Tag {
         return this.tags.hashCode();
     }
     
-    private static void writeNamedTag(final String string, final Tag kj, final DataOutput dataOutput) throws IOException {
-        dataOutput.writeByte(kj.getId());
-        if (kj.getId() == 0) {
+    private static void writeNamedTag(final String string, final Tag lu, final DataOutput dataOutput) throws IOException {
+        dataOutput.writeByte(lu.getId());
+        if (lu.getId() == 0) {
             return;
         }
         dataOutput.writeUTF(string);
-        kj.write(dataOutput);
+        lu.write(dataOutput);
     }
     
-    private static byte readNamedTagType(final DataInput dataInput, final NbtAccounter kc) throws IOException {
+    private static byte readNamedTagType(final DataInput dataInput, final NbtAccounter ln) throws IOException {
         return dataInput.readByte();
     }
     
-    private static String readNamedTagName(final DataInput dataInput, final NbtAccounter kc) throws IOException {
+    private static String readNamedTagName(final DataInput dataInput, final NbtAccounter ln) throws IOException {
         return dataInput.readUTF();
     }
     
-    private static Tag readNamedTagData(final TagType<?> kl, final String string, final DataInput dataInput, final int integer, final NbtAccounter kc) {
+    private static Tag readNamedTagData(final TagType<?> lw, final String string, final DataInput dataInput, final int integer, final NbtAccounter ln) {
         try {
-            return (Tag)kl.load(dataInput, integer, kc);
+            return (Tag)lw.load(dataInput, integer, ln);
         }
         catch (IOException iOException6) {
-            final CrashReport h7 = CrashReport.forThrowable(iOException6, "Loading NBT data");
-            final CrashReportCategory i8 = h7.addCategory("NBT Tag");
-            i8.setDetail("Tag name", string);
-            i8.setDetail("Tag type", kl.getName());
-            throw new ReportedException(h7);
+            final CrashReport j7 = CrashReport.forThrowable(iOException6, "Loading NBT data");
+            final CrashReportCategory k8 = j7.addCategory("NBT Tag");
+            k8.setDetail("Tag name", string);
+            k8.setDetail("Tag type", lw.getName());
+            throw new ReportedException(j7);
         }
     }
     
-    public CompoundTag merge(final CompoundTag jt) {
-        for (final String string4 : jt.tags.keySet()) {
-            final Tag kj5 = jt.tags.get(string4);
-            if (kj5.getId() == 10) {
+    public CompoundTag merge(final CompoundTag le) {
+        for (final String string4 : le.tags.keySet()) {
+            final Tag lu5 = le.tags.get(string4);
+            if (lu5.getId() == 10) {
                 if (this.contains(string4, 10)) {
-                    final CompoundTag jt2 = this.getCompound(string4);
-                    jt2.merge((CompoundTag)kj5);
+                    final CompoundTag le2 = this.getCompound(string4);
+                    le2.merge((CompoundTag)lu5);
                 }
                 else {
-                    this.put(string4, kj5.copy());
+                    this.put(string4, lu5.copy());
                 }
             }
             else {
-                this.put(string4, kj5.copy());
+                this.put(string4, lu5.copy());
             }
         }
         return this;
@@ -414,8 +415,8 @@ public class CompoundTag implements Tag {
         }
         final String string2 = StringTag.quoteAndEscape(string);
         final String string3 = string2.substring(0, 1);
-        final Component lf4 = new TextComponent(string2.substring(1, string2.length() - 1)).withStyle(CompoundTag.SYNTAX_HIGHLIGHTING_KEY);
-        return new TextComponent(string3).append(lf4).append(string3);
+        final Component mr4 = new TextComponent(string2.substring(1, string2.length() - 1)).withStyle(CompoundTag.SYNTAX_HIGHLIGHTING_KEY);
+        return new TextComponent(string3).append(mr4).append(string3);
     }
     
     @Override
@@ -423,7 +424,7 @@ public class CompoundTag implements Tag {
         if (this.tags.isEmpty()) {
             return new TextComponent("{}");
         }
-        final Component lf4 = new TextComponent("{");
+        final MutableComponent mx4 = new TextComponent("{");
         Collection<String> collection5 = this.tags.keySet();
         if (CompoundTag.LOGGER.isDebugEnabled()) {
             final List<String> list6 = Lists.newArrayList(this.tags.keySet());
@@ -431,45 +432,59 @@ public class CompoundTag implements Tag {
             collection5 = list6;
         }
         if (!string.isEmpty()) {
-            lf4.append("\n");
+            mx4.append("\n");
         }
         final Iterator<String> iterator6 = collection5.iterator();
         while (iterator6.hasNext()) {
             final String string2 = iterator6.next();
-            final Component lf5 = new TextComponent(Strings.repeat(string, integer + 1)).append(handleEscapePretty(string2)).append(String.valueOf(':')).append(" ").append(this.tags.get(string2).getPrettyDisplay(string, integer + 1));
+            final MutableComponent mx5 = new TextComponent(Strings.repeat(string, integer + 1)).append(handleEscapePretty(string2)).append(String.valueOf(':')).append(" ").append(this.tags.get(string2).getPrettyDisplay(string, integer + 1));
             if (iterator6.hasNext()) {
-                lf5.append(String.valueOf(',')).append(string.isEmpty() ? " " : "\n");
+                mx5.append(String.valueOf(',')).append(string.isEmpty() ? " " : "\n");
             }
-            lf4.append(lf5);
+            mx4.append(mx5);
         }
         if (!string.isEmpty()) {
-            lf4.append("\n").append(Strings.repeat(string, integer));
+            mx4.append("\n").append(Strings.repeat(string, integer));
         }
-        lf4.append("}");
-        return lf4;
+        mx4.append("}");
+        return mx4;
+    }
+    
+    protected Map<String, Tag> entries() {
+        return Collections.<String, Tag>unmodifiableMap(this.tags);
     }
     
     static {
+        final Tag lu2;
+        CODEC = Codec.PASSTHROUGH.comapFlatMap(dynamic -> {
+            lu2 = (Tag)dynamic.convert((DynamicOps)NbtOps.INSTANCE).getValue();
+            if (lu2 instanceof CompoundTag) {
+                return DataResult.success(lu2);
+            }
+            else {
+                return DataResult.error("Not a compound tag: " + lu2);
+            }
+        }, le -> new Dynamic((DynamicOps)NbtOps.INSTANCE, le));
         LOGGER = LogManager.getLogger();
         SIMPLE_VALUE = Pattern.compile("[A-Za-z0-9._+-]+");
         TYPE = new TagType<CompoundTag>() {
             @Override
-            public CompoundTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(384L);
+            public CompoundTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(384L);
                 if (integer > 512) {
                     throw new RuntimeException("Tried to read NBT tag with too high complexity, depth > 512");
                 }
                 final Map<String, Tag> map5 = Maps.newHashMap();
                 byte byte6;
-                while ((byte6 = readNamedTagType(dataInput, kc)) != 0) {
-                    final String string7 = readNamedTagName(dataInput, kc);
-                    kc.accountBits(224 + 16 * string7.length());
-                    final Tag kj8 = readNamedTagData(TagTypes.getType(byte6), string7, dataInput, integer + 1, kc);
-                    if (map5.put(string7, kj8) != null) {
-                        kc.accountBits(288L);
+                while ((byte6 = readNamedTagType(dataInput, ln)) != 0) {
+                    final String string7 = readNamedTagName(dataInput, ln);
+                    ln.accountBits(224 + 16 * string7.length());
+                    final Tag lu8 = readNamedTagData(TagTypes.getType(byte6), string7, dataInput, integer + 1, ln);
+                    if (map5.put(string7, lu8) != null) {
+                        ln.accountBits(288L);
                     }
                 }
-                return new CompoundTag(map5, null);
+                return new CompoundTag(map5);
             }
             
             @Override
diff --git a/src/net/minecraft/nbt/DoubleTag.java b/src/net/minecraft/nbt/DoubleTag.java
index 370635d..e9c37a2 100644
--- a/src/net/minecraft/nbt/DoubleTag.java
+++ b/src/net/minecraft/nbt/DoubleTag.java
@@ -61,8 +61,8 @@ public class DoubleTag extends NumericTag {
     
     @Override
     public Component getPrettyDisplay(final String string, final int integer) {
-        final Component lf4 = new TextComponent("d").withStyle(DoubleTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
-        return new TextComponent(String.valueOf(this.data)).append(lf4).withStyle(DoubleTag.SYNTAX_HIGHLIGHTING_NUMBER);
+        final Component mr4 = new TextComponent("d").withStyle(DoubleTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+        return new TextComponent(String.valueOf(this.data)).append(mr4).withStyle(DoubleTag.SYNTAX_HIGHLIGHTING_NUMBER);
     }
     
     @Override
@@ -104,8 +104,8 @@ public class DoubleTag extends NumericTag {
         ZERO = new DoubleTag(0.0);
         TYPE = new TagType<DoubleTag>() {
             @Override
-            public DoubleTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(128L);
+            public DoubleTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(128L);
                 return DoubleTag.valueOf(dataInput.readDouble());
             }
             
diff --git a/src/net/minecraft/nbt/EndTag.java b/src/net/minecraft/nbt/EndTag.java
index 8ae3fdd..d321571 100644
--- a/src/net/minecraft/nbt/EndTag.java
+++ b/src/net/minecraft/nbt/EndTag.java
@@ -39,14 +39,14 @@ public class EndTag implements Tag {
     
     @Override
     public Component getPrettyDisplay(final String string, final int integer) {
-        return new TextComponent("");
+        return TextComponent.EMPTY;
     }
     
     static {
         TYPE = new TagType<EndTag>() {
             @Override
-            public EndTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) {
-                kc.accountBits(64L);
+            public EndTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) {
+                ln.accountBits(64L);
                 return EndTag.INSTANCE;
             }
             
diff --git a/src/net/minecraft/nbt/FloatTag.java b/src/net/minecraft/nbt/FloatTag.java
index a83e35a..44ce2bf 100644
--- a/src/net/minecraft/nbt/FloatTag.java
+++ b/src/net/minecraft/nbt/FloatTag.java
@@ -60,8 +60,8 @@ public class FloatTag extends NumericTag {
     
     @Override
     public Component getPrettyDisplay(final String string, final int integer) {
-        final Component lf4 = new TextComponent("f").withStyle(FloatTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
-        return new TextComponent(String.valueOf(this.data)).append(lf4).withStyle(FloatTag.SYNTAX_HIGHLIGHTING_NUMBER);
+        final Component mr4 = new TextComponent("f").withStyle(FloatTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+        return new TextComponent(String.valueOf(this.data)).append(mr4).withStyle(FloatTag.SYNTAX_HIGHLIGHTING_NUMBER);
     }
     
     @Override
@@ -103,8 +103,8 @@ public class FloatTag extends NumericTag {
         ZERO = new FloatTag(0.0f);
         TYPE = new TagType<FloatTag>() {
             @Override
-            public FloatTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(96L);
+            public FloatTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(96L);
                 return FloatTag.valueOf(dataInput.readFloat());
             }
             
diff --git a/src/net/minecraft/nbt/IntArrayTag.java b/src/net/minecraft/nbt/IntArrayTag.java
index 5e5d7b6..ddea2da 100644
--- a/src/net/minecraft/nbt/IntArrayTag.java
+++ b/src/net/minecraft/nbt/IntArrayTag.java
@@ -2,6 +2,7 @@ package net.minecraft.nbt;
 
 import java.io.DataInput;
 import org.apache.commons.lang3.ArrayUtils;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.Component;
 import java.util.Arrays;
@@ -83,16 +84,16 @@ public class IntArrayTag extends CollectionTag<IntTag> {
     
     @Override
     public Component getPrettyDisplay(final String string, final int integer) {
-        final Component lf4 = new TextComponent("I").withStyle(IntArrayTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
-        final Component lf5 = new TextComponent("[").append(lf4).append(";");
+        final Component mr4 = new TextComponent("I").withStyle(IntArrayTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+        final MutableComponent mx5 = new TextComponent("[").append(mr4).append(";");
         for (int integer2 = 0; integer2 < this.data.length; ++integer2) {
-            lf5.append(" ").append(new TextComponent(String.valueOf(this.data[integer2])).withStyle(IntArrayTag.SYNTAX_HIGHLIGHTING_NUMBER));
+            mx5.append(" ").append(new TextComponent(String.valueOf(this.data[integer2])).withStyle(IntArrayTag.SYNTAX_HIGHLIGHTING_NUMBER));
             if (integer2 != this.data.length - 1) {
-                lf5.append(",");
+                mx5.append(",");
             }
         }
-        lf5.append("]");
-        return lf5;
+        mx5.append("]");
+        return mx5;
     }
     
     @Override
@@ -106,30 +107,30 @@ public class IntArrayTag extends CollectionTag<IntTag> {
     }
     
     @Override
-    public IntTag set(final int integer, final IntTag jy) {
+    public IntTag set(final int integer, final IntTag lj) {
         final int integer2 = this.data[integer];
-        this.data[integer] = jy.getAsInt();
+        this.data[integer] = lj.getAsInt();
         return IntTag.valueOf(integer2);
     }
     
     @Override
-    public void add(final int integer, final IntTag jy) {
-        this.data = ArrayUtils.add(this.data, integer, jy.getAsInt());
+    public void add(final int integer, final IntTag lj) {
+        this.data = ArrayUtils.add(this.data, integer, lj.getAsInt());
     }
     
     @Override
-    public boolean setTag(final int integer, final Tag kj) {
-        if (kj instanceof NumericTag) {
-            this.data[integer] = ((NumericTag)kj).getAsInt();
+    public boolean setTag(final int integer, final Tag lu) {
+        if (lu instanceof NumericTag) {
+            this.data[integer] = ((NumericTag)lu).getAsInt();
             return true;
         }
         return false;
     }
     
     @Override
-    public boolean addTag(final int integer, final Tag kj) {
-        if (kj instanceof NumericTag) {
-            this.data = ArrayUtils.add(this.data, integer, ((NumericTag)kj).getAsInt());
+    public boolean addTag(final int integer, final Tag lu) {
+        if (lu instanceof NumericTag) {
+            this.data = ArrayUtils.add(this.data, integer, ((NumericTag)lu).getAsInt());
             return true;
         }
         return false;
@@ -142,6 +143,11 @@ public class IntArrayTag extends CollectionTag<IntTag> {
         return IntTag.valueOf(integer2);
     }
     
+    @Override
+    public byte getElementType() {
+        return 3;
+    }
+    
     @Override
     public void clear() {
         this.data = new int[0];
@@ -150,10 +156,10 @@ public class IntArrayTag extends CollectionTag<IntTag> {
     static {
         TYPE = new TagType<IntArrayTag>() {
             @Override
-            public IntArrayTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(192L);
+            public IntArrayTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(192L);
                 final int integer2 = dataInput.readInt();
-                kc.accountBits(32L * integer2);
+                ln.accountBits(32L * integer2);
                 final int[] arr6 = new int[integer2];
                 for (int integer3 = 0; integer3 < integer2; ++integer3) {
                     arr6[integer3] = dataInput.readInt();
diff --git a/src/net/minecraft/nbt/IntTag.java b/src/net/minecraft/nbt/IntTag.java
index 720ce18..c344beb 100644
--- a/src/net/minecraft/nbt/IntTag.java
+++ b/src/net/minecraft/nbt/IntTag.java
@@ -99,8 +99,8 @@ public class IntTag extends NumericTag {
     static {
         TYPE = new TagType<IntTag>() {
             @Override
-            public IntTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(96L);
+            public IntTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(96L);
                 return IntTag.valueOf(dataInput.readInt());
             }
             
diff --git a/src/net/minecraft/nbt/ListTag.java b/src/net/minecraft/nbt/ListTag.java
index febe985..38d89e5 100644
--- a/src/net/minecraft/nbt/ListTag.java
+++ b/src/net/minecraft/nbt/ListTag.java
@@ -4,6 +4,7 @@ import java.util.Collection;
 import it.unimi.dsi.fastutil.bytes.ByteOpenHashSet;
 import java.util.Arrays;
 import java.io.DataInput;
+import net.minecraft.network.chat.MutableComponent;
 import com.google.common.base.Strings;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.Component;
@@ -42,8 +43,8 @@ public class ListTag extends CollectionTag<Tag> {
         }
         dataOutput.writeByte(this.type);
         dataOutput.writeInt(this.list.size());
-        for (final Tag kj4 : this.list) {
-            kj4.write(dataOutput);
+        for (final Tag lu4 : this.list) {
+            lu4.write(dataOutput);
         }
     }
     
@@ -77,9 +78,9 @@ public class ListTag extends CollectionTag<Tag> {
     
     @Override
     public Tag remove(final int integer) {
-        final Tag kj3 = this.list.remove(integer);
+        final Tag lu3 = this.list.remove(integer);
         this.updateTypeAfterRemove();
-        return kj3;
+        return lu3;
     }
     
     @Override
@@ -89,9 +90,9 @@ public class ListTag extends CollectionTag<Tag> {
     
     public CompoundTag getCompound(final int integer) {
         if (integer >= 0 && integer < this.list.size()) {
-            final Tag kj3 = this.list.get(integer);
-            if (kj3.getId() == 10) {
-                return (CompoundTag)kj3;
+            final Tag lu3 = this.list.get(integer);
+            if (lu3.getId() == 10) {
+                return (CompoundTag)lu3;
             }
         }
         return new CompoundTag();
@@ -99,9 +100,9 @@ public class ListTag extends CollectionTag<Tag> {
     
     public ListTag getList(final int integer) {
         if (integer >= 0 && integer < this.list.size()) {
-            final Tag kj3 = this.list.get(integer);
-            if (kj3.getId() == 9) {
-                return (ListTag)kj3;
+            final Tag lu3 = this.list.get(integer);
+            if (lu3.getId() == 9) {
+                return (ListTag)lu3;
             }
         }
         return new ListTag();
@@ -109,9 +110,9 @@ public class ListTag extends CollectionTag<Tag> {
     
     public short getShort(final int integer) {
         if (integer >= 0 && integer < this.list.size()) {
-            final Tag kj3 = this.list.get(integer);
-            if (kj3.getId() == 2) {
-                return ((ShortTag)kj3).getAsShort();
+            final Tag lu3 = this.list.get(integer);
+            if (lu3.getId() == 2) {
+                return ((ShortTag)lu3).getAsShort();
             }
         }
         return 0;
@@ -119,9 +120,9 @@ public class ListTag extends CollectionTag<Tag> {
     
     public int getInt(final int integer) {
         if (integer >= 0 && integer < this.list.size()) {
-            final Tag kj3 = this.list.get(integer);
-            if (kj3.getId() == 3) {
-                return ((IntTag)kj3).getAsInt();
+            final Tag lu3 = this.list.get(integer);
+            if (lu3.getId() == 3) {
+                return ((IntTag)lu3).getAsInt();
             }
         }
         return 0;
@@ -129,9 +130,9 @@ public class ListTag extends CollectionTag<Tag> {
     
     public int[] getIntArray(final int integer) {
         if (integer >= 0 && integer < this.list.size()) {
-            final Tag kj3 = this.list.get(integer);
-            if (kj3.getId() == 11) {
-                return ((IntArrayTag)kj3).getAsIntArray();
+            final Tag lu3 = this.list.get(integer);
+            if (lu3.getId() == 11) {
+                return ((IntArrayTag)lu3).getAsIntArray();
             }
         }
         return new int[0];
@@ -139,9 +140,9 @@ public class ListTag extends CollectionTag<Tag> {
     
     public double getDouble(final int integer) {
         if (integer >= 0 && integer < this.list.size()) {
-            final Tag kj3 = this.list.get(integer);
-            if (kj3.getId() == 6) {
-                return ((DoubleTag)kj3).getAsDouble();
+            final Tag lu3 = this.list.get(integer);
+            if (lu3.getId() == 6) {
+                return ((DoubleTag)lu3).getAsDouble();
             }
         }
         return 0.0;
@@ -149,9 +150,9 @@ public class ListTag extends CollectionTag<Tag> {
     
     public float getFloat(final int integer) {
         if (integer >= 0 && integer < this.list.size()) {
-            final Tag kj3 = this.list.get(integer);
-            if (kj3.getId() == 5) {
-                return ((FloatTag)kj3).getAsFloat();
+            final Tag lu3 = this.list.get(integer);
+            if (lu3.getId() == 5) {
+                return ((FloatTag)lu3).getAsFloat();
             }
         }
         return 0.0f;
@@ -161,11 +162,11 @@ public class ListTag extends CollectionTag<Tag> {
         if (integer < 0 || integer >= this.list.size()) {
             return "";
         }
-        final Tag kj3 = this.list.get(integer);
-        if (kj3.getId() == 8) {
-            return kj3.getAsString();
+        final Tag lu3 = this.list.get(integer);
+        if (lu3.getId() == 8) {
+            return lu3.getAsString();
         }
-        return kj3.toString();
+        return lu3.toString();
     }
     
     @Override
@@ -179,48 +180,48 @@ public class ListTag extends CollectionTag<Tag> {
     }
     
     @Override
-    public Tag set(final int integer, final Tag kj) {
-        final Tag kj2 = this.get(integer);
-        if (!this.setTag(integer, kj)) {
-            throw new UnsupportedOperationException(String.format("Trying to add tag of type %d to list of %d", kj.getId(), this.type));
+    public Tag set(final int integer, final Tag lu) {
+        final Tag lu2 = this.get(integer);
+        if (!this.setTag(integer, lu)) {
+            throw new UnsupportedOperationException(String.format("Trying to add tag of type %d to list of %d", lu.getId(), this.type));
         }
-        return kj2;
+        return lu2;
     }
     
     @Override
-    public void add(final int integer, final Tag kj) {
-        if (!this.addTag(integer, kj)) {
-            throw new UnsupportedOperationException(String.format("Trying to add tag of type %d to list of %d", kj.getId(), this.type));
+    public void add(final int integer, final Tag lu) {
+        if (!this.addTag(integer, lu)) {
+            throw new UnsupportedOperationException(String.format("Trying to add tag of type %d to list of %d", lu.getId(), this.type));
         }
     }
     
     @Override
-    public boolean setTag(final int integer, final Tag kj) {
-        if (this.updateType(kj)) {
-            this.list.set(integer, kj);
+    public boolean setTag(final int integer, final Tag lu) {
+        if (this.updateType(lu)) {
+            this.list.set(integer, lu);
             return true;
         }
         return false;
     }
     
     @Override
-    public boolean addTag(final int integer, final Tag kj) {
-        if (this.updateType(kj)) {
-            this.list.add(integer, kj);
+    public boolean addTag(final int integer, final Tag lu) {
+        if (this.updateType(lu)) {
+            this.list.add(integer, lu);
             return true;
         }
         return false;
     }
     
-    private boolean updateType(final Tag kj) {
-        if (kj.getId() == 0) {
+    private boolean updateType(final Tag lu) {
+        if (lu.getId() == 0) {
             return false;
         }
         if (this.type == 0) {
-            this.type = kj.getId();
+            this.type = lu.getId();
             return true;
         }
-        return this.type == kj.getId();
+        return this.type == lu.getId();
     }
     
     @Override
@@ -247,37 +248,38 @@ public class ListTag extends CollectionTag<Tag> {
         }
         if (ListTag.INLINE_ELEMENT_TYPES.contains(this.type) && this.size() <= 8) {
             final String string2 = ", ";
-            final Component lf5 = new TextComponent("[");
+            final MutableComponent mx5 = new TextComponent("[");
             for (int integer2 = 0; integer2 < this.list.size(); ++integer2) {
                 if (integer2 != 0) {
-                    lf5.append(", ");
+                    mx5.append(", ");
                 }
-                lf5.append(this.list.get(integer2).getPrettyDisplay());
+                mx5.append(this.list.get(integer2).getPrettyDisplay());
             }
-            lf5.append("]");
-            return lf5;
+            mx5.append("]");
+            return mx5;
         }
-        final Component lf6 = new TextComponent("[");
+        final MutableComponent mx6 = new TextComponent("[");
         if (!string.isEmpty()) {
-            lf6.append("\n");
+            mx6.append("\n");
         }
         final String string3 = String.valueOf(',');
         for (int integer2 = 0; integer2 < this.list.size(); ++integer2) {
-            final Component lf7 = new TextComponent(Strings.repeat(string, integer + 1));
-            lf7.append(this.list.get(integer2).getPrettyDisplay(string, integer + 1));
+            final MutableComponent mx7 = new TextComponent(Strings.repeat(string, integer + 1));
+            mx7.append(this.list.get(integer2).getPrettyDisplay(string, integer + 1));
             if (integer2 != this.list.size() - 1) {
-                lf7.append(string3).append(string.isEmpty() ? " " : "\n");
+                mx7.append(string3).append(string.isEmpty() ? " " : "\n");
             }
-            lf6.append(lf7);
+            mx6.append(mx7);
         }
         if (!string.isEmpty()) {
-            lf6.append("\n").append(Strings.repeat(string, integer));
+            mx6.append("\n").append(Strings.repeat(string, integer));
         }
-        lf6.append("]");
-        return lf6;
+        mx6.append("]");
+        return mx6;
     }
     
-    public int getElementType() {
+    @Override
+    public byte getElementType() {
         return this.type;
     }
     
@@ -290,8 +292,8 @@ public class ListTag extends CollectionTag<Tag> {
     static {
         TYPE = new TagType<ListTag>() {
             @Override
-            public ListTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(296L);
+            public ListTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(296L);
                 if (integer > 512) {
                     throw new RuntimeException("Tried to read NBT tag with too high complexity, depth > 512");
                 }
@@ -300,11 +302,11 @@ public class ListTag extends CollectionTag<Tag> {
                 if (byte5 == 0 && integer2 > 0) {
                     throw new RuntimeException("Missing type on ListTag");
                 }
-                kc.accountBits(32L * integer2);
-                final TagType<?> kl7 = TagTypes.getType(byte5);
+                ln.accountBits(32L * integer2);
+                final TagType<?> lw7 = TagTypes.getType(byte5);
                 final List<Tag> list8 = Lists.newArrayListWithCapacity(integer2);
                 for (int integer3 = 0; integer3 < integer2; ++integer3) {
-                    list8.add((Tag)kl7.load(dataInput, integer + 1, kc));
+                    list8.add((Tag)lw7.load(dataInput, integer + 1, ln));
                 }
                 return new ListTag(list8, byte5, null);
             }
diff --git a/src/net/minecraft/nbt/LongArrayTag.java b/src/net/minecraft/nbt/LongArrayTag.java
index 1eed5f7..444b9e6 100644
--- a/src/net/minecraft/nbt/LongArrayTag.java
+++ b/src/net/minecraft/nbt/LongArrayTag.java
@@ -2,6 +2,7 @@ package net.minecraft.nbt;
 
 import java.io.DataInput;
 import org.apache.commons.lang3.ArrayUtils;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.Component;
 import java.util.Arrays;
@@ -84,17 +85,17 @@ public class LongArrayTag extends CollectionTag<LongTag> {
     
     @Override
     public Component getPrettyDisplay(final String string, final int integer) {
-        final Component lf4 = new TextComponent("L").withStyle(LongArrayTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
-        final Component lf5 = new TextComponent("[").append(lf4).append(";");
+        final Component mr4 = new TextComponent("L").withStyle(LongArrayTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+        final MutableComponent mx5 = new TextComponent("[").append(mr4).append(";");
         for (int integer2 = 0; integer2 < this.data.length; ++integer2) {
-            final Component lf6 = new TextComponent(String.valueOf(this.data[integer2])).withStyle(LongArrayTag.SYNTAX_HIGHLIGHTING_NUMBER);
-            lf5.append(" ").append(lf6).append(lf4);
+            final MutableComponent mx6 = new TextComponent(String.valueOf(this.data[integer2])).withStyle(LongArrayTag.SYNTAX_HIGHLIGHTING_NUMBER);
+            mx5.append(" ").append(mx6).append(mr4);
             if (integer2 != this.data.length - 1) {
-                lf5.append(",");
+                mx5.append(",");
             }
         }
-        lf5.append("]");
-        return lf5;
+        mx5.append("]");
+        return mx5;
     }
     
     public long[] getAsLongArray() {
@@ -112,30 +113,30 @@ public class LongArrayTag extends CollectionTag<LongTag> {
     }
     
     @Override
-    public LongTag set(final int integer, final LongTag kb) {
+    public LongTag set(final int integer, final LongTag lm) {
         final long long4 = this.data[integer];
-        this.data[integer] = kb.getAsLong();
+        this.data[integer] = lm.getAsLong();
         return LongTag.valueOf(long4);
     }
     
     @Override
-    public void add(final int integer, final LongTag kb) {
-        this.data = ArrayUtils.add(this.data, integer, kb.getAsLong());
+    public void add(final int integer, final LongTag lm) {
+        this.data = ArrayUtils.add(this.data, integer, lm.getAsLong());
     }
     
     @Override
-    public boolean setTag(final int integer, final Tag kj) {
-        if (kj instanceof NumericTag) {
-            this.data[integer] = ((NumericTag)kj).getAsLong();
+    public boolean setTag(final int integer, final Tag lu) {
+        if (lu instanceof NumericTag) {
+            this.data[integer] = ((NumericTag)lu).getAsLong();
             return true;
         }
         return false;
     }
     
     @Override
-    public boolean addTag(final int integer, final Tag kj) {
-        if (kj instanceof NumericTag) {
-            this.data = ArrayUtils.add(this.data, integer, ((NumericTag)kj).getAsLong());
+    public boolean addTag(final int integer, final Tag lu) {
+        if (lu instanceof NumericTag) {
+            this.data = ArrayUtils.add(this.data, integer, ((NumericTag)lu).getAsLong());
             return true;
         }
         return false;
@@ -148,6 +149,11 @@ public class LongArrayTag extends CollectionTag<LongTag> {
         return LongTag.valueOf(long3);
     }
     
+    @Override
+    public byte getElementType() {
+        return 4;
+    }
+    
     @Override
     public void clear() {
         this.data = new long[0];
@@ -156,10 +162,10 @@ public class LongArrayTag extends CollectionTag<LongTag> {
     static {
         TYPE = new TagType<LongArrayTag>() {
             @Override
-            public LongArrayTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(192L);
+            public LongArrayTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(192L);
                 final int integer2 = dataInput.readInt();
-                kc.accountBits(64L * integer2);
+                ln.accountBits(64L * integer2);
                 final long[] arr6 = new long[integer2];
                 for (int integer3 = 0; integer3 < integer2; ++integer3) {
                     arr6[integer3] = dataInput.readLong();
diff --git a/src/net/minecraft/nbt/LongTag.java b/src/net/minecraft/nbt/LongTag.java
index 5e68d7b..ad37144 100644
--- a/src/net/minecraft/nbt/LongTag.java
+++ b/src/net/minecraft/nbt/LongTag.java
@@ -58,8 +58,8 @@ public class LongTag extends NumericTag {
     
     @Override
     public Component getPrettyDisplay(final String string, final int integer) {
-        final Component lf4 = new TextComponent("L").withStyle(LongTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
-        return new TextComponent(String.valueOf(this.data)).append(lf4).withStyle(LongTag.SYNTAX_HIGHLIGHTING_NUMBER);
+        final Component mr4 = new TextComponent("L").withStyle(LongTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+        return new TextComponent(String.valueOf(this.data)).append(mr4).withStyle(LongTag.SYNTAX_HIGHLIGHTING_NUMBER);
     }
     
     @Override
@@ -100,8 +100,8 @@ public class LongTag extends NumericTag {
     static {
         TYPE = new TagType<LongTag>() {
             @Override
-            public LongTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(128L);
+            public LongTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(128L);
                 return LongTag.valueOf(dataInput.readLong());
             }
             
diff --git a/src/net/minecraft/nbt/NbtIo.java b/src/net/minecraft/nbt/NbtIo.java
index c0bfc08..68a2661 100644
--- a/src/net/minecraft/nbt/NbtIo.java
+++ b/src/net/minecraft/nbt/NbtIo.java
@@ -26,31 +26,16 @@ public class NbtIo {
         }
     }
     
-    public static void writeCompressed(final CompoundTag jt, final OutputStream outputStream) throws IOException {
+    public static void writeCompressed(final CompoundTag le, final OutputStream outputStream) throws IOException {
         try (final DataOutputStream dataOutputStream3 = new DataOutputStream(new BufferedOutputStream(new GZIPOutputStream(outputStream)))) {
-            write(jt, dataOutputStream3);
+            write(le, dataOutputStream3);
         }
     }
     
-    public static void safeWrite(final CompoundTag jt, final File file) throws IOException {
-        final File file2 = new File(file.getAbsolutePath() + "_tmp");
-        if (file2.exists()) {
-            file2.delete();
-        }
-        write(jt, file2);
-        if (file.exists()) {
-            file.delete();
-        }
-        if (file.exists()) {
-            throw new IOException("Failed to delete " + file);
-        }
-        file2.renameTo(file);
-    }
-    
-    public static void write(final CompoundTag jt, final File file) throws IOException {
+    public static void write(final CompoundTag le, final File file) throws IOException {
         final DataOutputStream dataOutputStream3 = new DataOutputStream(new FileOutputStream(file));
         try {
-            write(jt, dataOutputStream3);
+            write(le, dataOutputStream3);
         }
         finally {
             dataOutputStream3.close();
@@ -75,41 +60,41 @@ public class NbtIo {
         return read(dataInputStream, NbtAccounter.UNLIMITED);
     }
     
-    public static CompoundTag read(final DataInput dataInput, final NbtAccounter kc) throws IOException {
-        final Tag kj3 = readUnnamedTag(dataInput, 0, kc);
-        if (kj3 instanceof CompoundTag) {
-            return (CompoundTag)kj3;
+    public static CompoundTag read(final DataInput dataInput, final NbtAccounter ln) throws IOException {
+        final Tag lu3 = readUnnamedTag(dataInput, 0, ln);
+        if (lu3 instanceof CompoundTag) {
+            return (CompoundTag)lu3;
         }
         throw new IOException("Root tag must be a named compound tag");
     }
     
-    public static void write(final CompoundTag jt, final DataOutput dataOutput) throws IOException {
-        writeUnnamedTag(jt, dataOutput);
+    public static void write(final CompoundTag le, final DataOutput dataOutput) throws IOException {
+        writeUnnamedTag(le, dataOutput);
     }
     
-    private static void writeUnnamedTag(final Tag kj, final DataOutput dataOutput) throws IOException {
-        dataOutput.writeByte(kj.getId());
-        if (kj.getId() == 0) {
+    private static void writeUnnamedTag(final Tag lu, final DataOutput dataOutput) throws IOException {
+        dataOutput.writeByte(lu.getId());
+        if (lu.getId() == 0) {
             return;
         }
         dataOutput.writeUTF("");
-        kj.write(dataOutput);
+        lu.write(dataOutput);
     }
     
-    private static Tag readUnnamedTag(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
+    private static Tag readUnnamedTag(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
         final byte byte4 = dataInput.readByte();
         if (byte4 == 0) {
             return EndTag.INSTANCE;
         }
         dataInput.readUTF();
         try {
-            return (Tag)TagTypes.getType(byte4).load(dataInput, integer, kc);
+            return (Tag)TagTypes.getType(byte4).load(dataInput, integer, ln);
         }
         catch (IOException iOException5) {
-            final CrashReport h6 = CrashReport.forThrowable(iOException5, "Loading NBT data");
-            final CrashReportCategory i7 = h6.addCategory("NBT Tag");
-            i7.setDetail("Tag type", byte4);
-            throw new ReportedException(h6);
+            final CrashReport j6 = CrashReport.forThrowable(iOException5, "Loading NBT data");
+            final CrashReportCategory k7 = j6.addCategory("NBT Tag");
+            k7.setDetail("Tag type", byte4);
+            throw new ReportedException(j6);
         }
     }
 }
diff --git a/src/net/minecraft/nbt/NbtOps.java b/src/net/minecraft/nbt/NbtOps.java
index a4f2f5e..88f0cd5 100644
--- a/src/net/minecraft/nbt/NbtOps.java
+++ b/src/net/minecraft/nbt/NbtOps.java
@@ -1,27 +1,28 @@
 package net.minecraft.nbt;
 
+import java.util.Map;
+import com.google.common.collect.Maps;
+import com.mojang.serialization.RecordBuilder;
 import java.util.Objects;
-import java.util.List;
 import com.google.common.collect.PeekingIterator;
-import com.google.common.collect.Lists;
+import java.util.Iterator;
 import com.google.common.collect.Iterators;
 import java.util.stream.LongStream;
-import java.util.Arrays;
 import java.util.stream.IntStream;
 import com.mojang.datafixers.DataFixUtils;
-import java.nio.ByteBuffer;
-import java.util.stream.Stream;
-import java.util.stream.Collector;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import com.mojang.datafixers.util.Pair;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Collection;
-import java.util.Optional;
-import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.types.Type;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.stream.Stream;
+import com.google.common.collect.Lists;
+import com.mojang.serialization.MapLike;
+import java.util.function.Function;
+import java.util.List;
+import com.mojang.serialization.DataResult;
+import java.util.Arrays;
+import java.nio.ByteBuffer;
+import com.mojang.serialization.DynamicOps;
 
 public class NbtOps implements DynamicOps<Tag> {
     public static final NbtOps INSTANCE;
@@ -33,58 +34,58 @@ public class NbtOps implements DynamicOps<Tag> {
         return EndTag.INSTANCE;
     }
     
-    public Type<?> getType(final Tag kj) {
-        switch (kj.getId()) {
+    public <U> U convertTo(final DynamicOps<U> dynamicOps, final Tag lu) {
+        switch (lu.getId()) {
             case 0: {
-                return DSL.nilType();
+                return (U)dynamicOps.empty();
             }
             case 1: {
-                return DSL.byteType();
+                return (U)dynamicOps.createByte(((NumericTag)lu).getAsByte());
             }
             case 2: {
-                return DSL.shortType();
+                return (U)dynamicOps.createShort(((NumericTag)lu).getAsShort());
             }
             case 3: {
-                return DSL.intType();
+                return (U)dynamicOps.createInt(((NumericTag)lu).getAsInt());
             }
             case 4: {
-                return DSL.longType();
+                return (U)dynamicOps.createLong(((NumericTag)lu).getAsLong());
             }
             case 5: {
-                return DSL.floatType();
+                return (U)dynamicOps.createFloat(((NumericTag)lu).getAsFloat());
             }
             case 6: {
-                return DSL.doubleType();
+                return (U)dynamicOps.createDouble(((NumericTag)lu).getAsDouble());
             }
             case 7: {
-                return DSL.list(DSL.byteType());
+                return (U)dynamicOps.createByteList(ByteBuffer.wrap(((ByteArrayTag)lu).getAsByteArray()));
             }
             case 8: {
-                return DSL.string();
+                return (U)dynamicOps.createString(lu.getAsString());
             }
             case 9: {
-                return DSL.list(DSL.remainderType());
+                return (U)this.convertList((DynamicOps)dynamicOps, lu);
             }
             case 10: {
-                return DSL.compoundList(DSL.remainderType(), DSL.remainderType());
+                return (U)this.convertMap((DynamicOps)dynamicOps, lu);
             }
             case 11: {
-                return DSL.list(DSL.intType());
+                return (U)dynamicOps.createIntList(Arrays.stream(((IntArrayTag)lu).getAsIntArray()));
             }
             case 12: {
-                return DSL.list(DSL.longType());
+                return (U)dynamicOps.createLongList(Arrays.stream(((LongArrayTag)lu).getAsLongArray()));
             }
             default: {
-                return DSL.remainderType();
+                throw new IllegalStateException("Unknown tag type: " + lu);
             }
         }
     }
     
-    public Optional<Number> getNumberValue(final Tag kj) {
-        if (kj instanceof NumericTag) {
-            return Optional.<Number>of(((NumericTag)kj).getAsNumber());
+    public DataResult<Number> getNumberValue(final Tag lu) {
+        if (lu instanceof NumericTag) {
+            return (DataResult<Number>)DataResult.success(((NumericTag)lu).getAsNumber());
         }
-        return Optional.<Number>empty();
+        return (DataResult<Number>)DataResult.error("Not a number");
     }
     
     public Tag createNumeric(final Number number) {
@@ -119,141 +120,206 @@ public class NbtOps implements DynamicOps<Tag> {
         return ByteTag.valueOf(boolean1);
     }
     
-    public Optional<String> getStringValue(final Tag kj) {
-        if (kj instanceof StringTag) {
-            return Optional.<String>of(kj.getAsString());
+    public DataResult<String> getStringValue(final Tag lu) {
+        if (lu instanceof StringTag) {
+            return (DataResult<String>)DataResult.success(lu.getAsString());
         }
-        return Optional.<String>empty();
+        return (DataResult<String>)DataResult.error("Not a string");
     }
     
     public Tag createString(final String string) {
         return StringTag.valueOf(string);
     }
     
-    public Tag mergeInto(final Tag kj1, final Tag kj2) {
-        if (kj2 instanceof EndTag) {
-            return kj1;
+    private static CollectionTag<?> createGenericList(final byte byte1, final byte byte2) {
+        if (typesMatch(byte1, byte2, (byte)4)) {
+            return new LongArrayTag(new long[0]);
         }
-        if (kj1 instanceof CompoundTag) {
-            if (kj2 instanceof CompoundTag) {
-                final CompoundTag jt5 = new CompoundTag();
-                final CompoundTag jt6 = (CompoundTag)kj1;
-                for (final String string8 : jt6.getAllKeys()) {
-                    jt5.put(string8, jt6.get(string8));
-                }
-                final CompoundTag jt7 = (CompoundTag)kj2;
-                for (final String string9 : jt7.getAllKeys()) {
-                    jt5.put(string9, jt7.get(string9));
-                }
-                return jt5;
+        if (typesMatch(byte1, byte2, (byte)1)) {
+            return new ByteArrayTag(new byte[0]);
+        }
+        if (typesMatch(byte1, byte2, (byte)3)) {
+            return new IntArrayTag(new int[0]);
+        }
+        return new ListTag();
+    }
+    
+    private static boolean typesMatch(final byte byte1, final byte byte2, final byte byte3) {
+        return (byte1 == byte3 || byte1 == 0) && (byte2 == byte3 || byte2 == 0);
+    }
+    
+    private static <T extends Tag> void fillOne(final CollectionTag<T> ld, final Tag lu2, final Tag lu3) {
+        if (lu2 instanceof CollectionTag) {
+            final CollectionTag<?> ld2 = lu2;
+            ld2.forEach(lu -> ld.add((T)lu));
+        }
+        ld.add((T)lu3);
+    }
+    
+    private static <T extends Tag> void fillMany(final CollectionTag<T> ld, final Tag lu, final List<Tag> list) {
+        if (lu instanceof CollectionTag) {
+            final CollectionTag<?> ld2 = lu;
+            ld2.forEach(lu -> ld.add((T)lu));
+        }
+        list.forEach(lu -> ld.add((T)lu));
+    }
+    
+    public DataResult<Tag> mergeToList(final Tag lu1, final Tag lu2) {
+        if (!(lu1 instanceof CollectionTag) && !(lu1 instanceof EndTag)) {
+            return (DataResult<Tag>)DataResult.error("mergeToList called with not a list: " + lu1, lu1);
+        }
+        final CollectionTag<?> ld4 = createGenericList((lu1 instanceof CollectionTag) ? ((CollectionTag)lu1).getElementType() : 0, lu2.getId());
+        NbtOps.fillOne(ld4, lu1, lu2);
+        return (DataResult<Tag>)DataResult.success(ld4);
+    }
+    
+    public DataResult<Tag> mergeToList(final Tag lu, final List<Tag> list) {
+        if (!(lu instanceof CollectionTag) && !(lu instanceof EndTag)) {
+            return (DataResult<Tag>)DataResult.error("mergeToList called with not a list: " + lu, lu);
+        }
+        final CollectionTag<?> ld4 = createGenericList((lu instanceof CollectionTag) ? ((CollectionTag)lu).getElementType() : 0, list.stream().findFirst().<Byte>map(Tag::getId).orElse((Byte)0));
+        NbtOps.fillMany(ld4, lu, list);
+        return (DataResult<Tag>)DataResult.success(ld4);
+    }
+    
+    public DataResult<Tag> mergeToMap(final Tag lu1, final Tag lu2, final Tag lu3) {
+        if (!(lu1 instanceof CompoundTag) && !(lu1 instanceof EndTag)) {
+            return (DataResult<Tag>)DataResult.error("mergeToMap called with not a map: " + lu1, lu1);
+        }
+        if (!(lu2 instanceof StringTag)) {
+            return (DataResult<Tag>)DataResult.error("key is not a string: " + lu2, lu1);
+        }
+        final CompoundTag le5 = new CompoundTag();
+        if (lu1 instanceof CompoundTag) {
+            final CompoundTag le6 = (CompoundTag)lu1;
+            le6.getAllKeys().forEach(string -> le5.put(string, le6.get(string)));
+        }
+        le5.put(lu2.getAsString(), lu3);
+        return (DataResult<Tag>)DataResult.success(le5);
+    }
+    
+    public DataResult<Tag> mergeToMap(final Tag lu, final MapLike<Tag> mapLike) {
+        if (!(lu instanceof CompoundTag) && !(lu instanceof EndTag)) {
+            return (DataResult<Tag>)DataResult.error("mergeToMap called with not a map: " + lu, lu);
+        }
+        final CompoundTag le4 = new CompoundTag();
+        if (lu instanceof CompoundTag) {
+            final CompoundTag le5 = (CompoundTag)lu;
+            le5.getAllKeys().forEach(string -> le4.put(string, le5.get(string)));
+        }
+        final List<Tag> list5 = Lists.newArrayList();
+        final Tag lu2;
+        final List<Tag> list6;
+        final CompoundTag compoundTag;
+        mapLike.entries().forEach(pair -> {
+            lu2 = (Tag)pair.getFirst();
+            if (!(lu2 instanceof StringTag)) {
+                list6.add(lu2);
+                return;
             }
-            return kj1;
-        }
-        else {
-            if (kj1 instanceof EndTag) {
-                throw new IllegalArgumentException("mergeInto called with a null input.");
+            else {
+                compoundTag.put(lu2.getAsString(), (Tag)pair.getSecond());
+                return;
             }
-            if (kj1 instanceof CollectionTag) {
-                final CollectionTag<Tag> js4 = new ListTag();
-                final CollectionTag<?> js5 = kj1;
-                js4.addAll(js5);
-                js4.add(kj2);
-                return js4;
+        });
+        if (!list5.isEmpty()) {
+            return (DataResult<Tag>)DataResult.error("some keys are not strings: " + list5, le4);
+        }
+        return (DataResult<Tag>)DataResult.success(le4);
+    }
+    
+    public DataResult<Stream<Pair<Tag, Tag>>> getMapValues(final Tag lu) {
+        if (!(lu instanceof CompoundTag)) {
+            return (DataResult<Stream<Pair<Tag, Tag>>>)DataResult.error("Not a map: " + lu);
+        }
+        final CompoundTag le3 = (CompoundTag)lu;
+        return (DataResult<Stream<Pair<Tag, Tag>>>)DataResult.success(le3.getAllKeys().stream().map(string -> Pair.of((Object)this.createString(string), (Object)le3.get(string))));
+    }
+    
+    public DataResult<Consumer<BiConsumer<Tag, Tag>>> getMapEntries(final Tag lu) {
+        if (!(lu instanceof CompoundTag)) {
+            return (DataResult<Consumer<BiConsumer<Tag, Tag>>>)DataResult.error("Not a map: " + lu);
+        }
+        final CompoundTag le3 = (CompoundTag)lu;
+        final CompoundTag compoundTag;
+        return (DataResult<Consumer<BiConsumer<Tag, Tag>>>)DataResult.success(biConsumer -> compoundTag.getAllKeys().forEach(string -> biConsumer.accept(this.createString(string), compoundTag.get(string))));
+    }
+    
+    public DataResult<MapLike<Tag>> getMap(final Tag lu) {
+        if (!(lu instanceof CompoundTag)) {
+            return (DataResult<MapLike<Tag>>)DataResult.error("Not a map: " + lu);
+        }
+        final CompoundTag le3 = (CompoundTag)lu;
+        return (DataResult<MapLike<Tag>>)DataResult.success(new MapLike<Tag>() {
+            @Nullable
+            public Tag get(final Tag lu) {
+                return le3.get(lu.getAsString());
             }
-            return kj1;
-        }
-    }
-    
-    public Tag mergeInto(final Tag kj1, final Tag kj2, final Tag kj3) {
-        CompoundTag jt5;
-        if (kj1 instanceof EndTag) {
-            jt5 = new CompoundTag();
-        }
-        else {
-            if (!(kj1 instanceof CompoundTag)) {
-                return kj1;
+            
+            @Nullable
+            public Tag get(final String string) {
+                return le3.get(string);
             }
-            final CompoundTag jt6 = (CompoundTag)kj1;
-            jt5 = new CompoundTag();
-            jt6.getAllKeys().forEach(string -> jt5.put(string, jt6.get(string)));
-        }
-        jt5.put(kj2.getAsString(), kj3);
-        return jt5;
+            
+            public Stream<Pair<Tag, Tag>> entries() {
+                return le3.getAllKeys().stream().<Pair<Tag, Tag>>map(string -> Pair.of((Object)NbtOps.this.createString(string), (Object)le3.get(string)));
+            }
+            
+            @Override
+            public String toString() {
+                return "MapLike[" + le3 + "]";
+            }
+        });
     }
     
-    public Tag merge(final Tag kj1, final Tag kj2) {
-        if (kj1 instanceof EndTag) {
-            return kj2;
-        }
-        if (kj2 instanceof EndTag) {
-            return kj1;
-        }
-        if (kj1 instanceof CompoundTag && kj2 instanceof CompoundTag) {
-            final CompoundTag jt4 = (CompoundTag)kj1;
-            final CompoundTag jt5 = (CompoundTag)kj2;
-            final CompoundTag jt6 = new CompoundTag();
-            jt4.getAllKeys().forEach(string -> jt6.put(string, jt4.get(string)));
-            jt5.getAllKeys().forEach(string -> jt6.put(string, jt5.get(string)));
-        }
-        if (kj1 instanceof CollectionTag && kj2 instanceof CollectionTag) {
-            final ListTag jz4 = new ListTag();
-            jz4.addAll(kj1);
-            jz4.addAll(kj2);
-            return jz4;
-        }
-        throw new IllegalArgumentException("Could not merge " + kj1 + " and " + kj2);
+    public Tag createMap(final Stream<Pair<Tag, Tag>> stream) {
+        final CompoundTag le3 = new CompoundTag();
+        stream.forEach(pair -> le3.put(((Tag)pair.getFirst()).getAsString(), (Tag)pair.getSecond()));
+        return le3;
     }
     
-    public Optional<Map<Tag, Tag>> getMapValues(final Tag kj) {
-        if (kj instanceof CompoundTag) {
-            final CompoundTag jt3 = (CompoundTag)kj;
-            return Optional.<Map<Tag, Tag>>of(jt3.getAllKeys().stream().map(string -> Pair.of(this.createString(string), jt3.get(string))).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)));
+    public DataResult<Stream<Tag>> getStream(final Tag lu) {
+        if (lu instanceof CollectionTag) {
+            return (DataResult<Stream<Tag>>)DataResult.success(((CollectionTag)lu).stream().map(lu -> lu));
         }
-        return Optional.<Map<Tag, Tag>>empty();
+        return (DataResult<Stream<Tag>>)DataResult.error("Not a list");
     }
     
-    public Tag createMap(final Map<Tag, Tag> map) {
-        final CompoundTag jt3 = new CompoundTag();
-        for (final Map.Entry<Tag, Tag> entry5 : map.entrySet()) {
-            jt3.put(entry5.getKey().getAsString(), entry5.getValue());
+    public DataResult<Consumer<Consumer<Tag>>> getList(final Tag lu) {
+        if (lu instanceof CollectionTag) {
+            final CollectionTag<?> ld3 = lu;
+            return (DataResult<Consumer<Consumer<Tag>>>)DataResult.success(ld3::forEach);
         }
-        return jt3;
+        return (DataResult<Consumer<Consumer<Tag>>>)DataResult.error("Not a list: " + lu);
     }
     
-    public Optional<Stream<Tag>> getStream(final Tag kj) {
-        if (kj instanceof CollectionTag) {
-            return Optional.<Stream<Tag>>of(((CollectionTag)kj).stream().map(kj -> kj));
+    public DataResult<ByteBuffer> getByteBuffer(final Tag lu) {
+        if (lu instanceof ByteArrayTag) {
+            return (DataResult<ByteBuffer>)DataResult.success(ByteBuffer.wrap(((ByteArrayTag)lu).getAsByteArray()));
         }
-        return Optional.<Stream<Tag>>empty();
-    }
-    
-    public Optional<ByteBuffer> getByteBuffer(final Tag kj) {
-        if (kj instanceof ByteArrayTag) {
-            return Optional.<ByteBuffer>of(ByteBuffer.wrap(((ByteArrayTag)kj).getAsByteArray()));
-        }
-        return (Optional<ByteBuffer>)super.getByteBuffer(kj);
+        return (DataResult<ByteBuffer>)super.getByteBuffer(lu);
     }
     
     public Tag createByteList(final ByteBuffer byteBuffer) {
         return new ByteArrayTag(DataFixUtils.toArray(byteBuffer));
     }
     
-    public Optional<IntStream> getIntStream(final Tag kj) {
-        if (kj instanceof IntArrayTag) {
-            return Optional.<IntStream>of(Arrays.stream(((IntArrayTag)kj).getAsIntArray()));
+    public DataResult<IntStream> getIntStream(final Tag lu) {
+        if (lu instanceof IntArrayTag) {
+            return (DataResult<IntStream>)DataResult.success(Arrays.stream(((IntArrayTag)lu).getAsIntArray()));
         }
-        return (Optional<IntStream>)super.getIntStream(kj);
+        return (DataResult<IntStream>)super.getIntStream(lu);
     }
     
     public Tag createIntList(final IntStream intStream) {
         return new IntArrayTag(intStream.toArray());
     }
     
-    public Optional<LongStream> getLongStream(final Tag kj) {
-        if (kj instanceof LongArrayTag) {
-            return Optional.<LongStream>of(Arrays.stream(((LongArrayTag)kj).getAsLongArray()));
+    public DataResult<LongStream> getLongStream(final Tag lu) {
+        if (lu instanceof LongArrayTag) {
+            return (DataResult<LongStream>)DataResult.success(Arrays.stream(((LongArrayTag)lu).getAsLongArray()));
         }
-        return (Optional<LongStream>)super.getLongStream(kj);
+        return (DataResult<LongStream>)super.getLongStream(lu);
     }
     
     public Tag createLongList(final LongStream longStream) {
@@ -265,38 +331,38 @@ public class NbtOps implements DynamicOps<Tag> {
         if (!peekingIterator3.hasNext()) {
             return new ListTag();
         }
-        final Tag kj2 = peekingIterator3.peek();
-        if (kj2 instanceof ByteTag) {
-            final List<Byte> list5 = Lists.newArrayList(Iterators.transform((Iterator<Tag>)peekingIterator3, kj -> kj.getAsByte()));
+        final Tag lu2 = peekingIterator3.peek();
+        if (lu2 instanceof ByteTag) {
+            final List<Byte> list5 = Lists.newArrayList(Iterators.transform((Iterator<Tag>)peekingIterator3, lu -> lu.getAsByte()));
             return new ByteArrayTag(list5);
         }
-        if (kj2 instanceof IntTag) {
-            final List<Integer> list6 = Lists.newArrayList(Iterators.transform((Iterator<Tag>)peekingIterator3, kj -> kj.getAsInt()));
+        if (lu2 instanceof IntTag) {
+            final List<Integer> list6 = Lists.newArrayList(Iterators.transform((Iterator<Tag>)peekingIterator3, lu -> lu.getAsInt()));
             return new IntArrayTag(list6);
         }
-        if (kj2 instanceof LongTag) {
-            final List<Long> list7 = Lists.newArrayList(Iterators.transform((Iterator<Tag>)peekingIterator3, kj -> kj.getAsLong()));
+        if (lu2 instanceof LongTag) {
+            final List<Long> list7 = Lists.newArrayList(Iterators.transform((Iterator<Tag>)peekingIterator3, lu -> lu.getAsLong()));
             return new LongArrayTag(list7);
         }
-        final ListTag jz5 = new ListTag();
+        final ListTag lk5 = new ListTag();
         while (peekingIterator3.hasNext()) {
-            final Tag kj3 = peekingIterator3.next();
-            if (kj3 instanceof EndTag) {
+            final Tag lu3 = peekingIterator3.next();
+            if (lu3 instanceof EndTag) {
                 continue;
             }
-            jz5.add(kj3);
+            lk5.add(lu3);
         }
-        return jz5;
+        return lk5;
     }
     
-    public Tag remove(final Tag kj, final String string) {
-        if (kj instanceof CompoundTag) {
-            final CompoundTag jt4 = (CompoundTag)kj;
-            final CompoundTag jt5 = new CompoundTag();
-            jt4.getAllKeys().stream().filter(string2 -> !Objects.equals(string2, string)).forEach(string -> jt5.put(string, jt4.get(string)));
-            return jt5;
+    public Tag remove(final Tag lu, final String string) {
+        if (lu instanceof CompoundTag) {
+            final CompoundTag le4 = (CompoundTag)lu;
+            final CompoundTag le5 = new CompoundTag();
+            le4.getAllKeys().stream().filter(string2 -> !Objects.equals(string2, string)).forEach(string -> le5.put(string, le4.get(string)));
+            return le5;
         }
-        return kj;
+        return lu;
     }
     
     @Override
@@ -304,7 +370,40 @@ public class NbtOps implements DynamicOps<Tag> {
         return "NBT";
     }
     
+    public RecordBuilder<Tag> mapBuilder() {
+        return (RecordBuilder<Tag>)new NbtRecordBuilder();
+    }
+    
     static {
         INSTANCE = new NbtOps();
     }
+    
+    class NbtRecordBuilder extends RecordBuilder.AbstractStringBuilder<Tag, CompoundTag> {
+        protected NbtRecordBuilder() {
+            super((DynamicOps)NbtOps.this);
+        }
+        
+        protected CompoundTag initBuilder() {
+            return new CompoundTag();
+        }
+        
+        protected CompoundTag append(final String string, final Tag lu, final CompoundTag le) {
+            le.put(string, lu);
+            return le;
+        }
+        
+        protected DataResult<Tag> build(final CompoundTag le, final Tag lu) {
+            if (lu == null || lu == EndTag.INSTANCE) {
+                return (DataResult<Tag>)DataResult.success(le);
+            }
+            if (lu instanceof CompoundTag) {
+                final CompoundTag le2 = new CompoundTag(Maps.newHashMap(((CompoundTag)lu).entries()));
+                for (final Map.Entry<String, Tag> entry6 : le.entries().entrySet()) {
+                    le2.put(entry6.getKey(), entry6.getValue());
+                }
+                return (DataResult<Tag>)DataResult.success(le2);
+            }
+            return (DataResult<Tag>)DataResult.error("mergeToMap called with not a map: " + lu, lu);
+        }
+    }
 }
diff --git a/src/net/minecraft/nbt/NbtUtils.java b/src/net/minecraft/nbt/NbtUtils.java
index a5ab01f..a30b987 100644
--- a/src/net/minecraft/nbt/NbtUtils.java
+++ b/src/net/minecraft/nbt/NbtUtils.java
@@ -2,8 +2,8 @@ package net.minecraft.nbt;
 
 import java.util.AbstractList;
 import org.apache.logging.log4j.LogManager;
-import com.mojang.datafixers.types.DynamicOps;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Dynamic;
 import net.minecraft.SharedConstants;
 import net.minecraft.util.datafix.DataFixTypes;
 import com.mojang.datafixers.DataFixer;
@@ -19,12 +19,13 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.SerializableUUID;
 import com.google.common.annotations.VisibleForTesting;
 import net.minecraft.util.StringUtil;
 import javax.annotation.Nullable;
 import java.util.Iterator;
-import com.mojang.authlib.properties.Property;
 import java.util.UUID;
+import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.GameProfile;
 import org.apache.logging.log4j.Logger;
 
@@ -32,114 +33,104 @@ public final class NbtUtils {
     private static final Logger LOGGER;
     
     @Nullable
-    public static GameProfile readGameProfile(final CompoundTag jt) {
+    public static GameProfile readGameProfile(final CompoundTag le) {
         String string2 = null;
-        String string3 = null;
-        if (jt.contains("Name", 8)) {
-            string2 = jt.getString("Name");
+        UUID uUID3 = null;
+        if (le.contains("Name", 8)) {
+            string2 = le.getString("Name");
         }
-        Label_0040: {
-            if (!jt.contains("Id", 8)) {
-                break Label_0040;
-            }
-            string3 = jt.getString("Id");
-            try {
-                UUID uUID4;
-                try {
-                    uUID4 = UUID.fromString(string3);
-                }
-                catch (Throwable throwable5) {
-                    uUID4 = null;
-                }
-                final GameProfile gameProfile5 = new GameProfile(uUID4, string2);
-                if (jt.contains("Properties", 10)) {
-                    final CompoundTag jt2 = jt.getCompound("Properties");
-                    for (final String string4 : jt2.getAllKeys()) {
-                        final ListTag jz9 = jt2.getList(string4, 10);
-                        for (int integer10 = 0; integer10 < jz9.size(); ++integer10) {
-                            final CompoundTag jt3 = jz9.getCompound(integer10);
-                            final String string5 = jt3.getString("Value");
-                            if (jt3.contains("Signature", 8)) {
-                                gameProfile5.getProperties().put(string4, new Property(string4, string5, jt3.getString("Signature")));
-                            }
-                            else {
-                                gameProfile5.getProperties().put(string4, new Property(string4, string5));
-                            }
+        if (le.hasUUID("Id")) {
+            uUID3 = le.getUUID("Id");
+        }
+        try {
+            final GameProfile gameProfile4 = new GameProfile(uUID3, string2);
+            if (le.contains("Properties", 10)) {
+                final CompoundTag le2 = le.getCompound("Properties");
+                for (final String string3 : le2.getAllKeys()) {
+                    final ListTag lk8 = le2.getList(string3, 10);
+                    for (int integer9 = 0; integer9 < lk8.size(); ++integer9) {
+                        final CompoundTag le3 = lk8.getCompound(integer9);
+                        final String string4 = le3.getString("Value");
+                        if (le3.contains("Signature", 8)) {
+                            gameProfile4.getProperties().put(string3, new Property(string3, string4, le3.getString("Signature")));
+                        }
+                        else {
+                            gameProfile4.getProperties().put(string3, new Property(string3, string4));
                         }
                     }
                 }
-                return gameProfile5;
-            }
-            catch (Throwable t) {
-                return null;
             }
+            return gameProfile4;
+        }
+        catch (Throwable t) {
+            return null;
         }
     }
     
-    public static CompoundTag writeGameProfile(final CompoundTag jt, final GameProfile gameProfile) {
+    public static CompoundTag writeGameProfile(final CompoundTag le, final GameProfile gameProfile) {
         if (!StringUtil.isNullOrEmpty(gameProfile.getName())) {
-            jt.putString("Name", gameProfile.getName());
+            le.putString("Name", gameProfile.getName());
         }
         if (gameProfile.getId() != null) {
-            jt.putString("Id", gameProfile.getId().toString());
+            le.putUUID("Id", gameProfile.getId());
         }
         if (!gameProfile.getProperties().isEmpty()) {
-            final CompoundTag jt2 = new CompoundTag();
+            final CompoundTag le2 = new CompoundTag();
             for (final String string5 : gameProfile.getProperties().keySet()) {
-                final ListTag jz6 = new ListTag();
+                final ListTag lk6 = new ListTag();
                 for (final Property property8 : gameProfile.getProperties().get(string5)) {
-                    final CompoundTag jt3 = new CompoundTag();
-                    jt3.putString("Value", property8.getValue());
+                    final CompoundTag le3 = new CompoundTag();
+                    le3.putString("Value", property8.getValue());
                     if (property8.hasSignature()) {
-                        jt3.putString("Signature", property8.getSignature());
+                        le3.putString("Signature", property8.getSignature());
                     }
-                    ((AbstractList<CompoundTag>)jz6).add(jt3);
+                    ((AbstractList<CompoundTag>)lk6).add(le3);
                 }
-                jt2.put(string5, jz6);
+                le2.put(string5, lk6);
             }
-            jt.put("Properties", jt2);
+            le.put("Properties", le2);
         }
-        return jt;
+        return le;
     }
     
     @VisibleForTesting
-    public static boolean compareNbt(@Nullable final Tag kj1, @Nullable final Tag kj2, final boolean boolean3) {
-        if (kj1 == kj2) {
+    public static boolean compareNbt(@Nullable final Tag lu1, @Nullable final Tag lu2, final boolean boolean3) {
+        if (lu1 == lu2) {
             return true;
         }
-        if (kj1 == null) {
+        if (lu1 == null) {
             return true;
         }
-        if (kj2 == null) {
+        if (lu2 == null) {
             return false;
         }
-        if (!kj1.getClass().equals(kj2.getClass())) {
+        if (!lu1.getClass().equals(lu2.getClass())) {
             return false;
         }
-        if (kj1 instanceof CompoundTag) {
-            final CompoundTag jt4 = (CompoundTag)kj1;
-            final CompoundTag jt5 = (CompoundTag)kj2;
-            for (final String string7 : jt4.getAllKeys()) {
-                final Tag kj3 = jt4.get(string7);
-                if (!compareNbt(kj3, jt5.get(string7), boolean3)) {
+        if (lu1 instanceof CompoundTag) {
+            final CompoundTag le4 = (CompoundTag)lu1;
+            final CompoundTag le5 = (CompoundTag)lu2;
+            for (final String string7 : le4.getAllKeys()) {
+                final Tag lu3 = le4.get(string7);
+                if (!compareNbt(lu3, le5.get(string7), boolean3)) {
                     return false;
                 }
             }
             return true;
         }
-        if (!(kj1 instanceof ListTag) || !boolean3) {
-            return kj1.equals(kj2);
+        if (!(lu1 instanceof ListTag) || !boolean3) {
+            return lu1.equals(lu2);
         }
-        final ListTag jz4 = (ListTag)kj1;
-        final ListTag jz5 = (ListTag)kj2;
-        if (jz4.isEmpty()) {
-            return jz5.isEmpty();
+        final ListTag lk4 = (ListTag)lu1;
+        final ListTag lk5 = (ListTag)lu2;
+        if (lk4.isEmpty()) {
+            return lk5.isEmpty();
         }
-        for (int integer6 = 0; integer6 < jz4.size(); ++integer6) {
-            final Tag kj4 = jz4.get(integer6);
+        for (int integer6 = 0; integer6 < lk4.size(); ++integer6) {
+            final Tag lu4 = lk4.get(integer6);
             boolean boolean4 = false;
-            for (int integer7 = 0; integer7 < jz5.size(); ++integer7) {
-                if (compareNbt(kj4, jz5.get(integer7), boolean3)) {
+            for (int integer7 = 0; integer7 < lk5.size(); ++integer7) {
+                if (compareNbt(lu4, lk5.get(integer7), boolean3)) {
                     boolean4 = true;
                     break;
                 }
@@ -151,82 +142,86 @@ public final class NbtUtils {
         return true;
     }
     
-    public static CompoundTag createUUIDTag(final UUID uUID) {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.putLong("M", uUID.getMostSignificantBits());
-        jt2.putLong("L", uUID.getLeastSignificantBits());
-        return jt2;
+    public static IntArrayTag createUUID(final UUID uUID) {
+        return new IntArrayTag(SerializableUUID.uuidToIntArray(uUID));
     }
     
-    public static UUID loadUUIDTag(final CompoundTag jt) {
-        return new UUID(jt.getLong("M"), jt.getLong("L"));
+    public static UUID loadUUID(final Tag lu) {
+        if (lu.getType() != IntArrayTag.TYPE) {
+            throw new IllegalArgumentException("Expected UUID-Tag to be of type " + IntArrayTag.TYPE.getName() + ", but found " + lu.getType().getName() + ".");
+        }
+        final int[] arr2 = ((IntArrayTag)lu).getAsIntArray();
+        if (arr2.length != 4) {
+            throw new IllegalArgumentException("Expected UUID-Array to be of length 4, but found " + arr2.length + ".");
+        }
+        return SerializableUUID.uuidFromIntArray(arr2);
     }
     
-    public static BlockPos readBlockPos(final CompoundTag jt) {
-        return new BlockPos(jt.getInt("X"), jt.getInt("Y"), jt.getInt("Z"));
+    public static BlockPos readBlockPos(final CompoundTag le) {
+        return new BlockPos(le.getInt("X"), le.getInt("Y"), le.getInt("Z"));
     }
     
-    public static CompoundTag writeBlockPos(final BlockPos fk) {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.putInt("X", fk.getX());
-        jt2.putInt("Y", fk.getY());
-        jt2.putInt("Z", fk.getZ());
-        return jt2;
+    public static CompoundTag writeBlockPos(final BlockPos fu) {
+        final CompoundTag le2 = new CompoundTag();
+        le2.putInt("X", fu.getX());
+        le2.putInt("Y", fu.getY());
+        le2.putInt("Z", fu.getZ());
+        return le2;
     }
     
-    public static BlockState readBlockState(final CompoundTag jt) {
-        if (!jt.contains("Name", 8)) {
+    public static BlockState readBlockState(final CompoundTag le) {
+        if (!le.contains("Name", 8)) {
             return Blocks.AIR.defaultBlockState();
         }
-        final Block bph2 = Registry.BLOCK.get(new ResourceLocation(jt.getString("Name")));
-        BlockState byj3 = bph2.defaultBlockState();
-        if (jt.contains("Properties", 10)) {
-            final CompoundTag jt2 = jt.getCompound("Properties");
-            final StateDefinition<Block, BlockState> byk5 = bph2.getStateDefinition();
-            for (final String string7 : jt2.getAllKeys()) {
-                final net.minecraft.world.level.block.state.properties.Property<?> bzm8 = byk5.getProperty(string7);
-                if (bzm8 != null) {
-                    byj3 = NbtUtils.setValueHelper(byj3, bzm8, string7, jt2, jt);
+        final Block bvr2 = Registry.BLOCK.get(new ResourceLocation(le.getString("Name")));
+        BlockState cfj3 = bvr2.defaultBlockState();
+        if (le.contains("Properties", 10)) {
+            final CompoundTag le2 = le.getCompound("Properties");
+            final StateDefinition<Block, BlockState> cfk5 = bvr2.getStateDefinition();
+            for (final String string7 : le2.getAllKeys()) {
+                final net.minecraft.world.level.block.state.properties.Property<?> cgl8 = cfk5.getProperty(string7);
+                if (cgl8 != null) {
+                    cfj3 = NbtUtils.setValueHelper(cfj3, cgl8, string7, le2, le);
                 }
             }
         }
-        return byj3;
+        return cfj3;
     }
     
-    private static <S extends StateHolder<S>, T extends Comparable<T>> S setValueHelper(final S byl, final net.minecraft.world.level.block.state.properties.Property<T> bzm, final String string, final CompoundTag jt4, final CompoundTag jt5) {
-        final Optional<T> optional6 = bzm.getValue(jt4.getString(string));
+    private static <S extends StateHolder<?, S>, T extends Comparable<T>> S setValueHelper(final S cfl, final net.minecraft.world.level.block.state.properties.Property<T> cgl, final String string, final CompoundTag le4, final CompoundTag le5) {
+        final Optional<T> optional6 = cgl.getValue(le4.getString(string));
         if (optional6.isPresent()) {
-            return byl.<T, T>setValue(bzm, optional6.get());
+            return ((StateHolder<O, S>)cfl).<T, T>setValue(cgl, optional6.get());
         }
-        NbtUtils.LOGGER.warn("Unable to read property: {} with value: {} for blockstate: {}", string, jt4.getString(string), jt5.toString());
-        return byl;
+        NbtUtils.LOGGER.warn("Unable to read property: {} with value: {} for blockstate: {}", string, le4.getString(string), le5.toString());
+        return cfl;
     }
     
-    public static CompoundTag writeBlockState(final BlockState byj) {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.putString("Name", Registry.BLOCK.getKey(byj.getBlock()).toString());
-        final ImmutableMap<net.minecraft.world.level.block.state.properties.Property<?>, Comparable<?>> immutableMap3 = byj.getValues();
+    public static CompoundTag writeBlockState(final BlockState cfj) {
+        final CompoundTag le2 = new CompoundTag();
+        le2.putString("Name", Registry.BLOCK.getKey(cfj.getBlock()).toString());
+        final ImmutableMap<net.minecraft.world.level.block.state.properties.Property<?>, Comparable<?>> immutableMap3 = cfj.getValues();
         if (!immutableMap3.isEmpty()) {
-            final CompoundTag jt3 = new CompoundTag();
+            final CompoundTag le3 = new CompoundTag();
             for (final Map.Entry<net.minecraft.world.level.block.state.properties.Property<?>, Comparable<?>> entry6 : immutableMap3.entrySet()) {
-                final net.minecraft.world.level.block.state.properties.Property<?> bzm7 = entry6.getKey();
-                jt3.putString(bzm7.getName(), NbtUtils.getName(bzm7, entry6.getValue()));
+                final net.minecraft.world.level.block.state.properties.Property<?> cgl7 = entry6.getKey();
+                le3.putString(cgl7.getName(), NbtUtils.getName(cgl7, entry6.getValue()));
             }
-            jt2.put("Properties", jt3);
+            le2.put("Properties", le3);
         }
-        return jt2;
+        return le2;
     }
     
-    private static <T extends Comparable<T>> String getName(final net.minecraft.world.level.block.state.properties.Property<T> bzm, final Comparable<?> comparable) {
-        return bzm.getName((T)comparable);
+    private static <T extends Comparable<T>> String getName(final net.minecraft.world.level.block.state.properties.Property<T> cgl, final Comparable<?> comparable) {
+        return cgl.getName((T)comparable);
     }
     
-    public static CompoundTag update(final DataFixer dataFixer, final DataFixTypes acd, final CompoundTag jt, final int integer) {
-        return update(dataFixer, acd, jt, integer, SharedConstants.getCurrentVersion().getWorldVersion());
+    public static CompoundTag update(final DataFixer dataFixer, final DataFixTypes aeo, final CompoundTag le, final int integer) {
+        return update(dataFixer, aeo, le, integer, SharedConstants.getCurrentVersion().getWorldVersion());
     }
     
-    public static CompoundTag update(final DataFixer dataFixer, final DataFixTypes acd, final CompoundTag jt, final int integer4, final int integer5) {
-        return (CompoundTag)dataFixer.update(acd.getType(), new Dynamic((DynamicOps)NbtOps.INSTANCE, jt), integer4, integer5).getValue();
+    public static CompoundTag update(final DataFixer dataFixer, final DataFixTypes aeo, final CompoundTag le, final int integer4, final int integer5) {
+        return (CompoundTag)dataFixer.update(aeo.getType(), new Dynamic((DynamicOps)NbtOps.INSTANCE, le), integer4, integer5).getValue();
     }
     
     static {
diff --git a/src/net/minecraft/nbt/ShortTag.java b/src/net/minecraft/nbt/ShortTag.java
index e3b664e..51166f0 100644
--- a/src/net/minecraft/nbt/ShortTag.java
+++ b/src/net/minecraft/nbt/ShortTag.java
@@ -58,8 +58,8 @@ public class ShortTag extends NumericTag {
     
     @Override
     public Component getPrettyDisplay(final String string, final int integer) {
-        final Component lf4 = new TextComponent("s").withStyle(ShortTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
-        return new TextComponent(String.valueOf(this.data)).append(lf4).withStyle(ShortTag.SYNTAX_HIGHLIGHTING_NUMBER);
+        final Component mr4 = new TextComponent("s").withStyle(ShortTag.SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+        return new TextComponent(String.valueOf(this.data)).append(mr4).withStyle(ShortTag.SYNTAX_HIGHLIGHTING_NUMBER);
     }
     
     @Override
@@ -100,8 +100,8 @@ public class ShortTag extends NumericTag {
     static {
         TYPE = new TagType<ShortTag>() {
             @Override
-            public ShortTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(80L);
+            public ShortTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(80L);
                 return ShortTag.valueOf(dataInput.readShort());
             }
             
diff --git a/src/net/minecraft/nbt/StringTag.java b/src/net/minecraft/nbt/StringTag.java
index 57d04bb..cfe197c 100644
--- a/src/net/minecraft/nbt/StringTag.java
+++ b/src/net/minecraft/nbt/StringTag.java
@@ -68,8 +68,8 @@ public class StringTag implements Tag {
     public Component getPrettyDisplay(final String string, final int integer) {
         final String string2 = quoteAndEscape(this.data);
         final String string3 = string2.substring(0, 1);
-        final Component lf6 = new TextComponent(string2.substring(1, string2.length() - 1)).withStyle(StringTag.SYNTAX_HIGHLIGHTING_STRING);
-        return new TextComponent(string3).append(lf6).append(string3);
+        final Component mr6 = new TextComponent(string2.substring(1, string2.length() - 1)).withStyle(StringTag.SYNTAX_HIGHLIGHTING_STRING);
+        return new TextComponent(string3).append(mr6).append(string3);
     }
     
     public static String quoteAndEscape(final String string) {
@@ -101,10 +101,10 @@ public class StringTag implements Tag {
     static {
         TYPE = new TagType<StringTag>() {
             @Override
-            public StringTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
-                kc.accountBits(288L);
+            public StringTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
+                ln.accountBits(288L);
                 final String string5 = dataInput.readUTF();
-                kc.accountBits(16 * string5.length());
+                ln.accountBits(16 * string5.length());
                 return StringTag.valueOf(string5);
             }
             
diff --git a/src/net/minecraft/nbt/TagParser.java b/src/net/minecraft/nbt/TagParser.java
index 9af814c..7b74213 100644
--- a/src/net/minecraft/nbt/TagParser.java
+++ b/src/net/minecraft/nbt/TagParser.java
@@ -35,12 +35,12 @@ public class TagParser {
     
     @VisibleForTesting
     CompoundTag readSingleStruct() throws CommandSyntaxException {
-        final CompoundTag jt2 = this.readStruct();
+        final CompoundTag le2 = this.readStruct();
         this.reader.skipWhitespace();
         if (this.reader.canRead()) {
             throw TagParser.ERROR_TRAILING_DATA.createWithContext((ImmutableStringReader)this.reader);
         }
-        return jt2;
+        return le2;
     }
     
     public TagParser(final StringReader stringReader) {
@@ -127,7 +127,7 @@ public class TagParser {
     
     public CompoundTag readStruct() throws CommandSyntaxException {
         this.expect('{');
-        final CompoundTag jt2 = new CompoundTag();
+        final CompoundTag le2 = new CompoundTag();
         this.reader.skipWhitespace();
         while (this.reader.canRead() && this.reader.peek() != '}') {
             final int integer3 = this.reader.getCursor();
@@ -137,7 +137,7 @@ public class TagParser {
                 throw TagParser.ERROR_EXPECTED_KEY.createWithContext((ImmutableStringReader)this.reader);
             }
             this.expect(':');
-            jt2.put(string4, this.readValue());
+            le2.put(string4, this.readValue());
             if (!this.hasElementSeparator()) {
                 break;
             }
@@ -146,7 +146,7 @@ public class TagParser {
             }
         }
         this.expect('}');
-        return jt2;
+        return le2;
     }
     
     private Tag readListTag() throws CommandSyntaxException {
@@ -155,20 +155,20 @@ public class TagParser {
         if (!this.reader.canRead()) {
             throw TagParser.ERROR_EXPECTED_VALUE.createWithContext((ImmutableStringReader)this.reader);
         }
-        final ListTag jz2 = new ListTag();
-        TagType<?> kl3 = null;
+        final ListTag lk2 = new ListTag();
+        TagType<?> lw3 = null;
         while (this.reader.peek() != ']') {
             final int integer4 = this.reader.getCursor();
-            final Tag kj5 = this.readValue();
-            final TagType<?> kl4 = kj5.getType();
-            if (kl3 == null) {
-                kl3 = kl4;
+            final Tag lu5 = this.readValue();
+            final TagType<?> lw4 = lu5.getType();
+            if (lw3 == null) {
+                lw3 = lw4;
             }
-            else if (kl4 != kl3) {
+            else if (lw4 != lw3) {
                 this.reader.setCursor(integer4);
-                throw TagParser.ERROR_INSERT_MIXED_LIST.createWithContext((ImmutableStringReader)this.reader, kl4.getPrettyName(), kl3.getPrettyName());
+                throw TagParser.ERROR_INSERT_MIXED_LIST.createWithContext((ImmutableStringReader)this.reader, lw4.getPrettyName(), lw3.getPrettyName());
             }
-            jz2.add(kj5);
+            lk2.add(lu5);
             if (!this.hasElementSeparator()) {
                 break;
             }
@@ -177,7 +177,7 @@ public class TagParser {
             }
         }
         this.expect(']');
-        return jz2;
+        return lk2;
     }
     
     private Tag readArrayTag() throws CommandSyntaxException {
@@ -202,24 +202,24 @@ public class TagParser {
         throw TagParser.ERROR_INVALID_ARRAY.createWithContext((ImmutableStringReader)this.reader, String.valueOf(character3));
     }
     
-    private <T extends Number> List<T> readArray(final TagType<?> kl1, final TagType<?> kl2) throws CommandSyntaxException {
+    private <T extends Number> List<T> readArray(final TagType<?> lw1, final TagType<?> lw2) throws CommandSyntaxException {
         final List<T> list4 = Lists.newArrayList();
         while (this.reader.peek() != ']') {
             final int integer5 = this.reader.getCursor();
-            final Tag kj6 = this.readValue();
-            final TagType<?> kl3 = kj6.getType();
-            if (kl3 != kl2) {
+            final Tag lu6 = this.readValue();
+            final TagType<?> lw3 = lu6.getType();
+            if (lw3 != lw2) {
                 this.reader.setCursor(integer5);
-                throw TagParser.ERROR_INSERT_MIXED_ARRAY.createWithContext((ImmutableStringReader)this.reader, kl3.getPrettyName(), kl1.getPrettyName());
+                throw TagParser.ERROR_INSERT_MIXED_ARRAY.createWithContext((ImmutableStringReader)this.reader, lw3.getPrettyName(), lw1.getPrettyName());
             }
-            if (kl2 == ByteTag.TYPE) {
-                list4.add((T)((NumericTag)kj6).getAsByte());
+            if (lw2 == ByteTag.TYPE) {
+                list4.add((T)((NumericTag)lu6).getAsByte());
             }
-            else if (kl2 == LongTag.TYPE) {
-                list4.add((T)((NumericTag)kj6).getAsLong());
+            else if (lw2 == LongTag.TYPE) {
+                list4.add((T)((NumericTag)lu6).getAsLong());
             }
             else {
-                list4.add((T)((NumericTag)kj6).getAsInt());
+                list4.add((T)((NumericTag)lu6).getAsInt());
             }
             if (!this.hasElementSeparator()) {
                 break;
@@ -248,9 +248,9 @@ public class TagParser {
     }
     
     static {
-        ERROR_TRAILING_DATA = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.nbt.trailing", new Object[0]));
-        ERROR_EXPECTED_KEY = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.nbt.expected.key", new Object[0]));
-        ERROR_EXPECTED_VALUE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.nbt.expected.value", new Object[0]));
+        ERROR_TRAILING_DATA = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.nbt.trailing"));
+        ERROR_EXPECTED_KEY = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.nbt.expected.key"));
+        ERROR_EXPECTED_VALUE = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.nbt.expected.value"));
         ERROR_INSERT_MIXED_LIST = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("argument.nbt.list.mixed", new Object[] { object1, object2 }));
         ERROR_INSERT_MIXED_ARRAY = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("argument.nbt.array.mixed", new Object[] { object1, object2 }));
         final TranslatableComponent translatableComponent;
diff --git a/src/net/minecraft/nbt/TagType.java b/src/net/minecraft/nbt/TagType.java
index 3c3cb8d..a8a72a4 100644
--- a/src/net/minecraft/nbt/TagType.java
+++ b/src/net/minecraft/nbt/TagType.java
@@ -4,7 +4,7 @@ import java.io.IOException;
 import java.io.DataInput;
 
 public interface TagType<T extends Tag> {
-    T load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException;
+    T load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException;
     
     default boolean isValue() {
         return false;
@@ -17,7 +17,7 @@ public interface TagType<T extends Tag> {
     default TagType<EndTag> createInvalid(final int integer) {
         return new TagType<EndTag>() {
             @Override
-            public EndTag load(final DataInput dataInput, final int integer, final NbtAccounter kc) throws IOException {
+            public EndTag load(final DataInput dataInput, final int integer, final NbtAccounter ln) throws IOException {
                 throw new IllegalArgumentException("Invalid tag id: " + integer);
             }
             
diff --git a/src/net/minecraft/network/CompressionDecoder.java b/src/net/minecraft/network/CompressionDecoder.java
index 86b709c..0e2b049 100644
--- a/src/net/minecraft/network/CompressionDecoder.java
+++ b/src/net/minecraft/network/CompressionDecoder.java
@@ -21,10 +21,10 @@ public class CompressionDecoder extends ByteToMessageDecoder {
         if (byteBuf.readableBytes() == 0) {
             return;
         }
-        final FriendlyByteBuf kv5 = new FriendlyByteBuf(byteBuf);
-        final int integer6 = kv5.readVarInt();
+        final FriendlyByteBuf mg5 = new FriendlyByteBuf(byteBuf);
+        final int integer6 = mg5.readVarInt();
         if (integer6 == 0) {
-            list.add(kv5.readBytes(kv5.readableBytes()));
+            list.add(mg5.readBytes(mg5.readableBytes()));
         }
         else {
             if (integer6 < this.threshold) {
@@ -33,8 +33,8 @@ public class CompressionDecoder extends ByteToMessageDecoder {
             if (integer6 > 2097152) {
                 throw new DecoderException("Badly compressed packet - size of " + integer6 + " is larger than protocol maximum of " + 2097152);
             }
-            final byte[] arr7 = new byte[kv5.readableBytes()];
-            kv5.readBytes(arr7);
+            final byte[] arr7 = new byte[mg5.readableBytes()];
+            mg5.readBytes(arr7);
             this.inflater.setInput(arr7);
             final byte[] arr8 = new byte[integer6];
             this.inflater.inflate(arr8);
diff --git a/src/net/minecraft/network/CompressionEncoder.java b/src/net/minecraft/network/CompressionEncoder.java
index 9885b24..1dabad7 100644
--- a/src/net/minecraft/network/CompressionEncoder.java
+++ b/src/net/minecraft/network/CompressionEncoder.java
@@ -18,20 +18,20 @@ public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
     
     protected void encode(final ChannelHandlerContext channelHandlerContext, final ByteBuf byteBuf2, final ByteBuf byteBuf3) throws Exception {
         final int integer5 = byteBuf2.readableBytes();
-        final FriendlyByteBuf kv6 = new FriendlyByteBuf(byteBuf3);
+        final FriendlyByteBuf mg6 = new FriendlyByteBuf(byteBuf3);
         if (integer5 < this.threshold) {
-            kv6.writeVarInt(0);
-            kv6.writeBytes(byteBuf2);
+            mg6.writeVarInt(0);
+            mg6.writeBytes(byteBuf2);
         }
         else {
             final byte[] arr7 = new byte[integer5];
             byteBuf2.readBytes(arr7);
-            kv6.writeVarInt(arr7.length);
+            mg6.writeVarInt(arr7.length);
             this.deflater.setInput(arr7, 0, integer5);
             this.deflater.finish();
             while (!this.deflater.finished()) {
                 final int integer6 = this.deflater.deflate(this.encodeBuf);
-                kv6.writeBytes(this.encodeBuf, 0, integer6);
+                mg6.writeBytes(this.encodeBuf, 0, integer6);
             }
             this.deflater.reset();
         }
diff --git a/src/net/minecraft/network/Connection.java b/src/net/minecraft/network/Connection.java
index 55f1826..8e88d68 100644
--- a/src/net/minecraft/network/Connection.java
+++ b/src/net/minecraft/network/Connection.java
@@ -72,9 +72,9 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
     private int tickCount;
     private boolean handlingFault;
     
-    public Connection(final PacketFlow lu) {
+    public Connection(final PacketFlow nj) {
         this.queue = Queues.newConcurrentLinkedQueue();
-        this.receiving = lu;
+        this.receiving = nj;
     }
     
     public void channelActive(final ChannelHandlerContext channelHandlerContext) throws Exception {
@@ -89,14 +89,14 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
         }
     }
     
-    public void setProtocol(final ConnectionProtocol ku) {
-        this.channel.attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).set(ku);
+    public void setProtocol(final ConnectionProtocol mf) {
+        this.channel.attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).set(mf);
         this.channel.config().setAutoRead(true);
         Connection.LOGGER.debug("Enabled auto read");
     }
     
     public void channelInactive(final ChannelHandlerContext channelHandlerContext) throws Exception {
-        this.disconnect(new TranslatableComponent("disconnect.endOfStream", new Object[0]));
+        this.disconnect(new TranslatableComponent("disconnect.endOfStream"));
     }
     
     public void exceptionCaught(final ChannelHandlerContext channelHandlerContext, final Throwable throwable) {
@@ -111,69 +111,68 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
         }
         if (throwable instanceof TimeoutException) {
             Connection.LOGGER.debug("Timeout", throwable);
-            this.disconnect(new TranslatableComponent("disconnect.timeout", new Object[0]));
+            this.disconnect(new TranslatableComponent("disconnect.timeout"));
         }
         else {
-            final Component lf5 = new TranslatableComponent("disconnect.genericReason", new Object[] { "Internal Exception: " + throwable });
+            final Component mr5 = new TranslatableComponent("disconnect.genericReason", new Object[] { "Internal Exception: " + throwable });
             if (boolean4) {
                 Connection.LOGGER.debug("Failed to sent packet", throwable);
-                this.send(new ClientboundDisconnectPacket(lf5), (future -> this.disconnect(lf5)));
+                this.send(new ClientboundDisconnectPacket(mr5), (future -> this.disconnect(mr5)));
                 this.setReadOnly();
             }
             else {
                 Connection.LOGGER.debug("Double fault", throwable);
-                this.disconnect(lf5);
+                this.disconnect(mr5);
             }
         }
     }
     
-    protected void channelRead0(final ChannelHandlerContext channelHandlerContext, final Packet<?> lt) throws Exception {
+    protected void channelRead0(final ChannelHandlerContext channelHandlerContext, final Packet<?> ni) throws Exception {
         if (this.channel.isOpen()) {
             try {
-                Connection.genericsFtw(lt, this.packetListener);
+                Connection.genericsFtw(ni, this.packetListener);
             }
             catch (RunningOnDifferentThreadException ex) {}
             ++this.receivedPackets;
         }
     }
     
-    private static <T extends PacketListener> void genericsFtw(final Packet<T> lt, final PacketListener ky) {
-        lt.handle((T)ky);
+    private static <T extends PacketListener> void genericsFtw(final Packet<T> ni, final PacketListener mj) {
+        ni.handle((T)mj);
     }
     
-    public void setListener(final PacketListener ky) {
-        Validate.notNull(ky, "packetListener", new Object[0]);
-        Connection.LOGGER.debug("Set listener of {} to {}", this, ky);
-        this.packetListener = ky;
+    public void setListener(final PacketListener mj) {
+        Validate.notNull(mj, "packetListener", new Object[0]);
+        this.packetListener = mj;
     }
     
-    public void send(final Packet<?> lt) {
-        this.send(lt, null);
+    public void send(final Packet<?> ni) {
+        this.send(ni, null);
     }
     
-    public void send(final Packet<?> lt, @Nullable final GenericFutureListener<? extends Future<? super Void>> genericFutureListener) {
+    public void send(final Packet<?> ni, @Nullable final GenericFutureListener<? extends Future<? super Void>> genericFutureListener) {
         if (this.isConnected()) {
             this.flushQueue();
-            this.sendPacket(lt, genericFutureListener);
+            this.sendPacket(ni, genericFutureListener);
         }
         else {
-            this.queue.add(new PacketHolder(lt, genericFutureListener));
+            this.queue.add(new PacketHolder(ni, genericFutureListener));
         }
     }
     
-    private void sendPacket(final Packet<?> lt, @Nullable final GenericFutureListener<? extends Future<? super Void>> genericFutureListener) {
-        final ConnectionProtocol ku4 = ConnectionProtocol.getProtocolForPacket(lt);
-        final ConnectionProtocol ku5 = (ConnectionProtocol)this.channel.attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get();
+    private void sendPacket(final Packet<?> ni, @Nullable final GenericFutureListener<? extends Future<? super Void>> genericFutureListener) {
+        final ConnectionProtocol mf4 = ConnectionProtocol.getProtocolForPacket(ni);
+        final ConnectionProtocol mf5 = (ConnectionProtocol)this.channel.attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get();
         ++this.sentPackets;
-        if (ku5 != ku4) {
+        if (mf5 != mf4) {
             Connection.LOGGER.debug("Disabled auto read");
             this.channel.config().setAutoRead(false);
         }
         if (this.channel.eventLoop().inEventLoop()) {
-            if (ku4 != ku5) {
-                this.setProtocol(ku4);
+            if (mf4 != mf5) {
+                this.setProtocol(mf4);
             }
-            final ChannelFuture channelFuture6 = this.channel.writeAndFlush(lt);
+            final ChannelFuture channelFuture6 = this.channel.writeAndFlush(ni);
             if (genericFutureListener != null) {
                 channelFuture6.addListener((GenericFutureListener)genericFutureListener);
             }
@@ -183,10 +182,10 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
             final ConnectionProtocol protocol;
             final ChannelFuture channelFuture7;
             this.channel.eventLoop().execute(() -> {
-                if (protocol != ku5) {
+                if (protocol != mf5) {
                     this.setProtocol(protocol);
                 }
-                channelFuture7 = this.channel.writeAndFlush(lt);
+                channelFuture7 = this.channel.writeAndFlush(ni);
                 if (genericFutureListener != null) {
                     channelFuture7.addListener((GenericFutureListener)genericFutureListener);
                 }
@@ -230,10 +229,10 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
         return this.address;
     }
     
-    public void disconnect(final Component lf) {
+    public void disconnect(final Component mr) {
         if (this.channel.isOpen()) {
             this.channel.close().awaitUninterruptibly();
-            this.disconnectedReason = lf;
+            this.disconnectedReason = mr;
         }
     }
     
@@ -242,37 +241,37 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
     }
     
     public static Connection connectToServer(final InetAddress inetAddress, final int integer, final boolean boolean3) {
-        final Connection kt4 = new Connection(PacketFlow.CLIENTBOUND);
+        final Connection me4 = new Connection(PacketFlow.CLIENTBOUND);
         Class<? extends SocketChannel> class5;
-        LazyLoadedValue<? extends EventLoopGroup> abn6;
+        LazyLoadedValue<? extends EventLoopGroup> ady6;
         if (Epoll.isAvailable() && boolean3) {
             class5 = EpollSocketChannel.class;
-            abn6 = Connection.NETWORK_EPOLL_WORKER_GROUP;
+            ady6 = Connection.NETWORK_EPOLL_WORKER_GROUP;
         }
         else {
             class5 = NioSocketChannel.class;
-            abn6 = Connection.NETWORK_WORKER_GROUP;
+            ady6 = Connection.NETWORK_WORKER_GROUP;
         }
-        ((Bootstrap)((Bootstrap)((Bootstrap)new Bootstrap().group((EventLoopGroup)abn6.get())).handler((ChannelHandler)new ChannelInitializer<Channel>() {
+        ((Bootstrap)((Bootstrap)((Bootstrap)new Bootstrap().group((EventLoopGroup)ady6.get())).handler((ChannelHandler)new ChannelInitializer<Channel>() {
             protected void initChannel(final Channel channel) throws Exception {
                 try {
                     channel.config().setOption(ChannelOption.TCP_NODELAY, true);
                 }
                 catch (ChannelException ex) {}
-                channel.pipeline().addLast("timeout", (ChannelHandler)new ReadTimeoutHandler(30)).addLast("splitter", (ChannelHandler)new Varint21FrameDecoder()).addLast("decoder", (ChannelHandler)new PacketDecoder(PacketFlow.CLIENTBOUND)).addLast("prepender", (ChannelHandler)new Varint21LengthFieldPrepender()).addLast("encoder", (ChannelHandler)new PacketEncoder(PacketFlow.SERVERBOUND)).addLast("packet_handler", (ChannelHandler)kt4);
+                channel.pipeline().addLast("timeout", (ChannelHandler)new ReadTimeoutHandler(30)).addLast("splitter", (ChannelHandler)new Varint21FrameDecoder()).addLast("decoder", (ChannelHandler)new PacketDecoder(PacketFlow.CLIENTBOUND)).addLast("prepender", (ChannelHandler)new Varint21LengthFieldPrepender()).addLast("encoder", (ChannelHandler)new PacketEncoder(PacketFlow.SERVERBOUND)).addLast("packet_handler", (ChannelHandler)me4);
             }
         })).channel((Class)class5)).connect(inetAddress, integer).syncUninterruptibly();
-        return kt4;
+        return me4;
     }
     
     public static Connection connectToLocalServer(final SocketAddress socketAddress) {
-        final Connection kt2 = new Connection(PacketFlow.CLIENTBOUND);
+        final Connection me2 = new Connection(PacketFlow.CLIENTBOUND);
         ((Bootstrap)((Bootstrap)((Bootstrap)new Bootstrap().group((EventLoopGroup)Connection.LOCAL_WORKER_GROUP.get())).handler((ChannelHandler)new ChannelInitializer<Channel>() {
             protected void initChannel(final Channel channel) throws Exception {
-                channel.pipeline().addLast("packet_handler", (ChannelHandler)kt2);
+                channel.pipeline().addLast("packet_handler", (ChannelHandler)me2);
             }
         })).channel((Class)LocalChannel.class)).connect(socketAddress).syncUninterruptibly();
-        return kt2;
+        return me2;
     }
     
     public void setEncryptionKey(final SecretKey secretKey) {
@@ -344,7 +343,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
                 this.getPacketListener().onDisconnect(this.getDisconnectedReason());
             }
             else if (this.getPacketListener() != null) {
-                this.getPacketListener().onDisconnect(new TranslatableComponent("multiplayer.disconnect.generic", new Object[0]));
+                this.getPacketListener().onDisconnect(new TranslatableComponent("multiplayer.disconnect.generic"));
             }
         }
     }
@@ -384,8 +383,8 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
         @Nullable
         private final GenericFutureListener<? extends Future<? super Void>> listener;
         
-        public PacketHolder(final Packet<?> lt, @Nullable final GenericFutureListener<? extends Future<? super Void>> genericFutureListener) {
-            this.packet = lt;
+        public PacketHolder(final Packet<?> ni, @Nullable final GenericFutureListener<? extends Future<? super Void>> genericFutureListener) {
+            this.packet = ni;
             this.listener = genericFutureListener;
         }
     }
diff --git a/src/net/minecraft/network/ConnectionProtocol.java b/src/net/minecraft/network/ConnectionProtocol.java
index aa405df..7721f51 100644
--- a/src/net/minecraft/network/ConnectionProtocol.java
+++ b/src/net/minecraft/network/ConnectionProtocol.java
@@ -34,13 +34,13 @@ public enum ConnectionProtocol {
     }
     
     @Nullable
-    public Integer getPacketId(final PacketFlow lu, final Packet<?> lt) {
-        return ((PacketSet)this.flows.get(lu)).getId(lt.getClass());
+    public Integer getPacketId(final PacketFlow nj, final Packet<?> ni) {
+        return ((PacketSet)this.flows.get(nj)).getId(ni.getClass());
     }
     
     @Nullable
-    public Packet<?> createPacket(final PacketFlow lu, final int integer) {
-        return ((PacketSet)this.flows.get(lu)).createPacket(integer);
+    public Packet<?> createPacket(final PacketFlow nj, final int integer) {
+        return ((PacketSet)this.flows.get(nj)).createPacket(integer);
     }
     
     public int getId() {
@@ -55,8 +55,8 @@ public enum ConnectionProtocol {
         return ConnectionProtocol.LOOKUP[integer + 1];
     }
     
-    public static ConnectionProtocol getProtocolForPacket(final Packet<?> lt) {
-        return ConnectionProtocol.PROTOCOL_BY_PACKET.get(lt.getClass());
+    public static ConnectionProtocol getProtocolForPacket(final Packet<?> ni) {
+        return ConnectionProtocol.PROTOCOL_BY_PACKET.get(ni.getClass());
     }
     
     static {
@@ -98,199 +98,199 @@ public enum ConnectionProtocol {
         //    73: ldc             Lnet/minecraft/network/protocol/game/ClientboundAddExperienceOrbPacket;.class
         //    75: invokedynamic   BootstrapMethod #3, get:()Ljava/util/function/Supplier;
         //    80: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //    83: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAddGlobalEntityPacket;.class
+        //    83: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAddMobPacket;.class
         //    86: invokedynamic   BootstrapMethod #4, get:()Ljava/util/function/Supplier;
         //    91: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //    94: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAddMobPacket;.class
+        //    94: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAddPaintingPacket;.class
         //    97: invokedynamic   BootstrapMethod #5, get:()Ljava/util/function/Supplier;
         //   102: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   105: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAddPaintingPacket;.class
+        //   105: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAddPlayerPacket;.class
         //   108: invokedynamic   BootstrapMethod #6, get:()Ljava/util/function/Supplier;
         //   113: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   116: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAddPlayerPacket;.class
+        //   116: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAnimatePacket;.class
         //   119: invokedynamic   BootstrapMethod #7, get:()Ljava/util/function/Supplier;
         //   124: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   127: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAnimatePacket;.class
+        //   127: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAwardStatsPacket;.class
         //   130: invokedynamic   BootstrapMethod #8, get:()Ljava/util/function/Supplier;
         //   135: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   138: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundAwardStatsPacket;.class
+        //   138: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBlockBreakAckPacket;.class
         //   141: invokedynamic   BootstrapMethod #9, get:()Ljava/util/function/Supplier;
         //   146: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   149: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBlockBreakAckPacket;.class
+        //   149: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBlockDestructionPacket;.class
         //   152: invokedynamic   BootstrapMethod #10, get:()Ljava/util/function/Supplier;
         //   157: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   160: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBlockDestructionPacket;.class
+        //   160: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket;.class
         //   163: invokedynamic   BootstrapMethod #11, get:()Ljava/util/function/Supplier;
         //   168: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   171: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket;.class
+        //   171: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBlockEventPacket;.class
         //   174: invokedynamic   BootstrapMethod #12, get:()Ljava/util/function/Supplier;
         //   179: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   182: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBlockEventPacket;.class
+        //   182: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBlockUpdatePacket;.class
         //   185: invokedynamic   BootstrapMethod #13, get:()Ljava/util/function/Supplier;
         //   190: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   193: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBlockUpdatePacket;.class
+        //   193: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBossEventPacket;.class
         //   196: invokedynamic   BootstrapMethod #14, get:()Ljava/util/function/Supplier;
         //   201: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   204: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundBossEventPacket;.class
+        //   204: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundChangeDifficultyPacket;.class
         //   207: invokedynamic   BootstrapMethod #15, get:()Ljava/util/function/Supplier;
         //   212: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   215: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundChangeDifficultyPacket;.class
+        //   215: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundChatPacket;.class
         //   218: invokedynamic   BootstrapMethod #16, get:()Ljava/util/function/Supplier;
         //   223: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   226: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundChatPacket;.class
+        //   226: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundChunkBlocksUpdatePacket;.class
         //   229: invokedynamic   BootstrapMethod #17, get:()Ljava/util/function/Supplier;
         //   234: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   237: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundChunkBlocksUpdatePacket;.class
+        //   237: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundCommandSuggestionsPacket;.class
         //   240: invokedynamic   BootstrapMethod #18, get:()Ljava/util/function/Supplier;
         //   245: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   248: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundCommandSuggestionsPacket;.class
+        //   248: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundCommandsPacket;.class
         //   251: invokedynamic   BootstrapMethod #19, get:()Ljava/util/function/Supplier;
         //   256: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   259: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundCommandsPacket;.class
+        //   259: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundContainerAckPacket;.class
         //   262: invokedynamic   BootstrapMethod #20, get:()Ljava/util/function/Supplier;
         //   267: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   270: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundContainerAckPacket;.class
+        //   270: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundContainerClosePacket;.class
         //   273: invokedynamic   BootstrapMethod #21, get:()Ljava/util/function/Supplier;
         //   278: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   281: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundContainerClosePacket;.class
+        //   281: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundContainerSetContentPacket;.class
         //   284: invokedynamic   BootstrapMethod #22, get:()Ljava/util/function/Supplier;
         //   289: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   292: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundContainerSetContentPacket;.class
+        //   292: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundContainerSetDataPacket;.class
         //   295: invokedynamic   BootstrapMethod #23, get:()Ljava/util/function/Supplier;
         //   300: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   303: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundContainerSetDataPacket;.class
+        //   303: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket;.class
         //   306: invokedynamic   BootstrapMethod #24, get:()Ljava/util/function/Supplier;
         //   311: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   314: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket;.class
+        //   314: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundCooldownPacket;.class
         //   317: invokedynamic   BootstrapMethod #25, get:()Ljava/util/function/Supplier;
         //   322: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   325: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundCooldownPacket;.class
+        //   325: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundCustomPayloadPacket;.class
         //   328: invokedynamic   BootstrapMethod #26, get:()Ljava/util/function/Supplier;
         //   333: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   336: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundCustomPayloadPacket;.class
+        //   336: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundCustomSoundPacket;.class
         //   339: invokedynamic   BootstrapMethod #27, get:()Ljava/util/function/Supplier;
         //   344: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   347: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundCustomSoundPacket;.class
+        //   347: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundDisconnectPacket;.class
         //   350: invokedynamic   BootstrapMethod #28, get:()Ljava/util/function/Supplier;
         //   355: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   358: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundDisconnectPacket;.class
+        //   358: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundEntityEventPacket;.class
         //   361: invokedynamic   BootstrapMethod #29, get:()Ljava/util/function/Supplier;
         //   366: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   369: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundEntityEventPacket;.class
+        //   369: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundExplodePacket;.class
         //   372: invokedynamic   BootstrapMethod #30, get:()Ljava/util/function/Supplier;
         //   377: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   380: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundExplodePacket;.class
+        //   380: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundForgetLevelChunkPacket;.class
         //   383: invokedynamic   BootstrapMethod #31, get:()Ljava/util/function/Supplier;
         //   388: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   391: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundForgetLevelChunkPacket;.class
+        //   391: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundGameEventPacket;.class
         //   394: invokedynamic   BootstrapMethod #32, get:()Ljava/util/function/Supplier;
         //   399: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   402: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundGameEventPacket;.class
+        //   402: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundHorseScreenOpenPacket;.class
         //   405: invokedynamic   BootstrapMethod #33, get:()Ljava/util/function/Supplier;
         //   410: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   413: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundHorseScreenOpenPacket;.class
+        //   413: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundKeepAlivePacket;.class
         //   416: invokedynamic   BootstrapMethod #34, get:()Ljava/util/function/Supplier;
         //   421: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   424: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundKeepAlivePacket;.class
+        //   424: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundLevelChunkPacket;.class
         //   427: invokedynamic   BootstrapMethod #35, get:()Ljava/util/function/Supplier;
         //   432: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   435: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundLevelChunkPacket;.class
+        //   435: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundLevelEventPacket;.class
         //   438: invokedynamic   BootstrapMethod #36, get:()Ljava/util/function/Supplier;
         //   443: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   446: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundLevelEventPacket;.class
+        //   446: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundLevelParticlesPacket;.class
         //   449: invokedynamic   BootstrapMethod #37, get:()Ljava/util/function/Supplier;
         //   454: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   457: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundLevelParticlesPacket;.class
+        //   457: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundLightUpdatePacket;.class
         //   460: invokedynamic   BootstrapMethod #38, get:()Ljava/util/function/Supplier;
         //   465: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   468: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundLightUpdatePacket;.class
+        //   468: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundLoginPacket;.class
         //   471: invokedynamic   BootstrapMethod #39, get:()Ljava/util/function/Supplier;
         //   476: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   479: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundLoginPacket;.class
+        //   479: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundMapItemDataPacket;.class
         //   482: invokedynamic   BootstrapMethod #40, get:()Ljava/util/function/Supplier;
         //   487: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   490: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundMapItemDataPacket;.class
+        //   490: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundMerchantOffersPacket;.class
         //   493: invokedynamic   BootstrapMethod #41, get:()Ljava/util/function/Supplier;
         //   498: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   501: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundMerchantOffersPacket;.class
-        //   504: invokedynamic   BootstrapMethod #42, get:()Ljava/util/function/Supplier;
-        //   509: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   512: ldc             Lnet/minecraft/network/protocol/game/ClientboundMoveEntityPacket$Pos;.class
-        //   514: invokedynamic   BootstrapMethod #43, get:()Ljava/util/function/Supplier;
-        //   519: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   522: ldc             Lnet/minecraft/network/protocol/game/ClientboundMoveEntityPacket$PosRot;.class
-        //   524: invokedynamic   BootstrapMethod #44, get:()Ljava/util/function/Supplier;
-        //   529: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   532: ldc             Lnet/minecraft/network/protocol/game/ClientboundMoveEntityPacket$Rot;.class
-        //   534: invokedynamic   BootstrapMethod #45, get:()Ljava/util/function/Supplier;
-        //   539: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   542: ldc             Lnet/minecraft/network/protocol/game/ClientboundMoveEntityPacket;.class
+        //   501: ldc             Lnet/minecraft/network/protocol/game/ClientboundMoveEntityPacket$Pos;.class
+        //   503: invokedynamic   BootstrapMethod #42, get:()Ljava/util/function/Supplier;
+        //   508: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
+        //   511: ldc             Lnet/minecraft/network/protocol/game/ClientboundMoveEntityPacket$PosRot;.class
+        //   513: invokedynamic   BootstrapMethod #43, get:()Ljava/util/function/Supplier;
+        //   518: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
+        //   521: ldc             Lnet/minecraft/network/protocol/game/ClientboundMoveEntityPacket$Rot;.class
+        //   523: invokedynamic   BootstrapMethod #44, get:()Ljava/util/function/Supplier;
+        //   528: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
+        //   531: ldc             Lnet/minecraft/network/protocol/game/ClientboundMoveEntityPacket;.class
+        //   533: invokedynamic   BootstrapMethod #45, get:()Ljava/util/function/Supplier;
+        //   538: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
+        //   541: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundMoveVehiclePacket;.class
         //   544: invokedynamic   BootstrapMethod #46, get:()Ljava/util/function/Supplier;
         //   549: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   552: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundMoveVehiclePacket;.class
+        //   552: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundOpenBookPacket;.class
         //   555: invokedynamic   BootstrapMethod #47, get:()Ljava/util/function/Supplier;
         //   560: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   563: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundOpenBookPacket;.class
+        //   563: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundOpenScreenPacket;.class
         //   566: invokedynamic   BootstrapMethod #48, get:()Ljava/util/function/Supplier;
         //   571: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   574: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundOpenScreenPacket;.class
+        //   574: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundOpenSignEditorPacket;.class
         //   577: invokedynamic   BootstrapMethod #49, get:()Ljava/util/function/Supplier;
         //   582: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   585: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundOpenSignEditorPacket;.class
+        //   585: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket;.class
         //   588: invokedynamic   BootstrapMethod #50, get:()Ljava/util/function/Supplier;
         //   593: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   596: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket;.class
+        //   596: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlayerAbilitiesPacket;.class
         //   599: invokedynamic   BootstrapMethod #51, get:()Ljava/util/function/Supplier;
         //   604: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   607: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlayerAbilitiesPacket;.class
+        //   607: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlayerCombatPacket;.class
         //   610: invokedynamic   BootstrapMethod #52, get:()Ljava/util/function/Supplier;
         //   615: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   618: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlayerCombatPacket;.class
+        //   618: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlayerInfoPacket;.class
         //   621: invokedynamic   BootstrapMethod #53, get:()Ljava/util/function/Supplier;
         //   626: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   629: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlayerInfoPacket;.class
+        //   629: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlayerLookAtPacket;.class
         //   632: invokedynamic   BootstrapMethod #54, get:()Ljava/util/function/Supplier;
         //   637: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   640: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlayerLookAtPacket;.class
+        //   640: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlayerPositionPacket;.class
         //   643: invokedynamic   BootstrapMethod #55, get:()Ljava/util/function/Supplier;
         //   648: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   651: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundPlayerPositionPacket;.class
+        //   651: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundRecipePacket;.class
         //   654: invokedynamic   BootstrapMethod #56, get:()Ljava/util/function/Supplier;
         //   659: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   662: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundRecipePacket;.class
+        //   662: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundRemoveEntitiesPacket;.class
         //   665: invokedynamic   BootstrapMethod #57, get:()Ljava/util/function/Supplier;
         //   670: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   673: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundRemoveEntitiesPacket;.class
+        //   673: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundRemoveMobEffectPacket;.class
         //   676: invokedynamic   BootstrapMethod #58, get:()Ljava/util/function/Supplier;
         //   681: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   684: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundRemoveMobEffectPacket;.class
+        //   684: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundResourcePackPacket;.class
         //   687: invokedynamic   BootstrapMethod #59, get:()Ljava/util/function/Supplier;
         //   692: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   695: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundResourcePackPacket;.class
+        //   695: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundRespawnPacket;.class
         //   698: invokedynamic   BootstrapMethod #60, get:()Ljava/util/function/Supplier;
         //   703: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   706: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundRespawnPacket;.class
+        //   706: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundRotateHeadPacket;.class
         //   709: invokedynamic   BootstrapMethod #61, get:()Ljava/util/function/Supplier;
         //   714: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   717: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundRotateHeadPacket;.class
+        //   717: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSelectAdvancementsTabPacket;.class
         //   720: invokedynamic   BootstrapMethod #62, get:()Ljava/util/function/Supplier;
         //   725: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   728: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSelectAdvancementsTabPacket;.class
+        //   728: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetBorderPacket;.class
         //   731: invokedynamic   BootstrapMethod #63, get:()Ljava/util/function/Supplier;
         //   736: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   739: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetBorderPacket;.class
+        //   739: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetCameraPacket;.class
         //   742: invokedynamic   BootstrapMethod #64, get:()Ljava/util/function/Supplier;
         //   747: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   750: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetCameraPacket;.class
+        //   750: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket;.class
         //   753: invokedynamic   BootstrapMethod #65, get:()Ljava/util/function/Supplier;
         //   758: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   761: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket;.class
+        //   761: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetChunkCacheCenterPacket;.class
         //   764: invokedynamic   BootstrapMethod #66, get:()Ljava/util/function/Supplier;
         //   769: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   772: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetChunkCacheCenterPacket;.class
+        //   772: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetChunkCacheRadiusPacket;.class
         //   775: invokedynamic   BootstrapMethod #67, get:()Ljava/util/function/Supplier;
         //   780: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   783: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetChunkCacheRadiusPacket;.class
+        //   783: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetDefaultSpawnPositionPacket;.class
         //   786: invokedynamic   BootstrapMethod #68, get:()Ljava/util/function/Supplier;
         //   791: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
         //   794: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetDisplayObjectivePacket;.class
@@ -305,7 +305,7 @@ public enum ConnectionProtocol {
         //   827: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetEntityMotionPacket;.class
         //   830: invokedynamic   BootstrapMethod #72, get:()Ljava/util/function/Supplier;
         //   835: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   838: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetEquippedItemPacket;.class
+        //   838: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetEquipmentPacket;.class
         //   841: invokedynamic   BootstrapMethod #73, get:()Ljava/util/function/Supplier;
         //   846: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
         //   849: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetExperiencePacket;.class
@@ -326,100 +326,100 @@ public enum ConnectionProtocol {
         //   904: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetScorePacket;.class
         //   907: invokedynamic   BootstrapMethod #79, get:()Ljava/util/function/Supplier;
         //   912: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   915: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetSpawnPositionPacket;.class
+        //   915: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetTimePacket;.class
         //   918: invokedynamic   BootstrapMethod #80, get:()Ljava/util/function/Supplier;
         //   923: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   926: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetTimePacket;.class
+        //   926: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetTitlesPacket;.class
         //   929: invokedynamic   BootstrapMethod #81, get:()Ljava/util/function/Supplier;
         //   934: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   937: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSetTitlesPacket;.class
+        //   937: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSoundEntityPacket;.class
         //   940: invokedynamic   BootstrapMethod #82, get:()Ljava/util/function/Supplier;
         //   945: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   948: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSoundEntityPacket;.class
+        //   948: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSoundPacket;.class
         //   951: invokedynamic   BootstrapMethod #83, get:()Ljava/util/function/Supplier;
         //   956: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   959: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundSoundPacket;.class
+        //   959: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundStopSoundPacket;.class
         //   962: invokedynamic   BootstrapMethod #84, get:()Ljava/util/function/Supplier;
         //   967: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   970: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundStopSoundPacket;.class
+        //   970: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundTabListPacket;.class
         //   973: invokedynamic   BootstrapMethod #85, get:()Ljava/util/function/Supplier;
         //   978: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   981: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundTabListPacket;.class
+        //   981: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundTagQueryPacket;.class
         //   984: invokedynamic   BootstrapMethod #86, get:()Ljava/util/function/Supplier;
         //   989: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //   992: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundTagQueryPacket;.class
+        //   992: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundTakeItemEntityPacket;.class
         //   995: invokedynamic   BootstrapMethod #87, get:()Ljava/util/function/Supplier;
         //  1000: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1003: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundTakeItemEntityPacket;.class
+        //  1003: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundTeleportEntityPacket;.class
         //  1006: invokedynamic   BootstrapMethod #88, get:()Ljava/util/function/Supplier;
         //  1011: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1014: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundTeleportEntityPacket;.class
+        //  1014: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundUpdateAdvancementsPacket;.class
         //  1017: invokedynamic   BootstrapMethod #89, get:()Ljava/util/function/Supplier;
         //  1022: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1025: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundUpdateAdvancementsPacket;.class
+        //  1025: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundUpdateAttributesPacket;.class
         //  1028: invokedynamic   BootstrapMethod #90, get:()Ljava/util/function/Supplier;
         //  1033: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1036: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundUpdateAttributesPacket;.class
+        //  1036: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundUpdateMobEffectPacket;.class
         //  1039: invokedynamic   BootstrapMethod #91, get:()Ljava/util/function/Supplier;
         //  1044: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1047: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundUpdateMobEffectPacket;.class
+        //  1047: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket;.class
         //  1050: invokedynamic   BootstrapMethod #92, get:()Ljava/util/function/Supplier;
         //  1055: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1058: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket;.class
+        //  1058: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundUpdateTagsPacket;.class
         //  1061: invokedynamic   BootstrapMethod #93, get:()Ljava/util/function/Supplier;
         //  1066: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1069: ldc_w           Lnet/minecraft/network/protocol/game/ClientboundUpdateTagsPacket;.class
-        //  1072: invokedynamic   BootstrapMethod #94, get:()Ljava/util/function/Supplier;
-        //  1077: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1080: invokevirtual   net/minecraft/network/ConnectionProtocol$ProtocolBuilder.addFlow:(Lnet/minecraft/network/protocol/PacketFlow;Lnet/minecraft/network/ConnectionProtocol$PacketSet;)Lnet/minecraft/network/ConnectionProtocol$ProtocolBuilder;
-        //  1083: getstatic       net/minecraft/network/protocol/PacketFlow.SERVERBOUND:Lnet/minecraft/network/protocol/PacketFlow;
-        //  1086: new             Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1089: dup            
-        //  1090: aconst_null    
-        //  1091: invokespecial   net/minecraft/network/ConnectionProtocol$PacketSet.<init>:(Lnet/minecraft/network/ConnectionProtocol$1;)V
-        //  1094: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundAcceptTeleportationPacket;.class
+        //  1069: invokevirtual   net/minecraft/network/ConnectionProtocol$ProtocolBuilder.addFlow:(Lnet/minecraft/network/protocol/PacketFlow;Lnet/minecraft/network/ConnectionProtocol$PacketSet;)Lnet/minecraft/network/ConnectionProtocol$ProtocolBuilder;
+        //  1072: getstatic       net/minecraft/network/protocol/PacketFlow.SERVERBOUND:Lnet/minecraft/network/protocol/PacketFlow;
+        //  1075: new             Lnet/minecraft/network/ConnectionProtocol$PacketSet;
+        //  1078: dup            
+        //  1079: aconst_null    
+        //  1080: invokespecial   net/minecraft/network/ConnectionProtocol$PacketSet.<init>:(Lnet/minecraft/network/ConnectionProtocol$1;)V
+        //  1083: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundAcceptTeleportationPacket;.class
+        //  1086: invokedynamic   BootstrapMethod #94, get:()Ljava/util/function/Supplier;
+        //  1091: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
+        //  1094: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundBlockEntityTagQuery;.class
         //  1097: invokedynamic   BootstrapMethod #95, get:()Ljava/util/function/Supplier;
         //  1102: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1105: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundBlockEntityTagQuery;.class
+        //  1105: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundChangeDifficultyPacket;.class
         //  1108: invokedynamic   BootstrapMethod #96, get:()Ljava/util/function/Supplier;
         //  1113: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1116: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundChangeDifficultyPacket;.class
+        //  1116: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundChatPacket;.class
         //  1119: invokedynamic   BootstrapMethod #97, get:()Ljava/util/function/Supplier;
         //  1124: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1127: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundChatPacket;.class
+        //  1127: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundClientCommandPacket;.class
         //  1130: invokedynamic   BootstrapMethod #98, get:()Ljava/util/function/Supplier;
         //  1135: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1138: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundClientCommandPacket;.class
+        //  1138: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundClientInformationPacket;.class
         //  1141: invokedynamic   BootstrapMethod #99, get:()Ljava/util/function/Supplier;
         //  1146: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1149: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundClientInformationPacket;.class
+        //  1149: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundCommandSuggestionPacket;.class
         //  1152: invokedynamic   BootstrapMethod #100, get:()Ljava/util/function/Supplier;
         //  1157: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1160: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundCommandSuggestionPacket;.class
+        //  1160: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundContainerAckPacket;.class
         //  1163: invokedynamic   BootstrapMethod #101, get:()Ljava/util/function/Supplier;
         //  1168: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1171: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundContainerAckPacket;.class
+        //  1171: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundContainerButtonClickPacket;.class
         //  1174: invokedynamic   BootstrapMethod #102, get:()Ljava/util/function/Supplier;
         //  1179: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1182: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundContainerButtonClickPacket;.class
+        //  1182: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundContainerClickPacket;.class
         //  1185: invokedynamic   BootstrapMethod #103, get:()Ljava/util/function/Supplier;
         //  1190: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1193: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundContainerClickPacket;.class
+        //  1193: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundContainerClosePacket;.class
         //  1196: invokedynamic   BootstrapMethod #104, get:()Ljava/util/function/Supplier;
         //  1201: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1204: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundContainerClosePacket;.class
+        //  1204: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundCustomPayloadPacket;.class
         //  1207: invokedynamic   BootstrapMethod #105, get:()Ljava/util/function/Supplier;
         //  1212: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1215: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundCustomPayloadPacket;.class
+        //  1215: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundEditBookPacket;.class
         //  1218: invokedynamic   BootstrapMethod #106, get:()Ljava/util/function/Supplier;
         //  1223: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1226: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundEditBookPacket;.class
+        //  1226: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundEntityTagQuery;.class
         //  1229: invokedynamic   BootstrapMethod #107, get:()Ljava/util/function/Supplier;
         //  1234: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1237: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundEntityTagQuery;.class
+        //  1237: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundInteractPacket;.class
         //  1240: invokedynamic   BootstrapMethod #108, get:()Ljava/util/function/Supplier;
         //  1245: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
-        //  1248: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundInteractPacket;.class
+        //  1248: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundJigsawGeneratePacket;.class
         //  1251: invokedynamic   BootstrapMethod #109, get:()Ljava/util/function/Supplier;
         //  1256: invokevirtual   net/minecraft/network/ConnectionProtocol$PacketSet.addPacket:(Ljava/lang/Class;Ljava/util/function/Supplier;)Lnet/minecraft/network/ConnectionProtocol$PacketSet;
         //  1259: ldc_w           Lnet/minecraft/network/protocol/game/ServerboundKeepAlivePacket;.class
@@ -755,8 +755,8 @@ public enum ConnectionProtocol {
             this.flows = Maps.newEnumMap(PacketFlow.class);
         }
         
-        public <T extends PacketListener> ProtocolBuilder addFlow(final PacketFlow lu, final PacketSet<T> a) {
-            this.flows.put(lu, a);
+        public <T extends PacketListener> ProtocolBuilder addFlow(final PacketFlow nj, final PacketSet<T> a) {
+            this.flows.put(nj, a);
             return this;
         }
     }
diff --git a/src/net/minecraft/network/FriendlyByteBuf.java b/src/net/minecraft/network/FriendlyByteBuf.java
index 22697c4..38ead2d 100644
--- a/src/net/minecraft/network/FriendlyByteBuf.java
+++ b/src/net/minecraft/network/FriendlyByteBuf.java
@@ -23,18 +23,23 @@ import net.minecraft.world.item.ItemStack;
 import java.io.DataInput;
 import net.minecraft.nbt.NbtAccounter;
 import io.netty.buffer.ByteBufInputStream;
-import java.io.IOException;
 import io.netty.handler.codec.EncoderException;
 import java.io.DataOutput;
 import net.minecraft.nbt.NbtIo;
 import io.netty.buffer.ByteBufOutputStream;
-import net.minecraft.nbt.CompoundTag;
 import java.util.UUID;
 import net.minecraft.network.chat.Component;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.BlockPos;
 import javax.annotation.Nullable;
 import io.netty.handler.codec.DecoderException;
+import net.minecraft.nbt.Tag;
+import net.minecraft.nbt.CompoundTag;
+import java.io.IOException;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.nbt.NbtOps;
+import com.mojang.serialization.Codec;
 import io.netty.buffer.ByteBuf;
 
 public class FriendlyByteBuf extends ByteBuf {
@@ -53,6 +58,23 @@ public class FriendlyByteBuf extends ByteBuf {
         return 5;
     }
     
+    public <T> T readWithCodec(final Codec<T> codec) throws IOException {
+        final CompoundTag le3 = this.readNbt();
+        final DataResult<T> dataResult4 = (DataResult<T>)codec.parse((DynamicOps)NbtOps.INSTANCE, le3);
+        if (dataResult4.error().isPresent()) {
+            throw new IOException("Failed to decode: " + dataResult4.error().get().message() + " " + le3);
+        }
+        return dataResult4.result().get();
+    }
+    
+    public <T> void writeWithCodec(final Codec<T> codec, final T object) throws IOException {
+        final DataResult<Tag> dataResult4 = (DataResult<Tag>)codec.encodeStart((DynamicOps)NbtOps.INSTANCE, object);
+        if (dataResult4.error().isPresent()) {
+            throw new IOException("Failed to encode: " + dataResult4.error().get().message() + " " + object);
+        }
+        this.writeNbt(dataResult4.result().get());
+    }
+    
     public FriendlyByteBuf writeByteArray(final byte[] arr) {
         this.writeVarInt(arr.length);
         this.writeBytes(arr);
@@ -127,8 +149,8 @@ public class FriendlyByteBuf extends ByteBuf {
         return BlockPos.of(this.readLong());
     }
     
-    public FriendlyByteBuf writeBlockPos(final BlockPos fk) {
-        this.writeLong(fk.asLong());
+    public FriendlyByteBuf writeBlockPos(final BlockPos fu) {
+        this.writeLong(fu.asLong());
         return this;
     }
     
@@ -140,8 +162,8 @@ public class FriendlyByteBuf extends ByteBuf {
         return Component.Serializer.fromJson(this.readUtf(262144));
     }
     
-    public FriendlyByteBuf writeComponent(final Component lf) {
-        return this.writeUtf(Component.Serializer.toJson(lf), 262144);
+    public FriendlyByteBuf writeComponent(final Component mr) {
+        return this.writeUtf(Component.Serializer.toJson(mr), 262144);
     }
     
     public <T extends Enum<T>> T readEnum(final Class<T> class1) {
@@ -208,13 +230,13 @@ public class FriendlyByteBuf extends ByteBuf {
         return this;
     }
     
-    public FriendlyByteBuf writeNbt(@Nullable final CompoundTag jt) {
-        if (jt == null) {
+    public FriendlyByteBuf writeNbt(@Nullable final CompoundTag le) {
+        if (le == null) {
             this.writeByte(0);
         }
         else {
             try {
-                NbtIo.write(jt, (DataOutput)new ByteBufOutputStream((ByteBuf)this));
+                NbtIo.write(le, (DataOutput)new ByteBufOutputStream((ByteBuf)this));
             }
             catch (IOException iOException3) {
                 throw new EncoderException((Throwable)iOException3);
@@ -239,20 +261,20 @@ public class FriendlyByteBuf extends ByteBuf {
         }
     }
     
-    public FriendlyByteBuf writeItem(final ItemStack ben) {
-        if (ben.isEmpty()) {
+    public FriendlyByteBuf writeItem(final ItemStack bki) {
+        if (bki.isEmpty()) {
             this.writeBoolean(false);
         }
         else {
             this.writeBoolean(true);
-            final Item bei3 = ben.getItem();
-            this.writeVarInt(Item.getId(bei3));
-            this.writeByte(ben.getCount());
-            CompoundTag jt4 = null;
-            if (bei3.canBeDepleted() || bei3.shouldOverrideMultiplayerNbt()) {
-                jt4 = ben.getTag();
+            final Item bke3 = bki.getItem();
+            this.writeVarInt(Item.getId(bke3));
+            this.writeByte(bki.getCount());
+            CompoundTag le4 = null;
+            if (bke3.canBeDepleted() || bke3.shouldOverrideMultiplayerNbt()) {
+                le4 = bki.getTag();
             }
-            this.writeNbt(jt4);
+            this.writeNbt(le4);
         }
         return this;
     }
@@ -263,9 +285,9 @@ public class FriendlyByteBuf extends ByteBuf {
         }
         final int integer2 = this.readVarInt();
         final int integer3 = this.readByte();
-        final ItemStack ben4 = new ItemStack(Item.byId(integer2), integer3);
-        ben4.setTag(this.readNbt());
-        return ben4;
+        final ItemStack bki4 = new ItemStack(Item.byId(integer2), integer3);
+        bki4.setTag(this.readNbt());
+        return bki4;
     }
     
     public String readUtf() {
@@ -306,8 +328,8 @@ public class FriendlyByteBuf extends ByteBuf {
         return new ResourceLocation(this.readUtf(32767));
     }
     
-    public FriendlyByteBuf writeResourceLocation(final ResourceLocation sm) {
-        this.writeUtf(sm.toString());
+    public FriendlyByteBuf writeResourceLocation(final ResourceLocation uh) {
+        this.writeUtf(uh.toString());
         return this;
     }
     
@@ -321,24 +343,24 @@ public class FriendlyByteBuf extends ByteBuf {
     }
     
     public BlockHitResult readBlockHitResult() {
-        final BlockPos fk2 = this.readBlockPos();
-        final Direction fp3 = this.<Direction>readEnum(Direction.class);
+        final BlockPos fu2 = this.readBlockPos();
+        final Direction fz3 = this.<Direction>readEnum(Direction.class);
         final float float4 = this.readFloat();
         final float float5 = this.readFloat();
         final float float6 = this.readFloat();
         final boolean boolean7 = this.readBoolean();
-        return new BlockHitResult(new Vec3(fk2.getX() + float4, fk2.getY() + float5, fk2.getZ() + float6), fp3, fk2, boolean7);
+        return new BlockHitResult(new Vec3(fu2.getX() + (double)float4, fu2.getY() + (double)float5, fu2.getZ() + (double)float6), fz3, fu2, boolean7);
     }
     
-    public void writeBlockHitResult(final BlockHitResult cvg) {
-        final BlockPos fk3 = cvg.getBlockPos();
-        this.writeBlockPos(fk3);
-        this.writeEnum(cvg.getDirection());
-        final Vec3 cvl4 = cvg.getLocation();
-        this.writeFloat((float)(cvl4.x - fk3.getX()));
-        this.writeFloat((float)(cvl4.y - fk3.getY()));
-        this.writeFloat((float)(cvl4.z - fk3.getZ()));
-        this.writeBoolean(cvg.isInside());
+    public void writeBlockHitResult(final BlockHitResult deh) {
+        final BlockPos fu3 = deh.getBlockPos();
+        this.writeBlockPos(fu3);
+        this.writeEnum(deh.getDirection());
+        final Vec3 dem4 = deh.getLocation();
+        this.writeFloat((float)(dem4.x - fu3.getX()));
+        this.writeFloat((float)(dem4.y - fu3.getY()));
+        this.writeFloat((float)(dem4.z - fu3.getZ()));
+        this.writeBoolean(deh.isInside());
     }
     
     public int capacity() {
diff --git a/src/net/minecraft/network/PacketDecoder.java b/src/net/minecraft/network/PacketDecoder.java
index d9fada2..7b143e2 100644
--- a/src/net/minecraft/network/PacketDecoder.java
+++ b/src/net/minecraft/network/PacketDecoder.java
@@ -18,27 +18,27 @@ public class PacketDecoder extends ByteToMessageDecoder {
     private static final Marker MARKER;
     private final PacketFlow flow;
     
-    public PacketDecoder(final PacketFlow lu) {
-        this.flow = lu;
+    public PacketDecoder(final PacketFlow nj) {
+        this.flow = nj;
     }
     
     protected void decode(final ChannelHandlerContext channelHandlerContext, final ByteBuf byteBuf, final List<Object> list) throws Exception {
         if (byteBuf.readableBytes() == 0) {
             return;
         }
-        final FriendlyByteBuf kv5 = new FriendlyByteBuf(byteBuf);
-        final int integer6 = kv5.readVarInt();
-        final Packet<?> lt7 = ((ConnectionProtocol)channelHandlerContext.channel().attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get()).createPacket(this.flow, integer6);
-        if (lt7 == null) {
+        final FriendlyByteBuf mg5 = new FriendlyByteBuf(byteBuf);
+        final int integer6 = mg5.readVarInt();
+        final Packet<?> ni7 = ((ConnectionProtocol)channelHandlerContext.channel().attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get()).createPacket(this.flow, integer6);
+        if (ni7 == null) {
             throw new IOException("Bad packet id " + integer6);
         }
-        lt7.read(kv5);
-        if (kv5.readableBytes() > 0) {
-            throw new IOException("Packet " + ((ConnectionProtocol)channelHandlerContext.channel().attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get()).getId() + "/" + integer6 + " (" + lt7.getClass().getSimpleName() + ") was larger than I expected, found " + kv5.readableBytes() + " bytes extra whilst reading packet " + integer6);
+        ni7.read(mg5);
+        if (mg5.readableBytes() > 0) {
+            throw new IOException("Packet " + ((ConnectionProtocol)channelHandlerContext.channel().attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get()).getId() + "/" + integer6 + " (" + ni7.getClass().getSimpleName() + ") was larger than I expected, found " + mg5.readableBytes() + " bytes extra whilst reading packet " + integer6);
         }
-        list.add(lt7);
+        list.add(ni7);
         if (PacketDecoder.LOGGER.isDebugEnabled()) {
-            PacketDecoder.LOGGER.debug(PacketDecoder.MARKER, " IN: [{}:{}] {}", channelHandlerContext.channel().attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get(), integer6, lt7.getClass().getName());
+            PacketDecoder.LOGGER.debug(PacketDecoder.MARKER, " IN: [{}:{}] {}", channelHandlerContext.channel().attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get(), integer6, ni7.getClass().getName());
         }
     }
     
diff --git a/src/net/minecraft/network/PacketEncoder.java b/src/net/minecraft/network/PacketEncoder.java
index 65cd6f0..ac72736 100644
--- a/src/net/minecraft/network/PacketEncoder.java
+++ b/src/net/minecraft/network/PacketEncoder.java
@@ -17,30 +17,30 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
     private static final Marker MARKER;
     private final PacketFlow flow;
     
-    public PacketEncoder(final PacketFlow lu) {
-        this.flow = lu;
+    public PacketEncoder(final PacketFlow nj) {
+        this.flow = nj;
     }
     
-    protected void encode(final ChannelHandlerContext channelHandlerContext, final Packet<?> lt, final ByteBuf byteBuf) throws Exception {
-        final ConnectionProtocol ku5 = (ConnectionProtocol)channelHandlerContext.channel().attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get();
-        if (ku5 == null) {
-            throw new RuntimeException("ConnectionProtocol unknown: " + lt);
+    protected void encode(final ChannelHandlerContext channelHandlerContext, final Packet<?> ni, final ByteBuf byteBuf) throws Exception {
+        final ConnectionProtocol mf5 = (ConnectionProtocol)channelHandlerContext.channel().attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get();
+        if (mf5 == null) {
+            throw new RuntimeException("ConnectionProtocol unknown: " + ni);
         }
-        final Integer integer6 = ku5.getPacketId(this.flow, lt);
+        final Integer integer6 = mf5.getPacketId(this.flow, ni);
         if (PacketEncoder.LOGGER.isDebugEnabled()) {
-            PacketEncoder.LOGGER.debug(PacketEncoder.MARKER, "OUT: [{}:{}] {}", channelHandlerContext.channel().attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get(), integer6, lt.getClass().getName());
+            PacketEncoder.LOGGER.debug(PacketEncoder.MARKER, "OUT: [{}:{}] {}", channelHandlerContext.channel().attr((AttributeKey)Connection.ATTRIBUTE_PROTOCOL).get(), integer6, ni.getClass().getName());
         }
         if (integer6 == null) {
             throw new IOException("Can't serialize unregistered packet");
         }
-        final FriendlyByteBuf kv7 = new FriendlyByteBuf(byteBuf);
-        kv7.writeVarInt(integer6);
+        final FriendlyByteBuf mg7 = new FriendlyByteBuf(byteBuf);
+        mg7.writeVarInt(integer6);
         try {
-            lt.write(kv7);
+            ni.write(mg7);
         }
         catch (Throwable throwable8) {
             PacketEncoder.LOGGER.error(throwable8);
-            if (lt.isSkippable()) {
+            if (ni.isSkippable()) {
                 throw new SkipPacketException(throwable8);
             }
             throw throwable8;
diff --git a/src/net/minecraft/network/PacketListener.java b/src/net/minecraft/network/PacketListener.java
index 48b20c7..701b8e8 100644
--- a/src/net/minecraft/network/PacketListener.java
+++ b/src/net/minecraft/network/PacketListener.java
@@ -3,7 +3,7 @@ package net.minecraft.network;
 import net.minecraft.network.chat.Component;
 
 public interface PacketListener {
-    void onDisconnect(final Component lf);
+    void onDisconnect(final Component mr);
     
     Connection getConnection();
 }
diff --git a/src/net/minecraft/network/Varint21FrameDecoder.java b/src/net/minecraft/network/Varint21FrameDecoder.java
index 3338748..2b99210 100644
--- a/src/net/minecraft/network/Varint21FrameDecoder.java
+++ b/src/net/minecraft/network/Varint21FrameDecoder.java
@@ -18,9 +18,9 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder {
             }
             arr5[integer6] = byteBuf.readByte();
             if (arr5[integer6] >= 0) {
-                final FriendlyByteBuf kv7 = new FriendlyByteBuf(Unpooled.wrappedBuffer(arr5));
+                final FriendlyByteBuf mg7 = new FriendlyByteBuf(Unpooled.wrappedBuffer(arr5));
                 try {
-                    final int integer7 = kv7.readVarInt();
+                    final int integer7 = mg7.readVarInt();
                     if (byteBuf.readableBytes() < integer7) {
                         byteBuf.resetReaderIndex();
                         return;
@@ -29,7 +29,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder {
                     return;
                 }
                 finally {
-                    kv7.release();
+                    mg7.release();
                 }
             }
         }
diff --git a/src/net/minecraft/network/Varint21LengthFieldPrepender.java b/src/net/minecraft/network/Varint21LengthFieldPrepender.java
index 37d8385..a4b7ca6 100644
--- a/src/net/minecraft/network/Varint21LengthFieldPrepender.java
+++ b/src/net/minecraft/network/Varint21LengthFieldPrepender.java
@@ -13,9 +13,9 @@ public class Varint21LengthFieldPrepender extends MessageToByteEncoder<ByteBuf>
         if (integer6 > 3) {
             throw new IllegalArgumentException("unable to fit " + integer5 + " into " + 3);
         }
-        final FriendlyByteBuf kv7 = new FriendlyByteBuf(byteBuf3);
-        kv7.ensureWritable(integer6 + integer5);
-        kv7.writeVarInt(integer5);
-        kv7.writeBytes(byteBuf2, byteBuf2.readerIndex(), integer5);
+        final FriendlyByteBuf mg7 = new FriendlyByteBuf(byteBuf3);
+        mg7.ensureWritable(integer6 + integer5);
+        mg7.writeVarInt(integer5);
+        mg7.writeBytes(byteBuf2, byteBuf2.readerIndex(), integer5);
     }
 }
diff --git a/src/net/minecraft/network/chat/BaseComponent.java b/src/net/minecraft/network/chat/BaseComponent.java
index e9a452d..eff6349 100644
--- a/src/net/minecraft/network/chat/BaseComponent.java
+++ b/src/net/minecraft/network/chat/BaseComponent.java
@@ -1,56 +1,55 @@
 package net.minecraft.network.chat;
 
 import java.util.Objects;
-import com.google.common.collect.Streams;
-import java.util.function.Function;
-import java.util.stream.Stream;
-import java.util.Iterator;
+import java.util.Collection;
 import com.google.common.collect.Lists;
 import java.util.List;
 
-public abstract class BaseComponent implements Component {
+public abstract class BaseComponent implements MutableComponent {
     protected final List<Component> siblings;
     private Style style;
     
     public BaseComponent() {
         this.siblings = Lists.newArrayList();
+        this.style = Style.EMPTY;
     }
     
     @Override
-    public Component append(final Component lf) {
-        lf.getStyle().inheritFrom(this.getStyle());
-        this.siblings.add(lf);
+    public MutableComponent append(final Component mr) {
+        this.siblings.add(mr);
         return this;
     }
     
+    @Override
+    public String getContents() {
+        return "";
+    }
+    
     @Override
     public List<Component> getSiblings() {
         return this.siblings;
     }
     
     @Override
-    public Component setStyle(final Style ln) {
-        this.style = ln;
-        for (final Component lf4 : this.siblings) {
-            lf4.getStyle().inheritFrom(this.getStyle());
-        }
+    public MutableComponent setStyle(final Style nb) {
+        this.style = nb;
         return this;
     }
     
     @Override
     public Style getStyle() {
-        if (this.style == null) {
-            this.style = new Style();
-            for (final Component lf3 : this.siblings) {
-                lf3.getStyle().inheritFrom(this.style);
-            }
-        }
         return this.style;
     }
     
     @Override
-    public Stream<Component> stream() {
-        return Streams.<Component>concat(new Stream[] { Stream.<BaseComponent>of(this), this.siblings.stream().flatMap(Component::stream) });
+    public abstract BaseComponent plainCopy();
+    
+    @Override
+    public final MutableComponent copy() {
+        final BaseComponent mn2 = this.plainCopy();
+        mn2.siblings.addAll(this.siblings);
+        mn2.setStyle(this.style);
+        return mn2;
     }
     
     @Override
@@ -59,8 +58,8 @@ public abstract class BaseComponent implements Component {
             return true;
         }
         if (object instanceof BaseComponent) {
-            final BaseComponent lc3 = (BaseComponent)object;
-            return this.siblings.equals(lc3.siblings) && this.getStyle().equals(lc3.getStyle());
+            final BaseComponent mn3 = (BaseComponent)object;
+            return this.siblings.equals(mn3.siblings) && Objects.equals(this.getStyle(), mn3.getStyle());
         }
         return false;
     }
diff --git a/src/net/minecraft/network/chat/ChatType.java b/src/net/minecraft/network/chat/ChatType.java
index 82319cc..2f8e8f6 100644
--- a/src/net/minecraft/network/chat/ChatType.java
+++ b/src/net/minecraft/network/chat/ChatType.java
@@ -18,9 +18,9 @@ public enum ChatType {
     }
     
     public static ChatType getForIndex(final byte byte1) {
-        for (final ChatType ld5 : values()) {
-            if (byte1 == ld5.index) {
-                return ld5;
+        for (final ChatType mo5 : values()) {
+            if (byte1 == mo5.index) {
+                return mo5;
             }
         }
         return ChatType.CHAT;
diff --git a/src/net/minecraft/network/chat/ClickEvent.java b/src/net/minecraft/network/chat/ClickEvent.java
index c95a07e..173958b 100644
--- a/src/net/minecraft/network/chat/ClickEvent.java
+++ b/src/net/minecraft/network/chat/ClickEvent.java
@@ -30,16 +30,16 @@ public class ClickEvent {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final ClickEvent le3 = (ClickEvent)object;
-        if (this.action != le3.action) {
+        final ClickEvent mp3 = (ClickEvent)object;
+        if (this.action != mp3.action) {
             return false;
         }
         if (this.value != null) {
-            if (this.value.equals(le3.value)) {
+            if (this.value.equals(mp3.value)) {
                 return true;
             }
         }
-        else if (le3.value == null) {
+        else if (mp3.value == null) {
             return true;
         }
         return false;
diff --git a/src/net/minecraft/network/chat/CommonComponents.java b/src/net/minecraft/network/chat/CommonComponents.java
new file mode 100644
index 0000000..2fbb839
--- /dev/null
+++ b/src/net/minecraft/network/chat/CommonComponents.java
@@ -0,0 +1,27 @@
+package net.minecraft.network.chat;
+
+public class CommonComponents {
+    public static final Component OPTION_ON;
+    public static final Component OPTION_OFF;
+    public static final Component GUI_DONE;
+    public static final Component GUI_CANCEL;
+    public static final Component GUI_YES;
+    public static final Component GUI_NO;
+    public static final Component GUI_PROCEED;
+    public static final Component GUI_BACK;
+    
+    public static Component optionStatus(final boolean boolean1) {
+        return boolean1 ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF;
+    }
+    
+    static {
+        OPTION_ON = new TranslatableComponent("options.on");
+        OPTION_OFF = new TranslatableComponent("options.off");
+        GUI_DONE = new TranslatableComponent("gui.done");
+        GUI_CANCEL = new TranslatableComponent("gui.cancel");
+        GUI_YES = new TranslatableComponent("gui.yes");
+        GUI_NO = new TranslatableComponent("gui.no");
+        GUI_PROCEED = new TranslatableComponent("gui.proceed");
+        GUI_BACK = new TranslatableComponent("gui.back");
+    }
+}
diff --git a/src/net/minecraft/network/chat/Component.java b/src/net/minecraft/network/chat/Component.java
index 6c3d215..e24e962 100644
--- a/src/net/minecraft/network/chat/Component.java
+++ b/src/net/minecraft/network/chat/Component.java
@@ -8,7 +8,6 @@ import java.io.IOException;
 import java.io.Reader;
 import com.google.gson.stream.JsonReader;
 import com.mojang.brigadier.StringReader;
-import javax.annotation.Nullable;
 import com.google.gson.JsonPrimitive;
 import java.util.Map;
 import com.google.gson.JsonSerializationContext;
@@ -24,158 +23,100 @@ import java.lang.reflect.Field;
 import com.google.gson.Gson;
 import com.google.gson.JsonSerializer;
 import com.google.gson.JsonDeserializer;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Stream;
-import java.util.List;
-import net.minecraft.ChatFormatting;
+import javax.annotation.Nullable;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
 import com.mojang.brigadier.Message;
 
-public interface Component extends Message, Iterable<Component> {
-    Component setStyle(final Style ln);
-    
+public interface Component extends Message, FormattedText {
     Style getStyle();
     
-    default Component append(final String string) {
-        return this.append(new TextComponent(string));
-    }
-    
-    Component append(final Component lf);
-    
     String getContents();
     
     default String getString() {
-        final StringBuilder stringBuilder2 = new StringBuilder();
-        this.stream().forEach(lf -> stringBuilder2.append(lf.getContents()));
-        return stringBuilder2.toString();
+        return super.getString();
     }
     
     default String getString(final int integer) {
         final StringBuilder stringBuilder3 = new StringBuilder();
-        final Iterator<Component> iterator4 = this.stream().iterator();
-        while (iterator4.hasNext()) {
-            final int integer2 = integer - stringBuilder3.length();
+        final StringBuilder sb;
+        final int integer2;
+        this.visit(string -> {
+            integer2 = integer - sb.length();
             if (integer2 <= 0) {
-                break;
+                return (Optional<Object>)Component.STOP_ITERATION;
             }
-            final String string6 = iterator4.next().getContents();
-            stringBuilder3.append((string6.length() <= integer2) ? string6 : string6.substring(0, integer2));
-        }
+            else {
+                sb.append((string.length() <= integer2) ? string : string.substring(0, integer2));
+                return Optional.empty();
+            }
+        });
         return stringBuilder3.toString();
     }
     
-    default String getColoredString() {
-        final StringBuilder stringBuilder2 = new StringBuilder();
-        String string3 = "";
-        for (final Component lf5 : this.stream()) {
-            final String string4 = lf5.getContents();
-            if (!string4.isEmpty()) {
-                final String string5 = lf5.getStyle().getLegacyFormatCodes();
-                if (!string5.equals(string3)) {
-                    if (!string3.isEmpty()) {
-                        stringBuilder2.append(ChatFormatting.RESET);
-                    }
-                    stringBuilder2.append(string5);
-                    string3 = string5;
-                }
-                stringBuilder2.append(string4);
-            }
-        }
-        if (!string3.isEmpty()) {
-            stringBuilder2.append(ChatFormatting.RESET);
-        }
-        return stringBuilder2.toString();
-    }
-    
     List<Component> getSiblings();
     
-    Stream<Component> stream();
+    MutableComponent plainCopy();
     
-    default Stream<Component> flatStream() {
-        return this.stream().<Component>map(Component::flattenStyle);
-    }
+    MutableComponent copy();
     
-    default Iterator<Component> iterator() {
-        return this.flatStream().iterator();
-    }
-    
-    Component copy();
-    
-    default Component deepCopy() {
-        final Component lf2 = this.copy();
-        lf2.setStyle(this.getStyle().copy());
-        for (final Component lf3 : this.getSiblings()) {
-            lf2.append(lf3.deepCopy());
+    default <T> Optional<T> visit(final StyledContentConsumer<T> b, final Style nb) {
+        final Style nb2 = this.getStyle().applyTo(nb);
+        final Optional<T> optional5 = this.visitSelf((StyledContentConsumer<Object>)b, nb2);
+        if (optional5.isPresent()) {
+            return optional5;
         }
-        return lf2;
-    }
-    
-    default Component withStyle(final Consumer<Style> consumer) {
-        consumer.accept(this.getStyle());
-        return this;
-    }
-    
-    default Component withStyle(final ChatFormatting... arr) {
-        for (final ChatFormatting g6 : arr) {
-            this.withStyle(g6);
-        }
-        return this;
-    }
-    
-    default Component withStyle(final ChatFormatting g) {
-        final Style ln3 = this.getStyle();
-        if (g.isColor()) {
-            ln3.setColor(g);
-        }
-        if (g.isFormat()) {
-            switch (g) {
-                case OBFUSCATED: {
-                    ln3.setObfuscated(true);
-                    break;
-                }
-                case BOLD: {
-                    ln3.setBold(true);
-                    break;
-                }
-                case STRIKETHROUGH: {
-                    ln3.setStrikethrough(true);
-                    break;
-                }
-                case UNDERLINE: {
-                    ln3.setUnderlined(true);
-                    break;
-                }
-                case ITALIC: {
-                    ln3.setItalic(true);
-                    break;
-                }
+        for (final Component mr7 : this.getSiblings()) {
+            final Optional<T> optional6 = mr7.visit((StyledContentConsumer<Object>)b, nb2);
+            if (optional6.isPresent()) {
+                return optional6;
             }
         }
-        return this;
+        return Optional.<T>empty();
     }
     
-    default Component flattenStyle(final Component lf) {
-        final Component lf2 = lf.copy();
-        lf2.setStyle(lf.getStyle().flatCopy());
-        return lf2;
+    default <T> Optional<T> visit(final ContentConsumer<T> a) {
+        final Optional<T> optional3 = this.visitSelf((ContentConsumer<Object>)a);
+        if (optional3.isPresent()) {
+            return optional3;
+        }
+        for (final Component mr5 : this.getSiblings()) {
+            final Optional<T> optional4 = mr5.visit((ContentConsumer<Object>)a);
+            if (optional4.isPresent()) {
+                return optional4;
+            }
+        }
+        return Optional.<T>empty();
     }
     
-    public static class Serializer implements JsonDeserializer<Component>, JsonSerializer<Component> {
+    default <T> Optional<T> visitSelf(final StyledContentConsumer<T> b, final Style nb) {
+        return b.accept(nb, this.getContents());
+    }
+    
+    default <T> Optional<T> visitSelf(final ContentConsumer<T> a) {
+        return a.accept(this.getContents());
+    }
+    
+    default Component nullToEmpty(@Nullable final String string) {
+        return (string != null) ? new TextComponent(string) : TextComponent.EMPTY;
+    }
+    
+    public static class Serializer implements JsonDeserializer<MutableComponent>, JsonSerializer<Component> {
         private static final Gson GSON;
         private static final Field JSON_READER_POS;
         private static final Field JSON_READER_LINESTART;
         
         @Override
-        public Component deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
+        public MutableComponent deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             if (jsonElement.isJsonPrimitive()) {
                 return new TextComponent(jsonElement.getAsString());
             }
             if (jsonElement.isJsonObject()) {
                 final JsonObject jsonObject5 = jsonElement.getAsJsonObject();
-                Component lf6;
+                MutableComponent mx6;
                 if (jsonObject5.has("text")) {
-                    lf6 = new TextComponent(GsonHelper.getAsString(jsonObject5, "text"));
+                    mx6 = new TextComponent(GsonHelper.getAsString(jsonObject5, "text"));
                 }
                 else if (jsonObject5.has("translate")) {
                     final String string7 = GsonHelper.getAsString(jsonObject5, "translate");
@@ -185,16 +126,16 @@ public interface Component extends Message, Iterable<Component> {
                         for (int integer10 = 0; integer10 < arr9.length; ++integer10) {
                             arr9[integer10] = this.deserialize(jsonArray8.get(integer10), type, jsonDeserializationContext);
                             if (arr9[integer10] instanceof TextComponent) {
-                                final TextComponent lo11 = (TextComponent)arr9[integer10];
-                                if (lo11.getStyle().isEmpty() && lo11.getSiblings().isEmpty()) {
-                                    arr9[integer10] = lo11.getText();
+                                final TextComponent nd11 = (TextComponent)arr9[integer10];
+                                if (nd11.getStyle().isEmpty() && nd11.getSiblings().isEmpty()) {
+                                    arr9[integer10] = nd11.getText();
                                 }
                             }
                         }
-                        lf6 = new TranslatableComponent(string7, arr9);
+                        mx6 = new TranslatableComponent(string7, arr9);
                     }
                     else {
-                        lf6 = new TranslatableComponent(string7, new Object[0]);
+                        mx6 = new TranslatableComponent(string7);
                     }
                 }
                 else if (jsonObject5.has("score")) {
@@ -202,16 +143,13 @@ public interface Component extends Message, Iterable<Component> {
                     if (!jsonObject6.has("name") || !jsonObject6.has("objective")) {
                         throw new JsonParseException("A score component needs a least a name and an objective");
                     }
-                    lf6 = new ScoreComponent(GsonHelper.getAsString(jsonObject6, "name"), GsonHelper.getAsString(jsonObject6, "objective"));
-                    if (jsonObject6.has("value")) {
-                        ((ScoreComponent)lf6).setValue(GsonHelper.getAsString(jsonObject6, "value"));
-                    }
+                    mx6 = new ScoreComponent(GsonHelper.getAsString(jsonObject6, "name"), GsonHelper.getAsString(jsonObject6, "objective"));
                 }
                 else if (jsonObject5.has("selector")) {
-                    lf6 = new SelectorComponent(GsonHelper.getAsString(jsonObject5, "selector"));
+                    mx6 = new SelectorComponent(GsonHelper.getAsString(jsonObject5, "selector"));
                 }
                 else if (jsonObject5.has("keybind")) {
-                    lf6 = new KeybindComponent(GsonHelper.getAsString(jsonObject5, "keybind"));
+                    mx6 = new KeybindComponent(GsonHelper.getAsString(jsonObject5, "keybind"));
                 }
                 else {
                     if (!jsonObject5.has("nbt")) {
@@ -220,16 +158,16 @@ public interface Component extends Message, Iterable<Component> {
                     final String string7 = GsonHelper.getAsString(jsonObject5, "nbt");
                     final boolean boolean8 = GsonHelper.getAsBoolean(jsonObject5, "interpret", false);
                     if (jsonObject5.has("block")) {
-                        lf6 = new NbtComponent.BlockNbtComponent(string7, boolean8, GsonHelper.getAsString(jsonObject5, "block"));
+                        mx6 = new NbtComponent.BlockNbtComponent(string7, boolean8, GsonHelper.getAsString(jsonObject5, "block"));
                     }
                     else if (jsonObject5.has("entity")) {
-                        lf6 = new NbtComponent.EntityNbtComponent(string7, boolean8, GsonHelper.getAsString(jsonObject5, "entity"));
+                        mx6 = new NbtComponent.EntityNbtComponent(string7, boolean8, GsonHelper.getAsString(jsonObject5, "entity"));
                     }
                     else {
                         if (!jsonObject5.has("storage")) {
                             throw new JsonParseException("Don't know how to turn " + jsonElement + " into a Component");
                         }
-                        lf6 = new NbtComponent.StorageNbtComponent(string7, boolean8, new ResourceLocation(GsonHelper.getAsString(jsonObject5, "storage")));
+                        mx6 = new NbtComponent.StorageNbtComponent(string7, boolean8, new ResourceLocation(GsonHelper.getAsString(jsonObject5, "storage")));
                     }
                 }
                 if (jsonObject5.has("extra")) {
@@ -238,31 +176,31 @@ public interface Component extends Message, Iterable<Component> {
                         throw new JsonParseException("Unexpected empty array of components");
                     }
                     for (int integer11 = 0; integer11 < jsonArray9.size(); ++integer11) {
-                        lf6.append(this.deserialize(jsonArray9.get(integer11), type, jsonDeserializationContext));
+                        mx6.append(this.deserialize(jsonArray9.get(integer11), type, jsonDeserializationContext));
                     }
                 }
-                lf6.setStyle(jsonDeserializationContext.<Style>deserialize(jsonElement, Style.class));
-                return lf6;
+                mx6.setStyle(jsonDeserializationContext.<Style>deserialize(jsonElement, Style.class));
+                return mx6;
             }
             if (jsonElement.isJsonArray()) {
                 final JsonArray jsonArray10 = jsonElement.getAsJsonArray();
-                Component lf6 = null;
+                MutableComponent mx6 = null;
                 for (final JsonElement jsonElement2 : jsonArray10) {
-                    final Component lf7 = this.deserialize(jsonElement2, (Type)jsonElement2.getClass(), jsonDeserializationContext);
-                    if (lf6 == null) {
-                        lf6 = lf7;
+                    final MutableComponent mx7 = this.deserialize(jsonElement2, (Type)jsonElement2.getClass(), jsonDeserializationContext);
+                    if (mx6 == null) {
+                        mx6 = mx7;
                     }
                     else {
-                        lf6.append(lf7);
+                        mx6.append(mx7);
                     }
                 }
-                return lf6;
+                return mx6;
             }
             throw new JsonParseException("Don't know how to turn " + jsonElement + " into a Component");
         }
         
-        private void serializeStyle(final Style ln, final JsonObject jsonObject, final JsonSerializationContext jsonSerializationContext) {
-            final JsonElement jsonElement5 = jsonSerializationContext.serialize(ln);
+        private void serializeStyle(final Style nb, final JsonObject jsonObject, final JsonSerializationContext jsonSerializationContext) {
+            final JsonElement jsonElement5 = jsonSerializationContext.serialize(nb);
             if (jsonElement5.isJsonObject()) {
                 final JsonObject jsonObject2 = (JsonObject)jsonElement5;
                 for (final Map.Entry<String, JsonElement> entry8 : jsonObject2.entrySet()) {
@@ -272,27 +210,27 @@ public interface Component extends Message, Iterable<Component> {
         }
         
         @Override
-        public JsonElement serialize(final Component lf, final Type type, final JsonSerializationContext jsonSerializationContext) {
+        public JsonElement serialize(final Component mr, final Type type, final JsonSerializationContext jsonSerializationContext) {
             final JsonObject jsonObject5 = new JsonObject();
-            if (!lf.getStyle().isEmpty()) {
-                this.serializeStyle(lf.getStyle(), jsonObject5, jsonSerializationContext);
+            if (!mr.getStyle().isEmpty()) {
+                this.serializeStyle(mr.getStyle(), jsonObject5, jsonSerializationContext);
             }
-            if (!lf.getSiblings().isEmpty()) {
+            if (!mr.getSiblings().isEmpty()) {
                 final JsonArray jsonArray6 = new JsonArray();
-                for (final Component lf2 : lf.getSiblings()) {
-                    jsonArray6.add(this.serialize(lf2, lf2.getClass(), jsonSerializationContext));
+                for (final Component mr2 : mr.getSiblings()) {
+                    jsonArray6.add(this.serialize(mr2, mr2.getClass(), jsonSerializationContext));
                 }
                 jsonObject5.add("extra", jsonArray6);
             }
-            if (lf instanceof TextComponent) {
-                jsonObject5.addProperty("text", ((TextComponent)lf).getText());
+            if (mr instanceof TextComponent) {
+                jsonObject5.addProperty("text", ((TextComponent)mr).getText());
             }
-            else if (lf instanceof TranslatableComponent) {
-                final TranslatableComponent lp6 = (TranslatableComponent)lf;
-                jsonObject5.addProperty("translate", lp6.getKey());
-                if (lp6.getArgs() != null && lp6.getArgs().length > 0) {
+            else if (mr instanceof TranslatableComponent) {
+                final TranslatableComponent ne6 = (TranslatableComponent)mr;
+                jsonObject5.addProperty("translate", ne6.getKey());
+                if (ne6.getArgs() != null && ne6.getArgs().length > 0) {
                     final JsonArray jsonArray7 = new JsonArray();
-                    for (final Object object11 : lp6.getArgs()) {
+                    for (final Object object11 : ne6.getArgs()) {
                         if (object11 instanceof Component) {
                             jsonArray7.add(this.serialize((Component)object11, object11.getClass(), jsonSerializationContext));
                         }
@@ -303,78 +241,77 @@ public interface Component extends Message, Iterable<Component> {
                     jsonObject5.add("with", jsonArray7);
                 }
             }
-            else if (lf instanceof ScoreComponent) {
-                final ScoreComponent ll6 = (ScoreComponent)lf;
+            else if (mr instanceof ScoreComponent) {
+                final ScoreComponent mz6 = (ScoreComponent)mr;
                 final JsonObject jsonObject6 = new JsonObject();
-                jsonObject6.addProperty("name", ll6.getName());
-                jsonObject6.addProperty("objective", ll6.getObjective());
-                jsonObject6.addProperty("value", ll6.getContents());
+                jsonObject6.addProperty("name", mz6.getName());
+                jsonObject6.addProperty("objective", mz6.getObjective());
                 jsonObject5.add("score", jsonObject6);
             }
-            else if (lf instanceof SelectorComponent) {
-                final SelectorComponent lm6 = (SelectorComponent)lf;
-                jsonObject5.addProperty("selector", lm6.getPattern());
+            else if (mr instanceof SelectorComponent) {
+                final SelectorComponent na6 = (SelectorComponent)mr;
+                jsonObject5.addProperty("selector", na6.getPattern());
             }
-            else if (lf instanceof KeybindComponent) {
-                final KeybindComponent lj6 = (KeybindComponent)lf;
-                jsonObject5.addProperty("keybind", lj6.getName());
+            else if (mr instanceof KeybindComponent) {
+                final KeybindComponent mw6 = (KeybindComponent)mr;
+                jsonObject5.addProperty("keybind", mw6.getName());
             }
             else {
-                if (!(lf instanceof NbtComponent)) {
-                    throw new IllegalArgumentException("Don't know how to serialize " + lf + " as a Component");
+                if (!(mr instanceof NbtComponent)) {
+                    throw new IllegalArgumentException("Don't know how to serialize " + mr + " as a Component");
                 }
-                final NbtComponent lk6 = (NbtComponent)lf;
-                jsonObject5.addProperty("nbt", lk6.getNbtPath());
-                jsonObject5.addProperty("interpret", lk6.isInterpreting());
-                if (lf instanceof NbtComponent.BlockNbtComponent) {
-                    final NbtComponent.BlockNbtComponent a7 = (NbtComponent.BlockNbtComponent)lf;
+                final NbtComponent my6 = (NbtComponent)mr;
+                jsonObject5.addProperty("nbt", my6.getNbtPath());
+                jsonObject5.addProperty("interpret", my6.isInterpreting());
+                if (mr instanceof NbtComponent.BlockNbtComponent) {
+                    final NbtComponent.BlockNbtComponent a7 = (NbtComponent.BlockNbtComponent)mr;
                     jsonObject5.addProperty("block", a7.getPos());
                 }
-                else if (lf instanceof NbtComponent.EntityNbtComponent) {
-                    final NbtComponent.EntityNbtComponent b7 = (NbtComponent.EntityNbtComponent)lf;
+                else if (mr instanceof NbtComponent.EntityNbtComponent) {
+                    final NbtComponent.EntityNbtComponent b7 = (NbtComponent.EntityNbtComponent)mr;
                     jsonObject5.addProperty("entity", b7.getSelector());
                 }
                 else {
-                    if (!(lf instanceof NbtComponent.StorageNbtComponent)) {
-                        throw new IllegalArgumentException("Don't know how to serialize " + lf + " as a Component");
+                    if (!(mr instanceof NbtComponent.StorageNbtComponent)) {
+                        throw new IllegalArgumentException("Don't know how to serialize " + mr + " as a Component");
                     }
-                    final NbtComponent.StorageNbtComponent c7 = (NbtComponent.StorageNbtComponent)lf;
+                    final NbtComponent.StorageNbtComponent c7 = (NbtComponent.StorageNbtComponent)mr;
                     jsonObject5.addProperty("storage", c7.getId().toString());
                 }
             }
             return jsonObject5;
         }
         
-        public static String toJson(final Component lf) {
-            return Serializer.GSON.toJson(lf);
+        public static String toJson(final Component mr) {
+            return Serializer.GSON.toJson(mr);
         }
         
-        public static JsonElement toJsonTree(final Component lf) {
-            return Serializer.GSON.toJsonTree(lf);
+        public static JsonElement toJsonTree(final Component mr) {
+            return Serializer.GSON.toJsonTree(mr);
         }
         
         @Nullable
-        public static Component fromJson(final String string) {
-            return GsonHelper.<Component>fromJson(Serializer.GSON, string, Component.class, false);
+        public static MutableComponent fromJson(final String string) {
+            return GsonHelper.<MutableComponent>fromJson(Serializer.GSON, string, MutableComponent.class, false);
         }
         
         @Nullable
-        public static Component fromJson(final JsonElement jsonElement) {
-            return Serializer.GSON.<Component>fromJson(jsonElement, Component.class);
+        public static MutableComponent fromJson(final JsonElement jsonElement) {
+            return Serializer.GSON.<MutableComponent>fromJson(jsonElement, MutableComponent.class);
         }
         
         @Nullable
-        public static Component fromJsonLenient(final String string) {
-            return GsonHelper.<Component>fromJson(Serializer.GSON, string, Component.class, true);
+        public static MutableComponent fromJsonLenient(final String string) {
+            return GsonHelper.<MutableComponent>fromJson(Serializer.GSON, string, MutableComponent.class, true);
         }
         
-        public static Component fromJson(final StringReader stringReader) {
+        public static MutableComponent fromJson(final StringReader stringReader) {
             try {
                 final JsonReader jsonReader2 = new JsonReader(new java.io.StringReader(stringReader.getRemaining()));
                 jsonReader2.setLenient(false);
-                final Component lf3 = Serializer.GSON.<Component>getAdapter(Component.class).read(jsonReader2);
+                final MutableComponent mx3 = Serializer.GSON.<MutableComponent>getAdapter(MutableComponent.class).read(jsonReader2);
                 stringReader.setCursor(stringReader.getCursor() + getPos(jsonReader2));
-                return lf3;
+                return mx3;
             }
             catch (IOException | StackOverflowError ex) {
                 final Throwable t;
diff --git a/src/net/minecraft/network/chat/ComponentUtils.java b/src/net/minecraft/network/chat/ComponentUtils.java
index 5dfcb26..13d6dd4 100644
--- a/src/net/minecraft/network/chat/ComponentUtils.java
+++ b/src/net/minecraft/network/chat/ComponentUtils.java
@@ -14,26 +14,41 @@ import javax.annotation.Nullable;
 import net.minecraft.commands.CommandSourceStack;
 
 public class ComponentUtils {
-    public static Component mergeStyles(final Component lf, final Style ln) {
-        if (ln.isEmpty()) {
-            return lf;
+    public static MutableComponent mergeStyles(final MutableComponent mx, final Style nb) {
+        if (nb.isEmpty()) {
+            return mx;
         }
-        if (lf.getStyle().isEmpty()) {
-            return lf.setStyle(ln.copy());
+        final Style nb2 = mx.getStyle();
+        if (nb2.isEmpty()) {
+            return mx.setStyle(nb);
         }
-        return new TextComponent("").append(lf).setStyle(ln.copy());
+        if (nb2.equals(nb)) {
+            return mx;
+        }
+        return mx.setStyle(nb2.applyTo(nb));
     }
     
-    public static Component updateForEntity(@Nullable final CommandSourceStack cq, final Component lf, @Nullable final Entity akq, int integer) throws CommandSyntaxException {
+    public static MutableComponent updateForEntity(@Nullable final CommandSourceStack cz, final Component mr, @Nullable final Entity aom, final int integer) throws CommandSyntaxException {
         if (integer > 100) {
-            return lf;
+            return mr.copy();
         }
-        ++integer;
-        final Component lf2 = (lf instanceof ContextAwareComponent) ? ((ContextAwareComponent)lf).resolve(cq, akq, integer) : lf.copy();
-        for (final Component lf3 : lf.getSiblings()) {
-            lf2.append(updateForEntity(cq, lf3, akq, integer));
+        final MutableComponent mx5 = (mr instanceof ContextAwareComponent) ? ((ContextAwareComponent)mr).resolve(cz, aom, integer + 1) : mr.plainCopy();
+        for (final Component mr2 : mr.getSiblings()) {
+            mx5.append(updateForEntity(cz, mr2, aom, integer + 1));
         }
-        return mergeStyles(lf2, lf.getStyle());
+        return mx5.withStyle(resolveStyle(cz, mr.getStyle(), aom, integer));
+    }
+    
+    private static Style resolveStyle(@Nullable final CommandSourceStack cz, final Style nb, @Nullable final Entity aom, final int integer) throws CommandSyntaxException {
+        final HoverEvent mv5 = nb.getHoverEvent();
+        if (mv5 != null) {
+            final Component mr6 = mv5.<Component>getValue(HoverEvent.Action.SHOW_TEXT);
+            if (mr6 != null) {
+                final HoverEvent mv6 = new HoverEvent((HoverEvent.Action<T>)HoverEvent.Action.SHOW_TEXT, (T)updateForEntity(cz, mr6, aom, integer + 1));
+                return nb.withHoverEvent(mv6);
+            }
+        }
+        return nb;
     }
     
     public static Component getDisplayName(final GameProfile gameProfile) {
@@ -52,37 +67,37 @@ public class ComponentUtils {
     
     public static <T extends Comparable<T>> Component formatAndSortList(final Collection<T> collection, final Function<T, Component> function) {
         if (collection.isEmpty()) {
-            return new TextComponent("");
+            return TextComponent.EMPTY;
         }
         if (collection.size() == 1) {
             return function.apply(collection.iterator().next());
         }
         final List<T> list3 = Lists.newArrayList(collection);
         list3.sort(Comparable::compareTo);
-        return ComponentUtils.formatList((Collection<Object>)list3, (Function<Object, Component>)function);
+        return ComponentUtils.<T>formatList(list3, function);
     }
     
-    public static <T> Component formatList(final Collection<T> collection, final Function<T, Component> function) {
+    public static <T> MutableComponent formatList(final Collection<T> collection, final Function<T, Component> function) {
         if (collection.isEmpty()) {
             return new TextComponent("");
         }
         if (collection.size() == 1) {
-            return function.apply(collection.iterator().next());
+            return function.apply(collection.iterator().next()).copy();
         }
-        final Component lf3 = new TextComponent("");
+        final MutableComponent mx3 = new TextComponent("");
         boolean boolean4 = true;
         for (final T object6 : collection) {
             if (!boolean4) {
-                lf3.append(new TextComponent(", ").withStyle(ChatFormatting.GRAY));
+                mx3.append(new TextComponent(", ").withStyle(ChatFormatting.GRAY));
             }
-            lf3.append(function.apply(object6));
+            mx3.append(function.apply(object6));
             boolean4 = false;
         }
-        return lf3;
+        return mx3;
     }
     
-    public static Component wrapInSquareBrackets(final Component lf) {
-        return new TextComponent("[").append(lf).append("]");
+    public static MutableComponent wrapInSquareBrackets(final Component mr) {
+        return new TextComponent("[").append(mr).append("]");
     }
     
     public static Component fromMessage(final Message message) {
diff --git a/src/net/minecraft/network/chat/ContextAwareComponent.java b/src/net/minecraft/network/chat/ContextAwareComponent.java
index 8dac47b..7e83431 100644
--- a/src/net/minecraft/network/chat/ContextAwareComponent.java
+++ b/src/net/minecraft/network/chat/ContextAwareComponent.java
@@ -6,5 +6,5 @@ import javax.annotation.Nullable;
 import net.minecraft.commands.CommandSourceStack;
 
 public interface ContextAwareComponent {
-    Component resolve(@Nullable final CommandSourceStack cq, @Nullable final Entity akq, final int integer) throws CommandSyntaxException;
+    MutableComponent resolve(@Nullable final CommandSourceStack cz, @Nullable final Entity aom, final int integer) throws CommandSyntaxException;
 }
diff --git a/src/net/minecraft/network/chat/FormattedText.java b/src/net/minecraft/network/chat/FormattedText.java
new file mode 100644
index 0000000..a550fb0
--- /dev/null
+++ b/src/net/minecraft/network/chat/FormattedText.java
@@ -0,0 +1,101 @@
+package net.minecraft.network.chat;
+
+import java.util.Iterator;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.util.Unit;
+import java.util.Optional;
+
+public interface FormattedText {
+    public static final Optional<Unit> STOP_ITERATION = Optional.<Unit>of(Unit.INSTANCE);
+    public static final FormattedText EMPTY = new FormattedText() {
+        @Override
+        public <T> Optional<T> visit(final ContentConsumer<T> a) {
+            return Optional.<T>empty();
+        }
+        
+        @Override
+        public <T> Optional<T> visit(final StyledContentConsumer<T> b, final Style nb) {
+            return Optional.<T>empty();
+        }
+    };
+    
+     <T> Optional<T> visit(final ContentConsumer<T> a);
+    
+     <T> Optional<T> visit(final StyledContentConsumer<T> b, final Style nb);
+    
+    default FormattedText of(final String string) {
+        return new FormattedText() {
+            @Override
+            public <T> Optional<T> visit(final ContentConsumer<T> a) {
+                return a.accept(string);
+            }
+            
+            @Override
+            public <T> Optional<T> visit(final StyledContentConsumer<T> b, final Style nb) {
+                return b.accept(nb, string);
+            }
+        };
+    }
+    
+    default FormattedText of(final String string, final Style nb) {
+        return new FormattedText() {
+            @Override
+            public <T> Optional<T> visit(final ContentConsumer<T> a) {
+                return a.accept(string);
+            }
+            
+            @Override
+            public <T> Optional<T> visit(final StyledContentConsumer<T> b, final Style nb) {
+                return b.accept(nb.applyTo(nb), string);
+            }
+        };
+    }
+    
+    default FormattedText composite(final FormattedText... arr) {
+        return composite(ImmutableList.<FormattedText>copyOf(arr));
+    }
+    
+    default FormattedText composite(final List<FormattedText> list) {
+        return new FormattedText() {
+            @Override
+            public <T> Optional<T> visit(final ContentConsumer<T> a) {
+                for (final FormattedText mu4 : list) {
+                    final Optional<T> optional5 = mu4.<T>visit(a);
+                    if (optional5.isPresent()) {
+                        return optional5;
+                    }
+                }
+                return Optional.<T>empty();
+            }
+            
+            @Override
+            public <T> Optional<T> visit(final StyledContentConsumer<T> b, final Style nb) {
+                for (final FormattedText mu5 : list) {
+                    final Optional<T> optional6 = mu5.<T>visit(b, nb);
+                    if (optional6.isPresent()) {
+                        return optional6;
+                    }
+                }
+                return Optional.<T>empty();
+            }
+        };
+    }
+    
+    default String getString() {
+        final StringBuilder stringBuilder2 = new StringBuilder();
+        this.visit(string -> {
+            stringBuilder2.append(string);
+            return Optional.empty();
+        });
+        return stringBuilder2.toString();
+    }
+    
+    public interface ContentConsumer<T> {
+        Optional<T> accept(final String string);
+    }
+    
+    public interface StyledContentConsumer<T> {
+        Optional<T> accept(final Style nb, final String string);
+    }
+}
diff --git a/src/net/minecraft/network/chat/HoverEvent.java b/src/net/minecraft/network/chat/HoverEvent.java
index ed77764..968327e 100644
--- a/src/net/minecraft/network/chat/HoverEvent.java
+++ b/src/net/minecraft/network/chat/HoverEvent.java
@@ -1,25 +1,51 @@
 package net.minecraft.network.chat;
 
+import java.util.stream.Collector;
+import com.google.common.collect.ImmutableMap;
+import java.util.stream.Stream;
 import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.Arrays;
 import java.util.Map;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Item;
+import com.google.common.collect.Lists;
+import net.minecraft.nbt.CompoundTag;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.google.gson.JsonSyntaxException;
+import net.minecraft.nbt.TagParser;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.core.Registry;
+import java.util.List;
+import java.util.UUID;
+import net.minecraft.world.entity.EntityType;
+import org.apache.logging.log4j.LogManager;
+import com.google.gson.JsonElement;
+import net.minecraft.util.GsonHelper;
+import com.google.gson.JsonObject;
+import java.util.Objects;
+import javax.annotation.Nullable;
+import org.apache.logging.log4j.Logger;
 
 public class HoverEvent {
-    private final Action action;
-    private final Component value;
+    private static final Logger LOGGER;
+    private final Action<?> action;
+    private final Object value;
     
-    public HoverEvent(final Action a, final Component lf) {
+    public <T> HoverEvent(final Action<T> a, final T object) {
         this.action = a;
-        this.value = lf;
+        this.value = object;
     }
     
-    public Action getAction() {
+    public Action<?> getAction() {
         return this.action;
     }
     
-    public Component getValue() {
-        return this.value;
+    @Nullable
+    public <T> T getValue(final Action<T> a) {
+        if (this.action == a) {
+            return (T)((Action<Object>)a).cast(this.value);
+        }
+        return null;
     }
     
     @Override
@@ -30,19 +56,8 @@ public class HoverEvent {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final HoverEvent li3 = (HoverEvent)object;
-        if (this.action != li3.action) {
-            return false;
-        }
-        if (this.value != null) {
-            if (this.value.equals(li3.value)) {
-                return true;
-            }
-        }
-        else if (li3.value == null) {
-            return true;
-        }
-        return false;
+        final HoverEvent mv3 = (HoverEvent)object;
+        return this.action == mv3.action && Objects.equals(this.value, mv3.value);
     }
     
     @Override
@@ -57,18 +72,233 @@ public class HoverEvent {
         return integer2;
     }
     
-    public enum Action {
-        SHOW_TEXT("show_text", true), 
-        SHOW_ITEM("show_item", true), 
-        SHOW_ENTITY("show_entity", true);
+    @Nullable
+    public static HoverEvent deserialize(final JsonObject jsonObject) {
+        final String string2 = GsonHelper.getAsString(jsonObject, "action", null);
+        if (string2 == null) {
+            return null;
+        }
+        final Action<?> a3 = Action.getByName(string2);
+        if (a3 == null) {
+            return null;
+        }
+        final JsonElement jsonElement4 = jsonObject.get("contents");
+        if (jsonElement4 != null) {
+            return a3.deserialize(jsonElement4);
+        }
+        final Component mr5 = Component.Serializer.fromJson(jsonObject.get("value"));
+        if (mr5 != null) {
+            return a3.deserializeFromLegacy(mr5);
+        }
+        return null;
+    }
+    
+    public JsonObject serialize() {
+        final JsonObject jsonObject2 = new JsonObject();
+        jsonObject2.addProperty("action", this.action.getName());
+        jsonObject2.add("contents", this.action.serializeArg(this.value));
+        return jsonObject2;
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+    
+    public static class EntityTooltipInfo {
+        public final EntityType<?> type;
+        public final UUID id;
+        @Nullable
+        public final Component name;
+        @Nullable
+        private List<Component> linesCache;
         
+        public EntityTooltipInfo(final EntityType<?> aoq, final UUID uUID, @Nullable final Component mr) {
+            this.type = aoq;
+            this.id = uUID;
+            this.name = mr;
+        }
+        
+        @Nullable
+        public static EntityTooltipInfo create(final JsonElement jsonElement) {
+            if (!jsonElement.isJsonObject()) {
+                return null;
+            }
+            final JsonObject jsonObject2 = jsonElement.getAsJsonObject();
+            final EntityType<?> aoq3 = Registry.ENTITY_TYPE.get(new ResourceLocation(GsonHelper.getAsString(jsonObject2, "type")));
+            final UUID uUID4 = UUID.fromString(GsonHelper.getAsString(jsonObject2, "id"));
+            final Component mr5 = Component.Serializer.fromJson(jsonObject2.get("name"));
+            return new EntityTooltipInfo(aoq3, uUID4, mr5);
+        }
+        
+        @Nullable
+        public static EntityTooltipInfo create(final Component mr) {
+            try {
+                final CompoundTag le2 = TagParser.parseTag(mr.getString());
+                final Component mr2 = Component.Serializer.fromJson(le2.getString("name"));
+                final EntityType<?> aoq4 = Registry.ENTITY_TYPE.get(new ResourceLocation(le2.getString("type")));
+                final UUID uUID5 = UUID.fromString(le2.getString("id"));
+                return new EntityTooltipInfo(aoq4, uUID5, mr2);
+            }
+            catch (JsonSyntaxException | CommandSyntaxException ex2) {
+                final Exception ex;
+                final Exception exception2 = ex;
+                return null;
+            }
+        }
+        
+        public JsonElement serialize() {
+            final JsonObject jsonObject2 = new JsonObject();
+            jsonObject2.addProperty("type", Registry.ENTITY_TYPE.getKey(this.type).toString());
+            jsonObject2.addProperty("id", this.id.toString());
+            if (this.name != null) {
+                jsonObject2.add("name", Component.Serializer.toJsonTree(this.name));
+            }
+            return jsonObject2;
+        }
+        
+        public List<Component> getTooltipLines() {
+            if (this.linesCache == null) {
+                this.linesCache = Lists.newArrayList();
+                if (this.name != null) {
+                    this.linesCache.add(this.name);
+                }
+                this.linesCache.add(new TranslatableComponent("gui.entity_tooltip.type", new Object[] { this.type.getDescription() }));
+                this.linesCache.add(new TextComponent(this.id.toString()));
+            }
+            return this.linesCache;
+        }
+        
+        @Override
+        public boolean equals(final Object object) {
+            if (this == object) {
+                return true;
+            }
+            if (object == null || this.getClass() != object.getClass()) {
+                return false;
+            }
+            final EntityTooltipInfo b3 = (EntityTooltipInfo)object;
+            return this.type.equals(b3.type) && this.id.equals(b3.id) && Objects.equals(this.name, b3.name);
+        }
+        
+        @Override
+        public int hashCode() {
+            int integer2 = this.type.hashCode();
+            integer2 = 31 * integer2 + this.id.hashCode();
+            integer2 = 31 * integer2 + ((this.name != null) ? this.name.hashCode() : 0);
+            return integer2;
+        }
+    }
+    
+    public static class ItemStackInfo {
+        private final Item item;
+        private final int count;
+        @Nullable
+        private final CompoundTag tag;
+        @Nullable
+        private ItemStack itemStack;
+        
+        ItemStackInfo(final Item bke, final int integer, @Nullable final CompoundTag le) {
+            this.item = bke;
+            this.count = integer;
+            this.tag = le;
+        }
+        
+        public ItemStackInfo(final ItemStack bki) {
+            this(bki.getItem(), bki.getCount(), (bki.getTag() != null) ? bki.getTag().copy() : null);
+        }
+        
+        @Override
+        public boolean equals(final Object object) {
+            if (this == object) {
+                return true;
+            }
+            if (object == null || this.getClass() != object.getClass()) {
+                return false;
+            }
+            final ItemStackInfo c3 = (ItemStackInfo)object;
+            return this.count == c3.count && this.item.equals(c3.item) && Objects.equals(this.tag, c3.tag);
+        }
+        
+        @Override
+        public int hashCode() {
+            int integer2 = this.item.hashCode();
+            integer2 = 31 * integer2 + this.count;
+            integer2 = 31 * integer2 + ((this.tag != null) ? this.tag.hashCode() : 0);
+            return integer2;
+        }
+        
+        public ItemStack getItemStack() {
+            if (this.itemStack == null) {
+                this.itemStack = new ItemStack(this.item, this.count);
+                if (this.tag != null) {
+                    this.itemStack.setTag(this.tag);
+                }
+            }
+            return this.itemStack;
+        }
+        
+        private static ItemStackInfo create(final JsonElement jsonElement) {
+            if (jsonElement.isJsonPrimitive()) {
+                return new ItemStackInfo(Registry.ITEM.get(new ResourceLocation(jsonElement.getAsString())), 1, null);
+            }
+            final JsonObject jsonObject2 = GsonHelper.convertToJsonObject(jsonElement, "item");
+            final Item bke3 = Registry.ITEM.get(new ResourceLocation(GsonHelper.getAsString(jsonObject2, "id")));
+            final int integer4 = GsonHelper.getAsInt(jsonObject2, "count", 1);
+            if (jsonObject2.has("tag")) {
+                final String string5 = GsonHelper.getAsString(jsonObject2, "tag");
+                try {
+                    final CompoundTag le6 = TagParser.parseTag(string5);
+                    return new ItemStackInfo(bke3, integer4, le6);
+                }
+                catch (CommandSyntaxException commandSyntaxException6) {
+                    HoverEvent.LOGGER.warn("Failed to parse tag: {}", string5, commandSyntaxException6);
+                }
+            }
+            return new ItemStackInfo(bke3, integer4, null);
+        }
+        
+        @Nullable
+        private static ItemStackInfo create(final Component mr) {
+            try {
+                final CompoundTag le2 = TagParser.parseTag(mr.getString());
+                return new ItemStackInfo(ItemStack.of(le2));
+            }
+            catch (CommandSyntaxException commandSyntaxException2) {
+                HoverEvent.LOGGER.warn("Failed to parse item tag: {}", mr, commandSyntaxException2);
+                return null;
+            }
+        }
+        
+        private JsonElement serialize() {
+            final JsonObject jsonObject2 = new JsonObject();
+            jsonObject2.addProperty("id", Registry.ITEM.getKey(this.item).toString());
+            if (this.count != 1) {
+                jsonObject2.addProperty("count", this.count);
+            }
+            if (this.tag != null) {
+                jsonObject2.addProperty("tag", this.tag.toString());
+            }
+            return jsonObject2;
+        }
+    }
+    
+    public static class Action<T> {
+        public static final Action<Component> SHOW_TEXT;
+        public static final Action<ItemStackInfo> SHOW_ITEM;
+        public static final Action<EntityTooltipInfo> SHOW_ENTITY;
         private static final Map<String, Action> LOOKUP;
-        private final boolean allowFromServer;
         private final String name;
+        private final boolean allowFromServer;
+        private final Function<JsonElement, T> argDeserializer;
+        private final Function<T, JsonElement> argSerializer;
+        private final Function<Component, T> legacyArgDeserializer;
         
-        private Action(final String string3, final boolean boolean4) {
-            this.name = string3;
-            this.allowFromServer = boolean4;
+        public Action(final String string, final boolean boolean2, final Function<JsonElement, T> function3, final Function<T, JsonElement> function4, final Function<Component, T> function5) {
+            this.name = string;
+            this.allowFromServer = boolean2;
+            this.argDeserializer = function3;
+            this.argSerializer = function4;
+            this.legacyArgDeserializer = function5;
         }
         
         public boolean isAllowedFromServer() {
@@ -79,12 +309,47 @@ public class HoverEvent {
             return this.name;
         }
         
+        @Nullable
         public static Action getByName(final String string) {
             return Action.LOOKUP.get(string);
         }
         
+        private T cast(final Object object) {
+            return (T)object;
+        }
+        
+        @Nullable
+        public HoverEvent deserialize(final JsonElement jsonElement) {
+            final T object3 = this.argDeserializer.apply(jsonElement);
+            if (object3 == null) {
+                return null;
+            }
+            return new HoverEvent((Action<T>)this, (T)object3);
+        }
+        
+        @Nullable
+        public HoverEvent deserializeFromLegacy(final Component mr) {
+            final T object3 = this.legacyArgDeserializer.apply(mr);
+            if (object3 == null) {
+                return null;
+            }
+            return new HoverEvent((Action<T>)this, (T)object3);
+        }
+        
+        public JsonElement serializeArg(final Object object) {
+            return this.argSerializer.apply(this.cast(object));
+        }
+        
+        @Override
+        public String toString() {
+            return "<action " + this.name + ">";
+        }
+        
         static {
-            LOOKUP = Arrays.<Action>stream(values()).collect(Collectors.toMap(Action::getName, a -> a));
+            SHOW_TEXT = new Action<Component>("show_text", true, (Function<JsonElement, Component>)Component.Serializer::fromJson, Component.Serializer::toJsonTree, Function.<Component>identity());
+            SHOW_ITEM = new Action<ItemStackInfo>("show_item", true, jsonElement -> create(jsonElement), object -> object.serialize(), mr -> create(mr));
+            SHOW_ENTITY = new Action<EntityTooltipInfo>("show_entity", true, EntityTooltipInfo::create, EntityTooltipInfo::serialize, EntityTooltipInfo::create);
+            LOOKUP = Stream.<Action>of((Action[])new Action[] { Action.SHOW_TEXT, Action.SHOW_ITEM, Action.SHOW_ENTITY }).collect(ImmutableMap.toImmutableMap(Action::getName, a -> a));
         }
     }
 }
diff --git a/src/net/minecraft/network/chat/KeybindComponent.java b/src/net/minecraft/network/chat/KeybindComponent.java
index 752d86e..9b15082 100644
--- a/src/net/minecraft/network/chat/KeybindComponent.java
+++ b/src/net/minecraft/network/chat/KeybindComponent.java
@@ -1,19 +1,23 @@
 package net.minecraft.network.chat;
 
+import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.function.Function;
 
 public class KeybindComponent extends BaseComponent {
-    public static Function<String, Supplier<String>> keyResolver;
+    private static Function<String, Supplier<Component>> keyResolver;
     private final String name;
-    private Supplier<String> nameResolver;
+    private Supplier<Component> nameResolver;
     
     public KeybindComponent(final String string) {
         this.name = string;
     }
     
-    @Override
-    public String getContents() {
+    public static void setKeyResolver(final Function<String, Supplier<Component>> function) {
+        KeybindComponent.keyResolver = function;
+    }
+    
+    private Component getNestedComponent() {
         if (this.nameResolver == null) {
             this.nameResolver = KeybindComponent.keyResolver.apply(this.name);
         }
@@ -21,7 +25,17 @@ public class KeybindComponent extends BaseComponent {
     }
     
     @Override
-    public KeybindComponent copy() {
+    public <T> Optional<T> visitSelf(final FormattedText.ContentConsumer<T> a) {
+        return this.getNestedComponent().<T>visit(a);
+    }
+    
+    @Override
+    public <T> Optional<T> visitSelf(final FormattedText.StyledContentConsumer<T> b, final Style nb) {
+        return this.getNestedComponent().<T>visit(b, nb);
+    }
+    
+    @Override
+    public KeybindComponent plainCopy() {
         return new KeybindComponent(this.name);
     }
     
@@ -31,8 +45,8 @@ public class KeybindComponent extends BaseComponent {
             return true;
         }
         if (object instanceof KeybindComponent) {
-            final KeybindComponent lj3 = (KeybindComponent)object;
-            return this.name.equals(lj3.name) && super.equals(object);
+            final KeybindComponent mw3 = (KeybindComponent)object;
+            return this.name.equals(mw3.name) && super.equals(object);
         }
         return false;
     }
@@ -47,6 +61,6 @@ public class KeybindComponent extends BaseComponent {
     }
     
     static {
-        KeybindComponent.keyResolver = (string -> () -> string);
+        KeybindComponent.keyResolver = (string -> () -> new TextComponent(string));
     }
 }
diff --git a/src/net/minecraft/network/chat/MutableComponent.java b/src/net/minecraft/network/chat/MutableComponent.java
new file mode 100644
index 0000000..96f2a4d
--- /dev/null
+++ b/src/net/minecraft/network/chat/MutableComponent.java
@@ -0,0 +1,34 @@
+package net.minecraft.network.chat;
+
+import net.minecraft.ChatFormatting;
+import java.util.function.UnaryOperator;
+
+public interface MutableComponent extends Component {
+    MutableComponent setStyle(final Style nb);
+    
+    default MutableComponent append(final String string) {
+        return this.append(new TextComponent(string));
+    }
+    
+    MutableComponent append(final Component mr);
+    
+    default MutableComponent withStyle(final UnaryOperator<Style> unaryOperator) {
+        this.setStyle(unaryOperator.apply(this.getStyle()));
+        return this;
+    }
+    
+    default MutableComponent withStyle(final Style nb) {
+        this.setStyle(nb.applyTo(this.getStyle()));
+        return this;
+    }
+    
+    default MutableComponent withStyle(final ChatFormatting... arr) {
+        this.setStyle(this.getStyle().applyFormats(arr));
+        return this;
+    }
+    
+    default MutableComponent withStyle(final ChatFormatting i) {
+        this.setStyle(this.getStyle().applyFormat(i));
+        return this;
+    }
+}
diff --git a/src/net/minecraft/network/chat/NbtComponent.java b/src/net/minecraft/network/chat/NbtComponent.java
index 3c15060..72669ab 100644
--- a/src/net/minecraft/network/chat/NbtComponent.java
+++ b/src/net/minecraft/network/chat/NbtComponent.java
@@ -52,12 +52,7 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
         this.interpreting = boolean3;
     }
     
-    protected abstract Stream<CompoundTag> getData(final CommandSourceStack cq) throws CommandSyntaxException;
-    
-    @Override
-    public String getContents() {
-        return "";
-    }
+    protected abstract Stream<CompoundTag> getData(final CommandSourceStack cz) throws CommandSyntaxException;
     
     public String getNbtPath() {
         return this.nbtPathPattern;
@@ -68,30 +63,30 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
     }
     
     @Override
-    public Component resolve(@Nullable final CommandSourceStack cq, @Nullable final Entity akq, final int integer) throws CommandSyntaxException {
-        if (cq == null || this.compiledNbtPath == null) {
+    public MutableComponent resolve(@Nullable final CommandSourceStack cz, @Nullable final Entity aom, final int integer) throws CommandSyntaxException {
+        if (cz == null || this.compiledNbtPath == null) {
             return new TextComponent("");
         }
-        final Stream<String> stream5 = this.getData(cq).flatMap(jt -> {
+        final Stream<String> stream5 = this.getData(cz).flatMap(le -> {
             try {
-                return this.compiledNbtPath.get(jt).stream();
+                return this.compiledNbtPath.get(le).stream();
             }
             catch (CommandSyntaxException commandSyntaxException3) {
                 return Stream.empty();
             }
         }).<String>map(Tag::getAsString);
         if (this.interpreting) {
-            Component lf3;
+            MutableComponent mx3;
             return stream5.<TextComponent>flatMap(string -> {
                 try {
-                    lf3 = Component.Serializer.fromJson(string);
-                    return Stream.<Component>of(ComponentUtils.updateForEntity(cq, lf3, akq, integer));
+                    mx3 = Component.Serializer.fromJson(string);
+                    return Stream.<MutableComponent>of(ComponentUtils.updateForEntity(cz, mx3, aom, integer));
                 }
                 catch (Exception exception5) {
                     NbtComponent.LOGGER.warn("Failed to parse component: " + string, (Throwable)exception5);
-                    return Stream.<Component>of(new Component[0]);
+                    return Stream.<MutableComponent>of(new MutableComponent[0]);
                 }
-            }).reduce((lf1, lf2) -> lf1.append(", ").append(lf2)).orElse(new TextComponent(""));
+            }).reduce((mx1, mx2) -> mx1.append(", ").append(mx2)).orElse(new TextComponent(""));
         }
         return new TextComponent(Joiner.on(", ").join(stream5.iterator()));
     }
@@ -114,18 +109,18 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
         @Nullable
         private static EntitySelector compileSelector(final String string) {
             try {
-                final EntitySelectorParser eq2 = new EntitySelectorParser(new StringReader(string));
-                return eq2.parse();
+                final EntitySelectorParser fa2 = new EntitySelectorParser(new StringReader(string));
+                return fa2.parse();
             }
             catch (CommandSyntaxException commandSyntaxException2) {
                 return null;
             }
         }
         
-        private EntityNbtComponent(final String string1, @Nullable final NbtPathArgument.NbtPath h, final boolean boolean3, final String string4, @Nullable final EntitySelector ep) {
+        private EntityNbtComponent(final String string1, @Nullable final NbtPathArgument.NbtPath h, final boolean boolean3, final String string4, @Nullable final EntitySelector ez) {
             super(string1, h, boolean3);
             this.selectorPattern = string4;
-            this.compiledSelector = ep;
+            this.compiledSelector = ez;
         }
         
         public String getSelector() {
@@ -133,14 +128,14 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
         }
         
         @Override
-        public Component copy() {
+        public EntityNbtComponent plainCopy() {
             return new EntityNbtComponent(this.nbtPathPattern, this.compiledNbtPath, this.interpreting, this.selectorPattern, this.compiledSelector);
         }
         
         @Override
-        protected Stream<CompoundTag> getData(final CommandSourceStack cq) throws CommandSyntaxException {
+        protected Stream<CompoundTag> getData(final CommandSourceStack cz) throws CommandSyntaxException {
             if (this.compiledSelector != null) {
-                final List<? extends Entity> list3 = this.compiledSelector.findEntities(cq);
+                final List<? extends Entity> list3 = this.compiledSelector.findEntities(cz);
                 return list3.stream().<CompoundTag>map(NbtPredicate::getEntityTagToCompare);
             }
             return Stream.<CompoundTag>empty();
@@ -185,10 +180,10 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
             }
         }
         
-        private BlockNbtComponent(final String string1, @Nullable final NbtPathArgument.NbtPath h, final boolean boolean3, final String string4, @Nullable final Coordinates dz) {
+        private BlockNbtComponent(final String string1, @Nullable final NbtPathArgument.NbtPath h, final boolean boolean3, final String string4, @Nullable final Coordinates ej) {
             super(string1, h, boolean3);
             this.posPattern = string4;
-            this.compiledPos = dz;
+            this.compiledPos = ej;
         }
         
         @Nullable
@@ -197,19 +192,19 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
         }
         
         @Override
-        public Component copy() {
+        public BlockNbtComponent plainCopy() {
             return new BlockNbtComponent(this.nbtPathPattern, this.compiledNbtPath, this.interpreting, this.posPattern, this.compiledPos);
         }
         
         @Override
-        protected Stream<CompoundTag> getData(final CommandSourceStack cq) {
+        protected Stream<CompoundTag> getData(final CommandSourceStack cz) {
             if (this.compiledPos != null) {
-                final ServerLevel xd3 = cq.getLevel();
-                final BlockPos fk4 = this.compiledPos.getBlockPos(cq);
-                if (xd3.isLoaded(fk4)) {
-                    final BlockEntity bwl5 = xd3.getBlockEntity(fk4);
-                    if (bwl5 != null) {
-                        return Stream.<CompoundTag>of(bwl5.save(new CompoundTag()));
+                final ServerLevel zd3 = cz.getLevel();
+                final BlockPos fu4 = this.compiledPos.getBlockPos(cz);
+                if (zd3.isLoaded(fu4)) {
+                    final BlockEntity cdl5 = zd3.getBlockEntity(fu4);
+                    if (cdl5 != null) {
+                        return Stream.<CompoundTag>of(cdl5.save(new CompoundTag()));
                     }
                 }
             }
@@ -237,14 +232,14 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
     public static class StorageNbtComponent extends NbtComponent {
         private final ResourceLocation id;
         
-        public StorageNbtComponent(final String string, final boolean boolean2, final ResourceLocation sm) {
+        public StorageNbtComponent(final String string, final boolean boolean2, final ResourceLocation uh) {
             super(string, boolean2);
-            this.id = sm;
+            this.id = uh;
         }
         
-        public StorageNbtComponent(final String string, @Nullable final NbtPathArgument.NbtPath h, final boolean boolean3, final ResourceLocation sm) {
+        public StorageNbtComponent(final String string, @Nullable final NbtPathArgument.NbtPath h, final boolean boolean3, final ResourceLocation uh) {
             super(string, h, boolean3);
-            this.id = sm;
+            this.id = uh;
         }
         
         public ResourceLocation getId() {
@@ -252,14 +247,14 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
         }
         
         @Override
-        public Component copy() {
+        public StorageNbtComponent plainCopy() {
             return new StorageNbtComponent(this.nbtPathPattern, this.compiledNbtPath, this.interpreting, this.id);
         }
         
         @Override
-        protected Stream<CompoundTag> getData(final CommandSourceStack cq) {
-            final CompoundTag jt3 = cq.getServer().getCommandStorage().get(this.id);
-            return Stream.<CompoundTag>of(jt3);
+        protected Stream<CompoundTag> getData(final CommandSourceStack cz) {
+            final CompoundTag le3 = cz.getServer().getCommandStorage().get(this.id);
+            return Stream.<CompoundTag>of(le3);
         }
         
         @Override
diff --git a/src/net/minecraft/network/chat/ScoreComponent.java b/src/net/minecraft/network/chat/ScoreComponent.java
index bac7871..69e4916 100644
--- a/src/net/minecraft/network/chat/ScoreComponent.java
+++ b/src/net/minecraft/network/chat/ScoreComponent.java
@@ -1,13 +1,12 @@
 package net.minecraft.network.chat;
 
-import java.util.List;
-import net.minecraft.commands.arguments.EntityArgument;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.scores.Score;
 import net.minecraft.world.scores.Objective;
 import net.minecraft.world.scores.Scoreboard;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.StringUtil;
+import java.util.List;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.commands.arguments.EntityArgument;
 import net.minecraft.commands.CommandSourceStack;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.commands.arguments.selector.EntitySelectorParser;
@@ -20,19 +19,25 @@ public class ScoreComponent extends BaseComponent implements ContextAwareCompone
     @Nullable
     private final EntitySelector selector;
     private final String objective;
-    private String value;
+    
+    @Nullable
+    private static EntitySelector parseSelector(final String string) {
+        try {
+            return new EntitySelectorParser(new StringReader(string)).parse();
+        }
+        catch (CommandSyntaxException ex) {
+            return null;
+        }
+    }
     
     public ScoreComponent(final String string1, final String string2) {
-        this.value = "";
+        this(string1, parseSelector(string1), string2);
+    }
+    
+    private ScoreComponent(final String string1, @Nullable final EntitySelector ez, final String string3) {
         this.name = string1;
-        this.objective = string2;
-        EntitySelector ep4 = null;
-        try {
-            final EntitySelectorParser eq5 = new EntitySelectorParser(new StringReader(string1));
-            ep4 = eq5.parse();
-        }
-        catch (CommandSyntaxException ex) {}
-        this.selector = ep4;
+        this.selector = ez;
+        this.objective = string3;
     }
     
     public String getName() {
@@ -43,63 +48,45 @@ public class ScoreComponent extends BaseComponent implements ContextAwareCompone
         return this.objective;
     }
     
-    public void setValue(final String string) {
-        this.value = string;
-    }
-    
-    @Override
-    public String getContents() {
-        return this.value;
-    }
-    
-    private void resolve(final CommandSourceStack cq) {
-        final MinecraftServer minecraftServer3 = cq.getServer();
-        if (minecraftServer3 != null && minecraftServer3.isInitialized() && StringUtil.isNullOrEmpty(this.value)) {
-            final Scoreboard cwl4 = minecraftServer3.getScoreboard();
-            final Objective cwi5 = cwl4.getObjective(this.objective);
-            if (cwl4.hasPlayerScore(this.name, cwi5)) {
-                final Score cwk6 = cwl4.getOrCreatePlayerScore(this.name, cwi5);
-                this.setValue(String.format("%d", cwk6.getScore()));
-            }
-            else {
-                this.value = "";
-            }
-        }
-    }
-    
-    @Override
-    public ScoreComponent copy() {
-        final ScoreComponent ll2 = new ScoreComponent(this.name, this.objective);
-        ll2.setValue(this.value);
-        return ll2;
-    }
-    
-    @Override
-    public Component resolve(@Nullable final CommandSourceStack cq, @Nullable final Entity akq, final int integer) throws CommandSyntaxException {
-        if (cq == null) {
-            return this.copy();
-        }
-        String string5;
+    private String findTargetName(final CommandSourceStack cz) throws CommandSyntaxException {
         if (this.selector != null) {
-            final List<? extends Entity> list6 = this.selector.findEntities(cq);
-            if (list6.isEmpty()) {
-                string5 = this.name;
-            }
-            else {
-                if (list6.size() != 1) {
+            final List<? extends Entity> list3 = this.selector.findEntities(cz);
+            if (!list3.isEmpty()) {
+                if (list3.size() != 1) {
                     throw EntityArgument.ERROR_NOT_SINGLE_ENTITY.create();
                 }
-                string5 = ((Entity)list6.get(0)).getScoreboardName();
+                return ((Entity)list3.get(0)).getScoreboardName();
             }
         }
-        else {
-            string5 = this.name;
+        return this.name;
+    }
+    
+    private String getScore(final String string, final CommandSourceStack cz) {
+        final MinecraftServer minecraftServer4 = cz.getServer();
+        if (minecraftServer4 != null) {
+            final Scoreboard dfm5 = minecraftServer4.getScoreboard();
+            final Objective dfj6 = dfm5.getObjective(this.objective);
+            if (dfm5.hasPlayerScore(string, dfj6)) {
+                final Score dfl7 = dfm5.getOrCreatePlayerScore(string, dfj6);
+                return Integer.toString(dfl7.getScore());
+            }
         }
-        final String string6 = (akq != null && string5.equals("*")) ? akq.getScoreboardName() : string5;
-        final ScoreComponent ll7 = new ScoreComponent(string6, this.objective);
-        ll7.setValue(this.value);
-        ll7.resolve(cq);
-        return ll7;
+        return "";
+    }
+    
+    @Override
+    public ScoreComponent plainCopy() {
+        return new ScoreComponent(this.name, this.selector, this.objective);
+    }
+    
+    @Override
+    public MutableComponent resolve(@Nullable final CommandSourceStack cz, @Nullable final Entity aom, final int integer) throws CommandSyntaxException {
+        if (cz == null) {
+            return new TextComponent("");
+        }
+        final String string5 = this.findTargetName(cz);
+        final String string6 = (aom != null && string5.equals("*")) ? aom.getScoreboardName() : string5;
+        return new TextComponent(this.getScore(string6, cz));
     }
     
     @Override
@@ -108,8 +95,8 @@ public class ScoreComponent extends BaseComponent implements ContextAwareCompone
             return true;
         }
         if (object instanceof ScoreComponent) {
-            final ScoreComponent ll3 = (ScoreComponent)object;
-            return this.name.equals(ll3.name) && this.objective.equals(ll3.objective) && super.equals(object);
+            final ScoreComponent mz3 = (ScoreComponent)object;
+            return this.name.equals(mz3.name) && this.objective.equals(mz3.objective) && super.equals(object);
         }
         return false;
     }
diff --git a/src/net/minecraft/network/chat/SelectorComponent.java b/src/net/minecraft/network/chat/SelectorComponent.java
index cf8659f..1222fbb 100644
--- a/src/net/minecraft/network/chat/SelectorComponent.java
+++ b/src/net/minecraft/network/chat/SelectorComponent.java
@@ -18,15 +18,15 @@ public class SelectorComponent extends BaseComponent implements ContextAwareComp
     
     public SelectorComponent(final String string) {
         this.pattern = string;
-        EntitySelector ep3 = null;
+        EntitySelector ez3 = null;
         try {
-            final EntitySelectorParser eq4 = new EntitySelectorParser(new StringReader(string));
-            ep3 = eq4.parse();
+            final EntitySelectorParser fa4 = new EntitySelectorParser(new StringReader(string));
+            ez3 = fa4.parse();
         }
         catch (CommandSyntaxException commandSyntaxException4) {
             SelectorComponent.LOGGER.warn("Invalid selector component: {}", string, commandSyntaxException4.getMessage());
         }
-        this.selector = ep3;
+        this.selector = ez3;
     }
     
     public String getPattern() {
@@ -34,11 +34,11 @@ public class SelectorComponent extends BaseComponent implements ContextAwareComp
     }
     
     @Override
-    public Component resolve(@Nullable final CommandSourceStack cq, @Nullable final Entity akq, final int integer) throws CommandSyntaxException {
-        if (cq == null || this.selector == null) {
+    public MutableComponent resolve(@Nullable final CommandSourceStack cz, @Nullable final Entity aom, final int integer) throws CommandSyntaxException {
+        if (cz == null || this.selector == null) {
             return new TextComponent("");
         }
-        return EntitySelector.joinNames(this.selector.findEntities(cq));
+        return EntitySelector.joinNames(this.selector.findEntities(cz));
     }
     
     @Override
@@ -47,7 +47,7 @@ public class SelectorComponent extends BaseComponent implements ContextAwareComp
     }
     
     @Override
-    public SelectorComponent copy() {
+    public SelectorComponent plainCopy() {
         return new SelectorComponent(this.pattern);
     }
     
@@ -57,8 +57,8 @@ public class SelectorComponent extends BaseComponent implements ContextAwareComp
             return true;
         }
         if (object instanceof SelectorComponent) {
-            final SelectorComponent lm3 = (SelectorComponent)object;
-            return this.pattern.equals(lm3.pattern) && super.equals(object);
+            final SelectorComponent na3 = (SelectorComponent)object;
+            return this.pattern.equals(na3.pattern) && super.equals(object);
         }
         return false;
     }
diff --git a/src/net/minecraft/network/chat/Style.java b/src/net/minecraft/network/chat/Style.java
index e63a40f..f4ac489 100644
--- a/src/net/minecraft/network/chat/Style.java
+++ b/src/net/minecraft/network/chat/Style.java
@@ -1,161 +1,275 @@
 package net.minecraft.network.chat;
 
 import com.google.gson.JsonSerializationContext;
+import net.minecraft.ResourceLocationException;
+import com.google.gson.JsonSyntaxException;
+import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonObject;
-import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import java.lang.reflect.Type;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonSerializer;
 import com.google.gson.JsonDeserializer;
 import java.util.Objects;
-import javax.annotation.Nullable;
 import net.minecraft.ChatFormatting;
+import javax.annotation.Nullable;
+import net.minecraft.resources.ResourceLocation;
 
 public class Style {
-    private Style parent;
-    private ChatFormatting color;
-    private Boolean bold;
-    private Boolean italic;
-    private Boolean underlined;
-    private Boolean strikethrough;
-    private Boolean obfuscated;
-    private ClickEvent clickEvent;
-    private HoverEvent hoverEvent;
-    private String insertion;
-    private static final Style ROOT;
+    public static final ResourceLocation DEFAULT_FONT;
+    public static final Style EMPTY;
+    @Nullable
+    private final TextColor color;
+    @Nullable
+    private final Boolean bold;
+    @Nullable
+    private final Boolean italic;
+    @Nullable
+    private final Boolean underlined;
+    @Nullable
+    private final Boolean strikethrough;
+    @Nullable
+    private final Boolean obfuscated;
+    @Nullable
+    private final ClickEvent clickEvent;
+    @Nullable
+    private final HoverEvent hoverEvent;
+    @Nullable
+    private final String insertion;
+    @Nullable
+    private final ResourceLocation font;
+    
+    private Style(@Nullable final TextColor nc, @Nullable final Boolean boolean2, @Nullable final Boolean boolean3, @Nullable final Boolean boolean4, @Nullable final Boolean boolean5, @Nullable final Boolean boolean6, @Nullable final ClickEvent mp, @Nullable final HoverEvent mv, @Nullable final String string, @Nullable final ResourceLocation uh) {
+        this.color = nc;
+        this.bold = boolean2;
+        this.italic = boolean3;
+        this.underlined = boolean4;
+        this.strikethrough = boolean5;
+        this.obfuscated = boolean6;
+        this.clickEvent = mp;
+        this.hoverEvent = mv;
+        this.insertion = string;
+        this.font = uh;
+    }
     
     @Nullable
-    public ChatFormatting getColor() {
-        return (this.color == null) ? this.getParent().getColor() : this.color;
+    public TextColor getColor() {
+        return this.color;
     }
     
     public boolean isBold() {
-        return (this.bold == null) ? this.getParent().isBold() : this.bold;
+        return this.bold == Boolean.TRUE;
     }
     
     public boolean isItalic() {
-        return (this.italic == null) ? this.getParent().isItalic() : this.italic;
+        return this.italic == Boolean.TRUE;
     }
     
     public boolean isStrikethrough() {
-        return (this.strikethrough == null) ? this.getParent().isStrikethrough() : this.strikethrough;
+        return this.strikethrough == Boolean.TRUE;
     }
     
     public boolean isUnderlined() {
-        return (this.underlined == null) ? this.getParent().isUnderlined() : this.underlined;
+        return this.underlined == Boolean.TRUE;
     }
     
     public boolean isObfuscated() {
-        return (this.obfuscated == null) ? this.getParent().isObfuscated() : this.obfuscated;
+        return this.obfuscated == Boolean.TRUE;
     }
     
     public boolean isEmpty() {
-        return this.bold == null && this.italic == null && this.strikethrough == null && this.underlined == null && this.obfuscated == null && this.color == null && this.clickEvent == null && this.hoverEvent == null && this.insertion == null;
+        return this == Style.EMPTY;
     }
     
     @Nullable
     public ClickEvent getClickEvent() {
-        return (this.clickEvent == null) ? this.getParent().getClickEvent() : this.clickEvent;
+        return this.clickEvent;
     }
     
     @Nullable
     public HoverEvent getHoverEvent() {
-        return (this.hoverEvent == null) ? this.getParent().getHoverEvent() : this.hoverEvent;
+        return this.hoverEvent;
     }
     
     @Nullable
     public String getInsertion() {
-        return (this.insertion == null) ? this.getParent().getInsertion() : this.insertion;
+        return this.insertion;
     }
     
-    public Style setColor(final ChatFormatting g) {
-        this.color = g;
-        return this;
+    public ResourceLocation getFont() {
+        return (this.font != null) ? this.font : Style.DEFAULT_FONT;
     }
     
-    public Style setBold(final Boolean boolean1) {
-        this.bold = boolean1;
-        return this;
+    public Style withColor(@Nullable final TextColor nc) {
+        return new Style(nc, this.bold, this.italic, this.underlined, this.strikethrough, this.obfuscated, this.clickEvent, this.hoverEvent, this.insertion, this.font);
     }
     
-    public Style setItalic(final Boolean boolean1) {
-        this.italic = boolean1;
-        return this;
+    public Style withColor(@Nullable final ChatFormatting i) {
+        return this.withColor((i != null) ? TextColor.fromLegacyFormat(i) : null);
     }
     
-    public Style setStrikethrough(final Boolean boolean1) {
-        this.strikethrough = boolean1;
-        return this;
+    public Style withBold(@Nullable final Boolean boolean1) {
+        return new Style(this.color, boolean1, this.italic, this.underlined, this.strikethrough, this.obfuscated, this.clickEvent, this.hoverEvent, this.insertion, this.font);
     }
     
-    public Style setUnderlined(final Boolean boolean1) {
-        this.underlined = boolean1;
-        return this;
+    public Style withItalic(@Nullable final Boolean boolean1) {
+        return new Style(this.color, this.bold, boolean1, this.underlined, this.strikethrough, this.obfuscated, this.clickEvent, this.hoverEvent, this.insertion, this.font);
     }
     
-    public Style setObfuscated(final Boolean boolean1) {
-        this.obfuscated = boolean1;
-        return this;
+    public Style withClickEvent(@Nullable final ClickEvent mp) {
+        return new Style(this.color, this.bold, this.italic, this.underlined, this.strikethrough, this.obfuscated, mp, this.hoverEvent, this.insertion, this.font);
     }
     
-    public Style setClickEvent(final ClickEvent le) {
-        this.clickEvent = le;
-        return this;
+    public Style withHoverEvent(@Nullable final HoverEvent mv) {
+        return new Style(this.color, this.bold, this.italic, this.underlined, this.strikethrough, this.obfuscated, this.clickEvent, mv, this.insertion, this.font);
     }
     
-    public Style setHoverEvent(final HoverEvent li) {
-        this.hoverEvent = li;
-        return this;
+    public Style withInsertion(@Nullable final String string) {
+        return new Style(this.color, this.bold, this.italic, this.underlined, this.strikethrough, this.obfuscated, this.clickEvent, this.hoverEvent, string, this.font);
     }
     
-    public Style setInsertion(final String string) {
-        this.insertion = string;
-        return this;
+    public Style withFont(@Nullable final ResourceLocation uh) {
+        return new Style(this.color, this.bold, this.italic, this.underlined, this.strikethrough, this.obfuscated, this.clickEvent, this.hoverEvent, this.insertion, uh);
     }
     
-    public Style inheritFrom(final Style ln) {
-        this.parent = ln;
-        return this;
-    }
-    
-    public String getLegacyFormatCodes() {
-        if (!this.isEmpty()) {
-            final StringBuilder stringBuilder2 = new StringBuilder();
-            if (this.getColor() != null) {
-                stringBuilder2.append(this.getColor());
+    public Style applyFormat(final ChatFormatting i) {
+        TextColor nc3 = this.color;
+        Boolean boolean4 = this.bold;
+        Boolean boolean5 = this.italic;
+        Boolean boolean6 = this.strikethrough;
+        Boolean boolean7 = this.underlined;
+        Boolean boolean8 = this.obfuscated;
+        switch (i) {
+            case OBFUSCATED: {
+                boolean8 = true;
+                break;
             }
-            if (this.isBold()) {
-                stringBuilder2.append(ChatFormatting.BOLD);
+            case BOLD: {
+                boolean4 = true;
+                break;
             }
-            if (this.isItalic()) {
-                stringBuilder2.append(ChatFormatting.ITALIC);
+            case STRIKETHROUGH: {
+                boolean6 = true;
+                break;
             }
-            if (this.isUnderlined()) {
-                stringBuilder2.append(ChatFormatting.UNDERLINE);
+            case UNDERLINE: {
+                boolean7 = true;
+                break;
             }
-            if (this.isObfuscated()) {
-                stringBuilder2.append(ChatFormatting.OBFUSCATED);
+            case ITALIC: {
+                boolean5 = true;
+                break;
             }
-            if (this.isStrikethrough()) {
-                stringBuilder2.append(ChatFormatting.STRIKETHROUGH);
+            case RESET: {
+                return Style.EMPTY;
+            }
+            default: {
+                nc3 = TextColor.fromLegacyFormat(i);
+                break;
             }
-            return stringBuilder2.toString();
         }
-        if (this.parent != null) {
-            return this.parent.getLegacyFormatCodes();
-        }
-        return "";
+        return new Style(nc3, boolean4, boolean5, boolean7, boolean6, boolean8, this.clickEvent, this.hoverEvent, this.insertion, this.font);
     }
     
-    private Style getParent() {
-        return (this.parent == null) ? Style.ROOT : this.parent;
+    public Style applyLegacyFormat(final ChatFormatting i) {
+        TextColor nc3 = this.color;
+        Boolean boolean4 = this.bold;
+        Boolean boolean5 = this.italic;
+        Boolean boolean6 = this.strikethrough;
+        Boolean boolean7 = this.underlined;
+        Boolean boolean8 = this.obfuscated;
+        switch (i) {
+            case OBFUSCATED: {
+                boolean8 = true;
+                break;
+            }
+            case BOLD: {
+                boolean4 = true;
+                break;
+            }
+            case STRIKETHROUGH: {
+                boolean6 = true;
+                break;
+            }
+            case UNDERLINE: {
+                boolean7 = true;
+                break;
+            }
+            case ITALIC: {
+                boolean5 = true;
+                break;
+            }
+            case RESET: {
+                return Style.EMPTY;
+            }
+            default: {
+                boolean8 = false;
+                boolean4 = false;
+                boolean6 = false;
+                boolean7 = false;
+                boolean5 = false;
+                nc3 = TextColor.fromLegacyFormat(i);
+                break;
+            }
+        }
+        return new Style(nc3, boolean4, boolean5, boolean7, boolean6, boolean8, this.clickEvent, this.hoverEvent, this.insertion, this.font);
+    }
+    
+    public Style applyFormats(final ChatFormatting... arr) {
+        TextColor nc3 = this.color;
+        Boolean boolean4 = this.bold;
+        Boolean boolean5 = this.italic;
+        Boolean boolean6 = this.strikethrough;
+        Boolean boolean7 = this.underlined;
+        Boolean boolean8 = this.obfuscated;
+        for (final ChatFormatting i12 : arr) {
+            switch (i12) {
+                case OBFUSCATED: {
+                    boolean8 = true;
+                    break;
+                }
+                case BOLD: {
+                    boolean4 = true;
+                    break;
+                }
+                case STRIKETHROUGH: {
+                    boolean6 = true;
+                    break;
+                }
+                case UNDERLINE: {
+                    boolean7 = true;
+                    break;
+                }
+                case ITALIC: {
+                    boolean5 = true;
+                    break;
+                }
+                case RESET: {
+                    return Style.EMPTY;
+                }
+                default: {
+                    nc3 = TextColor.fromLegacyFormat(i12);
+                    break;
+                }
+            }
+        }
+        return new Style(nc3, boolean4, boolean5, boolean7, boolean6, boolean8, this.clickEvent, this.hoverEvent, this.insertion, this.font);
+    }
+    
+    public Style applyTo(final Style nb) {
+        if (this == Style.EMPTY) {
+            return nb;
+        }
+        if (nb == Style.EMPTY) {
+            return this;
+        }
+        return new Style((this.color != null) ? this.color : nb.color, (this.bold != null) ? this.bold : nb.bold, (this.italic != null) ? this.italic : nb.italic, (this.underlined != null) ? this.underlined : nb.underlined, (this.strikethrough != null) ? this.strikethrough : nb.strikethrough, (this.obfuscated != null) ? this.obfuscated : nb.obfuscated, (this.clickEvent != null) ? this.clickEvent : nb.clickEvent, (this.hoverEvent != null) ? this.hoverEvent : nb.hoverEvent, (this.insertion != null) ? this.insertion : nb.insertion, (this.font != null) ? this.font : nb.font);
     }
     
     @Override
     public String toString() {
-        return "Style{hasParent=" + (this.parent != null) + ", color=" + this.color + ", bold=" + this.bold + ", italic=" + this.italic + ", underlined=" + this.underlined + ", obfuscated=" + this.obfuscated + ", clickEvent=" + this.getClickEvent() + ", hoverEvent=" + this.getHoverEvent() + ", insertion=" + this.getInsertion() + '}';
+        return "Style{ color=" + this.color + ", bold=" + this.bold + ", italic=" + this.italic + ", underlined=" + this.underlined + ", strikethrough=" + this.strikethrough + ", obfuscated=" + this.obfuscated + ", clickEvent=" + this.getClickEvent() + ", hoverEvent=" + this.getHoverEvent() + ", insertion=" + this.getInsertion() + ", font=" + this.getFont() + '}';
     }
     
     @Override
@@ -164,29 +278,8 @@ public class Style {
             return true;
         }
         if (object instanceof Style) {
-            final Style ln3 = (Style)object;
-            if (this.isBold() == ln3.isBold() && this.getColor() == ln3.getColor() && this.isItalic() == ln3.isItalic() && this.isObfuscated() == ln3.isObfuscated() && this.isStrikethrough() == ln3.isStrikethrough() && this.isUnderlined() == ln3.isUnderlined()) {
-                if (this.getClickEvent() != null) {
-                    if (!this.getClickEvent().equals(ln3.getClickEvent())) {
-                        return false;
-                    }
-                }
-                else if (ln3.getClickEvent() != null) {
-                    return false;
-                }
-                if (this.getHoverEvent() != null) {
-                    if (!this.getHoverEvent().equals(ln3.getHoverEvent())) {
-                        return false;
-                    }
-                }
-                else if (ln3.getHoverEvent() != null) {
-                    return false;
-                }
-                if ((this.getInsertion() == null) ? (ln3.getInsertion() == null) : this.getInsertion().equals(ln3.getInsertion())) {
-                    return true;
-                }
-            }
-            return false;
+            final Style nb3 = (Style)object;
+            return this.isBold() == nb3.isBold() && Objects.equals(this.getColor(), nb3.getColor()) && this.isItalic() == nb3.isItalic() && this.isObfuscated() == nb3.isObfuscated() && this.isStrikethrough() == nb3.isStrikethrough() && this.isUnderlined() == nb3.isUnderlined() && Objects.equals(this.getClickEvent(), nb3.getClickEvent()) && Objects.equals(this.getHoverEvent(), nb3.getHoverEvent()) && Objects.equals(this.getInsertion(), nb3.getInsertion()) && Objects.equals(this.getFont(), nb3.getFont());
         }
         return false;
     }
@@ -196,151 +289,9 @@ public class Style {
         return Objects.hash(this.color, this.bold, this.italic, this.underlined, this.strikethrough, this.obfuscated, this.clickEvent, this.hoverEvent, this.insertion);
     }
     
-    public Style copy() {
-        final Style ln2 = new Style();
-        ln2.bold = this.bold;
-        ln2.italic = this.italic;
-        ln2.strikethrough = this.strikethrough;
-        ln2.underlined = this.underlined;
-        ln2.obfuscated = this.obfuscated;
-        ln2.color = this.color;
-        ln2.clickEvent = this.clickEvent;
-        ln2.hoverEvent = this.hoverEvent;
-        ln2.parent = this.parent;
-        ln2.insertion = this.insertion;
-        return ln2;
-    }
-    
-    public Style flatCopy() {
-        final Style ln2 = new Style();
-        ln2.setBold(this.isBold());
-        ln2.setItalic(this.isItalic());
-        ln2.setStrikethrough(this.isStrikethrough());
-        ln2.setUnderlined(this.isUnderlined());
-        ln2.setObfuscated(this.isObfuscated());
-        ln2.setColor(this.getColor());
-        ln2.setClickEvent(this.getClickEvent());
-        ln2.setHoverEvent(this.getHoverEvent());
-        ln2.setInsertion(this.getInsertion());
-        return ln2;
-    }
-    
     static {
-        ROOT = new Style() {
-            @Nullable
-            @Override
-            public ChatFormatting getColor() {
-                return null;
-            }
-            
-            @Override
-            public boolean isBold() {
-                return false;
-            }
-            
-            @Override
-            public boolean isItalic() {
-                return false;
-            }
-            
-            @Override
-            public boolean isStrikethrough() {
-                return false;
-            }
-            
-            @Override
-            public boolean isUnderlined() {
-                return false;
-            }
-            
-            @Override
-            public boolean isObfuscated() {
-                return false;
-            }
-            
-            @Nullable
-            @Override
-            public ClickEvent getClickEvent() {
-                return null;
-            }
-            
-            @Nullable
-            @Override
-            public HoverEvent getHoverEvent() {
-                return null;
-            }
-            
-            @Nullable
-            @Override
-            public String getInsertion() {
-                return null;
-            }
-            
-            @Override
-            public Style setColor(final ChatFormatting g) {
-                throw new UnsupportedOperationException();
-            }
-            
-            @Override
-            public Style setBold(final Boolean boolean1) {
-                throw new UnsupportedOperationException();
-            }
-            
-            @Override
-            public Style setItalic(final Boolean boolean1) {
-                throw new UnsupportedOperationException();
-            }
-            
-            @Override
-            public Style setStrikethrough(final Boolean boolean1) {
-                throw new UnsupportedOperationException();
-            }
-            
-            @Override
-            public Style setUnderlined(final Boolean boolean1) {
-                throw new UnsupportedOperationException();
-            }
-            
-            @Override
-            public Style setObfuscated(final Boolean boolean1) {
-                throw new UnsupportedOperationException();
-            }
-            
-            @Override
-            public Style setClickEvent(final ClickEvent le) {
-                throw new UnsupportedOperationException();
-            }
-            
-            @Override
-            public Style setHoverEvent(final HoverEvent li) {
-                throw new UnsupportedOperationException();
-            }
-            
-            @Override
-            public Style inheritFrom(final Style ln) {
-                throw new UnsupportedOperationException();
-            }
-            
-            @Override
-            public String toString() {
-                return "Style.ROOT";
-            }
-            
-            @Override
-            public Style copy() {
-                return this;
-            }
-            
-            @Override
-            public Style flatCopy() {
-                return this;
-            }
-            
-            @Override
-            public String getLegacyFormatCodes() {
-                return "";
-            }
-        };
+        DEFAULT_FONT = new ResourceLocation("minecraft", "default");
+        EMPTY = new Style(null, null, null, null, null, null, null, null, null, null);
     }
     
     public static class Serializer implements JsonDeserializer<Style>, JsonSerializer<Style> {
@@ -350,92 +301,124 @@ public class Style {
             if (!jsonElement.isJsonObject()) {
                 return null;
             }
-            final Style ln5 = new Style();
-            final JsonObject jsonObject6 = jsonElement.getAsJsonObject();
-            if (jsonObject6 == null) {
+            final JsonObject jsonObject5 = jsonElement.getAsJsonObject();
+            if (jsonObject5 == null) {
                 return null;
             }
-            if (jsonObject6.has("bold")) {
-                ln5.bold = jsonObject6.get("bold").getAsBoolean();
-            }
-            if (jsonObject6.has("italic")) {
-                ln5.italic = jsonObject6.get("italic").getAsBoolean();
-            }
-            if (jsonObject6.has("underlined")) {
-                ln5.underlined = jsonObject6.get("underlined").getAsBoolean();
-            }
-            if (jsonObject6.has("strikethrough")) {
-                ln5.strikethrough = jsonObject6.get("strikethrough").getAsBoolean();
-            }
-            if (jsonObject6.has("obfuscated")) {
-                ln5.obfuscated = jsonObject6.get("obfuscated").getAsBoolean();
-            }
-            if (jsonObject6.has("color")) {
-                ln5.color = jsonDeserializationContext.<ChatFormatting>deserialize(jsonObject6.get("color"), ChatFormatting.class);
-            }
-            if (jsonObject6.has("insertion")) {
-                ln5.insertion = jsonObject6.get("insertion").getAsString();
-            }
-            if (jsonObject6.has("clickEvent")) {
-                final JsonObject jsonObject7 = GsonHelper.getAsJsonObject(jsonObject6, "clickEvent");
-                final String string8 = GsonHelper.getAsString(jsonObject7, "action", null);
-                final ClickEvent.Action a9 = (string8 == null) ? null : ClickEvent.Action.getByName(string8);
-                final String string9 = GsonHelper.getAsString(jsonObject7, "value", null);
-                if (a9 != null && string9 != null && a9.isAllowedFromServer()) {
-                    ln5.clickEvent = new ClickEvent(a9, string9);
+            final Boolean boolean6 = getOptionalFlag(jsonObject5, "bold");
+            final Boolean boolean7 = getOptionalFlag(jsonObject5, "italic");
+            final Boolean boolean8 = getOptionalFlag(jsonObject5, "underlined");
+            final Boolean boolean9 = getOptionalFlag(jsonObject5, "strikethrough");
+            final Boolean boolean10 = getOptionalFlag(jsonObject5, "obfuscated");
+            final TextColor nc11 = getTextColor(jsonObject5);
+            final String string12 = getInsertion(jsonObject5);
+            final ClickEvent mp13 = getClickEvent(jsonObject5);
+            final HoverEvent mv14 = getHoverEvent(jsonObject5);
+            final ResourceLocation uh15 = getFont(jsonObject5);
+            return new Style(nc11, boolean6, boolean7, boolean8, boolean9, boolean10, mp13, mv14, string12, uh15, null);
+        }
+        
+        @Nullable
+        private static ResourceLocation getFont(final JsonObject jsonObject) {
+            if (jsonObject.has("font")) {
+                final String string2 = GsonHelper.getAsString(jsonObject, "font");
+                try {
+                    return new ResourceLocation(string2);
+                }
+                catch (ResourceLocationException t3) {
+                    throw new JsonSyntaxException("Invalid font name: " + string2);
                 }
             }
-            if (jsonObject6.has("hoverEvent")) {
-                final JsonObject jsonObject7 = GsonHelper.getAsJsonObject(jsonObject6, "hoverEvent");
-                final String string8 = GsonHelper.getAsString(jsonObject7, "action", null);
-                final HoverEvent.Action a10 = (string8 == null) ? null : HoverEvent.Action.getByName(string8);
-                final Component lf10 = jsonDeserializationContext.<Component>deserialize(jsonObject7.get("value"), Component.class);
-                if (a10 != null && lf10 != null && a10.isAllowedFromServer()) {
-                    ln5.hoverEvent = new HoverEvent(a10, lf10);
+            return null;
+        }
+        
+        @Nullable
+        private static HoverEvent getHoverEvent(final JsonObject jsonObject) {
+            if (jsonObject.has("hoverEvent")) {
+                final JsonObject jsonObject2 = GsonHelper.getAsJsonObject(jsonObject, "hoverEvent");
+                final HoverEvent mv3 = HoverEvent.deserialize(jsonObject2);
+                if (mv3 != null && mv3.getAction().isAllowedFromServer()) {
+                    return mv3;
                 }
             }
-            return ln5;
+            return null;
+        }
+        
+        @Nullable
+        private static ClickEvent getClickEvent(final JsonObject jsonObject) {
+            if (jsonObject.has("clickEvent")) {
+                final JsonObject jsonObject2 = GsonHelper.getAsJsonObject(jsonObject, "clickEvent");
+                final String string3 = GsonHelper.getAsString(jsonObject2, "action", null);
+                final ClickEvent.Action a4 = (string3 == null) ? null : ClickEvent.Action.getByName(string3);
+                final String string4 = GsonHelper.getAsString(jsonObject2, "value", null);
+                if (a4 != null && string4 != null && a4.isAllowedFromServer()) {
+                    return new ClickEvent(a4, string4);
+                }
+            }
+            return null;
+        }
+        
+        @Nullable
+        private static String getInsertion(final JsonObject jsonObject) {
+            return GsonHelper.getAsString(jsonObject, "insertion", null);
+        }
+        
+        @Nullable
+        private static TextColor getTextColor(final JsonObject jsonObject) {
+            if (jsonObject.has("color")) {
+                final String string2 = GsonHelper.getAsString(jsonObject, "color");
+                return TextColor.parseColor(string2);
+            }
+            return null;
+        }
+        
+        @Nullable
+        private static Boolean getOptionalFlag(final JsonObject jsonObject, final String string) {
+            if (jsonObject.has(string)) {
+                return jsonObject.get(string).getAsBoolean();
+            }
+            return null;
         }
         
         @Nullable
         @Override
-        public JsonElement serialize(final Style ln, final Type type, final JsonSerializationContext jsonSerializationContext) {
-            if (ln.isEmpty()) {
+        public JsonElement serialize(final Style nb, final Type type, final JsonSerializationContext jsonSerializationContext) {
+            if (nb.isEmpty()) {
                 return null;
             }
             final JsonObject jsonObject5 = new JsonObject();
-            if (ln.bold != null) {
-                jsonObject5.addProperty("bold", ln.bold);
+            if (nb.bold != null) {
+                jsonObject5.addProperty("bold", nb.bold);
             }
-            if (ln.italic != null) {
-                jsonObject5.addProperty("italic", ln.italic);
+            if (nb.italic != null) {
+                jsonObject5.addProperty("italic", nb.italic);
             }
-            if (ln.underlined != null) {
-                jsonObject5.addProperty("underlined", ln.underlined);
+            if (nb.underlined != null) {
+                jsonObject5.addProperty("underlined", nb.underlined);
             }
-            if (ln.strikethrough != null) {
-                jsonObject5.addProperty("strikethrough", ln.strikethrough);
+            if (nb.strikethrough != null) {
+                jsonObject5.addProperty("strikethrough", nb.strikethrough);
             }
-            if (ln.obfuscated != null) {
-                jsonObject5.addProperty("obfuscated", ln.obfuscated);
+            if (nb.obfuscated != null) {
+                jsonObject5.addProperty("obfuscated", nb.obfuscated);
             }
-            if (ln.color != null) {
-                jsonObject5.add("color", jsonSerializationContext.serialize(ln.color));
+            if (nb.color != null) {
+                jsonObject5.addProperty("color", nb.color.serialize());
             }
-            if (ln.insertion != null) {
-                jsonObject5.add("insertion", jsonSerializationContext.serialize(ln.insertion));
+            if (nb.insertion != null) {
+                jsonObject5.add("insertion", jsonSerializationContext.serialize(nb.insertion));
             }
-            if (ln.clickEvent != null) {
+            if (nb.clickEvent != null) {
                 final JsonObject jsonObject6 = new JsonObject();
-                jsonObject6.addProperty("action", ln.clickEvent.getAction().getName());
-                jsonObject6.addProperty("value", ln.clickEvent.getValue());
+                jsonObject6.addProperty("action", nb.clickEvent.getAction().getName());
+                jsonObject6.addProperty("value", nb.clickEvent.getValue());
                 jsonObject5.add("clickEvent", jsonObject6);
             }
-            if (ln.hoverEvent != null) {
-                final JsonObject jsonObject6 = new JsonObject();
-                jsonObject6.addProperty("action", ln.hoverEvent.getAction().getName());
-                jsonObject6.add("value", jsonSerializationContext.serialize(ln.hoverEvent.getValue()));
-                jsonObject5.add("hoverEvent", jsonObject6);
+            if (nb.hoverEvent != null) {
+                jsonObject5.add("hoverEvent", nb.hoverEvent.serialize());
+            }
+            if (nb.font != null) {
+                jsonObject5.addProperty("font", nb.font.toString());
             }
             return jsonObject5;
         }
diff --git a/src/net/minecraft/network/chat/TextColor.java b/src/net/minecraft/network/chat/TextColor.java
new file mode 100644
index 0000000..6d2840b
--- /dev/null
+++ b/src/net/minecraft/network/chat/TextColor.java
@@ -0,0 +1,93 @@
+package net.minecraft.network.chat;
+
+import java.util.stream.Collector;
+import com.google.common.collect.ImmutableMap;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import java.util.Objects;
+import javax.annotation.Nullable;
+import net.minecraft.ChatFormatting;
+import java.util.Map;
+
+public final class TextColor {
+    private static final Map<ChatFormatting, TextColor> LEGACY_FORMAT_TO_COLOR;
+    private static final Map<String, TextColor> NAMED_COLORS;
+    private final int value;
+    @Nullable
+    private final String name;
+    
+    private TextColor(final int integer, final String string) {
+        this.value = integer;
+        this.name = string;
+    }
+    
+    private TextColor(final int integer) {
+        this.value = integer;
+        this.name = null;
+    }
+    
+    public int getValue() {
+        return this.value;
+    }
+    
+    public String serialize() {
+        if (this.name != null) {
+            return this.name;
+        }
+        return this.formatValue();
+    }
+    
+    private String formatValue() {
+        return String.format("#%06X", this.value);
+    }
+    
+    @Override
+    public boolean equals(final Object object) {
+        if (this == object) {
+            return true;
+        }
+        if (object == null || this.getClass() != object.getClass()) {
+            return false;
+        }
+        final TextColor nc3 = (TextColor)object;
+        return this.value == nc3.value;
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.value, this.name);
+    }
+    
+    @Override
+    public String toString() {
+        return (this.name != null) ? this.name : this.formatValue();
+    }
+    
+    @Nullable
+    public static TextColor fromLegacyFormat(final ChatFormatting i) {
+        return TextColor.LEGACY_FORMAT_TO_COLOR.get(i);
+    }
+    
+    public static TextColor fromRgb(final int integer) {
+        return new TextColor(integer);
+    }
+    
+    @Nullable
+    public static TextColor parseColor(final String string) {
+        if (string.startsWith("#")) {
+            try {
+                final int integer2 = Integer.parseInt(string.substring(1), 16);
+                return fromRgb(integer2);
+            }
+            catch (NumberFormatException numberFormatException2) {
+                return null;
+            }
+        }
+        return TextColor.NAMED_COLORS.get(string);
+    }
+    
+    static {
+        LEGACY_FORMAT_TO_COLOR = Stream.<ChatFormatting>of(ChatFormatting.values()).filter(ChatFormatting::isColor).collect(ImmutableMap.toImmutableMap(Function.identity(), i -> new TextColor(i.getColor(), i.getName())));
+        NAMED_COLORS = TextColor.LEGACY_FORMAT_TO_COLOR.values().stream().collect(ImmutableMap.toImmutableMap(nc -> nc.name, Function.identity()));
+    }
+}
diff --git a/src/net/minecraft/network/chat/TextComponent.java b/src/net/minecraft/network/chat/TextComponent.java
index fe5fe42..3017138 100644
--- a/src/net/minecraft/network/chat/TextComponent.java
+++ b/src/net/minecraft/network/chat/TextComponent.java
@@ -1,10 +1,18 @@
 package net.minecraft.network.chat;
 
+import javax.annotation.Nullable;
+import net.minecraft.locale.Language;
+
 public class TextComponent extends BaseComponent {
+    public static final Component EMPTY;
     private final String text;
+    @Nullable
+    private Language decomposedWith;
+    private String reorderedText;
     
     public TextComponent(final String string) {
         this.text = string;
+        this.reorderedText = string;
     }
     
     public String getText() {
@@ -13,11 +21,19 @@ public class TextComponent extends BaseComponent {
     
     @Override
     public String getContents() {
-        return this.text;
+        if (this.text.isEmpty()) {
+            return this.text;
+        }
+        final Language kz2 = Language.getInstance();
+        if (this.decomposedWith != kz2) {
+            this.reorderedText = kz2.reorder(this.text, false);
+            this.decomposedWith = kz2;
+        }
+        return this.reorderedText;
     }
     
     @Override
-    public TextComponent copy() {
+    public TextComponent plainCopy() {
         return new TextComponent(this.text);
     }
     
@@ -27,8 +43,8 @@ public class TextComponent extends BaseComponent {
             return true;
         }
         if (object instanceof TextComponent) {
-            final TextComponent lo3 = (TextComponent)object;
-            return this.text.equals(lo3.getText()) && super.equals(object);
+            final TextComponent nd3 = (TextComponent)object;
+            return this.text.equals(nd3.getText()) && super.equals(object);
         }
         return false;
     }
@@ -37,4 +53,8 @@ public class TextComponent extends BaseComponent {
     public String toString() {
         return "TextComponent{text='" + this.text + '\'' + ", siblings=" + this.siblings + ", style=" + this.getStyle() + '}';
     }
+    
+    static {
+        EMPTY = new TextComponent("");
+    }
 }
diff --git a/src/net/minecraft/network/chat/TranslatableComponent.java b/src/net/minecraft/network/chat/TranslatableComponent.java
index 7b3d049..17062f1 100644
--- a/src/net/minecraft/network/chat/TranslatableComponent.java
+++ b/src/net/minecraft/network/chat/TranslatableComponent.java
@@ -3,181 +3,148 @@ package net.minecraft.network.chat;
 import java.util.Arrays;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.world.entity.Entity;
-import javax.annotation.Nullable;
 import net.minecraft.commands.CommandSourceStack;
-import java.util.function.Function;
-import com.google.common.collect.Streams;
-import java.util.stream.Stream;
 import java.util.Iterator;
+import java.util.Optional;
 import java.util.regex.Matcher;
-import java.util.IllegalFormatException;
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import java.util.regex.Pattern;
 import java.util.List;
+import javax.annotation.Nullable;
 import net.minecraft.locale.Language;
 
 public class TranslatableComponent extends BaseComponent implements ContextAwareComponent {
-    private static final Language DEFAULT_LANGUAGE;
-    private static final Language LANGUAGE;
+    private static final Object[] NO_ARGS;
+    private static final FormattedText TEXT_PERCENT;
+    private static final FormattedText TEXT_NULL;
     private final String key;
     private final Object[] args;
-    private final Object decomposeLock;
-    private long decomposedLanguageTime;
-    protected final List<Component> decomposedParts;
-    public static final Pattern FORMAT_PATTERN;
+    @Nullable
+    private Language decomposedWith;
+    private final List<FormattedText> decomposedParts;
+    private static final Pattern FORMAT_PATTERN;
+    
+    public TranslatableComponent(final String string) {
+        this.decomposedParts = Lists.newArrayList();
+        this.key = string;
+        this.args = TranslatableComponent.NO_ARGS;
+    }
     
     public TranslatableComponent(final String string, final Object... arr) {
-        this.decomposeLock = new Object();
-        this.decomposedLanguageTime = -1L;
         this.decomposedParts = Lists.newArrayList();
         this.key = string;
         this.args = arr;
-        for (int integer4 = 0; integer4 < arr.length; ++integer4) {
-            final Object object5 = arr[integer4];
-            if (object5 instanceof Component) {
-                final Component lf6 = ((Component)object5).deepCopy();
-                this.args[integer4] = lf6;
-                lf6.getStyle().inheritFrom(this.getStyle());
-            }
-            else if (object5 == null) {
-                this.args[integer4] = "null";
-            }
+    }
+    
+    private void decompose() {
+        final Language kz2 = Language.getInstance();
+        if (kz2 == this.decomposedWith) {
+            return;
+        }
+        this.decomposedWith = kz2;
+        this.decomposedParts.clear();
+        final String string3 = kz2.getOrDefault(this.key);
+        try {
+            this.decomposeTemplate(kz2.reorder(string3, true), kz2);
+        }
+        catch (TranslatableFormatException nf4) {
+            this.decomposedParts.clear();
+            this.decomposedParts.add(FormattedText.of(string3));
         }
     }
     
-    @VisibleForTesting
-    synchronized void decompose() {
-        synchronized (this.decomposeLock) {
-            final long long3 = TranslatableComponent.LANGUAGE.getLastUpdateTime();
-            if (long3 == this.decomposedLanguageTime) {
-                return;
-            }
-            this.decomposedLanguageTime = long3;
-            this.decomposedParts.clear();
-        }
-        final String string2 = TranslatableComponent.LANGUAGE.getElement(this.key);
+    private void decomposeTemplate(final String string, final Language kz) {
+        final Matcher matcher4 = TranslatableComponent.FORMAT_PATTERN.matcher(string);
         try {
-            this.decomposeTemplate(string2);
-        }
-        catch (TranslatableFormatException lq3) {
-            this.decomposedParts.clear();
-            this.decomposedParts.add(new TextComponent(string2));
-        }
-    }
-    
-    protected void decomposeTemplate(final String string) {
-        final Matcher matcher3 = TranslatableComponent.FORMAT_PATTERN.matcher(string);
-        try {
-            int integer4 = 0;
-            int integer5;
-            int integer7;
-            for (integer5 = 0; matcher3.find(integer5); integer5 = integer7) {
-                final int integer6 = matcher3.start();
-                integer7 = matcher3.end();
-                if (integer6 > integer5) {
-                    final Component lf8 = new TextComponent(String.format(string.substring(integer5, integer6)));
-                    lf8.getStyle().inheritFrom(this.getStyle());
-                    this.decomposedParts.add(lf8);
+            int integer5 = 0;
+            int integer6;
+            int integer8;
+            for (integer6 = 0; matcher4.find(integer6); integer6 = integer8) {
+                final int integer7 = matcher4.start();
+                integer8 = matcher4.end();
+                if (integer7 > integer6) {
+                    final String string2 = string.substring(integer6, integer7);
+                    if (string2.indexOf(37) != -1) {
+                        throw new IllegalArgumentException();
+                    }
+                    this.decomposedParts.add(FormattedText.of(string2));
                 }
-                final String string2 = matcher3.group(2);
-                final String string3 = string.substring(integer6, integer7);
+                final String string2 = matcher4.group(2);
+                final String string3 = string.substring(integer7, integer8);
                 if ("%".equals(string2) && "%%".equals(string3)) {
-                    final Component lf9 = new TextComponent("%");
-                    lf9.getStyle().inheritFrom(this.getStyle());
-                    this.decomposedParts.add(lf9);
+                    this.decomposedParts.add(TranslatableComponent.TEXT_PERCENT);
                 }
                 else {
                     if (!"s".equals(string2)) {
                         throw new TranslatableFormatException(this, "Unsupported format: '" + string3 + "'");
                     }
-                    final String string4 = matcher3.group(1);
-                    final int integer8 = (string4 != null) ? (Integer.parseInt(string4) - 1) : integer4++;
-                    if (integer8 < this.args.length) {
-                        this.decomposedParts.add(this.getComponent(integer8));
+                    final String string4 = matcher4.group(1);
+                    final int integer9 = (string4 != null) ? (Integer.parseInt(string4) - 1) : integer5++;
+                    if (integer9 < this.args.length) {
+                        this.decomposedParts.add(this.getArgument(integer9, kz));
                     }
                 }
             }
-            if (integer5 < string.length()) {
-                final Component lf10 = new TextComponent(String.format(string.substring(integer5)));
-                lf10.getStyle().inheritFrom(this.getStyle());
-                this.decomposedParts.add(lf10);
+            if (integer6 < string.length()) {
+                final String string5 = string.substring(integer6);
+                if (string5.indexOf(37) != -1) {
+                    throw new IllegalArgumentException();
+                }
+                this.decomposedParts.add(FormattedText.of(string5));
             }
         }
-        catch (IllegalFormatException illegalFormatException4) {
-            throw new TranslatableFormatException(this, illegalFormatException4);
+        catch (IllegalArgumentException illegalArgumentException5) {
+            throw new TranslatableFormatException(this, illegalArgumentException5);
         }
     }
     
-    private Component getComponent(final int integer) {
+    private FormattedText getArgument(final int integer, final Language kz) {
         if (integer >= this.args.length) {
             throw new TranslatableFormatException(this, integer);
         }
-        final Object object3 = this.args[integer];
-        Component lf4;
-        if (object3 instanceof Component) {
-            lf4 = (Component)object3;
+        final Object object4 = this.args[integer];
+        if (object4 instanceof Component) {
+            return (Component)object4;
         }
-        else {
-            lf4 = new TextComponent((object3 == null) ? "null" : object3.toString());
-            lf4.getStyle().inheritFrom(this.getStyle());
-        }
-        return lf4;
+        return (object4 == null) ? TranslatableComponent.TEXT_NULL : FormattedText.of(kz.reorder(object4.toString(), false));
     }
     
     @Override
-    public Component setStyle(final Style ln) {
-        super.setStyle(ln);
-        for (final Object object6 : this.args) {
-            if (object6 instanceof Component) {
-                ((Component)object6).getStyle().inheritFrom(this.getStyle());
-            }
-        }
-        if (this.decomposedLanguageTime > -1L) {
-            for (final Component lf4 : this.decomposedParts) {
-                lf4.getStyle().inheritFrom(ln);
-            }
-        }
-        return this;
+    public TranslatableComponent plainCopy() {
+        return new TranslatableComponent(this.key, this.args);
     }
     
     @Override
-    public Stream<Component> stream() {
+    public <T> Optional<T> visitSelf(final FormattedText.StyledContentConsumer<T> b, final Style nb) {
         this.decompose();
-        return Streams.concat(new Stream[] { this.decomposedParts.stream(), this.siblings.stream() }).<Component>flatMap(Component::stream);
+        for (final FormattedText mu5 : this.decomposedParts) {
+            final Optional<T> optional6 = mu5.<T>visit(b, nb);
+            if (optional6.isPresent()) {
+                return optional6;
+            }
+        }
+        return Optional.<T>empty();
     }
     
     @Override
-    public String getContents() {
+    public <T> Optional<T> visitSelf(final FormattedText.ContentConsumer<T> a) {
         this.decompose();
-        final StringBuilder stringBuilder2 = new StringBuilder();
-        for (final Component lf4 : this.decomposedParts) {
-            stringBuilder2.append(lf4.getContents());
+        for (final FormattedText mu4 : this.decomposedParts) {
+            final Optional<T> optional5 = mu4.<T>visit(a);
+            if (optional5.isPresent()) {
+                return optional5;
+            }
         }
-        return stringBuilder2.toString();
+        return Optional.<T>empty();
     }
     
     @Override
-    public TranslatableComponent copy() {
-        final Object[] arr2 = new Object[this.args.length];
-        for (int integer3 = 0; integer3 < this.args.length; ++integer3) {
-            if (this.args[integer3] instanceof Component) {
-                arr2[integer3] = ((Component)this.args[integer3]).deepCopy();
-            }
-            else {
-                arr2[integer3] = this.args[integer3];
-            }
-        }
-        return new TranslatableComponent(this.key, arr2);
-    }
-    
-    @Override
-    public Component resolve(@Nullable final CommandSourceStack cq, @Nullable final Entity akq, final int integer) throws CommandSyntaxException {
+    public MutableComponent resolve(@Nullable final CommandSourceStack cz, @Nullable final Entity aom, final int integer) throws CommandSyntaxException {
         final Object[] arr5 = new Object[this.args.length];
         for (int integer2 = 0; integer2 < arr5.length; ++integer2) {
             final Object object7 = this.args[integer2];
             if (object7 instanceof Component) {
-                arr5[integer2] = ComponentUtils.updateForEntity(cq, (Component)object7, akq, integer);
+                arr5[integer2] = ComponentUtils.updateForEntity(cz, (Component)object7, aom, integer);
             }
             else {
                 arr5[integer2] = object7;
@@ -192,8 +159,8 @@ public class TranslatableComponent extends BaseComponent implements ContextAware
             return true;
         }
         if (object instanceof TranslatableComponent) {
-            final TranslatableComponent lp3 = (TranslatableComponent)object;
-            return Arrays.equals(this.args, lp3.args) && this.key.equals(lp3.key) && super.equals(object);
+            final TranslatableComponent ne3 = (TranslatableComponent)object;
+            return Arrays.equals(this.args, ne3.args) && this.key.equals(ne3.key) && super.equals(object);
         }
         return false;
     }
@@ -220,8 +187,9 @@ public class TranslatableComponent extends BaseComponent implements ContextAware
     }
     
     static {
-        DEFAULT_LANGUAGE = new Language();
-        LANGUAGE = Language.getInstance();
+        NO_ARGS = new Object[0];
+        TEXT_PERCENT = FormattedText.of("%");
+        TEXT_NULL = FormattedText.of("null");
         FORMAT_PATTERN = Pattern.compile("%(?:(\\d+)\\$)?([A-Za-z%]|$)");
     }
 }
diff --git a/src/net/minecraft/network/chat/TranslatableFormatException.java b/src/net/minecraft/network/chat/TranslatableFormatException.java
index 336c0df..3f7622d 100644
--- a/src/net/minecraft/network/chat/TranslatableFormatException.java
+++ b/src/net/minecraft/network/chat/TranslatableFormatException.java
@@ -1,15 +1,15 @@
 package net.minecraft.network.chat;
 
 public class TranslatableFormatException extends IllegalArgumentException {
-    public TranslatableFormatException(final TranslatableComponent lp, final String string) {
-        super(String.format("Error parsing: %s: %s", lp, string));
+    public TranslatableFormatException(final TranslatableComponent ne, final String string) {
+        super(String.format("Error parsing: %s: %s", ne, string));
     }
     
-    public TranslatableFormatException(final TranslatableComponent lp, final int integer) {
-        super(String.format("Invalid index %d requested for %s", integer, lp));
+    public TranslatableFormatException(final TranslatableComponent ne, final int integer) {
+        super(String.format("Invalid index %d requested for %s", integer, ne));
     }
     
-    public TranslatableFormatException(final TranslatableComponent lp, final Throwable throwable) {
-        super(String.format("Error while parsing: %s", lp), throwable);
+    public TranslatableFormatException(final TranslatableComponent ne, final Throwable throwable) {
+        super(String.format("Error while parsing: %s", ne), throwable);
     }
 }
diff --git a/src/net/minecraft/network/protocol/Packet.java b/src/net/minecraft/network/protocol/Packet.java
index 0a84b86..f816e80 100644
--- a/src/net/minecraft/network/protocol/Packet.java
+++ b/src/net/minecraft/network/protocol/Packet.java
@@ -5,11 +5,11 @@ import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.PacketListener;
 
 public interface Packet<T extends PacketListener> {
-    void read(final FriendlyByteBuf kv) throws IOException;
+    void read(final FriendlyByteBuf mg) throws IOException;
     
-    void write(final FriendlyByteBuf kv) throws IOException;
+    void write(final FriendlyByteBuf mg) throws IOException;
     
-    void handle(final T ky);
+    void handle(final T mj);
     
     default boolean isSkippable() {
         return false;
diff --git a/src/net/minecraft/network/protocol/PacketUtils.java b/src/net/minecraft/network/protocol/PacketUtils.java
index 8150ef0..07ccb8a 100644
--- a/src/net/minecraft/network/protocol/PacketUtils.java
+++ b/src/net/minecraft/network/protocol/PacketUtils.java
@@ -10,18 +10,18 @@ import org.apache.logging.log4j.Logger;
 public class PacketUtils {
     private static final Logger LOGGER;
     
-    public static <T extends PacketListener> void ensureRunningOnSameThread(final Packet<T> lt, final T ky, final ServerLevel xd) throws RunningOnDifferentThreadException {
-        PacketUtils.<T>ensureRunningOnSameThread(lt, ky, xd.getServer());
+    public static <T extends PacketListener> void ensureRunningOnSameThread(final Packet<T> ni, final T mj, final ServerLevel zd) throws RunningOnDifferentThreadException {
+        PacketUtils.<T>ensureRunningOnSameThread(ni, mj, zd.getServer());
     }
     
-    public static <T extends PacketListener> void ensureRunningOnSameThread(final Packet<T> lt, final T ky, final BlockableEventLoop<?> ais) throws RunningOnDifferentThreadException {
-        if (!ais.isSameThread()) {
-            ais.execute(() -> {
-                if (ky.getConnection().isConnected()) {
-                    lt.handle(ky);
+    public static <T extends PacketListener> void ensureRunningOnSameThread(final Packet<T> ni, final T mj, final BlockableEventLoop<?> amn) throws RunningOnDifferentThreadException {
+        if (!amn.isSameThread()) {
+            amn.execute(() -> {
+                if (mj.getConnection().isConnected()) {
+                    ni.handle(mj);
                 }
                 else {
-                    PacketUtils.LOGGER.debug("Ignoring packet due to disconnection: " + lt);
+                    PacketUtils.LOGGER.debug("Ignoring packet due to disconnection: " + ni);
                 }
                 return;
             });
diff --git a/src/net/minecraft/network/protocol/game/ClientGamePacketListener.java b/src/net/minecraft/network/protocol/game/ClientGamePacketListener.java
index 46881b3..60c1470 100644
--- a/src/net/minecraft/network/protocol/game/ClientGamePacketListener.java
+++ b/src/net/minecraft/network/protocol/game/ClientGamePacketListener.java
@@ -3,183 +3,181 @@ package net.minecraft.network.protocol.game;
 import net.minecraft.network.PacketListener;
 
 public interface ClientGamePacketListener extends PacketListener {
-    void handleAddEntity(final ClientboundAddEntityPacket lx);
+    void handleAddEntity(final ClientboundAddEntityPacket nm);
     
-    void handleAddExperienceOrb(final ClientboundAddExperienceOrbPacket ly);
+    void handleAddExperienceOrb(final ClientboundAddExperienceOrbPacket nn);
     
-    void handleAddGlobalEntity(final ClientboundAddGlobalEntityPacket lz);
+    void handleAddMob(final ClientboundAddMobPacket no);
     
-    void handleAddMob(final ClientboundAddMobPacket ma);
+    void handleAddObjective(final ClientboundSetObjectivePacket qf);
     
-    void handleAddObjective(final ClientboundSetObjectivePacket oq);
+    void handleAddPainting(final ClientboundAddPaintingPacket np);
     
-    void handleAddPainting(final ClientboundAddPaintingPacket mb);
+    void handleAddPlayer(final ClientboundAddPlayerPacket nq);
     
-    void handleAddPlayer(final ClientboundAddPlayerPacket mc);
+    void handleAnimate(final ClientboundAnimatePacket nr);
     
-    void handleAnimate(final ClientboundAnimatePacket md);
+    void handleAwardStats(final ClientboundAwardStatsPacket ns);
     
-    void handleAwardStats(final ClientboundAwardStatsPacket me);
+    void handleAddOrRemoveRecipes(final ClientboundRecipePacket pl);
     
-    void handleAddOrRemoveRecipes(final ClientboundRecipePacket nx);
+    void handleBlockDestruction(final ClientboundBlockDestructionPacket nu);
     
-    void handleBlockDestruction(final ClientboundBlockDestructionPacket mg);
+    void handleOpenSignEditor(final ClientboundOpenSignEditorPacket pe);
     
-    void handleOpenSignEditor(final ClientboundOpenSignEditorPacket nq);
+    void handleBlockEntityData(final ClientboundBlockEntityDataPacket nv);
     
-    void handleBlockEntityData(final ClientboundBlockEntityDataPacket mh);
+    void handleBlockEvent(final ClientboundBlockEventPacket nw);
     
-    void handleBlockEvent(final ClientboundBlockEventPacket mi);
+    void handleBlockUpdate(final ClientboundBlockUpdatePacket nx);
     
-    void handleBlockUpdate(final ClientboundBlockUpdatePacket mj);
+    void handleChat(final ClientboundChatPacket oa);
     
-    void handleChat(final ClientboundChatPacket mm);
+    void handleChunkBlocksUpdate(final ClientboundChunkBlocksUpdatePacket ob);
     
-    void handleChunkBlocksUpdate(final ClientboundChunkBlocksUpdatePacket mn);
+    void handleMapItemData(final ClientboundMapItemDataPacket oy);
     
-    void handleMapItemData(final ClientboundMapItemDataPacket nk);
+    void handleContainerAck(final ClientboundContainerAckPacket oe);
     
-    void handleContainerAck(final ClientboundContainerAckPacket mq);
+    void handleContainerClose(final ClientboundContainerClosePacket of);
     
-    void handleContainerClose(final ClientboundContainerClosePacket mr);
+    void handleContainerContent(final ClientboundContainerSetContentPacket og);
     
-    void handleContainerContent(final ClientboundContainerSetContentPacket ms);
+    void handleHorseScreenOpen(final ClientboundHorseScreenOpenPacket or);
     
-    void handleHorseScreenOpen(final ClientboundHorseScreenOpenPacket nd);
+    void handleContainerSetData(final ClientboundContainerSetDataPacket oh);
     
-    void handleContainerSetData(final ClientboundContainerSetDataPacket mt);
+    void handleContainerSetSlot(final ClientboundContainerSetSlotPacket oi);
     
-    void handleContainerSetSlot(final ClientboundContainerSetSlotPacket mu);
+    void handleCustomPayload(final ClientboundCustomPayloadPacket ok);
     
-    void handleCustomPayload(final ClientboundCustomPayloadPacket mw);
+    void handleDisconnect(final ClientboundDisconnectPacket om);
     
-    void handleDisconnect(final ClientboundDisconnectPacket my);
+    void handleEntityEvent(final ClientboundEntityEventPacket on);
     
-    void handleEntityEvent(final ClientboundEntityEventPacket mz);
+    void handleEntityLinkPacket(final ClientboundSetEntityLinkPacket qa);
     
-    void handleEntityLinkPacket(final ClientboundSetEntityLinkPacket ol);
+    void handleSetEntityPassengersPacket(final ClientboundSetPassengersPacket qg);
     
-    void handleSetEntityPassengersPacket(final ClientboundSetPassengersPacket or);
+    void handleExplosion(final ClientboundExplodePacket oo);
     
-    void handleExplosion(final ClientboundExplodePacket na);
+    void handleGameEvent(final ClientboundGameEventPacket oq);
     
-    void handleGameEvent(final ClientboundGameEventPacket nc);
+    void handleKeepAlive(final ClientboundKeepAlivePacket os);
     
-    void handleKeepAlive(final ClientboundKeepAlivePacket ne);
+    void handleLevelChunk(final ClientboundLevelChunkPacket ot);
     
-    void handleLevelChunk(final ClientboundLevelChunkPacket nf);
+    void handleForgetLevelChunk(final ClientboundForgetLevelChunkPacket op);
     
-    void handleForgetLevelChunk(final ClientboundForgetLevelChunkPacket nb);
+    void handleLevelEvent(final ClientboundLevelEventPacket ou);
     
-    void handleLevelEvent(final ClientboundLevelEventPacket ng);
+    void handleLogin(final ClientboundLoginPacket ox);
     
-    void handleLogin(final ClientboundLoginPacket nj);
+    void handleMoveEntity(final ClientboundMoveEntityPacket pa);
     
-    void handleMoveEntity(final ClientboundMoveEntityPacket nm);
+    void handleMovePlayer(final ClientboundPlayerPositionPacket pk);
     
-    void handleMovePlayer(final ClientboundPlayerPositionPacket nw);
+    void handleParticleEvent(final ClientboundLevelParticlesPacket ov);
     
-    void handleParticleEvent(final ClientboundLevelParticlesPacket nh);
+    void handlePlayerAbilities(final ClientboundPlayerAbilitiesPacket pg);
     
-    void handlePlayerAbilities(final ClientboundPlayerAbilitiesPacket ns);
+    void handlePlayerInfo(final ClientboundPlayerInfoPacket pi);
     
-    void handlePlayerInfo(final ClientboundPlayerInfoPacket nu);
+    void handleRemoveEntity(final ClientboundRemoveEntitiesPacket pm);
     
-    void handleRemoveEntity(final ClientboundRemoveEntitiesPacket ny);
+    void handleRemoveMobEffect(final ClientboundRemoveMobEffectPacket pn);
     
-    void handleRemoveMobEffect(final ClientboundRemoveMobEffectPacket nz);
+    void handleRespawn(final ClientboundRespawnPacket pp);
     
-    void handleRespawn(final ClientboundRespawnPacket ob);
+    void handleRotateMob(final ClientboundRotateHeadPacket pq);
     
-    void handleRotateMob(final ClientboundRotateHeadPacket oc);
+    void handleSetCarriedItem(final ClientboundSetCarriedItemPacket pu);
     
-    void handleSetCarriedItem(final ClientboundSetCarriedItemPacket og);
+    void handleSetDisplayObjective(final ClientboundSetDisplayObjectivePacket py);
     
-    void handleSetDisplayObjective(final ClientboundSetDisplayObjectivePacket oj);
+    void handleSetEntityData(final ClientboundSetEntityDataPacket pz);
     
-    void handleSetEntityData(final ClientboundSetEntityDataPacket ok);
+    void handleSetEntityMotion(final ClientboundSetEntityMotionPacket qb);
     
-    void handleSetEntityMotion(final ClientboundSetEntityMotionPacket om);
+    void handleSetEquipment(final ClientboundSetEquipmentPacket qc);
     
-    void handleSetEquippedItem(final ClientboundSetEquippedItemPacket on);
+    void handleSetExperience(final ClientboundSetExperiencePacket qd);
     
-    void handleSetExperience(final ClientboundSetExperiencePacket oo);
+    void handleSetHealth(final ClientboundSetHealthPacket qe);
     
-    void handleSetHealth(final ClientboundSetHealthPacket op);
+    void handleSetPlayerTeamPacket(final ClientboundSetPlayerTeamPacket qh);
     
-    void handleSetPlayerTeamPacket(final ClientboundSetPlayerTeamPacket os);
+    void handleSetScore(final ClientboundSetScorePacket qi);
     
-    void handleSetScore(final ClientboundSetScorePacket ot);
+    void handleSetSpawn(final ClientboundSetDefaultSpawnPositionPacket px);
     
-    void handleSetSpawn(final ClientboundSetSpawnPositionPacket ou);
+    void handleSetTime(final ClientboundSetTimePacket qj);
     
-    void handleSetTime(final ClientboundSetTimePacket ov);
+    void handleSoundEvent(final ClientboundSoundPacket qm);
     
-    void handleSoundEvent(final ClientboundSoundPacket oy);
+    void handleSoundEntityEvent(final ClientboundSoundEntityPacket ql);
     
-    void handleSoundEntityEvent(final ClientboundSoundEntityPacket ox);
+    void handleCustomSoundEvent(final ClientboundCustomSoundPacket ol);
     
-    void handleCustomSoundEvent(final ClientboundCustomSoundPacket mx);
+    void handleTakeItemEntity(final ClientboundTakeItemEntityPacket qq);
     
-    void handleTakeItemEntity(final ClientboundTakeItemEntityPacket pc);
+    void handleTeleportEntity(final ClientboundTeleportEntityPacket qr);
     
-    void handleTeleportEntity(final ClientboundTeleportEntityPacket pd);
+    void handleUpdateAttributes(final ClientboundUpdateAttributesPacket qt);
     
-    void handleUpdateAttributes(final ClientboundUpdateAttributesPacket pf);
+    void handleUpdateMobEffect(final ClientboundUpdateMobEffectPacket qu);
     
-    void handleUpdateMobEffect(final ClientboundUpdateMobEffectPacket pg);
+    void handleUpdateTags(final ClientboundUpdateTagsPacket qw);
     
-    void handleUpdateTags(final ClientboundUpdateTagsPacket pi);
+    void handlePlayerCombat(final ClientboundPlayerCombatPacket ph);
     
-    void handlePlayerCombat(final ClientboundPlayerCombatPacket nt);
+    void handleChangeDifficulty(final ClientboundChangeDifficultyPacket nz);
     
-    void handleChangeDifficulty(final ClientboundChangeDifficultyPacket ml);
+    void handleSetCamera(final ClientboundSetCameraPacket pt);
     
-    void handleSetCamera(final ClientboundSetCameraPacket of);
+    void handleSetBorder(final ClientboundSetBorderPacket ps);
     
-    void handleSetBorder(final ClientboundSetBorderPacket oe);
+    void handleSetTitles(final ClientboundSetTitlesPacket qk);
     
-    void handleSetTitles(final ClientboundSetTitlesPacket ow);
+    void handleTabListCustomisation(final ClientboundTabListPacket qo);
     
-    void handleTabListCustomisation(final ClientboundTabListPacket pa);
+    void handleResourcePack(final ClientboundResourcePackPacket po);
     
-    void handleResourcePack(final ClientboundResourcePackPacket oa);
+    void handleBossUpdate(final ClientboundBossEventPacket ny);
     
-    void handleBossUpdate(final ClientboundBossEventPacket mk);
+    void handleItemCooldown(final ClientboundCooldownPacket oj);
     
-    void handleItemCooldown(final ClientboundCooldownPacket mv);
+    void handleMoveVehicle(final ClientboundMoveVehiclePacket pb);
     
-    void handleMoveVehicle(final ClientboundMoveVehiclePacket nn);
+    void handleUpdateAdvancementsPacket(final ClientboundUpdateAdvancementsPacket qs);
     
-    void handleUpdateAdvancementsPacket(final ClientboundUpdateAdvancementsPacket pe);
+    void handleSelectAdvancementsTab(final ClientboundSelectAdvancementsTabPacket pr);
     
-    void handleSelectAdvancementsTab(final ClientboundSelectAdvancementsTabPacket od);
+    void handlePlaceRecipe(final ClientboundPlaceGhostRecipePacket pf);
     
-    void handlePlaceRecipe(final ClientboundPlaceGhostRecipePacket nr);
+    void handleCommands(final ClientboundCommandsPacket od);
     
-    void handleCommands(final ClientboundCommandsPacket mp);
+    void handleStopSoundEvent(final ClientboundStopSoundPacket qn);
     
-    void handleStopSoundEvent(final ClientboundStopSoundPacket oz);
+    void handleCommandSuggestions(final ClientboundCommandSuggestionsPacket oc);
     
-    void handleCommandSuggestions(final ClientboundCommandSuggestionsPacket mo);
+    void handleUpdateRecipes(final ClientboundUpdateRecipesPacket qv);
     
-    void handleUpdateRecipes(final ClientboundUpdateRecipesPacket ph);
+    void handleLookAt(final ClientboundPlayerLookAtPacket pj);
     
-    void handleLookAt(final ClientboundPlayerLookAtPacket nv);
+    void handleTagQueryPacket(final ClientboundTagQueryPacket qp);
     
-    void handleTagQueryPacket(final ClientboundTagQueryPacket pb);
+    void handleLightUpdatePacked(final ClientboundLightUpdatePacket ow);
     
-    void handleLightUpdatePacked(final ClientboundLightUpdatePacket ni);
+    void handleOpenBook(final ClientboundOpenBookPacket pc);
     
-    void handleOpenBook(final ClientboundOpenBookPacket no);
+    void handleOpenScreen(final ClientboundOpenScreenPacket pd);
     
-    void handleOpenScreen(final ClientboundOpenScreenPacket np);
+    void handleMerchantOffers(final ClientboundMerchantOffersPacket oz);
     
-    void handleMerchantOffers(final ClientboundMerchantOffersPacket nl);
+    void handleSetChunkCacheRadius(final ClientboundSetChunkCacheRadiusPacket pw);
     
-    void handleSetChunkCacheRadius(final ClientboundSetChunkCacheRadiusPacket oi);
+    void handleSetChunkCacheCenter(final ClientboundSetChunkCacheCenterPacket pv);
     
-    void handleSetChunkCacheCenter(final ClientboundSetChunkCacheCenterPacket oh);
-    
-    void handleBlockBreakAck(final ClientboundBlockBreakAckPacket mf);
+    void handleBlockBreakAck(final ClientboundBlockBreakAckPacket nt);
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundAddEntityPacket.java b/src/net/minecraft/network/protocol/game/ClientboundAddEntityPacket.java
index 295dbc3..8f4713b 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundAddEntityPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundAddEntityPacket.java
@@ -29,7 +29,7 @@ public class ClientboundAddEntityPacket implements Packet<ClientGamePacketListen
     public ClientboundAddEntityPacket() {
     }
     
-    public ClientboundAddEntityPacket(final int integer1, final UUID uUID, final double double3, final double double4, final double double5, final float float6, final float float7, final EntityType<?> aku, final int integer9, final Vec3 cvl) {
+    public ClientboundAddEntityPacket(final int integer1, final UUID uUID, final double double3, final double double4, final double double5, final float float6, final float float7, final EntityType<?> aoq, final int integer9, final Vec3 dem) {
         this.id = integer1;
         this.uuid = uUID;
         this.x = double3;
@@ -37,60 +37,60 @@ public class ClientboundAddEntityPacket implements Packet<ClientGamePacketListen
         this.z = double5;
         this.xRot = Mth.floor(float6 * 256.0f / 360.0f);
         this.yRot = Mth.floor(float7 * 256.0f / 360.0f);
-        this.type = aku;
+        this.type = aoq;
         this.data = integer9;
-        this.xa = (int)(Mth.clamp(cvl.x, -3.9, 3.9) * 8000.0);
-        this.ya = (int)(Mth.clamp(cvl.y, -3.9, 3.9) * 8000.0);
-        this.za = (int)(Mth.clamp(cvl.z, -3.9, 3.9) * 8000.0);
+        this.xa = (int)(Mth.clamp(dem.x, -3.9, 3.9) * 8000.0);
+        this.ya = (int)(Mth.clamp(dem.y, -3.9, 3.9) * 8000.0);
+        this.za = (int)(Mth.clamp(dem.z, -3.9, 3.9) * 8000.0);
     }
     
-    public ClientboundAddEntityPacket(final Entity akq) {
-        this(akq, 0);
+    public ClientboundAddEntityPacket(final Entity aom) {
+        this(aom, 0);
     }
     
-    public ClientboundAddEntityPacket(final Entity akq, final int integer) {
-        this(akq.getId(), akq.getUUID(), akq.getX(), akq.getY(), akq.getZ(), akq.xRot, akq.yRot, akq.getType(), integer, akq.getDeltaMovement());
+    public ClientboundAddEntityPacket(final Entity aom, final int integer) {
+        this(aom.getId(), aom.getUUID(), aom.getX(), aom.getY(), aom.getZ(), aom.xRot, aom.yRot, aom.getType(), integer, aom.getDeltaMovement());
     }
     
-    public ClientboundAddEntityPacket(final Entity akq, final EntityType<?> aku, final int integer, final BlockPos fk) {
-        this(akq.getId(), akq.getUUID(), fk.getX(), fk.getY(), fk.getZ(), akq.xRot, akq.yRot, aku, integer, akq.getDeltaMovement());
+    public ClientboundAddEntityPacket(final Entity aom, final EntityType<?> aoq, final int integer, final BlockPos fu) {
+        this(aom.getId(), aom.getUUID(), fu.getX(), fu.getY(), fu.getZ(), aom.xRot, aom.yRot, aoq, integer, aom.getDeltaMovement());
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.uuid = kv.readUUID();
-        this.type = Registry.ENTITY_TYPE.byId(kv.readVarInt());
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-        this.xRot = kv.readByte();
-        this.yRot = kv.readByte();
-        this.data = kv.readInt();
-        this.xa = kv.readShort();
-        this.ya = kv.readShort();
-        this.za = kv.readShort();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.uuid = mg.readUUID();
+        this.type = Registry.ENTITY_TYPE.byId(mg.readVarInt());
+        this.x = mg.readDouble();
+        this.y = mg.readDouble();
+        this.z = mg.readDouble();
+        this.xRot = mg.readByte();
+        this.yRot = mg.readByte();
+        this.data = mg.readInt();
+        this.xa = mg.readShort();
+        this.ya = mg.readShort();
+        this.za = mg.readShort();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeUUID(this.uuid);
-        kv.writeVarInt(Registry.ENTITY_TYPE.getId(this.type));
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-        kv.writeByte(this.xRot);
-        kv.writeByte(this.yRot);
-        kv.writeInt(this.data);
-        kv.writeShort(this.xa);
-        kv.writeShort(this.ya);
-        kv.writeShort(this.za);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeUUID(this.uuid);
+        mg.writeVarInt(Registry.ENTITY_TYPE.getId(this.type));
+        mg.writeDouble(this.x);
+        mg.writeDouble(this.y);
+        mg.writeDouble(this.z);
+        mg.writeByte(this.xRot);
+        mg.writeByte(this.yRot);
+        mg.writeInt(this.data);
+        mg.writeShort(this.xa);
+        mg.writeShort(this.ya);
+        mg.writeShort(this.za);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleAddEntity(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleAddEntity(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundAddExperienceOrbPacket.java b/src/net/minecraft/network/protocol/game/ClientboundAddExperienceOrbPacket.java
index 297b6e1..8f58e3f 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundAddExperienceOrbPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundAddExperienceOrbPacket.java
@@ -16,35 +16,35 @@ public class ClientboundAddExperienceOrbPacket implements Packet<ClientGamePacke
     public ClientboundAddExperienceOrbPacket() {
     }
     
-    public ClientboundAddExperienceOrbPacket(final ExperienceOrb akw) {
-        this.id = akw.getId();
-        this.x = akw.getX();
-        this.y = akw.getY();
-        this.z = akw.getZ();
-        this.value = akw.getValue();
+    public ClientboundAddExperienceOrbPacket(final ExperienceOrb aos) {
+        this.id = aos.getId();
+        this.x = aos.getX();
+        this.y = aos.getY();
+        this.z = aos.getZ();
+        this.value = aos.getValue();
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-        this.value = kv.readShort();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.x = mg.readDouble();
+        this.y = mg.readDouble();
+        this.z = mg.readDouble();
+        this.value = mg.readShort();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-        kv.writeShort(this.value);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeDouble(this.x);
+        mg.writeDouble(this.y);
+        mg.writeDouble(this.z);
+        mg.writeShort(this.value);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleAddExperienceOrb(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleAddExperienceOrb(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundAddGlobalEntityPacket.java b/src/net/minecraft/network/protocol/game/ClientboundAddGlobalEntityPacket.java
deleted file mode 100644
index d414ea5..0000000
--- a/src/net/minecraft/network/protocol/game/ClientboundAddGlobalEntityPacket.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package net.minecraft.network.protocol.game;
-
-import net.minecraft.network.PacketListener;
-import java.io.IOException;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.entity.global.LightningBolt;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.network.protocol.Packet;
-
-public class ClientboundAddGlobalEntityPacket implements Packet<ClientGamePacketListener> {
-    private int id;
-    private double x;
-    private double y;
-    private double z;
-    private int type;
-    
-    public ClientboundAddGlobalEntityPacket() {
-    }
-    
-    public ClientboundAddGlobalEntityPacket(final Entity akq) {
-        this.id = akq.getId();
-        this.x = akq.getX();
-        this.y = akq.getY();
-        this.z = akq.getZ();
-        if (akq instanceof LightningBolt) {
-            this.type = 1;
-        }
-    }
-    
-    @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.type = kv.readByte();
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-    }
-    
-    @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeByte(this.type);
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-    }
-    
-    @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleAddGlobalEntity(this);
-    }
-    
-    public int getId() {
-        return this.id;
-    }
-    
-    public double getX() {
-        return this.x;
-    }
-    
-    public double getY() {
-        return this.y;
-    }
-    
-    public double getZ() {
-        return this.z;
-    }
-    
-    public int getType() {
-        return this.type;
-    }
-}
diff --git a/src/net/minecraft/network/protocol/game/ClientboundAddMobPacket.java b/src/net/minecraft/network/protocol/game/ClientboundAddMobPacket.java
index f62ee50..be29915 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundAddMobPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundAddMobPacket.java
@@ -27,61 +27,61 @@ public class ClientboundAddMobPacket implements Packet<ClientGamePacketListener>
     public ClientboundAddMobPacket() {
     }
     
-    public ClientboundAddMobPacket(final LivingEntity akz) {
-        this.id = akz.getId();
-        this.uuid = akz.getUUID();
-        this.type = Registry.ENTITY_TYPE.getId(akz.getType());
-        this.x = akz.getX();
-        this.y = akz.getY();
-        this.z = akz.getZ();
-        this.yRot = (byte)(akz.yRot * 256.0f / 360.0f);
-        this.xRot = (byte)(akz.xRot * 256.0f / 360.0f);
-        this.yHeadRot = (byte)(akz.yHeadRot * 256.0f / 360.0f);
+    public ClientboundAddMobPacket(final LivingEntity aoy) {
+        this.id = aoy.getId();
+        this.uuid = aoy.getUUID();
+        this.type = Registry.ENTITY_TYPE.getId(aoy.getType());
+        this.x = aoy.getX();
+        this.y = aoy.getY();
+        this.z = aoy.getZ();
+        this.yRot = (byte)(aoy.yRot * 256.0f / 360.0f);
+        this.xRot = (byte)(aoy.xRot * 256.0f / 360.0f);
+        this.yHeadRot = (byte)(aoy.yHeadRot * 256.0f / 360.0f);
         final double double3 = 3.9;
-        final Vec3 cvl5 = akz.getDeltaMovement();
-        final double double4 = Mth.clamp(cvl5.x, -3.9, 3.9);
-        final double double5 = Mth.clamp(cvl5.y, -3.9, 3.9);
-        final double double6 = Mth.clamp(cvl5.z, -3.9, 3.9);
+        final Vec3 dem5 = aoy.getDeltaMovement();
+        final double double4 = Mth.clamp(dem5.x, -3.9, 3.9);
+        final double double5 = Mth.clamp(dem5.y, -3.9, 3.9);
+        final double double6 = Mth.clamp(dem5.z, -3.9, 3.9);
         this.xd = (int)(double4 * 8000.0);
         this.yd = (int)(double5 * 8000.0);
         this.zd = (int)(double6 * 8000.0);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.uuid = kv.readUUID();
-        this.type = kv.readVarInt();
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-        this.yRot = kv.readByte();
-        this.xRot = kv.readByte();
-        this.yHeadRot = kv.readByte();
-        this.xd = kv.readShort();
-        this.yd = kv.readShort();
-        this.zd = kv.readShort();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.uuid = mg.readUUID();
+        this.type = mg.readVarInt();
+        this.x = mg.readDouble();
+        this.y = mg.readDouble();
+        this.z = mg.readDouble();
+        this.yRot = mg.readByte();
+        this.xRot = mg.readByte();
+        this.yHeadRot = mg.readByte();
+        this.xd = mg.readShort();
+        this.yd = mg.readShort();
+        this.zd = mg.readShort();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeUUID(this.uuid);
-        kv.writeVarInt(this.type);
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-        kv.writeByte(this.yRot);
-        kv.writeByte(this.xRot);
-        kv.writeByte(this.yHeadRot);
-        kv.writeShort(this.xd);
-        kv.writeShort(this.yd);
-        kv.writeShort(this.zd);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeUUID(this.uuid);
+        mg.writeVarInt(this.type);
+        mg.writeDouble(this.x);
+        mg.writeDouble(this.y);
+        mg.writeDouble(this.z);
+        mg.writeByte(this.yRot);
+        mg.writeByte(this.xRot);
+        mg.writeByte(this.yHeadRot);
+        mg.writeShort(this.xd);
+        mg.writeShort(this.yd);
+        mg.writeShort(this.zd);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleAddMob(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleAddMob(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundAddPaintingPacket.java b/src/net/minecraft/network/protocol/game/ClientboundAddPaintingPacket.java
index 220877a..3ca7355 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundAddPaintingPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundAddPaintingPacket.java
@@ -21,35 +21,35 @@ public class ClientboundAddPaintingPacket implements Packet<ClientGamePacketList
     public ClientboundAddPaintingPacket() {
     }
     
-    public ClientboundAddPaintingPacket(final Painting avu) {
-        this.id = avu.getId();
-        this.uuid = avu.getUUID();
-        this.pos = avu.getPos();
-        this.direction = avu.getDirection();
-        this.motive = Registry.MOTIVE.getId(avu.motive);
+    public ClientboundAddPaintingPacket(final Painting bbd) {
+        this.id = bbd.getId();
+        this.uuid = bbd.getUUID();
+        this.pos = bbd.getPos();
+        this.direction = bbd.getDirection();
+        this.motive = Registry.MOTIVE.getId(bbd.motive);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.uuid = kv.readUUID();
-        this.motive = kv.readVarInt();
-        this.pos = kv.readBlockPos();
-        this.direction = Direction.from2DDataValue(kv.readUnsignedByte());
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.uuid = mg.readUUID();
+        this.motive = mg.readVarInt();
+        this.pos = mg.readBlockPos();
+        this.direction = Direction.from2DDataValue(mg.readUnsignedByte());
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeUUID(this.uuid);
-        kv.writeVarInt(this.motive);
-        kv.writeBlockPos(this.pos);
-        kv.writeByte(this.direction.get2DDataValue());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeUUID(this.uuid);
+        mg.writeVarInt(this.motive);
+        mg.writeBlockPos(this.pos);
+        mg.writeByte(this.direction.get2DDataValue());
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleAddPainting(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleAddPainting(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundAddPlayerPacket.java b/src/net/minecraft/network/protocol/game/ClientboundAddPlayerPacket.java
index b361697..11216b1 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundAddPlayerPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundAddPlayerPacket.java
@@ -19,41 +19,41 @@ public class ClientboundAddPlayerPacket implements Packet<ClientGamePacketListen
     public ClientboundAddPlayerPacket() {
     }
     
-    public ClientboundAddPlayerPacket(final Player ayj) {
-        this.entityId = ayj.getId();
-        this.playerId = ayj.getGameProfile().getId();
-        this.x = ayj.getX();
-        this.y = ayj.getY();
-        this.z = ayj.getZ();
-        this.yRot = (byte)(ayj.yRot * 256.0f / 360.0f);
-        this.xRot = (byte)(ayj.xRot * 256.0f / 360.0f);
+    public ClientboundAddPlayerPacket(final Player bec) {
+        this.entityId = bec.getId();
+        this.playerId = bec.getGameProfile().getId();
+        this.x = bec.getX();
+        this.y = bec.getY();
+        this.z = bec.getZ();
+        this.yRot = (byte)(bec.yRot * 256.0f / 360.0f);
+        this.xRot = (byte)(bec.xRot * 256.0f / 360.0f);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entityId = kv.readVarInt();
-        this.playerId = kv.readUUID();
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-        this.yRot = kv.readByte();
-        this.xRot = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entityId = mg.readVarInt();
+        this.playerId = mg.readUUID();
+        this.x = mg.readDouble();
+        this.y = mg.readDouble();
+        this.z = mg.readDouble();
+        this.yRot = mg.readByte();
+        this.xRot = mg.readByte();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.entityId);
-        kv.writeUUID(this.playerId);
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-        kv.writeByte(this.yRot);
-        kv.writeByte(this.xRot);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.entityId);
+        mg.writeUUID(this.playerId);
+        mg.writeDouble(this.x);
+        mg.writeDouble(this.y);
+        mg.writeDouble(this.z);
+        mg.writeByte(this.yRot);
+        mg.writeByte(this.xRot);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleAddPlayer(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleAddPlayer(this);
     }
     
     public int getEntityId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundAnimatePacket.java b/src/net/minecraft/network/protocol/game/ClientboundAnimatePacket.java
index 0f7be51..a61b193 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundAnimatePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundAnimatePacket.java
@@ -13,26 +13,26 @@ public class ClientboundAnimatePacket implements Packet<ClientGamePacketListener
     public ClientboundAnimatePacket() {
     }
     
-    public ClientboundAnimatePacket(final Entity akq, final int integer) {
-        this.id = akq.getId();
+    public ClientboundAnimatePacket(final Entity aom, final int integer) {
+        this.id = aom.getId();
         this.action = integer;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.action = kv.readUnsignedByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.action = mg.readUnsignedByte();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeByte(this.action);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeByte(this.action);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleAnimate(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleAnimate(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundAwardStatsPacket.java b/src/net/minecraft/network/protocol/game/ClientboundAwardStatsPacket.java
index bbac7ca..814620b 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundAwardStatsPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundAwardStatsPacket.java
@@ -23,38 +23,38 @@ public class ClientboundAwardStatsPacket implements Packet<ClientGamePacketListe
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleAwardStats(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleAwardStats(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        final int integer3 = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        final int integer3 = mg.readVarInt();
         this.stats = (Object2IntMap<Stat<?>>)new Object2IntOpenHashMap(integer3);
         for (int integer4 = 0; integer4 < integer3; ++integer4) {
-            this.readStat(Registry.STAT_TYPE.byId(kv.readVarInt()), kv);
+            this.readStat(Registry.STAT_TYPE.byId(mg.readVarInt()), mg);
         }
     }
     
-    private <T> void readStat(final StatType<T> aaq, final FriendlyByteBuf kv) {
-        final int integer4 = kv.readVarInt();
-        final int integer5 = kv.readVarInt();
-        this.stats.put(aaq.get(aaq.getRegistry().byId(integer4)), integer5);
+    private <T> void readStat(final StatType<T> act, final FriendlyByteBuf mg) {
+        final int integer4 = mg.readVarInt();
+        final int integer5 = mg.readVarInt();
+        this.stats.put(act.get(act.getRegistry().byId(integer4)), integer5);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.stats.size());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.stats.size());
         for (final Object2IntMap.Entry<Stat<?>> entry4 : this.stats.object2IntEntrySet()) {
-            final Stat<?> aao5 = entry4.getKey();
-            kv.writeVarInt(Registry.STAT_TYPE.getId(aao5.getType()));
-            kv.writeVarInt(this.getId(aao5));
-            kv.writeVarInt(entry4.getIntValue());
+            final Stat<?> acr5 = entry4.getKey();
+            mg.writeVarInt(Registry.STAT_TYPE.getId(acr5.getType()));
+            mg.writeVarInt(this.getId(acr5));
+            mg.writeVarInt(entry4.getIntValue());
         }
     }
     
-    private <T> int getId(final Stat<T> aao) {
-        return aao.getType().getRegistry().getId(aao.getValue());
+    private <T> int getId(final Stat<T> acr) {
+        return acr.getType().getRegistry().getId(acr.getValue());
     }
     
     public Map<Stat<?>, Integer> getStats() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundBlockBreakAckPacket.java b/src/net/minecraft/network/protocol/game/ClientboundBlockBreakAckPacket.java
index aed41ce..5eb2be0 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundBlockBreakAckPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundBlockBreakAckPacket.java
@@ -20,32 +20,32 @@ public class ClientboundBlockBreakAckPacket implements Packet<ClientGamePacketLi
     public ClientboundBlockBreakAckPacket() {
     }
     
-    public ClientboundBlockBreakAckPacket(final BlockPos fk, final BlockState byj, final ServerboundPlayerActionPacket.Action a, final boolean boolean4, final String string) {
-        this.pos = fk.immutable();
-        this.state = byj;
+    public ClientboundBlockBreakAckPacket(final BlockPos fu, final BlockState cfj, final ServerboundPlayerActionPacket.Action a, final boolean boolean4, final String string) {
+        this.pos = fu.immutable();
+        this.state = cfj;
         this.action = a;
         this.allGood = boolean4;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.pos = kv.readBlockPos();
-        this.state = Block.BLOCK_STATE_REGISTRY.byId(kv.readVarInt());
-        this.action = kv.<ServerboundPlayerActionPacket.Action>readEnum(ServerboundPlayerActionPacket.Action.class);
-        this.allGood = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
+        this.state = Block.BLOCK_STATE_REGISTRY.byId(mg.readVarInt());
+        this.action = mg.<ServerboundPlayerActionPacket.Action>readEnum(ServerboundPlayerActionPacket.Action.class);
+        this.allGood = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBlockPos(this.pos);
-        kv.writeVarInt(Block.getId(this.state));
-        kv.writeEnum(this.action);
-        kv.writeBoolean(this.allGood);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
+        mg.writeVarInt(Block.getId(this.state));
+        mg.writeEnum(this.action);
+        mg.writeBoolean(this.allGood);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleBlockBreakAck(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleBlockBreakAck(this);
     }
     
     public BlockState getState() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundBlockDestructionPacket.java b/src/net/minecraft/network/protocol/game/ClientboundBlockDestructionPacket.java
index 2ae9d5c..ae25ef4 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundBlockDestructionPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundBlockDestructionPacket.java
@@ -14,29 +14,29 @@ public class ClientboundBlockDestructionPacket implements Packet<ClientGamePacke
     public ClientboundBlockDestructionPacket() {
     }
     
-    public ClientboundBlockDestructionPacket(final int integer1, final BlockPos fk, final int integer3) {
+    public ClientboundBlockDestructionPacket(final int integer1, final BlockPos fu, final int integer3) {
         this.id = integer1;
-        this.pos = fk;
+        this.pos = fu;
         this.progress = integer3;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.pos = kv.readBlockPos();
-        this.progress = kv.readUnsignedByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.pos = mg.readBlockPos();
+        this.progress = mg.readUnsignedByte();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeBlockPos(this.pos);
-        kv.writeByte(this.progress);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeBlockPos(this.pos);
+        mg.writeByte(this.progress);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleBlockDestruction(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleBlockDestruction(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java b/src/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
index e975d38..a598747 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
@@ -15,29 +15,29 @@ public class ClientboundBlockEntityDataPacket implements Packet<ClientGamePacket
     public ClientboundBlockEntityDataPacket() {
     }
     
-    public ClientboundBlockEntityDataPacket(final BlockPos fk, final int integer, final CompoundTag jt) {
-        this.pos = fk;
+    public ClientboundBlockEntityDataPacket(final BlockPos fu, final int integer, final CompoundTag le) {
+        this.pos = fu;
         this.type = integer;
-        this.tag = jt;
+        this.tag = le;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.pos = kv.readBlockPos();
-        this.type = kv.readUnsignedByte();
-        this.tag = kv.readNbt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
+        this.type = mg.readUnsignedByte();
+        this.tag = mg.readNbt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBlockPos(this.pos);
-        kv.writeByte((byte)this.type);
-        kv.writeNbt(this.tag);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
+        mg.writeByte((byte)this.type);
+        mg.writeNbt(this.tag);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleBlockEntityData(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleBlockEntityData(this);
     }
     
     public BlockPos getPos() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundBlockEventPacket.java b/src/net/minecraft/network/protocol/game/ClientboundBlockEventPacket.java
index 74c9a6d..1447502 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundBlockEventPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundBlockEventPacket.java
@@ -17,32 +17,32 @@ public class ClientboundBlockEventPacket implements Packet<ClientGamePacketListe
     public ClientboundBlockEventPacket() {
     }
     
-    public ClientboundBlockEventPacket(final BlockPos fk, final Block bph, final int integer3, final int integer4) {
-        this.pos = fk;
-        this.block = bph;
+    public ClientboundBlockEventPacket(final BlockPos fu, final Block bvr, final int integer3, final int integer4) {
+        this.pos = fu;
+        this.block = bvr;
         this.b0 = integer3;
         this.b1 = integer4;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.pos = kv.readBlockPos();
-        this.b0 = kv.readUnsignedByte();
-        this.b1 = kv.readUnsignedByte();
-        this.block = Registry.BLOCK.byId(kv.readVarInt());
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
+        this.b0 = mg.readUnsignedByte();
+        this.b1 = mg.readUnsignedByte();
+        this.block = Registry.BLOCK.byId(mg.readVarInt());
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBlockPos(this.pos);
-        kv.writeByte(this.b0);
-        kv.writeByte(this.b1);
-        kv.writeVarInt(Registry.BLOCK.getId(this.block));
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
+        mg.writeByte(this.b0);
+        mg.writeByte(this.b1);
+        mg.writeVarInt(Registry.BLOCK.getId(this.block));
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleBlockEvent(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleBlockEvent(this);
     }
     
     public BlockPos getPos() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundBlockUpdatePacket.java b/src/net/minecraft/network/protocol/game/ClientboundBlockUpdatePacket.java
index 8b3f547..17ba41b 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundBlockUpdatePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundBlockUpdatePacket.java
@@ -16,26 +16,26 @@ public class ClientboundBlockUpdatePacket implements Packet<ClientGamePacketList
     public ClientboundBlockUpdatePacket() {
     }
     
-    public ClientboundBlockUpdatePacket(final BlockGetter bjg, final BlockPos fk) {
-        this.pos = fk;
-        this.blockState = bjg.getBlockState(fk);
+    public ClientboundBlockUpdatePacket(final BlockGetter bpg, final BlockPos fu) {
+        this.pos = fu;
+        this.blockState = bpg.getBlockState(fu);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.pos = kv.readBlockPos();
-        this.blockState = Block.BLOCK_STATE_REGISTRY.byId(kv.readVarInt());
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
+        this.blockState = Block.BLOCK_STATE_REGISTRY.byId(mg.readVarInt());
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBlockPos(this.pos);
-        kv.writeVarInt(Block.getId(this.blockState));
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
+        mg.writeVarInt(Block.getId(this.blockState));
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleBlockUpdate(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleBlockUpdate(this);
     }
     
     public BlockState getBlockState() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundBossEventPacket.java b/src/net/minecraft/network/protocol/game/ClientboundBossEventPacket.java
index 16765c3..eebe5e2 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundBossEventPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundBossEventPacket.java
@@ -22,45 +22,45 @@ public class ClientboundBossEventPacket implements Packet<ClientGamePacketListen
     public ClientboundBossEventPacket() {
     }
     
-    public ClientboundBossEventPacket(final Operation a, final BossEvent ajb) {
+    public ClientboundBossEventPacket(final Operation a, final BossEvent amw) {
         this.operation = a;
-        this.id = ajb.getId();
-        this.name = ajb.getName();
-        this.pct = ajb.getPercent();
-        this.color = ajb.getColor();
-        this.overlay = ajb.getOverlay();
-        this.darkenScreen = ajb.shouldDarkenScreen();
-        this.playMusic = ajb.shouldPlayBossMusic();
-        this.createWorldFog = ajb.shouldCreateWorldFog();
+        this.id = amw.getId();
+        this.name = amw.getName();
+        this.pct = amw.getPercent();
+        this.color = amw.getColor();
+        this.overlay = amw.getOverlay();
+        this.darkenScreen = amw.shouldDarkenScreen();
+        this.playMusic = amw.shouldPlayBossMusic();
+        this.createWorldFog = amw.shouldCreateWorldFog();
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readUUID();
-        this.operation = kv.<Operation>readEnum(Operation.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readUUID();
+        this.operation = mg.<Operation>readEnum(Operation.class);
         switch (this.operation) {
             case ADD: {
-                this.name = kv.readComponent();
-                this.pct = kv.readFloat();
-                this.color = kv.<BossEvent.BossBarColor>readEnum(BossEvent.BossBarColor.class);
-                this.overlay = kv.<BossEvent.BossBarOverlay>readEnum(BossEvent.BossBarOverlay.class);
-                this.decodeProperties(kv.readUnsignedByte());
+                this.name = mg.readComponent();
+                this.pct = mg.readFloat();
+                this.color = mg.<BossEvent.BossBarColor>readEnum(BossEvent.BossBarColor.class);
+                this.overlay = mg.<BossEvent.BossBarOverlay>readEnum(BossEvent.BossBarOverlay.class);
+                this.decodeProperties(mg.readUnsignedByte());
             }
             case UPDATE_PCT: {
-                this.pct = kv.readFloat();
+                this.pct = mg.readFloat();
                 break;
             }
             case UPDATE_NAME: {
-                this.name = kv.readComponent();
+                this.name = mg.readComponent();
                 break;
             }
             case UPDATE_STYLE: {
-                this.color = kv.<BossEvent.BossBarColor>readEnum(BossEvent.BossBarColor.class);
-                this.overlay = kv.<BossEvent.BossBarOverlay>readEnum(BossEvent.BossBarOverlay.class);
+                this.color = mg.<BossEvent.BossBarColor>readEnum(BossEvent.BossBarColor.class);
+                this.overlay = mg.<BossEvent.BossBarOverlay>readEnum(BossEvent.BossBarOverlay.class);
                 break;
             }
             case UPDATE_PROPERTIES: {
-                this.decodeProperties(kv.readUnsignedByte());
+                this.decodeProperties(mg.readUnsignedByte());
                 break;
             }
         }
@@ -73,32 +73,32 @@ public class ClientboundBossEventPacket implements Packet<ClientGamePacketListen
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUUID(this.id);
-        kv.writeEnum(this.operation);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUUID(this.id);
+        mg.writeEnum(this.operation);
         switch (this.operation) {
             case ADD: {
-                kv.writeComponent(this.name);
-                kv.writeFloat(this.pct);
-                kv.writeEnum(this.color);
-                kv.writeEnum(this.overlay);
-                kv.writeByte(this.encodeProperties());
+                mg.writeComponent(this.name);
+                mg.writeFloat(this.pct);
+                mg.writeEnum(this.color);
+                mg.writeEnum(this.overlay);
+                mg.writeByte(this.encodeProperties());
             }
             case UPDATE_PCT: {
-                kv.writeFloat(this.pct);
+                mg.writeFloat(this.pct);
                 break;
             }
             case UPDATE_NAME: {
-                kv.writeComponent(this.name);
+                mg.writeComponent(this.name);
                 break;
             }
             case UPDATE_STYLE: {
-                kv.writeEnum(this.color);
-                kv.writeEnum(this.overlay);
+                mg.writeEnum(this.color);
+                mg.writeEnum(this.overlay);
                 break;
             }
             case UPDATE_PROPERTIES: {
-                kv.writeByte(this.encodeProperties());
+                mg.writeByte(this.encodeProperties());
                 break;
             }
         }
@@ -119,8 +119,8 @@ public class ClientboundBossEventPacket implements Packet<ClientGamePacketListen
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleBossUpdate(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleBossUpdate(this);
     }
     
     public UUID getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundChangeDifficultyPacket.java b/src/net/minecraft/network/protocol/game/ClientboundChangeDifficultyPacket.java
index 1a97e1d..0168906 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundChangeDifficultyPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundChangeDifficultyPacket.java
@@ -13,26 +13,26 @@ public class ClientboundChangeDifficultyPacket implements Packet<ClientGamePacke
     public ClientboundChangeDifficultyPacket() {
     }
     
-    public ClientboundChangeDifficultyPacket(final Difficulty aji, final boolean boolean2) {
-        this.difficulty = aji;
+    public ClientboundChangeDifficultyPacket(final Difficulty and, final boolean boolean2) {
+        this.difficulty = and;
         this.locked = boolean2;
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleChangeDifficulty(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleChangeDifficulty(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.difficulty = Difficulty.byId(kv.readUnsignedByte());
-        this.locked = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.difficulty = Difficulty.byId(mg.readUnsignedByte());
+        this.locked = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.difficulty.getId());
-        kv.writeBoolean(this.locked);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.difficulty.getId());
+        mg.writeBoolean(this.locked);
     }
     
     public boolean isLocked() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundChatPacket.java b/src/net/minecraft/network/protocol/game/ClientboundChatPacket.java
index 038e415..ca3ec79 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundChatPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundChatPacket.java
@@ -3,6 +3,7 @@ package net.minecraft.network.protocol.game;
 import net.minecraft.network.PacketListener;
 import java.io.IOException;
 import net.minecraft.network.FriendlyByteBuf;
+import java.util.UUID;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
@@ -10,34 +11,34 @@ import net.minecraft.network.protocol.Packet;
 public class ClientboundChatPacket implements Packet<ClientGamePacketListener> {
     private Component message;
     private ChatType type;
+    private UUID sender;
     
     public ClientboundChatPacket() {
     }
     
-    public ClientboundChatPacket(final Component lf) {
-        this(lf, ChatType.SYSTEM);
-    }
-    
-    public ClientboundChatPacket(final Component lf, final ChatType ld) {
-        this.message = lf;
-        this.type = ld;
+    public ClientboundChatPacket(final Component mr, final ChatType mo, final UUID uUID) {
+        this.message = mr;
+        this.type = mo;
+        this.sender = uUID;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.message = kv.readComponent();
-        this.type = ChatType.getForIndex(kv.readByte());
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.message = mg.readComponent();
+        this.type = ChatType.getForIndex(mg.readByte());
+        this.sender = mg.readUUID();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeComponent(this.message);
-        kv.writeByte(this.type.getIndex());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeComponent(this.message);
+        mg.writeByte(this.type.getIndex());
+        mg.writeUUID(this.sender);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleChat(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleChat(this);
     }
     
     public Component getMessage() {
@@ -52,6 +53,10 @@ public class ClientboundChatPacket implements Packet<ClientGamePacketListener> {
         return this.type;
     }
     
+    public UUID getSender() {
+        return this.sender;
+    }
+    
     @Override
     public boolean isSkippable() {
         return true;
diff --git a/src/net/minecraft/network/protocol/game/ClientboundChunkBlocksUpdatePacket.java b/src/net/minecraft/network/protocol/game/ClientboundChunkBlocksUpdatePacket.java
index cceeba5..a897b4e 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundChunkBlocksUpdatePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundChunkBlocksUpdatePacket.java
@@ -18,37 +18,37 @@ public class ClientboundChunkBlocksUpdatePacket implements Packet<ClientGamePack
     public ClientboundChunkBlocksUpdatePacket() {
     }
     
-    public ClientboundChunkBlocksUpdatePacket(final int integer, final short[] arr, final LevelChunk cal) {
-        this.chunkPos = cal.getPos();
+    public ClientboundChunkBlocksUpdatePacket(final int integer, final short[] arr, final LevelChunk chj) {
+        this.chunkPos = chj.getPos();
         this.updates = new BlockUpdate[integer];
         for (int integer2 = 0; integer2 < this.updates.length; ++integer2) {
-            this.updates[integer2] = new BlockUpdate(arr[integer2], cal);
+            this.updates[integer2] = new BlockUpdate(arr[integer2], chj);
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.chunkPos = new ChunkPos(kv.readInt(), kv.readInt());
-        this.updates = new BlockUpdate[kv.readVarInt()];
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.chunkPos = new ChunkPos(mg.readInt(), mg.readInt());
+        this.updates = new BlockUpdate[mg.readVarInt()];
         for (int integer3 = 0; integer3 < this.updates.length; ++integer3) {
-            this.updates[integer3] = new BlockUpdate(kv.readShort(), Block.BLOCK_STATE_REGISTRY.byId(kv.readVarInt()));
+            this.updates[integer3] = new BlockUpdate(mg.readShort(), Block.BLOCK_STATE_REGISTRY.byId(mg.readVarInt()));
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeInt(this.chunkPos.x);
-        kv.writeInt(this.chunkPos.z);
-        kv.writeVarInt(this.updates.length);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeInt(this.chunkPos.x);
+        mg.writeInt(this.chunkPos.z);
+        mg.writeVarInt(this.updates.length);
         for (final BlockUpdate a6 : this.updates) {
-            kv.writeShort(a6.getOffset());
-            kv.writeVarInt(Block.getId(a6.getBlock()));
+            mg.writeShort(a6.getOffset());
+            mg.writeVarInt(Block.getId(a6.getBlock()));
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleChunkBlocksUpdate(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleChunkBlocksUpdate(this);
     }
     
     public BlockUpdate[] getUpdates() {
@@ -59,14 +59,14 @@ public class ClientboundChunkBlocksUpdatePacket implements Packet<ClientGamePack
         private final short offset;
         private final BlockState block;
         
-        public BlockUpdate(final short short2, final BlockState byj) {
+        public BlockUpdate(final short short2, final BlockState cfj) {
             this.offset = short2;
-            this.block = byj;
+            this.block = cfj;
         }
         
-        public BlockUpdate(final short short2, final LevelChunk cal) {
+        public BlockUpdate(final short short2, final LevelChunk chj) {
             this.offset = short2;
-            this.block = cal.getBlockState(this.getPos());
+            this.block = chj.getBlockState(this.getPos());
         }
         
         public BlockPos getPos() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundCommandSuggestionsPacket.java b/src/net/minecraft/network/protocol/game/ClientboundCommandSuggestionsPacket.java
index a7f1690..36b63c1 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundCommandSuggestionsPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundCommandSuggestionsPacket.java
@@ -27,39 +27,39 @@ public class ClientboundCommandSuggestionsPacket implements Packet<ClientGamePac
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        final int integer3 = kv.readVarInt();
-        final int integer4 = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        final int integer3 = mg.readVarInt();
+        final int integer4 = mg.readVarInt();
         final StringRange stringRange5 = StringRange.between(integer3, integer3 + integer4);
-        final int integer5 = kv.readVarInt();
+        final int integer5 = mg.readVarInt();
         final List<Suggestion> list7 = Lists.newArrayListWithCapacity(integer5);
         for (int integer6 = 0; integer6 < integer5; ++integer6) {
-            final String string9 = kv.readUtf(32767);
-            final Component lf10 = kv.readBoolean() ? kv.readComponent() : null;
-            list7.add(new Suggestion(stringRange5, string9, (Message)lf10));
+            final String string9 = mg.readUtf(32767);
+            final Component mr10 = mg.readBoolean() ? mg.readComponent() : null;
+            list7.add(new Suggestion(stringRange5, string9, (Message)mr10));
         }
         this.suggestions = new Suggestions(stringRange5, (List)list7);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeVarInt(this.suggestions.getRange().getStart());
-        kv.writeVarInt(this.suggestions.getRange().getLength());
-        kv.writeVarInt(this.suggestions.getList().size());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeVarInt(this.suggestions.getRange().getStart());
+        mg.writeVarInt(this.suggestions.getRange().getLength());
+        mg.writeVarInt(this.suggestions.getList().size());
         for (final Suggestion suggestion4 : this.suggestions.getList()) {
-            kv.writeUtf(suggestion4.getText());
-            kv.writeBoolean(suggestion4.getTooltip() != null);
+            mg.writeUtf(suggestion4.getText());
+            mg.writeBoolean(suggestion4.getTooltip() != null);
             if (suggestion4.getTooltip() != null) {
-                kv.writeComponent(ComponentUtils.fromMessage(suggestion4.getTooltip()));
+                mg.writeComponent(ComponentUtils.fromMessage(suggestion4.getTooltip()));
             }
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleCommandSuggestions(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleCommandSuggestions(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundCommandsPacket.java b/src/net/minecraft/network/protocol/game/ClientboundCommandsPacket.java
index c324437..9b81039 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundCommandsPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundCommandsPacket.java
@@ -37,11 +37,11 @@ public class ClientboundCommandsPacket implements Packet<ClientGamePacketListene
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        final Entry[] arr3 = new Entry[kv.readVarInt()];
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        final Entry[] arr3 = new Entry[mg.readVarInt()];
         final Deque<Entry> deque4 = new ArrayDeque<Entry>(arr3.length);
         for (int integer5 = 0; integer5 < arr3.length; ++integer5) {
-            deque4.add(arr3[integer5] = this.readNode(kv));
+            deque4.add(arr3[integer5] = this.readNode(mg));
         }
         while (!deque4.isEmpty()) {
             boolean boolean5 = false;
@@ -57,11 +57,11 @@ public class ClientboundCommandsPacket implements Packet<ClientGamePacketListene
                 throw new IllegalStateException("Server sent an impossible command tree");
             }
         }
-        this.root = (RootCommandNode<SharedSuggestionProvider>)arr3[kv.readVarInt()].node;
+        this.root = (RootCommandNode<SharedSuggestionProvider>)arr3[mg.readVarInt()].node;
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
+    public void write(final FriendlyByteBuf mg) throws IOException {
         final Map<CommandNode<SharedSuggestionProvider>, Integer> map3 = Maps.newHashMap();
         final Deque<CommandNode<SharedSuggestionProvider>> deque4 = new ArrayDeque<CommandNode<SharedSuggestionProvider>>();
         deque4.add((CommandNode<SharedSuggestionProvider>)this.root);
@@ -82,45 +82,45 @@ public class ClientboundCommandsPacket implements Packet<ClientGamePacketListene
         for (final Map.Entry<CommandNode<SharedSuggestionProvider>, Integer> entry7 : map3.entrySet()) {
             arr5[entry7.getValue()] = entry7.getKey();
         }
-        kv.writeVarInt(arr5.length);
+        mg.writeVarInt(arr5.length);
         for (final CommandNode<SharedSuggestionProvider> commandNode6 : arr5) {
-            this.writeNode(kv, commandNode6, map3);
+            this.writeNode(mg, commandNode6, map3);
         }
-        kv.writeVarInt(map3.get(this.root));
+        mg.writeVarInt(map3.get(this.root));
     }
     
-    private Entry readNode(final FriendlyByteBuf kv) {
-        final byte byte3 = kv.readByte();
-        final int[] arr4 = kv.readVarIntArray();
-        final int integer5 = ((byte3 & 0x8) != 0x0) ? kv.readVarInt() : 0;
-        final ArgumentBuilder<SharedSuggestionProvider, ?> argumentBuilder6 = this.createBuilder(kv, byte3);
+    private Entry readNode(final FriendlyByteBuf mg) {
+        final byte byte3 = mg.readByte();
+        final int[] arr4 = mg.readVarIntArray();
+        final int integer5 = ((byte3 & 0x8) != 0x0) ? mg.readVarInt() : 0;
+        final ArgumentBuilder<SharedSuggestionProvider, ?> argumentBuilder6 = this.createBuilder(mg, byte3);
         return new Entry((ArgumentBuilder)argumentBuilder6, byte3, integer5, arr4);
     }
     
     @Nullable
-    private ArgumentBuilder<SharedSuggestionProvider, ?> createBuilder(final FriendlyByteBuf kv, final byte byte2) {
+    private ArgumentBuilder<SharedSuggestionProvider, ?> createBuilder(final FriendlyByteBuf mg, final byte byte2) {
         final int integer4 = byte2 & 0x3;
         if (integer4 == 2) {
-            final String string5 = kv.readUtf(32767);
-            final ArgumentType<?> argumentType6 = ArgumentTypes.deserialize(kv);
+            final String string5 = mg.readUtf(32767);
+            final ArgumentType<?> argumentType6 = ArgumentTypes.deserialize(mg);
             if (argumentType6 == null) {
                 return null;
             }
             final RequiredArgumentBuilder<SharedSuggestionProvider, ?> requiredArgumentBuilder7 = RequiredArgumentBuilder.argument(string5, (ArgumentType)argumentType6);
             if ((byte2 & 0x10) != 0x0) {
-                requiredArgumentBuilder7.suggests((SuggestionProvider)SuggestionProviders.getProvider(kv.readResourceLocation()));
+                requiredArgumentBuilder7.suggests((SuggestionProvider)SuggestionProviders.getProvider(mg.readResourceLocation()));
             }
             return requiredArgumentBuilder7;
         }
         else {
             if (integer4 == 1) {
-                return LiteralArgumentBuilder.literal(kv.readUtf(32767));
+                return LiteralArgumentBuilder.literal(mg.readUtf(32767));
             }
             return null;
         }
     }
     
-    private void writeNode(final FriendlyByteBuf kv, final CommandNode<SharedSuggestionProvider> commandNode, final Map<CommandNode<SharedSuggestionProvider>, Integer> map) {
+    private void writeNode(final FriendlyByteBuf mg, final CommandNode<SharedSuggestionProvider> commandNode, final Map<CommandNode<SharedSuggestionProvider>, Integer> map) {
         byte byte5 = 0;
         if (commandNode.getRedirect() != null) {
             byte5 |= 0x8;
@@ -143,30 +143,30 @@ public class ClientboundCommandsPacket implements Packet<ClientGamePacketListene
             }
             byte5 |= 0x1;
         }
-        kv.writeByte(byte5);
-        kv.writeVarInt(commandNode.getChildren().size());
+        mg.writeByte(byte5);
+        mg.writeVarInt(commandNode.getChildren().size());
         for (final CommandNode<SharedSuggestionProvider> commandNode2 : commandNode.getChildren()) {
-            kv.writeVarInt(map.get(commandNode2));
+            mg.writeVarInt(map.get(commandNode2));
         }
         if (commandNode.getRedirect() != null) {
-            kv.writeVarInt(map.get(commandNode.getRedirect()));
+            mg.writeVarInt(map.get(commandNode.getRedirect()));
         }
         if (commandNode instanceof ArgumentCommandNode) {
             final ArgumentCommandNode<SharedSuggestionProvider, ?> argumentCommandNode6 = commandNode;
-            kv.writeUtf(argumentCommandNode6.getName());
-            ArgumentTypes.<ArgumentType>serialize(kv, argumentCommandNode6.getType());
+            mg.writeUtf(argumentCommandNode6.getName());
+            ArgumentTypes.<ArgumentType>serialize(mg, argumentCommandNode6.getType());
             if (argumentCommandNode6.getCustomSuggestions() != null) {
-                kv.writeResourceLocation(SuggestionProviders.getName((SuggestionProvider<SharedSuggestionProvider>)argumentCommandNode6.getCustomSuggestions()));
+                mg.writeResourceLocation(SuggestionProviders.getName((SuggestionProvider<SharedSuggestionProvider>)argumentCommandNode6.getCustomSuggestions()));
             }
         }
         else if (commandNode instanceof LiteralCommandNode) {
-            kv.writeUtf(((LiteralCommandNode)commandNode).getLiteral());
+            mg.writeUtf(((LiteralCommandNode)commandNode).getLiteral());
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleCommands(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleCommands(this);
     }
     
     public RootCommandNode<SharedSuggestionProvider> getRoot() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundContainerAckPacket.java b/src/net/minecraft/network/protocol/game/ClientboundContainerAckPacket.java
index 835f807..2ca023f 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundContainerAckPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundContainerAckPacket.java
@@ -20,22 +20,22 @@ public class ClientboundContainerAckPacket implements Packet<ClientGamePacketLis
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleContainerAck(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleContainerAck(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readUnsignedByte();
-        this.uid = kv.readShort();
-        this.accepted = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readUnsignedByte();
+        this.uid = mg.readShort();
+        this.accepted = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
-        kv.writeShort(this.uid);
-        kv.writeBoolean(this.accepted);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
+        mg.writeShort(this.uid);
+        mg.writeBoolean(this.accepted);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundContainerClosePacket.java b/src/net/minecraft/network/protocol/game/ClientboundContainerClosePacket.java
index c7099eb..346c38a 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundContainerClosePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundContainerClosePacket.java
@@ -16,17 +16,17 @@ public class ClientboundContainerClosePacket implements Packet<ClientGamePacketL
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleContainerClose(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleContainerClose(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readUnsignedByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readUnsignedByte();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java b/src/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java
index f401527..ddb421d 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java
@@ -16,36 +16,36 @@ public class ClientboundContainerSetContentPacket implements Packet<ClientGamePa
     public ClientboundContainerSetContentPacket() {
     }
     
-    public ClientboundContainerSetContentPacket(final int integer, final NonNullList<ItemStack> fy) {
+    public ClientboundContainerSetContentPacket(final int integer, final NonNullList<ItemStack> gi) {
         this.containerId = integer;
-        this.items = NonNullList.<ItemStack>withSize(fy.size(), ItemStack.EMPTY);
+        this.items = NonNullList.<ItemStack>withSize(gi.size(), ItemStack.EMPTY);
         for (int integer2 = 0; integer2 < this.items.size(); ++integer2) {
-            this.items.set(integer2, fy.get(integer2).copy());
+            this.items.set(integer2, gi.get(integer2).copy());
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readUnsignedByte();
-        final int integer3 = kv.readShort();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readUnsignedByte();
+        final int integer3 = mg.readShort();
         this.items = NonNullList.<ItemStack>withSize(integer3, ItemStack.EMPTY);
         for (int integer4 = 0; integer4 < integer3; ++integer4) {
-            this.items.set(integer4, kv.readItem());
+            this.items.set(integer4, mg.readItem());
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
-        kv.writeShort(this.items.size());
-        for (final ItemStack ben4 : this.items) {
-            kv.writeItem(ben4);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
+        mg.writeShort(this.items.size());
+        for (final ItemStack bki4 : this.items) {
+            mg.writeItem(bki4);
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleContainerContent(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleContainerContent(this);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundContainerSetDataPacket.java b/src/net/minecraft/network/protocol/game/ClientboundContainerSetDataPacket.java
index 2d0eae1..62c6b93 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundContainerSetDataPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundContainerSetDataPacket.java
@@ -20,22 +20,22 @@ public class ClientboundContainerSetDataPacket implements Packet<ClientGamePacke
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleContainerSetData(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleContainerSetData(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readUnsignedByte();
-        this.id = kv.readShort();
-        this.value = kv.readShort();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readUnsignedByte();
+        this.id = mg.readShort();
+        this.value = mg.readShort();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
-        kv.writeShort(this.id);
-        kv.writeShort(this.value);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
+        mg.writeShort(this.id);
+        mg.writeShort(this.value);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java b/src/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java
index 1986c72..35323ef 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java
@@ -15,30 +15,30 @@ public class ClientboundContainerSetSlotPacket implements Packet<ClientGamePacke
         this.itemStack = ItemStack.EMPTY;
     }
     
-    public ClientboundContainerSetSlotPacket(final int integer1, final int integer2, final ItemStack ben) {
+    public ClientboundContainerSetSlotPacket(final int integer1, final int integer2, final ItemStack bki) {
         this.itemStack = ItemStack.EMPTY;
         this.containerId = integer1;
         this.slot = integer2;
-        this.itemStack = ben.copy();
+        this.itemStack = bki.copy();
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleContainerSetSlot(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleContainerSetSlot(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readByte();
-        this.slot = kv.readShort();
-        this.itemStack = kv.readItem();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readByte();
+        this.slot = mg.readShort();
+        this.itemStack = mg.readItem();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
-        kv.writeShort(this.slot);
-        kv.writeItem(this.itemStack);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
+        mg.writeShort(this.slot);
+        mg.writeItem(this.itemStack);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundCooldownPacket.java b/src/net/minecraft/network/protocol/game/ClientboundCooldownPacket.java
index 3ed61d4..fca7257 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundCooldownPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundCooldownPacket.java
@@ -13,26 +13,26 @@ public class ClientboundCooldownPacket implements Packet<ClientGamePacketListene
     public ClientboundCooldownPacket() {
     }
     
-    public ClientboundCooldownPacket(final Item bei, final int integer) {
-        this.item = bei;
+    public ClientboundCooldownPacket(final Item bke, final int integer) {
+        this.item = bke;
         this.duration = integer;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.item = Item.byId(kv.readVarInt());
-        this.duration = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.item = Item.byId(mg.readVarInt());
+        this.duration = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(Item.getId(this.item));
-        kv.writeVarInt(this.duration);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(Item.getId(this.item));
+        mg.writeVarInt(this.duration);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleItemCooldown(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleItemCooldown(this);
     }
     
     public Item getItem() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundCustomPayloadPacket.java b/src/net/minecraft/network/protocol/game/ClientboundCustomPayloadPacket.java
index 19ccf95..2e61aca 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundCustomPayloadPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundCustomPayloadPacket.java
@@ -30,33 +30,33 @@ public class ClientboundCustomPayloadPacket implements Packet<ClientGamePacketLi
     public ClientboundCustomPayloadPacket() {
     }
     
-    public ClientboundCustomPayloadPacket(final ResourceLocation sm, final FriendlyByteBuf kv) {
-        this.identifier = sm;
-        this.data = kv;
-        if (kv.writerIndex() > 1048576) {
+    public ClientboundCustomPayloadPacket(final ResourceLocation uh, final FriendlyByteBuf mg) {
+        this.identifier = uh;
+        this.data = mg;
+        if (mg.writerIndex() > 1048576) {
             throw new IllegalArgumentException("Payload may not be larger than 1048576 bytes");
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.identifier = kv.readResourceLocation();
-        final int integer3 = kv.readableBytes();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.identifier = mg.readResourceLocation();
+        final int integer3 = mg.readableBytes();
         if (integer3 < 0 || integer3 > 1048576) {
             throw new IOException("Payload may not be larger than 1048576 bytes");
         }
-        this.data = new FriendlyByteBuf(kv.readBytes(integer3));
+        this.data = new FriendlyByteBuf(mg.readBytes(integer3));
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeResourceLocation(this.identifier);
-        kv.writeBytes(this.data.copy());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeResourceLocation(this.identifier);
+        mg.writeBytes(this.data.copy());
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleCustomPayload(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleCustomPayload(this);
     }
     
     public ResourceLocation getIdentifier() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundCustomSoundPacket.java b/src/net/minecraft/network/protocol/game/ClientboundCustomSoundPacket.java
index 4a880f2..e656f2e 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundCustomSoundPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundCustomSoundPacket.java
@@ -21,37 +21,37 @@ public class ClientboundCustomSoundPacket implements Packet<ClientGamePacketList
         this.y = Integer.MAX_VALUE;
     }
     
-    public ClientboundCustomSoundPacket(final ResourceLocation sm, final SoundSource aaj, final Vec3 cvl, final float float4, final float float5) {
+    public ClientboundCustomSoundPacket(final ResourceLocation uh, final SoundSource acm, final Vec3 dem, final float float4, final float float5) {
         this.y = Integer.MAX_VALUE;
-        this.name = sm;
-        this.source = aaj;
-        this.x = (int)(cvl.x * 8.0);
-        this.y = (int)(cvl.y * 8.0);
-        this.z = (int)(cvl.z * 8.0);
+        this.name = uh;
+        this.source = acm;
+        this.x = (int)(dem.x * 8.0);
+        this.y = (int)(dem.y * 8.0);
+        this.z = (int)(dem.z * 8.0);
         this.volume = float4;
         this.pitch = float5;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.name = kv.readResourceLocation();
-        this.source = kv.<SoundSource>readEnum(SoundSource.class);
-        this.x = kv.readInt();
-        this.y = kv.readInt();
-        this.z = kv.readInt();
-        this.volume = kv.readFloat();
-        this.pitch = kv.readFloat();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.name = mg.readResourceLocation();
+        this.source = mg.<SoundSource>readEnum(SoundSource.class);
+        this.x = mg.readInt();
+        this.y = mg.readInt();
+        this.z = mg.readInt();
+        this.volume = mg.readFloat();
+        this.pitch = mg.readFloat();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeResourceLocation(this.name);
-        kv.writeEnum(this.source);
-        kv.writeInt(this.x);
-        kv.writeInt(this.y);
-        kv.writeInt(this.z);
-        kv.writeFloat(this.volume);
-        kv.writeFloat(this.pitch);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeResourceLocation(this.name);
+        mg.writeEnum(this.source);
+        mg.writeInt(this.x);
+        mg.writeInt(this.y);
+        mg.writeInt(this.z);
+        mg.writeFloat(this.volume);
+        mg.writeFloat(this.pitch);
     }
     
     public ResourceLocation getName() {
@@ -83,7 +83,7 @@ public class ClientboundCustomSoundPacket implements Packet<ClientGamePacketList
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleCustomSoundEvent(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleCustomSoundEvent(this);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundDisconnectPacket.java b/src/net/minecraft/network/protocol/game/ClientboundDisconnectPacket.java
index 3bd309f..4a6562f 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundDisconnectPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundDisconnectPacket.java
@@ -12,23 +12,23 @@ public class ClientboundDisconnectPacket implements Packet<ClientGamePacketListe
     public ClientboundDisconnectPacket() {
     }
     
-    public ClientboundDisconnectPacket(final Component lf) {
-        this.reason = lf;
+    public ClientboundDisconnectPacket(final Component mr) {
+        this.reason = mr;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.reason = kv.readComponent();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.reason = mg.readComponent();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeComponent(this.reason);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeComponent(this.reason);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleDisconnect(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleDisconnect(this);
     }
     
     public Component getReason() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundEntityEventPacket.java b/src/net/minecraft/network/protocol/game/ClientboundEntityEventPacket.java
index fca54eb..6b91d0a 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundEntityEventPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundEntityEventPacket.java
@@ -14,30 +14,30 @@ public class ClientboundEntityEventPacket implements Packet<ClientGamePacketList
     public ClientboundEntityEventPacket() {
     }
     
-    public ClientboundEntityEventPacket(final Entity akq, final byte byte2) {
-        this.entityId = akq.getId();
+    public ClientboundEntityEventPacket(final Entity aom, final byte byte2) {
+        this.entityId = aom.getId();
         this.eventId = byte2;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entityId = kv.readInt();
-        this.eventId = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entityId = mg.readInt();
+        this.eventId = mg.readByte();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeInt(this.entityId);
-        kv.writeByte(this.eventId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeInt(this.entityId);
+        mg.writeByte(this.eventId);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleEntityEvent(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleEntityEvent(this);
     }
     
-    public Entity getEntity(final Level bjw) {
-        return bjw.getEntity(this.entityId);
+    public Entity getEntity(final Level bqb) {
+        return bqb.getEntity(this.entityId);
     }
     
     public byte getEventId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundExplodePacket.java b/src/net/minecraft/network/protocol/game/ClientboundExplodePacket.java
index aea955d..b2aa5e1 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundExplodePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundExplodePacket.java
@@ -24,67 +24,67 @@ public class ClientboundExplodePacket implements Packet<ClientGamePacketListener
     public ClientboundExplodePacket() {
     }
     
-    public ClientboundExplodePacket(final double double1, final double double2, final double double3, final float float4, final List<BlockPos> list, final Vec3 cvl) {
+    public ClientboundExplodePacket(final double double1, final double double2, final double double3, final float float4, final List<BlockPos> list, final Vec3 dem) {
         this.x = double1;
         this.y = double2;
         this.z = double3;
         this.power = float4;
         this.toBlow = Lists.newArrayList(list);
-        if (cvl != null) {
-            this.knockbackX = (float)cvl.x;
-            this.knockbackY = (float)cvl.y;
-            this.knockbackZ = (float)cvl.z;
+        if (dem != null) {
+            this.knockbackX = (float)dem.x;
+            this.knockbackY = (float)dem.y;
+            this.knockbackZ = (float)dem.z;
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.x = kv.readFloat();
-        this.y = kv.readFloat();
-        this.z = kv.readFloat();
-        this.power = kv.readFloat();
-        final int integer3 = kv.readInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.x = mg.readFloat();
+        this.y = mg.readFloat();
+        this.z = mg.readFloat();
+        this.power = mg.readFloat();
+        final int integer3 = mg.readInt();
         this.toBlow = Lists.newArrayListWithCapacity(integer3);
         final int integer4 = Mth.floor(this.x);
         final int integer5 = Mth.floor(this.y);
         final int integer6 = Mth.floor(this.z);
         for (int integer7 = 0; integer7 < integer3; ++integer7) {
-            final int integer8 = kv.readByte() + integer4;
-            final int integer9 = kv.readByte() + integer5;
-            final int integer10 = kv.readByte() + integer6;
+            final int integer8 = mg.readByte() + integer4;
+            final int integer9 = mg.readByte() + integer5;
+            final int integer10 = mg.readByte() + integer6;
             this.toBlow.add(new BlockPos(integer8, integer9, integer10));
         }
-        this.knockbackX = kv.readFloat();
-        this.knockbackY = kv.readFloat();
-        this.knockbackZ = kv.readFloat();
+        this.knockbackX = mg.readFloat();
+        this.knockbackY = mg.readFloat();
+        this.knockbackZ = mg.readFloat();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeFloat((float)this.x);
-        kv.writeFloat((float)this.y);
-        kv.writeFloat((float)this.z);
-        kv.writeFloat(this.power);
-        kv.writeInt(this.toBlow.size());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeFloat((float)this.x);
+        mg.writeFloat((float)this.y);
+        mg.writeFloat((float)this.z);
+        mg.writeFloat(this.power);
+        mg.writeInt(this.toBlow.size());
         final int integer3 = Mth.floor(this.x);
         final int integer4 = Mth.floor(this.y);
         final int integer5 = Mth.floor(this.z);
-        for (final BlockPos fk7 : this.toBlow) {
-            final int integer6 = fk7.getX() - integer3;
-            final int integer7 = fk7.getY() - integer4;
-            final int integer8 = fk7.getZ() - integer5;
-            kv.writeByte(integer6);
-            kv.writeByte(integer7);
-            kv.writeByte(integer8);
+        for (final BlockPos fu7 : this.toBlow) {
+            final int integer6 = fu7.getX() - integer3;
+            final int integer7 = fu7.getY() - integer4;
+            final int integer8 = fu7.getZ() - integer5;
+            mg.writeByte(integer6);
+            mg.writeByte(integer7);
+            mg.writeByte(integer8);
         }
-        kv.writeFloat(this.knockbackX);
-        kv.writeFloat(this.knockbackY);
-        kv.writeFloat(this.knockbackZ);
+        mg.writeFloat(this.knockbackX);
+        mg.writeFloat(this.knockbackY);
+        mg.writeFloat(this.knockbackZ);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleExplosion(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleExplosion(this);
     }
     
     public float getKnockbackX() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundForgetLevelChunkPacket.java b/src/net/minecraft/network/protocol/game/ClientboundForgetLevelChunkPacket.java
index 6310385..b3c4ba6 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundForgetLevelChunkPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundForgetLevelChunkPacket.java
@@ -18,20 +18,20 @@ public class ClientboundForgetLevelChunkPacket implements Packet<ClientGamePacke
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.x = kv.readInt();
-        this.z = kv.readInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.x = mg.readInt();
+        this.z = mg.readInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeInt(this.x);
-        kv.writeInt(this.z);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeInt(this.x);
+        mg.writeInt(this.z);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleForgetLevelChunk(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleForgetLevelChunk(this);
     }
     
     public int getX() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundGameEventPacket.java b/src/net/minecraft/network/protocol/game/ClientboundGameEventPacket.java
index 600caef..a7336bd 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundGameEventPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundGameEventPacket.java
@@ -1,41 +1,54 @@
 package net.minecraft.network.protocol.game;
 
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.network.PacketListener;
 import java.io.IOException;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.Packet;
 
 public class ClientboundGameEventPacket implements Packet<ClientGamePacketListener> {
-    public static final String[] EVENT_LANGUAGE_ID;
-    private int event;
+    public static final Type NO_RESPAWN_BLOCK_AVAILABLE;
+    public static final Type START_RAINING;
+    public static final Type STOP_RAINING;
+    public static final Type CHANGE_GAME_MODE;
+    public static final Type WIN_GAME;
+    public static final Type DEMO_EVENT;
+    public static final Type ARROW_HIT_PLAYER;
+    public static final Type RAIN_LEVEL_CHANGE;
+    public static final Type THUNDER_LEVEL_CHANGE;
+    public static final Type PUFFER_FISH_STING;
+    public static final Type GUARDIAN_ELDER_EFFECT;
+    public static final Type IMMEDIATE_RESPAWN;
+    private Type event;
     private float param;
     
     public ClientboundGameEventPacket() {
     }
     
-    public ClientboundGameEventPacket(final int integer, final float float2) {
-        this.event = integer;
+    public ClientboundGameEventPacket(final Type a, final float float2) {
+        this.event = a;
         this.param = float2;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.event = kv.readUnsignedByte();
-        this.param = kv.readFloat();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.event = (Type)Type.TYPES.get((int)mg.readUnsignedByte());
+        this.param = mg.readFloat();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.event);
-        kv.writeFloat(this.param);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.event.id);
+        mg.writeFloat(this.param);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleGameEvent(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleGameEvent(this);
     }
     
-    public int getEvent() {
+    public Type getEvent() {
         return this.event;
     }
     
@@ -44,6 +57,31 @@ public class ClientboundGameEventPacket implements Packet<ClientGamePacketListen
     }
     
     static {
-        EVENT_LANGUAGE_ID = new String[] { "block.minecraft.bed.not_valid" };
+        NO_RESPAWN_BLOCK_AVAILABLE = new Type(0);
+        START_RAINING = new Type(1);
+        STOP_RAINING = new Type(2);
+        CHANGE_GAME_MODE = new Type(3);
+        WIN_GAME = new Type(4);
+        DEMO_EVENT = new Type(5);
+        ARROW_HIT_PLAYER = new Type(6);
+        RAIN_LEVEL_CHANGE = new Type(7);
+        THUNDER_LEVEL_CHANGE = new Type(8);
+        PUFFER_FISH_STING = new Type(9);
+        GUARDIAN_ELDER_EFFECT = new Type(10);
+        IMMEDIATE_RESPAWN = new Type(11);
+    }
+    
+    public static class Type {
+        private static final Int2ObjectMap<Type> TYPES;
+        private final int id;
+        
+        public Type(final int integer) {
+            this.id = integer;
+            Type.TYPES.put(integer, this);
+        }
+        
+        static {
+            TYPES = (Int2ObjectMap)new Int2ObjectOpenHashMap();
+        }
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundHorseScreenOpenPacket.java b/src/net/minecraft/network/protocol/game/ClientboundHorseScreenOpenPacket.java
index 12ebd9e..7a6bb0b 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundHorseScreenOpenPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundHorseScreenOpenPacket.java
@@ -20,22 +20,22 @@ public class ClientboundHorseScreenOpenPacket implements Packet<ClientGamePacket
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleHorseScreenOpen(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleHorseScreenOpen(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readUnsignedByte();
-        this.size = kv.readVarInt();
-        this.entityId = kv.readInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readUnsignedByte();
+        this.size = mg.readVarInt();
+        this.entityId = mg.readInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
-        kv.writeVarInt(this.size);
-        kv.writeInt(this.entityId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
+        mg.writeVarInt(this.size);
+        mg.writeInt(this.entityId);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundKeepAlivePacket.java b/src/net/minecraft/network/protocol/game/ClientboundKeepAlivePacket.java
index d23c41c..cda2bb3 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundKeepAlivePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundKeepAlivePacket.java
@@ -16,18 +16,18 @@ public class ClientboundKeepAlivePacket implements Packet<ClientGamePacketListen
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleKeepAlive(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleKeepAlive(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readLong();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readLong();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeLong(this.id);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeLong(this.id);
     }
     
     public long getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java b/src/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java
index 0908486..80f860f 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java
@@ -32,83 +32,87 @@ public class ClientboundLevelChunkPacket implements Packet<ClientGamePacketListe
     private byte[] buffer;
     private List<CompoundTag> blockEntitiesTags;
     private boolean fullChunk;
+    private boolean forgetOldData;
     
     public ClientboundLevelChunkPacket() {
     }
     
-    public ClientboundLevelChunkPacket(final LevelChunk cal, final int integer) {
-        final ChunkPos bjh4 = cal.getPos();
-        this.x = bjh4.x;
-        this.z = bjh4.z;
+    public ClientboundLevelChunkPacket(final LevelChunk chj, final int integer, final boolean boolean3) {
+        final ChunkPos bph5 = chj.getPos();
+        this.x = bph5.x;
+        this.z = bph5.z;
         this.fullChunk = (integer == 65535);
+        this.forgetOldData = boolean3;
         this.heightmaps = new CompoundTag();
-        for (final Map.Entry<Heightmap.Types, Heightmap> entry6 : cal.getHeightmaps()) {
-            if (!entry6.getKey().sendToClient()) {
+        for (final Map.Entry<Heightmap.Types, Heightmap> entry7 : chj.getHeightmaps()) {
+            if (!entry7.getKey().sendToClient()) {
                 continue;
             }
-            this.heightmaps.put(entry6.getKey().getSerializationKey(), new LongArrayTag(entry6.getValue().getRawData()));
+            this.heightmaps.put(entry7.getKey().getSerializationKey(), new LongArrayTag(entry7.getValue().getRawData()));
         }
         if (this.fullChunk) {
-            this.biomes = cal.getBiomes().copy();
+            this.biomes = chj.getBiomes().copy();
         }
-        this.buffer = new byte[this.calculateChunkSize(cal, integer)];
-        this.availableSections = this.extractChunkData(new FriendlyByteBuf(this.getWriteBuffer()), cal, integer);
+        this.buffer = new byte[this.calculateChunkSize(chj, integer)];
+        this.availableSections = this.extractChunkData(new FriendlyByteBuf(this.getWriteBuffer()), chj, integer);
         this.blockEntitiesTags = Lists.newArrayList();
-        for (final Map.Entry<BlockPos, BlockEntity> entry7 : cal.getBlockEntities().entrySet()) {
-            final BlockPos fk7 = entry7.getKey();
-            final BlockEntity bwl8 = entry7.getValue();
-            final int integer2 = fk7.getY() >> 4;
+        for (final Map.Entry<BlockPos, BlockEntity> entry8 : chj.getBlockEntities().entrySet()) {
+            final BlockPos fu8 = entry8.getKey();
+            final BlockEntity cdl9 = entry8.getValue();
+            final int integer2 = fu8.getY() >> 4;
             if (!this.isFullChunk() && (integer & 1 << integer2) == 0x0) {
                 continue;
             }
-            final CompoundTag jt10 = bwl8.getUpdateTag();
-            this.blockEntitiesTags.add(jt10);
+            final CompoundTag le11 = cdl9.getUpdateTag();
+            this.blockEntitiesTags.add(le11);
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.x = kv.readInt();
-        this.z = kv.readInt();
-        this.fullChunk = kv.readBoolean();
-        this.availableSections = kv.readVarInt();
-        this.heightmaps = kv.readNbt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.x = mg.readInt();
+        this.z = mg.readInt();
+        this.fullChunk = mg.readBoolean();
+        this.forgetOldData = mg.readBoolean();
+        this.availableSections = mg.readVarInt();
+        this.heightmaps = mg.readNbt();
         if (this.fullChunk) {
-            this.biomes = new ChunkBiomeContainer(kv);
+            this.biomes = new ChunkBiomeContainer(mg);
         }
-        final int integer3 = kv.readVarInt();
+        final int integer3 = mg.readVarInt();
         if (integer3 > 2097152) {
             throw new RuntimeException("Chunk Packet trying to allocate too much memory on read.");
         }
-        kv.readBytes(this.buffer = new byte[integer3]);
-        final int integer4 = kv.readVarInt();
+        mg.readBytes(this.buffer = new byte[integer3]);
+        final int integer4 = mg.readVarInt();
         this.blockEntitiesTags = Lists.newArrayList();
         for (int integer5 = 0; integer5 < integer4; ++integer5) {
-            this.blockEntitiesTags.add(kv.readNbt());
+            this.blockEntitiesTags.add(mg.readNbt());
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeInt(this.x);
-        kv.writeInt(this.z);
-        kv.writeBoolean(this.fullChunk);
-        kv.writeVarInt(this.availableSections);
-        kv.writeNbt(this.heightmaps);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeInt(this.x);
+        mg.writeInt(this.z);
+        mg.writeBoolean(this.fullChunk);
+        mg.writeBoolean(this.forgetOldData);
+        mg.writeVarInt(this.availableSections);
+        mg.writeNbt(this.heightmaps);
         if (this.biomes != null) {
-            this.biomes.write(kv);
+            this.biomes.write(mg);
         }
-        kv.writeVarInt(this.buffer.length);
-        kv.writeBytes(this.buffer);
-        kv.writeVarInt(this.blockEntitiesTags.size());
-        for (final CompoundTag jt4 : this.blockEntitiesTags) {
-            kv.writeNbt(jt4);
+        mg.writeVarInt(this.buffer.length);
+        mg.writeBytes(this.buffer);
+        mg.writeVarInt(this.blockEntitiesTags.size());
+        for (final CompoundTag le4 : this.blockEntitiesTags) {
+            mg.writeNbt(le4);
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleLevelChunk(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleLevelChunk(this);
     }
     
     public FriendlyByteBuf getReadBuffer() {
@@ -121,29 +125,29 @@ public class ClientboundLevelChunkPacket implements Packet<ClientGamePacketListe
         return byteBuf2;
     }
     
-    public int extractChunkData(final FriendlyByteBuf kv, final LevelChunk cal, final int integer) {
+    public int extractChunkData(final FriendlyByteBuf mg, final LevelChunk chj, final int integer) {
         int integer2 = 0;
-        final LevelChunkSection[] arr6 = cal.getSections();
+        final LevelChunkSection[] arr6 = chj.getSections();
         for (int integer3 = 0, integer4 = arr6.length; integer3 < integer4; ++integer3) {
-            final LevelChunkSection cam9 = arr6[integer3];
-            if (cam9 != LevelChunk.EMPTY_SECTION && (!this.isFullChunk() || !cam9.isEmpty())) {
+            final LevelChunkSection chk9 = arr6[integer3];
+            if (chk9 != LevelChunk.EMPTY_SECTION && (!this.isFullChunk() || !chk9.isEmpty())) {
                 if ((integer & 1 << integer3) != 0x0) {
                     integer2 |= 1 << integer3;
-                    cam9.write(kv);
+                    chk9.write(mg);
                 }
             }
         }
         return integer2;
     }
     
-    protected int calculateChunkSize(final LevelChunk cal, final int integer) {
+    protected int calculateChunkSize(final LevelChunk chj, final int integer) {
         int integer2 = 0;
-        final LevelChunkSection[] arr5 = cal.getSections();
+        final LevelChunkSection[] arr5 = chj.getSections();
         for (int integer3 = 0, integer4 = arr5.length; integer3 < integer4; ++integer3) {
-            final LevelChunkSection cam8 = arr5[integer3];
-            if (cam8 != LevelChunk.EMPTY_SECTION && (!this.isFullChunk() || !cam8.isEmpty())) {
+            final LevelChunkSection chk8 = arr5[integer3];
+            if (chk8 != LevelChunk.EMPTY_SECTION && (!this.isFullChunk() || !chk8.isEmpty())) {
                 if ((integer & 1 << integer3) != 0x0) {
-                    integer2 += cam8.getSerializedSize();
+                    integer2 += chk8.getSerializedSize();
                 }
             }
         }
@@ -166,6 +170,10 @@ public class ClientboundLevelChunkPacket implements Packet<ClientGamePacketListe
         return this.fullChunk;
     }
     
+    public boolean forgetOldData() {
+        return this.forgetOldData;
+    }
+    
     public CompoundTag getHeightmaps() {
         return this.heightmaps;
     }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundLevelEventPacket.java b/src/net/minecraft/network/protocol/game/ClientboundLevelEventPacket.java
index c768add..e65c6a1 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundLevelEventPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundLevelEventPacket.java
@@ -15,32 +15,32 @@ public class ClientboundLevelEventPacket implements Packet<ClientGamePacketListe
     public ClientboundLevelEventPacket() {
     }
     
-    public ClientboundLevelEventPacket(final int integer1, final BlockPos fk, final int integer3, final boolean boolean4) {
+    public ClientboundLevelEventPacket(final int integer1, final BlockPos fu, final int integer3, final boolean boolean4) {
         this.type = integer1;
-        this.pos = fk.immutable();
+        this.pos = fu.immutable();
         this.data = integer3;
         this.globalEvent = boolean4;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.type = kv.readInt();
-        this.pos = kv.readBlockPos();
-        this.data = kv.readInt();
-        this.globalEvent = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.type = mg.readInt();
+        this.pos = mg.readBlockPos();
+        this.data = mg.readInt();
+        this.globalEvent = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeInt(this.type);
-        kv.writeBlockPos(this.pos);
-        kv.writeInt(this.data);
-        kv.writeBoolean(this.globalEvent);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeInt(this.type);
+        mg.writeBlockPos(this.pos);
+        mg.writeInt(this.data);
+        mg.writeBoolean(this.globalEvent);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleLevelEvent(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleLevelEvent(this);
     }
     
     public boolean isGlobalEvent() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundLevelParticlesPacket.java b/src/net/minecraft/network/protocol/game/ClientboundLevelParticlesPacket.java
index 318974a..d6cdb09 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundLevelParticlesPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundLevelParticlesPacket.java
@@ -24,8 +24,8 @@ public class ClientboundLevelParticlesPacket implements Packet<ClientGamePacketL
     public ClientboundLevelParticlesPacket() {
     }
     
-    public <T extends ParticleOptions> ClientboundLevelParticlesPacket(final T gt, final boolean boolean2, final double double3, final double double4, final double double5, final float float6, final float float7, final float float8, final float float9, final int integer) {
-        this.particle = gt;
+    public <T extends ParticleOptions> ClientboundLevelParticlesPacket(final T hf, final boolean boolean2, final double double3, final double double4, final double double5, final float float6, final float float7, final float float8, final float float9, final int integer) {
+        this.particle = hf;
         this.overrideLimiter = boolean2;
         this.x = double3;
         this.y = double4;
@@ -38,40 +38,40 @@ public class ClientboundLevelParticlesPacket implements Packet<ClientGamePacketL
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        ParticleType<?> gu3 = Registry.PARTICLE_TYPE.byId(kv.readInt());
-        if (gu3 == null) {
-            gu3 = ParticleTypes.BARRIER;
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        ParticleType<?> hg3 = Registry.PARTICLE_TYPE.byId(mg.readInt());
+        if (hg3 == null) {
+            hg3 = ParticleTypes.BARRIER;
         }
-        this.overrideLimiter = kv.readBoolean();
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-        this.xDist = kv.readFloat();
-        this.yDist = kv.readFloat();
-        this.zDist = kv.readFloat();
-        this.maxSpeed = kv.readFloat();
-        this.count = kv.readInt();
-        this.particle = this.<ParticleOptions>readParticle(kv, gu3);
+        this.overrideLimiter = mg.readBoolean();
+        this.x = mg.readDouble();
+        this.y = mg.readDouble();
+        this.z = mg.readDouble();
+        this.xDist = mg.readFloat();
+        this.yDist = mg.readFloat();
+        this.zDist = mg.readFloat();
+        this.maxSpeed = mg.readFloat();
+        this.count = mg.readInt();
+        this.particle = this.<ParticleOptions>readParticle(mg, hg3);
     }
     
-    private <T extends ParticleOptions> T readParticle(final FriendlyByteBuf kv, final ParticleType<T> gu) {
-        return gu.getDeserializer().fromNetwork(gu, kv);
+    private <T extends ParticleOptions> T readParticle(final FriendlyByteBuf mg, final ParticleType<T> hg) {
+        return hg.getDeserializer().fromNetwork(hg, mg);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeInt(Registry.PARTICLE_TYPE.getId(this.particle.getType()));
-        kv.writeBoolean(this.overrideLimiter);
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-        kv.writeFloat(this.xDist);
-        kv.writeFloat(this.yDist);
-        kv.writeFloat(this.zDist);
-        kv.writeFloat(this.maxSpeed);
-        kv.writeInt(this.count);
-        this.particle.writeToNetwork(kv);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeInt(Registry.PARTICLE_TYPE.getId(this.particle.getType()));
+        mg.writeBoolean(this.overrideLimiter);
+        mg.writeDouble(this.x);
+        mg.writeDouble(this.y);
+        mg.writeDouble(this.z);
+        mg.writeFloat(this.xDist);
+        mg.writeFloat(this.yDist);
+        mg.writeFloat(this.zDist);
+        mg.writeFloat(this.maxSpeed);
+        mg.writeInt(this.count);
+        this.particle.writeToNetwork(mg);
     }
     
     public boolean isOverrideLimiter() {
@@ -115,7 +115,7 @@ public class ClientboundLevelParticlesPacket implements Packet<ClientGamePacketL
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleParticleEvent(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleParticleEvent(this);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundLightUpdatePacket.java b/src/net/minecraft/network/protocol/game/ClientboundLightUpdatePacket.java
index 7f3a21b..7b6c253 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundLightUpdatePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundLightUpdatePacket.java
@@ -22,115 +22,120 @@ public class ClientboundLightUpdatePacket implements Packet<ClientGamePacketList
     private int emptyBlockYMask;
     private List<byte[]> skyUpdates;
     private List<byte[]> blockUpdates;
+    private boolean trustEdges;
     
     public ClientboundLightUpdatePacket() {
     }
     
-    public ClientboundLightUpdatePacket(final ChunkPos bjh, final LevelLightEngine coa) {
-        this.x = bjh.x;
-        this.z = bjh.z;
+    public ClientboundLightUpdatePacket(final ChunkPos bph, final LevelLightEngine cwr, final boolean boolean3) {
+        this.x = bph.x;
+        this.z = bph.z;
+        this.trustEdges = boolean3;
         this.skyUpdates = Lists.newArrayList();
         this.blockUpdates = Lists.newArrayList();
-        for (int integer4 = 0; integer4 < 18; ++integer4) {
-            final DataLayer caf5 = coa.getLayerListener(LightLayer.SKY).getDataLayerData(SectionPos.of(bjh, -1 + integer4));
-            final DataLayer caf6 = coa.getLayerListener(LightLayer.BLOCK).getDataLayerData(SectionPos.of(bjh, -1 + integer4));
-            if (caf5 != null) {
-                if (caf5.isEmpty()) {
-                    this.emptySkyYMask |= 1 << integer4;
+        for (int integer5 = 0; integer5 < 18; ++integer5) {
+            final DataLayer chd6 = cwr.getLayerListener(LightLayer.SKY).getDataLayerData(SectionPos.of(bph, -1 + integer5));
+            final DataLayer chd7 = cwr.getLayerListener(LightLayer.BLOCK).getDataLayerData(SectionPos.of(bph, -1 + integer5));
+            if (chd6 != null) {
+                if (chd6.isEmpty()) {
+                    this.emptySkyYMask |= 1 << integer5;
                 }
                 else {
-                    this.skyYMask |= 1 << integer4;
-                    this.skyUpdates.add(caf5.getData().clone());
+                    this.skyYMask |= 1 << integer5;
+                    this.skyUpdates.add(chd6.getData().clone());
                 }
             }
-            if (caf6 != null) {
-                if (caf6.isEmpty()) {
-                    this.emptyBlockYMask |= 1 << integer4;
+            if (chd7 != null) {
+                if (chd7.isEmpty()) {
+                    this.emptyBlockYMask |= 1 << integer5;
                 }
                 else {
-                    this.blockYMask |= 1 << integer4;
-                    this.blockUpdates.add(caf6.getData().clone());
+                    this.blockYMask |= 1 << integer5;
+                    this.blockUpdates.add(chd7.getData().clone());
                 }
             }
         }
     }
     
-    public ClientboundLightUpdatePacket(final ChunkPos bjh, final LevelLightEngine coa, final int integer3, final int integer4) {
-        this.x = bjh.x;
-        this.z = bjh.z;
+    public ClientboundLightUpdatePacket(final ChunkPos bph, final LevelLightEngine cwr, final int integer3, final int integer4, final boolean boolean5) {
+        this.x = bph.x;
+        this.z = bph.z;
+        this.trustEdges = boolean5;
         this.skyYMask = integer3;
         this.blockYMask = integer4;
         this.skyUpdates = Lists.newArrayList();
         this.blockUpdates = Lists.newArrayList();
         for (int integer5 = 0; integer5 < 18; ++integer5) {
             if ((this.skyYMask & 1 << integer5) != 0x0) {
-                final DataLayer caf7 = coa.getLayerListener(LightLayer.SKY).getDataLayerData(SectionPos.of(bjh, -1 + integer5));
-                if (caf7 == null || caf7.isEmpty()) {
+                final DataLayer chd8 = cwr.getLayerListener(LightLayer.SKY).getDataLayerData(SectionPos.of(bph, -1 + integer5));
+                if (chd8 == null || chd8.isEmpty()) {
                     this.skyYMask &= ~(1 << integer5);
-                    if (caf7 != null) {
+                    if (chd8 != null) {
                         this.emptySkyYMask |= 1 << integer5;
                     }
                 }
                 else {
-                    this.skyUpdates.add(caf7.getData().clone());
+                    this.skyUpdates.add(chd8.getData().clone());
                 }
             }
             if ((this.blockYMask & 1 << integer5) != 0x0) {
-                final DataLayer caf7 = coa.getLayerListener(LightLayer.BLOCK).getDataLayerData(SectionPos.of(bjh, -1 + integer5));
-                if (caf7 == null || caf7.isEmpty()) {
+                final DataLayer chd8 = cwr.getLayerListener(LightLayer.BLOCK).getDataLayerData(SectionPos.of(bph, -1 + integer5));
+                if (chd8 == null || chd8.isEmpty()) {
                     this.blockYMask &= ~(1 << integer5);
-                    if (caf7 != null) {
+                    if (chd8 != null) {
                         this.emptyBlockYMask |= 1 << integer5;
                     }
                 }
                 else {
-                    this.blockUpdates.add(caf7.getData().clone());
+                    this.blockUpdates.add(chd8.getData().clone());
                 }
             }
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.x = kv.readVarInt();
-        this.z = kv.readVarInt();
-        this.skyYMask = kv.readVarInt();
-        this.blockYMask = kv.readVarInt();
-        this.emptySkyYMask = kv.readVarInt();
-        this.emptyBlockYMask = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.x = mg.readVarInt();
+        this.z = mg.readVarInt();
+        this.trustEdges = mg.readBoolean();
+        this.skyYMask = mg.readVarInt();
+        this.blockYMask = mg.readVarInt();
+        this.emptySkyYMask = mg.readVarInt();
+        this.emptyBlockYMask = mg.readVarInt();
         this.skyUpdates = Lists.newArrayList();
         for (int integer3 = 0; integer3 < 18; ++integer3) {
             if ((this.skyYMask & 1 << integer3) != 0x0) {
-                this.skyUpdates.add(kv.readByteArray(2048));
+                this.skyUpdates.add(mg.readByteArray(2048));
             }
         }
         this.blockUpdates = Lists.newArrayList();
         for (int integer3 = 0; integer3 < 18; ++integer3) {
             if ((this.blockYMask & 1 << integer3) != 0x0) {
-                this.blockUpdates.add(kv.readByteArray(2048));
+                this.blockUpdates.add(mg.readByteArray(2048));
             }
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.x);
-        kv.writeVarInt(this.z);
-        kv.writeVarInt(this.skyYMask);
-        kv.writeVarInt(this.blockYMask);
-        kv.writeVarInt(this.emptySkyYMask);
-        kv.writeVarInt(this.emptyBlockYMask);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.x);
+        mg.writeVarInt(this.z);
+        mg.writeBoolean(this.trustEdges);
+        mg.writeVarInt(this.skyYMask);
+        mg.writeVarInt(this.blockYMask);
+        mg.writeVarInt(this.emptySkyYMask);
+        mg.writeVarInt(this.emptyBlockYMask);
         for (final byte[] arr4 : this.skyUpdates) {
-            kv.writeByteArray(arr4);
+            mg.writeByteArray(arr4);
         }
         for (final byte[] arr4 : this.blockUpdates) {
-            kv.writeByteArray(arr4);
+            mg.writeByteArray(arr4);
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleLightUpdatePacked(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleLightUpdatePacked(this);
     }
     
     public int getX() {
@@ -164,4 +169,8 @@ public class ClientboundLightUpdatePacket implements Packet<ClientGamePacketList
     public List<byte[]> getBlockUpdates() {
         return this.blockUpdates;
     }
+    
+    public boolean getTrustEdges() {
+        return this.trustEdges;
+    }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundLoginPacket.java b/src/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
index 3e12545..6c2b225 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
@@ -1,10 +1,16 @@
 package net.minecraft.network.protocol.game;
 
 import net.minecraft.network.PacketListener;
+import java.util.Iterator;
 import java.io.IOException;
+import net.minecraft.core.Registry;
+import com.google.common.collect.Sets;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.level.LevelType;
 import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import java.util.Set;
 import net.minecraft.world.level.GameType;
 import net.minecraft.network.protocol.Packet;
 
@@ -13,68 +19,92 @@ public class ClientboundLoginPacket implements Packet<ClientGamePacketListener>
     private long seed;
     private boolean hardcore;
     private GameType gameType;
-    private DimensionType dimension;
+    private GameType previousGameType;
+    private Set<ResourceKey<Level>> levels;
+    private RegistryAccess.RegistryHolder registryHolder;
+    private ResourceKey<DimensionType> dimensionType;
+    private ResourceKey<Level> dimension;
     private int maxPlayers;
-    private LevelType levelType;
     private int chunkRadius;
     private boolean reducedDebugInfo;
     private boolean showDeathScreen;
+    private boolean isDebug;
+    private boolean isFlat;
     
     public ClientboundLoginPacket() {
     }
     
-    public ClientboundLoginPacket(final int integer1, final GameType bjt, final long long3, final boolean boolean4, final DimensionType cbi, final int integer6, final LevelType bkd, final int integer8, final boolean boolean9, final boolean boolean10) {
+    public ClientboundLoginPacket(final int integer1, final GameType bpy2, final GameType bpy3, final long long4, final boolean boolean5, final Set<ResourceKey<Level>> set, final RegistryAccess.RegistryHolder a, final ResourceKey<DimensionType> ug8, final ResourceKey<Level> ug9, final int integer10, final int integer11, final boolean boolean12, final boolean boolean13, final boolean boolean14, final boolean boolean15) {
         this.playerId = integer1;
-        this.dimension = cbi;
-        this.seed = long3;
-        this.gameType = bjt;
-        this.maxPlayers = integer6;
-        this.hardcore = boolean4;
-        this.levelType = bkd;
-        this.chunkRadius = integer8;
-        this.reducedDebugInfo = boolean9;
-        this.showDeathScreen = boolean10;
+        this.levels = set;
+        this.registryHolder = a;
+        this.dimensionType = ug8;
+        this.dimension = ug9;
+        this.seed = long4;
+        this.gameType = bpy2;
+        this.previousGameType = bpy3;
+        this.maxPlayers = integer10;
+        this.hardcore = boolean5;
+        this.chunkRadius = integer11;
+        this.reducedDebugInfo = boolean12;
+        this.showDeathScreen = boolean13;
+        this.isDebug = boolean14;
+        this.isFlat = boolean15;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.playerId = kv.readInt();
-        int integer3 = kv.readUnsignedByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.playerId = mg.readInt();
+        int integer3 = mg.readUnsignedByte();
         this.hardcore = ((integer3 & 0x8) == 0x8);
         integer3 &= 0xFFFFFFF7;
         this.gameType = GameType.byId(integer3);
-        this.dimension = DimensionType.getById(kv.readInt());
-        this.seed = kv.readLong();
-        this.maxPlayers = kv.readUnsignedByte();
-        this.levelType = LevelType.getLevelType(kv.readUtf(16));
-        if (this.levelType == null) {
-            this.levelType = LevelType.NORMAL;
+        this.previousGameType = GameType.byId(mg.readUnsignedByte());
+        final int integer4 = mg.readVarInt();
+        this.levels = Sets.newHashSet();
+        for (int integer5 = 0; integer5 < integer4; ++integer5) {
+            this.levels.add(ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, mg.readResourceLocation()));
         }
-        this.chunkRadius = kv.readVarInt();
-        this.reducedDebugInfo = kv.readBoolean();
-        this.showDeathScreen = kv.readBoolean();
+        this.registryHolder = mg.<RegistryAccess.RegistryHolder>readWithCodec(RegistryAccess.RegistryHolder.CODEC);
+        this.dimensionType = ResourceKey.<DimensionType>create(Registry.DIMENSION_TYPE_REGISTRY, mg.readResourceLocation());
+        this.dimension = ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, mg.readResourceLocation());
+        this.seed = mg.readLong();
+        this.maxPlayers = mg.readUnsignedByte();
+        this.chunkRadius = mg.readVarInt();
+        this.reducedDebugInfo = mg.readBoolean();
+        this.showDeathScreen = mg.readBoolean();
+        this.isDebug = mg.readBoolean();
+        this.isFlat = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeInt(this.playerId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeInt(this.playerId);
         int integer3 = this.gameType.getId();
         if (this.hardcore) {
             integer3 |= 0x8;
         }
-        kv.writeByte(integer3);
-        kv.writeInt(this.dimension.getId());
-        kv.writeLong(this.seed);
-        kv.writeByte(this.maxPlayers);
-        kv.writeUtf(this.levelType.getName());
-        kv.writeVarInt(this.chunkRadius);
-        kv.writeBoolean(this.reducedDebugInfo);
-        kv.writeBoolean(this.showDeathScreen);
+        mg.writeByte(integer3);
+        mg.writeByte(this.previousGameType.getId());
+        mg.writeVarInt(this.levels.size());
+        for (final ResourceKey<Level> ug5 : this.levels) {
+            mg.writeResourceLocation(ug5.location());
+        }
+        mg.<RegistryAccess.RegistryHolder>writeWithCodec(RegistryAccess.RegistryHolder.CODEC, this.registryHolder);
+        mg.writeResourceLocation(this.dimensionType.location());
+        mg.writeResourceLocation(this.dimension.location());
+        mg.writeLong(this.seed);
+        mg.writeByte(this.maxPlayers);
+        mg.writeVarInt(this.chunkRadius);
+        mg.writeBoolean(this.reducedDebugInfo);
+        mg.writeBoolean(this.showDeathScreen);
+        mg.writeBoolean(this.isDebug);
+        mg.writeBoolean(this.isFlat);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleLogin(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleLogin(this);
     }
     
     public int getPlayerId() {
@@ -93,12 +123,24 @@ public class ClientboundLoginPacket implements Packet<ClientGamePacketListener>
         return this.gameType;
     }
     
-    public DimensionType getDimension() {
-        return this.dimension;
+    public GameType getPreviousGameType() {
+        return this.previousGameType;
     }
     
-    public LevelType getLevelType() {
-        return this.levelType;
+    public Set<ResourceKey<Level>> levels() {
+        return this.levels;
+    }
+    
+    public RegistryAccess registryAccess() {
+        return this.registryHolder;
+    }
+    
+    public ResourceKey<DimensionType> getDimensionType() {
+        return this.dimensionType;
+    }
+    
+    public ResourceKey<Level> getDimension() {
+        return this.dimension;
     }
     
     public int getChunkRadius() {
@@ -112,4 +154,12 @@ public class ClientboundLoginPacket implements Packet<ClientGamePacketListener>
     public boolean shouldShowDeathScreen() {
         return this.showDeathScreen;
     }
+    
+    public boolean isDebug() {
+        return this.isDebug;
+    }
+    
+    public boolean isFlat() {
+        return this.isFlat;
+    }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java b/src/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java
index a1f95fa..fdff53c 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java
@@ -42,75 +42,75 @@ public class ClientboundMapItemDataPacket implements Packet<ClientGamePacketList
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.mapId = kv.readVarInt();
-        this.scale = kv.readByte();
-        this.trackingPosition = kv.readBoolean();
-        this.locked = kv.readBoolean();
-        this.decorations = new MapDecoration[kv.readVarInt()];
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.mapId = mg.readVarInt();
+        this.scale = mg.readByte();
+        this.trackingPosition = mg.readBoolean();
+        this.locked = mg.readBoolean();
+        this.decorations = new MapDecoration[mg.readVarInt()];
         for (int integer3 = 0; integer3 < this.decorations.length; ++integer3) {
-            final MapDecoration.Type a4 = kv.<MapDecoration.Type>readEnum(MapDecoration.Type.class);
-            this.decorations[integer3] = new MapDecoration(a4, kv.readByte(), kv.readByte(), (byte)(kv.readByte() & 0xF), kv.readBoolean() ? kv.readComponent() : null);
+            final MapDecoration.Type a4 = mg.<MapDecoration.Type>readEnum(MapDecoration.Type.class);
+            this.decorations[integer3] = new MapDecoration(a4, mg.readByte(), mg.readByte(), (byte)(mg.readByte() & 0xF), mg.readBoolean() ? mg.readComponent() : null);
         }
-        this.width = kv.readUnsignedByte();
+        this.width = mg.readUnsignedByte();
         if (this.width > 0) {
-            this.height = kv.readUnsignedByte();
-            this.startX = kv.readUnsignedByte();
-            this.startY = kv.readUnsignedByte();
-            this.mapColors = kv.readByteArray();
+            this.height = mg.readUnsignedByte();
+            this.startX = mg.readUnsignedByte();
+            this.startY = mg.readUnsignedByte();
+            this.mapColors = mg.readByteArray();
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.mapId);
-        kv.writeByte(this.scale);
-        kv.writeBoolean(this.trackingPosition);
-        kv.writeBoolean(this.locked);
-        kv.writeVarInt(this.decorations.length);
-        for (final MapDecoration crd6 : this.decorations) {
-            kv.writeEnum(crd6.getType());
-            kv.writeByte(crd6.getX());
-            kv.writeByte(crd6.getY());
-            kv.writeByte(crd6.getRot() & 0xF);
-            if (crd6.getName() != null) {
-                kv.writeBoolean(true);
-                kv.writeComponent(crd6.getName());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.mapId);
+        mg.writeByte(this.scale);
+        mg.writeBoolean(this.trackingPosition);
+        mg.writeBoolean(this.locked);
+        mg.writeVarInt(this.decorations.length);
+        for (final MapDecoration czs6 : this.decorations) {
+            mg.writeEnum(czs6.getType());
+            mg.writeByte(czs6.getX());
+            mg.writeByte(czs6.getY());
+            mg.writeByte(czs6.getRot() & 0xF);
+            if (czs6.getName() != null) {
+                mg.writeBoolean(true);
+                mg.writeComponent(czs6.getName());
             }
             else {
-                kv.writeBoolean(false);
+                mg.writeBoolean(false);
             }
         }
-        kv.writeByte(this.width);
+        mg.writeByte(this.width);
         if (this.width > 0) {
-            kv.writeByte(this.height);
-            kv.writeByte(this.startX);
-            kv.writeByte(this.startY);
-            kv.writeByteArray(this.mapColors);
+            mg.writeByte(this.height);
+            mg.writeByte(this.startX);
+            mg.writeByte(this.startY);
+            mg.writeByteArray(this.mapColors);
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleMapItemData(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleMapItemData(this);
     }
     
     public int getMapId() {
         return this.mapId;
     }
     
-    public void applyToMap(final MapItemSavedData crg) {
-        crg.scale = this.scale;
-        crg.trackingPosition = this.trackingPosition;
-        crg.locked = this.locked;
-        crg.decorations.clear();
+    public void applyToMap(final MapItemSavedData czv) {
+        czv.scale = this.scale;
+        czv.trackingPosition = this.trackingPosition;
+        czv.locked = this.locked;
+        czv.decorations.clear();
         for (int integer3 = 0; integer3 < this.decorations.length; ++integer3) {
-            final MapDecoration crd4 = this.decorations[integer3];
-            crg.decorations.put("icon-" + integer3, crd4);
+            final MapDecoration czs4 = this.decorations[integer3];
+            czv.decorations.put("icon-" + integer3, czs4);
         }
         for (int integer3 = 0; integer3 < this.width; ++integer3) {
             for (int integer4 = 0; integer4 < this.height; ++integer4) {
-                crg.colors[this.startX + integer3 + (this.startY + integer4) * 128] = this.mapColors[integer3 + integer4 * this.width];
+                czv.colors[this.startX + integer3 + (this.startY + integer4) * 128] = this.mapColors[integer3 + integer4 * this.width];
             }
         }
     }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundMerchantOffersPacket.java b/src/net/minecraft/network/protocol/game/ClientboundMerchantOffersPacket.java
index 76f3eb3..cb65114 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundMerchantOffersPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundMerchantOffersPacket.java
@@ -17,9 +17,9 @@ public class ClientboundMerchantOffersPacket implements Packet<ClientGamePacketL
     public ClientboundMerchantOffersPacket() {
     }
     
-    public ClientboundMerchantOffersPacket(final int integer1, final MerchantOffers bja, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6) {
+    public ClientboundMerchantOffersPacket(final int integer1, final MerchantOffers bpa, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6) {
         this.containerId = integer1;
-        this.offers = bja;
+        this.offers = bpa;
         this.villagerLevel = integer3;
         this.villagerXp = integer4;
         this.showProgress = boolean5;
@@ -27,28 +27,28 @@ public class ClientboundMerchantOffersPacket implements Packet<ClientGamePacketL
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readVarInt();
-        this.offers = MerchantOffers.createFromStream(kv);
-        this.villagerLevel = kv.readVarInt();
-        this.villagerXp = kv.readVarInt();
-        this.showProgress = kv.readBoolean();
-        this.canRestock = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readVarInt();
+        this.offers = MerchantOffers.createFromStream(mg);
+        this.villagerLevel = mg.readVarInt();
+        this.villagerXp = mg.readVarInt();
+        this.showProgress = mg.readBoolean();
+        this.canRestock = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.containerId);
-        this.offers.writeToStream(kv);
-        kv.writeVarInt(this.villagerLevel);
-        kv.writeVarInt(this.villagerXp);
-        kv.writeBoolean(this.showProgress);
-        kv.writeBoolean(this.canRestock);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.containerId);
+        this.offers.writeToStream(mg);
+        mg.writeVarInt(this.villagerLevel);
+        mg.writeVarInt(this.villagerXp);
+        mg.writeBoolean(this.showProgress);
+        mg.writeBoolean(this.canRestock);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleMerchantOffers(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleMerchantOffers(this);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java b/src/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java
index 909dd10..5c38646 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java
@@ -36,18 +36,18 @@ public class ClientboundMoveEntityPacket implements Packet<ClientGamePacketListe
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entityId = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entityId = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.entityId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.entityId);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleMoveEntity(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleMoveEntity(this);
     }
     
     @Override
@@ -55,8 +55,8 @@ public class ClientboundMoveEntityPacket implements Packet<ClientGamePacketListe
         return "Entity_" + super.toString();
     }
     
-    public Entity getEntity(final Level bjw) {
-        return bjw.getEntity(this.entityId);
+    public Entity getEntity(final Level bqb) {
+        return bqb.getEntity(this.entityId);
     }
     
     public short getXa() {
@@ -110,25 +110,25 @@ public class ClientboundMoveEntityPacket implements Packet<ClientGamePacketListe
         }
         
         @Override
-        public void read(final FriendlyByteBuf kv) throws IOException {
-            super.read(kv);
-            this.xa = kv.readShort();
-            this.ya = kv.readShort();
-            this.za = kv.readShort();
-            this.yRot = kv.readByte();
-            this.xRot = kv.readByte();
-            this.onGround = kv.readBoolean();
+        public void read(final FriendlyByteBuf mg) throws IOException {
+            super.read(mg);
+            this.xa = mg.readShort();
+            this.ya = mg.readShort();
+            this.za = mg.readShort();
+            this.yRot = mg.readByte();
+            this.xRot = mg.readByte();
+            this.onGround = mg.readBoolean();
         }
         
         @Override
-        public void write(final FriendlyByteBuf kv) throws IOException {
-            super.write(kv);
-            kv.writeShort(this.xa);
-            kv.writeShort(this.ya);
-            kv.writeShort(this.za);
-            kv.writeByte(this.yRot);
-            kv.writeByte(this.xRot);
-            kv.writeBoolean(this.onGround);
+        public void write(final FriendlyByteBuf mg) throws IOException {
+            super.write(mg);
+            mg.writeShort(this.xa);
+            mg.writeShort(this.ya);
+            mg.writeShort(this.za);
+            mg.writeByte(this.yRot);
+            mg.writeByte(this.xRot);
+            mg.writeBoolean(this.onGround);
         }
     }
     
@@ -147,21 +147,21 @@ public class ClientboundMoveEntityPacket implements Packet<ClientGamePacketListe
         }
         
         @Override
-        public void read(final FriendlyByteBuf kv) throws IOException {
-            super.read(kv);
-            this.xa = kv.readShort();
-            this.ya = kv.readShort();
-            this.za = kv.readShort();
-            this.onGround = kv.readBoolean();
+        public void read(final FriendlyByteBuf mg) throws IOException {
+            super.read(mg);
+            this.xa = mg.readShort();
+            this.ya = mg.readShort();
+            this.za = mg.readShort();
+            this.onGround = mg.readBoolean();
         }
         
         @Override
-        public void write(final FriendlyByteBuf kv) throws IOException {
-            super.write(kv);
-            kv.writeShort(this.xa);
-            kv.writeShort(this.ya);
-            kv.writeShort(this.za);
-            kv.writeBoolean(this.onGround);
+        public void write(final FriendlyByteBuf mg) throws IOException {
+            super.write(mg);
+            mg.writeShort(this.xa);
+            mg.writeShort(this.ya);
+            mg.writeShort(this.za);
+            mg.writeBoolean(this.onGround);
         }
     }
     
@@ -179,19 +179,19 @@ public class ClientboundMoveEntityPacket implements Packet<ClientGamePacketListe
         }
         
         @Override
-        public void read(final FriendlyByteBuf kv) throws IOException {
-            super.read(kv);
-            this.yRot = kv.readByte();
-            this.xRot = kv.readByte();
-            this.onGround = kv.readBoolean();
+        public void read(final FriendlyByteBuf mg) throws IOException {
+            super.read(mg);
+            this.yRot = mg.readByte();
+            this.xRot = mg.readByte();
+            this.onGround = mg.readBoolean();
         }
         
         @Override
-        public void write(final FriendlyByteBuf kv) throws IOException {
-            super.write(kv);
-            kv.writeByte(this.yRot);
-            kv.writeByte(this.xRot);
-            kv.writeBoolean(this.onGround);
+        public void write(final FriendlyByteBuf mg) throws IOException {
+            super.write(mg);
+            mg.writeByte(this.yRot);
+            mg.writeByte(this.xRot);
+            mg.writeBoolean(this.onGround);
         }
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundMoveVehiclePacket.java b/src/net/minecraft/network/protocol/game/ClientboundMoveVehiclePacket.java
index 8b10246..1dc1207 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundMoveVehiclePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundMoveVehiclePacket.java
@@ -16,35 +16,35 @@ public class ClientboundMoveVehiclePacket implements Packet<ClientGamePacketList
     public ClientboundMoveVehiclePacket() {
     }
     
-    public ClientboundMoveVehiclePacket(final Entity akq) {
-        this.x = akq.getX();
-        this.y = akq.getY();
-        this.z = akq.getZ();
-        this.yRot = akq.yRot;
-        this.xRot = akq.xRot;
+    public ClientboundMoveVehiclePacket(final Entity aom) {
+        this.x = aom.getX();
+        this.y = aom.getY();
+        this.z = aom.getZ();
+        this.yRot = aom.yRot;
+        this.xRot = aom.xRot;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-        this.yRot = kv.readFloat();
-        this.xRot = kv.readFloat();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.x = mg.readDouble();
+        this.y = mg.readDouble();
+        this.z = mg.readDouble();
+        this.yRot = mg.readFloat();
+        this.xRot = mg.readFloat();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-        kv.writeFloat(this.yRot);
-        kv.writeFloat(this.xRot);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeDouble(this.x);
+        mg.writeDouble(this.y);
+        mg.writeDouble(this.z);
+        mg.writeFloat(this.yRot);
+        mg.writeFloat(this.xRot);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleMoveVehicle(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleMoveVehicle(this);
     }
     
     public double getX() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundOpenBookPacket.java b/src/net/minecraft/network/protocol/game/ClientboundOpenBookPacket.java
index 84ff223..b719ef6 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundOpenBookPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundOpenBookPacket.java
@@ -12,23 +12,23 @@ public class ClientboundOpenBookPacket implements Packet<ClientGamePacketListene
     public ClientboundOpenBookPacket() {
     }
     
-    public ClientboundOpenBookPacket(final InteractionHand ajk) {
-        this.hand = ajk;
+    public ClientboundOpenBookPacket(final InteractionHand anf) {
+        this.hand = anf;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.hand = kv.<InteractionHand>readEnum(InteractionHand.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.hand = mg.<InteractionHand>readEnum(InteractionHand.class);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.hand);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.hand);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleOpenBook(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleOpenBook(this);
     }
     
     public InteractionHand getHand() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundOpenScreenPacket.java b/src/net/minecraft/network/protocol/game/ClientboundOpenScreenPacket.java
index f2bc401..94f01c8 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundOpenScreenPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundOpenScreenPacket.java
@@ -17,29 +17,29 @@ public class ClientboundOpenScreenPacket implements Packet<ClientGamePacketListe
     public ClientboundOpenScreenPacket() {
     }
     
-    public ClientboundOpenScreenPacket(final int integer, final MenuType<?> bbo, final Component lf) {
+    public ClientboundOpenScreenPacket(final int integer, final MenuType<?> bhk, final Component mr) {
         this.containerId = integer;
-        this.type = Registry.MENU.getId(bbo);
-        this.title = lf;
+        this.type = Registry.MENU.getId(bhk);
+        this.title = mr;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readVarInt();
-        this.type = kv.readVarInt();
-        this.title = kv.readComponent();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readVarInt();
+        this.type = mg.readVarInt();
+        this.title = mg.readComponent();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.containerId);
-        kv.writeVarInt(this.type);
-        kv.writeComponent(this.title);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.containerId);
+        mg.writeVarInt(this.type);
+        mg.writeComponent(this.title);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleOpenScreen(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleOpenScreen(this);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundOpenSignEditorPacket.java b/src/net/minecraft/network/protocol/game/ClientboundOpenSignEditorPacket.java
index 6bb61fa..75c6b85 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundOpenSignEditorPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundOpenSignEditorPacket.java
@@ -12,23 +12,23 @@ public class ClientboundOpenSignEditorPacket implements Packet<ClientGamePacketL
     public ClientboundOpenSignEditorPacket() {
     }
     
-    public ClientboundOpenSignEditorPacket(final BlockPos fk) {
-        this.pos = fk;
+    public ClientboundOpenSignEditorPacket(final BlockPos fu) {
+        this.pos = fu;
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleOpenSignEditor(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleOpenSignEditor(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.pos = kv.readBlockPos();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBlockPos(this.pos);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
     }
     
     public BlockPos getPos() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket.java b/src/net/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket.java
index 986c5c0..2c711f4 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket.java
@@ -14,9 +14,9 @@ public class ClientboundPlaceGhostRecipePacket implements Packet<ClientGamePacke
     public ClientboundPlaceGhostRecipePacket() {
     }
     
-    public ClientboundPlaceGhostRecipePacket(final int integer, final Recipe<?> bgw) {
+    public ClientboundPlaceGhostRecipePacket(final int integer, final Recipe<?> bmu) {
         this.containerId = integer;
-        this.recipe = bgw.getId();
+        this.recipe = bmu.getId();
     }
     
     public ResourceLocation getRecipe() {
@@ -28,19 +28,19 @@ public class ClientboundPlaceGhostRecipePacket implements Packet<ClientGamePacke
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readByte();
-        this.recipe = kv.readResourceLocation();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readByte();
+        this.recipe = mg.readResourceLocation();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
-        kv.writeResourceLocation(this.recipe);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
+        mg.writeResourceLocation(this.recipe);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handlePlaceRecipe(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handlePlaceRecipe(this);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundPlayerAbilitiesPacket.java b/src/net/minecraft/network/protocol/game/ClientboundPlayerAbilitiesPacket.java
index 3c59240..3db394a 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundPlayerAbilitiesPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundPlayerAbilitiesPacket.java
@@ -17,96 +17,72 @@ public class ClientboundPlayerAbilitiesPacket implements Packet<ClientGamePacket
     public ClientboundPlayerAbilitiesPacket() {
     }
     
-    public ClientboundPlayerAbilitiesPacket(final Abilities ayg) {
-        this.setInvulnerable(ayg.invulnerable);
-        this.setFlying(ayg.flying);
-        this.setCanFly(ayg.mayfly);
-        this.setInstabuild(ayg.instabuild);
-        this.setFlyingSpeed(ayg.getFlyingSpeed());
-        this.setWalkingSpeed(ayg.getWalkingSpeed());
+    public ClientboundPlayerAbilitiesPacket(final Abilities bdz) {
+        this.invulnerable = bdz.invulnerable;
+        this.isFlying = bdz.flying;
+        this.canFly = bdz.mayfly;
+        this.instabuild = bdz.instabuild;
+        this.flyingSpeed = bdz.getFlyingSpeed();
+        this.walkingSpeed = bdz.getWalkingSpeed();
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        final byte byte3 = kv.readByte();
-        this.setInvulnerable((byte3 & 0x1) > 0);
-        this.setFlying((byte3 & 0x2) > 0);
-        this.setCanFly((byte3 & 0x4) > 0);
-        this.setInstabuild((byte3 & 0x8) > 0);
-        this.setFlyingSpeed(kv.readFloat());
-        this.setWalkingSpeed(kv.readFloat());
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        final byte byte3 = mg.readByte();
+        this.invulnerable = ((byte3 & 0x1) != 0x0);
+        this.isFlying = ((byte3 & 0x2) != 0x0);
+        this.canFly = ((byte3 & 0x4) != 0x0);
+        this.instabuild = ((byte3 & 0x8) != 0x0);
+        this.flyingSpeed = mg.readFloat();
+        this.walkingSpeed = mg.readFloat();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
+    public void write(final FriendlyByteBuf mg) throws IOException {
         byte byte3 = 0;
-        if (this.isInvulnerable()) {
+        if (this.invulnerable) {
             byte3 |= 0x1;
         }
-        if (this.isFlying()) {
+        if (this.isFlying) {
             byte3 |= 0x2;
         }
-        if (this.canFly()) {
+        if (this.canFly) {
             byte3 |= 0x4;
         }
-        if (this.canInstabuild()) {
+        if (this.instabuild) {
             byte3 |= 0x8;
         }
-        kv.writeByte(byte3);
-        kv.writeFloat(this.flyingSpeed);
-        kv.writeFloat(this.walkingSpeed);
+        mg.writeByte(byte3);
+        mg.writeFloat(this.flyingSpeed);
+        mg.writeFloat(this.walkingSpeed);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handlePlayerAbilities(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handlePlayerAbilities(this);
     }
     
     public boolean isInvulnerable() {
         return this.invulnerable;
     }
     
-    public void setInvulnerable(final boolean boolean1) {
-        this.invulnerable = boolean1;
-    }
-    
     public boolean isFlying() {
         return this.isFlying;
     }
     
-    public void setFlying(final boolean boolean1) {
-        this.isFlying = boolean1;
-    }
-    
     public boolean canFly() {
         return this.canFly;
     }
     
-    public void setCanFly(final boolean boolean1) {
-        this.canFly = boolean1;
-    }
-    
     public boolean canInstabuild() {
         return this.instabuild;
     }
     
-    public void setInstabuild(final boolean boolean1) {
-        this.instabuild = boolean1;
-    }
-    
     public float getFlyingSpeed() {
         return this.flyingSpeed;
     }
     
-    public void setFlyingSpeed(final float float1) {
-        this.flyingSpeed = float1;
-    }
-    
     public float getWalkingSpeed() {
         return this.walkingSpeed;
     }
-    
-    public void setWalkingSpeed(final float float1) {
-        this.walkingSpeed = float1;
-    }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundPlayerCombatPacket.java b/src/net/minecraft/network/protocol/game/ClientboundPlayerCombatPacket.java
index 144560f..c363be0 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundPlayerCombatPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundPlayerCombatPacket.java
@@ -19,59 +19,59 @@ public class ClientboundPlayerCombatPacket implements Packet<ClientGamePacketLis
     public ClientboundPlayerCombatPacket() {
     }
     
-    public ClientboundPlayerCombatPacket(final CombatTracker ajy, final Event a) {
-        this(ajy, a, new TextComponent(""));
+    public ClientboundPlayerCombatPacket(final CombatTracker anv, final Event a) {
+        this(anv, a, TextComponent.EMPTY);
     }
     
-    public ClientboundPlayerCombatPacket(final CombatTracker ajy, final Event a, final Component lf) {
+    public ClientboundPlayerCombatPacket(final CombatTracker anv, final Event a, final Component mr) {
         this.event = a;
-        final LivingEntity akz5 = ajy.getKiller();
+        final LivingEntity aoy5 = anv.getKiller();
         switch (a) {
             case END_COMBAT: {
-                this.duration = ajy.getCombatDuration();
-                this.killerId = ((akz5 == null) ? -1 : akz5.getId());
+                this.duration = anv.getCombatDuration();
+                this.killerId = ((aoy5 == null) ? -1 : aoy5.getId());
                 break;
             }
             case ENTITY_DIED: {
-                this.playerId = ajy.getMob().getId();
-                this.killerId = ((akz5 == null) ? -1 : akz5.getId());
-                this.message = lf;
+                this.playerId = anv.getMob().getId();
+                this.killerId = ((aoy5 == null) ? -1 : aoy5.getId());
+                this.message = mr;
                 break;
             }
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.event = kv.<Event>readEnum(Event.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.event = mg.<Event>readEnum(Event.class);
         if (this.event == Event.END_COMBAT) {
-            this.duration = kv.readVarInt();
-            this.killerId = kv.readInt();
+            this.duration = mg.readVarInt();
+            this.killerId = mg.readInt();
         }
         else if (this.event == Event.ENTITY_DIED) {
-            this.playerId = kv.readVarInt();
-            this.killerId = kv.readInt();
-            this.message = kv.readComponent();
+            this.playerId = mg.readVarInt();
+            this.killerId = mg.readInt();
+            this.message = mg.readComponent();
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.event);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.event);
         if (this.event == Event.END_COMBAT) {
-            kv.writeVarInt(this.duration);
-            kv.writeInt(this.killerId);
+            mg.writeVarInt(this.duration);
+            mg.writeInt(this.killerId);
         }
         else if (this.event == Event.ENTITY_DIED) {
-            kv.writeVarInt(this.playerId);
-            kv.writeInt(this.killerId);
-            kv.writeComponent(this.message);
+            mg.writeVarInt(this.playerId);
+            mg.writeInt(this.killerId);
+            mg.writeComponent(this.message);
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handlePlayerCombat(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handlePlayerCombat(this);
     }
     
     @Override
diff --git a/src/net/minecraft/network/protocol/game/ClientboundPlayerInfoPacket.java b/src/net/minecraft/network/protocol/game/ClientboundPlayerInfoPacket.java
index 403895b..95f6729 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundPlayerInfoPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundPlayerInfoPacket.java
@@ -26,128 +26,128 @@ public class ClientboundPlayerInfoPacket implements Packet<ClientGamePacketListe
     public ClientboundPlayerInfoPacket(final Action a, final ServerPlayer... arr) {
         this.entries = Lists.newArrayList();
         this.action = a;
-        for (final ServerPlayer xe7 : arr) {
-            this.entries.add(new PlayerUpdate(xe7.getGameProfile(), xe7.latency, xe7.gameMode.getGameModeForPlayer(), xe7.getTabListDisplayName()));
+        for (final ServerPlayer ze7 : arr) {
+            this.entries.add(new PlayerUpdate(ze7.getGameProfile(), ze7.latency, ze7.gameMode.getGameModeForPlayer(), ze7.getTabListDisplayName()));
         }
     }
     
     public ClientboundPlayerInfoPacket(final Action a, final Iterable<ServerPlayer> iterable) {
         this.entries = Lists.newArrayList();
         this.action = a;
-        for (final ServerPlayer xe5 : iterable) {
-            this.entries.add(new PlayerUpdate(xe5.getGameProfile(), xe5.latency, xe5.gameMode.getGameModeForPlayer(), xe5.getTabListDisplayName()));
+        for (final ServerPlayer ze5 : iterable) {
+            this.entries.add(new PlayerUpdate(ze5.getGameProfile(), ze5.latency, ze5.gameMode.getGameModeForPlayer(), ze5.getTabListDisplayName()));
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.action = kv.<Action>readEnum(Action.class);
-        for (int integer3 = kv.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.action = mg.<Action>readEnum(Action.class);
+        for (int integer3 = mg.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
             GameProfile gameProfile5 = null;
             int integer5 = 0;
-            GameType bjt7 = null;
-            Component lf8 = null;
+            GameType bpy7 = null;
+            Component mr8 = null;
             switch (this.action) {
                 case ADD_PLAYER: {
-                    gameProfile5 = new GameProfile(kv.readUUID(), kv.readUtf(16));
-                    for (int integer6 = kv.readVarInt(), integer7 = 0; integer7 < integer6; ++integer7) {
-                        final String string11 = kv.readUtf(32767);
-                        final String string12 = kv.readUtf(32767);
-                        if (kv.readBoolean()) {
-                            gameProfile5.getProperties().put(string11, new Property(string11, string12, kv.readUtf(32767)));
+                    gameProfile5 = new GameProfile(mg.readUUID(), mg.readUtf(16));
+                    for (int integer6 = mg.readVarInt(), integer7 = 0; integer7 < integer6; ++integer7) {
+                        final String string11 = mg.readUtf(32767);
+                        final String string12 = mg.readUtf(32767);
+                        if (mg.readBoolean()) {
+                            gameProfile5.getProperties().put(string11, new Property(string11, string12, mg.readUtf(32767)));
                         }
                         else {
                             gameProfile5.getProperties().put(string11, new Property(string11, string12));
                         }
                     }
-                    bjt7 = GameType.byId(kv.readVarInt());
-                    integer5 = kv.readVarInt();
-                    if (kv.readBoolean()) {
-                        lf8 = kv.readComponent();
+                    bpy7 = GameType.byId(mg.readVarInt());
+                    integer5 = mg.readVarInt();
+                    if (mg.readBoolean()) {
+                        mr8 = mg.readComponent();
                         break;
                     }
                     break;
                 }
                 case UPDATE_GAME_MODE: {
-                    gameProfile5 = new GameProfile(kv.readUUID(), (String)null);
-                    bjt7 = GameType.byId(kv.readVarInt());
+                    gameProfile5 = new GameProfile(mg.readUUID(), (String)null);
+                    bpy7 = GameType.byId(mg.readVarInt());
                     break;
                 }
                 case UPDATE_LATENCY: {
-                    gameProfile5 = new GameProfile(kv.readUUID(), (String)null);
-                    integer5 = kv.readVarInt();
+                    gameProfile5 = new GameProfile(mg.readUUID(), (String)null);
+                    integer5 = mg.readVarInt();
                     break;
                 }
                 case UPDATE_DISPLAY_NAME: {
-                    gameProfile5 = new GameProfile(kv.readUUID(), (String)null);
-                    if (kv.readBoolean()) {
-                        lf8 = kv.readComponent();
+                    gameProfile5 = new GameProfile(mg.readUUID(), (String)null);
+                    if (mg.readBoolean()) {
+                        mr8 = mg.readComponent();
                         break;
                     }
                     break;
                 }
                 case REMOVE_PLAYER: {
-                    gameProfile5 = new GameProfile(kv.readUUID(), (String)null);
+                    gameProfile5 = new GameProfile(mg.readUUID(), (String)null);
                     break;
                 }
             }
-            this.entries.add(new PlayerUpdate(gameProfile5, integer5, bjt7, lf8));
+            this.entries.add(new PlayerUpdate(gameProfile5, integer5, bpy7, mr8));
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.action);
-        kv.writeVarInt(this.entries.size());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.action);
+        mg.writeVarInt(this.entries.size());
         for (final PlayerUpdate b4 : this.entries) {
             switch (this.action) {
                 case ADD_PLAYER: {
-                    kv.writeUUID(b4.getProfile().getId());
-                    kv.writeUtf(b4.getProfile().getName());
-                    kv.writeVarInt(b4.getProfile().getProperties().size());
+                    mg.writeUUID(b4.getProfile().getId());
+                    mg.writeUtf(b4.getProfile().getName());
+                    mg.writeVarInt(b4.getProfile().getProperties().size());
                     for (final Property property6 : b4.getProfile().getProperties().values()) {
-                        kv.writeUtf(property6.getName());
-                        kv.writeUtf(property6.getValue());
+                        mg.writeUtf(property6.getName());
+                        mg.writeUtf(property6.getValue());
                         if (property6.hasSignature()) {
-                            kv.writeBoolean(true);
-                            kv.writeUtf(property6.getSignature());
+                            mg.writeBoolean(true);
+                            mg.writeUtf(property6.getSignature());
                         }
                         else {
-                            kv.writeBoolean(false);
+                            mg.writeBoolean(false);
                         }
                     }
-                    kv.writeVarInt(b4.getGameMode().getId());
-                    kv.writeVarInt(b4.getLatency());
+                    mg.writeVarInt(b4.getGameMode().getId());
+                    mg.writeVarInt(b4.getLatency());
                     if (b4.getDisplayName() == null) {
-                        kv.writeBoolean(false);
+                        mg.writeBoolean(false);
                         continue;
                     }
-                    kv.writeBoolean(true);
-                    kv.writeComponent(b4.getDisplayName());
+                    mg.writeBoolean(true);
+                    mg.writeComponent(b4.getDisplayName());
                     continue;
                 }
                 case UPDATE_GAME_MODE: {
-                    kv.writeUUID(b4.getProfile().getId());
-                    kv.writeVarInt(b4.getGameMode().getId());
+                    mg.writeUUID(b4.getProfile().getId());
+                    mg.writeVarInt(b4.getGameMode().getId());
                     continue;
                 }
                 case UPDATE_LATENCY: {
-                    kv.writeUUID(b4.getProfile().getId());
-                    kv.writeVarInt(b4.getLatency());
+                    mg.writeUUID(b4.getProfile().getId());
+                    mg.writeVarInt(b4.getLatency());
                     continue;
                 }
                 case UPDATE_DISPLAY_NAME: {
-                    kv.writeUUID(b4.getProfile().getId());
+                    mg.writeUUID(b4.getProfile().getId());
                     if (b4.getDisplayName() == null) {
-                        kv.writeBoolean(false);
+                        mg.writeBoolean(false);
                         continue;
                     }
-                    kv.writeBoolean(true);
-                    kv.writeComponent(b4.getDisplayName());
+                    mg.writeBoolean(true);
+                    mg.writeComponent(b4.getDisplayName());
                     continue;
                 }
                 case REMOVE_PLAYER: {
-                    kv.writeUUID(b4.getProfile().getId());
+                    mg.writeUUID(b4.getProfile().getId());
                     continue;
                 }
             }
@@ -155,8 +155,8 @@ public class ClientboundPlayerInfoPacket implements Packet<ClientGamePacketListe
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handlePlayerInfo(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handlePlayerInfo(this);
     }
     
     public List<PlayerUpdate> getEntries() {
@@ -186,11 +186,11 @@ public class ClientboundPlayerInfoPacket implements Packet<ClientGamePacketListe
         private final GameProfile profile;
         private final Component displayName;
         
-        public PlayerUpdate(final GameProfile gameProfile, final int integer, @Nullable final GameType bjt, @Nullable final Component lf) {
+        public PlayerUpdate(final GameProfile gameProfile, final int integer, @Nullable final GameType bpy, @Nullable final Component mr) {
             this.profile = gameProfile;
             this.latency = integer;
-            this.gameMode = bjt;
-            this.displayName = lf;
+            this.gameMode = bpy;
+            this.displayName = mr;
         }
         
         public GameProfile getProfile() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundPlayerLookAtPacket.java b/src/net/minecraft/network/protocol/game/ClientboundPlayerLookAtPacket.java
index 432fd4e..61bb4e8 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundPlayerLookAtPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundPlayerLookAtPacket.java
@@ -29,46 +29,46 @@ public class ClientboundPlayerLookAtPacket implements Packet<ClientGamePacketLis
         this.z = double4;
     }
     
-    public ClientboundPlayerLookAtPacket(final EntityAnchorArgument.Anchor a1, final Entity akq, final EntityAnchorArgument.Anchor a3) {
+    public ClientboundPlayerLookAtPacket(final EntityAnchorArgument.Anchor a1, final Entity aom, final EntityAnchorArgument.Anchor a3) {
         this.fromAnchor = a1;
-        this.entity = akq.getId();
+        this.entity = aom.getId();
         this.toAnchor = a3;
-        final Vec3 cvl5 = a3.apply(akq);
-        this.x = cvl5.x;
-        this.y = cvl5.y;
-        this.z = cvl5.z;
+        final Vec3 dem5 = a3.apply(aom);
+        this.x = dem5.x;
+        this.y = dem5.y;
+        this.z = dem5.z;
         this.atEntity = true;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.fromAnchor = kv.<EntityAnchorArgument.Anchor>readEnum(EntityAnchorArgument.Anchor.class);
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-        if (kv.readBoolean()) {
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.fromAnchor = mg.<EntityAnchorArgument.Anchor>readEnum(EntityAnchorArgument.Anchor.class);
+        this.x = mg.readDouble();
+        this.y = mg.readDouble();
+        this.z = mg.readDouble();
+        if (mg.readBoolean()) {
             this.atEntity = true;
-            this.entity = kv.readVarInt();
-            this.toAnchor = kv.<EntityAnchorArgument.Anchor>readEnum(EntityAnchorArgument.Anchor.class);
+            this.entity = mg.readVarInt();
+            this.toAnchor = mg.<EntityAnchorArgument.Anchor>readEnum(EntityAnchorArgument.Anchor.class);
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.fromAnchor);
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-        kv.writeBoolean(this.atEntity);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.fromAnchor);
+        mg.writeDouble(this.x);
+        mg.writeDouble(this.y);
+        mg.writeDouble(this.z);
+        mg.writeBoolean(this.atEntity);
         if (this.atEntity) {
-            kv.writeVarInt(this.entity);
-            kv.writeEnum(this.toAnchor);
+            mg.writeVarInt(this.entity);
+            mg.writeEnum(this.toAnchor);
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleLookAt(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleLookAt(this);
     }
     
     public EntityAnchorArgument.Anchor getFromAnchor() {
@@ -76,14 +76,14 @@ public class ClientboundPlayerLookAtPacket implements Packet<ClientGamePacketLis
     }
     
     @Nullable
-    public Vec3 getPosition(final Level bjw) {
+    public Vec3 getPosition(final Level bqb) {
         if (!this.atEntity) {
             return new Vec3(this.x, this.y, this.z);
         }
-        final Entity akq3 = bjw.getEntity(this.entity);
-        if (akq3 == null) {
+        final Entity aom3 = bqb.getEntity(this.entity);
+        if (aom3 == null) {
             return new Vec3(this.x, this.y, this.z);
         }
-        return this.toAnchor.apply(akq3);
+        return this.toAnchor.apply(aom3);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundPlayerPositionPacket.java b/src/net/minecraft/network/protocol/game/ClientboundPlayerPositionPacket.java
index 2d6741e..ae197c5 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundPlayerPositionPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundPlayerPositionPacket.java
@@ -31,30 +31,30 @@ public class ClientboundPlayerPositionPacket implements Packet<ClientGamePacketL
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-        this.yRot = kv.readFloat();
-        this.xRot = kv.readFloat();
-        this.relativeArguments = RelativeArgument.unpack(kv.readUnsignedByte());
-        this.id = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.x = mg.readDouble();
+        this.y = mg.readDouble();
+        this.z = mg.readDouble();
+        this.yRot = mg.readFloat();
+        this.xRot = mg.readFloat();
+        this.relativeArguments = RelativeArgument.unpack(mg.readUnsignedByte());
+        this.id = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-        kv.writeFloat(this.yRot);
-        kv.writeFloat(this.xRot);
-        kv.writeByte(RelativeArgument.pack(this.relativeArguments));
-        kv.writeVarInt(this.id);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeDouble(this.x);
+        mg.writeDouble(this.y);
+        mg.writeDouble(this.z);
+        mg.writeFloat(this.yRot);
+        mg.writeFloat(this.xRot);
+        mg.writeByte(RelativeArgument.pack(this.relativeArguments));
+        mg.writeVarInt(this.id);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleMovePlayer(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleMovePlayer(this);
     }
     
     public double getX() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundRecipePacket.java b/src/net/minecraft/network/protocol/game/ClientboundRecipePacket.java
index 728f3ea..1c44853 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundRecipePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundRecipePacket.java
@@ -34,46 +34,46 @@ public class ClientboundRecipePacket implements Packet<ClientGamePacketListener>
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleAddOrRemoveRecipes(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleAddOrRemoveRecipes(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.state = kv.<State>readEnum(State.class);
-        this.guiOpen = kv.readBoolean();
-        this.filteringCraftable = kv.readBoolean();
-        this.furnaceGuiOpen = kv.readBoolean();
-        this.furnaceFilteringCraftable = kv.readBoolean();
-        int integer3 = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.state = mg.<State>readEnum(State.class);
+        this.guiOpen = mg.readBoolean();
+        this.filteringCraftable = mg.readBoolean();
+        this.furnaceGuiOpen = mg.readBoolean();
+        this.furnaceFilteringCraftable = mg.readBoolean();
+        int integer3 = mg.readVarInt();
         this.recipes = Lists.newArrayList();
         for (int integer4 = 0; integer4 < integer3; ++integer4) {
-            this.recipes.add(kv.readResourceLocation());
+            this.recipes.add(mg.readResourceLocation());
         }
         if (this.state == State.INIT) {
-            integer3 = kv.readVarInt();
+            integer3 = mg.readVarInt();
             this.toHighlight = Lists.newArrayList();
             for (int integer4 = 0; integer4 < integer3; ++integer4) {
-                this.toHighlight.add(kv.readResourceLocation());
+                this.toHighlight.add(mg.readResourceLocation());
             }
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.state);
-        kv.writeBoolean(this.guiOpen);
-        kv.writeBoolean(this.filteringCraftable);
-        kv.writeBoolean(this.furnaceGuiOpen);
-        kv.writeBoolean(this.furnaceFilteringCraftable);
-        kv.writeVarInt(this.recipes.size());
-        for (final ResourceLocation sm4 : this.recipes) {
-            kv.writeResourceLocation(sm4);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.state);
+        mg.writeBoolean(this.guiOpen);
+        mg.writeBoolean(this.filteringCraftable);
+        mg.writeBoolean(this.furnaceGuiOpen);
+        mg.writeBoolean(this.furnaceFilteringCraftable);
+        mg.writeVarInt(this.recipes.size());
+        for (final ResourceLocation uh4 : this.recipes) {
+            mg.writeResourceLocation(uh4);
         }
         if (this.state == State.INIT) {
-            kv.writeVarInt(this.toHighlight.size());
-            for (final ResourceLocation sm4 : this.toHighlight) {
-                kv.writeResourceLocation(sm4);
+            mg.writeVarInt(this.toHighlight.size());
+            for (final ResourceLocation uh4 : this.toHighlight) {
+                mg.writeResourceLocation(uh4);
             }
         }
     }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundRemoveEntitiesPacket.java b/src/net/minecraft/network/protocol/game/ClientboundRemoveEntitiesPacket.java
index 8b67868..c2a412c 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundRemoveEntitiesPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundRemoveEntitiesPacket.java
@@ -16,24 +16,24 @@ public class ClientboundRemoveEntitiesPacket implements Packet<ClientGamePacketL
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entityIds = new int[kv.readVarInt()];
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entityIds = new int[mg.readVarInt()];
         for (int integer3 = 0; integer3 < this.entityIds.length; ++integer3) {
-            this.entityIds[integer3] = kv.readVarInt();
+            this.entityIds[integer3] = mg.readVarInt();
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.entityIds.length);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.entityIds.length);
         for (final int integer6 : this.entityIds) {
-            kv.writeVarInt(integer6);
+            mg.writeVarInt(integer6);
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleRemoveEntity(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleRemoveEntity(this);
     }
     
     public int[] getEntityIds() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundRemoveMobEffectPacket.java b/src/net/minecraft/network/protocol/game/ClientboundRemoveMobEffectPacket.java
index 430fceb..46c11ba 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundRemoveMobEffectPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundRemoveMobEffectPacket.java
@@ -16,31 +16,31 @@ public class ClientboundRemoveMobEffectPacket implements Packet<ClientGamePacket
     public ClientboundRemoveMobEffectPacket() {
     }
     
-    public ClientboundRemoveMobEffectPacket(final int integer, final MobEffect aki) {
+    public ClientboundRemoveMobEffectPacket(final int integer, final MobEffect aoe) {
         this.entityId = integer;
-        this.effect = aki;
+        this.effect = aoe;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entityId = kv.readVarInt();
-        this.effect = MobEffect.byId(kv.readUnsignedByte());
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entityId = mg.readVarInt();
+        this.effect = MobEffect.byId(mg.readUnsignedByte());
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.entityId);
-        kv.writeByte(MobEffect.getId(this.effect));
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.entityId);
+        mg.writeByte(MobEffect.getId(this.effect));
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleRemoveMobEffect(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleRemoveMobEffect(this);
     }
     
     @Nullable
-    public Entity getEntity(final Level bjw) {
-        return bjw.getEntity(this.entityId);
+    public Entity getEntity(final Level bqb) {
+        return bqb.getEntity(this.entityId);
     }
     
     @Nullable
diff --git a/src/net/minecraft/network/protocol/game/ClientboundResourcePackPacket.java b/src/net/minecraft/network/protocol/game/ClientboundResourcePackPacket.java
index ae7389c..ba207cb 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundResourcePackPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundResourcePackPacket.java
@@ -21,20 +21,20 @@ public class ClientboundResourcePackPacket implements Packet<ClientGamePacketLis
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.url = kv.readUtf(32767);
-        this.hash = kv.readUtf(40);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.url = mg.readUtf(32767);
+        this.hash = mg.readUtf(40);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUtf(this.url);
-        kv.writeUtf(this.hash);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUtf(this.url);
+        mg.writeUtf(this.hash);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleResourcePack(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleResourcePack(this);
     }
     
     public String getUrl() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundRespawnPacket.java b/src/net/minecraft/network/protocol/game/ClientboundRespawnPacket.java
index 9b394cc..cd86b9e 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundRespawnPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundRespawnPacket.java
@@ -2,53 +2,72 @@ package net.minecraft.network.protocol.game;
 
 import net.minecraft.network.PacketListener;
 import java.io.IOException;
+import net.minecraft.core.Registry;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.level.LevelType;
 import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.network.protocol.Packet;
 
 public class ClientboundRespawnPacket implements Packet<ClientGamePacketListener> {
-    private DimensionType dimension;
+    private ResourceKey<DimensionType> dimensionType;
+    private ResourceKey<Level> dimension;
     private long seed;
     private GameType playerGameType;
-    private LevelType levelType;
+    private GameType previousPlayerGameType;
+    private boolean isDebug;
+    private boolean isFlat;
+    private boolean keepAllPlayerData;
     
     public ClientboundRespawnPacket() {
     }
     
-    public ClientboundRespawnPacket(final DimensionType cbi, final long long2, final LevelType bkd, final GameType bjt) {
-        this.dimension = cbi;
-        this.seed = long2;
-        this.playerGameType = bjt;
-        this.levelType = bkd;
+    public ClientboundRespawnPacket(final ResourceKey<DimensionType> ug1, final ResourceKey<Level> ug2, final long long3, final GameType bpy4, final GameType bpy5, final boolean boolean6, final boolean boolean7, final boolean boolean8) {
+        this.dimensionType = ug1;
+        this.dimension = ug2;
+        this.seed = long3;
+        this.playerGameType = bpy4;
+        this.previousPlayerGameType = bpy5;
+        this.isDebug = boolean6;
+        this.isFlat = boolean7;
+        this.keepAllPlayerData = boolean8;
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleRespawn(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleRespawn(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.dimension = DimensionType.getById(kv.readInt());
-        this.seed = kv.readLong();
-        this.playerGameType = GameType.byId(kv.readUnsignedByte());
-        this.levelType = LevelType.getLevelType(kv.readUtf(16));
-        if (this.levelType == null) {
-            this.levelType = LevelType.NORMAL;
-        }
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.dimensionType = ResourceKey.<DimensionType>create(Registry.DIMENSION_TYPE_REGISTRY, mg.readResourceLocation());
+        this.dimension = ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, mg.readResourceLocation());
+        this.seed = mg.readLong();
+        this.playerGameType = GameType.byId(mg.readUnsignedByte());
+        this.previousPlayerGameType = GameType.byId(mg.readUnsignedByte());
+        this.isDebug = mg.readBoolean();
+        this.isFlat = mg.readBoolean();
+        this.keepAllPlayerData = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeInt(this.dimension.getId());
-        kv.writeLong(this.seed);
-        kv.writeByte(this.playerGameType.getId());
-        kv.writeUtf(this.levelType.getName());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeResourceLocation(this.dimensionType.location());
+        mg.writeResourceLocation(this.dimension.location());
+        mg.writeLong(this.seed);
+        mg.writeByte(this.playerGameType.getId());
+        mg.writeByte(this.previousPlayerGameType.getId());
+        mg.writeBoolean(this.isDebug);
+        mg.writeBoolean(this.isFlat);
+        mg.writeBoolean(this.keepAllPlayerData);
     }
     
-    public DimensionType getDimension() {
+    public ResourceKey<DimensionType> getDimensionType() {
+        return this.dimensionType;
+    }
+    
+    public ResourceKey<Level> getDimension() {
         return this.dimension;
     }
     
@@ -60,7 +79,19 @@ public class ClientboundRespawnPacket implements Packet<ClientGamePacketListener
         return this.playerGameType;
     }
     
-    public LevelType getLevelType() {
-        return this.levelType;
+    public GameType getPreviousPlayerGameType() {
+        return this.previousPlayerGameType;
+    }
+    
+    public boolean isDebug() {
+        return this.isDebug;
+    }
+    
+    public boolean isFlat() {
+        return this.isFlat;
+    }
+    
+    public boolean shouldKeepAllPlayerData() {
+        return this.keepAllPlayerData;
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundRotateHeadPacket.java b/src/net/minecraft/network/protocol/game/ClientboundRotateHeadPacket.java
index a83b0b2..b739030 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundRotateHeadPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundRotateHeadPacket.java
@@ -14,30 +14,30 @@ public class ClientboundRotateHeadPacket implements Packet<ClientGamePacketListe
     public ClientboundRotateHeadPacket() {
     }
     
-    public ClientboundRotateHeadPacket(final Entity akq, final byte byte2) {
-        this.entityId = akq.getId();
+    public ClientboundRotateHeadPacket(final Entity aom, final byte byte2) {
+        this.entityId = aom.getId();
         this.yHeadRot = byte2;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entityId = kv.readVarInt();
-        this.yHeadRot = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entityId = mg.readVarInt();
+        this.yHeadRot = mg.readByte();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.entityId);
-        kv.writeByte(this.yHeadRot);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.entityId);
+        mg.writeByte(this.yHeadRot);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleRotateMob(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleRotateMob(this);
     }
     
-    public Entity getEntity(final Level bjw) {
-        return bjw.getEntity(this.entityId);
+    public Entity getEntity(final Level bqb) {
+        return bqb.getEntity(this.entityId);
     }
     
     public byte getYHeadRot() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSelectAdvancementsTabPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSelectAdvancementsTabPacket.java
index 14408d7..d5301de 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSelectAdvancementsTabPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSelectAdvancementsTabPacket.java
@@ -14,27 +14,27 @@ public class ClientboundSelectAdvancementsTabPacket implements Packet<ClientGame
     public ClientboundSelectAdvancementsTabPacket() {
     }
     
-    public ClientboundSelectAdvancementsTabPacket(@Nullable final ResourceLocation sm) {
-        this.tab = sm;
+    public ClientboundSelectAdvancementsTabPacket(@Nullable final ResourceLocation uh) {
+        this.tab = uh;
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSelectAdvancementsTab(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSelectAdvancementsTab(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        if (kv.readBoolean()) {
-            this.tab = kv.readResourceLocation();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        if (mg.readBoolean()) {
+            this.tab = mg.readResourceLocation();
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBoolean(this.tab != null);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBoolean(this.tab != null);
         if (this.tab != null) {
-            kv.writeResourceLocation(this.tab);
+            mg.writeResourceLocation(this.tab);
         }
     }
     
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetBorderPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetBorderPacket.java
index 9cafbd9..bf4ca38 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetBorderPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetBorderPacket.java
@@ -20,138 +20,138 @@ public class ClientboundSetBorderPacket implements Packet<ClientGamePacketListen
     public ClientboundSetBorderPacket() {
     }
     
-    public ClientboundSetBorderPacket(final WorldBorder bzw, final Type a) {
+    public ClientboundSetBorderPacket(final WorldBorder cgw, final Type a) {
         this.type = a;
-        this.newCenterX = bzw.getCenterX();
-        this.newCenterZ = bzw.getCenterZ();
-        this.oldSize = bzw.getSize();
-        this.newSize = bzw.getLerpTarget();
-        this.lerpTime = bzw.getLerpRemainingTime();
-        this.newAbsoluteMaxSize = bzw.getAbsoluteMaxSize();
-        this.warningBlocks = bzw.getWarningBlocks();
-        this.warningTime = bzw.getWarningTime();
+        this.newCenterX = cgw.getCenterX();
+        this.newCenterZ = cgw.getCenterZ();
+        this.oldSize = cgw.getSize();
+        this.newSize = cgw.getLerpTarget();
+        this.lerpTime = cgw.getLerpRemainingTime();
+        this.newAbsoluteMaxSize = cgw.getAbsoluteMaxSize();
+        this.warningBlocks = cgw.getWarningBlocks();
+        this.warningTime = cgw.getWarningTime();
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.type = kv.<Type>readEnum(Type.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.type = mg.<Type>readEnum(Type.class);
         switch (this.type) {
             case SET_SIZE: {
-                this.newSize = kv.readDouble();
+                this.newSize = mg.readDouble();
                 break;
             }
             case LERP_SIZE: {
-                this.oldSize = kv.readDouble();
-                this.newSize = kv.readDouble();
-                this.lerpTime = kv.readVarLong();
+                this.oldSize = mg.readDouble();
+                this.newSize = mg.readDouble();
+                this.lerpTime = mg.readVarLong();
                 break;
             }
             case SET_CENTER: {
-                this.newCenterX = kv.readDouble();
-                this.newCenterZ = kv.readDouble();
+                this.newCenterX = mg.readDouble();
+                this.newCenterZ = mg.readDouble();
                 break;
             }
             case SET_WARNING_BLOCKS: {
-                this.warningBlocks = kv.readVarInt();
+                this.warningBlocks = mg.readVarInt();
                 break;
             }
             case SET_WARNING_TIME: {
-                this.warningTime = kv.readVarInt();
+                this.warningTime = mg.readVarInt();
                 break;
             }
             case INITIALIZE: {
-                this.newCenterX = kv.readDouble();
-                this.newCenterZ = kv.readDouble();
-                this.oldSize = kv.readDouble();
-                this.newSize = kv.readDouble();
-                this.lerpTime = kv.readVarLong();
-                this.newAbsoluteMaxSize = kv.readVarInt();
-                this.warningBlocks = kv.readVarInt();
-                this.warningTime = kv.readVarInt();
+                this.newCenterX = mg.readDouble();
+                this.newCenterZ = mg.readDouble();
+                this.oldSize = mg.readDouble();
+                this.newSize = mg.readDouble();
+                this.lerpTime = mg.readVarLong();
+                this.newAbsoluteMaxSize = mg.readVarInt();
+                this.warningBlocks = mg.readVarInt();
+                this.warningTime = mg.readVarInt();
                 break;
             }
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.type);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.type);
         switch (this.type) {
             case SET_SIZE: {
-                kv.writeDouble(this.newSize);
+                mg.writeDouble(this.newSize);
                 break;
             }
             case LERP_SIZE: {
-                kv.writeDouble(this.oldSize);
-                kv.writeDouble(this.newSize);
-                kv.writeVarLong(this.lerpTime);
+                mg.writeDouble(this.oldSize);
+                mg.writeDouble(this.newSize);
+                mg.writeVarLong(this.lerpTime);
                 break;
             }
             case SET_CENTER: {
-                kv.writeDouble(this.newCenterX);
-                kv.writeDouble(this.newCenterZ);
+                mg.writeDouble(this.newCenterX);
+                mg.writeDouble(this.newCenterZ);
                 break;
             }
             case SET_WARNING_TIME: {
-                kv.writeVarInt(this.warningTime);
+                mg.writeVarInt(this.warningTime);
                 break;
             }
             case SET_WARNING_BLOCKS: {
-                kv.writeVarInt(this.warningBlocks);
+                mg.writeVarInt(this.warningBlocks);
                 break;
             }
             case INITIALIZE: {
-                kv.writeDouble(this.newCenterX);
-                kv.writeDouble(this.newCenterZ);
-                kv.writeDouble(this.oldSize);
-                kv.writeDouble(this.newSize);
-                kv.writeVarLong(this.lerpTime);
-                kv.writeVarInt(this.newAbsoluteMaxSize);
-                kv.writeVarInt(this.warningBlocks);
-                kv.writeVarInt(this.warningTime);
+                mg.writeDouble(this.newCenterX);
+                mg.writeDouble(this.newCenterZ);
+                mg.writeDouble(this.oldSize);
+                mg.writeDouble(this.newSize);
+                mg.writeVarLong(this.lerpTime);
+                mg.writeVarInt(this.newAbsoluteMaxSize);
+                mg.writeVarInt(this.warningBlocks);
+                mg.writeVarInt(this.warningTime);
                 break;
             }
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetBorder(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetBorder(this);
     }
     
-    public void applyChanges(final WorldBorder bzw) {
+    public void applyChanges(final WorldBorder cgw) {
         switch (this.type) {
             case SET_SIZE: {
-                bzw.setSize(this.newSize);
+                cgw.setSize(this.newSize);
                 break;
             }
             case LERP_SIZE: {
-                bzw.lerpSizeBetween(this.oldSize, this.newSize, this.lerpTime);
+                cgw.lerpSizeBetween(this.oldSize, this.newSize, this.lerpTime);
                 break;
             }
             case SET_CENTER: {
-                bzw.setCenter(this.newCenterX, this.newCenterZ);
+                cgw.setCenter(this.newCenterX, this.newCenterZ);
                 break;
             }
             case INITIALIZE: {
-                bzw.setCenter(this.newCenterX, this.newCenterZ);
+                cgw.setCenter(this.newCenterX, this.newCenterZ);
                 if (this.lerpTime > 0L) {
-                    bzw.lerpSizeBetween(this.oldSize, this.newSize, this.lerpTime);
+                    cgw.lerpSizeBetween(this.oldSize, this.newSize, this.lerpTime);
                 }
                 else {
-                    bzw.setSize(this.newSize);
+                    cgw.setSize(this.newSize);
                 }
-                bzw.setAbsoluteMaxSize(this.newAbsoluteMaxSize);
-                bzw.setWarningBlocks(this.warningBlocks);
-                bzw.setWarningTime(this.warningTime);
+                cgw.setAbsoluteMaxSize(this.newAbsoluteMaxSize);
+                cgw.setWarningBlocks(this.warningBlocks);
+                cgw.setWarningTime(this.warningTime);
                 break;
             }
             case SET_WARNING_TIME: {
-                bzw.setWarningTime(this.warningTime);
+                cgw.setWarningTime(this.warningTime);
                 break;
             }
             case SET_WARNING_BLOCKS: {
-                bzw.setWarningBlocks(this.warningBlocks);
+                cgw.setWarningBlocks(this.warningBlocks);
                 break;
             }
         }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetCameraPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetCameraPacket.java
index fc58310..056b538 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetCameraPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetCameraPacket.java
@@ -14,27 +14,27 @@ public class ClientboundSetCameraPacket implements Packet<ClientGamePacketListen
     public ClientboundSetCameraPacket() {
     }
     
-    public ClientboundSetCameraPacket(final Entity akq) {
-        this.cameraId = akq.getId();
+    public ClientboundSetCameraPacket(final Entity aom) {
+        this.cameraId = aom.getId();
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.cameraId = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.cameraId = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.cameraId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.cameraId);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetCamera(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetCamera(this);
     }
     
     @Nullable
-    public Entity getEntity(final Level bjw) {
-        return bjw.getEntity(this.cameraId);
+    public Entity getEntity(final Level bqb) {
+        return bqb.getEntity(this.cameraId);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket.java
index af25b03..27c7790 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket.java
@@ -16,18 +16,18 @@ public class ClientboundSetCarriedItemPacket implements Packet<ClientGamePacketL
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.slot = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.slot = mg.readByte();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.slot);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.slot);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetCarriedItem(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetCarriedItem(this);
     }
     
     public int getSlot() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetChunkCacheCenterPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetChunkCacheCenterPacket.java
index 26e02fb..4338d56 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetChunkCacheCenterPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetChunkCacheCenterPacket.java
@@ -18,20 +18,20 @@ public class ClientboundSetChunkCacheCenterPacket implements Packet<ClientGamePa
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.x = kv.readVarInt();
-        this.z = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.x = mg.readVarInt();
+        this.z = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.x);
-        kv.writeVarInt(this.z);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.x);
+        mg.writeVarInt(this.z);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetChunkCacheCenter(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetChunkCacheCenter(this);
     }
     
     public int getX() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetChunkCacheRadiusPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetChunkCacheRadiusPacket.java
index 33e02a0..d13120a 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetChunkCacheRadiusPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetChunkCacheRadiusPacket.java
@@ -16,18 +16,18 @@ public class ClientboundSetChunkCacheRadiusPacket implements Packet<ClientGamePa
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.radius = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.radius = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.radius);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.radius);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetChunkCacheRadius(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetChunkCacheRadius(this);
     }
     
     public int getRadius() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetDefaultSpawnPositionPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetDefaultSpawnPositionPacket.java
new file mode 100644
index 0000000..2515d31
--- /dev/null
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetDefaultSpawnPositionPacket.java
@@ -0,0 +1,37 @@
+package net.minecraft.network.protocol.game;
+
+import net.minecraft.network.PacketListener;
+import java.io.IOException;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.protocol.Packet;
+
+public class ClientboundSetDefaultSpawnPositionPacket implements Packet<ClientGamePacketListener> {
+    private BlockPos pos;
+    
+    public ClientboundSetDefaultSpawnPositionPacket() {
+    }
+    
+    public ClientboundSetDefaultSpawnPositionPacket(final BlockPos fu) {
+        this.pos = fu;
+    }
+    
+    @Override
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
+    }
+    
+    @Override
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
+    }
+    
+    @Override
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetSpawn(this);
+    }
+    
+    public BlockPos getPos() {
+        return this.pos;
+    }
+}
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetDisplayObjectivePacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetDisplayObjectivePacket.java
index 522cc6c..ac795e6 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetDisplayObjectivePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetDisplayObjectivePacket.java
@@ -15,31 +15,31 @@ public class ClientboundSetDisplayObjectivePacket implements Packet<ClientGamePa
     public ClientboundSetDisplayObjectivePacket() {
     }
     
-    public ClientboundSetDisplayObjectivePacket(final int integer, @Nullable final Objective cwi) {
+    public ClientboundSetDisplayObjectivePacket(final int integer, @Nullable final Objective dfj) {
         this.slot = integer;
-        if (cwi == null) {
+        if (dfj == null) {
             this.objectiveName = "";
         }
         else {
-            this.objectiveName = cwi.getName();
+            this.objectiveName = dfj.getName();
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.slot = kv.readByte();
-        this.objectiveName = kv.readUtf(16);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.slot = mg.readByte();
+        this.objectiveName = mg.readUtf(16);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.slot);
-        kv.writeUtf(this.objectiveName);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.slot);
+        mg.writeUtf(this.objectiveName);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetDisplayObjective(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetDisplayObjective(this);
     }
     
     public int getSlot() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java
index 7b58ecf..467040a 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java
@@ -14,32 +14,32 @@ public class ClientboundSetEntityDataPacket implements Packet<ClientGamePacketLi
     public ClientboundSetEntityDataPacket() {
     }
     
-    public ClientboundSetEntityDataPacket(final int integer, final SynchedEntityData se, final boolean boolean3) {
+    public ClientboundSetEntityDataPacket(final int integer, final SynchedEntityData tt, final boolean boolean3) {
         this.id = integer;
         if (boolean3) {
-            this.packedItems = se.getAll();
-            se.clearDirty();
+            this.packedItems = tt.getAll();
+            tt.clearDirty();
         }
         else {
-            this.packedItems = se.packDirty();
+            this.packedItems = tt.packDirty();
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.packedItems = SynchedEntityData.unpack(kv);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.packedItems = SynchedEntityData.unpack(mg);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        SynchedEntityData.pack(this.packedItems, kv);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        SynchedEntityData.pack(this.packedItems, mg);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetEntityData(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetEntityData(this);
     }
     
     public List<SynchedEntityData.DataItem<?>> getUnpackedData() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetEntityLinkPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetEntityLinkPacket.java
index 945f82c..dea58a0 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetEntityLinkPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetEntityLinkPacket.java
@@ -14,26 +14,26 @@ public class ClientboundSetEntityLinkPacket implements Packet<ClientGamePacketLi
     public ClientboundSetEntityLinkPacket() {
     }
     
-    public ClientboundSetEntityLinkPacket(final Entity akq1, @Nullable final Entity akq2) {
-        this.sourceId = akq1.getId();
-        this.destId = ((akq2 != null) ? akq2.getId() : 0);
+    public ClientboundSetEntityLinkPacket(final Entity aom1, @Nullable final Entity aom2) {
+        this.sourceId = aom1.getId();
+        this.destId = ((aom2 != null) ? aom2.getId() : 0);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.sourceId = kv.readInt();
-        this.destId = kv.readInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.sourceId = mg.readInt();
+        this.destId = mg.readInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeInt(this.sourceId);
-        kv.writeInt(this.destId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeInt(this.sourceId);
+        mg.writeInt(this.destId);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleEntityLinkPacket(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleEntityLinkPacket(this);
     }
     
     public int getSourceId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetEntityMotionPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetEntityMotionPacket.java
index ed9bb51..ca55ccb 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetEntityMotionPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetEntityMotionPacket.java
@@ -17,40 +17,40 @@ public class ClientboundSetEntityMotionPacket implements Packet<ClientGamePacket
     public ClientboundSetEntityMotionPacket() {
     }
     
-    public ClientboundSetEntityMotionPacket(final Entity akq) {
-        this(akq.getId(), akq.getDeltaMovement());
+    public ClientboundSetEntityMotionPacket(final Entity aom) {
+        this(aom.getId(), aom.getDeltaMovement());
     }
     
-    public ClientboundSetEntityMotionPacket(final int integer, final Vec3 cvl) {
+    public ClientboundSetEntityMotionPacket(final int integer, final Vec3 dem) {
         this.id = integer;
         final double double4 = 3.9;
-        final double double5 = Mth.clamp(cvl.x, -3.9, 3.9);
-        final double double6 = Mth.clamp(cvl.y, -3.9, 3.9);
-        final double double7 = Mth.clamp(cvl.z, -3.9, 3.9);
+        final double double5 = Mth.clamp(dem.x, -3.9, 3.9);
+        final double double6 = Mth.clamp(dem.y, -3.9, 3.9);
+        final double double7 = Mth.clamp(dem.z, -3.9, 3.9);
         this.xa = (int)(double5 * 8000.0);
         this.ya = (int)(double6 * 8000.0);
         this.za = (int)(double7 * 8000.0);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.xa = kv.readShort();
-        this.ya = kv.readShort();
-        this.za = kv.readShort();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.xa = mg.readShort();
+        this.ya = mg.readShort();
+        this.za = mg.readShort();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeShort(this.xa);
-        kv.writeShort(this.ya);
-        kv.writeShort(this.za);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeShort(this.xa);
+        mg.writeShort(this.ya);
+        mg.writeShort(this.za);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetEntityMotion(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetEntityMotion(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java
new file mode 100644
index 0000000..c2588ac
--- /dev/null
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java
@@ -0,0 +1,64 @@
+package net.minecraft.network.protocol.game;
+
+import net.minecraft.network.PacketListener;
+import java.io.IOException;
+import net.minecraft.network.FriendlyByteBuf;
+import com.google.common.collect.Lists;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.entity.EquipmentSlot;
+import com.mojang.datafixers.util.Pair;
+import java.util.List;
+import net.minecraft.network.protocol.Packet;
+
+public class ClientboundSetEquipmentPacket implements Packet<ClientGamePacketListener> {
+    private int entity;
+    private final List<Pair<EquipmentSlot, ItemStack>> slots;
+    
+    public ClientboundSetEquipmentPacket() {
+        this.slots = Lists.newArrayList();
+    }
+    
+    public ClientboundSetEquipmentPacket(final int integer, final List<Pair<EquipmentSlot, ItemStack>> list) {
+        this.entity = integer;
+        this.slots = list;
+    }
+    
+    @Override
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entity = mg.readVarInt();
+        final EquipmentSlot[] arr3 = EquipmentSlot.values();
+        int integer4;
+        do {
+            integer4 = mg.readByte();
+            final EquipmentSlot aor5 = arr3[integer4 & 0x7F];
+            final ItemStack bki6 = mg.readItem();
+            this.slots.add((Pair<EquipmentSlot, ItemStack>)Pair.of(aor5, bki6));
+        } while ((integer4 & 0xFFFFFF80) != 0x0);
+    }
+    
+    @Override
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.entity);
+        for (int integer3 = this.slots.size(), integer4 = 0; integer4 < integer3; ++integer4) {
+            final Pair<EquipmentSlot, ItemStack> pair5 = this.slots.get(integer4);
+            final EquipmentSlot aor6 = (EquipmentSlot)pair5.getFirst();
+            final boolean boolean7 = integer4 != integer3 - 1;
+            final int integer5 = aor6.ordinal();
+            mg.writeByte(boolean7 ? (integer5 | 0xFFFFFF80) : integer5);
+            mg.writeItem((ItemStack)pair5.getSecond());
+        }
+    }
+    
+    @Override
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetEquipment(this);
+    }
+    
+    public int getEntity() {
+        return this.entity;
+    }
+    
+    public List<Pair<EquipmentSlot, ItemStack>> getSlots() {
+        return this.slots;
+    }
+}
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetEquippedItemPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetEquippedItemPacket.java
deleted file mode 100644
index a5779e0..0000000
--- a/src/net/minecraft/network/protocol/game/ClientboundSetEquippedItemPacket.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package net.minecraft.network.protocol.game;
-
-import net.minecraft.network.PacketListener;
-import java.io.IOException;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.network.protocol.Packet;
-
-public class ClientboundSetEquippedItemPacket implements Packet<ClientGamePacketListener> {
-    private int entity;
-    private EquipmentSlot slot;
-    private ItemStack itemStack;
-    
-    public ClientboundSetEquippedItemPacket() {
-        this.itemStack = ItemStack.EMPTY;
-    }
-    
-    public ClientboundSetEquippedItemPacket(final int integer, final EquipmentSlot akv, final ItemStack ben) {
-        this.itemStack = ItemStack.EMPTY;
-        this.entity = integer;
-        this.slot = akv;
-        this.itemStack = ben.copy();
-    }
-    
-    @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entity = kv.readVarInt();
-        this.slot = kv.<EquipmentSlot>readEnum(EquipmentSlot.class);
-        this.itemStack = kv.readItem();
-    }
-    
-    @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.entity);
-        kv.writeEnum(this.slot);
-        kv.writeItem(this.itemStack);
-    }
-    
-    @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetEquippedItem(this);
-    }
-    
-    public ItemStack getItem() {
-        return this.itemStack;
-    }
-    
-    public int getEntity() {
-        return this.entity;
-    }
-    
-    public EquipmentSlot getSlot() {
-        return this.slot;
-    }
-}
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetExperiencePacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetExperiencePacket.java
index 7d44261..821bf71 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetExperiencePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetExperiencePacket.java
@@ -20,22 +20,22 @@ public class ClientboundSetExperiencePacket implements Packet<ClientGamePacketLi
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.experienceProgress = kv.readFloat();
-        this.experienceLevel = kv.readVarInt();
-        this.totalExperience = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.experienceProgress = mg.readFloat();
+        this.experienceLevel = mg.readVarInt();
+        this.totalExperience = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeFloat(this.experienceProgress);
-        kv.writeVarInt(this.experienceLevel);
-        kv.writeVarInt(this.totalExperience);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeFloat(this.experienceProgress);
+        mg.writeVarInt(this.experienceLevel);
+        mg.writeVarInt(this.totalExperience);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetExperience(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetExperience(this);
     }
     
     public float getExperienceProgress() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetHealthPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetHealthPacket.java
index 26b95bd..b23bf61 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetHealthPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetHealthPacket.java
@@ -20,22 +20,22 @@ public class ClientboundSetHealthPacket implements Packet<ClientGamePacketListen
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.health = kv.readFloat();
-        this.food = kv.readVarInt();
-        this.saturation = kv.readFloat();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.health = mg.readFloat();
+        this.food = mg.readVarInt();
+        this.saturation = mg.readFloat();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeFloat(this.health);
-        kv.writeVarInt(this.food);
-        kv.writeFloat(this.saturation);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeFloat(this.health);
+        mg.writeVarInt(this.food);
+        mg.writeFloat(this.saturation);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetHealth(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetHealth(this);
     }
     
     public float getHealth() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetObjectivePacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetObjectivePacket.java
index b3014f3..757c811 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetObjectivePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetObjectivePacket.java
@@ -17,36 +17,36 @@ public class ClientboundSetObjectivePacket implements Packet<ClientGamePacketLis
     public ClientboundSetObjectivePacket() {
     }
     
-    public ClientboundSetObjectivePacket(final Objective cwi, final int integer) {
-        this.objectiveName = cwi.getName();
-        this.displayName = cwi.getDisplayName();
-        this.renderType = cwi.getRenderType();
+    public ClientboundSetObjectivePacket(final Objective dfj, final int integer) {
+        this.objectiveName = dfj.getName();
+        this.displayName = dfj.getDisplayName();
+        this.renderType = dfj.getRenderType();
         this.method = integer;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.objectiveName = kv.readUtf(16);
-        this.method = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.objectiveName = mg.readUtf(16);
+        this.method = mg.readByte();
         if (this.method == 0 || this.method == 2) {
-            this.displayName = kv.readComponent();
-            this.renderType = kv.<ObjectiveCriteria.RenderType>readEnum(ObjectiveCriteria.RenderType.class);
+            this.displayName = mg.readComponent();
+            this.renderType = mg.<ObjectiveCriteria.RenderType>readEnum(ObjectiveCriteria.RenderType.class);
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUtf(this.objectiveName);
-        kv.writeByte(this.method);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUtf(this.objectiveName);
+        mg.writeByte(this.method);
         if (this.method == 0 || this.method == 2) {
-            kv.writeComponent(this.displayName);
-            kv.writeEnum(this.renderType);
+            mg.writeComponent(this.displayName);
+            mg.writeEnum(this.renderType);
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleAddObjective(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleAddObjective(this);
     }
     
     public String getObjectiveName() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetPassengersPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetPassengersPacket.java
index 0def28b..12e7564 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetPassengersPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetPassengersPacket.java
@@ -14,9 +14,9 @@ public class ClientboundSetPassengersPacket implements Packet<ClientGamePacketLi
     public ClientboundSetPassengersPacket() {
     }
     
-    public ClientboundSetPassengersPacket(final Entity akq) {
-        this.vehicle = akq.getId();
-        final List<Entity> list3 = akq.getPassengers();
+    public ClientboundSetPassengersPacket(final Entity aom) {
+        this.vehicle = aom.getId();
+        final List<Entity> list3 = aom.getPassengers();
         this.passengers = new int[list3.size()];
         for (int integer4 = 0; integer4 < list3.size(); ++integer4) {
             this.passengers[integer4] = list3.get(integer4).getId();
@@ -24,20 +24,20 @@ public class ClientboundSetPassengersPacket implements Packet<ClientGamePacketLi
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.vehicle = kv.readVarInt();
-        this.passengers = kv.readVarIntArray();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.vehicle = mg.readVarInt();
+        this.passengers = mg.readVarIntArray();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.vehicle);
-        kv.writeVarIntArray(this.passengers);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.vehicle);
+        mg.writeVarIntArray(this.passengers);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetEntityPassengersPacket(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetEntityPassengersPacket(this);
     }
     
     public int[] getPassengers() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
index e65574b..3c69d96 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
@@ -27,45 +27,45 @@ public class ClientboundSetPlayerTeamPacket implements Packet<ClientGamePacketLi
     
     public ClientboundSetPlayerTeamPacket() {
         this.name = "";
-        this.displayName = new TextComponent("");
-        this.playerPrefix = new TextComponent("");
-        this.playerSuffix = new TextComponent("");
+        this.displayName = TextComponent.EMPTY;
+        this.playerPrefix = TextComponent.EMPTY;
+        this.playerSuffix = TextComponent.EMPTY;
         this.nametagVisibility = Team.Visibility.ALWAYS.name;
         this.collisionRule = Team.CollisionRule.ALWAYS.name;
         this.color = ChatFormatting.RESET;
         this.players = Lists.newArrayList();
     }
     
-    public ClientboundSetPlayerTeamPacket(final PlayerTeam cwj, final int integer) {
+    public ClientboundSetPlayerTeamPacket(final PlayerTeam dfk, final int integer) {
         this.name = "";
-        this.displayName = new TextComponent("");
-        this.playerPrefix = new TextComponent("");
-        this.playerSuffix = new TextComponent("");
+        this.displayName = TextComponent.EMPTY;
+        this.playerPrefix = TextComponent.EMPTY;
+        this.playerSuffix = TextComponent.EMPTY;
         this.nametagVisibility = Team.Visibility.ALWAYS.name;
         this.collisionRule = Team.CollisionRule.ALWAYS.name;
         this.color = ChatFormatting.RESET;
         this.players = Lists.newArrayList();
-        this.name = cwj.getName();
+        this.name = dfk.getName();
         this.method = integer;
         if (integer == 0 || integer == 2) {
-            this.displayName = cwj.getDisplayName();
-            this.options = cwj.packOptions();
-            this.nametagVisibility = cwj.getNameTagVisibility().name;
-            this.collisionRule = cwj.getCollisionRule().name;
-            this.color = cwj.getColor();
-            this.playerPrefix = cwj.getPlayerPrefix();
-            this.playerSuffix = cwj.getPlayerSuffix();
+            this.displayName = dfk.getDisplayName();
+            this.options = dfk.packOptions();
+            this.nametagVisibility = dfk.getNameTagVisibility().name;
+            this.collisionRule = dfk.getCollisionRule().name;
+            this.color = dfk.getColor();
+            this.playerPrefix = dfk.getPlayerPrefix();
+            this.playerSuffix = dfk.getPlayerSuffix();
         }
         if (integer == 0) {
-            this.players.addAll(cwj.getPlayers());
+            this.players.addAll(dfk.getPlayers());
         }
     }
     
-    public ClientboundSetPlayerTeamPacket(final PlayerTeam cwj, final Collection<String> collection, final int integer) {
+    public ClientboundSetPlayerTeamPacket(final PlayerTeam dfk, final Collection<String> collection, final int integer) {
         this.name = "";
-        this.displayName = new TextComponent("");
-        this.playerPrefix = new TextComponent("");
-        this.playerSuffix = new TextComponent("");
+        this.displayName = TextComponent.EMPTY;
+        this.playerPrefix = TextComponent.EMPTY;
+        this.playerSuffix = TextComponent.EMPTY;
         this.nametagVisibility = Team.Visibility.ALWAYS.name;
         this.collisionRule = Team.CollisionRule.ALWAYS.name;
         this.color = ChatFormatting.RESET;
@@ -77,54 +77,54 @@ public class ClientboundSetPlayerTeamPacket implements Packet<ClientGamePacketLi
             throw new IllegalArgumentException("Players cannot be null/empty");
         }
         this.method = integer;
-        this.name = cwj.getName();
+        this.name = dfk.getName();
         this.players.addAll(collection);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.name = kv.readUtf(16);
-        this.method = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.name = mg.readUtf(16);
+        this.method = mg.readByte();
         if (this.method == 0 || this.method == 2) {
-            this.displayName = kv.readComponent();
-            this.options = kv.readByte();
-            this.nametagVisibility = kv.readUtf(40);
-            this.collisionRule = kv.readUtf(40);
-            this.color = kv.<ChatFormatting>readEnum(ChatFormatting.class);
-            this.playerPrefix = kv.readComponent();
-            this.playerSuffix = kv.readComponent();
+            this.displayName = mg.readComponent();
+            this.options = mg.readByte();
+            this.nametagVisibility = mg.readUtf(40);
+            this.collisionRule = mg.readUtf(40);
+            this.color = mg.<ChatFormatting>readEnum(ChatFormatting.class);
+            this.playerPrefix = mg.readComponent();
+            this.playerSuffix = mg.readComponent();
         }
         if (this.method == 0 || this.method == 3 || this.method == 4) {
-            for (int integer3 = kv.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
-                this.players.add(kv.readUtf(40));
+            for (int integer3 = mg.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
+                this.players.add(mg.readUtf(40));
             }
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUtf(this.name);
-        kv.writeByte(this.method);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUtf(this.name);
+        mg.writeByte(this.method);
         if (this.method == 0 || this.method == 2) {
-            kv.writeComponent(this.displayName);
-            kv.writeByte(this.options);
-            kv.writeUtf(this.nametagVisibility);
-            kv.writeUtf(this.collisionRule);
-            kv.writeEnum(this.color);
-            kv.writeComponent(this.playerPrefix);
-            kv.writeComponent(this.playerSuffix);
+            mg.writeComponent(this.displayName);
+            mg.writeByte(this.options);
+            mg.writeUtf(this.nametagVisibility);
+            mg.writeUtf(this.collisionRule);
+            mg.writeEnum(this.color);
+            mg.writeComponent(this.playerPrefix);
+            mg.writeComponent(this.playerSuffix);
         }
         if (this.method == 0 || this.method == 3 || this.method == 4) {
-            kv.writeVarInt(this.players.size());
+            mg.writeVarInt(this.players.size());
             for (final String string4 : this.players) {
-                kv.writeUtf(string4);
+                mg.writeUtf(string4);
             }
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetPlayerTeamPacket(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetPlayerTeamPacket(this);
     }
     
     public String getName() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetScorePacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetScorePacket.java
index 69c79bc..61b4321 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetScorePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetScorePacket.java
@@ -31,29 +31,29 @@ public class ClientboundSetScorePacket implements Packet<ClientGamePacketListene
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.owner = kv.readUtf(40);
-        this.method = kv.<ServerScoreboard.Method>readEnum(ServerScoreboard.Method.class);
-        final String string3 = kv.readUtf(16);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.owner = mg.readUtf(40);
+        this.method = mg.<ServerScoreboard.Method>readEnum(ServerScoreboard.Method.class);
+        final String string3 = mg.readUtf(16);
         this.objectiveName = (Objects.equals(string3, "") ? null : string3);
         if (this.method != ServerScoreboard.Method.REMOVE) {
-            this.score = kv.readVarInt();
+            this.score = mg.readVarInt();
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUtf(this.owner);
-        kv.writeEnum(this.method);
-        kv.writeUtf((this.objectiveName == null) ? "" : this.objectiveName);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUtf(this.owner);
+        mg.writeEnum(this.method);
+        mg.writeUtf((this.objectiveName == null) ? "" : this.objectiveName);
         if (this.method != ServerScoreboard.Method.REMOVE) {
-            kv.writeVarInt(this.score);
+            mg.writeVarInt(this.score);
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetScore(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetScore(this);
     }
     
     public String getOwner() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetSpawnPositionPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetSpawnPositionPacket.java
deleted file mode 100644
index 3e60e7d..0000000
--- a/src/net/minecraft/network/protocol/game/ClientboundSetSpawnPositionPacket.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package net.minecraft.network.protocol.game;
-
-import net.minecraft.network.PacketListener;
-import java.io.IOException;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.protocol.Packet;
-
-public class ClientboundSetSpawnPositionPacket implements Packet<ClientGamePacketListener> {
-    private BlockPos pos;
-    
-    public ClientboundSetSpawnPositionPacket() {
-    }
-    
-    public ClientboundSetSpawnPositionPacket(final BlockPos fk) {
-        this.pos = fk;
-    }
-    
-    @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.pos = kv.readBlockPos();
-    }
-    
-    @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBlockPos(this.pos);
-    }
-    
-    @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetSpawn(this);
-    }
-    
-    public BlockPos getPos() {
-        return this.pos;
-    }
-}
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
index 9661aec..f0c9b34 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
@@ -24,20 +24,20 @@ public class ClientboundSetTimePacket implements Packet<ClientGamePacketListener
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.gameTime = kv.readLong();
-        this.dayTime = kv.readLong();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.gameTime = mg.readLong();
+        this.dayTime = mg.readLong();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeLong(this.gameTime);
-        kv.writeLong(this.dayTime);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeLong(this.gameTime);
+        mg.writeLong(this.dayTime);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetTime(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetTime(this);
     }
     
     public long getGameTime() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSetTitlesPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSetTitlesPacket.java
index aac818d..baeec0f 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSetTitlesPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSetTitlesPacket.java
@@ -17,51 +17,51 @@ public class ClientboundSetTitlesPacket implements Packet<ClientGamePacketListen
     public ClientboundSetTitlesPacket() {
     }
     
-    public ClientboundSetTitlesPacket(final Type a, final Component lf) {
-        this(a, lf, -1, -1, -1);
+    public ClientboundSetTitlesPacket(final Type a, final Component mr) {
+        this(a, mr, -1, -1, -1);
     }
     
     public ClientboundSetTitlesPacket(final int integer1, final int integer2, final int integer3) {
         this(Type.TIMES, null, integer1, integer2, integer3);
     }
     
-    public ClientboundSetTitlesPacket(final Type a, @Nullable final Component lf, final int integer3, final int integer4, final int integer5) {
+    public ClientboundSetTitlesPacket(final Type a, @Nullable final Component mr, final int integer3, final int integer4, final int integer5) {
         this.type = a;
-        this.text = lf;
+        this.text = mr;
         this.fadeInTime = integer3;
         this.stayTime = integer4;
         this.fadeOutTime = integer5;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.type = kv.<Type>readEnum(Type.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.type = mg.<Type>readEnum(Type.class);
         if (this.type == Type.TITLE || this.type == Type.SUBTITLE || this.type == Type.ACTIONBAR) {
-            this.text = kv.readComponent();
+            this.text = mg.readComponent();
         }
         if (this.type == Type.TIMES) {
-            this.fadeInTime = kv.readInt();
-            this.stayTime = kv.readInt();
-            this.fadeOutTime = kv.readInt();
+            this.fadeInTime = mg.readInt();
+            this.stayTime = mg.readInt();
+            this.fadeOutTime = mg.readInt();
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.type);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.type);
         if (this.type == Type.TITLE || this.type == Type.SUBTITLE || this.type == Type.ACTIONBAR) {
-            kv.writeComponent(this.text);
+            mg.writeComponent(this.text);
         }
         if (this.type == Type.TIMES) {
-            kv.writeInt(this.fadeInTime);
-            kv.writeInt(this.stayTime);
-            kv.writeInt(this.fadeOutTime);
+            mg.writeInt(this.fadeInTime);
+            mg.writeInt(this.stayTime);
+            mg.writeInt(this.fadeOutTime);
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSetTitles(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSetTitles(this);
     }
     
     public Type getType() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSoundEntityPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSoundEntityPacket.java
index 54d0046..f9f6e96 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSoundEntityPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSoundEntityPacket.java
@@ -20,31 +20,31 @@ public class ClientboundSoundEntityPacket implements Packet<ClientGamePacketList
     public ClientboundSoundEntityPacket() {
     }
     
-    public ClientboundSoundEntityPacket(final SoundEvent aah, final SoundSource aaj, final Entity akq, final float float4, final float float5) {
-        Validate.notNull(aah, "sound", new Object[0]);
-        this.sound = aah;
-        this.source = aaj;
-        this.id = akq.getId();
+    public ClientboundSoundEntityPacket(final SoundEvent ack, final SoundSource acm, final Entity aom, final float float4, final float float5) {
+        Validate.notNull(ack, "sound", new Object[0]);
+        this.sound = ack;
+        this.source = acm;
+        this.id = aom.getId();
         this.volume = float4;
         this.pitch = float5;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.sound = Registry.SOUND_EVENT.byId(kv.readVarInt());
-        this.source = kv.<SoundSource>readEnum(SoundSource.class);
-        this.id = kv.readVarInt();
-        this.volume = kv.readFloat();
-        this.pitch = kv.readFloat();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.sound = Registry.SOUND_EVENT.byId(mg.readVarInt());
+        this.source = mg.<SoundSource>readEnum(SoundSource.class);
+        this.id = mg.readVarInt();
+        this.volume = mg.readFloat();
+        this.pitch = mg.readFloat();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(Registry.SOUND_EVENT.getId(this.sound));
-        kv.writeEnum(this.source);
-        kv.writeVarInt(this.id);
-        kv.writeFloat(this.volume);
-        kv.writeFloat(this.pitch);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(Registry.SOUND_EVENT.getId(this.sound));
+        mg.writeEnum(this.source);
+        mg.writeVarInt(this.id);
+        mg.writeFloat(this.volume);
+        mg.writeFloat(this.pitch);
     }
     
     public SoundEvent getSound() {
@@ -68,7 +68,7 @@ public class ClientboundSoundEntityPacket implements Packet<ClientGamePacketList
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSoundEntityEvent(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSoundEntityEvent(this);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundSoundPacket.java b/src/net/minecraft/network/protocol/game/ClientboundSoundPacket.java
index d0f9f0e..b26795f 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundSoundPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundSoundPacket.java
@@ -21,10 +21,10 @@ public class ClientboundSoundPacket implements Packet<ClientGamePacketListener>
     public ClientboundSoundPacket() {
     }
     
-    public ClientboundSoundPacket(final SoundEvent aah, final SoundSource aaj, final double double3, final double double4, final double double5, final float float6, final float float7) {
-        Validate.notNull(aah, "sound", new Object[0]);
-        this.sound = aah;
-        this.source = aaj;
+    public ClientboundSoundPacket(final SoundEvent ack, final SoundSource acm, final double double3, final double double4, final double double5, final float float6, final float float7) {
+        Validate.notNull(ack, "sound", new Object[0]);
+        this.sound = ack;
+        this.source = acm;
         this.x = (int)(double3 * 8.0);
         this.y = (int)(double4 * 8.0);
         this.z = (int)(double5 * 8.0);
@@ -33,25 +33,25 @@ public class ClientboundSoundPacket implements Packet<ClientGamePacketListener>
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.sound = Registry.SOUND_EVENT.byId(kv.readVarInt());
-        this.source = kv.<SoundSource>readEnum(SoundSource.class);
-        this.x = kv.readInt();
-        this.y = kv.readInt();
-        this.z = kv.readInt();
-        this.volume = kv.readFloat();
-        this.pitch = kv.readFloat();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.sound = Registry.SOUND_EVENT.byId(mg.readVarInt());
+        this.source = mg.<SoundSource>readEnum(SoundSource.class);
+        this.x = mg.readInt();
+        this.y = mg.readInt();
+        this.z = mg.readInt();
+        this.volume = mg.readFloat();
+        this.pitch = mg.readFloat();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(Registry.SOUND_EVENT.getId(this.sound));
-        kv.writeEnum(this.source);
-        kv.writeInt(this.x);
-        kv.writeInt(this.y);
-        kv.writeInt(this.z);
-        kv.writeFloat(this.volume);
-        kv.writeFloat(this.pitch);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(Registry.SOUND_EVENT.getId(this.sound));
+        mg.writeEnum(this.source);
+        mg.writeInt(this.x);
+        mg.writeInt(this.y);
+        mg.writeInt(this.z);
+        mg.writeFloat(this.volume);
+        mg.writeFloat(this.pitch);
     }
     
     public SoundEvent getSound() {
@@ -83,7 +83,7 @@ public class ClientboundSoundPacket implements Packet<ClientGamePacketListener>
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleSoundEvent(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleSoundEvent(this);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundStopSoundPacket.java b/src/net/minecraft/network/protocol/game/ClientboundStopSoundPacket.java
index 32e230d..b1d9c55 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundStopSoundPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundStopSoundPacket.java
@@ -15,41 +15,41 @@ public class ClientboundStopSoundPacket implements Packet<ClientGamePacketListen
     public ClientboundStopSoundPacket() {
     }
     
-    public ClientboundStopSoundPacket(@Nullable final ResourceLocation sm, @Nullable final SoundSource aaj) {
-        this.name = sm;
-        this.source = aaj;
+    public ClientboundStopSoundPacket(@Nullable final ResourceLocation uh, @Nullable final SoundSource acm) {
+        this.name = uh;
+        this.source = acm;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        final int integer3 = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        final int integer3 = mg.readByte();
         if ((integer3 & 0x1) > 0) {
-            this.source = kv.<SoundSource>readEnum(SoundSource.class);
+            this.source = mg.<SoundSource>readEnum(SoundSource.class);
         }
         if ((integer3 & 0x2) > 0) {
-            this.name = kv.readResourceLocation();
+            this.name = mg.readResourceLocation();
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
+    public void write(final FriendlyByteBuf mg) throws IOException {
         if (this.source != null) {
             if (this.name != null) {
-                kv.writeByte(3);
-                kv.writeEnum(this.source);
-                kv.writeResourceLocation(this.name);
+                mg.writeByte(3);
+                mg.writeEnum(this.source);
+                mg.writeResourceLocation(this.name);
             }
             else {
-                kv.writeByte(1);
-                kv.writeEnum(this.source);
+                mg.writeByte(1);
+                mg.writeEnum(this.source);
             }
         }
         else if (this.name != null) {
-            kv.writeByte(2);
-            kv.writeResourceLocation(this.name);
+            mg.writeByte(2);
+            mg.writeResourceLocation(this.name);
         }
         else {
-            kv.writeByte(0);
+            mg.writeByte(0);
         }
     }
     
@@ -64,7 +64,7 @@ public class ClientboundStopSoundPacket implements Packet<ClientGamePacketListen
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleStopSoundEvent(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleStopSoundEvent(this);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundTabListPacket.java b/src/net/minecraft/network/protocol/game/ClientboundTabListPacket.java
index d92705d..2e341e1 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundTabListPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundTabListPacket.java
@@ -11,20 +11,20 @@ public class ClientboundTabListPacket implements Packet<ClientGamePacketListener
     private Component footer;
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.header = kv.readComponent();
-        this.footer = kv.readComponent();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.header = mg.readComponent();
+        this.footer = mg.readComponent();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeComponent(this.header);
-        kv.writeComponent(this.footer);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeComponent(this.header);
+        mg.writeComponent(this.footer);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleTabListCustomisation(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleTabListCustomisation(this);
     }
     
     public Component getHeader() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundTagQueryPacket.java b/src/net/minecraft/network/protocol/game/ClientboundTagQueryPacket.java
index 4e7c3d5..15704d8 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundTagQueryPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundTagQueryPacket.java
@@ -15,26 +15,26 @@ public class ClientboundTagQueryPacket implements Packet<ClientGamePacketListene
     public ClientboundTagQueryPacket() {
     }
     
-    public ClientboundTagQueryPacket(final int integer, @Nullable final CompoundTag jt) {
+    public ClientboundTagQueryPacket(final int integer, @Nullable final CompoundTag le) {
         this.transactionId = integer;
-        this.tag = jt;
+        this.tag = le;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.transactionId = kv.readVarInt();
-        this.tag = kv.readNbt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.transactionId = mg.readVarInt();
+        this.tag = mg.readNbt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.transactionId);
-        kv.writeNbt(this.tag);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.transactionId);
+        mg.writeNbt(this.tag);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleTagQueryPacket(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleTagQueryPacket(this);
     }
     
     public int getTransactionId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundTakeItemEntityPacket.java b/src/net/minecraft/network/protocol/game/ClientboundTakeItemEntityPacket.java
index dc4c455..cd53e22 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundTakeItemEntityPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundTakeItemEntityPacket.java
@@ -20,22 +20,22 @@ public class ClientboundTakeItemEntityPacket implements Packet<ClientGamePacketL
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.itemId = kv.readVarInt();
-        this.playerId = kv.readVarInt();
-        this.amount = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.itemId = mg.readVarInt();
+        this.playerId = mg.readVarInt();
+        this.amount = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.itemId);
-        kv.writeVarInt(this.playerId);
-        kv.writeVarInt(this.amount);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.itemId);
+        mg.writeVarInt(this.playerId);
+        mg.writeVarInt(this.amount);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleTakeItemEntity(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleTakeItemEntity(this);
     }
     
     public int getItemId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundTeleportEntityPacket.java b/src/net/minecraft/network/protocol/game/ClientboundTeleportEntityPacket.java
index 0910e7f..67978c2 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundTeleportEntityPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundTeleportEntityPacket.java
@@ -18,41 +18,41 @@ public class ClientboundTeleportEntityPacket implements Packet<ClientGamePacketL
     public ClientboundTeleportEntityPacket() {
     }
     
-    public ClientboundTeleportEntityPacket(final Entity akq) {
-        this.id = akq.getId();
-        this.x = akq.getX();
-        this.y = akq.getY();
-        this.z = akq.getZ();
-        this.yRot = (byte)(akq.yRot * 256.0f / 360.0f);
-        this.xRot = (byte)(akq.xRot * 256.0f / 360.0f);
-        this.onGround = akq.onGround;
+    public ClientboundTeleportEntityPacket(final Entity aom) {
+        this.id = aom.getId();
+        this.x = aom.getX();
+        this.y = aom.getY();
+        this.z = aom.getZ();
+        this.yRot = (byte)(aom.yRot * 256.0f / 360.0f);
+        this.xRot = (byte)(aom.xRot * 256.0f / 360.0f);
+        this.onGround = aom.isOnGround();
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-        this.yRot = kv.readByte();
-        this.xRot = kv.readByte();
-        this.onGround = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.x = mg.readDouble();
+        this.y = mg.readDouble();
+        this.z = mg.readDouble();
+        this.yRot = mg.readByte();
+        this.xRot = mg.readByte();
+        this.onGround = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-        kv.writeByte(this.yRot);
-        kv.writeByte(this.xRot);
-        kv.writeBoolean(this.onGround);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeDouble(this.x);
+        mg.writeDouble(this.y);
+        mg.writeDouble(this.z);
+        mg.writeByte(this.yRot);
+        mg.writeByte(this.xRot);
+        mg.writeBoolean(this.onGround);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleTeleportEntity(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleTeleportEntity(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundUpdateAdvancementsPacket.java b/src/net/minecraft/network/protocol/game/ClientboundUpdateAdvancementsPacket.java
index cab0ad6..cf8d8f1 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundUpdateAdvancementsPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundUpdateAdvancementsPacket.java
@@ -26,57 +26,57 @@ public class ClientboundUpdateAdvancementsPacket implements Packet<ClientGamePac
     public ClientboundUpdateAdvancementsPacket(final boolean boolean1, final Collection<Advancement> collection, final Set<ResourceLocation> set, final Map<ResourceLocation, AdvancementProgress> map) {
         this.reset = boolean1;
         this.added = Maps.newHashMap();
-        for (final Advancement u7 : collection) {
-            this.added.put(u7.getId(), u7.deconstruct());
+        for (final Advancement w7 : collection) {
+            this.added.put(w7.getId(), w7.deconstruct());
         }
         this.removed = set;
         this.progress = Maps.newHashMap(map);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleUpdateAdvancementsPacket(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleUpdateAdvancementsPacket(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.reset = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.reset = mg.readBoolean();
         this.added = Maps.newHashMap();
         this.removed = Sets.newLinkedHashSet();
         this.progress = Maps.newHashMap();
-        for (int integer3 = kv.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
-            final ResourceLocation sm5 = kv.readResourceLocation();
-            final Advancement.Builder a6 = Advancement.Builder.fromNetwork(kv);
-            this.added.put(sm5, a6);
+        for (int integer3 = mg.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
+            final ResourceLocation uh5 = mg.readResourceLocation();
+            final Advancement.Builder a6 = Advancement.Builder.fromNetwork(mg);
+            this.added.put(uh5, a6);
         }
-        for (int integer3 = kv.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
-            final ResourceLocation sm5 = kv.readResourceLocation();
-            this.removed.add(sm5);
+        for (int integer3 = mg.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
+            final ResourceLocation uh5 = mg.readResourceLocation();
+            this.removed.add(uh5);
         }
-        for (int integer3 = kv.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
-            final ResourceLocation sm5 = kv.readResourceLocation();
-            this.progress.put(sm5, AdvancementProgress.fromNetwork(kv));
+        for (int integer3 = mg.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
+            final ResourceLocation uh5 = mg.readResourceLocation();
+            this.progress.put(uh5, AdvancementProgress.fromNetwork(mg));
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBoolean(this.reset);
-        kv.writeVarInt(this.added.size());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBoolean(this.reset);
+        mg.writeVarInt(this.added.size());
         for (final Map.Entry<ResourceLocation, Advancement.Builder> entry4 : this.added.entrySet()) {
-            final ResourceLocation sm5 = entry4.getKey();
+            final ResourceLocation uh5 = entry4.getKey();
             final Advancement.Builder a6 = entry4.getValue();
-            kv.writeResourceLocation(sm5);
-            a6.serializeToNetwork(kv);
+            mg.writeResourceLocation(uh5);
+            a6.serializeToNetwork(mg);
         }
-        kv.writeVarInt(this.removed.size());
-        for (final ResourceLocation sm6 : this.removed) {
-            kv.writeResourceLocation(sm6);
+        mg.writeVarInt(this.removed.size());
+        for (final ResourceLocation uh6 : this.removed) {
+            mg.writeResourceLocation(uh6);
         }
-        kv.writeVarInt(this.progress.size());
+        mg.writeVarInt(this.progress.size());
         for (final Map.Entry<ResourceLocation, AdvancementProgress> entry5 : this.progress.entrySet()) {
-            kv.writeResourceLocation(entry5.getKey());
-            entry5.getValue().serializeToNetwork(kv);
+            mg.writeResourceLocation(entry5.getKey());
+            entry5.getValue().serializeToNetwork(mg);
         }
     }
     
diff --git a/src/net/minecraft/network/protocol/game/ClientboundUpdateAttributesPacket.java b/src/net/minecraft/network/protocol/game/ClientboundUpdateAttributesPacket.java
index 5fbf9b6..e5f9ab2 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundUpdateAttributesPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundUpdateAttributesPacket.java
@@ -3,6 +3,9 @@ package net.minecraft.network.protocol.game;
 import net.minecraft.network.PacketListener;
 import java.io.IOException;
 import java.util.UUID;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.core.Registry;
+import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.network.FriendlyByteBuf;
 import java.util.Iterator;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
@@ -23,45 +26,46 @@ public class ClientboundUpdateAttributesPacket implements Packet<ClientGamePacke
     public ClientboundUpdateAttributesPacket(final int integer, final Collection<AttributeInstance> collection) {
         this.attributes = Lists.newArrayList();
         this.entityId = integer;
-        for (final AttributeInstance alr5 : collection) {
-            this.attributes.add(new AttributeSnapshot(alr5.getAttribute().getName(), alr5.getBaseValue(), alr5.getModifiers()));
+        for (final AttributeInstance apt5 : collection) {
+            this.attributes.add(new AttributeSnapshot(apt5.getAttribute(), apt5.getBaseValue(), apt5.getModifiers()));
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entityId = kv.readVarInt();
-        for (int integer3 = kv.readInt(), integer4 = 0; integer4 < integer3; ++integer4) {
-            final String string5 = kv.readUtf(64);
-            final double double6 = kv.readDouble();
-            final List<AttributeModifier> list8 = Lists.newArrayList();
-            for (int integer5 = kv.readVarInt(), integer6 = 0; integer6 < integer5; ++integer6) {
-                final UUID uUID11 = kv.readUUID();
-                list8.add(new AttributeModifier(uUID11, "Unknown synced attribute modifier", kv.readDouble(), AttributeModifier.Operation.fromValue(kv.readByte())));
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entityId = mg.readVarInt();
+        for (int integer3 = mg.readInt(), integer4 = 0; integer4 < integer3; ++integer4) {
+            final ResourceLocation uh5 = mg.readResourceLocation();
+            final Attribute aps6 = Registry.ATTRIBUTE.get(uh5);
+            final double double7 = mg.readDouble();
+            final List<AttributeModifier> list9 = Lists.newArrayList();
+            for (int integer5 = mg.readVarInt(), integer6 = 0; integer6 < integer5; ++integer6) {
+                final UUID uUID12 = mg.readUUID();
+                list9.add(new AttributeModifier(uUID12, "Unknown synced attribute modifier", mg.readDouble(), AttributeModifier.Operation.fromValue(mg.readByte())));
             }
-            this.attributes.add(new AttributeSnapshot(string5, double6, list8));
+            this.attributes.add(new AttributeSnapshot(aps6, double7, list9));
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.entityId);
-        kv.writeInt(this.attributes.size());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.entityId);
+        mg.writeInt(this.attributes.size());
         for (final AttributeSnapshot a4 : this.attributes) {
-            kv.writeUtf(a4.getName());
-            kv.writeDouble(a4.getBase());
-            kv.writeVarInt(a4.getModifiers().size());
-            for (final AttributeModifier als6 : a4.getModifiers()) {
-                kv.writeUUID(als6.getId());
-                kv.writeDouble(als6.getAmount());
-                kv.writeByte(als6.getOperation().toValue());
+            mg.writeResourceLocation(Registry.ATTRIBUTE.getKey(a4.getAttribute()));
+            mg.writeDouble(a4.getBase());
+            mg.writeVarInt(a4.getModifiers().size());
+            for (final AttributeModifier apv6 : a4.getModifiers()) {
+                mg.writeUUID(apv6.getId());
+                mg.writeDouble(apv6.getAmount());
+                mg.writeByte(apv6.getOperation().toValue());
             }
         }
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleUpdateAttributes(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleUpdateAttributes(this);
     }
     
     public int getEntityId() {
@@ -73,18 +77,18 @@ public class ClientboundUpdateAttributesPacket implements Packet<ClientGamePacke
     }
     
     public class AttributeSnapshot {
-        private final String name;
+        private final Attribute attribute;
         private final double base;
         private final Collection<AttributeModifier> modifiers;
         
-        public AttributeSnapshot(final String string, final double double3, final Collection<AttributeModifier> collection) {
-            this.name = string;
+        public AttributeSnapshot(final Attribute aps, final double double3, final Collection<AttributeModifier> collection) {
+            this.attribute = aps;
             this.base = double3;
             this.modifiers = collection;
         }
         
-        public String getName() {
-            return this.name;
+        public Attribute getAttribute() {
+            return this.attribute;
         }
         
         public double getBase() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundUpdateMobEffectPacket.java b/src/net/minecraft/network/protocol/game/ClientboundUpdateMobEffectPacket.java
index 09aa503..d566109 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundUpdateMobEffectPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundUpdateMobEffectPacket.java
@@ -17,44 +17,44 @@ public class ClientboundUpdateMobEffectPacket implements Packet<ClientGamePacket
     public ClientboundUpdateMobEffectPacket() {
     }
     
-    public ClientboundUpdateMobEffectPacket(final int integer, final MobEffectInstance akk) {
+    public ClientboundUpdateMobEffectPacket(final int integer, final MobEffectInstance aog) {
         this.entityId = integer;
-        this.effectId = (byte)(MobEffect.getId(akk.getEffect()) & 0xFF);
-        this.effectAmplifier = (byte)(akk.getAmplifier() & 0xFF);
-        if (akk.getDuration() > 32767) {
+        this.effectId = (byte)(MobEffect.getId(aog.getEffect()) & 0xFF);
+        this.effectAmplifier = (byte)(aog.getAmplifier() & 0xFF);
+        if (aog.getDuration() > 32767) {
             this.effectDurationTicks = 32767;
         }
         else {
-            this.effectDurationTicks = akk.getDuration();
+            this.effectDurationTicks = aog.getDuration();
         }
         this.flags = 0;
-        if (akk.isAmbient()) {
+        if (aog.isAmbient()) {
             this.flags |= 0x1;
         }
-        if (akk.isVisible()) {
+        if (aog.isVisible()) {
             this.flags |= 0x2;
         }
-        if (akk.showIcon()) {
+        if (aog.showIcon()) {
             this.flags |= 0x4;
         }
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entityId = kv.readVarInt();
-        this.effectId = kv.readByte();
-        this.effectAmplifier = kv.readByte();
-        this.effectDurationTicks = kv.readVarInt();
-        this.flags = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entityId = mg.readVarInt();
+        this.effectId = mg.readByte();
+        this.effectAmplifier = mg.readByte();
+        this.effectDurationTicks = mg.readVarInt();
+        this.flags = mg.readByte();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.entityId);
-        kv.writeByte(this.effectId);
-        kv.writeByte(this.effectAmplifier);
-        kv.writeVarInt(this.effectDurationTicks);
-        kv.writeByte(this.flags);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.entityId);
+        mg.writeByte(this.effectId);
+        mg.writeByte(this.effectAmplifier);
+        mg.writeVarInt(this.effectDurationTicks);
+        mg.writeByte(this.flags);
     }
     
     public boolean isSuperLongDuration() {
@@ -62,8 +62,8 @@ public class ClientboundUpdateMobEffectPacket implements Packet<ClientGamePacket
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleUpdateMobEffect(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleUpdateMobEffect(this);
     }
     
     public int getEntityId() {
diff --git a/src/net/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket.java b/src/net/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket.java
index 11080cc..66cf4d0 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket.java
@@ -24,23 +24,23 @@ public class ClientboundUpdateRecipesPacket implements Packet<ClientGamePacketLi
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleUpdateRecipes(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleUpdateRecipes(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
+    public void read(final FriendlyByteBuf mg) throws IOException {
         this.recipes = Lists.newArrayList();
-        for (int integer3 = kv.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
-            this.recipes.add(fromNetwork(kv));
+        for (int integer3 = mg.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
+            this.recipes.add(fromNetwork(mg));
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.recipes.size());
-        for (final Recipe<?> bgw4 : this.recipes) {
-            ClientboundUpdateRecipesPacket.<Recipe<?>>toNetwork(bgw4, kv);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.recipes.size());
+        for (final Recipe<?> bmu4 : this.recipes) {
+            ClientboundUpdateRecipesPacket.<Recipe<?>>toNetwork(bmu4, mg);
         }
     }
     
@@ -48,20 +48,20 @@ public class ClientboundUpdateRecipesPacket implements Packet<ClientGamePacketLi
         return this.recipes;
     }
     
-    public static Recipe<?> fromNetwork(final FriendlyByteBuf kv) {
-        final ResourceLocation sm2 = kv.readResourceLocation();
-        final ResourceLocation sm3 = kv.readResourceLocation();
+    public static Recipe<?> fromNetwork(final FriendlyByteBuf mg) {
+        final ResourceLocation uh2 = mg.readResourceLocation();
+        final ResourceLocation uh3 = mg.readResourceLocation();
         final Object o;
         final Object obj;
-        return Registry.RECIPE_SERIALIZER.getOptional(sm2).<Throwable>orElseThrow(() -> {
+        return Registry.RECIPE_SERIALIZER.getOptional(uh2).<Throwable>orElseThrow(() -> {
             new IllegalArgumentException("Unknown recipe serializer " + obj);
             return o;
-        }).fromNetwork(sm3, kv);
+        }).fromNetwork(uh3, mg);
     }
     
-    public static <T extends Recipe<?>> void toNetwork(final T bgw, final FriendlyByteBuf kv) {
-        kv.writeResourceLocation(Registry.RECIPE_SERIALIZER.getKey(bgw.getSerializer()));
-        kv.writeResourceLocation(bgw.getId());
-        bgw.getSerializer().toNetwork(kv, bgw);
+    public static <T extends Recipe<?>> void toNetwork(final T bmu, final FriendlyByteBuf mg) {
+        mg.writeResourceLocation(Registry.RECIPE_SERIALIZER.getKey(bmu.getSerializer()));
+        mg.writeResourceLocation(bmu.getId());
+        bmu.getSerializer().toNetwork(mg, bmu);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ClientboundUpdateTagsPacket.java b/src/net/minecraft/network/protocol/game/ClientboundUpdateTagsPacket.java
index 7236da1..541a16a 100644
--- a/src/net/minecraft/network/protocol/game/ClientboundUpdateTagsPacket.java
+++ b/src/net/minecraft/network/protocol/game/ClientboundUpdateTagsPacket.java
@@ -12,23 +12,23 @@ public class ClientboundUpdateTagsPacket implements Packet<ClientGamePacketListe
     public ClientboundUpdateTagsPacket() {
     }
     
-    public ClientboundUpdateTagsPacket(final TagManager abb) {
-        this.tags = abb;
+    public ClientboundUpdateTagsPacket(final TagManager adh) {
+        this.tags = adh;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.tags = TagManager.deserializeFromNetwork(kv);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.tags = TagManager.deserializeFromNetwork(mg);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        this.tags.serializeToNetwork(kv);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        this.tags.serializeToNetwork(mg);
     }
     
     @Override
-    public void handle(final ClientGamePacketListener lw) {
-        lw.handleUpdateTags(this);
+    public void handle(final ClientGamePacketListener nl) {
+        nl.handleUpdateTags(this);
     }
     
     public TagManager getTags() {
diff --git a/src/net/minecraft/network/protocol/game/DebugMobNameGenerator.java b/src/net/minecraft/network/protocol/game/DebugEntityNameGenerator.java
similarity index 52%
rename from src/net/minecraft/network/protocol/game/DebugMobNameGenerator.java
rename to src/net/minecraft/network/protocol/game/DebugEntityNameGenerator.java
index eac603a..c3f9dc8 100644
--- a/src/net/minecraft/network/protocol/game/DebugMobNameGenerator.java
+++ b/src/net/minecraft/network/protocol/game/DebugEntityNameGenerator.java
@@ -1,19 +1,20 @@
 package net.minecraft.network.protocol.game;
 
+import net.minecraft.Util;
 import java.util.Random;
 import java.util.UUID;
 
-public class DebugMobNameGenerator {
+public class DebugEntityNameGenerator {
     private static final String[] NAMES_FIRST_PART;
     private static final String[] NAMES_SECOND_PART;
     
-    public static String getMobName(final UUID uUID) {
+    public static String getEntityName(final UUID uUID) {
         final Random random2 = getRandom(uUID);
-        return getRandomString(random2, DebugMobNameGenerator.NAMES_FIRST_PART) + getRandomString(random2, DebugMobNameGenerator.NAMES_SECOND_PART);
+        return getRandomString(random2, DebugEntityNameGenerator.NAMES_FIRST_PART) + getRandomString(random2, DebugEntityNameGenerator.NAMES_SECOND_PART);
     }
     
     private static String getRandomString(final Random random, final String[] arr) {
-        return arr[random.nextInt(arr.length)];
+        return Util.<String>getRandom(arr, random);
     }
     
     private static Random getRandom(final UUID uUID) {
@@ -21,7 +22,7 @@ public class DebugMobNameGenerator {
     }
     
     static {
-        NAMES_FIRST_PART = new String[] { "Slim", "Far", "River", "Silly", "Fat", "Thin", "Fish", "Bat", "Dark", "Oak", "Sly", "Bush", "Zen", "Bark", "Cry", "Slack", "Soup", "Grim", "Hook" };
-        NAMES_SECOND_PART = new String[] { "Fox", "Tail", "Jaw", "Whisper", "Twig", "Root", "Finder", "Nose", "Brow", "Blade", "Fry", "Seek", "Tooth", "Foot", "Leaf", "Stone", "Fall", "Face", "Tongue" };
+        NAMES_FIRST_PART = new String[] { "Slim", "Far", "River", "Silly", "Fat", "Thin", "Fish", "Bat", "Dark", "Oak", "Sly", "Bush", "Zen", "Bark", "Cry", "Slack", "Soup", "Grim", "Hook", "Dirt", "Mud", "Sad", "Hard", "Crook", "Sneak", "Stink", "Weird", "Fire", "Soot", "Soft", "Rough", "Cling", "Scar" };
+        NAMES_SECOND_PART = new String[] { "Fox", "Tail", "Jaw", "Whisper", "Twig", "Root", "Finder", "Nose", "Brow", "Blade", "Fry", "Seek", "Wart", "Tooth", "Foot", "Leaf", "Stone", "Fall", "Face", "Tongue", "Voice", "Lip", "Mouth", "Snail", "Toe", "Ear", "Hair", "Beard", "Shirt", "Fist" };
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/DebugPackets.java b/src/net/minecraft/network/protocol/game/DebugPackets.java
index edd0148..833bc7c 100644
--- a/src/net/minecraft/network/protocol/game/DebugPackets.java
+++ b/src/net/minecraft/network/protocol/game/DebugPackets.java
@@ -28,60 +28,66 @@ import org.apache.logging.log4j.Logger;
 public class DebugPackets {
     private static final Logger LOGGER;
     
-    public static void sendGameTestAddMarker(final ServerLevel xd, final BlockPos fk, final String string, final int integer4, final int integer5) {
-        final FriendlyByteBuf kv6 = new FriendlyByteBuf(Unpooled.buffer());
-        kv6.writeBlockPos(fk);
-        kv6.writeInt(integer4);
-        kv6.writeUtf(string);
-        kv6.writeInt(integer5);
-        sendPacketToAllPlayers(xd, kv6, ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_ADD_MARKER);
+    public static void sendGameTestAddMarker(final ServerLevel zd, final BlockPos fu, final String string, final int integer4, final int integer5) {
+        final FriendlyByteBuf mg6 = new FriendlyByteBuf(Unpooled.buffer());
+        mg6.writeBlockPos(fu);
+        mg6.writeInt(integer4);
+        mg6.writeUtf(string);
+        mg6.writeInt(integer5);
+        sendPacketToAllPlayers(zd, mg6, ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_ADD_MARKER);
     }
     
-    public static void sendGameTestClearPacket(final ServerLevel xd) {
-        final FriendlyByteBuf kv2 = new FriendlyByteBuf(Unpooled.buffer());
-        sendPacketToAllPlayers(xd, kv2, ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR);
+    public static void sendGameTestClearPacket(final ServerLevel zd) {
+        final FriendlyByteBuf mg2 = new FriendlyByteBuf(Unpooled.buffer());
+        sendPacketToAllPlayers(zd, mg2, ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR);
     }
     
-    public static void sendPoiPacketsForChunk(final ServerLevel xd, final ChunkPos bjh) {
+    public static void sendPoiPacketsForChunk(final ServerLevel zd, final ChunkPos bph) {
     }
     
-    public static void sendPoiAddedPacket(final ServerLevel xd, final BlockPos fk) {
+    public static void sendPoiAddedPacket(final ServerLevel zd, final BlockPos fu) {
+        sendVillageSectionsPacket(zd, fu);
     }
     
-    public static void sendPoiRemovedPacket(final ServerLevel xd, final BlockPos fk) {
+    public static void sendPoiRemovedPacket(final ServerLevel zd, final BlockPos fu) {
+        sendVillageSectionsPacket(zd, fu);
     }
     
-    public static void sendPoiTicketCountPacket(final ServerLevel xd, final BlockPos fk) {
+    public static void sendPoiTicketCountPacket(final ServerLevel zd, final BlockPos fu) {
+        sendVillageSectionsPacket(zd, fu);
     }
     
-    public static void sendPathFindingPacket(final Level bjw, final Mob ala, @Nullable final Path cqq, final float float4) {
+    private static void sendVillageSectionsPacket(final ServerLevel zd, final BlockPos fu) {
     }
     
-    public static void sendNeighborsUpdatePacket(final Level bjw, final BlockPos fk) {
+    public static void sendPathFindingPacket(final Level bqb, final Mob aoz, @Nullable final Path czf, final float float4) {
     }
     
-    public static void sendStructurePacket(final LevelAccessor bjx, final StructureStart clv) {
+    public static void sendNeighborsUpdatePacket(final Level bqb, final BlockPos fu) {
     }
     
-    public static void sendGoalSelector(final Level bjw, final Mob ala, final GoalSelector aph) {
+    public static void sendStructurePacket(final LevelAccessor bqc, final StructureStart<?> ctz) {
     }
     
-    public static void sendRaids(final ServerLevel xd, final Collection<Raid> collection) {
+    public static void sendGoalSelector(final Level bqb, final Mob aoz, final GoalSelector auh) {
     }
     
-    public static void sendEntityBrain(final LivingEntity akz) {
+    public static void sendRaids(final ServerLevel zd, final Collection<Raid> collection) {
     }
     
-    public static void sendBeeInfo(final Bee atd) {
+    public static void sendEntityBrain(final LivingEntity aoy) {
     }
     
-    public static void sendHiveInfo(final BeehiveBlockEntity bwi) {
+    public static void sendBeeInfo(final Bee ayl) {
     }
     
-    private static void sendPacketToAllPlayers(final ServerLevel xd, final FriendlyByteBuf kv, final ResourceLocation sm) {
-        final Packet<?> lt4 = new ClientboundCustomPayloadPacket(sm, kv);
-        for (final Player ayj6 : xd.getLevel().players()) {
-            ((ServerPlayer)ayj6).connection.send(lt4);
+    public static void sendHiveInfo(final BeehiveBlockEntity cdi) {
+    }
+    
+    private static void sendPacketToAllPlayers(final ServerLevel zd, final FriendlyByteBuf mg, final ResourceLocation uh) {
+        final Packet<?> ni4 = new ClientboundCustomPayloadPacket(uh, mg);
+        for (final Player bec6 : zd.getLevel().players()) {
+            ((ServerPlayer)bec6).connection.send(ni4);
         }
     }
     
diff --git a/src/net/minecraft/network/protocol/game/ServerGamePacketListener.java b/src/net/minecraft/network/protocol/game/ServerGamePacketListener.java
index 7e303d4..aeec00f 100644
--- a/src/net/minecraft/network/protocol/game/ServerGamePacketListener.java
+++ b/src/net/minecraft/network/protocol/game/ServerGamePacketListener.java
@@ -3,89 +3,91 @@ package net.minecraft.network.protocol.game;
 import net.minecraft.network.PacketListener;
 
 public interface ServerGamePacketListener extends PacketListener {
-    void handleAnimate(final ServerboundSwingPacket qz);
+    void handleAnimate(final ServerboundSwingPacket so);
     
-    void handleChat(final ServerboundChatPacket pp);
+    void handleChat(final ServerboundChatPacket rd);
     
-    void handleClientCommand(final ServerboundClientCommandPacket pq);
+    void handleClientCommand(final ServerboundClientCommandPacket re);
     
-    void handleClientInformation(final ServerboundClientInformationPacket pr);
+    void handleClientInformation(final ServerboundClientInformationPacket rf);
     
-    void handleContainerAck(final ServerboundContainerAckPacket pt);
+    void handleContainerAck(final ServerboundContainerAckPacket rh);
     
-    void handleContainerButtonClick(final ServerboundContainerButtonClickPacket pu);
+    void handleContainerButtonClick(final ServerboundContainerButtonClickPacket ri);
     
-    void handleContainerClick(final ServerboundContainerClickPacket pv);
+    void handleContainerClick(final ServerboundContainerClickPacket rj);
     
-    void handlePlaceRecipe(final ServerboundPlaceRecipePacket qh);
+    void handlePlaceRecipe(final ServerboundPlaceRecipePacket rw);
     
-    void handleContainerClose(final ServerboundContainerClosePacket pw);
+    void handleContainerClose(final ServerboundContainerClosePacket rk);
     
-    void handleCustomPayload(final ServerboundCustomPayloadPacket px);
+    void handleCustomPayload(final ServerboundCustomPayloadPacket rl);
     
-    void handleInteract(final ServerboundInteractPacket qa);
+    void handleInteract(final ServerboundInteractPacket ro);
     
-    void handleKeepAlive(final ServerboundKeepAlivePacket qb);
+    void handleKeepAlive(final ServerboundKeepAlivePacket rq);
     
-    void handleMovePlayer(final ServerboundMovePlayerPacket qd);
+    void handleMovePlayer(final ServerboundMovePlayerPacket rs);
     
-    void handlePlayerAbilities(final ServerboundPlayerAbilitiesPacket qi);
+    void handlePlayerAbilities(final ServerboundPlayerAbilitiesPacket rx);
     
-    void handlePlayerAction(final ServerboundPlayerActionPacket qj);
+    void handlePlayerAction(final ServerboundPlayerActionPacket ry);
     
-    void handlePlayerCommand(final ServerboundPlayerCommandPacket qk);
+    void handlePlayerCommand(final ServerboundPlayerCommandPacket rz);
     
-    void handlePlayerInput(final ServerboundPlayerInputPacket ql);
+    void handlePlayerInput(final ServerboundPlayerInputPacket sa);
     
-    void handleSetCarriedItem(final ServerboundSetCarriedItemPacket qs);
+    void handleSetCarriedItem(final ServerboundSetCarriedItemPacket sh);
     
-    void handleSetCreativeModeSlot(final ServerboundSetCreativeModeSlotPacket qv);
+    void handleSetCreativeModeSlot(final ServerboundSetCreativeModeSlotPacket sk);
     
-    void handleSignUpdate(final ServerboundSignUpdatePacket qy);
+    void handleSignUpdate(final ServerboundSignUpdatePacket sn);
     
-    void handleUseItemOn(final ServerboundUseItemOnPacket rb);
+    void handleUseItemOn(final ServerboundUseItemOnPacket sq);
     
-    void handleUseItem(final ServerboundUseItemPacket rc);
+    void handleUseItem(final ServerboundUseItemPacket sr);
     
-    void handleTeleportToEntityPacket(final ServerboundTeleportToEntityPacket ra);
+    void handleTeleportToEntityPacket(final ServerboundTeleportToEntityPacket sp);
     
-    void handleResourcePackResponse(final ServerboundResourcePackPacket qo);
+    void handleResourcePackResponse(final ServerboundResourcePackPacket sd);
     
-    void handlePaddleBoat(final ServerboundPaddleBoatPacket qf);
+    void handlePaddleBoat(final ServerboundPaddleBoatPacket ru);
     
-    void handleMoveVehicle(final ServerboundMoveVehiclePacket qe);
+    void handleMoveVehicle(final ServerboundMoveVehiclePacket rt);
     
-    void handleAcceptTeleportPacket(final ServerboundAcceptTeleportationPacket pm);
+    void handleAcceptTeleportPacket(final ServerboundAcceptTeleportationPacket ra);
     
-    void handleRecipeBookUpdatePacket(final ServerboundRecipeBookUpdatePacket qm);
+    void handleRecipeBookUpdatePacket(final ServerboundRecipeBookUpdatePacket sb);
     
-    void handleSeenAdvancements(final ServerboundSeenAdvancementsPacket qp);
+    void handleSeenAdvancements(final ServerboundSeenAdvancementsPacket se);
     
-    void handleCustomCommandSuggestions(final ServerboundCommandSuggestionPacket ps);
+    void handleCustomCommandSuggestions(final ServerboundCommandSuggestionPacket rg);
     
-    void handleSetCommandBlock(final ServerboundSetCommandBlockPacket qt);
+    void handleSetCommandBlock(final ServerboundSetCommandBlockPacket si);
     
-    void handleSetCommandMinecart(final ServerboundSetCommandMinecartPacket qu);
+    void handleSetCommandMinecart(final ServerboundSetCommandMinecartPacket sj);
     
-    void handlePickItem(final ServerboundPickItemPacket qg);
+    void handlePickItem(final ServerboundPickItemPacket rv);
     
-    void handleRenameItem(final ServerboundRenameItemPacket qn);
+    void handleRenameItem(final ServerboundRenameItemPacket sc);
     
-    void handleSetBeaconPacket(final ServerboundSetBeaconPacket qr);
+    void handleSetBeaconPacket(final ServerboundSetBeaconPacket sg);
     
-    void handleSetStructureBlock(final ServerboundSetStructureBlockPacket qx);
+    void handleSetStructureBlock(final ServerboundSetStructureBlockPacket sm);
     
-    void handleSelectTrade(final ServerboundSelectTradePacket qq);
+    void handleSelectTrade(final ServerboundSelectTradePacket sf);
     
-    void handleEditBook(final ServerboundEditBookPacket py);
+    void handleEditBook(final ServerboundEditBookPacket rm);
     
-    void handleEntityTagQuery(final ServerboundEntityTagQuery pz);
+    void handleEntityTagQuery(final ServerboundEntityTagQuery rn);
     
-    void handleBlockEntityTagQuery(final ServerboundBlockEntityTagQuery pn);
+    void handleBlockEntityTagQuery(final ServerboundBlockEntityTagQuery rb);
     
-    void handleSetJigsawBlock(final ServerboundSetJigsawBlockPacket qw);
+    void handleSetJigsawBlock(final ServerboundSetJigsawBlockPacket sl);
     
-    void handleChangeDifficulty(final ServerboundChangeDifficultyPacket po);
+    void handleJigsawGenerate(final ServerboundJigsawGeneratePacket rp);
     
-    void handleLockDifficulty(final ServerboundLockDifficultyPacket qc);
+    void handleChangeDifficulty(final ServerboundChangeDifficultyPacket rc);
+    
+    void handleLockDifficulty(final ServerboundLockDifficultyPacket rr);
 }
diff --git a/src/net/minecraft/network/protocol/game/ServerboundAcceptTeleportationPacket.java b/src/net/minecraft/network/protocol/game/ServerboundAcceptTeleportationPacket.java
index 8bade24..46a9ca2 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundAcceptTeleportationPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundAcceptTeleportationPacket.java
@@ -16,18 +16,18 @@ public class ServerboundAcceptTeleportationPacket implements Packet<ServerGamePa
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleAcceptTeleportPacket(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleAcceptTeleportPacket(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundBlockEntityTagQuery.java b/src/net/minecraft/network/protocol/game/ServerboundBlockEntityTagQuery.java
index 24116a1..8469915 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundBlockEntityTagQuery.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundBlockEntityTagQuery.java
@@ -13,26 +13,26 @@ public class ServerboundBlockEntityTagQuery implements Packet<ServerGamePacketLi
     public ServerboundBlockEntityTagQuery() {
     }
     
-    public ServerboundBlockEntityTagQuery(final int integer, final BlockPos fk) {
+    public ServerboundBlockEntityTagQuery(final int integer, final BlockPos fu) {
         this.transactionId = integer;
-        this.pos = fk;
+        this.pos = fu;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.transactionId = kv.readVarInt();
-        this.pos = kv.readBlockPos();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.transactionId = mg.readVarInt();
+        this.pos = mg.readBlockPos();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.transactionId);
-        kv.writeBlockPos(this.pos);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.transactionId);
+        mg.writeBlockPos(this.pos);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleBlockEntityTagQuery(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleBlockEntityTagQuery(this);
     }
     
     public int getTransactionId() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundChangeDifficultyPacket.java b/src/net/minecraft/network/protocol/game/ServerboundChangeDifficultyPacket.java
index 20630ae..96be3de 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundChangeDifficultyPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundChangeDifficultyPacket.java
@@ -12,23 +12,23 @@ public class ServerboundChangeDifficultyPacket implements Packet<ServerGamePacke
     public ServerboundChangeDifficultyPacket() {
     }
     
-    public ServerboundChangeDifficultyPacket(final Difficulty aji) {
-        this.difficulty = aji;
+    public ServerboundChangeDifficultyPacket(final Difficulty and) {
+        this.difficulty = and;
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleChangeDifficulty(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleChangeDifficulty(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.difficulty = Difficulty.byId(kv.readUnsignedByte());
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.difficulty = Difficulty.byId(mg.readUnsignedByte());
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.difficulty.getId());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.difficulty.getId());
     }
     
     public Difficulty getDifficulty() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundChatPacket.java b/src/net/minecraft/network/protocol/game/ServerboundChatPacket.java
index 83e78ad..8ee3c78 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundChatPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundChatPacket.java
@@ -19,18 +19,18 @@ public class ServerboundChatPacket implements Packet<ServerGamePacketListener> {
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.message = kv.readUtf(256);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.message = mg.readUtf(256);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUtf(this.message);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUtf(this.message);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleChat(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleChat(this);
     }
     
     public String getMessage() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundClientCommandPacket.java b/src/net/minecraft/network/protocol/game/ServerboundClientCommandPacket.java
index 14c4f23..1c4d6d6 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundClientCommandPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundClientCommandPacket.java
@@ -16,18 +16,18 @@ public class ServerboundClientCommandPacket implements Packet<ServerGamePacketLi
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.action = kv.<Action>readEnum(Action.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.action = mg.<Action>readEnum(Action.class);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.action);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.action);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleClientCommand(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleClientCommand(this);
     }
     
     public Action getAction() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundClientInformationPacket.java b/src/net/minecraft/network/protocol/game/ServerboundClientInformationPacket.java
index 5232928..b6da9d4 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundClientInformationPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundClientInformationPacket.java
@@ -18,42 +18,38 @@ public class ServerboundClientInformationPacket implements Packet<ServerGamePack
     public ServerboundClientInformationPacket() {
     }
     
-    public ServerboundClientInformationPacket(final String string, final int integer2, final ChatVisiblity ayh, final boolean boolean4, final int integer5, final HumanoidArm aky) {
+    public ServerboundClientInformationPacket(final String string, final int integer2, final ChatVisiblity bea, final boolean boolean4, final int integer5, final HumanoidArm aou) {
         this.language = string;
         this.viewDistance = integer2;
-        this.chatVisibility = ayh;
+        this.chatVisibility = bea;
         this.chatColors = boolean4;
         this.modelCustomisation = integer5;
-        this.mainHand = aky;
+        this.mainHand = aou;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.language = kv.readUtf(16);
-        this.viewDistance = kv.readByte();
-        this.chatVisibility = kv.<ChatVisiblity>readEnum(ChatVisiblity.class);
-        this.chatColors = kv.readBoolean();
-        this.modelCustomisation = kv.readUnsignedByte();
-        this.mainHand = kv.<HumanoidArm>readEnum(HumanoidArm.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.language = mg.readUtf(16);
+        this.viewDistance = mg.readByte();
+        this.chatVisibility = mg.<ChatVisiblity>readEnum(ChatVisiblity.class);
+        this.chatColors = mg.readBoolean();
+        this.modelCustomisation = mg.readUnsignedByte();
+        this.mainHand = mg.<HumanoidArm>readEnum(HumanoidArm.class);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUtf(this.language);
-        kv.writeByte(this.viewDistance);
-        kv.writeEnum(this.chatVisibility);
-        kv.writeBoolean(this.chatColors);
-        kv.writeByte(this.modelCustomisation);
-        kv.writeEnum(this.mainHand);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUtf(this.language);
+        mg.writeByte(this.viewDistance);
+        mg.writeEnum(this.chatVisibility);
+        mg.writeBoolean(this.chatColors);
+        mg.writeByte(this.modelCustomisation);
+        mg.writeEnum(this.mainHand);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleClientInformation(this);
-    }
-    
-    public String getLanguage() {
-        return this.language;
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleClientInformation(this);
     }
     
     public ChatVisiblity getChatVisibility() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundCommandSuggestionPacket.java b/src/net/minecraft/network/protocol/game/ServerboundCommandSuggestionPacket.java
index 6751b4a..2d6ac67 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundCommandSuggestionPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundCommandSuggestionPacket.java
@@ -18,20 +18,20 @@ public class ServerboundCommandSuggestionPacket implements Packet<ServerGamePack
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.command = kv.readUtf(32500);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.command = mg.readUtf(32500);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeUtf(this.command, 32500);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeUtf(this.command, 32500);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleCustomCommandSuggestions(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleCustomCommandSuggestions(this);
     }
     
     public int getId() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundContainerAckPacket.java b/src/net/minecraft/network/protocol/game/ServerboundContainerAckPacket.java
index 31060c1..227c87f 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundContainerAckPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundContainerAckPacket.java
@@ -20,22 +20,22 @@ public class ServerboundContainerAckPacket implements Packet<ServerGamePacketLis
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleContainerAck(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleContainerAck(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readByte();
-        this.uid = kv.readShort();
-        this.accepted = (kv.readByte() != 0);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readByte();
+        this.uid = mg.readShort();
+        this.accepted = (mg.readByte() != 0);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
-        kv.writeShort(this.uid);
-        kv.writeByte(this.accepted ? 1 : 0);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
+        mg.writeShort(this.uid);
+        mg.writeByte(this.accepted ? 1 : 0);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundContainerButtonClickPacket.java b/src/net/minecraft/network/protocol/game/ServerboundContainerButtonClickPacket.java
index 8af3974..14a1e3d 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundContainerButtonClickPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundContainerButtonClickPacket.java
@@ -18,20 +18,20 @@ public class ServerboundContainerButtonClickPacket implements Packet<ServerGameP
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleContainerButtonClick(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleContainerButtonClick(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readByte();
-        this.buttonId = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readByte();
+        this.buttonId = mg.readByte();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
-        kv.writeByte(this.buttonId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
+        mg.writeByte(this.buttonId);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundContainerClickPacket.java b/src/net/minecraft/network/protocol/game/ServerboundContainerClickPacket.java
index ead6bc5..de51719 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundContainerClickPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundContainerClickPacket.java
@@ -19,39 +19,39 @@ public class ServerboundContainerClickPacket implements Packet<ServerGamePacketL
         this.itemStack = ItemStack.EMPTY;
     }
     
-    public ServerboundContainerClickPacket(final int integer1, final int integer2, final int integer3, final ClickType bav, final ItemStack ben, final short short6) {
+    public ServerboundContainerClickPacket(final int integer1, final int integer2, final int integer3, final ClickType bgq, final ItemStack bki, final short short6) {
         this.itemStack = ItemStack.EMPTY;
         this.containerId = integer1;
         this.slotNum = integer2;
         this.buttonNum = integer3;
-        this.itemStack = ben.copy();
+        this.itemStack = bki.copy();
         this.uid = short6;
-        this.clickType = bav;
+        this.clickType = bgq;
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleContainerClick(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleContainerClick(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readByte();
-        this.slotNum = kv.readShort();
-        this.buttonNum = kv.readByte();
-        this.uid = kv.readShort();
-        this.clickType = kv.<ClickType>readEnum(ClickType.class);
-        this.itemStack = kv.readItem();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readByte();
+        this.slotNum = mg.readShort();
+        this.buttonNum = mg.readByte();
+        this.uid = mg.readShort();
+        this.clickType = mg.<ClickType>readEnum(ClickType.class);
+        this.itemStack = mg.readItem();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
-        kv.writeShort(this.slotNum);
-        kv.writeByte(this.buttonNum);
-        kv.writeShort(this.uid);
-        kv.writeEnum(this.clickType);
-        kv.writeItem(this.itemStack);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
+        mg.writeShort(this.slotNum);
+        mg.writeByte(this.buttonNum);
+        mg.writeShort(this.uid);
+        mg.writeEnum(this.clickType);
+        mg.writeItem(this.itemStack);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundContainerClosePacket.java b/src/net/minecraft/network/protocol/game/ServerboundContainerClosePacket.java
index 06f7961..9b5bcaa 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundContainerClosePacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundContainerClosePacket.java
@@ -16,17 +16,17 @@ public class ServerboundContainerClosePacket implements Packet<ServerGamePacketL
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleContainerClose(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleContainerClose(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readByte();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ServerboundCustomPayloadPacket.java b/src/net/minecraft/network/protocol/game/ServerboundCustomPayloadPacket.java
index 93887ac..59de640 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundCustomPayloadPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundCustomPayloadPacket.java
@@ -15,30 +15,30 @@ public class ServerboundCustomPayloadPacket implements Packet<ServerGamePacketLi
     public ServerboundCustomPayloadPacket() {
     }
     
-    public ServerboundCustomPayloadPacket(final ResourceLocation sm, final FriendlyByteBuf kv) {
-        this.identifier = sm;
-        this.data = kv;
+    public ServerboundCustomPayloadPacket(final ResourceLocation uh, final FriendlyByteBuf mg) {
+        this.identifier = uh;
+        this.data = mg;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.identifier = kv.readResourceLocation();
-        final int integer3 = kv.readableBytes();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.identifier = mg.readResourceLocation();
+        final int integer3 = mg.readableBytes();
         if (integer3 < 0 || integer3 > 32767) {
             throw new IOException("Payload may not be larger than 32767 bytes");
         }
-        this.data = new FriendlyByteBuf(kv.readBytes(integer3));
+        this.data = new FriendlyByteBuf(mg.readBytes(integer3));
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeResourceLocation(this.identifier);
-        kv.writeBytes(this.data);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeResourceLocation(this.identifier);
+        mg.writeBytes(this.data);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleCustomPayload(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleCustomPayload(this);
         if (this.data != null) {
             this.data.release();
         }
diff --git a/src/net/minecraft/network/protocol/game/ServerboundEditBookPacket.java b/src/net/minecraft/network/protocol/game/ServerboundEditBookPacket.java
index 062f428..fcea8a8 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundEditBookPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundEditBookPacket.java
@@ -15,29 +15,29 @@ public class ServerboundEditBookPacket implements Packet<ServerGamePacketListene
     public ServerboundEditBookPacket() {
     }
     
-    public ServerboundEditBookPacket(final ItemStack ben, final boolean boolean2, final InteractionHand ajk) {
-        this.book = ben.copy();
+    public ServerboundEditBookPacket(final ItemStack bki, final boolean boolean2, final InteractionHand anf) {
+        this.book = bki.copy();
         this.signing = boolean2;
-        this.hand = ajk;
+        this.hand = anf;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.book = kv.readItem();
-        this.signing = kv.readBoolean();
-        this.hand = kv.<InteractionHand>readEnum(InteractionHand.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.book = mg.readItem();
+        this.signing = mg.readBoolean();
+        this.hand = mg.<InteractionHand>readEnum(InteractionHand.class);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeItem(this.book);
-        kv.writeBoolean(this.signing);
-        kv.writeEnum(this.hand);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeItem(this.book);
+        mg.writeBoolean(this.signing);
+        mg.writeEnum(this.hand);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleEditBook(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleEditBook(this);
     }
     
     public ItemStack getBook() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundEntityTagQuery.java b/src/net/minecraft/network/protocol/game/ServerboundEntityTagQuery.java
index 7507fc6..506aa43 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundEntityTagQuery.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundEntityTagQuery.java
@@ -18,20 +18,20 @@ public class ServerboundEntityTagQuery implements Packet<ServerGamePacketListene
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.transactionId = kv.readVarInt();
-        this.entityId = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.transactionId = mg.readVarInt();
+        this.entityId = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.transactionId);
-        kv.writeVarInt(this.entityId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.transactionId);
+        mg.writeVarInt(this.entityId);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleEntityTagQuery(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleEntityTagQuery(this);
     }
     
     public int getTransactionId() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundInteractPacket.java b/src/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
index e14688e..7bb56b7 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
@@ -15,62 +15,68 @@ public class ServerboundInteractPacket implements Packet<ServerGamePacketListene
     private Action action;
     private Vec3 location;
     private InteractionHand hand;
+    private boolean usingSecondaryAction;
     
     public ServerboundInteractPacket() {
     }
     
-    public ServerboundInteractPacket(final Entity akq) {
-        this.entityId = akq.getId();
+    public ServerboundInteractPacket(final Entity aom, final boolean boolean2) {
+        this.entityId = aom.getId();
         this.action = Action.ATTACK;
+        this.usingSecondaryAction = boolean2;
     }
     
-    public ServerboundInteractPacket(final Entity akq, final InteractionHand ajk) {
-        this.entityId = akq.getId();
+    public ServerboundInteractPacket(final Entity aom, final InteractionHand anf, final boolean boolean3) {
+        this.entityId = aom.getId();
         this.action = Action.INTERACT;
-        this.hand = ajk;
+        this.hand = anf;
+        this.usingSecondaryAction = boolean3;
     }
     
-    public ServerboundInteractPacket(final Entity akq, final InteractionHand ajk, final Vec3 cvl) {
-        this.entityId = akq.getId();
+    public ServerboundInteractPacket(final Entity aom, final InteractionHand anf, final Vec3 dem, final boolean boolean4) {
+        this.entityId = aom.getId();
         this.action = Action.INTERACT_AT;
-        this.hand = ajk;
-        this.location = cvl;
+        this.hand = anf;
+        this.location = dem;
+        this.usingSecondaryAction = boolean4;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entityId = kv.readVarInt();
-        this.action = kv.<Action>readEnum(Action.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entityId = mg.readVarInt();
+        this.action = mg.<Action>readEnum(Action.class);
         if (this.action == Action.INTERACT_AT) {
-            this.location = new Vec3(kv.readFloat(), kv.readFloat(), kv.readFloat());
+            this.location = new Vec3(mg.readFloat(), mg.readFloat(), mg.readFloat());
         }
         if (this.action == Action.INTERACT || this.action == Action.INTERACT_AT) {
-            this.hand = kv.<InteractionHand>readEnum(InteractionHand.class);
+            this.hand = mg.<InteractionHand>readEnum(InteractionHand.class);
         }
+        this.usingSecondaryAction = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.entityId);
-        kv.writeEnum(this.action);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.entityId);
+        mg.writeEnum(this.action);
         if (this.action == Action.INTERACT_AT) {
-            kv.writeFloat((float)this.location.x);
-            kv.writeFloat((float)this.location.y);
-            kv.writeFloat((float)this.location.z);
+            mg.writeFloat((float)this.location.x);
+            mg.writeFloat((float)this.location.y);
+            mg.writeFloat((float)this.location.z);
         }
         if (this.action == Action.INTERACT || this.action == Action.INTERACT_AT) {
-            kv.writeEnum(this.hand);
+            mg.writeEnum(this.hand);
         }
+        mg.writeBoolean(this.usingSecondaryAction);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleInteract(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleInteract(this);
     }
     
     @Nullable
-    public Entity getTarget(final Level bjw) {
-        return bjw.getEntity(this.entityId);
+    public Entity getTarget(final Level bqb) {
+        return bqb.getEntity(this.entityId);
     }
     
     public Action getAction() {
@@ -85,6 +91,10 @@ public class ServerboundInteractPacket implements Packet<ServerGamePacketListene
         return this.location;
     }
     
+    public boolean isUsingSecondaryAction() {
+        return this.usingSecondaryAction;
+    }
+    
     public enum Action {
         INTERACT, 
         ATTACK, 
diff --git a/src/net/minecraft/network/protocol/game/ServerboundJigsawGeneratePacket.java b/src/net/minecraft/network/protocol/game/ServerboundJigsawGeneratePacket.java
new file mode 100644
index 0000000..c2240b5
--- /dev/null
+++ b/src/net/minecraft/network/protocol/game/ServerboundJigsawGeneratePacket.java
@@ -0,0 +1,53 @@
+package net.minecraft.network.protocol.game;
+
+import net.minecraft.network.PacketListener;
+import java.io.IOException;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.protocol.Packet;
+
+public class ServerboundJigsawGeneratePacket implements Packet<ServerGamePacketListener> {
+    private BlockPos pos;
+    private int levels;
+    private boolean keepJigsaws;
+    
+    public ServerboundJigsawGeneratePacket() {
+    }
+    
+    public ServerboundJigsawGeneratePacket(final BlockPos fu, final int integer, final boolean boolean3) {
+        this.pos = fu;
+        this.levels = integer;
+        this.keepJigsaws = boolean3;
+    }
+    
+    @Override
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
+        this.levels = mg.readVarInt();
+        this.keepJigsaws = mg.readBoolean();
+    }
+    
+    @Override
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
+        mg.writeVarInt(this.levels);
+        mg.writeBoolean(this.keepJigsaws);
+    }
+    
+    @Override
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleJigsawGenerate(this);
+    }
+    
+    public BlockPos getPos() {
+        return this.pos;
+    }
+    
+    public int levels() {
+        return this.levels;
+    }
+    
+    public boolean keepJigsaws() {
+        return this.keepJigsaws;
+    }
+}
diff --git a/src/net/minecraft/network/protocol/game/ServerboundKeepAlivePacket.java b/src/net/minecraft/network/protocol/game/ServerboundKeepAlivePacket.java
index ab15276..817839b 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundKeepAlivePacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundKeepAlivePacket.java
@@ -16,18 +16,18 @@ public class ServerboundKeepAlivePacket implements Packet<ServerGamePacketListen
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleKeepAlive(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleKeepAlive(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readLong();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readLong();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeLong(this.id);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeLong(this.id);
     }
     
     public long getId() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundLockDifficultyPacket.java b/src/net/minecraft/network/protocol/game/ServerboundLockDifficultyPacket.java
index 4857560..934a429 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundLockDifficultyPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundLockDifficultyPacket.java
@@ -16,18 +16,18 @@ public class ServerboundLockDifficultyPacket implements Packet<ServerGamePacketL
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleLockDifficulty(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleLockDifficulty(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.locked = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.locked = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBoolean(this.locked);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBoolean(this.locked);
     }
     
     public boolean isLocked() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.java b/src/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.java
index d0d21c8..850dfac 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.java
@@ -23,18 +23,18 @@ public class ServerboundMovePlayerPacket implements Packet<ServerGamePacketListe
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleMovePlayer(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleMovePlayer(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.onGround = (kv.readUnsignedByte() != 0);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.onGround = (mg.readUnsignedByte() != 0);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.onGround ? 1 : 0);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.onGround ? 1 : 0);
     }
     
     public double getX(final double double1) {
@@ -79,23 +79,23 @@ public class ServerboundMovePlayerPacket implements Packet<ServerGamePacketListe
         }
         
         @Override
-        public void read(final FriendlyByteBuf kv) throws IOException {
-            this.x = kv.readDouble();
-            this.y = kv.readDouble();
-            this.z = kv.readDouble();
-            this.yRot = kv.readFloat();
-            this.xRot = kv.readFloat();
-            super.read(kv);
+        public void read(final FriendlyByteBuf mg) throws IOException {
+            this.x = mg.readDouble();
+            this.y = mg.readDouble();
+            this.z = mg.readDouble();
+            this.yRot = mg.readFloat();
+            this.xRot = mg.readFloat();
+            super.read(mg);
         }
         
         @Override
-        public void write(final FriendlyByteBuf kv) throws IOException {
-            kv.writeDouble(this.x);
-            kv.writeDouble(this.y);
-            kv.writeDouble(this.z);
-            kv.writeFloat(this.yRot);
-            kv.writeFloat(this.xRot);
-            super.write(kv);
+        public void write(final FriendlyByteBuf mg) throws IOException {
+            mg.writeDouble(this.x);
+            mg.writeDouble(this.y);
+            mg.writeDouble(this.z);
+            mg.writeFloat(this.yRot);
+            mg.writeFloat(this.xRot);
+            super.write(mg);
         }
     }
     
@@ -113,19 +113,19 @@ public class ServerboundMovePlayerPacket implements Packet<ServerGamePacketListe
         }
         
         @Override
-        public void read(final FriendlyByteBuf kv) throws IOException {
-            this.x = kv.readDouble();
-            this.y = kv.readDouble();
-            this.z = kv.readDouble();
-            super.read(kv);
+        public void read(final FriendlyByteBuf mg) throws IOException {
+            this.x = mg.readDouble();
+            this.y = mg.readDouble();
+            this.z = mg.readDouble();
+            super.read(mg);
         }
         
         @Override
-        public void write(final FriendlyByteBuf kv) throws IOException {
-            kv.writeDouble(this.x);
-            kv.writeDouble(this.y);
-            kv.writeDouble(this.z);
-            super.write(kv);
+        public void write(final FriendlyByteBuf mg) throws IOException {
+            mg.writeDouble(this.x);
+            mg.writeDouble(this.y);
+            mg.writeDouble(this.z);
+            super.write(mg);
         }
     }
     
@@ -142,17 +142,17 @@ public class ServerboundMovePlayerPacket implements Packet<ServerGamePacketListe
         }
         
         @Override
-        public void read(final FriendlyByteBuf kv) throws IOException {
-            this.yRot = kv.readFloat();
-            this.xRot = kv.readFloat();
-            super.read(kv);
+        public void read(final FriendlyByteBuf mg) throws IOException {
+            this.yRot = mg.readFloat();
+            this.xRot = mg.readFloat();
+            super.read(mg);
         }
         
         @Override
-        public void write(final FriendlyByteBuf kv) throws IOException {
-            kv.writeFloat(this.yRot);
-            kv.writeFloat(this.xRot);
-            super.write(kv);
+        public void write(final FriendlyByteBuf mg) throws IOException {
+            mg.writeFloat(this.yRot);
+            mg.writeFloat(this.xRot);
+            super.write(mg);
         }
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ServerboundMoveVehiclePacket.java b/src/net/minecraft/network/protocol/game/ServerboundMoveVehiclePacket.java
index f51236b..51b4b65 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundMoveVehiclePacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundMoveVehiclePacket.java
@@ -16,35 +16,35 @@ public class ServerboundMoveVehiclePacket implements Packet<ServerGamePacketList
     public ServerboundMoveVehiclePacket() {
     }
     
-    public ServerboundMoveVehiclePacket(final Entity akq) {
-        this.x = akq.getX();
-        this.y = akq.getY();
-        this.z = akq.getZ();
-        this.yRot = akq.yRot;
-        this.xRot = akq.xRot;
+    public ServerboundMoveVehiclePacket(final Entity aom) {
+        this.x = aom.getX();
+        this.y = aom.getY();
+        this.z = aom.getZ();
+        this.yRot = aom.yRot;
+        this.xRot = aom.xRot;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.x = kv.readDouble();
-        this.y = kv.readDouble();
-        this.z = kv.readDouble();
-        this.yRot = kv.readFloat();
-        this.xRot = kv.readFloat();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.x = mg.readDouble();
+        this.y = mg.readDouble();
+        this.z = mg.readDouble();
+        this.yRot = mg.readFloat();
+        this.xRot = mg.readFloat();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeDouble(this.x);
-        kv.writeDouble(this.y);
-        kv.writeDouble(this.z);
-        kv.writeFloat(this.yRot);
-        kv.writeFloat(this.xRot);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeDouble(this.x);
+        mg.writeDouble(this.y);
+        mg.writeDouble(this.z);
+        mg.writeFloat(this.yRot);
+        mg.writeFloat(this.xRot);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleMoveVehicle(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleMoveVehicle(this);
     }
     
     public double getX() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundPaddleBoatPacket.java b/src/net/minecraft/network/protocol/game/ServerboundPaddleBoatPacket.java
index af8661d..85ffc23 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundPaddleBoatPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundPaddleBoatPacket.java
@@ -18,20 +18,20 @@ public class ServerboundPaddleBoatPacket implements Packet<ServerGamePacketListe
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.left = kv.readBoolean();
-        this.right = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.left = mg.readBoolean();
+        this.right = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBoolean(this.left);
-        kv.writeBoolean(this.right);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBoolean(this.left);
+        mg.writeBoolean(this.right);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handlePaddleBoat(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handlePaddleBoat(this);
     }
     
     public boolean getLeft() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundPickItemPacket.java b/src/net/minecraft/network/protocol/game/ServerboundPickItemPacket.java
index 7b4e70d..68ee731 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundPickItemPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundPickItemPacket.java
@@ -16,18 +16,18 @@ public class ServerboundPickItemPacket implements Packet<ServerGamePacketListene
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.slot = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.slot = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.slot);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.slot);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handlePickItem(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handlePickItem(this);
     }
     
     public int getSlot() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundPlaceRecipePacket.java b/src/net/minecraft/network/protocol/game/ServerboundPlaceRecipePacket.java
index b22fe1b..b55e7d1 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundPlaceRecipePacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundPlaceRecipePacket.java
@@ -15,29 +15,29 @@ public class ServerboundPlaceRecipePacket implements Packet<ServerGamePacketList
     public ServerboundPlaceRecipePacket() {
     }
     
-    public ServerboundPlaceRecipePacket(final int integer, final Recipe<?> bgw, final boolean boolean3) {
+    public ServerboundPlaceRecipePacket(final int integer, final Recipe<?> bmu, final boolean boolean3) {
         this.containerId = integer;
-        this.recipe = bgw.getId();
+        this.recipe = bmu.getId();
         this.shiftDown = boolean3;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.containerId = kv.readByte();
-        this.recipe = kv.readResourceLocation();
-        this.shiftDown = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.containerId = mg.readByte();
+        this.recipe = mg.readResourceLocation();
+        this.shiftDown = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByte(this.containerId);
-        kv.writeResourceLocation(this.recipe);
-        kv.writeBoolean(this.shiftDown);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByte(this.containerId);
+        mg.writeResourceLocation(this.recipe);
+        mg.writeBoolean(this.shiftDown);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handlePlaceRecipe(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handlePlaceRecipe(this);
     }
     
     public int getContainerId() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundPlayerAbilitiesPacket.java b/src/net/minecraft/network/protocol/game/ServerboundPlayerAbilitiesPacket.java
index ddedfd0..aa3a18b 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundPlayerAbilitiesPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundPlayerAbilitiesPacket.java
@@ -7,98 +7,36 @@ import net.minecraft.world.entity.player.Abilities;
 import net.minecraft.network.protocol.Packet;
 
 public class ServerboundPlayerAbilitiesPacket implements Packet<ServerGamePacketListener> {
-    private boolean invulnerable;
     private boolean isFlying;
-    private boolean canFly;
-    private boolean instabuild;
-    private float flyingSpeed;
-    private float walkingSpeed;
     
     public ServerboundPlayerAbilitiesPacket() {
     }
     
-    public ServerboundPlayerAbilitiesPacket(final Abilities ayg) {
-        this.setInvulnerable(ayg.invulnerable);
-        this.setFlying(ayg.flying);
-        this.setCanFly(ayg.mayfly);
-        this.setInstabuild(ayg.instabuild);
-        this.setFlyingSpeed(ayg.getFlyingSpeed());
-        this.setWalkingSpeed(ayg.getWalkingSpeed());
+    public ServerboundPlayerAbilitiesPacket(final Abilities bdz) {
+        this.isFlying = bdz.flying;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        final byte byte3 = kv.readByte();
-        this.setInvulnerable((byte3 & 0x1) > 0);
-        this.setFlying((byte3 & 0x2) > 0);
-        this.setCanFly((byte3 & 0x4) > 0);
-        this.setInstabuild((byte3 & 0x8) > 0);
-        this.setFlyingSpeed(kv.readFloat());
-        this.setWalkingSpeed(kv.readFloat());
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        final byte byte3 = mg.readByte();
+        this.isFlying = ((byte3 & 0x2) != 0x0);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
+    public void write(final FriendlyByteBuf mg) throws IOException {
         byte byte3 = 0;
-        if (this.isInvulnerable()) {
-            byte3 |= 0x1;
-        }
-        if (this.isFlying()) {
+        if (this.isFlying) {
             byte3 |= 0x2;
         }
-        if (this.canFly()) {
-            byte3 |= 0x4;
-        }
-        if (this.canInstabuild()) {
-            byte3 |= 0x8;
-        }
-        kv.writeByte(byte3);
-        kv.writeFloat(this.flyingSpeed);
-        kv.writeFloat(this.walkingSpeed);
+        mg.writeByte(byte3);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handlePlayerAbilities(this);
-    }
-    
-    public boolean isInvulnerable() {
-        return this.invulnerable;
-    }
-    
-    public void setInvulnerable(final boolean boolean1) {
-        this.invulnerable = boolean1;
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handlePlayerAbilities(this);
     }
     
     public boolean isFlying() {
         return this.isFlying;
     }
-    
-    public void setFlying(final boolean boolean1) {
-        this.isFlying = boolean1;
-    }
-    
-    public boolean canFly() {
-        return this.canFly;
-    }
-    
-    public void setCanFly(final boolean boolean1) {
-        this.canFly = boolean1;
-    }
-    
-    public boolean canInstabuild() {
-        return this.instabuild;
-    }
-    
-    public void setInstabuild(final boolean boolean1) {
-        this.instabuild = boolean1;
-    }
-    
-    public void setFlyingSpeed(final float float1) {
-        this.flyingSpeed = float1;
-    }
-    
-    public void setWalkingSpeed(final float float1) {
-        this.walkingSpeed = float1;
-    }
 }
diff --git a/src/net/minecraft/network/protocol/game/ServerboundPlayerActionPacket.java b/src/net/minecraft/network/protocol/game/ServerboundPlayerActionPacket.java
index 8a60c8a..2fbe7a9 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundPlayerActionPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundPlayerActionPacket.java
@@ -15,29 +15,29 @@ public class ServerboundPlayerActionPacket implements Packet<ServerGamePacketLis
     public ServerboundPlayerActionPacket() {
     }
     
-    public ServerboundPlayerActionPacket(final Action a, final BlockPos fk, final Direction fp) {
+    public ServerboundPlayerActionPacket(final Action a, final BlockPos fu, final Direction fz) {
         this.action = a;
-        this.pos = fk.immutable();
-        this.direction = fp;
+        this.pos = fu.immutable();
+        this.direction = fz;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.action = kv.<Action>readEnum(Action.class);
-        this.pos = kv.readBlockPos();
-        this.direction = Direction.from3DDataValue(kv.readUnsignedByte());
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.action = mg.<Action>readEnum(Action.class);
+        this.pos = mg.readBlockPos();
+        this.direction = Direction.from3DDataValue(mg.readUnsignedByte());
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.action);
-        kv.writeBlockPos(this.pos);
-        kv.writeByte(this.direction.get3DDataValue());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.action);
+        mg.writeBlockPos(this.pos);
+        mg.writeByte(this.direction.get3DDataValue());
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handlePlayerAction(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handlePlayerAction(this);
     }
     
     public BlockPos getPos() {
@@ -59,6 +59,6 @@ public class ServerboundPlayerActionPacket implements Packet<ServerGamePacketLis
         DROP_ALL_ITEMS, 
         DROP_ITEM, 
         RELEASE_USE_ITEM, 
-        SWAP_HELD_ITEMS;
+        SWAP_ITEM_WITH_OFFHAND;
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ServerboundPlayerCommandPacket.java b/src/net/minecraft/network/protocol/game/ServerboundPlayerCommandPacket.java
index e4cc538..88d1fca 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundPlayerCommandPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundPlayerCommandPacket.java
@@ -14,33 +14,33 @@ public class ServerboundPlayerCommandPacket implements Packet<ServerGamePacketLi
     public ServerboundPlayerCommandPacket() {
     }
     
-    public ServerboundPlayerCommandPacket(final Entity akq, final Action a) {
-        this(akq, a, 0);
+    public ServerboundPlayerCommandPacket(final Entity aom, final Action a) {
+        this(aom, a, 0);
     }
     
-    public ServerboundPlayerCommandPacket(final Entity akq, final Action a, final int integer) {
-        this.id = akq.getId();
+    public ServerboundPlayerCommandPacket(final Entity aom, final Action a, final int integer) {
+        this.id = aom.getId();
         this.action = a;
         this.data = integer;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.id = kv.readVarInt();
-        this.action = kv.<Action>readEnum(Action.class);
-        this.data = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.id = mg.readVarInt();
+        this.action = mg.<Action>readEnum(Action.class);
+        this.data = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.id);
-        kv.writeEnum(this.action);
-        kv.writeVarInt(this.data);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.id);
+        mg.writeEnum(this.action);
+        mg.writeVarInt(this.data);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handlePlayerCommand(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handlePlayerCommand(this);
     }
     
     public Action getAction() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundPlayerInputPacket.java b/src/net/minecraft/network/protocol/game/ServerboundPlayerInputPacket.java
index 24fae1c..7048337 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundPlayerInputPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundPlayerInputPacket.java
@@ -22,18 +22,18 @@ public class ServerboundPlayerInputPacket implements Packet<ServerGamePacketList
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.xxa = kv.readFloat();
-        this.zza = kv.readFloat();
-        final byte byte3 = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.xxa = mg.readFloat();
+        this.zza = mg.readFloat();
+        final byte byte3 = mg.readByte();
         this.isJumping = ((byte3 & 0x1) > 0);
         this.isShiftKeyDown = ((byte3 & 0x2) > 0);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeFloat(this.xxa);
-        kv.writeFloat(this.zza);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeFloat(this.xxa);
+        mg.writeFloat(this.zza);
         byte byte3 = 0;
         if (this.isJumping) {
             byte3 |= 0x1;
@@ -41,12 +41,12 @@ public class ServerboundPlayerInputPacket implements Packet<ServerGamePacketList
         if (this.isShiftKeyDown) {
             byte3 |= 0x2;
         }
-        kv.writeByte(byte3);
+        mg.writeByte(byte3);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handlePlayerInput(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handlePlayerInput(this);
     }
     
     public float getXxa() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundRecipeBookUpdatePacket.java b/src/net/minecraft/network/protocol/game/ServerboundRecipeBookUpdatePacket.java
index 8a7fed6..0de12a5 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundRecipeBookUpdatePacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundRecipeBookUpdatePacket.java
@@ -22,9 +22,9 @@ public class ServerboundRecipeBookUpdatePacket implements Packet<ServerGamePacke
     public ServerboundRecipeBookUpdatePacket() {
     }
     
-    public ServerboundRecipeBookUpdatePacket(final Recipe<?> bgw) {
+    public ServerboundRecipeBookUpdatePacket(final Recipe<?> bmu) {
         this.purpose = Purpose.SHOWN;
-        this.recipe = bgw.getId();
+        this.recipe = bmu.getId();
     }
     
     public ServerboundRecipeBookUpdatePacket(final boolean boolean1, final boolean boolean2, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6) {
@@ -40,44 +40,44 @@ public class ServerboundRecipeBookUpdatePacket implements Packet<ServerGamePacke
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.purpose = kv.<Purpose>readEnum(Purpose.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.purpose = mg.<Purpose>readEnum(Purpose.class);
         if (this.purpose == Purpose.SHOWN) {
-            this.recipe = kv.readResourceLocation();
+            this.recipe = mg.readResourceLocation();
         }
         else if (this.purpose == Purpose.SETTINGS) {
-            this.guiOpen = kv.readBoolean();
-            this.filteringCraftable = kv.readBoolean();
-            this.furnaceGuiOpen = kv.readBoolean();
-            this.furnaceFilteringCraftable = kv.readBoolean();
-            this.blastFurnaceGuiOpen = kv.readBoolean();
-            this.blastFurnaceFilteringCraftable = kv.readBoolean();
-            this.smokerGuiOpen = kv.readBoolean();
-            this.smokerFilteringCraftable = kv.readBoolean();
+            this.guiOpen = mg.readBoolean();
+            this.filteringCraftable = mg.readBoolean();
+            this.furnaceGuiOpen = mg.readBoolean();
+            this.furnaceFilteringCraftable = mg.readBoolean();
+            this.blastFurnaceGuiOpen = mg.readBoolean();
+            this.blastFurnaceFilteringCraftable = mg.readBoolean();
+            this.smokerGuiOpen = mg.readBoolean();
+            this.smokerFilteringCraftable = mg.readBoolean();
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.purpose);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.purpose);
         if (this.purpose == Purpose.SHOWN) {
-            kv.writeResourceLocation(this.recipe);
+            mg.writeResourceLocation(this.recipe);
         }
         else if (this.purpose == Purpose.SETTINGS) {
-            kv.writeBoolean(this.guiOpen);
-            kv.writeBoolean(this.filteringCraftable);
-            kv.writeBoolean(this.furnaceGuiOpen);
-            kv.writeBoolean(this.furnaceFilteringCraftable);
-            kv.writeBoolean(this.blastFurnaceGuiOpen);
-            kv.writeBoolean(this.blastFurnaceFilteringCraftable);
-            kv.writeBoolean(this.smokerGuiOpen);
-            kv.writeBoolean(this.smokerFilteringCraftable);
+            mg.writeBoolean(this.guiOpen);
+            mg.writeBoolean(this.filteringCraftable);
+            mg.writeBoolean(this.furnaceGuiOpen);
+            mg.writeBoolean(this.furnaceFilteringCraftable);
+            mg.writeBoolean(this.blastFurnaceGuiOpen);
+            mg.writeBoolean(this.blastFurnaceFilteringCraftable);
+            mg.writeBoolean(this.smokerGuiOpen);
+            mg.writeBoolean(this.smokerFilteringCraftable);
         }
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleRecipeBookUpdatePacket(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleRecipeBookUpdatePacket(this);
     }
     
     public Purpose getPurpose() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundRenameItemPacket.java b/src/net/minecraft/network/protocol/game/ServerboundRenameItemPacket.java
index a3ef97d..79f9eab 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundRenameItemPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundRenameItemPacket.java
@@ -16,18 +16,18 @@ public class ServerboundRenameItemPacket implements Packet<ServerGamePacketListe
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.name = kv.readUtf(32767);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.name = mg.readUtf(32767);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUtf(this.name);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUtf(this.name);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleRenameItem(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleRenameItem(this);
     }
     
     public String getName() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundResourcePackPacket.java b/src/net/minecraft/network/protocol/game/ServerboundResourcePackPacket.java
index a713be6..cca72c9 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundResourcePackPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundResourcePackPacket.java
@@ -16,18 +16,18 @@ public class ServerboundResourcePackPacket implements Packet<ServerGamePacketLis
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.action = kv.<Action>readEnum(Action.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.action = mg.<Action>readEnum(Action.class);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.action);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.action);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleResourcePackResponse(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleResourcePackResponse(this);
     }
     
     public enum Action {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSeenAdvancementsPacket.java b/src/net/minecraft/network/protocol/game/ServerboundSeenAdvancementsPacket.java
index a18278c..fd1fad8 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSeenAdvancementsPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSeenAdvancementsPacket.java
@@ -15,13 +15,13 @@ public class ServerboundSeenAdvancementsPacket implements Packet<ServerGamePacke
     public ServerboundSeenAdvancementsPacket() {
     }
     
-    public ServerboundSeenAdvancementsPacket(final Action a, @Nullable final ResourceLocation sm) {
+    public ServerboundSeenAdvancementsPacket(final Action a, @Nullable final ResourceLocation uh) {
         this.action = a;
-        this.tab = sm;
+        this.tab = uh;
     }
     
-    public static ServerboundSeenAdvancementsPacket openedTab(final Advancement u) {
-        return new ServerboundSeenAdvancementsPacket(Action.OPENED_TAB, u.getId());
+    public static ServerboundSeenAdvancementsPacket openedTab(final Advancement w) {
+        return new ServerboundSeenAdvancementsPacket(Action.OPENED_TAB, w.getId());
     }
     
     public static ServerboundSeenAdvancementsPacket closedScreen() {
@@ -29,24 +29,24 @@ public class ServerboundSeenAdvancementsPacket implements Packet<ServerGamePacke
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.action = kv.<Action>readEnum(Action.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.action = mg.<Action>readEnum(Action.class);
         if (this.action == Action.OPENED_TAB) {
-            this.tab = kv.readResourceLocation();
+            this.tab = mg.readResourceLocation();
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.action);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.action);
         if (this.action == Action.OPENED_TAB) {
-            kv.writeResourceLocation(this.tab);
+            mg.writeResourceLocation(this.tab);
         }
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleSeenAdvancements(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleSeenAdvancements(this);
     }
     
     public Action getAction() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSelectTradePacket.java b/src/net/minecraft/network/protocol/game/ServerboundSelectTradePacket.java
index 790888a..e70c8bb 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSelectTradePacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSelectTradePacket.java
@@ -16,18 +16,18 @@ public class ServerboundSelectTradePacket implements Packet<ServerGamePacketList
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.item = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.item = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.item);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.item);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleSelectTrade(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleSelectTrade(this);
     }
     
     public int getItem() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSetBeaconPacket.java b/src/net/minecraft/network/protocol/game/ServerboundSetBeaconPacket.java
index d012a3c..84d4a4e 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSetBeaconPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSetBeaconPacket.java
@@ -18,20 +18,20 @@ public class ServerboundSetBeaconPacket implements Packet<ServerGamePacketListen
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.primary = kv.readVarInt();
-        this.secondary = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.primary = mg.readVarInt();
+        this.secondary = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.primary);
-        kv.writeVarInt(this.secondary);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.primary);
+        mg.writeVarInt(this.secondary);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleSetBeaconPacket(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleSetBeaconPacket(this);
     }
     
     public int getPrimary() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSetCarriedItemPacket.java b/src/net/minecraft/network/protocol/game/ServerboundSetCarriedItemPacket.java
index 436c9e2..8af752e 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSetCarriedItemPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSetCarriedItemPacket.java
@@ -16,18 +16,18 @@ public class ServerboundSetCarriedItemPacket implements Packet<ServerGamePacketL
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.slot = kv.readShort();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.slot = mg.readShort();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeShort(this.slot);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeShort(this.slot);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleSetCarriedItem(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleSetCarriedItem(this);
     }
     
     public int getSlot() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSetCommandBlockPacket.java b/src/net/minecraft/network/protocol/game/ServerboundSetCommandBlockPacket.java
index 5f0a24e..94f34c4 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSetCommandBlockPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSetCommandBlockPacket.java
@@ -18,8 +18,8 @@ public class ServerboundSetCommandBlockPacket implements Packet<ServerGamePacket
     public ServerboundSetCommandBlockPacket() {
     }
     
-    public ServerboundSetCommandBlockPacket(final BlockPos fk, final String string, final CommandBlockEntity.Mode a, final boolean boolean4, final boolean boolean5, final boolean boolean6) {
-        this.pos = fk;
+    public ServerboundSetCommandBlockPacket(final BlockPos fu, final String string, final CommandBlockEntity.Mode a, final boolean boolean4, final boolean boolean5, final boolean boolean6) {
+        this.pos = fu;
         this.command = string;
         this.trackOutput = boolean4;
         this.conditional = boolean5;
@@ -28,21 +28,21 @@ public class ServerboundSetCommandBlockPacket implements Packet<ServerGamePacket
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.pos = kv.readBlockPos();
-        this.command = kv.readUtf(32767);
-        this.mode = kv.<CommandBlockEntity.Mode>readEnum(CommandBlockEntity.Mode.class);
-        final int integer3 = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
+        this.command = mg.readUtf(32767);
+        this.mode = mg.<CommandBlockEntity.Mode>readEnum(CommandBlockEntity.Mode.class);
+        final int integer3 = mg.readByte();
         this.trackOutput = ((integer3 & 0x1) != 0x0);
         this.conditional = ((integer3 & 0x2) != 0x0);
         this.automatic = ((integer3 & 0x4) != 0x0);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBlockPos(this.pos);
-        kv.writeUtf(this.command);
-        kv.writeEnum(this.mode);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
+        mg.writeUtf(this.command);
+        mg.writeEnum(this.mode);
         int integer3 = 0;
         if (this.trackOutput) {
             integer3 |= 0x1;
@@ -53,12 +53,12 @@ public class ServerboundSetCommandBlockPacket implements Packet<ServerGamePacket
         if (this.automatic) {
             integer3 |= 0x4;
         }
-        kv.writeByte(integer3);
+        mg.writeByte(integer3);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleSetCommandBlock(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleSetCommandBlock(this);
     }
     
     public BlockPos getPos() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java b/src/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java
index 71d4fa4..574d74b 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java
@@ -25,29 +25,29 @@ public class ServerboundSetCommandMinecartPacket implements Packet<ServerGamePac
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.entity = kv.readVarInt();
-        this.command = kv.readUtf(32767);
-        this.trackOutput = kv.readBoolean();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.entity = mg.readVarInt();
+        this.command = mg.readUtf(32767);
+        this.trackOutput = mg.readBoolean();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.entity);
-        kv.writeUtf(this.command);
-        kv.writeBoolean(this.trackOutput);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.entity);
+        mg.writeUtf(this.command);
+        mg.writeBoolean(this.trackOutput);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleSetCommandMinecart(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleSetCommandMinecart(this);
     }
     
     @Nullable
-    public BaseCommandBlock getCommandBlock(final Level bjw) {
-        final Entity akq3 = bjw.getEntity(this.entity);
-        if (akq3 instanceof MinecartCommandBlock) {
-            return ((MinecartCommandBlock)akq3).getCommandBlock();
+    public BaseCommandBlock getCommandBlock(final Level bqb) {
+        final Entity aom3 = bqb.getEntity(this.entity);
+        if (aom3 instanceof MinecartCommandBlock) {
+            return ((MinecartCommandBlock)aom3).getCommandBlock();
         }
         return null;
     }
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSetCreativeModeSlotPacket.java b/src/net/minecraft/network/protocol/game/ServerboundSetCreativeModeSlotPacket.java
index cb8e5a0..7f97696 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSetCreativeModeSlotPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSetCreativeModeSlotPacket.java
@@ -14,27 +14,27 @@ public class ServerboundSetCreativeModeSlotPacket implements Packet<ServerGamePa
         this.itemStack = ItemStack.EMPTY;
     }
     
-    public ServerboundSetCreativeModeSlotPacket(final int integer, final ItemStack ben) {
+    public ServerboundSetCreativeModeSlotPacket(final int integer, final ItemStack bki) {
         this.itemStack = ItemStack.EMPTY;
         this.slotNum = integer;
-        this.itemStack = ben.copy();
+        this.itemStack = bki.copy();
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleSetCreativeModeSlot(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleSetCreativeModeSlot(this);
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.slotNum = kv.readShort();
-        this.itemStack = kv.readItem();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.slotNum = mg.readShort();
+        this.itemStack = mg.readItem();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeShort(this.slotNum);
-        kv.writeItem(this.itemStack);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeShort(this.slotNum);
+        mg.writeItem(this.itemStack);
     }
     
     public int getSlotNum() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSetJigsawBlockPacket.java b/src/net/minecraft/network/protocol/game/ServerboundSetJigsawBlockPacket.java
index 7722060..d71e30f 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSetJigsawBlockPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSetJigsawBlockPacket.java
@@ -3,60 +3,77 @@ package net.minecraft.network.protocol.game;
 import net.minecraft.network.PacketListener;
 import java.io.IOException;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.world.level.block.entity.JigsawBlockEntity;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.Packet;
 
 public class ServerboundSetJigsawBlockPacket implements Packet<ServerGamePacketListener> {
     private BlockPos pos;
-    private ResourceLocation attachementType;
-    private ResourceLocation targetPool;
+    private ResourceLocation name;
+    private ResourceLocation target;
+    private ResourceLocation pool;
     private String finalState;
+    private JigsawBlockEntity.JointType joint;
     
     public ServerboundSetJigsawBlockPacket() {
     }
     
-    public ServerboundSetJigsawBlockPacket(final BlockPos fk, final ResourceLocation sm2, final ResourceLocation sm3, final String string) {
-        this.pos = fk;
-        this.attachementType = sm2;
-        this.targetPool = sm3;
+    public ServerboundSetJigsawBlockPacket(final BlockPos fu, final ResourceLocation uh2, final ResourceLocation uh3, final ResourceLocation uh4, final String string, final JigsawBlockEntity.JointType a) {
+        this.pos = fu;
+        this.name = uh2;
+        this.target = uh3;
+        this.pool = uh4;
         this.finalState = string;
+        this.joint = a;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.pos = kv.readBlockPos();
-        this.attachementType = kv.readResourceLocation();
-        this.targetPool = kv.readResourceLocation();
-        this.finalState = kv.readUtf(32767);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
+        this.name = mg.readResourceLocation();
+        this.target = mg.readResourceLocation();
+        this.pool = mg.readResourceLocation();
+        this.finalState = mg.readUtf(32767);
+        this.joint = JigsawBlockEntity.JointType.byName(mg.readUtf(32767)).orElse(JigsawBlockEntity.JointType.ALIGNED);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBlockPos(this.pos);
-        kv.writeResourceLocation(this.attachementType);
-        kv.writeResourceLocation(this.targetPool);
-        kv.writeUtf(this.finalState);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
+        mg.writeResourceLocation(this.name);
+        mg.writeResourceLocation(this.target);
+        mg.writeResourceLocation(this.pool);
+        mg.writeUtf(this.finalState);
+        mg.writeUtf(this.joint.getSerializedName());
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleSetJigsawBlock(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleSetJigsawBlock(this);
     }
     
     public BlockPos getPos() {
         return this.pos;
     }
     
-    public ResourceLocation getTargetPool() {
-        return this.targetPool;
+    public ResourceLocation getName() {
+        return this.name;
     }
     
-    public ResourceLocation getAttachementType() {
-        return this.attachementType;
+    public ResourceLocation getTarget() {
+        return this.target;
+    }
+    
+    public ResourceLocation getPool() {
+        return this.pool;
     }
     
     public String getFinalState() {
         return this.finalState;
     }
+    
+    public JigsawBlockEntity.JointType getJoint() {
+        return this.joint;
+    }
 }
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSetStructureBlockPacket.java b/src/net/minecraft/network/protocol/game/ServerboundSetStructureBlockPacket.java
index f763ff1..527cf93 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSetStructureBlockPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSetStructureBlockPacket.java
@@ -30,15 +30,15 @@ public class ServerboundSetStructureBlockPacket implements Packet<ServerGamePack
     public ServerboundSetStructureBlockPacket() {
     }
     
-    public ServerboundSetStructureBlockPacket(final BlockPos fk1, final StructureBlockEntity.UpdateType a, final StructureMode bzr, final String string4, final BlockPos fk5, final BlockPos fk6, final Mirror bsu, final Rotation btu, final String string9, final boolean boolean10, final boolean boolean11, final boolean boolean12, final float float13, final long long14) {
-        this.pos = fk1;
+    public ServerboundSetStructureBlockPacket(final BlockPos fu1, final StructureBlockEntity.UpdateType a, final StructureMode cgq, final String string4, final BlockPos fu5, final BlockPos fu6, final Mirror bzj, final Rotation cap, final String string9, final boolean boolean10, final boolean boolean11, final boolean boolean12, final float float13, final long long14) {
+        this.pos = fu1;
         this.updateType = a;
-        this.mode = bzr;
+        this.mode = cgq;
         this.name = string4;
-        this.offset = fk5;
-        this.size = fk6;
-        this.mirror = bsu;
-        this.rotation = btu;
+        this.offset = fu5;
+        this.size = fu6;
+        this.mirror = bzj;
+        this.rotation = cap;
         this.data = string9;
         this.ignoreEntities = boolean10;
         this.showAir = boolean11;
@@ -48,41 +48,41 @@ public class ServerboundSetStructureBlockPacket implements Packet<ServerGamePack
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.pos = kv.readBlockPos();
-        this.updateType = kv.<StructureBlockEntity.UpdateType>readEnum(StructureBlockEntity.UpdateType.class);
-        this.mode = kv.<StructureMode>readEnum(StructureMode.class);
-        this.name = kv.readUtf(32767);
-        this.offset = new BlockPos(Mth.clamp(kv.readByte(), -32, 32), Mth.clamp(kv.readByte(), -32, 32), Mth.clamp(kv.readByte(), -32, 32));
-        this.size = new BlockPos(Mth.clamp(kv.readByte(), 0, 32), Mth.clamp(kv.readByte(), 0, 32), Mth.clamp(kv.readByte(), 0, 32));
-        this.mirror = kv.<Mirror>readEnum(Mirror.class);
-        this.rotation = kv.<Rotation>readEnum(Rotation.class);
-        this.data = kv.readUtf(12);
-        this.integrity = Mth.clamp(kv.readFloat(), 0.0f, 1.0f);
-        this.seed = kv.readVarLong();
-        final int integer3 = kv.readByte();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
+        this.updateType = mg.<StructureBlockEntity.UpdateType>readEnum(StructureBlockEntity.UpdateType.class);
+        this.mode = mg.<StructureMode>readEnum(StructureMode.class);
+        this.name = mg.readUtf(32767);
+        this.offset = new BlockPos(Mth.clamp(mg.readByte(), -32, 32), Mth.clamp(mg.readByte(), -32, 32), Mth.clamp(mg.readByte(), -32, 32));
+        this.size = new BlockPos(Mth.clamp(mg.readByte(), 0, 32), Mth.clamp(mg.readByte(), 0, 32), Mth.clamp(mg.readByte(), 0, 32));
+        this.mirror = mg.<Mirror>readEnum(Mirror.class);
+        this.rotation = mg.<Rotation>readEnum(Rotation.class);
+        this.data = mg.readUtf(12);
+        this.integrity = Mth.clamp(mg.readFloat(), 0.0f, 1.0f);
+        this.seed = mg.readVarLong();
+        final int integer3 = mg.readByte();
         this.ignoreEntities = ((integer3 & 0x1) != 0x0);
         this.showAir = ((integer3 & 0x2) != 0x0);
         this.showBoundingBox = ((integer3 & 0x4) != 0x0);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBlockPos(this.pos);
-        kv.writeEnum(this.updateType);
-        kv.writeEnum(this.mode);
-        kv.writeUtf(this.name);
-        kv.writeByte(this.offset.getX());
-        kv.writeByte(this.offset.getY());
-        kv.writeByte(this.offset.getZ());
-        kv.writeByte(this.size.getX());
-        kv.writeByte(this.size.getY());
-        kv.writeByte(this.size.getZ());
-        kv.writeEnum(this.mirror);
-        kv.writeEnum(this.rotation);
-        kv.writeUtf(this.data);
-        kv.writeFloat(this.integrity);
-        kv.writeVarLong(this.seed);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
+        mg.writeEnum(this.updateType);
+        mg.writeEnum(this.mode);
+        mg.writeUtf(this.name);
+        mg.writeByte(this.offset.getX());
+        mg.writeByte(this.offset.getY());
+        mg.writeByte(this.offset.getZ());
+        mg.writeByte(this.size.getX());
+        mg.writeByte(this.size.getY());
+        mg.writeByte(this.size.getZ());
+        mg.writeEnum(this.mirror);
+        mg.writeEnum(this.rotation);
+        mg.writeUtf(this.data);
+        mg.writeFloat(this.integrity);
+        mg.writeVarLong(this.seed);
         int integer3 = 0;
         if (this.ignoreEntities) {
             integer3 |= 0x1;
@@ -93,12 +93,12 @@ public class ServerboundSetStructureBlockPacket implements Packet<ServerGamePack
         if (this.showBoundingBox) {
             integer3 |= 0x4;
         }
-        kv.writeByte(integer3);
+        mg.writeByte(integer3);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleSetStructureBlock(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleSetStructureBlock(this);
     }
     
     public BlockPos getPos() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSignUpdatePacket.java b/src/net/minecraft/network/protocol/game/ServerboundSignUpdatePacket.java
index 2e17938..77db4a1 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSignUpdatePacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSignUpdatePacket.java
@@ -3,7 +3,6 @@ package net.minecraft.network.protocol.game;
 import net.minecraft.network.PacketListener;
 import java.io.IOException;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.chat.Component;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.Packet;
 
@@ -14,31 +13,31 @@ public class ServerboundSignUpdatePacket implements Packet<ServerGamePacketListe
     public ServerboundSignUpdatePacket() {
     }
     
-    public ServerboundSignUpdatePacket(final BlockPos fk, final Component lf2, final Component lf3, final Component lf4, final Component lf5) {
-        this.pos = fk;
-        this.lines = new String[] { lf2.getString(), lf3.getString(), lf4.getString(), lf5.getString() };
+    public ServerboundSignUpdatePacket(final BlockPos fu, final String string2, final String string3, final String string4, final String string5) {
+        this.pos = fu;
+        this.lines = new String[] { string2, string3, string4, string5 };
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.pos = kv.readBlockPos();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.pos = mg.readBlockPos();
         this.lines = new String[4];
         for (int integer3 = 0; integer3 < 4; ++integer3) {
-            this.lines[integer3] = kv.readUtf(384);
+            this.lines[integer3] = mg.readUtf(384);
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeBlockPos(this.pos);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeBlockPos(this.pos);
         for (int integer3 = 0; integer3 < 4; ++integer3) {
-            kv.writeUtf(this.lines[integer3]);
+            mg.writeUtf(this.lines[integer3]);
         }
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleSignUpdate(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleSignUpdate(this);
     }
     
     public BlockPos getPos() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundSwingPacket.java b/src/net/minecraft/network/protocol/game/ServerboundSwingPacket.java
index 4a94477..af6b856 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundSwingPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundSwingPacket.java
@@ -12,23 +12,23 @@ public class ServerboundSwingPacket implements Packet<ServerGamePacketListener>
     public ServerboundSwingPacket() {
     }
     
-    public ServerboundSwingPacket(final InteractionHand ajk) {
-        this.hand = ajk;
+    public ServerboundSwingPacket(final InteractionHand anf) {
+        this.hand = anf;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.hand = kv.<InteractionHand>readEnum(InteractionHand.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.hand = mg.<InteractionHand>readEnum(InteractionHand.class);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.hand);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.hand);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleAnimate(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleAnimate(this);
     }
     
     public InteractionHand getHand() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundTeleportToEntityPacket.java b/src/net/minecraft/network/protocol/game/ServerboundTeleportToEntityPacket.java
index 5d79a92..417cc92 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundTeleportToEntityPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundTeleportToEntityPacket.java
@@ -20,22 +20,22 @@ public class ServerboundTeleportToEntityPacket implements Packet<ServerGamePacke
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.uuid = kv.readUUID();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.uuid = mg.readUUID();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUUID(this.uuid);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUUID(this.uuid);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleTeleportToEntityPacket(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleTeleportToEntityPacket(this);
     }
     
     @Nullable
-    public Entity getEntity(final ServerLevel xd) {
-        return xd.getEntity(this.uuid);
+    public Entity getEntity(final ServerLevel zd) {
+        return zd.getEntity(this.uuid);
     }
 }
diff --git a/src/net/minecraft/network/protocol/game/ServerboundUseItemOnPacket.java b/src/net/minecraft/network/protocol/game/ServerboundUseItemOnPacket.java
index 565ec35..5a82621 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundUseItemOnPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundUseItemOnPacket.java
@@ -14,26 +14,26 @@ public class ServerboundUseItemOnPacket implements Packet<ServerGamePacketListen
     public ServerboundUseItemOnPacket() {
     }
     
-    public ServerboundUseItemOnPacket(final InteractionHand ajk, final BlockHitResult cvg) {
-        this.hand = ajk;
-        this.blockHit = cvg;
+    public ServerboundUseItemOnPacket(final InteractionHand anf, final BlockHitResult deh) {
+        this.hand = anf;
+        this.blockHit = deh;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.hand = kv.<InteractionHand>readEnum(InteractionHand.class);
-        this.blockHit = kv.readBlockHitResult();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.hand = mg.<InteractionHand>readEnum(InteractionHand.class);
+        this.blockHit = mg.readBlockHitResult();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.hand);
-        kv.writeBlockHitResult(this.blockHit);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.hand);
+        mg.writeBlockHitResult(this.blockHit);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleUseItemOn(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleUseItemOn(this);
     }
     
     public InteractionHand getHand() {
diff --git a/src/net/minecraft/network/protocol/game/ServerboundUseItemPacket.java b/src/net/minecraft/network/protocol/game/ServerboundUseItemPacket.java
index d69b070..74e2c1a 100644
--- a/src/net/minecraft/network/protocol/game/ServerboundUseItemPacket.java
+++ b/src/net/minecraft/network/protocol/game/ServerboundUseItemPacket.java
@@ -12,23 +12,23 @@ public class ServerboundUseItemPacket implements Packet<ServerGamePacketListener
     public ServerboundUseItemPacket() {
     }
     
-    public ServerboundUseItemPacket(final InteractionHand ajk) {
-        this.hand = ajk;
+    public ServerboundUseItemPacket(final InteractionHand anf) {
+        this.hand = anf;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.hand = kv.<InteractionHand>readEnum(InteractionHand.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.hand = mg.<InteractionHand>readEnum(InteractionHand.class);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeEnum(this.hand);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeEnum(this.hand);
     }
     
     @Override
-    public void handle(final ServerGamePacketListener pl) {
-        pl.handleUseItem(this);
+    public void handle(final ServerGamePacketListener qz) {
+        qz.handleUseItem(this);
     }
     
     public InteractionHand getHand() {
diff --git a/src/net/minecraft/network/protocol/handshake/ClientIntentionPacket.java b/src/net/minecraft/network/protocol/handshake/ClientIntentionPacket.java
index c26b812..53c6443 100644
--- a/src/net/minecraft/network/protocol/handshake/ClientIntentionPacket.java
+++ b/src/net/minecraft/network/protocol/handshake/ClientIntentionPacket.java
@@ -16,32 +16,32 @@ public class ClientIntentionPacket implements Packet<ServerHandshakePacketListen
     public ClientIntentionPacket() {
     }
     
-    public ClientIntentionPacket(final String string, final int integer, final ConnectionProtocol ku) {
+    public ClientIntentionPacket(final String string, final int integer, final ConnectionProtocol mf) {
         this.protocolVersion = SharedConstants.getCurrentVersion().getProtocolVersion();
         this.hostName = string;
         this.port = integer;
-        this.intention = ku;
+        this.intention = mf;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.protocolVersion = kv.readVarInt();
-        this.hostName = kv.readUtf(255);
-        this.port = kv.readUnsignedShort();
-        this.intention = ConnectionProtocol.getById(kv.readVarInt());
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.protocolVersion = mg.readVarInt();
+        this.hostName = mg.readUtf(255);
+        this.port = mg.readUnsignedShort();
+        this.intention = ConnectionProtocol.getById(mg.readVarInt());
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.protocolVersion);
-        kv.writeUtf(this.hostName);
-        kv.writeShort(this.port);
-        kv.writeVarInt(this.intention.getId());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.protocolVersion);
+        mg.writeUtf(this.hostName);
+        mg.writeShort(this.port);
+        mg.writeVarInt(this.intention.getId());
     }
     
     @Override
-    public void handle(final ServerHandshakePacketListener rf) {
-        rf.handleIntention(this);
+    public void handle(final ServerHandshakePacketListener su) {
+        su.handleIntention(this);
     }
     
     public ConnectionProtocol getIntention() {
diff --git a/src/net/minecraft/network/protocol/handshake/ServerHandshakePacketListener.java b/src/net/minecraft/network/protocol/handshake/ServerHandshakePacketListener.java
index 7c2985d..dae8d0f 100644
--- a/src/net/minecraft/network/protocol/handshake/ServerHandshakePacketListener.java
+++ b/src/net/minecraft/network/protocol/handshake/ServerHandshakePacketListener.java
@@ -3,5 +3,5 @@ package net.minecraft.network.protocol.handshake;
 import net.minecraft.network.PacketListener;
 
 public interface ServerHandshakePacketListener extends PacketListener {
-    void handleIntention(final ClientIntentionPacket re);
+    void handleIntention(final ClientIntentionPacket st);
 }
diff --git a/src/net/minecraft/network/protocol/login/ClientLoginPacketListener.java b/src/net/minecraft/network/protocol/login/ClientLoginPacketListener.java
index 9234254..3d1a169 100644
--- a/src/net/minecraft/network/protocol/login/ClientLoginPacketListener.java
+++ b/src/net/minecraft/network/protocol/login/ClientLoginPacketListener.java
@@ -3,13 +3,13 @@ package net.minecraft.network.protocol.login;
 import net.minecraft.network.PacketListener;
 
 public interface ClientLoginPacketListener extends PacketListener {
-    void handleHello(final ClientboundHelloPacket rk);
+    void handleHello(final ClientboundHelloPacket sz);
     
-    void handleGameProfile(final ClientboundGameProfilePacket rj);
+    void handleGameProfile(final ClientboundGameProfilePacket sy);
     
-    void handleDisconnect(final ClientboundLoginDisconnectPacket rm);
+    void handleDisconnect(final ClientboundLoginDisconnectPacket tb);
     
-    void handleCompression(final ClientboundLoginCompressionPacket rl);
+    void handleCompression(final ClientboundLoginCompressionPacket ta);
     
-    void handleCustomQuery(final ClientboundCustomQueryPacket ri);
+    void handleCustomQuery(final ClientboundCustomQueryPacket sx);
 }
diff --git a/src/net/minecraft/network/protocol/login/ClientboundCustomQueryPacket.java b/src/net/minecraft/network/protocol/login/ClientboundCustomQueryPacket.java
index 003655a..62cd344 100644
--- a/src/net/minecraft/network/protocol/login/ClientboundCustomQueryPacket.java
+++ b/src/net/minecraft/network/protocol/login/ClientboundCustomQueryPacket.java
@@ -12,26 +12,26 @@ public class ClientboundCustomQueryPacket implements Packet<ClientLoginPacketLis
     private FriendlyByteBuf data;
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.transactionId = kv.readVarInt();
-        this.identifier = kv.readResourceLocation();
-        final int integer3 = kv.readableBytes();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.transactionId = mg.readVarInt();
+        this.identifier = mg.readResourceLocation();
+        final int integer3 = mg.readableBytes();
         if (integer3 < 0 || integer3 > 1048576) {
             throw new IOException("Payload may not be larger than 1048576 bytes");
         }
-        this.data = new FriendlyByteBuf(kv.readBytes(integer3));
+        this.data = new FriendlyByteBuf(mg.readBytes(integer3));
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.transactionId);
-        kv.writeResourceLocation(this.identifier);
-        kv.writeBytes(this.data.copy());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.transactionId);
+        mg.writeResourceLocation(this.identifier);
+        mg.writeBytes(this.data.copy());
     }
     
     @Override
-    public void handle(final ClientLoginPacketListener rh) {
-        rh.handleCustomQuery(this);
+    public void handle(final ClientLoginPacketListener sw) {
+        sw.handleCustomQuery(this);
     }
     
     public int getTransactionId() {
diff --git a/src/net/minecraft/network/protocol/login/ClientboundGameProfilePacket.java b/src/net/minecraft/network/protocol/login/ClientboundGameProfilePacket.java
index 538db52..f343831 100644
--- a/src/net/minecraft/network/protocol/login/ClientboundGameProfilePacket.java
+++ b/src/net/minecraft/network/protocol/login/ClientboundGameProfilePacket.java
@@ -3,6 +3,7 @@ package net.minecraft.network.protocol.login;
 import net.minecraft.network.PacketListener;
 import java.io.IOException;
 import java.util.UUID;
+import net.minecraft.core.SerializableUUID;
 import net.minecraft.network.FriendlyByteBuf;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.network.protocol.Packet;
@@ -18,23 +19,27 @@ public class ClientboundGameProfilePacket implements Packet<ClientLoginPacketLis
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        final String string3 = kv.readUtf(36);
-        final String string4 = kv.readUtf(16);
-        final UUID uUID5 = UUID.fromString(string3);
-        this.gameProfile = new GameProfile(uUID5, string4);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        final int[] arr3 = new int[4];
+        for (int integer4 = 0; integer4 < arr3.length; ++integer4) {
+            arr3[integer4] = mg.readInt();
+        }
+        final UUID uUID4 = SerializableUUID.uuidFromIntArray(arr3);
+        final String string5 = mg.readUtf(16);
+        this.gameProfile = new GameProfile(uUID4, string5);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        final UUID uUID3 = this.gameProfile.getId();
-        kv.writeUtf((uUID3 == null) ? "" : uUID3.toString());
-        kv.writeUtf(this.gameProfile.getName());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        for (final int integer6 : SerializableUUID.uuidToIntArray(this.gameProfile.getId())) {
+            mg.writeInt(integer6);
+        }
+        mg.writeUtf(this.gameProfile.getName());
     }
     
     @Override
-    public void handle(final ClientLoginPacketListener rh) {
-        rh.handleGameProfile(this);
+    public void handle(final ClientLoginPacketListener sw) {
+        sw.handleGameProfile(this);
     }
     
     public GameProfile getGameProfile() {
diff --git a/src/net/minecraft/network/protocol/login/ClientboundHelloPacket.java b/src/net/minecraft/network/protocol/login/ClientboundHelloPacket.java
index 1c2d335..e828d02 100644
--- a/src/net/minecraft/network/protocol/login/ClientboundHelloPacket.java
+++ b/src/net/minecraft/network/protocol/login/ClientboundHelloPacket.java
@@ -22,22 +22,22 @@ public class ClientboundHelloPacket implements Packet<ClientLoginPacketListener>
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.serverId = kv.readUtf(20);
-        this.publicKey = Crypt.byteToPublicKey(kv.readByteArray());
-        this.nonce = kv.readByteArray();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.serverId = mg.readUtf(20);
+        this.publicKey = Crypt.byteToPublicKey(mg.readByteArray());
+        this.nonce = mg.readByteArray();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUtf(this.serverId);
-        kv.writeByteArray(this.publicKey.getEncoded());
-        kv.writeByteArray(this.nonce);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUtf(this.serverId);
+        mg.writeByteArray(this.publicKey.getEncoded());
+        mg.writeByteArray(this.nonce);
     }
     
     @Override
-    public void handle(final ClientLoginPacketListener rh) {
-        rh.handleHello(this);
+    public void handle(final ClientLoginPacketListener sw) {
+        sw.handleHello(this);
     }
     
     public String getServerId() {
diff --git a/src/net/minecraft/network/protocol/login/ClientboundLoginCompressionPacket.java b/src/net/minecraft/network/protocol/login/ClientboundLoginCompressionPacket.java
index 8dd3905..1179aca 100644
--- a/src/net/minecraft/network/protocol/login/ClientboundLoginCompressionPacket.java
+++ b/src/net/minecraft/network/protocol/login/ClientboundLoginCompressionPacket.java
@@ -16,18 +16,18 @@ public class ClientboundLoginCompressionPacket implements Packet<ClientLoginPack
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.compressionThreshold = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.compressionThreshold = mg.readVarInt();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.compressionThreshold);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.compressionThreshold);
     }
     
     @Override
-    public void handle(final ClientLoginPacketListener rh) {
-        rh.handleCompression(this);
+    public void handle(final ClientLoginPacketListener sw) {
+        sw.handleCompression(this);
     }
     
     public int getCompressionThreshold() {
diff --git a/src/net/minecraft/network/protocol/login/ClientboundLoginDisconnectPacket.java b/src/net/minecraft/network/protocol/login/ClientboundLoginDisconnectPacket.java
index 5179615..f7066d9 100644
--- a/src/net/minecraft/network/protocol/login/ClientboundLoginDisconnectPacket.java
+++ b/src/net/minecraft/network/protocol/login/ClientboundLoginDisconnectPacket.java
@@ -12,23 +12,23 @@ public class ClientboundLoginDisconnectPacket implements Packet<ClientLoginPacke
     public ClientboundLoginDisconnectPacket() {
     }
     
-    public ClientboundLoginDisconnectPacket(final Component lf) {
-        this.reason = lf;
+    public ClientboundLoginDisconnectPacket(final Component mr) {
+        this.reason = mr;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.reason = Component.Serializer.fromJsonLenient(kv.readUtf(262144));
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.reason = Component.Serializer.fromJsonLenient(mg.readUtf(262144));
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeComponent(this.reason);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeComponent(this.reason);
     }
     
     @Override
-    public void handle(final ClientLoginPacketListener rh) {
-        rh.handleDisconnect(this);
+    public void handle(final ClientLoginPacketListener sw) {
+        sw.handleDisconnect(this);
     }
     
     public Component getReason() {
diff --git a/src/net/minecraft/network/protocol/login/ServerLoginPacketListener.java b/src/net/minecraft/network/protocol/login/ServerLoginPacketListener.java
index 3526400..c5cbc9d 100644
--- a/src/net/minecraft/network/protocol/login/ServerLoginPacketListener.java
+++ b/src/net/minecraft/network/protocol/login/ServerLoginPacketListener.java
@@ -3,9 +3,9 @@ package net.minecraft.network.protocol.login;
 import net.minecraft.network.PacketListener;
 
 public interface ServerLoginPacketListener extends PacketListener {
-    void handleHello(final ServerboundHelloPacket rp);
+    void handleHello(final ServerboundHelloPacket te);
     
-    void handleKey(final ServerboundKeyPacket rq);
+    void handleKey(final ServerboundKeyPacket tf);
     
-    void handleCustomQueryPacket(final ServerboundCustomQueryPacket ro);
+    void handleCustomQueryPacket(final ServerboundCustomQueryPacket td);
 }
diff --git a/src/net/minecraft/network/protocol/login/ServerboundCustomQueryPacket.java b/src/net/minecraft/network/protocol/login/ServerboundCustomQueryPacket.java
index 1ea3540..5e7f880 100644
--- a/src/net/minecraft/network/protocol/login/ServerboundCustomQueryPacket.java
+++ b/src/net/minecraft/network/protocol/login/ServerboundCustomQueryPacket.java
@@ -13,20 +13,20 @@ public class ServerboundCustomQueryPacket implements Packet<ServerLoginPacketLis
     public ServerboundCustomQueryPacket() {
     }
     
-    public ServerboundCustomQueryPacket(final int integer, @Nullable final FriendlyByteBuf kv) {
+    public ServerboundCustomQueryPacket(final int integer, @Nullable final FriendlyByteBuf mg) {
         this.transactionId = integer;
-        this.data = kv;
+        this.data = mg;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.transactionId = kv.readVarInt();
-        if (kv.readBoolean()) {
-            final int integer3 = kv.readableBytes();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.transactionId = mg.readVarInt();
+        if (mg.readBoolean()) {
+            final int integer3 = mg.readableBytes();
             if (integer3 < 0 || integer3 > 1048576) {
                 throw new IOException("Payload may not be larger than 1048576 bytes");
             }
-            this.data = new FriendlyByteBuf(kv.readBytes(integer3));
+            this.data = new FriendlyByteBuf(mg.readBytes(integer3));
         }
         else {
             this.data = null;
@@ -34,19 +34,19 @@ public class ServerboundCustomQueryPacket implements Packet<ServerLoginPacketLis
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeVarInt(this.transactionId);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeVarInt(this.transactionId);
         if (this.data != null) {
-            kv.writeBoolean(true);
-            kv.writeBytes(this.data.copy());
+            mg.writeBoolean(true);
+            mg.writeBytes(this.data.copy());
         }
         else {
-            kv.writeBoolean(false);
+            mg.writeBoolean(false);
         }
     }
     
     @Override
-    public void handle(final ServerLoginPacketListener rn) {
-        rn.handleCustomQueryPacket(this);
+    public void handle(final ServerLoginPacketListener tc) {
+        tc.handleCustomQueryPacket(this);
     }
 }
diff --git a/src/net/minecraft/network/protocol/login/ServerboundHelloPacket.java b/src/net/minecraft/network/protocol/login/ServerboundHelloPacket.java
index fa6e4d2..310db9e 100644
--- a/src/net/minecraft/network/protocol/login/ServerboundHelloPacket.java
+++ b/src/net/minecraft/network/protocol/login/ServerboundHelloPacket.java
@@ -18,18 +18,18 @@ public class ServerboundHelloPacket implements Packet<ServerLoginPacketListener>
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.gameProfile = new GameProfile((UUID)null, kv.readUtf(16));
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.gameProfile = new GameProfile((UUID)null, mg.readUtf(16));
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUtf(this.gameProfile.getName());
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUtf(this.gameProfile.getName());
     }
     
     @Override
-    public void handle(final ServerLoginPacketListener rn) {
-        rn.handleHello(this);
+    public void handle(final ServerLoginPacketListener tc) {
+        tc.handleHello(this);
     }
     
     public GameProfile getGameProfile() {
diff --git a/src/net/minecraft/network/protocol/login/ServerboundKeyPacket.java b/src/net/minecraft/network/protocol/login/ServerboundKeyPacket.java
index a9f224a..0512fd2 100644
--- a/src/net/minecraft/network/protocol/login/ServerboundKeyPacket.java
+++ b/src/net/minecraft/network/protocol/login/ServerboundKeyPacket.java
@@ -27,20 +27,20 @@ public class ServerboundKeyPacket implements Packet<ServerLoginPacketListener> {
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.keybytes = kv.readByteArray();
-        this.nonce = kv.readByteArray();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.keybytes = mg.readByteArray();
+        this.nonce = mg.readByteArray();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeByteArray(this.keybytes);
-        kv.writeByteArray(this.nonce);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeByteArray(this.keybytes);
+        mg.writeByteArray(this.nonce);
     }
     
     @Override
-    public void handle(final ServerLoginPacketListener rn) {
-        rn.handleKey(this);
+    public void handle(final ServerLoginPacketListener tc) {
+        tc.handleKey(this);
     }
     
     public SecretKey getSecretKey(final PrivateKey privateKey) {
diff --git a/src/net/minecraft/network/protocol/status/ClientStatusPacketListener.java b/src/net/minecraft/network/protocol/status/ClientStatusPacketListener.java
index 68dfba8..4b366ee 100644
--- a/src/net/minecraft/network/protocol/status/ClientStatusPacketListener.java
+++ b/src/net/minecraft/network/protocol/status/ClientStatusPacketListener.java
@@ -3,7 +3,7 @@ package net.minecraft.network.protocol.status;
 import net.minecraft.network.PacketListener;
 
 public interface ClientStatusPacketListener extends PacketListener {
-    void handleStatusResponse(final ClientboundStatusResponsePacket rv);
+    void handleStatusResponse(final ClientboundStatusResponsePacket tk);
     
-    void handlePongResponse(final ClientboundPongResponsePacket ru);
+    void handlePongResponse(final ClientboundPongResponsePacket tj);
 }
diff --git a/src/net/minecraft/network/protocol/status/ClientboundPongResponsePacket.java b/src/net/minecraft/network/protocol/status/ClientboundPongResponsePacket.java
index 020b69c..a5a0a13 100644
--- a/src/net/minecraft/network/protocol/status/ClientboundPongResponsePacket.java
+++ b/src/net/minecraft/network/protocol/status/ClientboundPongResponsePacket.java
@@ -16,17 +16,17 @@ public class ClientboundPongResponsePacket implements Packet<ClientStatusPacketL
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.time = kv.readLong();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.time = mg.readLong();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeLong(this.time);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeLong(this.time);
     }
     
     @Override
-    public void handle(final ClientStatusPacketListener rt) {
-        rt.handlePongResponse(this);
+    public void handle(final ClientStatusPacketListener ti) {
+        ti.handlePongResponse(this);
     }
 }
diff --git a/src/net/minecraft/network/protocol/status/ClientboundStatusResponsePacket.java b/src/net/minecraft/network/protocol/status/ClientboundStatusResponsePacket.java
index 9a80519..1dac0ee 100644
--- a/src/net/minecraft/network/protocol/status/ClientboundStatusResponsePacket.java
+++ b/src/net/minecraft/network/protocol/status/ClientboundStatusResponsePacket.java
@@ -20,23 +20,23 @@ public class ClientboundStatusResponsePacket implements Packet<ClientStatusPacke
     public ClientboundStatusResponsePacket() {
     }
     
-    public ClientboundStatusResponsePacket(final ServerStatus rw) {
-        this.status = rw;
+    public ClientboundStatusResponsePacket(final ServerStatus tl) {
+        this.status = tl;
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.status = GsonHelper.<ServerStatus>fromJson(ClientboundStatusResponsePacket.GSON, kv.readUtf(32767), ServerStatus.class);
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.status = GsonHelper.<ServerStatus>fromJson(ClientboundStatusResponsePacket.GSON, mg.readUtf(32767), ServerStatus.class);
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeUtf(ClientboundStatusResponsePacket.GSON.toJson(this.status));
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeUtf(ClientboundStatusResponsePacket.GSON.toJson(this.status));
     }
     
     @Override
-    public void handle(final ClientStatusPacketListener rt) {
-        rt.handleStatusResponse(this);
+    public void handle(final ClientStatusPacketListener ti) {
+        ti.handleStatusResponse(this);
     }
     
     public ServerStatus getStatus() {
diff --git a/src/net/minecraft/network/protocol/status/ServerStatus.java b/src/net/minecraft/network/protocol/status/ServerStatus.java
index cf31644..5a9df14 100644
--- a/src/net/minecraft/network/protocol/status/ServerStatus.java
+++ b/src/net/minecraft/network/protocol/status/ServerStatus.java
@@ -24,8 +24,8 @@ public class ServerStatus {
         return this.description;
     }
     
-    public void setDescription(final Component lf) {
-        this.description = lf;
+    public void setDescription(final Component mr) {
+        this.description = mr;
     }
     
     public Players getPlayers() {
@@ -157,36 +157,36 @@ public class ServerStatus {
         @Override
         public ServerStatus deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             final JsonObject jsonObject5 = GsonHelper.convertToJsonObject(jsonElement, "status");
-            final ServerStatus rw6 = new ServerStatus();
+            final ServerStatus tl6 = new ServerStatus();
             if (jsonObject5.has("description")) {
-                rw6.setDescription(jsonDeserializationContext.<Component>deserialize(jsonObject5.get("description"), Component.class));
+                tl6.setDescription(jsonDeserializationContext.<Component>deserialize(jsonObject5.get("description"), Component.class));
             }
             if (jsonObject5.has("players")) {
-                rw6.setPlayers(jsonDeserializationContext.<Players>deserialize(jsonObject5.get("players"), Players.class));
+                tl6.setPlayers(jsonDeserializationContext.<Players>deserialize(jsonObject5.get("players"), Players.class));
             }
             if (jsonObject5.has("version")) {
-                rw6.setVersion(jsonDeserializationContext.<Version>deserialize(jsonObject5.get("version"), Version.class));
+                tl6.setVersion(jsonDeserializationContext.<Version>deserialize(jsonObject5.get("version"), Version.class));
             }
             if (jsonObject5.has("favicon")) {
-                rw6.setFavicon(GsonHelper.getAsString(jsonObject5, "favicon"));
+                tl6.setFavicon(GsonHelper.getAsString(jsonObject5, "favicon"));
             }
-            return rw6;
+            return tl6;
         }
         
         @Override
-        public JsonElement serialize(final ServerStatus rw, final Type type, final JsonSerializationContext jsonSerializationContext) {
+        public JsonElement serialize(final ServerStatus tl, final Type type, final JsonSerializationContext jsonSerializationContext) {
             final JsonObject jsonObject5 = new JsonObject();
-            if (rw.getDescription() != null) {
-                jsonObject5.add("description", jsonSerializationContext.serialize(rw.getDescription()));
+            if (tl.getDescription() != null) {
+                jsonObject5.add("description", jsonSerializationContext.serialize(tl.getDescription()));
             }
-            if (rw.getPlayers() != null) {
-                jsonObject5.add("players", jsonSerializationContext.serialize(rw.getPlayers()));
+            if (tl.getPlayers() != null) {
+                jsonObject5.add("players", jsonSerializationContext.serialize(tl.getPlayers()));
             }
-            if (rw.getVersion() != null) {
-                jsonObject5.add("version", jsonSerializationContext.serialize(rw.getVersion()));
+            if (tl.getVersion() != null) {
+                jsonObject5.add("version", jsonSerializationContext.serialize(tl.getVersion()));
             }
-            if (rw.getFavicon() != null) {
-                jsonObject5.addProperty("favicon", rw.getFavicon());
+            if (tl.getFavicon() != null) {
+                jsonObject5.addProperty("favicon", tl.getFavicon());
             }
             return jsonObject5;
         }
diff --git a/src/net/minecraft/network/protocol/status/ServerStatusPacketListener.java b/src/net/minecraft/network/protocol/status/ServerStatusPacketListener.java
index da420fc..9b00f6d 100644
--- a/src/net/minecraft/network/protocol/status/ServerStatusPacketListener.java
+++ b/src/net/minecraft/network/protocol/status/ServerStatusPacketListener.java
@@ -3,7 +3,7 @@ package net.minecraft.network.protocol.status;
 import net.minecraft.network.PacketListener;
 
 public interface ServerStatusPacketListener extends PacketListener {
-    void handlePingRequest(final ServerboundPingRequestPacket ry);
+    void handlePingRequest(final ServerboundPingRequestPacket tn);
     
-    void handleStatusRequest(final ServerboundStatusRequestPacket rz);
+    void handleStatusRequest(final ServerboundStatusRequestPacket to);
 }
diff --git a/src/net/minecraft/network/protocol/status/ServerboundPingRequestPacket.java b/src/net/minecraft/network/protocol/status/ServerboundPingRequestPacket.java
index 955a1ad..b224671 100644
--- a/src/net/minecraft/network/protocol/status/ServerboundPingRequestPacket.java
+++ b/src/net/minecraft/network/protocol/status/ServerboundPingRequestPacket.java
@@ -16,18 +16,18 @@ public class ServerboundPingRequestPacket implements Packet<ServerStatusPacketLi
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
-        this.time = kv.readLong();
+    public void read(final FriendlyByteBuf mg) throws IOException {
+        this.time = mg.readLong();
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
-        kv.writeLong(this.time);
+    public void write(final FriendlyByteBuf mg) throws IOException {
+        mg.writeLong(this.time);
     }
     
     @Override
-    public void handle(final ServerStatusPacketListener rx) {
-        rx.handlePingRequest(this);
+    public void handle(final ServerStatusPacketListener tm) {
+        tm.handlePingRequest(this);
     }
     
     public long getTime() {
diff --git a/src/net/minecraft/network/protocol/status/ServerboundStatusRequestPacket.java b/src/net/minecraft/network/protocol/status/ServerboundStatusRequestPacket.java
index 4c56d3c..c3a13f5 100644
--- a/src/net/minecraft/network/protocol/status/ServerboundStatusRequestPacket.java
+++ b/src/net/minecraft/network/protocol/status/ServerboundStatusRequestPacket.java
@@ -7,15 +7,15 @@ import net.minecraft.network.protocol.Packet;
 
 public class ServerboundStatusRequestPacket implements Packet<ServerStatusPacketListener> {
     @Override
-    public void read(final FriendlyByteBuf kv) throws IOException {
+    public void read(final FriendlyByteBuf mg) throws IOException {
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) throws IOException {
+    public void write(final FriendlyByteBuf mg) throws IOException {
     }
     
     @Override
-    public void handle(final ServerStatusPacketListener rx) {
-        rx.handleStatusRequest(this);
+    public void handle(final ServerStatusPacketListener tm) {
+        tm.handleStatusRequest(this);
     }
 }
diff --git a/src/net/minecraft/network/syncher/EntityDataAccessor.java b/src/net/minecraft/network/syncher/EntityDataAccessor.java
index 983efc8..0846b93 100644
--- a/src/net/minecraft/network/syncher/EntityDataAccessor.java
+++ b/src/net/minecraft/network/syncher/EntityDataAccessor.java
@@ -4,9 +4,9 @@ public class EntityDataAccessor<T> {
     private final int id;
     private final EntityDataSerializer<T> serializer;
     
-    public EntityDataAccessor(final int integer, final EntityDataSerializer<T> sc) {
+    public EntityDataAccessor(final int integer, final EntityDataSerializer<T> tr) {
         this.id = integer;
-        this.serializer = sc;
+        this.serializer = tr;
     }
     
     public int getId() {
@@ -25,8 +25,8 @@ public class EntityDataAccessor<T> {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final EntityDataAccessor<?> sb3 = object;
-        return this.id == sb3.id;
+        final EntityDataAccessor<?> tq3 = object;
+        return this.id == tq3.id;
     }
     
     @Override
diff --git a/src/net/minecraft/network/syncher/EntityDataSerializer.java b/src/net/minecraft/network/syncher/EntityDataSerializer.java
index 8aa1ead..f994d16 100644
--- a/src/net/minecraft/network/syncher/EntityDataSerializer.java
+++ b/src/net/minecraft/network/syncher/EntityDataSerializer.java
@@ -3,9 +3,9 @@ package net.minecraft.network.syncher;
 import net.minecraft.network.FriendlyByteBuf;
 
 public interface EntityDataSerializer<T> {
-    void write(final FriendlyByteBuf kv, final T object);
+    void write(final FriendlyByteBuf mg, final T object);
     
-    T read(final FriendlyByteBuf kv);
+    T read(final FriendlyByteBuf mg);
     
     default EntityDataAccessor<T> createAccessor(final int integer) {
         return new EntityDataAccessor<T>(integer, this);
diff --git a/src/net/minecraft/network/syncher/EntityDataSerializers.java b/src/net/minecraft/network/syncher/EntityDataSerializers.java
index ed3409b..4be3577 100644
--- a/src/net/minecraft/network/syncher/EntityDataSerializers.java
+++ b/src/net/minecraft/network/syncher/EntityDataSerializers.java
@@ -44,8 +44,8 @@ public class EntityDataSerializers {
     public static final EntityDataSerializer<OptionalInt> OPTIONAL_UNSIGNED_INT;
     public static final EntityDataSerializer<Pose> POSE;
     
-    public static void registerSerializer(final EntityDataSerializer<?> sc) {
-        EntityDataSerializers.SERIALIZERS.add(sc);
+    public static void registerSerializer(final EntityDataSerializer<?> tr) {
+        EntityDataSerializers.SERIALIZERS.add(tr);
     }
     
     @Nullable
@@ -53,21 +53,21 @@ public class EntityDataSerializers {
         return EntityDataSerializers.SERIALIZERS.byId(integer);
     }
     
-    public static int getSerializedId(final EntityDataSerializer<?> sc) {
-        return EntityDataSerializers.SERIALIZERS.getId(sc);
+    public static int getSerializedId(final EntityDataSerializer<?> tr) {
+        return EntityDataSerializers.SERIALIZERS.getId(tr);
     }
     
     static {
         SERIALIZERS = new CrudeIncrementalIntIdentityHashBiMap<EntityDataSerializer<?>>(16);
         BYTE = new EntityDataSerializer<Byte>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Byte byte2) {
-                kv.writeByte(byte2);
+            public void write(final FriendlyByteBuf mg, final Byte byte2) {
+                mg.writeByte(byte2);
             }
             
             @Override
-            public Byte read(final FriendlyByteBuf kv) {
-                return kv.readByte();
+            public Byte read(final FriendlyByteBuf mg) {
+                return mg.readByte();
             }
             
             @Override
@@ -77,13 +77,13 @@ public class EntityDataSerializers {
         };
         INT = new EntityDataSerializer<Integer>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Integer integer) {
-                kv.writeVarInt(integer);
+            public void write(final FriendlyByteBuf mg, final Integer integer) {
+                mg.writeVarInt(integer);
             }
             
             @Override
-            public Integer read(final FriendlyByteBuf kv) {
-                return kv.readVarInt();
+            public Integer read(final FriendlyByteBuf mg) {
+                return mg.readVarInt();
             }
             
             @Override
@@ -93,13 +93,13 @@ public class EntityDataSerializers {
         };
         FLOAT = new EntityDataSerializer<Float>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Float float2) {
-                kv.writeFloat(float2);
+            public void write(final FriendlyByteBuf mg, final Float float2) {
+                mg.writeFloat(float2);
             }
             
             @Override
-            public Float read(final FriendlyByteBuf kv) {
-                return kv.readFloat();
+            public Float read(final FriendlyByteBuf mg) {
+                return mg.readFloat();
             }
             
             @Override
@@ -109,13 +109,13 @@ public class EntityDataSerializers {
         };
         STRING = new EntityDataSerializer<String>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final String string) {
-                kv.writeUtf(string);
+            public void write(final FriendlyByteBuf mg, final String string) {
+                mg.writeUtf(string);
             }
             
             @Override
-            public String read(final FriendlyByteBuf kv) {
-                return kv.readUtf(32767);
+            public String read(final FriendlyByteBuf mg) {
+                return mg.readUtf(32767);
             }
             
             @Override
@@ -125,72 +125,72 @@ public class EntityDataSerializers {
         };
         COMPONENT = new EntityDataSerializer<Component>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Component lf) {
-                kv.writeComponent(lf);
+            public void write(final FriendlyByteBuf mg, final Component mr) {
+                mg.writeComponent(mr);
             }
             
             @Override
-            public Component read(final FriendlyByteBuf kv) {
-                return kv.readComponent();
+            public Component read(final FriendlyByteBuf mg) {
+                return mg.readComponent();
             }
             
             @Override
-            public Component copy(final Component lf) {
-                return lf.deepCopy();
+            public Component copy(final Component mr) {
+                return mr;
             }
         };
         OPTIONAL_COMPONENT = new EntityDataSerializer<Optional<Component>>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Optional<Component> optional) {
+            public void write(final FriendlyByteBuf mg, final Optional<Component> optional) {
                 if (optional.isPresent()) {
-                    kv.writeBoolean(true);
-                    kv.writeComponent(optional.get());
+                    mg.writeBoolean(true);
+                    mg.writeComponent(optional.get());
                 }
                 else {
-                    kv.writeBoolean(false);
+                    mg.writeBoolean(false);
                 }
             }
             
             @Override
-            public Optional<Component> read(final FriendlyByteBuf kv) {
-                return kv.readBoolean() ? Optional.<Component>of(kv.readComponent()) : Optional.<Component>empty();
+            public Optional<Component> read(final FriendlyByteBuf mg) {
+                return mg.readBoolean() ? Optional.<Component>of(mg.readComponent()) : Optional.<Component>empty();
             }
             
             @Override
             public Optional<Component> copy(final Optional<Component> optional) {
-                return optional.isPresent() ? Optional.<Component>of(optional.get().deepCopy()) : Optional.<Component>empty();
+                return optional;
             }
         };
         ITEM_STACK = new EntityDataSerializer<ItemStack>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final ItemStack ben) {
-                kv.writeItem(ben);
+            public void write(final FriendlyByteBuf mg, final ItemStack bki) {
+                mg.writeItem(bki);
             }
             
             @Override
-            public ItemStack read(final FriendlyByteBuf kv) {
-                return kv.readItem();
+            public ItemStack read(final FriendlyByteBuf mg) {
+                return mg.readItem();
             }
             
             @Override
-            public ItemStack copy(final ItemStack ben) {
-                return ben.copy();
+            public ItemStack copy(final ItemStack bki) {
+                return bki.copy();
             }
         };
         BLOCK_STATE = new EntityDataSerializer<Optional<BlockState>>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Optional<BlockState> optional) {
+            public void write(final FriendlyByteBuf mg, final Optional<BlockState> optional) {
                 if (optional.isPresent()) {
-                    kv.writeVarInt(Block.getId(optional.get()));
+                    mg.writeVarInt(Block.getId(optional.get()));
                 }
                 else {
-                    kv.writeVarInt(0);
+                    mg.writeVarInt(0);
                 }
             }
             
             @Override
-            public Optional<BlockState> read(final FriendlyByteBuf kv) {
-                final int integer3 = kv.readVarInt();
+            public Optional<BlockState> read(final FriendlyByteBuf mg) {
+                final int integer3 = mg.readVarInt();
                 if (integer3 == 0) {
                     return Optional.<BlockState>empty();
                 }
@@ -204,13 +204,13 @@ public class EntityDataSerializers {
         };
         BOOLEAN = new EntityDataSerializer<Boolean>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Boolean boolean2) {
-                kv.writeBoolean(boolean2);
+            public void write(final FriendlyByteBuf mg, final Boolean boolean2) {
+                mg.writeBoolean(boolean2);
             }
             
             @Override
-            public Boolean read(final FriendlyByteBuf kv) {
-                return kv.readBoolean();
+            public Boolean read(final FriendlyByteBuf mg) {
+                return mg.readBoolean();
             }
             
             @Override
@@ -220,74 +220,74 @@ public class EntityDataSerializers {
         };
         PARTICLE = new EntityDataSerializer<ParticleOptions>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final ParticleOptions gt) {
-                kv.writeVarInt(Registry.PARTICLE_TYPE.getId(gt.getType()));
-                gt.writeToNetwork(kv);
+            public void write(final FriendlyByteBuf mg, final ParticleOptions hf) {
+                mg.writeVarInt(Registry.PARTICLE_TYPE.getId(hf.getType()));
+                hf.writeToNetwork(mg);
             }
             
             @Override
-            public ParticleOptions read(final FriendlyByteBuf kv) {
-                return this.<ParticleOptions>readParticle(kv, Registry.PARTICLE_TYPE.byId(kv.readVarInt()));
+            public ParticleOptions read(final FriendlyByteBuf mg) {
+                return this.<ParticleOptions>readParticle(mg, Registry.PARTICLE_TYPE.byId(mg.readVarInt()));
             }
             
-            private <T extends ParticleOptions> T readParticle(final FriendlyByteBuf kv, final ParticleType<T> gu) {
-                return gu.getDeserializer().fromNetwork(gu, kv);
+            private <T extends ParticleOptions> T readParticle(final FriendlyByteBuf mg, final ParticleType<T> hg) {
+                return hg.getDeserializer().fromNetwork(hg, mg);
             }
             
             @Override
-            public ParticleOptions copy(final ParticleOptions gt) {
-                return gt;
+            public ParticleOptions copy(final ParticleOptions hf) {
+                return hf;
             }
         };
         ROTATIONS = new EntityDataSerializer<Rotations>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Rotations gc) {
-                kv.writeFloat(gc.getX());
-                kv.writeFloat(gc.getY());
-                kv.writeFloat(gc.getZ());
+            public void write(final FriendlyByteBuf mg, final Rotations gn) {
+                mg.writeFloat(gn.getX());
+                mg.writeFloat(gn.getY());
+                mg.writeFloat(gn.getZ());
             }
             
             @Override
-            public Rotations read(final FriendlyByteBuf kv) {
-                return new Rotations(kv.readFloat(), kv.readFloat(), kv.readFloat());
+            public Rotations read(final FriendlyByteBuf mg) {
+                return new Rotations(mg.readFloat(), mg.readFloat(), mg.readFloat());
             }
             
             @Override
-            public Rotations copy(final Rotations gc) {
-                return gc;
+            public Rotations copy(final Rotations gn) {
+                return gn;
             }
         };
         BLOCK_POS = new EntityDataSerializer<BlockPos>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final BlockPos fk) {
-                kv.writeBlockPos(fk);
+            public void write(final FriendlyByteBuf mg, final BlockPos fu) {
+                mg.writeBlockPos(fu);
             }
             
             @Override
-            public BlockPos read(final FriendlyByteBuf kv) {
-                return kv.readBlockPos();
+            public BlockPos read(final FriendlyByteBuf mg) {
+                return mg.readBlockPos();
             }
             
             @Override
-            public BlockPos copy(final BlockPos fk) {
-                return fk;
+            public BlockPos copy(final BlockPos fu) {
+                return fu;
             }
         };
         OPTIONAL_BLOCK_POS = new EntityDataSerializer<Optional<BlockPos>>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Optional<BlockPos> optional) {
-                kv.writeBoolean(optional.isPresent());
+            public void write(final FriendlyByteBuf mg, final Optional<BlockPos> optional) {
+                mg.writeBoolean(optional.isPresent());
                 if (optional.isPresent()) {
-                    kv.writeBlockPos(optional.get());
+                    mg.writeBlockPos(optional.get());
                 }
             }
             
             @Override
-            public Optional<BlockPos> read(final FriendlyByteBuf kv) {
-                if (!kv.readBoolean()) {
+            public Optional<BlockPos> read(final FriendlyByteBuf mg) {
+                if (!mg.readBoolean()) {
                     return Optional.<BlockPos>empty();
                 }
-                return Optional.<BlockPos>of(kv.readBlockPos());
+                return Optional.<BlockPos>of(mg.readBlockPos());
             }
             
             @Override
@@ -297,35 +297,35 @@ public class EntityDataSerializers {
         };
         DIRECTION = new EntityDataSerializer<Direction>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Direction fp) {
-                kv.writeEnum(fp);
+            public void write(final FriendlyByteBuf mg, final Direction fz) {
+                mg.writeEnum(fz);
             }
             
             @Override
-            public Direction read(final FriendlyByteBuf kv) {
-                return kv.<Direction>readEnum(Direction.class);
+            public Direction read(final FriendlyByteBuf mg) {
+                return mg.<Direction>readEnum(Direction.class);
             }
             
             @Override
-            public Direction copy(final Direction fp) {
-                return fp;
+            public Direction copy(final Direction fz) {
+                return fz;
             }
         };
         OPTIONAL_UUID = new EntityDataSerializer<Optional<UUID>>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Optional<UUID> optional) {
-                kv.writeBoolean(optional.isPresent());
+            public void write(final FriendlyByteBuf mg, final Optional<UUID> optional) {
+                mg.writeBoolean(optional.isPresent());
                 if (optional.isPresent()) {
-                    kv.writeUUID(optional.get());
+                    mg.writeUUID(optional.get());
                 }
             }
             
             @Override
-            public Optional<UUID> read(final FriendlyByteBuf kv) {
-                if (!kv.readBoolean()) {
+            public Optional<UUID> read(final FriendlyByteBuf mg) {
+                if (!mg.readBoolean()) {
                     return Optional.<UUID>empty();
                 }
-                return Optional.<UUID>of(kv.readUUID());
+                return Optional.<UUID>of(mg.readUUID());
             }
             
             @Override
@@ -335,47 +335,47 @@ public class EntityDataSerializers {
         };
         COMPOUND_TAG = new EntityDataSerializer<CompoundTag>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final CompoundTag jt) {
-                kv.writeNbt(jt);
+            public void write(final FriendlyByteBuf mg, final CompoundTag le) {
+                mg.writeNbt(le);
             }
             
             @Override
-            public CompoundTag read(final FriendlyByteBuf kv) {
-                return kv.readNbt();
+            public CompoundTag read(final FriendlyByteBuf mg) {
+                return mg.readNbt();
             }
             
             @Override
-            public CompoundTag copy(final CompoundTag jt) {
-                return jt.copy();
+            public CompoundTag copy(final CompoundTag le) {
+                return le.copy();
             }
         };
         VILLAGER_DATA = new EntityDataSerializer<VillagerData>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final VillagerData axx) {
-                kv.writeVarInt(Registry.VILLAGER_TYPE.getId(axx.getType()));
-                kv.writeVarInt(Registry.VILLAGER_PROFESSION.getId(axx.getProfession()));
-                kv.writeVarInt(axx.getLevel());
+            public void write(final FriendlyByteBuf mg, final VillagerData bdq) {
+                mg.writeVarInt(Registry.VILLAGER_TYPE.getId(bdq.getType()));
+                mg.writeVarInt(Registry.VILLAGER_PROFESSION.getId(bdq.getProfession()));
+                mg.writeVarInt(bdq.getLevel());
             }
             
             @Override
-            public VillagerData read(final FriendlyByteBuf kv) {
-                return new VillagerData(Registry.VILLAGER_TYPE.byId(kv.readVarInt()), Registry.VILLAGER_PROFESSION.byId(kv.readVarInt()), kv.readVarInt());
+            public VillagerData read(final FriendlyByteBuf mg) {
+                return new VillagerData(Registry.VILLAGER_TYPE.byId(mg.readVarInt()), Registry.VILLAGER_PROFESSION.byId(mg.readVarInt()), mg.readVarInt());
             }
             
             @Override
-            public VillagerData copy(final VillagerData axx) {
-                return axx;
+            public VillagerData copy(final VillagerData bdq) {
+                return bdq;
             }
         };
         OPTIONAL_UNSIGNED_INT = new EntityDataSerializer<OptionalInt>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final OptionalInt optionalInt) {
-                kv.writeVarInt(optionalInt.orElse(-1) + 1);
+            public void write(final FriendlyByteBuf mg, final OptionalInt optionalInt) {
+                mg.writeVarInt(optionalInt.orElse(-1) + 1);
             }
             
             @Override
-            public OptionalInt read(final FriendlyByteBuf kv) {
-                final int integer3 = kv.readVarInt();
+            public OptionalInt read(final FriendlyByteBuf mg) {
+                final int integer3 = mg.readVarInt();
                 return (integer3 == 0) ? OptionalInt.empty() : OptionalInt.of(integer3 - 1);
             }
             
@@ -386,18 +386,18 @@ public class EntityDataSerializers {
         };
         POSE = new EntityDataSerializer<Pose>() {
             @Override
-            public void write(final FriendlyByteBuf kv, final Pose alj) {
-                kv.writeEnum(alj);
+            public void write(final FriendlyByteBuf mg, final Pose apj) {
+                mg.writeEnum(apj);
             }
             
             @Override
-            public Pose read(final FriendlyByteBuf kv) {
-                return kv.<Pose>readEnum(Pose.class);
+            public Pose read(final FriendlyByteBuf mg) {
+                return mg.<Pose>readEnum(Pose.class);
             }
             
             @Override
-            public Pose copy(final Pose alj) {
-                return alj;
+            public Pose copy(final Pose apj) {
+                return apj;
             }
         };
         registerSerializer(EntityDataSerializers.BYTE);
diff --git a/src/net/minecraft/network/syncher/SynchedEntityData.java b/src/net/minecraft/network/syncher/SynchedEntityData.java
index 0e1bd4d..97040bd 100644
--- a/src/net/minecraft/network/syncher/SynchedEntityData.java
+++ b/src/net/minecraft/network/syncher/SynchedEntityData.java
@@ -30,14 +30,14 @@ public class SynchedEntityData {
     private boolean isEmpty;
     private boolean isDirty;
     
-    public SynchedEntityData(final Entity akq) {
+    public SynchedEntityData(final Entity aom) {
         this.itemsById = Maps.newHashMap();
         this.lock = new ReentrantReadWriteLock();
         this.isEmpty = true;
-        this.entity = akq;
+        this.entity = aom;
     }
     
-    public static <T> EntityDataAccessor<T> defineId(final Class<? extends Entity> class1, final EntityDataSerializer<T> sc) {
+    public static <T> EntityDataAccessor<T> defineId(final Class<? extends Entity> class1, final EntityDataSerializer<T> tr) {
         if (SynchedEntityData.LOGGER.isDebugEnabled()) {
             try {
                 final Class<?> class2 = Class.forName(Thread.currentThread().getStackTrace()[2].getClassName());
@@ -67,42 +67,42 @@ public class SynchedEntityData {
             throw new IllegalArgumentException("Data value id is too big with " + integer3 + "! (Max is " + 254 + ")");
         }
         SynchedEntityData.ENTITY_ID_POOL.put(class1, integer3);
-        return sc.createAccessor(integer3);
+        return tr.createAccessor(integer3);
     }
     
-    public <T> void define(final EntityDataAccessor<T> sb, final T object) {
-        final int integer4 = sb.getId();
+    public <T> void define(final EntityDataAccessor<T> tq, final T object) {
+        final int integer4 = tq.getId();
         if (integer4 > 254) {
             throw new IllegalArgumentException("Data value id is too big with " + integer4 + "! (Max is " + 254 + ")");
         }
         if (this.itemsById.containsKey(integer4)) {
             throw new IllegalArgumentException("Duplicate id value for " + integer4 + "!");
         }
-        if (EntityDataSerializers.getSerializedId(sb.getSerializer()) < 0) {
-            throw new IllegalArgumentException("Unregistered serializer " + sb.getSerializer() + " for " + integer4 + "!");
+        if (EntityDataSerializers.getSerializedId(tq.getSerializer()) < 0) {
+            throw new IllegalArgumentException("Unregistered serializer " + tq.getSerializer() + " for " + integer4 + "!");
         }
-        this.createDataItem((EntityDataAccessor<Object>)sb, object);
+        this.createDataItem((EntityDataAccessor<Object>)tq, object);
     }
     
-    private <T> void createDataItem(final EntityDataAccessor<T> sb, final T object) {
-        final DataItem<T> a4 = new DataItem<T>(sb, object);
+    private <T> void createDataItem(final EntityDataAccessor<T> tq, final T object) {
+        final DataItem<T> a4 = new DataItem<T>(tq, object);
         this.lock.writeLock().lock();
-        this.itemsById.put(sb.getId(), a4);
+        this.itemsById.put(tq.getId(), a4);
         this.isEmpty = false;
         this.lock.writeLock().unlock();
     }
     
-    private <T> DataItem<T> getItem(final EntityDataAccessor<T> sb) {
+    private <T> DataItem<T> getItem(final EntityDataAccessor<T> tq) {
         this.lock.readLock().lock();
         DataItem<T> a3;
         try {
-            a3 = (DataItem<T>)this.itemsById.get(sb.getId());
+            a3 = (DataItem<T>)this.itemsById.get(tq.getId());
         }
         catch (Throwable throwable4) {
-            final CrashReport h5 = CrashReport.forThrowable(throwable4, "Getting synched entity data");
-            final CrashReportCategory i6 = h5.addCategory("Synched entity data");
-            i6.setDetail("Data ID", sb);
-            throw new ReportedException(h5);
+            final CrashReport j5 = CrashReport.forThrowable(throwable4, "Getting synched entity data");
+            final CrashReportCategory k6 = j5.addCategory("Synched entity data");
+            k6.setDetail("Data ID", tq);
+            throw new ReportedException(j5);
         }
         finally {
             this.lock.readLock().unlock();
@@ -110,15 +110,15 @@ public class SynchedEntityData {
         return a3;
     }
     
-    public <T> T get(final EntityDataAccessor<T> sb) {
-        return this.<T>getItem(sb).getValue();
+    public <T> T get(final EntityDataAccessor<T> tq) {
+        return this.<T>getItem(tq).getValue();
     }
     
-    public <T> void set(final EntityDataAccessor<T> sb, final T object) {
-        final DataItem<T> a4 = this.<T>getItem(sb);
+    public <T> void set(final EntityDataAccessor<T> tq, final T object) {
+        final DataItem<T> a4 = this.<T>getItem(tq);
         if (ObjectUtils.notEqual(object, a4.getValue())) {
             a4.setValue(object);
-            this.entity.onSyncedDataUpdated(sb);
+            this.entity.onSyncedDataUpdated(tq);
             a4.setDirty(true);
             this.isDirty = true;
         }
@@ -128,13 +128,13 @@ public class SynchedEntityData {
         return this.isDirty;
     }
     
-    public static void pack(final List<DataItem<?>> list, final FriendlyByteBuf kv) throws IOException {
+    public static void pack(final List<DataItem<?>> list, final FriendlyByteBuf mg) throws IOException {
         if (list != null) {
             for (int integer3 = 0, integer4 = list.size(); integer3 < integer4; ++integer3) {
-                SynchedEntityData.writeDataItem(kv, list.get(integer3));
+                SynchedEntityData.writeDataItem(mg, list.get(integer3));
             }
         }
-        kv.writeByte(255);
+        mg.writeByte(255);
     }
     
     @Nullable
@@ -171,37 +171,37 @@ public class SynchedEntityData {
         return list2;
     }
     
-    private static <T> void writeDataItem(final FriendlyByteBuf kv, final DataItem<T> a) throws IOException {
-        final EntityDataAccessor<T> sb3 = a.getAccessor();
-        final int integer4 = EntityDataSerializers.getSerializedId(sb3.getSerializer());
+    private static <T> void writeDataItem(final FriendlyByteBuf mg, final DataItem<T> a) throws IOException {
+        final EntityDataAccessor<T> tq3 = a.getAccessor();
+        final int integer4 = EntityDataSerializers.getSerializedId(tq3.getSerializer());
         if (integer4 < 0) {
-            throw new EncoderException("Unknown serializer type " + sb3.getSerializer());
+            throw new EncoderException("Unknown serializer type " + tq3.getSerializer());
         }
-        kv.writeByte(sb3.getId());
-        kv.writeVarInt(integer4);
-        sb3.getSerializer().write(kv, a.getValue());
+        mg.writeByte(tq3.getId());
+        mg.writeVarInt(integer4);
+        tq3.getSerializer().write(mg, a.getValue());
     }
     
     @Nullable
-    public static List<DataItem<?>> unpack(final FriendlyByteBuf kv) throws IOException {
+    public static List<DataItem<?>> unpack(final FriendlyByteBuf mg) throws IOException {
         List<DataItem<?>> list2 = null;
         int integer3;
-        while ((integer3 = kv.readUnsignedByte()) != 255) {
+        while ((integer3 = mg.readUnsignedByte()) != 255) {
             if (list2 == null) {
                 list2 = Lists.newArrayList();
             }
-            final int integer4 = kv.readVarInt();
-            final EntityDataSerializer<?> sc5 = EntityDataSerializers.getSerializer(integer4);
-            if (sc5 == null) {
+            final int integer4 = mg.readVarInt();
+            final EntityDataSerializer<?> tr5 = EntityDataSerializers.getSerializer(integer4);
+            if (tr5 == null) {
                 throw new DecoderException("Unknown serializer type " + integer4);
             }
-            list2.add(SynchedEntityData.genericHelper(kv, integer3, sc5));
+            list2.add(SynchedEntityData.genericHelper(mg, integer3, tr5));
         }
         return list2;
     }
     
-    private static <T> DataItem<T> genericHelper(final FriendlyByteBuf kv, final int integer, final EntityDataSerializer<T> sc) {
-        return new DataItem<T>(sc.createAccessor(integer), sc.read(kv));
+    private static <T> DataItem<T> genericHelper(final FriendlyByteBuf mg, final int integer, final EntityDataSerializer<T> tr) {
+        return new DataItem<T>(tr.createAccessor(integer), tr.read(mg));
     }
     
     public void assignValues(final List<DataItem<?>> list) {
@@ -247,8 +247,8 @@ public class SynchedEntityData {
         private T value;
         private boolean dirty;
         
-        public DataItem(final EntityDataAccessor<T> sb, final T object) {
-            this.accessor = sb;
+        public DataItem(final EntityDataAccessor<T> tq, final T object) {
+            this.accessor = tq;
             this.value = object;
             this.dirty = true;
         }
diff --git a/src/net/minecraft/realms/AbstractRealmsButton.java b/src/net/minecraft/realms/AbstractRealmsButton.java
deleted file mode 100644
index 3e40f91..0000000
--- a/src/net/minecraft/realms/AbstractRealmsButton.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.minecraft.realms;
-
-public abstract class AbstractRealmsButton<P extends AbstractWidget> {
-    public abstract P getProxy();
-    
-    public boolean active() {
-        return this.getProxy().active();
-    }
-    
-    public void active(final boolean boolean1) {
-        this.getProxy().active(boolean1);
-    }
-    
-    public boolean isVisible() {
-        return this.getProxy().isVisible();
-    }
-    
-    public void setVisible(final boolean boolean1) {
-        this.getProxy().setVisible(boolean1);
-    }
-    
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.getProxy().render(integer1, integer2, float3);
-    }
-    
-    public void blit(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.getProxy().blit(integer1, integer2, integer3, integer4, integer5, integer6);
-    }
-    
-    public void tick() {
-    }
-}
diff --git a/src/net/minecraft/realms/DisconnectedRealmsScreen.java b/src/net/minecraft/realms/DisconnectedRealmsScreen.java
index f353aa0..9b6e858 100644
--- a/src/net/minecraft/realms/DisconnectedRealmsScreen.java
+++ b/src/net/minecraft/realms/DisconnectedRealmsScreen.java
@@ -1,57 +1,74 @@
 package net.minecraft.realms;
 
 import java.util.Iterator;
+import net.minecraft.client.gui.Font;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.gui.screens.Screen;
+import javax.annotation.Nullable;
+import net.minecraft.network.chat.FormattedText;
 import java.util.List;
 import net.minecraft.network.chat.Component;
 
 public class DisconnectedRealmsScreen extends RealmsScreen {
     private final String title;
     private final Component reason;
-    private List<String> lines;
-    private final RealmsScreen parent;
+    @Nullable
+    private List<FormattedText> lines;
+    private final Screen parent;
     private int textHeight;
     
-    public DisconnectedRealmsScreen(final RealmsScreen realmsScreen, final String string, final Component lf) {
-        this.parent = realmsScreen;
-        this.title = RealmsScreen.getLocalizedString(string);
-        this.reason = lf;
+    public DisconnectedRealmsScreen(final Screen dqs, final String string, final Component mr) {
+        this.parent = dqs;
+        this.title = I18n.get(string);
+        this.reason = mr;
     }
     
-    @Override
     public void init() {
-        Realms.setConnectedToRealms(false);
-        Realms.clearResourcePack();
-        Realms.narrateNow(this.title + ": " + this.reason.getString());
-        this.lines = this.fontSplit(this.reason.getColoredString(), this.width() - 50);
-        this.textHeight = this.lines.size() * this.fontLineHeight();
-        this.buttonsAdd(new RealmsButton(0, this.width() / 2 - 100, this.height() / 2 + this.textHeight / 2 + this.fontLineHeight(), RealmsScreen.getLocalizedString("gui.back")) {
-            @Override
-            public void onPress() {
-                Realms.setScreen(DisconnectedRealmsScreen.this.parent);
-            }
-        });
+        final Minecraft dlx2 = Minecraft.getInstance();
+        dlx2.setConnectedToRealms(false);
+        dlx2.getClientPackSource().clearServerPack();
+        NarrationHelper.now(this.title + ": " + this.reason.getString());
+        this.lines = this.font.split(this.reason, this.width - 50);
+        final int size = this.lines.size();
+        this.font.getClass();
+        this.textHeight = size * 9;
+        final int integer1 = this.width / 2 - 100;
+        final int n = this.height / 2 + this.textHeight / 2;
+        this.font.getClass();
+        this.<Button>addButton(new Button(integer1, n + 9, 200, 20, CommonComponents.GUI_BACK, dni -> dlx2.setScreen(this.parent)));
     }
     
     @Override
     public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
         if (integer1 == 256) {
-            Realms.setScreen(this.parent);
+            Minecraft.getInstance().setScreen(this.parent);
             return true;
         }
         return super.keyPressed(integer1, integer2, integer3);
     }
     
     @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.renderBackground();
-        this.drawCenteredString(this.title, this.width() / 2, this.height() / 2 - this.textHeight / 2 - this.fontLineHeight() * 2, 11184810);
-        int integer3 = this.height() / 2 - this.textHeight / 2;
+    public void render(final PoseStack dhl, final int integer2, final int integer3, final float float4) {
+        this.renderBackground(dhl);
+        final Font font = this.font;
+        final String title = this.title;
+        final int integer5 = this.width / 2;
+        final int n = this.height / 2 - this.textHeight / 2;
+        this.font.getClass();
+        this.drawCenteredString(dhl, font, title, integer5, n - 9 * 2, 11184810);
+        int integer4 = this.height / 2 - this.textHeight / 2;
         if (this.lines != null) {
-            for (final String string7 : this.lines) {
-                this.drawCenteredString(string7, this.width() / 2, integer3, 16777215);
-                integer3 += this.fontLineHeight();
+            for (final FormattedText mu8 : this.lines) {
+                this.drawCenteredString(dhl, this.font, mu8, this.width / 2, integer4, 16777215);
+                final int n2 = integer4;
+                this.font.getClass();
+                integer4 = n2 + 9;
             }
         }
-        super.render(integer1, integer2, float3);
+        super.render(dhl, integer2, integer3, float4);
     }
 }
diff --git a/src/net/minecraft/realms/NarrationHelper.java b/src/net/minecraft/realms/NarrationHelper.java
new file mode 100644
index 0000000..e3a99ef
--- /dev/null
+++ b/src/net/minecraft/realms/NarrationHelper.java
@@ -0,0 +1,43 @@
+package net.minecraft.realms;
+
+import java.time.Duration;
+import java.util.Arrays;
+import net.minecraft.network.chat.Component;
+import net.minecraft.Util;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.ChatType;
+import net.minecraft.client.gui.chat.NarratorChatListener;
+
+public class NarrationHelper {
+    private static final RepeatedNarrator REPEATED_NARRATOR;
+    
+    public static void now(final String string) {
+        final NarratorChatListener dmy2 = NarratorChatListener.INSTANCE;
+        dmy2.clear();
+        dmy2.handle(ChatType.SYSTEM, new TextComponent(fixNarrationNewlines(string)), Util.NIL_UUID);
+    }
+    
+    private static String fixNarrationNewlines(final String string) {
+        return string.replace("\\n", System.lineSeparator());
+    }
+    
+    public static void now(final String... arr) {
+        now(Arrays.<String>asList(arr));
+    }
+    
+    public static void now(final Iterable<String> iterable) {
+        now(join(iterable));
+    }
+    
+    public static String join(final Iterable<String> iterable) {
+        return String.join(System.lineSeparator(), iterable);
+    }
+    
+    public static void repeatedly(final String string) {
+        NarrationHelper.REPEATED_NARRATOR.narrate(fixNarrationNewlines(string));
+    }
+    
+    static {
+        REPEATED_NARRATOR = new RepeatedNarrator(Duration.ofSeconds(5L));
+    }
+}
diff --git a/src/net/minecraft/realms/RealmListEntry.java b/src/net/minecraft/realms/RealmListEntry.java
deleted file mode 100644
index e107a46..0000000
--- a/src/net/minecraft/realms/RealmListEntry.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.gui.components.ObjectSelectionList;
-
-public abstract class RealmListEntry extends ObjectSelectionList.Entry<RealmListEntry> {
-    @Override
-    public abstract void render(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final float float9);
-    
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return false;
-    }
-}
diff --git a/src/net/minecraft/realms/Realms.java b/src/net/minecraft/realms/Realms.java
deleted file mode 100644
index e501c75..0000000
--- a/src/net/minecraft/realms/Realms.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package net.minecraft.realms;
-
-import java.time.Duration;
-import java.util.Arrays;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.ChatType;
-import net.minecraft.client.gui.chat.NarratorChatListener;
-import net.minecraft.client.resources.language.I18n;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.SharedConstants;
-import net.minecraft.nbt.CompoundTag;
-import java.io.OutputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import net.minecraft.nbt.NbtIo;
-import java.io.FileInputStream;
-import java.io.File;
-import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.world.level.GameType;
-import net.minecraft.client.gui.screens.Screen;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Supplier;
-import com.mojang.authlib.GameProfile;
-import com.mojang.util.UUIDTypeAdapter;
-import net.minecraft.Util;
-import net.minecraft.client.User;
-import java.net.Proxy;
-import net.minecraft.client.Minecraft;
-
-public class Realms {
-    private static final RepeatedNarrator REPEATED_NARRATOR;
-    
-    public static boolean isTouchScreen() {
-        return Minecraft.getInstance().options.touchscreen;
-    }
-    
-    public static Proxy getProxy() {
-        return Minecraft.getInstance().getProxy();
-    }
-    
-    public static String sessionId() {
-        final User dbz1 = Minecraft.getInstance().getUser();
-        if (dbz1 == null) {
-            return null;
-        }
-        return dbz1.getSessionId();
-    }
-    
-    public static String userName() {
-        final User dbz1 = Minecraft.getInstance().getUser();
-        if (dbz1 == null) {
-            return null;
-        }
-        return dbz1.getName();
-    }
-    
-    public static long currentTimeMillis() {
-        return Util.getMillis();
-    }
-    
-    public static String getSessionId() {
-        return Minecraft.getInstance().getUser().getSessionId();
-    }
-    
-    public static String getUUID() {
-        return Minecraft.getInstance().getUser().getUuid();
-    }
-    
-    public static String getName() {
-        return Minecraft.getInstance().getUser().getName();
-    }
-    
-    public static String uuidToName(final String string) {
-        return Minecraft.getInstance().getMinecraftSessionService().fillProfileProperties(new GameProfile(UUIDTypeAdapter.fromString(string), (String)null), false).getName();
-    }
-    
-    public static <V> CompletableFuture<V> execute(final Supplier<V> supplier) {
-        return Minecraft.getInstance().<V>submit(supplier);
-    }
-    
-    public static void execute(final Runnable runnable) {
-        Minecraft.getInstance().execute(runnable);
-    }
-    
-    public static void setScreen(final RealmsScreen realmsScreen) {
-        Realms.execute(() -> {
-            setScreenDirect(realmsScreen);
-            return null;
-        });
-    }
-    
-    public static void setScreenDirect(final RealmsScreen realmsScreen) {
-        Minecraft.getInstance().setScreen(realmsScreen.getProxy());
-    }
-    
-    public static String getGameDirectoryPath() {
-        return Minecraft.getInstance().gameDirectory.getAbsolutePath();
-    }
-    
-    public static int survivalId() {
-        return GameType.SURVIVAL.getId();
-    }
-    
-    public static int creativeId() {
-        return GameType.CREATIVE.getId();
-    }
-    
-    public static int adventureId() {
-        return GameType.ADVENTURE.getId();
-    }
-    
-    public static int spectatorId() {
-        return GameType.SPECTATOR.getId();
-    }
-    
-    public static void setConnectedToRealms(final boolean boolean1) {
-        Minecraft.getInstance().setConnectedToRealms(boolean1);
-    }
-    
-    public static CompletableFuture<?> downloadResourcePack(final String string1, final String string2) {
-        return Minecraft.getInstance().getClientPackSource().downloadAndSelectResourcePack(string1, string2);
-    }
-    
-    public static void clearResourcePack() {
-        Minecraft.getInstance().getClientPackSource().clearServerPack();
-    }
-    
-    public static boolean getRealmsNotificationsEnabled() {
-        return Minecraft.getInstance().options.realmsNotifications;
-    }
-    
-    public static boolean inTitleScreen() {
-        return Minecraft.getInstance().screen != null && Minecraft.getInstance().screen instanceof TitleScreen;
-    }
-    
-    public static void deletePlayerTag(final File file) {
-        if (file.exists()) {
-            try {
-                final CompoundTag jt2 = NbtIo.readCompressed(new FileInputStream(file));
-                final CompoundTag jt3 = jt2.getCompound("Data");
-                jt3.remove("Player");
-                NbtIo.writeCompressed(jt2, new FileOutputStream(file));
-            }
-            catch (Exception exception2) {
-                exception2.printStackTrace();
-            }
-        }
-    }
-    
-    public static void openUri(final String string) {
-        Util.getPlatform().openUri(string);
-    }
-    
-    public static void setClipboard(final String string) {
-        Minecraft.getInstance().keyboardHandler.setClipboard(string);
-    }
-    
-    public static String getMinecraftVersionString() {
-        return SharedConstants.getCurrentVersion().getName();
-    }
-    
-    public static ResourceLocation resourceLocation(final String string) {
-        return new ResourceLocation(string);
-    }
-    
-    public static String getLocalizedString(final String string, final Object... arr) {
-        return I18n.get(string, arr);
-    }
-    
-    public static void bind(final String string) {
-        final ResourceLocation sm2 = new ResourceLocation(string);
-        Minecraft.getInstance().getTextureManager().bind(sm2);
-    }
-    
-    public static void narrateNow(final String string) {
-        final NarratorChatListener dcm2 = NarratorChatListener.INSTANCE;
-        dcm2.clear();
-        dcm2.handle(ChatType.SYSTEM, new TextComponent(fixNarrationNewlines(string)));
-    }
-    
-    private static String fixNarrationNewlines(final String string) {
-        return string.replace("\\n", System.lineSeparator());
-    }
-    
-    public static void narrateNow(final String... arr) {
-        narrateNow(Arrays.<String>asList(arr));
-    }
-    
-    public static void narrateNow(final Iterable<String> iterable) {
-        narrateNow(joinNarrations(iterable));
-    }
-    
-    public static String joinNarrations(final Iterable<String> iterable) {
-        return String.join(System.lineSeparator(), iterable);
-    }
-    
-    public static void narrateRepeatedly(final String string) {
-        Realms.REPEATED_NARRATOR.narrate(fixNarrationNewlines(string));
-    }
-    
-    static {
-        REPEATED_NARRATOR = new RepeatedNarrator(Duration.ofSeconds(5L));
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsAbstractButtonProxy.java b/src/net/minecraft/realms/RealmsAbstractButtonProxy.java
deleted file mode 100644
index a4b4718..0000000
--- a/src/net/minecraft/realms/RealmsAbstractButtonProxy.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.minecraft.realms;
-
-public interface RealmsAbstractButtonProxy<T extends AbstractRealmsButton<?>> {
-    T getButton();
-    
-    boolean active();
-    
-    void active(final boolean boolean1);
-    
-    boolean isVisible();
-    
-    void setVisible(final boolean boolean1);
-}
diff --git a/src/net/minecraft/realms/RealmsAnvilLevelStorageSource.java b/src/net/minecraft/realms/RealmsAnvilLevelStorageSource.java
deleted file mode 100644
index 05e64ae..0000000
--- a/src/net/minecraft/realms/RealmsAnvilLevelStorageSource.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.world.level.storage.LevelStorageException;
-import java.util.Iterator;
-import net.minecraft.world.level.storage.LevelSummary;
-import com.google.common.collect.Lists;
-import java.util.List;
-import net.minecraft.util.ProgressListener;
-import net.minecraft.world.level.storage.LevelStorageSource;
-
-public class RealmsAnvilLevelStorageSource {
-    private final LevelStorageSource levelStorageSource;
-    
-    public RealmsAnvilLevelStorageSource(final LevelStorageSource crp) {
-        this.levelStorageSource = crp;
-    }
-    
-    public String getName() {
-        return this.levelStorageSource.getName();
-    }
-    
-    public boolean levelExists(final String string) {
-        return this.levelStorageSource.levelExists(string);
-    }
-    
-    public boolean convertLevel(final String string, final ProgressListener abs) {
-        return this.levelStorageSource.convertLevel(string, abs);
-    }
-    
-    public boolean requiresConversion(final String string) {
-        return this.levelStorageSource.requiresConversion(string);
-    }
-    
-    public boolean isNewLevelIdAcceptable(final String string) {
-        return this.levelStorageSource.isNewLevelIdAcceptable(string);
-    }
-    
-    public boolean deleteLevel(final String string) {
-        return this.levelStorageSource.deleteLevel(string);
-    }
-    
-    public void renameLevel(final String string1, final String string2) {
-        this.levelStorageSource.renameLevel(string1, string2);
-    }
-    
-    public List<RealmsLevelSummary> getLevelList() throws LevelStorageException {
-        final List<RealmsLevelSummary> list2 = Lists.newArrayList();
-        for (final LevelSummary crq4 : this.levelStorageSource.getLevelList()) {
-            list2.add(new RealmsLevelSummary(crq4));
-        }
-        return list2;
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsBridge.java b/src/net/minecraft/realms/RealmsBridge.java
index 17f06e0..4ed6abd 100644
--- a/src/net/minecraft/realms/RealmsBridge.java
+++ b/src/net/minecraft/realms/RealmsBridge.java
@@ -1,26 +1,25 @@
 package net.minecraft.realms;
 
-import net.minecraft.client.Minecraft;
 import javax.annotation.Nullable;
 import com.mojang.realmsclient.gui.screens.RealmsNotificationsScreen;
 import com.mojang.realmsclient.RealmsMainScreen;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 
 public class RealmsBridge extends RealmsScreen {
     private Screen previousScreen;
     
-    public void switchToRealms(final Screen dgb) {
-        this.previousScreen = dgb;
-        Realms.setScreen(new RealmsMainScreen(this));
+    public void switchToRealms(final Screen dqs) {
+        this.previousScreen = dqs;
+        Minecraft.getInstance().setScreen(new RealmsMainScreen(this));
     }
     
     @Nullable
-    public RealmsScreenProxy getNotificationScreen(final Screen dgb) {
-        this.previousScreen = dgb;
-        return new RealmsNotificationsScreen(this).getProxy();
+    public RealmsScreen getNotificationScreen(final Screen dqs) {
+        this.previousScreen = dqs;
+        return new RealmsNotificationsScreen();
     }
     
-    @Override
     public void init() {
         Minecraft.getInstance().setScreen(this.previousScreen);
     }
diff --git a/src/net/minecraft/realms/RealmsButton.java b/src/net/minecraft/realms/RealmsButton.java
deleted file mode 100644
index 8627f9a..0000000
--- a/src/net/minecraft/realms/RealmsButton.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.Minecraft;
-import net.minecraft.resources.ResourceLocation;
-
-public abstract class RealmsButton extends AbstractRealmsButton<RealmsButtonProxy> {
-    protected static final ResourceLocation WIDGETS_LOCATION;
-    private final int id;
-    private final RealmsButtonProxy proxy;
-    
-    public RealmsButton(final int integer1, final int integer2, final int integer3, final String string) {
-        this(integer1, integer2, integer3, 200, 20, string);
-    }
-    
-    public RealmsButton(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final String string) {
-        this.id = integer1;
-        this.proxy = new RealmsButtonProxy(this, integer2, integer3, string, integer4, integer5, dcv -> this.onPress());
-    }
-    
-    @Override
-    public RealmsButtonProxy getProxy() {
-        return this.proxy;
-    }
-    
-    public int id() {
-        return this.id;
-    }
-    
-    public void setMessage(final String string) {
-        this.proxy.setMessage(string);
-    }
-    
-    public int getWidth() {
-        return this.proxy.getWidth();
-    }
-    
-    public int getHeight() {
-        return this.proxy.getHeight();
-    }
-    
-    public int y() {
-        return this.proxy.y();
-    }
-    
-    public int x() {
-        return this.proxy.x;
-    }
-    
-    public void renderBg(final int integer1, final int integer2) {
-    }
-    
-    public int getYImage(final boolean boolean1) {
-        return this.proxy.getSuperYImage(boolean1);
-    }
-    
-    public abstract void onPress();
-    
-    public void onRelease(final double double1, final double double2) {
-    }
-    
-    public void renderButton(final int integer1, final int integer2, final float float3) {
-        this.getProxy().superRenderButton(integer1, integer2, float3);
-    }
-    
-    public void drawCenteredString(final String string, final int integer2, final int integer3, final int integer4) {
-        this.getProxy().drawCenteredString(Minecraft.getInstance().font, string, integer2, integer3, integer4);
-    }
-    
-    static {
-        WIDGETS_LOCATION = new ResourceLocation("textures/gui/widgets.png");
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsButtonProxy.java b/src/net/minecraft/realms/RealmsButtonProxy.java
deleted file mode 100644
index 6210abf..0000000
--- a/src/net/minecraft/realms/RealmsButtonProxy.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.Button;
-
-public class RealmsButtonProxy extends Button implements RealmsAbstractButtonProxy<RealmsButton> {
-    private final RealmsButton button;
-    
-    public RealmsButtonProxy(final RealmsButton realmsButton, final int integer2, final int integer3, final String string, final int integer5, final int integer6, final OnPress a) {
-        super(integer2, integer3, integer5, integer6, string, a);
-        this.button = realmsButton;
-    }
-    
-    @Override
-    public boolean active() {
-        return this.active;
-    }
-    
-    @Override
-    public void active(final boolean boolean1) {
-        this.active = boolean1;
-    }
-    
-    @Override
-    public boolean isVisible() {
-        return this.visible;
-    }
-    
-    @Override
-    public void setVisible(final boolean boolean1) {
-        this.visible = boolean1;
-    }
-    
-    @Override
-    public void setMessage(final String string) {
-        super.setMessage(string);
-    }
-    
-    @Override
-    public int getWidth() {
-        return super.getWidth();
-    }
-    
-    public int y() {
-        return this.y;
-    }
-    
-    @Override
-    public void onClick(final double double1, final double double2) {
-        this.button.onPress();
-    }
-    
-    @Override
-    public void onRelease(final double double1, final double double2) {
-        this.button.onRelease(double1, double2);
-    }
-    
-    public void renderBg(final Minecraft dbn, final int integer2, final int integer3) {
-        this.button.renderBg(integer2, integer3);
-    }
-    
-    @Override
-    public void renderButton(final int integer1, final int integer2, final float float3) {
-        this.button.renderButton(integer1, integer2, float3);
-    }
-    
-    public void superRenderButton(final int integer1, final int integer2, final float float3) {
-        super.renderButton(integer1, integer2, float3);
-    }
-    
-    @Override
-    public RealmsButton getButton() {
-        return this.button;
-    }
-    
-    public int getYImage(final boolean boolean1) {
-        return this.button.getYImage(boolean1);
-    }
-    
-    public int getSuperYImage(final boolean boolean1) {
-        return super.getYImage(boolean1);
-    }
-    
-    public int getHeight() {
-        return this.height;
-    }
-    
-    @Override
-    public boolean isHovered() {
-        return super.isHovered();
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsClickableScrolledSelectionList.java b/src/net/minecraft/realms/RealmsClickableScrolledSelectionList.java
deleted file mode 100644
index d63299a..0000000
--- a/src/net/minecraft/realms/RealmsClickableScrolledSelectionList.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.gui.components.events.GuiEventListener;
-
-public abstract class RealmsClickableScrolledSelectionList extends RealmsGuiEventListener {
-    private final RealmsClickableScrolledSelectionListProxy proxy;
-    
-    public RealmsClickableScrolledSelectionList(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-        this.proxy = new RealmsClickableScrolledSelectionListProxy(this, integer1, integer2, integer3, integer4, integer5);
-    }
-    
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.proxy.render(integer1, integer2, float3);
-    }
-    
-    public int width() {
-        return this.proxy.getWidth();
-    }
-    
-    protected void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final Tezzelator tezzelator, final int integer6, final int integer7) {
-    }
-    
-    public void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.renderItem(integer1, integer2, integer3, integer4, Tezzelator.instance, integer5, integer6);
-    }
-    
-    public int getItemCount() {
-        return 0;
-    }
-    
-    public boolean selectItem(final int integer1, final int integer2, final double double3, final double double4) {
-        return true;
-    }
-    
-    public boolean isSelectedItem(final int integer) {
-        return false;
-    }
-    
-    public void renderBackground() {
-    }
-    
-    public int getMaxPosition() {
-        return 0;
-    }
-    
-    public int getScrollbarPosition() {
-        return this.proxy.getWidth() / 2 + 124;
-    }
-    
-    @Override
-    public GuiEventListener getProxy() {
-        return this.proxy;
-    }
-    
-    public void scroll(final int integer) {
-        this.proxy.scroll(integer);
-    }
-    
-    public int getScroll() {
-        return this.proxy.getScroll();
-    }
-    
-    protected void renderList(final int integer1, final int integer2, final int integer3, final int integer4) {
-    }
-    
-    public void itemClicked(final int integer1, final int integer2, final double double3, final double double4, final int integer5) {
-    }
-    
-    public void renderSelected(final int integer1, final int integer2, final int integer3, final Tezzelator tezzelator) {
-    }
-    
-    public void setLeftPos(final int integer) {
-        this.proxy.setLeftPos(integer);
-    }
-    
-    public int y0() {
-        return this.proxy.y0();
-    }
-    
-    public int y1() {
-        return this.proxy.y1();
-    }
-    
-    public int headerHeight() {
-        return this.proxy.headerHeight();
-    }
-    
-    public double yo() {
-        return this.proxy.yo();
-    }
-    
-    public int itemHeight() {
-        return this.proxy.itemHeight();
-    }
-    
-    public boolean isVisible() {
-        return this.proxy.isVisible();
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsClickableScrolledSelectionListProxy.java b/src/net/minecraft/realms/RealmsClickableScrolledSelectionListProxy.java
deleted file mode 100644
index 3948ced..0000000
--- a/src/net/minecraft/realms/RealmsClickableScrolledSelectionListProxy.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.ScrolledSelectionList;
-
-public class RealmsClickableScrolledSelectionListProxy extends ScrolledSelectionList {
-    private final RealmsClickableScrolledSelectionList realmsClickableScrolledSelectionList;
-    
-    public RealmsClickableScrolledSelectionListProxy(final RealmsClickableScrolledSelectionList realmsClickableScrolledSelectionList, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        super(Minecraft.getInstance(), integer2, integer3, integer4, integer5, integer6);
-        this.realmsClickableScrolledSelectionList = realmsClickableScrolledSelectionList;
-    }
-    
-    public int getItemCount() {
-        return this.realmsClickableScrolledSelectionList.getItemCount();
-    }
-    
-    public boolean selectItem(final int integer1, final int integer2, final double double3, final double double4) {
-        return this.realmsClickableScrolledSelectionList.selectItem(integer1, integer2, double3, double4);
-    }
-    
-    public boolean isSelectedItem(final int integer) {
-        return this.realmsClickableScrolledSelectionList.isSelectedItem(integer);
-    }
-    
-    public void renderBackground() {
-        this.realmsClickableScrolledSelectionList.renderBackground();
-    }
-    
-    public void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final float float7) {
-        this.realmsClickableScrolledSelectionList.renderItem(integer1, integer2, integer3, integer4, integer5, integer6);
-    }
-    
-    public int getWidth() {
-        return this.width;
-    }
-    
-    public int getMaxPosition() {
-        return this.realmsClickableScrolledSelectionList.getMaxPosition();
-    }
-    
-    public int getScrollbarPosition() {
-        return this.realmsClickableScrolledSelectionList.getScrollbarPosition();
-    }
-    
-    public void itemClicked(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-        this.realmsClickableScrolledSelectionList.itemClicked(integer1, integer2, integer3, integer4, integer5);
-    }
-    
-    @Override
-    public boolean mouseScrolled(final double double1, final double double2, final double double3) {
-        return this.realmsClickableScrolledSelectionList.mouseScrolled(double1, double2, double3) || super.mouseScrolled(double1, double2, double3);
-    }
-    
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return this.realmsClickableScrolledSelectionList.mouseClicked(double1, double2, integer) || super.mouseClicked(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseReleased(final double double1, final double double2, final int integer) {
-        return this.realmsClickableScrolledSelectionList.mouseReleased(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
-        return this.realmsClickableScrolledSelectionList.mouseDragged(double1, double2, integer, double4, double5) || super.mouseDragged(double1, double2, integer, double4, double5);
-    }
-    
-    public void renderSelected(final int integer1, final int integer2, final int integer3, final Tezzelator tezzelator) {
-        this.realmsClickableScrolledSelectionList.renderSelected(integer1, integer2, integer3, tezzelator);
-    }
-    
-    public void renderList(final int integer1, final int integer2, final int integer3, final int integer4, final float float5) {
-        for (int integer5 = this.getItemCount(), integer6 = 0; integer6 < integer5; ++integer6) {
-            final int integer7 = integer2 + integer6 * this.itemHeight + this.headerHeight;
-            final int integer8 = this.itemHeight - 4;
-            if (integer7 > this.y1 || integer7 + integer8 < this.y0) {
-                this.updateItemPosition(integer6, integer1, integer7, float5);
-            }
-            if (this.renderSelection && this.isSelectedItem(integer6)) {
-                this.renderSelected(this.width, integer7, integer8, Tezzelator.instance);
-            }
-            this.renderItem(integer6, integer1, integer7, integer8, integer3, integer4, float5);
-        }
-    }
-    
-    public int y0() {
-        return this.y0;
-    }
-    
-    public int y1() {
-        return this.y1;
-    }
-    
-    public int headerHeight() {
-        return this.headerHeight;
-    }
-    
-    public double yo() {
-        return this.yo;
-    }
-    
-    public int itemHeight() {
-        return this.itemHeight;
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsConfirmResultListener.java b/src/net/minecraft/realms/RealmsConfirmResultListener.java
deleted file mode 100644
index 8e511a7..0000000
--- a/src/net/minecraft/realms/RealmsConfirmResultListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package net.minecraft.realms;
-
-public interface RealmsConfirmResultListener {
-    void confirmResult(final boolean boolean1, final int integer);
-}
diff --git a/src/net/minecraft/realms/RealmsConnect.java b/src/net/minecraft/realms/RealmsConnect.java
index 1ced6f4..f37a515 100644
--- a/src/net/minecraft/realms/RealmsConnect.java
+++ b/src/net/minecraft/realms/RealmsConnect.java
@@ -9,26 +9,28 @@ import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
 import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.PacketListener;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
-import net.minecraft.client.Minecraft;
 import java.net.InetAddress;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.Minecraft;
 import net.minecraft.network.Connection;
+import net.minecraft.client.gui.screens.Screen;
 import org.apache.logging.log4j.Logger;
 
 public class RealmsConnect {
     private static final Logger LOGGER;
-    private final RealmsScreen onlineScreen;
+    private final Screen onlineScreen;
     private volatile boolean aborted;
     private Connection connection;
     
-    public RealmsConnect(final RealmsScreen realmsScreen) {
-        this.onlineScreen = realmsScreen;
+    public RealmsConnect(final Screen dqs) {
+        this.onlineScreen = dqs;
     }
     
     public void connect(final String string, final int integer) {
-        Realms.setConnectedToRealms(true);
-        Realms.narrateNow(Realms.getLocalizedString("mco.connect.success"));
+        final Minecraft dlx4 = Minecraft.getInstance();
+        dlx4.setConnectedToRealms(true);
+        NarrationHelper.now(I18n.get("mco.connect.success"));
         new Thread("Realms-connect-task") {
             @Override
             public void run() {
@@ -38,11 +40,11 @@ public class RealmsConnect {
                     if (RealmsConnect.this.aborted) {
                         return;
                     }
-                    RealmsConnect.this.connection = Connection.connectToServer(inetAddress2, integer, Minecraft.getInstance().options.useNativeTransport());
+                    RealmsConnect.this.connection = Connection.connectToServer(inetAddress2, integer, dlx4.options.useNativeTransport());
                     if (RealmsConnect.this.aborted) {
                         return;
                     }
-                    RealmsConnect.this.connection.setListener(new ClientHandshakePacketListenerImpl(RealmsConnect.this.connection, Minecraft.getInstance(), RealmsConnect.this.onlineScreen.getProxy(), lf -> {}));
+                    RealmsConnect.this.connection.setListener(new ClientHandshakePacketListenerImpl(RealmsConnect.this.connection, dlx4, RealmsConnect.this.onlineScreen, mr -> {}));
                     if (RealmsConnect.this.aborted) {
                         return;
                     }
@@ -50,18 +52,19 @@ public class RealmsConnect {
                     if (RealmsConnect.this.aborted) {
                         return;
                     }
-                    RealmsConnect.this.connection.send(new ServerboundHelloPacket(Minecraft.getInstance().getUser().getGameProfile()));
+                    RealmsConnect.this.connection.send(new ServerboundHelloPacket(dlx4.getUser().getGameProfile()));
                 }
                 catch (UnknownHostException unknownHostException3) {
-                    Realms.clearResourcePack();
+                    dlx4.getClientPackSource().clearServerPack();
                     if (RealmsConnect.this.aborted) {
                         return;
                     }
                     RealmsConnect.LOGGER.error("Couldn't connect to world", (Throwable)unknownHostException3);
-                    Realms.setScreen(new DisconnectedRealmsScreen(RealmsConnect.this.onlineScreen, "connect.failed", new TranslatableComponent("disconnect.genericReason", new Object[] { "Unknown host '" + string + "'" })));
+                    final DisconnectedRealmsScreen eqb4 = new DisconnectedRealmsScreen(RealmsConnect.this.onlineScreen, "connect.failed", new TranslatableComponent("disconnect.genericReason", new Object[] { "Unknown host '" + string + "'" }));
+                    dlx4.execute(() -> dlx4.setScreen(eqb4));
                 }
                 catch (Exception exception3) {
-                    Realms.clearResourcePack();
+                    dlx4.getClientPackSource().clearServerPack();
                     if (RealmsConnect.this.aborted) {
                         return;
                     }
@@ -71,7 +74,8 @@ public class RealmsConnect {
                         final String string5 = inetAddress2 + ":" + integer;
                         string4 = string4.replaceAll(string5, "");
                     }
-                    Realms.setScreen(new DisconnectedRealmsScreen(RealmsConnect.this.onlineScreen, "connect.failed", new TranslatableComponent("disconnect.genericReason", new Object[] { string4 })));
+                    final DisconnectedRealmsScreen eqb5 = new DisconnectedRealmsScreen(RealmsConnect.this.onlineScreen, "connect.failed", new TranslatableComponent("disconnect.genericReason", new Object[] { string4 }));
+                    dlx4.execute(() -> dlx4.setScreen(eqb5));
                 }
             }
         }.start();
@@ -80,7 +84,7 @@ public class RealmsConnect {
     public void abort() {
         this.aborted = true;
         if (this.connection != null && this.connection.isConnected()) {
-            this.connection.disconnect(new TranslatableComponent("disconnect.genericReason", new Object[0]));
+            this.connection.disconnect(new TranslatableComponent("disconnect.genericReason"));
             this.connection.handleDisconnection();
         }
     }
diff --git a/src/net/minecraft/realms/RealmsDefaultVertexFormat.java b/src/net/minecraft/realms/RealmsDefaultVertexFormat.java
deleted file mode 100644
index f2f8bb7..0000000
--- a/src/net/minecraft/realms/RealmsDefaultVertexFormat.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.minecraft.realms;
-
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-
-public class RealmsDefaultVertexFormat {
-    public static final RealmsVertexFormat POSITION_COLOR;
-    public static final RealmsVertexFormat POSITION_TEX_COLOR;
-    
-    static {
-        POSITION_COLOR = new RealmsVertexFormat(DefaultVertexFormat.POSITION_COLOR);
-        POSITION_TEX_COLOR = new RealmsVertexFormat(DefaultVertexFormat.POSITION_TEX_COLOR);
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsEditBox.java b/src/net/minecraft/realms/RealmsEditBox.java
deleted file mode 100644
index cc0b95c..0000000
--- a/src/net/minecraft/realms/RealmsEditBox.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.EditBox;
-
-public class RealmsEditBox extends RealmsGuiEventListener {
-    private final EditBox editBox;
-    
-    public RealmsEditBox(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final String string) {
-        this.editBox = new EditBox(Minecraft.getInstance().font, integer2, integer3, integer4, integer5, null, string);
-    }
-    
-    public String getValue() {
-        return this.editBox.getValue();
-    }
-    
-    public void tick() {
-        this.editBox.tick();
-    }
-    
-    public void setValue(final String string) {
-        this.editBox.setValue(string);
-    }
-    
-    @Override
-    public boolean charTyped(final char character, final int integer) {
-        return this.editBox.charTyped(character, integer);
-    }
-    
-    @Override
-    public GuiEventListener getProxy() {
-        return this.editBox;
-    }
-    
-    @Override
-    public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
-        return this.editBox.keyPressed(integer1, integer2, integer3);
-    }
-    
-    public boolean isFocused() {
-        return this.editBox.isFocused();
-    }
-    
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return this.editBox.mouseClicked(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseReleased(final double double1, final double double2, final int integer) {
-        return this.editBox.mouseReleased(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
-        return this.editBox.mouseDragged(double1, double2, integer, double4, double5);
-    }
-    
-    @Override
-    public boolean mouseScrolled(final double double1, final double double2, final double double3) {
-        return this.editBox.mouseScrolled(double1, double2, double3);
-    }
-    
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.editBox.render(integer1, integer2, float3);
-    }
-    
-    public void setMaxLength(final int integer) {
-        this.editBox.setMaxLength(integer);
-    }
-    
-    public void setIsEditable(final boolean boolean1) {
-        this.editBox.setEditable(boolean1);
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsGuiEventListener.java b/src/net/minecraft/realms/RealmsGuiEventListener.java
deleted file mode 100644
index 8bd2f9a..0000000
--- a/src/net/minecraft/realms/RealmsGuiEventListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.gui.components.events.GuiEventListener;
-
-public abstract class RealmsGuiEventListener {
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return false;
-    }
-    
-    public boolean mouseReleased(final double double1, final double double2, final int integer) {
-        return false;
-    }
-    
-    public boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
-        return false;
-    }
-    
-    public boolean mouseScrolled(final double double1, final double double2, final double double3) {
-        return false;
-    }
-    
-    public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
-        return false;
-    }
-    
-    public boolean keyReleased(final int integer1, final int integer2, final int integer3) {
-        return false;
-    }
-    
-    public boolean charTyped(final char character, final int integer) {
-        return false;
-    }
-    
-    public abstract GuiEventListener getProxy();
-}
diff --git a/src/net/minecraft/realms/RealmsLabel.java b/src/net/minecraft/realms/RealmsLabel.java
index 57d7b64..e40d884 100644
--- a/src/net/minecraft/realms/RealmsLabel.java
+++ b/src/net/minecraft/realms/RealmsLabel.java
@@ -1,32 +1,30 @@
 package net.minecraft.realms;
 
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.client.Minecraft;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 
-public class RealmsLabel extends RealmsGuiEventListener {
-    private final RealmsLabelProxy proxy;
-    private final String text;
+public class RealmsLabel implements GuiEventListener {
+    private final Component text;
     private final int x;
     private final int y;
     private final int color;
     
-    public RealmsLabel(final String string, final int integer2, final int integer3, final int integer4) {
-        this.proxy = new RealmsLabelProxy(this);
-        this.text = string;
+    public RealmsLabel(final Component mr, final int integer2, final int integer3, final int integer4) {
+        this.text = mr;
         this.x = integer2;
         this.y = integer3;
         this.color = integer4;
     }
     
-    public void render(final RealmsScreen realmsScreen) {
-        realmsScreen.drawCenteredString(this.text, this.x, this.y, this.color);
-    }
-    
-    @Override
-    public GuiEventListener getProxy() {
-        return this.proxy;
+    public void render(final Screen dqs, final PoseStack dhl) {
+        dqs.drawCenteredString(dhl, Minecraft.getInstance().font, this.text, this.x, this.y, this.color);
     }
     
     public String getText() {
-        return this.text;
+        return this.text.getString();
     }
 }
diff --git a/src/net/minecraft/realms/RealmsLabelProxy.java b/src/net/minecraft/realms/RealmsLabelProxy.java
deleted file mode 100644
index 3c5419d..0000000
--- a/src/net/minecraft/realms/RealmsLabelProxy.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.gui.components.events.GuiEventListener;
-
-public class RealmsLabelProxy implements GuiEventListener {
-    private final RealmsLabel label;
-    
-    public RealmsLabelProxy(final RealmsLabel realmsLabel) {
-        this.label = realmsLabel;
-    }
-    
-    public RealmsLabel getLabel() {
-        return this.label;
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsLevelSummary.java b/src/net/minecraft/realms/RealmsLevelSummary.java
deleted file mode 100644
index b49b123..0000000
--- a/src/net/minecraft/realms/RealmsLevelSummary.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.world.level.storage.LevelSummary;
-
-public class RealmsLevelSummary implements Comparable<RealmsLevelSummary> {
-    private final LevelSummary levelSummary;
-    
-    public RealmsLevelSummary(final LevelSummary crq) {
-        this.levelSummary = crq;
-    }
-    
-    public int getGameMode() {
-        return this.levelSummary.getGameMode().getId();
-    }
-    
-    public String getLevelId() {
-        return this.levelSummary.getLevelId();
-    }
-    
-    public boolean hasCheats() {
-        return this.levelSummary.hasCheats();
-    }
-    
-    public boolean isHardcore() {
-        return this.levelSummary.isHardcore();
-    }
-    
-    public boolean isRequiresConversion() {
-        return this.levelSummary.isRequiresConversion();
-    }
-    
-    public String getLevelName() {
-        return this.levelSummary.getLevelName();
-    }
-    
-    public long getLastPlayed() {
-        return this.levelSummary.getLastPlayed();
-    }
-    
-    public int compareTo(final LevelSummary crq) {
-        return this.levelSummary.compareTo(crq);
-    }
-    
-    public long getSizeOnDisk() {
-        return this.levelSummary.getSizeOnDisk();
-    }
-    
-    @Override
-    public int compareTo(final RealmsLevelSummary realmsLevelSummary) {
-        if (this.levelSummary.getLastPlayed() < realmsLevelSummary.getLastPlayed()) {
-            return 1;
-        }
-        if (this.levelSummary.getLastPlayed() > realmsLevelSummary.getLastPlayed()) {
-            return -1;
-        }
-        return this.levelSummary.getLevelId().compareTo(realmsLevelSummary.getLevelId());
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsMth.java b/src/net/minecraft/realms/RealmsMth.java
deleted file mode 100644
index b54acbd..0000000
--- a/src/net/minecraft/realms/RealmsMth.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package net.minecraft.realms;
-
-import org.apache.commons.lang3.StringUtils;
-import java.util.Random;
-import net.minecraft.util.Mth;
-
-public class RealmsMth {
-    public static float sin(final float float1) {
-        return Mth.sin(float1);
-    }
-    
-    public static double nextDouble(final Random random, final double double2, final double double3) {
-        return Mth.nextDouble(random, double2, double3);
-    }
-    
-    public static int ceil(final float float1) {
-        return Mth.ceil(float1);
-    }
-    
-    public static int floor(final double double1) {
-        return Mth.floor(double1);
-    }
-    
-    public static int intFloorDiv(final int integer1, final int integer2) {
-        return Mth.intFloorDiv(integer1, integer2);
-    }
-    
-    public static float abs(final float float1) {
-        return Mth.abs(float1);
-    }
-    
-    public static int clamp(final int integer1, final int integer2, final int integer3) {
-        return Mth.clamp(integer1, integer2, integer3);
-    }
-    
-    public static double clampedLerp(final double double1, final double double2, final double double3) {
-        return Mth.clampedLerp(double1, double2, double3);
-    }
-    
-    public static int ceil(final double double1) {
-        return Mth.ceil(double1);
-    }
-    
-    public static boolean isEmpty(final String string) {
-        return StringUtils.isEmpty((CharSequence)string);
-    }
-    
-    public static long lfloor(final double double1) {
-        return Mth.lfloor(double1);
-    }
-    
-    public static float sqrt(final double double1) {
-        return Mth.sqrt(double1);
-    }
-    
-    public static double clamp(final double double1, final double double2, final double double3) {
-        return Mth.clamp(double1, double2, double3);
-    }
-    
-    public static int getInt(final String string, final int integer) {
-        return Mth.getInt(string, integer);
-    }
-    
-    public static double getDouble(final String string, final double double2) {
-        return Mth.getDouble(string, double2);
-    }
-    
-    public static int log2(final int integer) {
-        return Mth.log2(integer);
-    }
-    
-    public static int absFloor(final double double1) {
-        return Mth.absFloor(double1);
-    }
-    
-    public static int smallestEncompassingPowerOfTwo(final int integer) {
-        return Mth.smallestEncompassingPowerOfTwo(integer);
-    }
-    
-    public static float sqrt(final float float1) {
-        return Mth.sqrt(float1);
-    }
-    
-    public static float cos(final float float1) {
-        return Mth.cos(float1);
-    }
-    
-    public static int getInt(final String string, final int integer2, final int integer3) {
-        return Mth.getInt(string, integer2, integer3);
-    }
-    
-    public static int fastFloor(final double double1) {
-        return Mth.fastFloor(double1);
-    }
-    
-    public static double absMax(final double double1, final double double2) {
-        return Mth.absMax(double1, double2);
-    }
-    
-    public static float nextFloat(final Random random, final float float2, final float float3) {
-        return Mth.nextFloat(random, float2, float3);
-    }
-    
-    public static double wrapDegrees(final double double1) {
-        return Mth.wrapDegrees(double1);
-    }
-    
-    public static float wrapDegrees(final float float1) {
-        return Mth.wrapDegrees(float1);
-    }
-    
-    public static float clamp(final float float1, final float float2, final float float3) {
-        return Mth.clamp(float1, float2, float3);
-    }
-    
-    public static double getDouble(final String string, final double double2, final double double3) {
-        return Mth.getDouble(string, double2, double3);
-    }
-    
-    public static int roundUp(final int integer1, final int integer2) {
-        return Mth.roundUp(integer1, integer2);
-    }
-    
-    public static double average(final long[] arr) {
-        return Mth.average(arr);
-    }
-    
-    public static int floor(final float float1) {
-        return Mth.floor(float1);
-    }
-    
-    public static int abs(final int integer) {
-        return Mth.abs(integer);
-    }
-    
-    public static int nextInt(final Random random, final int integer2, final int integer3) {
-        return Mth.nextInt(random, integer2, integer3);
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsObjectSelectionList.java b/src/net/minecraft/realms/RealmsObjectSelectionList.java
index 53868f6..c1f7852 100644
--- a/src/net/minecraft/realms/RealmsObjectSelectionList.java
+++ b/src/net/minecraft/realms/RealmsObjectSelectionList.java
@@ -1,131 +1,65 @@
 package net.minecraft.realms;
 
+import net.minecraft.client.gui.components.AbstractSelectionList;
 import java.util.Collection;
-import java.util.List;
-import javax.annotation.Nullable;
-import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.ObjectSelectionList;
 
-public abstract class RealmsObjectSelectionList<E extends RealmListEntry> extends RealmsGuiEventListener {
-    private final RealmsObjectSelectionListProxy proxy;
-    
-    public RealmsObjectSelectionList(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-        this.proxy = new RealmsObjectSelectionListProxy(this, integer1, integer2, integer3, integer4, integer5);
+public abstract class RealmsObjectSelectionList<E extends Entry<E>> extends ObjectSelectionList<E> {
+    protected RealmsObjectSelectionList(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
+        super(Minecraft.getInstance(), integer1, integer2, integer3, integer4, integer5);
     }
     
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.proxy.render(integer1, integer2, float3);
+    public void setSelectedItem(final int integer) {
+        if (integer == -1) {
+            this.setSelected(null);
+        }
+        else if (super.getItemCount() != 0) {
+            this.setSelected(this.getEntry(integer));
+        }
     }
     
-    public void addEntry(final E realmListEntry) {
-        this.proxy.addEntry(realmListEntry);
-    }
-    
-    public void remove(final int integer) {
-        this.proxy.remove(integer);
-    }
-    
-    public void clear() {
-        this.proxy.clear();
-    }
-    
-    public boolean removeEntry(final E realmListEntry) {
-        return this.proxy.removeEntry(realmListEntry);
-    }
-    
-    public int width() {
-        return this.proxy.getWidth();
-    }
-    
-    protected void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final Tezzelator tezzelator, final int integer6, final int integer7) {
-    }
-    
-    public void setLeftPos(final int integer) {
-        this.proxy.setLeftPos(integer);
-    }
-    
-    public void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.renderItem(integer1, integer2, integer3, integer4, Tezzelator.instance, integer5, integer6);
-    }
-    
-    public void setSelected(final int integer) {
-        this.proxy.setSelectedItem(integer);
+    public void selectItem(final int integer) {
+        this.setSelectedItem(integer);
     }
     
     public void itemClicked(final int integer1, final int integer2, final double double3, final double double4, final int integer5) {
     }
     
-    public int getItemCount() {
-        return this.proxy.getItemCount();
-    }
-    
-    public void renderBackground() {
-    }
-    
     public int getMaxPosition() {
         return 0;
     }
     
     public int getScrollbarPosition() {
-        return this.proxy.getRowLeft() + this.proxy.getRowWidth();
-    }
-    
-    public int y0() {
-        return this.proxy.y0();
-    }
-    
-    public int y1() {
-        return this.proxy.y1();
-    }
-    
-    public int headerHeight() {
-        return this.proxy.headerHeight();
-    }
-    
-    public int itemHeight() {
-        return this.proxy.itemHeight();
-    }
-    
-    public void scroll(final int integer) {
-        this.proxy.setScrollAmount(integer);
-    }
-    
-    public int getScroll() {
-        return (int)this.proxy.getScrollAmount();
+        return this.getRowLeft() + this.getRowWidth();
     }
     
     @Override
-    public GuiEventListener getProxy() {
-        return this.proxy;
-    }
-    
     public int getRowWidth() {
-        return (int)(this.width() * 0.6);
-    }
-    
-    public abstract boolean isFocused();
-    
-    public void selectItem(final int integer) {
-        this.setSelected(integer);
-    }
-    
-    @Nullable
-    public E getSelected() {
-        return (E)this.proxy.getSelected();
-    }
-    
-    public List<E> children() {
-        return (List<E>)this.proxy.children();
+        return (int)(this.width * 0.6);
     }
     
     public void replaceEntries(final Collection<E> collection) {
-        this.proxy.replaceEntries(collection);
+        super.replaceEntries(collection);
+    }
+    
+    public int getItemCount() {
+        return super.getItemCount();
     }
     
     public int getRowTop(final int integer) {
-        return this.proxy.getRowTop(integer);
+        return super.getRowTop(integer);
     }
     
     public int getRowLeft() {
-        return this.proxy.getRowLeft();
+        return super.getRowLeft();
+    }
+    
+    public int addEntry(final E a) {
+        return super.addEntry(a);
+    }
+    
+    public void clear() {
+        this.clearEntries();
     }
 }
diff --git a/src/net/minecraft/realms/RealmsObjectSelectionListProxy.java b/src/net/minecraft/realms/RealmsObjectSelectionListProxy.java
deleted file mode 100644
index 8565072..0000000
--- a/src/net/minecraft/realms/RealmsObjectSelectionListProxy.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.gui.components.AbstractSelectionList;
-import java.util.Collection;
-import javax.annotation.Nullable;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.ObjectSelectionList;
-
-public class RealmsObjectSelectionListProxy<E extends Entry<E>> extends ObjectSelectionList<E> {
-    private final RealmsObjectSelectionList realmsObjectSelectionList;
-    
-    public RealmsObjectSelectionListProxy(final RealmsObjectSelectionList realmsObjectSelectionList, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        super(Minecraft.getInstance(), integer2, integer3, integer4, integer5, integer6);
-        this.realmsObjectSelectionList = realmsObjectSelectionList;
-    }
-    
-    public int getItemCount() {
-        return super.getItemCount();
-    }
-    
-    public void clear() {
-        super.clearEntries();
-    }
-    
-    public boolean isFocused() {
-        return this.realmsObjectSelectionList.isFocused();
-    }
-    
-    protected void setSelectedItem(final int integer) {
-        if (integer == -1) {
-            super.setSelected(null);
-        }
-        else if (super.getItemCount() != 0) {
-            final E a3 = super.getEntry(integer);
-            super.setSelected(a3);
-        }
-    }
-    
-    @Override
-    public void setSelected(@Nullable final E a) {
-        super.setSelected(a);
-        this.realmsObjectSelectionList.selectItem(super.children().indexOf(a));
-    }
-    
-    public void renderBackground() {
-        this.realmsObjectSelectionList.renderBackground();
-    }
-    
-    public int getWidth() {
-        return this.width;
-    }
-    
-    public int getMaxPosition() {
-        return this.realmsObjectSelectionList.getMaxPosition();
-    }
-    
-    public int getScrollbarPosition() {
-        return this.realmsObjectSelectionList.getScrollbarPosition();
-    }
-    
-    @Override
-    public boolean mouseScrolled(final double double1, final double double2, final double double3) {
-        return this.realmsObjectSelectionList.mouseScrolled(double1, double2, double3) || super.mouseScrolled(double1, double2, double3);
-    }
-    
-    @Override
-    public int getRowWidth() {
-        return this.realmsObjectSelectionList.getRowWidth();
-    }
-    
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return this.realmsObjectSelectionList.mouseClicked(double1, double2, integer) || AbstractSelectionList.this.mouseClicked(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseReleased(final double double1, final double double2, final int integer) {
-        return this.realmsObjectSelectionList.mouseReleased(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
-        return this.realmsObjectSelectionList.mouseDragged(double1, double2, integer, double4, double5) || super.mouseDragged(double1, double2, integer, double4, double5);
-    }
-    
-    @Override
-    protected final int addEntry(final E a) {
-        return super.addEntry(a);
-    }
-    
-    public E remove(final int integer) {
-        return super.remove(integer);
-    }
-    
-    public boolean removeEntry(final E a) {
-        return super.removeEntry(a);
-    }
-    
-    @Override
-    public void setScrollAmount(final double double1) {
-        super.setScrollAmount(double1);
-    }
-    
-    public int y0() {
-        return this.y0;
-    }
-    
-    public int y1() {
-        return this.y1;
-    }
-    
-    public int headerHeight() {
-        return this.headerHeight;
-    }
-    
-    public int itemHeight() {
-        return this.itemHeight;
-    }
-    
-    @Override
-    public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
-        return super.keyPressed(integer1, integer2, integer3) || this.realmsObjectSelectionList.keyPressed(integer1, integer2, integer3);
-    }
-    
-    public void replaceEntries(final Collection<E> collection) {
-        super.replaceEntries(collection);
-    }
-    
-    public int getRowTop(final int integer) {
-        return super.getRowTop(integer);
-    }
-    
-    public int getRowLeft() {
-        return super.getRowLeft();
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsScreen.java b/src/net/minecraft/realms/RealmsScreen.java
index 9585832..4ed9315 100644
--- a/src/net/minecraft/realms/RealmsScreen.java
+++ b/src/net/minecraft/realms/RealmsScreen.java
@@ -1,226 +1,36 @@
 package net.minecraft.realms;
 
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import com.mojang.blaze3d.platform.InputConstants;
-import net.minecraft.client.resources.language.I18n;
-import java.util.Iterator;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.List;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.client.Minecraft;
+import java.util.Iterator;
+import net.minecraft.client.gui.components.TickableWidget;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.chat.NarratorChatListener;
+import net.minecraft.client.gui.screens.Screen;
 
-public abstract class RealmsScreen extends RealmsGuiEventListener implements RealmsConfirmResultListener {
-    public static final int SKIN_HEAD_U = 8;
-    public static final int SKIN_HEAD_V = 8;
-    public static final int SKIN_HEAD_WIDTH = 8;
-    public static final int SKIN_HEAD_HEIGHT = 8;
-    public static final int SKIN_HAT_U = 40;
-    public static final int SKIN_HAT_V = 8;
-    public static final int SKIN_HAT_WIDTH = 8;
-    public static final int SKIN_HAT_HEIGHT = 8;
-    public static final int SKIN_TEX_WIDTH = 64;
-    public static final int SKIN_TEX_HEIGHT = 64;
-    private Minecraft minecraft;
-    public int width;
-    public int height;
-    private final RealmsScreenProxy proxy;
-    
+public abstract class RealmsScreen extends Screen {
     public RealmsScreen() {
-        this.proxy = new RealmsScreenProxy(this);
+        super(NarratorChatListener.NO_TITLE);
+    }
+    
+    protected static int row(final int integer) {
+        return 40 + integer * 13;
     }
     
     @Override
-    public RealmsScreenProxy getProxy() {
-        return this.proxy;
-    }
-    
-    public void init() {
-    }
-    
-    public void init(final Minecraft dbn, final int integer2, final int integer3) {
-        this.minecraft = dbn;
-    }
-    
-    public void drawCenteredString(final String string, final int integer2, final int integer3, final int integer4) {
-        this.proxy.drawCenteredString(string, integer2, integer3, integer4);
-    }
-    
-    public int draw(final String string, final int integer2, final int integer3, final int integer4, final boolean boolean5) {
-        return this.proxy.draw(string, integer2, integer3, integer4, boolean5);
-    }
-    
-    public void drawString(final String string, final int integer2, final int integer3, final int integer4) {
-        this.drawString(string, integer2, integer3, integer4, true);
-    }
-    
-    public void drawString(final String string, final int integer2, final int integer3, final int integer4, final boolean boolean5) {
-        this.proxy.drawString(string, integer2, integer3, integer4, false);
-    }
-    
-    public void blit(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.proxy.blit(integer1, integer2, integer3, integer4, integer5, integer6);
-    }
-    
-    public static void blit(final int integer1, final int integer2, final float float3, final float float4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final int integer10) {
-        GuiComponent.blit(integer1, integer2, integer7, integer8, float3, float4, integer5, integer6, integer9, integer10);
-    }
-    
-    public static void blit(final int integer1, final int integer2, final float float3, final float float4, final int integer5, final int integer6, final int integer7, final int integer8) {
-        GuiComponent.blit(integer1, integer2, float3, float4, integer5, integer6, integer7, integer8);
-    }
-    
-    public void fillGradient(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.proxy.fillGradient(integer1, integer2, integer3, integer4, integer5, integer6);
-    }
-    
-    public void renderBackground() {
-        this.proxy.renderBackground();
-    }
-    
-    public boolean isPauseScreen() {
-        return this.proxy.isPauseScreen();
-    }
-    
-    public void renderBackground(final int integer) {
-        this.proxy.renderBackground(integer);
-    }
-    
-    public void render(final int integer1, final int integer2, final float float3) {
-        for (int integer3 = 0; integer3 < this.proxy.buttons().size(); ++integer3) {
-            this.proxy.buttons().get(integer3).render(integer1, integer2, float3);
-        }
-    }
-    
-    public void renderTooltip(final ItemStack ben, final int integer2, final int integer3) {
-        this.proxy.renderTooltip(ben, integer2, integer3);
-    }
-    
-    public void renderTooltip(final String string, final int integer2, final int integer3) {
-        this.proxy.renderTooltip(string, integer2, integer3);
-    }
-    
-    public void renderTooltip(final List<String> list, final int integer2, final int integer3) {
-        this.proxy.renderTooltip(list, integer2, integer3);
-    }
-    
-    public static void bind(final String string) {
-        Realms.bind(string);
-    }
-    
     public void tick() {
-        this.tickButtons();
-    }
-    
-    protected void tickButtons() {
-        for (final AbstractRealmsButton<?> abstractRealmsButton3 : this.buttons()) {
-            abstractRealmsButton3.tick();
+        for (final AbstractWidget dng3 : this.buttons) {
+            if (dng3 instanceof TickableWidget) {
+                ((TickableWidget)dng3).tick();
+            }
         }
     }
     
-    public int width() {
-        return this.proxy.width;
-    }
-    
-    public int height() {
-        return this.proxy.height;
-    }
-    
-    public int fontLineHeight() {
-        return this.proxy.fontLineHeight();
-    }
-    
-    public int fontWidth(final String string) {
-        return this.proxy.fontWidth(string);
-    }
-    
-    public void fontDrawShadow(final String string, final int integer2, final int integer3, final int integer4) {
-        this.proxy.fontDrawShadow(string, integer2, integer3, integer4);
-    }
-    
-    public List<String> fontSplit(final String string, final int integer) {
-        return this.proxy.fontSplit(string, integer);
-    }
-    
-    public void childrenClear() {
-        this.proxy.childrenClear();
-    }
-    
-    public void addWidget(final RealmsGuiEventListener realmsGuiEventListener) {
-        this.proxy.addWidget(realmsGuiEventListener);
-    }
-    
-    public void removeWidget(final RealmsGuiEventListener realmsGuiEventListener) {
-        this.proxy.removeWidget(realmsGuiEventListener);
-    }
-    
-    public boolean hasWidget(final RealmsGuiEventListener realmsGuiEventListener) {
-        return this.proxy.hasWidget(realmsGuiEventListener);
-    }
-    
-    public void buttonsAdd(final AbstractRealmsButton<?> abstractRealmsButton) {
-        this.proxy.buttonsAdd(abstractRealmsButton);
-    }
-    
-    public List<AbstractRealmsButton<?>> buttons() {
-        return this.proxy.buttons();
-    }
-    
-    protected void buttonsClear() {
-        this.proxy.buttonsClear();
-    }
-    
-    protected void focusOn(final RealmsGuiEventListener realmsGuiEventListener) {
-        this.proxy.magicalSpecialHackyFocus(realmsGuiEventListener.getProxy());
-    }
-    
-    public RealmsEditBox newEditBox(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-        return this.newEditBox(integer1, integer2, integer3, integer4, integer5, "");
-    }
-    
-    public RealmsEditBox newEditBox(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final String string) {
-        return new RealmsEditBox(integer1, integer2, integer3, integer4, integer5, string);
-    }
-    
-    @Override
-    public void confirmResult(final boolean boolean1, final int integer) {
-    }
-    
-    public static String getLocalizedString(final String string) {
-        return Realms.getLocalizedString(string);
-    }
-    
-    public static String getLocalizedString(final String string, final Object... arr) {
-        return Realms.getLocalizedString(string, arr);
-    }
-    
-    public List<String> getLocalizedStringWithLineWidth(final String string, final int integer) {
-        return this.minecraft.font.split(I18n.get(string), integer);
-    }
-    
-    public RealmsAnvilLevelStorageSource getLevelStorageSource() {
-        return new RealmsAnvilLevelStorageSource(Minecraft.getInstance().getLevelSource());
-    }
-    
-    public void removed() {
-    }
-    
-    protected void removeButton(final RealmsButton realmsButton) {
-        this.proxy.removeButton(realmsButton);
-    }
-    
-    protected void setKeyboardHandlerSendRepeatsToGui(final boolean boolean1) {
-        this.minecraft.keyboardHandler.setSendRepeatsToGui(boolean1);
-    }
-    
-    protected boolean isKeyDown(final int integer) {
-        return InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), integer);
-    }
-    
-    protected void narrateLabels() {
-        this.getProxy().narrateLabels();
-    }
-    
-    public boolean isFocused(final RealmsGuiEventListener realmsGuiEventListener) {
-        return this.getProxy().getFocused() == realmsGuiEventListener.getProxy();
+    public void narrateLabels() {
+        final List<String> list2 = this.children.stream().filter(RealmsLabel.class::isInstance).map(RealmsLabel.class::cast).map(RealmsLabel::getText).collect(Collectors.toList());
+        NarrationHelper.now(list2);
     }
 }
diff --git a/src/net/minecraft/realms/RealmsScreenProxy.java b/src/net/minecraft/realms/RealmsScreenProxy.java
deleted file mode 100644
index e1b1cb3..0000000
--- a/src/net/minecraft/realms/RealmsScreenProxy.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package net.minecraft.realms;
-
-import org.apache.logging.log4j.LogManager;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import java.util.Set;
-import java.util.function.Predicate;
-import com.google.common.collect.Sets;
-import java.util.Iterator;
-import net.minecraft.client.gui.components.AbstractWidget;
-import com.google.common.collect.Lists;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-import java.util.List;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.chat.NarratorChatListener;
-import org.apache.logging.log4j.Logger;
-import net.minecraft.client.gui.screens.Screen;
-
-public class RealmsScreenProxy extends Screen {
-    private final RealmsScreen screen;
-    private static final Logger LOGGER;
-    
-    public RealmsScreenProxy(final RealmsScreen realmsScreen) {
-        super(NarratorChatListener.NO_TITLE);
-        this.screen = realmsScreen;
-    }
-    
-    public RealmsScreen getScreen() {
-        return this.screen;
-    }
-    
-    @Override
-    public void init(final Minecraft dbn, final int integer2, final int integer3) {
-        this.screen.init(dbn, integer2, integer3);
-        super.init(dbn, integer2, integer3);
-    }
-    
-    public void init() {
-        this.screen.init();
-        super.init();
-    }
-    
-    public void drawCenteredString(final String string, final int integer2, final int integer3, final int integer4) {
-        super.drawCenteredString(this.font, string, integer2, integer3, integer4);
-    }
-    
-    public void drawString(final String string, final int integer2, final int integer3, final int integer4, final boolean boolean5) {
-        if (boolean5) {
-            super.drawString(this.font, string, integer2, integer3, integer4);
-        }
-        else {
-            this.font.draw(string, (float)integer2, (float)integer3, integer4);
-        }
-    }
-    
-    @Override
-    public void blit(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.screen.blit(integer1, integer2, integer3, integer4, integer5, integer6);
-        super.blit(integer1, integer2, integer3, integer4, integer5, integer6);
-    }
-    
-    public static void blit(final int integer1, final int integer2, final float float3, final float float4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final int integer10) {
-        GuiComponent.blit(integer1, integer2, integer7, integer8, float3, float4, integer5, integer6, integer9, integer10);
-    }
-    
-    public static void blit(final int integer1, final int integer2, final float float3, final float float4, final int integer5, final int integer6, final int integer7, final int integer8) {
-        GuiComponent.blit(integer1, integer2, float3, float4, integer5, integer6, integer7, integer8);
-    }
-    
-    public void fillGradient(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        super.fillGradient(integer1, integer2, integer3, integer4, integer5, integer6);
-    }
-    
-    @Override
-    public void renderBackground() {
-        super.renderBackground();
-    }
-    
-    @Override
-    public boolean isPauseScreen() {
-        return super.isPauseScreen();
-    }
-    
-    @Override
-    public void renderBackground(final int integer) {
-        super.renderBackground(integer);
-    }
-    
-    @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.screen.render(integer1, integer2, float3);
-    }
-    
-    public void renderTooltip(final ItemStack ben, final int integer2, final int integer3) {
-        super.renderTooltip(ben, integer2, integer3);
-    }
-    
-    @Override
-    public void renderTooltip(final String string, final int integer2, final int integer3) {
-        super.renderTooltip(string, integer2, integer3);
-    }
-    
-    @Override
-    public void renderTooltip(final List<String> list, final int integer2, final int integer3) {
-        super.renderTooltip(list, integer2, integer3);
-    }
-    
-    @Override
-    public void tick() {
-        this.screen.tick();
-        super.tick();
-    }
-    
-    public int width() {
-        return this.width;
-    }
-    
-    public int height() {
-        return this.height;
-    }
-    
-    public int fontLineHeight() {
-        this.font.getClass();
-        return 9;
-    }
-    
-    public int fontWidth(final String string) {
-        return this.font.width(string);
-    }
-    
-    public void fontDrawShadow(final String string, final int integer2, final int integer3, final int integer4) {
-        this.font.drawShadow(string, (float)integer2, (float)integer3, integer4);
-    }
-    
-    public List<String> fontSplit(final String string, final int integer) {
-        return this.font.split(string, integer);
-    }
-    
-    public void childrenClear() {
-        this.children.clear();
-    }
-    
-    public void addWidget(final RealmsGuiEventListener realmsGuiEventListener) {
-        if (this.hasWidget(realmsGuiEventListener) || !this.children.add(realmsGuiEventListener.getProxy())) {
-            RealmsScreenProxy.LOGGER.error("Tried to add the same widget multiple times: " + realmsGuiEventListener);
-        }
-    }
-    
-    public void narrateLabels() {
-        final List<String> list2 = this.children.stream().filter(dds -> dds instanceof RealmsLabelProxy).map(dds -> dds.getLabel().getText()).collect(Collectors.toList());
-        Realms.narrateNow(list2);
-    }
-    
-    public void removeWidget(final RealmsGuiEventListener realmsGuiEventListener) {
-        if (!this.hasWidget(realmsGuiEventListener) || !this.children.remove(realmsGuiEventListener.getProxy())) {
-            RealmsScreenProxy.LOGGER.error("Tried to add the same widget multiple times: " + realmsGuiEventListener);
-        }
-    }
-    
-    public boolean hasWidget(final RealmsGuiEventListener realmsGuiEventListener) {
-        return this.children.contains(realmsGuiEventListener.getProxy());
-    }
-    
-    public void buttonsAdd(final AbstractRealmsButton<?> abstractRealmsButton) {
-        this.addButton(abstractRealmsButton.getProxy());
-    }
-    
-    public List<AbstractRealmsButton<?>> buttons() {
-        final List<AbstractRealmsButton<?>> list2 = Lists.newArrayListWithExpectedSize(this.buttons.size());
-        for (final AbstractWidget dct4 : this.buttons) {
-            list2.add(((RealmsAbstractButtonProxy)dct4).getButton());
-        }
-        return list2;
-    }
-    
-    public void buttonsClear() {
-        final Set<GuiEventListener> set2 = Sets.newHashSet(this.buttons);
-        this.children.removeIf(set2::contains);
-        this.buttons.clear();
-    }
-    
-    public void removeButton(final RealmsButton realmsButton) {
-        this.children.remove(realmsButton.getProxy());
-        this.buttons.remove(realmsButton.getProxy());
-    }
-    
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return this.screen.mouseClicked(double1, double2, integer) || super.mouseClicked(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseReleased(final double double1, final double double2, final int integer) {
-        return this.screen.mouseReleased(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
-        return this.screen.mouseDragged(double1, double2, integer, double4, double5) || super.mouseDragged(double1, double2, integer, double4, double5);
-    }
-    
-    @Override
-    public boolean keyPressed(final int integer1, final int integer2, final int integer3) {
-        return this.screen.keyPressed(integer1, integer2, integer3) || super.keyPressed(integer1, integer2, integer3);
-    }
-    
-    @Override
-    public boolean charTyped(final char character, final int integer) {
-        return this.screen.charTyped(character, integer) || super.charTyped(character, integer);
-    }
-    
-    @Override
-    public void removed() {
-        this.screen.removed();
-        super.removed();
-    }
-    
-    public int draw(final String string, final int integer2, final int integer3, final int integer4, final boolean boolean5) {
-        if (boolean5) {
-            return this.font.drawShadow(string, (float)integer2, (float)integer3, integer4);
-        }
-        return this.font.draw(string, (float)integer2, (float)integer3, integer4);
-    }
-    
-    public Font getFont() {
-        return this.font;
-    }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsScrolledSelectionList.java b/src/net/minecraft/realms/RealmsScrolledSelectionList.java
deleted file mode 100644
index 1484b74..0000000
--- a/src/net/minecraft/realms/RealmsScrolledSelectionList.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.gui.components.events.GuiEventListener;
-
-public abstract class RealmsScrolledSelectionList extends RealmsGuiEventListener {
-    private final RealmsScrolledSelectionListProxy proxy;
-    
-    public RealmsScrolledSelectionList(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-        this.proxy = new RealmsScrolledSelectionListProxy(this, integer1, integer2, integer3, integer4, integer5);
-    }
-    
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.proxy.render(integer1, integer2, float3);
-    }
-    
-    public int width() {
-        return this.proxy.getWidth();
-    }
-    
-    protected void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final Tezzelator tezzelator, final int integer6, final int integer7) {
-    }
-    
-    public void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.renderItem(integer1, integer2, integer3, integer4, Tezzelator.instance, integer5, integer6);
-    }
-    
-    public int getItemCount() {
-        return 0;
-    }
-    
-    public boolean selectItem(final int integer1, final int integer2, final double double3, final double double4) {
-        return true;
-    }
-    
-    public boolean isSelectedItem(final int integer) {
-        return false;
-    }
-    
-    public void renderBackground() {
-    }
-    
-    public int getMaxPosition() {
-        return 0;
-    }
-    
-    public int getScrollbarPosition() {
-        return this.proxy.getWidth() / 2 + 124;
-    }
-    
-    public void scroll(final int integer) {
-        this.proxy.scroll(integer);
-    }
-    
-    public int getScroll() {
-        return this.proxy.getScroll();
-    }
-    
-    protected void renderList(final int integer1, final int integer2, final int integer3, final int integer4) {
-    }
-    
-    @Override
-    public GuiEventListener getProxy() {
-        return this.proxy;
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsScrolledSelectionListProxy.java b/src/net/minecraft/realms/RealmsScrolledSelectionListProxy.java
deleted file mode 100644
index cb4e7f1..0000000
--- a/src/net/minecraft/realms/RealmsScrolledSelectionListProxy.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.ScrolledSelectionList;
-
-public class RealmsScrolledSelectionListProxy extends ScrolledSelectionList {
-    private final RealmsScrolledSelectionList realmsScrolledSelectionList;
-    
-    public RealmsScrolledSelectionListProxy(final RealmsScrolledSelectionList realmsScrolledSelectionList, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        super(Minecraft.getInstance(), integer2, integer3, integer4, integer5, integer6);
-        this.realmsScrolledSelectionList = realmsScrolledSelectionList;
-    }
-    
-    public int getItemCount() {
-        return this.realmsScrolledSelectionList.getItemCount();
-    }
-    
-    public boolean selectItem(final int integer1, final int integer2, final double double3, final double double4) {
-        return this.realmsScrolledSelectionList.selectItem(integer1, integer2, double3, double4);
-    }
-    
-    public boolean isSelectedItem(final int integer) {
-        return this.realmsScrolledSelectionList.isSelectedItem(integer);
-    }
-    
-    public void renderBackground() {
-        this.realmsScrolledSelectionList.renderBackground();
-    }
-    
-    public void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final float float7) {
-        this.realmsScrolledSelectionList.renderItem(integer1, integer2, integer3, integer4, integer5, integer6);
-    }
-    
-    public int getWidth() {
-        return this.width;
-    }
-    
-    public int getMaxPosition() {
-        return this.realmsScrolledSelectionList.getMaxPosition();
-    }
-    
-    public int getScrollbarPosition() {
-        return this.realmsScrolledSelectionList.getScrollbarPosition();
-    }
-    
-    @Override
-    public boolean mouseScrolled(final double double1, final double double2, final double double3) {
-        return this.realmsScrolledSelectionList.mouseScrolled(double1, double2, double3) || super.mouseScrolled(double1, double2, double3);
-    }
-    
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return this.realmsScrolledSelectionList.mouseClicked(double1, double2, integer) || super.mouseClicked(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseReleased(final double double1, final double double2, final int integer) {
-        return this.realmsScrolledSelectionList.mouseReleased(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
-        return this.realmsScrolledSelectionList.mouseDragged(double1, double2, integer, double4, double5);
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsServerAddress.java b/src/net/minecraft/realms/RealmsServerAddress.java
index 791eb5a..14ee83c 100644
--- a/src/net/minecraft/realms/RealmsServerAddress.java
+++ b/src/net/minecraft/realms/RealmsServerAddress.java
@@ -20,7 +20,7 @@ public class RealmsServerAddress {
     }
     
     public static RealmsServerAddress parseString(final String string) {
-        final ServerAddress dnt2 = ServerAddress.parseString(string);
-        return new RealmsServerAddress(dnt2.getHost(), dnt2.getPort());
+        final ServerAddress dyr2 = ServerAddress.parseString(string);
+        return new RealmsServerAddress(dyr2.getHost(), dyr2.getPort());
     }
 }
diff --git a/src/net/minecraft/realms/RealmsSharedConstants.java b/src/net/minecraft/realms/RealmsSharedConstants.java
deleted file mode 100644
index 73193cb..0000000
--- a/src/net/minecraft/realms/RealmsSharedConstants.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.SharedConstants;
-
-public class RealmsSharedConstants {
-    public static final int TICKS_PER_SECOND = 20;
-    public static final char[] ILLEGAL_FILE_CHARACTERS;
-    
-    static {
-        ILLEGAL_FILE_CHARACTERS = SharedConstants.ILLEGAL_FILE_CHARACTERS;
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsSimpleScrolledSelectionList.java b/src/net/minecraft/realms/RealmsSimpleScrolledSelectionList.java
deleted file mode 100644
index 8e471a7..0000000
--- a/src/net/minecraft/realms/RealmsSimpleScrolledSelectionList.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.gui.components.events.GuiEventListener;
-
-public abstract class RealmsSimpleScrolledSelectionList extends RealmsGuiEventListener {
-    private final RealmsSimpleScrolledSelectionListProxy proxy;
-    
-    public RealmsSimpleScrolledSelectionList(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
-        this.proxy = new RealmsSimpleScrolledSelectionListProxy(this, integer1, integer2, integer3, integer4, integer5);
-    }
-    
-    public void render(final int integer1, final int integer2, final float float3) {
-        this.proxy.render(integer1, integer2, float3);
-    }
-    
-    public int width() {
-        return this.proxy.getWidth();
-    }
-    
-    protected void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final Tezzelator tezzelator, final int integer6, final int integer7) {
-    }
-    
-    public void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        this.renderItem(integer1, integer2, integer3, integer4, Tezzelator.instance, integer5, integer6);
-    }
-    
-    public int getItemCount() {
-        return 0;
-    }
-    
-    public boolean selectItem(final int integer1, final int integer2, final double double3, final double double4) {
-        return true;
-    }
-    
-    public boolean isSelectedItem(final int integer) {
-        return false;
-    }
-    
-    public void renderBackground() {
-    }
-    
-    public int getMaxPosition() {
-        return 0;
-    }
-    
-    public int getScrollbarPosition() {
-        return this.proxy.getWidth() / 2 + 124;
-    }
-    
-    @Override
-    public GuiEventListener getProxy() {
-        return this.proxy;
-    }
-    
-    public void scroll(final int integer) {
-        this.proxy.scroll(integer);
-    }
-    
-    public int getScroll() {
-        return this.proxy.getScroll();
-    }
-    
-    protected void renderList(final int integer1, final int integer2, final int integer3, final int integer4) {
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsSimpleScrolledSelectionListProxy.java b/src/net/minecraft/realms/RealmsSimpleScrolledSelectionListProxy.java
deleted file mode 100644
index 8234ce8..0000000
--- a/src/net/minecraft/realms/RealmsSimpleScrolledSelectionListProxy.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package net.minecraft.realms;
-
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import net.minecraft.util.Mth;
-import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.Tesselator;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.ScrolledSelectionList;
-
-public class RealmsSimpleScrolledSelectionListProxy extends ScrolledSelectionList {
-    private final RealmsSimpleScrolledSelectionList realmsSimpleScrolledSelectionList;
-    
-    public RealmsSimpleScrolledSelectionListProxy(final RealmsSimpleScrolledSelectionList realmsSimpleScrolledSelectionList, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        super(Minecraft.getInstance(), integer2, integer3, integer4, integer5, integer6);
-        this.realmsSimpleScrolledSelectionList = realmsSimpleScrolledSelectionList;
-    }
-    
-    public int getItemCount() {
-        return this.realmsSimpleScrolledSelectionList.getItemCount();
-    }
-    
-    public boolean selectItem(final int integer1, final int integer2, final double double3, final double double4) {
-        return this.realmsSimpleScrolledSelectionList.selectItem(integer1, integer2, double3, double4);
-    }
-    
-    public boolean isSelectedItem(final int integer) {
-        return this.realmsSimpleScrolledSelectionList.isSelectedItem(integer);
-    }
-    
-    public void renderBackground() {
-        this.realmsSimpleScrolledSelectionList.renderBackground();
-    }
-    
-    public void renderItem(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final float float7) {
-        this.realmsSimpleScrolledSelectionList.renderItem(integer1, integer2, integer3, integer4, integer5, integer6);
-    }
-    
-    public int getWidth() {
-        return this.width;
-    }
-    
-    public int getMaxPosition() {
-        return this.realmsSimpleScrolledSelectionList.getMaxPosition();
-    }
-    
-    public int getScrollbarPosition() {
-        return this.realmsSimpleScrolledSelectionList.getScrollbarPosition();
-    }
-    
-    @Override
-    public void render(final int integer1, final int integer2, final float float3) {
-        if (!this.visible) {
-            return;
-        }
-        this.renderBackground();
-        final int integer3 = this.getScrollbarPosition();
-        final int integer4 = integer3 + 6;
-        this.capYPosition();
-        final Tesselator cym7 = Tesselator.getInstance();
-        final BufferBuilder cyg8 = cym7.getBuilder();
-        final int integer5 = this.x0 + this.width / 2 - this.getRowWidth() / 2 + 2;
-        final int integer6 = this.y0 + 4 - (int)this.yo;
-        if (this.renderHeader) {
-            this.renderHeader(integer5, integer6, cym7);
-        }
-        this.renderList(integer5, integer6, integer1, integer2, float3);
-        RenderSystem.disableDepthTest();
-        this.renderHoleBackground(0, this.y0, 255, 255);
-        this.renderHoleBackground(this.y1, this.height, 255, 255);
-        RenderSystem.enableBlend();
-        RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
-        RenderSystem.disableAlphaTest();
-        RenderSystem.shadeModel(7425);
-        RenderSystem.disableTexture();
-        final int integer7 = this.getMaxScroll();
-        if (integer7 > 0) {
-            int integer8 = (this.y1 - this.y0) * (this.y1 - this.y0) / this.getMaxPosition();
-            integer8 = Mth.clamp(integer8, 32, this.y1 - this.y0 - 8);
-            int integer9 = (int)this.yo * (this.y1 - this.y0 - integer8) / integer7 + this.y0;
-            if (integer9 < this.y0) {
-                integer9 = this.y0;
-            }
-            cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-            cyg8.vertex(integer3, this.y1, 0.0).uv(0.0f, 1.0f).color(0, 0, 0, 255).endVertex();
-            cyg8.vertex(integer4, this.y1, 0.0).uv(1.0f, 1.0f).color(0, 0, 0, 255).endVertex();
-            cyg8.vertex(integer4, this.y0, 0.0).uv(1.0f, 0.0f).color(0, 0, 0, 255).endVertex();
-            cyg8.vertex(integer3, this.y0, 0.0).uv(0.0f, 0.0f).color(0, 0, 0, 255).endVertex();
-            cym7.end();
-            cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-            cyg8.vertex(integer3, integer9 + integer8, 0.0).uv(0.0f, 1.0f).color(128, 128, 128, 255).endVertex();
-            cyg8.vertex(integer4, integer9 + integer8, 0.0).uv(1.0f, 1.0f).color(128, 128, 128, 255).endVertex();
-            cyg8.vertex(integer4, integer9, 0.0).uv(1.0f, 0.0f).color(128, 128, 128, 255).endVertex();
-            cyg8.vertex(integer3, integer9, 0.0).uv(0.0f, 0.0f).color(128, 128, 128, 255).endVertex();
-            cym7.end();
-            cyg8.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
-            cyg8.vertex(integer3, integer9 + integer8 - 1, 0.0).uv(0.0f, 1.0f).color(192, 192, 192, 255).endVertex();
-            cyg8.vertex(integer4 - 1, integer9 + integer8 - 1, 0.0).uv(1.0f, 1.0f).color(192, 192, 192, 255).endVertex();
-            cyg8.vertex(integer4 - 1, integer9, 0.0).uv(1.0f, 0.0f).color(192, 192, 192, 255).endVertex();
-            cyg8.vertex(integer3, integer9, 0.0).uv(0.0f, 0.0f).color(192, 192, 192, 255).endVertex();
-            cym7.end();
-        }
-        this.renderDecorations(integer1, integer2);
-        RenderSystem.enableTexture();
-        RenderSystem.shadeModel(7424);
-        RenderSystem.enableAlphaTest();
-        RenderSystem.disableBlend();
-    }
-    
-    @Override
-    public boolean mouseScrolled(final double double1, final double double2, final double double3) {
-        return this.realmsSimpleScrolledSelectionList.mouseScrolled(double1, double2, double3) || super.mouseScrolled(double1, double2, double3);
-    }
-    
-    @Override
-    public boolean mouseClicked(final double double1, final double double2, final int integer) {
-        return this.realmsSimpleScrolledSelectionList.mouseClicked(double1, double2, integer) || super.mouseClicked(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseReleased(final double double1, final double double2, final int integer) {
-        return this.realmsSimpleScrolledSelectionList.mouseReleased(double1, double2, integer);
-    }
-    
-    @Override
-    public boolean mouseDragged(final double double1, final double double2, final int integer, final double double4, final double double5) {
-        return this.realmsSimpleScrolledSelectionList.mouseDragged(double1, double2, integer, double4, double5);
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsSliderButton.java b/src/net/minecraft/realms/RealmsSliderButton.java
deleted file mode 100644
index f8bf938..0000000
--- a/src/net/minecraft/realms/RealmsSliderButton.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.util.Mth;
-import net.minecraft.resources.ResourceLocation;
-
-public abstract class RealmsSliderButton extends AbstractRealmsButton<RealmsSliderButtonProxy> {
-    protected static final ResourceLocation WIDGETS_LOCATION;
-    private final int id;
-    private final RealmsSliderButtonProxy proxy;
-    private final double minValue;
-    private final double maxValue;
-    
-    public RealmsSliderButton(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final double double6, final double double7) {
-        this.id = integer1;
-        this.minValue = double6;
-        this.maxValue = double7;
-        this.proxy = new RealmsSliderButtonProxy(this, integer2, integer3, integer4, 20, this.toPct(integer5));
-        this.getProxy().setMessage(this.getMessage());
-    }
-    
-    public String getMessage() {
-        return "";
-    }
-    
-    public double toPct(final double double1) {
-        return Mth.clamp((this.clamp(double1) - this.minValue) / (this.maxValue - this.minValue), 0.0, 1.0);
-    }
-    
-    public double toValue(final double double1) {
-        return this.clamp(Mth.lerp(Mth.clamp(double1, 0.0, 1.0), this.minValue, this.maxValue));
-    }
-    
-    public double clamp(final double double1) {
-        return Mth.clamp(double1, this.minValue, this.maxValue);
-    }
-    
-    public int getYImage(final boolean boolean1) {
-        return 0;
-    }
-    
-    public void onClick(final double double1, final double double2) {
-    }
-    
-    public void onRelease(final double double1, final double double2) {
-    }
-    
-    @Override
-    public RealmsSliderButtonProxy getProxy() {
-        return this.proxy;
-    }
-    
-    public double getValue() {
-        return this.proxy.getValue();
-    }
-    
-    public void setValue(final double double1) {
-        this.proxy.setValue(double1);
-    }
-    
-    public int id() {
-        return this.id;
-    }
-    
-    public void setMessage(final String string) {
-        this.proxy.setMessage(string);
-    }
-    
-    public int getWidth() {
-        return this.proxy.getWidth();
-    }
-    
-    public int getHeight() {
-        return this.proxy.getHeight();
-    }
-    
-    public int y() {
-        return this.proxy.y();
-    }
-    
-    public abstract void applyValue();
-    
-    public void updateMessage() {
-        this.proxy.setMessage(this.getMessage());
-    }
-    
-    static {
-        WIDGETS_LOCATION = new ResourceLocation("textures/gui/widgets.png");
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsSliderButtonProxy.java b/src/net/minecraft/realms/RealmsSliderButtonProxy.java
deleted file mode 100644
index 9529601..0000000
--- a/src/net/minecraft/realms/RealmsSliderButtonProxy.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package net.minecraft.realms;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.AbstractSliderButton;
-
-public class RealmsSliderButtonProxy extends AbstractSliderButton implements RealmsAbstractButtonProxy<RealmsSliderButton> {
-    private final RealmsSliderButton button;
-    
-    public RealmsSliderButtonProxy(final RealmsSliderButton realmsSliderButton, final int integer2, final int integer3, final int integer4, final int integer5, final double double6) {
-        super(integer2, integer3, integer4, integer5, double6);
-        this.button = realmsSliderButton;
-    }
-    
-    @Override
-    public boolean active() {
-        return this.active;
-    }
-    
-    @Override
-    public void active(final boolean boolean1) {
-        this.active = boolean1;
-    }
-    
-    @Override
-    public boolean isVisible() {
-        return this.visible;
-    }
-    
-    @Override
-    public void setVisible(final boolean boolean1) {
-        this.visible = boolean1;
-    }
-    
-    @Override
-    public void setMessage(final String string) {
-        super.setMessage(string);
-    }
-    
-    @Override
-    public int getWidth() {
-        return super.getWidth();
-    }
-    
-    public int y() {
-        return this.y;
-    }
-    
-    @Override
-    public void onClick(final double double1, final double double2) {
-        this.button.onClick(double1, double2);
-    }
-    
-    @Override
-    public void onRelease(final double double1, final double double2) {
-        this.button.onRelease(double1, double2);
-    }
-    
-    public void updateMessage() {
-        this.button.updateMessage();
-    }
-    
-    public void applyValue() {
-        this.button.applyValue();
-    }
-    
-    public double getValue() {
-        return this.value;
-    }
-    
-    public void setValue(final double double1) {
-        this.value = double1;
-    }
-    
-    public void renderBg(final Minecraft dbn, final int integer2, final int integer3) {
-        super.renderBg(dbn, integer2, integer3);
-    }
-    
-    @Override
-    public RealmsSliderButton getButton() {
-        return this.button;
-    }
-    
-    public int getYImage(final boolean boolean1) {
-        return this.button.getYImage(boolean1);
-    }
-    
-    public int getSuperYImage(final boolean boolean1) {
-        return super.getYImage(boolean1);
-    }
-    
-    public int getHeight() {
-        return this.height;
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsVertexFormat.java b/src/net/minecraft/realms/RealmsVertexFormat.java
deleted file mode 100644
index 10d9c0c..0000000
--- a/src/net/minecraft/realms/RealmsVertexFormat.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package net.minecraft.realms;
-
-import com.google.common.collect.UnmodifiableIterator;
-import com.mojang.blaze3d.vertex.VertexFormatElement;
-import com.google.common.collect.Lists;
-import java.util.List;
-import com.mojang.blaze3d.vertex.VertexFormat;
-
-public class RealmsVertexFormat {
-    private VertexFormat v;
-    
-    public RealmsVertexFormat(final VertexFormat cyp) {
-        this.v = cyp;
-    }
-    
-    public VertexFormat getVertexFormat() {
-        return this.v;
-    }
-    
-    public List<RealmsVertexFormatElement> getElements() {
-        final List<RealmsVertexFormatElement> list2 = Lists.newArrayList();
-        for (final VertexFormatElement cyq4 : this.v.getElements()) {
-            list2.add(new RealmsVertexFormatElement(cyq4));
-        }
-        return list2;
-    }
-    
-    @Override
-    public boolean equals(final Object object) {
-        return this.v.equals(object);
-    }
-    
-    @Override
-    public int hashCode() {
-        return this.v.hashCode();
-    }
-    
-    @Override
-    public String toString() {
-        return this.v.toString();
-    }
-}
diff --git a/src/net/minecraft/realms/RealmsVertexFormatElement.java b/src/net/minecraft/realms/RealmsVertexFormatElement.java
deleted file mode 100644
index 12be513..0000000
--- a/src/net/minecraft/realms/RealmsVertexFormatElement.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package net.minecraft.realms;
-
-import com.mojang.blaze3d.vertex.VertexFormatElement;
-
-public class RealmsVertexFormatElement {
-    private final VertexFormatElement v;
-    
-    public RealmsVertexFormatElement(final VertexFormatElement cyq) {
-        this.v = cyq;
-    }
-    
-    public VertexFormatElement getVertexFormatElement() {
-        return this.v;
-    }
-    
-    public boolean isPosition() {
-        return this.v.isPosition();
-    }
-    
-    public int getIndex() {
-        return this.v.getIndex();
-    }
-    
-    public int getByteSize() {
-        return this.v.getByteSize();
-    }
-    
-    public int getCount() {
-        return this.v.getCount();
-    }
-    
-    @Override
-    public int hashCode() {
-        return this.v.hashCode();
-    }
-    
-    @Override
-    public boolean equals(final Object object) {
-        return this.v.equals(object);
-    }
-    
-    @Override
-    public String toString() {
-        return this.v.toString();
-    }
-}
diff --git a/src/net/minecraft/realms/RepeatedNarrator.java b/src/net/minecraft/realms/RepeatedNarrator.java
index b96d180..cf8d345 100644
--- a/src/net/minecraft/realms/RepeatedNarrator.java
+++ b/src/net/minecraft/realms/RepeatedNarrator.java
@@ -1,23 +1,21 @@
 package net.minecraft.realms;
 
 import net.minecraft.network.chat.Component;
+import net.minecraft.Util;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import com.google.common.util.concurrent.RateLimiter;
-import java.util.concurrent.atomic.AtomicReference;
 import java.time.Duration;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class RepeatedNarrator {
-    final Duration repeatDelay;
     private final float permitsPerSecond;
-    final AtomicReference<Params> params;
+    private final AtomicReference<Params> params;
     
     public RepeatedNarrator(final Duration duration) {
-        this.repeatDelay = duration;
         this.params = new AtomicReference<Params>();
-        final float float3 = duration.toMillis() / 1000.0f;
-        this.permitsPerSecond = 1.0f / float3;
+        this.permitsPerSecond = 1000.0f / duration.toMillis();
     }
     
     public void narrate(final String string) {
@@ -30,14 +28,13 @@ public class RepeatedNarrator {
             }
         });
         if (a2.rateLimiter.tryAcquire(1)) {
-            final NarratorChatListener dcm4 = NarratorChatListener.INSTANCE;
-            dcm4.handle(ChatType.SYSTEM, new TextComponent(string));
+            NarratorChatListener.INSTANCE.handle(ChatType.SYSTEM, new TextComponent(string), Util.NIL_UUID);
         }
     }
     
     static class Params {
-        String narration;
-        RateLimiter rateLimiter;
+        private final String narration;
+        private final RateLimiter rateLimiter;
         
         Params(final String string, final RateLimiter rateLimiter) {
             this.narration = string;
diff --git a/src/net/minecraft/realms/Tezzelator.java b/src/net/minecraft/realms/Tezzelator.java
deleted file mode 100644
index 773af82..0000000
--- a/src/net/minecraft/realms/Tezzelator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package net.minecraft.realms;
-
-import com.mojang.blaze3d.vertex.Tesselator;
-
-public class Tezzelator {
-    public static final Tesselator t;
-    public static final Tezzelator instance;
-    
-    public void end() {
-        Tezzelator.t.end();
-    }
-    
-    public Tezzelator vertex(final double double1, final double double2, final double double3) {
-        Tezzelator.t.getBuilder().vertex(double1, double2, double3);
-        return this;
-    }
-    
-    public void begin(final int integer, final RealmsVertexFormat realmsVertexFormat) {
-        Tezzelator.t.getBuilder().begin(integer, realmsVertexFormat.getVertexFormat());
-    }
-    
-    public void endVertex() {
-        Tezzelator.t.getBuilder().endVertex();
-    }
-    
-    public Tezzelator color(final int integer1, final int integer2, final int integer3, final int integer4) {
-        Tezzelator.t.getBuilder().color(integer1, integer2, integer3, integer4);
-        return this;
-    }
-    
-    public Tezzelator tex(final float float1, final float float2) {
-        Tezzelator.t.getBuilder().uv(float1, float2);
-        return this;
-    }
-    
-    static {
-        t = Tesselator.getInstance();
-        instance = new Tezzelator();
-    }
-}
diff --git a/src/net/minecraft/realms/pluginapi/LoadedRealmsPlugin.java b/src/net/minecraft/realms/pluginapi/LoadedRealmsPlugin.java
deleted file mode 100644
index 74d775c..0000000
--- a/src/net/minecraft/realms/pluginapi/LoadedRealmsPlugin.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package net.minecraft.realms.pluginapi;
-
-import net.minecraft.realms.RealmsScreen;
-
-public interface LoadedRealmsPlugin {
-    RealmsScreen getMainScreen(final RealmsScreen realmsScreen);
-    
-    RealmsScreen getNotificationsScreen(final RealmsScreen realmsScreen);
-}
diff --git a/src/net/minecraft/realms/pluginapi/RealmsPlugin.java b/src/net/minecraft/realms/pluginapi/RealmsPlugin.java
deleted file mode 100644
index 51d59d4..0000000
--- a/src/net/minecraft/realms/pluginapi/RealmsPlugin.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.minecraft.realms.pluginapi;
-
-import com.mojang.datafixers.util.Either;
-
-public interface RealmsPlugin {
-    Either<LoadedRealmsPlugin, String> tryLoad(final String string);
-}
diff --git a/src/net/minecraft/recipebook/PlaceRecipe.java b/src/net/minecraft/recipebook/PlaceRecipe.java
index e64c6ea..52e1367 100644
--- a/src/net/minecraft/recipebook/PlaceRecipe.java
+++ b/src/net/minecraft/recipebook/PlaceRecipe.java
@@ -6,13 +6,13 @@ import java.util.Iterator;
 import net.minecraft.world.item.crafting.Recipe;
 
 public interface PlaceRecipe<T> {
-    default void placeRecipe(final int integer1, final int integer2, final int integer3, final Recipe<?> bgw, final Iterator<T> iterator, final int integer6) {
+    default void placeRecipe(final int integer1, final int integer2, final int integer3, final Recipe<?> bmu, final Iterator<T> iterator, final int integer6) {
         int integer7 = integer1;
         int integer8 = integer2;
-        if (bgw instanceof ShapedRecipe) {
-            final ShapedRecipe bhb10 = (ShapedRecipe)bgw;
-            integer7 = bhb10.getWidth();
-            integer8 = bhb10.getHeight();
+        if (bmu instanceof ShapedRecipe) {
+            final ShapedRecipe bmz10 = (ShapedRecipe)bmu;
+            integer7 = bmz10.getWidth();
+            integer8 = bmz10.getHeight();
         }
         int integer9 = 0;
         for (int integer10 = 0; integer10 < integer2; ++integer10) {
diff --git a/src/net/minecraft/recipebook/ServerPlaceRecipe.java b/src/net/minecraft/recipebook/ServerPlaceRecipe.java
index 5ddb723..f2d5dc8 100644
--- a/src/net/minecraft/recipebook/ServerPlaceRecipe.java
+++ b/src/net/minecraft/recipebook/ServerPlaceRecipe.java
@@ -28,30 +28,30 @@ public class ServerPlaceRecipe<C extends Container> implements PlaceRecipe<Integ
     protected Inventory inventory;
     protected RecipeBookMenu<C> menu;
     
-    public ServerPlaceRecipe(final RecipeBookMenu<C> bbt) {
+    public ServerPlaceRecipe(final RecipeBookMenu<C> bhp) {
         this.stackedContents = new StackedContents();
-        this.menu = bbt;
+        this.menu = bhp;
     }
     
-    public void recipeClicked(final ServerPlayer xe, @Nullable final Recipe<C> bgw, final boolean boolean3) {
-        if (bgw == null || !xe.getRecipeBook().contains(bgw)) {
+    public void recipeClicked(final ServerPlayer ze, @Nullable final Recipe<C> bmu, final boolean boolean3) {
+        if (bmu == null || !ze.getRecipeBook().contains(bmu)) {
             return;
         }
-        this.inventory = xe.inventory;
-        if (!this.testClearGrid() && !xe.isCreative()) {
+        this.inventory = ze.inventory;
+        if (!this.testClearGrid() && !ze.isCreative()) {
             return;
         }
         this.stackedContents.clear();
-        xe.inventory.fillStackedContents(this.stackedContents);
+        ze.inventory.fillStackedContents(this.stackedContents);
         this.menu.fillCraftSlotsStackedContents(this.stackedContents);
-        if (this.stackedContents.canCraft(bgw, null)) {
-            this.handleRecipeClicked(bgw, boolean3);
+        if (this.stackedContents.canCraft(bmu, null)) {
+            this.handleRecipeClicked(bmu, boolean3);
         }
         else {
             this.clearGrid();
-            xe.connection.send(new ClientboundPlaceGhostRecipePacket(xe.containerMenu.containerId, bgw));
+            ze.connection.send(new ClientboundPlaceGhostRecipePacket(ze.containerMenu.containerId, bmu));
         }
-        xe.inventory.setChanged();
+        ze.inventory.setChanged();
     }
     
     protected void clearGrid() {
@@ -70,32 +70,32 @@ public class ServerPlaceRecipe<C extends Container> implements PlaceRecipe<Integ
     }
     
     protected void moveItemToInventory(final int integer) {
-        final ItemStack ben3 = this.menu.getSlot(integer).getItem();
-        if (ben3.isEmpty()) {
+        final ItemStack bki3 = this.menu.getSlot(integer).getItem();
+        if (bki3.isEmpty()) {
             return;
         }
-        while (ben3.getCount() > 0) {
-            int integer2 = this.inventory.getSlotWithRemainingSpace(ben3);
+        while (bki3.getCount() > 0) {
+            int integer2 = this.inventory.getSlotWithRemainingSpace(bki3);
             if (integer2 == -1) {
                 integer2 = this.inventory.getFreeSlot();
             }
-            final ItemStack ben4 = ben3.copy();
-            ben4.setCount(1);
-            if (!this.inventory.add(integer2, ben4)) {
+            final ItemStack bki4 = bki3.copy();
+            bki4.setCount(1);
+            if (!this.inventory.add(integer2, bki4)) {
                 ServerPlaceRecipe.LOGGER.error("Can't find any space for item in the inventory");
             }
             this.menu.getSlot(integer).remove(1);
         }
     }
     
-    protected void handleRecipeClicked(final Recipe<C> bgw, final boolean boolean2) {
-        final boolean boolean3 = this.menu.recipeMatches(bgw);
-        final int integer5 = this.stackedContents.getBiggestCraftableStack(bgw, null);
+    protected void handleRecipeClicked(final Recipe<C> bmu, final boolean boolean2) {
+        final boolean boolean3 = this.menu.recipeMatches(bmu);
+        final int integer5 = this.stackedContents.getBiggestCraftableStack(bmu, null);
         if (boolean3) {
             for (int integer6 = 0; integer6 < this.menu.getGridHeight() * this.menu.getGridWidth() + 1; ++integer6) {
                 if (integer6 != this.menu.getResultSlotIndex()) {
-                    final ItemStack ben7 = this.menu.getSlot(integer6).getItem();
-                    if (!ben7.isEmpty() && Math.min(integer5, ben7.getMaxStackSize()) < ben7.getCount() + 1) {
+                    final ItemStack bki7 = this.menu.getSlot(integer6).getItem();
+                    if (!bki7.isEmpty() && Math.min(integer5, bki7.getMaxStackSize()) < bki7.getCount() + 1) {
                         return;
                     }
                 }
@@ -103,7 +103,7 @@ public class ServerPlaceRecipe<C extends Container> implements PlaceRecipe<Integ
         }
         int integer6 = this.getStackSize(boolean2, integer5, boolean3);
         final IntList intList7 = (IntList)new IntArrayList();
-        if (this.stackedContents.canCraft(bgw, intList7, integer6)) {
+        if (this.stackedContents.canCraft(bmu, intList7, integer6)) {
             int integer7 = integer6;
             for (final int integer8 : intList7) {
                 final int integer9 = StackedContents.fromStackingIndex(integer8).getMaxStackSize();
@@ -112,20 +112,20 @@ public class ServerPlaceRecipe<C extends Container> implements PlaceRecipe<Integ
                 }
             }
             integer6 = integer7;
-            if (this.stackedContents.canCraft(bgw, intList7, integer6)) {
+            if (this.stackedContents.canCraft(bmu, intList7, integer6)) {
                 this.clearGrid();
-                this.placeRecipe(this.menu.getGridWidth(), this.menu.getGridHeight(), this.menu.getResultSlotIndex(), bgw, (Iterator<Integer>)intList7.iterator(), integer6);
+                this.placeRecipe(this.menu.getGridWidth(), this.menu.getGridHeight(), this.menu.getResultSlotIndex(), bmu, (Iterator<Integer>)intList7.iterator(), integer6);
             }
         }
     }
     
     @Override
     public void addItemToSlot(final Iterator<Integer> iterator, final int integer2, final int integer3, final int integer4, final int integer5) {
-        final Slot bca7 = this.menu.getSlot(integer2);
-        final ItemStack ben8 = StackedContents.fromStackingIndex(iterator.next());
-        if (!ben8.isEmpty()) {
+        final Slot bhw7 = this.menu.getSlot(integer2);
+        final ItemStack bki8 = StackedContents.fromStackingIndex(iterator.next());
+        if (!bki8.isEmpty()) {
             for (int integer6 = 0; integer6 < integer3; ++integer6) {
-                this.moveItemToGrid(bca7, ben8);
+                this.moveItemToGrid(bhw7, bki8);
             }
         }
     }
@@ -139,9 +139,9 @@ public class ServerPlaceRecipe<C extends Container> implements PlaceRecipe<Integ
             integer2 = 64;
             for (int integer3 = 0; integer3 < this.menu.getGridWidth() * this.menu.getGridHeight() + 1; ++integer3) {
                 if (integer3 != this.menu.getResultSlotIndex()) {
-                    final ItemStack ben7 = this.menu.getSlot(integer3).getItem();
-                    if (!ben7.isEmpty() && integer2 > ben7.getCount()) {
-                        integer2 = ben7.getCount();
+                    final ItemStack bki7 = this.menu.getSlot(integer3).getItem();
+                    if (!bki7.isEmpty() && integer2 > bki7.getCount()) {
+                        integer2 = bki7.getCount();
                     }
                 }
             }
@@ -152,27 +152,27 @@ public class ServerPlaceRecipe<C extends Container> implements PlaceRecipe<Integ
         return integer2;
     }
     
-    protected void moveItemToGrid(final Slot bca, final ItemStack ben) {
-        final int integer4 = this.inventory.findSlotMatchingUnusedItem(ben);
+    protected void moveItemToGrid(final Slot bhw, final ItemStack bki) {
+        final int integer4 = this.inventory.findSlotMatchingUnusedItem(bki);
         if (integer4 == -1) {
             return;
         }
-        final ItemStack ben2 = this.inventory.getItem(integer4).copy();
-        if (ben2.isEmpty()) {
+        final ItemStack bki2 = this.inventory.getItem(integer4).copy();
+        if (bki2.isEmpty()) {
             return;
         }
-        if (ben2.getCount() > 1) {
+        if (bki2.getCount() > 1) {
             this.inventory.removeItem(integer4, 1);
         }
         else {
             this.inventory.removeItemNoUpdate(integer4);
         }
-        ben2.setCount(1);
-        if (bca.getItem().isEmpty()) {
-            bca.set(ben2);
+        bki2.setCount(1);
+        if (bhw.getItem().isEmpty()) {
+            bhw.set(bki2);
         }
         else {
-            bca.getItem().grow(1);
+            bhw.getItem().grow(1);
         }
     }
     
@@ -181,22 +181,22 @@ public class ServerPlaceRecipe<C extends Container> implements PlaceRecipe<Integ
         final int integer3 = this.getAmountOfFreeSlotsInInventory();
         for (int integer4 = 0; integer4 < this.menu.getGridWidth() * this.menu.getGridHeight() + 1; ++integer4) {
             if (integer4 != this.menu.getResultSlotIndex()) {
-                final ItemStack ben5 = this.menu.getSlot(integer4).getItem().copy();
-                if (!ben5.isEmpty()) {
-                    final int integer5 = this.inventory.getSlotWithRemainingSpace(ben5);
+                final ItemStack bki5 = this.menu.getSlot(integer4).getItem().copy();
+                if (!bki5.isEmpty()) {
+                    final int integer5 = this.inventory.getSlotWithRemainingSpace(bki5);
                     if (integer5 == -1 && list2.size() <= integer3) {
-                        for (final ItemStack ben6 : list2) {
-                            if (ben6.sameItem(ben5) && ben6.getCount() != ben6.getMaxStackSize() && ben6.getCount() + ben5.getCount() <= ben6.getMaxStackSize()) {
-                                ben6.grow(ben5.getCount());
-                                ben5.setCount(0);
+                        for (final ItemStack bki6 : list2) {
+                            if (bki6.sameItem(bki5) && bki6.getCount() != bki6.getMaxStackSize() && bki6.getCount() + bki5.getCount() <= bki6.getMaxStackSize()) {
+                                bki6.grow(bki5.getCount());
+                                bki5.setCount(0);
                                 break;
                             }
                         }
-                        if (!ben5.isEmpty()) {
+                        if (!bki5.isEmpty()) {
                             if (list2.size() >= integer3) {
                                 return false;
                             }
-                            list2.add(ben5);
+                            list2.add(bki5);
                         }
                     }
                     else if (integer5 == -1) {
@@ -210,8 +210,8 @@ public class ServerPlaceRecipe<C extends Container> implements PlaceRecipe<Integ
     
     private int getAmountOfFreeSlotsInInventory() {
         int integer2 = 0;
-        for (final ItemStack ben4 : this.inventory.items) {
-            if (ben4.isEmpty()) {
+        for (final ItemStack bki4 : this.inventory.items) {
+            if (bki4.isEmpty()) {
                 ++integer2;
             }
         }
diff --git a/src/net/minecraft/recipebook/ServerPlaceSmeltingRecipe.java b/src/net/minecraft/recipebook/ServerPlaceSmeltingRecipe.java
index 54a07e2..4cc5e41 100644
--- a/src/net/minecraft/recipebook/ServerPlaceSmeltingRecipe.java
+++ b/src/net/minecraft/recipebook/ServerPlaceSmeltingRecipe.java
@@ -13,23 +13,23 @@ import net.minecraft.world.Container;
 public class ServerPlaceSmeltingRecipe<C extends Container> extends ServerPlaceRecipe<C> {
     private boolean recipeMatchesPlaced;
     
-    public ServerPlaceSmeltingRecipe(final RecipeBookMenu<C> bbt) {
-        super(bbt);
+    public ServerPlaceSmeltingRecipe(final RecipeBookMenu<C> bhp) {
+        super(bhp);
     }
     
     @Override
-    protected void handleRecipeClicked(final Recipe<C> bgw, final boolean boolean2) {
-        this.recipeMatchesPlaced = this.menu.recipeMatches(bgw);
-        final int integer4 = this.stackedContents.getBiggestCraftableStack(bgw, null);
+    protected void handleRecipeClicked(final Recipe<C> bmu, final boolean boolean2) {
+        this.recipeMatchesPlaced = this.menu.recipeMatches(bmu);
+        final int integer4 = this.stackedContents.getBiggestCraftableStack(bmu, null);
         if (this.recipeMatchesPlaced) {
-            final ItemStack ben5 = this.menu.getSlot(0).getItem();
-            if (ben5.isEmpty() || integer4 <= ben5.getCount()) {
+            final ItemStack bki5 = this.menu.getSlot(0).getItem();
+            if (bki5.isEmpty() || integer4 <= bki5.getCount()) {
                 return;
             }
         }
         final int integer5 = this.getStackSize(boolean2, integer4, this.recipeMatchesPlaced);
         final IntList intList6 = (IntList)new IntArrayList();
-        if (!this.stackedContents.canCraft(bgw, intList6, integer5)) {
+        if (!this.stackedContents.canCraft(bmu, intList6, integer5)) {
             return;
         }
         if (!this.recipeMatchesPlaced) {
@@ -47,17 +47,17 @@ public class ServerPlaceSmeltingRecipe<C extends Container> extends ServerPlaceR
     
     protected void placeRecipe(final int integer, final IntList intList) {
         final Iterator<Integer> iterator4 = (Iterator<Integer>)intList.iterator();
-        final Slot bca5 = this.menu.getSlot(0);
-        final ItemStack ben6 = StackedContents.fromStackingIndex(iterator4.next());
-        if (ben6.isEmpty()) {
+        final Slot bhw5 = this.menu.getSlot(0);
+        final ItemStack bki6 = StackedContents.fromStackingIndex(iterator4.next());
+        if (bki6.isEmpty()) {
             return;
         }
-        int integer2 = Math.min(ben6.getMaxStackSize(), integer);
+        int integer2 = Math.min(bki6.getMaxStackSize(), integer);
         if (this.recipeMatchesPlaced) {
-            integer2 -= bca5.getItem().getCount();
+            integer2 -= bhw5.getItem().getCount();
         }
         for (int integer3 = 0; integer3 < integer2; ++integer3) {
-            this.moveItemToGrid(bca5, ben6);
+            this.moveItemToGrid(bhw5, bki6);
         }
     }
 }
diff --git a/src/net/minecraft/resources/DelegatingOps.java b/src/net/minecraft/resources/DelegatingOps.java
new file mode 100644
index 0000000..82cfa75
--- /dev/null
+++ b/src/net/minecraft/resources/DelegatingOps.java
@@ -0,0 +1,163 @@
+package net.minecraft.resources;
+
+import com.mojang.serialization.RecordBuilder;
+import com.mojang.serialization.ListBuilder;
+import java.util.stream.LongStream;
+import java.util.stream.IntStream;
+import java.nio.ByteBuffer;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import com.mojang.datafixers.util.Pair;
+import java.util.stream.Stream;
+import com.mojang.serialization.MapLike;
+import java.util.List;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+
+public abstract class DelegatingOps<T> implements DynamicOps<T> {
+    protected final DynamicOps<T> delegate;
+    
+    protected DelegatingOps(final DynamicOps<T> dynamicOps) {
+        this.delegate = dynamicOps;
+    }
+    
+    public T empty() {
+        return (T)this.delegate.empty();
+    }
+    
+    public <U> U convertTo(final DynamicOps<U> dynamicOps, final T object) {
+        return (U)this.delegate.convertTo((DynamicOps)dynamicOps, object);
+    }
+    
+    public DataResult<Number> getNumberValue(final T object) {
+        return (DataResult<Number>)this.delegate.getNumberValue(object);
+    }
+    
+    public T createNumeric(final Number number) {
+        return (T)this.delegate.createNumeric(number);
+    }
+    
+    public T createByte(final byte byte1) {
+        return (T)this.delegate.createByte(byte1);
+    }
+    
+    public T createShort(final short short1) {
+        return (T)this.delegate.createShort(short1);
+    }
+    
+    public T createInt(final int integer) {
+        return (T)this.delegate.createInt(integer);
+    }
+    
+    public T createLong(final long long1) {
+        return (T)this.delegate.createLong(long1);
+    }
+    
+    public T createFloat(final float float1) {
+        return (T)this.delegate.createFloat(float1);
+    }
+    
+    public T createDouble(final double double1) {
+        return (T)this.delegate.createDouble(double1);
+    }
+    
+    public DataResult<Boolean> getBooleanValue(final T object) {
+        return (DataResult<Boolean>)this.delegate.getBooleanValue(object);
+    }
+    
+    public T createBoolean(final boolean boolean1) {
+        return (T)this.delegate.createBoolean(boolean1);
+    }
+    
+    public DataResult<String> getStringValue(final T object) {
+        return (DataResult<String>)this.delegate.getStringValue(object);
+    }
+    
+    public T createString(final String string) {
+        return (T)this.delegate.createString(string);
+    }
+    
+    public DataResult<T> mergeToList(final T object1, final T object2) {
+        return (DataResult<T>)this.delegate.mergeToList(object1, object2);
+    }
+    
+    public DataResult<T> mergeToList(final T object, final List<T> list) {
+        return (DataResult<T>)this.delegate.mergeToList(object, (List)list);
+    }
+    
+    public DataResult<T> mergeToMap(final T object1, final T object2, final T object3) {
+        return (DataResult<T>)this.delegate.mergeToMap(object1, object2, object3);
+    }
+    
+    public DataResult<T> mergeToMap(final T object, final MapLike<T> mapLike) {
+        return (DataResult<T>)this.delegate.mergeToMap(object, (MapLike)mapLike);
+    }
+    
+    public DataResult<Stream<Pair<T, T>>> getMapValues(final T object) {
+        return (DataResult<Stream<Pair<T, T>>>)this.delegate.getMapValues(object);
+    }
+    
+    public DataResult<Consumer<BiConsumer<T, T>>> getMapEntries(final T object) {
+        return (DataResult<Consumer<BiConsumer<T, T>>>)this.delegate.getMapEntries(object);
+    }
+    
+    public T createMap(final Stream<Pair<T, T>> stream) {
+        return (T)this.delegate.createMap((Stream)stream);
+    }
+    
+    public DataResult<MapLike<T>> getMap(final T object) {
+        return (DataResult<MapLike<T>>)this.delegate.getMap(object);
+    }
+    
+    public DataResult<Stream<T>> getStream(final T object) {
+        return (DataResult<Stream<T>>)this.delegate.getStream(object);
+    }
+    
+    public DataResult<Consumer<Consumer<T>>> getList(final T object) {
+        return (DataResult<Consumer<Consumer<T>>>)this.delegate.getList(object);
+    }
+    
+    public T createList(final Stream<T> stream) {
+        return (T)this.delegate.createList((Stream)stream);
+    }
+    
+    public DataResult<ByteBuffer> getByteBuffer(final T object) {
+        return (DataResult<ByteBuffer>)this.delegate.getByteBuffer(object);
+    }
+    
+    public T createByteList(final ByteBuffer byteBuffer) {
+        return (T)this.delegate.createByteList(byteBuffer);
+    }
+    
+    public DataResult<IntStream> getIntStream(final T object) {
+        return (DataResult<IntStream>)this.delegate.getIntStream(object);
+    }
+    
+    public T createIntList(final IntStream intStream) {
+        return (T)this.delegate.createIntList(intStream);
+    }
+    
+    public DataResult<LongStream> getLongStream(final T object) {
+        return (DataResult<LongStream>)this.delegate.getLongStream(object);
+    }
+    
+    public T createLongList(final LongStream longStream) {
+        return (T)this.delegate.createLongList(longStream);
+    }
+    
+    public T remove(final T object, final String string) {
+        return (T)this.delegate.remove(object, string);
+    }
+    
+    public boolean compressMaps() {
+        return this.delegate.compressMaps();
+    }
+    
+    public ListBuilder<T> listBuilder() {
+        return (ListBuilder<T>)this.delegate.listBuilder();
+    }
+    
+    public RecordBuilder<T> mapBuilder() {
+        return (RecordBuilder<T>)this.delegate.mapBuilder();
+    }
+}
diff --git a/src/net/minecraft/resources/RegistryDataPackCodec.java b/src/net/minecraft/resources/RegistryDataPackCodec.java
new file mode 100644
index 0000000..fca7a8b
--- /dev/null
+++ b/src/net/minecraft/resources/RegistryDataPackCodec.java
@@ -0,0 +1,43 @@
+package net.minecraft.resources;
+
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Lifecycle;
+import com.mojang.serialization.MapCodec;
+import net.minecraft.core.Registry;
+import net.minecraft.core.MappedRegistry;
+import com.mojang.serialization.Codec;
+
+public final class RegistryDataPackCodec<E> implements Codec<MappedRegistry<E>> {
+    private final Codec<MappedRegistry<E>> directCodec;
+    private final ResourceKey<Registry<E>> registryKey;
+    private final MapCodec<E> elementCodec;
+    
+    public static <E> RegistryDataPackCodec<E> create(final ResourceKey<Registry<E>> ug, final Lifecycle lifecycle, final MapCodec<E> mapCodec) {
+        return new RegistryDataPackCodec<E>(ug, lifecycle, mapCodec);
+    }
+    
+    private RegistryDataPackCodec(final ResourceKey<Registry<E>> ug, final Lifecycle lifecycle, final MapCodec<E> mapCodec) {
+        this.directCodec = MappedRegistry.<E>directCodec(ug, lifecycle, mapCodec);
+        this.registryKey = ug;
+        this.elementCodec = mapCodec;
+    }
+    
+    public <T> DataResult<T> encode(final MappedRegistry<E> gh, final DynamicOps<T> dynamicOps, final T object) {
+        return (DataResult<T>)this.directCodec.encode(gh, (DynamicOps)dynamicOps, object);
+    }
+    
+    public <T> DataResult<Pair<MappedRegistry<E>, T>> decode(final DynamicOps<T> dynamicOps, final T object) {
+        final DataResult<Pair<MappedRegistry<E>, T>> dataResult4 = (DataResult<Pair<MappedRegistry<E>, T>>)this.directCodec.decode((DynamicOps)dynamicOps, object);
+        if (dynamicOps instanceof RegistryReadOps) {
+            return (DataResult<Pair<MappedRegistry<E>, T>>)dataResult4.flatMap(pair -> ((RegistryReadOps)dynamicOps).<E>decodeElements((MappedRegistry<E>)pair.getFirst(), this.registryKey, this.elementCodec).map(gh -> Pair.of(gh, pair.getSecond())));
+        }
+        return dataResult4;
+    }
+    
+    @Override
+    public String toString() {
+        return "RegistryDapaPackCodec[" + this.directCodec + " " + this.registryKey + " " + this.elementCodec + "]";
+    }
+}
diff --git a/src/net/minecraft/resources/RegistryFileCodec.java b/src/net/minecraft/resources/RegistryFileCodec.java
new file mode 100644
index 0000000..d408ea7
--- /dev/null
+++ b/src/net/minecraft/resources/RegistryFileCodec.java
@@ -0,0 +1,42 @@
+package net.minecraft.resources;
+
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.MapCodec;
+import net.minecraft.core.Registry;
+import java.util.function.Supplier;
+import com.mojang.serialization.Codec;
+
+public final class RegistryFileCodec<E> implements Codec<Supplier<E>> {
+    private final ResourceKey<Registry<E>> registryKey;
+    private final MapCodec<E> elementCodec;
+    
+    public static <E> RegistryFileCodec<E> create(final ResourceKey<Registry<E>> ug, final MapCodec<E> mapCodec) {
+        return new RegistryFileCodec<E>(ug, mapCodec);
+    }
+    
+    private RegistryFileCodec(final ResourceKey<Registry<E>> ug, final MapCodec<E> mapCodec) {
+        this.registryKey = ug;
+        this.elementCodec = mapCodec;
+    }
+    
+    public <T> DataResult<T> encode(final Supplier<E> supplier, final DynamicOps<T> dynamicOps, final T object) {
+        if (dynamicOps instanceof RegistryWriteOps) {
+            return ((RegistryWriteOps)dynamicOps).<E>encode(supplier.get(), object, this.registryKey, this.elementCodec);
+        }
+        return (DataResult<T>)this.elementCodec.codec().encode(supplier.get(), (DynamicOps)dynamicOps, object);
+    }
+    
+    public <T> DataResult<Pair<Supplier<E>, T>> decode(final DynamicOps<T> dynamicOps, final T object) {
+        if (dynamicOps instanceof RegistryReadOps) {
+            return ((RegistryReadOps)dynamicOps).<E>decodeElement(object, this.registryKey, this.elementCodec);
+        }
+        return (DataResult<Pair<Supplier<E>, T>>)this.elementCodec.codec().decode((DynamicOps)dynamicOps, object).map(pair -> pair.mapFirst(object -> () -> object));
+    }
+    
+    @Override
+    public String toString() {
+        return "RegistryFileCodec[" + this.registryKey + " " + this.elementCodec + "]";
+    }
+}
diff --git a/src/net/minecraft/resources/RegistryReadOps.java b/src/net/minecraft/resources/RegistryReadOps.java
new file mode 100644
index 0000000..b4a2f8e
--- /dev/null
+++ b/src/net/minecraft/resources/RegistryReadOps.java
@@ -0,0 +1,246 @@
+package net.minecraft.resources;
+
+import org.apache.logging.log4j.LogManager;
+import com.google.gson.JsonElement;
+import java.io.Reader;
+import net.minecraft.server.packs.resources.Resource;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.JsonIOException;
+import java.io.IOException;
+import com.mojang.serialization.JsonOps;
+import com.google.gson.JsonParser;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Iterator;
+import java.util.Collection;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.core.MappedRegistry;
+import java.util.Optional;
+import net.minecraft.util.Codecs;
+import net.minecraft.core.WritableRegistry;
+import java.util.function.Supplier;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.MapCodec;
+import com.google.common.collect.Maps;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.core.Registry;
+import java.util.Map;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.server.packs.resources.ResourceManager;
+import org.apache.logging.log4j.Logger;
+
+public class RegistryReadOps<T> extends DelegatingOps<T> {
+    private static final Logger LOGGER;
+    private final ResourceManager resourceManager;
+    private final RegistryAccess registryHolder;
+    private final Map<ResourceKey<? extends Registry<?>>, ReadCache<?>> readCache;
+    
+    public static <T> RegistryReadOps<T> create(final DynamicOps<T> dynamicOps, final ResourceManager abc, final RegistryAccess gm) {
+        return new RegistryReadOps<T>(dynamicOps, abc, gm);
+    }
+    
+    private RegistryReadOps(final DynamicOps<T> dynamicOps, final ResourceManager abc, final RegistryAccess gm) {
+        super(dynamicOps);
+        this.readCache = Maps.newIdentityHashMap();
+        this.resourceManager = abc;
+        this.registryHolder = gm;
+    }
+    
+    protected <E> DataResult<Pair<Supplier<E>, T>> decodeElement(final T object, final ResourceKey<Registry<E>> ug, final MapCodec<E> mapCodec) {
+        final Optional<WritableRegistry<E>> optional5 = this.registryHolder.<E>registry(ug);
+        if (!optional5.isPresent()) {
+            return (DataResult<Pair<Supplier<E>, T>>)DataResult.error("Unknown registry: " + ug);
+        }
+        final WritableRegistry<E> gs6 = optional5.get();
+        final DataResult<Pair<ResourceLocation, T>> dataResult7 = (DataResult<Pair<ResourceLocation, T>>)ResourceLocation.CODEC.decode((DynamicOps)this.delegate, object);
+        if (!dataResult7.result().isPresent()) {
+            final WritableRegistry<Object> writableRegistry;
+            return (DataResult<Pair<Supplier<E>, T>>)Codecs.<E>withName(ug, mapCodec).codec().decode((DynamicOps)this.delegate, object).map(pair -> pair.mapFirst(pair -> {
+                writableRegistry.register((ResourceKey<Object>)pair.getFirst(), pair.getSecond());
+                writableRegistry.setPersistent((ResourceKey<Object>)pair.getFirst());
+                return pair::getSecond;
+            }));
+        }
+        final Pair<ResourceLocation, T> pair2 = (Pair<ResourceLocation, T>)dataResult7.result().get();
+        final ResourceLocation uh9 = (ResourceLocation)pair2.getFirst();
+        return (DataResult<Pair<Supplier<E>, T>>)this.<E>readAndRegisterElement(ug, gs6, mapCodec, uh9).map(supplier -> Pair.of(supplier, pair2.getSecond()));
+    }
+    
+    public <E> DataResult<MappedRegistry<E>> decodeElements(final MappedRegistry<E> gh, final ResourceKey<Registry<E>> ug, final MapCodec<E> mapCodec) {
+        final ResourceLocation uh5 = ug.location();
+        final Collection<ResourceLocation> collection6 = this.resourceManager.listResources(uh5, string -> string.endsWith(".json"));
+        DataResult<MappedRegistry<E>> dataResult7 = (DataResult<MappedRegistry<E>>)DataResult.success(gh, Lifecycle.stable());
+        for (final ResourceLocation uh6 : collection6) {
+            final String string2 = uh6.getPath();
+            if (!string2.endsWith(".json")) {
+                RegistryReadOps.LOGGER.warn("Skipping resource {} since it is not a json file", uh6);
+            }
+            else if (!string2.startsWith(uh5.getPath() + "/")) {
+                RegistryReadOps.LOGGER.warn("Skipping resource {} since it does not have a registry name prefix", uh6);
+            }
+            else {
+                final String string3 = string2.substring(0, string2.length() - ".json".length()).substring(uh5.getPath().length() + 1);
+                final int integer12 = string3.indexOf(47);
+                if (integer12 < 0) {
+                    RegistryReadOps.LOGGER.warn("Skipping resource {} since it does not have a namespace", uh6);
+                }
+                else {
+                    final String string4 = string3.substring(0, integer12);
+                    final String string5 = string3.substring(integer12 + 1);
+                    final ResourceLocation uh7 = new ResourceLocation(string4, string5);
+                    dataResult7 = (DataResult<MappedRegistry<E>>)dataResult7.flatMap(gh -> this.<E>readAndRegisterElement(ug, gh, mapCodec, uh7).map(supplier -> gh));
+                }
+            }
+        }
+        return (DataResult<MappedRegistry<E>>)dataResult7.setPartial(gh);
+    }
+    
+    private <E> DataResult<Supplier<E>> readAndRegisterElement(final ResourceKey<Registry<E>> ug, final WritableRegistry<E> gs, final MapCodec<E> mapCodec, final ResourceLocation uh) {
+        // 
+        // This method could not be decompiled.
+        // 
+        // Original Bytecode:
+        // 
+        //     1: aload           uh
+        //     3: invokestatic    net/minecraft/resources/ResourceKey.create:(Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/resources/ResourceKey;
+        //     6: astore          ug6
+        //     8: aload_2         /* gs */
+        //     9: aload           ug6
+        //    11: invokevirtual   net/minecraft/core/WritableRegistry.get:(Lnet/minecraft/resources/ResourceKey;)Ljava/lang/Object;
+        //    14: astore          object7
+        //    16: aload           object7
+        //    18: ifnull          35
+        //    21: aload           object7
+        //    23: invokedynamic   BootstrapMethod #4, get:(Ljava/lang/Object;)Ljava/util/function/Supplier;
+        //    28: invokestatic    com/mojang/serialization/Lifecycle.stable:()Lcom/mojang/serialization/Lifecycle;
+        //    31: invokestatic    com/mojang/serialization/DataResult.success:(Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lcom/mojang/serialization/DataResult;
+        //    34: areturn        
+        //    35: aload_0         /* this */
+        //    36: aload_1         /* ug */
+        //    37: invokespecial   net/minecraft/resources/RegistryReadOps.readCache:(Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/resources/RegistryReadOps$ReadCache;
+        //    40: astore          a8
+        //    42: aload           a8
+        //    44: invokestatic    net/minecraft/resources/RegistryReadOps$ReadCache.access$000:(Lnet/minecraft/resources/RegistryReadOps$ReadCache;)Ljava/util/Map;
+        //    47: aload           ug6
+        //    49: invokeinterface java/util/Map.get:(Ljava/lang/Object;)Ljava/lang/Object;
+        //    54: checkcast       Lcom/mojang/serialization/DataResult;
+        //    57: astore          dataResult9
+        //    59: aload           dataResult9
+        //    61: ifnull          67
+        //    64: aload           dataResult9
+        //    66: areturn        
+        //    67: aload_2         /* gs */
+        //    68: aload           ug6
+        //    70: invokedynamic   BootstrapMethod #5, get:(Lnet/minecraft/core/WritableRegistry;Lnet/minecraft/resources/ResourceKey;)Lcom/google/common/base/Supplier;
+        //    75: invokestatic    com/google/common/base/Suppliers.memoize:(Lcom/google/common/base/Supplier;)Lcom/google/common/base/Supplier;
+        //    78: astore          supplier10
+        //    80: aload           a8
+        //    82: invokestatic    net/minecraft/resources/RegistryReadOps$ReadCache.access$000:(Lnet/minecraft/resources/RegistryReadOps$ReadCache;)Ljava/util/Map;
+        //    85: aload           ug6
+        //    87: aload           supplier10
+        //    89: invokestatic    com/mojang/serialization/DataResult.success:(Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+        //    92: invokeinterface java/util/Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+        //    97: pop            
+        //    98: aload_0         /* this */
+        //    99: aload_1         /* ug */
+        //   100: aload           ug6
+        //   102: aload_3         /* mapCodec */
+        //   103: invokespecial   net/minecraft/resources/RegistryReadOps.readElementFromFile:(Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/DataResult;
+        //   106: astore          dataResult11
+        //   108: aload           dataResult11
+        //   110: invokevirtual   com/mojang/serialization/DataResult.result:()Ljava/util/Optional;
+        //   113: aload_2         /* gs */
+        //   114: aload           ug6
+        //   116: invokedynamic   BootstrapMethod #6, accept:(Lnet/minecraft/core/WritableRegistry;Lnet/minecraft/resources/ResourceKey;)Ljava/util/function/Consumer;
+        //   121: invokevirtual   java/util/Optional.ifPresent:(Ljava/util/function/Consumer;)V
+        //   124: aload           dataResult11
+        //   126: invokedynamic   BootstrapMethod #7, apply:()Ljava/util/function/Function;
+        //   131: invokevirtual   com/mojang/serialization/DataResult.map:(Ljava/util/function/Function;)Lcom/mojang/serialization/DataResult;
+        //   134: astore          dataResult12
+        //   136: aload           a8
+        //   138: invokestatic    net/minecraft/resources/RegistryReadOps$ReadCache.access$000:(Lnet/minecraft/resources/RegistryReadOps$ReadCache;)Ljava/util/Map;
+        //   141: aload           ug6
+        //   143: aload           dataResult12
+        //   145: invokeinterface java/util/Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+        //   150: pop            
+        //   151: aload           dataResult12
+        //   153: areturn        
+        //    Signature:
+        //  <E:Ljava/lang/Object;>(Lnet/minecraft/resources/ResourceKey<Lnet/minecraft/core/Registry<TE;>;>;Lnet/minecraft/core/WritableRegistry<TE;>;Lcom/mojang/serialization/MapCodec<TE;>;Lnet/minecraft/resources/ResourceLocation;)Lcom/mojang/serialization/DataResult<Ljava/util/function/Supplier<TE;>;>;
+        //    MethodParameters:
+        //  Name      Flags  
+        //  --------  -----
+        //  ug        
+        //  gs        
+        //  mapCodec  
+        //  uh        
+        //    StackMapTable: 00 02 FF 00 23 00 06 07 00 02 07 00 A1 07 00 68 07 00 83 00 07 00 A1 00 00 FD 00 1F 00 07 00 0A
+        // 
+        // The error that occurred was:
+        // 
+        // java.lang.IllegalStateException: Could not infer any expression.
+        //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:374)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.run(TypeAnalysis.java:96)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:344)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:42)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:214)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
+        //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
+        //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
+        //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
+        //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
+        //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
+        //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
+        //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
+        //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
+        //     at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
+        //     at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
+        //     at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:177)
+        // 
+        throw new IllegalStateException("An error occurred while decompiling this method.");
+    }
+    
+    private <E> DataResult<E> readElementFromFile(final ResourceKey<Registry<E>> ug1, final ResourceKey<E> ug2, final MapCodec<E> mapCodec) {
+        final ResourceLocation uh5 = new ResourceLocation(ug1.location().getNamespace(), ug1.location().getPath() + "/" + ug2.location().getNamespace() + "/" + ug2.location().getPath() + ".json");
+        try (final Resource abb6 = this.resourceManager.getResource(uh5);
+             final Reader reader8 = new InputStreamReader(abb6.getInputStream(), StandardCharsets.UTF_8)) {
+            final JsonParser jsonParser10 = new JsonParser();
+            final JsonElement jsonElement11 = jsonParser10.parse(reader8);
+            return (DataResult<E>)mapCodec.codec().parse((DynamicOps)new RegistryReadOps((com.mojang.serialization.DynamicOps<Object>)JsonOps.INSTANCE, this.resourceManager, this.registryHolder), jsonElement11);
+        }
+        catch (IOException | JsonIOException | JsonSyntaxException ex2) {
+            final Exception ex;
+            final Exception exception6 = ex;
+            return (DataResult<E>)DataResult.error("Failed to parse file: " + exception6.getMessage());
+        }
+    }
+    
+    private <E> ReadCache<E> readCache(final ResourceKey<Registry<E>> ug) {
+        return (ReadCache<E>)this.readCache.computeIfAbsent(ug, ug -> new ReadCache());
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+    
+    static final class ReadCache<E> {
+        private final Map<ResourceKey<E>, DataResult<Supplier<E>>> values;
+        
+        private ReadCache() {
+            this.values = Maps.newIdentityHashMap();
+        }
+    }
+}
diff --git a/src/net/minecraft/resources/RegistryWriteOps.java b/src/net/minecraft/resources/RegistryWriteOps.java
new file mode 100644
index 0000000..259ffc1
--- /dev/null
+++ b/src/net/minecraft/resources/RegistryWriteOps.java
@@ -0,0 +1,40 @@
+package net.minecraft.resources;
+
+import java.util.Optional;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.util.Codecs;
+import net.minecraft.core.WritableRegistry;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.MapCodec;
+import net.minecraft.core.Registry;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.core.RegistryAccess;
+
+public class RegistryWriteOps<T> extends DelegatingOps<T> {
+    private final RegistryAccess registryHolder;
+    
+    public static <T> RegistryWriteOps<T> create(final DynamicOps<T> dynamicOps, final RegistryAccess gm) {
+        return new RegistryWriteOps<T>(dynamicOps, gm);
+    }
+    
+    private RegistryWriteOps(final DynamicOps<T> dynamicOps, final RegistryAccess gm) {
+        super(dynamicOps);
+        this.registryHolder = gm;
+    }
+    
+    protected <E> DataResult<T> encode(final E object1, final T object2, final ResourceKey<Registry<E>> ug, final MapCodec<E> mapCodec) {
+        final Optional<WritableRegistry<E>> optional6 = this.registryHolder.<E>registry(ug);
+        if (optional6.isPresent()) {
+            final WritableRegistry<E> gs7 = optional6.get();
+            final Optional<ResourceKey<E>> optional7 = gs7.getResourceKey(object1);
+            if (optional7.isPresent()) {
+                final ResourceKey<E> ug2 = optional7.get();
+                if (gs7.persistent(ug2)) {
+                    return (DataResult<T>)Codecs.<E>withName(ug, mapCodec).codec().encode(Pair.of((Object)ug2, (Object)object1), (DynamicOps)this.delegate, object2);
+                }
+                return (DataResult<T>)ResourceLocation.CODEC.encode(ug2.location(), (DynamicOps)this.delegate, object2);
+            }
+        }
+        return (DataResult<T>)mapCodec.codec().encode(object1, (DynamicOps)this.delegate, object2);
+    }
+}
diff --git a/src/net/minecraft/resources/ResourceKey.java b/src/net/minecraft/resources/ResourceKey.java
new file mode 100644
index 0000000..0aab9d2
--- /dev/null
+++ b/src/net/minecraft/resources/ResourceKey.java
@@ -0,0 +1,48 @@
+package net.minecraft.resources;
+
+import java.util.Collections;
+import com.google.common.collect.Maps;
+import java.util.function.Function;
+import net.minecraft.core.Registry;
+import java.util.Map;
+
+public class ResourceKey<T> {
+    private static final Map<String, ResourceKey<?>> VALUES;
+    private final ResourceLocation registryName;
+    private final ResourceLocation location;
+    
+    public static <T> ResourceKey<T> create(final ResourceKey<Registry<T>> ug, final ResourceLocation uh) {
+        return ResourceKey.<T>create(ug.location, uh);
+    }
+    
+    public static <T> ResourceKey<Registry<T>> createRegistryKey(final ResourceLocation uh) {
+        return ResourceKey.<Registry<T>>create(Registry.ROOT_REGISTRY_NAME, uh);
+    }
+    
+    private static <T> ResourceKey<T> create(final ResourceLocation uh1, final ResourceLocation uh2) {
+        final String string3 = (uh1 + ":" + uh2).intern();
+        return (ResourceKey<T>)ResourceKey.VALUES.computeIfAbsent(string3, string -> new ResourceKey(uh1, uh2));
+    }
+    
+    private ResourceKey(final ResourceLocation uh1, final ResourceLocation uh2) {
+        this.registryName = uh1;
+        this.location = uh2;
+    }
+    
+    @Override
+    public String toString() {
+        return "ResourceKey[" + this.registryName + " / " + this.location + ']';
+    }
+    
+    public ResourceLocation location() {
+        return this.location;
+    }
+    
+    public static <T> Function<ResourceLocation, ResourceKey<T>> elementKey(final ResourceKey<Registry<T>> ug) {
+        return (Function<ResourceLocation, ResourceKey<T>>)(uh -> ResourceKey.<T>create(ug, uh));
+    }
+    
+    static {
+        VALUES = Collections.<String, ResourceKey<?>>synchronizedMap(Maps.newIdentityHashMap());
+    }
+}
diff --git a/src/net/minecraft/resources/ResourceLocation.java b/src/net/minecraft/resources/ResourceLocation.java
index 02d7a25..b9bd5c9 100644
--- a/src/net/minecraft/resources/ResourceLocation.java
+++ b/src/net/minecraft/resources/ResourceLocation.java
@@ -11,15 +11,19 @@ import com.google.gson.JsonSerializer;
 import com.google.gson.JsonDeserializer;
 import com.mojang.brigadier.Message;
 import net.minecraft.network.chat.TranslatableComponent;
+import java.util.function.Function;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.ImmutableStringReader;
 import com.mojang.brigadier.StringReader;
+import com.mojang.serialization.DataResult;
 import javax.annotation.Nullable;
 import net.minecraft.ResourceLocationException;
 import org.apache.commons.lang3.StringUtils;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import com.mojang.serialization.Codec;
 
 public class ResourceLocation implements Comparable<ResourceLocation> {
+    public static final Codec<ResourceLocation> CODEC;
     private static final SimpleCommandExceptionType ERROR_INVALID;
     protected final String namespace;
     protected final String path;
@@ -52,7 +56,7 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
         try {
             return new ResourceLocation(string);
         }
-        catch (ResourceLocationException r2) {
+        catch (ResourceLocationException t2) {
             return null;
         }
     }
@@ -69,6 +73,15 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
         return arr3;
     }
     
+    private static DataResult<ResourceLocation> read(final String string) {
+        try {
+            return (DataResult<ResourceLocation>)DataResult.success(new ResourceLocation(string));
+        }
+        catch (ResourceLocationException t2) {
+            return (DataResult<ResourceLocation>)DataResult.error("Not a valid resource location: " + string + " " + t2.getMessage());
+        }
+    }
+    
     public String getPath() {
         return this.path;
     }
@@ -88,8 +101,8 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
             return true;
         }
         if (object instanceof ResourceLocation) {
-            final ResourceLocation sm3 = (ResourceLocation)object;
-            return this.namespace.equals(sm3.namespace) && this.path.equals(sm3.path);
+            final ResourceLocation uh3 = (ResourceLocation)object;
+            return this.namespace.equals(uh3.namespace) && this.path.equals(uh3.path);
         }
         return false;
     }
@@ -100,10 +113,10 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
     }
     
     @Override
-    public int compareTo(final ResourceLocation sm) {
-        int integer3 = this.path.compareTo(sm.path);
+    public int compareTo(final ResourceLocation uh) {
+        int integer3 = this.path.compareTo(uh.path);
         if (integer3 == 0) {
-            integer3 = this.namespace.compareTo(sm.namespace);
+            integer3 = this.namespace.compareTo(uh.namespace);
         }
         return integer3;
     }
@@ -117,7 +130,7 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
         try {
             return new ResourceLocation(string3);
         }
-        catch (ResourceLocationException r4) {
+        catch (ResourceLocationException t4) {
             stringReader.setCursor(integer2);
             throw ResourceLocation.ERROR_INVALID.createWithContext((ImmutableStringReader)stringReader);
         }
@@ -128,11 +141,29 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
     }
     
     private static boolean isValidPath(final String string) {
-        return string.chars().allMatch(integer -> integer == 95 || integer == 45 || (integer >= 97 && integer <= 122) || (integer >= 48 && integer <= 57) || integer == 47 || integer == 46);
+        for (int integer2 = 0; integer2 < string.length(); ++integer2) {
+            if (!validPathChar(string.charAt(integer2))) {
+                return false;
+            }
+        }
+        return true;
     }
     
     private static boolean isValidNamespace(final String string) {
-        return string.chars().allMatch(integer -> integer == 95 || integer == 45 || (integer >= 97 && integer <= 122) || (integer >= 48 && integer <= 57) || integer == 46);
+        for (int integer2 = 0; integer2 < string.length(); ++integer2) {
+            if (!validNamespaceChar(string.charAt(integer2))) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    private static boolean validPathChar(final char character) {
+        return character == '_' || character == '-' || (character >= 'a' && character <= 'z') || (character >= '0' && character <= '9') || character == '/' || character == '.';
+    }
+    
+    private static boolean validNamespaceChar(final char character) {
+        return character == '_' || character == '-' || (character >= 'a' && character <= 'z') || (character >= '0' && character <= '9') || character == '.';
     }
     
     public static boolean isValidResourceLocation(final String string) {
@@ -141,7 +172,8 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
     }
     
     static {
-        ERROR_INVALID = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.id.invalid", new Object[0]));
+        CODEC = Codec.STRING.comapFlatMap((Function)ResourceLocation::read, (Function)ResourceLocation::toString).stable();
+        ERROR_INVALID = new SimpleCommandExceptionType((Message)new TranslatableComponent("argument.id.invalid"));
     }
     
     public static class Serializer implements JsonDeserializer<ResourceLocation>, JsonSerializer<ResourceLocation> {
@@ -151,8 +183,8 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
         }
         
         @Override
-        public JsonElement serialize(final ResourceLocation sm, final Type type, final JsonSerializationContext jsonSerializationContext) {
-            return new JsonPrimitive(sm.toString());
+        public JsonElement serialize(final ResourceLocation uh, final Type type, final JsonSerializationContext jsonSerializationContext) {
+            return new JsonPrimitive(uh.toString());
         }
     }
 }
diff --git a/src/net/minecraft/server/Bootstrap.java b/src/net/minecraft/server/Bootstrap.java
index df51ab3..741745b 100644
--- a/src/net/minecraft/server/Bootstrap.java
+++ b/src/net/minecraft/server/Bootstrap.java
@@ -2,6 +2,7 @@ package net.minecraft.server;
 
 import org.apache.logging.log4j.LogManager;
 import java.io.OutputStream;
+import net.minecraft.world.entity.ai.attributes.DefaultAttributes;
 import net.minecraft.SharedConstants;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
@@ -9,7 +10,9 @@ import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.effect.MobEffect;
+import net.minecraft.world.entity.ai.attributes.Attribute;
 import java.util.TreeSet;
+import net.minecraft.world.level.GameRules;
 import net.minecraft.locale.Language;
 import java.util.Set;
 import java.util.function.Function;
@@ -34,7 +37,7 @@ public class Bootstrap {
             return;
         }
         Bootstrap.isBootstrapped = true;
-        if (Registry.REGISTRY.isEmpty()) {
+        if (Registry.REGISTRY.keySet().isEmpty()) {
             throw new IllegalStateException("Unable to load registries");
         }
         FireBlock.bootStrap();
@@ -49,27 +52,41 @@ public class Bootstrap {
         wrapStreams();
     }
     
-    private static <T> void checkTranslations(final Registry<T> gb, final Function<T, String> function, final Set<String> set) {
-        final Language jo4 = Language.getInstance();
+    private static <T> void checkTranslations(final Iterable<T> iterable, final Function<T, String> function, final Set<String> set) {
+        final Language kz4 = Language.getInstance();
         final String string5;
         final Language language;
-        gb.iterator().forEachRemaining(object -> {
+        iterable.forEach(object -> {
             string5 = function.apply(object);
-            if (!language.exists(string5)) {
+            if (!language.has(string5)) {
                 set.add(string5);
             }
         });
     }
     
+    private static void checkGameruleTranslations(final Set<String> set) {
+        final Language kz2 = Language.getInstance();
+        GameRules.visitGameRuleTypes(new GameRules.GameRuleTypeVisitor() {
+            @Override
+            public <T extends GameRules.Value<T>> void visit(final GameRules.Key<T> e, final GameRules.Type<T> f) {
+                if (!kz2.has(e.getDescriptionId())) {
+                    set.add(e.getId());
+                }
+            }
+        });
+    }
+    
     public static Set<String> getMissingTranslations() {
         final Set<String> set1 = new TreeSet<String>();
+        Bootstrap.<Attribute>checkTranslations(Registry.ATTRIBUTE, Attribute::getDescriptionId, set1);
         Bootstrap.<EntityType<?>>checkTranslations(Registry.ENTITY_TYPE, EntityType::getDescriptionId, set1);
         Bootstrap.<MobEffect>checkTranslations(Registry.MOB_EFFECT, MobEffect::getDescriptionId, set1);
         Bootstrap.<Item>checkTranslations(Registry.ITEM, Item::getDescriptionId, set1);
         Bootstrap.<Enchantment>checkTranslations(Registry.ENCHANTMENT, Enchantment::getDescriptionId, set1);
         Bootstrap.<Biome>checkTranslations(Registry.BIOME, Biome::getDescriptionId, set1);
         Bootstrap.<Block>checkTranslations(Registry.BLOCK, Block::getDescriptionId, set1);
-        Bootstrap.<ResourceLocation>checkTranslations(Registry.CUSTOM_STAT, sm -> "stat." + sm.toString().replace(':', '.'), set1);
+        Bootstrap.<ResourceLocation>checkTranslations((Iterable<ResourceLocation>)Registry.CUSTOM_STAT, uh -> "stat." + uh.toString().replace(':', '.'), set1);
+        checkGameruleTranslations(set1);
         return set1;
     }
     
@@ -80,6 +97,7 @@ public class Bootstrap {
         if (SharedConstants.IS_RUNNING_IN_IDE) {
             getMissingTranslations().forEach(string -> Bootstrap.LOGGER.error("Missing translations: " + string));
         }
+        DefaultAttributes.validate();
     }
     
     private static void wrapStreams() {
diff --git a/src/net/minecraft/server/ConsoleInput.java b/src/net/minecraft/server/ConsoleInput.java
index b571edd..1616e5a 100644
--- a/src/net/minecraft/server/ConsoleInput.java
+++ b/src/net/minecraft/server/ConsoleInput.java
@@ -6,8 +6,8 @@ public class ConsoleInput {
     public final String msg;
     public final CommandSourceStack source;
     
-    public ConsoleInput(final String string, final CommandSourceStack cq) {
+    public ConsoleInput(final String string, final CommandSourceStack cz) {
         this.msg = string;
-        this.source = cq;
+        this.source = cz;
     }
 }
diff --git a/src/net/minecraft/server/Main.java b/src/net/minecraft/server/Main.java
new file mode 100644
index 0000000..25c24d5
--- /dev/null
+++ b/src/net/minecraft/server/Main.java
@@ -0,0 +1,224 @@
+package net.minecraft.server;
+
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.network.chat.Component;
+import net.minecraft.util.Mth;
+import net.minecraft.util.worldupdate.WorldUpgrader;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import com.google.common.collect.ImmutableSet;
+import java.util.function.BooleanSupplier;
+import com.mojang.datafixers.DataFixer;
+import net.minecraft.server.dedicated.DedicatedServerProperties;
+import net.minecraft.world.level.storage.WorldData;
+import java.util.concurrent.CompletableFuture;
+import com.mojang.authlib.GameProfileRepository;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import java.nio.file.Path;
+import joptsimple.OptionSet;
+import net.minecraft.DefaultUncaughtExceptionHandler;
+import java.awt.GraphicsEnvironment;
+import net.minecraft.server.level.progress.LoggerChunkProgressListener;
+import net.minecraft.server.dedicated.DedicatedServer;
+import net.minecraft.util.datafix.DataFixers;
+import net.minecraft.world.level.storage.PrimaryLevelData;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.world.level.LevelSettings;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.nbt.Tag;
+import net.minecraft.resources.RegistryReadOps;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.commands.Commands;
+import net.minecraft.world.level.DataPackConfig;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.server.packs.repository.FolderRepositorySource;
+import net.minecraft.server.packs.repository.PackSource;
+import net.minecraft.world.level.storage.LevelResource;
+import net.minecraft.server.packs.repository.ServerPacksSource;
+import net.minecraft.server.packs.repository.RepositorySource;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.world.level.storage.LevelStorageSource;
+import java.util.Optional;
+import net.minecraft.server.players.GameProfileCache;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import java.util.UUID;
+import java.net.Proxy;
+import java.io.File;
+import net.minecraft.server.dedicated.DedicatedServerSettings;
+import java.nio.file.Paths;
+import net.minecraft.Util;
+import net.minecraft.CrashReport;
+import java.io.OutputStream;
+import joptsimple.OptionSpec;
+import joptsimple.OptionParser;
+import org.apache.logging.log4j.Logger;
+
+public class Main {
+    private static final Logger LOGGER;
+    
+    public static void main(final String[] arr) {
+        final OptionParser optionParser2 = new OptionParser();
+        final OptionSpec<Void> optionSpec3 = optionParser2.accepts("nogui");
+        final OptionSpec<Void> optionSpec4 = optionParser2.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits");
+        final OptionSpec<Void> optionSpec5 = optionParser2.accepts("demo");
+        final OptionSpec<Void> optionSpec6 = optionParser2.accepts("bonusChest");
+        final OptionSpec<Void> optionSpec7 = optionParser2.accepts("forceUpgrade");
+        final OptionSpec<Void> optionSpec8 = optionParser2.accepts("eraseCache");
+        final OptionSpec<Void> optionSpec9 = optionParser2.accepts("safeMode", "Loads level with vanilla datapack only");
+        final OptionSpec<Void> optionSpec10 = optionParser2.accepts("help").forHelp();
+        final OptionSpec<String> optionSpec11 = optionParser2.accepts("singleplayer").withRequiredArg();
+        final OptionSpec<String> optionSpec12 = optionParser2.accepts("universe").withRequiredArg().defaultsTo(".", new String[0]);
+        final OptionSpec<String> optionSpec13 = optionParser2.accepts("world").withRequiredArg();
+        final OptionSpec<Integer> optionSpec14 = optionParser2.accepts("port").withRequiredArg().<Integer>ofType(Integer.class).defaultsTo(-1, new Integer[0]);
+        final OptionSpec<String> optionSpec15 = optionParser2.accepts("serverId").withRequiredArg();
+        final OptionSpec<String> optionSpec16 = optionParser2.nonOptions();
+        try {
+            final OptionSet optionSet17 = optionParser2.parse(arr);
+            if (optionSet17.has(optionSpec10)) {
+                optionParser2.printHelpOn(System.err);
+                return;
+            }
+            CrashReport.preload();
+            Bootstrap.bootStrap();
+            Bootstrap.validate();
+            Util.startTimerHackThread();
+            final Path path18 = Paths.get("server.properties");
+            final DedicatedServerSettings yf19 = new DedicatedServerSettings(path18);
+            yf19.forceSave();
+            final Path path19 = Paths.get("eula.txt");
+            final Eula uo21 = new Eula(path19);
+            if (optionSet17.has(optionSpec4)) {
+                Main.LOGGER.info("Initialized '{}' and '{}'", path18.toAbsolutePath(), path19.toAbsolutePath());
+                return;
+            }
+            if (!uo21.hasAgreedToEULA()) {
+                Main.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
+                return;
+            }
+            final File file22 = new File(optionSet17.<String>valueOf(optionSpec12));
+            final YggdrasilAuthenticationService yggdrasilAuthenticationService23 = new YggdrasilAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString());
+            final MinecraftSessionService minecraftSessionService24 = yggdrasilAuthenticationService23.createMinecraftSessionService();
+            final GameProfileRepository gameProfileRepository25 = yggdrasilAuthenticationService23.createProfileRepository();
+            final GameProfileCache abl26 = new GameProfileCache(gameProfileRepository25, new File(file22, MinecraftServer.USERID_CACHE_FILE.getName()));
+            final String string27 = Optional.<String>ofNullable((String)optionSet17.<T>valueOf((OptionSpec<T>)optionSpec13)).orElse(yf19.getProperties().levelName);
+            final LevelStorageSource dae28 = LevelStorageSource.createDefault(file22.toPath());
+            final LevelStorageSource.LevelStorageAccess a29 = dae28.createAccess(string27);
+            MinecraftServer.convertFromRegionFormatIfNeeded(a29);
+            final DataPackConfig bpn30 = a29.getDataPacks();
+            final boolean boolean31 = optionSet17.has(optionSpec9);
+            if (boolean31) {
+                Main.LOGGER.warn("Safe mode active, only vanilla datapack will be loaded");
+            }
+            final PackRepository<Pack> aar32 = new PackRepository<Pack>(Pack::new, new RepositorySource[] { new ServerPacksSource(), new FolderRepositorySource(a29.getLevelPath(LevelResource.DATAPACK_DIR).toFile(), PackSource.WORLD) });
+            final DataPackConfig bpn31 = MinecraftServer.configurePackRepository(aar32, (bpn30 == null) ? DataPackConfig.DEFAULT : bpn30, boolean31);
+            final CompletableFuture<ServerResources> completableFuture34 = ServerResources.loadResources(aar32.openAllSelected(), Commands.CommandSelection.DEDICATED, yf19.getProperties().functionPermissionLevel, Util.backgroundExecutor(), Runnable::run);
+            ServerResources uw35;
+            try {
+                uw35 = completableFuture34.get();
+            }
+            catch (Exception exception36) {
+                Main.LOGGER.warn("Failed to load datapacks, can't proceed with server load. You can either fix your datapacks or reset to vanilla with --safeMode", (Throwable)exception36);
+                aar32.close();
+                return;
+            }
+            uw35.updateGlobals();
+            final RegistryAccess.RegistryHolder a30 = RegistryAccess.builtin();
+            final RegistryReadOps<Tag> ue37 = RegistryReadOps.<Tag>create((com.mojang.serialization.DynamicOps<Tag>)NbtOps.INSTANCE, uw35.getResourceManager(), a30);
+            WorldData dal38 = a29.getDataTag((DynamicOps<Tag>)ue37, bpn31);
+            if (dal38 == null) {
+                LevelSettings bqe39;
+                WorldGenSettings cix40;
+                if (optionSet17.has(optionSpec5)) {
+                    bqe39 = MinecraftServer.DEMO_SETTINGS;
+                    cix40 = WorldGenSettings.DEMO_SETTINGS;
+                }
+                else {
+                    final DedicatedServerProperties ye41 = yf19.getProperties();
+                    bqe39 = new LevelSettings(ye41.levelName, ye41.gamemode, ye41.hardcore, ye41.difficulty, false, new GameRules(), bpn31);
+                    cix40 = (optionSet17.has(optionSpec6) ? ye41.worldGenSettings.withBonusChest() : ye41.worldGenSettings);
+                }
+                dal38 = new PrimaryLevelData(bqe39, cix40, Lifecycle.stable());
+            }
+            if (optionSet17.has(optionSpec7)) {
+                forceUpgrade(a29, DataFixers.getDataFixer(), optionSet17.has(optionSpec8), () -> true, dal38.worldGenSettings().levels());
+            }
+            a29.saveDataTag(a30, dal38);
+            final WorldData dal39 = dal38;
+            final RegistryAccess.RegistryHolder a31;
+            final LevelStorageSource.LevelStorageAccess a32;
+            final PackRepository<Pack> aar33;
+            final ServerResources uw36;
+            final WorldData dal40;
+            final DedicatedServerSettings yf20;
+            final MinecraftSessionService minecraftSessionService25;
+            final GameProfileRepository gameProfileRepository26;
+            final GameProfileCache abl27;
+            final DedicatedServer yd41;
+            final OptionSet set;
+            final OptionSpec<String> option;
+            final OptionSpec<Integer> option2;
+            final OptionSpec<?> option3;
+            final OptionSpec<String> option4;
+            final OptionSpec<?> option5;
+            final OptionSpec<Object> option6;
+            final boolean boolean32;
+            final DedicatedServer yd40 = MinecraftServer.<DedicatedServer>spin(thread -> {
+                yd41 = new DedicatedServer(thread, a31, a32, aar33, uw36, dal40, yf20, DataFixers.getDataFixer(), minecraftSessionService25, gameProfileRepository26, abl27, LoggerChunkProgressListener::new);
+                yd41.setSingleplayerName(set.<String>valueOf(option));
+                yd41.setPort(set.<Integer>valueOf(option2));
+                yd41.setDemo(set.has(option3));
+                yd41.setId(set.<String>valueOf(option4));
+                boolean32 = (!set.has(option5) && !set.valuesOf(option6).contains("nogui"));
+                if (boolean32 && !GraphicsEnvironment.isHeadless()) {
+                    yd41.showGui();
+                }
+                return yd41;
+            });
+            final Thread thread2 = new Thread("Server Shutdown Thread") {
+                @Override
+                public void run() {
+                    yd40.halt(true);
+                }
+            };
+            thread2.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(Main.LOGGER));
+            Runtime.getRuntime().addShutdownHook(thread2);
+        }
+        catch (Exception exception37) {
+            Main.LOGGER.fatal("Failed to start the minecraft server", (Throwable)exception37);
+        }
+    }
+    
+    private static void forceUpgrade(final LevelStorageSource.LevelStorageAccess a, final DataFixer dataFixer, final boolean boolean3, final BooleanSupplier booleanSupplier, final ImmutableSet<ResourceKey<Level>> immutableSet) {
+        Main.LOGGER.info("Forcing world upgrade!");
+        final WorldUpgrader amu6 = new WorldUpgrader(a, dataFixer, immutableSet, boolean3);
+        Component mr7 = null;
+        while (!amu6.isFinished()) {
+            final Component mr8 = amu6.getStatus();
+            if (mr7 != mr8) {
+                mr7 = mr8;
+                Main.LOGGER.info(amu6.getStatus().getString());
+            }
+            final int integer9 = amu6.getTotalChunks();
+            if (integer9 > 0) {
+                final int integer10 = amu6.getConverted() + amu6.getSkipped();
+                Main.LOGGER.info("{}% completed ({} / {} chunks)...", Mth.floor(integer10 / (float)integer9 * 100.0f), integer10, integer9);
+            }
+            if (!booleanSupplier.getAsBoolean()) {
+                amu6.cancel();
+            }
+            else {
+                try {
+                    Thread.sleep(1000L);
+                }
+                catch (InterruptedException ex) {}
+            }
+        }
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+}
diff --git a/src/net/minecraft/server/MinecraftServer.java b/src/net/minecraft/server/MinecraftServer.java
index 17bd5ea..d1dffa4 100644
--- a/src/net/minecraft/server/MinecraftServer.java
+++ b/src/net/minecraft/server/MinecraftServer.java
@@ -1,10 +1,9 @@
 package net.minecraft.server;
 
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Block;
+import java.util.concurrent.CompletionStage;
+import net.minecraft.util.profiling.ProfileResults;
 import java.lang.management.ThreadMXBean;
-import java.util.function.Function;
 import java.util.Comparator;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ManagementFactory;
@@ -14,38 +13,43 @@ import java.nio.file.OpenOption;
 import net.minecraft.resources.ResourceLocation;
 import java.nio.file.Files;
 import java.nio.file.attribute.FileAttribute;
+import java.nio.file.Path;
 import net.minecraft.server.players.ServerOpListEntry;
+import net.minecraft.world.level.storage.loot.PredicateManager;
+import net.minecraft.world.level.storage.loot.LootTables;
+import net.minecraft.tags.TagManager;
+import net.minecraft.world.item.crafting.RecipeManager;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.server.players.UserWhiteList;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.server.packs.Pack;
+import com.google.common.collect.Sets;
+import net.minecraft.world.level.DataPackConfig;
+import net.minecraft.server.packs.PackResources;
+import net.minecraft.commands.Commands;
+import java.util.stream.Collector;
+import java.util.function.Predicate;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.Collection;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.level.storage.LevelData;
 import net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket;
 import java.util.function.Consumer;
-import java.nio.file.Path;
-import joptsimple.OptionSet;
-import net.minecraft.DefaultUncaughtExceptionHandler;
-import java.awt.GraphicsEnvironment;
-import net.minecraft.server.dedicated.DedicatedServer;
-import net.minecraft.server.level.progress.LoggerChunkProgressListener;
-import net.minecraft.util.datafix.DataFixers;
-import java.util.Optional;
 import java.util.UUID;
-import net.minecraft.server.dedicated.DedicatedServerSettings;
-import java.nio.file.Paths;
-import joptsimple.OptionSpec;
-import joptsimple.OptionParser;
+import java.util.Optional;
+import java.util.Set;
 import net.minecraft.gametest.framework.GameTestTicker;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundSetTimePacket;
-import net.minecraft.core.Registry;
+import net.minecraft.world.level.GameRules;
 import java.util.Collections;
 import java.util.Arrays;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.Mth;
 import com.mojang.authlib.GameProfile;
 import java.util.function.BooleanSupplier;
 import java.nio.ByteBuffer;
@@ -60,111 +64,124 @@ import javax.imageio.ImageIO;
 import io.netty.buffer.Unpooled;
 import java.util.Date;
 import java.text.SimpleDateFormat;
+import net.minecraft.util.profiling.SingleTickProfiler;
 import net.minecraft.SharedConstants;
 import net.minecraft.network.chat.TextComponent;
-import net.minecraft.world.level.LevelConflictException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import net.minecraft.world.level.storage.LevelResource;
 import it.unimi.dsi.fastutil.longs.LongIterator;
 import net.minecraft.server.level.ServerChunkCache;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ForcedChunksSavedData;
+import net.minecraft.util.Unit;
 import net.minecraft.server.level.TicketType;
-import net.minecraft.world.level.ChunkPos;
-import java.util.Collection;
-import net.minecraft.server.packs.repository.RepositorySource;
-import net.minecraft.server.packs.repository.ServerPacksSource;
-import net.minecraft.world.level.GameRules;
-import net.minecraft.world.Difficulty;
 import net.minecraft.world.level.GameType;
+import net.minecraft.world.Difficulty;
+import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.server.level.PlayerRespawnLogic;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.core.BlockPos;
 import java.util.Iterator;
-import net.minecraft.server.level.DerivedServerLevel;
+import net.minecraft.world.level.border.WorldBorder;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.core.MappedRegistry;
+import net.minecraft.world.level.border.BorderChangeListener;
+import net.minecraft.world.level.storage.ServerLevelData;
+import net.minecraft.world.level.storage.DerivedLevelData;
+import net.minecraft.core.Registry;
 import net.minecraft.ReportedException;
 import net.minecraft.CrashReport;
-import net.minecraft.util.profiling.ProfilerFiller;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.dimension.LevelStem;
+import net.minecraft.world.level.CustomSpawner;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.entity.npc.WanderingTraderSpawner;
+import net.minecraft.world.entity.ai.village.VillageSiege;
+import net.minecraft.world.entity.npc.CatSpawner;
+import net.minecraft.world.level.levelgen.PatrolSpawner;
+import net.minecraft.world.level.levelgen.PhantomSpawner;
+import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.server.level.progress.ChunkProgressListener;
-import net.minecraft.world.level.storage.LevelStorage;
-import com.google.gson.JsonElement;
-import net.minecraft.world.level.LevelType;
-import net.minecraft.world.level.storage.LevelData;
-import net.minecraft.util.Mth;
-import net.minecraft.util.worldupdate.WorldUpgrader;
+import net.minecraft.network.chat.Component;
 import net.minecraft.util.ProgressListener;
-import net.minecraft.network.chat.TranslatableComponent;
 import java.io.IOException;
 import net.minecraft.world.level.saveddata.SavedData;
 import net.minecraft.world.level.saveddata.SaveDataDirtyRunnable;
 import net.minecraft.world.scores.Scoreboard;
 import net.minecraft.world.scores.ScoreboardSaveData;
 import net.minecraft.world.level.storage.DimensionDataStorage;
-import net.minecraft.server.packs.resources.PreparableReloadListener;
-import net.minecraft.server.packs.resources.SimpleReloadableResourceManager;
-import net.minecraft.server.packs.PackType;
 import com.google.common.collect.Maps;
+import net.minecraft.util.profiling.InactiveProfiler;
 import com.google.common.collect.Lists;
 import net.minecraft.Util;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import net.minecraft.world.level.storage.WorldData;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import java.util.concurrent.Executor;
 import net.minecraft.util.FrameTimer;
-import net.minecraft.world.level.storage.loot.LootTables;
-import net.minecraft.world.level.storage.loot.PredicateManager;
 import net.minecraft.server.bossevents.CustomBossEvents;
 import net.minecraft.world.level.storage.CommandStorage;
-import net.minecraft.tags.TagManager;
-import net.minecraft.world.item.crafting.RecipeManager;
-import net.minecraft.commands.Commands;
-import net.minecraft.server.packs.repository.FolderRepositorySource;
-import net.minecraft.server.packs.repository.UnopenedPack;
+import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackRepository;
-import net.minecraft.server.packs.resources.ReloadableResourceManager;
 import net.minecraft.server.players.GameProfileCache;
 import com.mojang.authlib.GameProfileRepository;
 import com.mojang.authlib.minecraft.MinecraftSessionService;
-import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
-import net.minecraft.network.chat.Component;
 import java.security.KeyPair;
 import javax.annotation.Nullable;
 import java.net.Proxy;
 import net.minecraft.server.players.PlayerList;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import java.util.Map;
+import net.minecraft.core.RegistryAccess;
 import com.mojang.datafixers.DataFixer;
 import java.util.Random;
 import net.minecraft.network.protocol.status.ServerStatus;
 import net.minecraft.server.level.progress.ChunkProgressListenerFactory;
 import net.minecraft.server.network.ServerConnectionListener;
-import net.minecraft.util.profiling.GameProfiler;
+import net.minecraft.util.profiling.ProfilerFiller;
+import net.minecraft.util.profiling.ContinuousProfiler;
 import java.util.List;
 import net.minecraft.world.Snooper;
+import net.minecraft.world.level.storage.PlayerDataStorage;
 import net.minecraft.world.level.storage.LevelStorageSource;
 import net.minecraft.world.level.LevelSettings;
-import net.minecraft.util.Unit;
-import java.util.concurrent.CompletableFuture;
 import java.io.File;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.commands.CommandSource;
 import net.minecraft.world.SnooperPopulator;
 import net.minecraft.util.thread.ReentrantBlockableEventLoop;
 
-public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements SnooperPopulator, CommandSource, AutoCloseable, Runnable {
+public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements SnooperPopulator, CommandSource, AutoCloseable {
     private static final Logger LOGGER;
     public static final File USERID_CACHE_FILE;
-    private static final CompletableFuture<Unit> DATA_RELOAD_INITIAL_TASK;
     public static final LevelSettings DEMO_SETTINGS;
-    private final LevelStorageSource storageSource;
+    protected final LevelStorageSource.LevelStorageAccess storageSource;
+    protected final PlayerDataStorage playerDataStorage;
     private final Snooper snooper;
-    private final File universe;
     private final List<Runnable> tickables;
-    private final GameProfiler profiler;
+    private ContinuousProfiler continousProfiler;
+    private ProfilerFiller profiler;
     private final ServerConnectionListener connection;
-    protected final ChunkProgressListenerFactory progressListenerFactory;
+    private final ChunkProgressListenerFactory progressListenerFactory;
     private final ServerStatus status;
     private final Random random;
     private final DataFixer fixerUpper;
     private String localIp;
     private int port;
-    private final Map<DimensionType, ServerLevel> levels;
+    protected final RegistryAccess.RegistryHolder registryHolder;
+    private final Map<ResourceKey<Level>, ServerLevel> levels;
     private PlayerList playerList;
     private volatile boolean running;
     private boolean stopped;
@@ -172,8 +189,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     protected final Proxy proxy;
     private boolean onlineMode;
     private boolean preventProxyConnections;
-    private boolean animals;
-    private boolean npcs;
     private boolean pvp;
     private boolean allowFlight;
     @Nullable
@@ -185,122 +200,105 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     private KeyPair keyPair;
     @Nullable
     private String singleplayerName;
-    private final String levelIdName;
-    @Nullable
-    private String levelName;
     private boolean isDemo;
-    private boolean levelHasStartingBonusChest;
     private String resourcePack;
     private String resourcePackHash;
     private volatile boolean isReady;
     private long lastOverloadWarning;
-    @Nullable
-    private Component startupState;
     private boolean delayProfilerStart;
     private boolean forceGameType;
-    @Nullable
-    private final YggdrasilAuthenticationService authenticationService;
     private final MinecraftSessionService sessionService;
     private final GameProfileRepository profileRepository;
     private final GameProfileCache profileCache;
     private long lastServerStatus;
-    protected final Thread serverThread;
+    private final Thread serverThread;
     private long nextTickTime;
     private long delayedTasksMaxNextTickTime;
     private boolean mayHaveDelayedTasks;
     private boolean hasWorldScreenshot;
-    private final ReloadableResourceManager resources;
-    private final PackRepository<UnopenedPack> packRepository;
-    @Nullable
-    private FolderRepositorySource folderPackSource;
-    private final Commands commands;
-    private final RecipeManager recipes;
-    private final TagManager tags;
+    private final PackRepository<Pack> packRepository;
     private final ServerScoreboard scoreboard;
     @Nullable
     private CommandStorage commandStorage;
     private final CustomBossEvents customBossEvents;
-    private final PredicateManager predicateManager;
-    private final LootTables lootTables;
-    private final ServerAdvancementManager advancements;
-    private final ServerFunctionManager functions;
+    private final ServerFunctionManager functionManager;
     private final FrameTimer frameTimer;
     private boolean enforceWhitelist;
-    private boolean forceUpgrade;
-    private boolean eraseCache;
     private float averageTickTime;
     private final Executor executor;
     @Nullable
     private String serverId;
+    private ServerResources resources;
+    private final StructureManager structureManager;
+    protected final WorldData worldData;
     
-    public MinecraftServer(final File file, final Proxy proxy, final DataFixer dataFixer, final Commands cr, final YggdrasilAuthenticationService yggdrasilAuthenticationService, final MinecraftSessionService minecraftSessionService, final GameProfileRepository gameProfileRepository, final GameProfileCache zk, final ChunkProgressListenerFactory xn, final String string) {
+    public static <S extends MinecraftServer> S spin(final Function<Thread, S> function) {
+        final AtomicReference<S> atomicReference2 = new AtomicReference<S>();
+        final Thread thread3 = new Thread(() -> atomicReference2.get().runServer(), "Server thread");
+        thread3.setUncaughtExceptionHandler((thread, throwable) -> MinecraftServer.LOGGER.error(throwable));
+        final S minecraftServer4 = function.apply(thread3);
+        atomicReference2.set(minecraftServer4);
+        thread3.start();
+        return minecraftServer4;
+    }
+    
+    public MinecraftServer(final Thread thread, final RegistryAccess.RegistryHolder a, final LevelStorageSource.LevelStorageAccess a, final WorldData dal, final PackRepository<Pack> aar, final Proxy proxy, final DataFixer dataFixer, final ServerResources uw, final MinecraftSessionService minecraftSessionService, final GameProfileRepository gameProfileRepository, final GameProfileCache abl, final ChunkProgressListenerFactory zn) {
         super("Server");
         this.snooper = new Snooper("server", this, Util.getMillis());
         this.tickables = Lists.newArrayList();
-        this.profiler = new GameProfiler(this::getTickCount);
+        this.continousProfiler = new ContinuousProfiler(Util.timeSource, this::getTickCount);
+        this.profiler = InactiveProfiler.INSTANCE;
         this.status = new ServerStatus();
         this.random = new Random();
         this.port = -1;
-        this.levels = Maps.newIdentityHashMap();
+        this.levels = Maps.newLinkedHashMap();
         this.running = true;
         this.tickTimes = new long[100];
         this.resourcePack = "";
         this.resourcePackHash = "";
-        this.serverThread = Util.<Thread>make(new Thread(this, "Server thread"), thread -> thread.setUncaughtExceptionHandler((thread, throwable) -> MinecraftServer.LOGGER.error(throwable)));
         this.nextTickTime = Util.getMillis();
-        this.resources = new SimpleReloadableResourceManager(PackType.SERVER_DATA, this.serverThread);
-        this.packRepository = new PackRepository<UnopenedPack>(UnopenedPack::new);
-        this.recipes = new RecipeManager();
-        this.tags = new TagManager();
         this.scoreboard = new ServerScoreboard(this);
-        this.customBossEvents = new CustomBossEvents(this);
-        this.predicateManager = new PredicateManager();
-        this.lootTables = new LootTables(this.predicateManager);
-        this.advancements = new ServerAdvancementManager();
-        this.functions = new ServerFunctionManager(this);
+        this.customBossEvents = new CustomBossEvents();
         this.frameTimer = new FrameTimer();
+        this.registryHolder = a;
+        this.worldData = dal;
         this.proxy = proxy;
-        this.commands = cr;
-        this.authenticationService = yggdrasilAuthenticationService;
+        this.packRepository = aar;
+        this.resources = uw;
         this.sessionService = minecraftSessionService;
         this.profileRepository = gameProfileRepository;
-        this.profileCache = zk;
-        this.universe = file;
+        this.profileCache = abl;
         this.connection = new ServerConnectionListener(this);
-        this.progressListenerFactory = xn;
-        this.storageSource = new LevelStorageSource(file.toPath(), file.toPath().resolve("../backups"), dataFixer);
+        this.progressListenerFactory = zn;
+        this.storageSource = a;
+        this.playerDataStorage = a.createPlayerStorage();
         this.fixerUpper = dataFixer;
-        this.resources.registerReloadListener(this.tags);
-        this.resources.registerReloadListener(this.predicateManager);
-        this.resources.registerReloadListener(this.recipes);
-        this.resources.registerReloadListener(this.lootTables);
-        this.resources.registerReloadListener(this.functions);
-        this.resources.registerReloadListener(this.advancements);
+        this.functionManager = new ServerFunctionManager(this, uw.getFunctionLibrary());
+        this.structureManager = new StructureManager(uw.getResourceManager(), a, dataFixer);
+        this.serverThread = thread;
         this.executor = Util.backgroundExecutor();
-        this.levelIdName = string;
     }
     
-    private void readScoreboard(final DimensionDataStorage crl) {
-        final ScoreboardSaveData cwm3 = crl.<ScoreboardSaveData>computeIfAbsent(ScoreboardSaveData::new, "scoreboard");
-        cwm3.setScoreboard(this.getScoreboard());
-        this.getScoreboard().addDirtyListener(new SaveDataDirtyRunnable(cwm3));
+    private void readScoreboard(final DimensionDataStorage daa) {
+        final ScoreboardSaveData dfn3 = daa.<ScoreboardSaveData>computeIfAbsent(ScoreboardSaveData::new, "scoreboard");
+        dfn3.setScoreboard(this.getScoreboard());
+        this.getScoreboard().addDirtyListener(new SaveDataDirtyRunnable(dfn3));
     }
     
     protected abstract boolean initServer() throws IOException;
     
-    protected void ensureLevelConversion(final String string) {
-        if (this.getStorageSource().requiresConversion(string)) {
+    public static void convertFromRegionFormatIfNeeded(final LevelStorageSource.LevelStorageAccess a) {
+        if (a.requiresConversion()) {
             MinecraftServer.LOGGER.info("Converting map!");
-            this.setServerStartupState(new TranslatableComponent("menu.convertingLevel", new Object[0]));
-            this.getStorageSource().convertLevel(string, new ProgressListener() {
+            a.convertLevel(new ProgressListener() {
                 private long timeStamp = Util.getMillis();
                 
                 @Override
-                public void progressStartNoAbort(final Component lf) {
+                public void progressStartNoAbort(final Component mr) {
                 }
                 
                 @Override
-                public void progressStart(final Component lf) {
+                public void progressStart(final Component mr) {
                 }
                 
                 @Override
@@ -316,205 +314,216 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                 }
                 
                 @Override
-                public void progressStage(final Component lf) {
+                public void progressStage(final Component mr) {
                 }
             });
         }
-        if (this.forceUpgrade) {
-            MinecraftServer.LOGGER.info("Forcing world upgrade!");
-            final LevelData crm3 = this.getStorageSource().getDataTagFor(this.getLevelIdName());
-            if (crm3 != null) {
-                final WorldUpgrader aiz4 = new WorldUpgrader(this.getLevelIdName(), this.getStorageSource(), crm3, this.eraseCache);
-                Component lf5 = null;
-                while (!aiz4.isFinished()) {
-                    final Component lf6 = aiz4.getStatus();
-                    if (lf5 != lf6) {
-                        lf5 = lf6;
-                        MinecraftServer.LOGGER.info(aiz4.getStatus().getString());
-                    }
-                    final int integer7 = aiz4.getTotalChunks();
-                    if (integer7 > 0) {
-                        final int integer8 = aiz4.getConverted() + aiz4.getSkipped();
-                        MinecraftServer.LOGGER.info("{}% completed ({} / {} chunks)...", Mth.floor(integer8 / (float)integer7 * 100.0f), integer8, integer7);
-                    }
-                    if (this.isStopped()) {
-                        aiz4.cancel();
-                    }
-                    else {
-                        try {
-                            Thread.sleep(1000L);
-                        }
-                        catch (InterruptedException ex) {}
-                    }
-                }
-            }
-        }
     }
     
-    protected synchronized void setServerStartupState(final Component lf) {
-        this.startupState = lf;
+    protected void loadLevel() {
+        this.detectBundledResources();
+        this.worldData.setModdedInfo(this.getServerModName(), this.getModdedStatus().isPresent());
+        final ChunkProgressListener zm2 = this.progressListenerFactory.create(11);
+        this.createLevels(zm2);
+        this.forceDifficulty();
+        this.prepareLevels(zm2);
     }
     
-    protected void loadLevel(final String string1, final String string2, final long long3, final LevelType bkd, final JsonElement jsonElement) {
-        this.ensureLevelConversion(string1);
-        this.setServerStartupState(new TranslatableComponent("menu.loadingLevel", new Object[0]));
-        final LevelStorage crn8 = this.getStorageSource().selectLevel(string1, this);
-        this.detectBundledResources(this.getLevelIdName(), crn8);
-        LevelData crm10 = crn8.prepareLevel();
-        LevelSettings bka9;
-        if (crm10 == null) {
-            if (this.isDemo()) {
-                bka9 = MinecraftServer.DEMO_SETTINGS;
-            }
-            else {
-                bka9 = new LevelSettings(long3, this.getDefaultGameType(), this.canGenerateStructures(), this.isHardcore(), bkd);
-                bka9.setLevelTypeOptions(jsonElement);
-                if (this.levelHasStartingBonusChest) {
-                    bka9.enableStartingBonusItems();
-                }
-            }
-            crm10 = new LevelData(bka9, string2);
+    protected void forceDifficulty() {
+    }
+    
+    protected void createLevels(final ChunkProgressListener zm) {
+        final ServerLevelData dak3 = this.worldData.overworldData();
+        final WorldGenSettings cix4 = this.worldData.worldGenSettings();
+        final boolean boolean5 = cix4.isDebug();
+        final long long6 = cix4.seed();
+        final long long7 = BiomeManager.obfuscateSeed(long6);
+        final List<CustomSpawner> list10 = ImmutableList.<CustomSpawner>of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(dak3));
+        final MappedRegistry<LevelStem> gh11 = cix4.dimensions();
+        final LevelStem cig13 = gh11.get(LevelStem.OVERWORLD);
+        DimensionType cif14;
+        ChunkGenerator cha12;
+        if (cig13 == null) {
+            cif14 = DimensionType.defaultOverworld();
+            cha12 = WorldGenSettings.makeDefaultOverworld(new Random().nextLong());
         }
         else {
-            crm10.setLevelName(string2);
-            bka9 = new LevelSettings(crm10);
+            cif14 = cig13.type();
+            cha12 = cig13.generator();
         }
-        crm10.setModdedInfo(this.getServerModName(), this.getModdedStatus().isPresent());
-        this.loadDataPacks(crn8.getFolder(), crm10);
-        final ChunkProgressListener xm11 = this.progressListenerFactory.create(11);
-        this.createLevels(crn8, crm10, bka9, xm11);
-        this.setDifficulty(this.getDefaultDifficulty(), true);
-        this.prepareLevels(xm11);
-    }
-    
-    protected void createLevels(final LevelStorage crn, final LevelData crm, final LevelSettings bka, final ChunkProgressListener xm) {
-        if (this.isDemo()) {
-            crm.setLevelSettings(MinecraftServer.DEMO_SETTINGS);
-        }
-        final ServerLevel xd6 = new ServerLevel(this, this.executor, crn, crm, DimensionType.OVERWORLD, this.profiler, xm);
-        this.levels.put(DimensionType.OVERWORLD, xd6);
-        final DimensionDataStorage crl7 = xd6.getDataStorage();
-        this.readScoreboard(crl7);
-        this.commandStorage = new CommandStorage(crl7);
-        xd6.getWorldBorder().readBorderData(crm);
-        final ServerLevel xd7 = this.getLevel(DimensionType.OVERWORLD);
-        if (!crm.isInitialized()) {
+        final Object o;
+        final Object obj;
+        final ResourceKey<DimensionType> ug15 = this.registryHolder.dimensionTypes().getResourceKey(cif14).<Throwable>orElseThrow(() -> {
+            new IllegalStateException("Unregistered dimension type: " + obj);
+            return o;
+        });
+        final ServerLevel zd16 = new ServerLevel(this, this.executor, this.storageSource, dak3, Level.OVERWORLD, ug15, cif14, zm, cha12, boolean5, long7, list10, true);
+        this.levels.put(Level.OVERWORLD, zd16);
+        final DimensionDataStorage daa17 = zd16.getDataStorage();
+        this.readScoreboard(daa17);
+        this.commandStorage = new CommandStorage(daa17);
+        final WorldBorder cgw18 = zd16.getWorldBorder();
+        cgw18.applySettings(dak3.getWorldBorder());
+        if (!dak3.isInitialized()) {
             try {
-                xd7.setInitialSpawn(bka);
-                if (crm.getGeneratorType() == LevelType.DEBUG_ALL_BLOCK_STATES) {
-                    this.setupDebugLevel(crm);
+                setInitialSpawn(zd16, dak3, cix4.generateBonusChest(), boolean5, true);
+                dak3.setInitialized(true);
+                if (boolean5) {
+                    this.setupDebugLevel(this.worldData);
                 }
-                crm.setInitialized(true);
             }
-            catch (Throwable throwable9) {
-                final CrashReport h10 = CrashReport.forThrowable(throwable9, "Exception initializing level");
+            catch (Throwable throwable19) {
+                final CrashReport j20 = CrashReport.forThrowable(throwable19, "Exception initializing level");
                 try {
-                    xd7.fillReportDetails(h10);
+                    zd16.fillReportDetails(j20);
                 }
                 catch (Throwable t) {}
-                throw new ReportedException(h10);
+                throw new ReportedException(j20);
             }
-            crm.setInitialized(true);
+            dak3.setInitialized(true);
         }
-        this.getPlayerList().setLevel(xd7);
-        if (crm.getCustomBossEvents() != null) {
-            this.getCustomBossEvents().load(crm.getCustomBossEvents());
+        this.getPlayerList().setLevel(zd16);
+        if (this.worldData.getCustomBossEvents() != null) {
+            this.getCustomBossEvents().load(this.worldData.getCustomBossEvents());
         }
-        for (final DimensionType cbi10 : DimensionType.getAllTypes()) {
-            if (cbi10 == DimensionType.OVERWORLD) {
+        for (final Map.Entry<ResourceKey<LevelStem>, LevelStem> entry20 : gh11.entrySet()) {
+            final ResourceKey<LevelStem> ug16 = entry20.getKey();
+            if (ug16 == LevelStem.OVERWORLD) {
                 continue;
             }
-            this.levels.put(cbi10, new DerivedServerLevel(xd7, this, this.executor, crn, cbi10, this.profiler, xm));
+            final ResourceKey<Level> ug17 = ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, ug16.location());
+            final DimensionType cif15 = entry20.getValue().type();
+            final Object o2;
+            final Object obj2;
+            final ResourceKey<DimensionType> ug18 = this.registryHolder.dimensionTypes().getResourceKey(cif15).<Throwable>orElseThrow(() -> {
+                new IllegalStateException("Unregistered dimension type: " + obj2);
+                return o2;
+            });
+            final ChunkGenerator cha13 = entry20.getValue().generator();
+            final DerivedLevelData czz26 = new DerivedLevelData(this.worldData, dak3);
+            final ServerLevel zd17 = new ServerLevel(this, this.executor, this.storageSource, czz26, ug17, ug18, cif15, zm, cha13, boolean5, long7, ImmutableList.of(), false);
+            cgw18.addListener(new BorderChangeListener.DelegateBorderChangeListener(zd17.getWorldBorder()));
+            this.levels.put(ug17, zd17);
         }
     }
     
-    private void setupDebugLevel(final LevelData crm) {
-        crm.setGenerateMapFeatures(false);
-        crm.setAllowCommands(true);
-        crm.setRaining(false);
-        crm.setThundering(false);
-        crm.setClearWeatherTime(1000000000);
-        crm.setDayTime(6000L);
-        crm.setGameType(GameType.SPECTATOR);
-        crm.setHardcore(false);
-        crm.setDifficulty(Difficulty.PEACEFUL);
-        crm.setDifficultyLocked(true);
-        crm.getGameRules().<GameRules.BooleanValue>getRule(GameRules.RULE_DAYLIGHT).set(false, this);
-    }
-    
-    protected void loadDataPacks(final File file, final LevelData crm) {
-        this.packRepository.addSource(new ServerPacksSource());
-        this.folderPackSource = new FolderRepositorySource(new File(file, "datapacks"));
-        this.packRepository.addSource(this.folderPackSource);
-        this.packRepository.reload();
-        final List<UnopenedPack> list4 = Lists.newArrayList();
-        for (final String string6 : crm.getEnabledDataPacks()) {
-            final UnopenedPack yt7 = this.packRepository.getPack(string6);
-            if (yt7 != null) {
-                list4.add(yt7);
-            }
-            else {
-                MinecraftServer.LOGGER.warn("Missing data pack {}", string6);
+    private static void setInitialSpawn(final ServerLevel zd, final ServerLevelData dak, final boolean boolean3, final boolean boolean4, final boolean boolean5) {
+        final ChunkGenerator cha6 = zd.getChunkSource().getGenerator();
+        if (!boolean5) {
+            dak.setSpawn(BlockPos.ZERO.above(cha6.getSpawnHeight()));
+            return;
+        }
+        if (boolean4) {
+            dak.setSpawn(BlockPos.ZERO.above());
+            return;
+        }
+        final BiomeSource brh7 = cha6.getBiomeSource();
+        final List<Biome> list8 = brh7.getPlayerSpawnBiomes();
+        final Random random9 = new Random(zd.getSeed());
+        final BlockPos fu10 = brh7.findBiomeHorizontal(0, zd.getSeaLevel(), 0, 256, list8, random9);
+        final ChunkPos bph11 = (fu10 == null) ? new ChunkPos(0, 0) : new ChunkPos(fu10);
+        if (fu10 == null) {
+            MinecraftServer.LOGGER.warn("Unable to find spawn biome");
+        }
+        boolean boolean6 = false;
+        for (final Block bvr14 : BlockTags.VALID_SPAWN.getValues()) {
+            if (brh7.getSurfaceBlocks().contains(bvr14.defaultBlockState())) {
+                boolean6 = true;
+                break;
             }
         }
-        this.packRepository.setSelected(list4);
-        this.updateSelectedPacks(crm);
-        this.refreshRegistries();
+        dak.setSpawn(bph11.getWorldPosition().offset(8, cha6.getSpawnHeight(), 8));
+        int integer13 = 0;
+        int integer14 = 0;
+        int integer15 = 0;
+        int integer16 = -1;
+        final int integer17 = 32;
+        for (int integer18 = 0; integer18 < 1024; ++integer18) {
+            if (integer13 > -16 && integer13 <= 16 && integer14 > -16 && integer14 <= 16) {
+                final BlockPos fu11 = PlayerRespawnLogic.getSpawnPosInChunk(zd, new ChunkPos(bph11.x + integer13, bph11.z + integer14), boolean6);
+                if (fu11 != null) {
+                    dak.setSpawn(fu11);
+                    break;
+                }
+            }
+            if (integer13 == integer14 || (integer13 < 0 && integer13 == -integer14) || (integer13 > 0 && integer13 == 1 - integer14)) {
+                final int integer19 = integer15;
+                integer15 = -integer16;
+                integer16 = integer19;
+            }
+            integer13 += integer15;
+            integer14 += integer16;
+        }
+        if (boolean3) {
+            final ConfiguredFeature<?, ?> ckb18 = Feature.BONUS_CHEST.configured(FeatureConfiguration.NONE);
+            ckb18.place(zd, zd.structureFeatureManager(), cha6, zd.random, new BlockPos(dak.getXSpawn(), dak.getYSpawn(), dak.getZSpawn()));
+        }
     }
     
-    protected void prepareLevels(final ChunkProgressListener xm) {
-        this.setServerStartupState(new TranslatableComponent("menu.generatingTerrain", new Object[0]));
-        final ServerLevel xd3 = this.getLevel(DimensionType.OVERWORLD);
-        MinecraftServer.LOGGER.info("Preparing start region for dimension " + DimensionType.getName(xd3.dimension.getType()));
-        final BlockPos fk4 = xd3.getSharedSpawnPos();
-        xm.updateSpawnPos(new ChunkPos(fk4));
-        final ServerChunkCache xb5 = xd3.getChunkSource();
-        xb5.getLightEngine().setTaskPerBatch(500);
+    private void setupDebugLevel(final WorldData dal) {
+        dal.setDifficulty(Difficulty.PEACEFUL);
+        dal.setDifficultyLocked(true);
+        final ServerLevelData dak3 = dal.overworldData();
+        dak3.setRaining(false);
+        dak3.setThundering(false);
+        dak3.setClearWeatherTime(1000000000);
+        dak3.setDayTime(6000L);
+        dak3.setGameType(GameType.SPECTATOR);
+    }
+    
+    private void prepareLevels(final ChunkProgressListener zm) {
+        final ServerLevel zd3 = this.overworld();
+        MinecraftServer.LOGGER.info("Preparing start region for dimension {}", zd3.dimension().location());
+        final BlockPos fu4 = zd3.getSharedSpawnPos();
+        zm.updateSpawnPos(new ChunkPos(fu4));
+        final ServerChunkCache zb5 = zd3.getChunkSource();
+        zb5.getLightEngine().setTaskPerBatch(500);
         this.nextTickTime = Util.getMillis();
-        xb5.<Unit>addRegionTicket(TicketType.START, new ChunkPos(fk4), 11, Unit.INSTANCE);
-        while (xb5.getTickingGenerated() != 441) {
+        zb5.<Unit>addRegionTicket(TicketType.START, new ChunkPos(fu4), 11, Unit.INSTANCE);
+        while (zb5.getTickingGenerated() != 441) {
             this.nextTickTime = Util.getMillis() + 10L;
             this.waitUntilNextTick();
         }
         this.nextTickTime = Util.getMillis() + 10L;
         this.waitUntilNextTick();
-        for (final DimensionType cbi7 : DimensionType.getAllTypes()) {
-            final ForcedChunksSavedData bjr8 = this.getLevel(cbi7).getDataStorage().<ForcedChunksSavedData>get(ForcedChunksSavedData::new, "chunks");
-            if (bjr8 != null) {
-                final ServerLevel xd4 = this.getLevel(cbi7);
-                final LongIterator longIterator10 = bjr8.getChunks().iterator();
-                while (longIterator10.hasNext()) {
-                    final long long11 = longIterator10.nextLong();
-                    final ChunkPos bjh13 = new ChunkPos(long11);
-                    xd4.getChunkSource().updateChunkForced(bjh13, true);
+        for (final ServerLevel zd4 : this.levels.values()) {
+            final ForcedChunksSavedData bpw8 = zd4.getDataStorage().<ForcedChunksSavedData>get(ForcedChunksSavedData::new, "chunks");
+            if (bpw8 != null) {
+                final LongIterator longIterator9 = bpw8.getChunks().iterator();
+                while (longIterator9.hasNext()) {
+                    final long long10 = longIterator9.nextLong();
+                    final ChunkPos bph12 = new ChunkPos(long10);
+                    zd4.getChunkSource().updateChunkForced(bph12, true);
                 }
             }
         }
         this.nextTickTime = Util.getMillis() + 10L;
         this.waitUntilNextTick();
-        xm.stop();
-        xb5.getLightEngine().setTaskPerBatch(5);
+        zm.stop();
+        zb5.getLightEngine().setTaskPerBatch(5);
+        this.updateMobSpawningFlags();
     }
     
-    protected void detectBundledResources(final String string, final LevelStorage crn) {
-        final File file4 = new File(crn.getFolder(), "resources.zip");
-        if (file4.isFile()) {
+    protected void detectBundledResources() {
+        final File file2 = this.storageSource.getLevelPath(LevelResource.MAP_RESOURCE_FILE).toFile();
+        if (file2.isFile()) {
+            final String string3 = this.storageSource.getLevelId();
             try {
-                this.setResourcePack("level://" + URLEncoder.encode(string, StandardCharsets.UTF_8.toString()) + "/" + "resources.zip", "");
+                this.setResourcePack("level://" + URLEncoder.encode(string3, StandardCharsets.UTF_8.toString()) + "/" + "resources.zip", "");
             }
-            catch (UnsupportedEncodingException unsupportedEncodingException5) {
-                MinecraftServer.LOGGER.warn("Something went wrong url encoding {}", string);
+            catch (UnsupportedEncodingException unsupportedEncodingException4) {
+                MinecraftServer.LOGGER.warn("Something went wrong url encoding {}", string3);
             }
         }
     }
     
-    public abstract boolean canGenerateStructures();
+    public GameType getDefaultGameType() {
+        return this.worldData.getGameType();
+    }
     
-    public abstract GameType getDefaultGameType();
-    
-    public abstract Difficulty getDefaultDifficulty();
-    
-    public abstract boolean isHardcore();
+    public boolean isHardcore() {
+        return this.worldData.isHardcore();
+    }
     
     public abstract int getOperatorUserPermissionLevel();
     
@@ -524,23 +533,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     
     public boolean saveAllChunks(final boolean boolean1, final boolean boolean2, final boolean boolean3) {
         boolean boolean4 = false;
-        for (final ServerLevel xd7 : this.getAllLevels()) {
+        for (final ServerLevel zd7 : this.getAllLevels()) {
             if (!boolean1) {
-                MinecraftServer.LOGGER.info("Saving chunks for level '{}'/{}", xd7.getLevelData().getLevelName(), DimensionType.getName(xd7.dimension.getType()));
-            }
-            try {
-                xd7.save(null, boolean2, xd7.noSave && !boolean3);
-            }
-            catch (LevelConflictException bjy8) {
-                MinecraftServer.LOGGER.warn(bjy8.getMessage());
+                MinecraftServer.LOGGER.info("Saving chunks for level '{}'/{}", zd7, zd7.dimension().location());
             }
+            zd7.save(null, boolean2, zd7.noSave && !boolean3);
             boolean4 = true;
         }
-        final ServerLevel xd8 = this.getLevel(DimensionType.OVERWORLD);
-        final LevelData crm7 = xd8.getLevelData();
-        xd8.getWorldBorder().saveWorldBorderData(crm7);
-        crm7.setCustomBossEvents(this.getCustomBossEvents().save());
-        xd8.getLevelStorage().saveLevelData(crm7, this.getPlayerList().getSingleplayerData());
+        final ServerLevel zd8 = this.overworld();
+        final ServerLevelData dak7 = this.worldData.overworldData();
+        dak7.setWorldBorder(zd8.getWorldBorder().createSettings());
+        this.worldData.setCustomBossEvents(this.getCustomBossEvents().save());
+        this.storageSource.saveDataTag(this.registryHolder, this.worldData, this.getPlayerList().getSingleplayerData());
         return boolean4;
     }
     
@@ -560,16 +564,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             this.playerList.removeAll();
         }
         MinecraftServer.LOGGER.info("Saving worlds");
-        for (final ServerLevel xd3 : this.getAllLevels()) {
-            if (xd3 != null) {
-                xd3.noSave = false;
+        for (final ServerLevel zd3 : this.getAllLevels()) {
+            if (zd3 != null) {
+                zd3.noSave = false;
             }
         }
         this.saveAllChunks(false, true, false);
-        for (final ServerLevel xd3 : this.getAllLevels()) {
-            if (xd3 != null) {
+        for (final ServerLevel zd3 : this.getAllLevels()) {
+            if (zd3 != null) {
                 try {
-                    xd3.close();
+                    zd3.close();
                 }
                 catch (IOException iOException4) {
                     MinecraftServer.LOGGER.error("Exception closing the level", (Throwable)iOException4);
@@ -579,6 +583,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         if (this.snooper.isStarted()) {
             this.snooper.interrupt();
         }
+        this.resources.close();
+        try {
+            this.storageSource.close();
+        }
+        catch (IOException iOException5) {
+            MinecraftServer.LOGGER.error("Failed to unlock level {}", this.storageSource.getLevelId(), iOException5);
+        }
     }
     
     public String getLocalIp() {
@@ -605,8 +616,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         }
     }
     
-    @Override
-    public void run() {
+    protected void runServer() {
         try {
             if (this.initServer()) {
                 this.nextTickTime = Util.getMillis();
@@ -622,10 +632,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                         this.lastOverloadWarning = this.nextTickTime;
                     }
                     this.nextTickTime += 50L;
-                    if (this.delayProfilerStart) {
-                        this.delayProfilerStart = false;
-                        this.profiler.continuous().enable();
-                    }
+                    final SingleTickProfiler aml4 = SingleTickProfiler.createTickProfiler("Server");
+                    this.startProfilerTick(aml4);
                     this.profiler.startTick();
                     this.profiler.push("tick");
                     this.tickServer(this::haveTime);
@@ -635,6 +643,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                     this.waitUntilNextTick();
                     this.profiler.pop();
                     this.profiler.endTick();
+                    this.endProfilerTick(aml4);
                     this.isReady = true;
                 }
             }
@@ -644,21 +653,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         }
         catch (Throwable throwable2) {
             MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable2);
-            CrashReport h3;
+            CrashReport j3;
             if (throwable2 instanceof ReportedException) {
-                h3 = this.fillReport(((ReportedException)throwable2).getReport());
+                j3 = this.fillReport(((ReportedException)throwable2).getReport());
             }
             else {
-                h3 = this.fillReport(new CrashReport("Exception in server tick loop", throwable2));
+                j3 = this.fillReport(new CrashReport("Exception in server tick loop", throwable2));
             }
             final File file4 = new File(new File(this.getServerDirectory(), "crash-reports"), "crash-" + new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new Date()) + "-server.txt");
-            if (h3.saveToFile(file4)) {
+            if (j3.saveToFile(file4)) {
                 MinecraftServer.LOGGER.error("This crash report has been saved to: {}", file4.getAbsolutePath());
             }
             else {
                 MinecraftServer.LOGGER.error("We were unable to save this crash report to disk.");
             }
-            this.onServerCrash(h3);
+            this.onServerCrash(j3);
             try {
                 this.stopped = true;
                 this.stopServer();
@@ -700,8 +709,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
     
     @Override
-    protected boolean shouldRun(final TickTask tb) {
-        return tb.getTick() + 3 < this.tickCount || this.haveTime();
+    protected boolean shouldRun(final TickTask uy) {
+        return uy.getTick() + 3 < this.tickCount || this.haveTime();
     }
     
     public boolean pollTask() {
@@ -714,8 +723,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             return true;
         }
         if (this.haveTime()) {
-            for (final ServerLevel xd3 : this.getAllLevels()) {
-                if (xd3.getChunkSource().pollTask()) {
+            for (final ServerLevel zd3 : this.getAllLevels()) {
+                if (zd3.getChunkSource().pollTask()) {
                     return true;
                 }
             }
@@ -724,15 +733,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
     
     @Override
-    protected void doRunTask(final TickTask tb) {
+    protected void doRunTask(final TickTask uy) {
         this.getProfiler().incrementCounter("runTask");
-        super.doRunTask(tb);
+        super.doRunTask(uy);
     }
     
-    public void updateStatusIcon(final ServerStatus rw) {
+    private void updateStatusIcon(final ServerStatus tl) {
         File file3 = this.getFile("server-icon.png");
         if (!file3.exists()) {
-            file3 = this.getStorageSource().getFile(this.getLevelIdName(), "icon.png");
+            file3 = this.storageSource.getIconFile();
         }
         if (file3.isFile()) {
             final ByteBuf byteBuf4 = Unpooled.buffer();
@@ -742,7 +751,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                 Validate.validState(bufferedImage5.getHeight() == 64, "Must be 64 pixels high", new Object[0]);
                 ImageIO.write(bufferedImage5, "PNG", (OutputStream)new ByteBufOutputStream(byteBuf4));
                 final ByteBuffer byteBuffer6 = Base64.getEncoder().encode(byteBuf4.nioBuffer());
-                rw.setFavicon("data:image/png;base64," + StandardCharsets.UTF_8.decode(byteBuffer6));
+                tl.setFavicon("data:image/png;base64," + StandardCharsets.UTF_8.decode(byteBuffer6));
             }
             catch (Exception exception5) {
                 MinecraftServer.LOGGER.error("Couldn't load server icon", (Throwable)exception5);
@@ -758,14 +767,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
     
     public File getWorldScreenshotFile() {
-        return this.getStorageSource().getFile(this.getLevelIdName(), "icon.png");
+        return this.storageSource.getIconFile();
     }
     
     public File getServerDirectory() {
         return new File(".");
     }
     
-    protected void onServerCrash(final CrashReport h) {
+    protected void onServerCrash(final CrashReport j) {
     }
     
     protected void onServerExit() {
@@ -818,27 +827,25 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         this.profiler.push("commandFunctions");
         this.getFunctions().tick();
         this.profiler.popPush("levels");
-        for (final ServerLevel xd4 : this.getAllLevels()) {
-            if (xd4.dimension.getType() == DimensionType.OVERWORLD || this.isNetherEnabled()) {
-                final ServerLevel serverLevel;
-                this.profiler.push(() -> serverLevel.getLevelData().getLevelName() + " " + Registry.DIMENSION_TYPE.getKey(serverLevel.dimension.getType()));
-                if (this.tickCount % 20 == 0) {
-                    this.profiler.push("timeSync");
-                    this.playerList.broadcastAll(new ClientboundSetTimePacket(xd4.getGameTime(), xd4.getDayTime(), xd4.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)), xd4.dimension.getType());
-                    this.profiler.pop();
-                }
-                this.profiler.push("tick");
-                try {
-                    xd4.tick(booleanSupplier);
-                }
-                catch (Throwable throwable5) {
-                    final CrashReport h6 = CrashReport.forThrowable(throwable5, "Exception ticking world");
-                    xd4.fillReportDetails(h6);
-                    throw new ReportedException(h6);
-                }
-                this.profiler.pop();
+        for (final ServerLevel zd4 : this.getAllLevels()) {
+            final Level obj;
+            this.profiler.push(() -> obj + " " + obj.dimension().location());
+            if (this.tickCount % 20 == 0) {
+                this.profiler.push("timeSync");
+                this.playerList.broadcastAll(new ClientboundSetTimePacket(zd4.getGameTime(), zd4.getDayTime(), zd4.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)), zd4.dimension());
                 this.profiler.pop();
             }
+            this.profiler.push("tick");
+            try {
+                zd4.tick(booleanSupplier);
+            }
+            catch (Throwable throwable5) {
+                final CrashReport j6 = CrashReport.forThrowable(throwable5, "Exception ticking world");
+                zd4.fillReportDetails(j6);
+                throw new ReportedException(j6);
+            }
+            this.profiler.pop();
+            this.profiler.pop();
         }
         this.profiler.popPush("connection");
         this.getConnection().tick();
@@ -862,92 +869,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         this.tickables.add(runnable);
     }
     
-    public static void main(final String[] arr) {
-        final OptionParser optionParser2 = new OptionParser();
-        final OptionSpec<Void> optionSpec3 = optionParser2.accepts("nogui");
-        final OptionSpec<Void> optionSpec4 = optionParser2.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits");
-        final OptionSpec<Void> optionSpec5 = optionParser2.accepts("demo");
-        final OptionSpec<Void> optionSpec6 = optionParser2.accepts("bonusChest");
-        final OptionSpec<Void> optionSpec7 = optionParser2.accepts("forceUpgrade");
-        final OptionSpec<Void> optionSpec8 = optionParser2.accepts("eraseCache");
-        final OptionSpec<Void> optionSpec9 = optionParser2.accepts("help").forHelp();
-        final OptionSpec<String> optionSpec10 = optionParser2.accepts("singleplayer").withRequiredArg();
-        final OptionSpec<String> optionSpec11 = optionParser2.accepts("universe").withRequiredArg().defaultsTo(".", new String[0]);
-        final OptionSpec<String> optionSpec12 = optionParser2.accepts("world").withRequiredArg();
-        final OptionSpec<Integer> optionSpec13 = optionParser2.accepts("port").withRequiredArg().<Integer>ofType(Integer.class).defaultsTo(-1, new Integer[0]);
-        final OptionSpec<String> optionSpec14 = optionParser2.accepts("serverId").withRequiredArg();
-        final OptionSpec<String> optionSpec15 = optionParser2.nonOptions();
-        try {
-            final OptionSet optionSet16 = optionParser2.parse(arr);
-            if (optionSet16.has(optionSpec9)) {
-                optionParser2.printHelpOn(System.err);
-                return;
-            }
-            final Path path17 = Paths.get("server.properties");
-            final DedicatedServerSettings wf18 = new DedicatedServerSettings(path17);
-            wf18.forceSave();
-            final Path path18 = Paths.get("eula.txt");
-            final Eula st20 = new Eula(path18);
-            if (optionSet16.has(optionSpec4)) {
-                MinecraftServer.LOGGER.info("Initialized '" + path17.toAbsolutePath().toString() + "' and '" + path18.toAbsolutePath().toString() + "'");
-                return;
-            }
-            if (!st20.hasAgreedToEULA()) {
-                MinecraftServer.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
-                return;
-            }
-            CrashReport.preload();
-            Bootstrap.bootStrap();
-            Bootstrap.validate();
-            final String string21 = optionSet16.<String>valueOf(optionSpec11);
-            final YggdrasilAuthenticationService yggdrasilAuthenticationService22 = new YggdrasilAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString());
-            final MinecraftSessionService minecraftSessionService23 = yggdrasilAuthenticationService22.createMinecraftSessionService();
-            final GameProfileRepository gameProfileRepository24 = yggdrasilAuthenticationService22.createProfileRepository();
-            final GameProfileCache zk25 = new GameProfileCache(gameProfileRepository24, new File(string21, MinecraftServer.USERID_CACHE_FILE.getName()));
-            final String string22 = Optional.<String>ofNullable((String)optionSet16.<T>valueOf((OptionSpec<T>)optionSpec12)).orElse(wf18.getProperties().levelName);
-            final DedicatedServer wd27 = new DedicatedServer(new File(string21), wf18, DataFixers.getDataFixer(), yggdrasilAuthenticationService22, minecraftSessionService23, gameProfileRepository24, zk25, LoggerChunkProgressListener::new, string22);
-            wd27.setSingleplayerName(optionSet16.<String>valueOf(optionSpec10));
-            wd27.setPort(optionSet16.<Integer>valueOf(optionSpec13));
-            wd27.setDemo(optionSet16.has(optionSpec5));
-            wd27.setBonusChest(optionSet16.has(optionSpec6));
-            wd27.forceUpgrade(optionSet16.has(optionSpec7));
-            wd27.eraseCache(optionSet16.has(optionSpec8));
-            wd27.setId(optionSet16.<String>valueOf(optionSpec14));
-            final boolean boolean28 = !optionSet16.has(optionSpec3) && !optionSet16.<String>valuesOf(optionSpec15).contains("nogui");
-            if (boolean28 && !GraphicsEnvironment.isHeadless()) {
-                wd27.showGui();
-            }
-            wd27.forkAndRun();
-            final Thread thread29 = new Thread("Server Shutdown Thread") {
-                @Override
-                public void run() {
-                    wd27.halt(true);
-                }
-            };
-            thread29.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(MinecraftServer.LOGGER));
-            Runtime.getRuntime().addShutdownHook(thread29);
-        }
-        catch (Exception exception16) {
-            MinecraftServer.LOGGER.fatal("Failed to start the minecraft server", (Throwable)exception16);
-        }
-    }
-    
     protected void setId(final String string) {
         this.serverId = string;
     }
     
-    protected void forceUpgrade(final boolean boolean1) {
-        this.forceUpgrade = boolean1;
-    }
-    
-    protected void eraseCache(final boolean boolean1) {
-        this.eraseCache = boolean1;
-    }
-    
-    public void forkAndRun() {
-        this.serverThread.start();
-    }
-    
     public boolean isShutdown() {
         return !this.serverThread.isAlive();
     }
@@ -956,16 +881,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return new File(this.getServerDirectory(), string);
     }
     
-    public void info(final String string) {
-        MinecraftServer.LOGGER.info(string);
+    public final ServerLevel overworld() {
+        return this.levels.get(Level.OVERWORLD);
     }
     
-    public void warn(final String string) {
-        MinecraftServer.LOGGER.warn(string);
+    @Nullable
+    public ServerLevel getLevel(final ResourceKey<Level> ug) {
+        return this.levels.get(ug);
     }
     
-    public ServerLevel getLevel(final DimensionType cbi) {
-        return this.levels.get(cbi);
+    public Set<ResourceKey<Level>> levelKeys() {
+        return this.levels.keySet();
     }
     
     public Iterable<ServerLevel> getAllLevels() {
@@ -988,61 +914,43 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return this.playerList.getPlayerNamesArray();
     }
     
-    public boolean isDebugging() {
-        return false;
-    }
-    
-    public void error(final String string) {
-        MinecraftServer.LOGGER.error(string);
-    }
-    
-    public void debug(final String string) {
-        if (this.isDebugging()) {
-            MinecraftServer.LOGGER.info(string);
-        }
-    }
-    
     public String getServerModName() {
         return "vanilla";
     }
     
-    public CrashReport fillReport(final CrashReport h) {
+    public CrashReport fillReport(final CrashReport j) {
         if (this.playerList != null) {
-            h.getSystemDetails().setDetail("Player Count", () -> this.playerList.getPlayerCount() + " / " + this.playerList.getMaxPlayers() + "; " + this.playerList.getPlayers());
+            j.getSystemDetails().setDetail("Player Count", () -> this.playerList.getPlayerCount() + " / " + this.playerList.getMaxPlayers() + "; " + this.playerList.getPlayers());
         }
         final StringBuilder stringBuilder2;
-        final Iterator<UnopenedPack> iterator;
-        UnopenedPack yt4;
-        h.getSystemDetails().setDetail("Data Packs", () -> {
+        final Iterator<Pack> iterator;
+        Pack aap4;
+        j.getSystemDetails().setDetail("Data Packs", () -> {
             stringBuilder2 = new StringBuilder();
-            this.packRepository.getSelected().iterator();
+            this.packRepository.getSelectedPacks().iterator();
             while (iterator.hasNext()) {
-                yt4 = iterator.next();
+                aap4 = iterator.next();
                 if (stringBuilder2.length() > 0) {
                     stringBuilder2.append(", ");
                 }
-                stringBuilder2.append(yt4.getId());
-                if (!yt4.getCompatibility().isCompatible()) {
+                stringBuilder2.append(aap4.getId());
+                if (!aap4.getCompatibility().isCompatible()) {
                     stringBuilder2.append(" (incompatible)");
                 }
             }
             return stringBuilder2.toString();
         });
         if (this.serverId != null) {
-            h.getSystemDetails().setDetail("Server Id", () -> this.serverId);
+            j.getSystemDetails().setDetail("Server Id", () -> this.serverId);
         }
-        return h;
+        return j;
     }
     
     public abstract Optional<String> getModdedStatus();
     
-    public boolean isInitialized() {
-        return this.universe != null;
-    }
-    
     @Override
-    public void sendMessage(final Component lf) {
-        MinecraftServer.LOGGER.info(lf.getString());
+    public void sendMessage(final Component mr, final UUID uUID) {
+        MinecraftServer.LOGGER.info(mr.getString());
     }
     
     public KeyPair getKeyPair() {
@@ -1069,59 +977,41 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return this.singleplayerName != null;
     }
     
-    public String getLevelIdName() {
-        return this.levelIdName;
-    }
-    
-    public void setLevelName(final String string) {
-        this.levelName = string;
-    }
-    
-    public String getLevelName() {
-        return this.levelName;
-    }
-    
     public void setKeyPair(final KeyPair keyPair) {
         this.keyPair = keyPair;
     }
     
-    public void setDifficulty(final Difficulty aji, final boolean boolean2) {
-        for (final ServerLevel xd5 : this.getAllLevels()) {
-            final LevelData crm6 = xd5.getLevelData();
-            if (!boolean2 && crm6.isDifficultyLocked()) {
-                continue;
-            }
-            if (crm6.isHardcore()) {
-                crm6.setDifficulty(Difficulty.HARD);
-                xd5.setSpawnSettings(true, true);
-            }
-            else if (this.isSingleplayer()) {
-                crm6.setDifficulty(aji);
-                xd5.setSpawnSettings(xd5.getDifficulty() != Difficulty.PEACEFUL, true);
-            }
-            else {
-                crm6.setDifficulty(aji);
-                xd5.setSpawnSettings(this.getSpawnMonsters(), this.animals);
-            }
+    public void setDifficulty(final Difficulty and, final boolean boolean2) {
+        if (!boolean2 && this.worldData.isDifficultyLocked()) {
+            return;
         }
+        this.worldData.setDifficulty(this.worldData.isHardcore() ? Difficulty.HARD : and);
+        this.updateMobSpawningFlags();
         this.getPlayerList().getPlayers().forEach(this::sendDifficultyUpdate);
     }
     
+    public int getScaledTrackingDistance(final int integer) {
+        return integer;
+    }
+    
+    private void updateMobSpawningFlags() {
+        for (final ServerLevel zd3 : this.getAllLevels()) {
+            zd3.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
+        }
+    }
+    
     public void setDifficultyLocked(final boolean boolean1) {
-        for (final ServerLevel xd4 : this.getAllLevels()) {
-            final LevelData crm5 = xd4.getLevelData();
-            crm5.setDifficultyLocked(boolean1);
-        }
+        this.worldData.setDifficultyLocked(boolean1);
         this.getPlayerList().getPlayers().forEach(this::sendDifficultyUpdate);
     }
     
-    private void sendDifficultyUpdate(final ServerPlayer xe) {
-        final LevelData crm3 = xe.getLevel().getLevelData();
-        xe.connection.send(new ClientboundChangeDifficultyPacket(crm3.getDifficulty(), crm3.isDifficultyLocked()));
+    private void sendDifficultyUpdate(final ServerPlayer ze) {
+        final LevelData dab3 = ze.getLevel().getLevelData();
+        ze.connection.send(new ClientboundChangeDifficultyPacket(dab3.getDifficulty(), dab3.isDifficultyLocked()));
     }
     
-    protected boolean getSpawnMonsters() {
-        return true;
+    protected boolean isSpawningMonsters() {
+        return this.worldData.getDifficulty() != Difficulty.PEACEFUL;
     }
     
     public boolean isDemo() {
@@ -1132,14 +1022,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         this.isDemo = boolean1;
     }
     
-    public void setBonusChest(final boolean boolean1) {
-        this.levelHasStartingBonusChest = boolean1;
-    }
-    
-    public LevelStorageSource getStorageSource() {
-        return this.storageSource;
-    }
-    
     public String getResourcePack() {
         return this.resourcePack;
     }
@@ -1154,34 +1036,31 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
     
     @Override
-    public void populateSnooper(final Snooper ajs) {
-        ajs.setDynamicData("whitelist_enabled", false);
-        ajs.setDynamicData("whitelist_count", 0);
+    public void populateSnooper(final Snooper ano) {
+        ano.setDynamicData("whitelist_enabled", false);
+        ano.setDynamicData("whitelist_count", 0);
         if (this.playerList != null) {
-            ajs.setDynamicData("players_current", this.getPlayerCount());
-            ajs.setDynamicData("players_max", this.getMaxPlayers());
-            ajs.setDynamicData("players_seen", this.getLevel(DimensionType.OVERWORLD).getLevelStorage().getSeenPlayers().length);
+            ano.setDynamicData("players_current", this.getPlayerCount());
+            ano.setDynamicData("players_max", this.getMaxPlayers());
+            ano.setDynamicData("players_seen", this.playerDataStorage.getSeenPlayers().length);
         }
-        ajs.setDynamicData("uses_auth", this.onlineMode);
-        ajs.setDynamicData("gui_state", this.hasGui() ? "enabled" : "disabled");
-        ajs.setDynamicData("run_time", (Util.getMillis() - ajs.getStartupTime()) / 60L * 1000L);
-        ajs.setDynamicData("avg_tick_ms", (int)(Mth.average(this.tickTimes) * 1.0E-6));
+        ano.setDynamicData("uses_auth", this.onlineMode);
+        ano.setDynamicData("gui_state", this.hasGui() ? "enabled" : "disabled");
+        ano.setDynamicData("run_time", (Util.getMillis() - ano.getStartupTime()) / 60L * 1000L);
+        ano.setDynamicData("avg_tick_ms", (int)(Mth.average(this.tickTimes) * 1.0E-6));
         int integer3 = 0;
-        for (final ServerLevel xd5 : this.getAllLevels()) {
-            if (xd5 != null) {
-                final LevelData crm6 = xd5.getLevelData();
-                ajs.setDynamicData("world[" + integer3 + "][dimension]", xd5.dimension.getType());
-                ajs.setDynamicData("world[" + integer3 + "][mode]", crm6.getGameType());
-                ajs.setDynamicData("world[" + integer3 + "][difficulty]", xd5.getDifficulty());
-                ajs.setDynamicData("world[" + integer3 + "][hardcore]", crm6.isHardcore());
-                ajs.setDynamicData("world[" + integer3 + "][generator_name]", crm6.getGeneratorType().getName());
-                ajs.setDynamicData("world[" + integer3 + "][generator_version]", crm6.getGeneratorType().getVersion());
-                ajs.setDynamicData("world[" + integer3 + "][height]", this.maxBuildHeight);
-                ajs.setDynamicData("world[" + integer3 + "][chunks_loaded]", xd5.getChunkSource().getLoadedChunksCount());
+        for (final ServerLevel zd5 : this.getAllLevels()) {
+            if (zd5 != null) {
+                ano.setDynamicData("world[" + integer3 + "][dimension]", zd5.dimension().location());
+                ano.setDynamicData("world[" + integer3 + "][mode]", this.worldData.getGameType());
+                ano.setDynamicData("world[" + integer3 + "][difficulty]", zd5.getDifficulty());
+                ano.setDynamicData("world[" + integer3 + "][hardcore]", this.worldData.isHardcore());
+                ano.setDynamicData("world[" + integer3 + "][height]", this.maxBuildHeight);
+                ano.setDynamicData("world[" + integer3 + "][chunks_loaded]", zd5.getChunkSource().getLoadedChunksCount());
                 ++integer3;
             }
         }
-        ajs.setDynamicData("worlds", integer3);
+        ano.setDynamicData("worlds", integer3);
     }
     
     public abstract boolean isDedicatedServer();
@@ -1202,24 +1081,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         this.preventProxyConnections = boolean1;
     }
     
-    public boolean isAnimals() {
-        return this.animals;
+    public boolean isSpawningAnimals() {
+        return true;
     }
     
-    public void setAnimals(final boolean boolean1) {
-        this.animals = boolean1;
-    }
-    
-    public boolean isNpcsEnabled() {
-        return this.npcs;
+    public boolean areNpcsEnabled() {
+        return true;
     }
     
     public abstract boolean isEpollEnabled();
     
-    public void setNpcsEnabled(final boolean boolean1) {
-        this.npcs = boolean1;
-    }
-    
     public boolean isPvpAllowed() {
         return this.pvp;
     }
@@ -1262,16 +1133,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return this.playerList;
     }
     
-    public void setPlayerList(final PlayerList zo) {
-        this.playerList = zo;
+    public void setPlayerList(final PlayerList abp) {
+        this.playerList = abp;
     }
     
     public abstract boolean isPublished();
     
-    public void setDefaultGameMode(final GameType bjt) {
-        for (final ServerLevel xd4 : this.getAllLevels()) {
-            xd4.getLevelData().setGameType(bjt);
-        }
+    public void setDefaultGameType(final GameType bpy) {
+        this.worldData.setGameType(bpy);
     }
     
     @Nullable
@@ -1287,16 +1156,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return false;
     }
     
-    public abstract boolean publishServer(final GameType bjt, final boolean boolean2, final int integer);
+    public abstract boolean publishServer(final GameType bpy, final boolean boolean2, final int integer);
     
     public int getTickCount() {
         return this.tickCount;
     }
     
-    public void delayStartProfiler() {
-        this.delayProfilerStart = true;
-    }
-    
     public Snooper getSnooper() {
         return this.snooper;
     }
@@ -1305,7 +1170,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return 16;
     }
     
-    public boolean isUnderSpawnProtection(final Level bjw, final BlockPos fk, final Player ayj) {
+    public boolean isUnderSpawnProtection(final ServerLevel zd, final BlockPos fu, final Player bec) {
         return false;
     }
     
@@ -1317,6 +1182,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return this.forceGameType;
     }
     
+    public boolean repliesToStatus() {
+        return true;
+    }
+    
     public int getPlayerIdleTimeout() {
         return this.playerIdleTimeout;
     }
@@ -1369,93 +1238,102 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return this.fixerUpper;
     }
     
-    public int getSpawnRadius(@Nullable final ServerLevel xd) {
-        if (xd != null) {
-            return xd.getGameRules().getInt(GameRules.RULE_SPAWN_RADIUS);
+    public int getSpawnRadius(@Nullable final ServerLevel zd) {
+        if (zd != null) {
+            return zd.getGameRules().getInt(GameRules.RULE_SPAWN_RADIUS);
         }
         return 10;
     }
     
     public ServerAdvancementManager getAdvancements() {
-        return this.advancements;
+        return this.resources.getAdvancements();
     }
     
     public ServerFunctionManager getFunctions() {
-        return this.functions;
+        return this.functionManager;
     }
     
-    public void reloadResources() {
-        if (!this.isSameThread()) {
-            this.execute(this::reloadResources);
+    public CompletableFuture<Void> reloadResources(final Collection<String> collection) {
+        final CompletableFuture<Void> completableFuture3 = CompletableFuture.<ImmutableList<? super Object>>supplyAsync(() -> collection.stream().map(this.packRepository::getPack).filter(Objects::nonNull).map(Pack::open).collect(ImmutableList.toImmutableList()), this).thenCompose(immutableList -> ServerResources.loadResources(immutableList, this.isDedicatedServer() ? Commands.CommandSelection.DEDICATED : Commands.CommandSelection.INTEGRATED, this.getFunctionCompilationLevel(), this.executor, this)).thenAcceptAsync(uw -> {
+            this.resources.close();
+            this.resources = uw;
+            this.packRepository.setSelected(collection);
+            this.worldData.setDataPackConfig(getSelectedPacks(this.packRepository));
+            uw.updateGlobals();
+            this.getPlayerList().saveAll();
+            this.getPlayerList().reloadResources();
+            this.functionManager.replaceLibrary(this.resources.getFunctionLibrary());
+            this.structureManager.onResourceManagerReload(this.resources.getResourceManager());
             return;
+        }, (Executor)this);
+        if (this.isSameThread()) {
+            this.managedBlock(completableFuture3::isDone);
         }
-        this.getPlayerList().saveAll();
-        this.packRepository.reload();
-        this.updateSelectedPacks(this.getLevel(DimensionType.OVERWORLD).getLevelData());
-        this.getPlayerList().reloadResources();
-        this.refreshRegistries();
+        return completableFuture3;
     }
     
-    private void updateSelectedPacks(final LevelData crm) {
-        final List<UnopenedPack> list3 = Lists.newArrayList(this.packRepository.getSelected());
-        for (final UnopenedPack yt2 : this.packRepository.getAvailable()) {
-            if (!crm.getDisabledDataPacks().contains(yt2.getId()) && !list3.contains(yt2)) {
-                MinecraftServer.LOGGER.info("Found new data pack {}, loading it automatically", yt2.getId());
-                yt2.getDefaultPosition().<UnopenedPack, UnopenedPack>insert(list3, yt2, yt -> yt, false);
+    public static DataPackConfig configurePackRepository(final PackRepository<Pack> aar, final DataPackConfig bpn, final boolean boolean3) {
+        aar.reload();
+        if (boolean3) {
+            aar.setSelected(Collections.<String>singleton("vanilla"));
+            return new DataPackConfig(ImmutableList.<String>of("vanilla"), ImmutableList.of());
+        }
+        final Set<String> set4 = Sets.newLinkedHashSet();
+        for (final String string6 : bpn.getEnabled()) {
+            if (aar.isAvailable(string6)) {
+                set4.add(string6);
+            }
+            else {
+                MinecraftServer.LOGGER.warn("Missing data pack {}", string6);
             }
         }
-        this.packRepository.setSelected(list3);
-        final List<Pack> list4 = Lists.newArrayList();
-        this.packRepository.getSelected().forEach(yt -> list4.add(yt.open()));
-        final CompletableFuture<Unit> completableFuture5 = this.resources.reload(this.executor, this, list4, MinecraftServer.DATA_RELOAD_INITIAL_TASK);
-        this.managedBlock(completableFuture5::isDone);
-        try {
-            completableFuture5.get();
-        }
-        catch (Exception exception6) {
-            MinecraftServer.LOGGER.error("Failed to reload data packs", (Throwable)exception6);
-        }
-        crm.getEnabledDataPacks().clear();
-        crm.getDisabledDataPacks().clear();
-        this.packRepository.getSelected().forEach(yt -> crm.getEnabledDataPacks().add(yt.getId()));
-        this.packRepository.getAvailable().forEach(yt -> {
-            if (!this.packRepository.getSelected().contains(yt)) {
-                crm.getDisabledDataPacks().add(yt.getId());
+        for (final Pack aap6 : aar.getAvailablePacks()) {
+            final String string7 = aap6.getId();
+            if (!bpn.getDisabled().contains(string7) && !set4.contains(string7)) {
+                MinecraftServer.LOGGER.info("Found new data pack {}, loading it automatically", string7);
+                set4.add(string7);
             }
-        });
+        }
+        if (set4.isEmpty()) {
+            MinecraftServer.LOGGER.info("No datapacks selected, forcing vanilla");
+            set4.add("vanilla");
+        }
+        aar.setSelected(set4);
+        return getSelectedPacks(aar);
     }
     
-    public void kickUnlistedPlayers(final CommandSourceStack cq) {
+    private static DataPackConfig getSelectedPacks(final PackRepository<?> aar) {
+        final Collection<String> collection2 = aar.getSelectedIds();
+        final List<String> list3 = ImmutableList.copyOf(collection2);
+        final List<String> list4 = aar.getAvailableIds().stream().filter(string -> !collection2.contains(string)).collect(ImmutableList.toImmutableList());
+        return new DataPackConfig(list3, list4);
+    }
+    
+    public void kickUnlistedPlayers(final CommandSourceStack cz) {
         if (!this.isEnforceWhitelist()) {
             return;
         }
-        final PlayerList zo3 = cq.getServer().getPlayerList();
-        final UserWhiteList zv4 = zo3.getWhiteList();
-        if (!zv4.isEnabled()) {
-            return;
-        }
-        final List<ServerPlayer> list5 = Lists.newArrayList(zo3.getPlayers());
-        for (final ServerPlayer xe7 : list5) {
-            if (!zv4.isWhiteListed(xe7.getGameProfile())) {
-                xe7.connection.disconnect(new TranslatableComponent("multiplayer.disconnect.not_whitelisted", new Object[0]));
+        final PlayerList abp3 = cz.getServer().getPlayerList();
+        final UserWhiteList abw4 = abp3.getWhiteList();
+        final List<ServerPlayer> list5 = Lists.newArrayList(abp3.getPlayers());
+        for (final ServerPlayer ze7 : list5) {
+            if (!abw4.isWhiteListed(ze7.getGameProfile())) {
+                ze7.connection.disconnect(new TranslatableComponent("multiplayer.disconnect.not_whitelisted"));
             }
         }
     }
     
-    public ReloadableResourceManager getResources() {
-        return this.resources;
-    }
-    
-    public PackRepository<UnopenedPack> getPackRepository() {
+    public PackRepository<Pack> getPackRepository() {
         return this.packRepository;
     }
     
     public Commands getCommands() {
-        return this.commands;
+        return this.resources.getCommands();
     }
     
     public CommandSourceStack createCommandSourceStack() {
-        return new CommandSourceStack(this, (this.getLevel(DimensionType.OVERWORLD) == null) ? Vec3.ZERO : new Vec3(this.getLevel(DimensionType.OVERWORLD).getSharedSpawnPos()), Vec2.ZERO, this.getLevel(DimensionType.OVERWORLD), 4, "Server", new TextComponent("Server"), this, null);
+        final ServerLevel zd2 = this.overworld();
+        return new CommandSourceStack(this, (zd2 == null) ? Vec3.ZERO : Vec3.atLowerCornerOf(zd2.getSharedSpawnPos()), Vec2.ZERO, zd2, 4, "Server", new TextComponent("Server"), this, null);
     }
     
     @Override
@@ -1469,11 +1347,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
     
     public RecipeManager getRecipeManager() {
-        return this.recipes;
+        return this.resources.getRecipeManager();
     }
     
     public TagManager getTags() {
-        return this.tags;
+        return this.resources.getTags();
     }
     
     public ServerScoreboard getScoreboard() {
@@ -1488,15 +1366,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
     
     public LootTables getLootTables() {
-        return this.lootTables;
+        return this.resources.getLootTables();
     }
     
     public PredicateManager getPredicateManager() {
-        return this.predicateManager;
+        return this.resources.getPredicateManager();
     }
     
     public GameRules getGameRules() {
-        return this.getLevel(DimensionType.OVERWORLD).getGameRules();
+        return this.overworld().getGameRules();
     }
     
     public CustomBossEvents getCustomBossEvents() {
@@ -1519,9 +1397,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         if (!this.getPlayerList().isOp(gameProfile)) {
             return 0;
         }
-        final ServerOpListEntry zq3 = this.getPlayerList().getOps().get(gameProfile);
-        if (zq3 != null) {
-            return zq3.getLevel();
+        final ServerOpListEntry abr3 = this.getPlayerList().getOps().get(gameProfile);
+        if (abr3 != null) {
+            return abr3.getLevel();
         }
         if (this.isSingleplayerOwner(gameProfile)) {
             return 4;
@@ -1536,21 +1414,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return this.frameTimer;
     }
     
-    public GameProfiler getProfiler() {
+    public ProfilerFiller getProfiler() {
         return this.profiler;
     }
     
-    public Executor getBackgroundTaskExecutor() {
-        return this.executor;
-    }
-    
     public abstract boolean isSingleplayerOwner(final GameProfile gameProfile);
     
     public void saveDebugReport(final Path path) throws IOException {
         final Path path2 = path.resolve("levels");
-        for (final Map.Entry<DimensionType, ServerLevel> entry5 : this.levels.entrySet()) {
-            final ResourceLocation sm6 = DimensionType.getName(entry5.getKey());
-            final Path path3 = path2.resolve(sm6.getNamespace()).resolve(sm6.getPath());
+        for (final Map.Entry<ResourceKey<Level>, ServerLevel> entry5 : this.levels.entrySet()) {
+            final ResourceLocation uh6 = entry5.getKey().location();
+            final Path path3 = path2.resolve(uh6.getNamespace()).resolve(uh6.getPath());
             Files.createDirectories(path3, new FileAttribute[0]);
             entry5.getValue().saveDebugReport(path3);
         }
@@ -1571,21 +1445,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
     
     private void dumpCrashCategory(final Path path) throws IOException {
-        final CrashReport h3 = new CrashReport("Server dump", new Exception("dummy"));
-        this.fillReport(h3);
+        final CrashReport j3 = new CrashReport("Server dump", new Exception("dummy"));
+        this.fillReport(j3);
         try (final Writer writer4 = Files.newBufferedWriter(path)) {
-            writer4.write(h3.getFriendlyReport());
+            writer4.write(j3.getFriendlyReport());
         }
     }
     
     private void dumpGameRules(final Path path) throws IOException {
         try (final Writer writer3 = Files.newBufferedWriter(path)) {
             final List<String> list5 = Lists.newArrayList();
-            final GameRules bjs6 = this.getGameRules();
+            final GameRules bpx6 = this.getGameRules();
             GameRules.visitGameRuleTypes(new GameRules.GameRuleTypeVisitor() {
                 @Override
-                public <T extends GameRules.Value<T>> void visit(final GameRules.Key<T> d, final GameRules.Type<T> e) {
-                    list5.add(String.format("%s=%s\n", d.getId(), bjs6.<T>getRule(d).toString()));
+                public <T extends GameRules.Value<T>> void visit(final GameRules.Key<T> e, final GameRules.Type<T> f) {
+                    list5.add(String.format("%s=%s\n", e.getId(), bpx6.<T>getRule(e).toString()));
                 }
             });
             for (final String string8 : list5) {
@@ -1617,14 +1491,54 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         }
     }
     
-    private void refreshRegistries() {
-        Block.BLOCK_STATE_REGISTRY.forEach(BlockState::initCache);
+    private void startProfilerTick(@Nullable final SingleTickProfiler aml) {
+        if (this.delayProfilerStart) {
+            this.delayProfilerStart = false;
+            this.continousProfiler.enable();
+        }
+        this.profiler = SingleTickProfiler.decorateFiller(this.continousProfiler.getFiller(), aml);
+    }
+    
+    private void endProfilerTick(@Nullable final SingleTickProfiler aml) {
+        if (aml != null) {
+            aml.endTick();
+        }
+        this.profiler = this.continousProfiler.getFiller();
+    }
+    
+    public boolean isProfiling() {
+        return this.continousProfiler.isEnabled();
+    }
+    
+    public void startProfiling() {
+        this.delayProfilerStart = true;
+    }
+    
+    public ProfileResults finishProfiling() {
+        final ProfileResults amh2 = this.continousProfiler.getResults();
+        this.continousProfiler.disable();
+        return amh2;
+    }
+    
+    public Path getWorldPath(final LevelResource dac) {
+        return this.storageSource.getLevelPath(dac);
+    }
+    
+    public boolean forceSynchronousWrites() {
+        return true;
+    }
+    
+    public StructureManager getStructureManager() {
+        return this.structureManager;
+    }
+    
+    public WorldData getWorldData() {
+        return this.worldData;
     }
     
     static {
         LOGGER = LogManager.getLogger();
         USERID_CACHE_FILE = new File("usercache.json");
-        DATA_RELOAD_INITIAL_TASK = CompletableFuture.<Unit>completedFuture(Unit.INSTANCE);
-        DEMO_SETTINGS = new LevelSettings("North Carolina".hashCode(), GameType.SURVIVAL, true, false, LevelType.NORMAL).enableStartingBonusItems();
+        DEMO_SETTINGS = new LevelSettings("Demo World", GameType.SURVIVAL, false, Difficulty.NORMAL, false, new GameRules(), DataPackConfig.DEFAULT);
     }
 }
diff --git a/src/net/minecraft/server/PlayerAdvancements.java b/src/net/minecraft/server/PlayerAdvancements.java
index 975025b..b2d539f 100644
--- a/src/net/minecraft/server/PlayerAdvancements.java
+++ b/src/net/minecraft/server/PlayerAdvancements.java
@@ -11,6 +11,8 @@ import net.minecraft.advancements.CriterionProgress;
 import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.advancements.Criterion;
 import net.minecraft.network.chat.Component;
+import net.minecraft.Util;
+import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.GameRules;
 import java.io.Writer;
@@ -28,10 +30,10 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonElement;
 import net.minecraft.SharedConstants;
 import net.minecraft.util.datafix.DataFixTypes;
-import com.mojang.datafixers.types.DynamicOps;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Dynamic;
 import com.google.gson.internal.Streams;
-import com.mojang.datafixers.types.JsonOps;
+import com.mojang.serialization.JsonOps;
 import java.io.Reader;
 import com.google.gson.stream.JsonReader;
 import java.io.StringReader;
@@ -49,6 +51,8 @@ import net.minecraft.server.level.ServerPlayer;
 import java.util.Set;
 import net.minecraft.advancements.Advancement;
 import java.io.File;
+import net.minecraft.server.players.PlayerList;
+import com.mojang.datafixers.DataFixer;
 import net.minecraft.advancements.AdvancementProgress;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
@@ -60,7 +64,8 @@ public class PlayerAdvancements {
     private static final Logger LOGGER;
     private static final Gson GSON;
     private static final TypeToken<Map<ResourceLocation, AdvancementProgress>> TYPE_TOKEN;
-    private final MinecraftServer server;
+    private final DataFixer dataFixer;
+    private final PlayerList playerList;
     private final File file;
     private final Map<Advancement, AdvancementProgress> advancements;
     private final Set<Advancement> visible;
@@ -71,29 +76,30 @@ public class PlayerAdvancements {
     private Advancement lastSelectedTab;
     private boolean isFirstPacket;
     
-    public PlayerAdvancements(final MinecraftServer minecraftServer, final File file, final ServerPlayer xe) {
+    public PlayerAdvancements(final DataFixer dataFixer, final PlayerList abp, final ServerAdvancementManager us, final File file, final ServerPlayer ze) {
         this.advancements = Maps.newLinkedHashMap();
         this.visible = Sets.newLinkedHashSet();
         this.visibilityChanged = Sets.newLinkedHashSet();
         this.progressChanged = Sets.newLinkedHashSet();
         this.isFirstPacket = true;
-        this.server = minecraftServer;
+        this.dataFixer = dataFixer;
+        this.playerList = abp;
         this.file = file;
-        this.player = xe;
-        this.load();
+        this.player = ze;
+        this.load(us);
     }
     
-    public void setPlayer(final ServerPlayer xe) {
-        this.player = xe;
+    public void setPlayer(final ServerPlayer ze) {
+        this.player = ze;
     }
     
     public void stopListening() {
-        for (final CriterionTrigger<?> ab3 : CriteriaTriggers.all()) {
-            ab3.removePlayerListeners(this);
+        for (final CriterionTrigger<?> ad3 : CriteriaTriggers.all()) {
+            ad3.removePlayerListeners(this);
         }
     }
     
-    public void reload() {
+    public void reload(final ServerAdvancementManager us) {
         this.stopListening();
         this.advancements.clear();
         this.visible.clear();
@@ -101,12 +107,12 @@ public class PlayerAdvancements {
         this.progressChanged.clear();
         this.isFirstPacket = true;
         this.lastSelectedTab = null;
-        this.load();
+        this.load(us);
     }
     
-    private void registerListeners() {
-        for (final Advancement u3 : this.server.getAdvancements().getAllAdvancements()) {
-            this.registerListeners(u3);
+    private void registerListeners(final ServerAdvancementManager us) {
+        for (final Advancement w4 : us.getAllAdvancements()) {
+            this.registerListeners(w4);
         }
     }
     
@@ -118,63 +124,63 @@ public class PlayerAdvancements {
                 this.progressChanged.add(entry4.getKey());
             }
         }
-        for (final Advancement u4 : list2) {
-            this.ensureVisibility(u4);
+        for (final Advancement w4 : list2) {
+            this.ensureVisibility(w4);
         }
     }
     
-    private void checkForAutomaticTriggers() {
-        for (final Advancement u3 : this.server.getAdvancements().getAllAdvancements()) {
-            if (u3.getCriteria().isEmpty()) {
-                this.award(u3, "");
-                u3.getRewards().grant(this.player);
+    private void checkForAutomaticTriggers(final ServerAdvancementManager us) {
+        for (final Advancement w4 : us.getAllAdvancements()) {
+            if (w4.getCriteria().isEmpty()) {
+                this.award(w4, "");
+                w4.getRewards().grant(this.player);
             }
         }
     }
     
-    private void load() {
+    private void load(final ServerAdvancementManager us) {
         if (this.file.isFile()) {
-            try (final JsonReader jsonReader2 = new JsonReader(new StringReader(Files.toString(this.file, StandardCharsets.UTF_8)))) {
-                jsonReader2.setLenient(false);
-                Dynamic<JsonElement> dynamic4 = (Dynamic<JsonElement>)new Dynamic((DynamicOps)JsonOps.INSTANCE, Streams.parse(jsonReader2));
-                if (!dynamic4.get("DataVersion").asNumber().isPresent()) {
-                    dynamic4 = (Dynamic<JsonElement>)dynamic4.set("DataVersion", dynamic4.createInt(1343));
+            try (final JsonReader jsonReader3 = new JsonReader(new StringReader(Files.toString(this.file, StandardCharsets.UTF_8)))) {
+                jsonReader3.setLenient(false);
+                Dynamic<JsonElement> dynamic5 = (Dynamic<JsonElement>)new Dynamic((DynamicOps)JsonOps.INSTANCE, Streams.parse(jsonReader3));
+                if (!dynamic5.get("DataVersion").asNumber().result().isPresent()) {
+                    dynamic5 = (Dynamic<JsonElement>)dynamic5.set("DataVersion", dynamic5.createInt(1343));
                 }
-                dynamic4 = (Dynamic<JsonElement>)this.server.getFixerUpper().update(DataFixTypes.ADVANCEMENTS.getType(), (Dynamic)dynamic4, dynamic4.get("DataVersion").asInt(0), SharedConstants.getCurrentVersion().getWorldVersion());
-                dynamic4 = (Dynamic<JsonElement>)dynamic4.remove("DataVersion");
-                final Map<ResourceLocation, AdvancementProgress> map5 = PlayerAdvancements.GSON.<Map<ResourceLocation, AdvancementProgress>>getAdapter(PlayerAdvancements.TYPE_TOKEN).fromJsonTree((JsonElement)dynamic4.getValue());
-                if (map5 == null) {
+                dynamic5 = (Dynamic<JsonElement>)this.dataFixer.update(DataFixTypes.ADVANCEMENTS.getType(), (Dynamic)dynamic5, dynamic5.get("DataVersion").asInt(0), SharedConstants.getCurrentVersion().getWorldVersion());
+                dynamic5 = (Dynamic<JsonElement>)dynamic5.remove("DataVersion");
+                final Map<ResourceLocation, AdvancementProgress> map6 = PlayerAdvancements.GSON.<Map<ResourceLocation, AdvancementProgress>>getAdapter(PlayerAdvancements.TYPE_TOKEN).fromJsonTree((JsonElement)dynamic5.getValue());
+                if (map6 == null) {
                     throw new JsonParseException("Found null for advancements");
                 }
-                final Stream<Map.Entry<ResourceLocation, AdvancementProgress>> stream6 = map5.entrySet().stream().sorted(Comparator.comparing(Map.Entry::getValue));
-                for (final Map.Entry<ResourceLocation, AdvancementProgress> entry8 : stream6.collect(Collectors.<Map.Entry<ResourceLocation, AdvancementProgress>>toList())) {
-                    final Advancement u9 = this.server.getAdvancements().getAdvancement(entry8.getKey());
-                    if (u9 == null) {
-                        PlayerAdvancements.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry8.getKey(), this.file);
+                final Stream<Map.Entry<ResourceLocation, AdvancementProgress>> stream7 = map6.entrySet().stream().sorted(Comparator.comparing(Map.Entry::getValue));
+                for (final Map.Entry<ResourceLocation, AdvancementProgress> entry9 : stream7.collect(Collectors.<Map.Entry<ResourceLocation, AdvancementProgress>>toList())) {
+                    final Advancement w10 = us.getAdvancement(entry9.getKey());
+                    if (w10 == null) {
+                        PlayerAdvancements.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry9.getKey(), this.file);
                     }
                     else {
-                        this.startProgress(u9, entry8.getValue());
+                        this.startProgress(w10, entry9.getValue());
                     }
                 }
             }
-            catch (JsonParseException jsonParseException2) {
-                PlayerAdvancements.LOGGER.error("Couldn't parse player advancements in {}", this.file, jsonParseException2);
+            catch (JsonParseException jsonParseException3) {
+                PlayerAdvancements.LOGGER.error("Couldn't parse player advancements in {}", this.file, jsonParseException3);
             }
-            catch (IOException iOException2) {
-                PlayerAdvancements.LOGGER.error("Couldn't access player advancements in {}", this.file, iOException2);
+            catch (IOException iOException3) {
+                PlayerAdvancements.LOGGER.error("Couldn't access player advancements in {}", this.file, iOException3);
             }
         }
-        this.checkForAutomaticTriggers();
+        this.checkForAutomaticTriggers(us);
         this.ensureAllVisible();
-        this.registerListeners();
+        this.registerListeners(us);
     }
     
     public void save() {
         final Map<ResourceLocation, AdvancementProgress> map2 = Maps.newHashMap();
         for (final Map.Entry<Advancement, AdvancementProgress> entry4 : this.advancements.entrySet()) {
-            final AdvancementProgress w5 = entry4.getValue();
-            if (w5.hasProgress()) {
-                map2.put(entry4.getKey().getId(), w5);
+            final AdvancementProgress y5 = entry4.getValue();
+            if (y5.hasProgress()) {
+                map2.put(entry4.getKey().getId(), y5);
             }
         }
         if (this.file.getParentFile() != null) {
@@ -191,106 +197,106 @@ public class PlayerAdvancements {
         }
     }
     
-    public boolean award(final Advancement u, final String string) {
+    public boolean award(final Advancement w, final String string) {
         boolean boolean4 = false;
-        final AdvancementProgress w5 = this.getOrStartProgress(u);
-        final boolean boolean5 = w5.isDone();
-        if (w5.grantProgress(string)) {
-            this.unregisterListeners(u);
-            this.progressChanged.add(u);
+        final AdvancementProgress y5 = this.getOrStartProgress(w);
+        final boolean boolean5 = y5.isDone();
+        if (y5.grantProgress(string)) {
+            this.unregisterListeners(w);
+            this.progressChanged.add(w);
             boolean4 = true;
-            if (!boolean5 && w5.isDone()) {
-                u.getRewards().grant(this.player);
-                if (u.getDisplay() != null && u.getDisplay().shouldAnnounceChat() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
-                    this.server.getPlayerList().broadcastMessage(new TranslatableComponent("chat.type.advancement." + u.getDisplay().getFrame().getName(), new Object[] { this.player.getDisplayName(), u.getChatComponent() }));
+            if (!boolean5 && y5.isDone()) {
+                w.getRewards().grant(this.player);
+                if (w.getDisplay() != null && w.getDisplay().shouldAnnounceChat() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
+                    this.playerList.broadcastMessage(new TranslatableComponent("chat.type.advancement." + w.getDisplay().getFrame().getName(), new Object[] { this.player.getDisplayName(), w.getChatComponent() }), ChatType.SYSTEM, Util.NIL_UUID);
                 }
             }
         }
-        if (w5.isDone()) {
-            this.ensureVisibility(u);
+        if (y5.isDone()) {
+            this.ensureVisibility(w);
         }
         return boolean4;
     }
     
-    public boolean revoke(final Advancement u, final String string) {
+    public boolean revoke(final Advancement w, final String string) {
         boolean boolean4 = false;
-        final AdvancementProgress w5 = this.getOrStartProgress(u);
-        if (w5.revokeProgress(string)) {
-            this.registerListeners(u);
-            this.progressChanged.add(u);
+        final AdvancementProgress y5 = this.getOrStartProgress(w);
+        if (y5.revokeProgress(string)) {
+            this.registerListeners(w);
+            this.progressChanged.add(w);
             boolean4 = true;
         }
-        if (!w5.hasProgress()) {
-            this.ensureVisibility(u);
+        if (!y5.hasProgress()) {
+            this.ensureVisibility(w);
         }
         return boolean4;
     }
     
-    private void registerListeners(final Advancement u) {
-        final AdvancementProgress w3 = this.getOrStartProgress(u);
-        if (w3.isDone()) {
+    private void registerListeners(final Advancement w) {
+        final AdvancementProgress y3 = this.getOrStartProgress(w);
+        if (y3.isDone()) {
             return;
         }
-        for (final Map.Entry<String, Criterion> entry5 : u.getCriteria().entrySet()) {
-            final CriterionProgress aa6 = w3.getCriterion(entry5.getKey());
-            if (aa6 != null) {
-                if (aa6.isDone()) {
+        for (final Map.Entry<String, Criterion> entry5 : w.getCriteria().entrySet()) {
+            final CriterionProgress ac6 = y3.getCriterion(entry5.getKey());
+            if (ac6 != null) {
+                if (ac6.isDone()) {
                     continue;
                 }
-                final CriterionTriggerInstance ac7 = entry5.getValue().getTrigger();
-                if (ac7 == null) {
+                final CriterionTriggerInstance ae7 = entry5.getValue().getTrigger();
+                if (ae7 == null) {
                     continue;
                 }
-                final CriterionTrigger<CriterionTriggerInstance> ab8 = CriteriaTriggers.<CriterionTriggerInstance>getCriterion(ac7.getCriterion());
-                if (ab8 == null) {
+                final CriterionTrigger<CriterionTriggerInstance> ad8 = CriteriaTriggers.<CriterionTriggerInstance>getCriterion(ae7.getCriterion());
+                if (ad8 == null) {
                     continue;
                 }
-                ab8.addPlayerListener(this, new CriterionTrigger.Listener<CriterionTriggerInstance>(ac7, u, entry5.getKey()));
+                ad8.addPlayerListener(this, new CriterionTrigger.Listener<CriterionTriggerInstance>(ae7, w, entry5.getKey()));
             }
         }
     }
     
-    private void unregisterListeners(final Advancement u) {
-        final AdvancementProgress w3 = this.getOrStartProgress(u);
-        for (final Map.Entry<String, Criterion> entry5 : u.getCriteria().entrySet()) {
-            final CriterionProgress aa6 = w3.getCriterion(entry5.getKey());
-            if (aa6 != null) {
-                if (!aa6.isDone() && !w3.isDone()) {
+    private void unregisterListeners(final Advancement w) {
+        final AdvancementProgress y3 = this.getOrStartProgress(w);
+        for (final Map.Entry<String, Criterion> entry5 : w.getCriteria().entrySet()) {
+            final CriterionProgress ac6 = y3.getCriterion(entry5.getKey());
+            if (ac6 != null) {
+                if (!ac6.isDone() && !y3.isDone()) {
                     continue;
                 }
-                final CriterionTriggerInstance ac7 = entry5.getValue().getTrigger();
-                if (ac7 == null) {
+                final CriterionTriggerInstance ae7 = entry5.getValue().getTrigger();
+                if (ae7 == null) {
                     continue;
                 }
-                final CriterionTrigger<CriterionTriggerInstance> ab8 = CriteriaTriggers.<CriterionTriggerInstance>getCriterion(ac7.getCriterion());
-                if (ab8 == null) {
+                final CriterionTrigger<CriterionTriggerInstance> ad8 = CriteriaTriggers.<CriterionTriggerInstance>getCriterion(ae7.getCriterion());
+                if (ad8 == null) {
                     continue;
                 }
-                ab8.removePlayerListener(this, new CriterionTrigger.Listener<CriterionTriggerInstance>(ac7, u, entry5.getKey()));
+                ad8.removePlayerListener(this, new CriterionTrigger.Listener<CriterionTriggerInstance>(ae7, w, entry5.getKey()));
             }
         }
     }
     
-    public void flushDirty(final ServerPlayer xe) {
+    public void flushDirty(final ServerPlayer ze) {
         if (this.isFirstPacket || !this.visibilityChanged.isEmpty() || !this.progressChanged.isEmpty()) {
             final Map<ResourceLocation, AdvancementProgress> map3 = Maps.newHashMap();
             final Set<Advancement> set4 = Sets.newLinkedHashSet();
             final Set<ResourceLocation> set5 = Sets.newLinkedHashSet();
-            for (final Advancement u7 : this.progressChanged) {
-                if (this.visible.contains(u7)) {
-                    map3.put(u7.getId(), this.advancements.get(u7));
+            for (final Advancement w7 : this.progressChanged) {
+                if (this.visible.contains(w7)) {
+                    map3.put(w7.getId(), this.advancements.get(w7));
                 }
             }
-            for (final Advancement u7 : this.visibilityChanged) {
-                if (this.visible.contains(u7)) {
-                    set4.add(u7);
+            for (final Advancement w7 : this.visibilityChanged) {
+                if (this.visible.contains(w7)) {
+                    set4.add(w7);
                 }
                 else {
-                    set5.add(u7.getId());
+                    set5.add(w7.getId());
                 }
             }
             if (this.isFirstPacket || !map3.isEmpty() || !set4.isEmpty() || !set5.isEmpty()) {
-                xe.connection.send(new ClientboundUpdateAdvancementsPacket(this.isFirstPacket, set4, set5, map3));
+                ze.connection.send(new ClientboundUpdateAdvancementsPacket(this.isFirstPacket, set4, set5, map3));
                 this.visibilityChanged.clear();
                 this.progressChanged.clear();
             }
@@ -298,81 +304,81 @@ public class PlayerAdvancements {
         this.isFirstPacket = false;
     }
     
-    public void setSelectedTab(@Nullable final Advancement u) {
-        final Advancement u2 = this.lastSelectedTab;
-        if (u != null && u.getParent() == null && u.getDisplay() != null) {
-            this.lastSelectedTab = u;
+    public void setSelectedTab(@Nullable final Advancement w) {
+        final Advancement w2 = this.lastSelectedTab;
+        if (w != null && w.getParent() == null && w.getDisplay() != null) {
+            this.lastSelectedTab = w;
         }
         else {
             this.lastSelectedTab = null;
         }
-        if (u2 != this.lastSelectedTab) {
+        if (w2 != this.lastSelectedTab) {
             this.player.connection.send(new ClientboundSelectAdvancementsTabPacket((this.lastSelectedTab == null) ? null : this.lastSelectedTab.getId()));
         }
     }
     
-    public AdvancementProgress getOrStartProgress(final Advancement u) {
-        AdvancementProgress w3 = this.advancements.get(u);
-        if (w3 == null) {
-            w3 = new AdvancementProgress();
-            this.startProgress(u, w3);
+    public AdvancementProgress getOrStartProgress(final Advancement w) {
+        AdvancementProgress y3 = this.advancements.get(w);
+        if (y3 == null) {
+            y3 = new AdvancementProgress();
+            this.startProgress(w, y3);
         }
-        return w3;
+        return y3;
     }
     
-    private void startProgress(final Advancement u, final AdvancementProgress w) {
-        w.update(u.getCriteria(), u.getRequirements());
-        this.advancements.put(u, w);
+    private void startProgress(final Advancement w, final AdvancementProgress y) {
+        y.update(w.getCriteria(), w.getRequirements());
+        this.advancements.put(w, y);
     }
     
-    private void ensureVisibility(final Advancement u) {
-        final boolean boolean3 = this.shouldBeVisible(u);
-        final boolean boolean4 = this.visible.contains(u);
+    private void ensureVisibility(final Advancement w) {
+        final boolean boolean3 = this.shouldBeVisible(w);
+        final boolean boolean4 = this.visible.contains(w);
         if (boolean3 && !boolean4) {
-            this.visible.add(u);
-            this.visibilityChanged.add(u);
-            if (this.advancements.containsKey(u)) {
-                this.progressChanged.add(u);
+            this.visible.add(w);
+            this.visibilityChanged.add(w);
+            if (this.advancements.containsKey(w)) {
+                this.progressChanged.add(w);
             }
         }
         else if (!boolean3 && boolean4) {
-            this.visible.remove(u);
-            this.visibilityChanged.add(u);
+            this.visible.remove(w);
+            this.visibilityChanged.add(w);
         }
-        if (boolean3 != boolean4 && u.getParent() != null) {
-            this.ensureVisibility(u.getParent());
+        if (boolean3 != boolean4 && w.getParent() != null) {
+            this.ensureVisibility(w.getParent());
         }
-        for (final Advancement u2 : u.getChildren()) {
-            this.ensureVisibility(u2);
+        for (final Advancement w2 : w.getChildren()) {
+            this.ensureVisibility(w2);
         }
     }
     
-    private boolean shouldBeVisible(Advancement u) {
-        for (int integer3 = 0; u != null && integer3 <= 2; u = u.getParent(), ++integer3) {
-            if (integer3 == 0 && this.hasCompletedChildrenOrSelf(u)) {
+    private boolean shouldBeVisible(Advancement w) {
+        for (int integer3 = 0; w != null && integer3 <= 2; w = w.getParent(), ++integer3) {
+            if (integer3 == 0 && this.hasCompletedChildrenOrSelf(w)) {
                 return true;
             }
-            if (u.getDisplay() == null) {
+            if (w.getDisplay() == null) {
                 return false;
             }
-            final AdvancementProgress w4 = this.getOrStartProgress(u);
-            if (w4.isDone()) {
+            final AdvancementProgress y4 = this.getOrStartProgress(w);
+            if (y4.isDone()) {
                 return true;
             }
-            if (u.getDisplay().isHidden()) {
+            if (w.getDisplay().isHidden()) {
                 return false;
             }
         }
         return false;
     }
     
-    private boolean hasCompletedChildrenOrSelf(final Advancement u) {
-        final AdvancementProgress w3 = this.getOrStartProgress(u);
-        if (w3.isDone()) {
+    private boolean hasCompletedChildrenOrSelf(final Advancement w) {
+        final AdvancementProgress y3 = this.getOrStartProgress(w);
+        if (y3.isDone()) {
             return true;
         }
-        for (final Advancement u2 : u.getChildren()) {
-            if (this.hasCompletedChildrenOrSelf(u2)) {
+        for (final Advancement w2 : w.getChildren()) {
+            if (this.hasCompletedChildrenOrSelf(w2)) {
                 return true;
             }
         }
diff --git a/src/net/minecraft/server/ServerAdvancementManager.java b/src/net/minecraft/server/ServerAdvancementManager.java
index 078c444..ef768b2 100644
--- a/src/net/minecraft/server/ServerAdvancementManager.java
+++ b/src/net/minecraft/server/ServerAdvancementManager.java
@@ -1,28 +1,23 @@
 package net.minecraft.server;
 
-import com.google.gson.TypeAdapterFactory;
-import net.minecraft.util.LowerCaseEnumTypeAdapterFactory;
-import net.minecraft.network.chat.Style;
-import net.minecraft.network.chat.Component;
-import net.minecraft.advancements.AdvancementRewards;
 import com.google.gson.GsonBuilder;
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
-import java.lang.reflect.Type;
 import java.util.Collection;
 import javax.annotation.Nullable;
 import java.util.Iterator;
+import com.google.gson.JsonObject;
 import net.minecraft.advancements.TreeNodePosition;
 import com.google.gson.JsonParseException;
-import com.google.gson.JsonElement;
 import net.minecraft.advancements.Advancement;
+import net.minecraft.advancements.critereon.DeserializationContext;
+import net.minecraft.util.GsonHelper;
 import com.google.common.collect.Maps;
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.server.packs.resources.ResourceManager;
-import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
+import net.minecraft.world.level.storage.loot.PredicateManager;
 import net.minecraft.advancements.AdvancementList;
 import com.google.gson.Gson;
 import org.apache.logging.log4j.Logger;
@@ -32,43 +27,47 @@ public class ServerAdvancementManager extends SimpleJsonResourceReloadListener {
     private static final Logger LOGGER;
     private static final Gson GSON;
     private AdvancementList advancements;
+    private final PredicateManager predicateManager;
     
-    public ServerAdvancementManager() {
+    public ServerAdvancementManager(final PredicateManager day) {
         super(ServerAdvancementManager.GSON, "advancements");
         this.advancements = new AdvancementList();
+        this.predicateManager = day;
     }
     
     @Override
-    protected void apply(final Map<ResourceLocation, JsonObject> map, final ResourceManager zb, final ProfilerFiller aio) {
+    protected void apply(final Map<ResourceLocation, JsonElement> map, final ResourceManager abc, final ProfilerFiller ami) {
         final Map<ResourceLocation, Advancement.Builder> map2 = Maps.newHashMap();
-        Advancement.Builder a4;
+        JsonObject jsonObject5;
+        Advancement.Builder a6;
         final Map<ResourceLocation, Advancement.Builder> map3;
         final RuntimeException ex;
-        RuntimeException runtimeException4;
-        map.forEach((sm, jsonObject) -> {
+        RuntimeException runtimeException5;
+        map.forEach((uh, jsonElement) -> {
             try {
-                a4 = ServerAdvancementManager.GSON.<Advancement.Builder>fromJson(jsonObject, Advancement.Builder.class);
-                map3.put(sm, a4);
+                jsonObject5 = GsonHelper.convertToJsonObject(jsonElement, "advancement");
+                a6 = Advancement.Builder.fromJson(jsonObject5, new DeserializationContext(uh, this.predicateManager));
+                map3.put(uh, a6);
             }
             catch (JsonParseException | IllegalArgumentException ex2) {
-                runtimeException4 = ex;
-                ServerAdvancementManager.LOGGER.error("Parsing error loading custom advancement {}: {}", sm, runtimeException4.getMessage());
+                runtimeException5 = ex;
+                ServerAdvancementManager.LOGGER.error("Parsing error loading custom advancement {}: {}", uh, runtimeException5.getMessage());
             }
             return;
         });
-        final AdvancementList v6 = new AdvancementList();
-        v6.add(map2);
-        for (final Advancement u8 : v6.getRoots()) {
-            if (u8.getDisplay() != null) {
-                TreeNodePosition.run(u8);
+        final AdvancementList x6 = new AdvancementList();
+        x6.add(map2);
+        for (final Advancement w8 : x6.getRoots()) {
+            if (w8.getDisplay() != null) {
+                TreeNodePosition.run(w8);
             }
         }
-        this.advancements = v6;
+        this.advancements = x6;
     }
     
     @Nullable
-    public Advancement getAdvancement(final ResourceLocation sm) {
-        return this.advancements.get(sm);
+    public Advancement getAdvancement(final ResourceLocation uh) {
+        return this.advancements.get(uh);
     }
     
     public Collection<Advancement> getAllAdvancements() {
@@ -77,10 +76,6 @@ public class ServerAdvancementManager extends SimpleJsonResourceReloadListener {
     
     static {
         LOGGER = LogManager.getLogger();
-        final JsonObject jsonObject4;
-        GSON = new GsonBuilder().registerTypeHierarchyAdapter(Advancement.Builder.class, (jsonElement, type, jsonDeserializationContext) -> {
-            jsonObject4 = GsonHelper.convertToJsonObject(jsonElement, "advancement");
-            return Advancement.Builder.fromJson(jsonObject4, jsonDeserializationContext);
-        }).registerTypeAdapter(AdvancementRewards.class, new AdvancementRewards.Deserializer()).registerTypeHierarchyAdapter(Component.class, new Component.Serializer()).registerTypeHierarchyAdapter(Style.class, new Style.Serializer()).registerTypeAdapterFactory(new LowerCaseEnumTypeAdapterFactory()).create();
+        GSON = new GsonBuilder().create();
     }
 }
diff --git a/src/net/minecraft/server/ServerFunctionLibrary.java b/src/net/minecraft/server/ServerFunctionLibrary.java
new file mode 100644
index 0000000..dc195e1
--- /dev/null
+++ b/src/net/minecraft/server/ServerFunctionLibrary.java
@@ -0,0 +1,135 @@
+package net.minecraft.server;
+
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.server.packs.resources.Resource;
+import java.io.IOException;
+import java.util.concurrent.CompletionException;
+import org.apache.commons.io.IOUtils;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Iterator;
+import java.util.function.Function;
+import java.util.function.BiFunction;
+import java.util.concurrent.CompletionStage;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.commands.CommandSource;
+import com.google.common.collect.Maps;
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import net.minecraft.util.profiling.ProfilerFiller;
+import net.minecraft.server.packs.resources.ResourceManager;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.tags.Tag;
+import java.util.Optional;
+import net.minecraft.commands.CommandSourceStack;
+import com.mojang.brigadier.CommandDispatcher;
+import net.minecraft.tags.TagCollection;
+import net.minecraft.commands.CommandFunction;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Map;
+import org.apache.logging.log4j.Logger;
+import net.minecraft.server.packs.resources.PreparableReloadListener;
+
+public class ServerFunctionLibrary implements PreparableReloadListener {
+    private static final Logger LOGGER;
+    private static final int PATH_PREFIX_LENGTH;
+    private static final int PATH_SUFFIX_LENGTH;
+    private volatile Map<ResourceLocation, CommandFunction> functions;
+    private final TagCollection<CommandFunction> tags;
+    private final int functionCompilationLevel;
+    private final CommandDispatcher<CommandSourceStack> dispatcher;
+    
+    public Optional<CommandFunction> getFunction(final ResourceLocation uh) {
+        return Optional.<CommandFunction>ofNullable(this.functions.get(uh));
+    }
+    
+    public Map<ResourceLocation, CommandFunction> getFunctions() {
+        return this.functions;
+    }
+    
+    public TagCollection<CommandFunction> getTags() {
+        return this.tags;
+    }
+    
+    public Tag<CommandFunction> getTag(final ResourceLocation uh) {
+        return this.tags.getTagOrEmpty(uh);
+    }
+    
+    public ServerFunctionLibrary(final int integer, final CommandDispatcher<CommandSourceStack> commandDispatcher) {
+        this.functions = ImmutableMap.of();
+        this.tags = new TagCollection<CommandFunction>(this::getFunction, "tags/functions", "function");
+        this.functionCompilationLevel = integer;
+        this.dispatcher = commandDispatcher;
+    }
+    
+    @Override
+    public CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager abc, final ProfilerFiller ami3, final ProfilerFiller ami4, final Executor executor5, final Executor executor6) {
+        final CompletableFuture<Map<ResourceLocation, Tag.Builder>> completableFuture2 = this.tags.prepare(abc, executor5);
+        final Map<ResourceLocation, CompletableFuture<CommandFunction>> map5;
+        final CommandSourceStack cz6;
+        final Iterator<ResourceLocation> iterator;
+        ResourceLocation uh2;
+        String string2;
+        ResourceLocation uh3;
+        final ResourceLocation uh4;
+        List<String> list6;
+        final ResourceLocation uh5;
+        final CommandSourceStack cz7;
+        final CompletableFuture<?>[] arr7;
+        final CompletableFuture<Map<ResourceLocation, CompletableFuture<CommandFunction>>> completableFuture3 = CompletableFuture.<Collection>supplyAsync(() -> abc.listResources("functions", string -> string.endsWith(".mcfunction")), executor5).<Map<ResourceLocation, CompletableFuture<CommandFunction>>>thenCompose(collection -> {
+            map5 = Maps.newHashMap();
+            cz6 = new CommandSourceStack(CommandSource.NULL, Vec3.ZERO, Vec2.ZERO, null, this.functionCompilationLevel, "", TextComponent.EMPTY, null, null);
+            collection.iterator();
+            while (iterator.hasNext()) {
+                uh2 = iterator.next();
+                string2 = uh2.getPath();
+                uh3 = new ResourceLocation(uh2.getNamespace(), string2.substring(ServerFunctionLibrary.PATH_PREFIX_LENGTH, string2.length() - ServerFunctionLibrary.PATH_SUFFIX_LENGTH));
+                map5.put(uh3, CompletableFuture.<CommandFunction>supplyAsync(() -> {
+                    list6 = readLines(abc, uh4);
+                    return CommandFunction.fromLines(uh5, this.dispatcher, cz7, list6);
+                }, executor5));
+            }
+            arr7 = map5.values().<CompletableFuture<?>>toArray(new CompletableFuture[0]);
+            return CompletableFuture.allOf(arr7).handle((void2, throwable) -> map5);
+        });
+        final Map<ResourceLocation, CompletableFuture<CommandFunction>> map6;
+        final ImmutableMap.Builder<ResourceLocation, CommandFunction> builder4;
+        final ImmutableMap.Builder<ResourceLocation, CommandFunction> builder5;
+        return completableFuture2.thenCombine(completableFuture3, Pair::of).thenCompose(a::wait).thenAcceptAsync(pair -> {
+            map6 = (Map<ResourceLocation, CompletableFuture<CommandFunction>>)pair.getSecond();
+            builder4 = ImmutableMap.<ResourceLocation, CommandFunction>builder();
+            map6.forEach((uh, completableFuture) -> completableFuture.handle((cw, throwable) -> {
+                if (throwable != null) {
+                    ServerFunctionLibrary.LOGGER.error("Failed to load function {}", uh, throwable);
+                }
+                else {
+                    builder5.put(uh, cw);
+                }
+                return null;
+            }).join());
+            this.functions = builder4.build();
+            this.tags.load((Map<ResourceLocation, Tag.Builder>)pair.getFirst());
+        }, executor6);
+    }
+    
+    private static List<String> readLines(final ResourceManager abc, final ResourceLocation uh) {
+        try (final Resource abb3 = abc.getResource(uh)) {
+            return (List<String>)IOUtils.readLines(abb3.getInputStream(), StandardCharsets.UTF_8);
+        }
+        catch (IOException iOException3) {
+            throw new CompletionException(iOException3);
+        }
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+        PATH_PREFIX_LENGTH = "functions/".length();
+        PATH_SUFFIX_LENGTH = ".mcfunction".length();
+    }
+}
diff --git a/src/net/minecraft/server/ServerFunctionManager.java b/src/net/minecraft/server/ServerFunctionManager.java
index b8fa8eb..e9e086c 100644
--- a/src/net/minecraft/server/ServerFunctionManager.java
+++ b/src/net/minecraft/server/ServerFunctionManager.java
@@ -1,116 +1,77 @@
 package net.minecraft.server;
 
-import org.apache.logging.log4j.LogManager;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.commands.CommandSource;
-import net.minecraft.server.packs.resources.Resource;
-import java.io.IOException;
-import java.util.concurrent.CompletionException;
-import org.apache.commons.io.IOUtils;
-import java.nio.charset.StandardCharsets;
-import javax.annotation.Nullable;
 import net.minecraft.tags.Tag;
-import java.util.concurrent.CompletableFuture;
-import net.minecraft.server.packs.resources.SimpleResource;
-import net.minecraft.server.packs.resources.ResourceManager;
+import java.util.Optional;
 import java.util.function.Consumer;
-import java.util.Collection;
 import java.util.Iterator;
+import java.util.Collection;
 import net.minecraft.commands.CommandSourceStack;
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.world.level.GameRules;
-import java.util.Optional;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import net.minecraft.tags.TagCollection;
+import net.minecraft.commands.CommandFunction;
 import java.util.List;
 import java.util.ArrayDeque;
-import net.minecraft.commands.CommandFunction;
-import java.util.Map;
 import net.minecraft.resources.ResourceLocation;
-import org.apache.logging.log4j.Logger;
-import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
 
-public class ServerFunctionManager implements ResourceManagerReloadListener {
-    private static final Logger LOGGER;
+public class ServerFunctionManager {
     private static final ResourceLocation TICK_FUNCTION_TAG;
     private static final ResourceLocation LOAD_FUNCTION_TAG;
-    public static final int PATH_PREFIX_LENGTH;
-    public static final int PATH_SUFFIX_LENGTH;
     private final MinecraftServer server;
-    private final Map<ResourceLocation, CommandFunction> functions;
     private boolean isInFunction;
     private final ArrayDeque<QueuedCommand> commandQueue;
     private final List<QueuedCommand> nestedCalls;
-    private final TagCollection<CommandFunction> tags;
     private final List<CommandFunction> ticking;
     private boolean postReload;
+    private ServerFunctionLibrary library;
     
-    public ServerFunctionManager(final MinecraftServer minecraftServer) {
-        this.functions = Maps.newHashMap();
+    public ServerFunctionManager(final MinecraftServer minecraftServer, final ServerFunctionLibrary ut) {
         this.commandQueue = new ArrayDeque<QueuedCommand>();
         this.nestedCalls = Lists.newArrayList();
-        this.tags = new TagCollection<CommandFunction>(this::get, "tags/functions", true, "function");
         this.ticking = Lists.newArrayList();
         this.server = minecraftServer;
-    }
-    
-    public Optional<CommandFunction> get(final ResourceLocation sm) {
-        return Optional.<CommandFunction>ofNullable(this.functions.get(sm));
-    }
-    
-    public MinecraftServer getServer() {
-        return this.server;
+        this.postReload(this.library = ut);
     }
     
     public int getCommandLimit() {
         return this.server.getGameRules().getInt(GameRules.RULE_MAX_COMMAND_CHAIN_LENGTH);
     }
     
-    public Map<ResourceLocation, CommandFunction> getFunctions() {
-        return this.functions;
-    }
-    
     public CommandDispatcher<CommandSourceStack> getDispatcher() {
         return this.server.getCommands().getDispatcher();
     }
     
     public void tick() {
-        this.server.getProfiler().push(ServerFunctionManager.TICK_FUNCTION_TAG::toString);
-        for (final CommandFunction cn3 : this.ticking) {
-            this.execute(cn3, this.getGameLoopSender());
-        }
-        this.server.getProfiler().pop();
+        this.executeTagFunctions(this.ticking, ServerFunctionManager.TICK_FUNCTION_TAG);
         if (this.postReload) {
             this.postReload = false;
-            final Collection<CommandFunction> collection2 = this.getTags().getTagOrEmpty(ServerFunctionManager.LOAD_FUNCTION_TAG).getValues();
-            this.server.getProfiler().push(ServerFunctionManager.LOAD_FUNCTION_TAG::toString);
-            for (final CommandFunction cn4 : collection2) {
-                this.execute(cn4, this.getGameLoopSender());
-            }
-            this.server.getProfiler().pop();
+            final Collection<CommandFunction> collection2 = this.library.getTags().getTagOrEmpty(ServerFunctionManager.LOAD_FUNCTION_TAG).getValues();
+            this.executeTagFunctions(collection2, ServerFunctionManager.LOAD_FUNCTION_TAG);
         }
     }
     
-    public int execute(final CommandFunction cn, final CommandSourceStack cq) {
+    private void executeTagFunctions(final Collection<CommandFunction> collection, final ResourceLocation uh) {
+        this.server.getProfiler().push(uh::toString);
+        for (final CommandFunction cw5 : collection) {
+            this.execute(cw5, this.getGameLoopSender());
+        }
+        this.server.getProfiler().pop();
+    }
+    
+    public int execute(final CommandFunction cw, final CommandSourceStack cz) {
         final int integer4 = this.getCommandLimit();
         if (this.isInFunction) {
             if (this.commandQueue.size() + this.nestedCalls.size() < integer4) {
-                this.nestedCalls.add(new QueuedCommand(this, cq, new CommandFunction.FunctionEntry(cn)));
+                this.nestedCalls.add(new QueuedCommand(this, cz, new CommandFunction.FunctionEntry(cw)));
             }
             return 0;
         }
         try {
             this.isInFunction = true;
             int integer5 = 0;
-            final CommandFunction.Entry[] arr6 = cn.getEntries();
+            final CommandFunction.Entry[] arr6 = cw.getEntries();
             for (int integer6 = arr6.length - 1; integer6 >= 0; --integer6) {
-                this.commandQueue.push(new QueuedCommand(this, cq, arr6[integer6]));
+                this.commandQueue.push(new QueuedCommand(this, cz, arr6[integer6]));
             }
             while (!this.commandQueue.isEmpty()) {
                 try {
@@ -138,65 +99,39 @@ public class ServerFunctionManager implements ResourceManagerReloadListener {
         }
     }
     
-    @Override
-    public void onResourceManagerReload(final ResourceManager zb) {
-        this.functions.clear();
+    public void replaceLibrary(final ServerFunctionLibrary ut) {
+        this.postReload(this.library = ut);
+    }
+    
+    private void postReload(final ServerFunctionLibrary ut) {
         this.ticking.clear();
-        final Collection<ResourceLocation> collection3 = zb.listResources("functions", string -> string.endsWith(".mcfunction"));
-        final List<CompletableFuture<CommandFunction>> list2 = Lists.newArrayList();
-        for (final ResourceLocation sm6 : collection3) {
-            final String string2 = sm6.getPath();
-            final ResourceLocation sm7 = new ResourceLocation(sm6.getNamespace(), string2.substring(ServerFunctionManager.PATH_PREFIX_LENGTH, string2.length() - ServerFunctionManager.PATH_SUFFIX_LENGTH));
-            list2.add(CompletableFuture.<List<String>>supplyAsync(() -> readLinesAsync(zb, sm6), SimpleResource.IO_EXECUTOR).thenApplyAsync(list -> CommandFunction.fromLines(sm7, this, list), this.server.getBackgroundTaskExecutor()).<CommandFunction>handle((cn, throwable) -> this.addFunction(cn, throwable, sm6)));
-        }
-        CompletableFuture.allOf(list2.<CompletableFuture<?>>toArray(new CompletableFuture[0])).join();
-        if (!this.functions.isEmpty()) {
-            ServerFunctionManager.LOGGER.info("Loaded {} custom command functions", this.functions.size());
-        }
-        this.tags.load(this.tags.prepare(zb, this.server.getBackgroundTaskExecutor()).join());
-        this.ticking.addAll(this.tags.getTagOrEmpty(ServerFunctionManager.TICK_FUNCTION_TAG).getValues());
+        this.ticking.addAll(ut.getTags().getTagOrEmpty(ServerFunctionManager.TICK_FUNCTION_TAG).getValues());
         this.postReload = true;
     }
     
-    @Nullable
-    private CommandFunction addFunction(final CommandFunction cn, @Nullable final Throwable throwable, final ResourceLocation sm) {
-        if (throwable != null) {
-            ServerFunctionManager.LOGGER.error("Couldn't load function at {}", sm, throwable);
-            return null;
-        }
-        synchronized (this.functions) {
-            this.functions.put(cn.getId(), cn);
-        }
-        return cn;
-    }
-    
-    private static List<String> readLinesAsync(final ResourceManager zb, final ResourceLocation sm) {
-        try (final Resource za3 = zb.getResource(sm)) {
-            return (List<String>)IOUtils.readLines(za3.getInputStream(), StandardCharsets.UTF_8);
-        }
-        catch (IOException iOException3) {
-            throw new CompletionException(iOException3);
-        }
-    }
-    
     public CommandSourceStack getGameLoopSender() {
         return this.server.createCommandSourceStack().withPermission(2).withSuppressedOutput();
     }
     
-    public CommandSourceStack getCompilationContext() {
-        return new CommandSourceStack(CommandSource.NULL, Vec3.ZERO, Vec2.ZERO, null, this.server.getFunctionCompilationLevel(), "", new TextComponent(""), this.server, null);
+    public Optional<CommandFunction> get(final ResourceLocation uh) {
+        return this.library.getFunction(uh);
     }
     
-    public TagCollection<CommandFunction> getTags() {
-        return this.tags;
+    public Tag<CommandFunction> getTag(final ResourceLocation uh) {
+        return this.library.getTag(uh);
+    }
+    
+    public Iterable<ResourceLocation> getFunctionNames() {
+        return this.library.getFunctions().keySet();
+    }
+    
+    public Iterable<ResourceLocation> getTagNames() {
+        return this.library.getTags().getAvailableTags();
     }
     
     static {
-        LOGGER = LogManager.getLogger();
         TICK_FUNCTION_TAG = new ResourceLocation("tick");
         LOAD_FUNCTION_TAG = new ResourceLocation("load");
-        PATH_PREFIX_LENGTH = "functions/".length();
-        PATH_SUFFIX_LENGTH = ".mcfunction".length();
     }
     
     public static class QueuedCommand {
@@ -204,9 +139,9 @@ public class ServerFunctionManager implements ResourceManagerReloadListener {
         private final CommandSourceStack sender;
         private final CommandFunction.Entry entry;
         
-        public QueuedCommand(final ServerFunctionManager sy, final CommandSourceStack cq, final CommandFunction.Entry c) {
-            this.manager = sy;
-            this.sender = cq;
+        public QueuedCommand(final ServerFunctionManager uu, final CommandSourceStack cz, final CommandFunction.Entry c) {
+            this.manager = uu;
+            this.sender = cz;
             this.entry = c;
         }
         
diff --git a/src/net/minecraft/server/ServerInterface.java b/src/net/minecraft/server/ServerInterface.java
index 7352d82..e592a8c 100644
--- a/src/net/minecraft/server/ServerInterface.java
+++ b/src/net/minecraft/server/ServerInterface.java
@@ -24,14 +24,4 @@ public interface ServerInterface {
     String getPluginNames();
     
     String runCommand(final String string);
-    
-    boolean isDebugging();
-    
-    void info(final String string);
-    
-    void warn(final String string);
-    
-    void error(final String string);
-    
-    void debug(final String string);
 }
diff --git a/src/net/minecraft/server/ServerResources.java b/src/net/minecraft/server/ServerResources.java
new file mode 100644
index 0000000..3761bc4
--- /dev/null
+++ b/src/net/minecraft/server/ServerResources.java
@@ -0,0 +1,102 @@
+package net.minecraft.server;
+
+import java.util.concurrent.Executor;
+import net.minecraft.server.packs.PackResources;
+import java.util.List;
+import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.server.packs.resources.PreparableReloadListener;
+import net.minecraft.server.packs.resources.SimpleReloadableResourceManager;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.world.level.storage.loot.LootTables;
+import net.minecraft.world.level.storage.loot.PredicateManager;
+import net.minecraft.tags.TagManager;
+import net.minecraft.world.item.crafting.RecipeManager;
+import net.minecraft.commands.Commands;
+import net.minecraft.server.packs.resources.ReloadableResourceManager;
+import net.minecraft.util.Unit;
+import java.util.concurrent.CompletableFuture;
+
+public class ServerResources implements AutoCloseable {
+    private static final CompletableFuture<Unit> DATA_RELOAD_INITIAL_TASK;
+    private final ReloadableResourceManager resources;
+    private final Commands commands;
+    private final RecipeManager recipes;
+    private final TagManager tags;
+    private final PredicateManager predicateManager;
+    private final LootTables lootTables;
+    private final ServerAdvancementManager advancements;
+    private final ServerFunctionLibrary functionLibrary;
+    
+    public ServerResources(final Commands.CommandSelection a, final int integer) {
+        this.resources = new SimpleReloadableResourceManager(PackType.SERVER_DATA);
+        this.recipes = new RecipeManager();
+        this.tags = new TagManager();
+        this.predicateManager = new PredicateManager();
+        this.lootTables = new LootTables(this.predicateManager);
+        this.advancements = new ServerAdvancementManager(this.predicateManager);
+        this.commands = new Commands(a);
+        this.functionLibrary = new ServerFunctionLibrary(integer, this.commands.getDispatcher());
+        this.resources.registerReloadListener(this.tags);
+        this.resources.registerReloadListener(this.predicateManager);
+        this.resources.registerReloadListener(this.recipes);
+        this.resources.registerReloadListener(this.lootTables);
+        this.resources.registerReloadListener(this.functionLibrary);
+        this.resources.registerReloadListener(this.advancements);
+    }
+    
+    public ServerFunctionLibrary getFunctionLibrary() {
+        return this.functionLibrary;
+    }
+    
+    public PredicateManager getPredicateManager() {
+        return this.predicateManager;
+    }
+    
+    public LootTables getLootTables() {
+        return this.lootTables;
+    }
+    
+    public TagManager getTags() {
+        return this.tags;
+    }
+    
+    public RecipeManager getRecipeManager() {
+        return this.recipes;
+    }
+    
+    public Commands getCommands() {
+        return this.commands;
+    }
+    
+    public ServerAdvancementManager getAdvancements() {
+        return this.advancements;
+    }
+    
+    public ResourceManager getResourceManager() {
+        return this.resources;
+    }
+    
+    public static CompletableFuture<ServerResources> loadResources(final List<PackResources> list, final Commands.CommandSelection a, final int integer, final Executor executor4, final Executor executor5) {
+        final ServerResources uw6 = new ServerResources(a, integer);
+        final CompletableFuture<Unit> completableFuture7 = uw6.resources.reload(executor4, executor5, list, ServerResources.DATA_RELOAD_INITIAL_TASK);
+        final ServerResources serverResources;
+        return completableFuture7.whenComplete((ael, throwable) -> {
+            if (throwable != null) {
+                serverResources.close();
+            }
+        }).<ServerResources>thenApply(ael -> uw6);
+    }
+    
+    public void updateGlobals() {
+        this.tags.bindToGlobal();
+    }
+    
+    @Override
+    public void close() {
+        this.resources.close();
+    }
+    
+    static {
+        DATA_RELOAD_INITIAL_TASK = CompletableFuture.<Unit>completedFuture(Unit.INSTANCE);
+    }
+}
diff --git a/src/net/minecraft/server/ServerScoreboard.java b/src/net/minecraft/server/ServerScoreboard.java
index dff0646..cadf416 100644
--- a/src/net/minecraft/server/ServerScoreboard.java
+++ b/src/net/minecraft/server/ServerScoreboard.java
@@ -31,10 +31,10 @@ public class ServerScoreboard extends Scoreboard {
     }
     
     @Override
-    public void onScoreChanged(final Score cwk) {
-        super.onScoreChanged(cwk);
-        if (this.trackedObjectives.contains(cwk.getObjective())) {
-            this.server.getPlayerList().broadcastAll(new ClientboundSetScorePacket(Method.CHANGE, cwk.getObjective().getName(), cwk.getOwner(), cwk.getScore()));
+    public void onScoreChanged(final Score dfl) {
+        super.onScoreChanged(dfl);
+        if (this.trackedObjectives.contains(dfl.getObjective())) {
+            this.server.getPlayerList().broadcastAll(new ClientboundSetScorePacket(Method.CHANGE, dfl.getObjective().getName(), dfl.getOwner(), dfl.getScore()));
         }
         this.setDirty();
     }
@@ -47,41 +47,41 @@ public class ServerScoreboard extends Scoreboard {
     }
     
     @Override
-    public void onPlayerScoreRemoved(final String string, final Objective cwi) {
-        super.onPlayerScoreRemoved(string, cwi);
-        if (this.trackedObjectives.contains(cwi)) {
-            this.server.getPlayerList().broadcastAll(new ClientboundSetScorePacket(Method.REMOVE, cwi.getName(), string, 0));
+    public void onPlayerScoreRemoved(final String string, final Objective dfj) {
+        super.onPlayerScoreRemoved(string, dfj);
+        if (this.trackedObjectives.contains(dfj)) {
+            this.server.getPlayerList().broadcastAll(new ClientboundSetScorePacket(Method.REMOVE, dfj.getName(), string, 0));
         }
         this.setDirty();
     }
     
     @Override
-    public void setDisplayObjective(final int integer, @Nullable final Objective cwi) {
-        final Objective cwi2 = this.getDisplayObjective(integer);
-        super.setDisplayObjective(integer, cwi);
-        if (cwi2 != cwi && cwi2 != null) {
-            if (this.getObjectiveDisplaySlotCount(cwi2) > 0) {
-                this.server.getPlayerList().broadcastAll(new ClientboundSetDisplayObjectivePacket(integer, cwi));
+    public void setDisplayObjective(final int integer, @Nullable final Objective dfj) {
+        final Objective dfj2 = this.getDisplayObjective(integer);
+        super.setDisplayObjective(integer, dfj);
+        if (dfj2 != dfj && dfj2 != null) {
+            if (this.getObjectiveDisplaySlotCount(dfj2) > 0) {
+                this.server.getPlayerList().broadcastAll(new ClientboundSetDisplayObjectivePacket(integer, dfj));
             }
             else {
-                this.stopTrackingObjective(cwi2);
+                this.stopTrackingObjective(dfj2);
             }
         }
-        if (cwi != null) {
-            if (this.trackedObjectives.contains(cwi)) {
-                this.server.getPlayerList().broadcastAll(new ClientboundSetDisplayObjectivePacket(integer, cwi));
+        if (dfj != null) {
+            if (this.trackedObjectives.contains(dfj)) {
+                this.server.getPlayerList().broadcastAll(new ClientboundSetDisplayObjectivePacket(integer, dfj));
             }
             else {
-                this.startTrackingObjective(cwi);
+                this.startTrackingObjective(dfj);
             }
         }
         this.setDirty();
     }
     
     @Override
-    public boolean addPlayerToTeam(final String string, final PlayerTeam cwj) {
-        if (super.addPlayerToTeam(string, cwj)) {
-            this.server.getPlayerList().broadcastAll(new ClientboundSetPlayerTeamPacket(cwj, Arrays.<String>asList(string), 3));
+    public boolean addPlayerToTeam(final String string, final PlayerTeam dfk) {
+        if (super.addPlayerToTeam(string, dfk)) {
+            this.server.getPlayerList().broadcastAll(new ClientboundSetPlayerTeamPacket(dfk, Arrays.<String>asList(string), 3));
             this.setDirty();
             return true;
         }
@@ -89,54 +89,54 @@ public class ServerScoreboard extends Scoreboard {
     }
     
     @Override
-    public void removePlayerFromTeam(final String string, final PlayerTeam cwj) {
-        super.removePlayerFromTeam(string, cwj);
-        this.server.getPlayerList().broadcastAll(new ClientboundSetPlayerTeamPacket(cwj, Arrays.<String>asList(string), 4));
+    public void removePlayerFromTeam(final String string, final PlayerTeam dfk) {
+        super.removePlayerFromTeam(string, dfk);
+        this.server.getPlayerList().broadcastAll(new ClientboundSetPlayerTeamPacket(dfk, Arrays.<String>asList(string), 4));
         this.setDirty();
     }
     
     @Override
-    public void onObjectiveAdded(final Objective cwi) {
-        super.onObjectiveAdded(cwi);
+    public void onObjectiveAdded(final Objective dfj) {
+        super.onObjectiveAdded(dfj);
         this.setDirty();
     }
     
     @Override
-    public void onObjectiveChanged(final Objective cwi) {
-        super.onObjectiveChanged(cwi);
-        if (this.trackedObjectives.contains(cwi)) {
-            this.server.getPlayerList().broadcastAll(new ClientboundSetObjectivePacket(cwi, 2));
+    public void onObjectiveChanged(final Objective dfj) {
+        super.onObjectiveChanged(dfj);
+        if (this.trackedObjectives.contains(dfj)) {
+            this.server.getPlayerList().broadcastAll(new ClientboundSetObjectivePacket(dfj, 2));
         }
         this.setDirty();
     }
     
     @Override
-    public void onObjectiveRemoved(final Objective cwi) {
-        super.onObjectiveRemoved(cwi);
-        if (this.trackedObjectives.contains(cwi)) {
-            this.stopTrackingObjective(cwi);
+    public void onObjectiveRemoved(final Objective dfj) {
+        super.onObjectiveRemoved(dfj);
+        if (this.trackedObjectives.contains(dfj)) {
+            this.stopTrackingObjective(dfj);
         }
         this.setDirty();
     }
     
     @Override
-    public void onTeamAdded(final PlayerTeam cwj) {
-        super.onTeamAdded(cwj);
-        this.server.getPlayerList().broadcastAll(new ClientboundSetPlayerTeamPacket(cwj, 0));
+    public void onTeamAdded(final PlayerTeam dfk) {
+        super.onTeamAdded(dfk);
+        this.server.getPlayerList().broadcastAll(new ClientboundSetPlayerTeamPacket(dfk, 0));
         this.setDirty();
     }
     
     @Override
-    public void onTeamChanged(final PlayerTeam cwj) {
-        super.onTeamChanged(cwj);
-        this.server.getPlayerList().broadcastAll(new ClientboundSetPlayerTeamPacket(cwj, 2));
+    public void onTeamChanged(final PlayerTeam dfk) {
+        super.onTeamChanged(dfk);
+        this.server.getPlayerList().broadcastAll(new ClientboundSetPlayerTeamPacket(dfk, 2));
         this.setDirty();
     }
     
     @Override
-    public void onTeamRemoved(final PlayerTeam cwj) {
-        super.onTeamRemoved(cwj);
-        this.server.getPlayerList().broadcastAll(new ClientboundSetPlayerTeamPacket(cwj, 1));
+    public void onTeamRemoved(final PlayerTeam dfk) {
+        super.onTeamRemoved(dfk);
+        this.server.getPlayerList().broadcastAll(new ClientboundSetPlayerTeamPacket(dfk, 1));
         this.setDirty();
     }
     
@@ -150,55 +150,55 @@ public class ServerScoreboard extends Scoreboard {
         }
     }
     
-    public List<Packet<?>> getStartTrackingPackets(final Objective cwi) {
+    public List<Packet<?>> getStartTrackingPackets(final Objective dfj) {
         final List<Packet<?>> list3 = Lists.newArrayList();
-        list3.add(new ClientboundSetObjectivePacket(cwi, 0));
+        list3.add(new ClientboundSetObjectivePacket(dfj, 0));
         for (int integer4 = 0; integer4 < 19; ++integer4) {
-            if (this.getDisplayObjective(integer4) == cwi) {
-                list3.add(new ClientboundSetDisplayObjectivePacket(integer4, cwi));
+            if (this.getDisplayObjective(integer4) == dfj) {
+                list3.add(new ClientboundSetDisplayObjectivePacket(integer4, dfj));
             }
         }
-        for (final Score cwk5 : this.getPlayerScores(cwi)) {
-            list3.add(new ClientboundSetScorePacket(Method.CHANGE, cwk5.getObjective().getName(), cwk5.getOwner(), cwk5.getScore()));
+        for (final Score dfl5 : this.getPlayerScores(dfj)) {
+            list3.add(new ClientboundSetScorePacket(Method.CHANGE, dfl5.getObjective().getName(), dfl5.getOwner(), dfl5.getScore()));
         }
         return list3;
     }
     
-    public void startTrackingObjective(final Objective cwi) {
-        final List<Packet<?>> list3 = this.getStartTrackingPackets(cwi);
-        for (final ServerPlayer xe5 : this.server.getPlayerList().getPlayers()) {
-            for (final Packet<?> lt7 : list3) {
-                xe5.connection.send(lt7);
+    public void startTrackingObjective(final Objective dfj) {
+        final List<Packet<?>> list3 = this.getStartTrackingPackets(dfj);
+        for (final ServerPlayer ze5 : this.server.getPlayerList().getPlayers()) {
+            for (final Packet<?> ni7 : list3) {
+                ze5.connection.send(ni7);
             }
         }
-        this.trackedObjectives.add(cwi);
+        this.trackedObjectives.add(dfj);
     }
     
-    public List<Packet<?>> getStopTrackingPackets(final Objective cwi) {
+    public List<Packet<?>> getStopTrackingPackets(final Objective dfj) {
         final List<Packet<?>> list3 = Lists.newArrayList();
-        list3.add(new ClientboundSetObjectivePacket(cwi, 1));
+        list3.add(new ClientboundSetObjectivePacket(dfj, 1));
         for (int integer4 = 0; integer4 < 19; ++integer4) {
-            if (this.getDisplayObjective(integer4) == cwi) {
-                list3.add(new ClientboundSetDisplayObjectivePacket(integer4, cwi));
+            if (this.getDisplayObjective(integer4) == dfj) {
+                list3.add(new ClientboundSetDisplayObjectivePacket(integer4, dfj));
             }
         }
         return list3;
     }
     
-    public void stopTrackingObjective(final Objective cwi) {
-        final List<Packet<?>> list3 = this.getStopTrackingPackets(cwi);
-        for (final ServerPlayer xe5 : this.server.getPlayerList().getPlayers()) {
-            for (final Packet<?> lt7 : list3) {
-                xe5.connection.send(lt7);
+    public void stopTrackingObjective(final Objective dfj) {
+        final List<Packet<?>> list3 = this.getStopTrackingPackets(dfj);
+        for (final ServerPlayer ze5 : this.server.getPlayerList().getPlayers()) {
+            for (final Packet<?> ni7 : list3) {
+                ze5.connection.send(ni7);
             }
         }
-        this.trackedObjectives.remove(cwi);
+        this.trackedObjectives.remove(dfj);
     }
     
-    public int getObjectiveDisplaySlotCount(final Objective cwi) {
+    public int getObjectiveDisplaySlotCount(final Objective dfj) {
         int integer3 = 0;
         for (int integer4 = 0; integer4 < 19; ++integer4) {
-            if (this.getDisplayObjective(integer4) == cwi) {
+            if (this.getDisplayObjective(integer4) == dfj) {
                 ++integer3;
             }
         }
diff --git a/src/net/minecraft/server/bossevents/CustomBossEvent.java b/src/net/minecraft/server/bossevents/CustomBossEvent.java
index 6e89c3f..6ac59a3 100644
--- a/src/net/minecraft/server/bossevents/CustomBossEvent.java
+++ b/src/net/minecraft/server/bossevents/CustomBossEvent.java
@@ -1,5 +1,6 @@
 package net.minecraft.server.bossevents;
 
+import net.minecraft.nbt.IntArrayTag;
 import java.util.AbstractList;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.NbtUtils;
@@ -27,11 +28,11 @@ public class CustomBossEvent extends ServerBossEvent {
     private int value;
     private int max;
     
-    public CustomBossEvent(final ResourceLocation sm, final Component lf) {
-        super(lf, BossBarColor.WHITE, BossBarOverlay.PROGRESS);
+    public CustomBossEvent(final ResourceLocation uh, final Component mr) {
+        super(mr, BossBarColor.WHITE, BossBarOverlay.PROGRESS);
         this.players = Sets.newHashSet();
         this.max = 100;
-        this.id = sm;
+        this.id = uh;
         this.setPercent(0.0f);
     }
     
@@ -40,9 +41,9 @@ public class CustomBossEvent extends ServerBossEvent {
     }
     
     @Override
-    public void addPlayer(final ServerPlayer xe) {
-        super.addPlayer(xe);
-        this.players.add(xe.getUUID());
+    public void addPlayer(final ServerPlayer ze) {
+        super.addPlayer(ze);
+        this.players.add(ze.getUUID());
     }
     
     public void addOfflinePlayer(final UUID uUID) {
@@ -50,9 +51,9 @@ public class CustomBossEvent extends ServerBossEvent {
     }
     
     @Override
-    public void removePlayer(final ServerPlayer xe) {
-        super.removePlayer(xe);
-        this.players.remove(xe.getUUID());
+    public void removePlayer(final ServerPlayer ze) {
+        super.removePlayer(ze);
+        this.players.remove(ze.getUUID());
     }
     
     @Override
@@ -80,12 +81,12 @@ public class CustomBossEvent extends ServerBossEvent {
     }
     
     public final Component getDisplayName() {
-        final HoverEvent hoverEvent;
+        final HoverEvent mv;
         final Style style;
-        return ComponentUtils.wrapInSquareBrackets(this.getName()).withStyle(ln -> {
-            ln.setColor(this.getColor().getFormatting());
-            new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent(this.getTextId().toString()));
-            style.setHoverEvent(hoverEvent).setInsertion(this.getTextId().toString());
+        return ComponentUtils.wrapInSquareBrackets(this.getName()).withStyle(nb -> {
+            nb.withColor(this.getColor().getFormatting());
+            new HoverEvent((HoverEvent.Action<TextComponent>)HoverEvent.Action.SHOW_TEXT, new TextComponent(this.getTextId().toString()));
+            return style.withHoverEvent(mv).withInsertion(this.getTextId().toString());
         });
     }
     
@@ -94,8 +95,8 @@ public class CustomBossEvent extends ServerBossEvent {
         final Set<ServerPlayer> set4 = Sets.newHashSet();
         for (final UUID uUID6 : this.players) {
             boolean boolean7 = false;
-            for (final ServerPlayer xe9 : collection) {
-                if (xe9.getUUID().equals(uUID6)) {
+            for (final ServerPlayer ze9 : collection) {
+                if (ze9.getUUID().equals(uUID6)) {
                     boolean7 = true;
                     break;
                 }
@@ -104,76 +105,76 @@ public class CustomBossEvent extends ServerBossEvent {
                 set3.add(uUID6);
             }
         }
-        for (final ServerPlayer xe10 : collection) {
+        for (final ServerPlayer ze10 : collection) {
             boolean boolean7 = false;
             for (final UUID uUID7 : this.players) {
-                if (xe10.getUUID().equals(uUID7)) {
+                if (ze10.getUUID().equals(uUID7)) {
                     boolean7 = true;
                     break;
                 }
             }
             if (!boolean7) {
-                set4.add(xe10);
+                set4.add(ze10);
             }
         }
         for (final UUID uUID6 : set3) {
-            for (final ServerPlayer xe11 : this.getPlayers()) {
-                if (xe11.getUUID().equals(uUID6)) {
-                    this.removePlayer(xe11);
+            for (final ServerPlayer ze11 : this.getPlayers()) {
+                if (ze11.getUUID().equals(uUID6)) {
+                    this.removePlayer(ze11);
                     break;
                 }
             }
             this.players.remove(uUID6);
         }
-        for (final ServerPlayer xe10 : set4) {
-            this.addPlayer(xe10);
+        for (final ServerPlayer ze10 : set4) {
+            this.addPlayer(ze10);
         }
         return !set3.isEmpty() || !set4.isEmpty();
     }
     
     public CompoundTag save() {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.putString("Name", Component.Serializer.toJson(this.name));
-        jt2.putBoolean("Visible", this.isVisible());
-        jt2.putInt("Value", this.value);
-        jt2.putInt("Max", this.max);
-        jt2.putString("Color", this.getColor().getName());
-        jt2.putString("Overlay", this.getOverlay().getName());
-        jt2.putBoolean("DarkenScreen", this.shouldDarkenScreen());
-        jt2.putBoolean("PlayBossMusic", this.shouldPlayBossMusic());
-        jt2.putBoolean("CreateWorldFog", this.shouldCreateWorldFog());
-        final ListTag jz3 = new ListTag();
+        final CompoundTag le2 = new CompoundTag();
+        le2.putString("Name", Component.Serializer.toJson(this.name));
+        le2.putBoolean("Visible", this.isVisible());
+        le2.putInt("Value", this.value);
+        le2.putInt("Max", this.max);
+        le2.putString("Color", this.getColor().getName());
+        le2.putString("Overlay", this.getOverlay().getName());
+        le2.putBoolean("DarkenScreen", this.shouldDarkenScreen());
+        le2.putBoolean("PlayBossMusic", this.shouldPlayBossMusic());
+        le2.putBoolean("CreateWorldFog", this.shouldCreateWorldFog());
+        final ListTag lk3 = new ListTag();
         for (final UUID uUID5 : this.players) {
-            ((AbstractList<CompoundTag>)jz3).add(NbtUtils.createUUIDTag(uUID5));
+            ((AbstractList<IntArrayTag>)lk3).add(NbtUtils.createUUID(uUID5));
         }
-        jt2.put("Players", jz3);
-        return jt2;
+        le2.put("Players", lk3);
+        return le2;
     }
     
-    public static CustomBossEvent load(final CompoundTag jt, final ResourceLocation sm) {
-        final CustomBossEvent tc3 = new CustomBossEvent(sm, Component.Serializer.fromJson(jt.getString("Name")));
-        tc3.setVisible(jt.getBoolean("Visible"));
-        tc3.setValue(jt.getInt("Value"));
-        tc3.setMax(jt.getInt("Max"));
-        tc3.setColor(BossBarColor.byName(jt.getString("Color")));
-        tc3.setOverlay(BossBarOverlay.byName(jt.getString("Overlay")));
-        tc3.setDarkenScreen(jt.getBoolean("DarkenScreen"));
-        tc3.setPlayBossMusic(jt.getBoolean("PlayBossMusic"));
-        tc3.setCreateWorldFog(jt.getBoolean("CreateWorldFog"));
-        final ListTag jz4 = jt.getList("Players", 10);
-        for (int integer5 = 0; integer5 < jz4.size(); ++integer5) {
-            tc3.addOfflinePlayer(NbtUtils.loadUUIDTag(jz4.getCompound(integer5)));
+    public static CustomBossEvent load(final CompoundTag le, final ResourceLocation uh) {
+        final CustomBossEvent uz3 = new CustomBossEvent(uh, Component.Serializer.fromJson(le.getString("Name")));
+        uz3.setVisible(le.getBoolean("Visible"));
+        uz3.setValue(le.getInt("Value"));
+        uz3.setMax(le.getInt("Max"));
+        uz3.setColor(BossBarColor.byName(le.getString("Color")));
+        uz3.setOverlay(BossBarOverlay.byName(le.getString("Overlay")));
+        uz3.setDarkenScreen(le.getBoolean("DarkenScreen"));
+        uz3.setPlayBossMusic(le.getBoolean("PlayBossMusic"));
+        uz3.setCreateWorldFog(le.getBoolean("CreateWorldFog"));
+        final ListTag lk4 = le.getList("Players", 11);
+        for (int integer5 = 0; integer5 < lk4.size(); ++integer5) {
+            uz3.addOfflinePlayer(NbtUtils.loadUUID(lk4.get(integer5)));
         }
-        return tc3;
+        return uz3;
     }
     
-    public void onPlayerConnect(final ServerPlayer xe) {
-        if (this.players.contains(xe.getUUID())) {
-            this.addPlayer(xe);
+    public void onPlayerConnect(final ServerPlayer ze) {
+        if (this.players.contains(ze.getUUID())) {
+            this.addPlayer(ze);
         }
     }
     
-    public void onPlayerDisconnect(final ServerPlayer xe) {
-        super.removePlayer(xe);
+    public void onPlayerDisconnect(final ServerPlayer ze) {
+        super.removePlayer(ze);
     }
 }
diff --git a/src/net/minecraft/server/bossevents/CustomBossEvents.java b/src/net/minecraft/server/bossevents/CustomBossEvents.java
index b0bb406..9eb8528 100644
--- a/src/net/minecraft/server/bossevents/CustomBossEvents.java
+++ b/src/net/minecraft/server/bossevents/CustomBossEvents.java
@@ -10,30 +10,27 @@ import javax.annotation.Nullable;
 import com.google.common.collect.Maps;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
-import net.minecraft.server.MinecraftServer;
 
 public class CustomBossEvents {
-    private final MinecraftServer server;
     private final Map<ResourceLocation, CustomBossEvent> events;
     
-    public CustomBossEvents(final MinecraftServer minecraftServer) {
+    public CustomBossEvents() {
         this.events = Maps.newHashMap();
-        this.server = minecraftServer;
     }
     
     @Nullable
-    public CustomBossEvent get(final ResourceLocation sm) {
-        return this.events.get(sm);
+    public CustomBossEvent get(final ResourceLocation uh) {
+        return this.events.get(uh);
     }
     
-    public CustomBossEvent create(final ResourceLocation sm, final Component lf) {
-        final CustomBossEvent tc4 = new CustomBossEvent(sm, lf);
-        this.events.put(sm, tc4);
-        return tc4;
+    public CustomBossEvent create(final ResourceLocation uh, final Component mr) {
+        final CustomBossEvent uz4 = new CustomBossEvent(uh, mr);
+        this.events.put(uh, uz4);
+        return uz4;
     }
     
-    public void remove(final CustomBossEvent tc) {
-        this.events.remove(tc.getTextId());
+    public void remove(final CustomBossEvent uz) {
+        this.events.remove(uz.getTextId());
     }
     
     public Collection<ResourceLocation> getIds() {
@@ -45,29 +42,29 @@ public class CustomBossEvents {
     }
     
     public CompoundTag save() {
-        final CompoundTag jt2 = new CompoundTag();
-        for (final CustomBossEvent tc4 : this.events.values()) {
-            jt2.put(tc4.getTextId().toString(), tc4.save());
+        final CompoundTag le2 = new CompoundTag();
+        for (final CustomBossEvent uz4 : this.events.values()) {
+            le2.put(uz4.getTextId().toString(), uz4.save());
         }
-        return jt2;
+        return le2;
     }
     
-    public void load(final CompoundTag jt) {
-        for (final String string4 : jt.getAllKeys()) {
-            final ResourceLocation sm5 = new ResourceLocation(string4);
-            this.events.put(sm5, CustomBossEvent.load(jt.getCompound(string4), sm5));
+    public void load(final CompoundTag le) {
+        for (final String string4 : le.getAllKeys()) {
+            final ResourceLocation uh5 = new ResourceLocation(string4);
+            this.events.put(uh5, CustomBossEvent.load(le.getCompound(string4), uh5));
         }
     }
     
-    public void onPlayerConnect(final ServerPlayer xe) {
-        for (final CustomBossEvent tc4 : this.events.values()) {
-            tc4.onPlayerConnect(xe);
+    public void onPlayerConnect(final ServerPlayer ze) {
+        for (final CustomBossEvent uz4 : this.events.values()) {
+            uz4.onPlayerConnect(ze);
         }
     }
     
-    public void onPlayerDisconnect(final ServerPlayer xe) {
-        for (final CustomBossEvent tc4 : this.events.values()) {
-            tc4.onPlayerDisconnect(xe);
+    public void onPlayerDisconnect(final ServerPlayer ze) {
+        for (final CustomBossEvent uz4 : this.events.values()) {
+            uz4.onPlayerDisconnect(ze);
         }
     }
 }
diff --git a/src/net/minecraft/server/commands/AdvancementCommands.java b/src/net/minecraft/server/commands/AdvancementCommands.java
index f4951ea..630e84c 100644
--- a/src/net/minecraft/server/commands/AdvancementCommands.java
+++ b/src/net/minecraft/server/commands/AdvancementCommands.java
@@ -32,28 +32,28 @@ public class AdvancementCommands {
     private static final SuggestionProvider<CommandSourceStack> SUGGEST_ADVANCEMENTS;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("advancement").requires(cq -> cq.hasPermission(2))).then(Commands.literal("grant").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.literal("only").then(((RequiredArgumentBuilder)Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.ONLY)))).then(Commands.argument("criterion", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.greedyString()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement").getCriteria().keySet(), suggestionsBuilder)).executes(commandContext -> performCriterion((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), StringArgumentType.getString(commandContext, "criterion"))))))).then(Commands.literal("from").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.FROM)))))).then(Commands.literal("until").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.UNTIL)))))).then(Commands.literal("through").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.THROUGH)))))).then(Commands.literal("everything").executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, ((CommandSourceStack)commandContext.getSource()).getServer().getAdvancements().getAllAdvancements())))))).then(Commands.literal("revoke").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.literal("only").then(((RequiredArgumentBuilder)Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.ONLY)))).then(Commands.argument("criterion", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.greedyString()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement").getCriteria().keySet(), suggestionsBuilder)).executes(commandContext -> performCriterion((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), StringArgumentType.getString(commandContext, "criterion"))))))).then(Commands.literal("from").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.FROM)))))).then(Commands.literal("until").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.UNTIL)))))).then(Commands.literal("through").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.THROUGH)))))).then(Commands.literal("everything").executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, ((CommandSourceStack)commandContext.getSource()).getServer().getAdvancements().getAllAdvancements()))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("advancement").requires(cz -> cz.hasPermission(2))).then(Commands.literal("grant").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.literal("only").then(((RequiredArgumentBuilder)Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.ONLY)))).then(Commands.argument("criterion", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.greedyString()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement").getCriteria().keySet(), suggestionsBuilder)).executes(commandContext -> performCriterion((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), StringArgumentType.getString(commandContext, "criterion"))))))).then(Commands.literal("from").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.FROM)))))).then(Commands.literal("until").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.UNTIL)))))).then(Commands.literal("through").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.THROUGH)))))).then(Commands.literal("everything").executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.GRANT, ((CommandSourceStack)commandContext.getSource()).getServer().getAdvancements().getAllAdvancements())))))).then(Commands.literal("revoke").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.literal("only").then(((RequiredArgumentBuilder)Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.ONLY)))).then(Commands.argument("criterion", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.greedyString()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement").getCriteria().keySet(), suggestionsBuilder)).executes(commandContext -> performCriterion((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), StringArgumentType.getString(commandContext, "criterion"))))))).then(Commands.literal("from").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.FROM)))))).then(Commands.literal("until").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.UNTIL)))))).then(Commands.literal("through").then(Commands.argument("advancement", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AdvancementCommands.SUGGEST_ADVANCEMENTS).executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, getAdvancements(ResourceLocationArgument.getAdvancement((CommandContext<CommandSourceStack>)commandContext, "advancement"), Mode.THROUGH)))))).then(Commands.literal("everything").executes(commandContext -> perform((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Action.REVOKE, ((CommandSourceStack)commandContext.getSource()).getServer().getAdvancements().getAllAdvancements()))))));
     }
     
-    private static int perform(final CommandSourceStack cq, final Collection<ServerPlayer> collection2, final Action a, final Collection<Advancement> collection4) {
+    private static int perform(final CommandSourceStack cz, final Collection<ServerPlayer> collection2, final Action a, final Collection<Advancement> collection4) {
         int integer5 = 0;
-        for (final ServerPlayer xe7 : collection2) {
-            integer5 += a.perform(xe7, collection4);
+        for (final ServerPlayer ze7 : collection2) {
+            integer5 += a.perform(ze7, collection4);
         }
         if (integer5 != 0) {
             if (collection4.size() == 1) {
                 if (collection2.size() == 1) {
-                    cq.sendSuccess(new TranslatableComponent(a.getKey() + ".one.to.one.success", new Object[] { collection4.iterator().next().getChatComponent(), collection2.iterator().next().getDisplayName() }), true);
+                    cz.sendSuccess(new TranslatableComponent(a.getKey() + ".one.to.one.success", new Object[] { collection4.iterator().next().getChatComponent(), collection2.iterator().next().getDisplayName() }), true);
                 }
                 else {
-                    cq.sendSuccess(new TranslatableComponent(a.getKey() + ".one.to.many.success", new Object[] { collection4.iterator().next().getChatComponent(), collection2.size() }), true);
+                    cz.sendSuccess(new TranslatableComponent(a.getKey() + ".one.to.many.success", new Object[] { collection4.iterator().next().getChatComponent(), collection2.size() }), true);
                 }
             }
             else if (collection2.size() == 1) {
-                cq.sendSuccess(new TranslatableComponent(a.getKey() + ".many.to.one.success", new Object[] { collection4.size(), collection2.iterator().next().getDisplayName() }), true);
+                cz.sendSuccess(new TranslatableComponent(a.getKey() + ".many.to.one.success", new Object[] { collection4.size(), collection2.iterator().next().getDisplayName() }), true);
             }
             else {
-                cq.sendSuccess(new TranslatableComponent(a.getKey() + ".many.to.many.success", new Object[] { collection4.size(), collection2.size() }), true);
+                cz.sendSuccess(new TranslatableComponent(a.getKey() + ".many.to.many.success", new Object[] { collection4.size(), collection2.size() }), true);
             }
             return integer5;
         }
@@ -71,49 +71,49 @@ public class AdvancementCommands {
         }
     }
     
-    private static int performCriterion(final CommandSourceStack cq, final Collection<ServerPlayer> collection, final Action a, final Advancement u, final String string) {
+    private static int performCriterion(final CommandSourceStack cz, final Collection<ServerPlayer> collection, final Action a, final Advancement w, final String string) {
         int integer6 = 0;
-        if (!u.getCriteria().containsKey(string)) {
-            throw new CommandRuntimeException(new TranslatableComponent("commands.advancement.criterionNotFound", new Object[] { u.getChatComponent(), string }));
+        if (!w.getCriteria().containsKey(string)) {
+            throw new CommandRuntimeException(new TranslatableComponent("commands.advancement.criterionNotFound", new Object[] { w.getChatComponent(), string }));
         }
-        for (final ServerPlayer xe8 : collection) {
-            if (a.performCriterion(xe8, u, string)) {
+        for (final ServerPlayer ze8 : collection) {
+            if (a.performCriterion(ze8, w, string)) {
                 ++integer6;
             }
         }
         if (integer6 != 0) {
             if (collection.size() == 1) {
-                cq.sendSuccess(new TranslatableComponent(a.getKey() + ".criterion.to.one.success", new Object[] { string, u.getChatComponent(), collection.iterator().next().getDisplayName() }), true);
+                cz.sendSuccess(new TranslatableComponent(a.getKey() + ".criterion.to.one.success", new Object[] { string, w.getChatComponent(), collection.iterator().next().getDisplayName() }), true);
             }
             else {
-                cq.sendSuccess(new TranslatableComponent(a.getKey() + ".criterion.to.many.success", new Object[] { string, u.getChatComponent(), collection.size() }), true);
+                cz.sendSuccess(new TranslatableComponent(a.getKey() + ".criterion.to.many.success", new Object[] { string, w.getChatComponent(), collection.size() }), true);
             }
             return integer6;
         }
         if (collection.size() == 1) {
-            throw new CommandRuntimeException(new TranslatableComponent(a.getKey() + ".criterion.to.one.failure", new Object[] { string, u.getChatComponent(), collection.iterator().next().getDisplayName() }));
+            throw new CommandRuntimeException(new TranslatableComponent(a.getKey() + ".criterion.to.one.failure", new Object[] { string, w.getChatComponent(), collection.iterator().next().getDisplayName() }));
         }
-        throw new CommandRuntimeException(new TranslatableComponent(a.getKey() + ".criterion.to.many.failure", new Object[] { string, u.getChatComponent(), collection.size() }));
+        throw new CommandRuntimeException(new TranslatableComponent(a.getKey() + ".criterion.to.many.failure", new Object[] { string, w.getChatComponent(), collection.size() }));
     }
     
-    private static List<Advancement> getAdvancements(final Advancement u, final Mode b) {
+    private static List<Advancement> getAdvancements(final Advancement w, final Mode b) {
         final List<Advancement> list3 = Lists.newArrayList();
         if (b.parents) {
-            for (Advancement u2 = u.getParent(); u2 != null; u2 = u2.getParent()) {
-                list3.add(u2);
+            for (Advancement w2 = w.getParent(); w2 != null; w2 = w2.getParent()) {
+                list3.add(w2);
             }
         }
-        list3.add(u);
+        list3.add(w);
         if (b.children) {
-            addChildren(u, list3);
+            addChildren(w, list3);
         }
         return list3;
     }
     
-    private static void addChildren(final Advancement u, final List<Advancement> list) {
-        for (final Advancement u2 : u.getChildren()) {
-            list.add(u2);
-            addChildren(u2, list);
+    private static void addChildren(final Advancement w, final List<Advancement> list) {
+        for (final Advancement w2 : w.getChildren()) {
+            list.add(w2);
+            addChildren(w2, list);
         }
     }
     
@@ -127,38 +127,38 @@ public class AdvancementCommands {
     enum Action {
         GRANT("grant") {
             @Override
-            protected boolean perform(final ServerPlayer xe, final Advancement u) {
-                final AdvancementProgress w4 = xe.getAdvancements().getOrStartProgress(u);
-                if (w4.isDone()) {
+            protected boolean perform(final ServerPlayer ze, final Advancement w) {
+                final AdvancementProgress y4 = ze.getAdvancements().getOrStartProgress(w);
+                if (y4.isDone()) {
                     return false;
                 }
-                for (final String string6 : w4.getRemainingCriteria()) {
-                    xe.getAdvancements().award(u, string6);
+                for (final String string6 : y4.getRemainingCriteria()) {
+                    ze.getAdvancements().award(w, string6);
                 }
                 return true;
             }
             
             @Override
-            protected boolean performCriterion(final ServerPlayer xe, final Advancement u, final String string) {
-                return xe.getAdvancements().award(u, string);
+            protected boolean performCriterion(final ServerPlayer ze, final Advancement w, final String string) {
+                return ze.getAdvancements().award(w, string);
             }
         }, 
         REVOKE("revoke") {
             @Override
-            protected boolean perform(final ServerPlayer xe, final Advancement u) {
-                final AdvancementProgress w4 = xe.getAdvancements().getOrStartProgress(u);
-                if (!w4.hasProgress()) {
+            protected boolean perform(final ServerPlayer ze, final Advancement w) {
+                final AdvancementProgress y4 = ze.getAdvancements().getOrStartProgress(w);
+                if (!y4.hasProgress()) {
                     return false;
                 }
-                for (final String string6 : w4.getCompletedCriteria()) {
-                    xe.getAdvancements().revoke(u, string6);
+                for (final String string6 : y4.getCompletedCriteria()) {
+                    ze.getAdvancements().revoke(w, string6);
                 }
                 return true;
             }
             
             @Override
-            protected boolean performCriterion(final ServerPlayer xe, final Advancement u, final String string) {
-                return xe.getAdvancements().revoke(u, string);
+            protected boolean performCriterion(final ServerPlayer ze, final Advancement w, final String string) {
+                return ze.getAdvancements().revoke(w, string);
             }
         };
         
@@ -168,19 +168,19 @@ public class AdvancementCommands {
             this.key = "commands.advancement." + string3;
         }
         
-        public int perform(final ServerPlayer xe, final Iterable<Advancement> iterable) {
+        public int perform(final ServerPlayer ze, final Iterable<Advancement> iterable) {
             int integer4 = 0;
-            for (final Advancement u6 : iterable) {
-                if (this.perform(xe, u6)) {
+            for (final Advancement w6 : iterable) {
+                if (this.perform(ze, w6)) {
                     ++integer4;
                 }
             }
             return integer4;
         }
         
-        protected abstract boolean perform(final ServerPlayer xe, final Advancement u);
+        protected abstract boolean perform(final ServerPlayer ze, final Advancement w);
         
-        protected abstract boolean performCriterion(final ServerPlayer xe, final Advancement u, final String string);
+        protected abstract boolean performCriterion(final ServerPlayer ze, final Advancement w, final String string);
         
         protected String getKey() {
             return this.key;
diff --git a/src/net/minecraft/server/commands/AttributeCommand.java b/src/net/minecraft/server/commands/AttributeCommand.java
new file mode 100644
index 0000000..6426f23
--- /dev/null
+++ b/src/net/minecraft/server/commands/AttributeCommand.java
@@ -0,0 +1,132 @@
+package net.minecraft.server.commands;
+
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.core.Registry;
+import java.util.concurrent.CompletableFuture;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import com.mojang.brigadier.Message;
+import com.mojang.brigadier.context.CommandContext;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.entity.ai.attributes.AttributeMap;
+import java.util.UUID;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.LivingEntity;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.world.entity.ai.attributes.AttributeInstance;
+import net.minecraft.world.entity.ai.attributes.Attribute;
+import net.minecraft.world.entity.Entity;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import net.minecraft.commands.arguments.UuidArgument;
+import com.mojang.brigadier.arguments.DoubleArgumentType;
+import net.minecraft.commands.arguments.ResourceLocationArgument;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.arguments.ArgumentType;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.commands.Commands;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.exceptions.Dynamic3CommandExceptionType;
+import com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType;
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
+import net.minecraft.commands.CommandSourceStack;
+import com.mojang.brigadier.suggestion.SuggestionProvider;
+
+public class AttributeCommand {
+    private static final SuggestionProvider<CommandSourceStack> AVAILABLE_ATTRIBUTES;
+    private static final DynamicCommandExceptionType ERROR_NOT_LIVING_ENTITY;
+    private static final Dynamic2CommandExceptionType ERROR_NO_SUCH_ATTRIBUTE;
+    private static final Dynamic3CommandExceptionType ERROR_NO_SUCH_MODIFIER;
+    private static final Dynamic3CommandExceptionType ERROR_MODIFIER_ALREADY_PRESENT;
+    
+    public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("attribute").requires(cz -> cz.hasPermission(2))).then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("attribute", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)AttributeCommand.AVAILABLE_ATTRIBUTES).then(((LiteralArgumentBuilder)Commands.literal("get").executes(commandContext -> getAttributeValue((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), 1.0))).then(Commands.argument("scale", (com.mojang.brigadier.arguments.ArgumentType<Object>)DoubleArgumentType.doubleArg()).executes(commandContext -> getAttributeValue((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), DoubleArgumentType.getDouble(commandContext, "scale")))))).then(((LiteralArgumentBuilder)Commands.literal("base").then(Commands.literal("set").then(Commands.argument("value", (com.mojang.brigadier.arguments.ArgumentType<Object>)DoubleArgumentType.doubleArg()).executes(commandContext -> setAttributeBase((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), DoubleArgumentType.getDouble(commandContext, "value")))))).then(((LiteralArgumentBuilder)Commands.literal("get").executes(commandContext -> getAttributeBase((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), 1.0))).then(Commands.argument("scale", (com.mojang.brigadier.arguments.ArgumentType<Object>)DoubleArgumentType.doubleArg()).executes(commandContext -> getAttributeBase((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), DoubleArgumentType.getDouble(commandContext, "scale"))))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("modifier").then(Commands.literal("add").then(Commands.argument("uuid", (com.mojang.brigadier.arguments.ArgumentType<Object>)UuidArgument.uuid()).then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.string()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("value", (com.mojang.brigadier.arguments.ArgumentType<Object>)DoubleArgumentType.doubleArg()).then(Commands.literal("add").executes(commandContext -> addModifier((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), UuidArgument.getUuid((CommandContext<CommandSourceStack>)commandContext, "uuid"), StringArgumentType.getString(commandContext, "name"), DoubleArgumentType.getDouble(commandContext, "value"), AttributeModifier.Operation.ADDITION)))).then(Commands.literal("multiply").executes(commandContext -> addModifier((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), UuidArgument.getUuid((CommandContext<CommandSourceStack>)commandContext, "uuid"), StringArgumentType.getString(commandContext, "name"), DoubleArgumentType.getDouble(commandContext, "value"), AttributeModifier.Operation.MULTIPLY_TOTAL)))).then(Commands.literal("multiply_base").executes(commandContext -> addModifier((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), UuidArgument.getUuid((CommandContext<CommandSourceStack>)commandContext, "uuid"), StringArgumentType.getString(commandContext, "name"), DoubleArgumentType.getDouble(commandContext, "value"), AttributeModifier.Operation.MULTIPLY_BASE)))))))).then(Commands.literal("remove").then(Commands.argument("uuid", (com.mojang.brigadier.arguments.ArgumentType<Object>)UuidArgument.uuid()).executes(commandContext -> removeModifier((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), UuidArgument.getUuid((CommandContext<CommandSourceStack>)commandContext, "uuid")))))).then(Commands.literal("value").then(Commands.literal("get").then(((RequiredArgumentBuilder)Commands.argument("uuid", (com.mojang.brigadier.arguments.ArgumentType<Object>)UuidArgument.uuid()).executes(commandContext -> getAttributeModifier((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), UuidArgument.getUuid((CommandContext<CommandSourceStack>)commandContext, "uuid"), 1.0))).then(Commands.argument("scale", (com.mojang.brigadier.arguments.ArgumentType<Object>)DoubleArgumentType.doubleArg()).executes(commandContext -> getAttributeModifier((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ResourceLocationArgument.getAttribute((CommandContext<CommandSourceStack>)commandContext, "attribute"), UuidArgument.getUuid((CommandContext<CommandSourceStack>)commandContext, "uuid"), DoubleArgumentType.getDouble(commandContext, "scale")))))))))));
+    }
+    
+    private static AttributeInstance getAttributeInstance(final Entity aom, final Attribute aps) throws CommandSyntaxException {
+        final AttributeInstance apt3 = getLivingEntity(aom).getAttributes().getInstance(aps);
+        if (apt3 == null) {
+            throw AttributeCommand.ERROR_NO_SUCH_ATTRIBUTE.create(aom.getName(), new TranslatableComponent(aps.getDescriptionId()));
+        }
+        return apt3;
+    }
+    
+    private static LivingEntity getLivingEntity(final Entity aom) throws CommandSyntaxException {
+        if (!(aom instanceof LivingEntity)) {
+            throw AttributeCommand.ERROR_NOT_LIVING_ENTITY.create(aom.getName());
+        }
+        return (LivingEntity)aom;
+    }
+    
+    private static LivingEntity getEntityWithAttribute(final Entity aom, final Attribute aps) throws CommandSyntaxException {
+        final LivingEntity aoy3 = getLivingEntity(aom);
+        if (!aoy3.getAttributes().hasAttribute(aps)) {
+            throw AttributeCommand.ERROR_NO_SUCH_ATTRIBUTE.create(aom.getName(), new TranslatableComponent(aps.getDescriptionId()));
+        }
+        return aoy3;
+    }
+    
+    private static int getAttributeValue(final CommandSourceStack cz, final Entity aom, final Attribute aps, final double double4) throws CommandSyntaxException {
+        final LivingEntity aoy6 = getEntityWithAttribute(aom, aps);
+        final double double5 = aoy6.getAttributeValue(aps);
+        cz.sendSuccess(new TranslatableComponent("commands.attribute.value.get.success", new Object[] { new TranslatableComponent(aps.getDescriptionId()), aom.getName(), double5 }), false);
+        return (int)(double5 * double4);
+    }
+    
+    private static int getAttributeBase(final CommandSourceStack cz, final Entity aom, final Attribute aps, final double double4) throws CommandSyntaxException {
+        final LivingEntity aoy6 = getEntityWithAttribute(aom, aps);
+        final double double5 = aoy6.getAttributeBaseValue(aps);
+        cz.sendSuccess(new TranslatableComponent("commands.attribute.base_value.get.success", new Object[] { new TranslatableComponent(aps.getDescriptionId()), aom.getName(), double5 }), false);
+        return (int)(double5 * double4);
+    }
+    
+    private static int getAttributeModifier(final CommandSourceStack cz, final Entity aom, final Attribute aps, final UUID uUID, final double double5) throws CommandSyntaxException {
+        final LivingEntity aoy7 = getEntityWithAttribute(aom, aps);
+        final AttributeMap apu8 = aoy7.getAttributes();
+        if (!apu8.hasModifier(aps, uUID)) {
+            throw AttributeCommand.ERROR_NO_SUCH_MODIFIER.create(aom.getName(), new TranslatableComponent(aps.getDescriptionId()), uUID);
+        }
+        final double double6 = apu8.getModifierValue(aps, uUID);
+        cz.sendSuccess(new TranslatableComponent("commands.attribute.modifier.value.get.success", new Object[] { uUID, new TranslatableComponent(aps.getDescriptionId()), aom.getName(), double6 }), false);
+        return (int)(double6 * double5);
+    }
+    
+    private static int setAttributeBase(final CommandSourceStack cz, final Entity aom, final Attribute aps, final double double4) throws CommandSyntaxException {
+        getAttributeInstance(aom, aps).setBaseValue(double4);
+        cz.sendSuccess(new TranslatableComponent("commands.attribute.base_value.set.success", new Object[] { new TranslatableComponent(aps.getDescriptionId()), aom.getName(), double4 }), false);
+        return 1;
+    }
+    
+    private static int addModifier(final CommandSourceStack cz, final Entity aom, final Attribute aps, final UUID uUID, final String string, final double double6, final AttributeModifier.Operation a) throws CommandSyntaxException {
+        final AttributeInstance apt9 = getAttributeInstance(aom, aps);
+        final AttributeModifier apv10 = new AttributeModifier(uUID, string, double6, a);
+        if (apt9.hasModifier(apv10)) {
+            throw AttributeCommand.ERROR_MODIFIER_ALREADY_PRESENT.create(aom.getName(), new TranslatableComponent(aps.getDescriptionId()), uUID);
+        }
+        apt9.addPermanentModifier(apv10);
+        cz.sendSuccess(new TranslatableComponent("commands.attribute.modifier.add.success", new Object[] { uUID, new TranslatableComponent(aps.getDescriptionId()), aom.getName() }), false);
+        return 1;
+    }
+    
+    private static int removeModifier(final CommandSourceStack cz, final Entity aom, final Attribute aps, final UUID uUID) throws CommandSyntaxException {
+        final AttributeInstance apt5 = getAttributeInstance(aom, aps);
+        if (apt5.removePermanentModifier(uUID)) {
+            cz.sendSuccess(new TranslatableComponent("commands.attribute.modifier.remove.success", new Object[] { uUID, new TranslatableComponent(aps.getDescriptionId()), aom.getName() }), false);
+            return 1;
+        }
+        throw AttributeCommand.ERROR_NO_SUCH_MODIFIER.create(aom.getName(), new TranslatableComponent(aps.getDescriptionId()), uUID);
+    }
+    
+    static {
+        AVAILABLE_ATTRIBUTES = ((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggestResource(Registry.ATTRIBUTE.keySet(), suggestionsBuilder));
+        final TranslatableComponent translatableComponent;
+        ERROR_NOT_LIVING_ENTITY = new DynamicCommandExceptionType(object -> {
+            new TranslatableComponent("commands.attribute.failed.entity", new Object[] { object });
+            return translatableComponent;
+        });
+        ERROR_NO_SUCH_ATTRIBUTE = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("commands.attribute.failed.no_attribute", new Object[] { object1, object2 }));
+        ERROR_NO_SUCH_MODIFIER = new Dynamic3CommandExceptionType((object1, object2, object3) -> new TranslatableComponent("commands.attribute.failed.no_modifier", new Object[] { object2, object1, object3 }));
+        ERROR_MODIFIER_ALREADY_PRESENT = new Dynamic3CommandExceptionType((object1, object2, object3) -> new TranslatableComponent("commands.attribute.failed.modifier_already_present", new Object[] { object3, object2, object1 }));
+    }
+}
diff --git a/src/net/minecraft/server/commands/BanIpCommands.java b/src/net/minecraft/server/commands/BanIpCommands.java
index 3780813..c01259f 100644
--- a/src/net/minecraft/server/commands/BanIpCommands.java
+++ b/src/net/minecraft/server/commands/BanIpCommands.java
@@ -33,42 +33,42 @@ public class BanIpCommands {
     private static final SimpleCommandExceptionType ERROR_ALREADY_BANNED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("ban-ip").requires(cq -> cq.getServer().getPlayerList().getIpBans().isEnabled() && cq.hasPermission(3))).then(((RequiredArgumentBuilder)Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> banIpOrName((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "target"), null))).then(Commands.argument("reason", (com.mojang.brigadier.arguments.ArgumentType<Object>)MessageArgument.message()).executes(commandContext -> banIpOrName((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "target"), MessageArgument.getMessage((CommandContext<CommandSourceStack>)commandContext, "reason"))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("ban-ip").requires(cz -> cz.hasPermission(3))).then(((RequiredArgumentBuilder)Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> banIpOrName((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "target"), null))).then(Commands.argument("reason", (com.mojang.brigadier.arguments.ArgumentType<Object>)MessageArgument.message()).executes(commandContext -> banIpOrName((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "target"), MessageArgument.getMessage((CommandContext<CommandSourceStack>)commandContext, "reason"))))));
     }
     
-    private static int banIpOrName(final CommandSourceStack cq, final String string, @Nullable final Component lf) throws CommandSyntaxException {
+    private static int banIpOrName(final CommandSourceStack cz, final String string, @Nullable final Component mr) throws CommandSyntaxException {
         final Matcher matcher4 = BanIpCommands.IP_ADDRESS_PATTERN.matcher(string);
         if (matcher4.matches()) {
-            return banIp(cq, string, lf);
+            return banIp(cz, string, mr);
         }
-        final ServerPlayer xe5 = cq.getServer().getPlayerList().getPlayerByName(string);
-        if (xe5 != null) {
-            return banIp(cq, xe5.getIpAddress(), lf);
+        final ServerPlayer ze5 = cz.getServer().getPlayerList().getPlayerByName(string);
+        if (ze5 != null) {
+            return banIp(cz, ze5.getIpAddress(), mr);
         }
         throw BanIpCommands.ERROR_INVALID_IP.create();
     }
     
-    private static int banIp(final CommandSourceStack cq, final String string, @Nullable final Component lf) throws CommandSyntaxException {
-        final IpBanList zl4 = cq.getServer().getPlayerList().getIpBans();
-        if (zl4.isBanned(string)) {
+    private static int banIp(final CommandSourceStack cz, final String string, @Nullable final Component mr) throws CommandSyntaxException {
+        final IpBanList abm4 = cz.getServer().getPlayerList().getIpBans();
+        if (abm4.isBanned(string)) {
             throw BanIpCommands.ERROR_ALREADY_BANNED.create();
         }
-        final List<ServerPlayer> list5 = cq.getServer().getPlayerList().getPlayersWithAddress(string);
-        final IpBanListEntry zm6 = new IpBanListEntry(string, null, cq.getTextName(), null, (lf == null) ? null : lf.getString());
-        ((StoredUserList<K, IpBanListEntry>)zl4).add(zm6);
-        cq.sendSuccess(new TranslatableComponent("commands.banip.success", new Object[] { string, zm6.getReason() }), true);
+        final List<ServerPlayer> list5 = cz.getServer().getPlayerList().getPlayersWithAddress(string);
+        final IpBanListEntry abn6 = new IpBanListEntry(string, null, cz.getTextName(), null, (mr == null) ? null : mr.getString());
+        ((StoredUserList<K, IpBanListEntry>)abm4).add(abn6);
+        cz.sendSuccess(new TranslatableComponent("commands.banip.success", new Object[] { string, abn6.getReason() }), true);
         if (!list5.isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.banip.info", new Object[] { list5.size(), EntitySelector.joinNames(list5) }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.banip.info", new Object[] { list5.size(), EntitySelector.joinNames(list5) }), true);
         }
-        for (final ServerPlayer xe8 : list5) {
-            xe8.connection.disconnect(new TranslatableComponent("multiplayer.disconnect.ip_banned", new Object[0]));
+        for (final ServerPlayer ze8 : list5) {
+            ze8.connection.disconnect(new TranslatableComponent("multiplayer.disconnect.ip_banned"));
         }
         return list5.size();
     }
     
     static {
         IP_ADDRESS_PATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");
-        ERROR_INVALID_IP = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.banip.invalid", new Object[0]));
-        ERROR_ALREADY_BANNED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.banip.failed", new Object[0]));
+        ERROR_INVALID_IP = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.banip.invalid"));
+        ERROR_ALREADY_BANNED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.banip.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/BanListCommands.java b/src/net/minecraft/server/commands/BanListCommands.java
index d0170ae..9d85726 100644
--- a/src/net/minecraft/server/commands/BanListCommands.java
+++ b/src/net/minecraft/server/commands/BanListCommands.java
@@ -18,20 +18,20 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class BanListCommands {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("banlist").requires(cq -> (cq.getServer().getPlayerList().getBans().isEnabled() || cq.getServer().getPlayerList().getIpBans().isEnabled()) && cq.hasPermission(3))).executes(commandContext -> {
-            final PlayerList zo2 = ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList();
-            return showList((CommandSourceStack)commandContext.getSource(), Lists.newArrayList(Iterables.concat(zo2.getBans().getEntries(), zo2.getIpBans().getEntries())));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("banlist").requires(cz -> cz.hasPermission(3))).executes(commandContext -> {
+            final PlayerList abp2 = ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList();
+            return showList((CommandSourceStack)commandContext.getSource(), Lists.newArrayList(Iterables.concat(abp2.getBans().getEntries(), abp2.getIpBans().getEntries())));
         })).then(Commands.literal("ips").executes(commandContext -> showList((CommandSourceStack)commandContext.getSource(), (((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getIpBans()).getEntries())))).then(Commands.literal("players").executes(commandContext -> showList((CommandSourceStack)commandContext.getSource(), (((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getBans()).getEntries()))));
     }
     
-    private static int showList(final CommandSourceStack cq, final Collection<? extends BanListEntry<?>> collection) {
+    private static int showList(final CommandSourceStack cz, final Collection<? extends BanListEntry<?>> collection) {
         if (collection.isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.banlist.none", new Object[0]), false);
+            cz.sendSuccess(new TranslatableComponent("commands.banlist.none"), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.banlist.list", new Object[] { collection.size() }), false);
-            for (final BanListEntry<?> zj4 : collection) {
-                cq.sendSuccess(new TranslatableComponent("commands.banlist.entry", new Object[] { zj4.getDisplayName(), zj4.getSource(), zj4.getReason() }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.banlist.list", new Object[] { collection.size() }), false);
+            for (final BanListEntry<?> abk4 : collection) {
+                cz.sendSuccess(new TranslatableComponent("commands.banlist.entry", new Object[] { abk4.getDisplayName(), abk4.getSource(), abk4.getReason() }), false);
             }
         }
         return collection.size();
diff --git a/src/net/minecraft/server/commands/BanPlayerCommands.java b/src/net/minecraft/server/commands/BanPlayerCommands.java
index 096df99..b425ae7 100644
--- a/src/net/minecraft/server/commands/BanPlayerCommands.java
+++ b/src/net/minecraft/server/commands/BanPlayerCommands.java
@@ -29,23 +29,23 @@ public class BanPlayerCommands {
     private static final SimpleCommandExceptionType ERROR_ALREADY_BANNED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("ban").requires(cq -> cq.getServer().getPlayerList().getBans().isEnabled() && cq.hasPermission(3))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).executes(commandContext -> banPlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets"), null))).then(Commands.argument("reason", (com.mojang.brigadier.arguments.ArgumentType<Object>)MessageArgument.message()).executes(commandContext -> banPlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets"), MessageArgument.getMessage((CommandContext<CommandSourceStack>)commandContext, "reason"))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("ban").requires(cz -> cz.hasPermission(3))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).executes(commandContext -> banPlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets"), null))).then(Commands.argument("reason", (com.mojang.brigadier.arguments.ArgumentType<Object>)MessageArgument.message()).executes(commandContext -> banPlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets"), MessageArgument.getMessage((CommandContext<CommandSourceStack>)commandContext, "reason"))))));
     }
     
-    private static int banPlayers(final CommandSourceStack cq, final Collection<GameProfile> collection, @Nullable final Component lf) throws CommandSyntaxException {
-        final UserBanList zt4 = cq.getServer().getPlayerList().getBans();
+    private static int banPlayers(final CommandSourceStack cz, final Collection<GameProfile> collection, @Nullable final Component mr) throws CommandSyntaxException {
+        final UserBanList abu4 = cz.getServer().getPlayerList().getBans();
         int integer5 = 0;
         for (final GameProfile gameProfile7 : collection) {
-            if (!zt4.isBanned(gameProfile7)) {
-                final UserBanListEntry zu8 = new UserBanListEntry(gameProfile7, null, cq.getTextName(), null, (lf == null) ? null : lf.getString());
-                ((StoredUserList<K, UserBanListEntry>)zt4).add(zu8);
+            if (!abu4.isBanned(gameProfile7)) {
+                final UserBanListEntry abv8 = new UserBanListEntry(gameProfile7, null, cz.getTextName(), null, (mr == null) ? null : mr.getString());
+                ((StoredUserList<K, UserBanListEntry>)abu4).add(abv8);
                 ++integer5;
-                cq.sendSuccess(new TranslatableComponent("commands.ban.success", new Object[] { ComponentUtils.getDisplayName(gameProfile7), zu8.getReason() }), true);
-                final ServerPlayer xe9 = cq.getServer().getPlayerList().getPlayer(gameProfile7.getId());
-                if (xe9 == null) {
+                cz.sendSuccess(new TranslatableComponent("commands.ban.success", new Object[] { ComponentUtils.getDisplayName(gameProfile7), abv8.getReason() }), true);
+                final ServerPlayer ze9 = cz.getServer().getPlayerList().getPlayer(gameProfile7.getId());
+                if (ze9 == null) {
                     continue;
                 }
-                xe9.connection.disconnect(new TranslatableComponent("multiplayer.disconnect.banned", new Object[0]));
+                ze9.connection.disconnect(new TranslatableComponent("multiplayer.disconnect.banned"));
             }
         }
         if (integer5 == 0) {
@@ -55,6 +55,6 @@ public class BanPlayerCommands {
     }
     
     static {
-        ERROR_ALREADY_BANNED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.ban.failed", new Object[0]));
+        ERROR_ALREADY_BANNED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.ban.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/BossBarCommands.java b/src/net/minecraft/server/commands/BossBarCommands.java
index d79e2f6..fc0d773 100644
--- a/src/net/minecraft/server/commands/BossBarCommands.java
+++ b/src/net/minecraft/server/commands/BossBarCommands.java
@@ -47,46 +47,46 @@ public class BossBarCommands {
     public static final SuggestionProvider<CommandSourceStack> SUGGEST_BOSS_BAR;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("bossbar").requires(cq -> cq.hasPermission(2))).then(Commands.literal("add").then(Commands.argument("id", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> createBar((CommandSourceStack)commandContext.getSource(), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "id"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "name"))))))).then(Commands.literal("remove").then(Commands.argument("id", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)BossBarCommands.SUGGEST_BOSS_BAR).executes(commandContext -> removeBar((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext)))))).then(Commands.literal("list").executes(commandContext -> listBars((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("set").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("id", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)BossBarCommands.SUGGEST_BOSS_BAR).then(Commands.literal("name").then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> setName((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "name")))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("color").then(Commands.literal("pink").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.PINK)))).then(Commands.literal("blue").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.BLUE)))).then(Commands.literal("red").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.RED)))).then(Commands.literal("green").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.GREEN)))).then(Commands.literal("yellow").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.YELLOW)))).then(Commands.literal("purple").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.PURPLE)))).then(Commands.literal("white").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.WHITE))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("style").then(Commands.literal("progress").executes(commandContext -> setStyle((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarOverlay.PROGRESS)))).then(Commands.literal("notched_6").executes(commandContext -> setStyle((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarOverlay.NOTCHED_6)))).then(Commands.literal("notched_10").executes(commandContext -> setStyle((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarOverlay.NOTCHED_10)))).then(Commands.literal("notched_12").executes(commandContext -> setStyle((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarOverlay.NOTCHED_12)))).then(Commands.literal("notched_20").executes(commandContext -> setStyle((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarOverlay.NOTCHED_20))))).then(Commands.literal("value").then(Commands.argument("value", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setValue((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), IntegerArgumentType.getInteger(commandContext, "value")))))).then(Commands.literal("max").then(Commands.argument("max", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(1)).executes(commandContext -> setMax((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), IntegerArgumentType.getInteger(commandContext, "max")))))).then(Commands.literal("visible").then(Commands.argument("visible", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).executes(commandContext -> setVisible((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BoolArgumentType.getBool(commandContext, "visible")))))).then(((LiteralArgumentBuilder)Commands.literal("players").executes(commandContext -> setPlayers((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), Collections.emptyList()))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> setPlayers((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), EntityArgument.getOptionalPlayers((CommandContext<CommandSourceStack>)commandContext, "targets")))))))).then(Commands.literal("get").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("id", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)BossBarCommands.SUGGEST_BOSS_BAR).then(Commands.literal("value").executes(commandContext -> getValue((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext))))).then(Commands.literal("max").executes(commandContext -> getMax((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext))))).then(Commands.literal("visible").executes(commandContext -> getVisible((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext))))).then(Commands.literal("players").executes(commandContext -> getPlayers((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext)))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("bossbar").requires(cz -> cz.hasPermission(2))).then(Commands.literal("add").then(Commands.argument("id", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> createBar((CommandSourceStack)commandContext.getSource(), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "id"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "name"))))))).then(Commands.literal("remove").then(Commands.argument("id", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)BossBarCommands.SUGGEST_BOSS_BAR).executes(commandContext -> removeBar((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext)))))).then(Commands.literal("list").executes(commandContext -> listBars((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("set").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("id", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)BossBarCommands.SUGGEST_BOSS_BAR).then(Commands.literal("name").then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> setName((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "name")))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("color").then(Commands.literal("pink").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.PINK)))).then(Commands.literal("blue").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.BLUE)))).then(Commands.literal("red").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.RED)))).then(Commands.literal("green").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.GREEN)))).then(Commands.literal("yellow").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.YELLOW)))).then(Commands.literal("purple").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.PURPLE)))).then(Commands.literal("white").executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarColor.WHITE))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("style").then(Commands.literal("progress").executes(commandContext -> setStyle((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarOverlay.PROGRESS)))).then(Commands.literal("notched_6").executes(commandContext -> setStyle((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarOverlay.NOTCHED_6)))).then(Commands.literal("notched_10").executes(commandContext -> setStyle((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarOverlay.NOTCHED_10)))).then(Commands.literal("notched_12").executes(commandContext -> setStyle((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarOverlay.NOTCHED_12)))).then(Commands.literal("notched_20").executes(commandContext -> setStyle((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BossEvent.BossBarOverlay.NOTCHED_20))))).then(Commands.literal("value").then(Commands.argument("value", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setValue((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), IntegerArgumentType.getInteger(commandContext, "value")))))).then(Commands.literal("max").then(Commands.argument("max", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(1)).executes(commandContext -> setMax((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), IntegerArgumentType.getInteger(commandContext, "max")))))).then(Commands.literal("visible").then(Commands.argument("visible", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).executes(commandContext -> setVisible((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), BoolArgumentType.getBool(commandContext, "visible")))))).then(((LiteralArgumentBuilder)Commands.literal("players").executes(commandContext -> setPlayers((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), Collections.emptyList()))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> setPlayers((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext), EntityArgument.getOptionalPlayers((CommandContext<CommandSourceStack>)commandContext, "targets")))))))).then(Commands.literal("get").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("id", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)BossBarCommands.SUGGEST_BOSS_BAR).then(Commands.literal("value").executes(commandContext -> getValue((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext))))).then(Commands.literal("max").executes(commandContext -> getMax((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext))))).then(Commands.literal("visible").executes(commandContext -> getVisible((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext))))).then(Commands.literal("players").executes(commandContext -> getPlayers((CommandSourceStack)commandContext.getSource(), getBossBar((CommandContext<CommandSourceStack>)commandContext)))))));
     }
     
-    private static int getValue(final CommandSourceStack cq, final CustomBossEvent tc) {
-        cq.sendSuccess(new TranslatableComponent("commands.bossbar.get.value", new Object[] { tc.getDisplayName(), tc.getValue() }), true);
-        return tc.getValue();
+    private static int getValue(final CommandSourceStack cz, final CustomBossEvent uz) {
+        cz.sendSuccess(new TranslatableComponent("commands.bossbar.get.value", new Object[] { uz.getDisplayName(), uz.getValue() }), true);
+        return uz.getValue();
     }
     
-    private static int getMax(final CommandSourceStack cq, final CustomBossEvent tc) {
-        cq.sendSuccess(new TranslatableComponent("commands.bossbar.get.max", new Object[] { tc.getDisplayName(), tc.getMax() }), true);
-        return tc.getMax();
+    private static int getMax(final CommandSourceStack cz, final CustomBossEvent uz) {
+        cz.sendSuccess(new TranslatableComponent("commands.bossbar.get.max", new Object[] { uz.getDisplayName(), uz.getMax() }), true);
+        return uz.getMax();
     }
     
-    private static int getVisible(final CommandSourceStack cq, final CustomBossEvent tc) {
-        if (tc.isVisible()) {
-            cq.sendSuccess(new TranslatableComponent("commands.bossbar.get.visible.visible", new Object[] { tc.getDisplayName() }), true);
+    private static int getVisible(final CommandSourceStack cz, final CustomBossEvent uz) {
+        if (uz.isVisible()) {
+            cz.sendSuccess(new TranslatableComponent("commands.bossbar.get.visible.visible", new Object[] { uz.getDisplayName() }), true);
             return 1;
         }
-        cq.sendSuccess(new TranslatableComponent("commands.bossbar.get.visible.hidden", new Object[] { tc.getDisplayName() }), true);
+        cz.sendSuccess(new TranslatableComponent("commands.bossbar.get.visible.hidden", new Object[] { uz.getDisplayName() }), true);
         return 0;
     }
     
-    private static int getPlayers(final CommandSourceStack cq, final CustomBossEvent tc) {
-        if (tc.getPlayers().isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.bossbar.get.players.none", new Object[] { tc.getDisplayName() }), true);
+    private static int getPlayers(final CommandSourceStack cz, final CustomBossEvent uz) {
+        if (uz.getPlayers().isEmpty()) {
+            cz.sendSuccess(new TranslatableComponent("commands.bossbar.get.players.none", new Object[] { uz.getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.bossbar.get.players.some", new Object[] { tc.getDisplayName(), tc.getPlayers().size(), ComponentUtils.<ServerPlayer>formatList(tc.getPlayers(), Player::getDisplayName) }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.bossbar.get.players.some", new Object[] { uz.getDisplayName(), uz.getPlayers().size(), ComponentUtils.<ServerPlayer>formatList(uz.getPlayers(), Player::getDisplayName) }), true);
         }
-        return tc.getPlayers().size();
+        return uz.getPlayers().size();
     }
     
-    private static int setVisible(final CommandSourceStack cq, final CustomBossEvent tc, final boolean boolean3) throws CommandSyntaxException {
-        if (tc.isVisible() != boolean3) {
-            tc.setVisible(boolean3);
+    private static int setVisible(final CommandSourceStack cz, final CustomBossEvent uz, final boolean boolean3) throws CommandSyntaxException {
+        if (uz.isVisible() != boolean3) {
+            uz.setVisible(boolean3);
             if (boolean3) {
-                cq.sendSuccess(new TranslatableComponent("commands.bossbar.set.visible.success.visible", new Object[] { tc.getDisplayName() }), true);
+                cz.sendSuccess(new TranslatableComponent("commands.bossbar.set.visible.success.visible", new Object[] { uz.getDisplayName() }), true);
             }
             else {
-                cq.sendSuccess(new TranslatableComponent("commands.bossbar.set.visible.success.hidden", new Object[] { tc.getDisplayName() }), true);
+                cz.sendSuccess(new TranslatableComponent("commands.bossbar.set.visible.success.hidden", new Object[] { uz.getDisplayName() }), true);
             }
             return 0;
         }
@@ -96,102 +96,102 @@ public class BossBarCommands {
         throw BossBarCommands.ERROR_ALREADY_HIDDEN.create();
     }
     
-    private static int setValue(final CommandSourceStack cq, final CustomBossEvent tc, final int integer) throws CommandSyntaxException {
-        if (tc.getValue() == integer) {
+    private static int setValue(final CommandSourceStack cz, final CustomBossEvent uz, final int integer) throws CommandSyntaxException {
+        if (uz.getValue() == integer) {
             throw BossBarCommands.ERROR_NO_VALUE_CHANGE.create();
         }
-        tc.setValue(integer);
-        cq.sendSuccess(new TranslatableComponent("commands.bossbar.set.value.success", new Object[] { tc.getDisplayName(), integer }), true);
+        uz.setValue(integer);
+        cz.sendSuccess(new TranslatableComponent("commands.bossbar.set.value.success", new Object[] { uz.getDisplayName(), integer }), true);
         return integer;
     }
     
-    private static int setMax(final CommandSourceStack cq, final CustomBossEvent tc, final int integer) throws CommandSyntaxException {
-        if (tc.getMax() == integer) {
+    private static int setMax(final CommandSourceStack cz, final CustomBossEvent uz, final int integer) throws CommandSyntaxException {
+        if (uz.getMax() == integer) {
             throw BossBarCommands.ERROR_NO_MAX_CHANGE.create();
         }
-        tc.setMax(integer);
-        cq.sendSuccess(new TranslatableComponent("commands.bossbar.set.max.success", new Object[] { tc.getDisplayName(), integer }), true);
+        uz.setMax(integer);
+        cz.sendSuccess(new TranslatableComponent("commands.bossbar.set.max.success", new Object[] { uz.getDisplayName(), integer }), true);
         return integer;
     }
     
-    private static int setColor(final CommandSourceStack cq, final CustomBossEvent tc, final BossEvent.BossBarColor a) throws CommandSyntaxException {
-        if (tc.getColor().equals(a)) {
+    private static int setColor(final CommandSourceStack cz, final CustomBossEvent uz, final BossEvent.BossBarColor a) throws CommandSyntaxException {
+        if (uz.getColor().equals(a)) {
             throw BossBarCommands.ERROR_NO_COLOR_CHANGE.create();
         }
-        tc.setColor(a);
-        cq.sendSuccess(new TranslatableComponent("commands.bossbar.set.color.success", new Object[] { tc.getDisplayName() }), true);
+        uz.setColor(a);
+        cz.sendSuccess(new TranslatableComponent("commands.bossbar.set.color.success", new Object[] { uz.getDisplayName() }), true);
         return 0;
     }
     
-    private static int setStyle(final CommandSourceStack cq, final CustomBossEvent tc, final BossEvent.BossBarOverlay b) throws CommandSyntaxException {
-        if (tc.getOverlay().equals(b)) {
+    private static int setStyle(final CommandSourceStack cz, final CustomBossEvent uz, final BossEvent.BossBarOverlay b) throws CommandSyntaxException {
+        if (uz.getOverlay().equals(b)) {
             throw BossBarCommands.ERROR_NO_STYLE_CHANGE.create();
         }
-        tc.setOverlay(b);
-        cq.sendSuccess(new TranslatableComponent("commands.bossbar.set.style.success", new Object[] { tc.getDisplayName() }), true);
+        uz.setOverlay(b);
+        cz.sendSuccess(new TranslatableComponent("commands.bossbar.set.style.success", new Object[] { uz.getDisplayName() }), true);
         return 0;
     }
     
-    private static int setName(final CommandSourceStack cq, final CustomBossEvent tc, final Component lf) throws CommandSyntaxException {
-        final Component lf2 = ComponentUtils.updateForEntity(cq, lf, null, 0);
-        if (tc.getName().equals(lf2)) {
+    private static int setName(final CommandSourceStack cz, final CustomBossEvent uz, final Component mr) throws CommandSyntaxException {
+        final Component mr2 = ComponentUtils.updateForEntity(cz, mr, null, 0);
+        if (uz.getName().equals(mr2)) {
             throw BossBarCommands.ERROR_NO_NAME_CHANGE.create();
         }
-        tc.setName(lf2);
-        cq.sendSuccess(new TranslatableComponent("commands.bossbar.set.name.success", new Object[] { tc.getDisplayName() }), true);
+        uz.setName(mr2);
+        cz.sendSuccess(new TranslatableComponent("commands.bossbar.set.name.success", new Object[] { uz.getDisplayName() }), true);
         return 0;
     }
     
-    private static int setPlayers(final CommandSourceStack cq, final CustomBossEvent tc, final Collection<ServerPlayer> collection) throws CommandSyntaxException {
-        final boolean boolean4 = tc.setPlayers(collection);
+    private static int setPlayers(final CommandSourceStack cz, final CustomBossEvent uz, final Collection<ServerPlayer> collection) throws CommandSyntaxException {
+        final boolean boolean4 = uz.setPlayers(collection);
         if (!boolean4) {
             throw BossBarCommands.ERROR_NO_PLAYER_CHANGE.create();
         }
-        if (tc.getPlayers().isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.bossbar.set.players.success.none", new Object[] { tc.getDisplayName() }), true);
+        if (uz.getPlayers().isEmpty()) {
+            cz.sendSuccess(new TranslatableComponent("commands.bossbar.set.players.success.none", new Object[] { uz.getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.bossbar.set.players.success.some", new Object[] { tc.getDisplayName(), collection.size(), ComponentUtils.<ServerPlayer>formatList(collection, Player::getDisplayName) }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.bossbar.set.players.success.some", new Object[] { uz.getDisplayName(), collection.size(), ComponentUtils.<ServerPlayer>formatList(collection, Player::getDisplayName) }), true);
         }
-        return tc.getPlayers().size();
+        return uz.getPlayers().size();
     }
     
-    private static int listBars(final CommandSourceStack cq) {
-        final Collection<CustomBossEvent> collection2 = cq.getServer().getCustomBossEvents().getEvents();
+    private static int listBars(final CommandSourceStack cz) {
+        final Collection<CustomBossEvent> collection2 = cz.getServer().getCustomBossEvents().getEvents();
         if (collection2.isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.bossbar.list.bars.none", new Object[0]), false);
+            cz.sendSuccess(new TranslatableComponent("commands.bossbar.list.bars.none"), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.bossbar.list.bars.some", new Object[] { collection2.size(), ComponentUtils.<CustomBossEvent>formatList(collection2, CustomBossEvent::getDisplayName) }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.bossbar.list.bars.some", new Object[] { collection2.size(), ComponentUtils.<CustomBossEvent>formatList(collection2, CustomBossEvent::getDisplayName) }), false);
         }
         return collection2.size();
     }
     
-    private static int createBar(final CommandSourceStack cq, final ResourceLocation sm, final Component lf) throws CommandSyntaxException {
-        final CustomBossEvents td4 = cq.getServer().getCustomBossEvents();
-        if (td4.get(sm) != null) {
-            throw BossBarCommands.ERROR_ALREADY_EXISTS.create(sm.toString());
+    private static int createBar(final CommandSourceStack cz, final ResourceLocation uh, final Component mr) throws CommandSyntaxException {
+        final CustomBossEvents va4 = cz.getServer().getCustomBossEvents();
+        if (va4.get(uh) != null) {
+            throw BossBarCommands.ERROR_ALREADY_EXISTS.create(uh.toString());
         }
-        final CustomBossEvent tc5 = td4.create(sm, ComponentUtils.updateForEntity(cq, lf, null, 0));
-        cq.sendSuccess(new TranslatableComponent("commands.bossbar.create.success", new Object[] { tc5.getDisplayName() }), true);
-        return td4.getEvents().size();
+        final CustomBossEvent uz5 = va4.create(uh, ComponentUtils.updateForEntity(cz, mr, null, 0));
+        cz.sendSuccess(new TranslatableComponent("commands.bossbar.create.success", new Object[] { uz5.getDisplayName() }), true);
+        return va4.getEvents().size();
     }
     
-    private static int removeBar(final CommandSourceStack cq, final CustomBossEvent tc) {
-        final CustomBossEvents td3 = cq.getServer().getCustomBossEvents();
-        tc.removeAllPlayers();
-        td3.remove(tc);
-        cq.sendSuccess(new TranslatableComponent("commands.bossbar.remove.success", new Object[] { tc.getDisplayName() }), true);
-        return td3.getEvents().size();
+    private static int removeBar(final CommandSourceStack cz, final CustomBossEvent uz) {
+        final CustomBossEvents va3 = cz.getServer().getCustomBossEvents();
+        uz.removeAllPlayers();
+        va3.remove(uz);
+        cz.sendSuccess(new TranslatableComponent("commands.bossbar.remove.success", new Object[] { uz.getDisplayName() }), true);
+        return va3.getEvents().size();
     }
     
     public static CustomBossEvent getBossBar(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
-        final ResourceLocation sm2 = ResourceLocationArgument.getId(commandContext, "id");
-        final CustomBossEvent tc3 = ((CommandSourceStack)commandContext.getSource()).getServer().getCustomBossEvents().get(sm2);
-        if (tc3 == null) {
-            throw BossBarCommands.ERROR_DOESNT_EXIST.create(sm2.toString());
+        final ResourceLocation uh2 = ResourceLocationArgument.getId(commandContext, "id");
+        final CustomBossEvent uz3 = ((CommandSourceStack)commandContext.getSource()).getServer().getCustomBossEvents().get(uh2);
+        if (uz3 == null) {
+            throw BossBarCommands.ERROR_DOESNT_EXIST.create(uh2.toString());
         }
-        return tc3;
+        return uz3;
     }
     
     static {
@@ -205,14 +205,14 @@ public class BossBarCommands {
             new TranslatableComponent("commands.bossbar.unknown", new Object[] { object });
             return translatableComponent2;
         });
-        ERROR_NO_PLAYER_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.players.unchanged", new Object[0]));
-        ERROR_NO_NAME_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.name.unchanged", new Object[0]));
-        ERROR_NO_COLOR_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.color.unchanged", new Object[0]));
-        ERROR_NO_STYLE_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.style.unchanged", new Object[0]));
-        ERROR_NO_VALUE_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.value.unchanged", new Object[0]));
-        ERROR_NO_MAX_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.max.unchanged", new Object[0]));
-        ERROR_ALREADY_HIDDEN = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.visibility.unchanged.hidden", new Object[0]));
-        ERROR_ALREADY_VISIBLE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.visibility.unchanged.visible", new Object[0]));
+        ERROR_NO_PLAYER_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.players.unchanged"));
+        ERROR_NO_NAME_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.name.unchanged"));
+        ERROR_NO_COLOR_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.color.unchanged"));
+        ERROR_NO_STYLE_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.style.unchanged"));
+        ERROR_NO_VALUE_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.value.unchanged"));
+        ERROR_NO_MAX_CHANGE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.max.unchanged"));
+        ERROR_ALREADY_HIDDEN = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.visibility.unchanged.hidden"));
+        ERROR_ALREADY_VISIBLE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.bossbar.set.visibility.unchanged.visible"));
         SUGGEST_BOSS_BAR = ((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggestResource(((CommandSourceStack)commandContext.getSource()).getServer().getCustomBossEvents().getIds(), suggestionsBuilder));
     }
 }
diff --git a/src/net/minecraft/server/commands/ClearInventoryCommands.java b/src/net/minecraft/server/commands/ClearInventoryCommands.java
index 9d699e3..a4c6505 100644
--- a/src/net/minecraft/server/commands/ClearInventoryCommands.java
+++ b/src/net/minecraft/server/commands/ClearInventoryCommands.java
@@ -7,6 +7,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.util.Iterator;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.world.Container;
 import net.minecraft.world.item.ItemStack;
 import java.util.function.Predicate;
 import net.minecraft.server.level.ServerPlayer;
@@ -27,35 +28,36 @@ public class ClearInventoryCommands {
     private static final DynamicCommandExceptionType ERROR_MULTIPLE;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("clear").requires(cq -> cq.hasPermission(2))).executes(commandContext -> clearInventory((CommandSourceStack)commandContext.getSource(), Collections.<ServerPlayer>singleton(((CommandSourceStack)commandContext.getSource()).getPlayerOrException()), ben -> true, -1))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> clearInventory((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ben -> true, -1))).then(((RequiredArgumentBuilder)Commands.argument("item", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemPredicateArgument.itemPredicate()).executes(commandContext -> clearInventory((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ItemPredicateArgument.getItemPredicate((CommandContext<CommandSourceStack>)commandContext, "item"), -1))).then(Commands.argument("maxCount", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> clearInventory((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ItemPredicateArgument.getItemPredicate((CommandContext<CommandSourceStack>)commandContext, "item"), IntegerArgumentType.getInteger(commandContext, "maxCount")))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("clear").requires(cz -> cz.hasPermission(2))).executes(commandContext -> clearInventory((CommandSourceStack)commandContext.getSource(), Collections.<ServerPlayer>singleton(((CommandSourceStack)commandContext.getSource()).getPlayerOrException()), bki -> true, -1))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> clearInventory((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), bki -> true, -1))).then(((RequiredArgumentBuilder)Commands.argument("item", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemPredicateArgument.itemPredicate()).executes(commandContext -> clearInventory((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ItemPredicateArgument.getItemPredicate((CommandContext<CommandSourceStack>)commandContext, "item"), -1))).then(Commands.argument("maxCount", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> clearInventory((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ItemPredicateArgument.getItemPredicate((CommandContext<CommandSourceStack>)commandContext, "item"), IntegerArgumentType.getInteger(commandContext, "maxCount")))))));
     }
     
-    private static int clearInventory(final CommandSourceStack cq, final Collection<ServerPlayer> collection, final Predicate<ItemStack> predicate, final int integer) throws CommandSyntaxException {
+    private static int clearInventory(final CommandSourceStack cz, final Collection<ServerPlayer> collection, final Predicate<ItemStack> predicate, final int integer) throws CommandSyntaxException {
         int integer2 = 0;
-        for (final ServerPlayer xe7 : collection) {
-            integer2 += xe7.inventory.clearInventory(predicate, integer);
-            xe7.containerMenu.broadcastChanges();
-            xe7.broadcastCarriedItem();
+        for (final ServerPlayer ze7 : collection) {
+            integer2 += ze7.inventory.clearOrCountMatchingItems(predicate, integer, ze7.inventoryMenu.getCraftSlots());
+            ze7.containerMenu.broadcastChanges();
+            ze7.inventoryMenu.slotsChanged(ze7.inventory);
+            ze7.broadcastCarriedItem();
         }
         if (integer2 != 0) {
             if (integer == 0) {
                 if (collection.size() == 1) {
-                    cq.sendSuccess(new TranslatableComponent("commands.clear.test.single", new Object[] { integer2, collection.iterator().next().getDisplayName() }), true);
+                    cz.sendSuccess(new TranslatableComponent("commands.clear.test.single", new Object[] { integer2, collection.iterator().next().getDisplayName() }), true);
                 }
                 else {
-                    cq.sendSuccess(new TranslatableComponent("commands.clear.test.multiple", new Object[] { integer2, collection.size() }), true);
+                    cz.sendSuccess(new TranslatableComponent("commands.clear.test.multiple", new Object[] { integer2, collection.size() }), true);
                 }
             }
             else if (collection.size() == 1) {
-                cq.sendSuccess(new TranslatableComponent("commands.clear.success.single", new Object[] { integer2, collection.iterator().next().getDisplayName() }), true);
+                cz.sendSuccess(new TranslatableComponent("commands.clear.success.single", new Object[] { integer2, collection.iterator().next().getDisplayName() }), true);
             }
             else {
-                cq.sendSuccess(new TranslatableComponent("commands.clear.success.multiple", new Object[] { integer2, collection.size() }), true);
+                cz.sendSuccess(new TranslatableComponent("commands.clear.success.multiple", new Object[] { integer2, collection.size() }), true);
             }
             return integer2;
         }
         if (collection.size() == 1) {
-            throw ClearInventoryCommands.ERROR_SINGLE.create(collection.iterator().next().getName().getColoredString());
+            throw ClearInventoryCommands.ERROR_SINGLE.create(collection.iterator().next().getName());
         }
         throw ClearInventoryCommands.ERROR_MULTIPLE.create(collection.size());
     }
diff --git a/src/net/minecraft/server/commands/CloneCommands.java b/src/net/minecraft/server/commands/CloneCommands.java
index 7edca84..0a4652a 100644
--- a/src/net/minecraft/server/commands/CloneCommands.java
+++ b/src/net/minecraft/server/commands/CloneCommands.java
@@ -42,63 +42,63 @@ public class CloneCommands {
     public static final Predicate<BlockInWorld> FILTER_AIR;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("clone").requires(cq -> cq.hasPermission(2))).then(Commands.argument("begin", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(Commands.argument("end", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("destination", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), byn -> true, Mode.NORMAL))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("replace").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), byn -> true, Mode.NORMAL))).then(Commands.literal("force").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), byn -> true, Mode.FORCE)))).then(Commands.literal("move").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), byn -> true, Mode.MOVE)))).then(Commands.literal("normal").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), byn -> true, Mode.NORMAL))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("masked").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), CloneCommands.FILTER_AIR, Mode.NORMAL))).then(Commands.literal("force").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), CloneCommands.FILTER_AIR, Mode.FORCE)))).then(Commands.literal("move").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), CloneCommands.FILTER_AIR, Mode.MOVE)))).then(Commands.literal("normal").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), CloneCommands.FILTER_AIR, Mode.NORMAL))))).then(Commands.literal("filtered").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("filter", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPredicateArgument.blockPredicate()).executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), BlockPredicateArgument.getBlockPredicate((CommandContext<CommandSourceStack>)commandContext, "filter"), Mode.NORMAL))).then(Commands.literal("force").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), BlockPredicateArgument.getBlockPredicate((CommandContext<CommandSourceStack>)commandContext, "filter"), Mode.FORCE)))).then(Commands.literal("move").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), BlockPredicateArgument.getBlockPredicate((CommandContext<CommandSourceStack>)commandContext, "filter"), Mode.MOVE)))).then(Commands.literal("normal").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), BlockPredicateArgument.getBlockPredicate((CommandContext<CommandSourceStack>)commandContext, "filter"), Mode.NORMAL)))))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("clone").requires(cz -> cz.hasPermission(2))).then(Commands.argument("begin", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(Commands.argument("end", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("destination", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), cfn -> true, Mode.NORMAL))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("replace").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), cfn -> true, Mode.NORMAL))).then(Commands.literal("force").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), cfn -> true, Mode.FORCE)))).then(Commands.literal("move").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), cfn -> true, Mode.MOVE)))).then(Commands.literal("normal").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), cfn -> true, Mode.NORMAL))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("masked").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), CloneCommands.FILTER_AIR, Mode.NORMAL))).then(Commands.literal("force").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), CloneCommands.FILTER_AIR, Mode.FORCE)))).then(Commands.literal("move").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), CloneCommands.FILTER_AIR, Mode.MOVE)))).then(Commands.literal("normal").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), CloneCommands.FILTER_AIR, Mode.NORMAL))))).then(Commands.literal("filtered").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("filter", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPredicateArgument.blockPredicate()).executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), BlockPredicateArgument.getBlockPredicate((CommandContext<CommandSourceStack>)commandContext, "filter"), Mode.NORMAL))).then(Commands.literal("force").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), BlockPredicateArgument.getBlockPredicate((CommandContext<CommandSourceStack>)commandContext, "filter"), Mode.FORCE)))).then(Commands.literal("move").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), BlockPredicateArgument.getBlockPredicate((CommandContext<CommandSourceStack>)commandContext, "filter"), Mode.MOVE)))).then(Commands.literal("normal").executes(commandContext -> clone((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "begin"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "end"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "destination"), BlockPredicateArgument.getBlockPredicate((CommandContext<CommandSourceStack>)commandContext, "filter"), Mode.NORMAL)))))))));
     }
     
-    private static int clone(final CommandSourceStack cq, final BlockPos fk2, final BlockPos fk3, final BlockPos fk4, final Predicate<BlockInWorld> predicate, final Mode b) throws CommandSyntaxException {
-        final BoundingBox clb7 = new BoundingBox(fk2, fk3);
-        final BlockPos fk5 = fk4.offset(clb7.getLength());
-        final BoundingBox clb8 = new BoundingBox(fk4, fk5);
-        if (!b.canOverlap() && clb8.intersects(clb7)) {
+    private static int clone(final CommandSourceStack cz, final BlockPos fu2, final BlockPos fu3, final BlockPos fu4, final Predicate<BlockInWorld> predicate, final Mode b) throws CommandSyntaxException {
+        final BoundingBox ctd7 = new BoundingBox(fu2, fu3);
+        final BlockPos fu5 = fu4.offset(ctd7.getLength());
+        final BoundingBox ctd8 = new BoundingBox(fu4, fu5);
+        if (!b.canOverlap() && ctd8.intersects(ctd7)) {
             throw CloneCommands.ERROR_OVERLAP.create();
         }
-        final int integer10 = clb7.getXSpan() * clb7.getYSpan() * clb7.getZSpan();
+        final int integer10 = ctd7.getXSpan() * ctd7.getYSpan() * ctd7.getZSpan();
         if (integer10 > 32768) {
             throw CloneCommands.ERROR_AREA_TOO_LARGE.create(32768, integer10);
         }
-        final ServerLevel xd11 = cq.getLevel();
-        if (!xd11.hasChunksAt(fk2, fk3) || !xd11.hasChunksAt(fk4, fk5)) {
+        final ServerLevel zd11 = cz.getLevel();
+        if (!zd11.hasChunksAt(fu2, fu3) || !zd11.hasChunksAt(fu4, fu5)) {
             throw BlockPosArgument.ERROR_NOT_LOADED.create();
         }
         final List<CloneBlockInfo> list12 = Lists.newArrayList();
         final List<CloneBlockInfo> list13 = Lists.newArrayList();
         final List<CloneBlockInfo> list14 = Lists.newArrayList();
         final Deque<BlockPos> deque15 = Lists.newLinkedList();
-        final BlockPos fk6 = new BlockPos(clb8.x0 - clb7.x0, clb8.y0 - clb7.y0, clb8.z0 - clb7.z0);
-        for (int integer11 = clb7.z0; integer11 <= clb7.z1; ++integer11) {
-            for (int integer12 = clb7.y0; integer12 <= clb7.y1; ++integer12) {
-                for (int integer13 = clb7.x0; integer13 <= clb7.x1; ++integer13) {
-                    final BlockPos fk7 = new BlockPos(integer13, integer12, integer11);
-                    final BlockPos fk8 = fk7.offset(fk6);
-                    final BlockInWorld byn22 = new BlockInWorld(xd11, fk7, false);
-                    final BlockState byj23 = byn22.getState();
-                    if (predicate.test(byn22)) {
-                        final BlockEntity bwl24 = xd11.getBlockEntity(fk7);
-                        if (bwl24 != null) {
-                            final CompoundTag jt25 = bwl24.save(new CompoundTag());
-                            list13.add(new CloneBlockInfo(fk8, byj23, jt25));
-                            deque15.addLast(fk7);
+        final BlockPos fu6 = new BlockPos(ctd8.x0 - ctd7.x0, ctd8.y0 - ctd7.y0, ctd8.z0 - ctd7.z0);
+        for (int integer11 = ctd7.z0; integer11 <= ctd7.z1; ++integer11) {
+            for (int integer12 = ctd7.y0; integer12 <= ctd7.y1; ++integer12) {
+                for (int integer13 = ctd7.x0; integer13 <= ctd7.x1; ++integer13) {
+                    final BlockPos fu7 = new BlockPos(integer13, integer12, integer11);
+                    final BlockPos fu8 = fu7.offset(fu6);
+                    final BlockInWorld cfn22 = new BlockInWorld(zd11, fu7, false);
+                    final BlockState cfj23 = cfn22.getState();
+                    if (predicate.test(cfn22)) {
+                        final BlockEntity cdl24 = zd11.getBlockEntity(fu7);
+                        if (cdl24 != null) {
+                            final CompoundTag le25 = cdl24.save(new CompoundTag());
+                            list13.add(new CloneBlockInfo(fu8, cfj23, le25));
+                            deque15.addLast(fu7);
                         }
-                        else if (byj23.isSolidRender(xd11, fk7) || byj23.isCollisionShapeFullBlock(xd11, fk7)) {
-                            list12.add(new CloneBlockInfo(fk8, byj23, null));
-                            deque15.addLast(fk7);
+                        else if (cfj23.isSolidRender(zd11, fu7) || cfj23.isCollisionShapeFullBlock(zd11, fu7)) {
+                            list12.add(new CloneBlockInfo(fu8, cfj23, null));
+                            deque15.addLast(fu7);
                         }
                         else {
-                            list14.add(new CloneBlockInfo(fk8, byj23, null));
-                            deque15.addFirst(fk7);
+                            list14.add(new CloneBlockInfo(fu8, cfj23, null));
+                            deque15.addFirst(fu7);
                         }
                     }
                 }
             }
         }
         if (b == Mode.MOVE) {
-            for (final BlockPos fk9 : deque15) {
-                final BlockEntity bwl25 = xd11.getBlockEntity(fk9);
-                Clearable.tryClear(bwl25);
-                xd11.setBlock(fk9, Blocks.BARRIER.defaultBlockState(), 2);
+            for (final BlockPos fu9 : deque15) {
+                final BlockEntity cdl25 = zd11.getBlockEntity(fu9);
+                Clearable.tryClear(cdl25);
+                zd11.setBlock(fu9, Blocks.BARRIER.defaultBlockState(), 2);
             }
-            for (final BlockPos fk9 : deque15) {
-                xd11.setBlock(fk9, Blocks.AIR.defaultBlockState(), 3);
+            for (final BlockPos fu9 : deque15) {
+                zd11.setBlock(fu9, Blocks.AIR.defaultBlockState(), 3);
             }
         }
         final List<CloneBlockInfo> list15 = Lists.newArrayList();
@@ -107,43 +107,43 @@ public class CloneCommands {
         list15.addAll(list14);
         final List<CloneBlockInfo> list16 = Lists.<CloneBlockInfo>reverse(list15);
         for (final CloneBlockInfo a20 : list16) {
-            final BlockEntity bwl26 = xd11.getBlockEntity(a20.pos);
-            Clearable.tryClear(bwl26);
-            xd11.setBlock(a20.pos, Blocks.BARRIER.defaultBlockState(), 2);
+            final BlockEntity cdl26 = zd11.getBlockEntity(a20.pos);
+            Clearable.tryClear(cdl26);
+            zd11.setBlock(a20.pos, Blocks.BARRIER.defaultBlockState(), 2);
         }
         int integer13 = 0;
         for (final CloneBlockInfo a21 : list15) {
-            if (xd11.setBlock(a21.pos, a21.state, 2)) {
+            if (zd11.setBlock(a21.pos, a21.state, 2)) {
                 ++integer13;
             }
         }
         for (final CloneBlockInfo a21 : list13) {
-            final BlockEntity bwl27 = xd11.getBlockEntity(a21.pos);
-            if (a21.tag != null && bwl27 != null) {
+            final BlockEntity cdl27 = zd11.getBlockEntity(a21.pos);
+            if (a21.tag != null && cdl27 != null) {
                 a21.tag.putInt("x", a21.pos.getX());
                 a21.tag.putInt("y", a21.pos.getY());
                 a21.tag.putInt("z", a21.pos.getZ());
-                bwl27.load(a21.tag);
-                bwl27.setChanged();
+                cdl27.load(a21.state, a21.tag);
+                cdl27.setChanged();
             }
-            xd11.setBlock(a21.pos, a21.state, 2);
+            zd11.setBlock(a21.pos, a21.state, 2);
         }
         for (final CloneBlockInfo a21 : list16) {
-            xd11.blockUpdated(a21.pos, a21.state.getBlock());
+            zd11.blockUpdated(a21.pos, a21.state.getBlock());
         }
-        xd11.getBlockTicks().copy(clb7, fk6);
+        zd11.getBlockTicks().copy(ctd7, fu6);
         if (integer13 == 0) {
             throw CloneCommands.ERROR_FAILED.create();
         }
-        cq.sendSuccess(new TranslatableComponent("commands.clone.success", new Object[] { integer13 }), true);
+        cz.sendSuccess(new TranslatableComponent("commands.clone.success", new Object[] { integer13 }), true);
         return integer13;
     }
     
     static {
-        ERROR_OVERLAP = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.clone.overlap", new Object[0]));
+        ERROR_OVERLAP = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.clone.overlap"));
         ERROR_AREA_TOO_LARGE = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("commands.clone.toobig", new Object[] { object1, object2 }));
-        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.clone.failed", new Object[0]));
-        FILTER_AIR = (byn -> !byn.getState().isAir());
+        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.clone.failed"));
+        FILTER_AIR = (cfn -> !cfn.getState().isAir());
     }
     
     enum Mode {
@@ -168,10 +168,10 @@ public class CloneCommands {
         @Nullable
         public final CompoundTag tag;
         
-        public CloneBlockInfo(final BlockPos fk, final BlockState byj, @Nullable final CompoundTag jt) {
-            this.pos = fk;
-            this.state = byj;
-            this.tag = jt;
+        public CloneBlockInfo(final BlockPos fu, final BlockState cfj, @Nullable final CompoundTag le) {
+            this.pos = fu;
+            this.state = cfj;
+            this.tag = le;
         }
     }
 }
diff --git a/src/net/minecraft/server/commands/DataPackCommand.java b/src/net/minecraft/server/commands/DataPackCommand.java
index cd1757c..45b77ff 100644
--- a/src/net/minecraft/server/commands/DataPackCommand.java
+++ b/src/net/minecraft/server/commands/DataPackCommand.java
@@ -2,21 +2,21 @@ package net.minecraft.server.commands;
 
 import com.mojang.brigadier.Message;
 import net.minecraft.commands.SharedSuggestionProvider;
-import java.util.function.Function;
 import java.util.concurrent.CompletableFuture;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.network.chat.ComponentUtils;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.world.level.storage.LevelData;
-import java.util.List;
 import net.minecraft.server.packs.repository.PackRepository;
+import java.util.Collection;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.function.Function;
+import java.util.List;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.world.level.dimension.DimensionType;
-import java.util.Collection;
 import com.google.common.collect.Lists;
-import net.minecraft.server.packs.repository.UnopenedPack;
+import net.minecraft.server.packs.repository.Pack;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
@@ -32,81 +32,77 @@ public class DataPackCommand {
     private static final DynamicCommandExceptionType ERROR_PACK_ALREADY_ENABLED;
     private static final DynamicCommandExceptionType ERROR_PACK_ALREADY_DISABLED;
     private static final SuggestionProvider<CommandSourceStack> SELECTED_PACKS;
-    private static final SuggestionProvider<CommandSourceStack> AVAILABLE_PACKS;
+    private static final SuggestionProvider<CommandSourceStack> UNSELECTED_PACKS;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("datapack").requires(cq -> cq.hasPermission(2))).then(Commands.literal("enable").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.string()).suggests((SuggestionProvider)DataPackCommand.AVAILABLE_PACKS).executes(commandContext -> enablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", true), (list, yt) -> yt.getDefaultPosition().<UnopenedPack, UnopenedPack>insert(list, yt, yt -> yt, false)))).then(Commands.literal("after").then(Commands.argument("existing", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.string()).suggests((SuggestionProvider)DataPackCommand.SELECTED_PACKS).executes(commandContext -> enablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", true), (list, yt) -> list.add(list.indexOf(getPack((CommandContext<CommandSourceStack>)commandContext, "existing", false)) + 1, yt)))))).then(Commands.literal("before").then(Commands.argument("existing", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.string()).suggests((SuggestionProvider)DataPackCommand.SELECTED_PACKS).executes(commandContext -> enablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", true), (list, yt) -> list.add(list.indexOf(getPack((CommandContext<CommandSourceStack>)commandContext, "existing", false)), yt)))))).then(Commands.literal("last").executes(commandContext -> enablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", true), List::add)))).then(Commands.literal("first").executes(commandContext -> enablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", true), (list, yt) -> list.add(0, yt))))))).then(Commands.literal("disable").then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.string()).suggests((SuggestionProvider)DataPackCommand.SELECTED_PACKS).executes(commandContext -> disablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", false)))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("list").executes(commandContext -> listPacks((CommandSourceStack)commandContext.getSource()))).then(Commands.literal("available").executes(commandContext -> listAvailablePacks((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("enabled").executes(commandContext -> listEnabledPacks((CommandSourceStack)commandContext.getSource())))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("datapack").requires(cz -> cz.hasPermission(2))).then(Commands.literal("enable").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.string()).suggests((SuggestionProvider)DataPackCommand.UNSELECTED_PACKS).executes(commandContext -> enablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", true), (list, aap) -> aap.getDefaultPosition().<Pack, Pack>insert(list, aap, aap -> aap, false)))).then(Commands.literal("after").then(Commands.argument("existing", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.string()).suggests((SuggestionProvider)DataPackCommand.SELECTED_PACKS).executes(commandContext -> enablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", true), (list, aap) -> list.add(list.indexOf(getPack((CommandContext<CommandSourceStack>)commandContext, "existing", false)) + 1, aap)))))).then(Commands.literal("before").then(Commands.argument("existing", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.string()).suggests((SuggestionProvider)DataPackCommand.SELECTED_PACKS).executes(commandContext -> enablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", true), (list, aap) -> list.add(list.indexOf(getPack((CommandContext<CommandSourceStack>)commandContext, "existing", false)), aap)))))).then(Commands.literal("last").executes(commandContext -> enablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", true), List::add)))).then(Commands.literal("first").executes(commandContext -> enablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", true), (list, aap) -> list.add(0, aap))))))).then(Commands.literal("disable").then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.string()).suggests((SuggestionProvider)DataPackCommand.SELECTED_PACKS).executes(commandContext -> disablePack((CommandSourceStack)commandContext.getSource(), getPack((CommandContext<CommandSourceStack>)commandContext, "name", false)))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("list").executes(commandContext -> listPacks((CommandSourceStack)commandContext.getSource()))).then(Commands.literal("available").executes(commandContext -> listAvailablePacks((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("enabled").executes(commandContext -> listEnabledPacks((CommandSourceStack)commandContext.getSource())))));
     }
     
-    private static int enablePack(final CommandSourceStack cq, final UnopenedPack yt, final Inserter a) throws CommandSyntaxException {
-        final PackRepository<UnopenedPack> yq4 = cq.getServer().getPackRepository();
-        final List<UnopenedPack> list5 = Lists.newArrayList(yq4.getSelected());
-        a.apply(list5, yt);
-        yq4.setSelected(list5);
-        final LevelData crm6 = cq.getServer().getLevel(DimensionType.OVERWORLD).getLevelData();
-        crm6.getEnabledDataPacks().clear();
-        yq4.getSelected().forEach(yt -> crm6.getEnabledDataPacks().add(yt.getId()));
-        crm6.getDisabledDataPacks().remove(yt.getId());
-        cq.sendSuccess(new TranslatableComponent("commands.datapack.enable.success", new Object[] { yt.getChatLink(true) }), true);
-        cq.getServer().reloadResources();
-        return yq4.getSelected().size();
+    private static int enablePack(final CommandSourceStack cz, final Pack aap, final Inserter a) throws CommandSyntaxException {
+        final PackRepository<?> aar4 = cz.getServer().getPackRepository();
+        final List<Pack> list5 = Lists.newArrayList(aar4.getSelectedPacks());
+        a.apply(list5, aap);
+        cz.sendSuccess(new TranslatableComponent("commands.datapack.modify.enable", new Object[] { aap.getChatLink(true) }), true);
+        ReloadCommand.reloadPacks(list5.stream().map(Pack::getId).collect(Collectors.toList()), cz);
+        return list5.size();
     }
     
-    private static int disablePack(final CommandSourceStack cq, final UnopenedPack yt) {
-        final PackRepository<UnopenedPack> yq3 = cq.getServer().getPackRepository();
-        final List<UnopenedPack> list4 = Lists.newArrayList(yq3.getSelected());
-        list4.remove(yt);
-        yq3.setSelected(list4);
-        final LevelData crm5 = cq.getServer().getLevel(DimensionType.OVERWORLD).getLevelData();
-        crm5.getEnabledDataPacks().clear();
-        yq3.getSelected().forEach(yt -> crm5.getEnabledDataPacks().add(yt.getId()));
-        crm5.getDisabledDataPacks().add(yt.getId());
-        cq.sendSuccess(new TranslatableComponent("commands.datapack.disable.success", new Object[] { yt.getChatLink(true) }), true);
-        cq.getServer().reloadResources();
-        return yq3.getSelected().size();
+    private static int disablePack(final CommandSourceStack cz, final Pack aap) {
+        final PackRepository<?> aar3 = cz.getServer().getPackRepository();
+        final List<Pack> list4 = Lists.newArrayList(aar3.getSelectedPacks());
+        list4.remove(aap);
+        cz.sendSuccess(new TranslatableComponent("commands.datapack.modify.disable", new Object[] { aap.getChatLink(true) }), true);
+        ReloadCommand.reloadPacks(list4.stream().map(Pack::getId).collect(Collectors.toList()), cz);
+        return list4.size();
     }
     
-    private static int listPacks(final CommandSourceStack cq) {
-        return listEnabledPacks(cq) + listAvailablePacks(cq);
+    private static int listPacks(final CommandSourceStack cz) {
+        return listEnabledPacks(cz) + listAvailablePacks(cz);
     }
     
-    private static int listAvailablePacks(final CommandSourceStack cq) {
-        final PackRepository<UnopenedPack> yq2 = cq.getServer().getPackRepository();
-        if (yq2.getUnselected().isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.datapack.list.available.none", new Object[0]), false);
+    private static int listAvailablePacks(final CommandSourceStack cz) {
+        final PackRepository<?> aar2 = cz.getServer().getPackRepository();
+        aar2.reload();
+        final Collection<? extends Pack> collection3 = aar2.getSelectedPacks();
+        final Collection<? extends Pack> collection4 = aar2.getAvailablePacks();
+        final List<Pack> list5 = collection4.stream().filter(aap -> !collection3.contains(aap)).collect(Collectors.toList());
+        if (list5.isEmpty()) {
+            cz.sendSuccess(new TranslatableComponent("commands.datapack.list.available.none"), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.datapack.list.available.success", new Object[] { yq2.getUnselected().size(), ComponentUtils.<UnopenedPack>formatList(yq2.getUnselected(), yt -> yt.getChatLink(false)) }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.datapack.list.available.success", new Object[] { list5.size(), ComponentUtils.<Pack>formatList((Collection<Pack>)list5, aap -> aap.getChatLink(false)) }), false);
         }
-        return yq2.getUnselected().size();
+        return list5.size();
     }
     
-    private static int listEnabledPacks(final CommandSourceStack cq) {
-        final PackRepository<UnopenedPack> yq2 = cq.getServer().getPackRepository();
-        if (yq2.getSelected().isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.datapack.list.enabled.none", new Object[0]), false);
+    private static int listEnabledPacks(final CommandSourceStack cz) {
+        final PackRepository<?> aar2 = cz.getServer().getPackRepository();
+        aar2.reload();
+        final Collection<? extends Pack> collection3 = aar2.getSelectedPacks();
+        if (collection3.isEmpty()) {
+            cz.sendSuccess(new TranslatableComponent("commands.datapack.list.enabled.none"), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.datapack.list.enabled.success", new Object[] { yq2.getSelected().size(), ComponentUtils.<UnopenedPack>formatList(yq2.getSelected(), yt -> yt.getChatLink(true)) }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.datapack.list.enabled.success", new Object[] { collection3.size(), ComponentUtils.<Pack>formatList((Collection<Pack>)collection3, aap -> aap.getChatLink(true)) }), false);
         }
-        return yq2.getSelected().size();
+        return collection3.size();
     }
     
-    private static UnopenedPack getPack(final CommandContext<CommandSourceStack> commandContext, final String string, final boolean boolean3) throws CommandSyntaxException {
+    private static Pack getPack(final CommandContext<CommandSourceStack> commandContext, final String string, final boolean boolean3) throws CommandSyntaxException {
         final String string2 = StringArgumentType.getString((CommandContext)commandContext, string);
-        final PackRepository<UnopenedPack> yq5 = ((CommandSourceStack)commandContext.getSource()).getServer().getPackRepository();
-        final UnopenedPack yt6 = yq5.getPack(string2);
-        if (yt6 == null) {
+        final PackRepository<?> aar5 = ((CommandSourceStack)commandContext.getSource()).getServer().getPackRepository();
+        final Pack aap6 = (Pack)aar5.getPack(string2);
+        if (aap6 == null) {
             throw DataPackCommand.ERROR_UNKNOWN_PACK.create(string2);
         }
-        final boolean boolean4 = yq5.getSelected().contains(yt6);
+        final boolean boolean4 = aar5.getSelectedPacks().contains(aap6);
         if (boolean3 && boolean4) {
             throw DataPackCommand.ERROR_PACK_ALREADY_ENABLED.create(string2);
         }
         if (!boolean3 && !boolean4) {
             throw DataPackCommand.ERROR_PACK_ALREADY_DISABLED.create(string2);
         }
-        return yt6;
+        return aap6;
     }
     
     static {
@@ -125,11 +121,15 @@ public class DataPackCommand {
             new TranslatableComponent("commands.datapack.disable.failed", new Object[] { object });
             return translatableComponent3;
         });
-        SELECTED_PACKS = ((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getPackRepository().getSelected().stream().map(UnopenedPack::getId).<String>map(StringArgumentType::escapeIfRequired), suggestionsBuilder));
-        AVAILABLE_PACKS = ((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getPackRepository().getUnselected().stream().map(UnopenedPack::getId).<String>map(StringArgumentType::escapeIfRequired), suggestionsBuilder));
+        SELECTED_PACKS = ((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getPackRepository().getSelectedIds().stream().<String>map(StringArgumentType::escapeIfRequired), suggestionsBuilder));
+        UNSELECTED_PACKS = ((commandContext, suggestionsBuilder) -> {
+            final PackRepository<?> aar3 = ((CommandSourceStack)commandContext.getSource()).getServer().getPackRepository();
+            final Collection<String> collection4 = aar3.getSelectedIds();
+            return SharedSuggestionProvider.suggest(aar3.getAvailableIds().stream().filter(string -> !collection4.contains(string)).<String>map(StringArgumentType::escapeIfRequired), suggestionsBuilder);
+        });
     }
     
     interface Inserter {
-        void apply(final List<UnopenedPack> list, final UnopenedPack yt) throws CommandSyntaxException;
+        void apply(final List<Pack> list, final Pack aap) throws CommandSyntaxException;
     }
 }
diff --git a/src/net/minecraft/server/commands/DeOpCommands.java b/src/net/minecraft/server/commands/DeOpCommands.java
index 54dbda5..89072f5 100644
--- a/src/net/minecraft/server/commands/DeOpCommands.java
+++ b/src/net/minecraft/server/commands/DeOpCommands.java
@@ -24,27 +24,27 @@ public class DeOpCommands {
     private static final SimpleCommandExceptionType ERROR_NOT_OP;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("deop").requires(cq -> cq.hasPermission(3))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getOpNames(), suggestionsBuilder)).executes(commandContext -> deopPlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets")))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("deop").requires(cz -> cz.hasPermission(3))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getOpNames(), suggestionsBuilder)).executes(commandContext -> deopPlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets")))));
     }
     
-    private static int deopPlayers(final CommandSourceStack cq, final Collection<GameProfile> collection) throws CommandSyntaxException {
-        final PlayerList zo3 = cq.getServer().getPlayerList();
+    private static int deopPlayers(final CommandSourceStack cz, final Collection<GameProfile> collection) throws CommandSyntaxException {
+        final PlayerList abp3 = cz.getServer().getPlayerList();
         int integer4 = 0;
         for (final GameProfile gameProfile6 : collection) {
-            if (zo3.isOp(gameProfile6)) {
-                zo3.deop(gameProfile6);
+            if (abp3.isOp(gameProfile6)) {
+                abp3.deop(gameProfile6);
                 ++integer4;
-                cq.sendSuccess(new TranslatableComponent("commands.deop.success", new Object[] { collection.iterator().next().getName() }), true);
+                cz.sendSuccess(new TranslatableComponent("commands.deop.success", new Object[] { collection.iterator().next().getName() }), true);
             }
         }
         if (integer4 == 0) {
             throw DeOpCommands.ERROR_NOT_OP.create();
         }
-        cq.getServer().kickUnlistedPlayers(cq);
+        cz.getServer().kickUnlistedPlayers(cz);
         return integer4;
     }
     
     static {
-        ERROR_NOT_OP = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.deop.failed", new Object[0]));
+        ERROR_NOT_OP = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.deop.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/DebugCommand.java b/src/net/minecraft/server/commands/DebugCommand.java
index 67b6af8..69bda13 100644
--- a/src/net/minecraft/server/commands/DebugCommand.java
+++ b/src/net/minecraft/server/commands/DebugCommand.java
@@ -18,7 +18,6 @@ import java.io.File;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.util.profiling.GameProfiler;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
@@ -39,37 +38,35 @@ public class DebugCommand {
     private static final FileSystemProvider ZIP_FS_PROVIDER;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("debug").requires(cq -> cq.hasPermission(3))).then(Commands.literal("start").executes(commandContext -> start((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("stop").executes(commandContext -> stop((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("report").executes(commandContext -> report((CommandSourceStack)commandContext.getSource()))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("debug").requires(cz -> cz.hasPermission(3))).then(Commands.literal("start").executes(commandContext -> start((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("stop").executes(commandContext -> stop((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("report").executes(commandContext -> report((CommandSourceStack)commandContext.getSource()))));
     }
     
-    private static int start(final CommandSourceStack cq) throws CommandSyntaxException {
-        final MinecraftServer minecraftServer2 = cq.getServer();
-        final GameProfiler aik3 = minecraftServer2.getProfiler();
-        if (aik3.continuous().isEnabled()) {
+    private static int start(final CommandSourceStack cz) throws CommandSyntaxException {
+        final MinecraftServer minecraftServer2 = cz.getServer();
+        if (minecraftServer2.isProfiling()) {
             throw DebugCommand.ERROR_ALREADY_RUNNING.create();
         }
-        minecraftServer2.delayStartProfiler();
-        cq.sendSuccess(new TranslatableComponent("commands.debug.started", new Object[] { "Started the debug profiler. Type '/debug stop' to stop it." }), true);
+        minecraftServer2.startProfiling();
+        cz.sendSuccess(new TranslatableComponent("commands.debug.started", new Object[] { "Started the debug profiler. Type '/debug stop' to stop it." }), true);
         return 0;
     }
     
-    private static int stop(final CommandSourceStack cq) throws CommandSyntaxException {
-        final MinecraftServer minecraftServer2 = cq.getServer();
-        final GameProfiler aik3 = minecraftServer2.getProfiler();
-        if (!aik3.continuous().isEnabled()) {
+    private static int stop(final CommandSourceStack cz) throws CommandSyntaxException {
+        final MinecraftServer minecraftServer2 = cz.getServer();
+        if (!minecraftServer2.isProfiling()) {
             throw DebugCommand.ERROR_NOT_RUNNING.create();
         }
-        final ProfileResults ain4 = aik3.continuous().disable();
-        final File file5 = new File(minecraftServer2.getFile("debug"), "profile-results-" + new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new Date()) + ".txt");
-        ain4.saveResults(file5);
-        final float float6 = ain4.getNanoDuration() / 1.0E9f;
-        final float float7 = ain4.getTickDuration() / float6;
-        cq.sendSuccess(new TranslatableComponent("commands.debug.stopped", new Object[] { String.format(Locale.ROOT, "%.2f", float6), ain4.getTickDuration(), String.format("%.2f", float7) }), true);
-        return Mth.floor(float7);
+        final ProfileResults amh3 = minecraftServer2.finishProfiling();
+        final File file4 = new File(minecraftServer2.getFile("debug"), "profile-results-" + new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new Date()) + ".txt");
+        amh3.saveResults(file4);
+        final float float5 = amh3.getNanoDuration() / 1.0E9f;
+        final float float6 = amh3.getTickDuration() / float5;
+        cz.sendSuccess(new TranslatableComponent("commands.debug.stopped", new Object[] { String.format(Locale.ROOT, "%.2f", float5), amh3.getTickDuration(), String.format("%.2f", float6) }), true);
+        return Mth.floor(float6);
     }
     
-    private static int report(final CommandSourceStack cq) {
-        final MinecraftServer minecraftServer2 = cq.getServer();
+    private static int report(final CommandSourceStack cz) {
+        final MinecraftServer minecraftServer2 = cz.getServer();
         final String string3 = "debug-report-" + new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new Date());
         try {
             final Path path5 = minecraftServer2.getFile("debug").toPath();
@@ -84,20 +81,20 @@ public class DebugCommand {
                     minecraftServer2.saveDebugReport(fileSystem6.getPath("/"));
                 }
             }
-            cq.sendSuccess(new TranslatableComponent("commands.debug.reportSaved", new Object[] { string3 }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.debug.reportSaved", new Object[] { string3 }), false);
             return 1;
         }
         catch (IOException iOException4) {
             DebugCommand.LOGGER.error("Failed to save debug dump", (Throwable)iOException4);
-            cq.sendFailure(new TranslatableComponent("commands.debug.reportFailed", new Object[0]));
+            cz.sendFailure(new TranslatableComponent("commands.debug.reportFailed"));
             return 0;
         }
     }
     
     static {
         LOGGER = LogManager.getLogger();
-        ERROR_NOT_RUNNING = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.debug.notRunning", new Object[0]));
-        ERROR_ALREADY_RUNNING = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.debug.alreadyRunning", new Object[0]));
+        ERROR_NOT_RUNNING = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.debug.notRunning"));
+        ERROR_ALREADY_RUNNING = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.debug.alreadyRunning"));
         ZIP_FS_PROVIDER = FileSystemProvider.installedProviders().stream().filter(fileSystemProvider -> fileSystemProvider.getScheme().equalsIgnoreCase("jar")).findFirst().orElse(null);
     }
 }
diff --git a/src/net/minecraft/server/commands/DefaultGameModeCommands.java b/src/net/minecraft/server/commands/DefaultGameModeCommands.java
index e53d9dd..fe84e2c 100644
--- a/src/net/minecraft/server/commands/DefaultGameModeCommands.java
+++ b/src/net/minecraft/server/commands/DefaultGameModeCommands.java
@@ -15,28 +15,28 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class DefaultGameModeCommands {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        final LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder2 = (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal("defaultgamemode").requires(cq -> cq.hasPermission(2));
-        for (final GameType bjt6 : GameType.values()) {
-            if (bjt6 != GameType.NOT_SET) {
-                literalArgumentBuilder2.then(Commands.literal(bjt6.getName()).executes(commandContext -> setMode((CommandSourceStack)commandContext.getSource(), bjt6)));
+        final LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder2 = (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal("defaultgamemode").requires(cz -> cz.hasPermission(2));
+        for (final GameType bpy6 : GameType.values()) {
+            if (bpy6 != GameType.NOT_SET) {
+                literalArgumentBuilder2.then(Commands.literal(bpy6.getName()).executes(commandContext -> setMode((CommandSourceStack)commandContext.getSource(), bpy6)));
             }
         }
         commandDispatcher.register((LiteralArgumentBuilder)literalArgumentBuilder2);
     }
     
-    private static int setMode(final CommandSourceStack cq, final GameType bjt) {
+    private static int setMode(final CommandSourceStack cz, final GameType bpy) {
         int integer3 = 0;
-        final MinecraftServer minecraftServer4 = cq.getServer();
-        minecraftServer4.setDefaultGameMode(bjt);
+        final MinecraftServer minecraftServer4 = cz.getServer();
+        minecraftServer4.setDefaultGameType(bpy);
         if (minecraftServer4.getForceGameType()) {
-            for (final ServerPlayer xe6 : minecraftServer4.getPlayerList().getPlayers()) {
-                if (xe6.gameMode.getGameModeForPlayer() != bjt) {
-                    xe6.setGameMode(bjt);
+            for (final ServerPlayer ze6 : minecraftServer4.getPlayerList().getPlayers()) {
+                if (ze6.gameMode.getGameModeForPlayer() != bpy) {
+                    ze6.setGameMode(bpy);
                     ++integer3;
                 }
             }
         }
-        cq.sendSuccess(new TranslatableComponent("commands.defaultgamemode.success", new Object[] { bjt.getDisplayName() }), true);
+        cz.sendSuccess(new TranslatableComponent("commands.defaultgamemode.success", new Object[] { bpy.getDisplayName() }), true);
         return integer3;
     }
 }
diff --git a/src/net/minecraft/server/commands/DifficultyCommand.java b/src/net/minecraft/server/commands/DifficultyCommand.java
index 4015638..ea7d441 100644
--- a/src/net/minecraft/server/commands/DifficultyCommand.java
+++ b/src/net/minecraft/server/commands/DifficultyCommand.java
@@ -6,7 +6,6 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.world.level.dimension.DimensionType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.world.Difficulty;
 import net.minecraft.commands.Commands;
@@ -19,23 +18,23 @@ public class DifficultyCommand {
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
         final LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder2 = Commands.literal("difficulty");
-        for (final Difficulty aji6 : Difficulty.values()) {
-            literalArgumentBuilder2.then(Commands.literal(aji6.getKey()).executes(commandContext -> setDifficulty((CommandSourceStack)commandContext.getSource(), aji6)));
+        for (final Difficulty and6 : Difficulty.values()) {
+            literalArgumentBuilder2.then(Commands.literal(and6.getKey()).executes(commandContext -> setDifficulty((CommandSourceStack)commandContext.getSource(), and6)));
         }
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)literalArgumentBuilder2.requires(cq -> cq.hasPermission(2))).executes(commandContext -> {
-            final Difficulty aji2 = ((CommandSourceStack)commandContext.getSource()).getLevel().getDifficulty();
-            ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.difficulty.query", new Object[] { aji2.getDisplayName() }), false);
-            return aji2.getId();
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)literalArgumentBuilder2.requires(cz -> cz.hasPermission(2))).executes(commandContext -> {
+            final Difficulty and2 = ((CommandSourceStack)commandContext.getSource()).getLevel().getDifficulty();
+            ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.difficulty.query", new Object[] { and2.getDisplayName() }), false);
+            return and2.getId();
         }));
     }
     
-    public static int setDifficulty(final CommandSourceStack cq, final Difficulty aji) throws CommandSyntaxException {
-        final MinecraftServer minecraftServer3 = cq.getServer();
-        if (minecraftServer3.getLevel(DimensionType.OVERWORLD).getDifficulty() == aji) {
-            throw DifficultyCommand.ERROR_ALREADY_DIFFICULT.create(aji.getKey());
+    public static int setDifficulty(final CommandSourceStack cz, final Difficulty and) throws CommandSyntaxException {
+        final MinecraftServer minecraftServer3 = cz.getServer();
+        if (minecraftServer3.getWorldData().getDifficulty() == and) {
+            throw DifficultyCommand.ERROR_ALREADY_DIFFICULT.create(and.getKey());
         }
-        minecraftServer3.setDifficulty(aji, true);
-        cq.sendSuccess(new TranslatableComponent("commands.difficulty.success", new Object[] { aji.getDisplayName() }), true);
+        minecraftServer3.setDifficulty(and, true);
+        cz.sendSuccess(new TranslatableComponent("commands.difficulty.success", new Object[] { and.getDisplayName() }), true);
         return 0;
     }
     
diff --git a/src/net/minecraft/server/commands/EffectCommands.java b/src/net/minecraft/server/commands/EffectCommands.java
index 47162ae..75f6385 100644
--- a/src/net/minecraft/server/commands/EffectCommands.java
+++ b/src/net/minecraft/server/commands/EffectCommands.java
@@ -31,30 +31,30 @@ public class EffectCommands {
     private static final SimpleCommandExceptionType ERROR_CLEAR_SPECIFIC_FAILED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("effect").requires(cq -> cq.hasPermission(2))).then(((LiteralArgumentBuilder)Commands.literal("clear").executes(commandContext -> clearEffects((CommandSourceStack)commandContext.getSource(), ImmutableList.<Entity>of(((CommandSourceStack)commandContext.getSource()).getEntityOrException())))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).executes(commandContext -> clearEffects((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets")))).then(Commands.argument("effect", (com.mojang.brigadier.arguments.ArgumentType<Object>)MobEffectArgument.effect()).executes(commandContext -> clearEffect((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), MobEffectArgument.getEffect((CommandContext<CommandSourceStack>)commandContext, "effect"))))))).then(Commands.literal("give").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(((RequiredArgumentBuilder)Commands.argument("effect", (com.mojang.brigadier.arguments.ArgumentType<Object>)MobEffectArgument.effect()).executes(commandContext -> giveEffect((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), MobEffectArgument.getEffect((CommandContext<CommandSourceStack>)commandContext, "effect"), null, 0, true))).then(((RequiredArgumentBuilder)Commands.argument("seconds", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(1, 1000000)).executes(commandContext -> giveEffect((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), MobEffectArgument.getEffect((CommandContext<CommandSourceStack>)commandContext, "effect"), IntegerArgumentType.getInteger(commandContext, "seconds"), 0, true))).then(((RequiredArgumentBuilder)Commands.argument("amplifier", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0, 255)).executes(commandContext -> giveEffect((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), MobEffectArgument.getEffect((CommandContext<CommandSourceStack>)commandContext, "effect"), IntegerArgumentType.getInteger(commandContext, "seconds"), IntegerArgumentType.getInteger(commandContext, "amplifier"), true))).then(Commands.argument("hideParticles", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).executes(commandContext -> giveEffect((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), MobEffectArgument.getEffect((CommandContext<CommandSourceStack>)commandContext, "effect"), IntegerArgumentType.getInteger(commandContext, "seconds"), IntegerArgumentType.getInteger(commandContext, "amplifier"), !BoolArgumentType.getBool(commandContext, "hideParticles"))))))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("effect").requires(cz -> cz.hasPermission(2))).then(((LiteralArgumentBuilder)Commands.literal("clear").executes(commandContext -> clearEffects((CommandSourceStack)commandContext.getSource(), ImmutableList.<Entity>of(((CommandSourceStack)commandContext.getSource()).getEntityOrException())))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).executes(commandContext -> clearEffects((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets")))).then(Commands.argument("effect", (com.mojang.brigadier.arguments.ArgumentType<Object>)MobEffectArgument.effect()).executes(commandContext -> clearEffect((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), MobEffectArgument.getEffect((CommandContext<CommandSourceStack>)commandContext, "effect"))))))).then(Commands.literal("give").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(((RequiredArgumentBuilder)Commands.argument("effect", (com.mojang.brigadier.arguments.ArgumentType<Object>)MobEffectArgument.effect()).executes(commandContext -> giveEffect((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), MobEffectArgument.getEffect((CommandContext<CommandSourceStack>)commandContext, "effect"), null, 0, true))).then(((RequiredArgumentBuilder)Commands.argument("seconds", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(1, 1000000)).executes(commandContext -> giveEffect((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), MobEffectArgument.getEffect((CommandContext<CommandSourceStack>)commandContext, "effect"), IntegerArgumentType.getInteger(commandContext, "seconds"), 0, true))).then(((RequiredArgumentBuilder)Commands.argument("amplifier", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0, 255)).executes(commandContext -> giveEffect((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), MobEffectArgument.getEffect((CommandContext<CommandSourceStack>)commandContext, "effect"), IntegerArgumentType.getInteger(commandContext, "seconds"), IntegerArgumentType.getInteger(commandContext, "amplifier"), true))).then(Commands.argument("hideParticles", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).executes(commandContext -> giveEffect((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), MobEffectArgument.getEffect((CommandContext<CommandSourceStack>)commandContext, "effect"), IntegerArgumentType.getInteger(commandContext, "seconds"), IntegerArgumentType.getInteger(commandContext, "amplifier"), !BoolArgumentType.getBool(commandContext, "hideParticles"))))))))));
     }
     
-    private static int giveEffect(final CommandSourceStack cq, final Collection<? extends Entity> collection, final MobEffect aki, @Nullable final Integer integer, final int integer, final boolean boolean6) throws CommandSyntaxException {
+    private static int giveEffect(final CommandSourceStack cz, final Collection<? extends Entity> collection, final MobEffect aoe, @Nullable final Integer integer, final int integer, final boolean boolean6) throws CommandSyntaxException {
         int integer2 = 0;
         int integer3;
         if (integer != null) {
-            if (aki.isInstantenous()) {
+            if (aoe.isInstantenous()) {
                 integer3 = integer;
             }
             else {
                 integer3 = integer * 20;
             }
         }
-        else if (aki.isInstantenous()) {
+        else if (aoe.isInstantenous()) {
             integer3 = 1;
         }
         else {
             integer3 = 600;
         }
-        for (final Entity akq10 : collection) {
-            if (akq10 instanceof LivingEntity) {
-                final MobEffectInstance akk11 = new MobEffectInstance(aki, integer3, integer, false, boolean6);
-                if (!((LivingEntity)akq10).addEffect(akk11)) {
+        for (final Entity aom10 : collection) {
+            if (aom10 instanceof LivingEntity) {
+                final MobEffectInstance aog11 = new MobEffectInstance(aoe, integer3, integer, false, boolean6);
+                if (!((LivingEntity)aom10).addEffect(aog11)) {
                     continue;
                 }
                 ++integer2;
@@ -64,18 +64,18 @@ public class EffectCommands {
             throw EffectCommands.ERROR_GIVE_FAILED.create();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.effect.give.success.single", new Object[] { aki.getDisplayName(), ((Entity)collection.iterator().next()).getDisplayName(), integer3 / 20 }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.effect.give.success.single", new Object[] { aoe.getDisplayName(), ((Entity)collection.iterator().next()).getDisplayName(), integer3 / 20 }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.effect.give.success.multiple", new Object[] { aki.getDisplayName(), collection.size(), integer3 / 20 }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.effect.give.success.multiple", new Object[] { aoe.getDisplayName(), collection.size(), integer3 / 20 }), true);
         }
         return integer2;
     }
     
-    private static int clearEffects(final CommandSourceStack cq, final Collection<? extends Entity> collection) throws CommandSyntaxException {
+    private static int clearEffects(final CommandSourceStack cz, final Collection<? extends Entity> collection) throws CommandSyntaxException {
         int integer3 = 0;
-        for (final Entity akq5 : collection) {
-            if (akq5 instanceof LivingEntity && ((LivingEntity)akq5).removeAllEffects()) {
+        for (final Entity aom5 : collection) {
+            if (aom5 instanceof LivingEntity && ((LivingEntity)aom5).removeAllEffects()) {
                 ++integer3;
             }
         }
@@ -83,18 +83,18 @@ public class EffectCommands {
             throw EffectCommands.ERROR_CLEAR_EVERYTHING_FAILED.create();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.effect.clear.everything.success.single", new Object[] { ((Entity)collection.iterator().next()).getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.effect.clear.everything.success.single", new Object[] { ((Entity)collection.iterator().next()).getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.effect.clear.everything.success.multiple", new Object[] { collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.effect.clear.everything.success.multiple", new Object[] { collection.size() }), true);
         }
         return integer3;
     }
     
-    private static int clearEffect(final CommandSourceStack cq, final Collection<? extends Entity> collection, final MobEffect aki) throws CommandSyntaxException {
+    private static int clearEffect(final CommandSourceStack cz, final Collection<? extends Entity> collection, final MobEffect aoe) throws CommandSyntaxException {
         int integer4 = 0;
-        for (final Entity akq6 : collection) {
-            if (akq6 instanceof LivingEntity && ((LivingEntity)akq6).removeEffect(aki)) {
+        for (final Entity aom6 : collection) {
+            if (aom6 instanceof LivingEntity && ((LivingEntity)aom6).removeEffect(aoe)) {
                 ++integer4;
             }
         }
@@ -102,17 +102,17 @@ public class EffectCommands {
             throw EffectCommands.ERROR_CLEAR_SPECIFIC_FAILED.create();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.effect.clear.specific.success.single", new Object[] { aki.getDisplayName(), ((Entity)collection.iterator().next()).getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.effect.clear.specific.success.single", new Object[] { aoe.getDisplayName(), ((Entity)collection.iterator().next()).getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.effect.clear.specific.success.multiple", new Object[] { aki.getDisplayName(), collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.effect.clear.specific.success.multiple", new Object[] { aoe.getDisplayName(), collection.size() }), true);
         }
         return integer4;
     }
     
     static {
-        ERROR_GIVE_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.effect.give.failed", new Object[0]));
-        ERROR_CLEAR_EVERYTHING_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.effect.clear.everything.failed", new Object[0]));
-        ERROR_CLEAR_SPECIFIC_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.effect.clear.specific.failed", new Object[0]));
+        ERROR_GIVE_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.effect.give.failed"));
+        ERROR_CLEAR_EVERYTHING_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.effect.clear.everything.failed"));
+        ERROR_CLEAR_SPECIFIC_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.effect.clear.specific.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/EmoteCommands.java b/src/net/minecraft/server/commands/EmoteCommands.java
index 5ba03d0..804ab2f 100644
--- a/src/net/minecraft/server/commands/EmoteCommands.java
+++ b/src/net/minecraft/server/commands/EmoteCommands.java
@@ -1,7 +1,10 @@
 package net.minecraft.server.commands;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.Util;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.arguments.ArgumentType;
@@ -14,7 +17,14 @@ import com.mojang.brigadier.CommandDispatcher;
 public class EmoteCommands {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
         commandDispatcher.register((LiteralArgumentBuilder)Commands.literal("me").then(Commands.argument("action", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.greedyString()).executes(commandContext -> {
-            ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().broadcastMessage(new TranslatableComponent("chat.type.emote", new Object[] { ((CommandSourceStack)commandContext.getSource()).getDisplayName(), StringArgumentType.getString(commandContext, "action") }));
+            final TranslatableComponent ne2 = new TranslatableComponent("chat.type.emote", new Object[] { ((CommandSourceStack)commandContext.getSource()).getDisplayName(), StringArgumentType.getString(commandContext, "action") });
+            final Entity aom3 = ((CommandSourceStack)commandContext.getSource()).getEntity();
+            if (aom3 != null) {
+                ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().broadcastMessage(ne2, ChatType.CHAT, aom3.getUUID());
+            }
+            else {
+                ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().broadcastMessage(ne2, ChatType.SYSTEM, Util.NIL_UUID);
+            }
             return 1;
         })));
     }
diff --git a/src/net/minecraft/server/commands/EnchantCommand.java b/src/net/minecraft/server/commands/EnchantCommand.java
index 9562e10..94487d1 100644
--- a/src/net/minecraft/server/commands/EnchantCommand.java
+++ b/src/net/minecraft/server/commands/EnchantCommand.java
@@ -33,40 +33,40 @@ public class EnchantCommand {
     private static final SimpleCommandExceptionType ERROR_NOTHING_HAPPENED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("enchant").requires(cq -> cq.hasPermission(2))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(((RequiredArgumentBuilder)Commands.argument("enchantment", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemEnchantmentArgument.enchantment()).executes(commandContext -> enchant((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ItemEnchantmentArgument.getEnchantment((CommandContext<CommandSourceStack>)commandContext, "enchantment"), 1))).then(Commands.argument("level", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> enchant((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ItemEnchantmentArgument.getEnchantment((CommandContext<CommandSourceStack>)commandContext, "enchantment"), IntegerArgumentType.getInteger(commandContext, "level")))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("enchant").requires(cz -> cz.hasPermission(2))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(((RequiredArgumentBuilder)Commands.argument("enchantment", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemEnchantmentArgument.enchantment()).executes(commandContext -> enchant((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ItemEnchantmentArgument.getEnchantment((CommandContext<CommandSourceStack>)commandContext, "enchantment"), 1))).then(Commands.argument("level", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> enchant((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ItemEnchantmentArgument.getEnchantment((CommandContext<CommandSourceStack>)commandContext, "enchantment"), IntegerArgumentType.getInteger(commandContext, "level")))))));
     }
     
-    private static int enchant(final CommandSourceStack cq, final Collection<? extends Entity> collection, final Enchantment bhx, final int integer) throws CommandSyntaxException {
-        if (integer > bhx.getMaxLevel()) {
-            throw EnchantCommand.ERROR_LEVEL_TOO_HIGH.create(integer, bhx.getMaxLevel());
+    private static int enchant(final CommandSourceStack cz, final Collection<? extends Entity> collection, final Enchantment bnw, final int integer) throws CommandSyntaxException {
+        if (integer > bnw.getMaxLevel()) {
+            throw EnchantCommand.ERROR_LEVEL_TOO_HIGH.create(integer, bnw.getMaxLevel());
         }
         int integer2 = 0;
-        for (final Entity akq7 : collection) {
-            if (akq7 instanceof LivingEntity) {
-                final LivingEntity akz8 = (LivingEntity)akq7;
-                final ItemStack ben9 = akz8.getMainHandItem();
-                if (!ben9.isEmpty()) {
-                    if (bhx.canEnchant(ben9) && EnchantmentHelper.isEnchantmentCompatible(EnchantmentHelper.getEnchantments(ben9).keySet(), bhx)) {
-                        ben9.enchant(bhx, integer);
+        for (final Entity aom7 : collection) {
+            if (aom7 instanceof LivingEntity) {
+                final LivingEntity aoy8 = (LivingEntity)aom7;
+                final ItemStack bki9 = aoy8.getMainHandItem();
+                if (!bki9.isEmpty()) {
+                    if (bnw.canEnchant(bki9) && EnchantmentHelper.isEnchantmentCompatible(EnchantmentHelper.getEnchantments(bki9).keySet(), bnw)) {
+                        bki9.enchant(bnw, integer);
                         ++integer2;
                     }
                     else {
                         if (collection.size() == 1) {
-                            throw EnchantCommand.ERROR_INCOMPATIBLE.create(ben9.getItem().getName(ben9).getString());
+                            throw EnchantCommand.ERROR_INCOMPATIBLE.create(bki9.getItem().getName(bki9).getString());
                         }
                         continue;
                     }
                 }
                 else {
                     if (collection.size() == 1) {
-                        throw EnchantCommand.ERROR_NO_ITEM.create(akz8.getName().getString());
+                        throw EnchantCommand.ERROR_NO_ITEM.create(aoy8.getName().getString());
                     }
                     continue;
                 }
             }
             else {
                 if (collection.size() == 1) {
-                    throw EnchantCommand.ERROR_NOT_LIVING_ENTITY.create(akq7.getName().getString());
+                    throw EnchantCommand.ERROR_NOT_LIVING_ENTITY.create(aom7.getName().getString());
                 }
                 continue;
             }
@@ -75,10 +75,10 @@ public class EnchantCommand {
             throw EnchantCommand.ERROR_NOTHING_HAPPENED.create();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.enchant.success.single", new Object[] { bhx.getFullname(integer), ((Entity)collection.iterator().next()).getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.enchant.success.single", new Object[] { bnw.getFullname(integer), ((Entity)collection.iterator().next()).getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.enchant.success.multiple", new Object[] { bhx.getFullname(integer), collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.enchant.success.multiple", new Object[] { bnw.getFullname(integer), collection.size() }), true);
         }
         return integer2;
     }
@@ -100,6 +100,6 @@ public class EnchantCommand {
             return translatableComponent3;
         });
         ERROR_LEVEL_TOO_HIGH = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("commands.enchant.failed.level", new Object[] { object1, object2 }));
-        ERROR_NOTHING_HAPPENED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.enchant.failed", new Object[0]));
+        ERROR_NOTHING_HAPPENED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.enchant.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/ExecuteCommand.java b/src/net/minecraft/server/commands/ExecuteCommand.java
index 3f96299..ec294a2 100644
--- a/src/net/minecraft/server/commands/ExecuteCommand.java
+++ b/src/net/minecraft/server/commands/ExecuteCommand.java
@@ -58,7 +58,7 @@ import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import net.minecraft.commands.arguments.ObjectiveArgument;
 import net.minecraft.commands.arguments.ScoreHolderArgument;
 import com.mojang.brigadier.tree.LiteralCommandNode;
-import net.minecraft.commands.arguments.DimensionTypeArgument;
+import net.minecraft.commands.arguments.DimensionArgument;
 import net.minecraft.commands.arguments.coordinates.SwizzleArgument;
 import net.minecraft.commands.arguments.EntityAnchorArgument;
 import net.minecraft.commands.arguments.coordinates.RotationArgument;
@@ -86,39 +86,39 @@ public class ExecuteCommand {
     private static final SuggestionProvider<CommandSourceStack> SUGGEST_PREDICATE;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        final LiteralCommandNode<CommandSourceStack> literalCommandNode2 = (LiteralCommandNode<CommandSourceStack>)commandDispatcher.register((LiteralArgumentBuilder)Commands.literal("execute").requires(cq -> cq.hasPermission(2)));
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("execute").requires(cq -> cq.hasPermission(2))).then(Commands.literal("run").redirect((CommandNode)commandDispatcher.getRoot()))).then((ArgumentBuilder)addConditionals((CommandNode<CommandSourceStack>)literalCommandNode2, Commands.literal("if"), true))).then((ArgumentBuilder)addConditionals((CommandNode<CommandSourceStack>)literalCommandNode2, Commands.literal("unless"), false))).then(Commands.literal("as").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).fork((CommandNode)literalCommandNode2, commandContext -> {
+        final LiteralCommandNode<CommandSourceStack> literalCommandNode2 = (LiteralCommandNode<CommandSourceStack>)commandDispatcher.register((LiteralArgumentBuilder)Commands.literal("execute").requires(cz -> cz.hasPermission(2)));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("execute").requires(cz -> cz.hasPermission(2))).then(Commands.literal("run").redirect((CommandNode)commandDispatcher.getRoot()))).then((ArgumentBuilder)addConditionals((CommandNode<CommandSourceStack>)literalCommandNode2, Commands.literal("if"), true))).then((ArgumentBuilder)addConditionals((CommandNode<CommandSourceStack>)literalCommandNode2, Commands.literal("unless"), false))).then(Commands.literal("as").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).fork((CommandNode)literalCommandNode2, commandContext -> {
             final List<CommandSourceStack> list2 = Lists.newArrayList();
-            for (final Entity akq4 : EntityArgument.getOptionalEntities((CommandContext<CommandSourceStack>)commandContext, "targets")) {
-                list2.add(((CommandSourceStack)commandContext.getSource()).withEntity(akq4));
+            for (final Entity aom4 : EntityArgument.getOptionalEntities((CommandContext<CommandSourceStack>)commandContext, "targets")) {
+                list2.add(((CommandSourceStack)commandContext.getSource()).withEntity(aom4));
             }
             return list2;
         })))).then(Commands.literal("at").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).fork((CommandNode)literalCommandNode2, commandContext -> {
             final List<CommandSourceStack> list2 = Lists.newArrayList();
-            for (final Entity akq4 : EntityArgument.getOptionalEntities((CommandContext<CommandSourceStack>)commandContext, "targets")) {
-                list2.add(((CommandSourceStack)commandContext.getSource()).withLevel((ServerLevel)akq4.level).withPosition(akq4.getCommandSenderWorldPosition()).withRotation(akq4.getRotationVector()));
+            for (final Entity aom4 : EntityArgument.getOptionalEntities((CommandContext<CommandSourceStack>)commandContext, "targets")) {
+                list2.add(((CommandSourceStack)commandContext.getSource()).withLevel((ServerLevel)aom4.level).withPosition(aom4.position()).withRotation(aom4.getRotationVector()));
             }
             return list2;
         })))).then(((LiteralArgumentBuilder)Commands.literal("store").then((ArgumentBuilder)wrapStores(literalCommandNode2, Commands.literal("result"), true))).then((ArgumentBuilder)wrapStores(literalCommandNode2, Commands.literal("success"), false)))).then(((LiteralArgumentBuilder)Commands.literal("positioned").then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).redirect((CommandNode)literalCommandNode2, commandContext -> ((CommandSourceStack)commandContext.getSource()).withPosition(Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos")).withAnchor(EntityAnchorArgument.Anchor.FEET)))).then(Commands.literal("as").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).fork((CommandNode)literalCommandNode2, commandContext -> {
             final List<CommandSourceStack> list2 = Lists.newArrayList();
-            for (final Entity akq4 : EntityArgument.getOptionalEntities((CommandContext<CommandSourceStack>)commandContext, "targets")) {
-                list2.add(((CommandSourceStack)commandContext.getSource()).withPosition(akq4.getCommandSenderWorldPosition()));
+            for (final Entity aom4 : EntityArgument.getOptionalEntities((CommandContext<CommandSourceStack>)commandContext, "targets")) {
+                list2.add(((CommandSourceStack)commandContext.getSource()).withPosition(aom4.position()));
             }
             return list2;
         }))))).then(((LiteralArgumentBuilder)Commands.literal("rotated").then(Commands.argument("rot", (com.mojang.brigadier.arguments.ArgumentType<Object>)RotationArgument.rotation()).redirect((CommandNode)literalCommandNode2, commandContext -> ((CommandSourceStack)commandContext.getSource()).withRotation(RotationArgument.getRotation((CommandContext<CommandSourceStack>)commandContext, "rot").getRotation((CommandSourceStack)commandContext.getSource()))))).then(Commands.literal("as").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).fork((CommandNode)literalCommandNode2, commandContext -> {
             final List<CommandSourceStack> list2 = Lists.newArrayList();
-            for (final Entity akq4 : EntityArgument.getOptionalEntities((CommandContext<CommandSourceStack>)commandContext, "targets")) {
-                list2.add(((CommandSourceStack)commandContext.getSource()).withRotation(akq4.getRotationVector()));
+            for (final Entity aom4 : EntityArgument.getOptionalEntities((CommandContext<CommandSourceStack>)commandContext, "targets")) {
+                list2.add(((CommandSourceStack)commandContext.getSource()).withRotation(aom4.getRotationVector()));
             }
             return list2;
         }))))).then(((LiteralArgumentBuilder)Commands.literal("facing").then(Commands.literal("entity").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(Commands.argument("anchor", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityAnchorArgument.anchor()).fork((CommandNode)literalCommandNode2, commandContext -> {
             final List<CommandSourceStack> list2 = Lists.newArrayList();
             final EntityAnchorArgument.Anchor a3 = EntityAnchorArgument.getAnchor((CommandContext<CommandSourceStack>)commandContext, "anchor");
-            for (final Entity akq5 : EntityArgument.getOptionalEntities((CommandContext<CommandSourceStack>)commandContext, "targets")) {
-                list2.add(((CommandSourceStack)commandContext.getSource()).facing(akq5, a3));
+            for (final Entity aom5 : EntityArgument.getOptionalEntities((CommandContext<CommandSourceStack>)commandContext, "targets")) {
+                list2.add(((CommandSourceStack)commandContext.getSource()).facing(aom5, a3));
             }
             return list2;
-        }))))).then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).redirect((CommandNode)literalCommandNode2, commandContext -> ((CommandSourceStack)commandContext.getSource()).facing(Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos")))))).then(Commands.literal("align").then(Commands.argument("axes", (com.mojang.brigadier.arguments.ArgumentType<Object>)SwizzleArgument.swizzle()).redirect((CommandNode)literalCommandNode2, commandContext -> ((CommandSourceStack)commandContext.getSource()).withPosition(((CommandSourceStack)commandContext.getSource()).getPosition().align(SwizzleArgument.getSwizzle((CommandContext<CommandSourceStack>)commandContext, "axes"))))))).then(Commands.literal("anchored").then(Commands.argument("anchor", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityAnchorArgument.anchor()).redirect((CommandNode)literalCommandNode2, commandContext -> ((CommandSourceStack)commandContext.getSource()).withAnchor(EntityAnchorArgument.getAnchor((CommandContext<CommandSourceStack>)commandContext, "anchor")))))).then(Commands.literal("in").then(Commands.argument("dimension", (com.mojang.brigadier.arguments.ArgumentType<Object>)DimensionTypeArgument.dimension()).redirect((CommandNode)literalCommandNode2, commandContext -> ((CommandSourceStack)commandContext.getSource()).withLevel(((CommandSourceStack)commandContext.getSource()).getServer().getLevel(DimensionTypeArgument.getDimension((CommandContext<CommandSourceStack>)commandContext, "dimension")))))));
+        }))))).then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).redirect((CommandNode)literalCommandNode2, commandContext -> ((CommandSourceStack)commandContext.getSource()).facing(Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos")))))).then(Commands.literal("align").then(Commands.argument("axes", (com.mojang.brigadier.arguments.ArgumentType<Object>)SwizzleArgument.swizzle()).redirect((CommandNode)literalCommandNode2, commandContext -> ((CommandSourceStack)commandContext.getSource()).withPosition(((CommandSourceStack)commandContext.getSource()).getPosition().align(SwizzleArgument.getSwizzle((CommandContext<CommandSourceStack>)commandContext, "axes"))))))).then(Commands.literal("anchored").then(Commands.argument("anchor", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityAnchorArgument.anchor()).redirect((CommandNode)literalCommandNode2, commandContext -> ((CommandSourceStack)commandContext.getSource()).withAnchor(EntityAnchorArgument.getAnchor((CommandContext<CommandSourceStack>)commandContext, "anchor")))))).then(Commands.literal("in").then(Commands.argument("dimension", (com.mojang.brigadier.arguments.ArgumentType<Object>)DimensionArgument.dimension()).redirect((CommandNode)literalCommandNode2, commandContext -> ((CommandSourceStack)commandContext.getSource()).withLevel(DimensionArgument.getDimension((CommandContext<CommandSourceStack>)commandContext, "dimension"))))));
     }
     
     private static ArgumentBuilder<CommandSourceStack, ?> wrapStores(final LiteralCommandNode<CommandSourceStack> literalCommandNode, final LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder, final boolean boolean3) {
@@ -131,36 +131,36 @@ public class ExecuteCommand {
         return literalArgumentBuilder;
     }
     
-    private static CommandSourceStack storeValue(final CommandSourceStack cq, final Collection<String> collection, final Objective cwi, final boolean boolean4) {
-        final Scoreboard cwl5 = cq.getServer().getScoreboard();
-        return cq.withCallback((ResultConsumer<CommandSourceStack>)((commandContext, boolean6, integer) -> {
+    private static CommandSourceStack storeValue(final CommandSourceStack cz, final Collection<String> collection, final Objective dfj, final boolean boolean4) {
+        final Scoreboard dfm5 = cz.getServer().getScoreboard();
+        return cz.withCallback((ResultConsumer<CommandSourceStack>)((commandContext, boolean6, integer) -> {
             for (final String string9 : collection) {
-                final Score cwk10 = cwl5.getOrCreatePlayerScore(string9, cwi);
+                final Score dfl10 = dfm5.getOrCreatePlayerScore(string9, dfj);
                 final int integer2 = boolean4 ? integer : (boolean6 ? 1 : 0);
-                cwk10.setScore(integer2);
+                dfl10.setScore(integer2);
             }
         }), ExecuteCommand.CALLBACK_CHAINER);
     }
     
-    private static CommandSourceStack storeValue(final CommandSourceStack cq, final CustomBossEvent tc, final boolean boolean3, final boolean boolean4) {
-        return cq.withCallback((ResultConsumer<CommandSourceStack>)((commandContext, boolean5, integer) -> {
+    private static CommandSourceStack storeValue(final CommandSourceStack cz, final CustomBossEvent uz, final boolean boolean3, final boolean boolean4) {
+        return cz.withCallback((ResultConsumer<CommandSourceStack>)((commandContext, boolean5, integer) -> {
             final int integer2 = boolean4 ? integer : (boolean5 ? 1 : 0);
             if (boolean3) {
-                tc.setValue(integer2);
+                uz.setValue(integer2);
             }
             else {
-                tc.setMax(integer2);
+                uz.setMax(integer2);
             }
         }), ExecuteCommand.CALLBACK_CHAINER);
     }
     
-    private static CommandSourceStack storeData(final CommandSourceStack cq, final DataAccessor vw, final NbtPathArgument.NbtPath h, final IntFunction<Tag> intFunction, final boolean boolean5) {
-        return cq.withCallback((ResultConsumer<CommandSourceStack>)((commandContext, boolean6, integer) -> {
+    private static CommandSourceStack storeData(final CommandSourceStack cz, final DataAccessor xw, final NbtPathArgument.NbtPath h, final IntFunction<Tag> intFunction, final boolean boolean5) {
+        return cz.withCallback((ResultConsumer<CommandSourceStack>)((commandContext, boolean6, integer) -> {
             try {
-                final CompoundTag jt8 = vw.getData();
+                final CompoundTag le8 = xw.getData();
                 final int integer2 = boolean5 ? integer : (boolean6 ? 1 : 0);
-                h.set(jt8, () -> intFunction.apply(integer2));
-                vw.setData(jt8);
+                h.set(le8, () -> intFunction.apply(integer2));
+                xw.setData(le8);
             }
             catch (CommandSyntaxException ex) {}
         }), ExecuteCommand.CALLBACK_CHAINER);
@@ -189,42 +189,42 @@ public class ExecuteCommand {
         return (Command<CommandSourceStack>)(commandContext -> {
             final int integer3 = a.test((CommandContext<CommandSourceStack>)commandContext);
             if (integer3 == 0) {
-                ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.execute.conditional.pass", new Object[0]), false);
+                ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.execute.conditional.pass"), false);
                 return 1;
             }
             throw ExecuteCommand.ERROR_CONDITIONAL_FAILED_COUNT.create(integer3);
         });
     }
     
-    private static int checkMatchingData(final DataAccessor vw, final NbtPathArgument.NbtPath h) throws CommandSyntaxException {
-        return h.countMatching(vw.getData());
+    private static int checkMatchingData(final DataAccessor xw, final NbtPathArgument.NbtPath h) throws CommandSyntaxException {
+        return h.countMatching(xw.getData());
     }
     
     private static boolean checkScore(final CommandContext<CommandSourceStack> commandContext, final BiPredicate<Integer, Integer> biPredicate) throws CommandSyntaxException {
         final String string3 = ScoreHolderArgument.getName(commandContext, "target");
-        final Objective cwi4 = ObjectiveArgument.getObjective(commandContext, "targetObjective");
+        final Objective dfj4 = ObjectiveArgument.getObjective(commandContext, "targetObjective");
         final String string4 = ScoreHolderArgument.getName(commandContext, "source");
-        final Objective cwi5 = ObjectiveArgument.getObjective(commandContext, "sourceObjective");
-        final Scoreboard cwl7 = ((CommandSourceStack)commandContext.getSource()).getServer().getScoreboard();
-        if (!cwl7.hasPlayerScore(string3, cwi4) || !cwl7.hasPlayerScore(string4, cwi5)) {
+        final Objective dfj5 = ObjectiveArgument.getObjective(commandContext, "sourceObjective");
+        final Scoreboard dfm7 = ((CommandSourceStack)commandContext.getSource()).getServer().getScoreboard();
+        if (!dfm7.hasPlayerScore(string3, dfj4) || !dfm7.hasPlayerScore(string4, dfj5)) {
             return false;
         }
-        final Score cwk8 = cwl7.getOrCreatePlayerScore(string3, cwi4);
-        final Score cwk9 = cwl7.getOrCreatePlayerScore(string4, cwi5);
-        return biPredicate.test(cwk8.getScore(), cwk9.getScore());
+        final Score dfl8 = dfm7.getOrCreatePlayerScore(string3, dfj4);
+        final Score dfl9 = dfm7.getOrCreatePlayerScore(string4, dfj5);
+        return biPredicate.test(dfl8.getScore(), dfl9.getScore());
     }
     
     private static boolean checkScore(final CommandContext<CommandSourceStack> commandContext, final MinMaxBounds.Ints d) throws CommandSyntaxException {
         final String string3 = ScoreHolderArgument.getName(commandContext, "target");
-        final Objective cwi4 = ObjectiveArgument.getObjective(commandContext, "targetObjective");
-        final Scoreboard cwl5 = ((CommandSourceStack)commandContext.getSource()).getServer().getScoreboard();
-        return cwl5.hasPlayerScore(string3, cwi4) && d.matches(cwl5.getOrCreatePlayerScore(string3, cwi4).getScore());
+        final Objective dfj4 = ObjectiveArgument.getObjective(commandContext, "targetObjective");
+        final Scoreboard dfm5 = ((CommandSourceStack)commandContext.getSource()).getServer().getScoreboard();
+        return dfm5.hasPlayerScore(string3, dfj4) && d.matches(dfm5.getOrCreatePlayerScore(string3, dfj4).getScore());
     }
     
-    private static boolean checkCustomPredicate(final CommandSourceStack cq, final LootItemCondition cum) {
-        final ServerLevel xd3 = cq.getLevel();
-        final LootContext.Builder a4 = new LootContext.Builder(xd3).<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(cq.getPosition())).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, cq.getEntity());
-        return cum.test(a4.create(LootContextParamSets.COMMAND));
+    private static boolean checkCustomPredicate(final CommandSourceStack cz, final LootItemCondition ddm) {
+        final ServerLevel zd3 = cz.getLevel();
+        final LootContext.Builder a4 = new LootContext.Builder(zd3).<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(cz.getPosition())).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, cz.getEntity());
+        return ddm.test(a4.create(LootContextParamSets.COMMAND));
     }
     
     private static Collection<CommandSourceStack> expect(final CommandContext<CommandSourceStack> commandContext, final boolean boolean2, final boolean boolean3) {
@@ -237,7 +237,7 @@ public class ExecuteCommand {
     private static ArgumentBuilder<CommandSourceStack, ?> addConditional(final CommandNode<CommandSourceStack> commandNode, final ArgumentBuilder<CommandSourceStack, ?> argumentBuilder, final boolean boolean3, final CommandPredicate b) {
         return argumentBuilder.fork((CommandNode)commandNode, commandContext -> expect((CommandContext<CommandSourceStack>)commandContext, boolean3, b.test((CommandContext<CommandSourceStack>)commandContext))).executes(commandContext -> {
             if (boolean3 == b.test((CommandContext<CommandSourceStack>)commandContext)) {
-                ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.execute.conditional.pass", new Object[0]), false);
+                ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.execute.conditional.pass"), false);
                 return 1;
             }
             throw ExecuteCommand.ERROR_CONDITIONAL_FAILED.create();
@@ -262,7 +262,7 @@ public class ExecuteCommand {
         if (optionalInt3.isPresent()) {
             throw ExecuteCommand.ERROR_CONDITIONAL_FAILED_COUNT.create(optionalInt3.getAsInt());
         }
-        ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.execute.conditional.pass", new Object[0]), false);
+        ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.execute.conditional.pass"), false);
         return 1;
     }
     
@@ -270,40 +270,40 @@ public class ExecuteCommand {
         return checkRegions(((CommandSourceStack)commandContext.getSource()).getLevel(), BlockPosArgument.getLoadedBlockPos(commandContext, "start"), BlockPosArgument.getLoadedBlockPos(commandContext, "end"), BlockPosArgument.getLoadedBlockPos(commandContext, "destination"), boolean2);
     }
     
-    private static OptionalInt checkRegions(final ServerLevel xd, final BlockPos fk2, final BlockPos fk3, final BlockPos fk4, final boolean boolean5) throws CommandSyntaxException {
-        final BoundingBox clb6 = new BoundingBox(fk2, fk3);
-        final BoundingBox clb7 = new BoundingBox(fk4, fk4.offset(clb6.getLength()));
-        final BlockPos fk5 = new BlockPos(clb7.x0 - clb6.x0, clb7.y0 - clb6.y0, clb7.z0 - clb6.z0);
-        final int integer9 = clb6.getXSpan() * clb6.getYSpan() * clb6.getZSpan();
+    private static OptionalInt checkRegions(final ServerLevel zd, final BlockPos fu2, final BlockPos fu3, final BlockPos fu4, final boolean boolean5) throws CommandSyntaxException {
+        final BoundingBox ctd6 = new BoundingBox(fu2, fu3);
+        final BoundingBox ctd7 = new BoundingBox(fu4, fu4.offset(ctd6.getLength()));
+        final BlockPos fu5 = new BlockPos(ctd7.x0 - ctd6.x0, ctd7.y0 - ctd6.y0, ctd7.z0 - ctd6.z0);
+        final int integer9 = ctd6.getXSpan() * ctd6.getYSpan() * ctd6.getZSpan();
         if (integer9 > 32768) {
             throw ExecuteCommand.ERROR_AREA_TOO_LARGE.create(32768, integer9);
         }
         int integer10 = 0;
-        for (int integer11 = clb6.z0; integer11 <= clb6.z1; ++integer11) {
-            for (int integer12 = clb6.y0; integer12 <= clb6.y1; ++integer12) {
-                for (int integer13 = clb6.x0; integer13 <= clb6.x1; ++integer13) {
-                    final BlockPos fk6 = new BlockPos(integer13, integer12, integer11);
-                    final BlockPos fk7 = fk6.offset(fk5);
-                    final BlockState byj16 = xd.getBlockState(fk6);
-                    if (!boolean5 || byj16.getBlock() != Blocks.AIR) {
-                        if (byj16 != xd.getBlockState(fk7)) {
+        for (int integer11 = ctd6.z0; integer11 <= ctd6.z1; ++integer11) {
+            for (int integer12 = ctd6.y0; integer12 <= ctd6.y1; ++integer12) {
+                for (int integer13 = ctd6.x0; integer13 <= ctd6.x1; ++integer13) {
+                    final BlockPos fu6 = new BlockPos(integer13, integer12, integer11);
+                    final BlockPos fu7 = fu6.offset(fu5);
+                    final BlockState cfj16 = zd.getBlockState(fu6);
+                    if (!boolean5 || !cfj16.is(Blocks.AIR)) {
+                        if (cfj16 != zd.getBlockState(fu7)) {
                             return OptionalInt.empty();
                         }
-                        final BlockEntity bwl17 = xd.getBlockEntity(fk6);
-                        final BlockEntity bwl18 = xd.getBlockEntity(fk7);
-                        if (bwl17 != null) {
-                            if (bwl18 == null) {
+                        final BlockEntity cdl17 = zd.getBlockEntity(fu6);
+                        final BlockEntity cdl18 = zd.getBlockEntity(fu7);
+                        if (cdl17 != null) {
+                            if (cdl18 == null) {
                                 return OptionalInt.empty();
                             }
-                            final CompoundTag jt19 = bwl17.save(new CompoundTag());
-                            jt19.remove("x");
-                            jt19.remove("y");
-                            jt19.remove("z");
-                            final CompoundTag jt20 = bwl18.save(new CompoundTag());
-                            jt20.remove("x");
-                            jt20.remove("y");
-                            jt20.remove("z");
-                            if (!jt19.equals(jt20)) {
+                            final CompoundTag le19 = cdl17.save(new CompoundTag());
+                            le19.remove("x");
+                            le19.remove("y");
+                            le19.remove("z");
+                            final CompoundTag le20 = cdl18.save(new CompoundTag());
+                            le20.remove("x");
+                            le20.remove("y");
+                            le20.remove("z");
+                            if (!le19.equals(le20)) {
                                 return OptionalInt.empty();
                             }
                         }
@@ -317,7 +317,7 @@ public class ExecuteCommand {
     
     static {
         ERROR_AREA_TOO_LARGE = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("commands.execute.blocks.toobig", new Object[] { object1, object2 }));
-        ERROR_CONDITIONAL_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.execute.conditional.fail", new Object[0]));
+        ERROR_CONDITIONAL_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.execute.conditional.fail"));
         final TranslatableComponent translatableComponent;
         ERROR_CONDITIONAL_FAILED_COUNT = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("commands.execute.conditional.fail_count", new Object[] { object });
@@ -328,8 +328,8 @@ public class ExecuteCommand {
             resultConsumer2.onCommandComplete(commandContext, boolean4, integer);
         });
         SUGGEST_PREDICATE = ((commandContext, suggestionsBuilder) -> {
-            final PredicateManager csc3 = ((CommandSourceStack)commandContext.getSource()).getServer().getPredicateManager();
-            return SharedSuggestionProvider.suggestResource(csc3.getKeys(), suggestionsBuilder);
+            final PredicateManager day3 = ((CommandSourceStack)commandContext.getSource()).getServer().getPredicateManager();
+            return SharedSuggestionProvider.suggestResource(day3.getKeys(), suggestionsBuilder);
         });
     }
     
diff --git a/src/net/minecraft/server/commands/ExperienceCommand.java b/src/net/minecraft/server/commands/ExperienceCommand.java
index a5e41a4..07d93b4 100644
--- a/src/net/minecraft/server/commands/ExperienceCommand.java
+++ b/src/net/minecraft/server/commands/ExperienceCommand.java
@@ -29,33 +29,33 @@ public class ExperienceCommand {
     private static final SimpleCommandExceptionType ERROR_SET_POINTS_INVALID;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        final LiteralCommandNode<CommandSourceStack> literalCommandNode2 = (LiteralCommandNode<CommandSourceStack>)commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("experience").requires(cq -> cq.hasPermission(2))).then(Commands.literal("add").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("amount", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> addExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.POINTS))).then(Commands.literal("points").executes(commandContext -> addExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.POINTS)))).then(Commands.literal("levels").executes(commandContext -> addExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.LEVELS))))))).then(Commands.literal("set").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("amount", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.POINTS))).then(Commands.literal("points").executes(commandContext -> setExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.POINTS)))).then(Commands.literal("levels").executes(commandContext -> setExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.LEVELS))))))).then(Commands.literal("query").then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.player()).then(Commands.literal("points").executes(commandContext -> queryExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayer((CommandContext<CommandSourceStack>)commandContext, "targets"), Type.POINTS)))).then(Commands.literal("levels").executes(commandContext -> queryExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayer((CommandContext<CommandSourceStack>)commandContext, "targets"), Type.LEVELS))))));
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("xp").requires(cq -> cq.hasPermission(2))).redirect((CommandNode)literalCommandNode2));
+        final LiteralCommandNode<CommandSourceStack> literalCommandNode2 = (LiteralCommandNode<CommandSourceStack>)commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("experience").requires(cz -> cz.hasPermission(2))).then(Commands.literal("add").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("amount", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> addExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.POINTS))).then(Commands.literal("points").executes(commandContext -> addExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.POINTS)))).then(Commands.literal("levels").executes(commandContext -> addExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.LEVELS))))))).then(Commands.literal("set").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("amount", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.POINTS))).then(Commands.literal("points").executes(commandContext -> setExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.POINTS)))).then(Commands.literal("levels").executes(commandContext -> setExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "amount"), Type.LEVELS))))))).then(Commands.literal("query").then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.player()).then(Commands.literal("points").executes(commandContext -> queryExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayer((CommandContext<CommandSourceStack>)commandContext, "targets"), Type.POINTS)))).then(Commands.literal("levels").executes(commandContext -> queryExperience((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayer((CommandContext<CommandSourceStack>)commandContext, "targets"), Type.LEVELS))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("xp").requires(cz -> cz.hasPermission(2))).redirect((CommandNode)literalCommandNode2));
     }
     
-    private static int queryExperience(final CommandSourceStack cq, final ServerPlayer xe, final Type a) {
-        final int integer4 = a.query.applyAsInt(xe);
-        cq.sendSuccess(new TranslatableComponent("commands.experience.query." + a.name, new Object[] { xe.getDisplayName(), integer4 }), false);
+    private static int queryExperience(final CommandSourceStack cz, final ServerPlayer ze, final Type a) {
+        final int integer4 = a.query.applyAsInt(ze);
+        cz.sendSuccess(new TranslatableComponent("commands.experience.query." + a.name, new Object[] { ze.getDisplayName(), integer4 }), false);
         return integer4;
     }
     
-    private static int addExperience(final CommandSourceStack cq, final Collection<? extends ServerPlayer> collection, final int integer, final Type a) {
-        for (final ServerPlayer xe6 : collection) {
-            a.add.accept(xe6, integer);
+    private static int addExperience(final CommandSourceStack cz, final Collection<? extends ServerPlayer> collection, final int integer, final Type a) {
+        for (final ServerPlayer ze6 : collection) {
+            a.add.accept(ze6, integer);
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.experience.add." + a.name + ".success.single", new Object[] { integer, ((ServerPlayer)collection.iterator().next()).getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.experience.add." + a.name + ".success.single", new Object[] { integer, ((ServerPlayer)collection.iterator().next()).getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.experience.add." + a.name + ".success.multiple", new Object[] { integer, collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.experience.add." + a.name + ".success.multiple", new Object[] { integer, collection.size() }), true);
         }
         return collection.size();
     }
     
-    private static int setExperience(final CommandSourceStack cq, final Collection<? extends ServerPlayer> collection, final int integer, final Type a) throws CommandSyntaxException {
+    private static int setExperience(final CommandSourceStack cz, final Collection<? extends ServerPlayer> collection, final int integer, final Type a) throws CommandSyntaxException {
         int integer2 = 0;
-        for (final ServerPlayer xe7 : collection) {
-            if (a.set.test(xe7, integer)) {
+        for (final ServerPlayer ze7 : collection) {
+            if (a.set.test(ze7, integer)) {
                 ++integer2;
             }
         }
@@ -63,32 +63,32 @@ public class ExperienceCommand {
             throw ExperienceCommand.ERROR_SET_POINTS_INVALID.create();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.experience.set." + a.name + ".success.single", new Object[] { integer, ((ServerPlayer)collection.iterator().next()).getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.experience.set." + a.name + ".success.single", new Object[] { integer, ((ServerPlayer)collection.iterator().next()).getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.experience.set." + a.name + ".success.multiple", new Object[] { integer, collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.experience.set." + a.name + ".success.multiple", new Object[] { integer, collection.size() }), true);
         }
         return collection.size();
     }
     
     static {
-        ERROR_SET_POINTS_INVALID = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.experience.set.points.invalid", new Object[0]));
+        ERROR_SET_POINTS_INVALID = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.experience.set.points.invalid"));
     }
     
     enum Type {
-        POINTS("points", Player::giveExperiencePoints, (xe, integer) -> {
-            if (integer >= xe.getXpNeededForNextLevel()) {
+        POINTS("points", Player::giveExperiencePoints, (ze, integer) -> {
+            if (integer >= ze.getXpNeededForNextLevel()) {
                 return false;
             }
             else {
-                xe.setExperiencePoints(integer);
+                ze.setExperiencePoints(integer);
                 return true;
             }
-        }, xe -> Mth.floor(xe.experienceProgress * xe.getXpNeededForNextLevel())), 
-        LEVELS("levels", ServerPlayer::giveExperienceLevels, (xe, integer) -> {
-            xe.setExperienceLevels(integer);
+        }, ze -> Mth.floor(ze.experienceProgress * ze.getXpNeededForNextLevel())), 
+        LEVELS("levels", ServerPlayer::giveExperienceLevels, (ze, integer) -> {
+            ze.setExperienceLevels(integer);
             return true;
-        }, xe -> xe.experienceLevel);
+        }, ze -> ze.experienceLevel);
         
         public final BiConsumer<ServerPlayer, Integer> add;
         public final BiPredicate<ServerPlayer, Integer> set;
diff --git a/src/net/minecraft/server/commands/FillCommand.java b/src/net/minecraft/server/commands/FillCommand.java
index d52e0bc..3847f9e 100644
--- a/src/net/minecraft/server/commands/FillCommand.java
+++ b/src/net/minecraft/server/commands/FillCommand.java
@@ -42,71 +42,71 @@ public class FillCommand {
     private static final SimpleCommandExceptionType ERROR_FAILED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("fill").requires(cq -> cq.hasPermission(2))).then(Commands.argument("from", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(Commands.argument("to", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("block", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockStateArgument.block()).executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, null))).then(((LiteralArgumentBuilder)Commands.literal("replace").executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, null))).then(Commands.argument("filter", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPredicateArgument.blockPredicate()).executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, BlockPredicateArgument.getBlockPredicate((CommandContext<CommandSourceStack>)commandContext, "filter")))))).then(Commands.literal("keep").executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, byn -> byn.getLevel().isEmptyBlock(byn.getPos()))))).then(Commands.literal("outline").executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.OUTLINE, null)))).then(Commands.literal("hollow").executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.HOLLOW, null)))).then(Commands.literal("destroy").executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.DESTROY, null)))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("fill").requires(cz -> cz.hasPermission(2))).then(Commands.argument("from", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(Commands.argument("to", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("block", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockStateArgument.block()).executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, null))).then(((LiteralArgumentBuilder)Commands.literal("replace").executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, null))).then(Commands.argument("filter", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPredicateArgument.blockPredicate()).executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, BlockPredicateArgument.getBlockPredicate((CommandContext<CommandSourceStack>)commandContext, "filter")))))).then(Commands.literal("keep").executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, cfn -> cfn.getLevel().isEmptyBlock(cfn.getPos()))))).then(Commands.literal("outline").executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.OUTLINE, null)))).then(Commands.literal("hollow").executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.HOLLOW, null)))).then(Commands.literal("destroy").executes(commandContext -> fillBlocks((CommandSourceStack)commandContext.getSource(), new BoundingBox(BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "from"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "to")), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.DESTROY, null)))))));
     }
     
-    private static int fillBlocks(final CommandSourceStack cq, final BoundingBox clb, final BlockInput ds, final Mode a, @Nullable final Predicate<BlockInWorld> predicate) throws CommandSyntaxException {
-        final int integer6 = clb.getXSpan() * clb.getYSpan() * clb.getZSpan();
+    private static int fillBlocks(final CommandSourceStack cz, final BoundingBox ctd, final BlockInput ec, final Mode a, @Nullable final Predicate<BlockInWorld> predicate) throws CommandSyntaxException {
+        final int integer6 = ctd.getXSpan() * ctd.getYSpan() * ctd.getZSpan();
         if (integer6 > 32768) {
             throw FillCommand.ERROR_AREA_TOO_LARGE.create(32768, integer6);
         }
         final List<BlockPos> list7 = Lists.newArrayList();
-        final ServerLevel xd8 = cq.getLevel();
+        final ServerLevel zd8 = cz.getLevel();
         int integer7 = 0;
-        for (final BlockPos fk11 : BlockPos.betweenClosed(clb.x0, clb.y0, clb.z0, clb.x1, clb.y1, clb.z1)) {
-            if (predicate != null && !predicate.test(new BlockInWorld(xd8, fk11, true))) {
+        for (final BlockPos fu11 : BlockPos.betweenClosed(ctd.x0, ctd.y0, ctd.z0, ctd.x1, ctd.y1, ctd.z1)) {
+            if (predicate != null && !predicate.test(new BlockInWorld(zd8, fu11, true))) {
                 continue;
             }
-            final BlockInput ds2 = a.filter.filter(clb, fk11, ds, xd8);
-            if (ds2 == null) {
+            final BlockInput ec2 = a.filter.filter(ctd, fu11, ec, zd8);
+            if (ec2 == null) {
                 continue;
             }
-            final BlockEntity bwl13 = xd8.getBlockEntity(fk11);
-            Clearable.tryClear(bwl13);
-            if (!ds2.place(xd8, fk11, 2)) {
+            final BlockEntity cdl13 = zd8.getBlockEntity(fu11);
+            Clearable.tryClear(cdl13);
+            if (!ec2.place(zd8, fu11, 2)) {
                 continue;
             }
-            list7.add(fk11.immutable());
+            list7.add(fu11.immutable());
             ++integer7;
         }
-        for (final BlockPos fk11 : list7) {
-            final Block bph12 = xd8.getBlockState(fk11).getBlock();
-            xd8.blockUpdated(fk11, bph12);
+        for (final BlockPos fu11 : list7) {
+            final Block bvr12 = zd8.getBlockState(fu11).getBlock();
+            zd8.blockUpdated(fu11, bvr12);
         }
         if (integer7 == 0) {
             throw FillCommand.ERROR_FAILED.create();
         }
-        cq.sendSuccess(new TranslatableComponent("commands.fill.success", new Object[] { integer7 }), true);
+        cz.sendSuccess(new TranslatableComponent("commands.fill.success", new Object[] { integer7 }), true);
         return integer7;
     }
     
     static {
         ERROR_AREA_TOO_LARGE = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("commands.fill.toobig", new Object[] { object1, object2 }));
         HOLLOW_CORE = new BlockInput(Blocks.AIR.defaultBlockState(), Collections.<Property<?>>emptySet(), null);
-        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.fill.failed", new Object[0]));
+        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.fill.failed"));
     }
     
     enum Mode {
-        REPLACE((clb, fk, ds, xd) -> ds), 
-        OUTLINE((clb, fk, ds, xd) -> {
-            if (fk.getX() == clb.x0 || fk.getX() == clb.x1 || fk.getY() == clb.y0 || fk.getY() == clb.y1 || fk.getZ() == clb.z0 || fk.getZ() == clb.z1) {
-                return ds;
+        REPLACE((ctd, fu, ec, zd) -> ec), 
+        OUTLINE((ctd, fu, ec, zd) -> {
+            if (fu.getX() == ctd.x0 || fu.getX() == ctd.x1 || fu.getY() == ctd.y0 || fu.getY() == ctd.y1 || fu.getZ() == ctd.z0 || fu.getZ() == ctd.z1) {
+                return ec;
             }
             else {
                 return null;
             }
         }), 
-        HOLLOW((clb, fk, ds, xd) -> {
-            if (fk.getX() == clb.x0 || fk.getX() == clb.x1 || fk.getY() == clb.y0 || fk.getY() == clb.y1 || fk.getZ() == clb.z0 || fk.getZ() == clb.z1) {
-                return ds;
+        HOLLOW((ctd, fu, ec, zd) -> {
+            if (fu.getX() == ctd.x0 || fu.getX() == ctd.x1 || fu.getY() == ctd.y0 || fu.getY() == ctd.y1 || fu.getZ() == ctd.z0 || fu.getZ() == ctd.z1) {
+                return ec;
             }
             else {
                 return FillCommand.HOLLOW_CORE;
             }
         }), 
-        DESTROY((clb, fk, ds, xd) -> {
-            xd.destroyBlock(fk, true);
-            return ds;
+        DESTROY((ctd, fu, ec, zd) -> {
+            zd.destroyBlock(fu, true);
+            return ec;
         });
         
         public final SetBlockCommand.Filter filter;
diff --git a/src/net/minecraft/server/commands/ForceLoadCommand.java b/src/net/minecraft/server/commands/ForceLoadCommand.java
index b160450..306946c 100644
--- a/src/net/minecraft/server/commands/ForceLoadCommand.java
+++ b/src/net/minecraft/server/commands/ForceLoadCommand.java
@@ -3,13 +3,14 @@ package net.minecraft.server.commands;
 import com.mojang.brigadier.Message;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
-import net.minecraft.server.level.ServerLevel;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import java.util.Iterator;
 import java.util.function.Function;
 import com.google.common.base.Joiner;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.ChunkPos;
@@ -31,53 +32,55 @@ public class ForceLoadCommand {
     private static final SimpleCommandExceptionType ERROR_NONE_REMOVED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("forceload").requires(cq -> cq.hasPermission(2))).then(Commands.literal("add").then(((RequiredArgumentBuilder)Commands.argument("from", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColumnPosArgument.columnPos()).executes(commandContext -> changeForceLoad((CommandSourceStack)commandContext.getSource(), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), true))).then(Commands.argument("to", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColumnPosArgument.columnPos()).executes(commandContext -> changeForceLoad((CommandSourceStack)commandContext.getSource(), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "to"), true)))))).then(((LiteralArgumentBuilder)Commands.literal("remove").then(((RequiredArgumentBuilder)Commands.argument("from", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColumnPosArgument.columnPos()).executes(commandContext -> changeForceLoad((CommandSourceStack)commandContext.getSource(), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), false))).then(Commands.argument("to", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColumnPosArgument.columnPos()).executes(commandContext -> changeForceLoad((CommandSourceStack)commandContext.getSource(), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "to"), false))))).then(Commands.literal("all").executes(commandContext -> removeAll((CommandSourceStack)commandContext.getSource()))))).then(((LiteralArgumentBuilder)Commands.literal("query").executes(commandContext -> listForceLoad((CommandSourceStack)commandContext.getSource()))).then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColumnPosArgument.columnPos()).executes(commandContext -> queryForceLoad((CommandSourceStack)commandContext.getSource(), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "pos"))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("forceload").requires(cz -> cz.hasPermission(2))).then(Commands.literal("add").then(((RequiredArgumentBuilder)Commands.argument("from", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColumnPosArgument.columnPos()).executes(commandContext -> changeForceLoad((CommandSourceStack)commandContext.getSource(), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), true))).then(Commands.argument("to", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColumnPosArgument.columnPos()).executes(commandContext -> changeForceLoad((CommandSourceStack)commandContext.getSource(), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "to"), true)))))).then(((LiteralArgumentBuilder)Commands.literal("remove").then(((RequiredArgumentBuilder)Commands.argument("from", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColumnPosArgument.columnPos()).executes(commandContext -> changeForceLoad((CommandSourceStack)commandContext.getSource(), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), false))).then(Commands.argument("to", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColumnPosArgument.columnPos()).executes(commandContext -> changeForceLoad((CommandSourceStack)commandContext.getSource(), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "from"), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "to"), false))))).then(Commands.literal("all").executes(commandContext -> removeAll((CommandSourceStack)commandContext.getSource()))))).then(((LiteralArgumentBuilder)Commands.literal("query").executes(commandContext -> listForceLoad((CommandSourceStack)commandContext.getSource()))).then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColumnPosArgument.columnPos()).executes(commandContext -> queryForceLoad((CommandSourceStack)commandContext.getSource(), ColumnPosArgument.getColumnPos((CommandContext<CommandSourceStack>)commandContext, "pos"))))));
     }
     
-    private static int queryForceLoad(final CommandSourceStack cq, final ColumnPos wt) throws CommandSyntaxException {
-        final ChunkPos bjh3 = new ChunkPos(wt.x >> 4, wt.z >> 4);
-        final DimensionType cbi4 = cq.getLevel().getDimension().getType();
-        final boolean boolean5 = cq.getServer().getLevel(cbi4).getForcedChunks().contains(bjh3.toLong());
-        if (boolean5) {
-            cq.sendSuccess(new TranslatableComponent("commands.forceload.query.success", new Object[] { bjh3, cbi4 }), false);
+    private static int queryForceLoad(final CommandSourceStack cz, final ColumnPos yt) throws CommandSyntaxException {
+        final ChunkPos bph3 = new ChunkPos(yt.x >> 4, yt.z >> 4);
+        final ServerLevel zd4 = cz.getLevel();
+        final ResourceKey<Level> ug5 = zd4.dimension();
+        final boolean boolean6 = zd4.getForcedChunks().contains(bph3.toLong());
+        if (boolean6) {
+            cz.sendSuccess(new TranslatableComponent("commands.forceload.query.success", new Object[] { bph3, ug5.location() }), false);
             return 1;
         }
-        throw ForceLoadCommand.ERROR_NOT_TICKING.create(bjh3, cbi4);
+        throw ForceLoadCommand.ERROR_NOT_TICKING.create(bph3, ug5.location());
     }
     
-    private static int listForceLoad(final CommandSourceStack cq) {
-        final DimensionType cbi2 = cq.getLevel().getDimension().getType();
-        final LongSet longSet3 = cq.getServer().getLevel(cbi2).getForcedChunks();
-        final int integer4 = longSet3.size();
-        if (integer4 > 0) {
-            final String string5 = Joiner.on(", ").join(longSet3.stream().sorted().map(ChunkPos::new).map(ChunkPos::toString).iterator());
-            if (integer4 == 1) {
-                cq.sendSuccess(new TranslatableComponent("commands.forceload.list.single", new Object[] { cbi2, string5 }), false);
+    private static int listForceLoad(final CommandSourceStack cz) {
+        final ServerLevel zd2 = cz.getLevel();
+        final ResourceKey<Level> ug3 = zd2.dimension();
+        final LongSet longSet4 = zd2.getForcedChunks();
+        final int integer5 = longSet4.size();
+        if (integer5 > 0) {
+            final String string6 = Joiner.on(", ").join(longSet4.stream().sorted().map(ChunkPos::new).map(ChunkPos::toString).iterator());
+            if (integer5 == 1) {
+                cz.sendSuccess(new TranslatableComponent("commands.forceload.list.single", new Object[] { ug3.location(), string6 }), false);
             }
             else {
-                cq.sendSuccess(new TranslatableComponent("commands.forceload.list.multiple", new Object[] { integer4, cbi2, string5 }), false);
+                cz.sendSuccess(new TranslatableComponent("commands.forceload.list.multiple", new Object[] { integer5, ug3.location(), string6 }), false);
             }
         }
         else {
-            cq.sendFailure(new TranslatableComponent("commands.forceload.added.none", new Object[] { cbi2 }));
+            cz.sendFailure(new TranslatableComponent("commands.forceload.added.none", new Object[] { ug3.location() }));
         }
-        return integer4;
+        return integer5;
     }
     
-    private static int removeAll(final CommandSourceStack cq) {
-        final DimensionType cbi2 = cq.getLevel().getDimension().getType();
-        final ServerLevel xd3 = cq.getServer().getLevel(cbi2);
-        final LongSet longSet4 = xd3.getForcedChunks();
-        longSet4.forEach(long2 -> xd3.setChunkForced(ChunkPos.getX(long2), ChunkPos.getZ(long2), false));
-        cq.sendSuccess(new TranslatableComponent("commands.forceload.removed.all", new Object[] { cbi2 }), true);
+    private static int removeAll(final CommandSourceStack cz) {
+        final ServerLevel zd2 = cz.getLevel();
+        final ResourceKey<Level> ug3 = zd2.dimension();
+        final LongSet longSet4 = zd2.getForcedChunks();
+        longSet4.forEach(long2 -> zd2.setChunkForced(ChunkPos.getX(long2), ChunkPos.getZ(long2), false));
+        cz.sendSuccess(new TranslatableComponent("commands.forceload.removed.all", new Object[] { ug3.location() }), true);
         return 0;
     }
     
-    private static int changeForceLoad(final CommandSourceStack cq, final ColumnPos wt2, final ColumnPos wt3, final boolean boolean4) throws CommandSyntaxException {
-        final int integer5 = Math.min(wt2.x, wt3.x);
-        final int integer6 = Math.min(wt2.z, wt3.z);
-        final int integer7 = Math.max(wt2.x, wt3.x);
-        final int integer8 = Math.max(wt2.z, wt3.z);
+    private static int changeForceLoad(final CommandSourceStack cz, final ColumnPos yt2, final ColumnPos yt3, final boolean boolean4) throws CommandSyntaxException {
+        final int integer5 = Math.min(yt2.x, yt3.x);
+        final int integer6 = Math.min(yt2.z, yt3.z);
+        final int integer7 = Math.max(yt2.x, yt3.x);
+        final int integer8 = Math.max(yt2.z, yt3.z);
         if (integer5 < -30000000 || integer6 < -30000000 || integer7 >= 30000000 || integer8 >= 30000000) {
             throw BlockPosArgument.ERROR_OUT_OF_WORLD.create();
         }
@@ -89,17 +92,17 @@ public class ForceLoadCommand {
         if (long13 > 256L) {
             throw ForceLoadCommand.ERROR_TOO_MANY_CHUNKS.create(256, long13);
         }
-        final DimensionType cbi15 = cq.getLevel().getDimension().getType();
-        final ServerLevel xd16 = cq.getServer().getLevel(cbi15);
-        ChunkPos bjh17 = null;
+        final ServerLevel zd15 = cz.getLevel();
+        final ResourceKey<Level> ug16 = zd15.dimension();
+        ChunkPos bph17 = null;
         int integer13 = 0;
         for (int integer14 = integer9; integer14 <= integer11; ++integer14) {
             for (int integer15 = integer10; integer15 <= integer12; ++integer15) {
-                final boolean boolean5 = xd16.setChunkForced(integer14, integer15, boolean4);
+                final boolean boolean5 = zd15.setChunkForced(integer14, integer15, boolean4);
                 if (boolean5) {
                     ++integer13;
-                    if (bjh17 == null) {
-                        bjh17 = new ChunkPos(integer14, integer15);
+                    if (bph17 == null) {
+                        bph17 = new ChunkPos(integer14, integer15);
                     }
                 }
             }
@@ -108,12 +111,12 @@ public class ForceLoadCommand {
             throw (boolean4 ? ForceLoadCommand.ERROR_ALL_ADDED : ForceLoadCommand.ERROR_NONE_REMOVED).create();
         }
         if (integer13 == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.forceload." + (boolean4 ? "added" : "removed") + ".single", new Object[] { bjh17, cbi15 }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.forceload." + (boolean4 ? "added" : "removed") + ".single", new Object[] { bph17, ug16.location() }), true);
         }
         else {
-            final ChunkPos bjh18 = new ChunkPos(integer9, integer10);
-            final ChunkPos bjh19 = new ChunkPos(integer11, integer12);
-            cq.sendSuccess(new TranslatableComponent("commands.forceload." + (boolean4 ? "added" : "removed") + ".multiple", new Object[] { integer13, cbi15, bjh18, bjh19 }), true);
+            final ChunkPos bph18 = new ChunkPos(integer9, integer10);
+            final ChunkPos bph19 = new ChunkPos(integer11, integer12);
+            cz.sendSuccess(new TranslatableComponent("commands.forceload." + (boolean4 ? "added" : "removed") + ".multiple", new Object[] { integer13, ug16.location(), bph18, bph19 }), true);
         }
         return integer13;
     }
@@ -121,7 +124,7 @@ public class ForceLoadCommand {
     static {
         ERROR_TOO_MANY_CHUNKS = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("commands.forceload.toobig", new Object[] { object1, object2 }));
         ERROR_NOT_TICKING = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("commands.forceload.query.failure", new Object[] { object1, object2 }));
-        ERROR_ALL_ADDED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.forceload.added.failure", new Object[0]));
-        ERROR_NONE_REMOVED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.forceload.removed.failure", new Object[0]));
+        ERROR_ALL_ADDED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.forceload.added.failure"));
+        ERROR_NONE_REMOVED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.forceload.removed.failure"));
     }
 }
diff --git a/src/net/minecraft/server/commands/FunctionCommand.java b/src/net/minecraft/server/commands/FunctionCommand.java
index 60dbacb..c27e5f1 100644
--- a/src/net/minecraft/server/commands/FunctionCommand.java
+++ b/src/net/minecraft/server/commands/FunctionCommand.java
@@ -1,7 +1,6 @@
 package net.minecraft.server.commands;
 
 import net.minecraft.server.ServerFunctionManager;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.commands.SharedSuggestionProvider;
 import java.util.concurrent.CompletableFuture;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
@@ -24,28 +23,28 @@ public class FunctionCommand {
     public static final SuggestionProvider<CommandSourceStack> SUGGEST_FUNCTION;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("function").requires(cq -> cq.hasPermission(2))).then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)FunctionArgument.functions()).suggests((SuggestionProvider)FunctionCommand.SUGGEST_FUNCTION).executes(commandContext -> runFunction((CommandSourceStack)commandContext.getSource(), FunctionArgument.getFunctions((CommandContext<CommandSourceStack>)commandContext, "name")))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("function").requires(cz -> cz.hasPermission(2))).then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)FunctionArgument.functions()).suggests((SuggestionProvider)FunctionCommand.SUGGEST_FUNCTION).executes(commandContext -> runFunction((CommandSourceStack)commandContext.getSource(), FunctionArgument.getFunctions((CommandContext<CommandSourceStack>)commandContext, "name")))));
     }
     
-    private static int runFunction(final CommandSourceStack cq, final Collection<CommandFunction> collection) {
+    private static int runFunction(final CommandSourceStack cz, final Collection<CommandFunction> collection) {
         int integer3 = 0;
-        for (final CommandFunction cn5 : collection) {
-            integer3 += cq.getServer().getFunctions().execute(cn5, cq.withSuppressedOutput().withMaximumPermission(2));
+        for (final CommandFunction cw5 : collection) {
+            integer3 += cz.getServer().getFunctions().execute(cw5, cz.withSuppressedOutput().withMaximumPermission(2));
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.function.success.single", new Object[] { integer3, collection.iterator().next().getId() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.function.success.single", new Object[] { integer3, collection.iterator().next().getId() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.function.success.multiple", new Object[] { integer3, collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.function.success.multiple", new Object[] { integer3, collection.size() }), true);
         }
         return integer3;
     }
     
     static {
         SUGGEST_FUNCTION = ((commandContext, suggestionsBuilder) -> {
-            final ServerFunctionManager sy3 = ((CommandSourceStack)commandContext.getSource()).getServer().getFunctions();
-            SharedSuggestionProvider.suggestResource(sy3.getTags().getAvailableTags(), suggestionsBuilder, "#");
-            return SharedSuggestionProvider.suggestResource(sy3.getFunctions().keySet(), suggestionsBuilder);
+            final ServerFunctionManager uu3 = ((CommandSourceStack)commandContext.getSource()).getServer().getFunctions();
+            SharedSuggestionProvider.suggestResource(uu3.getTagNames(), suggestionsBuilder, "#");
+            return SharedSuggestionProvider.suggestResource(uu3.getFunctionNames(), suggestionsBuilder);
         });
     }
 }
diff --git a/src/net/minecraft/server/commands/GameModeCommand.java b/src/net/minecraft/server/commands/GameModeCommand.java
index dc01625..68b30fc 100644
--- a/src/net/minecraft/server/commands/GameModeCommand.java
+++ b/src/net/minecraft/server/commands/GameModeCommand.java
@@ -5,6 +5,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.util.Iterator;
 import java.util.Collection;
 import com.mojang.brigadier.context.CommandContext;
+import net.minecraft.Util;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
@@ -19,34 +20,34 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class GameModeCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        final LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder2 = (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal("gamemode").requires(cq -> cq.hasPermission(2));
-        for (final GameType bjt6 : GameType.values()) {
-            if (bjt6 != GameType.NOT_SET) {
-                literalArgumentBuilder2.then(((LiteralArgumentBuilder)Commands.literal(bjt6.getName()).executes(commandContext -> setMode((CommandContext<CommandSourceStack>)commandContext, Collections.<ServerPlayer>singleton(((CommandSourceStack)commandContext.getSource()).getPlayerOrException()), bjt6))).then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> setMode((CommandContext<CommandSourceStack>)commandContext, EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "target"), bjt6))));
+        final LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder2 = (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal("gamemode").requires(cz -> cz.hasPermission(2));
+        for (final GameType bpy6 : GameType.values()) {
+            if (bpy6 != GameType.NOT_SET) {
+                literalArgumentBuilder2.then(((LiteralArgumentBuilder)Commands.literal(bpy6.getName()).executes(commandContext -> setMode((CommandContext<CommandSourceStack>)commandContext, Collections.<ServerPlayer>singleton(((CommandSourceStack)commandContext.getSource()).getPlayerOrException()), bpy6))).then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> setMode((CommandContext<CommandSourceStack>)commandContext, EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "target"), bpy6))));
             }
         }
         commandDispatcher.register((LiteralArgumentBuilder)literalArgumentBuilder2);
     }
     
-    private static void logGamemodeChange(final CommandSourceStack cq, final ServerPlayer xe, final GameType bjt) {
-        final Component lf4 = new TranslatableComponent("gameMode." + bjt.getName(), new Object[0]);
-        if (cq.getEntity() == xe) {
-            cq.sendSuccess(new TranslatableComponent("commands.gamemode.success.self", new Object[] { lf4 }), true);
+    private static void logGamemodeChange(final CommandSourceStack cz, final ServerPlayer ze, final GameType bpy) {
+        final Component mr4 = new TranslatableComponent("gameMode." + bpy.getName());
+        if (cz.getEntity() == ze) {
+            cz.sendSuccess(new TranslatableComponent("commands.gamemode.success.self", new Object[] { mr4 }), true);
         }
         else {
-            if (cq.getLevel().getGameRules().getBoolean(GameRules.RULE_SENDCOMMANDFEEDBACK)) {
-                xe.sendMessage(new TranslatableComponent("gameMode.changed", new Object[] { lf4 }));
+            if (cz.getLevel().getGameRules().getBoolean(GameRules.RULE_SENDCOMMANDFEEDBACK)) {
+                ze.sendMessage(new TranslatableComponent("gameMode.changed", new Object[] { mr4 }), Util.NIL_UUID);
             }
-            cq.sendSuccess(new TranslatableComponent("commands.gamemode.success.other", new Object[] { xe.getDisplayName(), lf4 }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.gamemode.success.other", new Object[] { ze.getDisplayName(), mr4 }), true);
         }
     }
     
-    private static int setMode(final CommandContext<CommandSourceStack> commandContext, final Collection<ServerPlayer> collection, final GameType bjt) {
+    private static int setMode(final CommandContext<CommandSourceStack> commandContext, final Collection<ServerPlayer> collection, final GameType bpy) {
         int integer4 = 0;
-        for (final ServerPlayer xe6 : collection) {
-            if (xe6.gameMode.getGameModeForPlayer() != bjt) {
-                xe6.setGameMode(bjt);
-                logGamemodeChange((CommandSourceStack)commandContext.getSource(), xe6, bjt);
+        for (final ServerPlayer ze6 : collection) {
+            if (ze6.gameMode.getGameModeForPlayer() != bpy) {
+                ze6.setGameMode(bpy);
+                logGamemodeChange((CommandSourceStack)commandContext.getSource(), ze6, bpy);
                 ++integer4;
             }
         }
diff --git a/src/net/minecraft/server/commands/GameRuleCommand.java b/src/net/minecraft/server/commands/GameRuleCommand.java
index 3fe7b79..ba0546e 100644
--- a/src/net/minecraft/server/commands/GameRuleCommand.java
+++ b/src/net/minecraft/server/commands/GameRuleCommand.java
@@ -12,27 +12,27 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class GameRuleCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        final LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder2 = (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal("gamerule").requires(cq -> cq.hasPermission(2));
+        final LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder2 = (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal("gamerule").requires(cz -> cz.hasPermission(2));
         GameRules.visitGameRuleTypes(new GameRules.GameRuleTypeVisitor() {
             @Override
-            public <T extends GameRules.Value<T>> void visit(final GameRules.Key<T> d, final GameRules.Type<T> e) {
-                literalArgumentBuilder2.then(((LiteralArgumentBuilder)Commands.literal(d.getId()).executes(commandContext -> GameRuleCommand.<GameRules.Value>queryRule((CommandSourceStack)commandContext.getSource(), (GameRules.Key<GameRules.Value>)d))).then(e.createArgument("value").executes(commandContext -> GameRuleCommand.<GameRules.Value>setRule((CommandContext<CommandSourceStack>)commandContext, (GameRules.Key<GameRules.Value>)d))));
+            public <T extends GameRules.Value<T>> void visit(final GameRules.Key<T> e, final GameRules.Type<T> f) {
+                literalArgumentBuilder2.then(((LiteralArgumentBuilder)Commands.literal(e.getId()).executes(commandContext -> GameRuleCommand.<GameRules.Value>queryRule((CommandSourceStack)commandContext.getSource(), (GameRules.Key<GameRules.Value>)e))).then(f.createArgument("value").executes(commandContext -> GameRuleCommand.<GameRules.Value>setRule((CommandContext<CommandSourceStack>)commandContext, (GameRules.Key<GameRules.Value>)e))));
             }
         });
         commandDispatcher.register((LiteralArgumentBuilder)literalArgumentBuilder2);
     }
     
-    private static <T extends GameRules.Value<T>> int setRule(final CommandContext<CommandSourceStack> commandContext, final GameRules.Key<T> d) {
-        final CommandSourceStack cq3 = (CommandSourceStack)commandContext.getSource();
-        final T f4 = cq3.getServer().getGameRules().<T>getRule(d);
-        f4.setFromArgument(commandContext, "value");
-        cq3.sendSuccess(new TranslatableComponent("commands.gamerule.set", new Object[] { d.getId(), f4.toString() }), true);
-        return f4.getCommandResult();
+    private static <T extends GameRules.Value<T>> int setRule(final CommandContext<CommandSourceStack> commandContext, final GameRules.Key<T> e) {
+        final CommandSourceStack cz3 = (CommandSourceStack)commandContext.getSource();
+        final T g4 = cz3.getServer().getGameRules().<T>getRule(e);
+        g4.setFromArgument(commandContext, "value");
+        cz3.sendSuccess(new TranslatableComponent("commands.gamerule.set", new Object[] { e.getId(), g4.toString() }), true);
+        return g4.getCommandResult();
     }
     
-    private static <T extends GameRules.Value<T>> int queryRule(final CommandSourceStack cq, final GameRules.Key<T> d) {
-        final T f3 = cq.getServer().getGameRules().<T>getRule(d);
-        cq.sendSuccess(new TranslatableComponent("commands.gamerule.query", new Object[] { d.getId(), f3.toString() }), false);
-        return f3.getCommandResult();
+    private static <T extends GameRules.Value<T>> int queryRule(final CommandSourceStack cz, final GameRules.Key<T> e) {
+        final T g3 = cz.getServer().getGameRules().<T>getRule(e);
+        cz.sendSuccess(new TranslatableComponent("commands.gamerule.query", new Object[] { e.getId(), g3.toString() }), false);
+        return g3.getCommandResult();
     }
 }
diff --git a/src/net/minecraft/server/commands/GiveCommand.java b/src/net/minecraft/server/commands/GiveCommand.java
index 4b70b08..636d8d3 100644
--- a/src/net/minecraft/server/commands/GiveCommand.java
+++ b/src/net/minecraft/server/commands/GiveCommand.java
@@ -25,41 +25,41 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class GiveCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("give").requires(cq -> cq.hasPermission(2))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(((RequiredArgumentBuilder)Commands.argument("item", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemArgument.item()).executes(commandContext -> giveItem((CommandSourceStack)commandContext.getSource(), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item"), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), 1))).then(Commands.argument("count", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(1)).executes(commandContext -> giveItem((CommandSourceStack)commandContext.getSource(), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item"), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "count")))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("give").requires(cz -> cz.hasPermission(2))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(((RequiredArgumentBuilder)Commands.argument("item", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemArgument.item()).executes(commandContext -> giveItem((CommandSourceStack)commandContext.getSource(), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item"), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), 1))).then(Commands.argument("count", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(1)).executes(commandContext -> giveItem((CommandSourceStack)commandContext.getSource(), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item"), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "count")))))));
     }
     
-    private static int giveItem(final CommandSourceStack cq, final ItemInput ek, final Collection<ServerPlayer> collection, final int integer) throws CommandSyntaxException {
-        for (final ServerPlayer xe6 : collection) {
+    private static int giveItem(final CommandSourceStack cz, final ItemInput eu, final Collection<ServerPlayer> collection, final int integer) throws CommandSyntaxException {
+        for (final ServerPlayer ze6 : collection) {
             int integer2 = integer;
             while (integer2 > 0) {
-                final int integer3 = Math.min(ek.getItem().getMaxStackSize(), integer2);
+                final int integer3 = Math.min(eu.getItem().getMaxStackSize(), integer2);
                 integer2 -= integer3;
-                final ItemStack ben9 = ek.createItemStack(integer3, false);
-                final boolean boolean10 = xe6.inventory.add(ben9);
-                if (!boolean10 || !ben9.isEmpty()) {
-                    final ItemEntity awb11 = xe6.drop(ben9, false);
-                    if (awb11 == null) {
+                final ItemStack bki9 = eu.createItemStack(integer3, false);
+                final boolean boolean10 = ze6.inventory.add(bki9);
+                if (!boolean10 || !bki9.isEmpty()) {
+                    final ItemEntity bbg11 = ze6.drop(bki9, false);
+                    if (bbg11 == null) {
                         continue;
                     }
-                    awb11.setNoPickUpDelay();
-                    awb11.setOwner(xe6.getUUID());
+                    bbg11.setNoPickUpDelay();
+                    bbg11.setOwner(ze6.getUUID());
                 }
                 else {
-                    ben9.setCount(1);
-                    final ItemEntity awb11 = xe6.drop(ben9, false);
-                    if (awb11 != null) {
-                        awb11.makeFakeItem();
+                    bki9.setCount(1);
+                    final ItemEntity bbg11 = ze6.drop(bki9, false);
+                    if (bbg11 != null) {
+                        bbg11.makeFakeItem();
                     }
-                    xe6.level.playSound(null, xe6.getX(), xe6.getY(), xe6.getZ(), SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2f, ((xe6.getRandom().nextFloat() - xe6.getRandom().nextFloat()) * 0.7f + 1.0f) * 2.0f);
-                    xe6.inventoryMenu.broadcastChanges();
+                    ze6.level.playSound(null, ze6.getX(), ze6.getY(), ze6.getZ(), SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2f, ((ze6.getRandom().nextFloat() - ze6.getRandom().nextFloat()) * 0.7f + 1.0f) * 2.0f);
+                    ze6.inventoryMenu.broadcastChanges();
                 }
             }
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.give.success.single", new Object[] { integer, ek.createItemStack(integer, false).getDisplayName(), collection.iterator().next().getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.give.success.single", new Object[] { integer, eu.createItemStack(integer, false).getDisplayName(), collection.iterator().next().getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.give.success.single", new Object[] { integer, ek.createItemStack(integer, false).getDisplayName(), collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.give.success.single", new Object[] { integer, eu.createItemStack(integer, false).getDisplayName(), collection.size() }), true);
         }
         return collection.size();
     }
diff --git a/src/net/minecraft/server/commands/HelpCommand.java b/src/net/minecraft/server/commands/HelpCommand.java
index 676b624..2f586f2 100644
--- a/src/net/minecraft/server/commands/HelpCommand.java
+++ b/src/net/minecraft/server/commands/HelpCommand.java
@@ -44,6 +44,6 @@ public class HelpCommand {
     }
     
     static {
-        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.help.failed", new Object[0]));
+        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.help.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/KickCommand.java b/src/net/minecraft/server/commands/KickCommand.java
index 6726af3..1280b8b 100644
--- a/src/net/minecraft/server/commands/KickCommand.java
+++ b/src/net/minecraft/server/commands/KickCommand.java
@@ -18,13 +18,13 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class KickCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("kick").requires(cq -> cq.hasPermission(3))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> kickPlayers((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), new TranslatableComponent("multiplayer.disconnect.kicked", new Object[0])))).then(Commands.argument("reason", (com.mojang.brigadier.arguments.ArgumentType<Object>)MessageArgument.message()).executes(commandContext -> kickPlayers((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), MessageArgument.getMessage((CommandContext<CommandSourceStack>)commandContext, "reason"))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("kick").requires(cz -> cz.hasPermission(3))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> kickPlayers((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), new TranslatableComponent("multiplayer.disconnect.kicked")))).then(Commands.argument("reason", (com.mojang.brigadier.arguments.ArgumentType<Object>)MessageArgument.message()).executes(commandContext -> kickPlayers((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), MessageArgument.getMessage((CommandContext<CommandSourceStack>)commandContext, "reason"))))));
     }
     
-    private static int kickPlayers(final CommandSourceStack cq, final Collection<ServerPlayer> collection, final Component lf) {
-        for (final ServerPlayer xe5 : collection) {
-            xe5.connection.disconnect(lf);
-            cq.sendSuccess(new TranslatableComponent("commands.kick.success", new Object[] { xe5.getDisplayName(), lf }), true);
+    private static int kickPlayers(final CommandSourceStack cz, final Collection<ServerPlayer> collection, final Component mr) {
+        for (final ServerPlayer ze5 : collection) {
+            ze5.connection.disconnect(mr);
+            cz.sendSuccess(new TranslatableComponent("commands.kick.success", new Object[] { ze5.getDisplayName(), mr }), true);
         }
         return collection.size();
     }
diff --git a/src/net/minecraft/server/commands/KillCommand.java b/src/net/minecraft/server/commands/KillCommand.java
index 798941b..1f4ef57 100644
--- a/src/net/minecraft/server/commands/KillCommand.java
+++ b/src/net/minecraft/server/commands/KillCommand.java
@@ -17,18 +17,18 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class KillCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("kill").requires(cq -> cq.hasPermission(2))).executes(commandContext -> kill((CommandSourceStack)commandContext.getSource(), ImmutableList.<Entity>of(((CommandSourceStack)commandContext.getSource()).getEntityOrException())))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).executes(commandContext -> kill((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets")))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("kill").requires(cz -> cz.hasPermission(2))).executes(commandContext -> kill((CommandSourceStack)commandContext.getSource(), ImmutableList.<Entity>of(((CommandSourceStack)commandContext.getSource()).getEntityOrException())))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).executes(commandContext -> kill((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets")))));
     }
     
-    private static int kill(final CommandSourceStack cq, final Collection<? extends Entity> collection) {
-        for (final Entity akq4 : collection) {
-            akq4.kill();
+    private static int kill(final CommandSourceStack cz, final Collection<? extends Entity> collection) {
+        for (final Entity aom4 : collection) {
+            aom4.kill();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.kill.success.single", new Object[] { ((Entity)collection.iterator().next()).getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.kill.success.single", new Object[] { ((Entity)collection.iterator().next()).getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.kill.success.multiple", new Object[] { collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.kill.success.multiple", new Object[] { collection.size() }), true);
         }
         return collection.size();
     }
diff --git a/src/net/minecraft/server/commands/ListPlayersCommand.java b/src/net/minecraft/server/commands/ListPlayersCommand.java
index 66966e7..bb5ba38 100644
--- a/src/net/minecraft/server/commands/ListPlayersCommand.java
+++ b/src/net/minecraft/server/commands/ListPlayersCommand.java
@@ -21,19 +21,19 @@ public class ListPlayersCommand {
         commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("list").executes(commandContext -> listPlayers((CommandSourceStack)commandContext.getSource()))).then(Commands.literal("uuids").executes(commandContext -> listPlayersWithUuids((CommandSourceStack)commandContext.getSource()))));
     }
     
-    private static int listPlayers(final CommandSourceStack cq) {
-        return format(cq, Player::getDisplayName);
+    private static int listPlayers(final CommandSourceStack cz) {
+        return format(cz, Player::getDisplayName);
     }
     
-    private static int listPlayersWithUuids(final CommandSourceStack cq) {
-        return format(cq, Player::getDisplayNameWithUuid);
+    private static int listPlayersWithUuids(final CommandSourceStack cz) {
+        return format(cz, Player::getDisplayNameWithUuid);
     }
     
-    private static int format(final CommandSourceStack cq, final Function<ServerPlayer, Component> function) {
-        final PlayerList zo3 = cq.getServer().getPlayerList();
-        final List<ServerPlayer> list4 = zo3.getPlayers();
-        final Component lf5 = ComponentUtils.<ServerPlayer>formatList(list4, function);
-        cq.sendSuccess(new TranslatableComponent("commands.list.players", new Object[] { list4.size(), zo3.getMaxPlayers(), lf5 }), false);
+    private static int format(final CommandSourceStack cz, final Function<ServerPlayer, Component> function) {
+        final PlayerList abp3 = cz.getServer().getPlayerList();
+        final List<ServerPlayer> list4 = abp3.getPlayers();
+        final Component mr5 = ComponentUtils.<ServerPlayer>formatList(list4, function);
+        cz.sendSuccess(new TranslatableComponent("commands.list.players", new Object[] { list4.size(), abp3.getMaxPlayers(), mr5 }), false);
         return list4.size();
     }
 }
diff --git a/src/net/minecraft/server/commands/LocateBiomeCommand.java b/src/net/minecraft/server/commands/LocateBiomeCommand.java
new file mode 100644
index 0000000..96e09dd
--- /dev/null
+++ b/src/net/minecraft/server/commands/LocateBiomeCommand.java
@@ -0,0 +1,52 @@
+package net.minecraft.server.commands;
+
+import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.brigadier.Message;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.resources.ResourceLocation;
+import com.mojang.brigadier.suggestion.SuggestionProvider;
+import net.minecraft.commands.synchronization.SuggestionProviders;
+import com.mojang.brigadier.arguments.ArgumentType;
+import net.minecraft.commands.arguments.ResourceLocationArgument;
+import net.minecraft.commands.Commands;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import net.minecraft.commands.CommandSourceStack;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
+
+public class LocateBiomeCommand {
+    public static final DynamicCommandExceptionType ERROR_INVALID_BIOME;
+    private static final DynamicCommandExceptionType ERROR_BIOME_NOT_FOUND;
+    
+    public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("locatebiome").requires(cz -> cz.hasPermission(2))).then(Commands.argument("biome", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)SuggestionProviders.AVAILABLE_BIOMES).executes(commandContext -> locateBiome((CommandSourceStack)commandContext.getSource(), (ResourceLocation)commandContext.getArgument("biome", (Class)ResourceLocation.class)))));
+    }
+    
+    private static int locateBiome(final CommandSourceStack cz, final ResourceLocation uh) throws CommandSyntaxException {
+        final Biome bre3 = Registry.BIOME.getOptional(uh).<Throwable>orElseThrow(() -> LocateBiomeCommand.ERROR_INVALID_BIOME.create(uh));
+        final BlockPos fu4 = new BlockPos(cz.getPosition());
+        final BlockPos fu5 = cz.getLevel().findNearestBiome(bre3, fu4, 6400, 8);
+        final String string6 = uh.toString();
+        if (fu5 == null) {
+            throw LocateBiomeCommand.ERROR_BIOME_NOT_FOUND.create(string6);
+        }
+        return LocateCommand.showLocateResult(cz, string6, fu4, fu5, "commands.locatebiome.success");
+    }
+    
+    static {
+        final TranslatableComponent translatableComponent;
+        ERROR_INVALID_BIOME = new DynamicCommandExceptionType(object -> {
+            new TranslatableComponent("commands.locatebiome.invalid", new Object[] { object });
+            return translatableComponent;
+        });
+        final TranslatableComponent translatableComponent2;
+        ERROR_BIOME_NOT_FOUND = new DynamicCommandExceptionType(object -> {
+            new TranslatableComponent("commands.locatebiome.notFound", new Object[] { object });
+            return translatableComponent2;
+        });
+    }
+}
diff --git a/src/net/minecraft/server/commands/LocateCommand.java b/src/net/minecraft/server/commands/LocateCommand.java
index 89520c6..c8ab7b0 100644
--- a/src/net/minecraft/server/commands/LocateCommand.java
+++ b/src/net/minecraft/server/commands/LocateCommand.java
@@ -3,8 +3,6 @@ package net.minecraft.server.commands;
 import com.mojang.brigadier.Message;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.network.chat.Style;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.core.Vec3i;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.ChatFormatting;
@@ -12,7 +10,11 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentUtils;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.core.BlockPos;
+import java.util.Iterator;
+import java.util.Map;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.commands.Commands;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.commands.CommandSourceStack;
@@ -23,31 +25,37 @@ public class LocateCommand {
     private static final SimpleCommandExceptionType ERROR_FAILED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("locate").requires(cq -> cq.hasPermission(2))).then(Commands.literal("Pillager_Outpost").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Pillager_Outpost")))).then(Commands.literal("Mineshaft").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Mineshaft")))).then(Commands.literal("Mansion").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Mansion")))).then(Commands.literal("Igloo").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Igloo")))).then(Commands.literal("Desert_Pyramid").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Desert_Pyramid")))).then(Commands.literal("Jungle_Pyramid").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Jungle_Pyramid")))).then(Commands.literal("Swamp_Hut").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Swamp_Hut")))).then(Commands.literal("Stronghold").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Stronghold")))).then(Commands.literal("Monument").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Monument")))).then(Commands.literal("Fortress").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Fortress")))).then(Commands.literal("EndCity").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "EndCity")))).then(Commands.literal("Ocean_Ruin").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Ocean_Ruin")))).then(Commands.literal("Buried_Treasure").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Buried_Treasure")))).then(Commands.literal("Shipwreck").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Shipwreck")))).then(Commands.literal("Village").executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), "Village"))));
+        LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder2 = (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal("locate").requires(cz -> cz.hasPermission(2));
+        for (final Map.Entry<String, StructureFeature<?>> entry4 : StructureFeature.STRUCTURES_REGISTRY.entrySet()) {
+            literalArgumentBuilder2 = (LiteralArgumentBuilder<CommandSourceStack>)literalArgumentBuilder2.then(Commands.literal(entry4.getKey()).executes(commandContext -> locate((CommandSourceStack)commandContext.getSource(), entry4.getValue())));
+        }
+        commandDispatcher.register((LiteralArgumentBuilder)literalArgumentBuilder2);
     }
     
-    private static int locate(final CommandSourceStack cq, final String string) throws CommandSyntaxException {
-        final BlockPos fk3 = new BlockPos(cq.getPosition());
-        final BlockPos fk4 = cq.getLevel().findNearestMapFeature(string, fk3, 100, false);
-        if (fk4 == null) {
+    private static int locate(final CommandSourceStack cz, final StructureFeature<?> cml) throws CommandSyntaxException {
+        final BlockPos fu3 = new BlockPos(cz.getPosition());
+        final BlockPos fu4 = cz.getLevel().findNearestMapFeature(cml, fu3, 100, false);
+        if (fu4 == null) {
             throw LocateCommand.ERROR_FAILED.create();
         }
-        final int integer5 = Mth.floor(dist(fk3.getX(), fk3.getZ(), fk4.getX(), fk4.getZ()));
-        final ClickEvent clickEvent;
-        final Vec3i vec3i;
+        return showLocateResult(cz, cml.getFeatureName(), fu3, fu4, "commands.locate.success");
+    }
+    
+    public static int showLocateResult(final CommandSourceStack cz, final String string2, final BlockPos fu3, final BlockPos fu4, final String string5) {
+        final int integer6 = Mth.floor(dist(fu3.getX(), fu3.getZ(), fu4.getX(), fu4.getZ()));
+        final ClickEvent mp;
         final Object o;
-        final HoverEvent hoverEvent;
-        final Object o2;
-        final Component lf6 = ComponentUtils.wrapInSquareBrackets(new TranslatableComponent("chat.coordinates", new Object[] { fk4.getX(), "~", fk4.getZ() })).withStyle(ln -> {
-            ln.setColor(ChatFormatting.GREEN);
-            new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/tp @s " + vec3i.getX() + " ~ " + vec3i.getZ());
-            ((Style)o).setClickEvent(clickEvent);
-            new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TranslatableComponent("chat.coordinates.tooltip", new Object[0]));
-            ((Style)o2).setHoverEvent(hoverEvent);
-            return;
+        final HoverEvent mv;
+        final Style style;
+        final Component mr7 = ComponentUtils.wrapInSquareBrackets(new TranslatableComponent("chat.coordinates", new Object[] { fu4.getX(), "~", fu4.getZ() })).withStyle(nb -> {
+            nb.withColor(ChatFormatting.GREEN);
+            new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/tp @s " + fu4.getX() + " ~ " + fu4.getZ());
+            ((Style)o).withClickEvent(mp);
+            new HoverEvent((HoverEvent.Action<TranslatableComponent>)HoverEvent.Action.SHOW_TEXT, new TranslatableComponent("chat.coordinates.tooltip"));
+            return style.withHoverEvent(mv);
         });
-        cq.sendSuccess(new TranslatableComponent("commands.locate.success", new Object[] { string, lf6, integer5 }), false);
-        return integer5;
+        cz.sendSuccess(new TranslatableComponent(string5, new Object[] { string2, mr7, integer6 }), false);
+        return integer6;
     }
     
     private static float dist(final int integer1, final int integer2, final int integer3, final int integer4) {
@@ -57,6 +65,6 @@ public class LocateCommand {
     }
     
     static {
-        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.locate.failed", new Object[0]));
+        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.locate.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/LootCommand.java b/src/net/minecraft/server/commands/LootCommand.java
index 76e9dba..4a62ad7 100644
--- a/src/net/minecraft/server/commands/LootCommand.java
+++ b/src/net/minecraft/server/commands/LootCommand.java
@@ -57,49 +57,49 @@ public class LootCommand {
     private static final DynamicCommandExceptionType ERROR_NO_LOOT_TABLE;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)LootCommand.<LiteralArgumentBuilder>addTargets((LiteralArgumentBuilder)Commands.literal("loot").requires(cq -> cq.hasPermission(2)), (argumentBuilder, b) -> argumentBuilder.then(Commands.literal("fish").then(Commands.argument("loot_table", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)LootCommand.SUGGEST_LOOT_TABLE).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).executes(commandContext -> dropFishingLoot((CommandContext<CommandSourceStack>)commandContext, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "loot_table"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), ItemStack.EMPTY, b))).then(Commands.argument("tool", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemArgument.item()).executes(commandContext -> dropFishingLoot((CommandContext<CommandSourceStack>)commandContext, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "loot_table"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "tool").createItemStack(1, false), b)))).then(Commands.literal("mainhand").executes(commandContext -> dropFishingLoot((CommandContext<CommandSourceStack>)commandContext, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "loot_table"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), getSourceHandItem((CommandSourceStack)commandContext.getSource(), EquipmentSlot.MAINHAND), b)))).then(Commands.literal("offhand").executes(commandContext -> dropFishingLoot((CommandContext<CommandSourceStack>)commandContext, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "loot_table"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), getSourceHandItem((CommandSourceStack)commandContext.getSource(), EquipmentSlot.OFFHAND), b)))))).then(Commands.literal("loot").then(Commands.argument("loot_table", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)LootCommand.SUGGEST_LOOT_TABLE).executes(commandContext -> dropChestLoot((CommandContext<CommandSourceStack>)commandContext, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "loot_table"), b)))).then(Commands.literal("kill").then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).executes(commandContext -> dropKillLoot((CommandContext<CommandSourceStack>)commandContext, EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), b)))).then(Commands.literal("mine").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).executes(commandContext -> dropBlockLoot((CommandContext<CommandSourceStack>)commandContext, BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), ItemStack.EMPTY, b))).then(Commands.argument("tool", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemArgument.item()).executes(commandContext -> dropBlockLoot((CommandContext<CommandSourceStack>)commandContext, BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "tool").createItemStack(1, false), b)))).then(Commands.literal("mainhand").executes(commandContext -> dropBlockLoot((CommandContext<CommandSourceStack>)commandContext, BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), getSourceHandItem((CommandSourceStack)commandContext.getSource(), EquipmentSlot.MAINHAND), b)))).then(Commands.literal("offhand").executes(commandContext -> dropBlockLoot((CommandContext<CommandSourceStack>)commandContext, BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), getSourceHandItem((CommandSourceStack)commandContext.getSource(), EquipmentSlot.OFFHAND), b)))))));
+        commandDispatcher.register((LiteralArgumentBuilder)LootCommand.<LiteralArgumentBuilder>addTargets((LiteralArgumentBuilder)Commands.literal("loot").requires(cz -> cz.hasPermission(2)), (argumentBuilder, b) -> argumentBuilder.then(Commands.literal("fish").then(Commands.argument("loot_table", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)LootCommand.SUGGEST_LOOT_TABLE).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).executes(commandContext -> dropFishingLoot((CommandContext<CommandSourceStack>)commandContext, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "loot_table"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), ItemStack.EMPTY, b))).then(Commands.argument("tool", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemArgument.item()).executes(commandContext -> dropFishingLoot((CommandContext<CommandSourceStack>)commandContext, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "loot_table"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "tool").createItemStack(1, false), b)))).then(Commands.literal("mainhand").executes(commandContext -> dropFishingLoot((CommandContext<CommandSourceStack>)commandContext, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "loot_table"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), getSourceHandItem((CommandSourceStack)commandContext.getSource(), EquipmentSlot.MAINHAND), b)))).then(Commands.literal("offhand").executes(commandContext -> dropFishingLoot((CommandContext<CommandSourceStack>)commandContext, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "loot_table"), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), getSourceHandItem((CommandSourceStack)commandContext.getSource(), EquipmentSlot.OFFHAND), b)))))).then(Commands.literal("loot").then(Commands.argument("loot_table", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)LootCommand.SUGGEST_LOOT_TABLE).executes(commandContext -> dropChestLoot((CommandContext<CommandSourceStack>)commandContext, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "loot_table"), b)))).then(Commands.literal("kill").then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).executes(commandContext -> dropKillLoot((CommandContext<CommandSourceStack>)commandContext, EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), b)))).then(Commands.literal("mine").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).executes(commandContext -> dropBlockLoot((CommandContext<CommandSourceStack>)commandContext, BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), ItemStack.EMPTY, b))).then(Commands.argument("tool", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemArgument.item()).executes(commandContext -> dropBlockLoot((CommandContext<CommandSourceStack>)commandContext, BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "tool").createItemStack(1, false), b)))).then(Commands.literal("mainhand").executes(commandContext -> dropBlockLoot((CommandContext<CommandSourceStack>)commandContext, BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), getSourceHandItem((CommandSourceStack)commandContext.getSource(), EquipmentSlot.MAINHAND), b)))).then(Commands.literal("offhand").executes(commandContext -> dropBlockLoot((CommandContext<CommandSourceStack>)commandContext, BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), getSourceHandItem((CommandSourceStack)commandContext.getSource(), EquipmentSlot.OFFHAND), b)))))));
     }
     
     private static <T extends ArgumentBuilder<CommandSourceStack, T>> T addTargets(final T argumentBuilder, final TailProvider c) {
         return (T)argumentBuilder.then(((LiteralArgumentBuilder)Commands.literal("replace").then(Commands.literal("entity").then(Commands.argument("entities", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(c.construct(Commands.argument("slot", (com.mojang.brigadier.arguments.ArgumentType<Object>)SlotArgument.slot()), (commandContext, list, a) -> entityReplace(EntityArgument.getEntities(commandContext, "entities"), SlotArgument.getSlot(commandContext, "slot"), list.size(), list, a)).then((ArgumentBuilder)c.construct(Commands.argument("count", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)), (commandContext, list, a) -> entityReplace(EntityArgument.getEntities(commandContext, "entities"), SlotArgument.getSlot(commandContext, "slot"), IntegerArgumentType.getInteger((CommandContext)commandContext, "count"), list, a))))))).then(Commands.literal("block").then(Commands.argument("targetPos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(c.construct(Commands.argument("slot", (com.mojang.brigadier.arguments.ArgumentType<Object>)SlotArgument.slot()), (commandContext, list, a) -> blockReplace((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos(commandContext, "targetPos"), SlotArgument.getSlot(commandContext, "slot"), list.size(), list, a)).then((ArgumentBuilder)c.construct(Commands.argument("count", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)), (commandContext, list, a) -> blockReplace((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos(commandContext, "targetPos"), IntegerArgumentType.getInteger((CommandContext)commandContext, "slot"), IntegerArgumentType.getInteger((CommandContext)commandContext, "count"), list, a))))))).then(Commands.literal("insert").then((ArgumentBuilder)c.construct(Commands.argument("targetPos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()), (commandContext, list, a) -> blockDistribute((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos(commandContext, "targetPos"), list, a)))).then(Commands.literal("give").then((ArgumentBuilder)c.construct(Commands.argument("players", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()), (commandContext, list, a) -> playerGive(EntityArgument.getPlayers(commandContext, "players"), list, a)))).then(Commands.literal("spawn").then((ArgumentBuilder)c.construct(Commands.argument("targetPos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()), (commandContext, list, a) -> dropInWorld((CommandSourceStack)commandContext.getSource(), Vec3Argument.getVec3(commandContext, "targetPos"), list, a))));
     }
     
-    private static Container getContainer(final CommandSourceStack cq, final BlockPos fk) throws CommandSyntaxException {
-        final BlockEntity bwl3 = cq.getLevel().getBlockEntity(fk);
-        if (!(bwl3 instanceof Container)) {
+    private static Container getContainer(final CommandSourceStack cz, final BlockPos fu) throws CommandSyntaxException {
+        final BlockEntity cdl3 = cz.getLevel().getBlockEntity(fu);
+        if (!(cdl3 instanceof Container)) {
             throw ReplaceItemCommand.ERROR_NOT_A_CONTAINER.create();
         }
-        return (Container)bwl3;
+        return (Container)cdl3;
     }
     
-    private static int blockDistribute(final CommandSourceStack cq, final BlockPos fk, final List<ItemStack> list, final Callback a) throws CommandSyntaxException {
-        final Container aje5 = getContainer(cq, fk);
+    private static int blockDistribute(final CommandSourceStack cz, final BlockPos fu, final List<ItemStack> list, final Callback a) throws CommandSyntaxException {
+        final Container amz5 = getContainer(cz, fu);
         final List<ItemStack> list2 = Lists.newArrayListWithCapacity(list.size());
-        for (final ItemStack ben8 : list) {
-            if (distributeToContainer(aje5, ben8.copy())) {
-                aje5.setChanged();
-                list2.add(ben8);
+        for (final ItemStack bki8 : list) {
+            if (distributeToContainer(amz5, bki8.copy())) {
+                amz5.setChanged();
+                list2.add(bki8);
             }
         }
         a.accept(list2);
         return list2.size();
     }
     
-    private static boolean distributeToContainer(final Container aje, final ItemStack ben) {
+    private static boolean distributeToContainer(final Container amz, final ItemStack bki) {
         boolean boolean3 = false;
-        for (int integer4 = 0; integer4 < aje.getContainerSize() && !ben.isEmpty(); ++integer4) {
-            final ItemStack ben2 = aje.getItem(integer4);
-            if (aje.canPlaceItem(integer4, ben)) {
-                if (ben2.isEmpty()) {
-                    aje.setItem(integer4, ben);
+        for (int integer4 = 0; integer4 < amz.getContainerSize() && !bki.isEmpty(); ++integer4) {
+            final ItemStack bki2 = amz.getItem(integer4);
+            if (amz.canPlaceItem(integer4, bki)) {
+                if (bki2.isEmpty()) {
+                    amz.setItem(integer4, bki);
                     boolean3 = true;
                     break;
                 }
-                if (canMergeItems(ben2, ben)) {
-                    final int integer5 = ben.getMaxStackSize() - ben2.getCount();
-                    final int integer6 = Math.min(ben.getCount(), integer5);
-                    ben.shrink(integer6);
-                    ben2.grow(integer6);
+                if (canMergeItems(bki2, bki)) {
+                    final int integer5 = bki.getMaxStackSize() - bki2.getCount();
+                    final int integer6 = Math.min(bki.getCount(), integer5);
+                    bki.shrink(integer6);
+                    bki2.grow(integer6);
                     boolean3 = true;
                 }
             }
@@ -107,35 +107,35 @@ public class LootCommand {
         return boolean3;
     }
     
-    private static int blockReplace(final CommandSourceStack cq, final BlockPos fk, final int integer3, final int integer4, final List<ItemStack> list, final Callback a) throws CommandSyntaxException {
-        final Container aje7 = getContainer(cq, fk);
-        final int integer5 = aje7.getContainerSize();
+    private static int blockReplace(final CommandSourceStack cz, final BlockPos fu, final int integer3, final int integer4, final List<ItemStack> list, final Callback a) throws CommandSyntaxException {
+        final Container amz7 = getContainer(cz, fu);
+        final int integer5 = amz7.getContainerSize();
         if (integer3 < 0 || integer3 >= integer5) {
             throw ReplaceItemCommand.ERROR_INAPPLICABLE_SLOT.create(integer3);
         }
         final List<ItemStack> list2 = Lists.newArrayListWithCapacity(list.size());
         for (int integer6 = 0; integer6 < integer4; ++integer6) {
             final int integer7 = integer3 + integer6;
-            final ItemStack ben12 = (integer6 < list.size()) ? list.get(integer6) : ItemStack.EMPTY;
-            if (aje7.canPlaceItem(integer7, ben12)) {
-                aje7.setItem(integer7, ben12);
-                list2.add(ben12);
+            final ItemStack bki12 = (integer6 < list.size()) ? list.get(integer6) : ItemStack.EMPTY;
+            if (amz7.canPlaceItem(integer7, bki12)) {
+                amz7.setItem(integer7, bki12);
+                list2.add(bki12);
             }
         }
         a.accept(list2);
         return list2.size();
     }
     
-    private static boolean canMergeItems(final ItemStack ben1, final ItemStack ben2) {
-        return ben1.getItem() == ben2.getItem() && ben1.getDamageValue() == ben2.getDamageValue() && ben1.getCount() <= ben1.getMaxStackSize() && Objects.equals(ben1.getTag(), ben2.getTag());
+    private static boolean canMergeItems(final ItemStack bki1, final ItemStack bki2) {
+        return bki1.getItem() == bki2.getItem() && bki1.getDamageValue() == bki2.getDamageValue() && bki1.getCount() <= bki1.getMaxStackSize() && Objects.equals(bki1.getTag(), bki2.getTag());
     }
     
     private static int playerGive(final Collection<ServerPlayer> collection, final List<ItemStack> list, final Callback a) throws CommandSyntaxException {
         final List<ItemStack> list2 = Lists.newArrayListWithCapacity(list.size());
-        for (final ItemStack ben6 : list) {
-            for (final ServerPlayer xe8 : collection) {
-                if (xe8.inventory.add(ben6.copy())) {
-                    list2.add(ben6);
+        for (final ItemStack bki6 : list) {
+            for (final ServerPlayer ze8 : collection) {
+                if (ze8.inventory.add(bki6.copy())) {
+                    list2.add(bki6);
                 }
             }
         }
@@ -143,128 +143,128 @@ public class LootCommand {
         return list2.size();
     }
     
-    private static void setSlots(final Entity akq, final List<ItemStack> list2, final int integer3, final int integer4, final List<ItemStack> list5) {
+    private static void setSlots(final Entity aom, final List<ItemStack> list2, final int integer3, final int integer4, final List<ItemStack> list5) {
         for (int integer5 = 0; integer5 < integer4; ++integer5) {
-            final ItemStack ben7 = (integer5 < list2.size()) ? list2.get(integer5) : ItemStack.EMPTY;
-            if (akq.setSlot(integer3 + integer5, ben7.copy())) {
-                list5.add(ben7);
+            final ItemStack bki7 = (integer5 < list2.size()) ? list2.get(integer5) : ItemStack.EMPTY;
+            if (aom.setSlot(integer3 + integer5, bki7.copy())) {
+                list5.add(bki7);
             }
         }
     }
     
     private static int entityReplace(final Collection<? extends Entity> collection, final int integer2, final int integer3, final List<ItemStack> list, final Callback a) throws CommandSyntaxException {
         final List<ItemStack> list2 = Lists.newArrayListWithCapacity(list.size());
-        for (final Entity akq8 : collection) {
-            if (akq8 instanceof ServerPlayer) {
-                final ServerPlayer xe9 = (ServerPlayer)akq8;
-                xe9.inventoryMenu.broadcastChanges();
-                setSlots(akq8, list, integer2, integer3, list2);
-                xe9.inventoryMenu.broadcastChanges();
+        for (final Entity aom8 : collection) {
+            if (aom8 instanceof ServerPlayer) {
+                final ServerPlayer ze9 = (ServerPlayer)aom8;
+                ze9.inventoryMenu.broadcastChanges();
+                setSlots(aom8, list, integer2, integer3, list2);
+                ze9.inventoryMenu.broadcastChanges();
             }
             else {
-                setSlots(akq8, list, integer2, integer3, list2);
+                setSlots(aom8, list, integer2, integer3, list2);
             }
         }
         a.accept(list2);
         return list2.size();
     }
     
-    private static int dropInWorld(final CommandSourceStack cq, final Vec3 cvl, final List<ItemStack> list, final Callback a) throws CommandSyntaxException {
-        final ServerLevel xd5 = cq.getLevel();
-        final ServerLevel bjw;
-        final ItemEntity awb4;
-        list.forEach(ben -> {
-            awb4 = new ItemEntity(bjw, cvl.x, cvl.y, cvl.z, ben.copy());
-            awb4.setDefaultPickUpDelay();
-            bjw.addFreshEntity(awb4);
+    private static int dropInWorld(final CommandSourceStack cz, final Vec3 dem, final List<ItemStack> list, final Callback a) throws CommandSyntaxException {
+        final ServerLevel zd5 = cz.getLevel();
+        final ServerLevel bqb;
+        final ItemEntity bbg4;
+        list.forEach(bki -> {
+            bbg4 = new ItemEntity(bqb, dem.x, dem.y, dem.z, bki.copy());
+            bbg4.setDefaultPickUpDelay();
+            bqb.addFreshEntity(bbg4);
             return;
         });
         a.accept(list);
         return list.size();
     }
     
-    private static void callback(final CommandSourceStack cq, final List<ItemStack> list) {
+    private static void callback(final CommandSourceStack cz, final List<ItemStack> list) {
         if (list.size() == 1) {
-            final ItemStack ben3 = list.get(0);
-            cq.sendSuccess(new TranslatableComponent("commands.drop.success.single", new Object[] { ben3.getCount(), ben3.getDisplayName() }), false);
+            final ItemStack bki3 = list.get(0);
+            cz.sendSuccess(new TranslatableComponent("commands.drop.success.single", new Object[] { bki3.getCount(), bki3.getDisplayName() }), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.drop.success.multiple", new Object[] { list.size() }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.drop.success.multiple", new Object[] { list.size() }), false);
         }
     }
     
-    private static void callback(final CommandSourceStack cq, final List<ItemStack> list, final ResourceLocation sm) {
+    private static void callback(final CommandSourceStack cz, final List<ItemStack> list, final ResourceLocation uh) {
         if (list.size() == 1) {
-            final ItemStack ben4 = list.get(0);
-            cq.sendSuccess(new TranslatableComponent("commands.drop.success.single_with_table", new Object[] { ben4.getCount(), ben4.getDisplayName(), sm }), false);
+            final ItemStack bki4 = list.get(0);
+            cz.sendSuccess(new TranslatableComponent("commands.drop.success.single_with_table", new Object[] { bki4.getCount(), bki4.getDisplayName(), uh }), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.drop.success.multiple_with_table", new Object[] { list.size(), sm }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.drop.success.multiple_with_table", new Object[] { list.size(), uh }), false);
         }
     }
     
-    private static ItemStack getSourceHandItem(final CommandSourceStack cq, final EquipmentSlot akv) throws CommandSyntaxException {
-        final Entity akq3 = cq.getEntityOrException();
-        if (akq3 instanceof LivingEntity) {
-            return ((LivingEntity)akq3).getItemBySlot(akv);
+    private static ItemStack getSourceHandItem(final CommandSourceStack cz, final EquipmentSlot aor) throws CommandSyntaxException {
+        final Entity aom3 = cz.getEntityOrException();
+        if (aom3 instanceof LivingEntity) {
+            return ((LivingEntity)aom3).getItemBySlot(aor);
         }
-        throw LootCommand.ERROR_NO_HELD_ITEMS.create(akq3.getDisplayName());
+        throw LootCommand.ERROR_NO_HELD_ITEMS.create(aom3.getDisplayName());
     }
     
-    private static int dropBlockLoot(final CommandContext<CommandSourceStack> commandContext, final BlockPos fk, final ItemStack ben, final DropConsumer b) throws CommandSyntaxException {
-        final CommandSourceStack cq5 = (CommandSourceStack)commandContext.getSource();
-        final ServerLevel xd6 = cq5.getLevel();
-        final BlockState byj7 = xd6.getBlockState(fk);
-        final BlockEntity bwl8 = xd6.getBlockEntity(fk);
-        final LootContext.Builder a9 = new LootContext.Builder(xd6).<BlockPos>withParameter(LootContextParams.BLOCK_POS, fk).<BlockState>withParameter(LootContextParams.BLOCK_STATE, byj7).<BlockEntity>withOptionalParameter(LootContextParams.BLOCK_ENTITY, bwl8).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, cq5.getEntity()).<ItemStack>withParameter(LootContextParams.TOOL, ben);
-        final List<ItemStack> list2 = byj7.getDrops(a9);
-        return b.accept(commandContext, list2, list -> callback(cq5, list, byj7.getBlock().getLootTable()));
+    private static int dropBlockLoot(final CommandContext<CommandSourceStack> commandContext, final BlockPos fu, final ItemStack bki, final DropConsumer b) throws CommandSyntaxException {
+        final CommandSourceStack cz5 = (CommandSourceStack)commandContext.getSource();
+        final ServerLevel zd6 = cz5.getLevel();
+        final BlockState cfj7 = zd6.getBlockState(fu);
+        final BlockEntity cdl8 = zd6.getBlockEntity(fu);
+        final LootContext.Builder a9 = new LootContext.Builder(zd6).<BlockPos>withParameter(LootContextParams.BLOCK_POS, fu).<BlockState>withParameter(LootContextParams.BLOCK_STATE, cfj7).<BlockEntity>withOptionalParameter(LootContextParams.BLOCK_ENTITY, cdl8).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, cz5.getEntity()).<ItemStack>withParameter(LootContextParams.TOOL, bki);
+        final List<ItemStack> list2 = cfj7.getDrops(a9);
+        return b.accept(commandContext, list2, list -> callback(cz5, list, cfj7.getBlock().getLootTable()));
     }
     
-    private static int dropKillLoot(final CommandContext<CommandSourceStack> commandContext, final Entity akq, final DropConsumer b) throws CommandSyntaxException {
-        if (!(akq instanceof LivingEntity)) {
-            throw LootCommand.ERROR_NO_LOOT_TABLE.create(akq.getDisplayName());
+    private static int dropKillLoot(final CommandContext<CommandSourceStack> commandContext, final Entity aom, final DropConsumer b) throws CommandSyntaxException {
+        if (!(aom instanceof LivingEntity)) {
+            throw LootCommand.ERROR_NO_LOOT_TABLE.create(aom.getDisplayName());
         }
-        final ResourceLocation sm4 = ((LivingEntity)akq).getLootTable();
-        final CommandSourceStack cq5 = (CommandSourceStack)commandContext.getSource();
-        final LootContext.Builder a6 = new LootContext.Builder(cq5.getLevel());
-        final Entity akq2 = cq5.getEntity();
-        if (akq2 instanceof Player) {
-            a6.<Player>withParameter(LootContextParams.LAST_DAMAGE_PLAYER, (Player)akq2);
+        final ResourceLocation uh4 = ((LivingEntity)aom).getLootTable();
+        final CommandSourceStack cz5 = (CommandSourceStack)commandContext.getSource();
+        final LootContext.Builder a6 = new LootContext.Builder(cz5.getLevel());
+        final Entity aom2 = cz5.getEntity();
+        if (aom2 instanceof Player) {
+            a6.<Player>withParameter(LootContextParams.LAST_DAMAGE_PLAYER, (Player)aom2);
         }
         a6.<DamageSource>withParameter(LootContextParams.DAMAGE_SOURCE, DamageSource.MAGIC);
-        a6.<Entity>withOptionalParameter(LootContextParams.DIRECT_KILLER_ENTITY, akq2);
-        a6.<Entity>withOptionalParameter(LootContextParams.KILLER_ENTITY, akq2);
-        a6.<Entity>withParameter(LootContextParams.THIS_ENTITY, akq);
-        a6.<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(cq5.getPosition()));
-        final LootTable csa8 = cq5.getServer().getLootTables().get(sm4);
-        final List<ItemStack> list2 = csa8.getRandomItems(a6.create(LootContextParamSets.ENTITY));
-        return b.accept(commandContext, list2, list -> callback(cq5, list, sm4));
+        a6.<Entity>withOptionalParameter(LootContextParams.DIRECT_KILLER_ENTITY, aom2);
+        a6.<Entity>withOptionalParameter(LootContextParams.KILLER_ENTITY, aom2);
+        a6.<Entity>withParameter(LootContextParams.THIS_ENTITY, aom);
+        a6.<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(cz5.getPosition()));
+        final LootTable daw8 = cz5.getServer().getLootTables().get(uh4);
+        final List<ItemStack> list2 = daw8.getRandomItems(a6.create(LootContextParamSets.ENTITY));
+        return b.accept(commandContext, list2, list -> callback(cz5, list, uh4));
     }
     
-    private static int dropChestLoot(final CommandContext<CommandSourceStack> commandContext, final ResourceLocation sm, final DropConsumer b) throws CommandSyntaxException {
-        final CommandSourceStack cq4 = (CommandSourceStack)commandContext.getSource();
-        final LootContext.Builder a5 = new LootContext.Builder(cq4.getLevel()).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, cq4.getEntity()).<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(cq4.getPosition()));
-        return drop(commandContext, sm, a5.create(LootContextParamSets.CHEST), b);
+    private static int dropChestLoot(final CommandContext<CommandSourceStack> commandContext, final ResourceLocation uh, final DropConsumer b) throws CommandSyntaxException {
+        final CommandSourceStack cz4 = (CommandSourceStack)commandContext.getSource();
+        final LootContext.Builder a5 = new LootContext.Builder(cz4.getLevel()).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, cz4.getEntity()).<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(cz4.getPosition()));
+        return drop(commandContext, uh, a5.create(LootContextParamSets.CHEST), b);
     }
     
-    private static int dropFishingLoot(final CommandContext<CommandSourceStack> commandContext, final ResourceLocation sm, final BlockPos fk, final ItemStack ben, final DropConsumer b) throws CommandSyntaxException {
-        final CommandSourceStack cq6 = (CommandSourceStack)commandContext.getSource();
-        final LootContext crx7 = new LootContext.Builder(cq6.getLevel()).<BlockPos>withParameter(LootContextParams.BLOCK_POS, fk).<ItemStack>withParameter(LootContextParams.TOOL, ben).create(LootContextParamSets.FISHING);
-        return drop(commandContext, sm, crx7, b);
+    private static int dropFishingLoot(final CommandContext<CommandSourceStack> commandContext, final ResourceLocation uh, final BlockPos fu, final ItemStack bki, final DropConsumer b) throws CommandSyntaxException {
+        final CommandSourceStack cz6 = (CommandSourceStack)commandContext.getSource();
+        final LootContext dat7 = new LootContext.Builder(cz6.getLevel()).<BlockPos>withParameter(LootContextParams.BLOCK_POS, fu).<ItemStack>withParameter(LootContextParams.TOOL, bki).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, cz6.getEntity()).create(LootContextParamSets.FISHING);
+        return drop(commandContext, uh, dat7, b);
     }
     
-    private static int drop(final CommandContext<CommandSourceStack> commandContext, final ResourceLocation sm, final LootContext crx, final DropConsumer b) throws CommandSyntaxException {
-        final CommandSourceStack cq5 = (CommandSourceStack)commandContext.getSource();
-        final LootTable csa6 = cq5.getServer().getLootTables().get(sm);
-        final List<ItemStack> list2 = csa6.getRandomItems(crx);
-        return b.accept(commandContext, list2, list -> callback(cq5, list));
+    private static int drop(final CommandContext<CommandSourceStack> commandContext, final ResourceLocation uh, final LootContext dat, final DropConsumer b) throws CommandSyntaxException {
+        final CommandSourceStack cz5 = (CommandSourceStack)commandContext.getSource();
+        final LootTable daw6 = cz5.getServer().getLootTables().get(uh);
+        final List<ItemStack> list2 = daw6.getRandomItems(dat);
+        return b.accept(commandContext, list2, list -> callback(cz5, list));
     }
     
     static {
         SUGGEST_LOOT_TABLE = ((commandContext, suggestionsBuilder) -> {
-            final LootTables csb3 = ((CommandSourceStack)commandContext.getSource()).getServer().getLootTables();
-            return SharedSuggestionProvider.suggestResource(csb3.getIds(), suggestionsBuilder);
+            final LootTables dax3 = ((CommandSourceStack)commandContext.getSource()).getServer().getLootTables();
+            return SharedSuggestionProvider.suggestResource(dax3.getIds(), suggestionsBuilder);
         });
         final TranslatableComponent translatableComponent;
         ERROR_NO_HELD_ITEMS = new DynamicCommandExceptionType(object -> {
diff --git a/src/net/minecraft/server/commands/MsgCommand.java b/src/net/minecraft/server/commands/MsgCommand.java
index 077a226..5a1bf56 100644
--- a/src/net/minecraft/server/commands/MsgCommand.java
+++ b/src/net/minecraft/server/commands/MsgCommand.java
@@ -3,8 +3,10 @@ package net.minecraft.server.commands;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.context.CommandContext;
 import java.util.Iterator;
+import java.util.UUID;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.Util;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import java.util.Collection;
@@ -25,10 +27,11 @@ public class MsgCommand {
         commandDispatcher.register((LiteralArgumentBuilder)Commands.literal("w").redirect((CommandNode)literalCommandNode2));
     }
     
-    private static int sendMessage(final CommandSourceStack cq, final Collection<ServerPlayer> collection, final Component lf) {
-        for (final ServerPlayer xe5 : collection) {
-            xe5.sendMessage(new TranslatableComponent("commands.message.display.incoming", new Object[] { cq.getDisplayName(), lf.deepCopy() }).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC));
-            cq.sendSuccess(new TranslatableComponent("commands.message.display.outgoing", new Object[] { xe5.getDisplayName(), lf.deepCopy() }).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC), false);
+    private static int sendMessage(final CommandSourceStack cz, final Collection<ServerPlayer> collection, final Component mr) {
+        final UUID uUID4 = (cz.getEntity() == null) ? Util.NIL_UUID : cz.getEntity().getUUID();
+        for (final ServerPlayer ze6 : collection) {
+            ze6.sendMessage(new TranslatableComponent("commands.message.display.incoming", new Object[] { cz.getDisplayName(), mr }).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC), uUID4);
+            cz.sendSuccess(new TranslatableComponent("commands.message.display.outgoing", new Object[] { ze6.getDisplayName(), mr }).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC), false);
         }
         return collection.size();
     }
diff --git a/src/net/minecraft/server/commands/OpCommand.java b/src/net/minecraft/server/commands/OpCommand.java
index 5e4f505..6996445 100644
--- a/src/net/minecraft/server/commands/OpCommand.java
+++ b/src/net/minecraft/server/commands/OpCommand.java
@@ -25,20 +25,20 @@ public class OpCommand {
     private static final SimpleCommandExceptionType ERROR_ALREADY_OP;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("op").requires(cq -> cq.hasPermission(3))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).suggests((commandContext, suggestionsBuilder) -> {
-            final PlayerList zo3 = ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList();
-            return SharedSuggestionProvider.suggest(zo3.getPlayers().stream().filter(xe -> !zo3.isOp(xe.getGameProfile())).<String>map(xe -> xe.getGameProfile().getName()), suggestionsBuilder);
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("op").requires(cz -> cz.hasPermission(3))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).suggests((commandContext, suggestionsBuilder) -> {
+            final PlayerList abp3 = ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList();
+            return SharedSuggestionProvider.suggest(abp3.getPlayers().stream().filter(ze -> !abp3.isOp(ze.getGameProfile())).<String>map(ze -> ze.getGameProfile().getName()), suggestionsBuilder);
         }).executes(commandContext -> opPlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets")))));
     }
     
-    private static int opPlayers(final CommandSourceStack cq, final Collection<GameProfile> collection) throws CommandSyntaxException {
-        final PlayerList zo3 = cq.getServer().getPlayerList();
+    private static int opPlayers(final CommandSourceStack cz, final Collection<GameProfile> collection) throws CommandSyntaxException {
+        final PlayerList abp3 = cz.getServer().getPlayerList();
         int integer4 = 0;
         for (final GameProfile gameProfile6 : collection) {
-            if (!zo3.isOp(gameProfile6)) {
-                zo3.op(gameProfile6);
+            if (!abp3.isOp(gameProfile6)) {
+                abp3.op(gameProfile6);
                 ++integer4;
-                cq.sendSuccess(new TranslatableComponent("commands.op.success", new Object[] { collection.iterator().next().getName() }), true);
+                cz.sendSuccess(new TranslatableComponent("commands.op.success", new Object[] { collection.iterator().next().getName() }), true);
             }
         }
         if (integer4 == 0) {
@@ -48,6 +48,6 @@ public class OpCommand {
     }
     
     static {
-        ERROR_ALREADY_OP = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.op.failed", new Object[0]));
+        ERROR_ALREADY_OP = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.op.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/PardonCommand.java b/src/net/minecraft/server/commands/PardonCommand.java
index f279fde..8b5abdf 100644
--- a/src/net/minecraft/server/commands/PardonCommand.java
+++ b/src/net/minecraft/server/commands/PardonCommand.java
@@ -26,17 +26,17 @@ public class PardonCommand {
     private static final SimpleCommandExceptionType ERROR_NOT_BANNED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("pardon").requires(cq -> cq.getServer().getPlayerList().getIpBans().isEnabled() && cq.hasPermission(3))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getBans().getUserList(), suggestionsBuilder)).executes(commandContext -> pardonPlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets")))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("pardon").requires(cz -> cz.hasPermission(3))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getBans().getUserList(), suggestionsBuilder)).executes(commandContext -> pardonPlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets")))));
     }
     
-    private static int pardonPlayers(final CommandSourceStack cq, final Collection<GameProfile> collection) throws CommandSyntaxException {
-        final UserBanList zt3 = cq.getServer().getPlayerList().getBans();
+    private static int pardonPlayers(final CommandSourceStack cz, final Collection<GameProfile> collection) throws CommandSyntaxException {
+        final UserBanList abu3 = cz.getServer().getPlayerList().getBans();
         int integer4 = 0;
         for (final GameProfile gameProfile6 : collection) {
-            if (zt3.isBanned(gameProfile6)) {
-                ((StoredUserList<GameProfile, V>)zt3).remove(gameProfile6);
+            if (abu3.isBanned(gameProfile6)) {
+                ((StoredUserList<GameProfile, V>)abu3).remove(gameProfile6);
                 ++integer4;
-                cq.sendSuccess(new TranslatableComponent("commands.pardon.success", new Object[] { ComponentUtils.getDisplayName(gameProfile6) }), true);
+                cz.sendSuccess(new TranslatableComponent("commands.pardon.success", new Object[] { ComponentUtils.getDisplayName(gameProfile6) }), true);
             }
         }
         if (integer4 == 0) {
@@ -46,6 +46,6 @@ public class PardonCommand {
     }
     
     static {
-        ERROR_NOT_BANNED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.pardon.failed", new Object[0]));
+        ERROR_NOT_BANNED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.pardon.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/PardonIpCommand.java b/src/net/minecraft/server/commands/PardonIpCommand.java
index 72afa24..10aece8 100644
--- a/src/net/minecraft/server/commands/PardonIpCommand.java
+++ b/src/net/minecraft/server/commands/PardonIpCommand.java
@@ -24,25 +24,25 @@ public class PardonIpCommand {
     private static final SimpleCommandExceptionType ERROR_NOT_BANNED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("pardon-ip").requires(cq -> cq.getServer().getPlayerList().getIpBans().isEnabled() && cq.hasPermission(3))).then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getIpBans().getUserList(), suggestionsBuilder)).executes(commandContext -> unban((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "target")))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("pardon-ip").requires(cz -> cz.hasPermission(3))).then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getIpBans().getUserList(), suggestionsBuilder)).executes(commandContext -> unban((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "target")))));
     }
     
-    private static int unban(final CommandSourceStack cq, final String string) throws CommandSyntaxException {
+    private static int unban(final CommandSourceStack cz, final String string) throws CommandSyntaxException {
         final Matcher matcher3 = BanIpCommands.IP_ADDRESS_PATTERN.matcher(string);
         if (!matcher3.matches()) {
             throw PardonIpCommand.ERROR_INVALID.create();
         }
-        final IpBanList zl4 = cq.getServer().getPlayerList().getIpBans();
-        if (!zl4.isBanned(string)) {
+        final IpBanList abm4 = cz.getServer().getPlayerList().getIpBans();
+        if (!abm4.isBanned(string)) {
             throw PardonIpCommand.ERROR_NOT_BANNED.create();
         }
-        ((StoredUserList<String, V>)zl4).remove(string);
-        cq.sendSuccess(new TranslatableComponent("commands.pardonip.success", new Object[] { string }), true);
+        ((StoredUserList<String, V>)abm4).remove(string);
+        cz.sendSuccess(new TranslatableComponent("commands.pardonip.success", new Object[] { string }), true);
         return 1;
     }
     
     static {
-        ERROR_INVALID = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.pardonip.invalid", new Object[0]));
-        ERROR_NOT_BANNED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.pardonip.failed", new Object[0]));
+        ERROR_INVALID = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.pardonip.invalid"));
+        ERROR_NOT_BANNED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.pardonip.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/ParticleCommand.java b/src/net/minecraft/server/commands/ParticleCommand.java
index 0c19b52..094b0da 100644
--- a/src/net/minecraft/server/commands/ParticleCommand.java
+++ b/src/net/minecraft/server/commands/ParticleCommand.java
@@ -6,7 +6,6 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.util.Iterator;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.core.particles.ParticleType;
 import net.minecraft.core.Registry;
 import net.minecraft.server.level.ServerPlayer;
 import java.util.Collection;
@@ -29,24 +28,24 @@ public class ParticleCommand {
     private static final SimpleCommandExceptionType ERROR_FAILED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("particle").requires(cq -> cq.hasPermission(2))).then(((RequiredArgumentBuilder)Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)ParticleArgument.particle()).executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), ((CommandSourceStack)commandContext.getSource()).getPosition(), Vec3.ZERO, 0.0f, 0, false, ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getPlayers()))).then(((RequiredArgumentBuilder)Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3.ZERO, 0.0f, 0, false, ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getPlayers()))).then(Commands.argument("delta", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3(false)).then(Commands.argument("speed", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f)).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("count", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "delta"), FloatArgumentType.getFloat(commandContext, "speed"), IntegerArgumentType.getInteger(commandContext, "count"), false, ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getPlayers()))).then(((LiteralArgumentBuilder)Commands.literal("force").executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "delta"), FloatArgumentType.getFloat(commandContext, "speed"), IntegerArgumentType.getInteger(commandContext, "count"), true, ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getPlayers()))).then(Commands.argument("viewers", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "delta"), FloatArgumentType.getFloat(commandContext, "speed"), IntegerArgumentType.getInteger(commandContext, "count"), true, EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "viewers")))))).then(((LiteralArgumentBuilder)Commands.literal("normal").executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "delta"), FloatArgumentType.getFloat(commandContext, "speed"), IntegerArgumentType.getInteger(commandContext, "count"), false, ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getPlayers()))).then(Commands.argument("viewers", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "delta"), FloatArgumentType.getFloat(commandContext, "speed"), IntegerArgumentType.getInteger(commandContext, "count"), false, EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "viewers")))))))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("particle").requires(cz -> cz.hasPermission(2))).then(((RequiredArgumentBuilder)Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)ParticleArgument.particle()).executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), ((CommandSourceStack)commandContext.getSource()).getPosition(), Vec3.ZERO, 0.0f, 0, false, ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getPlayers()))).then(((RequiredArgumentBuilder)Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3.ZERO, 0.0f, 0, false, ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getPlayers()))).then(Commands.argument("delta", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3(false)).then(Commands.argument("speed", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f)).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("count", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "delta"), FloatArgumentType.getFloat(commandContext, "speed"), IntegerArgumentType.getInteger(commandContext, "count"), false, ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getPlayers()))).then(((LiteralArgumentBuilder)Commands.literal("force").executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "delta"), FloatArgumentType.getFloat(commandContext, "speed"), IntegerArgumentType.getInteger(commandContext, "count"), true, ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getPlayers()))).then(Commands.argument("viewers", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "delta"), FloatArgumentType.getFloat(commandContext, "speed"), IntegerArgumentType.getInteger(commandContext, "count"), true, EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "viewers")))))).then(((LiteralArgumentBuilder)Commands.literal("normal").executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "delta"), FloatArgumentType.getFloat(commandContext, "speed"), IntegerArgumentType.getInteger(commandContext, "count"), false, ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getPlayers()))).then(Commands.argument("viewers", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> sendParticles((CommandSourceStack)commandContext.getSource(), ParticleArgument.getParticle((CommandContext<CommandSourceStack>)commandContext, "name"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "delta"), FloatArgumentType.getFloat(commandContext, "speed"), IntegerArgumentType.getInteger(commandContext, "count"), false, EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "viewers")))))))))));
     }
     
-    private static int sendParticles(final CommandSourceStack cq, final ParticleOptions gt, final Vec3 cvl3, final Vec3 cvl4, final float float5, final int integer, final boolean boolean7, final Collection<ServerPlayer> collection) throws CommandSyntaxException {
+    private static int sendParticles(final CommandSourceStack cz, final ParticleOptions hf, final Vec3 dem3, final Vec3 dem4, final float float5, final int integer, final boolean boolean7, final Collection<ServerPlayer> collection) throws CommandSyntaxException {
         int integer2 = 0;
-        for (final ServerPlayer xe11 : collection) {
-            if (cq.getLevel().<ParticleOptions>sendParticles(xe11, gt, boolean7, cvl3.x, cvl3.y, cvl3.z, integer, cvl4.x, cvl4.y, cvl4.z, float5)) {
+        for (final ServerPlayer ze11 : collection) {
+            if (cz.getLevel().<ParticleOptions>sendParticles(ze11, hf, boolean7, dem3.x, dem3.y, dem3.z, integer, dem4.x, dem4.y, dem4.z, float5)) {
                 ++integer2;
             }
         }
         if (integer2 == 0) {
             throw ParticleCommand.ERROR_FAILED.create();
         }
-        cq.sendSuccess(new TranslatableComponent("commands.particle.success", new Object[] { Registry.PARTICLE_TYPE.getKey(gt.getType()).toString() }), true);
+        cz.sendSuccess(new TranslatableComponent("commands.particle.success", new Object[] { Registry.PARTICLE_TYPE.getKey(hf.getType()).toString() }), true);
         return integer2;
     }
     
     static {
-        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.particle.failed", new Object[0]));
+        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.particle.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/PlaySoundCommand.java b/src/net/minecraft/server/commands/PlaySoundCommand.java
index 929ab24..333dced 100644
--- a/src/net/minecraft/server/commands/PlaySoundCommand.java
+++ b/src/net/minecraft/server/commands/PlaySoundCommand.java
@@ -34,50 +34,50 @@ public class PlaySoundCommand {
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
         final RequiredArgumentBuilder<CommandSourceStack, ResourceLocation> requiredArgumentBuilder2 = (RequiredArgumentBuilder<CommandSourceStack, ResourceLocation>)Commands.argument("sound", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)SuggestionProviders.AVAILABLE_SOUNDS);
-        for (final SoundSource aaj6 : SoundSource.values()) {
-            requiredArgumentBuilder2.then((ArgumentBuilder)source(aaj6));
+        for (final SoundSource acm6 : SoundSource.values()) {
+            requiredArgumentBuilder2.then((ArgumentBuilder)source(acm6));
         }
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("playsound").requires(cq -> cq.hasPermission(2))).then((ArgumentBuilder)requiredArgumentBuilder2));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("playsound").requires(cz -> cz.hasPermission(2))).then((ArgumentBuilder)requiredArgumentBuilder2));
     }
     
-    private static LiteralArgumentBuilder<CommandSourceStack> source(final SoundSource aaj) {
-        return (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal(aaj.getName()).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> playSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound"), aaj, ((CommandSourceStack)commandContext.getSource()).getPosition(), 1.0f, 1.0f, 0.0f))).then(((RequiredArgumentBuilder)Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> playSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound"), aaj, Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), 1.0f, 1.0f, 0.0f))).then(((RequiredArgumentBuilder)Commands.argument("volume", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f)).executes(commandContext -> playSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound"), aaj, Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), (float)commandContext.getArgument("volume", (Class)Float.class), 1.0f, 0.0f))).then(((RequiredArgumentBuilder)Commands.argument("pitch", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f, 2.0f)).executes(commandContext -> playSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound"), aaj, Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), (float)commandContext.getArgument("volume", (Class)Float.class), (float)commandContext.getArgument("pitch", (Class)Float.class), 0.0f))).then(Commands.argument("minVolume", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f, 1.0f)).executes(commandContext -> playSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound"), aaj, Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), (float)commandContext.getArgument("volume", (Class)Float.class), (float)commandContext.getArgument("pitch", (Class)Float.class), (float)commandContext.getArgument("minVolume", (Class)Float.class))))))));
+    private static LiteralArgumentBuilder<CommandSourceStack> source(final SoundSource acm) {
+        return (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal(acm.getName()).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> playSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound"), acm, ((CommandSourceStack)commandContext.getSource()).getPosition(), 1.0f, 1.0f, 0.0f))).then(((RequiredArgumentBuilder)Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> playSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound"), acm, Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), 1.0f, 1.0f, 0.0f))).then(((RequiredArgumentBuilder)Commands.argument("volume", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f)).executes(commandContext -> playSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound"), acm, Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), (float)commandContext.getArgument("volume", (Class)Float.class), 1.0f, 0.0f))).then(((RequiredArgumentBuilder)Commands.argument("pitch", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f, 2.0f)).executes(commandContext -> playSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound"), acm, Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), (float)commandContext.getArgument("volume", (Class)Float.class), (float)commandContext.getArgument("pitch", (Class)Float.class), 0.0f))).then(Commands.argument("minVolume", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f, 1.0f)).executes(commandContext -> playSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound"), acm, Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), (float)commandContext.getArgument("volume", (Class)Float.class), (float)commandContext.getArgument("pitch", (Class)Float.class), (float)commandContext.getArgument("minVolume", (Class)Float.class))))))));
     }
     
-    private static int playSound(final CommandSourceStack cq, final Collection<ServerPlayer> collection, final ResourceLocation sm, final SoundSource aaj, final Vec3 cvl, final float float6, final float float7, final float float8) throws CommandSyntaxException {
+    private static int playSound(final CommandSourceStack cz, final Collection<ServerPlayer> collection, final ResourceLocation uh, final SoundSource acm, final Vec3 dem, final float float6, final float float7, final float float8) throws CommandSyntaxException {
         final double double9 = Math.pow((float6 > 1.0f) ? ((double)(float6 * 16.0f)) : 16.0, 2.0);
         int integer11 = 0;
-        for (final ServerPlayer xe13 : collection) {
-            final double double10 = cvl.x - xe13.getX();
-            final double double11 = cvl.y - xe13.getY();
-            final double double12 = cvl.z - xe13.getZ();
+        for (final ServerPlayer ze13 : collection) {
+            final double double10 = dem.x - ze13.getX();
+            final double double11 = dem.y - ze13.getY();
+            final double double12 = dem.z - ze13.getZ();
             final double double13 = double10 * double10 + double11 * double11 + double12 * double12;
-            Vec3 cvl2 = cvl;
+            Vec3 dem2 = dem;
             float float9 = float6;
             if (double13 > double9) {
                 if (float8 <= 0.0f) {
                     continue;
                 }
                 final double double14 = Mth.sqrt(double13);
-                cvl2 = new Vec3(xe13.getX() + double10 / double14 * 2.0, xe13.getY() + double11 / double14 * 2.0, xe13.getZ() + double12 / double14 * 2.0);
+                dem2 = new Vec3(ze13.getX() + double10 / double14 * 2.0, ze13.getY() + double11 / double14 * 2.0, ze13.getZ() + double12 / double14 * 2.0);
                 float9 = float8;
             }
-            xe13.connection.send(new ClientboundCustomSoundPacket(sm, aaj, cvl2, float9, float7));
+            ze13.connection.send(new ClientboundCustomSoundPacket(uh, acm, dem2, float9, float7));
             ++integer11;
         }
         if (integer11 == 0) {
             throw PlaySoundCommand.ERROR_TOO_FAR.create();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.playsound.success.single", new Object[] { sm, collection.iterator().next().getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.playsound.success.single", new Object[] { uh, collection.iterator().next().getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.playsound.success.multiple", new Object[] { sm, collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.playsound.success.multiple", new Object[] { uh, collection.size() }), true);
         }
         return integer11;
     }
     
     static {
-        ERROR_TOO_FAR = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.playsound.failed", new Object[0]));
+        ERROR_TOO_FAR = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.playsound.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/PublishCommand.java b/src/net/minecraft/server/commands/PublishCommand.java
index 44a1dc5..1c6aa30 100644
--- a/src/net/minecraft/server/commands/PublishCommand.java
+++ b/src/net/minecraft/server/commands/PublishCommand.java
@@ -20,22 +20,22 @@ public class PublishCommand {
     private static final DynamicCommandExceptionType ERROR_ALREADY_PUBLISHED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("publish").requires(cq -> cq.getServer().isSingleplayer() && cq.hasPermission(4))).executes(commandContext -> publish((CommandSourceStack)commandContext.getSource(), HttpUtil.getAvailablePort()))).then(Commands.argument("port", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0, 65535)).executes(commandContext -> publish((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "port")))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("publish").requires(cz -> cz.hasPermission(4))).executes(commandContext -> publish((CommandSourceStack)commandContext.getSource(), HttpUtil.getAvailablePort()))).then(Commands.argument("port", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0, 65535)).executes(commandContext -> publish((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "port")))));
     }
     
-    private static int publish(final CommandSourceStack cq, final int integer) throws CommandSyntaxException {
-        if (cq.getServer().isPublished()) {
-            throw PublishCommand.ERROR_ALREADY_PUBLISHED.create(cq.getServer().getPort());
+    private static int publish(final CommandSourceStack cz, final int integer) throws CommandSyntaxException {
+        if (cz.getServer().isPublished()) {
+            throw PublishCommand.ERROR_ALREADY_PUBLISHED.create(cz.getServer().getPort());
         }
-        if (!cq.getServer().publishServer(cq.getServer().getDefaultGameType(), false, integer)) {
+        if (!cz.getServer().publishServer(cz.getServer().getDefaultGameType(), false, integer)) {
             throw PublishCommand.ERROR_FAILED.create();
         }
-        cq.sendSuccess(new TranslatableComponent("commands.publish.success", new Object[] { integer }), true);
+        cz.sendSuccess(new TranslatableComponent("commands.publish.success", new Object[] { integer }), true);
         return integer;
     }
     
     static {
-        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.publish.failed", new Object[0]));
+        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.publish.failed"));
         final TranslatableComponent translatableComponent;
         ERROR_ALREADY_PUBLISHED = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("commands.publish.alreadyPublished", new Object[] { object });
diff --git a/src/net/minecraft/server/commands/RecipeCommand.java b/src/net/minecraft/server/commands/RecipeCommand.java
index 3535146..9525f4f 100644
--- a/src/net/minecraft/server/commands/RecipeCommand.java
+++ b/src/net/minecraft/server/commands/RecipeCommand.java
@@ -27,45 +27,45 @@ public class RecipeCommand {
     private static final SimpleCommandExceptionType ERROR_TAKE_FAILED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("recipe").requires(cq -> cq.hasPermission(2))).then(Commands.literal("give").then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.argument("recipe", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)SuggestionProviders.ALL_RECIPES).executes(commandContext -> giveRecipes((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Collections.<Recipe<?>>singleton(ResourceLocationArgument.getRecipe((CommandContext<CommandSourceStack>)commandContext, "recipe")))))).then(Commands.literal("*").executes(commandContext -> giveRecipes((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getServer().getRecipeManager().getRecipes())))))).then(Commands.literal("take").then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.argument("recipe", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)SuggestionProviders.ALL_RECIPES).executes(commandContext -> takeRecipes((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Collections.<Recipe<?>>singleton(ResourceLocationArgument.getRecipe((CommandContext<CommandSourceStack>)commandContext, "recipe")))))).then(Commands.literal("*").executes(commandContext -> takeRecipes((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getServer().getRecipeManager().getRecipes()))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("recipe").requires(cz -> cz.hasPermission(2))).then(Commands.literal("give").then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.argument("recipe", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)SuggestionProviders.ALL_RECIPES).executes(commandContext -> giveRecipes((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Collections.<Recipe<?>>singleton(ResourceLocationArgument.getRecipe((CommandContext<CommandSourceStack>)commandContext, "recipe")))))).then(Commands.literal("*").executes(commandContext -> giveRecipes((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getServer().getRecipeManager().getRecipes())))))).then(Commands.literal("take").then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.argument("recipe", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)SuggestionProviders.ALL_RECIPES).executes(commandContext -> takeRecipes((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), Collections.<Recipe<?>>singleton(ResourceLocationArgument.getRecipe((CommandContext<CommandSourceStack>)commandContext, "recipe")))))).then(Commands.literal("*").executes(commandContext -> takeRecipes((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getServer().getRecipeManager().getRecipes()))))));
     }
     
-    private static int giveRecipes(final CommandSourceStack cq, final Collection<ServerPlayer> collection2, final Collection<Recipe<?>> collection3) throws CommandSyntaxException {
+    private static int giveRecipes(final CommandSourceStack cz, final Collection<ServerPlayer> collection2, final Collection<Recipe<?>> collection3) throws CommandSyntaxException {
         int integer4 = 0;
-        for (final ServerPlayer xe6 : collection2) {
-            integer4 += xe6.awardRecipes(collection3);
+        for (final ServerPlayer ze6 : collection2) {
+            integer4 += ze6.awardRecipes(collection3);
         }
         if (integer4 == 0) {
             throw RecipeCommand.ERROR_GIVE_FAILED.create();
         }
         if (collection2.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.recipe.give.success.single", new Object[] { collection3.size(), collection2.iterator().next().getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.recipe.give.success.single", new Object[] { collection3.size(), collection2.iterator().next().getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.recipe.give.success.multiple", new Object[] { collection3.size(), collection2.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.recipe.give.success.multiple", new Object[] { collection3.size(), collection2.size() }), true);
         }
         return integer4;
     }
     
-    private static int takeRecipes(final CommandSourceStack cq, final Collection<ServerPlayer> collection2, final Collection<Recipe<?>> collection3) throws CommandSyntaxException {
+    private static int takeRecipes(final CommandSourceStack cz, final Collection<ServerPlayer> collection2, final Collection<Recipe<?>> collection3) throws CommandSyntaxException {
         int integer4 = 0;
-        for (final ServerPlayer xe6 : collection2) {
-            integer4 += xe6.resetRecipes(collection3);
+        for (final ServerPlayer ze6 : collection2) {
+            integer4 += ze6.resetRecipes(collection3);
         }
         if (integer4 == 0) {
             throw RecipeCommand.ERROR_TAKE_FAILED.create();
         }
         if (collection2.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.recipe.take.success.single", new Object[] { collection3.size(), collection2.iterator().next().getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.recipe.take.success.single", new Object[] { collection3.size(), collection2.iterator().next().getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.recipe.take.success.multiple", new Object[] { collection3.size(), collection2.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.recipe.take.success.multiple", new Object[] { collection3.size(), collection2.size() }), true);
         }
         return integer4;
     }
     
     static {
-        ERROR_GIVE_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.recipe.give.failed", new Object[0]));
-        ERROR_TAKE_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.recipe.take.failed", new Object[0]));
+        ERROR_GIVE_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.recipe.give.failed"));
+        ERROR_TAKE_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.recipe.take.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/ReloadCommand.java b/src/net/minecraft/server/commands/ReloadCommand.java
index 366fd81..0206f55 100644
--- a/src/net/minecraft/server/commands/ReloadCommand.java
+++ b/src/net/minecraft/server/commands/ReloadCommand.java
@@ -1,20 +1,60 @@
 package net.minecraft.server.commands;
 
+import org.apache.logging.log4j.LogManager;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.server.MinecraftServer;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.commands.Commands;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import net.minecraft.commands.CommandSourceStack;
 import com.mojang.brigadier.CommandDispatcher;
+import java.util.Iterator;
+import com.google.common.collect.Lists;
+import net.minecraft.world.level.storage.WorldData;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.commands.CommandSourceStack;
+import java.util.Collection;
+import org.apache.logging.log4j.Logger;
 
 public class ReloadCommand {
+    private static final Logger LOGGER;
+    
+    public static void reloadPacks(final Collection<String> collection, final CommandSourceStack cz) {
+        cz.getServer().reloadResources(collection).exceptionally(throwable -> {
+            ReloadCommand.LOGGER.warn("Failed to execute reload", throwable);
+            cz.sendFailure(new TranslatableComponent("commands.reload.failure"));
+            return null;
+        });
+    }
+    
+    private static Collection<String> discoverNewPacks(final PackRepository<?> aar, final WorldData dal, final Collection<String> collection) {
+        aar.reload();
+        final Collection<String> collection2 = Lists.newArrayList(collection);
+        final Collection<String> collection3 = dal.getDataPackConfig().getDisabled();
+        for (final String string7 : aar.getAvailableIds()) {
+            if (!collection3.contains(string7) && !collection2.contains(string7)) {
+                collection2.add(string7);
+            }
+        }
+        return collection2;
+    }
+    
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("reload").requires(cq -> cq.hasPermission(2))).executes(commandContext -> {
-            ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.reload.success", new Object[0]), true);
-            ((CommandSourceStack)commandContext.getSource()).getServer().reloadResources();
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("reload").requires(cz -> cz.hasPermission(2))).executes(commandContext -> {
+            final CommandSourceStack cz2 = (CommandSourceStack)commandContext.getSource();
+            final MinecraftServer minecraftServer3 = cz2.getServer();
+            final PackRepository<?> aar4 = minecraftServer3.getPackRepository();
+            final WorldData dal5 = minecraftServer3.getWorldData();
+            final Collection<String> collection6 = aar4.getSelectedIds();
+            final Collection<String> collection7 = discoverNewPacks(aar4, dal5, collection6);
+            cz2.sendSuccess(new TranslatableComponent("commands.reload.success"), true);
+            reloadPacks(collection7, cz2);
             return 0;
         }));
     }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
 }
diff --git a/src/net/minecraft/server/commands/ReplaceItemCommand.java b/src/net/minecraft/server/commands/ReplaceItemCommand.java
index 45fa25f..dbeea28 100644
--- a/src/net/minecraft/server/commands/ReplaceItemCommand.java
+++ b/src/net/minecraft/server/commands/ReplaceItemCommand.java
@@ -36,51 +36,51 @@ public class ReplaceItemCommand {
     public static final Dynamic2CommandExceptionType ERROR_ENTITY_SLOT;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("replaceitem").requires(cq -> cq.hasPermission(2))).then(Commands.literal("block").then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(Commands.argument("slot", (com.mojang.brigadier.arguments.ArgumentType<Object>)SlotArgument.slot()).then(((RequiredArgumentBuilder)Commands.argument("item", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemArgument.item()).executes(commandContext -> setBlockItem((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), SlotArgument.getSlot((CommandContext<CommandSourceStack>)commandContext, "slot"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item").createItemStack(1, false)))).then(Commands.argument("count", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(1, 64)).executes(commandContext -> setBlockItem((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), SlotArgument.getSlot((CommandContext<CommandSourceStack>)commandContext, "slot"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item").createItemStack(IntegerArgumentType.getInteger(commandContext, "count"), true))))))))).then(Commands.literal("entity").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(Commands.argument("slot", (com.mojang.brigadier.arguments.ArgumentType<Object>)SlotArgument.slot()).then(((RequiredArgumentBuilder)Commands.argument("item", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemArgument.item()).executes(commandContext -> setEntityItem((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), SlotArgument.getSlot((CommandContext<CommandSourceStack>)commandContext, "slot"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item").createItemStack(1, false)))).then(Commands.argument("count", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(1, 64)).executes(commandContext -> setEntityItem((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), SlotArgument.getSlot((CommandContext<CommandSourceStack>)commandContext, "slot"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item").createItemStack(IntegerArgumentType.getInteger(commandContext, "count"), true)))))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("replaceitem").requires(cz -> cz.hasPermission(2))).then(Commands.literal("block").then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(Commands.argument("slot", (com.mojang.brigadier.arguments.ArgumentType<Object>)SlotArgument.slot()).then(((RequiredArgumentBuilder)Commands.argument("item", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemArgument.item()).executes(commandContext -> setBlockItem((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), SlotArgument.getSlot((CommandContext<CommandSourceStack>)commandContext, "slot"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item").createItemStack(1, false)))).then(Commands.argument("count", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(1, 64)).executes(commandContext -> setBlockItem((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), SlotArgument.getSlot((CommandContext<CommandSourceStack>)commandContext, "slot"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item").createItemStack(IntegerArgumentType.getInteger(commandContext, "count"), true))))))))).then(Commands.literal("entity").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(Commands.argument("slot", (com.mojang.brigadier.arguments.ArgumentType<Object>)SlotArgument.slot()).then(((RequiredArgumentBuilder)Commands.argument("item", (com.mojang.brigadier.arguments.ArgumentType<Object>)ItemArgument.item()).executes(commandContext -> setEntityItem((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), SlotArgument.getSlot((CommandContext<CommandSourceStack>)commandContext, "slot"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item").createItemStack(1, false)))).then(Commands.argument("count", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(1, 64)).executes(commandContext -> setEntityItem((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), SlotArgument.getSlot((CommandContext<CommandSourceStack>)commandContext, "slot"), ItemArgument.getItem((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "item").createItemStack(IntegerArgumentType.getInteger(commandContext, "count"), true)))))))));
     }
     
-    private static int setBlockItem(final CommandSourceStack cq, final BlockPos fk, final int integer, final ItemStack ben) throws CommandSyntaxException {
-        final BlockEntity bwl5 = cq.getLevel().getBlockEntity(fk);
-        if (!(bwl5 instanceof Container)) {
+    private static int setBlockItem(final CommandSourceStack cz, final BlockPos fu, final int integer, final ItemStack bki) throws CommandSyntaxException {
+        final BlockEntity cdl5 = cz.getLevel().getBlockEntity(fu);
+        if (!(cdl5 instanceof Container)) {
             throw ReplaceItemCommand.ERROR_NOT_A_CONTAINER.create();
         }
-        final Container aje6 = (Container)bwl5;
-        if (integer < 0 || integer >= aje6.getContainerSize()) {
+        final Container amz6 = (Container)cdl5;
+        if (integer < 0 || integer >= amz6.getContainerSize()) {
             throw ReplaceItemCommand.ERROR_INAPPLICABLE_SLOT.create(integer);
         }
-        aje6.setItem(integer, ben);
-        cq.sendSuccess(new TranslatableComponent("commands.replaceitem.block.success", new Object[] { fk.getX(), fk.getY(), fk.getZ(), ben.getDisplayName() }), true);
+        amz6.setItem(integer, bki);
+        cz.sendSuccess(new TranslatableComponent("commands.replaceitem.block.success", new Object[] { fu.getX(), fu.getY(), fu.getZ(), bki.getDisplayName() }), true);
         return 1;
     }
     
-    private static int setEntityItem(final CommandSourceStack cq, final Collection<? extends Entity> collection, final int integer, final ItemStack ben) throws CommandSyntaxException {
+    private static int setEntityItem(final CommandSourceStack cz, final Collection<? extends Entity> collection, final int integer, final ItemStack bki) throws CommandSyntaxException {
         final List<Entity> list5 = Lists.newArrayListWithCapacity(collection.size());
-        for (final Entity akq7 : collection) {
-            if (akq7 instanceof ServerPlayer) {
-                ((ServerPlayer)akq7).inventoryMenu.broadcastChanges();
+        for (final Entity aom7 : collection) {
+            if (aom7 instanceof ServerPlayer) {
+                ((ServerPlayer)aom7).inventoryMenu.broadcastChanges();
             }
-            if (akq7.setSlot(integer, ben.copy())) {
-                list5.add(akq7);
-                if (!(akq7 instanceof ServerPlayer)) {
+            if (aom7.setSlot(integer, bki.copy())) {
+                list5.add(aom7);
+                if (!(aom7 instanceof ServerPlayer)) {
                     continue;
                 }
-                ((ServerPlayer)akq7).inventoryMenu.broadcastChanges();
+                ((ServerPlayer)aom7).inventoryMenu.broadcastChanges();
             }
         }
         if (list5.isEmpty()) {
-            throw ReplaceItemCommand.ERROR_ENTITY_SLOT.create(ben.getDisplayName(), integer);
+            throw ReplaceItemCommand.ERROR_ENTITY_SLOT.create(bki.getDisplayName(), integer);
         }
         if (list5.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.replaceitem.entity.success.single", new Object[] { list5.iterator().next().getDisplayName(), ben.getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.replaceitem.entity.success.single", new Object[] { list5.iterator().next().getDisplayName(), bki.getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.replaceitem.entity.success.multiple", new Object[] { list5.size(), ben.getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.replaceitem.entity.success.multiple", new Object[] { list5.size(), bki.getDisplayName() }), true);
         }
         return list5.size();
     }
     
     static {
-        ERROR_NOT_A_CONTAINER = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.replaceitem.block.failed", new Object[0]));
+        ERROR_NOT_A_CONTAINER = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.replaceitem.block.failed"));
         final TranslatableComponent translatableComponent;
         ERROR_INAPPLICABLE_SLOT = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("commands.replaceitem.slot.inapplicable", new Object[] { object });
diff --git a/src/net/minecraft/server/commands/SaveAllCommand.java b/src/net/minecraft/server/commands/SaveAllCommand.java
index 8c55a1d..931105a 100644
--- a/src/net/minecraft/server/commands/SaveAllCommand.java
+++ b/src/net/minecraft/server/commands/SaveAllCommand.java
@@ -16,22 +16,22 @@ public class SaveAllCommand {
     private static final SimpleCommandExceptionType ERROR_FAILED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("save-all").requires(cq -> cq.hasPermission(4))).executes(commandContext -> saveAll((CommandSourceStack)commandContext.getSource(), false))).then(Commands.literal("flush").executes(commandContext -> saveAll((CommandSourceStack)commandContext.getSource(), true))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("save-all").requires(cz -> cz.hasPermission(4))).executes(commandContext -> saveAll((CommandSourceStack)commandContext.getSource(), false))).then(Commands.literal("flush").executes(commandContext -> saveAll((CommandSourceStack)commandContext.getSource(), true))));
     }
     
-    private static int saveAll(final CommandSourceStack cq, final boolean boolean2) throws CommandSyntaxException {
-        cq.sendSuccess(new TranslatableComponent("commands.save.saving", new Object[0]), false);
-        final MinecraftServer minecraftServer3 = cq.getServer();
+    private static int saveAll(final CommandSourceStack cz, final boolean boolean2) throws CommandSyntaxException {
+        cz.sendSuccess(new TranslatableComponent("commands.save.saving"), false);
+        final MinecraftServer minecraftServer3 = cz.getServer();
         minecraftServer3.getPlayerList().saveAll();
         final boolean boolean3 = minecraftServer3.saveAllChunks(true, boolean2, true);
         if (!boolean3) {
             throw SaveAllCommand.ERROR_FAILED.create();
         }
-        cq.sendSuccess(new TranslatableComponent("commands.save.success", new Object[0]), true);
+        cz.sendSuccess(new TranslatableComponent("commands.save.success"), true);
         return 1;
     }
     
     static {
-        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.save.failed", new Object[0]));
+        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.save.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/SaveOffCommand.java b/src/net/minecraft/server/commands/SaveOffCommand.java
index b3ea1fc..8dd7267 100644
--- a/src/net/minecraft/server/commands/SaveOffCommand.java
+++ b/src/net/minecraft/server/commands/SaveOffCommand.java
@@ -17,24 +17,24 @@ public class SaveOffCommand {
     private static final SimpleCommandExceptionType ERROR_ALREADY_OFF;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("save-off").requires(cq -> cq.hasPermission(4))).executes(commandContext -> {
-            final CommandSourceStack cq2 = (CommandSourceStack)commandContext.getSource();
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("save-off").requires(cz -> cz.hasPermission(4))).executes(commandContext -> {
+            final CommandSourceStack cz2 = (CommandSourceStack)commandContext.getSource();
             boolean boolean3 = false;
-            for (final ServerLevel xd5 : cq2.getServer().getAllLevels()) {
-                if (xd5 != null && !xd5.noSave) {
-                    xd5.noSave = true;
+            for (final ServerLevel zd5 : cz2.getServer().getAllLevels()) {
+                if (zd5 != null && !zd5.noSave) {
+                    zd5.noSave = true;
                     boolean3 = true;
                 }
             }
             if (!boolean3) {
                 throw SaveOffCommand.ERROR_ALREADY_OFF.create();
             }
-            cq2.sendSuccess(new TranslatableComponent("commands.save.disabled", new Object[0]), true);
+            cz2.sendSuccess(new TranslatableComponent("commands.save.disabled"), true);
             return 1;
         }));
     }
     
     static {
-        ERROR_ALREADY_OFF = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.save.alreadyOff", new Object[0]));
+        ERROR_ALREADY_OFF = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.save.alreadyOff"));
     }
 }
diff --git a/src/net/minecraft/server/commands/SaveOnCommand.java b/src/net/minecraft/server/commands/SaveOnCommand.java
index 8bec71d..5b45452 100644
--- a/src/net/minecraft/server/commands/SaveOnCommand.java
+++ b/src/net/minecraft/server/commands/SaveOnCommand.java
@@ -17,24 +17,24 @@ public class SaveOnCommand {
     private static final SimpleCommandExceptionType ERROR_ALREADY_ON;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("save-on").requires(cq -> cq.hasPermission(4))).executes(commandContext -> {
-            final CommandSourceStack cq2 = (CommandSourceStack)commandContext.getSource();
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("save-on").requires(cz -> cz.hasPermission(4))).executes(commandContext -> {
+            final CommandSourceStack cz2 = (CommandSourceStack)commandContext.getSource();
             boolean boolean3 = false;
-            for (final ServerLevel xd5 : cq2.getServer().getAllLevels()) {
-                if (xd5 != null && xd5.noSave) {
-                    xd5.noSave = false;
+            for (final ServerLevel zd5 : cz2.getServer().getAllLevels()) {
+                if (zd5 != null && zd5.noSave) {
+                    zd5.noSave = false;
                     boolean3 = true;
                 }
             }
             if (!boolean3) {
                 throw SaveOnCommand.ERROR_ALREADY_ON.create();
             }
-            cq2.sendSuccess(new TranslatableComponent("commands.save.enabled", new Object[0]), true);
+            cz2.sendSuccess(new TranslatableComponent("commands.save.enabled"), true);
             return 1;
         }));
     }
     
     static {
-        ERROR_ALREADY_ON = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.save.alreadyOn", new Object[0]));
+        ERROR_ALREADY_ON = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.save.alreadyOn"));
     }
 }
diff --git a/src/net/minecraft/server/commands/SayCommand.java b/src/net/minecraft/server/commands/SayCommand.java
index 0e76ea9..c0940c7 100644
--- a/src/net/minecraft/server/commands/SayCommand.java
+++ b/src/net/minecraft/server/commands/SayCommand.java
@@ -1,7 +1,10 @@
 package net.minecraft.server.commands;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.Util;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.TranslatableComponent;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.arguments.ArgumentType;
@@ -13,9 +16,16 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class SayCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("say").requires(cq -> cq.hasPermission(2))).then(Commands.argument("message", (com.mojang.brigadier.arguments.ArgumentType<Object>)MessageArgument.message()).executes(commandContext -> {
-            final Component lf2 = MessageArgument.getMessage((CommandContext<CommandSourceStack>)commandContext, "message");
-            ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().broadcastMessage(new TranslatableComponent("chat.type.announcement", new Object[] { ((CommandSourceStack)commandContext.getSource()).getDisplayName(), lf2 }));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("say").requires(cz -> cz.hasPermission(2))).then(Commands.argument("message", (com.mojang.brigadier.arguments.ArgumentType<Object>)MessageArgument.message()).executes(commandContext -> {
+            final Component mr2 = MessageArgument.getMessage((CommandContext<CommandSourceStack>)commandContext, "message");
+            final TranslatableComponent ne3 = new TranslatableComponent("chat.type.announcement", new Object[] { ((CommandSourceStack)commandContext.getSource()).getDisplayName(), mr2 });
+            final Entity aom4 = ((CommandSourceStack)commandContext.getSource()).getEntity();
+            if (aom4 != null) {
+                ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().broadcastMessage(ne3, ChatType.CHAT, aom4.getUUID());
+            }
+            else {
+                ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().broadcastMessage(ne3, ChatType.SYSTEM, Util.NIL_UUID);
+            }
             return 1;
         })));
     }
diff --git a/src/net/minecraft/server/commands/ScheduleCommand.java b/src/net/minecraft/server/commands/ScheduleCommand.java
index 7baf8d3..5b64405 100644
--- a/src/net/minecraft/server/commands/ScheduleCommand.java
+++ b/src/net/minecraft/server/commands/ScheduleCommand.java
@@ -7,7 +7,6 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.world.level.timers.FunctionCallback;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.timers.TimerCallback;
 import net.minecraft.world.level.timers.FunctionTagCallback;
 import net.minecraft.world.level.timers.TimerQueue;
@@ -17,6 +16,8 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.tags.Tag;
 import net.minecraft.commands.CommandFunction;
 import com.mojang.datafixers.util.Either;
+import net.minecraft.resources.ResourceLocation;
+import com.mojang.datafixers.util.Pair;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import net.minecraft.commands.arguments.TimeArgument;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
@@ -36,10 +37,10 @@ public class ScheduleCommand {
     private static final SuggestionProvider<CommandSourceStack> SUGGEST_SCHEDULE;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("schedule").requires(cq -> cq.hasPermission(2))).then(Commands.literal("function").then(Commands.argument("function", (com.mojang.brigadier.arguments.ArgumentType<Object>)FunctionArgument.functions()).suggests((SuggestionProvider)FunctionCommand.SUGGEST_FUNCTION).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)TimeArgument.time()).executes(commandContext -> schedule((CommandSourceStack)commandContext.getSource(), FunctionArgument.getFunctionOrTag((CommandContext<CommandSourceStack>)commandContext, "function"), IntegerArgumentType.getInteger(commandContext, "time"), true))).then(Commands.literal("append").executes(commandContext -> schedule((CommandSourceStack)commandContext.getSource(), FunctionArgument.getFunctionOrTag((CommandContext<CommandSourceStack>)commandContext, "function"), IntegerArgumentType.getInteger(commandContext, "time"), false)))).then(Commands.literal("replace").executes(commandContext -> schedule((CommandSourceStack)commandContext.getSource(), FunctionArgument.getFunctionOrTag((CommandContext<CommandSourceStack>)commandContext, "function"), IntegerArgumentType.getInteger(commandContext, "time"), true))))))).then(Commands.literal("clear").then(Commands.argument("function", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.greedyString()).suggests((SuggestionProvider)ScheduleCommand.SUGGEST_SCHEDULE).executes(commandContext -> remove((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "function"))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("schedule").requires(cz -> cz.hasPermission(2))).then(Commands.literal("function").then(Commands.argument("function", (com.mojang.brigadier.arguments.ArgumentType<Object>)FunctionArgument.functions()).suggests((SuggestionProvider)FunctionCommand.SUGGEST_FUNCTION).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)TimeArgument.time()).executes(commandContext -> schedule((CommandSourceStack)commandContext.getSource(), FunctionArgument.getFunctionOrTag((CommandContext<CommandSourceStack>)commandContext, "function"), IntegerArgumentType.getInteger(commandContext, "time"), true))).then(Commands.literal("append").executes(commandContext -> schedule((CommandSourceStack)commandContext.getSource(), FunctionArgument.getFunctionOrTag((CommandContext<CommandSourceStack>)commandContext, "function"), IntegerArgumentType.getInteger(commandContext, "time"), false)))).then(Commands.literal("replace").executes(commandContext -> schedule((CommandSourceStack)commandContext.getSource(), FunctionArgument.getFunctionOrTag((CommandContext<CommandSourceStack>)commandContext, "function"), IntegerArgumentType.getInteger(commandContext, "time"), true))))))).then(Commands.literal("clear").then(Commands.argument("function", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.greedyString()).suggests((SuggestionProvider)ScheduleCommand.SUGGEST_SCHEDULE).executes(commandContext -> remove((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "function"))))));
     }
     
-    private static int schedule(final CommandSourceStack cq, final Either<CommandFunction, Tag<CommandFunction>> either, final int integer, final boolean boolean4) throws CommandSyntaxException {
+    private static int schedule(final CommandSourceStack cz, final Pair<ResourceLocation, Either<CommandFunction, Tag<CommandFunction>>> pair, final int integer, final boolean boolean4) throws CommandSyntaxException {
         // 
         // This method could not be decompiled.
         // 
@@ -49,48 +50,57 @@ public class ScheduleCommand {
         //     4: getstatic       net/minecraft/server/commands/ScheduleCommand.ERROR_SAME_TICK:Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
         //     7: invokevirtual   com/mojang/brigadier/exceptions/SimpleCommandExceptionType.create:()Lcom/mojang/brigadier/exceptions/CommandSyntaxException;
         //    10: athrow         
-        //    11: aload_0         /* cq */
+        //    11: aload_0         /* cz */
         //    12: invokevirtual   net/minecraft/commands/CommandSourceStack.getLevel:()Lnet/minecraft/server/level/ServerLevel;
         //    15: invokevirtual   net/minecraft/server/level/ServerLevel.getGameTime:()J
         //    18: iload_2         /* integer */
         //    19: i2l            
         //    20: ladd           
         //    21: lstore          long5
-        //    23: aload_0         /* cq */
-        //    24: invokevirtual   net/minecraft/commands/CommandSourceStack.getLevel:()Lnet/minecraft/server/level/ServerLevel;
-        //    27: invokevirtual   net/minecraft/server/level/ServerLevel.getLevelData:()Lnet/minecraft/world/level/storage/LevelData;
-        //    30: invokevirtual   net/minecraft/world/level/storage/LevelData.getScheduledEvents:()Lnet/minecraft/world/level/timers/TimerQueue;
-        //    33: astore          cvc7
-        //    35: aload_1         /* either */
-        //    36: iload_3         /* boolean4 */
-        //    37: aload           cvc7
-        //    39: lload           long5
-        //    41: aload_0         /* cq */
-        //    42: iload_2         /* integer */
-        //    43: invokedynamic   BootstrapMethod #5, accept:(ZLnet/minecraft/world/level/timers/TimerQueue;JLnet/minecraft/commands/CommandSourceStack;I)Ljava/util/function/Consumer;
-        //    48: invokevirtual   com/mojang/datafixers/util/Either.ifLeft:(Ljava/util/function/Consumer;)Lcom/mojang/datafixers/util/Either;
-        //    51: iload_3         /* boolean4 */
-        //    52: aload           cvc7
-        //    54: lload           long5
-        //    56: aload_0         /* cq */
-        //    57: iload_2         /* integer */
-        //    58: invokedynamic   BootstrapMethod #6, accept:(ZLnet/minecraft/world/level/timers/TimerQueue;JLnet/minecraft/commands/CommandSourceStack;I)Ljava/util/function/Consumer;
-        //    63: invokevirtual   com/mojang/datafixers/util/Either.ifRight:(Ljava/util/function/Consumer;)Lcom/mojang/datafixers/util/Either;
-        //    66: pop            
-        //    67: lload           long5
-        //    69: ldc2_w          2147483647
-        //    72: invokestatic    java/lang/Math.floorMod:(JJ)J
-        //    75: l2i            
-        //    76: ireturn        
+        //    23: aload_1         /* pair */
+        //    24: invokevirtual   com/mojang/datafixers/util/Pair.getFirst:()Ljava/lang/Object;
+        //    27: checkcast       Lnet/minecraft/resources/ResourceLocation;
+        //    30: astore          uh7
+        //    32: aload_0         /* cz */
+        //    33: invokevirtual   net/minecraft/commands/CommandSourceStack.getServer:()Lnet/minecraft/server/MinecraftServer;
+        //    36: invokevirtual   net/minecraft/server/MinecraftServer.getWorldData:()Lnet/minecraft/world/level/storage/WorldData;
+        //    39: invokeinterface net/minecraft/world/level/storage/WorldData.overworldData:()Lnet/minecraft/world/level/storage/ServerLevelData;
+        //    44: invokeinterface net/minecraft/world/level/storage/ServerLevelData.getScheduledEvents:()Lnet/minecraft/world/level/timers/TimerQueue;
+        //    49: astore          ded8
+        //    51: aload_1         /* pair */
+        //    52: invokevirtual   com/mojang/datafixers/util/Pair.getSecond:()Ljava/lang/Object;
+        //    55: checkcast       Lcom/mojang/datafixers/util/Either;
+        //    58: aload           uh7
+        //    60: iload_3         /* boolean4 */
+        //    61: aload           ded8
+        //    63: lload           long5
+        //    65: aload_0         /* cz */
+        //    66: iload_2         /* integer */
+        //    67: invokedynamic   BootstrapMethod #5, accept:(Lnet/minecraft/resources/ResourceLocation;ZLnet/minecraft/world/level/timers/TimerQueue;JLnet/minecraft/commands/CommandSourceStack;I)Ljava/util/function/Consumer;
+        //    72: invokevirtual   com/mojang/datafixers/util/Either.ifLeft:(Ljava/util/function/Consumer;)Lcom/mojang/datafixers/util/Either;
+        //    75: aload           uh7
+        //    77: iload_3         /* boolean4 */
+        //    78: aload           ded8
+        //    80: lload           long5
+        //    82: aload_0         /* cz */
+        //    83: iload_2         /* integer */
+        //    84: invokedynamic   BootstrapMethod #6, accept:(Lnet/minecraft/resources/ResourceLocation;ZLnet/minecraft/world/level/timers/TimerQueue;JLnet/minecraft/commands/CommandSourceStack;I)Ljava/util/function/Consumer;
+        //    89: invokevirtual   com/mojang/datafixers/util/Either.ifRight:(Ljava/util/function/Consumer;)Lcom/mojang/datafixers/util/Either;
+        //    92: pop            
+        //    93: lload           long5
+        //    95: ldc2_w          2147483647
+        //    98: invokestatic    java/lang/Math.floorMod:(JJ)J
+        //   101: l2i            
+        //   102: ireturn        
         //    Exceptions:
         //  throws com.mojang.brigadier.exceptions.CommandSyntaxException
         //    Signature:
-        //  (Lnet/minecraft/commands/CommandSourceStack;Lcom/mojang/datafixers/util/Either<Lnet/minecraft/commands/CommandFunction;Lnet/minecraft/tags/Tag<Lnet/minecraft/commands/CommandFunction;>;>;IZ)I
+        //  (Lnet/minecraft/commands/CommandSourceStack;Lcom/mojang/datafixers/util/Pair<Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/datafixers/util/Either<Lnet/minecraft/commands/CommandFunction;Lnet/minecraft/tags/Tag<Lnet/minecraft/commands/CommandFunction;>;>;>;IZ)I
         //    MethodParameters:
         //  Name      Flags  
         //  --------  -----
-        //  cq        
-        //  either    
+        //  cz        
+        //  pair      
         //  integer   
         //  boolean4  
         //    StackMapTable: 00 01 0B
@@ -135,22 +145,22 @@ public class ScheduleCommand {
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    private static int remove(final CommandSourceStack cq, final String string) throws CommandSyntaxException {
-        final int integer3 = cq.getLevel().getLevelData().getScheduledEvents().remove(string);
+    private static int remove(final CommandSourceStack cz, final String string) throws CommandSyntaxException {
+        final int integer3 = cz.getServer().getWorldData().overworldData().getScheduledEvents().remove(string);
         if (integer3 == 0) {
             throw ScheduleCommand.ERROR_CANT_REMOVE.create(string);
         }
-        cq.sendSuccess(new TranslatableComponent("commands.schedule.cleared.success", new Object[] { integer3, string }), true);
+        cz.sendSuccess(new TranslatableComponent("commands.schedule.cleared.success", new Object[] { integer3, string }), true);
         return integer3;
     }
     
     static {
-        ERROR_SAME_TICK = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.schedule.same_tick", new Object[0]));
+        ERROR_SAME_TICK = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.schedule.same_tick"));
         final TranslatableComponent translatableComponent;
         ERROR_CANT_REMOVE = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("commands.schedule.cleared.failure", new Object[] { object });
             return translatableComponent;
         });
-        SUGGEST_SCHEDULE = ((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getLevel().getLevelData().getScheduledEvents().getEventsIds(), suggestionsBuilder));
+        SUGGEST_SCHEDULE = ((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getWorldData().overworldData().getScheduledEvents().getEventsIds(), suggestionsBuilder));
     }
 }
diff --git a/src/net/minecraft/server/commands/ScoreboardCommand.java b/src/net/minecraft/server/commands/ScoreboardCommand.java
index 0eee594..c41854f 100644
--- a/src/net/minecraft/server/commands/ScoreboardCommand.java
+++ b/src/net/minecraft/server/commands/ScoreboardCommand.java
@@ -48,7 +48,7 @@ public class ScoreboardCommand {
     private static final Dynamic2CommandExceptionType ERROR_NO_VALUE;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("scoreboard").requires(cq -> cq.hasPermission(2))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("objectives").then(Commands.literal("list").executes(commandContext -> listObjectives((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("add").then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).then(((RequiredArgumentBuilder)Commands.argument("criteria", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveCriteriaArgument.criteria()).executes(commandContext -> addObjective((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "objective"), ObjectiveCriteriaArgument.getCriteria((CommandContext<CommandSourceStack>)commandContext, "criteria"), new TextComponent(StringArgumentType.getString(commandContext, "objective"))))).then(Commands.argument("displayName", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> addObjective((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "objective"), ObjectiveCriteriaArgument.getCriteria((CommandContext<CommandSourceStack>)commandContext, "criteria"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "displayName")))))))).then(Commands.literal("modify").then(((RequiredArgumentBuilder)Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).then(Commands.literal("displayname").then(Commands.argument("displayName", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> setDisplayName((CommandSourceStack)commandContext.getSource(), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "displayName")))))).then((ArgumentBuilder)createRenderTypeModify())))).then(Commands.literal("remove").then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).executes(commandContext -> removeObjective((CommandSourceStack)commandContext.getSource(), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective")))))).then(Commands.literal("setdisplay").then(((RequiredArgumentBuilder)Commands.argument("slot", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreboardSlotArgument.displaySlot()).executes(commandContext -> clearDisplaySlot((CommandSourceStack)commandContext.getSource(), ScoreboardSlotArgument.getDisplaySlot((CommandContext<CommandSourceStack>)commandContext, "slot")))).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).executes(commandContext -> setDisplaySlot((CommandSourceStack)commandContext.getSource(), ScoreboardSlotArgument.getDisplaySlot((CommandContext<CommandSourceStack>)commandContext, "slot"), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective")))))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("players").then(((LiteralArgumentBuilder)Commands.literal("list").executes(commandContext -> listTrackedPlayers((CommandSourceStack)commandContext.getSource()))).then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolder()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).executes(commandContext -> listTrackedPlayerScores((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getName((CommandContext<CommandSourceStack>)commandContext, "target")))))).then(Commands.literal("set").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).then(Commands.argument("score", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> setScore((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getWritableObjective((CommandContext<CommandSourceStack>)commandContext, "objective"), IntegerArgumentType.getInteger(commandContext, "score")))))))).then(Commands.literal("get").then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolder()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).executes(commandContext -> getScore((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getName((CommandContext<CommandSourceStack>)commandContext, "target"), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective"))))))).then(Commands.literal("add").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).then(Commands.argument("score", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> addScore((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getWritableObjective((CommandContext<CommandSourceStack>)commandContext, "objective"), IntegerArgumentType.getInteger(commandContext, "score")))))))).then(Commands.literal("remove").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).then(Commands.argument("score", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> removeScore((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getWritableObjective((CommandContext<CommandSourceStack>)commandContext, "objective"), IntegerArgumentType.getInteger(commandContext, "score")))))))).then(Commands.literal("reset").then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).executes(commandContext -> resetScores((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets")))).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).executes(commandContext -> resetScore((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective"))))))).then(Commands.literal("enable").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).suggests((commandContext, suggestionsBuilder) -> suggestTriggers((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), suggestionsBuilder)).executes(commandContext -> enableTrigger((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective"))))))).then(Commands.literal("operation").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("targetObjective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).then(Commands.argument("operation", (com.mojang.brigadier.arguments.ArgumentType<Object>)OperationArgument.operation()).then(Commands.argument("source", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("sourceObjective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).executes(commandContext -> performOperation((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getWritableObjective((CommandContext<CommandSourceStack>)commandContext, "targetObjective"), OperationArgument.getOperation((CommandContext<CommandSourceStack>)commandContext, "operation"), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "source"), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "sourceObjective")))))))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("scoreboard").requires(cz -> cz.hasPermission(2))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("objectives").then(Commands.literal("list").executes(commandContext -> listObjectives((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("add").then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).then(((RequiredArgumentBuilder)Commands.argument("criteria", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveCriteriaArgument.criteria()).executes(commandContext -> addObjective((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "objective"), ObjectiveCriteriaArgument.getCriteria((CommandContext<CommandSourceStack>)commandContext, "criteria"), new TextComponent(StringArgumentType.getString(commandContext, "objective"))))).then(Commands.argument("displayName", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> addObjective((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "objective"), ObjectiveCriteriaArgument.getCriteria((CommandContext<CommandSourceStack>)commandContext, "criteria"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "displayName")))))))).then(Commands.literal("modify").then(((RequiredArgumentBuilder)Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).then(Commands.literal("displayname").then(Commands.argument("displayName", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> setDisplayName((CommandSourceStack)commandContext.getSource(), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "displayName")))))).then((ArgumentBuilder)createRenderTypeModify())))).then(Commands.literal("remove").then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).executes(commandContext -> removeObjective((CommandSourceStack)commandContext.getSource(), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective")))))).then(Commands.literal("setdisplay").then(((RequiredArgumentBuilder)Commands.argument("slot", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreboardSlotArgument.displaySlot()).executes(commandContext -> clearDisplaySlot((CommandSourceStack)commandContext.getSource(), ScoreboardSlotArgument.getDisplaySlot((CommandContext<CommandSourceStack>)commandContext, "slot")))).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).executes(commandContext -> setDisplaySlot((CommandSourceStack)commandContext.getSource(), ScoreboardSlotArgument.getDisplaySlot((CommandContext<CommandSourceStack>)commandContext, "slot"), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective")))))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("players").then(((LiteralArgumentBuilder)Commands.literal("list").executes(commandContext -> listTrackedPlayers((CommandSourceStack)commandContext.getSource()))).then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolder()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).executes(commandContext -> listTrackedPlayerScores((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getName((CommandContext<CommandSourceStack>)commandContext, "target")))))).then(Commands.literal("set").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).then(Commands.argument("score", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> setScore((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getWritableObjective((CommandContext<CommandSourceStack>)commandContext, "objective"), IntegerArgumentType.getInteger(commandContext, "score")))))))).then(Commands.literal("get").then(Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolder()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).executes(commandContext -> getScore((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getName((CommandContext<CommandSourceStack>)commandContext, "target"), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective"))))))).then(Commands.literal("add").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).then(Commands.argument("score", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> addScore((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getWritableObjective((CommandContext<CommandSourceStack>)commandContext, "objective"), IntegerArgumentType.getInteger(commandContext, "score")))))))).then(Commands.literal("remove").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).then(Commands.argument("score", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> removeScore((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getWritableObjective((CommandContext<CommandSourceStack>)commandContext, "objective"), IntegerArgumentType.getInteger(commandContext, "score")))))))).then(Commands.literal("reset").then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).executes(commandContext -> resetScores((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets")))).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).executes(commandContext -> resetScore((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective"))))))).then(Commands.literal("enable").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).suggests((commandContext, suggestionsBuilder) -> suggestTriggers((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), suggestionsBuilder)).executes(commandContext -> enableTrigger((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective"))))))).then(Commands.literal("operation").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("targetObjective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).then(Commands.argument("operation", (com.mojang.brigadier.arguments.ArgumentType<Object>)OperationArgument.operation()).then(Commands.argument("source", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).then(Commands.argument("sourceObjective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).executes(commandContext -> performOperation((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "targets"), ObjectiveArgument.getWritableObjective((CommandContext<CommandSourceStack>)commandContext, "targetObjective"), OperationArgument.getOperation((CommandContext<CommandSourceStack>)commandContext, "operation"), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "source"), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "sourceObjective")))))))))));
     }
     
     private static LiteralArgumentBuilder<CommandSourceStack> createRenderTypeModify() {
@@ -59,14 +59,14 @@ public class ScoreboardCommand {
         return literalArgumentBuilder1;
     }
     
-    private static CompletableFuture<Suggestions> suggestTriggers(final CommandSourceStack cq, final Collection<String> collection, final SuggestionsBuilder suggestionsBuilder) {
+    private static CompletableFuture<Suggestions> suggestTriggers(final CommandSourceStack cz, final Collection<String> collection, final SuggestionsBuilder suggestionsBuilder) {
         final List<String> list4 = Lists.newArrayList();
-        final Scoreboard cwl5 = cq.getServer().getScoreboard();
-        for (final Objective cwi7 : cwl5.getObjectives()) {
-            if (cwi7.getCriteria() == ObjectiveCriteria.TRIGGER) {
+        final Scoreboard dfm5 = cz.getServer().getScoreboard();
+        for (final Objective dfj7 : dfm5.getObjectives()) {
+            if (dfj7.getCriteria() == ObjectiveCriteria.TRIGGER) {
                 boolean boolean8 = false;
                 for (final String string10 : collection) {
-                    if (!cwl5.hasPlayerScore(string10, cwi7) || cwl5.getOrCreatePlayerScore(string10, cwi7).isLocked()) {
+                    if (!dfm5.hasPlayerScore(string10, dfj7) || dfm5.getOrCreatePlayerScore(string10, dfj7).isLocked()) {
                         boolean8 = true;
                         break;
                     }
@@ -74,52 +74,52 @@ public class ScoreboardCommand {
                 if (!boolean8) {
                     continue;
                 }
-                list4.add(cwi7.getName());
+                list4.add(dfj7.getName());
             }
         }
         return SharedSuggestionProvider.suggest(list4, suggestionsBuilder);
     }
     
-    private static int getScore(final CommandSourceStack cq, final String string, final Objective cwi) throws CommandSyntaxException {
-        final Scoreboard cwl4 = cq.getServer().getScoreboard();
-        if (!cwl4.hasPlayerScore(string, cwi)) {
-            throw ScoreboardCommand.ERROR_NO_VALUE.create(cwi.getName(), string);
+    private static int getScore(final CommandSourceStack cz, final String string, final Objective dfj) throws CommandSyntaxException {
+        final Scoreboard dfm4 = cz.getServer().getScoreboard();
+        if (!dfm4.hasPlayerScore(string, dfj)) {
+            throw ScoreboardCommand.ERROR_NO_VALUE.create(dfj.getName(), string);
         }
-        final Score cwk5 = cwl4.getOrCreatePlayerScore(string, cwi);
-        cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.get.success", new Object[] { string, cwk5.getScore(), cwi.getFormattedDisplayName() }), false);
-        return cwk5.getScore();
+        final Score dfl5 = dfm4.getOrCreatePlayerScore(string, dfj);
+        cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.get.success", new Object[] { string, dfl5.getScore(), dfj.getFormattedDisplayName() }), false);
+        return dfl5.getScore();
     }
     
-    private static int performOperation(final CommandSourceStack cq, final Collection<String> collection2, final Objective cwi3, final OperationArgument.Operation a, final Collection<String> collection5, final Objective cwi6) throws CommandSyntaxException {
-        final Scoreboard cwl7 = cq.getServer().getScoreboard();
+    private static int performOperation(final CommandSourceStack cz, final Collection<String> collection2, final Objective dfj3, final OperationArgument.Operation a, final Collection<String> collection5, final Objective dfj6) throws CommandSyntaxException {
+        final Scoreboard dfm7 = cz.getServer().getScoreboard();
         int integer8 = 0;
         for (final String string10 : collection2) {
-            final Score cwk11 = cwl7.getOrCreatePlayerScore(string10, cwi3);
+            final Score dfl11 = dfm7.getOrCreatePlayerScore(string10, dfj3);
             for (final String string11 : collection5) {
-                final Score cwk12 = cwl7.getOrCreatePlayerScore(string11, cwi6);
-                a.apply(cwk11, cwk12);
+                final Score dfl12 = dfm7.getOrCreatePlayerScore(string11, dfj6);
+                a.apply(dfl11, dfl12);
             }
-            integer8 += cwk11.getScore();
+            integer8 += dfl11.getScore();
         }
         if (collection2.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.operation.success.single", new Object[] { cwi3.getFormattedDisplayName(), collection2.iterator().next(), integer8 }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.operation.success.single", new Object[] { dfj3.getFormattedDisplayName(), collection2.iterator().next(), integer8 }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.operation.success.multiple", new Object[] { cwi3.getFormattedDisplayName(), collection2.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.operation.success.multiple", new Object[] { dfj3.getFormattedDisplayName(), collection2.size() }), true);
         }
         return integer8;
     }
     
-    private static int enableTrigger(final CommandSourceStack cq, final Collection<String> collection, final Objective cwi) throws CommandSyntaxException {
-        if (cwi.getCriteria() != ObjectiveCriteria.TRIGGER) {
+    private static int enableTrigger(final CommandSourceStack cz, final Collection<String> collection, final Objective dfj) throws CommandSyntaxException {
+        if (dfj.getCriteria() != ObjectiveCriteria.TRIGGER) {
             throw ScoreboardCommand.ERROR_NOT_TRIGGER.create();
         }
-        final Scoreboard cwl4 = cq.getServer().getScoreboard();
+        final Scoreboard dfm4 = cz.getServer().getScoreboard();
         int integer5 = 0;
         for (final String string7 : collection) {
-            final Score cwk8 = cwl4.getOrCreatePlayerScore(string7, cwi);
-            if (cwk8.isLocked()) {
-                cwk8.setLocked(false);
+            final Score dfl8 = dfm4.getOrCreatePlayerScore(string7, dfj);
+            if (dfl8.isLocked()) {
+                dfl8.setLocked(false);
                 ++integer5;
             }
         }
@@ -127,190 +127,190 @@ public class ScoreboardCommand {
             throw ScoreboardCommand.ERROR_TRIGGER_ALREADY_ENABLED.create();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.enable.success.single", new Object[] { cwi.getFormattedDisplayName(), collection.iterator().next() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.enable.success.single", new Object[] { dfj.getFormattedDisplayName(), collection.iterator().next() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.enable.success.multiple", new Object[] { cwi.getFormattedDisplayName(), collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.enable.success.multiple", new Object[] { dfj.getFormattedDisplayName(), collection.size() }), true);
         }
         return integer5;
     }
     
-    private static int resetScores(final CommandSourceStack cq, final Collection<String> collection) {
-        final Scoreboard cwl3 = cq.getServer().getScoreboard();
+    private static int resetScores(final CommandSourceStack cz, final Collection<String> collection) {
+        final Scoreboard dfm3 = cz.getServer().getScoreboard();
         for (final String string5 : collection) {
-            cwl3.resetPlayerScore(string5, null);
+            dfm3.resetPlayerScore(string5, null);
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.reset.all.single", new Object[] { collection.iterator().next() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.reset.all.single", new Object[] { collection.iterator().next() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.reset.all.multiple", new Object[] { collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.reset.all.multiple", new Object[] { collection.size() }), true);
         }
         return collection.size();
     }
     
-    private static int resetScore(final CommandSourceStack cq, final Collection<String> collection, final Objective cwi) {
-        final Scoreboard cwl4 = cq.getServer().getScoreboard();
+    private static int resetScore(final CommandSourceStack cz, final Collection<String> collection, final Objective dfj) {
+        final Scoreboard dfm4 = cz.getServer().getScoreboard();
         for (final String string6 : collection) {
-            cwl4.resetPlayerScore(string6, cwi);
+            dfm4.resetPlayerScore(string6, dfj);
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.reset.specific.single", new Object[] { cwi.getFormattedDisplayName(), collection.iterator().next() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.reset.specific.single", new Object[] { dfj.getFormattedDisplayName(), collection.iterator().next() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.reset.specific.multiple", new Object[] { cwi.getFormattedDisplayName(), collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.reset.specific.multiple", new Object[] { dfj.getFormattedDisplayName(), collection.size() }), true);
         }
         return collection.size();
     }
     
-    private static int setScore(final CommandSourceStack cq, final Collection<String> collection, final Objective cwi, final int integer) {
-        final Scoreboard cwl5 = cq.getServer().getScoreboard();
+    private static int setScore(final CommandSourceStack cz, final Collection<String> collection, final Objective dfj, final int integer) {
+        final Scoreboard dfm5 = cz.getServer().getScoreboard();
         for (final String string7 : collection) {
-            final Score cwk8 = cwl5.getOrCreatePlayerScore(string7, cwi);
-            cwk8.setScore(integer);
+            final Score dfl8 = dfm5.getOrCreatePlayerScore(string7, dfj);
+            dfl8.setScore(integer);
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.set.success.single", new Object[] { cwi.getFormattedDisplayName(), collection.iterator().next(), integer }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.set.success.single", new Object[] { dfj.getFormattedDisplayName(), collection.iterator().next(), integer }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.set.success.multiple", new Object[] { cwi.getFormattedDisplayName(), collection.size(), integer }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.set.success.multiple", new Object[] { dfj.getFormattedDisplayName(), collection.size(), integer }), true);
         }
         return integer * collection.size();
     }
     
-    private static int addScore(final CommandSourceStack cq, final Collection<String> collection, final Objective cwi, final int integer) {
-        final Scoreboard cwl5 = cq.getServer().getScoreboard();
+    private static int addScore(final CommandSourceStack cz, final Collection<String> collection, final Objective dfj, final int integer) {
+        final Scoreboard dfm5 = cz.getServer().getScoreboard();
         int integer2 = 0;
         for (final String string8 : collection) {
-            final Score cwk9 = cwl5.getOrCreatePlayerScore(string8, cwi);
-            cwk9.setScore(cwk9.getScore() + integer);
-            integer2 += cwk9.getScore();
+            final Score dfl9 = dfm5.getOrCreatePlayerScore(string8, dfj);
+            dfl9.setScore(dfl9.getScore() + integer);
+            integer2 += dfl9.getScore();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.add.success.single", new Object[] { integer, cwi.getFormattedDisplayName(), collection.iterator().next(), integer2 }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.add.success.single", new Object[] { integer, dfj.getFormattedDisplayName(), collection.iterator().next(), integer2 }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.add.success.multiple", new Object[] { integer, cwi.getFormattedDisplayName(), collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.add.success.multiple", new Object[] { integer, dfj.getFormattedDisplayName(), collection.size() }), true);
         }
         return integer2;
     }
     
-    private static int removeScore(final CommandSourceStack cq, final Collection<String> collection, final Objective cwi, final int integer) {
-        final Scoreboard cwl5 = cq.getServer().getScoreboard();
+    private static int removeScore(final CommandSourceStack cz, final Collection<String> collection, final Objective dfj, final int integer) {
+        final Scoreboard dfm5 = cz.getServer().getScoreboard();
         int integer2 = 0;
         for (final String string8 : collection) {
-            final Score cwk9 = cwl5.getOrCreatePlayerScore(string8, cwi);
-            cwk9.setScore(cwk9.getScore() - integer);
-            integer2 += cwk9.getScore();
+            final Score dfl9 = dfm5.getOrCreatePlayerScore(string8, dfj);
+            dfl9.setScore(dfl9.getScore() - integer);
+            integer2 += dfl9.getScore();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.remove.success.single", new Object[] { integer, cwi.getFormattedDisplayName(), collection.iterator().next(), integer2 }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.remove.success.single", new Object[] { integer, dfj.getFormattedDisplayName(), collection.iterator().next(), integer2 }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.remove.success.multiple", new Object[] { integer, cwi.getFormattedDisplayName(), collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.remove.success.multiple", new Object[] { integer, dfj.getFormattedDisplayName(), collection.size() }), true);
         }
         return integer2;
     }
     
-    private static int listTrackedPlayers(final CommandSourceStack cq) {
-        final Collection<String> collection2 = cq.getServer().getScoreboard().getTrackedPlayers();
+    private static int listTrackedPlayers(final CommandSourceStack cz) {
+        final Collection<String> collection2 = cz.getServer().getScoreboard().getTrackedPlayers();
         if (collection2.isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.list.empty", new Object[0]), false);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.list.empty"), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.list.success", new Object[] { collection2.size(), ComponentUtils.formatList(collection2) }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.list.success", new Object[] { collection2.size(), ComponentUtils.formatList(collection2) }), false);
         }
         return collection2.size();
     }
     
-    private static int listTrackedPlayerScores(final CommandSourceStack cq, final String string) {
-        final Map<Objective, Score> map3 = cq.getServer().getScoreboard().getPlayerScores(string);
+    private static int listTrackedPlayerScores(final CommandSourceStack cz, final String string) {
+        final Map<Objective, Score> map3 = cz.getServer().getScoreboard().getPlayerScores(string);
         if (map3.isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.list.entity.empty", new Object[] { string }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.list.entity.empty", new Object[] { string }), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.list.entity.success", new Object[] { string, map3.size() }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.list.entity.success", new Object[] { string, map3.size() }), false);
             for (final Map.Entry<Objective, Score> entry5 : map3.entrySet()) {
-                cq.sendSuccess(new TranslatableComponent("commands.scoreboard.players.list.entity.entry", new Object[] { entry5.getKey().getFormattedDisplayName(), entry5.getValue().getScore() }), false);
+                cz.sendSuccess(new TranslatableComponent("commands.scoreboard.players.list.entity.entry", new Object[] { entry5.getKey().getFormattedDisplayName(), entry5.getValue().getScore() }), false);
             }
         }
         return map3.size();
     }
     
-    private static int clearDisplaySlot(final CommandSourceStack cq, final int integer) throws CommandSyntaxException {
-        final Scoreboard cwl3 = cq.getServer().getScoreboard();
-        if (cwl3.getDisplayObjective(integer) == null) {
+    private static int clearDisplaySlot(final CommandSourceStack cz, final int integer) throws CommandSyntaxException {
+        final Scoreboard dfm3 = cz.getServer().getScoreboard();
+        if (dfm3.getDisplayObjective(integer) == null) {
             throw ScoreboardCommand.ERROR_DISPLAY_SLOT_ALREADY_EMPTY.create();
         }
-        cwl3.setDisplayObjective(integer, null);
-        cq.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.display.cleared", new Object[] { Scoreboard.getDisplaySlotNames()[integer] }), true);
+        dfm3.setDisplayObjective(integer, null);
+        cz.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.display.cleared", new Object[] { Scoreboard.getDisplaySlotNames()[integer] }), true);
         return 0;
     }
     
-    private static int setDisplaySlot(final CommandSourceStack cq, final int integer, final Objective cwi) throws CommandSyntaxException {
-        final Scoreboard cwl4 = cq.getServer().getScoreboard();
-        if (cwl4.getDisplayObjective(integer) == cwi) {
+    private static int setDisplaySlot(final CommandSourceStack cz, final int integer, final Objective dfj) throws CommandSyntaxException {
+        final Scoreboard dfm4 = cz.getServer().getScoreboard();
+        if (dfm4.getDisplayObjective(integer) == dfj) {
             throw ScoreboardCommand.ERROR_DISPLAY_SLOT_ALREADY_SET.create();
         }
-        cwl4.setDisplayObjective(integer, cwi);
-        cq.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.display.set", new Object[] { Scoreboard.getDisplaySlotNames()[integer], cwi.getDisplayName() }), true);
+        dfm4.setDisplayObjective(integer, dfj);
+        cz.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.display.set", new Object[] { Scoreboard.getDisplaySlotNames()[integer], dfj.getDisplayName() }), true);
         return 0;
     }
     
-    private static int setDisplayName(final CommandSourceStack cq, final Objective cwi, final Component lf) {
-        if (!cwi.getDisplayName().equals(lf)) {
-            cwi.setDisplayName(lf);
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.modify.displayname", new Object[] { cwi.getName(), cwi.getFormattedDisplayName() }), true);
+    private static int setDisplayName(final CommandSourceStack cz, final Objective dfj, final Component mr) {
+        if (!dfj.getDisplayName().equals(mr)) {
+            dfj.setDisplayName(mr);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.modify.displayname", new Object[] { dfj.getName(), dfj.getFormattedDisplayName() }), true);
         }
         return 0;
     }
     
-    private static int setRenderType(final CommandSourceStack cq, final Objective cwi, final ObjectiveCriteria.RenderType a) {
-        if (cwi.getRenderType() != a) {
-            cwi.setRenderType(a);
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.modify.rendertype", new Object[] { cwi.getFormattedDisplayName() }), true);
+    private static int setRenderType(final CommandSourceStack cz, final Objective dfj, final ObjectiveCriteria.RenderType a) {
+        if (dfj.getRenderType() != a) {
+            dfj.setRenderType(a);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.modify.rendertype", new Object[] { dfj.getFormattedDisplayName() }), true);
         }
         return 0;
     }
     
-    private static int removeObjective(final CommandSourceStack cq, final Objective cwi) {
-        final Scoreboard cwl3 = cq.getServer().getScoreboard();
-        cwl3.removeObjective(cwi);
-        cq.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.remove.success", new Object[] { cwi.getFormattedDisplayName() }), true);
-        return cwl3.getObjectives().size();
+    private static int removeObjective(final CommandSourceStack cz, final Objective dfj) {
+        final Scoreboard dfm3 = cz.getServer().getScoreboard();
+        dfm3.removeObjective(dfj);
+        cz.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.remove.success", new Object[] { dfj.getFormattedDisplayName() }), true);
+        return dfm3.getObjectives().size();
     }
     
-    private static int addObjective(final CommandSourceStack cq, final String string, final ObjectiveCriteria cwo, final Component lf) throws CommandSyntaxException {
-        final Scoreboard cwl5 = cq.getServer().getScoreboard();
-        if (cwl5.getObjective(string) != null) {
+    private static int addObjective(final CommandSourceStack cz, final String string, final ObjectiveCriteria dfp, final Component mr) throws CommandSyntaxException {
+        final Scoreboard dfm5 = cz.getServer().getScoreboard();
+        if (dfm5.getObjective(string) != null) {
             throw ScoreboardCommand.ERROR_OBJECTIVE_ALREADY_EXISTS.create();
         }
         if (string.length() > 16) {
             throw ObjectiveArgument.ERROR_OBJECTIVE_NAME_TOO_LONG.create(16);
         }
-        cwl5.addObjective(string, cwo, lf, cwo.getDefaultRenderType());
-        final Objective cwi6 = cwl5.getObjective(string);
-        cq.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.add.success", new Object[] { cwi6.getFormattedDisplayName() }), true);
-        return cwl5.getObjectives().size();
+        dfm5.addObjective(string, dfp, mr, dfp.getDefaultRenderType());
+        final Objective dfj6 = dfm5.getObjective(string);
+        cz.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.add.success", new Object[] { dfj6.getFormattedDisplayName() }), true);
+        return dfm5.getObjectives().size();
     }
     
-    private static int listObjectives(final CommandSourceStack cq) {
-        final Collection<Objective> collection2 = cq.getServer().getScoreboard().getObjectives();
+    private static int listObjectives(final CommandSourceStack cz) {
+        final Collection<Objective> collection2 = cz.getServer().getScoreboard().getObjectives();
         if (collection2.isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.list.empty", new Object[0]), false);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.list.empty"), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.list.success", new Object[] { collection2.size(), ComponentUtils.<Objective>formatList(collection2, Objective::getFormattedDisplayName) }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.scoreboard.objectives.list.success", new Object[] { collection2.size(), ComponentUtils.<Objective>formatList(collection2, Objective::getFormattedDisplayName) }), false);
         }
         return collection2.size();
     }
     
     static {
-        ERROR_OBJECTIVE_ALREADY_EXISTS = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.scoreboard.objectives.add.duplicate", new Object[0]));
-        ERROR_DISPLAY_SLOT_ALREADY_EMPTY = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.scoreboard.objectives.display.alreadyEmpty", new Object[0]));
-        ERROR_DISPLAY_SLOT_ALREADY_SET = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.scoreboard.objectives.display.alreadySet", new Object[0]));
-        ERROR_TRIGGER_ALREADY_ENABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.scoreboard.players.enable.failed", new Object[0]));
-        ERROR_NOT_TRIGGER = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.scoreboard.players.enable.invalid", new Object[0]));
+        ERROR_OBJECTIVE_ALREADY_EXISTS = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.scoreboard.objectives.add.duplicate"));
+        ERROR_DISPLAY_SLOT_ALREADY_EMPTY = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.scoreboard.objectives.display.alreadyEmpty"));
+        ERROR_DISPLAY_SLOT_ALREADY_SET = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.scoreboard.objectives.display.alreadySet"));
+        ERROR_TRIGGER_ALREADY_ENABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.scoreboard.players.enable.failed"));
+        ERROR_NOT_TRIGGER = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.scoreboard.players.enable.invalid"));
         ERROR_NO_VALUE = new Dynamic2CommandExceptionType((object1, object2) -> new TranslatableComponent("commands.scoreboard.players.get.null", new Object[] { object1, object2 }));
     }
 }
diff --git a/src/net/minecraft/server/commands/SeedCommand.java b/src/net/minecraft/server/commands/SeedCommand.java
index 3561815..804d484 100644
--- a/src/net/minecraft/server/commands/SeedCommand.java
+++ b/src/net/minecraft/server/commands/SeedCommand.java
@@ -2,8 +2,8 @@ package net.minecraft.server.commands;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.network.chat.Style;
-import net.minecraft.network.chat.ComponentUtils;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentUtils;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.ClickEvent;
@@ -16,19 +16,18 @@ import net.minecraft.commands.CommandSourceStack;
 import com.mojang.brigadier.CommandDispatcher;
 
 public class SeedCommand {
-    public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("seed").requires(cq -> cq.getServer().isSingleplayer() || cq.hasPermission(2))).executes(commandContext -> {
+    public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher, final boolean boolean2) {
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("seed").requires(cz -> !boolean2 || cz.hasPermission(2))).executes(commandContext -> {
             final long long2 = ((CommandSourceStack)commandContext.getSource()).getLevel().getSeed();
             final long n;
-            final HoverEvent hoverEvent;
+            final HoverEvent mv;
             final Style style;
-            final Component lf4 = ComponentUtils.wrapInSquareBrackets(new TextComponent(String.valueOf(long2)).withStyle(ln -> {
-                ln.setColor(ChatFormatting.GREEN).setClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, String.valueOf(n)));
-                new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TranslatableComponent("chat.copy.click", new Object[0]));
-                style.setHoverEvent(hoverEvent).setInsertion(String.valueOf(n));
-                return;
+            final Component mr4 = ComponentUtils.wrapInSquareBrackets(new TextComponent(String.valueOf(long2)).withStyle(nb -> {
+                nb.withColor(ChatFormatting.GREEN).withClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, String.valueOf(n)));
+                new HoverEvent((HoverEvent.Action<TranslatableComponent>)HoverEvent.Action.SHOW_TEXT, new TranslatableComponent("chat.copy.click"));
+                return style.withHoverEvent(mv).withInsertion(String.valueOf(n));
             }));
-            ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.seed.success", new Object[] { lf4 }), false);
+            ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.seed.success", new Object[] { mr4 }), false);
             return (int)long2;
         }));
     }
diff --git a/src/net/minecraft/server/commands/SetBlockCommand.java b/src/net/minecraft/server/commands/SetBlockCommand.java
index c201471..39b6f5a 100644
--- a/src/net/minecraft/server/commands/SetBlockCommand.java
+++ b/src/net/minecraft/server/commands/SetBlockCommand.java
@@ -29,34 +29,34 @@ public class SetBlockCommand {
     private static final SimpleCommandExceptionType ERROR_FAILED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("setblock").requires(cq -> cq.hasPermission(2))).then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("block", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockStateArgument.block()).executes(commandContext -> setBlock((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, null))).then(Commands.literal("destroy").executes(commandContext -> setBlock((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.DESTROY, null)))).then(Commands.literal("keep").executes(commandContext -> setBlock((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, byn -> byn.getLevel().isEmptyBlock(byn.getPos()))))).then(Commands.literal("replace").executes(commandContext -> setBlock((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, null))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("setblock").requires(cz -> cz.hasPermission(2))).then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("block", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockStateArgument.block()).executes(commandContext -> setBlock((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, null))).then(Commands.literal("destroy").executes(commandContext -> setBlock((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.DESTROY, null)))).then(Commands.literal("keep").executes(commandContext -> setBlock((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, cfn -> cfn.getLevel().isEmptyBlock(cfn.getPos()))))).then(Commands.literal("replace").executes(commandContext -> setBlock((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getLoadedBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"), BlockStateArgument.getBlock((CommandContext<CommandSourceStack>)commandContext, "block"), Mode.REPLACE, null))))));
     }
     
-    private static int setBlock(final CommandSourceStack cq, final BlockPos fk, final BlockInput ds, final Mode b, @Nullable final Predicate<BlockInWorld> predicate) throws CommandSyntaxException {
-        final ServerLevel xd6 = cq.getLevel();
-        if (predicate != null && !predicate.test(new BlockInWorld(xd6, fk, true))) {
+    private static int setBlock(final CommandSourceStack cz, final BlockPos fu, final BlockInput ec, final Mode b, @Nullable final Predicate<BlockInWorld> predicate) throws CommandSyntaxException {
+        final ServerLevel zd6 = cz.getLevel();
+        if (predicate != null && !predicate.test(new BlockInWorld(zd6, fu, true))) {
             throw SetBlockCommand.ERROR_FAILED.create();
         }
         boolean boolean7;
         if (b == Mode.DESTROY) {
-            xd6.destroyBlock(fk, true);
-            boolean7 = !ds.getState().isAir();
+            zd6.destroyBlock(fu, true);
+            boolean7 = (!ec.getState().isAir() || !zd6.getBlockState(fu).isAir());
         }
         else {
-            final BlockEntity bwl8 = xd6.getBlockEntity(fk);
-            Clearable.tryClear(bwl8);
+            final BlockEntity cdl8 = zd6.getBlockEntity(fu);
+            Clearable.tryClear(cdl8);
             boolean7 = true;
         }
-        if (boolean7 && !ds.place(xd6, fk, 2)) {
+        if (boolean7 && !ec.place(zd6, fu, 2)) {
             throw SetBlockCommand.ERROR_FAILED.create();
         }
-        xd6.blockUpdated(fk, ds.getState().getBlock());
-        cq.sendSuccess(new TranslatableComponent("commands.setblock.success", new Object[] { fk.getX(), fk.getY(), fk.getZ() }), true);
+        zd6.blockUpdated(fu, ec.getState().getBlock());
+        cz.sendSuccess(new TranslatableComponent("commands.setblock.success", new Object[] { fu.getX(), fu.getY(), fu.getZ() }), true);
         return 1;
     }
     
     static {
-        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.setblock.failed", new Object[0]));
+        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.setblock.failed"));
     }
     
     public enum Mode {
@@ -66,6 +66,6 @@ public class SetBlockCommand {
     
     public interface Filter {
         @Nullable
-        BlockInput filter(final BoundingBox clb, final BlockPos fk, final BlockInput ds, final ServerLevel xd);
+        BlockInput filter(final BoundingBox ctd, final BlockPos fu, final BlockInput ec, final ServerLevel zd);
     }
 }
diff --git a/src/net/minecraft/server/commands/SetPlayerIdleTimeoutCommand.java b/src/net/minecraft/server/commands/SetPlayerIdleTimeoutCommand.java
index 471a94c..27fd089 100644
--- a/src/net/minecraft/server/commands/SetPlayerIdleTimeoutCommand.java
+++ b/src/net/minecraft/server/commands/SetPlayerIdleTimeoutCommand.java
@@ -13,12 +13,12 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class SetPlayerIdleTimeoutCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("setidletimeout").requires(cq -> cq.hasPermission(3))).then(Commands.argument("minutes", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setIdleTimeout((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "minutes")))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("setidletimeout").requires(cz -> cz.hasPermission(3))).then(Commands.argument("minutes", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setIdleTimeout((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "minutes")))));
     }
     
-    private static int setIdleTimeout(final CommandSourceStack cq, final int integer) {
-        cq.getServer().setPlayerIdleTimeout(integer);
-        cq.sendSuccess(new TranslatableComponent("commands.setidletimeout.success", new Object[] { integer }), true);
+    private static int setIdleTimeout(final CommandSourceStack cz, final int integer) {
+        cz.getServer().setPlayerIdleTimeout(integer);
+        cz.sendSuccess(new TranslatableComponent("commands.setidletimeout.success", new Object[] { integer }), true);
         return integer;
     }
 }
diff --git a/src/net/minecraft/server/commands/SetSpawnCommand.java b/src/net/minecraft/server/commands/SetSpawnCommand.java
index 60ddcbb..733dbdc 100644
--- a/src/net/minecraft/server/commands/SetSpawnCommand.java
+++ b/src/net/minecraft/server/commands/SetSpawnCommand.java
@@ -4,6 +4,8 @@ import java.util.Collections;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.context.CommandContext;
 import java.util.Iterator;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.core.BlockPos;
@@ -20,18 +22,20 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class SetSpawnCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("spawnpoint").requires(cq -> cq.hasPermission(2))).executes(commandContext -> setSpawn((CommandSourceStack)commandContext.getSource(), Collections.<ServerPlayer>singleton(((CommandSourceStack)commandContext.getSource()).getPlayerOrException()), new BlockPos(((CommandSourceStack)commandContext.getSource()).getPosition())))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> setSpawn((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), new BlockPos(((CommandSourceStack)commandContext.getSource()).getPosition())))).then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).executes(commandContext -> setSpawn((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), BlockPosArgument.getOrLoadBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("spawnpoint").requires(cz -> cz.hasPermission(2))).executes(commandContext -> setSpawn((CommandSourceStack)commandContext.getSource(), Collections.<ServerPlayer>singleton(((CommandSourceStack)commandContext.getSource()).getPlayerOrException()), new BlockPos(((CommandSourceStack)commandContext.getSource()).getPosition())))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> setSpawn((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), new BlockPos(((CommandSourceStack)commandContext.getSource()).getPosition())))).then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).executes(commandContext -> setSpawn((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), BlockPosArgument.getOrLoadBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos"))))));
     }
     
-    private static int setSpawn(final CommandSourceStack cq, final Collection<ServerPlayer> collection, final BlockPos fk) {
-        for (final ServerPlayer xe5 : collection) {
-            xe5.setRespawnPosition(fk, true, false);
+    private static int setSpawn(final CommandSourceStack cz, final Collection<ServerPlayer> collection, final BlockPos fu) {
+        final ResourceKey<Level> ug4 = cz.getLevel().dimension();
+        for (final ServerPlayer ze6 : collection) {
+            ze6.setRespawnPosition(ug4, fu, true, false);
         }
+        final String string5 = ug4.location().toString();
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.spawnpoint.success.single", new Object[] { fk.getX(), fk.getY(), fk.getZ(), collection.iterator().next().getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.spawnpoint.success.single", new Object[] { fu.getX(), fu.getY(), fu.getZ(), string5, collection.iterator().next().getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.spawnpoint.success.multiple", new Object[] { fk.getX(), fk.getY(), fk.getZ(), collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.spawnpoint.success.multiple", new Object[] { fu.getX(), fu.getY(), fu.getZ(), string5, collection.size() }), true);
         }
         return collection.size();
     }
diff --git a/src/net/minecraft/server/commands/SetWorldSpawnCommand.java b/src/net/minecraft/server/commands/SetWorldSpawnCommand.java
index d8baf4c..41439ae 100644
--- a/src/net/minecraft/server/commands/SetWorldSpawnCommand.java
+++ b/src/net/minecraft/server/commands/SetWorldSpawnCommand.java
@@ -4,8 +4,6 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientboundSetSpawnPositionPacket;
 import net.minecraft.core.BlockPos;
 import com.mojang.brigadier.arguments.ArgumentType;
 import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
@@ -16,13 +14,12 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class SetWorldSpawnCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("setworldspawn").requires(cq -> cq.hasPermission(2))).executes(commandContext -> setSpawn((CommandSourceStack)commandContext.getSource(), new BlockPos(((CommandSourceStack)commandContext.getSource()).getPosition())))).then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).executes(commandContext -> setSpawn((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getOrLoadBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos")))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("setworldspawn").requires(cz -> cz.hasPermission(2))).executes(commandContext -> setSpawn((CommandSourceStack)commandContext.getSource(), new BlockPos(((CommandSourceStack)commandContext.getSource()).getPosition())))).then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)BlockPosArgument.blockPos()).executes(commandContext -> setSpawn((CommandSourceStack)commandContext.getSource(), BlockPosArgument.getOrLoadBlockPos((CommandContext<CommandSourceStack>)commandContext, "pos")))));
     }
     
-    private static int setSpawn(final CommandSourceStack cq, final BlockPos fk) {
-        cq.getLevel().setSpawnPos(fk);
-        cq.getServer().getPlayerList().broadcastAll(new ClientboundSetSpawnPositionPacket(fk));
-        cq.sendSuccess(new TranslatableComponent("commands.setworldspawn.success", new Object[] { fk.getX(), fk.getY(), fk.getZ() }), true);
+    private static int setSpawn(final CommandSourceStack cz, final BlockPos fu) {
+        cz.getLevel().setDefaultSpawnPos(fu);
+        cz.sendSuccess(new TranslatableComponent("commands.setworldspawn.success", new Object[] { fu.getX(), fu.getY(), fu.getZ() }), true);
         return 1;
     }
 }
diff --git a/src/net/minecraft/server/commands/SpectateCommand.java b/src/net/minecraft/server/commands/SpectateCommand.java
index f3e75d7..6c599e7 100644
--- a/src/net/minecraft/server/commands/SpectateCommand.java
+++ b/src/net/minecraft/server/commands/SpectateCommand.java
@@ -24,28 +24,28 @@ public class SpectateCommand {
     private static final DynamicCommandExceptionType ERROR_NOT_SPECTATOR;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("spectate").requires(cq -> cq.hasPermission(2))).executes(commandContext -> spectate((CommandSourceStack)commandContext.getSource(), null, ((CommandSourceStack)commandContext.getSource()).getPlayerOrException()))).then(((RequiredArgumentBuilder)Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).executes(commandContext -> spectate((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ((CommandSourceStack)commandContext.getSource()).getPlayerOrException()))).then(Commands.argument("player", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.player()).executes(commandContext -> spectate((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), EntityArgument.getPlayer((CommandContext<CommandSourceStack>)commandContext, "player"))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("spectate").requires(cz -> cz.hasPermission(2))).executes(commandContext -> spectate((CommandSourceStack)commandContext.getSource(), null, ((CommandSourceStack)commandContext.getSource()).getPlayerOrException()))).then(((RequiredArgumentBuilder)Commands.argument("target", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).executes(commandContext -> spectate((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), ((CommandSourceStack)commandContext.getSource()).getPlayerOrException()))).then(Commands.argument("player", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.player()).executes(commandContext -> spectate((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "target"), EntityArgument.getPlayer((CommandContext<CommandSourceStack>)commandContext, "player"))))));
     }
     
-    private static int spectate(final CommandSourceStack cq, @Nullable final Entity akq, final ServerPlayer xe) throws CommandSyntaxException {
-        if (xe == akq) {
+    private static int spectate(final CommandSourceStack cz, @Nullable final Entity aom, final ServerPlayer ze) throws CommandSyntaxException {
+        if (ze == aom) {
             throw SpectateCommand.ERROR_SELF.create();
         }
-        if (xe.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) {
-            throw SpectateCommand.ERROR_NOT_SPECTATOR.create(xe.getDisplayName());
+        if (ze.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) {
+            throw SpectateCommand.ERROR_NOT_SPECTATOR.create(ze.getDisplayName());
         }
-        xe.setCamera(akq);
-        if (akq != null) {
-            cq.sendSuccess(new TranslatableComponent("commands.spectate.success.started", new Object[] { akq.getDisplayName() }), false);
+        ze.setCamera(aom);
+        if (aom != null) {
+            cz.sendSuccess(new TranslatableComponent("commands.spectate.success.started", new Object[] { aom.getDisplayName() }), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.spectate.success.stopped", new Object[0]), false);
+            cz.sendSuccess(new TranslatableComponent("commands.spectate.success.stopped"), false);
         }
         return 1;
     }
     
     static {
-        ERROR_SELF = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.spectate.self", new Object[0]));
+        ERROR_SELF = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.spectate.self"));
         final TranslatableComponent translatableComponent;
         ERROR_NOT_SPECTATOR = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("commands.spectate.not_spectator", new Object[] { object });
diff --git a/src/net/minecraft/server/commands/SpreadPlayersCommand.java b/src/net/minecraft/server/commands/SpreadPlayersCommand.java
index 697aaf2..6cef84d 100644
--- a/src/net/minecraft/server/commands/SpreadPlayersCommand.java
+++ b/src/net/minecraft/server/commands/SpreadPlayersCommand.java
@@ -2,6 +2,7 @@ package net.minecraft.server.commands;
 
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
+import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
 import com.mojang.brigadier.Message;
 import com.mojang.brigadier.context.CommandContext;
@@ -23,8 +24,10 @@ import java.util.Random;
 import net.minecraft.world.entity.Entity;
 import java.util.Collection;
 import net.minecraft.world.phys.Vec2;
+import com.mojang.brigadier.arguments.IntegerArgumentType;
 import net.minecraft.commands.arguments.EntityArgument;
 import com.mojang.brigadier.arguments.BoolArgumentType;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.brigadier.arguments.FloatArgumentType;
 import com.mojang.brigadier.arguments.ArgumentType;
 import net.minecraft.commands.arguments.coordinates.Vec2Argument;
@@ -39,27 +42,27 @@ public class SpreadPlayersCommand {
     private static final Dynamic4CommandExceptionType ERROR_FAILED_TO_SPREAD_ENTITIES;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("spreadplayers").requires(cq -> cq.hasPermission(2))).then(Commands.argument("center", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec2Argument.vec2()).then(Commands.argument("spreadDistance", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f)).then(Commands.argument("maxRange", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(1.0f)).then(Commands.argument("respectTeams", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).executes(commandContext -> spreadPlayers((CommandSourceStack)commandContext.getSource(), Vec2Argument.getVec2((CommandContext<CommandSourceStack>)commandContext, "center"), FloatArgumentType.getFloat(commandContext, "spreadDistance"), FloatArgumentType.getFloat(commandContext, "maxRange"), BoolArgumentType.getBool(commandContext, "respectTeams"), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets")))))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("spreadplayers").requires(cz -> cz.hasPermission(2))).then(Commands.argument("center", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec2Argument.vec2()).then(Commands.argument("spreadDistance", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f)).then(((RequiredArgumentBuilder)Commands.argument("maxRange", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(1.0f)).then(Commands.argument("respectTeams", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).executes(commandContext -> spreadPlayers((CommandSourceStack)commandContext.getSource(), Vec2Argument.getVec2((CommandContext<CommandSourceStack>)commandContext, "center"), FloatArgumentType.getFloat(commandContext, "spreadDistance"), FloatArgumentType.getFloat(commandContext, "maxRange"), 256, BoolArgumentType.getBool(commandContext, "respectTeams"), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets")))))).then(Commands.literal("under").then(Commands.argument("maxHeight", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).then(Commands.argument("respectTeams", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).executes(commandContext -> spreadPlayers((CommandSourceStack)commandContext.getSource(), Vec2Argument.getVec2((CommandContext<CommandSourceStack>)commandContext, "center"), FloatArgumentType.getFloat(commandContext, "spreadDistance"), FloatArgumentType.getFloat(commandContext, "maxRange"), IntegerArgumentType.getInteger(commandContext, "maxHeight"), BoolArgumentType.getBool(commandContext, "respectTeams"), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets")))))))))));
     }
     
-    private static int spreadPlayers(final CommandSourceStack cq, final Vec2 cvk, final float float3, final float float4, final boolean boolean5, final Collection<? extends Entity> collection) throws CommandSyntaxException {
-        final Random random7 = new Random();
-        final double double8 = cvk.x - float4;
-        final double double9 = cvk.y - float4;
-        final double double10 = cvk.x + float4;
-        final double double11 = cvk.y + float4;
-        final Position[] arr16 = createInitialPositions(random7, boolean5 ? getNumberOfTeams(collection) : collection.size(), double8, double9, double10, double11);
-        spreadPositions(cvk, float3, cq.getLevel(), random7, double8, double9, double10, double11, arr16, boolean5);
-        final double double12 = setPlayerPositions(collection, cq.getLevel(), arr16, boolean5);
-        cq.sendSuccess(new TranslatableComponent("commands.spreadplayers.success." + (boolean5 ? "teams" : "entities"), new Object[] { arr16.length, cvk.x, cvk.y, String.format(Locale.ROOT, "%.2f", double12) }), true);
-        return arr16.length;
+    private static int spreadPlayers(final CommandSourceStack cz, final Vec2 del, final float float3, final float float4, final int integer, final boolean boolean6, final Collection<? extends Entity> collection) throws CommandSyntaxException {
+        final Random random8 = new Random();
+        final double double9 = del.x - float4;
+        final double double10 = del.y - float4;
+        final double double11 = del.x + float4;
+        final double double12 = del.y + float4;
+        final Position[] arr17 = createInitialPositions(random8, boolean6 ? getNumberOfTeams(collection) : collection.size(), double9, double10, double11, double12);
+        spreadPositions(del, float3, cz.getLevel(), random8, double9, double10, double11, double12, integer, arr17, boolean6);
+        final double double13 = setPlayerPositions(collection, cz.getLevel(), arr17, integer, boolean6);
+        cz.sendSuccess(new TranslatableComponent("commands.spreadplayers.success." + (boolean6 ? "teams" : "entities"), new Object[] { arr17.length, del.x, del.y, String.format(Locale.ROOT, "%.2f", double13) }), true);
+        return arr17.length;
     }
     
     private static int getNumberOfTeams(final Collection<? extends Entity> collection) {
         final Set<Team> set2 = Sets.newHashSet();
-        for (final Entity akq4 : collection) {
-            if (akq4 instanceof Player) {
-                set2.add(akq4.getTeam());
+        for (final Entity aom4 : collection) {
+            if (aom4 instanceof Player) {
+                set2.add(aom4.getTeam());
             }
             else {
                 set2.add(null);
@@ -68,51 +71,51 @@ public class SpreadPlayersCommand {
         return set2.size();
     }
     
-    private static void spreadPositions(final Vec2 cvk, final double double2, final ServerLevel xd, final Random random, final double double5, final double double6, final double double7, final double double8, final Position[] arr, final boolean boolean10) throws CommandSyntaxException {
-        boolean boolean11 = true;
+    private static void spreadPositions(final Vec2 del, final double double2, final ServerLevel zd, final Random random, final double double5, final double double6, final double double7, final double double8, final int integer, final Position[] arr, final boolean boolean11) throws CommandSyntaxException {
+        boolean boolean12 = true;
         double double9 = 3.4028234663852886E38;
-        int integer17;
-        for (integer17 = 0; integer17 < 10000 && boolean11; ++integer17) {
-            boolean11 = false;
+        int integer2;
+        for (integer2 = 0; integer2 < 10000 && boolean12; ++integer2) {
+            boolean12 = false;
             double9 = 3.4028234663852886E38;
-            for (int integer18 = 0; integer18 < arr.length; ++integer18) {
-                final Position a21 = arr[integer18];
-                int integer19 = 0;
-                final Position a22 = new Position();
-                for (int integer20 = 0; integer20 < arr.length; ++integer20) {
-                    if (integer18 != integer20) {
-                        final Position a23 = arr[integer20];
-                        final double double10 = a21.dist(a23);
+            for (int integer3 = 0; integer3 < arr.length; ++integer3) {
+                final Position a22 = arr[integer3];
+                int integer4 = 0;
+                final Position a23 = new Position();
+                for (int integer5 = 0; integer5 < arr.length; ++integer5) {
+                    if (integer3 != integer5) {
+                        final Position a24 = arr[integer5];
+                        final double double10 = a22.dist(a24);
                         double9 = Math.min(double10, double9);
                         if (double10 < double2) {
-                            ++integer19;
-                            a22.x += a23.x - a21.x;
-                            a22.z += a23.z - a21.z;
+                            ++integer4;
+                            a23.x += a24.x - a22.x;
+                            a23.z += a24.z - a22.z;
                         }
                     }
                 }
-                if (integer19 > 0) {
-                    a22.x /= integer19;
-                    a22.z /= integer19;
-                    final double double11 = a22.getLength();
+                if (integer4 > 0) {
+                    a23.x /= integer4;
+                    a23.z /= integer4;
+                    final double double11 = a23.getLength();
                     if (double11 > 0.0) {
-                        a22.normalize();
-                        a21.moveAway(a22);
+                        a23.normalize();
+                        a22.moveAway(a23);
                     }
                     else {
-                        a21.randomize(random, double5, double6, double7, double8);
+                        a22.randomize(random, double5, double6, double7, double8);
                     }
-                    boolean11 = true;
+                    boolean12 = true;
                 }
-                if (a21.clamp(double5, double6, double7, double8)) {
-                    boolean11 = true;
+                if (a22.clamp(double5, double6, double7, double8)) {
+                    boolean12 = true;
                 }
             }
-            if (!boolean11) {
-                for (final Position a22 : arr) {
-                    if (!a22.isSafe(xd)) {
-                        a22.randomize(random, double5, double6, double7, double8);
-                        boolean11 = true;
+            if (!boolean12) {
+                for (final Position a23 : arr) {
+                    if (!a23.isSafe(zd, integer)) {
+                        a23.randomize(random, double5, double6, double7, double8);
+                        boolean12 = true;
                     }
                 }
             }
@@ -120,46 +123,46 @@ public class SpreadPlayersCommand {
         if (double9 == 3.4028234663852886E38) {
             double9 = 0.0;
         }
-        if (integer17 < 10000) {
+        if (integer2 < 10000) {
             return;
         }
-        if (boolean10) {
-            throw SpreadPlayersCommand.ERROR_FAILED_TO_SPREAD_TEAMS.create(arr.length, cvk.x, cvk.y, String.format(Locale.ROOT, "%.2f", double9));
+        if (boolean11) {
+            throw SpreadPlayersCommand.ERROR_FAILED_TO_SPREAD_TEAMS.create(arr.length, del.x, del.y, String.format(Locale.ROOT, "%.2f", double9));
         }
-        throw SpreadPlayersCommand.ERROR_FAILED_TO_SPREAD_ENTITIES.create(arr.length, cvk.x, cvk.y, String.format(Locale.ROOT, "%.2f", double9));
+        throw SpreadPlayersCommand.ERROR_FAILED_TO_SPREAD_ENTITIES.create(arr.length, del.x, del.y, String.format(Locale.ROOT, "%.2f", double9));
     }
     
-    private static double setPlayerPositions(final Collection<? extends Entity> collection, final ServerLevel xd, final Position[] arr, final boolean boolean4) {
-        double double5 = 0.0;
-        int integer7 = 0;
-        final Map<Team, Position> map8 = Maps.newHashMap();
-        for (final Entity akq10 : collection) {
-            Position a11;
-            if (boolean4) {
-                final Team cwn12 = (akq10 instanceof Player) ? akq10.getTeam() : null;
-                if (!map8.containsKey(cwn12)) {
-                    map8.put(cwn12, arr[integer7++]);
+    private static double setPlayerPositions(final Collection<? extends Entity> collection, final ServerLevel zd, final Position[] arr, final int integer, final boolean boolean5) {
+        double double6 = 0.0;
+        int integer2 = 0;
+        final Map<Team, Position> map9 = Maps.newHashMap();
+        for (final Entity aom11 : collection) {
+            Position a12;
+            if (boolean5) {
+                final Team dfo13 = (aom11 instanceof Player) ? aom11.getTeam() : null;
+                if (!map9.containsKey(dfo13)) {
+                    map9.put(dfo13, arr[integer2++]);
                 }
-                a11 = map8.get(cwn12);
+                a12 = map9.get(dfo13);
             }
             else {
-                a11 = arr[integer7++];
+                a12 = arr[integer2++];
             }
-            akq10.teleportToWithTicket(Mth.floor(a11.x) + 0.5f, a11.getSpawnY(xd), Mth.floor(a11.z) + 0.5);
-            double double6 = Double.MAX_VALUE;
-            for (final Position a12 : arr) {
-                if (a11 != a12) {
-                    final double double7 = a11.dist(a12);
-                    double6 = Math.min(double7, double6);
+            aom11.teleportToWithTicket(Mth.floor(a12.x) + 0.5, a12.getSpawnY(zd, integer), Mth.floor(a12.z) + 0.5);
+            double double7 = Double.MAX_VALUE;
+            for (final Position a13 : arr) {
+                if (a12 != a13) {
+                    final double double8 = a12.dist(a13);
+                    double7 = Math.min(double8, double7);
                 }
             }
-            double5 += double6;
+            double6 += double7;
         }
         if (collection.size() < 2) {
             return 0.0;
         }
-        double5 /= collection.size();
-        return double5;
+        double6 /= collection.size();
+        return double6;
     }
     
     private static Position[] createInitialPositions(final Random random, final int integer, final double double3, final double double4, final double double5, final double double6) {
@@ -223,28 +226,28 @@ public class SpreadPlayersCommand {
             return boolean10;
         }
         
-        public int getSpawnY(final BlockGetter bjg) {
-            BlockPos fk3 = new BlockPos(this.x, 256.0, this.z);
-            while (fk3.getY() > 0) {
-                fk3 = fk3.below();
-                if (!bjg.getBlockState(fk3).isAir()) {
-                    return fk3.getY() + 1;
+        public int getSpawnY(final BlockGetter bpg, final int integer) {
+            final BlockPos.MutableBlockPos a4 = new BlockPos.MutableBlockPos(this.x, integer + 1, this.z);
+            boolean boolean5 = bpg.getBlockState(a4).isAir();
+            a4.move(Direction.DOWN);
+            boolean boolean6 = bpg.getBlockState(a4).isAir();
+            while (a4.getY() > 0) {
+                a4.move(Direction.DOWN);
+                final boolean boolean7 = bpg.getBlockState(a4).isAir();
+                if (!boolean7 && boolean6 && boolean5) {
+                    return a4.getY() + 1;
                 }
+                boolean5 = boolean6;
+                boolean6 = boolean7;
             }
-            return 257;
+            return integer + 1;
         }
         
-        public boolean isSafe(final BlockGetter bjg) {
-            BlockPos fk3 = new BlockPos(this.x, 256.0, this.z);
-            while (fk3.getY() > 0) {
-                fk3 = fk3.below();
-                final BlockState byj4 = bjg.getBlockState(fk3);
-                if (!byj4.isAir()) {
-                    final Material coo5 = byj4.getMaterial();
-                    return !coo5.isLiquid() && coo5 != Material.FIRE;
-                }
-            }
-            return false;
+        public boolean isSafe(final BlockGetter bpg, final int integer) {
+            final BlockPos fu4 = new BlockPos(this.x, this.getSpawnY(bpg, integer) - 1, this.z);
+            final BlockState cfj5 = bpg.getBlockState(fu4);
+            final Material cxd6 = cfj5.getMaterial();
+            return fu4.getY() < integer && !cxd6.isLiquid() && cxd6 != Material.FIRE;
         }
         
         public void randomize(final Random random, final double double2, final double double3, final double double4, final double double5) {
diff --git a/src/net/minecraft/server/commands/StopCommand.java b/src/net/minecraft/server/commands/StopCommand.java
index 902f5d7..dababc3 100644
--- a/src/net/minecraft/server/commands/StopCommand.java
+++ b/src/net/minecraft/server/commands/StopCommand.java
@@ -11,8 +11,8 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class StopCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("stop").requires(cq -> cq.hasPermission(4))).executes(commandContext -> {
-            ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.stop.stopping", new Object[0]), true);
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("stop").requires(cz -> cz.hasPermission(4))).executes(commandContext -> {
+            ((CommandSourceStack)commandContext.getSource()).sendSuccess(new TranslatableComponent("commands.stop.stopping"), true);
             ((CommandSourceStack)commandContext.getSource()).getServer().halt(false);
             return 1;
         }));
diff --git a/src/net/minecraft/server/commands/StopSoundCommand.java b/src/net/minecraft/server/commands/StopSoundCommand.java
index 9cb8f41..d15faea 100644
--- a/src/net/minecraft/server/commands/StopSoundCommand.java
+++ b/src/net/minecraft/server/commands/StopSoundCommand.java
@@ -28,30 +28,30 @@ import com.mojang.brigadier.CommandDispatcher;
 public class StopSoundCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
         final RequiredArgumentBuilder<CommandSourceStack, EntitySelector> requiredArgumentBuilder2 = (RequiredArgumentBuilder<CommandSourceStack, EntitySelector>)((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).executes(commandContext -> stopSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), null, null))).then(Commands.literal("*").then(Commands.argument("sound", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)SuggestionProviders.AVAILABLE_SOUNDS).executes(commandContext -> stopSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), null, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound")))));
-        for (final SoundSource aaj6 : SoundSource.values()) {
-            requiredArgumentBuilder2.then(((LiteralArgumentBuilder)Commands.literal(aaj6.getName()).executes(commandContext -> stopSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), aaj6, null))).then(Commands.argument("sound", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)SuggestionProviders.AVAILABLE_SOUNDS).executes(commandContext -> stopSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), aaj6, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound")))));
+        for (final SoundSource acm6 : SoundSource.values()) {
+            requiredArgumentBuilder2.then(((LiteralArgumentBuilder)Commands.literal(acm6.getName()).executes(commandContext -> stopSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), acm6, null))).then(Commands.argument("sound", (com.mojang.brigadier.arguments.ArgumentType<Object>)ResourceLocationArgument.id()).suggests((SuggestionProvider)SuggestionProviders.AVAILABLE_SOUNDS).executes(commandContext -> stopSound((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), acm6, ResourceLocationArgument.getId((CommandContext<CommandSourceStack>)commandContext, "sound")))));
         }
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("stopsound").requires(cq -> cq.hasPermission(2))).then((ArgumentBuilder)requiredArgumentBuilder2));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("stopsound").requires(cz -> cz.hasPermission(2))).then((ArgumentBuilder)requiredArgumentBuilder2));
     }
     
-    private static int stopSound(final CommandSourceStack cq, final Collection<ServerPlayer> collection, @Nullable final SoundSource aaj, @Nullable final ResourceLocation sm) {
-        final ClientboundStopSoundPacket oz5 = new ClientboundStopSoundPacket(sm, aaj);
-        for (final ServerPlayer xe7 : collection) {
-            xe7.connection.send(oz5);
+    private static int stopSound(final CommandSourceStack cz, final Collection<ServerPlayer> collection, @Nullable final SoundSource acm, @Nullable final ResourceLocation uh) {
+        final ClientboundStopSoundPacket qn5 = new ClientboundStopSoundPacket(uh, acm);
+        for (final ServerPlayer ze7 : collection) {
+            ze7.connection.send(qn5);
         }
-        if (aaj != null) {
-            if (sm != null) {
-                cq.sendSuccess(new TranslatableComponent("commands.stopsound.success.source.sound", new Object[] { sm, aaj.getName() }), true);
+        if (acm != null) {
+            if (uh != null) {
+                cz.sendSuccess(new TranslatableComponent("commands.stopsound.success.source.sound", new Object[] { uh, acm.getName() }), true);
             }
             else {
-                cq.sendSuccess(new TranslatableComponent("commands.stopsound.success.source.any", new Object[] { aaj.getName() }), true);
+                cz.sendSuccess(new TranslatableComponent("commands.stopsound.success.source.any", new Object[] { acm.getName() }), true);
             }
         }
-        else if (sm != null) {
-            cq.sendSuccess(new TranslatableComponent("commands.stopsound.success.sourceless.sound", new Object[] { sm }), true);
+        else if (uh != null) {
+            cz.sendSuccess(new TranslatableComponent("commands.stopsound.success.sourceless.sound", new Object[] { uh }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.stopsound.success.sourceless.any", new Object[0]), true);
+            cz.sendSuccess(new TranslatableComponent("commands.stopsound.success.sourceless.any"), true);
         }
         return collection.size();
     }
diff --git a/src/net/minecraft/server/commands/SummonCommand.java b/src/net/minecraft/server/commands/SummonCommand.java
index 4674e70..976779b 100644
--- a/src/net/minecraft/server/commands/SummonCommand.java
+++ b/src/net/minecraft/server/commands/SummonCommand.java
@@ -5,16 +5,15 @@ import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.MobSpawnType;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Mob;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.entity.global.LightningBolt;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.Level;
+import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.resources.ResourceLocation;
@@ -33,42 +32,42 @@ import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 
 public class SummonCommand {
     private static final SimpleCommandExceptionType ERROR_FAILED;
+    private static final SimpleCommandExceptionType INVALID_POSITION;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("summon").requires(cq -> cq.hasPermission(2))).then(((RequiredArgumentBuilder)Commands.argument("entity", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntitySummonArgument.id()).suggests((SuggestionProvider)SuggestionProviders.SUMMONABLE_ENTITIES).executes(commandContext -> spawnEntity((CommandSourceStack)commandContext.getSource(), EntitySummonArgument.getSummonableEntity((CommandContext<CommandSourceStack>)commandContext, "entity"), ((CommandSourceStack)commandContext.getSource()).getPosition(), new CompoundTag(), true))).then(((RequiredArgumentBuilder)Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> spawnEntity((CommandSourceStack)commandContext.getSource(), EntitySummonArgument.getSummonableEntity((CommandContext<CommandSourceStack>)commandContext, "entity"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), new CompoundTag(), true))).then(Commands.argument("nbt", (com.mojang.brigadier.arguments.ArgumentType<Object>)CompoundTagArgument.compoundTag()).executes(commandContext -> spawnEntity((CommandSourceStack)commandContext.getSource(), EntitySummonArgument.getSummonableEntity((CommandContext<CommandSourceStack>)commandContext, "entity"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), CompoundTagArgument.getCompoundTag((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "nbt"), false))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("summon").requires(cz -> cz.hasPermission(2))).then(((RequiredArgumentBuilder)Commands.argument("entity", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntitySummonArgument.id()).suggests((SuggestionProvider)SuggestionProviders.SUMMONABLE_ENTITIES).executes(commandContext -> spawnEntity((CommandSourceStack)commandContext.getSource(), EntitySummonArgument.getSummonableEntity((CommandContext<CommandSourceStack>)commandContext, "entity"), ((CommandSourceStack)commandContext.getSource()).getPosition(), new CompoundTag(), true))).then(((RequiredArgumentBuilder)Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> spawnEntity((CommandSourceStack)commandContext.getSource(), EntitySummonArgument.getSummonableEntity((CommandContext<CommandSourceStack>)commandContext, "entity"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), new CompoundTag(), true))).then(Commands.argument("nbt", (com.mojang.brigadier.arguments.ArgumentType<Object>)CompoundTagArgument.compoundTag()).executes(commandContext -> spawnEntity((CommandSourceStack)commandContext.getSource(), EntitySummonArgument.getSummonableEntity((CommandContext<CommandSourceStack>)commandContext, "entity"), Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "pos"), CompoundTagArgument.getCompoundTag((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "nbt"), false))))));
     }
     
-    private static int spawnEntity(final CommandSourceStack cq, final ResourceLocation sm, final Vec3 cvl, final CompoundTag jt, final boolean boolean5) throws CommandSyntaxException {
-        final CompoundTag jt2 = jt.copy();
-        jt2.putString("id", sm.toString());
-        if (EntityType.getKey(EntityType.LIGHTNING_BOLT).equals(sm)) {
-            final LightningBolt avy7 = new LightningBolt(cq.getLevel(), cvl.x, cvl.y, cvl.z, false);
-            cq.getLevel().addGlobalEntity(avy7);
-            cq.sendSuccess(new TranslatableComponent("commands.summon.success", new Object[] { avy7.getDisplayName() }), true);
-            return 1;
+    private static int spawnEntity(final CommandSourceStack cz, final ResourceLocation uh, final Vec3 dem, final CompoundTag le, final boolean boolean5) throws CommandSyntaxException {
+        final BlockPos fu6 = new BlockPos(dem);
+        if (!Level.isInSpawnableBounds(fu6)) {
+            throw SummonCommand.INVALID_POSITION.create();
         }
-        final ServerLevel xd7 = cq.getLevel();
+        final CompoundTag le2 = le.copy();
+        le2.putString("id", uh.toString());
+        final ServerLevel zd8 = cz.getLevel();
         final ServerLevel serverLevel;
-        final Entity akq2 = EntityType.loadEntityRecursive(jt2, (Level)xd7, akq -> {
-            akq.moveTo(cvl.x, cvl.y, cvl.z, akq.yRot, akq.xRot);
-            if (!serverLevel.addWithUUID(akq)) {
+        final Entity aom2 = EntityType.loadEntityRecursive(le2, (Level)zd8, aom -> {
+            aom.moveTo(dem.x, dem.y, dem.z, aom.yRot, aom.xRot);
+            if (!serverLevel.addWithUUID(aom)) {
                 return null;
             }
             else {
-                return akq;
+                return aom;
             }
         });
-        if (akq2 == null) {
+        if (aom2 == null) {
             throw SummonCommand.ERROR_FAILED.create();
         }
-        if (boolean5 && akq2 instanceof Mob) {
-            ((Mob)akq2).finalizeSpawn(cq.getLevel(), cq.getLevel().getCurrentDifficultyAt(new BlockPos(akq2)), MobSpawnType.COMMAND, null, null);
+        if (boolean5 && aom2 instanceof Mob) {
+            ((Mob)aom2).finalizeSpawn(cz.getLevel(), cz.getLevel().getCurrentDifficultyAt(aom2.blockPosition()), MobSpawnType.COMMAND, null, null);
         }
-        cq.sendSuccess(new TranslatableComponent("commands.summon.success", new Object[] { akq2.getDisplayName() }), true);
+        cz.sendSuccess(new TranslatableComponent("commands.summon.success", new Object[] { aom2.getDisplayName() }), true);
         return 1;
     }
     
     static {
-        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.summon.failed", new Object[0]));
+        ERROR_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.summon.failed"));
+        INVALID_POSITION = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.summon.invalidPosition"));
     }
 }
diff --git a/src/net/minecraft/server/commands/TagCommand.java b/src/net/minecraft/server/commands/TagCommand.java
index 0140fea..385bb9d 100644
--- a/src/net/minecraft/server/commands/TagCommand.java
+++ b/src/net/minecraft/server/commands/TagCommand.java
@@ -29,21 +29,21 @@ public class TagCommand {
     private static final SimpleCommandExceptionType ERROR_REMOVE_FAILED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("tag").requires(cq -> cq.hasPermission(2))).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(Commands.literal("add").then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> addTag((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), StringArgumentType.getString(commandContext, "name")))))).then(Commands.literal("remove").then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(getTags(EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets")), suggestionsBuilder)).executes(commandContext -> removeTag((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), StringArgumentType.getString(commandContext, "name")))))).then(Commands.literal("list").executes(commandContext -> listTags((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("tag").requires(cz -> cz.hasPermission(2))).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(Commands.literal("add").then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> addTag((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), StringArgumentType.getString(commandContext, "name")))))).then(Commands.literal("remove").then(Commands.argument("name", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(getTags(EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets")), suggestionsBuilder)).executes(commandContext -> removeTag((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), StringArgumentType.getString(commandContext, "name")))))).then(Commands.literal("list").executes(commandContext -> listTags((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"))))));
     }
     
     private static Collection<String> getTags(final Collection<? extends Entity> collection) {
         final Set<String> set2 = Sets.newHashSet();
-        for (final Entity akq4 : collection) {
-            set2.addAll(akq4.getTags());
+        for (final Entity aom4 : collection) {
+            set2.addAll(aom4.getTags());
         }
         return set2;
     }
     
-    private static int addTag(final CommandSourceStack cq, final Collection<? extends Entity> collection, final String string) throws CommandSyntaxException {
+    private static int addTag(final CommandSourceStack cz, final Collection<? extends Entity> collection, final String string) throws CommandSyntaxException {
         int integer4 = 0;
-        for (final Entity akq6 : collection) {
-            if (akq6.addTag(string)) {
+        for (final Entity aom6 : collection) {
+            if (aom6.addTag(string)) {
                 ++integer4;
             }
         }
@@ -51,18 +51,18 @@ public class TagCommand {
             throw TagCommand.ERROR_ADD_FAILED.create();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.tag.add.success.single", new Object[] { string, ((Entity)collection.iterator().next()).getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.tag.add.success.single", new Object[] { string, ((Entity)collection.iterator().next()).getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.tag.add.success.multiple", new Object[] { string, collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.tag.add.success.multiple", new Object[] { string, collection.size() }), true);
         }
         return integer4;
     }
     
-    private static int removeTag(final CommandSourceStack cq, final Collection<? extends Entity> collection, final String string) throws CommandSyntaxException {
+    private static int removeTag(final CommandSourceStack cz, final Collection<? extends Entity> collection, final String string) throws CommandSyntaxException {
         int integer4 = 0;
-        for (final Entity akq6 : collection) {
-            if (akq6.removeTag(string)) {
+        for (final Entity aom6 : collection) {
+            if (aom6.removeTag(string)) {
                 ++integer4;
             }
         }
@@ -70,39 +70,39 @@ public class TagCommand {
             throw TagCommand.ERROR_REMOVE_FAILED.create();
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.tag.remove.success.single", new Object[] { string, ((Entity)collection.iterator().next()).getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.tag.remove.success.single", new Object[] { string, ((Entity)collection.iterator().next()).getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.tag.remove.success.multiple", new Object[] { string, collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.tag.remove.success.multiple", new Object[] { string, collection.size() }), true);
         }
         return integer4;
     }
     
-    private static int listTags(final CommandSourceStack cq, final Collection<? extends Entity> collection) {
+    private static int listTags(final CommandSourceStack cz, final Collection<? extends Entity> collection) {
         final Set<String> set3 = Sets.newHashSet();
-        for (final Entity akq5 : collection) {
-            set3.addAll(akq5.getTags());
+        for (final Entity aom5 : collection) {
+            set3.addAll(aom5.getTags());
         }
         if (collection.size() == 1) {
-            final Entity akq6 = (Entity)collection.iterator().next();
+            final Entity aom6 = (Entity)collection.iterator().next();
             if (set3.isEmpty()) {
-                cq.sendSuccess(new TranslatableComponent("commands.tag.list.single.empty", new Object[] { akq6.getDisplayName() }), false);
+                cz.sendSuccess(new TranslatableComponent("commands.tag.list.single.empty", new Object[] { aom6.getDisplayName() }), false);
             }
             else {
-                cq.sendSuccess(new TranslatableComponent("commands.tag.list.single.success", new Object[] { akq6.getDisplayName(), set3.size(), ComponentUtils.formatList(set3) }), false);
+                cz.sendSuccess(new TranslatableComponent("commands.tag.list.single.success", new Object[] { aom6.getDisplayName(), set3.size(), ComponentUtils.formatList(set3) }), false);
             }
         }
         else if (set3.isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.tag.list.multiple.empty", new Object[] { collection.size() }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.tag.list.multiple.empty", new Object[] { collection.size() }), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.tag.list.multiple.success", new Object[] { collection.size(), set3.size(), ComponentUtils.formatList(set3) }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.tag.list.multiple.success", new Object[] { collection.size(), set3.size(), ComponentUtils.formatList(set3) }), false);
         }
         return set3.size();
     }
     
     static {
-        ERROR_ADD_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.tag.add.failed", new Object[0]));
-        ERROR_REMOVE_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.tag.remove.failed", new Object[0]));
+        ERROR_ADD_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.tag.add.failed"));
+        ERROR_REMOVE_FAILED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.tag.remove.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/TeamCommand.java b/src/net/minecraft/server/commands/TeamCommand.java
index 727d472..a7bbc85 100644
--- a/src/net/minecraft/server/commands/TeamCommand.java
+++ b/src/net/minecraft/server/commands/TeamCommand.java
@@ -3,6 +3,7 @@ package net.minecraft.server.commands;
 import com.mojang.brigadier.Message;
 import java.util.Collections;
 import com.mojang.brigadier.context.CommandContext;
+import java.util.function.Function;
 import net.minecraft.network.chat.ComponentUtils;
 import net.minecraft.network.chat.TextComponent;
 import com.google.common.collect.Lists;
@@ -46,68 +47,68 @@ public class TeamCommand {
     private static final SimpleCommandExceptionType ERROR_TEAM_COLLISION_UNCHANGED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("team").requires(cq -> cq.hasPermission(2))).then(((LiteralArgumentBuilder)Commands.literal("list").executes(commandContext -> listTeams((CommandSourceStack)commandContext.getSource()))).then(Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)TeamArgument.team()).executes(commandContext -> listMembers((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team")))))).then(Commands.literal("add").then(((RequiredArgumentBuilder)Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> createTeam((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "team")))).then(Commands.argument("displayName", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> createTeam((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "team"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "displayName"))))))).then(Commands.literal("remove").then(Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)TeamArgument.team()).executes(commandContext -> deleteTeam((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team")))))).then(Commands.literal("empty").then(Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)TeamArgument.team()).executes(commandContext -> emptyTeam((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team")))))).then(Commands.literal("join").then(((RequiredArgumentBuilder)Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)TeamArgument.team()).executes(commandContext -> joinTeam((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Collections.<String>singleton(((CommandSourceStack)commandContext.getSource()).getEntityOrException().getScoreboardName())))).then(Commands.argument("members", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).executes(commandContext -> joinTeam((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "members"))))))).then(Commands.literal("leave").then(Commands.argument("members", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).executes(commandContext -> leaveTeam((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "members")))))).then(Commands.literal("modify").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)TeamArgument.team()).then(Commands.literal("displayName").then(Commands.argument("displayName", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> setDisplayName((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "displayName")))))).then(Commands.literal("color").then(Commands.argument("value", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColorArgument.color()).executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), ColorArgument.getColor((CommandContext<CommandSourceStack>)commandContext, "value")))))).then(Commands.literal("friendlyFire").then(Commands.argument("allowed", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).executes(commandContext -> setFriendlyFire((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), BoolArgumentType.getBool(commandContext, "allowed")))))).then(Commands.literal("seeFriendlyInvisibles").then(Commands.argument("allowed", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).executes(commandContext -> setFriendlySight((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), BoolArgumentType.getBool(commandContext, "allowed")))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("nametagVisibility").then(Commands.literal("never").executes(commandContext -> setNametagVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.NEVER)))).then(Commands.literal("hideForOtherTeams").executes(commandContext -> setNametagVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.HIDE_FOR_OTHER_TEAMS)))).then(Commands.literal("hideForOwnTeam").executes(commandContext -> setNametagVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.HIDE_FOR_OWN_TEAM)))).then(Commands.literal("always").executes(commandContext -> setNametagVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.ALWAYS))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("deathMessageVisibility").then(Commands.literal("never").executes(commandContext -> setDeathMessageVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.NEVER)))).then(Commands.literal("hideForOtherTeams").executes(commandContext -> setDeathMessageVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.HIDE_FOR_OTHER_TEAMS)))).then(Commands.literal("hideForOwnTeam").executes(commandContext -> setDeathMessageVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.HIDE_FOR_OWN_TEAM)))).then(Commands.literal("always").executes(commandContext -> setDeathMessageVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.ALWAYS))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("collisionRule").then(Commands.literal("never").executes(commandContext -> setCollision((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.CollisionRule.NEVER)))).then(Commands.literal("pushOwnTeam").executes(commandContext -> setCollision((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.CollisionRule.PUSH_OWN_TEAM)))).then(Commands.literal("pushOtherTeams").executes(commandContext -> setCollision((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.CollisionRule.PUSH_OTHER_TEAMS)))).then(Commands.literal("always").executes(commandContext -> setCollision((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.CollisionRule.ALWAYS))))).then(Commands.literal("prefix").then(Commands.argument("prefix", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> setPrefix((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "prefix")))))).then(Commands.literal("suffix").then(Commands.argument("suffix", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> setSuffix((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "suffix"))))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("team").requires(cz -> cz.hasPermission(2))).then(((LiteralArgumentBuilder)Commands.literal("list").executes(commandContext -> listTeams((CommandSourceStack)commandContext.getSource()))).then(Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)TeamArgument.team()).executes(commandContext -> listMembers((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team")))))).then(Commands.literal("add").then(((RequiredArgumentBuilder)Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)StringArgumentType.word()).executes(commandContext -> createTeam((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "team")))).then(Commands.argument("displayName", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> createTeam((CommandSourceStack)commandContext.getSource(), StringArgumentType.getString(commandContext, "team"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "displayName"))))))).then(Commands.literal("remove").then(Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)TeamArgument.team()).executes(commandContext -> deleteTeam((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team")))))).then(Commands.literal("empty").then(Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)TeamArgument.team()).executes(commandContext -> emptyTeam((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team")))))).then(Commands.literal("join").then(((RequiredArgumentBuilder)Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)TeamArgument.team()).executes(commandContext -> joinTeam((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Collections.<String>singleton(((CommandSourceStack)commandContext.getSource()).getEntityOrException().getScoreboardName())))).then(Commands.argument("members", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).executes(commandContext -> joinTeam((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "members"))))))).then(Commands.literal("leave").then(Commands.argument("members", (com.mojang.brigadier.arguments.ArgumentType<Object>)ScoreHolderArgument.scoreHolders()).suggests((SuggestionProvider)ScoreHolderArgument.SUGGEST_SCORE_HOLDERS).executes(commandContext -> leaveTeam((CommandSourceStack)commandContext.getSource(), ScoreHolderArgument.getNamesWithDefaultWildcard((CommandContext<CommandSourceStack>)commandContext, "members")))))).then(Commands.literal("modify").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("team", (com.mojang.brigadier.arguments.ArgumentType<Object>)TeamArgument.team()).then(Commands.literal("displayName").then(Commands.argument("displayName", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> setDisplayName((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "displayName")))))).then(Commands.literal("color").then(Commands.argument("value", (com.mojang.brigadier.arguments.ArgumentType<Object>)ColorArgument.color()).executes(commandContext -> setColor((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), ColorArgument.getColor((CommandContext<CommandSourceStack>)commandContext, "value")))))).then(Commands.literal("friendlyFire").then(Commands.argument("allowed", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).executes(commandContext -> setFriendlyFire((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), BoolArgumentType.getBool(commandContext, "allowed")))))).then(Commands.literal("seeFriendlyInvisibles").then(Commands.argument("allowed", (com.mojang.brigadier.arguments.ArgumentType<Object>)BoolArgumentType.bool()).executes(commandContext -> setFriendlySight((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), BoolArgumentType.getBool(commandContext, "allowed")))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("nametagVisibility").then(Commands.literal("never").executes(commandContext -> setNametagVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.NEVER)))).then(Commands.literal("hideForOtherTeams").executes(commandContext -> setNametagVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.HIDE_FOR_OTHER_TEAMS)))).then(Commands.literal("hideForOwnTeam").executes(commandContext -> setNametagVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.HIDE_FOR_OWN_TEAM)))).then(Commands.literal("always").executes(commandContext -> setNametagVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.ALWAYS))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("deathMessageVisibility").then(Commands.literal("never").executes(commandContext -> setDeathMessageVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.NEVER)))).then(Commands.literal("hideForOtherTeams").executes(commandContext -> setDeathMessageVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.HIDE_FOR_OTHER_TEAMS)))).then(Commands.literal("hideForOwnTeam").executes(commandContext -> setDeathMessageVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.HIDE_FOR_OWN_TEAM)))).then(Commands.literal("always").executes(commandContext -> setDeathMessageVisibility((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.Visibility.ALWAYS))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("collisionRule").then(Commands.literal("never").executes(commandContext -> setCollision((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.CollisionRule.NEVER)))).then(Commands.literal("pushOwnTeam").executes(commandContext -> setCollision((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.CollisionRule.PUSH_OWN_TEAM)))).then(Commands.literal("pushOtherTeams").executes(commandContext -> setCollision((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.CollisionRule.PUSH_OTHER_TEAMS)))).then(Commands.literal("always").executes(commandContext -> setCollision((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), Team.CollisionRule.ALWAYS))))).then(Commands.literal("prefix").then(Commands.argument("prefix", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> setPrefix((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "prefix")))))).then(Commands.literal("suffix").then(Commands.argument("suffix", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> setSuffix((CommandSourceStack)commandContext.getSource(), TeamArgument.getTeam((CommandContext<CommandSourceStack>)commandContext, "team"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "suffix"))))))));
     }
     
-    private static int leaveTeam(final CommandSourceStack cq, final Collection<String> collection) {
-        final Scoreboard cwl3 = cq.getServer().getScoreboard();
+    private static int leaveTeam(final CommandSourceStack cz, final Collection<String> collection) {
+        final Scoreboard dfm3 = cz.getServer().getScoreboard();
         for (final String string5 : collection) {
-            cwl3.removePlayerFromTeam(string5);
+            dfm3.removePlayerFromTeam(string5);
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.team.leave.success.single", new Object[] { collection.iterator().next() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.team.leave.success.single", new Object[] { collection.iterator().next() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.team.leave.success.multiple", new Object[] { collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.team.leave.success.multiple", new Object[] { collection.size() }), true);
         }
         return collection.size();
     }
     
-    private static int joinTeam(final CommandSourceStack cq, final PlayerTeam cwj, final Collection<String> collection) {
-        final Scoreboard cwl4 = cq.getServer().getScoreboard();
+    private static int joinTeam(final CommandSourceStack cz, final PlayerTeam dfk, final Collection<String> collection) {
+        final Scoreboard dfm4 = cz.getServer().getScoreboard();
         for (final String string6 : collection) {
-            cwl4.addPlayerToTeam(string6, cwj);
+            dfm4.addPlayerToTeam(string6, dfk);
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.team.join.success.single", new Object[] { collection.iterator().next(), cwj.getFormattedDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.team.join.success.single", new Object[] { collection.iterator().next(), dfk.getFormattedDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.team.join.success.multiple", new Object[] { collection.size(), cwj.getFormattedDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.team.join.success.multiple", new Object[] { collection.size(), dfk.getFormattedDisplayName() }), true);
         }
         return collection.size();
     }
     
-    private static int setNametagVisibility(final CommandSourceStack cq, final PlayerTeam cwj, final Team.Visibility b) throws CommandSyntaxException {
-        if (cwj.getNameTagVisibility() == b) {
+    private static int setNametagVisibility(final CommandSourceStack cz, final PlayerTeam dfk, final Team.Visibility b) throws CommandSyntaxException {
+        if (dfk.getNameTagVisibility() == b) {
             throw TeamCommand.ERROR_TEAM_NAMETAG_VISIBLITY_UNCHANGED.create();
         }
-        cwj.setNameTagVisibility(b);
-        cq.sendSuccess(new TranslatableComponent("commands.team.option.nametagVisibility.success", new Object[] { cwj.getFormattedDisplayName(), b.getDisplayName() }), true);
+        dfk.setNameTagVisibility(b);
+        cz.sendSuccess(new TranslatableComponent("commands.team.option.nametagVisibility.success", new Object[] { dfk.getFormattedDisplayName(), b.getDisplayName() }), true);
         return 0;
     }
     
-    private static int setDeathMessageVisibility(final CommandSourceStack cq, final PlayerTeam cwj, final Team.Visibility b) throws CommandSyntaxException {
-        if (cwj.getDeathMessageVisibility() == b) {
+    private static int setDeathMessageVisibility(final CommandSourceStack cz, final PlayerTeam dfk, final Team.Visibility b) throws CommandSyntaxException {
+        if (dfk.getDeathMessageVisibility() == b) {
             throw TeamCommand.ERROR_TEAM_DEATH_MESSAGE_VISIBLITY_UNCHANGED.create();
         }
-        cwj.setDeathMessageVisibility(b);
-        cq.sendSuccess(new TranslatableComponent("commands.team.option.deathMessageVisibility.success", new Object[] { cwj.getFormattedDisplayName(), b.getDisplayName() }), true);
+        dfk.setDeathMessageVisibility(b);
+        cz.sendSuccess(new TranslatableComponent("commands.team.option.deathMessageVisibility.success", new Object[] { dfk.getFormattedDisplayName(), b.getDisplayName() }), true);
         return 0;
     }
     
-    private static int setCollision(final CommandSourceStack cq, final PlayerTeam cwj, final Team.CollisionRule a) throws CommandSyntaxException {
-        if (cwj.getCollisionRule() == a) {
+    private static int setCollision(final CommandSourceStack cz, final PlayerTeam dfk, final Team.CollisionRule a) throws CommandSyntaxException {
+        if (dfk.getCollisionRule() == a) {
             throw TeamCommand.ERROR_TEAM_COLLISION_UNCHANGED.create();
         }
-        cwj.setCollisionRule(a);
-        cq.sendSuccess(new TranslatableComponent("commands.team.option.collisionRule.success", new Object[] { cwj.getFormattedDisplayName(), a.getDisplayName() }), true);
+        dfk.setCollisionRule(a);
+        cz.sendSuccess(new TranslatableComponent("commands.team.option.collisionRule.success", new Object[] { dfk.getFormattedDisplayName(), a.getDisplayName() }), true);
         return 0;
     }
     
-    private static int setFriendlySight(final CommandSourceStack cq, final PlayerTeam cwj, final boolean boolean3) throws CommandSyntaxException {
-        if (cwj.canSeeFriendlyInvisibles() != boolean3) {
-            cwj.setSeeFriendlyInvisibles(boolean3);
-            cq.sendSuccess(new TranslatableComponent("commands.team.option.seeFriendlyInvisibles." + (boolean3 ? "enabled" : "disabled"), new Object[] { cwj.getFormattedDisplayName() }), true);
+    private static int setFriendlySight(final CommandSourceStack cz, final PlayerTeam dfk, final boolean boolean3) throws CommandSyntaxException {
+        if (dfk.canSeeFriendlyInvisibles() != boolean3) {
+            dfk.setSeeFriendlyInvisibles(boolean3);
+            cz.sendSuccess(new TranslatableComponent("commands.team.option.seeFriendlyInvisibles." + (boolean3 ? "enabled" : "disabled"), new Object[] { dfk.getFormattedDisplayName() }), true);
             return 0;
         }
         if (boolean3) {
@@ -116,10 +117,10 @@ public class TeamCommand {
         throw TeamCommand.ERROR_TEAM_ALREADY_FRIENDLYINVISIBLES_DISABLED.create();
     }
     
-    private static int setFriendlyFire(final CommandSourceStack cq, final PlayerTeam cwj, final boolean boolean3) throws CommandSyntaxException {
-        if (cwj.isAllowFriendlyFire() != boolean3) {
-            cwj.setAllowFriendlyFire(boolean3);
-            cq.sendSuccess(new TranslatableComponent("commands.team.option.friendlyfire." + (boolean3 ? "enabled" : "disabled"), new Object[] { cwj.getFormattedDisplayName() }), true);
+    private static int setFriendlyFire(final CommandSourceStack cz, final PlayerTeam dfk, final boolean boolean3) throws CommandSyntaxException {
+        if (dfk.isAllowFriendlyFire() != boolean3) {
+            dfk.setAllowFriendlyFire(boolean3);
+            cz.sendSuccess(new TranslatableComponent("commands.team.option.friendlyfire." + (boolean3 ? "enabled" : "disabled"), new Object[] { dfk.getFormattedDisplayName() }), true);
             return 0;
         }
         if (boolean3) {
@@ -128,112 +129,112 @@ public class TeamCommand {
         throw TeamCommand.ERROR_TEAM_ALREADY_FRIENDLYFIRE_DISABLED.create();
     }
     
-    private static int setDisplayName(final CommandSourceStack cq, final PlayerTeam cwj, final Component lf) throws CommandSyntaxException {
-        if (cwj.getDisplayName().equals(lf)) {
+    private static int setDisplayName(final CommandSourceStack cz, final PlayerTeam dfk, final Component mr) throws CommandSyntaxException {
+        if (dfk.getDisplayName().equals(mr)) {
             throw TeamCommand.ERROR_TEAM_ALREADY_NAME.create();
         }
-        cwj.setDisplayName(lf);
-        cq.sendSuccess(new TranslatableComponent("commands.team.option.name.success", new Object[] { cwj.getFormattedDisplayName() }), true);
+        dfk.setDisplayName(mr);
+        cz.sendSuccess(new TranslatableComponent("commands.team.option.name.success", new Object[] { dfk.getFormattedDisplayName() }), true);
         return 0;
     }
     
-    private static int setColor(final CommandSourceStack cq, final PlayerTeam cwj, final ChatFormatting g) throws CommandSyntaxException {
-        if (cwj.getColor() == g) {
+    private static int setColor(final CommandSourceStack cz, final PlayerTeam dfk, final ChatFormatting i) throws CommandSyntaxException {
+        if (dfk.getColor() == i) {
             throw TeamCommand.ERROR_TEAM_ALREADY_COLOR.create();
         }
-        cwj.setColor(g);
-        cq.sendSuccess(new TranslatableComponent("commands.team.option.color.success", new Object[] { cwj.getFormattedDisplayName(), g.getName() }), true);
+        dfk.setColor(i);
+        cz.sendSuccess(new TranslatableComponent("commands.team.option.color.success", new Object[] { dfk.getFormattedDisplayName(), i.getName() }), true);
         return 0;
     }
     
-    private static int emptyTeam(final CommandSourceStack cq, final PlayerTeam cwj) throws CommandSyntaxException {
-        final Scoreboard cwl3 = cq.getServer().getScoreboard();
-        final Collection<String> collection4 = Lists.newArrayList(cwj.getPlayers());
+    private static int emptyTeam(final CommandSourceStack cz, final PlayerTeam dfk) throws CommandSyntaxException {
+        final Scoreboard dfm3 = cz.getServer().getScoreboard();
+        final Collection<String> collection4 = Lists.newArrayList(dfk.getPlayers());
         if (collection4.isEmpty()) {
             throw TeamCommand.ERROR_TEAM_ALREADY_EMPTY.create();
         }
         for (final String string6 : collection4) {
-            cwl3.removePlayerFromTeam(string6, cwj);
+            dfm3.removePlayerFromTeam(string6, dfk);
         }
-        cq.sendSuccess(new TranslatableComponent("commands.team.empty.success", new Object[] { collection4.size(), cwj.getFormattedDisplayName() }), true);
+        cz.sendSuccess(new TranslatableComponent("commands.team.empty.success", new Object[] { collection4.size(), dfk.getFormattedDisplayName() }), true);
         return collection4.size();
     }
     
-    private static int deleteTeam(final CommandSourceStack cq, final PlayerTeam cwj) {
-        final Scoreboard cwl3 = cq.getServer().getScoreboard();
-        cwl3.removePlayerTeam(cwj);
-        cq.sendSuccess(new TranslatableComponent("commands.team.remove.success", new Object[] { cwj.getFormattedDisplayName() }), true);
-        return cwl3.getPlayerTeams().size();
+    private static int deleteTeam(final CommandSourceStack cz, final PlayerTeam dfk) {
+        final Scoreboard dfm3 = cz.getServer().getScoreboard();
+        dfm3.removePlayerTeam(dfk);
+        cz.sendSuccess(new TranslatableComponent("commands.team.remove.success", new Object[] { dfk.getFormattedDisplayName() }), true);
+        return dfm3.getPlayerTeams().size();
     }
     
-    private static int createTeam(final CommandSourceStack cq, final String string) throws CommandSyntaxException {
-        return createTeam(cq, string, new TextComponent(string));
+    private static int createTeam(final CommandSourceStack cz, final String string) throws CommandSyntaxException {
+        return createTeam(cz, string, new TextComponent(string));
     }
     
-    private static int createTeam(final CommandSourceStack cq, final String string, final Component lf) throws CommandSyntaxException {
-        final Scoreboard cwl4 = cq.getServer().getScoreboard();
-        if (cwl4.getPlayerTeam(string) != null) {
+    private static int createTeam(final CommandSourceStack cz, final String string, final Component mr) throws CommandSyntaxException {
+        final Scoreboard dfm4 = cz.getServer().getScoreboard();
+        if (dfm4.getPlayerTeam(string) != null) {
             throw TeamCommand.ERROR_TEAM_ALREADY_EXISTS.create();
         }
         if (string.length() > 16) {
             throw TeamCommand.ERROR_TEAM_NAME_TOO_LONG.create(16);
         }
-        final PlayerTeam cwj5 = cwl4.addPlayerTeam(string);
-        cwj5.setDisplayName(lf);
-        cq.sendSuccess(new TranslatableComponent("commands.team.add.success", new Object[] { cwj5.getFormattedDisplayName() }), true);
-        return cwl4.getPlayerTeams().size();
+        final PlayerTeam dfk5 = dfm4.addPlayerTeam(string);
+        dfk5.setDisplayName(mr);
+        cz.sendSuccess(new TranslatableComponent("commands.team.add.success", new Object[] { dfk5.getFormattedDisplayName() }), true);
+        return dfm4.getPlayerTeams().size();
     }
     
-    private static int listMembers(final CommandSourceStack cq, final PlayerTeam cwj) {
-        final Collection<String> collection3 = cwj.getPlayers();
+    private static int listMembers(final CommandSourceStack cz, final PlayerTeam dfk) {
+        final Collection<String> collection3 = dfk.getPlayers();
         if (collection3.isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.team.list.members.empty", new Object[] { cwj.getFormattedDisplayName() }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.team.list.members.empty", new Object[] { dfk.getFormattedDisplayName() }), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.team.list.members.success", new Object[] { cwj.getFormattedDisplayName(), collection3.size(), ComponentUtils.formatList(collection3) }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.team.list.members.success", new Object[] { dfk.getFormattedDisplayName(), collection3.size(), ComponentUtils.formatList(collection3) }), false);
         }
         return collection3.size();
     }
     
-    private static int listTeams(final CommandSourceStack cq) {
-        final Collection<PlayerTeam> collection2 = cq.getServer().getScoreboard().getPlayerTeams();
+    private static int listTeams(final CommandSourceStack cz) {
+        final Collection<PlayerTeam> collection2 = cz.getServer().getScoreboard().getPlayerTeams();
         if (collection2.isEmpty()) {
-            cq.sendSuccess(new TranslatableComponent("commands.team.list.teams.empty", new Object[0]), false);
+            cz.sendSuccess(new TranslatableComponent("commands.team.list.teams.empty"), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.team.list.teams.success", new Object[] { collection2.size(), ComponentUtils.<PlayerTeam>formatList(collection2, PlayerTeam::getFormattedDisplayName) }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.team.list.teams.success", new Object[] { collection2.size(), ComponentUtils.<PlayerTeam>formatList(collection2, (Function<PlayerTeam, Component>)PlayerTeam::getFormattedDisplayName) }), false);
         }
         return collection2.size();
     }
     
-    private static int setPrefix(final CommandSourceStack cq, final PlayerTeam cwj, final Component lf) {
-        cwj.setPlayerPrefix(lf);
-        cq.sendSuccess(new TranslatableComponent("commands.team.option.prefix.success", new Object[] { lf }), false);
+    private static int setPrefix(final CommandSourceStack cz, final PlayerTeam dfk, final Component mr) {
+        dfk.setPlayerPrefix(mr);
+        cz.sendSuccess(new TranslatableComponent("commands.team.option.prefix.success", new Object[] { mr }), false);
         return 1;
     }
     
-    private static int setSuffix(final CommandSourceStack cq, final PlayerTeam cwj, final Component lf) {
-        cwj.setPlayerSuffix(lf);
-        cq.sendSuccess(new TranslatableComponent("commands.team.option.suffix.success", new Object[] { lf }), false);
+    private static int setSuffix(final CommandSourceStack cz, final PlayerTeam dfk, final Component mr) {
+        dfk.setPlayerSuffix(mr);
+        cz.sendSuccess(new TranslatableComponent("commands.team.option.suffix.success", new Object[] { mr }), false);
         return 1;
     }
     
     static {
-        ERROR_TEAM_ALREADY_EXISTS = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.add.duplicate", new Object[0]));
+        ERROR_TEAM_ALREADY_EXISTS = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.add.duplicate"));
         final TranslatableComponent translatableComponent;
         ERROR_TEAM_NAME_TOO_LONG = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("commands.team.add.longName", new Object[] { object });
             return translatableComponent;
         });
-        ERROR_TEAM_ALREADY_EMPTY = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.empty.unchanged", new Object[0]));
-        ERROR_TEAM_ALREADY_NAME = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.name.unchanged", new Object[0]));
-        ERROR_TEAM_ALREADY_COLOR = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.color.unchanged", new Object[0]));
-        ERROR_TEAM_ALREADY_FRIENDLYFIRE_ENABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.friendlyfire.alreadyEnabled", new Object[0]));
-        ERROR_TEAM_ALREADY_FRIENDLYFIRE_DISABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.friendlyfire.alreadyDisabled", new Object[0]));
-        ERROR_TEAM_ALREADY_FRIENDLYINVISIBLES_ENABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.seeFriendlyInvisibles.alreadyEnabled", new Object[0]));
-        ERROR_TEAM_ALREADY_FRIENDLYINVISIBLES_DISABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.seeFriendlyInvisibles.alreadyDisabled", new Object[0]));
-        ERROR_TEAM_NAMETAG_VISIBLITY_UNCHANGED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.nametagVisibility.unchanged", new Object[0]));
-        ERROR_TEAM_DEATH_MESSAGE_VISIBLITY_UNCHANGED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.deathMessageVisibility.unchanged", new Object[0]));
-        ERROR_TEAM_COLLISION_UNCHANGED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.collisionRule.unchanged", new Object[0]));
+        ERROR_TEAM_ALREADY_EMPTY = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.empty.unchanged"));
+        ERROR_TEAM_ALREADY_NAME = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.name.unchanged"));
+        ERROR_TEAM_ALREADY_COLOR = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.color.unchanged"));
+        ERROR_TEAM_ALREADY_FRIENDLYFIRE_ENABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.friendlyfire.alreadyEnabled"));
+        ERROR_TEAM_ALREADY_FRIENDLYFIRE_DISABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.friendlyfire.alreadyDisabled"));
+        ERROR_TEAM_ALREADY_FRIENDLYINVISIBLES_ENABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.seeFriendlyInvisibles.alreadyEnabled"));
+        ERROR_TEAM_ALREADY_FRIENDLYINVISIBLES_DISABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.seeFriendlyInvisibles.alreadyDisabled"));
+        ERROR_TEAM_NAMETAG_VISIBLITY_UNCHANGED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.nametagVisibility.unchanged"));
+        ERROR_TEAM_DEATH_MESSAGE_VISIBLITY_UNCHANGED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.deathMessageVisibility.unchanged"));
+        ERROR_TEAM_COLLISION_UNCHANGED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.team.option.collisionRule.unchanged"));
     }
 }
diff --git a/src/net/minecraft/server/commands/TeamMsgCommand.java b/src/net/minecraft/server/commands/TeamMsgCommand.java
index 50ea9a1..e3ccd18 100644
--- a/src/net/minecraft/server/commands/TeamMsgCommand.java
+++ b/src/net/minecraft/server/commands/TeamMsgCommand.java
@@ -1,17 +1,15 @@
 package net.minecraft.server.commands;
 
 import com.mojang.brigadier.Message;
+import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.HoverEvent;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import java.util.List;
 import java.util.Iterator;
-import net.minecraft.network.chat.Style;
-import java.util.function.Consumer;
+import java.util.List;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.network.chat.HoverEvent;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.scores.PlayerTeam;
 import net.minecraft.network.chat.Component;
 import com.mojang.brigadier.tree.LiteralCommandNode;
@@ -23,8 +21,10 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.commands.CommandSourceStack;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import net.minecraft.network.chat.Style;
 
 public class TeamMsgCommand {
+    private static final Style SUGGEST_STYLE;
     private static final SimpleCommandExceptionType ERROR_NOT_ON_TEAM;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
@@ -32,38 +32,30 @@ public class TeamMsgCommand {
         commandDispatcher.register((LiteralArgumentBuilder)Commands.literal("tm").redirect((CommandNode)literalCommandNode2));
     }
     
-    private static int sendMessage(final CommandSourceStack cq, final Component lf) throws CommandSyntaxException {
-        final Entity akq3 = cq.getEntityOrException();
-        final PlayerTeam cwj4 = (PlayerTeam)akq3.getTeam();
-        if (cwj4 == null) {
+    private static int sendMessage(final CommandSourceStack cz, final Component mr) throws CommandSyntaxException {
+        final Entity aom3 = cz.getEntityOrException();
+        final PlayerTeam dfk4 = (PlayerTeam)aom3.getTeam();
+        if (dfk4 == null) {
             throw TeamMsgCommand.ERROR_NOT_ON_TEAM.create();
         }
-        final HoverEvent hoverEvent;
-        final Consumer<Style> consumer5 = ln -> {
-            new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TranslatableComponent("chat.type.team.hover", new Object[0]));
-            ln.setHoverEvent(hoverEvent).setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/teammsg "));
-            return;
-        };
-        final Component lf2 = cwj4.getFormattedDisplayName().withStyle(consumer5);
-        for (final Component lf3 : lf2.getSiblings()) {
-            lf3.withStyle(consumer5);
-        }
-        final List<ServerPlayer> list7 = cq.getServer().getPlayerList().getPlayers();
-        for (final ServerPlayer xe9 : list7) {
-            if (xe9 == akq3) {
-                xe9.sendMessage(new TranslatableComponent("chat.type.team.sent", new Object[] { lf2, cq.getDisplayName(), lf.deepCopy() }));
+        final Component mr2 = dfk4.getFormattedDisplayName().withStyle(TeamMsgCommand.SUGGEST_STYLE);
+        final List<ServerPlayer> list6 = cz.getServer().getPlayerList().getPlayers();
+        for (final ServerPlayer ze8 : list6) {
+            if (ze8 == aom3) {
+                ze8.sendMessage(new TranslatableComponent("chat.type.team.sent", new Object[] { mr2, cz.getDisplayName(), mr }), aom3.getUUID());
             }
             else {
-                if (xe9.getTeam() != cwj4) {
+                if (ze8.getTeam() != dfk4) {
                     continue;
                 }
-                xe9.sendMessage(new TranslatableComponent("chat.type.team.text", new Object[] { lf2, cq.getDisplayName(), lf.deepCopy() }));
+                ze8.sendMessage(new TranslatableComponent("chat.type.team.text", new Object[] { mr2, cz.getDisplayName(), mr }), aom3.getUUID());
             }
         }
-        return list7.size();
+        return list6.size();
     }
     
     static {
-        ERROR_NOT_ON_TEAM = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.teammsg.failed.noteam", new Object[0]));
+        SUGGEST_STYLE = Style.EMPTY.withHoverEvent(new HoverEvent((HoverEvent.Action<T>)HoverEvent.Action.SHOW_TEXT, (T)new TranslatableComponent("chat.type.team.hover"))).withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/teammsg "));
+        ERROR_NOT_ON_TEAM = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.teammsg.failed.noteam"));
     }
 }
diff --git a/src/net/minecraft/server/commands/TeleportCommand.java b/src/net/minecraft/server/commands/TeleportCommand.java
index 7cf0c55..d9e4c62 100644
--- a/src/net/minecraft/server/commands/TeleportCommand.java
+++ b/src/net/minecraft/server/commands/TeleportCommand.java
@@ -1,20 +1,22 @@
 package net.minecraft.server.commands;
 
+import com.mojang.brigadier.Message;
 import net.minecraft.commands.arguments.coordinates.WorldCoordinates;
 import java.util.Collections;
 import com.mojang.brigadier.context.CommandContext;
+import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.Level;
 import net.minecraft.util.Mth;
 import net.minecraft.server.level.TicketType;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.world.level.Level;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
 import javax.annotation.Nullable;
 import net.minecraft.commands.arguments.coordinates.Coordinates;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.util.Iterator;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
@@ -36,114 +38,127 @@ import net.minecraft.commands.Commands;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.commands.CommandSourceStack;
 import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 
 public class TeleportCommand {
+    private static final SimpleCommandExceptionType INVALID_POSITION;
+    
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        final LiteralCommandNode<CommandSourceStack> literalCommandNode2 = (LiteralCommandNode<CommandSourceStack>)commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("teleport").requires(cq -> cq.hasPermission(2))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("location", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), null, null))).then(Commands.argument("rotation", (com.mojang.brigadier.arguments.ArgumentType<Object>)RotationArgument.rotation()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), RotationArgument.getRotation((CommandContext<CommandSourceStack>)commandContext, "rotation"), null)))).then(((LiteralArgumentBuilder)Commands.literal("facing").then(Commands.literal("entity").then(((RequiredArgumentBuilder)Commands.argument("facingEntity", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), null, new LookAt(EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "facingEntity"), EntityAnchorArgument.Anchor.FEET)))).then(Commands.argument("facingAnchor", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityAnchorArgument.anchor()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), null, new LookAt(EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "facingEntity"), EntityAnchorArgument.getAnchor((CommandContext<CommandSourceStack>)commandContext, "facingAnchor")))))))).then(Commands.argument("facingLocation", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), null, new LookAt(Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "facingLocation")))))))).then(Commands.argument("destination", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).executes(commandContext -> teleportToEntity((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "destination")))))).then(Commands.argument("location", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), Collections.<Entity>singleton(((CommandSourceStack)commandContext.getSource()).getEntityOrException()), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), WorldCoordinates.current(), null)))).then(Commands.argument("destination", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).executes(commandContext -> teleportToEntity((CommandSourceStack)commandContext.getSource(), Collections.<Entity>singleton(((CommandSourceStack)commandContext.getSource()).getEntityOrException()), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "destination")))));
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("tp").requires(cq -> cq.hasPermission(2))).redirect((CommandNode)literalCommandNode2));
+        final LiteralCommandNode<CommandSourceStack> literalCommandNode2 = (LiteralCommandNode<CommandSourceStack>)commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("teleport").requires(cz -> cz.hasPermission(2))).then(((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entities()).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("location", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), null, null))).then(Commands.argument("rotation", (com.mojang.brigadier.arguments.ArgumentType<Object>)RotationArgument.rotation()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), RotationArgument.getRotation((CommandContext<CommandSourceStack>)commandContext, "rotation"), null)))).then(((LiteralArgumentBuilder)Commands.literal("facing").then(Commands.literal("entity").then(((RequiredArgumentBuilder)Commands.argument("facingEntity", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), null, new LookAt(EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "facingEntity"), EntityAnchorArgument.Anchor.FEET)))).then(Commands.argument("facingAnchor", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityAnchorArgument.anchor()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), null, new LookAt(EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "facingEntity"), EntityAnchorArgument.getAnchor((CommandContext<CommandSourceStack>)commandContext, "facingAnchor")))))))).then(Commands.argument("facingLocation", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), null, new LookAt(Vec3Argument.getVec3((CommandContext<CommandSourceStack>)commandContext, "facingLocation")))))))).then(Commands.argument("destination", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).executes(commandContext -> teleportToEntity((CommandSourceStack)commandContext.getSource(), EntityArgument.getEntities((CommandContext<CommandSourceStack>)commandContext, "targets"), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "destination")))))).then(Commands.argument("location", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec3Argument.vec3()).executes(commandContext -> teleportToPos((CommandSourceStack)commandContext.getSource(), Collections.<Entity>singleton(((CommandSourceStack)commandContext.getSource()).getEntityOrException()), ((CommandSourceStack)commandContext.getSource()).getLevel(), Vec3Argument.getCoordinates((CommandContext<CommandSourceStack>)commandContext, "location"), WorldCoordinates.current(), null)))).then(Commands.argument("destination", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.entity()).executes(commandContext -> teleportToEntity((CommandSourceStack)commandContext.getSource(), Collections.<Entity>singleton(((CommandSourceStack)commandContext.getSource()).getEntityOrException()), EntityArgument.getEntity((CommandContext<CommandSourceStack>)commandContext, "destination")))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("tp").requires(cz -> cz.hasPermission(2))).redirect((CommandNode)literalCommandNode2));
     }
     
-    private static int teleportToEntity(final CommandSourceStack cq, final Collection<? extends Entity> collection, final Entity akq) {
-        for (final Entity akq2 : collection) {
-            performTeleport(cq, akq2, (ServerLevel)akq.level, akq.getX(), akq.getY(), akq.getZ(), EnumSet.<ClientboundPlayerPositionPacket.RelativeArgument>noneOf(ClientboundPlayerPositionPacket.RelativeArgument.class), akq.yRot, akq.xRot, null);
+    private static int teleportToEntity(final CommandSourceStack cz, final Collection<? extends Entity> collection, final Entity aom) throws CommandSyntaxException {
+        for (final Entity aom2 : collection) {
+            performTeleport(cz, aom2, (ServerLevel)aom.level, aom.getX(), aom.getY(), aom.getZ(), EnumSet.<ClientboundPlayerPositionPacket.RelativeArgument>noneOf(ClientboundPlayerPositionPacket.RelativeArgument.class), aom.yRot, aom.xRot, null);
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.teleport.success.entity.single", new Object[] { ((Entity)collection.iterator().next()).getDisplayName(), akq.getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.teleport.success.entity.single", new Object[] { ((Entity)collection.iterator().next()).getDisplayName(), aom.getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.teleport.success.entity.multiple", new Object[] { collection.size(), akq.getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.teleport.success.entity.multiple", new Object[] { collection.size(), aom.getDisplayName() }), true);
         }
         return collection.size();
     }
     
-    private static int teleportToPos(final CommandSourceStack cq, final Collection<? extends Entity> collection, final ServerLevel xd, final Coordinates dz4, @Nullable final Coordinates dz5, @Nullable final LookAt a) throws CommandSyntaxException {
-        final Vec3 cvl7 = dz4.getPosition(cq);
-        final Vec2 cvk8 = (dz5 == null) ? null : dz5.getRotation(cq);
+    private static int teleportToPos(final CommandSourceStack cz, final Collection<? extends Entity> collection, final ServerLevel zd, final Coordinates ej4, @Nullable final Coordinates ej5, @Nullable final LookAt a) throws CommandSyntaxException {
+        final Vec3 dem7 = ej4.getPosition(cz);
+        final Vec2 del8 = (ej5 == null) ? null : ej5.getRotation(cz);
         final Set<ClientboundPlayerPositionPacket.RelativeArgument> set9 = EnumSet.<ClientboundPlayerPositionPacket.RelativeArgument>noneOf(ClientboundPlayerPositionPacket.RelativeArgument.class);
-        if (dz4.isXRelative()) {
+        if (ej4.isXRelative()) {
             set9.add(ClientboundPlayerPositionPacket.RelativeArgument.X);
         }
-        if (dz4.isYRelative()) {
+        if (ej4.isYRelative()) {
             set9.add(ClientboundPlayerPositionPacket.RelativeArgument.Y);
         }
-        if (dz4.isZRelative()) {
+        if (ej4.isZRelative()) {
             set9.add(ClientboundPlayerPositionPacket.RelativeArgument.Z);
         }
-        if (dz5 == null) {
+        if (ej5 == null) {
             set9.add(ClientboundPlayerPositionPacket.RelativeArgument.X_ROT);
             set9.add(ClientboundPlayerPositionPacket.RelativeArgument.Y_ROT);
         }
         else {
-            if (dz5.isXRelative()) {
+            if (ej5.isXRelative()) {
                 set9.add(ClientboundPlayerPositionPacket.RelativeArgument.X_ROT);
             }
-            if (dz5.isYRelative()) {
+            if (ej5.isYRelative()) {
                 set9.add(ClientboundPlayerPositionPacket.RelativeArgument.Y_ROT);
             }
         }
-        for (final Entity akq11 : collection) {
-            if (dz5 == null) {
-                performTeleport(cq, akq11, xd, cvl7.x, cvl7.y, cvl7.z, set9, akq11.yRot, akq11.xRot, a);
+        for (final Entity aom11 : collection) {
+            if (ej5 == null) {
+                performTeleport(cz, aom11, zd, dem7.x, dem7.y, dem7.z, set9, aom11.yRot, aom11.xRot, a);
             }
             else {
-                performTeleport(cq, akq11, xd, cvl7.x, cvl7.y, cvl7.z, set9, cvk8.y, cvk8.x, a);
+                performTeleport(cz, aom11, zd, dem7.x, dem7.y, dem7.z, set9, del8.y, del8.x, a);
             }
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.teleport.success.location.single", new Object[] { ((Entity)collection.iterator().next()).getDisplayName(), cvl7.x, cvl7.y, cvl7.z }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.teleport.success.location.single", new Object[] { ((Entity)collection.iterator().next()).getDisplayName(), dem7.x, dem7.y, dem7.z }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.teleport.success.location.multiple", new Object[] { collection.size(), cvl7.x, cvl7.y, cvl7.z }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.teleport.success.location.multiple", new Object[] { collection.size(), dem7.x, dem7.y, dem7.z }), true);
         }
         return collection.size();
     }
     
-    private static void performTeleport(final CommandSourceStack cq, Entity akq, final ServerLevel xd, final double double4, final double double5, final double double6, final Set<ClientboundPlayerPositionPacket.RelativeArgument> set, final float float8, final float float9, @Nullable final LookAt a) {
-        if (akq instanceof ServerPlayer) {
-            final ChunkPos bjh14 = new ChunkPos(new BlockPos(double4, double5, double6));
-            xd.getChunkSource().<Integer>addRegionTicket(TicketType.POST_TELEPORT, bjh14, 1, akq.getId());
-            akq.stopRiding();
-            if (((ServerPlayer)akq).isSleeping()) {
-                ((ServerPlayer)akq).stopSleepInBed(true, true);
+    private static void performTeleport(final CommandSourceStack cz, Entity aom, final ServerLevel zd, final double double4, final double double5, final double double6, final Set<ClientboundPlayerPositionPacket.RelativeArgument> set, final float float8, final float float9, @Nullable final LookAt a) throws CommandSyntaxException {
+        final BlockPos fu14 = new BlockPos(double4, double5, double6);
+        if (!Level.isInSpawnableBounds(fu14)) {
+            throw TeleportCommand.INVALID_POSITION.create();
+        }
+        if (aom instanceof ServerPlayer) {
+            final ChunkPos bph15 = new ChunkPos(new BlockPos(double4, double5, double6));
+            zd.getChunkSource().<Integer>addRegionTicket(TicketType.POST_TELEPORT, bph15, 1, aom.getId());
+            aom.stopRiding();
+            if (((ServerPlayer)aom).isSleeping()) {
+                ((ServerPlayer)aom).stopSleepInBed(true, true);
             }
-            if (xd == akq.level) {
-                ((ServerPlayer)akq).connection.teleport(double4, double5, double6, float8, float9, set);
+            if (zd == aom.level) {
+                ((ServerPlayer)aom).connection.teleport(double4, double5, double6, float8, float9, set);
             }
             else {
-                ((ServerPlayer)akq).teleportTo(xd, double4, double5, double6, float8, float9);
+                ((ServerPlayer)aom).teleportTo(zd, double4, double5, double6, float8, float9);
             }
-            akq.setYHeadRot(float8);
+            aom.setYHeadRot(float8);
         }
         else {
             final float float10 = Mth.wrapDegrees(float8);
             float float11 = Mth.wrapDegrees(float9);
             float11 = Mth.clamp(float11, -90.0f, 90.0f);
-            if (xd == akq.level) {
-                akq.moveTo(double4, double5, double6, float10, float11);
-                akq.setYHeadRot(float10);
+            if (zd == aom.level) {
+                aom.moveTo(double4, double5, double6, float10, float11);
+                aom.setYHeadRot(float10);
             }
             else {
-                akq.unRide();
-                akq.dimension = xd.dimension.getType();
-                final Entity akq2 = akq;
-                akq = (Entity)akq2.getType().create(xd);
-                if (akq == null) {
+                aom.unRide();
+                final Entity aom2 = aom;
+                aom = (Entity)aom2.getType().create(zd);
+                if (aom == null) {
                     return;
                 }
-                akq.restoreFrom(akq2);
-                akq.moveTo(double4, double5, double6, float10, float11);
-                akq.setYHeadRot(float10);
-                xd.addFromAnotherDimension(akq);
-                akq2.removed = true;
+                aom.restoreFrom(aom2);
+                aom.moveTo(double4, double5, double6, float10, float11);
+                aom.setYHeadRot(float10);
+                zd.addFromAnotherDimension(aom);
+                aom2.removed = true;
             }
         }
         if (a != null) {
-            a.perform(cq, akq);
+            a.perform(cz, aom);
         }
-        if (!(akq instanceof LivingEntity) || !((LivingEntity)akq).isFallFlying()) {
-            akq.setDeltaMovement(akq.getDeltaMovement().multiply(1.0, 0.0, 1.0));
-            akq.onGround = true;
+        if (!(aom instanceof LivingEntity) || !((LivingEntity)aom).isFallFlying()) {
+            aom.setDeltaMovement(aom.getDeltaMovement().multiply(1.0, 0.0, 1.0));
+            aom.setOnGround(true);
         }
+        if (aom instanceof PathfinderMob) {
+            ((PathfinderMob)aom).getNavigation().stop();
+        }
+    }
+    
+    static {
+        INVALID_POSITION = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.teleport.invalidPosition"));
     }
     
     static class LookAt {
@@ -151,29 +166,29 @@ public class TeleportCommand {
         private final Entity entity;
         private final EntityAnchorArgument.Anchor anchor;
         
-        public LookAt(final Entity akq, final EntityAnchorArgument.Anchor a) {
-            this.entity = akq;
+        public LookAt(final Entity aom, final EntityAnchorArgument.Anchor a) {
+            this.entity = aom;
             this.anchor = a;
-            this.position = a.apply(akq);
+            this.position = a.apply(aom);
         }
         
-        public LookAt(final Vec3 cvl) {
+        public LookAt(final Vec3 dem) {
             this.entity = null;
-            this.position = cvl;
+            this.position = dem;
             this.anchor = null;
         }
         
-        public void perform(final CommandSourceStack cq, final Entity akq) {
+        public void perform(final CommandSourceStack cz, final Entity aom) {
             if (this.entity != null) {
-                if (akq instanceof ServerPlayer) {
-                    ((ServerPlayer)akq).lookAt(cq.getAnchor(), this.entity, this.anchor);
+                if (aom instanceof ServerPlayer) {
+                    ((ServerPlayer)aom).lookAt(cz.getAnchor(), this.entity, this.anchor);
                 }
                 else {
-                    akq.lookAt(cq.getAnchor(), this.position);
+                    aom.lookAt(cz.getAnchor(), this.position);
                 }
             }
             else {
-                akq.lookAt(cq.getAnchor(), this.position);
+                aom.lookAt(cz.getAnchor(), this.position);
             }
         }
     }
diff --git a/src/net/minecraft/server/commands/TellRawCommand.java b/src/net/minecraft/server/commands/TellRawCommand.java
index 0aa5168..1a71670 100644
--- a/src/net/minecraft/server/commands/TellRawCommand.java
+++ b/src/net/minecraft/server/commands/TellRawCommand.java
@@ -2,6 +2,8 @@ package net.minecraft.server.commands;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.util.Iterator;
+import net.minecraft.network.chat.Component;
+import net.minecraft.Util;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.network.chat.ComponentUtils;
 import net.minecraft.server.level.ServerPlayer;
@@ -16,10 +18,10 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class TellRawCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("tellraw").requires(cq -> cq.hasPermission(2))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.argument("message", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> {
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("tellraw").requires(cz -> cz.hasPermission(2))).then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.argument("message", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> {
             int integer2 = 0;
-            for (final ServerPlayer xe4 : EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets")) {
-                xe4.sendMessage(ComponentUtils.updateForEntity((CommandSourceStack)commandContext.getSource(), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "message"), xe4, 0));
+            for (final ServerPlayer ze4 : EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets")) {
+                ze4.sendMessage(ComponentUtils.updateForEntity((CommandSourceStack)commandContext.getSource(), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "message"), ze4, 0), Util.NIL_UUID);
                 ++integer2;
             }
             return integer2;
diff --git a/src/net/minecraft/server/commands/TimeCommand.java b/src/net/minecraft/server/commands/TimeCommand.java
index 3756383..85c4f3e 100644
--- a/src/net/minecraft/server/commands/TimeCommand.java
+++ b/src/net/minecraft/server/commands/TimeCommand.java
@@ -16,32 +16,32 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class TimeCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("time").requires(cq -> cq.hasPermission(2))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("set").then(Commands.literal("day").executes(commandContext -> setTime((CommandSourceStack)commandContext.getSource(), 1000)))).then(Commands.literal("noon").executes(commandContext -> setTime((CommandSourceStack)commandContext.getSource(), 6000)))).then(Commands.literal("night").executes(commandContext -> setTime((CommandSourceStack)commandContext.getSource(), 13000)))).then(Commands.literal("midnight").executes(commandContext -> setTime((CommandSourceStack)commandContext.getSource(), 18000)))).then(Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)TimeArgument.time()).executes(commandContext -> setTime((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "time")))))).then(Commands.literal("add").then(Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)TimeArgument.time()).executes(commandContext -> addTime((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "time")))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("query").then(Commands.literal("daytime").executes(commandContext -> queryTime((CommandSourceStack)commandContext.getSource(), getDayTime(((CommandSourceStack)commandContext.getSource()).getLevel()))))).then(Commands.literal("gametime").executes(commandContext -> queryTime((CommandSourceStack)commandContext.getSource(), (int)(((CommandSourceStack)commandContext.getSource()).getLevel().getGameTime() % 2147483647L))))).then(Commands.literal("day").executes(commandContext -> queryTime((CommandSourceStack)commandContext.getSource(), (int)(((CommandSourceStack)commandContext.getSource()).getLevel().getDayTime() / 24000L % 2147483647L))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("time").requires(cz -> cz.hasPermission(2))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("set").then(Commands.literal("day").executes(commandContext -> setTime((CommandSourceStack)commandContext.getSource(), 1000)))).then(Commands.literal("noon").executes(commandContext -> setTime((CommandSourceStack)commandContext.getSource(), 6000)))).then(Commands.literal("night").executes(commandContext -> setTime((CommandSourceStack)commandContext.getSource(), 13000)))).then(Commands.literal("midnight").executes(commandContext -> setTime((CommandSourceStack)commandContext.getSource(), 18000)))).then(Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)TimeArgument.time()).executes(commandContext -> setTime((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "time")))))).then(Commands.literal("add").then(Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)TimeArgument.time()).executes(commandContext -> addTime((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "time")))))).then(((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("query").then(Commands.literal("daytime").executes(commandContext -> queryTime((CommandSourceStack)commandContext.getSource(), getDayTime(((CommandSourceStack)commandContext.getSource()).getLevel()))))).then(Commands.literal("gametime").executes(commandContext -> queryTime((CommandSourceStack)commandContext.getSource(), (int)(((CommandSourceStack)commandContext.getSource()).getLevel().getGameTime() % 2147483647L))))).then(Commands.literal("day").executes(commandContext -> queryTime((CommandSourceStack)commandContext.getSource(), (int)(((CommandSourceStack)commandContext.getSource()).getLevel().getDayTime() / 24000L % 2147483647L))))));
     }
     
-    private static int getDayTime(final ServerLevel xd) {
-        return (int)(xd.getDayTime() % 24000L);
+    private static int getDayTime(final ServerLevel zd) {
+        return (int)(zd.getDayTime() % 24000L);
     }
     
-    private static int queryTime(final CommandSourceStack cq, final int integer) {
-        cq.sendSuccess(new TranslatableComponent("commands.time.query", new Object[] { integer }), false);
+    private static int queryTime(final CommandSourceStack cz, final int integer) {
+        cz.sendSuccess(new TranslatableComponent("commands.time.query", new Object[] { integer }), false);
         return integer;
     }
     
-    public static int setTime(final CommandSourceStack cq, final int integer) {
-        for (final ServerLevel xd4 : cq.getServer().getAllLevels()) {
-            xd4.setDayTime(integer);
+    public static int setTime(final CommandSourceStack cz, final int integer) {
+        for (final ServerLevel zd4 : cz.getServer().getAllLevels()) {
+            zd4.setDayTime(integer);
         }
-        cq.sendSuccess(new TranslatableComponent("commands.time.set", new Object[] { integer }), true);
-        return getDayTime(cq.getLevel());
+        cz.sendSuccess(new TranslatableComponent("commands.time.set", new Object[] { integer }), true);
+        return getDayTime(cz.getLevel());
     }
     
-    public static int addTime(final CommandSourceStack cq, final int integer) {
-        for (final ServerLevel xd4 : cq.getServer().getAllLevels()) {
-            xd4.setDayTime(xd4.getDayTime() + integer);
+    public static int addTime(final CommandSourceStack cz, final int integer) {
+        for (final ServerLevel zd4 : cz.getServer().getAllLevels()) {
+            zd4.setDayTime(zd4.getDayTime() + integer);
         }
-        final int integer2 = getDayTime(cq.getLevel());
-        cq.sendSuccess(new TranslatableComponent("commands.time.set", new Object[] { integer2 }), true);
+        final int integer2 = getDayTime(cz.getLevel());
+        cz.sendSuccess(new TranslatableComponent("commands.time.set", new Object[] { integer2 }), true);
         return integer2;
     }
 }
diff --git a/src/net/minecraft/server/commands/TitleCommand.java b/src/net/minecraft/server/commands/TitleCommand.java
index 4391a05..3d56cc6 100644
--- a/src/net/minecraft/server/commands/TitleCommand.java
+++ b/src/net/minecraft/server/commands/TitleCommand.java
@@ -24,60 +24,60 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class TitleCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("title").requires(cq -> cq.hasPermission(2))).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.literal("clear").executes(commandContext -> clearTitle((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"))))).then(Commands.literal("reset").executes(commandContext -> resetTitle((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"))))).then(Commands.literal("title").then(Commands.argument("title", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> showTitle((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "title"), ClientboundSetTitlesPacket.Type.TITLE))))).then(Commands.literal("subtitle").then(Commands.argument("title", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> showTitle((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "title"), ClientboundSetTitlesPacket.Type.SUBTITLE))))).then(Commands.literal("actionbar").then(Commands.argument("title", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> showTitle((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "title"), ClientboundSetTitlesPacket.Type.ACTIONBAR))))).then(Commands.literal("times").then(Commands.argument("fadeIn", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).then(Commands.argument("stay", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).then(Commands.argument("fadeOut", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setTimes((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "fadeIn"), IntegerArgumentType.getInteger(commandContext, "stay"), IntegerArgumentType.getInteger(commandContext, "fadeOut")))))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("title").requires(cz -> cz.hasPermission(2))).then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)EntityArgument.players()).then(Commands.literal("clear").executes(commandContext -> clearTitle((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"))))).then(Commands.literal("reset").executes(commandContext -> resetTitle((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"))))).then(Commands.literal("title").then(Commands.argument("title", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> showTitle((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "title"), ClientboundSetTitlesPacket.Type.TITLE))))).then(Commands.literal("subtitle").then(Commands.argument("title", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> showTitle((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "title"), ClientboundSetTitlesPacket.Type.SUBTITLE))))).then(Commands.literal("actionbar").then(Commands.argument("title", (com.mojang.brigadier.arguments.ArgumentType<Object>)ComponentArgument.textComponent()).executes(commandContext -> showTitle((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), ComponentArgument.getComponent((CommandContext<CommandSourceStack>)commandContext, "title"), ClientboundSetTitlesPacket.Type.ACTIONBAR))))).then(Commands.literal("times").then(Commands.argument("fadeIn", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).then(Commands.argument("stay", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).then(Commands.argument("fadeOut", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setTimes((CommandSourceStack)commandContext.getSource(), EntityArgument.getPlayers((CommandContext<CommandSourceStack>)commandContext, "targets"), IntegerArgumentType.getInteger(commandContext, "fadeIn"), IntegerArgumentType.getInteger(commandContext, "stay"), IntegerArgumentType.getInteger(commandContext, "fadeOut")))))))));
     }
     
-    private static int clearTitle(final CommandSourceStack cq, final Collection<ServerPlayer> collection) {
-        final ClientboundSetTitlesPacket ow3 = new ClientboundSetTitlesPacket(ClientboundSetTitlesPacket.Type.CLEAR, null);
-        for (final ServerPlayer xe5 : collection) {
-            xe5.connection.send(ow3);
+    private static int clearTitle(final CommandSourceStack cz, final Collection<ServerPlayer> collection) {
+        final ClientboundSetTitlesPacket qk3 = new ClientboundSetTitlesPacket(ClientboundSetTitlesPacket.Type.CLEAR, null);
+        for (final ServerPlayer ze5 : collection) {
+            ze5.connection.send(qk3);
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.title.cleared.single", new Object[] { collection.iterator().next().getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.title.cleared.single", new Object[] { collection.iterator().next().getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.title.cleared.multiple", new Object[] { collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.title.cleared.multiple", new Object[] { collection.size() }), true);
         }
         return collection.size();
     }
     
-    private static int resetTitle(final CommandSourceStack cq, final Collection<ServerPlayer> collection) {
-        final ClientboundSetTitlesPacket ow3 = new ClientboundSetTitlesPacket(ClientboundSetTitlesPacket.Type.RESET, null);
-        for (final ServerPlayer xe5 : collection) {
-            xe5.connection.send(ow3);
+    private static int resetTitle(final CommandSourceStack cz, final Collection<ServerPlayer> collection) {
+        final ClientboundSetTitlesPacket qk3 = new ClientboundSetTitlesPacket(ClientboundSetTitlesPacket.Type.RESET, null);
+        for (final ServerPlayer ze5 : collection) {
+            ze5.connection.send(qk3);
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.title.reset.single", new Object[] { collection.iterator().next().getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.title.reset.single", new Object[] { collection.iterator().next().getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.title.reset.multiple", new Object[] { collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.title.reset.multiple", new Object[] { collection.size() }), true);
         }
         return collection.size();
     }
     
-    private static int showTitle(final CommandSourceStack cq, final Collection<ServerPlayer> collection, final Component lf, final ClientboundSetTitlesPacket.Type a) throws CommandSyntaxException {
-        for (final ServerPlayer xe6 : collection) {
-            xe6.connection.send(new ClientboundSetTitlesPacket(a, ComponentUtils.updateForEntity(cq, lf, xe6, 0)));
+    private static int showTitle(final CommandSourceStack cz, final Collection<ServerPlayer> collection, final Component mr, final ClientboundSetTitlesPacket.Type a) throws CommandSyntaxException {
+        for (final ServerPlayer ze6 : collection) {
+            ze6.connection.send(new ClientboundSetTitlesPacket(a, ComponentUtils.updateForEntity(cz, mr, ze6, 0)));
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.title.show." + a.name().toLowerCase(Locale.ROOT) + ".single", new Object[] { collection.iterator().next().getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.title.show." + a.name().toLowerCase(Locale.ROOT) + ".single", new Object[] { collection.iterator().next().getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.title.show." + a.name().toLowerCase(Locale.ROOT) + ".multiple", new Object[] { collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.title.show." + a.name().toLowerCase(Locale.ROOT) + ".multiple", new Object[] { collection.size() }), true);
         }
         return collection.size();
     }
     
-    private static int setTimes(final CommandSourceStack cq, final Collection<ServerPlayer> collection, final int integer3, final int integer4, final int integer5) {
-        final ClientboundSetTitlesPacket ow6 = new ClientboundSetTitlesPacket(integer3, integer4, integer5);
-        for (final ServerPlayer xe8 : collection) {
-            xe8.connection.send(ow6);
+    private static int setTimes(final CommandSourceStack cz, final Collection<ServerPlayer> collection, final int integer3, final int integer4, final int integer5) {
+        final ClientboundSetTitlesPacket qk6 = new ClientboundSetTitlesPacket(integer3, integer4, integer5);
+        for (final ServerPlayer ze8 : collection) {
+            ze8.connection.send(qk6);
         }
         if (collection.size() == 1) {
-            cq.sendSuccess(new TranslatableComponent("commands.title.times.single", new Object[] { collection.iterator().next().getDisplayName() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.title.times.single", new Object[] { collection.iterator().next().getDisplayName() }), true);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.title.times.multiple", new Object[] { collection.size() }), true);
+            cz.sendSuccess(new TranslatableComponent("commands.title.times.multiple", new Object[] { collection.size() }), true);
         }
         return collection.size();
     }
diff --git a/src/net/minecraft/server/commands/TriggerCommand.java b/src/net/minecraft/server/commands/TriggerCommand.java
index f01f0cd..2617141 100644
--- a/src/net/minecraft/server/commands/TriggerCommand.java
+++ b/src/net/minecraft/server/commands/TriggerCommand.java
@@ -36,62 +36,62 @@ public class TriggerCommand {
         commandDispatcher.register((LiteralArgumentBuilder)Commands.literal("trigger").then(((RequiredArgumentBuilder)((RequiredArgumentBuilder)Commands.argument("objective", (com.mojang.brigadier.arguments.ArgumentType<Object>)ObjectiveArgument.objective()).suggests((commandContext, suggestionsBuilder) -> suggestObjectives((CommandSourceStack)commandContext.getSource(), suggestionsBuilder)).executes(commandContext -> simpleTrigger((CommandSourceStack)commandContext.getSource(), getScore(((CommandSourceStack)commandContext.getSource()).getPlayerOrException(), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective"))))).then(Commands.literal("add").then(Commands.argument("value", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> addValue((CommandSourceStack)commandContext.getSource(), getScore(((CommandSourceStack)commandContext.getSource()).getPlayerOrException(), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective")), IntegerArgumentType.getInteger(commandContext, "value")))))).then(Commands.literal("set").then(Commands.argument("value", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).executes(commandContext -> setValue((CommandSourceStack)commandContext.getSource(), getScore(((CommandSourceStack)commandContext.getSource()).getPlayerOrException(), ObjectiveArgument.getObjective((CommandContext<CommandSourceStack>)commandContext, "objective")), IntegerArgumentType.getInteger(commandContext, "value")))))));
     }
     
-    public static CompletableFuture<Suggestions> suggestObjectives(final CommandSourceStack cq, final SuggestionsBuilder suggestionsBuilder) {
-        final Entity akq3 = cq.getEntity();
+    public static CompletableFuture<Suggestions> suggestObjectives(final CommandSourceStack cz, final SuggestionsBuilder suggestionsBuilder) {
+        final Entity aom3 = cz.getEntity();
         final List<String> list4 = Lists.newArrayList();
-        if (akq3 != null) {
-            final Scoreboard cwl5 = cq.getServer().getScoreboard();
-            final String string6 = akq3.getScoreboardName();
-            for (final Objective cwi8 : cwl5.getObjectives()) {
-                if (cwi8.getCriteria() == ObjectiveCriteria.TRIGGER && cwl5.hasPlayerScore(string6, cwi8)) {
-                    final Score cwk9 = cwl5.getOrCreatePlayerScore(string6, cwi8);
-                    if (cwk9.isLocked()) {
+        if (aom3 != null) {
+            final Scoreboard dfm5 = cz.getServer().getScoreboard();
+            final String string6 = aom3.getScoreboardName();
+            for (final Objective dfj8 : dfm5.getObjectives()) {
+                if (dfj8.getCriteria() == ObjectiveCriteria.TRIGGER && dfm5.hasPlayerScore(string6, dfj8)) {
+                    final Score dfl9 = dfm5.getOrCreatePlayerScore(string6, dfj8);
+                    if (dfl9.isLocked()) {
                         continue;
                     }
-                    list4.add(cwi8.getName());
+                    list4.add(dfj8.getName());
                 }
             }
         }
         return SharedSuggestionProvider.suggest(list4, suggestionsBuilder);
     }
     
-    private static int addValue(final CommandSourceStack cq, final Score cwk, final int integer) {
-        cwk.add(integer);
-        cq.sendSuccess(new TranslatableComponent("commands.trigger.add.success", new Object[] { cwk.getObjective().getFormattedDisplayName(), integer }), true);
-        return cwk.getScore();
+    private static int addValue(final CommandSourceStack cz, final Score dfl, final int integer) {
+        dfl.add(integer);
+        cz.sendSuccess(new TranslatableComponent("commands.trigger.add.success", new Object[] { dfl.getObjective().getFormattedDisplayName(), integer }), true);
+        return dfl.getScore();
     }
     
-    private static int setValue(final CommandSourceStack cq, final Score cwk, final int integer) {
-        cwk.setScore(integer);
-        cq.sendSuccess(new TranslatableComponent("commands.trigger.set.success", new Object[] { cwk.getObjective().getFormattedDisplayName(), integer }), true);
+    private static int setValue(final CommandSourceStack cz, final Score dfl, final int integer) {
+        dfl.setScore(integer);
+        cz.sendSuccess(new TranslatableComponent("commands.trigger.set.success", new Object[] { dfl.getObjective().getFormattedDisplayName(), integer }), true);
         return integer;
     }
     
-    private static int simpleTrigger(final CommandSourceStack cq, final Score cwk) {
-        cwk.add(1);
-        cq.sendSuccess(new TranslatableComponent("commands.trigger.simple.success", new Object[] { cwk.getObjective().getFormattedDisplayName() }), true);
-        return cwk.getScore();
+    private static int simpleTrigger(final CommandSourceStack cz, final Score dfl) {
+        dfl.add(1);
+        cz.sendSuccess(new TranslatableComponent("commands.trigger.simple.success", new Object[] { dfl.getObjective().getFormattedDisplayName() }), true);
+        return dfl.getScore();
     }
     
-    private static Score getScore(final ServerPlayer xe, final Objective cwi) throws CommandSyntaxException {
-        if (cwi.getCriteria() != ObjectiveCriteria.TRIGGER) {
+    private static Score getScore(final ServerPlayer ze, final Objective dfj) throws CommandSyntaxException {
+        if (dfj.getCriteria() != ObjectiveCriteria.TRIGGER) {
             throw TriggerCommand.ERROR_INVALID_OBJECTIVE.create();
         }
-        final Scoreboard cwl3 = xe.getScoreboard();
-        final String string4 = xe.getScoreboardName();
-        if (!cwl3.hasPlayerScore(string4, cwi)) {
+        final Scoreboard dfm3 = ze.getScoreboard();
+        final String string4 = ze.getScoreboardName();
+        if (!dfm3.hasPlayerScore(string4, dfj)) {
             throw TriggerCommand.ERROR_NOT_PRIMED.create();
         }
-        final Score cwk5 = cwl3.getOrCreatePlayerScore(string4, cwi);
-        if (cwk5.isLocked()) {
+        final Score dfl5 = dfm3.getOrCreatePlayerScore(string4, dfj);
+        if (dfl5.isLocked()) {
             throw TriggerCommand.ERROR_NOT_PRIMED.create();
         }
-        cwk5.setLocked(true);
-        return cwk5;
+        dfl5.setLocked(true);
+        return dfl5;
     }
     
     static {
-        ERROR_NOT_PRIMED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.trigger.failed.unprimed", new Object[0]));
-        ERROR_INVALID_OBJECTIVE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.trigger.failed.invalid", new Object[0]));
+        ERROR_NOT_PRIMED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.trigger.failed.unprimed"));
+        ERROR_INVALID_OBJECTIVE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.trigger.failed.invalid"));
     }
 }
diff --git a/src/net/minecraft/server/commands/WeatherCommand.java b/src/net/minecraft/server/commands/WeatherCommand.java
index 9d4b8e3..c3e2be9 100644
--- a/src/net/minecraft/server/commands/WeatherCommand.java
+++ b/src/net/minecraft/server/commands/WeatherCommand.java
@@ -13,36 +13,24 @@ import com.mojang.brigadier.CommandDispatcher;
 
 public class WeatherCommand {
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("weather").requires(cq -> cq.hasPermission(2))).then(((LiteralArgumentBuilder)Commands.literal("clear").executes(commandContext -> setClear((CommandSourceStack)commandContext.getSource(), 6000))).then(Commands.argument("duration", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0, 1000000)).executes(commandContext -> setClear((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "duration") * 20))))).then(((LiteralArgumentBuilder)Commands.literal("rain").executes(commandContext -> setRain((CommandSourceStack)commandContext.getSource(), 6000))).then(Commands.argument("duration", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0, 1000000)).executes(commandContext -> setRain((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "duration") * 20))))).then(((LiteralArgumentBuilder)Commands.literal("thunder").executes(commandContext -> setThunder((CommandSourceStack)commandContext.getSource(), 6000))).then(Commands.argument("duration", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0, 1000000)).executes(commandContext -> setThunder((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "duration") * 20)))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("weather").requires(cz -> cz.hasPermission(2))).then(((LiteralArgumentBuilder)Commands.literal("clear").executes(commandContext -> setClear((CommandSourceStack)commandContext.getSource(), 6000))).then(Commands.argument("duration", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0, 1000000)).executes(commandContext -> setClear((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "duration") * 20))))).then(((LiteralArgumentBuilder)Commands.literal("rain").executes(commandContext -> setRain((CommandSourceStack)commandContext.getSource(), 6000))).then(Commands.argument("duration", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0, 1000000)).executes(commandContext -> setRain((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "duration") * 20))))).then(((LiteralArgumentBuilder)Commands.literal("thunder").executes(commandContext -> setThunder((CommandSourceStack)commandContext.getSource(), 6000))).then(Commands.argument("duration", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0, 1000000)).executes(commandContext -> setThunder((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "duration") * 20)))));
     }
     
-    private static int setClear(final CommandSourceStack cq, final int integer) {
-        cq.getLevel().getLevelData().setClearWeatherTime(integer);
-        cq.getLevel().getLevelData().setRainTime(0);
-        cq.getLevel().getLevelData().setThunderTime(0);
-        cq.getLevel().getLevelData().setRaining(false);
-        cq.getLevel().getLevelData().setThundering(false);
-        cq.sendSuccess(new TranslatableComponent("commands.weather.set.clear", new Object[0]), true);
+    private static int setClear(final CommandSourceStack cz, final int integer) {
+        cz.getLevel().setWeatherParameters(integer, 0, false, false);
+        cz.sendSuccess(new TranslatableComponent("commands.weather.set.clear"), true);
         return integer;
     }
     
-    private static int setRain(final CommandSourceStack cq, final int integer) {
-        cq.getLevel().getLevelData().setClearWeatherTime(0);
-        cq.getLevel().getLevelData().setRainTime(integer);
-        cq.getLevel().getLevelData().setThunderTime(integer);
-        cq.getLevel().getLevelData().setRaining(true);
-        cq.getLevel().getLevelData().setThundering(false);
-        cq.sendSuccess(new TranslatableComponent("commands.weather.set.rain", new Object[0]), true);
+    private static int setRain(final CommandSourceStack cz, final int integer) {
+        cz.getLevel().setWeatherParameters(0, integer, true, false);
+        cz.sendSuccess(new TranslatableComponent("commands.weather.set.rain"), true);
         return integer;
     }
     
-    private static int setThunder(final CommandSourceStack cq, final int integer) {
-        cq.getLevel().getLevelData().setClearWeatherTime(0);
-        cq.getLevel().getLevelData().setRainTime(integer);
-        cq.getLevel().getLevelData().setThunderTime(integer);
-        cq.getLevel().getLevelData().setRaining(true);
-        cq.getLevel().getLevelData().setThundering(true);
-        cq.sendSuccess(new TranslatableComponent("commands.weather.set.thunder", new Object[0]), true);
+    private static int setThunder(final CommandSourceStack cz, final int integer) {
+        cz.getLevel().setWeatherParameters(0, integer, true, true);
+        cz.sendSuccess(new TranslatableComponent("commands.weather.set.thunder"), true);
         return integer;
     }
 }
diff --git a/src/net/minecraft/server/commands/WhitelistCommand.java b/src/net/minecraft/server/commands/WhitelistCommand.java
index 4c3bf6b..2762880 100644
--- a/src/net/minecraft/server/commands/WhitelistCommand.java
+++ b/src/net/minecraft/server/commands/WhitelistCommand.java
@@ -33,27 +33,27 @@ public class WhitelistCommand {
     private static final SimpleCommandExceptionType ERROR_NOT_WHITELISTED;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("whitelist").requires(cq -> cq.hasPermission(3))).then(Commands.literal("on").executes(commandContext -> enableWhitelist((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("off").executes(commandContext -> disableWhitelist((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("list").executes(commandContext -> showList((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("add").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).suggests((commandContext, suggestionsBuilder) -> {
-            final PlayerList zo3 = ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList();
-            return SharedSuggestionProvider.suggest(zo3.getPlayers().stream().filter(xe -> !zo3.getWhiteList().isWhiteListed(xe.getGameProfile())).<String>map(xe -> xe.getGameProfile().getName()), suggestionsBuilder);
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("whitelist").requires(cz -> cz.hasPermission(3))).then(Commands.literal("on").executes(commandContext -> enableWhitelist((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("off").executes(commandContext -> disableWhitelist((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("list").executes(commandContext -> showList((CommandSourceStack)commandContext.getSource())))).then(Commands.literal("add").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).suggests((commandContext, suggestionsBuilder) -> {
+            final PlayerList abp3 = ((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList();
+            return SharedSuggestionProvider.suggest(abp3.getPlayers().stream().filter(ze -> !abp3.getWhiteList().isWhiteListed(ze.getGameProfile())).<String>map(ze -> ze.getGameProfile().getName()), suggestionsBuilder);
         }).executes(commandContext -> addPlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets")))))).then(Commands.literal("remove").then(Commands.argument("targets", (com.mojang.brigadier.arguments.ArgumentType<Object>)GameProfileArgument.gameProfile()).suggests((commandContext, suggestionsBuilder) -> SharedSuggestionProvider.suggest(((CommandSourceStack)commandContext.getSource()).getServer().getPlayerList().getWhiteListNames(), suggestionsBuilder)).executes(commandContext -> removePlayers((CommandSourceStack)commandContext.getSource(), GameProfileArgument.getGameProfiles((CommandContext<CommandSourceStack>)commandContext, "targets")))))).then(Commands.literal("reload").executes(commandContext -> reload((CommandSourceStack)commandContext.getSource()))));
     }
     
-    private static int reload(final CommandSourceStack cq) {
-        cq.getServer().getPlayerList().reloadWhiteList();
-        cq.sendSuccess(new TranslatableComponent("commands.whitelist.reloaded", new Object[0]), true);
-        cq.getServer().kickUnlistedPlayers(cq);
+    private static int reload(final CommandSourceStack cz) {
+        cz.getServer().getPlayerList().reloadWhiteList();
+        cz.sendSuccess(new TranslatableComponent("commands.whitelist.reloaded"), true);
+        cz.getServer().kickUnlistedPlayers(cz);
         return 1;
     }
     
-    private static int addPlayers(final CommandSourceStack cq, final Collection<GameProfile> collection) throws CommandSyntaxException {
-        final UserWhiteList zv3 = cq.getServer().getPlayerList().getWhiteList();
+    private static int addPlayers(final CommandSourceStack cz, final Collection<GameProfile> collection) throws CommandSyntaxException {
+        final UserWhiteList abw3 = cz.getServer().getPlayerList().getWhiteList();
         int integer4 = 0;
         for (final GameProfile gameProfile6 : collection) {
-            if (!zv3.isWhiteListed(gameProfile6)) {
-                final UserWhiteListEntry zw7 = new UserWhiteListEntry(gameProfile6);
-                ((StoredUserList<K, UserWhiteListEntry>)zv3).add(zw7);
-                cq.sendSuccess(new TranslatableComponent("commands.whitelist.add.success", new Object[] { ComponentUtils.getDisplayName(gameProfile6) }), true);
+            if (!abw3.isWhiteListed(gameProfile6)) {
+                final UserWhiteListEntry abx7 = new UserWhiteListEntry(gameProfile6);
+                ((StoredUserList<K, UserWhiteListEntry>)abw3).add(abx7);
+                cz.sendSuccess(new TranslatableComponent("commands.whitelist.add.success", new Object[] { ComponentUtils.getDisplayName(gameProfile6) }), true);
                 ++integer4;
             }
         }
@@ -63,60 +63,60 @@ public class WhitelistCommand {
         return integer4;
     }
     
-    private static int removePlayers(final CommandSourceStack cq, final Collection<GameProfile> collection) throws CommandSyntaxException {
-        final UserWhiteList zv3 = cq.getServer().getPlayerList().getWhiteList();
+    private static int removePlayers(final CommandSourceStack cz, final Collection<GameProfile> collection) throws CommandSyntaxException {
+        final UserWhiteList abw3 = cz.getServer().getPlayerList().getWhiteList();
         int integer4 = 0;
         for (final GameProfile gameProfile6 : collection) {
-            if (zv3.isWhiteListed(gameProfile6)) {
-                final UserWhiteListEntry zw7 = new UserWhiteListEntry(gameProfile6);
-                ((StoredUserList<GameProfile, V>)zv3).remove(zw7);
-                cq.sendSuccess(new TranslatableComponent("commands.whitelist.remove.success", new Object[] { ComponentUtils.getDisplayName(gameProfile6) }), true);
+            if (abw3.isWhiteListed(gameProfile6)) {
+                final UserWhiteListEntry abx7 = new UserWhiteListEntry(gameProfile6);
+                ((StoredUserList<GameProfile, V>)abw3).remove(abx7);
+                cz.sendSuccess(new TranslatableComponent("commands.whitelist.remove.success", new Object[] { ComponentUtils.getDisplayName(gameProfile6) }), true);
                 ++integer4;
             }
         }
         if (integer4 == 0) {
             throw WhitelistCommand.ERROR_NOT_WHITELISTED.create();
         }
-        cq.getServer().kickUnlistedPlayers(cq);
+        cz.getServer().kickUnlistedPlayers(cz);
         return integer4;
     }
     
-    private static int enableWhitelist(final CommandSourceStack cq) throws CommandSyntaxException {
-        final PlayerList zo2 = cq.getServer().getPlayerList();
-        if (zo2.isUsingWhitelist()) {
+    private static int enableWhitelist(final CommandSourceStack cz) throws CommandSyntaxException {
+        final PlayerList abp2 = cz.getServer().getPlayerList();
+        if (abp2.isUsingWhitelist()) {
             throw WhitelistCommand.ERROR_ALREADY_ENABLED.create();
         }
-        zo2.setUsingWhiteList(true);
-        cq.sendSuccess(new TranslatableComponent("commands.whitelist.enabled", new Object[0]), true);
-        cq.getServer().kickUnlistedPlayers(cq);
+        abp2.setUsingWhiteList(true);
+        cz.sendSuccess(new TranslatableComponent("commands.whitelist.enabled"), true);
+        cz.getServer().kickUnlistedPlayers(cz);
         return 1;
     }
     
-    private static int disableWhitelist(final CommandSourceStack cq) throws CommandSyntaxException {
-        final PlayerList zo2 = cq.getServer().getPlayerList();
-        if (!zo2.isUsingWhitelist()) {
+    private static int disableWhitelist(final CommandSourceStack cz) throws CommandSyntaxException {
+        final PlayerList abp2 = cz.getServer().getPlayerList();
+        if (!abp2.isUsingWhitelist()) {
             throw WhitelistCommand.ERROR_ALREADY_DISABLED.create();
         }
-        zo2.setUsingWhiteList(false);
-        cq.sendSuccess(new TranslatableComponent("commands.whitelist.disabled", new Object[0]), true);
+        abp2.setUsingWhiteList(false);
+        cz.sendSuccess(new TranslatableComponent("commands.whitelist.disabled"), true);
         return 1;
     }
     
-    private static int showList(final CommandSourceStack cq) {
-        final String[] arr2 = cq.getServer().getPlayerList().getWhiteListNames();
+    private static int showList(final CommandSourceStack cz) {
+        final String[] arr2 = cz.getServer().getPlayerList().getWhiteListNames();
         if (arr2.length == 0) {
-            cq.sendSuccess(new TranslatableComponent("commands.whitelist.none", new Object[0]), false);
+            cz.sendSuccess(new TranslatableComponent("commands.whitelist.none"), false);
         }
         else {
-            cq.sendSuccess(new TranslatableComponent("commands.whitelist.list", new Object[] { arr2.length, String.join(", ", (CharSequence[])arr2) }), false);
+            cz.sendSuccess(new TranslatableComponent("commands.whitelist.list", new Object[] { arr2.length, String.join(", ", (CharSequence[])arr2) }), false);
         }
         return arr2.length;
     }
     
     static {
-        ERROR_ALREADY_ENABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.whitelist.alreadyOn", new Object[0]));
-        ERROR_ALREADY_DISABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.whitelist.alreadyOff", new Object[0]));
-        ERROR_ALREADY_WHITELISTED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.whitelist.add.failed", new Object[0]));
-        ERROR_NOT_WHITELISTED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.whitelist.remove.failed", new Object[0]));
+        ERROR_ALREADY_ENABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.whitelist.alreadyOn"));
+        ERROR_ALREADY_DISABLED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.whitelist.alreadyOff"));
+        ERROR_ALREADY_WHITELISTED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.whitelist.add.failed"));
+        ERROR_NOT_WHITELISTED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.whitelist.remove.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/WorldBorderCommand.java b/src/net/minecraft/server/commands/WorldBorderCommand.java
index a6a9a67..83dd2a9 100644
--- a/src/net/minecraft/server/commands/WorldBorderCommand.java
+++ b/src/net/minecraft/server/commands/WorldBorderCommand.java
@@ -31,68 +31,68 @@ public class WorldBorderCommand {
     private static final SimpleCommandExceptionType ERROR_SAME_DAMAGE_AMOUNT;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("worldborder").requires(cq -> cq.hasPermission(2))).then(Commands.literal("add").then(((RequiredArgumentBuilder)Commands.argument("distance", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(-6.0E7f, 6.0E7f)).executes(commandContext -> setSize((CommandSourceStack)commandContext.getSource(), ((CommandSourceStack)commandContext.getSource()).getLevel().getWorldBorder().getSize() + FloatArgumentType.getFloat(commandContext, "distance"), 0L))).then(Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setSize((CommandSourceStack)commandContext.getSource(), ((CommandSourceStack)commandContext.getSource()).getLevel().getWorldBorder().getSize() + FloatArgumentType.getFloat(commandContext, "distance"), ((CommandSourceStack)commandContext.getSource()).getLevel().getWorldBorder().getLerpRemainingTime() + IntegerArgumentType.getInteger(commandContext, "time") * 1000L)))))).then(Commands.literal("set").then(((RequiredArgumentBuilder)Commands.argument("distance", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(-6.0E7f, 6.0E7f)).executes(commandContext -> setSize((CommandSourceStack)commandContext.getSource(), FloatArgumentType.getFloat(commandContext, "distance"), 0L))).then(Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setSize((CommandSourceStack)commandContext.getSource(), FloatArgumentType.getFloat(commandContext, "distance"), IntegerArgumentType.getInteger(commandContext, "time") * 1000L)))))).then(Commands.literal("center").then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec2Argument.vec2()).executes(commandContext -> setCenter((CommandSourceStack)commandContext.getSource(), Vec2Argument.getVec2((CommandContext<CommandSourceStack>)commandContext, "pos")))))).then(((LiteralArgumentBuilder)Commands.literal("damage").then(Commands.literal("amount").then(Commands.argument("damagePerBlock", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f)).executes(commandContext -> setDamageAmount((CommandSourceStack)commandContext.getSource(), FloatArgumentType.getFloat(commandContext, "damagePerBlock")))))).then(Commands.literal("buffer").then(Commands.argument("distance", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f)).executes(commandContext -> setDamageBuffer((CommandSourceStack)commandContext.getSource(), FloatArgumentType.getFloat(commandContext, "distance"))))))).then(Commands.literal("get").executes(commandContext -> getSize((CommandSourceStack)commandContext.getSource())))).then(((LiteralArgumentBuilder)Commands.literal("warning").then(Commands.literal("distance").then(Commands.argument("distance", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setWarningDistance((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "distance")))))).then(Commands.literal("time").then(Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setWarningTime((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "time")))))));
+        commandDispatcher.register((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)Commands.literal("worldborder").requires(cz -> cz.hasPermission(2))).then(Commands.literal("add").then(((RequiredArgumentBuilder)Commands.argument("distance", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(-6.0E7f, 6.0E7f)).executes(commandContext -> setSize((CommandSourceStack)commandContext.getSource(), ((CommandSourceStack)commandContext.getSource()).getLevel().getWorldBorder().getSize() + FloatArgumentType.getFloat(commandContext, "distance"), 0L))).then(Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setSize((CommandSourceStack)commandContext.getSource(), ((CommandSourceStack)commandContext.getSource()).getLevel().getWorldBorder().getSize() + FloatArgumentType.getFloat(commandContext, "distance"), ((CommandSourceStack)commandContext.getSource()).getLevel().getWorldBorder().getLerpRemainingTime() + IntegerArgumentType.getInteger(commandContext, "time") * 1000L)))))).then(Commands.literal("set").then(((RequiredArgumentBuilder)Commands.argument("distance", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(-6.0E7f, 6.0E7f)).executes(commandContext -> setSize((CommandSourceStack)commandContext.getSource(), FloatArgumentType.getFloat(commandContext, "distance"), 0L))).then(Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setSize((CommandSourceStack)commandContext.getSource(), FloatArgumentType.getFloat(commandContext, "distance"), IntegerArgumentType.getInteger(commandContext, "time") * 1000L)))))).then(Commands.literal("center").then(Commands.argument("pos", (com.mojang.brigadier.arguments.ArgumentType<Object>)Vec2Argument.vec2()).executes(commandContext -> setCenter((CommandSourceStack)commandContext.getSource(), Vec2Argument.getVec2((CommandContext<CommandSourceStack>)commandContext, "pos")))))).then(((LiteralArgumentBuilder)Commands.literal("damage").then(Commands.literal("amount").then(Commands.argument("damagePerBlock", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f)).executes(commandContext -> setDamageAmount((CommandSourceStack)commandContext.getSource(), FloatArgumentType.getFloat(commandContext, "damagePerBlock")))))).then(Commands.literal("buffer").then(Commands.argument("distance", (com.mojang.brigadier.arguments.ArgumentType<Object>)FloatArgumentType.floatArg(0.0f)).executes(commandContext -> setDamageBuffer((CommandSourceStack)commandContext.getSource(), FloatArgumentType.getFloat(commandContext, "distance"))))))).then(Commands.literal("get").executes(commandContext -> getSize((CommandSourceStack)commandContext.getSource())))).then(((LiteralArgumentBuilder)Commands.literal("warning").then(Commands.literal("distance").then(Commands.argument("distance", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setWarningDistance((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "distance")))))).then(Commands.literal("time").then(Commands.argument("time", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer(0)).executes(commandContext -> setWarningTime((CommandSourceStack)commandContext.getSource(), IntegerArgumentType.getInteger(commandContext, "time")))))));
     }
     
-    private static int setDamageBuffer(final CommandSourceStack cq, final float float2) throws CommandSyntaxException {
-        final WorldBorder bzw3 = cq.getLevel().getWorldBorder();
-        if (bzw3.getDamageSafeZone() == float2) {
+    private static int setDamageBuffer(final CommandSourceStack cz, final float float2) throws CommandSyntaxException {
+        final WorldBorder cgw3 = cz.getLevel().getWorldBorder();
+        if (cgw3.getDamageSafeZone() == float2) {
             throw WorldBorderCommand.ERROR_SAME_DAMAGE_BUFFER.create();
         }
-        bzw3.setDamageSafeZone(float2);
-        cq.sendSuccess(new TranslatableComponent("commands.worldborder.damage.buffer.success", new Object[] { String.format(Locale.ROOT, "%.2f", float2) }), true);
+        cgw3.setDamageSafeZone(float2);
+        cz.sendSuccess(new TranslatableComponent("commands.worldborder.damage.buffer.success", new Object[] { String.format(Locale.ROOT, "%.2f", float2) }), true);
         return (int)float2;
     }
     
-    private static int setDamageAmount(final CommandSourceStack cq, final float float2) throws CommandSyntaxException {
-        final WorldBorder bzw3 = cq.getLevel().getWorldBorder();
-        if (bzw3.getDamagePerBlock() == float2) {
+    private static int setDamageAmount(final CommandSourceStack cz, final float float2) throws CommandSyntaxException {
+        final WorldBorder cgw3 = cz.getLevel().getWorldBorder();
+        if (cgw3.getDamagePerBlock() == float2) {
             throw WorldBorderCommand.ERROR_SAME_DAMAGE_AMOUNT.create();
         }
-        bzw3.setDamagePerBlock(float2);
-        cq.sendSuccess(new TranslatableComponent("commands.worldborder.damage.amount.success", new Object[] { String.format(Locale.ROOT, "%.2f", float2) }), true);
+        cgw3.setDamagePerBlock(float2);
+        cz.sendSuccess(new TranslatableComponent("commands.worldborder.damage.amount.success", new Object[] { String.format(Locale.ROOT, "%.2f", float2) }), true);
         return (int)float2;
     }
     
-    private static int setWarningTime(final CommandSourceStack cq, final int integer) throws CommandSyntaxException {
-        final WorldBorder bzw3 = cq.getLevel().getWorldBorder();
-        if (bzw3.getWarningTime() == integer) {
+    private static int setWarningTime(final CommandSourceStack cz, final int integer) throws CommandSyntaxException {
+        final WorldBorder cgw3 = cz.getLevel().getWorldBorder();
+        if (cgw3.getWarningTime() == integer) {
             throw WorldBorderCommand.ERROR_SAME_WARNING_TIME.create();
         }
-        bzw3.setWarningTime(integer);
-        cq.sendSuccess(new TranslatableComponent("commands.worldborder.warning.time.success", new Object[] { integer }), true);
+        cgw3.setWarningTime(integer);
+        cz.sendSuccess(new TranslatableComponent("commands.worldborder.warning.time.success", new Object[] { integer }), true);
         return integer;
     }
     
-    private static int setWarningDistance(final CommandSourceStack cq, final int integer) throws CommandSyntaxException {
-        final WorldBorder bzw3 = cq.getLevel().getWorldBorder();
-        if (bzw3.getWarningBlocks() == integer) {
+    private static int setWarningDistance(final CommandSourceStack cz, final int integer) throws CommandSyntaxException {
+        final WorldBorder cgw3 = cz.getLevel().getWorldBorder();
+        if (cgw3.getWarningBlocks() == integer) {
             throw WorldBorderCommand.ERROR_SAME_WARNING_DISTANCE.create();
         }
-        bzw3.setWarningBlocks(integer);
-        cq.sendSuccess(new TranslatableComponent("commands.worldborder.warning.distance.success", new Object[] { integer }), true);
+        cgw3.setWarningBlocks(integer);
+        cz.sendSuccess(new TranslatableComponent("commands.worldborder.warning.distance.success", new Object[] { integer }), true);
         return integer;
     }
     
-    private static int getSize(final CommandSourceStack cq) {
-        final double double2 = cq.getLevel().getWorldBorder().getSize();
-        cq.sendSuccess(new TranslatableComponent("commands.worldborder.get", new Object[] { String.format(Locale.ROOT, "%.0f", double2) }), false);
+    private static int getSize(final CommandSourceStack cz) {
+        final double double2 = cz.getLevel().getWorldBorder().getSize();
+        cz.sendSuccess(new TranslatableComponent("commands.worldborder.get", new Object[] { String.format(Locale.ROOT, "%.0f", double2) }), false);
         return Mth.floor(double2 + 0.5);
     }
     
-    private static int setCenter(final CommandSourceStack cq, final Vec2 cvk) throws CommandSyntaxException {
-        final WorldBorder bzw3 = cq.getLevel().getWorldBorder();
-        if (bzw3.getCenterX() == cvk.x && bzw3.getCenterZ() == cvk.y) {
+    private static int setCenter(final CommandSourceStack cz, final Vec2 del) throws CommandSyntaxException {
+        final WorldBorder cgw3 = cz.getLevel().getWorldBorder();
+        if (cgw3.getCenterX() == del.x && cgw3.getCenterZ() == del.y) {
             throw WorldBorderCommand.ERROR_SAME_CENTER.create();
         }
-        bzw3.setCenter(cvk.x, cvk.y);
-        cq.sendSuccess(new TranslatableComponent("commands.worldborder.center.success", new Object[] { String.format(Locale.ROOT, "%.2f", cvk.x), String.format("%.2f", cvk.y) }), true);
+        cgw3.setCenter(del.x, del.y);
+        cz.sendSuccess(new TranslatableComponent("commands.worldborder.center.success", new Object[] { String.format(Locale.ROOT, "%.2f", del.x), String.format("%.2f", del.y) }), true);
         return 0;
     }
     
-    private static int setSize(final CommandSourceStack cq, final double double2, final long long3) throws CommandSyntaxException {
-        final WorldBorder bzw6 = cq.getLevel().getWorldBorder();
-        final double double3 = bzw6.getSize();
+    private static int setSize(final CommandSourceStack cz, final double double2, final long long3) throws CommandSyntaxException {
+        final WorldBorder cgw6 = cz.getLevel().getWorldBorder();
+        final double double3 = cgw6.getSize();
         if (double3 == double2) {
             throw WorldBorderCommand.ERROR_SAME_SIZE.create();
         }
@@ -103,29 +103,29 @@ public class WorldBorderCommand {
             throw WorldBorderCommand.ERROR_TOO_BIG.create();
         }
         if (long3 > 0L) {
-            bzw6.lerpSizeBetween(double3, double2, long3);
+            cgw6.lerpSizeBetween(double3, double2, long3);
             if (double2 > double3) {
-                cq.sendSuccess(new TranslatableComponent("commands.worldborder.set.grow", new Object[] { String.format(Locale.ROOT, "%.1f", double2), Long.toString(long3 / 1000L) }), true);
+                cz.sendSuccess(new TranslatableComponent("commands.worldborder.set.grow", new Object[] { String.format(Locale.ROOT, "%.1f", double2), Long.toString(long3 / 1000L) }), true);
             }
             else {
-                cq.sendSuccess(new TranslatableComponent("commands.worldborder.set.shrink", new Object[] { String.format(Locale.ROOT, "%.1f", double2), Long.toString(long3 / 1000L) }), true);
+                cz.sendSuccess(new TranslatableComponent("commands.worldborder.set.shrink", new Object[] { String.format(Locale.ROOT, "%.1f", double2), Long.toString(long3 / 1000L) }), true);
             }
         }
         else {
-            bzw6.setSize(double2);
-            cq.sendSuccess(new TranslatableComponent("commands.worldborder.set.immediate", new Object[] { String.format(Locale.ROOT, "%.1f", double2) }), true);
+            cgw6.setSize(double2);
+            cz.sendSuccess(new TranslatableComponent("commands.worldborder.set.immediate", new Object[] { String.format(Locale.ROOT, "%.1f", double2) }), true);
         }
         return (int)(double2 - double3);
     }
     
     static {
-        ERROR_SAME_CENTER = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.center.failed", new Object[0]));
-        ERROR_SAME_SIZE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.set.failed.nochange", new Object[0]));
-        ERROR_TOO_SMALL = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.set.failed.small.", new Object[0]));
-        ERROR_TOO_BIG = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.set.failed.big.", new Object[0]));
-        ERROR_SAME_WARNING_TIME = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.warning.time.failed", new Object[0]));
-        ERROR_SAME_WARNING_DISTANCE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.warning.distance.failed", new Object[0]));
-        ERROR_SAME_DAMAGE_BUFFER = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.damage.buffer.failed", new Object[0]));
-        ERROR_SAME_DAMAGE_AMOUNT = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.damage.amount.failed", new Object[0]));
+        ERROR_SAME_CENTER = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.center.failed"));
+        ERROR_SAME_SIZE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.set.failed.nochange"));
+        ERROR_TOO_SMALL = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.set.failed.small."));
+        ERROR_TOO_BIG = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.set.failed.big."));
+        ERROR_SAME_WARNING_TIME = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.warning.time.failed"));
+        ERROR_SAME_WARNING_DISTANCE = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.warning.distance.failed"));
+        ERROR_SAME_DAMAGE_BUFFER = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.damage.buffer.failed"));
+        ERROR_SAME_DAMAGE_AMOUNT = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.worldborder.damage.amount.failed"));
     }
 }
diff --git a/src/net/minecraft/server/commands/data/BlockDataAccessor.java b/src/net/minecraft/server/commands/data/BlockDataAccessor.java
index c6beab8..d2809d7 100644
--- a/src/net/minecraft/server/commands/data/BlockDataAccessor.java
+++ b/src/net/minecraft/server/commands/data/BlockDataAccessor.java
@@ -26,20 +26,20 @@ public class BlockDataAccessor implements DataAccessor {
     private final BlockEntity entity;
     private final BlockPos pos;
     
-    public BlockDataAccessor(final BlockEntity bwl, final BlockPos fk) {
-        this.entity = bwl;
-        this.pos = fk;
+    public BlockDataAccessor(final BlockEntity cdl, final BlockPos fu) {
+        this.entity = cdl;
+        this.pos = fu;
     }
     
     @Override
-    public void setData(final CompoundTag jt) {
-        jt.putInt("x", this.pos.getX());
-        jt.putInt("y", this.pos.getY());
-        jt.putInt("z", this.pos.getZ());
-        this.entity.load(jt);
+    public void setData(final CompoundTag le) {
+        le.putInt("x", this.pos.getX());
+        le.putInt("y", this.pos.getY());
+        le.putInt("z", this.pos.getZ());
+        final BlockState cfj3 = this.entity.getLevel().getBlockState(this.pos);
+        this.entity.load(cfj3, le);
         this.entity.setChanged();
-        final BlockState byj3 = this.entity.getLevel().getBlockState(this.pos);
-        this.entity.getLevel().sendBlockUpdated(this.pos, byj3, byj3, 3);
+        this.entity.getLevel().sendBlockUpdated(this.pos, cfj3, cfj3, 3);
     }
     
     @Override
@@ -53,8 +53,8 @@ public class BlockDataAccessor implements DataAccessor {
     }
     
     @Override
-    public Component getPrintSuccess(final Tag kj) {
-        return new TranslatableComponent("commands.data.block.query", new Object[] { this.pos.getX(), this.pos.getY(), this.pos.getZ(), kj.getPrettyDisplay() });
+    public Component getPrintSuccess(final Tag lu) {
+        return new TranslatableComponent("commands.data.block.query", new Object[] { this.pos.getX(), this.pos.getY(), this.pos.getZ(), lu.getPrettyDisplay() });
     }
     
     @Override
@@ -63,18 +63,18 @@ public class BlockDataAccessor implements DataAccessor {
     }
     
     static {
-        ERROR_NOT_A_BLOCK_ENTITY = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.data.block.invalid", new Object[0]));
+        ERROR_NOT_A_BLOCK_ENTITY = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.data.block.invalid"));
         PROVIDER = (string -> new DataCommands.DataProvider() {
             final /* synthetic */ String val$argPrefix;
             
             @Override
             public DataAccessor access(final CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
-                final BlockPos fk3 = BlockPosArgument.getLoadedBlockPos(commandContext, string + "Pos");
-                final BlockEntity bwl4 = ((CommandSourceStack)commandContext.getSource()).getLevel().getBlockEntity(fk3);
-                if (bwl4 == null) {
+                final BlockPos fu3 = BlockPosArgument.getLoadedBlockPos(commandContext, string + "Pos");
+                final BlockEntity cdl4 = ((CommandSourceStack)commandContext.getSource()).getLevel().getBlockEntity(fu3);
+                if (cdl4 == null) {
                     throw BlockDataAccessor.ERROR_NOT_A_BLOCK_ENTITY.create();
                 }
-                return new BlockDataAccessor(bwl4, fk3);
+                return new BlockDataAccessor(cdl4, fu3);
             }
             
             @Override
diff --git a/src/net/minecraft/server/commands/data/DataAccessor.java b/src/net/minecraft/server/commands/data/DataAccessor.java
index baa6f71..473b2b0 100644
--- a/src/net/minecraft/server/commands/data/DataAccessor.java
+++ b/src/net/minecraft/server/commands/data/DataAccessor.java
@@ -7,13 +7,13 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.nbt.CompoundTag;
 
 public interface DataAccessor {
-    void setData(final CompoundTag jt) throws CommandSyntaxException;
+    void setData(final CompoundTag le) throws CommandSyntaxException;
     
     CompoundTag getData() throws CommandSyntaxException;
     
     Component getModifiedSuccess();
     
-    Component getPrintSuccess(final Tag kj);
+    Component getPrintSuccess(final Tag lu);
     
     Component getPrintSuccess(final NbtPathArgument.NbtPath h, final double double2, final int integer);
 }
diff --git a/src/net/minecraft/server/commands/data/DataCommands.java b/src/net/minecraft/server/commands/data/DataCommands.java
index 5dd65c3..1b5d47d 100644
--- a/src/net/minecraft/server/commands/data/DataCommands.java
+++ b/src/net/minecraft/server/commands/data/DataCommands.java
@@ -49,44 +49,44 @@ public class DataCommands {
     public static final List<DataProvider> SOURCE_PROVIDERS;
     
     public static void register(final CommandDispatcher<CommandSourceStack> commandDispatcher) {
-        final LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder2 = (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal("data").requires(cq -> cq.hasPermission(2));
+        final LiteralArgumentBuilder<CommandSourceStack> literalArgumentBuilder2 = (LiteralArgumentBuilder<CommandSourceStack>)Commands.literal("data").requires(cz -> cz.hasPermission(2));
         for (final DataProvider c4 : DataCommands.TARGET_PROVIDERS) {
             final Object o;
             final int integer5;
             final Collection<Tag> collection5;
             int integer6;
             final Iterator<Tag> iterator2;
-            Tag kj8;
-            CompoundTag jt2;
-            CompoundTag jt3;
+            Tag lu8;
+            CompoundTag le2;
+            CompoundTag le3;
             final Iterator<Tag> iterator3;
-            Tag kj9;
-            ((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)literalArgumentBuilder2.then((ArgumentBuilder)c4.wrap(Commands.literal("merge"), argumentBuilder -> argumentBuilder.then(Commands.argument("nbt", (com.mojang.brigadier.arguments.ArgumentType<Object>)CompoundTagArgument.compoundTag()).executes(commandContext -> mergeData((CommandSourceStack)commandContext.getSource(), c4.access((CommandContext<CommandSourceStack>)commandContext), CompoundTagArgument.getCompoundTag((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "nbt"))))))).then((ArgumentBuilder)c4.wrap(Commands.literal("get"), argumentBuilder -> argumentBuilder.executes(commandContext -> getData((CommandSourceStack)commandContext.getSource(), ((DataProvider)o).access((CommandContext<CommandSourceStack>)commandContext))).then(((RequiredArgumentBuilder)Commands.argument("path", (com.mojang.brigadier.arguments.ArgumentType<Object>)NbtPathArgument.nbtPath()).executes(commandContext -> getData((CommandSourceStack)commandContext.getSource(), ((DataProvider)o).access((CommandContext<CommandSourceStack>)commandContext), NbtPathArgument.getPath((CommandContext<CommandSourceStack>)commandContext, "path")))).then(Commands.argument("scale", (com.mojang.brigadier.arguments.ArgumentType<Object>)DoubleArgumentType.doubleArg()).executes(commandContext -> getNumeric((CommandSourceStack)commandContext.getSource(), ((DataProvider)o).access((CommandContext<CommandSourceStack>)commandContext), NbtPathArgument.getPath((CommandContext<CommandSourceStack>)commandContext, "path"), DoubleArgumentType.getDouble(commandContext, "scale")))))))).then((ArgumentBuilder)c4.wrap(Commands.literal("remove"), argumentBuilder -> argumentBuilder.then(Commands.argument("path", (com.mojang.brigadier.arguments.ArgumentType<Object>)NbtPathArgument.nbtPath()).executes(commandContext -> removeData((CommandSourceStack)commandContext.getSource(), c4.access((CommandContext<CommandSourceStack>)commandContext), NbtPathArgument.getPath((CommandContext<CommandSourceStack>)commandContext, "path"))))))).then((ArgumentBuilder)decorateModification((argumentBuilder, b) -> argumentBuilder.then(Commands.literal("insert").then(Commands.argument("index", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).then((ArgumentBuilder)b.create((commandContext, jt, h, list) -> {
+            Tag lu9;
+            ((LiteralArgumentBuilder)((LiteralArgumentBuilder)((LiteralArgumentBuilder)literalArgumentBuilder2.then((ArgumentBuilder)c4.wrap(Commands.literal("merge"), argumentBuilder -> argumentBuilder.then(Commands.argument("nbt", (com.mojang.brigadier.arguments.ArgumentType<Object>)CompoundTagArgument.compoundTag()).executes(commandContext -> mergeData((CommandSourceStack)commandContext.getSource(), c4.access((CommandContext<CommandSourceStack>)commandContext), CompoundTagArgument.getCompoundTag((com.mojang.brigadier.context.CommandContext<Object>)commandContext, "nbt"))))))).then((ArgumentBuilder)c4.wrap(Commands.literal("get"), argumentBuilder -> argumentBuilder.executes(commandContext -> getData((CommandSourceStack)commandContext.getSource(), ((DataProvider)o).access((CommandContext<CommandSourceStack>)commandContext))).then(((RequiredArgumentBuilder)Commands.argument("path", (com.mojang.brigadier.arguments.ArgumentType<Object>)NbtPathArgument.nbtPath()).executes(commandContext -> getData((CommandSourceStack)commandContext.getSource(), ((DataProvider)o).access((CommandContext<CommandSourceStack>)commandContext), NbtPathArgument.getPath((CommandContext<CommandSourceStack>)commandContext, "path")))).then(Commands.argument("scale", (com.mojang.brigadier.arguments.ArgumentType<Object>)DoubleArgumentType.doubleArg()).executes(commandContext -> getNumeric((CommandSourceStack)commandContext.getSource(), ((DataProvider)o).access((CommandContext<CommandSourceStack>)commandContext), NbtPathArgument.getPath((CommandContext<CommandSourceStack>)commandContext, "path"), DoubleArgumentType.getDouble(commandContext, "scale")))))))).then((ArgumentBuilder)c4.wrap(Commands.literal("remove"), argumentBuilder -> argumentBuilder.then(Commands.argument("path", (com.mojang.brigadier.arguments.ArgumentType<Object>)NbtPathArgument.nbtPath()).executes(commandContext -> removeData((CommandSourceStack)commandContext.getSource(), c4.access((CommandContext<CommandSourceStack>)commandContext), NbtPathArgument.getPath((CommandContext<CommandSourceStack>)commandContext, "path"))))))).then((ArgumentBuilder)decorateModification((argumentBuilder, b) -> argumentBuilder.then(Commands.literal("insert").then(Commands.argument("index", (com.mojang.brigadier.arguments.ArgumentType<Object>)IntegerArgumentType.integer()).then((ArgumentBuilder)b.create((commandContext, le, h, list) -> {
                 integer5 = IntegerArgumentType.getInteger(commandContext, "index");
-                return insertAtIndex(integer5, jt, h, list);
-            })))).then(Commands.literal("prepend").then((ArgumentBuilder)b.create((commandContext, jt, h, list) -> insertAtIndex(0, jt, h, list)))).then(Commands.literal("append").then((ArgumentBuilder)b.create((commandContext, jt, h, list) -> insertAtIndex(-1, jt, h, list)))).then(Commands.literal("set").then((ArgumentBuilder)b.create((commandContext, jt, h, list) -> h.set(jt, (Tag)Iterables.<Tag>getLast(list)::copy)))).then(Commands.literal("merge").then((ArgumentBuilder)b.create((commandContext, jt, h, list) -> {
-                collection5 = h.getOrCreate(jt, (Supplier<Tag>)CompoundTag::new);
+                return insertAtIndex(integer5, le, h, list);
+            })))).then(Commands.literal("prepend").then((ArgumentBuilder)b.create((commandContext, le, h, list) -> insertAtIndex(0, le, h, list)))).then(Commands.literal("append").then((ArgumentBuilder)b.create((commandContext, le, h, list) -> insertAtIndex(-1, le, h, list)))).then(Commands.literal("set").then((ArgumentBuilder)b.create((commandContext, le, h, list) -> h.set(le, (Tag)Iterables.<Tag>getLast(list)::copy)))).then(Commands.literal("merge").then((ArgumentBuilder)b.create((commandContext, le, h, list) -> {
+                collection5 = h.getOrCreate(le, (Supplier<Tag>)CompoundTag::new);
                 integer6 = 0;
                 collection5.iterator();
                 while (iterator2.hasNext()) {
-                    kj8 = iterator2.next();
-                    if (!(kj8 instanceof CompoundTag)) {
-                        throw DataCommands.ERROR_EXPECTED_OBJECT.create(kj8);
+                    lu8 = iterator2.next();
+                    if (!(lu8 instanceof CompoundTag)) {
+                        throw DataCommands.ERROR_EXPECTED_OBJECT.create(lu8);
                     }
                     else {
-                        jt2 = (CompoundTag)kj8;
-                        jt3 = jt2.copy();
+                        le2 = (CompoundTag)lu8;
+                        le3 = le2.copy();
                         list.iterator();
                         while (iterator3.hasNext()) {
-                            kj9 = iterator3.next();
-                            if (!(kj9 instanceof CompoundTag)) {
-                                throw DataCommands.ERROR_EXPECTED_OBJECT.create(kj9);
+                            lu9 = iterator3.next();
+                            if (!(lu9 instanceof CompoundTag)) {
+                                throw DataCommands.ERROR_EXPECTED_OBJECT.create(lu9);
                             }
                             else {
-                                jt2.merge((CompoundTag)kj9);
+                                le2.merge((CompoundTag)lu9);
                             }
                         }
-                        integer6 += (jt3.equals(jt2) ? 0 : 1);
+                        integer6 += (le3.equals(le2) ? 0 : 1);
                     }
                 }
                 return integer6;
@@ -95,19 +95,19 @@ public class DataCommands {
         commandDispatcher.register((LiteralArgumentBuilder)literalArgumentBuilder2);
     }
     
-    private static int insertAtIndex(final int integer, final CompoundTag jt, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException {
-        final Collection<Tag> collection5 = h.getOrCreate(jt, (Supplier<Tag>)ListTag::new);
+    private static int insertAtIndex(final int integer, final CompoundTag le, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException {
+        final Collection<Tag> collection5 = h.getOrCreate(le, (Supplier<Tag>)ListTag::new);
         int integer2 = 0;
-        for (final Tag kj8 : collection5) {
-            if (!(kj8 instanceof CollectionTag)) {
-                throw DataCommands.ERROR_EXPECTED_LIST.create(kj8);
+        for (final Tag lu8 : collection5) {
+            if (!(lu8 instanceof CollectionTag)) {
+                throw DataCommands.ERROR_EXPECTED_LIST.create(lu8);
             }
             boolean boolean9 = false;
-            final CollectionTag<?> js10 = kj8;
-            int integer3 = (integer < 0) ? (js10.size() + integer + 1) : integer;
-            for (final Tag kj9 : list) {
+            final CollectionTag<?> ld10 = lu8;
+            int integer3 = (integer < 0) ? (ld10.size() + integer + 1) : integer;
+            for (final Tag lu9 : list) {
                 try {
-                    if (!js10.addTag(integer3, kj9.copy())) {
+                    if (!ld10.addTag(integer3, lu9.copy())) {
                         continue;
                     }
                     ++integer3;
@@ -141,9 +141,9 @@ public class DataCommands {
                         final List<Tag> list5 = Collections.singletonList(((DataProvider)o).access((CommandContext<CommandSourceStack>)commandContext).getData());
                         return manipulateData((CommandContext<CommandSourceStack>)commandContext, o2, a, list5);
                     }).then(Commands.argument("sourcePath", (com.mojang.brigadier.arguments.ArgumentType<Object>)NbtPathArgument.nbtPath()).executes(commandContext -> {
-                        final DataAccessor vw5 = ((DataProvider)o).access((CommandContext<CommandSourceStack>)commandContext);
+                        final DataAccessor xw5 = ((DataProvider)o).access((CommandContext<CommandSourceStack>)commandContext);
                         final NbtPathArgument.NbtPath h6 = NbtPathArgument.getPath((CommandContext<CommandSourceStack>)commandContext, "sourcePath");
-                        final List<Tag> list7 = h6.get(vw5.getData());
+                        final List<Tag> list7 = h6.get(xw5.getData());
                         return manipulateData((CommandContext<CommandSourceStack>)commandContext, o2, a, list7);
                     }))));
                 }
@@ -158,89 +158,89 @@ public class DataCommands {
     }
     
     private static int manipulateData(final CommandContext<CommandSourceStack> commandContext, final DataProvider c, final DataManipulator a, final List<Tag> list) throws CommandSyntaxException {
-        final DataAccessor vw5 = c.access(commandContext);
+        final DataAccessor xw5 = c.access(commandContext);
         final NbtPathArgument.NbtPath h6 = NbtPathArgument.getPath(commandContext, "targetPath");
-        final CompoundTag jt7 = vw5.getData();
-        final int integer8 = a.modify(commandContext, jt7, h6, list);
+        final CompoundTag le7 = xw5.getData();
+        final int integer8 = a.modify(commandContext, le7, h6, list);
         if (integer8 == 0) {
             throw DataCommands.ERROR_MERGE_UNCHANGED.create();
         }
-        vw5.setData(jt7);
-        ((CommandSourceStack)commandContext.getSource()).sendSuccess(vw5.getModifiedSuccess(), true);
+        xw5.setData(le7);
+        ((CommandSourceStack)commandContext.getSource()).sendSuccess(xw5.getModifiedSuccess(), true);
         return integer8;
     }
     
-    private static int removeData(final CommandSourceStack cq, final DataAccessor vw, final NbtPathArgument.NbtPath h) throws CommandSyntaxException {
-        final CompoundTag jt4 = vw.getData();
-        final int integer5 = h.remove(jt4);
+    private static int removeData(final CommandSourceStack cz, final DataAccessor xw, final NbtPathArgument.NbtPath h) throws CommandSyntaxException {
+        final CompoundTag le4 = xw.getData();
+        final int integer5 = h.remove(le4);
         if (integer5 == 0) {
             throw DataCommands.ERROR_MERGE_UNCHANGED.create();
         }
-        vw.setData(jt4);
-        cq.sendSuccess(vw.getModifiedSuccess(), true);
+        xw.setData(le4);
+        cz.sendSuccess(xw.getModifiedSuccess(), true);
         return integer5;
     }
     
-    private static Tag getSingleTag(final NbtPathArgument.NbtPath h, final DataAccessor vw) throws CommandSyntaxException {
-        final Collection<Tag> collection3 = h.get(vw.getData());
+    private static Tag getSingleTag(final NbtPathArgument.NbtPath h, final DataAccessor xw) throws CommandSyntaxException {
+        final Collection<Tag> collection3 = h.get(xw.getData());
         final Iterator<Tag> iterator4 = collection3.iterator();
-        final Tag kj5 = iterator4.next();
+        final Tag lu5 = iterator4.next();
         if (iterator4.hasNext()) {
             throw DataCommands.ERROR_MULTIPLE_TAGS.create();
         }
-        return kj5;
+        return lu5;
     }
     
-    private static int getData(final CommandSourceStack cq, final DataAccessor vw, final NbtPathArgument.NbtPath h) throws CommandSyntaxException {
-        final Tag kj4 = getSingleTag(h, vw);
+    private static int getData(final CommandSourceStack cz, final DataAccessor xw, final NbtPathArgument.NbtPath h) throws CommandSyntaxException {
+        final Tag lu4 = getSingleTag(h, xw);
         int integer5;
-        if (kj4 instanceof NumericTag) {
-            integer5 = Mth.floor(((NumericTag)kj4).getAsDouble());
+        if (lu4 instanceof NumericTag) {
+            integer5 = Mth.floor(((NumericTag)lu4).getAsDouble());
         }
-        else if (kj4 instanceof CollectionTag) {
-            integer5 = ((CollectionTag)kj4).size();
+        else if (lu4 instanceof CollectionTag) {
+            integer5 = ((CollectionTag)lu4).size();
         }
-        else if (kj4 instanceof CompoundTag) {
-            integer5 = ((CompoundTag)kj4).size();
+        else if (lu4 instanceof CompoundTag) {
+            integer5 = ((CompoundTag)lu4).size();
         }
         else {
-            if (!(kj4 instanceof StringTag)) {
+            if (!(lu4 instanceof StringTag)) {
                 throw DataCommands.ERROR_GET_NON_EXISTENT.create(h.toString());
             }
-            integer5 = kj4.getAsString().length();
+            integer5 = lu4.getAsString().length();
         }
-        cq.sendSuccess(vw.getPrintSuccess(kj4), false);
+        cz.sendSuccess(xw.getPrintSuccess(lu4), false);
         return integer5;
     }
     
-    private static int getNumeric(final CommandSourceStack cq, final DataAccessor vw, final NbtPathArgument.NbtPath h, final double double4) throws CommandSyntaxException {
-        final Tag kj6 = getSingleTag(h, vw);
-        if (!(kj6 instanceof NumericTag)) {
+    private static int getNumeric(final CommandSourceStack cz, final DataAccessor xw, final NbtPathArgument.NbtPath h, final double double4) throws CommandSyntaxException {
+        final Tag lu6 = getSingleTag(h, xw);
+        if (!(lu6 instanceof NumericTag)) {
             throw DataCommands.ERROR_GET_NOT_NUMBER.create(h.toString());
         }
-        final int integer7 = Mth.floor(((NumericTag)kj6).getAsDouble() * double4);
-        cq.sendSuccess(vw.getPrintSuccess(h, double4, integer7), false);
+        final int integer7 = Mth.floor(((NumericTag)lu6).getAsDouble() * double4);
+        cz.sendSuccess(xw.getPrintSuccess(h, double4, integer7), false);
         return integer7;
     }
     
-    private static int getData(final CommandSourceStack cq, final DataAccessor vw) throws CommandSyntaxException {
-        cq.sendSuccess(vw.getPrintSuccess(vw.getData()), false);
+    private static int getData(final CommandSourceStack cz, final DataAccessor xw) throws CommandSyntaxException {
+        cz.sendSuccess(xw.getPrintSuccess(xw.getData()), false);
         return 1;
     }
     
-    private static int mergeData(final CommandSourceStack cq, final DataAccessor vw, final CompoundTag jt) throws CommandSyntaxException {
-        final CompoundTag jt2 = vw.getData();
-        final CompoundTag jt3 = jt2.copy().merge(jt);
-        if (jt2.equals(jt3)) {
+    private static int mergeData(final CommandSourceStack cz, final DataAccessor xw, final CompoundTag le) throws CommandSyntaxException {
+        final CompoundTag le2 = xw.getData();
+        final CompoundTag le3 = le2.copy().merge(le);
+        if (le2.equals(le3)) {
             throw DataCommands.ERROR_MERGE_UNCHANGED.create();
         }
-        vw.setData(jt3);
-        cq.sendSuccess(vw.getModifiedSuccess(), true);
+        xw.setData(le3);
+        cz.sendSuccess(xw.getModifiedSuccess(), true);
         return 1;
     }
     
     static {
-        ERROR_MERGE_UNCHANGED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.data.merge.failed", new Object[0]));
+        ERROR_MERGE_UNCHANGED = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.data.merge.failed"));
         final TranslatableComponent translatableComponent;
         ERROR_GET_NOT_NUMBER = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("commands.data.get.invalid", new Object[] { object });
@@ -251,7 +251,7 @@ public class DataCommands {
             new TranslatableComponent("commands.data.get.unknown", new Object[] { object });
             return translatableComponent2;
         });
-        ERROR_MULTIPLE_TAGS = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.data.get.multiple", new Object[0]));
+        ERROR_MULTIPLE_TAGS = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.data.get.multiple"));
         final TranslatableComponent translatableComponent3;
         ERROR_EXPECTED_LIST = new DynamicCommandExceptionType(object -> {
             new TranslatableComponent("commands.data.modify.expected_list", new Object[] { object });
@@ -283,6 +283,6 @@ public class DataCommands {
     }
     
     interface DataManipulator {
-        int modify(final CommandContext<CommandSourceStack> commandContext, final CompoundTag jt, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException;
+        int modify(final CommandContext<CommandSourceStack> commandContext, final CompoundTag le, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException;
     }
 }
diff --git a/src/net/minecraft/server/commands/data/EntityDataAccessor.java b/src/net/minecraft/server/commands/data/EntityDataAccessor.java
index bdf1ee0..e4984ba 100644
--- a/src/net/minecraft/server/commands/data/EntityDataAccessor.java
+++ b/src/net/minecraft/server/commands/data/EntityDataAccessor.java
@@ -26,17 +26,17 @@ public class EntityDataAccessor implements DataAccessor {
     public static final Function<String, DataCommands.DataProvider> PROVIDER;
     private final Entity entity;
     
-    public EntityDataAccessor(final Entity akq) {
-        this.entity = akq;
+    public EntityDataAccessor(final Entity aom) {
+        this.entity = aom;
     }
     
     @Override
-    public void setData(final CompoundTag jt) throws CommandSyntaxException {
+    public void setData(final CompoundTag le) throws CommandSyntaxException {
         if (this.entity instanceof Player) {
             throw EntityDataAccessor.ERROR_NO_PLAYERS.create();
         }
         final UUID uUID3 = this.entity.getUUID();
-        this.entity.load(jt);
+        this.entity.load(le);
         this.entity.setUUID(uUID3);
     }
     
@@ -51,8 +51,8 @@ public class EntityDataAccessor implements DataAccessor {
     }
     
     @Override
-    public Component getPrintSuccess(final Tag kj) {
-        return new TranslatableComponent("commands.data.entity.query", new Object[] { this.entity.getDisplayName(), kj.getPrettyDisplay() });
+    public Component getPrintSuccess(final Tag lu) {
+        return new TranslatableComponent("commands.data.entity.query", new Object[] { this.entity.getDisplayName(), lu.getPrettyDisplay() });
     }
     
     @Override
@@ -61,7 +61,7 @@ public class EntityDataAccessor implements DataAccessor {
     }
     
     static {
-        ERROR_NO_PLAYERS = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.data.entity.invalid", new Object[0]));
+        ERROR_NO_PLAYERS = new SimpleCommandExceptionType((Message)new TranslatableComponent("commands.data.entity.invalid"));
         PROVIDER = (string -> new DataCommands.DataProvider() {
             final /* synthetic */ String val$arg;
             
diff --git a/src/net/minecraft/server/commands/data/StorageDataAccessor.java b/src/net/minecraft/server/commands/data/StorageDataAccessor.java
index b95c821..dce971e 100644
--- a/src/net/minecraft/server/commands/data/StorageDataAccessor.java
+++ b/src/net/minecraft/server/commands/data/StorageDataAccessor.java
@@ -31,14 +31,14 @@ public class StorageDataAccessor implements DataAccessor {
         return ((CommandSourceStack)commandContext.getSource()).getServer().getCommandStorage();
     }
     
-    private StorageDataAccessor(final CommandStorage crj, final ResourceLocation sm) {
-        this.storage = crj;
-        this.id = sm;
+    private StorageDataAccessor(final CommandStorage czy, final ResourceLocation uh) {
+        this.storage = czy;
+        this.id = uh;
     }
     
     @Override
-    public void setData(final CompoundTag jt) {
-        this.storage.set(this.id, jt);
+    public void setData(final CompoundTag le) {
+        this.storage.set(this.id, le);
     }
     
     @Override
@@ -52,8 +52,8 @@ public class StorageDataAccessor implements DataAccessor {
     }
     
     @Override
-    public Component getPrintSuccess(final Tag kj) {
-        return new TranslatableComponent("commands.data.storage.query", new Object[] { this.id, kj.getPrettyDisplay() });
+    public Component getPrintSuccess(final Tag lu) {
+        return new TranslatableComponent("commands.data.storage.query", new Object[] { this.id, lu.getPrettyDisplay() });
     }
     
     @Override
diff --git a/src/net/minecraft/server/dedicated/DedicatedPlayerList.java b/src/net/minecraft/server/dedicated/DedicatedPlayerList.java
index af2be8b..5c38320 100644
--- a/src/net/minecraft/server/dedicated/DedicatedPlayerList.java
+++ b/src/net/minecraft/server/dedicated/DedicatedPlayerList.java
@@ -4,21 +4,19 @@ import org.apache.logging.log4j.LogManager;
 import java.io.IOException;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.storage.PlayerDataStorage;
+import net.minecraft.core.RegistryAccess;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.server.players.PlayerList;
 
 public class DedicatedPlayerList extends PlayerList {
     private static final Logger LOGGER;
     
-    public DedicatedPlayerList(final DedicatedServer wd) {
-        super(wd, wd.getProperties().maxPlayers);
-        final DedicatedServerProperties we3 = wd.getProperties();
-        this.setViewDistance(we3.viewDistance);
-        super.setUsingWhiteList(we3.whiteList.get());
-        if (!wd.isSingleplayer()) {
-            this.getBans().setEnabled(true);
-            this.getIpBans().setEnabled(true);
-        }
+    public DedicatedPlayerList(final DedicatedServer yd, final RegistryAccess.RegistryHolder a, final PlayerDataStorage dai) {
+        super(yd, a, dai, yd.getProperties().maxPlayers);
+        final DedicatedServerProperties ye5 = yd.getProperties();
+        this.setViewDistance(ye5.viewDistance);
+        super.setUsingWhiteList(ye5.whiteList.get());
         this.loadUserBanList();
         this.saveUserBanList();
         this.loadIpBanList();
diff --git a/src/net/minecraft/server/dedicated/DedicatedServer.java b/src/net/minecraft/server/dedicated/DedicatedServer.java
index 703d138..c826dcc 100644
--- a/src/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/net/minecraft/server/dedicated/DedicatedServer.java
@@ -3,17 +3,18 @@ package net.minecraft.server.dedicated;
 import org.apache.logging.log4j.LogManager;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.GameType;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.world.Snooper;
 import java.util.function.BooleanSupplier;
 import java.util.Optional;
 import net.minecraft.CrashReport;
-import net.minecraft.world.Difficulty;
 import com.google.common.base.Strings;
+import net.minecraft.util.monitoring.jmx.MinecraftServerStatistics;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.item.CreativeModeTab;
@@ -21,38 +22,35 @@ import net.minecraft.world.item.Items;
 import net.minecraft.DefaultUncaughtExceptionHandlerWithName;
 import net.minecraft.world.level.GameRules;
 import java.util.Locale;
-import com.google.gson.JsonElement;
-import net.minecraft.util.GsonHelper;
-import net.minecraft.world.level.LevelType;
-import com.google.gson.JsonObject;
 import net.minecraft.world.level.block.entity.SkullBlockEntity;
-import java.util.Random;
 import net.minecraft.Util;
 import net.minecraft.server.players.PlayerList;
 import net.minecraft.server.players.OldUsersConverter;
 import net.minecraft.util.Crypt;
 import java.net.InetAddress;
 import net.minecraft.SharedConstants;
+import net.minecraft.DefaultUncaughtExceptionHandler;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import net.minecraft.DefaultUncaughtExceptionHandler;
 import java.util.Collections;
 import com.google.common.collect.Lists;
-import net.minecraft.commands.Commands;
 import java.net.Proxy;
 import net.minecraft.server.level.progress.ChunkProgressListenerFactory;
 import net.minecraft.server.players.GameProfileCache;
 import com.mojang.authlib.GameProfileRepository;
 import com.mojang.authlib.minecraft.MinecraftSessionService;
-import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
 import com.mojang.datafixers.DataFixer;
-import java.io.File;
+import net.minecraft.world.level.storage.WorldData;
+import net.minecraft.server.ServerResources;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.world.level.storage.LevelStorageSource;
+import net.minecraft.core.RegistryAccess;
 import javax.annotation.Nullable;
 import net.minecraft.server.gui.MinecraftServerGui;
-import net.minecraft.world.level.GameType;
 import net.minecraft.server.rcon.thread.RconThread;
 import net.minecraft.server.rcon.RconConsoleSource;
 import net.minecraft.server.rcon.thread.QueryThreadGs4;
@@ -71,37 +69,14 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
     private final RconConsoleSource rconConsoleSource;
     private RconThread rconThread;
     private final DedicatedServerSettings settings;
-    private GameType gameType;
     @Nullable
     private MinecraftServerGui gui;
     
-    public DedicatedServer(final File file, final DedicatedServerSettings wf, final DataFixer dataFixer, final YggdrasilAuthenticationService yggdrasilAuthenticationService, final MinecraftSessionService minecraftSessionService, final GameProfileRepository gameProfileRepository, final GameProfileCache zk, final ChunkProgressListenerFactory xn, final String string) {
-        super(file, Proxy.NO_PROXY, dataFixer, new Commands(true), yggdrasilAuthenticationService, minecraftSessionService, gameProfileRepository, zk, xn, string);
+    public DedicatedServer(final Thread thread, final RegistryAccess.RegistryHolder a, final LevelStorageSource.LevelStorageAccess a, final PackRepository<Pack> aar, final ServerResources uw, final WorldData dal, final DedicatedServerSettings yf, final DataFixer dataFixer, final MinecraftSessionService minecraftSessionService, final GameProfileRepository gameProfileRepository, final GameProfileCache abl, final ChunkProgressListenerFactory zn) {
+        super(thread, a, a, dal, aar, Proxy.NO_PROXY, dataFixer, uw, minecraftSessionService, gameProfileRepository, abl, zn);
         this.consoleInput = Collections.<ConsoleInput>synchronizedList(Lists.newArrayList());
-        this.settings = wf;
+        this.settings = yf;
         this.rconConsoleSource = new RconConsoleSource(this);
-        new Thread("Server Infinisleeper") {
-            {
-                this.setDaemon(true);
-                this.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(DedicatedServer.LOGGER));
-                this.start();
-            }
-            
-            @Override
-            public void run() {
-                while (true) {
-                    try {
-                        while (true) {
-                            Thread.sleep(2147483647L);
-                        }
-                    }
-                    catch (InterruptedException ex) {
-                        continue;
-                    }
-                    break;
-                }
-            }
-        };
     }
     
     public boolean initServer() throws IOException {
@@ -128,32 +103,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
             DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
         }
         DedicatedServer.LOGGER.info("Loading properties");
-        final DedicatedServerProperties we3 = this.settings.getProperties();
+        final DedicatedServerProperties ye3 = this.settings.getProperties();
         if (this.isSingleplayer()) {
             this.setLocalIp("127.0.0.1");
         }
         else {
-            this.setUsesAuthentication(we3.onlineMode);
-            this.setPreventProxyConnections(we3.preventProxyConnections);
-            this.setLocalIp(we3.serverIp);
+            this.setUsesAuthentication(ye3.onlineMode);
+            this.setPreventProxyConnections(ye3.preventProxyConnections);
+            this.setLocalIp(ye3.serverIp);
         }
-        this.setAnimals(we3.spawnAnimals);
-        this.setNpcsEnabled(we3.spawnNpcs);
-        this.setPvpAllowed(we3.pvp);
-        this.setFlightAllowed(we3.allowFlight);
-        this.setResourcePack(we3.resourcePack, this.getPackHash());
-        this.setMotd(we3.motd);
-        this.setForceGameType(we3.forceGameMode);
-        super.setPlayerIdleTimeout(we3.playerIdleTimeout.get());
-        this.setEnforceWhitelist(we3.enforceWhitelist);
-        this.gameType = we3.gamemode;
-        DedicatedServer.LOGGER.info("Default game type: {}", this.gameType);
+        this.setPvpAllowed(ye3.pvp);
+        this.setFlightAllowed(ye3.allowFlight);
+        this.setResourcePack(ye3.resourcePack, this.getPackHash());
+        this.setMotd(ye3.motd);
+        this.setForceGameType(ye3.forceGameMode);
+        super.setPlayerIdleTimeout(ye3.playerIdleTimeout.get());
+        this.setEnforceWhitelist(ye3.enforceWhitelist);
+        this.worldData.setGameType(ye3.gamemode);
+        DedicatedServer.LOGGER.info("Default game type: {}", ye3.gamemode);
         InetAddress inetAddress4 = null;
         if (!this.getLocalIp().isEmpty()) {
             inetAddress4 = InetAddress.getByName(this.getLocalIp());
         }
         if (this.getPort() < 0) {
-            this.setPort(we3.serverPort);
+            this.setPort(ye3.serverPort);
         }
         DedicatedServer.LOGGER.info("Generating keypair");
         this.setKeyPair(Crypt.generateKeyPair());
@@ -179,47 +152,25 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
             return false;
         }
-        this.setPlayerList(new DedicatedPlayerList(this));
+        this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage));
         final long long5 = Util.getNanos();
-        final String string7 = we3.levelSeed;
-        final String string8 = we3.generatorSettings;
-        long long6 = new Random().nextLong();
-        if (!string7.isEmpty()) {
-            try {
-                final long long7 = Long.parseLong(string7);
-                if (long7 != 0L) {
-                    long6 = long7;
-                }
-            }
-            catch (NumberFormatException numberFormatException11) {
-                long6 = string7.hashCode();
-            }
-        }
-        final LevelType bkd11 = we3.levelType;
-        this.setMaxBuildHeight(we3.maxBuildHeight);
+        this.setMaxBuildHeight(ye3.maxBuildHeight);
         SkullBlockEntity.setProfileCache(this.getProfileCache());
         SkullBlockEntity.setSessionService(this.getSessionService());
         GameProfileCache.setUsesAuthentication(this.usesAuthentication());
         DedicatedServer.LOGGER.info("Preparing level \"{}\"", this.getLevelIdName());
-        JsonObject jsonObject12 = new JsonObject();
-        if (bkd11 == LevelType.FLAT) {
-            jsonObject12.addProperty("flat_world_options", string8);
-        }
-        else if (!string8.isEmpty()) {
-            jsonObject12 = GsonHelper.parse(string8);
-        }
-        this.loadLevel(this.getLevelIdName(), this.getLevelIdName(), long6, bkd11, jsonObject12);
-        final long long8 = Util.getNanos() - long5;
-        final String string9 = String.format(Locale.ROOT, "%.3fs", long8 / 1.0E9);
+        this.loadLevel();
+        final long long6 = Util.getNanos() - long5;
+        final String string9 = String.format(Locale.ROOT, "%.3fs", long6 / 1.0E9);
         DedicatedServer.LOGGER.info("Done ({})! For help, type \"help\"", string9);
-        if (we3.announcePlayerAchievements != null) {
-            this.getGameRules().<GameRules.BooleanValue>getRule(GameRules.RULE_ANNOUNCE_ADVANCEMENTS).set(we3.announcePlayerAchievements, this);
+        if (ye3.announcePlayerAchievements != null) {
+            this.getGameRules().<GameRules.BooleanValue>getRule(GameRules.RULE_ANNOUNCE_ADVANCEMENTS).set(ye3.announcePlayerAchievements, this);
         }
-        if (we3.enableQuery) {
+        if (ye3.enableQuery) {
             DedicatedServer.LOGGER.info("Starting GS4 status listener");
             (this.queryThreadGs4 = new QueryThreadGs4(this)).start();
         }
-        if (we3.enableRcon) {
+        if (ye3.enableRcon) {
             DedicatedServer.LOGGER.info("Starting remote control listener");
             (this.rconThread = new RconThread(this)).start();
         }
@@ -231,21 +182,38 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
             thread3.start();
         }
         Items.AIR.fillItemCategory(CreativeModeTab.TAB_SEARCH, NonNullList.<ItemStack>create());
+        if (ye3.enableJmxMonitoring) {
+            MinecraftServerStatistics.registerJmxMonitoring(this);
+        }
         return true;
     }
     
+    @Override
+    public boolean isSpawningAnimals() {
+        return this.getProperties().spawnAnimals && super.isSpawningAnimals();
+    }
+    
+    public boolean isSpawningMonsters() {
+        return this.settings.getProperties().spawnMonsters && super.isSpawningMonsters();
+    }
+    
+    @Override
+    public boolean areNpcsEnabled() {
+        return this.settings.getProperties().spawnNpcs && super.areNpcsEnabled();
+    }
+    
     public String getPackHash() {
-        final DedicatedServerProperties we2 = this.settings.getProperties();
+        final DedicatedServerProperties ye2 = this.settings.getProperties();
         String string3;
-        if (!we2.resourcePackSha1.isEmpty()) {
-            string3 = we2.resourcePackSha1;
-            if (!Strings.isNullOrEmpty(we2.resourcePackHash)) {
+        if (!ye2.resourcePackSha1.isEmpty()) {
+            string3 = ye2.resourcePackSha1;
+            if (!Strings.isNullOrEmpty(ye2.resourcePackHash)) {
                 DedicatedServer.LOGGER.warn("resource-pack-hash is deprecated and found along side resource-pack-sha1. resource-pack-hash will be ignored.");
             }
         }
-        else if (!Strings.isNullOrEmpty(we2.resourcePackHash)) {
+        else if (!Strings.isNullOrEmpty(ye2.resourcePackHash)) {
             DedicatedServer.LOGGER.warn("resource-pack-hash is deprecated. Please use resource-pack-sha1 instead.");
-            string3 = we2.resourcePackHash;
+            string3 = ye2.resourcePackHash;
         }
         else {
             string3 = "";
@@ -253,36 +221,19 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         if (!string3.isEmpty() && !DedicatedServer.SHA1.matcher(string3).matches()) {
             DedicatedServer.LOGGER.warn("Invalid sha1 for ressource-pack-sha1");
         }
-        if (!we2.resourcePack.isEmpty() && string3.isEmpty()) {
+        if (!ye2.resourcePack.isEmpty() && string3.isEmpty()) {
             DedicatedServer.LOGGER.warn("You specified a resource pack without providing a sha1 hash. Pack will be updated on the client only if you change the name of the pack.");
         }
         return string3;
     }
     
-    @Override
-    public void setDefaultGameMode(final GameType bjt) {
-        super.setDefaultGameMode(bjt);
-        this.gameType = bjt;
-    }
-    
     @Override
     public DedicatedServerProperties getProperties() {
         return this.settings.getProperties();
     }
     
-    @Override
-    public boolean canGenerateStructures() {
-        return this.getProperties().generateStructures;
-    }
-    
-    @Override
-    public GameType getDefaultGameType() {
-        return this.gameType;
-    }
-    
-    @Override
-    public Difficulty getDefaultDifficulty() {
-        return this.getProperties().difficulty;
+    public void forceDifficulty() {
+        this.setDifficulty(this.getProperties().difficulty, true);
     }
     
     @Override
@@ -291,11 +242,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
     }
     
     @Override
-    public CrashReport fillReport(CrashReport h) {
-        h = super.fillReport(h);
-        h.getSystemDetails().setDetail("Is Modded", () -> this.getModdedStatus().orElse("Unknown (can't tell)"));
-        h.getSystemDetails().setDetail("Type", () -> "Dedicated Server (map_server.txt)");
-        return h;
+    public CrashReport fillReport(CrashReport j) {
+        j = super.fillReport(j);
+        j.getSystemDetails().setDetail("Is Modded", () -> this.getModdedStatus().orElse("Unknown (can't tell)"));
+        j.getSystemDetails().setDetail("Type", () -> "Dedicated Server (map_server.txt)");
+        return j;
     }
     
     @Override
@@ -329,25 +280,21 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         return this.getProperties().allowNether;
     }
     
-    public boolean getSpawnMonsters() {
-        return this.getProperties().spawnMonsters;
-    }
-    
     @Override
-    public void populateSnooper(final Snooper ajs) {
-        ajs.setDynamicData("whitelist_enabled", this.getPlayerList().isUsingWhitelist());
-        ajs.setDynamicData("whitelist_count", this.getPlayerList().getWhiteListNames().length);
-        super.populateSnooper(ajs);
+    public void populateSnooper(final Snooper ano) {
+        ano.setDynamicData("whitelist_enabled", this.getPlayerList().isUsingWhitelist());
+        ano.setDynamicData("whitelist_count", this.getPlayerList().getWhiteListNames().length);
+        super.populateSnooper(ano);
     }
     
-    public void handleConsoleInput(final String string, final CommandSourceStack cq) {
-        this.consoleInput.add(new ConsoleInput(string, cq));
+    public void handleConsoleInput(final String string, final CommandSourceStack cz) {
+        this.consoleInput.add(new ConsoleInput(string, cz));
     }
     
     public void handleConsoleInputs() {
         while (!this.consoleInput.isEmpty()) {
-            final ConsoleInput sq2 = this.consoleInput.remove(0);
-            this.getCommands().performCommand(sq2.source, sq2.msg);
+            final ConsoleInput ul2 = this.consoleInput.remove(0);
+            this.getCommands().performCommand(ul2.source, ul2.msg);
         }
     }
     
@@ -398,7 +345,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
     }
     
     @Override
-    public boolean publishServer(final GameType bjt, final boolean boolean2, final int integer) {
+    public boolean publishServer(final GameType bpy, final boolean boolean2, final int integer) {
         return false;
     }
     
@@ -413,26 +360,31 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
     }
     
     @Override
-    public boolean isUnderSpawnProtection(final Level bjw, final BlockPos fk, final Player ayj) {
-        if (bjw.dimension.getType() != DimensionType.OVERWORLD) {
+    public boolean isUnderSpawnProtection(final ServerLevel zd, final BlockPos fu, final Player bec) {
+        if (zd.dimension() != Level.OVERWORLD) {
             return false;
         }
         if (this.getPlayerList().getOps().isEmpty()) {
             return false;
         }
-        if (this.getPlayerList().isOp(ayj.getGameProfile())) {
+        if (this.getPlayerList().isOp(bec.getGameProfile())) {
             return false;
         }
         if (this.getSpawnProtectionRadius() <= 0) {
             return false;
         }
-        final BlockPos fk2 = bjw.getSharedSpawnPos();
-        final int integer6 = Mth.abs(fk.getX() - fk2.getX());
-        final int integer7 = Mth.abs(fk.getZ() - fk2.getZ());
+        final BlockPos fu2 = zd.getSharedSpawnPos();
+        final int integer6 = Mth.abs(fu.getX() - fu2.getX());
+        final int integer7 = Mth.abs(fu.getZ() - fu2.getZ());
         final int integer8 = Math.max(integer6, integer7);
         return integer8 <= this.getSpawnProtectionRadius();
     }
     
+    @Override
+    public boolean repliesToStatus() {
+        return this.getProperties().enableStatus;
+    }
+    
     @Override
     public int getOperatorUserPermissionLevel() {
         return this.getProperties().opPermissionLevel;
@@ -446,7 +398,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
     @Override
     public void setPlayerIdleTimeout(final int integer) {
         super.setPlayerIdleTimeout(integer);
-        this.settings.update(we -> (DedicatedServerProperties)we.playerIdleTimeout.update(integer));
+        this.settings.update(ye -> (DedicatedServerProperties)ye.playerIdleTimeout.update(integer));
     }
     
     @Override
@@ -532,12 +484,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
     }
     
     public void storeUsingWhiteList(final boolean boolean1) {
-        this.settings.update(we -> (DedicatedServerProperties)we.whiteList.update(boolean1));
+        this.settings.update(ye -> (DedicatedServerProperties)ye.whiteList.update(boolean1));
     }
     
     public void stopServer() {
         super.stopServer();
-        Util.shutdownBackgroundExecutor();
+        Util.shutdownExecutors();
     }
     
     @Override
@@ -545,6 +497,21 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         return false;
     }
     
+    @Override
+    public int getScaledTrackingDistance(final int integer) {
+        return this.getProperties().entityBroadcastRangePercentage * integer / 100;
+    }
+    
+    @Override
+    public String getLevelIdName() {
+        return this.storageSource.getLevelId();
+    }
+    
+    @Override
+    public boolean forceSynchronousWrites() {
+        return this.settings.getProperties().syncChunkWrites;
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
         SHA1 = Pattern.compile("^[a-fA-F0-9]{40}$");
diff --git a/src/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/net/minecraft/server/dedicated/DedicatedServerProperties.java
index 24a84af..c5b42ed 100644
--- a/src/net/minecraft/server/dedicated/DedicatedServerProperties.java
+++ b/src/net/minecraft/server/dedicated/DedicatedServerProperties.java
@@ -6,7 +6,7 @@ import net.minecraft.util.Mth;
 import java.util.function.Function;
 import java.util.function.IntFunction;
 import java.util.Properties;
-import net.minecraft.world.level.LevelType;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.Difficulty;
 
@@ -22,13 +22,9 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
     public final String motd;
     public final boolean forceGameMode;
     public final boolean enforceWhitelist;
-    public final boolean generateStructures;
     public final Difficulty difficulty;
     public final GameType gamemode;
     public final String levelName;
-    public final String levelSeed;
-    public final LevelType levelType;
-    public final String generatorSettings;
     public final int serverPort;
     public final int maxBuildHeight;
     public final Boolean announcePlayerAchievements;
@@ -55,8 +51,13 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
     public final boolean broadcastRconToOps;
     public final boolean broadcastConsoleToOps;
     public final int maxWorldSize;
+    public final boolean syncChunkWrites;
+    public final boolean enableJmxMonitoring;
+    public final boolean enableStatus;
+    public final int entityBroadcastRangePercentage;
     public final MutableValue<Integer> playerIdleTimeout;
     public final MutableValue<Boolean> whiteList;
+    public final WorldGenSettings worldGenSettings;
     
     public DedicatedServerProperties(final Properties properties) {
         super(properties);
@@ -71,13 +72,9 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
         this.motd = this.get("motd", "A Minecraft Server");
         this.forceGameMode = this.get("force-gamemode", false);
         this.enforceWhitelist = this.get("enforce-whitelist", false);
-        this.generateStructures = this.get("generate-structures", true);
         this.difficulty = this.<Difficulty>get("difficulty", Settings.dispatchNumberOrString((IntFunction<V>)Difficulty::byId, (Function<String, V>)Difficulty::byName), Difficulty::getKey, Difficulty.EASY);
         this.gamemode = this.<GameType>get("gamemode", Settings.dispatchNumberOrString((IntFunction<V>)GameType::byId, (Function<String, V>)GameType::byName), GameType::getName, GameType.SURVIVAL);
         this.levelName = this.get("level-name", "world");
-        this.levelSeed = this.get("level-seed", "");
-        this.levelType = this.<LevelType>get("level-type", LevelType::getLevelType, LevelType::getName, LevelType.NORMAL);
-        this.generatorSettings = this.get("generator-settings", "");
         this.serverPort = this.get("server-port", 25565);
         this.maxBuildHeight = this.get("max-build-height", integer -> Mth.clamp((integer + 8) / 16 * 16, 64, 256), 256);
         this.announcePlayerAchievements = this.getLegacyBoolean("announce-player-achievements");
@@ -105,8 +102,13 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
         this.broadcastRconToOps = this.get("broadcast-rcon-to-ops", true);
         this.broadcastConsoleToOps = this.get("broadcast-console-to-ops", true);
         this.maxWorldSize = this.get("max-world-size", integer -> Mth.clamp(integer, 1, 29999984), 29999984);
+        this.syncChunkWrites = this.get("sync-chunk-writes", true);
+        this.enableJmxMonitoring = this.get("enable-jmx-monitoring", false);
+        this.enableStatus = this.get("enable-status", true);
+        this.entityBroadcastRangePercentage = this.get("entity-broadcast-range-percentage", integer -> Mth.clamp(integer, 10, 1000), 100);
         this.playerIdleTimeout = this.getMutable("player-idle-timeout", 0);
         this.whiteList = this.getMutable("white-list", false);
+        this.worldGenSettings = WorldGenSettings.create(properties);
     }
     
     public static DedicatedServerProperties fromFile(final Path path) {
diff --git a/src/net/minecraft/server/dedicated/ServerWatchdog.java b/src/net/minecraft/server/dedicated/ServerWatchdog.java
index e9665ab..2a87105 100644
--- a/src/net/minecraft/server/dedicated/ServerWatchdog.java
+++ b/src/net/minecraft/server/dedicated/ServerWatchdog.java
@@ -20,9 +20,9 @@ public class ServerWatchdog implements Runnable {
     private final DedicatedServer server;
     private final long maxTickTime;
     
-    public ServerWatchdog(final DedicatedServer wd) {
-        this.server = wd;
-        this.maxTickTime = wd.getMaxTickLength();
+    public ServerWatchdog(final DedicatedServer yd) {
+        this.server = yd;
+        this.maxTickTime = yd.getMaxTickLength();
     }
     
     @Override
@@ -45,12 +45,12 @@ public class ServerWatchdog implements Runnable {
                     stringBuilder10.append(threadInfo15);
                     stringBuilder10.append("\n");
                 }
-                final CrashReport h12 = new CrashReport("Watching Server", error11);
-                this.server.fillReport(h12);
-                final CrashReportCategory i13 = h12.addCategory("Thread Dump");
-                i13.setDetail("Threads", stringBuilder10);
+                final CrashReport j12 = new CrashReport("Watching Server", error11);
+                this.server.fillReport(j12);
+                final CrashReportCategory k13 = j12.addCategory("Thread Dump");
+                k13.setDetail("Threads", stringBuilder10);
                 final File file14 = new File(new File(this.server.getServerDirectory(), "crash-reports"), "crash-" + new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new Date()) + "-server.txt");
-                if (h12.saveToFile(file14)) {
+                if (j12.saveToFile(file14)) {
                     ServerWatchdog.LOGGER.error("This crash report has been saved to: {}", file14.getAbsolutePath());
                 }
                 else {
diff --git a/src/net/minecraft/server/gui/MinecraftServerGui.java b/src/net/minecraft/server/gui/MinecraftServerGui.java
index 2ff7a35..ce95b26 100644
--- a/src/net/minecraft/server/gui/MinecraftServerGui.java
+++ b/src/net/minecraft/server/gui/MinecraftServerGui.java
@@ -47,37 +47,37 @@ public class MinecraftServerGui extends JComponent {
     private final Collection<Runnable> finalizers;
     private final AtomicBoolean isClosing;
     
-    public static MinecraftServerGui showFrameFor(final DedicatedServer wd) {
+    public static MinecraftServerGui showFrameFor(final DedicatedServer yd) {
         try {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
         }
         catch (Exception ex) {}
         final JFrame jFrame2 = new JFrame("Minecraft server");
-        final MinecraftServerGui wj3 = new MinecraftServerGui(wd);
+        final MinecraftServerGui yj3 = new MinecraftServerGui(yd);
         jFrame2.setDefaultCloseOperation(2);
-        jFrame2.add(wj3);
+        jFrame2.add(yj3);
         jFrame2.pack();
         jFrame2.setLocationRelativeTo(null);
         jFrame2.setVisible(true);
         jFrame2.addWindowListener(new WindowAdapter() {
             @Override
             public void windowClosing(final WindowEvent windowEvent) {
-                if (!wj3.isClosing.getAndSet(true)) {
+                if (!yj3.isClosing.getAndSet(true)) {
                     jFrame2.setTitle("Minecraft server - shutting down!");
-                    wd.halt(true);
+                    yd.halt(true);
                     MinecraftServerGui.this.runFinalizers();
                 }
             }
         });
-        wj3.addFinalizer(jFrame2::dispose);
-        wj3.start();
-        return wj3;
+        yj3.addFinalizer(jFrame2::dispose);
+        yj3.start();
+        return yj3;
     }
     
-    private MinecraftServerGui(final DedicatedServer wd) {
+    private MinecraftServerGui(final DedicatedServer yd) {
         this.finalizers = Lists.newArrayList();
         this.isClosing = new AtomicBoolean();
-        this.server = wd;
+        this.server = yd;
         this.setPreferredSize(new Dimension(854, 480));
         this.setLayout(new BorderLayout());
         try {
@@ -95,9 +95,9 @@ public class MinecraftServerGui extends JComponent {
     
     private JComponent buildInfoPanel() {
         final JPanel jPanel2 = new JPanel(new BorderLayout());
-        final StatsComponent wl3 = new StatsComponent(this.server);
-        this.finalizers.add(wl3::close);
-        jPanel2.add(wl3, "North");
+        final StatsComponent yl3 = new StatsComponent(this.server);
+        this.finalizers.add(yl3::close);
+        jPanel2.add(yl3, "North");
         jPanel2.add(this.buildPlayerPanel(), "Center");
         jPanel2.setBorder(new TitledBorder(new EtchedBorder(), "Stats"));
         return jPanel2;
diff --git a/src/net/minecraft/server/level/BlockDestructionProgress.java b/src/net/minecraft/server/level/BlockDestructionProgress.java
index 5305c7a..386ebb6 100644
--- a/src/net/minecraft/server/level/BlockDestructionProgress.java
+++ b/src/net/minecraft/server/level/BlockDestructionProgress.java
@@ -8,9 +8,9 @@ public class BlockDestructionProgress implements Comparable<BlockDestructionProg
     private int progress;
     private int updatedRenderTick;
     
-    public BlockDestructionProgress(final int integer, final BlockPos fk) {
+    public BlockDestructionProgress(final int integer, final BlockPos fu) {
         this.id = integer;
-        this.pos = fk;
+        this.pos = fu;
     }
     
     public BlockPos getPos() {
@@ -44,8 +44,8 @@ public class BlockDestructionProgress implements Comparable<BlockDestructionProg
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final BlockDestructionProgress wn3 = (BlockDestructionProgress)object;
-        return this.id == wn3.id;
+        final BlockDestructionProgress yn3 = (BlockDestructionProgress)object;
+        return this.id == yn3.id;
     }
     
     @Override
@@ -54,10 +54,10 @@ public class BlockDestructionProgress implements Comparable<BlockDestructionProg
     }
     
     @Override
-    public int compareTo(final BlockDestructionProgress wn) {
-        if (this.progress != wn.progress) {
-            return Integer.compare(this.progress, wn.progress);
+    public int compareTo(final BlockDestructionProgress yn) {
+        if (this.progress != yn.progress) {
+            return Integer.compare(this.progress, yn.progress);
         }
-        return Integer.compare(this.id, wn.id);
+        return Integer.compare(this.id, yn.id);
     }
 }
diff --git a/src/net/minecraft/server/level/ChunkHolder.java b/src/net/minecraft/server/level/ChunkHolder.java
index 68732cd..f618791 100644
--- a/src/net/minecraft/server/level/ChunkHolder.java
+++ b/src/net/minecraft/server/level/ChunkHolder.java
@@ -51,7 +51,6 @@ public class ChunkHolder {
     private final short[] changedBlocks;
     private int changes;
     private int changedSectionFilter;
-    private int sectionsToForceSendLightFor;
     private int blockChangedLightSectionFilter;
     private int skyChangedLightSectionFilter;
     private final LevelLightEngine lightEngine;
@@ -59,15 +58,15 @@ public class ChunkHolder {
     private final PlayerProvider playerProvider;
     private boolean wasAccessibleSinceLastSave;
     
-    public ChunkHolder(final ChunkPos bjh, final int integer, final LevelLightEngine coa, final LevelChangeListener c, final PlayerProvider d) {
+    public ChunkHolder(final ChunkPos bph, final int integer, final LevelLightEngine cwr, final LevelChangeListener c, final PlayerProvider d) {
         this.futures = new AtomicReferenceArray<CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>>>(ChunkHolder.CHUNK_STATUSES.size());
         this.fullChunkFuture = ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE;
         this.tickingChunkFuture = ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE;
         this.entityTickingChunkFuture = ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE;
         this.chunkToSave = CompletableFuture.<ChunkAccess>completedFuture((ChunkAccess)null);
         this.changedBlocks = new short[64];
-        this.pos = bjh;
-        this.lightEngine = coa;
+        this.pos = bph;
+        this.lightEngine = cwr;
         this.onLevelChange = c;
         this.playerProvider = d;
         this.oldTicketLevel = ChunkMap.MAX_CHUNK_DISTANCE + 1;
@@ -76,14 +75,14 @@ public class ChunkHolder {
         this.setTicketLevel(integer);
     }
     
-    public CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> getFutureIfPresentUnchecked(final ChunkStatus cae) {
-        final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture3 = this.futures.get(cae.getIndex());
+    public CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> getFutureIfPresentUnchecked(final ChunkStatus chc) {
+        final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture3 = this.futures.get(chc.getIndex());
         return (completableFuture3 == null) ? ChunkHolder.UNLOADED_CHUNK_FUTURE : completableFuture3;
     }
     
-    public CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> getFutureIfPresent(final ChunkStatus cae) {
-        if (getStatus(this.ticketLevel).isOrAfter(cae)) {
-            return this.getFutureIfPresentUnchecked(cae);
+    public CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> getFutureIfPresent(final ChunkStatus chc) {
+        if (getStatus(this.ticketLevel).isOrAfter(chc)) {
+            return this.getFutureIfPresentUnchecked(chc);
         }
         return ChunkHolder.UNLOADED_CHUNK_FUTURE;
     }
@@ -113,10 +112,10 @@ public class ChunkHolder {
     @Nullable
     public ChunkStatus getLastAvailableStatus() {
         for (int integer2 = ChunkHolder.CHUNK_STATUSES.size() - 1; integer2 >= 0; --integer2) {
-            final ChunkStatus cae3 = ChunkHolder.CHUNK_STATUSES.get(integer2);
-            final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture4 = this.getFutureIfPresentUnchecked(cae3);
+            final ChunkStatus chc3 = ChunkHolder.CHUNK_STATUSES.get(integer2);
+            final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture4 = this.getFutureIfPresentUnchecked(chc3);
             if (completableFuture4.getNow(ChunkHolder.UNLOADED_CHUNK).left().isPresent()) {
-                return cae3;
+                return chc3;
             }
         }
         return null;
@@ -125,8 +124,8 @@ public class ChunkHolder {
     @Nullable
     public ChunkAccess getLastAvailable() {
         for (int integer2 = ChunkHolder.CHUNK_STATUSES.size() - 1; integer2 >= 0; --integer2) {
-            final ChunkStatus cae3 = ChunkHolder.CHUNK_STATUSES.get(integer2);
-            final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture4 = this.getFutureIfPresentUnchecked(cae3);
+            final ChunkStatus chc3 = ChunkHolder.CHUNK_STATUSES.get(integer2);
+            final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture4 = this.getFutureIfPresentUnchecked(chc3);
             if (!completableFuture4.isCompletedExceptionally()) {
                 final Optional<ChunkAccess> optional5 = (Optional<ChunkAccess>)completableFuture4.getNow(ChunkHolder.UNLOADED_CHUNK).left();
                 if (optional5.isPresent()) {
@@ -142,8 +141,8 @@ public class ChunkHolder {
     }
     
     public void blockChanged(final int integer1, final int integer2, final int integer3) {
-        final LevelChunk cal5 = this.getTickingChunk();
-        if (cal5 == null) {
+        final LevelChunk chj5 = this.getTickingChunk();
+        if (chj5 == null) {
             return;
         }
         this.changedSectionFilter |= 1 << (integer2 >> 4);
@@ -158,13 +157,13 @@ public class ChunkHolder {
         }
     }
     
-    public void sectionLightChanged(final LightLayer bkf, final int integer) {
-        final LevelChunk cal4 = this.getTickingChunk();
-        if (cal4 == null) {
+    public void sectionLightChanged(final LightLayer bqi, final int integer) {
+        final LevelChunk chj4 = this.getTickingChunk();
+        if (chj4 == null) {
             return;
         }
-        cal4.setUnsaved(true);
-        if (bkf == LightLayer.SKY) {
+        chj4.setUnsaved(true);
+        if (bqi == LightLayer.SKY) {
             this.skyChangedLightSectionFilter |= 1 << integer + 1;
         }
         else {
@@ -172,47 +171,38 @@ public class ChunkHolder {
         }
     }
     
-    public void broadcastChanges(final LevelChunk cal) {
+    public void broadcastChanges(final LevelChunk chj) {
         if (this.changes == 0 && this.skyChangedLightSectionFilter == 0 && this.blockChangedLightSectionFilter == 0) {
             return;
         }
-        final Level bjw3 = cal.getLevel();
-        if (this.changes == 64) {
-            this.sectionsToForceSendLightFor = -1;
-        }
-        if (this.skyChangedLightSectionFilter != 0 || this.blockChangedLightSectionFilter != 0) {
-            this.broadcast(new ClientboundLightUpdatePacket(cal.getPos(), this.lightEngine, this.skyChangedLightSectionFilter & ~this.sectionsToForceSendLightFor, this.blockChangedLightSectionFilter & ~this.sectionsToForceSendLightFor), true);
-            final int integer4 = this.skyChangedLightSectionFilter & this.sectionsToForceSendLightFor;
-            final int integer5 = this.blockChangedLightSectionFilter & this.sectionsToForceSendLightFor;
-            if (integer4 != 0 || integer5 != 0) {
-                this.broadcast(new ClientboundLightUpdatePacket(cal.getPos(), this.lightEngine, integer4, integer5), false);
-            }
+        final Level bqb3 = chj.getLevel();
+        if (this.changes < 64 && (this.skyChangedLightSectionFilter != 0 || this.blockChangedLightSectionFilter != 0)) {
+            this.broadcast(new ClientboundLightUpdatePacket(chj.getPos(), this.lightEngine, this.skyChangedLightSectionFilter, this.blockChangedLightSectionFilter, false), true);
             this.skyChangedLightSectionFilter = 0;
             this.blockChangedLightSectionFilter = 0;
-            this.sectionsToForceSendLightFor &= ~(this.skyChangedLightSectionFilter & this.blockChangedLightSectionFilter);
         }
         if (this.changes == 1) {
             final int integer4 = (this.changedBlocks[0] >> 12 & 0xF) + this.pos.x * 16;
             final int integer5 = this.changedBlocks[0] & 0xFF;
             final int integer6 = (this.changedBlocks[0] >> 8 & 0xF) + this.pos.z * 16;
-            final BlockPos fk7 = new BlockPos(integer4, integer5, integer6);
-            this.broadcast(new ClientboundBlockUpdatePacket(bjw3, fk7), false);
-            if (bjw3.getBlockState(fk7).getBlock().isEntityBlock()) {
-                this.broadcastBlockEntity(bjw3, fk7);
+            final BlockPos fu7 = new BlockPos(integer4, integer5, integer6);
+            this.broadcast(new ClientboundBlockUpdatePacket(bqb3, fu7), false);
+            if (bqb3.getBlockState(fu7).getBlock().isEntityBlock()) {
+                this.broadcastBlockEntity(bqb3, fu7);
             }
         }
         else if (this.changes == 64) {
-            this.broadcast(new ClientboundLevelChunkPacket(cal, this.changedSectionFilter), false);
+            this.broadcast(new ClientboundLevelChunkPacket(chj, this.changedSectionFilter, false), false);
         }
         else if (this.changes != 0) {
-            this.broadcast(new ClientboundChunkBlocksUpdatePacket(this.changes, this.changedBlocks, cal), false);
+            this.broadcast(new ClientboundChunkBlocksUpdatePacket(this.changes, this.changedBlocks, chj), false);
             for (int integer4 = 0; integer4 < this.changes; ++integer4) {
                 final int integer5 = (this.changedBlocks[integer4] >> 12 & 0xF) + this.pos.x * 16;
                 final int integer6 = this.changedBlocks[integer4] & 0xFF;
                 final int integer7 = (this.changedBlocks[integer4] >> 8 & 0xF) + this.pos.z * 16;
-                final BlockPos fk8 = new BlockPos(integer5, integer6, integer7);
-                if (bjw3.getBlockState(fk8).getBlock().isEntityBlock()) {
-                    this.broadcastBlockEntity(bjw3, fk8);
+                final BlockPos fu8 = new BlockPos(integer5, integer6, integer7);
+                if (bqb3.getBlockState(fu8).getBlock().isEntityBlock()) {
+                    this.broadcastBlockEntity(bqb3, fu8);
                 }
             }
         }
@@ -220,22 +210,22 @@ public class ChunkHolder {
         this.changedSectionFilter = 0;
     }
     
-    private void broadcastBlockEntity(final Level bjw, final BlockPos fk) {
-        final BlockEntity bwl4 = bjw.getBlockEntity(fk);
-        if (bwl4 != null) {
-            final ClientboundBlockEntityDataPacket mh5 = bwl4.getUpdatePacket();
-            if (mh5 != null) {
-                this.broadcast(mh5, false);
+    private void broadcastBlockEntity(final Level bqb, final BlockPos fu) {
+        final BlockEntity cdl4 = bqb.getBlockEntity(fu);
+        if (cdl4 != null) {
+            final ClientboundBlockEntityDataPacket nv5 = cdl4.getUpdatePacket();
+            if (nv5 != null) {
+                this.broadcast(nv5, false);
             }
         }
     }
     
-    private void broadcast(final Packet<?> lt, final boolean boolean2) {
-        this.playerProvider.getPlayers(this.pos, boolean2).forEach(xe -> xe.connection.send(lt));
+    private void broadcast(final Packet<?> ni, final boolean boolean2) {
+        this.playerProvider.getPlayers(this.pos, boolean2).forEach(ze -> ze.connection.send(ni));
     }
     
-    public CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> getOrScheduleFuture(final ChunkStatus cae, final ChunkMap wp) {
-        final int integer4 = cae.getIndex();
+    public CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> getOrScheduleFuture(final ChunkStatus chc, final ChunkMap yp) {
+        final int integer4 = chc.getIndex();
         final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture5 = this.futures.get(integer4);
         if (completableFuture5 != null) {
             final Either<ChunkAccess, ChunkLoadingFailure> either6 = completableFuture5.getNow(null);
@@ -243,8 +233,8 @@ public class ChunkHolder {
                 return completableFuture5;
             }
         }
-        if (getStatus(this.ticketLevel).isOrAfter(cae)) {
-            final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture6 = wp.schedule(this, cae);
+        if (getStatus(this.ticketLevel).isOrAfter(chc)) {
+            final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture6 = yp.schedule(this, chc);
             this.updateChunkToSave(completableFuture6);
             this.futures.set(integer4, completableFuture6);
             return completableFuture6;
@@ -253,7 +243,7 @@ public class ChunkHolder {
     }
     
     private void updateChunkToSave(final CompletableFuture<? extends Either<? extends ChunkAccess, ChunkLoadingFailure>> completableFuture) {
-        this.chunkToSave = this.chunkToSave.<Object, ChunkAccess>thenCombine(completableFuture, (bzy, either) -> (ChunkAccess)either.map(bzy -> bzy, a -> bzy));
+        this.chunkToSave = this.chunkToSave.<Object, ChunkAccess>thenCombine(completableFuture, (cgy, either) -> (ChunkAccess)either.map(cgy -> cgy, a -> cgy));
     }
     
     public FullChunkStatus getFullStatus() {
@@ -280,9 +270,9 @@ public class ChunkHolder {
         this.ticketLevel = integer;
     }
     
-    protected void updateFutures(final ChunkMap wp) {
-        final ChunkStatus cae3 = getStatus(this.oldTicketLevel);
-        final ChunkStatus cae4 = getStatus(this.ticketLevel);
+    protected void updateFutures(final ChunkMap yp) {
+        final ChunkStatus chc3 = getStatus(this.oldTicketLevel);
+        final ChunkStatus chc4 = getStatus(this.ticketLevel);
         final boolean boolean5 = this.oldTicketLevel <= ChunkMap.MAX_CHUNK_DISTANCE;
         final boolean boolean6 = this.ticketLevel <= ChunkMap.MAX_CHUNK_DISTANCE;
         final FullChunkStatus b7 = getFullChunkStatus(this.oldTicketLevel);
@@ -294,7 +284,7 @@ public class ChunkHolder {
                     return "Unloaded ticket level " + ChunkHolder.this.pos.toString();
                 }
             });
-            for (int integer10 = boolean6 ? (cae4.getIndex() + 1) : 0; integer10 <= cae3.getIndex(); ++integer10) {
+            for (int integer10 = boolean6 ? (chc4.getIndex() + 1) : 0; integer10 <= chc3.getIndex(); ++integer10) {
                 final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture11 = this.futures.get(integer10);
                 if (completableFuture11 != null) {
                     completableFuture11.complete(either2);
@@ -308,17 +298,17 @@ public class ChunkHolder {
         final boolean boolean8 = b8.isOrAfter(FullChunkStatus.BORDER);
         this.wasAccessibleSinceLastSave |= boolean8;
         if (!boolean7 && boolean8) {
-            this.updateChunkToSave(this.fullChunkFuture = wp.unpackTicks(this));
+            this.updateChunkToSave(this.fullChunkFuture = yp.unpackTicks(this));
         }
         if (boolean7 && !boolean8) {
             final CompletableFuture<Either<LevelChunk, ChunkLoadingFailure>> completableFuture12 = this.fullChunkFuture;
             this.fullChunkFuture = ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE;
-            this.updateChunkToSave(completableFuture12.thenApply(either -> either.ifLeft((Consumer)wp::packTicks)));
+            this.updateChunkToSave(completableFuture12.thenApply(either -> either.ifLeft((Consumer)yp::packTicks)));
         }
         final boolean boolean9 = b7.isOrAfter(FullChunkStatus.TICKING);
         final boolean boolean10 = b8.isOrAfter(FullChunkStatus.TICKING);
         if (!boolean9 && boolean10) {
-            this.updateChunkToSave(this.tickingChunkFuture = wp.postProcess(this));
+            this.updateChunkToSave(this.tickingChunkFuture = yp.postProcess(this));
         }
         if (boolean9 && !boolean10) {
             this.tickingChunkFuture.complete(ChunkHolder.UNLOADED_LEVEL_CHUNK);
@@ -330,7 +320,7 @@ public class ChunkHolder {
             if (this.entityTickingChunkFuture != ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE) {
                 throw Util.<IllegalStateException>pauseInIde(new IllegalStateException());
             }
-            this.updateChunkToSave(this.entityTickingChunkFuture = wp.getEntityTickingRangeFuture(this.pos));
+            this.updateChunkToSave(this.entityTickingChunkFuture = yp.getEntityTickingRangeFuture(this.pos));
         }
         if (boolean11 && !boolean12) {
             this.entityTickingChunkFuture.complete(ChunkHolder.UNLOADED_LEVEL_CHUNK);
@@ -359,19 +349,19 @@ public class ChunkHolder {
         this.wasAccessibleSinceLastSave = getFullChunkStatus(this.ticketLevel).isOrAfter(FullChunkStatus.BORDER);
     }
     
-    public void replaceProtoChunk(final ImposterProtoChunk cak) {
+    public void replaceProtoChunk(final ImposterProtoChunk chi) {
         for (int integer3 = 0; integer3 < this.futures.length(); ++integer3) {
             final CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>> completableFuture4 = this.futures.get(integer3);
             if (completableFuture4 != null) {
                 final Optional<ChunkAccess> optional5 = (Optional<ChunkAccess>)completableFuture4.getNow(ChunkHolder.UNLOADED_CHUNK).left();
                 if (optional5.isPresent()) {
                     if (optional5.get() instanceof ProtoChunk) {
-                        this.futures.set(integer3, CompletableFuture.<Either<ChunkAccess, ChunkLoadingFailure>>completedFuture(Either.left(cak)));
+                        this.futures.set(integer3, CompletableFuture.<Either<ChunkAccess, ChunkLoadingFailure>>completedFuture(Either.left(chi)));
                     }
                 }
             }
         }
-        this.updateChunkToSave(CompletableFuture.<Either>completedFuture(Either.left(cak.getWrapped())));
+        this.updateChunkToSave(CompletableFuture.<Either>completedFuture(Either.left(chi.getWrapped())));
     }
     
     static {
@@ -404,10 +394,10 @@ public class ChunkHolder {
     }
     
     public interface PlayerProvider {
-        Stream<ServerPlayer> getPlayers(final ChunkPos bjh, final boolean boolean2);
+        Stream<ServerPlayer> getPlayers(final ChunkPos bph, final boolean boolean2);
     }
     
     public interface LevelChangeListener {
-        void onLevelChange(final ChunkPos bjh, final IntSupplier intSupplier, final int integer, final IntConsumer intConsumer);
+        void onLevelChange(final ChunkPos bph, final IntSupplier intSupplier, final int integer, final IntConsumer intConsumer);
     }
 }
diff --git a/src/net/minecraft/server/level/ChunkMap.java b/src/net/minecraft/server/level/ChunkMap.java
index 5d06750..368eaa5 100644
--- a/src/net/minecraft/server/level/ChunkMap.java
+++ b/src/net/minecraft/server/level/ChunkMap.java
@@ -1,10 +1,15 @@
 java.lang.StackOverflowError
+	at java.base/java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:936)
+	at java.base/java.util.concurrent.ConcurrentHashMap.containsKey(ConcurrentHashMap.java:964)
 	at java.base/java.util.Collections$SetFromMap.contains(Collections.java:5564)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:21)
 	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
 	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.resolve(CoreMetadataFactory.java:616)
+	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:91)
+	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.resolve(CoreMetadataFactory.java:616)
 	at com.strobel.assembler.metadata.MetadataHelper.isRawType(MetadataHelper.java:1581)
 	at com.strobel.assembler.metadata.MetadataHelper$SameTypeVisitor.visitClassType(MetadataHelper.java:2361)
 	at com.strobel.assembler.metadata.MetadataHelper$SameTypeVisitor.visitClassType(MetadataHelper.java:2322)
@@ -1018,8 +1023,3 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
-	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
diff --git a/src/net/minecraft/server/level/ChunkTaskPriorityQueue.java b/src/net/minecraft/server/level/ChunkTaskPriorityQueue.java
index 8c60e7c..015cbd4 100644
--- a/src/net/minecraft/server/level/ChunkTaskPriorityQueue.java
+++ b/src/net/minecraft/server/level/ChunkTaskPriorityQueue.java
@@ -35,19 +35,19 @@ public class ChunkTaskPriorityQueue<T> {
         this.maxTasks = integer;
     }
     
-    protected void resortChunkTasks(final int integer1, final ChunkPos bjh, final int integer3) {
+    protected void resortChunkTasks(final int integer1, final ChunkPos bph, final int integer3) {
         if (integer1 >= ChunkTaskPriorityQueue.PRIORITY_LEVEL_COUNT) {
             return;
         }
         final Long2ObjectLinkedOpenHashMap<List<Optional<T>>> long2ObjectLinkedOpenHashMap5 = this.taskQueue.get(integer1);
-        final List<Optional<T>> list6 = (List<Optional<T>>)long2ObjectLinkedOpenHashMap5.remove(bjh.toLong());
+        final List<Optional<T>> list6 = (List<Optional<T>>)long2ObjectLinkedOpenHashMap5.remove(bph.toLong());
         if (integer1 == this.firstQueue) {
             while (this.firstQueue < ChunkTaskPriorityQueue.PRIORITY_LEVEL_COUNT && this.taskQueue.get(this.firstQueue).isEmpty()) {
                 ++this.firstQueue;
             }
         }
         if (list6 != null && !list6.isEmpty()) {
-            ((List)this.taskQueue.get(integer3).computeIfAbsent(bjh.toLong(), long1 -> Lists.newArrayList())).addAll(list6);
+            ((List)this.taskQueue.get(integer3).computeIfAbsent(bph.toLong(), long1 -> Lists.newArrayList())).addAll(list6);
             this.firstQueue = Math.min(this.firstQueue, integer3);
         }
     }
diff --git a/src/net/minecraft/server/level/ChunkTaskPriorityQueueSorter.java b/src/net/minecraft/server/level/ChunkTaskPriorityQueueSorter.java
index 05c5c4c..923a808 100644
--- a/src/net/minecraft/server/level/ChunkTaskPriorityQueueSorter.java
+++ b/src/net/minecraft/server/level/ChunkTaskPriorityQueueSorter.java
@@ -32,8 +32,8 @@ public class ChunkTaskPriorityQueueSorter implements AutoCloseable, ChunkHolder.
     
     public ChunkTaskPriorityQueueSorter(final List<ProcessorHandle<?>> list, final Executor executor, final int integer) {
         final ChunkTaskPriorityQueue chunkTaskPriorityQueue;
-        this.queues = list.stream().collect(Collectors.toMap(Function.identity(), aiu -> {
-            new ChunkTaskPriorityQueue(aiu.name() + "_queue", integer);
+        this.queues = list.stream().collect(Collectors.toMap(Function.identity(), amp -> {
+            new ChunkTaskPriorityQueue(amp.name() + "_queue", integer);
             return chunkTaskPriorityQueue;
         }));
         this.sleeping = Sets.newHashSet(list);
@@ -41,91 +41,91 @@ public class ChunkTaskPriorityQueueSorter implements AutoCloseable, ChunkHolder.
     }
     
     public static Message<Runnable> message(final Runnable runnable, final long long2, final IntSupplier intSupplier) {
-        return new Message<Runnable>(aiu -> () -> {
+        return new Message<Runnable>(amp -> () -> {
             runnable.run();
-            aiu.tell(Unit.INSTANCE);
+            amp.tell(Unit.INSTANCE);
         }, long2, intSupplier);
     }
     
-    public static Message<Runnable> message(final ChunkHolder wo, final Runnable runnable) {
-        return message(runnable, wo.getPos().toLong(), wo::getQueueLevel);
+    public static Message<Runnable> message(final ChunkHolder yo, final Runnable runnable) {
+        return message(runnable, yo.getPos().toLong(), yo::getQueueLevel);
     }
     
     public static Release release(final Runnable runnable, final long long2, final boolean boolean3) {
         return new Release(runnable, long2, boolean3);
     }
     
-    public <T> ProcessorHandle<Message<T>> getProcessor(final ProcessorHandle<T> aiu, final boolean boolean2) {
-        return this.mailbox.<ProcessorHandle<Message<T>>>ask(aiu3 -> new StrictQueue.IntRunnable(0, () -> {
-            this.<T>getQueue(aiu);
-            aiu3.tell(ProcessorHandle.of("chunk priority sorter around " + aiu.name(), a -> this.<T>submit(aiu, a.task, a.pos, a.level, boolean2)));
+    public <T> ProcessorHandle<Message<T>> getProcessor(final ProcessorHandle<T> amp, final boolean boolean2) {
+        return this.mailbox.<ProcessorHandle<Message<T>>>ask(amp3 -> new StrictQueue.IntRunnable(0, () -> {
+            this.<T>getQueue(amp);
+            amp3.tell(ProcessorHandle.of("chunk priority sorter around " + amp.name(), a -> this.<T>submit(amp, a.task, a.pos, a.level, boolean2)));
         })).join();
     }
     
-    public ProcessorHandle<Release> getReleaseProcessor(final ProcessorHandle<Runnable> aiu) {
-        return this.mailbox.<ProcessorHandle<Release>>ask(aiu2 -> new StrictQueue.IntRunnable(0, () -> aiu2.tell(ProcessorHandle.of("chunk priority sorter around " + aiu.name(), b -> this.<Runnable>release(aiu, b.pos, b.task, b.clearQueue))))).join();
+    public ProcessorHandle<Release> getReleaseProcessor(final ProcessorHandle<Runnable> amp) {
+        return this.mailbox.<ProcessorHandle<Release>>ask(amp2 -> new StrictQueue.IntRunnable(0, () -> amp2.tell(ProcessorHandle.of("chunk priority sorter around " + amp.name(), b -> this.<Runnable>release(amp, b.pos, b.task, b.clearQueue))))).join();
     }
     
     @Override
-    public void onLevelChange(final ChunkPos bjh, final IntSupplier intSupplier, final int integer, final IntConsumer intConsumer) {
+    public void onLevelChange(final ChunkPos bph, final IntSupplier intSupplier, final int integer, final IntConsumer intConsumer) {
         final int integer2;
         this.mailbox.tell(new StrictQueue.IntRunnable(0, () -> {
             integer2 = intSupplier.getAsInt();
-            this.queues.values().forEach(wq -> wq.resortChunkTasks(integer2, bjh, integer));
+            this.queues.values().forEach(yq -> yq.resortChunkTasks(integer2, bph, integer));
             intConsumer.accept(integer);
         }));
     }
     
-    private <T> void release(final ProcessorHandle<T> aiu, final long long2, final Runnable runnable, final boolean boolean4) {
-        final ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, Object>> wq7;
+    private <T> void release(final ProcessorHandle<T> amp, final long long2, final Runnable runnable, final boolean boolean4) {
+        final ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, Object>> yq7;
         this.mailbox.tell(new StrictQueue.IntRunnable(1, () -> {
-            wq7 = this.getQueue(aiu);
-            wq7.release(long2, boolean4);
-            if (this.sleeping.remove(aiu)) {
-                this.pollTask(wq7, (ProcessorHandle<Object>)aiu);
+            yq7 = this.getQueue(amp);
+            yq7.release(long2, boolean4);
+            if (this.sleeping.remove(amp)) {
+                this.pollTask(yq7, (ProcessorHandle<Object>)amp);
             }
             runnable.run();
         }));
     }
     
-    private <T> void submit(final ProcessorHandle<T> aiu, final Function<ProcessorHandle<Unit>, T> function, final long long3, final IntSupplier intSupplier, final boolean boolean5) {
-        final ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, Object>> wq8;
+    private <T> void submit(final ProcessorHandle<T> amp, final Function<ProcessorHandle<Unit>, T> function, final long long3, final IntSupplier intSupplier, final boolean boolean5) {
+        final ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, Object>> yq8;
         final int integer9;
         this.mailbox.tell(new StrictQueue.IntRunnable(2, () -> {
-            wq8 = this.getQueue(aiu);
+            yq8 = this.getQueue(amp);
             integer9 = intSupplier.getAsInt();
-            wq8.submit(Optional.<Function<ProcessorHandle<Unit>, Object>>of((Function<ProcessorHandle<Unit>, Object>)function), long3, integer9);
+            yq8.submit(Optional.<Function<ProcessorHandle<Unit>, Object>>of((Function<ProcessorHandle<Unit>, Object>)function), long3, integer9);
             if (boolean5) {
-                wq8.submit(Optional.<Function<ProcessorHandle<Unit>, Object>>empty(), long3, integer9);
+                yq8.submit(Optional.<Function<ProcessorHandle<Unit>, Object>>empty(), long3, integer9);
             }
-            if (this.sleeping.remove(aiu)) {
-                this.pollTask(wq8, (ProcessorHandle<Object>)aiu);
+            if (this.sleeping.remove(amp)) {
+                this.pollTask(yq8, (ProcessorHandle<Object>)amp);
             }
         }));
     }
     
-    private <T> void pollTask(final ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, T>> wq, final ProcessorHandle<T> aiu) {
+    private <T> void pollTask(final ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, T>> yq, final ProcessorHandle<T> amp) {
         final Stream<Either<Function<ProcessorHandle<Unit>, Object>, Runnable>> stream4;
         this.mailbox.tell(new StrictQueue.IntRunnable(3, () -> {
-            stream4 = (Stream<Either<Function<ProcessorHandle<Unit>, Object>, Runnable>>)wq.pop();
+            stream4 = (Stream<Either<Function<ProcessorHandle<Unit>, Object>, Runnable>>)yq.pop();
             if (stream4 == null) {
-                this.sleeping.add(aiu);
+                this.sleeping.add(amp);
             }
             else {
-                Util.sequence(stream4.map(either -> (CompletableFuture)either.map((Function)aiu::ask, runnable -> {
+                Util.sequence(stream4.map(either -> (CompletableFuture)either.map((Function)amp::ask, runnable -> {
                     runnable.run();
                     return CompletableFuture.<Unit>completedFuture(Unit.INSTANCE);
-                })).collect(Collectors.toList())).thenAccept(list -> this.pollTask((ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, Object>>)wq, (ProcessorHandle<Object>)aiu));
+                })).collect(Collectors.toList())).thenAccept(list -> this.pollTask((ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, Object>>)yq, (ProcessorHandle<Object>)amp));
             }
         }));
     }
     
-    private <T> ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, T>> getQueue(final ProcessorHandle<T> aiu) {
-        final ChunkTaskPriorityQueue<? extends Function<ProcessorHandle<Unit>, ?>> wq3 = this.queues.get(aiu);
-        if (wq3 == null) {
-            throw Util.<IllegalArgumentException>pauseInIde(new IllegalArgumentException("No queue for: " + aiu));
+    private <T> ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, T>> getQueue(final ProcessorHandle<T> amp) {
+        final ChunkTaskPriorityQueue<? extends Function<ProcessorHandle<Unit>, ?>> yq3 = this.queues.get(amp);
+        if (yq3 == null) {
+            throw Util.<IllegalArgumentException>pauseInIde(new IllegalArgumentException("No queue for: " + amp));
         }
-        return (ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, T>>)wq3;
+        return (ChunkTaskPriorityQueue<Function<ProcessorHandle<Unit>, T>>)yq3;
     }
     
     @VisibleForTesting
diff --git a/src/net/minecraft/server/level/ChunkTracker.java b/src/net/minecraft/server/level/ChunkTracker.java
index 7f73632..f9c84c6 100644
--- a/src/net/minecraft/server/level/ChunkTracker.java
+++ b/src/net/minecraft/server/level/ChunkTracker.java
@@ -15,9 +15,9 @@ public abstract class ChunkTracker extends DynamicGraphMinFixedPoint {
     
     @Override
     protected void checkNeighborsAfterUpdate(final long long1, final int integer, final boolean boolean3) {
-        final ChunkPos bjh6 = new ChunkPos(long1);
-        final int integer2 = bjh6.x;
-        final int integer3 = bjh6.z;
+        final ChunkPos bph6 = new ChunkPos(long1);
+        final int integer2 = bph6.x;
+        final int integer3 = bph6.z;
         for (int integer4 = -1; integer4 <= 1; ++integer4) {
             for (int integer5 = -1; integer5 <= 1; ++integer5) {
                 final long long2 = ChunkPos.asLong(integer2 + integer4, integer3 + integer5);
@@ -31,9 +31,9 @@ public abstract class ChunkTracker extends DynamicGraphMinFixedPoint {
     @Override
     protected int getComputedLevel(final long long1, final long long2, final int integer) {
         int integer2 = integer;
-        final ChunkPos bjh8 = new ChunkPos(long1);
-        final int integer3 = bjh8.x;
-        final int integer4 = bjh8.z;
+        final ChunkPos bph8 = new ChunkPos(long1);
+        final int integer3 = bph8.x;
+        final int integer4 = bph8.z;
         for (int integer5 = -1; integer5 <= 1; ++integer5) {
             for (int integer6 = -1; integer6 <= 1; ++integer6) {
                 long long3 = ChunkPos.asLong(integer3 + integer5, integer4 + integer6);
diff --git a/src/net/minecraft/server/level/ColumnPos.java b/src/net/minecraft/server/level/ColumnPos.java
index e59f9b3..8dbeee9 100644
--- a/src/net/minecraft/server/level/ColumnPos.java
+++ b/src/net/minecraft/server/level/ColumnPos.java
@@ -11,9 +11,9 @@ public class ColumnPos {
         this.z = integer2;
     }
     
-    public ColumnPos(final BlockPos fk) {
-        this.x = fk.getX();
-        this.z = fk.getZ();
+    public ColumnPos(final BlockPos fu) {
+        this.x = fu.getX();
+        this.z = fu.getZ();
     }
     
     @Override
@@ -34,8 +34,8 @@ public class ColumnPos {
             return true;
         }
         if (object instanceof ColumnPos) {
-            final ColumnPos wt3 = (ColumnPos)object;
-            return this.x == wt3.x && this.z == wt3.z;
+            final ColumnPos yt3 = (ColumnPos)object;
+            return this.x == yt3.x && this.z == yt3.z;
         }
         return false;
     }
diff --git a/src/net/minecraft/server/level/DemoMode.java b/src/net/minecraft/server/level/DemoMode.java
index e638e84..6565d34 100644
--- a/src/net/minecraft/server/level/DemoMode.java
+++ b/src/net/minecraft/server/level/DemoMode.java
@@ -5,11 +5,11 @@ import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.Direction;
 import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
+import net.minecraft.Util;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
@@ -20,8 +20,8 @@ public class DemoMode extends ServerPlayerGameMode {
     private int demoEndedReminder;
     private int gameModeTicks;
     
-    public DemoMode(final ServerLevel xd) {
-        super(xd);
+    public DemoMode(final ServerLevel zd) {
+        super(zd);
     }
     
     @Override
@@ -32,7 +32,7 @@ public class DemoMode extends ServerPlayerGameMode {
         final long long3 = long2 / 24000L + 1L;
         if (!this.displayedIntro && this.gameModeTicks > 20) {
             this.displayedIntro = true;
-            this.player.connection.send(new ClientboundGameEventPacket(5, 0.0f));
+            this.player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, 0.0f));
         }
         this.demoHasEnded = (long2 > 120500L);
         if (this.demoHasEnded) {
@@ -41,60 +41,60 @@ public class DemoMode extends ServerPlayerGameMode {
         if (long2 % 24000L == 500L) {
             if (long3 <= 6L) {
                 if (long3 == 6L) {
-                    this.player.connection.send(new ClientboundGameEventPacket(5, 104.0f));
+                    this.player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, 104.0f));
                 }
                 else {
-                    this.player.sendMessage(new TranslatableComponent("demo.day." + long3, new Object[0]));
+                    this.player.sendMessage(new TranslatableComponent("demo.day." + long3), Util.NIL_UUID);
                 }
             }
         }
         else if (long3 == 1L) {
             if (long2 == 100L) {
-                this.player.connection.send(new ClientboundGameEventPacket(5, 101.0f));
+                this.player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, 101.0f));
             }
             else if (long2 == 175L) {
-                this.player.connection.send(new ClientboundGameEventPacket(5, 102.0f));
+                this.player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, 102.0f));
             }
             else if (long2 == 250L) {
-                this.player.connection.send(new ClientboundGameEventPacket(5, 103.0f));
+                this.player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, 103.0f));
             }
         }
         else if (long3 == 5L && long2 % 24000L == 22000L) {
-            this.player.sendMessage(new TranslatableComponent("demo.day.warning", new Object[0]));
+            this.player.sendMessage(new TranslatableComponent("demo.day.warning"), Util.NIL_UUID);
         }
     }
     
     private void outputDemoReminder() {
         if (this.demoEndedReminder > 100) {
-            this.player.sendMessage(new TranslatableComponent("demo.reminder", new Object[0]));
+            this.player.sendMessage(new TranslatableComponent("demo.reminder"), Util.NIL_UUID);
             this.demoEndedReminder = 0;
         }
     }
     
     @Override
-    public void handleBlockBreakAction(final BlockPos fk, final ServerboundPlayerActionPacket.Action a, final Direction fp, final int integer) {
+    public void handleBlockBreakAction(final BlockPos fu, final ServerboundPlayerActionPacket.Action a, final Direction fz, final int integer) {
         if (this.demoHasEnded) {
             this.outputDemoReminder();
             return;
         }
-        super.handleBlockBreakAction(fk, a, fp, integer);
+        super.handleBlockBreakAction(fu, a, fz, integer);
     }
     
     @Override
-    public InteractionResult useItem(final Player ayj, final Level bjw, final ItemStack ben, final InteractionHand ajk) {
+    public InteractionResult useItem(final ServerPlayer ze, final Level bqb, final ItemStack bki, final InteractionHand anf) {
         if (this.demoHasEnded) {
             this.outputDemoReminder();
             return InteractionResult.PASS;
         }
-        return super.useItem(ayj, bjw, ben, ajk);
+        return super.useItem(ze, bqb, bki, anf);
     }
     
     @Override
-    public InteractionResult useItemOn(final Player ayj, final Level bjw, final ItemStack ben, final InteractionHand ajk, final BlockHitResult cvg) {
+    public InteractionResult useItemOn(final ServerPlayer ze, final Level bqb, final ItemStack bki, final InteractionHand anf, final BlockHitResult deh) {
         if (this.demoHasEnded) {
             this.outputDemoReminder();
             return InteractionResult.PASS;
         }
-        return super.useItemOn(ayj, bjw, ben, ajk, cvg);
+        return super.useItemOn(ze, bqb, bki, anf, deh);
     }
 }
diff --git a/src/net/minecraft/server/level/DerivedServerLevel.java b/src/net/minecraft/server/level/DerivedServerLevel.java
deleted file mode 100644
index 1b7196f..0000000
--- a/src/net/minecraft/server/level/DerivedServerLevel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package net.minecraft.server.level;
-
-import net.minecraft.world.level.border.BorderChangeListener;
-import net.minecraft.world.level.storage.LevelData;
-import net.minecraft.world.level.storage.DerivedLevelData;
-import net.minecraft.server.level.progress.ChunkProgressListener;
-import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.storage.LevelStorage;
-import java.util.concurrent.Executor;
-import net.minecraft.server.MinecraftServer;
-
-public class DerivedServerLevel extends ServerLevel {
-    public DerivedServerLevel(final ServerLevel xd, final MinecraftServer minecraftServer, final Executor executor, final LevelStorage crn, final DimensionType cbi, final ProfilerFiller aio, final ChunkProgressListener xm) {
-        super(minecraftServer, executor, crn, new DerivedLevelData(xd.getLevelData()), cbi, aio, xm);
-        xd.getWorldBorder().addListener(new BorderChangeListener.DelegateBorderChangeListener(this.getWorldBorder()));
-    }
-    
-    @Override
-    protected void tickTime() {
-    }
-}
diff --git a/src/net/minecraft/server/level/DistanceManager.java b/src/net/minecraft/server/level/DistanceManager.java
index 04083ca..c83fd8f 100644
--- a/src/net/minecraft/server/level/DistanceManager.java
+++ b/src/net/minecraft/server/level/DistanceManager.java
@@ -54,11 +54,11 @@ public abstract class DistanceManager {
         this.playerTicketManager = new PlayerTicketTracker(33);
         this.chunksToUpdateFutures = Sets.newHashSet();
         this.ticketsToRelease = (LongSet)new LongOpenHashSet();
-        final ProcessorHandle<Runnable> aiu4 = ProcessorHandle.<Runnable>of("player ticket throttler", executor2::execute);
-        final ChunkTaskPriorityQueueSorter wr5 = new ChunkTaskPriorityQueueSorter(ImmutableList.of(aiu4), executor1, 4);
-        this.ticketThrottler = wr5;
-        this.ticketThrottlerInput = wr5.<Runnable>getProcessor(aiu4, true);
-        this.ticketThrottlerReleaser = wr5.getReleaseProcessor(aiu4);
+        final ProcessorHandle<Runnable> amp4 = ProcessorHandle.<Runnable>of("player ticket throttler", executor2::execute);
+        final ChunkTaskPriorityQueueSorter yr5 = new ChunkTaskPriorityQueueSorter(ImmutableList.of(amp4), executor1, 4);
+        this.ticketThrottler = yr5;
+        this.ticketThrottlerInput = yr5.<Runnable>getProcessor(amp4, true);
+        this.ticketThrottlerReleaser = yr5.getReleaseProcessor(amp4);
         this.mainThreadExecutor = executor2;
     }
     
@@ -67,7 +67,7 @@ public abstract class DistanceManager {
         final ObjectIterator<Long2ObjectMap.Entry<SortedArraySet<Ticket<?>>>> objectIterator2 = (ObjectIterator<Long2ObjectMap.Entry<SortedArraySet<Ticket<?>>>>)this.tickets.long2ObjectEntrySet().fastIterator();
         while (objectIterator2.hasNext()) {
             final Long2ObjectMap.Entry<SortedArraySet<Ticket<?>>> entry3 = (Long2ObjectMap.Entry<SortedArraySet<Ticket<?>>>)objectIterator2.next();
-            if (((SortedArraySet)entry3.getValue()).removeIf(xh -> xh.timedOut(this.ticketTickCounter))) {
+            if (((SortedArraySet)entry3.getValue()).removeIf(zh -> zh.timedOut(this.ticketTickCounter))) {
                 this.ticketTracker.update(entry3.getLongKey(), getTicketLevelAt((SortedArraySet<Ticket<?>>)entry3.getValue()), false);
             }
             if (((SortedArraySet)entry3.getValue()).isEmpty()) {
@@ -76,8 +76,8 @@ public abstract class DistanceManager {
         }
     }
     
-    private static int getTicketLevelAt(final SortedArraySet<Ticket<?>> abw) {
-        return abw.isEmpty() ? (ChunkMap.MAX_CHUNK_DISTANCE + 1) : abw.first().getTicketLevel();
+    private static int getTicketLevelAt(final SortedArraySet<Ticket<?>> aeg) {
+        return aeg.isEmpty() ? (ChunkMap.MAX_CHUNK_DISTANCE + 1) : aeg.first().getTicketLevel();
     }
     
     protected abstract boolean isChunkToRemove(final long long1);
@@ -86,16 +86,16 @@ public abstract class DistanceManager {
     protected abstract ChunkHolder getChunk(final long long1);
     
     @Nullable
-    protected abstract ChunkHolder updateChunkScheduling(final long long1, final int integer2, @Nullable final ChunkHolder wo, final int integer4);
+    protected abstract ChunkHolder updateChunkScheduling(final long long1, final int integer2, @Nullable final ChunkHolder yo, final int integer4);
     
-    public boolean runAllUpdates(final ChunkMap wp) {
+    public boolean runAllUpdates(final ChunkMap yp) {
         this.naturalSpawnChunkCounter.runAllUpdates();
         this.playerTicketManager.runAllUpdates();
         final int integer3 = Integer.MAX_VALUE - this.ticketTracker.runDistnaceUpdates(Integer.MAX_VALUE);
         final boolean boolean4 = integer3 != 0;
         if (boolean4) {}
         if (!this.chunksToUpdateFutures.isEmpty()) {
-            this.chunksToUpdateFutures.forEach(wo -> wo.updateFutures(wp));
+            this.chunksToUpdateFutures.forEach(yo -> yo.updateFutures(yp));
             this.chunksToUpdateFutures.clear();
             return true;
         }
@@ -103,12 +103,12 @@ public abstract class DistanceManager {
             final LongIterator longIterator5 = this.ticketsToRelease.iterator();
             while (longIterator5.hasNext()) {
                 final long long6 = longIterator5.nextLong();
-                if (this.getTickets(long6).stream().anyMatch(xh -> xh.getType() == TicketType.PLAYER)) {
-                    final ChunkHolder wo2 = wp.getUpdatingChunkIfPresent(long6);
-                    if (wo2 == null) {
+                if (this.getTickets(long6).stream().anyMatch(zh -> zh.getType() == TicketType.PLAYER)) {
+                    final ChunkHolder yo2 = yp.getUpdatingChunkIfPresent(long6);
+                    if (yo2 == null) {
                         throw new IllegalStateException();
                     }
-                    final CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> completableFuture9 = wo2.getEntityTickingChunkFuture();
+                    final CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> completableFuture9 = yo2.getEntityTickingChunkFuture();
                     completableFuture9.thenAccept(either -> this.mainThreadExecutor.execute(() -> this.ticketThrottlerReleaser.tell(ChunkTaskPriorityQueueSorter.release(() -> {}, long6, false))));
                 }
             }
@@ -117,68 +117,68 @@ public abstract class DistanceManager {
         return boolean4;
     }
     
-    private void addTicket(final long long1, final Ticket<?> xh) {
-        final SortedArraySet<Ticket<?>> abw5 = this.getTickets(long1);
-        final int integer6 = getTicketLevelAt(abw5);
-        final Ticket<?> xh2 = abw5.addOrGet(xh);
-        xh2.setCreatedTick(this.ticketTickCounter);
-        if (xh.getTicketLevel() < integer6) {
-            this.ticketTracker.update(long1, xh.getTicketLevel(), true);
+    private void addTicket(final long long1, final Ticket<?> zh) {
+        final SortedArraySet<Ticket<?>> aeg5 = this.getTickets(long1);
+        final int integer6 = getTicketLevelAt(aeg5);
+        final Ticket<?> zh2 = aeg5.addOrGet(zh);
+        zh2.setCreatedTick(this.ticketTickCounter);
+        if (zh.getTicketLevel() < integer6) {
+            this.ticketTracker.update(long1, zh.getTicketLevel(), true);
         }
     }
     
-    private void removeTicket(final long long1, final Ticket<?> xh) {
-        final SortedArraySet<Ticket<?>> abw5 = this.getTickets(long1);
-        if (abw5.remove(xh)) {}
-        if (abw5.isEmpty()) {
+    private void removeTicket(final long long1, final Ticket<?> zh) {
+        final SortedArraySet<Ticket<?>> aeg5 = this.getTickets(long1);
+        if (aeg5.remove(zh)) {}
+        if (aeg5.isEmpty()) {
             this.tickets.remove(long1);
         }
-        this.ticketTracker.update(long1, getTicketLevelAt(abw5), false);
+        this.ticketTracker.update(long1, getTicketLevelAt(aeg5), false);
     }
     
-    public <T> void addTicket(final TicketType<T> xi, final ChunkPos bjh, final int integer, final T object) {
-        this.addTicket(bjh.toLong(), new Ticket<>(xi, integer, object));
+    public <T> void addTicket(final TicketType<T> zi, final ChunkPos bph, final int integer, final T object) {
+        this.addTicket(bph.toLong(), new Ticket<>(zi, integer, object));
     }
     
-    public <T> void removeTicket(final TicketType<T> xi, final ChunkPos bjh, final int integer, final T object) {
-        final Ticket<T> xh6 = new Ticket<T>(xi, integer, object);
-        this.removeTicket(bjh.toLong(), xh6);
+    public <T> void removeTicket(final TicketType<T> zi, final ChunkPos bph, final int integer, final T object) {
+        final Ticket<T> zh6 = new Ticket<T>(zi, integer, object);
+        this.removeTicket(bph.toLong(), zh6);
     }
     
-    public <T> void addRegionTicket(final TicketType<T> xi, final ChunkPos bjh, final int integer, final T object) {
-        this.addTicket(bjh.toLong(), new Ticket<>(xi, 33 - integer, object));
+    public <T> void addRegionTicket(final TicketType<T> zi, final ChunkPos bph, final int integer, final T object) {
+        this.addTicket(bph.toLong(), new Ticket<>(zi, 33 - integer, object));
     }
     
-    public <T> void removeRegionTicket(final TicketType<T> xi, final ChunkPos bjh, final int integer, final T object) {
-        final Ticket<T> xh6 = new Ticket<T>(xi, 33 - integer, object);
-        this.removeTicket(bjh.toLong(), xh6);
+    public <T> void removeRegionTicket(final TicketType<T> zi, final ChunkPos bph, final int integer, final T object) {
+        final Ticket<T> zh6 = new Ticket<T>(zi, 33 - integer, object);
+        this.removeTicket(bph.toLong(), zh6);
     }
     
     private SortedArraySet<Ticket<?>> getTickets(final long long1) {
         return (SortedArraySet<Ticket<?>>)this.tickets.computeIfAbsent(long1, long1 -> SortedArraySet.<Comparable>create(4));
     }
     
-    protected void updateChunkForced(final ChunkPos bjh, final boolean boolean2) {
-        final Ticket<ChunkPos> xh4 = new Ticket<ChunkPos>(TicketType.FORCED, 31, bjh);
+    protected void updateChunkForced(final ChunkPos bph, final boolean boolean2) {
+        final Ticket<ChunkPos> zh4 = new Ticket<ChunkPos>(TicketType.FORCED, 31, bph);
         if (boolean2) {
-            this.addTicket(bjh.toLong(), xh4);
+            this.addTicket(bph.toLong(), zh4);
         }
         else {
-            this.removeTicket(bjh.toLong(), xh4);
+            this.removeTicket(bph.toLong(), zh4);
         }
     }
     
-    public void addPlayer(final SectionPos gd, final ServerPlayer xe) {
-        final long long4 = gd.chunk().toLong();
-        ((ObjectSet)this.playersPerChunk.computeIfAbsent(long4, long1 -> new ObjectOpenHashSet())).add(xe);
+    public void addPlayer(final SectionPos go, final ServerPlayer ze) {
+        final long long4 = go.chunk().toLong();
+        ((ObjectSet)this.playersPerChunk.computeIfAbsent(long4, long1 -> new ObjectOpenHashSet())).add(ze);
         this.naturalSpawnChunkCounter.update(long4, 0, true);
         this.playerTicketManager.update(long4, 0, true);
     }
     
-    public void removePlayer(final SectionPos gd, final ServerPlayer xe) {
-        final long long4 = gd.chunk().toLong();
+    public void removePlayer(final SectionPos go, final ServerPlayer ze) {
+        final long long4 = go.chunk().toLong();
         final ObjectSet<ServerPlayer> objectSet6 = (ObjectSet<ServerPlayer>)this.playersPerChunk.get(long4);
-        objectSet6.remove(xe);
+        objectSet6.remove(ze);
         if (objectSet6.isEmpty()) {
             this.playersPerChunk.remove(long4);
             this.naturalSpawnChunkCounter.update(long4, Integer.MAX_VALUE, false);
@@ -187,13 +187,13 @@ public abstract class DistanceManager {
     }
     
     protected String getTicketDebugString(final long long1) {
-        final SortedArraySet<Ticket<?>> abw4 = (SortedArraySet<Ticket<?>>)this.tickets.get(long1);
+        final SortedArraySet<Ticket<?>> aeg4 = (SortedArraySet<Ticket<?>>)this.tickets.get(long1);
         String string5;
-        if (abw4 == null || abw4.isEmpty()) {
+        if (aeg4 == null || aeg4.isEmpty()) {
             string5 = "no_ticket";
         }
         else {
-            string5 = abw4.first().toString();
+            string5 = aeg4.first().toString();
         }
         return string5;
     }
@@ -296,12 +296,12 @@ public abstract class DistanceManager {
         
         private void onLevelChange(final long long1, final int integer, final boolean boolean3, final boolean boolean4) {
             if (boolean3 != boolean4) {
-                final Ticket<?> xh7 = new Ticket<>(TicketType.PLAYER, DistanceManager.PLAYER_TICKET_LEVEL, new ChunkPos(long1));
+                final Ticket<?> zh7 = new Ticket<>(TicketType.PLAYER, DistanceManager.PLAYER_TICKET_LEVEL, new ChunkPos(long1));
                 if (boolean4) {
-                    final Ticket xh8;
+                    final Ticket zh8;
                     DistanceManager.this.ticketThrottlerInput.tell(ChunkTaskPriorityQueueSorter.message(() -> DistanceManager.this.mainThreadExecutor.execute(() -> {
                         if (this.haveTicketFor(this.getLevel(long1))) {
-                            DistanceManager.this.addTicket(long1, xh8);
+                            DistanceManager.this.addTicket(long1, zh8);
                             DistanceManager.this.ticketsToRelease.add(long1);
                         }
                         else {
@@ -310,7 +310,7 @@ public abstract class DistanceManager {
                     }), long1, () -> integer));
                 }
                 else {
-                    DistanceManager.this.ticketThrottlerReleaser.tell(ChunkTaskPriorityQueueSorter.release(() -> DistanceManager.this.mainThreadExecutor.execute(() -> DistanceManager.this.removeTicket(long1, xh7)), long1, true));
+                    DistanceManager.this.ticketThrottlerReleaser.tell(ChunkTaskPriorityQueueSorter.release(() -> DistanceManager.this.mainThreadExecutor.execute(() -> DistanceManager.this.removeTicket(long1, zh7)), long1, true));
                 }
             }
         }
@@ -354,22 +354,22 @@ public abstract class DistanceManager {
         
         @Override
         protected int getLevelFromSource(final long long1) {
-            final SortedArraySet<Ticket<?>> abw4 = (SortedArraySet<Ticket<?>>)DistanceManager.this.tickets.get(long1);
-            if (abw4 == null) {
+            final SortedArraySet<Ticket<?>> aeg4 = (SortedArraySet<Ticket<?>>)DistanceManager.this.tickets.get(long1);
+            if (aeg4 == null) {
                 return Integer.MAX_VALUE;
             }
-            if (abw4.isEmpty()) {
+            if (aeg4.isEmpty()) {
                 return Integer.MAX_VALUE;
             }
-            return abw4.first().getTicketLevel();
+            return aeg4.first().getTicketLevel();
         }
         
         @Override
         protected int getLevel(final long long1) {
             if (!DistanceManager.this.isChunkToRemove(long1)) {
-                final ChunkHolder wo4 = DistanceManager.this.getChunk(long1);
-                if (wo4 != null) {
-                    return wo4.getTicketLevel();
+                final ChunkHolder yo4 = DistanceManager.this.getChunk(long1);
+                if (yo4 != null) {
+                    return yo4.getTicketLevel();
                 }
             }
             return ChunkMap.MAX_CHUNK_DISTANCE + 1;
@@ -377,14 +377,14 @@ public abstract class DistanceManager {
         
         @Override
         protected void setLevel(final long long1, final int integer) {
-            ChunkHolder wo5 = DistanceManager.this.getChunk(long1);
-            final int integer2 = (wo5 == null) ? (ChunkMap.MAX_CHUNK_DISTANCE + 1) : wo5.getTicketLevel();
+            ChunkHolder yo5 = DistanceManager.this.getChunk(long1);
+            final int integer2 = (yo5 == null) ? (ChunkMap.MAX_CHUNK_DISTANCE + 1) : yo5.getTicketLevel();
             if (integer2 == integer) {
                 return;
             }
-            wo5 = DistanceManager.this.updateChunkScheduling(long1, integer, wo5, integer2);
-            if (wo5 != null) {
-                DistanceManager.this.chunksToUpdateFutures.add(wo5);
+            yo5 = DistanceManager.this.updateChunkScheduling(long1, integer, yo5, integer2);
+            if (yo5 != null) {
+                DistanceManager.this.chunksToUpdateFutures.add(yo5);
             }
         }
         
diff --git a/src/net/minecraft/server/level/PlayerMap.java b/src/net/minecraft/server/level/PlayerMap.java
index 2c5ea27..e254287 100644
--- a/src/net/minecraft/server/level/PlayerMap.java
+++ b/src/net/minecraft/server/level/PlayerMap.java
@@ -15,30 +15,30 @@ public final class PlayerMap {
         return (Stream<ServerPlayer>)this.players.keySet().stream();
     }
     
-    public void addPlayer(final long long1, final ServerPlayer xe, final boolean boolean3) {
-        this.players.put(xe, boolean3);
+    public void addPlayer(final long long1, final ServerPlayer ze, final boolean boolean3) {
+        this.players.put(ze, boolean3);
     }
     
-    public void removePlayer(final long long1, final ServerPlayer xe) {
-        this.players.removeBoolean(xe);
+    public void removePlayer(final long long1, final ServerPlayer ze) {
+        this.players.removeBoolean(ze);
     }
     
-    public void ignorePlayer(final ServerPlayer xe) {
-        this.players.replace(xe, true);
+    public void ignorePlayer(final ServerPlayer ze) {
+        this.players.replace(ze, true);
     }
     
-    public void unIgnorePlayer(final ServerPlayer xe) {
-        this.players.replace(xe, false);
+    public void unIgnorePlayer(final ServerPlayer ze) {
+        this.players.replace(ze, false);
     }
     
-    public boolean ignoredOrUnknown(final ServerPlayer xe) {
-        return this.players.getOrDefault(xe, true);
+    public boolean ignoredOrUnknown(final ServerPlayer ze) {
+        return this.players.getOrDefault(ze, true);
     }
     
-    public boolean ignored(final ServerPlayer xe) {
-        return this.players.getBoolean(xe);
+    public boolean ignored(final ServerPlayer ze) {
+        return this.players.getBoolean(ze);
     }
     
-    public void updatePlayer(final long long1, final long long2, final ServerPlayer xe) {
+    public void updatePlayer(final long long1, final long long2, final ServerPlayer ze) {
     }
 }
diff --git a/src/net/minecraft/server/level/PlayerRespawnLogic.java b/src/net/minecraft/server/level/PlayerRespawnLogic.java
new file mode 100644
index 0000000..68d972f
--- /dev/null
+++ b/src/net/minecraft/server/level/PlayerRespawnLogic.java
@@ -0,0 +1,58 @@
+package net.minecraft.server.level;
+
+import net.minecraft.world.level.ChunkPos;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.core.BlockPos;
+
+public class PlayerRespawnLogic {
+    @Nullable
+    protected static BlockPos getOverworldRespawnPos(final ServerLevel zd, final int integer2, final int integer3, final boolean boolean4) {
+        final BlockPos.MutableBlockPos a5 = new BlockPos.MutableBlockPos(integer2, 0, integer3);
+        final Biome bre6 = zd.getBiome(a5);
+        final boolean boolean5 = zd.dimensionType().hasCeiling();
+        final BlockState cfj8 = bre6.getSurfaceBuilderConfig().getTopMaterial();
+        if (boolean4 && !cfj8.getBlock().is(BlockTags.VALID_SPAWN)) {
+            return null;
+        }
+        final LevelChunk chj9 = zd.getChunk(integer2 >> 4, integer3 >> 4);
+        final int integer4 = boolean5 ? zd.getChunkSource().getGenerator().getSpawnHeight() : chj9.getHeight(Heightmap.Types.MOTION_BLOCKING, integer2 & 0xF, integer3 & 0xF);
+        if (integer4 < 0) {
+            return null;
+        }
+        final int integer5 = chj9.getHeight(Heightmap.Types.WORLD_SURFACE, integer2 & 0xF, integer3 & 0xF);
+        if (integer5 <= integer4 && integer5 > chj9.getHeight(Heightmap.Types.OCEAN_FLOOR, integer2 & 0xF, integer3 & 0xF)) {
+            return null;
+        }
+        for (int integer6 = integer4 + 1; integer6 >= 0; --integer6) {
+            a5.set(integer2, integer6, integer3);
+            final BlockState cfj9 = zd.getBlockState(a5);
+            if (!cfj9.getFluidState().isEmpty()) {
+                break;
+            }
+            if (cfj9.equals(cfj8)) {
+                return a5.above().immutable();
+            }
+        }
+        return null;
+    }
+    
+    @Nullable
+    public static BlockPos getSpawnPosInChunk(final ServerLevel zd, final ChunkPos bph, final boolean boolean3) {
+        for (int integer4 = bph.getMinBlockX(); integer4 <= bph.getMaxBlockX(); ++integer4) {
+            for (int integer5 = bph.getMinBlockZ(); integer5 <= bph.getMaxBlockZ(); ++integer5) {
+                final BlockPos fu6 = getOverworldRespawnPos(zd, integer4, integer5, boolean3);
+                if (fu6 != null) {
+                    return fu6;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/net/minecraft/server/level/ServerBossEvent.java b/src/net/minecraft/server/level/ServerBossEvent.java
index a2b5062..1cad6e8 100644
--- a/src/net/minecraft/server/level/ServerBossEvent.java
+++ b/src/net/minecraft/server/level/ServerBossEvent.java
@@ -18,8 +18,8 @@ public class ServerBossEvent extends BossEvent {
     private final Set<ServerPlayer> unmodifiablePlayers;
     private boolean visible;
     
-    public ServerBossEvent(final Component lf, final BossBarColor a, final BossBarOverlay b) {
-        super(Mth.createInsecureUUID(), lf, a, b);
+    public ServerBossEvent(final Component mr, final BossBarColor a, final BossBarOverlay b) {
+        super(Mth.createInsecureUUID(), mr, a, b);
         this.players = Sets.newHashSet();
         this.unmodifiablePlayers = Collections.<ServerPlayer>unmodifiableSet(this.players);
         this.visible = true;
@@ -77,38 +77,38 @@ public class ServerBossEvent extends BossEvent {
     }
     
     @Override
-    public void setName(final Component lf) {
-        if (!Objects.equal(lf, this.name)) {
-            super.setName(lf);
+    public void setName(final Component mr) {
+        if (!Objects.equal(mr, this.name)) {
+            super.setName(mr);
             this.broadcast(ClientboundBossEventPacket.Operation.UPDATE_NAME);
         }
     }
     
     private void broadcast(final ClientboundBossEventPacket.Operation a) {
         if (this.visible) {
-            final ClientboundBossEventPacket mk3 = new ClientboundBossEventPacket(a, this);
-            for (final ServerPlayer xe5 : this.players) {
-                xe5.connection.send(mk3);
+            final ClientboundBossEventPacket ny3 = new ClientboundBossEventPacket(a, this);
+            for (final ServerPlayer ze5 : this.players) {
+                ze5.connection.send(ny3);
             }
         }
     }
     
-    public void addPlayer(final ServerPlayer xe) {
-        if (this.players.add(xe) && this.visible) {
-            xe.connection.send(new ClientboundBossEventPacket(ClientboundBossEventPacket.Operation.ADD, this));
+    public void addPlayer(final ServerPlayer ze) {
+        if (this.players.add(ze) && this.visible) {
+            ze.connection.send(new ClientboundBossEventPacket(ClientboundBossEventPacket.Operation.ADD, this));
         }
     }
     
-    public void removePlayer(final ServerPlayer xe) {
-        if (this.players.remove(xe) && this.visible) {
-            xe.connection.send(new ClientboundBossEventPacket(ClientboundBossEventPacket.Operation.REMOVE, this));
+    public void removePlayer(final ServerPlayer ze) {
+        if (this.players.remove(ze) && this.visible) {
+            ze.connection.send(new ClientboundBossEventPacket(ClientboundBossEventPacket.Operation.REMOVE, this));
         }
     }
     
     public void removeAllPlayers() {
         if (!this.players.isEmpty()) {
-            for (final ServerPlayer xe3 : Lists.<ServerPlayer>newArrayList(this.players)) {
-                this.removePlayer(xe3);
+            for (final ServerPlayer ze3 : Lists.<ServerPlayer>newArrayList(this.players)) {
+                this.removePlayer(ze3);
             }
         }
     }
@@ -120,8 +120,8 @@ public class ServerBossEvent extends BossEvent {
     public void setVisible(final boolean boolean1) {
         if (boolean1 != this.visible) {
             this.visible = boolean1;
-            for (final ServerPlayer xe4 : this.players) {
-                xe4.connection.send(new ClientboundBossEventPacket(boolean1 ? ClientboundBossEventPacket.Operation.ADD : ClientboundBossEventPacket.Operation.REMOVE, this));
+            for (final ServerPlayer ze4 : this.players) {
+                ze4.connection.send(new ClientboundBossEventPacket(boolean1 ? ClientboundBossEventPacket.Operation.ADD : ClientboundBossEventPacket.Operation.REMOVE, this));
             }
         }
     }
diff --git a/src/net/minecraft/server/level/ServerChunkCache.java b/src/net/minecraft/server/level/ServerChunkCache.java
index e410259..9b1b717 100644
--- a/src/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/net/minecraft/server/level/ServerChunkCache.java
@@ -1,6 +1,5 @@
 package net.minecraft.server.level;
 
-import net.minecraft.core.Registry;
 import java.util.concurrent.CompletionStage;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.entity.ai.village.poi.PoiManager;
@@ -8,12 +7,11 @@ import net.minecraft.network.protocol.Packet;
 import net.minecraft.core.SectionPos;
 import net.minecraft.world.level.LightLayer;
 import com.google.common.annotations.VisibleForTesting;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import java.util.function.Consumer;
 import net.minecraft.world.level.storage.LevelData;
-import net.minecraft.world.level.NaturalSpawner;
-import net.minecraft.world.entity.MobCategory;
+import java.util.Collections;
+import com.google.common.collect.Lists;
 import net.minecraft.world.level.GameRules;
-import net.minecraft.world.level.LevelType;
 import java.util.function.BooleanSupplier;
 import java.io.IOException;
 import java.util.function.Function;
@@ -29,16 +27,18 @@ import net.minecraft.Util;
 import com.mojang.datafixers.util.Either;
 import net.minecraft.world.level.ChunkPos;
 import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nullable;
 import net.minecraft.world.level.chunk.LightChunkGetter;
 import net.minecraft.util.thread.BlockableEventLoop;
+import java.io.File;
 import net.minecraft.world.level.Level;
 import java.util.function.Supplier;
 import net.minecraft.server.level.progress.ChunkProgressListener;
 import java.util.concurrent.Executor;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import com.mojang.datafixers.DataFixer;
-import java.io.File;
+import net.minecraft.world.level.storage.LevelStorageSource;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.NaturalSpawner;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.storage.DimensionDataStorage;
 import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -47,10 +47,9 @@ import java.util.List;
 import net.minecraft.world.level.chunk.ChunkSource;
 
 public class ServerChunkCache extends ChunkSource {
-    private static final int MAGIC_NUMBER;
     private static final List<ChunkStatus> CHUNK_STATUSES;
     private final DistanceManager distanceManager;
-    private final ChunkGenerator<?> generator;
+    private final ChunkGenerator generator;
     private final ServerLevel level;
     private final Thread mainThread;
     private final ThreadedLevelLightEngine lightEngine;
@@ -63,22 +62,24 @@ public class ServerChunkCache extends ChunkSource {
     private final long[] lastChunkPos;
     private final ChunkStatus[] lastChunkStatus;
     private final ChunkAccess[] lastChunk;
+    @Nullable
+    private NaturalSpawner.SpawnState lastSpawnState;
     
-    public ServerChunkCache(final ServerLevel xd, final File file, final DataFixer dataFixer, final StructureManager cmo, final Executor executor, final ChunkGenerator<?> caa, final int integer, final ChunkProgressListener xm, final Supplier<DimensionDataStorage> supplier) {
+    public ServerChunkCache(final ServerLevel zd, final LevelStorageSource.LevelStorageAccess a, final DataFixer dataFixer, final StructureManager cva, final Executor executor, final ChunkGenerator cha, final int integer, final boolean boolean8, final ChunkProgressListener zm, final Supplier<DimensionDataStorage> supplier) {
         this.spawnEnemies = true;
         this.spawnFriendlies = true;
         this.lastChunkPos = new long[4];
         this.lastChunkStatus = new ChunkStatus[4];
         this.lastChunk = new ChunkAccess[4];
-        this.level = xd;
-        this.mainThreadProcessor = new MainThreadExecutor((Level)xd);
-        this.generator = caa;
+        this.level = zd;
+        this.mainThreadProcessor = new MainThreadExecutor((Level)zd);
+        this.generator = cha;
         this.mainThread = Thread.currentThread();
-        final File file2 = xd.getDimension().getType().getStorageFolder(file);
-        final File file3 = new File(file2, "data");
-        file3.mkdirs();
-        this.dataStorage = new DimensionDataStorage(file3, dataFixer);
-        this.chunkMap = new ChunkMap(xd, file, dataFixer, cmo, executor, this.mainThreadProcessor, this, this.getGenerator(), xm, supplier, integer);
+        final File file12 = a.getDimensionPath(zd.dimension());
+        final File file13 = new File(file12, "data");
+        file13.mkdirs();
+        this.dataStorage = new DimensionDataStorage(file13, dataFixer);
+        this.chunkMap = new ChunkMap(zd, a, dataFixer, cva, executor, this.mainThreadProcessor, this, this.getGenerator(), zm, supplier, integer, boolean8);
         this.lightEngine = this.chunkMap.getLightEngine();
         this.distanceManager = this.chunkMap.getDistanceManager();
         this.clearCache();
@@ -98,39 +99,39 @@ public class ServerChunkCache extends ChunkSource {
         return this.chunkMap.getTickingGenerated();
     }
     
-    private void storeInCache(final long long1, final ChunkAccess bzy, final ChunkStatus cae) {
+    private void storeInCache(final long long1, final ChunkAccess cgy, final ChunkStatus chc) {
         for (int integer6 = 3; integer6 > 0; --integer6) {
             this.lastChunkPos[integer6] = this.lastChunkPos[integer6 - 1];
             this.lastChunkStatus[integer6] = this.lastChunkStatus[integer6 - 1];
             this.lastChunk[integer6] = this.lastChunk[integer6 - 1];
         }
         this.lastChunkPos[0] = long1;
-        this.lastChunkStatus[0] = cae;
-        this.lastChunk[0] = bzy;
+        this.lastChunkStatus[0] = chc;
+        this.lastChunk[0] = cgy;
     }
     
     @Nullable
     @Override
-    public ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus cae, final boolean boolean4) {
+    public ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus chc, final boolean boolean4) {
         if (Thread.currentThread() != this.mainThread) {
-            return CompletableFuture.<ChunkAccess>supplyAsync(() -> this.getChunk(integer1, integer2, cae, boolean4), this.mainThreadProcessor).join();
+            return CompletableFuture.<ChunkAccess>supplyAsync(() -> this.getChunk(integer1, integer2, chc, boolean4), this.mainThreadProcessor).join();
         }
-        final ProfilerFiller aio6 = this.level.getProfiler();
-        aio6.incrementCounter("getChunk");
+        final ProfilerFiller ami6 = this.level.getProfiler();
+        ami6.incrementCounter("getChunk");
         final long long7 = ChunkPos.asLong(integer1, integer2);
         for (int integer3 = 0; integer3 < 4; ++integer3) {
-            if (long7 == this.lastChunkPos[integer3] && cae == this.lastChunkStatus[integer3]) {
-                final ChunkAccess bzy2 = this.lastChunk[integer3];
-                if (bzy2 != null || !boolean4) {
-                    return bzy2;
+            if (long7 == this.lastChunkPos[integer3] && chc == this.lastChunkStatus[integer3]) {
+                final ChunkAccess cgy2 = this.lastChunk[integer3];
+                if (cgy2 != null || !boolean4) {
+                    return cgy2;
                 }
             }
         }
-        aio6.incrementCounter("getChunkCacheMiss");
-        final CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> completableFuture9 = this.getChunkFutureMainThread(integer1, integer2, cae, boolean4);
+        ami6.incrementCounter("getChunkCacheMiss");
+        final CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> completableFuture9 = this.getChunkFutureMainThread(integer1, integer2, chc, boolean4);
         this.mainThreadProcessor.managedBlock(completableFuture9::isDone);
         final IllegalStateException throwable;
-        final ChunkAccess bzy2 = (ChunkAccess)completableFuture9.join().map(bzy -> bzy, a -> {
+        final ChunkAccess cgy2 = (ChunkAccess)completableFuture9.join().map(cgy -> cgy, a -> {
             if (boolean4) {
                 new IllegalStateException("Chunk not there when requested: " + a);
                 throw Util.<IllegalStateException>pauseInIde(throwable);
@@ -139,8 +140,8 @@ public class ServerChunkCache extends ChunkSource {
                 return null;
             }
         });
-        this.storeInCache(long7, bzy2, cae);
-        return bzy2;
+        this.storeInCache(long7, cgy2, chc);
+        return cgy2;
     }
     
     @Nullable
@@ -153,23 +154,23 @@ public class ServerChunkCache extends ChunkSource {
         final long long4 = ChunkPos.asLong(integer1, integer2);
         for (int integer3 = 0; integer3 < 4; ++integer3) {
             if (long4 == this.lastChunkPos[integer3] && this.lastChunkStatus[integer3] == ChunkStatus.FULL) {
-                final ChunkAccess bzy7 = this.lastChunk[integer3];
-                return (bzy7 instanceof LevelChunk) ? ((LevelChunk)bzy7) : null;
+                final ChunkAccess cgy7 = this.lastChunk[integer3];
+                return (cgy7 instanceof LevelChunk) ? ((LevelChunk)cgy7) : null;
             }
         }
-        final ChunkHolder wo6 = this.getVisibleChunkIfPresent(long4);
-        if (wo6 == null) {
+        final ChunkHolder yo6 = this.getVisibleChunkIfPresent(long4);
+        if (yo6 == null) {
             return null;
         }
-        final Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure> either7 = wo6.getFutureIfPresent(ChunkStatus.FULL).getNow(null);
+        final Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure> either7 = yo6.getFutureIfPresent(ChunkStatus.FULL).getNow(null);
         if (either7 == null) {
             return null;
         }
-        final ChunkAccess bzy8 = either7.left().orElse(null);
-        if (bzy8 != null) {
-            this.storeInCache(long4, bzy8, ChunkStatus.FULL);
-            if (bzy8 instanceof LevelChunk) {
-                return (LevelChunk)bzy8;
+        final ChunkAccess cgy8 = either7.left().orElse(null);
+        if (cgy8 != null) {
+            this.storeInCache(long4, cgy8, ChunkStatus.FULL);
+            if (cgy8 instanceof LevelChunk) {
+                return (LevelChunk)cgy8;
             }
         }
         return null;
@@ -181,69 +182,69 @@ public class ServerChunkCache extends ChunkSource {
         Arrays.fill(this.lastChunk, null);
     }
     
-    public CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> getChunkFuture(final int integer1, final int integer2, final ChunkStatus cae, final boolean boolean4) {
+    public CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> getChunkFuture(final int integer1, final int integer2, final ChunkStatus chc, final boolean boolean4) {
         final boolean boolean5 = Thread.currentThread() == this.mainThread;
         CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> completableFuture2;
         if (boolean5) {
-            completableFuture2 = this.getChunkFutureMainThread(integer1, integer2, cae, boolean4);
+            completableFuture2 = this.getChunkFutureMainThread(integer1, integer2, chc, boolean4);
             this.mainThreadProcessor.managedBlock(completableFuture2::isDone);
         }
         else {
-            completableFuture2 = CompletableFuture.<CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>>supplyAsync(() -> this.getChunkFutureMainThread(integer1, integer2, cae, boolean4), this.mainThreadProcessor).<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>thenCompose(completableFuture -> completableFuture);
+            completableFuture2 = CompletableFuture.<CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>>supplyAsync(() -> this.getChunkFutureMainThread(integer1, integer2, chc, boolean4), this.mainThreadProcessor).<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>thenCompose(completableFuture -> completableFuture);
         }
         return completableFuture2;
     }
     
-    private CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> getChunkFutureMainThread(final int integer1, final int integer2, final ChunkStatus cae, final boolean boolean4) {
-        final ChunkPos bjh6 = new ChunkPos(integer1, integer2);
-        final long long7 = bjh6.toLong();
-        final int integer3 = 33 + ChunkStatus.getDistance(cae);
-        ChunkHolder wo10 = this.getVisibleChunkIfPresent(long7);
+    private CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> getChunkFutureMainThread(final int integer1, final int integer2, final ChunkStatus chc, final boolean boolean4) {
+        final ChunkPos bph6 = new ChunkPos(integer1, integer2);
+        final long long7 = bph6.toLong();
+        final int integer3 = 33 + ChunkStatus.getDistance(chc);
+        ChunkHolder yo10 = this.getVisibleChunkIfPresent(long7);
         if (boolean4) {
-            this.distanceManager.<ChunkPos>addTicket(TicketType.UNKNOWN, bjh6, integer3, bjh6);
-            if (this.chunkAbsent(wo10, integer3)) {
-                final ProfilerFiller aio11 = this.level.getProfiler();
-                aio11.push("chunkLoad");
+            this.distanceManager.<ChunkPos>addTicket(TicketType.UNKNOWN, bph6, integer3, bph6);
+            if (this.chunkAbsent(yo10, integer3)) {
+                final ProfilerFiller ami11 = this.level.getProfiler();
+                ami11.push("chunkLoad");
                 this.runDistanceManagerUpdates();
-                wo10 = this.getVisibleChunkIfPresent(long7);
-                aio11.pop();
-                if (this.chunkAbsent(wo10, integer3)) {
+                yo10 = this.getVisibleChunkIfPresent(long7);
+                ami11.pop();
+                if (this.chunkAbsent(yo10, integer3)) {
                     throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("No chunk holder after ticket has been added"));
                 }
             }
         }
-        if (this.chunkAbsent(wo10, integer3)) {
+        if (this.chunkAbsent(yo10, integer3)) {
             return ChunkHolder.UNLOADED_CHUNK_FUTURE;
         }
-        return wo10.getOrScheduleFuture(cae, this.chunkMap);
+        return yo10.getOrScheduleFuture(chc, this.chunkMap);
     }
     
-    private boolean chunkAbsent(@Nullable final ChunkHolder wo, final int integer) {
-        return wo == null || wo.getTicketLevel() > integer;
+    private boolean chunkAbsent(@Nullable final ChunkHolder yo, final int integer) {
+        return yo == null || yo.getTicketLevel() > integer;
     }
     
     @Override
     public boolean hasChunk(final int integer1, final int integer2) {
-        final ChunkHolder wo4 = this.getVisibleChunkIfPresent(new ChunkPos(integer1, integer2).toLong());
+        final ChunkHolder yo4 = this.getVisibleChunkIfPresent(new ChunkPos(integer1, integer2).toLong());
         final int integer3 = 33 + ChunkStatus.getDistance(ChunkStatus.FULL);
-        return !this.chunkAbsent(wo4, integer3);
+        return !this.chunkAbsent(yo4, integer3);
     }
     
     @Override
     public BlockGetter getChunkForLighting(final int integer1, final int integer2) {
         final long long4 = ChunkPos.asLong(integer1, integer2);
-        final ChunkHolder wo6 = this.getVisibleChunkIfPresent(long4);
-        if (wo6 == null) {
+        final ChunkHolder yo6 = this.getVisibleChunkIfPresent(long4);
+        if (yo6 == null) {
             return null;
         }
         int integer3 = ServerChunkCache.CHUNK_STATUSES.size() - 1;
         while (true) {
-            final ChunkStatus cae8 = ServerChunkCache.CHUNK_STATUSES.get(integer3);
-            final Optional<ChunkAccess> optional9 = (Optional<ChunkAccess>)wo6.getFutureIfPresentUnchecked(cae8).getNow(ChunkHolder.UNLOADED_CHUNK).left();
+            final ChunkStatus chc8 = ServerChunkCache.CHUNK_STATUSES.get(integer3);
+            final Optional<ChunkAccess> optional9 = (Optional<ChunkAccess>)yo6.getFutureIfPresentUnchecked(chc8).getNow(ChunkHolder.UNLOADED_CHUNK).left();
             if (optional9.isPresent()) {
                 return optional9.get();
             }
-            if (cae8 == ChunkStatus.LIGHT.getParent()) {
+            if (chc8 == ChunkStatus.LIGHT.getParent()) {
                 return null;
             }
             --integer3;
@@ -270,33 +271,28 @@ public class ServerChunkCache extends ChunkSource {
     }
     
     @Override
-    public boolean isEntityTickingChunk(final Entity akq) {
-        final long long3 = ChunkPos.asLong(Mth.floor(akq.getX()) >> 4, Mth.floor(akq.getZ()) >> 4);
+    public boolean isEntityTickingChunk(final Entity aom) {
+        final long long3 = ChunkPos.asLong(Mth.floor(aom.getX()) >> 4, Mth.floor(aom.getZ()) >> 4);
         return this.checkChunkFuture(long3, ChunkHolder::getEntityTickingChunkFuture);
     }
     
     @Override
-    public boolean isEntityTickingChunk(final ChunkPos bjh) {
-        return this.checkChunkFuture(bjh.toLong(), ChunkHolder::getEntityTickingChunkFuture);
+    public boolean isEntityTickingChunk(final ChunkPos bph) {
+        return this.checkChunkFuture(bph.toLong(), ChunkHolder::getEntityTickingChunkFuture);
     }
     
     @Override
-    public boolean isTickingChunk(final BlockPos fk) {
-        final long long3 = ChunkPos.asLong(fk.getX() >> 4, fk.getZ() >> 4);
+    public boolean isTickingChunk(final BlockPos fu) {
+        final long long3 = ChunkPos.asLong(fu.getX() >> 4, fu.getZ() >> 4);
         return this.checkChunkFuture(long3, ChunkHolder::getTickingChunkFuture);
     }
     
-    public boolean isInAccessibleChunk(final Entity akq) {
-        final long long3 = ChunkPos.asLong(Mth.floor(akq.getX()) >> 4, Mth.floor(akq.getZ()) >> 4);
-        return this.checkChunkFuture(long3, ChunkHolder::getFullChunkFuture);
-    }
-    
     private boolean checkChunkFuture(final long long1, final Function<ChunkHolder, CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>>> function) {
-        final ChunkHolder wo5 = this.getVisibleChunkIfPresent(long1);
-        if (wo5 == null) {
+        final ChunkHolder yo5 = this.getVisibleChunkIfPresent(long1);
+        if (yo5 == null) {
             return false;
         }
-        final Either<LevelChunk, ChunkHolder.ChunkLoadingFailure> either6 = function.apply(wo5).getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK);
+        final Either<LevelChunk, ChunkHolder.ChunkLoadingFailure> either6 = function.apply(yo5).getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK);
         return either6.left().isPresent();
     }
     
@@ -312,7 +308,6 @@ public class ServerChunkCache extends ChunkSource {
         this.chunkMap.close();
     }
     
-    @Override
     public void tick(final BooleanSupplier booleanSupplier) {
         this.level.getProfiler().push("purge");
         this.distanceManager.purgeStaleTickets();
@@ -329,77 +324,62 @@ public class ServerChunkCache extends ChunkSource {
         final long long2 = this.level.getGameTime();
         final long long3 = long2 - this.lastInhabitedUpdate;
         this.lastInhabitedUpdate = long2;
-        final LevelData crm6 = this.level.getLevelData();
-        final boolean boolean7 = crm6.getGeneratorType() == LevelType.DEBUG_ALL_BLOCK_STATES;
+        final LevelData dab6 = this.level.getLevelData();
+        final boolean boolean7 = this.level.isDebug();
         final boolean boolean8 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING);
         if (!boolean7) {
             this.level.getProfiler().push("pollingChunks");
             final int integer9 = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
-            final BlockPos fk10 = this.level.getSharedSpawnPos();
-            final boolean boolean9 = crm6.getGameTime() % 400L == 0L;
+            final boolean boolean9 = dab6.getGameTime() % 400L == 0L;
             this.level.getProfiler().push("naturalSpawnCount");
             final int integer10 = this.distanceManager.getNaturalSpawnChunkCount();
-            final MobCategory[] arr13 = MobCategory.values();
-            final Object2IntMap<MobCategory> object2IntMap14 = this.level.getMobCategoryCounts();
+            final NaturalSpawner.SpawnState d12 = NaturalSpawner.createState(integer10, this.level.getAllEntities(), this::getFullChunk);
+            this.lastSpawnState = d12;
             this.level.getProfiler().pop();
-            final Optional<LevelChunk> optional12;
-            LevelChunk cal13;
-            ChunkPos bjh14;
+            final List<ChunkHolder> list13 = Lists.newArrayList(this.chunkMap.getChunks());
+            Collections.shuffle(list13);
+            final Optional<LevelChunk> optional9;
+            Optional<LevelChunk> optional10;
+            LevelChunk chj11;
+            ChunkPos bph12;
             final long n;
             final boolean b;
-            final MobCategory[] array;
-            int length;
-            int i = 0;
-            MobCategory alb18;
-            final boolean b2;
-            final int n2;
-            int integer11;
-            final Object2IntMap object2IntMap15;
-            final BlockPos fk11;
-            final int integer12;
-            this.chunkMap.getChunks().forEach(wo -> {
-                optional12 = (Optional<LevelChunk>)wo.getEntityTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK).left();
-                if (!optional12.isPresent()) {
+            final NaturalSpawner.SpawnState d13;
+            final boolean boolean10;
+            final int integer11;
+            list13.forEach(yo -> {
+                optional9 = (Optional<LevelChunk>)yo.getTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK).left();
+                if (!optional9.isPresent()) {
                     return;
                 }
                 else {
-                    cal13 = optional12.get();
                     this.level.getProfiler().push("broadcast");
-                    wo.broadcastChanges(cal13);
+                    yo.broadcastChanges(optional9.get());
                     this.level.getProfiler().pop();
-                    bjh14 = wo.getPos();
-                    if (this.chunkMap.noPlayersCloseForSpawning(bjh14)) {
+                    optional10 = (Optional<LevelChunk>)yo.getEntityTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK).left();
+                    if (!optional10.isPresent()) {
                         return;
                     }
                     else {
-                        cal13.setInhabitedTime(cal13.getInhabitedTime() + n);
-                        if (b && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(cal13.getPos())) {
-                            this.level.getProfiler().push("spawner");
-                            for (length = array.length; i < length; ++i) {
-                                alb18 = array[i];
-                                if (alb18 != MobCategory.MISC) {
-                                    if (!alb18.isFriendly() || this.spawnFriendlies) {
-                                        if (alb18.isFriendly() || this.spawnEnemies) {
-                                            if (!alb18.isPersistent() || b2) {
-                                                integer11 = alb18.getMaxInstancesPerChunk() * n2 / ServerChunkCache.MAGIC_NUMBER;
-                                                if (object2IntMap15.getInt(alb18) <= integer11) {
-                                                    NaturalSpawner.spawnCategoryForChunk(alb18, this.level, cal13, fk11);
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            this.level.getProfiler().pop();
+                        chj11 = optional10.get();
+                        bph12 = yo.getPos();
+                        if (this.chunkMap.noPlayersCloseForSpawning(bph12)) {
+                            return;
+                        }
+                        else {
+                            chj11.setInhabitedTime(chj11.getInhabitedTime() + n);
+                            if (b && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chj11.getPos())) {
+                                NaturalSpawner.spawnForChunk(this.level, chj11, d13, this.spawnFriendlies, this.spawnEnemies, boolean10);
+                            }
+                            this.level.tickChunk(chj11, integer11);
+                            return;
                         }
-                        this.level.tickChunk(cal13, integer12);
-                        return;
                     }
                 }
             });
             this.level.getProfiler().push("customSpawners");
             if (boolean8) {
-                this.generator.tickCustomSpawners(this.level, this.spawnEnemies, this.spawnFriendlies);
+                this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
             }
             this.level.getProfiler().pop();
             this.level.getProfiler().pop();
@@ -407,6 +387,13 @@ public class ServerChunkCache extends ChunkSource {
         this.chunkMap.tick();
     }
     
+    private void getFullChunk(final long long1, final Consumer<LevelChunk> consumer) {
+        final ChunkHolder yo5 = this.getVisibleChunkIfPresent(long1);
+        if (yo5 != null) {
+            yo5.getFullChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK).left().ifPresent(consumer);
+        }
+    }
+    
     @Override
     public String gatherStats() {
         return "ServerChunkCache: " + this.getLoadedChunksCount();
@@ -417,7 +404,7 @@ public class ServerChunkCache extends ChunkSource {
         return this.mainThreadProcessor.getPendingTasksCount();
     }
     
-    public ChunkGenerator<?> getGenerator() {
+    public ChunkGenerator getGenerator() {
         return this.generator;
     }
     
@@ -425,57 +412,57 @@ public class ServerChunkCache extends ChunkSource {
         return this.chunkMap.size();
     }
     
-    public void blockChanged(final BlockPos fk) {
-        final int integer3 = fk.getX() >> 4;
-        final int integer4 = fk.getZ() >> 4;
-        final ChunkHolder wo5 = this.getVisibleChunkIfPresent(ChunkPos.asLong(integer3, integer4));
-        if (wo5 != null) {
-            wo5.blockChanged(fk.getX() & 0xF, fk.getY(), fk.getZ() & 0xF);
+    public void blockChanged(final BlockPos fu) {
+        final int integer3 = fu.getX() >> 4;
+        final int integer4 = fu.getZ() >> 4;
+        final ChunkHolder yo5 = this.getVisibleChunkIfPresent(ChunkPos.asLong(integer3, integer4));
+        if (yo5 != null) {
+            yo5.blockChanged(fu.getX() & 0xF, fu.getY(), fu.getZ() & 0xF);
         }
     }
     
     @Override
-    public void onLightUpdate(final LightLayer bkf, final SectionPos gd) {
-        final ChunkHolder wo4;
+    public void onLightUpdate(final LightLayer bqi, final SectionPos go) {
+        final ChunkHolder yo4;
         this.mainThreadProcessor.execute(() -> {
-            wo4 = this.getVisibleChunkIfPresent(gd.chunk().toLong());
-            if (wo4 != null) {
-                wo4.sectionLightChanged(bkf, gd.y());
+            yo4 = this.getVisibleChunkIfPresent(go.chunk().toLong());
+            if (yo4 != null) {
+                yo4.sectionLightChanged(bqi, go.y());
             }
         });
     }
     
-    public <T> void addRegionTicket(final TicketType<T> xi, final ChunkPos bjh, final int integer, final T object) {
-        this.distanceManager.<T>addRegionTicket(xi, bjh, integer, object);
+    public <T> void addRegionTicket(final TicketType<T> zi, final ChunkPos bph, final int integer, final T object) {
+        this.distanceManager.<T>addRegionTicket(zi, bph, integer, object);
     }
     
-    public <T> void removeRegionTicket(final TicketType<T> xi, final ChunkPos bjh, final int integer, final T object) {
-        this.distanceManager.<T>removeRegionTicket(xi, bjh, integer, object);
+    public <T> void removeRegionTicket(final TicketType<T> zi, final ChunkPos bph, final int integer, final T object) {
+        this.distanceManager.<T>removeRegionTicket(zi, bph, integer, object);
     }
     
     @Override
-    public void updateChunkForced(final ChunkPos bjh, final boolean boolean2) {
-        this.distanceManager.updateChunkForced(bjh, boolean2);
+    public void updateChunkForced(final ChunkPos bph, final boolean boolean2) {
+        this.distanceManager.updateChunkForced(bph, boolean2);
     }
     
-    public void move(final ServerPlayer xe) {
-        this.chunkMap.move(xe);
+    public void move(final ServerPlayer ze) {
+        this.chunkMap.move(ze);
     }
     
-    public void removeEntity(final Entity akq) {
-        this.chunkMap.removeEntity(akq);
+    public void removeEntity(final Entity aom) {
+        this.chunkMap.removeEntity(aom);
     }
     
-    public void addEntity(final Entity akq) {
-        this.chunkMap.addEntity(akq);
+    public void addEntity(final Entity aom) {
+        this.chunkMap.addEntity(aom);
     }
     
-    public void broadcastAndSend(final Entity akq, final Packet<?> lt) {
-        this.chunkMap.broadcastAndSend(akq, lt);
+    public void broadcastAndSend(final Entity aom, final Packet<?> ni) {
+        this.chunkMap.broadcastAndSend(aom, ni);
     }
     
-    public void broadcast(final Entity akq, final Packet<?> lt) {
-        this.chunkMap.broadcast(akq, lt);
+    public void broadcast(final Entity aom, final Packet<?> ni) {
+        this.chunkMap.broadcast(aom, ni);
     }
     
     public void setViewDistance(final int integer) {
@@ -488,8 +475,8 @@ public class ServerChunkCache extends ChunkSource {
         this.spawnFriendlies = boolean2;
     }
     
-    public String getChunkDebugData(final ChunkPos bjh) {
-        return this.chunkMap.getChunkDebugData(bjh);
+    public String getChunkDebugData(final ChunkPos bph) {
+        return this.chunkMap.getChunkDebugData(bph);
     }
     
     public DimensionDataStorage getDataStorage() {
@@ -500,14 +487,18 @@ public class ServerChunkCache extends ChunkSource {
         return this.chunkMap.getPoiManager();
     }
     
+    @Nullable
+    public NaturalSpawner.SpawnState getLastSpawnState() {
+        return this.lastSpawnState;
+    }
+    
     static {
-        MAGIC_NUMBER = (int)Math.pow(17.0, 2.0);
         CHUNK_STATUSES = ChunkStatus.getStatusList();
     }
     
     final class MainThreadExecutor extends BlockableEventLoop<Runnable> {
-        private MainThreadExecutor(final Level bjw) {
-            super("Chunk source main thread executor for " + Registry.DIMENSION_TYPE.getKey(bjw.getDimension().getType()));
+        private MainThreadExecutor(final Level bqb) {
+            super("Chunk source main thread executor for " + bqb.dimension().location());
         }
         
         @Override
diff --git a/src/net/minecraft/server/level/ServerEntity.java b/src/net/minecraft/server/level/ServerEntity.java
index 29b3809..d95f8db 100644
--- a/src/net/minecraft/server/level/ServerEntity.java
+++ b/src/net/minecraft/server/level/ServerEntity.java
@@ -9,11 +9,12 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
 import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.network.protocol.game.ClientboundSetEquippedItemPacket;
+import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
+import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.entity.EquipmentSlot;
+import com.google.common.collect.Lists;
 import net.minecraft.network.protocol.game.ClientboundAddMobPacket;
 import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket;
-import net.minecraft.world.entity.ai.attributes.ModifiableAttributeMap;
 import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
 import java.util.Iterator;
 import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
@@ -58,19 +59,19 @@ public class ServerEntity {
     private boolean wasRiding;
     private boolean wasOnGround;
     
-    public ServerEntity(final ServerLevel xd, final Entity akq, final int integer, final boolean boolean4, final Consumer<Packet<?>> consumer) {
+    public ServerEntity(final ServerLevel zd, final Entity aom, final int integer, final boolean boolean4, final Consumer<Packet<?>> consumer) {
         this.ap = Vec3.ZERO;
         this.lastPassengers = Collections.<Entity>emptyList();
-        this.level = xd;
+        this.level = zd;
         this.broadcast = consumer;
-        this.entity = akq;
+        this.entity = aom;
         this.updateInterval = integer;
         this.trackDelta = boolean4;
         this.updateSentPos();
-        this.yRotp = Mth.floor(akq.yRot * 256.0f / 360.0f);
-        this.xRotp = Mth.floor(akq.xRot * 256.0f / 360.0f);
-        this.yHeadRotp = Mth.floor(akq.getYHeadRot() * 256.0f / 360.0f);
-        this.wasOnGround = akq.onGround;
+        this.yRotp = Mth.floor(aom.yRot * 256.0f / 360.0f);
+        this.xRotp = Mth.floor(aom.xRot * 256.0f / 360.0f);
+        this.yHeadRotp = Mth.floor(aom.getYHeadRot() * 256.0f / 360.0f);
+        this.wasOnGround = aom.isOnGround();
     }
     
     public void sendChanges() {
@@ -80,15 +81,15 @@ public class ServerEntity {
             this.broadcast.accept(new ClientboundSetPassengersPacket(this.entity));
         }
         if (this.entity instanceof ItemFrame && this.tickCount % 10 == 0) {
-            final ItemFrame avr3 = (ItemFrame)this.entity;
-            final ItemStack ben4 = avr3.getItem();
-            if (ben4.getItem() instanceof MapItem) {
-                final MapItemSavedData crg5 = MapItem.getOrCreateSavedData(ben4, this.level);
-                for (final ServerPlayer xe7 : this.level.players()) {
-                    crg5.tickCarriedBy(xe7, ben4);
-                    final Packet<?> lt8 = ((MapItem)ben4.getItem()).getUpdatePacket(ben4, this.level, xe7);
-                    if (lt8 != null) {
-                        xe7.connection.send(lt8);
+            final ItemFrame bba3 = (ItemFrame)this.entity;
+            final ItemStack bki4 = bba3.getItem();
+            if (bki4.getItem() instanceof MapItem) {
+                final MapItemSavedData czv5 = MapItem.getOrCreateSavedData(bki4, this.level);
+                for (final ServerPlayer ze7 : this.level.players()) {
+                    czv5.tickCarriedBy(ze7, bki4);
+                    final Packet<?> ni8 = ((MapItem)bki4.getItem()).getUpdatePacket(bki4, this.level, ze7);
+                    if (ni8 != null) {
+                        ze7.connection.send(ni8);
                     }
                 }
             }
@@ -100,7 +101,7 @@ public class ServerEntity {
                 final int integer4 = Mth.floor(this.entity.xRot * 256.0f / 360.0f);
                 final boolean boolean5 = Math.abs(integer3 - this.yRotp) >= 1 || Math.abs(integer4 - this.xRotp) >= 1;
                 if (boolean5) {
-                    this.broadcast.accept(new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte)integer3, (byte)integer4, this.entity.onGround));
+                    this.broadcast.accept(new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte)integer3, (byte)integer4, this.entity.isOnGround()));
                     this.yRotp = integer3;
                     this.xRotp = integer4;
                 }
@@ -112,41 +113,41 @@ public class ServerEntity {
                 ++this.teleportDelay;
                 final int integer3 = Mth.floor(this.entity.yRot * 256.0f / 360.0f);
                 final int integer4 = Mth.floor(this.entity.xRot * 256.0f / 360.0f);
-                final Vec3 cvl5 = this.entity.position().subtract(ClientboundMoveEntityPacket.packetToEntity(this.xp, this.yp, this.zp));
-                final boolean boolean6 = cvl5.lengthSqr() >= 7.62939453125E-6;
-                Packet<?> lt9 = null;
+                final Vec3 dem5 = this.entity.position().subtract(ClientboundMoveEntityPacket.packetToEntity(this.xp, this.yp, this.zp));
+                final boolean boolean6 = dem5.lengthSqr() >= 7.62939453125E-6;
+                Packet<?> ni9 = null;
                 final boolean boolean7 = boolean6 || this.tickCount % 60 == 0;
                 final boolean boolean8 = Math.abs(integer3 - this.yRotp) >= 1 || Math.abs(integer4 - this.xRotp) >= 1;
                 if (this.tickCount > 0 || this.entity instanceof AbstractArrow) {
-                    final long long10 = ClientboundMoveEntityPacket.entityToPacket(cvl5.x);
-                    final long long11 = ClientboundMoveEntityPacket.entityToPacket(cvl5.y);
-                    final long long12 = ClientboundMoveEntityPacket.entityToPacket(cvl5.z);
+                    final long long10 = ClientboundMoveEntityPacket.entityToPacket(dem5.x);
+                    final long long11 = ClientboundMoveEntityPacket.entityToPacket(dem5.y);
+                    final long long12 = ClientboundMoveEntityPacket.entityToPacket(dem5.z);
                     final boolean boolean9 = long10 < -32768L || long10 > 32767L || long11 < -32768L || long11 > 32767L || long12 < -32768L || long12 > 32767L;
-                    if (boolean9 || this.teleportDelay > 400 || this.wasRiding || this.wasOnGround != this.entity.onGround) {
-                        this.wasOnGround = this.entity.onGround;
+                    if (boolean9 || this.teleportDelay > 400 || this.wasRiding || this.wasOnGround != this.entity.isOnGround()) {
+                        this.wasOnGround = this.entity.isOnGround();
                         this.teleportDelay = 0;
-                        lt9 = new ClientboundTeleportEntityPacket(this.entity);
+                        ni9 = new ClientboundTeleportEntityPacket(this.entity);
                     }
                     else if ((boolean7 && boolean8) || this.entity instanceof AbstractArrow) {
-                        lt9 = new ClientboundMoveEntityPacket.PosRot(this.entity.getId(), (short)long10, (short)long11, (short)long12, (byte)integer3, (byte)integer4, this.entity.onGround);
+                        ni9 = new ClientboundMoveEntityPacket.PosRot(this.entity.getId(), (short)long10, (short)long11, (short)long12, (byte)integer3, (byte)integer4, this.entity.isOnGround());
                     }
                     else if (boolean7) {
-                        lt9 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short)long10, (short)long11, (short)long12, this.entity.onGround);
+                        ni9 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short)long10, (short)long11, (short)long12, this.entity.isOnGround());
                     }
                     else if (boolean8) {
-                        lt9 = new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte)integer3, (byte)integer4, this.entity.onGround);
+                        ni9 = new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte)integer3, (byte)integer4, this.entity.isOnGround());
                     }
                 }
                 if ((this.trackDelta || this.entity.hasImpulse || (this.entity instanceof LivingEntity && ((LivingEntity)this.entity).isFallFlying())) && this.tickCount > 0) {
-                    final Vec3 cvl6 = this.entity.getDeltaMovement();
-                    final double double11 = cvl6.distanceToSqr(this.ap);
-                    if (double11 > 1.0E-7 || (double11 > 0.0 && cvl6.lengthSqr() == 0.0)) {
-                        this.ap = cvl6;
+                    final Vec3 dem6 = this.entity.getDeltaMovement();
+                    final double double11 = dem6.distanceToSqr(this.ap);
+                    if (double11 > 1.0E-7 || (double11 > 0.0 && dem6.lengthSqr() == 0.0)) {
+                        this.ap = dem6;
                         this.broadcast.accept(new ClientboundSetEntityMotionPacket(this.entity.getId(), this.ap));
                     }
                 }
-                if (lt9 != null) {
-                    this.broadcast.accept(lt9);
+                if (ni9 != null) {
+                    this.broadcast.accept(ni9);
                 }
                 this.sendDirtyEntityData();
                 if (boolean7) {
@@ -172,54 +173,57 @@ public class ServerEntity {
         }
     }
     
-    public void removePairing(final ServerPlayer xe) {
-        this.entity.stopSeenByPlayer(xe);
-        xe.sendRemoveEntity(this.entity);
+    public void removePairing(final ServerPlayer ze) {
+        this.entity.stopSeenByPlayer(ze);
+        ze.sendRemoveEntity(this.entity);
     }
     
-    public void addPairing(final ServerPlayer xe) {
-        this.sendPairingData(xe.connection::send);
-        this.entity.startSeenByPlayer(xe);
-        xe.cancelRemoveEntity(this.entity);
+    public void addPairing(final ServerPlayer ze) {
+        this.sendPairingData(ze.connection::send);
+        this.entity.startSeenByPlayer(ze);
+        ze.cancelRemoveEntity(this.entity);
     }
     
     public void sendPairingData(final Consumer<Packet<?>> consumer) {
         if (this.entity.removed) {
             ServerEntity.LOGGER.warn("Fetching packet for removed entity " + this.entity);
         }
-        final Packet<?> lt3 = this.entity.getAddEntityPacket();
+        final Packet<?> ni3 = this.entity.getAddEntityPacket();
         this.yHeadRotp = Mth.floor(this.entity.getYHeadRot() * 256.0f / 360.0f);
-        consumer.accept(lt3);
+        consumer.accept(ni3);
         if (!this.entity.getEntityData().isEmpty()) {
             consumer.accept(new ClientboundSetEntityDataPacket(this.entity.getId(), this.entity.getEntityData(), true));
         }
         boolean boolean4 = this.trackDelta;
         if (this.entity instanceof LivingEntity) {
-            final ModifiableAttributeMap alw5 = (ModifiableAttributeMap)((LivingEntity)this.entity).getAttributes();
-            final Collection<AttributeInstance> collection6 = alw5.getSyncableAttributes();
-            if (!collection6.isEmpty()) {
-                consumer.accept(new ClientboundUpdateAttributesPacket(this.entity.getId(), collection6));
+            final Collection<AttributeInstance> collection5 = ((LivingEntity)this.entity).getAttributes().getSyncableAttributes();
+            if (!collection5.isEmpty()) {
+                consumer.accept(new ClientboundUpdateAttributesPacket(this.entity.getId(), collection5));
             }
             if (((LivingEntity)this.entity).isFallFlying()) {
                 boolean4 = true;
             }
         }
         this.ap = this.entity.getDeltaMovement();
-        if (boolean4 && !(lt3 instanceof ClientboundAddMobPacket)) {
+        if (boolean4 && !(ni3 instanceof ClientboundAddMobPacket)) {
             consumer.accept(new ClientboundSetEntityMotionPacket(this.entity.getId(), this.ap));
         }
         if (this.entity instanceof LivingEntity) {
-            for (final EquipmentSlot akv8 : EquipmentSlot.values()) {
-                final ItemStack ben9 = ((LivingEntity)this.entity).getItemBySlot(akv8);
-                if (!ben9.isEmpty()) {
-                    consumer.accept(new ClientboundSetEquippedItemPacket(this.entity.getId(), akv8, ben9));
+            final List<Pair<EquipmentSlot, ItemStack>> list5 = Lists.newArrayList();
+            for (final EquipmentSlot aor9 : EquipmentSlot.values()) {
+                final ItemStack bki10 = ((LivingEntity)this.entity).getItemBySlot(aor9);
+                if (!bki10.isEmpty()) {
+                    list5.add((Pair<EquipmentSlot, ItemStack>)Pair.of(aor9, bki10.copy()));
                 }
             }
+            if (!list5.isEmpty()) {
+                consumer.accept(new ClientboundSetEquipmentPacket(this.entity.getId(), list5));
+            }
         }
         if (this.entity instanceof LivingEntity) {
-            final LivingEntity akz5 = (LivingEntity)this.entity;
-            for (final MobEffectInstance akk7 : akz5.getActiveEffects()) {
-                consumer.accept(new ClientboundUpdateMobEffectPacket(this.entity.getId(), akk7));
+            final LivingEntity aoy5 = (LivingEntity)this.entity;
+            for (final MobEffectInstance aog7 : aoy5.getActiveEffects()) {
+                consumer.accept(new ClientboundUpdateMobEffectPacket(this.entity.getId(), aog7));
             }
         }
         if (!this.entity.getPassengers().isEmpty()) {
@@ -229,25 +233,24 @@ public class ServerEntity {
             consumer.accept(new ClientboundSetPassengersPacket(this.entity.getVehicle()));
         }
         if (this.entity instanceof Mob) {
-            final Mob ala5 = (Mob)this.entity;
-            if (ala5.isLeashed()) {
-                consumer.accept(new ClientboundSetEntityLinkPacket(ala5, ala5.getLeashHolder()));
+            final Mob aoz5 = (Mob)this.entity;
+            if (aoz5.isLeashed()) {
+                consumer.accept(new ClientboundSetEntityLinkPacket(aoz5, aoz5.getLeashHolder()));
             }
         }
     }
     
     private void sendDirtyEntityData() {
-        final SynchedEntityData se2 = this.entity.getEntityData();
-        if (se2.isDirty()) {
-            this.broadcastAndSend(new ClientboundSetEntityDataPacket(this.entity.getId(), se2, false));
+        final SynchedEntityData tt2 = this.entity.getEntityData();
+        if (tt2.isDirty()) {
+            this.broadcastAndSend(new ClientboundSetEntityDataPacket(this.entity.getId(), tt2, false));
         }
         if (this.entity instanceof LivingEntity) {
-            final ModifiableAttributeMap alw3 = (ModifiableAttributeMap)((LivingEntity)this.entity).getAttributes();
-            final Set<AttributeInstance> set4 = alw3.getDirtyAttributes();
-            if (!set4.isEmpty()) {
-                this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set4));
+            final Set<AttributeInstance> set3 = ((LivingEntity)this.entity).getAttributes().getDirtyAttributes();
+            if (!set3.isEmpty()) {
+                this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set3));
             }
-            set4.clear();
+            set3.clear();
         }
     }
     
@@ -261,10 +264,10 @@ public class ServerEntity {
         return ClientboundMoveEntityPacket.packetToEntity(this.xp, this.yp, this.zp);
     }
     
-    private void broadcastAndSend(final Packet<?> lt) {
-        this.broadcast.accept(lt);
+    private void broadcastAndSend(final Packet<?> ni) {
+        this.broadcast.accept(ni);
         if (this.entity instanceof ServerPlayer) {
-            ((ServerPlayer)this.entity).connection.send(lt);
+            ((ServerPlayer)this.entity).connection.send(ni);
         }
     }
     
diff --git a/src/net/minecraft/server/level/ServerLevel.java b/src/net/minecraft/server/level/ServerLevel.java
index 1ddf2a9..092a6d2 100644
--- a/src/net/minecraft/server/level/ServerLevel.java
+++ b/src/net/minecraft/server/level/ServerLevel.java
@@ -1,17 +1,20 @@
 package net.minecraft.server.level;
 
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.world.level.dimension.Dimension;
 import net.minecraft.world.level.TickList;
 import net.minecraft.world.level.chunk.ChunkSource;
 import net.minecraft.world.scores.Scoreboard;
+import com.google.common.collect.Iterables;
+import net.minecraft.core.Direction;
 import com.google.common.annotations.VisibleForTesting;
-import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.util.CsvOutput;
 import java.io.IOException;
+import net.minecraft.world.level.NaturalSpawner;
 import java.io.Writer;
 import net.minecraft.CrashReport;
+import net.minecraft.world.entity.MobCategory;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import java.nio.file.Files;
 import java.nio.file.OpenOption;
 import java.nio.file.Path;
@@ -27,6 +30,7 @@ import net.minecraft.world.entity.ai.village.poi.PoiType;
 import it.unimi.dsi.fastutil.longs.LongSets;
 import net.minecraft.world.level.ForcedChunksSavedData;
 import it.unimi.dsi.fastutil.longs.LongSet;
+import net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket;
 import net.minecraft.util.Unit;
 import net.minecraft.world.level.saveddata.maps.MapIndex;
 import net.minecraft.world.level.saveddata.SavedData;
@@ -34,6 +38,8 @@ import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
 import net.minecraft.world.level.storage.DimensionDataStorage;
 import net.minecraft.tags.TagManager;
 import net.minecraft.world.item.crafting.RecipeManager;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.core.Position;
 import net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket;
 import net.minecraft.core.particles.ParticleOptions;
@@ -41,8 +47,8 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
 import javax.annotation.Nonnull;
 import net.minecraft.network.protocol.game.ClientboundBlockEventPacket;
 import net.minecraft.network.protocol.game.ClientboundExplodePacket;
-import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.ExplosionDamageCalculator;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.network.protocol.game.ClientboundEntityEventPacket;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -55,82 +61,71 @@ import net.minecraft.network.protocol.game.ClientboundSoundPacket;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket;
-import net.minecraft.network.protocol.game.ClientboundAddGlobalEntityPacket;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.util.ClassInstanceMultiMap;
 import net.minecraft.Util;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import java.util.Collection;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
-import java.util.function.BiFunction;
-import net.minecraft.world.entity.Mob;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import net.minecraft.world.entity.MobCategory;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
 import java.util.function.Predicate;
-import net.minecraft.world.level.LevelConflictException;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.ProgressListener;
-import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.tags.BlockTags;
-import java.util.Random;
-import net.minecraft.world.level.LevelSettings;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.TickNextTickData;
 import net.minecraft.server.ServerScoreboard;
-import java.util.Iterator;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.DifficultyInstance;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.levelgen.Heightmap;
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.LightningBolt;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.animal.horse.SkeletonHorse;
 import net.minecraft.world.level.chunk.LevelChunk;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import net.minecraft.world.entity.LivingEntity;
+import java.util.Iterator;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
+import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.entity.boss.EnderDragonPart;
 import net.minecraft.world.entity.npc.Npc;
 import net.minecraft.world.entity.animal.WaterAnimal;
 import net.minecraft.world.entity.animal.Animal;
-import net.minecraft.world.level.LevelType;
-import net.minecraft.world.Difficulty;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.GameRules;
 import java.util.function.BooleanSupplier;
 import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.LevelAccessor;
 import com.google.common.collect.Sets;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.core.Registry;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Queues;
 import com.google.common.collect.Maps;
 import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
-import com.google.common.collect.Lists;
+import net.minecraft.world.level.storage.WritableLevelData;
+import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.server.level.progress.ChunkProgressListener;
-import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.storage.LevelData;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.storage.LevelStorageSource;
 import java.util.concurrent.Executor;
+import net.minecraft.world.level.StructureFeatureManager;
 import javax.annotation.Nullable;
-import net.minecraft.world.entity.npc.WanderingTraderSpawner;
+import net.minecraft.world.level.dimension.end.EndDragonFight;
+import net.minecraft.world.level.CustomSpawner;
 import net.minecraft.world.level.BlockEventData;
 import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
 import net.minecraft.world.entity.raid.Raids;
@@ -140,27 +135,30 @@ import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.ServerTickList;
 import net.minecraft.world.level.PortalForcer;
-import net.minecraft.world.level.storage.LevelStorage;
+import net.minecraft.world.level.storage.ServerLevelData;
 import net.minecraft.server.MinecraftServer;
+import java.util.List;
 import java.util.Queue;
 import java.util.UUID;
 import java.util.Map;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.world.entity.Entity;
-import java.util.List;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import org.apache.logging.log4j.Logger;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.Level;
 
-public class ServerLevel extends Level {
+public class ServerLevel extends Level implements WorldGenLevel {
+    public static final BlockPos END_SPAWN_POINT;
     private static final Logger LOGGER;
-    private final List<Entity> globalEntities;
     private final Int2ObjectMap<Entity> entitiesById;
     private final Map<UUID, Entity> entitiesByUuid;
     private final Queue<Entity> toAddAfterTick;
     private final List<ServerPlayer> players;
+    private final ServerChunkCache chunkSource;
     boolean tickingEntities;
     private final MinecraftServer server;
-    private final LevelStorage levelStorage;
+    private final ServerLevelData serverLevelData;
     public boolean noSave;
     private boolean allPlayersSleeping;
     private int emptyTime;
@@ -171,31 +169,50 @@ public class ServerLevel extends Level {
     protected final Raids raids;
     private final ObjectLinkedOpenHashSet<BlockEventData> blockEvents;
     private boolean handlingTick;
+    private final List<CustomSpawner> customSpawners;
     @Nullable
-    private final WanderingTraderSpawner wanderingTraderSpawner;
+    private final EndDragonFight dragonFight;
+    private final StructureFeatureManager structureFeatureManager;
+    private final boolean tickTime;
     
-    public ServerLevel(final MinecraftServer minecraftServer, final Executor executor, final LevelStorage crn, final LevelData crm, final DimensionType cbi, final ProfilerFiller aio, final ChunkProgressListener xm) {
-        super(crm, cbi, (bjw, cbh) -> new ServerChunkCache(bjw, crn.getFolder(), crn.getFixerUpper(), crn.getStructureManager(), executor, cbh.createRandomLevelGenerator(), minecraftServer.getPlayerList().getViewDistance(), xm, () -> minecraftServer.getLevel(DimensionType.OVERWORLD).getDataStorage()), aio, false);
-        this.globalEntities = Lists.newArrayList();
+    public ServerLevel(final MinecraftServer minecraftServer, final Executor executor, final LevelStorageSource.LevelStorageAccess a, final ServerLevelData dak, final ResourceKey<Level> ug5, final ResourceKey<DimensionType> ug6, final DimensionType cif, final ChunkProgressListener zm, final ChunkGenerator cha, final boolean boolean10, final long long11, final List<CustomSpawner> list, final boolean boolean13) {
+        super(dak, ug5, ug6, cif, minecraftServer::getProfiler, false, boolean10, long11);
         this.entitiesById = (Int2ObjectMap<Entity>)new Int2ObjectLinkedOpenHashMap();
         this.entitiesByUuid = Maps.newHashMap();
         this.toAddAfterTick = Queues.newArrayDeque();
         this.players = Lists.newArrayList();
-        this.blockTicks = new ServerTickList<Block>(this, bph -> bph == null || bph.defaultBlockState().isAir(), Registry.BLOCK::getKey, Registry.BLOCK::get, this::tickBlock);
-        this.liquidTicks = new ServerTickList<Fluid>(this, coi -> coi == null || coi == Fluids.EMPTY, Registry.FLUID::getKey, Registry.FLUID::get, this::tickLiquid);
+        this.blockTicks = new ServerTickList<Block>(this, bvr -> bvr == null || bvr.defaultBlockState().isAir(), Registry.BLOCK::getKey, this::tickBlock);
+        this.liquidTicks = new ServerTickList<Fluid>(this, cwz -> cwz == null || cwz == Fluids.EMPTY, Registry.FLUID::getKey, this::tickLiquid);
         this.navigations = Sets.newHashSet();
         this.blockEvents = (ObjectLinkedOpenHashSet<BlockEventData>)new ObjectLinkedOpenHashSet();
-        this.levelStorage = crn;
+        this.tickTime = boolean13;
         this.server = minecraftServer;
+        this.customSpawners = list;
+        this.serverLevelData = dak;
+        this.chunkSource = new ServerChunkCache(this, a, minecraftServer.getFixerUpper(), minecraftServer.getStructureManager(), executor, cha, minecraftServer.getPlayerList().getViewDistance(), minecraftServer.forceSynchronousWrites(), zm, () -> minecraftServer.overworld().getDataStorage());
         this.portalForcer = new PortalForcer(this);
         this.updateSkyBrightness();
         this.prepareWeather();
         this.getWorldBorder().setAbsoluteMaxSize(minecraftServer.getAbsoluteMaxWorldSize());
-        this.raids = this.getDataStorage().<Raids>computeIfAbsent(() -> new Raids(this), Raids.getFileId(this.dimension));
+        this.raids = this.getDataStorage().<Raids>computeIfAbsent(() -> new Raids(this), Raids.getFileId(this.dimensionType()));
         if (!minecraftServer.isSingleplayer()) {
-            this.getLevelData().setGameType(minecraftServer.getDefaultGameType());
+            dak.setGameType(minecraftServer.getDefaultGameType());
         }
-        this.wanderingTraderSpawner = ((this.dimension.getType() == DimensionType.OVERWORLD) ? new WanderingTraderSpawner(this) : null);
+        this.structureFeatureManager = new StructureFeatureManager(this, minecraftServer.getWorldData().worldGenSettings());
+        if (this.dimensionType().createDragonFight()) {
+            this.dragonFight = new EndDragonFight(this, minecraftServer.getWorldData().worldGenSettings().seed(), minecraftServer.getWorldData().endDragonFightData());
+        }
+        else {
+            this.dragonFight = null;
+        }
+    }
+    
+    public void setWeatherParameters(final int integer1, final int integer2, final boolean boolean3, final boolean boolean4) {
+        this.serverLevelData.setClearWeatherTime(integer1);
+        this.serverLevelData.setRainTime(integer2);
+        this.serverLevelData.setThunderTime(integer2);
+        this.serverLevelData.setRaining(boolean3);
+        this.serverLevelData.setThundering(boolean4);
     }
     
     @Override
@@ -203,18 +220,22 @@ public class ServerLevel extends Level {
         return this.getChunkSource().getGenerator().getBiomeSource().getNoiseBiome(integer1, integer2, integer3);
     }
     
+    public StructureFeatureManager structureFeatureManager() {
+        return this.structureFeatureManager;
+    }
+    
     public void tick(final BooleanSupplier booleanSupplier) {
-        final ProfilerFiller aio3 = this.getProfiler();
+        final ProfilerFiller ami3 = this.getProfiler();
         this.handlingTick = true;
-        aio3.push("world border");
+        ami3.push("world border");
         this.getWorldBorder().tick();
-        aio3.popPush("weather");
+        ami3.popPush("weather");
         final boolean boolean4 = this.isRaining();
-        if (this.dimension.isHasSkyLight()) {
+        if (this.dimensionType().hasSkyLight()) {
             if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE)) {
-                int integer5 = this.levelData.getClearWeatherTime();
-                int integer6 = this.levelData.getThunderTime();
-                int integer7 = this.levelData.getRainTime();
+                int integer5 = this.serverLevelData.getClearWeatherTime();
+                int integer6 = this.serverLevelData.getThunderTime();
+                int integer7 = this.serverLevelData.getRainTime();
                 boolean boolean5 = this.levelData.isThundering();
                 boolean boolean6 = this.levelData.isRaining();
                 if (integer5 > 0) {
@@ -248,11 +269,11 @@ public class ServerLevel extends Level {
                         integer7 = this.random.nextInt(168000) + 12000;
                     }
                 }
-                this.levelData.setThunderTime(integer6);
-                this.levelData.setRainTime(integer7);
-                this.levelData.setClearWeatherTime(integer5);
-                this.levelData.setThundering(boolean5);
-                this.levelData.setRaining(boolean6);
+                this.serverLevelData.setThunderTime(integer6);
+                this.serverLevelData.setRainTime(integer7);
+                this.serverLevelData.setClearWeatherTime(integer5);
+                this.serverLevelData.setThundering(boolean5);
+                this.serverLevelData.setRaining(boolean6);
             }
             this.oThunderLevel = this.thunderLevel;
             if (this.levelData.isThundering()) {
@@ -272,25 +293,22 @@ public class ServerLevel extends Level {
             this.rainLevel = Mth.clamp(this.rainLevel, 0.0f, 1.0f);
         }
         if (this.oRainLevel != this.rainLevel) {
-            this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(7, this.rainLevel), this.dimension.getType());
+            this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(ClientboundGameEventPacket.RAIN_LEVEL_CHANGE, this.rainLevel), this.dimension());
         }
         if (this.oThunderLevel != this.thunderLevel) {
-            this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(8, this.thunderLevel), this.dimension.getType());
+            this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(ClientboundGameEventPacket.THUNDER_LEVEL_CHANGE, this.thunderLevel), this.dimension());
         }
         if (boolean4 != this.isRaining()) {
             if (boolean4) {
-                this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(2, 0.0f));
+                this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(ClientboundGameEventPacket.STOP_RAINING, 0.0f));
             }
             else {
-                this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(1, 0.0f));
+                this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(ClientboundGameEventPacket.START_RAINING, 0.0f));
             }
-            this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(7, this.rainLevel));
-            this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(8, this.thunderLevel));
+            this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(ClientboundGameEventPacket.RAIN_LEVEL_CHANGE, this.rainLevel));
+            this.server.getPlayerList().broadcastAll(new ClientboundGameEventPacket(ClientboundGameEventPacket.THUNDER_LEVEL_CHANGE, this.thunderLevel));
         }
-        if (this.getLevelData().isHardcore() && this.getDifficulty() != Difficulty.HARD) {
-            this.getLevelData().setDifficulty(Difficulty.HARD);
-        }
-        if (this.allPlayersSleeping && this.players.stream().noneMatch(xe -> !xe.isSpectator() && !xe.isSleepingLongEnough())) {
+        if (this.allPlayersSleeping && this.players.stream().noneMatch(ze -> !ze.isSpectator() && !ze.isSleepingLongEnough())) {
             this.allPlayersSleeping = false;
             if (this.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
                 final long long5 = this.levelData.getDayTime() + 24000L;
@@ -303,164 +321,174 @@ public class ServerLevel extends Level {
         }
         this.updateSkyBrightness();
         this.tickTime();
-        aio3.popPush("chunkSource");
+        ami3.popPush("chunkSource");
         this.getChunkSource().tick(booleanSupplier);
-        aio3.popPush("tickPending");
-        if (this.levelData.getGeneratorType() != LevelType.DEBUG_ALL_BLOCK_STATES) {
+        ami3.popPush("tickPending");
+        if (!this.isDebug()) {
             this.blockTicks.tick();
             this.liquidTicks.tick();
         }
-        aio3.popPush("raid");
+        ami3.popPush("raid");
         this.raids.tick();
-        if (this.wanderingTraderSpawner != null) {
-            this.wanderingTraderSpawner.tick();
-        }
-        aio3.popPush("blockEvents");
+        ami3.popPush("blockEvents");
         this.runBlockEvents();
         this.handlingTick = false;
-        aio3.popPush("entities");
+        ami3.popPush("entities");
         final boolean boolean7 = !this.players.isEmpty() || !this.getForcedChunks().isEmpty();
         if (boolean7) {
             this.resetEmptyTime();
         }
         if (boolean7 || this.emptyTime++ < 300) {
-            this.dimension.tick();
-            aio3.push("global");
-            for (int integer6 = 0; integer6 < this.globalEntities.size(); ++integer6) {
-                final Entity akq2 = this.globalEntities.get(integer6);
-                this.guardEntityTick(akq -> {
-                    ++akq.tickCount;
-                    akq.tick();
-                    return;
-                }, akq2);
-                if (akq2.removed) {
-                    this.globalEntities.remove(integer6--);
-                }
+            if (this.dragonFight != null) {
+                this.dragonFight.tick();
             }
-            aio3.popPush("regular");
             this.tickingEntities = true;
             final ObjectIterator<Int2ObjectMap.Entry<Entity>> objectIterator6 = (ObjectIterator<Int2ObjectMap.Entry<Entity>>)this.entitiesById.int2ObjectEntrySet().iterator();
             while (objectIterator6.hasNext()) {
                 final Int2ObjectMap.Entry<Entity> entry7 = (Int2ObjectMap.Entry<Entity>)objectIterator6.next();
-                final Entity akq3 = (Entity)entry7.getValue();
-                final Entity akq4 = akq3.getVehicle();
-                if (!this.server.isAnimals() && (akq3 instanceof Animal || akq3 instanceof WaterAnimal)) {
-                    akq3.remove();
+                final Entity aom8 = (Entity)entry7.getValue();
+                final Entity aom9 = aom8.getVehicle();
+                if (!this.server.isSpawningAnimals() && (aom8 instanceof Animal || aom8 instanceof WaterAnimal)) {
+                    aom8.remove();
                 }
-                if (!this.server.isNpcsEnabled() && akq3 instanceof Npc) {
-                    akq3.remove();
+                if (!this.server.areNpcsEnabled() && aom8 instanceof Npc) {
+                    aom8.remove();
                 }
-                aio3.push("checkDespawn");
-                if (!akq3.removed) {
-                    akq3.checkDespawn();
+                ami3.push("checkDespawn");
+                if (!aom8.removed) {
+                    aom8.checkDespawn();
                 }
-                aio3.pop();
-                if (akq4 != null) {
-                    if (!akq4.removed && akq4.hasPassenger(akq3)) {
+                ami3.pop();
+                if (aom9 != null) {
+                    if (!aom9.removed && aom9.hasPassenger(aom8)) {
                         continue;
                     }
-                    akq3.stopRiding();
+                    aom8.stopRiding();
                 }
-                aio3.push("tick");
-                if (!akq3.removed && !(akq3 instanceof EnderDragonPart)) {
-                    this.guardEntityTick(this::tickNonPassenger, akq3);
+                ami3.push("tick");
+                if (!aom8.removed && !(aom8 instanceof EnderDragonPart)) {
+                    this.guardEntityTick(this::tickNonPassenger, aom8);
                 }
-                aio3.pop();
-                aio3.push("remove");
-                if (akq3.removed) {
-                    this.removeFromChunk(akq3);
+                ami3.pop();
+                ami3.push("remove");
+                if (aom8.removed) {
+                    this.removeFromChunk(aom8);
                     objectIterator6.remove();
-                    this.onEntityRemoved(akq3);
+                    this.onEntityRemoved(aom8);
                 }
-                aio3.pop();
+                ami3.pop();
             }
             this.tickingEntities = false;
-            Entity akq2;
-            while ((akq2 = this.toAddAfterTick.poll()) != null) {
-                this.add(akq2);
+            Entity aom10;
+            while ((aom10 = this.toAddAfterTick.poll()) != null) {
+                this.add(aom10);
             }
-            aio3.pop();
             this.tickBlockEntities();
         }
-        aio3.pop();
+        ami3.pop();
+    }
+    
+    protected void tickTime() {
+        if (!this.tickTime) {
+            return;
+        }
+        final long long2 = this.levelData.getGameTime() + 1L;
+        this.serverLevelData.setGameTime(long2);
+        this.serverLevelData.getScheduledEvents().tick(this.server, long2);
+        if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
+            this.setDayTime(this.levelData.getDayTime() + 1L);
+        }
+    }
+    
+    public void setDayTime(final long long1) {
+        this.serverLevelData.setDayTime(long1);
+    }
+    
+    public void tickCustomSpawners(final boolean boolean1, final boolean boolean2) {
+        for (final CustomSpawner bpm5 : this.customSpawners) {
+            bpm5.tick(this, boolean1, boolean2);
+        }
     }
     
     private void wakeUpAllPlayers() {
-        this.players.stream().filter(LivingEntity::isSleeping).collect(Collectors.toList()).forEach(xe -> xe.stopSleepInBed(false, false));
+        this.players.stream().filter(LivingEntity::isSleeping).collect(Collectors.toList()).forEach(ze -> ze.stopSleepInBed(false, false));
     }
     
-    public void tickChunk(final LevelChunk cal, final int integer) {
-        final ChunkPos bjh4 = cal.getPos();
+    public void tickChunk(final LevelChunk chj, final int integer) {
+        final ChunkPos bph4 = chj.getPos();
         final boolean boolean5 = this.isRaining();
-        final int integer2 = bjh4.getMinBlockX();
-        final int integer3 = bjh4.getMinBlockZ();
-        final ProfilerFiller aio8 = this.getProfiler();
-        aio8.push("thunder");
+        final int integer2 = bph4.getMinBlockX();
+        final int integer3 = bph4.getMinBlockZ();
+        final ProfilerFiller ami8 = this.getProfiler();
+        ami8.push("thunder");
         if (boolean5 && this.isThundering() && this.random.nextInt(100000) == 0) {
-            final BlockPos fk9 = this.findLightingTargetAround(this.getBlockRandomPos(integer2, 0, integer3, 15));
-            if (this.isRainingAt(fk9)) {
-                final DifficultyInstance ajj10 = this.getCurrentDifficultyAt(fk9);
-                final boolean boolean6 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < ajj10.getEffectiveDifficulty() * 0.01;
+            final BlockPos fu9 = this.findLightingTargetAround(this.getBlockRandomPos(integer2, 0, integer3, 15));
+            if (this.isRainingAt(fu9)) {
+                final DifficultyInstance ane10 = this.getCurrentDifficultyAt(fu9);
+                final boolean boolean6 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < ane10.getEffectiveDifficulty() * 0.01;
                 if (boolean6) {
-                    final SkeletonHorse auj12 = EntityType.SKELETON_HORSE.create(this);
-                    auj12.setTrap(true);
-                    auj12.setAge(0);
-                    auj12.setPos(fk9.getX(), fk9.getY(), fk9.getZ());
-                    this.addFreshEntity(auj12);
+                    final SkeletonHorse azs12 = EntityType.SKELETON_HORSE.create(this);
+                    azs12.setTrap(true);
+                    azs12.setAge(0);
+                    azs12.setPos(fu9.getX(), fu9.getY(), fu9.getZ());
+                    this.addFreshEntity(azs12);
                 }
-                this.addGlobalEntity(new LightningBolt(this, fk9.getX() + 0.5, fk9.getY(), fk9.getZ() + 0.5, boolean6));
+                final LightningBolt aox12 = EntityType.LIGHTNING_BOLT.create(this);
+                aox12.moveTo(Vec3.atBottomCenterOf(fu9));
+                aox12.setVisualOnly(boolean6);
+                this.addFreshEntity(aox12);
             }
         }
-        aio8.popPush("iceandsnow");
+        ami8.popPush("iceandsnow");
         if (this.random.nextInt(16) == 0) {
-            final BlockPos fk9 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, this.getBlockRandomPos(integer2, 0, integer3, 15));
-            final BlockPos fk10 = fk9.below();
-            final Biome bkt11 = this.getBiome(fk9);
-            if (bkt11.shouldFreeze(this, fk10)) {
-                this.setBlockAndUpdate(fk10, Blocks.ICE.defaultBlockState());
+            final BlockPos fu9 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, this.getBlockRandomPos(integer2, 0, integer3, 15));
+            final BlockPos fu10 = fu9.below();
+            final Biome bre11 = this.getBiome(fu9);
+            if (bre11.shouldFreeze(this, fu10)) {
+                this.setBlockAndUpdate(fu10, Blocks.ICE.defaultBlockState());
             }
-            if (boolean5 && bkt11.shouldSnow(this, fk9)) {
-                this.setBlockAndUpdate(fk9, Blocks.SNOW.defaultBlockState());
+            if (boolean5 && bre11.shouldSnow(this, fu9)) {
+                this.setBlockAndUpdate(fu9, Blocks.SNOW.defaultBlockState());
             }
-            if (boolean5 && this.getBiome(fk10).getPrecipitation() == Biome.Precipitation.RAIN) {
-                this.getBlockState(fk10).getBlock().handleRain(this, fk10);
+            if (boolean5 && this.getBiome(fu10).getPrecipitation() == Biome.Precipitation.RAIN) {
+                this.getBlockState(fu10).getBlock().handleRain(this, fu10);
             }
         }
-        aio8.popPush("tickBlocks");
+        ami8.popPush("tickBlocks");
         if (integer > 0) {
-            for (final LevelChunkSection cam12 : cal.getSections()) {
-                if (cam12 != LevelChunk.EMPTY_SECTION && cam12.isRandomlyTicking()) {
-                    final int integer4 = cam12.bottomBlockY();
+            for (final LevelChunkSection chk12 : chj.getSections()) {
+                if (chk12 != LevelChunk.EMPTY_SECTION && chk12.isRandomlyTicking()) {
+                    final int integer4 = chk12.bottomBlockY();
                     for (int integer5 = 0; integer5 < integer; ++integer5) {
-                        final BlockPos fk11 = this.getBlockRandomPos(integer2, integer4, integer3, 15);
-                        aio8.push("randomTick");
-                        final BlockState byj16 = cam12.getBlockState(fk11.getX() - integer2, fk11.getY() - integer4, fk11.getZ() - integer3);
-                        if (byj16.isRandomlyTicking()) {
-                            byj16.randomTick(this, fk11, this.random);
+                        final BlockPos fu11 = this.getBlockRandomPos(integer2, integer4, integer3, 15);
+                        ami8.push("randomTick");
+                        final BlockState cfj16 = chk12.getBlockState(fu11.getX() - integer2, fu11.getY() - integer4, fu11.getZ() - integer3);
+                        if (cfj16.isRandomlyTicking()) {
+                            cfj16.randomTick(this, fu11, this.random);
                         }
-                        final FluidState coj17 = byj16.getFluidState();
-                        if (coj17.isRandomlyTicking()) {
-                            coj17.randomTick(this, fk11, this.random);
+                        final FluidState cxa17 = cfj16.getFluidState();
+                        if (cxa17.isRandomlyTicking()) {
+                            cxa17.randomTick(this, fu11, this.random);
                         }
-                        aio8.pop();
+                        ami8.pop();
                     }
                 }
             }
         }
-        aio8.pop();
+        ami8.pop();
     }
     
-    protected BlockPos findLightingTargetAround(final BlockPos fk) {
-        BlockPos fk2 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, fk);
-        final AABB cvf4 = new AABB(fk2, new BlockPos(fk2.getX(), this.getMaxBuildHeight(), fk2.getZ())).inflate(3.0);
-        final List<LivingEntity> list5 = this.<LivingEntity>getEntitiesOfClass(LivingEntity.class, cvf4, akz -> akz != null && akz.isAlive() && this.canSeeSky(akz.getCommandSenderBlockPosition()));
+    protected BlockPos findLightingTargetAround(final BlockPos fu) {
+        BlockPos fu2 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, fu);
+        final AABB deg4 = new AABB(fu2, new BlockPos(fu2.getX(), this.getMaxBuildHeight(), fu2.getZ())).inflate(3.0);
+        final List<LivingEntity> list5 = this.<LivingEntity>getEntitiesOfClass(LivingEntity.class, deg4, aoy -> aoy != null && aoy.isAlive() && this.canSeeSky(aoy.blockPosition()));
         if (!list5.isEmpty()) {
-            return list5.get(this.random.nextInt(list5.size())).getCommandSenderBlockPosition();
+            return list5.get(this.random.nextInt(list5.size())).blockPosition();
         }
-        if (fk2.getY() == -1) {
-            fk2 = fk2.above(2);
+        if (fu2.getY() == -1) {
+            fu2 = fu2.above(2);
         }
-        return fk2;
+        return fu2;
     }
     
     public boolean isHandlingTick() {
@@ -472,12 +500,12 @@ public class ServerLevel extends Level {
         if (!this.players.isEmpty()) {
             int integer2 = 0;
             int integer3 = 0;
-            for (final ServerPlayer xe5 : this.players) {
-                if (xe5.isSpectator()) {
+            for (final ServerPlayer ze5 : this.players) {
+                if (ze5.isSpectator()) {
                     ++integer2;
                 }
                 else {
-                    if (!xe5.isSleeping()) {
+                    if (!ze5.isSleeping()) {
                         continue;
                     }
                     ++integer3;
@@ -493,211 +521,139 @@ public class ServerLevel extends Level {
     }
     
     private void stopWeather() {
-        this.levelData.setRainTime(0);
-        this.levelData.setRaining(false);
-        this.levelData.setThunderTime(0);
-        this.levelData.setThundering(false);
-    }
-    
-    @Override
-    public void validateSpawn() {
-        if (this.levelData.getYSpawn() <= 0) {
-            this.levelData.setYSpawn(this.getSeaLevel() + 1);
-        }
-        int integer2 = this.levelData.getXSpawn();
-        int integer3 = this.levelData.getZSpawn();
-        int integer4 = 0;
-        while (this.getTopBlockState(new BlockPos(integer2, 0, integer3)).isAir()) {
-            integer2 += this.random.nextInt(8) - this.random.nextInt(8);
-            integer3 += this.random.nextInt(8) - this.random.nextInt(8);
-            if (++integer4 == 10000) {
-                break;
-            }
-        }
-        this.levelData.setXSpawn(integer2);
-        this.levelData.setZSpawn(integer3);
+        this.serverLevelData.setRainTime(0);
+        this.serverLevelData.setRaining(false);
+        this.serverLevelData.setThunderTime(0);
+        this.serverLevelData.setThundering(false);
     }
     
     public void resetEmptyTime() {
         this.emptyTime = 0;
     }
     
-    private void tickLiquid(final TickNextTickData<Fluid> bkm) {
-        final FluidState coj3 = this.getFluidState(bkm.pos);
-        if (coj3.getType() == bkm.getType()) {
-            coj3.tick(this, bkm.pos);
+    private void tickLiquid(final TickNextTickData<Fluid> bqs) {
+        final FluidState cxa3 = this.getFluidState(bqs.pos);
+        if (cxa3.getType() == bqs.getType()) {
+            cxa3.tick(this, bqs.pos);
         }
     }
     
-    private void tickBlock(final TickNextTickData<Block> bkm) {
-        final BlockState byj3 = this.getBlockState(bkm.pos);
-        if (byj3.getBlock() == bkm.getType()) {
-            byj3.tick(this, bkm.pos, this.random);
+    private void tickBlock(final TickNextTickData<Block> bqs) {
+        final BlockState cfj3 = this.getBlockState(bqs.pos);
+        if (cfj3.is(bqs.getType())) {
+            cfj3.tick(this, bqs.pos, this.random);
         }
     }
     
-    public void tickNonPassenger(final Entity akq) {
-        if (!(akq instanceof Player) && !this.getChunkSource().isEntityTickingChunk(akq)) {
+    public void tickNonPassenger(final Entity aom) {
+        if (!(aom instanceof Player) && !this.getChunkSource().isEntityTickingChunk(aom)) {
+            this.updateChunkPos(aom);
             return;
         }
-        akq.setPosAndOldPos(akq.getX(), akq.getY(), akq.getZ());
-        akq.yRotO = akq.yRot;
-        akq.xRotO = akq.xRot;
-        if (akq.inChunk) {
-            ++akq.tickCount;
-            final ProfilerFiller aio3 = this.getProfiler();
-            aio3.push(() -> Registry.ENTITY_TYPE.getKey(akq.getType()).toString());
-            aio3.incrementCounter("tickNonPassenger");
-            akq.tick();
-            aio3.pop();
+        aom.setPosAndOldPos(aom.getX(), aom.getY(), aom.getZ());
+        aom.yRotO = aom.yRot;
+        aom.xRotO = aom.xRot;
+        if (aom.inChunk) {
+            ++aom.tickCount;
+            final ProfilerFiller ami3 = this.getProfiler();
+            ami3.push(() -> Registry.ENTITY_TYPE.getKey(aom.getType()).toString());
+            ami3.incrementCounter("tickNonPassenger");
+            aom.tick();
+            ami3.pop();
         }
-        this.updateChunkPos(akq);
-        if (akq.inChunk) {
-            for (final Entity akq2 : akq.getPassengers()) {
-                this.tickPassenger(akq, akq2);
+        this.updateChunkPos(aom);
+        if (aom.inChunk) {
+            for (final Entity aom2 : aom.getPassengers()) {
+                this.tickPassenger(aom, aom2);
             }
         }
     }
     
-    public void tickPassenger(final Entity akq1, final Entity akq2) {
-        if (akq2.removed || akq2.getVehicle() != akq1) {
-            akq2.stopRiding();
+    public void tickPassenger(final Entity aom1, final Entity aom2) {
+        if (aom2.removed || aom2.getVehicle() != aom1) {
+            aom2.stopRiding();
             return;
         }
-        if (!(akq2 instanceof Player) && !this.getChunkSource().isEntityTickingChunk(akq2)) {
+        if (!(aom2 instanceof Player) && !this.getChunkSource().isEntityTickingChunk(aom2)) {
             return;
         }
-        akq2.setPosAndOldPos(akq2.getX(), akq2.getY(), akq2.getZ());
-        akq2.yRotO = akq2.yRot;
-        akq2.xRotO = akq2.xRot;
-        if (akq2.inChunk) {
-            ++akq2.tickCount;
-            final ProfilerFiller aio4 = this.getProfiler();
-            aio4.push(() -> Registry.ENTITY_TYPE.getKey(akq2.getType()).toString());
-            aio4.incrementCounter("tickPassenger");
-            akq2.rideTick();
-            aio4.pop();
+        aom2.setPosAndOldPos(aom2.getX(), aom2.getY(), aom2.getZ());
+        aom2.yRotO = aom2.yRot;
+        aom2.xRotO = aom2.xRot;
+        if (aom2.inChunk) {
+            ++aom2.tickCount;
+            final ProfilerFiller ami4 = this.getProfiler();
+            ami4.push(() -> Registry.ENTITY_TYPE.getKey(aom2.getType()).toString());
+            ami4.incrementCounter("tickPassenger");
+            aom2.rideTick();
+            ami4.pop();
         }
-        this.updateChunkPos(akq2);
-        if (akq2.inChunk) {
-            for (final Entity akq3 : akq2.getPassengers()) {
-                this.tickPassenger(akq2, akq3);
+        this.updateChunkPos(aom2);
+        if (aom2.inChunk) {
+            for (final Entity aom3 : aom2.getPassengers()) {
+                this.tickPassenger(aom2, aom3);
             }
         }
     }
     
-    public void updateChunkPos(final Entity akq) {
+    public void updateChunkPos(final Entity aom) {
+        if (!aom.checkAndResetUpdateChunkPos()) {
+            return;
+        }
         this.getProfiler().push("chunkCheck");
-        final int integer3 = Mth.floor(akq.getX() / 16.0);
-        final int integer4 = Mth.floor(akq.getY() / 16.0);
-        final int integer5 = Mth.floor(akq.getZ() / 16.0);
-        if (!akq.inChunk || akq.xChunk != integer3 || akq.yChunk != integer4 || akq.zChunk != integer5) {
-            if (akq.inChunk && this.hasChunk(akq.xChunk, akq.zChunk)) {
-                this.getChunk(akq.xChunk, akq.zChunk).removeEntity(akq, akq.yChunk);
+        final int integer3 = Mth.floor(aom.getX() / 16.0);
+        final int integer4 = Mth.floor(aom.getY() / 16.0);
+        final int integer5 = Mth.floor(aom.getZ() / 16.0);
+        if (!aom.inChunk || aom.xChunk != integer3 || aom.yChunk != integer4 || aom.zChunk != integer5) {
+            if (aom.inChunk && this.hasChunk(aom.xChunk, aom.zChunk)) {
+                this.getChunk(aom.xChunk, aom.zChunk).removeEntity(aom, aom.yChunk);
             }
-            if (akq.checkAndResetTeleportedFlag() || this.hasChunk(integer3, integer5)) {
-                this.getChunk(integer3, integer5).addEntity(akq);
+            if (aom.checkAndResetForcedChunkAdditionFlag() || this.hasChunk(integer3, integer5)) {
+                this.getChunk(integer3, integer5).addEntity(aom);
             }
             else {
-                akq.inChunk = false;
+                if (aom.inChunk) {
+                    ServerLevel.LOGGER.warn("Entity {} left loaded chunk area", aom);
+                }
+                aom.inChunk = false;
             }
         }
         this.getProfiler().pop();
     }
     
     @Override
-    public boolean mayInteract(final Player ayj, final BlockPos fk) {
-        return !this.server.isUnderSpawnProtection(this, fk, ayj) && this.getWorldBorder().isWithinBounds(fk);
+    public boolean mayInteract(final Player bec, final BlockPos fu) {
+        return !this.server.isUnderSpawnProtection(this, fu, bec) && this.getWorldBorder().isWithinBounds(fu);
     }
     
-    public void setInitialSpawn(final LevelSettings bka) {
-        if (!this.dimension.mayRespawn()) {
-            this.levelData.setSpawn(BlockPos.ZERO.above(this.getChunkSource().getGenerator().getSpawnHeight()));
-            return;
-        }
-        if (this.levelData.getGeneratorType() == LevelType.DEBUG_ALL_BLOCK_STATES) {
-            this.levelData.setSpawn(BlockPos.ZERO.above());
-            return;
-        }
-        final BiomeSource bkw3 = this.getChunkSource().getGenerator().getBiomeSource();
-        final List<Biome> list4 = bkw3.getPlayerSpawnBiomes();
-        final Random random5 = new Random(this.getSeed());
-        final BlockPos fk6 = bkw3.findBiomeHorizontal(0, this.getSeaLevel(), 0, 256, list4, random5);
-        final ChunkPos bjh7 = (fk6 == null) ? new ChunkPos(0, 0) : new ChunkPos(fk6);
-        if (fk6 == null) {
-            ServerLevel.LOGGER.warn("Unable to find spawn biome");
-        }
-        boolean boolean8 = false;
-        for (final Block bph10 : BlockTags.VALID_SPAWN.getValues()) {
-            if (bkw3.getSurfaceBlocks().contains(bph10.defaultBlockState())) {
-                boolean8 = true;
-                break;
-            }
-        }
-        this.levelData.setSpawn(bjh7.getWorldPosition().offset(8, this.getChunkSource().getGenerator().getSpawnHeight(), 8));
-        int integer9 = 0;
-        int integer10 = 0;
-        int integer11 = 0;
-        int integer12 = -1;
-        final int integer13 = 32;
-        for (int integer14 = 0; integer14 < 1024; ++integer14) {
-            if (integer9 > -16 && integer9 <= 16 && integer10 > -16 && integer10 <= 16) {
-                final BlockPos fk7 = this.dimension.getSpawnPosInChunk(new ChunkPos(bjh7.x + integer9, bjh7.z + integer10), boolean8);
-                if (fk7 != null) {
-                    this.levelData.setSpawn(fk7);
-                    break;
-                }
-            }
-            if (integer9 == integer10 || (integer9 < 0 && integer9 == -integer10) || (integer9 > 0 && integer9 == 1 - integer10)) {
-                final int integer15 = integer11;
-                integer11 = -integer12;
-                integer12 = integer15;
-            }
-            integer9 += integer11;
-            integer10 += integer12;
-        }
-        if (bka.hasStartingBonusItems()) {
-            this.generateBonusItemsNearSpawn();
-        }
-    }
-    
-    protected void generateBonusItemsNearSpawn() {
-        final ConfiguredFeature<?, ?> cdc2 = Feature.BONUS_CHEST.configured(FeatureConfiguration.NONE);
-        cdc2.place(this, this.getChunkSource().getGenerator(), this.random, new BlockPos(this.levelData.getXSpawn(), this.levelData.getYSpawn(), this.levelData.getZSpawn()));
-    }
-    
-    @Nullable
-    public BlockPos getDimensionSpecificSpawn() {
-        return this.dimension.getDimensionSpecificSpawn();
-    }
-    
-    public void save(@Nullable final ProgressListener abs, final boolean boolean2, final boolean boolean3) throws LevelConflictException {
-        final ServerChunkCache xb5 = this.getChunkSource();
+    public void save(@Nullable final ProgressListener aed, final boolean boolean2, final boolean boolean3) {
+        final ServerChunkCache zb5 = this.getChunkSource();
         if (boolean3) {
             return;
         }
-        if (abs != null) {
-            abs.progressStartNoAbort(new TranslatableComponent("menu.savingLevel", new Object[0]));
+        if (aed != null) {
+            aed.progressStartNoAbort(new TranslatableComponent("menu.savingLevel"));
         }
         this.saveLevelData();
-        if (abs != null) {
-            abs.progressStage(new TranslatableComponent("menu.savingChunks", new Object[0]));
+        if (aed != null) {
+            aed.progressStage(new TranslatableComponent("menu.savingChunks"));
         }
-        xb5.save(boolean2);
+        zb5.save(boolean2);
     }
     
-    protected void saveLevelData() throws LevelConflictException {
-        this.checkSession();
-        this.dimension.saveData();
+    private void saveLevelData() {
+        if (this.dragonFight != null) {
+            this.server.getWorldData().setEndDragonFightData(this.dragonFight.saveData());
+        }
         this.getChunkSource().getDataStorage().save();
     }
     
-    public List<Entity> getEntities(@Nullable final EntityType<?> aku, final Predicate<? super Entity> predicate) {
+    public List<Entity> getEntities(@Nullable final EntityType<?> aoq, final Predicate<? super Entity> predicate) {
         final List<Entity> list4 = Lists.newArrayList();
-        final ServerChunkCache xb5 = this.getChunkSource();
-        for (final Entity akq7 : this.entitiesById.values()) {
-            if ((aku == null || akq7.getType() == aku) && xb5.hasChunk(Mth.floor(akq7.getX()) >> 4, Mth.floor(akq7.getZ()) >> 4) && predicate.test(akq7)) {
-                list4.add(akq7);
+        final ServerChunkCache zb5 = this.getChunkSource();
+        for (final Entity aom7 : this.entitiesById.values()) {
+            if ((aoq == null || aom7.getType() == aoq) && zb5.hasChunk(Mth.floor(aom7.getX()) >> 4, Mth.floor(aom7.getZ()) >> 4) && predicate.test(aom7)) {
+                list4.add(aom7);
             }
         }
         return list4;
@@ -705,9 +661,9 @@ public class ServerLevel extends Level {
     
     public List<EnderDragon> getDragons() {
         final List<EnderDragon> list2 = Lists.newArrayList();
-        for (final Entity akq4 : this.entitiesById.values()) {
-            if (akq4 instanceof EnderDragon && akq4.isAlive()) {
-                list2.add((EnderDragon)akq4);
+        for (final Entity aom4 : this.entitiesById.values()) {
+            if (aom4 instanceof EnderDragon && aom4.isAlive()) {
+                list2.add((EnderDragon)aom4);
             }
         }
         return list2;
@@ -715,9 +671,9 @@ public class ServerLevel extends Level {
     
     public List<ServerPlayer> getPlayers(final Predicate<? super ServerPlayer> predicate) {
         final List<ServerPlayer> list3 = Lists.newArrayList();
-        for (final ServerPlayer xe5 : this.players) {
-            if (predicate.test(xe5)) {
-                list3.add(xe5);
+        for (final ServerPlayer ze5 : this.players) {
+            if (predicate.test(ze5)) {
+                list3.add(ze5);
             }
         }
         return list3;
@@ -732,295 +688,263 @@ public class ServerLevel extends Level {
         return list2.get(this.random.nextInt(list2.size()));
     }
     
-    public Object2IntMap<MobCategory> getMobCategoryCounts() {
-        final Object2IntMap<MobCategory> object2IntMap2 = (Object2IntMap<MobCategory>)new Object2IntOpenHashMap();
-        for (final Entity akq4 : this.entitiesById.values()) {
-            if (akq4 instanceof Mob) {
-                final Mob ala5 = (Mob)akq4;
-                if (ala5.isPersistenceRequired()) {
-                    continue;
-                }
-                if (ala5.requiresCustomPersistence()) {
-                    continue;
-                }
-            }
-            final MobCategory alb5 = akq4.getType().getCategory();
-            if (alb5 == MobCategory.MISC) {
-                continue;
-            }
-            if (!this.getChunkSource().isInAccessibleChunk(akq4)) {
-                continue;
-            }
-            object2IntMap2.mergeInt(alb5, 1, (BiFunction)Integer::sum);
-        }
-        return object2IntMap2;
-    }
-    
     @Override
-    public boolean addFreshEntity(final Entity akq) {
-        return this.addEntity(akq);
+    public boolean addFreshEntity(final Entity aom) {
+        return this.addEntity(aom);
     }
     
-    public boolean addWithUUID(final Entity akq) {
-        return this.addEntity(akq);
+    public boolean addWithUUID(final Entity aom) {
+        return this.addEntity(aom);
     }
     
-    public void addFromAnotherDimension(final Entity akq) {
-        final boolean boolean3 = akq.forcedLoading;
-        akq.forcedLoading = true;
-        this.addWithUUID(akq);
-        akq.forcedLoading = boolean3;
-        this.updateChunkPos(akq);
+    public void addFromAnotherDimension(final Entity aom) {
+        final boolean boolean3 = aom.forcedLoading;
+        aom.forcedLoading = true;
+        this.addWithUUID(aom);
+        aom.forcedLoading = boolean3;
+        this.updateChunkPos(aom);
     }
     
-    public void addDuringCommandTeleport(final ServerPlayer xe) {
-        this.addPlayer(xe);
-        this.updateChunkPos(xe);
+    public void addDuringCommandTeleport(final ServerPlayer ze) {
+        this.addPlayer(ze);
+        this.updateChunkPos(ze);
     }
     
-    public void addDuringPortalTeleport(final ServerPlayer xe) {
-        this.addPlayer(xe);
-        this.updateChunkPos(xe);
+    public void addDuringPortalTeleport(final ServerPlayer ze) {
+        this.addPlayer(ze);
+        this.updateChunkPos(ze);
     }
     
-    public void addNewPlayer(final ServerPlayer xe) {
-        this.addPlayer(xe);
+    public void addNewPlayer(final ServerPlayer ze) {
+        this.addPlayer(ze);
     }
     
-    public void addRespawnedPlayer(final ServerPlayer xe) {
-        this.addPlayer(xe);
+    public void addRespawnedPlayer(final ServerPlayer ze) {
+        this.addPlayer(ze);
     }
     
-    private void addPlayer(final ServerPlayer xe) {
-        final Entity akq3 = this.entitiesByUuid.get(xe.getUUID());
-        if (akq3 != null) {
-            ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", xe.getUUID().toString());
-            akq3.unRide();
-            this.removePlayerImmediately((ServerPlayer)akq3);
+    private void addPlayer(final ServerPlayer ze) {
+        final Entity aom3 = this.entitiesByUuid.get(ze.getUUID());
+        if (aom3 != null) {
+            ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", ze.getUUID().toString());
+            aom3.unRide();
+            this.removePlayerImmediately((ServerPlayer)aom3);
         }
-        this.players.add(xe);
+        this.players.add(ze);
         this.updateSleepingPlayerList();
-        final ChunkAccess bzy4 = this.getChunk(Mth.floor(xe.getX() / 16.0), Mth.floor(xe.getZ() / 16.0), ChunkStatus.FULL, true);
-        if (bzy4 instanceof LevelChunk) {
-            bzy4.addEntity(xe);
+        final ChunkAccess cgy4 = this.getChunk(Mth.floor(ze.getX() / 16.0), Mth.floor(ze.getZ() / 16.0), ChunkStatus.FULL, true);
+        if (cgy4 instanceof LevelChunk) {
+            cgy4.addEntity(ze);
         }
-        this.add(xe);
+        this.add(ze);
     }
     
-    private boolean addEntity(final Entity akq) {
-        if (akq.removed) {
-            ServerLevel.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityType.getKey(akq.getType()));
+    private boolean addEntity(final Entity aom) {
+        if (aom.removed) {
+            ServerLevel.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityType.getKey(aom.getType()));
             return false;
         }
-        if (this.isUUIDUsed(akq)) {
+        if (this.isUUIDUsed(aom)) {
             return false;
         }
-        final ChunkAccess bzy3 = this.getChunk(Mth.floor(akq.getX() / 16.0), Mth.floor(akq.getZ() / 16.0), ChunkStatus.FULL, akq.forcedLoading);
-        if (!(bzy3 instanceof LevelChunk)) {
+        final ChunkAccess cgy3 = this.getChunk(Mth.floor(aom.getX() / 16.0), Mth.floor(aom.getZ() / 16.0), ChunkStatus.FULL, aom.forcedLoading);
+        if (!(cgy3 instanceof LevelChunk)) {
             return false;
         }
-        bzy3.addEntity(akq);
-        this.add(akq);
+        cgy3.addEntity(aom);
+        this.add(aom);
         return true;
     }
     
-    public boolean loadFromChunk(final Entity akq) {
-        if (this.isUUIDUsed(akq)) {
+    public boolean loadFromChunk(final Entity aom) {
+        if (this.isUUIDUsed(aom)) {
             return false;
         }
-        this.add(akq);
+        this.add(aom);
         return true;
     }
     
-    private boolean isUUIDUsed(final Entity akq) {
-        final Entity akq2 = this.entitiesByUuid.get(akq.getUUID());
-        if (akq2 == null) {
+    private boolean isUUIDUsed(final Entity aom) {
+        final Entity aom2 = this.entitiesByUuid.get(aom.getUUID());
+        if (aom2 == null) {
             return false;
         }
-        ServerLevel.LOGGER.warn("Keeping entity {} that already exists with UUID {}", EntityType.getKey(akq2.getType()), akq.getUUID().toString());
+        ServerLevel.LOGGER.warn("Keeping entity {} that already exists with UUID {}", EntityType.getKey(aom2.getType()), aom.getUUID().toString());
         return true;
     }
     
-    public void unload(final LevelChunk cal) {
-        this.blockEntitiesToUnload.addAll(cal.getBlockEntities().values());
-        for (final ClassInstanceMultiMap<Entity> abe6 : cal.getEntitySections()) {
-            for (final Entity akq8 : abe6) {
-                if (akq8 instanceof ServerPlayer) {
+    public void unload(final LevelChunk chj) {
+        this.blockEntitiesToUnload.addAll(chj.getBlockEntities().values());
+        for (final ClassInstanceMultiMap<Entity> adk6 : chj.getEntitySections()) {
+            for (final Entity aom8 : adk6) {
+                if (aom8 instanceof ServerPlayer) {
                     continue;
                 }
                 if (this.tickingEntities) {
                     throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("Removing entity while ticking!"));
                 }
-                this.entitiesById.remove(akq8.getId());
-                this.onEntityRemoved(akq8);
+                this.entitiesById.remove(aom8.getId());
+                this.onEntityRemoved(aom8);
             }
         }
     }
     
-    public void onEntityRemoved(final Entity akq) {
-        if (akq instanceof EnderDragon) {
-            for (final EnderDragonPart auq6 : ((EnderDragon)akq).getSubEntities()) {
-                auq6.remove();
+    public void onEntityRemoved(final Entity aom) {
+        if (aom instanceof EnderDragon) {
+            for (final EnderDragonPart baa6 : ((EnderDragon)aom).getSubEntities()) {
+                baa6.remove();
             }
         }
-        this.entitiesByUuid.remove(akq.getUUID());
-        this.getChunkSource().removeEntity(akq);
-        if (akq instanceof ServerPlayer) {
-            final ServerPlayer xe3 = (ServerPlayer)akq;
-            this.players.remove(xe3);
+        this.entitiesByUuid.remove(aom.getUUID());
+        this.getChunkSource().removeEntity(aom);
+        if (aom instanceof ServerPlayer) {
+            final ServerPlayer ze3 = (ServerPlayer)aom;
+            this.players.remove(ze3);
         }
-        this.getScoreboard().entityRemoved(akq);
-        if (akq instanceof Mob) {
-            this.navigations.remove(((Mob)akq).getNavigation());
+        this.getScoreboard().entityRemoved(aom);
+        if (aom instanceof Mob) {
+            this.navigations.remove(((Mob)aom).getNavigation());
         }
     }
     
-    private void add(final Entity akq) {
+    private void add(final Entity aom) {
         if (this.tickingEntities) {
-            this.toAddAfterTick.add(akq);
+            this.toAddAfterTick.add(aom);
         }
         else {
-            this.entitiesById.put(akq.getId(), akq);
-            if (akq instanceof EnderDragon) {
-                for (final EnderDragonPart auq6 : ((EnderDragon)akq).getSubEntities()) {
-                    this.entitiesById.put(auq6.getId(), auq6);
+            this.entitiesById.put(aom.getId(), aom);
+            if (aom instanceof EnderDragon) {
+                for (final EnderDragonPart baa6 : ((EnderDragon)aom).getSubEntities()) {
+                    this.entitiesById.put(baa6.getId(), baa6);
                 }
             }
-            this.entitiesByUuid.put(akq.getUUID(), akq);
-            this.getChunkSource().addEntity(akq);
-            if (akq instanceof Mob) {
-                this.navigations.add(((Mob)akq).getNavigation());
+            this.entitiesByUuid.put(aom.getUUID(), aom);
+            this.getChunkSource().addEntity(aom);
+            if (aom instanceof Mob) {
+                this.navigations.add(((Mob)aom).getNavigation());
             }
         }
     }
     
-    public void despawn(final Entity akq) {
+    public void despawn(final Entity aom) {
         if (this.tickingEntities) {
             throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("Removing entity while ticking!"));
         }
-        this.removeFromChunk(akq);
-        this.entitiesById.remove(akq.getId());
-        this.onEntityRemoved(akq);
+        this.removeFromChunk(aom);
+        this.entitiesById.remove(aom.getId());
+        this.onEntityRemoved(aom);
     }
     
-    private void removeFromChunk(final Entity akq) {
-        final ChunkAccess bzy3 = this.getChunk(akq.xChunk, akq.zChunk, ChunkStatus.FULL, false);
-        if (bzy3 instanceof LevelChunk) {
-            ((LevelChunk)bzy3).removeEntity(akq);
+    private void removeFromChunk(final Entity aom) {
+        final ChunkAccess cgy3 = this.getChunk(aom.xChunk, aom.zChunk, ChunkStatus.FULL, false);
+        if (cgy3 instanceof LevelChunk) {
+            ((LevelChunk)cgy3).removeEntity(aom);
         }
     }
     
-    public void removePlayerImmediately(final ServerPlayer xe) {
-        xe.remove();
-        this.despawn(xe);
+    public void removePlayerImmediately(final ServerPlayer ze) {
+        ze.remove();
+        this.despawn(ze);
         this.updateSleepingPlayerList();
     }
     
-    public void addGlobalEntity(final LightningBolt avy) {
-        this.globalEntities.add(avy);
-        this.server.getPlayerList().broadcast(null, avy.getX(), avy.getY(), avy.getZ(), 512.0, this.dimension.getType(), new ClientboundAddGlobalEntityPacket(avy));
-    }
-    
     @Override
-    public void destroyBlockProgress(final int integer1, final BlockPos fk, final int integer3) {
-        for (final ServerPlayer xe6 : this.server.getPlayerList().getPlayers()) {
-            if (xe6 != null && xe6.level == this) {
-                if (xe6.getId() == integer1) {
+    public void destroyBlockProgress(final int integer1, final BlockPos fu, final int integer3) {
+        for (final ServerPlayer ze6 : this.server.getPlayerList().getPlayers()) {
+            if (ze6 != null && ze6.level == this) {
+                if (ze6.getId() == integer1) {
                     continue;
                 }
-                final double double7 = fk.getX() - xe6.getX();
-                final double double8 = fk.getY() - xe6.getY();
-                final double double9 = fk.getZ() - xe6.getZ();
+                final double double7 = fu.getX() - ze6.getX();
+                final double double8 = fu.getY() - ze6.getY();
+                final double double9 = fu.getZ() - ze6.getZ();
                 if (double7 * double7 + double8 * double8 + double9 * double9 >= 1024.0) {
                     continue;
                 }
-                xe6.connection.send(new ClientboundBlockDestructionPacket(integer1, fk, integer3));
+                ze6.connection.send(new ClientboundBlockDestructionPacket(integer1, fu, integer3));
             }
         }
     }
     
     @Override
-    public void playSound(@Nullable final Player ayj, final double double2, final double double3, final double double4, final SoundEvent aah, final SoundSource aaj, final float float7, final float float8) {
-        this.server.getPlayerList().broadcast(ayj, double2, double3, double4, (float7 > 1.0f) ? ((double)(16.0f * float7)) : 16.0, this.dimension.getType(), new ClientboundSoundPacket(aah, aaj, double2, double3, double4, float7, float8));
+    public void playSound(@Nullable final Player bec, final double double2, final double double3, final double double4, final SoundEvent ack, final SoundSource acm, final float float7, final float float8) {
+        this.server.getPlayerList().broadcast(bec, double2, double3, double4, (float7 > 1.0f) ? ((double)(16.0f * float7)) : 16.0, this.dimension(), new ClientboundSoundPacket(ack, acm, double2, double3, double4, float7, float8));
     }
     
     @Override
-    public void playSound(@Nullable final Player ayj, final Entity akq, final SoundEvent aah, final SoundSource aaj, final float float5, final float float6) {
-        this.server.getPlayerList().broadcast(ayj, akq.getX(), akq.getY(), akq.getZ(), (float5 > 1.0f) ? ((double)(16.0f * float5)) : 16.0, this.dimension.getType(), new ClientboundSoundEntityPacket(aah, aaj, akq, float5, float6));
+    public void playSound(@Nullable final Player bec, final Entity aom, final SoundEvent ack, final SoundSource acm, final float float5, final float float6) {
+        this.server.getPlayerList().broadcast(bec, aom.getX(), aom.getY(), aom.getZ(), (float5 > 1.0f) ? ((double)(16.0f * float5)) : 16.0, this.dimension(), new ClientboundSoundEntityPacket(ack, acm, aom, float5, float6));
     }
     
     @Override
-    public void globalLevelEvent(final int integer1, final BlockPos fk, final int integer3) {
-        this.server.getPlayerList().broadcastAll(new ClientboundLevelEventPacket(integer1, fk, integer3, true));
+    public void globalLevelEvent(final int integer1, final BlockPos fu, final int integer3) {
+        this.server.getPlayerList().broadcastAll(new ClientboundLevelEventPacket(integer1, fu, integer3, true));
     }
     
     @Override
-    public void levelEvent(@Nullable final Player ayj, final int integer2, final BlockPos fk, final int integer4) {
-        this.server.getPlayerList().broadcast(ayj, fk.getX(), fk.getY(), fk.getZ(), 64.0, this.dimension.getType(), new ClientboundLevelEventPacket(integer2, fk, integer4, false));
+    public void levelEvent(@Nullable final Player bec, final int integer2, final BlockPos fu, final int integer4) {
+        this.server.getPlayerList().broadcast(bec, fu.getX(), fu.getY(), fu.getZ(), 64.0, this.dimension(), new ClientboundLevelEventPacket(integer2, fu, integer4, false));
     }
     
     @Override
-    public void sendBlockUpdated(final BlockPos fk, final BlockState byj2, final BlockState byj3, final int integer) {
-        this.getChunkSource().blockChanged(fk);
-        final VoxelShape cwf6 = byj2.getCollisionShape(this, fk);
-        final VoxelShape cwf7 = byj3.getCollisionShape(this, fk);
-        if (!Shapes.joinIsNotEmpty(cwf6, cwf7, BooleanOp.NOT_SAME)) {
+    public void sendBlockUpdated(final BlockPos fu, final BlockState cfj2, final BlockState cfj3, final int integer) {
+        this.getChunkSource().blockChanged(fu);
+        final VoxelShape dfg6 = cfj2.getCollisionShape(this, fu);
+        final VoxelShape dfg7 = cfj3.getCollisionShape(this, fu);
+        if (!Shapes.joinIsNotEmpty(dfg6, dfg7, BooleanOp.NOT_SAME)) {
             return;
         }
-        for (final PathNavigation arr9 : this.navigations) {
-            if (arr9.hasDelayedRecomputation()) {
+        for (final PathNavigation awv9 : this.navigations) {
+            if (awv9.hasDelayedRecomputation()) {
                 continue;
             }
-            arr9.recomputePath(fk);
+            awv9.recomputePath(fu);
         }
     }
     
     @Override
-    public void broadcastEntityEvent(final Entity akq, final byte byte2) {
-        this.getChunkSource().broadcastAndSend(akq, new ClientboundEntityEventPacket(akq, byte2));
+    public void broadcastEntityEvent(final Entity aom, final byte byte2) {
+        this.getChunkSource().broadcastAndSend(aom, new ClientboundEntityEventPacket(aom, byte2));
     }
     
     @Override
     public ServerChunkCache getChunkSource() {
-        return (ServerChunkCache)super.getChunkSource();
+        return this.chunkSource;
     }
     
     @Override
-    public Explosion explode(@Nullable final Entity akq, @Nullable final DamageSource ajz, final double double3, final double double4, final double double5, final float float6, final boolean boolean7, final Explosion.BlockInteraction a) {
-        final Explosion bjp13 = new Explosion(this, akq, double3, double4, double5, float6, boolean7, a);
-        if (ajz != null) {
-            bjp13.setDamageSource(ajz);
-        }
-        bjp13.explode();
-        bjp13.finalizeExplosion(false);
+    public Explosion explode(@Nullable final Entity aom, @Nullable final DamageSource anw, @Nullable final ExplosionDamageCalculator bpu, final double double4, final double double5, final double double6, final float float7, final boolean boolean8, final Explosion.BlockInteraction a) {
+        final Explosion bpt14 = new Explosion(this, aom, anw, bpu, double4, double5, double6, float7, boolean8, a);
+        bpt14.explode();
+        bpt14.finalizeExplosion(false);
         if (a == Explosion.BlockInteraction.NONE) {
-            bjp13.clearToBlow();
+            bpt14.clearToBlow();
         }
-        for (final ServerPlayer xe15 : this.players) {
-            if (xe15.distanceToSqr(double3, double4, double5) < 4096.0) {
-                xe15.connection.send(new ClientboundExplodePacket(double3, double4, double5, float6, bjp13.getToBlow(), bjp13.getHitPlayers().get(xe15)));
+        for (final ServerPlayer ze16 : this.players) {
+            if (ze16.distanceToSqr(double4, double5, double6) < 4096.0) {
+                ze16.connection.send(new ClientboundExplodePacket(double4, double5, double6, float7, bpt14.getToBlow(), bpt14.getHitPlayers().get(ze16)));
             }
         }
-        return bjp13;
+        return bpt14;
     }
     
     @Override
-    public void blockEvent(final BlockPos fk, final Block bph, final int integer3, final int integer4) {
-        this.blockEvents.add(new BlockEventData(fk, bph, integer3, integer4));
+    public void blockEvent(final BlockPos fu, final Block bvr, final int integer3, final int integer4) {
+        this.blockEvents.add(new BlockEventData(fu, bvr, integer3, integer4));
     }
     
     private void runBlockEvents() {
         while (!this.blockEvents.isEmpty()) {
-            final BlockEventData bjf2 = (BlockEventData)this.blockEvents.removeFirst();
-            if (this.doBlockEvent(bjf2)) {
-                this.server.getPlayerList().broadcast(null, bjf2.getPos().getX(), bjf2.getPos().getY(), bjf2.getPos().getZ(), 64.0, this.dimension.getType(), new ClientboundBlockEventPacket(bjf2.getPos(), bjf2.getBlock(), bjf2.getParamA(), bjf2.getParamB()));
+            final BlockEventData bpf2 = (BlockEventData)this.blockEvents.removeFirst();
+            if (this.doBlockEvent(bpf2)) {
+                this.server.getPlayerList().broadcast(null, bpf2.getPos().getX(), bpf2.getPos().getY(), bpf2.getPos().getZ(), 64.0, this.dimension(), new ClientboundBlockEventPacket(bpf2.getPos(), bpf2.getBlock(), bpf2.getParamA(), bpf2.getParamB()));
             }
         }
     }
     
-    private boolean doBlockEvent(final BlockEventData bjf) {
-        final BlockState byj3 = this.getBlockState(bjf.getPos());
-        return byj3.getBlock() == bjf.getBlock() && byj3.triggerEvent(this, bjf.getPos(), bjf.getParamA(), bjf.getParamB());
+    private boolean doBlockEvent(final BlockEventData bpf) {
+        final BlockState cfj3 = this.getBlockState(bpf.getPos());
+        return cfj3.is(bpf.getBlock()) && cfj3.triggerEvent(this, bpf.getPos(), bpf.getParamA(), bpf.getParamB());
     }
     
     @Override
@@ -1044,33 +968,33 @@ public class ServerLevel extends Level {
     }
     
     public StructureManager getStructureManager() {
-        return this.levelStorage.getStructureManager();
+        return this.server.getStructureManager();
     }
     
-    public <T extends ParticleOptions> int sendParticles(final T gt, final double double2, final double double3, final double double4, final int integer, final double double6, final double double7, final double double8, final double double9) {
-        final ClientboundLevelParticlesPacket nh18 = new ClientboundLevelParticlesPacket((T)gt, false, double2, double3, double4, (float)double6, (float)double7, (float)double8, (float)double9, integer);
+    public <T extends ParticleOptions> int sendParticles(final T hf, final double double2, final double double3, final double double4, final int integer, final double double6, final double double7, final double double8, final double double9) {
+        final ClientboundLevelParticlesPacket ov18 = new ClientboundLevelParticlesPacket((T)hf, false, double2, double3, double4, (float)double6, (float)double7, (float)double8, (float)double9, integer);
         int integer2 = 0;
         for (int integer3 = 0; integer3 < this.players.size(); ++integer3) {
-            final ServerPlayer xe21 = this.players.get(integer3);
-            if (this.sendParticles(xe21, false, double2, double3, double4, nh18)) {
+            final ServerPlayer ze21 = this.players.get(integer3);
+            if (this.sendParticles(ze21, false, double2, double3, double4, ov18)) {
                 ++integer2;
             }
         }
         return integer2;
     }
     
-    public <T extends ParticleOptions> boolean sendParticles(final ServerPlayer xe, final T gt, final boolean boolean3, final double double4, final double double5, final double double6, final int integer, final double double8, final double double9, final double double10, final double double11) {
-        final Packet<?> lt20 = new ClientboundLevelParticlesPacket((T)gt, boolean3, double4, double5, double6, (float)double8, (float)double9, (float)double10, (float)double11, integer);
-        return this.sendParticles(xe, boolean3, double4, double5, double6, lt20);
+    public <T extends ParticleOptions> boolean sendParticles(final ServerPlayer ze, final T hf, final boolean boolean3, final double double4, final double double5, final double double6, final int integer, final double double8, final double double9, final double double10, final double double11) {
+        final Packet<?> ni20 = new ClientboundLevelParticlesPacket((T)hf, boolean3, double4, double5, double6, (float)double8, (float)double9, (float)double10, (float)double11, integer);
+        return this.sendParticles(ze, boolean3, double4, double5, double6, ni20);
     }
     
-    private boolean sendParticles(final ServerPlayer xe, final boolean boolean2, final double double3, final double double4, final double double5, final Packet<?> lt) {
-        if (xe.getLevel() != this) {
+    private boolean sendParticles(final ServerPlayer ze, final boolean boolean2, final double double3, final double double4, final double double5, final Packet<?> ni) {
+        if (ze.getLevel() != this) {
             return false;
         }
-        final BlockPos fk11 = xe.getCommandSenderBlockPosition();
-        if (fk11.closerThan(new Vec3(double3, double4, double5), boolean2 ? 512.0 : 32.0)) {
-            xe.connection.send(lt);
+        final BlockPos fu11 = ze.blockPosition();
+        if (fu11.closerThan(new Vec3(double3, double4, double5), boolean2 ? 512.0 : 32.0)) {
+            ze.connection.send(ni);
             return true;
         }
         return false;
@@ -1088,8 +1012,16 @@ public class ServerLevel extends Level {
     }
     
     @Nullable
-    public BlockPos findNearestMapFeature(final String string, final BlockPos fk, final int integer, final boolean boolean4) {
-        return this.getChunkSource().getGenerator().findNearestMapFeature(this, string, fk, integer, boolean4);
+    public BlockPos findNearestMapFeature(final StructureFeature<?> cml, final BlockPos fu, final int integer, final boolean boolean4) {
+        if (!this.server.getWorldData().worldGenSettings().generateFeatures()) {
+            return null;
+        }
+        return this.getChunkSource().getGenerator().findNearestMapFeature(this, cml, fu, integer, boolean4);
+    }
+    
+    @Nullable
+    public BlockPos findNearestBiome(final Biome bre, final BlockPos fu, final int integer3, final int integer4) {
+        return this.getChunkSource().getGenerator().getBiomeSource().findBiomeHorizontal(fu.getX(), fu.getY(), fu.getZ(), integer3, integer4, ImmutableList.<Biome>of(bre), this.random, true);
     }
     
     @Override
@@ -1102,25 +1034,11 @@ public class ServerLevel extends Level {
         return this.server.getTags();
     }
     
-    @Override
-    public void setGameTime(final long long1) {
-        super.setGameTime(long1);
-        this.levelData.getScheduledEvents().tick(this.server, long1);
-    }
-    
     @Override
     public boolean noSave() {
         return this.noSave;
     }
     
-    public void checkSession() throws LevelConflictException {
-        this.levelStorage.checkSession();
-    }
-    
-    public LevelStorage getLevelStorage() {
-        return this.levelStorage;
-    }
-    
     public DimensionDataStorage getDataStorage() {
         return this.getChunkSource().getDataStorage();
     }
@@ -1128,49 +1046,57 @@ public class ServerLevel extends Level {
     @Nullable
     @Override
     public MapItemSavedData getMapData(final String string) {
-        return this.getServer().getLevel(DimensionType.OVERWORLD).getDataStorage().<MapItemSavedData>get(() -> new MapItemSavedData(string), string);
+        return this.getServer().overworld().getDataStorage().<MapItemSavedData>get(() -> new MapItemSavedData(string), string);
     }
     
     @Override
-    public void setMapData(final MapItemSavedData crg) {
-        this.getServer().getLevel(DimensionType.OVERWORLD).getDataStorage().set(crg);
+    public void setMapData(final MapItemSavedData czv) {
+        this.getServer().overworld().getDataStorage().set(czv);
     }
     
     @Override
     public int getFreeMapId() {
-        return this.getServer().getLevel(DimensionType.OVERWORLD).getDataStorage().<MapIndex>computeIfAbsent(MapIndex::new, "idcounts").getFreeAuxValueForMap();
+        return this.getServer().overworld().getDataStorage().<MapIndex>computeIfAbsent(MapIndex::new, "idcounts").getFreeAuxValueForMap();
     }
     
-    @Override
-    public void setSpawnPos(final BlockPos fk) {
-        final ChunkPos bjh3 = new ChunkPos(new BlockPos(this.levelData.getXSpawn(), 0, this.levelData.getZSpawn()));
-        super.setSpawnPos(fk);
-        this.getChunkSource().<Unit>removeRegionTicket(TicketType.START, bjh3, 11, Unit.INSTANCE);
-        this.getChunkSource().<Unit>addRegionTicket(TicketType.START, new ChunkPos(fk), 11, Unit.INSTANCE);
+    public void setDefaultSpawnPos(final BlockPos fu) {
+        final ChunkPos bph3 = new ChunkPos(new BlockPos(this.levelData.getXSpawn(), 0, this.levelData.getZSpawn()));
+        this.levelData.setSpawn(fu);
+        this.getChunkSource().<Unit>removeRegionTicket(TicketType.START, bph3, 11, Unit.INSTANCE);
+        this.getChunkSource().<Unit>addRegionTicket(TicketType.START, new ChunkPos(fu), 11, Unit.INSTANCE);
+        this.getServer().getPlayerList().broadcastAll(new ClientboundSetDefaultSpawnPositionPacket(fu));
+    }
+    
+    public BlockPos getSharedSpawnPos() {
+        BlockPos fu2 = new BlockPos(this.levelData.getXSpawn(), this.levelData.getYSpawn(), this.levelData.getZSpawn());
+        if (!this.getWorldBorder().isWithinBounds(fu2)) {
+            fu2 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, new BlockPos(this.getWorldBorder().getCenterX(), 0.0, this.getWorldBorder().getCenterZ()));
+        }
+        return fu2;
     }
     
     public LongSet getForcedChunks() {
-        final ForcedChunksSavedData bjr2 = this.getDataStorage().<ForcedChunksSavedData>get(ForcedChunksSavedData::new, "chunks");
-        return (LongSet)((bjr2 != null) ? LongSets.unmodifiable(bjr2.getChunks()) : LongSets.EMPTY_SET);
+        final ForcedChunksSavedData bpw2 = this.getDataStorage().<ForcedChunksSavedData>get(ForcedChunksSavedData::new, "chunks");
+        return (LongSet)((bpw2 != null) ? LongSets.unmodifiable(bpw2.getChunks()) : LongSets.EMPTY_SET);
     }
     
     public boolean setChunkForced(final int integer1, final int integer2, final boolean boolean3) {
-        final ForcedChunksSavedData bjr5 = this.getDataStorage().<ForcedChunksSavedData>computeIfAbsent(ForcedChunksSavedData::new, "chunks");
-        final ChunkPos bjh6 = new ChunkPos(integer1, integer2);
-        final long long7 = bjh6.toLong();
+        final ForcedChunksSavedData bpw5 = this.getDataStorage().<ForcedChunksSavedData>computeIfAbsent(ForcedChunksSavedData::new, "chunks");
+        final ChunkPos bph6 = new ChunkPos(integer1, integer2);
+        final long long7 = bph6.toLong();
         boolean boolean4;
         if (boolean3) {
-            boolean4 = bjr5.getChunks().add(long7);
+            boolean4 = bpw5.getChunks().add(long7);
             if (boolean4) {
                 this.getChunk(integer1, integer2);
             }
         }
         else {
-            boolean4 = bjr5.getChunks().remove(long7);
+            boolean4 = bpw5.getChunks().remove(long7);
         }
-        bjr5.setDirty(boolean4);
+        bpw5.setDirty(boolean4);
         if (boolean4) {
-            this.getChunkSource().updateChunkForced(bjh6, boolean3);
+            this.getChunkSource().updateChunkForced(bph6, boolean3);
         }
         return boolean4;
     }
@@ -1181,21 +1107,21 @@ public class ServerLevel extends Level {
     }
     
     @Override
-    public void onBlockStateChange(final BlockPos fk, final BlockState byj2, final BlockState byj3) {
-        final Optional<PoiType> optional5 = PoiType.forState(byj2);
-        final Optional<PoiType> optional6 = PoiType.forState(byj3);
+    public void onBlockStateChange(final BlockPos fu, final BlockState cfj2, final BlockState cfj3) {
+        final Optional<PoiType> optional5 = PoiType.forState(cfj2);
+        final Optional<PoiType> optional6 = PoiType.forState(cfj3);
         if (Objects.equals(optional5, optional6)) {
             return;
         }
-        final BlockPos fk2 = fk.immutable();
+        final BlockPos fu2 = fu.immutable();
         final BlockPos blockPos;
-        optional5.ifPresent(asu -> this.getServer().execute(() -> {
+        optional5.ifPresent(ayc -> this.getServer().execute(() -> {
             this.getPoiManager().remove(blockPos);
             DebugPackets.sendPoiRemovedPacket(this, blockPos);
         }));
         final BlockPos blockPos2;
-        optional6.ifPresent(asu -> this.getServer().execute(() -> {
-            this.getPoiManager().add(blockPos2, asu);
+        optional6.ifPresent(ayc -> this.getServer().execute(() -> {
+            this.getPoiManager().add(blockPos2, ayc);
             DebugPackets.sendPoiAddedPacket(this, blockPos2);
         }));
     }
@@ -1204,20 +1130,20 @@ public class ServerLevel extends Level {
         return this.getChunkSource().getPoiManager();
     }
     
-    public boolean isVillage(final BlockPos fk) {
-        return this.closeToVillage(fk, 1);
+    public boolean isVillage(final BlockPos fu) {
+        return this.isCloseToVillage(fu, 1);
     }
     
-    public boolean isVillage(final SectionPos gd) {
-        return this.isVillage(gd.center());
+    public boolean isVillage(final SectionPos go) {
+        return this.isVillage(go.center());
     }
     
-    public boolean closeToVillage(final BlockPos fk, final int integer) {
-        return integer <= 6 && this.sectionsToVillage(SectionPos.of(fk)) <= integer;
+    public boolean isCloseToVillage(final BlockPos fu, final int integer) {
+        return integer <= 6 && this.sectionsToVillage(SectionPos.of(fu)) <= integer;
     }
     
-    public int sectionsToVillage(final SectionPos gd) {
-        return this.getPoiManager().sectionsToVillage(gd);
+    public int sectionsToVillage(final SectionPos go) {
+        return this.getPoiManager().sectionsToVillage(go);
     }
     
     public Raids getRaids() {
@@ -1225,78 +1151,122 @@ public class ServerLevel extends Level {
     }
     
     @Nullable
-    public Raid getRaidAt(final BlockPos fk) {
-        return this.raids.getNearbyRaid(fk, 9216);
+    public Raid getRaidAt(final BlockPos fu) {
+        return this.raids.getNearbyRaid(fu, 9216);
     }
     
-    public boolean isRaided(final BlockPos fk) {
-        return this.getRaidAt(fk) != null;
+    public boolean isRaided(final BlockPos fu) {
+        return this.getRaidAt(fu) != null;
     }
     
-    public void onReputationEvent(final ReputationEventType aso, final Entity akq, final ReputationEventHandler all) {
-        all.onReputationEventFrom(aso, akq);
+    public void onReputationEvent(final ReputationEventType axw, final Entity aom, final ReputationEventHandler apl) {
+        apl.onReputationEventFrom(axw, aom);
     }
     
     public void saveDebugReport(final Path path) throws IOException {
-        final ChunkMap wp3 = this.getChunkSource().chunkMap;
+        final ChunkMap yp3 = this.getChunkSource().chunkMap;
         try (final Writer writer4 = Files.newBufferedWriter(path.resolve("stats.txt"))) {
-            writer4.write(String.format("spawning_chunks: %d\n", wp3.getDistanceManager().getNaturalSpawnChunkCount()));
-            for (final Object2IntMap.Entry<MobCategory> entry7 : this.getMobCategoryCounts().object2IntEntrySet()) {
-                writer4.write(String.format("spawn_count.%s: %d\n", ((MobCategory)entry7.getKey()).getName(), entry7.getIntValue()));
+            writer4.write(String.format("spawning_chunks: %d\n", yp3.getDistanceManager().getNaturalSpawnChunkCount()));
+            final NaturalSpawner.SpawnState d6 = this.getChunkSource().getLastSpawnState();
+            if (d6 != null) {
+                for (final Object2IntMap.Entry<MobCategory> entry8 : d6.getMobCategoryCounts().object2IntEntrySet()) {
+                    writer4.write(String.format("spawn_count.%s: %d\n", ((MobCategory)entry8.getKey()).getName(), entry8.getIntValue()));
+                }
             }
             writer4.write(String.format("entities: %d\n", this.entitiesById.size()));
             writer4.write(String.format("block_entities: %d\n", this.blockEntityList.size()));
             writer4.write(String.format("block_ticks: %d\n", this.getBlockTicks().size()));
             writer4.write(String.format("fluid_ticks: %d\n", this.getLiquidTicks().size()));
-            writer4.write("distance_manager: " + wp3.getDistanceManager().getDebugStatus() + "\n");
+            writer4.write("distance_manager: " + yp3.getDistanceManager().getDebugStatus() + "\n");
             writer4.write(String.format("pending_tasks: %d\n", this.getChunkSource().getPendingTasksCount()));
         }
-        final CrashReport h4 = new CrashReport("Level dump", new Exception("dummy"));
-        this.fillReportDetails(h4);
+        final CrashReport j4 = new CrashReport("Level dump", new Exception("dummy"));
+        this.fillReportDetails(j4);
         try (final Writer writer5 = Files.newBufferedWriter(path.resolve("example_crash.txt"))) {
-            writer5.write(h4.getFriendlyReport());
+            writer5.write(j4.getFriendlyReport());
         }
         final Path path2 = path.resolve("chunks.csv");
         try (final Writer writer6 = Files.newBufferedWriter(path2)) {
-            wp3.dumpChunks(writer6);
+            yp3.dumpChunks(writer6);
         }
         final Path path3 = path.resolve("entities.csv");
         try (final Writer writer7 = Files.newBufferedWriter(path3)) {
             dumpEntities(writer7, (Iterable<Entity>)this.entitiesById.values());
         }
-        final Path path4 = path.resolve("global_entities.csv");
+        final Path path4 = path.resolve("block_entities.csv");
         try (final Writer writer8 = Files.newBufferedWriter(path4)) {
-            dumpEntities(writer8, this.globalEntities);
-        }
-        final Path path5 = path.resolve("block_entities.csv");
-        try (final Writer writer9 = Files.newBufferedWriter(path5)) {
-            this.dumpBlockEntities(writer9);
+            this.dumpBlockEntities(writer8);
         }
     }
     
     private static void dumpEntities(final Writer writer, final Iterable<Entity> iterable) throws IOException {
-        final CsvOutput abh3 = CsvOutput.builder().addColumn("x").addColumn("y").addColumn("z").addColumn("uuid").addColumn("type").addColumn("alive").addColumn("display_name").addColumn("custom_name").build(writer);
-        for (final Entity akq5 : iterable) {
-            final Component lf6 = akq5.getCustomName();
-            final Component lf7 = akq5.getDisplayName();
-            abh3.writeRow(akq5.getX(), akq5.getY(), akq5.getZ(), akq5.getUUID(), Registry.ENTITY_TYPE.getKey(akq5.getType()), akq5.isAlive(), lf7.getString(), (lf6 != null) ? lf6.getString() : null);
+        final CsvOutput ado3 = CsvOutput.builder().addColumn("x").addColumn("y").addColumn("z").addColumn("uuid").addColumn("type").addColumn("alive").addColumn("display_name").addColumn("custom_name").build(writer);
+        for (final Entity aom5 : iterable) {
+            final Component mr6 = aom5.getCustomName();
+            final Component mr7 = aom5.getDisplayName();
+            ado3.writeRow(aom5.getX(), aom5.getY(), aom5.getZ(), aom5.getUUID(), Registry.ENTITY_TYPE.getKey(aom5.getType()), aom5.isAlive(), mr7.getString(), (mr6 != null) ? mr6.getString() : null);
         }
     }
     
     private void dumpBlockEntities(final Writer writer) throws IOException {
-        final CsvOutput abh3 = CsvOutput.builder().addColumn("x").addColumn("y").addColumn("z").addColumn("type").build(writer);
-        for (final BlockEntity bwl5 : this.blockEntityList) {
-            final BlockPos fk6 = bwl5.getBlockPos();
-            abh3.writeRow(fk6.getX(), fk6.getY(), fk6.getZ(), Registry.BLOCK_ENTITY_TYPE.getKey(bwl5.getType()));
+        final CsvOutput ado3 = CsvOutput.builder().addColumn("x").addColumn("y").addColumn("z").addColumn("type").build(writer);
+        for (final BlockEntity cdl5 : this.blockEntityList) {
+            final BlockPos fu6 = cdl5.getBlockPos();
+            ado3.writeRow(fu6.getX(), fu6.getY(), fu6.getZ(), Registry.BLOCK_ENTITY_TYPE.getKey(cdl5.getType()));
         }
     }
     
     @VisibleForTesting
-    public void clearBlockEvents(final BoundingBox clb) {
-        this.blockEvents.removeIf(bjf -> clb.isInside(bjf.getPos()));
+    public void clearBlockEvents(final BoundingBox ctd) {
+        this.blockEvents.removeIf(bpf -> ctd.isInside(bpf.getPos()));
+    }
+    
+    @Override
+    public void blockUpdated(final BlockPos fu, final Block bvr) {
+        if (!this.isDebug()) {
+            this.updateNeighborsAt(fu, bvr);
+        }
+    }
+    
+    @Override
+    public float getShade(final Direction fz, final boolean boolean2) {
+        return 1.0f;
+    }
+    
+    public Iterable<Entity> getAllEntities() {
+        return Iterables.<Entity>unmodifiableIterable(this.entitiesById.values());
+    }
+    
+    @Override
+    public String toString() {
+        return "ServerLevel[" + this.serverLevelData.getLevelName() + "]";
+    }
+    
+    public boolean isFlat() {
+        return this.server.getWorldData().worldGenSettings().isFlatWorld();
+    }
+    
+    @Override
+    public long getSeed() {
+        return this.server.getWorldData().worldGenSettings().seed();
+    }
+    
+    @Nullable
+    public EndDragonFight dragonFight() {
+        return this.dragonFight;
+    }
+    
+    public static void makeObsidianPlatform(final ServerLevel zd) {
+        final BlockPos fu2 = ServerLevel.END_SPAWN_POINT;
+        final int integer3 = fu2.getX();
+        final int integer4 = fu2.getY() - 2;
+        final int integer5 = fu2.getZ();
+        BlockPos.betweenClosed(integer3 - 2, integer4 + 1, integer5 - 2, integer3 + 2, integer4 + 3, integer5 + 2).forEach(fu -> zd.setBlockAndUpdate(fu, Blocks.AIR.defaultBlockState()));
+        BlockPos.betweenClosed(integer3 - 2, integer4, integer5 - 2, integer3 + 2, integer4, integer5 + 2).forEach(fu -> zd.setBlockAndUpdate(fu, Blocks.OBSIDIAN.defaultBlockState()));
     }
     
     static {
+        END_SPAWN_POINT = new BlockPos(100, 50, 0);
         LOGGER = LogManager.getLogger();
     }
 }
diff --git a/src/net/minecraft/server/level/ServerPlayer.java b/src/net/minecraft/server/level/ServerPlayer.java
index 09633eb..19d8339 100644
--- a/src/net/minecraft/server/level/ServerPlayer.java
+++ b/src/net/minecraft/server/level/ServerPlayer.java
@@ -15,6 +15,7 @@ import net.minecraft.network.protocol.game.ClientboundSetCameraPacket;
 import net.minecraft.network.protocol.game.ClientboundResourcePackPacket;
 import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.network.protocol.game.ServerboundClientInformationPacket;
+import java.util.UUID;
 import net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.stats.RecipeBook;
@@ -23,9 +24,6 @@ import net.minecraft.network.protocol.game.ClientboundPlayerLookAtPacket;
 import net.minecraft.commands.arguments.EntityAnchorArgument;
 import net.minecraft.network.protocol.game.ClientboundEntityEventPacket;
 import net.minecraft.network.protocol.game.ClientboundChatPacket;
-import net.minecraft.network.chat.ChatType;
-import java.util.function.Consumer;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.crafting.Recipe;
 import java.util.Collection;
 import net.minecraft.network.protocol.game.ClientboundContainerClosePacket;
@@ -55,29 +53,38 @@ import net.minecraft.world.MenuProvider;
 import net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
 import net.minecraft.network.protocol.game.ClientboundAnimatePacket;
+import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.HorizontalDirectionalBlock;
+import net.minecraft.core.Direction;
 import net.minecraft.util.Unit;
 import com.mojang.datafixers.util.Either;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.server.players.PlayerList;
+import net.minecraft.world.level.storage.LevelData;
 import net.minecraft.network.protocol.game.ClientboundLevelEventPacket;
 import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket;
 import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
-import net.minecraft.world.level.storage.LevelData;
+import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.damagesource.EntityDamageSource;
 import net.minecraft.world.scores.PlayerTeam;
+import net.minecraft.world.entity.NeutralMob;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.network.chat.Component;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.scores.Score;
+import net.minecraft.network.chat.ChatType;
 import net.minecraft.world.scores.Team;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
@@ -99,16 +106,21 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundPlayerCombatPacket;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.nbt.Tag;
+import java.util.function.Consumer;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.GameType;
 import net.minecraft.Util;
 import com.google.common.collect.Lists;
-import net.minecraft.world.level.Level;
 import com.mojang.authlib.GameProfile;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.core.SectionPos;
 import javax.annotation.Nullable;
 import net.minecraft.world.phys.Vec3;
@@ -126,7 +138,6 @@ import net.minecraft.world.entity.player.Player;
 
 public class ServerPlayer extends Player implements ContainerListener {
     private static final Logger LOGGER;
-    private String language;
     public ServerGamePacketListenerImpl connection;
     public final MinecraftServer server;
     public final ServerPlayerGameMode gameMode;
@@ -157,14 +168,17 @@ public class ServerPlayer extends Player implements ContainerListener {
     @Nullable
     private Vec3 enteredNetherPosition;
     private SectionPos lastSectionPos;
+    private ResourceKey<Level> respawnDimension;
+    @Nullable
+    private BlockPos respawnPosition;
+    private boolean respawnForced;
     private int containerCounter;
     public boolean ignoreSlotUpdateHack;
     public int latency;
     public boolean wonGame;
     
-    public ServerPlayer(final MinecraftServer minecraftServer, final ServerLevel xd, final GameProfile gameProfile, final ServerPlayerGameMode xf) {
-        super(xd, gameProfile);
-        this.language = "en_US";
+    public ServerPlayer(final MinecraftServer minecraftServer, final ServerLevel zd, final GameProfile gameProfile, final ServerPlayerGameMode zf) {
+        super(zd, zd.getSharedSpawnPos(), gameProfile);
         this.entitiesToRemove = Lists.newLinkedList();
         this.lastRecordedHealthAndAbsorption = Float.MIN_VALUE;
         this.lastRecordedFoodLevel = Integer.MIN_VALUE;
@@ -179,22 +193,23 @@ public class ServerPlayer extends Player implements ContainerListener {
         this.spawnInvulnerableTime = 60;
         this.canChatColor = true;
         this.lastActionTime = Util.getMillis();
+        this.recipeBook = new ServerRecipeBook();
         this.lastSectionPos = SectionPos.of(0, 0, 0);
-        xf.player = this;
-        this.gameMode = xf;
+        this.respawnDimension = Level.OVERWORLD;
+        zf.player = this;
+        this.gameMode = zf;
         this.server = minecraftServer;
-        this.recipeBook = new ServerRecipeBook(minecraftServer.getRecipeManager());
         this.stats = minecraftServer.getPlayerList().getPlayerStats(this);
         this.advancements = minecraftServer.getPlayerList().getPlayerAdvancements(this);
         this.maxUpStep = 1.0f;
-        this.fudgeSpawnLocation(xd);
+        this.fudgeSpawnLocation(zd);
     }
     
-    private void fudgeSpawnLocation(final ServerLevel xd) {
-        final BlockPos fk3 = xd.getSharedSpawnPos();
-        if (xd.dimension.isHasSkyLight() && xd.getLevelData().getGameType() != GameType.ADVENTURE) {
-            int integer4 = Math.max(0, this.server.getSpawnRadius(xd));
-            final int integer5 = Mth.floor(xd.getWorldBorder().getDistanceToBorder(fk3.getX(), fk3.getZ()));
+    private void fudgeSpawnLocation(final ServerLevel zd) {
+        final BlockPos fu3 = zd.getSharedSpawnPos();
+        if (zd.dimensionType().hasSkyLight() && zd.getServer().getWorldData().getGameType() != GameType.ADVENTURE) {
+            int integer4 = Math.max(0, this.server.getSpawnRadius(zd));
+            final int integer5 = Mth.floor(zd.getWorldBorder().getDistanceToBorder(fu3.getX(), fu3.getZ()));
             if (integer5 < integer4) {
                 integer4 = integer5;
             }
@@ -210,18 +225,18 @@ public class ServerPlayer extends Player implements ContainerListener {
                 final int integer10 = (integer8 + integer7 * integer9) % integer6;
                 final int integer11 = integer10 % (integer4 * 2 + 1);
                 final int integer12 = integer10 / (integer4 * 2 + 1);
-                final BlockPos fk4 = xd.getDimension().getValidSpawnPosition(fk3.getX() + integer11 - integer4, fk3.getZ() + integer12 - integer4, false);
-                if (fk4 != null) {
-                    this.moveTo(fk4, 0.0f, 0.0f);
-                    if (xd.noCollision(this)) {
+                final BlockPos fu4 = PlayerRespawnLogic.getOverworldRespawnPos(zd, fu3.getX() + integer11 - integer4, fu3.getZ() + integer12 - integer4, false);
+                if (fu4 != null) {
+                    this.moveTo(fu4, 0.0f, 0.0f);
+                    if (zd.noCollision(this)) {
                         break;
                     }
                 }
             }
         }
         else {
-            this.moveTo(fk3, 0.0f, 0.0f);
-            while (!xd.noCollision(this) && this.getY() < 255.0) {
+            this.moveTo(fu3, 0.0f, 0.0f);
+            while (!zd.noCollision(this) && this.getY() < 255.0) {
                 this.setPos(this.getX(), this.getY() + 1.0, this.getZ());
             }
         }
@@ -232,52 +247,68 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("playerGameType", 99)) {
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("playerGameType", 99)) {
             if (this.getServer().getForceGameType()) {
-                this.gameMode.setGameModeForPlayer(this.getServer().getDefaultGameType());
+                this.gameMode.setGameModeForPlayer(this.getServer().getDefaultGameType(), GameType.NOT_SET);
             }
             else {
-                this.gameMode.setGameModeForPlayer(GameType.byId(jt.getInt("playerGameType")));
+                this.gameMode.setGameModeForPlayer(GameType.byId(le.getInt("playerGameType")), le.contains("previousPlayerGameType", 3) ? GameType.byId(le.getInt("previousPlayerGameType")) : GameType.NOT_SET);
             }
         }
-        if (jt.contains("enteredNetherPosition", 10)) {
-            final CompoundTag jt2 = jt.getCompound("enteredNetherPosition");
-            this.enteredNetherPosition = new Vec3(jt2.getDouble("x"), jt2.getDouble("y"), jt2.getDouble("z"));
+        if (le.contains("enteredNetherPosition", 10)) {
+            final CompoundTag le2 = le.getCompound("enteredNetherPosition");
+            this.enteredNetherPosition = new Vec3(le2.getDouble("x"), le2.getDouble("y"), le2.getDouble("z"));
         }
-        this.seenCredits = jt.getBoolean("seenCredits");
-        if (jt.contains("recipeBook", 10)) {
-            this.recipeBook.fromNbt(jt.getCompound("recipeBook"));
+        this.seenCredits = le.getBoolean("seenCredits");
+        if (le.contains("recipeBook", 10)) {
+            this.recipeBook.fromNbt(le.getCompound("recipeBook"), this.server.getRecipeManager());
         }
         if (this.isSleeping()) {
             this.stopSleeping();
         }
+        if (le.contains("SpawnX", 99) && le.contains("SpawnY", 99) && le.contains("SpawnZ", 99)) {
+            this.respawnPosition = new BlockPos(le.getInt("SpawnX"), le.getInt("SpawnY"), le.getInt("SpawnZ"));
+            this.respawnForced = le.getBoolean("SpawnForced");
+            if (le.contains("SpawnDimension")) {
+                this.respawnDimension = Level.RESOURCE_KEY_CODEC.parse((DynamicOps)NbtOps.INSTANCE, le.get("SpawnDimension")).resultOrPartial((Consumer)ServerPlayer.LOGGER::error).orElse(Level.OVERWORLD);
+            }
+        }
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("playerGameType", this.gameMode.getGameModeForPlayer().getId());
-        jt.putBoolean("seenCredits", this.seenCredits);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("playerGameType", this.gameMode.getGameModeForPlayer().getId());
+        le.putInt("previousPlayerGameType", this.gameMode.getPreviousGameModeForPlayer().getId());
+        le.putBoolean("seenCredits", this.seenCredits);
         if (this.enteredNetherPosition != null) {
-            final CompoundTag jt2 = new CompoundTag();
-            jt2.putDouble("x", this.enteredNetherPosition.x);
-            jt2.putDouble("y", this.enteredNetherPosition.y);
-            jt2.putDouble("z", this.enteredNetherPosition.z);
-            jt.put("enteredNetherPosition", jt2);
+            final CompoundTag le2 = new CompoundTag();
+            le2.putDouble("x", this.enteredNetherPosition.x);
+            le2.putDouble("y", this.enteredNetherPosition.y);
+            le2.putDouble("z", this.enteredNetherPosition.z);
+            le.put("enteredNetherPosition", le2);
         }
-        final Entity akq3 = this.getRootVehicle();
-        final Entity akq4 = this.getVehicle();
-        if (akq4 != null && akq3 != this && akq3.hasOnePlayerPassenger()) {
-            final CompoundTag jt3 = new CompoundTag();
-            final CompoundTag jt4 = new CompoundTag();
-            akq3.save(jt4);
-            jt3.putUUID("Attach", akq4.getUUID());
-            jt3.put("Entity", jt4);
-            jt.put("RootVehicle", jt3);
+        final Entity aom3 = this.getRootVehicle();
+        final Entity aom4 = this.getVehicle();
+        if (aom4 != null && aom3 != this && aom3.hasOnePlayerPassenger()) {
+            final CompoundTag le3 = new CompoundTag();
+            final CompoundTag le4 = new CompoundTag();
+            aom3.save(le4);
+            le3.putUUID("Attach", aom4.getUUID());
+            le3.put("Entity", le4);
+            le.put("RootVehicle", le3);
+        }
+        le.put("recipeBook", this.recipeBook.toNbt());
+        le.putString("Dimension", this.level.dimension().location().toString());
+        if (this.respawnPosition != null) {
+            le.putInt("SpawnX", this.respawnPosition.getX());
+            le.putInt("SpawnY", this.respawnPosition.getY());
+            le.putInt("SpawnZ", this.respawnPosition.getZ());
+            le.putBoolean("SpawnForced", this.respawnForced);
+            ResourceLocation.CODEC.encodeStart((DynamicOps)NbtOps.INSTANCE, this.respawnDimension.location()).resultOrPartial((Consumer)ServerPlayer.LOGGER::error).ifPresent(lu -> le.put("SpawnDimension", lu));
         }
-        jt.put("recipeBook", this.recipeBook.toNbt());
     }
     
     public void setExperiencePoints(final int integer) {
@@ -299,8 +330,8 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public void onEnchantmentPerformed(final ItemStack ben, final int integer) {
-        super.onEnchantmentPerformed(ben, integer);
+    public void onEnchantmentPerformed(final ItemStack bki, final int integer) {
+        super.onEnchantmentPerformed(bki, integer);
         this.lastSentExp = -1;
     }
     
@@ -321,8 +352,8 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    protected void onInsideBlock(final BlockState byj) {
-        CriteriaTriggers.ENTER_BLOCK.trigger(this, byj);
+    protected void onInsideBlock(final BlockState cfj) {
+        CriteriaTriggers.ENTER_BLOCK.trigger(this, cfj);
     }
     
     @Override
@@ -353,10 +384,10 @@ public class ServerPlayer extends Player implements ContainerListener {
             }
             this.connection.send(new ClientboundRemoveEntitiesPacket(arr3));
         }
-        final Entity akq2 = this.getCamera();
-        if (akq2 != this) {
-            if (akq2.isAlive()) {
-                this.absMoveTo(akq2.getX(), akq2.getY(), akq2.getZ(), akq2.yRot, akq2.xRot);
+        final Entity aom2 = this.getCamera();
+        if (aom2 != this) {
+            if (aom2.isAlive()) {
+                this.absMoveTo(aom2.getX(), aom2.getY(), aom2.getZ(), aom2.yRot, aom2.xRot);
                 this.getLevel().getChunkSource().move(this);
                 if (this.wantsToStopRiding()) {
                     this.setCamera(this);
@@ -375,15 +406,15 @@ public class ServerPlayer extends Player implements ContainerListener {
     
     public void doTick() {
         try {
-            if (!this.isSpectator() || this.level.hasChunkAt(new BlockPos(this))) {
+            if (!this.isSpectator() || this.level.hasChunkAt(this.blockPosition())) {
                 super.tick();
             }
             for (int integer2 = 0; integer2 < this.inventory.getContainerSize(); ++integer2) {
-                final ItemStack ben3 = this.inventory.getItem(integer2);
-                if (ben3.getItem().isComplex()) {
-                    final Packet<?> lt4 = ((ComplexItem)ben3.getItem()).getUpdatePacket(ben3, this.level, this);
-                    if (lt4 != null) {
-                        this.connection.send(lt4);
+                final ItemStack bki3 = this.inventory.getItem(integer2);
+                if (bki3.getItem().isComplex()) {
+                    final Packet<?> ni4 = ((ComplexItem)bki3.getItem()).getUpdatePacket(bki3, this.level, this);
+                    if (ni4 != null) {
+                        this.connection.send(ni4);
                     }
                 }
             }
@@ -426,55 +457,58 @@ public class ServerPlayer extends Player implements ContainerListener {
             }
         }
         catch (Throwable throwable2) {
-            final CrashReport h3 = CrashReport.forThrowable(throwable2, "Ticking player");
-            final CrashReportCategory i4 = h3.addCategory("Player being ticked");
-            this.fillCrashReportCategory(i4);
-            throw new ReportedException(h3);
+            final CrashReport j3 = CrashReport.forThrowable(throwable2, "Ticking player");
+            final CrashReportCategory k4 = j3.addCategory("Player being ticked");
+            this.fillCrashReportCategory(k4);
+            throw new ReportedException(j3);
         }
     }
     
-    private void updateScoreForCriteria(final ObjectiveCriteria cwo, final int integer) {
-        this.getScoreboard().forAllObjectives(cwo, this.getScoreboardName(), cwk -> cwk.setScore(integer));
+    private void updateScoreForCriteria(final ObjectiveCriteria dfp, final int integer) {
+        this.getScoreboard().forAllObjectives(dfp, this.getScoreboardName(), dfl -> dfl.setScore(integer));
     }
     
     @Override
-    public void die(final DamageSource ajz) {
+    public void die(final DamageSource anw) {
         final boolean boolean3 = this.level.getGameRules().getBoolean(GameRules.RULE_SHOWDEATHMESSAGES);
         if (boolean3) {
-            final Component lf4 = this.getCombatTracker().getDeathMessage();
-            this.connection.send(new ClientboundPlayerCombatPacket(this.getCombatTracker(), ClientboundPlayerCombatPacket.Event.ENTITY_DIED, lf4), (future -> {
+            final Component mr4 = this.getCombatTracker().getDeathMessage();
+            this.connection.send(new ClientboundPlayerCombatPacket(this.getCombatTracker(), ClientboundPlayerCombatPacket.Event.ENTITY_DIED, mr4), (future -> {
                 if (!future.isSuccess()) {
                     final int integer4 = 256;
-                    final String string5 = lf4.getString(256);
-                    final Component lf2 = new TranslatableComponent("death.attack.message_too_long", new Object[] { new TextComponent(string5).withStyle(ChatFormatting.YELLOW) });
-                    final Component lf3 = new TranslatableComponent("death.attack.even_more_magic", new Object[] { this.getDisplayName() }).withStyle(ln -> ln.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, lf2)));
-                    this.connection.send(new ClientboundPlayerCombatPacket(this.getCombatTracker(), ClientboundPlayerCombatPacket.Event.ENTITY_DIED, lf3));
+                    final String string5 = mr4.getString(256);
+                    final Component mr2 = new TranslatableComponent("death.attack.message_too_long", new Object[] { new TextComponent(string5).withStyle(ChatFormatting.YELLOW) });
+                    final Component mr3 = new TranslatableComponent("death.attack.even_more_magic", new Object[] { this.getDisplayName() }).withStyle(nb -> nb.withHoverEvent(new HoverEvent((HoverEvent.Action<T>)HoverEvent.Action.SHOW_TEXT, (T)mr2)));
+                    this.connection.send(new ClientboundPlayerCombatPacket(this.getCombatTracker(), ClientboundPlayerCombatPacket.Event.ENTITY_DIED, mr3));
                 }
             }));
-            final Team cwn5 = this.getTeam();
-            if (cwn5 == null || cwn5.getDeathMessageVisibility() == Team.Visibility.ALWAYS) {
-                this.server.getPlayerList().broadcastMessage(lf4);
+            final Team dfo5 = this.getTeam();
+            if (dfo5 == null || dfo5.getDeathMessageVisibility() == Team.Visibility.ALWAYS) {
+                this.server.getPlayerList().broadcastMessage(mr4, ChatType.SYSTEM, Util.NIL_UUID);
             }
-            else if (cwn5.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
-                this.server.getPlayerList().broadcastToTeam(this, lf4);
+            else if (dfo5.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
+                this.server.getPlayerList().broadcastToTeam(this, mr4);
             }
-            else if (cwn5.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OWN_TEAM) {
-                this.server.getPlayerList().broadcastToAllExceptTeam(this, lf4);
+            else if (dfo5.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OWN_TEAM) {
+                this.server.getPlayerList().broadcastToAllExceptTeam(this, mr4);
             }
         }
         else {
             this.connection.send(new ClientboundPlayerCombatPacket(this.getCombatTracker(), ClientboundPlayerCombatPacket.Event.ENTITY_DIED));
         }
         this.removeEntitiesOnShoulder();
+        if (this.level.getGameRules().getBoolean(GameRules.RULE_FORGIVE_DEAD_PLAYERS)) {
+            this.tellNeutralMobsThatIDied();
+        }
         if (!this.isSpectator()) {
-            this.dropAllDeathLoot(ajz);
+            this.dropAllDeathLoot(anw);
         }
         this.getScoreboard().forAllObjectives(ObjectiveCriteria.DEATH_COUNT, this.getScoreboardName(), Score::increment);
-        final LivingEntity akz4 = this.getKillCredit();
-        if (akz4 != null) {
-            this.awardStat(Stats.ENTITY_KILLED_BY.get(akz4.getType()));
-            akz4.awardKillScore(this, this.deathScore, ajz);
-            this.createWitherRose(akz4);
+        final LivingEntity aoy4 = this.getKillCredit();
+        if (aoy4 != null) {
+            this.awardStat(Stats.ENTITY_KILLED_BY.get(aoy4.getType()));
+            aoy4.awardKillScore(this, this.deathScore, anw);
+            this.createWitherRose(aoy4);
         }
         this.level.broadcastEntityEvent(this, (byte)3);
         this.awardStat(Stats.DEATHS);
@@ -485,17 +519,22 @@ public class ServerPlayer extends Player implements ContainerListener {
         this.getCombatTracker().recheckStatus();
     }
     
+    private void tellNeutralMobsThatIDied() {
+        final AABB deg2 = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0);
+        this.level.<Entity>getLoadedEntitiesOfClass(Mob.class, deg2).stream().filter(aoz -> aoz instanceof NeutralMob).forEach(aoz -> aoz.playerDied(this));
+    }
+    
     @Override
-    public void awardKillScore(final Entity akq, final int integer, final DamageSource ajz) {
-        if (akq == this) {
+    public void awardKillScore(final Entity aom, final int integer, final DamageSource anw) {
+        if (aom == this) {
             return;
         }
-        super.awardKillScore(akq, integer, ajz);
+        super.awardKillScore(aom, integer, anw);
         this.increaseScore(integer);
         final String string5 = this.getScoreboardName();
-        final String string6 = akq.getScoreboardName();
+        final String string6 = aom.getScoreboardName();
         this.getScoreboard().forAllObjectives(ObjectiveCriteria.KILL_COUNT_ALL, string5, Score::increment);
-        if (akq instanceof Player) {
+        if (aom instanceof Player) {
             this.awardStat(Stats.PLAYER_KILLS);
             this.getScoreboard().forAllObjectives(ObjectiveCriteria.KILL_COUNT_PLAYERS, string5, Score::increment);
         }
@@ -504,13 +543,13 @@ public class ServerPlayer extends Player implements ContainerListener {
         }
         this.handleTeamKill(string5, string6, ObjectiveCriteria.TEAM_KILL);
         this.handleTeamKill(string6, string5, ObjectiveCriteria.KILLED_BY_TEAM);
-        CriteriaTriggers.PLAYER_KILLED_ENTITY.trigger(this, akq, ajz);
+        CriteriaTriggers.PLAYER_KILLED_ENTITY.trigger(this, aom, anw);
     }
     
     private void handleTeamKill(final String string1, final String string2, final ObjectiveCriteria[] arr) {
-        final PlayerTeam cwj5 = this.getScoreboard().getPlayersTeam(string2);
-        if (cwj5 != null) {
-            final int integer6 = cwj5.getColor().getId();
+        final PlayerTeam dfk5 = this.getScoreboard().getPlayersTeam(string2);
+        if (dfk5 != null) {
+            final int integer6 = dfk5.getColor().getId();
             if (integer6 >= 0 && integer6 < arr.length) {
                 this.getScoreboard().forAllObjectives(arr[integer6], string1, Score::increment);
             }
@@ -518,33 +557,33 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        final boolean boolean4 = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(ajz.msgId);
-        if (!boolean4 && this.spawnInvulnerableTime > 0 && ajz != DamageSource.OUT_OF_WORLD) {
+        final boolean boolean4 = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(anw.msgId);
+        if (!boolean4 && this.spawnInvulnerableTime > 0 && anw != DamageSource.OUT_OF_WORLD) {
             return false;
         }
-        if (ajz instanceof EntityDamageSource) {
-            final Entity akq5 = ajz.getEntity();
-            if (akq5 instanceof Player && !this.canHarmPlayer((Player)akq5)) {
+        if (anw instanceof EntityDamageSource) {
+            final Entity aom5 = anw.getEntity();
+            if (aom5 instanceof Player && !this.canHarmPlayer((Player)aom5)) {
                 return false;
             }
-            if (akq5 instanceof AbstractArrow) {
-                final AbstractArrow ayn6 = (AbstractArrow)akq5;
-                final Entity akq6 = ayn6.getOwner();
-                if (akq6 instanceof Player && !this.canHarmPlayer((Player)akq6)) {
+            if (aom5 instanceof AbstractArrow) {
+                final AbstractArrow beg6 = (AbstractArrow)aom5;
+                final Entity aom6 = beg6.getOwner();
+                if (aom6 instanceof Player && !this.canHarmPlayer((Player)aom6)) {
                     return false;
                 }
             }
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
-    public boolean canHarmPlayer(final Player ayj) {
-        return this.isPvpAllowed() && super.canHarmPlayer(ayj);
+    public boolean canHarmPlayer(final Player bec) {
+        return this.isPvpAllowed() && super.canHarmPlayer(bec);
     }
     
     private boolean isPvpAllowed() {
@@ -553,99 +592,91 @@ public class ServerPlayer extends Player implements ContainerListener {
     
     @Nullable
     @Override
-    public Entity changeDimension(final DimensionType cbi) {
+    public Entity changeDimension(final ServerLevel zd) {
         this.isChangingDimension = true;
-        final DimensionType cbi2 = this.dimension;
-        if (cbi2 == DimensionType.THE_END && cbi == DimensionType.OVERWORLD) {
+        final ServerLevel zd2 = this.getLevel();
+        final ResourceKey<Level> ug4 = zd2.dimension();
+        if (ug4 == Level.END && zd.dimension() == Level.OVERWORLD) {
             this.unRide();
             this.getLevel().removePlayerImmediately(this);
             if (!this.wonGame) {
                 this.wonGame = true;
-                this.connection.send(new ClientboundGameEventPacket(4, this.seenCredits ? 0.0f : 1.0f));
+                this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.WIN_GAME, this.seenCredits ? 0.0f : 1.0f));
                 this.seenCredits = true;
             }
             return this;
         }
-        final ServerLevel xd4 = this.server.getLevel(cbi2);
-        this.dimension = cbi;
-        final ServerLevel xd5 = this.server.getLevel(cbi);
-        final LevelData crm6 = xd5.getLevelData();
-        this.connection.send(new ClientboundRespawnPacket(cbi, LevelData.obfuscateSeed(crm6.getSeed()), crm6.getGeneratorType(), this.gameMode.getGameModeForPlayer()));
-        this.connection.send(new ClientboundChangeDifficultyPacket(crm6.getDifficulty(), crm6.isDifficultyLocked()));
-        final PlayerList zo7 = this.server.getPlayerList();
-        zo7.sendPlayerPermissionLevel(this);
-        xd4.removePlayerImmediately(this);
+        final LevelData dab5 = zd.getLevelData();
+        this.connection.send(new ClientboundRespawnPacket(zd.dimensionTypeKey(), zd.dimension(), BiomeManager.obfuscateSeed(zd.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), zd.isDebug(), zd.isFlat(), true));
+        this.connection.send(new ClientboundChangeDifficultyPacket(dab5.getDifficulty(), dab5.isDifficultyLocked()));
+        final PlayerList abp6 = this.server.getPlayerList();
+        abp6.sendPlayerPermissionLevel(this);
+        zd2.removePlayerImmediately(this);
         this.removed = false;
-        double double8 = this.getX();
-        double double9 = this.getY();
-        double double10 = this.getZ();
-        float float14 = this.xRot;
-        float float15 = this.yRot;
-        final double double11 = 8.0;
-        final float float16 = float15;
-        xd4.getProfiler().push("moving");
-        if (cbi2 == DimensionType.OVERWORLD && cbi == DimensionType.NETHER) {
-            this.enteredNetherPosition = this.position();
-            double8 /= 8.0;
-            double10 /= 8.0;
+        double double7 = this.getX();
+        double double8 = this.getY();
+        double double9 = this.getZ();
+        float float13 = this.xRot;
+        final float float15;
+        float float14 = float15 = this.yRot;
+        zd2.getProfiler().push("moving");
+        if (zd.dimension() == Level.END) {
+            final BlockPos fu16 = ServerLevel.END_SPAWN_POINT;
+            double7 = fu16.getX();
+            double8 = fu16.getY();
+            double9 = fu16.getZ();
+            float14 = 90.0f;
+            float13 = 0.0f;
         }
-        else if (cbi2 == DimensionType.NETHER && cbi == DimensionType.OVERWORLD) {
-            double8 *= 8.0;
-            double10 *= 8.0;
-        }
-        else if (cbi2 == DimensionType.OVERWORLD && cbi == DimensionType.THE_END) {
-            final BlockPos fk19 = xd5.getDimensionSpecificSpawn();
-            double8 = fk19.getX();
-            double9 = fk19.getY();
-            double10 = fk19.getZ();
-            float15 = 90.0f;
-            float14 = 0.0f;
-        }
-        this.moveTo(double8, double9, double10, float15, float14);
-        xd4.getProfiler().pop();
-        xd4.getProfiler().push("placing");
-        final double double12 = Math.min(-2.9999872E7, xd5.getWorldBorder().getMinX() + 16.0);
-        final double double13 = Math.min(-2.9999872E7, xd5.getWorldBorder().getMinZ() + 16.0);
-        final double double14 = Math.min(2.9999872E7, xd5.getWorldBorder().getMaxX() - 16.0);
-        final double double15 = Math.min(2.9999872E7, xd5.getWorldBorder().getMaxZ() - 16.0);
-        double8 = Mth.clamp(double8, double12, double14);
-        double10 = Mth.clamp(double10, double13, double15);
-        this.moveTo(double8, double9, double10, float15, float14);
-        if (cbi == DimensionType.THE_END) {
-            final int integer27 = Mth.floor(this.getX());
-            final int integer28 = Mth.floor(this.getY()) - 1;
-            final int integer29 = Mth.floor(this.getZ());
-            final int integer30 = 1;
-            final int integer31 = 0;
-            for (int integer32 = -2; integer32 <= 2; ++integer32) {
-                for (int integer33 = -2; integer33 <= 2; ++integer33) {
-                    for (int integer34 = -1; integer34 < 3; ++integer34) {
-                        final int integer35 = integer27 + integer33 * 1 + integer32 * 0;
-                        final int integer36 = integer28 + integer34;
-                        final int integer37 = integer29 + integer33 * 0 - integer32 * 1;
-                        final boolean boolean38 = integer34 < 0;
-                        xd5.setBlockAndUpdate(new BlockPos(integer35, integer36, integer37), boolean38 ? Blocks.OBSIDIAN.defaultBlockState() : Blocks.AIR.defaultBlockState());
-                    }
-                }
+        else {
+            if (ug4 == Level.OVERWORLD && zd.dimension() == Level.NETHER) {
+                this.enteredNetherPosition = this.position();
             }
-            this.moveTo(integer27, integer28, integer29, float15, 0.0f);
+            final DimensionType cif16 = zd2.dimensionType();
+            final DimensionType cif17 = zd.dimensionType();
+            final double double10 = 8.0;
+            if (!cif16.shrunk() && cif17.shrunk()) {
+                double7 /= 8.0;
+                double9 /= 8.0;
+            }
+            else if (cif16.shrunk() && !cif17.shrunk()) {
+                double7 *= 8.0;
+                double9 *= 8.0;
+            }
+        }
+        this.moveTo(double7, double8, double9, float14, float13);
+        zd2.getProfiler().pop();
+        zd2.getProfiler().push("placing");
+        final double double11 = Math.min(-2.9999872E7, zd.getWorldBorder().getMinX() + 16.0);
+        final double double10 = Math.min(-2.9999872E7, zd.getWorldBorder().getMinZ() + 16.0);
+        final double double12 = Math.min(2.9999872E7, zd.getWorldBorder().getMaxX() - 16.0);
+        final double double13 = Math.min(2.9999872E7, zd.getWorldBorder().getMaxZ() - 16.0);
+        double7 = Mth.clamp(double7, double11, double12);
+        double9 = Mth.clamp(double9, double10, double13);
+        this.moveTo(double7, double8, double9, float14, float13);
+        if (zd.dimension() == Level.END) {
+            final int integer24 = Mth.floor(this.getX());
+            final int integer25 = Mth.floor(this.getY()) - 1;
+            final int integer26 = Mth.floor(this.getZ());
+            ServerLevel.makeObsidianPlatform(zd);
+            this.moveTo(integer24, integer25, integer26, float14, 0.0f);
             this.setDeltaMovement(Vec3.ZERO);
         }
-        else if (!xd5.getPortalForcer().findAndMoveToPortal(this, float16)) {
-            xd5.getPortalForcer().createPortal(this);
-            xd5.getPortalForcer().findAndMoveToPortal(this, float16);
+        else if (!zd.getPortalForcer().findAndMoveToPortal(this, float15)) {
+            zd.getPortalForcer().createPortal(this);
+            zd.getPortalForcer().findAndMoveToPortal(this, float15);
         }
-        xd4.getProfiler().pop();
-        this.setLevel(xd5);
-        xd5.addDuringPortalTeleport(this);
-        this.triggerDimensionChangeTriggers(xd4);
-        this.connection.teleport(this.getX(), this.getY(), this.getZ(), float15, float14);
-        this.gameMode.setLevel(xd5);
+        zd2.getProfiler().pop();
+        this.setLevel(zd);
+        zd.addDuringPortalTeleport(this);
+        this.triggerDimensionChangeTriggers(zd2);
+        this.connection.teleport(this.getX(), this.getY(), this.getZ(), float14, float13);
+        this.gameMode.setLevel(zd);
         this.connection.send(new ClientboundPlayerAbilitiesPacket(this.abilities));
-        zo7.sendLevelInfo(this, xd5);
-        zo7.sendAllPlayerInfo(this);
-        for (final MobEffectInstance akk28 : this.getActiveEffects()) {
-            this.connection.send(new ClientboundUpdateMobEffectPacket(this.getId(), akk28));
+        abp6.sendLevelInfo(this, zd);
+        abp6.sendAllPlayerInfo(this);
+        for (final MobEffectInstance aog25 : this.getActiveEffects()) {
+            this.connection.send(new ClientboundUpdateMobEffectPacket(this.getId(), aog25));
         }
         this.connection.send(new ClientboundLevelEventPacket(1032, BlockPos.ZERO, 0, false));
         this.lastSentExp = -1;
@@ -654,47 +685,96 @@ public class ServerPlayer extends Player implements ContainerListener {
         return this;
     }
     
-    private void triggerDimensionChangeTriggers(final ServerLevel xd) {
-        final DimensionType cbi3 = xd.dimension.getType();
-        final DimensionType cbi4 = this.level.dimension.getType();
-        CriteriaTriggers.CHANGED_DIMENSION.trigger(this, cbi3, cbi4);
-        if (cbi3 == DimensionType.NETHER && cbi4 == DimensionType.OVERWORLD && this.enteredNetherPosition != null) {
+    private void triggerDimensionChangeTriggers(final ServerLevel zd) {
+        final ResourceKey<Level> ug3 = zd.dimension();
+        final ResourceKey<Level> ug4 = this.level.dimension();
+        CriteriaTriggers.CHANGED_DIMENSION.trigger(this, ug3, ug4);
+        if (ug3 == Level.NETHER && ug4 == Level.OVERWORLD && this.enteredNetherPosition != null) {
             CriteriaTriggers.NETHER_TRAVEL.trigger(this, this.enteredNetherPosition);
         }
-        if (cbi4 != DimensionType.NETHER) {
+        if (ug4 != Level.NETHER) {
             this.enteredNetherPosition = null;
         }
     }
     
     @Override
-    public boolean broadcastToPlayer(final ServerPlayer xe) {
-        if (xe.isSpectator()) {
+    public boolean broadcastToPlayer(final ServerPlayer ze) {
+        if (ze.isSpectator()) {
             return this.getCamera() == this;
         }
-        return !this.isSpectator() && super.broadcastToPlayer(xe);
+        return !this.isSpectator() && super.broadcastToPlayer(ze);
     }
     
-    private void broadcast(final BlockEntity bwl) {
-        if (bwl != null) {
-            final ClientboundBlockEntityDataPacket mh3 = bwl.getUpdatePacket();
-            if (mh3 != null) {
-                this.connection.send(mh3);
+    private void broadcast(final BlockEntity cdl) {
+        if (cdl != null) {
+            final ClientboundBlockEntityDataPacket nv3 = cdl.getUpdatePacket();
+            if (nv3 != null) {
+                this.connection.send(nv3);
             }
         }
     }
     
     @Override
-    public void take(final Entity akq, final int integer) {
-        super.take(akq, integer);
+    public void take(final Entity aom, final int integer) {
+        super.take(aom, integer);
         this.containerMenu.broadcastChanges();
     }
     
     @Override
-    public Either<BedSleepingProblem, Unit> startSleepInBed(final BlockPos fk) {
-        return (Either<BedSleepingProblem, Unit>)super.startSleepInBed(fk).ifRight(aca -> {
+    public Either<BedSleepingProblem, Unit> startSleepInBed(final BlockPos fu) {
+        final Direction fz3 = this.level.getBlockState(fu).<Direction>getValue((Property<Direction>)HorizontalDirectionalBlock.FACING);
+        if (this.isSleeping() || !this.isAlive()) {
+            return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.OTHER_PROBLEM);
+        }
+        if (!this.level.dimensionType().natural()) {
+            return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.NOT_POSSIBLE_HERE);
+        }
+        if (!this.bedInRange(fu, fz3)) {
+            return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.TOO_FAR_AWAY);
+        }
+        if (this.bedBlocked(fu, fz3)) {
+            return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.OBSTRUCTED);
+        }
+        this.setRespawnPosition(this.level.dimension(), fu, false, true);
+        if (this.level.isDay()) {
+            return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.NOT_POSSIBLE_NOW);
+        }
+        if (!this.isCreative()) {
+            final double double4 = 8.0;
+            final double double5 = 5.0;
+            final Vec3 dem8 = Vec3.atBottomCenterOf(fu);
+            final List<Monster> list9 = this.level.<Monster>getEntitiesOfClass(Monster.class, new AABB(dem8.x() - 8.0, dem8.y() - 5.0, dem8.z() - 8.0, dem8.x() + 8.0, dem8.y() + 5.0, dem8.z() + 8.0), bcb -> bcb.isPreventingPlayerRest(this));
+            if (!list9.isEmpty()) {
+                return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.NOT_SAFE);
+            }
+        }
+        final Either<BedSleepingProblem, Unit> either4 = (Either<BedSleepingProblem, Unit>)super.startSleepInBed(fu).ifRight(ael -> {
             this.awardStat(Stats.SLEEP_IN_BED);
             CriteriaTriggers.SLEPT_IN_BED.trigger(this);
+            return;
         });
+        ((ServerLevel)this.level).updateSleepingPlayerList();
+        return either4;
+    }
+    
+    @Override
+    public void startSleeping(final BlockPos fu) {
+        this.resetStat(Stats.CUSTOM.get(Stats.TIME_SINCE_REST));
+        super.startSleeping(fu);
+    }
+    
+    private boolean bedInRange(final BlockPos fu, final Direction fz) {
+        return this.isReachableBedBlock(fu) || this.isReachableBedBlock(fu.relative(fz.getOpposite()));
+    }
+    
+    private boolean isReachableBedBlock(final BlockPos fu) {
+        final Vec3 dem3 = Vec3.atBottomCenterOf(fu);
+        return Math.abs(this.getX() - dem3.x()) <= 3.0 && Math.abs(this.getY() - dem3.y()) <= 2.0 && Math.abs(this.getZ() - dem3.z()) <= 3.0;
+    }
+    
+    private boolean bedBlocked(final BlockPos fu, final Direction fz) {
+        final BlockPos fu2 = fu.above();
+        return !this.freeAt(fu2) || !this.freeAt(fu2.relative(fz.getOpposite()));
     }
     
     @Override
@@ -709,13 +789,13 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public boolean startRiding(final Entity akq, final boolean boolean2) {
-        final Entity akq2 = this.getVehicle();
-        if (!super.startRiding(akq, boolean2)) {
+    public boolean startRiding(final Entity aom, final boolean boolean2) {
+        final Entity aom2 = this.getVehicle();
+        if (!super.startRiding(aom, boolean2)) {
             return false;
         }
-        final Entity akq3 = this.getVehicle();
-        if (akq3 != akq2 && this.connection != null) {
+        final Entity aom3 = this.getVehicle();
+        if (aom3 != aom2 && this.connection != null) {
             this.connection.teleport(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
         }
         return true;
@@ -723,43 +803,42 @@ public class ServerPlayer extends Player implements ContainerListener {
     
     @Override
     public void stopRiding() {
-        final Entity akq2 = this.getVehicle();
+        final Entity aom2 = this.getVehicle();
         super.stopRiding();
-        final Entity akq3 = this.getVehicle();
-        if (akq3 != akq2 && this.connection != null) {
+        final Entity aom3 = this.getVehicle();
+        if (aom3 != aom2 && this.connection != null) {
             this.connection.teleport(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
         }
     }
     
     @Override
-    public boolean isInvulnerableTo(final DamageSource ajz) {
-        return super.isInvulnerableTo(ajz) || this.isChangingDimension() || (this.abilities.invulnerable && ajz == DamageSource.WITHER);
+    public boolean isInvulnerableTo(final DamageSource anw) {
+        return super.isInvulnerableTo(anw) || this.isChangingDimension() || (this.abilities.invulnerable && anw == DamageSource.WITHER);
     }
     
     @Override
-    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState byj, final BlockPos fk) {
+    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState cfj, final BlockPos fu) {
     }
     
     @Override
-    protected void onChangedBlock(final BlockPos fk) {
+    protected void onChangedBlock(final BlockPos fu) {
         if (!this.isSpectator()) {
-            super.onChangedBlock(fk);
+            super.onChangedBlock(fu);
         }
     }
     
     public void doCheckFallDamage(final double double1, final boolean boolean2) {
-        final BlockPos fk5 = this.getOnPos();
-        if (!this.level.hasChunkAt(fk5)) {
+        final BlockPos fu5 = this.getOnPos();
+        if (!this.level.hasChunkAt(fu5)) {
             return;
         }
-        final BlockState byj6 = this.level.getBlockState(fk5);
-        super.checkFallDamage(double1, boolean2, byj6, fk5);
+        super.checkFallDamage(double1, boolean2, this.level.getBlockState(fu5), fu5);
     }
     
     @Override
-    public void openTextEdit(final SignBlockEntity bxh) {
-        bxh.setAllowedPlayerEditor(this);
-        this.connection.send(new ClientboundOpenSignEditorPacket(bxh.getBlockPos()));
+    public void openTextEdit(final SignBlockEntity ceh) {
+        ceh.setAllowedPlayerEditor(this);
+        this.connection.send(new ClientboundOpenSignEditorPacket(ceh.getBlockPos()));
     }
     
     private void nextContainerCounter() {
@@ -767,86 +846,86 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public OptionalInt openMenu(@Nullable final MenuProvider ajo) {
-        if (ajo == null) {
+    public OptionalInt openMenu(@Nullable final MenuProvider anj) {
+        if (anj == null) {
             return OptionalInt.empty();
         }
         if (this.containerMenu != this.inventoryMenu) {
             this.closeContainer();
         }
         this.nextContainerCounter();
-        final AbstractContainerMenu ban3 = ajo.createMenu(this.containerCounter, this.inventory, this);
-        if (ban3 == null) {
+        final AbstractContainerMenu bgi3 = anj.createMenu(this.containerCounter, this.inventory, this);
+        if (bgi3 == null) {
             if (this.isSpectator()) {
-                this.displayClientMessage(new TranslatableComponent("container.spectatorCantOpen", new Object[0]).withStyle(ChatFormatting.RED), true);
+                this.displayClientMessage(new TranslatableComponent("container.spectatorCantOpen").withStyle(ChatFormatting.RED), true);
             }
             return OptionalInt.empty();
         }
-        this.connection.send(new ClientboundOpenScreenPacket(ban3.containerId, ban3.getType(), ajo.getDisplayName()));
-        ban3.addSlotListener(this);
-        this.containerMenu = ban3;
+        this.connection.send(new ClientboundOpenScreenPacket(bgi3.containerId, bgi3.getType(), anj.getDisplayName()));
+        bgi3.addSlotListener(this);
+        this.containerMenu = bgi3;
         return OptionalInt.of(this.containerCounter);
     }
     
     @Override
-    public void sendMerchantOffers(final int integer1, final MerchantOffers bja, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6) {
-        this.connection.send(new ClientboundMerchantOffersPacket(integer1, bja, integer3, integer4, boolean5, boolean6));
+    public void sendMerchantOffers(final int integer1, final MerchantOffers bpa, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6) {
+        this.connection.send(new ClientboundMerchantOffersPacket(integer1, bpa, integer3, integer4, boolean5, boolean6));
     }
     
     @Override
-    public void openHorseInventory(final AbstractHorse aue, final Container aje) {
+    public void openHorseInventory(final AbstractHorse azm, final Container amz) {
         if (this.containerMenu != this.inventoryMenu) {
             this.closeContainer();
         }
         this.nextContainerCounter();
-        this.connection.send(new ClientboundHorseScreenOpenPacket(this.containerCounter, aje.getContainerSize(), aue.getId()));
-        (this.containerMenu = new HorseInventoryMenu(this.containerCounter, this.inventory, aje, aue)).addSlotListener(this);
+        this.connection.send(new ClientboundHorseScreenOpenPacket(this.containerCounter, amz.getContainerSize(), azm.getId()));
+        (this.containerMenu = new HorseInventoryMenu(this.containerCounter, this.inventory, amz, azm)).addSlotListener(this);
     }
     
     @Override
-    public void openItemGui(final ItemStack ben, final InteractionHand ajk) {
-        final Item bei4 = ben.getItem();
-        if (bei4 == Items.WRITTEN_BOOK) {
-            if (WrittenBookItem.resolveBookComponents(ben, this.createCommandSourceStack(), this)) {
+    public void openItemGui(final ItemStack bki, final InteractionHand anf) {
+        final Item bke4 = bki.getItem();
+        if (bke4 == Items.WRITTEN_BOOK) {
+            if (WrittenBookItem.resolveBookComponents(bki, this.createCommandSourceStack(), this)) {
                 this.containerMenu.broadcastChanges();
             }
-            this.connection.send(new ClientboundOpenBookPacket(ajk));
+            this.connection.send(new ClientboundOpenBookPacket(anf));
         }
     }
     
     @Override
-    public void openCommandBlock(final CommandBlockEntity bwq) {
-        bwq.setSendToClient(true);
-        this.broadcast(bwq);
+    public void openCommandBlock(final CommandBlockEntity cdq) {
+        cdq.setSendToClient(true);
+        this.broadcast(cdq);
     }
     
     @Override
-    public void slotChanged(final AbstractContainerMenu ban, final int integer, final ItemStack ben) {
-        if (ban.getSlot(integer) instanceof ResultSlot) {
+    public void slotChanged(final AbstractContainerMenu bgi, final int integer, final ItemStack bki) {
+        if (bgi.getSlot(integer) instanceof ResultSlot) {
             return;
         }
-        if (ban == this.inventoryMenu) {
-            CriteriaTriggers.INVENTORY_CHANGED.trigger(this, this.inventory);
+        if (bgi == this.inventoryMenu) {
+            CriteriaTriggers.INVENTORY_CHANGED.trigger(this, this.inventory, bki);
         }
         if (this.ignoreSlotUpdateHack) {
             return;
         }
-        this.connection.send(new ClientboundContainerSetSlotPacket(ban.containerId, integer, ben));
+        this.connection.send(new ClientboundContainerSetSlotPacket(bgi.containerId, integer, bki));
     }
     
-    public void refreshContainer(final AbstractContainerMenu ban) {
-        this.refreshContainer(ban, ban.getItems());
+    public void refreshContainer(final AbstractContainerMenu bgi) {
+        this.refreshContainer(bgi, bgi.getItems());
     }
     
     @Override
-    public void refreshContainer(final AbstractContainerMenu ban, final NonNullList<ItemStack> fy) {
-        this.connection.send(new ClientboundContainerSetContentPacket(ban.containerId, fy));
+    public void refreshContainer(final AbstractContainerMenu bgi, final NonNullList<ItemStack> gi) {
+        this.connection.send(new ClientboundContainerSetContentPacket(bgi.containerId, gi));
         this.connection.send(new ClientboundContainerSetSlotPacket(-1, -1, this.inventory.getCarried()));
     }
     
     @Override
-    public void setContainerData(final AbstractContainerMenu ban, final int integer2, final int integer3) {
-        this.connection.send(new ClientboundContainerSetDataPacket(ban.containerId, integer2, integer3));
+    public void setContainerData(final AbstractContainerMenu bgi, final int integer2, final int integer3) {
+        this.connection.send(new ClientboundContainerSetDataPacket(bgi.containerId, integer2, integer3));
     }
     
     public void closeContainer() {
@@ -880,15 +959,15 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public void awardStat(final Stat<?> aao, final int integer) {
-        this.stats.increment(this, aao, integer);
-        this.getScoreboard().forAllObjectives(aao, this.getScoreboardName(), cwk -> cwk.add(integer));
+    public void awardStat(final Stat<?> acr, final int integer) {
+        this.stats.increment(this, acr, integer);
+        this.getScoreboard().forAllObjectives(acr, this.getScoreboardName(), dfl -> dfl.add(integer));
     }
     
     @Override
-    public void resetStat(final Stat<?> aao) {
-        this.stats.setValue(this, aao, 0);
-        this.getScoreboard().forAllObjectives(aao, this.getScoreboardName(), Score::reset);
+    public void resetStat(final Stat<?> acr) {
+        this.stats.setValue(this, acr, 0);
+        this.getScoreboard().forAllObjectives(acr, this.getScoreboardName(), Score::reset);
     }
     
     @Override
@@ -899,8 +978,8 @@ public class ServerPlayer extends Player implements ContainerListener {
     @Override
     public void awardRecipesByKey(final ResourceLocation[] arr) {
         final List<Recipe<?>> list3 = Lists.newArrayList();
-        for (final ResourceLocation sm7 : arr) {
-            this.server.getRecipeManager().byKey(sm7).ifPresent(list3::add);
+        for (final ResourceLocation uh7 : arr) {
+            this.server.getRecipeManager().byKey(uh7).ifPresent(list3::add);
         }
         this.awardRecipes(list3);
     }
@@ -933,8 +1012,8 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public void displayClientMessage(final Component lf, final boolean boolean2) {
-        this.connection.send(new ClientboundChatPacket(lf, boolean2 ? ChatType.GAME_INFO : ChatType.CHAT));
+    public void displayClientMessage(final Component mr, final boolean boolean2) {
+        this.connection.send(new ClientboundChatPacket(mr, boolean2 ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID));
     }
     
     @Override
@@ -946,56 +1025,56 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public void lookAt(final EntityAnchorArgument.Anchor a, final Vec3 cvl) {
-        super.lookAt(a, cvl);
-        this.connection.send(new ClientboundPlayerLookAtPacket(a, cvl.x, cvl.y, cvl.z));
+    public void lookAt(final EntityAnchorArgument.Anchor a, final Vec3 dem) {
+        super.lookAt(a, dem);
+        this.connection.send(new ClientboundPlayerLookAtPacket(a, dem.x, dem.y, dem.z));
     }
     
-    public void lookAt(final EntityAnchorArgument.Anchor a1, final Entity akq, final EntityAnchorArgument.Anchor a3) {
-        final Vec3 cvl5 = a3.apply(akq);
-        super.lookAt(a1, cvl5);
-        this.connection.send(new ClientboundPlayerLookAtPacket(a1, akq, a3));
+    public void lookAt(final EntityAnchorArgument.Anchor a1, final Entity aom, final EntityAnchorArgument.Anchor a3) {
+        final Vec3 dem5 = a3.apply(aom);
+        super.lookAt(a1, dem5);
+        this.connection.send(new ClientboundPlayerLookAtPacket(a1, aom, a3));
     }
     
-    public void restoreFrom(final ServerPlayer xe, final boolean boolean2) {
+    public void restoreFrom(final ServerPlayer ze, final boolean boolean2) {
         if (boolean2) {
-            this.inventory.replaceWith(xe.inventory);
-            this.setHealth(xe.getHealth());
-            this.foodData = xe.foodData;
-            this.experienceLevel = xe.experienceLevel;
-            this.totalExperience = xe.totalExperience;
-            this.experienceProgress = xe.experienceProgress;
-            this.setScore(xe.getScore());
-            this.portalEntranceBlock = xe.portalEntranceBlock;
-            this.portalEntranceOffset = xe.portalEntranceOffset;
-            this.portalEntranceForwards = xe.portalEntranceForwards;
+            this.inventory.replaceWith(ze.inventory);
+            this.setHealth(ze.getHealth());
+            this.foodData = ze.foodData;
+            this.experienceLevel = ze.experienceLevel;
+            this.totalExperience = ze.totalExperience;
+            this.experienceProgress = ze.experienceProgress;
+            this.setScore(ze.getScore());
+            this.portalEntranceBlock = ze.portalEntranceBlock;
+            this.portalEntranceOffset = ze.portalEntranceOffset;
+            this.portalEntranceForwards = ze.portalEntranceForwards;
         }
-        else if (this.level.getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) || xe.isSpectator()) {
-            this.inventory.replaceWith(xe.inventory);
-            this.experienceLevel = xe.experienceLevel;
-            this.totalExperience = xe.totalExperience;
-            this.experienceProgress = xe.experienceProgress;
-            this.setScore(xe.getScore());
+        else if (this.level.getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) || ze.isSpectator()) {
+            this.inventory.replaceWith(ze.inventory);
+            this.experienceLevel = ze.experienceLevel;
+            this.totalExperience = ze.totalExperience;
+            this.experienceProgress = ze.experienceProgress;
+            this.setScore(ze.getScore());
         }
-        this.enchantmentSeed = xe.enchantmentSeed;
-        this.enderChestInventory = xe.enderChestInventory;
-        this.getEntityData().<Byte>set(ServerPlayer.DATA_PLAYER_MODE_CUSTOMISATION, (Byte)xe.getEntityData().<T>get((EntityDataAccessor<T>)ServerPlayer.DATA_PLAYER_MODE_CUSTOMISATION));
+        this.enchantmentSeed = ze.enchantmentSeed;
+        this.enderChestInventory = ze.enderChestInventory;
+        this.getEntityData().<Byte>set(ServerPlayer.DATA_PLAYER_MODE_CUSTOMISATION, (Byte)ze.getEntityData().<T>get((EntityDataAccessor<T>)ServerPlayer.DATA_PLAYER_MODE_CUSTOMISATION));
         this.lastSentExp = -1;
         this.lastSentHealth = -1.0f;
         this.lastSentFood = -1;
-        this.recipeBook.copyOverData(xe.recipeBook);
-        this.entitiesToRemove.addAll(xe.entitiesToRemove);
-        this.seenCredits = xe.seenCredits;
-        this.enteredNetherPosition = xe.enteredNetherPosition;
-        this.setShoulderEntityLeft(xe.getShoulderEntityLeft());
-        this.setShoulderEntityRight(xe.getShoulderEntityRight());
+        this.recipeBook.copyOverData(ze.recipeBook);
+        this.entitiesToRemove.addAll(ze.entitiesToRemove);
+        this.seenCredits = ze.seenCredits;
+        this.enteredNetherPosition = ze.enteredNetherPosition;
+        this.setShoulderEntityLeft(ze.getShoulderEntityLeft());
+        this.setShoulderEntityRight(ze.getShoulderEntityRight());
     }
     
     @Override
-    protected void onEffectAdded(final MobEffectInstance akk) {
-        super.onEffectAdded(akk);
-        this.connection.send(new ClientboundUpdateMobEffectPacket(this.getId(), akk));
-        if (akk.getEffect() == MobEffects.LEVITATION) {
+    protected void onEffectAdded(final MobEffectInstance aog) {
+        super.onEffectAdded(aog);
+        this.connection.send(new ClientboundUpdateMobEffectPacket(this.getId(), aog));
+        if (aog.getEffect() == MobEffects.LEVITATION) {
             this.levitationStartTime = this.tickCount;
             this.levitationStartPos = this.position();
         }
@@ -1003,17 +1082,17 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    protected void onEffectUpdated(final MobEffectInstance akk, final boolean boolean2) {
-        super.onEffectUpdated(akk, boolean2);
-        this.connection.send(new ClientboundUpdateMobEffectPacket(this.getId(), akk));
+    protected void onEffectUpdated(final MobEffectInstance aog, final boolean boolean2) {
+        super.onEffectUpdated(aog, boolean2);
+        this.connection.send(new ClientboundUpdateMobEffectPacket(this.getId(), aog));
         CriteriaTriggers.EFFECTS_CHANGED.trigger(this);
     }
     
     @Override
-    protected void onEffectRemoved(final MobEffectInstance akk) {
-        super.onEffectRemoved(akk);
-        this.connection.send(new ClientboundRemoveMobEffectPacket(this.getId(), akk.getEffect()));
-        if (akk.getEffect() == MobEffects.LEVITATION) {
+    protected void onEffectRemoved(final MobEffectInstance aog) {
+        super.onEffectRemoved(aog);
+        this.connection.send(new ClientboundRemoveMobEffectPacket(this.getId(), aog.getEffect()));
+        if (aog.getEffect() == MobEffects.LEVITATION) {
             this.levitationStartPos = null;
         }
         CriteriaTriggers.EFFECTS_CHANGED.trigger(this);
@@ -1025,19 +1104,19 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public void forceMove(final double double1, final double double2, final double double3) {
+    public void moveTo(final double double1, final double double2, final double double3) {
         this.connection.teleport(double1, double2, double3, this.yRot, this.xRot);
         this.connection.resetPosition();
     }
     
     @Override
-    public void crit(final Entity akq) {
-        this.getLevel().getChunkSource().broadcastAndSend(this, new ClientboundAnimatePacket(akq, 4));
+    public void crit(final Entity aom) {
+        this.getLevel().getChunkSource().broadcastAndSend(this, new ClientboundAnimatePacket(aom, 4));
     }
     
     @Override
-    public void magicCrit(final Entity akq) {
-        this.getLevel().getChunkSource().broadcastAndSend(this, new ClientboundAnimatePacket(akq, 5));
+    public void magicCrit(final Entity aom) {
+        this.getLevel().getChunkSource().broadcastAndSend(this, new ClientboundAnimatePacket(aom, 5));
     }
     
     @Override
@@ -1054,10 +1133,10 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public void setGameMode(final GameType bjt) {
-        this.gameMode.setGameModeForPlayer(bjt);
-        this.connection.send(new ClientboundGameEventPacket(3, (float)bjt.getId()));
-        if (bjt == GameType.SPECTATOR) {
+    public void setGameMode(final GameType bpy) {
+        this.gameMode.setGameModeForPlayer(bpy);
+        this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float)bpy.getId()));
+        if (bpy == GameType.SPECTATOR) {
             this.removeEntitiesOnShoulder();
             this.stopRiding();
         }
@@ -1079,17 +1158,17 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public void sendMessage(final Component lf) {
-        this.sendMessage(lf, ChatType.SYSTEM);
+    public void sendMessage(final Component mr, final UUID uUID) {
+        this.sendMessage(mr, ChatType.SYSTEM, uUID);
     }
     
-    public void sendMessage(final Component lf, final ChatType ld) {
-        this.connection.send(new ClientboundChatPacket(lf, ld), (future -> {
-            if (!future.isSuccess() && (ld == ChatType.GAME_INFO || ld == ChatType.SYSTEM)) {
-                final int integer5 = 256;
-                final String string6 = lf.getString(256);
-                final Component lf2 = new TextComponent(string6).withStyle(ChatFormatting.YELLOW);
-                this.connection.send(new ClientboundChatPacket(new TranslatableComponent("multiplayer.message_not_delivered", new Object[] { lf2 }).withStyle(ChatFormatting.RED), ChatType.SYSTEM));
+    public void sendMessage(final Component mr, final ChatType mo, final UUID uUID) {
+        this.connection.send(new ClientboundChatPacket(mr, mo, uUID), (future -> {
+            if (!future.isSuccess() && (mo == ChatType.GAME_INFO || mo == ChatType.SYSTEM)) {
+                final int integer6 = 256;
+                final String string7 = mr.getString(256);
+                final Component mr2 = new TextComponent(string7).withStyle(ChatFormatting.YELLOW);
+                this.connection.send(new ClientboundChatPacket(new TranslatableComponent("multiplayer.message_not_delivered", new Object[] { mr2 }).withStyle(ChatFormatting.RED), ChatType.SYSTEM, uUID));
             }
         }));
     }
@@ -1101,12 +1180,11 @@ public class ServerPlayer extends Player implements ContainerListener {
         return string2;
     }
     
-    public void updateOptions(final ServerboundClientInformationPacket pr) {
-        this.language = pr.getLanguage();
-        this.chatVisibility = pr.getChatVisibility();
-        this.canChatColor = pr.getChatColors();
-        this.getEntityData().<Byte>set(ServerPlayer.DATA_PLAYER_MODE_CUSTOMISATION, (byte)pr.getModelCustomisation());
-        this.getEntityData().<Byte>set(ServerPlayer.DATA_PLAYER_MAIN_HAND, (byte)((pr.getMainHand() != HumanoidArm.LEFT) ? 1 : 0));
+    public void updateOptions(final ServerboundClientInformationPacket rf) {
+        this.chatVisibility = rf.getChatVisibility();
+        this.canChatColor = rf.getChatColors();
+        this.getEntityData().<Byte>set(ServerPlayer.DATA_PLAYER_MODE_CUSTOMISATION, (byte)rf.getModelCustomisation());
+        this.getEntityData().<Byte>set(ServerPlayer.DATA_PLAYER_MAIN_HAND, (byte)((rf.getMainHand() != HumanoidArm.LEFT) ? 1 : 0));
     }
     
     public ChatVisiblity getChatVisibility() {
@@ -1134,17 +1212,17 @@ public class ServerPlayer extends Player implements ContainerListener {
         return this.recipeBook;
     }
     
-    public void sendRemoveEntity(final Entity akq) {
-        if (akq instanceof Player) {
-            this.connection.send(new ClientboundRemoveEntitiesPacket(new int[] { akq.getId() }));
+    public void sendRemoveEntity(final Entity aom) {
+        if (aom instanceof Player) {
+            this.connection.send(new ClientboundRemoveEntitiesPacket(new int[] { aom.getId() }));
         }
         else {
-            this.entitiesToRemove.add(akq.getId());
+            this.entitiesToRemove.add(aom.getId());
         }
     }
     
-    public void cancelRemoveEntity(final Entity akq) {
-        this.entitiesToRemove.remove(akq.getId());
+    public void cancelRemoveEntity(final Entity aom) {
+        this.entitiesToRemove.remove(aom.getId());
     }
     
     @Override
@@ -1162,10 +1240,10 @@ public class ServerPlayer extends Player implements ContainerListener {
         return (this.camera == null) ? this : this.camera;
     }
     
-    public void setCamera(final Entity akq) {
-        final Entity akq2 = this.getCamera();
-        this.camera = ((akq == null) ? this : akq);
-        if (akq2 != this.camera) {
+    public void setCamera(final Entity aom) {
+        final Entity aom2 = this.getCamera();
+        this.camera = ((aom == null) ? this : aom);
+        if (aom2 != this.camera) {
             this.connection.send(new ClientboundSetCameraPacket(this.camera));
             this.teleportTo(this.camera.getX(), this.camera.getY(), this.camera.getZ());
         }
@@ -1179,12 +1257,12 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public void attack(final Entity akq) {
+    public void attack(final Entity aom) {
         if (this.gameMode.getGameModeForPlayer() == GameType.SPECTATOR) {
-            this.setCamera(akq);
+            this.setCamera(aom);
         }
         else {
-            super.attack(akq);
+            super.attack(aom);
         }
     }
     
@@ -1198,8 +1276,8 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public void swing(final InteractionHand ajk) {
-        super.swing(ajk);
+    public void swing(final InteractionHand anf) {
+        super.swing(anf);
         this.resetAttackStrengthTicker();
     }
     
@@ -1215,40 +1293,69 @@ public class ServerPlayer extends Player implements ContainerListener {
         return this.advancements;
     }
     
-    public void teleportTo(final ServerLevel xd, final double double2, final double double3, final double double4, final float float5, final float float6) {
+    public void teleportTo(final ServerLevel zd, final double double2, final double double3, final double double4, final float float5, final float float6) {
         this.setCamera(this);
         this.stopRiding();
-        if (xd == this.level) {
+        if (zd == this.level) {
             this.connection.teleport(double2, double3, double4, float5, float6);
         }
         else {
-            final ServerLevel xd2 = this.getLevel();
-            this.dimension = xd.dimension.getType();
-            final LevelData crm12 = xd.getLevelData();
-            this.connection.send(new ClientboundRespawnPacket(this.dimension, LevelData.obfuscateSeed(crm12.getSeed()), crm12.getGeneratorType(), this.gameMode.getGameModeForPlayer()));
-            this.connection.send(new ClientboundChangeDifficultyPacket(crm12.getDifficulty(), crm12.isDifficultyLocked()));
+            final ServerLevel zd2 = this.getLevel();
+            final LevelData dab12 = zd.getLevelData();
+            this.connection.send(new ClientboundRespawnPacket(zd.dimensionTypeKey(), zd.dimension(), BiomeManager.obfuscateSeed(zd.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), zd.isDebug(), zd.isFlat(), true));
+            this.connection.send(new ClientboundChangeDifficultyPacket(dab12.getDifficulty(), dab12.isDifficultyLocked()));
             this.server.getPlayerList().sendPlayerPermissionLevel(this);
-            xd2.removePlayerImmediately(this);
+            zd2.removePlayerImmediately(this);
             this.removed = false;
             this.moveTo(double2, double3, double4, float5, float6);
-            this.setLevel(xd);
-            xd.addDuringCommandTeleport(this);
-            this.triggerDimensionChangeTriggers(xd2);
+            this.setLevel(zd);
+            zd.addDuringCommandTeleport(this);
+            this.triggerDimensionChangeTriggers(zd2);
             this.connection.teleport(double2, double3, double4, float5, float6);
-            this.gameMode.setLevel(xd);
-            this.server.getPlayerList().sendLevelInfo(this, xd);
+            this.gameMode.setLevel(zd);
+            this.server.getPlayerList().sendLevelInfo(this, zd);
             this.server.getPlayerList().sendAllPlayerInfo(this);
         }
     }
     
-    public void trackChunk(final ChunkPos bjh, final Packet<?> lt2, final Packet<?> lt3) {
-        this.connection.send(lt3);
-        this.connection.send(lt2);
+    @Nullable
+    public BlockPos getRespawnPosition() {
+        return this.respawnPosition;
     }
     
-    public void untrackChunk(final ChunkPos bjh) {
+    public ResourceKey<Level> getRespawnDimension() {
+        return this.respawnDimension;
+    }
+    
+    public boolean isRespawnForced() {
+        return this.respawnForced;
+    }
+    
+    public void setRespawnPosition(final ResourceKey<Level> ug, @Nullable final BlockPos fu, final boolean boolean3, final boolean boolean4) {
+        if (fu != null) {
+            final boolean boolean5 = fu.equals(this.respawnPosition) && ug.equals(this.respawnDimension);
+            if (boolean4 && !boolean5) {
+                this.sendMessage(new TranslatableComponent("block.minecraft.set_spawn"), Util.NIL_UUID);
+            }
+            this.respawnPosition = fu;
+            this.respawnDimension = ug;
+            this.respawnForced = boolean3;
+        }
+        else {
+            this.respawnPosition = null;
+            this.respawnDimension = Level.OVERWORLD;
+            this.respawnForced = false;
+        }
+    }
+    
+    public void trackChunk(final ChunkPos bph, final Packet<?> ni2, final Packet<?> ni3) {
+        this.connection.send(ni3);
+        this.connection.send(ni2);
+    }
+    
+    public void untrackChunk(final ChunkPos bph) {
         if (this.isAlive()) {
-            this.connection.send(new ClientboundForgetLevelChunkPacket(bjh.x, bjh.z));
+            this.connection.send(new ClientboundForgetLevelChunkPacket(bph.x, bph.z));
         }
     }
     
@@ -1256,13 +1363,13 @@ public class ServerPlayer extends Player implements ContainerListener {
         return this.lastSectionPos;
     }
     
-    public void setLastSectionPos(final SectionPos gd) {
-        this.lastSectionPos = gd;
+    public void setLastSectionPos(final SectionPos go) {
+        this.lastSectionPos = go;
     }
     
     @Override
-    public void playNotifySound(final SoundEvent aah, final SoundSource aaj, final float float3, final float float4) {
-        this.connection.send(new ClientboundSoundPacket(aah, aaj, this.getX(), this.getY(), this.getZ(), float3, float4));
+    public void playNotifySound(final SoundEvent ack, final SoundSource acm, final float float3, final float float4) {
+        this.connection.send(new ClientboundSoundPacket(ack, acm, this.getX(), this.getY(), this.getZ(), float3, float4));
     }
     
     @Override
@@ -1271,20 +1378,20 @@ public class ServerPlayer extends Player implements ContainerListener {
     }
     
     @Override
-    public ItemEntity drop(final ItemStack ben, final boolean boolean2, final boolean boolean3) {
-        final ItemEntity awb5 = super.drop(ben, boolean2, boolean3);
-        if (awb5 == null) {
+    public ItemEntity drop(final ItemStack bki, final boolean boolean2, final boolean boolean3) {
+        final ItemEntity bbg5 = super.drop(bki, boolean2, boolean3);
+        if (bbg5 == null) {
             return null;
         }
-        this.level.addFreshEntity(awb5);
-        final ItemStack ben2 = awb5.getItem();
+        this.level.addFreshEntity(bbg5);
+        final ItemStack bki2 = bbg5.getItem();
         if (boolean3) {
-            if (!ben2.isEmpty()) {
-                this.awardStat(Stats.ITEM_DROPPED.get(ben2.getItem()), ben.getCount());
+            if (!bki2.isEmpty()) {
+                this.awardStat(Stats.ITEM_DROPPED.get(bki2.getItem()), bki.getCount());
             }
             this.awardStat(Stats.DROP);
         }
-        return awb5;
+        return bbg5;
     }
     
     static {
diff --git a/src/net/minecraft/server/level/ServerPlayerGameMode.java b/src/net/minecraft/server/level/ServerPlayerGameMode.java
index 354d317..f91d4d2 100644
--- a/src/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -3,6 +3,7 @@ package net.minecraft.server.level;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.item.UseOnContext;
+import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -34,6 +35,7 @@ public class ServerPlayerGameMode {
     public ServerLevel level;
     public ServerPlayer player;
     private GameType gameModeForPlayer;
+    private GameType previousGameModeForPlayer;
     private boolean isDestroyingBlock;
     private int destroyProgressStart;
     private BlockPos destroyPos;
@@ -43,16 +45,22 @@ public class ServerPlayerGameMode {
     private int delayedTickStart;
     private int lastSentState;
     
-    public ServerPlayerGameMode(final ServerLevel xd) {
+    public ServerPlayerGameMode(final ServerLevel zd) {
         this.gameModeForPlayer = GameType.NOT_SET;
+        this.previousGameModeForPlayer = GameType.NOT_SET;
         this.destroyPos = BlockPos.ZERO;
         this.delayedDestroyPos = BlockPos.ZERO;
         this.lastSentState = -1;
-        this.level = xd;
+        this.level = zd;
     }
     
-    public void setGameModeForPlayer(final GameType bjt) {
-        (this.gameModeForPlayer = bjt).updatePlayerAbilities(this.player.abilities);
+    public void setGameModeForPlayer(final GameType bpy) {
+        this.setGameModeForPlayer(bpy, (bpy != this.gameModeForPlayer) ? this.gameModeForPlayer : this.previousGameModeForPlayer);
+    }
+    
+    public void setGameModeForPlayer(final GameType bpy1, final GameType bpy2) {
+        this.previousGameModeForPlayer = bpy2;
+        (this.gameModeForPlayer = bpy1).updatePlayerAbilities(this.player.abilities);
         this.player.onUpdateAbilities();
         this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_GAME_MODE, new ServerPlayer[] { this.player }));
         this.level.updateSleepingPlayerList();
@@ -62,6 +70,10 @@ public class ServerPlayerGameMode {
         return this.gameModeForPlayer;
     }
     
+    public GameType getPreviousGameModeForPlayer() {
+        return this.previousGameModeForPlayer;
+    }
+    
     public boolean isSurvival() {
         return this.gameModeForPlayer.isSurvival();
     }
@@ -70,9 +82,9 @@ public class ServerPlayerGameMode {
         return this.gameModeForPlayer.isCreative();
     }
     
-    public void updateGameMode(final GameType bjt) {
+    public void updateGameMode(final GameType bpy) {
         if (this.gameModeForPlayer == GameType.NOT_SET) {
-            this.gameModeForPlayer = bjt;
+            this.gameModeForPlayer = bpy;
         }
         this.setGameModeForPlayer(this.gameModeForPlayer);
     }
@@ -80,12 +92,12 @@ public class ServerPlayerGameMode {
     public void tick() {
         ++this.gameTicks;
         if (this.hasDelayedDestroy) {
-            final BlockState byj2 = this.level.getBlockState(this.delayedDestroyPos);
-            if (byj2.isAir()) {
+            final BlockState cfj2 = this.level.getBlockState(this.delayedDestroyPos);
+            if (cfj2.isAir()) {
                 this.hasDelayedDestroy = false;
             }
             else {
-                final float float3 = this.incrementDestroyProgress(byj2, this.delayedDestroyPos, this.delayedTickStart);
+                final float float3 = this.incrementDestroyProgress(cfj2, this.delayedDestroyPos, this.delayedTickStart);
                 if (float3 >= 1.0f) {
                     this.hasDelayedDestroy = false;
                     this.destroyBlock(this.delayedDestroyPos);
@@ -93,227 +105,229 @@ public class ServerPlayerGameMode {
             }
         }
         else if (this.isDestroyingBlock) {
-            final BlockState byj2 = this.level.getBlockState(this.destroyPos);
-            if (byj2.isAir()) {
+            final BlockState cfj2 = this.level.getBlockState(this.destroyPos);
+            if (cfj2.isAir()) {
                 this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
                 this.lastSentState = -1;
                 this.isDestroyingBlock = false;
             }
             else {
-                this.incrementDestroyProgress(byj2, this.destroyPos, this.destroyProgressStart);
+                this.incrementDestroyProgress(cfj2, this.destroyPos, this.destroyProgressStart);
             }
         }
     }
     
-    private float incrementDestroyProgress(final BlockState byj, final BlockPos fk, final int integer) {
+    private float incrementDestroyProgress(final BlockState cfj, final BlockPos fu, final int integer) {
         final int integer2 = this.gameTicks - integer;
-        final float float6 = byj.getDestroyProgress(this.player, this.player.level, fk) * (integer2 + 1);
+        final float float6 = cfj.getDestroyProgress(this.player, this.player.level, fu) * (integer2 + 1);
         final int integer3 = (int)(float6 * 10.0f);
         if (integer3 != this.lastSentState) {
-            this.level.destroyBlockProgress(this.player.getId(), fk, integer3);
+            this.level.destroyBlockProgress(this.player.getId(), fu, integer3);
             this.lastSentState = integer3;
         }
         return float6;
     }
     
-    public void handleBlockBreakAction(final BlockPos fk, final ServerboundPlayerActionPacket.Action a, final Direction fp, final int integer) {
-        final double double6 = this.player.getX() - (fk.getX() + 0.5);
-        final double double7 = this.player.getY() - (fk.getY() + 0.5) + 1.5;
-        final double double8 = this.player.getZ() - (fk.getZ() + 0.5);
+    public void handleBlockBreakAction(final BlockPos fu, final ServerboundPlayerActionPacket.Action a, final Direction fz, final int integer) {
+        final double double6 = this.player.getX() - (fu.getX() + 0.5);
+        final double double7 = this.player.getY() - (fu.getY() + 0.5) + 1.5;
+        final double double8 = this.player.getZ() - (fu.getZ() + 0.5);
         final double double9 = double6 * double6 + double7 * double7 + double8 * double8;
         if (double9 > 36.0) {
-            this.player.connection.send(new ClientboundBlockBreakAckPacket(fk, this.level.getBlockState(fk), a, false, "too far"));
+            this.player.connection.send(new ClientboundBlockBreakAckPacket(fu, this.level.getBlockState(fu), a, false, "too far"));
             return;
         }
-        if (fk.getY() >= integer) {
-            this.player.connection.send(new ClientboundBlockBreakAckPacket(fk, this.level.getBlockState(fk), a, false, "too high"));
+        if (fu.getY() >= integer) {
+            this.player.connection.send(new ClientboundBlockBreakAckPacket(fu, this.level.getBlockState(fu), a, false, "too high"));
             return;
         }
         if (a == ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK) {
-            if (!this.level.mayInteract(this.player, fk)) {
-                this.player.connection.send(new ClientboundBlockBreakAckPacket(fk, this.level.getBlockState(fk), a, false, "may not interact"));
+            if (!this.level.mayInteract(this.player, fu)) {
+                this.player.connection.send(new ClientboundBlockBreakAckPacket(fu, this.level.getBlockState(fu), a, false, "may not interact"));
                 return;
             }
             if (this.isCreative()) {
-                if (!this.level.extinguishFire(null, fk, fp)) {
-                    this.destroyAndAck(fk, a, "creative destroy");
-                }
-                else {
-                    this.player.connection.send(new ClientboundBlockBreakAckPacket(fk, this.level.getBlockState(fk), a, true, "fire put out"));
-                }
+                this.destroyAndAck(fu, a, "creative destroy");
                 return;
             }
-            if (this.player.blockActionRestricted(this.level, fk, this.gameModeForPlayer)) {
-                this.player.connection.send(new ClientboundBlockBreakAckPacket(fk, this.level.getBlockState(fk), a, false, "block action restricted"));
+            if (this.player.blockActionRestricted(this.level, fu, this.gameModeForPlayer)) {
+                this.player.connection.send(new ClientboundBlockBreakAckPacket(fu, this.level.getBlockState(fu), a, false, "block action restricted"));
                 return;
             }
-            this.level.extinguishFire(null, fk, fp);
             this.destroyProgressStart = this.gameTicks;
             float float14 = 1.0f;
-            final BlockState byj15 = this.level.getBlockState(fk);
-            if (!byj15.isAir()) {
-                byj15.attack(this.level, fk, this.player);
-                float14 = byj15.getDestroyProgress(this.player, this.player.level, fk);
+            final BlockState cfj15 = this.level.getBlockState(fu);
+            if (!cfj15.isAir()) {
+                cfj15.attack(this.level, fu, this.player);
+                float14 = cfj15.getDestroyProgress(this.player, this.player.level, fu);
             }
-            if (!byj15.isAir() && float14 >= 1.0f) {
-                this.destroyAndAck(fk, a, "insta mine");
+            if (!cfj15.isAir() && float14 >= 1.0f) {
+                this.destroyAndAck(fu, a, "insta mine");
             }
             else {
                 if (this.isDestroyingBlock) {
                     this.player.connection.send(new ClientboundBlockBreakAckPacket(this.destroyPos, this.level.getBlockState(this.destroyPos), ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, false, "abort destroying since another started (client insta mine, server disagreed)"));
                 }
                 this.isDestroyingBlock = true;
-                this.destroyPos = fk.immutable();
+                this.destroyPos = fu.immutable();
                 final int integer2 = (int)(float14 * 10.0f);
-                this.level.destroyBlockProgress(this.player.getId(), fk, integer2);
-                this.player.connection.send(new ClientboundBlockBreakAckPacket(fk, this.level.getBlockState(fk), a, true, "actual start of destroying"));
+                this.level.destroyBlockProgress(this.player.getId(), fu, integer2);
+                this.player.connection.send(new ClientboundBlockBreakAckPacket(fu, this.level.getBlockState(fu), a, true, "actual start of destroying"));
                 this.lastSentState = integer2;
             }
         }
         else if (a == ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK) {
-            if (fk.equals(this.destroyPos)) {
+            if (fu.equals(this.destroyPos)) {
                 final int integer3 = this.gameTicks - this.destroyProgressStart;
-                final BlockState byj15 = this.level.getBlockState(fk);
-                if (!byj15.isAir()) {
-                    final float float15 = byj15.getDestroyProgress(this.player, this.player.level, fk) * (integer3 + 1);
+                final BlockState cfj15 = this.level.getBlockState(fu);
+                if (!cfj15.isAir()) {
+                    final float float15 = cfj15.getDestroyProgress(this.player, this.player.level, fu) * (integer3 + 1);
                     if (float15 >= 0.7f) {
                         this.isDestroyingBlock = false;
-                        this.level.destroyBlockProgress(this.player.getId(), fk, -1);
-                        this.destroyAndAck(fk, a, "destroyed");
+                        this.level.destroyBlockProgress(this.player.getId(), fu, -1);
+                        this.destroyAndAck(fu, a, "destroyed");
                         return;
                     }
                     if (!this.hasDelayedDestroy) {
                         this.isDestroyingBlock = false;
                         this.hasDelayedDestroy = true;
-                        this.delayedDestroyPos = fk;
+                        this.delayedDestroyPos = fu;
                         this.delayedTickStart = this.destroyProgressStart;
                     }
                 }
             }
-            this.player.connection.send(new ClientboundBlockBreakAckPacket(fk, this.level.getBlockState(fk), a, true, "stopped destroying"));
+            this.player.connection.send(new ClientboundBlockBreakAckPacket(fu, this.level.getBlockState(fu), a, true, "stopped destroying"));
         }
         else if (a == ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK) {
             this.isDestroyingBlock = false;
-            if (!Objects.equals(this.destroyPos, fk)) {
-                ServerPlayerGameMode.LOGGER.warn("Mismatch in destroy block pos: " + this.destroyPos + " " + fk);
+            if (!Objects.equals(this.destroyPos, fu)) {
+                ServerPlayerGameMode.LOGGER.warn("Mismatch in destroy block pos: " + this.destroyPos + " " + fu);
                 this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
                 this.player.connection.send(new ClientboundBlockBreakAckPacket(this.destroyPos, this.level.getBlockState(this.destroyPos), a, true, "aborted mismatched destroying"));
             }
-            this.level.destroyBlockProgress(this.player.getId(), fk, -1);
-            this.player.connection.send(new ClientboundBlockBreakAckPacket(fk, this.level.getBlockState(fk), a, true, "aborted destroying"));
+            this.level.destroyBlockProgress(this.player.getId(), fu, -1);
+            this.player.connection.send(new ClientboundBlockBreakAckPacket(fu, this.level.getBlockState(fu), a, true, "aborted destroying"));
         }
     }
     
-    public void destroyAndAck(final BlockPos fk, final ServerboundPlayerActionPacket.Action a, final String string) {
-        if (this.destroyBlock(fk)) {
-            this.player.connection.send(new ClientboundBlockBreakAckPacket(fk, this.level.getBlockState(fk), a, true, string));
+    public void destroyAndAck(final BlockPos fu, final ServerboundPlayerActionPacket.Action a, final String string) {
+        if (this.destroyBlock(fu)) {
+            this.player.connection.send(new ClientboundBlockBreakAckPacket(fu, this.level.getBlockState(fu), a, true, string));
         }
         else {
-            this.player.connection.send(new ClientboundBlockBreakAckPacket(fk, this.level.getBlockState(fk), a, false, string));
+            this.player.connection.send(new ClientboundBlockBreakAckPacket(fu, this.level.getBlockState(fu), a, false, string));
         }
     }
     
-    public boolean destroyBlock(final BlockPos fk) {
-        final BlockState byj3 = this.level.getBlockState(fk);
-        if (!this.player.getMainHandItem().getItem().canAttackBlock(byj3, this.level, fk, this.player)) {
+    public boolean destroyBlock(final BlockPos fu) {
+        final BlockState cfj3 = this.level.getBlockState(fu);
+        if (!this.player.getMainHandItem().getItem().canAttackBlock(cfj3, this.level, fu, this.player)) {
             return false;
         }
-        final BlockEntity bwl4 = this.level.getBlockEntity(fk);
-        final Block bph5 = byj3.getBlock();
-        if ((bph5 instanceof CommandBlock || bph5 instanceof StructureBlock || bph5 instanceof JigsawBlock) && !this.player.canUseGameMasterBlocks()) {
-            this.level.sendBlockUpdated(fk, byj3, byj3, 3);
+        final BlockEntity cdl4 = this.level.getBlockEntity(fu);
+        final Block bvr5 = cfj3.getBlock();
+        if ((bvr5 instanceof CommandBlock || bvr5 instanceof StructureBlock || bvr5 instanceof JigsawBlock) && !this.player.canUseGameMasterBlocks()) {
+            this.level.sendBlockUpdated(fu, cfj3, cfj3, 3);
             return false;
         }
-        if (this.player.blockActionRestricted(this.level, fk, this.gameModeForPlayer)) {
+        if (this.player.blockActionRestricted(this.level, fu, this.gameModeForPlayer)) {
             return false;
         }
-        bph5.playerWillDestroy(this.level, fk, byj3, this.player);
-        final boolean boolean6 = this.level.removeBlock(fk, false);
+        bvr5.playerWillDestroy(this.level, fu, cfj3, this.player);
+        final boolean boolean6 = this.level.removeBlock(fu, false);
         if (boolean6) {
-            bph5.destroy(this.level, fk, byj3);
+            bvr5.destroy(this.level, fu, cfj3);
         }
         if (this.isCreative()) {
             return true;
         }
-        final ItemStack ben7 = this.player.getMainHandItem();
-        final ItemStack ben8 = ben7.copy();
-        final boolean boolean7 = this.player.canDestroy(byj3);
-        ben7.mineBlock(this.level, byj3, fk, this.player);
+        final ItemStack bki7 = this.player.getMainHandItem();
+        final ItemStack bki8 = bki7.copy();
+        final boolean boolean7 = this.player.hasCorrectToolForDrops(cfj3);
+        bki7.mineBlock(this.level, cfj3, fu, this.player);
         if (boolean6 && boolean7) {
-            bph5.playerDestroy(this.level, this.player, fk, byj3, bwl4, ben8);
+            bvr5.playerDestroy(this.level, this.player, fu, cfj3, cdl4, bki8);
         }
         return true;
     }
     
-    public InteractionResult useItem(final Player ayj, final Level bjw, final ItemStack ben, final InteractionHand ajk) {
+    public InteractionResult useItem(final ServerPlayer ze, final Level bqb, final ItemStack bki, final InteractionHand anf) {
         if (this.gameModeForPlayer == GameType.SPECTATOR) {
             return InteractionResult.PASS;
         }
-        if (ayj.getCooldowns().isOnCooldown(ben.getItem())) {
+        if (ze.getCooldowns().isOnCooldown(bki.getItem())) {
             return InteractionResult.PASS;
         }
-        final int integer6 = ben.getCount();
-        final int integer7 = ben.getDamageValue();
-        final InteractionResultHolder<ItemStack> ajm8 = ben.use(bjw, ayj, ajk);
-        final ItemStack ben2 = ajm8.getObject();
-        if (ben2 == ben && ben2.getCount() == integer6 && ben2.getUseDuration() <= 0 && ben2.getDamageValue() == integer7) {
-            return ajm8.getResult();
+        final int integer6 = bki.getCount();
+        final int integer7 = bki.getDamageValue();
+        final InteractionResultHolder<ItemStack> anh8 = bki.use(bqb, ze, anf);
+        final ItemStack bki2 = anh8.getObject();
+        if (bki2 == bki && bki2.getCount() == integer6 && bki2.getUseDuration() <= 0 && bki2.getDamageValue() == integer7) {
+            return anh8.getResult();
         }
-        if (ajm8.getResult() == InteractionResult.FAIL && ben2.getUseDuration() > 0 && !ayj.isUsingItem()) {
-            return ajm8.getResult();
+        if (anh8.getResult() == InteractionResult.FAIL && bki2.getUseDuration() > 0 && !ze.isUsingItem()) {
+            return anh8.getResult();
         }
-        ayj.setItemInHand(ajk, ben2);
+        ze.setItemInHand(anf, bki2);
         if (this.isCreative()) {
-            ben2.setCount(integer6);
-            if (ben2.isDamageableItem() && ben2.getDamageValue() != integer7) {
-                ben2.setDamageValue(integer7);
+            bki2.setCount(integer6);
+            if (bki2.isDamageableItem() && bki2.getDamageValue() != integer7) {
+                bki2.setDamageValue(integer7);
             }
         }
-        if (ben2.isEmpty()) {
-            ayj.setItemInHand(ajk, ItemStack.EMPTY);
+        if (bki2.isEmpty()) {
+            ze.setItemInHand(anf, ItemStack.EMPTY);
         }
-        if (!ayj.isUsingItem()) {
-            ((ServerPlayer)ayj).refreshContainer(ayj.inventoryMenu);
+        if (!ze.isUsingItem()) {
+            ze.refreshContainer(ze.inventoryMenu);
         }
-        return ajm8.getResult();
+        return anh8.getResult();
     }
     
-    public InteractionResult useItemOn(final Player ayj, final Level bjw, final ItemStack ben, final InteractionHand ajk, final BlockHitResult cvg) {
-        final BlockPos fk7 = cvg.getBlockPos();
-        final BlockState byj8 = bjw.getBlockState(fk7);
+    public InteractionResult useItemOn(final ServerPlayer ze, final Level bqb, final ItemStack bki, final InteractionHand anf, final BlockHitResult deh) {
+        final BlockPos fu7 = deh.getBlockPos();
+        final BlockState cfj8 = bqb.getBlockState(fu7);
         if (this.gameModeForPlayer == GameType.SPECTATOR) {
-            final MenuProvider ajo9 = byj8.getMenuProvider(bjw, fk7);
-            if (ajo9 != null) {
-                ayj.openMenu(ajo9);
+            final MenuProvider anj9 = cfj8.getMenuProvider(bqb, fu7);
+            if (anj9 != null) {
+                ze.openMenu(anj9);
                 return InteractionResult.SUCCESS;
             }
             return InteractionResult.PASS;
         }
         else {
-            final boolean boolean9 = !ayj.getMainHandItem().isEmpty() || !ayj.getOffhandItem().isEmpty();
-            final boolean boolean10 = ayj.isSecondaryUseActive() && boolean9;
+            final boolean boolean9 = !ze.getMainHandItem().isEmpty() || !ze.getOffhandItem().isEmpty();
+            final boolean boolean10 = ze.isSecondaryUseActive() && boolean9;
+            final ItemStack bki2 = bki.copy();
             if (!boolean10) {
-                final InteractionResult ajl11 = byj8.use(bjw, ayj, ajk, cvg);
-                if (ajl11.consumesAction()) {
-                    return ajl11;
+                final InteractionResult ang12 = cfj8.use(bqb, ze, anf, deh);
+                if (ang12.consumesAction()) {
+                    CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(ze, fu7, bki2);
+                    return ang12;
                 }
             }
-            if (ben.isEmpty() || ayj.getCooldowns().isOnCooldown(ben.getItem())) {
+            if (bki.isEmpty() || ze.getCooldowns().isOnCooldown(bki.getItem())) {
                 return InteractionResult.PASS;
             }
-            final UseOnContext bfz11 = new UseOnContext(ayj, ajk, cvg);
+            final UseOnContext blv12 = new UseOnContext(ze, anf, deh);
+            InteractionResult ang13;
             if (this.isCreative()) {
-                final int integer12 = ben.getCount();
-                final InteractionResult ajl12 = ben.useOn(bfz11);
-                ben.setCount(integer12);
-                return ajl12;
+                final int integer14 = bki.getCount();
+                ang13 = bki.useOn(blv12);
+                bki.setCount(integer14);
             }
-            return ben.useOn(bfz11);
+            else {
+                ang13 = bki.useOn(blv12);
+            }
+            if (ang13.consumesAction()) {
+                CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(ze, fu7, bki2);
+            }
+            return ang13;
         }
     }
     
-    public void setLevel(final ServerLevel xd) {
-        this.level = xd;
+    public void setLevel(final ServerLevel zd) {
+        this.level = zd;
     }
     
     static {
diff --git a/src/net/minecraft/server/level/ThreadedLevelLightEngine.java b/src/net/minecraft/server/level/ThreadedLevelLightEngine.java
index d74f353..b5cf655 100644
--- a/src/net/minecraft/server/level/ThreadedLevelLightEngine.java
+++ b/src/net/minecraft/server/level/ThreadedLevelLightEngine.java
@@ -32,14 +32,14 @@ public class ThreadedLevelLightEngine extends LevelLightEngine implements AutoCl
     private volatile int taskPerBatch;
     private final AtomicBoolean scheduled;
     
-    public ThreadedLevelLightEngine(final LightChunkGetter can, final ChunkMap wp, final boolean boolean3, final ProcessorMailbox<Runnable> aiv, final ProcessorHandle<ChunkTaskPriorityQueueSorter.Message<Runnable>> aiu) {
-        super(can, true, boolean3);
+    public ThreadedLevelLightEngine(final LightChunkGetter chl, final ChunkMap yp, final boolean boolean3, final ProcessorMailbox<Runnable> amq, final ProcessorHandle<ChunkTaskPriorityQueueSorter.Message<Runnable>> amp) {
+        super(chl, true, boolean3);
         this.lightTasks = (ObjectList<Pair<TaskType, Runnable>>)new ObjectArrayList();
         this.taskPerBatch = 5;
         this.scheduled = new AtomicBoolean();
-        this.chunkMap = wp;
-        this.sorterMailbox = aiu;
-        this.taskMailbox = aiv;
+        this.chunkMap = yp;
+        this.sorterMailbox = amp;
+        this.taskMailbox = amq;
     }
     
     @Override
@@ -52,45 +52,45 @@ public class ThreadedLevelLightEngine extends LevelLightEngine implements AutoCl
     }
     
     @Override
-    public void onBlockEmissionIncrease(final BlockPos fk, final int integer) {
+    public void onBlockEmissionIncrease(final BlockPos fu, final int integer) {
         throw Util.<UnsupportedOperationException>pauseInIde(new UnsupportedOperationException("Ran authomatically on a different thread!"));
     }
     
     @Override
-    public void checkBlock(final BlockPos fk) {
-        final BlockPos fk2 = fk.immutable();
-        this.addTask(fk.getX() >> 4, fk.getZ() >> 4, TaskType.POST_UPDATE, Util.name(() -> super.checkBlock(fk2), () -> "checkBlock " + fk2));
+    public void checkBlock(final BlockPos fu) {
+        final BlockPos fu2 = fu.immutable();
+        this.addTask(fu.getX() >> 4, fu.getZ() >> 4, TaskType.POST_UPDATE, Util.name(() -> super.checkBlock(fu2), () -> "checkBlock " + fu2));
     }
     
-    protected void updateChunkStatus(final ChunkPos bjh) {
+    protected void updateChunkStatus(final ChunkPos bph) {
         int integer3;
         int integer4;
-        this.addTask(bjh.x, bjh.z, () -> 0, TaskType.PRE_UPDATE, Util.name(() -> {
-            super.retainData(bjh, false);
-            super.enableLightSources(bjh, false);
+        this.addTask(bph.x, bph.z, () -> 0, TaskType.PRE_UPDATE, Util.name(() -> {
+            super.retainData(bph, false);
+            super.enableLightSources(bph, false);
             for (integer3 = -1; integer3 < 17; ++integer3) {
-                super.queueSectionData(LightLayer.BLOCK, SectionPos.of(bjh, integer3), null);
-                super.queueSectionData(LightLayer.SKY, SectionPos.of(bjh, integer3), null);
+                super.queueSectionData(LightLayer.BLOCK, SectionPos.of(bph, integer3), null, true);
+                super.queueSectionData(LightLayer.SKY, SectionPos.of(bph, integer3), null, true);
             }
             for (integer4 = 0; integer4 < 16; ++integer4) {
-                super.updateSectionStatus(SectionPos.of(bjh, integer4), true);
+                super.updateSectionStatus(SectionPos.of(bph, integer4), true);
             }
-        }, () -> "updateChunkStatus " + bjh + " " + true));
+        }, () -> "updateChunkStatus " + bph + " " + true));
     }
     
     @Override
-    public void updateSectionStatus(final SectionPos gd, final boolean boolean2) {
-        this.addTask(gd.x(), gd.z(), () -> 0, TaskType.PRE_UPDATE, Util.name(() -> super.updateSectionStatus(gd, boolean2), () -> "updateSectionStatus " + gd + " " + boolean2));
+    public void updateSectionStatus(final SectionPos go, final boolean boolean2) {
+        this.addTask(go.x(), go.z(), () -> 0, TaskType.PRE_UPDATE, Util.name(() -> super.updateSectionStatus(go, boolean2), () -> "updateSectionStatus " + go + " " + boolean2));
     }
     
     @Override
-    public void enableLightSources(final ChunkPos bjh, final boolean boolean2) {
-        this.addTask(bjh.x, bjh.z, TaskType.PRE_UPDATE, Util.name(() -> super.enableLightSources(bjh, boolean2), () -> "enableLight " + bjh + " " + boolean2));
+    public void enableLightSources(final ChunkPos bph, final boolean boolean2) {
+        this.addTask(bph.x, bph.z, TaskType.PRE_UPDATE, Util.name(() -> super.enableLightSources(bph, boolean2), () -> "enableLight " + bph + " " + boolean2));
     }
     
     @Override
-    public void queueSectionData(final LightLayer bkf, final SectionPos gd, @Nullable final DataLayer caf) {
-        this.addTask(gd.x(), gd.z(), () -> 0, TaskType.PRE_UPDATE, Util.name(() -> super.queueSectionData(bkf, gd, caf), () -> "queueData " + gd));
+    public void queueSectionData(final LightLayer bqi, final SectionPos go, @Nullable final DataLayer chd, final boolean boolean4) {
+        this.addTask(go.x(), go.z(), () -> 0, TaskType.PRE_UPDATE, Util.name(() -> super.queueSectionData(bqi, go, chd, boolean4), () -> "queueData " + go));
     }
     
     private void addTask(final int integer1, final int integer2, final TaskType a, final Runnable runnable) {
@@ -107,38 +107,38 @@ public class ThreadedLevelLightEngine extends LevelLightEngine implements AutoCl
     }
     
     @Override
-    public void retainData(final ChunkPos bjh, final boolean boolean2) {
-        this.addTask(bjh.x, bjh.z, () -> 0, TaskType.PRE_UPDATE, Util.name(() -> super.retainData(bjh, boolean2), () -> "retainData " + bjh));
+    public void retainData(final ChunkPos bph, final boolean boolean2) {
+        this.addTask(bph.x, bph.z, () -> 0, TaskType.PRE_UPDATE, Util.name(() -> super.retainData(bph, boolean2), () -> "retainData " + bph));
     }
     
-    public CompletableFuture<ChunkAccess> lightChunk(final ChunkAccess bzy, final boolean boolean2) {
-        final ChunkPos bjh4 = bzy.getPos();
-        bzy.setLightCorrect(false);
+    public CompletableFuture<ChunkAccess> lightChunk(final ChunkAccess cgy, final boolean boolean2) {
+        final ChunkPos bph4 = cgy.getPos();
+        cgy.setLightCorrect(false);
         final LevelChunkSection[] arr5;
         int integer6;
-        LevelChunkSection cam7;
-        final ChunkPos bjh5;
-        this.addTask(bjh4.x, bjh4.z, TaskType.PRE_UPDATE, Util.name(() -> {
-            arr5 = bzy.getSections();
+        LevelChunkSection chk7;
+        final ChunkPos bph5;
+        this.addTask(bph4.x, bph4.z, TaskType.PRE_UPDATE, Util.name(() -> {
+            arr5 = cgy.getSections();
             for (integer6 = 0; integer6 < 16; ++integer6) {
-                cam7 = arr5[integer6];
-                if (!LevelChunkSection.isEmpty(cam7)) {
-                    super.updateSectionStatus(SectionPos.of(bjh5, integer6), false);
+                chk7 = arr5[integer6];
+                if (!LevelChunkSection.isEmpty(chk7)) {
+                    super.updateSectionStatus(SectionPos.of(bph5, integer6), false);
                 }
             }
-            super.enableLightSources(bjh5, true);
+            super.enableLightSources(bph5, true);
             if (!boolean2) {
-                bzy.getLights().forEach(fk -> super.onBlockEmissionIncrease(fk, bzy.getLightEmission(fk)));
+                cgy.getLights().forEach(fu -> super.onBlockEmissionIncrease(fu, cgy.getLightEmission(fu)));
             }
-            this.chunkMap.releaseLightTicket(bjh5);
+            this.chunkMap.releaseLightTicket(bph5);
             return;
-        }, () -> "lightChunk " + bjh4 + " " + boolean2));
-        final ChunkPos bjh6;
+        }, () -> "lightChunk " + bph4 + " " + boolean2));
+        final ChunkPos bph6;
         final ChunkPos chunkPos;
         return CompletableFuture.<ChunkAccess>supplyAsync(() -> {
-            bzy.setLightCorrect(true);
-            super.retainData(bjh6, false);
-            return bzy;
+            cgy.setLightCorrect(true);
+            super.retainData(bph6, false);
+            return cgy;
         }, runnable -> this.addTask(chunkPos.x, chunkPos.z, TaskType.POST_UPDATE, runnable));
     }
     
diff --git a/src/net/minecraft/server/level/Ticket.java b/src/net/minecraft/server/level/Ticket.java
index e9866ca..777960e 100644
--- a/src/net/minecraft/server/level/Ticket.java
+++ b/src/net/minecraft/server/level/Ticket.java
@@ -8,23 +8,23 @@ public final class Ticket<T> implements Comparable<Ticket<?>> {
     private final T key;
     private long createdTick;
     
-    protected Ticket(final TicketType<T> xi, final int integer, final T object) {
-        this.type = xi;
+    protected Ticket(final TicketType<T> zi, final int integer, final T object) {
+        this.type = zi;
         this.ticketLevel = integer;
         this.key = object;
     }
     
     @Override
-    public int compareTo(final Ticket<?> xh) {
-        final int integer3 = Integer.compare(this.ticketLevel, xh.ticketLevel);
+    public int compareTo(final Ticket<?> zh) {
+        final int integer3 = Integer.compare(this.ticketLevel, zh.ticketLevel);
         if (integer3 != 0) {
             return integer3;
         }
-        final int integer4 = Integer.compare(System.identityHashCode(this.type), System.identityHashCode(xh.type));
+        final int integer4 = Integer.compare(System.identityHashCode(this.type), System.identityHashCode(zh.type));
         if (integer4 != 0) {
             return integer4;
         }
-        return this.type.getComparator().compare(this.key, (T)xh.key);
+        return this.type.getComparator().compare(this.key, (T)zh.key);
     }
     
     @Override
@@ -35,8 +35,8 @@ public final class Ticket<T> implements Comparable<Ticket<?>> {
         if (!(object instanceof Ticket)) {
             return false;
         }
-        final Ticket<?> xh3 = object;
-        return this.ticketLevel == xh3.ticketLevel && Objects.equals(this.type, xh3.type) && Objects.equals(this.key, xh3.key);
+        final Ticket<?> zh3 = object;
+        return this.ticketLevel == zh3.ticketLevel && Objects.equals(this.type, zh3.type) && Objects.equals(this.key, zh3.key);
     }
     
     @Override
diff --git a/src/net/minecraft/server/level/TicketType.java b/src/net/minecraft/server/level/TicketType.java
index 4c19505..0f13bf3 100644
--- a/src/net/minecraft/server/level/TicketType.java
+++ b/src/net/minecraft/server/level/TicketType.java
@@ -47,8 +47,8 @@ public class TicketType<T> {
     }
     
     static {
-        START = TicketType.<Unit>create("start", (aca1, aca2) -> 0);
-        DRAGON = TicketType.<Unit>create("dragon", (aca1, aca2) -> 0);
+        START = TicketType.<Unit>create("start", (ael1, ael2) -> 0);
+        DRAGON = TicketType.<Unit>create("dragon", (ael1, ael2) -> 0);
         PLAYER = TicketType.<ChunkPos>create("player", Comparator.<ChunkPos>comparingLong(ChunkPos::toLong));
         FORCED = TicketType.<ChunkPos>create("forced", Comparator.<ChunkPos>comparingLong(ChunkPos::toLong));
         LIGHT = TicketType.<ChunkPos>create("light", Comparator.<ChunkPos>comparingLong(ChunkPos::toLong));
diff --git a/src/net/minecraft/server/level/WorldGenRegion.java b/src/net/minecraft/server/level/WorldGenRegion.java
index 47e4aed..eca29f9 100644
--- a/src/net/minecraft/server/level/WorldGenRegion.java
+++ b/src/net/minecraft/server/level/WorldGenRegion.java
@@ -18,6 +18,7 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.core.Direction;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.Entity;
@@ -27,23 +28,22 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.ChunkPos;
 import net.minecraft.Util;
 import net.minecraft.util.Mth;
+import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.TickList;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.dimension.Dimension;
+import net.minecraft.world.level.dimension.DimensionType;
 import java.util.Random;
 import net.minecraft.world.level.storage.LevelData;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.List;
 import org.apache.logging.log4j.Logger;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.WorldGenLevel;
 
-public class WorldGenRegion implements LevelAccessor {
+public class WorldGenRegion implements WorldGenLevel {
     private static final Logger LOGGER;
     private final List<ChunkAccess> cache;
     private final int x;
@@ -51,35 +51,35 @@ public class WorldGenRegion implements LevelAccessor {
     private final int size;
     private final ServerLevel level;
     private final long seed;
-    private final int seaLevel;
     private final LevelData levelData;
     private final Random random;
-    private final Dimension dimension;
-    private final ChunkGeneratorSettings settings;
+    private final DimensionType dimensionType;
     private final TickList<Block> blockTicks;
     private final TickList<Fluid> liquidTicks;
     private final BiomeManager biomeManager;
+    private final ChunkPos firstPos;
+    private final ChunkPos lastPos;
     
-    public WorldGenRegion(final ServerLevel xd, final List<ChunkAccess> list) {
-        this.blockTicks = new WorldGenTickList<Block>(fk -> this.getChunk(fk).getBlockTicks());
-        this.liquidTicks = new WorldGenTickList<Fluid>(fk -> this.getChunk(fk).getLiquidTicks());
+    public WorldGenRegion(final ServerLevel zd, final List<ChunkAccess> list) {
+        this.blockTicks = new WorldGenTickList<Block>(fu -> this.getChunk(fu).getBlockTicks());
+        this.liquidTicks = new WorldGenTickList<Fluid>(fu -> this.getChunk(fu).getLiquidTicks());
         final int integer4 = Mth.floor(Math.sqrt(list.size()));
         if (integer4 * integer4 != list.size()) {
             throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("Cache size is not a square."));
         }
-        final ChunkPos bjh5 = list.get(list.size() / 2).getPos();
+        final ChunkPos bph5 = list.get(list.size() / 2).getPos();
         this.cache = list;
-        this.x = bjh5.x;
-        this.z = bjh5.z;
+        this.x = bph5.x;
+        this.z = bph5.z;
         this.size = integer4;
-        this.level = xd;
-        this.seed = xd.getSeed();
-        this.settings = (ChunkGeneratorSettings)xd.getChunkSource().getGenerator().getSettings();
-        this.seaLevel = xd.getSeaLevel();
-        this.levelData = xd.getLevelData();
-        this.random = xd.getRandom();
-        this.dimension = xd.getDimension();
-        this.biomeManager = new BiomeManager(this, LevelData.obfuscateSeed(this.seed), this.dimension.getType().getBiomeZoomer());
+        this.level = zd;
+        this.seed = zd.getSeed();
+        this.levelData = zd.getLevelData();
+        this.random = zd.getRandom();
+        this.dimensionType = zd.dimensionType();
+        this.biomeManager = new BiomeManager(this, BiomeManager.obfuscateSeed(this.seed), zd.dimensionType().getBiomeZoomer());
+        this.firstPos = list.get(0).getPos();
+        this.lastPos = list.get(list.size() - 1).getPos();
     }
     
     public int getCenterX() {
@@ -97,48 +97,43 @@ public class WorldGenRegion implements LevelAccessor {
     
     @Nullable
     @Override
-    public ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus cae, final boolean boolean4) {
-        ChunkAccess bzy6;
+    public ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus chc, final boolean boolean4) {
+        ChunkAccess cgy6;
         if (this.hasChunk(integer1, integer2)) {
-            final ChunkPos bjh7 = this.cache.get(0).getPos();
-            final int integer3 = integer1 - bjh7.x;
-            final int integer4 = integer2 - bjh7.z;
-            bzy6 = this.cache.get(integer3 + integer4 * this.size);
-            if (bzy6.getStatus().isOrAfter(cae)) {
-                return bzy6;
+            final int integer3 = integer1 - this.firstPos.x;
+            final int integer4 = integer2 - this.firstPos.z;
+            cgy6 = this.cache.get(integer3 + integer4 * this.size);
+            if (cgy6.getStatus().isOrAfter(chc)) {
+                return cgy6;
             }
         }
         else {
-            bzy6 = null;
+            cgy6 = null;
         }
         if (!boolean4) {
             return null;
         }
-        final ChunkAccess bzy7 = this.cache.get(0);
-        final ChunkAccess bzy8 = this.cache.get(this.cache.size() - 1);
         WorldGenRegion.LOGGER.error("Requested chunk : {} {}", integer1, integer2);
-        WorldGenRegion.LOGGER.error("Region bounds : {} {} | {} {}", bzy7.getPos().x, bzy7.getPos().z, bzy8.getPos().x, bzy8.getPos().z);
-        if (bzy6 != null) {
-            throw Util.<RuntimeException>pauseInIde(new RuntimeException(String.format("Chunk is not of correct status. Expecting %s, got %s | %s %s", cae, bzy6.getStatus(), integer1, integer2)));
+        WorldGenRegion.LOGGER.error("Region bounds : {} {} | {} {}", this.firstPos.x, this.firstPos.z, this.lastPos.x, this.lastPos.z);
+        if (cgy6 != null) {
+            throw Util.<RuntimeException>pauseInIde(new RuntimeException(String.format("Chunk is not of correct status. Expecting %s, got %s | %s %s", chc, cgy6.getStatus(), integer1, integer2)));
         }
         throw Util.<RuntimeException>pauseInIde(new RuntimeException(String.format("We are asking a region for a chunk out of bound | %s %s", integer1, integer2)));
     }
     
     @Override
     public boolean hasChunk(final int integer1, final int integer2) {
-        final ChunkAccess bzy4 = this.cache.get(0);
-        final ChunkAccess bzy5 = this.cache.get(this.cache.size() - 1);
-        return integer1 >= bzy4.getPos().x && integer1 <= bzy5.getPos().x && integer2 >= bzy4.getPos().z && integer2 <= bzy5.getPos().z;
+        return integer1 >= this.firstPos.x && integer1 <= this.lastPos.x && integer2 >= this.firstPos.z && integer2 <= this.lastPos.z;
     }
     
     @Override
-    public BlockState getBlockState(final BlockPos fk) {
-        return this.getChunk(fk.getX() >> 4, fk.getZ() >> 4).getBlockState(fk);
+    public BlockState getBlockState(final BlockPos fu) {
+        return this.getChunk(fu.getX() >> 4, fu.getZ() >> 4).getBlockState(fu);
     }
     
     @Override
-    public FluidState getFluidState(final BlockPos fk) {
-        return this.getChunk(fk).getFluidState(fk);
+    public FluidState getFluidState(final BlockPos fu) {
+        return this.getChunk(fu).getFluidState(fu);
     }
     
     @Nullable
@@ -162,100 +157,106 @@ public class WorldGenRegion implements LevelAccessor {
         return this.level.getUncachedNoiseBiome(integer1, integer2, integer3);
     }
     
+    @Override
+    public float getShade(final Direction fz, final boolean boolean2) {
+        return 1.0f;
+    }
+    
     @Override
     public LevelLightEngine getLightEngine() {
         return this.level.getLightEngine();
     }
     
     @Override
-    public boolean destroyBlock(final BlockPos fk, final boolean boolean2, @Nullable final Entity akq) {
-        final BlockState byj5 = this.getBlockState(fk);
-        if (byj5.isAir()) {
+    public boolean destroyBlock(final BlockPos fu, final boolean boolean2, @Nullable final Entity aom, final int integer) {
+        final BlockState cfj6 = this.getBlockState(fu);
+        if (cfj6.isAir()) {
             return false;
         }
         if (boolean2) {
-            final BlockEntity bwl6 = byj5.getBlock().isEntityBlock() ? this.getBlockEntity(fk) : null;
-            Block.dropResources(byj5, this.level, fk, bwl6, akq, ItemStack.EMPTY);
+            final BlockEntity cdl7 = cfj6.getBlock().isEntityBlock() ? this.getBlockEntity(fu) : null;
+            Block.dropResources(cfj6, this.level, fu, cdl7, aom, ItemStack.EMPTY);
         }
-        return this.setBlock(fk, Blocks.AIR.defaultBlockState(), 3);
+        return this.setBlock(fu, Blocks.AIR.defaultBlockState(), 3, integer);
     }
     
     @Nullable
     @Override
-    public BlockEntity getBlockEntity(final BlockPos fk) {
-        final ChunkAccess bzy3 = this.getChunk(fk);
-        BlockEntity bwl4 = bzy3.getBlockEntity(fk);
-        if (bwl4 != null) {
-            return bwl4;
+    public BlockEntity getBlockEntity(final BlockPos fu) {
+        final ChunkAccess cgy3 = this.getChunk(fu);
+        BlockEntity cdl4 = cgy3.getBlockEntity(fu);
+        if (cdl4 != null) {
+            return cdl4;
         }
-        final CompoundTag jt5 = bzy3.getBlockEntityNbt(fk);
-        if (jt5 != null) {
-            if ("DUMMY".equals(jt5.getString("id"))) {
-                final Block bph6 = this.getBlockState(fk).getBlock();
-                if (!(bph6 instanceof EntityBlock)) {
+        final CompoundTag le5 = cgy3.getBlockEntityNbt(fu);
+        final BlockState cfj6 = cgy3.getBlockState(fu);
+        if (le5 != null) {
+            if ("DUMMY".equals(le5.getString("id"))) {
+                final Block bvr7 = cfj6.getBlock();
+                if (!(bvr7 instanceof EntityBlock)) {
                     return null;
                 }
-                bwl4 = ((EntityBlock)bph6).newBlockEntity(this.level);
+                cdl4 = ((EntityBlock)bvr7).newBlockEntity(this.level);
             }
             else {
-                bwl4 = BlockEntity.loadStatic(jt5);
+                cdl4 = BlockEntity.loadStatic(cfj6, le5);
             }
-            if (bwl4 != null) {
-                bzy3.setBlockEntity(fk, bwl4);
-                return bwl4;
+            if (cdl4 != null) {
+                cgy3.setBlockEntity(fu, cdl4);
+                return cdl4;
             }
         }
-        if (bzy3.getBlockState(fk).getBlock() instanceof EntityBlock) {
-            WorldGenRegion.LOGGER.warn("Tried to access a block entity before it was created. {}", fk);
+        if (cfj6.getBlock() instanceof EntityBlock) {
+            WorldGenRegion.LOGGER.warn("Tried to access a block entity before it was created. {}", fu);
         }
         return null;
     }
     
     @Override
-    public boolean setBlock(final BlockPos fk, final BlockState byj, final int integer) {
-        final ChunkAccess bzy5 = this.getChunk(fk);
-        final BlockState byj2 = bzy5.setBlockState(fk, byj, false);
-        if (byj2 != null) {
-            this.level.onBlockStateChange(fk, byj2, byj);
+    public boolean setBlock(final BlockPos fu, final BlockState cfj, final int integer3, final int integer4) {
+        final ChunkAccess cgy6 = this.getChunk(fu);
+        final BlockState cfj2 = cgy6.setBlockState(fu, cfj, false);
+        if (cfj2 != null) {
+            this.level.onBlockStateChange(fu, cfj2, cfj);
         }
-        final Block bph7 = byj.getBlock();
-        if (bph7.isEntityBlock()) {
-            if (bzy5.getStatus().getChunkType() == ChunkStatus.ChunkType.LEVELCHUNK) {
-                bzy5.setBlockEntity(fk, ((EntityBlock)bph7).newBlockEntity(this));
+        final Block bvr8 = cfj.getBlock();
+        if (bvr8.isEntityBlock()) {
+            if (cgy6.getStatus().getChunkType() == ChunkStatus.ChunkType.LEVELCHUNK) {
+                cgy6.setBlockEntity(fu, ((EntityBlock)bvr8).newBlockEntity(this));
             }
             else {
-                final CompoundTag jt8 = new CompoundTag();
-                jt8.putInt("x", fk.getX());
-                jt8.putInt("y", fk.getY());
-                jt8.putInt("z", fk.getZ());
-                jt8.putString("id", "DUMMY");
-                bzy5.setBlockEntityNbt(jt8);
+                final CompoundTag le9 = new CompoundTag();
+                le9.putInt("x", fu.getX());
+                le9.putInt("y", fu.getY());
+                le9.putInt("z", fu.getZ());
+                le9.putString("id", "DUMMY");
+                cgy6.setBlockEntityNbt(le9);
             }
         }
-        else if (byj2 != null && byj2.getBlock().isEntityBlock()) {
-            bzy5.removeBlockEntity(fk);
+        else if (cfj2 != null && cfj2.getBlock().isEntityBlock()) {
+            cgy6.removeBlockEntity(fu);
         }
-        if (byj.hasPostProcess(this, fk)) {
-            this.markPosForPostprocessing(fk);
+        if (cfj.hasPostProcess(this, fu)) {
+            this.markPosForPostprocessing(fu);
         }
         return true;
     }
     
-    private void markPosForPostprocessing(final BlockPos fk) {
-        this.getChunk(fk).markPosForPostprocessing(fk);
+    private void markPosForPostprocessing(final BlockPos fu) {
+        this.getChunk(fu).markPosForPostprocessing(fu);
     }
     
     @Override
-    public boolean addFreshEntity(final Entity akq) {
-        final int integer3 = Mth.floor(akq.getX() / 16.0);
-        final int integer4 = Mth.floor(akq.getZ() / 16.0);
-        this.getChunk(integer3, integer4).addEntity(akq);
+    public boolean addFreshEntity(final Entity aom) {
+        final int integer3 = Mth.floor(aom.getX() / 16.0);
+        final int integer4 = Mth.floor(aom.getZ() / 16.0);
+        this.getChunk(integer3, integer4).addEntity(aom);
         return true;
     }
     
     @Override
-    public boolean removeBlock(final BlockPos fk, final boolean boolean2) {
-        return this.setBlock(fk, Blocks.AIR.defaultBlockState(), 3);
+    public boolean removeBlock(final BlockPos fu, final boolean boolean2) {
+        return this.setBlock(fu, Blocks.AIR.defaultBlockState(), 3);
     }
     
     @Override
@@ -280,8 +281,8 @@ public class WorldGenRegion implements LevelAccessor {
     }
     
     @Override
-    public DifficultyInstance getCurrentDifficultyAt(final BlockPos fk) {
-        if (!this.hasChunk(fk.getX() >> 4, fk.getZ() >> 4)) {
+    public DifficultyInstance getCurrentDifficultyAt(final BlockPos fu) {
+        if (!this.hasChunk(fu.getX() >> 4, fu.getZ() >> 4)) {
             throw new RuntimeException("We are asking a region for a chunk out of bound");
         }
         return new DifficultyInstance(this.level.getDifficulty(), this.level.getDayTime(), 0L, this.level.getMoonBrightness());
@@ -309,7 +310,7 @@ public class WorldGenRegion implements LevelAccessor {
     
     @Override
     public int getSeaLevel() {
-        return this.seaLevel;
+        return this.level.getSeaLevel();
     }
     
     @Override
@@ -317,49 +318,40 @@ public class WorldGenRegion implements LevelAccessor {
         return this.random;
     }
     
-    @Override
-    public void blockUpdated(final BlockPos fk, final Block bph) {
-    }
-    
     @Override
     public int getHeight(final Heightmap.Types a, final int integer2, final int integer3) {
         return this.getChunk(integer2 >> 4, integer3 >> 4).getHeight(a, integer2 & 0xF, integer3 & 0xF) + 1;
     }
     
     @Override
-    public void playSound(@Nullable final Player ayj, final BlockPos fk, final SoundEvent aah, final SoundSource aaj, final float float5, final float float6) {
+    public void playSound(@Nullable final Player bec, final BlockPos fu, final SoundEvent ack, final SoundSource acm, final float float5, final float float6) {
     }
     
     @Override
-    public void addParticle(final ParticleOptions gt, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+    public void addParticle(final ParticleOptions hf, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
     }
     
     @Override
-    public void levelEvent(@Nullable final Player ayj, final int integer2, final BlockPos fk, final int integer4) {
+    public void levelEvent(@Nullable final Player bec, final int integer2, final BlockPos fu, final int integer4) {
     }
     
     @Override
-    public BlockPos getSharedSpawnPos() {
-        return this.level.getSharedSpawnPos();
+    public DimensionType dimensionType() {
+        return this.dimensionType;
     }
     
     @Override
-    public Dimension getDimension() {
-        return this.dimension;
+    public boolean isStateAtPosition(final BlockPos fu, final Predicate<BlockState> predicate) {
+        return predicate.test(this.getBlockState(fu));
     }
     
     @Override
-    public boolean isStateAtPosition(final BlockPos fk, final Predicate<BlockState> predicate) {
-        return predicate.test(this.getBlockState(fk));
-    }
-    
-    @Override
-    public <T extends Entity> List<T> getEntitiesOfClass(final Class<? extends T> class1, final AABB cvf, @Nullable final Predicate<? super T> predicate) {
+    public <T extends Entity> List<T> getEntitiesOfClass(final Class<? extends T> class1, final AABB deg, @Nullable final Predicate<? super T> predicate) {
         return Collections.<T>emptyList();
     }
     
     @Override
-    public List<Entity> getEntities(@Nullable final Entity akq, final AABB cvf, @Nullable final Predicate<? super Entity> predicate) {
+    public List<Entity> getEntities(@Nullable final Entity aom, final AABB deg, @Nullable final Predicate<? super Entity> predicate) {
         return Collections.<Entity>emptyList();
     }
     
diff --git a/src/net/minecraft/server/level/WorldGenTickList.java b/src/net/minecraft/server/level/WorldGenTickList.java
index 0546fe5..f8239a1 100644
--- a/src/net/minecraft/server/level/WorldGenTickList.java
+++ b/src/net/minecraft/server/level/WorldGenTickList.java
@@ -1,7 +1,5 @@
 package net.minecraft.server.level;
 
-import net.minecraft.world.level.TickNextTickData;
-import java.util.stream.Stream;
 import net.minecraft.world.level.TickPriority;
 import net.minecraft.core.BlockPos;
 import java.util.function.Function;
@@ -15,22 +13,17 @@ public class WorldGenTickList<T> implements TickList<T> {
     }
     
     @Override
-    public boolean hasScheduledTick(final BlockPos fk, final T object) {
-        return this.index.apply(fk).hasScheduledTick(fk, object);
+    public boolean hasScheduledTick(final BlockPos fu, final T object) {
+        return this.index.apply(fu).hasScheduledTick(fu, object);
     }
     
     @Override
-    public void scheduleTick(final BlockPos fk, final T object, final int integer, final TickPriority bkn) {
-        this.index.apply(fk).scheduleTick(fk, object, integer, bkn);
+    public void scheduleTick(final BlockPos fu, final T object, final int integer, final TickPriority bqt) {
+        this.index.apply(fu).scheduleTick(fu, object, integer, bqt);
     }
     
     @Override
-    public boolean willTickThisTick(final BlockPos fk, final T object) {
+    public boolean willTickThisTick(final BlockPos fu, final T object) {
         return false;
     }
-    
-    @Override
-    public void addAll(final Stream<TickNextTickData<T>> stream) {
-        stream.forEach(bkm -> this.index.apply(bkm.pos).addAll(Stream.<TickNextTickData<T>>of(bkm)));
-    }
 }
diff --git a/src/net/minecraft/server/level/progress/ChunkProgressListener.java b/src/net/minecraft/server/level/progress/ChunkProgressListener.java
index 9d5d41d..ab5e676 100644
--- a/src/net/minecraft/server/level/progress/ChunkProgressListener.java
+++ b/src/net/minecraft/server/level/progress/ChunkProgressListener.java
@@ -5,9 +5,9 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.ChunkPos;
 
 public interface ChunkProgressListener {
-    void updateSpawnPos(final ChunkPos bjh);
+    void updateSpawnPos(final ChunkPos bph);
     
-    void onStatusChange(final ChunkPos bjh, @Nullable final ChunkStatus cae);
+    void onStatusChange(final ChunkPos bph, @Nullable final ChunkStatus chc);
     
     void stop();
 }
diff --git a/src/net/minecraft/server/level/progress/LoggerChunkProgressListener.java b/src/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
index 43ecef7..0e411db 100644
--- a/src/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
+++ b/src/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
@@ -23,14 +23,14 @@ public class LoggerChunkProgressListener implements ChunkProgressListener {
     }
     
     @Override
-    public void updateSpawnPos(final ChunkPos bjh) {
+    public void updateSpawnPos(final ChunkPos bph) {
         this.nextTickTime = Util.getMillis();
         this.startTime = this.nextTickTime;
     }
     
     @Override
-    public void onStatusChange(final ChunkPos bjh, @Nullable final ChunkStatus cae) {
-        if (cae == ChunkStatus.FULL) {
+    public void onStatusChange(final ChunkPos bph, @Nullable final ChunkStatus chc) {
+        if (chc == ChunkStatus.FULL) {
             ++this.count;
         }
         final int integer4 = this.getProgress();
diff --git a/src/net/minecraft/server/level/progress/ProcessorChunkProgressListener.java b/src/net/minecraft/server/level/progress/ProcessorChunkProgressListener.java
index cd3b128..f9a33ad 100644
--- a/src/net/minecraft/server/level/progress/ProcessorChunkProgressListener.java
+++ b/src/net/minecraft/server/level/progress/ProcessorChunkProgressListener.java
@@ -10,19 +10,19 @@ public class ProcessorChunkProgressListener implements ChunkProgressListener {
     private final ChunkProgressListener delegate;
     private final ProcessorMailbox<Runnable> mailbox;
     
-    public ProcessorChunkProgressListener(final ChunkProgressListener xm, final Executor executor) {
-        this.delegate = xm;
+    public ProcessorChunkProgressListener(final ChunkProgressListener zm, final Executor executor) {
+        this.delegate = zm;
         this.mailbox = ProcessorMailbox.create(executor, "progressListener");
     }
     
     @Override
-    public void updateSpawnPos(final ChunkPos bjh) {
-        this.mailbox.tell(() -> this.delegate.updateSpawnPos(bjh));
+    public void updateSpawnPos(final ChunkPos bph) {
+        this.mailbox.tell(() -> this.delegate.updateSpawnPos(bph));
     }
     
     @Override
-    public void onStatusChange(final ChunkPos bjh, @Nullable final ChunkStatus cae) {
-        this.mailbox.tell(() -> this.delegate.onStatusChange(bjh, cae));
+    public void onStatusChange(final ChunkPos bph, @Nullable final ChunkStatus chc) {
+        this.mailbox.tell(() -> this.delegate.onStatusChange(bph, chc));
     }
     
     @Override
diff --git a/src/net/minecraft/server/level/progress/StoringChunkProgressListener.java b/src/net/minecraft/server/level/progress/StoringChunkProgressListener.java
index b98cdfd..8151b3e 100644
--- a/src/net/minecraft/server/level/progress/StoringChunkProgressListener.java
+++ b/src/net/minecraft/server/level/progress/StoringChunkProgressListener.java
@@ -24,25 +24,25 @@ public class StoringChunkProgressListener implements ChunkProgressListener {
     }
     
     @Override
-    public void updateSpawnPos(final ChunkPos bjh) {
+    public void updateSpawnPos(final ChunkPos bph) {
         if (!this.started) {
             return;
         }
-        this.delegate.updateSpawnPos(bjh);
-        this.spawnPos = bjh;
+        this.delegate.updateSpawnPos(bph);
+        this.spawnPos = bph;
     }
     
     @Override
-    public void onStatusChange(final ChunkPos bjh, @Nullable final ChunkStatus cae) {
+    public void onStatusChange(final ChunkPos bph, @Nullable final ChunkStatus chc) {
         if (!this.started) {
             return;
         }
-        this.delegate.onStatusChange(bjh, cae);
-        if (cae == null) {
-            this.statuses.remove(bjh.toLong());
+        this.delegate.onStatusChange(bph, chc);
+        if (chc == null) {
+            this.statuses.remove(bph.toLong());
         }
         else {
-            this.statuses.put(bjh.toLong(), cae);
+            this.statuses.put(bph.toLong(), chc);
         }
     }
     
diff --git a/src/net/minecraft/server/network/LegacyQueryHandler.java b/src/net/minecraft/server/network/LegacyQueryHandler.java
index 9be4eb0..a929d1e 100644
--- a/src/net/minecraft/server/network/LegacyQueryHandler.java
+++ b/src/net/minecraft/server/network/LegacyQueryHandler.java
@@ -16,8 +16,8 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
     private static final Logger LOGGER;
     private final ServerConnectionListener serverConnectionListener;
     
-    public LegacyQueryHandler(final ServerConnectionListener xu) {
-        this.serverConnectionListener = xu;
+    public LegacyQueryHandler(final ServerConnectionListener zu) {
+        this.serverConnectionListener = zu;
     }
     
     public void channelRead(final ChannelHandlerContext channelHandlerContext, final Object object) throws Exception {
diff --git a/src/net/minecraft/server/network/MemoryServerHandshakePacketListenerImpl.java b/src/net/minecraft/server/network/MemoryServerHandshakePacketListenerImpl.java
index 1a011be..f75fe14 100644
--- a/src/net/minecraft/server/network/MemoryServerHandshakePacketListenerImpl.java
+++ b/src/net/minecraft/server/network/MemoryServerHandshakePacketListenerImpl.java
@@ -11,19 +11,19 @@ public class MemoryServerHandshakePacketListenerImpl implements ServerHandshakeP
     private final MinecraftServer server;
     private final Connection connection;
     
-    public MemoryServerHandshakePacketListenerImpl(final MinecraftServer minecraftServer, final Connection kt) {
+    public MemoryServerHandshakePacketListenerImpl(final MinecraftServer minecraftServer, final Connection me) {
         this.server = minecraftServer;
-        this.connection = kt;
+        this.connection = me;
     }
     
     @Override
-    public void handleIntention(final ClientIntentionPacket re) {
-        this.connection.setProtocol(re.getIntention());
+    public void handleIntention(final ClientIntentionPacket st) {
+        this.connection.setProtocol(st.getIntention());
         this.connection.setListener(new ServerLoginPacketListenerImpl(this.server, this.connection));
     }
     
     @Override
-    public void onDisconnect(final Component lf) {
+    public void onDisconnect(final Component mr) {
     }
     
     @Override
diff --git a/src/net/minecraft/server/network/ServerConnectionListener.java b/src/net/minecraft/server/network/ServerConnectionListener.java
index 94037f3..ffc1bc5 100644
--- a/src/net/minecraft/server/network/ServerConnectionListener.java
+++ b/src/net/minecraft/server/network/ServerConnectionListener.java
@@ -3,7 +3,6 @@ package net.minecraft.server.network;
 import org.apache.logging.log4j.LogManager;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import net.minecraft.network.chat.Component;
-import net.minecraft.CrashReportCategory;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import net.minecraft.network.protocol.Packet;
@@ -66,15 +65,15 @@ public class ServerConnectionListener {
     public void startTcpServerListener(@Nullable final InetAddress inetAddress, final int integer) throws IOException {
         synchronized (this.channels) {
             Class<? extends ServerSocketChannel> class5;
-            LazyLoadedValue<? extends EventLoopGroup> abn6;
+            LazyLoadedValue<? extends EventLoopGroup> ady6;
             if (Epoll.isAvailable() && this.server.isEpollEnabled()) {
                 class5 = EpollServerSocketChannel.class;
-                abn6 = ServerConnectionListener.SERVER_EPOLL_EVENT_GROUP;
+                ady6 = ServerConnectionListener.SERVER_EPOLL_EVENT_GROUP;
                 ServerConnectionListener.LOGGER.info("Using epoll channel type");
             }
             else {
                 class5 = NioServerSocketChannel.class;
-                abn6 = ServerConnectionListener.SERVER_EVENT_GROUP;
+                ady6 = ServerConnectionListener.SERVER_EVENT_GROUP;
                 ServerConnectionListener.LOGGER.info("Using default channel type");
             }
             this.channels.add(((ServerBootstrap)((ServerBootstrap)new ServerBootstrap().channel((Class)class5)).childHandler((ChannelHandler)new ChannelInitializer<Channel>() {
@@ -84,12 +83,12 @@ public class ServerConnectionListener {
                     }
                     catch (ChannelException ex) {}
                     channel.pipeline().addLast("timeout", (ChannelHandler)new ReadTimeoutHandler(30)).addLast("legacy_query", (ChannelHandler)new LegacyQueryHandler(ServerConnectionListener.this)).addLast("splitter", (ChannelHandler)new Varint21FrameDecoder()).addLast("decoder", (ChannelHandler)new PacketDecoder(PacketFlow.SERVERBOUND)).addLast("prepender", (ChannelHandler)new Varint21LengthFieldPrepender()).addLast("encoder", (ChannelHandler)new PacketEncoder(PacketFlow.CLIENTBOUND));
-                    final Connection kt3 = new Connection(PacketFlow.SERVERBOUND);
-                    ServerConnectionListener.this.connections.add(kt3);
-                    channel.pipeline().addLast("packet_handler", (ChannelHandler)kt3);
-                    kt3.setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, kt3));
+                    final Connection me3 = new Connection(PacketFlow.SERVERBOUND);
+                    ServerConnectionListener.this.connections.add(me3);
+                    channel.pipeline().addLast("packet_handler", (ChannelHandler)me3);
+                    me3.setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, me3));
                 }
-            }).group((EventLoopGroup)abn6.get()).localAddress(inetAddress, integer)).bind().syncUninterruptibly());
+            }).group((EventLoopGroup)ady6.get()).localAddress(inetAddress, integer)).bind().syncUninterruptibly());
         }
     }
     
@@ -98,10 +97,10 @@ public class ServerConnectionListener {
         synchronized (this.channels) {
             channelFuture2 = ((ServerBootstrap)((ServerBootstrap)new ServerBootstrap().channel((Class)LocalServerChannel.class)).childHandler((ChannelHandler)new ChannelInitializer<Channel>() {
                 protected void initChannel(final Channel channel) throws Exception {
-                    final Connection kt3 = new Connection(PacketFlow.SERVERBOUND);
-                    kt3.setListener(new MemoryServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, kt3));
-                    ServerConnectionListener.this.connections.add(kt3);
-                    channel.pipeline().addLast("packet_handler", (ChannelHandler)kt3);
+                    final Connection me3 = new Connection(PacketFlow.SERVERBOUND);
+                    me3.setListener(new MemoryServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, me3));
+                    ServerConnectionListener.this.connections.add(me3);
+                    channel.pipeline().addLast("packet_handler", (ChannelHandler)me3);
                 }
             }).group((EventLoopGroup)ServerConnectionListener.SERVER_EVENT_GROUP.get()).localAddress((SocketAddress)LocalAddress.ANY)).bind().syncUninterruptibly();
             this.channels.add(channelFuture2);
@@ -125,30 +124,27 @@ public class ServerConnectionListener {
         synchronized (this.connections) {
             final Iterator<Connection> iterator3 = this.connections.iterator();
             while (iterator3.hasNext()) {
-                final Connection kt4 = iterator3.next();
-                if (kt4.isConnecting()) {
+                final Connection me4 = iterator3.next();
+                if (me4.isConnecting()) {
                     continue;
                 }
-                if (kt4.isConnected()) {
+                if (me4.isConnected()) {
                     try {
-                        kt4.tick();
+                        me4.tick();
                     }
                     catch (Exception exception5) {
-                        if (kt4.isMemoryConnection()) {
-                            final CrashReport h6 = CrashReport.forThrowable(exception5, "Ticking memory connection");
-                            final CrashReportCategory i7 = h6.addCategory("Ticking connection");
-                            i7.setDetail("Connection", kt4::toString);
-                            throw new ReportedException(h6);
+                        if (me4.isMemoryConnection()) {
+                            throw new ReportedException(CrashReport.forThrowable(exception5, "Ticking memory connection"));
                         }
-                        ServerConnectionListener.LOGGER.warn("Failed to handle packet for {}", kt4.getRemoteAddress(), exception5);
-                        final Component lf6 = new TextComponent("Internal server error");
-                        kt4.send(new ClientboundDisconnectPacket(lf6), (future -> kt4.disconnect(lf6)));
-                        kt4.setReadOnly();
+                        ServerConnectionListener.LOGGER.warn("Failed to handle packet for {}", me4.getRemoteAddress(), exception5);
+                        final Component mr6 = new TextComponent("Internal server error");
+                        me4.send(new ClientboundDisconnectPacket(mr6), (future -> me4.disconnect(mr6)));
+                        me4.setReadOnly();
                     }
                 }
                 else {
                     iterator3.remove();
-                    kt4.handleDisconnection();
+                    me4.handleDisconnection();
                 }
             }
         }
diff --git a/src/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 09082e2..bf5d00a 100644
--- a/src/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1,6 +1,6 @@
 package net.minecraft.server.network;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import org.apache.logging.log4j.LogManager;
 import com.mojang.brigadier.suggestion.Suggestions;
 import net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket;
@@ -21,12 +21,12 @@ import net.minecraft.world.inventory.Slot;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.protocol.game.ServerboundContainerClickPacket;
 import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
+import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.ExperienceOrb;
 import net.minecraft.world.entity.item.ItemEntity;
+import java.util.Optional;
 import net.minecraft.network.protocol.game.ServerboundInteractPacket;
 import net.minecraft.world.entity.animal.horse.AbstractHorse;
 import net.minecraft.world.entity.PlayerRideableJumping;
@@ -57,14 +57,22 @@ import net.minecraft.ChatFormatting;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.BucketItem;
+import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
 import java.util.Set;
 import net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket;
 import java.util.Collections;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import java.util.stream.Stream;
+import net.minecraft.world.phys.shapes.BooleanOp;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.effect.MobEffects;
-import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery;
 import net.minecraft.network.protocol.game.ClientboundTagQueryPacket;
@@ -82,6 +90,7 @@ import net.minecraft.network.protocol.game.ServerboundEditBookPacket;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MerchantMenu;
 import net.minecraft.network.protocol.game.ServerboundSelectTradePacket;
+import net.minecraft.network.protocol.game.ServerboundJigsawGeneratePacket;
 import net.minecraft.world.level.block.entity.JigsawBlockEntity;
 import net.minecraft.network.protocol.game.ServerboundSetJigsawBlockPacket;
 import net.minecraft.world.level.block.entity.StructureBlockEntity;
@@ -118,6 +127,7 @@ import net.minecraft.world.item.crafting.Recipe;
 import java.util.function.Consumer;
 import net.minecraft.network.protocol.game.ServerboundRecipeBookUpdatePacket;
 import net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.MoverType;
 import net.minecraft.network.protocol.game.ClientboundMoveVehiclePacket;
@@ -181,12 +191,12 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
     private int receivedMovePacketCount;
     private int knownMovePacketCount;
     
-    public ServerGamePacketListenerImpl(final MinecraftServer minecraftServer, final Connection kt, final ServerPlayer xe) {
+    public ServerGamePacketListenerImpl(final MinecraftServer minecraftServer, final Connection me, final ServerPlayer ze) {
         this.expectedAcks = (Int2ShortMap)new Int2ShortOpenHashMap();
         this.server = minecraftServer;
-        (this.connection = kt).setListener(this);
-        this.player = xe;
-        xe.connection = this;
+        (this.connection = me).setListener(this);
+        this.player = ze;
+        ze.connection = this;
     }
     
     public void tick() {
@@ -198,10 +208,10 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
         this.player.absMoveTo(this.firstGoodX, this.firstGoodY, this.firstGoodZ, this.player.yRot, this.player.xRot);
         ++this.tickCount;
         this.knownMovePacketCount = this.receivedMovePacketCount;
-        if (this.clientIsFloating) {
+        if (this.clientIsFloating && !this.player.isSleeping()) {
             if (++this.aboveGroundTickCount > 80) {
                 ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating too long!", this.player.getName().getString());
-                this.disconnect(new TranslatableComponent("multiplayer.disconnect.flying", new Object[0]));
+                this.disconnect(new TranslatableComponent("multiplayer.disconnect.flying"));
                 return;
             }
         }
@@ -225,7 +235,7 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
             if (this.clientVehicleIsFloating && this.player.getRootVehicle().getControllingPassenger() == this.player) {
                 if (++this.aboveGroundVehicleTickCount > 80) {
                     ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getName().getString());
-                    this.disconnect(new TranslatableComponent("multiplayer.disconnect.flying", new Object[0]));
+                    this.disconnect(new TranslatableComponent("multiplayer.disconnect.flying"));
                     return;
                 }
             }
@@ -238,7 +248,7 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
         final long long2 = Util.getMillis();
         if (long2 - this.keepAliveTime >= 15000L) {
             if (this.keepAlivePending) {
-                this.disconnect(new TranslatableComponent("disconnect.timeout", new Object[0]));
+                this.disconnect(new TranslatableComponent("disconnect.timeout"));
             }
             else {
                 this.keepAlivePending = true;
@@ -255,7 +265,7 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
             --this.dropSpamTickCount;
         }
         if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > this.server.getPlayerIdleTimeout() * 1000 * 60) {
-            this.disconnect(new TranslatableComponent("multiplayer.disconnect.idling", new Object[0]));
+            this.disconnect(new TranslatableComponent("multiplayer.disconnect.idling"));
         }
     }
     
@@ -277,92 +287,96 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
         return this.server.isSingleplayerOwner(this.player.getGameProfile());
     }
     
-    public void disconnect(final Component lf) {
-        this.connection.send(new ClientboundDisconnectPacket(lf), (future -> this.connection.disconnect(lf)));
+    public void disconnect(final Component mr) {
+        this.connection.send(new ClientboundDisconnectPacket(mr), (future -> this.connection.disconnect(mr)));
         this.connection.setReadOnly();
         this.server.executeBlocking(this.connection::handleDisconnection);
     }
     
     @Override
-    public void handlePlayerInput(final ServerboundPlayerInputPacket ql) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)ql, this, this.player.getLevel());
-        this.player.setPlayerInput(ql.getXxa(), ql.getZza(), ql.isJumping(), ql.isShiftKeyDown());
+    public void handlePlayerInput(final ServerboundPlayerInputPacket sa) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sa, this, this.player.getLevel());
+        this.player.setPlayerInput(sa.getXxa(), sa.getZza(), sa.isJumping(), sa.isShiftKeyDown());
     }
     
-    private static boolean containsInvalidValues(final ServerboundMovePlayerPacket qd) {
-        return !Doubles.isFinite(qd.getX(0.0)) || !Doubles.isFinite(qd.getY(0.0)) || !Doubles.isFinite(qd.getZ(0.0)) || !Floats.isFinite(qd.getXRot(0.0f)) || !Floats.isFinite(qd.getYRot(0.0f)) || (Math.abs(qd.getX(0.0)) > 3.0E7 || Math.abs(qd.getY(0.0)) > 3.0E7 || Math.abs(qd.getZ(0.0)) > 3.0E7);
+    private static boolean containsInvalidValues(final ServerboundMovePlayerPacket rs) {
+        return !Doubles.isFinite(rs.getX(0.0)) || !Doubles.isFinite(rs.getY(0.0)) || !Doubles.isFinite(rs.getZ(0.0)) || !Floats.isFinite(rs.getXRot(0.0f)) || !Floats.isFinite(rs.getYRot(0.0f)) || (Math.abs(rs.getX(0.0)) > 3.0E7 || Math.abs(rs.getY(0.0)) > 3.0E7 || Math.abs(rs.getZ(0.0)) > 3.0E7);
     }
     
-    private static boolean containsInvalidValues(final ServerboundMoveVehiclePacket qe) {
-        return !Doubles.isFinite(qe.getX()) || !Doubles.isFinite(qe.getY()) || !Doubles.isFinite(qe.getZ()) || !Floats.isFinite(qe.getXRot()) || !Floats.isFinite(qe.getYRot());
+    private static boolean containsInvalidValues(final ServerboundMoveVehiclePacket rt) {
+        return !Doubles.isFinite(rt.getX()) || !Doubles.isFinite(rt.getY()) || !Doubles.isFinite(rt.getZ()) || !Floats.isFinite(rt.getXRot()) || !Floats.isFinite(rt.getYRot());
     }
     
     @Override
-    public void handleMoveVehicle(final ServerboundMoveVehiclePacket qe) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qe, this, this.player.getLevel());
-        if (containsInvalidValues(qe)) {
-            this.disconnect(new TranslatableComponent("multiplayer.disconnect.invalid_vehicle_movement", new Object[0]));
+    public void handleMoveVehicle(final ServerboundMoveVehiclePacket rt) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rt, this, this.player.getLevel());
+        if (containsInvalidValues(rt)) {
+            this.disconnect(new TranslatableComponent("multiplayer.disconnect.invalid_vehicle_movement"));
             return;
         }
-        final Entity akq3 = this.player.getRootVehicle();
-        if (akq3 != this.player && akq3.getControllingPassenger() == this.player && akq3 == this.lastVehicle) {
-            final ServerLevel xd4 = this.player.getLevel();
-            final double double5 = akq3.getX();
-            final double double6 = akq3.getY();
-            final double double7 = akq3.getZ();
-            final double double8 = qe.getX();
-            final double double9 = qe.getY();
-            final double double10 = qe.getZ();
-            final float float17 = qe.getYRot();
-            final float float18 = qe.getXRot();
+        final Entity aom3 = this.player.getRootVehicle();
+        if (aom3 != this.player && aom3.getControllingPassenger() == this.player && aom3 == this.lastVehicle) {
+            final ServerLevel zd4 = this.player.getLevel();
+            final double double5 = aom3.getX();
+            final double double6 = aom3.getY();
+            final double double7 = aom3.getZ();
+            final double double8 = rt.getX();
+            final double double9 = rt.getY();
+            final double double10 = rt.getZ();
+            final float float17 = rt.getYRot();
+            final float float18 = rt.getXRot();
             double double11 = double8 - this.vehicleFirstGoodX;
             double double12 = double9 - this.vehicleFirstGoodY;
             double double13 = double10 - this.vehicleFirstGoodZ;
-            final double double14 = akq3.getDeltaMovement().lengthSqr();
+            final double double14 = aom3.getDeltaMovement().lengthSqr();
             double double15 = double11 * double11 + double12 * double12 + double13 * double13;
             if (double15 - double14 > 100.0 && !this.isSingleplayerOwner()) {
-                ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", akq3.getName().getString(), this.player.getName().getString(), double11, double12, double13);
-                this.connection.send(new ClientboundMoveVehiclePacket(akq3));
+                ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", aom3.getName().getString(), this.player.getName().getString(), double11, double12, double13);
+                this.connection.send(new ClientboundMoveVehiclePacket(aom3));
                 return;
             }
-            final boolean boolean29 = xd4.noCollision(akq3, akq3.getBoundingBox().deflate(0.0625));
+            final boolean boolean29 = zd4.noCollision(aom3, aom3.getBoundingBox().deflate(0.0625));
             double11 = double8 - this.vehicleLastGoodX;
             double12 = double9 - this.vehicleLastGoodY - 1.0E-6;
             double13 = double10 - this.vehicleLastGoodZ;
-            akq3.move(MoverType.PLAYER, new Vec3(double11, double12, double13));
+            aom3.move(MoverType.PLAYER, new Vec3(double11, double12, double13));
             final double double16 = double12;
-            double11 = double8 - akq3.getX();
-            double12 = double9 - akq3.getY();
+            double11 = double8 - aom3.getX();
+            double12 = double9 - aom3.getY();
             if (double12 > -0.5 || double12 < 0.5) {
                 double12 = 0.0;
             }
-            double13 = double10 - akq3.getZ();
+            double13 = double10 - aom3.getZ();
             double15 = double11 * double11 + double12 * double12 + double13 * double13;
             boolean boolean30 = false;
             if (double15 > 0.0625) {
                 boolean30 = true;
-                ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!", akq3.getName().getString());
+                ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", aom3.getName().getString(), this.player.getName().getString(), Math.sqrt(double15));
             }
-            akq3.absMoveTo(double8, double9, double10, float17, float18);
-            final boolean boolean31 = xd4.noCollision(akq3, akq3.getBoundingBox().deflate(0.0625));
+            aom3.absMoveTo(double8, double9, double10, float17, float18);
+            final boolean boolean31 = zd4.noCollision(aom3, aom3.getBoundingBox().deflate(0.0625));
             if (boolean29 && (boolean30 || !boolean31)) {
-                akq3.absMoveTo(double5, double6, double7, float17, float18);
-                this.connection.send(new ClientboundMoveVehiclePacket(akq3));
+                aom3.absMoveTo(double5, double6, double7, float17, float18);
+                this.connection.send(new ClientboundMoveVehiclePacket(aom3));
                 return;
             }
             this.player.getLevel().getChunkSource().move(this.player);
             this.player.checkMovementStatistics(this.player.getX() - double5, this.player.getY() - double6, this.player.getZ() - double7);
-            this.clientVehicleIsFloating = (double16 >= -0.03125 && !this.server.isFlightAllowed() && !xd4.containsAnyBlocks(akq3.getBoundingBox().inflate(0.0625).expandTowards(0.0, -0.55, 0.0)));
-            this.vehicleLastGoodX = akq3.getX();
-            this.vehicleLastGoodY = akq3.getY();
-            this.vehicleLastGoodZ = akq3.getZ();
+            this.clientVehicleIsFloating = (double16 >= -0.03125 && !this.server.isFlightAllowed() && this.noBlocksAround(aom3));
+            this.vehicleLastGoodX = aom3.getX();
+            this.vehicleLastGoodY = aom3.getY();
+            this.vehicleLastGoodZ = aom3.getZ();
         }
     }
     
+    private boolean noBlocksAround(final Entity aom) {
+        return aom.level.getBlockStates(aom.getBoundingBox().inflate(0.0625).expandTowards(0.0, -0.55, 0.0)).allMatch(BlockBehaviour.BlockStateBase::isAir);
+    }
+    
     @Override
-    public void handleAcceptTeleportPacket(final ServerboundAcceptTeleportationPacket pm) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)pm, this, this.player.getLevel());
-        if (pm.getId() == this.awaitingTeleport) {
+    public void handleAcceptTeleportPacket(final ServerboundAcceptTeleportationPacket ra) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)ra, this, this.player.getLevel());
+        if (ra.getId() == this.awaitingTeleport) {
             this.player.absMoveTo(this.awaitingPositionFromClient.x, this.awaitingPositionFromClient.y, this.awaitingPositionFromClient.z, this.player.yRot, this.player.xRot);
             this.lastGoodX = this.awaitingPositionFromClient.x;
             this.lastGoodY = this.awaitingPositionFromClient.y;
@@ -375,317 +389,333 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
     }
     
     @Override
-    public void handleRecipeBookUpdatePacket(final ServerboundRecipeBookUpdatePacket qm) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qm, this, this.player.getLevel());
-        if (qm.getPurpose() == ServerboundRecipeBookUpdatePacket.Purpose.SHOWN) {
-            this.server.getRecipeManager().byKey(qm.getRecipe()).ifPresent(this.player.getRecipeBook()::removeHighlight);
+    public void handleRecipeBookUpdatePacket(final ServerboundRecipeBookUpdatePacket sb) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sb, this, this.player.getLevel());
+        if (sb.getPurpose() == ServerboundRecipeBookUpdatePacket.Purpose.SHOWN) {
+            this.server.getRecipeManager().byKey(sb.getRecipe()).ifPresent(this.player.getRecipeBook()::removeHighlight);
         }
-        else if (qm.getPurpose() == ServerboundRecipeBookUpdatePacket.Purpose.SETTINGS) {
-            this.player.getRecipeBook().setGuiOpen(qm.isGuiOpen());
-            this.player.getRecipeBook().setFilteringCraftable(qm.isFilteringCraftable());
-            this.player.getRecipeBook().setFurnaceGuiOpen(qm.isFurnaceGuiOpen());
-            this.player.getRecipeBook().setFurnaceFilteringCraftable(qm.isFurnaceFilteringCraftable());
-            this.player.getRecipeBook().setBlastingFurnaceGuiOpen(qm.isBlastFurnaceGuiOpen());
-            this.player.getRecipeBook().setBlastingFurnaceFilteringCraftable(qm.isBlastFurnaceFilteringCraftable());
-            this.player.getRecipeBook().setSmokerGuiOpen(qm.isSmokerGuiOpen());
-            this.player.getRecipeBook().setSmokerFilteringCraftable(qm.isSmokerFilteringCraftable());
+        else if (sb.getPurpose() == ServerboundRecipeBookUpdatePacket.Purpose.SETTINGS) {
+            this.player.getRecipeBook().setGuiOpen(sb.isGuiOpen());
+            this.player.getRecipeBook().setFilteringCraftable(sb.isFilteringCraftable());
+            this.player.getRecipeBook().setFurnaceGuiOpen(sb.isFurnaceGuiOpen());
+            this.player.getRecipeBook().setFurnaceFilteringCraftable(sb.isFurnaceFilteringCraftable());
+            this.player.getRecipeBook().setBlastingFurnaceGuiOpen(sb.isBlastFurnaceGuiOpen());
+            this.player.getRecipeBook().setBlastingFurnaceFilteringCraftable(sb.isBlastFurnaceFilteringCraftable());
+            this.player.getRecipeBook().setSmokerGuiOpen(sb.isSmokerGuiOpen());
+            this.player.getRecipeBook().setSmokerFilteringCraftable(sb.isSmokerFilteringCraftable());
         }
     }
     
     @Override
-    public void handleSeenAdvancements(final ServerboundSeenAdvancementsPacket qp) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qp, this, this.player.getLevel());
-        if (qp.getAction() == ServerboundSeenAdvancementsPacket.Action.OPENED_TAB) {
-            final ResourceLocation sm3 = qp.getTab();
-            final Advancement u4 = this.server.getAdvancements().getAdvancement(sm3);
-            if (u4 != null) {
-                this.player.getAdvancements().setSelectedTab(u4);
+    public void handleSeenAdvancements(final ServerboundSeenAdvancementsPacket se) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)se, this, this.player.getLevel());
+        if (se.getAction() == ServerboundSeenAdvancementsPacket.Action.OPENED_TAB) {
+            final ResourceLocation uh3 = se.getTab();
+            final Advancement w4 = this.server.getAdvancements().getAdvancement(uh3);
+            if (w4 != null) {
+                this.player.getAdvancements().setSelectedTab(w4);
             }
         }
     }
     
     @Override
-    public void handleCustomCommandSuggestions(final ServerboundCommandSuggestionPacket ps) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)ps, this, this.player.getLevel());
-        final StringReader stringReader3 = new StringReader(ps.getCommand());
+    public void handleCustomCommandSuggestions(final ServerboundCommandSuggestionPacket rg) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rg, this, this.player.getLevel());
+        final StringReader stringReader3 = new StringReader(rg.getCommand());
         if (stringReader3.canRead() && stringReader3.peek() == '/') {
             stringReader3.skip();
         }
         final ParseResults<CommandSourceStack> parseResults4 = (ParseResults<CommandSourceStack>)this.server.getCommands().getDispatcher().parse(stringReader3, this.player.createCommandSourceStack());
-        this.server.getCommands().getDispatcher().getCompletionSuggestions((ParseResults)parseResults4).thenAccept(suggestions -> this.connection.send(new ClientboundCommandSuggestionsPacket(ps.getId(), suggestions)));
+        this.server.getCommands().getDispatcher().getCompletionSuggestions((ParseResults)parseResults4).thenAccept(suggestions -> this.connection.send(new ClientboundCommandSuggestionsPacket(rg.getId(), suggestions)));
     }
     
     @Override
-    public void handleSetCommandBlock(final ServerboundSetCommandBlockPacket qt) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qt, this, this.player.getLevel());
+    public void handleSetCommandBlock(final ServerboundSetCommandBlockPacket si) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)si, this, this.player.getLevel());
         if (!this.server.isCommandBlockEnabled()) {
-            this.player.sendMessage(new TranslatableComponent("advMode.notEnabled", new Object[0]));
+            this.player.sendMessage(new TranslatableComponent("advMode.notEnabled"), Util.NIL_UUID);
             return;
         }
         if (!this.player.canUseGameMasterBlocks()) {
-            this.player.sendMessage(new TranslatableComponent("advMode.notAllowed", new Object[0]));
+            this.player.sendMessage(new TranslatableComponent("advMode.notAllowed"), Util.NIL_UUID);
             return;
         }
-        BaseCommandBlock bjc3 = null;
-        CommandBlockEntity bwq4 = null;
-        final BlockPos fk5 = qt.getPos();
-        final BlockEntity bwl6 = this.player.level.getBlockEntity(fk5);
-        if (bwl6 instanceof CommandBlockEntity) {
-            bwq4 = (CommandBlockEntity)bwl6;
-            bjc3 = bwq4.getCommandBlock();
+        BaseCommandBlock bpc3 = null;
+        CommandBlockEntity cdq4 = null;
+        final BlockPos fu5 = si.getPos();
+        final BlockEntity cdl6 = this.player.level.getBlockEntity(fu5);
+        if (cdl6 instanceof CommandBlockEntity) {
+            cdq4 = (CommandBlockEntity)cdl6;
+            bpc3 = cdq4.getCommandBlock();
         }
-        final String string7 = qt.getCommand();
-        final boolean boolean8 = qt.isTrackOutput();
-        if (bjc3 != null) {
-            final CommandBlockEntity.Mode a9 = bwq4.getMode();
-            final Direction fp10 = this.player.level.getBlockState(fk5).<Direction>getValue((Property<Direction>)CommandBlock.FACING);
-            switch (qt.getMode()) {
+        final String string7 = si.getCommand();
+        final boolean boolean8 = si.isTrackOutput();
+        if (bpc3 != null) {
+            final CommandBlockEntity.Mode a9 = cdq4.getMode();
+            final Direction fz10 = this.player.level.getBlockState(fu5).<Direction>getValue((Property<Direction>)CommandBlock.FACING);
+            switch (si.getMode()) {
                 case SEQUENCE: {
-                    final BlockState byj11 = Blocks.CHAIN_COMMAND_BLOCK.defaultBlockState();
-                    this.player.level.setBlock(fk5, (((AbstractStateHolder<O, BlockState>)byj11).setValue((Property<Comparable>)CommandBlock.FACING, fp10)).<Comparable, Boolean>setValue((Property<Comparable>)CommandBlock.CONDITIONAL, qt.isConditional()), 2);
+                    final BlockState cfj11 = Blocks.CHAIN_COMMAND_BLOCK.defaultBlockState();
+                    this.player.level.setBlock(fu5, (((StateHolder<O, BlockState>)cfj11).setValue((Property<Comparable>)CommandBlock.FACING, fz10)).<Comparable, Boolean>setValue((Property<Comparable>)CommandBlock.CONDITIONAL, si.isConditional()), 2);
                     break;
                 }
                 case AUTO: {
-                    final BlockState byj11 = Blocks.REPEATING_COMMAND_BLOCK.defaultBlockState();
-                    this.player.level.setBlock(fk5, (((AbstractStateHolder<O, BlockState>)byj11).setValue((Property<Comparable>)CommandBlock.FACING, fp10)).<Comparable, Boolean>setValue((Property<Comparable>)CommandBlock.CONDITIONAL, qt.isConditional()), 2);
+                    final BlockState cfj11 = Blocks.REPEATING_COMMAND_BLOCK.defaultBlockState();
+                    this.player.level.setBlock(fu5, (((StateHolder<O, BlockState>)cfj11).setValue((Property<Comparable>)CommandBlock.FACING, fz10)).<Comparable, Boolean>setValue((Property<Comparable>)CommandBlock.CONDITIONAL, si.isConditional()), 2);
                     break;
                 }
                 default: {
-                    final BlockState byj11 = Blocks.COMMAND_BLOCK.defaultBlockState();
-                    this.player.level.setBlock(fk5, (((AbstractStateHolder<O, BlockState>)byj11).setValue((Property<Comparable>)CommandBlock.FACING, fp10)).<Comparable, Boolean>setValue((Property<Comparable>)CommandBlock.CONDITIONAL, qt.isConditional()), 2);
+                    final BlockState cfj11 = Blocks.COMMAND_BLOCK.defaultBlockState();
+                    this.player.level.setBlock(fu5, (((StateHolder<O, BlockState>)cfj11).setValue((Property<Comparable>)CommandBlock.FACING, fz10)).<Comparable, Boolean>setValue((Property<Comparable>)CommandBlock.CONDITIONAL, si.isConditional()), 2);
                     break;
                 }
             }
-            bwl6.clearRemoved();
-            this.player.level.setBlockEntity(fk5, bwl6);
-            bjc3.setCommand(string7);
-            bjc3.setTrackOutput(boolean8);
+            cdl6.clearRemoved();
+            this.player.level.setBlockEntity(fu5, cdl6);
+            bpc3.setCommand(string7);
+            bpc3.setTrackOutput(boolean8);
             if (!boolean8) {
-                bjc3.setLastOutput(null);
+                bpc3.setLastOutput(null);
             }
-            bwq4.setAutomatic(qt.isAutomatic());
-            if (a9 != qt.getMode()) {
-                bwq4.onModeSwitch();
+            cdq4.setAutomatic(si.isAutomatic());
+            if (a9 != si.getMode()) {
+                cdq4.onModeSwitch();
             }
-            bjc3.onUpdated();
+            bpc3.onUpdated();
             if (!StringUtil.isNullOrEmpty(string7)) {
-                this.player.sendMessage(new TranslatableComponent("advMode.setCommand.success", new Object[] { string7 }));
+                this.player.sendMessage(new TranslatableComponent("advMode.setCommand.success", new Object[] { string7 }), Util.NIL_UUID);
             }
         }
     }
     
     @Override
-    public void handleSetCommandMinecart(final ServerboundSetCommandMinecartPacket qu) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qu, this, this.player.getLevel());
+    public void handleSetCommandMinecart(final ServerboundSetCommandMinecartPacket sj) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sj, this, this.player.getLevel());
         if (!this.server.isCommandBlockEnabled()) {
-            this.player.sendMessage(new TranslatableComponent("advMode.notEnabled", new Object[0]));
+            this.player.sendMessage(new TranslatableComponent("advMode.notEnabled"), Util.NIL_UUID);
             return;
         }
         if (!this.player.canUseGameMasterBlocks()) {
-            this.player.sendMessage(new TranslatableComponent("advMode.notAllowed", new Object[0]));
+            this.player.sendMessage(new TranslatableComponent("advMode.notAllowed"), Util.NIL_UUID);
             return;
         }
-        final BaseCommandBlock bjc3 = qu.getCommandBlock(this.player.level);
-        if (bjc3 != null) {
-            bjc3.setCommand(qu.getCommand());
-            bjc3.setTrackOutput(qu.isTrackOutput());
-            if (!qu.isTrackOutput()) {
-                bjc3.setLastOutput(null);
+        final BaseCommandBlock bpc3 = sj.getCommandBlock(this.player.level);
+        if (bpc3 != null) {
+            bpc3.setCommand(sj.getCommand());
+            bpc3.setTrackOutput(sj.isTrackOutput());
+            if (!sj.isTrackOutput()) {
+                bpc3.setLastOutput(null);
             }
-            bjc3.onUpdated();
-            this.player.sendMessage(new TranslatableComponent("advMode.setCommand.success", new Object[] { qu.getCommand() }));
+            bpc3.onUpdated();
+            this.player.sendMessage(new TranslatableComponent("advMode.setCommand.success", new Object[] { sj.getCommand() }), Util.NIL_UUID);
         }
     }
     
     @Override
-    public void handlePickItem(final ServerboundPickItemPacket qg) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qg, this, this.player.getLevel());
-        this.player.inventory.pickSlot(qg.getSlot());
+    public void handlePickItem(final ServerboundPickItemPacket rv) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rv, this, this.player.getLevel());
+        this.player.inventory.pickSlot(rv.getSlot());
         this.player.connection.send(new ClientboundContainerSetSlotPacket(-2, this.player.inventory.selected, this.player.inventory.getItem(this.player.inventory.selected)));
-        this.player.connection.send(new ClientboundContainerSetSlotPacket(-2, qg.getSlot(), this.player.inventory.getItem(qg.getSlot())));
+        this.player.connection.send(new ClientboundContainerSetSlotPacket(-2, rv.getSlot(), this.player.inventory.getItem(rv.getSlot())));
         this.player.connection.send(new ClientboundSetCarriedItemPacket(this.player.inventory.selected));
     }
     
     @Override
-    public void handleRenameItem(final ServerboundRenameItemPacket qn) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qn, this, this.player.getLevel());
+    public void handleRenameItem(final ServerboundRenameItemPacket sc) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sc, this, this.player.getLevel());
         if (this.player.containerMenu instanceof AnvilMenu) {
-            final AnvilMenu bap3 = (AnvilMenu)this.player.containerMenu;
-            final String string4 = SharedConstants.filterText(qn.getName());
+            final AnvilMenu bgk3 = (AnvilMenu)this.player.containerMenu;
+            final String string4 = SharedConstants.filterText(sc.getName());
             if (string4.length() <= 35) {
-                bap3.setItemName(string4);
+                bgk3.setItemName(string4);
             }
         }
     }
     
     @Override
-    public void handleSetBeaconPacket(final ServerboundSetBeaconPacket qr) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qr, this, this.player.getLevel());
+    public void handleSetBeaconPacket(final ServerboundSetBeaconPacket sg) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sg, this, this.player.getLevel());
         if (this.player.containerMenu instanceof BeaconMenu) {
-            ((BeaconMenu)this.player.containerMenu).updateEffects(qr.getPrimary(), qr.getSecondary());
+            ((BeaconMenu)this.player.containerMenu).updateEffects(sg.getPrimary(), sg.getSecondary());
         }
     }
     
     @Override
-    public void handleSetStructureBlock(final ServerboundSetStructureBlockPacket qx) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qx, this, this.player.getLevel());
+    public void handleSetStructureBlock(final ServerboundSetStructureBlockPacket sm) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sm, this, this.player.getLevel());
         if (!this.player.canUseGameMasterBlocks()) {
             return;
         }
-        final BlockPos fk3 = qx.getPos();
-        final BlockState byj4 = this.player.level.getBlockState(fk3);
-        final BlockEntity bwl5 = this.player.level.getBlockEntity(fk3);
-        if (bwl5 instanceof StructureBlockEntity) {
-            final StructureBlockEntity bxl6 = (StructureBlockEntity)bwl5;
-            bxl6.setMode(qx.getMode());
-            bxl6.setStructureName(qx.getName());
-            bxl6.setStructurePos(qx.getOffset());
-            bxl6.setStructureSize(qx.getSize());
-            bxl6.setMirror(qx.getMirror());
-            bxl6.setRotation(qx.getRotation());
-            bxl6.setMetaData(qx.getData());
-            bxl6.setIgnoreEntities(qx.isIgnoreEntities());
-            bxl6.setShowAir(qx.isShowAir());
-            bxl6.setShowBoundingBox(qx.isShowBoundingBox());
-            bxl6.setIntegrity(qx.getIntegrity());
-            bxl6.setSeed(qx.getSeed());
-            if (bxl6.hasStructureName()) {
-                final String string7 = bxl6.getStructureName();
-                if (qx.getUpdateType() == StructureBlockEntity.UpdateType.SAVE_AREA) {
-                    if (bxl6.saveStructure()) {
+        final BlockPos fu3 = sm.getPos();
+        final BlockState cfj4 = this.player.level.getBlockState(fu3);
+        final BlockEntity cdl5 = this.player.level.getBlockEntity(fu3);
+        if (cdl5 instanceof StructureBlockEntity) {
+            final StructureBlockEntity cel6 = (StructureBlockEntity)cdl5;
+            cel6.setMode(sm.getMode());
+            cel6.setStructureName(sm.getName());
+            cel6.setStructurePos(sm.getOffset());
+            cel6.setStructureSize(sm.getSize());
+            cel6.setMirror(sm.getMirror());
+            cel6.setRotation(sm.getRotation());
+            cel6.setMetaData(sm.getData());
+            cel6.setIgnoreEntities(sm.isIgnoreEntities());
+            cel6.setShowAir(sm.isShowAir());
+            cel6.setShowBoundingBox(sm.isShowBoundingBox());
+            cel6.setIntegrity(sm.getIntegrity());
+            cel6.setSeed(sm.getSeed());
+            if (cel6.hasStructureName()) {
+                final String string7 = cel6.getStructureName();
+                if (sm.getUpdateType() == StructureBlockEntity.UpdateType.SAVE_AREA) {
+                    if (cel6.saveStructure()) {
                         this.player.displayClientMessage(new TranslatableComponent("structure_block.save_success", new Object[] { string7 }), false);
                     }
                     else {
                         this.player.displayClientMessage(new TranslatableComponent("structure_block.save_failure", new Object[] { string7 }), false);
                     }
                 }
-                else if (qx.getUpdateType() == StructureBlockEntity.UpdateType.LOAD_AREA) {
-                    if (!bxl6.isStructureLoadable()) {
+                else if (sm.getUpdateType() == StructureBlockEntity.UpdateType.LOAD_AREA) {
+                    if (!cel6.isStructureLoadable()) {
                         this.player.displayClientMessage(new TranslatableComponent("structure_block.load_not_found", new Object[] { string7 }), false);
                     }
-                    else if (bxl6.loadStructure()) {
+                    else if (cel6.loadStructure()) {
                         this.player.displayClientMessage(new TranslatableComponent("structure_block.load_success", new Object[] { string7 }), false);
                     }
                     else {
                         this.player.displayClientMessage(new TranslatableComponent("structure_block.load_prepare", new Object[] { string7 }), false);
                     }
                 }
-                else if (qx.getUpdateType() == StructureBlockEntity.UpdateType.SCAN_AREA) {
-                    if (bxl6.detectSize()) {
+                else if (sm.getUpdateType() == StructureBlockEntity.UpdateType.SCAN_AREA) {
+                    if (cel6.detectSize()) {
                         this.player.displayClientMessage(new TranslatableComponent("structure_block.size_success", new Object[] { string7 }), false);
                     }
                     else {
-                        this.player.displayClientMessage(new TranslatableComponent("structure_block.size_failure", new Object[0]), false);
+                        this.player.displayClientMessage(new TranslatableComponent("structure_block.size_failure"), false);
                     }
                 }
             }
             else {
-                this.player.displayClientMessage(new TranslatableComponent("structure_block.invalid_structure_name", new Object[] { qx.getName() }), false);
+                this.player.displayClientMessage(new TranslatableComponent("structure_block.invalid_structure_name", new Object[] { sm.getName() }), false);
             }
-            bxl6.setChanged();
-            this.player.level.sendBlockUpdated(fk3, byj4, byj4, 3);
+            cel6.setChanged();
+            this.player.level.sendBlockUpdated(fu3, cfj4, cfj4, 3);
         }
     }
     
     @Override
-    public void handleSetJigsawBlock(final ServerboundSetJigsawBlockPacket qw) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qw, this, this.player.getLevel());
+    public void handleSetJigsawBlock(final ServerboundSetJigsawBlockPacket sl) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sl, this, this.player.getLevel());
         if (!this.player.canUseGameMasterBlocks()) {
             return;
         }
-        final BlockPos fk3 = qw.getPos();
-        final BlockState byj4 = this.player.level.getBlockState(fk3);
-        final BlockEntity bwl5 = this.player.level.getBlockEntity(fk3);
-        if (bwl5 instanceof JigsawBlockEntity) {
-            final JigsawBlockEntity bxb6 = (JigsawBlockEntity)bwl5;
-            bxb6.setAttachementType(qw.getAttachementType());
-            bxb6.setTargetPool(qw.getTargetPool());
-            bxb6.setFinalState(qw.getFinalState());
-            bxb6.setChanged();
-            this.player.level.sendBlockUpdated(fk3, byj4, byj4, 3);
+        final BlockPos fu3 = sl.getPos();
+        final BlockState cfj4 = this.player.level.getBlockState(fu3);
+        final BlockEntity cdl5 = this.player.level.getBlockEntity(fu3);
+        if (cdl5 instanceof JigsawBlockEntity) {
+            final JigsawBlockEntity ceb6 = (JigsawBlockEntity)cdl5;
+            ceb6.setName(sl.getName());
+            ceb6.setTarget(sl.getTarget());
+            ceb6.setPool(sl.getPool());
+            ceb6.setFinalState(sl.getFinalState());
+            ceb6.setJoint(sl.getJoint());
+            ceb6.setChanged();
+            this.player.level.sendBlockUpdated(fu3, cfj4, cfj4, 3);
         }
     }
     
     @Override
-    public void handleSelectTrade(final ServerboundSelectTradePacket qq) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qq, this, this.player.getLevel());
-        final int integer3 = qq.getItem();
-        final AbstractContainerMenu ban4 = this.player.containerMenu;
-        if (ban4 instanceof MerchantMenu) {
-            final MerchantMenu bbq5 = (MerchantMenu)ban4;
-            bbq5.setSelectionHint(integer3);
-            bbq5.tryMoveItems(integer3);
+    public void handleJigsawGenerate(final ServerboundJigsawGeneratePacket rp) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rp, this, this.player.getLevel());
+        if (!this.player.canUseGameMasterBlocks()) {
+            return;
+        }
+        final BlockPos fu3 = rp.getPos();
+        final BlockEntity cdl4 = this.player.level.getBlockEntity(fu3);
+        if (cdl4 instanceof JigsawBlockEntity) {
+            final JigsawBlockEntity ceb5 = (JigsawBlockEntity)cdl4;
+            ceb5.generate(this.player.getLevel(), rp.levels(), rp.keepJigsaws());
         }
     }
     
     @Override
-    public void handleEditBook(final ServerboundEditBookPacket py) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)py, this, this.player.getLevel());
-        final ItemStack ben3 = py.getBook();
-        if (ben3.isEmpty()) {
+    public void handleSelectTrade(final ServerboundSelectTradePacket sf) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sf, this, this.player.getLevel());
+        final int integer3 = sf.getItem();
+        final AbstractContainerMenu bgi4 = this.player.containerMenu;
+        if (bgi4 instanceof MerchantMenu) {
+            final MerchantMenu bhm5 = (MerchantMenu)bgi4;
+            bhm5.setSelectionHint(integer3);
+            bhm5.tryMoveItems(integer3);
+        }
+    }
+    
+    @Override
+    public void handleEditBook(final ServerboundEditBookPacket rm) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rm, this, this.player.getLevel());
+        final ItemStack bki3 = rm.getBook();
+        if (bki3.isEmpty()) {
             return;
         }
-        if (!WritableBookItem.makeSureTagIsValid(ben3.getTag())) {
+        if (!WritableBookItem.makeSureTagIsValid(bki3.getTag())) {
             return;
         }
-        final ItemStack ben4 = this.player.getItemInHand(py.getHand());
-        if (ben3.getItem() == Items.WRITABLE_BOOK && ben4.getItem() == Items.WRITABLE_BOOK) {
-            if (py.isSigning()) {
-                final ItemStack ben5 = new ItemStack(Items.WRITTEN_BOOK);
-                final CompoundTag jt6 = ben4.getTag();
-                if (jt6 != null) {
-                    ben5.setTag(jt6.copy());
+        final ItemStack bki4 = this.player.getItemInHand(rm.getHand());
+        if (bki3.getItem() == Items.WRITABLE_BOOK && bki4.getItem() == Items.WRITABLE_BOOK) {
+            if (rm.isSigning()) {
+                final ItemStack bki5 = new ItemStack(Items.WRITTEN_BOOK);
+                final CompoundTag le6 = bki4.getTag();
+                if (le6 != null) {
+                    bki5.setTag(le6.copy());
                 }
-                ben5.addTagElement("author", StringTag.valueOf(this.player.getName().getString()));
-                ben5.addTagElement("title", StringTag.valueOf(ben3.getTag().getString("title")));
-                final ListTag jz7 = ben3.getTag().getList("pages", 8);
-                for (int integer8 = 0; integer8 < jz7.size(); ++integer8) {
-                    String string9 = jz7.getString(integer8);
-                    final Component lf10 = new TextComponent(string9);
-                    string9 = Component.Serializer.toJson(lf10);
-                    jz7.set(integer8, StringTag.valueOf(string9));
+                bki5.addTagElement("author", StringTag.valueOf(this.player.getName().getString()));
+                bki5.addTagElement("title", StringTag.valueOf(bki3.getTag().getString("title")));
+                final ListTag lk7 = bki3.getTag().getList("pages", 8);
+                for (int integer8 = 0; integer8 < lk7.size(); ++integer8) {
+                    String string9 = lk7.getString(integer8);
+                    final Component mr10 = new TextComponent(string9);
+                    string9 = Component.Serializer.toJson(mr10);
+                    lk7.set(integer8, StringTag.valueOf(string9));
                 }
-                ben5.addTagElement("pages", jz7);
-                this.player.setItemInHand(py.getHand(), ben5);
+                bki5.addTagElement("pages", lk7);
+                this.player.setItemInHand(rm.getHand(), bki5);
             }
             else {
-                ben4.addTagElement("pages", ben3.getTag().getList("pages", 8));
+                bki4.addTagElement("pages", bki3.getTag().getList("pages", 8));
             }
         }
     }
     
     @Override
-    public void handleEntityTagQuery(final ServerboundEntityTagQuery pz) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)pz, this, this.player.getLevel());
+    public void handleEntityTagQuery(final ServerboundEntityTagQuery rn) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rn, this, this.player.getLevel());
         if (!this.player.hasPermissions(2)) {
             return;
         }
-        final Entity akq3 = this.player.getLevel().getEntity(pz.getEntityId());
-        if (akq3 != null) {
-            final CompoundTag jt4 = akq3.saveWithoutId(new CompoundTag());
-            this.player.connection.send(new ClientboundTagQueryPacket(pz.getTransactionId(), jt4));
+        final Entity aom3 = this.player.getLevel().getEntity(rn.getEntityId());
+        if (aom3 != null) {
+            final CompoundTag le4 = aom3.saveWithoutId(new CompoundTag());
+            this.player.connection.send(new ClientboundTagQueryPacket(rn.getTransactionId(), le4));
         }
     }
     
     @Override
-    public void handleBlockEntityTagQuery(final ServerboundBlockEntityTagQuery pn) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)pn, this, this.player.getLevel());
+    public void handleBlockEntityTagQuery(final ServerboundBlockEntityTagQuery rb) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rb, this, this.player.getLevel());
         if (!this.player.hasPermissions(2)) {
             return;
         }
-        final BlockEntity bwl3 = this.player.getLevel().getBlockEntity(pn.getPos());
-        final CompoundTag jt4 = (bwl3 != null) ? bwl3.save(new CompoundTag()) : null;
-        this.player.connection.send(new ClientboundTagQueryPacket(pn.getTransactionId(), jt4));
+        final BlockEntity cdl3 = this.player.getLevel().getBlockEntity(rb.getPos());
+        final CompoundTag le4 = (cdl3 != null) ? cdl3.save(new CompoundTag()) : null;
+        this.player.connection.send(new ClientboundTagQueryPacket(rb.getTransactionId(), le4));
     }
     
     @Override
-    public void handleMovePlayer(final ServerboundMovePlayerPacket qd) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qd, this, this.player.getLevel());
-        if (containsInvalidValues(qd)) {
-            this.disconnect(new TranslatableComponent("multiplayer.disconnect.invalid_player_movement", new Object[0]));
+    public void handleMovePlayer(final ServerboundMovePlayerPacket rs) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rs, this, this.player.getLevel());
+        if (containsInvalidValues(rs)) {
+            this.disconnect(new TranslatableComponent("multiplayer.disconnect.invalid_player_movement"));
             return;
         }
-        final ServerLevel xd3 = this.server.getLevel(this.player.dimension);
+        final ServerLevel zd3 = this.player.getLevel();
         if (this.player.wonGame) {
             return;
         }
@@ -701,7 +731,7 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
         }
         this.awaitingTeleportTime = this.tickCount;
         if (this.player.isPassenger()) {
-            this.player.absMoveTo(this.player.getX(), this.player.getY(), this.player.getZ(), qd.getYRot(this.player.yRot), qd.getXRot(this.player.xRot));
+            this.player.absMoveTo(this.player.getX(), this.player.getY(), this.player.getZ(), rs.getYRot(this.player.yRot), rs.getXRot(this.player.xRot));
             this.player.getLevel().getChunkSource().move(this.player);
             return;
         }
@@ -709,11 +739,11 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
         final double double5 = this.player.getY();
         final double double6 = this.player.getZ();
         final double double7 = this.player.getY();
-        final double double8 = qd.getX(this.player.getX());
-        final double double9 = qd.getY(this.player.getY());
-        final double double10 = qd.getZ(this.player.getZ());
-        final float float18 = qd.getYRot(this.player.yRot);
-        final float float19 = qd.getXRot(this.player.xRot);
+        final double double8 = rs.getX(this.player.getX());
+        final double double9 = rs.getY(this.player.getY());
+        final double double10 = rs.getZ(this.player.getZ());
+        final float float18 = rs.getYRot(this.player.yRot);
+        final float float19 = rs.getXRot(this.player.xRot);
         double double11 = double8 - this.firstGoodX;
         double double12 = double9 - this.firstGoodY;
         double double13 = double10 - this.firstGoodZ;
@@ -721,7 +751,7 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
         double double15 = double11 * double11 + double12 * double12 + double13 * double13;
         if (this.player.isSleeping()) {
             if (double15 > 1.0) {
-                this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), qd.getYRot(this.player.yRot), qd.getXRot(this.player.xRot));
+                this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), rs.getYRot(this.player.yRot), rs.getXRot(this.player.xRot));
             }
             return;
         }
@@ -741,18 +771,15 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
                 }
             }
         }
-        final boolean boolean31 = this.isPlayerCollidingWithAnything(xd3);
+        final AABB deg31 = this.player.getBoundingBox();
         double11 = double8 - this.lastGoodX;
         double12 = double9 - this.lastGoodY;
         double13 = double10 - this.lastGoodZ;
-        if (double12 > 0.0) {
-            this.player.fallDistance = 0.0f;
-        }
-        if (this.player.onGround && !qd.isOnGround() && double12 > 0.0) {
+        final boolean boolean32 = double12 > 0.0;
+        if (this.player.isOnGround() && !rs.isOnGround() && boolean32) {
             this.player.jumpFromGround();
         }
         this.player.move(MoverType.PLAYER, new Vec3(double11, double12, double13));
-        this.player.onGround = qd.isOnGround();
         final double double16 = double12;
         double11 = double8 - this.player.getX();
         double12 = double9 - this.player.getY();
@@ -761,31 +788,33 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
         }
         double13 = double10 - this.player.getZ();
         double15 = double11 * double11 + double12 * double12 + double13 * double13;
-        boolean boolean32 = false;
+        boolean boolean33 = false;
         if (!this.player.isChangingDimension() && double15 > 0.0625 && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) {
-            boolean32 = true;
+            boolean33 = true;
             ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!", this.player.getName().getString());
         }
         this.player.absMoveTo(double8, double9, double10, float18, float19);
-        this.player.checkMovementStatistics(this.player.getX() - double4, this.player.getY() - double5, this.player.getZ() - double6);
-        if (!this.player.noPhysics && !this.player.isSleeping()) {
-            final boolean boolean33 = this.isPlayerCollidingWithAnything(xd3);
-            if (boolean31 && (boolean32 || !boolean33)) {
-                this.teleport(double4, double5, double6, float18, float19);
-                return;
-            }
+        if (!this.player.noPhysics && !this.player.isSleeping() && ((boolean33 && zd3.noCollision(this.player, deg31)) || this.isPlayerCollidingWithAnythingNew(zd3, deg31))) {
+            this.teleport(double4, double5, double6, float18, float19);
+            return;
         }
-        this.clientIsFloating = (double16 >= -0.03125 && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR && !this.server.isFlightAllowed() && !this.player.abilities.mayfly && !this.player.hasEffect(MobEffects.LEVITATION) && !this.player.isFallFlying() && !xd3.containsAnyBlocks(this.player.getBoundingBox().inflate(0.0625).expandTowards(0.0, -0.55, 0.0)));
-        this.player.onGround = qd.isOnGround();
+        this.clientIsFloating = (double16 >= -0.03125 && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR && !this.server.isFlightAllowed() && !this.player.abilities.mayfly && !this.player.hasEffect(MobEffects.LEVITATION) && !this.player.isFallFlying() && this.noBlocksAround(this.player));
         this.player.getLevel().getChunkSource().move(this.player);
-        this.player.doCheckFallDamage(this.player.getY() - double7, qd.isOnGround());
+        this.player.doCheckFallDamage(this.player.getY() - double7, rs.isOnGround());
+        this.player.setOnGround(rs.isOnGround());
+        if (boolean32) {
+            this.player.fallDistance = 0.0f;
+        }
+        this.player.checkMovementStatistics(this.player.getX() - double4, this.player.getY() - double5, this.player.getZ() - double6);
         this.lastGoodX = this.player.getX();
         this.lastGoodY = this.player.getY();
         this.lastGoodZ = this.player.getZ();
     }
     
-    private boolean isPlayerCollidingWithAnything(final LevelReader bjz) {
-        return bjz.noCollision(this.player, this.player.getBoundingBox().deflate(9.999999747378752E-6));
+    private boolean isPlayerCollidingWithAnythingNew(final LevelReader bqd, final AABB deg) {
+        final Stream<VoxelShape> stream4 = bqd.getCollisions(this.player, this.player.getBoundingBox().deflate(9.999999747378752E-6), aom -> true);
+        final VoxelShape dfg3 = Shapes.create(deg.deflate(9.999999747378752E-6));
+        return stream4.anyMatch(dfg2 -> !Shapes.joinIsNotEmpty(dfg2, dfg3, BooleanOp.AND));
     }
     
     public void teleport(final double double1, final double double2, final double double3, final float float4, final float float5) {
@@ -808,17 +837,18 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
     }
     
     @Override
-    public void handlePlayerAction(final ServerboundPlayerActionPacket qj) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qj, this, this.player.getLevel());
-        final BlockPos fk3 = qj.getPos();
+    public void handlePlayerAction(final ServerboundPlayerActionPacket ry) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)ry, this, this.player.getLevel());
+        final BlockPos fu3 = ry.getPos();
         this.player.resetLastActionTime();
-        final ServerboundPlayerActionPacket.Action a4 = qj.getAction();
+        final ServerboundPlayerActionPacket.Action a4 = ry.getAction();
         switch (a4) {
-            case SWAP_HELD_ITEMS: {
+            case SWAP_ITEM_WITH_OFFHAND: {
                 if (!this.player.isSpectator()) {
-                    final ItemStack ben5 = this.player.getItemInHand(InteractionHand.OFF_HAND);
+                    final ItemStack bki5 = this.player.getItemInHand(InteractionHand.OFF_HAND);
                     this.player.setItemInHand(InteractionHand.OFF_HAND, this.player.getItemInHand(InteractionHand.MAIN_HAND));
-                    this.player.setItemInHand(InteractionHand.MAIN_HAND, ben5);
+                    this.player.setItemInHand(InteractionHand.MAIN_HAND, bki5);
+                    this.player.stopUsingItem();
                 }
             }
             case DROP_ITEM: {
@@ -837,7 +867,7 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
             case START_DESTROY_BLOCK:
             case ABORT_DESTROY_BLOCK:
             case STOP_DESTROY_BLOCK: {
-                this.player.gameMode.handleBlockBreakAction(fk3, a4, qj.getDirection(), this.server.getMaxBuildHeight());
+                this.player.gameMode.handleBlockBreakAction(fu3, a4, ry.getDirection(), this.server.getMaxBuildHeight());
             }
             default: {
                 throw new IllegalArgumentException("Invalid player action");
@@ -845,76 +875,91 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
         }
     }
     
+    private static boolean wasBlockPlacementAttempt(final ServerPlayer ze, final ItemStack bki) {
+        if (bki.isEmpty()) {
+            return false;
+        }
+        final Item bke3 = bki.getItem();
+        return (bke3 instanceof BlockItem || bke3 instanceof BucketItem) && !ze.getCooldowns().isOnCooldown(bke3);
+    }
+    
     @Override
-    public void handleUseItemOn(final ServerboundUseItemOnPacket rb) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rb, this, this.player.getLevel());
-        final ServerLevel xd3 = this.server.getLevel(this.player.dimension);
-        final InteractionHand ajk4 = rb.getHand();
-        final ItemStack ben5 = this.player.getItemInHand(ajk4);
-        final BlockHitResult cvg6 = rb.getHitResult();
-        final BlockPos fk7 = cvg6.getBlockPos();
-        final Direction fp8 = cvg6.getDirection();
+    public void handleUseItemOn(final ServerboundUseItemOnPacket sq) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sq, this, this.player.getLevel());
+        final ServerLevel zd3 = this.player.getLevel();
+        final InteractionHand anf4 = sq.getHand();
+        final ItemStack bki5 = this.player.getItemInHand(anf4);
+        final BlockHitResult deh6 = sq.getHitResult();
+        final BlockPos fu7 = deh6.getBlockPos();
+        final Direction fz8 = deh6.getDirection();
         this.player.resetLastActionTime();
-        if (fk7.getY() < this.server.getMaxBuildHeight() - 1 || (fp8 != Direction.UP && fk7.getY() < this.server.getMaxBuildHeight())) {
-            if (this.awaitingPositionFromClient == null && this.player.distanceToSqr(fk7.getX() + 0.5, fk7.getY() + 0.5, fk7.getZ() + 0.5) < 64.0 && xd3.mayInteract(this.player, fk7)) {
-                final InteractionResult ajl9 = this.player.gameMode.useItemOn(this.player, xd3, ben5, ajk4, cvg6);
-                if (ajl9.shouldSwing()) {
-                    this.player.swing(ajk4, true);
+        if (fu7.getY() < this.server.getMaxBuildHeight()) {
+            if (this.awaitingPositionFromClient == null && this.player.distanceToSqr(fu7.getX() + 0.5, fu7.getY() + 0.5, fu7.getZ() + 0.5) < 64.0 && zd3.mayInteract(this.player, fu7)) {
+                final InteractionResult ang9 = this.player.gameMode.useItemOn(this.player, zd3, bki5, anf4, deh6);
+                if (fz8 == Direction.UP && !ang9.consumesAction() && fu7.getY() >= this.server.getMaxBuildHeight() - 1 && wasBlockPlacementAttempt(this.player, bki5)) {
+                    final Component mr10 = new TranslatableComponent("build.tooHigh", new Object[] { this.server.getMaxBuildHeight() }).withStyle(ChatFormatting.RED);
+                    this.player.connection.send(new ClientboundChatPacket(mr10, ChatType.GAME_INFO, Util.NIL_UUID));
+                }
+                else if (ang9.shouldSwing()) {
+                    this.player.swing(anf4, true);
                 }
             }
         }
         else {
-            final Component lf9 = new TranslatableComponent("build.tooHigh", new Object[] { this.server.getMaxBuildHeight() }).withStyle(ChatFormatting.RED);
-            this.player.connection.send(new ClientboundChatPacket(lf9, ChatType.GAME_INFO));
+            final Component mr11 = new TranslatableComponent("build.tooHigh", new Object[] { this.server.getMaxBuildHeight() }).withStyle(ChatFormatting.RED);
+            this.player.connection.send(new ClientboundChatPacket(mr11, ChatType.GAME_INFO, Util.NIL_UUID));
         }
-        this.player.connection.send(new ClientboundBlockUpdatePacket(xd3, fk7));
-        this.player.connection.send(new ClientboundBlockUpdatePacket(xd3, fk7.relative(fp8)));
+        this.player.connection.send(new ClientboundBlockUpdatePacket(zd3, fu7));
+        this.player.connection.send(new ClientboundBlockUpdatePacket(zd3, fu7.relative(fz8)));
     }
     
     @Override
-    public void handleUseItem(final ServerboundUseItemPacket rc) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rc, this, this.player.getLevel());
-        final ServerLevel xd3 = this.server.getLevel(this.player.dimension);
-        final InteractionHand ajk4 = rc.getHand();
-        final ItemStack ben5 = this.player.getItemInHand(ajk4);
+    public void handleUseItem(final ServerboundUseItemPacket sr) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sr, this, this.player.getLevel());
+        final ServerLevel zd3 = this.player.getLevel();
+        final InteractionHand anf4 = sr.getHand();
+        final ItemStack bki5 = this.player.getItemInHand(anf4);
         this.player.resetLastActionTime();
-        if (ben5.isEmpty()) {
+        if (bki5.isEmpty()) {
             return;
         }
-        this.player.gameMode.useItem(this.player, xd3, ben5, ajk4);
+        final InteractionResult ang6 = this.player.gameMode.useItem(this.player, zd3, bki5, anf4);
+        if (ang6.shouldSwing()) {
+            this.player.swing(anf4, true);
+        }
     }
     
     @Override
-    public void handleTeleportToEntityPacket(final ServerboundTeleportToEntityPacket ra) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)ra, this, this.player.getLevel());
+    public void handleTeleportToEntityPacket(final ServerboundTeleportToEntityPacket sp) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sp, this, this.player.getLevel());
         if (this.player.isSpectator()) {
-            for (final ServerLevel xd4 : this.server.getAllLevels()) {
-                final Entity akq5 = ra.getEntity(xd4);
-                if (akq5 != null) {
-                    this.player.teleportTo(xd4, akq5.getX(), akq5.getY(), akq5.getZ(), akq5.yRot, akq5.xRot);
+            for (final ServerLevel zd4 : this.server.getAllLevels()) {
+                final Entity aom5 = sp.getEntity(zd4);
+                if (aom5 != null) {
+                    this.player.teleportTo(zd4, aom5.getX(), aom5.getY(), aom5.getZ(), aom5.yRot, aom5.xRot);
                 }
             }
         }
     }
     
     @Override
-    public void handleResourcePackResponse(final ServerboundResourcePackPacket qo) {
+    public void handleResourcePackResponse(final ServerboundResourcePackPacket sd) {
     }
     
     @Override
-    public void handlePaddleBoat(final ServerboundPaddleBoatPacket qf) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qf, this, this.player.getLevel());
-        final Entity akq3 = this.player.getVehicle();
-        if (akq3 instanceof Boat) {
-            ((Boat)akq3).setPaddleState(qf.getLeft(), qf.getRight());
+    public void handlePaddleBoat(final ServerboundPaddleBoatPacket ru) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)ru, this, this.player.getLevel());
+        final Entity aom3 = this.player.getVehicle();
+        if (aom3 instanceof Boat) {
+            ((Boat)aom3).setPaddleState(ru.getLeft(), ru.getRight());
         }
     }
     
     @Override
-    public void onDisconnect(final Component lf) {
-        ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), lf.getString());
+    public void onDisconnect(final Component mr) {
+        ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), mr.getString());
         this.server.invalidateStatus();
-        this.server.getPlayerList().broadcastMessage(new TranslatableComponent("multiplayer.player.left", new Object[] { this.player.getDisplayName() }).withStyle(ChatFormatting.YELLOW));
+        this.server.getPlayerList().broadcastMessage(new TranslatableComponent("multiplayer.player.left", new Object[] { this.player.getDisplayName() }).withStyle(ChatFormatting.YELLOW), ChatType.SYSTEM, Util.NIL_UUID);
         this.player.disconnect();
         this.server.getPlayerList().remove(this.player);
         if (this.isSingleplayerOwner()) {
@@ -923,56 +968,58 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
         }
     }
     
-    public void send(final Packet<?> lt) {
-        this.send(lt, null);
+    public void send(final Packet<?> ni) {
+        this.send(ni, null);
     }
     
-    public void send(final Packet<?> lt, @Nullable final GenericFutureListener<? extends Future<? super Void>> genericFutureListener) {
-        if (lt instanceof ClientboundChatPacket) {
-            final ClientboundChatPacket mm4 = (ClientboundChatPacket)lt;
-            final ChatVisiblity ayh5 = this.player.getChatVisibility();
-            if (ayh5 == ChatVisiblity.HIDDEN && mm4.getType() != ChatType.GAME_INFO) {
+    public void send(final Packet<?> ni, @Nullable final GenericFutureListener<? extends Future<? super Void>> genericFutureListener) {
+        if (ni instanceof ClientboundChatPacket) {
+            final ClientboundChatPacket oa4 = (ClientboundChatPacket)ni;
+            final ChatVisiblity bea5 = this.player.getChatVisibility();
+            if (bea5 == ChatVisiblity.HIDDEN && oa4.getType() != ChatType.GAME_INFO) {
                 return;
             }
-            if (ayh5 == ChatVisiblity.SYSTEM && !mm4.isSystem()) {
+            if (bea5 == ChatVisiblity.SYSTEM && !oa4.isSystem()) {
                 return;
             }
         }
         try {
-            this.connection.send(lt, genericFutureListener);
+            this.connection.send(ni, genericFutureListener);
         }
         catch (Throwable throwable4) {
-            final CrashReport h5 = CrashReport.forThrowable(throwable4, "Sending packet");
-            final CrashReportCategory i6 = h5.addCategory("Packet being sent");
-            i6.setDetail("Packet class", () -> lt.getClass().getCanonicalName());
-            throw new ReportedException(h5);
+            final CrashReport j5 = CrashReport.forThrowable(throwable4, "Sending packet");
+            final CrashReportCategory k6 = j5.addCategory("Packet being sent");
+            k6.setDetail("Packet class", () -> ni.getClass().getCanonicalName());
+            throw new ReportedException(j5);
         }
     }
     
     @Override
-    public void handleSetCarriedItem(final ServerboundSetCarriedItemPacket qs) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qs, this, this.player.getLevel());
-        if (qs.getSlot() < 0 || qs.getSlot() >= Inventory.getSelectionSize()) {
+    public void handleSetCarriedItem(final ServerboundSetCarriedItemPacket sh) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sh, this, this.player.getLevel());
+        if (sh.getSlot() < 0 || sh.getSlot() >= Inventory.getSelectionSize()) {
             ServerGamePacketListenerImpl.LOGGER.warn("{} tried to set an invalid carried item", this.player.getName().getString());
             return;
         }
-        this.player.inventory.selected = qs.getSlot();
+        if (this.player.inventory.selected != sh.getSlot() && this.player.getUsedItemHand() == InteractionHand.MAIN_HAND) {
+            this.player.stopUsingItem();
+        }
+        this.player.inventory.selected = sh.getSlot();
         this.player.resetLastActionTime();
     }
     
     @Override
-    public void handleChat(final ServerboundChatPacket pp) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)pp, this, this.player.getLevel());
+    public void handleChat(final ServerboundChatPacket rd) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rd, this, this.player.getLevel());
         if (this.player.getChatVisibility() == ChatVisiblity.HIDDEN) {
-            this.send(new ClientboundChatPacket(new TranslatableComponent("chat.cannotSend", new Object[0]).withStyle(ChatFormatting.RED)));
+            this.send(new ClientboundChatPacket(new TranslatableComponent("chat.cannotSend").withStyle(ChatFormatting.RED), ChatType.SYSTEM, Util.NIL_UUID));
             return;
         }
         this.player.resetLastActionTime();
-        String string3 = pp.getMessage();
-        string3 = StringUtils.normalizeSpace(string3);
+        final String string3 = StringUtils.normalizeSpace(rd.getMessage());
         for (int integer4 = 0; integer4 < string3.length(); ++integer4) {
             if (!SharedConstants.isAllowedChatCharacter(string3.charAt(integer4))) {
-                this.disconnect(new TranslatableComponent("multiplayer.disconnect.illegal_characters", new Object[0]));
+                this.disconnect(new TranslatableComponent("multiplayer.disconnect.illegal_characters"));
                 return;
             }
         }
@@ -980,12 +1027,12 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
             this.handleCommand(string3);
         }
         else {
-            final Component lf4 = new TranslatableComponent("chat.type.text", new Object[] { this.player.getDisplayName(), string3 });
-            this.server.getPlayerList().broadcastMessage(lf4, false);
+            final Component mr4 = new TranslatableComponent("chat.type.text", new Object[] { this.player.getDisplayName(), string3 });
+            this.server.getPlayerList().broadcastMessage(mr4, ChatType.CHAT, this.player.getUUID());
         }
         this.chatSpamTickCount += 20;
         if (this.chatSpamTickCount > 200 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) {
-            this.disconnect(new TranslatableComponent("disconnect.spam", new Object[0]));
+            this.disconnect(new TranslatableComponent("disconnect.spam"));
         }
     }
     
@@ -994,17 +1041,17 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
     }
     
     @Override
-    public void handleAnimate(final ServerboundSwingPacket qz) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qz, this, this.player.getLevel());
+    public void handleAnimate(final ServerboundSwingPacket so) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)so, this, this.player.getLevel());
         this.player.resetLastActionTime();
-        this.player.swing(qz.getHand());
+        this.player.swing(so.getHand());
     }
     
     @Override
-    public void handlePlayerCommand(final ServerboundPlayerCommandPacket qk) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qk, this, this.player.getLevel());
+    public void handlePlayerCommand(final ServerboundPlayerCommandPacket rz) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rz, this, this.player.getLevel());
         this.player.resetLastActionTime();
-        switch (qk.getAction()) {
+        switch (rz.getAction()) {
             case PRESS_SHIFT_KEY: {
                 this.player.setShiftKeyDown(true);
                 break;
@@ -1031,10 +1078,10 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
             }
             case START_RIDING_JUMP: {
                 if (this.player.getVehicle() instanceof PlayerRideableJumping) {
-                    final PlayerRideableJumping ali3 = (PlayerRideableJumping)this.player.getVehicle();
-                    final int integer4 = qk.getData();
-                    if (ali3.canJump() && integer4 > 0) {
-                        ali3.handleStartJump(integer4);
+                    final PlayerRideableJumping api3 = (PlayerRideableJumping)this.player.getVehicle();
+                    final int integer4 = rz.getData();
+                    if (api3.canJump() && integer4 > 0) {
+                        api3.handleStartJump(integer4);
                     }
                     break;
                 }
@@ -1042,8 +1089,8 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
             }
             case STOP_RIDING_JUMP: {
                 if (this.player.getVehicle() instanceof PlayerRideableJumping) {
-                    final PlayerRideableJumping ali3 = (PlayerRideableJumping)this.player.getVehicle();
-                    ali3.handleStopJump();
+                    final PlayerRideableJumping api3 = (PlayerRideableJumping)this.player.getVehicle();
+                    api3.handleStopJump();
                     break;
                 }
                 break;
@@ -1069,58 +1116,58 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
     }
     
     @Override
-    public void handleInteract(final ServerboundInteractPacket qa) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qa, this, this.player.getLevel());
-        final ServerLevel xd3 = this.server.getLevel(this.player.dimension);
-        final Entity akq4 = qa.getTarget(xd3);
+    public void handleInteract(final ServerboundInteractPacket ro) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)ro, this, this.player.getLevel());
+        final ServerLevel zd3 = this.player.getLevel();
+        final Entity aom4 = ro.getTarget(zd3);
         this.player.resetLastActionTime();
-        if (akq4 != null) {
-            final boolean boolean5 = this.player.canSee(akq4);
-            double double6 = 36.0;
-            if (!boolean5) {
-                double6 = 9.0;
-            }
-            if (this.player.distanceToSqr(akq4) < double6) {
-                if (qa.getAction() == ServerboundInteractPacket.Action.INTERACT) {
-                    final InteractionHand ajk8 = qa.getHand();
-                    this.player.interactOn(akq4, ajk8);
+        this.player.setShiftKeyDown(ro.isUsingSecondaryAction());
+        if (aom4 != null) {
+            final double double5 = 36.0;
+            if (this.player.distanceToSqr(aom4) < 36.0) {
+                final InteractionHand anf7 = ro.getHand();
+                Optional<InteractionResult> optional8 = Optional.<InteractionResult>empty();
+                if (ro.getAction() == ServerboundInteractPacket.Action.INTERACT) {
+                    optional8 = Optional.<InteractionResult>of(this.player.interactOn(aom4, anf7));
                 }
-                else if (qa.getAction() == ServerboundInteractPacket.Action.INTERACT_AT) {
-                    final InteractionHand ajk8 = qa.getHand();
-                    final InteractionResult ajl9 = akq4.interactAt(this.player, qa.getLocation(), ajk8);
-                    if (ajl9.shouldSwing()) {
-                        this.player.swing(ajk8, true);
-                    }
+                else if (ro.getAction() == ServerboundInteractPacket.Action.INTERACT_AT) {
+                    optional8 = Optional.<InteractionResult>of(aom4.interactAt(this.player, ro.getLocation(), anf7));
                 }
-                else if (qa.getAction() == ServerboundInteractPacket.Action.ATTACK) {
-                    if (akq4 instanceof ItemEntity || akq4 instanceof ExperienceOrb || akq4 instanceof AbstractArrow || akq4 == this.player) {
-                        this.disconnect(new TranslatableComponent("multiplayer.disconnect.invalid_entity_attacked", new Object[0]));
-                        this.server.warn("Player " + this.player.getName().getString() + " tried to attack an invalid entity");
+                else if (ro.getAction() == ServerboundInteractPacket.Action.ATTACK) {
+                    if (aom4 instanceof ItemEntity || aom4 instanceof ExperienceOrb || aom4 instanceof AbstractArrow || aom4 == this.player) {
+                        this.disconnect(new TranslatableComponent("multiplayer.disconnect.invalid_entity_attacked"));
+                        ServerGamePacketListenerImpl.LOGGER.warn("Player {} tried to attack an invalid entity", this.player.getName().getString());
                         return;
                     }
-                    this.player.attack(akq4);
+                    this.player.attack(aom4);
+                }
+                if (optional8.isPresent() && optional8.get().consumesAction()) {
+                    CriteriaTriggers.PLAYER_INTERACTED_WITH_ENTITY.trigger(this.player, this.player.getItemInHand(anf7), aom4);
+                    if (optional8.get().shouldSwing()) {
+                        this.player.swing(anf7, true);
+                    }
                 }
             }
         }
     }
     
     @Override
-    public void handleClientCommand(final ServerboundClientCommandPacket pq) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)pq, this, this.player.getLevel());
+    public void handleClientCommand(final ServerboundClientCommandPacket re) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)re, this, this.player.getLevel());
         this.player.resetLastActionTime();
-        final ServerboundClientCommandPacket.Action a3 = pq.getAction();
+        final ServerboundClientCommandPacket.Action a3 = re.getAction();
         switch (a3) {
             case PERFORM_RESPAWN: {
                 if (this.player.wonGame) {
                     this.player.wonGame = false;
-                    this.player = this.server.getPlayerList().respawn(this.player, DimensionType.OVERWORLD, true);
-                    CriteriaTriggers.CHANGED_DIMENSION.trigger(this.player, DimensionType.THE_END, DimensionType.OVERWORLD);
+                    this.player = this.server.getPlayerList().respawn(this.player, true);
+                    CriteriaTriggers.CHANGED_DIMENSION.trigger(this.player, Level.END, Level.OVERWORLD);
                     break;
                 }
                 if (this.player.getHealth() > 0.0f) {
                     return;
                 }
-                this.player = this.server.getPlayerList().respawn(this.player, DimensionType.OVERWORLD, false);
+                this.player = this.server.getPlayerList().respawn(this.player, false);
                 if (this.server.isHardcore()) {
                     this.player.setGameMode(GameType.SPECTATOR);
                     this.player.getLevel().getGameRules().<GameRules.BooleanValue>getRule(GameRules.RULE_SPECTATORSGENERATECHUNKS).set(false, this.server);
@@ -1136,183 +1183,183 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
     }
     
     @Override
-    public void handleContainerClose(final ServerboundContainerClosePacket pw) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)pw, this, this.player.getLevel());
+    public void handleContainerClose(final ServerboundContainerClosePacket rk) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rk, this, this.player.getLevel());
         this.player.doCloseContainer();
     }
     
     @Override
-    public void handleContainerClick(final ServerboundContainerClickPacket pv) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)pv, this, this.player.getLevel());
+    public void handleContainerClick(final ServerboundContainerClickPacket rj) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rj, this, this.player.getLevel());
         this.player.resetLastActionTime();
-        if (this.player.containerMenu.containerId == pv.getContainerId() && this.player.containerMenu.isSynched(this.player)) {
+        if (this.player.containerMenu.containerId == rj.getContainerId() && this.player.containerMenu.isSynched(this.player)) {
             if (this.player.isSpectator()) {
-                final NonNullList<ItemStack> fy3 = NonNullList.<ItemStack>create();
+                final NonNullList<ItemStack> gi3 = NonNullList.<ItemStack>create();
                 for (int integer4 = 0; integer4 < this.player.containerMenu.slots.size(); ++integer4) {
-                    fy3.add(this.player.containerMenu.slots.get(integer4).getItem());
+                    gi3.add(this.player.containerMenu.slots.get(integer4).getItem());
                 }
-                this.player.refreshContainer(this.player.containerMenu, fy3);
+                this.player.refreshContainer(this.player.containerMenu, gi3);
             }
             else {
-                final ItemStack ben3 = this.player.containerMenu.clicked(pv.getSlotNum(), pv.getButtonNum(), pv.getClickType(), this.player);
-                if (ItemStack.matches(pv.getItem(), ben3)) {
-                    this.player.connection.send(new ClientboundContainerAckPacket(pv.getContainerId(), pv.getUid(), true));
+                final ItemStack bki3 = this.player.containerMenu.clicked(rj.getSlotNum(), rj.getButtonNum(), rj.getClickType(), this.player);
+                if (ItemStack.matches(rj.getItem(), bki3)) {
+                    this.player.connection.send(new ClientboundContainerAckPacket(rj.getContainerId(), rj.getUid(), true));
                     this.player.ignoreSlotUpdateHack = true;
                     this.player.containerMenu.broadcastChanges();
                     this.player.broadcastCarriedItem();
                     this.player.ignoreSlotUpdateHack = false;
                 }
                 else {
-                    this.expectedAcks.put(this.player.containerMenu.containerId, pv.getUid());
-                    this.player.connection.send(new ClientboundContainerAckPacket(pv.getContainerId(), pv.getUid(), false));
+                    this.expectedAcks.put(this.player.containerMenu.containerId, rj.getUid());
+                    this.player.connection.send(new ClientboundContainerAckPacket(rj.getContainerId(), rj.getUid(), false));
                     this.player.containerMenu.setSynched(this.player, false);
-                    final NonNullList<ItemStack> fy4 = NonNullList.<ItemStack>create();
+                    final NonNullList<ItemStack> gi4 = NonNullList.<ItemStack>create();
                     for (int integer5 = 0; integer5 < this.player.containerMenu.slots.size(); ++integer5) {
-                        final ItemStack ben4 = this.player.containerMenu.slots.get(integer5).getItem();
-                        fy4.add(ben4.isEmpty() ? ItemStack.EMPTY : ben4);
+                        final ItemStack bki4 = this.player.containerMenu.slots.get(integer5).getItem();
+                        gi4.add(bki4.isEmpty() ? ItemStack.EMPTY : bki4);
                     }
-                    this.player.refreshContainer(this.player.containerMenu, fy4);
+                    this.player.refreshContainer(this.player.containerMenu, gi4);
                 }
             }
         }
     }
     
     @Override
-    public void handlePlaceRecipe(final ServerboundPlaceRecipePacket qh) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qh, this, this.player.getLevel());
+    public void handlePlaceRecipe(final ServerboundPlaceRecipePacket rw) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rw, this, this.player.getLevel());
         this.player.resetLastActionTime();
-        if (this.player.isSpectator() || this.player.containerMenu.containerId != qh.getContainerId() || !this.player.containerMenu.isSynched(this.player) || !(this.player.containerMenu instanceof RecipeBookMenu)) {
+        if (this.player.isSpectator() || this.player.containerMenu.containerId != rw.getContainerId() || !this.player.containerMenu.isSynched(this.player) || !(this.player.containerMenu instanceof RecipeBookMenu)) {
             return;
         }
-        this.server.getRecipeManager().byKey(qh.getRecipe()).ifPresent(bgw -> ((RecipeBookMenu)this.player.containerMenu).handlePlacement(qh.isShiftDown(), bgw, this.player));
+        this.server.getRecipeManager().byKey(rw.getRecipe()).ifPresent(bmu -> ((RecipeBookMenu)this.player.containerMenu).handlePlacement(rw.isShiftDown(), bmu, this.player));
     }
     
     @Override
-    public void handleContainerButtonClick(final ServerboundContainerButtonClickPacket pu) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)pu, this, this.player.getLevel());
+    public void handleContainerButtonClick(final ServerboundContainerButtonClickPacket ri) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)ri, this, this.player.getLevel());
         this.player.resetLastActionTime();
-        if (this.player.containerMenu.containerId == pu.getContainerId() && this.player.containerMenu.isSynched(this.player) && !this.player.isSpectator()) {
-            this.player.containerMenu.clickMenuButton(this.player, pu.getButtonId());
+        if (this.player.containerMenu.containerId == ri.getContainerId() && this.player.containerMenu.isSynched(this.player) && !this.player.isSpectator()) {
+            this.player.containerMenu.clickMenuButton(this.player, ri.getButtonId());
             this.player.containerMenu.broadcastChanges();
         }
     }
     
     @Override
-    public void handleSetCreativeModeSlot(final ServerboundSetCreativeModeSlotPacket qv) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qv, this, this.player.getLevel());
+    public void handleSetCreativeModeSlot(final ServerboundSetCreativeModeSlotPacket sk) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sk, this, this.player.getLevel());
         if (this.player.gameMode.isCreative()) {
-            final boolean boolean3 = qv.getSlotNum() < 0;
-            final ItemStack ben4 = qv.getItem();
-            final CompoundTag jt5 = ben4.getTagElement("BlockEntityTag");
-            if (!ben4.isEmpty() && jt5 != null && jt5.contains("x") && jt5.contains("y") && jt5.contains("z")) {
-                final BlockPos fk6 = new BlockPos(jt5.getInt("x"), jt5.getInt("y"), jt5.getInt("z"));
-                final BlockEntity bwl7 = this.player.level.getBlockEntity(fk6);
-                if (bwl7 != null) {
-                    final CompoundTag jt6 = bwl7.save(new CompoundTag());
-                    jt6.remove("x");
-                    jt6.remove("y");
-                    jt6.remove("z");
-                    ben4.addTagElement("BlockEntityTag", jt6);
+            final boolean boolean3 = sk.getSlotNum() < 0;
+            final ItemStack bki4 = sk.getItem();
+            final CompoundTag le5 = bki4.getTagElement("BlockEntityTag");
+            if (!bki4.isEmpty() && le5 != null && le5.contains("x") && le5.contains("y") && le5.contains("z")) {
+                final BlockPos fu6 = new BlockPos(le5.getInt("x"), le5.getInt("y"), le5.getInt("z"));
+                final BlockEntity cdl7 = this.player.level.getBlockEntity(fu6);
+                if (cdl7 != null) {
+                    final CompoundTag le6 = cdl7.save(new CompoundTag());
+                    le6.remove("x");
+                    le6.remove("y");
+                    le6.remove("z");
+                    bki4.addTagElement("BlockEntityTag", le6);
                 }
             }
-            final boolean boolean4 = qv.getSlotNum() >= 1 && qv.getSlotNum() <= 45;
-            final boolean boolean5 = ben4.isEmpty() || (ben4.getDamageValue() >= 0 && ben4.getCount() <= 64 && !ben4.isEmpty());
+            final boolean boolean4 = sk.getSlotNum() >= 1 && sk.getSlotNum() <= 45;
+            final boolean boolean5 = bki4.isEmpty() || (bki4.getDamageValue() >= 0 && bki4.getCount() <= 64 && !bki4.isEmpty());
             if (boolean4 && boolean5) {
-                if (ben4.isEmpty()) {
-                    this.player.inventoryMenu.setItem(qv.getSlotNum(), ItemStack.EMPTY);
+                if (bki4.isEmpty()) {
+                    this.player.inventoryMenu.setItem(sk.getSlotNum(), ItemStack.EMPTY);
                 }
                 else {
-                    this.player.inventoryMenu.setItem(qv.getSlotNum(), ben4);
+                    this.player.inventoryMenu.setItem(sk.getSlotNum(), bki4);
                 }
                 this.player.inventoryMenu.setSynched(this.player, true);
                 this.player.inventoryMenu.broadcastChanges();
             }
             else if (boolean3 && boolean5 && this.dropSpamTickCount < 200) {
                 this.dropSpamTickCount += 20;
-                this.player.drop(ben4, true);
+                this.player.drop(bki4, true);
             }
         }
     }
     
     @Override
-    public void handleContainerAck(final ServerboundContainerAckPacket pt) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)pt, this, this.player.getLevel());
+    public void handleContainerAck(final ServerboundContainerAckPacket rh) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rh, this, this.player.getLevel());
         final int integer3 = this.player.containerMenu.containerId;
-        if (integer3 == pt.getContainerId() && this.expectedAcks.getOrDefault(integer3, (short)(pt.getUid() + 1)) == pt.getUid() && !this.player.containerMenu.isSynched(this.player) && !this.player.isSpectator()) {
+        if (integer3 == rh.getContainerId() && this.expectedAcks.getOrDefault(integer3, (short)(rh.getUid() + 1)) == rh.getUid() && !this.player.containerMenu.isSynched(this.player) && !this.player.isSpectator()) {
             this.player.containerMenu.setSynched(this.player, true);
         }
     }
     
     @Override
-    public void handleSignUpdate(final ServerboundSignUpdatePacket qy) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qy, this, this.player.getLevel());
+    public void handleSignUpdate(final ServerboundSignUpdatePacket sn) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)sn, this, this.player.getLevel());
         this.player.resetLastActionTime();
-        final ServerLevel xd3 = this.server.getLevel(this.player.dimension);
-        final BlockPos fk4 = qy.getPos();
-        if (xd3.hasChunkAt(fk4)) {
-            final BlockState byj5 = xd3.getBlockState(fk4);
-            final BlockEntity bwl6 = xd3.getBlockEntity(fk4);
-            if (!(bwl6 instanceof SignBlockEntity)) {
+        final ServerLevel zd3 = this.player.getLevel();
+        final BlockPos fu4 = sn.getPos();
+        if (zd3.hasChunkAt(fu4)) {
+            final BlockState cfj5 = zd3.getBlockState(fu4);
+            final BlockEntity cdl6 = zd3.getBlockEntity(fu4);
+            if (!(cdl6 instanceof SignBlockEntity)) {
                 return;
             }
-            final SignBlockEntity bxh7 = (SignBlockEntity)bwl6;
-            if (!bxh7.isEditable() || bxh7.getPlayerWhoMayEdit() != this.player) {
-                this.server.warn("Player " + this.player.getName().getString() + " just tried to change non-editable sign");
+            final SignBlockEntity ceh7 = (SignBlockEntity)cdl6;
+            if (!ceh7.isEditable() || ceh7.getPlayerWhoMayEdit() != this.player) {
+                ServerGamePacketListenerImpl.LOGGER.warn("Player {} just tried to change non-editable sign", this.player.getName().getString());
                 return;
             }
-            final String[] arr8 = qy.getLines();
+            final String[] arr8 = sn.getLines();
             for (int integer9 = 0; integer9 < arr8.length; ++integer9) {
-                bxh7.setMessage(integer9, new TextComponent(ChatFormatting.stripFormatting(arr8[integer9])));
+                ceh7.setMessage(integer9, new TextComponent(ChatFormatting.stripFormatting(arr8[integer9])));
             }
-            bxh7.setChanged();
-            xd3.sendBlockUpdated(fk4, byj5, byj5, 3);
+            ceh7.setChanged();
+            zd3.sendBlockUpdated(fu4, cfj5, cfj5, 3);
         }
     }
     
     @Override
-    public void handleKeepAlive(final ServerboundKeepAlivePacket qb) {
-        if (this.keepAlivePending && qb.getId() == this.keepAliveChallenge) {
+    public void handleKeepAlive(final ServerboundKeepAlivePacket rq) {
+        if (this.keepAlivePending && rq.getId() == this.keepAliveChallenge) {
             final int integer3 = (int)(Util.getMillis() - this.keepAliveTime);
             this.player.latency = (this.player.latency * 3 + integer3) / 4;
             this.keepAlivePending = false;
         }
         else if (!this.isSingleplayerOwner()) {
-            this.disconnect(new TranslatableComponent("disconnect.timeout", new Object[0]));
+            this.disconnect(new TranslatableComponent("disconnect.timeout"));
         }
     }
     
     @Override
-    public void handlePlayerAbilities(final ServerboundPlayerAbilitiesPacket qi) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qi, this, this.player.getLevel());
-        this.player.abilities.flying = (qi.isFlying() && this.player.abilities.mayfly);
+    public void handlePlayerAbilities(final ServerboundPlayerAbilitiesPacket rx) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rx, this, this.player.getLevel());
+        this.player.abilities.flying = (rx.isFlying() && this.player.abilities.mayfly);
     }
     
     @Override
-    public void handleClientInformation(final ServerboundClientInformationPacket pr) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)pr, this, this.player.getLevel());
-        this.player.updateOptions(pr);
+    public void handleClientInformation(final ServerboundClientInformationPacket rf) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rf, this, this.player.getLevel());
+        this.player.updateOptions(rf);
     }
     
     @Override
-    public void handleCustomPayload(final ServerboundCustomPayloadPacket px) {
+    public void handleCustomPayload(final ServerboundCustomPayloadPacket rl) {
     }
     
     @Override
-    public void handleChangeDifficulty(final ServerboundChangeDifficultyPacket po) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)po, this, this.player.getLevel());
+    public void handleChangeDifficulty(final ServerboundChangeDifficultyPacket rc) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rc, this, this.player.getLevel());
         if (!this.player.hasPermissions(2) && !this.isSingleplayerOwner()) {
             return;
         }
-        this.server.setDifficulty(po.getDifficulty(), false);
+        this.server.setDifficulty(rc.getDifficulty(), false);
     }
     
     @Override
-    public void handleLockDifficulty(final ServerboundLockDifficultyPacket qc) {
-        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)qc, this, this.player.getLevel());
+    public void handleLockDifficulty(final ServerboundLockDifficultyPacket rr) {
+        PacketUtils.<ServerGamePacketListenerImpl>ensureRunningOnSameThread((Packet<ServerGamePacketListenerImpl>)rr, this, this.player.getLevel());
         if (!this.player.hasPermissions(2) && !this.isSingleplayerOwner()) {
             return;
         }
-        this.server.setDifficultyLocked(qc.isLocked());
+        this.server.setDifficultyLocked(rr.isLocked());
     }
     
     static {
diff --git a/src/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
index 2640199..7ecbebb 100644
--- a/src/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
+++ b/src/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
@@ -1,6 +1,6 @@
 package net.minecraft.server.network;
 
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.PacketListener;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.login.ClientboundLoginDisconnectPacket;
@@ -10,54 +10,64 @@ import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
 import net.minecraft.network.Connection;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.handshake.ServerHandshakePacketListener;
 
 public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketListener {
+    private static final Component IGNORE_STATUS_REASON;
     private final MinecraftServer server;
     private final Connection connection;
     
-    public ServerHandshakePacketListenerImpl(final MinecraftServer minecraftServer, final Connection kt) {
+    public ServerHandshakePacketListenerImpl(final MinecraftServer minecraftServer, final Connection me) {
         this.server = minecraftServer;
-        this.connection = kt;
+        this.connection = me;
     }
     
     @Override
-    public void handleIntention(final ClientIntentionPacket re) {
-        switch (re.getIntention()) {
+    public void handleIntention(final ClientIntentionPacket st) {
+        switch (st.getIntention()) {
             case LOGIN: {
                 this.connection.setProtocol(ConnectionProtocol.LOGIN);
-                if (re.getProtocolVersion() > SharedConstants.getCurrentVersion().getProtocolVersion()) {
-                    final Component lf3 = new TranslatableComponent("multiplayer.disconnect.outdated_server", new Object[] { SharedConstants.getCurrentVersion().getName() });
-                    this.connection.send(new ClientboundLoginDisconnectPacket(lf3));
-                    this.connection.disconnect(lf3);
+                if (st.getProtocolVersion() > SharedConstants.getCurrentVersion().getProtocolVersion()) {
+                    final Component mr3 = new TranslatableComponent("multiplayer.disconnect.outdated_server", new Object[] { SharedConstants.getCurrentVersion().getName() });
+                    this.connection.send(new ClientboundLoginDisconnectPacket(mr3));
+                    this.connection.disconnect(mr3);
                     break;
                 }
-                if (re.getProtocolVersion() < SharedConstants.getCurrentVersion().getProtocolVersion()) {
-                    final Component lf3 = new TranslatableComponent("multiplayer.disconnect.outdated_client", new Object[] { SharedConstants.getCurrentVersion().getName() });
-                    this.connection.send(new ClientboundLoginDisconnectPacket(lf3));
-                    this.connection.disconnect(lf3);
+                if (st.getProtocolVersion() < SharedConstants.getCurrentVersion().getProtocolVersion()) {
+                    final Component mr3 = new TranslatableComponent("multiplayer.disconnect.outdated_client", new Object[] { SharedConstants.getCurrentVersion().getName() });
+                    this.connection.send(new ClientboundLoginDisconnectPacket(mr3));
+                    this.connection.disconnect(mr3);
                     break;
                 }
                 this.connection.setListener(new ServerLoginPacketListenerImpl(this.server, this.connection));
                 break;
             }
             case STATUS: {
-                this.connection.setProtocol(ConnectionProtocol.STATUS);
-                this.connection.setListener(new ServerStatusPacketListenerImpl(this.server, this.connection));
+                if (this.server.repliesToStatus()) {
+                    this.connection.setProtocol(ConnectionProtocol.STATUS);
+                    this.connection.setListener(new ServerStatusPacketListenerImpl(this.server, this.connection));
+                    break;
+                }
+                this.connection.disconnect(ServerHandshakePacketListenerImpl.IGNORE_STATUS_REASON);
                 break;
             }
             default: {
-                throw new UnsupportedOperationException("Invalid intention " + re.getIntention());
+                throw new UnsupportedOperationException("Invalid intention " + st.getIntention());
             }
         }
     }
     
     @Override
-    public void onDisconnect(final Component lf) {
+    public void onDisconnect(final Component mr) {
     }
     
     @Override
     public Connection getConnection() {
         return this.connection;
     }
+    
+    static {
+        IGNORE_STATUS_REASON = new TextComponent("Ignoring status request");
+    }
 }
diff --git a/src/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index 5b69f05..b5ddd86 100644
--- a/src/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -51,11 +51,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
     private SecretKey secretKey;
     private ServerPlayer delayedAcceptPlayer;
     
-    public ServerLoginPacketListenerImpl(final MinecraftServer minecraftServer, final Connection kt) {
+    public ServerLoginPacketListenerImpl(final MinecraftServer minecraftServer, final Connection me) {
         this.nonce = new byte[4];
         this.state = State.HELLO;
         this.server = minecraftServer;
-        this.connection = kt;
+        this.connection = me;
         ServerLoginPacketListenerImpl.RANDOM.nextBytes(this.nonce);
     }
     
@@ -64,15 +64,15 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
             this.handleAcceptedLogin();
         }
         else if (this.state == State.DELAY_ACCEPT) {
-            final ServerPlayer xe2 = this.server.getPlayerList().getPlayer(this.gameProfile.getId());
-            if (xe2 == null) {
+            final ServerPlayer ze2 = this.server.getPlayerList().getPlayer(this.gameProfile.getId());
+            if (ze2 == null) {
                 this.state = State.READY_TO_ACCEPT;
                 this.server.getPlayerList().placeNewPlayer(this.connection, this.delayedAcceptPlayer);
                 this.delayedAcceptPlayer = null;
             }
         }
         if (this.tick++ == 600) {
-            this.disconnect(new TranslatableComponent("multiplayer.disconnect.slow_login", new Object[0]));
+            this.disconnect(new TranslatableComponent("multiplayer.disconnect.slow_login"));
         }
     }
     
@@ -81,11 +81,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
         return this.connection;
     }
     
-    public void disconnect(final Component lf) {
+    public void disconnect(final Component mr) {
         try {
-            ServerLoginPacketListenerImpl.LOGGER.info("Disconnecting {}: {}", this.getUserName(), lf.getString());
-            this.connection.send(new ClientboundLoginDisconnectPacket(lf));
-            this.connection.disconnect(lf);
+            ServerLoginPacketListenerImpl.LOGGER.info("Disconnecting {}: {}", this.getUserName(), mr.getString());
+            this.connection.send(new ClientboundLoginDisconnectPacket(mr));
+            this.connection.disconnect(mr);
         }
         catch (Exception exception3) {
             ServerLoginPacketListenerImpl.LOGGER.error("Error whilst disconnecting player", (Throwable)exception3);
@@ -96,9 +96,9 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
         if (!this.gameProfile.isComplete()) {
             this.gameProfile = this.createFakeProfile(this.gameProfile);
         }
-        final Component lf2 = this.server.getPlayerList().canPlayerLogin(this.connection.getRemoteAddress(), this.gameProfile);
-        if (lf2 != null) {
-            this.disconnect(lf2);
+        final Component mr2 = this.server.getPlayerList().canPlayerLogin(this.connection.getRemoteAddress(), this.gameProfile);
+        if (mr2 != null) {
+            this.disconnect(mr2);
         }
         else {
             this.state = State.ACCEPTED;
@@ -106,8 +106,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
                 this.connection.send(new ClientboundLoginCompressionPacket(this.server.getCompressionThreshold()), (channelFuture -> this.connection.setupCompression(this.server.getCompressionThreshold())));
             }
             this.connection.send(new ClientboundGameProfilePacket(this.gameProfile));
-            final ServerPlayer xe3 = this.server.getPlayerList().getPlayer(this.gameProfile.getId());
-            if (xe3 != null) {
+            final ServerPlayer ze3 = this.server.getPlayerList().getPlayer(this.gameProfile.getId());
+            if (ze3 != null) {
                 this.state = State.DELAY_ACCEPT;
                 this.delayedAcceptPlayer = this.server.getPlayerList().getPlayerForLogin(this.gameProfile);
             }
@@ -118,8 +118,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
     }
     
     @Override
-    public void onDisconnect(final Component lf) {
-        ServerLoginPacketListenerImpl.LOGGER.info("{} lost connection: {}", this.getUserName(), lf.getString());
+    public void onDisconnect(final Component mr) {
+        ServerLoginPacketListenerImpl.LOGGER.info("{} lost connection: {}", this.getUserName(), mr.getString());
     }
     
     public String getUserName() {
@@ -130,9 +130,9 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
     }
     
     @Override
-    public void handleHello(final ServerboundHelloPacket rp) {
+    public void handleHello(final ServerboundHelloPacket te) {
         Validate.validState(this.state == State.HELLO, "Unexpected hello packet", new Object[0]);
-        this.gameProfile = rp.getGameProfile();
+        this.gameProfile = te.getGameProfile();
         if (this.server.usesAuthentication() && !this.connection.isMemoryConnection()) {
             this.state = State.KEY;
             this.connection.send(new ClientboundHelloPacket("", this.server.getKeyPair().getPublic(), this.nonce));
@@ -143,13 +143,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
     }
     
     @Override
-    public void handleKey(final ServerboundKeyPacket rq) {
+    public void handleKey(final ServerboundKeyPacket tf) {
         Validate.validState(this.state == State.KEY, "Unexpected key packet", new Object[0]);
         final PrivateKey privateKey3 = this.server.getKeyPair().getPrivate();
-        if (!Arrays.equals(this.nonce, rq.getNonce(privateKey3))) {
+        if (!Arrays.equals(this.nonce, tf.getNonce(privateKey3))) {
             throw new IllegalStateException("Invalid nonce!");
         }
-        this.secretKey = rq.getSecretKey(privateKey3);
+        this.secretKey = tf.getSecretKey(privateKey3);
         this.state = State.AUTHENTICATING;
         this.connection.setEncryptionKey(this.secretKey);
         final Thread thread4 = new Thread("User Authenticator #" + ServerLoginPacketListenerImpl.UNIQUE_THREAD_ID.incrementAndGet()) {
@@ -169,7 +169,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
                         ServerLoginPacketListenerImpl.this.state = ServerLoginPacketListenerImpl.State.READY_TO_ACCEPT;
                     }
                     else {
-                        ServerLoginPacketListenerImpl.this.disconnect(new TranslatableComponent("multiplayer.disconnect.unverified_username", new Object[0]));
+                        ServerLoginPacketListenerImpl.this.disconnect(new TranslatableComponent("multiplayer.disconnect.unverified_username"));
                         ServerLoginPacketListenerImpl.LOGGER.error("Username '{}' tried to join with an invalid session", gameProfile2.getName());
                     }
                 }
@@ -180,7 +180,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
                         ServerLoginPacketListenerImpl.this.state = ServerLoginPacketListenerImpl.State.READY_TO_ACCEPT;
                     }
                     else {
-                        ServerLoginPacketListenerImpl.this.disconnect(new TranslatableComponent("multiplayer.disconnect.authservers_down", new Object[0]));
+                        ServerLoginPacketListenerImpl.this.disconnect(new TranslatableComponent("multiplayer.disconnect.authservers_down"));
                         ServerLoginPacketListenerImpl.LOGGER.error("Couldn't verify username because servers are unavailable");
                     }
                 }
@@ -197,8 +197,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
     }
     
     @Override
-    public void handleCustomQueryPacket(final ServerboundCustomQueryPacket ro) {
-        this.disconnect(new TranslatableComponent("multiplayer.disconnect.unexpected_query_response", new Object[0]));
+    public void handleCustomQueryPacket(final ServerboundCustomQueryPacket td) {
+        this.disconnect(new TranslatableComponent("multiplayer.disconnect.unexpected_query_response"));
     }
     
     protected GameProfile createFakeProfile(final GameProfile gameProfile) {
diff --git a/src/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
index 3b72e5b..4d38249 100644
--- a/src/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
+++ b/src/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
@@ -17,13 +17,13 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
     private final Connection connection;
     private boolean hasRequestedStatus;
     
-    public ServerStatusPacketListenerImpl(final MinecraftServer minecraftServer, final Connection kt) {
+    public ServerStatusPacketListenerImpl(final MinecraftServer minecraftServer, final Connection me) {
         this.server = minecraftServer;
-        this.connection = kt;
+        this.connection = me;
     }
     
     @Override
-    public void onDisconnect(final Component lf) {
+    public void onDisconnect(final Component mr) {
     }
     
     @Override
@@ -32,7 +32,7 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
     }
     
     @Override
-    public void handleStatusRequest(final ServerboundStatusRequestPacket rz) {
+    public void handleStatusRequest(final ServerboundStatusRequestPacket to) {
         if (this.hasRequestedStatus) {
             this.connection.disconnect(ServerStatusPacketListenerImpl.DISCONNECT_REASON);
             return;
@@ -42,12 +42,12 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
     }
     
     @Override
-    public void handlePingRequest(final ServerboundPingRequestPacket ry) {
-        this.connection.send(new ClientboundPongResponsePacket(ry.getTime()));
+    public void handlePingRequest(final ServerboundPingRequestPacket tn) {
+        this.connection.send(new ClientboundPongResponsePacket(tn.getTime()));
         this.connection.disconnect(ServerStatusPacketListenerImpl.DISCONNECT_REASON);
     }
     
     static {
-        DISCONNECT_REASON = new TranslatableComponent("multiplayer.status.request_handled", new Object[0]);
+        DISCONNECT_REASON = new TranslatableComponent("multiplayer.status.request_handled");
     }
 }
diff --git a/src/net/minecraft/server/packs/AbstractResourcePack.java b/src/net/minecraft/server/packs/AbstractPackResources.java
similarity index 65%
rename from src/net/minecraft/server/packs/AbstractResourcePack.java
rename to src/net/minecraft/server/packs/AbstractPackResources.java
index eab3d6a..bf55aa3 100644
--- a/src/net/minecraft/server/packs/AbstractResourcePack.java
+++ b/src/net/minecraft/server/packs/AbstractPackResources.java
@@ -16,16 +16,16 @@ import net.minecraft.resources.ResourceLocation;
 import java.io.File;
 import org.apache.logging.log4j.Logger;
 
-public abstract class AbstractResourcePack implements Pack {
+public abstract class AbstractPackResources implements PackResources {
     private static final Logger LOGGER;
     protected final File file;
     
-    public AbstractResourcePack(final File file) {
+    public AbstractPackResources(final File file) {
         this.file = file;
     }
     
-    private static String getPathFromLocation(final PackType yf, final ResourceLocation sm) {
-        return String.format("%s/%s/%s", yf.getDirectory(), sm.getNamespace(), sm.getPath());
+    private static String getPathFromLocation(final PackType aaf, final ResourceLocation uh) {
+        return String.format("%s/%s/%s", aaf.getDirectory(), uh.getNamespace(), uh.getPath());
     }
     
     protected static String getRelativePath(final File file1, final File file2) {
@@ -33,13 +33,13 @@ public abstract class AbstractResourcePack implements Pack {
     }
     
     @Override
-    public InputStream getResource(final PackType yf, final ResourceLocation sm) throws IOException {
-        return this.getResource(getPathFromLocation(yf, sm));
+    public InputStream getResource(final PackType aaf, final ResourceLocation uh) throws IOException {
+        return this.getResource(getPathFromLocation(aaf, uh));
     }
     
     @Override
-    public boolean hasResource(final PackType yf, final ResourceLocation sm) {
-        return this.hasResource(getPathFromLocation(yf, sm));
+    public boolean hasResource(final PackType aaf, final ResourceLocation uh) {
+        return this.hasResource(getPathFromLocation(aaf, uh));
     }
     
     protected abstract InputStream getResource(final String string) throws IOException;
@@ -55,19 +55,19 @@ public abstract class AbstractResourcePack implements Pack {
     protected abstract boolean hasResource(final String string);
     
     protected void logWarning(final String string) {
-        AbstractResourcePack.LOGGER.warn("ResourcePack: ignored non-lowercase namespace: {} in {}", string, this.file);
+        AbstractPackResources.LOGGER.warn("ResourcePack: ignored non-lowercase namespace: {} in {}", string, this.file);
     }
     
     @Nullable
     @Override
-    public <T> T getMetadataSection(final MetadataSectionSerializer<T> yi) throws IOException {
+    public <T> T getMetadataSection(final MetadataSectionSerializer<T> aai) throws IOException {
         try (final InputStream inputStream3 = this.getResource("pack.mcmeta")) {
-            return AbstractResourcePack.<T>getMetadataFromStream(yi, inputStream3);
+            return AbstractPackResources.<T>getMetadataFromStream(aai, inputStream3);
         }
     }
     
     @Nullable
-    public static <T> T getMetadataFromStream(final MetadataSectionSerializer<T> yi, final InputStream inputStream) {
+    public static <T> T getMetadataFromStream(final MetadataSectionSerializer<T> aai, final InputStream inputStream) {
         JsonObject jsonObject3;
         try (final BufferedReader bufferedReader4 = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
             jsonObject3 = GsonHelper.parse(bufferedReader4);
@@ -75,17 +75,17 @@ public abstract class AbstractResourcePack implements Pack {
         catch (IOException | JsonParseException ex2) {
             final Exception ex;
             final Exception exception4 = ex;
-            AbstractResourcePack.LOGGER.error("Couldn't load {} metadata", yi.getMetadataSectionName(), exception4);
+            AbstractPackResources.LOGGER.error("Couldn't load {} metadata", aai.getMetadataSectionName(), exception4);
             return null;
         }
-        if (!jsonObject3.has(yi.getMetadataSectionName())) {
+        if (!jsonObject3.has(aai.getMetadataSectionName())) {
             return null;
         }
         try {
-            return yi.fromJson(GsonHelper.getAsJsonObject(jsonObject3, yi.getMetadataSectionName()));
+            return aai.fromJson(GsonHelper.getAsJsonObject(jsonObject3, aai.getMetadataSectionName()));
         }
         catch (JsonParseException jsonParseException4) {
-            AbstractResourcePack.LOGGER.error("Couldn't load {} metadata", yi.getMetadataSectionName(), jsonParseException4);
+            AbstractPackResources.LOGGER.error("Couldn't load {} metadata", aai.getMetadataSectionName(), jsonParseException4);
             return null;
         }
     }
diff --git a/src/net/minecraft/server/packs/FileResourcePack.java b/src/net/minecraft/server/packs/FilePackResources.java
similarity index 90%
rename from src/net/minecraft/server/packs/FileResourcePack.java
rename to src/net/minecraft/server/packs/FilePackResources.java
index 3572082..9d0f871 100644
--- a/src/net/minecraft/server/packs/FileResourcePack.java
+++ b/src/net/minecraft/server/packs/FilePackResources.java
@@ -19,11 +19,11 @@ import java.io.File;
 import java.util.zip.ZipFile;
 import com.google.common.base.Splitter;
 
-public class FileResourcePack extends AbstractResourcePack {
+public class FilePackResources extends AbstractPackResources {
     public static final Splitter SPLITTER;
     private ZipFile zipFile;
     
-    public FileResourcePack(final File file) {
+    public FilePackResources(final File file) {
         super(file);
     }
     
@@ -54,7 +54,7 @@ public class FileResourcePack extends AbstractResourcePack {
     }
     
     @Override
-    public Set<String> getNamespaces(final PackType yf) {
+    public Set<String> getNamespaces(final PackType aaf) {
         ZipFile zipFile3;
         try {
             zipFile3 = this.getOrCreateZipFile();
@@ -67,8 +67,8 @@ public class FileResourcePack extends AbstractResourcePack {
         while (enumeration4.hasMoreElements()) {
             final ZipEntry zipEntry6 = (ZipEntry)enumeration4.nextElement();
             final String string7 = zipEntry6.getName();
-            if (string7.startsWith(yf.getDirectory() + "/")) {
-                final List<String> list8 = Lists.newArrayList(FileResourcePack.SPLITTER.split(string7));
+            if (string7.startsWith(aaf.getDirectory() + "/")) {
+                final List<String> list8 = Lists.newArrayList(FilePackResources.SPLITTER.split(string7));
                 if (list8.size() <= 1) {
                     continue;
                 }
@@ -99,7 +99,7 @@ public class FileResourcePack extends AbstractResourcePack {
     }
     
     @Override
-    public Collection<ResourceLocation> getResources(final PackType yf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
+    public Collection<ResourceLocation> getResources(final PackType aaf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
         ZipFile zipFile7;
         try {
             zipFile7 = this.getOrCreateZipFile();
@@ -109,7 +109,7 @@ public class FileResourcePack extends AbstractResourcePack {
         }
         final Enumeration<? extends ZipEntry> enumeration8 = zipFile7.entries();
         final List<ResourceLocation> list9 = Lists.newArrayList();
-        final String string4 = yf.getDirectory() + "/" + string2 + "/";
+        final String string4 = aaf.getDirectory() + "/" + string2 + "/";
         final String string5 = string4 + string3 + "/";
         while (enumeration8.hasMoreElements()) {
             final ZipEntry zipEntry12 = (ZipEntry)enumeration8.nextElement();
diff --git a/src/net/minecraft/server/packs/FolderResourcePack.java b/src/net/minecraft/server/packs/FolderPackResources.java
similarity index 82%
rename from src/net/minecraft/server/packs/FolderResourcePack.java
rename to src/net/minecraft/server/packs/FolderPackResources.java
index 488c14d..028fb1f 100644
--- a/src/net/minecraft/server/packs/FolderResourcePack.java
+++ b/src/net/minecraft/server/packs/FolderPackResources.java
@@ -21,19 +21,19 @@ import java.io.File;
 import com.google.common.base.CharMatcher;
 import org.apache.logging.log4j.Logger;
 
-public class FolderResourcePack extends AbstractResourcePack {
+public class FolderPackResources extends AbstractPackResources {
     private static final Logger LOGGER;
     private static final boolean ON_WINDOWS;
     private static final CharMatcher BACKSLASH_MATCHER;
     
-    public FolderResourcePack(final File file) {
+    public FolderPackResources(final File file) {
         super(file);
     }
     
     public static boolean validatePath(final File file, final String string) throws IOException {
         String string2 = file.getCanonicalPath();
-        if (FolderResourcePack.ON_WINDOWS) {
-            string2 = FolderResourcePack.BACKSLASH_MATCHER.replaceFrom(string2, '/');
+        if (FolderPackResources.ON_WINDOWS) {
+            string2 = FolderPackResources.BACKSLASH_MATCHER.replaceFrom(string2, '/');
         }
         return string2.endsWith(string);
     }
@@ -65,13 +65,13 @@ public class FolderResourcePack extends AbstractResourcePack {
     }
     
     @Override
-    public Set<String> getNamespaces(final PackType yf) {
+    public Set<String> getNamespaces(final PackType aaf) {
         final Set<String> set3 = Sets.newHashSet();
-        final File file4 = new File(this.file, yf.getDirectory());
+        final File file4 = new File(this.file, aaf.getDirectory());
         final File[] arr5 = file4.listFiles((FileFilter)DirectoryFileFilter.DIRECTORY);
         if (arr5 != null) {
             for (final File file5 : arr5) {
-                final String string10 = AbstractResourcePack.getRelativePath(file4, file5);
+                final String string10 = AbstractPackResources.getRelativePath(file4, file5);
                 if (string10.equals(string10.toLowerCase(Locale.ROOT))) {
                     set3.add(string10.substring(0, string10.length() - 1));
                 }
@@ -84,12 +84,12 @@ public class FolderResourcePack extends AbstractResourcePack {
     }
     
     @Override
-    public void close() throws IOException {
+    public void close() {
     }
     
     @Override
-    public Collection<ResourceLocation> getResources(final PackType yf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
-        final File file7 = new File(this.file, yf.getDirectory());
+    public Collection<ResourceLocation> getResources(final PackType aaf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
+        final File file7 = new File(this.file, aaf.getDirectory());
         final List<ResourceLocation> list8 = Lists.newArrayList();
         this.listResources(new File(new File(file7, string2), string3), integer, string2, list8, string3 + "/", predicate);
         return list8;
@@ -108,8 +108,8 @@ public class FolderResourcePack extends AbstractResourcePack {
                     try {
                         list.add(new ResourceLocation(string3, string5 + file2.getName()));
                     }
-                    catch (ResourceLocationException r13) {
-                        FolderResourcePack.LOGGER.error(r13.getMessage());
+                    catch (ResourceLocationException t13) {
+                        FolderPackResources.LOGGER.error(t13.getMessage());
                     }
                 }
             }
diff --git a/src/net/minecraft/server/packs/Pack.java b/src/net/minecraft/server/packs/PackResources.java
similarity index 52%
rename from src/net/minecraft/server/packs/Pack.java
rename to src/net/minecraft/server/packs/PackResources.java
index d8f1c4d..0ac9354 100644
--- a/src/net/minecraft/server/packs/Pack.java
+++ b/src/net/minecraft/server/packs/PackResources.java
@@ -8,21 +8,22 @@ import java.util.function.Predicate;
 import net.minecraft.resources.ResourceLocation;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Closeable;
 
-public interface Pack extends Closeable {
+public interface PackResources extends AutoCloseable {
     InputStream getRootResource(final String string) throws IOException;
     
-    InputStream getResource(final PackType yf, final ResourceLocation sm) throws IOException;
+    InputStream getResource(final PackType aaf, final ResourceLocation uh) throws IOException;
     
-    Collection<ResourceLocation> getResources(final PackType yf, final String string2, final String string3, final int integer, final Predicate<String> predicate);
+    Collection<ResourceLocation> getResources(final PackType aaf, final String string2, final String string3, final int integer, final Predicate<String> predicate);
     
-    boolean hasResource(final PackType yf, final ResourceLocation sm);
+    boolean hasResource(final PackType aaf, final ResourceLocation uh);
     
-    Set<String> getNamespaces(final PackType yf);
+    Set<String> getNamespaces(final PackType aaf);
     
     @Nullable
-     <T> T getMetadataSection(final MetadataSectionSerializer<T> yi) throws IOException;
+     <T> T getMetadataSection(final MetadataSectionSerializer<T> aai) throws IOException;
     
     String getName();
+    
+    void close();
 }
diff --git a/src/net/minecraft/server/packs/VanillaPack.java b/src/net/minecraft/server/packs/VanillaPackResources.java
similarity index 69%
rename from src/net/minecraft/server/packs/VanillaPack.java
rename to src/net/minecraft/server/packs/VanillaPackResources.java
index 392951a..5dba5c4 100644
--- a/src/net/minecraft/server/packs/VanillaPack.java
+++ b/src/net/minecraft/server/packs/VanillaPackResources.java
@@ -36,14 +36,14 @@ import java.util.Map;
 import org.apache.logging.log4j.Logger;
 import java.nio.file.Path;
 
-public class VanillaPack implements Pack {
+public class VanillaPackResources implements PackResources {
     public static Path generatedDir;
     private static final Logger LOGGER;
     public static Class<?> clientObject;
     private static final Map<PackType, FileSystem> JAR_FILESYSTEM_BY_TYPE;
     public final Set<String> namespaces;
     
-    public VanillaPack(final String... arr) {
+    public VanillaPackResources(final String... arr) {
         this.namespaces = ImmutableSet.<String>copyOf(arr);
     }
     
@@ -52,8 +52,8 @@ public class VanillaPack implements Pack {
         if (string.contains("/") || string.contains("\\")) {
             throw new IllegalArgumentException("Root resources can only be filenames, not paths (no / allowed!)");
         }
-        if (VanillaPack.generatedDir != null) {
-            final Path path3 = VanillaPack.generatedDir.resolve(string);
+        if (VanillaPackResources.generatedDir != null) {
+            final Path path3 = VanillaPackResources.generatedDir.resolve(string);
             if (Files.exists(path3)) {
                 return Files.newInputStream(path3);
             }
@@ -62,26 +62,26 @@ public class VanillaPack implements Pack {
     }
     
     @Override
-    public InputStream getResource(final PackType yf, final ResourceLocation sm) throws IOException {
-        final InputStream inputStream4 = this.getResourceAsStream(yf, sm);
+    public InputStream getResource(final PackType aaf, final ResourceLocation uh) throws IOException {
+        final InputStream inputStream4 = this.getResourceAsStream(aaf, uh);
         if (inputStream4 != null) {
             return inputStream4;
         }
-        throw new FileNotFoundException(sm.getPath());
+        throw new FileNotFoundException(uh.getPath());
     }
     
     @Override
-    public Collection<ResourceLocation> getResources(final PackType yf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
+    public Collection<ResourceLocation> getResources(final PackType aaf, final String string2, final String string3, final int integer, final Predicate<String> predicate) {
         final Set<ResourceLocation> set7 = Sets.newHashSet();
-        if (VanillaPack.generatedDir != null) {
+        if (VanillaPackResources.generatedDir != null) {
             try {
-                getResources(set7, integer, string2, VanillaPack.generatedDir.resolve(yf.getDirectory()), string3, predicate);
+                getResources(set7, integer, string2, VanillaPackResources.generatedDir.resolve(aaf.getDirectory()), string3, predicate);
             }
             catch (IOException ex2) {}
-            if (yf == PackType.CLIENT_RESOURCES) {
+            if (aaf == PackType.CLIENT_RESOURCES) {
                 Enumeration<URL> enumeration8 = null;
                 try {
-                    enumeration8 = VanillaPack.clientObject.getClassLoader().getResources(yf.getDirectory() + "/");
+                    enumeration8 = VanillaPackResources.clientObject.getClassLoader().getResources(aaf.getDirectory() + "/");
                 }
                 catch (IOException ex3) {}
                 while (enumeration8 != null && enumeration8.hasMoreElements()) {
@@ -97,9 +97,9 @@ public class VanillaPack implements Pack {
             }
         }
         try {
-            final URL uRL8 = VanillaPack.class.getResource("/" + yf.getDirectory() + "/.mcassetsroot");
+            final URL uRL8 = VanillaPackResources.class.getResource("/" + aaf.getDirectory() + "/.mcassetsroot");
             if (uRL8 == null) {
-                VanillaPack.LOGGER.error("Couldn't find .mcassetsroot, cannot load vanilla resources");
+                VanillaPackResources.LOGGER.error("Couldn't find .mcassetsroot, cannot load vanilla resources");
                 return set7;
             }
             final URI uRI9 = uRL8.toURI();
@@ -109,18 +109,18 @@ public class VanillaPack implements Pack {
                 getResources(set7, integer, string2, path11, string3, predicate);
             }
             else if ("jar".equals(uRI9.getScheme())) {
-                final Path path12 = VanillaPack.JAR_FILESYSTEM_BY_TYPE.get(yf).getPath("/" + yf.getDirectory());
+                final Path path12 = VanillaPackResources.JAR_FILESYSTEM_BY_TYPE.get(aaf).getPath("/" + aaf.getDirectory());
                 getResources(set7, integer, "minecraft", path12, string3, predicate);
             }
             else {
-                VanillaPack.LOGGER.error("Unsupported scheme {} trying to list vanilla resources (NYI?)", uRI9);
+                VanillaPackResources.LOGGER.error("Unsupported scheme {} trying to list vanilla resources (NYI?)", uRI9);
             }
         }
         catch (FileNotFoundException | NoSuchFileException ex5) {}
         catch (URISyntaxException | IOException ex6) {
             final Exception ex;
             final Exception exception8 = ex;
-            VanillaPack.LOGGER.error("Couldn't get a list of all vanilla resources", (Throwable)exception8);
+            VanillaPackResources.LOGGER.error("Couldn't get a list of all vanilla resources", (Throwable)exception8);
         }
         return set7;
     }
@@ -133,10 +133,10 @@ public class VanillaPack implements Pack {
     }
     
     @Nullable
-    protected InputStream getResourceAsStream(final PackType yf, final ResourceLocation sm) {
-        final String string4 = createPath(yf, sm);
-        if (VanillaPack.generatedDir != null) {
-            final Path path5 = VanillaPack.generatedDir.resolve(yf.getDirectory() + "/" + sm.getNamespace() + "/" + sm.getPath());
+    protected InputStream getResourceAsStream(final PackType aaf, final ResourceLocation uh) {
+        final String string4 = createPath(aaf, uh);
+        if (VanillaPackResources.generatedDir != null) {
+            final Path path5 = VanillaPackResources.generatedDir.resolve(aaf.getDirectory() + "/" + uh.getNamespace() + "/" + uh.getPath());
             if (Files.exists(path5)) {
                 try {
                     return Files.newInputStream(path5);
@@ -145,41 +145,41 @@ public class VanillaPack implements Pack {
             }
         }
         try {
-            final URL uRL5 = VanillaPack.class.getResource(string4);
+            final URL uRL5 = VanillaPackResources.class.getResource(string4);
             if (isResourceUrlValid(string4, uRL5)) {
                 return uRL5.openStream();
             }
         }
         catch (IOException iOException5) {
-            return VanillaPack.class.getResourceAsStream(string4);
+            return VanillaPackResources.class.getResourceAsStream(string4);
         }
         return null;
     }
     
-    private static String createPath(final PackType yf, final ResourceLocation sm) {
-        return "/" + yf.getDirectory() + "/" + sm.getNamespace() + "/" + sm.getPath();
+    private static String createPath(final PackType aaf, final ResourceLocation uh) {
+        return "/" + aaf.getDirectory() + "/" + uh.getNamespace() + "/" + uh.getPath();
     }
     
     private static boolean isResourceUrlValid(final String string, @Nullable final URL uRL) throws IOException {
-        return uRL != null && (uRL.getProtocol().equals("jar") || FolderResourcePack.validatePath(new File(uRL.getFile()), string));
+        return uRL != null && (uRL.getProtocol().equals("jar") || FolderPackResources.validatePath(new File(uRL.getFile()), string));
     }
     
     @Nullable
     protected InputStream getResourceAsStream(final String string) {
-        return VanillaPack.class.getResourceAsStream("/" + string);
+        return VanillaPackResources.class.getResourceAsStream("/" + string);
     }
     
     @Override
-    public boolean hasResource(final PackType yf, final ResourceLocation sm) {
-        final String string4 = createPath(yf, sm);
-        if (VanillaPack.generatedDir != null) {
-            final Path path5 = VanillaPack.generatedDir.resolve(yf.getDirectory() + "/" + sm.getNamespace() + "/" + sm.getPath());
+    public boolean hasResource(final PackType aaf, final ResourceLocation uh) {
+        final String string4 = createPath(aaf, uh);
+        if (VanillaPackResources.generatedDir != null) {
+            final Path path5 = VanillaPackResources.generatedDir.resolve(aaf.getDirectory() + "/" + uh.getNamespace() + "/" + uh.getPath());
             if (Files.exists(path5)) {
                 return true;
             }
         }
         try {
-            final URL uRL5 = VanillaPack.class.getResource(string4);
+            final URL uRL5 = VanillaPackResources.class.getResource(string4);
             return isResourceUrlValid(string4, uRL5);
         }
         catch (IOException ex) {
@@ -188,15 +188,15 @@ public class VanillaPack implements Pack {
     }
     
     @Override
-    public Set<String> getNamespaces(final PackType yf) {
+    public Set<String> getNamespaces(final PackType aaf) {
         return this.namespaces;
     }
     
     @Nullable
     @Override
-    public <T> T getMetadataSection(final MetadataSectionSerializer<T> yi) throws IOException {
+    public <T> T getMetadataSection(final MetadataSectionSerializer<T> aai) throws IOException {
         try (final InputStream inputStream3 = this.getRootResource("pack.mcmeta")) {
-            return AbstractResourcePack.<T>getMetadataFromStream(yi, inputStream3);
+            return AbstractPackResources.<T>getMetadataFromStream(aai, inputStream3);
         }
         catch (RuntimeException | FileNotFoundException ex2) {
             final Exception ex;
@@ -219,18 +219,18 @@ public class VanillaPack implements Pack {
         final PackType[] array;
         int length;
         int i = 0;
-        PackType yf6;
+        PackType aaf6;
         URL uRL7;
         URI uRI8;
         FileSystem fileSystem9;
         final Exception ex;
         Exception exception8;
         JAR_FILESYSTEM_BY_TYPE = Util.<Map<PackType, FileSystem>>make(Maps.newHashMap(), hashMap -> {
-            synchronized (VanillaPack.class) {
+            synchronized (VanillaPackResources.class) {
                 PackType.values();
                 for (length = array.length; i < length; ++i) {
-                    yf6 = array[i];
-                    uRL7 = VanillaPack.class.getResource("/" + yf6.getDirectory() + "/.mcassetsroot");
+                    aaf6 = array[i];
+                    uRL7 = VanillaPackResources.class.getResource("/" + aaf6.getDirectory() + "/.mcassetsroot");
                     try {
                         uRI8 = uRL7.toURI();
                         if ("jar".equals(uRI8.getScheme())) {
@@ -240,12 +240,12 @@ public class VanillaPack implements Pack {
                             catch (FileSystemNotFoundException fileSystemNotFoundException10) {
                                 fileSystem9 = FileSystems.newFileSystem(uRI8, Collections.emptyMap());
                             }
-                            hashMap.put(yf6, fileSystem9);
+                            hashMap.put(aaf6, fileSystem9);
                         }
                     }
                     catch (URISyntaxException | IOException ex2) {
                         exception8 = ex;
-                        VanillaPack.LOGGER.error("Couldn't get a list of all vanilla resources", (Throwable)exception8);
+                        VanillaPackResources.LOGGER.error("Couldn't get a list of all vanilla resources", (Throwable)exception8);
                     }
                 }
             }
diff --git a/src/net/minecraft/server/packs/metadata/pack/PackMetadataSection.java b/src/net/minecraft/server/packs/metadata/pack/PackMetadataSection.java
index 6abdd43..5bac1a4 100644
--- a/src/net/minecraft/server/packs/metadata/pack/PackMetadataSection.java
+++ b/src/net/minecraft/server/packs/metadata/pack/PackMetadataSection.java
@@ -7,8 +7,8 @@ public class PackMetadataSection {
     private final Component description;
     private final int packFormat;
     
-    public PackMetadataSection(final Component lf, final int integer) {
-        this.description = lf;
+    public PackMetadataSection(final Component mr, final int integer) {
+        this.description = mr;
         this.packFormat = integer;
     }
     
diff --git a/src/net/minecraft/server/packs/metadata/pack/PackMetadataSectionSerializer.java b/src/net/minecraft/server/packs/metadata/pack/PackMetadataSectionSerializer.java
index 588b76c..824fb95 100644
--- a/src/net/minecraft/server/packs/metadata/pack/PackMetadataSectionSerializer.java
+++ b/src/net/minecraft/server/packs/metadata/pack/PackMetadataSectionSerializer.java
@@ -9,12 +9,12 @@ import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
 public class PackMetadataSectionSerializer implements MetadataSectionSerializer<PackMetadataSection> {
     @Override
     public PackMetadataSection fromJson(final JsonObject jsonObject) {
-        final Component lf3 = Component.Serializer.fromJson(jsonObject.get("description"));
-        if (lf3 == null) {
+        final Component mr3 = Component.Serializer.fromJson(jsonObject.get("description"));
+        if (mr3 == null) {
             throw new JsonParseException("Invalid/missing description!");
         }
         final int integer4 = GsonHelper.getAsInt(jsonObject, "pack_format");
-        return new PackMetadataSection(lf3, integer4);
+        return new PackMetadataSection(mr3, integer4);
     }
     
     @Override
diff --git a/src/net/minecraft/server/packs/repository/FolderRepositorySource.java b/src/net/minecraft/server/packs/repository/FolderRepositorySource.java
index 08d6769..ec9ccca 100644
--- a/src/net/minecraft/server/packs/repository/FolderRepositorySource.java
+++ b/src/net/minecraft/server/packs/repository/FolderRepositorySource.java
@@ -1,23 +1,25 @@
 package net.minecraft.server.packs.repository;
 
-import net.minecraft.server.packs.FileResourcePack;
-import net.minecraft.server.packs.FolderResourcePack;
-import net.minecraft.server.packs.Pack;
+import net.minecraft.server.packs.FilePackResources;
+import net.minecraft.server.packs.FolderPackResources;
+import net.minecraft.server.packs.PackResources;
 import java.util.function.Supplier;
-import java.util.Map;
+import java.util.function.Consumer;
 import java.io.File;
 import java.io.FileFilter;
 
 public class FolderRepositorySource implements RepositorySource {
     private static final FileFilter RESOURCEPACK_FILTER;
     private final File folder;
+    private final PackSource packSource;
     
-    public FolderRepositorySource(final File file) {
+    public FolderRepositorySource(final File file, final PackSource aas) {
         this.folder = file;
+        this.packSource = aas;
     }
     
     @Override
-    public <T extends UnopenedPack> void loadPacks(final Map<String, T> map, final UnopenedPack.UnopenedPackConstructor<T> b) {
+    public <T extends Pack> void loadPacks(final Consumer<T> consumer, final Pack.PackConstructor<T> a) {
         if (!this.folder.isDirectory()) {
             this.folder.mkdirs();
         }
@@ -27,18 +29,18 @@ public class FolderRepositorySource implements RepositorySource {
         }
         for (final File file8 : arr4) {
             final String string9 = "file/" + file8.getName();
-            final T yt10 = UnopenedPack.<T>create(string9, false, this.createSupplier(file8), b, UnopenedPack.Position.TOP);
-            if (yt10 != null) {
-                map.put(string9, yt10);
+            final T aap10 = Pack.<T>create(string9, false, this.createSupplier(file8), a, Pack.Position.TOP, this.packSource);
+            if (aap10 != null) {
+                consumer.accept(aap10);
             }
         }
     }
     
-    private Supplier<Pack> createSupplier(final File file) {
+    private Supplier<PackResources> createSupplier(final File file) {
         if (file.isDirectory()) {
-            return (Supplier<Pack>)(() -> new FolderResourcePack(file));
+            return (Supplier<PackResources>)(() -> new FolderPackResources(file));
         }
-        return (Supplier<Pack>)(() -> new FileResourcePack(file));
+        return (Supplier<PackResources>)(() -> new FilePackResources(file));
     }
     
     static {
diff --git a/src/net/minecraft/server/packs/repository/Pack.java b/src/net/minecraft/server/packs/repository/Pack.java
new file mode 100644
index 0000000..cc1e86d
--- /dev/null
+++ b/src/net/minecraft/server/packs/repository/Pack.java
@@ -0,0 +1,182 @@
+package net.minecraft.server.packs.repository;
+
+import java.util.function.Function;
+import java.util.List;
+import net.minecraft.SharedConstants;
+import net.minecraft.network.chat.TranslatableComponent;
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.network.chat.Style;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.HoverEvent;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.ComponentUtils;
+import net.minecraft.network.chat.TextComponent;
+import javax.annotation.Nullable;
+import java.io.IOException;
+import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.packs.PackResources;
+import java.util.function.Supplier;
+import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
+import org.apache.logging.log4j.Logger;
+
+public class Pack implements AutoCloseable {
+    private static final Logger LOGGER;
+    private static final PackMetadataSection BROKEN_ASSETS_FALLBACK;
+    private final String id;
+    private final Supplier<PackResources> supplier;
+    private final Component title;
+    private final Component description;
+    private final PackCompatibility compatibility;
+    private final Position defaultPosition;
+    private final boolean required;
+    private final boolean fixedPosition;
+    private final PackSource packSource;
+    
+    @Nullable
+    public static <T extends Pack> T create(final String string, final boolean boolean2, final Supplier<PackResources> supplier, final PackConstructor<T> a, final Position b, final PackSource aas) {
+        try (final PackResources aae7 = supplier.get()) {
+            PackMetadataSection aaj9 = aae7.<PackMetadataSection>getMetadataSection((MetadataSectionSerializer<PackMetadataSection>)PackMetadataSection.SERIALIZER);
+            if (boolean2 && aaj9 == null) {
+                Pack.LOGGER.error("Broken/missing pack.mcmeta detected, fudging it into existance. Please check that your launcher has downloaded all assets for the game correctly!");
+                aaj9 = Pack.BROKEN_ASSETS_FALLBACK;
+            }
+            if (aaj9 != null) {
+                return a.create(string, boolean2, supplier, aae7, aaj9, b, aas);
+            }
+            Pack.LOGGER.warn("Couldn't find pack meta for pack {}", string);
+        }
+        catch (IOException iOException7) {
+            Pack.LOGGER.warn("Couldn't get pack info for: {}", iOException7.toString());
+        }
+        return null;
+    }
+    
+    public Pack(final String string, final boolean boolean2, final Supplier<PackResources> supplier, final Component mr4, final Component mr5, final PackCompatibility aaq, final Position b, final boolean boolean8, final PackSource aas) {
+        this.id = string;
+        this.supplier = supplier;
+        this.title = mr4;
+        this.description = mr5;
+        this.compatibility = aaq;
+        this.required = boolean2;
+        this.defaultPosition = b;
+        this.fixedPosition = boolean8;
+        this.packSource = aas;
+    }
+    
+    public Pack(final String string, final boolean boolean2, final Supplier<PackResources> supplier, final PackResources aae, final PackMetadataSection aaj, final Position b, final PackSource aas) {
+        this(string, boolean2, supplier, new TextComponent(aae.getName()), aaj.getDescription(), PackCompatibility.forFormat(aaj.getPackFormat()), b, false, aas);
+    }
+    
+    public Component getTitle() {
+        return this.title;
+    }
+    
+    public Component getDescription() {
+        return this.description;
+    }
+    
+    public Component getChatLink(final boolean boolean1) {
+        final HoverEvent mv;
+        final Style style;
+        return ComponentUtils.wrapInSquareBrackets(this.packSource.decorate(new TextComponent(this.id))).withStyle(nb -> {
+            nb.withColor(boolean1 ? ChatFormatting.GREEN : ChatFormatting.RED).withInsertion(StringArgumentType.escapeIfRequired(this.id));
+            new HoverEvent((HoverEvent.Action<MutableComponent>)HoverEvent.Action.SHOW_TEXT, new TextComponent("").append(this.title).append("\n").append(this.description));
+            return style.withHoverEvent(mv);
+        });
+    }
+    
+    public PackCompatibility getCompatibility() {
+        return this.compatibility;
+    }
+    
+    public PackResources open() {
+        return this.supplier.get();
+    }
+    
+    public String getId() {
+        return this.id;
+    }
+    
+    public boolean isRequired() {
+        return this.required;
+    }
+    
+    public boolean isFixedPosition() {
+        return this.fixedPosition;
+    }
+    
+    public Position getDefaultPosition() {
+        return this.defaultPosition;
+    }
+    
+    public PackSource getPackSource() {
+        return this.packSource;
+    }
+    
+    @Override
+    public boolean equals(final Object object) {
+        if (this == object) {
+            return true;
+        }
+        if (!(object instanceof Pack)) {
+            return false;
+        }
+        final Pack aap3 = (Pack)object;
+        return this.id.equals(aap3.id);
+    }
+    
+    @Override
+    public int hashCode() {
+        return this.id.hashCode();
+    }
+    
+    @Override
+    public void close() {
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+        BROKEN_ASSETS_FALLBACK = new PackMetadataSection(new TranslatableComponent("resourcePack.broken_assets").withStyle(ChatFormatting.RED, ChatFormatting.ITALIC), SharedConstants.getCurrentVersion().getPackVersion());
+    }
+    
+    public enum Position {
+        TOP, 
+        BOTTOM;
+        
+        public <T, P extends Pack> int insert(final List<T> list, final T object, final Function<T, P> function, final boolean boolean4) {
+            final Position b6 = boolean4 ? this.opposite() : this;
+            if (b6 == Position.BOTTOM) {
+                int integer7;
+                for (integer7 = 0; integer7 < list.size(); ++integer7) {
+                    final P aap8 = function.apply(list.get(integer7));
+                    if (!aap8.isFixedPosition() || aap8.getDefaultPosition() != this) {
+                        break;
+                    }
+                }
+                list.add(integer7, object);
+                return integer7;
+            }
+            int integer7;
+            for (integer7 = list.size() - 1; integer7 >= 0; --integer7) {
+                final P aap8 = function.apply(list.get(integer7));
+                if (!aap8.isFixedPosition() || aap8.getDefaultPosition() != this) {
+                    break;
+                }
+            }
+            list.add(integer7 + 1, object);
+            return integer7 + 1;
+        }
+        
+        public Position opposite() {
+            return (this == Position.TOP) ? Position.BOTTOM : Position.TOP;
+        }
+    }
+    
+    @FunctionalInterface
+    public interface PackConstructor<T extends Pack> {
+        @Nullable
+        T create(final String string, final boolean boolean2, final Supplier<PackResources> supplier, final PackResources aae, final PackMetadataSection aaj, final Position b, final PackSource aas);
+    }
+}
diff --git a/src/net/minecraft/server/packs/repository/PackCompatibility.java b/src/net/minecraft/server/packs/repository/PackCompatibility.java
index b5bbed7..920eccb 100644
--- a/src/net/minecraft/server/packs/repository/PackCompatibility.java
+++ b/src/net/minecraft/server/packs/repository/PackCompatibility.java
@@ -13,8 +13,8 @@ public enum PackCompatibility {
     private final Component confirmation;
     
     private PackCompatibility(final String string3) {
-        this.description = new TranslatableComponent("resourcePack.incompatible." + string3, new Object[0]);
-        this.confirmation = new TranslatableComponent("resourcePack.incompatible.confirm." + string3, new Object[0]);
+        this.description = new TranslatableComponent("pack.incompatible." + string3);
+        this.confirmation = new TranslatableComponent("pack.incompatible.confirm." + string3);
     }
     
     public boolean isCompatible() {
diff --git a/src/net/minecraft/server/packs/repository/PackRepository.java b/src/net/minecraft/server/packs/repository/PackRepository.java
index 454952d..b01dc6a 100644
--- a/src/net/minecraft/server/packs/repository/PackRepository.java
+++ b/src/net/minecraft/server/packs/repository/PackRepository.java
@@ -1,82 +1,84 @@
 package net.minecraft.server.packs.repository;
 
+import net.minecraft.server.packs.PackResources;
 import javax.annotation.Nullable;
-import java.util.Comparator;
-import java.util.Iterator;
-import com.google.common.base.Functions;
 import java.util.function.Predicate;
 import java.util.Objects;
+import java.util.stream.Stream;
+import com.google.common.base.Functions;
+import java.util.stream.Collectors;
+import java.util.Iterator;
+import com.google.common.collect.Maps;
 import java.util.Collection;
 import java.util.stream.Collector;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.LinkedHashSet;
 import java.util.function.Function;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class PackRepository<T extends UnopenedPack> implements AutoCloseable {
+public class PackRepository<T extends Pack> implements AutoCloseable {
     private final Set<RepositorySource> sources;
-    private final Map<String, T> available;
-    private final List<T> selected;
-    private final UnopenedPack.UnopenedPackConstructor<T> constructor;
+    private Map<String, T> available;
+    private List<T> selected;
+    private final Pack.PackConstructor<T> constructor;
     
-    public PackRepository(final UnopenedPack.UnopenedPackConstructor<T> b) {
-        this.sources = Sets.newHashSet();
-        this.available = Maps.newLinkedHashMap();
-        this.selected = Lists.newLinkedList();
-        this.constructor = b;
+    public PackRepository(final Pack.PackConstructor<T> a, final RepositorySource... arr) {
+        this.available = ImmutableMap.of();
+        this.selected = ImmutableList.of();
+        this.constructor = a;
+        this.sources = ImmutableSet.<RepositorySource>copyOf(arr);
     }
     
     public void reload() {
+        final List<String> list2 = this.selected.stream().map(Pack::getId).collect(ImmutableList.toImmutableList());
         this.close();
-        final Set<String> set2 = this.selected.stream().map(UnopenedPack::getId).collect(Collectors.toCollection((Supplier<R>)LinkedHashSet::new));
-        this.available.clear();
-        this.selected.clear();
-        for (final RepositorySource yr4 : this.sources) {
-            yr4.<T>loadPacks(this.available, this.constructor);
+        this.available = this.discoverAvailable();
+        this.selected = this.rebuildSelected(list2);
+    }
+    
+    private Map<String, T> discoverAvailable() {
+        final Map<String, T> map2 = Maps.newTreeMap();
+        for (final RepositorySource aat4 : this.sources) {
+            final Pack pack;
+            aat4.<T>loadPacks(aap -> pack = map2.put(aap.getId(), (T)aap), this.constructor);
         }
-        this.sortAvailable();
-        this.selected.addAll(set2.stream().map(this.available::get).filter(Objects::nonNull).collect(Collectors.toCollection((Supplier<R>)LinkedHashSet::new)));
-        for (final T yt4 : this.available.values()) {
-            if (yt4.isRequired() && !this.selected.contains(yt4)) {
-                yt4.getDefaultPosition().insert((List<Object>)this.selected, yt4, Functions.identity(), false);
+        return ImmutableMap.copyOf(map2);
+    }
+    
+    public void setSelected(final Collection<String> collection) {
+        this.selected = this.rebuildSelected(collection);
+    }
+    
+    private List<T> rebuildSelected(final Collection<String> collection) {
+        final List<T> list3 = this.getAvailablePacks(collection).collect(Collectors.toList());
+        for (final T aap5 : this.available.values()) {
+            if (aap5.isRequired() && !list3.contains(aap5)) {
+                aap5.getDefaultPosition().insert((List<Object>)list3, aap5, Functions.identity(), false);
             }
         }
+        return ImmutableList.copyOf(list3);
     }
     
-    private void sortAvailable() {
-        final List<Map.Entry<String, T>> list2 = Lists.newArrayList(this.available.entrySet());
-        this.available.clear();
-        final UnopenedPack unopenedPack;
-        list2.stream().sorted(Map.Entry.<Comparable, Object>comparingByKey()).forEachOrdered(entry -> unopenedPack = this.available.put(entry.getKey(), (T)entry.getValue()));
+    private Stream<T> getAvailablePacks(final Collection<String> collection) {
+        return collection.stream().<T>map(this.available::get).filter(Objects::nonNull);
     }
     
-    public void setSelected(final Collection<T> collection) {
-        this.selected.clear();
-        this.selected.addAll(collection);
-        for (final T yt4 : this.available.values()) {
-            if (yt4.isRequired() && !this.selected.contains(yt4)) {
-                yt4.getDefaultPosition().insert((List<Object>)this.selected, yt4, Functions.identity(), false);
-            }
-        }
+    public Collection<String> getAvailableIds() {
+        return this.available.keySet();
     }
     
-    public Collection<T> getAvailable() {
+    public Collection<T> getAvailablePacks() {
         return this.available.values();
     }
     
-    public Collection<T> getUnselected() {
-        final Collection<T> collection2 = Lists.newArrayList(this.available.values());
-        collection2.removeAll(this.selected);
-        return collection2;
+    public Collection<String> getSelectedIds() {
+        return this.selected.stream().map(Pack::getId).collect(ImmutableSet.toImmutableSet());
     }
     
-    public Collection<T> getSelected() {
+    public Collection<T> getSelectedPacks() {
         return this.selected;
     }
     
@@ -85,12 +87,16 @@ public class PackRepository<T extends UnopenedPack> implements AutoCloseable {
         return this.available.get(string);
     }
     
-    public void addSource(final RepositorySource yr) {
-        this.sources.add(yr);
-    }
-    
     @Override
     public void close() {
-        this.available.values().forEach(UnopenedPack::close);
+        this.available.values().forEach(Pack::close);
+    }
+    
+    public boolean isAvailable(final String string) {
+        return this.available.containsKey(string);
+    }
+    
+    public List<PackResources> openAllSelected() {
+        return this.selected.stream().map(Pack::open).collect(ImmutableList.toImmutableList());
     }
 }
diff --git a/src/net/minecraft/server/packs/repository/PackSource.java b/src/net/minecraft/server/packs/repository/PackSource.java
new file mode 100644
index 0000000..5b2522b
--- /dev/null
+++ b/src/net/minecraft/server/packs/repository/PackSource.java
@@ -0,0 +1,27 @@
+package net.minecraft.server.packs.repository;
+
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
+
+public interface PackSource {
+    public static final PackSource DEFAULT = passThrough();
+    public static final PackSource BUILT_IN = decorating("pack.source.builtin");
+    public static final PackSource WORLD = decorating("pack.source.world");
+    public static final PackSource SERVER = decorating("pack.source.server");
+    
+    Component decorate(final Component mr);
+    
+    default PackSource passThrough() {
+        return mr -> mr;
+    }
+    
+    default PackSource decorating(final String string) {
+        final Component mr3 = new TranslatableComponent(string);
+        final TranslatableComponent translatableComponent;
+        final Object o;
+        return mr2 -> {
+            new TranslatableComponent("pack.nameAndSource", new Object[] { mr2, o });
+            return translatableComponent;
+        };
+    }
+}
diff --git a/src/net/minecraft/server/packs/repository/RepositorySource.java b/src/net/minecraft/server/packs/repository/RepositorySource.java
index ed8ee98..4926f97 100644
--- a/src/net/minecraft/server/packs/repository/RepositorySource.java
+++ b/src/net/minecraft/server/packs/repository/RepositorySource.java
@@ -1,7 +1,7 @@
 package net.minecraft.server.packs.repository;
 
-import java.util.Map;
+import java.util.function.Consumer;
 
 public interface RepositorySource {
-     <T extends UnopenedPack> void loadPacks(final Map<String, T> map, final UnopenedPack.UnopenedPackConstructor<T> b);
+     <T extends Pack> void loadPacks(final Consumer<T> consumer, final Pack.PackConstructor<T> a);
 }
diff --git a/src/net/minecraft/server/packs/repository/ServerPacksSource.java b/src/net/minecraft/server/packs/repository/ServerPacksSource.java
index 8778eb1..49e3b1b 100644
--- a/src/net/minecraft/server/packs/repository/ServerPacksSource.java
+++ b/src/net/minecraft/server/packs/repository/ServerPacksSource.java
@@ -1,21 +1,21 @@
 package net.minecraft.server.packs.repository;
 
-import net.minecraft.server.packs.Pack;
-import java.util.Map;
-import net.minecraft.server.packs.VanillaPack;
+import net.minecraft.server.packs.PackResources;
+import java.util.function.Consumer;
+import net.minecraft.server.packs.VanillaPackResources;
 
 public class ServerPacksSource implements RepositorySource {
-    private final VanillaPack vanillaPack;
+    private final VanillaPackResources vanillaPack;
     
     public ServerPacksSource() {
-        this.vanillaPack = new VanillaPack(new String[] { "minecraft" });
+        this.vanillaPack = new VanillaPackResources(new String[] { "minecraft" });
     }
     
     @Override
-    public <T extends UnopenedPack> void loadPacks(final Map<String, T> map, final UnopenedPack.UnopenedPackConstructor<T> b) {
-        final T yt4 = UnopenedPack.<T>create("vanilla", false, () -> this.vanillaPack, b, UnopenedPack.Position.BOTTOM);
-        if (yt4 != null) {
-            map.put("vanilla", yt4);
+    public <T extends Pack> void loadPacks(final Consumer<T> consumer, final Pack.PackConstructor<T> a) {
+        final T aap4 = Pack.<T>create("vanilla", false, () -> this.vanillaPack, a, Pack.Position.BOTTOM, PackSource.BUILT_IN);
+        if (aap4 != null) {
+            consumer.accept(aap4);
         }
     }
 }
diff --git a/src/net/minecraft/server/packs/repository/UnopenedPack.java b/src/net/minecraft/server/packs/repository/UnopenedPack.java
deleted file mode 100644
index 518a57b..0000000
--- a/src/net/minecraft/server/packs/repository/UnopenedPack.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package net.minecraft.server.packs.repository;
-
-import java.util.function.Function;
-import java.util.List;
-import net.minecraft.SharedConstants;
-import net.minecraft.network.chat.TranslatableComponent;
-import org.apache.logging.log4j.LogManager;
-import net.minecraft.network.chat.Style;
-import net.minecraft.network.chat.HoverEvent;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.ComponentUtils;
-import net.minecraft.network.chat.TextComponent;
-import javax.annotation.Nullable;
-import java.io.IOException;
-import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.packs.Pack;
-import java.util.function.Supplier;
-import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
-import org.apache.logging.log4j.Logger;
-
-public class UnopenedPack implements AutoCloseable {
-    private static final Logger LOGGER;
-    private static final PackMetadataSection BROKEN_ASSETS_FALLBACK;
-    private final String id;
-    private final Supplier<Pack> supplier;
-    private final Component title;
-    private final Component description;
-    private final PackCompatibility compatibility;
-    private final Position defaultPosition;
-    private final boolean required;
-    private final boolean fixedPosition;
-    
-    @Nullable
-    public static <T extends UnopenedPack> T create(final String string, final boolean boolean2, final Supplier<Pack> supplier, final UnopenedPackConstructor<T> b, final Position a) {
-        try (final Pack ye6 = supplier.get()) {
-            PackMetadataSection yj8 = ye6.<PackMetadataSection>getMetadataSection((MetadataSectionSerializer<PackMetadataSection>)PackMetadataSection.SERIALIZER);
-            if (boolean2 && yj8 == null) {
-                UnopenedPack.LOGGER.error("Broken/missing pack.mcmeta detected, fudging it into existance. Please check that your launcher has downloaded all assets for the game correctly!");
-                yj8 = UnopenedPack.BROKEN_ASSETS_FALLBACK;
-            }
-            if (yj8 != null) {
-                return b.create(string, boolean2, supplier, ye6, yj8, a);
-            }
-            UnopenedPack.LOGGER.warn("Couldn't find pack meta for pack {}", string);
-        }
-        catch (IOException iOException6) {
-            UnopenedPack.LOGGER.warn("Couldn't get pack info for: {}", iOException6.toString());
-        }
-        return null;
-    }
-    
-    public UnopenedPack(final String string, final boolean boolean2, final Supplier<Pack> supplier, final Component lf4, final Component lf5, final PackCompatibility yp, final Position a, final boolean boolean8) {
-        this.id = string;
-        this.supplier = supplier;
-        this.title = lf4;
-        this.description = lf5;
-        this.compatibility = yp;
-        this.required = boolean2;
-        this.defaultPosition = a;
-        this.fixedPosition = boolean8;
-    }
-    
-    public UnopenedPack(final String string, final boolean boolean2, final Supplier<Pack> supplier, final Pack ye, final PackMetadataSection yj, final Position a) {
-        this(string, boolean2, supplier, new TextComponent(ye.getName()), yj.getDescription(), PackCompatibility.forFormat(yj.getPackFormat()), a, false);
-    }
-    
-    public Component getTitle() {
-        return this.title;
-    }
-    
-    public Component getDescription() {
-        return this.description;
-    }
-    
-    public Component getChatLink(final boolean boolean1) {
-        final HoverEvent hoverEvent;
-        final Object o;
-        return ComponentUtils.wrapInSquareBrackets(new TextComponent(this.id)).withStyle(ln -> {
-            ln.setColor(boolean1 ? ChatFormatting.GREEN : ChatFormatting.RED).setInsertion(StringArgumentType.escapeIfRequired(this.id));
-            new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent("").append(this.title).append("\n").append(this.description));
-            ((Style)o).setHoverEvent(hoverEvent);
-        });
-    }
-    
-    public PackCompatibility getCompatibility() {
-        return this.compatibility;
-    }
-    
-    public Pack open() {
-        return this.supplier.get();
-    }
-    
-    public String getId() {
-        return this.id;
-    }
-    
-    public boolean isRequired() {
-        return this.required;
-    }
-    
-    public boolean isFixedPosition() {
-        return this.fixedPosition;
-    }
-    
-    public Position getDefaultPosition() {
-        return this.defaultPosition;
-    }
-    
-    @Override
-    public boolean equals(final Object object) {
-        if (this == object) {
-            return true;
-        }
-        if (!(object instanceof UnopenedPack)) {
-            return false;
-        }
-        final UnopenedPack yt3 = (UnopenedPack)object;
-        return this.id.equals(yt3.id);
-    }
-    
-    @Override
-    public int hashCode() {
-        return this.id.hashCode();
-    }
-    
-    @Override
-    public void close() {
-    }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-        BROKEN_ASSETS_FALLBACK = new PackMetadataSection(new TranslatableComponent("resourcePack.broken_assets", new Object[0]).withStyle(ChatFormatting.RED, ChatFormatting.ITALIC), SharedConstants.getCurrentVersion().getPackVersion());
-    }
-    
-    public enum Position {
-        TOP, 
-        BOTTOM;
-        
-        public <T, P extends UnopenedPack> int insert(final List<T> list, final T object, final Function<T, P> function, final boolean boolean4) {
-            final Position a6 = boolean4 ? this.opposite() : this;
-            if (a6 == Position.BOTTOM) {
-                int integer7;
-                for (integer7 = 0; integer7 < list.size(); ++integer7) {
-                    final P yt8 = function.apply(list.get(integer7));
-                    if (!yt8.isFixedPosition() || yt8.getDefaultPosition() != this) {
-                        break;
-                    }
-                }
-                list.add(integer7, object);
-                return integer7;
-            }
-            int integer7;
-            for (integer7 = list.size() - 1; integer7 >= 0; --integer7) {
-                final P yt8 = function.apply(list.get(integer7));
-                if (!yt8.isFixedPosition() || yt8.getDefaultPosition() != this) {
-                    break;
-                }
-            }
-            list.add(integer7 + 1, object);
-            return integer7 + 1;
-        }
-        
-        public Position opposite() {
-            return (this == Position.TOP) ? Position.BOTTOM : Position.TOP;
-        }
-    }
-    
-    @FunctionalInterface
-    public interface UnopenedPackConstructor<T extends UnopenedPack> {
-        @Nullable
-        T create(final String string, final boolean boolean2, final Supplier<Pack> supplier, final Pack ye, final PackMetadataSection yj, final Position a);
-    }
-}
diff --git a/src/net/minecraft/server/packs/resources/FallbackResourceManager.java b/src/net/minecraft/server/packs/resources/FallbackResourceManager.java
index 670d701..261fe51 100644
--- a/src/net/minecraft/server/packs/resources/FallbackResourceManager.java
+++ b/src/net/minecraft/server/packs/resources/FallbackResourceManager.java
@@ -5,7 +5,9 @@ import java.io.PrintStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FilterInputStream;
 import org.apache.logging.log4j.LogManager;
+import java.util.stream.Stream;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Collection;
 import java.util.function.Predicate;
 import java.util.Iterator;
@@ -17,24 +19,24 @@ import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 import com.google.common.collect.Lists;
 import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.Pack;
+import net.minecraft.server.packs.PackResources;
 import java.util.List;
 import org.apache.logging.log4j.Logger;
 
 public class FallbackResourceManager implements ResourceManager {
     private static final Logger LOGGER;
-    protected final List<Pack> fallbacks;
+    protected final List<PackResources> fallbacks;
     private final PackType type;
     private final String namespace;
     
-    public FallbackResourceManager(final PackType yf, final String string) {
+    public FallbackResourceManager(final PackType aaf, final String string) {
         this.fallbacks = Lists.newArrayList();
-        this.type = yf;
+        this.type = aaf;
         this.namespace = string;
     }
     
-    public void add(final Pack ye) {
-        this.fallbacks.add(ye);
+    public void add(final PackResources aae) {
+        this.fallbacks.add(aae);
     }
     
     @Override
@@ -43,84 +45,97 @@ public class FallbackResourceManager implements ResourceManager {
     }
     
     @Override
-    public Resource getResource(final ResourceLocation sm) throws IOException {
-        this.validateLocation(sm);
-        Pack ye3 = null;
-        final ResourceLocation sm2 = getMetadataLocation(sm);
+    public Resource getResource(final ResourceLocation uh) throws IOException {
+        this.validateLocation(uh);
+        PackResources aae3 = null;
+        final ResourceLocation uh2 = getMetadataLocation(uh);
         for (int integer5 = this.fallbacks.size() - 1; integer5 >= 0; --integer5) {
-            final Pack ye4 = this.fallbacks.get(integer5);
-            if (ye3 == null && ye4.hasResource(this.type, sm2)) {
-                ye3 = ye4;
+            final PackResources aae4 = this.fallbacks.get(integer5);
+            if (aae3 == null && aae4.hasResource(this.type, uh2)) {
+                aae3 = aae4;
             }
-            if (ye4.hasResource(this.type, sm)) {
+            if (aae4.hasResource(this.type, uh)) {
                 InputStream inputStream7 = null;
-                if (ye3 != null) {
-                    inputStream7 = this.getWrappedResource(sm2, ye3);
+                if (aae3 != null) {
+                    inputStream7 = this.getWrappedResource(uh2, aae3);
                 }
-                return new SimpleResource(ye4.getName(), sm, this.getWrappedResource(sm, ye4), inputStream7);
+                return new SimpleResource(aae4.getName(), uh, this.getWrappedResource(uh, aae4), inputStream7);
             }
         }
-        throw new FileNotFoundException(sm.toString());
+        throw new FileNotFoundException(uh.toString());
     }
     
     @Override
-    public boolean hasResource(final ResourceLocation sm) {
-        if (!this.isValidLocation(sm)) {
+    public boolean hasResource(final ResourceLocation uh) {
+        if (!this.isValidLocation(uh)) {
             return false;
         }
         for (int integer3 = this.fallbacks.size() - 1; integer3 >= 0; --integer3) {
-            final Pack ye4 = this.fallbacks.get(integer3);
-            if (ye4.hasResource(this.type, sm)) {
+            final PackResources aae4 = this.fallbacks.get(integer3);
+            if (aae4.hasResource(this.type, uh)) {
                 return true;
             }
         }
         return false;
     }
     
-    protected InputStream getWrappedResource(final ResourceLocation sm, final Pack ye) throws IOException {
-        final InputStream inputStream4 = ye.getResource(this.type, sm);
-        return FallbackResourceManager.LOGGER.isDebugEnabled() ? new LeakedResourceWarningInputStream(inputStream4, sm, ye.getName()) : inputStream4;
+    protected InputStream getWrappedResource(final ResourceLocation uh, final PackResources aae) throws IOException {
+        final InputStream inputStream4 = aae.getResource(this.type, uh);
+        return FallbackResourceManager.LOGGER.isDebugEnabled() ? new LeakedResourceWarningInputStream(inputStream4, uh, aae.getName()) : inputStream4;
     }
     
-    private void validateLocation(final ResourceLocation sm) throws IOException {
-        if (!this.isValidLocation(sm)) {
-            throw new IOException("Invalid relative path to resource: " + sm);
+    private void validateLocation(final ResourceLocation uh) throws IOException {
+        if (!this.isValidLocation(uh)) {
+            throw new IOException("Invalid relative path to resource: " + uh);
         }
     }
     
-    private boolean isValidLocation(final ResourceLocation sm) {
-        return !sm.getPath().contains("..");
+    private boolean isValidLocation(final ResourceLocation uh) {
+        return !uh.getPath().contains("..");
     }
     
     @Override
-    public List<Resource> getResources(final ResourceLocation sm) throws IOException {
-        this.validateLocation(sm);
+    public List<Resource> getResources(final ResourceLocation uh) throws IOException {
+        this.validateLocation(uh);
         final List<Resource> list3 = Lists.newArrayList();
-        final ResourceLocation sm2 = getMetadataLocation(sm);
-        for (final Pack ye6 : this.fallbacks) {
-            if (ye6.hasResource(this.type, sm)) {
-                final InputStream inputStream7 = ye6.hasResource(this.type, sm2) ? this.getWrappedResource(sm2, ye6) : null;
-                list3.add(new SimpleResource(ye6.getName(), sm, this.getWrappedResource(sm, ye6), inputStream7));
+        final ResourceLocation uh2 = getMetadataLocation(uh);
+        for (final PackResources aae6 : this.fallbacks) {
+            if (aae6.hasResource(this.type, uh)) {
+                final InputStream inputStream7 = aae6.hasResource(this.type, uh2) ? this.getWrappedResource(uh2, aae6) : null;
+                list3.add(new SimpleResource(aae6.getName(), uh, this.getWrappedResource(uh, aae6), inputStream7));
             }
         }
         if (list3.isEmpty()) {
-            throw new FileNotFoundException(sm.toString());
+            throw new FileNotFoundException(uh.toString());
         }
         return list3;
     }
     
+    @Override
+    public Collection<ResourceLocation> listResources(final ResourceLocation uh, final Predicate<String> predicate) {
+        if (Objects.equals(uh.getNamespace(), this.namespace)) {
+            return this.listResources(uh.getPath(), predicate);
+        }
+        return ImmutableSet.of();
+    }
+    
     @Override
     public Collection<ResourceLocation> listResources(final String string, final Predicate<String> predicate) {
         final List<ResourceLocation> list4 = Lists.newArrayList();
-        for (final Pack ye6 : this.fallbacks) {
-            list4.addAll(ye6.getResources(this.type, this.namespace, string, Integer.MAX_VALUE, predicate));
+        for (final PackResources aae6 : this.fallbacks) {
+            list4.addAll(aae6.getResources(this.type, this.namespace, string, Integer.MAX_VALUE, predicate));
         }
         Collections.<ResourceLocation>sort(list4);
         return list4;
     }
     
-    static ResourceLocation getMetadataLocation(final ResourceLocation sm) {
-        return new ResourceLocation(sm.getNamespace(), sm.getPath() + ".mcmeta");
+    @Override
+    public Stream<PackResources> listPacks() {
+        return this.fallbacks.stream();
+    }
+    
+    static ResourceLocation getMetadataLocation(final ResourceLocation uh) {
+        return new ResourceLocation(uh.getNamespace(), uh.getPath() + ".mcmeta");
     }
     
     static {
@@ -131,11 +146,11 @@ public class FallbackResourceManager implements ResourceManager {
         private final String message;
         private boolean closed;
         
-        public LeakedResourceWarningInputStream(final InputStream inputStream, final ResourceLocation sm, final String string) {
+        public LeakedResourceWarningInputStream(final InputStream inputStream, final ResourceLocation uh, final String string) {
             super(inputStream);
             final ByteArrayOutputStream byteArrayOutputStream5 = new ByteArrayOutputStream();
             new Exception().printStackTrace(new PrintStream(byteArrayOutputStream5));
-            this.message = "Leaked resource: '" + sm + "' loaded from pack: '" + string + "'\n" + byteArrayOutputStream5;
+            this.message = "Leaked resource: '" + uh + "' loaded from pack: '" + string + "'\n" + byteArrayOutputStream5;
         }
         
         @Override
diff --git a/src/net/minecraft/server/packs/resources/PreparableReloadListener.java b/src/net/minecraft/server/packs/resources/PreparableReloadListener.java
index 2042c16..a44095b 100644
--- a/src/net/minecraft/server/packs/resources/PreparableReloadListener.java
+++ b/src/net/minecraft/server/packs/resources/PreparableReloadListener.java
@@ -5,7 +5,7 @@ import java.util.concurrent.Executor;
 import net.minecraft.util.profiling.ProfilerFiller;
 
 public interface PreparableReloadListener {
-    CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager zb, final ProfilerFiller aio3, final ProfilerFiller aio4, final Executor executor5, final Executor executor6);
+    CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager abc, final ProfilerFiller ami3, final ProfilerFiller ami4, final Executor executor5, final Executor executor6);
     
     default String getName() {
         return this.getClass().getSimpleName();
diff --git a/src/net/minecraft/server/packs/resources/ProfiledReloadInstance.java b/src/net/minecraft/server/packs/resources/ProfiledReloadInstance.java
index bcd301a..627602e 100644
--- a/src/net/minecraft/server/packs/resources/ProfiledReloadInstance.java
+++ b/src/net/minecraft/server/packs/resources/ProfiledReloadInstance.java
@@ -20,22 +20,22 @@ public class ProfiledReloadInstance extends SimpleReloadInstance<State> {
     private static final Logger LOGGER;
     private final Stopwatch total;
     
-    public ProfiledReloadInstance(final ResourceManager zb, final List<PreparableReloadListener> list, final Executor executor3, final Executor executor4, final CompletableFuture<Unit> completableFuture) {
+    public ProfiledReloadInstance(final ResourceManager abc, final List<PreparableReloadListener> list, final Executor executor3, final Executor executor4, final CompletableFuture<Unit> completableFuture) {
         final AtomicLong atomicLong7;
         final AtomicLong atomicLong8;
-        final ActiveProfiler aih9;
-        final ActiveProfiler aih10;
+        final ActiveProfiler amb9;
+        final ActiveProfiler amb10;
         final long long3;
         final AtomicLong atomicLong9;
         final long long4;
         final AtomicLong atomicLong10;
         final CompletableFuture<Void> completableFuture2;
-        super(executor3, executor4, zb, list, (a, zb, yw, executor5, executor6) -> {
+        super(executor3, executor4, abc, list, (a, abc, aax, executor5, executor6) -> {
             atomicLong7 = new AtomicLong();
             atomicLong8 = new AtomicLong();
-            aih9 = new ActiveProfiler(Util.getNanos(), () -> 0, false);
-            aih10 = new ActiveProfiler(Util.getNanos(), () -> 0, false);
-            completableFuture2 = yw.reload(a, zb, aih9, aih10, runnable -> executor5.execute(() -> {
+            amb9 = new ActiveProfiler(Util.timeSource, () -> 0, false);
+            amb10 = new ActiveProfiler(Util.timeSource, () -> 0, false);
+            completableFuture2 = aax.reload(a, abc, amb9, amb10, runnable -> executor5.execute(() -> {
                 long3 = Util.getNanos();
                 runnable.run();
                 atomicLong9.addAndGet(Util.getNanos() - long3);
@@ -44,7 +44,7 @@ public class ProfiledReloadInstance extends SimpleReloadInstance<State> {
                 runnable.run();
                 atomicLong10.addAndGet(Util.getNanos() - long4);
             }));
-            return completableFuture2.thenApplyAsync(void6 -> new State(yw.getName(), aih9.getResults(), aih10.getResults(), atomicLong7, atomicLong8), executor4);
+            return completableFuture2.thenApplyAsync(void6 -> new State(aax.getName(), amb9.getResults(), amb10.getResults(), atomicLong7, atomicLong8), executor4);
         }, completableFuture);
         (this.total = Stopwatch.createUnstarted()).start();
         this.allDone.thenAcceptAsync(this::finish, executor4);
@@ -55,8 +55,8 @@ public class ProfiledReloadInstance extends SimpleReloadInstance<State> {
         int integer3 = 0;
         ProfiledReloadInstance.LOGGER.info("Resource reload finished after " + this.total.elapsed(TimeUnit.MILLISECONDS) + " ms");
         for (final State a5 : list) {
-            final ProfileResults ain6 = a5.preparationResult;
-            final ProfileResults ain7 = a5.reloadResult;
+            final ProfileResults amh6 = a5.preparationResult;
+            final ProfileResults amh7 = a5.reloadResult;
             final int integer4 = (int)(a5.preparationNanos.get() / 1000000.0);
             final int integer5 = (int)(a5.reloadNanos.get() / 1000000.0);
             final int integer6 = integer4 + integer5;
@@ -78,10 +78,10 @@ public class ProfiledReloadInstance extends SimpleReloadInstance<State> {
         private final AtomicLong preparationNanos;
         private final AtomicLong reloadNanos;
         
-        private State(final String string, final ProfileResults ain2, final ProfileResults ain3, final AtomicLong atomicLong4, final AtomicLong atomicLong5) {
+        private State(final String string, final ProfileResults amh2, final ProfileResults amh3, final AtomicLong atomicLong4, final AtomicLong atomicLong5) {
             this.name = string;
-            this.preparationResult = ain2;
-            this.reloadResult = ain3;
+            this.preparationResult = amh2;
+            this.reloadResult = amh3;
             this.preparationNanos = atomicLong4;
             this.reloadNanos = atomicLong5;
         }
diff --git a/src/net/minecraft/server/packs/resources/ReloadableResourceManager.java b/src/net/minecraft/server/packs/resources/ReloadableResourceManager.java
index d352dfb..7587658 100644
--- a/src/net/minecraft/server/packs/resources/ReloadableResourceManager.java
+++ b/src/net/minecraft/server/packs/resources/ReloadableResourceManager.java
@@ -2,14 +2,18 @@ package net.minecraft.server.packs.resources;
 
 import net.minecraft.util.Unit;
 import java.util.concurrent.CompletableFuture;
-import net.minecraft.server.packs.Pack;
+import net.minecraft.server.packs.PackResources;
 import java.util.List;
 import java.util.concurrent.Executor;
 
-public interface ReloadableResourceManager extends ResourceManager {
-    CompletableFuture<Unit> reload(final Executor executor1, final Executor executor2, final List<Pack> list, final CompletableFuture<Unit> completableFuture);
+public interface ReloadableResourceManager extends ResourceManager, AutoCloseable {
+    default CompletableFuture<Unit> reload(final Executor executor1, final Executor executor2, final List<PackResources> list, final CompletableFuture<Unit> completableFuture) {
+        return this.createFullReload(executor1, executor2, completableFuture, list).done();
+    }
     
-    ReloadInstance createFullReload(final Executor executor1, final Executor executor2, final CompletableFuture<Unit> completableFuture, final List<Pack> list);
+    ReloadInstance createFullReload(final Executor executor1, final Executor executor2, final CompletableFuture<Unit> completableFuture, final List<PackResources> list);
     
-    void registerReloadListener(final PreparableReloadListener yw);
+    void registerReloadListener(final PreparableReloadListener aax);
+    
+    void close();
 }
diff --git a/src/net/minecraft/server/packs/resources/Resource.java b/src/net/minecraft/server/packs/resources/Resource.java
index d02f817..6dbea73 100644
--- a/src/net/minecraft/server/packs/resources/Resource.java
+++ b/src/net/minecraft/server/packs/resources/Resource.java
@@ -12,7 +12,7 @@ public interface Resource extends Closeable {
     InputStream getInputStream();
     
     @Nullable
-     <T> T getMetadata(final MetadataSectionSerializer<T> yi);
+     <T> T getMetadata(final MetadataSectionSerializer<T> aai);
     
     String getSourceName();
 }
diff --git a/src/net/minecraft/server/packs/resources/ResourceManager.java b/src/net/minecraft/server/packs/resources/ResourceManager.java
index 8a881b0..5466c3d 100644
--- a/src/net/minecraft/server/packs/resources/ResourceManager.java
+++ b/src/net/minecraft/server/packs/resources/ResourceManager.java
@@ -1,5 +1,10 @@
 package net.minecraft.server.packs.resources;
 
+import com.google.common.collect.ImmutableList;
+import java.io.FileNotFoundException;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.server.packs.PackResources;
+import java.util.stream.Stream;
 import java.util.Collection;
 import java.util.function.Predicate;
 import java.util.List;
@@ -10,11 +15,54 @@ import java.util.Set;
 public interface ResourceManager {
     Set<String> getNamespaces();
     
-    Resource getResource(final ResourceLocation sm) throws IOException;
+    Resource getResource(final ResourceLocation uh) throws IOException;
     
-    boolean hasResource(final ResourceLocation sm);
+    boolean hasResource(final ResourceLocation uh);
     
-    List<Resource> getResources(final ResourceLocation sm) throws IOException;
+    List<Resource> getResources(final ResourceLocation uh) throws IOException;
+    
+    Collection<ResourceLocation> listResources(final ResourceLocation uh, final Predicate<String> predicate);
     
     Collection<ResourceLocation> listResources(final String string, final Predicate<String> predicate);
+    
+    Stream<PackResources> listPacks();
+    
+    public enum Empty implements ResourceManager {
+        INSTANCE;
+        
+        @Override
+        public Set<String> getNamespaces() {
+            return ImmutableSet.of();
+        }
+        
+        @Override
+        public Resource getResource(final ResourceLocation uh) throws IOException {
+            throw new FileNotFoundException(uh.toString());
+        }
+        
+        @Override
+        public boolean hasResource(final ResourceLocation uh) {
+            return false;
+        }
+        
+        @Override
+        public List<Resource> getResources(final ResourceLocation uh) {
+            return ImmutableList.of();
+        }
+        
+        @Override
+        public Collection<ResourceLocation> listResources(final ResourceLocation uh, final Predicate<String> predicate) {
+            return ImmutableSet.of();
+        }
+        
+        @Override
+        public Collection<ResourceLocation> listResources(final String string, final Predicate<String> predicate) {
+            return ImmutableSet.of();
+        }
+        
+        @Override
+        public Stream<PackResources> listPacks() {
+            return Stream.<PackResources>of(new PackResources[0]);
+        }
+    }
 }
diff --git a/src/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java b/src/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java
index d729832..0bfa23a 100644
--- a/src/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java
+++ b/src/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java
@@ -6,9 +6,15 @@ import java.util.concurrent.Executor;
 import net.minecraft.util.profiling.ProfilerFiller;
 
 public interface ResourceManagerReloadListener extends PreparableReloadListener {
-    default CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager zb, final ProfilerFiller aio3, final ProfilerFiller aio4, final Executor executor5, final Executor executor6) {
-        return a.<Unit>wait(Unit.INSTANCE).thenRunAsync(() -> this.onResourceManagerReload(zb), executor6);
+    default CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager abc, final ProfilerFiller ami3, final ProfilerFiller ami4, final Executor executor5, final Executor executor6) {
+        return a.<Unit>wait(Unit.INSTANCE).thenRunAsync(() -> {
+            ami4.startTick();
+            ami4.push("listener");
+            this.onResourceManagerReload(abc);
+            ami4.pop();
+            ami4.endTick();
+        }, executor6);
     }
     
-    void onResourceManagerReload(final ResourceManager zb);
+    void onResourceManagerReload(final ResourceManager abc);
 }
diff --git a/src/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java b/src/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java
index 0bc9b36..1280ea4 100644
--- a/src/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java
+++ b/src/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java
@@ -14,11 +14,11 @@ import com.google.common.collect.Maps;
 import net.minecraft.util.profiling.ProfilerFiller;
 import com.google.gson.Gson;
 import org.apache.logging.log4j.Logger;
-import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
 
-public abstract class SimpleJsonResourceReloadListener extends SimplePreparableReloadListener<Map<ResourceLocation, JsonObject>> {
+public abstract class SimpleJsonResourceReloadListener extends SimplePreparableReloadListener<Map<ResourceLocation, JsonElement>> {
     private static final Logger LOGGER;
     private static final int PATH_SUFFIX_LENGTH;
     private final Gson gson;
@@ -30,30 +30,30 @@ public abstract class SimpleJsonResourceReloadListener extends SimplePreparableR
     }
     
     @Override
-    protected Map<ResourceLocation, JsonObject> prepare(final ResourceManager zb, final ProfilerFiller aio) {
-        final Map<ResourceLocation, JsonObject> map4 = Maps.newHashMap();
+    protected Map<ResourceLocation, JsonElement> prepare(final ResourceManager abc, final ProfilerFiller ami) {
+        final Map<ResourceLocation, JsonElement> map4 = Maps.newHashMap();
         final int integer5 = this.directory.length() + 1;
-        for (final ResourceLocation sm7 : zb.listResources(this.directory, string -> string.endsWith(".json"))) {
-            final String string2 = sm7.getPath();
-            final ResourceLocation sm8 = new ResourceLocation(sm7.getNamespace(), string2.substring(integer5, string2.length() - SimpleJsonResourceReloadListener.PATH_SUFFIX_LENGTH));
-            try (final Resource za10 = zb.getResource(sm7);
-                 final InputStream inputStream12 = za10.getInputStream();
+        for (final ResourceLocation uh7 : abc.listResources(this.directory, string -> string.endsWith(".json"))) {
+            final String string2 = uh7.getPath();
+            final ResourceLocation uh8 = new ResourceLocation(uh7.getNamespace(), string2.substring(integer5, string2.length() - SimpleJsonResourceReloadListener.PATH_SUFFIX_LENGTH));
+            try (final Resource abb10 = abc.getResource(uh7);
+                 final InputStream inputStream12 = abb10.getInputStream();
                  final Reader reader14 = new BufferedReader(new InputStreamReader(inputStream12, StandardCharsets.UTF_8))) {
-                final JsonObject jsonObject16 = GsonHelper.<JsonObject>fromJson(this.gson, reader14, JsonObject.class);
-                if (jsonObject16 != null) {
-                    final JsonObject jsonObject17 = map4.put(sm8, jsonObject16);
-                    if (jsonObject17 != null) {
-                        throw new IllegalStateException("Duplicate data file ignored with ID " + sm8);
+                final JsonElement jsonElement16 = GsonHelper.<JsonElement>fromJson(this.gson, reader14, JsonElement.class);
+                if (jsonElement16 != null) {
+                    final JsonElement jsonElement17 = map4.put(uh8, jsonElement16);
+                    if (jsonElement17 != null) {
+                        throw new IllegalStateException("Duplicate data file ignored with ID " + uh8);
                     }
                 }
                 else {
-                    SimpleJsonResourceReloadListener.LOGGER.error("Couldn't load data file {} from {} as it's null or empty", sm8, sm7);
+                    SimpleJsonResourceReloadListener.LOGGER.error("Couldn't load data file {} from {} as it's null or empty", uh8, uh7);
                 }
             }
             catch (JsonParseException | IllegalArgumentException | IOException ex2) {
                 final Exception ex;
                 final Exception exception10 = ex;
-                SimpleJsonResourceReloadListener.LOGGER.error("Couldn't parse data file {} from {}", sm8, sm7, exception10);
+                SimpleJsonResourceReloadListener.LOGGER.error("Couldn't parse data file {} from {}", uh8, uh7, exception10);
             }
         }
         return map4;
diff --git a/src/net/minecraft/server/packs/resources/SimplePreparableReloadListener.java b/src/net/minecraft/server/packs/resources/SimplePreparableReloadListener.java
index 4553990..2cb7771 100644
--- a/src/net/minecraft/server/packs/resources/SimplePreparableReloadListener.java
+++ b/src/net/minecraft/server/packs/resources/SimplePreparableReloadListener.java
@@ -8,11 +8,11 @@ import net.minecraft.util.profiling.ProfilerFiller;
 
 public abstract class SimplePreparableReloadListener<T> implements PreparableReloadListener {
     @Override
-    public final CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager zb, final ProfilerFiller aio3, final ProfilerFiller aio4, final Executor executor5, final Executor executor6) {
-        return CompletableFuture.supplyAsync(() -> this.prepare(zb, aio3), executor5).thenCompose(a::wait).thenAcceptAsync(object -> this.apply(object, zb, aio4), executor6);
+    public final CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager abc, final ProfilerFiller ami3, final ProfilerFiller ami4, final Executor executor5, final Executor executor6) {
+        return CompletableFuture.supplyAsync(() -> this.prepare(abc, ami3), executor5).thenCompose(a::wait).thenAcceptAsync(object -> this.apply(object, abc, ami4), executor6);
     }
     
-    protected abstract T prepare(final ResourceManager zb, final ProfilerFiller aio);
+    protected abstract T prepare(final ResourceManager abc, final ProfilerFiller ami);
     
-    protected abstract void apply(final T object, final ResourceManager zb, final ProfilerFiller aio);
+    protected abstract void apply(final T object, final ResourceManager abc, final ProfilerFiller ami);
 }
diff --git a/src/net/minecraft/server/packs/resources/SimpleReloadInstance.java b/src/net/minecraft/server/packs/resources/SimpleReloadInstance.java
index 6d0d4b7..0b0a013 100644
--- a/src/net/minecraft/server/packs/resources/SimpleReloadInstance.java
+++ b/src/net/minecraft/server/packs/resources/SimpleReloadInstance.java
@@ -25,36 +25,36 @@ public class SimpleReloadInstance<S> implements ReloadInstance {
     private final AtomicInteger startedTaskCounter;
     private final AtomicInteger doneTaskCounter;
     
-    public static SimpleReloadInstance<Void> of(final ResourceManager zb, final List<PreparableReloadListener> list, final Executor executor3, final Executor executor4, final CompletableFuture<Unit> completableFuture) {
-        return new SimpleReloadInstance<Void>(executor3, executor4, zb, list, (a, zb, yw, executor5, executor6) -> yw.reload(a, zb, InactiveProfiler.INACTIVE, InactiveProfiler.INACTIVE, executor3, executor6), completableFuture);
+    public static SimpleReloadInstance<Void> of(final ResourceManager abc, final List<PreparableReloadListener> list, final Executor executor3, final Executor executor4, final CompletableFuture<Unit> completableFuture) {
+        return new SimpleReloadInstance<Void>(executor3, executor4, abc, list, (a, abc, aax, executor5, executor6) -> aax.reload(a, abc, InactiveProfiler.INSTANCE, InactiveProfiler.INSTANCE, executor3, executor6), completableFuture);
     }
     
-    protected SimpleReloadInstance(final Executor executor1, final Executor executor2, final ResourceManager zb, final List<PreparableReloadListener> list, final StateFactory<S> a, final CompletableFuture<Unit> completableFuture) {
+    protected SimpleReloadInstance(final Executor executor1, final Executor executor2, final ResourceManager abc, final List<PreparableReloadListener> list, final StateFactory<S> a, final CompletableFuture<Unit> completableFuture) {
         this.allPreparations = new CompletableFuture<Unit>();
         this.startedTaskCounter = new AtomicInteger();
         this.doneTaskCounter = new AtomicInteger();
-        this.resourceManager = zb;
+        this.resourceManager = abc;
         this.listenerCount = list.size();
         this.startedTaskCounter.incrementAndGet();
         completableFuture.thenRun(this.doneTaskCounter::incrementAndGet);
         final List<CompletableFuture<S>> list2 = Lists.newArrayList();
         CompletableFuture<?> completableFuture2 = completableFuture;
         this.preparingListeners = Sets.newHashSet(list);
-        for (final PreparableReloadListener yw11 : list) {
+        for (final PreparableReloadListener aax11 : list) {
             final CompletableFuture<?> completableFuture3 = completableFuture2;
             final CompletableFuture<S> completableFuture4 = a.create(new PreparableReloadListener.PreparationBarrier() {
                 @Override
                 public <T> CompletableFuture<T> wait(final T object) {
                     executor2.execute(() -> {
-                        SimpleReloadInstance.this.preparingListeners.remove(yw11);
+                        SimpleReloadInstance.this.preparingListeners.remove(aax11);
                         if (SimpleReloadInstance.this.preparingListeners.isEmpty()) {
                             SimpleReloadInstance.this.allPreparations.complete(Unit.INSTANCE);
                         }
                         return;
                     });
-                    return SimpleReloadInstance.this.allPreparations.<Object, T>thenCombine(completableFuture3, (aca, object3) -> object);
+                    return SimpleReloadInstance.this.allPreparations.<Object, T>thenCombine(completableFuture3, (ael, object3) -> object);
                 }
-            }, zb, yw11, runnable -> {
+            }, abc, aax11, runnable -> {
                 this.startedTaskCounter.incrementAndGet();
                 executor1.execute(() -> {
                     runnable.run();
@@ -106,6 +106,6 @@ public class SimpleReloadInstance<S> implements ReloadInstance {
     }
     
     public interface StateFactory<S> {
-        CompletableFuture<S> create(final PreparableReloadListener.PreparationBarrier a, final ResourceManager zb, final PreparableReloadListener yw, final Executor executor4, final Executor executor5);
+        CompletableFuture<S> create(final PreparableReloadListener.PreparationBarrier a, final ResourceManager abc, final PreparableReloadListener aax, final Executor executor4, final Executor executor5);
     }
 }
diff --git a/src/net/minecraft/server/packs/resources/SimpleReloadableResourceManager.java b/src/net/minecraft/server/packs/resources/SimpleReloadableResourceManager.java
index 8a38f7b..2c9212a 100644
--- a/src/net/minecraft/server/packs/resources/SimpleReloadableResourceManager.java
+++ b/src/net/minecraft/server/packs/resources/SimpleReloadableResourceManager.java
@@ -4,21 +4,24 @@ import org.apache.logging.log4j.LogManager;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.function.Function;
+import java.util.stream.Stream;
+import org.apache.logging.log4j.util.Supplier;
 import net.minecraft.util.Unit;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.Collections;
+import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
 import java.util.function.Predicate;
 import java.io.IOException;
 import java.io.FileNotFoundException;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Iterator;
-import net.minecraft.server.packs.Pack;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.PackResources;
 import java.util.Set;
 import java.util.List;
 import java.util.Map;
@@ -30,27 +33,28 @@ public class SimpleReloadableResourceManager implements ReloadableResourceManage
     private final List<PreparableReloadListener> listeners;
     private final List<PreparableReloadListener> recentlyRegistered;
     private final Set<String> namespaces;
+    private final List<PackResources> packs;
     private final PackType type;
-    private final Thread mainThread;
     
-    public SimpleReloadableResourceManager(final PackType yf, final Thread thread) {
+    public SimpleReloadableResourceManager(final PackType aaf) {
         this.namespacedPacks = Maps.newHashMap();
         this.listeners = Lists.newArrayList();
         this.recentlyRegistered = Lists.newArrayList();
         this.namespaces = Sets.newLinkedHashSet();
-        this.type = yf;
-        this.mainThread = thread;
+        this.packs = Lists.newArrayList();
+        this.type = aaf;
     }
     
-    public void add(final Pack ye) {
-        for (final String string4 : ye.getNamespaces(this.type)) {
+    public void add(final PackResources aae) {
+        this.packs.add(aae);
+        for (final String string4 : aae.getNamespaces(this.type)) {
             this.namespaces.add(string4);
-            FallbackResourceManager yv5 = this.namespacedPacks.get(string4);
-            if (yv5 == null) {
-                yv5 = new FallbackResourceManager(this.type, string4);
-                this.namespacedPacks.put(string4, yv5);
+            FallbackResourceManager aaw5 = this.namespacedPacks.get(string4);
+            if (aaw5 == null) {
+                aaw5 = new FallbackResourceManager(this.type, string4);
+                this.namespacedPacks.put(string4, aaw5);
             }
-            yv5.add(ye);
+            aaw5.add(aae);
         }
     }
     
@@ -60,34 +64,43 @@ public class SimpleReloadableResourceManager implements ReloadableResourceManage
     }
     
     @Override
-    public Resource getResource(final ResourceLocation sm) throws IOException {
-        final ResourceManager zb3 = this.namespacedPacks.get(sm.getNamespace());
-        if (zb3 != null) {
-            return zb3.getResource(sm);
+    public Resource getResource(final ResourceLocation uh) throws IOException {
+        final ResourceManager abc3 = this.namespacedPacks.get(uh.getNamespace());
+        if (abc3 != null) {
+            return abc3.getResource(uh);
         }
-        throw new FileNotFoundException(sm.toString());
+        throw new FileNotFoundException(uh.toString());
     }
     
     @Override
-    public boolean hasResource(final ResourceLocation sm) {
-        final ResourceManager zb3 = this.namespacedPacks.get(sm.getNamespace());
-        return zb3 != null && zb3.hasResource(sm);
+    public boolean hasResource(final ResourceLocation uh) {
+        final ResourceManager abc3 = this.namespacedPacks.get(uh.getNamespace());
+        return abc3 != null && abc3.hasResource(uh);
     }
     
     @Override
-    public List<Resource> getResources(final ResourceLocation sm) throws IOException {
-        final ResourceManager zb3 = this.namespacedPacks.get(sm.getNamespace());
-        if (zb3 != null) {
-            return zb3.getResources(sm);
+    public List<Resource> getResources(final ResourceLocation uh) throws IOException {
+        final ResourceManager abc3 = this.namespacedPacks.get(uh.getNamespace());
+        if (abc3 != null) {
+            return abc3.getResources(uh);
         }
-        throw new FileNotFoundException(sm.toString());
+        throw new FileNotFoundException(uh.toString());
+    }
+    
+    @Override
+    public Collection<ResourceLocation> listResources(final ResourceLocation uh, final Predicate<String> predicate) {
+        final ResourceManager abc4 = this.namespacedPacks.get(uh.getNamespace());
+        if (abc4 != null) {
+            return abc4.listResources(uh.getPath(), predicate);
+        }
+        return ImmutableSet.of();
     }
     
     @Override
     public Collection<ResourceLocation> listResources(final String string, final Predicate<String> predicate) {
         final Set<ResourceLocation> set4 = Sets.newHashSet();
-        for (final FallbackResourceManager yv6 : this.namespacedPacks.values()) {
-            set4.addAll(yv6.listResources(string, predicate));
+        for (final FallbackResourceManager aaw6 : this.namespacedPacks.values()) {
+            set4.addAll(aaw6.listResources(string, predicate));
         }
         final List<ResourceLocation> list5 = Lists.newArrayList(set4);
         Collections.<ResourceLocation>sort(list5);
@@ -97,61 +110,67 @@ public class SimpleReloadableResourceManager implements ReloadableResourceManage
     private void clear() {
         this.namespacedPacks.clear();
         this.namespaces.clear();
+        this.packs.forEach(PackResources::close);
+        this.packs.clear();
     }
     
     @Override
-    public CompletableFuture<Unit> reload(final Executor executor1, final Executor executor2, final List<Pack> list, final CompletableFuture<Unit> completableFuture) {
-        final ReloadInstance yy6 = this.createFullReload(executor1, executor2, completableFuture, list);
-        return yy6.done();
+    public void close() {
+        this.clear();
     }
     
     @Override
-    public void registerReloadListener(final PreparableReloadListener yw) {
-        this.listeners.add(yw);
-        this.recentlyRegistered.add(yw);
+    public void registerReloadListener(final PreparableReloadListener aax) {
+        this.listeners.add(aax);
+        this.recentlyRegistered.add(aax);
     }
     
     protected ReloadInstance createReload(final Executor executor1, final Executor executor2, final List<PreparableReloadListener> list, final CompletableFuture<Unit> completableFuture) {
-        ReloadInstance yy6;
+        ReloadInstance aaz6;
         if (SimpleReloadableResourceManager.LOGGER.isDebugEnabled()) {
-            yy6 = new ProfiledReloadInstance(this, Lists.newArrayList(list), executor1, executor2, completableFuture);
+            aaz6 = new ProfiledReloadInstance(this, Lists.newArrayList(list), executor1, executor2, completableFuture);
         }
         else {
-            yy6 = SimpleReloadInstance.of(this, Lists.newArrayList(list), executor1, executor2, completableFuture);
+            aaz6 = SimpleReloadInstance.of(this, Lists.newArrayList(list), executor1, executor2, completableFuture);
         }
         this.recentlyRegistered.clear();
-        return yy6;
+        return aaz6;
     }
     
     @Override
-    public ReloadInstance createFullReload(final Executor executor1, final Executor executor2, final CompletableFuture<Unit> completableFuture, final List<Pack> list) {
+    public ReloadInstance createFullReload(final Executor executor1, final Executor executor2, final CompletableFuture<Unit> completableFuture, final List<PackResources> list) {
         this.clear();
-        SimpleReloadableResourceManager.LOGGER.info("Reloading ResourceManager: {}", list.stream().map(Pack::getName).collect(Collectors.joining(", ")));
-        for (final Pack ye7 : list) {
+        SimpleReloadableResourceManager.LOGGER.info("Reloading ResourceManager: {}", new Supplier[] { () -> list.stream().map(PackResources::getName).collect(Collectors.joining(", ")) });
+        for (final PackResources aae7 : list) {
             try {
-                this.add(ye7);
+                this.add(aae7);
             }
             catch (Exception exception8) {
-                SimpleReloadableResourceManager.LOGGER.error("Failed to add resource pack {}", ye7.getName(), exception8);
-                return new FailingReloadInstance(new ResourcePackLoadingFailure(ye7, exception8));
+                SimpleReloadableResourceManager.LOGGER.error("Failed to add resource pack {}", aae7.getName(), exception8);
+                return new FailingReloadInstance(new ResourcePackLoadingFailure(aae7, exception8));
             }
         }
         return this.createReload(executor1, executor2, this.listeners, completableFuture);
     }
     
+    @Override
+    public Stream<PackResources> listPacks() {
+        return this.packs.stream();
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
     }
     
     public static class ResourcePackLoadingFailure extends RuntimeException {
-        private final Pack pack;
+        private final PackResources pack;
         
-        public ResourcePackLoadingFailure(final Pack ye, final Throwable throwable) {
-            super(ye.getName(), throwable);
-            this.pack = ye;
+        public ResourcePackLoadingFailure(final PackResources aae, final Throwable throwable) {
+            super(aae.getName(), throwable);
+            this.pack = aae;
         }
         
-        public Pack getPack() {
+        public PackResources getPack() {
             return this.pack;
         }
     }
diff --git a/src/net/minecraft/server/packs/resources/SimpleResource.java b/src/net/minecraft/server/packs/resources/SimpleResource.java
index a0b0c7b..83da69b 100644
--- a/src/net/minecraft/server/packs/resources/SimpleResource.java
+++ b/src/net/minecraft/server/packs/resources/SimpleResource.java
@@ -1,9 +1,5 @@
 package net.minecraft.server.packs.resources;
 
-import java.util.concurrent.Executors;
-import net.minecraft.DefaultUncaughtExceptionHandler;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.logging.log4j.LogManager;
 import java.io.IOException;
 import org.apache.commons.io.IOUtils;
 import net.minecraft.util.GsonHelper;
@@ -16,12 +12,8 @@ import javax.annotation.Nullable;
 import com.google.gson.JsonObject;
 import java.io.InputStream;
 import net.minecraft.resources.ResourceLocation;
-import java.util.concurrent.Executor;
-import org.apache.logging.log4j.Logger;
 
 public class SimpleResource implements Resource {
-    private static final Logger LOGGER;
-    public static final Executor IO_EXECUTOR;
     private final String sourceName;
     private final ResourceLocation location;
     private final InputStream resourceStream;
@@ -29,9 +21,9 @@ public class SimpleResource implements Resource {
     private boolean triedMetadata;
     private JsonObject metadata;
     
-    public SimpleResource(final String string, final ResourceLocation sm, final InputStream inputStream3, @Nullable final InputStream inputStream4) {
+    public SimpleResource(final String string, final ResourceLocation uh, final InputStream inputStream3, @Nullable final InputStream inputStream4) {
         this.sourceName = string;
-        this.location = sm;
+        this.location = uh;
         this.resourceStream = inputStream3;
         this.metadataStream = inputStream4;
     }
@@ -52,7 +44,7 @@ public class SimpleResource implements Resource {
     
     @Nullable
     @Override
-    public <T> T getMetadata(final MetadataSectionSerializer<T> yi) {
+    public <T> T getMetadata(final MetadataSectionSerializer<T> aai) {
         if (!this.hasMetadata()) {
             return null;
         }
@@ -70,8 +62,8 @@ public class SimpleResource implements Resource {
         if (this.metadata == null) {
             return null;
         }
-        final String string3 = yi.getMetadataSectionName();
-        return this.metadata.has(string3) ? yi.fromJson(GsonHelper.getAsJsonObject(this.metadata, string3)) : null;
+        final String string3 = aai.getMetadataSectionName();
+        return this.metadata.has(string3) ? aai.fromJson(GsonHelper.getAsJsonObject(this.metadata, string3)) : null;
     }
     
     @Override
@@ -87,24 +79,24 @@ public class SimpleResource implements Resource {
         if (!(object instanceof SimpleResource)) {
             return false;
         }
-        final SimpleResource zh3 = (SimpleResource)object;
+        final SimpleResource abi3 = (SimpleResource)object;
         Label_0054: {
             if (this.location != null) {
-                if (this.location.equals(zh3.location)) {
+                if (this.location.equals(abi3.location)) {
                     break Label_0054;
                 }
             }
-            else if (zh3.location == null) {
+            else if (abi3.location == null) {
                 break Label_0054;
             }
             return false;
         }
         if (this.sourceName != null) {
-            if (this.sourceName.equals(zh3.sourceName)) {
+            if (this.sourceName.equals(abi3.sourceName)) {
                 return true;
             }
         }
-        else if (zh3.sourceName == null) {
+        else if (abi3.sourceName == null) {
             return true;
         }
         return false;
@@ -124,9 +116,4 @@ public class SimpleResource implements Resource {
             this.metadataStream.close();
         }
     }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-        IO_EXECUTOR = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("Resource IO {0}").setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(SimpleResource.LOGGER)).build());
-    }
 }
diff --git a/src/net/minecraft/server/players/BanListEntry.java b/src/net/minecraft/server/players/BanListEntry.java
index 436d0cb..ad9f7a5 100644
--- a/src/net/minecraft/server/players/BanListEntry.java
+++ b/src/net/minecraft/server/players/BanListEntry.java
@@ -23,7 +23,7 @@ public abstract class BanListEntry<T> extends StoredUserEntry<T> {
     }
     
     protected BanListEntry(final T object, final JsonObject jsonObject) {
-        super(object, jsonObject);
+        super(object);
         Date date4;
         try {
             date4 = (jsonObject.has("created") ? BanListEntry.DATE_FORMAT.parse(jsonObject.get("created").getAsString()) : new Date());
diff --git a/src/net/minecraft/server/players/GameProfileCache.java b/src/net/minecraft/server/players/GameProfileCache.java
index 938d40a..f6dc8b7 100644
--- a/src/net/minecraft/server/players/GameProfileCache.java
+++ b/src/net/minecraft/server/players/GameProfileCache.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonSerializationContext;
+import java.lang.reflect.Type;
 import com.google.gson.JsonSerializer;
 import com.google.gson.JsonDeserializer;
 import com.google.common.collect.Iterators;
@@ -16,10 +17,8 @@ import java.io.BufferedReader;
 import org.apache.commons.io.IOUtils;
 import com.google.gson.JsonParseException;
 import java.io.FileNotFoundException;
-import java.lang.reflect.Type;
 import java.io.Reader;
 import net.minecraft.util.GsonHelper;
-import java.util.List;
 import com.google.common.io.Files;
 import java.nio.charset.StandardCharsets;
 import javax.annotation.Nullable;
@@ -32,7 +31,8 @@ import com.mojang.authlib.ProfileLookupCallback;
 import com.google.gson.GsonBuilder;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import java.lang.reflect.ParameterizedType;
+import java.util.List;
+import com.google.gson.reflect.TypeToken;
 import java.io.File;
 import com.google.gson.Gson;
 import com.mojang.authlib.GameProfileRepository;
@@ -51,7 +51,7 @@ public class GameProfileCache {
     private final GameProfileRepository profileRepository;
     protected final Gson gson;
     private final File file;
-    private static final ParameterizedType GAMEPROFILE_ENTRY_TYPE;
+    private static final TypeToken<List<GameProfileInfo>> GAMEPROFILE_ENTRY_TYPE;
     
     public GameProfileCache(final GameProfileRepository gameProfileRepository, final File file) {
         this.profilesByName = Maps.newHashMap();
@@ -211,22 +211,7 @@ public class GameProfileCache {
     
     static {
         DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
-        GAMEPROFILE_ENTRY_TYPE = new ParameterizedType() {
-            @Override
-            public Type[] getActualTypeArguments() {
-                return new Type[] { GameProfileInfo.class };
-            }
-            
-            @Override
-            public Type getRawType() {
-                return List.class;
-            }
-            
-            @Override
-            public Type getOwnerType() {
-                return null;
-            }
-        };
+        GAMEPROFILE_ENTRY_TYPE = new TypeToken<List<GameProfileInfo>>() {};
     }
     
     class Serializer implements JsonDeserializer<GameProfileInfo>, JsonSerializer<GameProfileInfo> {
diff --git a/src/net/minecraft/server/players/OldUsersConverter.java b/src/net/minecraft/server/players/OldUsersConverter.java
index f6e2a12..6773cd3 100644
--- a/src/net/minecraft/server/players/OldUsersConverter.java
+++ b/src/net/minecraft/server/players/OldUsersConverter.java
@@ -2,12 +2,13 @@ package net.minecraft.server.players;
 
 import org.apache.logging.log4j.LogManager;
 import java.text.ParseException;
+import net.minecraft.world.level.storage.LevelResource;
 import net.minecraft.server.dedicated.DedicatedServer;
+import javax.annotation.Nullable;
 import com.google.common.collect.Lists;
 import com.mojang.authlib.yggdrasil.ProfileNotFoundException;
 import java.util.Date;
 import com.google.common.collect.Maps;
-import java.io.FileNotFoundException;
 import net.minecraft.world.entity.player.Player;
 import java.util.UUID;
 import com.mojang.authlib.GameProfile;
@@ -63,14 +64,14 @@ public class OldUsersConverter {
     }
     
     public static boolean convertUserBanlist(final MinecraftServer minecraftServer) {
-        final UserBanList zt2 = new UserBanList(PlayerList.USERBANLIST_FILE);
+        final UserBanList abu2 = new UserBanList(PlayerList.USERBANLIST_FILE);
         if (OldUsersConverter.OLD_USERBANLIST.exists() && OldUsersConverter.OLD_USERBANLIST.isFile()) {
-            if (zt2.getFile().exists()) {
+            if (abu2.getFile().exists()) {
                 try {
-                    zt2.load();
+                    abu2.load();
                 }
-                catch (FileNotFoundException fileNotFoundException3) {
-                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", zt2.getFile().getName(), fileNotFoundException3);
+                catch (IOException iOException3) {
+                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", abu2.getFile().getName(), iOException3);
                 }
             }
             try {
@@ -88,7 +89,7 @@ public class OldUsersConverter {
                         final String string5 = (arr3.length > 2) ? arr3[2] : null;
                         final Date date5 = (arr3.length > 3) ? parseDate(arr3[3], null) : null;
                         final String string6 = (arr3.length > 4) ? arr3[4] : null;
-                        ((StoredUserList<K, UserBanListEntry>)zt2).add(new UserBanListEntry(gameProfile, date4, string5, date5, string6));
+                        ((StoredUserList<K, UserBanListEntry>)abu2).add(new UserBanListEntry(gameProfile, date4, string5, date5, string6));
                     }
                     
                     public void onProfileLookupFailed(final GameProfile gameProfile, final Exception exception) {
@@ -99,7 +100,7 @@ public class OldUsersConverter {
                     }
                 };
                 lookupPlayers(minecraftServer, map3.keySet(), profileLookupCallback4);
-                zt2.save();
+                abu2.save();
                 renameOldFile(OldUsersConverter.OLD_USERBANLIST);
             }
             catch (IOException iOException3) {
@@ -116,14 +117,14 @@ public class OldUsersConverter {
     }
     
     public static boolean convertIpBanlist(final MinecraftServer minecraftServer) {
-        final IpBanList zl2 = new IpBanList(PlayerList.IPBANLIST_FILE);
+        final IpBanList abm2 = new IpBanList(PlayerList.IPBANLIST_FILE);
         if (OldUsersConverter.OLD_IPBANLIST.exists() && OldUsersConverter.OLD_IPBANLIST.isFile()) {
-            if (zl2.getFile().exists()) {
+            if (abm2.getFile().exists()) {
                 try {
-                    zl2.load();
+                    abm2.load();
                 }
-                catch (FileNotFoundException fileNotFoundException3) {
-                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", zl2.getFile().getName(), fileNotFoundException3);
+                catch (IOException iOException3) {
+                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", abm2.getFile().getName(), iOException3);
                 }
             }
             try {
@@ -135,9 +136,9 @@ public class OldUsersConverter {
                     final String string6 = (arr6.length > 2) ? arr6[2] : null;
                     final Date date8 = (arr6.length > 3) ? parseDate(arr6[3], null) : null;
                     final String string7 = (arr6.length > 4) ? arr6[4] : null;
-                    ((StoredUserList<K, IpBanListEntry>)zl2).add(new IpBanListEntry(string5, date7, string6, date8, string7));
+                    ((StoredUserList<K, IpBanListEntry>)abm2).add(new IpBanListEntry(string5, date7, string6, date8, string7));
                 }
-                zl2.save();
+                abm2.save();
                 renameOldFile(OldUsersConverter.OLD_IPBANLIST);
             }
             catch (IOException iOException3) {
@@ -150,14 +151,14 @@ public class OldUsersConverter {
     }
     
     public static boolean convertOpsList(final MinecraftServer minecraftServer) {
-        final ServerOpList zp2 = new ServerOpList(PlayerList.OPLIST_FILE);
+        final ServerOpList abq2 = new ServerOpList(PlayerList.OPLIST_FILE);
         if (OldUsersConverter.OLD_OPLIST.exists() && OldUsersConverter.OLD_OPLIST.isFile()) {
-            if (zp2.getFile().exists()) {
+            if (abq2.getFile().exists()) {
                 try {
-                    zp2.load();
+                    abq2.load();
                 }
-                catch (FileNotFoundException fileNotFoundException3) {
-                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", zp2.getFile().getName(), fileNotFoundException3);
+                catch (IOException iOException3) {
+                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", abq2.getFile().getName(), iOException3);
                 }
             }
             try {
@@ -165,7 +166,7 @@ public class OldUsersConverter {
                 final ProfileLookupCallback profileLookupCallback4 = (ProfileLookupCallback)new ProfileLookupCallback() {
                     public void onProfileLookupSucceeded(final GameProfile gameProfile) {
                         minecraftServer.getProfileCache().add(gameProfile);
-                        ((StoredUserList<K, ServerOpListEntry>)zp2).add(new ServerOpListEntry(gameProfile, minecraftServer.getOperatorUserPermissionLevel(), false));
+                        ((StoredUserList<K, ServerOpListEntry>)abq2).add(new ServerOpListEntry(gameProfile, minecraftServer.getOperatorUserPermissionLevel(), false));
                     }
                     
                     public void onProfileLookupFailed(final GameProfile gameProfile, final Exception exception) {
@@ -176,7 +177,7 @@ public class OldUsersConverter {
                     }
                 };
                 lookupPlayers(minecraftServer, list3, profileLookupCallback4);
-                zp2.save();
+                abq2.save();
                 renameOldFile(OldUsersConverter.OLD_OPLIST);
             }
             catch (IOException iOException3) {
@@ -193,14 +194,14 @@ public class OldUsersConverter {
     }
     
     public static boolean convertWhiteList(final MinecraftServer minecraftServer) {
-        final UserWhiteList zv2 = new UserWhiteList(PlayerList.WHITELIST_FILE);
+        final UserWhiteList abw2 = new UserWhiteList(PlayerList.WHITELIST_FILE);
         if (OldUsersConverter.OLD_WHITELIST.exists() && OldUsersConverter.OLD_WHITELIST.isFile()) {
-            if (zv2.getFile().exists()) {
+            if (abw2.getFile().exists()) {
                 try {
-                    zv2.load();
+                    abw2.load();
                 }
-                catch (FileNotFoundException fileNotFoundException3) {
-                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", zv2.getFile().getName(), fileNotFoundException3);
+                catch (IOException iOException3) {
+                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", abw2.getFile().getName(), iOException3);
                 }
             }
             try {
@@ -208,7 +209,7 @@ public class OldUsersConverter {
                 final ProfileLookupCallback profileLookupCallback4 = (ProfileLookupCallback)new ProfileLookupCallback() {
                     public void onProfileLookupSucceeded(final GameProfile gameProfile) {
                         minecraftServer.getProfileCache().add(gameProfile);
-                        ((StoredUserList<K, UserWhiteListEntry>)zv2).add(new UserWhiteListEntry(gameProfile));
+                        ((StoredUserList<K, UserWhiteListEntry>)abw2).add(new UserWhiteListEntry(gameProfile));
                     }
                     
                     public void onProfileLookupFailed(final GameProfile gameProfile, final Exception exception) {
@@ -219,7 +220,7 @@ public class OldUsersConverter {
                     }
                 };
                 lookupPlayers(minecraftServer, list3, profileLookupCallback4);
-                zv2.save();
+                abw2.save();
                 renameOldFile(OldUsersConverter.OLD_WHITELIST);
             }
             catch (IOException iOException3) {
@@ -235,16 +236,27 @@ public class OldUsersConverter {
         return true;
     }
     
-    public static String convertMobOwnerIfNecessary(final MinecraftServer minecraftServer, final String string) {
-        if (StringUtil.isNullOrEmpty(string) || string.length() > 16) {
-            return string;
+    @Nullable
+    public static UUID convertMobOwnerIfNecessary(final MinecraftServer minecraftServer, final String string) {
+        Label_0024: {
+            if (!StringUtil.isNullOrEmpty(string)) {
+                if (string.length() <= 16) {
+                    break Label_0024;
+                }
+            }
+            try {
+                return UUID.fromString(string);
+            }
+            catch (IllegalArgumentException illegalArgumentException3) {
+                return null;
+            }
         }
         final GameProfile gameProfile3 = minecraftServer.getProfileCache().get(string);
         if (gameProfile3 != null && gameProfile3.getId() != null) {
-            return gameProfile3.getId().toString();
+            return gameProfile3.getId();
         }
         if (minecraftServer.isSingleplayer() || !minecraftServer.usesAuthentication()) {
-            return Player.createPlayerUUID(new GameProfile((UUID)null, string)).toString();
+            return Player.createPlayerUUID(new GameProfile((UUID)null, string));
         }
         final List<GameProfile> list4 = Lists.newArrayList();
         final ProfileLookupCallback profileLookupCallback5 = (ProfileLookupCallback)new ProfileLookupCallback() {
@@ -259,13 +271,13 @@ public class OldUsersConverter {
         };
         lookupPlayers(minecraftServer, Lists.<String>newArrayList(string), profileLookupCallback5);
         if (!list4.isEmpty() && list4.get(0).getId() != null) {
-            return list4.get(0).getId().toString();
+            return list4.get(0).getId();
         }
-        return "";
+        return null;
     }
     
-    public static boolean convertPlayers(final DedicatedServer wd) {
-        final File file2 = getWorldPlayersDirectory(wd);
+    public static boolean convertPlayers(final DedicatedServer yd) {
+        final File file2 = getWorldPlayersDirectory(yd);
         final File file3 = new File(file2.getParentFile(), "playerdata");
         final File file4 = new File(file2.getParentFile(), "unknownplayers");
         if (!file2.exists() || !file2.isDirectory()) {
@@ -286,7 +298,7 @@ public class OldUsersConverter {
             final String[] arr6 = list6.<String>toArray(new String[list6.size()]);
             final ProfileLookupCallback profileLookupCallback8 = (ProfileLookupCallback)new ProfileLookupCallback() {
                 public void onProfileLookupSucceeded(final GameProfile gameProfile) {
-                    wd.getProfileCache().add(gameProfile);
+                    yd.getProfileCache().add(gameProfile);
                     final UUID uUID3 = gameProfile.getId();
                     if (uUID3 == null) {
                         throw new ConversionError("Missing UUID for user profile " + gameProfile.getName());
@@ -327,7 +339,7 @@ public class OldUsersConverter {
                     return string3;
                 }
             };
-            lookupPlayers(wd, Lists.<String>newArrayList(arr6), profileLookupCallback8);
+            lookupPlayers(yd, Lists.<String>newArrayList(arr6), profileLookupCallback8);
         }
         catch (ConversionError a7) {
             OldUsersConverter.LOGGER.error("Conversion failed, please try again later", (Throwable)a7);
@@ -403,9 +415,7 @@ public class OldUsersConverter {
     }
     
     private static File getWorldPlayersDirectory(final MinecraftServer minecraftServer) {
-        final String string2 = minecraftServer.getLevelIdName();
-        final File file3 = new File(string2);
-        return new File(file3, "players");
+        return minecraftServer.getWorldPath(LevelResource.PLAYER_OLD_DATA_DIR).toFile();
     }
     
     private static void renameOldFile(final File file) {
diff --git a/src/net/minecraft/server/players/PlayerList.java b/src/net/minecraft/server/players/PlayerList.java
index 14ea33c..5421bef 100644
--- a/src/net/minecraft/server/players/PlayerList.java
+++ b/src/net/minecraft/server/players/PlayerList.java
@@ -2,28 +2,30 @@ package net.minecraft.server.players;
 
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.network.protocol.game.ClientboundSetChunkCacheRadiusPacket;
+import net.minecraft.world.level.storage.LevelResource;
 import net.minecraft.network.protocol.game.ClientboundChatPacket;
-import net.minecraft.network.chat.ChatType;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.network.protocol.game.ClientboundSetTimePacket;
 import net.minecraft.network.protocol.game.ClientboundEntityEventPacket;
 import java.util.Collection;
 import net.minecraft.world.scores.Team;
-import java.util.Optional;
 import net.minecraft.core.BlockPos;
+import net.minecraft.network.protocol.game.ClientboundSoundPacket;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.sounds.SoundEvents;
 import net.minecraft.network.protocol.game.ClientboundSetExperiencePacket;
-import net.minecraft.network.protocol.game.ClientboundSetSpawnPositionPacket;
+import net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket;
 import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
 import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
+import net.minecraft.world.level.block.RespawnAnchorBlock;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.LevelReader;
+import java.util.Optional;
 import net.minecraft.server.level.ServerPlayerGameMode;
 import net.minecraft.server.level.DemoMode;
 import java.net.SocketAddress;
 import net.minecraft.stats.Stats;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.network.protocol.game.ClientboundSetBorderPacket;
 import net.minecraft.world.level.border.WorldBorder;
 import net.minecraft.world.level.border.BorderChangeListener;
@@ -34,7 +36,8 @@ import net.minecraft.world.scores.PlayerTeam;
 import com.google.common.collect.Sets;
 import net.minecraft.server.ServerScoreboard;
 import java.util.Iterator;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.world.level.storage.LevelData;
 import net.minecraft.nbt.CompoundTag;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.world.entity.Entity;
@@ -42,6 +45,9 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket;
+import net.minecraft.network.chat.Component;
+import net.minecraft.Util;
+import net.minecraft.network.chat.ChatType;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
@@ -54,17 +60,23 @@ import io.netty.buffer.Unpooled;
 import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundLoginPacket;
-import net.minecraft.world.level.storage.LevelData;
+import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
-import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.server.level.ServerLevel;
+import java.util.function.Consumer;
+import net.minecraft.world.level.dimension.DimensionType;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.network.Connection;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Lists;
 import net.minecraft.world.level.GameType;
-import net.minecraft.world.level.storage.PlayerIO;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.level.storage.PlayerDataStorage;
 import net.minecraft.server.PlayerAdvancements;
 import net.minecraft.stats.ServerStatsCounter;
 import java.util.UUID;
@@ -92,15 +104,16 @@ public abstract class PlayerList {
     private final UserWhiteList whitelist;
     private final Map<UUID, ServerStatsCounter> stats;
     private final Map<UUID, PlayerAdvancements> advancements;
-    private PlayerIO playerIo;
+    private final PlayerDataStorage playerIo;
     private boolean doWhiteList;
+    private final RegistryAccess.RegistryHolder registryHolder;
     protected final int maxPlayers;
     private int viewDistance;
     private GameType overrideGameMode;
     private boolean allowCheatsForAllPlayers;
     private int sendAllPlayerInfoIn;
     
-    public PlayerList(final MinecraftServer minecraftServer, final int integer) {
+    public PlayerList(final MinecraftServer minecraftServer, final RegistryAccess.RegistryHolder a, final PlayerDataStorage dai, final int integer) {
         this.players = Lists.newArrayList();
         this.playersByUUID = Maps.newHashMap();
         this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
@@ -110,239 +123,255 @@ public abstract class PlayerList {
         this.stats = Maps.newHashMap();
         this.advancements = Maps.newHashMap();
         this.server = minecraftServer;
+        this.registryHolder = a;
         this.maxPlayers = integer;
-        this.getBans().setEnabled(true);
-        this.getIpBans().setEnabled(true);
+        this.playerIo = dai;
     }
     
-    public void placeNewPlayer(final Connection kt, final ServerPlayer xe) {
-        final GameProfile gameProfile4 = xe.getGameProfile();
-        final GameProfileCache zk5 = this.server.getProfileCache();
-        final GameProfile gameProfile5 = zk5.get(gameProfile4.getId());
+    public void placeNewPlayer(final Connection me, final ServerPlayer ze) {
+        final GameProfile gameProfile4 = ze.getGameProfile();
+        final GameProfileCache abl5 = this.server.getProfileCache();
+        final GameProfile gameProfile5 = abl5.get(gameProfile4.getId());
         final String string7 = (gameProfile5 == null) ? gameProfile4.getName() : gameProfile5.getName();
-        zk5.add(gameProfile4);
-        final CompoundTag jt8 = this.load(xe);
-        final ServerLevel xd9 = this.server.getLevel(xe.dimension);
-        xe.setLevel(xd9);
-        xe.gameMode.setLevel((ServerLevel)xe.level);
-        String string8 = "local";
-        if (kt.getRemoteAddress() != null) {
-            string8 = kt.getRemoteAddress().toString();
-        }
-        PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", xe.getName().getString(), string8, xe.getId(), xe.getX(), xe.getY(), xe.getZ());
-        final LevelData crm11 = xd9.getLevelData();
-        this.updatePlayerGameMode(xe, null, xd9);
-        final ServerGamePacketListenerImpl xv12 = new ServerGamePacketListenerImpl(this.server, kt, xe);
-        final GameRules bjs13 = xd9.getGameRules();
-        final boolean boolean14 = bjs13.getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN);
-        final boolean boolean15 = bjs13.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
-        xv12.send(new ClientboundLoginPacket(xe.getId(), xe.gameMode.getGameModeForPlayer(), LevelData.obfuscateSeed(crm11.getSeed()), crm11.isHardcore(), xd9.dimension.getType(), this.getMaxPlayers(), crm11.getGeneratorType(), this.viewDistance, boolean15, !boolean14));
-        xv12.send(new ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.BRAND, new FriendlyByteBuf(Unpooled.buffer()).writeUtf(this.getServer().getServerModName())));
-        xv12.send(new ClientboundChangeDifficultyPacket(crm11.getDifficulty(), crm11.isDifficultyLocked()));
-        xv12.send(new ClientboundPlayerAbilitiesPacket(xe.abilities));
-        xv12.send(new ClientboundSetCarriedItemPacket(xe.inventory.selected));
-        xv12.send(new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getRecipes()));
-        xv12.send(new ClientboundUpdateTagsPacket(this.server.getTags()));
-        this.sendPlayerPermissionLevel(xe);
-        xe.getStats().markAllDirty();
-        xe.getRecipeBook().sendInitialRecipeBook(xe);
-        this.updateEntireScoreboard(xd9.getScoreboard(), xe);
-        this.server.invalidateStatus();
-        Component lf16;
-        if (xe.getGameProfile().getName().equalsIgnoreCase(string7)) {
-            lf16 = new TranslatableComponent("multiplayer.player.joined", new Object[] { xe.getDisplayName() });
+        abl5.add(gameProfile4);
+        final CompoundTag le8 = this.load(ze);
+        final ResourceKey<Level> ug9 = (le8 != null) ? DimensionType.parseLegacy(new Dynamic((DynamicOps)NbtOps.INSTANCE, le8.get("Dimension"))).resultOrPartial((Consumer)PlayerList.LOGGER::error).orElse(Level.OVERWORLD) : Level.OVERWORLD;
+        final ServerLevel zd10 = this.server.getLevel(ug9);
+        ServerLevel zd11;
+        if (zd10 == null) {
+            PlayerList.LOGGER.warn("Unknown respawn dimension {}, defaulting to overworld", ug9);
+            zd11 = this.server.overworld();
         }
         else {
-            lf16 = new TranslatableComponent("multiplayer.player.joined.renamed", new Object[] { xe.getDisplayName(), string7 });
+            zd11 = zd10;
         }
-        this.broadcastMessage(lf16.withStyle(ChatFormatting.YELLOW));
-        xv12.teleport(xe.getX(), xe.getY(), xe.getZ(), xe.yRot, xe.xRot);
-        this.players.add(xe);
-        this.playersByUUID.put(xe.getUUID(), xe);
-        this.broadcastAll(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, new ServerPlayer[] { xe }));
-        for (int integer17 = 0; integer17 < this.players.size(); ++integer17) {
-            xe.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, new ServerPlayer[] { this.players.get(integer17) }));
+        ze.setLevel(zd11);
+        ze.gameMode.setLevel((ServerLevel)ze.level);
+        String string8 = "local";
+        if (me.getRemoteAddress() != null) {
+            string8 = me.getRemoteAddress().toString();
         }
-        xd9.addNewPlayer(xe);
-        this.server.getCustomBossEvents().onPlayerConnect(xe);
-        this.sendLevelInfo(xe, xd9);
+        PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", ze.getName().getString(), string8, ze.getId(), ze.getX(), ze.getY(), ze.getZ());
+        final LevelData dab13 = zd11.getLevelData();
+        this.updatePlayerGameMode(ze, null, zd11);
+        final ServerGamePacketListenerImpl zv14 = new ServerGamePacketListenerImpl(this.server, me, ze);
+        final GameRules bpx15 = zd11.getGameRules();
+        final boolean boolean16 = bpx15.getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN);
+        final boolean boolean17 = bpx15.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
+        zv14.send(new ClientboundLoginPacket(ze.getId(), ze.gameMode.getGameModeForPlayer(), ze.gameMode.getPreviousGameModeForPlayer(), BiomeManager.obfuscateSeed(zd11.getSeed()), dab13.isHardcore(), this.server.levelKeys(), this.registryHolder, zd11.dimensionTypeKey(), zd11.dimension(), this.getMaxPlayers(), this.viewDistance, boolean17, !boolean16, zd11.isDebug(), zd11.isFlat()));
+        zv14.send(new ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.BRAND, new FriendlyByteBuf(Unpooled.buffer()).writeUtf(this.getServer().getServerModName())));
+        zv14.send(new ClientboundChangeDifficultyPacket(dab13.getDifficulty(), dab13.isDifficultyLocked()));
+        zv14.send(new ClientboundPlayerAbilitiesPacket(ze.abilities));
+        zv14.send(new ClientboundSetCarriedItemPacket(ze.inventory.selected));
+        zv14.send(new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getRecipes()));
+        zv14.send(new ClientboundUpdateTagsPacket(this.server.getTags()));
+        this.sendPlayerPermissionLevel(ze);
+        ze.getStats().markAllDirty();
+        ze.getRecipeBook().sendInitialRecipeBook(ze);
+        this.updateEntireScoreboard(zd11.getScoreboard(), ze);
+        this.server.invalidateStatus();
+        MutableComponent mx18;
+        if (ze.getGameProfile().getName().equalsIgnoreCase(string7)) {
+            mx18 = new TranslatableComponent("multiplayer.player.joined", new Object[] { ze.getDisplayName() });
+        }
+        else {
+            mx18 = new TranslatableComponent("multiplayer.player.joined.renamed", new Object[] { ze.getDisplayName(), string7 });
+        }
+        this.broadcastMessage(mx18.withStyle(ChatFormatting.YELLOW), ChatType.SYSTEM, Util.NIL_UUID);
+        zv14.teleport(ze.getX(), ze.getY(), ze.getZ(), ze.yRot, ze.xRot);
+        this.players.add(ze);
+        this.playersByUUID.put(ze.getUUID(), ze);
+        this.broadcastAll(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, new ServerPlayer[] { ze }));
+        for (int integer19 = 0; integer19 < this.players.size(); ++integer19) {
+            ze.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, new ServerPlayer[] { this.players.get(integer19) }));
+        }
+        zd11.addNewPlayer(ze);
+        this.server.getCustomBossEvents().onPlayerConnect(ze);
+        this.sendLevelInfo(ze, zd11);
         if (!this.server.getResourcePack().isEmpty()) {
-            xe.sendTexturePack(this.server.getResourcePack(), this.server.getResourcePackHash());
+            ze.sendTexturePack(this.server.getResourcePack(), this.server.getResourcePackHash());
         }
-        for (final MobEffectInstance akk18 : xe.getActiveEffects()) {
-            xv12.send(new ClientboundUpdateMobEffectPacket(xe.getId(), akk18));
+        for (final MobEffectInstance aog20 : ze.getActiveEffects()) {
+            zv14.send(new ClientboundUpdateMobEffectPacket(ze.getId(), aog20));
         }
-        if (jt8 != null && jt8.contains("RootVehicle", 10)) {
-            final CompoundTag jt9 = jt8.getCompound("RootVehicle");
-            final Entity akq2 = EntityType.loadEntityRecursive(jt9.getCompound("Entity"), (Level)xd9, akq -> {
-                if (!xd9.addWithUUID(akq)) {
+        if (le8 != null && le8.contains("RootVehicle", 10)) {
+            final CompoundTag le9 = le8.getCompound("RootVehicle");
+            final Entity aom2 = EntityType.loadEntityRecursive(le9.getCompound("Entity"), (Level)zd11, aom -> {
+                if (!zd11.addWithUUID(aom)) {
                     return null;
                 }
                 else {
-                    return akq;
+                    return aom;
                 }
             });
-            if (akq2 != null) {
-                final UUID uUID19 = jt9.getUUID("Attach");
-                if (akq2.getUUID().equals(uUID19)) {
-                    xe.startRiding(akq2, true);
+            if (aom2 != null) {
+                UUID uUID21;
+                if (le9.hasUUID("Attach")) {
+                    uUID21 = le9.getUUID("Attach");
                 }
                 else {
-                    for (final Entity akq3 : akq2.getIndirectPassengers()) {
-                        if (akq3.getUUID().equals(uUID19)) {
-                            xe.startRiding(akq3, true);
+                    uUID21 = null;
+                }
+                if (aom2.getUUID().equals(uUID21)) {
+                    ze.startRiding(aom2, true);
+                }
+                else {
+                    for (final Entity aom3 : aom2.getIndirectPassengers()) {
+                        if (aom3.getUUID().equals(uUID21)) {
+                            ze.startRiding(aom3, true);
                             break;
                         }
                     }
                 }
-                if (!xe.isPassenger()) {
+                if (!ze.isPassenger()) {
                     PlayerList.LOGGER.warn("Couldn't reattach entity to player");
-                    xd9.despawn(akq2);
-                    for (final Entity akq3 : akq2.getIndirectPassengers()) {
-                        xd9.despawn(akq3);
+                    zd11.despawn(aom2);
+                    for (final Entity aom3 : aom2.getIndirectPassengers()) {
+                        zd11.despawn(aom3);
                     }
                 }
             }
         }
-        xe.initMenu();
+        ze.initMenu();
     }
     
-    protected void updateEntireScoreboard(final ServerScoreboard ta, final ServerPlayer xe) {
+    protected void updateEntireScoreboard(final ServerScoreboard ux, final ServerPlayer ze) {
         final Set<Objective> set4 = Sets.newHashSet();
-        for (final PlayerTeam cwj6 : ta.getPlayerTeams()) {
-            xe.connection.send(new ClientboundSetPlayerTeamPacket(cwj6, 0));
+        for (final PlayerTeam dfk6 : ux.getPlayerTeams()) {
+            ze.connection.send(new ClientboundSetPlayerTeamPacket(dfk6, 0));
         }
         for (int integer5 = 0; integer5 < 19; ++integer5) {
-            final Objective cwi6 = ta.getDisplayObjective(integer5);
-            if (cwi6 != null && !set4.contains(cwi6)) {
-                final List<Packet<?>> list7 = ta.getStartTrackingPackets(cwi6);
-                for (final Packet<?> lt9 : list7) {
-                    xe.connection.send(lt9);
+            final Objective dfj6 = ux.getDisplayObjective(integer5);
+            if (dfj6 != null && !set4.contains(dfj6)) {
+                final List<Packet<?>> list7 = ux.getStartTrackingPackets(dfj6);
+                for (final Packet<?> ni9 : list7) {
+                    ze.connection.send(ni9);
                 }
-                set4.add(cwi6);
+                set4.add(dfj6);
             }
         }
     }
     
-    public void setLevel(final ServerLevel xd) {
-        this.playerIo = xd.getLevelStorage();
-        xd.getWorldBorder().addListener(new BorderChangeListener() {
+    public void setLevel(final ServerLevel zd) {
+        zd.getWorldBorder().addListener(new BorderChangeListener() {
             @Override
-            public void onBorderSizeSet(final WorldBorder bzw, final double double2) {
-                PlayerList.this.broadcastAll(new ClientboundSetBorderPacket(bzw, ClientboundSetBorderPacket.Type.SET_SIZE));
+            public void onBorderSizeSet(final WorldBorder cgw, final double double2) {
+                PlayerList.this.broadcastAll(new ClientboundSetBorderPacket(cgw, ClientboundSetBorderPacket.Type.SET_SIZE));
             }
             
             @Override
-            public void onBorderSizeLerping(final WorldBorder bzw, final double double2, final double double3, final long long4) {
-                PlayerList.this.broadcastAll(new ClientboundSetBorderPacket(bzw, ClientboundSetBorderPacket.Type.LERP_SIZE));
+            public void onBorderSizeLerping(final WorldBorder cgw, final double double2, final double double3, final long long4) {
+                PlayerList.this.broadcastAll(new ClientboundSetBorderPacket(cgw, ClientboundSetBorderPacket.Type.LERP_SIZE));
             }
             
             @Override
-            public void onBorderCenterSet(final WorldBorder bzw, final double double2, final double double3) {
-                PlayerList.this.broadcastAll(new ClientboundSetBorderPacket(bzw, ClientboundSetBorderPacket.Type.SET_CENTER));
+            public void onBorderCenterSet(final WorldBorder cgw, final double double2, final double double3) {
+                PlayerList.this.broadcastAll(new ClientboundSetBorderPacket(cgw, ClientboundSetBorderPacket.Type.SET_CENTER));
             }
             
             @Override
-            public void onBorderSetWarningTime(final WorldBorder bzw, final int integer) {
-                PlayerList.this.broadcastAll(new ClientboundSetBorderPacket(bzw, ClientboundSetBorderPacket.Type.SET_WARNING_TIME));
+            public void onBorderSetWarningTime(final WorldBorder cgw, final int integer) {
+                PlayerList.this.broadcastAll(new ClientboundSetBorderPacket(cgw, ClientboundSetBorderPacket.Type.SET_WARNING_TIME));
             }
             
             @Override
-            public void onBorderSetWarningBlocks(final WorldBorder bzw, final int integer) {
-                PlayerList.this.broadcastAll(new ClientboundSetBorderPacket(bzw, ClientboundSetBorderPacket.Type.SET_WARNING_BLOCKS));
+            public void onBorderSetWarningBlocks(final WorldBorder cgw, final int integer) {
+                PlayerList.this.broadcastAll(new ClientboundSetBorderPacket(cgw, ClientboundSetBorderPacket.Type.SET_WARNING_BLOCKS));
             }
             
             @Override
-            public void onBorderSetDamagePerBlock(final WorldBorder bzw, final double double2) {
+            public void onBorderSetDamagePerBlock(final WorldBorder cgw, final double double2) {
             }
             
             @Override
-            public void onBorderSetDamageSafeZOne(final WorldBorder bzw, final double double2) {
+            public void onBorderSetDamageSafeZOne(final WorldBorder cgw, final double double2) {
             }
         });
     }
     
     @Nullable
-    public CompoundTag load(final ServerPlayer xe) {
-        final CompoundTag jt3 = this.server.getLevel(DimensionType.OVERWORLD).getLevelData().getLoadedPlayerTag();
-        CompoundTag jt4;
-        if (xe.getName().getString().equals(this.server.getSingleplayerName()) && jt3 != null) {
-            jt4 = jt3;
-            xe.load(jt4);
+    public CompoundTag load(final ServerPlayer ze) {
+        final CompoundTag le3 = this.server.getWorldData().getLoadedPlayerTag();
+        CompoundTag le4;
+        if (ze.getName().getString().equals(this.server.getSingleplayerName()) && le3 != null) {
+            le4 = le3;
+            ze.load(le4);
             PlayerList.LOGGER.debug("loading single player");
         }
         else {
-            jt4 = this.playerIo.load(xe);
+            le4 = this.playerIo.load(ze);
         }
-        return jt4;
+        return le4;
     }
     
-    protected void save(final ServerPlayer xe) {
-        this.playerIo.save(xe);
-        final ServerStatsCounter aan3 = this.stats.get(xe.getUUID());
-        if (aan3 != null) {
-            aan3.save();
+    protected void save(final ServerPlayer ze) {
+        this.playerIo.save(ze);
+        final ServerStatsCounter acq3 = this.stats.get(ze.getUUID());
+        if (acq3 != null) {
+            acq3.save();
         }
-        final PlayerAdvancements sv4 = this.advancements.get(xe.getUUID());
-        if (sv4 != null) {
-            sv4.save();
+        final PlayerAdvancements uq4 = this.advancements.get(ze.getUUID());
+        if (uq4 != null) {
+            uq4.save();
         }
     }
     
-    public void remove(final ServerPlayer xe) {
-        final ServerLevel xd3 = xe.getLevel();
-        xe.awardStat(Stats.LEAVE_GAME);
-        this.save(xe);
-        if (xe.isPassenger()) {
-            final Entity akq4 = xe.getRootVehicle();
-            if (akq4.hasOnePlayerPassenger()) {
+    public void remove(final ServerPlayer ze) {
+        final ServerLevel zd3 = ze.getLevel();
+        ze.awardStat(Stats.LEAVE_GAME);
+        this.save(ze);
+        if (ze.isPassenger()) {
+            final Entity aom4 = ze.getRootVehicle();
+            if (aom4.hasOnePlayerPassenger()) {
                 PlayerList.LOGGER.debug("Removing player mount");
-                xe.stopRiding();
-                xd3.despawn(akq4);
-                for (final Entity akq5 : akq4.getIndirectPassengers()) {
-                    xd3.despawn(akq5);
+                ze.stopRiding();
+                zd3.despawn(aom4);
+                aom4.removed = true;
+                for (final Entity aom5 : aom4.getIndirectPassengers()) {
+                    zd3.despawn(aom5);
+                    aom5.removed = true;
                 }
-                xd3.getChunk(xe.xChunk, xe.zChunk).markUnsaved();
+                zd3.getChunk(ze.xChunk, ze.zChunk).markUnsaved();
             }
         }
-        xe.unRide();
-        xd3.removePlayerImmediately(xe);
-        xe.getAdvancements().stopListening();
-        this.players.remove(xe);
-        this.server.getCustomBossEvents().onPlayerDisconnect(xe);
-        final UUID uUID4 = xe.getUUID();
-        final ServerPlayer xe2 = this.playersByUUID.get(uUID4);
-        if (xe2 == xe) {
+        ze.unRide();
+        zd3.removePlayerImmediately(ze);
+        ze.getAdvancements().stopListening();
+        this.players.remove(ze);
+        this.server.getCustomBossEvents().onPlayerDisconnect(ze);
+        final UUID uUID4 = ze.getUUID();
+        final ServerPlayer ze2 = this.playersByUUID.get(uUID4);
+        if (ze2 == ze) {
             this.playersByUUID.remove(uUID4);
             this.stats.remove(uUID4);
             this.advancements.remove(uUID4);
         }
-        this.broadcastAll(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, new ServerPlayer[] { xe }));
+        this.broadcastAll(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, new ServerPlayer[] { ze }));
     }
     
     @Nullable
     public Component canPlayerLogin(final SocketAddress socketAddress, final GameProfile gameProfile) {
         if (this.bans.isBanned(gameProfile)) {
-            final UserBanListEntry zu4 = this.bans.get(gameProfile);
-            final Component lf5 = new TranslatableComponent("multiplayer.disconnect.banned.reason", new Object[] { zu4.getReason() });
-            if (zu4.getExpires() != null) {
-                lf5.append(new TranslatableComponent("multiplayer.disconnect.banned.expiration", new Object[] { PlayerList.BAN_DATE_FORMAT.format(zu4.getExpires()) }));
+            final UserBanListEntry abv4 = this.bans.get(gameProfile);
+            final MutableComponent mx5 = new TranslatableComponent("multiplayer.disconnect.banned.reason", new Object[] { abv4.getReason() });
+            if (abv4.getExpires() != null) {
+                mx5.append(new TranslatableComponent("multiplayer.disconnect.banned.expiration", new Object[] { PlayerList.BAN_DATE_FORMAT.format(abv4.getExpires()) }));
             }
-            return lf5;
+            return mx5;
         }
         if (!this.isWhiteListed(gameProfile)) {
-            return new TranslatableComponent("multiplayer.disconnect.not_whitelisted", new Object[0]);
+            return new TranslatableComponent("multiplayer.disconnect.not_whitelisted");
         }
         if (this.ipBans.isBanned(socketAddress)) {
-            final IpBanListEntry zm4 = this.ipBans.get(socketAddress);
-            final Component lf5 = new TranslatableComponent("multiplayer.disconnect.banned_ip.reason", new Object[] { zm4.getReason() });
-            if (zm4.getExpires() != null) {
-                lf5.append(new TranslatableComponent("multiplayer.disconnect.banned_ip.expiration", new Object[] { PlayerList.BAN_DATE_FORMAT.format(zm4.getExpires()) }));
+            final IpBanListEntry abn4 = this.ipBans.get(socketAddress);
+            final MutableComponent mx5 = new TranslatableComponent("multiplayer.disconnect.banned_ip.reason", new Object[] { abn4.getReason() });
+            if (abn4.getExpires() != null) {
+                mx5.append(new TranslatableComponent("multiplayer.disconnect.banned_ip.expiration", new Object[] { PlayerList.BAN_DATE_FORMAT.format(abn4.getExpires()) }));
             }
-            return lf5;
+            return mx5;
         }
         if (this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameProfile)) {
-            return new TranslatableComponent("multiplayer.disconnect.server_full", new Object[0]);
+            return new TranslatableComponent("multiplayer.disconnect.server_full");
         }
         return null;
     }
@@ -351,86 +380,95 @@ public abstract class PlayerList {
         final UUID uUID3 = Player.createPlayerUUID(gameProfile);
         final List<ServerPlayer> list4 = Lists.newArrayList();
         for (int integer5 = 0; integer5 < this.players.size(); ++integer5) {
-            final ServerPlayer xe6 = this.players.get(integer5);
-            if (xe6.getUUID().equals(uUID3)) {
-                list4.add(xe6);
+            final ServerPlayer ze6 = this.players.get(integer5);
+            if (ze6.getUUID().equals(uUID3)) {
+                list4.add(ze6);
             }
         }
-        final ServerPlayer xe7 = this.playersByUUID.get(gameProfile.getId());
-        if (xe7 != null && !list4.contains(xe7)) {
-            list4.add(xe7);
+        final ServerPlayer ze7 = this.playersByUUID.get(gameProfile.getId());
+        if (ze7 != null && !list4.contains(ze7)) {
+            list4.add(ze7);
         }
-        for (final ServerPlayer xe8 : list4) {
-            xe8.connection.disconnect(new TranslatableComponent("multiplayer.disconnect.duplicate_login", new Object[0]));
+        for (final ServerPlayer ze8 : list4) {
+            ze8.connection.disconnect(new TranslatableComponent("multiplayer.disconnect.duplicate_login"));
         }
-        ServerPlayerGameMode xf6;
+        final ServerLevel zd7 = this.server.overworld();
+        ServerPlayerGameMode zf6;
         if (this.server.isDemo()) {
-            xf6 = new DemoMode(this.server.getLevel(DimensionType.OVERWORLD));
+            zf6 = new DemoMode(zd7);
         }
         else {
-            xf6 = new ServerPlayerGameMode(this.server.getLevel(DimensionType.OVERWORLD));
+            zf6 = new ServerPlayerGameMode(zd7);
         }
-        return new ServerPlayer(this.server, this.server.getLevel(DimensionType.OVERWORLD), gameProfile, xf6);
+        return new ServerPlayer(this.server, zd7, gameProfile, zf6);
     }
     
-    public ServerPlayer respawn(final ServerPlayer xe, final DimensionType cbi, final boolean boolean3) {
-        this.players.remove(xe);
-        xe.getLevel().removePlayerImmediately(xe);
-        final BlockPos fk5 = xe.getRespawnPosition();
-        final boolean boolean4 = xe.isRespawnForced();
-        xe.dimension = cbi;
-        ServerPlayerGameMode xf7;
-        if (this.server.isDemo()) {
-            xf7 = new DemoMode(this.server.getLevel(xe.dimension));
+    public ServerPlayer respawn(final ServerPlayer ze, final boolean boolean2) {
+        this.players.remove(ze);
+        ze.getLevel().removePlayerImmediately(ze);
+        final BlockPos fu4 = ze.getRespawnPosition();
+        final boolean boolean3 = ze.isRespawnForced();
+        final ServerLevel zd6 = this.server.getLevel(ze.getRespawnDimension());
+        Optional<Vec3> optional7;
+        if (zd6 != null && fu4 != null) {
+            optional7 = Player.findRespawnPositionAndUseSpawnBlock(zd6, fu4, boolean3, boolean2);
         }
         else {
-            xf7 = new ServerPlayerGameMode(this.server.getLevel(xe.dimension));
+            optional7 = Optional.<Vec3>empty();
         }
-        final ServerPlayer xe2 = new ServerPlayer(this.server, this.server.getLevel(xe.dimension), xe.getGameProfile(), xf7);
-        xe2.connection = xe.connection;
-        xe2.restoreFrom(xe, boolean3);
-        xe2.setId(xe.getId());
-        xe2.setMainArm(xe.getMainArm());
-        for (final String string10 : xe.getTags()) {
-            xe2.addTag(string10);
+        final ServerLevel zd7 = (zd6 != null && optional7.isPresent()) ? zd6 : this.server.overworld();
+        ServerPlayerGameMode zf8;
+        if (this.server.isDemo()) {
+            zf8 = new DemoMode(zd7);
         }
-        final ServerLevel xd9 = this.server.getLevel(xe.dimension);
-        this.updatePlayerGameMode(xe2, xe, xd9);
-        if (fk5 != null) {
-            final Optional<Vec3> optional10 = Player.checkBedValidRespawnPosition(this.server.getLevel(xe.dimension), fk5, boolean4);
-            if (optional10.isPresent()) {
-                final Vec3 cvl11 = optional10.get();
-                xe2.moveTo(cvl11.x, cvl11.y, cvl11.z, 0.0f, 0.0f);
-                xe2.setRespawnPosition(fk5, boolean4, false);
-            }
-            else {
-                xe2.connection.send(new ClientboundGameEventPacket(0, 0.0f));
-            }
+        else {
+            zf8 = new ServerPlayerGameMode(zd7);
         }
-        while (!xd9.noCollision(xe2) && xe2.getY() < 256.0) {
-            xe2.setPos(xe2.getX(), xe2.getY() + 1.0, xe2.getZ());
+        final ServerPlayer ze2 = new ServerPlayer(this.server, zd7, ze.getGameProfile(), zf8);
+        ze2.connection = ze.connection;
+        ze2.restoreFrom(ze, boolean2);
+        ze2.setId(ze.getId());
+        ze2.setMainArm(ze.getMainArm());
+        for (final String string12 : ze.getTags()) {
+            ze2.addTag(string12);
         }
-        final LevelData crm10 = xe2.level.getLevelData();
-        xe2.connection.send(new ClientboundRespawnPacket(xe2.dimension, LevelData.obfuscateSeed(crm10.getSeed()), crm10.getGeneratorType(), xe2.gameMode.getGameModeForPlayer()));
-        final BlockPos fk6 = xd9.getSharedSpawnPos();
-        xe2.connection.teleport(xe2.getX(), xe2.getY(), xe2.getZ(), xe2.yRot, xe2.xRot);
-        xe2.connection.send(new ClientboundSetSpawnPositionPacket(fk6));
-        xe2.connection.send(new ClientboundChangeDifficultyPacket(crm10.getDifficulty(), crm10.isDifficultyLocked()));
-        xe2.connection.send(new ClientboundSetExperiencePacket(xe2.experienceProgress, xe2.totalExperience, xe2.experienceLevel));
-        this.sendLevelInfo(xe2, xd9);
-        this.sendPlayerPermissionLevel(xe2);
-        xd9.addRespawnedPlayer(xe2);
-        this.players.add(xe2);
-        this.playersByUUID.put(xe2.getUUID(), xe2);
-        xe2.initMenu();
-        xe2.setHealth(xe2.getHealth());
-        return xe2;
+        this.updatePlayerGameMode(ze2, ze, zd7);
+        boolean boolean4 = false;
+        if (optional7.isPresent()) {
+            final Vec3 dem12 = optional7.get();
+            ze2.moveTo(dem12.x, dem12.y, dem12.z, 0.0f, 0.0f);
+            ze2.setRespawnPosition(zd7.dimension(), fu4, boolean3, false);
+            boolean4 = (!boolean2 && zd7.getBlockState(fu4).getBlock() instanceof RespawnAnchorBlock);
+        }
+        else if (fu4 != null) {
+            ze2.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0f));
+        }
+        while (!zd7.noCollision(ze2) && ze2.getY() < 256.0) {
+            ze2.setPos(ze2.getX(), ze2.getY() + 1.0, ze2.getZ());
+        }
+        final LevelData dab12 = ze2.level.getLevelData();
+        ze2.connection.send(new ClientboundRespawnPacket(ze2.level.dimensionTypeKey(), ze2.level.dimension(), BiomeManager.obfuscateSeed(ze2.getLevel().getSeed()), ze2.gameMode.getGameModeForPlayer(), ze2.gameMode.getPreviousGameModeForPlayer(), ze2.getLevel().isDebug(), ze2.getLevel().isFlat(), boolean2));
+        ze2.connection.teleport(ze2.getX(), ze2.getY(), ze2.getZ(), ze2.yRot, ze2.xRot);
+        ze2.connection.send(new ClientboundSetDefaultSpawnPositionPacket(zd7.getSharedSpawnPos()));
+        ze2.connection.send(new ClientboundChangeDifficultyPacket(dab12.getDifficulty(), dab12.isDifficultyLocked()));
+        ze2.connection.send(new ClientboundSetExperiencePacket(ze2.experienceProgress, ze2.totalExperience, ze2.experienceLevel));
+        this.sendLevelInfo(ze2, zd7);
+        this.sendPlayerPermissionLevel(ze2);
+        zd7.addRespawnedPlayer(ze2);
+        this.players.add(ze2);
+        this.playersByUUID.put(ze2.getUUID(), ze2);
+        ze2.initMenu();
+        ze2.setHealth(ze2.getHealth());
+        if (boolean4) {
+            ze2.connection.send(new ClientboundSoundPacket(SoundEvents.RESPAWN_ANCHOR_DEPLETE, SoundSource.BLOCKS, fu4.getX(), fu4.getY(), fu4.getZ(), 1.0f, 1.0f));
+        }
+        return ze2;
     }
     
-    public void sendPlayerPermissionLevel(final ServerPlayer xe) {
-        final GameProfile gameProfile3 = xe.getGameProfile();
+    public void sendPlayerPermissionLevel(final ServerPlayer ze) {
+        final GameProfile gameProfile3 = ze.getGameProfile();
         final int integer4 = this.server.getProfilePermissions(gameProfile3);
-        this.sendPlayerPermissionLevel(xe, integer4);
+        this.sendPlayerPermissionLevel(ze, integer4);
     }
     
     public void tick() {
@@ -440,48 +478,48 @@ public abstract class PlayerList {
         }
     }
     
-    public void broadcastAll(final Packet<?> lt) {
+    public void broadcastAll(final Packet<?> ni) {
         for (int integer3 = 0; integer3 < this.players.size(); ++integer3) {
-            this.players.get(integer3).connection.send(lt);
+            this.players.get(integer3).connection.send(ni);
         }
     }
     
-    public void broadcastAll(final Packet<?> lt, final DimensionType cbi) {
+    public void broadcastAll(final Packet<?> ni, final ResourceKey<Level> ug) {
         for (int integer4 = 0; integer4 < this.players.size(); ++integer4) {
-            final ServerPlayer xe5 = this.players.get(integer4);
-            if (xe5.dimension == cbi) {
-                xe5.connection.send(lt);
+            final ServerPlayer ze5 = this.players.get(integer4);
+            if (ze5.level.dimension() == ug) {
+                ze5.connection.send(ni);
             }
         }
     }
     
-    public void broadcastToTeam(final Player ayj, final Component lf) {
-        final Team cwn4 = ayj.getTeam();
-        if (cwn4 == null) {
+    public void broadcastToTeam(final Player bec, final Component mr) {
+        final Team dfo4 = bec.getTeam();
+        if (dfo4 == null) {
             return;
         }
-        final Collection<String> collection5 = cwn4.getPlayers();
+        final Collection<String> collection5 = dfo4.getPlayers();
         for (final String string7 : collection5) {
-            final ServerPlayer xe8 = this.getPlayerByName(string7);
-            if (xe8 != null) {
-                if (xe8 == ayj) {
+            final ServerPlayer ze8 = this.getPlayerByName(string7);
+            if (ze8 != null) {
+                if (ze8 == bec) {
                     continue;
                 }
-                xe8.sendMessage(lf);
+                ze8.sendMessage(mr, bec.getUUID());
             }
         }
     }
     
-    public void broadcastToAllExceptTeam(final Player ayj, final Component lf) {
-        final Team cwn4 = ayj.getTeam();
-        if (cwn4 == null) {
-            this.broadcastMessage(lf);
+    public void broadcastToAllExceptTeam(final Player bec, final Component mr) {
+        final Team dfo4 = bec.getTeam();
+        if (dfo4 == null) {
+            this.broadcastMessage(mr, ChatType.SYSTEM, bec.getUUID());
             return;
         }
         for (int integer5 = 0; integer5 < this.players.size(); ++integer5) {
-            final ServerPlayer xe6 = this.players.get(integer5);
-            if (xe6.getTeam() != cwn4) {
-                xe6.sendMessage(lf);
+            final ServerPlayer ze6 = this.players.get(integer5);
+            if (ze6.getTeam() != dfo4) {
+                ze6.sendMessage(mr, bec.getUUID());
             }
         }
     }
@@ -504,22 +542,22 @@ public abstract class PlayerList {
     
     public void op(final GameProfile gameProfile) {
         ((StoredUserList<K, ServerOpListEntry>)this.ops).add(new ServerOpListEntry(gameProfile, this.server.getOperatorUserPermissionLevel(), this.ops.canBypassPlayerLimit(gameProfile)));
-        final ServerPlayer xe3 = this.getPlayer(gameProfile.getId());
-        if (xe3 != null) {
-            this.sendPlayerPermissionLevel(xe3);
+        final ServerPlayer ze3 = this.getPlayer(gameProfile.getId());
+        if (ze3 != null) {
+            this.sendPlayerPermissionLevel(ze3);
         }
     }
     
     public void deop(final GameProfile gameProfile) {
         ((StoredUserList<GameProfile, V>)this.ops).remove(gameProfile);
-        final ServerPlayer xe3 = this.getPlayer(gameProfile.getId());
-        if (xe3 != null) {
-            this.sendPlayerPermissionLevel(xe3);
+        final ServerPlayer ze3 = this.getPlayer(gameProfile.getId());
+        if (ze3 != null) {
+            this.sendPlayerPermissionLevel(ze3);
         }
     }
     
-    private void sendPlayerPermissionLevel(final ServerPlayer xe, final int integer) {
-        if (xe.connection != null) {
+    private void sendPlayerPermissionLevel(final ServerPlayer ze, final int integer) {
+        if (ze.connection != null) {
             byte byte4;
             if (integer <= 0) {
                 byte4 = 24;
@@ -530,9 +568,9 @@ public abstract class PlayerList {
             else {
                 byte4 = (byte)(24 + integer);
             }
-            xe.connection.send(new ClientboundEntityEventPacket(xe, byte4));
+            ze.connection.send(new ClientboundEntityEventPacket(ze, byte4));
         }
-        this.server.getCommands().sendCommands(xe);
+        this.server.getCommands().sendCommands(ze);
     }
     
     public boolean isWhiteListed(final GameProfile gameProfile) {
@@ -540,29 +578,29 @@ public abstract class PlayerList {
     }
     
     public boolean isOp(final GameProfile gameProfile) {
-        return ((StoredUserList<GameProfile, V>)this.ops).contains(gameProfile) || (this.server.isSingleplayerOwner(gameProfile) && this.server.getLevel(DimensionType.OVERWORLD).getLevelData().getAllowCommands()) || this.allowCheatsForAllPlayers;
+        return ((StoredUserList<GameProfile, V>)this.ops).contains(gameProfile) || (this.server.isSingleplayerOwner(gameProfile) && this.server.getWorldData().getAllowCommands()) || this.allowCheatsForAllPlayers;
     }
     
     @Nullable
     public ServerPlayer getPlayerByName(final String string) {
-        for (final ServerPlayer xe4 : this.players) {
-            if (xe4.getGameProfile().getName().equalsIgnoreCase(string)) {
-                return xe4;
+        for (final ServerPlayer ze4 : this.players) {
+            if (ze4.getGameProfile().getName().equalsIgnoreCase(string)) {
+                return ze4;
             }
         }
         return null;
     }
     
-    public void broadcast(@Nullable final Player ayj, final double double2, final double double3, final double double4, final double double5, final DimensionType cbi, final Packet<?> lt) {
+    public void broadcast(@Nullable final Player bec, final double double2, final double double3, final double double4, final double double5, final ResourceKey<Level> ug, final Packet<?> ni) {
         for (int integer13 = 0; integer13 < this.players.size(); ++integer13) {
-            final ServerPlayer xe14 = this.players.get(integer13);
-            if (xe14 != ayj) {
-                if (xe14.dimension == cbi) {
-                    final double double6 = double2 - xe14.getX();
-                    final double double7 = double3 - xe14.getY();
-                    final double double8 = double4 - xe14.getZ();
+            final ServerPlayer ze14 = this.players.get(integer13);
+            if (ze14 != bec) {
+                if (ze14.level.dimension() == ug) {
+                    final double double6 = double2 - ze14.getX();
+                    final double double7 = double3 - ze14.getY();
+                    final double double8 = double4 - ze14.getZ();
                     if (double6 * double6 + double7 * double7 + double8 * double8 < double5 * double5) {
-                        xe14.connection.send(lt);
+                        ze14.connection.send(ni);
                     }
                 }
             }
@@ -594,23 +632,22 @@ public abstract class PlayerList {
     public void reloadWhiteList() {
     }
     
-    public void sendLevelInfo(final ServerPlayer xe, final ServerLevel xd) {
-        final WorldBorder bzw4 = this.server.getLevel(DimensionType.OVERWORLD).getWorldBorder();
-        xe.connection.send(new ClientboundSetBorderPacket(bzw4, ClientboundSetBorderPacket.Type.INITIALIZE));
-        xe.connection.send(new ClientboundSetTimePacket(xd.getGameTime(), xd.getDayTime(), xd.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
-        final BlockPos fk5 = xd.getSharedSpawnPos();
-        xe.connection.send(new ClientboundSetSpawnPositionPacket(fk5));
-        if (xd.isRaining()) {
-            xe.connection.send(new ClientboundGameEventPacket(1, 0.0f));
-            xe.connection.send(new ClientboundGameEventPacket(7, xd.getRainLevel(1.0f)));
-            xe.connection.send(new ClientboundGameEventPacket(8, xd.getThunderLevel(1.0f)));
+    public void sendLevelInfo(final ServerPlayer ze, final ServerLevel zd) {
+        final WorldBorder cgw4 = this.server.overworld().getWorldBorder();
+        ze.connection.send(new ClientboundSetBorderPacket(cgw4, ClientboundSetBorderPacket.Type.INITIALIZE));
+        ze.connection.send(new ClientboundSetTimePacket(zd.getGameTime(), zd.getDayTime(), zd.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
+        ze.connection.send(new ClientboundSetDefaultSpawnPositionPacket(zd.getSharedSpawnPos()));
+        if (zd.isRaining()) {
+            ze.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.START_RAINING, 0.0f));
+            ze.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.RAIN_LEVEL_CHANGE, zd.getRainLevel(1.0f)));
+            ze.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.THUNDER_LEVEL_CHANGE, zd.getThunderLevel(1.0f)));
         }
     }
     
-    public void sendAllPlayerInfo(final ServerPlayer xe) {
-        xe.refreshContainer(xe.inventoryMenu);
-        xe.resetSentInfo();
-        xe.connection.send(new ClientboundSetCarriedItemPacket(xe.inventory.selected));
+    public void sendAllPlayerInfo(final ServerPlayer ze) {
+        ze.refreshContainer(ze.inventoryMenu);
+        ze.resetSentInfo();
+        ze.connection.send(new ClientboundSetCarriedItemPacket(ze.inventory.selected));
     }
     
     public int getPlayerCount() {
@@ -631,9 +668,9 @@ public abstract class PlayerList {
     
     public List<ServerPlayer> getPlayersWithAddress(final String string) {
         final List<ServerPlayer> list3 = Lists.newArrayList();
-        for (final ServerPlayer xe5 : this.players) {
-            if (xe5.getIpAddress().equals(string)) {
-                list3.add(xe5);
+        for (final ServerPlayer ze5 : this.players) {
+            if (ze5.getIpAddress().equals(string)) {
+                list3.add(ze5);
             }
         }
         return list3;
@@ -651,18 +688,18 @@ public abstract class PlayerList {
         return null;
     }
     
-    public void setOverrideGameMode(final GameType bjt) {
-        this.overrideGameMode = bjt;
+    public void setOverrideGameMode(final GameType bpy) {
+        this.overrideGameMode = bpy;
     }
     
-    private void updatePlayerGameMode(final ServerPlayer xe1, final ServerPlayer xe2, final LevelAccessor bjx) {
-        if (xe2 != null) {
-            xe1.gameMode.setGameModeForPlayer(xe2.gameMode.getGameModeForPlayer());
+    private void updatePlayerGameMode(final ServerPlayer ze1, @Nullable final ServerPlayer ze2, final ServerLevel zd) {
+        if (ze2 != null) {
+            ze1.gameMode.setGameModeForPlayer(ze2.gameMode.getGameModeForPlayer(), ze2.gameMode.getPreviousGameModeForPlayer());
         }
         else if (this.overrideGameMode != null) {
-            xe1.gameMode.setGameModeForPlayer(this.overrideGameMode);
+            ze1.gameMode.setGameModeForPlayer(this.overrideGameMode, GameType.NOT_SET);
         }
-        xe1.gameMode.updateGameMode(bjx.getLevelData().getGameType());
+        ze1.gameMode.updateGameMode(zd.getServer().getWorldData().getGameType());
     }
     
     public void setAllowCheatsForAllPlayers(final boolean boolean1) {
@@ -671,57 +708,52 @@ public abstract class PlayerList {
     
     public void removeAll() {
         for (int integer2 = 0; integer2 < this.players.size(); ++integer2) {
-            this.players.get(integer2).connection.disconnect(new TranslatableComponent("multiplayer.disconnect.server_shutdown", new Object[0]));
+            this.players.get(integer2).connection.disconnect(new TranslatableComponent("multiplayer.disconnect.server_shutdown"));
         }
     }
     
-    public void broadcastMessage(final Component lf, final boolean boolean2) {
-        this.server.sendMessage(lf);
-        final ChatType ld4 = boolean2 ? ChatType.SYSTEM : ChatType.CHAT;
-        this.broadcastAll(new ClientboundChatPacket(lf, ld4));
+    public void broadcastMessage(final Component mr, final ChatType mo, final UUID uUID) {
+        this.server.sendMessage(mr, uUID);
+        this.broadcastAll(new ClientboundChatPacket(mr, mo, uUID));
     }
     
-    public void broadcastMessage(final Component lf) {
-        this.broadcastMessage(lf, true);
-    }
-    
-    public ServerStatsCounter getPlayerStats(final Player ayj) {
-        final UUID uUID3 = ayj.getUUID();
-        ServerStatsCounter aan4 = (uUID3 == null) ? null : this.stats.get(uUID3);
-        if (aan4 == null) {
-            final File file5 = new File(this.server.getLevel(DimensionType.OVERWORLD).getLevelStorage().getFolder(), "stats");
+    public ServerStatsCounter getPlayerStats(final Player bec) {
+        final UUID uUID3 = bec.getUUID();
+        ServerStatsCounter acq4 = (uUID3 == null) ? null : this.stats.get(uUID3);
+        if (acq4 == null) {
+            final File file5 = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile();
             final File file6 = new File(file5, uUID3 + ".json");
             if (!file6.exists()) {
-                final File file7 = new File(file5, ayj.getName().getString() + ".json");
+                final File file7 = new File(file5, bec.getName().getString() + ".json");
                 if (file7.exists() && file7.isFile()) {
                     file7.renameTo(file6);
                 }
             }
-            aan4 = new ServerStatsCounter(this.server, file6);
-            this.stats.put(uUID3, aan4);
+            acq4 = new ServerStatsCounter(this.server, file6);
+            this.stats.put(uUID3, acq4);
         }
-        return aan4;
+        return acq4;
     }
     
-    public PlayerAdvancements getPlayerAdvancements(final ServerPlayer xe) {
-        final UUID uUID3 = xe.getUUID();
-        PlayerAdvancements sv4 = this.advancements.get(uUID3);
-        if (sv4 == null) {
-            final File file5 = new File(this.server.getLevel(DimensionType.OVERWORLD).getLevelStorage().getFolder(), "advancements");
+    public PlayerAdvancements getPlayerAdvancements(final ServerPlayer ze) {
+        final UUID uUID3 = ze.getUUID();
+        PlayerAdvancements uq4 = this.advancements.get(uUID3);
+        if (uq4 == null) {
+            final File file5 = this.server.getWorldPath(LevelResource.PLAYER_ADVANCEMENTS_DIR).toFile();
             final File file6 = new File(file5, uUID3 + ".json");
-            sv4 = new PlayerAdvancements(this.server, file6, xe);
-            this.advancements.put(uUID3, sv4);
+            uq4 = new PlayerAdvancements(this.server.getFixerUpper(), this, this.server.getAdvancements(), file6, ze);
+            this.advancements.put(uUID3, uq4);
         }
-        sv4.setPlayer(xe);
-        return sv4;
+        uq4.setPlayer(ze);
+        return uq4;
     }
     
     public void setViewDistance(final int integer) {
         this.viewDistance = integer;
         this.broadcastAll(new ClientboundSetChunkCacheRadiusPacket(integer));
-        for (final ServerLevel xd4 : this.server.getAllLevels()) {
-            if (xd4 != null) {
-                xd4.getChunkSource().setViewDistance(integer);
+        for (final ServerLevel zd4 : this.server.getAllLevels()) {
+            if (zd4 != null) {
+                zd4.getChunkSource().setViewDistance(integer);
             }
         }
     }
@@ -740,14 +772,14 @@ public abstract class PlayerList {
     }
     
     public void reloadResources() {
-        for (final PlayerAdvancements sv3 : this.advancements.values()) {
-            sv3.reload();
+        for (final PlayerAdvancements uq3 : this.advancements.values()) {
+            uq3.reload(this.server.getAdvancements());
         }
         this.broadcastAll(new ClientboundUpdateTagsPacket(this.server.getTags()));
-        final ClientboundUpdateRecipesPacket ph2 = new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getRecipes());
-        for (final ServerPlayer xe4 : this.players) {
-            xe4.connection.send(ph2);
-            xe4.getRecipeBook().sendInitialRecipeBook(xe4);
+        final ClientboundUpdateRecipesPacket qv2 = new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getRecipes());
+        for (final ServerPlayer ze4 : this.players) {
+            ze4.connection.send(qv2);
+            ze4.getRecipeBook().sendInitialRecipeBook(ze4);
         }
     }
     
diff --git a/src/net/minecraft/server/players/ServerOpList.java b/src/net/minecraft/server/players/ServerOpList.java
index 3f09a19..f99265e 100644
--- a/src/net/minecraft/server/players/ServerOpList.java
+++ b/src/net/minecraft/server/players/ServerOpList.java
@@ -19,15 +19,15 @@ public class ServerOpList extends StoredUserList<GameProfile, ServerOpListEntry>
     public String[] getUserList() {
         final String[] arr2 = new String[((StoredUserList<K, ServerOpListEntry>)this).getEntries().size()];
         int integer3 = 0;
-        for (final StoredUserEntry<GameProfile> zr5 : ((StoredUserList<K, ServerOpListEntry>)this).getEntries()) {
-            arr2[integer3++] = zr5.getUser().getName();
+        for (final StoredUserEntry<GameProfile> abs5 : ((StoredUserList<K, ServerOpListEntry>)this).getEntries()) {
+            arr2[integer3++] = abs5.getUser().getName();
         }
         return arr2;
     }
     
     public boolean canBypassPlayerLimit(final GameProfile gameProfile) {
-        final ServerOpListEntry zq3 = this.get(gameProfile);
-        return zq3 != null && zq3.getBypassesPlayerLimit();
+        final ServerOpListEntry abr3 = this.get(gameProfile);
+        return abr3 != null && abr3.getBypassesPlayerLimit();
     }
     
     @Override
diff --git a/src/net/minecraft/server/players/ServerOpListEntry.java b/src/net/minecraft/server/players/ServerOpListEntry.java
index bd0ffab..ef448d5 100644
--- a/src/net/minecraft/server/players/ServerOpListEntry.java
+++ b/src/net/minecraft/server/players/ServerOpListEntry.java
@@ -15,7 +15,7 @@ public class ServerOpListEntry extends StoredUserEntry<GameProfile> {
     }
     
     public ServerOpListEntry(final JsonObject jsonObject) {
-        super(createGameProfile(jsonObject), jsonObject);
+        super(createGameProfile(jsonObject));
         this.level = (jsonObject.has("level") ? jsonObject.get("level").getAsInt() : 0);
         this.bypassesPlayerLimit = (jsonObject.has("bypassesPlayerLimit") && jsonObject.get("bypassesPlayerLimit").getAsBoolean());
     }
@@ -35,7 +35,6 @@ public class ServerOpListEntry extends StoredUserEntry<GameProfile> {
         }
         jsonObject.addProperty("uuid", (this.getUser().getId() == null) ? "" : this.getUser().getId().toString());
         jsonObject.addProperty("name", this.getUser().getName());
-        super.serialize(jsonObject);
         jsonObject.addProperty("level", this.level);
         jsonObject.addProperty("bypassesPlayerLimit", this.bypassesPlayerLimit);
     }
diff --git a/src/net/minecraft/server/players/StoredUserEntry.java b/src/net/minecraft/server/players/StoredUserEntry.java
index 97b634d..adac3e3 100644
--- a/src/net/minecraft/server/players/StoredUserEntry.java
+++ b/src/net/minecraft/server/players/StoredUserEntry.java
@@ -3,15 +3,11 @@ package net.minecraft.server.players;
 import com.google.gson.JsonObject;
 import javax.annotation.Nullable;
 
-public class StoredUserEntry<T> {
+public abstract class StoredUserEntry<T> {
     @Nullable
     private final T user;
     
-    public StoredUserEntry(final T object) {
-        this.user = object;
-    }
-    
-    protected StoredUserEntry(@Nullable final T object, final JsonObject jsonObject) {
+    public StoredUserEntry(@Nullable final T object) {
         this.user = object;
     }
     
@@ -24,6 +20,5 @@ public class StoredUserEntry<T> {
         return false;
     }
     
-    protected void serialize(final JsonObject jsonObject) {
-    }
+    protected abstract void serialize(final JsonObject jsonObject);
 }
diff --git a/src/net/minecraft/server/players/StoredUserList.java b/src/net/minecraft/server/players/StoredUserList.java
index c00708f..12f28bf 100644
--- a/src/net/minecraft/server/players/StoredUserList.java
+++ b/src/net/minecraft/server/players/StoredUserList.java
@@ -1,22 +1,17 @@
 package net.minecraft.server.players;
 
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import com.google.gson.JsonDeserializer;
+import com.google.gson.GsonBuilder;
 import org.apache.logging.log4j.LogManager;
-import java.io.FileNotFoundException;
 import java.io.BufferedReader;
-import java.lang.reflect.Type;
-import java.io.Reader;
 import net.minecraft.util.GsonHelper;
+import java.io.Reader;
 import java.io.BufferedWriter;
-import java.io.Writer;
-import org.apache.commons.io.IOUtils;
+import com.google.gson.JsonElement;
 import com.google.common.io.Files;
 import java.nio.charset.StandardCharsets;
+import java.util.function.Consumer;
+import net.minecraft.Util;
+import com.google.gson.JsonArray;
 import java.util.Collection;
 import com.google.gson.JsonObject;
 import java.util.Iterator;
@@ -24,45 +19,29 @@ import java.util.List;
 import com.google.common.collect.Lists;
 import javax.annotation.Nullable;
 import java.io.IOException;
-import com.google.gson.GsonBuilder;
 import com.google.common.collect.Maps;
-import java.lang.reflect.ParameterizedType;
 import java.util.Map;
 import java.io.File;
 import com.google.gson.Gson;
 import org.apache.logging.log4j.Logger;
 
-public class StoredUserList<K, V extends StoredUserEntry<K>> {
+public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
     protected static final Logger LOGGER;
-    protected final Gson gson;
+    private static final Gson GSON;
     private final File file;
     private final Map<String, V> map;
-    private boolean enabled;
-    private static final ParameterizedType USERLIST_ENTRY_TYPE;
     
     public StoredUserList(final File file) {
         this.map = Maps.newHashMap();
-        this.enabled = true;
         this.file = file;
-        final GsonBuilder gsonBuilder3 = new GsonBuilder().setPrettyPrinting();
-        gsonBuilder3.registerTypeHierarchyAdapter(StoredUserEntry.class, new Serializer());
-        this.gson = gsonBuilder3.create();
-    }
-    
-    public boolean isEnabled() {
-        return this.enabled;
-    }
-    
-    public void setEnabled(final boolean boolean1) {
-        this.enabled = boolean1;
     }
     
     public File getFile() {
         return this.file;
     }
     
-    public void add(final V zr) {
-        this.map.put(this.getKeyForUser(zr.getUser()), zr);
+    public void add(final V abs) {
+        this.map.put(this.getKeyForUser(abs.getUser()), abs);
         try {
             this.save();
         }
@@ -87,8 +66,8 @@ public class StoredUserList<K, V extends StoredUserEntry<K>> {
         }
     }
     
-    public void remove(final StoredUserEntry<K> zr) {
-        this.remove(zr.getUser());
+    public void remove(final StoredUserEntry<K> abs) {
+        this.remove(abs.getUser());
     }
     
     public String[] getUserList() {
@@ -109,9 +88,9 @@ public class StoredUserList<K, V extends StoredUserEntry<K>> {
     
     private void removeExpired() {
         final List<K> list2 = Lists.newArrayList();
-        for (final V zr4 : this.map.values()) {
-            if (zr4.hasExpired()) {
-                list2.add(zr4.getUser());
+        for (final V abs4 : this.map.values()) {
+            if (abs4.hasExpired()) {
+                list2.add(abs4.getUser());
             }
         }
         for (final K object4 : list2) {
@@ -119,87 +98,39 @@ public class StoredUserList<K, V extends StoredUserEntry<K>> {
         }
     }
     
-    protected StoredUserEntry<K> createEntry(final JsonObject jsonObject) {
-        return new StoredUserEntry<K>(null, jsonObject);
-    }
+    protected abstract StoredUserEntry<K> createEntry(final JsonObject jsonObject);
     
     public Collection<V> getEntries() {
         return this.map.values();
     }
     
     public void save() throws IOException {
-        final Collection<V> collection2 = this.map.values();
-        final String string3 = this.gson.toJson(collection2);
-        BufferedWriter bufferedWriter4 = null;
-        try {
-            bufferedWriter4 = Files.newWriter(this.file, StandardCharsets.UTF_8);
-            bufferedWriter4.write(string3);
-        }
-        finally {
-            IOUtils.closeQuietly((Writer)bufferedWriter4);
+        final JsonArray jsonArray2 = new JsonArray();
+        this.map.values().stream().map(abs -> Util.<JsonObject>make(new JsonObject(), abs::serialize)).forEach(jsonArray2::add);
+        try (final BufferedWriter bufferedWriter3 = Files.newWriter(this.file, StandardCharsets.UTF_8)) {
+            StoredUserList.GSON.toJson(jsonArray2, bufferedWriter3);
         }
     }
     
-    public void load() throws FileNotFoundException {
+    public void load() throws IOException {
         if (!this.file.exists()) {
             return;
         }
-        BufferedReader bufferedReader2 = null;
-        try {
-            bufferedReader2 = Files.newReader(this.file, StandardCharsets.UTF_8);
-            final Collection<StoredUserEntry<K>> collection3 = GsonHelper.<Collection<StoredUserEntry<K>>>fromJson(this.gson, bufferedReader2, StoredUserList.USERLIST_ENTRY_TYPE);
-            if (collection3 != null) {
-                this.map.clear();
-                for (final StoredUserEntry<K> zr5 : collection3) {
-                    if (zr5.getUser() != null) {
-                        this.map.put(this.getKeyForUser(zr5.getUser()), (V)zr5);
-                    }
+        try (final BufferedReader bufferedReader2 = Files.newReader(this.file, StandardCharsets.UTF_8)) {
+            final JsonArray jsonArray4 = StoredUserList.GSON.<JsonArray>fromJson(bufferedReader2, JsonArray.class);
+            this.map.clear();
+            for (final JsonElement jsonElement6 : jsonArray4) {
+                final JsonObject jsonObject7 = GsonHelper.convertToJsonObject(jsonElement6, "entry");
+                final StoredUserEntry<K> abs8 = this.createEntry(jsonObject7);
+                if (abs8.getUser() != null) {
+                    this.map.put(this.getKeyForUser(abs8.getUser()), (V)abs8);
                 }
             }
         }
-        finally {
-            IOUtils.closeQuietly((Reader)bufferedReader2);
-        }
     }
     
     static {
         LOGGER = LogManager.getLogger();
-        USERLIST_ENTRY_TYPE = new ParameterizedType() {
-            @Override
-            public Type[] getActualTypeArguments() {
-                return new Type[] { StoredUserEntry.class };
-            }
-            
-            @Override
-            public Type getRawType() {
-                return List.class;
-            }
-            
-            @Override
-            public Type getOwnerType() {
-                return null;
-            }
-        };
-    }
-    
-    class Serializer implements JsonDeserializer<StoredUserEntry<K>>, JsonSerializer<StoredUserEntry<K>> {
-        private Serializer() {
-        }
-        
-        @Override
-        public JsonElement serialize(final StoredUserEntry<K> zr, final Type type, final JsonSerializationContext jsonSerializationContext) {
-            final JsonObject jsonObject5 = new JsonObject();
-            zr.serialize(jsonObject5);
-            return jsonObject5;
-        }
-        
-        @Override
-        public StoredUserEntry<K> deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
-            if (jsonElement.isJsonObject()) {
-                final JsonObject jsonObject5 = jsonElement.getAsJsonObject();
-                return StoredUserList.this.createEntry(jsonObject5);
-            }
-            return null;
-        }
+        GSON = new GsonBuilder().setPrettyPrinting().create();
     }
 }
diff --git a/src/net/minecraft/server/players/UserBanList.java b/src/net/minecraft/server/players/UserBanList.java
index 7a9b7ff..e997422 100644
--- a/src/net/minecraft/server/players/UserBanList.java
+++ b/src/net/minecraft/server/players/UserBanList.java
@@ -23,8 +23,8 @@ public class UserBanList extends StoredUserList<GameProfile, UserBanListEntry> {
     public String[] getUserList() {
         final String[] arr2 = new String[((StoredUserList<K, UserBanListEntry>)this).getEntries().size()];
         int integer3 = 0;
-        for (final StoredUserEntry<GameProfile> zr5 : ((StoredUserList<K, UserBanListEntry>)this).getEntries()) {
-            arr2[integer3++] = zr5.getUser().getName();
+        for (final StoredUserEntry<GameProfile> abs5 : ((StoredUserList<K, UserBanListEntry>)this).getEntries()) {
+            arr2[integer3++] = abs5.getUser().getName();
         }
         return arr2;
     }
diff --git a/src/net/minecraft/server/players/UserWhiteList.java b/src/net/minecraft/server/players/UserWhiteList.java
index b858734..59bfb8c 100644
--- a/src/net/minecraft/server/players/UserWhiteList.java
+++ b/src/net/minecraft/server/players/UserWhiteList.java
@@ -23,8 +23,8 @@ public class UserWhiteList extends StoredUserList<GameProfile, UserWhiteListEntr
     public String[] getUserList() {
         final String[] arr2 = new String[((StoredUserList<K, UserWhiteListEntry>)this).getEntries().size()];
         int integer3 = 0;
-        for (final StoredUserEntry<GameProfile> zr5 : ((StoredUserList<K, UserWhiteListEntry>)this).getEntries()) {
-            arr2[integer3++] = zr5.getUser().getName();
+        for (final StoredUserEntry<GameProfile> abs5 : ((StoredUserList<K, UserWhiteListEntry>)this).getEntries()) {
+            arr2[integer3++] = abs5.getUser().getName();
         }
         return arr2;
     }
diff --git a/src/net/minecraft/server/players/UserWhiteListEntry.java b/src/net/minecraft/server/players/UserWhiteListEntry.java
index f5ebace..255b510 100644
--- a/src/net/minecraft/server/players/UserWhiteListEntry.java
+++ b/src/net/minecraft/server/players/UserWhiteListEntry.java
@@ -10,7 +10,7 @@ public class UserWhiteListEntry extends StoredUserEntry<GameProfile> {
     }
     
     public UserWhiteListEntry(final JsonObject jsonObject) {
-        super(createGameProfile(jsonObject), jsonObject);
+        super(createGameProfile(jsonObject));
     }
     
     @Override
@@ -20,7 +20,6 @@ public class UserWhiteListEntry extends StoredUserEntry<GameProfile> {
         }
         jsonObject.addProperty("uuid", (this.getUser().getId() == null) ? "" : this.getUser().getId().toString());
         jsonObject.addProperty("name", this.getUser().getName());
-        super.serialize(jsonObject);
     }
     
     private static GameProfile createGameProfile(final JsonObject jsonObject) {
diff --git a/src/net/minecraft/server/rcon/RconConsoleSource.java b/src/net/minecraft/server/rcon/RconConsoleSource.java
index 30135de..0a0d71f 100644
--- a/src/net/minecraft/server/rcon/RconConsoleSource.java
+++ b/src/net/minecraft/server/rcon/RconConsoleSource.java
@@ -1,18 +1,19 @@
 package net.minecraft.server.rcon;
 
+import java.util.UUID;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.commands.CommandSource;
 
 public class RconConsoleSource implements CommandSource {
+    private static final TextComponent RCON_COMPONENT;
     private final StringBuffer buffer;
     private final MinecraftServer server;
     
@@ -30,13 +31,13 @@ public class RconConsoleSource implements CommandSource {
     }
     
     public CommandSourceStack createCommandSourceStack() {
-        final ServerLevel xd2 = this.server.getLevel(DimensionType.OVERWORLD);
-        return new CommandSourceStack(this, new Vec3(xd2.getSharedSpawnPos()), Vec2.ZERO, xd2, 4, "Recon", new TextComponent("Rcon"), this.server, null);
+        final ServerLevel zd2 = this.server.overworld();
+        return new CommandSourceStack(this, Vec3.atLowerCornerOf(zd2.getSharedSpawnPos()), Vec2.ZERO, zd2, 4, "Rcon", RconConsoleSource.RCON_COMPONENT, this.server, null);
     }
     
     @Override
-    public void sendMessage(final Component lf) {
-        this.buffer.append(lf.getString());
+    public void sendMessage(final Component mr, final UUID uUID) {
+        this.buffer.append(mr.getString());
     }
     
     @Override
@@ -53,4 +54,8 @@ public class RconConsoleSource implements CommandSource {
     public boolean shouldInformAdmins() {
         return this.server.shouldRconBroadcast();
     }
+    
+    static {
+        RCON_COMPONENT = new TextComponent("Rcon");
+    }
 }
diff --git a/src/net/minecraft/server/rcon/thread/GenericThread.java b/src/net/minecraft/server/rcon/thread/GenericThread.java
index d89ed37..cbdb4f8 100644
--- a/src/net/minecraft/server/rcon/thread/GenericThread.java
+++ b/src/net/minecraft/server/rcon/thread/GenericThread.java
@@ -1,42 +1,26 @@
 package net.minecraft.server.rcon.thread;
 
 import org.apache.logging.log4j.LogManager;
-import java.util.Iterator;
-import java.io.IOException;
 import net.minecraft.DefaultUncaughtExceptionHandlerWithName;
-import com.google.common.collect.Lists;
-import java.net.ServerSocket;
-import java.net.DatagramSocket;
-import java.util.List;
-import net.minecraft.server.ServerInterface;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.logging.log4j.Logger;
 
 public abstract class GenericThread implements Runnable {
     private static final Logger LOGGER;
     private static final AtomicInteger UNIQUE_THREAD_ID;
-    protected boolean running;
-    protected final ServerInterface serverInterface;
+    protected volatile boolean running;
     protected final String name;
     protected Thread thread;
-    protected final int maxStopWait = 5;
-    protected final List<DatagramSocket> datagramSockets;
-    protected final List<ServerSocket> serverSockets;
     
-    protected GenericThread(final ServerInterface sz, final String string) {
-        this.datagramSockets = Lists.newArrayList();
-        this.serverSockets = Lists.newArrayList();
-        this.serverInterface = sz;
+    protected GenericThread(final String string) {
         this.name = string;
-        if (this.serverInterface.isDebugging()) {
-            this.warn("Debugging is enabled, performance maybe reduced!");
-        }
     }
     
     public synchronized void start() {
+        this.running = true;
         (this.thread = new Thread(this, this.name + " #" + GenericThread.UNIQUE_THREAD_ID.incrementAndGet())).setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandlerWithName(GenericThread.LOGGER));
         this.thread.start();
-        this.running = true;
+        GenericThread.LOGGER.info("Thread {} started", this.name);
     }
     
     public synchronized void stop() {
@@ -48,26 +32,20 @@ public abstract class GenericThread implements Runnable {
         while (this.thread.isAlive()) {
             try {
                 this.thread.join(1000L);
-                ++integer2;
-                if (5 <= integer2) {
-                    this.warn("Waited " + integer2 + " seconds attempting force stop!");
-                    this.closeSockets(true);
+                if (++integer2 >= 5) {
+                    GenericThread.LOGGER.warn("Waited {} seconds attempting force stop!", integer2);
                 }
                 else {
                     if (!this.thread.isAlive()) {
                         continue;
                     }
-                    this.warn("Thread " + this + " (" + this.thread.getState() + ") failed to exit after " + integer2 + " second(s)");
-                    this.warn("Stack:");
-                    for (final StackTraceElement stackTraceElement6 : this.thread.getStackTrace()) {
-                        this.warn(stackTraceElement6.toString());
-                    }
+                    GenericThread.LOGGER.warn("Thread {} ({}) failed to exit after {} second(s)", this, this.thread.getState(), integer2, new Exception("Stack:"));
                     this.thread.interrupt();
                 }
             }
             catch (InterruptedException ex) {}
         }
-        this.closeSockets(true);
+        GenericThread.LOGGER.info("Thread {} stopped", this.name);
         this.thread = null;
     }
     
@@ -75,95 +53,6 @@ public abstract class GenericThread implements Runnable {
         return this.running;
     }
     
-    protected void debug(final String string) {
-        this.serverInterface.debug(string);
-    }
-    
-    protected void info(final String string) {
-        this.serverInterface.info(string);
-    }
-    
-    protected void warn(final String string) {
-        this.serverInterface.warn(string);
-    }
-    
-    protected void error(final String string) {
-        this.serverInterface.error(string);
-    }
-    
-    protected int currentPlayerCount() {
-        return this.serverInterface.getPlayerCount();
-    }
-    
-    protected void registerSocket(final DatagramSocket datagramSocket) {
-        this.debug("registerSocket: " + datagramSocket);
-        this.datagramSockets.add(datagramSocket);
-    }
-    
-    protected boolean closeSocket(final DatagramSocket datagramSocket, final boolean boolean2) {
-        this.debug("closeSocket: " + datagramSocket);
-        if (null == datagramSocket) {
-            return false;
-        }
-        boolean boolean3 = false;
-        if (!datagramSocket.isClosed()) {
-            datagramSocket.close();
-            boolean3 = true;
-        }
-        if (boolean2) {
-            this.datagramSockets.remove(datagramSocket);
-        }
-        return boolean3;
-    }
-    
-    protected boolean closeSocket(final ServerSocket serverSocket) {
-        return this.closeSocket(serverSocket, true);
-    }
-    
-    protected boolean closeSocket(final ServerSocket serverSocket, final boolean boolean2) {
-        this.debug("closeSocket: " + serverSocket);
-        if (null == serverSocket) {
-            return false;
-        }
-        boolean boolean3 = false;
-        try {
-            if (!serverSocket.isClosed()) {
-                serverSocket.close();
-                boolean3 = true;
-            }
-        }
-        catch (IOException iOException5) {
-            this.warn("IO: " + iOException5.getMessage());
-        }
-        if (boolean2) {
-            this.serverSockets.remove(serverSocket);
-        }
-        return boolean3;
-    }
-    
-    protected void closeSockets() {
-        this.closeSockets(false);
-    }
-    
-    protected void closeSockets(final boolean boolean1) {
-        int integer3 = 0;
-        for (final DatagramSocket datagramSocket5 : this.datagramSockets) {
-            if (this.closeSocket(datagramSocket5, false)) {
-                ++integer3;
-            }
-        }
-        this.datagramSockets.clear();
-        for (final ServerSocket serverSocket5 : this.serverSockets) {
-            if (this.closeSocket(serverSocket5, false)) {
-                ++integer3;
-            }
-        }
-        this.serverSockets.clear();
-        if (boolean1 && 0 < integer3) {
-            this.warn("Force closed " + integer3 + " sockets");
-        }
-    }
-    
     static {
         LOGGER = LogManager.getLogger();
         UNIQUE_THREAD_ID = new AtomicInteger(0);
diff --git a/src/net/minecraft/server/rcon/thread/QueryThreadGs4.java b/src/net/minecraft/server/rcon/thread/QueryThreadGs4.java
index 1f9e760..70ce696 100644
--- a/src/net/minecraft/server/rcon/thread/QueryThreadGs4.java
+++ b/src/net/minecraft/server/rcon/thread/QueryThreadGs4.java
@@ -2,14 +2,14 @@ package net.minecraft.server.rcon.thread;
 
 import java.util.Random;
 import java.nio.charset.StandardCharsets;
-import java.net.SocketException;
+import java.util.Date;
+import org.apache.logging.log4j.LogManager;
 import java.net.PortUnreachableException;
 import java.net.SocketTimeoutException;
-import java.util.Iterator;
 import net.minecraft.Util;
 import net.minecraft.server.rcon.PktUtils;
 import java.io.IOException;
-import java.util.Date;
+import java.net.DatagramPacket;
 import com.google.common.collect.Maps;
 import java.net.UnknownHostException;
 import java.net.InetAddress;
@@ -17,10 +17,11 @@ import net.minecraft.server.ServerInterface;
 import net.minecraft.server.rcon.NetworkDataOutputStream;
 import java.net.SocketAddress;
 import java.util.Map;
-import java.net.DatagramPacket;
 import java.net.DatagramSocket;
+import org.apache.logging.log4j.Logger;
 
 public class QueryThreadGs4 extends GenericThread {
+    private static final Logger LOGGER;
     private long lastChallengeCheck;
     private final int port;
     private final int serverPort;
@@ -29,24 +30,23 @@ public class QueryThreadGs4 extends GenericThread {
     private final String worldName;
     private DatagramSocket socket;
     private final byte[] buffer;
-    private DatagramPacket request;
-    private final Map<SocketAddress, String> idents;
     private String hostIp;
     private String serverIp;
     private final Map<SocketAddress, RequestChallenge> validChallenges;
-    private final long lastChallengeClean;
     private final NetworkDataOutputStream rulesResponse;
     private long lastRulesResponse;
+    private final ServerInterface serverInterface;
     
-    public QueryThreadGs4(final ServerInterface sz) {
-        super(sz, "Query Listener");
+    public QueryThreadGs4(final ServerInterface uv) {
+        super("Query Listener");
         this.buffer = new byte[1460];
-        this.port = sz.getProperties().queryPort;
-        this.serverIp = sz.getServerIp();
-        this.serverPort = sz.getServerPort();
-        this.serverName = sz.getServerName();
-        this.maxPlayers = sz.getMaxPlayers();
-        this.worldName = sz.getLevelIdName();
+        this.serverInterface = uv;
+        this.port = uv.getProperties().queryPort;
+        this.serverIp = uv.getServerIp();
+        this.serverPort = uv.getServerPort();
+        this.serverName = uv.getServerName();
+        this.maxPlayers = uv.getMaxPlayers();
+        this.worldName = uv.getLevelIdName();
         this.lastRulesResponse = 0L;
         this.hostIp = "0.0.0.0";
         if (this.serverIp.isEmpty() || this.hostIp.equals(this.serverIp)) {
@@ -56,16 +56,14 @@ public class QueryThreadGs4 extends GenericThread {
                 this.hostIp = inetAddress3.getHostAddress();
             }
             catch (UnknownHostException unknownHostException3) {
-                this.warn("Unable to determine local host IP, please set server-ip in server.properties: " + unknownHostException3.getMessage());
+                QueryThreadGs4.LOGGER.warn("Unable to determine local host IP, please set server-ip in server.properties", (Throwable)unknownHostException3);
             }
         }
         else {
             this.hostIp = this.serverIp;
         }
-        this.idents = Maps.newHashMap();
         this.rulesResponse = new NetworkDataOutputStream(1460);
         this.validChallenges = Maps.newHashMap();
-        this.lastChallengeClean = new Date().getTime();
     }
     
     private void sendTo(final byte[] arr, final DatagramPacket datagramPacket) throws IOException {
@@ -76,40 +74,40 @@ public class QueryThreadGs4 extends GenericThread {
         final byte[] arr3 = datagramPacket.getData();
         final int integer4 = datagramPacket.getLength();
         final SocketAddress socketAddress5 = datagramPacket.getSocketAddress();
-        this.debug("Packet len " + integer4 + " [" + socketAddress5 + "]");
+        QueryThreadGs4.LOGGER.debug("Packet len {} [{}]", integer4, socketAddress5);
         if (3 > integer4 || -2 != arr3[0] || -3 != arr3[1]) {
-            this.debug("Invalid packet [" + socketAddress5 + "]");
+            QueryThreadGs4.LOGGER.debug("Invalid packet [{}]", socketAddress5);
             return false;
         }
-        this.debug("Packet '" + PktUtils.toHexString(arr3[2]) + "' [" + socketAddress5 + "]");
+        QueryThreadGs4.LOGGER.debug("Packet '{}' [{}]", PktUtils.toHexString(arr3[2]), socketAddress5);
         switch (arr3[2]) {
             case 9: {
                 this.sendChallenge(datagramPacket);
-                this.debug("Challenge [" + socketAddress5 + "]");
+                QueryThreadGs4.LOGGER.debug("Challenge [{}]", socketAddress5);
                 return true;
             }
             case 0: {
                 if (!this.validChallenge(datagramPacket)) {
-                    this.debug("Invalid challenge [" + socketAddress5 + "]");
+                    QueryThreadGs4.LOGGER.debug("Invalid challenge [{}]", socketAddress5);
                     return false;
                 }
                 if (15 == integer4) {
                     this.sendTo(this.buildRuleResponse(datagramPacket), datagramPacket);
-                    this.debug("Rules [" + socketAddress5 + "]");
+                    QueryThreadGs4.LOGGER.debug("Rules [{}]", socketAddress5);
                     break;
                 }
-                final NetworkDataOutputStream zy6 = new NetworkDataOutputStream(1460);
-                zy6.write(0);
-                zy6.writeBytes(this.getIdentBytes(datagramPacket.getSocketAddress()));
-                zy6.writeString(this.serverName);
-                zy6.writeString("SMP");
-                zy6.writeString(this.worldName);
-                zy6.writeString(Integer.toString(this.currentPlayerCount()));
-                zy6.writeString(Integer.toString(this.maxPlayers));
-                zy6.writeShort((short)this.serverPort);
-                zy6.writeString(this.hostIp);
-                this.sendTo(zy6.toByteArray(), datagramPacket);
-                this.debug("Status [" + socketAddress5 + "]");
+                final NetworkDataOutputStream abz6 = new NetworkDataOutputStream(1460);
+                abz6.write(0);
+                abz6.writeBytes(this.getIdentBytes(datagramPacket.getSocketAddress()));
+                abz6.writeString(this.serverName);
+                abz6.writeString("SMP");
+                abz6.writeString(this.worldName);
+                abz6.writeString(Integer.toString(this.serverInterface.getPlayerCount()));
+                abz6.writeString(Integer.toString(this.maxPlayers));
+                abz6.writeShort((short)this.serverPort);
+                abz6.writeString(this.hostIp);
+                this.sendTo(abz6.toByteArray(), datagramPacket);
+                QueryThreadGs4.LOGGER.debug("Status [{}]", socketAddress5);
                 break;
             }
         }
@@ -147,7 +145,7 @@ public class QueryThreadGs4 extends GenericThread {
         this.rulesResponse.writeString("map");
         this.rulesResponse.writeString(this.worldName);
         this.rulesResponse.writeString("numplayers");
-        this.rulesResponse.writeString("" + this.currentPlayerCount());
+        this.rulesResponse.writeString("" + this.serverInterface.getPlayerCount());
         this.rulesResponse.writeString("maxplayers");
         this.rulesResponse.writeString("" + this.maxPlayers);
         this.rulesResponse.writeString("hostport");
@@ -177,10 +175,7 @@ public class QueryThreadGs4 extends GenericThread {
             return false;
         }
         final byte[] arr4 = datagramPacket.getData();
-        if (this.validChallenges.get(socketAddress3).getChallenge() != PktUtils.intFromNetworkByteArray(arr4, 7, datagramPacket.getLength())) {
-            return false;
-        }
-        return true;
+        return this.validChallenges.get(socketAddress3).getChallenge() == PktUtils.intFromNetworkByteArray(arr4, 7, datagramPacket.getLength());
     }
     
     private void sendChallenge(final DatagramPacket datagramPacket) throws IOException {
@@ -198,38 +193,33 @@ public class QueryThreadGs4 extends GenericThread {
             return;
         }
         this.lastChallengeCheck = long2;
-        final Iterator<Map.Entry<SocketAddress, RequestChallenge>> iterator4 = this.validChallenges.entrySet().iterator();
-        while (iterator4.hasNext()) {
-            final Map.Entry<SocketAddress, RequestChallenge> entry5 = iterator4.next();
-            if (entry5.getValue().before(long2)) {
-                iterator4.remove();
-            }
-        }
+        this.validChallenges.values().removeIf(a -> a.before(long2));
     }
     
     @Override
     public void run() {
-        this.info("Query running on " + this.serverIp + ":" + this.port);
+        QueryThreadGs4.LOGGER.info("Query running on {}:{}", this.serverIp, this.port);
         this.lastChallengeCheck = Util.getMillis();
-        this.request = new DatagramPacket(this.buffer, this.buffer.length);
+        final DatagramPacket datagramPacket2 = new DatagramPacket(this.buffer, this.buffer.length);
         try {
             while (this.running) {
                 try {
-                    this.socket.receive(this.request);
+                    this.socket.receive(datagramPacket2);
                     this.pruneChallenges();
-                    this.processPacket(this.request);
+                    this.processPacket(datagramPacket2);
                 }
-                catch (SocketTimeoutException socketTimeoutException2) {
+                catch (SocketTimeoutException socketTimeoutException3) {
                     this.pruneChallenges();
                 }
                 catch (PortUnreachableException ex) {}
-                catch (IOException iOException2) {
-                    this.recoverSocketError(iOException2);
+                catch (IOException iOException3) {
+                    this.recoverSocketError(iOException3);
                 }
             }
         }
         finally {
-            this.closeSockets();
+            QueryThreadGs4.LOGGER.debug("closeSocket: {}:{}", this.serverIp, this.port);
+            this.socket.close();
         }
     }
     
@@ -239,7 +229,7 @@ public class QueryThreadGs4 extends GenericThread {
             return;
         }
         if (0 >= this.port || 65535 < this.port) {
-            this.warn("Invalid query port " + this.port + " found in server.properties (queries disabled)");
+            QueryThreadGs4.LOGGER.warn("Invalid query port {} found in server.properties (queries disabled)", this.port);
             return;
         }
         if (this.initSocket()) {
@@ -251,32 +241,29 @@ public class QueryThreadGs4 extends GenericThread {
         if (!this.running) {
             return;
         }
-        this.warn("Unexpected exception, buggy JRE? (" + exception + ")");
+        QueryThreadGs4.LOGGER.warn("Unexpected exception", (Throwable)exception);
         if (!this.initSocket()) {
-            this.error("Failed to recover from buggy JRE, shutting down!");
+            QueryThreadGs4.LOGGER.error("Failed to recover from exception, shutting down!");
             this.running = false;
         }
     }
     
     private boolean initSocket() {
         try {
-            this.registerSocket(this.socket = new DatagramSocket(this.port, InetAddress.getByName(this.serverIp)));
-            this.socket.setSoTimeout(500);
+            (this.socket = new DatagramSocket(this.port, InetAddress.getByName(this.serverIp))).setSoTimeout(500);
             return true;
         }
-        catch (SocketException socketException2) {
-            this.warn("Unable to initialise query system on " + this.serverIp + ":" + this.port + " (Socket): " + socketException2.getMessage());
-        }
-        catch (UnknownHostException unknownHostException2) {
-            this.warn("Unable to initialise query system on " + this.serverIp + ":" + this.port + " (Unknown Host): " + unknownHostException2.getMessage());
-        }
         catch (Exception exception2) {
-            this.warn("Unable to initialise query system on " + this.serverIp + ":" + this.port + " (E): " + exception2.getMessage());
+            QueryThreadGs4.LOGGER.warn("Unable to initialise query system on {}:{}", this.serverIp, this.port, exception2);
+            return false;
         }
-        return false;
     }
     
-    class RequestChallenge {
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+    
+    static class RequestChallenge {
         private final long time;
         private final int challenge;
         private final byte[] identBytes;
@@ -285,11 +272,11 @@ public class QueryThreadGs4 extends GenericThread {
         
         public RequestChallenge(final DatagramPacket datagramPacket) {
             this.time = new Date().getTime();
-            final byte[] arr4 = datagramPacket.getData();
-            (this.identBytes = new byte[4])[0] = arr4[3];
-            this.identBytes[1] = arr4[4];
-            this.identBytes[2] = arr4[5];
-            this.identBytes[3] = arr4[6];
+            final byte[] arr3 = datagramPacket.getData();
+            (this.identBytes = new byte[4])[0] = arr3[3];
+            this.identBytes[1] = arr3[4];
+            this.identBytes[2] = arr3[5];
+            this.identBytes[3] = arr3[6];
             this.ident = new String(this.identBytes, StandardCharsets.UTF_8);
             this.challenge = new Random().nextInt(16777216);
             this.challengeBytes = String.format("\t%s%d\u0000", this.ident, this.challenge).getBytes(StandardCharsets.UTF_8);
diff --git a/src/net/minecraft/server/rcon/thread/RconClient.java b/src/net/minecraft/server/rcon/thread/RconClient.java
index eed71a2..433a1f1 100644
--- a/src/net/minecraft/server/rcon/thread/RconClient.java
+++ b/src/net/minecraft/server/rcon/thread/RconClient.java
@@ -18,10 +18,12 @@ public class RconClient extends GenericThread {
     private Socket client;
     private final byte[] buf;
     private final String rconPassword;
+    private final ServerInterface serverInterface;
     
-    RconClient(final ServerInterface sz, final String string, final Socket socket) {
-        super(sz, "RCON Client");
+    RconClient(final ServerInterface uv, final String string, final Socket socket) {
+        super("RCON Client " + socket.getInetAddress());
         this.buf = new byte[1460];
+        this.serverInterface = uv;
         this.client = socket;
         try {
             this.client.setSoTimeout(0);
@@ -30,7 +32,6 @@ public class RconClient extends GenericThread {
             this.running = false;
         }
         this.rconPassword = string;
-        this.info("Rcon connection from: " + socket.getInetAddress());
     }
     
     @Override
@@ -93,6 +94,8 @@ public class RconClient extends GenericThread {
         }
         finally {
             this.closeSocket();
+            RconClient.LOGGER.info("Thread {} shutting down", this.name);
+            this.running = false;
         }
     }
     
@@ -125,8 +128,9 @@ public class RconClient extends GenericThread {
     
     @Override
     public void stop() {
-        super.stop();
+        this.running = false;
         this.closeSocket();
+        super.stop();
     }
     
     private void closeSocket() {
@@ -137,7 +141,7 @@ public class RconClient extends GenericThread {
             this.client.close();
         }
         catch (IOException iOException2) {
-            this.warn("IO: " + iOException2.getMessage());
+            RconClient.LOGGER.warn("Failed to close socket", (Throwable)iOException2);
         }
         this.client = null;
     }
diff --git a/src/net/minecraft/server/rcon/thread/RconThread.java b/src/net/minecraft/server/rcon/thread/RconThread.java
index 4725b29..29f39cf 100644
--- a/src/net/minecraft/server/rcon/thread/RconThread.java
+++ b/src/net/minecraft/server/rcon/thread/RconThread.java
@@ -1,62 +1,54 @@
 package net.minecraft.server.rcon.thread;
 
+import org.apache.logging.log4j.LogManager;
+import java.util.Iterator;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.io.IOException;
 import java.net.SocketTimeoutException;
-import java.util.Iterator;
-import com.google.common.collect.Maps;
 import net.minecraft.server.dedicated.DedicatedServerProperties;
+import com.google.common.collect.Lists;
 import net.minecraft.server.ServerInterface;
-import java.net.SocketAddress;
-import java.util.Map;
+import java.util.List;
 import java.net.ServerSocket;
+import org.apache.logging.log4j.Logger;
 
 public class RconThread extends GenericThread {
+    private static final Logger LOGGER;
     private final int port;
     private String serverIp;
     private ServerSocket socket;
     private final String rconPassword;
-    private Map<SocketAddress, RconClient> clients;
+    private final List<RconClient> clients;
+    private final ServerInterface serverInterface;
     
-    public RconThread(final ServerInterface sz) {
-        super(sz, "RCON Listener");
-        final DedicatedServerProperties we3 = sz.getProperties();
-        this.port = we3.rconPort;
-        this.rconPassword = we3.rconPassword;
-        this.serverIp = sz.getServerIp();
+    public RconThread(final ServerInterface uv) {
+        super("RCON Listener");
+        this.clients = Lists.newArrayList();
+        this.serverInterface = uv;
+        final DedicatedServerProperties ye3 = uv.getProperties();
+        this.port = ye3.rconPort;
+        this.rconPassword = ye3.rconPassword;
+        this.serverIp = uv.getServerIp();
         if (this.serverIp.isEmpty()) {
             this.serverIp = "0.0.0.0";
         }
-        this.initClients();
-        this.socket = null;
-    }
-    
-    private void initClients() {
-        this.clients = Maps.newHashMap();
     }
     
     private void clearClients() {
-        final Iterator<Map.Entry<SocketAddress, RconClient>> iterator2 = this.clients.entrySet().iterator();
-        while (iterator2.hasNext()) {
-            final Map.Entry<SocketAddress, RconClient> entry3 = iterator2.next();
-            if (!entry3.getValue().isRunning()) {
-                iterator2.remove();
-            }
-        }
+        this.clients.removeIf(acf -> !acf.isRunning());
     }
     
     @Override
     public void run() {
-        this.info("RCON running on " + this.serverIp + ":" + this.port);
+        RconThread.LOGGER.info("RCON running on {}:{}", this.serverIp, this.port);
         try {
             while (this.running) {
                 try {
                     final Socket socket2 = this.socket.accept();
-                    socket2.setSoTimeout(500);
-                    final RconClient aae3 = new RconClient(this.serverInterface, this.rconPassword, socket2);
-                    aae3.start();
-                    this.clients.put(socket2.getRemoteSocketAddress(), aae3);
+                    final RconClient acf3 = new RconClient(this.serverInterface, this.rconPassword, socket2);
+                    acf3.start();
+                    this.clients.add(acf3);
                     this.clearClients();
                 }
                 catch (SocketTimeoutException socketTimeoutException2) {
@@ -66,7 +58,7 @@ public class RconThread extends GenericThread {
                     if (!this.running) {
                         continue;
                     }
-                    this.info("IO: " + iOException2.getMessage());
+                    RconThread.LOGGER.info("IO exception: ", (Throwable)iOException2);
                 }
             }
         }
@@ -78,11 +70,11 @@ public class RconThread extends GenericThread {
     @Override
     public void start() {
         if (this.rconPassword.isEmpty()) {
-            this.warn("No rcon password set in server.properties, rcon disabled!");
+            RconThread.LOGGER.warn("No rcon password set in server.properties, rcon disabled!");
             return;
         }
         if (0 >= this.port || 65535 < this.port) {
-            this.warn("Invalid rcon port " + this.port + " found in server.properties, rcon disabled!");
+            RconThread.LOGGER.warn("Invalid rcon port {} found in server.properties, rcon disabled!", this.port);
             return;
         }
         if (this.running) {
@@ -93,17 +85,34 @@ public class RconThread extends GenericThread {
             super.start();
         }
         catch (IOException iOException2) {
-            this.warn("Unable to initialise rcon on " + this.serverIp + ":" + this.port + " : " + iOException2.getMessage());
+            RconThread.LOGGER.warn("Unable to initialise rcon on {}:{}", this.serverIp, this.port, iOException2);
         }
     }
     
     @Override
     public void stop() {
-        super.stop();
-        for (final Map.Entry<SocketAddress, RconClient> entry3 : this.clients.entrySet()) {
-            entry3.getValue().stop();
-        }
+        this.running = false;
         this.closeSocket(this.socket);
-        this.initClients();
+        super.stop();
+        for (final RconClient acf3 : this.clients) {
+            if (acf3.isRunning()) {
+                acf3.stop();
+            }
+        }
+        this.clients.clear();
+    }
+    
+    private void closeSocket(final ServerSocket serverSocket) {
+        RconThread.LOGGER.debug("closeSocket: {}", serverSocket);
+        try {
+            serverSocket.close();
+        }
+        catch (IOException iOException3) {
+            RconThread.LOGGER.warn("Failed to close socket", (Throwable)iOException3);
+        }
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
     }
 }
diff --git a/src/net/minecraft/sounds/Music.java b/src/net/minecraft/sounds/Music.java
new file mode 100644
index 0000000..66150cd
--- /dev/null
+++ b/src/net/minecraft/sounds/Music.java
@@ -0,0 +1,41 @@
+package net.minecraft.sounds;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
+
+public class Music {
+    public static final Codec<Music> CODEC;
+    private final SoundEvent event;
+    private final int minDelay;
+    private final int maxDelay;
+    private final boolean replaceCurrentMusic;
+    
+    public Music(final SoundEvent ack, final int integer2, final int integer3, final boolean boolean4) {
+        this.event = ack;
+        this.minDelay = integer2;
+        this.maxDelay = integer3;
+        this.replaceCurrentMusic = boolean4;
+    }
+    
+    public SoundEvent getEvent() {
+        return this.event;
+    }
+    
+    public int getMinDelay() {
+        return this.minDelay;
+    }
+    
+    public int getMaxDelay() {
+        return this.maxDelay;
+    }
+    
+    public boolean replaceCurrentMusic() {
+        return this.replaceCurrentMusic;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)SoundEvent.CODEC.fieldOf("sound").forGetter(aci -> aci.event), (App)Codec.INT.fieldOf("min_delay").forGetter(aci -> aci.minDelay), (App)Codec.INT.fieldOf("max_delay").forGetter(aci -> aci.maxDelay), (App)Codec.BOOL.fieldOf("replace_current_music").forGetter(aci -> aci.replaceCurrentMusic)).apply(instance, Music::new));
+    }
+}
diff --git a/src/net/minecraft/sounds/Musics.java b/src/net/minecraft/sounds/Musics.java
new file mode 100644
index 0000000..d918809
--- /dev/null
+++ b/src/net/minecraft/sounds/Musics.java
@@ -0,0 +1,25 @@
+package net.minecraft.sounds;
+
+public class Musics {
+    public static final Music MENU;
+    public static final Music CREATIVE;
+    public static final Music CREDITS;
+    public static final Music END_BOSS;
+    public static final Music END;
+    public static final Music UNDER_WATER;
+    public static final Music GAME;
+    
+    public static Music createGameMusic(final SoundEvent ack) {
+        return new Music(ack, 12000, 24000, false);
+    }
+    
+    static {
+        MENU = new Music(SoundEvents.MUSIC_MENU, 20, 600, true);
+        CREATIVE = new Music(SoundEvents.MUSIC_CREATIVE, 12000, 24000, false);
+        CREDITS = new Music(SoundEvents.MUSIC_CREDITS, 0, 0, true);
+        END_BOSS = new Music(SoundEvents.MUSIC_DRAGON, 0, 0, true);
+        END = new Music(SoundEvents.MUSIC_END, 6000, 24000, false);
+        UNDER_WATER = createGameMusic(SoundEvents.MUSIC_UNDER_WATER);
+        GAME = createGameMusic(SoundEvents.MUSIC_GAME);
+    }
+}
diff --git a/src/net/minecraft/sounds/SoundEvent.java b/src/net/minecraft/sounds/SoundEvent.java
index b4de19a..0b3ecb5 100644
--- a/src/net/minecraft/sounds/SoundEvent.java
+++ b/src/net/minecraft/sounds/SoundEvent.java
@@ -1,15 +1,22 @@
 package net.minecraft.sounds;
 
+import java.util.function.Function;
 import net.minecraft.resources.ResourceLocation;
+import com.mojang.serialization.Codec;
 
 public class SoundEvent {
+    public static final Codec<SoundEvent> CODEC;
     private final ResourceLocation location;
     
-    public SoundEvent(final ResourceLocation sm) {
-        this.location = sm;
+    public SoundEvent(final ResourceLocation uh) {
+        this.location = uh;
     }
     
     public ResourceLocation getLocation() {
         return this.location;
     }
+    
+    static {
+        CODEC = ResourceLocation.CODEC.xmap((Function)SoundEvent::new, ack -> ack.location);
+    }
 }
diff --git a/src/net/minecraft/sounds/SoundEvents.java b/src/net/minecraft/sounds/SoundEvents.java
index 54b54d4..a8db43a 100644
--- a/src/net/minecraft/sounds/SoundEvents.java
+++ b/src/net/minecraft/sounds/SoundEvents.java
@@ -5,12 +5,32 @@ import net.minecraft.core.Registry;
 
 public class SoundEvents {
     public static final SoundEvent AMBIENT_CAVE;
+    public static final SoundEvent AMBIENT_BASALT_DELTAS_ADDITIONS;
+    public static final SoundEvent AMBIENT_BASALT_DELTAS_LOOP;
+    public static final SoundEvent AMBIENT_BASALT_DELTAS_MOOD;
+    public static final SoundEvent AMBIENT_CRIMSON_FOREST_ADDITIONS;
+    public static final SoundEvent AMBIENT_CRIMSON_FOREST_LOOP;
+    public static final SoundEvent AMBIENT_CRIMSON_FOREST_MOOD;
+    public static final SoundEvent AMBIENT_NETHER_WASTES_ADDITIONS;
+    public static final SoundEvent AMBIENT_NETHER_WASTES_LOOP;
+    public static final SoundEvent AMBIENT_NETHER_WASTES_MOOD;
+    public static final SoundEvent AMBIENT_SOUL_SAND_VALLEY_ADDITIONS;
+    public static final SoundEvent AMBIENT_SOUL_SAND_VALLEY_LOOP;
+    public static final SoundEvent AMBIENT_SOUL_SAND_VALLEY_MOOD;
+    public static final SoundEvent AMBIENT_WARPED_FOREST_ADDITIONS;
+    public static final SoundEvent AMBIENT_WARPED_FOREST_LOOP;
+    public static final SoundEvent AMBIENT_WARPED_FOREST_MOOD;
     public static final SoundEvent AMBIENT_UNDERWATER_ENTER;
     public static final SoundEvent AMBIENT_UNDERWATER_EXIT;
     public static final SoundEvent AMBIENT_UNDERWATER_LOOP;
     public static final SoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS;
     public static final SoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS_RARE;
     public static final SoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS_ULTRA_RARE;
+    public static final SoundEvent ANCIENT_DEBRIS_BREAK;
+    public static final SoundEvent ANCIENT_DEBRIS_STEP;
+    public static final SoundEvent ANCIENT_DEBRIS_PLACE;
+    public static final SoundEvent ANCIENT_DEBRIS_HIT;
+    public static final SoundEvent ANCIENT_DEBRIS_FALL;
     public static final SoundEvent ANVIL_BREAK;
     public static final SoundEvent ANVIL_DESTROY;
     public static final SoundEvent ANVIL_FALL;
@@ -26,6 +46,7 @@ public class SoundEvents {
     public static final SoundEvent ARMOR_EQUIP_GOLD;
     public static final SoundEvent ARMOR_EQUIP_IRON;
     public static final SoundEvent ARMOR_EQUIP_LEATHER;
+    public static final SoundEvent ARMOR_EQUIP_NETHERITE;
     public static final SoundEvent ARMOR_EQUIP_TURTLE;
     public static final SoundEvent ARMOR_STAND_BREAK;
     public static final SoundEvent ARMOR_STAND_FALL;
@@ -45,6 +66,11 @@ public class SoundEvents {
     public static final SoundEvent BAMBOO_SAPLING_PLACE;
     public static final SoundEvent BARREL_CLOSE;
     public static final SoundEvent BARREL_OPEN;
+    public static final SoundEvent BASALT_BREAK;
+    public static final SoundEvent BASALT_STEP;
+    public static final SoundEvent BASALT_PLACE;
+    public static final SoundEvent BASALT_HIT;
+    public static final SoundEvent BASALT_FALL;
     public static final SoundEvent BAT_AMBIENT;
     public static final SoundEvent BAT_DEATH;
     public static final SoundEvent BAT_HURT;
@@ -74,11 +100,13 @@ public class SoundEvents {
     public static final SoundEvent BLAZE_SHOOT;
     public static final SoundEvent BOAT_PADDLE_LAND;
     public static final SoundEvent BOAT_PADDLE_WATER;
+    public static final SoundEvent BONE_BLOCK_BREAK;
+    public static final SoundEvent BONE_BLOCK_FALL;
+    public static final SoundEvent BONE_BLOCK_HIT;
+    public static final SoundEvent BONE_BLOCK_PLACE;
+    public static final SoundEvent BONE_BLOCK_STEP;
     public static final SoundEvent BOOK_PAGE_TURN;
     public static final SoundEvent BOOK_PUT;
-    public static final SoundEvent FISHING_BOBBER_RETRIEVE;
-    public static final SoundEvent FISHING_BOBBER_SPLASH;
-    public static final SoundEvent FISHING_BOBBER_THROW;
     public static final SoundEvent BLASTFURNACE_FIRE_CRACKLE;
     public static final SoundEvent BOTTLE_EMPTY;
     public static final SoundEvent BOTTLE_FILL;
@@ -105,6 +133,11 @@ public class SoundEvents {
     public static final SoundEvent CAT_HURT;
     public static final SoundEvent CAT_PURR;
     public static final SoundEvent CAT_PURREOW;
+    public static final SoundEvent CHAIN_BREAK;
+    public static final SoundEvent CHAIN_FALL;
+    public static final SoundEvent CHAIN_HIT;
+    public static final SoundEvent CHAIN_PLACE;
+    public static final SoundEvent CHAIN_STEP;
     public static final SoundEvent CHEST_CLOSE;
     public static final SoundEvent CHEST_LOCKED;
     public static final SoundEvent CHEST_OPEN;
@@ -116,11 +149,6 @@ public class SoundEvents {
     public static final SoundEvent CHORUS_FLOWER_DEATH;
     public static final SoundEvent CHORUS_FLOWER_GROW;
     public static final SoundEvent CHORUS_FRUIT_TELEPORT;
-    public static final SoundEvent WOOL_BREAK;
-    public static final SoundEvent WOOL_FALL;
-    public static final SoundEvent WOOL_HIT;
-    public static final SoundEvent WOOL_PLACE;
-    public static final SoundEvent WOOL_STEP;
     public static final SoundEvent COD_AMBIENT;
     public static final SoundEvent COD_DEATH;
     public static final SoundEvent COD_FLOP;
@@ -135,6 +163,11 @@ public class SoundEvents {
     public static final SoundEvent CONDUIT_AMBIENT_SHORT;
     public static final SoundEvent CONDUIT_ATTACK_TARGET;
     public static final SoundEvent CONDUIT_DEACTIVATE;
+    public static final SoundEvent CORAL_BLOCK_BREAK;
+    public static final SoundEvent CORAL_BLOCK_FALL;
+    public static final SoundEvent CORAL_BLOCK_HIT;
+    public static final SoundEvent CORAL_BLOCK_PLACE;
+    public static final SoundEvent CORAL_BLOCK_STEP;
     public static final SoundEvent COW_AMBIENT;
     public static final SoundEvent COW_DEATH;
     public static final SoundEvent COW_HURT;
@@ -170,6 +203,7 @@ public class SoundEvents {
     public static final SoundEvent DONKEY_ANGRY;
     public static final SoundEvent DONKEY_CHEST;
     public static final SoundEvent DONKEY_DEATH;
+    public static final SoundEvent DONKEY_EAT;
     public static final SoundEvent DONKEY_HURT;
     public static final SoundEvent DROWNED_AMBIENT;
     public static final SoundEvent DROWNED_AMBIENT_WATER;
@@ -241,6 +275,9 @@ public class SoundEvents {
     public static final SoundEvent FIRE_AMBIENT;
     public static final SoundEvent FIRE_EXTINGUISH;
     public static final SoundEvent FISH_SWIM;
+    public static final SoundEvent FISHING_BOBBER_RETRIEVE;
+    public static final SoundEvent FISHING_BOBBER_SPLASH;
+    public static final SoundEvent FISHING_BOBBER_THROW;
     public static final SoundEvent FLINTANDSTEEL_USE;
     public static final SoundEvent FOX_AGGRO;
     public static final SoundEvent FOX_AMBIENT;
@@ -252,6 +289,12 @@ public class SoundEvents {
     public static final SoundEvent FOX_SLEEP;
     public static final SoundEvent FOX_SNIFF;
     public static final SoundEvent FOX_SPIT;
+    public static final SoundEvent FOX_TELEPORT;
+    public static final SoundEvent ROOTS_BREAK;
+    public static final SoundEvent ROOTS_STEP;
+    public static final SoundEvent ROOTS_PLACE;
+    public static final SoundEvent ROOTS_HIT;
+    public static final SoundEvent ROOTS_FALL;
     public static final SoundEvent FURNACE_FIRE_CRACKLE;
     public static final SoundEvent GENERIC_BIG_FALL;
     public static final SoundEvent GENERIC_BURN;
@@ -270,6 +313,11 @@ public class SoundEvents {
     public static final SoundEvent GHAST_SCREAM;
     public static final SoundEvent GHAST_SHOOT;
     public static final SoundEvent GHAST_WARN;
+    public static final SoundEvent GILDED_BLACKSTONE_BREAK;
+    public static final SoundEvent GILDED_BLACKSTONE_FALL;
+    public static final SoundEvent GILDED_BLACKSTONE_HIT;
+    public static final SoundEvent GILDED_BLACKSTONE_PLACE;
+    public static final SoundEvent GILDED_BLACKSTONE_STEP;
     public static final SoundEvent GLASS_BREAK;
     public static final SoundEvent GLASS_FALL;
     public static final SoundEvent GLASS_HIT;
@@ -280,16 +328,6 @@ public class SoundEvents {
     public static final SoundEvent GRASS_HIT;
     public static final SoundEvent GRASS_PLACE;
     public static final SoundEvent GRASS_STEP;
-    public static final SoundEvent WET_GRASS_BREAK;
-    public static final SoundEvent WET_GRASS_FALL;
-    public static final SoundEvent WET_GRASS_HIT;
-    public static final SoundEvent WET_GRASS_PLACE;
-    public static final SoundEvent WET_GRASS_STEP;
-    public static final SoundEvent CORAL_BLOCK_BREAK;
-    public static final SoundEvent CORAL_BLOCK_FALL;
-    public static final SoundEvent CORAL_BLOCK_HIT;
-    public static final SoundEvent CORAL_BLOCK_PLACE;
-    public static final SoundEvent CORAL_BLOCK_STEP;
     public static final SoundEvent GRAVEL_BREAK;
     public static final SoundEvent GRAVEL_FALL;
     public static final SoundEvent GRAVEL_HIT;
@@ -305,6 +343,14 @@ public class SoundEvents {
     public static final SoundEvent GUARDIAN_HURT;
     public static final SoundEvent GUARDIAN_HURT_LAND;
     public static final SoundEvent HOE_TILL;
+    public static final SoundEvent HOGLIN_AMBIENT;
+    public static final SoundEvent HOGLIN_ANGRY;
+    public static final SoundEvent HOGLIN_ATTACK;
+    public static final SoundEvent HOGLIN_CONVERTED_TO_ZOMBIFIED;
+    public static final SoundEvent HOGLIN_DEATH;
+    public static final SoundEvent HOGLIN_HURT;
+    public static final SoundEvent HOGLIN_RETREAT;
+    public static final SoundEvent HOGLIN_STEP;
     public static final SoundEvent HONEY_BLOCK_BREAK;
     public static final SoundEvent HONEY_BLOCK_FALL;
     public static final SoundEvent HONEY_BLOCK_HIT;
@@ -336,14 +382,6 @@ public class SoundEvents {
     public static final SoundEvent HUSK_DEATH;
     public static final SoundEvent HUSK_HURT;
     public static final SoundEvent HUSK_STEP;
-    public static final SoundEvent RAVAGER_AMBIENT;
-    public static final SoundEvent RAVAGER_ATTACK;
-    public static final SoundEvent RAVAGER_CELEBRATE;
-    public static final SoundEvent RAVAGER_DEATH;
-    public static final SoundEvent RAVAGER_HURT;
-    public static final SoundEvent RAVAGER_STEP;
-    public static final SoundEvent RAVAGER_STUNNED;
-    public static final SoundEvent RAVAGER_ROAR;
     public static final SoundEvent ILLUSIONER_AMBIENT;
     public static final SoundEvent ILLUSIONER_CAST_SPELL;
     public static final SoundEvent ILLUSIONER_DEATH;
@@ -396,10 +434,19 @@ public class SoundEvents {
     public static final SoundEvent LLAMA_SPIT;
     public static final SoundEvent LLAMA_STEP;
     public static final SoundEvent LLAMA_SWAG;
+    public static final SoundEvent MAGMA_CUBE_DEATH_SMALL;
+    public static final SoundEvent LODESTONE_BREAK;
+    public static final SoundEvent LODESTONE_STEP;
+    public static final SoundEvent LODESTONE_PLACE;
+    public static final SoundEvent LODESTONE_HIT;
+    public static final SoundEvent LODESTONE_FALL;
+    public static final SoundEvent LODESTONE_COMPASS_LOCK;
     public static final SoundEvent MAGMA_CUBE_DEATH;
     public static final SoundEvent MAGMA_CUBE_HURT;
+    public static final SoundEvent MAGMA_CUBE_HURT_SMALL;
     public static final SoundEvent MAGMA_CUBE_JUMP;
     public static final SoundEvent MAGMA_CUBE_SQUISH;
+    public static final SoundEvent MAGMA_CUBE_SQUISH_SMALL;
     public static final SoundEvent METAL_BREAK;
     public static final SoundEvent METAL_FALL;
     public static final SoundEvent METAL_HIT;
@@ -415,19 +462,83 @@ public class SoundEvents {
     public static final SoundEvent MOOSHROOM_MILK_SUSPICIOUSLY;
     public static final SoundEvent MOOSHROOM_SHEAR;
     public static final SoundEvent MULE_AMBIENT;
+    public static final SoundEvent MULE_ANGRY;
     public static final SoundEvent MULE_CHEST;
     public static final SoundEvent MULE_DEATH;
+    public static final SoundEvent MULE_EAT;
     public static final SoundEvent MULE_HURT;
     public static final SoundEvent MUSIC_CREATIVE;
     public static final SoundEvent MUSIC_CREDITS;
+    public static final SoundEvent MUSIC_DISC_11;
+    public static final SoundEvent MUSIC_DISC_13;
+    public static final SoundEvent MUSIC_DISC_BLOCKS;
+    public static final SoundEvent MUSIC_DISC_CAT;
+    public static final SoundEvent MUSIC_DISC_CHIRP;
+    public static final SoundEvent MUSIC_DISC_FAR;
+    public static final SoundEvent MUSIC_DISC_MALL;
+    public static final SoundEvent MUSIC_DISC_MELLOHI;
+    public static final SoundEvent MUSIC_DISC_PIGSTEP;
+    public static final SoundEvent MUSIC_DISC_STAL;
+    public static final SoundEvent MUSIC_DISC_STRAD;
+    public static final SoundEvent MUSIC_DISC_WAIT;
+    public static final SoundEvent MUSIC_DISC_WARD;
     public static final SoundEvent MUSIC_DRAGON;
     public static final SoundEvent MUSIC_END;
     public static final SoundEvent MUSIC_GAME;
     public static final SoundEvent MUSIC_MENU;
-    public static final SoundEvent MUSIC_NETHER;
+    public static final SoundEvent MUSIC_BIOME_BASALT_DELTAS;
+    public static final SoundEvent MUSIC_BIOME_NETHER_WASTES;
+    public static final SoundEvent MUSIC_BIOME_SOUL_SAND_VALLEY;
+    public static final SoundEvent MUSIC_BIOME_CRIMSON_FOREST;
+    public static final SoundEvent MUSIC_BIOME_WARPED_FOREST;
     public static final SoundEvent MUSIC_UNDER_WATER;
+    public static final SoundEvent NETHER_BRICKS_BREAK;
+    public static final SoundEvent NETHER_BRICKS_STEP;
+    public static final SoundEvent NETHER_BRICKS_PLACE;
+    public static final SoundEvent NETHER_BRICKS_HIT;
+    public static final SoundEvent NETHER_BRICKS_FALL;
     public static final SoundEvent NETHER_WART_BREAK;
     public static final SoundEvent NETHER_WART_PLANTED;
+    public static final SoundEvent STEM_BREAK;
+    public static final SoundEvent STEM_STEP;
+    public static final SoundEvent STEM_PLACE;
+    public static final SoundEvent STEM_HIT;
+    public static final SoundEvent STEM_FALL;
+    public static final SoundEvent NYLIUM_BREAK;
+    public static final SoundEvent NYLIUM_STEP;
+    public static final SoundEvent NYLIUM_PLACE;
+    public static final SoundEvent NYLIUM_HIT;
+    public static final SoundEvent NYLIUM_FALL;
+    public static final SoundEvent NETHER_SPROUTS_BREAK;
+    public static final SoundEvent NETHER_SPROUTS_STEP;
+    public static final SoundEvent NETHER_SPROUTS_PLACE;
+    public static final SoundEvent NETHER_SPROUTS_HIT;
+    public static final SoundEvent NETHER_SPROUTS_FALL;
+    public static final SoundEvent FUNGUS_BREAK;
+    public static final SoundEvent FUNGUS_STEP;
+    public static final SoundEvent FUNGUS_PLACE;
+    public static final SoundEvent FUNGUS_HIT;
+    public static final SoundEvent FUNGUS_FALL;
+    public static final SoundEvent WEEPING_VINES_BREAK;
+    public static final SoundEvent WEEPING_VINES_STEP;
+    public static final SoundEvent WEEPING_VINES_PLACE;
+    public static final SoundEvent WEEPING_VINES_HIT;
+    public static final SoundEvent WEEPING_VINES_FALL;
+    public static final SoundEvent WART_BLOCK_BREAK;
+    public static final SoundEvent WART_BLOCK_STEP;
+    public static final SoundEvent WART_BLOCK_PLACE;
+    public static final SoundEvent WART_BLOCK_HIT;
+    public static final SoundEvent WART_BLOCK_FALL;
+    public static final SoundEvent NETHERITE_BLOCK_BREAK;
+    public static final SoundEvent NETHERITE_BLOCK_STEP;
+    public static final SoundEvent NETHERITE_BLOCK_PLACE;
+    public static final SoundEvent NETHERITE_BLOCK_HIT;
+    public static final SoundEvent NETHERITE_BLOCK_FALL;
+    public static final SoundEvent NETHERRACK_BREAK;
+    public static final SoundEvent NETHERRACK_STEP;
+    public static final SoundEvent NETHERRACK_PLACE;
+    public static final SoundEvent NETHERRACK_HIT;
+    public static final SoundEvent NETHERRACK_FALL;
     public static final SoundEvent NOTE_BLOCK_BASEDRUM;
     public static final SoundEvent NOTE_BLOCK_BASS;
     public static final SoundEvent NOTE_BLOCK_BELL;
@@ -474,10 +585,12 @@ public class SoundEvents {
     public static final SoundEvent PARROT_IMITATE_EVOKER;
     public static final SoundEvent PARROT_IMITATE_GHAST;
     public static final SoundEvent PARROT_IMITATE_GUARDIAN;
+    public static final SoundEvent PARROT_IMITATE_HOGLIN;
     public static final SoundEvent PARROT_IMITATE_HUSK;
     public static final SoundEvent PARROT_IMITATE_ILLUSIONER;
     public static final SoundEvent PARROT_IMITATE_MAGMA_CUBE;
     public static final SoundEvent PARROT_IMITATE_PHANTOM;
+    public static final SoundEvent PARROT_IMITATE_PIGLIN;
     public static final SoundEvent PARROT_IMITATE_PILLAGER;
     public static final SoundEvent PARROT_IMITATE_RAVAGER;
     public static final SoundEvent PARROT_IMITATE_SHULKER;
@@ -491,6 +604,7 @@ public class SoundEvents {
     public static final SoundEvent PARROT_IMITATE_WITCH;
     public static final SoundEvent PARROT_IMITATE_WITHER;
     public static final SoundEvent PARROT_IMITATE_WITHER_SKELETON;
+    public static final SoundEvent PARROT_IMITATE_ZOGLIN;
     public static final SoundEvent PARROT_IMITATE_ZOMBIE;
     public static final SoundEvent PARROT_IMITATE_ZOMBIE_VILLAGER;
     public static final SoundEvent PARROT_STEP;
@@ -505,6 +619,16 @@ public class SoundEvents {
     public static final SoundEvent PIG_HURT;
     public static final SoundEvent PIG_SADDLE;
     public static final SoundEvent PIG_STEP;
+    public static final SoundEvent PIGLIN_ADMIRING_ITEM;
+    public static final SoundEvent PIGLIN_AMBIENT;
+    public static final SoundEvent PIGLIN_ANGRY;
+    public static final SoundEvent PIGLIN_CELEBRATE;
+    public static final SoundEvent PIGLIN_DEATH;
+    public static final SoundEvent PIGLIN_JEALOUS;
+    public static final SoundEvent PIGLIN_HURT;
+    public static final SoundEvent PIGLIN_RETREAT;
+    public static final SoundEvent PIGLIN_STEP;
+    public static final SoundEvent PIGLIN_CONVERTED_TO_ZOMBIFIED;
     public static final SoundEvent PILLAGER_AMBIENT;
     public static final SoundEvent PILLAGER_CELEBRATE;
     public static final SoundEvent PILLAGER_DEATH;
@@ -553,19 +677,29 @@ public class SoundEvents {
     public static final SoundEvent RABBIT_HURT;
     public static final SoundEvent RABBIT_JUMP;
     public static final SoundEvent RAID_HORN;
-    public static final SoundEvent MUSIC_DISC_11;
-    public static final SoundEvent MUSIC_DISC_13;
-    public static final SoundEvent MUSIC_DISC_BLOCKS;
-    public static final SoundEvent MUSIC_DISC_CAT;
-    public static final SoundEvent MUSIC_DISC_CHIRP;
-    public static final SoundEvent MUSIC_DISC_FAR;
-    public static final SoundEvent MUSIC_DISC_MALL;
-    public static final SoundEvent MUSIC_DISC_MELLOHI;
-    public static final SoundEvent MUSIC_DISC_STAL;
-    public static final SoundEvent MUSIC_DISC_STRAD;
-    public static final SoundEvent MUSIC_DISC_WAIT;
-    public static final SoundEvent MUSIC_DISC_WARD;
+    public static final SoundEvent RAVAGER_AMBIENT;
+    public static final SoundEvent RAVAGER_ATTACK;
+    public static final SoundEvent RAVAGER_CELEBRATE;
+    public static final SoundEvent RAVAGER_DEATH;
+    public static final SoundEvent RAVAGER_HURT;
+    public static final SoundEvent RAVAGER_STEP;
+    public static final SoundEvent RAVAGER_STUNNED;
+    public static final SoundEvent RAVAGER_ROAR;
+    public static final SoundEvent NETHER_GOLD_ORE_BREAK;
+    public static final SoundEvent NETHER_GOLD_ORE_FALL;
+    public static final SoundEvent NETHER_GOLD_ORE_HIT;
+    public static final SoundEvent NETHER_GOLD_ORE_PLACE;
+    public static final SoundEvent NETHER_GOLD_ORE_STEP;
+    public static final SoundEvent NETHER_ORE_BREAK;
+    public static final SoundEvent NETHER_ORE_FALL;
+    public static final SoundEvent NETHER_ORE_HIT;
+    public static final SoundEvent NETHER_ORE_PLACE;
+    public static final SoundEvent NETHER_ORE_STEP;
     public static final SoundEvent REDSTONE_TORCH_BURNOUT;
+    public static final SoundEvent RESPAWN_ANCHOR_AMBIENT;
+    public static final SoundEvent RESPAWN_ANCHOR_CHARGE;
+    public static final SoundEvent RESPAWN_ANCHOR_DEPLETE;
+    public static final SoundEvent RESPAWN_ANCHOR_SET_SPAWN;
     public static final SoundEvent SALMON_AMBIENT;
     public static final SoundEvent SALMON_DEATH;
     public static final SoundEvent SALMON_FLOP;
@@ -587,6 +721,11 @@ public class SoundEvents {
     public static final SoundEvent SHEEP_STEP;
     public static final SoundEvent SHIELD_BLOCK;
     public static final SoundEvent SHIELD_BREAK;
+    public static final SoundEvent SHROOMLIGHT_BREAK;
+    public static final SoundEvent SHROOMLIGHT_STEP;
+    public static final SoundEvent SHROOMLIGHT_PLACE;
+    public static final SoundEvent SHROOMLIGHT_HIT;
+    public static final SoundEvent SHROOMLIGHT_FALL;
     public static final SoundEvent SHOVEL_FLATTEN;
     public static final SoundEvent SHULKER_AMBIENT;
     public static final SoundEvent SHULKER_BOX_CLOSE;
@@ -627,13 +766,31 @@ public class SoundEvents {
     public static final SoundEvent SLIME_BLOCK_HIT;
     public static final SoundEvent SLIME_BLOCK_PLACE;
     public static final SoundEvent SLIME_BLOCK_STEP;
-    public static final SoundEvent MAGMA_CUBE_DEATH_SMALL;
-    public static final SoundEvent MAGMA_CUBE_HURT_SMALL;
-    public static final SoundEvent MAGMA_CUBE_SQUISH_SMALL;
+    public static final SoundEvent SOUL_SAND_BREAK;
+    public static final SoundEvent SOUL_SAND_STEP;
+    public static final SoundEvent SOUL_SAND_PLACE;
+    public static final SoundEvent SOUL_SAND_HIT;
+    public static final SoundEvent SOUL_SAND_FALL;
+    public static final SoundEvent SOUL_SOIL_BREAK;
+    public static final SoundEvent SOUL_SOIL_STEP;
+    public static final SoundEvent SOUL_SOIL_PLACE;
+    public static final SoundEvent SOUL_SOIL_HIT;
+    public static final SoundEvent SOUL_SOIL_FALL;
+    public static final SoundEvent SOUL_ESCAPE;
+    public static final SoundEvent STRIDER_AMBIENT;
+    public static final SoundEvent STRIDER_HAPPY;
+    public static final SoundEvent STRIDER_RETREAT;
+    public static final SoundEvent STRIDER_DEATH;
+    public static final SoundEvent STRIDER_HURT;
+    public static final SoundEvent STRIDER_STEP;
+    public static final SoundEvent STRIDER_STEP_LAVA;
+    public static final SoundEvent STRIDER_EAT;
+    public static final SoundEvent STRIDER_SADDLE;
     public static final SoundEvent SLIME_DEATH_SMALL;
     public static final SoundEvent SLIME_HURT_SMALL;
     public static final SoundEvent SLIME_JUMP_SMALL;
     public static final SoundEvent SLIME_SQUISH_SMALL;
+    public static final SoundEvent SMITHING_TABLE_USE;
     public static final SoundEvent SMOKER_SMOKE;
     public static final SoundEvent SNOWBALL_THROW;
     public static final SoundEvent SNOW_BREAK;
@@ -642,6 +799,7 @@ public class SoundEvents {
     public static final SoundEvent SNOW_GOLEM_DEATH;
     public static final SoundEvent SNOW_GOLEM_HURT;
     public static final SoundEvent SNOW_GOLEM_SHOOT;
+    public static final SoundEvent SNOW_GOLEM_SHEAR;
     public static final SoundEvent SNOW_HIT;
     public static final SoundEvent SNOW_PLACE;
     public static final SoundEvent SNOW_STEP;
@@ -739,6 +897,7 @@ public class SoundEvents {
     public static final SoundEvent VINDICATOR_CELEBRATE;
     public static final SoundEvent VINDICATOR_DEATH;
     public static final SoundEvent VINDICATOR_HURT;
+    public static final SoundEvent VINE_STEP;
     public static final SoundEvent LILY_PAD_PLACE;
     public static final SoundEvent WANDERING_TRADER_AMBIENT;
     public static final SoundEvent WANDERING_TRADER_DEATH;
@@ -753,6 +912,11 @@ public class SoundEvents {
     public static final SoundEvent WATER_AMBIENT;
     public static final SoundEvent WEATHER_RAIN;
     public static final SoundEvent WEATHER_RAIN_ABOVE;
+    public static final SoundEvent WET_GRASS_BREAK;
+    public static final SoundEvent WET_GRASS_FALL;
+    public static final SoundEvent WET_GRASS_HIT;
+    public static final SoundEvent WET_GRASS_PLACE;
+    public static final SoundEvent WET_GRASS_STEP;
     public static final SoundEvent WITCH_AMBIENT;
     public static final SoundEvent WITCH_CELEBRATE;
     public static final SoundEvent WITCH_DEATH;
@@ -791,6 +955,17 @@ public class SoundEvents {
     public static final SoundEvent WOODEN_PRESSURE_PLATE_CLICK_OFF;
     public static final SoundEvent WOODEN_PRESSURE_PLATE_CLICK_ON;
     public static final SoundEvent WOOD_STEP;
+    public static final SoundEvent WOOL_BREAK;
+    public static final SoundEvent WOOL_FALL;
+    public static final SoundEvent WOOL_HIT;
+    public static final SoundEvent WOOL_PLACE;
+    public static final SoundEvent WOOL_STEP;
+    public static final SoundEvent ZOGLIN_AMBIENT;
+    public static final SoundEvent ZOGLIN_ANGRY;
+    public static final SoundEvent ZOGLIN_ATTACK;
+    public static final SoundEvent ZOGLIN_DEATH;
+    public static final SoundEvent ZOGLIN_HURT;
+    public static final SoundEvent ZOGLIN_STEP;
     public static final SoundEvent ZOMBIE_AMBIENT;
     public static final SoundEvent ZOMBIE_ATTACK_WOODEN_DOOR;
     public static final SoundEvent ZOMBIE_ATTACK_IRON_DOOR;
@@ -803,10 +978,10 @@ public class SoundEvents {
     public static final SoundEvent ZOMBIE_HORSE_HURT;
     public static final SoundEvent ZOMBIE_HURT;
     public static final SoundEvent ZOMBIE_INFECT;
-    public static final SoundEvent ZOMBIE_PIGMAN_AMBIENT;
-    public static final SoundEvent ZOMBIE_PIGMAN_ANGRY;
-    public static final SoundEvent ZOMBIE_PIGMAN_DEATH;
-    public static final SoundEvent ZOMBIE_PIGMAN_HURT;
+    public static final SoundEvent ZOMBIFIED_PIGLIN_AMBIENT;
+    public static final SoundEvent ZOMBIFIED_PIGLIN_ANGRY;
+    public static final SoundEvent ZOMBIFIED_PIGLIN_DEATH;
+    public static final SoundEvent ZOMBIFIED_PIGLIN_HURT;
     public static final SoundEvent ZOMBIE_STEP;
     public static final SoundEvent ZOMBIE_VILLAGER_AMBIENT;
     public static final SoundEvent ZOMBIE_VILLAGER_CONVERTED;
@@ -821,12 +996,32 @@ public class SoundEvents {
     
     static {
         AMBIENT_CAVE = register("ambient.cave");
+        AMBIENT_BASALT_DELTAS_ADDITIONS = register("ambient.basalt_deltas.additions");
+        AMBIENT_BASALT_DELTAS_LOOP = register("ambient.basalt_deltas.loop");
+        AMBIENT_BASALT_DELTAS_MOOD = register("ambient.basalt_deltas.mood");
+        AMBIENT_CRIMSON_FOREST_ADDITIONS = register("ambient.crimson_forest.additions");
+        AMBIENT_CRIMSON_FOREST_LOOP = register("ambient.crimson_forest.loop");
+        AMBIENT_CRIMSON_FOREST_MOOD = register("ambient.crimson_forest.mood");
+        AMBIENT_NETHER_WASTES_ADDITIONS = register("ambient.nether_wastes.additions");
+        AMBIENT_NETHER_WASTES_LOOP = register("ambient.nether_wastes.loop");
+        AMBIENT_NETHER_WASTES_MOOD = register("ambient.nether_wastes.mood");
+        AMBIENT_SOUL_SAND_VALLEY_ADDITIONS = register("ambient.soul_sand_valley.additions");
+        AMBIENT_SOUL_SAND_VALLEY_LOOP = register("ambient.soul_sand_valley.loop");
+        AMBIENT_SOUL_SAND_VALLEY_MOOD = register("ambient.soul_sand_valley.mood");
+        AMBIENT_WARPED_FOREST_ADDITIONS = register("ambient.warped_forest.additions");
+        AMBIENT_WARPED_FOREST_LOOP = register("ambient.warped_forest.loop");
+        AMBIENT_WARPED_FOREST_MOOD = register("ambient.warped_forest.mood");
         AMBIENT_UNDERWATER_ENTER = register("ambient.underwater.enter");
         AMBIENT_UNDERWATER_EXIT = register("ambient.underwater.exit");
         AMBIENT_UNDERWATER_LOOP = register("ambient.underwater.loop");
         AMBIENT_UNDERWATER_LOOP_ADDITIONS = register("ambient.underwater.loop.additions");
         AMBIENT_UNDERWATER_LOOP_ADDITIONS_RARE = register("ambient.underwater.loop.additions.rare");
         AMBIENT_UNDERWATER_LOOP_ADDITIONS_ULTRA_RARE = register("ambient.underwater.loop.additions.ultra_rare");
+        ANCIENT_DEBRIS_BREAK = register("block.ancient_debris.break");
+        ANCIENT_DEBRIS_STEP = register("block.ancient_debris.step");
+        ANCIENT_DEBRIS_PLACE = register("block.ancient_debris.place");
+        ANCIENT_DEBRIS_HIT = register("block.ancient_debris.hit");
+        ANCIENT_DEBRIS_FALL = register("block.ancient_debris.fall");
         ANVIL_BREAK = register("block.anvil.break");
         ANVIL_DESTROY = register("block.anvil.destroy");
         ANVIL_FALL = register("block.anvil.fall");
@@ -842,6 +1037,7 @@ public class SoundEvents {
         ARMOR_EQUIP_GOLD = register("item.armor.equip_gold");
         ARMOR_EQUIP_IRON = register("item.armor.equip_iron");
         ARMOR_EQUIP_LEATHER = register("item.armor.equip_leather");
+        ARMOR_EQUIP_NETHERITE = register("item.armor.equip_netherite");
         ARMOR_EQUIP_TURTLE = register("item.armor.equip_turtle");
         ARMOR_STAND_BREAK = register("entity.armor_stand.break");
         ARMOR_STAND_FALL = register("entity.armor_stand.fall");
@@ -861,6 +1057,11 @@ public class SoundEvents {
         BAMBOO_SAPLING_PLACE = register("block.bamboo_sapling.place");
         BARREL_CLOSE = register("block.barrel.close");
         BARREL_OPEN = register("block.barrel.open");
+        BASALT_BREAK = register("block.basalt.break");
+        BASALT_STEP = register("block.basalt.step");
+        BASALT_PLACE = register("block.basalt.place");
+        BASALT_HIT = register("block.basalt.hit");
+        BASALT_FALL = register("block.basalt.fall");
         BAT_AMBIENT = register("entity.bat.ambient");
         BAT_DEATH = register("entity.bat.death");
         BAT_HURT = register("entity.bat.hurt");
@@ -890,11 +1091,13 @@ public class SoundEvents {
         BLAZE_SHOOT = register("entity.blaze.shoot");
         BOAT_PADDLE_LAND = register("entity.boat.paddle_land");
         BOAT_PADDLE_WATER = register("entity.boat.paddle_water");
+        BONE_BLOCK_BREAK = register("block.bone_block.break");
+        BONE_BLOCK_FALL = register("block.bone_block.fall");
+        BONE_BLOCK_HIT = register("block.bone_block.hit");
+        BONE_BLOCK_PLACE = register("block.bone_block.place");
+        BONE_BLOCK_STEP = register("block.bone_block.step");
         BOOK_PAGE_TURN = register("item.book.page_turn");
         BOOK_PUT = register("item.book.put");
-        FISHING_BOBBER_RETRIEVE = register("entity.fishing_bobber.retrieve");
-        FISHING_BOBBER_SPLASH = register("entity.fishing_bobber.splash");
-        FISHING_BOBBER_THROW = register("entity.fishing_bobber.throw");
         BLASTFURNACE_FIRE_CRACKLE = register("block.blastfurnace.fire_crackle");
         BOTTLE_EMPTY = register("item.bottle.empty");
         BOTTLE_FILL = register("item.bottle.fill");
@@ -921,6 +1124,11 @@ public class SoundEvents {
         CAT_HURT = register("entity.cat.hurt");
         CAT_PURR = register("entity.cat.purr");
         CAT_PURREOW = register("entity.cat.purreow");
+        CHAIN_BREAK = register("block.chain.break");
+        CHAIN_FALL = register("block.chain.fall");
+        CHAIN_HIT = register("block.chain.hit");
+        CHAIN_PLACE = register("block.chain.place");
+        CHAIN_STEP = register("block.chain.step");
         CHEST_CLOSE = register("block.chest.close");
         CHEST_LOCKED = register("block.chest.locked");
         CHEST_OPEN = register("block.chest.open");
@@ -932,11 +1140,6 @@ public class SoundEvents {
         CHORUS_FLOWER_DEATH = register("block.chorus_flower.death");
         CHORUS_FLOWER_GROW = register("block.chorus_flower.grow");
         CHORUS_FRUIT_TELEPORT = register("item.chorus_fruit.teleport");
-        WOOL_BREAK = register("block.wool.break");
-        WOOL_FALL = register("block.wool.fall");
-        WOOL_HIT = register("block.wool.hit");
-        WOOL_PLACE = register("block.wool.place");
-        WOOL_STEP = register("block.wool.step");
         COD_AMBIENT = register("entity.cod.ambient");
         COD_DEATH = register("entity.cod.death");
         COD_FLOP = register("entity.cod.flop");
@@ -951,6 +1154,11 @@ public class SoundEvents {
         CONDUIT_AMBIENT_SHORT = register("block.conduit.ambient.short");
         CONDUIT_ATTACK_TARGET = register("block.conduit.attack.target");
         CONDUIT_DEACTIVATE = register("block.conduit.deactivate");
+        CORAL_BLOCK_BREAK = register("block.coral_block.break");
+        CORAL_BLOCK_FALL = register("block.coral_block.fall");
+        CORAL_BLOCK_HIT = register("block.coral_block.hit");
+        CORAL_BLOCK_PLACE = register("block.coral_block.place");
+        CORAL_BLOCK_STEP = register("block.coral_block.step");
         COW_AMBIENT = register("entity.cow.ambient");
         COW_DEATH = register("entity.cow.death");
         COW_HURT = register("entity.cow.hurt");
@@ -986,6 +1194,7 @@ public class SoundEvents {
         DONKEY_ANGRY = register("entity.donkey.angry");
         DONKEY_CHEST = register("entity.donkey.chest");
         DONKEY_DEATH = register("entity.donkey.death");
+        DONKEY_EAT = register("entity.donkey.eat");
         DONKEY_HURT = register("entity.donkey.hurt");
         DROWNED_AMBIENT = register("entity.drowned.ambient");
         DROWNED_AMBIENT_WATER = register("entity.drowned.ambient_water");
@@ -1057,6 +1266,9 @@ public class SoundEvents {
         FIRE_AMBIENT = register("block.fire.ambient");
         FIRE_EXTINGUISH = register("block.fire.extinguish");
         FISH_SWIM = register("entity.fish.swim");
+        FISHING_BOBBER_RETRIEVE = register("entity.fishing_bobber.retrieve");
+        FISHING_BOBBER_SPLASH = register("entity.fishing_bobber.splash");
+        FISHING_BOBBER_THROW = register("entity.fishing_bobber.throw");
         FLINTANDSTEEL_USE = register("item.flintandsteel.use");
         FOX_AGGRO = register("entity.fox.aggro");
         FOX_AMBIENT = register("entity.fox.ambient");
@@ -1068,6 +1280,12 @@ public class SoundEvents {
         FOX_SLEEP = register("entity.fox.sleep");
         FOX_SNIFF = register("entity.fox.sniff");
         FOX_SPIT = register("entity.fox.spit");
+        FOX_TELEPORT = register("entity.fox.teleport");
+        ROOTS_BREAK = register("block.roots.break");
+        ROOTS_STEP = register("block.roots.step");
+        ROOTS_PLACE = register("block.roots.place");
+        ROOTS_HIT = register("block.roots.hit");
+        ROOTS_FALL = register("block.roots.fall");
         FURNACE_FIRE_CRACKLE = register("block.furnace.fire_crackle");
         GENERIC_BIG_FALL = register("entity.generic.big_fall");
         GENERIC_BURN = register("entity.generic.burn");
@@ -1086,6 +1304,11 @@ public class SoundEvents {
         GHAST_SCREAM = register("entity.ghast.scream");
         GHAST_SHOOT = register("entity.ghast.shoot");
         GHAST_WARN = register("entity.ghast.warn");
+        GILDED_BLACKSTONE_BREAK = register("block.gilded_blackstone.break");
+        GILDED_BLACKSTONE_FALL = register("block.gilded_blackstone.fall");
+        GILDED_BLACKSTONE_HIT = register("block.gilded_blackstone.hit");
+        GILDED_BLACKSTONE_PLACE = register("block.gilded_blackstone.place");
+        GILDED_BLACKSTONE_STEP = register("block.gilded_blackstone.step");
         GLASS_BREAK = register("block.glass.break");
         GLASS_FALL = register("block.glass.fall");
         GLASS_HIT = register("block.glass.hit");
@@ -1096,16 +1319,6 @@ public class SoundEvents {
         GRASS_HIT = register("block.grass.hit");
         GRASS_PLACE = register("block.grass.place");
         GRASS_STEP = register("block.grass.step");
-        WET_GRASS_BREAK = register("block.wet_grass.break");
-        WET_GRASS_FALL = register("block.wet_grass.fall");
-        WET_GRASS_HIT = register("block.wet_grass.hit");
-        WET_GRASS_PLACE = register("block.wet_grass.place");
-        WET_GRASS_STEP = register("block.wet_grass.step");
-        CORAL_BLOCK_BREAK = register("block.coral_block.break");
-        CORAL_BLOCK_FALL = register("block.coral_block.fall");
-        CORAL_BLOCK_HIT = register("block.coral_block.hit");
-        CORAL_BLOCK_PLACE = register("block.coral_block.place");
-        CORAL_BLOCK_STEP = register("block.coral_block.step");
         GRAVEL_BREAK = register("block.gravel.break");
         GRAVEL_FALL = register("block.gravel.fall");
         GRAVEL_HIT = register("block.gravel.hit");
@@ -1121,6 +1334,14 @@ public class SoundEvents {
         GUARDIAN_HURT = register("entity.guardian.hurt");
         GUARDIAN_HURT_LAND = register("entity.guardian.hurt_land");
         HOE_TILL = register("item.hoe.till");
+        HOGLIN_AMBIENT = register("entity.hoglin.ambient");
+        HOGLIN_ANGRY = register("entity.hoglin.angry");
+        HOGLIN_ATTACK = register("entity.hoglin.attack");
+        HOGLIN_CONVERTED_TO_ZOMBIFIED = register("entity.hoglin.converted_to_zombified");
+        HOGLIN_DEATH = register("entity.hoglin.death");
+        HOGLIN_HURT = register("entity.hoglin.hurt");
+        HOGLIN_RETREAT = register("entity.hoglin.retreat");
+        HOGLIN_STEP = register("entity.hoglin.step");
         HONEY_BLOCK_BREAK = register("block.honey_block.break");
         HONEY_BLOCK_FALL = register("block.honey_block.fall");
         HONEY_BLOCK_HIT = register("block.honey_block.hit");
@@ -1152,14 +1373,6 @@ public class SoundEvents {
         HUSK_DEATH = register("entity.husk.death");
         HUSK_HURT = register("entity.husk.hurt");
         HUSK_STEP = register("entity.husk.step");
-        RAVAGER_AMBIENT = register("entity.ravager.ambient");
-        RAVAGER_ATTACK = register("entity.ravager.attack");
-        RAVAGER_CELEBRATE = register("entity.ravager.celebrate");
-        RAVAGER_DEATH = register("entity.ravager.death");
-        RAVAGER_HURT = register("entity.ravager.hurt");
-        RAVAGER_STEP = register("entity.ravager.step");
-        RAVAGER_STUNNED = register("entity.ravager.stunned");
-        RAVAGER_ROAR = register("entity.ravager.roar");
         ILLUSIONER_AMBIENT = register("entity.illusioner.ambient");
         ILLUSIONER_CAST_SPELL = register("entity.illusioner.cast_spell");
         ILLUSIONER_DEATH = register("entity.illusioner.death");
@@ -1212,10 +1425,19 @@ public class SoundEvents {
         LLAMA_SPIT = register("entity.llama.spit");
         LLAMA_STEP = register("entity.llama.step");
         LLAMA_SWAG = register("entity.llama.swag");
+        MAGMA_CUBE_DEATH_SMALL = register("entity.magma_cube.death_small");
+        LODESTONE_BREAK = register("block.lodestone.break");
+        LODESTONE_STEP = register("block.lodestone.step");
+        LODESTONE_PLACE = register("block.lodestone.place");
+        LODESTONE_HIT = register("block.lodestone.hit");
+        LODESTONE_FALL = register("block.lodestone.fall");
+        LODESTONE_COMPASS_LOCK = register("item.lodestone_compass.lock");
         MAGMA_CUBE_DEATH = register("entity.magma_cube.death");
         MAGMA_CUBE_HURT = register("entity.magma_cube.hurt");
+        MAGMA_CUBE_HURT_SMALL = register("entity.magma_cube.hurt_small");
         MAGMA_CUBE_JUMP = register("entity.magma_cube.jump");
         MAGMA_CUBE_SQUISH = register("entity.magma_cube.squish");
+        MAGMA_CUBE_SQUISH_SMALL = register("entity.magma_cube.squish_small");
         METAL_BREAK = register("block.metal.break");
         METAL_FALL = register("block.metal.fall");
         METAL_HIT = register("block.metal.hit");
@@ -1231,19 +1453,83 @@ public class SoundEvents {
         MOOSHROOM_MILK_SUSPICIOUSLY = register("entity.mooshroom.suspicious_milk");
         MOOSHROOM_SHEAR = register("entity.mooshroom.shear");
         MULE_AMBIENT = register("entity.mule.ambient");
+        MULE_ANGRY = register("entity.mule.angry");
         MULE_CHEST = register("entity.mule.chest");
         MULE_DEATH = register("entity.mule.death");
+        MULE_EAT = register("entity.mule.eat");
         MULE_HURT = register("entity.mule.hurt");
         MUSIC_CREATIVE = register("music.creative");
         MUSIC_CREDITS = register("music.credits");
+        MUSIC_DISC_11 = register("music_disc.11");
+        MUSIC_DISC_13 = register("music_disc.13");
+        MUSIC_DISC_BLOCKS = register("music_disc.blocks");
+        MUSIC_DISC_CAT = register("music_disc.cat");
+        MUSIC_DISC_CHIRP = register("music_disc.chirp");
+        MUSIC_DISC_FAR = register("music_disc.far");
+        MUSIC_DISC_MALL = register("music_disc.mall");
+        MUSIC_DISC_MELLOHI = register("music_disc.mellohi");
+        MUSIC_DISC_PIGSTEP = register("music_disc.pigstep");
+        MUSIC_DISC_STAL = register("music_disc.stal");
+        MUSIC_DISC_STRAD = register("music_disc.strad");
+        MUSIC_DISC_WAIT = register("music_disc.wait");
+        MUSIC_DISC_WARD = register("music_disc.ward");
         MUSIC_DRAGON = register("music.dragon");
         MUSIC_END = register("music.end");
         MUSIC_GAME = register("music.game");
         MUSIC_MENU = register("music.menu");
-        MUSIC_NETHER = register("music.nether");
+        MUSIC_BIOME_BASALT_DELTAS = register("music.nether.basalt_deltas");
+        MUSIC_BIOME_NETHER_WASTES = register("music.nether.nether_wastes");
+        MUSIC_BIOME_SOUL_SAND_VALLEY = register("music.nether.soul_sand_valley");
+        MUSIC_BIOME_CRIMSON_FOREST = register("music.nether.crimson_forest");
+        MUSIC_BIOME_WARPED_FOREST = register("music.nether.warped_forest");
         MUSIC_UNDER_WATER = register("music.under_water");
+        NETHER_BRICKS_BREAK = register("block.nether_bricks.break");
+        NETHER_BRICKS_STEP = register("block.nether_bricks.step");
+        NETHER_BRICKS_PLACE = register("block.nether_bricks.place");
+        NETHER_BRICKS_HIT = register("block.nether_bricks.hit");
+        NETHER_BRICKS_FALL = register("block.nether_bricks.fall");
         NETHER_WART_BREAK = register("block.nether_wart.break");
         NETHER_WART_PLANTED = register("item.nether_wart.plant");
+        STEM_BREAK = register("block.stem.break");
+        STEM_STEP = register("block.stem.step");
+        STEM_PLACE = register("block.stem.place");
+        STEM_HIT = register("block.stem.hit");
+        STEM_FALL = register("block.stem.fall");
+        NYLIUM_BREAK = register("block.nylium.break");
+        NYLIUM_STEP = register("block.nylium.step");
+        NYLIUM_PLACE = register("block.nylium.place");
+        NYLIUM_HIT = register("block.nylium.hit");
+        NYLIUM_FALL = register("block.nylium.fall");
+        NETHER_SPROUTS_BREAK = register("block.nether_sprouts.break");
+        NETHER_SPROUTS_STEP = register("block.nether_sprouts.step");
+        NETHER_SPROUTS_PLACE = register("block.nether_sprouts.place");
+        NETHER_SPROUTS_HIT = register("block.nether_sprouts.hit");
+        NETHER_SPROUTS_FALL = register("block.nether_sprouts.fall");
+        FUNGUS_BREAK = register("block.fungus.break");
+        FUNGUS_STEP = register("block.fungus.step");
+        FUNGUS_PLACE = register("block.fungus.place");
+        FUNGUS_HIT = register("block.fungus.hit");
+        FUNGUS_FALL = register("block.fungus.fall");
+        WEEPING_VINES_BREAK = register("block.weeping_vines.break");
+        WEEPING_VINES_STEP = register("block.weeping_vines.step");
+        WEEPING_VINES_PLACE = register("block.weeping_vines.place");
+        WEEPING_VINES_HIT = register("block.weeping_vines.hit");
+        WEEPING_VINES_FALL = register("block.weeping_vines.fall");
+        WART_BLOCK_BREAK = register("block.wart_block.break");
+        WART_BLOCK_STEP = register("block.wart_block.step");
+        WART_BLOCK_PLACE = register("block.wart_block.place");
+        WART_BLOCK_HIT = register("block.wart_block.hit");
+        WART_BLOCK_FALL = register("block.wart_block.fall");
+        NETHERITE_BLOCK_BREAK = register("block.netherite_block.break");
+        NETHERITE_BLOCK_STEP = register("block.netherite_block.step");
+        NETHERITE_BLOCK_PLACE = register("block.netherite_block.place");
+        NETHERITE_BLOCK_HIT = register("block.netherite_block.hit");
+        NETHERITE_BLOCK_FALL = register("block.netherite_block.fall");
+        NETHERRACK_BREAK = register("block.netherrack.break");
+        NETHERRACK_STEP = register("block.netherrack.step");
+        NETHERRACK_PLACE = register("block.netherrack.place");
+        NETHERRACK_HIT = register("block.netherrack.hit");
+        NETHERRACK_FALL = register("block.netherrack.fall");
         NOTE_BLOCK_BASEDRUM = register("block.note_block.basedrum");
         NOTE_BLOCK_BASS = register("block.note_block.bass");
         NOTE_BLOCK_BELL = register("block.note_block.bell");
@@ -1290,10 +1576,12 @@ public class SoundEvents {
         PARROT_IMITATE_EVOKER = register("entity.parrot.imitate.evoker");
         PARROT_IMITATE_GHAST = register("entity.parrot.imitate.ghast");
         PARROT_IMITATE_GUARDIAN = register("entity.parrot.imitate.guardian");
+        PARROT_IMITATE_HOGLIN = register("entity.parrot.imitate.hoglin");
         PARROT_IMITATE_HUSK = register("entity.parrot.imitate.husk");
         PARROT_IMITATE_ILLUSIONER = register("entity.parrot.imitate.illusioner");
         PARROT_IMITATE_MAGMA_CUBE = register("entity.parrot.imitate.magma_cube");
         PARROT_IMITATE_PHANTOM = register("entity.parrot.imitate.phantom");
+        PARROT_IMITATE_PIGLIN = register("entity.parrot.imitate.piglin");
         PARROT_IMITATE_PILLAGER = register("entity.parrot.imitate.pillager");
         PARROT_IMITATE_RAVAGER = register("entity.parrot.imitate.ravager");
         PARROT_IMITATE_SHULKER = register("entity.parrot.imitate.shulker");
@@ -1307,6 +1595,7 @@ public class SoundEvents {
         PARROT_IMITATE_WITCH = register("entity.parrot.imitate.witch");
         PARROT_IMITATE_WITHER = register("entity.parrot.imitate.wither");
         PARROT_IMITATE_WITHER_SKELETON = register("entity.parrot.imitate.wither_skeleton");
+        PARROT_IMITATE_ZOGLIN = register("entity.parrot.imitate.zoglin");
         PARROT_IMITATE_ZOMBIE = register("entity.parrot.imitate.zombie");
         PARROT_IMITATE_ZOMBIE_VILLAGER = register("entity.parrot.imitate.zombie_villager");
         PARROT_STEP = register("entity.parrot.step");
@@ -1321,6 +1610,16 @@ public class SoundEvents {
         PIG_HURT = register("entity.pig.hurt");
         PIG_SADDLE = register("entity.pig.saddle");
         PIG_STEP = register("entity.pig.step");
+        PIGLIN_ADMIRING_ITEM = register("entity.piglin.admiring_item");
+        PIGLIN_AMBIENT = register("entity.piglin.ambient");
+        PIGLIN_ANGRY = register("entity.piglin.angry");
+        PIGLIN_CELEBRATE = register("entity.piglin.celebrate");
+        PIGLIN_DEATH = register("entity.piglin.death");
+        PIGLIN_JEALOUS = register("entity.piglin.jealous");
+        PIGLIN_HURT = register("entity.piglin.hurt");
+        PIGLIN_RETREAT = register("entity.piglin.retreat");
+        PIGLIN_STEP = register("entity.piglin.step");
+        PIGLIN_CONVERTED_TO_ZOMBIFIED = register("entity.piglin.converted_to_zombified");
         PILLAGER_AMBIENT = register("entity.pillager.ambient");
         PILLAGER_CELEBRATE = register("entity.pillager.celebrate");
         PILLAGER_DEATH = register("entity.pillager.death");
@@ -1369,19 +1668,29 @@ public class SoundEvents {
         RABBIT_HURT = register("entity.rabbit.hurt");
         RABBIT_JUMP = register("entity.rabbit.jump");
         RAID_HORN = register("event.raid.horn");
-        MUSIC_DISC_11 = register("music_disc.11");
-        MUSIC_DISC_13 = register("music_disc.13");
-        MUSIC_DISC_BLOCKS = register("music_disc.blocks");
-        MUSIC_DISC_CAT = register("music_disc.cat");
-        MUSIC_DISC_CHIRP = register("music_disc.chirp");
-        MUSIC_DISC_FAR = register("music_disc.far");
-        MUSIC_DISC_MALL = register("music_disc.mall");
-        MUSIC_DISC_MELLOHI = register("music_disc.mellohi");
-        MUSIC_DISC_STAL = register("music_disc.stal");
-        MUSIC_DISC_STRAD = register("music_disc.strad");
-        MUSIC_DISC_WAIT = register("music_disc.wait");
-        MUSIC_DISC_WARD = register("music_disc.ward");
+        RAVAGER_AMBIENT = register("entity.ravager.ambient");
+        RAVAGER_ATTACK = register("entity.ravager.attack");
+        RAVAGER_CELEBRATE = register("entity.ravager.celebrate");
+        RAVAGER_DEATH = register("entity.ravager.death");
+        RAVAGER_HURT = register("entity.ravager.hurt");
+        RAVAGER_STEP = register("entity.ravager.step");
+        RAVAGER_STUNNED = register("entity.ravager.stunned");
+        RAVAGER_ROAR = register("entity.ravager.roar");
+        NETHER_GOLD_ORE_BREAK = register("block.nether_gold_ore.break");
+        NETHER_GOLD_ORE_FALL = register("block.nether_gold_ore.fall");
+        NETHER_GOLD_ORE_HIT = register("block.nether_gold_ore.hit");
+        NETHER_GOLD_ORE_PLACE = register("block.nether_gold_ore.place");
+        NETHER_GOLD_ORE_STEP = register("block.nether_gold_ore.step");
+        NETHER_ORE_BREAK = register("block.nether_ore.break");
+        NETHER_ORE_FALL = register("block.nether_ore.fall");
+        NETHER_ORE_HIT = register("block.nether_ore.hit");
+        NETHER_ORE_PLACE = register("block.nether_ore.place");
+        NETHER_ORE_STEP = register("block.nether_ore.step");
         REDSTONE_TORCH_BURNOUT = register("block.redstone_torch.burnout");
+        RESPAWN_ANCHOR_AMBIENT = register("block.respawn_anchor.ambient");
+        RESPAWN_ANCHOR_CHARGE = register("block.respawn_anchor.charge");
+        RESPAWN_ANCHOR_DEPLETE = register("block.respawn_anchor.deplete");
+        RESPAWN_ANCHOR_SET_SPAWN = register("block.respawn_anchor.set_spawn");
         SALMON_AMBIENT = register("entity.salmon.ambient");
         SALMON_DEATH = register("entity.salmon.death");
         SALMON_FLOP = register("entity.salmon.flop");
@@ -1403,6 +1712,11 @@ public class SoundEvents {
         SHEEP_STEP = register("entity.sheep.step");
         SHIELD_BLOCK = register("item.shield.block");
         SHIELD_BREAK = register("item.shield.break");
+        SHROOMLIGHT_BREAK = register("block.shroomlight.break");
+        SHROOMLIGHT_STEP = register("block.shroomlight.step");
+        SHROOMLIGHT_PLACE = register("block.shroomlight.place");
+        SHROOMLIGHT_HIT = register("block.shroomlight.hit");
+        SHROOMLIGHT_FALL = register("block.shroomlight.fall");
         SHOVEL_FLATTEN = register("item.shovel.flatten");
         SHULKER_AMBIENT = register("entity.shulker.ambient");
         SHULKER_BOX_CLOSE = register("block.shulker_box.close");
@@ -1443,13 +1757,31 @@ public class SoundEvents {
         SLIME_BLOCK_HIT = register("block.slime_block.hit");
         SLIME_BLOCK_PLACE = register("block.slime_block.place");
         SLIME_BLOCK_STEP = register("block.slime_block.step");
-        MAGMA_CUBE_DEATH_SMALL = register("entity.magma_cube.death_small");
-        MAGMA_CUBE_HURT_SMALL = register("entity.magma_cube.hurt_small");
-        MAGMA_CUBE_SQUISH_SMALL = register("entity.magma_cube.squish_small");
+        SOUL_SAND_BREAK = register("block.soul_sand.break");
+        SOUL_SAND_STEP = register("block.soul_sand.step");
+        SOUL_SAND_PLACE = register("block.soul_sand.place");
+        SOUL_SAND_HIT = register("block.soul_sand.hit");
+        SOUL_SAND_FALL = register("block.soul_sand.fall");
+        SOUL_SOIL_BREAK = register("block.soul_soil.break");
+        SOUL_SOIL_STEP = register("block.soul_soil.step");
+        SOUL_SOIL_PLACE = register("block.soul_soil.place");
+        SOUL_SOIL_HIT = register("block.soul_soil.hit");
+        SOUL_SOIL_FALL = register("block.soul_soil.fall");
+        SOUL_ESCAPE = register("particle.soul_escape");
+        STRIDER_AMBIENT = register("entity.strider.ambient");
+        STRIDER_HAPPY = register("entity.strider.happy");
+        STRIDER_RETREAT = register("entity.strider.retreat");
+        STRIDER_DEATH = register("entity.strider.death");
+        STRIDER_HURT = register("entity.strider.hurt");
+        STRIDER_STEP = register("entity.strider.step");
+        STRIDER_STEP_LAVA = register("entity.strider.step_lava");
+        STRIDER_EAT = register("entity.strider.eat");
+        STRIDER_SADDLE = register("entity.strider.saddle");
         SLIME_DEATH_SMALL = register("entity.slime.death_small");
         SLIME_HURT_SMALL = register("entity.slime.hurt_small");
         SLIME_JUMP_SMALL = register("entity.slime.jump_small");
         SLIME_SQUISH_SMALL = register("entity.slime.squish_small");
+        SMITHING_TABLE_USE = register("block.smithing_table.use");
         SMOKER_SMOKE = register("block.smoker.smoke");
         SNOWBALL_THROW = register("entity.snowball.throw");
         SNOW_BREAK = register("block.snow.break");
@@ -1458,6 +1790,7 @@ public class SoundEvents {
         SNOW_GOLEM_DEATH = register("entity.snow_golem.death");
         SNOW_GOLEM_HURT = register("entity.snow_golem.hurt");
         SNOW_GOLEM_SHOOT = register("entity.snow_golem.shoot");
+        SNOW_GOLEM_SHEAR = register("entity.snow_golem.shear");
         SNOW_HIT = register("block.snow.hit");
         SNOW_PLACE = register("block.snow.place");
         SNOW_STEP = register("block.snow.step");
@@ -1555,6 +1888,7 @@ public class SoundEvents {
         VINDICATOR_CELEBRATE = register("entity.vindicator.celebrate");
         VINDICATOR_DEATH = register("entity.vindicator.death");
         VINDICATOR_HURT = register("entity.vindicator.hurt");
+        VINE_STEP = register("block.vine.step");
         LILY_PAD_PLACE = register("block.lily_pad.place");
         WANDERING_TRADER_AMBIENT = register("entity.wandering_trader.ambient");
         WANDERING_TRADER_DEATH = register("entity.wandering_trader.death");
@@ -1569,6 +1903,11 @@ public class SoundEvents {
         WATER_AMBIENT = register("block.water.ambient");
         WEATHER_RAIN = register("weather.rain");
         WEATHER_RAIN_ABOVE = register("weather.rain.above");
+        WET_GRASS_BREAK = register("block.wet_grass.break");
+        WET_GRASS_FALL = register("block.wet_grass.fall");
+        WET_GRASS_HIT = register("block.wet_grass.hit");
+        WET_GRASS_PLACE = register("block.wet_grass.place");
+        WET_GRASS_STEP = register("block.wet_grass.step");
         WITCH_AMBIENT = register("entity.witch.ambient");
         WITCH_CELEBRATE = register("entity.witch.celebrate");
         WITCH_DEATH = register("entity.witch.death");
@@ -1607,6 +1946,17 @@ public class SoundEvents {
         WOODEN_PRESSURE_PLATE_CLICK_OFF = register("block.wooden_pressure_plate.click_off");
         WOODEN_PRESSURE_PLATE_CLICK_ON = register("block.wooden_pressure_plate.click_on");
         WOOD_STEP = register("block.wood.step");
+        WOOL_BREAK = register("block.wool.break");
+        WOOL_FALL = register("block.wool.fall");
+        WOOL_HIT = register("block.wool.hit");
+        WOOL_PLACE = register("block.wool.place");
+        WOOL_STEP = register("block.wool.step");
+        ZOGLIN_AMBIENT = register("entity.zoglin.ambient");
+        ZOGLIN_ANGRY = register("entity.zoglin.angry");
+        ZOGLIN_ATTACK = register("entity.zoglin.attack");
+        ZOGLIN_DEATH = register("entity.zoglin.death");
+        ZOGLIN_HURT = register("entity.zoglin.hurt");
+        ZOGLIN_STEP = register("entity.zoglin.step");
         ZOMBIE_AMBIENT = register("entity.zombie.ambient");
         ZOMBIE_ATTACK_WOODEN_DOOR = register("entity.zombie.attack_wooden_door");
         ZOMBIE_ATTACK_IRON_DOOR = register("entity.zombie.attack_iron_door");
@@ -1619,10 +1969,10 @@ public class SoundEvents {
         ZOMBIE_HORSE_HURT = register("entity.zombie_horse.hurt");
         ZOMBIE_HURT = register("entity.zombie.hurt");
         ZOMBIE_INFECT = register("entity.zombie.infect");
-        ZOMBIE_PIGMAN_AMBIENT = register("entity.zombie_pigman.ambient");
-        ZOMBIE_PIGMAN_ANGRY = register("entity.zombie_pigman.angry");
-        ZOMBIE_PIGMAN_DEATH = register("entity.zombie_pigman.death");
-        ZOMBIE_PIGMAN_HURT = register("entity.zombie_pigman.hurt");
+        ZOMBIFIED_PIGLIN_AMBIENT = register("entity.zombified_piglin.ambient");
+        ZOMBIFIED_PIGLIN_ANGRY = register("entity.zombified_piglin.angry");
+        ZOMBIFIED_PIGLIN_DEATH = register("entity.zombified_piglin.death");
+        ZOMBIFIED_PIGLIN_HURT = register("entity.zombified_piglin.hurt");
         ZOMBIE_STEP = register("entity.zombie.step");
         ZOMBIE_VILLAGER_AMBIENT = register("entity.zombie_villager.ambient");
         ZOMBIE_VILLAGER_CONVERTED = register("entity.zombie_villager.converted");
diff --git a/src/net/minecraft/stats/RecipeBook.java b/src/net/minecraft/stats/RecipeBook.java
index b70aeb2..8bd0ff1 100644
--- a/src/net/minecraft/stats/RecipeBook.java
+++ b/src/net/minecraft/stats/RecipeBook.java
@@ -28,54 +28,62 @@ public class RecipeBook {
         this.highlight = Sets.newHashSet();
     }
     
-    public void copyOverData(final RecipeBook aal) {
+    public void copyOverData(final RecipeBook aco) {
         this.known.clear();
         this.highlight.clear();
-        this.known.addAll(aal.known);
-        this.highlight.addAll(aal.highlight);
+        this.guiOpen = aco.guiOpen;
+        this.filteringCraftable = aco.filteringCraftable;
+        this.furnaceGuiOpen = aco.furnaceGuiOpen;
+        this.furnaceFilteringCraftable = aco.furnaceFilteringCraftable;
+        this.blastingFurnaceGuiOpen = aco.blastingFurnaceGuiOpen;
+        this.blastingFurnaceFilteringCraftable = aco.blastingFurnaceFilteringCraftable;
+        this.smokerGuiOpen = aco.smokerGuiOpen;
+        this.smokerFilteringCraftable = aco.smokerFilteringCraftable;
+        this.known.addAll(aco.known);
+        this.highlight.addAll(aco.highlight);
     }
     
-    public void add(final Recipe<?> bgw) {
-        if (!bgw.isSpecial()) {
-            this.add(bgw.getId());
+    public void add(final Recipe<?> bmu) {
+        if (!bmu.isSpecial()) {
+            this.add(bmu.getId());
         }
     }
     
-    protected void add(final ResourceLocation sm) {
-        this.known.add(sm);
+    protected void add(final ResourceLocation uh) {
+        this.known.add(uh);
     }
     
-    public boolean contains(@Nullable final Recipe<?> bgw) {
-        return bgw != null && this.known.contains(bgw.getId());
+    public boolean contains(@Nullable final Recipe<?> bmu) {
+        return bmu != null && this.known.contains(bmu.getId());
     }
     
-    public boolean contains(final ResourceLocation sm) {
-        return this.known.contains(sm);
+    public boolean contains(final ResourceLocation uh) {
+        return this.known.contains(uh);
     }
     
-    public void remove(final Recipe<?> bgw) {
-        this.remove(bgw.getId());
+    public void remove(final Recipe<?> bmu) {
+        this.remove(bmu.getId());
     }
     
-    protected void remove(final ResourceLocation sm) {
-        this.known.remove(sm);
-        this.highlight.remove(sm);
+    protected void remove(final ResourceLocation uh) {
+        this.known.remove(uh);
+        this.highlight.remove(uh);
     }
     
-    public boolean willHighlight(final Recipe<?> bgw) {
-        return this.highlight.contains(bgw.getId());
+    public boolean willHighlight(final Recipe<?> bmu) {
+        return this.highlight.contains(bmu.getId());
     }
     
-    public void removeHighlight(final Recipe<?> bgw) {
-        this.highlight.remove(bgw.getId());
+    public void removeHighlight(final Recipe<?> bmu) {
+        this.highlight.remove(bmu.getId());
     }
     
-    public void addHighlight(final Recipe<?> bgw) {
-        this.addHighlight(bgw.getId());
+    public void addHighlight(final Recipe<?> bmu) {
+        this.addHighlight(bmu.getId());
     }
     
-    protected void addHighlight(final ResourceLocation sm) {
-        this.highlight.add(sm);
+    protected void addHighlight(final ResourceLocation uh) {
+        this.highlight.add(uh);
     }
     
     public boolean isGuiOpen() {
@@ -86,14 +94,14 @@ public class RecipeBook {
         this.guiOpen = boolean1;
     }
     
-    public boolean isFilteringCraftable(final RecipeBookMenu<?> bbt) {
-        if (bbt instanceof FurnaceMenu) {
+    public boolean isFilteringCraftable(final RecipeBookMenu<?> bhp) {
+        if (bhp instanceof FurnaceMenu) {
             return this.furnaceFilteringCraftable;
         }
-        if (bbt instanceof BlastFurnaceMenu) {
+        if (bhp instanceof BlastFurnaceMenu) {
             return this.blastingFurnaceFilteringCraftable;
         }
-        if (bbt instanceof SmokerMenu) {
+        if (bhp instanceof SmokerMenu) {
             return this.smokerFilteringCraftable;
         }
         return this.filteringCraftable;
diff --git a/src/net/minecraft/stats/ServerRecipeBook.java b/src/net/minecraft/stats/ServerRecipeBook.java
index 9e26e49..7f52941 100644
--- a/src/net/minecraft/stats/ServerRecipeBook.java
+++ b/src/net/minecraft/stats/ServerRecipeBook.java
@@ -5,6 +5,7 @@ import org.apache.logging.log4j.LogManager;
 import java.util.Optional;
 import net.minecraft.ResourceLocationException;
 import java.util.function.Consumer;
+import net.minecraft.world.item.crafting.RecipeManager;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.ListTag;
@@ -20,104 +21,106 @@ import com.google.common.collect.Lists;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.crafting.Recipe;
 import java.util.Collection;
-import net.minecraft.world.item.crafting.RecipeManager;
 import org.apache.logging.log4j.Logger;
 
 public class ServerRecipeBook extends RecipeBook {
     private static final Logger LOGGER;
-    private final RecipeManager manager;
     
-    public ServerRecipeBook(final RecipeManager bgx) {
-        this.manager = bgx;
-    }
-    
-    public int addRecipes(final Collection<Recipe<?>> collection, final ServerPlayer xe) {
+    public int addRecipes(final Collection<Recipe<?>> collection, final ServerPlayer ze) {
         final List<ResourceLocation> list4 = Lists.newArrayList();
         int integer5 = 0;
-        for (final Recipe<?> bgw7 : collection) {
-            final ResourceLocation sm8 = bgw7.getId();
-            if (!this.known.contains(sm8) && !bgw7.isSpecial()) {
-                this.add(sm8);
-                this.addHighlight(sm8);
-                list4.add(sm8);
-                CriteriaTriggers.RECIPE_UNLOCKED.trigger(xe, bgw7);
+        for (final Recipe<?> bmu7 : collection) {
+            final ResourceLocation uh8 = bmu7.getId();
+            if (!this.known.contains(uh8) && !bmu7.isSpecial()) {
+                this.add(uh8);
+                this.addHighlight(uh8);
+                list4.add(uh8);
+                CriteriaTriggers.RECIPE_UNLOCKED.trigger(ze, bmu7);
                 ++integer5;
             }
         }
-        this.sendRecipes(ClientboundRecipePacket.State.ADD, xe, list4);
+        this.sendRecipes(ClientboundRecipePacket.State.ADD, ze, list4);
         return integer5;
     }
     
-    public int removeRecipes(final Collection<Recipe<?>> collection, final ServerPlayer xe) {
+    public int removeRecipes(final Collection<Recipe<?>> collection, final ServerPlayer ze) {
         final List<ResourceLocation> list4 = Lists.newArrayList();
         int integer5 = 0;
-        for (final Recipe<?> bgw7 : collection) {
-            final ResourceLocation sm8 = bgw7.getId();
-            if (this.known.contains(sm8)) {
-                this.remove(sm8);
-                list4.add(sm8);
+        for (final Recipe<?> bmu7 : collection) {
+            final ResourceLocation uh8 = bmu7.getId();
+            if (this.known.contains(uh8)) {
+                this.remove(uh8);
+                list4.add(uh8);
                 ++integer5;
             }
         }
-        this.sendRecipes(ClientboundRecipePacket.State.REMOVE, xe, list4);
+        this.sendRecipes(ClientboundRecipePacket.State.REMOVE, ze, list4);
         return integer5;
     }
     
-    private void sendRecipes(final ClientboundRecipePacket.State a, final ServerPlayer xe, final List<ResourceLocation> list) {
-        xe.connection.send(new ClientboundRecipePacket(a, list, Collections.emptyList(), this.guiOpen, this.filteringCraftable, this.furnaceGuiOpen, this.furnaceFilteringCraftable));
+    private void sendRecipes(final ClientboundRecipePacket.State a, final ServerPlayer ze, final List<ResourceLocation> list) {
+        ze.connection.send(new ClientboundRecipePacket(a, list, Collections.emptyList(), this.guiOpen, this.filteringCraftable, this.furnaceGuiOpen, this.furnaceFilteringCraftable));
     }
     
     public CompoundTag toNbt() {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.putBoolean("isGuiOpen", this.guiOpen);
-        jt2.putBoolean("isFilteringCraftable", this.filteringCraftable);
-        jt2.putBoolean("isFurnaceGuiOpen", this.furnaceGuiOpen);
-        jt2.putBoolean("isFurnaceFilteringCraftable", this.furnaceFilteringCraftable);
-        final ListTag jz3 = new ListTag();
-        for (final ResourceLocation sm5 : this.known) {
-            ((AbstractList<StringTag>)jz3).add(StringTag.valueOf(sm5.toString()));
+        final CompoundTag le2 = new CompoundTag();
+        le2.putBoolean("isGuiOpen", this.guiOpen);
+        le2.putBoolean("isFilteringCraftable", this.filteringCraftable);
+        le2.putBoolean("isFurnaceGuiOpen", this.furnaceGuiOpen);
+        le2.putBoolean("isFurnaceFilteringCraftable", this.furnaceFilteringCraftable);
+        le2.putBoolean("isBlastingFurnaceGuiOpen", this.blastingFurnaceGuiOpen);
+        le2.putBoolean("isBlastingFurnaceFilteringCraftable", this.blastingFurnaceFilteringCraftable);
+        le2.putBoolean("isSmokerGuiOpen", this.smokerGuiOpen);
+        le2.putBoolean("isSmokerFilteringCraftable", this.smokerFilteringCraftable);
+        final ListTag lk3 = new ListTag();
+        for (final ResourceLocation uh5 : this.known) {
+            ((AbstractList<StringTag>)lk3).add(StringTag.valueOf(uh5.toString()));
         }
-        jt2.put("recipes", jz3);
-        final ListTag jz4 = new ListTag();
-        for (final ResourceLocation sm6 : this.highlight) {
-            ((AbstractList<StringTag>)jz4).add(StringTag.valueOf(sm6.toString()));
+        le2.put("recipes", lk3);
+        final ListTag lk4 = new ListTag();
+        for (final ResourceLocation uh6 : this.highlight) {
+            ((AbstractList<StringTag>)lk4).add(StringTag.valueOf(uh6.toString()));
         }
-        jt2.put("toBeDisplayed", jz4);
-        return jt2;
+        le2.put("toBeDisplayed", lk4);
+        return le2;
     }
     
-    public void fromNbt(final CompoundTag jt) {
-        this.guiOpen = jt.getBoolean("isGuiOpen");
-        this.filteringCraftable = jt.getBoolean("isFilteringCraftable");
-        this.furnaceGuiOpen = jt.getBoolean("isFurnaceGuiOpen");
-        this.furnaceFilteringCraftable = jt.getBoolean("isFurnaceFilteringCraftable");
-        final ListTag jz3 = jt.getList("recipes", 8);
-        this.loadRecipes(jz3, this::add);
-        final ListTag jz4 = jt.getList("toBeDisplayed", 8);
-        this.loadRecipes(jz4, this::addHighlight);
+    public void fromNbt(final CompoundTag le, final RecipeManager bmv) {
+        this.guiOpen = le.getBoolean("isGuiOpen");
+        this.filteringCraftable = le.getBoolean("isFilteringCraftable");
+        this.furnaceGuiOpen = le.getBoolean("isFurnaceGuiOpen");
+        this.furnaceFilteringCraftable = le.getBoolean("isFurnaceFilteringCraftable");
+        this.blastingFurnaceGuiOpen = le.getBoolean("isBlastingFurnaceGuiOpen");
+        this.blastingFurnaceFilteringCraftable = le.getBoolean("isBlastingFurnaceFilteringCraftable");
+        this.smokerGuiOpen = le.getBoolean("isSmokerGuiOpen");
+        this.smokerFilteringCraftable = le.getBoolean("isSmokerFilteringCraftable");
+        final ListTag lk4 = le.getList("recipes", 8);
+        this.loadRecipes(lk4, this::add, bmv);
+        final ListTag lk5 = le.getList("toBeDisplayed", 8);
+        this.loadRecipes(lk5, this::addHighlight, bmv);
     }
     
-    private void loadRecipes(final ListTag jz, final Consumer<Recipe<?>> consumer) {
-        for (int integer4 = 0; integer4 < jz.size(); ++integer4) {
-            final String string5 = jz.getString(integer4);
+    private void loadRecipes(final ListTag lk, final Consumer<Recipe<?>> consumer, final RecipeManager bmv) {
+        for (int integer5 = 0; integer5 < lk.size(); ++integer5) {
+            final String string6 = lk.getString(integer5);
             try {
-                final ResourceLocation sm6 = new ResourceLocation(string5);
-                final Optional<? extends Recipe<?>> optional7 = this.manager.byKey(sm6);
-                if (!optional7.isPresent()) {
-                    ServerRecipeBook.LOGGER.error("Tried to load unrecognized recipe: {} removed now.", sm6);
+                final ResourceLocation uh7 = new ResourceLocation(string6);
+                final Optional<? extends Recipe<?>> optional8 = bmv.byKey(uh7);
+                if (!optional8.isPresent()) {
+                    ServerRecipeBook.LOGGER.error("Tried to load unrecognized recipe: {} removed now.", uh7);
                 }
                 else {
-                    consumer.accept(optional7.get());
+                    consumer.accept(optional8.get());
                 }
             }
-            catch (ResourceLocationException r6) {
-                ServerRecipeBook.LOGGER.error("Tried to load improperly formatted recipe: {} removed now.", string5);
+            catch (ResourceLocationException t7) {
+                ServerRecipeBook.LOGGER.error("Tried to load improperly formatted recipe: {} removed now.", string6);
             }
         }
     }
     
-    public void sendInitialRecipeBook(final ServerPlayer xe) {
-        xe.connection.send(new ClientboundRecipePacket(ClientboundRecipePacket.State.INIT, this.known, this.highlight, this.guiOpen, this.filteringCraftable, this.furnaceGuiOpen, this.furnaceFilteringCraftable));
+    public void sendInitialRecipeBook(final ServerPlayer ze) {
+        ze.connection.send(new ClientboundRecipePacket(ClientboundRecipePacket.State.INIT, this.known, this.highlight, this.guiOpen, this.filteringCraftable, this.furnaceGuiOpen, this.furnaceFilteringCraftable));
     }
     
     static {
diff --git a/src/net/minecraft/stats/ServerStatsCounter.java b/src/net/minecraft/stats/ServerStatsCounter.java
index bc9ffd8..2eccbc3 100644
--- a/src/net/minecraft/stats/ServerStatsCounter.java
+++ b/src/net/minecraft/stats/ServerStatsCounter.java
@@ -74,9 +74,9 @@ public class ServerStatsCounter extends StatsCounter {
     }
     
     @Override
-    public void setValue(final Player ayj, final Stat<?> aao, final int integer) {
-        super.setValue(ayj, aao, integer);
-        this.dirty.add(aao);
+    public void setValue(final Player bec, final Stat<?> acr, final int integer) {
+        super.setValue(bec, acr, integer);
+        this.dirty.add(acr);
     }
     
     private Set<Stat<?>> getDirty() {
@@ -93,28 +93,28 @@ public class ServerStatsCounter extends StatsCounter {
                 ServerStatsCounter.LOGGER.error("Unable to parse Stat data from {}", this.file);
                 return;
             }
-            CompoundTag jt7 = fromJson(jsonElement6.getAsJsonObject());
-            if (!jt7.contains("DataVersion", 99)) {
-                jt7.putInt("DataVersion", 1343);
+            CompoundTag le7 = fromJson(jsonElement6.getAsJsonObject());
+            if (!le7.contains("DataVersion", 99)) {
+                le7.putInt("DataVersion", 1343);
             }
-            jt7 = NbtUtils.update(dataFixer, DataFixTypes.STATS, jt7, jt7.getInt("DataVersion"));
-            if (jt7.contains("stats", 10)) {
-                final CompoundTag jt8 = jt7.getCompound("stats");
-                for (final String string2 : jt8.getAllKeys()) {
-                    if (jt8.contains(string2, 10)) {
-                        final CompoundTag jt9;
+            le7 = NbtUtils.update(dataFixer, DataFixTypes.STATS, le7, le7.getInt("DataVersion"));
+            if (le7.contains("stats", 10)) {
+                final CompoundTag le8 = le7.getCompound("stats");
+                for (final String string2 : le8.getAllKeys()) {
+                    if (le8.contains(string2, 10)) {
+                        final CompoundTag le9;
                         final Iterator<String> iterator2;
                         String string3;
-                        Util.<StatType<?>>ifElse(Registry.STAT_TYPE.getOptional(new ResourceLocation(string2)), aaq -> {
-                            jt9 = jt8.getCompound(string2);
-                            jt9.getAllKeys().iterator();
+                        Util.<StatType<?>>ifElse(Registry.STAT_TYPE.getOptional(new ResourceLocation(string2)), act -> {
+                            le9 = le8.getCompound(string2);
+                            le9.getAllKeys().iterator();
                             while (iterator2.hasNext()) {
                                 string3 = iterator2.next();
-                                if (jt9.contains(string3, 99)) {
-                                    Util.<Stat<Object>>ifElse(this.getStat(aaq, string3), aao -> this.stats.put(aao, jt9.getInt(string3)), () -> ServerStatsCounter.LOGGER.warn("Invalid statistic in {}: Don't know what {} is", this.file, string3));
+                                if (le9.contains(string3, 99)) {
+                                    Util.<Stat<Object>>ifElse(this.getStat(act, string3), acr -> this.stats.put(acr, le9.getInt(string3)), () -> ServerStatsCounter.LOGGER.warn("Invalid statistic in {}: Don't know what {} is", this.file, string3));
                                 }
                                 else {
-                                    ServerStatsCounter.LOGGER.warn("Invalid statistic value in {}: Don't know what {} is for key {}", this.file, jt9.get(string3), string3);
+                                    ServerStatsCounter.LOGGER.warn("Invalid statistic value in {}: Don't know what {} is for key {}", this.file, le9.get(string3), string3);
                                 }
                             }
                             return;
@@ -130,16 +130,16 @@ public class ServerStatsCounter extends StatsCounter {
         }
     }
     
-    private <T> Optional<Stat<T>> getStat(final StatType<T> aaq, final String string) {
-        return Optional.<ResourceLocation>ofNullable(ResourceLocation.tryParse(string)).flatMap(aaq.getRegistry()::getOptional).<Stat<T>>map(aaq::get);
+    private <T> Optional<Stat<T>> getStat(final StatType<T> act, final String string) {
+        return Optional.<ResourceLocation>ofNullable(ResourceLocation.tryParse(string)).flatMap(act.getRegistry()::getOptional).<Stat<T>>map(act::get);
     }
     
     private static CompoundTag fromJson(final JsonObject jsonObject) {
-        final CompoundTag jt2 = new CompoundTag();
+        final CompoundTag le2 = new CompoundTag();
         for (final Map.Entry<String, JsonElement> entry4 : jsonObject.entrySet()) {
             final JsonElement jsonElement5 = entry4.getValue();
             if (jsonElement5.isJsonObject()) {
-                jt2.put(entry4.getKey(), fromJson(jsonElement5.getAsJsonObject()));
+                le2.put(entry4.getKey(), fromJson(jsonElement5.getAsJsonObject()));
             }
             else {
                 if (!jsonElement5.isJsonPrimitive()) {
@@ -149,17 +149,17 @@ public class ServerStatsCounter extends StatsCounter {
                 if (!jsonPrimitive6.isNumber()) {
                     continue;
                 }
-                jt2.putInt(entry4.getKey(), jsonPrimitive6.getAsInt());
+                le2.putInt(entry4.getKey(), jsonPrimitive6.getAsInt());
             }
         }
-        return jt2;
+        return le2;
     }
     
     protected String toJson() {
         final Map<StatType<?>, JsonObject> map2 = Maps.newHashMap();
         for (final Object2IntMap.Entry<Stat<?>> entry4 : this.stats.object2IntEntrySet()) {
-            final Stat<?> aao5 = entry4.getKey();
-            map2.computeIfAbsent(aao5.getType(), aaq -> new JsonObject()).addProperty(ServerStatsCounter.getKey(aao5).toString(), entry4.getIntValue());
+            final Stat<?> acr5 = entry4.getKey();
+            map2.computeIfAbsent(acr5.getType(), act -> new JsonObject()).addProperty(ServerStatsCounter.getKey(acr5).toString(), entry4.getIntValue());
         }
         final JsonObject jsonObject3 = new JsonObject();
         for (final Map.Entry<StatType<?>, JsonObject> entry5 : map2.entrySet()) {
@@ -171,24 +171,24 @@ public class ServerStatsCounter extends StatsCounter {
         return jsonObject4.toString();
     }
     
-    private static <T> ResourceLocation getKey(final Stat<T> aao) {
-        return aao.getType().getRegistry().getKey(aao.getValue());
+    private static <T> ResourceLocation getKey(final Stat<T> acr) {
+        return acr.getType().getRegistry().getKey(acr.getValue());
     }
     
     public void markAllDirty() {
         this.dirty.addAll(this.stats.keySet());
     }
     
-    public void sendStats(final ServerPlayer xe) {
+    public void sendStats(final ServerPlayer ze) {
         final int integer3 = this.server.getTickCount();
         final Object2IntMap<Stat<?>> object2IntMap4 = (Object2IntMap<Stat<?>>)new Object2IntOpenHashMap();
         if (integer3 - this.lastStatRequest > 300) {
             this.lastStatRequest = integer3;
-            for (final Stat<?> aao6 : this.getDirty()) {
-                object2IntMap4.put(aao6, this.getValue(aao6));
+            for (final Stat<?> acr6 : this.getDirty()) {
+                object2IntMap4.put(acr6, this.getValue(acr6));
             }
         }
-        xe.connection.send(new ClientboundAwardStatsPacket(object2IntMap4));
+        ze.connection.send(new ClientboundAwardStatsPacket(object2IntMap4));
     }
     
     static {
diff --git a/src/net/minecraft/stats/Stat.java b/src/net/minecraft/stats/Stat.java
index 70af913..128509d 100644
--- a/src/net/minecraft/stats/Stat.java
+++ b/src/net/minecraft/stats/Stat.java
@@ -11,19 +11,19 @@ public class Stat<T> extends ObjectiveCriteria {
     private final T value;
     private final StatType<T> type;
     
-    protected Stat(final StatType<T> aaq, final T object, final StatFormatter aap) {
-        super(Stat.<T>buildName(aaq, object));
-        this.type = aaq;
-        this.formatter = aap;
+    protected Stat(final StatType<T> act, final T object, final StatFormatter acs) {
+        super(Stat.<T>buildName(act, object));
+        this.type = act;
+        this.formatter = acs;
         this.value = object;
     }
     
-    public static <T> String buildName(final StatType<T> aaq, final T object) {
-        return Stat.locationToKey(Registry.STAT_TYPE.getKey(aaq)) + ":" + Stat.locationToKey(aaq.getRegistry().getKey(object));
+    public static <T> String buildName(final StatType<T> act, final T object) {
+        return Stat.locationToKey(Registry.STAT_TYPE.getKey(act)) + ":" + Stat.locationToKey(act.getRegistry().getKey(object));
     }
     
-    private static <T> String locationToKey(@Nullable final ResourceLocation sm) {
-        return sm.toString().replace(':', '.');
+    private static <T> String locationToKey(@Nullable final ResourceLocation uh) {
+        return uh.toString().replace(':', '.');
     }
     
     public StatType<T> getType() {
diff --git a/src/net/minecraft/stats/StatType.java b/src/net/minecraft/stats/StatType.java
index bb1fba1..ba0932c 100644
--- a/src/net/minecraft/stats/StatType.java
+++ b/src/net/minecraft/stats/StatType.java
@@ -9,17 +9,17 @@ public class StatType<T> implements Iterable<Stat<T>> {
     private final Registry<T> registry;
     private final Map<T, Stat<T>> map;
     
-    public StatType(final Registry<T> gb) {
+    public StatType(final Registry<T> gl) {
         this.map = new IdentityHashMap<T, Stat<T>>();
-        this.registry = gb;
+        this.registry = gl;
     }
     
     public boolean contains(final T object) {
         return this.map.containsKey(object);
     }
     
-    public Stat<T> get(final T object, final StatFormatter aap) {
-        return this.map.computeIfAbsent(object, object -> new Stat((StatType<Object>)this, object, aap));
+    public Stat<T> get(final T object, final StatFormatter acs) {
+        return this.map.computeIfAbsent(object, object -> new Stat((StatType<Object>)this, object, acs));
     }
     
     public Registry<T> getRegistry() {
diff --git a/src/net/minecraft/stats/Stats.java b/src/net/minecraft/stats/Stats.java
index d11af8b..c40ca28 100644
--- a/src/net/minecraft/stats/Stats.java
+++ b/src/net/minecraft/stats/Stats.java
@@ -35,6 +35,7 @@ public class Stats {
     public static final ResourceLocation HORSE_ONE_CM;
     public static final ResourceLocation AVIATE_ONE_CM;
     public static final ResourceLocation SWIM_ONE_CM;
+    public static final ResourceLocation STRIDER_ONE_CM;
     public static final ResourceLocation JUMP;
     public static final ResourceLocation DROP;
     public static final ResourceLocation DAMAGE_DEALT;
@@ -87,16 +88,18 @@ public class Stats {
     public static final ResourceLocation RAID_WIN;
     public static final ResourceLocation INTERACT_WITH_ANVIL;
     public static final ResourceLocation INTERACT_WITH_GRINDSTONE;
+    public static final ResourceLocation TARGET_HIT;
+    public static final ResourceLocation INTERACT_WITH_SMITHING_TABLE;
     
-    private static ResourceLocation makeCustomStat(final String string, final StatFormatter aap) {
-        final ResourceLocation sm3 = new ResourceLocation(string);
-        Registry.<ResourceLocation>register(Registry.CUSTOM_STAT, string, sm3);
-        Stats.CUSTOM.get(sm3, aap);
-        return sm3;
+    private static ResourceLocation makeCustomStat(final String string, final StatFormatter acs) {
+        final ResourceLocation uh3 = new ResourceLocation(string);
+        Registry.<ResourceLocation>register(Registry.CUSTOM_STAT, string, uh3);
+        Stats.CUSTOM.get(uh3, acs);
+        return uh3;
     }
     
-    private static <T> StatType<T> makeRegistryStatType(final String string, final Registry<T> gb) {
-        return Registry.<StatType<T>>register(Registry.STAT_TYPE, string, new StatType<T>(gb));
+    private static <T> StatType<T> makeRegistryStatType(final String string, final Registry<T> gl) {
+        return Registry.<StatType<T>>register(Registry.STAT_TYPE, string, new StatType<T>(gl));
     }
     
     static {
@@ -128,6 +131,7 @@ public class Stats {
         HORSE_ONE_CM = makeCustomStat("horse_one_cm", StatFormatter.DISTANCE);
         AVIATE_ONE_CM = makeCustomStat("aviate_one_cm", StatFormatter.DISTANCE);
         SWIM_ONE_CM = makeCustomStat("swim_one_cm", StatFormatter.DISTANCE);
+        STRIDER_ONE_CM = makeCustomStat("strider_one_cm", StatFormatter.DISTANCE);
         JUMP = makeCustomStat("jump", StatFormatter.DEFAULT);
         DROP = makeCustomStat("drop", StatFormatter.DEFAULT);
         DAMAGE_DEALT = makeCustomStat("damage_dealt", StatFormatter.DIVIDE_BY_TEN);
@@ -180,5 +184,7 @@ public class Stats {
         RAID_WIN = makeCustomStat("raid_win", StatFormatter.DEFAULT);
         INTERACT_WITH_ANVIL = makeCustomStat("interact_with_anvil", StatFormatter.DEFAULT);
         INTERACT_WITH_GRINDSTONE = makeCustomStat("interact_with_grindstone", StatFormatter.DEFAULT);
+        TARGET_HIT = makeCustomStat("target_hit", StatFormatter.DEFAULT);
+        INTERACT_WITH_SMITHING_TABLE = makeCustomStat("interact_with_smithing_table", StatFormatter.DEFAULT);
     }
 }
diff --git a/src/net/minecraft/stats/StatsCounter.java b/src/net/minecraft/stats/StatsCounter.java
index 75a2d89..dcd0112 100644
--- a/src/net/minecraft/stats/StatsCounter.java
+++ b/src/net/minecraft/stats/StatsCounter.java
@@ -12,19 +12,20 @@ public class StatsCounter {
         (this.stats = (Object2IntMap<Stat<?>>)Object2IntMaps.synchronize((Object2IntMap)new Object2IntOpenHashMap())).defaultReturnValue(0);
     }
     
-    public void increment(final Player ayj, final Stat<?> aao, final int integer) {
-        this.setValue(ayj, aao, this.getValue(aao) + integer);
+    public void increment(final Player bec, final Stat<?> acr, final int integer) {
+        final int integer2 = (int)Math.min(this.getValue(acr) + (long)integer, 2147483647L);
+        this.setValue(bec, acr, integer2);
     }
     
-    public void setValue(final Player ayj, final Stat<?> aao, final int integer) {
-        this.stats.put(aao, integer);
+    public void setValue(final Player bec, final Stat<?> acr, final int integer) {
+        this.stats.put(acr, integer);
     }
     
-    public <T> int getValue(final StatType<T> aaq, final T object) {
-        return aaq.contains(object) ? this.getValue(aaq.get(object)) : 0;
+    public <T> int getValue(final StatType<T> act, final T object) {
+        return act.contains(object) ? this.getValue(act.get(object)) : 0;
     }
     
-    public int getValue(final Stat<?> aao) {
-        return this.stats.getInt(aao);
+    public int getValue(final Stat<?> acr) {
+        return this.stats.getInt(acr);
     }
 }
diff --git a/src/net/minecraft/tags/BlockTags.java b/src/net/minecraft/tags/BlockTags.java
index 75f38b1..c05f0ec 100644
--- a/src/net/minecraft/tags/BlockTags.java
+++ b/src/net/minecraft/tags/BlockTags.java
@@ -1,85 +1,117 @@
 package net.minecraft.tags;
 
-import java.util.Collection;
-import java.util.Optional;
 import net.minecraft.resources.ResourceLocation;
+import java.util.Set;
 import net.minecraft.world.level.block.Block;
 
 public class BlockTags {
-    private static TagCollection<Block> source;
-    private static int resetCount;
-    public static final Tag<Block> WOOL;
-    public static final Tag<Block> PLANKS;
-    public static final Tag<Block> STONE_BRICKS;
-    public static final Tag<Block> WOODEN_BUTTONS;
-    public static final Tag<Block> BUTTONS;
-    public static final Tag<Block> CARPETS;
-    public static final Tag<Block> WOODEN_DOORS;
-    public static final Tag<Block> WOODEN_STAIRS;
-    public static final Tag<Block> WOODEN_SLABS;
-    public static final Tag<Block> WOODEN_FENCES;
-    public static final Tag<Block> WOODEN_PRESSURE_PLATES;
-    public static final Tag<Block> WOODEN_TRAPDOORS;
-    public static final Tag<Block> DOORS;
-    public static final Tag<Block> SAPLINGS;
-    public static final Tag<Block> LOGS;
-    public static final Tag<Block> DARK_OAK_LOGS;
-    public static final Tag<Block> OAK_LOGS;
-    public static final Tag<Block> BIRCH_LOGS;
-    public static final Tag<Block> ACACIA_LOGS;
-    public static final Tag<Block> JUNGLE_LOGS;
-    public static final Tag<Block> SPRUCE_LOGS;
-    public static final Tag<Block> BANNERS;
-    public static final Tag<Block> SAND;
-    public static final Tag<Block> STAIRS;
-    public static final Tag<Block> SLABS;
-    public static final Tag<Block> WALLS;
-    public static final Tag<Block> ANVIL;
-    public static final Tag<Block> RAILS;
-    public static final Tag<Block> LEAVES;
-    public static final Tag<Block> TRAPDOORS;
-    public static final Tag<Block> SMALL_FLOWERS;
-    public static final Tag<Block> BEDS;
-    public static final Tag<Block> FENCES;
-    public static final Tag<Block> TALL_FLOWERS;
-    public static final Tag<Block> FLOWERS;
-    public static final Tag<Block> SHULKER_BOXES;
-    public static final Tag<Block> FLOWER_POTS;
-    public static final Tag<Block> ENDERMAN_HOLDABLE;
-    public static final Tag<Block> ICE;
-    public static final Tag<Block> VALID_SPAWN;
-    public static final Tag<Block> IMPERMEABLE;
-    public static final Tag<Block> UNDERWATER_BONEMEALS;
-    public static final Tag<Block> CORAL_BLOCKS;
-    public static final Tag<Block> WALL_CORALS;
-    public static final Tag<Block> CORAL_PLANTS;
-    public static final Tag<Block> CORALS;
-    public static final Tag<Block> BAMBOO_PLANTABLE_ON;
-    public static final Tag<Block> STANDING_SIGNS;
-    public static final Tag<Block> WALL_SIGNS;
-    public static final Tag<Block> SIGNS;
-    public static final Tag<Block> DRAGON_IMMUNE;
-    public static final Tag<Block> WITHER_IMMUNE;
-    public static final Tag<Block> BEEHIVES;
-    public static final Tag<Block> CROPS;
-    public static final Tag<Block> BEE_GROWABLES;
-    public static final Tag<Block> PORTALS;
+    private static final StaticTagHelper<Block> HELPER;
+    public static final Tag.Named<Block> WOOL;
+    public static final Tag.Named<Block> PLANKS;
+    public static final Tag.Named<Block> STONE_BRICKS;
+    public static final Tag.Named<Block> WOODEN_BUTTONS;
+    public static final Tag.Named<Block> BUTTONS;
+    public static final Tag.Named<Block> CARPETS;
+    public static final Tag.Named<Block> WOODEN_DOORS;
+    public static final Tag.Named<Block> WOODEN_STAIRS;
+    public static final Tag.Named<Block> WOODEN_SLABS;
+    public static final Tag.Named<Block> WOODEN_FENCES;
+    public static final Tag.Named<Block> PRESSURE_PLATES;
+    public static final Tag.Named<Block> WOODEN_PRESSURE_PLATES;
+    public static final Tag.Named<Block> STONE_PRESSURE_PLATES;
+    public static final Tag.Named<Block> WOODEN_TRAPDOORS;
+    public static final Tag.Named<Block> DOORS;
+    public static final Tag.Named<Block> SAPLINGS;
+    public static final Tag.Named<Block> LOGS_THAT_BURN;
+    public static final Tag.Named<Block> LOGS;
+    public static final Tag.Named<Block> DARK_OAK_LOGS;
+    public static final Tag.Named<Block> OAK_LOGS;
+    public static final Tag.Named<Block> BIRCH_LOGS;
+    public static final Tag.Named<Block> ACACIA_LOGS;
+    public static final Tag.Named<Block> JUNGLE_LOGS;
+    public static final Tag.Named<Block> SPRUCE_LOGS;
+    public static final Tag.Named<Block> CRIMSON_STEMS;
+    public static final Tag.Named<Block> WARPED_STEMS;
+    public static final Tag.Named<Block> BANNERS;
+    public static final Tag.Named<Block> SAND;
+    public static final Tag.Named<Block> STAIRS;
+    public static final Tag.Named<Block> SLABS;
+    public static final Tag.Named<Block> WALLS;
+    public static final Tag.Named<Block> ANVIL;
+    public static final Tag.Named<Block> RAILS;
+    public static final Tag.Named<Block> LEAVES;
+    public static final Tag.Named<Block> TRAPDOORS;
+    public static final Tag.Named<Block> SMALL_FLOWERS;
+    public static final Tag.Named<Block> BEDS;
+    public static final Tag.Named<Block> FENCES;
+    public static final Tag.Named<Block> TALL_FLOWERS;
+    public static final Tag.Named<Block> FLOWERS;
+    public static final Tag.Named<Block> PIGLIN_REPELLENTS;
+    public static final Tag.Named<Block> GOLD_ORES;
+    public static final Tag.Named<Block> NON_FLAMMABLE_WOOD;
+    public static final Tag.Named<Block> FLOWER_POTS;
+    public static final Tag.Named<Block> ENDERMAN_HOLDABLE;
+    public static final Tag.Named<Block> ICE;
+    public static final Tag.Named<Block> VALID_SPAWN;
+    public static final Tag.Named<Block> IMPERMEABLE;
+    public static final Tag.Named<Block> UNDERWATER_BONEMEALS;
+    public static final Tag.Named<Block> CORAL_BLOCKS;
+    public static final Tag.Named<Block> WALL_CORALS;
+    public static final Tag.Named<Block> CORAL_PLANTS;
+    public static final Tag.Named<Block> CORALS;
+    public static final Tag.Named<Block> BAMBOO_PLANTABLE_ON;
+    public static final Tag.Named<Block> STANDING_SIGNS;
+    public static final Tag.Named<Block> WALL_SIGNS;
+    public static final Tag.Named<Block> SIGNS;
+    public static final Tag.Named<Block> DRAGON_IMMUNE;
+    public static final Tag.Named<Block> WITHER_IMMUNE;
+    public static final Tag.Named<Block> WITHER_SUMMON_BASE_BLOCKS;
+    public static final Tag.Named<Block> BEEHIVES;
+    public static final Tag.Named<Block> CROPS;
+    public static final Tag.Named<Block> BEE_GROWABLES;
+    public static final Tag.Named<Block> PORTALS;
+    public static final Tag.Named<Block> FIRE;
+    public static final Tag.Named<Block> NYLIUM;
+    public static final Tag.Named<Block> WART_BLOCKS;
+    public static final Tag.Named<Block> BEACON_BASE_BLOCKS;
+    public static final Tag.Named<Block> SOUL_SPEED_BLOCKS;
+    public static final Tag.Named<Block> WALL_POST_OVERRIDE;
+    public static final Tag.Named<Block> CLIMBABLE;
+    public static final Tag.Named<Block> SHULKER_BOXES;
+    public static final Tag.Named<Block> HOGLIN_REPELLENTS;
+    public static final Tag.Named<Block> SOUL_FIRE_BASE_BLOCKS;
+    public static final Tag.Named<Block> STRIDER_WARM_BLOCKS;
+    public static final Tag.Named<Block> CAMPFIRES;
+    public static final Tag.Named<Block> GUARDED_BY_PIGLINS;
+    public static final Tag.Named<Block> PREVENT_MOB_SPAWNING_INSIDE;
+    public static final Tag.Named<Block> FENCE_GATES;
+    public static final Tag.Named<Block> UNSTABLE_BOTTOM_CENTER;
+    public static final Tag.Named<Block> INFINIBURN_OVERWORLD;
+    public static final Tag.Named<Block> INFINIBURN_NETHER;
+    public static final Tag.Named<Block> INFINIBURN_END;
     
-    public static void reset(final TagCollection<Block> aba) {
-        BlockTags.source = aba;
-        ++BlockTags.resetCount;
+    private static Tag.Named<Block> bind(final String string) {
+        return BlockTags.HELPER.bind(string);
+    }
+    
+    public static void reset(final TagCollection<Block> adg) {
+        BlockTags.HELPER.reset(adg);
+    }
+    
+    public static void resetToEmpty() {
+        BlockTags.HELPER.resetToEmpty();
     }
     
     public static TagCollection<Block> getAllTags() {
-        return BlockTags.source;
+        return BlockTags.HELPER.getAllTags();
     }
     
-    private static Tag<Block> bind(final String string) {
-        return new Wrapper(new ResourceLocation(string));
+    public static Set<ResourceLocation> getMissingTags(final TagCollection<Block> adg) {
+        return BlockTags.HELPER.getMissingTags(adg);
     }
     
     static {
-        BlockTags.source = new TagCollection<Block>(sm -> Optional.empty(), "", false, "");
+        HELPER = new StaticTagHelper<Block>();
         WOOL = bind("wool");
         PLANKS = bind("planks");
         STONE_BRICKS = bind("stone_bricks");
@@ -90,10 +122,13 @@ public class BlockTags {
         WOODEN_STAIRS = bind("wooden_stairs");
         WOODEN_SLABS = bind("wooden_slabs");
         WOODEN_FENCES = bind("wooden_fences");
+        PRESSURE_PLATES = bind("pressure_plates");
         WOODEN_PRESSURE_PLATES = bind("wooden_pressure_plates");
+        STONE_PRESSURE_PLATES = bind("stone_pressure_plates");
         WOODEN_TRAPDOORS = bind("wooden_trapdoors");
         DOORS = bind("doors");
         SAPLINGS = bind("saplings");
+        LOGS_THAT_BURN = bind("logs_that_burn");
         LOGS = bind("logs");
         DARK_OAK_LOGS = bind("dark_oak_logs");
         OAK_LOGS = bind("oak_logs");
@@ -101,6 +136,8 @@ public class BlockTags {
         ACACIA_LOGS = bind("acacia_logs");
         JUNGLE_LOGS = bind("jungle_logs");
         SPRUCE_LOGS = bind("spruce_logs");
+        CRIMSON_STEMS = bind("crimson_stems");
+        WARPED_STEMS = bind("warped_stems");
         BANNERS = bind("banners");
         SAND = bind("sand");
         STAIRS = bind("stairs");
@@ -115,7 +152,9 @@ public class BlockTags {
         FENCES = bind("fences");
         TALL_FLOWERS = bind("tall_flowers");
         FLOWERS = bind("flowers");
-        SHULKER_BOXES = bind("shulker_boxes");
+        PIGLIN_REPELLENTS = bind("piglin_repellents");
+        GOLD_ORES = bind("gold_ores");
+        NON_FLAMMABLE_WOOD = bind("non_flammable_wood");
         FLOWER_POTS = bind("flower_pots");
         ENDERMAN_HOLDABLE = bind("enderman_holdable");
         ICE = bind("ice");
@@ -132,46 +171,29 @@ public class BlockTags {
         SIGNS = bind("signs");
         DRAGON_IMMUNE = bind("dragon_immune");
         WITHER_IMMUNE = bind("wither_immune");
+        WITHER_SUMMON_BASE_BLOCKS = bind("wither_summon_base_blocks");
         BEEHIVES = bind("beehives");
         CROPS = bind("crops");
         BEE_GROWABLES = bind("bee_growables");
         PORTALS = bind("portals");
-    }
-    
-    static class Wrapper extends Tag<Block> {
-        private int check;
-        private Tag<Block> actual;
-        
-        public Wrapper(final ResourceLocation sm) {
-            super(sm);
-            this.check = -1;
-        }
-        
-        @Override
-        public boolean contains(final Block bph) {
-            if (this.check != BlockTags.resetCount) {
-                this.actual = BlockTags.source.getTagOrEmpty(this.getId());
-                this.check = BlockTags.resetCount;
-            }
-            return this.actual.contains(bph);
-        }
-        
-        @Override
-        public Collection<Block> getValues() {
-            if (this.check != BlockTags.resetCount) {
-                this.actual = BlockTags.source.getTagOrEmpty(this.getId());
-                this.check = BlockTags.resetCount;
-            }
-            return this.actual.getValues();
-        }
-        
-        @Override
-        public Collection<Entry<Block>> getSource() {
-            if (this.check != BlockTags.resetCount) {
-                this.actual = BlockTags.source.getTagOrEmpty(this.getId());
-                this.check = BlockTags.resetCount;
-            }
-            return this.actual.getSource();
-        }
+        FIRE = bind("fire");
+        NYLIUM = bind("nylium");
+        WART_BLOCKS = bind("wart_blocks");
+        BEACON_BASE_BLOCKS = bind("beacon_base_blocks");
+        SOUL_SPEED_BLOCKS = bind("soul_speed_blocks");
+        WALL_POST_OVERRIDE = bind("wall_post_override");
+        CLIMBABLE = bind("climbable");
+        SHULKER_BOXES = bind("shulker_boxes");
+        HOGLIN_REPELLENTS = bind("hoglin_repellents");
+        SOUL_FIRE_BASE_BLOCKS = bind("soul_fire_base_blocks");
+        STRIDER_WARM_BLOCKS = bind("strider_warm_blocks");
+        CAMPFIRES = bind("campfires");
+        GUARDED_BY_PIGLINS = bind("guarded_by_piglins");
+        PREVENT_MOB_SPAWNING_INSIDE = bind("prevent_mob_spawning_inside");
+        FENCE_GATES = bind("fence_gates");
+        UNSTABLE_BOTTOM_CENTER = bind("unstable_bottom_center");
+        INFINIBURN_OVERWORLD = bind("infiniburn_overworld");
+        INFINIBURN_NETHER = bind("infiniburn_nether");
+        INFINIBURN_END = bind("infiniburn_end");
     }
 }
diff --git a/src/net/minecraft/tags/EntityTypeTags.java b/src/net/minecraft/tags/EntityTypeTags.java
index a178975..c941b40 100644
--- a/src/net/minecraft/tags/EntityTypeTags.java
+++ b/src/net/minecraft/tags/EntityTypeTags.java
@@ -1,73 +1,43 @@
 package net.minecraft.tags;
 
-import java.util.Collection;
-import java.util.Optional;
 import net.minecraft.resources.ResourceLocation;
+import java.util.Set;
 import net.minecraft.world.entity.EntityType;
 
 public class EntityTypeTags {
-    private static TagCollection<EntityType<?>> source;
-    private static int resetCount;
-    public static final Tag<EntityType<?>> SKELETONS;
-    public static final Tag<EntityType<?>> RAIDERS;
-    public static final Tag<EntityType<?>> BEEHIVE_INHABITORS;
-    public static final Tag<EntityType<?>> ARROWS;
+    private static final StaticTagHelper<EntityType<?>> HELPER;
+    public static final Tag.Named<EntityType<?>> SKELETONS;
+    public static final Tag.Named<EntityType<?>> RAIDERS;
+    public static final Tag.Named<EntityType<?>> BEEHIVE_INHABITORS;
+    public static final Tag.Named<EntityType<?>> ARROWS;
+    public static final Tag.Named<EntityType<?>> IMPACT_PROJECTILES;
     
-    public static void reset(final TagCollection<EntityType<?>> aba) {
-        EntityTypeTags.source = aba;
-        ++EntityTypeTags.resetCount;
+    private static Tag.Named<EntityType<?>> bind(final String string) {
+        return EntityTypeTags.HELPER.bind(string);
+    }
+    
+    public static void reset(final TagCollection<EntityType<?>> adg) {
+        EntityTypeTags.HELPER.reset(adg);
+    }
+    
+    public static void resetToEmpty() {
+        EntityTypeTags.HELPER.resetToEmpty();
     }
     
     public static TagCollection<EntityType<?>> getAllTags() {
-        return EntityTypeTags.source;
+        return EntityTypeTags.HELPER.getAllTags();
     }
     
-    private static Tag<EntityType<?>> bind(final String string) {
-        return new Wrapper(new ResourceLocation(string));
+    public static Set<ResourceLocation> getMissingTags(final TagCollection<EntityType<?>> adg) {
+        return EntityTypeTags.HELPER.getMissingTags(adg);
     }
     
     static {
-        EntityTypeTags.source = new TagCollection<EntityType<?>>(sm -> Optional.empty(), "", false, "");
+        HELPER = new StaticTagHelper<EntityType<?>>();
         SKELETONS = bind("skeletons");
         RAIDERS = bind("raiders");
         BEEHIVE_INHABITORS = bind("beehive_inhabitors");
         ARROWS = bind("arrows");
-    }
-    
-    public static class Wrapper extends Tag<EntityType<?>> {
-        private int check;
-        private Tag<EntityType<?>> actual;
-        
-        public Wrapper(final ResourceLocation sm) {
-            super(sm);
-            this.check = -1;
-        }
-        
-        @Override
-        public boolean contains(final EntityType<?> aku) {
-            if (this.check != EntityTypeTags.resetCount) {
-                this.actual = EntityTypeTags.source.getTagOrEmpty(this.getId());
-                this.check = EntityTypeTags.resetCount;
-            }
-            return this.actual.contains(aku);
-        }
-        
-        @Override
-        public Collection<EntityType<?>> getValues() {
-            if (this.check != EntityTypeTags.resetCount) {
-                this.actual = EntityTypeTags.source.getTagOrEmpty(this.getId());
-                this.check = EntityTypeTags.resetCount;
-            }
-            return this.actual.getValues();
-        }
-        
-        @Override
-        public Collection<Entry<EntityType<?>>> getSource() {
-            if (this.check != EntityTypeTags.resetCount) {
-                this.actual = EntityTypeTags.source.getTagOrEmpty(this.getId());
-                this.check = EntityTypeTags.resetCount;
-            }
-            return this.actual.getSource();
-        }
+        IMPACT_PROJECTILES = bind("impact_projectiles");
     }
 }
diff --git a/src/net/minecraft/tags/FluidTags.java b/src/net/minecraft/tags/FluidTags.java
index fa9e46c..6a97678 100644
--- a/src/net/minecraft/tags/FluidTags.java
+++ b/src/net/minecraft/tags/FluidTags.java
@@ -1,69 +1,42 @@
 package net.minecraft.tags;
 
-import java.util.Collection;
-import java.util.Optional;
 import net.minecraft.resources.ResourceLocation;
+import java.util.Set;
+import java.util.List;
 import net.minecraft.world.level.material.Fluid;
 
 public class FluidTags {
-    private static TagCollection<Fluid> source;
-    private static int resetCount;
-    public static final Tag<Fluid> WATER;
-    public static final Tag<Fluid> LAVA;
+    private static final StaticTagHelper<Fluid> HELPER;
+    public static final Tag.Named<Fluid> WATER;
+    public static final Tag.Named<Fluid> LAVA;
     
-    public static void reset(final TagCollection<Fluid> aba) {
-        FluidTags.source = aba;
-        ++FluidTags.resetCount;
+    private static Tag.Named<Fluid> bind(final String string) {
+        return FluidTags.HELPER.bind(string);
+    }
+    
+    public static void reset(final TagCollection<Fluid> adg) {
+        FluidTags.HELPER.reset(adg);
+    }
+    
+    public static void resetToEmpty() {
+        FluidTags.HELPER.resetToEmpty();
     }
     
     public static TagCollection<Fluid> getAllTags() {
-        return FluidTags.source;
+        return FluidTags.HELPER.getAllTags();
     }
     
-    private static Tag<Fluid> bind(final String string) {
-        return new Wrapper(new ResourceLocation(string));
+    public static List<StaticTagHelper.Wrapper<Fluid>> getWrappers() {
+        return FluidTags.HELPER.getWrappers();
+    }
+    
+    public static Set<ResourceLocation> getMissingTags(final TagCollection<Fluid> adg) {
+        return FluidTags.HELPER.getMissingTags(adg);
     }
     
     static {
-        FluidTags.source = new TagCollection<Fluid>(sm -> Optional.empty(), "", false, "");
+        HELPER = new StaticTagHelper<Fluid>();
         WATER = bind("water");
         LAVA = bind("lava");
     }
-    
-    public static class Wrapper extends Tag<Fluid> {
-        private int check;
-        private Tag<Fluid> actual;
-        
-        public Wrapper(final ResourceLocation sm) {
-            super(sm);
-            this.check = -1;
-        }
-        
-        @Override
-        public boolean contains(final Fluid coi) {
-            if (this.check != FluidTags.resetCount) {
-                this.actual = FluidTags.source.getTagOrEmpty(this.getId());
-                this.check = FluidTags.resetCount;
-            }
-            return this.actual.contains(coi);
-        }
-        
-        @Override
-        public Collection<Fluid> getValues() {
-            if (this.check != FluidTags.resetCount) {
-                this.actual = FluidTags.source.getTagOrEmpty(this.getId());
-                this.check = FluidTags.resetCount;
-            }
-            return this.actual.getValues();
-        }
-        
-        @Override
-        public Collection<Entry<Fluid>> getSource() {
-            if (this.check != FluidTags.resetCount) {
-                this.actual = FluidTags.source.getTagOrEmpty(this.getId());
-                this.check = FluidTags.resetCount;
-            }
-            return this.actual.getSource();
-        }
-    }
 }
diff --git a/src/net/minecraft/tags/ItemTags.java b/src/net/minecraft/tags/ItemTags.java
index ccb3778..7757de1 100644
--- a/src/net/minecraft/tags/ItemTags.java
+++ b/src/net/minecraft/tags/ItemTags.java
@@ -1,71 +1,88 @@
 package net.minecraft.tags;
 
-import java.util.Collection;
-import java.util.Optional;
 import net.minecraft.resources.ResourceLocation;
+import java.util.Set;
 import net.minecraft.world.item.Item;
 
 public class ItemTags {
-    private static TagCollection<Item> source;
-    private static int resetCount;
-    public static final Tag<Item> WOOL;
-    public static final Tag<Item> PLANKS;
-    public static final Tag<Item> STONE_BRICKS;
-    public static final Tag<Item> WOODEN_BUTTONS;
-    public static final Tag<Item> BUTTONS;
-    public static final Tag<Item> CARPETS;
-    public static final Tag<Item> WOODEN_DOORS;
-    public static final Tag<Item> WOODEN_STAIRS;
-    public static final Tag<Item> WOODEN_SLABS;
-    public static final Tag<Item> WOODEN_FENCES;
-    public static final Tag<Item> WOODEN_PRESSURE_PLATES;
-    public static final Tag<Item> WOODEN_TRAPDOORS;
-    public static final Tag<Item> DOORS;
-    public static final Tag<Item> SAPLINGS;
-    public static final Tag<Item> LOGS;
-    public static final Tag<Item> DARK_OAK_LOGS;
-    public static final Tag<Item> OAK_LOGS;
-    public static final Tag<Item> BIRCH_LOGS;
-    public static final Tag<Item> ACACIA_LOGS;
-    public static final Tag<Item> JUNGLE_LOGS;
-    public static final Tag<Item> SPRUCE_LOGS;
-    public static final Tag<Item> BANNERS;
-    public static final Tag<Item> SAND;
-    public static final Tag<Item> STAIRS;
-    public static final Tag<Item> SLABS;
-    public static final Tag<Item> WALLS;
-    public static final Tag<Item> ANVIL;
-    public static final Tag<Item> RAILS;
-    public static final Tag<Item> LEAVES;
-    public static final Tag<Item> TRAPDOORS;
-    public static final Tag<Item> SMALL_FLOWERS;
-    public static final Tag<Item> BEDS;
-    public static final Tag<Item> FENCES;
-    public static final Tag<Item> TALL_FLOWERS;
-    public static final Tag<Item> FLOWERS;
-    public static final Tag<Item> BOATS;
-    public static final Tag<Item> FISHES;
-    public static final Tag<Item> SIGNS;
-    public static final Tag<Item> MUSIC_DISCS;
-    public static final Tag<Item> COALS;
-    public static final Tag<Item> ARROWS;
-    public static final Tag<Item> LECTERN_BOOKS;
+    private static final StaticTagHelper<Item> HELPER;
+    public static final Tag.Named<Item> WOOL;
+    public static final Tag.Named<Item> PLANKS;
+    public static final Tag.Named<Item> STONE_BRICKS;
+    public static final Tag.Named<Item> WOODEN_BUTTONS;
+    public static final Tag.Named<Item> BUTTONS;
+    public static final Tag.Named<Item> CARPETS;
+    public static final Tag.Named<Item> WOODEN_DOORS;
+    public static final Tag.Named<Item> WOODEN_STAIRS;
+    public static final Tag.Named<Item> WOODEN_SLABS;
+    public static final Tag.Named<Item> WOODEN_FENCES;
+    public static final Tag.Named<Item> WOODEN_PRESSURE_PLATES;
+    public static final Tag.Named<Item> WOODEN_TRAPDOORS;
+    public static final Tag.Named<Item> DOORS;
+    public static final Tag.Named<Item> SAPLINGS;
+    public static final Tag.Named<Item> LOGS_THAT_BURN;
+    public static final Tag.Named<Item> LOGS;
+    public static final Tag.Named<Item> DARK_OAK_LOGS;
+    public static final Tag.Named<Item> OAK_LOGS;
+    public static final Tag.Named<Item> BIRCH_LOGS;
+    public static final Tag.Named<Item> ACACIA_LOGS;
+    public static final Tag.Named<Item> JUNGLE_LOGS;
+    public static final Tag.Named<Item> SPRUCE_LOGS;
+    public static final Tag.Named<Item> CRIMSON_STEMS;
+    public static final Tag.Named<Item> WARPED_STEMS;
+    public static final Tag.Named<Item> BANNERS;
+    public static final Tag.Named<Item> SAND;
+    public static final Tag.Named<Item> STAIRS;
+    public static final Tag.Named<Item> SLABS;
+    public static final Tag.Named<Item> WALLS;
+    public static final Tag.Named<Item> ANVIL;
+    public static final Tag.Named<Item> RAILS;
+    public static final Tag.Named<Item> LEAVES;
+    public static final Tag.Named<Item> TRAPDOORS;
+    public static final Tag.Named<Item> SMALL_FLOWERS;
+    public static final Tag.Named<Item> BEDS;
+    public static final Tag.Named<Item> FENCES;
+    public static final Tag.Named<Item> TALL_FLOWERS;
+    public static final Tag.Named<Item> FLOWERS;
+    public static final Tag.Named<Item> PIGLIN_REPELLENTS;
+    public static final Tag.Named<Item> PIGLIN_LOVED;
+    public static final Tag.Named<Item> GOLD_ORES;
+    public static final Tag.Named<Item> NON_FLAMMABLE_WOOD;
+    public static final Tag.Named<Item> SOUL_FIRE_BASE_BLOCKS;
+    public static final Tag.Named<Item> BOATS;
+    public static final Tag.Named<Item> FISHES;
+    public static final Tag.Named<Item> SIGNS;
+    public static final Tag.Named<Item> MUSIC_DISCS;
+    public static final Tag.Named<Item> CREEPER_DROP_MUSIC_DISCS;
+    public static final Tag.Named<Item> COALS;
+    public static final Tag.Named<Item> ARROWS;
+    public static final Tag.Named<Item> LECTERN_BOOKS;
+    public static final Tag.Named<Item> BEACON_PAYMENT_ITEMS;
+    public static final Tag.Named<Item> STONE_TOOL_MATERIALS;
+    public static final Tag.Named<Item> FURNACE_MATERIALS;
     
-    public static void reset(final TagCollection<Item> aba) {
-        ItemTags.source = aba;
-        ++ItemTags.resetCount;
+    private static Tag.Named<Item> bind(final String string) {
+        return ItemTags.HELPER.bind(string);
+    }
+    
+    public static void reset(final TagCollection<Item> adg) {
+        ItemTags.HELPER.reset(adg);
+    }
+    
+    public static void resetToEmpty() {
+        ItemTags.HELPER.resetToEmpty();
     }
     
     public static TagCollection<Item> getAllTags() {
-        return ItemTags.source;
+        return ItemTags.HELPER.getAllTags();
     }
     
-    private static Tag<Item> bind(final String string) {
-        return new Wrapper(new ResourceLocation(string));
+    public static Set<ResourceLocation> getMissingTags(final TagCollection<Item> adg) {
+        return ItemTags.HELPER.getMissingTags(adg);
     }
     
     static {
-        ItemTags.source = new TagCollection<Item>(sm -> Optional.empty(), "", false, "");
+        HELPER = new StaticTagHelper<Item>();
         WOOL = bind("wool");
         PLANKS = bind("planks");
         STONE_BRICKS = bind("stone_bricks");
@@ -80,6 +97,7 @@ public class ItemTags {
         WOODEN_TRAPDOORS = bind("wooden_trapdoors");
         DOORS = bind("doors");
         SAPLINGS = bind("saplings");
+        LOGS_THAT_BURN = bind("logs_that_burn");
         LOGS = bind("logs");
         DARK_OAK_LOGS = bind("dark_oak_logs");
         OAK_LOGS = bind("oak_logs");
@@ -87,6 +105,8 @@ public class ItemTags {
         ACACIA_LOGS = bind("acacia_logs");
         JUNGLE_LOGS = bind("jungle_logs");
         SPRUCE_LOGS = bind("spruce_logs");
+        CRIMSON_STEMS = bind("crimson_stems");
+        WARPED_STEMS = bind("warped_stems");
         BANNERS = bind("banners");
         SAND = bind("sand");
         STAIRS = bind("stairs");
@@ -101,49 +121,21 @@ public class ItemTags {
         FENCES = bind("fences");
         TALL_FLOWERS = bind("tall_flowers");
         FLOWERS = bind("flowers");
+        PIGLIN_REPELLENTS = bind("piglin_repellents");
+        PIGLIN_LOVED = bind("piglin_loved");
+        GOLD_ORES = bind("gold_ores");
+        NON_FLAMMABLE_WOOD = bind("non_flammable_wood");
+        SOUL_FIRE_BASE_BLOCKS = bind("soul_fire_base_blocks");
         BOATS = bind("boats");
         FISHES = bind("fishes");
         SIGNS = bind("signs");
         MUSIC_DISCS = bind("music_discs");
+        CREEPER_DROP_MUSIC_DISCS = bind("creeper_drop_music_discs");
         COALS = bind("coals");
         ARROWS = bind("arrows");
         LECTERN_BOOKS = bind("lectern_books");
-    }
-    
-    public static class Wrapper extends Tag<Item> {
-        private int check;
-        private Tag<Item> actual;
-        
-        public Wrapper(final ResourceLocation sm) {
-            super(sm);
-            this.check = -1;
-        }
-        
-        @Override
-        public boolean contains(final Item bei) {
-            if (this.check != ItemTags.resetCount) {
-                this.actual = ItemTags.source.getTagOrEmpty(this.getId());
-                this.check = ItemTags.resetCount;
-            }
-            return this.actual.contains(bei);
-        }
-        
-        @Override
-        public Collection<Item> getValues() {
-            if (this.check != ItemTags.resetCount) {
-                this.actual = ItemTags.source.getTagOrEmpty(this.getId());
-                this.check = ItemTags.resetCount;
-            }
-            return this.actual.getValues();
-        }
-        
-        @Override
-        public Collection<Entry<Item>> getSource() {
-            if (this.check != ItemTags.resetCount) {
-                this.actual = ItemTags.source.getTagOrEmpty(this.getId());
-                this.check = ItemTags.resetCount;
-            }
-            return this.actual.getSource();
-        }
+        BEACON_PAYMENT_ITEMS = bind("beacon_payment_items");
+        STONE_TOOL_MATERIALS = bind("stone_tool_materials");
+        FURNACE_MATERIALS = bind("furnace_materials");
     }
 }
diff --git a/src/net/minecraft/tags/SerializationTags.java b/src/net/minecraft/tags/SerializationTags.java
new file mode 100644
index 0000000..9d071b6
--- /dev/null
+++ b/src/net/minecraft/tags/SerializationTags.java
@@ -0,0 +1,49 @@
+package net.minecraft.tags;
+
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+
+public class SerializationTags {
+    private static volatile SerializationTags instance;
+    private final TagCollection<Block> blocks;
+    private final TagCollection<Item> items;
+    private final TagCollection<Fluid> fluids;
+    private final TagCollection<EntityType<?>> entityTypes;
+    
+    private SerializationTags(final TagCollection<Block> adg1, final TagCollection<Item> adg2, final TagCollection<Fluid> adg3, final TagCollection<EntityType<?>> adg4) {
+        this.blocks = adg1;
+        this.items = adg2;
+        this.fluids = adg3;
+        this.entityTypes = adg4;
+    }
+    
+    public TagCollection<Block> getBlocks() {
+        return this.blocks;
+    }
+    
+    public TagCollection<Item> getItems() {
+        return this.items;
+    }
+    
+    public TagCollection<Fluid> getFluids() {
+        return this.fluids;
+    }
+    
+    public TagCollection<EntityType<?>> getEntityTypes() {
+        return this.entityTypes;
+    }
+    
+    public static SerializationTags getInstance() {
+        return SerializationTags.instance;
+    }
+    
+    public static void bind(final TagCollection<Block> adg1, final TagCollection<Item> adg2, final TagCollection<Fluid> adg3, final TagCollection<EntityType<?>> adg4) {
+        SerializationTags.instance = new SerializationTags(adg1, adg2, adg3, adg4);
+    }
+    
+    static {
+        SerializationTags.instance = new SerializationTags(BlockTags.getAllTags(), ItemTags.getAllTags(), FluidTags.getAllTags(), EntityTypeTags.getAllTags());
+    }
+}
diff --git a/src/net/minecraft/tags/SetTag.java b/src/net/minecraft/tags/SetTag.java
new file mode 100644
index 0000000..ec7db13
--- /dev/null
+++ b/src/net/minecraft/tags/SetTag.java
@@ -0,0 +1,63 @@
+package net.minecraft.tags;
+
+import java.util.Iterator;
+import java.util.List;
+import com.google.common.collect.ImmutableSet;
+import java.util.Collection;
+import com.google.common.annotations.VisibleForTesting;
+import java.util.Set;
+import com.google.common.collect.ImmutableList;
+
+public class SetTag<T> implements Tag<T> {
+    private final ImmutableList<T> valuesList;
+    private final Set<T> values;
+    @VisibleForTesting
+    protected final Class<?> closestCommonSuperType;
+    
+    protected SetTag(final Set<T> set, final Class<?> class2) {
+        this.closestCommonSuperType = class2;
+        this.values = set;
+        this.valuesList = ImmutableList.<T>copyOf(set);
+    }
+    
+    public static <T> SetTag<T> empty() {
+        return new SetTag<T>(ImmutableSet.of(), Void.class);
+    }
+    
+    public static <T> SetTag<T> create(final Set<T> set) {
+        return new SetTag<T>(set, SetTag.<T>findCommonSuperClass(set));
+    }
+    
+    @Override
+    public boolean contains(final T object) {
+        return this.closestCommonSuperType.isInstance(object) && this.values.contains(object);
+    }
+    
+    @Override
+    public List<T> getValues() {
+        return this.valuesList;
+    }
+    
+    private static <T> Class<?> findCommonSuperClass(final Set<T> set) {
+        if (set.isEmpty()) {
+            return Void.class;
+        }
+        Class<?> class2 = null;
+        for (final T object4 : set) {
+            if (class2 == null) {
+                class2 = object4.getClass();
+            }
+            else {
+                class2 = findClosestAncestor(class2, object4.getClass());
+            }
+        }
+        return class2;
+    }
+    
+    private static Class<?> findClosestAncestor(Class<?> class1, final Class<?> class2) {
+        while (!class1.isAssignableFrom(class2)) {
+            class1 = class1.getSuperclass();
+        }
+        return class1;
+    }
+}
diff --git a/src/net/minecraft/tags/StaticTagHelper.java b/src/net/minecraft/tags/StaticTagHelper.java
new file mode 100644
index 0000000..84e216b
--- /dev/null
+++ b/src/net/minecraft/tags/StaticTagHelper.java
@@ -0,0 +1,93 @@
+package net.minecraft.tags;
+
+import javax.annotation.Nullable;
+import com.google.common.collect.Sets;
+import java.util.Collection;
+import com.google.common.collect.ImmutableSet;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.Set;
+import java.util.function.Function;
+import net.minecraft.resources.ResourceLocation;
+import com.google.common.collect.Lists;
+import java.util.Optional;
+import java.util.List;
+
+public class StaticTagHelper<T> {
+    private final TagCollection<T> empty;
+    private TagCollection<T> source;
+    private final List<Wrapper<T>> wrappers;
+    
+    public StaticTagHelper() {
+        this.empty = new TagCollection<T>(uh -> Optional.empty(), "", "");
+        this.source = this.empty;
+        this.wrappers = Lists.newArrayList();
+    }
+    
+    public Tag.Named<T> bind(final String string) {
+        final Wrapper<T> a3 = new Wrapper<T>(new ResourceLocation(string));
+        this.wrappers.add(a3);
+        return a3;
+    }
+    
+    public void resetToEmpty() {
+        this.source = this.empty;
+        final Tag<T> adf2 = SetTag.empty();
+        this.wrappers.forEach(a -> a.rebind(uh -> adf2));
+    }
+    
+    public void reset(final TagCollection<T> adg) {
+        this.source = adg;
+        this.wrappers.forEach(a -> a.rebind(adg::getTag));
+    }
+    
+    public TagCollection<T> getAllTags() {
+        return this.source;
+    }
+    
+    public List<Wrapper<T>> getWrappers() {
+        return this.wrappers;
+    }
+    
+    public Set<ResourceLocation> getMissingTags(final TagCollection<T> adg) {
+        final Set<ResourceLocation> set3 = this.wrappers.stream().map(Wrapper::getName).collect(Collectors.toSet());
+        final ImmutableSet<ResourceLocation> immutableSet4 = ImmutableSet.<ResourceLocation>copyOf(adg.getAvailableTags());
+        return Sets.<ResourceLocation>difference(set3, immutableSet4);
+    }
+    
+    public static class Wrapper<T> implements Tag.Named<T> {
+        @Nullable
+        private Tag<T> tag;
+        protected final ResourceLocation name;
+        
+        private Wrapper(final ResourceLocation uh) {
+            this.name = uh;
+        }
+        
+        @Override
+        public ResourceLocation getName() {
+            return this.name;
+        }
+        
+        private Tag<T> resolve() {
+            if (this.tag == null) {
+                throw new IllegalStateException("Tag " + this.name + " used before it was bound");
+            }
+            return this.tag;
+        }
+        
+        void rebind(final Function<ResourceLocation, Tag<T>> function) {
+            this.tag = function.apply(this.name);
+        }
+        
+        @Override
+        public boolean contains(final T object) {
+            return this.resolve().contains(object);
+        }
+        
+        @Override
+        public List<T> getValues() {
+            return this.resolve().getValues();
+        }
+    }
+}
diff --git a/src/net/minecraft/tags/SynchronizableTagCollection.java b/src/net/minecraft/tags/SynchronizableTagCollection.java
index 5d5b638..471a79d 100644
--- a/src/net/minecraft/tags/SynchronizableTagCollection.java
+++ b/src/net/minecraft/tags/SynchronizableTagCollection.java
@@ -1,5 +1,7 @@
 package net.minecraft.tags;
 
+import java.util.Set;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import java.util.Iterator;
 import net.minecraft.resources.ResourceLocation;
@@ -11,33 +13,33 @@ import net.minecraft.core.Registry;
 public class SynchronizableTagCollection<T> extends TagCollection<T> {
     private final Registry<T> registry;
     
-    public SynchronizableTagCollection(final Registry<T> gb, final String string2, final String string3) {
-        super(gb::getOptional, string2, false, string3);
-        this.registry = gb;
+    public SynchronizableTagCollection(final Registry<T> gl, final String string2, final String string3) {
+        super(gl::getOptional, string2, string3);
+        this.registry = gl;
     }
     
-    public void serializeToNetwork(final FriendlyByteBuf kv) {
+    public void serializeToNetwork(final FriendlyByteBuf mg) {
         final Map<ResourceLocation, Tag<T>> map3 = this.getAllTags();
-        kv.writeVarInt(map3.size());
+        mg.writeVarInt(map3.size());
         for (final Map.Entry<ResourceLocation, Tag<T>> entry5 : map3.entrySet()) {
-            kv.writeResourceLocation(entry5.getKey());
-            kv.writeVarInt(entry5.getValue().getValues().size());
+            mg.writeResourceLocation(entry5.getKey());
+            mg.writeVarInt(entry5.getValue().getValues().size());
             for (final T object7 : entry5.getValue().getValues()) {
-                kv.writeVarInt(this.registry.getId(object7));
+                mg.writeVarInt(this.registry.getId(object7));
             }
         }
     }
     
-    public void loadFromNetwork(final FriendlyByteBuf kv) {
+    public void loadFromNetwork(final FriendlyByteBuf mg) {
         final Map<ResourceLocation, Tag<T>> map3 = Maps.newHashMap();
-        for (int integer4 = kv.readVarInt(), integer5 = 0; integer5 < integer4; ++integer5) {
-            final ResourceLocation sm6 = kv.readResourceLocation();
-            final int integer6 = kv.readVarInt();
-            final Tag.Builder<T> a8 = Tag.Builder.<T>tag();
+        for (int integer4 = mg.readVarInt(), integer5 = 0; integer5 < integer4; ++integer5) {
+            final ResourceLocation uh6 = mg.readResourceLocation();
+            final int integer6 = mg.readVarInt();
+            final ImmutableSet.Builder<T> builder8 = ImmutableSet.<T>builder();
             for (int integer7 = 0; integer7 < integer6; ++integer7) {
-                a8.add(this.registry.byId(kv.readVarInt()));
+                builder8.add(this.registry.byId(mg.readVarInt()));
             }
-            map3.put(sm6, a8.build(sm6));
+            map3.put(uh6, Tag.<T>fromSet(builder8.build()));
         }
         this.replace(map3);
     }
diff --git a/src/net/minecraft/tags/Tag.java b/src/net/minecraft/tags/Tag.java
index a89a77a..2c0f2a1 100644
--- a/src/net/minecraft/tags/Tag.java
+++ b/src/net/minecraft/tags/Tag.java
@@ -1,235 +1,201 @@
 package net.minecraft.tags;
 
-import net.minecraft.Util;
-import javax.annotation.Nullable;
-import com.google.gson.JsonParseException;
-import net.minecraft.util.GsonHelper;
-import java.util.Optional;
-import java.util.List;
-import com.google.common.collect.Lists;
-import java.util.Random;
-import com.google.gson.JsonElement;
+import java.util.function.Consumer;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonObject;
-import java.util.function.Function;
+import java.util.stream.Stream;
 import java.util.Iterator;
-import com.google.common.collect.Sets;
-import java.util.Collections;
-import java.util.Collection;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 import java.util.Set;
+import java.util.Random;
+import java.util.List;
+import java.util.function.Function;
+import java.util.Optional;
+import com.mojang.serialization.DataResult;
 import net.minecraft.resources.ResourceLocation;
+import com.mojang.serialization.Codec;
+import java.util.function.Supplier;
 
-public class Tag<T> {
-    private final ResourceLocation id;
-    private final Set<T> values;
-    private final Collection<Entry<T>> source;
-    
-    public Tag(final ResourceLocation sm) {
-        this.id = sm;
-        this.values = Collections.<T>emptySet();
-        this.source = Collections.emptyList();
+public interface Tag<T> {
+    default <T> Codec<Tag<T>> codec(final Supplier<TagCollection<T>> supplier) {
+        return (Codec<Tag<T>>)ResourceLocation.CODEC.flatXmap(uh -> Optional.<Tag<T>>ofNullable(supplier.get().getTag(uh)).map(DataResult::success).orElseGet(() -> DataResult.error("Unknown tag: " + uh)), adf -> Optional.<ResourceLocation>ofNullable(supplier.get().getId(adf)).map(DataResult::success).orElseGet(() -> DataResult.error("Unknown tag: " + adf)));
     }
     
-    public Tag(final ResourceLocation sm, final Collection<Entry<T>> collection, final boolean boolean3) {
-        this.id = sm;
-        this.values = (Set<T>)(boolean3 ? Sets.newLinkedHashSet() : Sets.newHashSet());
-        this.source = collection;
-        for (final Entry<T> b6 : collection) {
-            b6.build(this.values);
-        }
-    }
+    boolean contains(final T object);
     
-    public JsonObject serializeToJson(final Function<T, ResourceLocation> function) {
-        final JsonObject jsonObject3 = new JsonObject();
-        final JsonArray jsonArray4 = new JsonArray();
-        for (final Entry<T> b6 : this.source) {
-            b6.serializeTo(jsonArray4, function);
-        }
-        jsonObject3.addProperty("replace", false);
-        jsonObject3.add("values", jsonArray4);
-        return jsonObject3;
-    }
+    List<T> getValues();
     
-    public boolean contains(final T object) {
-        return this.values.contains(object);
-    }
-    
-    public Collection<T> getValues() {
-        return this.values;
-    }
-    
-    public Collection<Entry<T>> getSource() {
-        return this.source;
-    }
-    
-    public T getRandomElement(final Random random) {
-        final List<T> list3 = Lists.newArrayList(this.getValues());
+    default T getRandomElement(final Random random) {
+        final List<T> list3 = this.getValues();
         return list3.get(random.nextInt(list3.size()));
     }
     
-    public ResourceLocation getId() {
-        return this.id;
+    default <T> Tag<T> fromSet(final Set<T> set) {
+        return SetTag.<T>create(set);
     }
     
-    public static class Builder<T> {
-        private final Set<Entry<T>> values;
-        private boolean ordered;
+    public static class BuilderEntry {
+        private final Entry entry;
+        private final String source;
+        
+        private BuilderEntry(final Entry d, final String string) {
+            this.entry = d;
+            this.source = string;
+        }
+        
+        public Entry getEntry() {
+            return this.entry;
+        }
+        
+        @Override
+        public String toString() {
+            return this.entry.toString() + " (from " + this.source + ")";
+        }
+    }
+    
+    public static class Builder {
+        private final List<BuilderEntry> entries;
         
         public Builder() {
-            this.values = Sets.newLinkedHashSet();
+            this.entries = Lists.newArrayList();
         }
         
-        public static <T> Builder<T> tag() {
-            return new Builder<T>();
+        public static Builder tag() {
+            return new Builder();
         }
         
-        public Builder<T> add(final Entry<T> b) {
-            this.values.add(b);
+        public Builder add(final BuilderEntry b) {
+            this.entries.add(b);
             return this;
         }
         
-        public Builder<T> add(final T object) {
-            this.values.add(new ValuesEntry<T>(Collections.<T>singleton(object)));
-            return this;
+        public Builder add(final Entry d, final String string) {
+            return this.add(new BuilderEntry(d, string));
         }
         
-        @SafeVarargs
-        public final Builder<T> add(final T... arr) {
-            this.values.add(new ValuesEntry<T>(Lists.<T>newArrayList(arr)));
-            return this;
+        public Builder addElement(final ResourceLocation uh, final String string) {
+            return this.add(new ElementEntry(uh), string);
         }
         
-        public Builder<T> addTag(final Tag<T> aaz) {
-            this.values.add(new TagEntry<T>(aaz));
-            return this;
+        public Builder addTag(final ResourceLocation uh, final String string) {
+            return this.add(new TagEntry(uh), string);
         }
         
-        public Builder<T> keepOrder(final boolean boolean1) {
-            this.ordered = boolean1;
-            return this;
-        }
-        
-        public boolean canBuild(final Function<ResourceLocation, Tag<T>> function) {
-            for (final Entry<T> b4 : this.values) {
-                if (!b4.canBuild(function)) {
-                    return false;
+        public <T> Optional<Tag<T>> build(final Function<ResourceLocation, Tag<T>> function1, final Function<ResourceLocation, T> function2) {
+            final ImmutableSet.Builder<T> builder4 = ImmutableSet.<T>builder();
+            for (final BuilderEntry b6 : this.entries) {
+                if (!b6.getEntry().<T>build(function1, function2, builder4::add)) {
+                    return Optional.<Tag<T>>empty();
                 }
             }
-            return true;
+            return Optional.<Tag<T>>of(Tag.<T>fromSet(builder4.build()));
         }
         
-        public Tag<T> build(final ResourceLocation sm) {
-            return new Tag<T>(sm, this.values, this.ordered);
+        public Stream<BuilderEntry> getEntries() {
+            return this.entries.stream();
         }
         
-        public Builder<T> addFromJson(final Function<ResourceLocation, Optional<T>> function, final JsonObject jsonObject) {
+        public <T> Stream<BuilderEntry> getUnresolvedEntries(final Function<ResourceLocation, Tag<T>> function1, final Function<ResourceLocation, T> function2) {
+            return this.getEntries().filter(b -> !b.getEntry().<T>build(function1, function2, object -> {}));
+        }
+        
+        public Builder addFromJson(final JsonObject jsonObject, final String string) {
             final JsonArray jsonArray4 = GsonHelper.getAsJsonArray(jsonObject, "values");
-            final List<Entry<T>> list5 = Lists.newArrayList();
+            final List<Entry> list5 = Lists.newArrayList();
             for (final JsonElement jsonElement7 : jsonArray4) {
-                final String string8 = GsonHelper.convertToString(jsonElement7, "value");
-                if (string8.startsWith("#")) {
-                    list5.add(new TagEntry<T>(new ResourceLocation(string8.substring(1))));
+                final String string2 = GsonHelper.convertToString(jsonElement7, "value");
+                if (string2.startsWith("#")) {
+                    list5.add(new TagEntry(new ResourceLocation(string2.substring(1))));
                 }
                 else {
-                    final ResourceLocation sm9 = new ResourceLocation(string8);
-                    final Object o;
-                    final Object obj;
-                    list5.add(new ValuesEntry<T>(Collections.<T>singleton(function.apply(sm9).<Throwable>orElseThrow(() -> {
-                        new JsonParseException("Unknown value '" + obj + "'");
-                        return o;
-                    }))));
+                    list5.add(new ElementEntry(new ResourceLocation(string2)));
                 }
             }
             if (GsonHelper.getAsBoolean(jsonObject, "replace", false)) {
-                this.values.clear();
+                this.entries.clear();
             }
-            this.values.addAll(list5);
+            list5.forEach(d -> this.entries.add(new BuilderEntry(d, string)));
             return this;
         }
+        
+        public JsonObject serializeToJson() {
+            final JsonObject jsonObject2 = new JsonObject();
+            final JsonArray jsonArray3 = new JsonArray();
+            for (final BuilderEntry b5 : this.entries) {
+                b5.getEntry().serializeTo(jsonArray3);
+            }
+            jsonObject2.addProperty("replace", false);
+            jsonObject2.add("values", jsonArray3);
+            return jsonObject2;
+        }
     }
     
-    public interface Entry<T> {
-        default boolean canBuild(final Function<ResourceLocation, Tag<T>> function) {
+    public static class ElementEntry implements Entry {
+        private final ResourceLocation id;
+        
+        public ElementEntry(final ResourceLocation uh) {
+            this.id = uh;
+        }
+        
+        @Override
+        public <T> boolean build(final Function<ResourceLocation, Tag<T>> function1, final Function<ResourceLocation, T> function2, final Consumer<T> consumer) {
+            final T object5 = function2.apply(this.id);
+            if (object5 == null) {
+                return false;
+            }
+            consumer.accept(object5);
             return true;
         }
         
-        void build(final Collection<T> collection);
-        
-        void serializeTo(final JsonArray jsonArray, final Function<T, ResourceLocation> function);
-    }
-    
-    public static class ValuesEntry<T> implements Entry<T> {
-        private final Collection<T> values;
-        
-        public ValuesEntry(final Collection<T> collection) {
-            this.values = collection;
+        @Override
+        public void serializeTo(final JsonArray jsonArray) {
+            jsonArray.add(this.id.toString());
         }
         
         @Override
-        public void build(final Collection<T> collection) {
-            collection.addAll(this.values);
-        }
-        
-        @Override
-        public void serializeTo(final JsonArray jsonArray, final Function<T, ResourceLocation> function) {
-            for (final T object5 : this.values) {
-                final ResourceLocation sm6 = function.apply(object5);
-                if (sm6 == null) {
-                    throw new IllegalStateException("Unable to serialize an anonymous value to json!");
-                }
-                jsonArray.add(sm6.toString());
-            }
-        }
-        
-        public Collection<T> getValues() {
-            return this.values;
+        public String toString() {
+            return this.id.toString();
         }
     }
     
-    public static class TagEntry<T> implements Entry<T> {
-        @Nullable
+    public static class TagEntry implements Entry {
         private final ResourceLocation id;
-        @Nullable
-        private Tag<T> tag;
         
-        public TagEntry(final ResourceLocation sm) {
-            this.id = sm;
-        }
-        
-        public TagEntry(final Tag<T> aaz) {
-            this.id = aaz.getId();
-            this.tag = aaz;
+        public TagEntry(final ResourceLocation uh) {
+            this.id = uh;
         }
         
         @Override
-        public boolean canBuild(final Function<ResourceLocation, Tag<T>> function) {
-            if (this.tag == null) {
-                this.tag = function.apply(this.id);
+        public <T> boolean build(final Function<ResourceLocation, Tag<T>> function1, final Function<ResourceLocation, T> function2, final Consumer<T> consumer) {
+            final Tag<T> adf5 = function1.apply(this.id);
+            if (adf5 == null) {
+                return false;
             }
-            return this.tag != null;
+            adf5.getValues().forEach(consumer);
+            return true;
         }
         
         @Override
-        public void build(final Collection<T> collection) {
-            if (this.tag == null) {
-                throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("Cannot build unresolved tag entry"));
-            }
-            collection.addAll(this.tag.getValues());
-        }
-        
-        public ResourceLocation getId() {
-            if (this.tag != null) {
-                return this.tag.getId();
-            }
-            if (this.id != null) {
-                return this.id;
-            }
-            throw new IllegalStateException("Cannot serialize an anonymous tag to json!");
+        public void serializeTo(final JsonArray jsonArray) {
+            jsonArray.add("#" + this.id);
         }
         
         @Override
-        public void serializeTo(final JsonArray jsonArray, final Function<T, ResourceLocation> function) {
-            jsonArray.add("#" + this.getId());
+        public String toString() {
+            return "#" + this.id;
         }
     }
+    
+    public interface Named<T> extends Tag<T> {
+        ResourceLocation getName();
+    }
+    
+    public interface Entry {
+         <T> boolean build(final Function<ResourceLocation, Tag<T>> function1, final Function<ResourceLocation, T> function2, final Consumer<T> consumer);
+        
+        void serializeTo(final JsonArray jsonArray);
+    }
 }
diff --git a/src/net/minecraft/tags/TagCollection.java b/src/net/minecraft/tags/TagCollection.java
index b64f46f..945bee7 100644
--- a/src/net/minecraft/tags/TagCollection.java
+++ b/src/net/minecraft/tags/TagCollection.java
@@ -1,11 +1,14 @@
 package net.minecraft.tags;
 
 import org.apache.logging.log4j.LogManager;
+import com.google.common.collect.ImmutableBiMap;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.Objects;
 import java.io.InputStream;
 import java.io.Closeable;
 import org.apache.commons.io.IOUtils;
 import java.io.IOException;
-import net.minecraft.Util;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonObject;
 import java.io.Reader;
@@ -19,14 +22,15 @@ import java.util.concurrent.Executor;
 import net.minecraft.server.packs.resources.ResourceManager;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import com.google.common.collect.Lists;
 import java.util.Collection;
 import javax.annotation.Nullable;
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.HashBiMap;
 import java.util.Optional;
 import java.util.function.Function;
 import net.minecraft.resources.ResourceLocation;
-import java.util.Map;
+import com.google.common.collect.BiMap;
 import com.google.gson.Gson;
 import org.apache.logging.log4j.Logger;
 
@@ -34,35 +38,47 @@ public class TagCollection<T> {
     private static final Logger LOGGER;
     private static final Gson GSON;
     private static final int PATH_SUFFIX_LENGTH;
-    private Map<ResourceLocation, Tag<T>> tags;
+    private final Tag<T> empty;
+    private volatile BiMap<ResourceLocation, Tag<T>> tags;
     private final Function<ResourceLocation, Optional<T>> idToValue;
     private final String directory;
-    private final boolean ordered;
     private final String name;
     
-    public TagCollection(final Function<ResourceLocation, Optional<T>> function, final String string2, final boolean boolean3, final String string4) {
-        this.tags = ImmutableMap.of();
+    public TagCollection(final Function<ResourceLocation, Optional<T>> function, final String string2, final String string3) {
+        this.empty = SetTag.empty();
+        this.tags = HashBiMap.create();
         this.idToValue = function;
         this.directory = string2;
-        this.ordered = boolean3;
-        this.name = string4;
+        this.name = string3;
     }
     
     @Nullable
-    public Tag<T> getTag(final ResourceLocation sm) {
-        return this.tags.get(sm);
+    public Tag<T> getTag(final ResourceLocation uh) {
+        return this.tags.get(uh);
     }
     
-    public Tag<T> getTagOrEmpty(final ResourceLocation sm) {
-        final Tag<T> aaz3 = this.tags.get(sm);
-        if (aaz3 == null) {
-            return new Tag<T>(sm);
+    public Tag<T> getTagOrEmpty(final ResourceLocation uh) {
+        return this.tags.getOrDefault(uh, this.empty);
+    }
+    
+    @Nullable
+    public ResourceLocation getId(final Tag<T> adf) {
+        if (adf instanceof Tag.Named) {
+            return ((Tag.Named)adf).getName();
         }
-        return aaz3;
+        return this.tags.inverse().get(adf);
+    }
+    
+    public ResourceLocation getIdOrThrow(final Tag<T> adf) {
+        final ResourceLocation uh3 = this.getId(adf);
+        if (uh3 == null) {
+            throw new IllegalStateException("Unrecognized tag");
+        }
+        return uh3;
     }
     
     public Collection<ResourceLocation> getAvailableTags() {
-        return this.tags.keySet();
+        return (Collection<ResourceLocation>)this.tags.keySet();
     }
     
     public Collection<ResourceLocation> getMatchingTags(final T object) {
@@ -75,43 +91,43 @@ public class TagCollection<T> {
         return list3;
     }
     
-    public CompletableFuture<Map<ResourceLocation, Tag.Builder<T>>> prepare(final ResourceManager zb, final Executor executor) {
-        final Map<ResourceLocation, Tag.Builder<T>> map3;
+    public CompletableFuture<Map<ResourceLocation, Tag.Builder>> prepare(final ResourceManager abc, final Executor executor) {
+        final Map<ResourceLocation, Tag.Builder> map3;
         final Iterator<ResourceLocation> iterator;
-        ResourceLocation sm5;
+        ResourceLocation uh5;
         String string2;
-        ResourceLocation sm6;
+        ResourceLocation uh6;
         final Iterator<Resource> iterator2;
-        Resource za9;
+        Resource abb9;
         InputStream inputStream10;
         final BufferedReader bufferedReader;
         Reader reader12;
         JsonObject jsonObject14;
         final Throwable t2;
         final Throwable t4;
-        return CompletableFuture.<Map<ResourceLocation, Tag.Builder<T>>>supplyAsync(() -> {
+        return CompletableFuture.<Map<ResourceLocation, Tag.Builder>>supplyAsync(() -> {
             map3 = Maps.newHashMap();
-            zb.listResources(this.directory, string -> string.endsWith(".json")).iterator();
+            abc.listResources(this.directory, string -> string.endsWith(".json")).iterator();
             while (iterator.hasNext()) {
-                sm5 = iterator.next();
-                string2 = sm5.getPath();
-                sm6 = new ResourceLocation(sm5.getNamespace(), string2.substring(this.directory.length() + 1, string2.length() - TagCollection.PATH_SUFFIX_LENGTH));
+                uh5 = iterator.next();
+                string2 = uh5.getPath();
+                uh6 = new ResourceLocation(uh5.getNamespace(), string2.substring(this.directory.length() + 1, string2.length() - TagCollection.PATH_SUFFIX_LENGTH));
                 try {
-                    zb.getResources(sm5).iterator();
+                    abc.getResources(uh5).iterator();
                     while (iterator2.hasNext()) {
-                        za9 = iterator2.next();
+                        abb9 = iterator2.next();
                         try {
-                            inputStream10 = za9.getInputStream();
+                            inputStream10 = abb9.getInputStream();
                             try {
                                 new BufferedReader(new InputStreamReader(inputStream10, StandardCharsets.UTF_8));
                                 reader12 = bufferedReader;
                                 try {
                                     jsonObject14 = GsonHelper.<JsonObject>fromJson(TagCollection.GSON, reader12, JsonObject.class);
                                     if (jsonObject14 == null) {
-                                        TagCollection.LOGGER.error("Couldn't load {} tag list {} from {} in data pack {} as it's empty or null", this.name, sm6, sm5, za9.getSourceName());
+                                        TagCollection.LOGGER.error("Couldn't load {} tag list {} from {} in data pack {} as it is empty or null", this.name, uh6, uh5, abb9.getSourceName());
                                     }
                                     else {
-                                        map3.computeIfAbsent(sm6, sm -> Util.<Tag.Builder<Object>>make(Tag.Builder.tag(), a -> a.keepOrder(this.ordered))).addFromJson(this.idToValue, jsonObject14);
+                                        map3.computeIfAbsent(uh6, uh -> Tag.Builder.tag()).addFromJson(jsonObject14, abb9.getSourceName());
                                     }
                                 }
                                 catch (Throwable t) {
@@ -154,48 +170,47 @@ public class TagCollection<T> {
                         }
                         catch (IOException ex) {}
                         catch (RuntimeException exception10) {
-                            TagCollection.LOGGER.error("Couldn't read {} tag list {} from {} in data pack {}", this.name, sm6, sm5, za9.getSourceName(), exception10);
+                            TagCollection.LOGGER.error("Couldn't read {} tag list {} from {} in data pack {}", this.name, uh6, uh5, abb9.getSourceName(), exception10);
                         }
                         finally {
-                            IOUtils.closeQuietly((Closeable)za9);
+                            IOUtils.closeQuietly((Closeable)abb9);
                         }
                     }
                 }
                 catch (IOException iOException8) {
-                    TagCollection.LOGGER.error("Couldn't read {} tag list {} from {}", this.name, sm6, sm5, iOException8);
+                    TagCollection.LOGGER.error("Couldn't read {} tag list {} from {}", this.name, uh6, uh5, iOException8);
                 }
             }
             return map3;
         }, executor);
     }
     
-    public void load(final Map<ResourceLocation, Tag.Builder<T>> map) {
+    public void load(final Map<ResourceLocation, Tag.Builder> map) {
         final Map<ResourceLocation, Tag<T>> map2 = Maps.newHashMap();
+        final Function<ResourceLocation, Tag<T>> function4 = map2::get;
+        final Function<ResourceLocation, T> function5 = (Function<ResourceLocation, T>)(uh -> this.idToValue.apply(uh).orElse(null));
         while (!map.isEmpty()) {
-            boolean boolean4 = false;
-            final Iterator<Map.Entry<ResourceLocation, Tag.Builder<T>>> iterator5 = map.entrySet().iterator();
-            while (iterator5.hasNext()) {
-                final Map.Entry<ResourceLocation, Tag.Builder<T>> entry6 = iterator5.next();
-                final Tag.Builder<T> a2 = entry6.getValue();
-                if (a2.canBuild(map2::get)) {
-                    boolean4 = true;
-                    final ResourceLocation sm2 = entry6.getKey();
-                    map2.put(sm2, a2.build(sm2));
-                    iterator5.remove();
+            boolean boolean6 = false;
+            final Iterator<Map.Entry<ResourceLocation, Tag.Builder>> iterator7 = map.entrySet().iterator();
+            while (iterator7.hasNext()) {
+                final Map.Entry<ResourceLocation, Tag.Builder> entry8 = iterator7.next();
+                final Optional<Tag<T>> optional9 = entry8.getValue().<T>build(function4, function5);
+                if (optional9.isPresent()) {
+                    map2.put(entry8.getKey(), optional9.get());
+                    iterator7.remove();
+                    boolean6 = true;
                 }
             }
-            if (!boolean4) {
-                map.forEach((sm, a) -> TagCollection.LOGGER.error("Couldn't load {} tag {} as it either references another tag that doesn't exist, or ultimately references itself", this.name, sm));
+            if (!boolean6) {
                 break;
             }
         }
-        final Tag<T> tag;
-        map.forEach((sm, a) -> tag = map2.put(sm, a.build(sm)));
+        map.forEach((uh, a) -> TagCollection.LOGGER.error("Couldn't load {} tag {} as it is missing following references: {}", this.name, uh, a.<T>getUnresolvedEntries(function4, function5).map(Objects::toString).collect(Collectors.joining(","))));
         this.replace(map2);
     }
     
     protected void replace(final Map<ResourceLocation, Tag<T>> map) {
-        this.tags = ImmutableMap.copyOf(map);
+        this.tags = ImmutableBiMap.copyOf(map);
     }
     
     public Map<ResourceLocation, Tag<T>> getAllTags() {
diff --git a/src/net/minecraft/tags/TagManager.java b/src/net/minecraft/tags/TagManager.java
index b69d5b5..553b04c 100644
--- a/src/net/minecraft/tags/TagManager.java
+++ b/src/net/minecraft/tags/TagManager.java
@@ -1,11 +1,14 @@
 package net.minecraft.tags;
 
-import java.util.function.Function;
+import net.minecraft.world.level.block.Blocks;
+import com.google.common.collect.Multimap;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import com.google.common.collect.HashMultimap;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
-import java.util.function.BiFunction;
 import java.util.concurrent.CompletionStage;
-import com.mojang.datafixers.util.Pair;
+import java.util.function.Function;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import net.minecraft.util.profiling.ProfilerFiller;
@@ -47,51 +50,57 @@ public class TagManager implements PreparableReloadListener {
         return this.entityTypes;
     }
     
-    public void serializeToNetwork(final FriendlyByteBuf kv) {
-        this.blocks.serializeToNetwork(kv);
-        this.items.serializeToNetwork(kv);
-        this.fluids.serializeToNetwork(kv);
-        this.entityTypes.serializeToNetwork(kv);
+    public void serializeToNetwork(final FriendlyByteBuf mg) {
+        this.blocks.serializeToNetwork(mg);
+        this.items.serializeToNetwork(mg);
+        this.fluids.serializeToNetwork(mg);
+        this.entityTypes.serializeToNetwork(mg);
     }
     
-    public static TagManager deserializeFromNetwork(final FriendlyByteBuf kv) {
-        final TagManager abb2 = new TagManager();
-        abb2.getBlocks().loadFromNetwork(kv);
-        abb2.getItems().loadFromNetwork(kv);
-        abb2.getFluids().loadFromNetwork(kv);
-        abb2.getEntityTypes().loadFromNetwork(kv);
-        return abb2;
+    public static TagManager deserializeFromNetwork(final FriendlyByteBuf mg) {
+        final TagManager adh2 = new TagManager();
+        adh2.getBlocks().loadFromNetwork(mg);
+        adh2.getItems().loadFromNetwork(mg);
+        adh2.getFluids().loadFromNetwork(mg);
+        adh2.getEntityTypes().loadFromNetwork(mg);
+        return adh2;
     }
     
     @Override
-    public CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager zb, final ProfilerFiller aio3, final ProfilerFiller aio4, final Executor executor5, final Executor executor6) {
-        final CompletableFuture<Map<ResourceLocation, Tag.Builder<Block>>> completableFuture8 = this.blocks.prepare(zb, executor5);
-        final CompletableFuture<Map<ResourceLocation, Tag.Builder<Item>>> completableFuture9 = this.items.prepare(zb, executor5);
-        final CompletableFuture<Map<ResourceLocation, Tag.Builder<Fluid>>> completableFuture10 = this.fluids.prepare(zb, executor5);
-        final CompletableFuture<Map<ResourceLocation, Tag.Builder<EntityType<?>>>> completableFuture11 = this.entityTypes.prepare(zb, executor5);
-        return completableFuture8.thenCombine(completableFuture9, Pair::of).thenCombine(completableFuture10.thenCombine(completableFuture11, Pair::of), (pair1, pair2) -> new Preparations((Map<ResourceLocation, Tag.Builder<Block>>)pair1.getFirst(), (Map<ResourceLocation, Tag.Builder<Item>>)pair1.getSecond(), (Map<ResourceLocation, Tag.Builder<Fluid>>)pair2.getFirst(), (Map<ResourceLocation, Tag.Builder<EntityType<?>>>)pair2.getSecond())).thenCompose(a::wait).thenAcceptAsync(a -> {
-            this.blocks.load(a.blocks);
-            this.items.load(a.items);
-            this.fluids.load(a.fluids);
-            this.entityTypes.load(a.entityTypes);
-            BlockTags.reset(this.blocks);
-            ItemTags.reset(this.items);
-            FluidTags.reset(this.fluids);
-            EntityTypeTags.reset(this.entityTypes);
+    public CompletableFuture<Void> reload(final PreparationBarrier a, final ResourceManager abc, final ProfilerFiller ami3, final ProfilerFiller ami4, final Executor executor5, final Executor executor6) {
+        final CompletableFuture<Map<ResourceLocation, Tag.Builder>> completableFuture8 = this.blocks.prepare(abc, executor5);
+        final CompletableFuture<Map<ResourceLocation, Tag.Builder>> completableFuture9 = this.items.prepare(abc, executor5);
+        final CompletableFuture<Map<ResourceLocation, Tag.Builder>> completableFuture10 = this.fluids.prepare(abc, executor5);
+        final CompletableFuture<Map<ResourceLocation, Tag.Builder>> completableFuture11 = this.entityTypes.prepare(abc, executor5);
+        final CompletableFuture<Map<ResourceLocation, Tag.Builder>> completableFuture12;
+        final CompletableFuture<Map<ResourceLocation, Tag.Builder>> completableFuture13;
+        final CompletableFuture<Map<ResourceLocation, Tag.Builder>> completableFuture14;
+        final CompletableFuture<Map<ResourceLocation, Tag.Builder>> completableFuture15;
+        final Multimap<String, ResourceLocation> multimap7;
+        final IllegalStateException ex;
+        return CompletableFuture.allOf(completableFuture8, completableFuture9, completableFuture10, completableFuture11).thenCompose(a::wait).thenAcceptAsync(void5 -> {
+            this.blocks.load(completableFuture12.join());
+            this.items.load(completableFuture13.join());
+            this.fluids.load(completableFuture14.join());
+            this.entityTypes.load(completableFuture15.join());
+            SerializationTags.bind(this.blocks, this.items, this.fluids, this.entityTypes);
+            multimap7 = HashMultimap.create();
+            multimap7.putAll("blocks", BlockTags.getMissingTags(this.blocks));
+            multimap7.putAll("items", ItemTags.getMissingTags(this.items));
+            multimap7.putAll("fluids", FluidTags.getMissingTags(this.fluids));
+            multimap7.putAll("entity_types", EntityTypeTags.getMissingTags(this.entityTypes));
+            if (!multimap7.isEmpty()) {
+                new IllegalStateException("Missing required tags: " + multimap7.entries().stream().map(entry -> entry.getKey() + ":" + entry.getValue()).sorted().collect(Collectors.joining(",")));
+                throw ex;
+            }
         }, executor6);
     }
     
-    public static class Preparations {
-        final Map<ResourceLocation, Tag.Builder<Block>> blocks;
-        final Map<ResourceLocation, Tag.Builder<Item>> items;
-        final Map<ResourceLocation, Tag.Builder<Fluid>> fluids;
-        final Map<ResourceLocation, Tag.Builder<EntityType<?>>> entityTypes;
-        
-        public Preparations(final Map<ResourceLocation, Tag.Builder<Block>> map1, final Map<ResourceLocation, Tag.Builder<Item>> map2, final Map<ResourceLocation, Tag.Builder<Fluid>> map3, final Map<ResourceLocation, Tag.Builder<EntityType<?>>> map4) {
-            this.blocks = map1;
-            this.items = map2;
-            this.fluids = map3;
-            this.entityTypes = map4;
-        }
+    public void bindToGlobal() {
+        BlockTags.reset(this.blocks);
+        ItemTags.reset(this.items);
+        FluidTags.reset(this.fluids);
+        EntityTypeTags.reset(this.entityTypes);
+        Blocks.rebuildCache();
     }
 }
diff --git a/src/net/minecraft/util/BitStorage.java b/src/net/minecraft/util/BitStorage.java
index 9d96ed0..4fb0534 100644
--- a/src/net/minecraft/util/BitStorage.java
+++ b/src/net/minecraft/util/BitStorage.java
@@ -3,74 +3,77 @@ package net.minecraft.util;
 import java.util.function.IntConsumer;
 import net.minecraft.Util;
 import org.apache.commons.lang3.Validate;
+import javax.annotation.Nullable;
 
 public class BitStorage {
+    private static final int[] MAGIC;
     private final long[] data;
     private final int bits;
     private final long mask;
     private final int size;
+    private final int valuesPerLong;
+    private final int divideMul;
+    private final int divideAdd;
+    private final int divideShift;
     
     public BitStorage(final int integer1, final int integer2) {
-        this(integer1, integer2, new long[Mth.roundUp(integer2 * integer1, 64) / 64]);
+        this(integer1, integer2, null);
     }
     
-    public BitStorage(final int integer1, final int integer2, final long[] arr) {
+    public BitStorage(final int integer1, final int integer2, @Nullable final long[] arr) {
         Validate.inclusiveBetween(1L, 32L, (long)integer1);
         this.size = integer2;
         this.bits = integer1;
-        this.data = arr;
         this.mask = (1L << integer1) - 1L;
-        final int integer3 = Mth.roundUp(integer2 * integer1, 64) / 64;
-        if (arr.length != integer3) {
-            throw Util.<RuntimeException>pauseInIde(new RuntimeException("Invalid length given for storage, got: " + arr.length + " but expected: " + integer3));
+        this.valuesPerLong = (char)(64 / integer1);
+        final int integer3 = 3 * (this.valuesPerLong - 1);
+        this.divideMul = BitStorage.MAGIC[integer3 + 0];
+        this.divideAdd = BitStorage.MAGIC[integer3 + 1];
+        this.divideShift = BitStorage.MAGIC[integer3 + 2];
+        final int integer4 = (integer2 + this.valuesPerLong - 1) / this.valuesPerLong;
+        if (arr != null) {
+            if (arr.length != integer4) {
+                throw Util.<RuntimeException>pauseInIde(new RuntimeException("Invalid length given for storage, got: " + arr.length + " but expected: " + integer4));
+            }
+            this.data = arr;
         }
+        else {
+            this.data = new long[integer4];
+        }
+    }
+    
+    private int cellIndex(final int integer) {
+        final long long3 = Integer.toUnsignedLong(this.divideMul);
+        final long long4 = Integer.toUnsignedLong(this.divideAdd);
+        return (int)(integer * long3 + long4 >> 32 >> this.divideShift);
     }
     
     public int getAndSet(final int integer1, final int integer2) {
         Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)integer1);
         Validate.inclusiveBetween(0L, this.mask, (long)integer2);
-        final int integer3 = integer1 * this.bits;
-        final int integer4 = integer3 >> 6;
-        final int integer5 = (integer1 + 1) * this.bits - 1 >> 6;
-        final int integer6 = integer3 ^ integer4 << 6;
-        int integer7 = 0;
-        integer7 |= (int)(this.data[integer4] >>> integer6 & this.mask);
-        this.data[integer4] = ((this.data[integer4] & ~(this.mask << integer6)) | ((long)integer2 & this.mask) << integer6);
-        if (integer4 != integer5) {
-            final int integer8 = 64 - integer6;
-            final int integer9 = this.bits - integer8;
-            integer7 |= (int)(this.data[integer5] << integer8 & this.mask);
-            this.data[integer5] = (this.data[integer5] >>> integer9 << integer9 | ((long)integer2 & this.mask) >> integer8);
-        }
-        return integer7;
+        final int integer3 = this.cellIndex(integer1);
+        final long long5 = this.data[integer3];
+        final int integer4 = (integer1 - integer3 * this.valuesPerLong) * this.bits;
+        final int integer5 = (int)(long5 >> integer4 & this.mask);
+        this.data[integer3] = ((long5 & ~(this.mask << integer4)) | ((long)integer2 & this.mask) << integer4);
+        return integer5;
     }
     
     public void set(final int integer1, final int integer2) {
         Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)integer1);
         Validate.inclusiveBetween(0L, this.mask, (long)integer2);
-        final int integer3 = integer1 * this.bits;
-        final int integer4 = integer3 >> 6;
-        final int integer5 = (integer1 + 1) * this.bits - 1 >> 6;
-        final int integer6 = integer3 ^ integer4 << 6;
-        this.data[integer4] = ((this.data[integer4] & ~(this.mask << integer6)) | ((long)integer2 & this.mask) << integer6);
-        if (integer4 != integer5) {
-            final int integer7 = 64 - integer6;
-            final int integer8 = this.bits - integer7;
-            this.data[integer5] = (this.data[integer5] >>> integer8 << integer8 | ((long)integer2 & this.mask) >> integer7);
-        }
+        final int integer3 = this.cellIndex(integer1);
+        final long long5 = this.data[integer3];
+        final int integer4 = (integer1 - integer3 * this.valuesPerLong) * this.bits;
+        this.data[integer3] = ((long5 & ~(this.mask << integer4)) | ((long)integer2 & this.mask) << integer4);
     }
     
     public int get(final int integer) {
         Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)integer);
-        final int integer2 = integer * this.bits;
-        final int integer3 = integer2 >> 6;
-        final int integer4 = (integer + 1) * this.bits - 1 >> 6;
-        final int integer5 = integer2 ^ integer3 << 6;
-        if (integer3 == integer4) {
-            return (int)(this.data[integer3] >>> integer5 & this.mask);
-        }
-        final int integer6 = 64 - integer5;
-        return (int)((this.data[integer3] >>> integer5 | this.data[integer4] << integer6) & this.mask);
+        final int integer2 = this.cellIndex(integer);
+        final long long4 = this.data[integer2];
+        final int integer3 = (integer - integer2 * this.valuesPerLong) * this.bits;
+        return (int)(long4 >> integer3 & this.mask);
     }
     
     public long[] getRaw() {
@@ -81,35 +84,20 @@ public class BitStorage {
         return this.size;
     }
     
-    public int getBits() {
-        return this.bits;
+    public void getAll(final IntConsumer intConsumer) {
+        int integer3 = 0;
+        for (long long7 : this.data) {
+            for (int integer4 = 0; integer4 < this.valuesPerLong; ++integer4) {
+                intConsumer.accept((int)(long7 & this.mask));
+                long7 >>= this.bits;
+                if (++integer3 >= this.size) {
+                    return;
+                }
+            }
+        }
     }
     
-    public void getAll(final IntConsumer intConsumer) {
-        final int integer3 = this.data.length;
-        if (integer3 == 0) {
-            return;
-        }
-        int integer4 = 0;
-        long long5 = this.data[0];
-        long long6 = (integer3 > 1) ? this.data[1] : 0L;
-        for (int integer5 = 0; integer5 < this.size; ++integer5) {
-            final int integer6 = integer5 * this.bits;
-            final int integer7 = integer6 >> 6;
-            final int integer8 = (integer5 + 1) * this.bits - 1 >> 6;
-            final int integer9 = integer6 ^ integer7 << 6;
-            if (integer7 != integer4) {
-                long5 = long6;
-                long6 = ((integer7 + 1 < integer3) ? this.data[integer7 + 1] : 0L);
-                integer4 = integer7;
-            }
-            if (integer7 == integer8) {
-                intConsumer.accept((int)(long5 >>> integer9 & this.mask));
-            }
-            else {
-                final int integer10 = 64 - integer9;
-                intConsumer.accept((int)((long5 >>> integer9 | long6 << integer10) & this.mask));
-            }
-        }
+    static {
+        MAGIC = new int[] { -1, -1, 0, Integer.MIN_VALUE, 0, 0, 1431655765, 1431655765, 0, Integer.MIN_VALUE, 0, 1, 858993459, 858993459, 0, 715827882, 715827882, 0, 613566756, 613566756, 0, Integer.MIN_VALUE, 0, 2, 477218588, 477218588, 0, 429496729, 429496729, 0, 390451572, 390451572, 0, 357913941, 357913941, 0, 330382099, 330382099, 0, 306783378, 306783378, 0, 286331153, 286331153, 0, Integer.MIN_VALUE, 0, 3, 252645135, 252645135, 0, 238609294, 238609294, 0, 226050910, 226050910, 0, 214748364, 214748364, 0, 204522252, 204522252, 0, 195225786, 195225786, 0, 186737708, 186737708, 0, 178956970, 178956970, 0, 171798691, 171798691, 0, 165191049, 165191049, 0, 159072862, 159072862, 0, 153391689, 153391689, 0, 148102320, 148102320, 0, 143165576, 143165576, 0, 138547332, 138547332, 0, Integer.MIN_VALUE, 0, 4, 130150524, 130150524, 0, 126322567, 126322567, 0, 122713351, 122713351, 0, 119304647, 119304647, 0, 116080197, 116080197, 0, 113025455, 113025455, 0, 110127366, 110127366, 0, 107374182, 107374182, 0, 104755299, 104755299, 0, 102261126, 102261126, 0, 99882960, 99882960, 0, 97612893, 97612893, 0, 95443717, 95443717, 0, 93368854, 93368854, 0, 91382282, 91382282, 0, 89478485, 89478485, 0, 87652393, 87652393, 0, 85899345, 85899345, 0, 84215045, 84215045, 0, 82595524, 82595524, 0, 81037118, 81037118, 0, 79536431, 79536431, 0, 78090314, 78090314, 0, 76695844, 76695844, 0, 75350303, 75350303, 0, 74051160, 74051160, 0, 72796055, 72796055, 0, 71582788, 71582788, 0, 70409299, 70409299, 0, 69273666, 69273666, 0, 68174084, 68174084, 0, Integer.MIN_VALUE, 0, 5 };
     }
 }
diff --git a/src/net/minecraft/util/ClassInstanceMultiMap.java b/src/net/minecraft/util/ClassInstanceMultiMap.java
index a8b8235..2ace112 100644
--- a/src/net/minecraft/util/ClassInstanceMultiMap.java
+++ b/src/net/minecraft/util/ClassInstanceMultiMap.java
@@ -1,5 +1,6 @@
 package net.minecraft.util;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
 import java.util.Collections;
 import java.util.stream.Collector;
@@ -69,6 +70,10 @@ public class ClassInstanceMultiMap<T> extends AbstractCollection<T> {
         return Iterators.unmodifiableIterator(this.allInstances.iterator());
     }
     
+    public List<T> getAllInstances() {
+        return ImmutableList.copyOf(this.allInstances);
+    }
+    
     @Override
     public int size() {
         return this.allInstances.size();
diff --git a/src/net/minecraft/util/Codecs.java b/src/net/minecraft/util/Codecs.java
new file mode 100644
index 0000000..d295a57
--- /dev/null
+++ b/src/net/minecraft/util/Codecs.java
@@ -0,0 +1,118 @@
+package net.minecraft.util;
+
+import java.util.function.Supplier;
+import java.util.function.Consumer;
+import com.mojang.serialization.MapLike;
+import com.mojang.serialization.RecordBuilder;
+import java.util.stream.Stream;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.resources.ResourceLocation;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.MapCodec;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DataResult;
+import java.util.function.Function;
+
+public class Codecs {
+    private static Function<Integer, DataResult<Integer>> checkRange(final int integer1, final int integer2) {
+        return (Function<Integer, DataResult<Integer>>)(integer -> {
+            if (integer >= integer1 && integer <= integer2) {
+                return DataResult.success(integer);
+            }
+            else {
+                return DataResult.error("Value " + integer + " outside of range [" + integer1 + ":" + integer2 + "]", integer);
+            }
+        });
+    }
+    
+    public static Codec<Integer> intRange(final int integer1, final int integer2) {
+        final Function<Integer, DataResult<Integer>> function3 = checkRange(integer1, integer2);
+        return (Codec<Integer>)Codec.INT.flatXmap((Function)function3, (Function)function3);
+    }
+    
+    private static Function<Double, DataResult<Double>> checkRange(final double double1, final double double2) {
+        return (Function<Double, DataResult<Double>>)(double3 -> {
+            if (double3 >= double1 && double3 <= double2) {
+                return DataResult.success(double3);
+            }
+            else {
+                return DataResult.error("Value " + double3 + " outside of range [" + double1 + ":" + double2 + "]", double3);
+            }
+        });
+    }
+    
+    public static Codec<Double> doubleRange(final double double1, final double double2) {
+        final Function<Double, DataResult<Double>> function5 = checkRange(double1, double2);
+        return (Codec<Double>)Codec.DOUBLE.flatXmap((Function)function5, (Function)function5);
+    }
+    
+    public static <T> MapCodec<Pair<ResourceKey<T>, T>> withName(final ResourceKey<Registry<T>> ug, final MapCodec<T> mapCodec) {
+        return (MapCodec<Pair<ResourceKey<T>, T>>)Codec.mapPair(ResourceLocation.CODEC.xmap((Function)ResourceKey.<T>elementKey(ug), (Function)ResourceKey::location).fieldOf("name"), (MapCodec)mapCodec);
+    }
+    
+    private static <A> MapCodec<A> mapResult(final MapCodec<A> mapCodec, final ResultFunction<A> a) {
+        return new MapCodec<A>() {
+            public <T> Stream<T> keys(final DynamicOps<T> dynamicOps) {
+                return (Stream<T>)mapCodec.keys((DynamicOps)dynamicOps);
+            }
+            
+            public <T> RecordBuilder<T> encode(final A object, final DynamicOps<T> dynamicOps, final RecordBuilder<T> recordBuilder) {
+                return a.<T>coApply(dynamicOps, object, mapCodec.encode(object, (DynamicOps)dynamicOps, (RecordBuilder)recordBuilder));
+            }
+            
+            public <T> DataResult<A> decode(final DynamicOps<T> dynamicOps, final MapLike<T> mapLike) {
+                return a.<T>apply(dynamicOps, mapLike, mapCodec.decode((DynamicOps)dynamicOps, (MapLike)mapLike));
+            }
+            
+            public String toString() {
+                return mapCodec + "[mapResult " + a + "]";
+            }
+        };
+    }
+    
+    public static <A> MapCodec<A> withDefault(final MapCodec<A> mapCodec, final Consumer<String> consumer, final Supplier<? extends A> supplier) {
+        return Codecs.<A>mapResult(mapCodec, new ResultFunction<A>() {
+            @Override
+            public <T> DataResult<A> apply(final DynamicOps<T> dynamicOps, final MapLike<T> mapLike, final DataResult<A> dataResult) {
+                return (DataResult<A>)DataResult.success(dataResult.resultOrPartial(consumer).orElseGet(supplier));
+            }
+            
+            @Override
+            public <T> RecordBuilder<T> coApply(final DynamicOps<T> dynamicOps, final A object, final RecordBuilder<T> recordBuilder) {
+                return recordBuilder;
+            }
+            
+            @Override
+            public String toString() {
+                return "WithDefault[" + supplier.get() + "]";
+            }
+        });
+    }
+    
+    public static <A> MapCodec<A> setPartial(final MapCodec<A> mapCodec, final Supplier<A> supplier) {
+        return Codecs.<A>mapResult(mapCodec, new ResultFunction<A>() {
+            @Override
+            public <T> DataResult<A> apply(final DynamicOps<T> dynamicOps, final MapLike<T> mapLike, final DataResult<A> dataResult) {
+                return (DataResult<A>)dataResult.setPartial(supplier);
+            }
+            
+            @Override
+            public <T> RecordBuilder<T> coApply(final DynamicOps<T> dynamicOps, final A object, final RecordBuilder<T> recordBuilder) {
+                return recordBuilder;
+            }
+            
+            @Override
+            public String toString() {
+                return "SetPartial[" + supplier + "]";
+            }
+        });
+    }
+    
+    interface ResultFunction<A> {
+         <T> DataResult<A> apply(final DynamicOps<T> dynamicOps, final MapLike<T> mapLike, final DataResult<A> dataResult);
+        
+         <T> RecordBuilder<T> coApply(final DynamicOps<T> dynamicOps, final A object, final RecordBuilder<T> recordBuilder);
+    }
+}
diff --git a/src/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java b/src/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java
index fb99e92..679be7c 100644
--- a/src/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java
+++ b/src/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java
@@ -42,6 +42,10 @@ public class CrudeIncrementalIntIdentityHashBiMap<K> implements IdMap<K> {
         return this.values[integer];
     }
     
+    public boolean contains(final int integer) {
+        return this.byId(integer) != null;
+    }
+    
     public int add(final K object) {
         final int integer3 = this.nextId();
         this.addMapping(object, integer3);
diff --git a/src/net/minecraft/util/CubicSampler.java b/src/net/minecraft/util/CubicSampler.java
new file mode 100644
index 0000000..e914d49
--- /dev/null
+++ b/src/net/minecraft/util/CubicSampler.java
@@ -0,0 +1,45 @@
+package net.minecraft.util;
+
+import javax.annotation.Nonnull;
+import net.minecraft.world.phys.Vec3;
+
+public class CubicSampler {
+    private static final double[] GAUSSIAN_SAMPLE_KERNEL;
+    
+    @Nonnull
+    public static Vec3 gaussianSampleVec3(final Vec3 dem, final Vec3Fetcher vec3Fetcher) {
+        final int integer3 = Mth.floor(dem.x());
+        final int integer4 = Mth.floor(dem.y());
+        final int integer5 = Mth.floor(dem.z());
+        final double double6 = dem.x() - integer3;
+        final double double7 = dem.y() - integer4;
+        final double double8 = dem.z() - integer5;
+        double double9 = 0.0;
+        Vec3 dem2 = Vec3.ZERO;
+        for (int integer6 = 0; integer6 < 6; ++integer6) {
+            final double double10 = Mth.lerp(double6, CubicSampler.GAUSSIAN_SAMPLE_KERNEL[integer6 + 1], CubicSampler.GAUSSIAN_SAMPLE_KERNEL[integer6]);
+            final int integer7 = integer3 - 2 + integer6;
+            for (int integer8 = 0; integer8 < 6; ++integer8) {
+                final double double11 = Mth.lerp(double7, CubicSampler.GAUSSIAN_SAMPLE_KERNEL[integer8 + 1], CubicSampler.GAUSSIAN_SAMPLE_KERNEL[integer8]);
+                final int integer9 = integer4 - 2 + integer8;
+                for (int integer10 = 0; integer10 < 6; ++integer10) {
+                    final double double12 = Mth.lerp(double8, CubicSampler.GAUSSIAN_SAMPLE_KERNEL[integer10 + 1], CubicSampler.GAUSSIAN_SAMPLE_KERNEL[integer10]);
+                    final int integer11 = integer5 - 2 + integer10;
+                    final double double13 = double10 * double11 * double12;
+                    double9 += double13;
+                    dem2 = dem2.add(vec3Fetcher.fetch(integer7, integer9, integer11).scale(double13));
+                }
+            }
+        }
+        dem2 = dem2.scale(1.0 / double9);
+        return dem2;
+    }
+    
+    static {
+        GAUSSIAN_SAMPLE_KERNEL = new double[] { 0.0, 1.0, 4.0, 6.0, 4.0, 1.0, 0.0 };
+    }
+    
+    public interface Vec3Fetcher {
+        Vec3 fetch(final int integer1, final int integer2, final int integer3);
+    }
+}
diff --git a/src/net/minecraft/util/Deserializer.java b/src/net/minecraft/util/Deserializer.java
deleted file mode 100644
index 4ac53f2..0000000
--- a/src/net/minecraft/util/Deserializer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package net.minecraft.util;
-
-import org.apache.logging.log4j.LogManager;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import org.apache.logging.log4j.Logger;
-
-public interface Deserializer<T> {
-    public static final Logger LOGGER = LogManager.getLogger();
-    
-    T deserialize(final Dynamic<?> dynamic);
-    
-    default <T, V, U extends Deserializer<V>> V deserialize(final Dynamic<T> dynamic, final Registry<U> gb, final String string, final V object) {
-        final U abi5 = gb.get(new ResourceLocation(dynamic.get(string).asString("")));
-        V object2;
-        if (abi5 != null) {
-            object2 = abi5.deserialize(dynamic);
-        }
-        else {
-            Deserializer.LOGGER.error("Unknown type {}, replacing with {}", dynamic.get(string).asString(""), object);
-            object2 = object;
-        }
-        return object2;
-    }
-}
diff --git a/src/net/minecraft/util/DirectoryLock.java b/src/net/minecraft/util/DirectoryLock.java
new file mode 100644
index 0000000..3c1bf96
--- /dev/null
+++ b/src/net/minecraft/util/DirectoryLock.java
@@ -0,0 +1,100 @@
+package net.minecraft.util;
+
+import com.google.common.base.Charsets;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.AccessDeniedException;
+import java.io.IOException;
+import java.nio.file.StandardOpenOption;
+import java.nio.file.OpenOption;
+import java.nio.file.attribute.FileAttribute;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileLock;
+import java.nio.channels.FileChannel;
+
+public class DirectoryLock implements AutoCloseable {
+    private final FileChannel lockFile;
+    private final FileLock lock;
+    private static final ByteBuffer DUMMY;
+    
+    public static DirectoryLock create(final Path path) throws IOException {
+        final Path path2 = path.resolve("session.lock");
+        if (!Files.isDirectory(path)) {
+            Files.createDirectories(path, new FileAttribute[0]);
+        }
+        final FileChannel fileChannel3 = FileChannel.open(path2, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
+        try {
+            fileChannel3.write(DirectoryLock.DUMMY.duplicate());
+            fileChannel3.force(true);
+            final FileLock fileLock4 = fileChannel3.tryLock();
+            if (fileLock4 == null) {
+                throw LockException.alreadyLocked(path2);
+            }
+            return new DirectoryLock(fileChannel3, fileLock4);
+        }
+        catch (IOException iOException4) {
+            try {
+                fileChannel3.close();
+            }
+            catch (IOException iOException5) {
+                iOException4.addSuppressed(iOException5);
+            }
+            throw iOException4;
+        }
+    }
+    
+    private DirectoryLock(final FileChannel fileChannel, final FileLock fileLock) {
+        this.lockFile = fileChannel;
+        this.lock = fileLock;
+    }
+    
+    @Override
+    public void close() throws IOException {
+        try {
+            if (this.lock.isValid()) {
+                this.lock.release();
+            }
+        }
+        finally {
+            if (this.lockFile.isOpen()) {
+                this.lockFile.close();
+            }
+        }
+    }
+    
+    public boolean isValid() {
+        return this.lock.isValid();
+    }
+    
+    public static boolean isLocked(final Path path) throws IOException {
+        final Path path2 = path.resolve("session.lock");
+        try (final FileChannel fileChannel3 = FileChannel.open(path2, StandardOpenOption.WRITE);
+             final FileLock fileLock5 = fileChannel3.tryLock()) {
+            return fileLock5 == null;
+        }
+        catch (AccessDeniedException accessDeniedException3) {
+            return true;
+        }
+        catch (NoSuchFileException noSuchFileException3) {
+            return false;
+        }
+    }
+    
+    static {
+        final byte[] arr1 = "\u2603".getBytes(Charsets.UTF_8);
+        (DUMMY = ByteBuffer.allocateDirect(arr1.length)).put(arr1);
+        DirectoryLock.DUMMY.flip();
+    }
+    
+    public static class LockException extends IOException {
+        private LockException(final Path path, final String string) {
+            super(path.toAbsolutePath() + ": " + string);
+        }
+        
+        public static LockException alreadyLocked(final Path path) {
+            return new LockException(path, "already locked (possibly by other Minecraft instance?)");
+        }
+    }
+}
diff --git a/src/net/minecraft/util/ExceptionCollector.java b/src/net/minecraft/util/ExceptionCollector.java
new file mode 100644
index 0000000..2936563
--- /dev/null
+++ b/src/net/minecraft/util/ExceptionCollector.java
@@ -0,0 +1,23 @@
+package net.minecraft.util;
+
+import javax.annotation.Nullable;
+
+public class ExceptionCollector<T extends Throwable> {
+    @Nullable
+    private T result;
+    
+    public void add(final T throwable) {
+        if (this.result == null) {
+            this.result = throwable;
+        }
+        else {
+            this.result.addSuppressed(throwable);
+        }
+    }
+    
+    public void throwIfPresent() throws T, Throwable {
+        if (this.result != null) {
+            throw this.result;
+        }
+    }
+}
diff --git a/src/net/minecraft/util/FastColor.java b/src/net/minecraft/util/FastColor.java
new file mode 100644
index 0000000..483f812
--- /dev/null
+++ b/src/net/minecraft/util/FastColor.java
@@ -0,0 +1,29 @@
+package net.minecraft.util;
+
+public class FastColor {
+    public static class ARGB32 {
+        public static int alpha(final int integer) {
+            return integer >>> 24;
+        }
+        
+        public static int red(final int integer) {
+            return integer >> 16 & 0xFF;
+        }
+        
+        public static int green(final int integer) {
+            return integer >> 8 & 0xFF;
+        }
+        
+        public static int blue(final int integer) {
+            return integer & 0xFF;
+        }
+        
+        public static int color(final int integer1, final int integer2, final int integer3, final int integer4) {
+            return integer1 << 24 | integer2 << 16 | integer3 << 8 | integer4;
+        }
+        
+        public static int multiply(final int integer1, final int integer2) {
+            return color(alpha(integer1) * alpha(integer2) / 255, red(integer1) * red(integer2) / 255, green(integer1) * green(integer2) / 255, blue(integer1) * blue(integer2) / 255);
+        }
+    }
+}
diff --git a/src/net/minecraft/util/GsonHelper.java b/src/net/minecraft/util/GsonHelper.java
index ab4738b..1430dcc 100644
--- a/src/net/minecraft/util/GsonHelper.java
+++ b/src/net/minecraft/util/GsonHelper.java
@@ -294,11 +294,11 @@ public class GsonHelper {
     }
     
     @Nullable
-    public static <T> T fromJson(final Gson gson, final Reader reader, final Type type, final boolean boolean4) {
+    public static <T> T fromJson(final Gson gson, final Reader reader, final TypeToken<T> typeToken, final boolean boolean4) {
         try {
             final JsonReader jsonReader5 = new JsonReader(reader);
             jsonReader5.setLenient(boolean4);
-            return (T)gson.getAdapter(TypeToken.get(type)).read(jsonReader5);
+            return gson.<T>getAdapter(typeToken).read(jsonReader5);
         }
         catch (IOException iOException5) {
             throw new JsonParseException(iOException5);
@@ -306,8 +306,8 @@ public class GsonHelper {
     }
     
     @Nullable
-    public static <T> T fromJson(final Gson gson, final String string, final Type type, final boolean boolean4) {
-        return GsonHelper.<T>fromJson(gson, new StringReader(string), type, boolean4);
+    public static <T> T fromJson(final Gson gson, final String string, final TypeToken<T> typeToken, final boolean boolean4) {
+        return GsonHelper.<T>fromJson(gson, new StringReader(string), typeToken, boolean4);
     }
     
     @Nullable
@@ -316,13 +316,13 @@ public class GsonHelper {
     }
     
     @Nullable
-    public static <T> T fromJson(final Gson gson, final Reader reader, final Type type) {
-        return GsonHelper.<T>fromJson(gson, reader, type, false);
+    public static <T> T fromJson(final Gson gson, final Reader reader, final TypeToken<T> typeToken) {
+        return GsonHelper.<T>fromJson(gson, reader, typeToken, false);
     }
     
     @Nullable
-    public static <T> T fromJson(final Gson gson, final String string, final Type type) {
-        return GsonHelper.<T>fromJson(gson, string, type, false);
+    public static <T> T fromJson(final Gson gson, final String string, final TypeToken<T> typeToken) {
+        return GsonHelper.<T>fromJson(gson, string, typeToken, false);
     }
     
     @Nullable
diff --git a/src/net/minecraft/util/HttpUtil.java b/src/net/minecraft/util/HttpUtil.java
index ae6e2f8..c60307d 100644
--- a/src/net/minecraft/util/HttpUtil.java
+++ b/src/net/minecraft/util/HttpUtil.java
@@ -32,7 +32,7 @@ public class HttpUtil {
     private static final Logger LOGGER;
     public static final ListeningExecutorService DOWNLOAD_EXECUTOR;
     
-    public static CompletableFuture<?> downloadTo(final File file, final String string, final Map<String, String> map, final int integer, @Nullable final ProgressListener abs, final Proxy proxy) {
+    public static CompletableFuture<?> downloadTo(final File file, final String string, final Map<String, String> map, final int integer, @Nullable final ProgressListener aed, final Proxy proxy) {
         HttpURLConnection httpURLConnection7;
         InputStream inputStream8;
         OutputStream outputStream9;
@@ -45,7 +45,7 @@ public class HttpUtil {
         final float n;
         float float14;
         int integer2;
-        final TranslatableComponent lf;
+        final TranslatableComponent mr;
         long long15;
         final DataOutputStream dataOutputStream;
         final IOException ex;
@@ -56,9 +56,9 @@ public class HttpUtil {
             httpURLConnection7 = null;
             inputStream8 = null;
             outputStream9 = null;
-            if (abs != null) {
-                abs.progressStart(new TranslatableComponent("resourcepack.downloading", new Object[0]));
-                abs.progressStage(new TranslatableComponent("resourcepack.requesting", new Object[0]));
+            if (aed != null) {
+                aed.progressStart(new TranslatableComponent("resourcepack.downloading"));
+                aed.progressStage(new TranslatableComponent("resourcepack.requesting"));
             }
             try {
                 arr10 = new byte[4096];
@@ -71,23 +71,23 @@ public class HttpUtil {
                 while (iterator.hasNext()) {
                     entry15 = iterator.next();
                     httpURLConnection7.setRequestProperty(entry15.getKey(), entry15.getValue());
-                    if (abs != null) {
+                    if (aed != null) {
                         ++float12;
-                        abs.progressStagePercentage((int)(n / float13 * 100.0f));
+                        aed.progressStagePercentage((int)(n / float13 * 100.0f));
                     }
                 }
                 inputStream8 = httpURLConnection7.getInputStream();
                 float14 = (float)httpURLConnection7.getContentLength();
                 integer2 = httpURLConnection7.getContentLength();
-                if (abs != null) {
+                if (aed != null) {
                     new TranslatableComponent("resourcepack.progress", new Object[] { String.format(Locale.ROOT, "%.2f", float14 / 1000.0f / 1000.0f) });
-                    abs.progressStage(lf);
+                    aed.progressStage(mr);
                 }
                 if (file.exists()) {
                     long15 = file.length();
                     if (long15 == integer2) {
-                        if (abs != null) {
-                            abs.stop();
+                        if (aed != null) {
+                            aed.stop();
                         }
                         return null;
                     }
@@ -102,8 +102,8 @@ public class HttpUtil {
                 new DataOutputStream(new FileOutputStream(file));
                 outputStream9 = dataOutputStream;
                 if (integer > 0 && float14 > integer) {
-                    if (abs != null) {
-                        abs.stop();
+                    if (aed != null) {
+                        aed.stop();
                     }
                     new IOException("Filesize is bigger than maximum allowed (file is " + float12 + ", limit is " + integer + ")");
                     throw ex;
@@ -111,20 +111,20 @@ public class HttpUtil {
                 else {
                     while ((integer3 = inputStream8.read(arr10)) >= 0) {
                         float12 += integer3;
-                        if (abs != null) {
-                            abs.progressStagePercentage((int)(float12 / float14 * 100.0f));
+                        if (aed != null) {
+                            aed.progressStagePercentage((int)(float12 / float14 * 100.0f));
                         }
                         if (integer > 0 && float12 > integer) {
-                            if (abs != null) {
-                                abs.stop();
+                            if (aed != null) {
+                                aed.stop();
                             }
                             new IOException("Filesize was bigger than maximum allowed (got >= " + float12 + ", limit was " + integer + ")");
                             throw ex2;
                         }
                         else if (Thread.interrupted()) {
                             HttpUtil.LOGGER.error("INTERRUPTED");
-                            if (abs != null) {
-                                abs.stop();
+                            if (aed != null) {
+                                aed.stop();
                             }
                             return null;
                         }
@@ -132,8 +132,8 @@ public class HttpUtil {
                             outputStream9.write(arr10, 0, integer3);
                         }
                     }
-                    if (abs != null) {
-                        abs.stop();
+                    if (aed != null) {
+                        aed.stop();
                     }
                 }
             }
@@ -148,8 +148,8 @@ public class HttpUtil {
                         iOException12.printStackTrace();
                     }
                 }
-                if (abs != null) {
-                    abs.stop();
+                if (aed != null) {
+                    aed.stop();
                 }
             }
             finally {
diff --git a/src/net/minecraft/util/InsensitiveStringMap.java b/src/net/minecraft/util/InsensitiveStringMap.java
deleted file mode 100644
index 4d3a175..0000000
--- a/src/net/minecraft/util/InsensitiveStringMap.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package net.minecraft.util;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Locale;
-import com.google.common.collect.Maps;
-import java.util.Map;
-
-public class InsensitiveStringMap<V> implements Map<String, V> {
-    private final Map<String, V> map;
-    
-    public InsensitiveStringMap() {
-        this.map = Maps.newLinkedHashMap();
-    }
-    
-    @Override
-    public int size() {
-        return this.map.size();
-    }
-    
-    @Override
-    public boolean isEmpty() {
-        return this.map.isEmpty();
-    }
-    
-    @Override
-    public boolean containsKey(final Object object) {
-        return this.map.containsKey(object.toString().toLowerCase(Locale.ROOT));
-    }
-    
-    @Override
-    public boolean containsValue(final Object object) {
-        return this.map.containsValue(object);
-    }
-    
-    @Override
-    public V get(final Object object) {
-        return this.map.get(object.toString().toLowerCase(Locale.ROOT));
-    }
-    
-    @Override
-    public V put(final String string, final V object) {
-        return this.map.put(string.toLowerCase(Locale.ROOT), object);
-    }
-    
-    @Override
-    public V remove(final Object object) {
-        return this.map.remove(object.toString().toLowerCase(Locale.ROOT));
-    }
-    
-    @Override
-    public void putAll(final Map<? extends String, ? extends V> map) {
-        for (final Entry<? extends String, ? extends V> entry4 : map.entrySet()) {
-            this.put((String)entry4.getKey(), entry4.getValue());
-        }
-    }
-    
-    @Override
-    public void clear() {
-        this.map.clear();
-    }
-    
-    @Override
-    public Set<String> keySet() {
-        return this.map.keySet();
-    }
-    
-    @Override
-    public Collection<V> values() {
-        return this.map.values();
-    }
-    
-    @Override
-    public Set<Entry<String, V>> entrySet() {
-        return this.map.entrySet();
-    }
-}
diff --git a/src/net/minecraft/util/IntRange.java b/src/net/minecraft/util/IntRange.java
new file mode 100644
index 0000000..6e0edc0
--- /dev/null
+++ b/src/net/minecraft/util/IntRange.java
@@ -0,0 +1,40 @@
+package net.minecraft.util;
+
+import java.util.Random;
+
+public class IntRange {
+    private final int minInclusive;
+    private final int maxInclusive;
+    
+    public IntRange(final int integer1, final int integer2) {
+        if (integer2 < integer1) {
+            throw new IllegalArgumentException("max must be >= minInclusive! Given minInclusive: " + integer1 + ", Given max: " + integer2);
+        }
+        this.minInclusive = integer1;
+        this.maxInclusive = integer2;
+    }
+    
+    public static IntRange of(final int integer1, final int integer2) {
+        return new IntRange(integer1, integer2);
+    }
+    
+    public int randomValue(final Random random) {
+        if (this.minInclusive == this.maxInclusive) {
+            return this.minInclusive;
+        }
+        return random.nextInt(this.maxInclusive - this.minInclusive + 1) + this.minInclusive;
+    }
+    
+    public int getMinInclusive() {
+        return this.minInclusive;
+    }
+    
+    public int getMaxInclusive() {
+        return this.maxInclusive;
+    }
+    
+    @Override
+    public String toString() {
+        return "IntRange[" + this.minInclusive + "-" + this.maxInclusive + "]";
+    }
+}
diff --git a/src/net/minecraft/util/Mth.java b/src/net/minecraft/util/Mth.java
index 03a3e0c..5e274dd 100644
--- a/src/net/minecraft/util/Mth.java
+++ b/src/net/minecraft/util/Mth.java
@@ -51,10 +51,6 @@ public class Mth {
         return (double1 < long3) ? (long3 - 1L) : long3;
     }
     
-    public static int absFloor(final double double1) {
-        return (int)((double1 >= 0.0) ? double1 : (-double1 + 1.0));
-    }
-    
     public static float abs(final float float1) {
         return Math.abs(float1);
     }
@@ -250,23 +246,6 @@ public class Mth {
         return NumberUtils.toInt(string, integer);
     }
     
-    public static int getInt(final String string, final int integer2, final int integer3) {
-        return Math.max(integer3, getInt(string, integer2));
-    }
-    
-    public static double getDouble(final String string, final double double2) {
-        try {
-            return Double.parseDouble(string);
-        }
-        catch (Throwable throwable4) {
-            return double2;
-        }
-    }
-    
-    public static double getDouble(final String string, final double double2, final double double3) {
-        return Math.max(double3, getDouble(string, double2));
-    }
-    
     public static int smallestEncompassingPowerOfTwo(final int integer) {
         int integer2 = integer - 1;
         integer2 |= integer2 >> 1;
@@ -277,7 +256,7 @@ public class Mth {
         return integer2 + 1;
     }
     
-    private static boolean isPowerOfTwo(final int integer) {
+    public static boolean isPowerOfTwo(final int integer) {
         return integer != 0 && (integer & integer - 1) == 0x0;
     }
     
@@ -326,8 +305,8 @@ public class Mth {
         return double1 - lfloor(double1);
     }
     
-    public static long getSeed(final Vec3i gg) {
-        return getSeed(gg.getX(), gg.getY(), gg.getZ());
+    public static long getSeed(final Vec3i gr) {
+        return getSeed(gr.getX(), gr.getY(), gr.getZ());
     }
     
     public static long getSeed(final int integer1, final int integer2, final int integer3) {
@@ -346,7 +325,7 @@ public class Mth {
         return createInsecureUUID(Mth.RANDOM);
     }
     
-    public static double pct(final double double1, final double double2, final double double3) {
+    public static double inverseLerp(final double double1, final double double2, final double double3) {
         return (double1 - double2) / (double3 - double2);
     }
     
@@ -552,6 +531,14 @@ public class Mth {
         return (float)double1;
     }
     
+    public static float triangleWave(final float float1, final float float2) {
+        return (Math.abs(float1 % float2 - float2 * 0.5f) - float2 * 0.25f) / (float2 * 0.25f);
+    }
+    
+    public static float square(final float float1) {
+        return float1 * float1;
+    }
+    
     static {
         SQRT_OF_TWO = sqrt(2.0f);
         int integer2;
diff --git a/src/net/minecraft/util/ProgressListener.java b/src/net/minecraft/util/ProgressListener.java
index 28cfafe..85e050e 100644
--- a/src/net/minecraft/util/ProgressListener.java
+++ b/src/net/minecraft/util/ProgressListener.java
@@ -3,11 +3,11 @@ package net.minecraft.util;
 import net.minecraft.network.chat.Component;
 
 public interface ProgressListener {
-    void progressStartNoAbort(final Component lf);
+    void progressStartNoAbort(final Component mr);
     
-    void progressStart(final Component lf);
+    void progressStart(final Component mr);
     
-    void progressStage(final Component lf);
+    void progressStage(final Component mr);
     
     void progressStagePercentage(final int integer);
     
diff --git a/src/net/minecraft/util/Serializable.java b/src/net/minecraft/util/Serializable.java
deleted file mode 100644
index a0c2049..0000000
--- a/src/net/minecraft/util/Serializable.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.minecraft.util;
-
-import com.mojang.datafixers.types.DynamicOps;
-
-public interface Serializable {
-     <T> T serialize(final DynamicOps<T> dynamicOps);
-}
diff --git a/src/net/minecraft/util/SortedArraySet.java b/src/net/minecraft/util/SortedArraySet.java
index 4ea4dd6..150dc99 100644
--- a/src/net/minecraft/util/SortedArraySet.java
+++ b/src/net/minecraft/util/SortedArraySet.java
@@ -151,9 +151,9 @@ public class SortedArraySet<T> extends AbstractSet<T> {
             return true;
         }
         if (object instanceof SortedArraySet) {
-            final SortedArraySet<?> abw3 = object;
-            if (this.comparator.equals(abw3.comparator)) {
-                return this.size == abw3.size && Arrays.equals(this.contents, (Object[])abw3.contents);
+            final SortedArraySet<?> aeg3 = object;
+            if (this.comparator.equals(aeg3.comparator)) {
+                return this.size == aeg3.size && Arrays.equals(this.contents, (Object[])aeg3.contents);
             }
         }
         return super.equals(object);
diff --git a/src/net/minecraft/util/StringRepresentable.java b/src/net/minecraft/util/StringRepresentable.java
index 1b2ffdf..b376bc0 100644
--- a/src/net/minecraft/util/StringRepresentable.java
+++ b/src/net/minecraft/util/StringRepresentable.java
@@ -1,5 +1,58 @@
 package net.minecraft.util;
 
+import java.util.Arrays;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import com.mojang.serialization.Keyable;
+import java.util.Optional;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+import java.util.function.IntFunction;
+import java.util.function.ToIntFunction;
+import com.mojang.serialization.Codec;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
 public interface StringRepresentable {
     String getSerializedName();
+    
+    default <E extends Enum> Codec<E> fromEnum(final Supplier<E[]> supplier, final Function<? super String, ? extends E> function) {
+        final E[] arr3 = supplier.get();
+        return StringRepresentable.<E>fromStringResolver(java.lang.Enum::ordinal, integer -> arr3[integer], function);
+    }
+    
+    default <E extends StringRepresentable> Codec<E> fromStringResolver(final ToIntFunction<E> toIntFunction, final IntFunction<E> intFunction, final Function<? super String, ? extends E> function) {
+        return (Codec<E>)new Codec<E>() {
+            public <T> DataResult<T> encode(final E aeh, final DynamicOps<T> dynamicOps, final T object) {
+                if (dynamicOps.compressMaps()) {
+                    return (DataResult<T>)dynamicOps.mergeToPrimitive(object, dynamicOps.createInt(toIntFunction.applyAsInt(aeh)));
+                }
+                return (DataResult<T>)dynamicOps.mergeToPrimitive(object, dynamicOps.createString(aeh.getSerializedName()));
+            }
+            
+            public <T> DataResult<Pair<E, T>> decode(final DynamicOps<T> dynamicOps, final T object) {
+                if (dynamicOps.compressMaps()) {
+                    return (DataResult<Pair<E, T>>)dynamicOps.getNumberValue(object).flatMap(number -> Optional.ofNullable(intFunction.apply(number.intValue())).map(DataResult::success).orElseGet(() -> DataResult.error("Unknown element id: " + number))).map(aeh -> Pair.of(aeh, dynamicOps.empty()));
+                }
+                return (DataResult<Pair<E, T>>)dynamicOps.getStringValue(object).flatMap(string -> Optional.ofNullable(function.apply(string)).map(DataResult::success).orElseGet(() -> DataResult.error("Unknown element name: " + string))).map(aeh -> Pair.of(aeh, dynamicOps.empty()));
+            }
+            
+            @Override
+            public String toString() {
+                return "StringRepresentable[" + toIntFunction + "]";
+            }
+        };
+    }
+    
+    default Keyable keys(final StringRepresentable[] arr) {
+        return (Keyable)new Keyable() {
+            public <T> Stream<T> keys(final DynamicOps<T> dynamicOps) {
+                if (dynamicOps.compressMaps()) {
+                    return IntStream.range(0, arr.length).<T>mapToObj(dynamicOps::createInt);
+                }
+                return Arrays.<StringRepresentable>stream(arr).map(StringRepresentable::getSerializedName).<T>map(dynamicOps::createString);
+            }
+        };
+    }
 }
diff --git a/src/net/minecraft/util/TimeUtil.java b/src/net/minecraft/util/TimeUtil.java
new file mode 100644
index 0000000..8bf008e
--- /dev/null
+++ b/src/net/minecraft/util/TimeUtil.java
@@ -0,0 +1,7 @@
+package net.minecraft.util;
+
+public class TimeUtil {
+    public static IntRange rangeOfSeconds(final int integer1, final int integer2) {
+        return new IntRange(integer1 * 20, integer2 * 20);
+    }
+}
diff --git a/src/net/minecraft/util/datafix/DataFixTypes.java b/src/net/minecraft/util/datafix/DataFixTypes.java
index e9818cd..dceb6d2 100644
--- a/src/net/minecraft/util/datafix/DataFixTypes.java
+++ b/src/net/minecraft/util/datafix/DataFixTypes.java
@@ -13,7 +13,8 @@ public enum DataFixTypes {
     STATS(References.STATS), 
     SAVED_DATA(References.SAVED_DATA), 
     ADVANCEMENTS(References.ADVANCEMENTS), 
-    POI_CHUNK(References.POI_CHUNK);
+    POI_CHUNK(References.POI_CHUNK), 
+    WORLD_GEN_SETTINGS(References.WORLD_GEN_SETTINGS);
     
     private final DSL.TypeReference type;
     
diff --git a/src/net/minecraft/util/datafix/DataFixers.java b/src/net/minecraft/util/datafix/DataFixers.java
index 70b2a82..7994df3 100644
--- a/src/net/minecraft/util/datafix/DataFixers.java
+++ b/src/net/minecraft/util/datafix/DataFixers.java
@@ -1,5 +1,38 @@
 package net.minecraft.util.datafix;
 
+import java.util.function.UnaryOperator;
+import net.minecraft.util.datafix.fixes.OptionsRenameFieldFix;
+import net.minecraft.util.datafix.fixes.MissingDimensionFix;
+import net.minecraft.util.datafix.fixes.BiomeFix;
+import net.minecraft.util.datafix.fixes.RenameBiomesFix;
+import net.minecraft.util.datafix.schemas.V2551;
+import net.minecraft.util.datafix.fixes.WorldGenSettingsFix;
+import net.minecraft.util.datafix.fixes.EntityShulkerRotationFix;
+import net.minecraft.util.datafix.fixes.VillagerFollowRangeFix;
+import net.minecraft.util.datafix.fixes.RedstoneWireConnectionsFix;
+import net.minecraft.util.datafix.fixes.StriderGravityFix;
+import net.minecraft.util.datafix.fixes.BitStorageAlignFix;
+import net.minecraft.util.datafix.fixes.AttributesRename;
+import net.minecraft.util.datafix.schemas.V2522;
+import net.minecraft.util.datafix.schemas.V2519;
+import net.minecraft.util.datafix.fixes.JigsawRotationFix;
+import net.minecraft.util.datafix.fixes.JigsawPropertiesFix;
+import net.minecraft.util.datafix.fixes.GossipUUIDFix;
+import net.minecraft.util.datafix.fixes.ItemStackUUIDFix;
+import net.minecraft.util.datafix.fixes.SavedDataUUIDFix;
+import net.minecraft.util.datafix.fixes.LevelUUIDFix;
+import net.minecraft.util.datafix.fixes.PlayerUUIDFix;
+import net.minecraft.util.datafix.fixes.BlockEntityUUIDFix;
+import net.minecraft.util.datafix.fixes.EntityUUIDFix;
+import net.minecraft.util.datafix.fixes.EntityProjectileOwnerFix;
+import net.minecraft.util.datafix.fixes.EntityZombifiedPiglinRenameFix;
+import net.minecraft.util.datafix.schemas.V2509;
+import net.minecraft.util.datafix.fixes.MemoryExpiryDataFix;
+import net.minecraft.util.datafix.schemas.V2505;
+import net.minecraft.util.datafix.fixes.WallPropertyFix;
+import net.minecraft.util.datafix.schemas.V2502;
+import net.minecraft.util.datafix.fixes.FurnaceRecipeFix;
+import net.minecraft.util.datafix.schemas.V2501;
 import net.minecraft.util.datafix.fixes.ForcePoiRebuild;
 import net.minecraft.util.datafix.fixes.StructureReferenceCountFix;
 import net.minecraft.util.datafix.fixes.BeehivePoiRenameFix;
@@ -10,6 +43,8 @@ import net.minecraft.util.datafix.schemas.V2100;
 import net.minecraft.util.datafix.fixes.ChunkLightRemoveFix;
 import net.minecraft.util.datafix.fixes.ZombieVillagerRebuildXpFix;
 import net.minecraft.util.datafix.fixes.VillagerRebuildLevelAndXpFix;
+import net.minecraft.util.datafix.fixes.OminousBannerBlockEntityRenameFix;
+import net.minecraft.util.datafix.fixes.OminousBannerRenameFix;
 import net.minecraft.util.datafix.fixes.ReorganizePoi;
 import net.minecraft.util.datafix.fixes.OptionsAddTextBackgroundFix;
 import net.minecraft.util.datafix.schemas.V1931;
@@ -40,7 +75,6 @@ import net.minecraft.util.datafix.fixes.SwimStatsRenameFix;
 import net.minecraft.util.datafix.fixes.RecipesRenameningFix;
 import net.minecraft.util.datafix.fixes.EntityTheRenameningFix;
 import net.minecraft.util.datafix.schemas.V1510;
-import net.minecraft.util.datafix.fixes.BiomeFix;
 import net.minecraft.util.datafix.fixes.LevelDataGeneratorOptionsFix;
 import net.minecraft.util.datafix.fixes.RecipesFix;
 import net.minecraft.util.datafix.fixes.AdvancementsFix;
@@ -49,7 +83,6 @@ import net.minecraft.util.datafix.fixes.LeavesFix;
 import net.minecraft.util.datafix.fixes.ItemStackEnchantmentNamesFix;
 import net.minecraft.util.datafix.fixes.ChunkStructuresTemplateRenameFix;
 import net.minecraft.util.datafix.fixes.IglooMetadataRemovalFix;
-import java.util.function.Function;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.DSL;
 import net.minecraft.util.datafix.fixes.NamedEntityFix;
@@ -60,6 +93,7 @@ import net.minecraft.util.datafix.fixes.EntityPufferfishRenameFix;
 import net.minecraft.util.datafix.schemas.V1483;
 import net.minecraft.util.datafix.schemas.V1481;
 import net.minecraft.util.datafix.fixes.RenamedCoralFix;
+import java.util.Map;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.util.datafix.fixes.BlockRenameFix;
 import net.minecraft.util.datafix.fixes.ColorlessShulkerEntityFix;
@@ -102,6 +136,7 @@ import net.minecraft.util.datafix.fixes.BedBlockEntityInjecter;
 import net.minecraft.util.datafix.schemas.V1125;
 import net.minecraft.util.datafix.fixes.WriteAndReadFix;
 import net.minecraft.util.datafix.schemas.V1022;
+import java.util.function.Function;
 import net.minecraft.util.datafix.fixes.OptionsLowerCaseLanguageFix;
 import net.minecraft.util.datafix.fixes.BlockEntityShulkerBoxColorFix;
 import net.minecraft.util.datafix.fixes.ItemShulkerBoxColorFix;
@@ -168,7 +203,7 @@ public class DataFixers {
     private static DataFixer createFixerUpper() {
         final DataFixerBuilder dataFixerBuilder1 = new DataFixerBuilder(SharedConstants.getCurrentVersion().getWorldVersion());
         addFixers(dataFixerBuilder1);
-        return dataFixerBuilder1.build(Util.backgroundExecutor());
+        return dataFixerBuilder1.build(Util.bootstrapExecutor());
     }
     
     public static DataFixer getDataFixer() {
@@ -241,7 +276,7 @@ public class DataFixers {
         final Schema schema32 = dataFixerBuilder.addSchema(816, (BiFunction)DataFixers.SAME_NAMESPACED);
         dataFixerBuilder.addFixer((DataFix)new OptionsLowerCaseLanguageFix(schema32, false));
         final Schema schema33 = dataFixerBuilder.addSchema(820, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema33, "totem item renamer", string -> Objects.equals(string, "minecraft:totem") ? "minecraft:totem_of_undying" : string));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema33, "totem item renamer", createRenamer("minecraft:totem", "minecraft:totem_of_undying")));
         final Schema schema34 = dataFixerBuilder.addSchema(1022, (BiFunction)V1022::new);
         dataFixerBuilder.addFixer((DataFix)new WriteAndReadFix(schema34, "added shoulder entities to players", References.PLAYER));
         final Schema schema35 = dataFixerBuilder.addSchema(1125, (BiFunction)V1125::new);
@@ -295,28 +330,28 @@ public class DataFixers {
         dataFixerBuilder.addFixer(BlockRenameFix.create(schema53, "Colorless shulker block fixer", string -> Objects.equals(NamespacedSchema.ensureNamespaced(string), "minecraft:purple_shulker_box") ? "minecraft:shulker_box" : string));
         dataFixerBuilder.addFixer(ItemRenameFix.create(schema53, "Colorless shulker item fixer", string -> Objects.equals(NamespacedSchema.ensureNamespaced(string), "minecraft:purple_shulker_box") ? "minecraft:shulker_box" : string));
         final Schema schema54 = dataFixerBuilder.addSchema(1475, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer(BlockRenameFix.create(schema54, "Flowing fixer", string -> ImmutableMap.<String, String>of("minecraft:flowing_water", "minecraft:water", "minecraft:flowing_lava", "minecraft:lava").getOrDefault(string, string)));
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema54, "Flowing fixer", createRenamer(ImmutableMap.<String, String>of("minecraft:flowing_water", "minecraft:water", "minecraft:flowing_lava", "minecraft:lava"))));
         final Schema schema55 = dataFixerBuilder.addSchema(1480, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer(BlockRenameFix.create(schema55, "Rename coral blocks", string -> RenamedCoralFix.RENAMED_IDS.getOrDefault(string, string)));
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema55, "Rename coral items", string -> RenamedCoralFix.RENAMED_IDS.getOrDefault(string, string)));
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema55, "Rename coral blocks", createRenamer(RenamedCoralFix.RENAMED_IDS)));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema55, "Rename coral items", createRenamer(RenamedCoralFix.RENAMED_IDS)));
         final Schema schema56 = dataFixerBuilder.addSchema(1481, (BiFunction)V1481::new);
         dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema56, "Add conduit", References.BLOCK_ENTITY));
         final Schema schema57 = dataFixerBuilder.addSchema(1483, (BiFunction)V1483::new);
         dataFixerBuilder.addFixer((DataFix)new EntityPufferfishRenameFix(schema57, true));
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema57, "Rename pufferfish egg item", string -> EntityPufferfishRenameFix.RENAMED_IDS.getOrDefault(string, string)));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema57, "Rename pufferfish egg item", createRenamer(EntityPufferfishRenameFix.RENAMED_IDS)));
         final Schema schema58 = dataFixerBuilder.addSchema(1484, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema58, "Rename seagrass items", string -> ImmutableMap.<String, String>of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass").getOrDefault(string, string)));
-        dataFixerBuilder.addFixer(BlockRenameFix.create(schema58, "Rename seagrass blocks", string -> ImmutableMap.<String, String>of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass").getOrDefault(string, string)));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema58, "Rename seagrass items", createRenamer(ImmutableMap.<String, String>of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass"))));
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema58, "Rename seagrass blocks", createRenamer(ImmutableMap.<String, String>of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass"))));
         dataFixerBuilder.addFixer((DataFix)new HeightmapRenamingFix(schema58, false));
         final Schema schema59 = dataFixerBuilder.addSchema(1486, (BiFunction)V1486::new);
         dataFixerBuilder.addFixer((DataFix)new EntityCodSalmonFix(schema59, true));
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema59, "Rename cod/salmon egg items", string -> EntityCodSalmonFix.RENAMED_EGG_IDS.getOrDefault(string, string)));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema59, "Rename cod/salmon egg items", createRenamer(EntityCodSalmonFix.RENAMED_EGG_IDS)));
         final Schema schema60 = dataFixerBuilder.addSchema(1487, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema60, "Rename prismarine_brick(s)_* blocks", string -> ImmutableMap.<String, String>of("minecraft:prismarine_bricks_slab", "minecraft:prismarine_brick_slab", "minecraft:prismarine_bricks_stairs", "minecraft:prismarine_brick_stairs").getOrDefault(string, string)));
-        dataFixerBuilder.addFixer(BlockRenameFix.create(schema60, "Rename prismarine_brick(s)_* items", string -> ImmutableMap.<String, String>of("minecraft:prismarine_bricks_slab", "minecraft:prismarine_brick_slab", "minecraft:prismarine_bricks_stairs", "minecraft:prismarine_brick_stairs").getOrDefault(string, string)));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema60, "Rename prismarine_brick(s)_* blocks", createRenamer(ImmutableMap.<String, String>of("minecraft:prismarine_bricks_slab", "minecraft:prismarine_brick_slab", "minecraft:prismarine_bricks_stairs", "minecraft:prismarine_brick_stairs"))));
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema60, "Rename prismarine_brick(s)_* items", createRenamer(ImmutableMap.<String, String>of("minecraft:prismarine_bricks_slab", "minecraft:prismarine_brick_slab", "minecraft:prismarine_bricks_stairs", "minecraft:prismarine_brick_stairs"))));
         final Schema schema61 = dataFixerBuilder.addSchema(1488, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer(BlockRenameFix.create(schema61, "Rename kelp/kelptop", string -> ImmutableMap.<String, String>of("minecraft:kelp_top", "minecraft:kelp", "minecraft:kelp", "minecraft:kelp_plant").getOrDefault(string, string)));
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema61, "Rename kelptop", string -> Objects.equals(string, "minecraft:kelp_top") ? "minecraft:kelp" : string));
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema61, "Rename kelp/kelptop", createRenamer(ImmutableMap.<String, String>of("minecraft:kelp_top", "minecraft:kelp", "minecraft:kelp", "minecraft:kelp_plant"))));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema61, "Rename kelptop", createRenamer("minecraft:kelp_top", "minecraft:kelp")));
         dataFixerBuilder.addFixer((DataFix)new NamedEntityFix(schema61, false, "Command block block entity custom name fix", References.BLOCK_ENTITY, "minecraft:command_block") {
             @Override
             protected Typed<?> fix(final Typed<?> typed) {
@@ -331,8 +366,8 @@ public class DataFixers {
         });
         dataFixerBuilder.addFixer((DataFix)new IglooMetadataRemovalFix(schema61, false));
         final Schema schema62 = dataFixerBuilder.addSchema(1490, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer(BlockRenameFix.create(schema62, "Rename melon_block", string -> Objects.equals(string, "minecraft:melon_block") ? "minecraft:melon" : string));
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema62, "Rename melon_block/melon/speckled_melon", string -> ImmutableMap.<String, String>of("minecraft:melon_block", "minecraft:melon", "minecraft:melon", "minecraft:melon_slice", "minecraft:speckled_melon", "minecraft:glistering_melon_slice").getOrDefault(string, string)));
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema62, "Rename melon_block", createRenamer("minecraft:melon_block", "minecraft:melon")));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema62, "Rename melon_block/melon/speckled_melon", createRenamer(ImmutableMap.<String, String>of("minecraft:melon_block", "minecraft:melon", "minecraft:melon", "minecraft:melon_slice", "minecraft:speckled_melon", "minecraft:glistering_melon_slice"))));
         final Schema schema63 = dataFixerBuilder.addSchema(1492, (BiFunction)DataFixers.SAME_NAMESPACED);
         dataFixerBuilder.addFixer((DataFix)new ChunkStructuresTemplateRenameFix(schema63, false));
         final Schema schema64 = dataFixerBuilder.addSchema(1494, (BiFunction)DataFixers.SAME_NAMESPACED);
@@ -347,88 +382,155 @@ public class DataFixers {
         dataFixerBuilder.addFixer((DataFix)new RecipesFix(schema68, false));
         final Schema schema69 = dataFixerBuilder.addSchema(1506, (BiFunction)DataFixers.SAME_NAMESPACED);
         dataFixerBuilder.addFixer((DataFix)new LevelDataGeneratorOptionsFix(schema69, false));
-        final Schema schema70 = dataFixerBuilder.addSchema(1508, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new BiomeFix(schema70, false));
-        final Schema schema71 = dataFixerBuilder.addSchema(1510, (BiFunction)V1510::new);
-        dataFixerBuilder.addFixer(BlockRenameFix.create(schema71, "Block renamening fix", string -> EntityTheRenameningFix.RENAMED_BLOCKS.getOrDefault(string, string)));
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema71, "Item renamening fix", string -> EntityTheRenameningFix.RENAMED_ITEMS.getOrDefault(string, string)));
-        dataFixerBuilder.addFixer((DataFix)new RecipesRenameningFix(schema71, false));
-        dataFixerBuilder.addFixer((DataFix)new EntityTheRenameningFix(schema71, true));
-        dataFixerBuilder.addFixer((DataFix)new SwimStatsRenameFix(schema71, false));
-        final Schema schema72 = dataFixerBuilder.addSchema(1514, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new ObjectiveDisplayNameFix(schema72, false));
-        dataFixerBuilder.addFixer((DataFix)new TeamDisplayNameFix(schema72, false));
-        dataFixerBuilder.addFixer((DataFix)new ObjectiveRenderTypeFix(schema72, false));
-        final Schema schema73 = dataFixerBuilder.addSchema(1515, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer(BlockRenameFix.create(schema73, "Rename coral fan blocks", string -> RenamedCoralFansFix.RENAMED_IDS.getOrDefault(string, string)));
-        final Schema schema74 = dataFixerBuilder.addSchema(1624, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new TrappedChestBlockEntityFix(schema74, false));
-        final Schema schema75 = dataFixerBuilder.addSchema(1800, (BiFunction)V1800::new);
-        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema75, "Added 1.14 mobs fix", References.ENTITY));
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema75, "Rename dye items", string -> DyeItemRenameFix.RENAMED_IDS.getOrDefault(string, string)));
-        final Schema schema76 = dataFixerBuilder.addSchema(1801, (BiFunction)V1801::new);
-        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema76, "Added Illager Beast", References.ENTITY));
-        final Schema schema77 = dataFixerBuilder.addSchema(1802, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer(BlockRenameFix.create(schema77, "Rename sign blocks & stone slabs", string -> ImmutableMap.<String, String>of("minecraft:stone_slab", "minecraft:smooth_stone_slab", "minecraft:sign", "minecraft:oak_sign", "minecraft:wall_sign", "minecraft:oak_wall_sign").getOrDefault(string, string)));
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema77, "Rename sign item & stone slabs", string -> ImmutableMap.<String, String>of("minecraft:stone_slab", "minecraft:smooth_stone_slab", "minecraft:sign", "minecraft:oak_sign").getOrDefault(string, string)));
-        final Schema schema78 = dataFixerBuilder.addSchema(1803, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new ItemLoreFix(schema78, false));
-        final Schema schema79 = dataFixerBuilder.addSchema(1904, (BiFunction)V1904::new);
-        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema79, "Added Cats", References.ENTITY));
-        dataFixerBuilder.addFixer((DataFix)new EntityCatSplitFix(schema79, false));
-        final Schema schema80 = dataFixerBuilder.addSchema(1905, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new ChunkStatusFix(schema80, false));
-        final Schema schema81 = dataFixerBuilder.addSchema(1906, (BiFunction)V1906::new);
-        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema81, "Add POI Blocks", References.BLOCK_ENTITY));
-        final Schema schema82 = dataFixerBuilder.addSchema(1909, (BiFunction)V1909::new);
-        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema82, "Add jigsaw", References.BLOCK_ENTITY));
-        final Schema schema83 = dataFixerBuilder.addSchema(1911, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new ChunkStatusFix2(schema83, false));
-        final Schema schema84 = dataFixerBuilder.addSchema(1917, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new CatTypeFix(schema84, false));
-        final Schema schema85 = dataFixerBuilder.addSchema(1918, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new VillagerDataFix(schema85, "minecraft:villager"));
-        dataFixerBuilder.addFixer((DataFix)new VillagerDataFix(schema85, "minecraft:zombie_villager"));
-        final Schema schema86 = dataFixerBuilder.addSchema(1920, (BiFunction)V1920::new);
-        dataFixerBuilder.addFixer((DataFix)new NewVillageFix(schema86, false));
-        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema86, "Add campfire", References.BLOCK_ENTITY));
-        final Schema schema87 = dataFixerBuilder.addSchema(1925, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new MapIdFix(schema87, false));
-        final Schema schema88 = dataFixerBuilder.addSchema(1928, (BiFunction)V1928::new);
-        dataFixerBuilder.addFixer((DataFix)new EntityRavagerRenameFix(schema88, true));
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema88, "Rename ravager egg item", string -> EntityRavagerRenameFix.RENAMED_IDS.getOrDefault(string, string)));
-        final Schema schema89 = dataFixerBuilder.addSchema(1929, (BiFunction)V1929::new);
-        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema89, "Add Wandering Trader and Trader Llama", References.ENTITY));
-        final Schema schema90 = dataFixerBuilder.addSchema(1931, (BiFunction)V1931::new);
-        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema90, "Added Fox", References.ENTITY));
-        final Schema schema91 = dataFixerBuilder.addSchema(1936, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new OptionsAddTextBackgroundFix(schema91, false));
-        final Schema schema92 = dataFixerBuilder.addSchema(1946, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new ReorganizePoi(schema92, false));
-        final Schema schema93 = dataFixerBuilder.addSchema(1948, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new OminousBannerRenameFix(schema93, false));
-        final Schema schema94 = dataFixerBuilder.addSchema(1953, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new OminousBannerBlockEntityRenameFix(schema94, false));
-        final Schema schema95 = dataFixerBuilder.addSchema(1955, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new VillagerRebuildLevelAndXpFix(schema95, false));
-        dataFixerBuilder.addFixer((DataFix)new ZombieVillagerRebuildXpFix(schema95, false));
-        final Schema schema96 = dataFixerBuilder.addSchema(1961, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new ChunkLightRemoveFix(schema96, false));
-        final Schema schema97 = dataFixerBuilder.addSchema(2100, (BiFunction)V2100::new);
-        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema97, "Added Bee and Bee Stinger", References.ENTITY));
-        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema97, "Add beehive", References.BLOCK_ENTITY));
-        dataFixerBuilder.addFixer((DataFix)new RecipesRenameFix(schema97, false, "Rename sugar recipe", string -> "minecraft:sugar".equals(string) ? "sugar_from_sugar_cane" : string));
-        dataFixerBuilder.addFixer((DataFix)new AdvancementsRenameFix(schema97, false, "Rename sugar recipe advancement", string -> "minecraft:recipes/misc/sugar".equals(string) ? "minecraft:recipes/misc/sugar_from_sugar_cane" : string));
-        final Schema schema98 = dataFixerBuilder.addSchema(2202, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new ChunkBiomeFix(schema98, false));
-        final Schema schema99 = dataFixerBuilder.addSchema(2209, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer(ItemRenameFix.create(schema99, "Rename bee_hive item to beehive", string -> Objects.equals(string, "minecraft:bee_hive") ? "minecraft:beehive" : string));
-        dataFixerBuilder.addFixer((DataFix)new BeehivePoiRenameFix(schema99));
-        dataFixerBuilder.addFixer(BlockRenameFix.create(schema99, "Rename bee_hive block to beehive", string -> ImmutableMap.<String, String>of("minecraft:bee_hive", "minecraft:beehive").getOrDefault(string, string)));
-        final Schema schema100 = dataFixerBuilder.addSchema(2211, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new StructureReferenceCountFix(schema100, false));
-        final Schema schema101 = dataFixerBuilder.addSchema(2218, (BiFunction)DataFixers.SAME_NAMESPACED);
-        dataFixerBuilder.addFixer((DataFix)new ForcePoiRebuild(schema101, false));
+        final Schema schema70 = dataFixerBuilder.addSchema(1510, (BiFunction)V1510::new);
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema70, "Block renamening fix", createRenamer(EntityTheRenameningFix.RENAMED_BLOCKS)));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema70, "Item renamening fix", createRenamer(EntityTheRenameningFix.RENAMED_ITEMS)));
+        dataFixerBuilder.addFixer((DataFix)new RecipesRenameningFix(schema70, false));
+        dataFixerBuilder.addFixer((DataFix)new EntityTheRenameningFix(schema70, true));
+        dataFixerBuilder.addFixer((DataFix)new SwimStatsRenameFix(schema70, false));
+        final Schema schema71 = dataFixerBuilder.addSchema(1514, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new ObjectiveDisplayNameFix(schema71, false));
+        dataFixerBuilder.addFixer((DataFix)new TeamDisplayNameFix(schema71, false));
+        dataFixerBuilder.addFixer((DataFix)new ObjectiveRenderTypeFix(schema71, false));
+        final Schema schema72 = dataFixerBuilder.addSchema(1515, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema72, "Rename coral fan blocks", createRenamer(RenamedCoralFansFix.RENAMED_IDS)));
+        final Schema schema73 = dataFixerBuilder.addSchema(1624, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new TrappedChestBlockEntityFix(schema73, false));
+        final Schema schema74 = dataFixerBuilder.addSchema(1800, (BiFunction)V1800::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema74, "Added 1.14 mobs fix", References.ENTITY));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema74, "Rename dye items", createRenamer(DyeItemRenameFix.RENAMED_IDS)));
+        final Schema schema75 = dataFixerBuilder.addSchema(1801, (BiFunction)V1801::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema75, "Added Illager Beast", References.ENTITY));
+        final Schema schema76 = dataFixerBuilder.addSchema(1802, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema76, "Rename sign blocks & stone slabs", createRenamer(ImmutableMap.<String, String>of("minecraft:stone_slab", "minecraft:smooth_stone_slab", "minecraft:sign", "minecraft:oak_sign", "minecraft:wall_sign", "minecraft:oak_wall_sign"))));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema76, "Rename sign item & stone slabs", createRenamer(ImmutableMap.<String, String>of("minecraft:stone_slab", "minecraft:smooth_stone_slab", "minecraft:sign", "minecraft:oak_sign"))));
+        final Schema schema77 = dataFixerBuilder.addSchema(1803, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new ItemLoreFix(schema77, false));
+        final Schema schema78 = dataFixerBuilder.addSchema(1904, (BiFunction)V1904::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema78, "Added Cats", References.ENTITY));
+        dataFixerBuilder.addFixer((DataFix)new EntityCatSplitFix(schema78, false));
+        final Schema schema79 = dataFixerBuilder.addSchema(1905, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new ChunkStatusFix(schema79, false));
+        final Schema schema80 = dataFixerBuilder.addSchema(1906, (BiFunction)V1906::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema80, "Add POI Blocks", References.BLOCK_ENTITY));
+        final Schema schema81 = dataFixerBuilder.addSchema(1909, (BiFunction)V1909::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema81, "Add jigsaw", References.BLOCK_ENTITY));
+        final Schema schema82 = dataFixerBuilder.addSchema(1911, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new ChunkStatusFix2(schema82, false));
+        final Schema schema83 = dataFixerBuilder.addSchema(1917, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new CatTypeFix(schema83, false));
+        final Schema schema84 = dataFixerBuilder.addSchema(1918, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new VillagerDataFix(schema84, "minecraft:villager"));
+        dataFixerBuilder.addFixer((DataFix)new VillagerDataFix(schema84, "minecraft:zombie_villager"));
+        final Schema schema85 = dataFixerBuilder.addSchema(1920, (BiFunction)V1920::new);
+        dataFixerBuilder.addFixer((DataFix)new NewVillageFix(schema85, false));
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema85, "Add campfire", References.BLOCK_ENTITY));
+        final Schema schema86 = dataFixerBuilder.addSchema(1925, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new MapIdFix(schema86, false));
+        final Schema schema87 = dataFixerBuilder.addSchema(1928, (BiFunction)V1928::new);
+        dataFixerBuilder.addFixer((DataFix)new EntityRavagerRenameFix(schema87, true));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema87, "Rename ravager egg item", createRenamer(EntityRavagerRenameFix.RENAMED_IDS)));
+        final Schema schema88 = dataFixerBuilder.addSchema(1929, (BiFunction)V1929::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema88, "Add Wandering Trader and Trader Llama", References.ENTITY));
+        final Schema schema89 = dataFixerBuilder.addSchema(1931, (BiFunction)V1931::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema89, "Added Fox", References.ENTITY));
+        final Schema schema90 = dataFixerBuilder.addSchema(1936, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new OptionsAddTextBackgroundFix(schema90, false));
+        final Schema schema91 = dataFixerBuilder.addSchema(1946, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new ReorganizePoi(schema91, false));
+        final Schema schema92 = dataFixerBuilder.addSchema(1948, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new OminousBannerRenameFix(schema92, false));
+        final Schema schema93 = dataFixerBuilder.addSchema(1953, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new OminousBannerBlockEntityRenameFix(schema93, false));
+        final Schema schema94 = dataFixerBuilder.addSchema(1955, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new VillagerRebuildLevelAndXpFix(schema94, false));
+        dataFixerBuilder.addFixer((DataFix)new ZombieVillagerRebuildXpFix(schema94, false));
+        final Schema schema95 = dataFixerBuilder.addSchema(1961, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new ChunkLightRemoveFix(schema95, false));
+        final Schema schema96 = dataFixerBuilder.addSchema(2100, (BiFunction)V2100::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema96, "Added Bee and Bee Stinger", References.ENTITY));
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema96, "Add beehive", References.BLOCK_ENTITY));
+        dataFixerBuilder.addFixer((DataFix)new RecipesRenameFix(schema96, false, "Rename sugar recipe", createRenamer("minecraft:sugar", "sugar_from_sugar_cane")));
+        dataFixerBuilder.addFixer((DataFix)new AdvancementsRenameFix(schema96, false, "Rename sugar recipe advancement", createRenamer("minecraft:recipes/misc/sugar", "minecraft:recipes/misc/sugar_from_sugar_cane")));
+        final Schema schema97 = dataFixerBuilder.addSchema(2202, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new ChunkBiomeFix(schema97, false));
+        final Schema schema98 = dataFixerBuilder.addSchema(2209, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema98, "Rename bee_hive item to beehive", createRenamer("minecraft:bee_hive", "minecraft:beehive")));
+        dataFixerBuilder.addFixer((DataFix)new BeehivePoiRenameFix(schema98));
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema98, "Rename bee_hive block to beehive", createRenamer("minecraft:bee_hive", "minecraft:beehive")));
+        final Schema schema99 = dataFixerBuilder.addSchema(2211, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new StructureReferenceCountFix(schema99, false));
+        final Schema schema100 = dataFixerBuilder.addSchema(2218, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new ForcePoiRebuild(schema100, false));
+        final Schema schema101 = dataFixerBuilder.addSchema(2501, (BiFunction)V2501::new);
+        dataFixerBuilder.addFixer((DataFix)new FurnaceRecipeFix(schema101, true));
+        final Schema schema102 = dataFixerBuilder.addSchema(2502, (BiFunction)V2502::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema102, "Added Hoglin", References.ENTITY));
+        final Schema schema103 = dataFixerBuilder.addSchema(2503, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new WallPropertyFix(schema103, false));
+        dataFixerBuilder.addFixer((DataFix)new AdvancementsRenameFix(schema103, false, "Composter category change", createRenamer("minecraft:recipes/misc/composter", "minecraft:recipes/decorations/composter")));
+        final Schema schema104 = dataFixerBuilder.addSchema(2505, (BiFunction)V2505::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema104, "Added Piglin", References.ENTITY));
+        dataFixerBuilder.addFixer((DataFix)new MemoryExpiryDataFix(schema104, "minecraft:villager"));
+        final Schema schema105 = dataFixerBuilder.addSchema(2508, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema105, "Renamed fungi items to fungus", createRenamer(ImmutableMap.<String, String>of("minecraft:warped_fungi", "minecraft:warped_fungus", "minecraft:crimson_fungi", "minecraft:crimson_fungus"))));
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema105, "Renamed fungi blocks to fungus", createRenamer(ImmutableMap.<String, String>of("minecraft:warped_fungi", "minecraft:warped_fungus", "minecraft:crimson_fungi", "minecraft:crimson_fungus"))));
+        final Schema schema106 = dataFixerBuilder.addSchema(2509, (BiFunction)V2509::new);
+        dataFixerBuilder.addFixer((DataFix)new EntityZombifiedPiglinRenameFix(schema106));
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema106, "Rename zombie pigman egg item", createRenamer(EntityZombifiedPiglinRenameFix.RENAMED_IDS)));
+        final Schema schema107 = dataFixerBuilder.addSchema(2511, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new EntityProjectileOwnerFix(schema107));
+        final Schema schema108 = dataFixerBuilder.addSchema(2514, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new EntityUUIDFix(schema108));
+        dataFixerBuilder.addFixer((DataFix)new BlockEntityUUIDFix(schema108));
+        dataFixerBuilder.addFixer((DataFix)new PlayerUUIDFix(schema108));
+        dataFixerBuilder.addFixer((DataFix)new LevelUUIDFix(schema108));
+        dataFixerBuilder.addFixer((DataFix)new SavedDataUUIDFix(schema108));
+        dataFixerBuilder.addFixer((DataFix)new ItemStackUUIDFix(schema108));
+        final Schema schema109 = dataFixerBuilder.addSchema(2516, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new GossipUUIDFix(schema109, "minecraft:villager"));
+        dataFixerBuilder.addFixer((DataFix)new GossipUUIDFix(schema109, "minecraft:zombie_villager"));
+        final Schema schema110 = dataFixerBuilder.addSchema(2518, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new JigsawPropertiesFix(schema110, false));
+        dataFixerBuilder.addFixer((DataFix)new JigsawRotationFix(schema110, false));
+        final Schema schema111 = dataFixerBuilder.addSchema(2519, (BiFunction)V2519::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema111, "Added Strider", References.ENTITY));
+        final Schema schema112 = dataFixerBuilder.addSchema(2522, (BiFunction)V2522::new);
+        dataFixerBuilder.addFixer((DataFix)new AddNewChoices(schema112, "Added Zoglin", References.ENTITY));
+        final Schema schema113 = dataFixerBuilder.addSchema(2523, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new AttributesRename(schema113));
+        final Schema schema114 = dataFixerBuilder.addSchema(2527, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new BitStorageAlignFix(schema114));
+        final Schema schema115 = dataFixerBuilder.addSchema(2528, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer(ItemRenameFix.create(schema115, "Rename soul fire torch and soul fire lantern", createRenamer(ImmutableMap.<String, String>of("minecraft:soul_fire_torch", "minecraft:soul_torch", "minecraft:soul_fire_lantern", "minecraft:soul_lantern"))));
+        dataFixerBuilder.addFixer(BlockRenameFix.create(schema115, "Rename soul fire torch and soul fire lantern", createRenamer(ImmutableMap.<String, String>of("minecraft:soul_fire_torch", "minecraft:soul_torch", "minecraft:soul_fire_wall_torch", "minecraft:soul_wall_torch", "minecraft:soul_fire_lantern", "minecraft:soul_lantern"))));
+        final Schema schema116 = dataFixerBuilder.addSchema(2529, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new StriderGravityFix(schema116, false));
+        final Schema schema117 = dataFixerBuilder.addSchema(2531, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new RedstoneWireConnectionsFix(schema117));
+        final Schema schema118 = dataFixerBuilder.addSchema(2533, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new VillagerFollowRangeFix(schema118));
+        final Schema schema119 = dataFixerBuilder.addSchema(2535, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new EntityShulkerRotationFix(schema119));
+        final Schema schema120 = dataFixerBuilder.addSchema(2550, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new WorldGenSettingsFix(schema120));
+        final Schema schema121 = dataFixerBuilder.addSchema(2551, (BiFunction)V2551::new);
+        dataFixerBuilder.addFixer((DataFix)new WriteAndReadFix(schema121, "add types to WorldGenData", References.WORLD_GEN_SETTINGS));
+        final Schema schema122 = dataFixerBuilder.addSchema(2552, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new RenameBiomesFix(schema122, false, "Nether biome rename", ImmutableMap.<String, String>of("minecraft:nether", "minecraft:nether_wastes")));
+        final Schema schema123 = dataFixerBuilder.addSchema(2553, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new BiomeFix(schema123, false));
+        final Schema schema124 = dataFixerBuilder.addSchema(2558, (BiFunction)DataFixers.SAME_NAMESPACED);
+        dataFixerBuilder.addFixer((DataFix)new MissingDimensionFix(schema124, false));
+        dataFixerBuilder.addFixer((DataFix)new OptionsRenameFieldFix(schema124, false, "Rename swapHands setting", "key_key.swapHands", "key_key.swapOffhand"));
+    }
+    
+    private static UnaryOperator<String> createRenamer(final Map<String, String> map) {
+        return (UnaryOperator<String>)(string -> map.getOrDefault(string, string));
+    }
+    
+    private static UnaryOperator<String> createRenamer(final String string1, final String string2) {
+        return (UnaryOperator<String>)(string3 -> Objects.equals(string3, string1) ? string2 : string3);
     }
     
     static {
diff --git a/src/net/minecraft/util/datafix/PackedBitStorage.java b/src/net/minecraft/util/datafix/PackedBitStorage.java
new file mode 100644
index 0000000..c64772e
--- /dev/null
+++ b/src/net/minecraft/util/datafix/PackedBitStorage.java
@@ -0,0 +1,63 @@
+package net.minecraft.util.datafix;
+
+import org.apache.commons.lang3.Validate;
+import net.minecraft.util.Mth;
+
+public class PackedBitStorage {
+    private final long[] data;
+    private final int bits;
+    private final long mask;
+    private final int size;
+    
+    public PackedBitStorage(final int integer1, final int integer2) {
+        this(integer1, integer2, new long[Mth.roundUp(integer2 * integer1, 64) / 64]);
+    }
+    
+    public PackedBitStorage(final int integer1, final int integer2, final long[] arr) {
+        Validate.inclusiveBetween(1L, 32L, (long)integer1);
+        this.size = integer2;
+        this.bits = integer1;
+        this.data = arr;
+        this.mask = (1L << integer1) - 1L;
+        final int integer3 = Mth.roundUp(integer2 * integer1, 64) / 64;
+        if (arr.length != integer3) {
+            throw new IllegalArgumentException("Invalid length given for storage, got: " + arr.length + " but expected: " + integer3);
+        }
+    }
+    
+    public void set(final int integer1, final int integer2) {
+        Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)integer1);
+        Validate.inclusiveBetween(0L, this.mask, (long)integer2);
+        final int integer3 = integer1 * this.bits;
+        final int integer4 = integer3 >> 6;
+        final int integer5 = (integer1 + 1) * this.bits - 1 >> 6;
+        final int integer6 = integer3 ^ integer4 << 6;
+        this.data[integer4] = ((this.data[integer4] & ~(this.mask << integer6)) | ((long)integer2 & this.mask) << integer6);
+        if (integer4 != integer5) {
+            final int integer7 = 64 - integer6;
+            final int integer8 = this.bits - integer7;
+            this.data[integer5] = (this.data[integer5] >>> integer8 << integer8 | ((long)integer2 & this.mask) >> integer7);
+        }
+    }
+    
+    public int get(final int integer) {
+        Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)integer);
+        final int integer2 = integer * this.bits;
+        final int integer3 = integer2 >> 6;
+        final int integer4 = (integer + 1) * this.bits - 1 >> 6;
+        final int integer5 = integer2 ^ integer3 << 6;
+        if (integer3 == integer4) {
+            return (int)(this.data[integer3] >>> integer5 & this.mask);
+        }
+        final int integer6 = 64 - integer5;
+        return (int)((this.data[integer3] >>> integer5 | this.data[integer4] << integer6) & this.mask);
+    }
+    
+    public long[] getRaw() {
+        return this.data;
+    }
+    
+    public int getBits() {
+        return this.bits;
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/AbstractUUIDFix.java b/src/net/minecraft/util/datafix/fixes/AbstractUUIDFix.java
new file mode 100644
index 0000000..c0a1551
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/AbstractUUIDFix.java
@@ -0,0 +1,81 @@
+package net.minecraft.util.datafix.fixes;
+
+import org.apache.logging.log4j.LogManager;
+import java.util.Arrays;
+import java.util.UUID;
+import java.util.Optional;
+import com.mojang.datafixers.types.Type;
+import com.mojang.serialization.Dynamic;
+import java.util.function.Function;
+import com.mojang.datafixers.Typed;
+import com.mojang.datafixers.schemas.Schema;
+import com.mojang.datafixers.DSL;
+import org.apache.logging.log4j.Logger;
+import com.mojang.datafixers.DataFix;
+
+public abstract class AbstractUUIDFix extends DataFix {
+    protected static final Logger LOGGER;
+    protected DSL.TypeReference typeReference;
+    
+    public AbstractUUIDFix(final Schema schema, final DSL.TypeReference typeReference) {
+        super(schema, false);
+        this.typeReference = typeReference;
+    }
+    
+    protected Typed<?> updateNamedChoice(final Typed<?> typed, final String string, final Function<Dynamic<?>, Dynamic<?>> function) {
+        final Type<?> type5 = this.getInputSchema().getChoiceType(this.typeReference, string);
+        final Type<?> type6 = this.getOutputSchema().getChoiceType(this.typeReference, string);
+        return typed.updateTyped(DSL.namedChoice(string, (Type)type5), (Type)type6, typed -> typed.update(DSL.remainderFinder(), (Function)function));
+    }
+    
+    protected static Optional<Dynamic<?>> replaceUUIDString(final Dynamic<?> dynamic, final String string2, final String string3) {
+        return createUUIDFromString(dynamic, string2).<Dynamic<?>>map(dynamic4 -> dynamic.remove(string2).set(string3, dynamic4));
+    }
+    
+    protected static Optional<Dynamic<?>> replaceUUIDMLTag(final Dynamic<?> dynamic, final String string2, final String string3) {
+        return dynamic.get(string2).result().flatMap(AbstractUUIDFix::createUUIDFromML).<Dynamic<?>>map(dynamic4 -> dynamic.remove(string2).set(string3, dynamic4));
+    }
+    
+    protected static Optional<Dynamic<?>> replaceUUIDLeastMost(final Dynamic<?> dynamic, final String string2, final String string3) {
+        final String string4 = string2 + "Most";
+        final String string5 = string2 + "Least";
+        return createUUIDFromLongs(dynamic, string4, string5).<Dynamic<?>>map(dynamic5 -> dynamic.remove(string4).remove(string5).set(string3, dynamic5));
+    }
+    
+    protected static Optional<Dynamic<?>> createUUIDFromString(final Dynamic<?> dynamic, final String string) {
+        final String string2;
+        UUID uUID4;
+        return dynamic.get(string).result().<Dynamic<?>>flatMap(dynamic2 -> {
+            string2 = dynamic2.asString((String)null);
+            if (string2 != null) {
+                try {
+                    uUID4 = UUID.fromString(string2);
+                    return createUUIDTag(dynamic, uUID4.getMostSignificantBits(), uUID4.getLeastSignificantBits());
+                }
+                catch (IllegalArgumentException ex) {}
+            }
+            return Optional.<Dynamic<?>>empty();
+        });
+    }
+    
+    protected static Optional<Dynamic<?>> createUUIDFromML(final Dynamic<?> dynamic) {
+        return createUUIDFromLongs(dynamic, "M", "L");
+    }
+    
+    protected static Optional<Dynamic<?>> createUUIDFromLongs(final Dynamic<?> dynamic, final String string2, final String string3) {
+        final long long4 = dynamic.get(string2).asLong(0L);
+        final long long5 = dynamic.get(string3).asLong(0L);
+        if (long4 == 0L || long5 == 0L) {
+            return Optional.<Dynamic<?>>empty();
+        }
+        return createUUIDTag(dynamic, long4, long5);
+    }
+    
+    protected static Optional<Dynamic<?>> createUUIDTag(final Dynamic<?> dynamic, final long long2, final long long3) {
+        return Optional.<Dynamic<?>>of(dynamic.createIntList(Arrays.stream(new int[] { (int)(long2 >> 32), (int)long2, (int)(long3 >> 32), (int)long3 })));
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/AddNewChoices.java b/src/net/minecraft/util/datafix/fixes/AddNewChoices.java
index 0e1246e..c36abf2 100644
--- a/src/net/minecraft/util/datafix/fixes/AddNewChoices.java
+++ b/src/net/minecraft/util/datafix/fixes/AddNewChoices.java
@@ -2,7 +2,7 @@ package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.util.Pair;
 import java.util.function.Function;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.types.templates.TaggedChoice;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
diff --git a/src/net/minecraft/util/datafix/fixes/AdvancementsRenameFix.java b/src/net/minecraft/util/datafix/fixes/AdvancementsRenameFix.java
index 9c4ccad..c8f906d 100644
--- a/src/net/minecraft/util/datafix/fixes/AdvancementsRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/AdvancementsRenameFix.java
@@ -2,7 +2,7 @@ package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
diff --git a/src/net/minecraft/util/datafix/fixes/AttributesRename.java b/src/net/minecraft/util/datafix/fixes/AttributesRename.java
new file mode 100644
index 0000000..db4dc2e
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/AttributesRename.java
@@ -0,0 +1,46 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.stream.Stream;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.Typed;
+import java.util.Optional;
+import com.mojang.datafixers.DataFixUtils;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.types.Type;
+import java.util.function.Function;
+import com.mojang.datafixers.OpticFinder;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import java.util.Map;
+import com.mojang.datafixers.DataFix;
+
+public class AttributesRename extends DataFix {
+    private static final Map<String, String> RENAMES;
+    
+    public AttributesRename(final Schema schema) {
+        super(schema, false);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        final Type<?> type2 = this.getInputSchema().getType(References.ITEM_STACK);
+        final OpticFinder<?> opticFinder3 = type2.findField("tag");
+        return TypeRewriteRule.seq(this.fixTypeEverywhereTyped("Rename ItemStack Attributes", (Type)type2, typed -> typed.updateTyped((OpticFinder)opticFinder3, (Function)AttributesRename::fixItemStackTag)), new TypeRewriteRule[] { this.fixTypeEverywhereTyped("Rename Entity Attributes", this.getInputSchema().getType(References.ENTITY), (Function)AttributesRename::fixEntity), this.fixTypeEverywhereTyped("Rename Player Attributes", this.getInputSchema().getType(References.PLAYER), (Function)AttributesRename::fixEntity) });
+    }
+    
+    private static Dynamic<?> fixName(final Dynamic<?> dynamic) {
+        return DataFixUtils.orElse((Optional)dynamic.asString().result().map(string -> AttributesRename.RENAMES.getOrDefault(string, string)).map(dynamic::createString), dynamic);
+    }
+    
+    private static Typed<?> fixItemStackTag(final Typed<?> typed) {
+        return typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("AttributeModifiers", dynamic -> (Dynamic)DataFixUtils.orElse((Optional)((Dynamic)dynamic).asStreamOpt().result().map(stream -> stream.map(dynamic -> dynamic.update("AttributeName", (Function)AttributesRename::fixName))).map(dynamic::createList), dynamic)));
+    }
+    
+    private static Typed<?> fixEntity(final Typed<?> typed) {
+        return typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("Attributes", dynamic -> (Dynamic)DataFixUtils.orElse((Optional)((Dynamic)dynamic).asStreamOpt().result().map(stream -> stream.map(dynamic -> dynamic.update("Name", (Function)AttributesRename::fixName))).map(dynamic::createList), dynamic)));
+    }
+    
+    static {
+        RENAMES = ImmutableMap.<String, String>builder().put("generic.maxHealth", "generic.max_health").put("Max Health", "generic.max_health").put("zombie.spawnReinforcements", "zombie.spawn_reinforcements").put("Spawn Reinforcements Chance", "zombie.spawn_reinforcements").put("horse.jumpStrength", "horse.jump_strength").put("Jump Strength", "horse.jump_strength").put("generic.followRange", "generic.follow_range").put("Follow Range", "generic.follow_range").put("generic.knockbackResistance", "generic.knockback_resistance").put("Knockback Resistance", "generic.knockback_resistance").put("generic.movementSpeed", "generic.movement_speed").put("Movement Speed", "generic.movement_speed").put("generic.flyingSpeed", "generic.flying_speed").put("Flying Speed", "generic.flying_speed").put("generic.attackDamage", "generic.attack_damage").put("generic.attackKnockback", "generic.attack_knockback").put("generic.attackSpeed", "generic.attack_speed").put("generic.armorToughness", "generic.armor_toughness").build();
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/BedBlockEntityInjecter.java b/src/net/minecraft/util/datafix/fixes/BedBlockEntityInjecter.java
index 0bd86b3..cc2f3ce 100644
--- a/src/net/minecraft/util/datafix/fixes/BedBlockEntityInjecter.java
+++ b/src/net/minecraft/util/datafix/fixes/BedBlockEntityInjecter.java
@@ -1,17 +1,16 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import java.util.Iterator;
 import java.util.stream.Stream;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.OpticFinder;
 import java.util.Map;
-import java.util.Optional;
+import com.mojang.datafixers.util.Pair;
 import com.google.common.collect.Maps;
 import java.util.function.Function;
 import com.google.common.collect.Lists;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.types.templates.List;
@@ -84,7 +83,7 @@ public class BedBlockEntityInjecter extends DataFix {
                         map21.put(dynamic3.createString("y"), dynamic3.createInt(integer15 + (integer11 << 4)));
                         map21.put(dynamic3.createString("z"), dynamic3.createInt(integer16 + (integer9 << 4)));
                         map21.put(dynamic3.createString("color"), dynamic3.createShort((short)14));
-                        list9.add(((Optional)type3.read(dynamic3.createMap((Map)map21)).getSecond()).orElseThrow(() -> new IllegalStateException("Could not parse newly created bed block entity.")));
+                        list9.add(((Pair)type3.read(dynamic3.createMap((Map)map21)).result().orElseThrow(() -> new IllegalStateException("Could not parse newly created bed block entity."))).getFirst());
                     }
                     ++integer12;
                 }
diff --git a/src/net/minecraft/util/datafix/fixes/BedItemColorFix.java b/src/net/minecraft/util/datafix/fixes/BedItemColorFix.java
index 295c6c1..db4ada4 100644
--- a/src/net/minecraft/util/datafix/fixes/BedItemColorFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BedItemColorFix.java
@@ -2,11 +2,13 @@ package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.OpticFinder;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -17,7 +19,7 @@ public class BedItemColorFix extends DataFix {
     }
     
     public TypeRewriteRule makeRule() {
-        final OpticFinder<Pair<String, String>> opticFinder2 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder2 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final Optional<Pair<String, String>> optional3;
         Dynamic<?> dynamic4;
         return this.fixTypeEverywhereTyped("BedItemColorFix", this.getInputSchema().getType(References.ITEM_STACK), typed -> {
diff --git a/src/net/minecraft/util/datafix/fixes/BiomeFix.java b/src/net/minecraft/util/datafix/fixes/BiomeFix.java
index 1c6386f..e48f6f9 100644
--- a/src/net/minecraft/util/datafix/fixes/BiomeFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BiomeFix.java
@@ -1,33 +1,17 @@
 package net.minecraft.util.datafix.fixes;
 
 import com.google.common.collect.ImmutableMap;
-import java.util.function.Function;
-import com.mojang.datafixers.types.DynamicOps;
-import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.types.Type;
-import java.util.Objects;
-import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import java.util.Map;
-import com.mojang.datafixers.DataFix;
 
-public class BiomeFix extends DataFix {
+public class BiomeFix extends RenameBiomesFix {
     public static final Map<String, String> BIOMES;
     
     public BiomeFix(final Schema schema, final boolean boolean2) {
-        super(schema, boolean2);
-    }
-    
-    protected TypeRewriteRule makeRule() {
-        final Type<Pair<String, String>> type2 = (Type<Pair<String, String>>)DSL.named(References.BIOME.typeName(), DSL.namespacedString());
-        if (!Objects.equals(type2, this.getInputSchema().getType(References.BIOME))) {
-            throw new IllegalStateException("Biome type is not what was expected.");
-        }
-        return this.fixTypeEverywhere("Biomes fix", (Type)type2, dynamicOps -> pair -> pair.mapSecond(string -> BiomeFix.BIOMES.getOrDefault(string, string)));
+        super(schema, boolean2, "Biomes fix", BiomeFix.BIOMES);
     }
     
     static {
-        BIOMES = ImmutableMap.<String, String>builder().put("minecraft:extreme_hills", "minecraft:mountains").put("minecraft:swampland", "minecraft:swamp").put("minecraft:hell", "minecraft:nether").put("minecraft:sky", "minecraft:the_end").put("minecraft:ice_flats", "minecraft:snowy_tundra").put("minecraft:ice_mountains", "minecraft:snowy_mountains").put("minecraft:mushroom_island", "minecraft:mushroom_fields").put("minecraft:mushroom_island_shore", "minecraft:mushroom_field_shore").put("minecraft:beaches", "minecraft:beach").put("minecraft:forest_hills", "minecraft:wooded_hills").put("minecraft:smaller_extreme_hills", "minecraft:mountain_edge").put("minecraft:stone_beach", "minecraft:stone_shore").put("minecraft:cold_beach", "minecraft:snowy_beach").put("minecraft:roofed_forest", "minecraft:dark_forest").put("minecraft:taiga_cold", "minecraft:snowy_taiga").put("minecraft:taiga_cold_hills", "minecraft:snowy_taiga_hills").put("minecraft:redwood_taiga", "minecraft:giant_tree_taiga").put("minecraft:redwood_taiga_hills", "minecraft:giant_tree_taiga_hills").put("minecraft:extreme_hills_with_trees", "minecraft:wooded_mountains").put("minecraft:savanna_rock", "minecraft:savanna_plateau").put("minecraft:mesa", "minecraft:badlands").put("minecraft:mesa_rock", "minecraft:wooded_badlands_plateau").put("minecraft:mesa_clear_rock", "minecraft:badlands_plateau").put("minecraft:sky_island_low", "minecraft:small_end_islands").put("minecraft:sky_island_medium", "minecraft:end_midlands").put("minecraft:sky_island_high", "minecraft:end_highlands").put("minecraft:sky_island_barren", "minecraft:end_barrens").put("minecraft:void", "minecraft:the_void").put("minecraft:mutated_plains", "minecraft:sunflower_plains").put("minecraft:mutated_desert", "minecraft:desert_lakes").put("minecraft:mutated_extreme_hills", "minecraft:gravelly_mountains").put("minecraft:mutated_forest", "minecraft:flower_forest").put("minecraft:mutated_taiga", "minecraft:taiga_mountains").put("minecraft:mutated_swampland", "minecraft:swamp_hills").put("minecraft:mutated_ice_flats", "minecraft:ice_spikes").put("minecraft:mutated_jungle", "minecraft:modified_jungle").put("minecraft:mutated_jungle_edge", "minecraft:modified_jungle_edge").put("minecraft:mutated_birch_forest", "minecraft:tall_birch_forest").put("minecraft:mutated_birch_forest_hills", "minecraft:tall_birch_hills").put("minecraft:mutated_roofed_forest", "minecraft:dark_forest_hills").put("minecraft:mutated_taiga_cold", "minecraft:snowy_taiga_mountains").put("minecraft:mutated_redwood_taiga", "minecraft:giant_spruce_taiga").put("minecraft:mutated_redwood_taiga_hills", "minecraft:giant_spruce_taiga_hills").put("minecraft:mutated_extreme_hills_with_trees", "minecraft:modified_gravelly_mountains").put("minecraft:mutated_savanna", "minecraft:shattered_savanna").put("minecraft:mutated_savanna_rock", "minecraft:shattered_savanna_plateau").put("minecraft:mutated_mesa", "minecraft:eroded_badlands").put("minecraft:mutated_mesa_rock", "minecraft:modified_wooded_badlands_plateau").put("minecraft:mutated_mesa_clear_rock", "minecraft:modified_badlands_plateau").put("minecraft:warm_deep_ocean", "minecraft:deep_warm_ocean").put("minecraft:lukewarm_deep_ocean", "minecraft:deep_lukewarm_ocean").put("minecraft:cold_deep_ocean", "minecraft:deep_cold_ocean").put("minecraft:frozen_deep_ocean", "minecraft:deep_frozen_ocean").build();
+        BIOMES = ImmutableMap.<String, String>builder().put("minecraft:extreme_hills", "minecraft:mountains").put("minecraft:swampland", "minecraft:swamp").put("minecraft:hell", "minecraft:nether_wastes").put("minecraft:sky", "minecraft:the_end").put("minecraft:ice_flats", "minecraft:snowy_tundra").put("minecraft:ice_mountains", "minecraft:snowy_mountains").put("minecraft:mushroom_island", "minecraft:mushroom_fields").put("minecraft:mushroom_island_shore", "minecraft:mushroom_field_shore").put("minecraft:beaches", "minecraft:beach").put("minecraft:forest_hills", "minecraft:wooded_hills").put("minecraft:smaller_extreme_hills", "minecraft:mountain_edge").put("minecraft:stone_beach", "minecraft:stone_shore").put("minecraft:cold_beach", "minecraft:snowy_beach").put("minecraft:roofed_forest", "minecraft:dark_forest").put("minecraft:taiga_cold", "minecraft:snowy_taiga").put("minecraft:taiga_cold_hills", "minecraft:snowy_taiga_hills").put("minecraft:redwood_taiga", "minecraft:giant_tree_taiga").put("minecraft:redwood_taiga_hills", "minecraft:giant_tree_taiga_hills").put("minecraft:extreme_hills_with_trees", "minecraft:wooded_mountains").put("minecraft:savanna_rock", "minecraft:savanna_plateau").put("minecraft:mesa", "minecraft:badlands").put("minecraft:mesa_rock", "minecraft:wooded_badlands_plateau").put("minecraft:mesa_clear_rock", "minecraft:badlands_plateau").put("minecraft:sky_island_low", "minecraft:small_end_islands").put("minecraft:sky_island_medium", "minecraft:end_midlands").put("minecraft:sky_island_high", "minecraft:end_highlands").put("minecraft:sky_island_barren", "minecraft:end_barrens").put("minecraft:void", "minecraft:the_void").put("minecraft:mutated_plains", "minecraft:sunflower_plains").put("minecraft:mutated_desert", "minecraft:desert_lakes").put("minecraft:mutated_extreme_hills", "minecraft:gravelly_mountains").put("minecraft:mutated_forest", "minecraft:flower_forest").put("minecraft:mutated_taiga", "minecraft:taiga_mountains").put("minecraft:mutated_swampland", "minecraft:swamp_hills").put("minecraft:mutated_ice_flats", "minecraft:ice_spikes").put("minecraft:mutated_jungle", "minecraft:modified_jungle").put("minecraft:mutated_jungle_edge", "minecraft:modified_jungle_edge").put("minecraft:mutated_birch_forest", "minecraft:tall_birch_forest").put("minecraft:mutated_birch_forest_hills", "minecraft:tall_birch_hills").put("minecraft:mutated_roofed_forest", "minecraft:dark_forest_hills").put("minecraft:mutated_taiga_cold", "minecraft:snowy_taiga_mountains").put("minecraft:mutated_redwood_taiga", "minecraft:giant_spruce_taiga").put("minecraft:mutated_redwood_taiga_hills", "minecraft:giant_spruce_taiga_hills").put("minecraft:mutated_extreme_hills_with_trees", "minecraft:modified_gravelly_mountains").put("minecraft:mutated_savanna", "minecraft:shattered_savanna").put("minecraft:mutated_savanna_rock", "minecraft:shattered_savanna_plateau").put("minecraft:mutated_mesa", "minecraft:eroded_badlands").put("minecraft:mutated_mesa_rock", "minecraft:modified_wooded_badlands_plateau").put("minecraft:mutated_mesa_clear_rock", "minecraft:modified_badlands_plateau").put("minecraft:warm_deep_ocean", "minecraft:deep_warm_ocean").put("minecraft:lukewarm_deep_ocean", "minecraft:deep_lukewarm_ocean").put("minecraft:cold_deep_ocean", "minecraft:deep_cold_ocean").put("minecraft:frozen_deep_ocean", "minecraft:deep_frozen_ocean").build();
     }
 }
diff --git a/src/net/minecraft/util/datafix/fixes/BitStorageAlignFix.java b/src/net/minecraft/util/datafix/fixes/BitStorageAlignFix.java
new file mode 100644
index 0000000..c07a7da
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/BitStorageAlignFix.java
@@ -0,0 +1,106 @@
+package net.minecraft.util.datafix.fixes;
+
+import java.util.stream.LongStream;
+import net.minecraft.util.Mth;
+import com.mojang.datafixers.DataFixUtils;
+import com.mojang.datafixers.Typed;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.OpticFinder;
+import com.mojang.datafixers.types.templates.List;
+import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import com.mojang.datafixers.DataFix;
+
+public class BitStorageAlignFix extends DataFix {
+    public BitStorageAlignFix(final Schema schema) {
+        super(schema, false);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        final Type<?> type2 = this.getInputSchema().getType(References.CHUNK);
+        final Type<?> type3 = type2.findFieldType("Level");
+        final OpticFinder<?> opticFinder4 = DSL.fieldFinder("Level", (Type)type3);
+        final OpticFinder<?> opticFinder5 = opticFinder4.type().findField("Sections");
+        final Type<?> type4 = ((List.ListType)opticFinder5.type()).getElement();
+        final OpticFinder<?> opticFinder6 = DSL.typeFinder((Type)type4);
+        final Type<Pair<String, Dynamic<?>>> type5 = (Type<Pair<String, Dynamic<?>>>)DSL.named(References.BLOCK_STATE.typeName(), DSL.remainderType());
+        final OpticFinder<java.util.List<Pair<String, Dynamic<?>>>> opticFinder7 = (OpticFinder<java.util.List<Pair<String, Dynamic<?>>>>)DSL.fieldFinder("Palette", (Type)DSL.list((Type)type5));
+        return this.fixTypeEverywhereTyped("BitStorageAlignFix", (Type)type2, this.getOutputSchema().getType(References.CHUNK), typed -> typed.updateTyped((OpticFinder)opticFinder4, typed -> this.updateHeightmaps(updateSections(opticFinder5, opticFinder6, opticFinder7, typed))));
+    }
+    
+    private Typed<?> updateHeightmaps(final Typed<?> typed) {
+        return typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("Heightmaps", dynamic2 -> dynamic2.updateMapValues(pair -> pair.mapSecond(dynamic2 -> updateBitStorage(dynamic, dynamic2, 256, 9)))));
+    }
+    
+    private static Typed<?> updateSections(final OpticFinder<?> opticFinder1, final OpticFinder<?> opticFinder2, final OpticFinder<java.util.List<Pair<String, Dynamic<?>>>> opticFinder3, final Typed<?> typed) {
+        final int integer3;
+        return typed.updateTyped((OpticFinder)opticFinder1, typed -> typed.updateTyped((OpticFinder)opticFinder2, typed -> {
+            integer3 = typed.getOptional((OpticFinder)opticFinder3).map(list -> Math.max(4, DataFixUtils.ceillog2(list.size()))).orElse(0);
+            if (integer3 == 0 || Mth.isPowerOfTwo(integer3)) {
+                return typed;
+            }
+            else {
+                return typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("BlockStates", dynamic3 -> updateBitStorage(dynamic, dynamic3, 4096, integer3)));
+            }
+        }));
+    }
+    
+    private static Dynamic<?> updateBitStorage(final Dynamic<?> dynamic1, final Dynamic<?> dynamic2, final int integer3, final int integer4) {
+        final long[] arr5 = dynamic2.asLongStream().toArray();
+        final long[] arr6 = addPadding(integer3, integer4, arr5);
+        return dynamic1.createLongList(LongStream.of(arr6));
+    }
+    
+    public static long[] addPadding(final int integer1, final int integer2, final long[] arr) {
+        final int integer3 = arr.length;
+        if (integer3 == 0) {
+            return arr;
+        }
+        final long long5 = (1L << integer2) - 1L;
+        final int integer4 = 64 / integer2;
+        final int integer5 = (integer1 + integer4 - 1) / integer4;
+        final long[] arr2 = new long[integer5];
+        int integer6 = 0;
+        int integer7 = 0;
+        long long6 = 0L;
+        int integer8 = 0;
+        long long7 = arr[0];
+        long long8 = (integer3 > 1) ? arr[1] : 0L;
+        for (int integer9 = 0; integer9 < integer1; ++integer9) {
+            final int integer10 = integer9 * integer2;
+            final int integer11 = integer10 >> 6;
+            final int integer12 = (integer9 + 1) * integer2 - 1 >> 6;
+            final int integer13 = integer10 ^ integer11 << 6;
+            if (integer11 != integer8) {
+                long7 = long8;
+                long8 = ((integer11 + 1 < integer3) ? arr[integer11 + 1] : 0L);
+                integer8 = integer11;
+            }
+            long long9;
+            if (integer11 == integer12) {
+                long9 = (long7 >>> integer13 & long5);
+            }
+            else {
+                final int integer14 = 64 - integer13;
+                long9 = ((long7 >>> integer13 | long8 << integer14) & long5);
+            }
+            final int integer14 = integer7 + integer2;
+            if (integer14 >= 64) {
+                arr2[integer6++] = long6;
+                long6 = long9;
+                integer7 = integer2;
+            }
+            else {
+                long6 |= long9 << integer7;
+                integer7 = integer14;
+            }
+        }
+        if (long6 != 0L) {
+            arr2[integer6] = long6;
+        }
+        return arr2;
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/BlockEntityBannerColorFix.java b/src/net/minecraft/util/datafix/fixes/BlockEntityBannerColorFix.java
index 1bf5697..40c8a49 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockEntityBannerColorFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockEntityBannerColorFix.java
@@ -3,10 +3,9 @@ package net.minecraft.util.datafix.fixes;
 import java.util.stream.Stream;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
-import java.util.Optional;
 import com.mojang.datafixers.DataFixUtils;
 import java.util.function.Function;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class BlockEntityBannerColorFix extends NamedEntityFix {
@@ -16,7 +15,7 @@ public class BlockEntityBannerColorFix extends NamedEntityFix {
     
     public Dynamic<?> fixTag(Dynamic<?> dynamic) {
         dynamic = dynamic.update("Base", dynamic -> dynamic.createInt(15 - dynamic.asInt(0)));
-        dynamic = dynamic.update("Patterns", dynamic -> (Dynamic)DataFixUtils.orElse((Optional)((Dynamic)dynamic).asStreamOpt().map(stream -> stream.map(dynamic -> dynamic.update("Color", dynamic -> dynamic.createInt(15 - dynamic.asInt(0))))).map(dynamic::createList), dynamic));
+        dynamic = dynamic.update("Patterns", dynamic -> (Dynamic)DataFixUtils.orElse(((Dynamic)dynamic).asStreamOpt().map(stream -> stream.map(dynamic -> dynamic.update("Color", dynamic -> dynamic.createInt(15 - dynamic.asInt(0))))).map((Function)dynamic::createList).result(), dynamic));
         return dynamic;
     }
     
diff --git a/src/net/minecraft/util/datafix/fixes/BlockEntityBlockStateFix.java b/src/net/minecraft/util/datafix/fixes/BlockEntityBlockStateFix.java
index ec84908..3ba2a53 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockEntityBlockStateFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockEntityBlockStateFix.java
@@ -1,8 +1,8 @@
 package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.OpticFinder;
-import java.util.Optional;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
@@ -25,6 +25,6 @@ public class BlockEntityBlockStateFix extends NamedEntityFix {
         dynamic6 = dynamic6.remove("blockData");
         final Dynamic<?> dynamic7 = BlockStateData.getTag(integer7 << 4 | integer8);
         final Typed<?> typed2 = type3.pointTyped(typed.getOps()).<Throwable>orElseThrow(() -> new IllegalStateException("Could not create new piston block entity."));
-        return typed2.set(DSL.remainderFinder(), dynamic6).set((OpticFinder)opticFinder5, (Typed)((Optional)type4.readTyped((Dynamic)dynamic7).getSecond()).<Throwable>orElseThrow(() -> new IllegalStateException("Could not parse newly created block state tag.")));
+        return typed2.set(DSL.remainderFinder(), dynamic6).set((OpticFinder)opticFinder5, (Typed)type4.readTyped((Dynamic)dynamic7).result().<Throwable>orElseThrow(() -> new IllegalStateException("Could not parse newly created block state tag.")).getFirst());
     }
 }
diff --git a/src/net/minecraft/util/datafix/fixes/BlockEntityCustomNameToComponentFix.java b/src/net/minecraft/util/datafix/fixes/BlockEntityCustomNameToComponentFix.java
index cd9853c..ae0c693 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockEntityCustomNameToComponentFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockEntityCustomNameToComponentFix.java
@@ -1,11 +1,13 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import java.util.Objects;
 import com.mojang.datafixers.OpticFinder;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -16,7 +18,7 @@ public class BlockEntityCustomNameToComponentFix extends DataFix {
     }
     
     public TypeRewriteRule makeRule() {
-        final OpticFinder<String> opticFinder2 = (OpticFinder<String>)DSL.fieldFinder("id", DSL.namespacedString());
+        final OpticFinder<String> opticFinder2 = (OpticFinder<String>)DSL.fieldFinder("id", (Type)NamespacedSchema.namespacedString());
         final Optional<String> optional4;
         return this.fixTypeEverywhereTyped("BlockEntityCustomNameToComponentFix", this.getInputSchema().getType(References.BLOCK_ENTITY), typed -> typed.update(DSL.remainderFinder(), dynamic -> {
             optional4 = (Optional<String>)typed.getOptional((OpticFinder)opticFinder2);
diff --git a/src/net/minecraft/util/datafix/fixes/BlockEntityIdFix.java b/src/net/minecraft/util/datafix/fixes/BlockEntityIdFix.java
index cb56c21..d7ffa29 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockEntityIdFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockEntityIdFix.java
@@ -5,7 +5,7 @@ import com.google.common.collect.Maps;
 import java.util.HashMap;
 import com.mojang.datafixers.util.Pair;
 import java.util.function.Function;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.types.templates.TaggedChoice;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.TypeRewriteRule;
diff --git a/src/net/minecraft/util/datafix/fixes/BlockEntityJukeboxFix.java b/src/net/minecraft/util/datafix/fixes/BlockEntityJukeboxFix.java
index e7f9722..0b48ae6 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockEntityJukeboxFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockEntityJukeboxFix.java
@@ -1,8 +1,8 @@
 package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.OpticFinder;
-import java.util.Optional;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
@@ -27,7 +27,7 @@ public class BlockEntityJukeboxFix extends NamedEntityFix {
                 Dynamic<?> dynamic7 = dynamic6.emptyMap();
                 dynamic7 = dynamic7.set("id", dynamic7.createString(string8));
                 dynamic7 = dynamic7.set("Count", dynamic7.createByte((byte)1));
-                return typed.set((OpticFinder)opticFinder5, (Typed)((Optional)type4.readTyped((Dynamic)dynamic7).getSecond()).<Throwable>orElseThrow(() -> new IllegalStateException("Could not create record item stack."))).set(DSL.remainderFinder(), dynamic6);
+                return typed.set((OpticFinder)opticFinder5, (Typed)type4.readTyped((Dynamic)dynamic7).result().<Throwable>orElseThrow(() -> new IllegalStateException("Could not create record item stack.")).getFirst()).set(DSL.remainderFinder(), dynamic6);
             }
         }
         return typed;
diff --git a/src/net/minecraft/util/datafix/fixes/BlockEntityKeepPacked.java b/src/net/minecraft/util/datafix/fixes/BlockEntityKeepPacked.java
index cb94908..c763810 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockEntityKeepPacked.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockEntityKeepPacked.java
@@ -3,7 +3,7 @@ package net.minecraft.util.datafix.fixes;
 import java.util.function.Function;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class BlockEntityKeepPacked extends NamedEntityFix {
diff --git a/src/net/minecraft/util/datafix/fixes/BlockEntityShulkerBoxColorFix.java b/src/net/minecraft/util/datafix/fixes/BlockEntityShulkerBoxColorFix.java
index cab8180..ee26bbc 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockEntityShulkerBoxColorFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockEntityShulkerBoxColorFix.java
@@ -1,6 +1,6 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.schemas.Schema;
diff --git a/src/net/minecraft/util/datafix/fixes/BlockEntitySignTextStrictJsonFix.java b/src/net/minecraft/util/datafix/fixes/BlockEntitySignTextStrictJsonFix.java
index b4a0737..445a134 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockEntitySignTextStrictJsonFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockEntitySignTextStrictJsonFix.java
@@ -2,6 +2,7 @@ package net.minecraft.util.datafix.fixes;
 
 import java.util.Iterator;
 import com.google.gson.JsonArray;
+import net.minecraft.network.chat.MutableComponent;
 import com.google.gson.JsonDeserializationContext;
 import java.lang.reflect.Type;
 import com.google.gson.JsonElement;
@@ -14,7 +15,7 @@ import net.minecraft.util.GsonHelper;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
 import org.apache.commons.lang3.StringUtils;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 import com.google.gson.Gson;
 
@@ -27,41 +28,41 @@ public class BlockEntitySignTextStrictJsonFix extends NamedEntityFix {
     
     private Dynamic<?> updateLine(final Dynamic<?> dynamic, final String string) {
         final String string2 = dynamic.get(string).asString("");
-        Component lf5 = null;
+        Component mr5 = null;
         if ("null".equals(string2) || StringUtils.isEmpty((CharSequence)string2)) {
-            lf5 = new TextComponent("");
+            mr5 = TextComponent.EMPTY;
         }
         else {
             if (string2.charAt(0) != '\"' || string2.charAt(string2.length() - 1) != '\"') {
                 if (string2.charAt(0) != '{' || string2.charAt(string2.length() - 1) != '}') {
-                    lf5 = new TextComponent(string2);
-                    return dynamic.set(string, dynamic.createString(Component.Serializer.toJson(lf5)));
+                    mr5 = new TextComponent(string2);
+                    return dynamic.set(string, dynamic.createString(Component.Serializer.toJson(mr5)));
                 }
             }
             try {
-                lf5 = GsonHelper.<Component>fromJson(BlockEntitySignTextStrictJsonFix.GSON, string2, Component.class, true);
-                if (lf5 == null) {
-                    lf5 = new TextComponent("");
+                mr5 = GsonHelper.<Component>fromJson(BlockEntitySignTextStrictJsonFix.GSON, string2, Component.class, true);
+                if (mr5 == null) {
+                    mr5 = TextComponent.EMPTY;
                 }
             }
             catch (JsonParseException ex) {}
-            if (lf5 == null) {
+            if (mr5 == null) {
                 try {
-                    lf5 = Component.Serializer.fromJson(string2);
+                    mr5 = Component.Serializer.fromJson(string2);
                 }
                 catch (JsonParseException ex2) {}
             }
-            if (lf5 == null) {
+            if (mr5 == null) {
                 try {
-                    lf5 = Component.Serializer.fromJsonLenient(string2);
+                    mr5 = Component.Serializer.fromJsonLenient(string2);
                 }
                 catch (JsonParseException ex3) {}
             }
-            if (lf5 == null) {
-                lf5 = new TextComponent(string2);
+            if (mr5 == null) {
+                mr5 = new TextComponent(string2);
             }
         }
-        return dynamic.set(string, dynamic.createString(Component.Serializer.toJson(lf5)));
+        return dynamic.set(string, dynamic.createString(Component.Serializer.toJson(mr5)));
     }
     
     @Override
@@ -78,23 +79,23 @@ public class BlockEntitySignTextStrictJsonFix extends NamedEntityFix {
     static {
         GSON = new GsonBuilder().registerTypeAdapter(Component.class, new JsonDeserializer<Component>() {
             @Override
-            public Component deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
+            public MutableComponent deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
                 if (jsonElement.isJsonPrimitive()) {
                     return new TextComponent(jsonElement.getAsString());
                 }
                 if (jsonElement.isJsonArray()) {
                     final JsonArray jsonArray5 = jsonElement.getAsJsonArray();
-                    Component lf6 = null;
+                    MutableComponent mx6 = null;
                     for (final JsonElement jsonElement2 : jsonArray5) {
-                        final Component lf7 = this.deserialize(jsonElement2, (Type)jsonElement2.getClass(), jsonDeserializationContext);
-                        if (lf6 == null) {
-                            lf6 = lf7;
+                        final MutableComponent mx7 = this.deserialize(jsonElement2, (Type)jsonElement2.getClass(), jsonDeserializationContext);
+                        if (mx6 == null) {
+                            mx6 = mx7;
                         }
                         else {
-                            lf6.append(lf7);
+                            mx6.append(mx7);
                         }
                     }
-                    return lf6;
+                    return mx6;
                 }
                 throw new JsonParseException("Don't know how to turn " + jsonElement + " into a Component");
             }
diff --git a/src/net/minecraft/util/datafix/fixes/BlockEntityUUIDFix.java b/src/net/minecraft/util/datafix/fixes/BlockEntityUUIDFix.java
new file mode 100644
index 0000000..b5309ab
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/BlockEntityUUIDFix.java
@@ -0,0 +1,28 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.mojang.datafixers.Typed;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+
+public class BlockEntityUUIDFix extends AbstractUUIDFix {
+    public BlockEntityUUIDFix(final Schema schema) {
+        super(schema, References.BLOCK_ENTITY);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        return this.fixTypeEverywhereTyped("BlockEntityUUIDFix", this.getInputSchema().getType(this.typeReference), typed -> {
+            typed = this.updateNamedChoice(typed, "minecraft:conduit", this::updateConduit);
+            typed = this.updateNamedChoice(typed, "minecraft:skull", this::updateSkull);
+            return typed;
+        });
+    }
+    
+    private Dynamic<?> updateSkull(final Dynamic<?> dynamic) {
+        return dynamic.get("Owner").get().map(dynamic -> AbstractUUIDFix.replaceUUIDString(dynamic, "Id", "Id").orElse(dynamic)).map(dynamic2 -> dynamic.remove("Owner").set("SkullOwner", dynamic2)).result().orElse(dynamic);
+    }
+    
+    private Dynamic<?> updateConduit(final Dynamic<?> dynamic) {
+        return AbstractUUIDFix.replaceUUIDMLTag(dynamic, "target_uuid", "Target").orElse(dynamic);
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/BlockNameFlatteningFix.java b/src/net/minecraft/util/datafix/fixes/BlockNameFlatteningFix.java
index c9b73c6..b627589 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockNameFlatteningFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockNameFlatteningFix.java
@@ -1,12 +1,12 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.util.Either;
 import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.types.Type;
 import java.util.function.Function;
-import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import java.util.Objects;
+import com.mojang.datafixers.types.Type;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
@@ -20,8 +20,8 @@ public class BlockNameFlatteningFix extends DataFix {
     public TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.BLOCK_NAME);
         final Type<?> type3 = this.getOutputSchema().getType(References.BLOCK_NAME);
-        final Type<Pair<String, Either<Integer, String>>> type4 = (Type<Pair<String, Either<Integer, String>>>)DSL.named(References.BLOCK_NAME.typeName(), DSL.or(DSL.intType(), DSL.namespacedString()));
-        final Type<Pair<String, String>> type5 = (Type<Pair<String, String>>)DSL.named(References.BLOCK_NAME.typeName(), DSL.namespacedString());
+        final Type<Pair<String, Either<Integer, String>>> type4 = (Type<Pair<String, Either<Integer, String>>>)DSL.named(References.BLOCK_NAME.typeName(), DSL.or(DSL.intType(), (Type)NamespacedSchema.namespacedString()));
+        final Type<Pair<String, String>> type5 = (Type<Pair<String, String>>)DSL.named(References.BLOCK_NAME.typeName(), (Type)NamespacedSchema.namespacedString());
         if (!Objects.equals(type2, type4) || !Objects.equals(type3, type5)) {
             throw new IllegalStateException("Expected and actual types don't match.");
         }
diff --git a/src/net/minecraft/util/datafix/fixes/BlockRenameFix.java b/src/net/minecraft/util/datafix/fixes/BlockRenameFix.java
index 9805d42..84c27ef 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockRenameFix.java
@@ -1,14 +1,15 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.types.DynamicOps;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.types.Type;
 import java.util.function.Function;
 import java.util.Objects;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -23,14 +24,14 @@ public abstract class BlockRenameFix extends DataFix {
     
     public TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.BLOCK_NAME);
-        final Type<Pair<String, String>> type3 = (Type<Pair<String, String>>)DSL.named(References.BLOCK_NAME.typeName(), DSL.namespacedString());
+        final Type<Pair<String, String>> type3 = (Type<Pair<String, String>>)DSL.named(References.BLOCK_NAME.typeName(), (Type)NamespacedSchema.namespacedString());
         if (!Objects.equals(type2, type3)) {
             throw new IllegalStateException("block type is not what was expected.");
         }
         final TypeRewriteRule typeRewriteRule4 = this.fixTypeEverywhere(this.name + " for block", (Type)type3, dynamicOps -> pair -> pair.mapSecond((Function)this::fixBlock));
         final Optional<String> optional3;
         final TypeRewriteRule typeRewriteRule5 = this.fixTypeEverywhereTyped(this.name + " for block_state", this.getInputSchema().getType(References.BLOCK_STATE), typed -> typed.update(DSL.remainderFinder(), dynamic -> {
-            optional3 = (Optional<String>)dynamic.get("Name").asString();
+            optional3 = (Optional<String>)dynamic.get("Name").asString().result();
             if (optional3.isPresent()) {
                 return dynamic.set("Name", dynamic.createString(this.fixBlock(optional3.get())));
             }
diff --git a/src/net/minecraft/util/datafix/fixes/BlockStateData.java b/src/net/minecraft/util/datafix/fixes/BlockStateData.java
index ceaa07b..0f7d538 100644
--- a/src/net/minecraft/util/datafix/fixes/BlockStateData.java
+++ b/src/net/minecraft/util/datafix/fixes/BlockStateData.java
@@ -3,11 +3,11 @@ package net.minecraft.util.datafix.fixes;
 import com.mojang.datafixers.DataFixUtils;
 import org.apache.logging.log4j.LogManager;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import net.minecraft.nbt.TagParser;
 import net.minecraft.nbt.NbtOps;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import org.apache.logging.log4j.Logger;
 
 public class BlockStateData {
diff --git a/src/net/minecraft/util/datafix/fixes/CatTypeFix.java b/src/net/minecraft/util/datafix/fixes/CatTypeFix.java
index 376cdd5..46382eb 100644
--- a/src/net/minecraft/util/datafix/fixes/CatTypeFix.java
+++ b/src/net/minecraft/util/datafix/fixes/CatTypeFix.java
@@ -3,7 +3,7 @@ package net.minecraft.util.datafix.fixes;
 import java.util.function.Function;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class CatTypeFix extends NamedEntityFix {
diff --git a/src/net/minecraft/util/datafix/fixes/ChunkBiomeFix.java b/src/net/minecraft/util/datafix/fixes/ChunkBiomeFix.java
index 81ae5c5..7273d0b 100644
--- a/src/net/minecraft/util/datafix/fixes/ChunkBiomeFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ChunkBiomeFix.java
@@ -1,6 +1,6 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import com.mojang.datafixers.types.Type;
@@ -30,7 +30,7 @@ public class ChunkBiomeFix extends DataFix {
         int integer9;
         int integer10;
         return this.fixTypeEverywhereTyped("Leaves fix", (Type)type2, typed -> typed.updateTyped((OpticFinder)opticFinder3, typed -> typed.update(DSL.remainderFinder(), dynamic -> {
-            optional2 = (Optional<IntStream>)dynamic.get("Biomes").asIntStreamOpt();
+            optional2 = (Optional<IntStream>)dynamic.get("Biomes").asIntStreamOpt().result();
             if (!optional2.isPresent()) {
                 return dynamic;
             }
diff --git a/src/net/minecraft/util/datafix/fixes/ChunkLightRemoveFix.java b/src/net/minecraft/util/datafix/fixes/ChunkLightRemoveFix.java
index 7372562..700e4da 100644
--- a/src/net/minecraft/util/datafix/fixes/ChunkLightRemoveFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ChunkLightRemoveFix.java
@@ -1,6 +1,6 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.OpticFinder;
 import com.mojang.datafixers.types.Type;
diff --git a/src/net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix.java b/src/net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix.java
index f85fe00..c0cab0b 100644
--- a/src/net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix.java
@@ -1,17 +1,19 @@
 package net.minecraft.util.datafix.fixes;
 
-import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import it.unimi.dsi.fastutil.ints.IntListIterator;
 import java.util.Arrays;
-import net.minecraft.util.BitStorage;
+import net.minecraft.util.datafix.PackedBitStorage;
+import java.util.stream.Stream;
 import java.util.function.Supplier;
 import java.nio.ByteBuffer;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
 import java.util.Set;
 import it.unimi.dsi.fastutil.ints.IntList;
+import java.util.List;
 import java.util.Iterator;
 import com.mojang.datafixers.DataFixUtils;
 import com.google.common.collect.Maps;
@@ -28,7 +30,7 @@ import net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap;
 import com.mojang.datafixers.schemas.Schema;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import java.util.Map;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.BitSet;
 import org.apache.logging.log4j.Logger;
 import com.mojang.datafixers.DataFix;
@@ -170,17 +172,17 @@ public class ChunkPalettedStorageFix extends DataFix {
         return dynamic.get("Properties").get(string).asString("");
     }
     
-    public static int idFor(final CrudeIncrementalIntIdentityHashBiMap<Dynamic<?>> abf, final Dynamic<?> dynamic) {
-        int integer3 = abf.getId(dynamic);
+    public static int idFor(final CrudeIncrementalIntIdentityHashBiMap<Dynamic<?>> adm, final Dynamic<?> dynamic) {
+        int integer3 = adm.getId(dynamic);
         if (integer3 == -1) {
-            integer3 = abf.add(dynamic);
+            integer3 = adm.add(dynamic);
         }
         return integer3;
     }
     
     private Dynamic<?> fix(final Dynamic<?> dynamic) {
-        final Optional<? extends Dynamic<?>> optional3 = dynamic.get("Level").get();
-        if (optional3.isPresent() && ((Dynamic)optional3.get()).get("Sections").asStreamOpt().isPresent()) {
+        final Optional<? extends Dynamic<?>> optional3 = dynamic.get("Level").result();
+        if (optional3.isPresent() && ((Dynamic)optional3.get()).get("Sections").asStreamOpt().result().isPresent()) {
             return dynamic.set("Level", (Dynamic)new UpgradeChunk(optional3.get()).write());
         }
         return dynamic;
@@ -399,7 +401,7 @@ public class ChunkPalettedStorageFix extends DataFix {
     
     static class Section {
         private final CrudeIncrementalIntIdentityHashBiMap<Dynamic<?>> palette;
-        private Dynamic<?> listTag;
+        private final List<Dynamic<?>> listTag;
         private final Dynamic<?> section;
         private final boolean hasData;
         private final Int2ObjectMap<IntList> toFix;
@@ -414,10 +416,10 @@ public class ChunkPalettedStorageFix extends DataFix {
             this.update = (IntList)new IntArrayList();
             this.seen = Sets.<Dynamic<?>>newIdentityHashSet();
             this.buffer = new int[4096];
-            this.listTag = dynamic.emptyList();
+            this.listTag = Lists.newArrayList();
             this.section = dynamic;
             this.y = dynamic.get("Y").asInt(0);
-            this.hasData = dynamic.get("Blocks").get().isPresent();
+            this.hasData = dynamic.get("Blocks").result().isPresent();
         }
         
         public Dynamic<?> getBlock(final int integer) {
@@ -430,7 +432,7 @@ public class ChunkPalettedStorageFix extends DataFix {
         
         public void setBlock(final int integer, final Dynamic<?> dynamic) {
             if (this.seen.add(dynamic)) {
-                this.listTag = this.listTag.merge("%%FILTER_ME%%".equals(ChunkPalettedStorageFix.getName(dynamic)) ? ChunkPalettedStorageFix.AIR : dynamic);
+                this.listTag.add("%%FILTER_ME%%".equals(ChunkPalettedStorageFix.getName(dynamic)) ? ChunkPalettedStorageFix.AIR : dynamic);
             }
             this.buffer[integer] = ChunkPalettedStorageFix.idFor(this.palette, dynamic);
         }
@@ -439,12 +441,12 @@ public class ChunkPalettedStorageFix extends DataFix {
             if (!this.hasData) {
                 return integer;
             }
-            final ByteBuffer byteBuffer2 = this.section.get("Blocks").asByteBufferOpt().get();
-            final DataLayer a4 = this.section.get("Data").asByteBufferOpt().<DataLayer>map(byteBuffer -> new DataLayer(DataFixUtils.toArray(byteBuffer))).orElseGet(DataLayer::new);
-            final DataLayer a5 = this.section.get("Add").asByteBufferOpt().<DataLayer>map(byteBuffer -> new DataLayer(DataFixUtils.toArray(byteBuffer))).orElseGet(DataLayer::new);
+            final ByteBuffer byteBuffer2 = this.section.get("Blocks").asByteBufferOpt().result().get();
+            final DataLayer a4 = this.section.get("Data").asByteBufferOpt().map(byteBuffer -> new DataLayer(DataFixUtils.toArray(byteBuffer))).result().orElseGet(DataLayer::new);
+            final DataLayer a5 = this.section.get("Add").asByteBufferOpt().map(byteBuffer -> new DataLayer(DataFixUtils.toArray(byteBuffer))).result().orElseGet(DataLayer::new);
             this.seen.add(ChunkPalettedStorageFix.AIR);
             ChunkPalettedStorageFix.idFor(this.palette, ChunkPalettedStorageFix.AIR);
-            this.listTag = this.listTag.merge(ChunkPalettedStorageFix.AIR);
+            this.listTag.add(ChunkPalettedStorageFix.AIR);
             for (int integer2 = 0; integer2 < 4096; ++integer2) {
                 final int integer3 = integer2 & 0xF;
                 final int integer4 = integer2 >> 8 & 0xF;
@@ -481,13 +483,13 @@ public class ChunkPalettedStorageFix extends DataFix {
             if (!this.hasData) {
                 return dynamic2;
             }
-            dynamic2 = dynamic2.set("Palette", (Dynamic)this.listTag);
+            dynamic2 = dynamic2.set("Palette", dynamic2.createList((Stream)this.listTag.stream()));
             final int integer3 = Math.max(4, DataFixUtils.ceillog2(this.seen.size()));
-            final BitStorage abd4 = new BitStorage(integer3, 4096);
+            final PackedBitStorage aeq4 = new PackedBitStorage(integer3, 4096);
             for (int integer4 = 0; integer4 < this.buffer.length; ++integer4) {
-                abd4.set(integer4, this.buffer[integer4]);
+                aeq4.set(integer4, this.buffer[integer4]);
             }
-            dynamic2 = dynamic2.set("BlockStates", dynamic2.createLongList(Arrays.stream(abd4.getRaw())));
+            dynamic2 = dynamic2.set("BlockStates", dynamic2.createLongList(Arrays.stream(aeq4.getRaw())));
             dynamic2 = dynamic2.remove("Blocks");
             dynamic2 = dynamic2.remove("Data");
             dynamic2 = dynamic2.remove("Add");
@@ -513,7 +515,7 @@ public class ChunkPalettedStorageFix extends DataFix {
             final int integer4;
             final int integer5;
             final int integer6;
-            dynamic.get("TileEntities").asStreamOpt().ifPresent(stream -> stream.forEach(dynamic -> {
+            dynamic.get("TileEntities").asStreamOpt().result().ifPresent(stream -> stream.forEach(dynamic -> {
                 integer3 = (dynamic.get("x").asInt(0) - this.x & 0xF);
                 integer4 = dynamic.get("y").asInt(0);
                 integer5 = (dynamic.get("z").asInt(0) - this.z & 0xF);
@@ -524,7 +526,7 @@ public class ChunkPalettedStorageFix extends DataFix {
             }));
             final boolean boolean3 = dynamic.get("convertedFromAlphaFormat").asBoolean(false);
             final Section c3;
-            dynamic.get("Sections").asStreamOpt().ifPresent(stream -> stream.forEach(dynamic -> {
+            dynamic.get("Sections").asStreamOpt().result().ifPresent(stream -> stream.forEach(dynamic -> {
                 c3 = new Section(dynamic);
                 this.sides = c3.upgrade(this.sides);
                 this.sections[c3.y] = c3;
@@ -809,17 +811,17 @@ public class ChunkPalettedStorageFix extends DataFix {
                 dynamic2 = dynamic2.set("TileEntities", dynamic2.createList(this.blockEntities.values().stream()));
             }
             Dynamic<?> dynamic3 = dynamic2.emptyMap();
-            Dynamic<?> dynamic4 = dynamic2.emptyList();
+            final List<Dynamic<?>> list4 = Lists.newArrayList();
             for (final Section c8 : this.sections) {
                 if (c8 != null) {
-                    dynamic4 = dynamic4.merge((Dynamic)c8.write());
+                    list4.add(c8.write());
                     dynamic3 = dynamic3.set(String.valueOf(c8.y), dynamic3.createIntList(Arrays.stream(c8.update.toIntArray())));
                 }
             }
-            Dynamic<?> dynamic5 = dynamic2.emptyMap();
-            dynamic5 = dynamic5.set("Sides", dynamic5.createByte((byte)this.sides));
-            dynamic5 = dynamic5.set("Indices", (Dynamic)dynamic3);
-            return dynamic2.set("UpgradeData", (Dynamic)dynamic5).set("Sections", (Dynamic)dynamic4);
+            Dynamic<?> dynamic4 = dynamic2.emptyMap();
+            dynamic4 = dynamic4.set("Sides", dynamic4.createByte((byte)this.sides));
+            dynamic4 = dynamic4.set("Indices", (Dynamic)dynamic3);
+            return dynamic2.set("UpgradeData", (Dynamic)dynamic4).set("Sections", dynamic4.createList((Stream)list4.stream()));
         }
     }
     
diff --git a/src/net/minecraft/util/datafix/fixes/ChunkStatusFix.java b/src/net/minecraft/util/datafix/fixes/ChunkStatusFix.java
index fdde5a4..21fd626 100644
--- a/src/net/minecraft/util/datafix/fixes/ChunkStatusFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ChunkStatusFix.java
@@ -3,7 +3,7 @@ package net.minecraft.util.datafix.fixes;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.OpticFinder;
 import java.util.Objects;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
diff --git a/src/net/minecraft/util/datafix/fixes/ChunkStatusFix2.java b/src/net/minecraft/util/datafix/fixes/ChunkStatusFix2.java
index 9e94aae..33b1e56 100644
--- a/src/net/minecraft/util/datafix/fixes/ChunkStatusFix2.java
+++ b/src/net/minecraft/util/datafix/fixes/ChunkStatusFix2.java
@@ -4,7 +4,7 @@ import com.google.common.collect.ImmutableMap;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.OpticFinder;
 import java.util.Objects;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
diff --git a/src/net/minecraft/util/datafix/fixes/ChunkStructuresTemplateRenameFix.java b/src/net/minecraft/util/datafix/fixes/ChunkStructuresTemplateRenameFix.java
index 35bb190..8cd700c 100644
--- a/src/net/minecraft/util/datafix/fixes/ChunkStructuresTemplateRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ChunkStructuresTemplateRenameFix.java
@@ -3,7 +3,7 @@ package net.minecraft.util.datafix.fixes;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.OpticFinder;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
diff --git a/src/net/minecraft/util/datafix/fixes/ChunkToProtochunkFix.java b/src/net/minecraft/util/datafix/fixes/ChunkToProtochunkFix.java
index 606d045..fa89c1d 100644
--- a/src/net/minecraft/util/datafix/fixes/ChunkToProtochunkFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ChunkToProtochunkFix.java
@@ -1,17 +1,22 @@
 package net.minecraft.util.datafix.fixes;
 
+import com.mojang.serialization.DynamicLike;
+import java.util.Optional;
 import com.mojang.datafixers.OpticFinder;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.Typed;
+import com.mojang.datafixers.DataFixUtils;
+import java.util.function.Function;
+import java.util.stream.Stream;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import it.unimi.dsi.fastutil.shorts.ShortArrayList;
 import java.util.stream.IntStream;
+import it.unimi.dsi.fastutil.shorts.ShortList;
 import java.util.List;
 import java.util.Arrays;
 import java.nio.ByteBuffer;
-import java.util.Optional;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import com.mojang.datafixers.Typed;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
@@ -35,32 +40,32 @@ public class ChunkToProtochunkFix extends DataFix {
         final Type type7;
         final OpticFinder opticFinder10;
         final Optional<? extends Stream<? extends Dynamic<?>>> optional4;
-        final Dynamic<?> dynamic4;
+        final Dynamic<?> dynamic2;
         final boolean boolean6;
-        final Dynamic<?> dynamic5;
-        Dynamic<?> dynamic6;
+        final Dynamic<?> dynamic3;
+        Dynamic<?> dynamic4;
         Optional<ByteBuffer> optional5;
         ByteBuffer byteBuffer9;
         int[] arr10;
         int integer11;
-        Dynamic<?> dynamic7;
-        List<Dynamic<?>> list10;
+        Dynamic<?> dynamic5;
+        List<ShortList> list10;
         int integer12;
         int integer13;
         int integer14;
-        short short7;
-        final List<Dynamic> list11;
-        final Dynamic dynamic9;
-        Dynamic<?> dynamic8;
+        short short6;
+        final List<ShortList> list11;
+        final DynamicLike dynamicLike;
+        Dynamic<?> dynamic6;
         final Type type8;
         return TypeRewriteRule.seq(this.fixTypeEverywhereTyped("ChunkToProtoChunkFix", (Type)type2, this.getOutputSchema().getType(References.CHUNK), typed -> typed.updateTyped(opticFinder9, type7, typed -> {
-            optional4 = typed.getOptionalTyped(opticFinder10).map(Typed::write).flatMap(Dynamic::asStreamOpt);
-            dynamic4 = typed.get(DSL.remainderFinder());
-            boolean6 = (dynamic4.get("TerrainPopulated").asBoolean((boolean)(0 != 0)) && (!dynamic4.get("LightPopulated").asNumber().isPresent() || dynamic4.get("LightPopulated").asBoolean((boolean)(0 != 0))));
-            dynamic5 = dynamic4.set("Status", dynamic4.createString(boolean6 ? "mobs_spawned" : "empty"));
-            dynamic6 = dynamic5.set("hasLegacyStructureData", dynamic5.createBoolean((boolean)(1 != 0)));
+            optional4 = typed.getOptionalTyped(opticFinder10).flatMap(typed -> typed.write().result()).flatMap(dynamic -> dynamic.asStreamOpt().result());
+            dynamic2 = typed.get(DSL.remainderFinder());
+            boolean6 = (dynamic2.get("TerrainPopulated").asBoolean((boolean)(0 != 0)) && (!dynamic2.get("LightPopulated").asNumber().result().isPresent() || dynamic2.get("LightPopulated").asBoolean((boolean)(0 != 0))));
+            dynamic3 = dynamic2.set("Status", dynamic2.createString(boolean6 ? "mobs_spawned" : "empty"));
+            dynamic4 = dynamic3.set("hasLegacyStructureData", dynamic3.createBoolean((boolean)(1 != 0)));
             if (boolean6) {
-                optional5 = (Optional<ByteBuffer>)dynamic6.get("Biomes").asByteBufferOpt();
+                optional5 = (Optional<ByteBuffer>)dynamic4.get("Biomes").asByteBufferOpt().result();
                 if (optional5.isPresent()) {
                     byteBuffer9 = optional5.get();
                     for (arr10 = new int[256], integer11 = 0; integer11 < arr10.length; ++integer11) {
@@ -68,27 +73,27 @@ public class ChunkToProtochunkFix extends DataFix {
                             arr10[integer11] = (byteBuffer9.get(integer11) & 0xFF);
                         }
                     }
-                    dynamic6 = dynamic6.set("Biomes", dynamic6.createIntList(Arrays.stream(arr10)));
+                    dynamic4 = dynamic4.set("Biomes", dynamic4.createIntList(Arrays.stream(arr10)));
                 }
-                dynamic7 = dynamic6;
-                list10 = IntStream.range(0, 16).mapToObj(integer -> dynamic7.createList((Stream)Stream.empty())).collect(Collectors.toList());
+                dynamic5 = dynamic4;
+                list10 = IntStream.range(0, 16).mapToObj(integer -> new ShortArrayList()).collect(Collectors.toList());
                 if (optional4.isPresent()) {
-                    ((Stream)optional4.get()).forEach(dynamic3 -> {
-                        integer12 = dynamic3.get("x").asInt(0);
-                        integer13 = dynamic3.get("y").asInt(0);
-                        integer14 = dynamic3.get("z").asInt(0);
-                        short7 = packOffsetCoordinates(integer12, integer13, integer14);
-                        list11.set(integer13 >> 4, list11.get(integer13 >> 4).merge(dynamic9.createShort(short7)));
+                    ((Stream)optional4.get()).forEach(dynamic -> {
+                        integer12 = dynamic.get("x").asInt(0);
+                        integer13 = dynamic.get("y").asInt(0);
+                        integer14 = dynamic.get("z").asInt(0);
+                        short6 = packOffsetCoordinates(integer12, integer13, integer14);
+                        list11.get(integer13 >> 4).add(short6);
                         return;
                     });
-                    dynamic6 = dynamic6.set("ToBeTicked", dynamic6.createList((Stream)list10.stream()));
+                    dynamic4 = dynamic4.set("ToBeTicked", dynamic4.createList((Stream)list10.stream().map(shortList -> ((Dynamic)dynamicLike).createList((Stream)shortList.stream().map(dynamicLike::createShort)))));
                 }
-                dynamic8 = typed.set(DSL.remainderFinder(), dynamic6).write();
+                dynamic6 = DataFixUtils.orElse(typed.set(DSL.remainderFinder(), dynamic4).write().result(), dynamic4);
             }
             else {
-                dynamic8 = dynamic6;
+                dynamic6 = dynamic4;
             }
-            return (Typed)((Optional)type8.readTyped((Dynamic)dynamic8).getSecond()).orElseThrow(() -> new IllegalStateException("Could not read the new chunk"));
+            return (Typed)((Pair)type8.readTyped((Dynamic)dynamic6).result().orElseThrow(() -> new IllegalStateException("Could not read the new chunk"))).getFirst();
         })), this.writeAndRead("Structure biome inject", this.getInputSchema().getType(References.STRUCTURE_FEATURE), this.getOutputSchema().getType(References.STRUCTURE_FEATURE)));
     }
     
diff --git a/src/net/minecraft/util/datafix/fixes/ColorlessShulkerEntityFix.java b/src/net/minecraft/util/datafix/fixes/ColorlessShulkerEntityFix.java
index fb00f82..58e135e 100644
--- a/src/net/minecraft/util/datafix/fixes/ColorlessShulkerEntityFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ColorlessShulkerEntityFix.java
@@ -1,6 +1,6 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.schemas.Schema;
diff --git a/src/net/minecraft/util/datafix/fixes/EntityArmorStandSilentFix.java b/src/net/minecraft/util/datafix/fixes/EntityArmorStandSilentFix.java
index 3b98baa..9c6873c 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityArmorStandSilentFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityArmorStandSilentFix.java
@@ -3,7 +3,7 @@ package net.minecraft.util.datafix.fixes;
 import java.util.function.Function;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class EntityArmorStandSilentFix extends NamedEntityFix {
diff --git a/src/net/minecraft/util/datafix/fixes/EntityBlockStateFix.java b/src/net/minecraft/util/datafix/fixes/EntityBlockStateFix.java
index 2955f59..9ec12ea 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityBlockStateFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityBlockStateFix.java
@@ -4,13 +4,14 @@ import com.mojang.datafixers.DataFixUtils;
 import com.google.common.collect.Maps;
 import java.util.HashMap;
 import java.util.Optional;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.util.Unit;
 import com.mojang.datafixers.util.Either;
 import com.mojang.datafixers.Typed;
 import java.util.function.Function;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.types.Type;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
@@ -34,7 +35,7 @@ public class EntityBlockStateFix extends DataFix {
         final Schema schema3 = this.getOutputSchema();
         final Function<Typed<?>, Typed<?>> function4 = (Function<Typed<?>, Typed<?>>)(typed -> this.updateBlockToBlockState(typed, "DisplayTile", "DisplayData", "DisplayState"));
         final Function<Typed<?>, Typed<?>> function5 = (Function<Typed<?>, Typed<?>>)(typed -> this.updateBlockToBlockState(typed, "inTile", "inData", "inBlockState"));
-        final Type<Pair<Either<Pair<String, Either<Integer, String>>, Unit>, Dynamic<?>>> type6 = (Type<Pair<Either<Pair<String, Either<Integer, String>>, Unit>, Dynamic<?>>>)DSL.and(DSL.optional((Type)DSL.field("inTile", DSL.named(References.BLOCK_NAME.typeName(), DSL.or(DSL.intType(), DSL.namespacedString())))), DSL.remainderType());
+        final Type<Pair<Either<Pair<String, Either<Integer, String>>, Unit>, Dynamic<?>>> type6 = (Type<Pair<Either<Pair<String, Either<Integer, String>>, Unit>, Dynamic<?>>>)DSL.and(DSL.optional((Type)DSL.field("inTile", DSL.named(References.BLOCK_NAME.typeName(), DSL.or(DSL.intType(), (Type)NamespacedSchema.namespacedString())))), DSL.remainderType());
         final Function<Typed<?>, Typed<?>> function6 = (Function<Typed<?>, Typed<?>>)(typed -> typed.update(type6.finder(), DSL.remainderType(), (Function)Pair::getSecond));
         final Function<Typed<?>, Typed<?>> function7;
         final Function<Typed<?>, Typed<?>> function8;
@@ -64,7 +65,7 @@ public class EntityBlockStateFix extends DataFix {
     }
     
     private Typed<?> updateFallingBlock(final Typed<?> typed) {
-        final Type<Either<Pair<String, Either<Integer, String>>, Unit>> type3 = (Type<Either<Pair<String, Either<Integer, String>>, Unit>>)DSL.optional((Type)DSL.field("Block", DSL.named(References.BLOCK_NAME.typeName(), DSL.or(DSL.intType(), DSL.namespacedString()))));
+        final Type<Either<Pair<String, Either<Integer, String>>, Unit>> type3 = (Type<Either<Pair<String, Either<Integer, String>>, Unit>>)DSL.optional((Type)DSL.field("Block", DSL.named(References.BLOCK_NAME.typeName(), DSL.or(DSL.intType(), (Type)NamespacedSchema.namespacedString()))));
         final Type<Either<Pair<String, Dynamic<?>>, Unit>> type4 = (Type<Either<Pair<String, Dynamic<?>>, Unit>>)DSL.optional((Type)DSL.field("BlockState", DSL.named(References.BLOCK_STATE.typeName(), DSL.remainderType())));
         final Dynamic<?> dynamic5 = typed.get(DSL.remainderFinder());
         final Dynamic dynamic6;
@@ -74,7 +75,7 @@ public class EntityBlockStateFix extends DataFix {
         final int integer3;
         return typed.update(type3.finder(), (Type)type4, either -> {
             integer2 = (int)either.map(pair -> (Integer)((Either)pair.getSecond()).map(integer -> integer, (Function)EntityBlockStateFix::getBlockId), unit -> {
-                optional3 = (Optional<Number>)dynamic6.get("TileID").asNumber();
+                optional3 = (Optional<Number>)dynamic6.get("TileID").asNumber().result();
                 return Integer.valueOf(optional3.<Integer>map(Number::intValue).orElseGet(() -> dynamic6.get("Tile").asByte((byte)0) & 0xFF));
             });
             integer3 = (dynamic7.get("Data").asInt(0) & 0xF);
@@ -83,7 +84,7 @@ public class EntityBlockStateFix extends DataFix {
     }
     
     private Typed<?> updateBlockToBlockState(final Typed<?> typed, final String string2, final String string3, final String string4) {
-        final Type<Pair<String, Either<Integer, String>>> type6 = (Type<Pair<String, Either<Integer, String>>>)DSL.field(string2, DSL.named(References.BLOCK_NAME.typeName(), DSL.or(DSL.intType(), DSL.namespacedString())));
+        final Type<Pair<String, Either<Integer, String>>> type6 = (Type<Pair<String, Either<Integer, String>>>)DSL.field(string2, DSL.named(References.BLOCK_NAME.typeName(), DSL.or(DSL.intType(), (Type)NamespacedSchema.namespacedString())));
         final Type<Pair<String, Dynamic<?>>> type7 = (Type<Pair<String, Dynamic<?>>>)DSL.field(string4, DSL.named(References.BLOCK_STATE.typeName(), DSL.remainderType()));
         final Dynamic<?> dynamic8 = typed.getOrCreate(DSL.remainderFinder());
         final int integer2;
diff --git a/src/net/minecraft/util/datafix/fixes/EntityCatSplitFix.java b/src/net/minecraft/util/datafix/fixes/EntityCatSplitFix.java
index 86c5e2d..95774aa 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityCatSplitFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityCatSplitFix.java
@@ -2,7 +2,7 @@ package net.minecraft.util.datafix.fixes;
 
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class EntityCatSplitFix extends SimpleEntityRenameFix {
diff --git a/src/net/minecraft/util/datafix/fixes/EntityCustomNameToComponentFix.java b/src/net/minecraft/util/datafix/fixes/EntityCustomNameToComponentFix.java
index be14f79..8cb768a 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityCustomNameToComponentFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityCustomNameToComponentFix.java
@@ -3,11 +3,13 @@ package net.minecraft.util.datafix.fixes;
 import com.mojang.datafixers.Typed;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.Optional;
 import java.util.Objects;
 import com.mojang.datafixers.OpticFinder;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -18,7 +20,7 @@ public class EntityCustomNameToComponentFix extends DataFix {
     }
     
     public TypeRewriteRule makeRule() {
-        final OpticFinder<String> opticFinder2 = (OpticFinder<String>)DSL.fieldFinder("id", DSL.namespacedString());
+        final OpticFinder<String> opticFinder2 = (OpticFinder<String>)DSL.fieldFinder("id", (Type)NamespacedSchema.namespacedString());
         final Optional<String> optional4;
         return this.fixTypeEverywhereTyped("EntityCustomNameToComponentFix", this.getInputSchema().getType(References.ENTITY), typed -> typed.update(DSL.remainderFinder(), dynamic -> {
             optional4 = (Optional<String>)typed.getOptional((OpticFinder)opticFinder2);
diff --git a/src/net/minecraft/util/datafix/fixes/EntityElderGuardianSplitFix.java b/src/net/minecraft/util/datafix/fixes/EntityElderGuardianSplitFix.java
index 813b09b..fdd7c22 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityElderGuardianSplitFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityElderGuardianSplitFix.java
@@ -2,7 +2,7 @@ package net.minecraft.util.datafix.fixes;
 
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class EntityElderGuardianSplitFix extends SimpleEntityRenameFix {
diff --git a/src/net/minecraft/util/datafix/fixes/EntityEquipmentToArmorAndHandFix.java b/src/net/minecraft/util/datafix/fixes/EntityEquipmentToArmorAndHandFix.java
index 43aad83..005de13 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityEquipmentToArmorAndHandFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityEquipmentToArmorAndHandFix.java
@@ -2,14 +2,15 @@ package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.Typed;
 import java.util.Iterator;
+import java.util.Optional;
 import com.mojang.datafixers.OpticFinder;
 import com.mojang.datafixers.util.Unit;
-import com.mojang.datafixers.util.Pair;
+import java.util.function.Function;
 import java.util.stream.Stream;
 import com.google.common.collect.Lists;
-import java.util.Optional;
+import com.mojang.datafixers.util.Pair;
 import java.util.List;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.util.Either;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.types.Type;
@@ -55,7 +56,7 @@ public class EntityEquipmentToArmorAndHandFix extends DataFix {
             optional9 = (Optional<List<Object>>)typed.getOptional(opticFinder7);
             if (optional9.isPresent()) {
                 list10 = optional9.get();
-                object11 = ((Optional)type.read(dynamic8.emptyMap()).getSecond()).<Throwable>orElseThrow(() -> new IllegalStateException("Could not parse newly created empty itemstack."));
+                object11 = type.read(dynamic8.emptyMap()).result().<Throwable>orElseThrow(() -> new IllegalStateException("Could not parse newly created empty itemstack.")).getFirst();
                 if (!list10.isEmpty()) {
                     either6 = (Either<List<Object>, Unit>)Either.left(Lists.newArrayList(list10.get(0), object11));
                 }
@@ -68,16 +69,16 @@ public class EntityEquipmentToArmorAndHandFix extends DataFix {
                 }
             }
             dynamic9 = dynamic8;
-            optional10 = dynamic8.get("DropChances").asStreamOpt();
+            optional10 = dynamic8.get("DropChances").asStreamOpt().result();
             if (optional10.isPresent()) {
                 iterator12 = Stream.concat(optional10.get(), Stream.generate(() -> dynamic9.createInt(0))).iterator();
                 float13 = ((Dynamic)iterator12.next()).asFloat(0.0f);
-                if (!dynamic8.get("HandDropChances").get().isPresent()) {
-                    dynamic10 = dynamic8.emptyMap().merge(dynamic8.createFloat(float13)).merge(dynamic8.createFloat(0.0f));
+                if (!dynamic8.get("HandDropChances").result().isPresent()) {
+                    dynamic10 = dynamic8.createList((Stream)Stream.<Float>of(new Float[] { float13, 0.0f }).map(dynamic8::createFloat));
                     dynamic8 = dynamic8.set("HandDropChances", (Dynamic)dynamic10);
                 }
-                if (!dynamic8.get("ArmorDropChances").get().isPresent()) {
-                    dynamic11 = dynamic8.emptyMap().merge(dynamic8.createFloat(((Dynamic)iterator12.next()).asFloat(0.0f))).merge(dynamic8.createFloat(((Dynamic)iterator12.next()).asFloat(0.0f))).merge(dynamic8.createFloat(((Dynamic)iterator12.next()).asFloat(0.0f))).merge(dynamic8.createFloat(((Dynamic)iterator12.next()).asFloat(0.0f)));
+                if (!dynamic8.get("ArmorDropChances").result().isPresent()) {
+                    dynamic11 = dynamic8.createList((Stream)Stream.<Float>of(new Float[] { ((Dynamic)iterator12.next()).asFloat(0.0f), ((Dynamic)iterator12.next()).asFloat(0.0f), ((Dynamic)iterator12.next()).asFloat(0.0f), ((Dynamic)iterator12.next()).asFloat(0.0f) }).map(dynamic8::createFloat));
                     dynamic8 = dynamic8.set("ArmorDropChances", (Dynamic)dynamic11);
                 }
                 dynamic8 = dynamic8.remove("DropChances");
diff --git a/src/net/minecraft/util/datafix/fixes/EntityHealthFix.java b/src/net/minecraft/util/datafix/fixes/EntityHealthFix.java
index 4c7332b..603a012 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityHealthFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityHealthFix.java
@@ -6,7 +6,7 @@ import java.util.function.Function;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import java.util.Optional;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 import java.util.Set;
 import com.mojang.datafixers.DataFix;
@@ -19,8 +19,8 @@ public class EntityHealthFix extends DataFix {
     }
     
     public Dynamic<?> fixTag(Dynamic<?> dynamic) {
-        final Optional<Number> optional4 = (Optional<Number>)dynamic.get("HealF").asNumber();
-        final Optional<Number> optional5 = (Optional<Number>)dynamic.get("Health").asNumber();
+        final Optional<Number> optional4 = (Optional<Number>)dynamic.get("HealF").asNumber().result();
+        final Optional<Number> optional5 = (Optional<Number>)dynamic.get("Health").asNumber().result();
         float float3;
         if (optional4.isPresent()) {
             float3 = optional4.get().floatValue();
diff --git a/src/net/minecraft/util/datafix/fixes/EntityHorseSaddleFix.java b/src/net/minecraft/util/datafix/fixes/EntityHorseSaddleFix.java
index 16e80ac..a7f673c 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityHorseSaddleFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityHorseSaddleFix.java
@@ -3,10 +3,11 @@ package net.minecraft.util.datafix.fixes;
 import java.util.Optional;
 import com.mojang.datafixers.util.Pair;
 import java.util.function.Supplier;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.OpticFinder;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.schemas.Schema;
 
@@ -17,7 +18,7 @@ public class EntityHorseSaddleFix extends NamedEntityFix {
     
     @Override
     protected Typed<?> fix(final Typed<?> typed) {
-        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final Type<?> type4 = this.getInputSchema().getTypeRaw(References.ITEM_STACK);
         final OpticFinder<?> opticFinder4 = DSL.fieldFinder("SaddleItem", (Type)type4);
         final Optional<? extends Typed<?>> optional6 = typed.getOptionalTyped((OpticFinder)opticFinder4);
diff --git a/src/net/minecraft/util/datafix/fixes/EntityHorseSplitFix.java b/src/net/minecraft/util/datafix/fixes/EntityHorseSplitFix.java
index a3390fa..1e45306 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityHorseSplitFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityHorseSplitFix.java
@@ -1,10 +1,10 @@
 package net.minecraft.util.datafix.fixes;
 
-import java.util.Optional;
+import java.util.function.Function;
 import com.mojang.datafixers.types.Type;
 import java.util.Objects;
 import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.schemas.Schema;
@@ -44,7 +44,7 @@ public class EntityHorseSplitFix extends EntityRenameFix {
             }
             dynamic4.remove("Type");
             final Type<?> type7 = this.getOutputSchema().findChoiceType(References.ENTITY).types().get(string2);
-            return (Pair<String, Typed<?>>)Pair.of(string2, ((Optional)type7.readTyped(typed.write()).getSecond()).<Throwable>orElseThrow(() -> new IllegalStateException("Could not parse the new horse")));
+            return (Pair<String, Typed<?>>)Pair.of(string2, typed.write().flatMap((Function)type7::readTyped).result().<Throwable>orElseThrow(() -> new IllegalStateException("Could not parse the new horse")).getFirst());
         }
         return (Pair<String, Typed<?>>)Pair.of(string, typed);
     }
diff --git a/src/net/minecraft/util/datafix/fixes/EntityIdFix.java b/src/net/minecraft/util/datafix/fixes/EntityIdFix.java
index 5900c20..76c1112 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityIdFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityIdFix.java
@@ -5,7 +5,7 @@ import com.google.common.collect.Maps;
 import java.util.HashMap;
 import com.mojang.datafixers.util.Pair;
 import java.util.function.Function;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.types.templates.TaggedChoice;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.TypeRewriteRule;
diff --git a/src/net/minecraft/util/datafix/fixes/EntityItemFrameDirectionFix.java b/src/net/minecraft/util/datafix/fixes/EntityItemFrameDirectionFix.java
index 6ca1dab..7593024 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityItemFrameDirectionFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityItemFrameDirectionFix.java
@@ -3,7 +3,7 @@ package net.minecraft.util.datafix.fixes;
 import java.util.function.Function;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class EntityItemFrameDirectionFix extends NamedEntityFix {
diff --git a/src/net/minecraft/util/datafix/fixes/EntityMinecartIdentifiersFix.java b/src/net/minecraft/util/datafix/fixes/EntityMinecartIdentifiersFix.java
index 9c58ed1..fcafa4a 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityMinecartIdentifiersFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityMinecartIdentifiersFix.java
@@ -1,14 +1,14 @@
 package net.minecraft.util.datafix.fixes;
 
 import com.google.common.collect.Lists;
+import com.mojang.serialization.DataResult;
 import java.util.function.Function;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.types.templates.TaggedChoice;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.types.Type;
-import java.util.Optional;
 import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.function.Supplier;
 import com.mojang.datafixers.Typed;
 import java.util.Objects;
@@ -29,22 +29,22 @@ public class EntityMinecartIdentifiersFix extends DataFix {
         final TaggedChoice.TaggedChoiceType<String> taggedChoiceType3 = (TaggedChoice.TaggedChoiceType<String>)this.getOutputSchema().findChoiceType(References.ENTITY);
         final TaggedChoice.TaggedChoiceType taggedChoiceType4;
         Typed<? extends Pair<String, ?>> typed5;
-        Dynamic<?> dynamic6;
+        Dynamic<?> dynamic2;
         int integer8;
         String string7;
         final TaggedChoice.TaggedChoiceType taggedChoiceType5;
         return this.fixTypeEverywhere("EntityMinecartIdentifiersFix", (Type)taggedChoiceType2, (Type)taggedChoiceType3, dynamicOps -> pair -> {
             if (Objects.equals(pair.getFirst(), "Minecart")) {
                 typed5 = taggedChoiceType4.point(dynamicOps, "Minecart", pair.getSecond()).orElseThrow(IllegalStateException::new);
-                dynamic6 = typed5.getOrCreate(DSL.remainderFinder());
-                integer8 = dynamic6.get("Type").asInt(0);
+                dynamic2 = typed5.getOrCreate(DSL.remainderFinder());
+                integer8 = dynamic2.get("Type").asInt(0);
                 if (integer8 > 0 && integer8 < EntityMinecartIdentifiersFix.MINECART_BY_ID.size()) {
                     string7 = EntityMinecartIdentifiersFix.MINECART_BY_ID.get(integer8);
                 }
                 else {
                     string7 = "MinecartRideable";
                 }
-                return Pair.of(string7, ((Optional)((Type)taggedChoiceType5.types().get(string7)).read(typed5.write()).getSecond()).orElseThrow(() -> new IllegalStateException("Could not read the new minecart.")));
+                return Pair.of(string7, typed5.write().map(dynamic -> taggedChoiceType5.types().get(string7).read(dynamic)).result().<Throwable>orElseThrow(() -> new IllegalStateException("Could not read the new minecart.")));
             }
             else {
                 return pair;
diff --git a/src/net/minecraft/util/datafix/fixes/EntityPaintingItemFrameDirectionFix.java b/src/net/minecraft/util/datafix/fixes/EntityPaintingItemFrameDirectionFix.java
index 49eeda7..4c57473 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityPaintingItemFrameDirectionFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityPaintingItemFrameDirectionFix.java
@@ -5,7 +5,7 @@ import com.mojang.datafixers.OpticFinder;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
 
@@ -17,16 +17,16 @@ public class EntityPaintingItemFrameDirectionFix extends DataFix {
     }
     
     private Dynamic<?> doFix(Dynamic<?> dynamic, final boolean boolean2, final boolean boolean3) {
-        if ((boolean2 || boolean3) && !dynamic.get("Facing").asNumber().isPresent()) {
+        if ((boolean2 || boolean3) && !dynamic.get("Facing").asNumber().result().isPresent()) {
             int integer5;
-            if (dynamic.get("Direction").asNumber().isPresent()) {
+            if (dynamic.get("Direction").asNumber().result().isPresent()) {
                 integer5 = dynamic.get("Direction").asByte((byte)0) % EntityPaintingItemFrameDirectionFix.DIRECTIONS.length;
                 final int[] arr6 = EntityPaintingItemFrameDirectionFix.DIRECTIONS[integer5];
                 dynamic = dynamic.set("TileX", dynamic.createInt(dynamic.get("TileX").asInt(0) + arr6[0]));
                 dynamic = dynamic.set("TileY", dynamic.createInt(dynamic.get("TileY").asInt(0) + arr6[1]));
                 dynamic = dynamic.set("TileZ", dynamic.createInt(dynamic.get("TileZ").asInt(0) + arr6[2]));
                 dynamic = dynamic.remove("Direction");
-                if (boolean3 && dynamic.get("ItemRotation").asNumber().isPresent()) {
+                if (boolean3 && dynamic.get("ItemRotation").asNumber().result().isPresent()) {
                     dynamic = dynamic.set("ItemRotation", dynamic.createByte((byte)(dynamic.get("ItemRotation").asByte((byte)0) * 2)));
                 }
             }
diff --git a/src/net/minecraft/util/datafix/fixes/EntityPaintingMotiveFix.java b/src/net/minecraft/util/datafix/fixes/EntityPaintingMotiveFix.java
index fb52a9c..72b533a 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityPaintingMotiveFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityPaintingMotiveFix.java
@@ -9,7 +9,7 @@ import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Locale;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 import java.util.Map;
 
@@ -21,7 +21,7 @@ public class EntityPaintingMotiveFix extends NamedEntityFix {
     }
     
     public Dynamic<?> fixTag(final Dynamic<?> dynamic) {
-        final Optional<String> optional3 = (Optional<String>)dynamic.get("Motive").asString();
+        final Optional<String> optional3 = (Optional<String>)dynamic.get("Motive").asString().result();
         if (optional3.isPresent()) {
             final String string4 = optional3.get().toLowerCase(Locale.ROOT);
             return dynamic.set("Motive", dynamic.createString(new ResourceLocation(EntityPaintingMotiveFix.MAP.getOrDefault(string4, string4)).toString()));
diff --git a/src/net/minecraft/util/datafix/fixes/EntityProjectileOwnerFix.java b/src/net/minecraft/util/datafix/fixes/EntityProjectileOwnerFix.java
new file mode 100644
index 0000000..a087975
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/EntityProjectileOwnerFix.java
@@ -0,0 +1,81 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.DSL;
+import java.util.Arrays;
+import com.mojang.serialization.OptionalDynamic;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.Typed;
+import java.util.function.Function;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import com.mojang.datafixers.DataFix;
+
+public class EntityProjectileOwnerFix extends DataFix {
+    public EntityProjectileOwnerFix(final Schema schema) {
+        super(schema, false);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        final Schema schema2 = this.getInputSchema();
+        return this.fixTypeEverywhereTyped("EntityProjectileOwner", schema2.getType(References.ENTITY), (Function)this::updateProjectiles);
+    }
+    
+    private Typed<?> updateProjectiles(Typed<?> typed) {
+        typed = this.updateEntity(typed, "minecraft:egg", this::updateOwnerThrowable);
+        typed = this.updateEntity(typed, "minecraft:ender_pearl", this::updateOwnerThrowable);
+        typed = this.updateEntity(typed, "minecraft:experience_bottle", this::updateOwnerThrowable);
+        typed = this.updateEntity(typed, "minecraft:snowball", this::updateOwnerThrowable);
+        typed = this.updateEntity(typed, "minecraft:potion", this::updateOwnerThrowable);
+        typed = this.updateEntity(typed, "minecraft:potion", this::updateItemPotion);
+        typed = this.updateEntity(typed, "minecraft:llama_spit", this::updateOwnerLlamaSpit);
+        typed = this.updateEntity(typed, "minecraft:arrow", this::updateOwnerArrow);
+        typed = this.updateEntity(typed, "minecraft:spectral_arrow", this::updateOwnerArrow);
+        typed = this.updateEntity(typed, "minecraft:trident", this::updateOwnerArrow);
+        return typed;
+    }
+    
+    private Dynamic<?> updateOwnerArrow(final Dynamic<?> dynamic) {
+        final long long3 = dynamic.get("OwnerUUIDMost").asLong(0L);
+        final long long4 = dynamic.get("OwnerUUIDLeast").asLong(0L);
+        return this.setUUID(dynamic, long3, long4).remove("OwnerUUIDMost").remove("OwnerUUIDLeast");
+    }
+    
+    private Dynamic<?> updateOwnerLlamaSpit(final Dynamic<?> dynamic) {
+        final OptionalDynamic<?> optionalDynamic3 = dynamic.get("Owner");
+        final long long4 = optionalDynamic3.get("OwnerUUIDMost").asLong(0L);
+        final long long5 = optionalDynamic3.get("OwnerUUIDLeast").asLong(0L);
+        return this.setUUID(dynamic, long4, long5).remove("Owner");
+    }
+    
+    private Dynamic<?> updateItemPotion(final Dynamic<?> dynamic) {
+        final OptionalDynamic<?> optionalDynamic3 = dynamic.get("Potion");
+        return dynamic.set("Item", optionalDynamic3.orElseEmptyMap()).remove("Potion");
+    }
+    
+    private Dynamic<?> updateOwnerThrowable(final Dynamic<?> dynamic) {
+        final String string3 = "owner";
+        final OptionalDynamic<?> optionalDynamic4 = dynamic.get("owner");
+        final long long5 = optionalDynamic4.get("M").asLong(0L);
+        final long long6 = optionalDynamic4.get("L").asLong(0L);
+        return this.setUUID(dynamic, long5, long6).remove("owner");
+    }
+    
+    private Dynamic<?> setUUID(final Dynamic<?> dynamic, final long long2, final long long3) {
+        final String string7 = "OwnerUUID";
+        if (long2 != 0L && long3 != 0L) {
+            return dynamic.set("OwnerUUID", dynamic.createIntList(Arrays.stream(createUUIDArray(long2, long3))));
+        }
+        return dynamic;
+    }
+    
+    private static int[] createUUIDArray(final long long1, final long long2) {
+        return new int[] { (int)(long1 >> 32), (int)long1, (int)(long2 >> 32), (int)long2 };
+    }
+    
+    private Typed<?> updateEntity(final Typed<?> typed, final String string, final Function<Dynamic<?>, Dynamic<?>> function) {
+        final Type<?> type5 = this.getInputSchema().getChoiceType(References.ENTITY, string);
+        final Type<?> type6 = this.getOutputSchema().getChoiceType(References.ENTITY, string);
+        return typed.updateTyped(DSL.namedChoice(string, (Type)type5), (Type)type6, typed -> typed.update(DSL.remainderFinder(), (Function)function));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/EntityRedundantChanceTagsFix.java b/src/net/minecraft/util/datafix/fixes/EntityRedundantChanceTagsFix.java
index b335400..3f4550a 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityRedundantChanceTagsFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityRedundantChanceTagsFix.java
@@ -1,31 +1,40 @@
 package net.minecraft.util.datafix.fixes;
 
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.Typed;
-import java.util.Objects;
-import com.mojang.datafixers.Dynamic;
-import java.util.Optional;
-import java.util.stream.Stream;
+import java.util.function.Function;
+import com.mojang.serialization.OptionalDynamic;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
+import java.util.List;
+import com.mojang.serialization.Codec;
 import com.mojang.datafixers.DataFix;
 
 public class EntityRedundantChanceTagsFix extends DataFix {
+    private static final Codec<List<Float>> FLOAT_LIST_CODEC;
+    
     public EntityRedundantChanceTagsFix(final Schema schema, final boolean boolean2) {
         super(schema, boolean2);
     }
     
     public TypeRewriteRule makeRule() {
-        final Dynamic<?> dynamic2;
         return this.fixTypeEverywhereTyped("EntityRedundantChanceTagsFix", this.getInputSchema().getType(References.ENTITY), typed -> typed.update(DSL.remainderFinder(), dynamic -> {
-            dynamic2 = dynamic;
-            if (Objects.equals(dynamic.get("HandDropChances"), Optional.<Dynamic>of(dynamic.createList((Stream)Stream.generate(() -> dynamic2.createFloat(0.0f)).limit(2L))))) {
+            if (isZeroList(dynamic.get("HandDropChances"), 2)) {
                 dynamic = dynamic.remove("HandDropChances");
             }
-            if (Objects.equals(dynamic.get("ArmorDropChances"), Optional.<Dynamic>of(dynamic.createList((Stream)Stream.generate(() -> dynamic2.createFloat(0.0f)).limit(4L))))) {
+            if (isZeroList(dynamic.get("ArmorDropChances"), 4)) {
                 dynamic = dynamic.remove("ArmorDropChances");
             }
             return dynamic;
         }));
     }
+    
+    private static boolean isZeroList(final OptionalDynamic<?> optionalDynamic, final int integer) {
+        return optionalDynamic.flatMap((Function)EntityRedundantChanceTagsFix.FLOAT_LIST_CODEC::parse).map(list -> list.size() == integer && list.stream().allMatch(float1 -> float1 == 0.0f)).result().orElse(false);
+    }
+    
+    static {
+        FLOAT_LIST_CODEC = Codec.FLOAT.listOf();
+    }
 }
diff --git a/src/net/minecraft/util/datafix/fixes/EntityRenameFix.java b/src/net/minecraft/util/datafix/fixes/EntityRenameFix.java
index 93a703d..21d1458 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityRenameFix.java
@@ -1,7 +1,7 @@
 package net.minecraft.util.datafix.fixes;
 
 import java.util.function.Function;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.types.templates.TaggedChoice;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.Typed;
diff --git a/src/net/minecraft/util/datafix/fixes/EntityRidingToPassengersFix.java b/src/net/minecraft/util/datafix/fixes/EntityRidingToPassengersFix.java
index 5fb3c2e..ad88ca2 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityRidingToPassengersFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityRidingToPassengersFix.java
@@ -1,7 +1,7 @@
 package net.minecraft.util.datafix.fixes;
 
 import java.util.function.Function;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.OpticFinder;
 import com.mojang.datafixers.DataFixUtils;
 import com.google.common.collect.ImmutableList;
diff --git a/src/net/minecraft/util/datafix/fixes/EntityShulkerColorFix.java b/src/net/minecraft/util/datafix/fixes/EntityShulkerColorFix.java
index ca00765..706c467 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityShulkerColorFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityShulkerColorFix.java
@@ -3,7 +3,7 @@ package net.minecraft.util.datafix.fixes;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
 import java.util.function.Function;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class EntityShulkerColorFix extends NamedEntityFix {
@@ -12,7 +12,7 @@ public class EntityShulkerColorFix extends NamedEntityFix {
     }
     
     public Dynamic<?> fixTag(final Dynamic<?> dynamic) {
-        if (!dynamic.get("Color").map((Function)Dynamic::asNumber).isPresent()) {
+        if (!dynamic.get("Color").map((Function)Dynamic::asNumber).result().isPresent()) {
             return dynamic.set("Color", dynamic.createByte((byte)10));
         }
         return dynamic;
diff --git a/src/net/minecraft/util/datafix/fixes/EntityShulkerRotationFix.java b/src/net/minecraft/util/datafix/fixes/EntityShulkerRotationFix.java
new file mode 100644
index 0000000..a4699ba
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/EntityShulkerRotationFix.java
@@ -0,0 +1,29 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.Typed;
+import java.util.List;
+import java.util.stream.Stream;
+import java.util.function.Function;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.schemas.Schema;
+
+public class EntityShulkerRotationFix extends NamedEntityFix {
+    public EntityShulkerRotationFix(final Schema schema) {
+        super(schema, false, "EntityShulkerRotationFix", References.ENTITY, "minecraft:shulker");
+    }
+    
+    public Dynamic<?> fixTag(final Dynamic<?> dynamic) {
+        final List<Double> list3 = (List<Double>)dynamic.get("Rotation").asList(dynamic -> dynamic.asDouble(180.0));
+        if (!list3.isEmpty()) {
+            list3.set(0, list3.get(0) - 180.0);
+            return dynamic.set("Rotation", dynamic.createList((Stream)list3.stream().map(dynamic::createDouble)));
+        }
+        return dynamic;
+    }
+    
+    @Override
+    protected Typed<?> fix(final Typed<?> typed) {
+        return typed.update(DSL.remainderFinder(), (Function)this::fixTag);
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/EntitySkeletonSplitFix.java b/src/net/minecraft/util/datafix/fixes/EntitySkeletonSplitFix.java
index e1a919f..ee29c3b 100644
--- a/src/net/minecraft/util/datafix/fixes/EntitySkeletonSplitFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntitySkeletonSplitFix.java
@@ -2,7 +2,7 @@ package net.minecraft.util.datafix.fixes;
 
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class EntitySkeletonSplitFix extends SimpleEntityRenameFix {
diff --git a/src/net/minecraft/util/datafix/fixes/EntityStringUuidFix.java b/src/net/minecraft/util/datafix/fixes/EntityStringUuidFix.java
index 6142048..2f82421 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityStringUuidFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityStringUuidFix.java
@@ -1,6 +1,6 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import java.util.UUID;
@@ -18,7 +18,7 @@ public class EntityStringUuidFix extends DataFix {
         final Optional optional2;
         UUID uUID3;
         return this.fixTypeEverywhereTyped("EntityStringUuidFix", this.getInputSchema().getType(References.ENTITY), typed -> typed.update(DSL.remainderFinder(), dynamic -> {
-            optional2 = dynamic.get("UUID").asString();
+            optional2 = dynamic.get("UUID").asString().result();
             if (optional2.isPresent()) {
                 uUID3 = UUID.fromString(optional2.get());
                 return dynamic.remove("UUID").set("UUIDMost", dynamic.createLong(uUID3.getMostSignificantBits())).set("UUIDLeast", dynamic.createLong(uUID3.getLeastSignificantBits()));
diff --git a/src/net/minecraft/util/datafix/fixes/EntityUUIDFix.java b/src/net/minecraft/util/datafix/fixes/EntityUUIDFix.java
new file mode 100644
index 0000000..6ccad4c
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/EntityUUIDFix.java
@@ -0,0 +1,243 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.google.common.collect.Sets;
+import com.mojang.datafixers.Typed;
+import java.util.Optional;
+import com.mojang.datafixers.DataFixUtils;
+import java.util.stream.Stream;
+import com.mojang.serialization.Dynamic;
+import java.util.Iterator;
+import java.util.function.Function;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import java.util.Set;
+
+public class EntityUUIDFix extends AbstractUUIDFix {
+    private static final Set<String> ABSTRACT_HORSES;
+    private static final Set<String> TAMEABLE_ANIMALS;
+    private static final Set<String> ANIMALS;
+    private static final Set<String> MOBS;
+    private static final Set<String> LIVING_ENTITIES;
+    private static final Set<String> PROJECTILES;
+    
+    public EntityUUIDFix(final Schema schema) {
+        super(schema, References.ENTITY);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        final Iterator<String> iterator;
+        String string4;
+        final Iterator<String> iterator2;
+        String string5;
+        final Iterator<String> iterator3;
+        String string6;
+        final Iterator<String> iterator4;
+        String string7;
+        final Iterator<String> iterator5;
+        String string8;
+        final Iterator<String> iterator6;
+        String string9;
+        return this.fixTypeEverywhereTyped("EntityUUIDFixes", this.getInputSchema().getType(this.typeReference), typed -> {
+            typed = typed.update(DSL.remainderFinder(), (Function)EntityUUIDFix::updateEntityUUID);
+            EntityUUIDFix.ABSTRACT_HORSES.iterator();
+            while (iterator.hasNext()) {
+                string4 = iterator.next();
+                typed = this.updateNamedChoice(typed, string4, EntityUUIDFix::updateAnimalOwner);
+            }
+            EntityUUIDFix.TAMEABLE_ANIMALS.iterator();
+            while (iterator2.hasNext()) {
+                string5 = iterator2.next();
+                typed = this.updateNamedChoice(typed, string5, EntityUUIDFix::updateAnimalOwner);
+            }
+            EntityUUIDFix.ANIMALS.iterator();
+            while (iterator3.hasNext()) {
+                string6 = iterator3.next();
+                typed = this.updateNamedChoice(typed, string6, EntityUUIDFix::updateAnimal);
+            }
+            EntityUUIDFix.MOBS.iterator();
+            while (iterator4.hasNext()) {
+                string7 = iterator4.next();
+                typed = this.updateNamedChoice(typed, string7, EntityUUIDFix::updateMob);
+            }
+            EntityUUIDFix.LIVING_ENTITIES.iterator();
+            while (iterator5.hasNext()) {
+                string8 = iterator5.next();
+                typed = this.updateNamedChoice(typed, string8, EntityUUIDFix::updateLivingEntity);
+            }
+            EntityUUIDFix.PROJECTILES.iterator();
+            while (iterator6.hasNext()) {
+                string9 = iterator6.next();
+                typed = this.updateNamedChoice(typed, string9, EntityUUIDFix::updateProjectile);
+            }
+            typed = this.updateNamedChoice(typed, "minecraft:bee", EntityUUIDFix::updateHurtBy);
+            typed = this.updateNamedChoice(typed, "minecraft:zombified_piglin", EntityUUIDFix::updateHurtBy);
+            typed = this.updateNamedChoice(typed, "minecraft:fox", EntityUUIDFix::updateFox);
+            typed = this.updateNamedChoice(typed, "minecraft:item", EntityUUIDFix::updateItem);
+            typed = this.updateNamedChoice(typed, "minecraft:shulker_bullet", EntityUUIDFix::updateShulkerBullet);
+            typed = this.updateNamedChoice(typed, "minecraft:area_effect_cloud", EntityUUIDFix::updateAreaEffectCloud);
+            typed = this.updateNamedChoice(typed, "minecraft:zombie_villager", EntityUUIDFix::updateZombieVillager);
+            typed = this.updateNamedChoice(typed, "minecraft:evoker_fangs", EntityUUIDFix::updateEvokerFangs);
+            typed = this.updateNamedChoice(typed, "minecraft:piglin", EntityUUIDFix::updatePiglin);
+            return typed;
+        });
+    }
+    
+    private static Dynamic<?> updatePiglin(final Dynamic<?> dynamic) {
+        return dynamic.update("Brain", dynamic -> dynamic.update("memories", dynamic -> dynamic.update("minecraft:angry_at", dynamic -> AbstractUUIDFix.replaceUUIDString(dynamic, "value", "value").orElseGet(() -> {
+            EntityUUIDFix.LOGGER.warn("angry_at has no value.");
+            return dynamic;
+        }))));
+    }
+    
+    private static Dynamic<?> updateEvokerFangs(final Dynamic<?> dynamic) {
+        return AbstractUUIDFix.replaceUUIDLeastMost(dynamic, "OwnerUUID", "Owner").orElse(dynamic);
+    }
+    
+    private static Dynamic<?> updateZombieVillager(final Dynamic<?> dynamic) {
+        return AbstractUUIDFix.replaceUUIDLeastMost(dynamic, "ConversionPlayer", "ConversionPlayer").orElse(dynamic);
+    }
+    
+    private static Dynamic<?> updateAreaEffectCloud(final Dynamic<?> dynamic) {
+        return AbstractUUIDFix.replaceUUIDLeastMost(dynamic, "OwnerUUID", "Owner").orElse(dynamic);
+    }
+    
+    private static Dynamic<?> updateShulkerBullet(Dynamic<?> dynamic) {
+        dynamic = AbstractUUIDFix.replaceUUIDMLTag(dynamic, "Owner", "Owner").orElse(dynamic);
+        return AbstractUUIDFix.replaceUUIDMLTag(dynamic, "Target", "Target").orElse(dynamic);
+    }
+    
+    private static Dynamic<?> updateItem(Dynamic<?> dynamic) {
+        dynamic = AbstractUUIDFix.replaceUUIDMLTag(dynamic, "Owner", "Owner").orElse(dynamic);
+        return AbstractUUIDFix.replaceUUIDMLTag(dynamic, "Thrower", "Thrower").orElse(dynamic);
+    }
+    
+    private static Dynamic<?> updateFox(final Dynamic<?> dynamic) {
+        final Optional<Dynamic<?>> optional2 = dynamic.get("TrustedUUIDs").result().<Dynamic<?>>map(dynamic2 -> dynamic.createList((Stream)dynamic2.asStream().map(dynamic -> AbstractUUIDFix.createUUIDFromML(dynamic).orElseGet(() -> {
+            EntityUUIDFix.LOGGER.warn("Trusted contained invalid data.");
+            return dynamic;
+        }))));
+        return DataFixUtils.orElse((Optional)optional2.map(dynamic2 -> dynamic.remove("TrustedUUIDs").set("Trusted", dynamic2)), dynamic);
+    }
+    
+    private static Dynamic<?> updateHurtBy(final Dynamic<?> dynamic) {
+        return AbstractUUIDFix.replaceUUIDString(dynamic, "HurtBy", "HurtBy").orElse(dynamic);
+    }
+    
+    private static Dynamic<?> updateAnimalOwner(final Dynamic<?> dynamic) {
+        final Dynamic<?> dynamic2 = updateAnimal(dynamic);
+        return AbstractUUIDFix.replaceUUIDString(dynamic2, "OwnerUUID", "Owner").orElse(dynamic2);
+    }
+    
+    private static Dynamic<?> updateAnimal(final Dynamic<?> dynamic) {
+        final Dynamic<?> dynamic2 = updateMob(dynamic);
+        return AbstractUUIDFix.replaceUUIDLeastMost(dynamic2, "LoveCause", "LoveCause").orElse(dynamic2);
+    }
+    
+    private static Dynamic<?> updateMob(final Dynamic<?> dynamic) {
+        return updateLivingEntity(dynamic).update("Leash", dynamic -> AbstractUUIDFix.replaceUUIDLeastMost(dynamic, "UUID", "UUID").orElse(dynamic));
+    }
+    
+    public static Dynamic<?> updateLivingEntity(final Dynamic<?> dynamic) {
+        return dynamic.update("Attributes", dynamic2 -> dynamic.createList((Stream)dynamic2.asStream().map(dynamic -> dynamic.update("Modifiers", dynamic2 -> dynamic.createList((Stream)dynamic2.asStream().map(dynamic -> AbstractUUIDFix.replaceUUIDLeastMost(dynamic, "UUID", "UUID").orElse(dynamic)))))));
+    }
+    
+    private static Dynamic<?> updateProjectile(final Dynamic<?> dynamic) {
+        return DataFixUtils.orElse((Optional)dynamic.get("OwnerUUID").result().map(dynamic2 -> dynamic.remove("OwnerUUID").set("Owner", dynamic2)), dynamic);
+    }
+    
+    public static Dynamic<?> updateEntityUUID(final Dynamic<?> dynamic) {
+        return AbstractUUIDFix.replaceUUIDLeastMost(dynamic, "UUID", "UUID").orElse(dynamic);
+    }
+    
+    static {
+        ABSTRACT_HORSES = Sets.newHashSet();
+        TAMEABLE_ANIMALS = Sets.newHashSet();
+        ANIMALS = Sets.newHashSet();
+        MOBS = Sets.newHashSet();
+        LIVING_ENTITIES = Sets.newHashSet();
+        PROJECTILES = Sets.newHashSet();
+        EntityUUIDFix.ABSTRACT_HORSES.add("minecraft:donkey");
+        EntityUUIDFix.ABSTRACT_HORSES.add("minecraft:horse");
+        EntityUUIDFix.ABSTRACT_HORSES.add("minecraft:llama");
+        EntityUUIDFix.ABSTRACT_HORSES.add("minecraft:mule");
+        EntityUUIDFix.ABSTRACT_HORSES.add("minecraft:skeleton_horse");
+        EntityUUIDFix.ABSTRACT_HORSES.add("minecraft:trader_llama");
+        EntityUUIDFix.ABSTRACT_HORSES.add("minecraft:zombie_horse");
+        EntityUUIDFix.TAMEABLE_ANIMALS.add("minecraft:cat");
+        EntityUUIDFix.TAMEABLE_ANIMALS.add("minecraft:parrot");
+        EntityUUIDFix.TAMEABLE_ANIMALS.add("minecraft:wolf");
+        EntityUUIDFix.ANIMALS.add("minecraft:bee");
+        EntityUUIDFix.ANIMALS.add("minecraft:chicken");
+        EntityUUIDFix.ANIMALS.add("minecraft:cow");
+        EntityUUIDFix.ANIMALS.add("minecraft:fox");
+        EntityUUIDFix.ANIMALS.add("minecraft:mooshroom");
+        EntityUUIDFix.ANIMALS.add("minecraft:ocelot");
+        EntityUUIDFix.ANIMALS.add("minecraft:panda");
+        EntityUUIDFix.ANIMALS.add("minecraft:pig");
+        EntityUUIDFix.ANIMALS.add("minecraft:polar_bear");
+        EntityUUIDFix.ANIMALS.add("minecraft:rabbit");
+        EntityUUIDFix.ANIMALS.add("minecraft:sheep");
+        EntityUUIDFix.ANIMALS.add("minecraft:turtle");
+        EntityUUIDFix.ANIMALS.add("minecraft:hoglin");
+        EntityUUIDFix.MOBS.add("minecraft:bat");
+        EntityUUIDFix.MOBS.add("minecraft:blaze");
+        EntityUUIDFix.MOBS.add("minecraft:cave_spider");
+        EntityUUIDFix.MOBS.add("minecraft:cod");
+        EntityUUIDFix.MOBS.add("minecraft:creeper");
+        EntityUUIDFix.MOBS.add("minecraft:dolphin");
+        EntityUUIDFix.MOBS.add("minecraft:drowned");
+        EntityUUIDFix.MOBS.add("minecraft:elder_guardian");
+        EntityUUIDFix.MOBS.add("minecraft:ender_dragon");
+        EntityUUIDFix.MOBS.add("minecraft:enderman");
+        EntityUUIDFix.MOBS.add("minecraft:endermite");
+        EntityUUIDFix.MOBS.add("minecraft:evoker");
+        EntityUUIDFix.MOBS.add("minecraft:ghast");
+        EntityUUIDFix.MOBS.add("minecraft:giant");
+        EntityUUIDFix.MOBS.add("minecraft:guardian");
+        EntityUUIDFix.MOBS.add("minecraft:husk");
+        EntityUUIDFix.MOBS.add("minecraft:illusioner");
+        EntityUUIDFix.MOBS.add("minecraft:magma_cube");
+        EntityUUIDFix.MOBS.add("minecraft:pufferfish");
+        EntityUUIDFix.MOBS.add("minecraft:zombified_piglin");
+        EntityUUIDFix.MOBS.add("minecraft:salmon");
+        EntityUUIDFix.MOBS.add("minecraft:shulker");
+        EntityUUIDFix.MOBS.add("minecraft:silverfish");
+        EntityUUIDFix.MOBS.add("minecraft:skeleton");
+        EntityUUIDFix.MOBS.add("minecraft:slime");
+        EntityUUIDFix.MOBS.add("minecraft:snow_golem");
+        EntityUUIDFix.MOBS.add("minecraft:spider");
+        EntityUUIDFix.MOBS.add("minecraft:squid");
+        EntityUUIDFix.MOBS.add("minecraft:stray");
+        EntityUUIDFix.MOBS.add("minecraft:tropical_fish");
+        EntityUUIDFix.MOBS.add("minecraft:vex");
+        EntityUUIDFix.MOBS.add("minecraft:villager");
+        EntityUUIDFix.MOBS.add("minecraft:iron_golem");
+        EntityUUIDFix.MOBS.add("minecraft:vindicator");
+        EntityUUIDFix.MOBS.add("minecraft:pillager");
+        EntityUUIDFix.MOBS.add("minecraft:wandering_trader");
+        EntityUUIDFix.MOBS.add("minecraft:witch");
+        EntityUUIDFix.MOBS.add("minecraft:wither");
+        EntityUUIDFix.MOBS.add("minecraft:wither_skeleton");
+        EntityUUIDFix.MOBS.add("minecraft:zombie");
+        EntityUUIDFix.MOBS.add("minecraft:zombie_villager");
+        EntityUUIDFix.MOBS.add("minecraft:phantom");
+        EntityUUIDFix.MOBS.add("minecraft:ravager");
+        EntityUUIDFix.MOBS.add("minecraft:piglin");
+        EntityUUIDFix.LIVING_ENTITIES.add("minecraft:armor_stand");
+        EntityUUIDFix.PROJECTILES.add("minecraft:arrow");
+        EntityUUIDFix.PROJECTILES.add("minecraft:dragon_fireball");
+        EntityUUIDFix.PROJECTILES.add("minecraft:firework_rocket");
+        EntityUUIDFix.PROJECTILES.add("minecraft:fireball");
+        EntityUUIDFix.PROJECTILES.add("minecraft:llama_spit");
+        EntityUUIDFix.PROJECTILES.add("minecraft:small_fireball");
+        EntityUUIDFix.PROJECTILES.add("minecraft:snowball");
+        EntityUUIDFix.PROJECTILES.add("minecraft:spectral_arrow");
+        EntityUUIDFix.PROJECTILES.add("minecraft:egg");
+        EntityUUIDFix.PROJECTILES.add("minecraft:ender_pearl");
+        EntityUUIDFix.PROJECTILES.add("minecraft:experience_bottle");
+        EntityUUIDFix.PROJECTILES.add("minecraft:potion");
+        EntityUUIDFix.PROJECTILES.add("minecraft:trident");
+        EntityUUIDFix.PROJECTILES.add("minecraft:wither_skull");
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/EntityWolfColorFix.java b/src/net/minecraft/util/datafix/fixes/EntityWolfColorFix.java
index a2ed998..e1e9c06 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityWolfColorFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityWolfColorFix.java
@@ -3,7 +3,7 @@ package net.minecraft.util.datafix.fixes;
 import java.util.function.Function;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class EntityWolfColorFix extends NamedEntityFix {
diff --git a/src/net/minecraft/util/datafix/fixes/EntityZombieSplitFix.java b/src/net/minecraft/util/datafix/fixes/EntityZombieSplitFix.java
index af3ac26..a515e13 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityZombieSplitFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityZombieSplitFix.java
@@ -2,7 +2,7 @@ package net.minecraft.util.datafix.fixes;
 
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 
 public class EntityZombieSplitFix extends SimpleEntityRenameFix {
diff --git a/src/net/minecraft/util/datafix/fixes/EntityZombieVillagerTypeFix.java b/src/net/minecraft/util/datafix/fixes/EntityZombieVillagerTypeFix.java
index 94388e1..f83cf17 100644
--- a/src/net/minecraft/util/datafix/fixes/EntityZombieVillagerTypeFix.java
+++ b/src/net/minecraft/util/datafix/fixes/EntityZombieVillagerTypeFix.java
@@ -3,7 +3,7 @@ package net.minecraft.util.datafix.fixes;
 import java.util.function.Function;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 import java.util.Random;
 
@@ -16,7 +16,7 @@ public class EntityZombieVillagerTypeFix extends NamedEntityFix {
     
     public Dynamic<?> fixTag(Dynamic<?> dynamic) {
         if (dynamic.get("IsVillager").asBoolean(false)) {
-            if (!dynamic.get("ZombieType").get().isPresent()) {
+            if (!dynamic.get("ZombieType").result().isPresent()) {
                 int integer3 = this.getVillagerProfession(dynamic.get("VillagerProfession").asInt(-1));
                 if (integer3 == -1) {
                     integer3 = this.getVillagerProfession(EntityZombieVillagerTypeFix.RANDOM.nextInt(6));
diff --git a/src/net/minecraft/util/datafix/fixes/EntityZombifiedPiglinRenameFix.java b/src/net/minecraft/util/datafix/fixes/EntityZombifiedPiglinRenameFix.java
new file mode 100644
index 0000000..af0debb
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/EntityZombifiedPiglinRenameFix.java
@@ -0,0 +1,23 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Objects;
+import com.mojang.datafixers.schemas.Schema;
+import java.util.Map;
+
+public class EntityZombifiedPiglinRenameFix extends SimplestEntityRenameFix {
+    public static final Map<String, String> RENAMED_IDS;
+    
+    public EntityZombifiedPiglinRenameFix(final Schema schema) {
+        super("EntityZombifiedPiglinRenameFix", schema, true);
+    }
+    
+    @Override
+    protected String rename(final String string) {
+        return Objects.equals("minecraft:zombie_pigman", string) ? "minecraft:zombified_piglin" : string;
+    }
+    
+    static {
+        RENAMED_IDS = ImmutableMap.<String, String>builder().put("minecraft:zombie_pigman_spawn_egg", "minecraft:zombified_piglin_spawn_egg").build();
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/ForcePoiRebuild.java b/src/net/minecraft/util/datafix/fixes/ForcePoiRebuild.java
index 1d7dc78..64ef06d 100644
--- a/src/net/minecraft/util/datafix/fixes/ForcePoiRebuild.java
+++ b/src/net/minecraft/util/datafix/fixes/ForcePoiRebuild.java
@@ -1,7 +1,7 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.types.DynamicOps;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.types.Type;
 import java.util.function.Function;
diff --git a/src/net/minecraft/util/datafix/fixes/FurnaceRecipeFix.java b/src/net/minecraft/util/datafix/fixes/FurnaceRecipeFix.java
new file mode 100644
index 0000000..489074b
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/FurnaceRecipeFix.java
@@ -0,0 +1,67 @@
+package net.minecraft.util.datafix.fixes;
+
+import java.util.Optional;
+import com.google.common.collect.Lists;
+import com.mojang.datafixers.Typed;
+import com.mojang.datafixers.util.Unit;
+import com.mojang.serialization.Dynamic;
+import java.util.List;
+import com.mojang.datafixers.util.Either;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.OpticFinder;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import com.mojang.datafixers.DataFix;
+
+public class FurnaceRecipeFix extends DataFix {
+    public FurnaceRecipeFix(final Schema schema, final boolean boolean2) {
+        super(schema, boolean2);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        return this.cap((com.mojang.datafixers.types.Type<Object>)this.getOutputSchema().getTypeRaw(References.RECIPE));
+    }
+    
+    private <R> TypeRewriteRule cap(final Type<R> type) {
+        final Type<Pair<Either<Pair<List<Pair<R, Integer>>, Dynamic<?>>, Unit>, Dynamic<?>>> type2 = (Type<Pair<Either<Pair<List<Pair<R, Integer>>, Dynamic<?>>, Unit>, Dynamic<?>>>)DSL.and(DSL.optional((Type)DSL.field("RecipesUsed", DSL.and((Type)DSL.compoundList((Type)type, DSL.intType()), DSL.remainderType()))), DSL.remainderType());
+        final OpticFinder<?> opticFinder4 = DSL.namedChoice("minecraft:furnace", this.getInputSchema().getChoiceType(References.BLOCK_ENTITY, "minecraft:furnace"));
+        final OpticFinder<?> opticFinder5 = DSL.namedChoice("minecraft:blast_furnace", this.getInputSchema().getChoiceType(References.BLOCK_ENTITY, "minecraft:blast_furnace"));
+        final OpticFinder<?> opticFinder6 = DSL.namedChoice("minecraft:smoker", this.getInputSchema().getChoiceType(References.BLOCK_ENTITY, "minecraft:smoker"));
+        final Type<?> type3 = this.getOutputSchema().getChoiceType(References.BLOCK_ENTITY, "minecraft:furnace");
+        final Type<?> type4 = this.getOutputSchema().getChoiceType(References.BLOCK_ENTITY, "minecraft:blast_furnace");
+        final Type<?> type5 = this.getOutputSchema().getChoiceType(References.BLOCK_ENTITY, "minecraft:smoker");
+        final Type<?> type6 = this.getInputSchema().getType(References.BLOCK_ENTITY);
+        final Type<?> type7 = this.getOutputSchema().getType(References.BLOCK_ENTITY);
+        final OpticFinder opticFinder7;
+        final Type type8;
+        final com.mojang.datafixers.types.Type<com.mojang.datafixers.util.Pair<com.mojang.datafixers.util.Either<com.mojang.datafixers.util.Pair<List<com.mojang.datafixers.util.Pair<R, Integer>>, Dynamic<?>>, Unit>, Dynamic<?>>> type9;
+        return this.fixTypeEverywhereTyped("FurnaceRecipesFix", (Type)type6, (Type)type7, typed -> typed.updateTyped(opticFinder7, type8, typed -> this.<R>updateFurnaceContents(type, type9, typed)).updateTyped((OpticFinder)opticFinder5, (Type)type4, typed -> this.<R>updateFurnaceContents(type, type9, typed)).updateTyped((OpticFinder)opticFinder6, (Type)type5, typed -> this.<R>updateFurnaceContents(type, type9, typed)));
+    }
+    
+    private <R> Typed<?> updateFurnaceContents(final Type<R> type1, final Type<Pair<Either<Pair<List<Pair<R, Integer>>, Dynamic<?>>, Unit>, Dynamic<?>>> type2, final Typed<?> typed) {
+        Dynamic<?> dynamic2 = typed.getOrCreate(DSL.remainderFinder());
+        final int integer6 = dynamic2.get("RecipesUsedSize").asInt(0);
+        dynamic2 = dynamic2.remove("RecipesUsedSize");
+        final List<Pair<R, Integer>> list7 = Lists.newArrayList();
+        for (int integer7 = 0; integer7 < integer6; ++integer7) {
+            final String string9 = "RecipeLocation" + integer7;
+            final String string10 = "RecipeAmount" + integer7;
+            final Optional<? extends Dynamic<?>> optional11 = dynamic2.get(string9).result();
+            final int integer8 = dynamic2.get(string10).asInt(0);
+            if (integer8 > 0) {
+                final Optional<? extends Pair<Object, ? extends Dynamic<?>>> optional12;
+                final List<Pair> list8;
+                final int i;
+                optional11.ifPresent(dynamic -> {
+                    optional12 = type1.read(dynamic).result();
+                    optional12.ifPresent(pair -> list8.add(Pair.of(pair.getFirst(), i)));
+                    return;
+                });
+            }
+            dynamic2 = dynamic2.remove(string9).remove(string10);
+        }
+        return typed.set(DSL.remainderFinder(), (Type)type2, Pair.of((Object)Either.left((Object)Pair.of((Object)list7, (Object)dynamic2.emptyMap())), (Object)dynamic2));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/GossipUUIDFix.java b/src/net/minecraft/util/datafix/fixes/GossipUUIDFix.java
new file mode 100644
index 0000000..3b1ffb2
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/GossipUUIDFix.java
@@ -0,0 +1,21 @@
+package net.minecraft.util.datafix.fixes;
+
+import java.util.stream.Stream;
+import java.util.Optional;
+import com.mojang.datafixers.DataFixUtils;
+import java.util.function.Function;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.Typed;
+import com.mojang.datafixers.schemas.Schema;
+
+public class GossipUUIDFix extends NamedEntityFix {
+    public GossipUUIDFix(final Schema schema, final String string) {
+        super(schema, false, "Gossip for for " + string, References.ENTITY, string);
+    }
+    
+    @Override
+    protected Typed<?> fix(final Typed<?> typed) {
+        return typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("Gossips", dynamic -> (Dynamic)DataFixUtils.orElse((Optional)((Dynamic)dynamic).asStreamOpt().result().map(stream -> stream.map(dynamic -> AbstractUUIDFix.replaceUUIDLeastMost(dynamic, "Target", "Target").orElse(dynamic))).map(dynamic::createList), dynamic)));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/HeightmapRenamingFix.java b/src/net/minecraft/util/datafix/fixes/HeightmapRenamingFix.java
index f1f10cd..78a483b 100644
--- a/src/net/minecraft/util/datafix/fixes/HeightmapRenamingFix.java
+++ b/src/net/minecraft/util/datafix/fixes/HeightmapRenamingFix.java
@@ -2,7 +2,7 @@ package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.OpticFinder;
 import java.util.function.Function;
@@ -23,28 +23,28 @@ public class HeightmapRenamingFix extends DataFix {
     }
     
     private Dynamic<?> fix(final Dynamic<?> dynamic) {
-        final Optional<? extends Dynamic<?>> optional3 = dynamic.get("Heightmaps").get();
+        final Optional<? extends Dynamic<?>> optional3 = dynamic.get("Heightmaps").result();
         if (!optional3.isPresent()) {
             return dynamic;
         }
         Dynamic<?> dynamic2 = optional3.get();
-        final Optional<? extends Dynamic<?>> optional4 = dynamic2.get("LIQUID").get();
+        final Optional<? extends Dynamic<?>> optional4 = dynamic2.get("LIQUID").result();
         if (optional4.isPresent()) {
             dynamic2 = dynamic2.remove("LIQUID");
             dynamic2 = dynamic2.set("WORLD_SURFACE_WG", (Dynamic)optional4.get());
         }
-        final Optional<? extends Dynamic<?>> optional5 = dynamic2.get("SOLID").get();
+        final Optional<? extends Dynamic<?>> optional5 = dynamic2.get("SOLID").result();
         if (optional5.isPresent()) {
             dynamic2 = dynamic2.remove("SOLID");
             dynamic2 = dynamic2.set("OCEAN_FLOOR_WG", (Dynamic)optional5.get());
             dynamic2 = dynamic2.set("OCEAN_FLOOR", (Dynamic)optional5.get());
         }
-        final Optional<? extends Dynamic<?>> optional6 = dynamic2.get("LIGHT").get();
+        final Optional<? extends Dynamic<?>> optional6 = dynamic2.get("LIGHT").result();
         if (optional6.isPresent()) {
             dynamic2 = dynamic2.remove("LIGHT");
             dynamic2 = dynamic2.set("LIGHT_BLOCKING", (Dynamic)optional6.get());
         }
-        final Optional<? extends Dynamic<?>> optional7 = dynamic2.get("RAIN").get();
+        final Optional<? extends Dynamic<?>> optional7 = dynamic2.get("RAIN").result();
         if (optional7.isPresent()) {
             dynamic2 = dynamic2.remove("RAIN");
             dynamic2 = dynamic2.set("MOTION_BLOCKING", (Dynamic)optional7.get());
diff --git a/src/net/minecraft/util/datafix/fixes/IglooMetadataRemovalFix.java b/src/net/minecraft/util/datafix/fixes/IglooMetadataRemovalFix.java
index 512dcd9..94bb50a 100644
--- a/src/net/minecraft/util/datafix/fixes/IglooMetadataRemovalFix.java
+++ b/src/net/minecraft/util/datafix/fixes/IglooMetadataRemovalFix.java
@@ -2,7 +2,7 @@ package net.minecraft.util.datafix.fixes;
 
 import java.util.stream.Stream;
 import java.util.function.Predicate;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.function.Function;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.TypeRewriteRule;
@@ -21,7 +21,7 @@ public class IglooMetadataRemovalFix extends DataFix {
     }
     
     private static <T> Dynamic<T> fixTag(final Dynamic<T> dynamic) {
-        final boolean boolean2 = dynamic.get("Children").asStreamOpt().<Boolean>map(stream -> stream.allMatch(IglooMetadataRemovalFix::isIglooPiece)).orElse(false);
+        final boolean boolean2 = dynamic.get("Children").asStreamOpt().map(stream -> stream.allMatch(IglooMetadataRemovalFix::isIglooPiece)).result().orElse(false);
         if (boolean2) {
             return (Dynamic<T>)dynamic.set("id", dynamic.createString("Igloo")).remove("Children");
         }
@@ -29,7 +29,7 @@ public class IglooMetadataRemovalFix extends DataFix {
     }
     
     private static <T> Dynamic<T> removeIglooPieces(final Dynamic<T> dynamic) {
-        return dynamic.asStreamOpt().map(stream -> stream.filter(dynamic -> !isIglooPiece(dynamic))).<Dynamic<T>>map(dynamic::createList).orElse(dynamic);
+        return dynamic.asStreamOpt().map(stream -> stream.filter(dynamic -> !isIglooPiece(dynamic))).map((Function)dynamic::createList).result().orElse(dynamic);
     }
     
     private static boolean isIglooPiece(final Dynamic<?> dynamic) {
diff --git a/src/net/minecraft/util/datafix/fixes/ItemBannerColorFix.java b/src/net/minecraft/util/datafix/fixes/ItemBannerColorFix.java
index 5d11522..8489b31 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemBannerColorFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemBannerColorFix.java
@@ -2,13 +2,16 @@ package net.minecraft.util.datafix.fixes;
 
 import java.util.Optional;
 import com.mojang.datafixers.OpticFinder;
-import com.mojang.datafixers.types.Type;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
 import java.util.stream.Stream;
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -20,7 +23,7 @@ public class ItemBannerColorFix extends DataFix {
     
     public TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.ITEM_STACK);
-        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final OpticFinder<?> opticFinder4 = type2.findField("tag");
         final OpticFinder<?> opticFinder5 = opticFinder4.type().findField("BlockEntityTag");
         final OpticFinder opticFinder6;
@@ -37,6 +40,7 @@ public class ItemBannerColorFix extends DataFix {
         Dynamic<?> dynamic9;
         Optional<? extends Dynamic<?>> optional8;
         Dynamic<?> dynamic10;
+        Dynamic<?> dynamic11;
         return this.fixTypeEverywhereTyped("ItemBannerColorFix", (Type)type2, typed -> {
             optional5 = (Optional<Pair<String, String>>)typed.getOptional(opticFinder6);
             if (optional5.isPresent() && Objects.equals(optional5.get().getSecond(), "minecraft:banner")) {
@@ -49,12 +53,13 @@ public class ItemBannerColorFix extends DataFix {
                         typed3 = optional7.get();
                         dynamic7 = typed2.get(DSL.remainderFinder());
                         dynamic8 = typed3.getOrCreate(DSL.remainderFinder());
-                        if (dynamic8.get("Base").asNumber().isPresent()) {
+                        if (dynamic8.get("Base").asNumber().result().isPresent()) {
                             dynamic9 = dynamic6.set("Damage", dynamic6.createShort((short)(dynamic8.get("Base").asInt(0) & 0xF)));
-                            optional8 = dynamic7.get("display").get();
+                            optional8 = dynamic7.get("display").result();
                             if (optional8.isPresent()) {
                                 dynamic10 = optional8.get();
-                                if (Objects.equals(dynamic10, dynamic10.emptyMap().merge(dynamic10.createString("Lore"), dynamic10.createList((Stream)Stream.<Dynamic>of(dynamic10.createString("(+NBT")))))) {
+                                dynamic11 = dynamic10.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic10.createString("Lore"), dynamic10.createList((Stream)Stream.<Dynamic>of(dynamic10.createString("(+NBT")))));
+                                if (Objects.equals(dynamic10, dynamic11)) {
                                     return typed.set(DSL.remainderFinder(), dynamic9);
                                 }
                             }
diff --git a/src/net/minecraft/util/datafix/fixes/ItemCustomNameToComponentFix.java b/src/net/minecraft/util/datafix/fixes/ItemCustomNameToComponentFix.java
index d942541..a27b339 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemCustomNameToComponentFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemCustomNameToComponentFix.java
@@ -10,7 +10,7 @@ import java.util.Optional;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
 
@@ -20,17 +20,17 @@ public class ItemCustomNameToComponentFix extends DataFix {
     }
     
     private Dynamic<?> fixTag(final Dynamic<?> dynamic) {
-        final Optional<? extends Dynamic<?>> optional3 = dynamic.get("display").get();
+        final Optional<? extends Dynamic<?>> optional3 = dynamic.get("display").result();
         if (optional3.isPresent()) {
             Dynamic<?> dynamic2 = optional3.get();
-            final Optional<String> optional4 = (Optional<String>)dynamic2.get("Name").asString();
+            final Optional<String> optional4 = (Optional<String>)dynamic2.get("Name").asString().result();
             if (optional4.isPresent()) {
                 dynamic2 = dynamic2.set("Name", dynamic2.createString(Component.Serializer.toJson(new TextComponent(optional4.get()))));
             }
             else {
-                final Optional<String> optional5 = (Optional<String>)dynamic2.get("LocName").asString();
+                final Optional<String> optional5 = (Optional<String>)dynamic2.get("LocName").asString().result();
                 if (optional5.isPresent()) {
-                    dynamic2 = dynamic2.set("Name", dynamic2.createString(Component.Serializer.toJson(new TranslatableComponent(optional5.get(), new Object[0]))));
+                    dynamic2 = dynamic2.set("Name", dynamic2.createString(Component.Serializer.toJson(new TranslatableComponent(optional5.get()))));
                     dynamic2 = dynamic2.remove("LocName");
                 }
             }
diff --git a/src/net/minecraft/util/datafix/fixes/ItemIdFix.java b/src/net/minecraft/util/datafix/fixes/ItemIdFix.java
index 8480235..65c9a23 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemIdFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemIdFix.java
@@ -7,6 +7,7 @@ import com.mojang.datafixers.util.Either;
 import com.mojang.datafixers.OpticFinder;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.types.Type;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
@@ -25,8 +26,8 @@ public class ItemIdFix extends DataFix {
     }
     
     public TypeRewriteRule makeRule() {
-        final Type<Either<Integer, Pair<String, String>>> type2 = (Type<Either<Integer, Pair<String, String>>>)DSL.or(DSL.intType(), DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
-        final Type<Pair<String, String>> type3 = (Type<Pair<String, String>>)DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString());
+        final Type<Either<Integer, Pair<String, String>>> type2 = (Type<Either<Integer, Pair<String, String>>>)DSL.or(DSL.intType(), DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
+        final Type<Pair<String, String>> type3 = (Type<Pair<String, String>>)DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString());
         final OpticFinder<Either<Integer, Pair<String, String>>> opticFinder4 = (OpticFinder<Either<Integer, Pair<String, String>>>)DSL.fieldFinder("id", (Type)type2);
         return this.fixTypeEverywhereTyped("ItemIdFix", this.getInputSchema().getType(References.ITEM_STACK), this.getOutputSchema().getType(References.ITEM_STACK), typed -> typed.update((OpticFinder)opticFinder4, (Type)type3, either -> (Pair)either.map(integer -> Pair.of(References.ITEM_NAME.typeName(), getItem(integer)), pair -> pair)));
     }
diff --git a/src/net/minecraft/util/datafix/fixes/ItemLoreFix.java b/src/net/minecraft/util/datafix/fixes/ItemLoreFix.java
index 7380830..7366bab 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemLoreFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemLoreFix.java
@@ -6,10 +6,9 @@ import net.minecraft.network.chat.TextComponent;
 import java.util.stream.Stream;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.OpticFinder;
-import java.util.Optional;
 import com.mojang.datafixers.DataFixUtils;
 import java.util.function.Function;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
@@ -23,11 +22,11 @@ public class ItemLoreFix extends DataFix {
     protected TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.ITEM_STACK);
         final OpticFinder<?> opticFinder3 = type2.findField("tag");
-        return this.fixTypeEverywhereTyped("Item Lore componentize", (Type)type2, typed -> typed.updateTyped((OpticFinder)opticFinder3, typed -> typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("display", dynamic -> dynamic.update("Lore", dynamic -> (Dynamic)DataFixUtils.orElse((Optional)((Dynamic)dynamic).asStreamOpt().map(ItemLoreFix::fixLoreList).map(dynamic::createList), dynamic))))));
+        return this.fixTypeEverywhereTyped("Item Lore componentize", (Type)type2, typed -> typed.updateTyped((OpticFinder)opticFinder3, typed -> typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("display", dynamic -> dynamic.update("Lore", dynamic -> (Dynamic)DataFixUtils.orElse(((Dynamic)dynamic).asStreamOpt().map((Function)ItemLoreFix::fixLoreList).map((Function)dynamic::createList).result(), dynamic))))));
     }
     
     private static <T> Stream<Dynamic<T>> fixLoreList(final Stream<Dynamic<T>> stream) {
-        return stream.<Dynamic<T>>map(dynamic -> (Dynamic)DataFixUtils.orElse((Optional)((Dynamic)dynamic).asString().map(ItemLoreFix::fixLoreEntry).map(dynamic::createString), dynamic));
+        return stream.<Dynamic<T>>map(dynamic -> (Dynamic)DataFixUtils.orElse(((Dynamic)dynamic).asString().map((Function)ItemLoreFix::fixLoreEntry).map((Function)dynamic::createString).result(), dynamic));
     }
     
     private static String fixLoreEntry(final String string) {
diff --git a/src/net/minecraft/util/datafix/fixes/ItemPotionFix.java b/src/net/minecraft/util/datafix/fixes/ItemPotionFix.java
index b552500..84601bd 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemPotionFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemPotionFix.java
@@ -3,12 +3,13 @@ package net.minecraft.util.datafix.fixes;
 import com.mojang.datafixers.DataFixUtils;
 import java.util.Optional;
 import com.mojang.datafixers.OpticFinder;
-import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -22,7 +23,7 @@ public class ItemPotionFix extends DataFix {
     
     public TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.ITEM_STACK);
-        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final OpticFinder<?> opticFinder4 = type2.findField("tag");
         final OpticFinder opticFinder5;
         final Optional<Pair<String, String>> optional4;
@@ -44,7 +45,7 @@ public class ItemPotionFix extends DataFix {
                 if (optional5.isPresent()) {
                     typed2 = typed;
                     dynamic6 = ((Typed)optional5.get()).get(DSL.remainderFinder());
-                    optional6 = (Optional<String>)dynamic6.get("Potion").asString();
+                    optional6 = (Optional<String>)dynamic6.get("Potion").asString().result();
                     if (!optional6.isPresent()) {
                         string11 = ItemPotionFix.POTIONS[short7 & 0x7F];
                         typed3 = ((Typed)optional5.get()).set(DSL.remainderFinder(), dynamic6.set("Potion", dynamic6.createString((string11 == null) ? "minecraft:water" : string11)));
diff --git a/src/net/minecraft/util/datafix/fixes/ItemRenameFix.java b/src/net/minecraft/util/datafix/fixes/ItemRenameFix.java
index 595c8f2..fe2b62c 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemRenameFix.java
@@ -1,11 +1,12 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.types.Type;
 import java.util.function.Function;
 import java.util.Objects;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -19,7 +20,7 @@ public abstract class ItemRenameFix extends DataFix {
     }
     
     public TypeRewriteRule makeRule() {
-        final Type<Pair<String, String>> type2 = (Type<Pair<String, String>>)DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString());
+        final Type<Pair<String, String>> type2 = (Type<Pair<String, String>>)DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString());
         if (!Objects.equals(this.getInputSchema().getType(References.ITEM_NAME), type2)) {
             throw new IllegalStateException("item name type is not what was expected.");
         }
diff --git a/src/net/minecraft/util/datafix/fixes/ItemShulkerBoxColorFix.java b/src/net/minecraft/util/datafix/fixes/ItemShulkerBoxColorFix.java
index 26f4038..3d644ee 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemShulkerBoxColorFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemShulkerBoxColorFix.java
@@ -2,12 +2,13 @@ package net.minecraft.util.datafix.fixes;
 
 import java.util.Optional;
 import com.mojang.datafixers.OpticFinder;
-import com.mojang.datafixers.types.Type;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.Typed;
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -21,7 +22,7 @@ public class ItemShulkerBoxColorFix extends DataFix {
     
     public TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.ITEM_STACK);
-        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final OpticFinder<?> opticFinder4 = type2.findField("tag");
         final OpticFinder<?> opticFinder5 = opticFinder4.type().findField("BlockEntityTag");
         final OpticFinder opticFinder6;
diff --git a/src/net/minecraft/util/datafix/fixes/ItemSpawnEggFix.java b/src/net/minecraft/util/datafix/fixes/ItemSpawnEggFix.java
index 2859e1d..b0c4f76 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemSpawnEggFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemSpawnEggFix.java
@@ -1,14 +1,16 @@
 package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.DataFixUtils;
-import com.mojang.datafixers.OpticFinder;
-import com.mojang.datafixers.types.Type;
+import com.mojang.serialization.DataResult;
 import java.util.Optional;
+import com.mojang.datafixers.OpticFinder;
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -23,14 +25,15 @@ public class ItemSpawnEggFix extends DataFix {
     public TypeRewriteRule makeRule() {
         final Schema schema2 = this.getInputSchema();
         final Type<?> type3 = schema2.getType(References.ITEM_STACK);
-        final OpticFinder<Pair<String, String>> opticFinder4 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder4 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final OpticFinder<String> opticFinder5 = (OpticFinder<String>)DSL.fieldFinder("id", DSL.string());
         final OpticFinder<?> opticFinder6 = type3.findField("tag");
         final OpticFinder<?> opticFinder7 = opticFinder6.type().findField("EntityTag");
         final OpticFinder<?> opticFinder8 = DSL.typeFinder(schema2.getTypeRaw(References.ENTITY));
+        final Type<?> type4 = this.getOutputSchema().getTypeRaw(References.ENTITY);
         final OpticFinder opticFinder9;
         final Optional<Pair<String, String>> optional8;
-        Dynamic<?> dynamic9;
+        Dynamic<?> dynamic5;
         short short10;
         final OpticFinder opticFinder10;
         Optional<? extends Typed<?>> optional9;
@@ -45,14 +48,15 @@ public class ItemSpawnEggFix extends DataFix {
         Typed<?> typed3;
         Typed<?> typed4;
         Typed<?> typed5;
-        Dynamic<?> dynamic10;
+        Dynamic<?> dynamic6;
+        final Type type5;
         Typed<?> typed6;
-        Dynamic<?> dynamic11;
+        Dynamic<?> dynamic7;
         return this.fixTypeEverywhereTyped("ItemSpawnEggFix", (Type)type3, typed -> {
             optional8 = (Optional<Pair<String, String>>)typed.getOptional(opticFinder9);
             if (optional8.isPresent() && Objects.equals(optional8.get().getSecond(), "minecraft:spawn_egg")) {
-                dynamic9 = typed.get(DSL.remainderFinder());
-                short10 = dynamic9.get("Damage").asShort((short)0);
+                dynamic5 = typed.get(DSL.remainderFinder());
+                short10 = dynamic5.get("Damage").asShort((short)0);
                 optional9 = typed.getOptionalTyped(opticFinder10);
                 optional10 = optional9.flatMap(typed -> typed.getOptionalTyped(opticFinder11));
                 optional11 = optional10.flatMap(typed -> typed.getOptionalTyped(opticFinder12));
@@ -63,13 +67,13 @@ public class ItemSpawnEggFix extends DataFix {
                     typed3 = typed.getOrCreateTyped(opticFinder10);
                     typed4 = typed3.getOrCreateTyped(opticFinder11);
                     typed5 = typed4.getOrCreateTyped(opticFinder12);
-                    dynamic10 = typed5.write().set("id", dynamic9.createString(string16));
-                    typed6 = ((Optional)this.getOutputSchema().getTypeRaw(References.ENTITY).readTyped((Dynamic)dynamic10).getSecond()).<Throwable>orElseThrow(() -> new IllegalStateException("Could not parse new entity"));
+                    dynamic6 = dynamic5;
+                    typed6 = typed5.write().flatMap(dynamic4 -> type5.readTyped(dynamic4.set("id", dynamic6.createString(string16)))).result().<Throwable>orElseThrow(() -> new IllegalStateException("Could not parse new entity")).getFirst();
                     typed2 = typed2.set(opticFinder10, typed3.set(opticFinder11, typed4.set(opticFinder12, (Typed)typed6)));
                 }
                 if (short10 != 0) {
-                    dynamic11 = dynamic9.set("Damage", dynamic9.createShort((short)0));
-                    typed2 = typed2.set(DSL.remainderFinder(), dynamic11);
+                    dynamic7 = dynamic5.set("Damage", dynamic5.createShort((short)0));
+                    typed2 = typed2.set(DSL.remainderFinder(), dynamic7);
                 }
                 return typed2;
             }
diff --git a/src/net/minecraft/util/datafix/fixes/ItemStackEnchantmentNamesFix.java b/src/net/minecraft/util/datafix/fixes/ItemStackEnchantmentNamesFix.java
index 032fb38..7ba33de 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemStackEnchantmentNamesFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemStackEnchantmentNamesFix.java
@@ -5,7 +5,7 @@ import com.mojang.datafixers.Typed;
 import java.util.stream.Stream;
 import java.util.Optional;
 import com.mojang.datafixers.DataFixUtils;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.OpticFinder;
 import java.util.function.Function;
@@ -29,11 +29,11 @@ public class ItemStackEnchantmentNamesFix extends DataFix {
     }
     
     private Dynamic<?> fixTag(Dynamic<?> dynamic) {
-        final Optional<Dynamic<?>> optional3 = dynamic.get("ench").asStreamOpt().map(stream -> stream.map(dynamic -> dynamic.set("id", dynamic.createString((String)ItemStackEnchantmentNamesFix.MAP.getOrDefault(dynamic.get("id").asInt(0), "null"))))).<Dynamic<?>>map(dynamic::createList);
+        final Optional<? extends Dynamic<?>> optional3 = dynamic.get("ench").asStreamOpt().map(stream -> stream.map(dynamic -> dynamic.set("id", dynamic.createString((String)ItemStackEnchantmentNamesFix.MAP.getOrDefault(dynamic.get("id").asInt(0), "null"))))).map((Function)dynamic::createList).result();
         if (optional3.isPresent()) {
             dynamic = dynamic.remove("ench").set("Enchantments", (Dynamic)optional3.get());
         }
-        return dynamic.update("StoredEnchantments", dynamic -> (Dynamic)DataFixUtils.orElse((Optional)((Dynamic)dynamic).asStreamOpt().map(stream -> stream.map(dynamic -> dynamic.set("id", dynamic.createString((String)ItemStackEnchantmentNamesFix.MAP.getOrDefault(dynamic.get("id").asInt(0), "null"))))).map(dynamic::createList), dynamic));
+        return dynamic.update("StoredEnchantments", dynamic -> (Dynamic)DataFixUtils.orElse(((Dynamic)dynamic).asStreamOpt().map(stream -> stream.map(dynamic -> dynamic.set("id", dynamic.createString((String)ItemStackEnchantmentNamesFix.MAP.getOrDefault(dynamic.get("id").asInt(0), "null"))))).map((Function)dynamic::createList).result(), dynamic));
     }
     
     static {
diff --git a/src/net/minecraft/util/datafix/fixes/ItemStackMapIdFix.java b/src/net/minecraft/util/datafix/fixes/ItemStackMapIdFix.java
index b04fa8a..ddfce5b 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemStackMapIdFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemStackMapIdFix.java
@@ -3,11 +3,12 @@ package net.minecraft.util.datafix.fixes;
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import com.mojang.datafixers.OpticFinder;
-import com.mojang.datafixers.types.Type;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -19,7 +20,7 @@ public class ItemStackMapIdFix extends DataFix {
     
     public TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.ITEM_STACK);
-        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final OpticFinder<?> opticFinder4 = type2.findField("tag");
         final OpticFinder opticFinder5;
         final Optional<Pair<String, String>> optional4;
diff --git a/src/net/minecraft/util/datafix/fixes/ItemStackSpawnEggFix.java b/src/net/minecraft/util/datafix/fixes/ItemStackSpawnEggFix.java
index 7a68ab8..e2f978e 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemStackSpawnEggFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemStackSpawnEggFix.java
@@ -6,10 +6,11 @@ import java.util.HashMap;
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import com.mojang.datafixers.OpticFinder;
-import com.mojang.datafixers.types.Type;
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import java.util.Map;
@@ -24,8 +25,8 @@ public class ItemStackSpawnEggFix extends DataFix {
     
     public TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.ITEM_STACK);
-        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
-        final OpticFinder<String> opticFinder4 = (OpticFinder<String>)DSL.fieldFinder("id", DSL.namespacedString());
+        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
+        final OpticFinder<String> opticFinder4 = (OpticFinder<String>)DSL.fieldFinder("id", (Type)NamespacedSchema.namespacedString());
         final OpticFinder<?> opticFinder5 = type2.findField("tag");
         final OpticFinder<?> opticFinder6 = opticFinder5.type().findField("EntityTag");
         final OpticFinder opticFinder7;
diff --git a/src/net/minecraft/util/datafix/fixes/ItemStackTheFlatteningFix.java b/src/net/minecraft/util/datafix/fixes/ItemStackTheFlatteningFix.java
index 4f72071..85b208a 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemStackTheFlatteningFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemStackTheFlatteningFix.java
@@ -10,10 +10,11 @@ import javax.annotation.Nullable;
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import com.mojang.datafixers.OpticFinder;
-import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import java.util.Set;
@@ -31,7 +32,7 @@ public class ItemStackTheFlatteningFix extends DataFix {
     
     public TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.ITEM_STACK);
-        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final OpticFinder<?> opticFinder4 = type2.findField("tag");
         final OpticFinder opticFinder5;
         final Optional<Pair<String, String>> optional4;
diff --git a/src/net/minecraft/util/datafix/fixes/ItemStackUUIDFix.java b/src/net/minecraft/util/datafix/fixes/ItemStackUUIDFix.java
new file mode 100644
index 0000000..257ffe4
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/ItemStackUUIDFix.java
@@ -0,0 +1,1025 @@
+java.lang.StackOverflowError
+	at java.base/java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:936)
+	at java.base/java.util.concurrent.ConcurrentHashMap.containsKey(ConcurrentHashMap.java:964)
+	at java.base/java.util.Collections$SetFromMap.contains(Collections.java:5564)
+	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:21)
+	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
+	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
+	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.resolve(CoreMetadataFactory.java:616)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2024)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
+	at com.strobel.assembler.metadata.TypeDefinition.accept(TypeDefinition.java:183)
+	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
+	at com.strobel.assembler.metadata.MetadataHelper.asSuper(MetadataHelper.java:727)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2017)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
+	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
+	at com.strobel.assembler.metadata.MetadataHelper.asSuper(MetadataHelper.java:727)
+	at com.strobel.assembler.metadata.MetadataHelper$6.visitClassType(MetadataHelper.java:1853)
+	at com.strobel.assembler.metadata.MetadataHelper$6.visitClassType(MetadataHelper.java:1815)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
+	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
+	at com.strobel.assembler.metadata.MetadataHelper.isSubType(MetadataHelper.java:1302)
+	at com.strobel.assembler.metadata.MetadataHelper.isSubType(MetadataHelper.java:568)
+	at com.strobel.assembler.metadata.MetadataHelper.isConvertible(MetadataHelper.java:508)
+	at com.strobel.assembler.metadata.MetadataHelper.isAssignableFrom(MetadataHelper.java:561)
+	at com.strobel.assembler.metadata.MetadataHelper.getConversionType(MetadataHelper.java:317)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitCastExpression(InsertNecessaryConversionsTransform.java:74)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitCastExpression(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.CastExpression.acceptVisitor(CastExpression.java:55)
+	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitChildren(DepthFirstAstVisitor.java:41)
+	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitReturnStatement(DepthFirstAstVisitor.java:149)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:179)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
diff --git a/src/net/minecraft/util/datafix/fixes/ItemWaterPotionFix.java b/src/net/minecraft/util/datafix/fixes/ItemWaterPotionFix.java
index 8a27738..974ec66 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemWaterPotionFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemWaterPotionFix.java
@@ -3,10 +3,11 @@ package net.minecraft.util.datafix.fixes;
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import com.mojang.datafixers.OpticFinder;
-import com.mojang.datafixers.types.Type;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -18,7 +19,7 @@ public class ItemWaterPotionFix extends DataFix {
     
     public TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.ITEM_STACK);
-        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final OpticFinder<?> opticFinder4 = type2.findField("tag");
         final OpticFinder opticFinder5;
         final Optional<Pair<String, String>> optional4;
@@ -33,7 +34,7 @@ public class ItemWaterPotionFix extends DataFix {
                 if ("minecraft:potion".equals(string5) || "minecraft:splash_potion".equals(string5) || "minecraft:lingering_potion".equals(string5) || "minecraft:tipped_arrow".equals(string5)) {
                     typed2 = typed.getOrCreateTyped(opticFinder6);
                     dynamic7 = typed2.get(DSL.remainderFinder());
-                    if (!dynamic7.get("Potion").asString().isPresent()) {
+                    if (!dynamic7.get("Potion").asString().result().isPresent()) {
                         dynamic7 = dynamic7.set("Potion", dynamic7.createString("minecraft:water"));
                     }
                     return typed.set(opticFinder6, typed2.set(DSL.remainderFinder(), dynamic7));
diff --git a/src/net/minecraft/util/datafix/fixes/ItemWrittenBookPagesStrictJsonFix.java b/src/net/minecraft/util/datafix/fixes/ItemWrittenBookPagesStrictJsonFix.java
index f467732..4722572 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemWrittenBookPagesStrictJsonFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemWrittenBookPagesStrictJsonFix.java
@@ -6,7 +6,6 @@ import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.OpticFinder;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
-import java.util.Optional;
 import com.mojang.datafixers.DataFixUtils;
 import java.util.function.Function;
 import com.google.gson.JsonParseException;
@@ -14,7 +13,7 @@ import net.minecraft.util.GsonHelper;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
 import org.apache.commons.lang3.StringUtils;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
 
@@ -25,50 +24,50 @@ public class ItemWrittenBookPagesStrictJsonFix extends DataFix {
     
     public Dynamic<?> fixTag(final Dynamic<?> dynamic) {
         String string2;
-        Component lf3;
-        return dynamic.update("pages", dynamic2 -> (Dynamic)DataFixUtils.orElse((Optional)dynamic2.asStreamOpt().map(stream -> stream.map(dynamic -> {
-            if (!dynamic.asString().isPresent()) {
+        Component mr3;
+        return dynamic.update("pages", dynamic2 -> (Dynamic)DataFixUtils.orElse(dynamic2.asStreamOpt().map(stream -> stream.map(dynamic -> {
+            if (!dynamic.asString().result().isPresent()) {
                 return dynamic;
             }
             else {
                 string2 = dynamic.asString("");
-                lf3 = null;
+                mr3 = null;
                 if ("null".equals(string2) || StringUtils.isEmpty((CharSequence)string2)) {
-                    lf3 = new TextComponent("");
+                    mr3 = TextComponent.EMPTY;
                 }
                 else {
                     if (string2.charAt(0) != 34 || string2.charAt(string2.length() - 1) != 34) {
                         if (string2.charAt(0) != 123 || string2.charAt(string2.length() - 1) != 125) {
-                            lf3 = new TextComponent(string2);
-                            return dynamic.createString(Component.Serializer.toJson(lf3));
+                            mr3 = new TextComponent(string2);
+                            return dynamic.createString(Component.Serializer.toJson(mr3));
                         }
                     }
                     try {
-                        lf3 = GsonHelper.<Component>fromJson(BlockEntitySignTextStrictJsonFix.GSON, string2, Component.class, (boolean)(1 != 0));
-                        if (lf3 == null) {
-                            lf3 = new TextComponent("");
+                        mr3 = GsonHelper.<Component>fromJson(BlockEntitySignTextStrictJsonFix.GSON, string2, Component.class, (boolean)(1 != 0));
+                        if (mr3 == null) {
+                            mr3 = TextComponent.EMPTY;
                         }
                     }
                     catch (JsonParseException ex) {}
-                    if (lf3 == null) {
+                    if (mr3 == null) {
                         try {
-                            lf3 = Component.Serializer.fromJson(string2);
+                            mr3 = Component.Serializer.fromJson(string2);
                         }
                         catch (JsonParseException ex2) {}
                     }
-                    if (lf3 == null) {
+                    if (mr3 == null) {
                         try {
-                            lf3 = Component.Serializer.fromJsonLenient(string2);
+                            mr3 = Component.Serializer.fromJsonLenient(string2);
                         }
                         catch (JsonParseException ex3) {}
                     }
-                    if (lf3 == null) {
-                        lf3 = new TextComponent(string2);
+                    if (mr3 == null) {
+                        mr3 = new TextComponent(string2);
                     }
                 }
-                return dynamic.createString(Component.Serializer.toJson(lf3));
+                return dynamic.createString(Component.Serializer.toJson(mr3));
             }
-        })).map(dynamic::createList), dynamic.emptyList()));
+        })).map((Function)dynamic::createList).result(), dynamic.emptyList()));
     }
     
     public TypeRewriteRule makeRule() {
diff --git a/src/net/minecraft/util/datafix/fixes/JigsawPropertiesFix.java b/src/net/minecraft/util/datafix/fixes/JigsawPropertiesFix.java
new file mode 100644
index 0000000..ebeecaf
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/JigsawPropertiesFix.java
@@ -0,0 +1,24 @@
+package net.minecraft.util.datafix.fixes;
+
+import java.util.function.Function;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.Typed;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.schemas.Schema;
+
+public class JigsawPropertiesFix extends NamedEntityFix {
+    public JigsawPropertiesFix(final Schema schema, final boolean boolean2) {
+        super(schema, boolean2, "JigsawPropertiesFix", References.BLOCK_ENTITY, "minecraft:jigsaw");
+    }
+    
+    private static Dynamic<?> fixTag(final Dynamic<?> dynamic) {
+        final String string2 = dynamic.get("attachement_type").asString("minecraft:empty");
+        final String string3 = dynamic.get("target_pool").asString("minecraft:empty");
+        return dynamic.set("name", dynamic.createString(string2)).set("target", dynamic.createString(string2)).remove("attachement_type").set("pool", dynamic.createString(string3)).remove("target_pool");
+    }
+    
+    @Override
+    protected Typed<?> fix(final Typed<?> typed) {
+        return typed.update(DSL.remainderFinder(), (Function)JigsawPropertiesFix::fixTag);
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/JigsawRotationFix.java b/src/net/minecraft/util/datafix/fixes/JigsawRotationFix.java
new file mode 100644
index 0000000..19f6764
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/JigsawRotationFix.java
@@ -0,0 +1,40 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.google.common.collect.ImmutableMap;
+import com.mojang.datafixers.Typed;
+import java.util.function.Function;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import java.util.Optional;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.schemas.Schema;
+import java.util.Map;
+import com.mojang.datafixers.DataFix;
+
+public class JigsawRotationFix extends DataFix {
+    private static final Map<String, String> renames;
+    
+    public JigsawRotationFix(final Schema schema, final boolean boolean2) {
+        super(schema, boolean2);
+    }
+    
+    private static Dynamic<?> fix(final Dynamic<?> dynamic) {
+        final Optional<String> optional2 = (Optional<String>)dynamic.get("Name").asString().result();
+        if (optional2.equals(Optional.<String>of("minecraft:jigsaw"))) {
+            final String string2;
+            return dynamic.update("Properties", dynamic -> {
+                string2 = dynamic.get("facing").asString("north");
+                return dynamic.remove("facing").set("orientation", dynamic.createString((String)JigsawRotationFix.renames.getOrDefault(string2, string2)));
+            });
+        }
+        return dynamic;
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        return this.fixTypeEverywhereTyped("jigsaw_rotation_fix", this.getInputSchema().getType(References.BLOCK_STATE), typed -> typed.update(DSL.remainderFinder(), (Function)JigsawRotationFix::fix));
+    }
+    
+    static {
+        renames = ImmutableMap.<String, String>builder().put("down", "down_south").put("up", "up_north").put("north", "north_up").put("south", "south_up").put("west", "west_up").put("east", "east_up").build();
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/LeavesFix.java b/src/net/minecraft/util/datafix/fixes/LeavesFix.java
index 586085a..bd9ebd7 100644
--- a/src/net/minecraft/util/datafix/fixes/LeavesFix.java
+++ b/src/net/minecraft/util/datafix/fixes/LeavesFix.java
@@ -1,19 +1,20 @@
 java.lang.StackOverflowError
-	at com.strobel.decompiler.languages.java.ast.AstNode.getUserData(AstNode.java:907)
-	at com.strobel.decompiler.languages.java.ast.JavaResolver$ResolveVisitor.visitIdentifierExpression(JavaResolver.java:127)
-	at com.strobel.decompiler.languages.java.ast.JavaResolver$ResolveVisitor.visitIdentifierExpression(JavaResolver.java:40)
-	at com.strobel.decompiler.languages.java.ast.IdentifierExpression.acceptVisitor(IdentifierExpression.java:55)
-	at com.strobel.decompiler.languages.java.ast.JavaResolver.apply(JavaResolver.java:37)
-	at com.strobel.decompiler.languages.java.ast.JavaResolver.apply(JavaResolver.java:28)
-	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.getType(RedundantCastUtility.java:481)
-	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.isTypeCastSemantic(RedundantCastUtility.java:988)
-	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.addToResults(RedundantCastUtility.java:551)
-	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.processPossibleTypeCast(RedundantCastUtility.java:532)
-	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.visitReturnStatement(RedundantCastUtility.java:233)
-	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.visitReturnStatement(RedundantCastUtility.java:167)
-	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
-	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility.isCastRedundant(RedundantCastUtility.java:67)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitCastExpression(InsertNecessaryConversionsTransform.java:80)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedGenericType.getInternalName(CoreMetadataFactory.java:683)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2007)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
+	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
+	at com.strobel.assembler.metadata.MetadataHelper.asSuper(MetadataHelper.java:727)
+	at com.strobel.assembler.metadata.MetadataHelper$6.visitClassType(MetadataHelper.java:1853)
+	at com.strobel.assembler.metadata.MetadataHelper$6.visitClassType(MetadataHelper.java:1815)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
+	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
+	at com.strobel.assembler.metadata.MetadataHelper.isSubType(MetadataHelper.java:1302)
+	at com.strobel.assembler.metadata.MetadataHelper.isSubType(MetadataHelper.java:568)
+	at com.strobel.assembler.metadata.MetadataHelper.isConvertible(MetadataHelper.java:508)
+	at com.strobel.assembler.metadata.MetadataHelper.isAssignableFrom(MetadataHelper.java:561)
+	at com.strobel.assembler.metadata.MetadataHelper.getConversionType(MetadataHelper.java:317)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitCastExpression(InsertNecessaryConversionsTransform.java:74)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitCastExpression(InsertNecessaryConversionsTransform.java:37)
 	at com.strobel.decompiler.languages.java.ast.CastExpression.acceptVisitor(CastExpression.java:55)
 	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitChildren(DepthFirstAstVisitor.java:41)
@@ -1022,4 +1023,3 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
 	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
diff --git a/src/net/minecraft/util/datafix/fixes/LevelDataGeneratorOptionsFix.java b/src/net/minecraft/util/datafix/fixes/LevelDataGeneratorOptionsFix.java
index 245aa8a..e005441 100644
--- a/src/net/minecraft/util/datafix/fixes/LevelDataGeneratorOptionsFix.java
+++ b/src/net/minecraft/util/datafix/fixes/LevelDataGeneratorOptionsFix.java
@@ -2,28 +2,29 @@ package net.minecraft.util.datafix.fixes;
 
 import net.minecraft.Util;
 import java.util.HashMap;
+import com.mojang.serialization.DataResult;
 import java.util.Collections;
 import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Iterator;
 import java.util.stream.Collector;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.util.Pair;
 import com.google.common.collect.Lists;
 import java.util.Locale;
 import com.google.common.collect.Maps;
 import com.google.common.base.Splitter;
 import com.google.gson.JsonElement;
-import com.mojang.datafixers.types.Type;
 import java.util.Optional;
-import com.mojang.datafixers.Typed;
+import com.mojang.datafixers.types.Type;
+import java.util.function.Function;
+import com.mojang.datafixers.util.Pair;
 import net.minecraft.util.GsonHelper;
-import com.mojang.datafixers.types.JsonOps;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.JsonOps;
+import com.mojang.serialization.Dynamic;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import java.util.Map;
@@ -38,28 +39,26 @@ public class LevelDataGeneratorOptionsFix extends DataFix {
     
     protected TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getOutputSchema().getType(References.LEVEL);
-        final Dynamic<?> dynamic3;
-        final Optional<String> optional4;
-        String string6;
-        Dynamic<?> dynamic4;
-        Dynamic<JsonElement> dynamic5;
+        final Optional<String> optional3;
+        String string5;
+        Dynamic<?> dynamic2;
+        Dynamic<JsonElement> dynamic3;
         final Type type3;
-        return this.fixTypeEverywhereTyped("LevelDataGeneratorOptionsFix", this.getInputSchema().getType(References.LEVEL), (Type)type2, typed -> {
-            dynamic3 = typed.write();
-            optional4 = (Optional<String>)dynamic3.get("generatorOptions").asString();
-            if ("flat".equalsIgnoreCase(dynamic3.get("generatorName").asString(""))) {
-                string6 = optional4.orElse("");
-                dynamic4 = dynamic3.set("generatorOptions", (Dynamic)LevelDataGeneratorOptionsFix.convert(string6, (com.mojang.datafixers.types.DynamicOps<Object>)dynamic3.getOps()));
+        return this.fixTypeEverywhereTyped("LevelDataGeneratorOptionsFix", this.getInputSchema().getType(References.LEVEL), (Type)type2, typed -> (Typed)typed.write().flatMap(dynamic -> {
+            optional3 = (Optional<String>)dynamic.get("generatorOptions").asString().result();
+            if ("flat".equalsIgnoreCase(dynamic.get("generatorName").asString(""))) {
+                string5 = optional3.orElse("");
+                dynamic2 = dynamic.set("generatorOptions", (Dynamic)LevelDataGeneratorOptionsFix.convert(string5, (com.mojang.serialization.DynamicOps<Object>)dynamic.getOps()));
             }
-            else if ("buffet".equalsIgnoreCase(dynamic3.get("generatorName").asString("")) && optional4.isPresent()) {
-                dynamic5 = (Dynamic<JsonElement>)new Dynamic((DynamicOps)JsonOps.INSTANCE, GsonHelper.parse(optional4.get(), true));
-                dynamic4 = dynamic3.set("generatorOptions", dynamic5.convert(dynamic3.getOps()));
+            else if ("buffet".equalsIgnoreCase(dynamic.get("generatorName").asString("")) && optional3.isPresent()) {
+                dynamic3 = (Dynamic<JsonElement>)new Dynamic((DynamicOps)JsonOps.INSTANCE, GsonHelper.parse(optional3.get(), (boolean)(1 != 0)));
+                dynamic2 = dynamic.set("generatorOptions", dynamic3.convert(dynamic.getOps()));
             }
             else {
-                dynamic4 = dynamic3;
+                dynamic2 = dynamic;
             }
-            return (Typed)((Optional)type3.readTyped((Dynamic)dynamic4).getSecond()).orElseThrow(() -> new IllegalStateException("Could not read new level type."));
-        });
+            return type3.readTyped((Dynamic)dynamic2);
+        }).map((Function)Pair::getFirst).result().orElseThrow(() -> new IllegalStateException("Could not read new level type.")));
     }
     
     private static <T> Dynamic<T> convert(final String string, final DynamicOps<T> dynamicOps) {
diff --git a/src/net/minecraft/util/datafix/fixes/LevelFlatGeneratorInfoFix.java b/src/net/minecraft/util/datafix/fixes/LevelFlatGeneratorInfoFix.java
index d160718..48f887d 100644
--- a/src/net/minecraft/util/datafix/fixes/LevelFlatGeneratorInfoFix.java
+++ b/src/net/minecraft/util/datafix/fixes/LevelFlatGeneratorInfoFix.java
@@ -8,9 +8,8 @@ import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import org.apache.commons.lang3.math.NumberUtils;
-import java.util.Optional;
 import com.mojang.datafixers.DataFixUtils;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.function.Function;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
@@ -35,7 +34,7 @@ public class LevelFlatGeneratorInfoFix extends DataFix {
     
     private Dynamic<?> fix(final Dynamic<?> dynamic) {
         if (dynamic.get("generatorName").asString("").equalsIgnoreCase("flat")) {
-            return dynamic.update("generatorOptions", dynamic -> (Dynamic)DataFixUtils.orElse((Optional)((Dynamic)dynamic).asString().map(this::fixString).map(dynamic::createString), dynamic));
+            return dynamic.update("generatorOptions", dynamic -> (Dynamic)DataFixUtils.orElse(((Dynamic)dynamic).asString().map((Function)this::fixString).map((Function)dynamic::createString).result(), dynamic));
         }
         return dynamic;
     }
diff --git a/src/net/minecraft/util/datafix/fixes/LevelUUIDFix.java b/src/net/minecraft/util/datafix/fixes/LevelUUIDFix.java
new file mode 100644
index 0000000..e492523
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/LevelUUIDFix.java
@@ -0,0 +1,39 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.mojang.datafixers.Typed;
+import com.mojang.datafixers.util.Pair;
+import java.util.stream.Stream;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+
+public class LevelUUIDFix extends AbstractUUIDFix {
+    public LevelUUIDFix(final Schema schema) {
+        super(schema, References.LEVEL);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        return this.fixTypeEverywhereTyped("LevelUUIDFix", this.getInputSchema().getType(this.typeReference), typed -> typed.updateTyped(DSL.remainderFinder(), typed -> typed.update(DSL.remainderFinder(), dynamic -> {
+            dynamic = (Typed)this.updateCustomBossEvents(dynamic);
+            dynamic = (Typed)this.updateDragonFight(dynamic);
+            dynamic = (Typed)this.updateWanderingTrader(dynamic);
+            return dynamic;
+        })));
+    }
+    
+    private Dynamic<?> updateWanderingTrader(final Dynamic<?> dynamic) {
+        return AbstractUUIDFix.replaceUUIDString(dynamic, "WanderingTraderId", "WanderingTraderId").orElse(dynamic);
+    }
+    
+    private Dynamic<?> updateDragonFight(final Dynamic<?> dynamic) {
+        return dynamic.update("DimensionData", dynamic -> dynamic.updateMapValues(pair -> pair.mapSecond(dynamic -> dynamic.update("DragonFight", dynamic -> AbstractUUIDFix.replaceUUIDLeastMost(dynamic, "DragonUUID", "Dragon").orElse(dynamic)))));
+    }
+    
+    private Dynamic<?> updateCustomBossEvents(final Dynamic<?> dynamic) {
+        return dynamic.update("CustomBossEvents", dynamic -> dynamic.updateMapValues(pair -> pair.mapSecond(dynamic -> dynamic.update("Players", dynamic2 -> dynamic.createList((Stream)dynamic2.asStream().map(dynamic -> AbstractUUIDFix.createUUIDFromML(dynamic).orElseGet(() -> {
+            LevelUUIDFix.LOGGER.warn("CustomBossEvents contains invalid UUIDs.");
+            return dynamic;
+        })))))));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/MapIdFix.java b/src/net/minecraft/util/datafix/fixes/MapIdFix.java
index 5c74d97..0196b7a 100644
--- a/src/net/minecraft/util/datafix/fixes/MapIdFix.java
+++ b/src/net/minecraft/util/datafix/fixes/MapIdFix.java
@@ -1,9 +1,11 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.Dynamic;
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import com.mojang.datafixers.types.Type;
+import java.util.Map;
+import com.mojang.serialization.Dynamic;
+import com.google.common.collect.ImmutableMap;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.OpticFinder;
 import com.mojang.datafixers.TypeRewriteRule;
@@ -25,7 +27,7 @@ public class MapIdFix extends DataFix {
                 return typed;
             }
             else {
-                return typed.update(DSL.remainderFinder(), dynamic -> dynamic.emptyMap().merge(dynamic.createString("data"), dynamic));
+                return typed.update(DSL.remainderFinder(), dynamic -> dynamic.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic.createString("data"), dynamic)));
             }
         });
     }
diff --git a/src/net/minecraft/util/datafix/fixes/MemoryExpiryDataFix.java b/src/net/minecraft/util/datafix/fixes/MemoryExpiryDataFix.java
new file mode 100644
index 0000000..5273476
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/MemoryExpiryDataFix.java
@@ -0,0 +1,41 @@
+package net.minecraft.util.datafix.fixes;
+
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.Dynamic;
+import java.util.function.Function;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.Typed;
+import com.mojang.datafixers.schemas.Schema;
+
+public class MemoryExpiryDataFix extends NamedEntityFix {
+    public MemoryExpiryDataFix(final Schema schema, final String string) {
+        super(schema, false, "Memory expiry data fix (" + string + ")", References.ENTITY, string);
+    }
+    
+    @Override
+    protected Typed<?> fix(final Typed<?> typed) {
+        return typed.update(DSL.remainderFinder(), (Function)this::fixTag);
+    }
+    
+    public Dynamic<?> fixTag(final Dynamic<?> dynamic) {
+        return dynamic.update("Brain", (Function)this::updateBrain);
+    }
+    
+    private Dynamic<?> updateBrain(final Dynamic<?> dynamic) {
+        return dynamic.update("memories", (Function)this::updateMemories);
+    }
+    
+    private Dynamic<?> updateMemories(final Dynamic<?> dynamic) {
+        return dynamic.updateMapValues((Function)this::updateMemoryEntry);
+    }
+    
+    private Pair<Dynamic<?>, Dynamic<?>> updateMemoryEntry(final Pair<Dynamic<?>, Dynamic<?>> pair) {
+        return (Pair<Dynamic<?>, Dynamic<?>>)pair.mapSecond((Function)this::wrapMemoryValue);
+    }
+    
+    private Dynamic<?> wrapMemoryValue(final Dynamic<?> dynamic) {
+        return dynamic.createMap((Map)ImmutableMap.<Dynamic, Dynamic<?>>of(dynamic.createString("value"), dynamic));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/MissingDimensionFix.java b/src/net/minecraft/util/datafix/fixes/MissingDimensionFix.java
new file mode 100644
index 0000000..90a5368
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/MissingDimensionFix.java
@@ -0,0 +1,75 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.mojang.datafixers.types.templates.CompoundList;
+import com.mojang.datafixers.OpticFinder;
+import java.util.Optional;
+import com.mojang.datafixers.DataFixUtils;
+import java.util.function.Function;
+import com.mojang.datafixers.Typed;
+import java.util.List;
+import com.mojang.datafixers.FieldFinder;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
+import com.mojang.datafixers.types.templates.TaggedChoice;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.util.Unit;
+import com.mojang.datafixers.util.Either;
+import com.mojang.datafixers.DSL;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.schemas.Schema;
+import com.mojang.datafixers.DataFix;
+
+public class MissingDimensionFix extends DataFix {
+    public MissingDimensionFix(final Schema schema, final boolean boolean2) {
+        super(schema, boolean2);
+    }
+    
+    private static <A> Type<Pair<A, Dynamic<?>>> fields(final String string, final Type<A> type) {
+        return (Type<Pair<A, Dynamic<?>>>)DSL.and((Type)DSL.field(string, (Type)type), DSL.remainderType());
+    }
+    
+    private static <A> Type<Pair<Either<A, Unit>, Dynamic<?>>> optionalFields(final String string, final Type<A> type) {
+        return (Type<Pair<Either<A, Unit>, Dynamic<?>>>)DSL.and(DSL.optional((Type)DSL.field(string, (Type)type)), DSL.remainderType());
+    }
+    
+    private static <A1, A2> Type<Pair<Either<A1, Unit>, Pair<Either<A2, Unit>, Dynamic<?>>>> optionalFields(final String string1, final Type<A1> type2, final String string3, final Type<A2> type4) {
+        return (Type<Pair<Either<A1, Unit>, Pair<Either<A2, Unit>, Dynamic<?>>>>)DSL.and(DSL.optional((Type)DSL.field(string1, (Type)type2)), DSL.optional((Type)DSL.field(string3, (Type)type4)), DSL.remainderType());
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        final Schema schema2 = this.getInputSchema();
+        final TaggedChoice.TaggedChoiceType<String> taggedChoiceType3 = (TaggedChoice.TaggedChoiceType<String>)new TaggedChoice.TaggedChoiceType("type", DSL.string(), (Map)ImmutableMap.<String, Type>of("minecraft:debug", DSL.remainderType(), "minecraft:flat", (Type)MissingDimensionFix.<com.mojang.datafixers.util.Pair<com.mojang.datafixers.util.Either<Object, Unit>, com.mojang.datafixers.util.Pair<com.mojang.datafixers.util.Either<Object, Unit>, Dynamic<?>>>>optionalFields("settings", MissingDimensionFix.optionalFields("biome", (com.mojang.datafixers.types.Type<Object>)schema2.getType(References.BIOME), "layers", (com.mojang.datafixers.types.Type<Object>)DSL.list((Type)MissingDimensionFix.optionalFields("block", (com.mojang.datafixers.types.Type<Object>)schema2.getType(References.BLOCK_NAME))))), "minecraft:noise", (Type)MissingDimensionFix.optionalFields("biome_source", (com.mojang.datafixers.types.Type<Object>)DSL.taggedChoiceType("type", DSL.string(), (Map)ImmutableMap.<String, Object>of("minecraft:fixed", MissingDimensionFix.fields("biome", (com.mojang.datafixers.types.Type<Object>)schema2.getType(References.BIOME)), "minecraft:multi_noise", DSL.list((Type)MissingDimensionFix.fields("biome", (com.mojang.datafixers.types.Type<Object>)schema2.getType(References.BIOME))), "minecraft:checkerboard", MissingDimensionFix.fields("biomes", (com.mojang.datafixers.types.Type<Object>)DSL.list(schema2.getType(References.BIOME))), "minecraft:vanilla_layered", DSL.remainderType(), "minecraft:the_end", DSL.remainderType())), "settings", (com.mojang.datafixers.types.Type<Object>)DSL.or(DSL.string(), (Type)MissingDimensionFix.optionalFields("default_block", (com.mojang.datafixers.types.Type<Object>)schema2.getType(References.BLOCK_NAME), "default_fluid", (com.mojang.datafixers.types.Type<Object>)schema2.getType(References.BLOCK_NAME))))));
+        final CompoundList.CompoundListType<String, ?> compoundListType4 = DSL.compoundList((Type)NamespacedSchema.namespacedString(), (Type)MissingDimensionFix.fields("generator", (com.mojang.datafixers.types.Type<Object>)taggedChoiceType3));
+        final Type<?> type5 = DSL.and((Type)compoundListType4, DSL.remainderType());
+        final Type<?> type6 = schema2.getType(References.WORLD_GEN_SETTINGS);
+        final FieldFinder<?> fieldFinder7 = new FieldFinder("dimensions", (Type)type5);
+        if (!type6.findFieldType("dimensions").equals(type5)) {
+            throw new IllegalStateException();
+        }
+        final OpticFinder<? extends List<? extends Pair<String, ?>>> opticFinder8 = compoundListType4.finder();
+        Dynamic<?> dynamic5;
+        Dynamic<?> dynamic6;
+        final CompoundList.CompoundListType compoundListType5;
+        return this.fixTypeEverywhereTyped("MissingDimensionFix", (Type)type6, typed -> typed.updateTyped((OpticFinder)fieldFinder7, typed4 -> typed4.updateTyped((OpticFinder)opticFinder8, typed3 -> {
+            if (!(typed3.getValue() instanceof List)) {
+                throw new IllegalStateException("List exptected");
+            }
+            else if (((List)typed3.getValue()).isEmpty()) {
+                dynamic5 = typed.get(DSL.remainderFinder());
+                dynamic6 = this.recreateSettings(dynamic5);
+                return (Typed)DataFixUtils.orElse((Optional)compoundListType5.readTyped((Dynamic)dynamic6).result().map(Pair::getFirst), typed3);
+            }
+            else {
+                return typed3;
+            }
+        })));
+    }
+    
+    private <T> Dynamic<T> recreateSettings(final Dynamic<T> dynamic) {
+        final long long3 = dynamic.get("seed").asLong(0L);
+        return (Dynamic<T>)new Dynamic(dynamic.getOps(), WorldGenSettingsFix.<T>vanillaLevels(dynamic, long3, (com.mojang.serialization.Dynamic<T>)WorldGenSettingsFix.<T>defaultOverworld((com.mojang.serialization.Dynamic<T>)dynamic, long3), false));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/MobSpawnerEntityIdentifiersFix.java b/src/net/minecraft/util/datafix/fixes/MobSpawnerEntityIdentifiersFix.java
index ddb616b..17f5831 100644
--- a/src/net/minecraft/util/datafix/fixes/MobSpawnerEntityIdentifiersFix.java
+++ b/src/net/minecraft/util/datafix/fixes/MobSpawnerEntityIdentifiersFix.java
@@ -1,14 +1,15 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.DataResult;
 import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import java.util.Optional;
 import java.util.stream.Stream;
 import com.mojang.datafixers.DataFixUtils;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
 
@@ -21,21 +22,21 @@ public class MobSpawnerEntityIdentifiersFix extends DataFix {
         if (!"MobSpawner".equals(dynamic.get("id").asString(""))) {
             return dynamic;
         }
-        final Optional<String> optional3 = (Optional<String>)dynamic.get("EntityId").asString();
+        final Optional<String> optional3 = (Optional<String>)dynamic.get("EntityId").asString().result();
         if (optional3.isPresent()) {
-            Dynamic<?> dynamic2 = DataFixUtils.orElse(dynamic.get("SpawnData").get(), dynamic.emptyMap());
+            Dynamic<?> dynamic2 = DataFixUtils.orElse(dynamic.get("SpawnData").result(), dynamic.emptyMap());
             dynamic2 = dynamic2.set("id", dynamic2.createString(optional3.get().isEmpty() ? "Pig" : optional3.get()));
             dynamic = dynamic.set("SpawnData", (Dynamic)dynamic2);
             dynamic = dynamic.remove("EntityId");
         }
-        final Optional<? extends Stream<? extends Dynamic<?>>> optional4 = dynamic.get("SpawnPotentials").asStreamOpt();
+        final Optional<? extends Stream<? extends Dynamic<?>>> optional4 = dynamic.get("SpawnPotentials").asStreamOpt().result();
         if (optional4.isPresent()) {
             final Optional<String> optional5;
             Dynamic<?> dynamic3;
             dynamic = dynamic.set("SpawnPotentials", dynamic.createList((Stream)((Stream)optional4.get()).map(dynamic -> {
-                optional5 = (Optional<String>)dynamic.get("Type").asString();
+                optional5 = (Optional<String>)dynamic.get("Type").asString().result();
                 if (optional5.isPresent()) {
-                    dynamic3 = ((Dynamic)DataFixUtils.orElse(dynamic.get("Properties").get(), dynamic.emptyMap())).set("id", dynamic.createString((String)optional5.get()));
+                    dynamic3 = ((Dynamic)DataFixUtils.orElse(dynamic.get("Properties").result(), dynamic.emptyMap())).set("id", dynamic.createString((String)optional5.get()));
                     return dynamic.set("Entity", (Dynamic)dynamic3).remove("Type").remove("Properties");
                 }
                 else {
@@ -51,16 +52,16 @@ public class MobSpawnerEntityIdentifiersFix extends DataFix {
         final Dynamic<?> dynamic4;
         final Dynamic<?> dynamic5;
         final Type type3;
-        final Pair<?, ? extends Optional<? extends Typed<?>>> pair5;
+        final DataResult<? extends Pair<? extends Typed<?>, ?>> dataResult5;
         return this.fixTypeEverywhereTyped("MobSpawnerEntityIdentifiersFix", this.getInputSchema().getType(References.UNTAGGED_SPAWNER), (Type)type2, typed -> {
             dynamic4 = typed.get(DSL.remainderFinder());
             dynamic5 = dynamic4.set("id", dynamic4.createString("MobSpawner"));
-            pair5 = type3.readTyped((Dynamic)this.fix(dynamic5));
-            if (!((Optional)pair5.getSecond()).isPresent()) {
+            dataResult5 = type3.readTyped((Dynamic)this.fix(dynamic5));
+            if (!dataResult5.result().isPresent()) {
                 return typed;
             }
             else {
-                return (Typed)((Optional)pair5.getSecond()).get();
+                return (Typed)dataResult5.result().get().getFirst();
             }
         });
     }
diff --git a/src/net/minecraft/util/datafix/fixes/NewVillageFix.java b/src/net/minecraft/util/datafix/fixes/NewVillageFix.java
index ef4c0f5..1df34c7 100644
--- a/src/net/minecraft/util/datafix/fixes/NewVillageFix.java
+++ b/src/net/minecraft/util/datafix/fixes/NewVillageFix.java
@@ -5,7 +5,7 @@ import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.types.Type;
 import java.util.Optional;
 import com.mojang.datafixers.DataFixUtils;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.Objects;
@@ -38,8 +38,8 @@ public class NewVillageFix extends DataFix {
         final OpticFinder<List<Pair<String, SF>>> opticFinder8 = (OpticFinder<List<Pair<String, SF>>>)compoundListType.finder();
         final Optional<? extends Dynamic<?>> optional2;
         return TypeRewriteRule.seq(this.fixTypeEverywhereTyped("NewVillageFix", (Type)type3, typed -> typed.updateTyped((OpticFinder)opticFinder5, typed -> typed.updateTyped((OpticFinder)opticFinder6, typed -> typed.updateTyped((OpticFinder)opticFinder7, typed -> typed.update((OpticFinder)opticFinder8, list -> list.stream().filter(pair -> !Objects.equals(pair.getFirst(), "Village")).map(pair -> pair.mapFirst(string -> string.equals("New_Village") ? "Village" : string)).collect(Collectors.toList()))).update(DSL.remainderFinder(), dynamic -> dynamic.update("References", dynamic -> {
-            optional2 = dynamic.get("New_Village").get();
-            return ((Dynamic)DataFixUtils.orElse((Optional)optional2.map(dynamic2 -> dynamic.remove("New_Village").merge(dynamic.createString("Village"), dynamic2)), dynamic)).remove("Village");
+            optional2 = dynamic.get("New_Village").result();
+            return ((Dynamic)DataFixUtils.orElse((Optional)optional2.map(dynamic2 -> dynamic.remove("New_Village").set("Village", dynamic2)), dynamic)).remove("Village");
         }))))), this.fixTypeEverywhereTyped("NewVillageStartFix", (Type)type4, typed -> typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("id", dynamic -> Objects.equals(NamespacedSchema.ensureNamespaced(dynamic.asString("")), "minecraft:new_village") ? dynamic.createString("minecraft:village") : dynamic))));
     }
 }
diff --git a/src/net/minecraft/util/datafix/fixes/ObjectiveDisplayNameFix.java b/src/net/minecraft/util/datafix/fixes/ObjectiveDisplayNameFix.java
index c0713cf..d6fbe6e 100644
--- a/src/net/minecraft/util/datafix/fixes/ObjectiveDisplayNameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ObjectiveDisplayNameFix.java
@@ -1,14 +1,13 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.types.Type;
-import java.util.Optional;
 import com.mojang.datafixers.DataFixUtils;
 import java.util.function.Function;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.Objects;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
@@ -25,6 +24,6 @@ public class ObjectiveDisplayNameFix extends DataFix {
         if (!Objects.equals(type2, this.getInputSchema().getType(References.OBJECTIVE))) {
             throw new IllegalStateException("Objective type is not what was expected.");
         }
-        return this.fixTypeEverywhere("ObjectiveDisplayNameFix", (Type)type2, dynamicOps -> pair -> pair.mapSecond(dynamic -> ((Dynamic)dynamic).update("DisplayName", dynamic2 -> (Dynamic)DataFixUtils.orElse((Optional)dynamic2.asString().map(string -> Component.Serializer.toJson(new TextComponent(string))).map(dynamic::createString), dynamic2))));
+        return this.fixTypeEverywhere("ObjectiveDisplayNameFix", (Type)type2, dynamicOps -> pair -> pair.mapSecond(dynamic -> ((Dynamic)dynamic).update("DisplayName", dynamic2 -> (Dynamic)DataFixUtils.orElse(dynamic2.asString().map(string -> Component.Serializer.toJson(new TextComponent(string))).map((Function)dynamic::createString).result(), dynamic2))));
     }
 }
diff --git a/src/net/minecraft/util/datafix/fixes/ObjectiveRenderTypeFix.java b/src/net/minecraft/util/datafix/fixes/ObjectiveRenderTypeFix.java
index 8619890..fdc3751 100644
--- a/src/net/minecraft/util/datafix/fixes/ObjectiveRenderTypeFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ObjectiveRenderTypeFix.java
@@ -1,9 +1,9 @@
 package net.minecraft.util.datafix.fixes;
 
 import java.util.function.Function;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import java.util.Optional;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.types.Type;
 import java.util.Objects;
@@ -31,7 +31,7 @@ public class ObjectiveRenderTypeFix extends DataFix {
         String string3;
         ObjectiveCriteria.RenderType a4;
         return this.fixTypeEverywhere("ObjectiveRenderTypeFix", (Type)type2, dynamicOps -> pair -> pair.mapSecond(dynamic -> {
-            optional2 = (Optional<String>)dynamic.get("RenderType").asString();
+            optional2 = (Optional<String>)dynamic.get("RenderType").asString().result();
             if (!optional2.isPresent()) {
                 string3 = dynamic.get("CriteriaName").asString("");
                 a4 = getRenderType(string3);
diff --git a/src/net/minecraft/util/datafix/OminousBannerBlockEntityRenameFix.java b/src/net/minecraft/util/datafix/fixes/OminousBannerBlockEntityRenameFix.java
similarity index 83%
rename from src/net/minecraft/util/datafix/OminousBannerBlockEntityRenameFix.java
rename to src/net/minecraft/util/datafix/fixes/OminousBannerBlockEntityRenameFix.java
index bff309f..5c9d0c6 100644
--- a/src/net/minecraft/util/datafix/OminousBannerBlockEntityRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/OminousBannerBlockEntityRenameFix.java
@@ -1,13 +1,11 @@
-package net.minecraft.util.datafix;
+package net.minecraft.util.datafix.fixes;
 
 import java.util.Optional;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.function.Function;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
-import net.minecraft.util.datafix.fixes.References;
 import com.mojang.datafixers.schemas.Schema;
-import net.minecraft.util.datafix.fixes.NamedEntityFix;
 
 public class OminousBannerBlockEntityRenameFix extends NamedEntityFix {
     public OminousBannerBlockEntityRenameFix(final Schema schema, final boolean boolean2) {
@@ -20,7 +18,7 @@ public class OminousBannerBlockEntityRenameFix extends NamedEntityFix {
     }
     
     private Dynamic<?> fixTag(final Dynamic<?> dynamic) {
-        final Optional<String> optional3 = (Optional<String>)dynamic.get("CustomName").asString();
+        final Optional<String> optional3 = (Optional<String>)dynamic.get("CustomName").asString().result();
         if (optional3.isPresent()) {
             String string4 = optional3.get();
             string4 = string4.replace("\"translate\":\"block.minecraft.illager_banner\"", "\"translate\":\"block.minecraft.ominous_banner\"");
diff --git a/src/net/minecraft/util/datafix/OminousBannerRenameFix.java b/src/net/minecraft/util/datafix/fixes/OminousBannerRenameFix.java
similarity index 89%
rename from src/net/minecraft/util/datafix/OminousBannerRenameFix.java
rename to src/net/minecraft/util/datafix/fixes/OminousBannerRenameFix.java
index 171a997..d024712 100644
--- a/src/net/minecraft/util/datafix/OminousBannerRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/OminousBannerRenameFix.java
@@ -1,15 +1,15 @@
-package net.minecraft.util.datafix;
+package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.OpticFinder;
-import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.Typed;
 import java.util.Objects;
 import com.mojang.datafixers.util.Pair;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
-import net.minecraft.util.datafix.fixes.References;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import java.util.Optional;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
 
@@ -19,10 +19,10 @@ public class OminousBannerRenameFix extends DataFix {
     }
     
     private Dynamic<?> fixTag(final Dynamic<?> dynamic) {
-        final Optional<? extends Dynamic<?>> optional3 = dynamic.get("display").get();
+        final Optional<? extends Dynamic<?>> optional3 = dynamic.get("display").result();
         if (optional3.isPresent()) {
             Dynamic<?> dynamic2 = optional3.get();
-            final Optional<String> optional4 = (Optional<String>)dynamic2.get("Name").asString();
+            final Optional<String> optional4 = (Optional<String>)dynamic2.get("Name").asString().result();
             if (optional4.isPresent()) {
                 String string6 = optional4.get();
                 string6 = string6.replace("\"translate\":\"block.minecraft.illager_banner\"", "\"translate\":\"block.minecraft.ominous_banner\"");
@@ -35,7 +35,7 @@ public class OminousBannerRenameFix extends DataFix {
     
     public TypeRewriteRule makeRule() {
         final Type<?> type2 = this.getInputSchema().getType(References.ITEM_STACK);
-        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder3 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final OpticFinder<?> opticFinder4 = type2.findField("tag");
         final OpticFinder opticFinder5;
         final Optional<Pair<String, String>> optional5;
diff --git a/src/net/minecraft/util/datafix/fixes/OptionsAddTextBackgroundFix.java b/src/net/minecraft/util/datafix/fixes/OptionsAddTextBackgroundFix.java
index 2364da7..28348a9 100644
--- a/src/net/minecraft/util/datafix/fixes/OptionsAddTextBackgroundFix.java
+++ b/src/net/minecraft/util/datafix/fixes/OptionsAddTextBackgroundFix.java
@@ -1,9 +1,8 @@
 package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.Typed;
-import java.util.Optional;
 import com.mojang.datafixers.DataFixUtils;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
@@ -15,7 +14,7 @@ public class OptionsAddTextBackgroundFix extends DataFix {
     }
     
     public TypeRewriteRule makeRule() {
-        return this.fixTypeEverywhereTyped("OptionsAddTextBackgroundFix", this.getInputSchema().getType(References.OPTIONS), typed -> typed.update(DSL.remainderFinder(), dynamic -> (Dynamic)DataFixUtils.orElse((Optional)dynamic.get("chatOpacity").asString().map(string -> dynamic.set("textBackgroundOpacity", dynamic.createDouble(this.calculateBackground(string)))), dynamic)));
+        return this.fixTypeEverywhereTyped("OptionsAddTextBackgroundFix", this.getInputSchema().getType(References.OPTIONS), typed -> typed.update(DSL.remainderFinder(), dynamic -> (Dynamic)DataFixUtils.orElse(dynamic.get("chatOpacity").asString().map(string -> dynamic.set("textBackgroundOpacity", dynamic.createDouble(this.calculateBackground(string)))).result(), dynamic)));
     }
     
     private double calculateBackground(final String string) {
diff --git a/src/net/minecraft/util/datafix/fixes/OptionsForceVBOFix.java b/src/net/minecraft/util/datafix/fixes/OptionsForceVBOFix.java
index d486ac6..51383f6 100644
--- a/src/net/minecraft/util/datafix/fixes/OptionsForceVBOFix.java
+++ b/src/net/minecraft/util/datafix/fixes/OptionsForceVBOFix.java
@@ -1,6 +1,6 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
diff --git a/src/net/minecraft/util/datafix/fixes/OptionsKeyLwjgl3Fix.java b/src/net/minecraft/util/datafix/fixes/OptionsKeyLwjgl3Fix.java
index 6d24630..feb520a 100644
--- a/src/net/minecraft/util/datafix/fixes/OptionsKeyLwjgl3Fix.java
+++ b/src/net/minecraft/util/datafix/fixes/OptionsKeyLwjgl3Fix.java
@@ -8,7 +8,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import com.mojang.datafixers.util.Pair;
 import java.util.Map;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
@@ -54,7 +54,7 @@ public class OptionsKeyLwjgl3Fix extends DataFix {
             else {
                 return Pair.of(entry.getKey(), entry.getValue());
             }
-        }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)))).orElse(dynamic)));
+        }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)))).result().orElse(dynamic)));
     }
     
     static {
diff --git a/src/net/minecraft/util/datafix/fixes/OptionsKeyTranslationFix.java b/src/net/minecraft/util/datafix/fixes/OptionsKeyTranslationFix.java
index c6fbfef..7945d09 100644
--- a/src/net/minecraft/util/datafix/fixes/OptionsKeyTranslationFix.java
+++ b/src/net/minecraft/util/datafix/fixes/OptionsKeyTranslationFix.java
@@ -6,7 +6,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import com.mojang.datafixers.util.Pair;
 import java.util.Map;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
@@ -27,6 +27,6 @@ public class OptionsKeyTranslationFix extends DataFix {
                 }
             }
             return Pair.of(entry.getKey(), entry.getValue());
-        }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)))).orElse(dynamic)));
+        }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)))).result().orElse(dynamic)));
     }
 }
diff --git a/src/net/minecraft/util/datafix/fixes/OptionsLowerCaseLanguageFix.java b/src/net/minecraft/util/datafix/fixes/OptionsLowerCaseLanguageFix.java
index 352e2a0..4ee25b3 100644
--- a/src/net/minecraft/util/datafix/fixes/OptionsLowerCaseLanguageFix.java
+++ b/src/net/minecraft/util/datafix/fixes/OptionsLowerCaseLanguageFix.java
@@ -1,6 +1,6 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.Typed;
 import java.util.Optional;
 import java.util.Locale;
@@ -17,7 +17,7 @@ public class OptionsLowerCaseLanguageFix extends DataFix {
     public TypeRewriteRule makeRule() {
         final Optional optional2;
         return this.fixTypeEverywhereTyped("OptionsLowerCaseLanguageFix", this.getInputSchema().getType(References.OPTIONS), typed -> typed.update(DSL.remainderFinder(), dynamic -> {
-            optional2 = dynamic.get("lang").asString();
+            optional2 = dynamic.get("lang").asString().result();
             if (optional2.isPresent()) {
                 return dynamic.set("lang", dynamic.createString(optional2.get().toLowerCase(Locale.ROOT)));
             }
diff --git a/src/net/minecraft/util/datafix/fixes/OptionsRenameFieldFix.java b/src/net/minecraft/util/datafix/fixes/OptionsRenameFieldFix.java
new file mode 100644
index 0000000..443f6ce
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/OptionsRenameFieldFix.java
@@ -0,0 +1,27 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.mojang.datafixers.Typed;
+import java.util.Optional;
+import com.mojang.datafixers.DataFixUtils;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import com.mojang.datafixers.DataFix;
+
+public class OptionsRenameFieldFix extends DataFix {
+    private final String fixName;
+    private final String fieldFrom;
+    private final String fieldTo;
+    
+    public OptionsRenameFieldFix(final Schema schema, final boolean boolean2, final String string3, final String string4, final String string5) {
+        super(schema, boolean2);
+        this.fixName = string3;
+        this.fieldFrom = string4;
+        this.fieldTo = string5;
+    }
+    
+    public TypeRewriteRule makeRule() {
+        return this.fixTypeEverywhereTyped(this.fixName, this.getInputSchema().getType(References.OPTIONS), typed -> typed.update(DSL.remainderFinder(), dynamic -> (Dynamic)DataFixUtils.orElse((Optional)dynamic.get(this.fieldFrom).result().map(dynamic2 -> dynamic.set(this.fieldTo, dynamic2).remove(this.fieldFrom)), dynamic)));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/PlayerUUIDFix.java b/src/net/minecraft/util/datafix/fixes/PlayerUUIDFix.java
new file mode 100644
index 0000000..e1f8757
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/PlayerUUIDFix.java
@@ -0,0 +1,22 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.mojang.datafixers.Typed;
+import com.mojang.datafixers.OpticFinder;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+
+public class PlayerUUIDFix extends AbstractUUIDFix {
+    public PlayerUUIDFix(final Schema schema) {
+        super(schema, References.PLAYER);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        final OpticFinder opticFinder2;
+        return this.fixTypeEverywhereTyped("PlayerUUIDFix", this.getInputSchema().getType(this.typeReference), typed -> {
+            opticFinder2 = typed.getType().findField("RootVehicle");
+            return typed.updateTyped(opticFinder2, opticFinder2.type(), typed -> typed.update(DSL.remainderFinder(), dynamic -> AbstractUUIDFix.replaceUUIDLeastMost(dynamic, "Attach", "Attach").orElse(dynamic))).update(DSL.remainderFinder(), dynamic -> EntityUUIDFix.updateEntityUUID(EntityUUIDFix.updateLivingEntity(dynamic)));
+        });
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/PoiTypeRename.java b/src/net/minecraft/util/datafix/fixes/PoiTypeRename.java
index ba92823..172d929 100644
--- a/src/net/minecraft/util/datafix/fixes/PoiTypeRename.java
+++ b/src/net/minecraft/util/datafix/fixes/PoiTypeRename.java
@@ -1,10 +1,10 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import java.util.stream.Stream;
 import java.util.Optional;
 import com.mojang.datafixers.DataFixUtils;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.types.Type;
 import java.util.function.Function;
@@ -32,7 +32,7 @@ public abstract class PoiTypeRename extends DataFix {
     }
     
     private <T> Optional<Dynamic<T>> renameRecords(final Dynamic<T> dynamic) {
-        return dynamic.asStreamOpt().<Dynamic<T>>map(stream -> dynamic.createList((Stream)stream.map(dynamic -> dynamic.update("type", dynamic -> (Dynamic)DataFixUtils.orElse((Optional)((Dynamic)dynamic).asString().map(this::rename).map(dynamic::createString), dynamic)))));
+        return (Optional<Dynamic<T>>)dynamic.asStreamOpt().map(stream -> dynamic.createList((Stream)stream.map(dynamic -> dynamic.update("type", dynamic -> (Dynamic)DataFixUtils.orElse(((Dynamic)dynamic).asString().map((Function)this::rename).map((Function)dynamic::createString).result(), dynamic))))).result();
     }
     
     protected abstract String rename(final String string);
diff --git a/src/net/minecraft/util/datafix/fixes/RecipesRenameFix.java b/src/net/minecraft/util/datafix/fixes/RecipesRenameFix.java
index a24d6ae..dd25998 100644
--- a/src/net/minecraft/util/datafix/fixes/RecipesRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/RecipesRenameFix.java
@@ -1,10 +1,11 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.util.Pair;
-import com.mojang.datafixers.types.Type;
 import java.util.Objects;
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import java.util.function.Function;
@@ -21,7 +22,7 @@ public class RecipesRenameFix extends DataFix {
     }
     
     protected TypeRewriteRule makeRule() {
-        final Type<Pair<String, String>> type2 = (Type<Pair<String, String>>)DSL.named(References.RECIPE.typeName(), DSL.namespacedString());
+        final Type<Pair<String, String>> type2 = (Type<Pair<String, String>>)DSL.named(References.RECIPE.typeName(), (Type)NamespacedSchema.namespacedString());
         if (!Objects.equals(type2, this.getInputSchema().getType(References.RECIPE))) {
             throw new IllegalStateException("Recipe type is not what was expected.");
         }
diff --git a/src/net/minecraft/util/datafix/fixes/RedstoneWireConnectionsFix.java b/src/net/minecraft/util/datafix/fixes/RedstoneWireConnectionsFix.java
new file mode 100644
index 0000000..d48e842
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/RedstoneWireConnectionsFix.java
@@ -0,0 +1,55 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.mojang.datafixers.Typed;
+import java.util.function.Predicate;
+import com.mojang.serialization.Dynamic;
+import java.util.function.Function;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import com.mojang.datafixers.DataFix;
+
+public class RedstoneWireConnectionsFix extends DataFix {
+    public RedstoneWireConnectionsFix(final Schema schema) {
+        super(schema, false);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        final Schema schema2 = this.getInputSchema();
+        return this.fixTypeEverywhereTyped("RedstoneConnectionsFix", schema2.getType(References.BLOCK_STATE), typed -> typed.update(DSL.remainderFinder(), (Function)this::updateRedstoneConnections));
+    }
+    
+    private <T> Dynamic<T> updateRedstoneConnections(final Dynamic<T> dynamic) {
+        final boolean boolean3 = dynamic.get("Name").asString().result().filter("minecraft:redstone_wire"::equals).isPresent();
+        if (!boolean3) {
+            return dynamic;
+        }
+        final String string2;
+        final String string3;
+        final String string4;
+        final String string5;
+        final boolean boolean4;
+        final boolean boolean5;
+        final String string6;
+        final String string7;
+        final String string8;
+        final String string9;
+        return (Dynamic<T>)dynamic.update("Properties", dynamic -> {
+            string2 = dynamic.get("east").asString("none");
+            string3 = dynamic.get("west").asString("none");
+            string4 = dynamic.get("north").asString("none");
+            string5 = dynamic.get("south").asString("none");
+            boolean4 = (isConnected(string2) || isConnected(string3));
+            boolean5 = (isConnected(string4) || isConnected(string5));
+            string6 = ((!isConnected(string2) && !boolean5) ? "side" : string2);
+            string7 = ((!isConnected(string3) && !boolean5) ? "side" : string3);
+            string8 = ((!isConnected(string4) && !boolean4) ? "side" : string4);
+            string9 = ((!isConnected(string5) && !boolean4) ? "side" : string5);
+            return dynamic.update("east", dynamic -> dynamic.createString(string6)).update("west", dynamic -> dynamic.createString(string7)).update("north", dynamic -> dynamic.createString(string8)).update("south", dynamic -> dynamic.createString(string9));
+        });
+    }
+    
+    private static boolean isConnected(final String string) {
+        return !"none".equals(string);
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/References.java b/src/net/minecraft/util/datafix/fixes/References.java
index f8afe79..f95b0fb 100644
--- a/src/net/minecraft/util/datafix/fixes/References.java
+++ b/src/net/minecraft/util/datafix/fixes/References.java
@@ -27,6 +27,7 @@ public class References {
     public static final DSL.TypeReference TEAM;
     public static final DSL.TypeReference RECIPE;
     public static final DSL.TypeReference BIOME;
+    public static final DSL.TypeReference WORLD_GEN_SETTINGS;
     
     static {
         LEVEL = (() -> "level");
@@ -53,5 +54,6 @@ public class References {
         TEAM = (() -> "team");
         RECIPE = (() -> "recipe");
         BIOME = (() -> "biome");
+        WORLD_GEN_SETTINGS = (() -> "world_gen_settings");
     }
 }
diff --git a/src/net/minecraft/util/datafix/fixes/RenameBiomesFix.java b/src/net/minecraft/util/datafix/fixes/RenameBiomesFix.java
new file mode 100644
index 0000000..0ac0d72
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/RenameBiomesFix.java
@@ -0,0 +1,32 @@
+package net.minecraft.util.datafix.fixes;
+
+import java.util.function.Function;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.datafixers.util.Pair;
+import java.util.Objects;
+import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import java.util.Map;
+import com.mojang.datafixers.DataFix;
+
+public class RenameBiomesFix extends DataFix {
+    private final String name;
+    private final Map<String, String> biomes;
+    
+    public RenameBiomesFix(final Schema schema, final boolean boolean2, final String string, final Map<String, String> map) {
+        super(schema, boolean2);
+        this.biomes = map;
+        this.name = string;
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        final Type<Pair<String, String>> type2 = (Type<Pair<String, String>>)DSL.named(References.BIOME.typeName(), (Type)NamespacedSchema.namespacedString());
+        if (!Objects.equals(type2, this.getInputSchema().getType(References.BIOME))) {
+            throw new IllegalStateException("Biome type is not what was expected.");
+        }
+        return this.fixTypeEverywhere(this.name, (Type)type2, dynamicOps -> pair -> pair.mapSecond(string -> this.biomes.getOrDefault(string, string)));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/ReorganizePoi.java b/src/net/minecraft/util/datafix/fixes/ReorganizePoi.java
index 515db38..bef0660 100644
--- a/src/net/minecraft/util/datafix/fixes/ReorganizePoi.java
+++ b/src/net/minecraft/util/datafix/fixes/ReorganizePoi.java
@@ -1,11 +1,11 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import java.util.Optional;
 import java.util.Map;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.types.Type;
 import java.util.function.Function;
@@ -32,7 +32,7 @@ public class ReorganizePoi extends DataFix {
         final Map<Dynamic<T>, Dynamic<T>> map2 = Maps.newHashMap();
         for (int integer3 = 0; integer3 < 16; ++integer3) {
             final String string4 = String.valueOf(integer3);
-            final Optional<Dynamic<T>> optional5 = (Optional<Dynamic<T>>)dynamic.get(string4).get();
+            final Optional<Dynamic<T>> optional5 = (Optional<Dynamic<T>>)dynamic.get(string4).result();
             if (optional5.isPresent()) {
                 final Dynamic<T> dynamic2 = optional5.get();
                 final Dynamic<T> dynamic3 = (Dynamic<T>)dynamic.createMap((Map)ImmutableMap.<Dynamic, Dynamic<T>>of(dynamic.createString("Records"), dynamic2));
diff --git a/src/net/minecraft/util/datafix/fixes/SavedDataUUIDFix.java b/src/net/minecraft/util/datafix/fixes/SavedDataUUIDFix.java
new file mode 100644
index 0000000..e19a344
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/SavedDataUUIDFix.java
@@ -0,0 +1,21 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.mojang.datafixers.Typed;
+import java.util.stream.Stream;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+
+public class SavedDataUUIDFix extends AbstractUUIDFix {
+    public SavedDataUUIDFix(final Schema schema) {
+        super(schema, References.SAVED_DATA);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        return this.fixTypeEverywhereTyped("SavedDataUUIDFix", this.getInputSchema().getType(this.typeReference), typed -> typed.updateTyped(typed.getType().findField("data"), typed -> typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("Raids", dynamic -> dynamic.createList((Stream)dynamic.asStream().map(dynamic -> dynamic.update("HeroesOfTheVillage", dynamic -> dynamic.createList((Stream)dynamic.asStream().map(dynamic -> AbstractUUIDFix.createUUIDFromLongs(dynamic, "UUIDMost", "UUIDLeast").orElseGet(() -> {
+            SavedDataUUIDFix.LOGGER.warn("HeroesOfTheVillage contained invalid UUIDs.");
+            return dynamic;
+        }))))))))));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/SavedDataVillageCropFix.java b/src/net/minecraft/util/datafix/fixes/SavedDataVillageCropFix.java
index f7e9206..b83cdbd 100644
--- a/src/net/minecraft/util/datafix/fixes/SavedDataVillageCropFix.java
+++ b/src/net/minecraft/util/datafix/fixes/SavedDataVillageCropFix.java
@@ -1,7 +1,7 @@
 package net.minecraft.util.datafix.fixes;
 
 import java.util.stream.Stream;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.function.Function;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
@@ -21,7 +21,7 @@ public class SavedDataVillageCropFix extends DataFix {
     }
     
     private static <T> Dynamic<T> updateChildren(final Dynamic<T> dynamic) {
-        return dynamic.asStreamOpt().map(SavedDataVillageCropFix::updateChildren).<Dynamic<T>>map(dynamic::createList).orElse(dynamic);
+        return dynamic.asStreamOpt().map((Function)SavedDataVillageCropFix::updateChildren).map((Function)dynamic::createList).result().orElse(dynamic);
     }
     
     private static Stream<? extends Dynamic<?>> updateChildren(final Stream<? extends Dynamic<?>> stream) {
@@ -53,7 +53,7 @@ public class SavedDataVillageCropFix extends DataFix {
     }
     
     private static <T> Dynamic<T> updateCrop(final Dynamic<T> dynamic, final String string) {
-        if (dynamic.get(string).asNumber().isPresent()) {
+        if (dynamic.get(string).asNumber().result().isPresent()) {
             return (Dynamic<T>)dynamic.set(string, (Dynamic)BlockStateData.getTag(dynamic.get(string).asInt(0) << 4));
         }
         return dynamic;
diff --git a/src/net/minecraft/util/datafix/fixes/SimpleEntityRenameFix.java b/src/net/minecraft/util/datafix/fixes/SimpleEntityRenameFix.java
index dc32110..73c9edc 100644
--- a/src/net/minecraft/util/datafix/fixes/SimpleEntityRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/SimpleEntityRenameFix.java
@@ -1,7 +1,7 @@
 package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.schemas.Schema;
diff --git a/src/net/minecraft/util/datafix/fixes/SimplestEntityRenameFix.java b/src/net/minecraft/util/datafix/fixes/SimplestEntityRenameFix.java
index 5b02051..900d118 100644
--- a/src/net/minecraft/util/datafix/fixes/SimplestEntityRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/SimplestEntityRenameFix.java
@@ -4,7 +4,7 @@ import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.types.templates.TaggedChoice;
 import com.mojang.datafixers.util.Pair;
 import java.util.function.Function;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.DataFix;
@@ -34,7 +34,7 @@ public abstract class SimplestEntityRenameFix extends DataFix {
         //    21: astore_2        /* taggedChoiceType3 */
         //    22: getstatic       net/minecraft/util/datafix/fixes/References.ENTITY_NAME:Lcom/mojang/datafixers/DSL$TypeReference;
         //    25: invokeinterface com/mojang/datafixers/DSL$TypeReference.typeName:()Ljava/lang/String;
-        //    30: invokestatic    com/mojang/datafixers/DSL.namespacedString:()Lcom/mojang/datafixers/types/Type;
+        //    30: invokestatic    net/minecraft/util/datafix/schemas/NamespacedSchema.namespacedString:()Lcom/mojang/datafixers/types/Type;
         //    33: invokestatic    com/mojang/datafixers/DSL.named:(Ljava/lang/String;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/types/Type;
         //    36: astore_3        /* type4 */
         //    37: aload_0         /* this */
@@ -75,7 +75,7 @@ public abstract class SimplestEntityRenameFix extends DataFix {
         //   112: invokevirtual   net/minecraft/util/datafix/fixes/SimplestEntityRenameFix.fixTypeEverywhere:(Ljava/lang/String;Lcom/mojang/datafixers/types/Type;Ljava/util/function/Function;)Lcom/mojang/datafixers/TypeRewriteRule;
         //   115: invokestatic    com/mojang/datafixers/TypeRewriteRule.seq:(Lcom/mojang/datafixers/TypeRewriteRule;Lcom/mojang/datafixers/TypeRewriteRule;)Lcom/mojang/datafixers/TypeRewriteRule;
         //   118: areturn        
-        //    StackMapTable: 00 01 FE 00 40 07 00 07 07 00 07 07 00 5B
+        //    StackMapTable: 00 01 FE 00 40 07 00 07 07 00 07 07 00 5D
         // 
         // The error that occurred was:
         // 
diff --git a/src/net/minecraft/util/datafix/fixes/StatsCounterFix.java b/src/net/minecraft/util/datafix/fixes/StatsCounterFix.java
index 726e4a1..92271db 100644
--- a/src/net/minecraft/util/datafix/fixes/StatsCounterFix.java
+++ b/src/net/minecraft/util/datafix/fixes/StatsCounterFix.java
@@ -4,13 +4,14 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import javax.annotation.Nullable;
 import java.util.Iterator;
-import com.mojang.datafixers.types.Type;
 import java.util.Optional;
+import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.Typed;
 import org.apache.commons.lang3.StringUtils;
 import com.google.common.collect.Maps;
 import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.TypeRewriteRule;
 import com.mojang.datafixers.schemas.Schema;
 import java.util.Map;
@@ -49,12 +50,12 @@ public class StatsCounterFix extends DataFix {
         return this.fixTypeEverywhereTyped("StatsCounterFix", this.getInputSchema().getType(References.STATS), (Type)type2, typed -> {
             dynamic4 = typed.get(DSL.remainderFinder());
             map5 = Maps.newHashMap();
-            optional6 = dynamic4.getMapValues();
+            optional6 = dynamic4.getMapValues().result();
             if (optional6.isPresent()) {
                 ((Map)optional6.get()).entrySet().iterator();
                 while (iterator.hasNext()) {
                     entry8 = iterator.next();
-                    if (((Dynamic)entry8.getValue()).asNumber().isPresent()) {
+                    if (((Dynamic)entry8.getValue()).asNumber().result().isPresent()) {
                         string9 = ((Dynamic)entry8.getKey()).asString("");
                         if (StatsCounterFix.SKIP.contains(string9)) {
                             continue;
@@ -98,7 +99,7 @@ public class StatsCounterFix extends DataFix {
                     }
                 }
             }
-            return (Typed)((Optional)type3.readTyped(dynamic4.emptyMap().set("stats", dynamic4.createMap((Map)map5))).getSecond()).orElseThrow(() -> new IllegalStateException("Could not parse new stats object."));
+            return (Typed)((Pair)type3.readTyped(dynamic4.emptyMap().set("stats", dynamic4.createMap((Map)map5))).result().orElseThrow(() -> new IllegalStateException("Could not parse new stats object."))).getFirst();
         });
     }
     
diff --git a/src/net/minecraft/util/datafix/fixes/StriderGravityFix.java b/src/net/minecraft/util/datafix/fixes/StriderGravityFix.java
new file mode 100644
index 0000000..9cba5ac
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/StriderGravityFix.java
@@ -0,0 +1,25 @@
+package net.minecraft.util.datafix.fixes;
+
+import java.util.function.Function;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.Typed;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.schemas.Schema;
+
+public class StriderGravityFix extends NamedEntityFix {
+    public StriderGravityFix(final Schema schema, final boolean boolean2) {
+        super(schema, boolean2, "StriderGravityFix", References.ENTITY, "minecraft:strider");
+    }
+    
+    public Dynamic<?> fixTag(final Dynamic<?> dynamic) {
+        if (dynamic.get("NoGravity").asBoolean(false)) {
+            return dynamic.set("NoGravity", dynamic.createBoolean(false));
+        }
+        return dynamic;
+    }
+    
+    @Override
+    protected Typed<?> fix(final Typed<?> typed) {
+        return typed.update(DSL.remainderFinder(), (Function)this::fixTag);
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/StructureReferenceCountFix.java b/src/net/minecraft/util/datafix/fixes/StructureReferenceCountFix.java
index 7ad0985..8cef03d 100644
--- a/src/net/minecraft/util/datafix/fixes/StructureReferenceCountFix.java
+++ b/src/net/minecraft/util/datafix/fixes/StructureReferenceCountFix.java
@@ -1,7 +1,7 @@
 package net.minecraft.util.datafix.fixes;
 
 import com.mojang.datafixers.Typed;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.types.Type;
 import java.util.function.Function;
 import com.mojang.datafixers.DSL;
@@ -20,6 +20,6 @@ public class StructureReferenceCountFix extends DataFix {
     }
     
     private static <T> Dynamic<T> setCountToAtLeastOne(final Dynamic<T> dynamic) {
-        return (Dynamic<T>)dynamic.update("references", dynamic -> dynamic.createInt((int)dynamic.asNumber().map(Number::intValue).filter(integer -> integer > 0).orElse(1)));
+        return (Dynamic<T>)dynamic.update("references", dynamic -> dynamic.createInt((int)dynamic.asNumber().map((Function)Number::intValue).result().filter(integer -> integer > 0).orElse(1)));
     }
 }
diff --git a/src/net/minecraft/util/datafix/fixes/SwimStatsRenameFix.java b/src/net/minecraft/util/datafix/fixes/SwimStatsRenameFix.java
index 099952d..314fb09 100644
--- a/src/net/minecraft/util/datafix/fixes/SwimStatsRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/SwimStatsRenameFix.java
@@ -1,4 +1,8 @@
 java.lang.StackOverflowError
+	at java.base/java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:936)
+	at java.base/java.util.concurrent.ConcurrentHashMap.containsKey(ConcurrentHashMap.java:964)
+	at java.base/java.util.Collections$SetFromMap.contains(Collections.java:5564)
+	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:21)
 	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
 	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
@@ -1019,7 +1023,3 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
 	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
diff --git a/src/net/minecraft/util/datafix/fixes/TeamDisplayNameFix.java b/src/net/minecraft/util/datafix/fixes/TeamDisplayNameFix.java
index b78017e..2a98950 100644
--- a/src/net/minecraft/util/datafix/fixes/TeamDisplayNameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/TeamDisplayNameFix.java
@@ -1,14 +1,13 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.types.Type;
-import java.util.Optional;
 import com.mojang.datafixers.DataFixUtils;
 import java.util.function.Function;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.Objects;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.TypeRewriteRule;
@@ -25,6 +24,6 @@ public class TeamDisplayNameFix extends DataFix {
         if (!Objects.equals(type2, this.getInputSchema().getType(References.TEAM))) {
             throw new IllegalStateException("Team type is not what was expected.");
         }
-        return this.fixTypeEverywhere("TeamDisplayNameFix", (Type)type2, dynamicOps -> pair -> pair.mapSecond(dynamic -> ((Dynamic)dynamic).update("DisplayName", dynamic2 -> (Dynamic)DataFixUtils.orElse((Optional)dynamic2.asString().map(string -> Component.Serializer.toJson(new TextComponent(string))).map(dynamic::createString), dynamic2))));
+        return this.fixTypeEverywhere("TeamDisplayNameFix", (Type)type2, dynamicOps -> pair -> pair.mapSecond(dynamic -> ((Dynamic)dynamic).update("DisplayName", dynamic2 -> (Dynamic)DataFixUtils.orElse(dynamic2.asString().map(string -> Component.Serializer.toJson(new TextComponent(string))).map((Function)dynamic::createString).result(), dynamic2))));
     }
 }
diff --git a/src/net/minecraft/util/datafix/fixes/TrappedChestBlockEntityFix.java b/src/net/minecraft/util/datafix/fixes/TrappedChestBlockEntityFix.java
index bfc57a4..1751468 100644
--- a/src/net/minecraft/util/datafix/fixes/TrappedChestBlockEntityFix.java
+++ b/src/net/minecraft/util/datafix/fixes/TrappedChestBlockEntityFix.java
@@ -9,7 +9,7 @@ import it.unimi.dsi.fastutil.ints.IntSet;
 import java.util.Optional;
 import com.mojang.datafixers.OpticFinder;
 import java.util.Objects;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.types.Type;
diff --git a/src/net/minecraft/util/datafix/fixes/VillagerDataFix.java b/src/net/minecraft/util/datafix/fixes/VillagerDataFix.java
index eb378d5..a6279d5 100644
--- a/src/net/minecraft/util/datafix/fixes/VillagerDataFix.java
+++ b/src/net/minecraft/util/datafix/fixes/VillagerDataFix.java
@@ -4,7 +4,7 @@ import java.util.Map;
 import com.google.common.collect.ImmutableMap;
 import com.mojang.datafixers.DataFixUtils;
 import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.schemas.Schema;
 
@@ -16,7 +16,7 @@ public class VillagerDataFix extends NamedEntityFix {
     @Override
     protected Typed<?> fix(final Typed<?> typed) {
         final Dynamic<?> dynamic3 = typed.get(DSL.remainderFinder());
-        return typed.set(DSL.remainderFinder(), dynamic3.remove("Profession").remove("Career").remove("CareerLevel").set("VillagerData", dynamic3.createMap((Map)ImmutableMap.<Dynamic, Object>of(dynamic3.createString("type"), (Object)dynamic3.createString("minecraft:plains"), dynamic3.createString("profession"), (Object)dynamic3.createString(upgradeData(dynamic3.get("Profession").asInt(0), dynamic3.get("Career").asInt(0))), dynamic3.createString("level"), DataFixUtils.orElse(dynamic3.get("CareerLevel").get(), (Object)dynamic3.createInt(1))))));
+        return typed.set(DSL.remainderFinder(), dynamic3.remove("Profession").remove("Career").remove("CareerLevel").set("VillagerData", dynamic3.createMap((Map)ImmutableMap.<Dynamic, Object>of(dynamic3.createString("type"), (Object)dynamic3.createString("minecraft:plains"), dynamic3.createString("profession"), (Object)dynamic3.createString(upgradeData(dynamic3.get("Profession").asInt(0), dynamic3.get("Career").asInt(0))), dynamic3.createString("level"), DataFixUtils.orElse(dynamic3.get("CareerLevel").result(), (Object)dynamic3.createInt(1))))));
     }
     
     private static String upgradeData(final int integer1, final int integer2) {
diff --git a/src/net/minecraft/util/datafix/fixes/VillagerFollowRangeFix.java b/src/net/minecraft/util/datafix/fixes/VillagerFollowRangeFix.java
new file mode 100644
index 0000000..2d3b3d5
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/VillagerFollowRangeFix.java
@@ -0,0 +1,30 @@
+package net.minecraft.util.datafix.fixes;
+
+import java.util.stream.Stream;
+import com.mojang.serialization.Dynamic;
+import java.util.function.Function;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.Typed;
+import com.mojang.datafixers.schemas.Schema;
+
+public class VillagerFollowRangeFix extends NamedEntityFix {
+    public VillagerFollowRangeFix(final Schema schema) {
+        super(schema, false, "Villager Follow Range Fix", References.ENTITY, "minecraft:villager");
+    }
+    
+    @Override
+    protected Typed<?> fix(final Typed<?> typed) {
+        return typed.update(DSL.remainderFinder(), (Function)VillagerFollowRangeFix::fixValue);
+    }
+    
+    private static Dynamic<?> fixValue(final Dynamic<?> dynamic) {
+        return dynamic.update("Attributes", dynamic2 -> dynamic.createList((Stream)dynamic2.asStream().map(dynamic -> {
+            if (!dynamic.get("Name").asString("").equals("generic.follow_range") || dynamic.get("Base").asDouble(0.0) != 16.0) {
+                return dynamic;
+            }
+            else {
+                return dynamic.set("Base", dynamic.createDouble(48.0));
+            }
+        })));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/VillagerRebuildLevelAndXpFix.java b/src/net/minecraft/util/datafix/fixes/VillagerRebuildLevelAndXpFix.java
index 3579078..6b0a94f 100644
--- a/src/net/minecraft/util/datafix/fixes/VillagerRebuildLevelAndXpFix.java
+++ b/src/net/minecraft/util/datafix/fixes/VillagerRebuildLevelAndXpFix.java
@@ -1,6 +1,4 @@
 java.lang.StackOverflowError
-	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
-	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedGenericType.resolve(CoreMetadataFactory.java:744)
 	at com.strobel.assembler.metadata.MetadataHelper$9.visitClassType(MetadataHelper.java:2114)
@@ -1023,3 +1021,5 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
diff --git a/src/net/minecraft/util/datafix/fixes/VillagerTradeFix.java b/src/net/minecraft/util/datafix/fixes/VillagerTradeFix.java
index c932ce5..ba81c6d 100644
--- a/src/net/minecraft/util/datafix/fixes/VillagerTradeFix.java
+++ b/src/net/minecraft/util/datafix/fixes/VillagerTradeFix.java
@@ -4,6 +4,7 @@ import java.util.Objects;
 import java.util.function.Function;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.datafixers.OpticFinder;
+import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.types.templates.List;
@@ -29,7 +30,7 @@ public class VillagerTradeFix extends NamedEntityFix {
         final OpticFinder<?> opticFinder6 = type6.findField("buy");
         final OpticFinder<?> opticFinder7 = type6.findField("buyB");
         final OpticFinder<?> opticFinder8 = type6.findField("sell");
-        final OpticFinder<Pair<String, String>> opticFinder9 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), DSL.namespacedString()));
+        final OpticFinder<Pair<String, String>> opticFinder9 = (OpticFinder<Pair<String, String>>)DSL.fieldFinder("id", DSL.named(References.ITEM_NAME.typeName(), (Type)NamespacedSchema.namespacedString()));
         final Function<Typed<?>, Typed<?>> function13 = (Function<Typed<?>, Typed<?>>)(typed -> this.updateItemStack(opticFinder9, typed));
         final OpticFinder opticFinder10;
         final Function function14;
diff --git a/src/net/minecraft/util/datafix/fixes/WallPropertyFix.java b/src/net/minecraft/util/datafix/fixes/WallPropertyFix.java
new file mode 100644
index 0000000..e2608ba
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/WallPropertyFix.java
@@ -0,0 +1,54 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.google.common.collect.ImmutableSet;
+import com.mojang.datafixers.Typed;
+import java.util.function.Predicate;
+import java.util.Optional;
+import com.mojang.datafixers.DataFixUtils;
+import com.mojang.serialization.Dynamic;
+import java.util.function.Function;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import java.util.Set;
+import com.mojang.datafixers.DataFix;
+
+public class WallPropertyFix extends DataFix {
+    private static final Set<String> WALL_BLOCKS;
+    
+    public WallPropertyFix(final Schema schema, final boolean boolean2) {
+        super(schema, boolean2);
+    }
+    
+    public TypeRewriteRule makeRule() {
+        return this.fixTypeEverywhereTyped("WallPropertyFix", this.getInputSchema().getType(References.BLOCK_STATE), typed -> typed.update(DSL.remainderFinder(), (Function)WallPropertyFix::upgradeBlockStateTag));
+    }
+    
+    private static String mapProperty(final String string) {
+        return "true".equals(string) ? "low" : "none";
+    }
+    
+    private static <T> Dynamic<T> fixWallProperty(final Dynamic<T> dynamic, final String string) {
+        return (Dynamic<T>)dynamic.update(string, dynamic -> (Dynamic)DataFixUtils.orElse((Optional)((Dynamic)dynamic).asString().result().map(WallPropertyFix::mapProperty).map(dynamic::createString), dynamic));
+    }
+    
+    private static <T> Dynamic<T> upgradeBlockStateTag(final Dynamic<T> dynamic) {
+        final boolean boolean2 = dynamic.get("Name").asString().result().filter(WallPropertyFix.WALL_BLOCKS::contains).isPresent();
+        if (!boolean2) {
+            return dynamic;
+        }
+        final Dynamic<?> dynamic2;
+        final Dynamic<?> dynamic3;
+        final Dynamic<?> dynamic4;
+        return (Dynamic<T>)dynamic.update("Properties", dynamic -> {
+            dynamic2 = WallPropertyFix.fixWallProperty((com.mojang.serialization.Dynamic<?>)dynamic, "east");
+            dynamic3 = WallPropertyFix.fixWallProperty(dynamic2, "west");
+            dynamic4 = WallPropertyFix.fixWallProperty(dynamic3, "north");
+            return WallPropertyFix.fixWallProperty(dynamic4, "south");
+        });
+    }
+    
+    static {
+        WALL_BLOCKS = ImmutableSet.<String>of("minecraft:andesite_wall", "minecraft:brick_wall", "minecraft:cobblestone_wall", "minecraft:diorite_wall", "minecraft:end_stone_brick_wall", "minecraft:granite_wall", "minecraft:mossy_cobblestone_wall", "minecraft:mossy_stone_brick_wall", "minecraft:nether_brick_wall", "minecraft:prismarine_wall", "minecraft:red_nether_brick_wall", "minecraft:red_sandstone_wall", "minecraft:sandstone_wall", "minecraft:stone_brick_wall");
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/WorldGenSettingsFix.java b/src/net/minecraft/util/datafix/fixes/WorldGenSettingsFix.java
new file mode 100644
index 0000000..2e43477
--- /dev/null
+++ b/src/net/minecraft/util/datafix/fixes/WorldGenSettingsFix.java
@@ -0,0 +1,335 @@
+package net.minecraft.util.datafix.fixes;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
+import com.mojang.datafixers.Typed;
+import org.apache.commons.lang3.mutable.MutableInt;
+import org.apache.commons.lang3.mutable.MutableBoolean;
+import org.apache.commons.lang3.math.NumberUtils;
+import com.mojang.serialization.OptionalDynamic;
+import com.mojang.serialization.DynamicOps;
+import java.util.Objects;
+import java.util.stream.Stream;
+import java.util.Optional;
+import java.util.Locale;
+import java.util.Map;
+import com.mojang.serialization.Dynamic;
+import com.mojang.serialization.DynamicLike;
+import java.util.function.Function;
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import com.google.common.collect.ImmutableMap;
+import com.mojang.datafixers.DataFix;
+
+public class WorldGenSettingsFix extends DataFix {
+    private static final ImmutableMap<String, StructureFeatureConfiguration> DEFAULTS;
+    
+    public WorldGenSettingsFix(final Schema schema) {
+        super(schema, true);
+    }
+    
+    protected TypeRewriteRule makeRule() {
+        return this.fixTypeEverywhereTyped("WorldGenSettings building", this.getInputSchema().getType(References.WORLD_GEN_SETTINGS), typed -> typed.update(DSL.remainderFinder(), (Function)WorldGenSettingsFix::fix));
+    }
+    
+    private static <T> Dynamic<T> noise(final long long1, final DynamicLike<T> dynamicLike, final Dynamic<T> dynamic3, final Dynamic<T> dynamic4) {
+        return (Dynamic<T>)dynamicLike.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamicLike.createString("type"), dynamicLike.createString("minecraft:noise"), dynamicLike.createString("biome_source"), (Dynamic)dynamic4, dynamicLike.createString("seed"), dynamicLike.createLong(long1), dynamicLike.createString("settings"), (Dynamic)dynamic3));
+    }
+    
+    private static <T> Dynamic<T> vanillaBiomeSource(final Dynamic<T> dynamic, final long long2, final boolean boolean3, final boolean boolean4) {
+        final ImmutableMap.Builder<Dynamic<T>, Dynamic<T>> builder6 = ImmutableMap.<Dynamic<T>, Dynamic<T>>builder().put((Dynamic<T>)dynamic.createString("type"), (Dynamic<T>)dynamic.createString("minecraft:vanilla_layered")).put((Dynamic<T>)dynamic.createString("seed"), (Dynamic<T>)dynamic.createLong(long2)).put((Dynamic<T>)dynamic.createString("large_biomes"), (Dynamic<T>)dynamic.createBoolean(boolean4));
+        if (boolean3) {
+            builder6.put((Dynamic<T>)dynamic.createString("legacy_biome_init_layer"), (Dynamic<T>)dynamic.createBoolean(boolean3));
+        }
+        return (Dynamic<T>)dynamic.createMap((Map)builder6.build());
+    }
+    
+    private static <T> Dynamic<T> fix(final Dynamic<T> dynamic) {
+        final DynamicOps<T> dynamicOps2 = (DynamicOps<T>)dynamic.getOps();
+        final long long3 = dynamic.get("RandomSeed").asLong(0L);
+        final Optional<String> optional6 = (Optional<String>)dynamic.get("generatorName").asString().map(string -> string.toLowerCase(Locale.ROOT)).result();
+        final Optional<String> optional7 = dynamic.get("legacy_custom_options").asString().result().<Optional<String>>map(Optional::of).orElseGet(() -> {
+            if (optional6.equals(Optional.<String>of("customized"))) {
+                return dynamic.get("generatorOptions").asString().result();
+            }
+            else {
+                return Optional.empty();
+            }
+        });
+        boolean boolean8 = false;
+        Dynamic<T> dynamic2;
+        if (optional6.equals(Optional.<String>of("customized"))) {
+            dynamic2 = WorldGenSettingsFix.<T>defaultOverworld(dynamic, long3);
+        }
+        else if (!optional6.isPresent()) {
+            dynamic2 = WorldGenSettingsFix.<T>defaultOverworld(dynamic, long3);
+        }
+        else {
+            final String s = optional6.get();
+            switch (s) {
+                case "flat": {
+                    final OptionalDynamic<T> optionalDynamic11 = (OptionalDynamic<T>)dynamic.get("generatorOptions");
+                    final Map<Dynamic<T>, Dynamic<T>> map12 = WorldGenSettingsFix.<T>fixFlatStructures(dynamicOps2, optionalDynamic11);
+                    dynamic2 = (Dynamic<T>)dynamic.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic.createString("type"), dynamic.createString("minecraft:flat"), dynamic.createString("settings"), dynamic.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic.createString("structures"), dynamic.createMap((Map)map12), dynamic.createString("layers"), optionalDynamic11.get("layers").result().orElseGet(() -> dynamic.createList((Stream)Stream.<Dynamic>of(new Dynamic[] { dynamic.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic.createString("height"), dynamic.createInt(1), dynamic.createString("block"), dynamic.createString("minecraft:bedrock"))), dynamic.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic.createString("height"), dynamic.createInt(2), dynamic.createString("block"), dynamic.createString("minecraft:dirt"))), dynamic.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic.createString("height"), dynamic.createInt(1), dynamic.createString("block"), dynamic.createString("minecraft:grass_block"))) }))), dynamic.createString("biome"), dynamic.createString(optionalDynamic11.get("biome").asString("minecraft:plains"))))));
+                    break;
+                }
+                case "debug_all_block_states": {
+                    dynamic2 = (Dynamic<T>)dynamic.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic.createString("type"), dynamic.createString("minecraft:debug")));
+                    break;
+                }
+                case "buffet": {
+                    final OptionalDynamic<T> optionalDynamic12 = (OptionalDynamic<T>)dynamic.get("generatorOptions");
+                    final OptionalDynamic<?> optionalDynamic13 = optionalDynamic12.get("chunk_generator");
+                    final Optional<String> optional8 = (Optional<String>)optionalDynamic13.get("type").asString().result();
+                    Dynamic<T> dynamic3;
+                    if (Objects.equals(optional8, Optional.<String>of("minecraft:caves"))) {
+                        dynamic3 = (Dynamic<T>)dynamic.createString("minecraft:caves");
+                        boolean8 = true;
+                    }
+                    else if (Objects.equals(optional8, Optional.<String>of("minecraft:floating_islands"))) {
+                        dynamic3 = (Dynamic<T>)dynamic.createString("minecraft:floating_islands");
+                    }
+                    else {
+                        dynamic3 = (Dynamic<T>)dynamic.createString("minecraft:overworld");
+                    }
+                    final Dynamic<T> dynamic4 = (Dynamic<T>)optionalDynamic12.get("biome_source").result().orElseGet(() -> dynamic.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic.createString("type"), dynamic.createString("minecraft:fixed"))));
+                    Dynamic<T> dynamic5;
+                    if (dynamic4.get("type").asString().result().equals(Optional.<String>of("minecraft:fixed"))) {
+                        final String string2 = dynamic4.get("options").get("biomes").asStream().findFirst().<String>flatMap(dynamic -> dynamic.asString().result()).orElse("minecraft:ocean");
+                        dynamic5 = (Dynamic<T>)dynamic4.remove("options").set("biome", dynamic.createString(string2));
+                    }
+                    else {
+                        dynamic5 = dynamic4;
+                    }
+                    dynamic2 = WorldGenSettingsFix.<T>noise(long3, (com.mojang.serialization.DynamicLike<T>)dynamic, dynamic3, dynamic5);
+                    break;
+                }
+                default: {
+                    final boolean boolean9 = optional6.get().equals("default");
+                    final boolean boolean10 = optional6.get().equals("default_1_1") || (boolean9 && dynamic.get("generatorVersion").asInt(0) == 0);
+                    final boolean boolean11 = optional6.get().equals("amplified");
+                    final boolean boolean12 = optional6.get().equals("largebiomes");
+                    dynamic2 = WorldGenSettingsFix.<T>noise(long3, (com.mojang.serialization.DynamicLike<T>)dynamic, (com.mojang.serialization.Dynamic<T>)dynamic.createString(boolean11 ? "minecraft:amplified" : "minecraft:overworld"), (com.mojang.serialization.Dynamic<T>)WorldGenSettingsFix.<T>vanillaBiomeSource((com.mojang.serialization.Dynamic<T>)dynamic, long3, boolean10, boolean12));
+                    break;
+                }
+            }
+        }
+        final boolean boolean13 = dynamic.get("MapFeatures").asBoolean(true);
+        final boolean boolean14 = dynamic.get("BonusChest").asBoolean(false);
+        final ImmutableMap.Builder<T, T> builder11 = ImmutableMap.<T, T>builder();
+        builder11.put((T)dynamicOps2.createString("seed"), (T)dynamicOps2.createLong(long3));
+        builder11.put((T)dynamicOps2.createString("generate_features"), (T)dynamicOps2.createBoolean(boolean13));
+        builder11.put((T)dynamicOps2.createString("bonus_chest"), (T)dynamicOps2.createBoolean(boolean14));
+        builder11.put((T)dynamicOps2.createString("dimensions"), WorldGenSettingsFix.<T>vanillaLevels(dynamic, long3, dynamic2, boolean8));
+        final ImmutableMap.Builder<Object, Object> builder12;
+        final DynamicOps dynamicOps3;
+        optional7.ifPresent(string -> builder12.put(dynamicOps3.createString("legacy_custom_options"), dynamicOps3.createString(string)));
+        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps2, dynamicOps2.createMap((Map)builder11.build()));
+    }
+    
+    protected static <T> Dynamic<T> defaultOverworld(final Dynamic<T> dynamic, final long long2) {
+        return WorldGenSettingsFix.<T>noise(long2, (com.mojang.serialization.DynamicLike<T>)dynamic, (com.mojang.serialization.Dynamic<T>)dynamic.createString("minecraft:overworld"), (com.mojang.serialization.Dynamic<T>)WorldGenSettingsFix.<T>vanillaBiomeSource((com.mojang.serialization.Dynamic<T>)dynamic, long2, false, false));
+    }
+    
+    protected static <T> T vanillaLevels(final Dynamic<T> dynamic1, final long long2, final Dynamic<T> dynamic3, final boolean boolean4) {
+        final DynamicOps<T> dynamicOps6 = (DynamicOps<T>)dynamic1.getOps();
+        return (T)dynamicOps6.createMap((Map)ImmutableMap.of(dynamicOps6.createString("minecraft:overworld"), dynamicOps6.createMap((Map)ImmutableMap.of(dynamicOps6.createString("type"), dynamicOps6.createString("minecraft:overworld" + (boolean4 ? "_caves" : "")), dynamicOps6.createString("generator"), dynamic3.getValue())), dynamicOps6.createString("minecraft:the_nether"), dynamicOps6.createMap((Map)ImmutableMap.of(dynamicOps6.createString("type"), dynamicOps6.createString("minecraft:the_nether"), dynamicOps6.createString("generator"), WorldGenSettingsFix.noise(long2, (com.mojang.serialization.DynamicLike<Object>)dynamic1, (com.mojang.serialization.Dynamic<Object>)dynamic1.createString("minecraft:nether"), (com.mojang.serialization.Dynamic<Object>)dynamic1.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic1.createString("type"), dynamic1.createString("minecraft:multi_noise"), dynamic1.createString("seed"), dynamic1.createLong(long2), dynamic1.createString("preset"), dynamic1.createString("minecraft:nether")))).getValue())), dynamicOps6.createString("minecraft:the_end"), dynamicOps6.createMap((Map)ImmutableMap.of(dynamicOps6.createString("type"), dynamicOps6.createString("minecraft:the_end"), dynamicOps6.createString("generator"), WorldGenSettingsFix.noise(long2, (com.mojang.serialization.DynamicLike<Object>)dynamic1, (com.mojang.serialization.Dynamic<Object>)dynamic1.createString("minecraft:end"), (com.mojang.serialization.Dynamic<Object>)dynamic1.createMap((Map)ImmutableMap.<Dynamic, Dynamic>of(dynamic1.createString("type"), dynamic1.createString("minecraft:the_end"), dynamic1.createString("seed"), dynamic1.createLong(long2)))).getValue()))));
+    }
+    
+    private static <T> Map<Dynamic<T>, Dynamic<T>> fixFlatStructures(final DynamicOps<T> dynamicOps, final OptionalDynamic<T> optionalDynamic) {
+        // 
+        // This method could not be decompiled.
+        // 
+        // Original Bytecode:
+        // 
+        //     3: dup            
+        //     4: bipush          32
+        //     6: invokespecial   org/apache/commons/lang3/mutable/MutableInt.<init>:(I)V
+        //     9: astore_2        /* mutableInt3 */
+        //    10: new             Lorg/apache/commons/lang3/mutable/MutableInt;
+        //    13: dup            
+        //    14: iconst_3       
+        //    15: invokespecial   org/apache/commons/lang3/mutable/MutableInt.<init>:(I)V
+        //    18: astore_3        /* mutableInt4 */
+        //    19: new             Lorg/apache/commons/lang3/mutable/MutableInt;
+        //    22: dup            
+        //    23: sipush          128
+        //    26: invokespecial   org/apache/commons/lang3/mutable/MutableInt.<init>:(I)V
+        //    29: astore          mutableInt5
+        //    31: new             Lorg/apache/commons/lang3/mutable/MutableBoolean;
+        //    34: dup            
+        //    35: iconst_0       
+        //    36: invokespecial   org/apache/commons/lang3/mutable/MutableBoolean.<init>:(Z)V
+        //    39: astore          mutableBoolean6
+        //    41: invokestatic    com/google/common/collect/Maps.newHashMap:()Ljava/util/HashMap;
+        //    44: astore          map7
+        //    46: aload_1         /* optionalDynamic */
+        //    47: invokevirtual   com/mojang/serialization/OptionalDynamic.result:()Ljava/util/Optional;
+        //    50: invokevirtual   java/util/Optional.isPresent:()Z
+        //    53: ifne            81
+        //    56: aload           mutableBoolean6
+        //    58: invokevirtual   org/apache/commons/lang3/mutable/MutableBoolean.setTrue:()V
+        //    61: aload           map7
+        //    63: ldc_w           "minecraft:village"
+        //    66: getstatic       net/minecraft/util/datafix/fixes/WorldGenSettingsFix.DEFAULTS:Lcom/google/common/collect/ImmutableMap;
+        //    69: ldc_w           "minecraft:village"
+        //    72: invokevirtual   com/google/common/collect/ImmutableMap.get:(Ljava/lang/Object;)Ljava/lang/Object;
+        //    75: invokeinterface java/util/Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+        //    80: pop            
+        //    81: aload_1         /* optionalDynamic */
+        //    82: ldc_w           "structures"
+        //    85: invokevirtual   com/mojang/serialization/OptionalDynamic.get:(Ljava/lang/String;)Lcom/mojang/serialization/OptionalDynamic;
+        //    88: invokedynamic   BootstrapMethod #8, apply:()Ljava/util/function/Function;
+        //    93: invokevirtual   com/mojang/serialization/OptionalDynamic.flatMap:(Ljava/util/function/Function;)Lcom/mojang/serialization/DataResult;
+        //    96: invokevirtual   com/mojang/serialization/DataResult.result:()Ljava/util/Optional;
+        //    99: aload           mutableBoolean6
+        //   101: aload_2         /* mutableInt3 */
+        //   102: aload_3         /* mutableInt4 */
+        //   103: aload           mutableInt5
+        //   105: aload           map7
+        //   107: invokedynamic   BootstrapMethod #9, accept:(Lorg/apache/commons/lang3/mutable/MutableBoolean;Lorg/apache/commons/lang3/mutable/MutableInt;Lorg/apache/commons/lang3/mutable/MutableInt;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/Map;)Ljava/util/function/Consumer;
+        //   112: invokevirtual   java/util/Optional.ifPresent:(Ljava/util/function/Consumer;)V
+        //   115: invokestatic    com/google/common/collect/ImmutableMap.builder:()Lcom/google/common/collect/ImmutableMap$Builder;
+        //   118: astore          builder8
+        //   120: aload           builder8
+        //   122: aload_1         /* optionalDynamic */
+        //   123: ldc_w           "structures"
+        //   126: invokevirtual   com/mojang/serialization/OptionalDynamic.createString:(Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+        //   129: aload_1         /* optionalDynamic */
+        //   130: aload           map7
+        //   132: invokeinterface java/util/Map.entrySet:()Ljava/util/Set;
+        //   137: invokeinterface java/util/Set.stream:()Ljava/util/stream/Stream;
+        //   142: aload_1         /* optionalDynamic */
+        //   143: invokedynamic   BootstrapMethod #10, apply:(Lcom/mojang/serialization/OptionalDynamic;)Ljava/util/function/Function;
+        //   148: aload_0         /* dynamicOps */
+        //   149: invokedynamic   BootstrapMethod #11, apply:(Lcom/mojang/serialization/DynamicOps;)Ljava/util/function/Function;
+        //   154: invokestatic    java/util/stream/Collectors.toMap:(Ljava/util/function/Function;Ljava/util/function/Function;)Ljava/util/stream/Collector;
+        //   157: invokeinterface java/util/stream/Stream.collect:(Ljava/util/stream/Collector;)Ljava/lang/Object;
+        //   162: checkcast       Ljava/util/Map;
+        //   165: invokevirtual   com/mojang/serialization/OptionalDynamic.createMap:(Ljava/util/Map;)Lcom/mojang/serialization/Dynamic;
+        //   168: invokevirtual   com/google/common/collect/ImmutableMap$Builder.put:(Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableMap$Builder;
+        //   171: pop            
+        //   172: aload           mutableBoolean6
+        //   174: invokevirtual   org/apache/commons/lang3/mutable/MutableBoolean.isTrue:()Z
+        //   177: ifeq            255
+        //   180: aload           builder8
+        //   182: aload_1         /* optionalDynamic */
+        //   183: ldc_w           "stronghold"
+        //   186: invokevirtual   com/mojang/serialization/OptionalDynamic.createString:(Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+        //   189: aload_1         /* optionalDynamic */
+        //   190: aload_1         /* optionalDynamic */
+        //   191: ldc_w           "distance"
+        //   194: invokevirtual   com/mojang/serialization/OptionalDynamic.createString:(Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+        //   197: aload_1         /* optionalDynamic */
+        //   198: aload_2         /* mutableInt3 */
+        //   199: invokevirtual   org/apache/commons/lang3/mutable/MutableInt.getValue:()Ljava/lang/Integer;
+        //   202: invokevirtual   java/lang/Integer.intValue:()I
+        //   205: invokevirtual   com/mojang/serialization/OptionalDynamic.createInt:(I)Lcom/mojang/serialization/Dynamic;
+        //   208: aload_1         /* optionalDynamic */
+        //   209: ldc_w           "spread"
+        //   212: invokevirtual   com/mojang/serialization/OptionalDynamic.createString:(Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+        //   215: aload_1         /* optionalDynamic */
+        //   216: aload_3         /* mutableInt4 */
+        //   217: invokevirtual   org/apache/commons/lang3/mutable/MutableInt.getValue:()Ljava/lang/Integer;
+        //   220: invokevirtual   java/lang/Integer.intValue:()I
+        //   223: invokevirtual   com/mojang/serialization/OptionalDynamic.createInt:(I)Lcom/mojang/serialization/Dynamic;
+        //   226: aload_1         /* optionalDynamic */
+        //   227: ldc_w           "count"
+        //   230: invokevirtual   com/mojang/serialization/OptionalDynamic.createString:(Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+        //   233: aload_1         /* optionalDynamic */
+        //   234: aload           mutableInt5
+        //   236: invokevirtual   org/apache/commons/lang3/mutable/MutableInt.getValue:()Ljava/lang/Integer;
+        //   239: invokevirtual   java/lang/Integer.intValue:()I
+        //   242: invokevirtual   com/mojang/serialization/OptionalDynamic.createInt:(I)Lcom/mojang/serialization/Dynamic;
+        //   245: invokestatic    com/google/common/collect/ImmutableMap.of:(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableMap;
+        //   248: invokevirtual   com/mojang/serialization/OptionalDynamic.createMap:(Ljava/util/Map;)Lcom/mojang/serialization/Dynamic;
+        //   251: invokevirtual   com/google/common/collect/ImmutableMap$Builder.put:(Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableMap$Builder;
+        //   254: pop            
+        //   255: aload           builder8
+        //   257: invokevirtual   com/google/common/collect/ImmutableMap$Builder.build:()Lcom/google/common/collect/ImmutableMap;
+        //   260: areturn        
+        //    Signature:
+        //  <T:Ljava/lang/Object;>(Lcom/mojang/serialization/DynamicOps<TT;>;Lcom/mojang/serialization/OptionalDynamic<TT;>;)Ljava/util/Map<Lcom/mojang/serialization/Dynamic<TT;>;Lcom/mojang/serialization/Dynamic<TT;>;>;
+        //    MethodParameters:
+        //  Name             Flags  
+        //  ---------------  -----
+        //  dynamicOps       
+        //  optionalDynamic  
+        //    StackMapTable: 00 02 FF 00 51 00 07 07 00 F4 07 00 B0 07 01 FA 07 01 FA 07 01 FA 07 01 FF 07 02 16 00 00 FF 00 AD 00 08 00 00 00 00 00 00 00 07 00 0A 00 00
+        // 
+        // The error that occurred was:
+        // 
+        // java.lang.NullPointerException
+        //     at com.strobel.decompiler.languages.java.ast.NameVariables.generateNameForVariable(NameVariables.java:264)
+        //     at com.strobel.decompiler.languages.java.ast.NameVariables.assignNamesToVariables(NameVariables.java:198)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:276)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
+        //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
+        //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
+        //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
+        //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
+        //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
+        //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
+        //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
+        //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
+        //     at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
+        //     at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
+        //     at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:177)
+        // 
+        throw new IllegalStateException("An error occurred while decompiling this method.");
+    }
+    
+    private static int getInt(final String string, final int integer) {
+        return NumberUtils.toInt(string, integer);
+    }
+    
+    private static int getInt(final String string, final int integer2, final int integer3) {
+        return Math.max(integer3, getInt(string, integer2));
+    }
+    
+    private static void setSpacing(final Map<String, StructureFeatureConfiguration> map, final String string2, final String string3, final int integer) {
+        final StructureFeatureConfiguration a5 = map.getOrDefault(string2, WorldGenSettingsFix.DEFAULTS.get(string2));
+        final int integer2 = getInt(string3, a5.spacing, integer);
+        map.put(string2, new StructureFeatureConfiguration(integer2, a5.separation, a5.salt));
+    }
+    
+    static {
+        DEFAULTS = ImmutableMap.<String, StructureFeatureConfiguration>builder().put("minecraft:village", new StructureFeatureConfiguration(32, 8, 10387312)).put("minecraft:desert_pyramid", new StructureFeatureConfiguration(32, 8, 14357617)).put("minecraft:igloo", new StructureFeatureConfiguration(32, 8, 14357618)).put("minecraft:jungle_pyramid", new StructureFeatureConfiguration(32, 8, 14357619)).put("minecraft:swamp_hut", new StructureFeatureConfiguration(32, 8, 14357620)).put("minecraft:pillager_outpost", new StructureFeatureConfiguration(32, 8, 165745296)).put("minecraft:monument", new StructureFeatureConfiguration(32, 5, 10387313)).put("minecraft:endcity", new StructureFeatureConfiguration(20, 11, 10387313)).put("minecraft:mansion", new StructureFeatureConfiguration(80, 20, 10387319)).build();
+    }
+    
+    static final class StructureFeatureConfiguration {
+        public static final Codec<StructureFeatureConfiguration> CODEC;
+        private final int spacing;
+        private final int separation;
+        private final int salt;
+        
+        public StructureFeatureConfiguration(final int integer1, final int integer2, final int integer3) {
+            this.spacing = integer1;
+            this.separation = integer2;
+            this.salt = integer3;
+        }
+        
+        public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
+            return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, StructureFeatureConfiguration.CODEC.encodeStart((DynamicOps)dynamicOps, this).result().orElse(dynamicOps.emptyMap()));
+        }
+        
+        static {
+            CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("spacing").forGetter(a -> a.spacing), (App)Codec.INT.fieldOf("separation").forGetter(a -> a.separation), (App)Codec.INT.fieldOf("salt").forGetter(a -> a.salt)).apply(instance, StructureFeatureConfiguration::new));
+        }
+    }
+}
diff --git a/src/net/minecraft/util/datafix/fixes/ZombieVillagerRebuildXpFix.java b/src/net/minecraft/util/datafix/fixes/ZombieVillagerRebuildXpFix.java
index a2142e7..f73fde9 100644
--- a/src/net/minecraft/util/datafix/fixes/ZombieVillagerRebuildXpFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ZombieVillagerRebuildXpFix.java
@@ -1,6 +1,6 @@
 package net.minecraft.util.datafix.fixes;
 
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
 import java.util.Optional;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.Typed;
@@ -16,9 +16,9 @@ public class ZombieVillagerRebuildXpFix extends NamedEntityFix {
         final Optional<Number> optional2;
         int integer3;
         return typed.update(DSL.remainderFinder(), dynamic -> {
-            optional2 = (Optional<Number>)dynamic.get("Xp").asNumber();
+            optional2 = (Optional<Number>)dynamic.get("Xp").asNumber().result();
             if (!optional2.isPresent()) {
-                integer3 = dynamic.get("VillagerData").get("level").asNumber().orElse(1).intValue();
+                integer3 = dynamic.get("VillagerData").get("level").asInt(1);
                 return dynamic.set("Xp", dynamic.createInt(VillagerRebuildLevelAndXpFix.getMinXpPerLevel(integer3)));
             }
             else {
diff --git a/src/net/minecraft/util/datafix/schemas/NamespacedSchema.java b/src/net/minecraft/util/datafix/schemas/NamespacedSchema.java
index 8e6bea7..9df23b2 100644
--- a/src/net/minecraft/util/datafix/schemas/NamespacedSchema.java
+++ b/src/net/minecraft/util/datafix/schemas/NamespacedSchema.java
@@ -1,24 +1,55 @@
 package net.minecraft.util.datafix.schemas;
 
-import com.mojang.datafixers.types.Type;
+import com.mojang.serialization.Codec;
+import com.mojang.datafixers.types.templates.Const;
+import java.util.function.Function;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.DSL;
 import net.minecraft.resources.ResourceLocation;
+import com.mojang.datafixers.types.Type;
+import com.mojang.serialization.codecs.PrimitiveCodec;
 import com.mojang.datafixers.schemas.Schema;
 
 public class NamespacedSchema extends Schema {
+    public static final PrimitiveCodec<String> NAMESPACED_STRING_CODEC;
+    private static final Type<String> NAMESPACED_STRING;
+    
     public NamespacedSchema(final int integer, final Schema schema) {
         super(integer, schema);
     }
     
     public static String ensureNamespaced(final String string) {
-        final ResourceLocation sm2 = ResourceLocation.tryParse(string);
-        if (sm2 != null) {
-            return sm2.toString();
+        final ResourceLocation uh2 = ResourceLocation.tryParse(string);
+        if (uh2 != null) {
+            return uh2.toString();
         }
         return string;
     }
     
+    public static Type<String> namespacedString() {
+        return NamespacedSchema.NAMESPACED_STRING;
+    }
+    
     public Type<?> getChoiceType(final DSL.TypeReference typeReference, final String string) {
         return super.getChoiceType(typeReference, ensureNamespaced(string));
     }
+    
+    static {
+        NAMESPACED_STRING_CODEC = (PrimitiveCodec)new PrimitiveCodec<String>() {
+            public <T> DataResult<String> read(final DynamicOps<T> dynamicOps, final T object) {
+                return (DataResult<String>)dynamicOps.getStringValue(object).map((Function)NamespacedSchema::ensureNamespaced);
+            }
+            
+            public <T> T write(final DynamicOps<T> dynamicOps, final String string) {
+                return (T)dynamicOps.createString(string);
+            }
+            
+            @Override
+            public String toString() {
+                return "NamespacedString";
+            }
+        };
+        NAMESPACED_STRING = (Type)new Const.PrimitiveType((Codec)NamespacedSchema.NAMESPACED_STRING_CODEC);
+    }
 }
diff --git a/src/net/minecraft/util/datafix/schemas/V1022.java b/src/net/minecraft/util/datafix/schemas/V1022.java
index 862d2ef..9b4f4c6 100644
--- a/src/net/minecraft/util/datafix/schemas/V1022.java
+++ b/src/net/minecraft/util/datafix/schemas/V1022.java
@@ -1,5 +1,6 @@
 package net.minecraft.util.datafix.schemas;
 
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import net.minecraft.util.datafix.fixes.References;
 import com.mojang.datafixers.types.templates.TypeTemplate;
@@ -14,7 +15,7 @@ public class V1022 extends Schema {
     
     public void registerTypes(final Schema schema, final Map<String, Supplier<TypeTemplate>> map2, final Map<String, Supplier<TypeTemplate>> map3) {
         super.registerTypes(schema, (Map)map2, (Map)map3);
-        schema.registerType(false, References.RECIPE, () -> DSL.constType(DSL.namespacedString()));
+        schema.registerType(false, References.RECIPE, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
         schema.registerType(false, References.PLAYER, () -> DSL.optionalFields("RootVehicle", DSL.optionalFields("Entity", References.ENTITY_TREE.in(schema)), "Inventory", DSL.list(References.ITEM_STACK.in(schema)), "EnderItems", DSL.list(References.ITEM_STACK.in(schema)), DSL.optionalFields("ShoulderEntityLeft", References.ENTITY_TREE.in(schema), "ShoulderEntityRight", References.ENTITY_TREE.in(schema), "recipeBook", DSL.optionalFields("recipes", DSL.list(References.RECIPE.in(schema)), "toBeDisplayed", DSL.list(References.RECIPE.in(schema))))));
         schema.registerType(false, References.HOTBAR, () -> DSL.compoundList(DSL.list(References.ITEM_STACK.in(schema))));
     }
diff --git a/src/net/minecraft/util/datafix/schemas/V1125.java b/src/net/minecraft/util/datafix/schemas/V1125.java
index 8275c0d..0384e90 100644
--- a/src/net/minecraft/util/datafix/schemas/V1125.java
+++ b/src/net/minecraft/util/datafix/schemas/V1125.java
@@ -1,5 +1,6 @@
 package net.minecraft.util.datafix.schemas;
 
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import net.minecraft.util.datafix.fixes.References;
 import com.mojang.datafixers.types.templates.TypeTemplate;
@@ -21,7 +22,7 @@ public class V1125 extends NamespacedSchema {
     public void registerTypes(final Schema schema, final Map<String, Supplier<TypeTemplate>> map2, final Map<String, Supplier<TypeTemplate>> map3) {
         super.registerTypes(schema, (Map)map2, (Map)map3);
         schema.registerType(false, References.ADVANCEMENTS, () -> DSL.optionalFields("minecraft:adventure/adventuring_time", DSL.optionalFields("criteria", DSL.compoundList(References.BIOME.in(schema), DSL.constType(DSL.string()))), "minecraft:adventure/kill_a_mob", DSL.optionalFields("criteria", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.string()))), "minecraft:adventure/kill_all_mobs", DSL.optionalFields("criteria", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.string()))), "minecraft:husbandry/bred_all_animals", DSL.optionalFields("criteria", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.string())))));
-        schema.registerType(false, References.BIOME, () -> DSL.constType(DSL.namespacedString()));
-        schema.registerType(false, References.ENTITY_NAME, () -> DSL.constType(DSL.namespacedString()));
+        schema.registerType(false, References.BIOME, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
+        schema.registerType(false, References.ENTITY_NAME, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
     }
 }
diff --git a/src/net/minecraft/util/datafix/schemas/V1451_4.java b/src/net/minecraft/util/datafix/schemas/V1451_4.java
index 83ffff3..3083e99 100644
--- a/src/net/minecraft/util/datafix/schemas/V1451_4.java
+++ b/src/net/minecraft/util/datafix/schemas/V1451_4.java
@@ -1,5 +1,6 @@
 package net.minecraft.util.datafix.schemas;
 
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import net.minecraft.util.datafix.fixes.References;
 import com.mojang.datafixers.types.templates.TypeTemplate;
@@ -14,6 +15,6 @@ public class V1451_4 extends NamespacedSchema {
     
     public void registerTypes(final Schema schema, final Map<String, Supplier<TypeTemplate>> map2, final Map<String, Supplier<TypeTemplate>> map3) {
         super.registerTypes(schema, (Map)map2, (Map)map3);
-        schema.registerType(false, References.BLOCK_NAME, () -> DSL.constType(DSL.namespacedString()));
+        schema.registerType(false, References.BLOCK_NAME, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
     }
 }
diff --git a/src/net/minecraft/util/datafix/schemas/V1451_6.java b/src/net/minecraft/util/datafix/schemas/V1451_6.java
index e69ebf6..6e30b72 100644
--- a/src/net/minecraft/util/datafix/schemas/V1451_6.java
+++ b/src/net/minecraft/util/datafix/schemas/V1451_6.java
@@ -1,5 +1,6 @@
 package net.minecraft.util.datafix.schemas;
 
+import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.DSL;
 import net.minecraft.util.datafix.fixes.References;
 import com.mojang.datafixers.types.templates.TypeTemplate;
@@ -16,6 +17,6 @@ public class V1451_6 extends NamespacedSchema {
         super.registerTypes(schema, (Map)map2, (Map)map3);
         final Supplier<TypeTemplate> supplier5 = () -> DSL.compoundList(References.ITEM_NAME.in(schema), DSL.constType(DSL.intType()));
         final Supplier<TypeTemplate> supplier6;
-        schema.registerType(false, References.STATS, () -> DSL.optionalFields("stats", DSL.optionalFields("minecraft:mined", DSL.compoundList(References.BLOCK_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:crafted", (TypeTemplate)supplier6.get(), "minecraft:used", (TypeTemplate)supplier6.get(), "minecraft:broken", (TypeTemplate)supplier6.get(), "minecraft:picked_up", (TypeTemplate)supplier6.get(), DSL.optionalFields("minecraft:dropped", (TypeTemplate)supplier6.get(), "minecraft:killed", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:killed_by", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:custom", DSL.compoundList(DSL.constType(DSL.namespacedString()), DSL.constType(DSL.intType()))))));
+        schema.registerType(false, References.STATS, () -> DSL.optionalFields("stats", DSL.optionalFields("minecraft:mined", DSL.compoundList(References.BLOCK_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:crafted", (TypeTemplate)supplier6.get(), "minecraft:used", (TypeTemplate)supplier6.get(), "minecraft:broken", (TypeTemplate)supplier6.get(), "minecraft:picked_up", (TypeTemplate)supplier6.get(), DSL.optionalFields("minecraft:dropped", (TypeTemplate)supplier6.get(), "minecraft:killed", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:killed_by", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:custom", DSL.compoundList(DSL.constType((Type)NamespacedSchema.namespacedString()), DSL.constType(DSL.intType()))))));
     }
 }
diff --git a/src/net/minecraft/util/datafix/schemas/V1460.java b/src/net/minecraft/util/datafix/schemas/V1460.java
index 7405c36..234a448 100644
--- a/src/net/minecraft/util/datafix/schemas/V1460.java
+++ b/src/net/minecraft/util/datafix/schemas/V1460.java
@@ -1,6 +1,7 @@
 package net.minecraft.util.datafix.schemas;
 
 import com.mojang.datafixers.types.templates.Hook;
+import com.mojang.datafixers.types.Type;
 import com.google.common.collect.Maps;
 import com.mojang.datafixers.DSL;
 import net.minecraft.util.datafix.fixes.References;
@@ -141,30 +142,31 @@ public class V1460 extends NamespacedSchema {
     
     public void registerTypes(final Schema schema, final Map<String, Supplier<TypeTemplate>> map2, final Map<String, Supplier<TypeTemplate>> map3) {
         schema.registerType(false, References.LEVEL, (Supplier)DSL::remainder);
-        schema.registerType(false, References.RECIPE, () -> DSL.constType(DSL.namespacedString()));
+        schema.registerType(false, References.RECIPE, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
         schema.registerType(false, References.PLAYER, () -> DSL.optionalFields("RootVehicle", DSL.optionalFields("Entity", References.ENTITY_TREE.in(schema)), "Inventory", DSL.list(References.ITEM_STACK.in(schema)), "EnderItems", DSL.list(References.ITEM_STACK.in(schema)), DSL.optionalFields("ShoulderEntityLeft", References.ENTITY_TREE.in(schema), "ShoulderEntityRight", References.ENTITY_TREE.in(schema), "recipeBook", DSL.optionalFields("recipes", DSL.list(References.RECIPE.in(schema)), "toBeDisplayed", DSL.list(References.RECIPE.in(schema))))));
         schema.registerType(false, References.CHUNK, () -> DSL.fields("Level", DSL.optionalFields("Entities", DSL.list(References.ENTITY_TREE.in(schema)), "TileEntities", DSL.list(References.BLOCK_ENTITY.in(schema)), "TileTicks", DSL.list(DSL.fields("i", References.BLOCK_NAME.in(schema))), "Sections", DSL.list(DSL.optionalFields("Palette", DSL.list(References.BLOCK_STATE.in(schema)))))));
-        schema.registerType(true, References.BLOCK_ENTITY, () -> DSL.taggedChoiceLazy("id", DSL.namespacedString(), (Map)map3));
+        schema.registerType(true, References.BLOCK_ENTITY, () -> DSL.taggedChoiceLazy("id", (Type)NamespacedSchema.namespacedString(), (Map)map3));
         schema.registerType(true, References.ENTITY_TREE, () -> DSL.optionalFields("Passengers", DSL.list(References.ENTITY_TREE.in(schema)), References.ENTITY.in(schema)));
-        schema.registerType(true, References.ENTITY, () -> DSL.taggedChoiceLazy("id", DSL.namespacedString(), (Map)map2));
+        schema.registerType(true, References.ENTITY, () -> DSL.taggedChoiceLazy("id", (Type)NamespacedSchema.namespacedString(), (Map)map2));
         schema.registerType(true, References.ITEM_STACK, () -> DSL.hook(DSL.optionalFields("id", References.ITEM_NAME.in(schema), "tag", DSL.optionalFields("EntityTag", References.ENTITY_TREE.in(schema), "BlockEntityTag", References.BLOCK_ENTITY.in(schema), "CanDestroy", DSL.list(References.BLOCK_NAME.in(schema)), "CanPlaceOn", DSL.list(References.BLOCK_NAME.in(schema)))), V705.ADD_NAMES, Hook.HookFunction.IDENTITY));
         schema.registerType(false, References.HOTBAR, () -> DSL.compoundList(DSL.list(References.ITEM_STACK.in(schema))));
         schema.registerType(false, References.OPTIONS, (Supplier)DSL::remainder);
         schema.registerType(false, References.STRUCTURE, () -> DSL.optionalFields("entities", DSL.list(DSL.optionalFields("nbt", References.ENTITY_TREE.in(schema))), "blocks", DSL.list(DSL.optionalFields("nbt", References.BLOCK_ENTITY.in(schema))), "palette", DSL.list(References.BLOCK_STATE.in(schema))));
-        schema.registerType(false, References.BLOCK_NAME, () -> DSL.constType(DSL.namespacedString()));
-        schema.registerType(false, References.ITEM_NAME, () -> DSL.constType(DSL.namespacedString()));
+        schema.registerType(false, References.BLOCK_NAME, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
+        schema.registerType(false, References.ITEM_NAME, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
         schema.registerType(false, References.BLOCK_STATE, (Supplier)DSL::remainder);
         final Supplier<TypeTemplate> supplier5 = () -> DSL.compoundList(References.ITEM_NAME.in(schema), DSL.constType(DSL.intType()));
         final Supplier<TypeTemplate> supplier6;
-        schema.registerType(false, References.STATS, () -> DSL.optionalFields("stats", DSL.optionalFields("minecraft:mined", DSL.compoundList(References.BLOCK_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:crafted", (TypeTemplate)supplier6.get(), "minecraft:used", (TypeTemplate)supplier6.get(), "minecraft:broken", (TypeTemplate)supplier6.get(), "minecraft:picked_up", (TypeTemplate)supplier6.get(), DSL.optionalFields("minecraft:dropped", (TypeTemplate)supplier6.get(), "minecraft:killed", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:killed_by", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:custom", DSL.compoundList(DSL.constType(DSL.namespacedString()), DSL.constType(DSL.intType()))))));
+        schema.registerType(false, References.STATS, () -> DSL.optionalFields("stats", DSL.optionalFields("minecraft:mined", DSL.compoundList(References.BLOCK_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:crafted", (TypeTemplate)supplier6.get(), "minecraft:used", (TypeTemplate)supplier6.get(), "minecraft:broken", (TypeTemplate)supplier6.get(), "minecraft:picked_up", (TypeTemplate)supplier6.get(), DSL.optionalFields("minecraft:dropped", (TypeTemplate)supplier6.get(), "minecraft:killed", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:killed_by", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.intType())), "minecraft:custom", DSL.compoundList(DSL.constType((Type)NamespacedSchema.namespacedString()), DSL.constType(DSL.intType()))))));
         schema.registerType(false, References.SAVED_DATA, () -> DSL.optionalFields("data", DSL.optionalFields("Features", DSL.compoundList(References.STRUCTURE_FEATURE.in(schema)), "Objectives", DSL.list(References.OBJECTIVE.in(schema)), "Teams", DSL.list(References.TEAM.in(schema)))));
         schema.registerType(false, References.STRUCTURE_FEATURE, () -> DSL.optionalFields("Children", DSL.list(DSL.optionalFields("CA", References.BLOCK_STATE.in(schema), "CB", References.BLOCK_STATE.in(schema), "CC", References.BLOCK_STATE.in(schema), "CD", References.BLOCK_STATE.in(schema)))));
         schema.registerType(false, References.OBJECTIVE, (Supplier)DSL::remainder);
         schema.registerType(false, References.TEAM, (Supplier)DSL::remainder);
         schema.registerType(true, References.UNTAGGED_SPAWNER, () -> DSL.optionalFields("SpawnPotentials", DSL.list(DSL.fields("Entity", References.ENTITY_TREE.in(schema))), "SpawnData", References.ENTITY_TREE.in(schema)));
         schema.registerType(false, References.ADVANCEMENTS, () -> DSL.optionalFields("minecraft:adventure/adventuring_time", DSL.optionalFields("criteria", DSL.compoundList(References.BIOME.in(schema), DSL.constType(DSL.string()))), "minecraft:adventure/kill_a_mob", DSL.optionalFields("criteria", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.string()))), "minecraft:adventure/kill_all_mobs", DSL.optionalFields("criteria", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.string()))), "minecraft:husbandry/bred_all_animals", DSL.optionalFields("criteria", DSL.compoundList(References.ENTITY_NAME.in(schema), DSL.constType(DSL.string())))));
-        schema.registerType(false, References.BIOME, () -> DSL.constType(DSL.namespacedString()));
-        schema.registerType(false, References.ENTITY_NAME, () -> DSL.constType(DSL.namespacedString()));
+        schema.registerType(false, References.BIOME, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
+        schema.registerType(false, References.ENTITY_NAME, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
         schema.registerType(false, References.POI_CHUNK, (Supplier)DSL::remainder);
+        schema.registerType(true, References.WORLD_GEN_SETTINGS, (Supplier)DSL::remainder);
     }
 }
diff --git a/src/net/minecraft/util/datafix/schemas/V2501.java b/src/net/minecraft/util/datafix/schemas/V2501.java
new file mode 100644
index 0000000..ac63e89
--- /dev/null
+++ b/src/net/minecraft/util/datafix/schemas/V2501.java
@@ -0,0 +1,26 @@
+package net.minecraft.util.datafix.schemas;
+
+import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.fixes.References;
+import com.mojang.datafixers.types.templates.TypeTemplate;
+import java.util.function.Supplier;
+import java.util.Map;
+import com.mojang.datafixers.schemas.Schema;
+
+public class V2501 extends NamespacedSchema {
+    public V2501(final int integer, final Schema schema) {
+        super(integer, schema);
+    }
+    
+    private static void registerFurnace(final Schema schema, final Map<String, Supplier<TypeTemplate>> map, final String string) {
+        schema.register((Map)map, string, () -> DSL.optionalFields("Items", DSL.list(References.ITEM_STACK.in(schema)), "RecipesUsed", DSL.compoundList(References.RECIPE.in(schema), DSL.constType(DSL.intType()))));
+    }
+    
+    public Map<String, Supplier<TypeTemplate>> registerBlockEntities(final Schema schema) {
+        final Map<String, Supplier<TypeTemplate>> map3 = (Map<String, Supplier<TypeTemplate>>)super.registerBlockEntities(schema);
+        registerFurnace(schema, map3, "minecraft:furnace");
+        registerFurnace(schema, map3, "minecraft:smoker");
+        registerFurnace(schema, map3, "minecraft:blast_furnace");
+        return map3;
+    }
+}
diff --git a/src/net/minecraft/util/datafix/schemas/V2502.java b/src/net/minecraft/util/datafix/schemas/V2502.java
new file mode 100644
index 0000000..3a81e5e
--- /dev/null
+++ b/src/net/minecraft/util/datafix/schemas/V2502.java
@@ -0,0 +1,22 @@
+package net.minecraft.util.datafix.schemas;
+
+import com.mojang.datafixers.types.templates.TypeTemplate;
+import java.util.function.Supplier;
+import java.util.Map;
+import com.mojang.datafixers.schemas.Schema;
+
+public class V2502 extends NamespacedSchema {
+    public V2502(final int integer, final Schema schema) {
+        super(integer, schema);
+    }
+    
+    protected static void registerMob(final Schema schema, final Map<String, Supplier<TypeTemplate>> map, final String string) {
+        schema.register((Map)map, string, () -> V100.equipment(schema));
+    }
+    
+    public Map<String, Supplier<TypeTemplate>> registerEntities(final Schema schema) {
+        final Map<String, Supplier<TypeTemplate>> map3 = (Map<String, Supplier<TypeTemplate>>)super.registerEntities(schema);
+        registerMob(schema, map3, "minecraft:hoglin");
+        return map3;
+    }
+}
diff --git a/src/net/minecraft/util/datafix/schemas/V2505.java b/src/net/minecraft/util/datafix/schemas/V2505.java
new file mode 100644
index 0000000..3a21e7b
--- /dev/null
+++ b/src/net/minecraft/util/datafix/schemas/V2505.java
@@ -0,0 +1,22 @@
+package net.minecraft.util.datafix.schemas;
+
+import com.mojang.datafixers.types.templates.TypeTemplate;
+import java.util.function.Supplier;
+import java.util.Map;
+import com.mojang.datafixers.schemas.Schema;
+
+public class V2505 extends NamespacedSchema {
+    public V2505(final int integer, final Schema schema) {
+        super(integer, schema);
+    }
+    
+    protected static void registerMob(final Schema schema, final Map<String, Supplier<TypeTemplate>> map, final String string) {
+        schema.register((Map)map, string, () -> V100.equipment(schema));
+    }
+    
+    public Map<String, Supplier<TypeTemplate>> registerEntities(final Schema schema) {
+        final Map<String, Supplier<TypeTemplate>> map3 = (Map<String, Supplier<TypeTemplate>>)super.registerEntities(schema);
+        registerMob(schema, map3, "minecraft:piglin");
+        return map3;
+    }
+}
diff --git a/src/net/minecraft/util/datafix/schemas/V2509.java b/src/net/minecraft/util/datafix/schemas/V2509.java
new file mode 100644
index 0000000..b138db5
--- /dev/null
+++ b/src/net/minecraft/util/datafix/schemas/V2509.java
@@ -0,0 +1,23 @@
+package net.minecraft.util.datafix.schemas;
+
+import com.mojang.datafixers.types.templates.TypeTemplate;
+import java.util.function.Supplier;
+import java.util.Map;
+import com.mojang.datafixers.schemas.Schema;
+
+public class V2509 extends NamespacedSchema {
+    public V2509(final int integer, final Schema schema) {
+        super(integer, schema);
+    }
+    
+    protected static void registerMob(final Schema schema, final Map<String, Supplier<TypeTemplate>> map, final String string) {
+        schema.register((Map)map, string, () -> V100.equipment(schema));
+    }
+    
+    public Map<String, Supplier<TypeTemplate>> registerEntities(final Schema schema) {
+        final Map<String, Supplier<TypeTemplate>> map3 = (Map<String, Supplier<TypeTemplate>>)super.registerEntities(schema);
+        map3.remove("minecraft:zombie_pigman");
+        registerMob(schema, map3, "minecraft:zombified_piglin");
+        return map3;
+    }
+}
diff --git a/src/net/minecraft/util/datafix/schemas/V2519.java b/src/net/minecraft/util/datafix/schemas/V2519.java
new file mode 100644
index 0000000..6b39247
--- /dev/null
+++ b/src/net/minecraft/util/datafix/schemas/V2519.java
@@ -0,0 +1,22 @@
+package net.minecraft.util.datafix.schemas;
+
+import com.mojang.datafixers.types.templates.TypeTemplate;
+import java.util.function.Supplier;
+import java.util.Map;
+import com.mojang.datafixers.schemas.Schema;
+
+public class V2519 extends NamespacedSchema {
+    public V2519(final int integer, final Schema schema) {
+        super(integer, schema);
+    }
+    
+    protected static void registerMob(final Schema schema, final Map<String, Supplier<TypeTemplate>> map, final String string) {
+        schema.register((Map)map, string, () -> V100.equipment(schema));
+    }
+    
+    public Map<String, Supplier<TypeTemplate>> registerEntities(final Schema schema) {
+        final Map<String, Supplier<TypeTemplate>> map3 = (Map<String, Supplier<TypeTemplate>>)super.registerEntities(schema);
+        registerMob(schema, map3, "minecraft:strider");
+        return map3;
+    }
+}
diff --git a/src/net/minecraft/util/datafix/schemas/V2522.java b/src/net/minecraft/util/datafix/schemas/V2522.java
new file mode 100644
index 0000000..d4313cd
--- /dev/null
+++ b/src/net/minecraft/util/datafix/schemas/V2522.java
@@ -0,0 +1,22 @@
+package net.minecraft.util.datafix.schemas;
+
+import com.mojang.datafixers.types.templates.TypeTemplate;
+import java.util.function.Supplier;
+import java.util.Map;
+import com.mojang.datafixers.schemas.Schema;
+
+public class V2522 extends NamespacedSchema {
+    public V2522(final int integer, final Schema schema) {
+        super(integer, schema);
+    }
+    
+    protected static void registerMob(final Schema schema, final Map<String, Supplier<TypeTemplate>> map, final String string) {
+        schema.register((Map)map, string, () -> V100.equipment(schema));
+    }
+    
+    public Map<String, Supplier<TypeTemplate>> registerEntities(final Schema schema) {
+        final Map<String, Supplier<TypeTemplate>> map3 = (Map<String, Supplier<TypeTemplate>>)super.registerEntities(schema);
+        registerMob(schema, map3, "minecraft:zoglin");
+        return map3;
+    }
+}
diff --git a/src/net/minecraft/util/datafix/schemas/V2551.java b/src/net/minecraft/util/datafix/schemas/V2551.java
new file mode 100644
index 0000000..634d6d7
--- /dev/null
+++ b/src/net/minecraft/util/datafix/schemas/V2551.java
@@ -0,0 +1,21 @@
+package net.minecraft.util.datafix.schemas;
+
+import com.google.common.collect.ImmutableMap;
+import com.mojang.datafixers.types.Type;
+import com.mojang.datafixers.DSL;
+import net.minecraft.util.datafix.fixes.References;
+import com.mojang.datafixers.types.templates.TypeTemplate;
+import java.util.function.Supplier;
+import java.util.Map;
+import com.mojang.datafixers.schemas.Schema;
+
+public class V2551 extends NamespacedSchema {
+    public V2551(final int integer, final Schema schema) {
+        super(integer, schema);
+    }
+    
+    public void registerTypes(final Schema schema, final Map<String, Supplier<TypeTemplate>> map2, final Map<String, Supplier<TypeTemplate>> map3) {
+        super.registerTypes(schema, (Map)map2, (Map)map3);
+        schema.registerType(false, References.WORLD_GEN_SETTINGS, () -> DSL.fields("dimensions", DSL.compoundList(DSL.constType((Type)NamespacedSchema.namespacedString()), DSL.fields("generator", (TypeTemplate)DSL.taggedChoiceLazy("type", DSL.string(), (Map)ImmutableMap.<String, Supplier<TypeTemplate>>of("minecraft:debug", (Supplier<TypeTemplate>)DSL::remainder, "minecraft:flat", () -> DSL.optionalFields("settings", DSL.optionalFields("biome", References.BIOME.in(schema), "layers", DSL.list(DSL.optionalFields("block", References.BLOCK_NAME.in(schema))))), "minecraft:noise", () -> DSL.optionalFields("biome_source", (TypeTemplate)DSL.taggedChoiceLazy("type", DSL.string(), (Map)ImmutableMap.<String, Supplier<TypeTemplate>>of("minecraft:fixed", () -> DSL.fields("biome", References.BIOME.in(schema)), "minecraft:multi_noise", () -> DSL.list(DSL.fields("biome", References.BIOME.in(schema))), "minecraft:checkerboard", () -> DSL.fields("biomes", DSL.list(References.BIOME.in(schema))), "minecraft:vanilla_layered", (Supplier<TypeTemplate>)DSL::remainder, "minecraft:the_end", (Supplier<TypeTemplate>)DSL::remainder)), "settings", DSL.or(DSL.constType(DSL.string()), DSL.optionalFields("default_block", References.BLOCK_NAME.in(schema), "default_fluid", References.BLOCK_NAME.in(schema))))))))));
+    }
+}
diff --git a/src/net/minecraft/util/datafix/schemas/V704.java b/src/net/minecraft/util/datafix/schemas/V704.java
index 96f51de..9c1e3ef 100644
--- a/src/net/minecraft/util/datafix/schemas/V704.java
+++ b/src/net/minecraft/util/datafix/schemas/V704.java
@@ -1,7 +1,7 @@
 package net.minecraft.util.datafix.schemas;
 
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.Dynamic;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.DataFixUtils;
 import java.util.HashMap;
 import com.google.common.collect.Maps;
@@ -64,7 +64,7 @@ public class V704 extends Schema {
     
     public void registerTypes(final Schema schema, final Map<String, Supplier<TypeTemplate>> map2, final Map<String, Supplier<TypeTemplate>> map3) {
         super.registerTypes(schema, (Map)map2, (Map)map3);
-        schema.registerType(false, References.BLOCK_ENTITY, () -> DSL.taggedChoiceLazy("id", DSL.namespacedString(), (Map)map3));
+        schema.registerType(false, References.BLOCK_ENTITY, () -> DSL.taggedChoiceLazy("id", (Type)NamespacedSchema.namespacedString(), (Map)map3));
         schema.registerType(true, References.ITEM_STACK, () -> DSL.hook(DSL.optionalFields("id", References.ITEM_NAME.in(schema), "tag", DSL.optionalFields("EntityTag", References.ENTITY_TREE.in(schema), "BlockEntityTag", References.BLOCK_ENTITY.in(schema), "CanDestroy", DSL.list(References.BLOCK_NAME.in(schema)), "CanPlaceOn", DSL.list(References.BLOCK_NAME.in(schema)))), V704.ADD_NAMES, Hook.HookFunction.IDENTITY));
     }
     
@@ -145,7 +145,7 @@ public class V704 extends Schema {
         });
         ADD_NAMES = (Hook.HookFunction)new Hook.HookFunction() {
             public <T> T apply(final DynamicOps<T> dynamicOps, final T object) {
-                return V99.<T>addNames((com.mojang.datafixers.Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, object), V704.ITEM_TO_BLOCKENTITY, "ArmorStand");
+                return V99.<T>addNames((com.mojang.serialization.Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, object), V704.ITEM_TO_BLOCKENTITY, "ArmorStand");
             }
         };
     }
diff --git a/src/net/minecraft/util/datafix/schemas/V705.java b/src/net/minecraft/util/datafix/schemas/V705.java
index 41a7bea..ee0920a 100644
--- a/src/net/minecraft/util/datafix/schemas/V705.java
+++ b/src/net/minecraft/util/datafix/schemas/V705.java
@@ -1,7 +1,8 @@
 package net.minecraft.util.datafix.schemas;
 
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.Dynamic;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.datafixers.types.Type;
 import com.google.common.collect.Maps;
 import com.mojang.datafixers.DSL;
 import net.minecraft.util.datafix.fixes.References;
@@ -116,14 +117,14 @@ public class V705 extends NamespacedSchema {
     
     public void registerTypes(final Schema schema, final Map<String, Supplier<TypeTemplate>> map2, final Map<String, Supplier<TypeTemplate>> map3) {
         super.registerTypes(schema, (Map)map2, (Map)map3);
-        schema.registerType(true, References.ENTITY, () -> DSL.taggedChoiceLazy("id", DSL.namespacedString(), (Map)map2));
+        schema.registerType(true, References.ENTITY, () -> DSL.taggedChoiceLazy("id", (Type)NamespacedSchema.namespacedString(), (Map)map2));
         schema.registerType(true, References.ITEM_STACK, () -> DSL.hook(DSL.optionalFields("id", References.ITEM_NAME.in(schema), "tag", DSL.optionalFields("EntityTag", References.ENTITY_TREE.in(schema), "BlockEntityTag", References.BLOCK_ENTITY.in(schema), "CanDestroy", DSL.list(References.BLOCK_NAME.in(schema)), "CanPlaceOn", DSL.list(References.BLOCK_NAME.in(schema)))), V705.ADD_NAMES, Hook.HookFunction.IDENTITY));
     }
     
     static {
         ADD_NAMES = (Hook.HookFunction)new Hook.HookFunction() {
             public <T> T apply(final DynamicOps<T> dynamicOps, final T object) {
-                return V99.<T>addNames((com.mojang.datafixers.Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, object), V704.ITEM_TO_BLOCKENTITY, "minecraft:armor_stand");
+                return V99.<T>addNames((com.mojang.serialization.Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, object), V704.ITEM_TO_BLOCKENTITY, "minecraft:armor_stand");
             }
         };
     }
diff --git a/src/net/minecraft/util/datafix/schemas/V99.java b/src/net/minecraft/util/datafix/schemas/V99.java
index d3dda79..d0c95ae 100644
--- a/src/net/minecraft/util/datafix/schemas/V99.java
+++ b/src/net/minecraft/util/datafix/schemas/V99.java
@@ -1,11 +1,12 @@
 package net.minecraft.util.datafix.schemas;
 
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import com.mojang.datafixers.DataFixUtils;
 import org.apache.logging.log4j.LogManager;
 import java.util.HashMap;
 import java.util.Objects;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.types.Type;
 import com.google.common.collect.Maps;
 import java.util.function.Supplier;
 import com.mojang.datafixers.DSL;
@@ -150,12 +151,12 @@ public class V99 extends Schema {
         schema.registerType(false, References.CHUNK, () -> DSL.fields("Level", DSL.optionalFields("Entities", DSL.list(References.ENTITY_TREE.in(schema)), "TileEntities", DSL.list(References.BLOCK_ENTITY.in(schema)), "TileTicks", DSL.list(DSL.fields("i", References.BLOCK_NAME.in(schema))))));
         schema.registerType(true, References.BLOCK_ENTITY, () -> DSL.taggedChoiceLazy("id", DSL.string(), (Map)map3));
         schema.registerType(true, References.ENTITY_TREE, () -> DSL.optionalFields("Riding", References.ENTITY_TREE.in(schema), References.ENTITY.in(schema)));
-        schema.registerType(false, References.ENTITY_NAME, () -> DSL.constType(DSL.namespacedString()));
+        schema.registerType(false, References.ENTITY_NAME, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
         schema.registerType(true, References.ENTITY, () -> DSL.taggedChoiceLazy("id", DSL.string(), (Map)map2));
         schema.registerType(true, References.ITEM_STACK, () -> DSL.hook(DSL.optionalFields("id", DSL.or(DSL.constType(DSL.intType()), References.ITEM_NAME.in(schema)), "tag", DSL.optionalFields("EntityTag", References.ENTITY_TREE.in(schema), "BlockEntityTag", References.BLOCK_ENTITY.in(schema), "CanDestroy", DSL.list(References.BLOCK_NAME.in(schema)), "CanPlaceOn", DSL.list(References.BLOCK_NAME.in(schema)))), V99.ADD_NAMES, Hook.HookFunction.IDENTITY));
         schema.registerType(false, References.OPTIONS, (Supplier)DSL::remainder);
-        schema.registerType(false, References.BLOCK_NAME, () -> DSL.or(DSL.constType(DSL.intType()), DSL.constType(DSL.namespacedString())));
-        schema.registerType(false, References.ITEM_NAME, () -> DSL.constType(DSL.namespacedString()));
+        schema.registerType(false, References.BLOCK_NAME, () -> DSL.or(DSL.constType(DSL.intType()), DSL.constType((Type)NamespacedSchema.namespacedString())));
+        schema.registerType(false, References.ITEM_NAME, () -> DSL.constType((Type)NamespacedSchema.namespacedString()));
         schema.registerType(false, References.STATS, (Supplier)DSL::remainder);
         schema.registerType(false, References.SAVED_DATA, () -> DSL.optionalFields("data", DSL.optionalFields("Features", DSL.compoundList(References.STRUCTURE_FEATURE.in(schema)), "Objectives", DSL.list(References.OBJECTIVE.in(schema)), "Teams", DSL.list(References.TEAM.in(schema)))));
         schema.registerType(false, References.STRUCTURE_FEATURE, (Supplier)DSL::remainder);
@@ -163,6 +164,7 @@ public class V99 extends Schema {
         schema.registerType(false, References.TEAM, (Supplier)DSL::remainder);
         schema.registerType(true, References.UNTAGGED_SPAWNER, (Supplier)DSL::remainder);
         schema.registerType(false, References.POI_CHUNK, (Supplier)DSL::remainder);
+        schema.registerType(true, References.WORLD_GEN_SETTINGS, (Supplier)DSL::remainder);
     }
     
     protected static <T> T addNames(final Dynamic<T> dynamic, final Map<String, String> map, final String string) {
@@ -231,7 +233,7 @@ public class V99 extends Schema {
         });
         ADD_NAMES = (Hook.HookFunction)new Hook.HookFunction() {
             public <T> T apply(final DynamicOps<T> dynamicOps, final T object) {
-                return V99.<T>addNames((com.mojang.datafixers.Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, object), V99.ITEM_TO_BLOCKENTITY, "ArmorStand");
+                return V99.<T>addNames((com.mojang.serialization.Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, object), V99.ITEM_TO_BLOCKENTITY, "ArmorStand");
             }
         };
     }
diff --git a/src/net/minecraft/util/monitoring/jmx/MinecraftServerStatistics.java b/src/net/minecraft/util/monitoring/jmx/MinecraftServerStatistics.java
new file mode 100644
index 0000000..07692ac
--- /dev/null
+++ b/src/net/minecraft/util/monitoring/jmx/MinecraftServerStatistics.java
@@ -0,0 +1,119 @@
+package net.minecraft.util.monitoring.jmx;
+
+import org.apache.logging.log4j.LogManager;
+import java.util.stream.Collector;
+import java.util.function.Predicate;
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.List;
+import javax.management.AttributeList;
+import javax.management.Attribute;
+import javax.annotation.Nullable;
+import javax.management.JMException;
+import javax.management.NotCompliantMBeanException;
+import javax.management.MBeanRegistrationException;
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import java.lang.management.ManagementFactory;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanConstructorInfo;
+import javax.management.MBeanNotificationInfo;
+import javax.management.MBeanAttributeInfo;
+import java.util.stream.Collectors;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import java.util.function.Supplier;
+import java.util.Map;
+import javax.management.MBeanInfo;
+import net.minecraft.server.MinecraftServer;
+import org.apache.logging.log4j.Logger;
+import javax.management.DynamicMBean;
+
+public final class MinecraftServerStatistics implements DynamicMBean {
+    private static final Logger LOGGER;
+    private final MinecraftServer server;
+    private final MBeanInfo mBeanInfo;
+    private final Map<String, AttributeDescription> attributeDescriptionByName;
+    
+    private MinecraftServerStatistics(final MinecraftServer minecraftServer) {
+        this.attributeDescriptionByName = Stream.<AttributeDescription>of(new AttributeDescription[] { new AttributeDescription("tickTimes", (Supplier)this::getTickTimes, "Historical tick times (ms)", (Class)long[].class), new AttributeDescription("averageTickTime", (Supplier)this::getAverageTickTime, "Current average tick time (ms)", (Class)Long.TYPE) }).collect(Collectors.toMap(a -> a.name, Function.<AttributeDescription>identity()));
+        this.server = minecraftServer;
+        final MBeanAttributeInfo[] arr3 = this.attributeDescriptionByName.values().stream().map(object -> object.asMBeanAttributeInfo()).<MBeanAttributeInfo>toArray(MBeanAttributeInfo[]::new);
+        this.mBeanInfo = new MBeanInfo(MinecraftServerStatistics.class.getSimpleName(), "metrics for dedicated server", arr3, null, null, new MBeanNotificationInfo[0]);
+    }
+    
+    public static void registerJmxMonitoring(final MinecraftServer minecraftServer) {
+        try {
+            ManagementFactory.getPlatformMBeanServer().registerMBean(new MinecraftServerStatistics(minecraftServer), new ObjectName("net.minecraft.server:type=Server"));
+        }
+        catch (MalformedObjectNameException | InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException ex2) {
+            final JMException ex;
+            final JMException jMException2 = ex;
+            MinecraftServerStatistics.LOGGER.warn("Failed to initialise server as JMX bean", (Throwable)jMException2);
+        }
+    }
+    
+    private float getAverageTickTime() {
+        return this.server.getAverageTickTime();
+    }
+    
+    private long[] getTickTimes() {
+        return this.server.tickTimes;
+    }
+    
+    @Nullable
+    @Override
+    public Object getAttribute(final String string) {
+        final AttributeDescription a3 = this.attributeDescriptionByName.get(string);
+        return (a3 == null) ? null : a3.getter.get();
+    }
+    
+    @Override
+    public void setAttribute(final Attribute attribute) {
+    }
+    
+    @Override
+    public AttributeList getAttributes(final String[] arr) {
+        final List<Attribute> list3 = Arrays.<String>stream(arr).map(this.attributeDescriptionByName::get).filter(Objects::nonNull).map(a -> new Attribute(a.name, a.getter.get())).collect(Collectors.toList());
+        return new AttributeList(list3);
+    }
+    
+    @Override
+    public AttributeList setAttributes(final AttributeList attributeList) {
+        return new AttributeList();
+    }
+    
+    @Nullable
+    @Override
+    public Object invoke(final String string, final Object[] arr, final String[] arr) {
+        return null;
+    }
+    
+    @Override
+    public MBeanInfo getMBeanInfo() {
+        return this.mBeanInfo;
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+    
+    static final class AttributeDescription {
+        private final String name;
+        private final Supplier<Object> getter;
+        private final String description;
+        private final Class<?> type;
+        
+        private AttributeDescription(final String string1, final Supplier<Object> supplier, final String string3, final Class<?> class4) {
+            this.name = string1;
+            this.getter = supplier;
+            this.description = string3;
+            this.type = class4;
+        }
+        
+        private MBeanAttributeInfo asMBeanAttributeInfo() {
+            return new MBeanAttributeInfo(this.name, this.type.getSimpleName(), this.description, true, false, false);
+        }
+    }
+}
diff --git a/src/net/minecraft/util/profiling/ActiveProfiler.java b/src/net/minecraft/util/profiling/ActiveProfiler.java
index 9059cc3..681c25a 100644
--- a/src/net/minecraft/util/profiling/ActiveProfiler.java
+++ b/src/net/minecraft/util/profiling/ActiveProfiler.java
@@ -11,6 +11,7 @@ import com.google.common.collect.Maps;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import com.google.common.collect.Lists;
 import javax.annotation.Nullable;
+import java.util.function.LongSupplier;
 import java.util.function.IntSupplier;
 import java.util.Map;
 import it.unimi.dsi.fastutil.longs.LongList;
@@ -24,6 +25,7 @@ public class ActiveProfiler implements ProfileCollector {
     private final LongList startTimes;
     private final Map<String, PathEntry> entries;
     private final IntSupplier getTickTime;
+    private final LongSupplier getRealTime;
     private final long startTimeNano;
     private final int startTimeTicks;
     private String path;
@@ -32,12 +34,13 @@ public class ActiveProfiler implements ProfileCollector {
     private PathEntry currentEntry;
     private final boolean warn;
     
-    public ActiveProfiler(final long long1, final IntSupplier intSupplier, final boolean boolean3) {
+    public ActiveProfiler(final LongSupplier longSupplier, final IntSupplier intSupplier, final boolean boolean3) {
         this.paths = Lists.newArrayList();
         this.startTimes = (LongList)new LongArrayList();
         this.entries = Maps.newHashMap();
         this.path = "";
-        this.startTimeNano = long1;
+        this.startTimeNano = longSupplier.getAsLong();
+        this.getRealTime = longSupplier;
         this.startTimeTicks = intSupplier.getAsInt();
         this.getTickTime = intSupplier;
         this.warn = boolean3;
@@ -143,7 +146,7 @@ public class ActiveProfiler implements ProfileCollector {
     
     @Override
     public ProfileResults getResults() {
-        return new FilledProfileResults(this.entries, this.startTimeNano, this.startTimeTicks, Util.getNanos(), this.getTickTime.getAsInt());
+        return new FilledProfileResults(this.entries, this.startTimeNano, this.startTimeTicks, this.getRealTime.getAsLong(), this.getTickTime.getAsInt());
     }
     
     static {
diff --git a/src/net/minecraft/util/profiling/ContinuousProfiler.java b/src/net/minecraft/util/profiling/ContinuousProfiler.java
new file mode 100644
index 0000000..f352f57
--- /dev/null
+++ b/src/net/minecraft/util/profiling/ContinuousProfiler.java
@@ -0,0 +1,36 @@
+package net.minecraft.util.profiling;
+
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+
+public class ContinuousProfiler {
+    private final LongSupplier realTime;
+    private final IntSupplier tickCount;
+    private ProfileCollector profiler;
+    
+    public ContinuousProfiler(final LongSupplier longSupplier, final IntSupplier intSupplier) {
+        this.profiler = InactiveProfiler.INSTANCE;
+        this.realTime = longSupplier;
+        this.tickCount = intSupplier;
+    }
+    
+    public boolean isEnabled() {
+        return this.profiler != InactiveProfiler.INSTANCE;
+    }
+    
+    public void disable() {
+        this.profiler = InactiveProfiler.INSTANCE;
+    }
+    
+    public void enable() {
+        this.profiler = new ActiveProfiler(this.realTime, this.tickCount, true);
+    }
+    
+    public ProfilerFiller getFiller() {
+        return this.profiler;
+    }
+    
+    public ProfileResults getResults() {
+        return this.profiler.getResults();
+    }
+}
diff --git a/src/net/minecraft/util/profiling/FilledProfileResults.java b/src/net/minecraft/util/profiling/FilledProfileResults.java
index 284fea3..320f52b 100644
--- a/src/net/minecraft/util/profiling/FilledProfileResults.java
+++ b/src/net/minecraft/util/profiling/FilledProfileResults.java
@@ -3,6 +3,7 @@ package net.minecraft.util.profiling;
 import it.unimi.dsi.fastutil.objects.Object2LongMaps;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.Util;
+import org.apache.commons.lang3.ObjectUtils;
 import java.util.Locale;
 import net.minecraft.SharedConstants;
 import java.io.Writer;
@@ -45,18 +46,18 @@ public class FilledProfileResults implements ProfileResults {
     }
     
     private ProfilerPathEntry getEntry(final String string) {
-        final ProfilerPathEntry aip3 = (ProfilerPathEntry)this.entries.get(string);
-        return (aip3 != null) ? aip3 : FilledProfileResults.EMPTY;
+        final ProfilerPathEntry amj3 = (ProfilerPathEntry)this.entries.get(string);
+        return (amj3 != null) ? amj3 : FilledProfileResults.EMPTY;
     }
     
     @Override
     public List<ResultField> getTimes(String string) {
         final String string2 = string;
-        final ProfilerPathEntry aip4 = this.getEntry("root");
-        long long5 = aip4.getDuration();
-        final ProfilerPathEntry aip5 = this.getEntry(string);
-        final long long6 = aip5.getDuration();
-        final long long7 = aip5.getCount();
+        final ProfilerPathEntry amj4 = this.getEntry("root");
+        long long5 = amj4.getDuration();
+        final ProfilerPathEntry amj5 = this.getEntry(string);
+        final long long6 = amj5.getDuration();
+        final long long7 = amj5.getCount();
         final List<ResultField> list12 = Lists.newArrayList();
         if (!string.isEmpty()) {
             string += '\u001e';
@@ -76,12 +77,12 @@ public class FilledProfileResults implements ProfileResults {
         }
         for (final String string4 : this.entries.keySet()) {
             if (isDirectChild(string, string4)) {
-                final ProfilerPathEntry aip6 = this.getEntry(string4);
-                final long long9 = aip6.getDuration();
+                final ProfilerPathEntry amj6 = this.getEntry(string4);
+                final long long9 = amj6.getDuration();
                 final double double21 = long9 * 100.0 / long8;
                 final double double22 = long9 * 100.0 / long5;
                 final String string5 = string4.substring(string.length());
-                list12.add(new ResultField(string5, double21, double22, aip6.getCount()));
+                list12.add(new ResultField(string5, double21, double22, amj6.getCount()));
             }
         }
         if (long8 > float15) {
@@ -101,8 +102,8 @@ public class FilledProfileResults implements ProfileResults {
         final Object2LongMap<String> object2LongMap4;
         List<String> list5;
         final Map<String, CounterCollector> map3;
-        this.entries.forEach((string, aip) -> {
-            object2LongMap4 = aip.getCounters();
+        this.entries.forEach((string, amj) -> {
+            object2LongMap4 = amj.getCounters();
             if (!object2LongMap4.isEmpty()) {
                 list5 = FilledProfileResults.SPLITTER.splitToList(string);
                 object2LongMap4.forEach((string, long4) -> map3.computeIfAbsent(string, string -> new CounterCollector()).addValue(list5.iterator(), long4));
@@ -182,17 +183,17 @@ public class FilledProfileResults implements ProfileResults {
     
     private void appendProfilerResults(final int integer, final String string, final StringBuilder stringBuilder) {
         final List<ResultField> list5 = this.getTimes(string);
-        final Object2LongMap<String> object2LongMap6 = ((ProfilerPathEntry)this.entries.get(string)).getCounters();
+        final Object2LongMap<String> object2LongMap6 = ((ProfilerPathEntry)ObjectUtils.firstNonNull((Object[])new ProfilerPathEntry[] { (ProfilerPathEntry)this.entries.get(string), FilledProfileResults.EMPTY })).getCounters();
         object2LongMap6.forEach((string, long4) -> indentLine(stringBuilder, integer).append('#').append(string).append(' ').append(long4).append('/').append(long4 / this.tickDuration).append('\n'));
         if (list5.size() < 3) {
             return;
         }
         for (int integer2 = 1; integer2 < list5.size(); ++integer2) {
-            final ResultField aiq8 = list5.get(integer2);
-            indentLine(stringBuilder, integer).append(aiq8.name).append('(').append(aiq8.count).append('/').append(String.format(Locale.ROOT, "%.0f", aiq8.count / (float)this.tickDuration)).append(')').append(" - ").append(String.format(Locale.ROOT, "%.2f", aiq8.percentage)).append("%/").append(String.format(Locale.ROOT, "%.2f", aiq8.globalPercentage)).append("%\n");
-            if (!"unspecified".equals(aiq8.name)) {
+            final ResultField amk8 = list5.get(integer2);
+            indentLine(stringBuilder, integer).append(amk8.name).append('(').append(amk8.count).append('/').append(String.format(Locale.ROOT, "%.0f", amk8.count / (float)this.tickDuration)).append(')').append(" - ").append(String.format(Locale.ROOT, "%.2f", amk8.percentage)).append("%/").append(String.format(Locale.ROOT, "%.2f", amk8.globalPercentage)).append("%\n");
+            if (!"unspecified".equals(amk8.name)) {
                 try {
-                    this.appendProfilerResults(integer + 1, string + '\u001e' + aiq8.name, stringBuilder);
+                    this.appendProfilerResults(integer + 1, string + '\u001e' + amk8.name, stringBuilder);
                 }
                 catch (Exception exception9) {
                     stringBuilder.append("[[ EXCEPTION ").append(exception9).append(" ]]");
diff --git a/src/net/minecraft/util/profiling/GameProfiler.java b/src/net/minecraft/util/profiling/GameProfiler.java
deleted file mode 100644
index f889435..0000000
--- a/src/net/minecraft/util/profiling/GameProfiler.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package net.minecraft.util.profiling;
-
-import net.minecraft.Util;
-import java.time.Duration;
-import org.apache.logging.log4j.LogManager;
-import java.util.function.Supplier;
-import java.util.function.IntSupplier;
-import org.apache.logging.log4j.Logger;
-
-public class GameProfiler implements ProfilerFiller {
-    private static final Logger LOGGER;
-    private static final long MAXIMUM_TICK_TIME_NANOS;
-    private final IntSupplier getTickTime;
-    private final ProfilerImpl continuous;
-    private final ProfilerImpl perTick;
-    
-    public GameProfiler(final IntSupplier intSupplier) {
-        this.continuous = new ProfilerImpl();
-        this.perTick = new ProfilerImpl();
-        this.getTickTime = intSupplier;
-    }
-    
-    public Profiler continuous() {
-        return this.continuous;
-    }
-    
-    @Override
-    public void startTick() {
-        this.continuous.collector.startTick();
-        this.perTick.collector.startTick();
-    }
-    
-    @Override
-    public void endTick() {
-        this.continuous.collector.endTick();
-        this.perTick.collector.endTick();
-    }
-    
-    @Override
-    public void push(final String string) {
-        this.continuous.collector.push(string);
-        this.perTick.collector.push(string);
-    }
-    
-    @Override
-    public void push(final Supplier<String> supplier) {
-        this.continuous.collector.push(supplier);
-        this.perTick.collector.push(supplier);
-    }
-    
-    @Override
-    public void pop() {
-        this.continuous.collector.pop();
-        this.perTick.collector.pop();
-    }
-    
-    @Override
-    public void popPush(final String string) {
-        this.continuous.collector.popPush(string);
-        this.perTick.collector.popPush(string);
-    }
-    
-    @Override
-    public void popPush(final Supplier<String> supplier) {
-        this.continuous.collector.popPush(supplier);
-        this.perTick.collector.popPush(supplier);
-    }
-    
-    @Override
-    public void incrementCounter(final String string) {
-        this.continuous.collector.incrementCounter(string);
-        this.perTick.collector.incrementCounter(string);
-    }
-    
-    @Override
-    public void incrementCounter(final Supplier<String> supplier) {
-        this.continuous.collector.incrementCounter(supplier);
-        this.perTick.collector.incrementCounter(supplier);
-    }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-        MAXIMUM_TICK_TIME_NANOS = Duration.ofMillis(300L).toNanos();
-    }
-    
-    class ProfilerImpl implements Profiler {
-        protected ProfileCollector collector;
-        
-        private ProfilerImpl() {
-            this.collector = InactiveProfiler.INACTIVE;
-        }
-        
-        @Override
-        public boolean isEnabled() {
-            return this.collector != InactiveProfiler.INACTIVE;
-        }
-        
-        @Override
-        public ProfileResults disable() {
-            final ProfileResults ain2 = this.collector.getResults();
-            this.collector = InactiveProfiler.INACTIVE;
-            return ain2;
-        }
-        
-        @Override
-        public ProfileResults getResults() {
-            return this.collector.getResults();
-        }
-        
-        @Override
-        public void enable() {
-            if (this.collector == InactiveProfiler.INACTIVE) {
-                this.collector = new ActiveProfiler(Util.getNanos(), GameProfiler.this.getTickTime, true);
-            }
-        }
-    }
-    
-    public interface Profiler {
-        boolean isEnabled();
-        
-        ProfileResults disable();
-        
-        ProfileResults getResults();
-        
-        void enable();
-    }
-}
diff --git a/src/net/minecraft/util/profiling/InactiveProfiler.java b/src/net/minecraft/util/profiling/InactiveProfiler.java
index 48ffb4a..bb79ea3 100644
--- a/src/net/minecraft/util/profiling/InactiveProfiler.java
+++ b/src/net/minecraft/util/profiling/InactiveProfiler.java
@@ -3,7 +3,7 @@ package net.minecraft.util.profiling;
 import java.util.function.Supplier;
 
 public class InactiveProfiler implements ProfileCollector {
-    public static final InactiveProfiler INACTIVE;
+    public static final InactiveProfiler INSTANCE;
     
     private InactiveProfiler() {
     }
@@ -50,6 +50,6 @@ public class InactiveProfiler implements ProfileCollector {
     }
     
     static {
-        INACTIVE = new InactiveProfiler();
+        INSTANCE = new InactiveProfiler();
     }
 }
diff --git a/src/net/minecraft/util/profiling/ProfilerFiller.java b/src/net/minecraft/util/profiling/ProfilerFiller.java
index ebb9c1c..efa5520 100644
--- a/src/net/minecraft/util/profiling/ProfilerFiller.java
+++ b/src/net/minecraft/util/profiling/ProfilerFiller.java
@@ -20,4 +20,68 @@ public interface ProfilerFiller {
     void incrementCounter(final String string);
     
     void incrementCounter(final Supplier<String> supplier);
+    
+    default ProfilerFiller tee(final ProfilerFiller ami1, final ProfilerFiller ami2) {
+        if (ami1 == InactiveProfiler.INSTANCE) {
+            return ami2;
+        }
+        if (ami2 == InactiveProfiler.INSTANCE) {
+            return ami1;
+        }
+        return new ProfilerFiller() {
+            @Override
+            public void startTick() {
+                ami1.startTick();
+                ami2.startTick();
+            }
+            
+            @Override
+            public void endTick() {
+                ami1.endTick();
+                ami2.endTick();
+            }
+            
+            @Override
+            public void push(final String string) {
+                ami1.push(string);
+                ami2.push(string);
+            }
+            
+            @Override
+            public void push(final Supplier<String> supplier) {
+                ami1.push(supplier);
+                ami2.push(supplier);
+            }
+            
+            @Override
+            public void pop() {
+                ami1.pop();
+                ami2.pop();
+            }
+            
+            @Override
+            public void popPush(final String string) {
+                ami1.popPush(string);
+                ami2.popPush(string);
+            }
+            
+            @Override
+            public void popPush(final Supplier<String> supplier) {
+                ami1.popPush(supplier);
+                ami2.popPush(supplier);
+            }
+            
+            @Override
+            public void incrementCounter(final String string) {
+                ami1.incrementCounter(string);
+                ami2.incrementCounter(string);
+            }
+            
+            @Override
+            public void incrementCounter(final Supplier<String> supplier) {
+                ami1.incrementCounter(supplier);
+                ami2.incrementCounter(supplier);
+            }
+        };
+    }
 }
diff --git a/src/net/minecraft/util/profiling/ResultField.java b/src/net/minecraft/util/profiling/ResultField.java
index 011be8c..98c6a9e 100644
--- a/src/net/minecraft/util/profiling/ResultField.java
+++ b/src/net/minecraft/util/profiling/ResultField.java
@@ -14,14 +14,14 @@ public final class ResultField implements Comparable<ResultField> {
     }
     
     @Override
-    public int compareTo(final ResultField aiq) {
-        if (aiq.percentage < this.percentage) {
+    public int compareTo(final ResultField amk) {
+        if (amk.percentage < this.percentage) {
             return -1;
         }
-        if (aiq.percentage > this.percentage) {
+        if (amk.percentage > this.percentage) {
             return 1;
         }
-        return aiq.name.compareTo(this.name);
+        return amk.name.compareTo(this.name);
     }
     
     public int getColor() {
diff --git a/src/net/minecraft/util/profiling/SingleTickProfiler.java b/src/net/minecraft/util/profiling/SingleTickProfiler.java
new file mode 100644
index 0000000..61e9758
--- /dev/null
+++ b/src/net/minecraft/util/profiling/SingleTickProfiler.java
@@ -0,0 +1,53 @@
+package net.minecraft.util.profiling;
+
+import org.apache.logging.log4j.LogManager;
+import javax.annotation.Nullable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.io.File;
+import java.util.function.LongSupplier;
+import org.apache.logging.log4j.Logger;
+
+public class SingleTickProfiler {
+    private static final Logger LOGGER;
+    private final LongSupplier realTime;
+    private final long saveThreshold;
+    private int tick;
+    private final File location;
+    private ProfileCollector profiler;
+    
+    public ProfilerFiller startTick() {
+        this.profiler = new ActiveProfiler(this.realTime, () -> this.tick, false);
+        ++this.tick;
+        return this.profiler;
+    }
+    
+    public void endTick() {
+        if (this.profiler == InactiveProfiler.INSTANCE) {
+            return;
+        }
+        final ProfileResults amh2 = this.profiler.getResults();
+        this.profiler = InactiveProfiler.INSTANCE;
+        if (amh2.getNanoDuration() >= this.saveThreshold) {
+            final File file3 = new File(this.location, "tick-results-" + new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new Date()) + ".txt");
+            amh2.saveResults(file3);
+            SingleTickProfiler.LOGGER.info("Recorded long tick -- wrote info to: {}", file3.getAbsolutePath());
+        }
+    }
+    
+    @Nullable
+    public static SingleTickProfiler createTickProfiler(final String string) {
+        return null;
+    }
+    
+    public static ProfilerFiller decorateFiller(final ProfilerFiller ami, @Nullable final SingleTickProfiler aml) {
+        if (aml != null) {
+            return ProfilerFiller.tee(aml.startTick(), ami);
+        }
+        return ami;
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+}
diff --git a/src/net/minecraft/util/thread/ProcessorHandle.java b/src/net/minecraft/util/thread/ProcessorHandle.java
index 3f2c023..d229204 100644
--- a/src/net/minecraft/util/thread/ProcessorHandle.java
+++ b/src/net/minecraft/util/thread/ProcessorHandle.java
@@ -1,6 +1,7 @@
 package net.minecraft.util.thread;
 
 import java.util.function.Consumer;
+import com.mojang.datafixers.util.Either;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 
@@ -19,6 +20,18 @@ public interface ProcessorHandle<Msg> extends AutoCloseable {
         return completableFuture3;
     }
     
+    default <Source> CompletableFuture<Source> askEither(final Function<? super ProcessorHandle<Either<Source, Exception>>, ? extends Msg> function) {
+        final CompletableFuture<Source> completableFuture3 = new CompletableFuture<Source>();
+        final CompletableFuture<Object> completableFuture4;
+        final Msg object4 = (Msg)function.apply(ProcessorHandle.of("ask future procesor handle", either -> {
+            either.ifLeft((Consumer)completableFuture4::complete);
+            either.ifRight((Consumer)completableFuture4::completeExceptionally);
+            return;
+        }));
+        this.tell(object4);
+        return completableFuture3;
+    }
+    
     default <Msg> ProcessorHandle<Msg> of(final String string, final Consumer<Msg> consumer) {
         return new ProcessorHandle<Msg>() {
             @Override
diff --git a/src/net/minecraft/util/thread/ProcessorMailbox.java b/src/net/minecraft/util/thread/ProcessorMailbox.java
index 00bb8c5..6b26f22 100644
--- a/src/net/minecraft/util/thread/ProcessorMailbox.java
+++ b/src/net/minecraft/util/thread/ProcessorMailbox.java
@@ -3,6 +3,7 @@ package net.minecraft.util.thread;
 import org.apache.logging.log4j.LogManager;
 import it.unimi.dsi.fastutil.ints.Int2BooleanFunction;
 import java.util.concurrent.RejectedExecutionException;
+import net.minecraft.SharedConstants;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.Executor;
@@ -20,10 +21,10 @@ public class ProcessorMailbox<T> implements ProcessorHandle<T>, AutoCloseable, R
         return new ProcessorMailbox<Runnable>(new StrictQueue.QueueStrictQueue(new ConcurrentLinkedQueue<>()), executor, string);
     }
     
-    public ProcessorMailbox(final StrictQueue<? super T, ? extends Runnable> aix, final Executor executor, final String string) {
+    public ProcessorMailbox(final StrictQueue<? super T, ? extends Runnable> ams, final Executor executor, final String string) {
         this.status = new AtomicInteger(0);
         this.dispatcher = executor;
-        this.queue = aix;
+        this.queue = ams;
         this.name = string;
     }
     
@@ -69,7 +70,21 @@ public class ProcessorMailbox<T> implements ProcessorHandle<T>, AutoCloseable, R
         if (runnable2 == null) {
             return false;
         }
+        Thread thread4;
+        String string3;
+        if (SharedConstants.IS_RUNNING_IN_IDE) {
+            thread4 = Thread.currentThread();
+            string3 = thread4.getName();
+            thread4.setName(this.name);
+        }
+        else {
+            thread4 = null;
+            string3 = null;
+        }
         runnable2.run();
+        if (thread4 != null) {
+            thread4.setName(string3);
+        }
         return true;
     }
     
diff --git a/src/net/minecraft/util/worldupdate/WorldUpgrader.java b/src/net/minecraft/util/worldupdate/WorldUpgrader.java
index cc1e3e6..549d9f6 100644
--- a/src/net/minecraft/util/worldupdate/WorldUpgrader.java
+++ b/src/net/minecraft/util/worldupdate/WorldUpgrader.java
@@ -6,10 +6,9 @@ import java.util.regex.Matcher;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import com.google.common.collect.Lists;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.UnmodifiableIterator;
 import net.minecraft.nbt.CompoundTag;
 import java.util.List;
-import java.util.Iterator;
+import com.google.common.collect.UnmodifiableIterator;
 import net.minecraft.ReportedException;
 import java.io.IOException;
 import net.minecraft.SharedConstants;
@@ -17,55 +16,55 @@ import net.minecraft.world.level.chunk.storage.ChunkStorage;
 import net.minecraft.world.level.ChunkPos;
 import java.util.ListIterator;
 import com.google.common.collect.ImmutableMap;
-import net.minecraft.server.MinecraftServer;
+import java.io.File;
 import net.minecraft.network.chat.TranslatableComponent;
 import it.unimi.dsi.fastutil.objects.Object2FloatMaps;
 import it.unimi.dsi.fastutil.Hash;
 import it.unimi.dsi.fastutil.objects.Object2FloatOpenCustomHashMap;
 import net.minecraft.Util;
-import net.minecraft.world.level.storage.LevelData;
-import net.minecraft.world.level.storage.LevelStorageSource;
 import net.minecraft.world.level.storage.DimensionDataStorage;
 import java.util.regex.Pattern;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.level.dimension.DimensionType;
 import it.unimi.dsi.fastutil.objects.Object2FloatMap;
-import java.io.File;
-import net.minecraft.world.level.storage.LevelStorage;
+import com.mojang.datafixers.DataFixer;
+import net.minecraft.world.level.storage.LevelStorageSource;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import com.google.common.collect.ImmutableSet;
 import java.util.concurrent.ThreadFactory;
 import org.apache.logging.log4j.Logger;
 
 public class WorldUpgrader {
     private static final Logger LOGGER;
     private static final ThreadFactory THREAD_FACTORY;
-    private final String levelName;
+    private final ImmutableSet<ResourceKey<Level>> levels;
     private final boolean eraseCache;
-    private final LevelStorage levelStorage;
+    private final LevelStorageSource.LevelStorageAccess levelStorage;
     private final Thread thread;
-    private final File pathToWorld;
+    private final DataFixer dataFixer;
     private volatile boolean running;
     private volatile boolean finished;
     private volatile float progress;
     private volatile int totalChunks;
     private volatile int converted;
     private volatile int skipped;
-    private final Object2FloatMap<DimensionType> progressMap;
+    private final Object2FloatMap<ResourceKey<Level>> progressMap;
     private volatile Component status;
     private static final Pattern REGEX;
     private final DimensionDataStorage overworldDataStorage;
     
-    public WorldUpgrader(final String string, final LevelStorageSource crp, final LevelData crm, final boolean boolean4) {
+    public WorldUpgrader(final LevelStorageSource.LevelStorageAccess a, final DataFixer dataFixer, final ImmutableSet<ResourceKey<Level>> immutableSet, final boolean boolean4) {
         this.running = true;
-        this.progressMap = (Object2FloatMap<DimensionType>)Object2FloatMaps.synchronize((Object2FloatMap)new Object2FloatOpenCustomHashMap((Hash.Strategy)Util.identityStrategy()));
-        this.status = new TranslatableComponent("optimizeWorld.stage.counting", new Object[0]);
-        this.levelName = crm.getLevelName();
+        this.progressMap = (Object2FloatMap<ResourceKey<Level>>)Object2FloatMaps.synchronize((Object2FloatMap)new Object2FloatOpenCustomHashMap((Hash.Strategy)Util.identityStrategy()));
+        this.status = new TranslatableComponent("optimizeWorld.stage.counting");
+        this.levels = immutableSet;
         this.eraseCache = boolean4;
-        (this.levelStorage = crp.selectLevel(string, null)).saveLevelData(crm);
-        this.overworldDataStorage = new DimensionDataStorage(new File(DimensionType.OVERWORLD.getStorageFolder(this.levelStorage.getFolder()), "data"), this.levelStorage.getFixerUpper());
-        this.pathToWorld = this.levelStorage.getFolder();
+        this.dataFixer = dataFixer;
+        this.levelStorage = a;
+        this.overworldDataStorage = new DimensionDataStorage(new File(this.levelStorage.getDimensionPath(Level.OVERWORLD), "data"), dataFixer);
         (this.thread = WorldUpgrader.THREAD_FACTORY.newThread(this::work)).setUncaughtExceptionHandler((thread, throwable) -> {
             WorldUpgrader.LOGGER.error("Error upgrading world", throwable);
-            this.status = new TranslatableComponent("optimizeWorld.stage.failed", new Object[0]);
+            this.status = new TranslatableComponent("optimizeWorld.stage.failed");
             this.finished = true;
             return;
         });
@@ -81,104 +80,103 @@ public class WorldUpgrader {
     }
     
     private void work() {
-        final File file2 = this.levelStorage.getFolder();
         this.totalChunks = 0;
-        final ImmutableMap.Builder<DimensionType, ListIterator<ChunkPos>> builder3 = ImmutableMap.<DimensionType, ListIterator<ChunkPos>>builder();
-        for (final DimensionType cbi5 : DimensionType.getAllTypes()) {
-            final List<ChunkPos> list6 = this.getAllChunkPos(cbi5);
-            builder3.put(cbi5, list6.listIterator());
-            this.totalChunks += list6.size();
+        final ImmutableMap.Builder<ResourceKey<Level>, ListIterator<ChunkPos>> builder2 = ImmutableMap.<ResourceKey<Level>, ListIterator<ChunkPos>>builder();
+        for (final ResourceKey<Level> ug4 : this.levels) {
+            final List<ChunkPos> list5 = this.getAllChunkPos(ug4);
+            builder2.put(ug4, list5.listIterator());
+            this.totalChunks += list5.size();
         }
         if (this.totalChunks == 0) {
             this.finished = true;
             return;
         }
-        final float float4 = (float)this.totalChunks;
-        final ImmutableMap<DimensionType, ListIterator<ChunkPos>> immutableMap5 = builder3.build();
-        final ImmutableMap.Builder<DimensionType, ChunkStorage> builder4 = ImmutableMap.<DimensionType, ChunkStorage>builder();
-        for (final DimensionType cbi6 : DimensionType.getAllTypes()) {
-            final File file3 = cbi6.getStorageFolder(file2);
-            builder4.put(cbi6, new ChunkStorage(new File(file3, "region"), this.levelStorage.getFixerUpper()));
+        final float float3 = (float)this.totalChunks;
+        final ImmutableMap<ResourceKey<Level>, ListIterator<ChunkPos>> immutableMap4 = builder2.build();
+        final ImmutableMap.Builder<ResourceKey<Level>, ChunkStorage> builder3 = ImmutableMap.<ResourceKey<Level>, ChunkStorage>builder();
+        for (final ResourceKey<Level> ug5 : this.levels) {
+            final File file8 = this.levelStorage.getDimensionPath(ug5);
+            builder3.put(ug5, new ChunkStorage(new File(file8, "region"), this.dataFixer, true));
         }
-        final ImmutableMap<DimensionType, ChunkStorage> immutableMap6 = builder4.build();
-        long long8 = Util.getMillis();
-        this.status = new TranslatableComponent("optimizeWorld.stage.upgrading", new Object[0]);
+        final ImmutableMap<ResourceKey<Level>, ChunkStorage> immutableMap5 = builder3.build();
+        long long7 = Util.getMillis();
+        this.status = new TranslatableComponent("optimizeWorld.stage.upgrading");
         while (this.running) {
-            boolean boolean10 = false;
-            float float5 = 0.0f;
-            for (final DimensionType cbi7 : DimensionType.getAllTypes()) {
-                final ListIterator<ChunkPos> listIterator14 = immutableMap5.get(cbi7);
-                final ChunkStorage cay15 = immutableMap6.get(cbi7);
-                if (listIterator14.hasNext()) {
-                    final ChunkPos bjh16 = listIterator14.next();
-                    boolean boolean11 = false;
+            boolean boolean9 = false;
+            float float4 = 0.0f;
+            for (final ResourceKey<Level> ug6 : this.levels) {
+                final ListIterator<ChunkPos> listIterator13 = immutableMap4.get(ug6);
+                final ChunkStorage chw14 = immutableMap5.get(ug6);
+                if (listIterator13.hasNext()) {
+                    final ChunkPos bph15 = listIterator13.next();
+                    boolean boolean10 = false;
                     try {
-                        final CompoundTag jt18 = cay15.read(bjh16);
-                        if (jt18 != null) {
-                            final int integer19 = ChunkStorage.getVersion(jt18);
-                            final CompoundTag jt19 = cay15.upgradeChunkTag(cbi7, () -> this.overworldDataStorage, jt18);
-                            final CompoundTag jt20 = jt19.getCompound("Level");
-                            final ChunkPos bjh17 = new ChunkPos(jt20.getInt("xPos"), jt20.getInt("zPos"));
-                            if (!bjh17.equals(bjh16)) {
-                                WorldUpgrader.LOGGER.warn("Chunk {} has invalid position {}", bjh16, bjh17);
+                        final CompoundTag le17 = chw14.read(bph15);
+                        if (le17 != null) {
+                            final int integer18 = ChunkStorage.getVersion(le17);
+                            final CompoundTag le18 = chw14.upgradeChunkTag(ug6, () -> this.overworldDataStorage, le17);
+                            final CompoundTag le19 = le18.getCompound("Level");
+                            final ChunkPos bph16 = new ChunkPos(le19.getInt("xPos"), le19.getInt("zPos"));
+                            if (!bph16.equals(bph15)) {
+                                WorldUpgrader.LOGGER.warn("Chunk {} has invalid position {}", bph15, bph16);
                             }
-                            boolean boolean12 = integer19 < SharedConstants.getCurrentVersion().getWorldVersion();
+                            boolean boolean11 = integer18 < SharedConstants.getCurrentVersion().getWorldVersion();
                             if (this.eraseCache) {
-                                boolean12 = (boolean12 || jt20.contains("Heightmaps"));
-                                jt20.remove("Heightmaps");
-                                boolean12 = (boolean12 || jt20.contains("isLightOn"));
-                                jt20.remove("isLightOn");
+                                boolean11 = (boolean11 || le19.contains("Heightmaps"));
+                                le19.remove("Heightmaps");
+                                boolean11 = (boolean11 || le19.contains("isLightOn"));
+                                le19.remove("isLightOn");
                             }
-                            if (boolean12) {
-                                cay15.write(bjh16, jt19);
-                                boolean11 = true;
+                            if (boolean11) {
+                                chw14.write(bph15, le18);
+                                boolean10 = true;
                             }
                         }
                     }
-                    catch (ReportedException q18) {
-                        final Throwable throwable19 = q18.getCause();
-                        if (!(throwable19 instanceof IOException)) {
-                            throw q18;
+                    catch (ReportedException s17) {
+                        final Throwable throwable18 = s17.getCause();
+                        if (!(throwable18 instanceof IOException)) {
+                            throw s17;
                         }
-                        WorldUpgrader.LOGGER.error("Error upgrading chunk {}", bjh16, throwable19);
+                        WorldUpgrader.LOGGER.error("Error upgrading chunk {}", bph15, throwable18);
                     }
-                    catch (IOException iOException18) {
-                        WorldUpgrader.LOGGER.error("Error upgrading chunk {}", bjh16, iOException18);
+                    catch (IOException iOException17) {
+                        WorldUpgrader.LOGGER.error("Error upgrading chunk {}", bph15, iOException17);
                     }
-                    if (boolean11) {
+                    if (boolean10) {
                         ++this.converted;
                     }
                     else {
                         ++this.skipped;
                     }
-                    boolean10 = true;
+                    boolean9 = true;
                 }
-                final float float6 = listIterator14.nextIndex() / float4;
-                this.progressMap.put(cbi7, float6);
-                float5 += float6;
+                final float float5 = listIterator13.nextIndex() / float3;
+                this.progressMap.put(ug6, float5);
+                float4 += float5;
             }
-            this.progress = float5;
-            if (!boolean10) {
+            this.progress = float4;
+            if (!boolean9) {
                 this.running = false;
             }
         }
-        this.status = new TranslatableComponent("optimizeWorld.stage.finished", new Object[0]);
-        for (final ChunkStorage cay16 : immutableMap6.values()) {
+        this.status = new TranslatableComponent("optimizeWorld.stage.finished");
+        for (final ChunkStorage chw15 : immutableMap5.values()) {
             try {
-                cay16.close();
+                chw15.close();
             }
-            catch (IOException iOException19) {
-                WorldUpgrader.LOGGER.error("Error upgrading chunk", (Throwable)iOException19);
+            catch (IOException iOException18) {
+                WorldUpgrader.LOGGER.error("Error upgrading chunk", (Throwable)iOException18);
             }
         }
         this.overworldDataStorage.save();
-        long8 = Util.getMillis() - long8;
-        WorldUpgrader.LOGGER.info("World optimizaton finished after {} ms", long8);
+        long7 = Util.getMillis() - long7;
+        WorldUpgrader.LOGGER.info("World optimizaton finished after {} ms", long7);
         this.finished = true;
     }
     
-    private List<ChunkPos> getAllChunkPos(final DimensionType cbi) {
-        final File file3 = cbi.getStorageFolder(this.pathToWorld);
+    private List<ChunkPos> getAllChunkPos(final ResourceKey<Level> ug) {
+        final File file3 = this.levelStorage.getDimensionPath(ug);
         final File file4 = new File(file3, "region");
         final File[] arr5 = file4.listFiles((file, string) -> string.endsWith(".mca"));
         if (arr5 == null) {
@@ -190,12 +188,12 @@ public class WorldUpgrader {
             if (matcher11.matches()) {
                 final int integer12 = Integer.parseInt(matcher11.group(1)) << 5;
                 final int integer13 = Integer.parseInt(matcher11.group(2)) << 5;
-                try (final RegionFile cbc14 = new RegionFile(file5, file4)) {
+                try (final RegionFile cia14 = new RegionFile(file5, file4, true)) {
                     for (int integer14 = 0; integer14 < 32; ++integer14) {
                         for (int integer15 = 0; integer15 < 32; ++integer15) {
-                            final ChunkPos bjh18 = new ChunkPos(integer14 + integer12, integer15 + integer13);
-                            if (cbc14.doesChunkExist(bjh18)) {
-                                list6.add(bjh18);
+                            final ChunkPos bph18 = new ChunkPos(integer14 + integer12, integer15 + integer13);
+                            if (cia14.doesChunkExist(bph18)) {
+                                list6.add(bph18);
                             }
                         }
                     }
@@ -210,8 +208,12 @@ public class WorldUpgrader {
         return this.finished;
     }
     
-    public float dimensionProgress(final DimensionType cbi) {
-        return this.progressMap.getFloat(cbi);
+    public ImmutableSet<ResourceKey<Level>> levels() {
+        return this.levels;
+    }
+    
+    public float dimensionProgress(final ResourceKey<Level> ug) {
+        return this.progressMap.getFloat(ug);
     }
     
     public float getProgress() {
diff --git a/src/net/minecraft/world/BossEvent.java b/src/net/minecraft/world/BossEvent.java
index ad55caf..5d83026 100644
--- a/src/net/minecraft/world/BossEvent.java
+++ b/src/net/minecraft/world/BossEvent.java
@@ -14,9 +14,9 @@ public abstract class BossEvent {
     protected boolean playBossMusic;
     protected boolean createWorldFog;
     
-    public BossEvent(final UUID uUID, final Component lf, final BossBarColor a, final BossBarOverlay b) {
+    public BossEvent(final UUID uUID, final Component mr, final BossBarColor a, final BossBarOverlay b) {
         this.id = uUID;
-        this.name = lf;
+        this.name = mr;
         this.color = a;
         this.overlay = b;
         this.percent = 1.0f;
@@ -30,8 +30,8 @@ public abstract class BossEvent {
         return this.name;
     }
     
-    public void setName(final Component lf) {
-        this.name = lf;
+    public void setName(final Component mr) {
+        this.name = mr;
     }
     
     public float getPercent() {
@@ -97,9 +97,9 @@ public abstract class BossEvent {
         private final String name;
         private final ChatFormatting formatting;
         
-        private BossBarColor(final String string3, final ChatFormatting g) {
+        private BossBarColor(final String string3, final ChatFormatting i) {
             this.name = string3;
-            this.formatting = g;
+            this.formatting = i;
         }
         
         public ChatFormatting getFormatting() {
diff --git a/src/net/minecraft/world/CompoundContainer.java b/src/net/minecraft/world/CompoundContainer.java
index 844a48e..fde1981 100644
--- a/src/net/minecraft/world/CompoundContainer.java
+++ b/src/net/minecraft/world/CompoundContainer.java
@@ -7,15 +7,15 @@ public class CompoundContainer implements Container {
     private final Container container1;
     private final Container container2;
     
-    public CompoundContainer(Container aje1, Container aje2) {
-        if (aje1 == null) {
-            aje1 = aje2;
+    public CompoundContainer(Container amz1, Container amz2) {
+        if (amz1 == null) {
+            amz1 = amz2;
         }
-        if (aje2 == null) {
-            aje2 = aje1;
+        if (amz2 == null) {
+            amz2 = amz1;
         }
-        this.container1 = aje1;
-        this.container2 = aje2;
+        this.container1 = amz1;
+        this.container2 = amz2;
     }
     
     @Override
@@ -28,8 +28,8 @@ public class CompoundContainer implements Container {
         return this.container1.isEmpty() && this.container2.isEmpty();
     }
     
-    public boolean contains(final Container aje) {
-        return this.container1 == aje || this.container2 == aje;
+    public boolean contains(final Container amz) {
+        return this.container1 == amz || this.container2 == amz;
     }
     
     @Override
@@ -57,12 +57,12 @@ public class CompoundContainer implements Container {
     }
     
     @Override
-    public void setItem(final int integer, final ItemStack ben) {
+    public void setItem(final int integer, final ItemStack bki) {
         if (integer >= this.container1.getContainerSize()) {
-            this.container2.setItem(integer - this.container1.getContainerSize(), ben);
+            this.container2.setItem(integer - this.container1.getContainerSize(), bki);
         }
         else {
-            this.container1.setItem(integer, ben);
+            this.container1.setItem(integer, bki);
         }
     }
     
@@ -78,28 +78,28 @@ public class CompoundContainer implements Container {
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.container1.stillValid(ayj) && this.container2.stillValid(ayj);
+    public boolean stillValid(final Player bec) {
+        return this.container1.stillValid(bec) && this.container2.stillValid(bec);
     }
     
     @Override
-    public void startOpen(final Player ayj) {
-        this.container1.startOpen(ayj);
-        this.container2.startOpen(ayj);
+    public void startOpen(final Player bec) {
+        this.container1.startOpen(bec);
+        this.container2.startOpen(bec);
     }
     
     @Override
-    public void stopOpen(final Player ayj) {
-        this.container1.stopOpen(ayj);
-        this.container2.stopOpen(ayj);
+    public void stopOpen(final Player bec) {
+        this.container1.stopOpen(bec);
+        this.container2.stopOpen(bec);
     }
     
     @Override
-    public boolean canPlaceItem(final int integer, final ItemStack ben) {
+    public boolean canPlaceItem(final int integer, final ItemStack bki) {
         if (integer >= this.container1.getContainerSize()) {
-            return this.container2.canPlaceItem(integer - this.container1.getContainerSize(), ben);
+            return this.container2.canPlaceItem(integer - this.container1.getContainerSize(), bki);
         }
-        return this.container1.canPlaceItem(integer, ben);
+        return this.container1.canPlaceItem(integer, bki);
     }
     
     @Override
diff --git a/src/net/minecraft/world/Container.java b/src/net/minecraft/world/Container.java
index aa37650..654682a 100644
--- a/src/net/minecraft/world/Container.java
+++ b/src/net/minecraft/world/Container.java
@@ -16,7 +16,7 @@ public interface Container extends Clearable {
     
     ItemStack removeItemNoUpdate(final int integer);
     
-    void setItem(final int integer, final ItemStack ben);
+    void setItem(final int integer, final ItemStack bki);
     
     default int getMaxStackSize() {
         return 64;
@@ -24,24 +24,24 @@ public interface Container extends Clearable {
     
     void setChanged();
     
-    boolean stillValid(final Player ayj);
+    boolean stillValid(final Player bec);
     
-    default void startOpen(final Player ayj) {
+    default void startOpen(final Player bec) {
     }
     
-    default void stopOpen(final Player ayj) {
+    default void stopOpen(final Player bec) {
     }
     
-    default boolean canPlaceItem(final int integer, final ItemStack ben) {
+    default boolean canPlaceItem(final int integer, final ItemStack bki) {
         return true;
     }
     
-    default int countItem(final Item bei) {
+    default int countItem(final Item bke) {
         int integer3 = 0;
         for (int integer4 = 0; integer4 < this.getContainerSize(); ++integer4) {
-            final ItemStack ben5 = this.getItem(integer4);
-            if (ben5.getItem().equals(bei)) {
-                integer3 += ben5.getCount();
+            final ItemStack bki5 = this.getItem(integer4);
+            if (bki5.getItem().equals(bke)) {
+                integer3 += bki5.getCount();
             }
         }
         return integer3;
@@ -49,8 +49,8 @@ public interface Container extends Clearable {
     
     default boolean hasAnyOf(final Set<Item> set) {
         for (int integer3 = 0; integer3 < this.getContainerSize(); ++integer3) {
-            final ItemStack ben4 = this.getItem(integer3);
-            if (set.contains(ben4.getItem()) && ben4.getCount() > 0) {
+            final ItemStack bki4 = this.getItem(integer3);
+            if (set.contains(bki4.getItem()) && bki4.getCount() > 0) {
                 return true;
             }
         }
diff --git a/src/net/minecraft/world/ContainerHelper.java b/src/net/minecraft/world/ContainerHelper.java
index ddfa915..ff5f09d 100644
--- a/src/net/minecraft/world/ContainerHelper.java
+++ b/src/net/minecraft/world/ContainerHelper.java
@@ -1,6 +1,7 @@
 package net.minecraft.world;
 
 import java.util.AbstractList;
+import java.util.function.Predicate;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.core.NonNullList;
@@ -23,35 +24,60 @@ public class ContainerHelper {
         return list.set(integer, ItemStack.EMPTY);
     }
     
-    public static CompoundTag saveAllItems(final CompoundTag jt, final NonNullList<ItemStack> fy) {
-        return saveAllItems(jt, fy, true);
+    public static CompoundTag saveAllItems(final CompoundTag le, final NonNullList<ItemStack> gi) {
+        return saveAllItems(le, gi, true);
     }
     
-    public static CompoundTag saveAllItems(final CompoundTag jt, final NonNullList<ItemStack> fy, final boolean boolean3) {
-        final ListTag jz4 = new ListTag();
-        for (int integer5 = 0; integer5 < fy.size(); ++integer5) {
-            final ItemStack ben6 = fy.get(integer5);
-            if (!ben6.isEmpty()) {
-                final CompoundTag jt2 = new CompoundTag();
-                jt2.putByte("Slot", (byte)integer5);
-                ben6.save(jt2);
-                ((AbstractList<CompoundTag>)jz4).add(jt2);
+    public static CompoundTag saveAllItems(final CompoundTag le, final NonNullList<ItemStack> gi, final boolean boolean3) {
+        final ListTag lk4 = new ListTag();
+        for (int integer5 = 0; integer5 < gi.size(); ++integer5) {
+            final ItemStack bki6 = gi.get(integer5);
+            if (!bki6.isEmpty()) {
+                final CompoundTag le2 = new CompoundTag();
+                le2.putByte("Slot", (byte)integer5);
+                bki6.save(le2);
+                ((AbstractList<CompoundTag>)lk4).add(le2);
             }
         }
-        if (!jz4.isEmpty() || boolean3) {
-            jt.put("Items", jz4);
+        if (!lk4.isEmpty() || boolean3) {
+            le.put("Items", lk4);
         }
-        return jt;
+        return le;
     }
     
-    public static void loadAllItems(final CompoundTag jt, final NonNullList<ItemStack> fy) {
-        final ListTag jz3 = jt.getList("Items", 10);
-        for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-            final CompoundTag jt2 = jz3.getCompound(integer4);
-            final int integer5 = jt2.getByte("Slot") & 0xFF;
-            if (integer5 >= 0 && integer5 < fy.size()) {
-                fy.set(integer5, ItemStack.of(jt2));
+    public static void loadAllItems(final CompoundTag le, final NonNullList<ItemStack> gi) {
+        final ListTag lk3 = le.getList("Items", 10);
+        for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+            final CompoundTag le2 = lk3.getCompound(integer4);
+            final int integer5 = le2.getByte("Slot") & 0xFF;
+            if (integer5 >= 0 && integer5 < gi.size()) {
+                gi.set(integer5, ItemStack.of(le2));
             }
         }
     }
+    
+    public static int clearOrCountMatchingItems(final Container amz, final Predicate<ItemStack> predicate, final int integer, final boolean boolean4) {
+        int integer2 = 0;
+        for (int integer3 = 0; integer3 < amz.getContainerSize(); ++integer3) {
+            final ItemStack bki7 = amz.getItem(integer3);
+            final int integer4 = clearOrCountMatchingItems(bki7, predicate, integer - integer2, boolean4);
+            if (integer4 > 0 && !boolean4 && bki7.isEmpty()) {
+                amz.setItem(integer3, ItemStack.EMPTY);
+            }
+            integer2 += integer4;
+        }
+        return integer2;
+    }
+    
+    public static int clearOrCountMatchingItems(final ItemStack bki, final Predicate<ItemStack> predicate, final int integer, final boolean boolean4) {
+        if (bki.isEmpty() || !predicate.test(bki)) {
+            return 0;
+        }
+        if (boolean4) {
+            return bki.getCount();
+        }
+        final int integer2 = (integer < 0) ? bki.getCount() : Math.min(integer, bki.getCount());
+        bki.shrink(integer2);
+        return integer2;
+    }
 }
diff --git a/src/net/minecraft/world/ContainerListener.java b/src/net/minecraft/world/ContainerListener.java
index 89cd9c5..2977e1b 100644
--- a/src/net/minecraft/world/ContainerListener.java
+++ b/src/net/minecraft/world/ContainerListener.java
@@ -1,5 +1,5 @@
 package net.minecraft.world;
 
 public interface ContainerListener {
-    void containerChanged(final Container aje);
+    void containerChanged(final Container amz);
 }
diff --git a/src/net/minecraft/world/Containers.java b/src/net/minecraft/world/Containers.java
index 5d52304..e0f3ce7 100644
--- a/src/net/minecraft/world/Containers.java
+++ b/src/net/minecraft/world/Containers.java
@@ -12,36 +12,36 @@ import java.util.Random;
 public class Containers {
     private static final Random RANDOM;
     
-    public static void dropContents(final Level bjw, final BlockPos fk, final Container aje) {
-        dropContents(bjw, fk.getX(), fk.getY(), fk.getZ(), aje);
+    public static void dropContents(final Level bqb, final BlockPos fu, final Container amz) {
+        dropContents(bqb, fu.getX(), fu.getY(), fu.getZ(), amz);
     }
     
-    public static void dropContents(final Level bjw, final Entity akq, final Container aje) {
-        dropContents(bjw, akq.getX(), akq.getY(), akq.getZ(), aje);
+    public static void dropContents(final Level bqb, final Entity aom, final Container amz) {
+        dropContents(bqb, aom.getX(), aom.getY(), aom.getZ(), amz);
     }
     
-    private static void dropContents(final Level bjw, final double double2, final double double3, final double double4, final Container aje) {
-        for (int integer9 = 0; integer9 < aje.getContainerSize(); ++integer9) {
-            dropItemStack(bjw, double2, double3, double4, aje.getItem(integer9));
+    private static void dropContents(final Level bqb, final double double2, final double double3, final double double4, final Container amz) {
+        for (int integer9 = 0; integer9 < amz.getContainerSize(); ++integer9) {
+            dropItemStack(bqb, double2, double3, double4, amz.getItem(integer9));
         }
     }
     
-    public static void dropContents(final Level bjw, final BlockPos fk, final NonNullList<ItemStack> fy) {
-        fy.forEach(ben -> dropItemStack(bjw, fk.getX(), fk.getY(), fk.getZ(), ben));
+    public static void dropContents(final Level bqb, final BlockPos fu, final NonNullList<ItemStack> gi) {
+        gi.forEach(bki -> dropItemStack(bqb, fu.getX(), fu.getY(), fu.getZ(), bki));
     }
     
-    public static void dropItemStack(final Level bjw, final double double2, final double double3, final double double4, final ItemStack ben) {
+    public static void dropItemStack(final Level bqb, final double double2, final double double3, final double double4, final ItemStack bki) {
         final double double5 = EntityType.ITEM.getWidth();
         final double double6 = 1.0 - double5;
         final double double7 = double5 / 2.0;
         final double double8 = Math.floor(double2) + Containers.RANDOM.nextDouble() * double6 + double7;
         final double double9 = Math.floor(double3) + Containers.RANDOM.nextDouble() * double6;
         final double double10 = Math.floor(double4) + Containers.RANDOM.nextDouble() * double6 + double7;
-        while (!ben.isEmpty()) {
-            final ItemEntity awb21 = new ItemEntity(bjw, double8, double9, double10, ben.split(Containers.RANDOM.nextInt(21) + 10));
+        while (!bki.isEmpty()) {
+            final ItemEntity bbg21 = new ItemEntity(bqb, double8, double9, double10, bki.split(Containers.RANDOM.nextInt(21) + 10));
             final float float22 = 0.05f;
-            awb21.setDeltaMovement(Containers.RANDOM.nextGaussian() * 0.05000000074505806, Containers.RANDOM.nextGaussian() * 0.05000000074505806 + 0.20000000298023224, Containers.RANDOM.nextGaussian() * 0.05000000074505806);
-            bjw.addFreshEntity(awb21);
+            bbg21.setDeltaMovement(Containers.RANDOM.nextGaussian() * 0.05000000074505806, Containers.RANDOM.nextGaussian() * 0.05000000074505806 + 0.20000000298023224, Containers.RANDOM.nextGaussian() * 0.05000000074505806);
+            bqb.addFreshEntity(bbg21);
         }
     }
     
diff --git a/src/net/minecraft/world/Difficulty.java b/src/net/minecraft/world/Difficulty.java
index 85fbe1d..ef32aa3 100644
--- a/src/net/minecraft/world/Difficulty.java
+++ b/src/net/minecraft/world/Difficulty.java
@@ -26,7 +26,7 @@ public enum Difficulty {
     }
     
     public Component getDisplayName() {
-        return new TranslatableComponent("options.difficulty." + this.key, new Object[0]);
+        return new TranslatableComponent("options.difficulty." + this.key);
     }
     
     public static Difficulty byId(final int integer) {
@@ -35,9 +35,9 @@ public enum Difficulty {
     
     @Nullable
     public static Difficulty byName(final String string) {
-        for (final Difficulty aji5 : values()) {
-            if (aji5.key.equals(string)) {
-                return aji5;
+        for (final Difficulty and5 : values()) {
+            if (and5.key.equals(string)) {
+                return and5;
             }
         }
         return null;
@@ -47,6 +47,10 @@ public enum Difficulty {
         return this.key;
     }
     
+    public Difficulty nextById() {
+        return Difficulty.BY_ID[(this.id + 1) % Difficulty.BY_ID.length];
+    }
+    
     static {
         BY_ID = Arrays.<Difficulty>stream(values()).sorted(Comparator.comparingInt(Difficulty::getId)).<Difficulty>toArray(Difficulty[]::new);
     }
diff --git a/src/net/minecraft/world/DifficultyInstance.java b/src/net/minecraft/world/DifficultyInstance.java
index ab6d943..13bf0c4 100644
--- a/src/net/minecraft/world/DifficultyInstance.java
+++ b/src/net/minecraft/world/DifficultyInstance.java
@@ -8,9 +8,9 @@ public class DifficultyInstance {
     private final Difficulty base;
     private final float effectiveDifficulty;
     
-    public DifficultyInstance(final Difficulty aji, final long long2, final long long3, final float float4) {
-        this.base = aji;
-        this.effectiveDifficulty = this.calculateDifficulty(aji, long2, long3, float4);
+    public DifficultyInstance(final Difficulty and, final long long2, final long long3, final float float4) {
+        this.base = and;
+        this.effectiveDifficulty = this.calculateDifficulty(and, long2, long3, float4);
     }
     
     public Difficulty getDifficulty() {
@@ -35,21 +35,21 @@ public class DifficultyInstance {
         return (this.effectiveDifficulty - 2.0f) / 2.0f;
     }
     
-    private float calculateDifficulty(final Difficulty aji, final long long2, final long long3, final float float4) {
-        if (aji == Difficulty.PEACEFUL) {
+    private float calculateDifficulty(final Difficulty and, final long long2, final long long3, final float float4) {
+        if (and == Difficulty.PEACEFUL) {
             return 0.0f;
         }
-        final boolean boolean8 = aji == Difficulty.HARD;
+        final boolean boolean8 = and == Difficulty.HARD;
         float float5 = 0.75f;
         final float float6 = Mth.clamp((long2 - 72000.0f) / 1440000.0f, 0.0f, 1.0f) * 0.25f;
         float5 += float6;
         float float7 = 0.0f;
         float7 += Mth.clamp(long3 / 3600000.0f, 0.0f, 1.0f) * (boolean8 ? 1.0f : 0.75f);
         float7 += Mth.clamp(float4 * 0.25f, 0.0f, float6);
-        if (aji == Difficulty.EASY) {
+        if (and == Difficulty.EASY) {
             float7 *= 0.5f;
         }
         float5 += float7;
-        return aji.getId() * float5;
+        return and.getId() * float5;
     }
 }
diff --git a/src/net/minecraft/world/InteractionResult.java b/src/net/minecraft/world/InteractionResult.java
index 32bd031..ce6a75c 100644
--- a/src/net/minecraft/world/InteractionResult.java
+++ b/src/net/minecraft/world/InteractionResult.java
@@ -13,4 +13,8 @@ public enum InteractionResult {
     public boolean shouldSwing() {
         return this == InteractionResult.SUCCESS;
     }
+    
+    public static InteractionResult sidedSuccess(final boolean boolean1) {
+        return boolean1 ? InteractionResult.SUCCESS : InteractionResult.CONSUME;
+    }
 }
diff --git a/src/net/minecraft/world/InteractionResultHolder.java b/src/net/minecraft/world/InteractionResultHolder.java
index 2a1892c..eac0f7f 100644
--- a/src/net/minecraft/world/InteractionResultHolder.java
+++ b/src/net/minecraft/world/InteractionResultHolder.java
@@ -4,8 +4,8 @@ public class InteractionResultHolder<T> {
     private final InteractionResult result;
     private final T object;
     
-    public InteractionResultHolder(final InteractionResult ajl, final T object) {
-        this.result = ajl;
+    public InteractionResultHolder(final InteractionResult ang, final T object) {
+        this.result = ang;
         this.object = object;
     }
     
@@ -32,4 +32,8 @@ public class InteractionResultHolder<T> {
     public static <T> InteractionResultHolder<T> fail(final T object) {
         return new InteractionResultHolder<T>(InteractionResult.FAIL, object);
     }
+    
+    public static <T> InteractionResultHolder<T> sidedSuccess(final T object, final boolean boolean2) {
+        return boolean2 ? InteractionResultHolder.<T>success(object) : InteractionResultHolder.<T>consume(object);
+    }
 }
diff --git a/src/net/minecraft/world/LockCode.java b/src/net/minecraft/world/LockCode.java
index f9c8cf6..a188fcc 100644
--- a/src/net/minecraft/world/LockCode.java
+++ b/src/net/minecraft/world/LockCode.java
@@ -13,19 +13,19 @@ public class LockCode {
         this.key = string;
     }
     
-    public boolean unlocksWith(final ItemStack ben) {
-        return this.key.isEmpty() || (!ben.isEmpty() && ben.hasCustomHoverName() && this.key.equals(ben.getHoverName().getString()));
+    public boolean unlocksWith(final ItemStack bki) {
+        return this.key.isEmpty() || (!bki.isEmpty() && bki.hasCustomHoverName() && this.key.equals(bki.getHoverName().getString()));
     }
     
-    public void addToTag(final CompoundTag jt) {
+    public void addToTag(final CompoundTag le) {
         if (!this.key.isEmpty()) {
-            jt.putString("Lock", this.key);
+            le.putString("Lock", this.key);
         }
     }
     
-    public static LockCode fromTag(final CompoundTag jt) {
-        if (jt.contains("Lock", 8)) {
-            return new LockCode(jt.getString("Lock"));
+    public static LockCode fromTag(final CompoundTag le) {
+        if (le.contains("Lock", 8)) {
+            return new LockCode(le.getString("Lock"));
         }
         return LockCode.NO_LOCK;
     }
diff --git a/src/net/minecraft/world/ShulkerSharedHelper.java b/src/net/minecraft/world/ShulkerSharedHelper.java
new file mode 100644
index 0000000..746511c
--- /dev/null
+++ b/src/net/minecraft/world/ShulkerSharedHelper.java
@@ -0,0 +1,12 @@
+package net.minecraft.world;
+
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.core.Direction;
+import net.minecraft.core.BlockPos;
+
+public class ShulkerSharedHelper {
+    public static AABB openBoundingBox(final BlockPos fu, final Direction fz) {
+        return Shapes.block().bounds().expandTowards(0.5f * fz.getStepX(), 0.5f * fz.getStepY(), 0.5f * fz.getStepZ()).contract(fz.getStepX(), fz.getStepY(), fz.getStepZ()).move(fu.relative(fz));
+    }
+}
diff --git a/src/net/minecraft/world/SimpleContainer.java b/src/net/minecraft/world/SimpleContainer.java
index 2ad8cd0..494606a 100644
--- a/src/net/minecraft/world/SimpleContainer.java
+++ b/src/net/minecraft/world/SimpleContainer.java
@@ -1,12 +1,15 @@
 package net.minecraft.world;
 
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
+import java.util.AbstractList;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
 import net.minecraft.world.entity.player.StackedContents;
 import net.minecraft.world.entity.player.Player;
 import java.util.Iterator;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.Item;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 import com.google.common.collect.Lists;
 import java.util.List;
 import net.minecraft.world.item.ItemStack;
@@ -28,15 +31,15 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
         this.items = NonNullList.<ItemStack>of(ItemStack.EMPTY, arr);
     }
     
-    public void addListener(final ContainerListener ajg) {
+    public void addListener(final ContainerListener anb) {
         if (this.listeners == null) {
             this.listeners = Lists.newArrayList();
         }
-        this.listeners.add(ajg);
+        this.listeners.add(anb);
     }
     
-    public void removeListener(final ContainerListener ajg) {
-        this.listeners.remove(ajg);
+    public void removeListener(final ContainerListener anb) {
+        this.listeners.remove(anb);
     }
     
     @Override
@@ -47,62 +50,79 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
         return this.items.get(integer);
     }
     
-    @Override
-    public ItemStack removeItem(final int integer1, final int integer2) {
-        final ItemStack ben4 = ContainerHelper.removeItem(this.items, integer1, integer2);
-        if (!ben4.isEmpty()) {
-            this.setChanged();
-        }
-        return ben4;
+    public List<ItemStack> removeAllItems() {
+        final List<ItemStack> list2 = this.items.stream().filter(bki -> !bki.isEmpty()).collect(Collectors.toList());
+        this.clearContent();
+        return list2;
     }
     
-    public ItemStack removeItemType(final Item bei, final int integer) {
-        final ItemStack ben4 = new ItemStack(bei, 0);
+    @Override
+    public ItemStack removeItem(final int integer1, final int integer2) {
+        final ItemStack bki4 = ContainerHelper.removeItem(this.items, integer1, integer2);
+        if (!bki4.isEmpty()) {
+            this.setChanged();
+        }
+        return bki4;
+    }
+    
+    public ItemStack removeItemType(final Item bke, final int integer) {
+        final ItemStack bki4 = new ItemStack(bke, 0);
         for (int integer2 = this.size - 1; integer2 >= 0; --integer2) {
-            final ItemStack ben5 = this.getItem(integer2);
-            if (ben5.getItem().equals(bei)) {
-                final int integer3 = integer - ben4.getCount();
-                final ItemStack ben6 = ben5.split(integer3);
-                ben4.grow(ben6.getCount());
-                if (ben4.getCount() == integer) {
+            final ItemStack bki5 = this.getItem(integer2);
+            if (bki5.getItem().equals(bke)) {
+                final int integer3 = integer - bki4.getCount();
+                final ItemStack bki6 = bki5.split(integer3);
+                bki4.grow(bki6.getCount());
+                if (bki4.getCount() == integer) {
                     break;
                 }
             }
         }
-        if (!ben4.isEmpty()) {
+        if (!bki4.isEmpty()) {
             this.setChanged();
         }
-        return ben4;
+        return bki4;
     }
     
-    public ItemStack addItem(final ItemStack ben) {
-        final ItemStack ben2 = ben.copy();
-        this.moveItemToOccupiedSlotsWithSameType(ben2);
-        if (ben2.isEmpty()) {
+    public ItemStack addItem(final ItemStack bki) {
+        final ItemStack bki2 = bki.copy();
+        this.moveItemToOccupiedSlotsWithSameType(bki2);
+        if (bki2.isEmpty()) {
             return ItemStack.EMPTY;
         }
-        this.moveItemToEmptySlots(ben2);
-        if (ben2.isEmpty()) {
+        this.moveItemToEmptySlots(bki2);
+        if (bki2.isEmpty()) {
             return ItemStack.EMPTY;
         }
-        return ben2;
+        return bki2;
+    }
+    
+    public boolean canAddItem(final ItemStack bki) {
+        boolean boolean3 = false;
+        for (final ItemStack bki2 : this.items) {
+            if (bki2.isEmpty() || (this.isSameItem(bki2, bki) && bki2.getCount() < bki2.getMaxStackSize())) {
+                boolean3 = true;
+                break;
+            }
+        }
+        return boolean3;
     }
     
     @Override
     public ItemStack removeItemNoUpdate(final int integer) {
-        final ItemStack ben3 = this.items.get(integer);
-        if (ben3.isEmpty()) {
+        final ItemStack bki3 = this.items.get(integer);
+        if (bki3.isEmpty()) {
             return ItemStack.EMPTY;
         }
         this.items.set(integer, ItemStack.EMPTY);
-        return ben3;
+        return bki3;
     }
     
     @Override
-    public void setItem(final int integer, final ItemStack ben) {
-        this.items.set(integer, ben);
-        if (!ben.isEmpty() && ben.getCount() > this.getMaxStackSize()) {
-            ben.setCount(this.getMaxStackSize());
+    public void setItem(final int integer, final ItemStack bki) {
+        this.items.set(integer, bki);
+        if (!bki.isEmpty() && bki.getCount() > this.getMaxStackSize()) {
+            bki.setCount(this.getMaxStackSize());
         }
         this.setChanged();
     }
@@ -114,8 +134,8 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
     
     @Override
     public boolean isEmpty() {
-        for (final ItemStack ben3 : this.items) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.items) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
@@ -125,14 +145,14 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
     @Override
     public void setChanged() {
         if (this.listeners != null) {
-            for (final ContainerListener ajg3 : this.listeners) {
-                ajg3.containerChanged(this);
+            for (final ContainerListener anb3 : this.listeners) {
+                anb3.containerChanged(this);
             }
         }
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
+    public boolean stillValid(final Player bec) {
         return true;
     }
     
@@ -143,47 +163,71 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
     }
     
     @Override
-    public void fillStackedContents(final StackedContents ayl) {
-        for (final ItemStack ben4 : this.items) {
-            ayl.accountStack(ben4);
+    public void fillStackedContents(final StackedContents bee) {
+        for (final ItemStack bki4 : this.items) {
+            bee.accountStack(bki4);
         }
     }
     
     @Override
     public String toString() {
-        return this.items.stream().filter(ben -> !ben.isEmpty()).collect(Collectors.toList()).toString();
+        return this.items.stream().filter(bki -> !bki.isEmpty()).collect(Collectors.toList()).toString();
     }
     
-    private void moveItemToEmptySlots(final ItemStack ben) {
+    private void moveItemToEmptySlots(final ItemStack bki) {
         for (int integer3 = 0; integer3 < this.size; ++integer3) {
-            final ItemStack ben2 = this.getItem(integer3);
-            if (ben2.isEmpty()) {
-                this.setItem(integer3, ben.copy());
-                ben.setCount(0);
+            final ItemStack bki2 = this.getItem(integer3);
+            if (bki2.isEmpty()) {
+                this.setItem(integer3, bki.copy());
+                bki.setCount(0);
                 return;
             }
         }
     }
     
-    private void moveItemToOccupiedSlotsWithSameType(final ItemStack ben) {
+    private void moveItemToOccupiedSlotsWithSameType(final ItemStack bki) {
         for (int integer3 = 0; integer3 < this.size; ++integer3) {
-            final ItemStack ben2 = this.getItem(integer3);
-            if (ItemStack.isSame(ben2, ben)) {
-                this.moveItemsBetweenStacks(ben, ben2);
-                if (ben.isEmpty()) {
+            final ItemStack bki2 = this.getItem(integer3);
+            if (this.isSameItem(bki2, bki)) {
+                this.moveItemsBetweenStacks(bki, bki2);
+                if (bki.isEmpty()) {
                     return;
                 }
             }
         }
     }
     
-    private void moveItemsBetweenStacks(final ItemStack ben1, final ItemStack ben2) {
-        final int integer4 = Math.min(this.getMaxStackSize(), ben2.getMaxStackSize());
-        final int integer5 = Math.min(ben1.getCount(), integer4 - ben2.getCount());
+    private boolean isSameItem(final ItemStack bki1, final ItemStack bki2) {
+        return bki1.getItem() == bki2.getItem() && ItemStack.tagMatches(bki1, bki2);
+    }
+    
+    private void moveItemsBetweenStacks(final ItemStack bki1, final ItemStack bki2) {
+        final int integer4 = Math.min(this.getMaxStackSize(), bki2.getMaxStackSize());
+        final int integer5 = Math.min(bki1.getCount(), integer4 - bki2.getCount());
         if (integer5 > 0) {
-            ben2.grow(integer5);
-            ben1.shrink(integer5);
+            bki2.grow(integer5);
+            bki1.shrink(integer5);
             this.setChanged();
         }
     }
+    
+    public void fromTag(final ListTag lk) {
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            final ItemStack bki4 = ItemStack.of(lk.getCompound(integer3));
+            if (!bki4.isEmpty()) {
+                this.addItem(bki4);
+            }
+        }
+    }
+    
+    public ListTag createTag() {
+        final ListTag lk2 = new ListTag();
+        for (int integer3 = 0; integer3 < this.getContainerSize(); ++integer3) {
+            final ItemStack bki4 = this.getItem(integer3);
+            if (!bki4.isEmpty()) {
+                ((AbstractList<CompoundTag>)lk2).add(bki4.save(new CompoundTag()));
+            }
+        }
+        return lk2;
+    }
 }
diff --git a/src/net/minecraft/world/SimpleMenuProvider.java b/src/net/minecraft/world/SimpleMenuProvider.java
index 6d89d7b..d44fd9d 100644
--- a/src/net/minecraft/world/SimpleMenuProvider.java
+++ b/src/net/minecraft/world/SimpleMenuProvider.java
@@ -10,9 +10,9 @@ public final class SimpleMenuProvider implements MenuProvider {
     private final Component title;
     private final MenuConstructor menuConstructor;
     
-    public SimpleMenuProvider(final MenuConstructor bbn, final Component lf) {
-        this.menuConstructor = bbn;
-        this.title = lf;
+    public SimpleMenuProvider(final MenuConstructor bhj, final Component mr) {
+        this.menuConstructor = bhj;
+        this.title = mr;
     }
     
     @Override
@@ -21,7 +21,7 @@ public final class SimpleMenuProvider implements MenuProvider {
     }
     
     @Override
-    public AbstractContainerMenu createMenu(final int integer, final Inventory ayi, final Player ayj) {
-        return this.menuConstructor.createMenu(integer, ayi, ayj);
+    public AbstractContainerMenu createMenu(final int integer, final Inventory beb, final Player bec) {
+        return this.menuConstructor.createMenu(integer, beb, bec);
     }
 }
diff --git a/src/net/minecraft/world/Snooper.java b/src/net/minecraft/world/Snooper.java
index 0f0f397..9443c58 100644
--- a/src/net/minecraft/world/Snooper.java
+++ b/src/net/minecraft/world/Snooper.java
@@ -18,7 +18,7 @@ public class Snooper {
     private final long startupTime;
     private boolean started;
     
-    public Snooper(final String string, final SnooperPopulator ajt, final long long3) {
+    public Snooper(final String string, final SnooperPopulator anp, final long long3) {
         this.fixedData = Maps.newHashMap();
         this.dynamicData = Maps.newHashMap();
         this.token = UUID.randomUUID().toString();
@@ -30,7 +30,7 @@ public class Snooper {
         catch (MalformedURLException malformedURLException6) {
             throw new IllegalArgumentException();
         }
-        this.populator = ajt;
+        this.populator = anp;
         this.startupTime = long3;
     }
     
diff --git a/src/net/minecraft/world/SnooperPopulator.java b/src/net/minecraft/world/SnooperPopulator.java
index c092642..9f052e9 100644
--- a/src/net/minecraft/world/SnooperPopulator.java
+++ b/src/net/minecraft/world/SnooperPopulator.java
@@ -1,5 +1,5 @@
 package net.minecraft.world;
 
 public interface SnooperPopulator {
-    void populateSnooper(final Snooper ajs);
+    void populateSnooper(final Snooper ano);
 }
diff --git a/src/net/minecraft/world/WorldlyContainer.java b/src/net/minecraft/world/WorldlyContainer.java
index 3ee7bc3..18a77b3 100644
--- a/src/net/minecraft/world/WorldlyContainer.java
+++ b/src/net/minecraft/world/WorldlyContainer.java
@@ -5,9 +5,9 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.Direction;
 
 public interface WorldlyContainer extends Container {
-    int[] getSlotsForFace(final Direction fp);
+    int[] getSlotsForFace(final Direction fz);
     
-    boolean canPlaceItemThroughFace(final int integer, final ItemStack ben, @Nullable final Direction fp);
+    boolean canPlaceItemThroughFace(final int integer, final ItemStack bki, @Nullable final Direction fz);
     
-    boolean canTakeItemThroughFace(final int integer, final ItemStack ben, final Direction fp);
+    boolean canTakeItemThroughFace(final int integer, final ItemStack bki, final Direction fz);
 }
diff --git a/src/net/minecraft/world/WorldlyContainerHolder.java b/src/net/minecraft/world/WorldlyContainerHolder.java
index 3d9bedf..d0d7625 100644
--- a/src/net/minecraft/world/WorldlyContainerHolder.java
+++ b/src/net/minecraft/world/WorldlyContainerHolder.java
@@ -5,5 +5,5 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.state.BlockState;
 
 public interface WorldlyContainerHolder {
-    WorldlyContainer getContainer(final BlockState byj, final LevelAccessor bjx, final BlockPos fk);
+    WorldlyContainer getContainer(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu);
 }
diff --git a/src/net/minecraft/world/damagesource/BadRespawnPointDamage.java b/src/net/minecraft/world/damagesource/BadRespawnPointDamage.java
new file mode 100644
index 0000000..13ddcd9
--- /dev/null
+++ b/src/net/minecraft/world/damagesource/BadRespawnPointDamage.java
@@ -0,0 +1,30 @@
+package net.minecraft.world.damagesource;
+
+import net.minecraft.network.chat.Style;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.HoverEvent;
+import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.ComponentUtils;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.LivingEntity;
+
+public class BadRespawnPointDamage extends DamageSource {
+    protected BadRespawnPointDamage() {
+        super("badRespawnPoint");
+        this.setScalesWithDifficulty();
+        this.setExplosion();
+    }
+    
+    @Override
+    public Component getLocalizedDeathMessage(final LivingEntity aoy) {
+        final HoverEvent mv;
+        final Style style;
+        final Component mr3 = ComponentUtils.wrapInSquareBrackets(new TranslatableComponent("death.attack.badRespawnPoint.link")).withStyle(nb -> {
+            nb.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://bugs.mojang.com/browse/MCPE-28723"));
+            new HoverEvent((HoverEvent.Action<TextComponent>)HoverEvent.Action.SHOW_TEXT, new TextComponent("MCPE-28723"));
+            return style.withHoverEvent(mv);
+        });
+        return new TranslatableComponent("death.attack.badRespawnPoint.message", new Object[] { aoy.getDisplayName(), mr3 });
+    }
+}
diff --git a/src/net/minecraft/world/damagesource/CombatEntry.java b/src/net/minecraft/world/damagesource/CombatEntry.java
index 24feda8..a1ce7fa 100644
--- a/src/net/minecraft/world/damagesource/CombatEntry.java
+++ b/src/net/minecraft/world/damagesource/CombatEntry.java
@@ -12,8 +12,8 @@ public class CombatEntry {
     private final String location;
     private final float fallDistance;
     
-    public CombatEntry(final DamageSource ajz, final int integer, final float float3, final float float4, final String string, final float float6) {
-        this.source = ajz;
+    public CombatEntry(final DamageSource anw, final int integer, final float float3, final float float4, final String string, final float float6) {
+        this.source = anw;
         this.time = integer;
         this.damage = float4;
         this.health = float3;
diff --git a/src/net/minecraft/world/damagesource/CombatTracker.java b/src/net/minecraft/world/damagesource/CombatTracker.java
index c1454b3..0111056 100644
--- a/src/net/minecraft/world/damagesource/CombatTracker.java
+++ b/src/net/minecraft/world/damagesource/CombatTracker.java
@@ -3,12 +3,16 @@ package net.minecraft.world.damagesource;
 import javax.annotation.Nullable;
 import java.util.Iterator;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.Optional;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import com.google.common.collect.Lists;
 import net.minecraft.world.entity.LivingEntity;
@@ -24,35 +28,48 @@ public class CombatTracker {
     private boolean takingDamage;
     private String nextLocation;
     
-    public CombatTracker(final LivingEntity akz) {
+    public CombatTracker(final LivingEntity aoy) {
         this.entries = Lists.newArrayList();
-        this.mob = akz;
+        this.mob = aoy;
     }
     
     public void prepareForDamage() {
         this.resetPreparedStatus();
-        if (this.mob.onLadder()) {
-            final Block bph2 = this.mob.level.getBlockState(new BlockPos(this.mob)).getBlock();
-            if (bph2 == Blocks.LADDER) {
+        final Optional<BlockPos> optional2 = this.mob.getLastClimbablePos();
+        if (optional2.isPresent()) {
+            final BlockState cfj3 = this.mob.level.getBlockState(optional2.get());
+            if (cfj3.is(Blocks.LADDER) || cfj3.is(BlockTags.TRAPDOORS)) {
                 this.nextLocation = "ladder";
             }
-            else if (bph2 == Blocks.VINE) {
+            else if (cfj3.is(Blocks.VINE)) {
                 this.nextLocation = "vines";
             }
+            else if (cfj3.is(Blocks.WEEPING_VINES) || cfj3.is(Blocks.WEEPING_VINES_PLANT)) {
+                this.nextLocation = "weeping_vines";
+            }
+            else if (cfj3.is(Blocks.TWISTING_VINES) || cfj3.is(Blocks.TWISTING_VINES_PLANT)) {
+                this.nextLocation = "twisting_vines";
+            }
+            else if (cfj3.is(Blocks.SCAFFOLDING)) {
+                this.nextLocation = "scaffolding";
+            }
+            else {
+                this.nextLocation = "other_climbable";
+            }
         }
         else if (this.mob.isInWater()) {
             this.nextLocation = "water";
         }
     }
     
-    public void recordDamage(final DamageSource ajz, final float float2, final float float3) {
+    public void recordDamage(final DamageSource anw, final float float2, final float float3) {
         this.recheckStatus();
         this.prepareForDamage();
-        final CombatEntry ajw5 = new CombatEntry(ajz, this.mob.tickCount, float2, float3, this.nextLocation, this.mob.fallDistance);
-        this.entries.add(ajw5);
+        final CombatEntry ant5 = new CombatEntry(anw, this.mob.tickCount, float2, float3, this.nextLocation, this.mob.fallDistance);
+        this.entries.add(ant5);
         this.lastDamageTime = this.mob.tickCount;
         this.takingDamage = true;
-        if (ajw5.isCombatRelated() && !this.inCombat && this.mob.isAlive()) {
+        if (ant5.isCombatRelated() && !this.inCombat && this.mob.isAlive()) {
             this.inCombat = true;
             this.combatStartTime = this.mob.tickCount;
             this.combatEndTime = this.combatStartTime;
@@ -64,101 +81,101 @@ public class CombatTracker {
         if (this.entries.isEmpty()) {
             return new TranslatableComponent("death.attack.generic", new Object[] { this.mob.getDisplayName() });
         }
-        final CombatEntry ajw2 = this.getMostSignificantFall();
-        final CombatEntry ajw3 = this.entries.get(this.entries.size() - 1);
-        final Component lf5 = ajw3.getAttackerName();
-        final Entity akq6 = ajw3.getSource().getEntity();
-        Component lf7;
-        if (ajw2 != null && ajw3.getSource() == DamageSource.FALL) {
-            final Component lf6 = ajw2.getAttackerName();
-            if (ajw2.getSource() == DamageSource.FALL || ajw2.getSource() == DamageSource.OUT_OF_WORLD) {
-                lf7 = new TranslatableComponent("death.fell.accident." + this.getFallLocation(ajw2), new Object[] { this.mob.getDisplayName() });
+        final CombatEntry ant2 = this.getMostSignificantFall();
+        final CombatEntry ant3 = this.entries.get(this.entries.size() - 1);
+        final Component mr5 = ant3.getAttackerName();
+        final Entity aom6 = ant3.getSource().getEntity();
+        Component mr7;
+        if (ant2 != null && ant3.getSource() == DamageSource.FALL) {
+            final Component mr6 = ant2.getAttackerName();
+            if (ant2.getSource() == DamageSource.FALL || ant2.getSource() == DamageSource.OUT_OF_WORLD) {
+                mr7 = new TranslatableComponent("death.fell.accident." + this.getFallLocation(ant2), new Object[] { this.mob.getDisplayName() });
             }
-            else if (lf6 != null && (lf5 == null || !lf6.equals(lf5))) {
-                final Entity akq7 = ajw2.getSource().getEntity();
-                final ItemStack ben9 = (akq7 instanceof LivingEntity) ? ((LivingEntity)akq7).getMainHandItem() : ItemStack.EMPTY;
-                if (!ben9.isEmpty() && ben9.hasCustomHoverName()) {
-                    lf7 = new TranslatableComponent("death.fell.assist.item", new Object[] { this.mob.getDisplayName(), lf6, ben9.getDisplayName() });
+            else if (mr6 != null && (mr5 == null || !mr6.equals(mr5))) {
+                final Entity aom7 = ant2.getSource().getEntity();
+                final ItemStack bki9 = (aom7 instanceof LivingEntity) ? ((LivingEntity)aom7).getMainHandItem() : ItemStack.EMPTY;
+                if (!bki9.isEmpty() && bki9.hasCustomHoverName()) {
+                    mr7 = new TranslatableComponent("death.fell.assist.item", new Object[] { this.mob.getDisplayName(), mr6, bki9.getDisplayName() });
                 }
                 else {
-                    lf7 = new TranslatableComponent("death.fell.assist", new Object[] { this.mob.getDisplayName(), lf6 });
+                    mr7 = new TranslatableComponent("death.fell.assist", new Object[] { this.mob.getDisplayName(), mr6 });
                 }
             }
-            else if (lf5 != null) {
-                final ItemStack ben10 = (akq6 instanceof LivingEntity) ? ((LivingEntity)akq6).getMainHandItem() : ItemStack.EMPTY;
-                if (!ben10.isEmpty() && ben10.hasCustomHoverName()) {
-                    lf7 = new TranslatableComponent("death.fell.finish.item", new Object[] { this.mob.getDisplayName(), lf5, ben10.getDisplayName() });
+            else if (mr5 != null) {
+                final ItemStack bki10 = (aom6 instanceof LivingEntity) ? ((LivingEntity)aom6).getMainHandItem() : ItemStack.EMPTY;
+                if (!bki10.isEmpty() && bki10.hasCustomHoverName()) {
+                    mr7 = new TranslatableComponent("death.fell.finish.item", new Object[] { this.mob.getDisplayName(), mr5, bki10.getDisplayName() });
                 }
                 else {
-                    lf7 = new TranslatableComponent("death.fell.finish", new Object[] { this.mob.getDisplayName(), lf5 });
+                    mr7 = new TranslatableComponent("death.fell.finish", new Object[] { this.mob.getDisplayName(), mr5 });
                 }
             }
             else {
-                lf7 = new TranslatableComponent("death.fell.killer", new Object[] { this.mob.getDisplayName() });
+                mr7 = new TranslatableComponent("death.fell.killer", new Object[] { this.mob.getDisplayName() });
             }
         }
         else {
-            lf7 = ajw3.getSource().getLocalizedDeathMessage(this.mob);
+            mr7 = ant3.getSource().getLocalizedDeathMessage(this.mob);
         }
-        return lf7;
+        return mr7;
     }
     
     @Nullable
     public LivingEntity getKiller() {
-        LivingEntity akz2 = null;
-        Player ayj3 = null;
+        LivingEntity aoy2 = null;
+        Player bec3 = null;
         float float4 = 0.0f;
         float float5 = 0.0f;
-        for (final CombatEntry ajw7 : this.entries) {
-            if (ajw7.getSource().getEntity() instanceof Player && (ayj3 == null || ajw7.getDamage() > float5)) {
-                float5 = ajw7.getDamage();
-                ayj3 = (Player)ajw7.getSource().getEntity();
+        for (final CombatEntry ant7 : this.entries) {
+            if (ant7.getSource().getEntity() instanceof Player && (bec3 == null || ant7.getDamage() > float5)) {
+                float5 = ant7.getDamage();
+                bec3 = (Player)ant7.getSource().getEntity();
             }
-            if (ajw7.getSource().getEntity() instanceof LivingEntity && (akz2 == null || ajw7.getDamage() > float4)) {
-                float4 = ajw7.getDamage();
-                akz2 = (LivingEntity)ajw7.getSource().getEntity();
+            if (ant7.getSource().getEntity() instanceof LivingEntity && (aoy2 == null || ant7.getDamage() > float4)) {
+                float4 = ant7.getDamage();
+                aoy2 = (LivingEntity)ant7.getSource().getEntity();
             }
         }
-        if (ayj3 != null && float5 >= float4 / 3.0f) {
-            return ayj3;
+        if (bec3 != null && float5 >= float4 / 3.0f) {
+            return bec3;
         }
-        return akz2;
+        return aoy2;
     }
     
     @Nullable
     private CombatEntry getMostSignificantFall() {
-        CombatEntry ajw2 = null;
-        CombatEntry ajw3 = null;
+        CombatEntry ant2 = null;
+        CombatEntry ant3 = null;
         float float4 = 0.0f;
         float float5 = 0.0f;
         for (int integer6 = 0; integer6 < this.entries.size(); ++integer6) {
-            final CombatEntry ajw4 = this.entries.get(integer6);
-            final CombatEntry ajw5 = (integer6 > 0) ? this.entries.get(integer6 - 1) : null;
-            if ((ajw4.getSource() == DamageSource.FALL || ajw4.getSource() == DamageSource.OUT_OF_WORLD) && ajw4.getFallDistance() > 0.0f && (ajw2 == null || ajw4.getFallDistance() > float5)) {
+            final CombatEntry ant4 = this.entries.get(integer6);
+            final CombatEntry ant5 = (integer6 > 0) ? this.entries.get(integer6 - 1) : null;
+            if ((ant4.getSource() == DamageSource.FALL || ant4.getSource() == DamageSource.OUT_OF_WORLD) && ant4.getFallDistance() > 0.0f && (ant2 == null || ant4.getFallDistance() > float5)) {
                 if (integer6 > 0) {
-                    ajw2 = ajw5;
+                    ant2 = ant5;
                 }
                 else {
-                    ajw2 = ajw4;
+                    ant2 = ant4;
                 }
-                float5 = ajw4.getFallDistance();
+                float5 = ant4.getFallDistance();
             }
-            if (ajw4.getLocation() != null && (ajw3 == null || ajw4.getDamage() > float4)) {
-                ajw3 = ajw4;
-                float4 = ajw4.getDamage();
+            if (ant4.getLocation() != null && (ant3 == null || ant4.getDamage() > float4)) {
+                ant3 = ant4;
+                float4 = ant4.getDamage();
             }
         }
-        if (float5 > 5.0f && ajw2 != null) {
-            return ajw2;
+        if (float5 > 5.0f && ant2 != null) {
+            return ant2;
         }
-        if (float4 > 5.0f && ajw3 != null) {
-            return ajw3;
+        if (float4 > 5.0f && ant3 != null) {
+            return ant3;
         }
         return null;
     }
     
-    private String getFallLocation(final CombatEntry ajw) {
-        return (ajw.getLocation() == null) ? "generic" : ajw.getLocation();
+    private String getFallLocation(final CombatEntry ant) {
+        return (ant.getLocation() == null) ? "generic" : ant.getLocation();
     }
     
     public int getCombatDuration() {
diff --git a/src/net/minecraft/world/damagesource/DamageSource.java b/src/net/minecraft/world/damagesource/DamageSource.java
index 2aa9859..ccf3368 100644
--- a/src/net/minecraft/world/damagesource/DamageSource.java
+++ b/src/net/minecraft/world/damagesource/DamageSource.java
@@ -4,7 +4,9 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.Explosion;
-import net.minecraft.world.entity.projectile.AbstractHurtingProjectile;
+import net.minecraft.world.entity.projectile.WitherSkull;
+import net.minecraft.world.entity.projectile.Fireball;
+import net.minecraft.world.entity.projectile.FireworkRocketEntity;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.player.Player;
@@ -31,7 +33,6 @@ public class DamageSource {
     public static final DamageSource ANVIL;
     public static final DamageSource FALLING_BLOCK;
     public static final DamageSource DRAGON_BREATH;
-    public static final DamageSource FIREWORKS;
     public static final DamageSource DRY_OUT;
     public static final DamageSource SWEET_BERRY_BUSH;
     private boolean bypassArmor;
@@ -45,65 +46,75 @@ public class DamageSource {
     private boolean isExplosion;
     public final String msgId;
     
-    public static DamageSource sting(final LivingEntity akz) {
-        return new EntityDamageSource("sting", akz);
+    public static DamageSource sting(final LivingEntity aoy) {
+        return new EntityDamageSource("sting", aoy);
     }
     
-    public static DamageSource mobAttack(final LivingEntity akz) {
-        return new EntityDamageSource("mob", akz);
+    public static DamageSource mobAttack(final LivingEntity aoy) {
+        return new EntityDamageSource("mob", aoy);
     }
     
-    public static DamageSource indirectMobAttack(final Entity akq, final LivingEntity akz) {
-        return new IndirectEntityDamageSource("mob", akq, akz);
+    public static DamageSource indirectMobAttack(final Entity aom, final LivingEntity aoy) {
+        return new IndirectEntityDamageSource("mob", aom, aoy);
     }
     
-    public static DamageSource playerAttack(final Player ayj) {
-        return new EntityDamageSource("player", ayj);
+    public static DamageSource playerAttack(final Player bec) {
+        return new EntityDamageSource("player", bec);
     }
     
-    public static DamageSource arrow(final AbstractArrow ayn, @Nullable final Entity akq) {
-        return new IndirectEntityDamageSource("arrow", ayn, akq).setProjectile();
+    public static DamageSource arrow(final AbstractArrow beg, @Nullable final Entity aom) {
+        return new IndirectEntityDamageSource("arrow", beg, aom).setProjectile();
     }
     
-    public static DamageSource trident(final Entity akq1, @Nullable final Entity akq2) {
-        return new IndirectEntityDamageSource("trident", akq1, akq2).setProjectile();
+    public static DamageSource trident(final Entity aom1, @Nullable final Entity aom2) {
+        return new IndirectEntityDamageSource("trident", aom1, aom2).setProjectile();
     }
     
-    public static DamageSource fireball(final AbstractHurtingProjectile ayo, @Nullable final Entity akq) {
-        if (akq == null) {
-            return new IndirectEntityDamageSource("onFire", ayo, ayo).setIsFire().setProjectile();
+    public static DamageSource fireworks(final FireworkRocketEntity ben, @Nullable final Entity aom) {
+        return new IndirectEntityDamageSource("fireworks", ben, aom).setExplosion();
+    }
+    
+    public static DamageSource fireball(final Fireball bem, @Nullable final Entity aom) {
+        if (aom == null) {
+            return new IndirectEntityDamageSource("onFire", bem, bem).setIsFire().setProjectile();
         }
-        return new IndirectEntityDamageSource("fireball", ayo, akq).setIsFire().setProjectile();
+        return new IndirectEntityDamageSource("fireball", bem, aom).setIsFire().setProjectile();
     }
     
-    public static DamageSource thrown(final Entity akq1, @Nullable final Entity akq2) {
-        return new IndirectEntityDamageSource("thrown", akq1, akq2).setProjectile();
+    public static DamageSource witherSkull(final WitherSkull bff, final Entity aom) {
+        return new IndirectEntityDamageSource("witherSkull", bff, aom).setProjectile();
     }
     
-    public static DamageSource indirectMagic(final Entity akq1, @Nullable final Entity akq2) {
-        return new IndirectEntityDamageSource("indirectMagic", akq1, akq2).bypassArmor().setMagic();
+    public static DamageSource thrown(final Entity aom1, @Nullable final Entity aom2) {
+        return new IndirectEntityDamageSource("thrown", aom1, aom2).setProjectile();
     }
     
-    public static DamageSource thorns(final Entity akq) {
-        return new EntityDamageSource("thorns", akq).setThorns().setMagic();
+    public static DamageSource indirectMagic(final Entity aom1, @Nullable final Entity aom2) {
+        return new IndirectEntityDamageSource("indirectMagic", aom1, aom2).bypassArmor().setMagic();
     }
     
-    public static DamageSource explosion(@Nullable final Explosion bjp) {
-        if (bjp != null && bjp.getSourceMob() != null) {
-            return new EntityDamageSource("explosion.player", bjp.getSourceMob()).setScalesWithDifficulty().setExplosion();
+    public static DamageSource thorns(final Entity aom) {
+        return new EntityDamageSource("thorns", aom).setThorns().setMagic();
+    }
+    
+    public static DamageSource explosion(@Nullable final Explosion bpt) {
+        return explosion((bpt != null) ? bpt.getSourceMob() : null);
+    }
+    
+    public static DamageSource explosion(@Nullable final LivingEntity aoy) {
+        if (aoy != null) {
+            return new EntityDamageSource("explosion.player", aoy).setScalesWithDifficulty().setExplosion();
         }
         return new DamageSource("explosion").setScalesWithDifficulty().setExplosion();
     }
     
-    public static DamageSource explosion(@Nullable final LivingEntity akz) {
-        if (akz != null) {
-            return new EntityDamageSource("explosion.player", akz).setScalesWithDifficulty().setExplosion();
-        }
-        return new DamageSource("explosion").setScalesWithDifficulty().setExplosion();
+    public static DamageSource badRespawnPointExplosion() {
+        return new BadRespawnPointDamage();
     }
     
-    public static DamageSource netherBedExplosion() {
-        return new NetherBedDamage();
+    @Override
+    public String toString() {
+        return "DamageSource (" + this.msgId + ")";
     }
     
     public boolean isProjectile() {
@@ -177,14 +188,14 @@ public class DamageSource {
         return this;
     }
     
-    public Component getLocalizedDeathMessage(final LivingEntity akz) {
-        final LivingEntity akz2 = akz.getKillCredit();
+    public Component getLocalizedDeathMessage(final LivingEntity aoy) {
+        final LivingEntity aoy2 = aoy.getKillCredit();
         final String string4 = "death.attack." + this.msgId;
         final String string5 = string4 + ".player";
-        if (akz2 != null) {
-            return new TranslatableComponent(string5, new Object[] { akz.getDisplayName(), akz2.getDisplayName() });
+        if (aoy2 != null) {
+            return new TranslatableComponent(string5, new Object[] { aoy.getDisplayName(), aoy2.getDisplayName() });
         }
-        return new TranslatableComponent(string4, new Object[] { akz.getDisplayName() });
+        return new TranslatableComponent(string4, new Object[] { aoy.getDisplayName() });
     }
     
     public boolean isFire() {
@@ -214,8 +225,8 @@ public class DamageSource {
     }
     
     public boolean isCreativePlayer() {
-        final Entity akq2 = this.getEntity();
-        return akq2 instanceof Player && ((Player)akq2).abilities.instabuild;
+        final Entity aom2 = this.getEntity();
+        return aom2 instanceof Player && ((Player)aom2).abilities.instabuild;
     }
     
     @Nullable
@@ -224,7 +235,7 @@ public class DamageSource {
     }
     
     static {
-        IN_FIRE = new DamageSource("inFire").setIsFire();
+        IN_FIRE = new DamageSource("inFire").bypassArmor().setIsFire();
         LIGHTNING_BOLT = new DamageSource("lightningBolt");
         ON_FIRE = new DamageSource("onFire").bypassArmor().setIsFire();
         LAVA = new DamageSource("lava").setIsFire();
@@ -243,7 +254,6 @@ public class DamageSource {
         ANVIL = new DamageSource("anvil");
         FALLING_BLOCK = new DamageSource("fallingBlock");
         DRAGON_BREATH = new DamageSource("dragonBreath").bypassArmor();
-        FIREWORKS = new DamageSource("fireworks").setExplosion();
         DRY_OUT = new DamageSource("dryout");
         SWEET_BERRY_BUSH = new DamageSource("sweetBerryBush");
     }
diff --git a/src/net/minecraft/world/damagesource/EntityDamageSource.java b/src/net/minecraft/world/damagesource/EntityDamageSource.java
index fc766d1..144823a 100644
--- a/src/net/minecraft/world/damagesource/EntityDamageSource.java
+++ b/src/net/minecraft/world/damagesource/EntityDamageSource.java
@@ -14,9 +14,9 @@ public class EntityDamageSource extends DamageSource {
     protected final Entity entity;
     private boolean isThorns;
     
-    public EntityDamageSource(final String string, @Nullable final Entity akq) {
+    public EntityDamageSource(final String string, @Nullable final Entity aom) {
         super(string);
-        this.entity = akq;
+        this.entity = aom;
     }
     
     public EntityDamageSource setThorns() {
@@ -35,13 +35,13 @@ public class EntityDamageSource extends DamageSource {
     }
     
     @Override
-    public Component getLocalizedDeathMessage(final LivingEntity akz) {
-        final ItemStack ben3 = (this.entity instanceof LivingEntity) ? ((LivingEntity)this.entity).getMainHandItem() : ItemStack.EMPTY;
+    public Component getLocalizedDeathMessage(final LivingEntity aoy) {
+        final ItemStack bki3 = (this.entity instanceof LivingEntity) ? ((LivingEntity)this.entity).getMainHandItem() : ItemStack.EMPTY;
         final String string4 = "death.attack." + this.msgId;
-        if (!ben3.isEmpty() && ben3.hasCustomHoverName()) {
-            return new TranslatableComponent(string4 + ".item", new Object[] { akz.getDisplayName(), this.entity.getDisplayName(), ben3.getDisplayName() });
+        if (!bki3.isEmpty() && bki3.hasCustomHoverName()) {
+            return new TranslatableComponent(string4 + ".item", new Object[] { aoy.getDisplayName(), this.entity.getDisplayName(), bki3.getDisplayName() });
         }
-        return new TranslatableComponent(string4, new Object[] { akz.getDisplayName(), this.entity.getDisplayName() });
+        return new TranslatableComponent(string4, new Object[] { aoy.getDisplayName(), this.entity.getDisplayName() });
     }
     
     @Override
@@ -54,4 +54,9 @@ public class EntityDamageSource extends DamageSource {
     public Vec3 getSourcePosition() {
         return (this.entity != null) ? this.entity.position() : null;
     }
+    
+    @Override
+    public String toString() {
+        return "EntityDamageSource (" + this.entity + ")";
+    }
 }
diff --git a/src/net/minecraft/world/damagesource/IndirectEntityDamageSource.java b/src/net/minecraft/world/damagesource/IndirectEntityDamageSource.java
index 3be3567..6777f3b 100644
--- a/src/net/minecraft/world/damagesource/IndirectEntityDamageSource.java
+++ b/src/net/minecraft/world/damagesource/IndirectEntityDamageSource.java
@@ -10,9 +10,9 @@ import net.minecraft.world.entity.Entity;
 public class IndirectEntityDamageSource extends EntityDamageSource {
     private final Entity owner;
     
-    public IndirectEntityDamageSource(final String string, final Entity akq2, @Nullable final Entity akq3) {
-        super(string, akq2);
-        this.owner = akq3;
+    public IndirectEntityDamageSource(final String string, final Entity aom2, @Nullable final Entity aom3) {
+        super(string, aom2);
+        this.owner = aom3;
     }
     
     @Nullable
@@ -28,14 +28,14 @@ public class IndirectEntityDamageSource extends EntityDamageSource {
     }
     
     @Override
-    public Component getLocalizedDeathMessage(final LivingEntity akz) {
-        final Component lf3 = (this.owner == null) ? this.entity.getDisplayName() : this.owner.getDisplayName();
-        final ItemStack ben4 = (this.owner instanceof LivingEntity) ? ((LivingEntity)this.owner).getMainHandItem() : ItemStack.EMPTY;
+    public Component getLocalizedDeathMessage(final LivingEntity aoy) {
+        final Component mr3 = (this.owner == null) ? this.entity.getDisplayName() : this.owner.getDisplayName();
+        final ItemStack bki4 = (this.owner instanceof LivingEntity) ? ((LivingEntity)this.owner).getMainHandItem() : ItemStack.EMPTY;
         final String string5 = "death.attack." + this.msgId;
         final String string6 = string5 + ".item";
-        if (!ben4.isEmpty() && ben4.hasCustomHoverName()) {
-            return new TranslatableComponent(string6, new Object[] { akz.getDisplayName(), lf3, ben4.getDisplayName() });
+        if (!bki4.isEmpty() && bki4.hasCustomHoverName()) {
+            return new TranslatableComponent(string6, new Object[] { aoy.getDisplayName(), mr3, bki4.getDisplayName() });
         }
-        return new TranslatableComponent(string5, new Object[] { akz.getDisplayName(), lf3 });
+        return new TranslatableComponent(string5, new Object[] { aoy.getDisplayName(), mr3 });
     }
 }
diff --git a/src/net/minecraft/world/damagesource/NetherBedDamage.java b/src/net/minecraft/world/damagesource/NetherBedDamage.java
deleted file mode 100644
index 6f34dde..0000000
--- a/src/net/minecraft/world/damagesource/NetherBedDamage.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package net.minecraft.world.damagesource;
-
-import net.minecraft.network.chat.Style;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.ComponentUtils;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.entity.LivingEntity;
-
-public class NetherBedDamage extends DamageSource {
-    protected NetherBedDamage() {
-        super("netherBed");
-        this.setScalesWithDifficulty();
-        this.setExplosion();
-    }
-    
-    @Override
-    public Component getLocalizedDeathMessage(final LivingEntity akz) {
-        final HoverEvent hoverEvent;
-        final Object o;
-        final Component lf3 = ComponentUtils.wrapInSquareBrackets(new TranslatableComponent("death.attack.netherBed.link", new Object[0])).withStyle(ln -> {
-            ln.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://bugs.mojang.com/browse/MCPE-28723"));
-            new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent("MCPE-28723"));
-            ((Style)o).setHoverEvent(hoverEvent);
-            return;
-        });
-        return new TranslatableComponent("death.attack.netherBed.message", new Object[] { akz.getDisplayName(), lf3 });
-    }
-}
diff --git a/src/net/minecraft/world/effect/AbsoptionMobEffect.java b/src/net/minecraft/world/effect/AbsoptionMobEffect.java
index 370606a..b18a63f 100644
--- a/src/net/minecraft/world/effect/AbsoptionMobEffect.java
+++ b/src/net/minecraft/world/effect/AbsoptionMobEffect.java
@@ -1,22 +1,22 @@
 package net.minecraft.world.effect;
 
-import net.minecraft.world.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.world.entity.ai.attributes.AttributeMap;
 import net.minecraft.world.entity.LivingEntity;
 
 public class AbsoptionMobEffect extends MobEffect {
-    protected AbsoptionMobEffect(final MobEffectCategory akj, final int integer) {
-        super(akj, integer);
+    protected AbsoptionMobEffect(final MobEffectCategory aof, final int integer) {
+        super(aof, integer);
     }
     
     @Override
-    public void removeAttributeModifiers(final LivingEntity akz, final BaseAttributeMap alu, final int integer) {
-        akz.setAbsorptionAmount(akz.getAbsorptionAmount() - 4 * (integer + 1));
-        super.removeAttributeModifiers(akz, alu, integer);
+    public void removeAttributeModifiers(final LivingEntity aoy, final AttributeMap apu, final int integer) {
+        aoy.setAbsorptionAmount(aoy.getAbsorptionAmount() - 4 * (integer + 1));
+        super.removeAttributeModifiers(aoy, apu, integer);
     }
     
     @Override
-    public void addAttributeModifiers(final LivingEntity akz, final BaseAttributeMap alu, final int integer) {
-        akz.setAbsorptionAmount(akz.getAbsorptionAmount() + 4 * (integer + 1));
-        super.addAttributeModifiers(akz, alu, integer);
+    public void addAttributeModifiers(final LivingEntity aoy, final AttributeMap apu, final int integer) {
+        aoy.setAbsorptionAmount(aoy.getAbsorptionAmount() + 4 * (integer + 1));
+        super.addAttributeModifiers(aoy, apu, integer);
     }
 }
diff --git a/src/net/minecraft/world/effect/AttackDamageMobEffect.java b/src/net/minecraft/world/effect/AttackDamageMobEffect.java
index e4b8f7a..dcfa46b 100644
--- a/src/net/minecraft/world/effect/AttackDamageMobEffect.java
+++ b/src/net/minecraft/world/effect/AttackDamageMobEffect.java
@@ -5,13 +5,13 @@ import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 public class AttackDamageMobEffect extends MobEffect {
     protected final double multiplier;
     
-    protected AttackDamageMobEffect(final MobEffectCategory akj, final int integer, final double double3) {
-        super(akj, integer);
+    protected AttackDamageMobEffect(final MobEffectCategory aof, final int integer, final double double3) {
+        super(aof, integer);
         this.multiplier = double3;
     }
     
     @Override
-    public double getAttributeModifierValue(final int integer, final AttributeModifier als) {
+    public double getAttributeModifierValue(final int integer, final AttributeModifier apv) {
         return this.multiplier * (integer + 1);
     }
 }
diff --git a/src/net/minecraft/world/effect/HealthBoostMobEffect.java b/src/net/minecraft/world/effect/HealthBoostMobEffect.java
index d4026b6..2fa6a4e 100644
--- a/src/net/minecraft/world/effect/HealthBoostMobEffect.java
+++ b/src/net/minecraft/world/effect/HealthBoostMobEffect.java
@@ -1,18 +1,18 @@
 package net.minecraft.world.effect;
 
-import net.minecraft.world.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.world.entity.ai.attributes.AttributeMap;
 import net.minecraft.world.entity.LivingEntity;
 
 public class HealthBoostMobEffect extends MobEffect {
-    public HealthBoostMobEffect(final MobEffectCategory akj, final int integer) {
-        super(akj, integer);
+    public HealthBoostMobEffect(final MobEffectCategory aof, final int integer) {
+        super(aof, integer);
     }
     
     @Override
-    public void removeAttributeModifiers(final LivingEntity akz, final BaseAttributeMap alu, final int integer) {
-        super.removeAttributeModifiers(akz, alu, integer);
-        if (akz.getHealth() > akz.getMaxHealth()) {
-            akz.setHealth(akz.getMaxHealth());
+    public void removeAttributeModifiers(final LivingEntity aoy, final AttributeMap apu, final int integer) {
+        super.removeAttributeModifiers(aoy, apu, integer);
+        if (aoy.getHealth() > aoy.getMaxHealth()) {
+            aoy.setHealth(aoy.getMaxHealth());
         }
     }
 }
diff --git a/src/net/minecraft/world/effect/InstantenousMobEffect.java b/src/net/minecraft/world/effect/InstantenousMobEffect.java
index 378a81e..a8cdd78 100644
--- a/src/net/minecraft/world/effect/InstantenousMobEffect.java
+++ b/src/net/minecraft/world/effect/InstantenousMobEffect.java
@@ -1,8 +1,8 @@
 package net.minecraft.world.effect;
 
 public class InstantenousMobEffect extends MobEffect {
-    public InstantenousMobEffect(final MobEffectCategory akj, final int integer) {
-        super(akj, integer);
+    public InstantenousMobEffect(final MobEffectCategory aof, final int integer) {
+        super(aof, integer);
     }
     
     @Override
diff --git a/src/net/minecraft/world/effect/MobEffect.java b/src/net/minecraft/world/effect/MobEffect.java
index e954ddc..c55312e 100644
--- a/src/net/minecraft/world/effect/MobEffect.java
+++ b/src/net/minecraft/world/effect/MobEffect.java
@@ -2,7 +2,7 @@ package net.minecraft.world.effect;
 
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import java.util.Iterator;
-import net.minecraft.world.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.world.entity.ai.attributes.AttributeMap;
 import java.util.UUID;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
@@ -30,62 +30,62 @@ public class MobEffect {
         return Registry.MOB_EFFECT.byId(integer);
     }
     
-    public static int getId(final MobEffect aki) {
-        return Registry.MOB_EFFECT.getId(aki);
+    public static int getId(final MobEffect aoe) {
+        return Registry.MOB_EFFECT.getId(aoe);
     }
     
-    protected MobEffect(final MobEffectCategory akj, final int integer) {
+    protected MobEffect(final MobEffectCategory aof, final int integer) {
         this.attributeModifiers = Maps.newHashMap();
-        this.category = akj;
+        this.category = aof;
         this.color = integer;
     }
     
-    public void applyEffectTick(final LivingEntity akz, final int integer) {
+    public void applyEffectTick(final LivingEntity aoy, final int integer) {
         if (this == MobEffects.REGENERATION) {
-            if (akz.getHealth() < akz.getMaxHealth()) {
-                akz.heal(1.0f);
+            if (aoy.getHealth() < aoy.getMaxHealth()) {
+                aoy.heal(1.0f);
             }
         }
         else if (this == MobEffects.POISON) {
-            if (akz.getHealth() > 1.0f) {
-                akz.hurt(DamageSource.MAGIC, 1.0f);
+            if (aoy.getHealth() > 1.0f) {
+                aoy.hurt(DamageSource.MAGIC, 1.0f);
             }
         }
         else if (this == MobEffects.WITHER) {
-            akz.hurt(DamageSource.WITHER, 1.0f);
+            aoy.hurt(DamageSource.WITHER, 1.0f);
         }
-        else if (this == MobEffects.HUNGER && akz instanceof Player) {
-            ((Player)akz).causeFoodExhaustion(0.005f * (integer + 1));
+        else if (this == MobEffects.HUNGER && aoy instanceof Player) {
+            ((Player)aoy).causeFoodExhaustion(0.005f * (integer + 1));
         }
-        else if (this == MobEffects.SATURATION && akz instanceof Player) {
-            if (!akz.level.isClientSide) {
-                ((Player)akz).getFoodData().eat(integer + 1, 1.0f);
+        else if (this == MobEffects.SATURATION && aoy instanceof Player) {
+            if (!aoy.level.isClientSide) {
+                ((Player)aoy).getFoodData().eat(integer + 1, 1.0f);
             }
         }
-        else if ((this == MobEffects.HEAL && !akz.isInvertedHealAndHarm()) || (this == MobEffects.HARM && akz.isInvertedHealAndHarm())) {
-            akz.heal((float)Math.max(4 << integer, 0));
+        else if ((this == MobEffects.HEAL && !aoy.isInvertedHealAndHarm()) || (this == MobEffects.HARM && aoy.isInvertedHealAndHarm())) {
+            aoy.heal((float)Math.max(4 << integer, 0));
         }
-        else if ((this == MobEffects.HARM && !akz.isInvertedHealAndHarm()) || (this == MobEffects.HEAL && akz.isInvertedHealAndHarm())) {
-            akz.hurt(DamageSource.MAGIC, (float)(6 << integer));
+        else if ((this == MobEffects.HARM && !aoy.isInvertedHealAndHarm()) || (this == MobEffects.HEAL && aoy.isInvertedHealAndHarm())) {
+            aoy.hurt(DamageSource.MAGIC, (float)(6 << integer));
         }
     }
     
-    public void applyInstantenousEffect(@Nullable final Entity akq1, @Nullable final Entity akq2, final LivingEntity akz, final int integer, final double double5) {
-        if ((this == MobEffects.HEAL && !akz.isInvertedHealAndHarm()) || (this == MobEffects.HARM && akz.isInvertedHealAndHarm())) {
+    public void applyInstantenousEffect(@Nullable final Entity aom1, @Nullable final Entity aom2, final LivingEntity aoy, final int integer, final double double5) {
+        if ((this == MobEffects.HEAL && !aoy.isInvertedHealAndHarm()) || (this == MobEffects.HARM && aoy.isInvertedHealAndHarm())) {
             final int integer2 = (int)(double5 * (4 << integer) + 0.5);
-            akz.heal((float)integer2);
+            aoy.heal((float)integer2);
         }
-        else if ((this == MobEffects.HARM && !akz.isInvertedHealAndHarm()) || (this == MobEffects.HEAL && akz.isInvertedHealAndHarm())) {
+        else if ((this == MobEffects.HARM && !aoy.isInvertedHealAndHarm()) || (this == MobEffects.HEAL && aoy.isInvertedHealAndHarm())) {
             final int integer2 = (int)(double5 * (6 << integer) + 0.5);
-            if (akq1 == null) {
-                akz.hurt(DamageSource.MAGIC, (float)integer2);
+            if (aom1 == null) {
+                aoy.hurt(DamageSource.MAGIC, (float)integer2);
             }
             else {
-                akz.hurt(DamageSource.indirectMagic(akq1, akq2), (float)integer2);
+                aoy.hurt(DamageSource.indirectMagic(aom1, aom2), (float)integer2);
             }
         }
         else {
-            this.applyEffectTick(akz, integer);
+            this.applyEffectTick(aoy, integer);
         }
     }
     
@@ -121,7 +121,7 @@ public class MobEffect {
     }
     
     public Component getDisplayName() {
-        return new TranslatableComponent(this.getDescriptionId(), new Object[0]);
+        return new TranslatableComponent(this.getDescriptionId());
     }
     
     public MobEffectCategory getCategory() {
@@ -132,9 +132,9 @@ public class MobEffect {
         return this.color;
     }
     
-    public MobEffect addAttributeModifier(final Attribute alq, final String string, final double double3, final AttributeModifier.Operation a) {
-        final AttributeModifier als7 = new AttributeModifier(UUID.fromString(string), this::getDescriptionId, double3, a);
-        this.attributeModifiers.put(alq, als7);
+    public MobEffect addAttributeModifier(final Attribute aps, final String string, final double double3, final AttributeModifier.Operation a) {
+        final AttributeModifier apv7 = new AttributeModifier(UUID.fromString(string), this::getDescriptionId, double3, a);
+        this.attributeModifiers.put(aps, apv7);
         return this;
     }
     
@@ -142,28 +142,28 @@ public class MobEffect {
         return this.attributeModifiers;
     }
     
-    public void removeAttributeModifiers(final LivingEntity akz, final BaseAttributeMap alu, final int integer) {
+    public void removeAttributeModifiers(final LivingEntity aoy, final AttributeMap apu, final int integer) {
         for (final Map.Entry<Attribute, AttributeModifier> entry6 : this.attributeModifiers.entrySet()) {
-            final AttributeInstance alr7 = alu.getInstance(entry6.getKey());
-            if (alr7 != null) {
-                alr7.removeModifier(entry6.getValue());
+            final AttributeInstance apt7 = apu.getInstance(entry6.getKey());
+            if (apt7 != null) {
+                apt7.removeModifier(entry6.getValue());
             }
         }
     }
     
-    public void addAttributeModifiers(final LivingEntity akz, final BaseAttributeMap alu, final int integer) {
+    public void addAttributeModifiers(final LivingEntity aoy, final AttributeMap apu, final int integer) {
         for (final Map.Entry<Attribute, AttributeModifier> entry6 : this.attributeModifiers.entrySet()) {
-            final AttributeInstance alr7 = alu.getInstance(entry6.getKey());
-            if (alr7 != null) {
-                final AttributeModifier als8 = entry6.getValue();
-                alr7.removeModifier(als8);
-                alr7.addModifier(new AttributeModifier(als8.getId(), this.getDescriptionId() + " " + integer, this.getAttributeModifierValue(integer, als8), als8.getOperation()));
+            final AttributeInstance apt7 = apu.getInstance(entry6.getKey());
+            if (apt7 != null) {
+                final AttributeModifier apv8 = entry6.getValue();
+                apt7.removeModifier(apv8);
+                apt7.addPermanentModifier(new AttributeModifier(apv8.getId(), this.getDescriptionId() + " " + integer, this.getAttributeModifierValue(integer, apv8), apv8.getOperation()));
             }
         }
     }
     
-    public double getAttributeModifierValue(final int integer, final AttributeModifier als) {
-        return als.getAmount() * (integer + 1);
+    public double getAttributeModifierValue(final int integer, final AttributeModifier apv) {
+        return apv.getAmount() * (integer + 1);
     }
     
     public boolean isBeneficial() {
diff --git a/src/net/minecraft/world/effect/MobEffectCategory.java b/src/net/minecraft/world/effect/MobEffectCategory.java
index ee675ec..08848a7 100644
--- a/src/net/minecraft/world/effect/MobEffectCategory.java
+++ b/src/net/minecraft/world/effect/MobEffectCategory.java
@@ -9,8 +9,8 @@ public enum MobEffectCategory {
     
     private final ChatFormatting tooltipFormatting;
     
-    private MobEffectCategory(final ChatFormatting g) {
-        this.tooltipFormatting = g;
+    private MobEffectCategory(final ChatFormatting i) {
+        this.tooltipFormatting = i;
     }
     
     public ChatFormatting getTooltipFormatting() {
diff --git a/src/net/minecraft/world/effect/MobEffectInstance.java b/src/net/minecraft/world/effect/MobEffectInstance.java
index 2b1f480..797c6bc 100644
--- a/src/net/minecraft/world/effect/MobEffectInstance.java
+++ b/src/net/minecraft/world/effect/MobEffectInstance.java
@@ -21,86 +21,86 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
     @Nullable
     private MobEffectInstance hiddenEffect;
     
-    public MobEffectInstance(final MobEffect aki) {
-        this(aki, 0, 0);
+    public MobEffectInstance(final MobEffect aoe) {
+        this(aoe, 0, 0);
     }
     
-    public MobEffectInstance(final MobEffect aki, final int integer) {
-        this(aki, integer, 0);
+    public MobEffectInstance(final MobEffect aoe, final int integer) {
+        this(aoe, integer, 0);
     }
     
-    public MobEffectInstance(final MobEffect aki, final int integer2, final int integer3) {
-        this(aki, integer2, integer3, false, true);
+    public MobEffectInstance(final MobEffect aoe, final int integer2, final int integer3) {
+        this(aoe, integer2, integer3, false, true);
     }
     
-    public MobEffectInstance(final MobEffect aki, final int integer2, final int integer3, final boolean boolean4, final boolean boolean5) {
-        this(aki, integer2, integer3, boolean4, boolean5, boolean5);
+    public MobEffectInstance(final MobEffect aoe, final int integer2, final int integer3, final boolean boolean4, final boolean boolean5) {
+        this(aoe, integer2, integer3, boolean4, boolean5, boolean5);
     }
     
-    public MobEffectInstance(final MobEffect aki, final int integer2, final int integer3, final boolean boolean4, final boolean boolean5, final boolean boolean6) {
-        this(aki, integer2, integer3, boolean4, boolean5, boolean6, null);
+    public MobEffectInstance(final MobEffect aoe, final int integer2, final int integer3, final boolean boolean4, final boolean boolean5, final boolean boolean6) {
+        this(aoe, integer2, integer3, boolean4, boolean5, boolean6, null);
     }
     
-    public MobEffectInstance(final MobEffect aki, final int integer2, final int integer3, final boolean boolean4, final boolean boolean5, final boolean boolean6, @Nullable final MobEffectInstance akk) {
-        this.effect = aki;
+    public MobEffectInstance(final MobEffect aoe, final int integer2, final int integer3, final boolean boolean4, final boolean boolean5, final boolean boolean6, @Nullable final MobEffectInstance aog) {
+        this.effect = aoe;
         this.duration = integer2;
         this.amplifier = integer3;
         this.ambient = boolean4;
         this.visible = boolean5;
         this.showIcon = boolean6;
-        this.hiddenEffect = akk;
+        this.hiddenEffect = aog;
     }
     
-    public MobEffectInstance(final MobEffectInstance akk) {
-        this.effect = akk.effect;
-        this.setDetailsFrom(akk);
+    public MobEffectInstance(final MobEffectInstance aog) {
+        this.effect = aog.effect;
+        this.setDetailsFrom(aog);
     }
     
-    void setDetailsFrom(final MobEffectInstance akk) {
-        this.duration = akk.duration;
-        this.amplifier = akk.amplifier;
-        this.ambient = akk.ambient;
-        this.visible = akk.visible;
-        this.showIcon = akk.showIcon;
+    void setDetailsFrom(final MobEffectInstance aog) {
+        this.duration = aog.duration;
+        this.amplifier = aog.amplifier;
+        this.ambient = aog.ambient;
+        this.visible = aog.visible;
+        this.showIcon = aog.showIcon;
     }
     
-    public boolean update(final MobEffectInstance akk) {
-        if (this.effect != akk.effect) {
+    public boolean update(final MobEffectInstance aog) {
+        if (this.effect != aog.effect) {
             MobEffectInstance.LOGGER.warn("This method should only be called for matching effects!");
         }
         boolean boolean3 = false;
-        if (akk.amplifier > this.amplifier) {
-            if (akk.duration < this.duration) {
-                final MobEffectInstance akk2 = this.hiddenEffect;
+        if (aog.amplifier > this.amplifier) {
+            if (aog.duration < this.duration) {
+                final MobEffectInstance aog2 = this.hiddenEffect;
                 this.hiddenEffect = new MobEffectInstance(this);
-                this.hiddenEffect.hiddenEffect = akk2;
+                this.hiddenEffect.hiddenEffect = aog2;
             }
-            this.amplifier = akk.amplifier;
-            this.duration = akk.duration;
+            this.amplifier = aog.amplifier;
+            this.duration = aog.duration;
             boolean3 = true;
         }
-        else if (akk.duration > this.duration) {
-            if (akk.amplifier == this.amplifier) {
-                this.duration = akk.duration;
+        else if (aog.duration > this.duration) {
+            if (aog.amplifier == this.amplifier) {
+                this.duration = aog.duration;
                 boolean3 = true;
             }
             else if (this.hiddenEffect == null) {
-                this.hiddenEffect = new MobEffectInstance(akk);
+                this.hiddenEffect = new MobEffectInstance(aog);
             }
             else {
-                this.hiddenEffect.update(akk);
+                this.hiddenEffect.update(aog);
             }
         }
-        if ((!akk.ambient && this.ambient) || boolean3) {
-            this.ambient = akk.ambient;
+        if ((!aog.ambient && this.ambient) || boolean3) {
+            this.ambient = aog.ambient;
             boolean3 = true;
         }
-        if (akk.visible != this.visible) {
-            this.visible = akk.visible;
+        if (aog.visible != this.visible) {
+            this.visible = aog.visible;
             boolean3 = true;
         }
-        if (akk.showIcon != this.showIcon) {
-            this.showIcon = akk.showIcon;
+        if (aog.showIcon != this.showIcon) {
+            this.showIcon = aog.showIcon;
             boolean3 = true;
         }
         return boolean3;
@@ -130,10 +130,10 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
         return this.showIcon;
     }
     
-    public boolean tick(final LivingEntity akz, final Runnable runnable) {
+    public boolean tick(final LivingEntity aoy, final Runnable runnable) {
         if (this.duration > 0) {
             if (this.effect.isDurationEffectTick(this.duration, this.amplifier)) {
-                this.applyEffect(akz);
+                this.applyEffect(aoy);
             }
             this.tickDownDuration();
             if (this.duration == 0 && this.hiddenEffect != null) {
@@ -152,9 +152,9 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
         return --this.duration;
     }
     
-    public void applyEffect(final LivingEntity akz) {
+    public void applyEffect(final LivingEntity aoy) {
         if (this.duration > 0) {
-            this.effect.applyEffectTick(akz, this.amplifier);
+            this.effect.applyEffectTick(aoy, this.amplifier);
         }
     }
     
@@ -189,8 +189,8 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
             return true;
         }
         if (object instanceof MobEffectInstance) {
-            final MobEffectInstance akk3 = (MobEffectInstance)object;
-            return this.duration == akk3.duration && this.amplifier == akk3.amplifier && this.splash == akk3.splash && this.ambient == akk3.ambient && this.effect.equals(akk3.effect);
+            final MobEffectInstance aog3 = (MobEffectInstance)object;
+            return this.duration == aog3.duration && this.amplifier == aog3.amplifier && this.splash == aog3.splash && this.ambient == aog3.ambient && this.effect.equals(aog3.effect);
         }
         return false;
     }
@@ -205,51 +205,51 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
         return integer2;
     }
     
-    public CompoundTag save(final CompoundTag jt) {
-        jt.putByte("Id", (byte)MobEffect.getId(this.getEffect()));
-        this.writeDetailsTo(jt);
-        return jt;
+    public CompoundTag save(final CompoundTag le) {
+        le.putByte("Id", (byte)MobEffect.getId(this.getEffect()));
+        this.writeDetailsTo(le);
+        return le;
     }
     
-    private void writeDetailsTo(final CompoundTag jt) {
-        jt.putByte("Amplifier", (byte)this.getAmplifier());
-        jt.putInt("Duration", this.getDuration());
-        jt.putBoolean("Ambient", this.isAmbient());
-        jt.putBoolean("ShowParticles", this.isVisible());
-        jt.putBoolean("ShowIcon", this.showIcon());
+    private void writeDetailsTo(final CompoundTag le) {
+        le.putByte("Amplifier", (byte)this.getAmplifier());
+        le.putInt("Duration", this.getDuration());
+        le.putBoolean("Ambient", this.isAmbient());
+        le.putBoolean("ShowParticles", this.isVisible());
+        le.putBoolean("ShowIcon", this.showIcon());
         if (this.hiddenEffect != null) {
-            final CompoundTag jt2 = new CompoundTag();
-            this.hiddenEffect.save(jt2);
-            jt.put("HiddenEffect", jt2);
+            final CompoundTag le2 = new CompoundTag();
+            this.hiddenEffect.save(le2);
+            le.put("HiddenEffect", le2);
         }
     }
     
-    public static MobEffectInstance load(final CompoundTag jt) {
-        final int integer2 = jt.getByte("Id");
-        final MobEffect aki3 = MobEffect.byId(integer2);
-        if (aki3 == null) {
+    public static MobEffectInstance load(final CompoundTag le) {
+        final int integer2 = le.getByte("Id");
+        final MobEffect aoe3 = MobEffect.byId(integer2);
+        if (aoe3 == null) {
             return null;
         }
-        return loadSpecifiedEffect(aki3, jt);
+        return loadSpecifiedEffect(aoe3, le);
     }
     
-    private static MobEffectInstance loadSpecifiedEffect(final MobEffect aki, final CompoundTag jt) {
-        final int integer3 = jt.getByte("Amplifier");
-        final int integer4 = jt.getInt("Duration");
-        final boolean boolean5 = jt.getBoolean("Ambient");
+    private static MobEffectInstance loadSpecifiedEffect(final MobEffect aoe, final CompoundTag le) {
+        final int integer3 = le.getByte("Amplifier");
+        final int integer4 = le.getInt("Duration");
+        final boolean boolean5 = le.getBoolean("Ambient");
         boolean boolean6 = true;
-        if (jt.contains("ShowParticles", 1)) {
-            boolean6 = jt.getBoolean("ShowParticles");
+        if (le.contains("ShowParticles", 1)) {
+            boolean6 = le.getBoolean("ShowParticles");
         }
         boolean boolean7 = boolean6;
-        if (jt.contains("ShowIcon", 1)) {
-            boolean7 = jt.getBoolean("ShowIcon");
+        if (le.contains("ShowIcon", 1)) {
+            boolean7 = le.getBoolean("ShowIcon");
         }
-        MobEffectInstance akk8 = null;
-        if (jt.contains("HiddenEffect", 10)) {
-            akk8 = loadSpecifiedEffect(aki, jt.getCompound("HiddenEffect"));
+        MobEffectInstance aog8 = null;
+        if (le.contains("HiddenEffect", 10)) {
+            aog8 = loadSpecifiedEffect(aoe, le.getCompound("HiddenEffect"));
         }
-        return new MobEffectInstance(aki, integer4, (integer3 < 0) ? 0 : integer3, boolean5, boolean6, boolean7, akk8);
+        return new MobEffectInstance(aoe, integer4, (integer3 < 0) ? 0 : integer3, boolean5, boolean6, boolean7, aog8);
     }
     
     public void setNoCounter(final boolean boolean1) {
@@ -261,12 +261,12 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
     }
     
     @Override
-    public int compareTo(final MobEffectInstance akk) {
+    public int compareTo(final MobEffectInstance aog) {
         final int integer3 = 32147;
-        if ((this.getDuration() > 32147 && akk.getDuration() > 32147) || (this.isAmbient() && akk.isAmbient())) {
-            return ComparisonChain.start().compare(this.isAmbient(), akk.isAmbient()).compare(this.getEffect().getColor(), akk.getEffect().getColor()).result();
+        if ((this.getDuration() > 32147 && aog.getDuration() > 32147) || (this.isAmbient() && aog.isAmbient())) {
+            return ComparisonChain.start().compare(this.isAmbient(), aog.isAmbient()).compare(this.getEffect().getColor(), aog.getEffect().getColor()).result();
         }
-        return ComparisonChain.start().compare(this.isAmbient(), akk.isAmbient()).compare(this.getDuration(), akk.getDuration()).compare(this.getEffect().getColor(), akk.getEffect().getColor()).result();
+        return ComparisonChain.start().compare(this.isAmbient(), aog.isAmbient()).compare(this.getDuration(), aog.getDuration()).compare(this.getEffect().getColor(), aog.getEffect().getColor()).result();
     }
     
     static {
diff --git a/src/net/minecraft/world/effect/MobEffectUtil.java b/src/net/minecraft/world/effect/MobEffectUtil.java
index 9703d78..3e958c5 100644
--- a/src/net/minecraft/world/effect/MobEffectUtil.java
+++ b/src/net/minecraft/world/effect/MobEffectUtil.java
@@ -5,31 +5,31 @@ import net.minecraft.util.StringUtil;
 import net.minecraft.util.Mth;
 
 public final class MobEffectUtil {
-    public static String formatDuration(final MobEffectInstance akk, final float float2) {
-        if (akk.isNoCounter()) {
+    public static String formatDuration(final MobEffectInstance aog, final float float2) {
+        if (aog.isNoCounter()) {
             return "**:**";
         }
-        final int integer3 = Mth.floor(akk.getDuration() * float2);
+        final int integer3 = Mth.floor(aog.getDuration() * float2);
         return StringUtil.formatTickDuration(integer3);
     }
     
-    public static boolean hasDigSpeed(final LivingEntity akz) {
-        return akz.hasEffect(MobEffects.DIG_SPEED) || akz.hasEffect(MobEffects.CONDUIT_POWER);
+    public static boolean hasDigSpeed(final LivingEntity aoy) {
+        return aoy.hasEffect(MobEffects.DIG_SPEED) || aoy.hasEffect(MobEffects.CONDUIT_POWER);
     }
     
-    public static int getDigSpeedAmplification(final LivingEntity akz) {
+    public static int getDigSpeedAmplification(final LivingEntity aoy) {
         int integer2 = 0;
         int integer3 = 0;
-        if (akz.hasEffect(MobEffects.DIG_SPEED)) {
-            integer2 = akz.getEffect(MobEffects.DIG_SPEED).getAmplifier();
+        if (aoy.hasEffect(MobEffects.DIG_SPEED)) {
+            integer2 = aoy.getEffect(MobEffects.DIG_SPEED).getAmplifier();
         }
-        if (akz.hasEffect(MobEffects.CONDUIT_POWER)) {
-            integer3 = akz.getEffect(MobEffects.CONDUIT_POWER).getAmplifier();
+        if (aoy.hasEffect(MobEffects.CONDUIT_POWER)) {
+            integer3 = aoy.getEffect(MobEffects.CONDUIT_POWER).getAmplifier();
         }
         return Math.max(integer2, integer3);
     }
     
-    public static boolean hasWaterBreathing(final LivingEntity akz) {
-        return akz.hasEffect(MobEffects.WATER_BREATHING) || akz.hasEffect(MobEffects.CONDUIT_POWER);
+    public static boolean hasWaterBreathing(final LivingEntity aoy) {
+        return aoy.hasEffect(MobEffects.WATER_BREATHING) || aoy.hasEffect(MobEffects.CONDUIT_POWER);
     }
 }
diff --git a/src/net/minecraft/world/effect/MobEffects.java b/src/net/minecraft/world/effect/MobEffects.java
index 86dd32d..aec90cf 100644
--- a/src/net/minecraft/world/effect/MobEffects.java
+++ b/src/net/minecraft/world/effect/MobEffects.java
@@ -1,13 +1,11 @@
 package net.minecraft.world.effect;
 
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.Difficulty;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.core.Registry;
 
 public class MobEffects {
@@ -44,16 +42,16 @@ public class MobEffects {
     public static final MobEffect BAD_OMEN;
     public static final MobEffect HERO_OF_THE_VILLAGE;
     
-    private static MobEffect register(final int integer, final String string, final MobEffect aki) {
-        return Registry.<MobEffect>registerMapping(Registry.MOB_EFFECT, integer, string, aki);
+    private static MobEffect register(final int integer, final String string, final MobEffect aoe) {
+        return Registry.<MobEffect, MobEffect>registerMapping(Registry.MOB_EFFECT, integer, string, aoe);
     }
     
     static {
-        MOVEMENT_SPEED = register(1, "speed", new MobEffect(MobEffectCategory.BENEFICIAL, 8171462).addAttributeModifier(SharedMonsterAttributes.MOVEMENT_SPEED, "91AEAA56-376B-4498-935B-2F7F68070635", 0.20000000298023224, AttributeModifier.Operation.MULTIPLY_TOTAL));
-        MOVEMENT_SLOWDOWN = register(2, "slowness", new MobEffect(MobEffectCategory.HARMFUL, 5926017).addAttributeModifier(SharedMonsterAttributes.MOVEMENT_SPEED, "7107DE5E-7CE8-4030-940E-514C1F160890", -0.15000000596046448, AttributeModifier.Operation.MULTIPLY_TOTAL));
-        DIG_SPEED = register(3, "haste", new MobEffect(MobEffectCategory.BENEFICIAL, 14270531).addAttributeModifier(SharedMonsterAttributes.ATTACK_SPEED, "AF8B6E3F-3328-4C0A-AA36-5BA2BB9DBEF3", 0.10000000149011612, AttributeModifier.Operation.MULTIPLY_TOTAL));
-        DIG_SLOWDOWN = register(4, "mining_fatigue", new MobEffect(MobEffectCategory.HARMFUL, 4866583).addAttributeModifier(SharedMonsterAttributes.ATTACK_SPEED, "55FCED67-E92A-486E-9800-B47F202C4386", -0.10000000149011612, AttributeModifier.Operation.MULTIPLY_TOTAL));
-        DAMAGE_BOOST = register(5, "strength", new AttackDamageMobEffect(MobEffectCategory.BENEFICIAL, 9643043, 3.0).addAttributeModifier(SharedMonsterAttributes.ATTACK_DAMAGE, "648D7064-6A60-4F59-8ABE-C2C23A6DD7A9", 0.0, AttributeModifier.Operation.ADDITION));
+        MOVEMENT_SPEED = register(1, "speed", new MobEffect(MobEffectCategory.BENEFICIAL, 8171462).addAttributeModifier(Attributes.MOVEMENT_SPEED, "91AEAA56-376B-4498-935B-2F7F68070635", 0.20000000298023224, AttributeModifier.Operation.MULTIPLY_TOTAL));
+        MOVEMENT_SLOWDOWN = register(2, "slowness", new MobEffect(MobEffectCategory.HARMFUL, 5926017).addAttributeModifier(Attributes.MOVEMENT_SPEED, "7107DE5E-7CE8-4030-940E-514C1F160890", -0.15000000596046448, AttributeModifier.Operation.MULTIPLY_TOTAL));
+        DIG_SPEED = register(3, "haste", new MobEffect(MobEffectCategory.BENEFICIAL, 14270531).addAttributeModifier(Attributes.ATTACK_SPEED, "AF8B6E3F-3328-4C0A-AA36-5BA2BB9DBEF3", 0.10000000149011612, AttributeModifier.Operation.MULTIPLY_TOTAL));
+        DIG_SLOWDOWN = register(4, "mining_fatigue", new MobEffect(MobEffectCategory.HARMFUL, 4866583).addAttributeModifier(Attributes.ATTACK_SPEED, "55FCED67-E92A-486E-9800-B47F202C4386", -0.10000000149011612, AttributeModifier.Operation.MULTIPLY_TOTAL));
+        DAMAGE_BOOST = register(5, "strength", new AttackDamageMobEffect(MobEffectCategory.BENEFICIAL, 9643043, 3.0).addAttributeModifier(Attributes.ATTACK_DAMAGE, "648D7064-6A60-4F59-8ABE-C2C23A6DD7A9", 0.0, AttributeModifier.Operation.ADDITION));
         HEAL = register(6, "instant_health", new InstantenousMobEffect(MobEffectCategory.BENEFICIAL, 16262179));
         HARM = register(7, "instant_damage", new InstantenousMobEffect(MobEffectCategory.HARMFUL, 4393481));
         JUMP = register(8, "jump_boost", new MobEffect(MobEffectCategory.BENEFICIAL, 2293580));
@@ -66,16 +64,16 @@ public class MobEffects {
         BLINDNESS = register(15, "blindness", new MobEffect(MobEffectCategory.HARMFUL, 2039587));
         NIGHT_VISION = register(16, "night_vision", new MobEffect(MobEffectCategory.BENEFICIAL, 2039713));
         HUNGER = register(17, "hunger", new MobEffect(MobEffectCategory.HARMFUL, 5797459));
-        WEAKNESS = register(18, "weakness", new AttackDamageMobEffect(MobEffectCategory.HARMFUL, 4738376, -4.0).addAttributeModifier(SharedMonsterAttributes.ATTACK_DAMAGE, "22653B89-116E-49DC-9B6B-9971489B5BE5", 0.0, AttributeModifier.Operation.ADDITION));
+        WEAKNESS = register(18, "weakness", new AttackDamageMobEffect(MobEffectCategory.HARMFUL, 4738376, -4.0).addAttributeModifier(Attributes.ATTACK_DAMAGE, "22653B89-116E-49DC-9B6B-9971489B5BE5", 0.0, AttributeModifier.Operation.ADDITION));
         POISON = register(19, "poison", new MobEffect(MobEffectCategory.HARMFUL, 5149489));
         WITHER = register(20, "wither", new MobEffect(MobEffectCategory.HARMFUL, 3484199));
-        HEALTH_BOOST = register(21, "health_boost", new HealthBoostMobEffect(MobEffectCategory.BENEFICIAL, 16284963).addAttributeModifier(SharedMonsterAttributes.MAX_HEALTH, "5D6F0BA2-1186-46AC-B896-C61C5CEE99CC", 4.0, AttributeModifier.Operation.ADDITION));
+        HEALTH_BOOST = register(21, "health_boost", new HealthBoostMobEffect(MobEffectCategory.BENEFICIAL, 16284963).addAttributeModifier(Attributes.MAX_HEALTH, "5D6F0BA2-1186-46AC-B896-C61C5CEE99CC", 4.0, AttributeModifier.Operation.ADDITION));
         ABSORPTION = register(22, "absorption", new AbsoptionMobEffect(MobEffectCategory.BENEFICIAL, 2445989));
         SATURATION = register(23, "saturation", new InstantenousMobEffect(MobEffectCategory.BENEFICIAL, 16262179));
         GLOWING = register(24, "glowing", new MobEffect(MobEffectCategory.NEUTRAL, 9740385));
         LEVITATION = register(25, "levitation", new MobEffect(MobEffectCategory.HARMFUL, 13565951));
-        LUCK = register(26, "luck", new MobEffect(MobEffectCategory.BENEFICIAL, 3381504).addAttributeModifier(SharedMonsterAttributes.LUCK, "03C3C89D-7037-4B42-869F-B146BCB64D2E", 1.0, AttributeModifier.Operation.ADDITION));
-        UNLUCK = register(27, "unluck", new MobEffect(MobEffectCategory.HARMFUL, 12624973).addAttributeModifier(SharedMonsterAttributes.LUCK, "CC5AF142-2BD2-4215-B636-2605AED11727", -1.0, AttributeModifier.Operation.ADDITION));
+        LUCK = register(26, "luck", new MobEffect(MobEffectCategory.BENEFICIAL, 3381504).addAttributeModifier(Attributes.LUCK, "03C3C89D-7037-4B42-869F-B146BCB64D2E", 1.0, AttributeModifier.Operation.ADDITION));
+        UNLUCK = register(27, "unluck", new MobEffect(MobEffectCategory.HARMFUL, 12624973).addAttributeModifier(Attributes.LUCK, "CC5AF142-2BD2-4215-B636-2605AED11727", -1.0, AttributeModifier.Operation.ADDITION));
         SLOW_FALLING = register(28, "slow_falling", new MobEffect(MobEffectCategory.BENEFICIAL, 16773073));
         CONDUIT_POWER = register(29, "conduit_power", new MobEffect(MobEffectCategory.BENEFICIAL, 1950417));
         DOLPHINS_GRACE = register(30, "dolphins_grace", new MobEffect(MobEffectCategory.BENEFICIAL, 8954814));
@@ -86,15 +84,15 @@ public class MobEffects {
             }
             
             @Override
-            public void applyEffectTick(final LivingEntity akz, final int integer) {
-                if (akz instanceof ServerPlayer && !akz.isSpectator()) {
-                    final ServerPlayer xe4 = (ServerPlayer)akz;
-                    final ServerLevel xd5 = xe4.getLevel();
-                    if (xd5.getDifficulty() == Difficulty.PEACEFUL) {
+            public void applyEffectTick(final LivingEntity aoy, final int integer) {
+                if (aoy instanceof ServerPlayer && !aoy.isSpectator()) {
+                    final ServerPlayer ze4 = (ServerPlayer)aoy;
+                    final ServerLevel zd5 = ze4.getLevel();
+                    if (zd5.getDifficulty() == Difficulty.PEACEFUL) {
                         return;
                     }
-                    if (xd5.isVillage(new BlockPos(akz))) {
-                        xd5.getRaids().createOrExtendRaid(xe4);
+                    if (zd5.isVillage(aoy.blockPosition())) {
+                        zd5.getRaids().createOrExtendRaid(ze4);
                     }
                 }
             }
diff --git a/src/net/minecraft/world/entity/AgableMob.java b/src/net/minecraft/world/entity/AgableMob.java
index 4662cef..8b08601 100644
--- a/src/net/minecraft/world/entity/AgableMob.java
+++ b/src/net/minecraft/world/entity/AgableMob.java
@@ -4,11 +4,6 @@ import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.SpawnEggItem;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.nbt.CompoundTag;
 import javax.annotation.Nullable;
 import net.minecraft.world.DifficultyInstance;
@@ -22,52 +17,25 @@ public abstract class AgableMob extends PathfinderMob {
     protected int forcedAge;
     protected int forcedAgeTimer;
     
-    protected AgableMob(final EntityType<? extends AgableMob> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AgableMob(final EntityType<? extends AgableMob> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        if (alm == null) {
-            alm = new AgableMobGroupData();
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        if (apo == null) {
+            apo = new AgableMobGroupData();
         }
-        final AgableMobGroupData a7 = (AgableMobGroupData)alm;
+        final AgableMobGroupData a7 = (AgableMobGroupData)apo;
         if (a7.isShouldSpawnBaby() && a7.getGroupSize() > 0 && this.random.nextFloat() <= a7.getBabySpawnChance()) {
             this.setAge(-24000);
         }
         a7.increaseGroupSizeByOne();
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     @Nullable
-    public abstract AgableMob getBreedOffspring(final AgableMob ako);
-    
-    protected void onOffspringSpawnedFromEgg(final Player ayj, final AgableMob ako) {
-    }
-    
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        final Item bei5 = ben4.getItem();
-        if (bei5 instanceof SpawnEggItem && ((SpawnEggItem)bei5).spawnsEntity(ben4.getTag(), this.getType())) {
-            if (!this.level.isClientSide) {
-                final AgableMob ako6 = this.getBreedOffspring(this);
-                if (ako6 != null) {
-                    ako6.setAge(-24000);
-                    ako6.moveTo(this.getX(), this.getY(), this.getZ(), 0.0f, 0.0f);
-                    this.level.addFreshEntity(ako6);
-                    if (ben4.hasCustomHoverName()) {
-                        ako6.setCustomName(ben4.getHoverName());
-                    }
-                    this.onOffspringSpawnedFromEgg(ayj, ako6);
-                    if (!ayj.abilities.instabuild) {
-                        ben4.shrink(1);
-                    }
-                }
-            }
-            return true;
-        }
-        return false;
-    }
+    public abstract AgableMob getBreedOffspring(final AgableMob aok);
     
     @Override
     protected void defineSynchedData() {
@@ -75,6 +43,10 @@ public abstract class AgableMob extends PathfinderMob {
         this.entityData.<Boolean>define(AgableMob.DATA_BABY_ID, false);
     }
     
+    public boolean canBreed() {
+        return false;
+    }
+    
     public int getAge() {
         if (this.level.isClientSide) {
             return this.entityData.<Boolean>get(AgableMob.DATA_BABY_ID) ? -1 : 1;
@@ -116,25 +88,25 @@ public abstract class AgableMob extends PathfinderMob {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("Age", this.getAge());
-        jt.putInt("ForcedAge", this.forcedAge);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Age", this.getAge());
+        le.putInt("ForcedAge", this.forcedAge);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setAge(jt.getInt("Age"));
-        this.forcedAge = jt.getInt("ForcedAge");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setAge(le.getInt("Age"));
+        this.forcedAge = le.getInt("ForcedAge");
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (AgableMob.DATA_BABY_ID.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (AgableMob.DATA_BABY_ID.equals(tq)) {
             this.refreshDimensions();
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     @Override
@@ -169,6 +141,11 @@ public abstract class AgableMob extends PathfinderMob {
         return this.getAge() < 0;
     }
     
+    @Override
+    public void setBaby(final boolean boolean1) {
+        this.setAge(boolean1 ? -24000 : 0);
+    }
+    
     static {
         DATA_BABY_ID = SynchedEntityData.<Boolean>defineId(AgableMob.class, EntityDataSerializers.BOOLEAN);
     }
diff --git a/src/net/minecraft/world/entity/AreaEffectCloud.java b/src/net/minecraft/world/entity/AreaEffectCloud.java
index 29bac2d..c47f4da 100644
--- a/src/net/minecraft/world/entity/AreaEffectCloud.java
+++ b/src/net/minecraft/world/entity/AreaEffectCloud.java
@@ -53,8 +53,8 @@ public class AreaEffectCloud extends Entity {
     private LivingEntity owner;
     private UUID ownerUUID;
     
-    public AreaEffectCloud(final EntityType<? extends AreaEffectCloud> aku, final Level bjw) {
-        super(aku, bjw);
+    public AreaEffectCloud(final EntityType<? extends AreaEffectCloud> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.potion = Potions.EMPTY;
         this.effects = Lists.newArrayList();
         this.victims = Maps.newHashMap();
@@ -65,8 +65,8 @@ public class AreaEffectCloud extends Entity {
         this.setRadius(3.0f);
     }
     
-    public AreaEffectCloud(final Level bjw, final double double2, final double double3, final double double4) {
-        this(EntityType.AREA_EFFECT_CLOUD, bjw);
+    public AreaEffectCloud(final Level bqb, final double double2, final double double3, final double double4) {
+        this(EntityType.AREA_EFFECT_CLOUD, bqb);
         this.setPos(double2, double3, double4);
     }
     
@@ -97,8 +97,8 @@ public class AreaEffectCloud extends Entity {
         return this.getEntityData().<Float>get(AreaEffectCloud.DATA_RADIUS);
     }
     
-    public void setPotion(final Potion bgd) {
-        this.potion = bgd;
+    public void setPotion(final Potion bmb) {
+        this.potion = bmb;
         if (!this.fixedColor) {
             this.updateColor();
         }
@@ -113,8 +113,8 @@ public class AreaEffectCloud extends Entity {
         }
     }
     
-    public void addEffect(final MobEffectInstance akk) {
-        this.effects.add(akk);
+    public void addEffect(final MobEffectInstance aog) {
+        this.effects.add(aog);
         if (!this.fixedColor) {
             this.updateColor();
         }
@@ -133,8 +133,8 @@ public class AreaEffectCloud extends Entity {
         return this.getEntityData().<ParticleOptions>get(AreaEffectCloud.DATA_PARTICLE);
     }
     
-    public void setParticle(final ParticleOptions gt) {
-        this.getEntityData().<ParticleOptions>set(AreaEffectCloud.DATA_PARTICLE, gt);
+    public void setParticle(final ParticleOptions hf) {
+        this.getEntityData().<ParticleOptions>set(AreaEffectCloud.DATA_PARTICLE, hf);
     }
     
     protected void setWaiting(final boolean boolean1) {
@@ -159,7 +159,7 @@ public class AreaEffectCloud extends Entity {
         final boolean boolean2 = this.isWaiting();
         float float3 = this.getRadius();
         if (this.level.isClientSide) {
-            final ParticleOptions gt4 = this.getParticle();
+            final ParticleOptions hf4 = this.getParticle();
             if (boolean2) {
                 if (this.random.nextBoolean()) {
                     for (int integer5 = 0; integer5 < 2; ++integer5) {
@@ -167,15 +167,15 @@ public class AreaEffectCloud extends Entity {
                         final float float5 = Mth.sqrt(this.random.nextFloat()) * 0.2f;
                         final float float6 = Mth.cos(float4) * float5;
                         final float float7 = Mth.sin(float4) * float5;
-                        if (gt4.getType() == ParticleTypes.ENTITY_EFFECT) {
+                        if (hf4.getType() == ParticleTypes.ENTITY_EFFECT) {
                             final int integer6 = this.random.nextBoolean() ? 16777215 : this.getColor();
                             final int integer7 = integer6 >> 16 & 0xFF;
                             final int integer8 = integer6 >> 8 & 0xFF;
                             final int integer9 = integer6 & 0xFF;
-                            this.level.addAlwaysVisibleParticle(gt4, this.getX() + float6, this.getY(), this.getZ() + float7, integer7 / 255.0f, integer8 / 255.0f, integer9 / 255.0f);
+                            this.level.addAlwaysVisibleParticle(hf4, this.getX() + float6, this.getY(), this.getZ() + float7, integer7 / 255.0f, integer8 / 255.0f, integer9 / 255.0f);
                         }
                         else {
-                            this.level.addAlwaysVisibleParticle(gt4, this.getX() + float6, this.getY(), this.getZ() + float7, 0.0, 0.0, 0.0);
+                            this.level.addAlwaysVisibleParticle(hf4, this.getX() + float6, this.getY(), this.getZ() + float7, 0.0, 0.0, 0.0);
                         }
                     }
                 }
@@ -187,15 +187,15 @@ public class AreaEffectCloud extends Entity {
                     final float float6 = Mth.sqrt(this.random.nextFloat()) * float3;
                     final float float7 = Mth.cos(float5) * float6;
                     final float float9 = Mth.sin(float5) * float6;
-                    if (gt4.getType() == ParticleTypes.ENTITY_EFFECT) {
+                    if (hf4.getType() == ParticleTypes.ENTITY_EFFECT) {
                         final int integer7 = this.getColor();
                         final int integer8 = integer7 >> 16 & 0xFF;
                         final int integer9 = integer7 >> 8 & 0xFF;
                         final int integer11 = integer7 & 0xFF;
-                        this.level.addAlwaysVisibleParticle(gt4, this.getX() + float7, this.getY(), this.getZ() + float9, integer8 / 255.0f, integer9 / 255.0f, integer11 / 255.0f);
+                        this.level.addAlwaysVisibleParticle(hf4, this.getX() + float7, this.getY(), this.getZ() + float9, integer8 / 255.0f, integer9 / 255.0f, integer11 / 255.0f);
                     }
                     else {
-                        this.level.addAlwaysVisibleParticle(gt4, this.getX() + float7, this.getY(), this.getZ() + float9, (0.5 - this.random.nextDouble()) * 0.15, 0.009999999776482582, (0.5 - this.random.nextDouble()) * 0.15);
+                        this.level.addAlwaysVisibleParticle(hf4, this.getX() + float7, this.getY(), this.getZ() + float9, (0.5 - this.random.nextDouble()) * 0.15, 0.009999999776482582, (0.5 - this.random.nextDouble()) * 0.15);
                     }
                 }
             }
@@ -229,8 +229,8 @@ public class AreaEffectCloud extends Entity {
                     }
                 }
                 final List<MobEffectInstance> list5 = Lists.newArrayList();
-                for (final MobEffectInstance akk7 : this.potion.getEffects()) {
-                    list5.add(new MobEffectInstance(akk7.getEffect(), akk7.getDuration() / 4, akk7.getAmplifier(), akk7.isAmbient(), akk7.isVisible()));
+                for (final MobEffectInstance aog7 : this.potion.getEffects()) {
+                    list5.add(new MobEffectInstance(aog7.getEffect(), aog7.getDuration() / 4, aog7.getAmplifier(), aog7.isAmbient(), aog7.isVisible()));
                 }
                 list5.addAll(this.effects);
                 if (list5.isEmpty()) {
@@ -239,24 +239,24 @@ public class AreaEffectCloud extends Entity {
                 else {
                     final List<LivingEntity> list6 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, this.getBoundingBox());
                     if (!list6.isEmpty()) {
-                        for (final LivingEntity akz8 : list6) {
-                            if (!this.victims.containsKey(akz8)) {
-                                if (!akz8.isAffectedByPotions()) {
+                        for (final LivingEntity aoy8 : list6) {
+                            if (!this.victims.containsKey(aoy8)) {
+                                if (!aoy8.isAffectedByPotions()) {
                                     continue;
                                 }
-                                final double double9 = akz8.getX() - this.getX();
-                                final double double10 = akz8.getZ() - this.getZ();
+                                final double double9 = aoy8.getX() - this.getX();
+                                final double double10 = aoy8.getZ() - this.getZ();
                                 final double double11 = double9 * double9 + double10 * double10;
                                 if (double11 > float3 * float3) {
                                     continue;
                                 }
-                                this.victims.put(akz8, this.tickCount + this.reapplicationDelay);
-                                for (final MobEffectInstance akk8 : list5) {
-                                    if (akk8.getEffect().isInstantenous()) {
-                                        akk8.getEffect().applyInstantenousEffect(this, this.getOwner(), akz8, akk8.getAmplifier(), 0.5);
+                                this.victims.put(aoy8, this.tickCount + this.reapplicationDelay);
+                                for (final MobEffectInstance aog8 : list5) {
+                                    if (aog8.getEffect().isInstantenous()) {
+                                        aog8.getEffect().applyInstantenousEffect(this, this.getOwner(), aoy8, aog8.getAmplifier(), 0.5);
                                     }
                                     else {
-                                        akz8.addEffect(new MobEffectInstance(akk8));
+                                        aoy8.addEffect(new MobEffectInstance(aog8));
                                     }
                                 }
                                 if (this.radiusOnUse != 0.0f) {
@@ -296,94 +296,96 @@ public class AreaEffectCloud extends Entity {
         this.waitTime = integer;
     }
     
-    public void setOwner(@Nullable final LivingEntity akz) {
-        this.owner = akz;
-        this.ownerUUID = ((akz == null) ? null : akz.getUUID());
+    public void setOwner(@Nullable final LivingEntity aoy) {
+        this.owner = aoy;
+        this.ownerUUID = ((aoy == null) ? null : aoy.getUUID());
     }
     
     @Nullable
     public LivingEntity getOwner() {
         if (this.owner == null && this.ownerUUID != null && this.level instanceof ServerLevel) {
-            final Entity akq2 = ((ServerLevel)this.level).getEntity(this.ownerUUID);
-            if (akq2 instanceof LivingEntity) {
-                this.owner = (LivingEntity)akq2;
+            final Entity aom2 = ((ServerLevel)this.level).getEntity(this.ownerUUID);
+            if (aom2 instanceof LivingEntity) {
+                this.owner = (LivingEntity)aom2;
             }
         }
         return this.owner;
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        this.tickCount = jt.getInt("Age");
-        this.duration = jt.getInt("Duration");
-        this.waitTime = jt.getInt("WaitTime");
-        this.reapplicationDelay = jt.getInt("ReapplicationDelay");
-        this.durationOnUse = jt.getInt("DurationOnUse");
-        this.radiusOnUse = jt.getFloat("RadiusOnUse");
-        this.radiusPerTick = jt.getFloat("RadiusPerTick");
-        this.setRadius(jt.getFloat("Radius"));
-        this.ownerUUID = jt.getUUID("OwnerUUID");
-        if (jt.contains("Particle", 8)) {
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        this.tickCount = le.getInt("Age");
+        this.duration = le.getInt("Duration");
+        this.waitTime = le.getInt("WaitTime");
+        this.reapplicationDelay = le.getInt("ReapplicationDelay");
+        this.durationOnUse = le.getInt("DurationOnUse");
+        this.radiusOnUse = le.getFloat("RadiusOnUse");
+        this.radiusPerTick = le.getFloat("RadiusPerTick");
+        this.setRadius(le.getFloat("Radius"));
+        if (le.hasUUID("Owner")) {
+            this.ownerUUID = le.getUUID("Owner");
+        }
+        if (le.contains("Particle", 8)) {
             try {
-                this.setParticle(ParticleArgument.readParticle(new StringReader(jt.getString("Particle"))));
+                this.setParticle(ParticleArgument.readParticle(new StringReader(le.getString("Particle"))));
             }
             catch (CommandSyntaxException commandSyntaxException3) {
-                AreaEffectCloud.LOGGER.warn("Couldn't load custom particle {}", jt.getString("Particle"), commandSyntaxException3);
+                AreaEffectCloud.LOGGER.warn("Couldn't load custom particle {}", le.getString("Particle"), commandSyntaxException3);
             }
         }
-        if (jt.contains("Color", 99)) {
-            this.setFixedColor(jt.getInt("Color"));
+        if (le.contains("Color", 99)) {
+            this.setFixedColor(le.getInt("Color"));
         }
-        if (jt.contains("Potion", 8)) {
-            this.setPotion(PotionUtils.getPotion(jt));
+        if (le.contains("Potion", 8)) {
+            this.setPotion(PotionUtils.getPotion(le));
         }
-        if (jt.contains("Effects", 9)) {
-            final ListTag jz3 = jt.getList("Effects", 10);
+        if (le.contains("Effects", 9)) {
+            final ListTag lk3 = le.getList("Effects", 10);
             this.effects.clear();
-            for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-                final MobEffectInstance akk5 = MobEffectInstance.load(jz3.getCompound(integer4));
-                if (akk5 != null) {
-                    this.addEffect(akk5);
+            for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+                final MobEffectInstance aog5 = MobEffectInstance.load(lk3.getCompound(integer4));
+                if (aog5 != null) {
+                    this.addEffect(aog5);
                 }
             }
         }
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putInt("Age", this.tickCount);
-        jt.putInt("Duration", this.duration);
-        jt.putInt("WaitTime", this.waitTime);
-        jt.putInt("ReapplicationDelay", this.reapplicationDelay);
-        jt.putInt("DurationOnUse", this.durationOnUse);
-        jt.putFloat("RadiusOnUse", this.radiusOnUse);
-        jt.putFloat("RadiusPerTick", this.radiusPerTick);
-        jt.putFloat("Radius", this.getRadius());
-        jt.putString("Particle", this.getParticle().writeToString());
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        le.putInt("Age", this.tickCount);
+        le.putInt("Duration", this.duration);
+        le.putInt("WaitTime", this.waitTime);
+        le.putInt("ReapplicationDelay", this.reapplicationDelay);
+        le.putInt("DurationOnUse", this.durationOnUse);
+        le.putFloat("RadiusOnUse", this.radiusOnUse);
+        le.putFloat("RadiusPerTick", this.radiusPerTick);
+        le.putFloat("Radius", this.getRadius());
+        le.putString("Particle", this.getParticle().writeToString());
         if (this.ownerUUID != null) {
-            jt.putUUID("OwnerUUID", this.ownerUUID);
+            le.putUUID("Owner", this.ownerUUID);
         }
         if (this.fixedColor) {
-            jt.putInt("Color", this.getColor());
+            le.putInt("Color", this.getColor());
         }
         if (this.potion != Potions.EMPTY && this.potion != null) {
-            jt.putString("Potion", Registry.POTION.getKey(this.potion).toString());
+            le.putString("Potion", Registry.POTION.getKey(this.potion).toString());
         }
         if (!this.effects.isEmpty()) {
-            final ListTag jz3 = new ListTag();
-            for (final MobEffectInstance akk5 : this.effects) {
-                ((AbstractList<CompoundTag>)jz3).add(akk5.save(new CompoundTag()));
+            final ListTag lk3 = new ListTag();
+            for (final MobEffectInstance aog5 : this.effects) {
+                ((AbstractList<CompoundTag>)lk3).add(aog5.save(new CompoundTag()));
             }
-            jt.put("Effects", jz3);
+            le.put("Effects", lk3);
         }
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (AreaEffectCloud.DATA_RADIUS.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (AreaEffectCloud.DATA_RADIUS.equals(tq)) {
             this.refreshDimensions();
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     @Override
@@ -397,7 +399,7 @@ public class AreaEffectCloud extends Entity {
     }
     
     @Override
-    public EntityDimensions getDimensions(final Pose alj) {
+    public EntityDimensions getDimensions(final Pose apj) {
         return EntityDimensions.scalable(this.getRadius() * 2.0f, 0.5f);
     }
     
diff --git a/src/net/minecraft/world/entity/Entity.java b/src/net/minecraft/world/entity/Entity.java
index 47b7ea4..2eeef59 100644
--- a/src/net/minecraft/world/entity/Entity.java
+++ b/src/net/minecraft/world/entity/Entity.java
@@ -16,27 +16,27 @@ import java.util.Collections;
 import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.server.level.TicketType;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.scores.PlayerTeam;
 import net.minecraft.world.level.Explosion;
-import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.levelgen.Heightmap;
 import java.util.Locale;
-import java.util.function.Consumer;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.world.entity.global.LightningBolt;
 import com.google.common.collect.Iterables;
 import net.minecraft.world.level.block.HoneyBlock;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.pattern.BlockPattern;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.NetherPortalBlock;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.level.ItemLike;
@@ -50,22 +50,20 @@ import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraft.tags.Tag;
 import net.minecraft.core.particles.BlockParticleOption;
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.tags.FluidTags;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.tags.StaticTagHelper;
 import net.minecraft.world.entity.vehicle.Boat;
+import net.minecraft.tags.FluidTags;
 import java.util.Iterator;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.util.RewindableStream;
-import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import java.util.stream.Stream;
 import net.minecraft.world.phys.shapes.BooleanOp;
@@ -73,14 +71,14 @@ import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import java.util.Arrays;
 import net.minecraft.world.level.block.FenceGateBlock;
-import net.minecraft.tags.BlockTags;
 import net.minecraft.CrashReportCategory;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.ReportedException;
 import net.minecraft.CrashReport;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.item.enchantment.ProtectionEnchantment;
 import net.minecraft.world.damagesource.DamageSource;
@@ -88,17 +86,20 @@ import net.minecraft.network.protocol.game.ClientboundMoveEntityPacket;
 import net.minecraft.world.scores.Team;
 import com.google.common.collect.Sets;
 import net.minecraft.util.Mth;
+import it.unimi.dsi.fastutil.objects.Object2DoubleArrayMap;
 import com.google.common.collect.Lists;
 import java.util.Set;
 import java.util.UUID;
 import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.network.chat.Component;
 import java.util.Optional;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
+import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 import java.util.Random;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.Level;
 import javax.annotation.Nullable;
@@ -128,19 +129,17 @@ public abstract class Entity implements Nameable, CommandSource {
     public double xo;
     public double yo;
     public double zo;
-    private double x;
-    private double y;
-    private double z;
+    private Vec3 position;
+    private BlockPos blockPosition;
     private Vec3 deltaMovement;
     public float yRot;
     public float xRot;
     public float yRotO;
     public float xRotO;
     private AABB bb;
-    public boolean onGround;
+    protected boolean onGround;
     public boolean horizontalCollision;
     public boolean verticalCollision;
-    public boolean collision;
     public boolean hurtMarked;
     protected Vec3 stuckSpeedMultiplier;
     public boolean removed;
@@ -159,10 +158,12 @@ public abstract class Entity implements Nameable, CommandSource {
     protected final Random random;
     public int tickCount;
     private int remainingFireTicks;
-    protected boolean wasInWater;
-    protected double waterHeight;
-    protected boolean wasUnderWater;
-    protected boolean isInLava;
+    protected boolean wasTouchingWater;
+    protected Object2DoubleMap<Tag<Fluid>> fluidHeight;
+    protected boolean wasEyeInWater;
+    @Nullable
+    protected Tag<Fluid> fluidOnEyes;
+    protected boolean isTouchingLava;
     public int invulnerableTime;
     protected boolean firstTick;
     protected final SynchedEntityData entityData;
@@ -177,6 +178,7 @@ public abstract class Entity implements Nameable, CommandSource {
     public int xChunk;
     public int yChunk;
     public int zChunk;
+    private boolean movedSinceLastChunkCheck;
     public long xp;
     public long yp;
     public long zp;
@@ -185,7 +187,6 @@ public abstract class Entity implements Nameable, CommandSource {
     public int changingDimensionDelay;
     protected boolean isInsidePortal;
     protected int portalTime;
-    public DimensionType dimension;
     protected BlockPos portalEntranceBlock;
     protected Vec3 portalEntranceOffset;
     protected Direction portalEntranceForwards;
@@ -194,13 +195,13 @@ public abstract class Entity implements Nameable, CommandSource {
     protected String stringUUID;
     protected boolean glowing;
     private final Set<String> tags;
-    private boolean teleported;
+    private boolean forceChunkAddition;
     private final double[] pistonDeltas;
     private long pistonDeltasGameTime;
     private EntityDimensions dimensions;
     private float eyeHeight;
     
-    public Entity(final EntityType<?> aku, final Level bjw) {
+    public Entity(final EntityType<?> aoq, final Level bqb) {
         this.id = Entity.ENTITY_COUNTER.incrementAndGet();
         this.passengers = Lists.newArrayList();
         this.deltaMovement = Vec3.ZERO;
@@ -210,18 +211,18 @@ public abstract class Entity implements Nameable, CommandSource {
         this.nextFlap = 1.0f;
         this.random = new Random();
         this.remainingFireTicks = -this.getFireImmuneTicks();
+        this.fluidHeight = (Object2DoubleMap<Tag<Fluid>>)new Object2DoubleArrayMap(2);
         this.firstTick = true;
         this.uuid = Mth.createInsecureUUID(this.random);
         this.stringUUID = this.uuid.toString();
         this.tags = Sets.newHashSet();
         this.pistonDeltas = new double[] { 0.0, 0.0, 0.0 };
-        this.type = aku;
-        this.level = bjw;
-        this.dimensions = aku.getDimensions();
+        this.type = aoq;
+        this.level = bqb;
+        this.dimensions = aoq.getDimensions();
+        this.position = Vec3.ZERO;
+        this.blockPosition = BlockPos.ZERO;
         this.setPos(0.0, 0.0, 0.0);
-        if (bjw != null) {
-            this.dimension = bjw.dimension.getType();
-        }
         (this.entityData = new SynchedEntityData(this)).<Byte>define(Entity.DATA_SHARED_FLAGS_ID, (Byte)0);
         this.entityData.<Integer>define(Entity.DATA_AIR_SUPPLY_ID, this.getMaxAirSupply());
         this.entityData.<Boolean>define(Entity.DATA_CUSTOM_NAME_VISIBLE, false);
@@ -234,9 +235,9 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public int getTeamColor() {
-        final Team cwn2 = this.getTeam();
-        if (cwn2 != null && cwn2.getColor().getColor() != null) {
-            return cwn2.getColor().getColor();
+        final Team dfo2 = this.getTeam();
+        if (dfo2 != null && dfo2.getColor().getColor() != null) {
+            return dfo2.getColor().getColor();
         }
         return 16777215;
     }
@@ -322,14 +323,21 @@ public abstract class Entity implements Nameable, CommandSource {
         this.removed = true;
     }
     
-    protected void setPose(final Pose alj) {
-        this.entityData.<Pose>set(Entity.DATA_POSE, alj);
+    public void setPose(final Pose apj) {
+        this.entityData.<Pose>set(Entity.DATA_POSE, apj);
     }
     
     public Pose getPose() {
         return this.entityData.<Pose>get(Entity.DATA_POSE);
     }
     
+    public boolean closerThan(final Entity aom, final double double2) {
+        final double double3 = aom.position.x - this.position.x;
+        final double double4 = aom.position.y - this.position.y;
+        final double double5 = aom.position.z - this.position.z;
+        return double3 * double3 + double4 * double4 + double5 * double5 < double2 * double2;
+    }
+    
     protected void setRot(final float float1, final float float2) {
         this.yRot = float1 % 360.0f;
         this.xRot = float2 % 360.0f;
@@ -343,7 +351,7 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     protected void reapplyPosition() {
-        this.setPos(this.x, this.y, this.z);
+        this.setPos(this.position.x, this.position.y, this.position.z);
     }
     
     public void turn(final double double1, final double double2) {
@@ -379,14 +387,18 @@ public abstract class Entity implements Nameable, CommandSource {
         this.xRotO = this.xRot;
         this.yRotO = this.yRot;
         this.handleNetherPortal();
-        this.updateSprintingState();
-        this.updateWaterState();
+        if (this.canSpawnSprintParticle()) {
+            this.spawnSprintParticle();
+        }
+        this.updateInWaterStateAndDoFluidPushing();
+        this.updateFluidOnEyes();
+        this.updateSwimming();
         if (this.level.isClientSide) {
             this.clearFire();
         }
         else if (this.remainingFireTicks > 0) {
             if (this.fireImmune()) {
-                this.remainingFireTicks -= 4;
+                this.setRemainingFireTicks(this.remainingFireTicks - 4);
                 if (this.remainingFireTicks < 0) {
                     this.clearFire();
                 }
@@ -395,7 +407,7 @@ public abstract class Entity implements Nameable, CommandSource {
                 if (this.remainingFireTicks % 20 == 0) {
                     this.hurt(DamageSource.ON_FIRE, 1.0f);
                 }
-                --this.remainingFireTicks;
+                this.setRemainingFireTicks(this.remainingFireTicks - 1);
             }
         }
         if (this.isInLava()) {
@@ -436,7 +448,7 @@ public abstract class Entity implements Nameable, CommandSource {
             integer2 = ProtectionEnchantment.getFireAfterDampener((LivingEntity)this, integer2);
         }
         if (this.remainingFireTicks < integer2) {
-            this.remainingFireTicks = integer2;
+            this.setRemainingFireTicks(integer2);
         }
     }
     
@@ -449,7 +461,7 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public void clearFire() {
-        this.remainingFireTicks = 0;
+        this.setRemainingFireTicks(0);
     }
     
     protected void outOfWorld() {
@@ -460,175 +472,173 @@ public abstract class Entity implements Nameable, CommandSource {
         return this.isFree(this.getBoundingBox().move(double1, double2, double3));
     }
     
-    private boolean isFree(final AABB cvf) {
-        return this.level.noCollision(this, cvf) && !this.level.containsAnyLiquid(cvf);
+    private boolean isFree(final AABB deg) {
+        return this.level.noCollision(this, deg) && !this.level.containsAnyLiquid(deg);
     }
     
-    public void move(final MoverType ale, Vec3 cvl) {
+    public void setOnGround(final boolean boolean1) {
+        this.onGround = boolean1;
+    }
+    
+    public boolean isOnGround() {
+        return this.onGround;
+    }
+    
+    public void move(final MoverType apd, Vec3 dem) {
         if (this.noPhysics) {
-            this.setBoundingBox(this.getBoundingBox().move(cvl));
+            this.setBoundingBox(this.getBoundingBox().move(dem));
             this.setLocationFromBoundingbox();
             return;
         }
-        if (ale == MoverType.PISTON) {
-            cvl = this.limitPistonMovement(cvl);
-            if (cvl.equals(Vec3.ZERO)) {
+        if (apd == MoverType.PISTON) {
+            dem = this.limitPistonMovement(dem);
+            if (dem.equals(Vec3.ZERO)) {
                 return;
             }
         }
         this.level.getProfiler().push("move");
         if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7) {
-            cvl = cvl.multiply(this.stuckSpeedMultiplier);
+            dem = dem.multiply(this.stuckSpeedMultiplier);
             this.stuckSpeedMultiplier = Vec3.ZERO;
             this.setDeltaMovement(Vec3.ZERO);
         }
-        cvl = this.maybeBackOffFromEdge(cvl, ale);
-        final Vec3 cvl2 = this.collide(cvl);
-        if (cvl2.lengthSqr() > 1.0E-7) {
-            this.setBoundingBox(this.getBoundingBox().move(cvl2));
+        dem = this.maybeBackOffFromEdge(dem, apd);
+        final Vec3 dem2 = this.collide(dem);
+        if (dem2.lengthSqr() > 1.0E-7) {
+            this.setBoundingBox(this.getBoundingBox().move(dem2));
             this.setLocationFromBoundingbox();
         }
         this.level.getProfiler().pop();
         this.level.getProfiler().push("rest");
-        this.horizontalCollision = (!Mth.equal(cvl.x, cvl2.x) || !Mth.equal(cvl.z, cvl2.z));
-        this.verticalCollision = (cvl.y != cvl2.y);
-        this.onGround = (this.verticalCollision && cvl.y < 0.0);
-        this.collision = (this.horizontalCollision || this.verticalCollision);
-        final BlockPos fk5 = this.getOnPos();
-        final BlockState byj6 = this.level.getBlockState(fk5);
-        this.checkFallDamage(cvl2.y, this.onGround, byj6, fk5);
-        final Vec3 cvl3 = this.getDeltaMovement();
-        if (cvl.x != cvl2.x) {
-            this.setDeltaMovement(0.0, cvl3.y, cvl3.z);
+        this.horizontalCollision = (!Mth.equal(dem.x, dem2.x) || !Mth.equal(dem.z, dem2.z));
+        this.verticalCollision = (dem.y != dem2.y);
+        this.onGround = (this.verticalCollision && dem.y < 0.0);
+        final BlockPos fu5 = this.getOnPos();
+        final BlockState cfj2 = this.level.getBlockState(fu5);
+        this.checkFallDamage(dem2.y, this.onGround, cfj2, fu5);
+        final Vec3 dem3 = this.getDeltaMovement();
+        if (dem.x != dem2.x) {
+            this.setDeltaMovement(0.0, dem3.y, dem3.z);
         }
-        if (cvl.z != cvl2.z) {
-            this.setDeltaMovement(cvl3.x, cvl3.y, 0.0);
+        if (dem.z != dem2.z) {
+            this.setDeltaMovement(dem3.x, dem3.y, 0.0);
         }
-        final Block bph8 = byj6.getBlock();
-        if (cvl.y != cvl2.y) {
-            bph8.updateEntityAfterFallOn(this.level, this);
+        final Block bvr8 = cfj2.getBlock();
+        if (dem.y != dem2.y) {
+            bvr8.updateEntityAfterFallOn(this.level, this);
         }
         if (this.onGround && !this.isSteppingCarefully()) {
-            bph8.stepOn(this.level, fk5, this);
+            bvr8.stepOn(this.level, fu5, this);
         }
         if (this.isMovementNoisy() && !this.isPassenger()) {
-            final double double9 = cvl2.x;
-            double double10 = cvl2.y;
-            final double double11 = cvl2.z;
-            if (bph8 != Blocks.LADDER && bph8 != Blocks.SCAFFOLDING) {
+            final double double9 = dem2.x;
+            double double10 = dem2.y;
+            final double double11 = dem2.z;
+            if (!bvr8.is(BlockTags.CLIMBABLE)) {
                 double10 = 0.0;
             }
-            this.walkDist += (float)(Mth.sqrt(getHorizontalDistanceSqr(cvl2)) * 0.6);
+            this.walkDist += (float)(Mth.sqrt(getHorizontalDistanceSqr(dem2)) * 0.6);
             this.moveDist += (float)(Mth.sqrt(double9 * double9 + double10 * double10 + double11 * double11) * 0.6);
-            if (this.moveDist > this.nextStep && !byj6.isAir()) {
+            if (this.moveDist > this.nextStep && !cfj2.isAir()) {
                 this.nextStep = this.nextStep();
                 if (this.isInWater()) {
-                    final Entity akq15 = (this.isVehicle() && this.getControllingPassenger() != null) ? this.getControllingPassenger() : this;
-                    final float float16 = (akq15 == this) ? 0.35f : 0.4f;
-                    final Vec3 cvl4 = akq15.getDeltaMovement();
-                    float float17 = Mth.sqrt(cvl4.x * cvl4.x * 0.20000000298023224 + cvl4.y * cvl4.y + cvl4.z * cvl4.z * 0.20000000298023224) * float16;
+                    final Entity aom15 = (this.isVehicle() && this.getControllingPassenger() != null) ? this.getControllingPassenger() : this;
+                    final float float16 = (aom15 == this) ? 0.35f : 0.4f;
+                    final Vec3 dem4 = aom15.getDeltaMovement();
+                    float float17 = Mth.sqrt(dem4.x * dem4.x * 0.20000000298023224 + dem4.y * dem4.y + dem4.z * dem4.z * 0.20000000298023224) * float16;
                     if (float17 > 1.0f) {
                         float17 = 1.0f;
                     }
                     this.playSwimSound(float17);
                 }
                 else {
-                    this.playStepSound(fk5, byj6);
+                    this.playStepSound(fu5, cfj2);
                 }
             }
-            else if (this.moveDist > this.nextFlap && this.makeFlySound() && byj6.isAir()) {
+            else if (this.moveDist > this.nextFlap && this.makeFlySound() && cfj2.isAir()) {
                 this.nextFlap = this.playFlySound(this.moveDist);
             }
         }
         try {
-            this.isInLava = false;
+            this.isTouchingLava = false;
             this.checkInsideBlocks();
         }
         catch (Throwable throwable9) {
-            final CrashReport h10 = CrashReport.forThrowable(throwable9, "Checking entity block collision");
-            final CrashReportCategory i11 = h10.addCategory("Entity being checked for collision");
-            this.fillCrashReportCategory(i11);
-            throw new ReportedException(h10);
+            final CrashReport j10 = CrashReport.forThrowable(throwable9, "Checking entity block collision");
+            final CrashReportCategory k11 = j10.addCategory("Entity being checked for collision");
+            this.fillCrashReportCategory(k11);
+            throw new ReportedException(j10);
         }
-        this.setDeltaMovement(this.getDeltaMovement().multiply(this.getBlockSpeedFactor(), 1.0, this.getBlockSpeedFactor()));
-        final boolean boolean9 = this.isInWaterRainOrBubble();
-        if (this.level.containsFireBlock(this.getBoundingBox().deflate(0.001))) {
-            if (!boolean9) {
-                ++this.remainingFireTicks;
-                if (this.remainingFireTicks == 0) {
-                    this.setSecondsOnFire(8);
-                }
-            }
-            this.burn(1);
+        final float float18 = this.getBlockSpeedFactor();
+        this.setDeltaMovement(this.getDeltaMovement().multiply(float18, 1.0, float18));
+        if (this.level.getBlockStatesIfLoaded(this.getBoundingBox().deflate(0.001)).noneMatch(cfj -> cfj.is(BlockTags.FIRE) || cfj.is(Blocks.LAVA)) && this.remainingFireTicks <= 0) {
+            this.setRemainingFireTicks(-this.getFireImmuneTicks());
         }
-        else if (this.remainingFireTicks <= 0) {
-            this.remainingFireTicks = -this.getFireImmuneTicks();
-        }
-        if (boolean9 && this.isOnFire()) {
+        if (this.isInWaterRainOrBubble() && this.isOnFire()) {
             this.playSound(SoundEvents.GENERIC_EXTINGUISH_FIRE, 0.7f, 1.6f + (this.random.nextFloat() - this.random.nextFloat()) * 0.4f);
-            this.remainingFireTicks = -this.getFireImmuneTicks();
+            this.setRemainingFireTicks(-this.getFireImmuneTicks());
         }
         this.level.getProfiler().pop();
     }
     
     protected BlockPos getOnPos() {
-        final int integer2 = Mth.floor(this.x);
-        final int integer3 = Mth.floor(this.y - 0.20000000298023224);
-        final int integer4 = Mth.floor(this.z);
-        final BlockPos fk5 = new BlockPos(integer2, integer3, integer4);
-        if (this.level.getBlockState(fk5).isAir()) {
-            final BlockPos fk6 = fk5.below();
-            final BlockState byj7 = this.level.getBlockState(fk6);
-            final Block bph8 = byj7.getBlock();
-            if (bph8.is(BlockTags.FENCES) || bph8.is(BlockTags.WALLS) || bph8 instanceof FenceGateBlock) {
-                return fk6;
+        final int integer2 = Mth.floor(this.position.x);
+        final int integer3 = Mth.floor(this.position.y - 0.20000000298023224);
+        final int integer4 = Mth.floor(this.position.z);
+        final BlockPos fu5 = new BlockPos(integer2, integer3, integer4);
+        if (this.level.getBlockState(fu5).isAir()) {
+            final BlockPos fu6 = fu5.below();
+            final BlockState cfj7 = this.level.getBlockState(fu6);
+            final Block bvr8 = cfj7.getBlock();
+            if (bvr8.is(BlockTags.FENCES) || bvr8.is(BlockTags.WALLS) || bvr8 instanceof FenceGateBlock) {
+                return fu6;
             }
         }
-        return fk5;
+        return fu5;
     }
     
     protected float getBlockJumpFactor() {
-        final float float2 = this.level.getBlockState(new BlockPos(this)).getBlock().getJumpFactor();
+        final float float2 = this.level.getBlockState(this.blockPosition()).getBlock().getJumpFactor();
         final float float3 = this.level.getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).getBlock().getJumpFactor();
         return (float2 == 1.0) ? float3 : float2;
     }
     
     protected float getBlockSpeedFactor() {
-        final Block bph2 = this.level.getBlockState(new BlockPos(this)).getBlock();
-        final float float3 = bph2.getSpeedFactor();
-        if (bph2 == Blocks.WATER || bph2 == Blocks.BUBBLE_COLUMN) {
+        final Block bvr2 = this.level.getBlockState(this.blockPosition()).getBlock();
+        final float float3 = bvr2.getSpeedFactor();
+        if (bvr2 == Blocks.WATER || bvr2 == Blocks.BUBBLE_COLUMN) {
             return float3;
         }
         return (float3 == 1.0) ? this.level.getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).getBlock().getSpeedFactor() : float3;
     }
     
     protected BlockPos getBlockPosBelowThatAffectsMyMovement() {
-        return new BlockPos(this.x, this.getBoundingBox().minY - 0.5000001, this.z);
+        return new BlockPos(this.position.x, this.getBoundingBox().minY - 0.5000001, this.position.z);
     }
     
-    protected Vec3 maybeBackOffFromEdge(final Vec3 cvl, final MoverType ale) {
-        return cvl;
+    protected Vec3 maybeBackOffFromEdge(final Vec3 dem, final MoverType apd) {
+        return dem;
     }
     
-    protected Vec3 limitPistonMovement(final Vec3 cvl) {
-        if (cvl.lengthSqr() <= 1.0E-7) {
-            return cvl;
+    protected Vec3 limitPistonMovement(final Vec3 dem) {
+        if (dem.lengthSqr() <= 1.0E-7) {
+            return dem;
         }
         final long long3 = this.level.getGameTime();
         if (long3 != this.pistonDeltasGameTime) {
             Arrays.fill(this.pistonDeltas, 0.0);
             this.pistonDeltasGameTime = long3;
         }
-        if (cvl.x != 0.0) {
-            final double double5 = this.applyPistonMovementRestriction(Direction.Axis.X, cvl.x);
+        if (dem.x != 0.0) {
+            final double double5 = this.applyPistonMovementRestriction(Direction.Axis.X, dem.x);
             return (Math.abs(double5) <= 9.999999747378752E-6) ? Vec3.ZERO : new Vec3(double5, 0.0, 0.0);
         }
-        if (cvl.y != 0.0) {
-            final double double5 = this.applyPistonMovementRestriction(Direction.Axis.Y, cvl.y);
+        if (dem.y != 0.0) {
+            final double double5 = this.applyPistonMovementRestriction(Direction.Axis.Y, dem.y);
             return (Math.abs(double5) <= 9.999999747378752E-6) ? Vec3.ZERO : new Vec3(0.0, double5, 0.0);
         }
-        if (cvl.z != 0.0) {
-            final double double5 = this.applyPistonMovementRestriction(Direction.Axis.Z, cvl.z);
+        if (dem.z != 0.0) {
+            final double double5 = this.applyPistonMovementRestriction(Direction.Axis.Z, dem.z);
             return (Math.abs(double5) <= 9.999999747378752E-6) ? Vec3.ZERO : new Vec3(0.0, 0.0, double5);
         }
         return Vec3.ZERO;
@@ -642,103 +652,103 @@ public abstract class Entity implements Nameable, CommandSource {
         return double2;
     }
     
-    private Vec3 collide(final Vec3 cvl) {
-        final AABB cvf3 = this.getBoundingBox();
-        final CollisionContext cvq4 = CollisionContext.of(this);
-        final VoxelShape cwf5 = this.level.getWorldBorder().getCollisionShape();
-        final Stream<VoxelShape> stream6 = Shapes.joinIsNotEmpty(cwf5, Shapes.create(cvf3.deflate(1.0E-7)), BooleanOp.AND) ? Stream.<VoxelShape>empty() : Stream.<VoxelShape>of(cwf5);
-        final Stream<VoxelShape> stream7 = this.level.getEntityCollisions(this, cvf3.expandTowards(cvl), ImmutableSet.of());
-        final RewindableStream<VoxelShape> abt8 = new RewindableStream<VoxelShape>(Stream.<VoxelShape>concat(stream7, stream6));
-        final Vec3 cvl2 = (cvl.lengthSqr() == 0.0) ? cvl : collideBoundingBoxHeuristically(this, cvl, cvf3, this.level, cvq4, abt8);
-        final boolean boolean10 = cvl.x != cvl2.x;
-        final boolean boolean11 = cvl.y != cvl2.y;
-        final boolean boolean12 = cvl.z != cvl2.z;
-        final boolean boolean13 = this.onGround || (boolean11 && cvl.y < 0.0);
+    private Vec3 collide(final Vec3 dem) {
+        final AABB deg3 = this.getBoundingBox();
+        final CollisionContext der4 = CollisionContext.of(this);
+        final VoxelShape dfg5 = this.level.getWorldBorder().getCollisionShape();
+        final Stream<VoxelShape> stream6 = Shapes.joinIsNotEmpty(dfg5, Shapes.create(deg3.deflate(1.0E-7)), BooleanOp.AND) ? Stream.<VoxelShape>empty() : Stream.<VoxelShape>of(dfg5);
+        final Stream<VoxelShape> stream7 = this.level.getEntityCollisions(this, deg3.expandTowards(dem), aom -> true);
+        final RewindableStream<VoxelShape> aee8 = new RewindableStream<VoxelShape>(Stream.<VoxelShape>concat(stream7, stream6));
+        final Vec3 dem2 = (dem.lengthSqr() == 0.0) ? dem : collideBoundingBoxHeuristically(this, dem, deg3, this.level, der4, aee8);
+        final boolean boolean10 = dem.x != dem2.x;
+        final boolean boolean11 = dem.y != dem2.y;
+        final boolean boolean12 = dem.z != dem2.z;
+        final boolean boolean13 = this.onGround || (boolean11 && dem.y < 0.0);
         if (this.maxUpStep > 0.0f && boolean13 && (boolean10 || boolean12)) {
-            Vec3 cvl3 = collideBoundingBoxHeuristically(this, new Vec3(cvl.x, this.maxUpStep, cvl.z), cvf3, this.level, cvq4, abt8);
-            final Vec3 cvl4 = collideBoundingBoxHeuristically(this, new Vec3(0.0, this.maxUpStep, 0.0), cvf3.expandTowards(cvl.x, 0.0, cvl.z), this.level, cvq4, abt8);
-            if (cvl4.y < this.maxUpStep) {
-                final Vec3 cvl5 = collideBoundingBoxHeuristically(this, new Vec3(cvl.x, 0.0, cvl.z), cvf3.move(cvl4), this.level, cvq4, abt8).add(cvl4);
-                if (getHorizontalDistanceSqr(cvl5) > getHorizontalDistanceSqr(cvl3)) {
-                    cvl3 = cvl5;
+            Vec3 dem3 = collideBoundingBoxHeuristically(this, new Vec3(dem.x, this.maxUpStep, dem.z), deg3, this.level, der4, aee8);
+            final Vec3 dem4 = collideBoundingBoxHeuristically(this, new Vec3(0.0, this.maxUpStep, 0.0), deg3.expandTowards(dem.x, 0.0, dem.z), this.level, der4, aee8);
+            if (dem4.y < this.maxUpStep) {
+                final Vec3 dem5 = collideBoundingBoxHeuristically(this, new Vec3(dem.x, 0.0, dem.z), deg3.move(dem4), this.level, der4, aee8).add(dem4);
+                if (getHorizontalDistanceSqr(dem5) > getHorizontalDistanceSqr(dem3)) {
+                    dem3 = dem5;
                 }
             }
-            if (getHorizontalDistanceSqr(cvl3) > getHorizontalDistanceSqr(cvl2)) {
-                return cvl3.add(collideBoundingBoxHeuristically(this, new Vec3(0.0, -cvl3.y + cvl.y, 0.0), cvf3.move(cvl3), this.level, cvq4, abt8));
+            if (getHorizontalDistanceSqr(dem3) > getHorizontalDistanceSqr(dem2)) {
+                return dem3.add(collideBoundingBoxHeuristically(this, new Vec3(0.0, -dem3.y + dem.y, 0.0), deg3.move(dem3), this.level, der4, aee8));
             }
         }
-        return cvl2;
+        return dem2;
     }
     
-    public static double getHorizontalDistanceSqr(final Vec3 cvl) {
-        return cvl.x * cvl.x + cvl.z * cvl.z;
+    public static double getHorizontalDistanceSqr(final Vec3 dem) {
+        return dem.x * dem.x + dem.z * dem.z;
     }
     
-    public static Vec3 collideBoundingBoxHeuristically(@Nullable final Entity akq, final Vec3 cvl, final AABB cvf, final Level bjw, final CollisionContext cvq, final RewindableStream<VoxelShape> abt) {
-        final boolean boolean7 = cvl.x == 0.0;
-        final boolean boolean8 = cvl.y == 0.0;
-        final boolean boolean9 = cvl.z == 0.0;
+    public static Vec3 collideBoundingBoxHeuristically(@Nullable final Entity aom, final Vec3 dem, final AABB deg, final Level bqb, final CollisionContext der, final RewindableStream<VoxelShape> aee) {
+        final boolean boolean7 = dem.x == 0.0;
+        final boolean boolean8 = dem.y == 0.0;
+        final boolean boolean9 = dem.z == 0.0;
         if ((boolean7 && boolean8) || (boolean7 && boolean9) || (boolean8 && boolean9)) {
-            return collideBoundingBox(cvl, cvf, bjw, cvq, abt);
+            return collideBoundingBox(dem, deg, bqb, der, aee);
         }
-        final RewindableStream<VoxelShape> abt2 = new RewindableStream<VoxelShape>(Stream.<VoxelShape>concat(abt.getStream(), bjw.getBlockCollisions(akq, cvf.expandTowards(cvl))));
-        return collideBoundingBoxLegacy(cvl, cvf, abt2);
+        final RewindableStream<VoxelShape> aee2 = new RewindableStream<VoxelShape>(Stream.<VoxelShape>concat(aee.getStream(), bqb.getBlockCollisions(aom, deg.expandTowards(dem))));
+        return collideBoundingBoxLegacy(dem, deg, aee2);
     }
     
-    public static Vec3 collideBoundingBoxLegacy(final Vec3 cvl, AABB cvf, final RewindableStream<VoxelShape> abt) {
-        double double4 = cvl.x;
-        double double5 = cvl.y;
-        double double6 = cvl.z;
+    public static Vec3 collideBoundingBoxLegacy(final Vec3 dem, AABB deg, final RewindableStream<VoxelShape> aee) {
+        double double4 = dem.x;
+        double double5 = dem.y;
+        double double6 = dem.z;
         if (double5 != 0.0) {
-            double5 = Shapes.collide(Direction.Axis.Y, cvf, abt.getStream(), double5);
+            double5 = Shapes.collide(Direction.Axis.Y, deg, aee.getStream(), double5);
             if (double5 != 0.0) {
-                cvf = cvf.move(0.0, double5, 0.0);
+                deg = deg.move(0.0, double5, 0.0);
             }
         }
         final boolean boolean10 = Math.abs(double4) < Math.abs(double6);
         if (boolean10 && double6 != 0.0) {
-            double6 = Shapes.collide(Direction.Axis.Z, cvf, abt.getStream(), double6);
+            double6 = Shapes.collide(Direction.Axis.Z, deg, aee.getStream(), double6);
             if (double6 != 0.0) {
-                cvf = cvf.move(0.0, 0.0, double6);
+                deg = deg.move(0.0, 0.0, double6);
             }
         }
         if (double4 != 0.0) {
-            double4 = Shapes.collide(Direction.Axis.X, cvf, abt.getStream(), double4);
+            double4 = Shapes.collide(Direction.Axis.X, deg, aee.getStream(), double4);
             if (!boolean10 && double4 != 0.0) {
-                cvf = cvf.move(double4, 0.0, 0.0);
+                deg = deg.move(double4, 0.0, 0.0);
             }
         }
         if (!boolean10 && double6 != 0.0) {
-            double6 = Shapes.collide(Direction.Axis.Z, cvf, abt.getStream(), double6);
+            double6 = Shapes.collide(Direction.Axis.Z, deg, aee.getStream(), double6);
         }
         return new Vec3(double4, double5, double6);
     }
     
-    public static Vec3 collideBoundingBox(final Vec3 cvl, AABB cvf, final LevelReader bjz, final CollisionContext cvq, final RewindableStream<VoxelShape> abt) {
-        double double6 = cvl.x;
-        double double7 = cvl.y;
-        double double8 = cvl.z;
+    public static Vec3 collideBoundingBox(final Vec3 dem, AABB deg, final LevelReader bqd, final CollisionContext der, final RewindableStream<VoxelShape> aee) {
+        double double6 = dem.x;
+        double double7 = dem.y;
+        double double8 = dem.z;
         if (double7 != 0.0) {
-            double7 = Shapes.collide(Direction.Axis.Y, cvf, bjz, double7, cvq, abt.getStream());
+            double7 = Shapes.collide(Direction.Axis.Y, deg, bqd, double7, der, aee.getStream());
             if (double7 != 0.0) {
-                cvf = cvf.move(0.0, double7, 0.0);
+                deg = deg.move(0.0, double7, 0.0);
             }
         }
         final boolean boolean12 = Math.abs(double6) < Math.abs(double8);
         if (boolean12 && double8 != 0.0) {
-            double8 = Shapes.collide(Direction.Axis.Z, cvf, bjz, double8, cvq, abt.getStream());
+            double8 = Shapes.collide(Direction.Axis.Z, deg, bqd, double8, der, aee.getStream());
             if (double8 != 0.0) {
-                cvf = cvf.move(0.0, 0.0, double8);
+                deg = deg.move(0.0, 0.0, double8);
             }
         }
         if (double6 != 0.0) {
-            double6 = Shapes.collide(Direction.Axis.X, cvf, bjz, double6, cvq, abt.getStream());
+            double6 = Shapes.collide(Direction.Axis.X, deg, bqd, double6, der, aee.getStream());
             if (!boolean12 && double6 != 0.0) {
-                cvf = cvf.move(double6, 0.0, 0.0);
+                deg = deg.move(double6, 0.0, 0.0);
             }
         }
         if (!boolean12 && double8 != 0.0) {
-            double8 = Shapes.collide(Direction.Axis.Z, cvf, bjz, double8, cvq, abt.getStream());
+            double8 = Shapes.collide(Direction.Axis.Z, deg, bqd, double8, der, aee.getStream());
         }
         return new Vec3(double6, double7, double8);
     }
@@ -748,8 +758,8 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public void setLocationFromBoundingbox() {
-        final AABB cvf2 = this.getBoundingBox();
-        this.setPosRaw((cvf2.minX + cvf2.maxX) / 2.0, cvf2.minY, (cvf2.minZ + cvf2.maxZ) / 2.0);
+        final AABB deg2 = this.getBoundingBox();
+        this.setPosRaw((deg2.minX + deg2.maxX) / 2.0, deg2.minY, (deg2.minZ + deg2.maxZ) / 2.0);
     }
     
     protected SoundEvent getSwimSound() {
@@ -765,26 +775,25 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     protected void checkInsideBlocks() {
-        final AABB cvf2 = this.getBoundingBox();
-        try (final BlockPos.PooledMutableBlockPos b3 = BlockPos.PooledMutableBlockPos.acquire(cvf2.minX + 0.001, cvf2.minY + 0.001, cvf2.minZ + 0.001);
-             final BlockPos.PooledMutableBlockPos b4 = BlockPos.PooledMutableBlockPos.acquire(cvf2.maxX - 0.001, cvf2.maxY - 0.001, cvf2.maxZ - 0.001);
-             final BlockPos.PooledMutableBlockPos b5 = BlockPos.PooledMutableBlockPos.acquire()) {
-            if (this.level.hasChunksAt(b3, b4)) {
-                for (int integer9 = b3.getX(); integer9 <= b4.getX(); ++integer9) {
-                    for (int integer10 = b3.getY(); integer10 <= b4.getY(); ++integer10) {
-                        for (int integer11 = b3.getZ(); integer11 <= b4.getZ(); ++integer11) {
-                            b5.set(integer9, integer10, integer11);
-                            final BlockState byj12 = this.level.getBlockState(b5);
-                            try {
-                                byj12.entityInside(this.level, b5, this);
-                                this.onInsideBlock(byj12);
-                            }
-                            catch (Throwable throwable13) {
-                                final CrashReport h14 = CrashReport.forThrowable(throwable13, "Colliding entity with block");
-                                final CrashReportCategory i15 = h14.addCategory("Block being collided with");
-                                CrashReportCategory.populateBlockDetails(i15, b5, byj12);
-                                throw new ReportedException(h14);
-                            }
+        final AABB deg2 = this.getBoundingBox();
+        final BlockPos fu3 = new BlockPos(deg2.minX + 0.001, deg2.minY + 0.001, deg2.minZ + 0.001);
+        final BlockPos fu4 = new BlockPos(deg2.maxX - 0.001, deg2.maxY - 0.001, deg2.maxZ - 0.001);
+        final BlockPos.MutableBlockPos a5 = new BlockPos.MutableBlockPos();
+        if (this.level.hasChunksAt(fu3, fu4)) {
+            for (int integer6 = fu3.getX(); integer6 <= fu4.getX(); ++integer6) {
+                for (int integer7 = fu3.getY(); integer7 <= fu4.getY(); ++integer7) {
+                    for (int integer8 = fu3.getZ(); integer8 <= fu4.getZ(); ++integer8) {
+                        a5.set(integer6, integer7, integer8);
+                        final BlockState cfj9 = this.level.getBlockState(a5);
+                        try {
+                            cfj9.entityInside(this.level, a5, this);
+                            this.onInsideBlock(cfj9);
+                        }
+                        catch (Throwable throwable10) {
+                            final CrashReport j11 = CrashReport.forThrowable(throwable10, "Colliding entity with block");
+                            final CrashReportCategory k12 = j11.addCategory("Block being collided with");
+                            CrashReportCategory.populateBlockDetails(k12, a5, cfj9);
+                            throw new ReportedException(j11);
                         }
                     }
                 }
@@ -792,16 +801,16 @@ public abstract class Entity implements Nameable, CommandSource {
         }
     }
     
-    protected void onInsideBlock(final BlockState byj) {
+    protected void onInsideBlock(final BlockState cfj) {
     }
     
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
-        if (byj.getMaterial().isLiquid()) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
+        if (cfj.getMaterial().isLiquid()) {
             return;
         }
-        final BlockState byj2 = this.level.getBlockState(fk.above());
-        final SoundType bum5 = (byj2.getBlock() == Blocks.SNOW) ? byj2.getSoundType() : byj.getSoundType();
-        this.playSound(bum5.getStepSound(), bum5.getVolume() * 0.15f, bum5.getPitch());
+        final BlockState cfj2 = this.level.getBlockState(fu.above());
+        final SoundType cbh5 = cfj2.is(Blocks.SNOW) ? cfj2.getSoundType() : cfj.getSoundType();
+        this.playSound(cbh5.getStepSound(), cbh5.getVolume() * 0.15f, cbh5.getPitch());
     }
     
     protected void playSwimSound(final float float1) {
@@ -816,9 +825,9 @@ public abstract class Entity implements Nameable, CommandSource {
         return false;
     }
     
-    public void playSound(final SoundEvent aah, final float float2, final float float3) {
+    public void playSound(final SoundEvent ack, final float float2, final float float3) {
         if (!this.isSilent()) {
-            this.level.playSound(null, this.getX(), this.getY(), this.getZ(), aah, this.getSoundSource(), float2, float3);
+            this.level.playSound(null, this.getX(), this.getY(), this.getZ(), ack, this.getSoundSource(), float2, float3);
         }
     }
     
@@ -842,10 +851,10 @@ public abstract class Entity implements Nameable, CommandSource {
         return true;
     }
     
-    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState byj, final BlockPos fk) {
+    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState cfj, final BlockPos fu) {
         if (boolean2) {
             if (this.fallDistance > 0.0f) {
-                byj.getBlock().fallOn(this.level, fk, this, this.fallDistance);
+                cfj.getBlock().fallOn(this.level, fu, this, this.fallDistance);
             }
             this.fallDistance = 0.0f;
         }
@@ -859,37 +868,30 @@ public abstract class Entity implements Nameable, CommandSource {
         return null;
     }
     
-    protected void burn(final int integer) {
-        if (!this.fireImmune()) {
-            this.hurt(DamageSource.IN_FIRE, (float)integer);
-        }
-    }
-    
-    public final boolean fireImmune() {
+    public boolean fireImmune() {
         return this.getType().fireImmune();
     }
     
     public boolean causeFallDamage(final float float1, final float float2) {
         if (this.isVehicle()) {
-            for (final Entity akq5 : this.getPassengers()) {
-                akq5.causeFallDamage(float1, float2);
+            for (final Entity aom5 : this.getPassengers()) {
+                aom5.causeFallDamage(float1, float2);
             }
         }
         return false;
     }
     
     public boolean isInWater() {
-        return this.wasInWater;
+        return this.wasTouchingWater;
     }
     
     private boolean isInRain() {
-        try (final BlockPos.PooledMutableBlockPos b2 = BlockPos.PooledMutableBlockPos.acquire(this)) {
-            return this.level.isRainingAt(b2) || this.level.isRainingAt(b2.set(this.getX(), this.getY() + this.dimensions.height, this.getZ()));
-        }
+        final BlockPos fu2 = this.blockPosition();
+        return this.level.isRainingAt(fu2) || this.level.isRainingAt(fu2.offset(0.0, this.dimensions.height, 0.0));
     }
     
     private boolean isInBubbleColumn() {
-        return this.level.getBlockState(new BlockPos(this)).getBlock() == Blocks.BUBBLE_COLUMN;
+        return this.level.getBlockState(this.blockPosition()).is(Blocks.BUBBLE_COLUMN);
     }
     
     public boolean isInWaterOrRain() {
@@ -905,13 +907,7 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public boolean isUnderWater() {
-        return this.wasUnderWater && this.isInWater();
-    }
-    
-    private void updateWaterState() {
-        this.updateInWaterState();
-        this.updateUnderWaterState();
-        this.updateSwimming();
+        return this.wasEyeInWater && this.isInWater();
     }
     
     public void updateSwimming() {
@@ -923,33 +919,62 @@ public abstract class Entity implements Nameable, CommandSource {
         }
     }
     
-    public boolean updateInWaterState() {
-        if (this.getVehicle() instanceof Boat) {
-            this.wasInWater = false;
+    protected boolean updateInWaterStateAndDoFluidPushing() {
+        this.fluidHeight.clear();
+        this.updateInWaterStateAndDoWaterCurrentPushing();
+        if (this.isInWater()) {
+            return true;
         }
-        else if (this.checkAndHandleWater(FluidTags.WATER)) {
-            if (!this.wasInWater && !this.firstTick) {
+        final double double2 = this.level.dimensionType().ultraWarm() ? 0.007 : 0.0023333333333333335;
+        return this.updateFluidHeightAndDoFluidPushing(FluidTags.LAVA, double2);
+    }
+    
+    void updateInWaterStateAndDoWaterCurrentPushing() {
+        if (this.getVehicle() instanceof Boat) {
+            this.wasTouchingWater = false;
+        }
+        else if (this.updateFluidHeightAndDoFluidPushing(FluidTags.WATER, 0.014)) {
+            if (!this.wasTouchingWater && !this.firstTick) {
                 this.doWaterSplashEffect();
             }
             this.fallDistance = 0.0f;
-            this.wasInWater = true;
+            this.wasTouchingWater = true;
             this.clearFire();
         }
         else {
-            this.wasInWater = false;
+            this.wasTouchingWater = false;
         }
-        return this.wasInWater;
     }
     
-    private void updateUnderWaterState() {
-        this.wasUnderWater = this.isUnderLiquid(FluidTags.WATER, true);
+    private void updateFluidOnEyes() {
+        this.wasEyeInWater = this.isEyeInFluid(FluidTags.WATER);
+        this.fluidOnEyes = null;
+        final double double2 = this.getEyeY() - 0.1111111119389534;
+        final Vec3 dem4 = new Vec3(this.getX(), double2, this.getZ());
+        final Entity aom5 = this.getVehicle();
+        if (aom5 instanceof Boat) {
+            final Boat bft6 = (Boat)aom5;
+            if (!bft6.isUnderWater() && bft6.getBoundingBox().contains(dem4)) {
+                return;
+            }
+        }
+        final BlockPos fu6 = new BlockPos(dem4);
+        final FluidState cxa7 = this.level.getFluidState(fu6);
+        for (final Tag<Fluid> adf9 : FluidTags.getWrappers()) {
+            if (cxa7.is(adf9)) {
+                final double double3 = fu6.getY() + cxa7.getHeight(this.level, fu6);
+                if (double3 > double2) {
+                    this.fluidOnEyes = adf9;
+                }
+            }
+        }
     }
     
     protected void doWaterSplashEffect() {
-        final Entity akq2 = (this.isVehicle() && this.getControllingPassenger() != null) ? this.getControllingPassenger() : this;
-        final float float3 = (akq2 == this) ? 0.2f : 0.9f;
-        final Vec3 cvl4 = akq2.getDeltaMovement();
-        float float4 = Mth.sqrt(cvl4.x * cvl4.x * 0.20000000298023224 + cvl4.y * cvl4.y + cvl4.z * cvl4.z * 0.20000000298023224) * float3;
+        final Entity aom2 = (this.isVehicle() && this.getControllingPassenger() != null) ? this.getControllingPassenger() : this;
+        final float float3 = (aom2 == this) ? 0.2f : 0.9f;
+        final Vec3 dem4 = aom2.getDeltaMovement();
+        float float4 = Mth.sqrt(dem4.x * dem4.x * 0.20000000298023224 + dem4.y * dem4.y + dem4.z * dem4.z * 0.20000000298023224) * float3;
         if (float4 > 1.0f) {
             float4 = 1.0f;
         }
@@ -961,74 +986,63 @@ public abstract class Entity implements Nameable, CommandSource {
         }
         final float float5 = (float)Mth.floor(this.getY());
         for (int integer7 = 0; integer7 < 1.0f + this.dimensions.width * 20.0f; ++integer7) {
-            final float float6 = (this.random.nextFloat() * 2.0f - 1.0f) * this.dimensions.width;
-            final float float7 = (this.random.nextFloat() * 2.0f - 1.0f) * this.dimensions.width;
-            this.level.addParticle(ParticleTypes.BUBBLE, this.getX() + float6, float5 + 1.0f, this.getZ() + float7, cvl4.x, cvl4.y - this.random.nextFloat() * 0.2f, cvl4.z);
+            final double double8 = (this.random.nextDouble() * 2.0 - 1.0) * this.dimensions.width;
+            final double double9 = (this.random.nextDouble() * 2.0 - 1.0) * this.dimensions.width;
+            this.level.addParticle(ParticleTypes.BUBBLE, this.getX() + double8, float5 + 1.0f, this.getZ() + double9, dem4.x, dem4.y - this.random.nextDouble() * 0.20000000298023224, dem4.z);
         }
         for (int integer7 = 0; integer7 < 1.0f + this.dimensions.width * 20.0f; ++integer7) {
-            final float float6 = (this.random.nextFloat() * 2.0f - 1.0f) * this.dimensions.width;
-            final float float7 = (this.random.nextFloat() * 2.0f - 1.0f) * this.dimensions.width;
-            this.level.addParticle(ParticleTypes.SPLASH, this.getX() + float6, float5 + 1.0f, this.getZ() + float7, cvl4.x, cvl4.y, cvl4.z);
+            final double double8 = (this.random.nextDouble() * 2.0 - 1.0) * this.dimensions.width;
+            final double double9 = (this.random.nextDouble() * 2.0 - 1.0) * this.dimensions.width;
+            this.level.addParticle(ParticleTypes.SPLASH, this.getX() + double8, float5 + 1.0f, this.getZ() + double9, dem4.x, dem4.y, dem4.z);
         }
     }
     
-    public void updateSprintingState() {
-        if (this.isSprinting() && !this.isInWater()) {
-            this.doSprintParticleEffect();
-        }
+    protected BlockState getBlockStateOn() {
+        return this.level.getBlockState(this.getOnPos());
     }
     
-    protected void doSprintParticleEffect() {
+    public boolean canSpawnSprintParticle() {
+        return this.isSprinting() && !this.isInWater() && !this.isSpectator() && !this.isCrouching() && !this.isInLava() && this.isAlive();
+    }
+    
+    protected void spawnSprintParticle() {
         final int integer2 = Mth.floor(this.getX());
         final int integer3 = Mth.floor(this.getY() - 0.20000000298023224);
         final int integer4 = Mth.floor(this.getZ());
-        final BlockPos fk5 = new BlockPos(integer2, integer3, integer4);
-        final BlockState byj6 = this.level.getBlockState(fk5);
-        if (byj6.getRenderShape() != RenderShape.INVISIBLE) {
-            final Vec3 cvl7 = this.getDeltaMovement();
-            this.level.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, byj6), this.getX() + (this.random.nextFloat() - 0.5) * this.dimensions.width, this.getY() + 0.1, this.getZ() + (this.random.nextFloat() - 0.5) * this.dimensions.width, cvl7.x * -4.0, 1.5, cvl7.z * -4.0);
+        final BlockPos fu5 = new BlockPos(integer2, integer3, integer4);
+        final BlockState cfj6 = this.level.getBlockState(fu5);
+        if (cfj6.getRenderShape() != RenderShape.INVISIBLE) {
+            final Vec3 dem7 = this.getDeltaMovement();
+            this.level.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, cfj6), this.getX() + (this.random.nextDouble() - 0.5) * this.dimensions.width, this.getY() + 0.1, this.getZ() + (this.random.nextDouble() - 0.5) * this.dimensions.width, dem7.x * -4.0, 1.5, dem7.z * -4.0);
         }
     }
     
-    public boolean isUnderLiquid(final Tag<Fluid> aaz) {
-        return this.isUnderLiquid(aaz, false);
-    }
-    
-    public boolean isUnderLiquid(final Tag<Fluid> aaz, final boolean boolean2) {
-        if (this.getVehicle() instanceof Boat) {
-            return false;
-        }
-        final double double4 = this.getEyeY();
-        final BlockPos fk6 = new BlockPos(this.getX(), double4, this.getZ());
-        if (boolean2 && !this.level.hasChunk(fk6.getX() >> 4, fk6.getZ() >> 4)) {
-            return false;
-        }
-        final FluidState coj7 = this.level.getFluidState(fk6);
-        return coj7.is(aaz) && double4 < fk6.getY() + (coj7.getHeight(this.level, fk6) + 0.11111111f);
+    public boolean isEyeInFluid(final Tag<Fluid> adf) {
+        return this.fluidOnEyes == adf;
     }
     
     public void setInLava() {
-        this.isInLava = true;
+        this.isTouchingLava = true;
     }
     
     public boolean isInLava() {
-        return this.isInLava;
+        return this.isTouchingLava;
     }
     
-    public void moveRelative(final float float1, final Vec3 cvl) {
-        final Vec3 cvl2 = getInputVector(cvl, float1, this.yRot);
-        this.setDeltaMovement(this.getDeltaMovement().add(cvl2));
+    public void moveRelative(final float float1, final Vec3 dem) {
+        final Vec3 dem2 = getInputVector(dem, float1, this.yRot);
+        this.setDeltaMovement(this.getDeltaMovement().add(dem2));
     }
     
-    private static Vec3 getInputVector(final Vec3 cvl, final float float2, final float float3) {
-        final double double4 = cvl.lengthSqr();
+    private static Vec3 getInputVector(final Vec3 dem, final float float2, final float float3) {
+        final double double4 = dem.lengthSqr();
         if (double4 < 1.0E-7) {
             return Vec3.ZERO;
         }
-        final Vec3 cvl2 = ((double4 > 1.0) ? cvl.normalize() : cvl).scale(float2);
+        final Vec3 dem2 = ((double4 > 1.0) ? dem.normalize() : dem).scale(float2);
         final float float4 = Mth.sin(float3 * 0.017453292f);
         final float float5 = Mth.cos(float3 * 0.017453292f);
-        return new Vec3(cvl2.x * float5 - cvl2.z * float4, cvl2.y, cvl2.z * float5 + cvl2.x * float4);
+        return new Vec3(dem2.x * float5 - dem2.z * float4, dem2.y, dem2.z * float5 + dem2.x * float4);
     }
     
     public float getBrightness() {
@@ -1040,8 +1054,8 @@ public abstract class Entity implements Nameable, CommandSource {
         return 0.0f;
     }
     
-    public void setLevel(final Level bjw) {
-        this.level = bjw;
+    public void setLevel(final Level bqb) {
+        this.level = bqb;
     }
     
     public void absMoveTo(final double double1, final double double2, final double double3, final float float4, final float float5) {
@@ -1054,8 +1068,16 @@ public abstract class Entity implements Nameable, CommandSource {
         this.xRotO = this.xRot;
     }
     
-    public void moveTo(final BlockPos fk, final float float2, final float float3) {
-        this.moveTo(fk.getX() + 0.5, fk.getY(), fk.getZ() + 0.5, float2, float3);
+    public void moveTo(final Vec3 dem) {
+        this.moveTo(dem.x, dem.y, dem.z);
+    }
+    
+    public void moveTo(final double double1, final double double2, final double double3) {
+        this.moveTo(double1, double2, double3, this.yRot, this.xRot);
+    }
+    
+    public void moveTo(final BlockPos fu, final float float2, final float float3) {
+        this.moveTo(fu.getX() + 0.5, fu.getY(), fu.getZ() + 0.5, float2, float3);
     }
     
     public void moveTo(final double double1, final double double2, final double double3, final float float4, final float float5) {
@@ -1075,10 +1097,10 @@ public abstract class Entity implements Nameable, CommandSource {
         this.zOld = double3;
     }
     
-    public float distanceTo(final Entity akq) {
-        final float float3 = (float)(this.getX() - akq.getX());
-        final float float4 = (float)(this.getY() - akq.getY());
-        final float float5 = (float)(this.getZ() - akq.getZ());
+    public float distanceTo(final Entity aom) {
+        final float float3 = (float)(this.getX() - aom.getX());
+        final float float4 = (float)(this.getY() - aom.getY());
+        final float float5 = (float)(this.getZ() - aom.getZ());
         return Mth.sqrt(float3 * float3 + float4 * float4 + float5 * float5);
     }
     
@@ -1089,29 +1111,29 @@ public abstract class Entity implements Nameable, CommandSource {
         return double4 * double4 + double5 * double5 + double6 * double6;
     }
     
-    public double distanceToSqr(final Entity akq) {
-        return this.distanceToSqr(akq.position());
+    public double distanceToSqr(final Entity aom) {
+        return this.distanceToSqr(aom.position());
     }
     
-    public double distanceToSqr(final Vec3 cvl) {
-        final double double3 = this.getX() - cvl.x;
-        final double double4 = this.getY() - cvl.y;
-        final double double5 = this.getZ() - cvl.z;
+    public double distanceToSqr(final Vec3 dem) {
+        final double double3 = this.getX() - dem.x;
+        final double double4 = this.getY() - dem.y;
+        final double double5 = this.getZ() - dem.z;
         return double3 * double3 + double4 * double4 + double5 * double5;
     }
     
-    public void playerTouch(final Player ayj) {
+    public void playerTouch(final Player bec) {
     }
     
-    public void push(final Entity akq) {
-        if (this.isPassengerOfSameVehicle(akq)) {
+    public void push(final Entity aom) {
+        if (this.isPassengerOfSameVehicle(aom)) {
             return;
         }
-        if (akq.noPhysics || this.noPhysics) {
+        if (aom.noPhysics || this.noPhysics) {
             return;
         }
-        double double3 = akq.getX() - this.getX();
-        double double4 = akq.getZ() - this.getZ();
+        double double3 = aom.getX() - this.getX();
+        double double4 = aom.getZ() - this.getZ();
         double double5 = Mth.absMax(double3, double4);
         if (double5 >= 0.009999999776482582) {
             double5 = Mth.sqrt(double5);
@@ -1130,8 +1152,8 @@ public abstract class Entity implements Nameable, CommandSource {
             if (!this.isVehicle()) {
                 this.push(-double3, 0.0, -double4);
             }
-            if (!akq.isVehicle()) {
-                akq.push(double3, 0.0, double4);
+            if (!aom.isVehicle()) {
+                aom.push(double3, 0.0, double4);
             }
         }
     }
@@ -1145,8 +1167,8 @@ public abstract class Entity implements Nameable, CommandSource {
         this.hurtMarked = true;
     }
     
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
         this.markHurt();
@@ -1200,10 +1222,10 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public HitResult pick(final double double1, final float float2, final boolean boolean3) {
-        final Vec3 cvl6 = this.getEyePosition(float2);
-        final Vec3 cvl7 = this.getViewVector(float2);
-        final Vec3 cvl8 = cvl6.add(cvl7.x * double1, cvl7.y * double1, cvl7.z * double1);
-        return this.level.clip(new ClipContext(cvl6, cvl8, ClipContext.Block.OUTLINE, boolean3 ? ClipContext.Fluid.ANY : ClipContext.Fluid.NONE, this));
+        final Vec3 dem6 = this.getEyePosition(float2);
+        final Vec3 dem7 = this.getViewVector(float2);
+        final Vec3 dem8 = dem6.add(dem7.x * double1, dem7.y * double1, dem7.z * double1);
+        return this.level.clip(new ClipContext(dem6, dem8, ClipContext.Block.OUTLINE, boolean3 ? ClipContext.Fluid.ANY : ClipContext.Fluid.NONE, this));
     }
     
     public boolean isPickable() {
@@ -1214,9 +1236,9 @@ public abstract class Entity implements Nameable, CommandSource {
         return false;
     }
     
-    public void awardKillScore(final Entity akq, final int integer, final DamageSource ajz) {
-        if (akq instanceof ServerPlayer) {
-            CriteriaTriggers.ENTITY_KILLED_PLAYER.trigger((ServerPlayer)akq, this, ajz);
+    public void awardKillScore(final Entity aom, final int integer, final DamageSource anw) {
+        if (aom instanceof ServerPlayer) {
+            CriteriaTriggers.ENTITY_KILLED_PLAYER.trigger((ServerPlayer)aom, this, anw);
         }
     }
     
@@ -1237,107 +1259,108 @@ public abstract class Entity implements Nameable, CommandSource {
         return double1 < double2 * double2;
     }
     
-    public boolean saveAsPassenger(final CompoundTag jt) {
+    public boolean saveAsPassenger(final CompoundTag le) {
         final String string3 = this.getEncodeId();
         if (this.removed || string3 == null) {
             return false;
         }
-        jt.putString("id", string3);
-        this.saveWithoutId(jt);
+        le.putString("id", string3);
+        this.saveWithoutId(le);
         return true;
     }
     
-    public boolean save(final CompoundTag jt) {
-        return !this.isPassenger() && this.saveAsPassenger(jt);
+    public boolean save(final CompoundTag le) {
+        return !this.isPassenger() && this.saveAsPassenger(le);
     }
     
-    public CompoundTag saveWithoutId(final CompoundTag jt) {
+    public CompoundTag saveWithoutId(final CompoundTag le) {
         try {
-            jt.put("Pos", this.newDoubleList(this.getX(), this.getY(), this.getZ()));
-            final Vec3 cvl3 = this.getDeltaMovement();
-            jt.put("Motion", this.newDoubleList(cvl3.x, cvl3.y, cvl3.z));
-            jt.put("Rotation", this.newFloatList(this.yRot, this.xRot));
-            jt.putFloat("FallDistance", this.fallDistance);
-            jt.putShort("Fire", (short)this.remainingFireTicks);
-            jt.putShort("Air", (short)this.getAirSupply());
-            jt.putBoolean("OnGround", this.onGround);
-            jt.putInt("Dimension", this.dimension.getId());
-            jt.putBoolean("Invulnerable", this.invulnerable);
-            jt.putInt("PortalCooldown", this.changingDimensionDelay);
-            jt.putUUID("UUID", this.getUUID());
-            final Component lf4 = this.getCustomName();
-            if (lf4 != null) {
-                jt.putString("CustomName", Component.Serializer.toJson(lf4));
+            if (this.vehicle != null) {
+                le.put("Pos", this.newDoubleList(this.vehicle.getX(), this.vehicle.getY(), this.vehicle.getZ()));
+            }
+            else {
+                le.put("Pos", this.newDoubleList(this.getX(), this.getY(), this.getZ()));
+            }
+            final Vec3 dem3 = this.getDeltaMovement();
+            le.put("Motion", this.newDoubleList(dem3.x, dem3.y, dem3.z));
+            le.put("Rotation", this.newFloatList(this.yRot, this.xRot));
+            le.putFloat("FallDistance", this.fallDistance);
+            le.putShort("Fire", (short)this.remainingFireTicks);
+            le.putShort("Air", (short)this.getAirSupply());
+            le.putBoolean("OnGround", this.onGround);
+            le.putBoolean("Invulnerable", this.invulnerable);
+            le.putInt("PortalCooldown", this.changingDimensionDelay);
+            le.putUUID("UUID", this.getUUID());
+            final Component mr4 = this.getCustomName();
+            if (mr4 != null) {
+                le.putString("CustomName", Component.Serializer.toJson(mr4));
             }
             if (this.isCustomNameVisible()) {
-                jt.putBoolean("CustomNameVisible", this.isCustomNameVisible());
+                le.putBoolean("CustomNameVisible", this.isCustomNameVisible());
             }
             if (this.isSilent()) {
-                jt.putBoolean("Silent", this.isSilent());
+                le.putBoolean("Silent", this.isSilent());
             }
             if (this.isNoGravity()) {
-                jt.putBoolean("NoGravity", this.isNoGravity());
+                le.putBoolean("NoGravity", this.isNoGravity());
             }
             if (this.glowing) {
-                jt.putBoolean("Glowing", this.glowing);
+                le.putBoolean("Glowing", this.glowing);
             }
             if (!this.tags.isEmpty()) {
-                final ListTag jz5 = new ListTag();
+                final ListTag lk5 = new ListTag();
                 for (final String string7 : this.tags) {
-                    ((AbstractList<StringTag>)jz5).add(StringTag.valueOf(string7));
+                    ((AbstractList<StringTag>)lk5).add(StringTag.valueOf(string7));
                 }
-                jt.put("Tags", jz5);
+                le.put("Tags", lk5);
             }
-            this.addAdditionalSaveData(jt);
+            this.addAdditionalSaveData(le);
             if (this.isVehicle()) {
-                final ListTag jz5 = new ListTag();
-                for (final Entity akq7 : this.getPassengers()) {
-                    final CompoundTag jt2 = new CompoundTag();
-                    if (akq7.saveAsPassenger(jt2)) {
-                        ((AbstractList<CompoundTag>)jz5).add(jt2);
+                final ListTag lk5 = new ListTag();
+                for (final Entity aom7 : this.getPassengers()) {
+                    final CompoundTag le2 = new CompoundTag();
+                    if (aom7.saveAsPassenger(le2)) {
+                        ((AbstractList<CompoundTag>)lk5).add(le2);
                     }
                 }
-                if (!jz5.isEmpty()) {
-                    jt.put("Passengers", jz5);
+                if (!lk5.isEmpty()) {
+                    le.put("Passengers", lk5);
                 }
             }
         }
         catch (Throwable throwable3) {
-            final CrashReport h4 = CrashReport.forThrowable(throwable3, "Saving entity NBT");
-            final CrashReportCategory i5 = h4.addCategory("Entity being saved");
-            this.fillCrashReportCategory(i5);
-            throw new ReportedException(h4);
+            final CrashReport j4 = CrashReport.forThrowable(throwable3, "Saving entity NBT");
+            final CrashReportCategory k5 = j4.addCategory("Entity being saved");
+            this.fillCrashReportCategory(k5);
+            throw new ReportedException(j4);
         }
-        return jt;
+        return le;
     }
     
-    public void load(final CompoundTag jt) {
+    public void load(final CompoundTag le) {
         try {
-            final ListTag jz3 = jt.getList("Pos", 6);
-            final ListTag jz4 = jt.getList("Motion", 6);
-            final ListTag jz5 = jt.getList("Rotation", 5);
-            final double double6 = jz4.getDouble(0);
-            final double double7 = jz4.getDouble(1);
-            final double double8 = jz4.getDouble(2);
+            final ListTag lk3 = le.getList("Pos", 6);
+            final ListTag lk4 = le.getList("Motion", 6);
+            final ListTag lk5 = le.getList("Rotation", 5);
+            final double double6 = lk4.getDouble(0);
+            final double double7 = lk4.getDouble(1);
+            final double double8 = lk4.getDouble(2);
             this.setDeltaMovement((Math.abs(double6) > 10.0) ? 0.0 : double6, (Math.abs(double7) > 10.0) ? 0.0 : double7, (Math.abs(double8) > 10.0) ? 0.0 : double8);
-            this.setPosAndOldPos(jz3.getDouble(0), jz3.getDouble(1), jz3.getDouble(2));
-            this.yRot = jz5.getFloat(0);
-            this.xRot = jz5.getFloat(1);
+            this.setPosAndOldPos(lk3.getDouble(0), lk3.getDouble(1), lk3.getDouble(2));
+            this.yRot = lk5.getFloat(0);
+            this.xRot = lk5.getFloat(1);
             this.yRotO = this.yRot;
             this.xRotO = this.xRot;
             this.setYHeadRot(this.yRot);
             this.setYBodyRot(this.yRot);
-            this.fallDistance = jt.getFloat("FallDistance");
-            this.remainingFireTicks = jt.getShort("Fire");
-            this.setAirSupply(jt.getShort("Air"));
-            this.onGround = jt.getBoolean("OnGround");
-            if (jt.contains("Dimension")) {
-                this.dimension = DimensionType.getById(jt.getInt("Dimension"));
-            }
-            this.invulnerable = jt.getBoolean("Invulnerable");
-            this.changingDimensionDelay = jt.getInt("PortalCooldown");
-            if (jt.hasUUID("UUID")) {
-                this.uuid = jt.getUUID("UUID");
+            this.fallDistance = le.getFloat("FallDistance");
+            this.remainingFireTicks = le.getShort("Fire");
+            this.setAirSupply(le.getShort("Air"));
+            this.onGround = le.getBoolean("OnGround");
+            this.invulnerable = le.getBoolean("Invulnerable");
+            this.changingDimensionDelay = le.getInt("PortalCooldown");
+            if (le.hasUUID("UUID")) {
+                this.uuid = le.getUUID("UUID");
                 this.stringUUID = this.uuid.toString();
             }
             if (!Double.isFinite(this.getX()) || !Double.isFinite(this.getY()) || !Double.isFinite(this.getZ())) {
@@ -1348,30 +1371,36 @@ public abstract class Entity implements Nameable, CommandSource {
             }
             this.reapplyPosition();
             this.setRot(this.yRot, this.xRot);
-            if (jt.contains("CustomName", 8)) {
-                this.setCustomName(Component.Serializer.fromJson(jt.getString("CustomName")));
-            }
-            this.setCustomNameVisible(jt.getBoolean("CustomNameVisible"));
-            this.setSilent(jt.getBoolean("Silent"));
-            this.setNoGravity(jt.getBoolean("NoGravity"));
-            this.setGlowing(jt.getBoolean("Glowing"));
-            if (jt.contains("Tags", 9)) {
-                this.tags.clear();
-                final ListTag jz6 = jt.getList("Tags", 8);
-                for (int integer13 = Math.min(jz6.size(), 1024), integer14 = 0; integer14 < integer13; ++integer14) {
-                    this.tags.add(jz6.getString(integer14));
+            if (le.contains("CustomName", 8)) {
+                final String string12 = le.getString("CustomName");
+                try {
+                    this.setCustomName(Component.Serializer.fromJson(string12));
+                }
+                catch (Exception exception13) {
+                    Entity.LOGGER.warn("Failed to parse entity custom name {}", string12, exception13);
                 }
             }
-            this.readAdditionalSaveData(jt);
+            this.setCustomNameVisible(le.getBoolean("CustomNameVisible"));
+            this.setSilent(le.getBoolean("Silent"));
+            this.setNoGravity(le.getBoolean("NoGravity"));
+            this.setGlowing(le.getBoolean("Glowing"));
+            if (le.contains("Tags", 9)) {
+                this.tags.clear();
+                final ListTag lk6 = le.getList("Tags", 8);
+                for (int integer13 = Math.min(lk6.size(), 1024), integer14 = 0; integer14 < integer13; ++integer14) {
+                    this.tags.add(lk6.getString(integer14));
+                }
+            }
+            this.readAdditionalSaveData(le);
             if (this.repositionEntityAfterLoad()) {
                 this.reapplyPosition();
             }
         }
         catch (Throwable throwable3) {
-            final CrashReport h4 = CrashReport.forThrowable(throwable3, "Loading entity NBT");
-            final CrashReportCategory i5 = h4.addCategory("Entity being loaded");
-            this.fillCrashReportCategory(i5);
-            throw new ReportedException(h4);
+            final CrashReport j4 = CrashReport.forThrowable(throwable3, "Loading entity NBT");
+            final CrashReportCategory k5 = j4.addCategory("Entity being loaded");
+            this.fillCrashReportCategory(k5);
+            throw new ReportedException(j4);
         }
     }
     
@@ -1381,58 +1410,58 @@ public abstract class Entity implements Nameable, CommandSource {
     
     @Nullable
     protected final String getEncodeId() {
-        final EntityType<?> aku2 = this.getType();
-        final ResourceLocation sm3 = EntityType.getKey(aku2);
-        return (!aku2.canSerialize() || sm3 == null) ? null : sm3.toString();
+        final EntityType<?> aoq2 = this.getType();
+        final ResourceLocation uh3 = EntityType.getKey(aoq2);
+        return (!aoq2.canSerialize() || uh3 == null) ? null : uh3.toString();
     }
     
-    protected abstract void readAdditionalSaveData(final CompoundTag jt);
+    protected abstract void readAdditionalSaveData(final CompoundTag le);
     
-    protected abstract void addAdditionalSaveData(final CompoundTag jt);
+    protected abstract void addAdditionalSaveData(final CompoundTag le);
     
     protected ListTag newDoubleList(final double... arr) {
-        final ListTag jz3 = new ListTag();
+        final ListTag lk3 = new ListTag();
         for (final double double7 : arr) {
-            ((AbstractList<DoubleTag>)jz3).add(DoubleTag.valueOf(double7));
+            ((AbstractList<DoubleTag>)lk3).add(DoubleTag.valueOf(double7));
         }
-        return jz3;
+        return lk3;
     }
     
     protected ListTag newFloatList(final float... arr) {
-        final ListTag jz3 = new ListTag();
+        final ListTag lk3 = new ListTag();
         for (final float float7 : arr) {
-            ((AbstractList<FloatTag>)jz3).add(FloatTag.valueOf(float7));
+            ((AbstractList<FloatTag>)lk3).add(FloatTag.valueOf(float7));
         }
-        return jz3;
+        return lk3;
     }
     
     @Nullable
-    public ItemEntity spawnAtLocation(final ItemLike bjv) {
-        return this.spawnAtLocation(bjv, 0);
+    public ItemEntity spawnAtLocation(final ItemLike bqa) {
+        return this.spawnAtLocation(bqa, 0);
     }
     
     @Nullable
-    public ItemEntity spawnAtLocation(final ItemLike bjv, final int integer) {
-        return this.spawnAtLocation(new ItemStack(bjv), (float)integer);
+    public ItemEntity spawnAtLocation(final ItemLike bqa, final int integer) {
+        return this.spawnAtLocation(new ItemStack(bqa), (float)integer);
     }
     
     @Nullable
-    public ItemEntity spawnAtLocation(final ItemStack ben) {
-        return this.spawnAtLocation(ben, 0.0f);
+    public ItemEntity spawnAtLocation(final ItemStack bki) {
+        return this.spawnAtLocation(bki, 0.0f);
     }
     
     @Nullable
-    public ItemEntity spawnAtLocation(final ItemStack ben, final float float2) {
-        if (ben.isEmpty()) {
+    public ItemEntity spawnAtLocation(final ItemStack bki, final float float2) {
+        if (bki.isEmpty()) {
             return null;
         }
         if (this.level.isClientSide) {
             return null;
         }
-        final ItemEntity awb4 = new ItemEntity(this.level, this.getX(), this.getY() + float2, this.getZ(), ben);
-        awb4.setDefaultPickUpDelay();
-        this.level.addFreshEntity(awb4);
-        return awb4;
+        final ItemEntity bbg4 = new ItemEntity(this.level, this.getX(), this.getY() + float2, this.getZ(), bki);
+        bbg4.setDefaultPickUpDelay();
+        this.level.addFreshEntity(bbg4);
+        return bbg4;
     }
     
     public boolean isAlive() {
@@ -1443,28 +1472,18 @@ public abstract class Entity implements Nameable, CommandSource {
         if (this.noPhysics) {
             return false;
         }
-        try (final BlockPos.PooledMutableBlockPos b2 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (int integer4 = 0; integer4 < 8; ++integer4) {
-                final int integer5 = Mth.floor(this.getY() + ((integer4 >> 0) % 2 - 0.5f) * 0.1f + this.eyeHeight);
-                final int integer6 = Mth.floor(this.getX() + ((integer4 >> 1) % 2 - 0.5f) * this.dimensions.width * 0.8f);
-                final int integer7 = Mth.floor(this.getZ() + ((integer4 >> 2) % 2 - 0.5f) * this.dimensions.width * 0.8f);
-                if (b2.getX() != integer6 || b2.getY() != integer5 || b2.getZ() != integer7) {
-                    b2.set(integer6, integer5, integer7);
-                    if (this.level.getBlockState(b2).isSuffocating(this.level, b2)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
+        final float float2 = 0.1f;
+        final float float3 = this.dimensions.width * 0.8f;
+        final AABB deg4 = AABB.ofSize(float3, 0.10000000149011612, float3).move(this.getX(), this.getEyeY(), this.getZ());
+        return this.level.getBlockCollisions(this, deg4, (cfj, fu) -> cfj.isSuffocating(this.level, fu)).findAny().isPresent();
     }
     
-    public boolean interact(final Player ayj, final InteractionHand ajk) {
-        return false;
+    public InteractionResult interact(final Player bec, final InteractionHand anf) {
+        return InteractionResult.PASS;
     }
     
     @Nullable
-    public AABB getCollideAgainstBox(final Entity akq) {
+    public AABB getCollideAgainstBox(final Entity aom) {
         return null;
     }
     
@@ -1477,58 +1496,60 @@ public abstract class Entity implements Nameable, CommandSource {
         this.getVehicle().positionRider(this);
     }
     
-    public void positionRider(final Entity akq) {
-        this.positionRider(akq, Entity::setPos);
+    public void positionRider(final Entity aom) {
+        this.positionRider(aom, Entity::setPos);
     }
     
-    public void positionRider(final Entity akq, final MoveCallback a) {
-        if (!this.hasPassenger(akq)) {
+    private void positionRider(final Entity aom, final MoveFunction a) {
+        if (!this.hasPassenger(aom)) {
             return;
         }
-        a.accept(akq, this.getX(), this.getY() + this.getRideHeight() + akq.getRidingHeight(), this.getZ());
+        final double double4 = this.getY() + this.getPassengersRidingOffset() + aom.getMyRidingOffset();
+        a.accept(aom, this.getX(), double4, this.getZ());
     }
     
-    public void onPassengerTurned(final Entity akq) {
+    public void onPassengerTurned(final Entity aom) {
     }
     
-    public double getRidingHeight() {
+    public double getMyRidingOffset() {
         return 0.0;
     }
     
-    public double getRideHeight() {
+    public double getPassengersRidingOffset() {
         return this.dimensions.height * 0.75;
     }
     
-    public boolean startRiding(final Entity akq) {
-        return this.startRiding(akq, false);
+    public boolean startRiding(final Entity aom) {
+        return this.startRiding(aom, false);
     }
     
     public boolean showVehicleHealth() {
         return this instanceof LivingEntity;
     }
     
-    public boolean startRiding(final Entity akq, final boolean boolean2) {
-        for (Entity akq2 = akq; akq2.vehicle != null; akq2 = akq2.vehicle) {
-            if (akq2.vehicle == this) {
+    public boolean startRiding(final Entity aom, final boolean boolean2) {
+        for (Entity aom2 = aom; aom2.vehicle != null; aom2 = aom2.vehicle) {
+            if (aom2.vehicle == this) {
                 return false;
             }
         }
-        if (!boolean2 && (!this.canRide(akq) || !akq.canAddPassenger(this))) {
+        if (!boolean2 && (!this.canRide(aom) || !aom.canAddPassenger(this))) {
             return false;
         }
         if (this.isPassenger()) {
             this.stopRiding();
         }
-        (this.vehicle = akq).addPassenger(this);
+        this.setPose(Pose.STANDING);
+        (this.vehicle = aom).addPassenger(this);
         return true;
     }
     
-    protected boolean canRide(final Entity akq) {
-        return this.boardingCooldown <= 0;
+    protected boolean canRide(final Entity aom) {
+        return !this.isShiftKeyDown() && this.boardingCooldown <= 0;
     }
     
-    protected boolean canEnterPose(final Pose alj) {
-        return this.level.noCollision(this, this.getBoundingBoxForPose(alj));
+    protected boolean canEnterPose(final Pose apj) {
+        return this.level.noCollision(this, this.getBoundingBoxForPose(apj).deflate(1.0E-7));
     }
     
     public void ejectPassengers() {
@@ -1537,35 +1558,39 @@ public abstract class Entity implements Nameable, CommandSource {
         }
     }
     
-    public void stopRiding() {
+    public void removeVehicle() {
         if (this.vehicle != null) {
-            final Entity akq2 = this.vehicle;
+            final Entity aom2 = this.vehicle;
             this.vehicle = null;
-            akq2.removePassenger(this);
+            aom2.removePassenger(this);
         }
     }
     
-    protected void addPassenger(final Entity akq) {
-        if (akq.getVehicle() != this) {
+    public void stopRiding() {
+        this.removeVehicle();
+    }
+    
+    protected void addPassenger(final Entity aom) {
+        if (aom.getVehicle() != this) {
             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
         }
-        if (!this.level.isClientSide && akq instanceof Player && !(this.getControllingPassenger() instanceof Player)) {
-            this.passengers.add(0, akq);
+        if (!this.level.isClientSide && aom instanceof Player && !(this.getControllingPassenger() instanceof Player)) {
+            this.passengers.add(0, aom);
         }
         else {
-            this.passengers.add(akq);
+            this.passengers.add(aom);
         }
     }
     
-    protected void removePassenger(final Entity akq) {
-        if (akq.getVehicle() == this) {
+    protected void removePassenger(final Entity aom) {
+        if (aom.getVehicle() == this) {
             throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
         }
-        this.passengers.remove(akq);
-        akq.boardingCooldown = 60;
+        this.passengers.remove(aom);
+        aom.boardingCooldown = 60;
     }
     
-    protected boolean canAddPassenger(final Entity akq) {
+    protected boolean canAddPassenger(final Entity aom) {
         return this.getPassengers().size() < 1;
     }
     
@@ -1594,18 +1619,18 @@ public abstract class Entity implements Nameable, CommandSource {
         return Vec3.directionFromRotation(this.getRotationVector());
     }
     
-    public void handleInsidePortal(final BlockPos fk) {
+    public void handleInsidePortal(final BlockPos fu) {
         if (this.changingDimensionDelay > 0) {
             this.changingDimensionDelay = this.getDimensionChangingDelay();
             return;
         }
-        if (!this.level.isClientSide && !fk.equals(this.portalEntranceBlock)) {
-            this.portalEntranceBlock = new BlockPos(fk);
+        if (!this.level.isClientSide && !fu.equals(this.portalEntranceBlock)) {
+            this.portalEntranceBlock = new BlockPos(fu);
             final NetherPortalBlock netherPortalBlock = (NetherPortalBlock)Blocks.NETHER_PORTAL;
             final BlockPattern.BlockPatternMatch b3 = NetherPortalBlock.getPortalShape(this.level, this.portalEntranceBlock);
             final double double4 = (b3.getForwards().getAxis() == Direction.Axis.X) ? b3.getFrontTopLeft().getZ() : ((double)b3.getFrontTopLeft().getX());
-            final double double5 = Math.abs(Mth.pct(((b3.getForwards().getAxis() == Direction.Axis.X) ? this.getZ() : this.getX()) - (double)((b3.getForwards().getClockWise().getAxisDirection() == Direction.AxisDirection.NEGATIVE) ? 1 : 0), double4, double4 - b3.getWidth()));
-            final double double6 = Mth.pct(this.getY() - 1.0, b3.getFrontTopLeft().getY(), b3.getFrontTopLeft().getY() - b3.getHeight());
+            final double double5 = Mth.clamp(Math.abs(Mth.inverseLerp(((b3.getForwards().getAxis() == Direction.Axis.X) ? this.getZ() : this.getX()) - (double)((b3.getForwards().getClockWise().getAxisDirection() == Direction.AxisDirection.NEGATIVE) ? 1 : 0), double4, double4 - b3.getWidth())), 0.0, 1.0);
+            final double double6 = Mth.clamp(Mth.inverseLerp(this.getY() - 1.0, b3.getFrontTopLeft().getY(), b3.getFrontTopLeft().getY() - b3.getHeight()), 0.0, 1.0);
             this.portalEntranceOffset = new Vec3(double5, double6, 0.0);
             this.portalEntranceForwards = b3.getForwards();
         }
@@ -1617,12 +1642,16 @@ public abstract class Entity implements Nameable, CommandSource {
             return;
         }
         final int integer2 = this.getPortalWaitTime();
+        final ServerLevel zd3 = (ServerLevel)this.level;
         if (this.isInsidePortal) {
-            if (this.level.getServer().isNetherEnabled() && !this.isPassenger() && this.portalTime++ >= integer2) {
+            final MinecraftServer minecraftServer4 = zd3.getServer();
+            final ResourceKey<Level> ug5 = (this.level.dimension() == Level.NETHER) ? Level.OVERWORLD : Level.NETHER;
+            final ServerLevel zd4 = minecraftServer4.getLevel(ug5);
+            if (zd4 != null && minecraftServer4.isNetherEnabled() && !this.isPassenger() && this.portalTime++ >= integer2) {
                 this.level.getProfiler().push("portal");
                 this.portalTime = integer2;
                 this.changingDimensionDelay = this.getDimensionChangingDelay();
-                this.changeDimension((this.level.dimension.getType() == DimensionType.NETHER) ? DimensionType.OVERWORLD : DimensionType.NETHER);
+                this.changeDimension(zd4);
                 this.level.getProfiler().pop();
             }
             this.isInsidePortal = false;
@@ -1670,7 +1699,7 @@ public abstract class Entity implements Nameable, CommandSource {
         return Iterables.<ItemStack>concat(this.getHandSlots(), this.getArmorSlots());
     }
     
-    public void setItemSlot(final EquipmentSlot akv, final ItemStack ben) {
+    public void setItemSlot(final EquipmentSlot aor, final ItemStack bki) {
     }
     
     public boolean isOnFire() {
@@ -1757,12 +1786,12 @@ public abstract class Entity implements Nameable, CommandSource {
         return this.getSharedFlag(5);
     }
     
-    public boolean isInvisibleTo(final Player ayj) {
-        if (ayj.isSpectator()) {
+    public boolean isInvisibleTo(final Player bec) {
+        if (bec.isSpectator()) {
             return false;
         }
-        final Team cwn3 = this.getTeam();
-        return (cwn3 == null || ayj == null || ayj.getTeam() != cwn3 || !cwn3.canSeeFriendlyInvisibles()) && this.isInvisible();
+        final Team dfo3 = this.getTeam();
+        return (dfo3 == null || bec == null || bec.getTeam() != dfo3 || !dfo3.canSeeFriendlyInvisibles()) && this.isInvisible();
     }
     
     @Nullable
@@ -1770,12 +1799,12 @@ public abstract class Entity implements Nameable, CommandSource {
         return this.level.getScoreboard().getPlayersTeam(this.getScoreboardName());
     }
     
-    public boolean isAlliedTo(final Entity akq) {
-        return this.isAlliedTo(akq.getTeam());
+    public boolean isAlliedTo(final Entity aom) {
+        return this.isAlliedTo(aom.getTeam());
     }
     
-    public boolean isAlliedTo(final Team cwn) {
-        return this.getTeam() != null && this.getTeam().isAlliedTo(cwn);
+    public boolean isAlliedTo(final Team dfo) {
+        return this.getTeam() != null && this.getTeam().isAlliedTo(dfo);
     }
     
     public void setInvisible(final boolean boolean1) {
@@ -1808,8 +1837,8 @@ public abstract class Entity implements Nameable, CommandSource {
         this.entityData.<Integer>set(Entity.DATA_AIR_SUPPLY_ID, integer);
     }
     
-    public void thunderHit(final LightningBolt avy) {
-        ++this.remainingFireTicks;
+    public void thunderHit(final LightningBolt aox) {
+        this.setRemainingFireTicks(this.remainingFireTicks + 1);
         if (this.remainingFireTicks == 0) {
             this.setSecondsOnFire(8);
         }
@@ -1817,80 +1846,82 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public void onAboveBubbleCol(final boolean boolean1) {
-        final Vec3 cvl3 = this.getDeltaMovement();
+        final Vec3 dem3 = this.getDeltaMovement();
         double double4;
         if (boolean1) {
-            double4 = Math.max(-0.9, cvl3.y - 0.03);
+            double4 = Math.max(-0.9, dem3.y - 0.03);
         }
         else {
-            double4 = Math.min(1.8, cvl3.y + 0.1);
+            double4 = Math.min(1.8, dem3.y + 0.1);
         }
-        this.setDeltaMovement(cvl3.x, double4, cvl3.z);
+        this.setDeltaMovement(dem3.x, double4, dem3.z);
     }
     
     public void onInsideBubbleColumn(final boolean boolean1) {
-        final Vec3 cvl3 = this.getDeltaMovement();
+        final Vec3 dem3 = this.getDeltaMovement();
         double double4;
         if (boolean1) {
-            double4 = Math.max(-0.3, cvl3.y - 0.03);
+            double4 = Math.max(-0.3, dem3.y - 0.03);
         }
         else {
-            double4 = Math.min(0.7, cvl3.y + 0.06);
+            double4 = Math.min(0.7, dem3.y + 0.06);
         }
-        this.setDeltaMovement(cvl3.x, double4, cvl3.z);
+        this.setDeltaMovement(dem3.x, double4, dem3.z);
         this.fallDistance = 0.0f;
     }
     
-    public void killed(final LivingEntity akz) {
+    public void killed(final LivingEntity aoy) {
     }
     
     protected void checkInBlock(final double double1, final double double2, final double double3) {
-        final BlockPos fk8 = new BlockPos(double1, double2, double3);
-        final Vec3 cvl9 = new Vec3(double1 - fk8.getX(), double2 - fk8.getY(), double3 - fk8.getZ());
+        final BlockPos fu8 = new BlockPos(double1, double2, double3);
+        final Vec3 dem9 = new Vec3(double1 - fu8.getX(), double2 - fu8.getY(), double3 - fu8.getZ());
         final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
-        Direction fp11 = Direction.UP;
+        Direction fz11 = Direction.UP;
         double double4 = Double.MAX_VALUE;
-        for (final Direction fp12 : new Direction[] { Direction.NORTH, Direction.SOUTH, Direction.WEST, Direction.EAST, Direction.UP }) {
-            a10.set(fk8).move(fp12);
+        for (final Direction fz12 : new Direction[] { Direction.NORTH, Direction.SOUTH, Direction.WEST, Direction.EAST, Direction.UP }) {
+            a10.setWithOffset(fu8, fz12);
             if (!this.level.getBlockState(a10).isCollisionShapeFullBlock(this.level, a10)) {
-                final double double5 = cvl9.get(fp12.getAxis());
-                final double double6 = (fp12.getAxisDirection() == Direction.AxisDirection.POSITIVE) ? (1.0 - double5) : double5;
+                final double double5 = dem9.get(fz12.getAxis());
+                final double double6 = (fz12.getAxisDirection() == Direction.AxisDirection.POSITIVE) ? (1.0 - double5) : double5;
                 if (double6 < double4) {
                     double4 = double6;
-                    fp11 = fp12;
+                    fz11 = fz12;
                 }
             }
         }
         final float float14 = this.random.nextFloat() * 0.2f + 0.1f;
-        final float float15 = (float)fp11.getAxisDirection().getStep();
-        final Vec3 cvl10 = this.getDeltaMovement().scale(0.75);
-        if (fp11.getAxis() == Direction.Axis.X) {
-            this.setDeltaMovement(float15 * float14, cvl10.y, cvl10.z);
+        final float float15 = (float)fz11.getAxisDirection().getStep();
+        final Vec3 dem10 = this.getDeltaMovement().scale(0.75);
+        if (fz11.getAxis() == Direction.Axis.X) {
+            this.setDeltaMovement(float15 * float14, dem10.y, dem10.z);
         }
-        else if (fp11.getAxis() == Direction.Axis.Y) {
-            this.setDeltaMovement(cvl10.x, float15 * float14, cvl10.z);
+        else if (fz11.getAxis() == Direction.Axis.Y) {
+            this.setDeltaMovement(dem10.x, float15 * float14, dem10.z);
         }
-        else if (fp11.getAxis() == Direction.Axis.Z) {
-            this.setDeltaMovement(cvl10.x, cvl10.y, float15 * float14);
+        else if (fz11.getAxis() == Direction.Axis.Z) {
+            this.setDeltaMovement(dem10.x, dem10.y, float15 * float14);
         }
     }
     
-    public void makeStuckInBlock(final BlockState byj, final Vec3 cvl) {
+    public void makeStuckInBlock(final BlockState cfj, final Vec3 dem) {
         this.fallDistance = 0.0f;
-        this.stuckSpeedMultiplier = cvl;
+        this.stuckSpeedMultiplier = dem;
     }
     
-    private static void removeAction(final Component lf) {
-        lf.withStyle(ln -> ln.setClickEvent(null)).getSiblings().forEach(Entity::removeAction);
+    private static Component removeAction(final Component mr) {
+        final MutableComponent mx2 = mr.plainCopy().setStyle(mr.getStyle().withClickEvent(null));
+        for (final Component mr2 : mr.getSiblings()) {
+            mx2.append(removeAction(mr2));
+        }
+        return mx2;
     }
     
     @Override
     public Component getName() {
-        final Component lf2 = this.getCustomName();
-        if (lf2 != null) {
-            final Component lf3 = lf2.deepCopy();
-            removeAction(lf3);
-            return lf3;
+        final Component mr2 = this.getCustomName();
+        if (mr2 != null) {
+            return removeAction(mr2);
         }
         return this.getTypeName();
     }
@@ -1899,8 +1930,8 @@ public abstract class Entity implements Nameable, CommandSource {
         return this.type.getDescription();
     }
     
-    public boolean is(final Entity akq) {
-        return this == akq;
+    public boolean is(final Entity aom) {
+        return this == aom;
     }
     
     public float getYHeadRot() {
@@ -1917,17 +1948,17 @@ public abstract class Entity implements Nameable, CommandSource {
         return true;
     }
     
-    public boolean skipAttackInteraction(final Entity akq) {
+    public boolean skipAttackInteraction(final Entity aom) {
         return false;
     }
     
     @Override
     public String toString() {
-        return String.format(Locale.ROOT, "%s['%s'/%d, l='%s', x=%.2f, y=%.2f, z=%.2f]", this.getClass().getSimpleName(), this.getName().getContents(), this.id, (this.level == null) ? "~NULL~" : this.level.getLevelData().getLevelName(), this.getX(), this.getY(), this.getZ());
+        return String.format(Locale.ROOT, "%s['%s'/%d, l='%s', x=%.2f, y=%.2f, z=%.2f]", this.getClass().getSimpleName(), this.getName().getString(), this.id, (this.level == null) ? "~NULL~" : this.level.toString(), this.getX(), this.getY(), this.getZ());
     }
     
-    public boolean isInvulnerableTo(final DamageSource ajz) {
-        return this.invulnerable && ajz != DamageSource.OUT_OF_WORLD && !ajz.isCreativePlayer();
+    public boolean isInvulnerableTo(final DamageSource anw) {
+        return this.invulnerable && anw != DamageSource.OUT_OF_WORLD && !anw.isCreativePlayer();
     }
     
     public boolean isInvulnerable() {
@@ -1938,95 +1969,99 @@ public abstract class Entity implements Nameable, CommandSource {
         this.invulnerable = boolean1;
     }
     
-    public void copyPosition(final Entity akq) {
-        this.moveTo(akq.getX(), akq.getY(), akq.getZ(), akq.yRot, akq.xRot);
+    public void copyPosition(final Entity aom) {
+        this.moveTo(aom.getX(), aom.getY(), aom.getZ(), aom.yRot, aom.xRot);
     }
     
-    public void restoreFrom(final Entity akq) {
-        final CompoundTag jt3 = akq.saveWithoutId(new CompoundTag());
-        jt3.remove("Dimension");
-        this.load(jt3);
-        this.changingDimensionDelay = akq.changingDimensionDelay;
-        this.portalEntranceBlock = akq.portalEntranceBlock;
-        this.portalEntranceOffset = akq.portalEntranceOffset;
-        this.portalEntranceForwards = akq.portalEntranceForwards;
+    public void restoreFrom(final Entity aom) {
+        final CompoundTag le3 = aom.saveWithoutId(new CompoundTag());
+        le3.remove("Dimension");
+        this.load(le3);
+        this.changingDimensionDelay = aom.changingDimensionDelay;
+        this.portalEntranceBlock = aom.portalEntranceBlock;
+        this.portalEntranceOffset = aom.portalEntranceOffset;
+        this.portalEntranceForwards = aom.portalEntranceForwards;
     }
     
     @Nullable
-    public Entity changeDimension(final DimensionType cbi) {
-        if (this.level.isClientSide || this.removed) {
+    public Entity changeDimension(final ServerLevel zd) {
+        if (!(this.level instanceof ServerLevel) || this.removed) {
             return null;
         }
         this.level.getProfiler().push("changeDimension");
-        final MinecraftServer minecraftServer3 = this.getServer();
-        final DimensionType cbi2 = this.dimension;
-        final ServerLevel xd5 = minecraftServer3.getLevel(cbi2);
-        final ServerLevel xd6 = minecraftServer3.getLevel(cbi);
-        this.dimension = cbi;
         this.unRide();
         this.level.getProfiler().push("reposition");
-        Vec3 cvl8 = this.getDeltaMovement();
-        float float9 = 0.0f;
-        BlockPos fk7;
-        if (cbi2 == DimensionType.THE_END && cbi == DimensionType.OVERWORLD) {
-            fk7 = xd6.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, xd6.getSharedSpawnPos());
+        Vec3 dem4 = this.getDeltaMovement();
+        float float5 = 0.0f;
+        BlockPos fu3;
+        if (this.level.dimension() == Level.END && zd.dimension() == Level.OVERWORLD) {
+            fu3 = zd.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, zd.getSharedSpawnPos());
         }
-        else if (cbi == DimensionType.THE_END) {
-            fk7 = xd6.getDimensionSpecificSpawn();
+        else if (zd.dimension() == Level.END) {
+            fu3 = ServerLevel.END_SPAWN_POINT;
         }
         else {
-            double double10 = this.getX();
-            double double11 = this.getZ();
-            final double double12 = 8.0;
-            if (cbi2 == DimensionType.OVERWORLD && cbi == DimensionType.NETHER) {
-                double10 /= 8.0;
-                double11 /= 8.0;
+            double double6 = this.getX();
+            double double7 = this.getZ();
+            final DimensionType cif10 = this.level.dimensionType();
+            final DimensionType cif11 = zd.dimensionType();
+            final double double8 = 8.0;
+            if (!cif10.shrunk() && cif11.shrunk()) {
+                double6 /= 8.0;
+                double7 /= 8.0;
             }
-            else if (cbi2 == DimensionType.NETHER && cbi == DimensionType.OVERWORLD) {
-                double10 *= 8.0;
-                double11 *= 8.0;
+            else if (cif10.shrunk() && !cif11.shrunk()) {
+                double6 *= 8.0;
+                double7 *= 8.0;
             }
-            final double double13 = Math.min(-2.9999872E7, xd6.getWorldBorder().getMinX() + 16.0);
-            final double double14 = Math.min(-2.9999872E7, xd6.getWorldBorder().getMinZ() + 16.0);
-            final double double15 = Math.min(2.9999872E7, xd6.getWorldBorder().getMaxX() - 16.0);
-            final double double16 = Math.min(2.9999872E7, xd6.getWorldBorder().getMaxZ() - 16.0);
-            double10 = Mth.clamp(double10, double13, double15);
-            double11 = Mth.clamp(double11, double14, double16);
-            final Vec3 cvl9 = this.getPortalEntranceOffset();
-            fk7 = new BlockPos(double10, this.getY(), double11);
-            final BlockPattern.PortalInfo c25 = xd6.getPortalForcer().findPortal(fk7, cvl8, this.getPortalEntranceForwards(), cvl9.x, cvl9.y, this instanceof Player);
-            if (c25 == null) {
+            final double double9 = Math.min(-2.9999872E7, zd.getWorldBorder().getMinX() + 16.0);
+            final double double10 = Math.min(-2.9999872E7, zd.getWorldBorder().getMinZ() + 16.0);
+            final double double11 = Math.min(2.9999872E7, zd.getWorldBorder().getMaxX() - 16.0);
+            final double double12 = Math.min(2.9999872E7, zd.getWorldBorder().getMaxZ() - 16.0);
+            double6 = Mth.clamp(double6, double9, double11);
+            double7 = Mth.clamp(double7, double10, double12);
+            final Vec3 dem5 = this.getPortalEntranceOffset();
+            fu3 = new BlockPos(double6, this.getY(), double7);
+            final BlockPattern.PortalInfo c23 = zd.getPortalForcer().findPortal(fu3, dem4, this.getPortalEntranceForwards(), dem5.x, dem5.y, this instanceof Player);
+            if (c23 == null) {
                 return null;
             }
-            fk7 = new BlockPos(c25.pos);
-            cvl8 = c25.speed;
-            float9 = (float)c25.angle;
+            fu3 = new BlockPos(c23.pos);
+            dem4 = c23.speed;
+            float5 = (float)c23.angle;
         }
         this.level.getProfiler().popPush("reloading");
-        final Entity akq10 = (Entity)this.getType().create(xd6);
-        if (akq10 != null) {
-            akq10.restoreFrom(this);
-            akq10.moveTo(fk7, akq10.yRot + float9, akq10.xRot);
-            akq10.setDeltaMovement(cvl8);
-            xd6.addFromAnotherDimension(akq10);
+        final Entity aom6 = (Entity)this.getType().create(zd);
+        if (aom6 != null) {
+            aom6.restoreFrom(this);
+            aom6.moveTo(fu3, aom6.yRot + float5, aom6.xRot);
+            aom6.setDeltaMovement(dem4);
+            zd.addFromAnotherDimension(aom6);
+            if (zd.dimension() == Level.END) {
+                ServerLevel.makeObsidianPlatform(zd);
+            }
         }
+        this.removeAfterChangingDimensions();
+        this.level.getProfiler().pop();
+        ((ServerLevel)this.level).resetEmptyTime();
+        zd.resetEmptyTime();
+        this.level.getProfiler().pop();
+        return aom6;
+    }
+    
+    protected void removeAfterChangingDimensions() {
         this.removed = true;
-        this.level.getProfiler().pop();
-        xd5.resetEmptyTime();
-        xd6.resetEmptyTime();
-        this.level.getProfiler().pop();
-        return akq10;
     }
     
     public boolean canChangeDimensions() {
         return true;
     }
     
-    public float getBlockExplosionResistance(final Explosion bjp, final BlockGetter bjg, final BlockPos fk, final BlockState byj, final FluidState coj, final float float6) {
+    public float getBlockExplosionResistance(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final FluidState cxa, final float float6) {
         return float6;
     }
     
-    public boolean shouldBlockExplode(final Explosion bjp, final BlockGetter bjg, final BlockPos fk, final BlockState byj, final float float5) {
+    public boolean shouldBlockExplode(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final float float5) {
         return true;
     }
     
@@ -2046,16 +2081,16 @@ public abstract class Entity implements Nameable, CommandSource {
         return false;
     }
     
-    public void fillCrashReportCategory(final CrashReportCategory i) {
-        i.setDetail("Entity Type", () -> EntityType.getKey(this.getType()) + " (" + this.getClass().getCanonicalName() + ")");
-        i.setDetail("Entity ID", this.id);
-        i.setDetail("Entity Name", () -> this.getName().getString());
-        i.setDetail("Entity's Exact location", String.format(Locale.ROOT, "%.2f, %.2f, %.2f", this.getX(), this.getY(), this.getZ()));
-        i.setDetail("Entity's Block location", CrashReportCategory.formatLocation(Mth.floor(this.getX()), Mth.floor(this.getY()), Mth.floor(this.getZ())));
-        final Vec3 cvl3 = this.getDeltaMovement();
-        i.setDetail("Entity's Momentum", String.format(Locale.ROOT, "%.2f, %.2f, %.2f", cvl3.x, cvl3.y, cvl3.z));
-        i.setDetail("Entity's Passengers", () -> this.getPassengers().toString());
-        i.setDetail("Entity's Vehicle", () -> this.getVehicle().toString());
+    public void fillCrashReportCategory(final CrashReportCategory k) {
+        k.setDetail("Entity Type", () -> EntityType.getKey(this.getType()) + " (" + this.getClass().getCanonicalName() + ")");
+        k.setDetail("Entity ID", this.id);
+        k.setDetail("Entity Name", () -> this.getName().getString());
+        k.setDetail("Entity's Exact location", String.format(Locale.ROOT, "%.2f, %.2f, %.2f", this.getX(), this.getY(), this.getZ()));
+        k.setDetail("Entity's Block location", CrashReportCategory.formatLocation(Mth.floor(this.getX()), Mth.floor(this.getY()), Mth.floor(this.getZ())));
+        final Vec3 dem3 = this.getDeltaMovement();
+        k.setDetail("Entity's Momentum", String.format(Locale.ROOT, "%.2f, %.2f, %.2f", dem3.x, dem3.y, dem3.z));
+        k.setDetail("Entity's Passengers", () -> this.getPassengers().toString());
+        k.setDetail("Entity's Vehicle", () -> this.getVehicle().toString());
     }
     
     public boolean displayFireAnimation() {
@@ -2079,7 +2114,7 @@ public abstract class Entity implements Nameable, CommandSource {
         return this.stringUUID;
     }
     
-    public boolean isPushedByWater() {
+    public boolean isPushedByFluid() {
         return true;
     }
     
@@ -2093,11 +2128,11 @@ public abstract class Entity implements Nameable, CommandSource {
     
     @Override
     public Component getDisplayName() {
-        return PlayerTeam.formatNameForTeam(this.getTeam(), this.getName()).withStyle(ln -> ln.setHoverEvent(this.createHoverEvent()).setInsertion(this.getStringUUID()));
+        return PlayerTeam.formatNameForTeam(this.getTeam(), this.getName()).withStyle(nb -> nb.withHoverEvent(this.createHoverEvent()).withInsertion(this.getStringUUID()));
     }
     
-    public void setCustomName(@Nullable final Component lf) {
-        this.entityData.<Optional<Component>>set(Entity.DATA_CUSTOM_NAME, Optional.<Component>ofNullable(lf));
+    public void setCustomName(@Nullable final Component mr) {
+        this.entityData.<Optional<Component>>set(Entity.DATA_CUSTOM_NAME, Optional.<Component>ofNullable(mr));
     }
     
     @Nullable
@@ -2123,9 +2158,9 @@ public abstract class Entity implements Nameable, CommandSource {
         if (!(this.level instanceof ServerLevel)) {
             return;
         }
-        final ChunkPos bjh8 = new ChunkPos(new BlockPos(double1, double2, double3));
-        ((ServerLevel)this.level).getChunkSource().<Integer>addRegionTicket(TicketType.POST_TELEPORT, bjh8, 0, this.getId());
-        this.level.getChunk(bjh8.x, bjh8.z);
+        final ChunkPos bph8 = new ChunkPos(new BlockPos(double1, double2, double3));
+        ((ServerLevel)this.level).getChunkSource().<Integer>addRegionTicket(TicketType.POST_TELEPORT, bph8, 0, this.getId());
+        this.level.getChunk(bph8.x, bph8.z);
         this.teleportTo(double1, double2, double3);
     }
     
@@ -2133,12 +2168,18 @@ public abstract class Entity implements Nameable, CommandSource {
         if (!(this.level instanceof ServerLevel)) {
             return;
         }
-        final ServerLevel xd8 = (ServerLevel)this.level;
+        final ServerLevel zd8 = (ServerLevel)this.level;
         this.moveTo(double1, double2, double3, this.yRot, this.xRot);
-        this.getSelfAndPassengers().forEach(akq -> {
-            xd8.updateChunkPos(akq);
-            akq.teleported = true;
-            akq.repositionDirectPassengers(Entity::forceMove);
+        final Iterator<Entity> iterator;
+        Entity aom2;
+        this.getSelfAndPassengers().forEach(aom -> {
+            zd8.updateChunkPos(aom);
+            aom.forceChunkAddition = true;
+            aom.passengers.iterator();
+            while (iterator.hasNext()) {
+                aom2 = iterator.next();
+                aom.positionRider(aom2, Entity::moveTo);
+            }
         });
     }
     
@@ -2146,27 +2187,27 @@ public abstract class Entity implements Nameable, CommandSource {
         return this.isCustomNameVisible();
     }
     
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (Entity.DATA_POSE.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (Entity.DATA_POSE.equals(tq)) {
             this.refreshDimensions();
         }
     }
     
     public void refreshDimensions() {
-        final EntityDimensions akr2 = this.dimensions;
-        final Pose alj3 = this.getPose();
-        final EntityDimensions akr3 = this.getDimensions(alj3);
-        this.dimensions = akr3;
-        this.eyeHeight = this.getEyeHeight(alj3, akr3);
-        if (akr3.width < akr2.width) {
-            final double double5 = akr3.width / 2.0;
-            this.setBoundingBox(new AABB(this.getX() - double5, this.getY(), this.getZ() - double5, this.getX() + double5, this.getY() + akr3.height, this.getZ() + double5));
+        final EntityDimensions aon2 = this.dimensions;
+        final Pose apj3 = this.getPose();
+        final EntityDimensions aon3 = this.getDimensions(apj3);
+        this.dimensions = aon3;
+        this.eyeHeight = this.getEyeHeight(apj3, aon3);
+        if (aon3.width < aon2.width) {
+            final double double5 = aon3.width / 2.0;
+            this.setBoundingBox(new AABB(this.getX() - double5, this.getY(), this.getZ() - double5, this.getX() + double5, this.getY() + aon3.height, this.getZ() + double5));
             return;
         }
-        final AABB cvf5 = this.getBoundingBox();
-        this.setBoundingBox(new AABB(cvf5.minX, cvf5.minY, cvf5.minZ, cvf5.minX + akr3.width, cvf5.minY + akr3.height, cvf5.minZ + akr3.width));
-        if (akr3.width > akr2.width && !this.firstTick && !this.level.isClientSide) {
-            final float float6 = akr2.width - akr3.width;
+        final AABB deg5 = this.getBoundingBox();
+        this.setBoundingBox(new AABB(deg5.minX, deg5.minY, deg5.minZ, deg5.minX + aon3.width, deg5.minY + aon3.height, deg5.minZ + aon3.width));
+        if (aon3.width > aon2.width && !this.firstTick && !this.level.isClientSide) {
+            final float float6 = aon2.width - aon3.width;
             this.move(MoverType.SELF, new Vec3(float6, 0.0, float6));
         }
     }
@@ -2180,17 +2221,10 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     protected HoverEvent createHoverEvent() {
-        final CompoundTag jt2 = new CompoundTag();
-        final ResourceLocation sm3 = EntityType.getKey(this.getType());
-        jt2.putString("id", this.getStringUUID());
-        if (sm3 != null) {
-            jt2.putString("type", sm3.toString());
-        }
-        jt2.putString("name", Component.Serializer.toJson(this.getName()));
-        return new HoverEvent(HoverEvent.Action.SHOW_ENTITY, new TextComponent(jt2.toString()));
+        return new HoverEvent((HoverEvent.Action<T>)HoverEvent.Action.SHOW_ENTITY, (T)new HoverEvent.EntityTooltipInfo(this.getType(), this.getUUID(), this.getName()));
     }
     
-    public boolean broadcastToPlayer(final ServerPlayer xe) {
+    public boolean broadcastToPlayer(final ServerPlayer ze) {
         return true;
     }
     
@@ -2202,44 +2236,40 @@ public abstract class Entity implements Nameable, CommandSource {
         return this.getBoundingBox();
     }
     
-    protected AABB getBoundingBoxForPose(final Pose alj) {
-        final EntityDimensions akr3 = this.getDimensions(alj);
-        final float float4 = akr3.width / 2.0f;
-        final Vec3 cvl5 = new Vec3(this.getX() - float4, this.getY(), this.getZ() - float4);
-        final Vec3 cvl6 = new Vec3(this.getX() + float4, this.getY() + akr3.height, this.getZ() + float4);
-        return new AABB(cvl5, cvl6);
+    protected AABB getBoundingBoxForPose(final Pose apj) {
+        final EntityDimensions aon3 = this.getDimensions(apj);
+        final float float4 = aon3.width / 2.0f;
+        final Vec3 dem5 = new Vec3(this.getX() - float4, this.getY(), this.getZ() - float4);
+        final Vec3 dem6 = new Vec3(this.getX() + float4, this.getY() + aon3.height, this.getZ() + float4);
+        return new AABB(dem5, dem6);
     }
     
-    public void setBoundingBox(final AABB cvf) {
-        this.bb = cvf;
+    public void setBoundingBox(final AABB deg) {
+        this.bb = deg;
     }
     
-    protected float getEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height * 0.85f;
+    protected float getEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height * 0.85f;
     }
     
-    public float getEyeHeight(final Pose alj) {
-        return this.getEyeHeight(alj, this.getDimensions(alj));
+    public float getEyeHeight(final Pose apj) {
+        return this.getEyeHeight(apj, this.getDimensions(apj));
     }
     
     public final float getEyeHeight() {
         return this.eyeHeight;
     }
     
-    public boolean setSlot(final int integer, final ItemStack ben) {
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, this.getEyeHeight(), this.getBbWidth() * 0.4f);
+    }
+    
+    public boolean setSlot(final int integer, final ItemStack bki) {
         return false;
     }
     
     @Override
-    public void sendMessage(final Component lf) {
-    }
-    
-    public BlockPos getCommandSenderBlockPosition() {
-        return new BlockPos(this);
-    }
-    
-    public Vec3 getCommandSenderWorldPosition() {
-        return this.position();
+    public void sendMessage(final Component mr, final UUID uUID) {
     }
     
     public Level getCommandSenderWorld() {
@@ -2251,7 +2281,7 @@ public abstract class Entity implements Nameable, CommandSource {
         return this.level.getServer();
     }
     
-    public InteractionResult interactAt(final Player ayj, final Vec3 cvl, final InteractionHand ajk) {
+    public InteractionResult interactAt(final Player bec, final Vec3 dem, final InteractionHand anf) {
         return InteractionResult.PASS;
     }
     
@@ -2259,22 +2289,22 @@ public abstract class Entity implements Nameable, CommandSource {
         return false;
     }
     
-    protected void doEnchantDamageEffects(final LivingEntity akz, final Entity akq) {
-        if (akq instanceof LivingEntity) {
-            EnchantmentHelper.doPostHurtEffects((LivingEntity)akq, akz);
+    public void doEnchantDamageEffects(final LivingEntity aoy, final Entity aom) {
+        if (aom instanceof LivingEntity) {
+            EnchantmentHelper.doPostHurtEffects((LivingEntity)aom, aoy);
         }
-        EnchantmentHelper.doPostDamageEffects(akz, akq);
+        EnchantmentHelper.doPostDamageEffects(aoy, aom);
     }
     
-    public void startSeenByPlayer(final ServerPlayer xe) {
+    public void startSeenByPlayer(final ServerPlayer ze) {
     }
     
-    public void stopSeenByPlayer(final ServerPlayer xe) {
+    public void stopSeenByPlayer(final ServerPlayer ze) {
     }
     
-    public float rotate(final Rotation btu) {
+    public float rotate(final Rotation cap) {
         final float float3 = Mth.wrapDegrees(this.yRot);
-        switch (btu) {
+        switch (cap) {
             case CLOCKWISE_180: {
                 return float3 + 180.0f;
             }
@@ -2290,9 +2320,9 @@ public abstract class Entity implements Nameable, CommandSource {
         }
     }
     
-    public float mirror(final Mirror bsu) {
+    public float mirror(final Mirror bzj) {
         final float float3 = Mth.wrapDegrees(this.yRot);
-        switch (bsu) {
+        switch (bzj) {
             case LEFT_RIGHT: {
                 return -float3;
             }
@@ -2309,9 +2339,15 @@ public abstract class Entity implements Nameable, CommandSource {
         return false;
     }
     
-    public boolean checkAndResetTeleportedFlag() {
-        final boolean boolean2 = this.teleported;
-        this.teleported = false;
+    public boolean checkAndResetForcedChunkAdditionFlag() {
+        final boolean boolean2 = this.forceChunkAddition;
+        this.forceChunkAddition = false;
+        return boolean2;
+    }
+    
+    public boolean checkAndResetUpdateChunkPos() {
+        final boolean boolean2 = this.movedSinceLastChunkCheck;
+        this.movedSinceLastChunkCheck = false;
         return boolean2;
     }
     
@@ -2327,9 +2363,9 @@ public abstract class Entity implements Nameable, CommandSource {
         return Lists.newArrayList(this.passengers);
     }
     
-    public boolean hasPassenger(final Entity akq) {
-        for (final Entity akq2 : this.getPassengers()) {
-            if (akq2.equals(akq)) {
+    public boolean hasPassenger(final Entity aom) {
+        for (final Entity aom2 : this.getPassengers()) {
+            if (aom2.equals(aom)) {
                 return true;
             }
         }
@@ -2337,8 +2373,8 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public boolean hasPassenger(final Class<? extends Entity> class1) {
-        for (final Entity akq4 : this.getPassengers()) {
-            if (class1.isAssignableFrom(akq4.getClass())) {
+        for (final Entity aom4 : this.getPassengers()) {
+            if (class1.isAssignableFrom(aom4.getClass())) {
                 return true;
             }
         }
@@ -2347,9 +2383,9 @@ public abstract class Entity implements Nameable, CommandSource {
     
     public Collection<Entity> getIndirectPassengers() {
         final Set<Entity> set2 = Sets.newHashSet();
-        for (final Entity akq4 : this.getPassengers()) {
-            set2.add(akq4);
-            akq4.fillIndirectPassengers(false, set2);
+        for (final Entity aom4 : this.getPassengers()) {
+            set2.add(aom4);
+            aom4.fillIndirectPassengers(false, set2);
         }
         return set2;
     }
@@ -2365,50 +2401,56 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     private void fillIndirectPassengers(final boolean boolean1, final Set<Entity> set) {
-        for (final Entity akq5 : this.getPassengers()) {
-            if (!boolean1 || ServerPlayer.class.isAssignableFrom(akq5.getClass())) {
-                set.add(akq5);
+        for (final Entity aom5 : this.getPassengers()) {
+            if (!boolean1 || ServerPlayer.class.isAssignableFrom(aom5.getClass())) {
+                set.add(aom5);
             }
-            akq5.fillIndirectPassengers(boolean1, set);
+            aom5.fillIndirectPassengers(boolean1, set);
         }
     }
     
     public Entity getRootVehicle() {
-        Entity akq2;
-        for (akq2 = this; akq2.isPassenger(); akq2 = akq2.getVehicle()) {}
-        return akq2;
+        Entity aom2;
+        for (aom2 = this; aom2.isPassenger(); aom2 = aom2.getVehicle()) {}
+        return aom2;
     }
     
-    public boolean isPassengerOfSameVehicle(final Entity akq) {
-        return this.getRootVehicle() == akq.getRootVehicle();
+    public boolean isPassengerOfSameVehicle(final Entity aom) {
+        return this.getRootVehicle() == aom.getRootVehicle();
     }
     
-    public boolean hasIndirectPassenger(final Entity akq) {
-        for (final Entity akq2 : this.getPassengers()) {
-            if (akq2.equals(akq)) {
+    public boolean hasIndirectPassenger(final Entity aom) {
+        for (final Entity aom2 : this.getPassengers()) {
+            if (aom2.equals(aom)) {
                 return true;
             }
-            if (akq2.hasIndirectPassenger(akq)) {
+            if (aom2.hasIndirectPassenger(aom)) {
                 return true;
             }
         }
         return false;
     }
     
-    public void repositionDirectPassengers(final MoveCallback a) {
-        for (final Entity akq4 : this.passengers) {
-            this.positionRider(akq4, a);
-        }
-    }
-    
     public boolean isControlledByLocalInstance() {
-        final Entity akq2 = this.getControllingPassenger();
-        if (akq2 instanceof Player) {
-            return ((Player)akq2).isLocalPlayer();
+        final Entity aom2 = this.getControllingPassenger();
+        if (aom2 instanceof Player) {
+            return ((Player)aom2).isLocalPlayer();
         }
         return !this.level.isClientSide;
     }
     
+    protected static Vec3 getCollisionHorizontalEscapeVector(final double double1, final double double2, final float float3) {
+        final double double3 = (double1 + double2 + 9.999999747378752E-6) / 2.0;
+        final float float4 = -Mth.sin(float3 * 0.017453292f);
+        final float float5 = Mth.cos(float3 * 0.017453292f);
+        final float float6 = Math.max(Math.abs(float4), Math.abs(float5));
+        return new Vec3(float4 * double3 / float6, 0.0, float5 * double3 / float6);
+    }
+    
+    public Vec3 getDismountLocationForPassenger(final LivingEntity aoy) {
+        return new Vec3(this.getX(), this.getBoundingBox().maxY, this.getZ());
+    }
+    
     @Nullable
     public Entity getVehicle() {
         return this.vehicle;
@@ -2453,11 +2495,11 @@ public abstract class Entity implements Nameable, CommandSource {
         return true;
     }
     
-    public void lookAt(final EntityAnchorArgument.Anchor a, final Vec3 cvl) {
-        final Vec3 cvl2 = a.apply(this);
-        final double double5 = cvl.x - cvl2.x;
-        final double double6 = cvl.y - cvl2.y;
-        final double double7 = cvl.z - cvl2.z;
+    public void lookAt(final EntityAnchorArgument.Anchor a, final Vec3 dem) {
+        final Vec3 dem2 = a.apply(this);
+        final double double5 = dem.x - dem2.x;
+        final double double6 = dem.y - dem2.y;
+        final double double7 = dem.z - dem2.z;
         final double double8 = Mth.sqrt(double5 * double5 + double7 * double7);
         this.xRot = Mth.wrapDegrees((float)(-(Mth.atan2(double6, double8) * 57.2957763671875)));
         this.setYHeadRot(this.yRot = Mth.wrapDegrees((float)(Mth.atan2(double7, double5) * 57.2957763671875) - 90.0f));
@@ -2465,62 +2507,71 @@ public abstract class Entity implements Nameable, CommandSource {
         this.yRotO = this.yRot;
     }
     
-    public boolean checkAndHandleWater(final Tag<Fluid> aaz) {
-        final AABB cvf3 = this.getBoundingBox().deflate(0.001);
-        final int integer4 = Mth.floor(cvf3.minX);
-        final int integer5 = Mth.ceil(cvf3.maxX);
-        final int integer6 = Mth.floor(cvf3.minY);
-        final int integer7 = Mth.ceil(cvf3.maxY);
-        final int integer8 = Mth.floor(cvf3.minZ);
-        final int integer9 = Mth.ceil(cvf3.maxZ);
-        if (!this.level.hasChunksAt(integer4, integer6, integer8, integer5, integer7, integer9)) {
+    public boolean updateFluidHeightAndDoFluidPushing(final Tag<Fluid> adf, final double double2) {
+        final AABB deg5 = this.getBoundingBox().deflate(0.001);
+        final int integer6 = Mth.floor(deg5.minX);
+        final int integer7 = Mth.ceil(deg5.maxX);
+        final int integer8 = Mth.floor(deg5.minY);
+        final int integer9 = Mth.ceil(deg5.maxY);
+        final int integer10 = Mth.floor(deg5.minZ);
+        final int integer11 = Mth.ceil(deg5.maxZ);
+        if (!this.level.hasChunksAt(integer6, integer8, integer10, integer7, integer9, integer11)) {
             return false;
         }
-        double double10 = 0.0;
-        final boolean boolean12 = this.isPushedByWater();
-        boolean boolean13 = false;
-        Vec3 cvl14 = Vec3.ZERO;
-        int integer10 = 0;
-        try (final BlockPos.PooledMutableBlockPos b16 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (int integer11 = integer4; integer11 < integer5; ++integer11) {
-                for (int integer12 = integer6; integer12 < integer7; ++integer12) {
-                    for (int integer13 = integer8; integer13 < integer9; ++integer13) {
-                        b16.set(integer11, integer12, integer13);
-                        final FluidState coj21 = this.level.getFluidState(b16);
-                        if (coj21.is(aaz)) {
-                            final double double11 = integer12 + coj21.getHeight(this.level, b16);
-                            if (double11 >= cvf3.minY) {
-                                boolean13 = true;
-                                double10 = Math.max(double11 - cvf3.minY, double10);
-                                if (boolean12) {
-                                    Vec3 cvl15 = coj21.getFlow(this.level, b16);
-                                    if (double10 < 0.4) {
-                                        cvl15 = cvl15.scale(double10);
-                                    }
-                                    cvl14 = cvl14.add(cvl15);
-                                    ++integer10;
+        double double3 = 0.0;
+        final boolean boolean14 = this.isPushedByFluid();
+        boolean boolean15 = false;
+        Vec3 dem16 = Vec3.ZERO;
+        int integer12 = 0;
+        final BlockPos.MutableBlockPos a18 = new BlockPos.MutableBlockPos();
+        for (int integer13 = integer6; integer13 < integer7; ++integer13) {
+            for (int integer14 = integer8; integer14 < integer9; ++integer14) {
+                for (int integer15 = integer10; integer15 < integer11; ++integer15) {
+                    a18.set(integer13, integer14, integer15);
+                    final FluidState cxa22 = this.level.getFluidState(a18);
+                    if (cxa22.is(adf)) {
+                        final double double4 = integer14 + cxa22.getHeight(this.level, a18);
+                        if (double4 >= deg5.minY) {
+                            boolean15 = true;
+                            double3 = Math.max(double4 - deg5.minY, double3);
+                            if (boolean14) {
+                                Vec3 dem17 = cxa22.getFlow(this.level, a18);
+                                if (double3 < 0.4) {
+                                    dem17 = dem17.scale(double3);
                                 }
+                                dem16 = dem16.add(dem17);
+                                ++integer12;
                             }
                         }
                     }
                 }
             }
         }
-        if (cvl14.length() > 0.0) {
-            if (integer10 > 0) {
-                cvl14 = cvl14.scale(1.0 / integer10);
+        if (dem16.length() > 0.0) {
+            if (integer12 > 0) {
+                dem16 = dem16.scale(1.0 / integer12);
             }
             if (!(this instanceof Player)) {
-                cvl14 = cvl14.normalize();
+                dem16 = dem16.normalize();
             }
-            this.setDeltaMovement(this.getDeltaMovement().add(cvl14.scale(0.014)));
+            final Vec3 dem18 = this.getDeltaMovement();
+            dem16 = dem16.scale(double2 * 1.0);
+            final double double5 = 0.003;
+            if (Math.abs(dem18.x) < 0.003 && Math.abs(dem18.z) < 0.003 && dem16.length() < 0.0045000000000000005) {
+                dem16 = dem16.normalize().scale(0.0045000000000000005);
+            }
+            this.setDeltaMovement(this.getDeltaMovement().add(dem16));
         }
-        this.waterHeight = double10;
-        return boolean13;
+        this.fluidHeight.put(adf, double3);
+        return boolean15;
     }
     
-    public double getWaterHeight() {
-        return this.waterHeight;
+    public double getFluidHeight(final Tag<Fluid> adf) {
+        return this.fluidHeight.getDouble(adf);
+    }
+    
+    public double getFluidJumpThreshold() {
+        return (this.getEyeHeight() < 0.4) ? 0.0 : 0.4;
     }
     
     public final float getBbWidth() {
@@ -2533,20 +2584,24 @@ public abstract class Entity implements Nameable, CommandSource {
     
     public abstract Packet<?> getAddEntityPacket();
     
-    public EntityDimensions getDimensions(final Pose alj) {
+    public EntityDimensions getDimensions(final Pose apj) {
         return this.type.getDimensions();
     }
     
     public Vec3 position() {
-        return new Vec3(this.x, this.y, this.z);
+        return this.position;
+    }
+    
+    public BlockPos blockPosition() {
+        return this.blockPosition;
     }
     
     public Vec3 getDeltaMovement() {
         return this.deltaMovement;
     }
     
-    public void setDeltaMovement(final Vec3 cvl) {
-        this.deltaMovement = cvl;
+    public void setDeltaMovement(final Vec3 dem) {
+        this.deltaMovement = dem;
     }
     
     public void setDeltaMovement(final double double1, final double double2, final double double3) {
@@ -2554,11 +2609,11 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public final double getX() {
-        return this.x;
+        return this.position.x;
     }
     
     public double getX(final double double1) {
-        return this.x + this.getBbWidth() * double1;
+        return this.position.x + this.getBbWidth() * double1;
     }
     
     public double getRandomX(final double double1) {
@@ -2566,11 +2621,11 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public final double getY() {
-        return this.y;
+        return this.position.y;
     }
     
     public double getY(final double double1) {
-        return this.y + this.getBbHeight() * double1;
+        return this.position.y + this.getBbHeight() * double1;
     }
     
     public double getRandomY() {
@@ -2578,15 +2633,15 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public double getEyeY() {
-        return this.y + this.eyeHeight;
+        return this.position.y + this.eyeHeight;
     }
     
     public final double getZ() {
-        return this.z;
+        return this.position.z;
     }
     
     public double getZ(final double double1) {
-        return this.z + this.getBbWidth() * double1;
+        return this.position.z + this.getBbWidth() * double1;
     }
     
     public double getRandomZ(final double double1) {
@@ -2594,18 +2649,21 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     public void setPosRaw(final double double1, final double double2, final double double3) {
-        this.x = double1;
-        this.y = double2;
-        this.z = double3;
+        if (this.position.x != double1 || this.position.y != double2 || this.position.z != double3) {
+            this.position = new Vec3(double1, double2, double3);
+            final int integer8 = Mth.floor(double1);
+            final int integer9 = Mth.floor(double2);
+            final int integer10 = Mth.floor(double3);
+            if (integer8 != this.blockPosition.getX() || integer9 != this.blockPosition.getY() || integer10 != this.blockPosition.getZ()) {
+                this.blockPosition = new BlockPos(integer8, integer9, integer10);
+            }
+            this.movedSinceLastChunkCheck = true;
+        }
     }
     
     public void checkDespawn() {
     }
     
-    public void forceMove(final double double1, final double double2, final double double3) {
-        this.moveTo(double1, double2, double3, this.yRot, this.xRot);
-    }
-    
     static {
         LOGGER = LogManager.getLogger();
         ENTITY_COUNTER = new AtomicInteger();
@@ -2622,7 +2680,7 @@ public abstract class Entity implements Nameable, CommandSource {
     }
     
     @FunctionalInterface
-    public interface MoveCallback {
-        void accept(final Entity akq, final double double2, final double double3, final double double4);
+    public interface MoveFunction {
+        void accept(final Entity aom, final double double2, final double double3, final double double4);
     }
 }
diff --git a/src/net/minecraft/world/entity/EntitySelector.java b/src/net/minecraft/world/entity/EntitySelector.java
index 97f3085..fc231a5 100644
--- a/src/net/minecraft/world/entity/EntitySelector.java
+++ b/src/net/minecraft/world/entity/EntitySelector.java
@@ -3,6 +3,7 @@ package net.minecraft.world.entity;
 import javax.annotation.Nullable;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.Container;
+import net.minecraft.world.Difficulty;
 import net.minecraft.world.entity.player.Player;
 import com.google.common.base.Predicates;
 import net.minecraft.world.scores.Team;
@@ -14,51 +15,52 @@ public final class EntitySelector {
     public static final Predicate<Entity> ENTITY_NOT_BEING_RIDDEN;
     public static final Predicate<Entity> CONTAINER_ENTITY_SELECTOR;
     public static final Predicate<Entity> NO_CREATIVE_OR_SPECTATOR;
+    public static final Predicate<Entity> ATTACK_ALLOWED;
     public static final Predicate<Entity> NO_SPECTATORS;
     
     public static Predicate<Entity> withinDistance(final double double1, final double double2, final double double3, final double double4) {
         final double double5 = double4 * double4;
         final double n;
-        return akq -> akq != null && akq.distanceToSqr(double1, double2, double3) <= n;
+        return aom -> aom != null && aom.distanceToSqr(double1, double2, double3) <= n;
     }
     
-    public static Predicate<Entity> pushableBy(final Entity akq) {
-        final Team cwn2 = akq.getTeam();
-        final Team.CollisionRule a3 = (cwn2 == null) ? Team.CollisionRule.ALWAYS : cwn2.getCollisionRule();
+    public static Predicate<Entity> pushableBy(final Entity aom) {
+        final Team dfo2 = aom.getTeam();
+        final Team.CollisionRule a3 = (dfo2 == null) ? Team.CollisionRule.ALWAYS : dfo2.getCollisionRule();
         if (a3 == Team.CollisionRule.NEVER) {
             return Predicates.alwaysFalse();
         }
-        Team cwn3;
+        Team dfo3;
         Team.CollisionRule a4;
         final Team team;
         boolean boolean7;
         final Team.CollisionRule collisionRule;
-        return EntitySelector.NO_SPECTATORS.and(akq4 -> {
-            if (!akq4.isPushable()) {
+        return EntitySelector.NO_SPECTATORS.and(aom4 -> {
+            if (!aom4.isPushable()) {
                 return false;
             }
-            else if (akq.level.isClientSide && (!(akq4 instanceof Player) || !akq4.isLocalPlayer())) {
+            else if (aom.level.isClientSide && (!(aom4 instanceof Player) || !aom4.isLocalPlayer())) {
                 return false;
             }
             else {
-                cwn3 = akq4.getTeam();
-                a4 = ((cwn3 == null) ? Team.CollisionRule.ALWAYS : cwn3.getCollisionRule());
+                dfo3 = aom4.getTeam();
+                a4 = ((dfo3 == null) ? Team.CollisionRule.ALWAYS : dfo3.getCollisionRule());
                 if (a4 == Team.CollisionRule.NEVER) {
                     return false;
                 }
                 else {
-                    boolean7 = (team != null && team.isAlliedTo(cwn3));
+                    boolean7 = (team != null && team.isAlliedTo(dfo3));
                     return ((collisionRule != Team.CollisionRule.PUSH_OWN_TEAM && a4 != Team.CollisionRule.PUSH_OWN_TEAM) || !boolean7) && ((collisionRule != Team.CollisionRule.PUSH_OTHER_TEAMS && a4 != Team.CollisionRule.PUSH_OTHER_TEAMS) || boolean7);
                 }
             }
         });
     }
     
-    public static Predicate<Entity> notRiding(final Entity akq) {
-        return akq2 -> {
-            while (akq2.isPassenger()) {
-                akq2 = akq2.getVehicle();
-                if (akq2 == akq) {
+    public static Predicate<Entity> notRiding(final Entity aom) {
+        return aom2 -> {
+            while (aom2.isPassenger()) {
+                aom2 = aom2.getVehicle();
+                if (aom2 == aom) {
                     return false;
                 }
             }
@@ -69,29 +71,30 @@ public final class EntitySelector {
     static {
         ENTITY_STILL_ALIVE = Entity::isAlive;
         LIVING_ENTITY_STILL_ALIVE = LivingEntity::isAlive;
-        ENTITY_NOT_BEING_RIDDEN = (akq -> akq.isAlive() && !akq.isVehicle() && !akq.isPassenger());
-        CONTAINER_ENTITY_SELECTOR = (akq -> akq instanceof Container && akq.isAlive());
-        NO_CREATIVE_OR_SPECTATOR = (akq -> !(akq instanceof Player) || (!akq.isSpectator() && !akq.isCreative()));
-        NO_SPECTATORS = (akq -> !akq.isSpectator());
+        ENTITY_NOT_BEING_RIDDEN = (aom -> aom.isAlive() && !aom.isVehicle() && !aom.isPassenger());
+        CONTAINER_ENTITY_SELECTOR = (aom -> aom instanceof Container && aom.isAlive());
+        NO_CREATIVE_OR_SPECTATOR = (aom -> !(aom instanceof Player) || (!aom.isSpectator() && !aom.isCreative()));
+        ATTACK_ALLOWED = (aom -> !(aom instanceof Player) || (!aom.isSpectator() && !aom.isCreative() && aom.level.getDifficulty() != Difficulty.PEACEFUL));
+        NO_SPECTATORS = (aom -> !aom.isSpectator());
     }
     
-    public static class MobCanWearArmourEntitySelector implements Predicate<Entity> {
+    public static class MobCanWearArmorEntitySelector implements Predicate<Entity> {
         private final ItemStack itemStack;
         
-        public MobCanWearArmourEntitySelector(final ItemStack ben) {
-            this.itemStack = ben;
+        public MobCanWearArmorEntitySelector(final ItemStack bki) {
+            this.itemStack = bki;
         }
         
         @Override
-        public boolean test(@Nullable final Entity akq) {
-            if (!akq.isAlive()) {
+        public boolean test(@Nullable final Entity aom) {
+            if (!aom.isAlive()) {
                 return false;
             }
-            if (!(akq instanceof LivingEntity)) {
+            if (!(aom instanceof LivingEntity)) {
                 return false;
             }
-            final LivingEntity akz3 = (LivingEntity)akq;
-            return akz3.canTakeItem(this.itemStack);
+            final LivingEntity aoy3 = (LivingEntity)aom;
+            return aoy3.canTakeItem(this.itemStack);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/EntityType.java b/src/net/minecraft/world/entity/EntityType.java
index b32f6a9..840707a 100644
--- a/src/net/minecraft/world/entity/EntityType.java
+++ b/src/net/minecraft/world/entity/EntityType.java
@@ -1,13 +1,14 @@
 package net.minecraft.world.entity;
 
 import net.minecraft.util.datafix.fixes.References;
-import com.mojang.datafixers.DataFixUtils;
-import net.minecraft.SharedConstants;
-import net.minecraft.util.datafix.DataFixers;
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.tags.Tag;
 import net.minecraft.nbt.ListTag;
 import java.util.function.Function;
+import net.minecraft.world.level.block.CampfireBlock;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.Util;
 import java.util.UUID;
@@ -16,7 +17,6 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import java.util.stream.Stream;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.core.Direction;
-import java.util.Collections;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.util.Mth;
@@ -30,33 +30,33 @@ import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.network.chat.Component;
 import javax.annotation.Nullable;
-import net.minecraft.world.entity.fishing.FishingHook;
+import net.minecraft.world.level.block.Block;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.projectile.FishingHook;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.global.LightningBolt;
-import net.minecraft.world.entity.monster.Ravager;
-import net.minecraft.world.entity.monster.Phantom;
+import net.minecraft.world.entity.monster.ZombifiedPiglin;
 import net.minecraft.world.entity.monster.ZombieVillager;
 import net.minecraft.world.entity.animal.horse.ZombieHorse;
 import net.minecraft.world.entity.monster.Zombie;
+import net.minecraft.world.entity.monster.Zoglin;
 import net.minecraft.world.entity.animal.Wolf;
 import net.minecraft.world.entity.projectile.WitherSkull;
 import net.minecraft.world.entity.monster.WitherSkeleton;
 import net.minecraft.world.entity.boss.wither.WitherBoss;
 import net.minecraft.world.entity.monster.Witch;
 import net.minecraft.world.entity.npc.WanderingTrader;
-import net.minecraft.world.entity.monster.Pillager;
 import net.minecraft.world.entity.monster.Vindicator;
-import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.npc.Villager;
 import net.minecraft.world.entity.monster.Vex;
+import net.minecraft.world.entity.animal.Turtle;
+import net.minecraft.world.entity.animal.TropicalFish;
+import net.minecraft.world.entity.animal.horse.TraderLlama;
 import net.minecraft.world.entity.projectile.ThrownTrident;
 import net.minecraft.world.entity.projectile.ThrownPotion;
 import net.minecraft.world.entity.projectile.ThrownExperienceBottle;
 import net.minecraft.world.entity.projectile.ThrownEnderpearl;
 import net.minecraft.world.entity.projectile.ThrownEgg;
-import net.minecraft.world.entity.animal.Turtle;
-import net.minecraft.world.entity.animal.TropicalFish;
-import net.minecraft.world.entity.animal.horse.TraderLlama;
+import net.minecraft.world.entity.monster.Strider;
 import net.minecraft.world.entity.monster.Stray;
 import net.minecraft.world.entity.animal.Squid;
 import net.minecraft.world.entity.monster.Spider;
@@ -72,12 +72,15 @@ import net.minecraft.world.entity.projectile.ShulkerBullet;
 import net.minecraft.world.entity.monster.Shulker;
 import net.minecraft.world.entity.animal.Sheep;
 import net.minecraft.world.entity.animal.Salmon;
+import net.minecraft.world.entity.monster.Ravager;
 import net.minecraft.world.entity.animal.Rabbit;
+import net.minecraft.world.entity.animal.Pufferfish;
 import net.minecraft.world.entity.item.PrimedTnt;
 import net.minecraft.world.entity.animal.PolarBear;
-import net.minecraft.world.entity.monster.PigZombie;
-import net.minecraft.world.entity.animal.Pufferfish;
+import net.minecraft.world.entity.monster.Pillager;
+import net.minecraft.world.entity.monster.piglin.Piglin;
 import net.minecraft.world.entity.animal.Pig;
+import net.minecraft.world.entity.monster.Phantom;
 import net.minecraft.world.entity.animal.Parrot;
 import net.minecraft.world.entity.animal.Panda;
 import net.minecraft.world.entity.decoration.Painting;
@@ -98,9 +101,11 @@ import net.minecraft.world.entity.decoration.LeashFenceKnotEntity;
 import net.minecraft.world.entity.projectile.LargeFireball;
 import net.minecraft.world.entity.decoration.ItemFrame;
 import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.monster.Illusioner;
 import net.minecraft.world.entity.monster.Husk;
 import net.minecraft.world.entity.animal.horse.Horse;
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
 import net.minecraft.world.entity.monster.Guardian;
 import net.minecraft.world.entity.monster.Giant;
 import net.minecraft.world.entity.monster.Ghast;
@@ -108,8 +113,8 @@ import net.minecraft.world.entity.animal.Fox;
 import net.minecraft.world.entity.projectile.FireworkRocketEntity;
 import net.minecraft.world.entity.item.FallingBlockEntity;
 import net.minecraft.world.entity.projectile.EyeOfEnder;
-import net.minecraft.world.entity.monster.Evoker;
 import net.minecraft.world.entity.projectile.EvokerFangs;
+import net.minecraft.world.entity.monster.Evoker;
 import net.minecraft.world.entity.monster.Endermite;
 import net.minecraft.world.entity.monster.EnderMan;
 import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
@@ -117,8 +122,8 @@ import net.minecraft.world.entity.boss.enderdragon.EndCrystal;
 import net.minecraft.world.entity.monster.ElderGuardian;
 import net.minecraft.world.entity.monster.Drowned;
 import net.minecraft.world.entity.projectile.DragonFireball;
-import net.minecraft.world.entity.animal.Dolphin;
 import net.minecraft.world.entity.animal.horse.Donkey;
+import net.minecraft.world.entity.animal.Dolphin;
 import net.minecraft.world.entity.monster.Creeper;
 import net.minecraft.world.entity.animal.Cow;
 import net.minecraft.world.entity.animal.Cod;
@@ -148,8 +153,8 @@ public class EntityType<T extends Entity> {
     public static final EntityType<Cod> COD;
     public static final EntityType<Cow> COW;
     public static final EntityType<Creeper> CREEPER;
-    public static final EntityType<Donkey> DONKEY;
     public static final EntityType<Dolphin> DOLPHIN;
+    public static final EntityType<Donkey> DONKEY;
     public static final EntityType<DragonFireball> DRAGON_FIREBALL;
     public static final EntityType<Drowned> DROWNED;
     public static final EntityType<ElderGuardian> ELDER_GUARDIAN;
@@ -157,8 +162,8 @@ public class EntityType<T extends Entity> {
     public static final EntityType<EnderDragon> ENDER_DRAGON;
     public static final EntityType<EnderMan> ENDERMAN;
     public static final EntityType<Endermite> ENDERMITE;
-    public static final EntityType<EvokerFangs> EVOKER_FANGS;
     public static final EntityType<Evoker> EVOKER;
+    public static final EntityType<EvokerFangs> EVOKER_FANGS;
     public static final EntityType<ExperienceOrb> EXPERIENCE_ORB;
     public static final EntityType<EyeOfEnder> EYE_OF_ENDER;
     public static final EntityType<FallingBlockEntity> FALLING_BLOCK;
@@ -167,13 +172,16 @@ public class EntityType<T extends Entity> {
     public static final EntityType<Ghast> GHAST;
     public static final EntityType<Giant> GIANT;
     public static final EntityType<Guardian> GUARDIAN;
+    public static final EntityType<Hoglin> HOGLIN;
     public static final EntityType<Horse> HORSE;
     public static final EntityType<Husk> HUSK;
     public static final EntityType<Illusioner> ILLUSIONER;
+    public static final EntityType<IronGolem> IRON_GOLEM;
     public static final EntityType<ItemEntity> ITEM;
     public static final EntityType<ItemFrame> ITEM_FRAME;
     public static final EntityType<LargeFireball> FIREBALL;
     public static final EntityType<LeashFenceKnotEntity> LEASH_KNOT;
+    public static final EntityType<LightningBolt> LIGHTNING_BOLT;
     public static final EntityType<Llama> LLAMA;
     public static final EntityType<LlamaSpit> LLAMA_SPIT;
     public static final EntityType<MagmaCube> MAGMA_CUBE;
@@ -190,12 +198,15 @@ public class EntityType<T extends Entity> {
     public static final EntityType<Painting> PAINTING;
     public static final EntityType<Panda> PANDA;
     public static final EntityType<Parrot> PARROT;
+    public static final EntityType<Phantom> PHANTOM;
     public static final EntityType<Pig> PIG;
-    public static final EntityType<Pufferfish> PUFFERFISH;
-    public static final EntityType<PigZombie> ZOMBIE_PIGMAN;
+    public static final EntityType<Piglin> PIGLIN;
+    public static final EntityType<Pillager> PILLAGER;
     public static final EntityType<PolarBear> POLAR_BEAR;
     public static final EntityType<PrimedTnt> TNT;
+    public static final EntityType<Pufferfish> PUFFERFISH;
     public static final EntityType<Rabbit> RABBIT;
+    public static final EntityType<Ravager> RAVAGER;
     public static final EntityType<Salmon> SALMON;
     public static final EntityType<Sheep> SHEEP;
     public static final EntityType<Shulker> SHULKER;
@@ -211,39 +222,40 @@ public class EntityType<T extends Entity> {
     public static final EntityType<Spider> SPIDER;
     public static final EntityType<Squid> SQUID;
     public static final EntityType<Stray> STRAY;
-    public static final EntityType<TraderLlama> TRADER_LLAMA;
-    public static final EntityType<TropicalFish> TROPICAL_FISH;
-    public static final EntityType<Turtle> TURTLE;
+    public static final EntityType<Strider> STRIDER;
     public static final EntityType<ThrownEgg> EGG;
     public static final EntityType<ThrownEnderpearl> ENDER_PEARL;
     public static final EntityType<ThrownExperienceBottle> EXPERIENCE_BOTTLE;
     public static final EntityType<ThrownPotion> POTION;
     public static final EntityType<ThrownTrident> TRIDENT;
+    public static final EntityType<TraderLlama> TRADER_LLAMA;
+    public static final EntityType<TropicalFish> TROPICAL_FISH;
+    public static final EntityType<Turtle> TURTLE;
     public static final EntityType<Vex> VEX;
     public static final EntityType<Villager> VILLAGER;
-    public static final EntityType<IronGolem> IRON_GOLEM;
     public static final EntityType<Vindicator> VINDICATOR;
-    public static final EntityType<Pillager> PILLAGER;
     public static final EntityType<WanderingTrader> WANDERING_TRADER;
     public static final EntityType<Witch> WITCH;
     public static final EntityType<WitherBoss> WITHER;
     public static final EntityType<WitherSkeleton> WITHER_SKELETON;
     public static final EntityType<WitherSkull> WITHER_SKULL;
     public static final EntityType<Wolf> WOLF;
+    public static final EntityType<Zoglin> ZOGLIN;
     public static final EntityType<Zombie> ZOMBIE;
     public static final EntityType<ZombieHorse> ZOMBIE_HORSE;
     public static final EntityType<ZombieVillager> ZOMBIE_VILLAGER;
-    public static final EntityType<Phantom> PHANTOM;
-    public static final EntityType<Ravager> RAVAGER;
-    public static final EntityType<LightningBolt> LIGHTNING_BOLT;
+    public static final EntityType<ZombifiedPiglin> ZOMBIFIED_PIGLIN;
     public static final EntityType<Player> PLAYER;
     public static final EntityType<FishingHook> FISHING_BOBBER;
     private final EntityFactory<T> factory;
     private final MobCategory category;
+    private final ImmutableSet<Block> immuneTo;
     private final boolean serialize;
     private final boolean summon;
     private final boolean fireImmune;
     private final boolean canSpawnFarFromPlayer;
+    private final int clientTrackingRange;
+    private final int updateInterval;
     @Nullable
     private String descriptionId;
     @Nullable
@@ -256,90 +268,93 @@ public class EntityType<T extends Entity> {
         return Registry.<EntityType<T>>register(Registry.ENTITY_TYPE, string, a.build(string));
     }
     
-    public static ResourceLocation getKey(final EntityType<?> aku) {
-        return Registry.ENTITY_TYPE.getKey(aku);
+    public static ResourceLocation getKey(final EntityType<?> aoq) {
+        return Registry.ENTITY_TYPE.getKey(aoq);
     }
     
     public static Optional<EntityType<?>> byString(final String string) {
         return Registry.ENTITY_TYPE.getOptional(ResourceLocation.tryParse(string));
     }
     
-    public EntityType(final EntityFactory<T> b, final MobCategory alb, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6, final EntityDimensions akr) {
+    public EntityType(final EntityFactory<T> b, final MobCategory apa, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6, final ImmutableSet<Block> immutableSet, final EntityDimensions aon, final int integer9, final int integer10) {
         this.factory = b;
-        this.category = alb;
+        this.category = apa;
         this.canSpawnFarFromPlayer = boolean6;
         this.serialize = boolean3;
         this.summon = boolean4;
         this.fireImmune = boolean5;
-        this.dimensions = akr;
+        this.immuneTo = immutableSet;
+        this.dimensions = aon;
+        this.clientTrackingRange = integer9;
+        this.updateInterval = integer10;
     }
     
     @Nullable
-    public Entity spawn(final Level bjw, @Nullable final ItemStack ben, @Nullable final Player ayj, final BlockPos fk, final MobSpawnType alc, final boolean boolean6, final boolean boolean7) {
-        return this.spawn(bjw, (ben == null) ? null : ben.getTag(), (ben != null && ben.hasCustomHoverName()) ? ben.getHoverName() : null, ayj, fk, alc, boolean6, boolean7);
+    public Entity spawn(final Level bqb, @Nullable final ItemStack bki, @Nullable final Player bec, final BlockPos fu, final MobSpawnType apb, final boolean boolean6, final boolean boolean7) {
+        return this.spawn(bqb, (bki == null) ? null : bki.getTag(), (bki != null && bki.hasCustomHoverName()) ? bki.getHoverName() : null, bec, fu, apb, boolean6, boolean7);
     }
     
     @Nullable
-    public T spawn(final Level bjw, @Nullable final CompoundTag jt, @Nullable final Component lf, @Nullable final Player ayj, final BlockPos fk, final MobSpawnType alc, final boolean boolean7, final boolean boolean8) {
-        final T akq10 = this.create(bjw, jt, lf, ayj, fk, alc, boolean7, boolean8);
-        bjw.addFreshEntity(akq10);
-        return akq10;
+    public T spawn(final Level bqb, @Nullable final CompoundTag le, @Nullable final Component mr, @Nullable final Player bec, final BlockPos fu, final MobSpawnType apb, final boolean boolean7, final boolean boolean8) {
+        final T aom10 = this.create(bqb, le, mr, bec, fu, apb, boolean7, boolean8);
+        bqb.addFreshEntity(aom10);
+        return aom10;
     }
     
     @Nullable
-    public T create(final Level bjw, @Nullable final CompoundTag jt, @Nullable final Component lf, @Nullable final Player ayj, final BlockPos fk, final MobSpawnType alc, final boolean boolean7, final boolean boolean8) {
-        final T akq10 = this.create(bjw);
-        if (akq10 == null) {
+    public T create(final Level bqb, @Nullable final CompoundTag le, @Nullable final Component mr, @Nullable final Player bec, final BlockPos fu, final MobSpawnType apb, final boolean boolean7, final boolean boolean8) {
+        final T aom10 = this.create(bqb);
+        if (aom10 == null) {
             return null;
         }
         double double11;
         if (boolean7) {
-            akq10.setPos(fk.getX() + 0.5, fk.getY() + 1, fk.getZ() + 0.5);
-            double11 = getYOffset(bjw, fk, boolean8, akq10.getBoundingBox());
+            aom10.setPos(fu.getX() + 0.5, fu.getY() + 1, fu.getZ() + 0.5);
+            double11 = getYOffset(bqb, fu, boolean8, aom10.getBoundingBox());
         }
         else {
             double11 = 0.0;
         }
-        akq10.moveTo(fk.getX() + 0.5, fk.getY() + double11, fk.getZ() + 0.5, Mth.wrapDegrees(bjw.random.nextFloat() * 360.0f), 0.0f);
-        if (akq10 instanceof Mob) {
-            final Mob ala13 = (Mob)akq10;
-            ala13.yHeadRot = ala13.yRot;
-            ala13.yBodyRot = ala13.yRot;
-            ala13.finalizeSpawn(bjw, bjw.getCurrentDifficultyAt(new BlockPos(ala13)), alc, null, jt);
-            ala13.playAmbientSound();
+        aom10.moveTo(fu.getX() + 0.5, fu.getY() + double11, fu.getZ() + 0.5, Mth.wrapDegrees(bqb.random.nextFloat() * 360.0f), 0.0f);
+        if (aom10 instanceof Mob) {
+            final Mob aoz13 = (Mob)aom10;
+            aoz13.yHeadRot = aoz13.yRot;
+            aoz13.yBodyRot = aoz13.yRot;
+            aoz13.finalizeSpawn(bqb, bqb.getCurrentDifficultyAt(aoz13.blockPosition()), apb, null, le);
+            aoz13.playAmbientSound();
         }
-        if (lf != null && akq10 instanceof LivingEntity) {
-            akq10.setCustomName(lf);
+        if (mr != null && aom10 instanceof LivingEntity) {
+            aom10.setCustomName(mr);
         }
-        updateCustomEntityTag(bjw, ayj, akq10, jt);
-        return akq10;
+        updateCustomEntityTag(bqb, bec, aom10, le);
+        return aom10;
     }
     
-    protected static double getYOffset(final LevelReader bjz, final BlockPos fk, final boolean boolean3, final AABB cvf) {
-        AABB cvf2 = new AABB(fk);
+    protected static double getYOffset(final LevelReader bqd, final BlockPos fu, final boolean boolean3, final AABB deg) {
+        AABB deg2 = new AABB(fu);
         if (boolean3) {
-            cvf2 = cvf2.expandTowards(0.0, -1.0, 0.0);
+            deg2 = deg2.expandTowards(0.0, -1.0, 0.0);
         }
-        final Stream<VoxelShape> stream6 = bjz.getCollisions(null, cvf2, Collections.<Entity>emptySet());
-        return 1.0 + Shapes.collide(Direction.Axis.Y, cvf, stream6, boolean3 ? -2.0 : -1.0);
+        final Stream<VoxelShape> stream6 = bqd.getCollisions(null, deg2, aom -> true);
+        return 1.0 + Shapes.collide(Direction.Axis.Y, deg, stream6, boolean3 ? -2.0 : -1.0);
     }
     
-    public static void updateCustomEntityTag(final Level bjw, @Nullable final Player ayj, @Nullable final Entity akq, @Nullable final CompoundTag jt) {
-        if (jt == null || !jt.contains("EntityTag", 10)) {
+    public static void updateCustomEntityTag(final Level bqb, @Nullable final Player bec, @Nullable final Entity aom, @Nullable final CompoundTag le) {
+        if (le == null || !le.contains("EntityTag", 10)) {
             return;
         }
-        final MinecraftServer minecraftServer5 = bjw.getServer();
-        if (minecraftServer5 == null || akq == null) {
+        final MinecraftServer minecraftServer5 = bqb.getServer();
+        if (minecraftServer5 == null || aom == null) {
             return;
         }
-        if (!bjw.isClientSide && akq.onlyOpCanSetNbt() && (ayj == null || !minecraftServer5.getPlayerList().isOp(ayj.getGameProfile()))) {
+        if (!bqb.isClientSide && aom.onlyOpCanSetNbt() && (bec == null || !minecraftServer5.getPlayerList().isOp(bec.getGameProfile()))) {
             return;
         }
-        final CompoundTag jt2 = akq.saveWithoutId(new CompoundTag());
-        final UUID uUID7 = akq.getUUID();
-        jt2.merge(jt.getCompound("EntityTag"));
-        akq.setUUID(uUID7);
-        akq.load(jt2);
+        final CompoundTag le2 = aom.saveWithoutId(new CompoundTag());
+        final UUID uUID7 = aom.getUUID();
+        le2.merge(le.getCompound("EntityTag"));
+        aom.setUUID(uUID7);
+        aom.load(le2);
     }
     
     public boolean canSerialize() {
@@ -371,15 +386,20 @@ public class EntityType<T extends Entity> {
     
     public Component getDescription() {
         if (this.description == null) {
-            this.description = new TranslatableComponent(this.getDescriptionId(), new Object[0]);
+            this.description = new TranslatableComponent(this.getDescriptionId());
         }
         return this.description;
     }
     
+    @Override
+    public String toString() {
+        return this.getDescriptionId();
+    }
+    
     public ResourceLocation getDefaultLootTable() {
         if (this.lootTable == null) {
-            final ResourceLocation sm2 = Registry.ENTITY_TYPE.getKey(this);
-            this.lootTable = new ResourceLocation(sm2.getNamespace(), "entities/" + sm2.getPath());
+            final ResourceLocation uh2 = Registry.ENTITY_TYPE.getKey(this);
+            this.lootTable = new ResourceLocation(uh2.getNamespace(), "entities/" + uh2.getPath());
         }
         return this.lootTable;
     }
@@ -393,22 +413,22 @@ public class EntityType<T extends Entity> {
     }
     
     @Nullable
-    public T create(final Level bjw) {
-        return this.factory.create(this, bjw);
+    public T create(final Level bqb) {
+        return this.factory.create(this, bqb);
     }
     
     @Nullable
-    public static Entity create(final int integer, final Level bjw) {
-        return create(bjw, Registry.ENTITY_TYPE.byId(integer));
+    public static Entity create(final int integer, final Level bqb) {
+        return create(bqb, Registry.ENTITY_TYPE.byId(integer));
     }
     
-    public static Optional<Entity> create(final CompoundTag jt, final Level bjw) {
-        return Util.<Entity>ifElse(by(jt).<Entity>map(aku -> aku.create(bjw)), akq -> akq.load(jt), () -> EntityType.LOGGER.warn("Skipping Entity with id {}", jt.getString("id")));
+    public static Optional<Entity> create(final CompoundTag le, final Level bqb) {
+        return Util.<Entity>ifElse(by(le).<Entity>map(aoq -> aoq.create(bqb)), aom -> aom.load(le), () -> EntityType.LOGGER.warn("Skipping Entity with id {}", le.getString("id")));
     }
     
     @Nullable
-    private static Entity create(final Level bjw, @Nullable final EntityType<?> aku) {
-        return (Entity)((aku == null) ? null : aku.create(bjw));
+    private static Entity create(final Level bqb, @Nullable final EntityType<?> aoq) {
+        return (Entity)((aoq == null) ? null : aoq.create(bqb));
     }
     
     public AABB getAABB(final double double1, final double double2, final double double3) {
@@ -416,35 +436,39 @@ public class EntityType<T extends Entity> {
         return new AABB(double1 - float8, double2, double3 - float8, double1 + float8, double2 + this.getHeight(), double3 + float8);
     }
     
+    public boolean isBlockDangerous(final BlockState cfj) {
+        return !this.immuneTo.contains(cfj.getBlock()) && ((!this.fireImmune && (cfj.is(BlockTags.FIRE) || cfj.is(Blocks.MAGMA_BLOCK) || CampfireBlock.isLitCampfire(cfj) || cfj.is(Blocks.LAVA))) || cfj.is(Blocks.WITHER_ROSE) || cfj.is(Blocks.SWEET_BERRY_BUSH) || cfj.is(Blocks.CACTUS));
+    }
+    
     public EntityDimensions getDimensions() {
         return this.dimensions;
     }
     
-    public static Optional<EntityType<?>> by(final CompoundTag jt) {
-        return Registry.ENTITY_TYPE.getOptional(new ResourceLocation(jt.getString("id")));
+    public static Optional<EntityType<?>> by(final CompoundTag le) {
+        return Registry.ENTITY_TYPE.getOptional(new ResourceLocation(le.getString("id")));
     }
     
     @Nullable
-    public static Entity loadEntityRecursive(final CompoundTag jt, final Level bjw, final Function<Entity, Entity> function) {
-        ListTag jz5;
+    public static Entity loadEntityRecursive(final CompoundTag le, final Level bqb, final Function<Entity, Entity> function) {
+        ListTag lk5;
         int integer6;
-        Entity akq2;
-        return loadStaticEntity(jt, bjw).map(function).<Entity>map(akq -> {
-            if (jt.contains("Passengers", 9)) {
-                for (jz5 = jt.getList("Passengers", 10), integer6 = 0; integer6 < jz5.size(); ++integer6) {
-                    akq2 = loadEntityRecursive(jz5.getCompound(integer6), bjw, function);
-                    if (akq2 != null) {
-                        akq2.startRiding(akq, true);
+        Entity aom2;
+        return loadStaticEntity(le, bqb).map(function).<Entity>map(aom -> {
+            if (le.contains("Passengers", 9)) {
+                for (lk5 = le.getList("Passengers", 10), integer6 = 0; integer6 < lk5.size(); ++integer6) {
+                    aom2 = loadEntityRecursive(lk5.getCompound(integer6), bqb, function);
+                    if (aom2 != null) {
+                        aom2.startRiding(aom, true);
                     }
                 }
             }
-            return akq;
+            return aom;
         }).orElse(null);
     }
     
-    private static Optional<Entity> loadStaticEntity(final CompoundTag jt, final Level bjw) {
+    private static Optional<Entity> loadStaticEntity(final CompoundTag le, final Level bqb) {
         try {
-            return create(jt, bjw);
+            return create(le, bqb);
         }
         catch (RuntimeException runtimeException3) {
             EntityType.LOGGER.warn("Exception loading entity: ", (Throwable)runtimeException3);
@@ -452,183 +476,163 @@ public class EntityType<T extends Entity> {
         }
     }
     
-    public int chunkRange() {
-        if (this == EntityType.PLAYER) {
-            return 32;
-        }
-        if (this == EntityType.END_CRYSTAL) {
-            return 16;
-        }
-        if (this == EntityType.ENDER_DRAGON || this == EntityType.TNT || this == EntityType.FALLING_BLOCK || this == EntityType.ITEM_FRAME || this == EntityType.LEASH_KNOT || this == EntityType.PAINTING || this == EntityType.ARMOR_STAND || this == EntityType.EXPERIENCE_ORB || this == EntityType.AREA_EFFECT_CLOUD || this == EntityType.EVOKER_FANGS) {
-            return 10;
-        }
-        if (this == EntityType.FISHING_BOBBER || this == EntityType.ARROW || this == EntityType.SPECTRAL_ARROW || this == EntityType.TRIDENT || this == EntityType.SMALL_FIREBALL || this == EntityType.DRAGON_FIREBALL || this == EntityType.FIREBALL || this == EntityType.WITHER_SKULL || this == EntityType.SNOWBALL || this == EntityType.LLAMA_SPIT || this == EntityType.ENDER_PEARL || this == EntityType.EYE_OF_ENDER || this == EntityType.EGG || this == EntityType.POTION || this == EntityType.EXPERIENCE_BOTTLE || this == EntityType.FIREWORK_ROCKET || this == EntityType.ITEM) {
-            return 4;
-        }
-        return 5;
+    public int clientTrackingRange() {
+        return this.clientTrackingRange;
     }
     
     public int updateInterval() {
-        if (this == EntityType.PLAYER || this == EntityType.EVOKER_FANGS) {
-            return 2;
-        }
-        if (this == EntityType.EYE_OF_ENDER) {
-            return 4;
-        }
-        if (this == EntityType.FISHING_BOBBER) {
-            return 5;
-        }
-        if (this == EntityType.SMALL_FIREBALL || this == EntityType.DRAGON_FIREBALL || this == EntityType.FIREBALL || this == EntityType.WITHER_SKULL || this == EntityType.SNOWBALL || this == EntityType.LLAMA_SPIT || this == EntityType.ENDER_PEARL || this == EntityType.EGG || this == EntityType.POTION || this == EntityType.EXPERIENCE_BOTTLE || this == EntityType.FIREWORK_ROCKET || this == EntityType.TNT) {
-            return 10;
-        }
-        if (this == EntityType.ARROW || this == EntityType.SPECTRAL_ARROW || this == EntityType.TRIDENT || this == EntityType.ITEM || this == EntityType.FALLING_BLOCK || this == EntityType.EXPERIENCE_ORB) {
-            return 20;
-        }
-        if (this == EntityType.ITEM_FRAME || this == EntityType.LEASH_KNOT || this == EntityType.PAINTING || this == EntityType.AREA_EFFECT_CLOUD || this == EntityType.END_CRYSTAL) {
-            return Integer.MAX_VALUE;
-        }
-        return 3;
+        return this.updateInterval;
     }
     
     public boolean trackDeltas() {
         return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
     }
     
-    public boolean is(final Tag<EntityType<?>> aaz) {
-        return aaz.contains(this);
+    public boolean is(final Tag<EntityType<?>> adf) {
+        return adf.contains(this);
     }
     
     static {
         LOGGER = LogManager.getLogger();
-        AREA_EFFECT_CLOUD = EntityType.<AreaEffectCloud>register("area_effect_cloud", Builder.<AreaEffectCloud>of(AreaEffectCloud::new, MobCategory.MISC).fireImmune().sized(6.0f, 0.5f));
-        ARMOR_STAND = EntityType.<ArmorStand>register("armor_stand", Builder.<ArmorStand>of(ArmorStand::new, MobCategory.MISC).sized(0.5f, 1.975f));
-        ARROW = EntityType.<Arrow>register("arrow", Builder.<Arrow>of(Arrow::new, MobCategory.MISC).sized(0.5f, 0.5f));
-        BAT = EntityType.<Bat>register("bat", Builder.<Bat>of(Bat::new, MobCategory.AMBIENT).sized(0.5f, 0.9f));
-        BEE = EntityType.<Bee>register("bee", Builder.<Bee>of(Bee::new, MobCategory.CREATURE).sized(0.7f, 0.6f));
-        BLAZE = EntityType.<Blaze>register("blaze", Builder.<Blaze>of(Blaze::new, MobCategory.MONSTER).fireImmune().sized(0.6f, 1.8f));
-        BOAT = EntityType.<Boat>register("boat", Builder.<Boat>of(Boat::new, MobCategory.MISC).sized(1.375f, 0.5625f));
-        CAT = EntityType.<Cat>register("cat", Builder.<Cat>of(Cat::new, MobCategory.CREATURE).sized(0.6f, 0.7f));
-        CAVE_SPIDER = EntityType.<CaveSpider>register("cave_spider", Builder.<CaveSpider>of(CaveSpider::new, MobCategory.MONSTER).sized(0.7f, 0.5f));
-        CHICKEN = EntityType.<Chicken>register("chicken", Builder.<Chicken>of(Chicken::new, MobCategory.CREATURE).sized(0.4f, 0.7f));
-        COD = EntityType.<Cod>register("cod", Builder.<Cod>of(Cod::new, MobCategory.WATER_CREATURE).sized(0.5f, 0.3f));
-        COW = EntityType.<Cow>register("cow", Builder.<Cow>of(Cow::new, MobCategory.CREATURE).sized(0.9f, 1.4f));
-        CREEPER = EntityType.<Creeper>register("creeper", Builder.<Creeper>of(Creeper::new, MobCategory.MONSTER).sized(0.6f, 1.7f));
-        DONKEY = EntityType.<Donkey>register("donkey", Builder.<Donkey>of(Donkey::new, MobCategory.CREATURE).sized(1.3964844f, 1.5f));
+        AREA_EFFECT_CLOUD = EntityType.<AreaEffectCloud>register("area_effect_cloud", Builder.<AreaEffectCloud>of(AreaEffectCloud::new, MobCategory.MISC).fireImmune().sized(6.0f, 0.5f).clientTrackingRange(10).updateInterval(Integer.MAX_VALUE));
+        ARMOR_STAND = EntityType.<ArmorStand>register("armor_stand", Builder.<ArmorStand>of(ArmorStand::new, MobCategory.MISC).sized(0.5f, 1.975f).clientTrackingRange(10));
+        ARROW = EntityType.<Arrow>register("arrow", Builder.<Arrow>of(Arrow::new, MobCategory.MISC).sized(0.5f, 0.5f).clientTrackingRange(4).updateInterval(20));
+        BAT = EntityType.<Bat>register("bat", Builder.<Bat>of(Bat::new, MobCategory.AMBIENT).sized(0.5f, 0.9f).clientTrackingRange(5));
+        BEE = EntityType.<Bee>register("bee", Builder.<Bee>of(Bee::new, MobCategory.CREATURE).sized(0.7f, 0.6f).clientTrackingRange(8));
+        BLAZE = EntityType.<Blaze>register("blaze", Builder.<Blaze>of(Blaze::new, MobCategory.MONSTER).fireImmune().sized(0.6f, 1.8f).clientTrackingRange(8));
+        BOAT = EntityType.<Boat>register("boat", Builder.<Boat>of(Boat::new, MobCategory.MISC).sized(1.375f, 0.5625f).clientTrackingRange(10));
+        CAT = EntityType.<Cat>register("cat", Builder.<Cat>of(Cat::new, MobCategory.CREATURE).sized(0.6f, 0.7f).clientTrackingRange(8));
+        CAVE_SPIDER = EntityType.<CaveSpider>register("cave_spider", Builder.<CaveSpider>of(CaveSpider::new, MobCategory.MONSTER).sized(0.7f, 0.5f).clientTrackingRange(8));
+        CHICKEN = EntityType.<Chicken>register("chicken", Builder.<Chicken>of(Chicken::new, MobCategory.CREATURE).sized(0.4f, 0.7f).clientTrackingRange(10));
+        COD = EntityType.<Cod>register("cod", Builder.<Cod>of(Cod::new, MobCategory.WATER_AMBIENT).sized(0.5f, 0.3f).clientTrackingRange(4));
+        COW = EntityType.<Cow>register("cow", Builder.<Cow>of(Cow::new, MobCategory.CREATURE).sized(0.9f, 1.4f).clientTrackingRange(10));
+        CREEPER = EntityType.<Creeper>register("creeper", Builder.<Creeper>of(Creeper::new, MobCategory.MONSTER).sized(0.6f, 1.7f).clientTrackingRange(8));
         DOLPHIN = EntityType.<Dolphin>register("dolphin", Builder.<Dolphin>of(Dolphin::new, MobCategory.WATER_CREATURE).sized(0.9f, 0.6f));
-        DRAGON_FIREBALL = EntityType.<DragonFireball>register("dragon_fireball", Builder.<DragonFireball>of(DragonFireball::new, MobCategory.MISC).sized(1.0f, 1.0f));
-        DROWNED = EntityType.<Drowned>register("drowned", Builder.<Drowned>of(Drowned::new, MobCategory.MONSTER).sized(0.6f, 1.95f));
-        ELDER_GUARDIAN = EntityType.<ElderGuardian>register("elder_guardian", Builder.<ElderGuardian>of(ElderGuardian::new, MobCategory.MONSTER).sized(1.9975f, 1.9975f));
-        END_CRYSTAL = EntityType.<EndCrystal>register("end_crystal", Builder.<EndCrystal>of(EndCrystal::new, MobCategory.MISC).sized(2.0f, 2.0f));
-        ENDER_DRAGON = EntityType.<EnderDragon>register("ender_dragon", Builder.<EnderDragon>of(EnderDragon::new, MobCategory.MONSTER).fireImmune().sized(16.0f, 8.0f));
-        ENDERMAN = EntityType.<EnderMan>register("enderman", Builder.<EnderMan>of(EnderMan::new, MobCategory.MONSTER).sized(0.6f, 2.9f));
-        ENDERMITE = EntityType.<Endermite>register("endermite", Builder.<Endermite>of(Endermite::new, MobCategory.MONSTER).sized(0.4f, 0.3f));
-        EVOKER_FANGS = EntityType.<EvokerFangs>register("evoker_fangs", Builder.<EvokerFangs>of(EvokerFangs::new, MobCategory.MISC).sized(0.5f, 0.8f));
-        EVOKER = EntityType.<Evoker>register("evoker", Builder.<Evoker>of(Evoker::new, MobCategory.MONSTER).sized(0.6f, 1.95f));
-        EXPERIENCE_ORB = EntityType.<ExperienceOrb>register("experience_orb", Builder.<ExperienceOrb>of(ExperienceOrb::new, MobCategory.MISC).sized(0.5f, 0.5f));
-        EYE_OF_ENDER = EntityType.<EyeOfEnder>register("eye_of_ender", Builder.<EyeOfEnder>of(EyeOfEnder::new, MobCategory.MISC).sized(0.25f, 0.25f));
-        FALLING_BLOCK = EntityType.<FallingBlockEntity>register("falling_block", Builder.<FallingBlockEntity>of(FallingBlockEntity::new, MobCategory.MISC).sized(0.98f, 0.98f));
-        FIREWORK_ROCKET = EntityType.<FireworkRocketEntity>register("firework_rocket", Builder.<FireworkRocketEntity>of(FireworkRocketEntity::new, MobCategory.MISC).sized(0.25f, 0.25f));
-        FOX = EntityType.<Fox>register("fox", Builder.<Fox>of(Fox::new, MobCategory.CREATURE).sized(0.6f, 0.7f));
-        GHAST = EntityType.<Ghast>register("ghast", Builder.<Ghast>of(Ghast::new, MobCategory.MONSTER).fireImmune().sized(4.0f, 4.0f));
-        GIANT = EntityType.<Giant>register("giant", Builder.<Giant>of(Giant::new, MobCategory.MONSTER).sized(3.6f, 12.0f));
-        GUARDIAN = EntityType.<Guardian>register("guardian", Builder.<Guardian>of(Guardian::new, MobCategory.MONSTER).sized(0.85f, 0.85f));
-        HORSE = EntityType.<Horse>register("horse", Builder.<Horse>of(Horse::new, MobCategory.CREATURE).sized(1.3964844f, 1.6f));
-        HUSK = EntityType.<Husk>register("husk", Builder.<Husk>of(Husk::new, MobCategory.MONSTER).sized(0.6f, 1.95f));
-        ILLUSIONER = EntityType.<Illusioner>register("illusioner", Builder.<Illusioner>of(Illusioner::new, MobCategory.MONSTER).sized(0.6f, 1.95f));
-        ITEM = EntityType.<ItemEntity>register("item", Builder.<ItemEntity>of(ItemEntity::new, MobCategory.MISC).sized(0.25f, 0.25f));
-        ITEM_FRAME = EntityType.<ItemFrame>register("item_frame", Builder.<ItemFrame>of(ItemFrame::new, MobCategory.MISC).sized(0.5f, 0.5f));
-        FIREBALL = EntityType.<LargeFireball>register("fireball", Builder.<LargeFireball>of(LargeFireball::new, MobCategory.MISC).sized(1.0f, 1.0f));
-        LEASH_KNOT = EntityType.<LeashFenceKnotEntity>register("leash_knot", Builder.<LeashFenceKnotEntity>of(LeashFenceKnotEntity::new, MobCategory.MISC).noSave().sized(0.5f, 0.5f));
-        LLAMA = EntityType.<Llama>register("llama", Builder.<Llama>of(Llama::new, MobCategory.CREATURE).sized(0.9f, 1.87f));
-        LLAMA_SPIT = EntityType.<LlamaSpit>register("llama_spit", Builder.<LlamaSpit>of(LlamaSpit::new, MobCategory.MISC).sized(0.25f, 0.25f));
-        MAGMA_CUBE = EntityType.<MagmaCube>register("magma_cube", Builder.<MagmaCube>of(MagmaCube::new, MobCategory.MONSTER).fireImmune().sized(2.04f, 2.04f));
-        MINECART = EntityType.<Minecart>register("minecart", Builder.<Minecart>of(Minecart::new, MobCategory.MISC).sized(0.98f, 0.7f));
-        CHEST_MINECART = EntityType.<MinecartChest>register("chest_minecart", Builder.<MinecartChest>of(MinecartChest::new, MobCategory.MISC).sized(0.98f, 0.7f));
-        COMMAND_BLOCK_MINECART = EntityType.<MinecartCommandBlock>register("command_block_minecart", Builder.<MinecartCommandBlock>of(MinecartCommandBlock::new, MobCategory.MISC).sized(0.98f, 0.7f));
-        FURNACE_MINECART = EntityType.<MinecartFurnace>register("furnace_minecart", Builder.<MinecartFurnace>of(MinecartFurnace::new, MobCategory.MISC).sized(0.98f, 0.7f));
-        HOPPER_MINECART = EntityType.<MinecartHopper>register("hopper_minecart", Builder.<MinecartHopper>of(MinecartHopper::new, MobCategory.MISC).sized(0.98f, 0.7f));
-        SPAWNER_MINECART = EntityType.<MinecartSpawner>register("spawner_minecart", Builder.<MinecartSpawner>of(MinecartSpawner::new, MobCategory.MISC).sized(0.98f, 0.7f));
-        TNT_MINECART = EntityType.<MinecartTNT>register("tnt_minecart", Builder.<MinecartTNT>of(MinecartTNT::new, MobCategory.MISC).sized(0.98f, 0.7f));
-        MULE = EntityType.<Mule>register("mule", Builder.<Mule>of(Mule::new, MobCategory.CREATURE).sized(1.3964844f, 1.6f));
-        MOOSHROOM = EntityType.<MushroomCow>register("mooshroom", Builder.<MushroomCow>of(MushroomCow::new, MobCategory.CREATURE).sized(0.9f, 1.4f));
-        OCELOT = EntityType.<Ocelot>register("ocelot", Builder.<Ocelot>of(Ocelot::new, MobCategory.CREATURE).sized(0.6f, 0.7f));
-        PAINTING = EntityType.<Painting>register("painting", Builder.<Painting>of(Painting::new, MobCategory.MISC).sized(0.5f, 0.5f));
-        PANDA = EntityType.<Panda>register("panda", Builder.<Panda>of(Panda::new, MobCategory.CREATURE).sized(1.3f, 1.25f));
-        PARROT = EntityType.<Parrot>register("parrot", Builder.<Parrot>of(Parrot::new, MobCategory.CREATURE).sized(0.5f, 0.9f));
-        PIG = EntityType.<Pig>register("pig", Builder.<Pig>of(Pig::new, MobCategory.CREATURE).sized(0.9f, 0.9f));
-        PUFFERFISH = EntityType.<Pufferfish>register("pufferfish", Builder.<Pufferfish>of(Pufferfish::new, MobCategory.WATER_CREATURE).sized(0.7f, 0.7f));
-        ZOMBIE_PIGMAN = EntityType.<PigZombie>register("zombie_pigman", Builder.<PigZombie>of(PigZombie::new, MobCategory.MONSTER).fireImmune().sized(0.6f, 1.95f));
-        POLAR_BEAR = EntityType.<PolarBear>register("polar_bear", Builder.<PolarBear>of(PolarBear::new, MobCategory.CREATURE).sized(1.4f, 1.4f));
-        TNT = EntityType.<PrimedTnt>register("tnt", Builder.<PrimedTnt>of(PrimedTnt::new, MobCategory.MISC).fireImmune().sized(0.98f, 0.98f));
-        RABBIT = EntityType.<Rabbit>register("rabbit", Builder.<Rabbit>of(Rabbit::new, MobCategory.CREATURE).sized(0.4f, 0.5f));
-        SALMON = EntityType.<Salmon>register("salmon", Builder.<Salmon>of(Salmon::new, MobCategory.WATER_CREATURE).sized(0.7f, 0.4f));
-        SHEEP = EntityType.<Sheep>register("sheep", Builder.<Sheep>of(Sheep::new, MobCategory.CREATURE).sized(0.9f, 1.3f));
-        SHULKER = EntityType.<Shulker>register("shulker", Builder.<Shulker>of(Shulker::new, MobCategory.MONSTER).fireImmune().canSpawnFarFromPlayer().sized(1.0f, 1.0f));
-        SHULKER_BULLET = EntityType.<ShulkerBullet>register("shulker_bullet", Builder.<ShulkerBullet>of(ShulkerBullet::new, MobCategory.MISC).sized(0.3125f, 0.3125f));
-        SILVERFISH = EntityType.<Silverfish>register("silverfish", Builder.<Silverfish>of(Silverfish::new, MobCategory.MONSTER).sized(0.4f, 0.3f));
-        SKELETON = EntityType.<Skeleton>register("skeleton", Builder.<Skeleton>of(Skeleton::new, MobCategory.MONSTER).sized(0.6f, 1.99f));
-        SKELETON_HORSE = EntityType.<SkeletonHorse>register("skeleton_horse", Builder.<SkeletonHorse>of(SkeletonHorse::new, MobCategory.CREATURE).sized(1.3964844f, 1.6f));
-        SLIME = EntityType.<Slime>register("slime", Builder.<Slime>of(Slime::new, MobCategory.MONSTER).sized(2.04f, 2.04f));
-        SMALL_FIREBALL = EntityType.<SmallFireball>register("small_fireball", Builder.<SmallFireball>of(SmallFireball::new, MobCategory.MISC).sized(0.3125f, 0.3125f));
-        SNOW_GOLEM = EntityType.<SnowGolem>register("snow_golem", Builder.<SnowGolem>of(SnowGolem::new, MobCategory.MISC).sized(0.7f, 1.9f));
-        SNOWBALL = EntityType.<Snowball>register("snowball", Builder.<Snowball>of(Snowball::new, MobCategory.MISC).sized(0.25f, 0.25f));
-        SPECTRAL_ARROW = EntityType.<SpectralArrow>register("spectral_arrow", Builder.<SpectralArrow>of(SpectralArrow::new, MobCategory.MISC).sized(0.5f, 0.5f));
-        SPIDER = EntityType.<Spider>register("spider", Builder.<Spider>of(Spider::new, MobCategory.MONSTER).sized(1.4f, 0.9f));
-        SQUID = EntityType.<Squid>register("squid", Builder.<Squid>of(Squid::new, MobCategory.WATER_CREATURE).sized(0.8f, 0.8f));
-        STRAY = EntityType.<Stray>register("stray", Builder.<Stray>of(Stray::new, MobCategory.MONSTER).sized(0.6f, 1.99f));
-        TRADER_LLAMA = EntityType.<TraderLlama>register("trader_llama", Builder.<TraderLlama>of(TraderLlama::new, MobCategory.CREATURE).sized(0.9f, 1.87f));
-        TROPICAL_FISH = EntityType.<TropicalFish>register("tropical_fish", Builder.<TropicalFish>of(TropicalFish::new, MobCategory.WATER_CREATURE).sized(0.5f, 0.4f));
-        TURTLE = EntityType.<Turtle>register("turtle", Builder.<Turtle>of(Turtle::new, MobCategory.CREATURE).sized(1.2f, 0.4f));
-        EGG = EntityType.<ThrownEgg>register("egg", Builder.<ThrownEgg>of(ThrownEgg::new, MobCategory.MISC).sized(0.25f, 0.25f));
-        ENDER_PEARL = EntityType.<ThrownEnderpearl>register("ender_pearl", Builder.<ThrownEnderpearl>of(ThrownEnderpearl::new, MobCategory.MISC).sized(0.25f, 0.25f));
-        EXPERIENCE_BOTTLE = EntityType.<ThrownExperienceBottle>register("experience_bottle", Builder.<ThrownExperienceBottle>of(ThrownExperienceBottle::new, MobCategory.MISC).sized(0.25f, 0.25f));
-        POTION = EntityType.<ThrownPotion>register("potion", Builder.<ThrownPotion>of(ThrownPotion::new, MobCategory.MISC).sized(0.25f, 0.25f));
-        TRIDENT = EntityType.<ThrownTrident>register("trident", Builder.<ThrownTrident>of(ThrownTrident::new, MobCategory.MISC).sized(0.5f, 0.5f));
-        VEX = EntityType.<Vex>register("vex", Builder.<Vex>of(Vex::new, MobCategory.MONSTER).fireImmune().sized(0.4f, 0.8f));
-        VILLAGER = EntityType.<Villager>register("villager", Builder.<Villager>of(Villager::new, MobCategory.MISC).sized(0.6f, 1.95f));
-        IRON_GOLEM = EntityType.<IronGolem>register("iron_golem", Builder.<IronGolem>of(IronGolem::new, MobCategory.MISC).sized(1.4f, 2.7f));
-        VINDICATOR = EntityType.<Vindicator>register("vindicator", Builder.<Vindicator>of(Vindicator::new, MobCategory.MONSTER).sized(0.6f, 1.95f));
-        PILLAGER = EntityType.<Pillager>register("pillager", Builder.<Pillager>of(Pillager::new, MobCategory.MONSTER).canSpawnFarFromPlayer().sized(0.6f, 1.95f));
-        WANDERING_TRADER = EntityType.<WanderingTrader>register("wandering_trader", Builder.<WanderingTrader>of(WanderingTrader::new, MobCategory.CREATURE).sized(0.6f, 1.95f));
-        WITCH = EntityType.<Witch>register("witch", Builder.<Witch>of(Witch::new, MobCategory.MONSTER).sized(0.6f, 1.95f));
-        WITHER = EntityType.<WitherBoss>register("wither", Builder.<WitherBoss>of(WitherBoss::new, MobCategory.MONSTER).fireImmune().sized(0.9f, 3.5f));
-        WITHER_SKELETON = EntityType.<WitherSkeleton>register("wither_skeleton", Builder.<WitherSkeleton>of(WitherSkeleton::new, MobCategory.MONSTER).fireImmune().sized(0.7f, 2.4f));
-        WITHER_SKULL = EntityType.<WitherSkull>register("wither_skull", Builder.<WitherSkull>of(WitherSkull::new, MobCategory.MISC).sized(0.3125f, 0.3125f));
-        WOLF = EntityType.<Wolf>register("wolf", Builder.<Wolf>of(Wolf::new, MobCategory.CREATURE).sized(0.6f, 0.85f));
-        ZOMBIE = EntityType.<Zombie>register("zombie", Builder.<Zombie>of(Zombie::new, MobCategory.MONSTER).sized(0.6f, 1.95f));
-        ZOMBIE_HORSE = EntityType.<ZombieHorse>register("zombie_horse", Builder.<ZombieHorse>of(ZombieHorse::new, MobCategory.CREATURE).sized(1.3964844f, 1.6f));
-        ZOMBIE_VILLAGER = EntityType.<ZombieVillager>register("zombie_villager", Builder.<ZombieVillager>of(ZombieVillager::new, MobCategory.MONSTER).sized(0.6f, 1.95f));
-        PHANTOM = EntityType.<Phantom>register("phantom", Builder.<Phantom>of(Phantom::new, MobCategory.MONSTER).sized(0.9f, 0.5f));
-        RAVAGER = EntityType.<Ravager>register("ravager", Builder.<Ravager>of(Ravager::new, MobCategory.MONSTER).sized(1.95f, 2.2f));
-        LIGHTNING_BOLT = EntityType.<LightningBolt>register("lightning_bolt", (Builder<LightningBolt>)Builder.<T>createNothing(MobCategory.MISC).noSave().sized(0.0f, 0.0f));
-        PLAYER = EntityType.<Player>register("player", (Builder<Player>)Builder.<T>createNothing(MobCategory.MISC).noSave().noSummon().sized(0.6f, 1.8f));
-        FISHING_BOBBER = EntityType.<FishingHook>register("fishing_bobber", (Builder<FishingHook>)Builder.<T>createNothing(MobCategory.MISC).noSave().noSummon().sized(0.25f, 0.25f));
+        DONKEY = EntityType.<Donkey>register("donkey", Builder.<Donkey>of(Donkey::new, MobCategory.CREATURE).sized(1.3964844f, 1.5f).clientTrackingRange(10));
+        DRAGON_FIREBALL = EntityType.<DragonFireball>register("dragon_fireball", Builder.<DragonFireball>of(DragonFireball::new, MobCategory.MISC).sized(1.0f, 1.0f).clientTrackingRange(4).updateInterval(10));
+        DROWNED = EntityType.<Drowned>register("drowned", Builder.<Drowned>of(Drowned::new, MobCategory.MONSTER).sized(0.6f, 1.95f).clientTrackingRange(8));
+        ELDER_GUARDIAN = EntityType.<ElderGuardian>register("elder_guardian", Builder.<ElderGuardian>of(ElderGuardian::new, MobCategory.MONSTER).sized(1.9975f, 1.9975f).clientTrackingRange(10));
+        END_CRYSTAL = EntityType.<EndCrystal>register("end_crystal", Builder.<EndCrystal>of(EndCrystal::new, MobCategory.MISC).sized(2.0f, 2.0f).clientTrackingRange(16).updateInterval(Integer.MAX_VALUE));
+        ENDER_DRAGON = EntityType.<EnderDragon>register("ender_dragon", Builder.<EnderDragon>of(EnderDragon::new, MobCategory.MONSTER).fireImmune().sized(16.0f, 8.0f).clientTrackingRange(10));
+        ENDERMAN = EntityType.<EnderMan>register("enderman", Builder.<EnderMan>of(EnderMan::new, MobCategory.MONSTER).sized(0.6f, 2.9f).clientTrackingRange(8));
+        ENDERMITE = EntityType.<Endermite>register("endermite", Builder.<Endermite>of(Endermite::new, MobCategory.MONSTER).sized(0.4f, 0.3f).clientTrackingRange(8));
+        EVOKER = EntityType.<Evoker>register("evoker", Builder.<Evoker>of(Evoker::new, MobCategory.MONSTER).sized(0.6f, 1.95f).clientTrackingRange(8));
+        EVOKER_FANGS = EntityType.<EvokerFangs>register("evoker_fangs", Builder.<EvokerFangs>of(EvokerFangs::new, MobCategory.MISC).sized(0.5f, 0.8f).clientTrackingRange(6).updateInterval(2));
+        EXPERIENCE_ORB = EntityType.<ExperienceOrb>register("experience_orb", Builder.<ExperienceOrb>of(ExperienceOrb::new, MobCategory.MISC).sized(0.5f, 0.5f).clientTrackingRange(6).updateInterval(20));
+        EYE_OF_ENDER = EntityType.<EyeOfEnder>register("eye_of_ender", Builder.<EyeOfEnder>of(EyeOfEnder::new, MobCategory.MISC).sized(0.25f, 0.25f).clientTrackingRange(4).updateInterval(4));
+        FALLING_BLOCK = EntityType.<FallingBlockEntity>register("falling_block", Builder.<FallingBlockEntity>of(FallingBlockEntity::new, MobCategory.MISC).sized(0.98f, 0.98f).clientTrackingRange(10).updateInterval(20));
+        FIREWORK_ROCKET = EntityType.<FireworkRocketEntity>register("firework_rocket", Builder.<FireworkRocketEntity>of(FireworkRocketEntity::new, MobCategory.MISC).sized(0.25f, 0.25f).clientTrackingRange(4).updateInterval(10));
+        FOX = EntityType.<Fox>register("fox", Builder.<Fox>of(Fox::new, MobCategory.CREATURE).sized(0.6f, 0.7f).clientTrackingRange(8).immuneTo(Blocks.SWEET_BERRY_BUSH));
+        GHAST = EntityType.<Ghast>register("ghast", Builder.<Ghast>of(Ghast::new, MobCategory.MONSTER).fireImmune().sized(4.0f, 4.0f).clientTrackingRange(10));
+        GIANT = EntityType.<Giant>register("giant", Builder.<Giant>of(Giant::new, MobCategory.MONSTER).sized(3.6f, 12.0f).clientTrackingRange(10));
+        GUARDIAN = EntityType.<Guardian>register("guardian", Builder.<Guardian>of(Guardian::new, MobCategory.MONSTER).sized(0.85f, 0.85f).clientTrackingRange(8));
+        HOGLIN = EntityType.<Hoglin>register("hoglin", Builder.<Hoglin>of(Hoglin::new, MobCategory.MONSTER).sized(1.3964844f, 1.4f).clientTrackingRange(8));
+        HORSE = EntityType.<Horse>register("horse", Builder.<Horse>of(Horse::new, MobCategory.CREATURE).sized(1.3964844f, 1.6f).clientTrackingRange(10));
+        HUSK = EntityType.<Husk>register("husk", Builder.<Husk>of(Husk::new, MobCategory.MONSTER).sized(0.6f, 1.95f).clientTrackingRange(8));
+        ILLUSIONER = EntityType.<Illusioner>register("illusioner", Builder.<Illusioner>of(Illusioner::new, MobCategory.MONSTER).sized(0.6f, 1.95f).clientTrackingRange(8));
+        IRON_GOLEM = EntityType.<IronGolem>register("iron_golem", Builder.<IronGolem>of(IronGolem::new, MobCategory.MISC).sized(1.4f, 2.7f).clientTrackingRange(10));
+        ITEM = EntityType.<ItemEntity>register("item", Builder.<ItemEntity>of(ItemEntity::new, MobCategory.MISC).sized(0.25f, 0.25f).clientTrackingRange(6).updateInterval(20));
+        ITEM_FRAME = EntityType.<ItemFrame>register("item_frame", Builder.<ItemFrame>of(ItemFrame::new, MobCategory.MISC).sized(0.5f, 0.5f).clientTrackingRange(10).updateInterval(Integer.MAX_VALUE));
+        FIREBALL = EntityType.<LargeFireball>register("fireball", Builder.<LargeFireball>of(LargeFireball::new, MobCategory.MISC).sized(1.0f, 1.0f).clientTrackingRange(4).updateInterval(10));
+        LEASH_KNOT = EntityType.<LeashFenceKnotEntity>register("leash_knot", Builder.<LeashFenceKnotEntity>of(LeashFenceKnotEntity::new, MobCategory.MISC).noSave().sized(0.5f, 0.5f).clientTrackingRange(10).updateInterval(Integer.MAX_VALUE));
+        LIGHTNING_BOLT = EntityType.<LightningBolt>register("lightning_bolt", Builder.<LightningBolt>of(LightningBolt::new, MobCategory.MISC).noSave().sized(0.0f, 0.0f).clientTrackingRange(16).updateInterval(Integer.MAX_VALUE));
+        LLAMA = EntityType.<Llama>register("llama", Builder.<Llama>of(Llama::new, MobCategory.CREATURE).sized(0.9f, 1.87f).clientTrackingRange(10));
+        LLAMA_SPIT = EntityType.<LlamaSpit>register("llama_spit", Builder.<LlamaSpit>of(LlamaSpit::new, MobCategory.MISC).sized(0.25f, 0.25f).clientTrackingRange(4).updateInterval(10));
+        MAGMA_CUBE = EntityType.<MagmaCube>register("magma_cube", Builder.<MagmaCube>of(MagmaCube::new, MobCategory.MONSTER).fireImmune().sized(2.04f, 2.04f).clientTrackingRange(8));
+        MINECART = EntityType.<Minecart>register("minecart", Builder.<Minecart>of(Minecart::new, MobCategory.MISC).sized(0.98f, 0.7f).clientTrackingRange(8));
+        CHEST_MINECART = EntityType.<MinecartChest>register("chest_minecart", Builder.<MinecartChest>of(MinecartChest::new, MobCategory.MISC).sized(0.98f, 0.7f).clientTrackingRange(8));
+        COMMAND_BLOCK_MINECART = EntityType.<MinecartCommandBlock>register("command_block_minecart", Builder.<MinecartCommandBlock>of(MinecartCommandBlock::new, MobCategory.MISC).sized(0.98f, 0.7f).clientTrackingRange(8));
+        FURNACE_MINECART = EntityType.<MinecartFurnace>register("furnace_minecart", Builder.<MinecartFurnace>of(MinecartFurnace::new, MobCategory.MISC).sized(0.98f, 0.7f).clientTrackingRange(8));
+        HOPPER_MINECART = EntityType.<MinecartHopper>register("hopper_minecart", Builder.<MinecartHopper>of(MinecartHopper::new, MobCategory.MISC).sized(0.98f, 0.7f).clientTrackingRange(8));
+        SPAWNER_MINECART = EntityType.<MinecartSpawner>register("spawner_minecart", Builder.<MinecartSpawner>of(MinecartSpawner::new, MobCategory.MISC).sized(0.98f, 0.7f).clientTrackingRange(8));
+        TNT_MINECART = EntityType.<MinecartTNT>register("tnt_minecart", Builder.<MinecartTNT>of(MinecartTNT::new, MobCategory.MISC).sized(0.98f, 0.7f).clientTrackingRange(8));
+        MULE = EntityType.<Mule>register("mule", Builder.<Mule>of(Mule::new, MobCategory.CREATURE).sized(1.3964844f, 1.6f).clientTrackingRange(8));
+        MOOSHROOM = EntityType.<MushroomCow>register("mooshroom", Builder.<MushroomCow>of(MushroomCow::new, MobCategory.CREATURE).sized(0.9f, 1.4f).clientTrackingRange(10));
+        OCELOT = EntityType.<Ocelot>register("ocelot", Builder.<Ocelot>of(Ocelot::new, MobCategory.CREATURE).sized(0.6f, 0.7f).clientTrackingRange(10));
+        PAINTING = EntityType.<Painting>register("painting", Builder.<Painting>of(Painting::new, MobCategory.MISC).sized(0.5f, 0.5f).clientTrackingRange(10).updateInterval(Integer.MAX_VALUE));
+        PANDA = EntityType.<Panda>register("panda", Builder.<Panda>of(Panda::new, MobCategory.CREATURE).sized(1.3f, 1.25f).clientTrackingRange(10));
+        PARROT = EntityType.<Parrot>register("parrot", Builder.<Parrot>of(Parrot::new, MobCategory.CREATURE).sized(0.5f, 0.9f).clientTrackingRange(8));
+        PHANTOM = EntityType.<Phantom>register("phantom", Builder.<Phantom>of(Phantom::new, MobCategory.MONSTER).sized(0.9f, 0.5f).clientTrackingRange(8));
+        PIG = EntityType.<Pig>register("pig", Builder.<Pig>of(Pig::new, MobCategory.CREATURE).sized(0.9f, 0.9f).clientTrackingRange(10));
+        PIGLIN = EntityType.<Piglin>register("piglin", Builder.<Piglin>of(Piglin::new, MobCategory.MONSTER).sized(0.6f, 1.95f).clientTrackingRange(8));
+        PILLAGER = EntityType.<Pillager>register("pillager", Builder.<Pillager>of(Pillager::new, MobCategory.MONSTER).canSpawnFarFromPlayer().sized(0.6f, 1.95f).clientTrackingRange(8));
+        POLAR_BEAR = EntityType.<PolarBear>register("polar_bear", Builder.<PolarBear>of(PolarBear::new, MobCategory.CREATURE).sized(1.4f, 1.4f).clientTrackingRange(10));
+        TNT = EntityType.<PrimedTnt>register("tnt", Builder.<PrimedTnt>of(PrimedTnt::new, MobCategory.MISC).fireImmune().sized(0.98f, 0.98f).clientTrackingRange(10).updateInterval(10));
+        PUFFERFISH = EntityType.<Pufferfish>register("pufferfish", Builder.<Pufferfish>of(Pufferfish::new, MobCategory.WATER_AMBIENT).sized(0.7f, 0.7f).clientTrackingRange(4));
+        RABBIT = EntityType.<Rabbit>register("rabbit", Builder.<Rabbit>of(Rabbit::new, MobCategory.CREATURE).sized(0.4f, 0.5f).clientTrackingRange(8));
+        RAVAGER = EntityType.<Ravager>register("ravager", Builder.<Ravager>of(Ravager::new, MobCategory.MONSTER).sized(1.95f, 2.2f).clientTrackingRange(10));
+        SALMON = EntityType.<Salmon>register("salmon", Builder.<Salmon>of(Salmon::new, MobCategory.WATER_AMBIENT).sized(0.7f, 0.4f).clientTrackingRange(4));
+        SHEEP = EntityType.<Sheep>register("sheep", Builder.<Sheep>of(Sheep::new, MobCategory.CREATURE).sized(0.9f, 1.3f).clientTrackingRange(10));
+        SHULKER = EntityType.<Shulker>register("shulker", Builder.<Shulker>of(Shulker::new, MobCategory.MONSTER).fireImmune().canSpawnFarFromPlayer().sized(1.0f, 1.0f).clientTrackingRange(10));
+        SHULKER_BULLET = EntityType.<ShulkerBullet>register("shulker_bullet", Builder.<ShulkerBullet>of(ShulkerBullet::new, MobCategory.MISC).sized(0.3125f, 0.3125f).clientTrackingRange(8));
+        SILVERFISH = EntityType.<Silverfish>register("silverfish", Builder.<Silverfish>of(Silverfish::new, MobCategory.MONSTER).sized(0.4f, 0.3f).clientTrackingRange(8));
+        SKELETON = EntityType.<Skeleton>register("skeleton", Builder.<Skeleton>of(Skeleton::new, MobCategory.MONSTER).sized(0.6f, 1.99f).clientTrackingRange(8));
+        SKELETON_HORSE = EntityType.<SkeletonHorse>register("skeleton_horse", Builder.<SkeletonHorse>of(SkeletonHorse::new, MobCategory.CREATURE).sized(1.3964844f, 1.6f).clientTrackingRange(10));
+        SLIME = EntityType.<Slime>register("slime", Builder.<Slime>of(Slime::new, MobCategory.MONSTER).sized(2.04f, 2.04f).clientTrackingRange(10));
+        SMALL_FIREBALL = EntityType.<SmallFireball>register("small_fireball", Builder.<SmallFireball>of(SmallFireball::new, MobCategory.MISC).sized(0.3125f, 0.3125f).clientTrackingRange(4).updateInterval(10));
+        SNOW_GOLEM = EntityType.<SnowGolem>register("snow_golem", Builder.<SnowGolem>of(SnowGolem::new, MobCategory.MISC).sized(0.7f, 1.9f).clientTrackingRange(8));
+        SNOWBALL = EntityType.<Snowball>register("snowball", Builder.<Snowball>of(Snowball::new, MobCategory.MISC).sized(0.25f, 0.25f).clientTrackingRange(4).updateInterval(10));
+        SPECTRAL_ARROW = EntityType.<SpectralArrow>register("spectral_arrow", Builder.<SpectralArrow>of(SpectralArrow::new, MobCategory.MISC).sized(0.5f, 0.5f).clientTrackingRange(4).updateInterval(20));
+        SPIDER = EntityType.<Spider>register("spider", Builder.<Spider>of(Spider::new, MobCategory.MONSTER).sized(1.4f, 0.9f).clientTrackingRange(8));
+        SQUID = EntityType.<Squid>register("squid", Builder.<Squid>of(Squid::new, MobCategory.WATER_CREATURE).sized(0.8f, 0.8f).clientTrackingRange(8));
+        STRAY = EntityType.<Stray>register("stray", Builder.<Stray>of(Stray::new, MobCategory.MONSTER).sized(0.6f, 1.99f).clientTrackingRange(8));
+        STRIDER = EntityType.<Strider>register("strider", Builder.<Strider>of(Strider::new, MobCategory.CREATURE).fireImmune().sized(0.9f, 1.7f).clientTrackingRange(10));
+        EGG = EntityType.<ThrownEgg>register("egg", Builder.<ThrownEgg>of(ThrownEgg::new, MobCategory.MISC).sized(0.25f, 0.25f).clientTrackingRange(4).updateInterval(10));
+        ENDER_PEARL = EntityType.<ThrownEnderpearl>register("ender_pearl", Builder.<ThrownEnderpearl>of(ThrownEnderpearl::new, MobCategory.MISC).sized(0.25f, 0.25f).clientTrackingRange(4).updateInterval(10));
+        EXPERIENCE_BOTTLE = EntityType.<ThrownExperienceBottle>register("experience_bottle", Builder.<ThrownExperienceBottle>of(ThrownExperienceBottle::new, MobCategory.MISC).sized(0.25f, 0.25f).clientTrackingRange(4).updateInterval(10));
+        POTION = EntityType.<ThrownPotion>register("potion", Builder.<ThrownPotion>of(ThrownPotion::new, MobCategory.MISC).sized(0.25f, 0.25f).clientTrackingRange(4).updateInterval(10));
+        TRIDENT = EntityType.<ThrownTrident>register("trident", Builder.<ThrownTrident>of(ThrownTrident::new, MobCategory.MISC).sized(0.5f, 0.5f).clientTrackingRange(4).updateInterval(20));
+        TRADER_LLAMA = EntityType.<TraderLlama>register("trader_llama", Builder.<TraderLlama>of(TraderLlama::new, MobCategory.CREATURE).sized(0.9f, 1.87f).clientTrackingRange(10));
+        TROPICAL_FISH = EntityType.<TropicalFish>register("tropical_fish", Builder.<TropicalFish>of(TropicalFish::new, MobCategory.WATER_AMBIENT).sized(0.5f, 0.4f).clientTrackingRange(4));
+        TURTLE = EntityType.<Turtle>register("turtle", Builder.<Turtle>of(Turtle::new, MobCategory.CREATURE).sized(1.2f, 0.4f).clientTrackingRange(10));
+        VEX = EntityType.<Vex>register("vex", Builder.<Vex>of(Vex::new, MobCategory.MONSTER).fireImmune().sized(0.4f, 0.8f).clientTrackingRange(8));
+        VILLAGER = EntityType.<Villager>register("villager", Builder.<Villager>of(Villager::new, MobCategory.MISC).sized(0.6f, 1.95f).clientTrackingRange(10));
+        VINDICATOR = EntityType.<Vindicator>register("vindicator", Builder.<Vindicator>of(Vindicator::new, MobCategory.MONSTER).sized(0.6f, 1.95f).clientTrackingRange(8));
+        WANDERING_TRADER = EntityType.<WanderingTrader>register("wandering_trader", Builder.<WanderingTrader>of(WanderingTrader::new, MobCategory.CREATURE).sized(0.6f, 1.95f).clientTrackingRange(10));
+        WITCH = EntityType.<Witch>register("witch", Builder.<Witch>of(Witch::new, MobCategory.MONSTER).sized(0.6f, 1.95f).clientTrackingRange(8));
+        WITHER = EntityType.<WitherBoss>register("wither", Builder.<WitherBoss>of(WitherBoss::new, MobCategory.MONSTER).fireImmune().immuneTo(Blocks.WITHER_ROSE).sized(0.9f, 3.5f).clientTrackingRange(10));
+        WITHER_SKELETON = EntityType.<WitherSkeleton>register("wither_skeleton", Builder.<WitherSkeleton>of(WitherSkeleton::new, MobCategory.MONSTER).fireImmune().immuneTo(Blocks.WITHER_ROSE).sized(0.7f, 2.4f).clientTrackingRange(8));
+        WITHER_SKULL = EntityType.<WitherSkull>register("wither_skull", Builder.<WitherSkull>of(WitherSkull::new, MobCategory.MISC).sized(0.3125f, 0.3125f).clientTrackingRange(4).updateInterval(10));
+        WOLF = EntityType.<Wolf>register("wolf", Builder.<Wolf>of(Wolf::new, MobCategory.CREATURE).sized(0.6f, 0.85f).clientTrackingRange(10));
+        ZOGLIN = EntityType.<Zoglin>register("zoglin", Builder.<Zoglin>of(Zoglin::new, MobCategory.MONSTER).fireImmune().sized(1.3964844f, 1.4f).clientTrackingRange(8));
+        ZOMBIE = EntityType.<Zombie>register("zombie", Builder.<Zombie>of(Zombie::new, MobCategory.MONSTER).sized(0.6f, 1.95f).clientTrackingRange(8));
+        ZOMBIE_HORSE = EntityType.<ZombieHorse>register("zombie_horse", Builder.<ZombieHorse>of(ZombieHorse::new, MobCategory.CREATURE).sized(1.3964844f, 1.6f).clientTrackingRange(10));
+        ZOMBIE_VILLAGER = EntityType.<ZombieVillager>register("zombie_villager", Builder.<ZombieVillager>of(ZombieVillager::new, MobCategory.MONSTER).sized(0.6f, 1.95f).clientTrackingRange(8));
+        ZOMBIFIED_PIGLIN = EntityType.<ZombifiedPiglin>register("zombified_piglin", Builder.<ZombifiedPiglin>of(ZombifiedPiglin::new, MobCategory.MONSTER).fireImmune().sized(0.6f, 1.95f).clientTrackingRange(8));
+        PLAYER = EntityType.<Player>register("player", (Builder<Player>)Builder.<T>createNothing(MobCategory.MISC).noSave().noSummon().sized(0.6f, 1.8f).clientTrackingRange(32).updateInterval(2));
+        FISHING_BOBBER = EntityType.<FishingHook>register("fishing_bobber", (Builder<FishingHook>)Builder.<T>createNothing(MobCategory.MISC).noSave().noSummon().sized(0.25f, 0.25f).clientTrackingRange(4).updateInterval(5));
     }
     
     public static class Builder<T extends Entity> {
         private final EntityFactory<T> factory;
         private final MobCategory category;
+        private ImmutableSet<Block> immuneTo;
         private boolean serialize;
         private boolean summon;
         private boolean fireImmune;
         private boolean canSpawnFarFromPlayer;
+        private int clientTrackingRange;
+        private int updateInterval;
         private EntityDimensions dimensions;
         
-        private Builder(final EntityFactory<T> b, final MobCategory alb) {
+        private Builder(final EntityFactory<T> b, final MobCategory apa) {
+            this.immuneTo = ImmutableSet.<Block>of();
             this.serialize = true;
             this.summon = true;
+            this.clientTrackingRange = 5;
+            this.updateInterval = 3;
             this.dimensions = EntityDimensions.scalable(0.6f, 1.8f);
             this.factory = b;
-            this.category = alb;
-            this.canSpawnFarFromPlayer = (alb == MobCategory.CREATURE || alb == MobCategory.MISC);
+            this.category = apa;
+            this.canSpawnFarFromPlayer = (apa == MobCategory.CREATURE || apa == MobCategory.MISC);
         }
         
-        public static <T extends Entity> Builder<T> of(final EntityFactory<T> b, final MobCategory alb) {
-            return new Builder<T>(b, alb);
+        public static <T extends Entity> Builder<T> of(final EntityFactory<T> b, final MobCategory apa) {
+            return new Builder<T>(b, apa);
         }
         
-        public static <T extends Entity> Builder<T> createNothing(final MobCategory alb) {
-            return new Builder<T>((aku, bjw) -> null, alb);
+        public static <T extends Entity> Builder<T> createNothing(final MobCategory apa) {
+            return new Builder<T>((aoq, bqb) -> null, apa);
         }
         
         public Builder<T> sized(final float float1, final float float2) {
@@ -651,28 +655,35 @@ public class EntityType<T extends Entity> {
             return this;
         }
         
+        public Builder<T> immuneTo(final Block... arr) {
+            this.immuneTo = ImmutableSet.<Block>copyOf(arr);
+            return this;
+        }
+        
         public Builder<T> canSpawnFarFromPlayer() {
             this.canSpawnFarFromPlayer = true;
             return this;
         }
         
+        public Builder<T> clientTrackingRange(final int integer) {
+            this.clientTrackingRange = integer;
+            return this;
+        }
+        
+        public Builder<T> updateInterval(final int integer) {
+            this.updateInterval = integer;
+            return this;
+        }
+        
         public EntityType<T> build(final String string) {
             if (this.serialize) {
-                try {
-                    DataFixers.getDataFixer().getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getWorldVersion())).getChoiceType(References.ENTITY_TREE, string);
-                }
-                catch (IllegalStateException illegalStateException3) {
-                    if (SharedConstants.IS_RUNNING_IN_IDE) {
-                        throw illegalStateException3;
-                    }
-                    EntityType.LOGGER.warn("No data fixer registered for entity {}", string);
-                }
+                Util.fetchChoiceType(References.ENTITY_TREE, string);
             }
-            return new EntityType<T>(this.factory, this.category, this.serialize, this.summon, this.fireImmune, this.canSpawnFarFromPlayer, this.dimensions);
+            return new EntityType<T>(this.factory, this.category, this.serialize, this.summon, this.fireImmune, this.canSpawnFarFromPlayer, this.immuneTo, this.dimensions, this.clientTrackingRange, this.updateInterval);
         }
     }
     
     public interface EntityFactory<T extends Entity> {
-        T create(final EntityType<T> aku, final Level bjw);
+        T create(final EntityType<T> aoq, final Level bqb);
     }
 }
diff --git a/src/net/minecraft/world/entity/EquipmentSlot.java b/src/net/minecraft/world/entity/EquipmentSlot.java
index 5a95832..3ba22b3 100644
--- a/src/net/minecraft/world/entity/EquipmentSlot.java
+++ b/src/net/minecraft/world/entity/EquipmentSlot.java
@@ -37,18 +37,18 @@ public enum EquipmentSlot {
     }
     
     public static EquipmentSlot byName(final String string) {
-        for (final EquipmentSlot akv5 : values()) {
-            if (akv5.getName().equals(string)) {
-                return akv5;
+        for (final EquipmentSlot aor5 : values()) {
+            if (aor5.getName().equals(string)) {
+                return aor5;
             }
         }
         throw new IllegalArgumentException("Invalid slot '" + string + "'");
     }
     
     public static EquipmentSlot byTypeAndIndex(final Type a, final int integer) {
-        for (final EquipmentSlot akv6 : values()) {
-            if (akv6.getType() == a && akv6.getIndex() == integer) {
-                return akv6;
+        for (final EquipmentSlot aor6 : values()) {
+            if (aor6.getType() == a && aor6.getIndex() == integer) {
+                return aor6;
             }
         }
         throw new IllegalArgumentException("Invalid slot '" + a + "': " + integer);
diff --git a/src/net/minecraft/world/entity/ExperienceOrb.java b/src/net/minecraft/world/entity/ExperienceOrb.java
index f6d3032..d6fa862 100644
--- a/src/net/minecraft/world/entity/ExperienceOrb.java
+++ b/src/net/minecraft/world/entity/ExperienceOrb.java
@@ -3,14 +3,16 @@ package net.minecraft.world.entity;
 import net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket;
 import net.minecraft.network.protocol.Packet;
 import java.util.Map;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Player;
@@ -24,16 +26,16 @@ public class ExperienceOrb extends Entity {
     private Player followingPlayer;
     private int followingTime;
     
-    public ExperienceOrb(final Level bjw, final double double2, final double double3, final double double4, final int integer) {
-        this(EntityType.EXPERIENCE_ORB, bjw);
+    public ExperienceOrb(final Level bqb, final double double2, final double double3, final double double4, final int integer) {
+        this(EntityType.EXPERIENCE_ORB, bqb);
         this.setPos(double2, double3, double4);
         this.yRot = (float)(this.random.nextDouble() * 360.0);
         this.setDeltaMovement((this.random.nextDouble() * 0.20000000298023224 - 0.10000000149011612) * 2.0, this.random.nextDouble() * 0.2 * 2.0, (this.random.nextDouble() * 0.20000000298023224 - 0.10000000149011612) * 2.0);
         this.value = integer;
     }
     
-    public ExperienceOrb(final EntityType<? extends ExperienceOrb> aku, final Level bjw) {
-        super(aku, bjw);
+    public ExperienceOrb(final EntityType<? extends ExperienceOrb> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.health = 5;
     }
     
@@ -55,13 +57,13 @@ public class ExperienceOrb extends Entity {
         this.xo = this.getX();
         this.yo = this.getY();
         this.zo = this.getZ();
-        if (this.isUnderLiquid(FluidTags.WATER)) {
+        if (this.isEyeInFluid(FluidTags.WATER)) {
             this.setUnderwaterMovement();
         }
         else if (!this.isNoGravity()) {
             this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.03, 0.0));
         }
-        if (this.level.getFluidState(new BlockPos(this)).is(FluidTags.LAVA)) {
+        if (this.level.getFluidState(this.blockPosition()).is(FluidTags.LAVA)) {
             this.setDeltaMovement((this.random.nextFloat() - this.random.nextFloat()) * 0.2f, 0.20000000298023224, (this.random.nextFloat() - this.random.nextFloat()) * 0.2f);
             this.playSound(SoundEvents.GENERIC_BURN, 0.4f, 2.0f + this.random.nextFloat() * 0.4f);
         }
@@ -79,11 +81,11 @@ public class ExperienceOrb extends Entity {
             this.followingPlayer = null;
         }
         if (this.followingPlayer != null) {
-            final Vec3 cvl4 = new Vec3(this.followingPlayer.getX() - this.getX(), this.followingPlayer.getY() + this.followingPlayer.getEyeHeight() / 2.0 - this.getY(), this.followingPlayer.getZ() - this.getZ());
-            final double double3 = cvl4.lengthSqr();
+            final Vec3 dem4 = new Vec3(this.followingPlayer.getX() - this.getX(), this.followingPlayer.getY() + this.followingPlayer.getEyeHeight() / 2.0 - this.getY(), this.followingPlayer.getZ() - this.getZ());
+            final double double3 = dem4.lengthSqr();
             if (double3 < 64.0) {
                 final double double4 = 1.0 - Math.sqrt(double3) / 8.0;
-                this.setDeltaMovement(this.getDeltaMovement().add(cvl4.normalize().scale(double4 * double4 * 0.1)));
+                this.setDeltaMovement(this.getDeltaMovement().add(dem4.normalize().scale(double4 * double4 * 0.1)));
             }
         }
         this.move(MoverType.SELF, this.getDeltaMovement());
@@ -103,8 +105,8 @@ public class ExperienceOrb extends Entity {
     }
     
     private void setUnderwaterMovement() {
-        final Vec3 cvl2 = this.getDeltaMovement();
-        this.setDeltaMovement(cvl2.x * 0.9900000095367432, Math.min(cvl2.y + 5.000000237487257E-4, 0.05999999865889549), cvl2.z * 0.9900000095367432);
+        final Vec3 dem2 = this.getDeltaMovement();
+        this.setDeltaMovement(dem2.x * 0.9900000095367432, Math.min(dem2.y + 5.000000237487257E-4, 0.05999999865889549), dem2.z * 0.9900000095367432);
     }
     
     @Override
@@ -112,13 +114,8 @@ public class ExperienceOrb extends Entity {
     }
     
     @Override
-    protected void burn(final int integer) {
-        this.hurt(DamageSource.IN_FIRE, (float)integer);
-    }
-    
-    @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
         this.markHurt();
@@ -129,37 +126,37 @@ public class ExperienceOrb extends Entity {
         return false;
     }
     
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putShort("Health", (short)this.health);
-        jt.putShort("Age", (short)this.age);
-        jt.putShort("Value", (short)this.value);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        le.putShort("Health", (short)this.health);
+        le.putShort("Age", (short)this.age);
+        le.putShort("Value", (short)this.value);
     }
     
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        this.health = jt.getShort("Health");
-        this.age = jt.getShort("Age");
-        this.value = jt.getShort("Value");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        this.health = le.getShort("Health");
+        this.age = le.getShort("Age");
+        this.value = le.getShort("Value");
     }
     
     @Override
-    public void playerTouch(final Player ayj) {
+    public void playerTouch(final Player bec) {
         if (this.level.isClientSide) {
             return;
         }
-        if (this.throwTime == 0 && ayj.takeXpDelay == 0) {
-            ayj.takeXpDelay = 2;
-            ayj.take(this, 1);
-            final Map.Entry<EquipmentSlot, ItemStack> entry3 = EnchantmentHelper.getRandomItemWith(Enchantments.MENDING, ayj);
+        if (this.throwTime == 0 && bec.takeXpDelay == 0) {
+            bec.takeXpDelay = 2;
+            bec.take(this, 1);
+            final Map.Entry<EquipmentSlot, ItemStack> entry3 = EnchantmentHelper.getRandomItemWith(Enchantments.MENDING, bec, ItemStack::isDamaged);
             if (entry3 != null) {
-                final ItemStack ben4 = entry3.getValue();
-                if (!ben4.isEmpty() && ben4.isDamaged()) {
-                    final int integer5 = Math.min(this.xpToDurability(this.value), ben4.getDamageValue());
+                final ItemStack bki4 = entry3.getValue();
+                if (!bki4.isEmpty() && bki4.isDamaged()) {
+                    final int integer5 = Math.min(this.xpToDurability(this.value), bki4.getDamageValue());
                     this.value -= this.durabilityToXp(integer5);
-                    ben4.setDamageValue(ben4.getDamageValue() - integer5);
+                    bki4.setDamageValue(bki4.getDamageValue() - integer5);
                 }
             }
             if (this.value > 0) {
-                ayj.giveExperiencePoints(this.value);
+                bec.giveExperiencePoints(this.value);
             }
             this.remove();
         }
diff --git a/src/net/minecraft/world/entity/FlyingMob.java b/src/net/minecraft/world/entity/FlyingMob.java
index 60d7be2..6a0e64c 100644
--- a/src/net/minecraft/world/entity/FlyingMob.java
+++ b/src/net/minecraft/world/entity/FlyingMob.java
@@ -1,14 +1,13 @@
 package net.minecraft.world.entity;
 
-import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.Level;
 
 public abstract class FlyingMob extends Mob {
-    protected FlyingMob(final EntityType<? extends FlyingMob> aku, final Level bjw) {
-        super(aku, bjw);
+    protected FlyingMob(final EntityType<? extends FlyingMob> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -17,18 +16,18 @@ public abstract class FlyingMob extends Mob {
     }
     
     @Override
-    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState byj, final BlockPos fk) {
+    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState cfj, final BlockPos fu) {
     }
     
     @Override
-    public void travel(final Vec3 cvl) {
+    public void travel(final Vec3 dem) {
         if (this.isInWater()) {
-            this.moveRelative(0.02f, cvl);
+            this.moveRelative(0.02f, dem);
             this.move(MoverType.SELF, this.getDeltaMovement());
             this.setDeltaMovement(this.getDeltaMovement().scale(0.800000011920929));
         }
         else if (this.isInLava()) {
-            this.moveRelative(0.02f, cvl);
+            this.moveRelative(0.02f, dem);
             this.move(MoverType.SELF, this.getDeltaMovement());
             this.setDeltaMovement(this.getDeltaMovement().scale(0.5));
         }
@@ -42,23 +41,15 @@ public abstract class FlyingMob extends Mob {
             if (this.onGround) {
                 float3 = this.level.getBlockState(new BlockPos(this.getX(), this.getY() - 1.0, this.getZ())).getBlock().getFriction() * 0.91f;
             }
-            this.moveRelative(this.onGround ? (0.1f * float4) : 0.02f, cvl);
+            this.moveRelative(this.onGround ? (0.1f * float4) : 0.02f, dem);
             this.move(MoverType.SELF, this.getDeltaMovement());
             this.setDeltaMovement(this.getDeltaMovement().scale(float3));
         }
-        this.animationSpeedOld = this.animationSpeed;
-        final double double3 = this.getX() - this.xo;
-        final double double4 = this.getZ() - this.zo;
-        float float5 = Mth.sqrt(double3 * double3 + double4 * double4) * 4.0f;
-        if (float5 > 1.0f) {
-            float5 = 1.0f;
-        }
-        this.animationSpeed += (float5 - this.animationSpeed) * 0.4f;
-        this.animationPosition += this.animationSpeed;
+        this.calculateEntityAnimation(this, false);
     }
     
     @Override
-    public boolean onLadder() {
+    public boolean onClimbable() {
         return false;
     }
 }
diff --git a/src/net/minecraft/world/entity/HumanoidArm.java b/src/net/minecraft/world/entity/HumanoidArm.java
index a0b81cc..27608f9 100644
--- a/src/net/minecraft/world/entity/HumanoidArm.java
+++ b/src/net/minecraft/world/entity/HumanoidArm.java
@@ -4,13 +4,13 @@ import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 
 public enum HumanoidArm {
-    LEFT((Component)new TranslatableComponent("options.mainHand.left", new Object[0])), 
-    RIGHT((Component)new TranslatableComponent("options.mainHand.right", new Object[0]));
+    LEFT((Component)new TranslatableComponent("options.mainHand.left")), 
+    RIGHT((Component)new TranslatableComponent("options.mainHand.right"));
     
     private final Component name;
     
-    private HumanoidArm(final Component lf) {
-        this.name = lf;
+    private HumanoidArm(final Component mr) {
+        this.name = mr;
     }
     
     public HumanoidArm getOpposite() {
@@ -24,4 +24,8 @@ public enum HumanoidArm {
     public String toString() {
         return this.name.getString();
     }
+    
+    public Component getName() {
+        return this.name;
+    }
 }
diff --git a/src/net/minecraft/world/entity/ItemBasedSteering.java b/src/net/minecraft/world/entity/ItemBasedSteering.java
new file mode 100644
index 0000000..776fd7b
--- /dev/null
+++ b/src/net/minecraft/world/entity/ItemBasedSteering.java
@@ -0,0 +1,54 @@
+package net.minecraft.world.entity;
+
+import net.minecraft.nbt.CompoundTag;
+import java.util.Random;
+import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.network.syncher.SynchedEntityData;
+
+public class ItemBasedSteering {
+    private final SynchedEntityData entityData;
+    private final EntityDataAccessor<Integer> boostTimeAccessor;
+    private final EntityDataAccessor<Boolean> hasSaddleAccessor;
+    public boolean boosting;
+    public int boostTime;
+    public int boostTimeTotal;
+    
+    public ItemBasedSteering(final SynchedEntityData tt, final EntityDataAccessor<Integer> tq2, final EntityDataAccessor<Boolean> tq3) {
+        this.entityData = tt;
+        this.boostTimeAccessor = tq2;
+        this.hasSaddleAccessor = tq3;
+    }
+    
+    public void onSynced() {
+        this.boosting = true;
+        this.boostTime = 0;
+        this.boostTimeTotal = this.entityData.<Integer>get(this.boostTimeAccessor);
+    }
+    
+    public boolean boost(final Random random) {
+        if (this.boosting) {
+            return false;
+        }
+        this.boosting = true;
+        this.boostTime = 0;
+        this.boostTimeTotal = random.nextInt(841) + 140;
+        this.entityData.<Integer>set(this.boostTimeAccessor, this.boostTimeTotal);
+        return true;
+    }
+    
+    public void addAdditionalSaveData(final CompoundTag le) {
+        le.putBoolean("Saddle", this.hasSaddle());
+    }
+    
+    public void readAdditionalSaveData(final CompoundTag le) {
+        this.setSaddle(le.getBoolean("Saddle"));
+    }
+    
+    public void setSaddle(final boolean boolean1) {
+        this.entityData.<Boolean>set(this.hasSaddleAccessor, boolean1);
+    }
+    
+    public boolean hasSaddle() {
+        return this.entityData.<Boolean>get(this.hasSaddleAccessor);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ItemSteerable.java b/src/net/minecraft/world/entity/ItemSteerable.java
new file mode 100644
index 0000000..312d982
--- /dev/null
+++ b/src/net/minecraft/world/entity/ItemSteerable.java
@@ -0,0 +1,51 @@
+package net.minecraft.world.entity;
+
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.phys.Vec3;
+
+public interface ItemSteerable {
+    boolean boost();
+    
+    void travelWithInput(final Vec3 dem);
+    
+    float getSteeringSpeed();
+    
+    default boolean travel(final Mob aoz, final ItemBasedSteering aov, final Vec3 dem) {
+        if (!aoz.isAlive()) {
+            return false;
+        }
+        final Entity aom5 = aoz.getPassengers().isEmpty() ? null : aoz.getPassengers().get(0);
+        if (!aoz.isVehicle() || !aoz.canBeControlledByRider() || !(aom5 instanceof Player)) {
+            aoz.maxUpStep = 0.5f;
+            aoz.flyingSpeed = 0.02f;
+            this.travelWithInput(dem);
+            return false;
+        }
+        aoz.yRot = aom5.yRot;
+        aoz.yRotO = aoz.yRot;
+        aoz.xRot = aom5.xRot * 0.5f;
+        aoz.setRot(aoz.yRot, aoz.xRot);
+        aoz.yBodyRot = aoz.yRot;
+        aoz.yHeadRot = aoz.yRot;
+        aoz.maxUpStep = 1.0f;
+        aoz.flyingSpeed = aoz.getSpeed() * 0.1f;
+        if (aov.boosting && aov.boostTime++ > aov.boostTimeTotal) {
+            aov.boosting = false;
+        }
+        if (aoz.isControlledByLocalInstance()) {
+            float float6 = this.getSteeringSpeed();
+            if (aov.boosting) {
+                float6 += float6 * 1.15f * Mth.sin(aov.boostTime / (float)aov.boostTimeTotal * 3.1415927f);
+            }
+            aoz.setSpeed(float6);
+            this.travelWithInput(new Vec3(0.0, 0.0, 1.0));
+            aoz.lerpSteps = 0;
+        }
+        else {
+            aoz.calculateEntityAnimation(aoz, false);
+            aoz.setDeltaMovement(Vec3.ZERO);
+        }
+        return true;
+    }
+}
diff --git a/src/net/minecraft/world/entity/global/LightningBolt.java b/src/net/minecraft/world/entity/LightningBolt.java
similarity index 68%
rename from src/net/minecraft/world/entity/global/LightningBolt.java
rename to src/net/minecraft/world/entity/LightningBolt.java
index ed2f853..062b1af 100644
--- a/src/net/minecraft/world/entity/global/LightningBolt.java
+++ b/src/net/minecraft/world/entity/LightningBolt.java
@@ -1,12 +1,13 @@
-package net.minecraft.world.entity.global;
+package net.minecraft.world.entity;
 
-import net.minecraft.network.protocol.game.ClientboundAddGlobalEntityPacket;
+import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.BaseFireBlock;
 import net.minecraft.world.level.GameRules;
 import java.util.Iterator;
 import java.util.List;
@@ -15,34 +16,30 @@ import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.Difficulty;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.level.Level;
 import javax.annotation.Nullable;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
 
 public class LightningBolt extends Entity {
     private int life;
     public long seed;
     private int flashes;
-    private final boolean visualOnly;
+    private boolean visualOnly;
     @Nullable
     private ServerPlayer cause;
     
-    public LightningBolt(final Level bjw, final double double2, final double double3, final double double4, final boolean boolean5) {
-        super(EntityType.LIGHTNING_BOLT, bjw);
+    public LightningBolt(final EntityType<? extends LightningBolt> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.noCulling = true;
-        this.moveTo(double2, double3, double4, 0.0f, 0.0f);
         this.life = 2;
         this.seed = this.random.nextLong();
         this.flashes = this.random.nextInt(3) + 1;
-        this.visualOnly = boolean5;
-        final Difficulty aji10 = bjw.getDifficulty();
-        if (aji10 == Difficulty.NORMAL || aji10 == Difficulty.HARD) {
-            this.spawnFire(4);
-        }
+    }
+    
+    public void setVisualOnly(final boolean boolean1) {
+        this.visualOnly = boolean1;
     }
     
     @Override
@@ -50,14 +47,18 @@ public class LightningBolt extends Entity {
         return SoundSource.WEATHER;
     }
     
-    public void setCause(@Nullable final ServerPlayer xe) {
-        this.cause = xe;
+    public void setCause(@Nullable final ServerPlayer ze) {
+        this.cause = ze;
     }
     
     @Override
     public void tick() {
         super.tick();
         if (this.life == 2) {
+            final Difficulty and2 = this.level.getDifficulty();
+            if (and2 == Difficulty.NORMAL || and2 == Difficulty.HARD) {
+                this.spawnFire(4);
+            }
             this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.LIGHTNING_BOLT_THUNDER, SoundSource.WEATHER, 10000.0f, 0.8f + this.random.nextFloat() * 0.2f);
             this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.LIGHTNING_BOLT_IMPACT, SoundSource.WEATHER, 2.0f, 0.5f + this.random.nextFloat() * 0.2f);
         }
@@ -80,8 +81,8 @@ public class LightningBolt extends Entity {
             else if (!this.visualOnly) {
                 final double double2 = 3.0;
                 final List<Entity> list4 = this.level.getEntities(this, new AABB(this.getX() - 3.0, this.getY() - 3.0, this.getZ() - 3.0, this.getX() + 3.0, this.getY() + 6.0 + 3.0, this.getZ() + 3.0), Entity::isAlive);
-                for (final Entity akq6 : list4) {
-                    akq6.thunderHit(this);
+                for (final Entity aom6 : list4) {
+                    aom6.thunderHit(this);
                 }
                 if (this.cause != null) {
                     CriteriaTriggers.CHANNELED_LIGHTNING.trigger(this.cause, list4);
@@ -94,15 +95,16 @@ public class LightningBolt extends Entity {
         if (this.visualOnly || this.level.isClientSide || !this.level.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
             return;
         }
-        final BlockState byj3 = Blocks.FIRE.defaultBlockState();
-        final BlockPos fk4 = new BlockPos(this);
-        if (this.level.getBlockState(fk4).isAir() && byj3.canSurvive(this.level, fk4)) {
-            this.level.setBlockAndUpdate(fk4, byj3);
+        final BlockPos fu3 = this.blockPosition();
+        BlockState cfj4 = BaseFireBlock.getState(this.level, fu3);
+        if (this.level.getBlockState(fu3).isAir() && cfj4.canSurvive(this.level, fu3)) {
+            this.level.setBlockAndUpdate(fu3, cfj4);
         }
         for (int integer2 = 0; integer2 < integer; ++integer2) {
-            final BlockPos fk5 = fk4.offset(this.random.nextInt(3) - 1, this.random.nextInt(3) - 1, this.random.nextInt(3) - 1);
-            if (this.level.getBlockState(fk5).isAir() && byj3.canSurvive(this.level, fk5)) {
-                this.level.setBlockAndUpdate(fk5, byj3);
+            final BlockPos fu4 = fu3.offset(this.random.nextInt(3) - 1, this.random.nextInt(3) - 1, this.random.nextInt(3) - 1);
+            cfj4 = BaseFireBlock.getState(this.level, fu4);
+            if (this.level.getBlockState(fu4).isAir() && cfj4.canSurvive(this.level, fu4)) {
+                this.level.setBlockAndUpdate(fu4, cfj4);
             }
         }
     }
@@ -118,15 +120,15 @@ public class LightningBolt extends Entity {
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
+    protected void readAdditionalSaveData(final CompoundTag le) {
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
+    protected void addAdditionalSaveData(final CompoundTag le) {
     }
     
     @Override
     public Packet<?> getAddEntityPacket() {
-        return new ClientboundAddGlobalEntityPacket(this);
+        return new ClientboundAddEntityPacket(this);
     }
 }
diff --git a/src/net/minecraft/world/entity/Mob.java b/src/net/minecraft/world/entity/Mob.java
index 6484db1..6edba37 100644
--- a/src/net/minecraft/world/entity/Mob.java
+++ b/src/net/minecraft/world/entity/Mob.java
@@ -11,11 +11,13 @@ import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.core.Vec3i;
+import java.util.Optional;
+import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.AbstractSkullBlock;
-import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.ItemLike;
@@ -28,7 +30,10 @@ import net.minecraft.util.Mth;
 import net.minecraft.network.protocol.game.DebugPackets;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.DiggerItem;
 import net.minecraft.world.item.ArmorItem;
+import net.minecraft.world.item.CrossbowItem;
 import net.minecraft.world.item.BowItem;
 import net.minecraft.world.item.SwordItem;
 import java.util.List;
@@ -48,8 +53,10 @@ import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.item.ProjectileWeaponItem;
 import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import java.util.Arrays;
 import com.google.common.collect.Maps;
 import net.minecraft.world.level.Level;
@@ -100,8 +107,8 @@ public abstract class Mob extends LivingEntity {
     private BlockPos restrictCenter;
     private float restrictRadius;
     
-    protected Mob(final EntityType<? extends Mob> aku, final Level bjw) {
-        super(aku, bjw);
+    protected Mob(final EntityType<? extends Mob> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.handItems = NonNullList.<ItemStack>withSize(2, ItemStack.EMPTY);
         this.handDropChances = new float[2];
         this.armorItems = NonNullList.<ItemStack>withSize(4, ItemStack.EMPTY);
@@ -109,17 +116,17 @@ public abstract class Mob extends LivingEntity {
         this.pathfindingMalus = Maps.newEnumMap(BlockPathTypes.class);
         this.restrictCenter = BlockPos.ZERO;
         this.restrictRadius = -1.0f;
-        this.goalSelector = new GoalSelector((bjw == null || bjw.getProfiler() == null) ? null : bjw.getProfiler());
-        this.targetSelector = new GoalSelector((bjw == null || bjw.getProfiler() == null) ? null : bjw.getProfiler());
+        this.goalSelector = new GoalSelector(bqb.getProfilerSupplier());
+        this.targetSelector = new GoalSelector(bqb.getProfilerSupplier());
         this.lookControl = new LookControl(this);
         this.moveControl = new MoveControl(this);
         this.jumpControl = new JumpControl(this);
         this.bodyRotationControl = this.createBodyControl();
-        this.navigation = this.createNavigation(bjw);
+        this.navigation = this.createNavigation(bqb);
         this.sensing = new Sensing(this);
         Arrays.fill(this.armorDropChances, 0.085f);
         Arrays.fill(this.handDropChances, 0.085f);
-        if (bjw != null && !bjw.isClientSide) {
+        if (bqb != null && !bqb.isClientSide) {
             this.registerGoals();
         }
     }
@@ -127,24 +134,36 @@ public abstract class Mob extends LivingEntity {
     protected void registerGoals() {
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(16.0);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_KNOCKBACK);
+    public static AttributeSupplier.Builder createMobAttributes() {
+        return LivingEntity.createLivingAttributes().add(Attributes.FOLLOW_RANGE, 16.0).add(Attributes.ATTACK_KNOCKBACK);
     }
     
-    protected PathNavigation createNavigation(final Level bjw) {
-        return new GroundPathNavigation(this, bjw);
+    protected PathNavigation createNavigation(final Level bqb) {
+        return new GroundPathNavigation(this, bqb);
     }
     
-    public float getPathfindingMalus(final BlockPathTypes cqm) {
-        final Float float3 = this.pathfindingMalus.get(cqm);
-        return (float3 == null) ? cqm.getMalus() : float3;
+    protected boolean shouldPassengersInheritMalus() {
+        return false;
     }
     
-    public void setPathfindingMalus(final BlockPathTypes cqm, final float float2) {
-        this.pathfindingMalus.put(cqm, float2);
+    public float getPathfindingMalus(final BlockPathTypes czb) {
+        Mob aoz3;
+        if (this.getVehicle() instanceof Mob && ((Mob)this.getVehicle()).shouldPassengersInheritMalus()) {
+            aoz3 = (Mob)this.getVehicle();
+        }
+        else {
+            aoz3 = this;
+        }
+        final Float float4 = aoz3.pathfindingMalus.get(czb);
+        return (float4 == null) ? czb.getMalus() : float4;
+    }
+    
+    public void setPathfindingMalus(final BlockPathTypes czb, final float float2) {
+        this.pathfindingMalus.put(czb, float2);
+    }
+    
+    public boolean canCutCorner(final BlockPathTypes czb) {
+        return czb != BlockPathTypes.DANGER_FIRE && czb != BlockPathTypes.DANGER_CACTUS && czb != BlockPathTypes.DANGER_OTHER;
     }
     
     protected BodyRotationControl createBodyControl() {
@@ -157,8 +176,8 @@ public abstract class Mob extends LivingEntity {
     
     public MoveControl getMoveControl() {
         if (this.isPassenger() && this.getVehicle() instanceof Mob) {
-            final Mob ala2 = (Mob)this.getVehicle();
-            return ala2.getMoveControl();
+            final Mob aoz2 = (Mob)this.getVehicle();
+            return aoz2.getMoveControl();
         }
         return this.moveControl;
     }
@@ -169,8 +188,8 @@ public abstract class Mob extends LivingEntity {
     
     public PathNavigation getNavigation() {
         if (this.isPassenger() && this.getVehicle() instanceof Mob) {
-            final Mob ala2 = (Mob)this.getVehicle();
-            return ala2.getNavigation();
+            final Mob aoz2 = (Mob)this.getVehicle();
+            return aoz2.getNavigation();
         }
         return this.navigation;
     }
@@ -184,13 +203,17 @@ public abstract class Mob extends LivingEntity {
         return this.target;
     }
     
-    public void setTarget(@Nullable final LivingEntity akz) {
-        this.target = akz;
+    public void setTarget(@Nullable final LivingEntity aoy) {
+        this.target = aoy;
     }
     
     @Override
-    public boolean canAttackType(final EntityType<?> aku) {
-        return aku != EntityType.GHAST;
+    public boolean canAttackType(final EntityType<?> aoq) {
+        return aoq != EntityType.GHAST;
+    }
+    
+    public boolean canFireProjectileWeapon(final ProjectileWeaponItem bkv) {
+        return false;
     }
     
     public void ate() {
@@ -207,9 +230,9 @@ public abstract class Mob extends LivingEntity {
     }
     
     public void playAmbientSound() {
-        final SoundEvent aah2 = this.getAmbientSound();
-        if (aah2 != null) {
-            this.playSound(aah2, this.getSoundVolume(), this.getVoicePitch());
+        final SoundEvent ack2 = this.getAmbientSound();
+        if (ack2 != null) {
+            this.playSound(ack2, this.getSoundVolume(), this.getVoicePitch());
         }
     }
     
@@ -225,9 +248,9 @@ public abstract class Mob extends LivingEntity {
     }
     
     @Override
-    protected void playHurtSound(final DamageSource ajz) {
+    protected void playHurtSound(final DamageSource anw) {
         this.resetAmbientSoundTime();
-        super.playHurtSound(ajz);
+        super.playHurtSound(anw);
     }
     
     private void resetAmbientSoundTime() {
@@ -235,7 +258,7 @@ public abstract class Mob extends LivingEntity {
     }
     
     @Override
-    protected int getExperienceReward(final Player ayj) {
+    protected int getExperienceReward(final Player bec) {
         if (this.xpReward > 0) {
             int integer3 = this.xpReward;
             for (int integer4 = 0; integer4 < this.armorItems.size(); ++integer4) {
@@ -309,118 +332,118 @@ public abstract class Mob extends LivingEntity {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("CanPickUpLoot", this.canPickUpLoot());
-        jt.putBoolean("PersistenceRequired", this.persistenceRequired);
-        final ListTag jz3 = new ListTag();
-        for (final ItemStack ben5 : this.armorItems) {
-            final CompoundTag jt2 = new CompoundTag();
-            if (!ben5.isEmpty()) {
-                ben5.save(jt2);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("CanPickUpLoot", this.canPickUpLoot());
+        le.putBoolean("PersistenceRequired", this.persistenceRequired);
+        final ListTag lk3 = new ListTag();
+        for (final ItemStack bki5 : this.armorItems) {
+            final CompoundTag le2 = new CompoundTag();
+            if (!bki5.isEmpty()) {
+                bki5.save(le2);
             }
-            ((AbstractList<CompoundTag>)jz3).add(jt2);
+            ((AbstractList<CompoundTag>)lk3).add(le2);
         }
-        jt.put("ArmorItems", jz3);
-        final ListTag jz4 = new ListTag();
-        for (final ItemStack ben6 : this.handItems) {
-            final CompoundTag jt3 = new CompoundTag();
-            if (!ben6.isEmpty()) {
-                ben6.save(jt3);
+        le.put("ArmorItems", lk3);
+        final ListTag lk4 = new ListTag();
+        for (final ItemStack bki6 : this.handItems) {
+            final CompoundTag le3 = new CompoundTag();
+            if (!bki6.isEmpty()) {
+                bki6.save(le3);
             }
-            ((AbstractList<CompoundTag>)jz4).add(jt3);
+            ((AbstractList<CompoundTag>)lk4).add(le3);
         }
-        jt.put("HandItems", jz4);
-        final ListTag jz5 = new ListTag();
+        le.put("HandItems", lk4);
+        final ListTag lk5 = new ListTag();
         for (final float float9 : this.armorDropChances) {
-            ((AbstractList<FloatTag>)jz5).add(FloatTag.valueOf(float9));
+            ((AbstractList<FloatTag>)lk5).add(FloatTag.valueOf(float9));
         }
-        jt.put("ArmorDropChances", jz5);
-        final ListTag jz6 = new ListTag();
+        le.put("ArmorDropChances", lk5);
+        final ListTag lk6 = new ListTag();
         for (final float float10 : this.handDropChances) {
-            ((AbstractList<FloatTag>)jz6).add(FloatTag.valueOf(float10));
+            ((AbstractList<FloatTag>)lk6).add(FloatTag.valueOf(float10));
         }
-        jt.put("HandDropChances", jz6);
+        le.put("HandDropChances", lk6);
         if (this.leashHolder != null) {
-            final CompoundTag jt3 = new CompoundTag();
+            final CompoundTag le3 = new CompoundTag();
             if (this.leashHolder instanceof LivingEntity) {
                 final UUID uUID8 = this.leashHolder.getUUID();
-                jt3.putUUID("UUID", uUID8);
+                le3.putUUID("UUID", uUID8);
             }
             else if (this.leashHolder instanceof HangingEntity) {
-                final BlockPos fk8 = ((HangingEntity)this.leashHolder).getPos();
-                jt3.putInt("X", fk8.getX());
-                jt3.putInt("Y", fk8.getY());
-                jt3.putInt("Z", fk8.getZ());
+                final BlockPos fu8 = ((HangingEntity)this.leashHolder).getPos();
+                le3.putInt("X", fu8.getX());
+                le3.putInt("Y", fu8.getY());
+                le3.putInt("Z", fu8.getZ());
             }
-            jt.put("Leash", jt3);
+            le.put("Leash", le3);
         }
         else if (this.leashInfoTag != null) {
-            jt.put("Leash", this.leashInfoTag.copy());
+            le.put("Leash", this.leashInfoTag.copy());
         }
-        jt.putBoolean("LeftHanded", this.isLeftHanded());
+        le.putBoolean("LeftHanded", this.isLeftHanded());
         if (this.lootTable != null) {
-            jt.putString("DeathLootTable", this.lootTable.toString());
+            le.putString("DeathLootTable", this.lootTable.toString());
             if (this.lootTableSeed != 0L) {
-                jt.putLong("DeathLootTableSeed", this.lootTableSeed);
+                le.putLong("DeathLootTableSeed", this.lootTableSeed);
             }
         }
         if (this.isNoAi()) {
-            jt.putBoolean("NoAI", this.isNoAi());
+            le.putBoolean("NoAI", this.isNoAi());
         }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("CanPickUpLoot", 1)) {
-            this.setCanPickUpLoot(jt.getBoolean("CanPickUpLoot"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("CanPickUpLoot", 1)) {
+            this.setCanPickUpLoot(le.getBoolean("CanPickUpLoot"));
         }
-        this.persistenceRequired = jt.getBoolean("PersistenceRequired");
-        if (jt.contains("ArmorItems", 9)) {
-            final ListTag jz3 = jt.getList("ArmorItems", 10);
+        this.persistenceRequired = le.getBoolean("PersistenceRequired");
+        if (le.contains("ArmorItems", 9)) {
+            final ListTag lk3 = le.getList("ArmorItems", 10);
             for (int integer4 = 0; integer4 < this.armorItems.size(); ++integer4) {
-                this.armorItems.set(integer4, ItemStack.of(jz3.getCompound(integer4)));
+                this.armorItems.set(integer4, ItemStack.of(lk3.getCompound(integer4)));
             }
         }
-        if (jt.contains("HandItems", 9)) {
-            final ListTag jz3 = jt.getList("HandItems", 10);
+        if (le.contains("HandItems", 9)) {
+            final ListTag lk3 = le.getList("HandItems", 10);
             for (int integer4 = 0; integer4 < this.handItems.size(); ++integer4) {
-                this.handItems.set(integer4, ItemStack.of(jz3.getCompound(integer4)));
+                this.handItems.set(integer4, ItemStack.of(lk3.getCompound(integer4)));
             }
         }
-        if (jt.contains("ArmorDropChances", 9)) {
-            final ListTag jz3 = jt.getList("ArmorDropChances", 5);
-            for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-                this.armorDropChances[integer4] = jz3.getFloat(integer4);
+        if (le.contains("ArmorDropChances", 9)) {
+            final ListTag lk3 = le.getList("ArmorDropChances", 5);
+            for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+                this.armorDropChances[integer4] = lk3.getFloat(integer4);
             }
         }
-        if (jt.contains("HandDropChances", 9)) {
-            final ListTag jz3 = jt.getList("HandDropChances", 5);
-            for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-                this.handDropChances[integer4] = jz3.getFloat(integer4);
+        if (le.contains("HandDropChances", 9)) {
+            final ListTag lk3 = le.getList("HandDropChances", 5);
+            for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+                this.handDropChances[integer4] = lk3.getFloat(integer4);
             }
         }
-        if (jt.contains("Leash", 10)) {
-            this.leashInfoTag = jt.getCompound("Leash");
+        if (le.contains("Leash", 10)) {
+            this.leashInfoTag = le.getCompound("Leash");
         }
-        this.setLeftHanded(jt.getBoolean("LeftHanded"));
-        if (jt.contains("DeathLootTable", 8)) {
-            this.lootTable = new ResourceLocation(jt.getString("DeathLootTable"));
-            this.lootTableSeed = jt.getLong("DeathLootTableSeed");
+        this.setLeftHanded(le.getBoolean("LeftHanded"));
+        if (le.contains("DeathLootTable", 8)) {
+            this.lootTable = new ResourceLocation(le.getString("DeathLootTable"));
+            this.lootTableSeed = le.getLong("DeathLootTableSeed");
         }
-        this.setNoAi(jt.getBoolean("NoAI"));
+        this.setNoAi(le.getBoolean("NoAI"));
     }
     
     @Override
-    protected void dropFromLootTable(final DamageSource ajz, final boolean boolean2) {
-        super.dropFromLootTable(ajz, boolean2);
+    protected void dropFromLootTable(final DamageSource anw, final boolean boolean2) {
+        super.dropFromLootTable(anw, boolean2);
         this.lootTable = null;
     }
     
     @Override
-    protected LootContext.Builder createLootContext(final boolean boolean1, final DamageSource ajz) {
-        return super.createLootContext(boolean1, ajz).withOptionalRandomSeed(this.lootTableSeed, this.random);
+    protected LootContext.Builder createLootContext(final boolean boolean1, final DamageSource anw) {
+        return super.createLootContext(boolean1, anw).withOptionalRandomSeed(this.lootTableSeed, this.random);
     }
     
     @Override
@@ -456,96 +479,139 @@ public abstract class Mob extends LivingEntity {
         this.level.getProfiler().push("looting");
         if (!this.level.isClientSide && this.canPickUpLoot() && this.isAlive() && !this.dead && this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
             final List<ItemEntity> list2 = this.level.<ItemEntity>getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(1.0, 0.0, 1.0));
-            for (final ItemEntity awb4 : list2) {
-                if (!awb4.removed && !awb4.getItem().isEmpty()) {
-                    if (awb4.hasPickUpDelay()) {
+            for (final ItemEntity bbg4 : list2) {
+                if (!bbg4.removed && !bbg4.getItem().isEmpty()) {
+                    if (bbg4.hasPickUpDelay()) {
                         continue;
                     }
-                    this.pickUpItem(awb4);
+                    if (!this.wantsToPickUp(bbg4.getItem())) {
+                        continue;
+                    }
+                    this.pickUpItem(bbg4);
                 }
             }
         }
         this.level.getProfiler().pop();
     }
     
-    protected void pickUpItem(final ItemEntity awb) {
-        final ItemStack ben3 = awb.getItem();
-        final EquipmentSlot akv4 = getEquipmentSlotForItem(ben3);
-        final ItemStack ben4 = this.getItemBySlot(akv4);
-        final boolean boolean6 = this.canReplaceCurrentItem(ben3, ben4, akv4);
-        if (boolean6 && this.canHoldItem(ben3)) {
-            final double double7 = this.getEquipmentDropChance(akv4);
-            if (!ben4.isEmpty() && Math.max(this.random.nextFloat() - 0.1f, 0.0f) < double7) {
-                this.spawnAtLocation(ben4);
-            }
-            this.setItemSlot(akv4, ben3);
-            switch (akv4.getType()) {
-                case HAND: {
-                    this.handDropChances[akv4.getIndex()] = 2.0f;
-                    break;
-                }
-                case ARMOR: {
-                    this.armorDropChances[akv4.getIndex()] = 2.0f;
-                    break;
-                }
-            }
-            this.persistenceRequired = true;
-            this.take(awb, ben3.getCount());
-            awb.remove();
+    protected void pickUpItem(final ItemEntity bbg) {
+        final ItemStack bki3 = bbg.getItem();
+        if (this.equipItemIfPossible(bki3)) {
+            this.onItemPickup(bbg);
+            this.take(bbg, bki3.getCount());
+            bbg.remove();
         }
     }
     
-    protected boolean canReplaceCurrentItem(final ItemStack ben1, final ItemStack ben2, final EquipmentSlot akv) {
-        boolean boolean5 = true;
-        if (!ben2.isEmpty()) {
-            if (akv.getType() == EquipmentSlot.Type.HAND) {
-                if (ben1.getItem() instanceof SwordItem && !(ben2.getItem() instanceof SwordItem)) {
-                    boolean5 = true;
-                }
-                else if (ben1.getItem() instanceof SwordItem && ben2.getItem() instanceof SwordItem) {
-                    final SwordItem bfq6 = (SwordItem)ben1.getItem();
-                    final SwordItem bfq7 = (SwordItem)ben2.getItem();
-                    if (bfq6.getDamage() == bfq7.getDamage()) {
-                        boolean5 = (ben1.getDamageValue() < ben2.getDamageValue() || (ben1.hasTag() && !ben2.hasTag()));
-                    }
-                    else {
-                        boolean5 = (bfq6.getDamage() > bfq7.getDamage());
-                    }
-                }
-                else {
-                    boolean5 = (ben1.getItem() instanceof BowItem && ben2.getItem() instanceof BowItem && ben1.hasTag() && !ben2.hasTag());
-                }
-            }
-            else if (ben1.getItem() instanceof ArmorItem && !(ben2.getItem() instanceof ArmorItem)) {
-                boolean5 = true;
-            }
-            else if (ben1.getItem() instanceof ArmorItem && ben2.getItem() instanceof ArmorItem && !EnchantmentHelper.hasBindingCurse(ben2)) {
-                final ArmorItem bcg6 = (ArmorItem)ben1.getItem();
-                final ArmorItem bcg7 = (ArmorItem)ben2.getItem();
-                if (bcg6.getDefense() == bcg7.getDefense()) {
-                    boolean5 = (ben1.getDamageValue() < ben2.getDamageValue() || (ben1.hasTag() && !ben2.hasTag()));
-                }
-                else {
-                    boolean5 = (bcg6.getDefense() > bcg7.getDefense());
-                }
-            }
-            else {
-                boolean5 = false;
+    public boolean equipItemIfPossible(final ItemStack bki) {
+        final EquipmentSlot aor3 = getEquipmentSlotForItem(bki);
+        final ItemStack bki2 = this.getItemBySlot(aor3);
+        final boolean boolean5 = this.canReplaceCurrentItem(bki, bki2);
+        if (boolean5 && this.canHoldItem(bki)) {
+            final double double6 = this.getEquipmentDropChance(aor3);
+            if (!bki2.isEmpty() && Math.max(this.random.nextFloat() - 0.1f, 0.0f) < double6) {
+                this.spawnAtLocation(bki2);
             }
+            this.setItemSlotAndDropWhenKilled(aor3, bki);
+            this.playEquipSound(bki);
+            return true;
         }
-        return boolean5;
+        return false;
     }
     
-    protected boolean canHoldItem(final ItemStack ben) {
+    protected void setItemSlotAndDropWhenKilled(final EquipmentSlot aor, final ItemStack bki) {
+        this.setItemSlot(aor, bki);
+        this.setGuaranteedDrop(aor);
+        this.persistenceRequired = true;
+    }
+    
+    public void setGuaranteedDrop(final EquipmentSlot aor) {
+        switch (aor.getType()) {
+            case HAND: {
+                this.handDropChances[aor.getIndex()] = 2.0f;
+                break;
+            }
+            case ARMOR: {
+                this.armorDropChances[aor.getIndex()] = 2.0f;
+                break;
+            }
+        }
+    }
+    
+    protected boolean canReplaceCurrentItem(final ItemStack bki1, final ItemStack bki2) {
+        if (bki2.isEmpty()) {
+            return true;
+        }
+        if (bki1.getItem() instanceof SwordItem) {
+            if (!(bki2.getItem() instanceof SwordItem)) {
+                return true;
+            }
+            final SwordItem blm4 = (SwordItem)bki1.getItem();
+            final SwordItem blm5 = (SwordItem)bki2.getItem();
+            if (blm4.getDamage() != blm5.getDamage()) {
+                return blm4.getDamage() > blm5.getDamage();
+            }
+            return this.canReplaceEqualItem(bki1, bki2);
+        }
+        else {
+            if (bki1.getItem() instanceof BowItem && bki2.getItem() instanceof BowItem) {
+                return this.canReplaceEqualItem(bki1, bki2);
+            }
+            if (bki1.getItem() instanceof CrossbowItem && bki2.getItem() instanceof CrossbowItem) {
+                return this.canReplaceEqualItem(bki1, bki2);
+            }
+            if (!(bki1.getItem() instanceof ArmorItem)) {
+                if (bki1.getItem() instanceof DiggerItem) {
+                    if (bki2.getItem() instanceof BlockItem) {
+                        return true;
+                    }
+                    if (bki2.getItem() instanceof DiggerItem) {
+                        final DiggerItem bjb4 = (DiggerItem)bki1.getItem();
+                        final DiggerItem bjb5 = (DiggerItem)bki2.getItem();
+                        if (bjb4.getAttackDamage() != bjb5.getAttackDamage()) {
+                            return bjb4.getAttackDamage() > bjb5.getAttackDamage();
+                        }
+                        return this.canReplaceEqualItem(bki1, bki2);
+                    }
+                }
+                return false;
+            }
+            if (EnchantmentHelper.hasBindingCurse(bki2)) {
+                return false;
+            }
+            if (!(bki2.getItem() instanceof ArmorItem)) {
+                return true;
+            }
+            final ArmorItem bid4 = (ArmorItem)bki1.getItem();
+            final ArmorItem bid5 = (ArmorItem)bki2.getItem();
+            if (bid4.getDefense() != bid5.getDefense()) {
+                return bid4.getDefense() > bid5.getDefense();
+            }
+            if (bid4.getToughness() != bid5.getToughness()) {
+                return bid4.getToughness() > bid5.getToughness();
+            }
+            return this.canReplaceEqualItem(bki1, bki2);
+        }
+    }
+    
+    public boolean canReplaceEqualItem(final ItemStack bki1, final ItemStack bki2) {
+        return bki1.getDamageValue() < bki2.getDamageValue() || (bki1.hasTag() && !bki2.hasTag()) || (bki1.hasTag() && bki2.hasTag() && bki1.getTag().getAllKeys().stream().anyMatch(string -> !string.equals("Damage")) && !bki2.getTag().getAllKeys().stream().anyMatch(string -> !string.equals("Damage")));
+    }
+    
+    public boolean canHoldItem(final ItemStack bki) {
         return true;
     }
     
+    public boolean wantsToPickUp(final ItemStack bki) {
+        return this.canHoldItem(bki);
+    }
+    
     public boolean removeWhenFarAway(final double double1) {
         return true;
     }
     
     public boolean requiresCustomPersistence() {
-        return false;
+        return this.isPassenger();
     }
     
     protected boolean shouldDespawnInPeaceful() {
@@ -562,16 +628,20 @@ public abstract class Mob extends LivingEntity {
             this.noActionTime = 0;
             return;
         }
-        final Entity akq2 = this.level.getNearestPlayer(this, -1.0);
-        if (akq2 != null) {
-            final double double3 = akq2.distanceToSqr(this);
-            if (double3 > 16384.0 && this.removeWhenFarAway(double3)) {
+        final Entity aom2 = this.level.getNearestPlayer(this, -1.0);
+        if (aom2 != null) {
+            final double double3 = aom2.distanceToSqr(this);
+            final int integer5 = this.getType().getCategory().getDespawnDistance();
+            final int integer6 = integer5 * integer5;
+            if (double3 > integer6 && this.removeWhenFarAway(double3)) {
                 this.remove();
             }
-            if (this.noActionTime > 600 && this.random.nextInt(800) == 0 && double3 > 1024.0 && this.removeWhenFarAway(double3)) {
+            final int integer7 = this.getType().getCategory().getNoDespawnDistance();
+            final int integer8 = integer7 * integer7;
+            if (this.noActionTime > 600 && this.random.nextInt(800) == 0 && double3 > integer8 && this.removeWhenFarAway(double3)) {
                 this.remove();
             }
-            else if (double3 < 1024.0) {
+            else if (double3 < integer8) {
                 this.noActionTime = 0;
             }
         }
@@ -626,16 +696,16 @@ public abstract class Mob extends LivingEntity {
         return 10;
     }
     
-    public void lookAt(final Entity akq, final float float2, final float float3) {
-        final double double5 = akq.getX() - this.getX();
-        final double double6 = akq.getZ() - this.getZ();
+    public void lookAt(final Entity aom, final float float2, final float float3) {
+        final double double5 = aom.getX() - this.getX();
+        final double double6 = aom.getZ() - this.getZ();
         double double7;
-        if (akq instanceof LivingEntity) {
-            final LivingEntity akz11 = (LivingEntity)akq;
-            double7 = akz11.getEyeY() - this.getEyeY();
+        if (aom instanceof LivingEntity) {
+            final LivingEntity aoy11 = (LivingEntity)aom;
+            double7 = aoy11.getEyeY() - this.getEyeY();
         }
         else {
-            double7 = (akq.getBoundingBox().minY + akq.getBoundingBox().maxY) / 2.0 - this.getEyeY();
+            double7 = (aom.getBoundingBox().minY + aom.getBoundingBox().maxY) / 2.0 - this.getEyeY();
         }
         final double double8 = Mth.sqrt(double5 * double5 + double6 * double6);
         final float float4 = (float)(Mth.atan2(double6, double5) * 57.2957763671875) - 90.0f;
@@ -655,17 +725,17 @@ public abstract class Mob extends LivingEntity {
         return float1 + float4;
     }
     
-    public static boolean checkMobSpawnRules(final EntityType<? extends Mob> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        final BlockPos fk2 = fk.below();
-        return alc == MobSpawnType.SPAWNER || bjx.getBlockState(fk2).isValidSpawn(bjx, fk2, aku);
+    public static boolean checkMobSpawnRules(final EntityType<? extends Mob> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        final BlockPos fu2 = fu.below();
+        return apb == MobSpawnType.SPAWNER || bqc.getBlockState(fu2).isValidSpawn(bqc, fu2, aoq);
     }
     
-    public boolean checkSpawnRules(final LevelAccessor bjx, final MobSpawnType alc) {
+    public boolean checkSpawnRules(final LevelAccessor bqc, final MobSpawnType apb) {
         return true;
     }
     
-    public boolean checkSpawnObstruction(final LevelReader bjz) {
-        return !bjz.containsAnyLiquid(this.getBoundingBox()) && bjz.isUnobstructed(this);
+    public boolean checkSpawnObstruction(final LevelReader bqd) {
+        return !bqd.containsAnyLiquid(this.getBoundingBox()) && bqd.isUnobstructed(this);
     }
     
     public int getMaxSpawnClusterSize() {
@@ -700,13 +770,13 @@ public abstract class Mob extends LivingEntity {
     }
     
     @Override
-    public ItemStack getItemBySlot(final EquipmentSlot akv) {
-        switch (akv.getType()) {
+    public ItemStack getItemBySlot(final EquipmentSlot aor) {
+        switch (aor.getType()) {
             case HAND: {
-                return this.handItems.get(akv.getIndex());
+                return this.handItems.get(aor.getIndex());
             }
             case ARMOR: {
-                return this.armorItems.get(akv.getIndex());
+                return this.armorItems.get(aor.getIndex());
             }
             default: {
                 return ItemStack.EMPTY;
@@ -715,44 +785,44 @@ public abstract class Mob extends LivingEntity {
     }
     
     @Override
-    public void setItemSlot(final EquipmentSlot akv, final ItemStack ben) {
-        switch (akv.getType()) {
+    public void setItemSlot(final EquipmentSlot aor, final ItemStack bki) {
+        switch (aor.getType()) {
             case HAND: {
-                this.handItems.set(akv.getIndex(), ben);
+                this.handItems.set(aor.getIndex(), bki);
                 break;
             }
             case ARMOR: {
-                this.armorItems.set(akv.getIndex(), ben);
+                this.armorItems.set(aor.getIndex(), bki);
                 break;
             }
         }
     }
     
     @Override
-    protected void dropCustomDeathLoot(final DamageSource ajz, final int integer, final boolean boolean3) {
-        super.dropCustomDeathLoot(ajz, integer, boolean3);
-        for (final EquipmentSlot akv8 : EquipmentSlot.values()) {
-            final ItemStack ben9 = this.getItemBySlot(akv8);
-            final float float10 = this.getEquipmentDropChance(akv8);
+    protected void dropCustomDeathLoot(final DamageSource anw, final int integer, final boolean boolean3) {
+        super.dropCustomDeathLoot(anw, integer, boolean3);
+        for (final EquipmentSlot aor8 : EquipmentSlot.values()) {
+            final ItemStack bki9 = this.getItemBySlot(aor8);
+            final float float10 = this.getEquipmentDropChance(aor8);
             final boolean boolean4 = float10 > 1.0f;
-            if (!ben9.isEmpty() && !EnchantmentHelper.hasVanishingCurse(ben9) && (boolean3 || boolean4) && Math.max(this.random.nextFloat() - integer * 0.01f, 0.0f) < float10) {
-                if (!boolean4 && ben9.isDamageableItem()) {
-                    ben9.setDamageValue(ben9.getMaxDamage() - this.random.nextInt(1 + this.random.nextInt(Math.max(ben9.getMaxDamage() - 3, 1))));
+            if (!bki9.isEmpty() && !EnchantmentHelper.hasVanishingCurse(bki9) && (boolean3 || boolean4) && Math.max(this.random.nextFloat() - integer * 0.01f, 0.0f) < float10) {
+                if (!boolean4 && bki9.isDamageableItem()) {
+                    bki9.setDamageValue(bki9.getMaxDamage() - this.random.nextInt(1 + this.random.nextInt(Math.max(bki9.getMaxDamage() - 3, 1))));
                 }
-                this.spawnAtLocation(ben9);
+                this.spawnAtLocation(bki9);
             }
         }
     }
     
-    protected float getEquipmentDropChance(final EquipmentSlot akv) {
+    protected float getEquipmentDropChance(final EquipmentSlot aor) {
         float float3 = 0.0f;
-        switch (akv.getType()) {
+        switch (aor.getType()) {
             case HAND: {
-                float3 = this.handDropChances[akv.getIndex()];
+                float3 = this.handDropChances[aor.getIndex()];
                 break;
             }
             case ARMOR: {
-                float3 = this.armorDropChances[akv.getIndex()];
+                float3 = this.armorDropChances[aor.getIndex()];
                 break;
             }
             default: {
@@ -763,8 +833,8 @@ public abstract class Mob extends LivingEntity {
         return float3;
     }
     
-    protected void populateDefaultEquipmentSlots(final DifficultyInstance ajj) {
-        if (this.random.nextFloat() < 0.15f * ajj.getSpecialMultiplier()) {
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
+        if (this.random.nextFloat() < 0.15f * ane.getSpecialMultiplier()) {
             int integer3 = this.random.nextInt(2);
             final float float4 = (this.level.getDifficulty() == Difficulty.HARD) ? 0.1f : 0.25f;
             if (this.random.nextFloat() < 0.095f) {
@@ -777,17 +847,17 @@ public abstract class Mob extends LivingEntity {
                 ++integer3;
             }
             boolean boolean5 = true;
-            for (final EquipmentSlot akv9 : EquipmentSlot.values()) {
-                if (akv9.getType() == EquipmentSlot.Type.ARMOR) {
-                    final ItemStack ben10 = this.getItemBySlot(akv9);
+            for (final EquipmentSlot aor9 : EquipmentSlot.values()) {
+                if (aor9.getType() == EquipmentSlot.Type.ARMOR) {
+                    final ItemStack bki10 = this.getItemBySlot(aor9);
                     if (!boolean5 && this.random.nextFloat() < float4) {
                         break;
                     }
                     boolean5 = false;
-                    if (ben10.isEmpty()) {
-                        final Item bei11 = getEquipmentForSlot(akv9, integer3);
-                        if (bei11 != null) {
-                            this.setItemSlot(akv9, new ItemStack(bei11));
+                    if (bki10.isEmpty()) {
+                        final Item bke11 = getEquipmentForSlot(aor9, integer3);
+                        if (bke11 != null) {
+                            this.setItemSlot(aor9, new ItemStack(bke11));
                         }
                     }
                 }
@@ -795,26 +865,26 @@ public abstract class Mob extends LivingEntity {
         }
     }
     
-    public static EquipmentSlot getEquipmentSlotForItem(final ItemStack ben) {
-        final Item bei2 = ben.getItem();
-        if (bei2 == Blocks.CARVED_PUMPKIN.asItem() || (bei2 instanceof BlockItem && ((BlockItem)bei2).getBlock() instanceof AbstractSkullBlock)) {
+    public static EquipmentSlot getEquipmentSlotForItem(final ItemStack bki) {
+        final Item bke2 = bki.getItem();
+        if (bke2 == Blocks.CARVED_PUMPKIN.asItem() || (bke2 instanceof BlockItem && ((BlockItem)bke2).getBlock() instanceof AbstractSkullBlock)) {
             return EquipmentSlot.HEAD;
         }
-        if (bei2 instanceof ArmorItem) {
-            return ((ArmorItem)bei2).getSlot();
+        if (bke2 instanceof ArmorItem) {
+            return ((ArmorItem)bke2).getSlot();
         }
-        if (bei2 == Items.ELYTRA) {
+        if (bke2 == Items.ELYTRA) {
             return EquipmentSlot.CHEST;
         }
-        if (bei2 == Items.SHIELD) {
+        if (bke2 == Items.SHIELD) {
             return EquipmentSlot.OFFHAND;
         }
         return EquipmentSlot.MAINHAND;
     }
     
     @Nullable
-    public static Item getEquipmentForSlot(final EquipmentSlot akv, final int integer) {
-        switch (akv) {
+    public static Item getEquipmentForSlot(final EquipmentSlot aor, final int integer) {
+        switch (aor) {
             case HEAD: {
                 if (integer == 0) {
                     return Items.LEATHER_HELMET;
@@ -888,31 +958,31 @@ public abstract class Mob extends LivingEntity {
         return null;
     }
     
-    protected void populateDefaultEquipmentEnchantments(final DifficultyInstance ajj) {
-        final float float3 = ajj.getSpecialMultiplier();
+    protected void populateDefaultEquipmentEnchantments(final DifficultyInstance ane) {
+        final float float3 = ane.getSpecialMultiplier();
         if (!this.getMainHandItem().isEmpty() && this.random.nextFloat() < 0.25f * float3) {
             this.setItemSlot(EquipmentSlot.MAINHAND, EnchantmentHelper.enchantItem(this.random, this.getMainHandItem(), (int)(5.0f + float3 * this.random.nextInt(18)), false));
         }
-        for (final EquipmentSlot akv7 : EquipmentSlot.values()) {
-            if (akv7.getType() == EquipmentSlot.Type.ARMOR) {
-                final ItemStack ben8 = this.getItemBySlot(akv7);
-                if (!ben8.isEmpty() && this.random.nextFloat() < 0.5f * float3) {
-                    this.setItemSlot(akv7, EnchantmentHelper.enchantItem(this.random, ben8, (int)(5.0f + float3 * this.random.nextInt(18)), false));
+        for (final EquipmentSlot aor7 : EquipmentSlot.values()) {
+            if (aor7.getType() == EquipmentSlot.Type.ARMOR) {
+                final ItemStack bki8 = this.getItemBySlot(aor7);
+                if (!bki8.isEmpty() && this.random.nextFloat() < 0.5f * float3) {
+                    this.setItemSlot(aor7, EnchantmentHelper.enchantItem(this.random, bki8, (int)(5.0f + float3 * this.random.nextInt(18)), false));
                 }
             }
         }
     }
     
     @Nullable
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).addModifier(new AttributeModifier("Random spawn bonus", this.random.nextGaussian() * 0.05, AttributeModifier.Operation.MULTIPLY_BASE));
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        this.getAttribute(Attributes.FOLLOW_RANGE).addPermanentModifier(new AttributeModifier("Random spawn bonus", this.random.nextGaussian() * 0.05, AttributeModifier.Operation.MULTIPLY_BASE));
         if (this.random.nextFloat() < 0.05f) {
             this.setLeftHanded(true);
         }
         else {
             this.setLeftHanded(false);
         }
-        return alm;
+        return apo;
     }
     
     public boolean canBeControlledByRider() {
@@ -923,14 +993,14 @@ public abstract class Mob extends LivingEntity {
         this.persistenceRequired = true;
     }
     
-    public void setDropChance(final EquipmentSlot akv, final float float2) {
-        switch (akv.getType()) {
+    public void setDropChance(final EquipmentSlot aor, final float float2) {
+        switch (aor.getType()) {
             case HAND: {
-                this.handDropChances[akv.getIndex()] = float2;
+                this.handDropChances[aor.getIndex()] = float2;
                 break;
             }
             case ARMOR: {
-                this.armorDropChances[akv.getIndex()] = float2;
+                this.armorDropChances[aor.getIndex()] = float2;
                 break;
             }
         }
@@ -945,9 +1015,9 @@ public abstract class Mob extends LivingEntity {
     }
     
     @Override
-    public boolean canTakeItem(final ItemStack ben) {
-        final EquipmentSlot akv3 = getEquipmentSlotForItem(ben);
-        return this.getItemBySlot(akv3).isEmpty() && this.canPickUpLoot();
+    public boolean canTakeItem(final ItemStack bki) {
+        final EquipmentSlot aor3 = getEquipmentSlotForItem(bki);
+        return this.getItemBySlot(aor3).isEmpty() && this.canPickUpLoot();
     }
     
     public boolean isPersistenceRequired() {
@@ -955,37 +1025,67 @@ public abstract class Mob extends LivingEntity {
     }
     
     @Override
-    public final boolean interact(final Player ayj, final InteractionHand ajk) {
+    public final InteractionResult interact(final Player bec, final InteractionHand anf) {
         if (!this.isAlive()) {
-            return false;
+            return InteractionResult.PASS;
         }
-        if (this.getLeashHolder() == ayj) {
-            this.dropLeash(true, !ayj.abilities.instabuild);
-            return true;
+        if (this.getLeashHolder() == bec) {
+            this.dropLeash(true, !bec.abilities.instabuild);
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() == Items.LEAD && this.canBeLeashed(ayj)) {
-            this.setLeashedTo(ayj, true);
-            ben4.shrink(1);
-            return true;
+        InteractionResult ang4 = this.checkAndHandleImportantInteractions(bec, anf);
+        if (ang4.consumesAction()) {
+            return ang4;
         }
-        return this.mobInteract(ayj, ajk) || super.interact(ayj, ajk);
+        ang4 = this.mobInteract(bec, anf);
+        if (ang4.consumesAction()) {
+            return ang4;
+        }
+        return super.interact(bec, anf);
     }
     
-    protected boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        return false;
+    private InteractionResult checkAndHandleImportantInteractions(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (bki4.getItem() == Items.LEAD && this.canBeLeashed(bec)) {
+            this.setLeashedTo(bec, true);
+            bki4.shrink(1);
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
+        }
+        if (bki4.getItem() == Items.NAME_TAG) {
+            final InteractionResult ang5 = bki4.interactLivingEntity(bec, this, anf);
+            if (ang5.consumesAction()) {
+                return ang5;
+            }
+        }
+        if (!(bki4.getItem() instanceof SpawnEggItem)) {
+            return InteractionResult.PASS;
+        }
+        if (!this.level.isClientSide) {
+            final SpawnEggItem blh5 = (SpawnEggItem)bki4.getItem();
+            final Optional<Mob> optional6 = blh5.spawnOffspringFromSpawnEgg(bec, this, this.getType(), this.level, this.position(), bki4);
+            optional6.ifPresent(aoz -> this.onOffspringSpawnedFromEgg(bec, aoz));
+            return optional6.isPresent() ? InteractionResult.SUCCESS : InteractionResult.PASS;
+        }
+        return InteractionResult.CONSUME;
+    }
+    
+    protected void onOffspringSpawnedFromEgg(final Player bec, final Mob aoz) {
+    }
+    
+    protected InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        return InteractionResult.PASS;
     }
     
     public boolean isWithinRestriction() {
-        return this.isWithinRestriction(new BlockPos(this));
+        return this.isWithinRestriction(this.blockPosition());
     }
     
-    public boolean isWithinRestriction(final BlockPos fk) {
-        return this.restrictRadius == -1.0f || this.restrictCenter.distSqr(fk) < this.restrictRadius * this.restrictRadius;
+    public boolean isWithinRestriction(final BlockPos fu) {
+        return this.restrictRadius == -1.0f || this.restrictCenter.distSqr(fu) < this.restrictRadius * this.restrictRadius;
     }
     
-    public void restrictTo(final BlockPos fk, final int integer) {
-        this.restrictCenter = fk;
+    public void restrictTo(final BlockPos fu, final int integer) {
+        this.restrictCenter = fu;
         this.restrictRadius = (float)integer;
     }
     
@@ -1001,6 +1101,37 @@ public abstract class Mob extends LivingEntity {
         return this.restrictRadius != -1.0f;
     }
     
+    @Nullable
+    protected <T extends Mob> T convertTo(final EntityType<T> aoq) {
+        if (this.removed) {
+            return null;
+        }
+        final T aoz3 = aoq.create(this.level);
+        aoz3.copyPosition(this);
+        aoz3.setCanPickUpLoot(this.canPickUpLoot());
+        aoz3.setBaby(this.isBaby());
+        aoz3.setNoAi(this.isNoAi());
+        if (this.hasCustomName()) {
+            aoz3.setCustomName(this.getCustomName());
+            aoz3.setCustomNameVisible(this.isCustomNameVisible());
+        }
+        if (this.isPersistenceRequired()) {
+            aoz3.setPersistenceRequired();
+        }
+        aoz3.setInvulnerable(this.isInvulnerable());
+        for (final EquipmentSlot aor7 : EquipmentSlot.values()) {
+            final ItemStack bki8 = this.getItemBySlot(aor7);
+            if (!bki8.isEmpty()) {
+                aoz3.setItemSlot(aor7, bki8.copy());
+                aoz3.setDropChance(aor7, this.getEquipmentDropChance(aor7));
+                bki8.setCount(0);
+            }
+        }
+        this.level.addFreshEntity(aoz3);
+        this.remove();
+        return aoz3;
+    }
+    
     protected void tickLeash() {
         if (this.leashInfoTag != null) {
             this.restoreLeashFromSave();
@@ -1020,6 +1151,7 @@ public abstract class Mob extends LivingEntity {
                 this.leashHolder.forcedLoading = false;
             }
             this.leashHolder = null;
+            this.leashInfoTag = null;
             if (!this.level.isClientSide && boolean2) {
                 this.spawnAtLocation(Items.LEAD);
             }
@@ -1029,7 +1161,7 @@ public abstract class Mob extends LivingEntity {
         }
     }
     
-    public boolean canBeLeashed(final Player ayj) {
+    public boolean canBeLeashed(final Player bec) {
         return !this.isLeashed() && !(this instanceof Enemy);
     }
     
@@ -1045,8 +1177,9 @@ public abstract class Mob extends LivingEntity {
         return this.leashHolder;
     }
     
-    public void setLeashedTo(final Entity akq, final boolean boolean2) {
-        this.leashHolder = akq;
+    public void setLeashedTo(final Entity aom, final boolean boolean2) {
+        this.leashHolder = aom;
+        this.leashInfoTag = null;
         this.forcedLoading = true;
         if (!(this.leashHolder instanceof Player)) {
             this.leashHolder.forcedLoading = true;
@@ -1065,8 +1198,8 @@ public abstract class Mob extends LivingEntity {
     }
     
     @Override
-    public boolean startRiding(final Entity akq, final boolean boolean2) {
-        final boolean boolean3 = super.startRiding(akq, boolean2);
+    public boolean startRiding(final Entity aom, final boolean boolean2) {
+        final boolean boolean3 = super.startRiding(aom, boolean2);
         if (boolean3 && this.isLeashed()) {
             this.dropLeash(true, true);
         }
@@ -1077,48 +1210,50 @@ public abstract class Mob extends LivingEntity {
         if (this.leashInfoTag != null && this.level instanceof ServerLevel) {
             if (this.leashInfoTag.hasUUID("UUID")) {
                 final UUID uUID2 = this.leashInfoTag.getUUID("UUID");
-                final Entity akq3 = ((ServerLevel)this.level).getEntity(uUID2);
-                if (akq3 != null) {
-                    this.setLeashedTo(akq3, true);
+                final Entity aom3 = ((ServerLevel)this.level).getEntity(uUID2);
+                if (aom3 != null) {
+                    this.setLeashedTo(aom3, true);
+                    return;
                 }
             }
             else if (this.leashInfoTag.contains("X", 99) && this.leashInfoTag.contains("Y", 99) && this.leashInfoTag.contains("Z", 99)) {
-                final BlockPos fk2 = new BlockPos(this.leashInfoTag.getInt("X"), this.leashInfoTag.getInt("Y"), this.leashInfoTag.getInt("Z"));
-                this.setLeashedTo(LeashFenceKnotEntity.getOrCreateKnot(this.level, fk2), true);
+                final BlockPos fu2 = new BlockPos(this.leashInfoTag.getInt("X"), this.leashInfoTag.getInt("Y"), this.leashInfoTag.getInt("Z"));
+                this.setLeashedTo(LeashFenceKnotEntity.getOrCreateKnot(this.level, fu2), true);
+                return;
             }
-            else {
-                this.dropLeash(false, true);
+            if (this.tickCount > 100) {
+                this.spawnAtLocation(Items.LEAD);
+                this.leashInfoTag = null;
             }
-            this.leashInfoTag = null;
         }
     }
     
     @Override
-    public boolean setSlot(final int integer, final ItemStack ben) {
-        EquipmentSlot akv4;
+    public boolean setSlot(final int integer, final ItemStack bki) {
+        EquipmentSlot aor4;
         if (integer == 98) {
-            akv4 = EquipmentSlot.MAINHAND;
+            aor4 = EquipmentSlot.MAINHAND;
         }
         else if (integer == 99) {
-            akv4 = EquipmentSlot.OFFHAND;
+            aor4 = EquipmentSlot.OFFHAND;
         }
         else if (integer == 100 + EquipmentSlot.HEAD.getIndex()) {
-            akv4 = EquipmentSlot.HEAD;
+            aor4 = EquipmentSlot.HEAD;
         }
         else if (integer == 100 + EquipmentSlot.CHEST.getIndex()) {
-            akv4 = EquipmentSlot.CHEST;
+            aor4 = EquipmentSlot.CHEST;
         }
         else if (integer == 100 + EquipmentSlot.LEGS.getIndex()) {
-            akv4 = EquipmentSlot.LEGS;
+            aor4 = EquipmentSlot.LEGS;
         }
         else {
             if (integer != 100 + EquipmentSlot.FEET.getIndex()) {
                 return false;
             }
-            akv4 = EquipmentSlot.FEET;
+            aor4 = EquipmentSlot.FEET;
         }
-        if (ben.isEmpty() || isValidSlotForItem(akv4, ben) || akv4 == EquipmentSlot.HEAD) {
-            this.setItemSlot(akv4, ben);
+        if (bki.isEmpty() || isValidSlotForItem(aor4, bki) || aor4 == EquipmentSlot.HEAD) {
+            this.setItemSlot(aor4, bki);
             return true;
         }
         return false;
@@ -1129,9 +1264,9 @@ public abstract class Mob extends LivingEntity {
         return this.canBeControlledByRider() && super.isControlledByLocalInstance();
     }
     
-    public static boolean isValidSlotForItem(final EquipmentSlot akv, final ItemStack ben) {
-        final EquipmentSlot akv2 = getEquipmentSlotForItem(ben);
-        return akv2 == akv || (akv2 == EquipmentSlot.MAINHAND && akv == EquipmentSlot.OFFHAND) || (akv2 == EquipmentSlot.OFFHAND && akv == EquipmentSlot.MAINHAND);
+    public static boolean isValidSlotForItem(final EquipmentSlot aor, final ItemStack bki) {
+        final EquipmentSlot aor2 = getEquipmentSlotForItem(bki);
+        return aor2 == aor || (aor2 == EquipmentSlot.MAINHAND && aor == EquipmentSlot.OFFHAND) || (aor2 == EquipmentSlot.OFFHAND && aor == EquipmentSlot.MAINHAND);
     }
     
     @Override
@@ -1166,57 +1301,62 @@ public abstract class Mob extends LivingEntity {
         return (this.entityData.<Byte>get(Mob.DATA_MOB_FLAGS_ID) & 0x4) != 0x0;
     }
     
+    public void setBaby(final boolean boolean1) {
+    }
+    
     @Override
     public HumanoidArm getMainArm() {
         return this.isLeftHanded() ? HumanoidArm.LEFT : HumanoidArm.RIGHT;
     }
     
     @Override
-    public boolean canAttack(final LivingEntity akz) {
-        return (akz.getType() != EntityType.PLAYER || !((Player)akz).abilities.invulnerable) && super.canAttack(akz);
+    public boolean canAttack(final LivingEntity aoy) {
+        return (aoy.getType() != EntityType.PLAYER || !((Player)aoy).abilities.invulnerable) && super.canAttack(aoy);
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        float float3 = (float)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue();
-        float float4 = (float)this.getAttribute(SharedMonsterAttributes.ATTACK_KNOCKBACK).getValue();
-        if (akq instanceof LivingEntity) {
-            float3 += EnchantmentHelper.getDamageBonus(this.getMainHandItem(), ((LivingEntity)akq).getMobType());
+    public boolean doHurtTarget(final Entity aom) {
+        float float3 = (float)this.getAttributeValue(Attributes.ATTACK_DAMAGE);
+        float float4 = (float)this.getAttributeValue(Attributes.ATTACK_KNOCKBACK);
+        if (aom instanceof LivingEntity) {
+            float3 += EnchantmentHelper.getDamageBonus(this.getMainHandItem(), ((LivingEntity)aom).getMobType());
             float4 += EnchantmentHelper.getKnockbackBonus(this);
         }
         final int integer5 = EnchantmentHelper.getFireAspect(this);
         if (integer5 > 0) {
-            akq.setSecondsOnFire(integer5 * 4);
+            aom.setSecondsOnFire(integer5 * 4);
         }
-        final boolean boolean6 = akq.hurt(DamageSource.mobAttack(this), float3);
+        final boolean boolean6 = aom.hurt(DamageSource.mobAttack(this), float3);
         if (boolean6) {
-            if (float4 > 0.0f && akq instanceof LivingEntity) {
-                ((LivingEntity)akq).knockback(this, float4 * 0.5f, Mth.sin(this.yRot * 0.017453292f), -Mth.cos(this.yRot * 0.017453292f));
+            if (float4 > 0.0f && aom instanceof LivingEntity) {
+                ((LivingEntity)aom).knockback(float4 * 0.5f, Mth.sin(this.yRot * 0.017453292f), -Mth.cos(this.yRot * 0.017453292f));
                 this.setDeltaMovement(this.getDeltaMovement().multiply(0.6, 1.0, 0.6));
             }
-            if (akq instanceof Player) {
-                final Player ayj7 = (Player)akq;
-                final ItemStack ben8 = this.getMainHandItem();
-                final ItemStack ben9 = ayj7.isUsingItem() ? ayj7.getUseItem() : ItemStack.EMPTY;
-                if (!ben8.isEmpty() && !ben9.isEmpty() && ben8.getItem() instanceof AxeItem && ben9.getItem() == Items.SHIELD) {
-                    final float float5 = 0.25f + EnchantmentHelper.getBlockEfficiency(this) * 0.05f;
-                    if (this.random.nextFloat() < float5) {
-                        ayj7.getCooldowns().addCooldown(Items.SHIELD, 100);
-                        this.level.broadcastEntityEvent(ayj7, (byte)30);
-                    }
-                }
+            if (aom instanceof Player) {
+                final Player bec7 = (Player)aom;
+                this.maybeDisableShield(bec7, this.getMainHandItem(), bec7.isUsingItem() ? bec7.getUseItem() : ItemStack.EMPTY);
             }
-            this.doEnchantDamageEffects(this, akq);
-            this.setLastHurtMob(akq);
+            this.doEnchantDamageEffects(this, aom);
+            this.setLastHurtMob(aom);
         }
         return boolean6;
     }
     
+    private void maybeDisableShield(final Player bec, final ItemStack bki2, final ItemStack bki3) {
+        if (!bki2.isEmpty() && !bki3.isEmpty() && bki2.getItem() instanceof AxeItem && bki3.getItem() == Items.SHIELD) {
+            final float float5 = 0.25f + EnchantmentHelper.getBlockEfficiency(this) * 0.05f;
+            if (this.random.nextFloat() < float5) {
+                bec.getCooldowns().addCooldown(Items.SHIELD, 100);
+                this.level.broadcastEntityEvent(bec, (byte)30);
+            }
+        }
+    }
+    
     protected boolean isSunBurnTick() {
         if (this.level.isDay() && !this.level.isClientSide) {
             final float float2 = this.getBrightness();
-            final BlockPos fk3 = (this.getVehicle() instanceof Boat) ? new BlockPos(this.getX(), (double)Math.round(this.getY()), this.getZ()).above() : new BlockPos(this.getX(), (double)Math.round(this.getY()), this.getZ());
-            if (float2 > 0.5f && this.random.nextFloat() * 30.0f < (float2 - 0.4f) * 2.0f && this.level.canSeeSky(fk3)) {
+            final BlockPos fu3 = (this.getVehicle() instanceof Boat) ? new BlockPos(this.getX(), (double)Math.round(this.getY()), this.getZ()).above() : new BlockPos(this.getX(), (double)Math.round(this.getY()), this.getZ());
+            if (float2 > 0.5f && this.random.nextFloat() * 30.0f < (float2 - 0.4f) * 2.0f && this.level.canSeeSky(fu3)) {
                 return true;
             }
         }
@@ -1224,17 +1364,19 @@ public abstract class Mob extends LivingEntity {
     }
     
     @Override
-    protected void jumpInLiquid(final net.minecraft.tags.Tag<Fluid> aaz) {
+    protected void jumpInLiquid(final net.minecraft.tags.Tag<Fluid> adf) {
         if (this.getNavigation().canFloat()) {
-            super.jumpInLiquid(aaz);
+            super.jumpInLiquid(adf);
         }
         else {
             this.setDeltaMovement(this.getDeltaMovement().add(0.0, 0.3, 0.0));
         }
     }
     
-    public boolean isHolding(final Item bei) {
-        return this.getMainHandItem().getItem() == bei || this.getOffhandItem().getItem() == bei;
+    @Override
+    protected void removeAfterChangingDimensions() {
+        super.removeAfterChangingDimensions();
+        this.dropLeash(true, false);
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/MobCategory.java b/src/net/minecraft/world/entity/MobCategory.java
index 8730931..2434fdf 100644
--- a/src/net/minecraft/world/entity/MobCategory.java
+++ b/src/net/minecraft/world/entity/MobCategory.java
@@ -1,34 +1,50 @@
 package net.minecraft.world.entity;
 
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.Arrays;
+import java.util.function.Function;
 import java.util.Map;
+import com.mojang.serialization.Codec;
+import net.minecraft.util.StringRepresentable;
 
-public enum MobCategory {
-    MONSTER("monster", 70, false, false), 
-    CREATURE("creature", 10, true, true), 
-    AMBIENT("ambient", 15, true, false), 
-    WATER_CREATURE("water_creature", 15, true, false), 
-    MISC("misc", 15, true, false);
+public enum MobCategory implements StringRepresentable {
+    MONSTER("monster", 70, false, false, 128), 
+    CREATURE("creature", 10, true, true, 128), 
+    AMBIENT("ambient", 15, true, false, 128), 
+    WATER_CREATURE("water_creature", 5, true, false, 128), 
+    WATER_AMBIENT("water_ambient", 20, true, false, 64), 
+    MISC("misc", -1, true, true, 128);
     
+    public static final Codec<MobCategory> CODEC;
     private static final Map<String, MobCategory> BY_NAME;
     private final int max;
     private final boolean isFriendly;
     private final boolean isPersistent;
     private final String name;
+    private final int noDespawnDistance = 32;
+    private final int despawnDistance;
     
-    private MobCategory(final String string3, final int integer4, final boolean boolean5, final boolean boolean6) {
+    private MobCategory(final String string3, final int integer4, final boolean boolean5, final boolean boolean6, final int integer7) {
         this.name = string3;
         this.max = integer4;
         this.isFriendly = boolean5;
         this.isPersistent = boolean6;
+        this.despawnDistance = integer7;
     }
     
     public String getName() {
         return this.name;
     }
     
+    @Override
+    public String getSerializedName() {
+        return this.name;
+    }
+    
+    public static MobCategory byName(final String string) {
+        return MobCategory.BY_NAME.get(string);
+    }
+    
     public int getMaxInstancesPerChunk() {
         return this.max;
     }
@@ -41,7 +57,16 @@ public enum MobCategory {
         return this.isPersistent;
     }
     
+    public int getDespawnDistance() {
+        return this.despawnDistance;
+    }
+    
+    public int getNoDespawnDistance() {
+        return 32;
+    }
+    
     static {
-        BY_NAME = Arrays.<MobCategory>stream(values()).collect(Collectors.toMap(MobCategory::getName, alb -> alb));
+        CODEC = StringRepresentable.<MobCategory>fromEnum(MobCategory::values, MobCategory::byName);
+        BY_NAME = Arrays.<MobCategory>stream(values()).collect(Collectors.toMap(MobCategory::getName, apa -> apa));
     }
 }
diff --git a/src/net/minecraft/world/entity/NeutralMob.java b/src/net/minecraft/world/entity/NeutralMob.java
new file mode 100644
index 0000000..be1867c
--- /dev/null
+++ b/src/net/minecraft/world/entity/NeutralMob.java
@@ -0,0 +1,112 @@
+package net.minecraft.world.entity;
+
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.Level;
+import java.util.Objects;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.nbt.CompoundTag;
+import javax.annotation.Nullable;
+import java.util.UUID;
+
+public interface NeutralMob {
+    int getRemainingPersistentAngerTime();
+    
+    void setRemainingPersistentAngerTime(final int integer);
+    
+    @Nullable
+    UUID getPersistentAngerTarget();
+    
+    void setPersistentAngerTarget(@Nullable final UUID uUID);
+    
+    void startPersistentAngerTimer();
+    
+    default void addPersistentAngerSaveData(final CompoundTag le) {
+        le.putInt("AngerTime", this.getRemainingPersistentAngerTime());
+        if (this.getPersistentAngerTarget() != null) {
+            le.putUUID("AngryAt", this.getPersistentAngerTarget());
+        }
+    }
+    
+    default void readPersistentAngerSaveData(final ServerLevel zd, final CompoundTag le) {
+        this.setRemainingPersistentAngerTime(le.getInt("AngerTime"));
+        if (!le.hasUUID("AngryAt")) {
+            this.setPersistentAngerTarget(null);
+            return;
+        }
+        final UUID uUID4 = le.getUUID("AngryAt");
+        this.setPersistentAngerTarget(uUID4);
+        final Entity aom5 = zd.getEntity(uUID4);
+        if (aom5 == null) {
+            return;
+        }
+        if (aom5 instanceof Mob) {
+            this.setLastHurtByMob((LivingEntity)aom5);
+        }
+        if (aom5.getType() == EntityType.PLAYER) {
+            this.setLastHurtByPlayer((Player)aom5);
+        }
+    }
+    
+    default void updatePersistentAnger(final ServerLevel zd, final boolean boolean2) {
+        final LivingEntity aoy4 = this.getTarget();
+        final UUID uUID5 = this.getPersistentAngerTarget();
+        if ((aoy4 == null || aoy4.isDeadOrDying()) && uUID5 != null && zd.getEntity(uUID5) instanceof Mob) {
+            this.stopBeingAngry();
+            return;
+        }
+        if (aoy4 != null && !Objects.equals(uUID5, aoy4.getUUID())) {
+            this.setPersistentAngerTarget(aoy4.getUUID());
+            this.startPersistentAngerTimer();
+        }
+        if (this.getRemainingPersistentAngerTime() > 0 && (aoy4 == null || aoy4.getType() != EntityType.PLAYER || !boolean2)) {
+            this.setRemainingPersistentAngerTime(this.getRemainingPersistentAngerTime() - 1);
+            if (this.getRemainingPersistentAngerTime() == 0) {
+                this.stopBeingAngry();
+            }
+        }
+    }
+    
+    default boolean isAngryAt(final LivingEntity aoy) {
+        return EntitySelector.ATTACK_ALLOWED.test(aoy) && ((aoy.getType() == EntityType.PLAYER && this.isAngryAtAllPlayers(aoy.level)) || aoy.getUUID().equals(this.getPersistentAngerTarget()));
+    }
+    
+    default boolean isAngryAtAllPlayers(final Level bqb) {
+        return bqb.getGameRules().getBoolean(GameRules.RULE_UNIVERSAL_ANGER) && this.isAngry() && this.getPersistentAngerTarget() == null;
+    }
+    
+    default boolean isAngry() {
+        return this.getRemainingPersistentAngerTime() > 0;
+    }
+    
+    default void playerDied(final Player bec) {
+        if (!bec.level.getGameRules().getBoolean(GameRules.RULE_FORGIVE_DEAD_PLAYERS)) {
+            return;
+        }
+        if (!bec.getUUID().equals(this.getPersistentAngerTarget())) {
+            return;
+        }
+        this.stopBeingAngry();
+    }
+    
+    default void forgetCurrentTargetAndRefreshUniversalAnger() {
+        this.stopBeingAngry();
+        this.startPersistentAngerTimer();
+    }
+    
+    default void stopBeingAngry() {
+        this.setLastHurtByMob(null);
+        this.setPersistentAngerTarget(null);
+        this.setTarget(null);
+        this.setRemainingPersistentAngerTime(0);
+    }
+    
+    void setLastHurtByMob(@Nullable final LivingEntity aoy);
+    
+    void setLastHurtByPlayer(@Nullable final Player bec);
+    
+    void setTarget(@Nullable final LivingEntity aoy);
+    
+    @Nullable
+    LivingEntity getTarget();
+}
diff --git a/src/net/minecraft/world/entity/PathfinderMob.java b/src/net/minecraft/world/entity/PathfinderMob.java
index 1a5bf39..54ef273 100644
--- a/src/net/minecraft/world/entity/PathfinderMob.java
+++ b/src/net/minecraft/world/entity/PathfinderMob.java
@@ -8,21 +8,21 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 
 public abstract class PathfinderMob extends Mob {
-    protected PathfinderMob(final EntityType<? extends PathfinderMob> aku, final Level bjw) {
-        super(aku, bjw);
+    protected PathfinderMob(final EntityType<? extends PathfinderMob> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public float getWalkTargetValue(final BlockPos fk) {
-        return this.getWalkTargetValue(fk, this.level);
+    public float getWalkTargetValue(final BlockPos fu) {
+        return this.getWalkTargetValue(fu, this.level);
     }
     
-    public float getWalkTargetValue(final BlockPos fk, final LevelReader bjz) {
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
         return 0.0f;
     }
     
     @Override
-    public boolean checkSpawnRules(final LevelAccessor bjx, final MobSpawnType alc) {
-        return this.getWalkTargetValue(new BlockPos(this), bjx) >= 0.0f;
+    public boolean checkSpawnRules(final LevelAccessor bqc, final MobSpawnType apb) {
+        return this.getWalkTargetValue(this.blockPosition(), bqc) >= 0.0f;
     }
     
     public boolean isPathFinding() {
@@ -32,11 +32,11 @@ public abstract class PathfinderMob extends Mob {
     @Override
     protected void tickLeash() {
         super.tickLeash();
-        final Entity akq2 = this.getLeashHolder();
-        if (akq2 != null && akq2.level == this.level) {
-            this.restrictTo(new BlockPos(akq2), 5);
-            final float float3 = this.distanceTo(akq2);
-            if (this instanceof TamableAnimal && ((TamableAnimal)this).isSitting()) {
+        final Entity aom2 = this.getLeashHolder();
+        if (aom2 != null && aom2.level == this.level) {
+            this.restrictTo(aom2.blockPosition(), 5);
+            final float float3 = this.distanceTo(aom2);
+            if (this instanceof TamableAnimal && ((TamableAnimal)this).isInSittingPose()) {
                 if (float3 > 10.0f) {
                     this.dropLeash(true, true);
                 }
@@ -48,16 +48,16 @@ public abstract class PathfinderMob extends Mob {
                 this.goalSelector.disableControlFlag(Goal.Flag.MOVE);
             }
             else if (float3 > 6.0f) {
-                final double double4 = (akq2.getX() - this.getX()) / float3;
-                final double double5 = (akq2.getY() - this.getY()) / float3;
-                final double double6 = (akq2.getZ() - this.getZ()) / float3;
+                final double double4 = (aom2.getX() - this.getX()) / float3;
+                final double double5 = (aom2.getY() - this.getY()) / float3;
+                final double double6 = (aom2.getZ() - this.getZ()) / float3;
                 this.setDeltaMovement(this.getDeltaMovement().add(Math.copySign(double4 * double4 * 0.4, double4), Math.copySign(double5 * double5 * 0.4, double5), Math.copySign(double6 * double6 * 0.4, double6)));
             }
             else {
                 this.goalSelector.enableControlFlag(Goal.Flag.MOVE);
                 final float float4 = 2.0f;
-                final Vec3 cvl5 = new Vec3(akq2.getX() - this.getX(), akq2.getY() - this.getY(), akq2.getZ() - this.getZ()).normalize().scale(Math.max(float3 - 2.0f, 0.0f));
-                this.getNavigation().moveTo(this.getX() + cvl5.x, this.getY() + cvl5.y, this.getZ() + cvl5.z, this.followLeashSpeed());
+                final Vec3 dem5 = new Vec3(aom2.getX() - this.getX(), aom2.getY() - this.getY(), aom2.getZ() - this.getZ()).normalize().scale(Math.max(float3 - 2.0f, 0.0f));
+                this.getNavigation().moveTo(this.getX() + dem5.x, this.getY() + dem5.y, this.getZ() + dem5.z, this.followLeashSpeed());
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/ReputationEventHandler.java b/src/net/minecraft/world/entity/ReputationEventHandler.java
index 42e7ea8..3395751 100644
--- a/src/net/minecraft/world/entity/ReputationEventHandler.java
+++ b/src/net/minecraft/world/entity/ReputationEventHandler.java
@@ -3,5 +3,5 @@ package net.minecraft.world.entity;
 import net.minecraft.world.entity.ai.village.ReputationEventType;
 
 public interface ReputationEventHandler {
-    void onReputationEventFrom(final ReputationEventType aso, final Entity akq);
+    void onReputationEventFrom(final ReputationEventType axw, final Entity aom);
 }
diff --git a/src/net/minecraft/world/entity/Saddleable.java b/src/net/minecraft/world/entity/Saddleable.java
new file mode 100644
index 0000000..5098e81
--- /dev/null
+++ b/src/net/minecraft/world/entity/Saddleable.java
@@ -0,0 +1,12 @@
+package net.minecraft.world.entity;
+
+import javax.annotation.Nullable;
+import net.minecraft.sounds.SoundSource;
+
+public interface Saddleable {
+    boolean isSaddleable();
+    
+    void equipSaddle(@Nullable final SoundSource acm);
+    
+    boolean isSaddled();
+}
diff --git a/src/net/minecraft/world/entity/Shearable.java b/src/net/minecraft/world/entity/Shearable.java
new file mode 100644
index 0000000..bb49efe
--- /dev/null
+++ b/src/net/minecraft/world/entity/Shearable.java
@@ -0,0 +1,9 @@
+package net.minecraft.world.entity;
+
+import net.minecraft.sounds.SoundSource;
+
+public interface Shearable {
+    void shear(final SoundSource acm);
+    
+    boolean readyForShearing();
+}
diff --git a/src/net/minecraft/world/entity/SpawnPlacements.java b/src/net/minecraft/world/entity/SpawnPlacements.java
index c807786..2a68d48 100644
--- a/src/net/minecraft/world/entity/SpawnPlacements.java
+++ b/src/net/minecraft/world/entity/SpawnPlacements.java
@@ -14,7 +14,7 @@ import net.minecraft.world.entity.monster.Evoker;
 import net.minecraft.world.entity.monster.ElderGuardian;
 import net.minecraft.world.entity.animal.Cat;
 import net.minecraft.world.entity.monster.ZombieVillager;
-import net.minecraft.world.entity.monster.PigZombie;
+import net.minecraft.world.entity.monster.ZombifiedPiglin;
 import net.minecraft.world.entity.animal.horse.ZombieHorse;
 import net.minecraft.world.entity.monster.Zombie;
 import net.minecraft.world.entity.animal.Wolf;
@@ -23,6 +23,7 @@ import net.minecraft.world.entity.boss.wither.WitherBoss;
 import net.minecraft.world.entity.monster.Witch;
 import net.minecraft.world.entity.npc.Villager;
 import net.minecraft.world.entity.animal.Turtle;
+import net.minecraft.world.entity.monster.Strider;
 import net.minecraft.world.entity.monster.Stray;
 import net.minecraft.world.entity.monster.Spider;
 import net.minecraft.world.entity.animal.SnowGolem;
@@ -35,6 +36,8 @@ import net.minecraft.world.entity.animal.Rabbit;
 import net.minecraft.world.entity.animal.PolarBear;
 import net.minecraft.world.entity.monster.Pillager;
 import net.minecraft.world.entity.monster.PatrollingMonster;
+import net.minecraft.world.entity.monster.piglin.Piglin;
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
 import net.minecraft.world.entity.animal.Pig;
 import net.minecraft.world.entity.animal.Parrot;
 import net.minecraft.world.entity.animal.Ocelot;
@@ -80,26 +83,26 @@ import java.util.Map;
 public class SpawnPlacements {
     private static final Map<EntityType<?>, Data> DATA_BY_TYPE;
     
-    private static <T extends Mob> void register(final EntityType<T> aku, final Type c, final Heightmap.Types a, final SpawnPredicate<T> b) {
-        final Data a2 = SpawnPlacements.DATA_BY_TYPE.put(aku, new Data(a, c, b));
+    private static <T extends Mob> void register(final EntityType<T> aoq, final Type c, final Heightmap.Types a, final SpawnPredicate<T> b) {
+        final Data a2 = SpawnPlacements.DATA_BY_TYPE.put(aoq, new Data(a, c, b));
         if (a2 != null) {
-            throw new IllegalStateException("Duplicate registration for type " + Registry.ENTITY_TYPE.getKey(aku));
+            throw new IllegalStateException("Duplicate registration for type " + Registry.ENTITY_TYPE.getKey(aoq));
         }
     }
     
-    public static Type getPlacementType(final EntityType<?> aku) {
-        final Data a2 = SpawnPlacements.DATA_BY_TYPE.get(aku);
+    public static Type getPlacementType(final EntityType<?> aoq) {
+        final Data a2 = SpawnPlacements.DATA_BY_TYPE.get(aoq);
         return (a2 == null) ? Type.NO_RESTRICTIONS : a2.placement;
     }
     
-    public static Heightmap.Types getHeightmapType(@Nullable final EntityType<?> aku) {
-        final Data a2 = SpawnPlacements.DATA_BY_TYPE.get(aku);
+    public static Heightmap.Types getHeightmapType(@Nullable final EntityType<?> aoq) {
+        final Data a2 = SpawnPlacements.DATA_BY_TYPE.get(aoq);
         return (a2 == null) ? Heightmap.Types.MOTION_BLOCKING_NO_LEAVES : a2.heightMap;
     }
     
-    public static <T extends Entity> boolean checkSpawnRules(final EntityType<T> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        final Data a6 = SpawnPlacements.DATA_BY_TYPE.get(aku);
-        return a6 == null || a6.predicate.test(aku, bjx, alc, fk, random);
+    public static <T extends Entity> boolean checkSpawnRules(final EntityType<T> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        final Data a6 = SpawnPlacements.DATA_BY_TYPE.get(aoq);
+        return a6 == null || a6.predicate.test(aoq, bqc, apb, fu, random);
     }
     
     static {
@@ -134,6 +137,8 @@ public class SpawnPlacements {
         SpawnPlacements.<Ocelot>register(EntityType.OCELOT, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING, Ocelot::checkOcelotSpawnRules);
         SpawnPlacements.<Parrot>register(EntityType.PARROT, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING, Parrot::checkParrotSpawnRules);
         SpawnPlacements.<Pig>register(EntityType.PIG, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Animal::checkAnimalSpawnRules);
+        SpawnPlacements.<Hoglin>register(EntityType.HOGLIN, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Hoglin::checkHoglinSpawnRules);
+        SpawnPlacements.<Piglin>register(EntityType.PIGLIN, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Piglin::checkPiglinSpawnRules);
         SpawnPlacements.<Pillager>register(EntityType.PILLAGER, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, PatrollingMonster::checkPatrollingMonsterSpawnRules);
         SpawnPlacements.<PolarBear>register(EntityType.POLAR_BEAR, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, PolarBear::checkPolarBearSpawnRules);
         SpawnPlacements.<Rabbit>register(EntityType.RABBIT, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Rabbit::checkRabbitSpawnRules);
@@ -145,6 +150,7 @@ public class SpawnPlacements {
         SpawnPlacements.<SnowGolem>register(EntityType.SNOW_GOLEM, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Mob::checkMobSpawnRules);
         SpawnPlacements.<Spider>register(EntityType.SPIDER, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Monster::checkMonsterSpawnRules);
         SpawnPlacements.<Stray>register(EntityType.STRAY, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Stray::checkStraySpawnRules);
+        SpawnPlacements.<Strider>register(EntityType.STRIDER, Type.IN_LAVA, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Strider::checkStriderSpawnRules);
         SpawnPlacements.<Turtle>register(EntityType.TURTLE, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Turtle::checkTurtleSpawnRules);
         SpawnPlacements.<Villager>register(EntityType.VILLAGER, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Mob::checkMobSpawnRules);
         SpawnPlacements.<Witch>register(EntityType.WITCH, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Monster::checkMonsterSpawnRules);
@@ -153,7 +159,7 @@ public class SpawnPlacements {
         SpawnPlacements.<Wolf>register(EntityType.WOLF, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Animal::checkAnimalSpawnRules);
         SpawnPlacements.<Zombie>register(EntityType.ZOMBIE, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Monster::checkMonsterSpawnRules);
         SpawnPlacements.<ZombieHorse>register(EntityType.ZOMBIE_HORSE, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Animal::checkAnimalSpawnRules);
-        SpawnPlacements.<PigZombie>register(EntityType.ZOMBIE_PIGMAN, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, PigZombie::checkPigZombieSpawnRules);
+        SpawnPlacements.<ZombifiedPiglin>register(EntityType.ZOMBIFIED_PIGLIN, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, ZombifiedPiglin::checkZombifiedPiglinSpawnRules);
         SpawnPlacements.<ZombieVillager>register(EntityType.ZOMBIE_VILLAGER, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Monster::checkMonsterSpawnRules);
         SpawnPlacements.<Cat>register(EntityType.CAT, Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Animal::checkAnimalSpawnRules);
         SpawnPlacements.<ElderGuardian>register(EntityType.ELDER_GUARDIAN, Type.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Guardian::checkGuardianSpawnRules);
@@ -185,11 +191,12 @@ public class SpawnPlacements {
     public enum Type {
         ON_GROUND, 
         IN_WATER, 
-        NO_RESTRICTIONS;
+        NO_RESTRICTIONS, 
+        IN_LAVA;
     }
     
     @FunctionalInterface
     public interface SpawnPredicate<T extends Entity> {
-        boolean test(final EntityType<T> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random);
+        boolean test(final EntityType<T> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random);
     }
 }
diff --git a/src/net/minecraft/world/entity/TamableAnimal.java b/src/net/minecraft/world/entity/TamableAnimal.java
index 80b3231..e804f32 100644
--- a/src/net/minecraft/world/entity/TamableAnimal.java
+++ b/src/net/minecraft/world/entity/TamableAnimal.java
@@ -2,6 +2,7 @@ package net.minecraft.world.entity;
 
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.Util;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.scores.Team;
@@ -14,7 +15,6 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.server.players.OldUsersConverter;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.entity.ai.goal.SitGoal;
 import java.util.UUID;
 import java.util.Optional;
 import net.minecraft.network.syncher.EntityDataAccessor;
@@ -23,10 +23,10 @@ import net.minecraft.world.entity.animal.Animal;
 public abstract class TamableAnimal extends Animal {
     protected static final EntityDataAccessor<Byte> DATA_FLAGS_ID;
     protected static final EntityDataAccessor<Optional<UUID>> DATA_OWNERUUID_ID;
-    protected SitGoal sitGoal;
+    private boolean orderedToSit;
     
-    protected TamableAnimal(final EntityType<? extends TamableAnimal> aku, final Level bjw) {
-        super(aku, bjw);
+    protected TamableAnimal(final EntityType<? extends TamableAnimal> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.reassessTameGoals();
     }
     
@@ -38,58 +38,52 @@ public abstract class TamableAnimal extends Animal {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        if (this.getOwnerUUID() == null) {
-            jt.putString("OwnerUUID", "");
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        if (this.getOwnerUUID() != null) {
+            le.putUUID("Owner", this.getOwnerUUID());
         }
-        else {
-            jt.putString("OwnerUUID", this.getOwnerUUID().toString());
-        }
-        jt.putBoolean("Sitting", this.isSitting());
+        le.putBoolean("Sitting", this.orderedToSit);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        String string3;
-        if (jt.contains("OwnerUUID", 8)) {
-            string3 = jt.getString("OwnerUUID");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        UUID uUID3;
+        if (le.hasUUID("Owner")) {
+            uUID3 = le.getUUID("Owner");
         }
         else {
-            final String string4 = jt.getString("Owner");
-            string3 = OldUsersConverter.convertMobOwnerIfNecessary(this.getServer(), string4);
+            final String string4 = le.getString("Owner");
+            uUID3 = OldUsersConverter.convertMobOwnerIfNecessary(this.getServer(), string4);
         }
-        if (!string3.isEmpty()) {
+        if (uUID3 != null) {
             try {
-                this.setOwnerUUID(UUID.fromString(string3));
+                this.setOwnerUUID(uUID3);
                 this.setTame(true);
             }
             catch (Throwable throwable4) {
                 this.setTame(false);
             }
         }
-        if (this.sitGoal != null) {
-            this.sitGoal.wantToSit(jt.getBoolean("Sitting"));
-        }
-        this.setSitting(jt.getBoolean("Sitting"));
+        this.setInSittingPose(this.orderedToSit = le.getBoolean("Sitting"));
     }
     
     @Override
-    public boolean canBeLeashed(final Player ayj) {
+    public boolean canBeLeashed(final Player bec) {
         return !this.isLeashed();
     }
     
     protected void spawnTamingParticles(final boolean boolean1) {
-        ParticleOptions gt3 = ParticleTypes.HEART;
+        ParticleOptions hf3 = ParticleTypes.HEART;
         if (!boolean1) {
-            gt3 = ParticleTypes.SMOKE;
+            hf3 = ParticleTypes.SMOKE;
         }
         for (int integer4 = 0; integer4 < 7; ++integer4) {
             final double double5 = this.random.nextGaussian() * 0.02;
             final double double6 = this.random.nextGaussian() * 0.02;
             final double double7 = this.random.nextGaussian() * 0.02;
-            this.level.addParticle(gt3, this.getRandomX(1.0), this.getRandomY() + 0.5, this.getRandomZ(1.0), double5, double6, double7);
+            this.level.addParticle(hf3, this.getRandomX(1.0), this.getRandomY() + 0.5, this.getRandomZ(1.0), double5, double6, double7);
         }
     }
     
@@ -124,11 +118,11 @@ public abstract class TamableAnimal extends Animal {
     protected void reassessTameGoals() {
     }
     
-    public boolean isSitting() {
+    public boolean isInSittingPose() {
         return (this.entityData.<Byte>get(TamableAnimal.DATA_FLAGS_ID) & 0x1) != 0x0;
     }
     
-    public void setSitting(final boolean boolean1) {
+    public void setInSittingPose(final boolean boolean1) {
         final byte byte3 = this.entityData.<Byte>get(TamableAnimal.DATA_FLAGS_ID);
         if (boolean1) {
             this.entityData.<Byte>set(TamableAnimal.DATA_FLAGS_ID, (byte)(byte3 | 0x1));
@@ -147,11 +141,11 @@ public abstract class TamableAnimal extends Animal {
         this.entityData.<Optional<UUID>>set(TamableAnimal.DATA_OWNERUUID_ID, Optional.<UUID>ofNullable(uUID));
     }
     
-    public void tame(final Player ayj) {
+    public void tame(final Player bec) {
         this.setTame(true);
-        this.setOwnerUUID(ayj.getUUID());
-        if (ayj instanceof ServerPlayer) {
-            CriteriaTriggers.TAME_ANIMAL.trigger((ServerPlayer)ayj, this);
+        this.setOwnerUUID(bec.getUUID());
+        if (bec instanceof ServerPlayer) {
+            CriteriaTriggers.TAME_ANIMAL.trigger((ServerPlayer)bec, this);
         }
     }
     
@@ -170,53 +164,57 @@ public abstract class TamableAnimal extends Animal {
     }
     
     @Override
-    public boolean canAttack(final LivingEntity akz) {
-        return !this.isOwnedBy(akz) && super.canAttack(akz);
+    public boolean canAttack(final LivingEntity aoy) {
+        return !this.isOwnedBy(aoy) && super.canAttack(aoy);
     }
     
-    public boolean isOwnedBy(final LivingEntity akz) {
-        return akz == this.getOwner();
+    public boolean isOwnedBy(final LivingEntity aoy) {
+        return aoy == this.getOwner();
     }
     
-    public SitGoal getSitGoal() {
-        return this.sitGoal;
-    }
-    
-    public boolean wantsToAttack(final LivingEntity akz1, final LivingEntity akz2) {
+    public boolean wantsToAttack(final LivingEntity aoy1, final LivingEntity aoy2) {
         return true;
     }
     
     @Override
     public Team getTeam() {
         if (this.isTame()) {
-            final LivingEntity akz2 = this.getOwner();
-            if (akz2 != null) {
-                return akz2.getTeam();
+            final LivingEntity aoy2 = this.getOwner();
+            if (aoy2 != null) {
+                return aoy2.getTeam();
             }
         }
         return super.getTeam();
     }
     
     @Override
-    public boolean isAlliedTo(final Entity akq) {
+    public boolean isAlliedTo(final Entity aom) {
         if (this.isTame()) {
-            final LivingEntity akz3 = this.getOwner();
-            if (akq == akz3) {
+            final LivingEntity aoy3 = this.getOwner();
+            if (aom == aoy3) {
                 return true;
             }
-            if (akz3 != null) {
-                return akz3.isAlliedTo(akq);
+            if (aoy3 != null) {
+                return aoy3.isAlliedTo(aom);
             }
         }
-        return super.isAlliedTo(akq);
+        return super.isAlliedTo(aom);
     }
     
     @Override
-    public void die(final DamageSource ajz) {
+    public void die(final DamageSource anw) {
         if (!this.level.isClientSide && this.level.getGameRules().getBoolean(GameRules.RULE_SHOWDEATHMESSAGES) && this.getOwner() instanceof ServerPlayer) {
-            this.getOwner().sendMessage(this.getCombatTracker().getDeathMessage());
+            this.getOwner().sendMessage(this.getCombatTracker().getDeathMessage(), Util.NIL_UUID);
         }
-        super.die(ajz);
+        super.die(anw);
+    }
+    
+    public boolean isOrderedToSit() {
+        return this.orderedToSit;
+    }
+    
+    public void setOrderedToSit(final boolean boolean1) {
+        this.orderedToSit = boolean1;
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/ai/Brain.java b/src/net/minecraft/world/entity/ai/Brain.java
index 025cdd1..6be386e 100644
--- a/src/net/minecraft/world/entity/ai/Brain.java
+++ b/src/net/minecraft/world/entity/ai/Brain.java
@@ -1,23 +1,30 @@
 package net.minecraft.world.entity.ai;
 
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Collectors;
+import com.mojang.serialization.Dynamic;
+import org.apache.logging.log4j.LogManager;
 import net.minecraft.server.level.ServerLevel;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtOps;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableList;
-import java.util.stream.Stream;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import java.util.List;
 import javax.annotation.Nullable;
-import java.util.function.Supplier;
+import com.google.common.collect.UnmodifiableIterator;
 import java.util.Iterator;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.core.Registry;
-import java.util.function.Function;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Maps;
-import com.mojang.datafixers.Dynamic;
+import net.minecraft.resources.ResourceLocation;
+import com.mojang.serialization.RecordBuilder;
+import java.util.function.Function;
+import java.util.function.Consumer;
+import java.util.function.BiFunction;
+import com.google.common.collect.ImmutableList;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.MapLike;
+import net.minecraft.Util;
+import net.minecraft.core.Registry;
+import java.util.stream.Stream;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.MapCodec;
+import org.apache.commons.lang3.mutable.MutableObject;
 import java.util.Collection;
 import net.minecraft.world.entity.ai.memory.MemoryStatus;
 import com.mojang.datafixers.util.Pair;
@@ -27,94 +34,153 @@ import java.util.Set;
 import net.minecraft.world.entity.schedule.Activity;
 import net.minecraft.world.entity.ai.sensing.Sensor;
 import net.minecraft.world.entity.ai.sensing.SensorType;
+import net.minecraft.world.entity.ai.memory.ExpirableValue;
 import java.util.Optional;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import java.util.Map;
-import net.minecraft.util.Serializable;
+import com.mojang.serialization.Codec;
+import java.util.function.Supplier;
+import org.apache.logging.log4j.Logger;
 import net.minecraft.world.entity.LivingEntity;
 
-public class Brain<E extends LivingEntity> implements Serializable {
-    private final Map<MemoryModuleType<?>, Optional<?>> memories;
+public class Brain<E extends LivingEntity> {
+    private static final Logger LOGGER;
+    private final Supplier<Codec<Brain<E>>> codec;
+    private final Map<MemoryModuleType<?>, Optional<? extends ExpirableValue<?>>> memories;
     private final Map<SensorType<? extends Sensor<? super E>>, Sensor<? super E>> sensors;
-    private final Map<Integer, Map<Activity, Set<Behavior<? super E>>>> availableGoalsByPriority;
+    private final Map<Integer, Map<Activity, Set<Behavior<? super E>>>> availableBehaviorsByPriority;
     private Schedule schedule;
     private final Map<Activity, Set<Pair<MemoryModuleType<?>, MemoryStatus>>> activityRequirements;
+    private final Map<Activity, Set<MemoryModuleType<?>>> activityMemoriesToEraseWhenStopped;
     private Set<Activity> coreActivities;
     private final Set<Activity> activeActivities;
     private Activity defaultActivity;
     private long lastScheduleUpdate;
     
-    public <T> Brain(final Collection<MemoryModuleType<?>> collection1, final Collection<SensorType<? extends Sensor<? super E>>> collection2, final Dynamic<T> dynamic) {
+    public static <E extends LivingEntity> Provider<E> provider(final Collection<? extends MemoryModuleType<?>> collection1, final Collection<? extends SensorType<? extends Sensor<? super E>>> collection2) {
+        return new Provider<E>((Collection)collection1, (Collection)collection2);
+    }
+    
+    public static <E extends LivingEntity> Codec<Brain<E>> codec(final Collection<? extends MemoryModuleType<?>> collection1, final Collection<? extends SensorType<? extends Sensor<? super E>>> collection2) {
+        final MutableObject<Codec<Brain<E>>> mutableObject3 = (MutableObject<Codec<Brain<E>>>)new MutableObject();
+        mutableObject3.setValue(new MapCodec<Brain<E>>() {
+            public <T> Stream<T> keys(final DynamicOps<T> dynamicOps) {
+                return collection1.stream().flatMap(awp -> Util.toStream(awp.getCodec().map(codec -> Registry.MEMORY_MODULE_TYPE.getKey(awp)))).<T>map(uh -> dynamicOps.createString(uh.toString()));
+            }
+            
+            public <T> DataResult<Brain<E>> decode(final DynamicOps<T> dynamicOps, final MapLike<T> mapLike) {
+                final MutableObject<DataResult<ImmutableList.Builder<MemoryValue<?>>>> mutableObject4 = (MutableObject<DataResult<ImmutableList.Builder<MemoryValue<?>>>>)new MutableObject((Object)DataResult.success((Object)ImmutableList.builder()));
+                final DataResult<MemoryModuleType<?>> dataResult5;
+                final DataResult<? extends MemoryValue<?>> dataResult6;
+                final MutableObject mutableObject5;
+                mapLike.entries().forEach(pair -> {
+                    dataResult5 = (DataResult<MemoryModuleType<?>>)Registry.MEMORY_MODULE_TYPE.parse((DynamicOps)dynamicOps, pair.getFirst());
+                    dataResult6 = dataResult5.flatMap(awp -> this.captureRead(awp, (com.mojang.serialization.DynamicOps<Object>)dynamicOps, pair.getSecond()));
+                    mutableObject5.setValue((Object)((DataResult)mutableObject5.getValue()).apply2((BiFunction)ImmutableList.Builder::add, (DataResult)dataResult6));
+                    return;
+                });
+                final ImmutableList<MemoryValue<?>> immutableList5 = ((DataResult)mutableObject4.getValue()).resultOrPartial((Consumer)Brain.LOGGER::error).<ImmutableList<MemoryValue<?>>>map(ImmutableList.Builder::build).orElseGet(ImmutableList::of);
+                return (DataResult<Brain<E>>)DataResult.success((Object)new Brain(collection1, collection2, immutableList5, mutableObject3::getValue));
+            }
+            
+            private <T, U> DataResult<MemoryValue<U>> captureRead(final MemoryModuleType<U> awp, final DynamicOps<T> dynamicOps, final T object) {
+                return (DataResult<MemoryValue<U>>)awp.getCodec().<DataResult>map(DataResult::success).orElseGet(() -> DataResult.error("No codec for memory: " + awp)).flatMap(codec -> codec.parse((DynamicOps)dynamicOps, (Object)object)).map(awo -> new MemoryValue((MemoryModuleType)awp, (Optional)Optional.<ExpirableValue>of(awo)));
+            }
+            
+            public <T> RecordBuilder<T> encode(final Brain<E> apr, final DynamicOps<T> dynamicOps, final RecordBuilder<T> recordBuilder) {
+                ((Brain<LivingEntity>)apr).memories().forEach(a -> a.<T>serialize(dynamicOps, recordBuilder));
+                return recordBuilder;
+            }
+        }.fieldOf("memories").codec());
+        return (Codec<Brain<E>>)mutableObject3.getValue();
+    }
+    
+    public Brain(final Collection<? extends MemoryModuleType<?>> collection1, final Collection<? extends SensorType<? extends Sensor<? super E>>> collection2, final ImmutableList<MemoryValue<?>> immutableList, final Supplier<Codec<Brain<E>>> supplier) {
         this.memories = Maps.newHashMap();
         this.sensors = Maps.newLinkedHashMap();
-        this.availableGoalsByPriority = Maps.newTreeMap();
+        this.availableBehaviorsByPriority = Maps.newTreeMap();
         this.schedule = Schedule.EMPTY;
         this.activityRequirements = Maps.newHashMap();
+        this.activityMemoriesToEraseWhenStopped = Maps.newHashMap();
         this.coreActivities = Sets.newHashSet();
         this.activeActivities = Sets.newHashSet();
         this.defaultActivity = Activity.IDLE;
         this.lastScheduleUpdate = -9999L;
-        final Optional<?> optional;
-        collection1.forEach(arl -> optional = this.memories.put(arl, Optional.empty()));
-        final Sensor<? super E> sensor;
-        collection2.forEach(asg -> sensor = this.sensors.put(asg, asg.create()));
-        final Iterator<MemoryModuleType<?>> iterator;
-        MemoryModuleType<?> arl2;
-        this.sensors.values().forEach(asf -> {
-            asf.requires().iterator();
-            while (iterator.hasNext()) {
-                arl2 = iterator.next();
-                this.memories.put(arl2, Optional.empty());
+        this.codec = supplier;
+        for (final MemoryModuleType<?> awp7 : collection1) {
+            this.memories.put(awp7, Optional.empty());
+        }
+        for (final SensorType<? extends Sensor<? super E>> axo7 : collection2) {
+            this.sensors.put(axo7, axo7.create());
+        }
+        for (final Sensor<? super E> axn7 : this.sensors.values()) {
+            for (final MemoryModuleType<?> awp8 : axn7.requires()) {
+                this.memories.put(awp8, Optional.empty());
             }
-            return;
-        });
-        for (final Map.Entry<Dynamic<T>, Dynamic<T>> entry6 : dynamic.get("memories").asMap((Function)Function.identity(), (Function)Function.identity()).entrySet()) {
-            this.<T, Object>readMemory(Registry.MEMORY_MODULE_TYPE.get(new ResourceLocation(entry6.getKey().asString(""))), entry6.getValue());
+        }
+        for (final MemoryValue<?> a7 : immutableList) {
+            ((MemoryValue<Object>)a7).setMemoryInternal(this);
         }
     }
     
-    public boolean hasMemoryValue(final MemoryModuleType<?> arl) {
-        return this.checkMemory(arl, MemoryStatus.VALUE_PRESENT);
+    public <T> DataResult<T> serializeStart(final DynamicOps<T> dynamicOps) {
+        return (DataResult<T>)this.codec.get().encodeStart((DynamicOps)dynamicOps, this);
     }
     
-    private <T, U> void readMemory(final MemoryModuleType<U> arl, final Dynamic<T> dynamic) {
-        this.<U>setMemory(arl, arl.getDeserializer().<Throwable>orElseThrow(RuntimeException::new).apply(dynamic));
+    private Stream<MemoryValue<?>> memories() {
+        return this.memories.entrySet().stream().<MemoryValue<?>>map(entry -> MemoryValue.createUnchecked((MemoryModuleType<Object>)entry.getKey(), (Optional)entry.getValue()));
     }
     
-    public <U> void eraseMemory(final MemoryModuleType<U> arl) {
-        this.<U>setMemory(arl, Optional.<U>empty());
+    public boolean hasMemoryValue(final MemoryModuleType<?> awp) {
+        return this.checkMemory(awp, MemoryStatus.VALUE_PRESENT);
     }
     
-    public <U> void setMemory(final MemoryModuleType<U> arl, @Nullable final U object) {
-        this.<U>setMemory(arl, Optional.ofNullable((U)object));
+    public <U> void eraseMemory(final MemoryModuleType<U> awp) {
+        this.<U>setMemory(awp, Optional.empty());
     }
     
-    public <U> void setMemory(final MemoryModuleType<U> arl, final Optional<U> optional) {
-        if (this.memories.containsKey(arl)) {
-            if (optional.isPresent() && this.isEmptyCollection(optional.get())) {
-                this.<U>eraseMemory(arl);
+    public <U> void setMemory(final MemoryModuleType<U> awp, @Nullable final U object) {
+        this.<U>setMemory(awp, Optional.ofNullable((U)object));
+    }
+    
+    public <U> void setMemoryWithExpiry(final MemoryModuleType<U> awp, final U object, final long long3) {
+        this.<U>setMemoryInternal(awp, Optional.of(ExpirableValue.<U>of(object, long3)));
+    }
+    
+    public <U> void setMemory(final MemoryModuleType<U> awp, final Optional<? extends U> optional) {
+        this.setMemoryInternal((MemoryModuleType<Object>)awp, optional.map(ExpirableValue::of));
+    }
+    
+    private <U> void setMemoryInternal(final MemoryModuleType<U> awp, final Optional<? extends ExpirableValue<?>> optional) {
+        if (this.memories.containsKey(awp)) {
+            if (optional.isPresent() && this.isEmptyCollection(((ExpirableValue)optional.get()).getValue())) {
+                this.<U>eraseMemory(awp);
             }
             else {
-                this.memories.put(arl, optional);
+                this.memories.put(awp, optional);
             }
         }
     }
     
-    public <U> Optional<U> getMemory(final MemoryModuleType<U> arl) {
-        return (Optional<U>)this.memories.get(arl);
+    public <U> Optional<U> getMemory(final MemoryModuleType<U> awp) {
+        return this.memories.get(awp).<U>map(ExpirableValue::getValue);
     }
     
-    public boolean checkMemory(final MemoryModuleType<?> arl, final MemoryStatus arm) {
-        final Optional<?> optional4 = this.memories.get(arl);
-        return optional4 != null && (arm == MemoryStatus.REGISTERED || (arm == MemoryStatus.VALUE_PRESENT && optional4.isPresent()) || (arm == MemoryStatus.VALUE_ABSENT && !optional4.isPresent()));
+    public <U> boolean isMemoryValue(final MemoryModuleType<U> awp, final U object) {
+        return this.hasMemoryValue(awp) && this.<U>getMemory(awp).filter(object2 -> object2.equals(object)).isPresent();
+    }
+    
+    public boolean checkMemory(final MemoryModuleType<?> awp, final MemoryStatus awq) {
+        final Optional<? extends ExpirableValue<?>> optional4 = this.memories.get(awp);
+        return optional4 != null && (awq == MemoryStatus.REGISTERED || (awq == MemoryStatus.VALUE_PRESENT && optional4.isPresent()) || (awq == MemoryStatus.VALUE_ABSENT && !optional4.isPresent()));
     }
     
     public Schedule getSchedule() {
         return this.schedule;
     }
     
-    public void setSchedule(final Schedule azt) {
-        this.schedule = azt;
+    public void setSchedule(final Schedule bfn) {
+        this.schedule = bfn;
     }
     
     public void setCoreActivities(final Set<Activity> set) {
@@ -122,93 +188,255 @@ public class Brain<E extends LivingEntity> implements Serializable {
     }
     
     @Deprecated
-    public Stream<Behavior<? super E>> getRunningBehaviorsStream() {
-        return this.availableGoalsByPriority.values().stream().flatMap(map -> map.values().stream()).<Behavior<? super E>>flatMap(Collection::stream).filter(amb -> amb.getStatus() == Behavior.Status.RUNNING);
+    public List<Behavior<? super E>> getRunningBehaviors() {
+        final List<Behavior<? super E>> list2 = (List<Behavior<? super E>>)new ObjectArrayList();
+        for (final Map<Activity, Set<Behavior<? super E>>> map4 : this.availableBehaviorsByPriority.values()) {
+            for (final Set<Behavior<? super E>> set6 : map4.values()) {
+                for (final Behavior<? super E> aqh8 : set6) {
+                    if (aqh8.getStatus() == Behavior.Status.RUNNING) {
+                        list2.add(aqh8);
+                    }
+                }
+            }
+        }
+        return list2;
     }
     
-    public void setActivity(final Activity azr) {
+    public void useDefaultActivity() {
+        this.setActiveActivity(this.defaultActivity);
+    }
+    
+    public Optional<Activity> getActiveNonCoreActivity() {
+        for (final Activity bfl3 : this.activeActivities) {
+            if (!this.coreActivities.contains(bfl3)) {
+                return Optional.<Activity>of(bfl3);
+            }
+        }
+        return Optional.<Activity>empty();
+    }
+    
+    public void setActiveActivityIfPossible(final Activity bfl) {
+        if (this.activityRequirementsAreMet(bfl)) {
+            this.setActiveActivity(bfl);
+        }
+        else {
+            this.useDefaultActivity();
+        }
+    }
+    
+    private void setActiveActivity(final Activity bfl) {
+        if (this.isActive(bfl)) {
+            return;
+        }
+        this.eraseMemoriesForOtherActivitesThan(bfl);
         this.activeActivities.clear();
         this.activeActivities.addAll(this.coreActivities);
-        final boolean boolean3 = this.activityRequirements.keySet().contains(azr) && this.activityRequirementsAreMet(azr);
-        this.activeActivities.add(boolean3 ? azr : this.defaultActivity);
+        this.activeActivities.add(bfl);
     }
     
-    public void updateActivity(final long long1, final long long2) {
-        if (long2 - this.lastScheduleUpdate > 20L) {
-            this.lastScheduleUpdate = long2;
-            final Activity azr6 = this.getSchedule().getActivityAt((int)(long1 % 24000L));
-            if (!this.activeActivities.contains(azr6)) {
-                this.setActivity(azr6);
+    private void eraseMemoriesForOtherActivitesThan(final Activity bfl) {
+        for (final Activity bfl2 : this.activeActivities) {
+            if (bfl2 != bfl) {
+                final Set<MemoryModuleType<?>> set5 = this.activityMemoriesToEraseWhenStopped.get(bfl2);
+                if (set5 == null) {
+                    continue;
+                }
+                for (final MemoryModuleType<?> awp7 : set5) {
+                    this.eraseMemory(awp7);
+                }
             }
         }
     }
     
-    public void setDefaultActivity(final Activity azr) {
-        this.defaultActivity = azr;
+    public void updateActivityFromSchedule(final long long1, final long long2) {
+        if (long2 - this.lastScheduleUpdate > 20L) {
+            this.lastScheduleUpdate = long2;
+            final Activity bfl6 = this.getSchedule().getActivityAt((int)(long1 % 24000L));
+            if (!this.activeActivities.contains(bfl6)) {
+                this.setActiveActivityIfPossible(bfl6);
+            }
+        }
     }
     
-    public void addActivity(final Activity azr, final ImmutableList<Pair<Integer, ? extends Behavior<? super E>>> immutableList) {
-        this.addActivity(azr, immutableList, ImmutableSet.of());
+    public void setActiveActivityToFirstValid(final List<Activity> list) {
+        for (final Activity bfl4 : list) {
+            if (this.activityRequirementsAreMet(bfl4)) {
+                this.setActiveActivity(bfl4);
+                break;
+            }
+        }
     }
     
-    public void addActivity(final Activity azr, final ImmutableList<Pair<Integer, ? extends Behavior<? super E>>> immutableList, final Set<Pair<MemoryModuleType<?>, MemoryStatus>> set) {
-        this.activityRequirements.put(azr, set);
-        immutableList.forEach(pair -> this.availableGoalsByPriority.computeIfAbsent((Integer)pair.getFirst(), integer -> Maps.newHashMap()).computeIfAbsent(azr, azr -> Sets.newLinkedHashSet()).add(pair.getSecond()));
+    public void setDefaultActivity(final Activity bfl) {
+        this.defaultActivity = bfl;
     }
     
-    public boolean isActive(final Activity azr) {
-        return this.activeActivities.contains(azr);
+    public void addActivity(final Activity bfl, final int integer, final ImmutableList<? extends Behavior<? super E>> immutableList) {
+        this.addActivity(bfl, this.createPriorityPairs(integer, immutableList));
     }
     
-    public Brain<E> copyWithoutGoals() {
-        final Brain<E> alp2 = new Brain<E>(this.memories.keySet(), this.sensors.keySet(), (Dynamic<T>)new Dynamic((DynamicOps)NbtOps.INSTANCE, new CompoundTag()));
-        final Optional<?> optional2;
-        this.memories.forEach((arl, optional) -> optional.ifPresent(object -> optional2 = alp2.memories.put(arl, Optional.of(object))));
-        return alp2;
+    public void addActivityAndRemoveMemoryWhenStopped(final Activity bfl, final int integer, final ImmutableList<? extends Behavior<? super E>> immutableList, final MemoryModuleType<?> awp) {
+        final Set<Pair<MemoryModuleType<?>, MemoryStatus>> set6 = ImmutableSet.of(Pair.of(awp, MemoryStatus.VALUE_PRESENT));
+        final Set<MemoryModuleType<?>> set7 = ImmutableSet.<MemoryModuleType<?>>of(awp);
+        this.addActivityAndRemoveMemoriesWhenStopped(bfl, this.createPriorityPairs(integer, immutableList), set6, set7);
     }
     
-    public void tick(final ServerLevel xd, final E akz) {
-        this.tickEachSensor(xd, akz);
-        this.startEachNonRunningBehavior(xd, akz);
-        this.tickEachRunningBehavior(xd, akz);
+    public void addActivity(final Activity bfl, final ImmutableList<? extends Pair<Integer, ? extends Behavior<? super E>>> immutableList) {
+        this.addActivityAndRemoveMemoriesWhenStopped(bfl, immutableList, ImmutableSet.of(), Sets.newHashSet());
     }
     
-    public void stopAll(final ServerLevel xd, final E akz) {
-        final long long4 = akz.level.getGameTime();
-        this.getRunningBehaviorsStream().forEach(amb -> amb.doStop(xd, akz, long4));
+    public void addActivityWithConditions(final Activity bfl, final ImmutableList<? extends Pair<Integer, ? extends Behavior<? super E>>> immutableList, final Set<Pair<MemoryModuleType<?>, MemoryStatus>> set) {
+        this.addActivityAndRemoveMemoriesWhenStopped(bfl, immutableList, set, Sets.newHashSet());
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        final T object3 = (T)dynamicOps.createMap((Map)this.memories.entrySet().stream().filter(entry -> entry.getKey().getDeserializer().isPresent() && ((Optional)entry.getValue()).isPresent()).map(entry -> Pair.of(dynamicOps.createString(Registry.MEMORY_MODULE_TYPE.getKey(entry.getKey()).toString()), ((Serializable)((Optional)entry.getValue()).get()).<T>serialize(dynamicOps))).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)));
-        return (T)dynamicOps.createMap((Map)ImmutableMap.<Object, T>of(dynamicOps.createString("memories"), object3));
+    private void addActivityAndRemoveMemoriesWhenStopped(final Activity bfl, final ImmutableList<? extends Pair<Integer, ? extends Behavior<? super E>>> immutableList, final Set<Pair<MemoryModuleType<?>, MemoryStatus>> set3, final Set<MemoryModuleType<?>> set4) {
+        this.activityRequirements.put(bfl, set3);
+        if (!set4.isEmpty()) {
+            this.activityMemoriesToEraseWhenStopped.put(bfl, set4);
+        }
+        for (final Pair<Integer, ? extends Behavior<? super E>> pair7 : immutableList) {
+            this.availableBehaviorsByPriority.computeIfAbsent((Integer)pair7.getFirst(), integer -> Maps.newHashMap()).computeIfAbsent(bfl, bfl -> Sets.newLinkedHashSet()).add(pair7.getSecond());
+        }
     }
     
-    private void tickEachSensor(final ServerLevel xd, final E akz) {
-        this.sensors.values().forEach(asf -> asf.tick(xd, akz));
+    public boolean isActive(final Activity bfl) {
+        return this.activeActivities.contains(bfl);
     }
     
-    private void startEachNonRunningBehavior(final ServerLevel xd, final E akz) {
-        final long long4 = xd.getGameTime();
-        this.availableGoalsByPriority.values().stream().flatMap(map -> map.entrySet().stream()).filter(entry -> this.activeActivities.contains(entry.getKey())).map(Map.Entry::getValue).flatMap(Collection::stream).filter(amb -> amb.getStatus() == Behavior.Status.STOPPED).forEach(amb -> amb.tryStart(xd, akz, long4));
+    public Brain<E> copyWithoutBehaviors() {
+        final Brain<E> apr2 = new Brain<E>(this.memories.keySet(), this.sensors.keySet(), ImmutableList.<MemoryValue<?>>of(), this.codec);
+        for (final Map.Entry<MemoryModuleType<?>, Optional<? extends ExpirableValue<?>>> entry4 : this.memories.entrySet()) {
+            final MemoryModuleType<?> awp5 = entry4.getKey();
+            if (entry4.getValue().isPresent()) {
+                apr2.memories.put(awp5, entry4.getValue());
+            }
+        }
+        return apr2;
     }
     
-    private void tickEachRunningBehavior(final ServerLevel xd, final E akz) {
-        final long long4 = xd.getGameTime();
-        this.getRunningBehaviorsStream().forEach(amb -> amb.tickOrStop(xd, akz, long4));
+    public void tick(final ServerLevel zd, final E aoy) {
+        this.forgetOutdatedMemories();
+        this.tickSensors(zd, aoy);
+        this.startEachNonRunningBehavior(zd, aoy);
+        this.tickEachRunningBehavior(zd, aoy);
     }
     
-    private boolean activityRequirementsAreMet(final Activity azr) {
-        final MemoryModuleType<?> arl3;
-        final MemoryStatus arm4;
-        return this.activityRequirements.get(azr).stream().allMatch(pair -> {
-            arl3 = pair.getFirst();
-            arm4 = (MemoryStatus)pair.getSecond();
-            return this.checkMemory(arl3, arm4);
-        });
+    private void tickSensors(final ServerLevel zd, final E aoy) {
+        for (final Sensor<? super E> axn5 : this.sensors.values()) {
+            axn5.tick(zd, aoy);
+        }
+    }
+    
+    private void forgetOutdatedMemories() {
+        for (final Map.Entry<MemoryModuleType<?>, Optional<? extends ExpirableValue<?>>> entry3 : this.memories.entrySet()) {
+            if (entry3.getValue().isPresent()) {
+                final ExpirableValue<?> awo4 = entry3.getValue().get();
+                awo4.tick();
+                if (!awo4.hasExpired()) {
+                    continue;
+                }
+                this.eraseMemory(entry3.getKey());
+            }
+        }
+    }
+    
+    public void stopAll(final ServerLevel zd, final E aoy) {
+        final long long4 = aoy.level.getGameTime();
+        for (final Behavior<? super E> aqh7 : this.getRunningBehaviors()) {
+            aqh7.doStop(zd, aoy, long4);
+        }
+    }
+    
+    private void startEachNonRunningBehavior(final ServerLevel zd, final E aoy) {
+        final long long4 = zd.getGameTime();
+        for (final Map<Activity, Set<Behavior<? super E>>> map7 : this.availableBehaviorsByPriority.values()) {
+            for (final Map.Entry<Activity, Set<Behavior<? super E>>> entry9 : map7.entrySet()) {
+                final Activity bfl10 = entry9.getKey();
+                if (this.activeActivities.contains(bfl10)) {
+                    final Set<Behavior<? super E>> set11 = entry9.getValue();
+                    for (final Behavior<? super E> aqh13 : set11) {
+                        if (aqh13.getStatus() == Behavior.Status.STOPPED) {
+                            aqh13.tryStart(zd, aoy, long4);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    private void tickEachRunningBehavior(final ServerLevel zd, final E aoy) {
+        final long long4 = zd.getGameTime();
+        for (final Behavior<? super E> aqh7 : this.getRunningBehaviors()) {
+            aqh7.tickOrStop(zd, aoy, long4);
+        }
+    }
+    
+    private boolean activityRequirementsAreMet(final Activity bfl) {
+        if (!this.activityRequirements.containsKey(bfl)) {
+            return false;
+        }
+        for (final Pair<MemoryModuleType<?>, MemoryStatus> pair4 : this.activityRequirements.get(bfl)) {
+            final MemoryModuleType<?> awp5 = pair4.getFirst();
+            final MemoryStatus awq6 = (MemoryStatus)pair4.getSecond();
+            if (!this.checkMemory(awp5, awq6)) {
+                return false;
+            }
+        }
+        return true;
     }
     
     private boolean isEmptyCollection(final Object object) {
         return object instanceof Collection && ((Collection)object).isEmpty();
     }
+    
+    ImmutableList<? extends Pair<Integer, ? extends Behavior<? super E>>> createPriorityPairs(final int integer, final ImmutableList<? extends Behavior<? super E>> immutableList) {
+        int integer2 = integer;
+        final ImmutableList.Builder<Pair<Integer, ? extends Behavior<? super E>>> builder5 = ImmutableList.<Pair<Integer, ? extends Behavior<? super E>>>builder();
+        for (final Behavior<? super E> aqh7 : immutableList) {
+            builder5.add(Pair.of((integer2++), aqh7));
+        }
+        return builder5.build();
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+    
+    public static final class Provider<E extends LivingEntity> {
+        private final Collection<? extends MemoryModuleType<?>> memoryTypes;
+        private final Collection<? extends SensorType<? extends Sensor<? super E>>> sensorTypes;
+        private final Codec<Brain<E>> codec;
+        
+        private Provider(final Collection<? extends MemoryModuleType<?>> collection1, final Collection<? extends SensorType<? extends Sensor<? super E>>> collection2) {
+            this.memoryTypes = collection1;
+            this.sensorTypes = collection2;
+            this.codec = Brain.<E>codec(collection1, collection2);
+        }
+        
+        public Brain<E> makeBrain(final Dynamic<?> dynamic) {
+            return this.codec.parse((Dynamic)dynamic).resultOrPartial((Consumer)Brain.LOGGER::error).orElseGet(() -> new Brain(this.memoryTypes, this.sensorTypes, ImmutableList.<MemoryValue<?>>of(), () -> this.codec));
+        }
+    }
+    
+    static final class MemoryValue<U> {
+        private final MemoryModuleType<U> type;
+        private final Optional<? extends ExpirableValue<U>> value;
+        
+        private static <U> MemoryValue<U> createUnchecked(final MemoryModuleType<U> awp, final Optional<? extends ExpirableValue<?>> optional) {
+            return new MemoryValue<U>(awp, optional);
+        }
+        
+        private MemoryValue(final MemoryModuleType<U> awp, final Optional<? extends ExpirableValue<U>> optional) {
+            this.type = awp;
+            this.value = optional;
+        }
+        
+        private void setMemoryInternal(final Brain<?> apr) {
+            ((Brain<LivingEntity>)apr).setMemoryInternal(this.type, this.value);
+        }
+        
+        public <T> void serialize(final DynamicOps<T> dynamicOps, final RecordBuilder<T> recordBuilder) {
+            this.type.getCodec().ifPresent(codec -> this.value.ifPresent(awo -> recordBuilder.add(Registry.MEMORY_MODULE_TYPE.encodeStart((DynamicOps)dynamicOps, this.type), codec.encodeStart((DynamicOps)dynamicOps, awo))));
+        }
+    }
 }
diff --git a/src/net/minecraft/world/entity/ai/attributes/Attribute.java b/src/net/minecraft/world/entity/ai/attributes/Attribute.java
index 5e8e3ef..6ab9dac 100644
--- a/src/net/minecraft/world/entity/ai/attributes/Attribute.java
+++ b/src/net/minecraft/world/entity/ai/attributes/Attribute.java
@@ -1,16 +1,33 @@
 package net.minecraft.world.entity.ai.attributes;
 
-import javax.annotation.Nullable;
-
-public interface Attribute {
-    String getName();
+public class Attribute {
+    private final double defaultValue;
+    private boolean syncable;
+    private final String descriptionId;
     
-    double sanitizeValue(final double double1);
+    protected Attribute(final String string, final double double2) {
+        this.defaultValue = double2;
+        this.descriptionId = string;
+    }
     
-    double getDefaultValue();
+    public double getDefaultValue() {
+        return this.defaultValue;
+    }
     
-    boolean isClientSyncable();
+    public boolean isClientSyncable() {
+        return this.syncable;
+    }
     
-    @Nullable
-    Attribute getParentAttribute();
+    public Attribute setSyncable(final boolean boolean1) {
+        this.syncable = boolean1;
+        return this;
+    }
+    
+    public double sanitizeValue(final double double1) {
+        return double1;
+    }
+    
+    public String getDescriptionId() {
+        return this.descriptionId;
+    }
 }
diff --git a/src/net/minecraft/world/entity/ai/attributes/AttributeInstance.java b/src/net/minecraft/world/entity/ai/attributes/AttributeInstance.java
index 54e5ba8..c35ef29 100644
--- a/src/net/minecraft/world/entity/ai/attributes/AttributeInstance.java
+++ b/src/net/minecraft/world/entity/ai/attributes/AttributeInstance.java
@@ -1,46 +1,194 @@
 package net.minecraft.world.entity.ai.attributes;
 
-import java.util.function.Consumer;
+import java.util.AbstractList;
+import net.minecraft.nbt.Tag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.core.Registry;
+import net.minecraft.nbt.CompoundTag;
+import java.util.Collections;
+import java.util.Iterator;
+import javax.annotation.Nullable;
 import java.util.Collection;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-import javax.annotation.Nullable;
+import it.unimi.dsi.fastutil.objects.ObjectArraySet;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import com.google.common.collect.Maps;
+import java.util.function.Consumer;
 import java.util.UUID;
 import java.util.Set;
+import java.util.Map;
 
-public interface AttributeInstance {
-    Attribute getAttribute();
+public class AttributeInstance {
+    private final Attribute attribute;
+    private final Map<AttributeModifier.Operation, Set<AttributeModifier>> modifiersByOperation;
+    private final Map<UUID, AttributeModifier> modifierById;
+    private final Set<AttributeModifier> permanentModifiers;
+    private double baseValue;
+    private boolean dirty;
+    private double cachedValue;
+    private final Consumer<AttributeInstance> onDirty;
     
-    double getBaseValue();
+    public AttributeInstance(final Attribute aps, final Consumer<AttributeInstance> consumer) {
+        this.modifiersByOperation = Maps.newEnumMap(AttributeModifier.Operation.class);
+        this.modifierById = (Map<UUID, AttributeModifier>)new Object2ObjectArrayMap();
+        this.permanentModifiers = (Set<AttributeModifier>)new ObjectArraySet();
+        this.dirty = true;
+        this.attribute = aps;
+        this.onDirty = consumer;
+        this.baseValue = aps.getDefaultValue();
+    }
     
-    void setBaseValue(final double double1);
+    public Attribute getAttribute() {
+        return this.attribute;
+    }
     
-    Set<AttributeModifier> getModifiers(final AttributeModifier.Operation a);
+    public double getBaseValue() {
+        return this.baseValue;
+    }
     
-    Set<AttributeModifier> getModifiers();
+    public void setBaseValue(final double double1) {
+        if (double1 == this.baseValue) {
+            return;
+        }
+        this.baseValue = double1;
+        this.setDirty();
+    }
     
-    boolean hasModifier(final AttributeModifier als);
+    public Set<AttributeModifier> getModifiers(final AttributeModifier.Operation a) {
+        return this.modifiersByOperation.computeIfAbsent(a, a -> Sets.newHashSet());
+    }
+    
+    public Set<AttributeModifier> getModifiers() {
+        return ImmutableSet.copyOf(this.modifierById.values());
+    }
     
     @Nullable
-    AttributeModifier getModifier(final UUID uUID);
+    public AttributeModifier getModifier(final UUID uUID) {
+        return this.modifierById.get(uUID);
+    }
     
-    void addModifier(final AttributeModifier als);
+    public boolean hasModifier(final AttributeModifier apv) {
+        return this.modifierById.get(apv.getId()) != null;
+    }
     
-    void removeModifier(final AttributeModifier als);
+    private void addModifier(final AttributeModifier apv) {
+        final AttributeModifier apv2 = this.modifierById.putIfAbsent(apv.getId(), apv);
+        if (apv2 != null) {
+            throw new IllegalArgumentException("Modifier is already applied on this attribute!");
+        }
+        this.getModifiers(apv.getOperation()).add(apv);
+        this.setDirty();
+    }
     
-    void removeModifier(final UUID uUID);
+    public void addTransientModifier(final AttributeModifier apv) {
+        this.addModifier(apv);
+    }
     
-    void removeModifiers();
+    public void addPermanentModifier(final AttributeModifier apv) {
+        this.addModifier(apv);
+        this.permanentModifiers.add(apv);
+    }
     
-    double getValue();
+    protected void setDirty() {
+        this.dirty = true;
+        this.onDirty.accept(this);
+    }
     
-    default void copyFrom(final AttributeInstance alr) {
-        this.setBaseValue(alr.getBaseValue());
-        final Set<AttributeModifier> set3 = alr.getModifiers();
-        final Set<AttributeModifier> set4 = this.getModifiers();
-        final ImmutableSet<AttributeModifier> immutableSet5 = ImmutableSet.<AttributeModifier>copyOf(Sets.<AttributeModifier>difference(set3, set4));
-        final ImmutableSet<AttributeModifier> immutableSet6 = ImmutableSet.<AttributeModifier>copyOf(Sets.<AttributeModifier>difference(set4, set3));
-        immutableSet5.forEach(this::addModifier);
-        immutableSet6.forEach(this::removeModifier);
+    public void removeModifier(final AttributeModifier apv) {
+        this.getModifiers(apv.getOperation()).remove(apv);
+        this.modifierById.remove(apv.getId());
+        this.permanentModifiers.remove(apv);
+        this.setDirty();
+    }
+    
+    public void removeModifier(final UUID uUID) {
+        final AttributeModifier apv3 = this.getModifier(uUID);
+        if (apv3 != null) {
+            this.removeModifier(apv3);
+        }
+    }
+    
+    public boolean removePermanentModifier(final UUID uUID) {
+        final AttributeModifier apv3 = this.getModifier(uUID);
+        if (apv3 != null && this.permanentModifiers.contains(apv3)) {
+            this.removeModifier(apv3);
+            return true;
+        }
+        return false;
+    }
+    
+    public void removeModifiers() {
+        for (final AttributeModifier apv3 : this.getModifiers()) {
+            this.removeModifier(apv3);
+        }
+    }
+    
+    public double getValue() {
+        if (this.dirty) {
+            this.cachedValue = this.calculateValue();
+            this.dirty = false;
+        }
+        return this.cachedValue;
+    }
+    
+    private double calculateValue() {
+        double double2 = this.getBaseValue();
+        for (final AttributeModifier apv5 : this.getModifiersOrEmpty(AttributeModifier.Operation.ADDITION)) {
+            double2 += apv5.getAmount();
+        }
+        double double3 = double2;
+        for (final AttributeModifier apv6 : this.getModifiersOrEmpty(AttributeModifier.Operation.MULTIPLY_BASE)) {
+            double3 += double2 * apv6.getAmount();
+        }
+        for (final AttributeModifier apv6 : this.getModifiersOrEmpty(AttributeModifier.Operation.MULTIPLY_TOTAL)) {
+            double3 *= 1.0 + apv6.getAmount();
+        }
+        return this.attribute.sanitizeValue(double3);
+    }
+    
+    private Collection<AttributeModifier> getModifiersOrEmpty(final AttributeModifier.Operation a) {
+        return this.modifiersByOperation.getOrDefault(a, Collections.<AttributeModifier>emptySet());
+    }
+    
+    public void replaceFrom(final AttributeInstance apt) {
+        this.baseValue = apt.baseValue;
+        this.modifierById.clear();
+        this.modifierById.putAll(apt.modifierById);
+        this.permanentModifiers.clear();
+        this.permanentModifiers.addAll(apt.permanentModifiers);
+        this.modifiersByOperation.clear();
+        apt.modifiersByOperation.forEach((a, set) -> this.getModifiers(a).addAll(set));
+        this.setDirty();
+    }
+    
+    public CompoundTag save() {
+        final CompoundTag le2 = new CompoundTag();
+        le2.putString("Name", Registry.ATTRIBUTE.getKey(this.attribute).toString());
+        le2.putDouble("Base", this.baseValue);
+        if (!this.permanentModifiers.isEmpty()) {
+            final ListTag lk3 = new ListTag();
+            for (final AttributeModifier apv5 : this.permanentModifiers) {
+                ((AbstractList<CompoundTag>)lk3).add(apv5.save());
+            }
+            le2.put("Modifiers", lk3);
+        }
+        return le2;
+    }
+    
+    public void load(final CompoundTag le) {
+        this.baseValue = le.getDouble("Base");
+        if (le.contains("Modifiers", 9)) {
+            final ListTag lk3 = le.getList("Modifiers", 10);
+            for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+                final AttributeModifier apv5 = AttributeModifier.load(lk3.getCompound(integer4));
+                if (apv5 != null) {
+                    this.modifierById.put(apv5.getId(), apv5);
+                    this.getModifiers(apv5.getOperation()).add(apv5);
+                    this.permanentModifiers.add(apv5);
+                }
+            }
+        }
+        this.setDirty();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/net/minecraft/world/entity/ai/attributes/AttributeMap.java
new file mode 100644
index 0000000..678a145
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/attributes/AttributeMap.java
@@ -0,0 +1,137 @@
+package net.minecraft.world.entity.ai.attributes;
+
+import java.util.AbstractList;
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.Util;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.core.Registry;
+import java.util.Iterator;
+import net.minecraft.nbt.ListTag;
+import java.util.function.Consumer;
+import com.google.common.collect.Multimap;
+import java.util.UUID;
+import javax.annotation.Nullable;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.Collection;
+import com.google.common.collect.Sets;
+import com.google.common.collect.Maps;
+import java.util.Set;
+import java.util.Map;
+import org.apache.logging.log4j.Logger;
+
+public class AttributeMap {
+    private static final Logger LOGGER;
+    private final Map<Attribute, AttributeInstance> attributes;
+    private final Set<AttributeInstance> dirtyAttributes;
+    private final AttributeSupplier supplier;
+    
+    public AttributeMap(final AttributeSupplier apw) {
+        this.attributes = Maps.newHashMap();
+        this.dirtyAttributes = Sets.newHashSet();
+        this.supplier = apw;
+    }
+    
+    private void onAttributeModified(final AttributeInstance apt) {
+        if (apt.getAttribute().isClientSyncable()) {
+            this.dirtyAttributes.add(apt);
+        }
+    }
+    
+    public Set<AttributeInstance> getDirtyAttributes() {
+        return this.dirtyAttributes;
+    }
+    
+    public Collection<AttributeInstance> getSyncableAttributes() {
+        return this.attributes.values().stream().filter(apt -> apt.getAttribute().isClientSyncable()).collect(Collectors.toList());
+    }
+    
+    @Nullable
+    public AttributeInstance getInstance(final Attribute aps) {
+        return this.attributes.computeIfAbsent(aps, aps -> this.supplier.createInstance(this::onAttributeModified, aps));
+    }
+    
+    public boolean hasAttribute(final Attribute aps) {
+        return this.attributes.get(aps) != null || this.supplier.hasAttribute(aps);
+    }
+    
+    public boolean hasModifier(final Attribute aps, final UUID uUID) {
+        final AttributeInstance apt4 = this.attributes.get(aps);
+        return (apt4 != null) ? (apt4.getModifier(uUID) != null) : this.supplier.hasModifier(aps, uUID);
+    }
+    
+    public double getValue(final Attribute aps) {
+        final AttributeInstance apt3 = this.attributes.get(aps);
+        return (apt3 != null) ? apt3.getValue() : this.supplier.getValue(aps);
+    }
+    
+    public double getBaseValue(final Attribute aps) {
+        final AttributeInstance apt3 = this.attributes.get(aps);
+        return (apt3 != null) ? apt3.getBaseValue() : this.supplier.getBaseValue(aps);
+    }
+    
+    public double getModifierValue(final Attribute aps, final UUID uUID) {
+        final AttributeInstance apt4 = this.attributes.get(aps);
+        return (apt4 != null) ? apt4.getModifier(uUID).getAmount() : this.supplier.getModifierValue(aps, uUID);
+    }
+    
+    public void removeAttributeModifiers(final Multimap<Attribute, AttributeModifier> multimap) {
+        final AttributeInstance apt4;
+        multimap.asMap().forEach((aps, collection) -> {
+            apt4 = this.attributes.get(aps);
+            if (apt4 != null) {
+                collection.forEach(apt4::removeModifier);
+            }
+        });
+    }
+    
+    public void addTransientAttributeModifiers(final Multimap<Attribute, AttributeModifier> multimap) {
+        final AttributeInstance apt4;
+        multimap.forEach((aps, apv) -> {
+            apt4 = this.getInstance(aps);
+            if (apt4 != null) {
+                apt4.removeModifier(apv);
+                apt4.addTransientModifier(apv);
+            }
+        });
+    }
+    
+    public void assignValues(final AttributeMap apu) {
+        final AttributeInstance apt2;
+        apu.attributes.values().forEach(apt -> {
+            apt2 = this.getInstance(apt.getAttribute());
+            if (apt2 != null) {
+                apt2.replaceFrom(apt);
+            }
+        });
+    }
+    
+    public ListTag save() {
+        final ListTag lk2 = new ListTag();
+        for (final AttributeInstance apt4 : this.attributes.values()) {
+            ((AbstractList<CompoundTag>)lk2).add(apt4.save());
+        }
+        return lk2;
+    }
+    
+    public void load(final ListTag lk) {
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            final CompoundTag le4 = lk.getCompound(integer3);
+            final String string5 = le4.getString("Name");
+            final AttributeInstance apt4;
+            final CompoundTag le5;
+            Util.<Attribute>ifElse(Registry.ATTRIBUTE.getOptional(ResourceLocation.tryParse(string5)), aps -> {
+                apt4 = this.getInstance(aps);
+                if (apt4 != null) {
+                    apt4.load(le5);
+                }
+                return;
+            }, () -> AttributeMap.LOGGER.warn("Ignoring unknown attribute '{}'", string5));
+        }
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/attributes/AttributeModifier.java b/src/net/minecraft/world/entity/ai/attributes/AttributeModifier.java
index 9106412..fa2717a 100644
--- a/src/net/minecraft/world/entity/ai/attributes/AttributeModifier.java
+++ b/src/net/minecraft/world/entity/ai/attributes/AttributeModifier.java
@@ -1,18 +1,22 @@
 package net.minecraft.world.entity.ai.attributes;
 
+import org.apache.logging.log4j.LogManager;
+import javax.annotation.Nullable;
+import net.minecraft.nbt.CompoundTag;
 import java.util.Objects;
 import java.util.Random;
 import net.minecraft.util.Mth;
 import io.netty.util.internal.ThreadLocalRandom;
 import java.util.UUID;
 import java.util.function.Supplier;
+import org.apache.logging.log4j.Logger;
 
 public class AttributeModifier {
+    private static final Logger LOGGER;
     private final double amount;
     private final Operation operation;
     private final Supplier<String> nameGetter;
     private final UUID id;
-    private boolean serialize;
     
     public AttributeModifier(final String string, final double double2, final Operation a) {
         this(Mth.createInsecureUUID((Random)ThreadLocalRandom.current()), () -> string, double2, a);
@@ -23,7 +27,6 @@ public class AttributeModifier {
     }
     
     public AttributeModifier(final UUID uUID, final Supplier<String> supplier, final double double3, final Operation a) {
-        this.serialize = true;
         this.id = uUID;
         this.nameGetter = supplier;
         this.amount = double3;
@@ -46,15 +49,6 @@ public class AttributeModifier {
         return this.amount;
     }
     
-    public boolean isSerializable() {
-        return this.serialize;
-    }
-    
-    public AttributeModifier setSerialize(final boolean boolean1) {
-        this.serialize = boolean1;
-        return this;
-    }
-    
     @Override
     public boolean equals(final Object object) {
         if (this == object) {
@@ -63,18 +57,44 @@ public class AttributeModifier {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final AttributeModifier als3 = (AttributeModifier)object;
-        return Objects.equals(this.id, als3.id);
+        final AttributeModifier apv3 = (AttributeModifier)object;
+        return Objects.equals(this.id, apv3.id);
     }
     
     @Override
     public int hashCode() {
-        return (this.id != null) ? this.id.hashCode() : 0;
+        return this.id.hashCode();
     }
     
     @Override
     public String toString() {
-        return "AttributeModifier{amount=" + this.amount + ", operation=" + this.operation + ", name='" + this.nameGetter.get() + '\'' + ", id=" + this.id + ", serialize=" + this.serialize + '}';
+        return "AttributeModifier{amount=" + this.amount + ", operation=" + this.operation + ", name='" + this.nameGetter.get() + '\'' + ", id=" + this.id + '}';
+    }
+    
+    public CompoundTag save() {
+        final CompoundTag le2 = new CompoundTag();
+        le2.putString("Name", this.getName());
+        le2.putDouble("Amount", this.amount);
+        le2.putInt("Operation", this.operation.toValue());
+        le2.putUUID("UUID", this.id);
+        return le2;
+    }
+    
+    @Nullable
+    public static AttributeModifier load(final CompoundTag le) {
+        try {
+            final UUID uUID2 = le.getUUID("UUID");
+            final Operation a3 = Operation.fromValue(le.getInt("Operation"));
+            return new AttributeModifier(uUID2, le.getString("Name"), le.getDouble("Amount"), a3);
+        }
+        catch (Exception exception2) {
+            AttributeModifier.LOGGER.warn("Unable to create attribute: {}", exception2.getMessage());
+            return null;
+        }
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
     }
     
     public enum Operation {
diff --git a/src/net/minecraft/world/entity/ai/attributes/AttributeSupplier.java b/src/net/minecraft/world/entity/ai/attributes/AttributeSupplier.java
new file mode 100644
index 0000000..14220f2
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/attributes/AttributeSupplier.java
@@ -0,0 +1,105 @@
+package net.minecraft.world.entity.ai.attributes;
+
+import com.google.common.collect.Maps;
+import javax.annotation.Nullable;
+import java.util.function.Consumer;
+import java.util.UUID;
+import net.minecraft.core.Registry;
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+
+public class AttributeSupplier {
+    private final Map<Attribute, AttributeInstance> instances;
+    
+    public AttributeSupplier(final Map<Attribute, AttributeInstance> map) {
+        this.instances = ImmutableMap.copyOf(map);
+    }
+    
+    private AttributeInstance getAttributeInstance(final Attribute aps) {
+        final AttributeInstance apt3 = this.instances.get(aps);
+        if (apt3 == null) {
+            throw new IllegalArgumentException("Can't find attribute " + Registry.ATTRIBUTE.getKey(aps));
+        }
+        return apt3;
+    }
+    
+    public double getValue(final Attribute aps) {
+        return this.getAttributeInstance(aps).getValue();
+    }
+    
+    public double getBaseValue(final Attribute aps) {
+        return this.getAttributeInstance(aps).getBaseValue();
+    }
+    
+    public double getModifierValue(final Attribute aps, final UUID uUID) {
+        final AttributeModifier apv4 = this.getAttributeInstance(aps).getModifier(uUID);
+        if (apv4 == null) {
+            throw new IllegalArgumentException("Can't find modifier " + uUID + " on attribute " + Registry.ATTRIBUTE.getKey(aps));
+        }
+        return apv4.getAmount();
+    }
+    
+    @Nullable
+    public AttributeInstance createInstance(final Consumer<AttributeInstance> consumer, final Attribute aps) {
+        final AttributeInstance apt4 = this.instances.get(aps);
+        if (apt4 == null) {
+            return null;
+        }
+        final AttributeInstance apt5 = new AttributeInstance(aps, consumer);
+        apt5.replaceFrom(apt4);
+        return apt5;
+    }
+    
+    public static Builder builder() {
+        return new Builder();
+    }
+    
+    public boolean hasAttribute(final Attribute aps) {
+        return this.instances.containsKey(aps);
+    }
+    
+    public boolean hasModifier(final Attribute aps, final UUID uUID) {
+        final AttributeInstance apt4 = this.instances.get(aps);
+        return apt4 != null && apt4.getModifier(uUID) != null;
+    }
+    
+    public static class Builder {
+        private final Map<Attribute, AttributeInstance> builder;
+        private boolean instanceFrozen;
+        
+        public Builder() {
+            this.builder = Maps.newHashMap();
+        }
+        
+        private AttributeInstance create(final Attribute aps) {
+            final UnsupportedOperationException ex;
+            final AttributeInstance apt3 = new AttributeInstance(aps, apt -> {
+                if (this.instanceFrozen) {
+                    new UnsupportedOperationException("Tried to change value for default attribute instance: " + Registry.ATTRIBUTE.getKey(aps));
+                    throw ex;
+                }
+                else {
+                    return;
+                }
+            });
+            this.builder.put(aps, apt3);
+            return apt3;
+        }
+        
+        public Builder add(final Attribute aps) {
+            this.create(aps);
+            return this;
+        }
+        
+        public Builder add(final Attribute aps, final double double2) {
+            final AttributeInstance apt5 = this.create(aps);
+            apt5.setBaseValue(double2);
+            return this;
+        }
+        
+        public AttributeSupplier build() {
+            this.instanceFrozen = true;
+            return new AttributeSupplier(this.builder);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/attributes/Attributes.java b/src/net/minecraft/world/entity/ai/attributes/Attributes.java
new file mode 100644
index 0000000..1b67b03
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/attributes/Attributes.java
@@ -0,0 +1,39 @@
+package net.minecraft.world.entity.ai.attributes;
+
+import net.minecraft.core.Registry;
+
+public class Attributes {
+    public static final Attribute MAX_HEALTH;
+    public static final Attribute FOLLOW_RANGE;
+    public static final Attribute KNOCKBACK_RESISTANCE;
+    public static final Attribute MOVEMENT_SPEED;
+    public static final Attribute FLYING_SPEED;
+    public static final Attribute ATTACK_DAMAGE;
+    public static final Attribute ATTACK_KNOCKBACK;
+    public static final Attribute ATTACK_SPEED;
+    public static final Attribute ARMOR;
+    public static final Attribute ARMOR_TOUGHNESS;
+    public static final Attribute LUCK;
+    public static final Attribute SPAWN_REINFORCEMENTS_CHANCE;
+    public static final Attribute JUMP_STRENGTH;
+    
+    private static Attribute register(final String string, final Attribute aps) {
+        return Registry.<Attribute>register(Registry.ATTRIBUTE, string, aps);
+    }
+    
+    static {
+        MAX_HEALTH = register("generic.max_health", new RangedAttribute("attribute.name.generic.max_health", 20.0, 1.0, 1024.0).setSyncable(true));
+        FOLLOW_RANGE = register("generic.follow_range", new RangedAttribute("attribute.name.generic.follow_range", 32.0, 0.0, 2048.0));
+        KNOCKBACK_RESISTANCE = register("generic.knockback_resistance", new RangedAttribute("attribute.name.generic.knockback_resistance", 0.0, 0.0, 1.0));
+        MOVEMENT_SPEED = register("generic.movement_speed", new RangedAttribute("attribute.name.generic.movement_speed", 0.699999988079071, 0.0, 1024.0).setSyncable(true));
+        FLYING_SPEED = register("generic.flying_speed", new RangedAttribute("attribute.name.generic.flying_speed", 0.4000000059604645, 0.0, 1024.0).setSyncable(true));
+        ATTACK_DAMAGE = register("generic.attack_damage", new RangedAttribute("attribute.name.generic.attack_damage", 2.0, 0.0, 2048.0));
+        ATTACK_KNOCKBACK = register("generic.attack_knockback", new RangedAttribute("attribute.name.generic.attack_knockback", 0.0, 0.0, 5.0));
+        ATTACK_SPEED = register("generic.attack_speed", new RangedAttribute("attribute.name.generic.attack_speed", 4.0, 0.0, 1024.0).setSyncable(true));
+        ARMOR = register("generic.armor", new RangedAttribute("attribute.name.generic.armor", 0.0, 0.0, 30.0).setSyncable(true));
+        ARMOR_TOUGHNESS = register("generic.armor_toughness", new RangedAttribute("attribute.name.generic.armor_toughness", 0.0, 0.0, 20.0).setSyncable(true));
+        LUCK = register("generic.luck", new RangedAttribute("attribute.name.generic.luck", 0.0, -1024.0, 1024.0).setSyncable(true));
+        SPAWN_REINFORCEMENTS_CHANCE = register("zombie.spawn_reinforcements", new RangedAttribute("attribute.name.zombie.spawn_reinforcements", 0.0, 0.0, 1.0));
+        JUMP_STRENGTH = register("horse.jump_strength", new RangedAttribute("attribute.name.horse.jump_strength", 0.7, 0.0, 2.0).setSyncable(true));
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/attributes/BaseAttribute.java b/src/net/minecraft/world/entity/ai/attributes/BaseAttribute.java
deleted file mode 100644
index 376bb89..0000000
--- a/src/net/minecraft/world/entity/ai/attributes/BaseAttribute.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package net.minecraft.world.entity.ai.attributes;
-
-import javax.annotation.Nullable;
-
-public abstract class BaseAttribute implements Attribute {
-    private final Attribute parent;
-    private final String name;
-    private final double defaultValue;
-    private boolean syncable;
-    
-    protected BaseAttribute(@Nullable final Attribute alq, final String string, final double double3) {
-        this.parent = alq;
-        this.name = string;
-        this.defaultValue = double3;
-        if (string == null) {
-            throw new IllegalArgumentException("Name cannot be null!");
-        }
-    }
-    
-    @Override
-    public String getName() {
-        return this.name;
-    }
-    
-    @Override
-    public double getDefaultValue() {
-        return this.defaultValue;
-    }
-    
-    @Override
-    public boolean isClientSyncable() {
-        return this.syncable;
-    }
-    
-    public BaseAttribute setSyncable(final boolean boolean1) {
-        this.syncable = boolean1;
-        return this;
-    }
-    
-    @Nullable
-    @Override
-    public Attribute getParentAttribute() {
-        return this.parent;
-    }
-    
-    @Override
-    public int hashCode() {
-        return this.name.hashCode();
-    }
-    
-    @Override
-    public boolean equals(final Object object) {
-        return object instanceof Attribute && this.name.equals(((Attribute)object).getName());
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.java b/src/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.java
deleted file mode 100644
index 9a2de28..0000000
--- a/src/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package net.minecraft.world.entity.ai.attributes;
-
-import java.util.Iterator;
-import java.util.Collection;
-import javax.annotation.Nullable;
-import com.google.common.collect.HashMultimap;
-import net.minecraft.util.InsensitiveStringMap;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import java.util.Map;
-
-public abstract class BaseAttributeMap {
-    protected final Map<Attribute, AttributeInstance> attributesByObject;
-    protected final Map<String, AttributeInstance> attributesByName;
-    protected final Multimap<Attribute, Attribute> descendantsByParent;
-    
-    public BaseAttributeMap() {
-        this.attributesByObject = Maps.newHashMap();
-        this.attributesByName = new InsensitiveStringMap<AttributeInstance>();
-        this.descendantsByParent = HashMultimap.create();
-    }
-    
-    @Nullable
-    public AttributeInstance getInstance(final Attribute alq) {
-        return this.attributesByObject.get(alq);
-    }
-    
-    @Nullable
-    public AttributeInstance getInstance(final String string) {
-        return this.attributesByName.get(string);
-    }
-    
-    public AttributeInstance registerAttribute(final Attribute alq) {
-        if (this.attributesByName.containsKey(alq.getName())) {
-            throw new IllegalArgumentException("Attribute is already registered!");
-        }
-        final AttributeInstance alr3 = this.createAttributeInstance(alq);
-        this.attributesByName.put(alq.getName(), alr3);
-        this.attributesByObject.put(alq, alr3);
-        for (Attribute alq2 = alq.getParentAttribute(); alq2 != null; alq2 = alq2.getParentAttribute()) {
-            this.descendantsByParent.put(alq2, alq);
-        }
-        return alr3;
-    }
-    
-    protected abstract AttributeInstance createAttributeInstance(final Attribute alq);
-    
-    public Collection<AttributeInstance> getAttributes() {
-        return this.attributesByName.values();
-    }
-    
-    public void onAttributeModified(final AttributeInstance alr) {
-    }
-    
-    public void removeAttributeModifiers(final Multimap<String, AttributeModifier> multimap) {
-        for (final Map.Entry<String, AttributeModifier> entry4 : multimap.entries()) {
-            final AttributeInstance alr5 = this.getInstance(entry4.getKey());
-            if (alr5 != null) {
-                alr5.removeModifier(entry4.getValue());
-            }
-        }
-    }
-    
-    public void addAttributeModifiers(final Multimap<String, AttributeModifier> multimap) {
-        for (final Map.Entry<String, AttributeModifier> entry4 : multimap.entries()) {
-            final AttributeInstance alr5 = this.getInstance(entry4.getKey());
-            if (alr5 != null) {
-                alr5.removeModifier(entry4.getValue());
-                alr5.addModifier(entry4.getValue());
-            }
-        }
-    }
-    
-    public void assignValues(final BaseAttributeMap alu) {
-        final AttributeInstance alr2;
-        this.getAttributes().forEach(alr -> {
-            alr2 = alu.getInstance(alr.getAttribute());
-            if (alr2 != null) {
-                alr.copyFrom(alr2);
-            }
-        });
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java b/src/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
new file mode 100644
index 0000000..9fa93e8
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
@@ -0,0 +1,103 @@
+package net.minecraft.world.entity.ai.attributes;
+
+import net.minecraft.world.entity.monster.ZombifiedPiglin;
+import net.minecraft.world.entity.animal.horse.ZombieHorse;
+import net.minecraft.world.entity.monster.Zoglin;
+import net.minecraft.world.entity.animal.Wolf;
+import net.minecraft.world.entity.boss.wither.WitherBoss;
+import net.minecraft.world.entity.monster.Witch;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.monster.Vindicator;
+import net.minecraft.world.entity.npc.Villager;
+import net.minecraft.world.entity.monster.Vex;
+import net.minecraft.world.entity.animal.Turtle;
+import net.minecraft.world.entity.monster.Strider;
+import net.minecraft.world.entity.animal.Squid;
+import net.minecraft.world.entity.monster.Spider;
+import net.minecraft.world.entity.animal.SnowGolem;
+import net.minecraft.world.entity.animal.horse.SkeletonHorse;
+import net.minecraft.world.entity.monster.AbstractSkeleton;
+import net.minecraft.world.entity.monster.Silverfish;
+import net.minecraft.world.entity.monster.Shulker;
+import net.minecraft.world.entity.animal.Sheep;
+import net.minecraft.world.entity.monster.Ravager;
+import net.minecraft.world.entity.animal.Rabbit;
+import net.minecraft.world.entity.animal.PolarBear;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.monster.Pillager;
+import net.minecraft.world.entity.monster.piglin.Piglin;
+import net.minecraft.world.entity.animal.Pig;
+import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.world.entity.animal.Parrot;
+import net.minecraft.world.entity.animal.Panda;
+import net.minecraft.world.entity.animal.Ocelot;
+import net.minecraft.world.entity.monster.MagmaCube;
+import net.minecraft.world.entity.animal.horse.Llama;
+import net.minecraft.world.entity.animal.IronGolem;
+import net.minecraft.world.entity.monster.Illusioner;
+import net.minecraft.world.entity.animal.horse.AbstractHorse;
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
+import net.minecraft.world.entity.monster.Guardian;
+import net.minecraft.world.entity.monster.Giant;
+import net.minecraft.world.entity.monster.Ghast;
+import net.minecraft.world.entity.animal.Fox;
+import net.minecraft.world.entity.monster.Evoker;
+import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
+import net.minecraft.world.entity.monster.Endermite;
+import net.minecraft.world.entity.monster.EnderMan;
+import net.minecraft.world.entity.monster.ElderGuardian;
+import net.minecraft.world.entity.monster.Zombie;
+import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
+import net.minecraft.world.entity.animal.Dolphin;
+import net.minecraft.world.entity.monster.Creeper;
+import net.minecraft.world.entity.animal.Cow;
+import net.minecraft.world.entity.animal.AbstractFish;
+import net.minecraft.world.entity.animal.Chicken;
+import net.minecraft.world.entity.monster.CaveSpider;
+import net.minecraft.world.entity.animal.Cat;
+import net.minecraft.world.entity.monster.Blaze;
+import net.minecraft.world.entity.animal.Bee;
+import net.minecraft.world.entity.ambient.Bat;
+import net.minecraft.world.entity.decoration.ArmorStand;
+import com.google.common.collect.ImmutableMap;
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.SharedConstants;
+import java.util.function.Function;
+import net.minecraft.world.entity.MobCategory;
+import net.minecraft.core.Registry;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.EntityType;
+import java.util.Map;
+import org.apache.logging.log4j.Logger;
+
+public class DefaultAttributes {
+    private static final Logger LOGGER;
+    private static final Map<EntityType<? extends LivingEntity>, AttributeSupplier> SUPPLIERS;
+    
+    public static AttributeSupplier getSupplier(final EntityType<? extends LivingEntity> aoq) {
+        return DefaultAttributes.SUPPLIERS.get(aoq);
+    }
+    
+    public static boolean hasSupplier(final EntityType<?> aoq) {
+        return DefaultAttributes.SUPPLIERS.containsKey(aoq);
+    }
+    
+    public static void validate() {
+        final IllegalStateException ex;
+        Registry.ENTITY_TYPE.stream().filter(aoq -> aoq.getCategory() != MobCategory.MISC).filter(aoq -> !hasSupplier(aoq)).map(Registry.ENTITY_TYPE::getKey).forEach(uh -> {
+            if (SharedConstants.IS_RUNNING_IN_IDE) {
+                new IllegalStateException("Entity " + uh + " has no attributes");
+                throw ex;
+            }
+            else {
+                DefaultAttributes.LOGGER.error("Entity {} has no attributes", uh);
+            }
+        });
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+        SUPPLIERS = ImmutableMap.<EntityType<ArmorStand>, AttributeSupplier>builder().put(EntityType.ARMOR_STAND, LivingEntity.createLivingAttributes().build()).put((EntityType<ArmorStand>)EntityType.BAT, Bat.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.BEE, Bee.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.BLAZE, Blaze.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.CAT, Cat.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.CAVE_SPIDER, CaveSpider.createCaveSpider().build()).put((EntityType<ArmorStand>)EntityType.CHICKEN, Chicken.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.COD, AbstractFish.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.COW, Cow.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.CREEPER, Creeper.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.DOLPHIN, Dolphin.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.DONKEY, AbstractChestedHorse.createBaseChestedHorseAttributes().build()).put((EntityType<ArmorStand>)EntityType.DROWNED, Zombie.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.ELDER_GUARDIAN, ElderGuardian.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.ENDERMAN, EnderMan.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.ENDERMITE, Endermite.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.ENDER_DRAGON, EnderDragon.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.EVOKER, Evoker.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.FOX, Fox.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.GHAST, Ghast.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.GIANT, Giant.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.GUARDIAN, Guardian.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.HOGLIN, Hoglin.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.HORSE, AbstractHorse.createBaseHorseAttributes().build()).put((EntityType<ArmorStand>)EntityType.HUSK, Zombie.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.ILLUSIONER, Illusioner.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.IRON_GOLEM, IronGolem.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.LLAMA, Llama.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.MAGMA_CUBE, MagmaCube.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.MOOSHROOM, Cow.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.MULE, AbstractChestedHorse.createBaseChestedHorseAttributes().build()).put((EntityType<ArmorStand>)EntityType.OCELOT, Ocelot.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.PANDA, Panda.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.PARROT, Parrot.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.PHANTOM, Monster.createMonsterAttributes().build()).put((EntityType<ArmorStand>)EntityType.PIG, Pig.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.PIGLIN, Piglin.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.PILLAGER, Pillager.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.PLAYER, Player.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.POLAR_BEAR, PolarBear.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.PUFFERFISH, AbstractFish.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.RABBIT, Rabbit.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.RAVAGER, Ravager.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.SALMON, AbstractFish.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.SHEEP, Sheep.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.SHULKER, Shulker.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.SILVERFISH, Silverfish.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.SKELETON, AbstractSkeleton.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.SKELETON_HORSE, SkeletonHorse.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.SLIME, Monster.createMonsterAttributes().build()).put((EntityType<ArmorStand>)EntityType.SNOW_GOLEM, SnowGolem.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.SPIDER, Spider.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.SQUID, Squid.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.STRAY, AbstractSkeleton.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.STRIDER, Strider.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.TRADER_LLAMA, Llama.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.TROPICAL_FISH, AbstractFish.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.TURTLE, Turtle.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.VEX, Vex.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.VILLAGER, Villager.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.VINDICATOR, Vindicator.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.WANDERING_TRADER, Mob.createMobAttributes().build()).put((EntityType<ArmorStand>)EntityType.WITCH, Witch.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.WITHER, WitherBoss.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.WITHER_SKELETON, AbstractSkeleton.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.WOLF, Wolf.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.ZOGLIN, Zoglin.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.ZOMBIE, Zombie.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.ZOMBIE_HORSE, ZombieHorse.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.ZOMBIE_VILLAGER, Zombie.createAttributes().build()).put((EntityType<ArmorStand>)EntityType.ZOMBIFIED_PIGLIN, ZombifiedPiglin.createAttributes().build()).build();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.java b/src/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.java
deleted file mode 100644
index 5bea00f..0000000
--- a/src/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package net.minecraft.world.entity.ai.attributes;
-
-import java.util.Iterator;
-import com.google.common.collect.Lists;
-import javax.annotation.Nullable;
-import java.util.Collection;
-import com.google.common.collect.Sets;
-import com.google.common.collect.Maps;
-import java.util.UUID;
-import java.util.Set;
-import java.util.Map;
-
-public class ModifiableAttributeInstance implements AttributeInstance {
-    private final BaseAttributeMap attributeMap;
-    private final Attribute attribute;
-    private final Map<AttributeModifier.Operation, Set<AttributeModifier>> modifiers;
-    private final Map<String, Set<AttributeModifier>> modifiersByName;
-    private final Map<UUID, AttributeModifier> modifierById;
-    private double baseValue;
-    private boolean dirty;
-    private double cachedValue;
-    
-    public ModifiableAttributeInstance(final BaseAttributeMap alu, final Attribute alq) {
-        this.modifiers = Maps.newEnumMap(AttributeModifier.Operation.class);
-        this.modifiersByName = Maps.newHashMap();
-        this.modifierById = Maps.newHashMap();
-        this.dirty = true;
-        this.attributeMap = alu;
-        this.attribute = alq;
-        this.baseValue = alq.getDefaultValue();
-        for (final AttributeModifier.Operation a7 : AttributeModifier.Operation.values()) {
-            this.modifiers.put(a7, Sets.newHashSet());
-        }
-    }
-    
-    @Override
-    public Attribute getAttribute() {
-        return this.attribute;
-    }
-    
-    @Override
-    public double getBaseValue() {
-        return this.baseValue;
-    }
-    
-    @Override
-    public void setBaseValue(final double double1) {
-        if (double1 == this.getBaseValue()) {
-            return;
-        }
-        this.baseValue = double1;
-        this.setDirty();
-    }
-    
-    @Override
-    public Set<AttributeModifier> getModifiers(final AttributeModifier.Operation a) {
-        return this.modifiers.get(a);
-    }
-    
-    @Override
-    public Set<AttributeModifier> getModifiers() {
-        final Set<AttributeModifier> set2 = Sets.newHashSet();
-        for (final AttributeModifier.Operation a6 : AttributeModifier.Operation.values()) {
-            set2.addAll(this.getModifiers(a6));
-        }
-        return set2;
-    }
-    
-    @Nullable
-    @Override
-    public AttributeModifier getModifier(final UUID uUID) {
-        return this.modifierById.get(uUID);
-    }
-    
-    @Override
-    public boolean hasModifier(final AttributeModifier als) {
-        return this.modifierById.get(als.getId()) != null;
-    }
-    
-    @Override
-    public void addModifier(final AttributeModifier als) {
-        if (this.getModifier(als.getId()) != null) {
-            throw new IllegalArgumentException("Modifier is already applied on this attribute!");
-        }
-        final Set<AttributeModifier> set3 = this.modifiersByName.computeIfAbsent(als.getName(), string -> Sets.newHashSet());
-        this.modifiers.get(als.getOperation()).add(als);
-        set3.add(als);
-        this.modifierById.put(als.getId(), als);
-        this.setDirty();
-    }
-    
-    protected void setDirty() {
-        this.dirty = true;
-        this.attributeMap.onAttributeModified(this);
-    }
-    
-    @Override
-    public void removeModifier(final AttributeModifier als) {
-        for (final AttributeModifier.Operation a6 : AttributeModifier.Operation.values()) {
-            this.modifiers.get(a6).remove(als);
-        }
-        final Set<AttributeModifier> set3 = this.modifiersByName.get(als.getName());
-        if (set3 != null) {
-            set3.remove(als);
-            if (set3.isEmpty()) {
-                this.modifiersByName.remove(als.getName());
-            }
-        }
-        this.modifierById.remove(als.getId());
-        this.setDirty();
-    }
-    
-    @Override
-    public void removeModifier(final UUID uUID) {
-        final AttributeModifier als3 = this.getModifier(uUID);
-        if (als3 != null) {
-            this.removeModifier(als3);
-        }
-    }
-    
-    @Override
-    public void removeModifiers() {
-        Collection<AttributeModifier> collection2 = this.getModifiers();
-        if (collection2 == null) {
-            return;
-        }
-        collection2 = Lists.newArrayList(collection2);
-        for (final AttributeModifier als4 : collection2) {
-            this.removeModifier(als4);
-        }
-    }
-    
-    @Override
-    public double getValue() {
-        if (this.dirty) {
-            this.cachedValue = this.calculateValue();
-            this.dirty = false;
-        }
-        return this.cachedValue;
-    }
-    
-    private double calculateValue() {
-        double double2 = this.getBaseValue();
-        for (final AttributeModifier als5 : this.getAppliedModifiers(AttributeModifier.Operation.ADDITION)) {
-            double2 += als5.getAmount();
-        }
-        double double3 = double2;
-        for (final AttributeModifier als6 : this.getAppliedModifiers(AttributeModifier.Operation.MULTIPLY_BASE)) {
-            double3 += double2 * als6.getAmount();
-        }
-        for (final AttributeModifier als6 : this.getAppliedModifiers(AttributeModifier.Operation.MULTIPLY_TOTAL)) {
-            double3 *= 1.0 + als6.getAmount();
-        }
-        return this.attribute.sanitizeValue(double3);
-    }
-    
-    private Collection<AttributeModifier> getAppliedModifiers(final AttributeModifier.Operation a) {
-        final Set<AttributeModifier> set3 = Sets.newHashSet(this.getModifiers(a));
-        for (Attribute alq4 = this.attribute.getParentAttribute(); alq4 != null; alq4 = alq4.getParentAttribute()) {
-            final AttributeInstance alr5 = this.attributeMap.getInstance(alq4);
-            if (alr5 != null) {
-                set3.addAll(alr5.getModifiers(a));
-            }
-        }
-        return set3;
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/attributes/ModifiableAttributeMap.java b/src/net/minecraft/world/entity/ai/attributes/ModifiableAttributeMap.java
deleted file mode 100644
index 8109cb7..0000000
--- a/src/net/minecraft/world/entity/ai/attributes/ModifiableAttributeMap.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package net.minecraft.world.entity.ai.attributes;
-
-import java.util.Collection;
-import java.util.Iterator;
-import net.minecraft.util.InsensitiveStringMap;
-import com.google.common.collect.Sets;
-import java.util.Map;
-import java.util.Set;
-
-public class ModifiableAttributeMap extends BaseAttributeMap {
-    private final Set<AttributeInstance> dirtyAttributes;
-    protected final Map<String, AttributeInstance> attributesByLegacy;
-    
-    public ModifiableAttributeMap() {
-        this.dirtyAttributes = Sets.newHashSet();
-        this.attributesByLegacy = new InsensitiveStringMap<AttributeInstance>();
-    }
-    
-    @Override
-    public ModifiableAttributeInstance getInstance(final Attribute alq) {
-        return (ModifiableAttributeInstance)super.getInstance(alq);
-    }
-    
-    @Override
-    public ModifiableAttributeInstance getInstance(final String string) {
-        AttributeInstance alr3 = super.getInstance(string);
-        if (alr3 == null) {
-            alr3 = this.attributesByLegacy.get(string);
-        }
-        return (ModifiableAttributeInstance)alr3;
-    }
-    
-    @Override
-    public AttributeInstance registerAttribute(final Attribute alq) {
-        final AttributeInstance alr3 = super.registerAttribute(alq);
-        if (alq instanceof RangedAttribute && ((RangedAttribute)alq).getImportLegacyName() != null) {
-            this.attributesByLegacy.put(((RangedAttribute)alq).getImportLegacyName(), alr3);
-        }
-        return alr3;
-    }
-    
-    @Override
-    protected AttributeInstance createAttributeInstance(final Attribute alq) {
-        return new ModifiableAttributeInstance(this, alq);
-    }
-    
-    @Override
-    public void onAttributeModified(final AttributeInstance alr) {
-        if (alr.getAttribute().isClientSyncable()) {
-            this.dirtyAttributes.add(alr);
-        }
-        for (final Attribute alq4 : this.descendantsByParent.get(alr.getAttribute())) {
-            final ModifiableAttributeInstance alv5 = this.getInstance(alq4);
-            if (alv5 != null) {
-                alv5.setDirty();
-            }
-        }
-    }
-    
-    public Set<AttributeInstance> getDirtyAttributes() {
-        return this.dirtyAttributes;
-    }
-    
-    public Collection<AttributeInstance> getSyncableAttributes() {
-        final Set<AttributeInstance> set2 = Sets.newHashSet();
-        for (final AttributeInstance alr4 : this.getAttributes()) {
-            if (alr4.getAttribute().isClientSyncable()) {
-                set2.add(alr4);
-            }
-        }
-        return set2;
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/attributes/RangedAttribute.java b/src/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
index 5d114f6..9b819e6 100644
--- a/src/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
+++ b/src/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
@@ -1,37 +1,26 @@
 package net.minecraft.world.entity.ai.attributes;
 
 import net.minecraft.util.Mth;
-import javax.annotation.Nullable;
 
-public class RangedAttribute extends BaseAttribute {
+public class RangedAttribute extends Attribute {
     private final double minValue;
     private final double maxValue;
-    private String importLegacyName;
     
-    public RangedAttribute(@Nullable final Attribute alq, final String string, final double double3, final double double4, final double double5) {
-        super(alq, string, double3);
-        this.minValue = double4;
-        this.maxValue = double5;
-        if (double4 > double5) {
+    public RangedAttribute(final String string, final double double2, final double double3, final double double4) {
+        super(string, double2);
+        this.minValue = double3;
+        this.maxValue = double4;
+        if (double3 > double4) {
             throw new IllegalArgumentException("Minimum value cannot be bigger than maximum value!");
         }
-        if (double3 < double4) {
+        if (double2 < double3) {
             throw new IllegalArgumentException("Default value cannot be lower than minimum value!");
         }
-        if (double3 > double5) {
+        if (double2 > double4) {
             throw new IllegalArgumentException("Default value cannot be bigger than maximum value!");
         }
     }
     
-    public RangedAttribute importLegacyName(final String string) {
-        this.importLegacyName = string;
-        return this;
-    }
-    
-    public String getImportLegacyName() {
-        return this.importLegacyName;
-    }
-    
     @Override
     public double sanitizeValue(double double1) {
         double1 = Mth.clamp(double1, this.minValue, this.maxValue);
diff --git a/src/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
index e2c83c2..5b0b95b 100644
--- a/src/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
+++ b/src/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
@@ -1,19 +1,22 @@
 package net.minecraft.world.entity.ai.behavior;
 
+import java.util.Random;
 import net.minecraft.world.entity.LivingEntity;
+import java.util.Iterator;
 import net.minecraft.world.level.pathfinder.Path;
-import java.util.stream.Stream;
 import java.util.function.Predicate;
 import net.minecraft.network.protocol.game.DebugPackets;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 import net.minecraft.world.entity.ai.village.poi.PoiManager;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
+import java.util.Set;
 import net.minecraft.server.level.ServerLevel;
-import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
 import net.minecraft.world.entity.ai.memory.MemoryStatus;
-import it.unimi.dsi.fastutil.longs.Long2LongMap;
+import com.google.common.collect.ImmutableMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import java.util.Map;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import net.minecraft.core.GlobalPos;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
@@ -21,58 +24,112 @@ import net.minecraft.world.entity.PathfinderMob;
 
 public class AcquirePoi extends Behavior<PathfinderMob> {
     private final PoiType poiType;
-    private final MemoryModuleType<GlobalPos> memoryType;
+    private final MemoryModuleType<GlobalPos> memoryToAcquire;
     private final boolean onlyIfAdult;
-    private long lastUpdate;
-    private final Long2LongMap batchCache;
-    private int triedCount;
+    private long nextScheduledStart;
+    private final Long2ObjectMap<JitteredLinearRetry> batchCache;
     
-    public AcquirePoi(final PoiType asu, final MemoryModuleType<GlobalPos> arl, final boolean boolean3) {
-        super(ImmutableMap.<MemoryModuleType<GlobalPos>, MemoryStatus>of(arl, MemoryStatus.VALUE_ABSENT));
-        this.batchCache = (Long2LongMap)new Long2LongOpenHashMap();
-        this.poiType = asu;
-        this.memoryType = arl;
-        this.onlyIfAdult = boolean3;
+    public AcquirePoi(final PoiType ayc, final MemoryModuleType<GlobalPos> awp2, final MemoryModuleType<GlobalPos> awp3, final boolean boolean4) {
+        super(constructEntryConditionMap(awp2, awp3));
+        this.batchCache = (Long2ObjectMap<JitteredLinearRetry>)new Long2ObjectOpenHashMap();
+        this.poiType = ayc;
+        this.memoryToAcquire = awp3;
+        this.onlyIfAdult = boolean4;
+    }
+    
+    public AcquirePoi(final PoiType ayc, final MemoryModuleType<GlobalPos> awp, final boolean boolean3) {
+        this(ayc, awp, awp, boolean3);
+    }
+    
+    private static ImmutableMap<MemoryModuleType<?>, MemoryStatus> constructEntryConditionMap(final MemoryModuleType<GlobalPos> awp1, final MemoryModuleType<GlobalPos> awp2) {
+        final ImmutableMap.Builder<MemoryModuleType<?>, MemoryStatus> builder3 = ImmutableMap.<MemoryModuleType<?>, MemoryStatus>builder();
+        builder3.put(awp1, MemoryStatus.VALUE_ABSENT);
+        if (awp2 != awp1) {
+            builder3.put(awp2, MemoryStatus.VALUE_ABSENT);
+        }
+        return builder3.build();
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final PathfinderMob alg) {
-        return (!this.onlyIfAdult || !alg.isBaby()) && xd.getGameTime() - this.lastUpdate >= 20L;
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final PathfinderMob apg) {
+        if (this.onlyIfAdult && apg.isBaby()) {
+            return false;
+        }
+        if (this.nextScheduledStart == 0L) {
+            this.nextScheduledStart = apg.level.getGameTime() + zd.random.nextInt(20);
+            return false;
+        }
+        return zd.getGameTime() >= this.nextScheduledStart;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final PathfinderMob alg, final long long3) {
-        this.triedCount = 0;
-        this.lastUpdate = xd.getGameTime() + xd.getRandom().nextInt(20);
-        final PoiManager asr6 = xd.getPoiManager();
-        final long long4;
-        final Predicate<BlockPos> predicate7 = fk -> {
-            long4 = fk.asLong();
-            if (this.batchCache.containsKey(long4)) {
-                return false;
+    protected void start(final ServerLevel zd, final PathfinderMob apg, final long long3) {
+        this.nextScheduledStart = long3 + 20L + zd.getRandom().nextInt(20);
+        final PoiManager axz6 = zd.getPoiManager();
+        this.batchCache.long2ObjectEntrySet().removeIf(entry -> !((JitteredLinearRetry)entry.getValue()).isStillValid(long3));
+        final JitteredLinearRetry a5;
+        final Predicate<BlockPos> predicate7 = fu -> {
+            a5 = (JitteredLinearRetry)this.batchCache.get(fu.asLong());
+            if (a5 == null) {
+                return true;
             }
-            else if (++this.triedCount >= 5) {
+            else if (!a5.shouldRetry(long3)) {
                 return false;
             }
             else {
-                this.batchCache.put(long4, this.lastUpdate + 40L);
+                a5.markAttempt(long3);
                 return true;
             }
         };
-        final Stream<BlockPos> stream8 = asr6.findAll(this.poiType.getPredicate(), predicate7, new BlockPos(alg), 48, PoiManager.Occupancy.HAS_SPACE);
-        final Path cqq9 = alg.getNavigation().createPath(stream8, this.poiType.getValidRange());
-        if (cqq9 != null && cqq9.canReach()) {
-            final BlockPos fk3 = cqq9.getTarget();
+        final Set<BlockPos> set8 = axz6.findAll(this.poiType.getPredicate(), predicate7, apg.blockPosition(), 48, PoiManager.Occupancy.HAS_SPACE).limit(5L).collect(Collectors.toSet());
+        final Path czf9 = apg.getNavigation().createPath(set8, this.poiType.getValidRange());
+        if (czf9 != null && czf9.canReach()) {
+            final BlockPos fu3 = czf9.getTarget();
             final PoiManager poiManager;
             final BlockPos blockPos;
-            asr6.getType(fk3).ifPresent(asu -> {
-                poiManager.take(this.poiType.getPredicate(), fk2 -> fk2.equals(blockPos), blockPos, 1);
-                alg.getBrain().<GlobalPos>setMemory(this.memoryType, GlobalPos.of(xd.getDimension().getType(), blockPos));
-                DebugPackets.sendPoiTicketCountPacket(xd, blockPos);
+            axz6.getType(fu3).ifPresent(ayc -> {
+                poiManager.take(this.poiType.getPredicate(), fu2 -> fu2.equals(blockPos), blockPos, 1);
+                apg.getBrain().<GlobalPos>setMemory(this.memoryToAcquire, GlobalPos.of(zd.dimension(), blockPos));
+                this.batchCache.clear();
+                DebugPackets.sendPoiTicketCountPacket(zd, blockPos);
             });
         }
-        else if (this.triedCount < 5) {
-            this.batchCache.long2LongEntrySet().removeIf(entry -> entry.getLongValue() < this.lastUpdate);
+        else {
+            for (final BlockPos fu4 : set8) {
+                this.batchCache.computeIfAbsent(fu4.asLong(), long3 -> new JitteredLinearRetry(apg.level.random, long3));
+            }
+        }
+    }
+    
+    static class JitteredLinearRetry {
+        private final Random random;
+        private long previousAttemptTimestamp;
+        private long nextScheduledAttemptTimestamp;
+        private int currentDelay;
+        
+        JitteredLinearRetry(final Random random, final long long2) {
+            this.random = random;
+            this.markAttempt(long2);
+        }
+        
+        public void markAttempt(final long long1) {
+            this.previousAttemptTimestamp = long1;
+            final int integer4 = this.currentDelay + this.random.nextInt(40) + 40;
+            this.currentDelay = Math.min(integer4, 400);
+            this.nextScheduledAttemptTimestamp = long1 + this.currentDelay;
+        }
+        
+        public boolean isStillValid(final long long1) {
+            return long1 - this.previousAttemptTimestamp < 400L;
+        }
+        
+        public boolean shouldRetry(final long long1) {
+            return long1 >= this.nextScheduledAttemptTimestamp;
+        }
+        
+        @Override
+        public String toString() {
+            return "RetryMarker{, previousAttemptAt=" + this.previousAttemptTimestamp + ", nextScheduledAttemptAt=" + this.nextScheduledAttemptTimestamp + ", currentDelay=" + this.currentDelay + '}';
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/AnimalMakeLove.java b/src/net/minecraft/world/entity/ai/behavior/AnimalMakeLove.java
new file mode 100644
index 0000000..33aa9fc
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/AnimalMakeLove.java
@@ -0,0 +1,89 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import java.util.function.Predicate;
+import java.util.Optional;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.entity.ai.memory.WalkTarget;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.AgableMob;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.world.entity.LivingEntity;
+import java.util.List;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.animal.Animal;
+
+public class AnimalMakeLove extends Behavior<Animal> {
+    private final EntityType<? extends Animal> partnerType;
+    private final float speedModifier;
+    private long spawnChildAtTime;
+    
+    public AnimalMakeLove(final EntityType<? extends Animal> aoq, final float float2) {
+        super(ImmutableMap.<MemoryModuleType<List<LivingEntity>>, MemoryStatus>of(MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.BREED_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED), 325);
+        this.partnerType = aoq;
+        this.speedModifier = float2;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Animal ayk) {
+        return ayk.isInLove() && this.findValidBreedPartner(ayk).isPresent();
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final Animal ayk, final long long3) {
+        final Animal ayk2 = (Animal)this.findValidBreedPartner(ayk).get();
+        ayk.getBrain().<AgableMob>setMemory(MemoryModuleType.BREED_TARGET, ayk2);
+        ayk2.getBrain().<AgableMob>setMemory(MemoryModuleType.BREED_TARGET, ayk);
+        BehaviorUtils.lockGazeAndWalkToEachOther(ayk, ayk2, this.speedModifier);
+        final int integer7 = 275 + ayk.getRandom().nextInt(50);
+        this.spawnChildAtTime = long3 + integer7;
+    }
+    
+    @Override
+    protected boolean canStillUse(final ServerLevel zd, final Animal ayk, final long long3) {
+        if (!this.hasBreedTargetOfRightType(ayk)) {
+            return false;
+        }
+        final Animal ayk2 = this.getBreedTarget(ayk);
+        return ayk2.isAlive() && ayk.canMate(ayk2) && BehaviorUtils.entityIsVisible(ayk.getBrain(), ayk2) && long3 <= this.spawnChildAtTime;
+    }
+    
+    @Override
+    protected void stop(final ServerLevel zd, final Animal ayk, final long long3) {
+        final Animal ayk2 = this.getBreedTarget(ayk);
+        BehaviorUtils.lockGazeAndWalkToEachOther(ayk, ayk2, this.speedModifier);
+        if (!ayk.closerThan(ayk2, 3.0)) {
+            return;
+        }
+        if (long3 >= this.spawnChildAtTime) {
+            ayk.spawnChildFromBreeding(zd, ayk2);
+            ayk.getBrain().<AgableMob>eraseMemory(MemoryModuleType.BREED_TARGET);
+            ayk2.getBrain().<AgableMob>eraseMemory(MemoryModuleType.BREED_TARGET);
+        }
+    }
+    
+    @Override
+    protected void stop(final ServerLevel zd, final Animal ayk, final long long3) {
+        ayk.getBrain().<AgableMob>eraseMemory(MemoryModuleType.BREED_TARGET);
+        ayk.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        ayk.getBrain().<PositionTracker>eraseMemory(MemoryModuleType.LOOK_TARGET);
+        this.spawnChildAtTime = 0L;
+    }
+    
+    private Animal getBreedTarget(final Animal ayk) {
+        return ayk.getBrain().<Animal>getMemory((MemoryModuleType<Animal>)MemoryModuleType.BREED_TARGET).get();
+    }
+    
+    private boolean hasBreedTargetOfRightType(final Animal ayk) {
+        final Brain<?> apr3 = ayk.getBrain();
+        return apr3.hasMemoryValue(MemoryModuleType.BREED_TARGET) && apr3.<AgableMob>getMemory(MemoryModuleType.BREED_TARGET).get().getType() == this.partnerType;
+    }
+    
+    private Optional<? extends Animal> findValidBreedPartner(final Animal ayk) {
+        return ayk.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get().stream().filter(aoy -> aoy.getType() == this.partnerType).map(aoy -> aoy).filter(ayk::canMate).findFirst();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/AssignProfessionFromJobSite.java b/src/net/minecraft/world/entity/ai/behavior/AssignProfessionFromJobSite.java
index 6c0c384..be53bcc 100644
--- a/src/net/minecraft/world/entity/ai/behavior/AssignProfessionFromJobSite.java
+++ b/src/net/minecraft/world/entity/ai/behavior/AssignProfessionFromJobSite.java
@@ -4,7 +4,10 @@ import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.core.Registry;
+import java.util.Optional;
 import net.minecraft.world.entity.npc.VillagerProfession;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Position;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.core.GlobalPos;
@@ -15,21 +18,27 @@ import net.minecraft.world.entity.npc.Villager;
 
 public class AssignProfessionFromJobSite extends Behavior<Villager> {
     public AssignProfessionFromJobSite() {
-        super(ImmutableMap.<MemoryModuleType<GlobalPos>, MemoryStatus>of(MemoryModuleType.JOB_SITE, MemoryStatus.VALUE_PRESENT));
+        super(ImmutableMap.<MemoryModuleType<GlobalPos>, MemoryStatus>of(MemoryModuleType.POTENTIAL_JOB_SITE, MemoryStatus.VALUE_PRESENT));
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        return axw.getVillagerData().getProfession() == VillagerProfession.NONE;
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        final BlockPos fu4 = bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.POTENTIAL_JOB_SITE).get().pos();
+        return fu4.closerThan(bdp.position(), 2.0) || bdp.assignProfessionWhenSpawned();
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        final GlobalPos fr6 = axw.getBrain().<GlobalPos>getMemory(MemoryModuleType.JOB_SITE).get();
-        final MinecraftServer minecraftServer7 = xd.getServer();
-        minecraftServer7.getLevel(fr6.dimension()).getPoiManager().getType(fr6.pos()).ifPresent(asu -> Registry.VILLAGER_PROFESSION.stream().filter(axz -> axz.getJobPoiType() == asu).findFirst().ifPresent(axz -> {
-            axw.setVillagerData(axw.getVillagerData().setProfession(axz));
-            axw.refreshBrain(xd);
-        }));
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        final GlobalPos gc6 = bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.POTENTIAL_JOB_SITE).get();
+        bdp.getBrain().<GlobalPos>eraseMemory(MemoryModuleType.POTENTIAL_JOB_SITE);
+        bdp.getBrain().<GlobalPos>setMemory(MemoryModuleType.JOB_SITE, gc6);
+        if (bdp.getVillagerData().getProfession() != VillagerProfession.NONE) {
+            return;
+        }
+        final MinecraftServer minecraftServer7 = zd.getServer();
+        Optional.<ServerLevel>ofNullable(minecraftServer7.getLevel(gc6.dimension())).flatMap(zd -> zd.getPoiManager().getType(gc6.pos())).flatMap(ayc -> Registry.VILLAGER_PROFESSION.stream().filter(bds -> bds.getJobPoiType() == ayc).findFirst()).ifPresent(bds -> {
+            bdp.setVillagerData(bdp.getVillagerData().setProfession(bds));
+            bdp.refreshBrain(zd);
+        });
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java b/src/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
new file mode 100644
index 0000000..d8c63f5
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
@@ -0,0 +1,40 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.util.IntRange;
+import net.minecraft.world.entity.AgableMob;
+
+public class BabyFollowAdult<E extends AgableMob> extends Behavior<E> {
+    private final IntRange followRange;
+    private final float speedModifier;
+    
+    public BabyFollowAdult(final IntRange adx, final float float2) {
+        super(ImmutableMap.<MemoryModuleType<AgableMob>, MemoryStatus>of(MemoryModuleType.NEAREST_VISIBLE_ADULT, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<AgableMob>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT));
+        this.followRange = adx;
+        this.speedModifier = float2;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aok) {
+        if (!aok.isBaby()) {
+            return false;
+        }
+        final AgableMob aok2 = this.getNearestAdult(aok);
+        return aok.closerThan(aok2, this.followRange.getMaxInclusive() + 1) && !aok.closerThan(aok2, this.followRange.getMinInclusive());
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aok, final long long3) {
+        BehaviorUtils.setWalkAndLookTargetMemories(aok, this.getNearestAdult(aok), this.speedModifier, this.followRange.getMinInclusive() - 1);
+    }
+    
+    private AgableMob getNearestAdult(final E aok) {
+        return aok.getBrain().<AgableMob>getMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT).get();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/BackUpIfTooClose.java b/src/net/minecraft/world/entity/ai/behavior/BackUpIfTooClose.java
new file mode 100644
index 0000000..c7bd89b
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/BackUpIfTooClose.java
@@ -0,0 +1,48 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.LivingEntity;
+import java.util.List;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.world.entity.ai.memory.WalkTarget;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.Mob;
+
+public class BackUpIfTooClose<E extends Mob> extends Behavior<E> {
+    private final int tooCloseDistance;
+    private final float strafeSpeed;
+    
+    public BackUpIfTooClose(final int integer, final float float2) {
+        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<WalkTarget>)MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)MemoryModuleType.ATTACK_TARGET, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<WalkTarget>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT));
+        this.tooCloseDistance = integer;
+        this.strafeSpeed = float2;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoz) {
+        return this.isTargetVisible(aoz) && this.isTargetTooClose(aoz);
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoz, final long long3) {
+        aoz.getBrain().<EntityTracker>setMemory((MemoryModuleType<EntityTracker>)MemoryModuleType.LOOK_TARGET, new EntityTracker(this.getTarget(aoz), true));
+        aoz.getMoveControl().strafe(-this.strafeSpeed, 0.0f);
+        aoz.yRot = Mth.rotateIfNecessary(aoz.yRot, aoz.yHeadRot, 0.0f);
+    }
+    
+    private boolean isTargetVisible(final E aoz) {
+        return aoz.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get().contains(this.getTarget(aoz));
+    }
+    
+    private boolean isTargetTooClose(final E aoz) {
+        return this.getTarget(aoz).closerThan(aoz, this.tooCloseDistance);
+    }
+    
+    private LivingEntity getTarget(final E aoz) {
+        return aoz.getBrain().<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET).get();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/BecomePassiveIfMemoryPresent.java b/src/net/minecraft/world/entity/ai/behavior/BecomePassiveIfMemoryPresent.java
new file mode 100644
index 0000000..8d71693
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/BecomePassiveIfMemoryPresent.java
@@ -0,0 +1,23 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.LivingEntity;
+
+public class BecomePassiveIfMemoryPresent extends Behavior<LivingEntity> {
+    private final int pacifyDuration;
+    
+    public BecomePassiveIfMemoryPresent(final MemoryModuleType<?> awp, final int integer) {
+        super(ImmutableMap.<MemoryModuleType<LivingEntity>, MemoryStatus>of(MemoryModuleType.ATTACK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<LivingEntity>)MemoryModuleType.PACIFIED, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<LivingEntity>)awp, MemoryStatus.VALUE_PRESENT));
+        this.pacifyDuration = integer;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        aoy.getBrain().<Boolean>setMemoryWithExpiry(MemoryModuleType.PACIFIED, true, this.pacifyDuration);
+        aoy.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.ATTACK_TARGET);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/Behavior.java b/src/net/minecraft/world/entity/ai/behavior/Behavior.java
index 31a8ef1..a6f411f 100644
--- a/src/net/minecraft/world/entity/ai/behavior/Behavior.java
+++ b/src/net/minecraft/world/entity/ai/behavior/Behavior.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.entity.ai.behavior;
 
+import java.util.Iterator;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.ai.memory.MemoryStatus;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
@@ -7,7 +8,7 @@ import java.util.Map;
 import net.minecraft.world.entity.LivingEntity;
 
 public abstract class Behavior<E extends LivingEntity> {
-    private final Map<MemoryModuleType<?>, MemoryStatus> entryCondition;
+    protected final Map<MemoryModuleType<?>, MemoryStatus> entryCondition;
     private Status status;
     private long endTimestamp;
     private final int minDuration;
@@ -32,41 +33,41 @@ public abstract class Behavior<E extends LivingEntity> {
         return this.status;
     }
     
-    public final boolean tryStart(final ServerLevel xd, final E akz, final long long3) {
-        if (this.hasRequiredMemories(akz) && this.checkExtraStartConditions(xd, akz)) {
+    public final boolean tryStart(final ServerLevel zd, final E aoy, final long long3) {
+        if (this.hasRequiredMemories(aoy) && this.checkExtraStartConditions(zd, aoy)) {
             this.status = Status.RUNNING;
-            final int integer6 = this.minDuration + xd.getRandom().nextInt(this.maxDuration + 1 - this.minDuration);
+            final int integer6 = this.minDuration + zd.getRandom().nextInt(this.maxDuration + 1 - this.minDuration);
             this.endTimestamp = long3 + integer6;
-            this.start(xd, akz, long3);
+            this.start(zd, aoy, long3);
             return true;
         }
         return false;
     }
     
-    protected void start(final ServerLevel xd, final E akz, final long long3) {
+    protected void start(final ServerLevel zd, final E aoy, final long long3) {
     }
     
-    public final void tickOrStop(final ServerLevel xd, final E akz, final long long3) {
-        if (!this.timedOut(long3) && this.canStillUse(xd, akz, long3)) {
-            this.tick(xd, akz, long3);
+    public final void tickOrStop(final ServerLevel zd, final E aoy, final long long3) {
+        if (!this.timedOut(long3) && this.canStillUse(zd, aoy, long3)) {
+            this.tick(zd, aoy, long3);
         }
         else {
-            this.doStop(xd, akz, long3);
+            this.doStop(zd, aoy, long3);
         }
     }
     
-    protected void tick(final ServerLevel xd, final E akz, final long long3) {
+    protected void tick(final ServerLevel zd, final E aoy, final long long3) {
     }
     
-    public final void doStop(final ServerLevel xd, final E akz, final long long3) {
+    public final void doStop(final ServerLevel zd, final E aoy, final long long3) {
         this.status = Status.STOPPED;
-        this.stop(xd, akz, long3);
+        this.stop(zd, aoy, long3);
     }
     
-    protected void stop(final ServerLevel xd, final E akz, final long long3) {
+    protected void stop(final ServerLevel zd, final E aoy, final long long3) {
     }
     
-    protected boolean canStillUse(final ServerLevel xd, final E akz, final long long3) {
+    protected boolean canStillUse(final ServerLevel zd, final E aoy, final long long3) {
         return false;
     }
     
@@ -74,7 +75,7 @@ public abstract class Behavior<E extends LivingEntity> {
         return long1 > this.endTimestamp;
     }
     
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final E akz) {
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoy) {
         return true;
     }
     
@@ -83,14 +84,15 @@ public abstract class Behavior<E extends LivingEntity> {
         return this.getClass().getSimpleName();
     }
     
-    private boolean hasRequiredMemories(final E akz) {
-        final MemoryModuleType<?> arl3;
-        final MemoryStatus arm4;
-        return this.entryCondition.entrySet().stream().allMatch(entry -> {
-            arl3 = entry.getKey();
-            arm4 = (MemoryStatus)entry.getValue();
-            return akz.getBrain().checkMemory(arl3, arm4);
-        });
+    private boolean hasRequiredMemories(final E aoy) {
+        for (final Map.Entry<MemoryModuleType<?>, MemoryStatus> entry4 : this.entryCondition.entrySet()) {
+            final MemoryModuleType<?> awp5 = entry4.getKey();
+            final MemoryStatus awq6 = entry4.getValue();
+            if (!aoy.getBrain().checkMemory(awp5, awq6)) {
+                return false;
+            }
+        }
+        return true;
     }
     
     public enum Status {
diff --git a/src/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/src/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
index 45ba403..4269433 100644
--- a/src/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
+++ b/src/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
@@ -1,17 +1,24 @@
 package net.minecraft.world.entity.ai.behavior;
 
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import net.minecraft.world.entity.npc.Villager;
+import java.util.UUID;
+import java.util.Optional;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ProjectileWeaponItem;
+import net.minecraft.world.entity.Mob;
 import java.util.function.ToIntFunction;
 import java.util.Comparator;
 import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.core.Vec3i;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
 import net.minecraft.world.entity.Entity;
+import java.util.function.Predicate;
 import net.minecraft.world.entity.EntityType;
 import java.util.List;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
@@ -19,57 +26,115 @@ import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.world.entity.LivingEntity;
 
 public class BehaviorUtils {
-    public static void lockGazeAndWalkToEachOther(final LivingEntity akz1, final LivingEntity akz2) {
-        lookAtEachOther(akz1, akz2);
-        walkToEachOther(akz1, akz2);
+    public static void lockGazeAndWalkToEachOther(final LivingEntity aoy1, final LivingEntity aoy2, final float float3) {
+        lookAtEachOther(aoy1, aoy2);
+        setWalkAndLookTargetMemoriesToEachOther(aoy1, aoy2, float3);
     }
     
-    public static boolean entityIsVisible(final Brain<?> alp, final LivingEntity akz) {
-        return alp.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).filter(list -> list.contains(akz)).isPresent();
+    public static boolean entityIsVisible(final Brain<?> apr, final LivingEntity aoy) {
+        return apr.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).filter(list -> list.contains(aoy)).isPresent();
     }
     
-    public static boolean targetIsValid(final Brain<?> alp, final MemoryModuleType<? extends LivingEntity> arl, final EntityType<?> aku) {
-        return alp.getMemory(arl).filter(akz -> akz.getType() == aku).filter(LivingEntity::isAlive).filter(akz -> entityIsVisible(alp, akz)).isPresent();
+    public static boolean targetIsValid(final Brain<?> apr, final MemoryModuleType<? extends LivingEntity> awp, final EntityType<?> aoq) {
+        return targetIsValid(apr, awp, aoy -> aoy.getType() == aoq);
     }
     
-    public static void lookAtEachOther(final LivingEntity akz1, final LivingEntity akz2) {
-        lookAtEntity(akz1, akz2);
-        lookAtEntity(akz2, akz1);
+    private static boolean targetIsValid(final Brain<?> apr, final MemoryModuleType<? extends LivingEntity> awp, final Predicate<LivingEntity> predicate) {
+        return apr.getMemory(awp).filter(predicate).filter(LivingEntity::isAlive).filter(aoy -> entityIsVisible(apr, aoy)).isPresent();
     }
     
-    public static void lookAtEntity(final LivingEntity akz1, final LivingEntity akz2) {
-        akz1.getBrain().<EntityPosWrapper>setMemory((MemoryModuleType<EntityPosWrapper>)MemoryModuleType.LOOK_TARGET, new EntityPosWrapper(akz2));
+    private static void lookAtEachOther(final LivingEntity aoy1, final LivingEntity aoy2) {
+        lookAtEntity(aoy1, aoy2);
+        lookAtEntity(aoy2, aoy1);
     }
     
-    public static void walkToEachOther(final LivingEntity akz1, final LivingEntity akz2) {
-        final int integer3 = 2;
-        walkToEntity(akz1, akz2, 2);
-        walkToEntity(akz2, akz1, 2);
+    public static void lookAtEntity(final LivingEntity aoy1, final LivingEntity aoy2) {
+        aoy1.getBrain().<EntityTracker>setMemory((MemoryModuleType<EntityTracker>)MemoryModuleType.LOOK_TARGET, new EntityTracker(aoy2, true));
     }
     
-    public static void walkToEntity(final LivingEntity akz1, final LivingEntity akz2, final int integer) {
-        final float float4 = (float)akz1.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue();
-        final EntityPosWrapper amg5 = new EntityPosWrapper(akz2);
-        final WalkTarget arn6 = new WalkTarget(amg5, float4, integer);
-        akz1.getBrain().<PositionWrapper>setMemory(MemoryModuleType.LOOK_TARGET, amg5);
-        akz1.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, arn6);
+    private static void setWalkAndLookTargetMemoriesToEachOther(final LivingEntity aoy1, final LivingEntity aoy2, final float float3) {
+        final int integer4 = 2;
+        setWalkAndLookTargetMemories(aoy1, aoy2, float3, 2);
+        setWalkAndLookTargetMemories(aoy2, aoy1, float3, 2);
     }
     
-    public static void throwItem(final LivingEntity akz1, final ItemStack ben, final LivingEntity akz3) {
-        final double double4 = akz1.getEyeY() - 0.30000001192092896;
-        final ItemEntity awb6 = new ItemEntity(akz1.level, akz1.getX(), double4, akz1.getZ(), ben);
-        final BlockPos fk7 = new BlockPos(akz3);
-        final BlockPos fk8 = new BlockPos(akz1);
-        final float float9 = 0.3f;
-        Vec3 cvl10 = new Vec3(fk7.subtract(fk8));
-        cvl10 = cvl10.normalize().scale(0.30000001192092896);
-        awb6.setDeltaMovement(cvl10);
-        awb6.setDefaultPickUpDelay();
-        akz1.level.addFreshEntity(awb6);
+    public static void setWalkAndLookTargetMemories(final LivingEntity aoy, final Entity aom, final float float3, final int integer) {
+        final WalkTarget awr5 = new WalkTarget(new EntityTracker(aom, false), float3, integer);
+        aoy.getBrain().<EntityTracker>setMemory((MemoryModuleType<EntityTracker>)MemoryModuleType.LOOK_TARGET, new EntityTracker(aom, true));
+        aoy.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, awr5);
     }
     
-    public static SectionPos findSectionClosestToVillage(final ServerLevel xd, final SectionPos gd, final int integer) {
-        final int integer2 = xd.sectionsToVillage(gd);
-        return SectionPos.cube(gd, integer).filter(gd -> xd.sectionsToVillage(gd) < integer2).min(Comparator.comparingInt(xd::sectionsToVillage)).orElse(gd);
+    public static void setWalkAndLookTargetMemories(final LivingEntity aoy, final BlockPos fu, final float float3, final int integer) {
+        final WalkTarget awr5 = new WalkTarget(new BlockPosTracker(fu), float3, integer);
+        aoy.getBrain().<BlockPosTracker>setMemory((MemoryModuleType<BlockPosTracker>)MemoryModuleType.LOOK_TARGET, new BlockPosTracker(fu));
+        aoy.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, awr5);
+    }
+    
+    public static void throwItem(final LivingEntity aoy, final ItemStack bki, final Vec3 dem) {
+        final double double4 = aoy.getEyeY() - 0.30000001192092896;
+        final ItemEntity bbg6 = new ItemEntity(aoy.level, aoy.getX(), double4, aoy.getZ(), bki);
+        final float float7 = 0.3f;
+        Vec3 dem2 = dem.subtract(aoy.position());
+        dem2 = dem2.normalize().scale(0.30000001192092896);
+        bbg6.setDeltaMovement(dem2);
+        bbg6.setDefaultPickUpDelay();
+        aoy.level.addFreshEntity(bbg6);
+    }
+    
+    public static SectionPos findSectionClosestToVillage(final ServerLevel zd, final SectionPos go, final int integer) {
+        final int integer2 = zd.sectionsToVillage(go);
+        return SectionPos.cube(go, integer).filter(go -> zd.sectionsToVillage(go) < integer2).min(Comparator.comparingInt(zd::sectionsToVillage)).orElse(go);
+    }
+    
+    public static boolean isWithinAttackRange(final Mob aoz, final LivingEntity aoy, final int integer) {
+        final Item bke4 = aoz.getMainHandItem().getItem();
+        if (bke4 instanceof ProjectileWeaponItem && aoz.canFireProjectileWeapon((ProjectileWeaponItem)bke4)) {
+            final int integer2 = ((ProjectileWeaponItem)bke4).getDefaultProjectileRange() - integer;
+            return aoz.closerThan(aoy, integer2);
+        }
+        return isWithinMeleeAttackRange(aoz, aoy);
+    }
+    
+    public static boolean isWithinMeleeAttackRange(final LivingEntity aoy1, final LivingEntity aoy2) {
+        final double double3 = aoy1.distanceToSqr(aoy2.getX(), aoy2.getY(), aoy2.getZ());
+        final double double4 = aoy1.getBbWidth() * 2.0f * (aoy1.getBbWidth() * 2.0f) + aoy2.getBbWidth();
+        return double3 <= double4;
+    }
+    
+    public static boolean isOtherTargetMuchFurtherAwayThanCurrentAttackTarget(final LivingEntity aoy1, final LivingEntity aoy2, final double double3) {
+        final Optional<LivingEntity> optional5 = aoy1.getBrain().<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET);
+        if (!optional5.isPresent()) {
+            return false;
+        }
+        final double double4 = aoy1.distanceToSqr(optional5.get().position());
+        final double double5 = aoy1.distanceToSqr(aoy2.position());
+        return double5 > double4 + double3 * double3;
+    }
+    
+    public static boolean canSee(final LivingEntity aoy1, final LivingEntity aoy2) {
+        final Brain<?> apr3 = aoy1.getBrain();
+        return apr3.hasMemoryValue(MemoryModuleType.VISIBLE_LIVING_ENTITIES) && apr3.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get().contains(aoy2);
+    }
+    
+    public static LivingEntity getNearestTarget(final LivingEntity aoy1, final Optional<LivingEntity> optional, final LivingEntity aoy3) {
+        if (!optional.isPresent()) {
+            return aoy3;
+        }
+        return getTargetNearestMe(aoy1, optional.get(), aoy3);
+    }
+    
+    public static LivingEntity getTargetNearestMe(final LivingEntity aoy1, final LivingEntity aoy2, final LivingEntity aoy3) {
+        final Vec3 dem4 = aoy2.position();
+        final Vec3 dem5 = aoy3.position();
+        return (aoy1.distanceToSqr(dem4) < aoy1.distanceToSqr(dem5)) ? aoy2 : aoy3;
+    }
+    
+    public static Optional<LivingEntity> getLivingEntityFromUUIDMemory(final LivingEntity aoy, final MemoryModuleType<UUID> awp) {
+        final Optional<UUID> optional3 = aoy.getBrain().<UUID>getMemory(awp);
+        return optional3.<LivingEntity>map(uUID -> (LivingEntity)((ServerLevel)aoy.level).getEntity(uUID));
+    }
+    
+    public static Stream<Villager> getNearbyVillagersWithCondition(final Villager bdp, final Predicate<Villager> predicate) {
+        return bdp.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.LIVING_ENTITIES).<Stream<Villager>>map(list -> list.stream().filter(aoy -> aoy instanceof Villager && aoy != bdp).map(aoy -> aoy).filter(LivingEntity::isAlive).filter(predicate)).orElseGet(Stream::empty);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/BlockPosTracker.java b/src/net/minecraft/world/entity/ai/behavior/BlockPosTracker.java
new file mode 100644
index 0000000..3423b66
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/BlockPosTracker.java
@@ -0,0 +1,36 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.core.BlockPos;
+
+public class BlockPosTracker implements PositionTracker {
+    private final BlockPos blockPos;
+    private final Vec3 centerPosition;
+    
+    public BlockPosTracker(final BlockPos fu) {
+        this.blockPos = fu;
+        this.centerPosition = Vec3.atCenterOf(fu);
+    }
+    
+    @Override
+    public Vec3 currentPosition() {
+        return this.centerPosition;
+    }
+    
+    @Override
+    public BlockPos currentBlockPosition() {
+        return this.blockPos;
+    }
+    
+    @Override
+    public boolean isVisibleBy(final LivingEntity aoy) {
+        return true;
+    }
+    
+    @Override
+    public String toString() {
+        return "BlockPosTracker{blockPos=" + this.blockPos + ", centerPosition=" + this.centerPosition + '}';
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/BlockPosWrapper.java b/src/net/minecraft/world/entity/ai/behavior/BlockPosWrapper.java
deleted file mode 100644
index aad79b3..0000000
--- a/src/net/minecraft/world/entity/ai/behavior/BlockPosWrapper.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package net.minecraft.world.entity.ai.behavior;
-
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.core.BlockPos;
-
-public class BlockPosWrapper implements PositionWrapper {
-    private final BlockPos pos;
-    private final Vec3 lookAt;
-    
-    public BlockPosWrapper(final BlockPos fk) {
-        this.pos = fk;
-        this.lookAt = new Vec3(fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5);
-    }
-    
-    @Override
-    public BlockPos getPos() {
-        return this.pos;
-    }
-    
-    @Override
-    public Vec3 getLookAtPos() {
-        return this.lookAt;
-    }
-    
-    @Override
-    public boolean isVisible(final LivingEntity akz) {
-        return true;
-    }
-    
-    @Override
-    public String toString() {
-        return "BlockPosWrapper{pos=" + this.pos + ", lookAt=" + this.lookAt + '}';
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/behavior/Celebrate.java b/src/net/minecraft/world/entity/ai/behavior/Celebrate.java
deleted file mode 100644
index 57fa486..0000000
--- a/src/net/minecraft/world/entity/ai/behavior/Celebrate.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package net.minecraft.world.entity.ai.behavior;
-
-import java.util.AbstractList;
-import java.util.List;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.world.item.FireworkRocketItem;
-import com.google.common.collect.Lists;
-import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.ItemStack;
-import java.util.Random;
-import net.minecraft.world.entity.projectile.FireworkRocketEntity;
-import net.minecraft.world.item.DyeColor;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import javax.annotation.Nullable;
-import net.minecraft.world.entity.raid.Raid;
-import net.minecraft.world.entity.npc.Villager;
-
-public class Celebrate extends Behavior<Villager> {
-    @Nullable
-    private Raid currentRaid;
-    
-    public Celebrate(final int integer1, final int integer2) {
-        super(ImmutableMap.of(), integer1, integer2);
-    }
-    
-    @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        final BlockPos fk4 = new BlockPos(axw);
-        this.currentRaid = xd.getRaidAt(fk4);
-        return this.currentRaid != null && this.currentRaid.isVictory() && MoveToSkySeeingSpot.hasNoBlocksAbove(xd, axw, fk4);
-    }
-    
-    @Override
-    protected boolean canStillUse(final ServerLevel xd, final Villager axw, final long long3) {
-        return this.currentRaid != null && !this.currentRaid.isStopped();
-    }
-    
-    @Override
-    protected void stop(final ServerLevel xd, final Villager axw, final long long3) {
-        this.currentRaid = null;
-        axw.getBrain().updateActivity(xd.getDayTime(), xd.getGameTime());
-    }
-    
-    @Override
-    protected void tick(final ServerLevel xd, final Villager axw, final long long3) {
-        final Random random6 = axw.getRandom();
-        if (random6.nextInt(100) == 0) {
-            axw.playCelebrateSound();
-        }
-        if (random6.nextInt(200) == 0 && MoveToSkySeeingSpot.hasNoBlocksAbove(xd, axw, new BlockPos(axw))) {
-            final DyeColor bdj7 = DyeColor.values()[random6.nextInt(DyeColor.values().length)];
-            final int integer8 = random6.nextInt(3);
-            final ItemStack ben9 = this.getFirework(bdj7, integer8);
-            final FireworkRocketEntity ayu10 = new FireworkRocketEntity(axw.level, axw.getX(), axw.getEyeY(), axw.getZ(), ben9);
-            axw.level.addFreshEntity(ayu10);
-        }
-    }
-    
-    private ItemStack getFirework(final DyeColor bdj, final int integer) {
-        final ItemStack ben4 = new ItemStack(Items.FIREWORK_ROCKET, 1);
-        final ItemStack ben5 = new ItemStack(Items.FIREWORK_STAR);
-        final CompoundTag jt6 = ben5.getOrCreateTagElement("Explosion");
-        final List<Integer> list7 = Lists.newArrayList();
-        list7.add(bdj.getFireworkColor());
-        jt6.putIntArray("Colors", list7);
-        jt6.putByte("Type", (byte)FireworkRocketItem.Shape.BURST.getId());
-        final CompoundTag jt7 = ben4.getOrCreateTagElement("Fireworks");
-        final ListTag jz9 = new ListTag();
-        final CompoundTag jt8 = ben5.getTagElement("Explosion");
-        if (jt8 != null) {
-            ((AbstractList<CompoundTag>)jz9).add(jt8);
-        }
-        jt7.putByte("Flight", (byte)integer);
-        if (!jz9.isEmpty()) {
-            jt7.put("Explosions", jz9);
-        }
-        return ben4;
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/behavior/CelebrateVillagersSurvivedRaid.java b/src/net/minecraft/world/entity/ai/behavior/CelebrateVillagersSurvivedRaid.java
new file mode 100644
index 0000000..f5b97aa
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/CelebrateVillagersSurvivedRaid.java
@@ -0,0 +1,88 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import java.util.AbstractList;
+import java.util.List;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.world.item.FireworkRocketItem;
+import com.google.common.collect.Lists;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.ItemStack;
+import java.util.Random;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.projectile.FireworkRocketEntity;
+import net.minecraft.Util;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import javax.annotation.Nullable;
+import net.minecraft.world.entity.raid.Raid;
+import net.minecraft.world.entity.npc.Villager;
+
+public class CelebrateVillagersSurvivedRaid extends Behavior<Villager> {
+    @Nullable
+    private Raid currentRaid;
+    
+    public CelebrateVillagersSurvivedRaid(final int integer1, final int integer2) {
+        super(ImmutableMap.of(), integer1, integer2);
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        final BlockPos fu4 = bdp.blockPosition();
+        this.currentRaid = zd.getRaidAt(fu4);
+        return this.currentRaid != null && this.currentRaid.isVictory() && MoveToSkySeeingSpot.hasNoBlocksAbove(zd, bdp, fu4);
+    }
+    
+    @Override
+    protected boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
+        return this.currentRaid != null && !this.currentRaid.isStopped();
+    }
+    
+    @Override
+    protected void stop(final ServerLevel zd, final Villager bdp, final long long3) {
+        this.currentRaid = null;
+        bdp.getBrain().updateActivityFromSchedule(zd.getDayTime(), zd.getGameTime());
+    }
+    
+    @Override
+    protected void stop(final ServerLevel zd, final Villager bdp, final long long3) {
+        final Random random6 = bdp.getRandom();
+        if (random6.nextInt(100) == 0) {
+            bdp.playCelebrateSound();
+        }
+        if (random6.nextInt(200) == 0 && MoveToSkySeeingSpot.hasNoBlocksAbove(zd, bdp, bdp.blockPosition())) {
+            final DyeColor bje7 = Util.<DyeColor>getRandom(DyeColor.values(), random6);
+            final int integer8 = random6.nextInt(3);
+            final ItemStack bki9 = this.getFirework(bje7, integer8);
+            final FireworkRocketEntity ben10 = new FireworkRocketEntity(bdp.level, bdp, bdp.getX(), bdp.getEyeY(), bdp.getZ(), bki9);
+            bdp.level.addFreshEntity(ben10);
+        }
+    }
+    
+    private ItemStack getFirework(final DyeColor bje, final int integer) {
+        final ItemStack bki4 = new ItemStack(Items.FIREWORK_ROCKET, 1);
+        final ItemStack bki5 = new ItemStack(Items.FIREWORK_STAR);
+        final CompoundTag le6 = bki5.getOrCreateTagElement("Explosion");
+        final List<Integer> list7 = Lists.newArrayList();
+        list7.add(bje.getFireworkColor());
+        le6.putIntArray("Colors", list7);
+        le6.putByte("Type", (byte)FireworkRocketItem.Shape.BURST.getId());
+        final CompoundTag le7 = bki4.getOrCreateTagElement("Fireworks");
+        final ListTag lk9 = new ListTag();
+        final CompoundTag le8 = bki5.getTagElement("Explosion");
+        if (le8 != null) {
+            ((AbstractList<CompoundTag>)lk9).add(le8);
+        }
+        le7.putByte("Flight", (byte)integer);
+        if (!lk9.isEmpty()) {
+            le7.put("Explosions", lk9);
+        }
+        return bki4;
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/CopyMemoryWithExpiry.java b/src/net/minecraft/world/entity/ai/behavior/CopyMemoryWithExpiry.java
new file mode 100644
index 0000000..3a5c8e3
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/CopyMemoryWithExpiry.java
@@ -0,0 +1,38 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.util.IntRange;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.Mob;
+
+public class CopyMemoryWithExpiry<E extends Mob, T> extends Behavior<E> {
+    private final Predicate<E> predicate;
+    private final MemoryModuleType<? extends T> sourceMemory;
+    private final MemoryModuleType<T> targetMemory;
+    private final IntRange durationOfCopy;
+    
+    public CopyMemoryWithExpiry(final Predicate<E> predicate, final MemoryModuleType<? extends T> awp2, final MemoryModuleType<T> awp3, final IntRange adx) {
+        super(ImmutableMap.<MemoryModuleType<? extends T>, MemoryStatus>of(awp2, MemoryStatus.VALUE_PRESENT, awp3, MemoryStatus.VALUE_ABSENT));
+        this.predicate = predicate;
+        this.sourceMemory = awp2;
+        this.targetMemory = awp3;
+        this.durationOfCopy = adx;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoz) {
+        return this.predicate.test(aoz);
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoz, final long long3) {
+        final Brain<?> apr6 = aoz.getBrain();
+        apr6.<T>setMemoryWithExpiry(this.targetMemory, (T)apr6.getMemory(this.sourceMemory).get(), this.durationOfCopy.randomValue(zd.random));
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/CrossbowAttack.java b/src/net/minecraft/world/entity/ai/behavior/CrossbowAttack.java
new file mode 100644
index 0000000..cc0cb13
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/CrossbowAttack.java
@@ -0,0 +1,102 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.entity.monster.RangedAttackMob;
+import net.minecraft.world.entity.projectile.ProjectileUtil;
+import net.minecraft.world.item.CrossbowItem;
+import net.minecraft.world.entity.monster.CrossbowAttackMob;
+import net.minecraft.world.item.Items;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.LivingEntity;
+
+public class CrossbowAttack<E extends Mob, T extends LivingEntity> extends Behavior<E> {
+    private int attackDelay;
+    private CrossbowState crossbowState;
+    
+    public CrossbowAttack() {
+        super(ImmutableMap.<MemoryModuleType<PositionTracker>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<PositionTracker>)MemoryModuleType.ATTACK_TARGET, MemoryStatus.VALUE_PRESENT), 1200);
+        this.crossbowState = CrossbowState.UNCHARGED;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoz) {
+        final LivingEntity aoy4 = getAttackTarget((LivingEntity)aoz);
+        return ((LivingEntity)aoz).isHolding(Items.CROSSBOW) && BehaviorUtils.canSee((LivingEntity)aoz, aoy4) && BehaviorUtils.isWithinAttackRange((Mob)aoz, aoy4, 0);
+    }
+    
+    @Override
+    protected boolean canStillUse(final ServerLevel zd, final E aoz, final long long3) {
+        return ((LivingEntity)aoz).getBrain().hasMemoryValue(MemoryModuleType.ATTACK_TARGET) && this.checkExtraStartConditions(zd, aoz);
+    }
+    
+    @Override
+    protected void tick(final ServerLevel zd, final E aoz, final long long3) {
+        final LivingEntity aoy6 = getAttackTarget((LivingEntity)aoz);
+        this.lookAtTarget((Mob)aoz, aoy6);
+        this.crossbowAttack(aoz, aoy6);
+    }
+    
+    @Override
+    protected void stop(final ServerLevel zd, final E aoz, final long long3) {
+        if (((LivingEntity)aoz).isUsingItem()) {
+            ((LivingEntity)aoz).stopUsingItem();
+        }
+        if (((LivingEntity)aoz).isHolding(Items.CROSSBOW)) {
+            ((CrossbowAttackMob)aoz).setChargingCrossbow(false);
+            CrossbowItem.setCharged(((LivingEntity)aoz).getUseItem(), false);
+        }
+    }
+    
+    private void crossbowAttack(final E aoz, final LivingEntity aoy) {
+        if (this.crossbowState == CrossbowState.UNCHARGED) {
+            ((LivingEntity)aoz).startUsingItem(ProjectileUtil.getWeaponHoldingHand((LivingEntity)aoz, Items.CROSSBOW));
+            this.crossbowState = CrossbowState.CHARGING;
+            ((CrossbowAttackMob)aoz).setChargingCrossbow(true);
+        }
+        else if (this.crossbowState == CrossbowState.CHARGING) {
+            if (!((LivingEntity)aoz).isUsingItem()) {
+                this.crossbowState = CrossbowState.UNCHARGED;
+            }
+            final int integer4 = ((LivingEntity)aoz).getTicksUsingItem();
+            final ItemStack bki5 = ((LivingEntity)aoz).getUseItem();
+            if (integer4 >= CrossbowItem.getChargeDuration(bki5)) {
+                ((LivingEntity)aoz).releaseUsingItem();
+                this.crossbowState = CrossbowState.CHARGED;
+                this.attackDelay = 20 + ((LivingEntity)aoz).getRandom().nextInt(20);
+                ((CrossbowAttackMob)aoz).setChargingCrossbow(false);
+            }
+        }
+        else if (this.crossbowState == CrossbowState.CHARGED) {
+            --this.attackDelay;
+            if (this.attackDelay == 0) {
+                this.crossbowState = CrossbowState.READY_TO_ATTACK;
+            }
+        }
+        else if (this.crossbowState == CrossbowState.READY_TO_ATTACK) {
+            ((RangedAttackMob)aoz).performRangedAttack(aoy, 1.0f);
+            final ItemStack bki6 = ((LivingEntity)aoz).getItemInHand(ProjectileUtil.getWeaponHoldingHand((LivingEntity)aoz, Items.CROSSBOW));
+            CrossbowItem.setCharged(bki6, false);
+            this.crossbowState = CrossbowState.UNCHARGED;
+        }
+    }
+    
+    private void lookAtTarget(final Mob aoz, final LivingEntity aoy) {
+        aoz.getBrain().<EntityTracker>setMemory((MemoryModuleType<EntityTracker>)MemoryModuleType.LOOK_TARGET, new EntityTracker(aoy, true));
+    }
+    
+    private static LivingEntity getAttackTarget(final LivingEntity aoy) {
+        return aoy.getBrain().<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET).get();
+    }
+    
+    enum CrossbowState {
+        UNCHARGED, 
+        CHARGING, 
+        CHARGED, 
+        READY_TO_ATTACK;
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/DismountOrSkipMounting.java b/src/net/minecraft/world/entity/ai/behavior/DismountOrSkipMounting.java
new file mode 100644
index 0000000..50d25e2
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/DismountOrSkipMounting.java
@@ -0,0 +1,42 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.function.BiPredicate;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+
+public class DismountOrSkipMounting<E extends LivingEntity, T extends Entity> extends Behavior<E> {
+    private final int maxWalkDistToRideTarget;
+    private final BiPredicate<E, Entity> dontRideIf;
+    
+    public DismountOrSkipMounting(final int integer, final BiPredicate<E, Entity> biPredicate) {
+        super(ImmutableMap.<MemoryModuleType<Entity>, MemoryStatus>of(MemoryModuleType.RIDE_TARGET, MemoryStatus.REGISTERED));
+        this.maxWalkDistToRideTarget = integer;
+        this.dontRideIf = biPredicate;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoy) {
+        final Entity aom4 = aoy.getVehicle();
+        final Entity aom5 = aoy.getBrain().<Entity>getMemory(MemoryModuleType.RIDE_TARGET).orElse(null);
+        if (aom4 == null && aom5 == null) {
+            return false;
+        }
+        final Entity aom6 = (aom4 == null) ? aom5 : aom4;
+        return !this.isVehicleValid(aoy, aom6) || this.dontRideIf.test(aoy, aom6);
+    }
+    
+    private boolean isVehicleValid(final E aoy, final Entity aom) {
+        return aom.isAlive() && aom.closerThan(aoy, this.maxWalkDistToRideTarget) && aom.level == aoy.level;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoy, final long long3) {
+        aoy.stopRiding();
+        aoy.getBrain().<Entity>eraseMemory(MemoryModuleType.RIDE_TARGET);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/DoNothing.java b/src/net/minecraft/world/entity/ai/behavior/DoNothing.java
index d3e7e34..0db5703 100644
--- a/src/net/minecraft/world/entity/ai/behavior/DoNothing.java
+++ b/src/net/minecraft/world/entity/ai/behavior/DoNothing.java
@@ -11,7 +11,7 @@ public class DoNothing extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final LivingEntity akz, final long long3) {
+    protected boolean canStillUse(final ServerLevel zd, final LivingEntity aoy, final long long3) {
         return true;
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/EntityPosWrapper.java b/src/net/minecraft/world/entity/ai/behavior/EntityPosWrapper.java
deleted file mode 100644
index 6ff5d50..0000000
--- a/src/net/minecraft/world/entity/ai/behavior/EntityPosWrapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package net.minecraft.world.entity.ai.behavior;
-
-import java.util.Optional;
-import java.util.List;
-import net.minecraft.world.entity.ai.memory.MemoryModuleType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.Entity;
-
-public class EntityPosWrapper implements PositionWrapper {
-    private final Entity entity;
-    
-    public EntityPosWrapper(final Entity akq) {
-        this.entity = akq;
-    }
-    
-    @Override
-    public BlockPos getPos() {
-        return new BlockPos(this.entity);
-    }
-    
-    @Override
-    public Vec3 getLookAtPos() {
-        return new Vec3(this.entity.getX(), this.entity.getEyeY(), this.entity.getZ());
-    }
-    
-    @Override
-    public boolean isVisible(final LivingEntity akz) {
-        final Optional<List<LivingEntity>> optional3 = akz.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES);
-        return this.entity.isAlive() && optional3.isPresent() && optional3.get().contains(this.entity);
-    }
-    
-    @Override
-    public String toString() {
-        return "EntityPosWrapper for " + this.entity;
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/behavior/EntityTracker.java b/src/net/minecraft/world/entity/ai/behavior/EntityTracker.java
new file mode 100644
index 0000000..801d1cb
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/EntityTracker.java
@@ -0,0 +1,43 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import java.util.Optional;
+import java.util.List;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.Entity;
+
+public class EntityTracker implements PositionTracker {
+    private final Entity entity;
+    private final boolean trackEyeHeight;
+    
+    public EntityTracker(final Entity aom, final boolean boolean2) {
+        this.entity = aom;
+        this.trackEyeHeight = boolean2;
+    }
+    
+    @Override
+    public Vec3 currentPosition() {
+        return this.trackEyeHeight ? this.entity.position().add(0.0, this.entity.getEyeHeight(), 0.0) : this.entity.position();
+    }
+    
+    @Override
+    public BlockPos currentBlockPosition() {
+        return this.entity.blockPosition();
+    }
+    
+    @Override
+    public boolean isVisibleBy(final LivingEntity aoy) {
+        if (this.entity instanceof LivingEntity) {
+            final Optional<List<LivingEntity>> optional3 = aoy.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES);
+            return this.entity.isAlive() && optional3.isPresent() && optional3.get().contains(this.entity);
+        }
+        return true;
+    }
+    
+    @Override
+    public String toString() {
+        return "EntityTracker for " + this.entity;
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/EraseMemoryIf.java b/src/net/minecraft/world/entity/ai/behavior/EraseMemoryIf.java
new file mode 100644
index 0000000..29cac98
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/EraseMemoryIf.java
@@ -0,0 +1,30 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.LivingEntity;
+
+public class EraseMemoryIf<E extends LivingEntity> extends Behavior<E> {
+    private final Predicate<E> predicate;
+    private final MemoryModuleType<?> memoryType;
+    
+    public EraseMemoryIf(final Predicate<E> predicate, final MemoryModuleType<?> awp) {
+        super(ImmutableMap.<MemoryModuleType<?>, MemoryStatus>of(awp, MemoryStatus.VALUE_PRESENT));
+        this.predicate = predicate;
+        this.memoryType = awp;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoy) {
+        return this.predicate.test(aoy);
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoy, final long long3) {
+        aoy.getBrain().eraseMemory(this.memoryType);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/GateBehavior.java b/src/net/minecraft/world/entity/ai/behavior/GateBehavior.java
index c248a3b..4c22539 100644
--- a/src/net/minecraft/world/entity/ai/behavior/GateBehavior.java
+++ b/src/net/minecraft/world/entity/ai/behavior/GateBehavior.java
@@ -28,8 +28,8 @@ public class GateBehavior<E extends LivingEntity> extends Behavior<E> {
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final E akz, final long long3) {
-        return this.behaviors.stream().filter(amb -> amb.getStatus() == Status.RUNNING).anyMatch(amb -> amb.canStillUse(xd, akz, long3));
+    protected boolean canStillUse(final ServerLevel zd, final E aoy, final long long3) {
+        return this.behaviors.stream().filter(aqh -> aqh.getStatus() == Status.RUNNING).anyMatch(aqh -> aqh.canStillUse(zd, aoy, long3));
     }
     
     @Override
@@ -38,30 +38,30 @@ public class GateBehavior<E extends LivingEntity> extends Behavior<E> {
     }
     
     @Override
-    protected void start(final ServerLevel xd, final E akz, final long long3) {
+    protected void start(final ServerLevel zd, final E aoy, final long long3) {
         this.orderPolicy.apply(this.behaviors);
-        this.runningPolicy.<E>apply(this.behaviors, xd, akz, long3);
+        this.runningPolicy.<E>apply(this.behaviors, zd, aoy, long3);
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final E akz, final long long3) {
-        this.behaviors.stream().filter(amb -> amb.getStatus() == Status.RUNNING).forEach(amb -> amb.tickOrStop(xd, akz, long3));
+    protected void tick(final ServerLevel zd, final E aoy, final long long3) {
+        this.behaviors.stream().filter(aqh -> aqh.getStatus() == Status.RUNNING).forEach(aqh -> aqh.tickOrStop(zd, aoy, long3));
     }
     
     @Override
-    protected void stop(final ServerLevel xd, final E akz, final long long3) {
-        this.behaviors.stream().filter(amb -> amb.getStatus() == Status.RUNNING).forEach(amb -> amb.doStop(xd, akz, long3));
-        this.exitErasedMemories.forEach(akz.getBrain()::eraseMemory);
+    protected void stop(final ServerLevel zd, final E aoy, final long long3) {
+        this.behaviors.stream().filter(aqh -> aqh.getStatus() == Status.RUNNING).forEach(aqh -> aqh.doStop(zd, aoy, long3));
+        this.exitErasedMemories.forEach(aoy.getBrain()::eraseMemory);
     }
     
     @Override
     public String toString() {
-        final Set<? extends Behavior<? super E>> set2 = this.behaviors.stream().filter(amb -> amb.getStatus() == Status.RUNNING).collect(Collectors.<Behavior<? super E>>toSet());
+        final Set<? extends Behavior<? super E>> set2 = this.behaviors.stream().filter(aqh -> aqh.getStatus() == Status.RUNNING).collect(Collectors.<Behavior<? super E>>toSet());
         return "(" + this.getClass().getSimpleName() + "): " + set2;
     }
     
     enum OrderPolicy {
-        ORDERED(aod -> {}), 
+        ORDERED(atb -> {}), 
         SHUFFLED(WeightedList::shuffle);
         
         private final Consumer<WeightedList<?>> consumer;
@@ -70,25 +70,25 @@ public class GateBehavior<E extends LivingEntity> extends Behavior<E> {
             this.consumer = consumer;
         }
         
-        public void apply(final WeightedList<?> aod) {
-            this.consumer.accept(aod);
+        public void apply(final WeightedList<?> atb) {
+            this.consumer.accept(atb);
         }
     }
     
     enum RunningPolicy {
         RUN_ONE {
             @Override
-            public <E extends LivingEntity> void apply(final WeightedList<Behavior<? super E>> aod, final ServerLevel xd, final E akz, final long long4) {
-                aod.stream().filter(amb -> amb.getStatus() == Status.STOPPED).filter(amb -> amb.tryStart(xd, akz, long4)).findFirst();
+            public <E extends LivingEntity> void apply(final WeightedList<Behavior<? super E>> atb, final ServerLevel zd, final E aoy, final long long4) {
+                atb.stream().filter(aqh -> aqh.getStatus() == Status.STOPPED).filter(aqh -> aqh.tryStart(zd, aoy, long4)).findFirst();
             }
         }, 
         TRY_ALL {
             @Override
-            public <E extends LivingEntity> void apply(final WeightedList<Behavior<? super E>> aod, final ServerLevel xd, final E akz, final long long4) {
-                aod.stream().filter(amb -> amb.getStatus() == Status.STOPPED).forEach(amb -> amb.tryStart(xd, akz, long4));
+            public <E extends LivingEntity> void apply(final WeightedList<Behavior<? super E>> atb, final ServerLevel zd, final E aoy, final long long4) {
+                atb.stream().filter(aqh -> aqh.getStatus() == Status.STOPPED).forEach(aqh -> aqh.tryStart(zd, aoy, long4));
             }
         };
         
-        public abstract <E extends LivingEntity> void apply(final WeightedList<Behavior<? super E>> aod, final ServerLevel xd, final E akz, final long long4);
+        public abstract <E extends LivingEntity> void apply(final WeightedList<Behavior<? super E>> atb, final ServerLevel zd, final E aoy, final long long4);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/GiveGiftToHero.java b/src/net/minecraft/world/entity/ai/behavior/GiveGiftToHero.java
index 55d5fca..1e6fabc 100644
--- a/src/net/minecraft/world/entity/ai/behavior/GiveGiftToHero.java
+++ b/src/net/minecraft/world/entity/ai/behavior/GiveGiftToHero.java
@@ -10,7 +10,6 @@ import java.util.function.Predicate;
 import java.util.Optional;
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.level.storage.loot.LootContext;
@@ -20,6 +19,7 @@ import net.minecraft.world.item.Items;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.server.level.ServerLevel;
@@ -44,8 +44,8 @@ public class GiveGiftToHero extends Behavior<Villager> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        if (!this.isHeroVisible(axw)) {
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        if (!this.isHeroVisible(bdp)) {
             return false;
         }
         if (this.timeUntilNextGift > 0) {
@@ -56,82 +56,82 @@ public class GiveGiftToHero extends Behavior<Villager> {
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
         this.giftGivenDuringThisRun = false;
         this.timeSinceStart = long3;
-        final Player ayj6 = this.getNearestTargetableHero(axw).get();
-        axw.getBrain().<LivingEntity>setMemory(MemoryModuleType.INTERACTION_TARGET, ayj6);
-        BehaviorUtils.lookAtEntity(axw, ayj6);
+        final Player bec6 = this.getNearestTargetableHero(bdp).get();
+        bdp.getBrain().<LivingEntity>setMemory(MemoryModuleType.INTERACTION_TARGET, bec6);
+        BehaviorUtils.lookAtEntity(bdp, bec6);
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final Villager axw, final long long3) {
-        return this.isHeroVisible(axw) && !this.giftGivenDuringThisRun;
+    protected boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
+        return this.isHeroVisible(bdp) && !this.giftGivenDuringThisRun;
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Villager axw, final long long3) {
-        final Player ayj6 = this.getNearestTargetableHero(axw).get();
-        BehaviorUtils.lookAtEntity(axw, ayj6);
-        if (this.isWithinThrowingDistance(axw, ayj6)) {
+    protected void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        final Player bec6 = this.getNearestTargetableHero(bdp).get();
+        BehaviorUtils.lookAtEntity(bdp, bec6);
+        if (this.isWithinThrowingDistance(bdp, bec6)) {
             if (long3 - this.timeSinceStart > 20L) {
-                this.throwGift(axw, ayj6);
+                this.throwGift(bdp, bec6);
                 this.giftGivenDuringThisRun = true;
             }
         }
         else {
-            BehaviorUtils.walkToEntity(axw, ayj6, 5);
+            BehaviorUtils.setWalkAndLookTargetMemories(bdp, bec6, 0.5f, 5);
         }
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Villager axw, final long long3) {
-        this.timeUntilNextGift = calculateTimeUntilNextGift(xd);
-        axw.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.INTERACTION_TARGET);
-        axw.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
-        axw.getBrain().<PositionWrapper>eraseMemory(MemoryModuleType.LOOK_TARGET);
+    protected void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        this.timeUntilNextGift = calculateTimeUntilNextGift(zd);
+        bdp.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.INTERACTION_TARGET);
+        bdp.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        bdp.getBrain().<PositionTracker>eraseMemory(MemoryModuleType.LOOK_TARGET);
     }
     
-    private void throwGift(final Villager axw, final LivingEntity akz) {
-        final List<ItemStack> list4 = this.getItemToThrow(axw);
-        for (final ItemStack ben6 : list4) {
-            BehaviorUtils.throwItem(axw, ben6, akz);
+    private void throwGift(final Villager bdp, final LivingEntity aoy) {
+        final List<ItemStack> list4 = this.getItemToThrow(bdp);
+        for (final ItemStack bki6 : list4) {
+            BehaviorUtils.throwItem(bdp, bki6, aoy.position());
         }
     }
     
-    private List<ItemStack> getItemToThrow(final Villager axw) {
-        if (axw.isBaby()) {
+    private List<ItemStack> getItemToThrow(final Villager bdp) {
+        if (bdp.isBaby()) {
             return ImmutableList.<ItemStack>of(new ItemStack(Items.POPPY));
         }
-        final VillagerProfession axz3 = axw.getVillagerData().getProfession();
-        if (GiveGiftToHero.gifts.containsKey(axz3)) {
-            final LootTable csa4 = axw.level.getServer().getLootTables().get(GiveGiftToHero.gifts.get(axz3));
-            final LootContext.Builder a5 = new LootContext.Builder((ServerLevel)axw.level).<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(axw)).<Entity>withParameter(LootContextParams.THIS_ENTITY, axw).withRandom(axw.getRandom());
-            return csa4.getRandomItems(a5.create(LootContextParamSets.GIFT));
+        final VillagerProfession bds3 = bdp.getVillagerData().getProfession();
+        if (GiveGiftToHero.gifts.containsKey(bds3)) {
+            final LootTable daw4 = bdp.level.getServer().getLootTables().get(GiveGiftToHero.gifts.get(bds3));
+            final LootContext.Builder a5 = new LootContext.Builder((ServerLevel)bdp.level).<BlockPos>withParameter(LootContextParams.BLOCK_POS, bdp.blockPosition()).<Entity>withParameter(LootContextParams.THIS_ENTITY, bdp).withRandom(bdp.getRandom());
+            return daw4.getRandomItems(a5.create(LootContextParamSets.GIFT));
         }
         return ImmutableList.<ItemStack>of(new ItemStack(Items.WHEAT_SEEDS));
     }
     
-    private boolean isHeroVisible(final Villager axw) {
-        return this.getNearestTargetableHero(axw).isPresent();
+    private boolean isHeroVisible(final Villager bdp) {
+        return this.getNearestTargetableHero(bdp).isPresent();
     }
     
-    private Optional<Player> getNearestTargetableHero(final Villager axw) {
-        return axw.getBrain().<Player>getMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER).filter(this::isHero);
+    private Optional<Player> getNearestTargetableHero(final Villager bdp) {
+        return bdp.getBrain().<Player>getMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER).filter(this::isHero);
     }
     
-    private boolean isHero(final Player ayj) {
-        return ayj.hasEffect(MobEffects.HERO_OF_THE_VILLAGE);
+    private boolean isHero(final Player bec) {
+        return bec.hasEffect(MobEffects.HERO_OF_THE_VILLAGE);
     }
     
-    private boolean isWithinThrowingDistance(final Villager axw, final Player ayj) {
-        final BlockPos fk4 = new BlockPos(ayj);
-        final BlockPos fk5 = new BlockPos(axw);
-        return fk5.closerThan(fk4, 5.0);
+    private boolean isWithinThrowingDistance(final Villager bdp, final Player bec) {
+        final BlockPos fu4 = bec.blockPosition();
+        final BlockPos fu5 = bdp.blockPosition();
+        return fu5.closerThan(fu4, 5.0);
     }
     
-    private static int calculateTimeUntilNextGift(final ServerLevel xd) {
-        return 600 + xd.random.nextInt(6001);
+    private static int calculateTimeUntilNextGift(final ServerLevel zd) {
+        return 600 + zd.random.nextInt(6001);
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/ai/behavior/GoOutsideToCelebrate.java b/src/net/minecraft/world/entity/ai/behavior/GoOutsideToCelebrate.java
index 0ab227e..c78b73a 100644
--- a/src/net/minecraft/world/entity/ai/behavior/GoOutsideToCelebrate.java
+++ b/src/net/minecraft/world/entity/ai/behavior/GoOutsideToCelebrate.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.raid.Raid;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.server.level.ServerLevel;
 
@@ -12,8 +10,8 @@ public class GoOutsideToCelebrate extends MoveToSkySeeingSpot {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        final Raid azn4 = xd.getRaidAt(new BlockPos(akz));
-        return azn4 != null && azn4.isVictory() && super.checkExtraStartConditions(xd, akz);
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        final Raid bfh4 = zd.getRaidAt(aoy.blockPosition());
+        return bfh4 != null && bfh4.isVictory() && super.checkExtraStartConditions(zd, aoy);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/GoToCelebrateLocation.java b/src/net/minecraft/world/entity/ai/behavior/GoToCelebrateLocation.java
new file mode 100644
index 0000000..ac767d8
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/GoToCelebrateLocation.java
@@ -0,0 +1,45 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import java.util.Random;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.core.Vec3i;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.core.BlockPos;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.Mob;
+
+public class GoToCelebrateLocation<E extends Mob> extends Behavior<E> {
+    private final int closeEnoughDist;
+    private final float speedModifier;
+    
+    public GoToCelebrateLocation(final int integer, final float float2) {
+        super(ImmutableMap.<MemoryModuleType<BlockPos>, MemoryStatus>of(MemoryModuleType.CELEBRATE_LOCATION, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<BlockPos>)MemoryModuleType.ATTACK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<BlockPos>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<BlockPos>)MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED));
+        this.closeEnoughDist = integer;
+        this.speedModifier = float2;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final Mob aoz, final long long3) {
+        final BlockPos fu6 = getCelebrateLocation(aoz);
+        final boolean boolean7 = fu6.closerThan(aoz.blockPosition(), this.closeEnoughDist);
+        if (!boolean7) {
+            BehaviorUtils.setWalkAndLookTargetMemories(aoz, getNearbyPos(aoz, fu6), this.speedModifier, this.closeEnoughDist);
+        }
+    }
+    
+    private static BlockPos getNearbyPos(final Mob aoz, final BlockPos fu) {
+        final Random random3 = aoz.level.random;
+        return fu.offset(getRandomOffset(random3), 0, getRandomOffset(random3));
+    }
+    
+    private static int getRandomOffset(final Random random) {
+        return random.nextInt(3) - 1;
+    }
+    
+    private static BlockPos getCelebrateLocation(final Mob aoz) {
+        return aoz.getBrain().<BlockPos>getMemory(MemoryModuleType.CELEBRATE_LOCATION).get();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/GoToClosestVillage.java b/src/net/minecraft/world/entity/ai/behavior/GoToClosestVillage.java
index 53cc00d..e5acfe0 100644
--- a/src/net/minecraft/world/entity/ai/behavior/GoToClosestVillage.java
+++ b/src/net/minecraft/world/entity/ai/behavior/GoToClosestVillage.java
@@ -3,11 +3,10 @@ package net.minecraft.world.entity.ai.behavior;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.ai.village.poi.PoiManager;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.ai.util.RandomPos;
 import net.minecraft.core.SectionPos;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
@@ -17,40 +16,40 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.npc.Villager;
 
 public class GoToClosestVillage extends Behavior<Villager> {
-    private final float speed;
+    private final float speedModifier;
     private final int closeEnoughDistance;
     
     public GoToClosestVillage(final float float1, final int integer) {
         super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT));
-        this.speed = float1;
+        this.speedModifier = float1;
         this.closeEnoughDistance = integer;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        return !xd.isVillage(new BlockPos(axw));
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        return !zd.isVillage(bdp.blockPosition());
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        final PoiManager asr6 = xd.getPoiManager();
-        final int integer7 = asr6.sectionsToVillage(SectionPos.of(new BlockPos(axw)));
-        Vec3 cvl8 = null;
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        final PoiManager axz6 = zd.getPoiManager();
+        final int integer7 = axz6.sectionsToVillage(SectionPos.of(bdp.blockPosition()));
+        Vec3 dem8 = null;
         for (int integer8 = 0; integer8 < 5; ++integer8) {
-            final Vec3 cvl9 = RandomPos.getLandPos(axw, 15, 7, fk -> -xd.sectionsToVillage(SectionPos.of(fk)));
-            if (cvl9 != null) {
-                final int integer9 = asr6.sectionsToVillage(SectionPos.of(new BlockPos(cvl9)));
+            final Vec3 dem9 = RandomPos.getLandPos(bdp, 15, 7, fu -> -zd.sectionsToVillage(SectionPos.of(fu)));
+            if (dem9 != null) {
+                final int integer9 = axz6.sectionsToVillage(SectionPos.of(new BlockPos(dem9)));
                 if (integer9 < integer7) {
-                    cvl8 = cvl9;
+                    dem8 = dem9;
                     break;
                 }
                 if (integer9 == integer7) {
-                    cvl8 = cvl9;
+                    dem8 = dem9;
                 }
             }
         }
-        if (cvl8 != null) {
-            axw.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(cvl8, this.speed, this.closeEnoughDistance));
+        if (dem8 != null) {
+            bdp.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(dem8, this.speedModifier, this.closeEnoughDistance));
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/GoToPotentialJobSite.java b/src/net/minecraft/world/entity/ai/behavior/GoToPotentialJobSite.java
new file mode 100644
index 0000000..3fa672a
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/GoToPotentialJobSite.java
@@ -0,0 +1,64 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.ai.village.poi.PoiType;
+import net.minecraft.world.entity.ai.village.poi.PoiManager;
+import net.minecraft.core.BlockPos;
+import java.util.Optional;
+import net.minecraft.network.protocol.game.DebugPackets;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.schedule.Activity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.core.GlobalPos;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.npc.Villager;
+
+public class GoToPotentialJobSite extends Behavior<Villager> {
+    final float speedModifier;
+    
+    public GoToPotentialJobSite(final float float1) {
+        super(ImmutableMap.<MemoryModuleType<GlobalPos>, MemoryStatus>of(MemoryModuleType.POTENTIAL_JOB_SITE, MemoryStatus.VALUE_PRESENT), 1200);
+        this.speedModifier = float1;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        return bdp.getBrain().getActiveNonCoreActivity().<Boolean>map(bfl -> bfl == Activity.IDLE || bfl == Activity.WORK || bfl == Activity.PLAY).orElse(true);
+    }
+    
+    @Override
+    protected boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
+        return bdp.getBrain().hasMemoryValue(MemoryModuleType.POTENTIAL_JOB_SITE);
+    }
+    
+    @Override
+    protected void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        BehaviorUtils.setWalkAndLookTargetMemories(bdp, bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.POTENTIAL_JOB_SITE).get().pos(), this.speedModifier, 1);
+    }
+    
+    @Override
+    protected void stop(final ServerLevel zd, final Villager bdp, final long long3) {
+        final Optional<GlobalPos> optional6 = bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.POTENTIAL_JOB_SITE);
+        final BlockPos fu3;
+        final ServerLevel zd2;
+        PoiManager axz5;
+        optional6.ifPresent(gc -> {
+            fu3 = gc.pos();
+            zd2 = zd.getServer().getLevel(gc.dimension());
+            if (zd2 == null) {
+                return;
+            }
+            else {
+                axz5 = zd2.getPoiManager();
+                if (axz5.exists(fu3, ayc -> true)) {
+                    axz5.release(fu3);
+                }
+                DebugPackets.sendPoiTicketCountPacket(zd, fu3);
+                return;
+            }
+        });
+        bdp.getBrain().<GlobalPos>eraseMemory(MemoryModuleType.POTENTIAL_JOB_SITE);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/GoToWantedItem.java b/src/net/minecraft/world/entity/ai/behavior/GoToWantedItem.java
new file mode 100644
index 0000000..7b0f2f6
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/GoToWantedItem.java
@@ -0,0 +1,42 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.LivingEntity;
+
+public class GoToWantedItem<E extends LivingEntity> extends Behavior<E> {
+    private final Predicate<E> predicate;
+    private final int maxDistToWalk;
+    private final float speedModifier;
+    
+    public GoToWantedItem(final float float1, final boolean boolean2, final int integer) {
+        this(aoy -> true, float1, boolean2, integer);
+    }
+    
+    public GoToWantedItem(final Predicate<E> predicate, final float float2, final boolean boolean3, final int integer) {
+        super(ImmutableMap.<MemoryModuleType<PositionTracker>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<PositionTracker>)MemoryModuleType.WALK_TARGET, boolean3 ? MemoryStatus.REGISTERED : MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionTracker>)MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, MemoryStatus.VALUE_PRESENT));
+        this.predicate = predicate;
+        this.maxDistToWalk = integer;
+        this.speedModifier = float2;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoy) {
+        return this.predicate.test(aoy) && this.getClosestLovedItem(aoy).closerThan(aoy, this.maxDistToWalk);
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoy, final long long3) {
+        BehaviorUtils.setWalkAndLookTargetMemories(aoy, this.getClosestLovedItem(aoy), this.speedModifier, 0);
+    }
+    
+    private ItemEntity getClosestLovedItem(final E aoy) {
+        return aoy.getBrain().<ItemEntity>getMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM).get();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/src/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
index 7acd592..02a6056 100644
--- a/src/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
+++ b/src/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
@@ -1,20 +1,21 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.core.Position;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.FarmBlock;
 import net.minecraft.world.level.block.CropBlock;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.SimpleContainer;
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.server.level.ServerLevel;
@@ -31,121 +32,108 @@ import net.minecraft.world.entity.npc.Villager;
 public class HarvestFarmland extends Behavior<Villager> {
     @Nullable
     private BlockPos aboveFarmlandPos;
-    private boolean canPlantStuff;
-    private boolean wantsToReapStuff;
     private long nextOkStartTime;
     private int timeWorkedSoFar;
     private final List<BlockPos> validFarmlandAroundVillager;
     
     public HarvestFarmland() {
-        super(ImmutableMap.<MemoryModuleType<PositionWrapper>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionWrapper>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionWrapper>)MemoryModuleType.SECONDARY_JOB_SITE, MemoryStatus.VALUE_PRESENT));
+        super(ImmutableMap.<MemoryModuleType<PositionTracker>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionTracker>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionTracker>)MemoryModuleType.SECONDARY_JOB_SITE, MemoryStatus.VALUE_PRESENT));
         this.validFarmlandAroundVillager = Lists.newArrayList();
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        if (!xd.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        if (!zd.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
             return false;
         }
-        if (axw.getVillagerData().getProfession() != VillagerProfession.FARMER) {
+        if (bdp.getVillagerData().getProfession() != VillagerProfession.FARMER) {
             return false;
         }
-        this.canPlantStuff = axw.hasFarmSeeds();
-        this.wantsToReapStuff = false;
-        final SimpleContainer ajq4 = axw.getInventory();
-        for (int integer5 = ajq4.getContainerSize(), integer6 = 0; integer6 < integer5; ++integer6) {
-            final ItemStack ben7 = ajq4.getItem(integer6);
-            if (ben7.isEmpty()) {
-                this.wantsToReapStuff = true;
-                break;
-            }
-            if (ben7.getItem() == Items.WHEAT_SEEDS || ben7.getItem() == Items.BEETROOT_SEEDS) {
-                this.wantsToReapStuff = true;
-                break;
-            }
-        }
-        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos(axw);
+        final BlockPos.MutableBlockPos a4 = bdp.blockPosition().mutable();
         this.validFarmlandAroundVillager.clear();
-        for (int integer7 = -1; integer7 <= 1; ++integer7) {
-            for (int integer8 = -1; integer8 <= 1; ++integer8) {
-                for (int integer9 = -1; integer9 <= 1; ++integer9) {
-                    a6.set(axw.getX() + integer7, axw.getY() + integer8, axw.getZ() + integer9);
-                    if (this.validPos(a6, xd)) {
-                        this.validFarmlandAroundVillager.add(new BlockPos(a6));
+        for (int integer5 = -1; integer5 <= 1; ++integer5) {
+            for (int integer6 = -1; integer6 <= 1; ++integer6) {
+                for (int integer7 = -1; integer7 <= 1; ++integer7) {
+                    a4.set(bdp.getX() + integer5, bdp.getY() + integer6, bdp.getZ() + integer7);
+                    if (this.validPos(a4, zd)) {
+                        this.validFarmlandAroundVillager.add(new BlockPos(a4));
                     }
                 }
             }
         }
-        this.aboveFarmlandPos = this.getValidFarmland(xd);
-        return (this.canPlantStuff || this.wantsToReapStuff) && this.aboveFarmlandPos != null;
+        this.aboveFarmlandPos = this.getValidFarmland(zd);
+        return this.aboveFarmlandPos != null;
     }
     
     @Nullable
-    private BlockPos getValidFarmland(final ServerLevel xd) {
-        return this.validFarmlandAroundVillager.isEmpty() ? null : this.validFarmlandAroundVillager.get(xd.getRandom().nextInt(this.validFarmlandAroundVillager.size()));
+    private BlockPos getValidFarmland(final ServerLevel zd) {
+        return this.validFarmlandAroundVillager.isEmpty() ? null : this.validFarmlandAroundVillager.get(zd.getRandom().nextInt(this.validFarmlandAroundVillager.size()));
     }
     
-    private boolean validPos(final BlockPos fk, final ServerLevel xd) {
-        final BlockState byj4 = xd.getBlockState(fk);
-        final Block bph5 = byj4.getBlock();
-        final Block bph6 = xd.getBlockState(fk.below()).getBlock();
-        return (bph5 instanceof CropBlock && ((CropBlock)bph5).isMaxAge(byj4) && this.wantsToReapStuff) || (byj4.isAir() && bph6 instanceof FarmBlock && this.canPlantStuff);
+    private boolean validPos(final BlockPos fu, final ServerLevel zd) {
+        final BlockState cfj4 = zd.getBlockState(fu);
+        final Block bvr5 = cfj4.getBlock();
+        final Block bvr6 = zd.getBlockState(fu.below()).getBlock();
+        return (bvr5 instanceof CropBlock && ((CropBlock)bvr5).isMaxAge(cfj4)) || (cfj4.isAir() && bvr6 instanceof FarmBlock);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
         if (long3 > this.nextOkStartTime && this.aboveFarmlandPos != null) {
-            axw.getBrain().<BlockPosWrapper>setMemory((MemoryModuleType<BlockPosWrapper>)MemoryModuleType.LOOK_TARGET, new BlockPosWrapper(this.aboveFarmlandPos));
-            axw.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(new BlockPosWrapper(this.aboveFarmlandPos), 0.5f, 1));
+            bdp.getBrain().<BlockPosTracker>setMemory((MemoryModuleType<BlockPosTracker>)MemoryModuleType.LOOK_TARGET, new BlockPosTracker(this.aboveFarmlandPos));
+            bdp.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(new BlockPosTracker(this.aboveFarmlandPos), 0.5f, 1));
         }
     }
     
     @Override
-    protected void stop(final ServerLevel xd, final Villager axw, final long long3) {
-        axw.getBrain().<PositionWrapper>eraseMemory(MemoryModuleType.LOOK_TARGET);
-        axw.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+    protected void stop(final ServerLevel zd, final Villager bdp, final long long3) {
+        bdp.getBrain().<PositionTracker>eraseMemory(MemoryModuleType.LOOK_TARGET);
+        bdp.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
         this.timeWorkedSoFar = 0;
         this.nextOkStartTime = long3 + 40L;
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Villager axw, final long long3) {
+    protected void stop(final ServerLevel zd, final Villager bdp, final long long3) {
+        if (this.aboveFarmlandPos != null && !this.aboveFarmlandPos.closerThan(bdp.position(), 1.0)) {
+            return;
+        }
         if (this.aboveFarmlandPos != null && long3 > this.nextOkStartTime) {
-            final BlockState byj6 = xd.getBlockState(this.aboveFarmlandPos);
-            final Block bph7 = byj6.getBlock();
-            final Block bph8 = xd.getBlockState(this.aboveFarmlandPos.below()).getBlock();
-            if (bph7 instanceof CropBlock && ((CropBlock)bph7).isMaxAge(byj6) && this.wantsToReapStuff) {
-                xd.destroyBlock(this.aboveFarmlandPos, true, axw);
+            final BlockState cfj6 = zd.getBlockState(this.aboveFarmlandPos);
+            final Block bvr7 = cfj6.getBlock();
+            final Block bvr8 = zd.getBlockState(this.aboveFarmlandPos.below()).getBlock();
+            if (bvr7 instanceof CropBlock && ((CropBlock)bvr7).isMaxAge(cfj6)) {
+                zd.destroyBlock(this.aboveFarmlandPos, true, bdp);
             }
-            if (byj6.isAir() && bph8 instanceof FarmBlock && this.canPlantStuff) {
-                final SimpleContainer ajq9 = axw.getInventory();
+            if (cfj6.isAir() && bvr8 instanceof FarmBlock && bdp.hasFarmSeeds()) {
+                final SimpleContainer anm9 = bdp.getInventory();
                 int integer10 = 0;
-                while (integer10 < ajq9.getContainerSize()) {
-                    final ItemStack ben11 = ajq9.getItem(integer10);
+                while (integer10 < anm9.getContainerSize()) {
+                    final ItemStack bki11 = anm9.getItem(integer10);
                     boolean boolean12 = false;
-                    if (!ben11.isEmpty()) {
-                        if (ben11.getItem() == Items.WHEAT_SEEDS) {
-                            xd.setBlock(this.aboveFarmlandPos, Blocks.WHEAT.defaultBlockState(), 3);
+                    if (!bki11.isEmpty()) {
+                        if (bki11.getItem() == Items.WHEAT_SEEDS) {
+                            zd.setBlock(this.aboveFarmlandPos, Blocks.WHEAT.defaultBlockState(), 3);
                             boolean12 = true;
                         }
-                        else if (ben11.getItem() == Items.POTATO) {
-                            xd.setBlock(this.aboveFarmlandPos, Blocks.POTATOES.defaultBlockState(), 3);
+                        else if (bki11.getItem() == Items.POTATO) {
+                            zd.setBlock(this.aboveFarmlandPos, Blocks.POTATOES.defaultBlockState(), 3);
                             boolean12 = true;
                         }
-                        else if (ben11.getItem() == Items.CARROT) {
-                            xd.setBlock(this.aboveFarmlandPos, Blocks.CARROTS.defaultBlockState(), 3);
+                        else if (bki11.getItem() == Items.CARROT) {
+                            zd.setBlock(this.aboveFarmlandPos, Blocks.CARROTS.defaultBlockState(), 3);
                             boolean12 = true;
                         }
-                        else if (ben11.getItem() == Items.BEETROOT_SEEDS) {
-                            xd.setBlock(this.aboveFarmlandPos, Blocks.BEETROOTS.defaultBlockState(), 3);
+                        else if (bki11.getItem() == Items.BEETROOT_SEEDS) {
+                            zd.setBlock(this.aboveFarmlandPos, Blocks.BEETROOTS.defaultBlockState(), 3);
                             boolean12 = true;
                         }
                     }
                     if (boolean12) {
-                        xd.playSound(null, this.aboveFarmlandPos.getX(), this.aboveFarmlandPos.getY(), this.aboveFarmlandPos.getZ(), SoundEvents.CROP_PLANTED, SoundSource.BLOCKS, 1.0f, 1.0f);
-                        ben11.shrink(1);
-                        if (ben11.isEmpty()) {
-                            ajq9.setItem(integer10, ItemStack.EMPTY);
+                        zd.playSound(null, this.aboveFarmlandPos.getX(), this.aboveFarmlandPos.getY(), this.aboveFarmlandPos.getZ(), SoundEvents.CROP_PLANTED, SoundSource.BLOCKS, 1.0f, 1.0f);
+                        bki11.shrink(1);
+                        if (bki11.isEmpty()) {
+                            anm9.setItem(integer10, ItemStack.EMPTY);
                             break;
                         }
                         break;
@@ -155,13 +143,13 @@ public class HarvestFarmland extends Behavior<Villager> {
                     }
                 }
             }
-            if (bph7 instanceof CropBlock && !((CropBlock)bph7).isMaxAge(byj6)) {
+            if (bvr7 instanceof CropBlock && !((CropBlock)bvr7).isMaxAge(cfj6)) {
                 this.validFarmlandAroundVillager.remove(this.aboveFarmlandPos);
-                this.aboveFarmlandPos = this.getValidFarmland(xd);
+                this.aboveFarmlandPos = this.getValidFarmland(zd);
                 if (this.aboveFarmlandPos != null) {
                     this.nextOkStartTime = long3 + 20L;
-                    axw.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(new BlockPosWrapper(this.aboveFarmlandPos), 0.5f, 1));
-                    axw.getBrain().<BlockPosWrapper>setMemory((MemoryModuleType<BlockPosWrapper>)MemoryModuleType.LOOK_TARGET, new BlockPosWrapper(this.aboveFarmlandPos));
+                    bdp.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(new BlockPosTracker(this.aboveFarmlandPos), 0.5f, 1));
+                    bdp.getBrain().<BlockPosTracker>setMemory((MemoryModuleType<BlockPosTracker>)MemoryModuleType.LOOK_TARGET, new BlockPosTracker(this.aboveFarmlandPos));
                 }
             }
         }
@@ -169,7 +157,7 @@ public class HarvestFarmland extends Behavior<Villager> {
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final Villager axw, final long long3) {
+    protected boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
         return this.timeWorkedSoFar < 200;
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/InsideBrownianWalk.java b/src/net/minecraft/world/entity/ai/behavior/InsideBrownianWalk.java
index 8459797..8d5080b 100644
--- a/src/net/minecraft/world/entity/ai/behavior/InsideBrownianWalk.java
+++ b/src/net/minecraft/world/entity/ai/behavior/InsideBrownianWalk.java
@@ -2,13 +2,13 @@ package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.LivingEntity;
 import java.util.Optional;
+import net.minecraft.world.entity.Entity;
 import java.util.Collections;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.function.Function;
-import java.util.List;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
+import java.util.List;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
@@ -18,24 +18,24 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.PathfinderMob;
 
 public class InsideBrownianWalk extends Behavior<PathfinderMob> {
-    private final float speed;
+    private final float speedModifier;
     
     public InsideBrownianWalk(final float float1) {
         super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT));
-        this.speed = float1;
+        this.speedModifier = float1;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final PathfinderMob alg) {
-        return !xd.canSeeSky(new BlockPos(alg));
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final PathfinderMob apg) {
+        return !zd.canSeeSky(apg.blockPosition());
     }
     
     @Override
-    protected void start(final ServerLevel xd, final PathfinderMob alg, final long long3) {
-        final BlockPos fk2 = new BlockPos(alg);
-        final List<BlockPos> list7 = BlockPos.betweenClosedStream(fk2.offset(-1, -1, -1), fk2.offset(1, 1, 1)).map(BlockPos::immutable).collect(Collectors.toList());
+    protected void start(final ServerLevel zd, final PathfinderMob apg, final long long3) {
+        final BlockPos fu2 = apg.blockPosition();
+        final List<BlockPos> list7 = BlockPos.betweenClosedStream(fu2.offset(-1, -1, -1), fu2.offset(1, 1, 1)).map(BlockPos::immutable).collect(Collectors.toList());
         Collections.shuffle(list7);
-        final Optional<BlockPos> optional8 = list7.stream().filter(fk -> !xd.canSeeSky(fk)).filter(fk -> xd.loadedAndEntityCanStandOn(fk, alg)).filter(fk -> xd.noCollision(alg)).findFirst();
-        optional8.ifPresent(fk -> alg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(fk, this.speed, 0)));
+        final Optional<BlockPos> optional8 = list7.stream().filter(fu -> !zd.canSeeSky(fu)).filter(fu -> zd.loadedAndEntityCanStandOn(fu, apg)).filter(fu -> zd.noCollision(apg)).findFirst();
+        optional8.ifPresent(fu -> apg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(fu, this.speedModifier, 0)));
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/InteractWith.java b/src/net/minecraft/world/entity/ai/behavior/InteractWith.java
index f1a0767..7e1f926 100644
--- a/src/net/minecraft/world/entity/ai/behavior/InteractWith.java
+++ b/src/net/minecraft/world/entity/ai/behavior/InteractWith.java
@@ -15,44 +15,53 @@ import net.minecraft.world.entity.LivingEntity;
 
 public class InteractWith<E extends LivingEntity, T extends LivingEntity> extends Behavior<E> {
     private final int maxDist;
-    private final float speed;
+    private final float speedModifier;
     private final EntityType<? extends T> type;
     private final int interactionRangeSqr;
     private final Predicate<T> targetFilter;
     private final Predicate<E> selfFilter;
     private final MemoryModuleType<T> memory;
     
-    public InteractWith(final EntityType<? extends T> aku, final int integer2, final Predicate<E> predicate3, final Predicate<T> predicate4, final MemoryModuleType<T> arl, final float float6, final int integer7) {
-        super(ImmutableMap.<MemoryModuleType<PositionWrapper>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<PositionWrapper>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionWrapper>)arl, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionWrapper>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT));
-        this.type = aku;
-        this.speed = float6;
+    public InteractWith(final EntityType<? extends T> aoq, final int integer2, final Predicate<E> predicate3, final Predicate<T> predicate4, final MemoryModuleType<T> awp, final float float6, final int integer7) {
+        super(ImmutableMap.<MemoryModuleType<PositionTracker>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<PositionTracker>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionTracker>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT));
+        this.type = aoq;
+        this.speedModifier = float6;
         this.interactionRangeSqr = integer2 * integer2;
         this.maxDist = integer7;
         this.targetFilter = predicate4;
         this.selfFilter = predicate3;
-        this.memory = arl;
+        this.memory = awp;
     }
     
-    public static <T extends LivingEntity> InteractWith<LivingEntity, T> of(final EntityType<? extends T> aku, final int integer2, final MemoryModuleType<T> arl, final float float4, final int integer5) {
-        return new InteractWith<LivingEntity, T>(aku, integer2, akz -> true, akz -> true, arl, float4, integer5);
+    public static <T extends LivingEntity> InteractWith<LivingEntity, T> of(final EntityType<? extends T> aoq, final int integer2, final MemoryModuleType<T> awp, final float float4, final int integer5) {
+        return new InteractWith<LivingEntity, T>(aoq, integer2, aoy -> true, aoy -> true, awp, float4, integer5);
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final E akz) {
-        return this.selfFilter.test(akz) && akz.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get().stream().anyMatch(akz -> this.type.equals(akz.getType()) && this.targetFilter.test((T)akz));
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoy) {
+        return this.selfFilter.test(aoy) && this.seesAtLeastOneValidTarget(aoy);
+    }
+    
+    private boolean seesAtLeastOneValidTarget(final E aoy) {
+        final List<LivingEntity> list3 = aoy.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get();
+        return list3.stream().anyMatch(this::isTargetValid);
+    }
+    
+    private boolean isTargetValid(final LivingEntity aoy) {
+        return this.type.equals(aoy.getType()) && this.targetFilter.test((T)aoy);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final E akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
+    protected void start(final ServerLevel zd, final E aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
         final Brain brain;
         final MemoryModuleType walk_TARGET;
         final Object object;
-        alp6.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).ifPresent(list -> list.stream().filter(akz -> this.type.equals(akz.getType())).map(akz -> akz).filter(akz2 -> akz2.distanceToSqr(akz) <= this.interactionRangeSqr).filter(this.targetFilter).findFirst().ifPresent(akz -> {
-            brain.setMemory(this.memory, akz);
-            brain.setMemory(MemoryModuleType.LOOK_TARGET, new EntityPosWrapper(akz));
+        apr6.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).ifPresent(list -> list.stream().filter(aoy -> this.type.equals(aoy.getType())).map(aoy -> aoy).filter(aoy2 -> aoy2.distanceToSqr(aoy) <= this.interactionRangeSqr).filter(this.targetFilter).findFirst().ifPresent(aoy -> {
+            brain.setMemory(this.memory, aoy);
+            brain.setMemory(MemoryModuleType.LOOK_TARGET, new EntityTracker(aoy, true));
             walk_TARGET = MemoryModuleType.WALK_TARGET;
-            new WalkTarget(new EntityPosWrapper(akz), this.speed, this.maxDist);
+            new WalkTarget(new EntityTracker(aoy, false), this.speedModifier, this.maxDist);
             brain.setMemory(walk_TARGET, object);
         }));
     }
diff --git a/src/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java b/src/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
index 126b6d8..a5bccb8 100644
--- a/src/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
+++ b/src/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
@@ -31,37 +31,37 @@ public class InteractWithDoor extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
-        final Path cqq7 = alp6.<Path>getMemory(MemoryModuleType.PATH).get();
-        final List<GlobalPos> list8 = alp6.<List<GlobalPos>>getMemory(MemoryModuleType.INTERACTABLE_DOORS).get();
-        final List<BlockPos> list9 = cqq7.getNodes().stream().map(cqo -> new BlockPos(cqo.x, cqo.y, cqo.z)).collect(Collectors.toList());
-        final Set<BlockPos> set10 = this.getDoorsThatAreOnMyPath(xd, list8, list9);
-        final int integer11 = cqq7.getIndex() - 1;
-        this.openOrCloseDoors(xd, list9, set10, integer11, akz, alp6);
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
+        final Path czf7 = apr6.<Path>getMemory(MemoryModuleType.PATH).get();
+        final List<GlobalPos> list8 = apr6.<List<GlobalPos>>getMemory(MemoryModuleType.INTERACTABLE_DOORS).get();
+        final List<BlockPos> list9 = czf7.getNodes().stream().map(czd -> new BlockPos(czd.x, czd.y, czd.z)).collect(Collectors.toList());
+        final Set<BlockPos> set10 = this.getDoorsThatAreOnMyPath(zd, list8, list9);
+        final int integer11 = czf7.getIndex() - 1;
+        this.openOrCloseDoors(zd, list9, set10, integer11, aoy, apr6);
     }
     
-    private Set<BlockPos> getDoorsThatAreOnMyPath(final ServerLevel xd, final List<GlobalPos> list2, final List<BlockPos> list3) {
-        return list2.stream().filter(fr -> fr.dimension() == xd.getDimension().getType()).map(GlobalPos::pos).filter(list3::contains).collect(Collectors.toSet());
+    private Set<BlockPos> getDoorsThatAreOnMyPath(final ServerLevel zd, final List<GlobalPos> list2, final List<BlockPos> list3) {
+        return list2.stream().filter(gc -> gc.dimension() == zd.dimension()).map(GlobalPos::pos).filter(list3::contains).collect(Collectors.toSet());
     }
     
-    private void openOrCloseDoors(final ServerLevel xd, final List<BlockPos> list, final Set<BlockPos> set, final int integer, final LivingEntity akz, final Brain<?> alp) {
+    private void openOrCloseDoors(final ServerLevel zd, final List<BlockPos> list, final Set<BlockPos> set, final int integer, final LivingEntity aoy, final Brain<?> apr) {
         // 
         // This method could not be decompiled.
         // 
         // Original Bytecode:
         // 
         //     1: aload_2         /* list */
-        //     2: aload_1         /* xd */
+        //     2: aload_1         /* zd */
         //     3: iload           integer
-        //     5: aload           alp
+        //     5: aload           apr
         //     7: invokedynamic   BootstrapMethod #4, accept:(Ljava/util/List;Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/entity/ai/Brain;)Ljava/util/function/Consumer;
         //    12: invokeinterface java/util/Set.forEach:(Ljava/util/function/Consumer;)V
-        //    17: aload_1         /* xd */
+        //    17: aload_1         /* zd */
         //    18: aload_2         /* list */
         //    19: iload           integer
-        //    21: aload           akz
-        //    23: aload           alp
+        //    21: aload           aoy
+        //    23: aload           apr
         //    25: invokestatic    net/minecraft/world/entity/ai/behavior/InteractWithDoor.closeAllOpenedDoors:(Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;ILnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/ai/Brain;)V
         //    28: return         
         //    Signature:
@@ -69,12 +69,12 @@ public class InteractWithDoor extends Behavior<LivingEntity> {
         //    MethodParameters:
         //  Name     Flags  
         //  -------  -----
-        //  xd       
+        //  zd       
         //  list     
         //  set      
         //  integer  
-        //  akz      
-        //  alp      
+        //  aoy      
+        //  apr      
         // 
         // The error that occurred was:
         // 
@@ -110,27 +110,27 @@ public class InteractWithDoor extends Behavior<LivingEntity> {
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    public static void closeAllOpenedDoors(final ServerLevel xd, final List<BlockPos> list, final int integer, final LivingEntity akz, final Brain<?> alp) {
+    public static void closeAllOpenedDoors(final ServerLevel zd, final List<BlockPos> list, final int integer, final LivingEntity aoy, final Brain<?> apr) {
         final Iterator<GlobalPos> iterator6;
-        GlobalPos fr7;
-        BlockPos fk8;
+        GlobalPos gc7;
+        BlockPos fu8;
         int integer2;
-        BlockState byj10;
-        Block bph11;
-        alp.<Set<GlobalPos>>getMemory(MemoryModuleType.OPENED_DOORS).ifPresent(set -> {
+        BlockState cfj10;
+        Block bvr11;
+        apr.<Set<GlobalPos>>getMemory(MemoryModuleType.OPENED_DOORS).ifPresent(set -> {
             iterator6 = set.iterator();
             while (iterator6.hasNext()) {
-                fr7 = iterator6.next();
-                fk8 = fr7.pos();
-                integer2 = list.indexOf(fk8);
-                if (xd.getDimension().getType() != fr7.dimension()) {
+                gc7 = iterator6.next();
+                fu8 = gc7.pos();
+                integer2 = list.indexOf(fu8);
+                if (zd.dimension() != gc7.dimension()) {
                     iterator6.remove();
                 }
                 else {
-                    byj10 = xd.getBlockState(fk8);
-                    bph11 = byj10.getBlock();
-                    if (BlockTags.WOODEN_DOORS.contains(bph11) && bph11 instanceof DoorBlock && integer2 < integer && fk8.closerThan(akz.position(), 4.0)) {
-                        ((DoorBlock)bph11).setOpen(xd, fk8, false);
+                    cfj10 = zd.getBlockState(fu8);
+                    bvr11 = cfj10.getBlock();
+                    if (BlockTags.WOODEN_DOORS.contains(bvr11) && bvr11 instanceof DoorBlock && integer2 < integer && fu8.closerThan(aoy.position(), 4.0)) {
+                        ((DoorBlock)bvr11).setOpen(zd, fu8, false);
                         iterator6.remove();
                     }
                     else {
diff --git a/src/net/minecraft/world/entity/ai/behavior/JumpOnBed.java b/src/net/minecraft/world/entity/ai/behavior/JumpOnBed.java
index 510645b..a6b9c03 100644
--- a/src/net/minecraft/world/entity/ai/behavior/JumpOnBed.java
+++ b/src/net/minecraft/world/entity/ai/behavior/JumpOnBed.java
@@ -2,8 +2,9 @@ package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.LivingEntity;
 import java.util.Optional;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
@@ -15,7 +16,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Mob;
 
 public class JumpOnBed extends Behavior<Mob> {
-    private final float speed;
+    private final float speedModifier;
     @Nullable
     private BlockPos targetBed;
     private int remainingTimeToReachBed;
@@ -24,29 +25,29 @@ public class JumpOnBed extends Behavior<Mob> {
     
     public JumpOnBed(final float float1) {
         super(ImmutableMap.<MemoryModuleType<BlockPos>, MemoryStatus>of(MemoryModuleType.NEAREST_BED, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<BlockPos>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT));
-        this.speed = float1;
+        this.speedModifier = float1;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Mob ala) {
-        return ala.isBaby() && this.nearBed(xd, ala);
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Mob aoz) {
+        return aoz.isBaby() && this.nearBed(zd, aoz);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Mob ala, final long long3) {
-        super.start(xd, ala, long3);
-        this.getNearestBed(ala).ifPresent(fk -> {
-            this.targetBed = fk;
+    protected void start(final ServerLevel zd, final Mob aoz, final long long3) {
+        super.start(zd, aoz, long3);
+        this.getNearestBed(aoz).ifPresent(fu -> {
+            this.targetBed = fu;
             this.remainingTimeToReachBed = 100;
-            this.remainingJumps = 3 + xd.random.nextInt(4);
+            this.remainingJumps = 3 + zd.random.nextInt(4);
             this.remainingCooldownUntilNextJump = 0;
-            this.startWalkingTowardsBed(ala, fk);
+            this.startWalkingTowardsBed(aoz, fu);
         });
     }
     
     @Override
-    protected void stop(final ServerLevel xd, final Mob ala, final long long3) {
-        super.stop(xd, ala, long3);
+    protected void stop(final ServerLevel zd, final Mob aoz, final long long3) {
+        super.stop(zd, aoz, long3);
         this.targetBed = null;
         this.remainingTimeToReachBed = 0;
         this.remainingJumps = 0;
@@ -54,8 +55,8 @@ public class JumpOnBed extends Behavior<Mob> {
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final Mob ala, final long long3) {
-        return ala.isBaby() && this.targetBed != null && this.isBed(xd, this.targetBed) && !this.tiredOfWalking(xd, ala) && !this.tiredOfJumping(xd, ala);
+    protected boolean canStillUse(final ServerLevel zd, final Mob aoz, final long long3) {
+        return aoz.isBaby() && this.targetBed != null && this.isBed(zd, this.targetBed) && !this.tiredOfWalking(zd, aoz) && !this.tiredOfJumping(zd, aoz);
     }
     
     @Override
@@ -64,8 +65,8 @@ public class JumpOnBed extends Behavior<Mob> {
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Mob ala, final long long3) {
-        if (!this.onOrOverBed(xd, ala)) {
+    protected void tick(final ServerLevel zd, final Mob aoz, final long long3) {
+        if (!this.onOrOverBed(zd, aoz)) {
             --this.remainingTimeToReachBed;
             return;
         }
@@ -73,44 +74,44 @@ public class JumpOnBed extends Behavior<Mob> {
             --this.remainingCooldownUntilNextJump;
             return;
         }
-        if (this.onBedSurface(xd, ala)) {
-            ala.getJumpControl().jump();
+        if (this.onBedSurface(zd, aoz)) {
+            aoz.getJumpControl().jump();
             --this.remainingJumps;
             this.remainingCooldownUntilNextJump = 5;
         }
     }
     
-    private void startWalkingTowardsBed(final Mob ala, final BlockPos fk) {
-        ala.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(fk, this.speed, 0));
+    private void startWalkingTowardsBed(final Mob aoz, final BlockPos fu) {
+        aoz.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(fu, this.speedModifier, 0));
     }
     
-    private boolean nearBed(final ServerLevel xd, final Mob ala) {
-        return this.onOrOverBed(xd, ala) || this.getNearestBed(ala).isPresent();
+    private boolean nearBed(final ServerLevel zd, final Mob aoz) {
+        return this.onOrOverBed(zd, aoz) || this.getNearestBed(aoz).isPresent();
     }
     
-    private boolean onOrOverBed(final ServerLevel xd, final Mob ala) {
-        final BlockPos fk4 = new BlockPos(ala);
-        final BlockPos fk5 = fk4.below();
-        return this.isBed(xd, fk4) || this.isBed(xd, fk5);
+    private boolean onOrOverBed(final ServerLevel zd, final Mob aoz) {
+        final BlockPos fu4 = aoz.blockPosition();
+        final BlockPos fu5 = fu4.below();
+        return this.isBed(zd, fu4) || this.isBed(zd, fu5);
     }
     
-    private boolean onBedSurface(final ServerLevel xd, final Mob ala) {
-        return this.isBed(xd, new BlockPos(ala));
+    private boolean onBedSurface(final ServerLevel zd, final Mob aoz) {
+        return this.isBed(zd, aoz.blockPosition());
     }
     
-    private boolean isBed(final ServerLevel xd, final BlockPos fk) {
-        return xd.getBlockState(fk).is(BlockTags.BEDS);
+    private boolean isBed(final ServerLevel zd, final BlockPos fu) {
+        return zd.getBlockState(fu).is(BlockTags.BEDS);
     }
     
-    private Optional<BlockPos> getNearestBed(final Mob ala) {
-        return ala.getBrain().<BlockPos>getMemory(MemoryModuleType.NEAREST_BED);
+    private Optional<BlockPos> getNearestBed(final Mob aoz) {
+        return aoz.getBrain().<BlockPos>getMemory(MemoryModuleType.NEAREST_BED);
     }
     
-    private boolean tiredOfWalking(final ServerLevel xd, final Mob ala) {
-        return !this.onOrOverBed(xd, ala) && this.remainingTimeToReachBed <= 0;
+    private boolean tiredOfWalking(final ServerLevel zd, final Mob aoz) {
+        return !this.onOrOverBed(zd, aoz) && this.remainingTimeToReachBed <= 0;
     }
     
-    private boolean tiredOfJumping(final ServerLevel xd, final Mob ala) {
-        return this.onOrOverBed(xd, ala) && this.remainingJumps <= 0;
+    private boolean tiredOfJumping(final ServerLevel zd, final Mob aoz) {
+        return this.onOrOverBed(zd, aoz) && this.remainingJumps <= 0;
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/LocateHidingPlace.java b/src/net/minecraft/world/entity/ai/behavior/LocateHidingPlace.java
index 6bf3440..07a6b57 100644
--- a/src/net/minecraft/world/entity/ai/behavior/LocateHidingPlace.java
+++ b/src/net/minecraft/world/entity/ai/behavior/LocateHidingPlace.java
@@ -1,12 +1,11 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.ai.Brain;
-import net.minecraft.world.entity.npc.Villager;
+import net.minecraft.world.entity.AgableMob;
 import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.core.GlobalPos;
 import net.minecraft.core.Position;
 import net.minecraft.world.entity.ai.village.poi.PoiManager;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
@@ -19,7 +18,7 @@ import java.util.Optional;
 import net.minecraft.world.entity.LivingEntity;
 
 public class LocateHidingPlace extends Behavior<LivingEntity> {
-    private final float speed;
+    private final float speedModifier;
     private final int radius;
     private final int closeEnoughDist;
     private Optional<BlockPos> currentPos;
@@ -28,14 +27,14 @@ public class LocateHidingPlace extends Behavior<LivingEntity> {
         super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<WalkTarget>)MemoryModuleType.HOME, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)MemoryModuleType.HIDING_PLACE, MemoryStatus.REGISTERED));
         this.currentPos = Optional.<BlockPos>empty();
         this.radius = integer1;
-        this.speed = float2;
+        this.speedModifier = float2;
         this.closeEnoughDist = integer3;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        final Optional<BlockPos> optional4 = xd.getPoiManager().find(asu -> asu == PoiType.HOME, fk -> true, new BlockPos(akz), this.closeEnoughDist + 1, PoiManager.Occupancy.ANY);
-        if (optional4.isPresent() && optional4.get().closerThan(akz.position(), this.closeEnoughDist)) {
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        final Optional<BlockPos> optional4 = zd.getPoiManager().find(ayc -> ayc == PoiType.HOME, fu -> true, aoy.blockPosition(), this.closeEnoughDist + 1, PoiManager.Occupancy.ANY);
+        if (optional4.isPresent() && optional4.get().closerThan(aoy.position(), this.closeEnoughDist)) {
             this.currentPos = optional4;
         }
         else {
@@ -45,26 +44,26 @@ public class LocateHidingPlace extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
         Optional<BlockPos> optional7 = this.currentPos;
         if (!optional7.isPresent()) {
-            optional7 = xd.getPoiManager().getRandom(asu -> asu == PoiType.HOME, fk -> true, PoiManager.Occupancy.ANY, new BlockPos(akz), this.radius, akz.getRandom());
+            optional7 = zd.getPoiManager().getRandom(ayc -> ayc == PoiType.HOME, fu -> true, PoiManager.Occupancy.ANY, aoy.blockPosition(), this.radius, aoy.getRandom());
             if (!optional7.isPresent()) {
-                final Optional<GlobalPos> optional8 = alp6.<GlobalPos>getMemory(MemoryModuleType.HOME);
+                final Optional<GlobalPos> optional8 = apr6.<GlobalPos>getMemory(MemoryModuleType.HOME);
                 if (optional8.isPresent()) {
                     optional7 = Optional.<BlockPos>of(optional8.get().pos());
                 }
             }
         }
         if (optional7.isPresent()) {
-            alp6.<Path>eraseMemory(MemoryModuleType.PATH);
-            alp6.<PositionWrapper>eraseMemory(MemoryModuleType.LOOK_TARGET);
-            alp6.<Villager>eraseMemory(MemoryModuleType.BREED_TARGET);
-            alp6.<LivingEntity>eraseMemory(MemoryModuleType.INTERACTION_TARGET);
-            alp6.<GlobalPos>setMemory(MemoryModuleType.HIDING_PLACE, GlobalPos.of(xd.getDimension().getType(), optional7.get()));
-            if (!optional7.get().closerThan(akz.position(), this.closeEnoughDist)) {
-                alp6.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(optional7.get(), this.speed, this.closeEnoughDist));
+            apr6.<Path>eraseMemory(MemoryModuleType.PATH);
+            apr6.<PositionTracker>eraseMemory(MemoryModuleType.LOOK_TARGET);
+            apr6.<AgableMob>eraseMemory(MemoryModuleType.BREED_TARGET);
+            apr6.<LivingEntity>eraseMemory(MemoryModuleType.INTERACTION_TARGET);
+            apr6.<GlobalPos>setMemory(MemoryModuleType.HIDING_PLACE, GlobalPos.of(zd.dimension(), optional7.get()));
+            if (!optional7.get().closerThan(aoy.position(), this.closeEnoughDist)) {
+                apr6.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(optional7.get(), this.speedModifier, this.closeEnoughDist));
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/behavior/LocateHidingPlaceDuringRaid.java b/src/net/minecraft/world/entity/ai/behavior/LocateHidingPlaceDuringRaid.java
index 1b5a950..7019795 100644
--- a/src/net/minecraft/world/entity/ai/behavior/LocateHidingPlaceDuringRaid.java
+++ b/src/net/minecraft/world/entity/ai/behavior/LocateHidingPlaceDuringRaid.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.raid.Raid;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.server.level.ServerLevel;
 
@@ -12,8 +10,8 @@ public class LocateHidingPlaceDuringRaid extends LocateHidingPlace {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        final Raid azn4 = xd.getRaidAt(new BlockPos(akz));
-        return super.checkExtraStartConditions(xd, akz) && azn4 != null && azn4.isActive() && !azn4.isVictory() && !azn4.isLoss();
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        final Raid bfh4 = zd.getRaidAt(aoy.blockPosition());
+        return super.checkExtraStartConditions(zd, aoy) && bfh4 != null && bfh4.isActive() && !bfh4.isVictory() && !bfh4.isLoss();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/LookAndFollowTradingPlayerSink.java b/src/net/minecraft/world/entity/ai/behavior/LookAndFollowTradingPlayerSink.java
index 46c323f..2bb6533 100644
--- a/src/net/minecraft/world/entity/ai/behavior/LookAndFollowTradingPlayerSink.java
+++ b/src/net/minecraft/world/entity/ai/behavior/LookAndFollowTradingPlayerSink.java
@@ -13,39 +13,39 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.npc.Villager;
 
 public class LookAndFollowTradingPlayerSink extends Behavior<Villager> {
-    private final float speed;
+    private final float speedModifier;
     
     public LookAndFollowTradingPlayerSink(final float float1) {
         super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED), Integer.MAX_VALUE);
-        this.speed = float1;
+        this.speedModifier = float1;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        final Player ayj4 = axw.getTradingPlayer();
-        return axw.isAlive() && ayj4 != null && !axw.isInWater() && !axw.hurtMarked && axw.distanceToSqr(ayj4) <= 16.0 && ayj4.containerMenu != null;
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        final Player bec4 = bdp.getTradingPlayer();
+        return bdp.isAlive() && bec4 != null && !bdp.isInWater() && !bdp.hurtMarked && bdp.distanceToSqr(bec4) <= 16.0 && bec4.containerMenu != null;
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final Villager axw, final long long3) {
-        return this.checkExtraStartConditions(xd, axw);
+    protected boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
+        return this.checkExtraStartConditions(zd, bdp);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        this.followPlayer(axw);
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        this.followPlayer(bdp);
     }
     
     @Override
-    protected void stop(final ServerLevel xd, final Villager axw, final long long3) {
-        final Brain<?> alp6 = axw.getBrain();
-        alp6.<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
-        alp6.<PositionWrapper>eraseMemory(MemoryModuleType.LOOK_TARGET);
+    protected void stop(final ServerLevel zd, final Villager bdp, final long long3) {
+        final Brain<?> apr6 = bdp.getBrain();
+        apr6.<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        apr6.<PositionTracker>eraseMemory(MemoryModuleType.LOOK_TARGET);
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Villager axw, final long long3) {
-        this.followPlayer(axw);
+    protected void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        this.followPlayer(bdp);
     }
     
     @Override
@@ -53,10 +53,9 @@ public class LookAndFollowTradingPlayerSink extends Behavior<Villager> {
         return false;
     }
     
-    private void followPlayer(final Villager axw) {
-        final EntityPosWrapper amg3 = new EntityPosWrapper(axw.getTradingPlayer());
-        final Brain<?> alp4 = axw.getBrain();
-        alp4.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(amg3, this.speed, 2));
-        alp4.<PositionWrapper>setMemory(MemoryModuleType.LOOK_TARGET, amg3);
+    private void followPlayer(final Villager bdp) {
+        final Brain<?> apr3 = bdp.getBrain();
+        apr3.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(new EntityTracker(bdp.getTradingPlayer(), false), this.speedModifier, 2));
+        apr3.<EntityTracker>setMemory((MemoryModuleType<EntityTracker>)MemoryModuleType.LOOK_TARGET, new EntityTracker(bdp.getTradingPlayer(), true));
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/LookAtTargetSink.java b/src/net/minecraft/world/entity/ai/behavior/LookAtTargetSink.java
index 35cbaff..dd19b94 100644
--- a/src/net/minecraft/world/entity/ai/behavior/LookAtTargetSink.java
+++ b/src/net/minecraft/world/entity/ai/behavior/LookAtTargetSink.java
@@ -10,21 +10,21 @@ import net.minecraft.world.entity.Mob;
 
 public class LookAtTargetSink extends Behavior<Mob> {
     public LookAtTargetSink(final int integer1, final int integer2) {
-        super(ImmutableMap.<MemoryModuleType<PositionWrapper>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_PRESENT), integer1, integer2);
+        super(ImmutableMap.<MemoryModuleType<PositionTracker>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_PRESENT), integer1, integer2);
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final Mob ala, final long long3) {
-        return ala.getBrain().<PositionWrapper>getMemory(MemoryModuleType.LOOK_TARGET).filter(amz -> amz.isVisible(ala)).isPresent();
+    protected boolean canStillUse(final ServerLevel zd, final Mob aoz, final long long3) {
+        return aoz.getBrain().<PositionTracker>getMemory(MemoryModuleType.LOOK_TARGET).filter(arn -> arn.isVisibleBy(aoz)).isPresent();
     }
     
     @Override
-    protected void stop(final ServerLevel xd, final Mob ala, final long long3) {
-        ala.getBrain().<PositionWrapper>eraseMemory(MemoryModuleType.LOOK_TARGET);
+    protected void stop(final ServerLevel zd, final Mob aoz, final long long3) {
+        aoz.getBrain().<PositionTracker>eraseMemory(MemoryModuleType.LOOK_TARGET);
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Mob ala, final long long3) {
-        ala.getBrain().<PositionWrapper>getMemory(MemoryModuleType.LOOK_TARGET).ifPresent(amz -> ala.getLookControl().setLookAt(amz.getLookAtPos()));
+    protected void stop(final ServerLevel zd, final Mob aoz, final long long3) {
+        aoz.getBrain().<PositionTracker>getMemory(MemoryModuleType.LOOK_TARGET).ifPresent(arn -> aoz.getLookControl().setLookAt(arn.currentPosition()));
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/MakeLove.java b/src/net/minecraft/world/entity/ai/behavior/MakeLove.java
deleted file mode 100644
index 6f05aef..0000000
--- a/src/net/minecraft/world/entity/ai/behavior/MakeLove.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package net.minecraft.world.entity.ai.behavior;
-
-import net.minecraft.core.GlobalPos;
-import net.minecraft.world.entity.AgableMob;
-import net.minecraft.world.level.pathfinder.Path;
-import net.minecraft.world.entity.ai.village.poi.PoiType;
-import net.minecraft.world.entity.ai.Brain;
-import net.minecraft.world.entity.EntityType;
-import java.util.Optional;
-import net.minecraft.network.protocol.game.DebugPackets;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.server.level.ServerLevel;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.world.entity.ai.memory.MemoryStatus;
-import net.minecraft.world.entity.ai.memory.MemoryModuleType;
-import net.minecraft.world.entity.npc.Villager;
-
-public class MakeLove extends Behavior<Villager> {
-    private long birthTimestamp;
-    
-    public MakeLove() {
-        super(ImmutableMap.<MemoryModuleType<Villager>, MemoryStatus>of(MemoryModuleType.BREED_TARGET, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<Villager>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT), 350, 350);
-    }
-    
-    @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        return this.isBreedingPossible(axw);
-    }
-    
-    @Override
-    protected boolean canStillUse(final ServerLevel xd, final Villager axw, final long long3) {
-        return long3 <= this.birthTimestamp && this.isBreedingPossible(axw);
-    }
-    
-    @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        final Villager axw2 = this.getBreedingTarget(axw);
-        BehaviorUtils.lockGazeAndWalkToEachOther(axw, axw2);
-        xd.broadcastEntityEvent(axw2, (byte)18);
-        xd.broadcastEntityEvent(axw, (byte)18);
-        final int integer7 = 275 + axw.getRandom().nextInt(50);
-        this.birthTimestamp = long3 + integer7;
-    }
-    
-    @Override
-    protected void tick(final ServerLevel xd, final Villager axw, final long long3) {
-        final Villager axw2 = this.getBreedingTarget(axw);
-        if (axw.distanceToSqr(axw2) > 5.0) {
-            return;
-        }
-        BehaviorUtils.lockGazeAndWalkToEachOther(axw, axw2);
-        if (long3 >= this.birthTimestamp) {
-            axw.eatAndDigestFood();
-            axw2.eatAndDigestFood();
-            this.tryToGiveBirth(xd, axw, axw2);
-        }
-        else if (axw.getRandom().nextInt(35) == 0) {
-            xd.broadcastEntityEvent(axw2, (byte)12);
-            xd.broadcastEntityEvent(axw, (byte)12);
-        }
-    }
-    
-    private void tryToGiveBirth(final ServerLevel xd, final Villager axw2, final Villager axw3) {
-        final Optional<BlockPos> optional5 = this.takeVacantBed(xd, axw2);
-        if (!optional5.isPresent()) {
-            xd.broadcastEntityEvent(axw3, (byte)13);
-            xd.broadcastEntityEvent(axw2, (byte)13);
-        }
-        else {
-            final Optional<Villager> optional6 = this.breed(axw2, axw3);
-            if (optional6.isPresent()) {
-                this.giveBedToChild(xd, optional6.get(), optional5.get());
-            }
-            else {
-                xd.getPoiManager().release(optional5.get());
-                DebugPackets.sendPoiTicketCountPacket(xd, optional5.get());
-            }
-        }
-    }
-    
-    @Override
-    protected void tick(final ServerLevel xd, final Villager axw, final long long3) {
-        axw.getBrain().<Villager>eraseMemory(MemoryModuleType.BREED_TARGET);
-    }
-    
-    private Villager getBreedingTarget(final Villager axw) {
-        return axw.getBrain().<Villager>getMemory(MemoryModuleType.BREED_TARGET).get();
-    }
-    
-    private boolean isBreedingPossible(final Villager axw) {
-        final Brain<Villager> alp3 = axw.getBrain();
-        if (!alp3.<Villager>getMemory(MemoryModuleType.BREED_TARGET).isPresent()) {
-            return false;
-        }
-        final Villager axw2 = this.getBreedingTarget(axw);
-        return BehaviorUtils.targetIsValid(alp3, MemoryModuleType.BREED_TARGET, EntityType.VILLAGER) && axw.canBreed() && axw2.canBreed();
-    }
-    
-    private Optional<BlockPos> takeVacantBed(final ServerLevel xd, final Villager axw) {
-        return xd.getPoiManager().take(PoiType.HOME.getPredicate(), fk -> this.canReach(axw, fk), new BlockPos(axw), 48);
-    }
-    
-    private boolean canReach(final Villager axw, final BlockPos fk) {
-        final Path cqq4 = axw.getNavigation().createPath(fk, PoiType.HOME.getValidRange());
-        return cqq4 != null && cqq4.canReach();
-    }
-    
-    private Optional<Villager> breed(final Villager axw1, final Villager axw2) {
-        final Villager axw3 = axw1.getBreedOffspring((AgableMob)axw2);
-        if (axw3 == null) {
-            return Optional.<Villager>empty();
-        }
-        axw1.setAge(6000);
-        axw2.setAge(6000);
-        axw3.setAge(-24000);
-        axw3.moveTo(axw1.getX(), axw1.getY(), axw1.getZ(), 0.0f, 0.0f);
-        axw1.level.addFreshEntity(axw3);
-        axw1.level.broadcastEntityEvent(axw3, (byte)12);
-        return Optional.<Villager>of(axw3);
-    }
-    
-    private void giveBedToChild(final ServerLevel xd, final Villager axw, final BlockPos fk) {
-        final GlobalPos fr5 = GlobalPos.of(xd.getDimension().getType(), fk);
-        axw.getBrain().<GlobalPos>setMemory(MemoryModuleType.HOME, fr5);
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/behavior/MeleeAttack.java b/src/net/minecraft/world/entity/ai/behavior/MeleeAttack.java
new file mode 100644
index 0000000..c7ceaae
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/MeleeAttack.java
@@ -0,0 +1,45 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.item.Item;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.item.ProjectileWeaponItem;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.Mob;
+
+public class MeleeAttack extends Behavior<Mob> {
+    private final int cooldownBetweenAttacks;
+    
+    public MeleeAttack(final int integer) {
+        super(ImmutableMap.<MemoryModuleType<PositionTracker>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<PositionTracker>)MemoryModuleType.ATTACK_TARGET, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<PositionTracker>)MemoryModuleType.ATTACK_COOLING_DOWN, MemoryStatus.VALUE_ABSENT));
+        this.cooldownBetweenAttacks = integer;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Mob aoz) {
+        final LivingEntity aoy4 = this.getAttackTarget(aoz);
+        return !this.isHoldingUsableProjectileWeapon(aoz) && BehaviorUtils.canSee(aoz, aoy4) && BehaviorUtils.isWithinMeleeAttackRange(aoz, aoy4);
+    }
+    
+    private boolean isHoldingUsableProjectileWeapon(final Mob aoz) {
+        return aoz.isHolding(bke -> bke instanceof ProjectileWeaponItem && aoz.canFireProjectileWeapon(bke));
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final Mob aoz, final long long3) {
+        final LivingEntity aoy6 = this.getAttackTarget(aoz);
+        BehaviorUtils.lookAtEntity(aoz, aoy6);
+        aoz.swing(InteractionHand.MAIN_HAND);
+        aoz.doHurtTarget(aoy6);
+        aoz.getBrain().<Boolean>setMemoryWithExpiry(MemoryModuleType.ATTACK_COOLING_DOWN, true, this.cooldownBetweenAttacks);
+    }
+    
+    private LivingEntity getAttackTarget(final Mob aoz) {
+        return aoz.getBrain().<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET).get();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/Mount.java b/src/net/minecraft/world/entity/ai/behavior/Mount.java
new file mode 100644
index 0000000..1411ea2
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/Mount.java
@@ -0,0 +1,41 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.LivingEntity;
+
+public class Mount<E extends LivingEntity> extends Behavior<E> {
+    private final float speedModifier;
+    
+    public Mount(final float float1) {
+        super(ImmutableMap.<MemoryModuleType<PositionTracker>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<PositionTracker>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionTracker>)MemoryModuleType.RIDE_TARGET, MemoryStatus.VALUE_PRESENT));
+        this.speedModifier = float1;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoy) {
+        return !aoy.isPassenger();
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoy, final long long3) {
+        if (this.isCloseEnoughToStartRiding(aoy)) {
+            aoy.startRiding(this.getRidableEntity(aoy));
+        }
+        else {
+            BehaviorUtils.setWalkAndLookTargetMemories(aoy, this.getRidableEntity(aoy), this.speedModifier, 1);
+        }
+    }
+    
+    private boolean isCloseEnoughToStartRiding(final E aoy) {
+        return this.getRidableEntity(aoy).closerThan(aoy, 1.0);
+    }
+    
+    private Entity getRidableEntity(final E aoy) {
+        return aoy.getBrain().<Entity>getMemory(MemoryModuleType.RIDE_TARGET).get();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/MoveToSkySeeingSpot.java b/src/net/minecraft/world/entity/ai/behavior/MoveToSkySeeingSpot.java
index 2de9e3f..7fa3d0c 100644
--- a/src/net/minecraft/world/entity/ai/behavior/MoveToSkySeeingSpot.java
+++ b/src/net/minecraft/world/entity/ai/behavior/MoveToSkySeeingSpot.java
@@ -2,10 +2,9 @@ package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.level.levelgen.Heightmap;
 import javax.annotation.Nullable;
+import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.Vec3;
 import java.util.Optional;
 import net.minecraft.server.level.ServerLevel;
@@ -17,40 +16,40 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.LivingEntity;
 
 public class MoveToSkySeeingSpot extends Behavior<LivingEntity> {
-    private final float speed;
+    private final float speedModifier;
     
     public MoveToSkySeeingSpot(final float float1) {
         super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT));
-        this.speed = float1;
+        this.speedModifier = float1;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Optional<Vec3> optional6 = Optional.<Vec3>ofNullable(this.getOutdoorPosition(xd, akz));
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Optional<Vec3> optional6 = Optional.<Vec3>ofNullable(this.getOutdoorPosition(zd, aoy));
         if (optional6.isPresent()) {
-            akz.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, optional6.<WalkTarget>map(cvl -> new WalkTarget(cvl, this.speed, 0)));
+            aoy.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, optional6.map(dem -> new WalkTarget(dem, this.speedModifier, 0)));
         }
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        return !xd.canSeeSky(new BlockPos(akz));
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        return !zd.canSeeSky(aoy.blockPosition());
     }
     
     @Nullable
-    private Vec3 getOutdoorPosition(final ServerLevel xd, final LivingEntity akz) {
-        final Random random4 = akz.getRandom();
-        final BlockPos fk5 = new BlockPos(akz);
+    private Vec3 getOutdoorPosition(final ServerLevel zd, final LivingEntity aoy) {
+        final Random random4 = aoy.getRandom();
+        final BlockPos fu5 = aoy.blockPosition();
         for (int integer6 = 0; integer6 < 10; ++integer6) {
-            final BlockPos fk6 = fk5.offset(random4.nextInt(20) - 10, random4.nextInt(6) - 3, random4.nextInt(20) - 10);
-            if (hasNoBlocksAbove(xd, akz, fk6)) {
-                return new Vec3(fk6);
+            final BlockPos fu6 = fu5.offset(random4.nextInt(20) - 10, random4.nextInt(6) - 3, random4.nextInt(20) - 10);
+            if (hasNoBlocksAbove(zd, aoy, fu6)) {
+                return Vec3.atBottomCenterOf(fu6);
             }
         }
         return null;
     }
     
-    public static boolean hasNoBlocksAbove(final ServerLevel xd, final LivingEntity akz, final BlockPos fk) {
-        return xd.canSeeSky(fk) && xd.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, fk).getY() <= akz.getY();
+    public static boolean hasNoBlocksAbove(final ServerLevel zd, final LivingEntity aoy, final BlockPos fu) {
+        return zd.canSeeSky(fu) && zd.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, fu).getY() <= aoy.getY();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java b/src/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java
index 5e7297a..3230839 100644
--- a/src/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java
+++ b/src/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java
@@ -1,7 +1,6 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.util.RandomPos;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.PathfinderMob;
@@ -25,98 +24,105 @@ public class MoveToTargetSink extends Behavior<Mob> {
     private Path path;
     @Nullable
     private BlockPos lastTargetPos;
-    private float speed;
+    private float speedModifier;
     private int remainingDelay;
     
     public MoveToTargetSink(final int integer) {
-        super(ImmutableMap.<MemoryModuleType<Path>, MemoryStatus>of(MemoryModuleType.PATH, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<Path>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_PRESENT), integer);
+        super(ImmutableMap.<MemoryModuleType<Long>, MemoryStatus>of(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryStatus.REGISTERED, (MemoryModuleType<Long>)MemoryModuleType.PATH, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<Long>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_PRESENT), integer);
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Mob ala) {
-        final Brain<?> alp4 = ala.getBrain();
-        final WalkTarget arn5 = alp4.<WalkTarget>getMemory(MemoryModuleType.WALK_TARGET).get();
-        if (!this.reachedTarget(ala, arn5) && this.tryComputePath(ala, arn5, xd.getGameTime())) {
-            this.lastTargetPos = arn5.getTarget().getPos();
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Mob aoz) {
+        final Brain<?> apr4 = aoz.getBrain();
+        final WalkTarget awr5 = apr4.<WalkTarget>getMemory(MemoryModuleType.WALK_TARGET).get();
+        final boolean boolean6 = this.reachedTarget(aoz, awr5);
+        if (!boolean6 && this.tryComputePath(aoz, awr5, zd.getGameTime())) {
+            this.lastTargetPos = awr5.getTarget().currentBlockPosition();
             return true;
         }
-        alp4.<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        apr4.<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        if (boolean6) {
+            apr4.<Long>eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
+        }
         return false;
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final Mob ala, final long long3) {
+    protected boolean canStillUse(final ServerLevel zd, final Mob aoz, final long long3) {
         if (this.path == null || this.lastTargetPos == null) {
             return false;
         }
-        final Optional<WalkTarget> optional6 = ala.getBrain().<WalkTarget>getMemory(MemoryModuleType.WALK_TARGET);
-        final PathNavigation arr7 = ala.getNavigation();
-        return !arr7.isDone() && optional6.isPresent() && !this.reachedTarget(ala, optional6.get());
+        final Optional<WalkTarget> optional6 = aoz.getBrain().<WalkTarget>getMemory(MemoryModuleType.WALK_TARGET);
+        final PathNavigation awv7 = aoz.getNavigation();
+        return !awv7.isDone() && optional6.isPresent() && !this.reachedTarget(aoz, optional6.get());
     }
     
     @Override
-    protected void stop(final ServerLevel xd, final Mob ala, final long long3) {
-        ala.getNavigation().stop();
-        ala.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
-        ala.getBrain().<Path>eraseMemory(MemoryModuleType.PATH);
+    protected void stop(final ServerLevel zd, final Mob aoz, final long long3) {
+        aoz.getNavigation().stop();
+        aoz.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        aoz.getBrain().<Path>eraseMemory(MemoryModuleType.PATH);
         this.path = null;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Mob ala, final long long3) {
-        ala.getBrain().<Path>setMemory(MemoryModuleType.PATH, this.path);
-        ala.getNavigation().moveTo(this.path, this.speed);
-        this.remainingDelay = xd.getRandom().nextInt(10);
+    protected void stop(final ServerLevel zd, final Mob aoz, final long long3) {
+        aoz.getBrain().<Path>setMemory(MemoryModuleType.PATH, this.path);
+        aoz.getNavigation().moveTo(this.path, this.speedModifier);
+        this.remainingDelay = zd.getRandom().nextInt(10);
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Mob ala, final long long3) {
+    protected void tick(final ServerLevel zd, final Mob aoz, final long long3) {
         --this.remainingDelay;
         if (this.remainingDelay > 0) {
             return;
         }
-        final Path cqq6 = ala.getNavigation().getPath();
-        final Brain<?> alp7 = ala.getBrain();
-        if (this.path != cqq6) {
-            this.path = cqq6;
-            alp7.<Path>setMemory(MemoryModuleType.PATH, cqq6);
+        final Path czf6 = aoz.getNavigation().getPath();
+        final Brain<?> apr7 = aoz.getBrain();
+        if (this.path != czf6) {
+            this.path = czf6;
+            apr7.<Path>setMemory(MemoryModuleType.PATH, czf6);
         }
-        if (cqq6 == null || this.lastTargetPos == null) {
+        if (czf6 == null || this.lastTargetPos == null) {
             return;
         }
-        final WalkTarget arn8 = alp7.<WalkTarget>getMemory(MemoryModuleType.WALK_TARGET).get();
-        if (arn8.getTarget().getPos().distSqr(this.lastTargetPos) > 4.0 && this.tryComputePath(ala, arn8, xd.getGameTime())) {
-            this.lastTargetPos = arn8.getTarget().getPos();
-            this.start(xd, ala, long3);
+        final WalkTarget awr8 = apr7.<WalkTarget>getMemory(MemoryModuleType.WALK_TARGET).get();
+        if (awr8.getTarget().currentBlockPosition().distSqr(this.lastTargetPos) > 4.0 && this.tryComputePath(aoz, awr8, zd.getGameTime())) {
+            this.lastTargetPos = awr8.getTarget().currentBlockPosition();
+            this.stop(zd, aoz, long3);
         }
     }
     
-    private boolean tryComputePath(final Mob ala, final WalkTarget arn, final long long3) {
-        final BlockPos fk6 = arn.getTarget().getPos();
-        this.path = ala.getNavigation().createPath(fk6, 0);
-        this.speed = arn.getSpeed();
-        if (!this.reachedTarget(ala, arn)) {
-            final Brain<?> alp7 = ala.getBrain();
+    private boolean tryComputePath(final Mob aoz, final WalkTarget awr, final long long3) {
+        final BlockPos fu6 = awr.getTarget().currentBlockPosition();
+        this.path = aoz.getNavigation().createPath(fu6, 0);
+        this.speedModifier = awr.getSpeedModifier();
+        final Brain<?> apr7 = aoz.getBrain();
+        if (this.reachedTarget(aoz, awr)) {
+            apr7.<Long>eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
+        }
+        else {
             final boolean boolean8 = this.path != null && this.path.canReach();
             if (boolean8) {
-                alp7.<Long>setMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, Optional.<Long>empty());
+                apr7.<Long>eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
             }
-            else if (!alp7.hasMemoryValue(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE)) {
-                alp7.<Long>setMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, long3);
+            else if (!apr7.hasMemoryValue(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE)) {
+                apr7.<Long>setMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, long3);
             }
             if (this.path != null) {
                 return true;
             }
-            final Vec3 cvl9 = RandomPos.getPosTowards((PathfinderMob)ala, 10, 7, new Vec3(fk6));
-            if (cvl9 != null) {
-                this.path = ala.getNavigation().createPath(cvl9.x, cvl9.y, cvl9.z, 0);
+            final Vec3 dem9 = RandomPos.getPosTowards((PathfinderMob)aoz, 10, 7, Vec3.atBottomCenterOf(fu6));
+            if (dem9 != null) {
+                this.path = aoz.getNavigation().createPath(dem9.x, dem9.y, dem9.z, 0);
                 return this.path != null;
             }
         }
         return false;
     }
     
-    private boolean reachedTarget(final Mob ala, final WalkTarget arn) {
-        return arn.getTarget().getPos().distManhattan(new BlockPos(ala)) <= arn.getCloseEnoughDist();
+    private boolean reachedTarget(final Mob aoz, final WalkTarget awr) {
+        return awr.getTarget().currentBlockPosition().distManhattan(aoz.blockPosition()) <= awr.getCloseEnoughDist();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/PickUpItems.java b/src/net/minecraft/world/entity/ai/behavior/PickUpItems.java
deleted file mode 100644
index d0f3a8c..0000000
--- a/src/net/minecraft/world/entity/ai/behavior/PickUpItems.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package net.minecraft.world.entity.ai.behavior;
-
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.entity.ai.memory.WalkTarget;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import com.google.common.collect.Lists;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.world.entity.ai.memory.MemoryStatus;
-import net.minecraft.world.entity.ai.memory.MemoryModuleType;
-import net.minecraft.world.entity.item.ItemEntity;
-import java.util.List;
-import net.minecraft.world.entity.npc.Villager;
-
-public class PickUpItems extends Behavior<Villager> {
-    private List<ItemEntity> items;
-    
-    public PickUpItems() {
-        super(ImmutableMap.<MemoryModuleType<PositionWrapper>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionWrapper>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT));
-        this.items = Lists.newArrayList();
-    }
-    
-    @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        this.items = xd.<ItemEntity>getEntitiesOfClass(ItemEntity.class, axw.getBoundingBox().inflate(4.0, 2.0, 4.0));
-        return !this.items.isEmpty();
-    }
-    
-    @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        final ItemEntity awb6 = this.items.get(xd.random.nextInt(this.items.size()));
-        if (axw.wantToPickUp(awb6.getItem().getItem())) {
-            final Vec3 cvl7 = awb6.position();
-            axw.getBrain().<BlockPosWrapper>setMemory((MemoryModuleType<BlockPosWrapper>)MemoryModuleType.LOOK_TARGET, new BlockPosWrapper(new BlockPos(cvl7)));
-            axw.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(cvl7, 0.5f, 0));
-        }
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/behavior/PlayTagWithOtherKids.java b/src/net/minecraft/world/entity/ai/behavior/PlayTagWithOtherKids.java
index 416a95f..0fa2b48 100644
--- a/src/net/minecraft/world/entity/ai/behavior/PlayTagWithOtherKids.java
+++ b/src/net/minecraft/world/entity/ai/behavior/PlayTagWithOtherKids.java
@@ -27,80 +27,80 @@ public class PlayTagWithOtherKids extends Behavior<PathfinderMob> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final PathfinderMob alg) {
-        return xd.getRandom().nextInt(10) == 0 && this.hasFriendsNearby(alg);
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final PathfinderMob apg) {
+        return zd.getRandom().nextInt(10) == 0 && this.hasFriendsNearby(apg);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final PathfinderMob alg, final long long3) {
-        final LivingEntity akz2 = this.seeIfSomeoneIsChasingMe(alg);
-        if (akz2 != null) {
-            this.fleeFromChaser(xd, alg, akz2);
+    protected void start(final ServerLevel zd, final PathfinderMob apg, final long long3) {
+        final LivingEntity aoy2 = this.seeIfSomeoneIsChasingMe(apg);
+        if (aoy2 != null) {
+            this.fleeFromChaser(zd, apg, aoy2);
             return;
         }
-        final Optional<LivingEntity> optional7 = this.findSomeoneBeingChased(alg);
+        final Optional<LivingEntity> optional7 = this.findSomeoneBeingChased(apg);
         if (optional7.isPresent()) {
-            chaseKid(alg, optional7.get());
+            chaseKid(apg, optional7.get());
             return;
         }
-        this.findSomeoneToChase(alg).ifPresent(akz -> chaseKid(alg, akz));
+        this.findSomeoneToChase(apg).ifPresent(aoy -> chaseKid(apg, aoy));
     }
     
-    private void fleeFromChaser(final ServerLevel xd, final PathfinderMob alg, final LivingEntity akz) {
+    private void fleeFromChaser(final ServerLevel zd, final PathfinderMob apg, final LivingEntity aoy) {
         for (int integer5 = 0; integer5 < 10; ++integer5) {
-            final Vec3 cvl6 = RandomPos.getLandPos(alg, 20, 8);
-            if (cvl6 != null && xd.isVillage(new BlockPos(cvl6))) {
-                alg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(cvl6, 0.6f, 0));
+            final Vec3 dem6 = RandomPos.getLandPos(apg, 20, 8);
+            if (dem6 != null && zd.isVillage(new BlockPos(dem6))) {
+                apg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(dem6, 0.6f, 0));
                 return;
             }
         }
     }
     
-    private static void chaseKid(final PathfinderMob alg, final LivingEntity akz) {
-        final Brain<?> alp3 = alg.getBrain();
-        alp3.<LivingEntity>setMemory(MemoryModuleType.INTERACTION_TARGET, akz);
-        alp3.<EntityPosWrapper>setMemory((MemoryModuleType<EntityPosWrapper>)MemoryModuleType.LOOK_TARGET, new EntityPosWrapper(akz));
-        alp3.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(new EntityPosWrapper(akz), 0.6f, 1));
+    private static void chaseKid(final PathfinderMob apg, final LivingEntity aoy) {
+        final Brain<?> apr3 = apg.getBrain();
+        apr3.<LivingEntity>setMemory(MemoryModuleType.INTERACTION_TARGET, aoy);
+        apr3.<EntityTracker>setMemory((MemoryModuleType<EntityTracker>)MemoryModuleType.LOOK_TARGET, new EntityTracker(aoy, true));
+        apr3.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(new EntityTracker(aoy, false), 0.6f, 1));
     }
     
-    private Optional<LivingEntity> findSomeoneToChase(final PathfinderMob alg) {
-        return this.getFriendsNearby(alg).stream().findAny();
+    private Optional<LivingEntity> findSomeoneToChase(final PathfinderMob apg) {
+        return this.getFriendsNearby(apg).stream().findAny();
     }
     
-    private Optional<LivingEntity> findSomeoneBeingChased(final PathfinderMob alg) {
-        final Map<LivingEntity, Integer> map3 = this.checkHowManyChasersEachFriendHas(alg);
+    private Optional<LivingEntity> findSomeoneBeingChased(final PathfinderMob apg) {
+        final Map<LivingEntity, Integer> map3 = this.checkHowManyChasersEachFriendHas(apg);
         return map3.entrySet().stream().sorted(Comparator.comparingInt(Map.Entry::getValue)).filter(entry -> entry.getValue() > 0 && entry.getValue() <= 5).<LivingEntity>map(Map.Entry::getKey).findFirst();
     }
     
-    private Map<LivingEntity, Integer> checkHowManyChasersEachFriendHas(final PathfinderMob alg) {
+    private Map<LivingEntity, Integer> checkHowManyChasersEachFriendHas(final PathfinderMob apg) {
         final Map<LivingEntity, Integer> map3 = Maps.newHashMap();
         final Integer n;
-        this.getFriendsNearby(alg).stream().filter(this::isChasingSomeone).forEach(akz -> n = map3.compute(this.whoAreYouChasing(akz), (akz, integer) -> (integer == null) ? 1 : (integer + 1)));
+        this.getFriendsNearby(apg).stream().filter(this::isChasingSomeone).forEach(aoy -> n = map3.compute(this.whoAreYouChasing(aoy), (aoy, integer) -> (integer == null) ? 1 : (integer + 1)));
         return map3;
     }
     
-    private List<LivingEntity> getFriendsNearby(final PathfinderMob alg) {
-        return alg.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_VILLAGER_BABIES).get();
+    private List<LivingEntity> getFriendsNearby(final PathfinderMob apg) {
+        return apg.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_VILLAGER_BABIES).get();
     }
     
-    private LivingEntity whoAreYouChasing(final LivingEntity akz) {
-        return akz.getBrain().<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).get();
+    private LivingEntity whoAreYouChasing(final LivingEntity aoy) {
+        return aoy.getBrain().<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).get();
     }
     
     @Nullable
-    private LivingEntity seeIfSomeoneIsChasingMe(final LivingEntity akz) {
-        return akz.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_VILLAGER_BABIES).get().stream().filter(akz2 -> this.isFriendChasingMe(akz, akz2)).findAny().orElse(null);
+    private LivingEntity seeIfSomeoneIsChasingMe(final LivingEntity aoy) {
+        return aoy.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_VILLAGER_BABIES).get().stream().filter(aoy2 -> this.isFriendChasingMe(aoy, aoy2)).findAny().orElse(null);
     }
     
-    private boolean isChasingSomeone(final LivingEntity akz) {
-        return akz.getBrain().<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).isPresent();
+    private boolean isChasingSomeone(final LivingEntity aoy) {
+        return aoy.getBrain().<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).isPresent();
     }
     
-    private boolean isFriendChasingMe(final LivingEntity akz1, final LivingEntity akz2) {
-        return akz2.getBrain().<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).filter(akz2 -> akz2 == akz1).isPresent();
+    private boolean isFriendChasingMe(final LivingEntity aoy1, final LivingEntity aoy2) {
+        return aoy2.getBrain().<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).filter(aoy2 -> aoy2 == aoy1).isPresent();
     }
     
-    private boolean hasFriendsNearby(final PathfinderMob alg) {
-        return alg.getBrain().hasMemoryValue(MemoryModuleType.VISIBLE_VILLAGER_BABIES);
+    private boolean hasFriendsNearby(final PathfinderMob apg) {
+        return apg.getBrain().hasMemoryValue(MemoryModuleType.VISIBLE_VILLAGER_BABIES);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java b/src/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java
new file mode 100644
index 0000000..8d31c98
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java
@@ -0,0 +1,54 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.village.poi.PoiType;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.core.GlobalPos;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.npc.VillagerProfession;
+import net.minecraft.world.entity.npc.Villager;
+
+public class PoiCompetitorScan extends Behavior<Villager> {
+    final VillagerProfession profession;
+    
+    public PoiCompetitorScan(final VillagerProfession bds) {
+        super(ImmutableMap.<MemoryModuleType<GlobalPos>, MemoryStatus>of(MemoryModuleType.JOB_SITE, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<GlobalPos>)MemoryModuleType.LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT));
+        this.profession = bds;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        final GlobalPos gc6 = bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.JOB_SITE).get();
+        zd.getPoiManager().getType(gc6.pos()).ifPresent(ayc -> BehaviorUtils.getNearbyVillagersWithCondition(bdp, bdp -> this.competesForSameJobsite(gc6, ayc, bdp)).reduce(bdp, PoiCompetitorScan::selectWinner));
+    }
+    
+    private static Villager selectWinner(final Villager bdp1, final Villager bdp2) {
+        Villager bdp3;
+        Villager bdp4;
+        if (bdp1.getVillagerXp() > bdp2.getVillagerXp()) {
+            bdp3 = bdp1;
+            bdp4 = bdp2;
+        }
+        else {
+            bdp3 = bdp2;
+            bdp4 = bdp1;
+        }
+        bdp4.getBrain().<GlobalPos>eraseMemory(MemoryModuleType.JOB_SITE);
+        return bdp3;
+    }
+    
+    private boolean competesForSameJobsite(final GlobalPos gc, final PoiType ayc, final Villager bdp) {
+        return this.hasJobSite(bdp) && gc.equals(bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.JOB_SITE).get()) && this.hasMatchingProfession(ayc, bdp.getVillagerData().getProfession());
+    }
+    
+    private boolean hasMatchingProfession(final PoiType ayc, final VillagerProfession bds) {
+        return bds.getJobPoiType().getPredicate().test(ayc);
+    }
+    
+    private boolean hasJobSite(final Villager bdp) {
+        return bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.JOB_SITE).isPresent();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/PositionWrapper.java b/src/net/minecraft/world/entity/ai/behavior/PositionTracker.java
similarity index 55%
rename from src/net/minecraft/world/entity/ai/behavior/PositionWrapper.java
rename to src/net/minecraft/world/entity/ai/behavior/PositionTracker.java
index af1b21f..ee1ccb5 100644
--- a/src/net/minecraft/world/entity/ai/behavior/PositionWrapper.java
+++ b/src/net/minecraft/world/entity/ai/behavior/PositionTracker.java
@@ -1,13 +1,13 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.phys.Vec3;
 
-public interface PositionWrapper {
-    BlockPos getPos();
+public interface PositionTracker {
+    Vec3 currentPosition();
     
-    Vec3 getLookAtPos();
+    BlockPos currentBlockPosition();
     
-    boolean isVisible(final LivingEntity akz);
+    boolean isVisibleBy(final LivingEntity aoy);
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/RandomStroll.java b/src/net/minecraft/world/entity/ai/behavior/RandomStroll.java
new file mode 100644
index 0000000..3c22bc5
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/RandomStroll.java
@@ -0,0 +1,36 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.phys.Vec3;
+import java.util.Optional;
+import net.minecraft.world.entity.ai.util.RandomPos;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.world.entity.ai.memory.WalkTarget;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.PathfinderMob;
+
+public class RandomStroll extends Behavior<PathfinderMob> {
+    private final float speedModifier;
+    private final int maxHorizontalDistance;
+    private final int maxVerticalDistance;
+    
+    public RandomStroll(final float float1) {
+        this(float1, 10, 7);
+    }
+    
+    public RandomStroll(final float float1, final int integer2, final int integer3) {
+        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT));
+        this.speedModifier = float1;
+        this.maxHorizontalDistance = integer2;
+        this.maxVerticalDistance = integer3;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final PathfinderMob apg, final long long3) {
+        final Optional<Vec3> optional6 = Optional.<Vec3>ofNullable(RandomPos.getLandPos(apg, this.maxHorizontalDistance, this.maxVerticalDistance));
+        apg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, optional6.map(dem -> new WalkTarget(dem, this.speedModifier, 0)));
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/ReactToBell.java b/src/net/minecraft/world/entity/ai/behavior/ReactToBell.java
index 7abbf0e..0e26846 100644
--- a/src/net/minecraft/world/entity/ai/behavior/ReactToBell.java
+++ b/src/net/minecraft/world/entity/ai/behavior/ReactToBell.java
@@ -3,8 +3,6 @@ package net.minecraft.world.entity.ai.behavior;
 import net.minecraft.world.entity.raid.Raid;
 import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.world.entity.schedule.Activity;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import com.google.common.collect.ImmutableMap;
@@ -18,11 +16,11 @@ public class ReactToBell extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
-        final Raid azn7 = xd.getRaidAt(new BlockPos(akz));
-        if (azn7 == null) {
-            alp6.setActivity(Activity.HIDE);
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
+        final Raid bfh7 = zd.getRaidAt(aoy.blockPosition());
+        if (bfh7 == null) {
+            apr6.setActiveActivityIfPossible(Activity.HIDE);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/ResetProfession.java b/src/net/minecraft/world/entity/ai/behavior/ResetProfession.java
index 97d6f4a..f2bbd3e 100644
--- a/src/net/minecraft/world/entity/ai/behavior/ResetProfession.java
+++ b/src/net/minecraft/world/entity/ai/behavior/ResetProfession.java
@@ -17,14 +17,14 @@ public class ResetProfession extends Behavior<Villager> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        final VillagerData axx4 = axw.getVillagerData();
-        return axx4.getProfession() != VillagerProfession.NONE && axx4.getProfession() != VillagerProfession.NITWIT && axw.getVillagerXp() == 0 && axx4.getLevel() <= 1;
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        final VillagerData bdq4 = bdp.getVillagerData();
+        return bdq4.getProfession() != VillagerProfession.NONE && bdq4.getProfession() != VillagerProfession.NITWIT && bdp.getVillagerXp() == 0 && bdq4.getLevel() <= 1;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        axw.setVillagerData(axw.getVillagerData().setProfession(VillagerProfession.NONE));
-        axw.refreshBrain(xd);
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        bdp.setVillagerData(bdp.getVillagerData().setProfession(VillagerProfession.NONE));
+        bdp.refreshBrain(zd);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/ResetRaidStatus.java b/src/net/minecraft/world/entity/ai/behavior/ResetRaidStatus.java
index e1b0f2a..216d409 100644
--- a/src/net/minecraft/world/entity/ai/behavior/ResetRaidStatus.java
+++ b/src/net/minecraft/world/entity/ai/behavior/ResetRaidStatus.java
@@ -3,8 +3,6 @@ package net.minecraft.world.entity.ai.behavior;
 import net.minecraft.world.entity.raid.Raid;
 import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.world.entity.schedule.Activity;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import com.google.common.collect.ImmutableMap;
@@ -16,17 +14,17 @@ public class ResetRaidStatus extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        return xd.random.nextInt(20) == 0;
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        return zd.random.nextInt(20) == 0;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
-        final Raid azn7 = xd.getRaidAt(new BlockPos(akz));
-        if (azn7 == null || azn7.isStopped() || azn7.isLoss()) {
-            alp6.setDefaultActivity(Activity.IDLE);
-            alp6.updateActivity(xd.getDayTime(), xd.getGameTime());
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
+        final Raid bfh7 = zd.getRaidAt(aoy.blockPosition());
+        if (bfh7 == null || bfh7.isStopped() || bfh7.isLoss()) {
+            apr6.setDefaultActivity(Activity.IDLE);
+            apr6.updateActivityFromSchedule(zd.getDayTime(), zd.getGameTime());
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/RingBell.java b/src/net/minecraft/world/entity/ai/behavior/RingBell.java
index 727417e..46bf844 100644
--- a/src/net/minecraft/world/entity/ai/behavior/RingBell.java
+++ b/src/net/minecraft/world/entity/ai/behavior/RingBell.java
@@ -1,14 +1,13 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BellBlock;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.core.GlobalPos;
@@ -23,19 +22,19 @@ public class RingBell extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        return xd.random.nextFloat() > 0.95f;
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        return zd.random.nextFloat() > 0.95f;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
-        final BlockPos fk7 = alp6.<GlobalPos>getMemory(MemoryModuleType.MEETING_POINT).get().pos();
-        if (fk7.closerThan(new BlockPos(akz), 3.0)) {
-            final BlockState byj8 = xd.getBlockState(fk7);
-            if (byj8.getBlock() == Blocks.BELL) {
-                final BellBlock bpf9 = (BellBlock)byj8.getBlock();
-                bpf9.attemptToRing(xd, fk7, null);
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
+        final BlockPos fu7 = apr6.<GlobalPos>getMemory(MemoryModuleType.MEETING_POINT).get().pos();
+        if (fu7.closerThan(aoy.blockPosition(), 3.0)) {
+            final BlockState cfj8 = zd.getBlockState(fu7);
+            if (cfj8.is(Blocks.BELL)) {
+                final BellBlock bvp9 = (BellBlock)cfj8.getBlock();
+                bvp9.attemptToRing(zd, fu7, null);
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/behavior/RunIf.java b/src/net/minecraft/world/entity/ai/behavior/RunIf.java
new file mode 100644
index 0000000..37a5162
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/RunIf.java
@@ -0,0 +1,69 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.server.level.ServerLevel;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.Map;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.LivingEntity;
+
+public class RunIf<E extends LivingEntity> extends Behavior<E> {
+    private final Predicate<E> predicate;
+    private final Behavior<? super E> wrappedBehavior;
+    private final boolean checkWhileRunningAlso;
+    
+    public RunIf(final Map<MemoryModuleType<?>, MemoryStatus> map, final Predicate<E> predicate, final Behavior<? super E> aqh, final boolean boolean4) {
+        super(mergeMaps(map, aqh.entryCondition));
+        this.predicate = predicate;
+        this.wrappedBehavior = aqh;
+        this.checkWhileRunningAlso = boolean4;
+    }
+    
+    private static Map<MemoryModuleType<?>, MemoryStatus> mergeMaps(final Map<MemoryModuleType<?>, MemoryStatus> map1, final Map<MemoryModuleType<?>, MemoryStatus> map2) {
+        final Map<MemoryModuleType<?>, MemoryStatus> map3 = Maps.newHashMap();
+        map3.putAll(map1);
+        map3.putAll(map2);
+        return map3;
+    }
+    
+    public RunIf(final Predicate<E> predicate, final Behavior<? super E> aqh) {
+        this((Map)ImmutableMap.of(), predicate, aqh, false);
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoy) {
+        return this.predicate.test(aoy) && this.wrappedBehavior.checkExtraStartConditions(zd, aoy);
+    }
+    
+    @Override
+    protected boolean canStillUse(final ServerLevel zd, final E aoy, final long long3) {
+        return this.checkWhileRunningAlso && this.predicate.test(aoy) && this.wrappedBehavior.canStillUse(zd, aoy, long3);
+    }
+    
+    @Override
+    protected boolean timedOut(final long long1) {
+        return false;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoy, final long long3) {
+        this.wrappedBehavior.start(zd, aoy, long3);
+    }
+    
+    @Override
+    protected void tick(final ServerLevel zd, final E aoy, final long long3) {
+        this.wrappedBehavior.tick(zd, aoy, long3);
+    }
+    
+    @Override
+    protected void stop(final ServerLevel zd, final E aoy, final long long3) {
+        this.wrappedBehavior.stop(zd, aoy, long3);
+    }
+    
+    @Override
+    public String toString() {
+        return "RunIf: " + this.wrappedBehavior;
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/RunSometimes.java b/src/net/minecraft/world/entity/ai/behavior/RunSometimes.java
new file mode 100644
index 0000000..5c85cc8
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/RunSometimes.java
@@ -0,0 +1,76 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.util.IntRange;
+import net.minecraft.world.entity.LivingEntity;
+
+public class RunSometimes<E extends LivingEntity> extends Behavior<E> {
+    private boolean resetTicks;
+    private boolean wasRunning;
+    private final IntRange interval;
+    private final Behavior<? super E> wrappedBehavior;
+    private int ticksUntilNextStart;
+    
+    public RunSometimes(final Behavior<? super E> aqh, final IntRange adx) {
+        this(aqh, false, adx);
+    }
+    
+    public RunSometimes(final Behavior<? super E> aqh, final boolean boolean2, final IntRange adx) {
+        super(aqh.entryCondition);
+        this.wrappedBehavior = aqh;
+        this.resetTicks = !boolean2;
+        this.interval = adx;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoy) {
+        if (!this.wrappedBehavior.checkExtraStartConditions(zd, aoy)) {
+            return false;
+        }
+        if (this.resetTicks) {
+            this.resetTicksUntilNextStart(zd);
+            this.resetTicks = false;
+        }
+        if (this.ticksUntilNextStart > 0) {
+            --this.ticksUntilNextStart;
+        }
+        return !this.wasRunning && this.ticksUntilNextStart == 0;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoy, final long long3) {
+        this.wrappedBehavior.start(zd, aoy, long3);
+    }
+    
+    @Override
+    protected boolean canStillUse(final ServerLevel zd, final E aoy, final long long3) {
+        return this.wrappedBehavior.canStillUse(zd, aoy, long3);
+    }
+    
+    @Override
+    protected void tick(final ServerLevel zd, final E aoy, final long long3) {
+        this.wrappedBehavior.tick(zd, aoy, long3);
+        this.wasRunning = (this.wrappedBehavior.getStatus() == Status.RUNNING);
+    }
+    
+    @Override
+    protected void stop(final ServerLevel zd, final E aoy, final long long3) {
+        this.resetTicksUntilNextStart(zd);
+        this.wrappedBehavior.stop(zd, aoy, long3);
+    }
+    
+    private void resetTicksUntilNextStart(final ServerLevel zd) {
+        this.ticksUntilNextStart = this.interval.randomValue(zd.random);
+    }
+    
+    @Override
+    protected boolean timedOut(final long long1) {
+        return false;
+    }
+    
+    @Override
+    public String toString() {
+        return "RunSometimes: " + this.wrappedBehavior;
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/SetClosestHomeAsWalkTarget.java b/src/net/minecraft/world/entity/ai/behavior/SetClosestHomeAsWalkTarget.java
index e957255..9db4dd4 100644
--- a/src/net/minecraft/world/entity/ai/behavior/SetClosestHomeAsWalkTarget.java
+++ b/src/net/minecraft/world/entity/ai/behavior/SetClosestHomeAsWalkTarget.java
@@ -6,9 +6,8 @@ import java.util.function.Predicate;
 import net.minecraft.network.protocol.game.DebugPackets;
 import java.util.Optional;
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.entity.ai.village.poi.PoiManager;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.ai.village.poi.PoiManager;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.server.level.ServerLevel;
@@ -22,7 +21,7 @@ import it.unimi.dsi.fastutil.longs.Long2LongMap;
 import net.minecraft.world.entity.LivingEntity;
 
 public class SetClosestHomeAsWalkTarget extends Behavior<LivingEntity> {
-    private final float speed;
+    private final float speedModifier;
     private final Long2LongMap batchCache;
     private int triedCount;
     private long lastUpdate;
@@ -30,29 +29,29 @@ public class SetClosestHomeAsWalkTarget extends Behavior<LivingEntity> {
     public SetClosestHomeAsWalkTarget(final float float1) {
         super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<WalkTarget>)MemoryModuleType.HOME, MemoryStatus.VALUE_ABSENT));
         this.batchCache = (Long2LongMap)new Long2LongOpenHashMap();
-        this.speed = float1;
+        this.speedModifier = float1;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        if (xd.getGameTime() - this.lastUpdate < 20L) {
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        if (zd.getGameTime() - this.lastUpdate < 20L) {
             return false;
         }
-        final PathfinderMob alg4 = (PathfinderMob)akz;
-        final PoiManager asr5 = xd.getPoiManager();
-        final Optional<BlockPos> optional6 = asr5.findClosest(PoiType.HOME.getPredicate(), fk -> true, new BlockPos(akz), 48, PoiManager.Occupancy.ANY);
-        return optional6.isPresent() && optional6.get().distSqr(new BlockPos(alg4)) > 4.0;
+        final PathfinderMob apg4 = (PathfinderMob)aoy;
+        final PoiManager axz5 = zd.getPoiManager();
+        final Optional<BlockPos> optional6 = axz5.findClosest(PoiType.HOME.getPredicate(), aoy.blockPosition(), 48, PoiManager.Occupancy.ANY);
+        return optional6.isPresent() && optional6.get().distSqr(apg4.blockPosition()) > 4.0;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
         this.triedCount = 0;
-        this.lastUpdate = xd.getGameTime() + xd.getRandom().nextInt(20);
-        final PathfinderMob alg6 = (PathfinderMob)akz;
-        final PoiManager asr7 = xd.getPoiManager();
+        this.lastUpdate = zd.getGameTime() + zd.getRandom().nextInt(20);
+        final PathfinderMob apg6 = (PathfinderMob)aoy;
+        final PoiManager axz7 = zd.getPoiManager();
         final long long4;
-        final Predicate<BlockPos> predicate8 = fk -> {
-            long4 = fk.asLong();
+        final Predicate<BlockPos> predicate8 = fu -> {
+            long4 = fu.asLong();
             if (this.batchCache.containsKey(long4)) {
                 return false;
             }
@@ -64,14 +63,14 @@ public class SetClosestHomeAsWalkTarget extends Behavior<LivingEntity> {
                 return true;
             }
         };
-        final Stream<BlockPos> stream9 = asr7.findAll(PoiType.HOME.getPredicate(), predicate8, new BlockPos(akz), 48, PoiManager.Occupancy.ANY);
-        final Path cqq10 = alg6.getNavigation().createPath(stream9, PoiType.HOME.getValidRange());
-        if (cqq10 != null && cqq10.canReach()) {
-            final BlockPos fk2 = cqq10.getTarget();
-            final Optional<PoiType> optional12 = asr7.getType(fk2);
+        final Stream<BlockPos> stream9 = axz7.findAll(PoiType.HOME.getPredicate(), predicate8, aoy.blockPosition(), 48, PoiManager.Occupancy.ANY);
+        final Path czf10 = apg6.getNavigation().createPath(stream9, PoiType.HOME.getValidRange());
+        if (czf10 != null && czf10.canReach()) {
+            final BlockPos fu2 = czf10.getTarget();
+            final Optional<PoiType> optional12 = axz7.getType(fu2);
             if (optional12.isPresent()) {
-                akz.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(fk2, this.speed, 1));
-                DebugPackets.sendPoiTicketCountPacket(xd, fk2);
+                aoy.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(fu2, this.speedModifier, 1));
+                DebugPackets.sendPoiTicketCountPacket(zd, fu2);
             }
         }
         else if (this.triedCount < 5) {
diff --git a/src/net/minecraft/world/entity/ai/behavior/SetEntityLookTarget.java b/src/net/minecraft/world/entity/ai/behavior/SetEntityLookTarget.java
index ce2103e..34895e0 100644
--- a/src/net/minecraft/world/entity/ai/behavior/SetEntityLookTarget.java
+++ b/src/net/minecraft/world/entity/ai/behavior/SetEntityLookTarget.java
@@ -17,28 +17,32 @@ public class SetEntityLookTarget extends Behavior<LivingEntity> {
     private final Predicate<LivingEntity> predicate;
     private final float maxDistSqr;
     
-    public SetEntityLookTarget(final MobCategory alb, final float float2) {
-        this(akz -> alb.equals(akz.getType().getCategory()), float2);
+    public SetEntityLookTarget(final MobCategory apa, final float float2) {
+        this(aoy -> apa.equals(aoy.getType().getCategory()), float2);
     }
     
-    public SetEntityLookTarget(final EntityType<?> aku, final float float2) {
-        this(akz -> aku.equals(akz.getType()), float2);
+    public SetEntityLookTarget(final EntityType<?> aoq, final float float2) {
+        this(aoy -> aoq.equals(aoy.getType()), float2);
+    }
+    
+    public SetEntityLookTarget(final float float1) {
+        this(aoy -> true, float1);
     }
     
     public SetEntityLookTarget(final Predicate<LivingEntity> predicate, final float float2) {
-        super(ImmutableMap.<MemoryModuleType<PositionWrapper>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionWrapper>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT));
+        super(ImmutableMap.<MemoryModuleType<PositionTracker>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionTracker>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT));
         this.predicate = predicate;
         this.maxDistSqr = float2 * float2;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        return akz.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get().stream().anyMatch(this.predicate);
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        return aoy.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get().stream().anyMatch(this.predicate);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
-        alp6.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).ifPresent(list -> list.stream().filter(this.predicate).filter(akz2 -> akz2.distanceToSqr(akz) <= this.maxDistSqr).findFirst().ifPresent(akz -> alp6.<EntityPosWrapper>setMemory((MemoryModuleType<EntityPosWrapper>)MemoryModuleType.LOOK_TARGET, new EntityPosWrapper(akz))));
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
+        apr6.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).ifPresent(list -> list.stream().filter(this.predicate).filter(aoy2 -> aoy2.distanceToSqr(aoy) <= this.maxDistSqr).findFirst().ifPresent(aoy -> apr6.<EntityTracker>setMemory((MemoryModuleType<EntityTracker>)MemoryModuleType.LOOK_TARGET, new EntityTracker(aoy, true))));
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/SetHiddenState.java b/src/net/minecraft/world/entity/ai/behavior/SetHiddenState.java
index dd8626d..b24c478 100644
--- a/src/net/minecraft/world/entity/ai/behavior/SetHiddenState.java
+++ b/src/net/minecraft/world/entity/ai/behavior/SetHiddenState.java
@@ -1,10 +1,9 @@
 package net.minecraft.world.entity.ai.behavior;
 
+import net.minecraft.core.BlockPos;
 import java.util.Optional;
 import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.core.GlobalPos;
@@ -26,19 +25,19 @@ public class SetHiddenState extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
-        final Optional<Long> optional7 = alp6.<Long>getMemory(MemoryModuleType.HEARD_BELL_TIME);
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
+        final Optional<Long> optional7 = apr6.<Long>getMemory(MemoryModuleType.HEARD_BELL_TIME);
         final boolean boolean8 = optional7.get() + 300L <= long3;
         if (this.ticksHidden > this.stayHiddenTicks || boolean8) {
-            alp6.<Long>eraseMemory(MemoryModuleType.HEARD_BELL_TIME);
-            alp6.<GlobalPos>eraseMemory(MemoryModuleType.HIDING_PLACE);
-            alp6.updateActivity(xd.getDayTime(), xd.getGameTime());
+            apr6.<Long>eraseMemory(MemoryModuleType.HEARD_BELL_TIME);
+            apr6.<GlobalPos>eraseMemory(MemoryModuleType.HIDING_PLACE);
+            apr6.updateActivityFromSchedule(zd.getDayTime(), zd.getGameTime());
             this.ticksHidden = 0;
             return;
         }
-        final BlockPos fk9 = alp6.<GlobalPos>getMemory(MemoryModuleType.HIDING_PLACE).get().pos();
-        if (fk9.closerThan(new BlockPos(akz), this.closeEnoughDist + 1)) {
+        final BlockPos fu9 = apr6.<GlobalPos>getMemory(MemoryModuleType.HIDING_PLACE).get().pos();
+        if (fu9.closerThan(aoy.blockPosition(), this.closeEnoughDist)) {
             ++this.ticksHidden;
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/behavior/SetLookAndInteract.java b/src/net/minecraft/world/entity/ai/behavior/SetLookAndInteract.java
index 76045cd..00e189d 100644
--- a/src/net/minecraft/world/entity/ai/behavior/SetLookAndInteract.java
+++ b/src/net/minecraft/world/entity/ai/behavior/SetLookAndInteract.java
@@ -18,37 +18,37 @@ public class SetLookAndInteract extends Behavior<LivingEntity> {
     private final Predicate<LivingEntity> targetFilter;
     private final Predicate<LivingEntity> selfFilter;
     
-    public SetLookAndInteract(final EntityType<?> aku, final int integer, final Predicate<LivingEntity> predicate3, final Predicate<LivingEntity> predicate4) {
-        super(ImmutableMap.<MemoryModuleType<PositionWrapper>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<PositionWrapper>)MemoryModuleType.INTERACTION_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionWrapper>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT));
-        this.type = aku;
+    public SetLookAndInteract(final EntityType<?> aoq, final int integer, final Predicate<LivingEntity> predicate3, final Predicate<LivingEntity> predicate4) {
+        super(ImmutableMap.<MemoryModuleType<PositionTracker>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<PositionTracker>)MemoryModuleType.INTERACTION_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionTracker>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT));
+        this.type = aoq;
         this.interactionRangeSqr = integer * integer;
         this.targetFilter = predicate4;
         this.selfFilter = predicate3;
     }
     
-    public SetLookAndInteract(final EntityType<?> aku, final int integer) {
-        this(aku, integer, akz -> true, akz -> true);
+    public SetLookAndInteract(final EntityType<?> aoq, final int integer) {
+        this(aoq, integer, aoy -> true, aoy -> true);
     }
     
-    public boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        return this.selfFilter.test(akz) && this.getVisibleEntities(akz).stream().anyMatch(this::isMatchingTarget);
+    public boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        return this.selfFilter.test(aoy) && this.getVisibleEntities(aoy).stream().anyMatch(this::isMatchingTarget);
     }
     
-    public void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        super.start(xd, akz, long3);
-        final Brain<?> alp6 = akz.getBrain();
+    public void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        super.start(zd, aoy, long3);
+        final Brain<?> apr6 = aoy.getBrain();
         final Brain brain;
-        alp6.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).ifPresent(list -> list.stream().filter(akz2 -> akz2.distanceToSqr(akz) <= this.interactionRangeSqr).filter(this::isMatchingTarget).findFirst().ifPresent(akz -> {
-            brain.setMemory(MemoryModuleType.INTERACTION_TARGET, akz);
-            brain.setMemory(MemoryModuleType.LOOK_TARGET, new EntityPosWrapper(akz));
+        apr6.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).ifPresent(list -> list.stream().filter(aoy2 -> aoy2.distanceToSqr(aoy) <= this.interactionRangeSqr).filter(this::isMatchingTarget).findFirst().ifPresent(aoy -> {
+            brain.setMemory(MemoryModuleType.INTERACTION_TARGET, aoy);
+            brain.setMemory(MemoryModuleType.LOOK_TARGET, new EntityTracker(aoy, true));
         }));
     }
     
-    private boolean isMatchingTarget(final LivingEntity akz) {
-        return this.type.equals(akz.getType()) && this.targetFilter.test(akz);
+    private boolean isMatchingTarget(final LivingEntity aoy) {
+        return this.type.equals(aoy.getType()) && this.targetFilter.test(aoy);
     }
     
-    private List<LivingEntity> getVisibleEntities(final LivingEntity akz) {
-        return akz.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get();
+    private List<LivingEntity> getVisibleEntities(final LivingEntity aoy) {
+        return aoy.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/SetRaidStatus.java b/src/net/minecraft/world/entity/ai/behavior/SetRaidStatus.java
index ed47b92..0fc0c1f 100644
--- a/src/net/minecraft/world/entity/ai/behavior/SetRaidStatus.java
+++ b/src/net/minecraft/world/entity/ai/behavior/SetRaidStatus.java
@@ -3,8 +3,6 @@ package net.minecraft.world.entity.ai.behavior;
 import net.minecraft.world.entity.raid.Raid;
 import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.world.entity.schedule.Activity;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import com.google.common.collect.ImmutableMap;
@@ -16,22 +14,22 @@ public class SetRaidStatus extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        return xd.random.nextInt(20) == 0;
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        return zd.random.nextInt(20) == 0;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
-        final Raid azn7 = xd.getRaidAt(new BlockPos(akz));
-        if (azn7 != null) {
-            if (!azn7.hasFirstWaveSpawned() || azn7.isBetweenWaves()) {
-                alp6.setDefaultActivity(Activity.PRE_RAID);
-                alp6.setActivity(Activity.PRE_RAID);
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
+        final Raid bfh7 = zd.getRaidAt(aoy.blockPosition());
+        if (bfh7 != null) {
+            if (!bfh7.hasFirstWaveSpawned() || bfh7.isBetweenWaves()) {
+                apr6.setDefaultActivity(Activity.PRE_RAID);
+                apr6.setActiveActivityIfPossible(Activity.PRE_RAID);
             }
             else {
-                alp6.setDefaultActivity(Activity.RAID);
-                alp6.setActivity(Activity.RAID);
+                apr6.setDefaultActivity(Activity.RAID);
+                apr6.setActiveActivityIfPossible(Activity.RAID);
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetAwayFrom.java b/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetAwayFrom.java
new file mode 100644
index 0000000..5b35e7f
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetAwayFrom.java
@@ -0,0 +1,76 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.util.RandomPos;
+import net.minecraft.core.Position;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.core.BlockPos;
+import java.util.Map;
+import net.minecraft.world.entity.ai.memory.WalkTarget;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.phys.Vec3;
+import java.util.function.Function;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.PathfinderMob;
+
+public class SetWalkTargetAwayFrom<T> extends Behavior<PathfinderMob> {
+    private final MemoryModuleType<T> walkAwayFromMemory;
+    private final float speedModifier;
+    private final int desiredDistance;
+    private final Function<T, Vec3> toPosition;
+    
+    public SetWalkTargetAwayFrom(final MemoryModuleType<T> awp, final float float2, final int integer, final boolean boolean4, final Function<T, Vec3> function) {
+        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, boolean4 ? MemoryStatus.REGISTERED : MemoryStatus.VALUE_ABSENT, (MemoryModuleType<WalkTarget>)awp, MemoryStatus.VALUE_PRESENT));
+        this.walkAwayFromMemory = awp;
+        this.speedModifier = float2;
+        this.desiredDistance = integer;
+        this.toPosition = function;
+    }
+    
+    public static SetWalkTargetAwayFrom<BlockPos> pos(final MemoryModuleType<BlockPos> awp, final float float2, final int integer, final boolean boolean4) {
+        return new SetWalkTargetAwayFrom<BlockPos>(awp, float2, integer, boolean4, Vec3::atBottomCenterOf);
+    }
+    
+    public static SetWalkTargetAwayFrom<? extends Entity> entity(final MemoryModuleType<? extends Entity> awp, final float float2, final int integer, final boolean boolean4) {
+        return new SetWalkTargetAwayFrom<Entity>(awp, float2, integer, boolean4, Entity::position);
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final PathfinderMob apg) {
+        return !this.alreadyWalkingAwayFromPosWithSameSpeed(apg) && apg.position().closerThan(this.getPosToAvoid(apg), this.desiredDistance);
+    }
+    
+    private Vec3 getPosToAvoid(final PathfinderMob apg) {
+        return this.toPosition.apply(apg.getBrain().<T>getMemory(this.walkAwayFromMemory).get());
+    }
+    
+    private boolean alreadyWalkingAwayFromPosWithSameSpeed(final PathfinderMob apg) {
+        if (!apg.getBrain().hasMemoryValue(MemoryModuleType.WALK_TARGET)) {
+            return false;
+        }
+        final WalkTarget awr3 = apg.getBrain().<WalkTarget>getMemory(MemoryModuleType.WALK_TARGET).get();
+        if (awr3.getSpeedModifier() != this.speedModifier) {
+            return false;
+        }
+        final Vec3 dem4 = awr3.getTarget().currentPosition().subtract(apg.position());
+        final Vec3 dem5 = this.getPosToAvoid(apg).subtract(apg.position());
+        return dem4.dot(dem5) < 0.0;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final PathfinderMob apg, final long long3) {
+        moveAwayFrom(apg, this.getPosToAvoid(apg), this.speedModifier);
+    }
+    
+    private static void moveAwayFrom(final PathfinderMob apg, final Vec3 dem, final float float3) {
+        for (int integer4 = 0; integer4 < 10; ++integer4) {
+            final Vec3 dem2 = RandomPos.getLandPosAvoid(apg, 16, 7, dem);
+            if (dem2 != null) {
+                apg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(dem2, float3, 0));
+                return;
+            }
+        }
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetAwayFromEntity.java b/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetAwayFromEntity.java
deleted file mode 100644
index 79d43db..0000000
--- a/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetAwayFromEntity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package net.minecraft.world.entity.ai.behavior;
-
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.entity.ai.util.RandomPos;
-import net.minecraft.server.level.ServerLevel;
-import java.util.Map;
-import net.minecraft.world.entity.ai.memory.WalkTarget;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.world.entity.ai.memory.MemoryStatus;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.ai.memory.MemoryModuleType;
-import net.minecraft.world.entity.PathfinderMob;
-
-public class SetWalkTargetAwayFromEntity extends Behavior<PathfinderMob> {
-    private final MemoryModuleType<? extends Entity> memory;
-    private final float speed;
-    
-    public SetWalkTargetAwayFromEntity(final MemoryModuleType<? extends Entity> arl, final float float2) {
-        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<WalkTarget>)arl, MemoryStatus.VALUE_PRESENT));
-        this.memory = arl;
-        this.speed = float2;
-    }
-    
-    @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final PathfinderMob alg) {
-        final Entity akq4 = (Entity)alg.getBrain().getMemory(this.memory).get();
-        return alg.distanceToSqr(akq4) < 36.0;
-    }
-    
-    @Override
-    protected void start(final ServerLevel xd, final PathfinderMob alg, final long long3) {
-        final Entity akq6 = (Entity)alg.getBrain().getMemory(this.memory).get();
-        moveAwayFromMob(alg, akq6, this.speed);
-    }
-    
-    public static void moveAwayFromMob(final PathfinderMob alg, final Entity akq, final float float3) {
-        for (int integer4 = 0; integer4 < 10; ++integer4) {
-            final Vec3 cvl5 = RandomPos.getLandPosAvoid(alg, 16, 7, akq.position());
-            if (cvl5 != null) {
-                alg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(cvl5, float3, 0));
-                return;
-            }
-        }
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromAttackTargetIfTargetOutOfReach.java b/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromAttackTargetIfTargetOutOfReach.java
new file mode 100644
index 0000000..0f8de90
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromAttackTargetIfTargetOutOfReach.java
@@ -0,0 +1,43 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.world.entity.ai.memory.WalkTarget;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.Mob;
+
+public class SetWalkTargetFromAttackTargetIfTargetOutOfReach extends Behavior<Mob> {
+    private final float speedModifier;
+    
+    public SetWalkTargetFromAttackTargetIfTargetOutOfReach(final float float1) {
+        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)MemoryModuleType.LOOK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)MemoryModuleType.ATTACK_TARGET, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<WalkTarget>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.REGISTERED));
+        this.speedModifier = float1;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final Mob aoz, final long long3) {
+        final LivingEntity aoy6 = aoz.getBrain().<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET).get();
+        if (BehaviorUtils.canSee(aoz, aoy6) && BehaviorUtils.isWithinAttackRange(aoz, aoy6, 1)) {
+            this.clearWalkTarget(aoz);
+        }
+        else {
+            this.setWalkAndLookTarget(aoz, aoy6);
+        }
+    }
+    
+    private void setWalkAndLookTarget(final LivingEntity aoy1, final LivingEntity aoy2) {
+        final Brain apr4 = aoy1.getBrain();
+        apr4.<EntityTracker>setMemory(MemoryModuleType.LOOK_TARGET, new EntityTracker(aoy2, true));
+        final WalkTarget awr5 = new WalkTarget(new EntityTracker(aoy2, false), this.speedModifier, 0);
+        apr4.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, awr5);
+    }
+    
+    private void clearWalkTarget(final LivingEntity aoy) {
+        aoy.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromBlockMemory.java b/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromBlockMemory.java
index ab57544..59d3d58 100644
--- a/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromBlockMemory.java
+++ b/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromBlockMemory.java
@@ -1,7 +1,6 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Entity;
 import java.util.Optional;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
 import net.minecraft.world.entity.PathfinderMob;
@@ -20,74 +19,74 @@ import net.minecraft.world.entity.npc.Villager;
 
 public class SetWalkTargetFromBlockMemory extends Behavior<Villager> {
     private final MemoryModuleType<GlobalPos> memoryType;
-    private final float speed;
+    private final float speedModifier;
     private final int closeEnoughDist;
     private final int tooFarDistance;
     private final int tooLongUnreachableDuration;
     
-    public SetWalkTargetFromBlockMemory(final MemoryModuleType<GlobalPos> arl, final float float2, final int integer3, final int integer4, final int integer5) {
-        super(ImmutableMap.<MemoryModuleType<Long>, MemoryStatus>of(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryStatus.REGISTERED, (MemoryModuleType<Long>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<Long>)arl, MemoryStatus.VALUE_PRESENT));
-        this.memoryType = arl;
-        this.speed = float2;
+    public SetWalkTargetFromBlockMemory(final MemoryModuleType<GlobalPos> awp, final float float2, final int integer3, final int integer4, final int integer5) {
+        super(ImmutableMap.<MemoryModuleType<Long>, MemoryStatus>of(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryStatus.REGISTERED, (MemoryModuleType<Long>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<Long>)awp, MemoryStatus.VALUE_PRESENT));
+        this.memoryType = awp;
+        this.speedModifier = float2;
         this.closeEnoughDist = integer3;
         this.tooFarDistance = integer4;
         this.tooLongUnreachableDuration = integer5;
     }
     
-    private void dropPOI(final Villager axw, final long long2) {
-        final Brain<?> alp5 = axw.getBrain();
-        axw.releasePoi(this.memoryType);
-        alp5.<GlobalPos>eraseMemory(this.memoryType);
-        alp5.<Long>setMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, long2);
+    private void dropPOI(final Villager bdp, final long long2) {
+        final Brain<?> apr5 = bdp.getBrain();
+        bdp.releasePoi(this.memoryType);
+        apr5.<GlobalPos>eraseMemory(this.memoryType);
+        apr5.<Long>setMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, long2);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        final Brain<?> alp6 = axw.getBrain();
-        Vec3 cvl8;
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        final Brain<?> apr6 = bdp.getBrain();
+        Vec3 dem8;
         int integer9;
         int integer10;
         final Brain brain;
-        alp6.<GlobalPos>getMemory(this.memoryType).ifPresent(fr -> {
-            if (this.tiredOfTryingToFindTarget(xd, axw)) {
-                this.dropPOI(axw, long3);
+        apr6.<GlobalPos>getMemory(this.memoryType).ifPresent(gc -> {
+            if (this.tiredOfTryingToFindTarget(zd, bdp)) {
+                this.dropPOI(bdp, long3);
             }
-            else if (this.tooFar(xd, axw, fr)) {
-                cvl8 = null;
+            else if (this.tooFar(zd, bdp, gc)) {
+                dem8 = null;
                 integer9 = 0;
                 integer10 = 1000;
                 while (integer9 < 1000) {
-                    if (cvl8 != null) {
-                        if (!this.tooFar(xd, axw, GlobalPos.of(axw.dimension, new BlockPos(cvl8)))) {
+                    if (dem8 != null) {
+                        if (!this.tooFar(zd, bdp, GlobalPos.of(zd.dimension(), new BlockPos(dem8)))) {
                             break;
                         }
                     }
-                    cvl8 = RandomPos.getPosTowards(axw, 15, 7, new Vec3(fr.pos()));
+                    dem8 = RandomPos.getPosTowards(bdp, 15, 7, Vec3.atBottomCenterOf(gc.pos()));
                     ++integer9;
                 }
                 if (integer9 == 1000) {
-                    this.dropPOI(axw, long3);
+                    this.dropPOI(bdp, long3);
                 }
                 else {
-                    brain.setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(cvl8, this.speed, this.closeEnoughDist));
+                    brain.setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(dem8, this.speedModifier, this.closeEnoughDist));
                 }
             }
-            else if (!this.closeEnough(xd, axw, fr)) {
-                brain.setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(fr.pos(), this.speed, this.closeEnoughDist));
+            else if (!this.closeEnough(zd, bdp, gc)) {
+                brain.setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(gc.pos(), this.speedModifier, this.closeEnoughDist));
             }
         });
     }
     
-    private boolean tiredOfTryingToFindTarget(final ServerLevel xd, final Villager axw) {
-        final Optional<Long> optional4 = axw.getBrain().<Long>getMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
-        return optional4.isPresent() && xd.getGameTime() - optional4.get() > this.tooLongUnreachableDuration;
+    private boolean tiredOfTryingToFindTarget(final ServerLevel zd, final Villager bdp) {
+        final Optional<Long> optional4 = bdp.getBrain().<Long>getMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
+        return optional4.isPresent() && zd.getGameTime() - optional4.get() > this.tooLongUnreachableDuration;
     }
     
-    private boolean tooFar(final ServerLevel xd, final Villager axw, final GlobalPos fr) {
-        return fr.dimension() != xd.getDimension().getType() || fr.pos().distManhattan(new BlockPos(axw)) > this.tooFarDistance;
+    private boolean tooFar(final ServerLevel zd, final Villager bdp, final GlobalPos gc) {
+        return gc.dimension() != zd.dimension() || gc.pos().distManhattan(bdp.blockPosition()) > this.tooFarDistance;
     }
     
-    private boolean closeEnough(final ServerLevel xd, final Villager axw, final GlobalPos fr) {
-        return fr.dimension() == xd.getDimension().getType() && fr.pos().distManhattan(new BlockPos(axw)) <= this.closeEnoughDist;
+    private boolean closeEnough(final ServerLevel zd, final Villager bdp, final GlobalPos gc) {
+        return gc.dimension() == zd.dimension() && gc.pos().distManhattan(bdp.blockPosition()) <= this.closeEnoughDist;
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromLookTarget.java b/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromLookTarget.java
index e33a2d2..411d369 100644
--- a/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromLookTarget.java
+++ b/src/net/minecraft/world/entity/ai/behavior/SetWalkTargetFromLookTarget.java
@@ -10,19 +10,19 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.LivingEntity;
 
 public class SetWalkTargetFromLookTarget extends Behavior<LivingEntity> {
-    private final float speed;
+    private final float speedModifier;
     private final int closeEnoughDistance;
     
     public SetWalkTargetFromLookTarget(final float float1, final int integer) {
         super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<WalkTarget>)MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_PRESENT));
-        this.speed = float1;
+        this.speedModifier = float1;
         this.closeEnoughDistance = integer;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
-        final PositionWrapper amz7 = alp6.<PositionWrapper>getMemory(MemoryModuleType.LOOK_TARGET).get();
-        alp6.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(amz7, this.speed, this.closeEnoughDistance));
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
+        final PositionTracker arn7 = apr6.<PositionTracker>getMemory(MemoryModuleType.LOOK_TARGET).get();
+        apr6.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(arn7, this.speedModifier, this.closeEnoughDistance));
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java b/src/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
index a2d712c..0bf4023 100644
--- a/src/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
+++ b/src/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
@@ -31,95 +31,95 @@ public class ShowTradesToPlayer extends Behavior<Villager> {
         this.displayItems = Lists.newArrayList();
     }
     
-    public boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        final Brain<?> alp4 = axw.getBrain();
-        if (!alp4.<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).isPresent()) {
+    public boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        final Brain<?> apr4 = bdp.getBrain();
+        if (!apr4.<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).isPresent()) {
             return false;
         }
-        final LivingEntity akz5 = alp4.<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).get();
-        return akz5.getType() == EntityType.PLAYER && axw.isAlive() && akz5.isAlive() && !axw.isBaby() && axw.distanceToSqr(akz5) <= 17.0;
+        final LivingEntity aoy5 = apr4.<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).get();
+        return aoy5.getType() == EntityType.PLAYER && bdp.isAlive() && aoy5.isAlive() && !bdp.isBaby() && bdp.distanceToSqr(aoy5) <= 17.0;
     }
     
-    public boolean canStillUse(final ServerLevel xd, final Villager axw, final long long3) {
-        return this.checkExtraStartConditions(xd, axw) && this.lookTime > 0 && axw.getBrain().<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).isPresent();
+    public boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
+        return this.checkExtraStartConditions(zd, bdp) && this.lookTime > 0 && bdp.getBrain().<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).isPresent();
     }
     
-    public void start(final ServerLevel xd, final Villager axw, final long long3) {
-        super.start(xd, axw, long3);
-        this.lookAtTarget(axw);
+    public void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        super.start(zd, bdp, long3);
+        this.lookAtTarget(bdp);
         this.cycleCounter = 0;
         this.displayIndex = 0;
         this.lookTime = 40;
     }
     
-    public void tick(final ServerLevel xd, final Villager axw, final long long3) {
-        final LivingEntity akz6 = this.lookAtTarget(axw);
-        this.findItemsToDisplay(akz6, axw);
+    public void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        final LivingEntity aoy6 = this.lookAtTarget(bdp);
+        this.findItemsToDisplay(aoy6, bdp);
         if (!this.displayItems.isEmpty()) {
-            this.displayCyclingItems(axw);
+            this.displayCyclingItems(bdp);
         }
         else {
-            axw.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
+            bdp.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
             this.lookTime = Math.min(this.lookTime, 40);
         }
         --this.lookTime;
     }
     
-    public void tick(final ServerLevel xd, final Villager axw, final long long3) {
-        super.stop(xd, axw, long3);
-        axw.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.INTERACTION_TARGET);
-        axw.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
+    public void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        super.stop(zd, bdp, long3);
+        bdp.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.INTERACTION_TARGET);
+        bdp.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
         this.playerItemStack = null;
     }
     
-    private void findItemsToDisplay(final LivingEntity akz, final Villager axw) {
+    private void findItemsToDisplay(final LivingEntity aoy, final Villager bdp) {
         boolean boolean4 = false;
-        final ItemStack ben5 = akz.getMainHandItem();
-        if (this.playerItemStack == null || !ItemStack.isSame(this.playerItemStack, ben5)) {
-            this.playerItemStack = ben5;
+        final ItemStack bki5 = aoy.getMainHandItem();
+        if (this.playerItemStack == null || !ItemStack.isSame(this.playerItemStack, bki5)) {
+            this.playerItemStack = bki5;
             boolean4 = true;
             this.displayItems.clear();
         }
         if (boolean4 && !this.playerItemStack.isEmpty()) {
-            this.updateDisplayItems(axw);
+            this.updateDisplayItems(bdp);
             if (!this.displayItems.isEmpty()) {
                 this.lookTime = 900;
-                this.displayFirstItem(axw);
+                this.displayFirstItem(bdp);
             }
         }
     }
     
-    private void displayFirstItem(final Villager axw) {
-        axw.setItemSlot(EquipmentSlot.MAINHAND, this.displayItems.get(0));
+    private void displayFirstItem(final Villager bdp) {
+        bdp.setItemSlot(EquipmentSlot.MAINHAND, this.displayItems.get(0));
     }
     
-    private void updateDisplayItems(final Villager axw) {
-        for (final MerchantOffer biz4 : axw.getOffers()) {
-            if (!biz4.isOutOfStock() && this.playerItemStackMatchesCostOfOffer(biz4)) {
-                this.displayItems.add(biz4.getResult());
+    private void updateDisplayItems(final Villager bdp) {
+        for (final MerchantOffer boz4 : bdp.getOffers()) {
+            if (!boz4.isOutOfStock() && this.playerItemStackMatchesCostOfOffer(boz4)) {
+                this.displayItems.add(boz4.getResult());
             }
         }
     }
     
-    private boolean playerItemStackMatchesCostOfOffer(final MerchantOffer biz) {
-        return ItemStack.isSame(this.playerItemStack, biz.getCostA()) || ItemStack.isSame(this.playerItemStack, biz.getCostB());
+    private boolean playerItemStackMatchesCostOfOffer(final MerchantOffer boz) {
+        return ItemStack.isSame(this.playerItemStack, boz.getCostA()) || ItemStack.isSame(this.playerItemStack, boz.getCostB());
     }
     
-    private LivingEntity lookAtTarget(final Villager axw) {
-        final Brain<?> alp3 = axw.getBrain();
-        final LivingEntity akz4 = alp3.<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).get();
-        alp3.<EntityPosWrapper>setMemory((MemoryModuleType<EntityPosWrapper>)MemoryModuleType.LOOK_TARGET, new EntityPosWrapper(akz4));
-        return akz4;
+    private LivingEntity lookAtTarget(final Villager bdp) {
+        final Brain<?> apr3 = bdp.getBrain();
+        final LivingEntity aoy4 = apr3.<LivingEntity>getMemory(MemoryModuleType.INTERACTION_TARGET).get();
+        apr3.<EntityTracker>setMemory((MemoryModuleType<EntityTracker>)MemoryModuleType.LOOK_TARGET, new EntityTracker(aoy4, true));
+        return aoy4;
     }
     
-    private void displayCyclingItems(final Villager axw) {
+    private void displayCyclingItems(final Villager bdp) {
         if (this.displayItems.size() >= 2 && ++this.cycleCounter >= 40) {
             ++this.displayIndex;
             this.cycleCounter = 0;
             if (this.displayIndex > this.displayItems.size() - 1) {
                 this.displayIndex = 0;
             }
-            axw.setItemSlot(EquipmentSlot.MAINHAND, this.displayItems.get(this.displayIndex));
+            bdp.setItemSlot(EquipmentSlot.MAINHAND, this.displayItems.get(this.displayIndex));
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/SleepInBed.java b/src/net/minecraft/world/entity/ai/behavior/SleepInBed.java
index 1079a9e..9e73142 100644
--- a/src/net/minecraft/world/entity/ai/behavior/SleepInBed.java
+++ b/src/net/minecraft/world/entity/ai/behavior/SleepInBed.java
@@ -10,10 +10,10 @@ import java.util.Optional;
 import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.BedBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.core.Position;
-import net.minecraft.core.SerializableLong;
-import java.util.Objects;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.core.GlobalPos;
@@ -30,38 +30,41 @@ public class SleepInBed extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        if (akz.isPassenger()) {
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        if (aoy.isPassenger()) {
             return false;
         }
-        final Brain<?> alp4 = akz.getBrain();
-        final GlobalPos fr5 = alp4.<GlobalPos>getMemory(MemoryModuleType.HOME).get();
-        if (!Objects.equals(xd.getDimension().getType(), fr5.dimension())) {
+        final Brain<?> apr4 = aoy.getBrain();
+        final GlobalPos gc5 = apr4.<GlobalPos>getMemory(MemoryModuleType.HOME).get();
+        if (zd.dimension() != gc5.dimension()) {
             return false;
         }
-        final Optional<SerializableLong> optional6 = alp4.<SerializableLong>getMemory(MemoryModuleType.LAST_WOKEN);
-        if (optional6.isPresent() && xd.getGameTime() - optional6.get().value() < 100L) {
-            return false;
+        final Optional<Long> optional6 = apr4.<Long>getMemory(MemoryModuleType.LAST_WOKEN);
+        if (optional6.isPresent()) {
+            final long long7 = zd.getGameTime() - optional6.get();
+            if (long7 > 0L && long7 < 100L) {
+                return false;
+            }
         }
-        final BlockState byj7 = xd.getBlockState(fr5.pos());
-        return fr5.pos().closerThan(akz.position(), 2.0) && byj7.getBlock().is(BlockTags.BEDS) && !byj7.<Boolean>getValue((Property<Boolean>)BedBlock.OCCUPIED);
+        final BlockState cfj7 = zd.getBlockState(gc5.pos());
+        return gc5.pos().closerThan(aoy.position(), 2.0) && cfj7.getBlock().is(BlockTags.BEDS) && !cfj7.<Boolean>getValue((Property<Boolean>)BedBlock.OCCUPIED);
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Optional<GlobalPos> optional6 = akz.getBrain().<GlobalPos>getMemory(MemoryModuleType.HOME);
+    protected boolean canStillUse(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Optional<GlobalPos> optional6 = aoy.getBrain().<GlobalPos>getMemory(MemoryModuleType.HOME);
         if (!optional6.isPresent()) {
             return false;
         }
-        final BlockPos fk7 = optional6.get().pos();
-        return akz.getBrain().isActive(Activity.REST) && akz.getY() > fk7.getY() + 0.4 && fk7.closerThan(akz.position(), 1.14);
+        final BlockPos fu7 = optional6.get().pos();
+        return aoy.getBrain().isActive(Activity.REST) && aoy.getY() > fu7.getY() + 0.4 && fu7.closerThan(aoy.position(), 1.14);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
         if (long3 > this.nextOkStartTime) {
-            akz.getBrain().<Set<GlobalPos>>getMemory(MemoryModuleType.OPENED_DOORS).ifPresent(set -> InteractWithDoor.closeAllOpenedDoors(xd, ImmutableList.of(), 0, akz, akz.getBrain()));
-            akz.startSleeping(akz.getBrain().<GlobalPos>getMemory(MemoryModuleType.HOME).get().pos());
+            aoy.getBrain().<Set<GlobalPos>>getMemory(MemoryModuleType.OPENED_DOORS).ifPresent(set -> InteractWithDoor.closeAllOpenedDoors(zd, ImmutableList.of(), 0, aoy, aoy.getBrain()));
+            aoy.startSleeping(aoy.getBrain().<GlobalPos>getMemory(MemoryModuleType.HOME).get().pos());
         }
     }
     
@@ -71,9 +74,9 @@ public class SleepInBed extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected void stop(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        if (akz.isSleeping()) {
-            akz.stopSleeping();
+    protected void stop(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        if (aoy.isSleeping()) {
+            aoy.stopSleeping();
             this.nextOkStartTime = long3 + 40L;
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/behavior/SocializeAtBell.java b/src/net/minecraft/world/entity/ai/behavior/SocializeAtBell.java
index 4af4d4c..773f027 100644
--- a/src/net/minecraft/world/entity/ai/behavior/SocializeAtBell.java
+++ b/src/net/minecraft/world/entity/ai/behavior/SocializeAtBell.java
@@ -6,7 +6,6 @@ import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.world.entity.EntityType;
 import java.util.List;
 import net.minecraft.core.Position;
-import java.util.Objects;
 import net.minecraft.core.GlobalPos;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
@@ -22,23 +21,23 @@ public class SocializeAtBell extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        final Brain<?> alp4 = akz.getBrain();
-        final Optional<GlobalPos> optional5 = alp4.<GlobalPos>getMemory(MemoryModuleType.MEETING_POINT);
-        return xd.getRandom().nextInt(100) == 0 && optional5.isPresent() && Objects.equals(xd.getDimension().getType(), optional5.get().dimension()) && optional5.get().pos().closerThan(akz.position(), 4.0) && alp4.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get().stream().anyMatch(akz -> EntityType.VILLAGER.equals(akz.getType()));
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        final Brain<?> apr4 = aoy.getBrain();
+        final Optional<GlobalPos> optional5 = apr4.<GlobalPos>getMemory(MemoryModuleType.MEETING_POINT);
+        return zd.getRandom().nextInt(100) == 0 && optional5.isPresent() && zd.dimension() == optional5.get().dimension() && optional5.get().pos().closerThan(aoy.position(), 4.0) && apr4.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).get().stream().anyMatch(aoy -> EntityType.VILLAGER.equals(aoy.getType()));
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
         final Brain brain;
         final MemoryModuleType walk_TARGET;
         final Object object;
-        alp6.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).ifPresent(list -> list.stream().filter(akz -> EntityType.VILLAGER.equals(akz.getType())).filter(akz2 -> akz2.distanceToSqr(akz) <= 32.0).findFirst().ifPresent(akz -> {
-            brain.setMemory(MemoryModuleType.INTERACTION_TARGET, akz);
-            brain.setMemory(MemoryModuleType.LOOK_TARGET, new EntityPosWrapper(akz));
+        apr6.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).ifPresent(list -> list.stream().filter(aoy -> EntityType.VILLAGER.equals(aoy.getType())).filter(aoy2 -> aoy2.distanceToSqr(aoy) <= 32.0).findFirst().ifPresent(aoy -> {
+            brain.setMemory(MemoryModuleType.INTERACTION_TARGET, aoy);
+            brain.setMemory(MemoryModuleType.LOOK_TARGET, new EntityTracker(aoy, true));
             walk_TARGET = MemoryModuleType.WALK_TARGET;
-            new WalkTarget(new EntityPosWrapper(akz), 0.3f, 1);
+            new WalkTarget(new EntityTracker(aoy, false), 0.3f, 1);
             brain.setMemory(walk_TARGET, object);
         }));
     }
diff --git a/src/net/minecraft/world/entity/ai/behavior/StartAttacking.java b/src/net/minecraft/world/entity/ai/behavior/StartAttacking.java
new file mode 100644
index 0000000..da81d2f
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/StartAttacking.java
@@ -0,0 +1,46 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.LivingEntity;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.Mob;
+
+public class StartAttacking<E extends Mob> extends Behavior<E> {
+    private final Predicate<E> canAttackPredicate;
+    private final Function<E, Optional<? extends LivingEntity>> targetFinderFunction;
+    
+    public StartAttacking(final Predicate<E> predicate, final Function<E, Optional<? extends LivingEntity>> function) {
+        super(ImmutableMap.<MemoryModuleType<LivingEntity>, MemoryStatus>of(MemoryModuleType.ATTACK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<LivingEntity>)MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryStatus.REGISTERED));
+        this.canAttackPredicate = predicate;
+        this.targetFinderFunction = function;
+    }
+    
+    public StartAttacking(final Function<E, Optional<? extends LivingEntity>> function) {
+        this(aoz -> true, (Function<Mob, Optional<? extends LivingEntity>>)function);
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E aoz) {
+        if (!this.canAttackPredicate.test(aoz)) {
+            return false;
+        }
+        final Optional<? extends LivingEntity> optional4 = this.targetFinderFunction.apply(aoz);
+        return optional4.isPresent() && ((LivingEntity)optional4.get()).isAlive();
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoz, final long long3) {
+        this.targetFinderFunction.apply(aoz).ifPresent(aoy -> this.setAttackTarget(aoz, aoy));
+    }
+    
+    private void setAttackTarget(final E aoz, final LivingEntity aoy) {
+        aoz.getBrain().<LivingEntity>setMemory(MemoryModuleType.ATTACK_TARGET, aoy);
+        aoz.getBrain().<Long>eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/StartCelebratingIfTargetDead.java b/src/net/minecraft/world/entity/ai/behavior/StartCelebratingIfTargetDead.java
new file mode 100644
index 0000000..8e58330
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/StartCelebratingIfTargetDead.java
@@ -0,0 +1,46 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import java.util.UUID;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.function.BiPredicate;
+import net.minecraft.world.entity.LivingEntity;
+
+public class StartCelebratingIfTargetDead extends Behavior<LivingEntity> {
+    private final int celebrateDuration;
+    private final BiPredicate<LivingEntity, LivingEntity> dancePredicate;
+    
+    public StartCelebratingIfTargetDead(final int integer, final BiPredicate<LivingEntity, LivingEntity> biPredicate) {
+        super(ImmutableMap.<MemoryModuleType<LivingEntity>, MemoryStatus>of(MemoryModuleType.ATTACK_TARGET, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<LivingEntity>)MemoryModuleType.ANGRY_AT, MemoryStatus.REGISTERED, (MemoryModuleType<LivingEntity>)MemoryModuleType.CELEBRATE_LOCATION, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<LivingEntity>)MemoryModuleType.DANCING, MemoryStatus.REGISTERED));
+        this.celebrateDuration = integer;
+        this.dancePredicate = biPredicate;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        return this.getAttackTarget(aoy).isDeadOrDying();
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final LivingEntity aoy2 = this.getAttackTarget(aoy);
+        if (this.dancePredicate.test(aoy, aoy2)) {
+            aoy.getBrain().<Boolean>setMemoryWithExpiry(MemoryModuleType.DANCING, true, this.celebrateDuration);
+        }
+        aoy.getBrain().<BlockPos>setMemoryWithExpiry(MemoryModuleType.CELEBRATE_LOCATION, aoy2.blockPosition(), this.celebrateDuration);
+        if (aoy2.getType() != EntityType.PLAYER || zd.getGameRules().getBoolean(GameRules.RULE_FORGIVE_DEAD_PLAYERS)) {
+            aoy.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.ATTACK_TARGET);
+            aoy.getBrain().<UUID>eraseMemory(MemoryModuleType.ANGRY_AT);
+        }
+    }
+    
+    private LivingEntity getAttackTarget(final LivingEntity aoy) {
+        return aoy.getBrain().<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET).get();
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java b/src/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java
new file mode 100644
index 0000000..aff3dbd
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java
@@ -0,0 +1,70 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import java.util.Optional;
+import net.minecraft.world.entity.EntitySelector;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.LivingEntity;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.Mob;
+
+public class StopAttackingIfTargetInvalid<E extends Mob> extends Behavior<E> {
+    private final Predicate<LivingEntity> stopAttackingWhen;
+    
+    public StopAttackingIfTargetInvalid(final Predicate<LivingEntity> predicate) {
+        super(ImmutableMap.<MemoryModuleType<LivingEntity>, MemoryStatus>of(MemoryModuleType.ATTACK_TARGET, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<LivingEntity>)MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryStatus.REGISTERED));
+        this.stopAttackingWhen = predicate;
+    }
+    
+    public StopAttackingIfTargetInvalid() {
+        this(aoy -> false);
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoz, final long long3) {
+        if (StopAttackingIfTargetInvalid.<E>isTiredOfTryingToReachTarget(aoz)) {
+            this.clearAttackTarget(aoz);
+            return;
+        }
+        if (this.isCurrentTargetDeadOrRemoved(aoz)) {
+            this.clearAttackTarget(aoz);
+            return;
+        }
+        if (this.isCurrentTargetInDifferentLevel(aoz)) {
+            this.clearAttackTarget(aoz);
+            return;
+        }
+        if (!EntitySelector.ATTACK_ALLOWED.test(this.getAttackTarget(aoz))) {
+            this.clearAttackTarget(aoz);
+            return;
+        }
+        if (this.stopAttackingWhen.test(this.getAttackTarget(aoz))) {
+            this.clearAttackTarget(aoz);
+        }
+    }
+    
+    private boolean isCurrentTargetInDifferentLevel(final E aoz) {
+        return this.getAttackTarget(aoz).level != aoz.level;
+    }
+    
+    private LivingEntity getAttackTarget(final E aoz) {
+        return aoz.getBrain().<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET).get();
+    }
+    
+    private static <E extends LivingEntity> boolean isTiredOfTryingToReachTarget(final E aoy) {
+        final Optional<Long> optional2 = aoy.getBrain().<Long>getMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
+        return optional2.isPresent() && aoy.level.getGameTime() - optional2.get() > 200L;
+    }
+    
+    private boolean isCurrentTargetDeadOrRemoved(final E aoz) {
+        final Optional<LivingEntity> optional3 = aoz.getBrain().<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET);
+        return optional3.isPresent() && !optional3.get().isAlive();
+    }
+    
+    private void clearAttackTarget(final E aoz) {
+        aoz.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.ATTACK_TARGET);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/StopBeingAngryIfTargetDead.java b/src/net/minecraft/world/entity/ai/behavior/StopBeingAngryIfTargetDead.java
new file mode 100644
index 0000000..ef7a170
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/StopBeingAngryIfTargetDead.java
@@ -0,0 +1,27 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import java.util.UUID;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.Mob;
+
+public class StopBeingAngryIfTargetDead<E extends Mob> extends Behavior<E> {
+    public StopBeingAngryIfTargetDead() {
+        super(ImmutableMap.<MemoryModuleType<UUID>, MemoryStatus>of(MemoryModuleType.ANGRY_AT, MemoryStatus.VALUE_PRESENT));
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E aoz, final long long3) {
+        BehaviorUtils.getLivingEntityFromUUIDMemory(aoz, MemoryModuleType.ANGRY_AT).ifPresent(aoy -> {
+            if (aoy.isDeadOrDying() && (aoy.getType() != EntityType.PLAYER || zd.getGameRules().getBoolean(GameRules.RULE_FORGIVE_DEAD_PLAYERS))) {
+                aoz.getBrain().<UUID>eraseMemory(MemoryModuleType.ANGRY_AT);
+            }
+        });
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/StrollAroundPoi.java b/src/net/minecraft/world/entity/ai/behavior/StrollAroundPoi.java
index 63bdb0b..dbfdab9 100644
--- a/src/net/minecraft/world/entity/ai/behavior/StrollAroundPoi.java
+++ b/src/net/minecraft/world/entity/ai/behavior/StrollAroundPoi.java
@@ -5,7 +5,6 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.ai.util.RandomPos;
 import java.util.Optional;
 import net.minecraft.core.Position;
-import java.util.Objects;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
@@ -20,23 +19,23 @@ public class StrollAroundPoi extends Behavior<PathfinderMob> {
     private long nextOkStartTime;
     private final int maxDistanceFromPoi;
     
-    public StrollAroundPoi(final MemoryModuleType<GlobalPos> arl, final int integer) {
-        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)arl, MemoryStatus.VALUE_PRESENT));
-        this.memoryType = arl;
+    public StrollAroundPoi(final MemoryModuleType<GlobalPos> awp, final int integer) {
+        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)awp, MemoryStatus.VALUE_PRESENT));
+        this.memoryType = awp;
         this.maxDistanceFromPoi = integer;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final PathfinderMob alg) {
-        final Optional<GlobalPos> optional4 = alg.getBrain().<GlobalPos>getMemory(this.memoryType);
-        return optional4.isPresent() && Objects.equals(xd.getDimension().getType(), optional4.get().dimension()) && optional4.get().pos().closerThan(alg.position(), this.maxDistanceFromPoi);
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final PathfinderMob apg) {
+        final Optional<GlobalPos> optional4 = apg.getBrain().<GlobalPos>getMemory(this.memoryType);
+        return optional4.isPresent() && zd.dimension() == optional4.get().dimension() && optional4.get().pos().closerThan(apg.position(), this.maxDistanceFromPoi);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final PathfinderMob alg, final long long3) {
+    protected void start(final ServerLevel zd, final PathfinderMob apg, final long long3) {
         if (long3 > this.nextOkStartTime) {
-            final Optional<Vec3> optional6 = Optional.<Vec3>ofNullable(RandomPos.getLandPos(alg, 8, 6));
-            alg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, optional6.<WalkTarget>map(cvl -> new WalkTarget(cvl, 0.4f, 1)));
+            final Optional<Vec3> optional6 = Optional.<Vec3>ofNullable(RandomPos.getLandPos(apg, 8, 6));
+            apg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, optional6.map(dem -> new WalkTarget(dem, 0.4f, 1)));
             this.nextOkStartTime = long3 + 180L;
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/behavior/StrollToPoi.java b/src/net/minecraft/world/entity/ai/behavior/StrollToPoi.java
index 8600aa7..3903395 100644
--- a/src/net/minecraft/world/entity/ai/behavior/StrollToPoi.java
+++ b/src/net/minecraft/world/entity/ai/behavior/StrollToPoi.java
@@ -4,7 +4,6 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.Brain;
 import java.util.Optional;
 import net.minecraft.core.Position;
-import java.util.Objects;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
@@ -20,25 +19,25 @@ public class StrollToPoi extends Behavior<PathfinderMob> {
     private final int maxDistanceFromPoi;
     private long nextOkStartTime;
     
-    public StrollToPoi(final MemoryModuleType<GlobalPos> arl, final int integer2, final int integer3) {
-        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)arl, MemoryStatus.VALUE_PRESENT));
-        this.memoryType = arl;
+    public StrollToPoi(final MemoryModuleType<GlobalPos> awp, final int integer2, final int integer3) {
+        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)awp, MemoryStatus.VALUE_PRESENT));
+        this.memoryType = awp;
         this.closeEnoughDist = integer2;
         this.maxDistanceFromPoi = integer3;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final PathfinderMob alg) {
-        final Optional<GlobalPos> optional4 = alg.getBrain().<GlobalPos>getMemory(this.memoryType);
-        return optional4.isPresent() && Objects.equals(xd.getDimension().getType(), optional4.get().dimension()) && optional4.get().pos().closerThan(alg.position(), this.maxDistanceFromPoi);
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final PathfinderMob apg) {
+        final Optional<GlobalPos> optional4 = apg.getBrain().<GlobalPos>getMemory(this.memoryType);
+        return optional4.isPresent() && zd.dimension() == optional4.get().dimension() && optional4.get().pos().closerThan(apg.position(), this.maxDistanceFromPoi);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final PathfinderMob alg, final long long3) {
+    protected void start(final ServerLevel zd, final PathfinderMob apg, final long long3) {
         if (long3 > this.nextOkStartTime) {
-            final Brain<?> alp6 = alg.getBrain();
-            final Optional<GlobalPos> optional7 = alp6.<GlobalPos>getMemory(this.memoryType);
-            optional7.ifPresent(fr -> alp6.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(fr.pos(), 0.4f, this.closeEnoughDist)));
+            final Brain<?> apr6 = apg.getBrain();
+            final Optional<GlobalPos> optional7 = apr6.<GlobalPos>getMemory(this.memoryType);
+            optional7.ifPresent(gc -> apr6.<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(gc.pos(), 0.4f, this.closeEnoughDist)));
             this.nextOkStartTime = long3 + 80L;
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/behavior/StrollToPoiList.java b/src/net/minecraft/world/entity/ai/behavior/StrollToPoiList.java
index c0891e1..ad7db13 100644
--- a/src/net/minecraft/world/entity/ai/behavior/StrollToPoiList.java
+++ b/src/net/minecraft/world/entity/ai/behavior/StrollToPoiList.java
@@ -3,7 +3,6 @@ package net.minecraft.world.entity.ai.behavior;
 import net.minecraft.world.entity.LivingEntity;
 import java.util.Optional;
 import net.minecraft.core.Position;
-import java.util.Objects;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
@@ -18,40 +17,40 @@ import net.minecraft.world.entity.npc.Villager;
 public class StrollToPoiList extends Behavior<Villager> {
     private final MemoryModuleType<List<GlobalPos>> strollToMemoryType;
     private final MemoryModuleType<GlobalPos> mustBeCloseToMemoryType;
-    private final float speed;
+    private final float speedModifier;
     private final int closeEnoughDist;
     private final int maxDistanceFromPoi;
     private long nextOkStartTime;
     @Nullable
     private GlobalPos targetPos;
     
-    public StrollToPoiList(final MemoryModuleType<List<GlobalPos>> arl1, final float float2, final int integer3, final int integer4, final MemoryModuleType<GlobalPos> arl5) {
-        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)arl1, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<WalkTarget>)arl5, MemoryStatus.VALUE_PRESENT));
-        this.strollToMemoryType = arl1;
-        this.speed = float2;
+    public StrollToPoiList(final MemoryModuleType<List<GlobalPos>> awp1, final float float2, final int integer3, final int integer4, final MemoryModuleType<GlobalPos> awp5) {
+        super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED, (MemoryModuleType<WalkTarget>)awp1, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<WalkTarget>)awp5, MemoryStatus.VALUE_PRESENT));
+        this.strollToMemoryType = awp1;
+        this.speedModifier = float2;
         this.closeEnoughDist = integer3;
         this.maxDistanceFromPoi = integer4;
-        this.mustBeCloseToMemoryType = arl5;
+        this.mustBeCloseToMemoryType = awp5;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        final Optional<List<GlobalPos>> optional4 = axw.getBrain().<List<GlobalPos>>getMemory(this.strollToMemoryType);
-        final Optional<GlobalPos> optional5 = axw.getBrain().<GlobalPos>getMemory(this.mustBeCloseToMemoryType);
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        final Optional<List<GlobalPos>> optional4 = bdp.getBrain().<List<GlobalPos>>getMemory(this.strollToMemoryType);
+        final Optional<GlobalPos> optional5 = bdp.getBrain().<GlobalPos>getMemory(this.mustBeCloseToMemoryType);
         if (optional4.isPresent() && optional5.isPresent()) {
             final List<GlobalPos> list6 = optional4.get();
             if (!list6.isEmpty()) {
-                this.targetPos = list6.get(xd.getRandom().nextInt(list6.size()));
-                return this.targetPos != null && Objects.equals(xd.getDimension().getType(), this.targetPos.dimension()) && optional5.get().pos().closerThan(axw.position(), this.maxDistanceFromPoi);
+                this.targetPos = list6.get(zd.getRandom().nextInt(list6.size()));
+                return this.targetPos != null && zd.dimension() == this.targetPos.dimension() && optional5.get().pos().closerThan(bdp.position(), this.maxDistanceFromPoi);
             }
         }
         return false;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
         if (long3 > this.nextOkStartTime && this.targetPos != null) {
-            axw.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(this.targetPos.pos(), this.speed, this.closeEnoughDist));
+            bdp.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(this.targetPos.pos(), this.speedModifier, this.closeEnoughDist));
             this.nextOkStartTime = long3 + 100L;
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/behavior/Swim.java b/src/net/minecraft/world/entity/ai/behavior/Swim.java
index 3243acc..bb5e3c3 100644
--- a/src/net/minecraft/world/entity/ai/behavior/Swim.java
+++ b/src/net/minecraft/world/entity/ai/behavior/Swim.java
@@ -1,35 +1,36 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.FluidTags;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.world.entity.Mob;
 
 public class Swim extends Behavior<Mob> {
-    private final float height;
     private final float chance;
     
-    public Swim(final float float1, final float float2) {
+    public Swim(final float float1) {
         super(ImmutableMap.of());
-        this.height = float1;
-        this.chance = float2;
+        this.chance = float1;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Mob ala) {
-        return (ala.isInWater() && ala.getWaterHeight() > this.height) || ala.isInLava();
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Mob aoz) {
+        return (aoz.isInWater() && aoz.getFluidHeight(FluidTags.WATER) > aoz.getFluidJumpThreshold()) || aoz.isInLava();
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final Mob ala, final long long3) {
-        return this.checkExtraStartConditions(xd, ala);
+    protected boolean canStillUse(final ServerLevel zd, final Mob aoz, final long long3) {
+        return this.checkExtraStartConditions(zd, aoz);
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Mob ala, final long long3) {
-        if (ala.getRandom().nextFloat() < this.chance) {
-            ala.getJumpControl().jump();
+    protected void tick(final ServerLevel zd, final Mob aoz, final long long3) {
+        if (aoz.getRandom().nextFloat() < this.chance) {
+            aoz.getJumpControl().jump();
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java b/src/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
index ce0f125..7384929 100644
--- a/src/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
+++ b/src/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
@@ -5,6 +5,7 @@ import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.ItemStack;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.Brain;
@@ -29,75 +30,78 @@ public class TradeWithVillager extends Behavior<Villager> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        return BehaviorUtils.targetIsValid(axw.getBrain(), MemoryModuleType.INTERACTION_TARGET, EntityType.VILLAGER);
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        return BehaviorUtils.targetIsValid(bdp.getBrain(), MemoryModuleType.INTERACTION_TARGET, EntityType.VILLAGER);
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final Villager axw, final long long3) {
-        return this.checkExtraStartConditions(xd, axw);
+    protected boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
+        return this.checkExtraStartConditions(zd, bdp);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        final Villager axw2 = axw.getBrain().<Villager>getMemory((MemoryModuleType<Villager>)MemoryModuleType.INTERACTION_TARGET).get();
-        BehaviorUtils.lockGazeAndWalkToEachOther(axw, axw2);
-        this.trades = figureOutWhatIAmWillingToTrade(axw, axw2);
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        final Villager bdp2 = bdp.getBrain().<Villager>getMemory((MemoryModuleType<Villager>)MemoryModuleType.INTERACTION_TARGET).get();
+        BehaviorUtils.lockGazeAndWalkToEachOther(bdp, bdp2, 0.5f);
+        this.trades = figureOutWhatIAmWillingToTrade(bdp, bdp2);
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Villager axw, final long long3) {
-        final Villager axw2 = axw.getBrain().<Villager>getMemory((MemoryModuleType<Villager>)MemoryModuleType.INTERACTION_TARGET).get();
-        if (axw.distanceToSqr(axw2) > 5.0) {
+    protected void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        final Villager bdp2 = bdp.getBrain().<Villager>getMemory((MemoryModuleType<Villager>)MemoryModuleType.INTERACTION_TARGET).get();
+        if (bdp.distanceToSqr(bdp2) > 5.0) {
             return;
         }
-        BehaviorUtils.lockGazeAndWalkToEachOther(axw, axw2);
-        axw.gossip(axw2, long3);
-        if (axw.hasExcessFood() && (axw.getVillagerData().getProfession() == VillagerProfession.FARMER || axw2.wantsMoreFood())) {
-            throwHalfStack(axw, Villager.FOOD_POINTS.keySet(), axw2);
+        BehaviorUtils.lockGazeAndWalkToEachOther(bdp, bdp2, 0.5f);
+        bdp.gossip(bdp2, long3);
+        if (bdp.hasExcessFood() && (bdp.getVillagerData().getProfession() == VillagerProfession.FARMER || bdp2.wantsMoreFood())) {
+            throwHalfStack(bdp, Villager.FOOD_POINTS.keySet(), bdp2);
         }
-        if (!this.trades.isEmpty() && axw.getInventory().hasAnyOf(this.trades)) {
-            throwHalfStack(axw, this.trades, axw2);
+        if (bdp2.getVillagerData().getProfession() == VillagerProfession.FARMER && bdp.getInventory().countItem(Items.WHEAT) > Items.WHEAT.getMaxStackSize() / 2) {
+            throwHalfStack(bdp, ImmutableSet.<Item>of(Items.WHEAT), bdp2);
+        }
+        if (!this.trades.isEmpty() && bdp.getInventory().hasAnyOf(this.trades)) {
+            throwHalfStack(bdp, this.trades, bdp2);
         }
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Villager axw, final long long3) {
-        axw.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.INTERACTION_TARGET);
+    protected void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        bdp.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.INTERACTION_TARGET);
     }
     
-    private static Set<Item> figureOutWhatIAmWillingToTrade(final Villager axw1, final Villager axw2) {
-        final ImmutableSet<Item> immutableSet3 = axw2.getVillagerData().getProfession().getRequestedItems();
-        final ImmutableSet<Item> immutableSet4 = axw1.getVillagerData().getProfession().getRequestedItems();
-        return immutableSet3.stream().filter(bei -> !immutableSet4.contains(bei)).collect(Collectors.toSet());
+    private static Set<Item> figureOutWhatIAmWillingToTrade(final Villager bdp1, final Villager bdp2) {
+        final ImmutableSet<Item> immutableSet3 = bdp2.getVillagerData().getProfession().getRequestedItems();
+        final ImmutableSet<Item> immutableSet4 = bdp1.getVillagerData().getProfession().getRequestedItems();
+        return immutableSet3.stream().filter(bke -> !immutableSet4.contains(bke)).collect(Collectors.toSet());
     }
     
-    private static void throwHalfStack(final Villager axw, final Set<Item> set, final LivingEntity akz) {
-        final SimpleContainer ajq4 = axw.getInventory();
-        ItemStack ben5 = ItemStack.EMPTY;
-        for (int integer6 = 0; integer6 < ajq4.getContainerSize(); ++integer6) {
-            final ItemStack ben6 = ajq4.getItem(integer6);
-            if (!ben6.isEmpty()) {
-                final Item bei8 = ben6.getItem();
-                if (set.contains(bei8)) {
+    private static void throwHalfStack(final Villager bdp, final Set<Item> set, final LivingEntity aoy) {
+        final SimpleContainer anm4 = bdp.getInventory();
+        ItemStack bki5 = ItemStack.EMPTY;
+        for (int integer6 = 0; integer6 < anm4.getContainerSize(); ++integer6) {
+            final ItemStack bki6 = anm4.getItem(integer6);
+            if (!bki6.isEmpty()) {
+                final Item bke8 = bki6.getItem();
+                if (set.contains(bke8)) {
                     int integer7;
-                    if (ben6.getCount() > ben6.getMaxStackSize() / 2) {
-                        integer7 = ben6.getCount() / 2;
+                    if (bki6.getCount() > bki6.getMaxStackSize() / 2) {
+                        integer7 = bki6.getCount() / 2;
                     }
                     else {
-                        if (ben6.getCount() <= 24) {
+                        if (bki6.getCount() <= 24) {
                             continue;
                         }
-                        integer7 = ben6.getCount() - 24;
+                        integer7 = bki6.getCount() - 24;
                     }
-                    ben6.shrink(integer7);
-                    ben5 = new ItemStack(bei8, integer7);
+                    bki6.shrink(integer7);
+                    bki5 = new ItemStack(bke8, integer7);
                     break;
                 }
             }
         }
-        if (!ben5.isEmpty()) {
-            BehaviorUtils.throwItem(axw, ben5, akz);
+        if (!bki5.isEmpty()) {
+            BehaviorUtils.throwItem(bdp, bki5, aoy.position());
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/UpdateActivityFromSchedule.java b/src/net/minecraft/world/entity/ai/behavior/UpdateActivityFromSchedule.java
index 6f15154..0572efa 100644
--- a/src/net/minecraft/world/entity/ai/behavior/UpdateActivityFromSchedule.java
+++ b/src/net/minecraft/world/entity/ai/behavior/UpdateActivityFromSchedule.java
@@ -11,7 +11,7 @@ public class UpdateActivityFromSchedule extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        akz.getBrain().updateActivity(xd.getDayTime(), xd.getGameTime());
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        aoy.getBrain().updateActivityFromSchedule(zd.getDayTime(), zd.getGameTime());
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/UseBonemeal.java b/src/net/minecraft/world/entity/ai/behavior/UseBonemeal.java
new file mode 100644
index 0000000..89d8c79
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/UseBonemeal.java
@@ -0,0 +1,123 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.item.BoneMealItem;
+import net.minecraft.core.Position;
+import net.minecraft.world.entity.ai.memory.WalkTarget;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.CropBlock;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.item.Items;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.core.BlockPos;
+import java.util.Optional;
+import net.minecraft.world.entity.npc.Villager;
+
+public class UseBonemeal extends Behavior<Villager> {
+    private long nextWorkCycleTime;
+    private long lastBonemealingSession;
+    private int timeWorkedSoFar;
+    private Optional<BlockPos> cropPos;
+    
+    public UseBonemeal() {
+        super(ImmutableMap.<MemoryModuleType<PositionTracker>, MemoryStatus>of(MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<PositionTracker>)MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT));
+        this.cropPos = Optional.<BlockPos>empty();
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        if (bdp.tickCount % 10 != 0 || (this.lastBonemealingSession != 0L && this.lastBonemealingSession + 160L > bdp.tickCount)) {
+            return false;
+        }
+        if (bdp.getInventory().countItem(Items.BONE_MEAL) <= 0) {
+            return false;
+        }
+        this.cropPos = this.pickNextTarget(zd, bdp);
+        return this.cropPos.isPresent();
+    }
+    
+    @Override
+    protected boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
+        return this.timeWorkedSoFar < 80 && this.cropPos.isPresent();
+    }
+    
+    private Optional<BlockPos> pickNextTarget(final ServerLevel zd, final Villager bdp) {
+        final BlockPos.MutableBlockPos a4 = new BlockPos.MutableBlockPos();
+        Optional<BlockPos> optional5 = Optional.<BlockPos>empty();
+        int integer6 = 0;
+        for (int integer7 = -1; integer7 <= 1; ++integer7) {
+            for (int integer8 = -1; integer8 <= 1; ++integer8) {
+                for (int integer9 = -1; integer9 <= 1; ++integer9) {
+                    a4.setWithOffset(bdp.blockPosition(), integer7, integer8, integer9);
+                    if (this.validPos(a4, zd) && zd.random.nextInt(++integer6) == 0) {
+                        optional5 = Optional.<BlockPos>of(a4.immutable());
+                    }
+                }
+            }
+        }
+        return optional5;
+    }
+    
+    private boolean validPos(final BlockPos fu, final ServerLevel zd) {
+        final BlockState cfj4 = zd.getBlockState(fu);
+        final Block bvr5 = cfj4.getBlock();
+        return bvr5 instanceof CropBlock && !((CropBlock)bvr5).isMaxAge(cfj4);
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        this.setCurrentCropAsTarget(bdp);
+        bdp.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.BONE_MEAL));
+        this.nextWorkCycleTime = long3;
+        this.timeWorkedSoFar = 0;
+    }
+    
+    private void setCurrentCropAsTarget(final Villager bdp) {
+        final BlockPosTracker aqj3;
+        this.cropPos.ifPresent(fu -> {
+            aqj3 = new BlockPosTracker(fu);
+            bdp.getBrain().<PositionTracker>setMemory(MemoryModuleType.LOOK_TARGET, aqj3);
+            bdp.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(aqj3, 0.5f, 1));
+        });
+    }
+    
+    @Override
+    protected void stop(final ServerLevel zd, final Villager bdp, final long long3) {
+        bdp.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
+        this.lastBonemealingSession = bdp.tickCount;
+    }
+    
+    @Override
+    protected void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        final BlockPos fu6 = this.cropPos.get();
+        if (long3 < this.nextWorkCycleTime || !fu6.closerThan(bdp.position(), 1.0)) {
+            return;
+        }
+        ItemStack bki7 = ItemStack.EMPTY;
+        final SimpleContainer anm8 = bdp.getInventory();
+        for (int integer9 = anm8.getContainerSize(), integer10 = 0; integer10 < integer9; ++integer10) {
+            final ItemStack bki8 = anm8.getItem(integer10);
+            if (bki8.getItem() == Items.BONE_MEAL) {
+                bki7 = bki8;
+                break;
+            }
+        }
+        if (!bki7.isEmpty() && BoneMealItem.growCrop(bki7, zd, fu6)) {
+            zd.levelEvent(2005, fu6, 0);
+            this.cropPos = this.pickNextTarget(zd, bdp);
+            this.setCurrentCropAsTarget(bdp);
+            this.nextWorkCycleTime = long3 + 40L;
+        }
+        ++this.timeWorkedSoFar;
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/ValidateNearbyPoi.java b/src/net/minecraft/world/entity/ai/behavior/ValidateNearbyPoi.java
index 3fc6083..d8d630a 100644
--- a/src/net/minecraft/world/entity/ai/behavior/ValidateNearbyPoi.java
+++ b/src/net/minecraft/world/entity/ai/behavior/ValidateNearbyPoi.java
@@ -3,12 +3,13 @@ package net.minecraft.world.entity.ai.behavior;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.BedBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.network.protocol.game.DebugPackets;
 import net.minecraft.core.Position;
-import java.util.Objects;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import com.google.common.collect.ImmutableMap;
@@ -23,40 +24,40 @@ public class ValidateNearbyPoi extends Behavior<LivingEntity> {
     private final MemoryModuleType<GlobalPos> memoryType;
     private final Predicate<PoiType> poiPredicate;
     
-    public ValidateNearbyPoi(final PoiType asu, final MemoryModuleType<GlobalPos> arl) {
-        super(ImmutableMap.<MemoryModuleType<GlobalPos>, MemoryStatus>of(arl, MemoryStatus.VALUE_PRESENT));
-        this.poiPredicate = asu.getPredicate();
-        this.memoryType = arl;
+    public ValidateNearbyPoi(final PoiType ayc, final MemoryModuleType<GlobalPos> awp) {
+        super(ImmutableMap.<MemoryModuleType<GlobalPos>, MemoryStatus>of(awp, MemoryStatus.VALUE_PRESENT));
+        this.poiPredicate = ayc.getPredicate();
+        this.memoryType = awp;
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        final GlobalPos fr4 = akz.getBrain().<GlobalPos>getMemory(this.memoryType).get();
-        return Objects.equals(xd.getDimension().getType(), fr4.dimension()) && fr4.pos().closerThan(akz.position(), 5.0);
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        final GlobalPos gc4 = aoy.getBrain().<GlobalPos>getMemory(this.memoryType).get();
+        return zd.dimension() == gc4.dimension() && gc4.pos().closerThan(aoy.position(), 16.0);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        final Brain<?> alp6 = akz.getBrain();
-        final GlobalPos fr7 = alp6.<GlobalPos>getMemory(this.memoryType).get();
-        final BlockPos fk8 = fr7.pos();
-        final ServerLevel xd2 = xd.getServer().getLevel(fr7.dimension());
-        if (this.poiDoesntExist(xd2, fk8)) {
-            alp6.<GlobalPos>eraseMemory(this.memoryType);
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        final Brain<?> apr6 = aoy.getBrain();
+        final GlobalPos gc7 = apr6.<GlobalPos>getMemory(this.memoryType).get();
+        final BlockPos fu8 = gc7.pos();
+        final ServerLevel zd2 = zd.getServer().getLevel(gc7.dimension());
+        if (zd2 == null || this.poiDoesntExist(zd2, fu8)) {
+            apr6.<GlobalPos>eraseMemory(this.memoryType);
         }
-        else if (this.bedIsOccupied(xd2, fk8, akz)) {
-            alp6.<GlobalPos>eraseMemory(this.memoryType);
-            xd.getPoiManager().release(fk8);
-            DebugPackets.sendPoiTicketCountPacket(xd, fk8);
+        else if (this.bedIsOccupied(zd2, fu8, aoy)) {
+            apr6.<GlobalPos>eraseMemory(this.memoryType);
+            zd.getPoiManager().release(fu8);
+            DebugPackets.sendPoiTicketCountPacket(zd, fu8);
         }
     }
     
-    private boolean bedIsOccupied(final ServerLevel xd, final BlockPos fk, final LivingEntity akz) {
-        final BlockState byj5 = xd.getBlockState(fk);
-        return byj5.getBlock().is(BlockTags.BEDS) && byj5.<Boolean>getValue((Property<Boolean>)BedBlock.OCCUPIED) && !akz.isSleeping();
+    private boolean bedIsOccupied(final ServerLevel zd, final BlockPos fu, final LivingEntity aoy) {
+        final BlockState cfj5 = zd.getBlockState(fu);
+        return cfj5.getBlock().is(BlockTags.BEDS) && cfj5.<Boolean>getValue((Property<Boolean>)BedBlock.OCCUPIED) && !aoy.isSleeping();
     }
     
-    private boolean poiDoesntExist(final ServerLevel xd, final BlockPos fk) {
-        return !xd.getPoiManager().exists(fk, this.poiPredicate);
+    private boolean poiDoesntExist(final ServerLevel zd, final BlockPos fu) {
+        return !zd.getPoiManager().exists(fu, this.poiPredicate);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/VictoryStroll.java b/src/net/minecraft/world/entity/ai/behavior/VictoryStroll.java
index f160498..19c0c89 100644
--- a/src/net/minecraft/world/entity/ai/behavior/VictoryStroll.java
+++ b/src/net/minecraft/world/entity/ai/behavior/VictoryStroll.java
@@ -2,8 +2,6 @@ package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.raid.Raid;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.server.level.ServerLevel;
 
@@ -13,8 +11,8 @@ public class VictoryStroll extends VillageBoundRandomStroll {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final PathfinderMob alg) {
-        final Raid azn4 = xd.getRaidAt(new BlockPos(alg));
-        return azn4 != null && azn4.isVictory() && super.checkExtraStartConditions(xd, alg);
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final PathfinderMob apg) {
+        final Raid bfh4 = zd.getRaidAt(apg.blockPosition());
+        return bfh4 != null && bfh4.isVictory() && super.checkExtraStartConditions(zd, apg);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/VillageBoundRandomStroll.java b/src/net/minecraft/world/entity/ai/behavior/VillageBoundRandomStroll.java
index 171719d..ce1c7cc 100644
--- a/src/net/minecraft/world/entity/ai/behavior/VillageBoundRandomStroll.java
+++ b/src/net/minecraft/world/entity/ai/behavior/VillageBoundRandomStroll.java
@@ -5,9 +5,8 @@ import java.util.Optional;
 import net.minecraft.world.entity.ai.util.RandomPos;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.core.SectionPos;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
@@ -17,7 +16,7 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.PathfinderMob;
 
 public class VillageBoundRandomStroll extends Behavior<PathfinderMob> {
-    private final float speed;
+    private final float speedModifier;
     private final int maxXyDist;
     private final int maxYDist;
     
@@ -27,36 +26,36 @@ public class VillageBoundRandomStroll extends Behavior<PathfinderMob> {
     
     public VillageBoundRandomStroll(final float float1, final int integer2, final int integer3) {
         super(ImmutableMap.<MemoryModuleType<WalkTarget>, MemoryStatus>of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT));
-        this.speed = float1;
+        this.speedModifier = float1;
         this.maxXyDist = integer2;
         this.maxYDist = integer3;
     }
     
     @Override
-    protected void start(final ServerLevel xd, final PathfinderMob alg, final long long3) {
-        final BlockPos fk6 = new BlockPos(alg);
-        if (xd.isVillage(fk6)) {
-            this.setRandomPos(alg);
+    protected void start(final ServerLevel zd, final PathfinderMob apg, final long long3) {
+        final BlockPos fu6 = apg.blockPosition();
+        if (zd.isVillage(fu6)) {
+            this.setRandomPos(apg);
         }
         else {
-            final SectionPos gd7 = SectionPos.of(fk6);
-            final SectionPos gd8 = BehaviorUtils.findSectionClosestToVillage(xd, gd7, 2);
-            if (gd8 != gd7) {
-                this.setTargetedPos(alg, gd8);
+            final SectionPos go7 = SectionPos.of(fu6);
+            final SectionPos go8 = BehaviorUtils.findSectionClosestToVillage(zd, go7, 2);
+            if (go8 != go7) {
+                this.setTargetedPos(apg, go8);
             }
             else {
-                this.setRandomPos(alg);
+                this.setRandomPos(apg);
             }
         }
     }
     
-    private void setTargetedPos(final PathfinderMob alg, final SectionPos gd) {
-        final Optional<Vec3> optional4 = Optional.<Vec3>ofNullable(RandomPos.getPosTowards(alg, this.maxXyDist, this.maxYDist, new Vec3(gd.center())));
-        alg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, optional4.<WalkTarget>map(cvl -> new WalkTarget(cvl, this.speed, 0)));
+    private void setTargetedPos(final PathfinderMob apg, final SectionPos go) {
+        final Optional<Vec3> optional4 = Optional.<Vec3>ofNullable(RandomPos.getPosTowards(apg, this.maxXyDist, this.maxYDist, Vec3.atBottomCenterOf(go.center())));
+        apg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, optional4.map(dem -> new WalkTarget(dem, this.speedModifier, 0)));
     }
     
-    private void setRandomPos(final PathfinderMob alg) {
-        final Optional<Vec3> optional3 = Optional.<Vec3>ofNullable(RandomPos.getLandPos(alg, this.maxXyDist, this.maxYDist));
-        alg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, optional3.<WalkTarget>map(cvl -> new WalkTarget(cvl, this.speed, 0)));
+    private void setRandomPos(final PathfinderMob apg) {
+        final Optional<Vec3> optional3 = Optional.<Vec3>ofNullable(RandomPos.getLandPos(apg, this.maxXyDist, this.maxYDist));
+        apg.getBrain().<WalkTarget>setMemory(MemoryModuleType.WALK_TARGET, optional3.map(dem -> new WalkTarget(dem, this.speedModifier, 0)));
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/VillagerCalmDown.java b/src/net/minecraft/world/entity/ai/behavior/VillagerCalmDown.java
index bf82db9..93e6974 100644
--- a/src/net/minecraft/world/entity/ai/behavior/VillagerCalmDown.java
+++ b/src/net/minecraft/world/entity/ai/behavior/VillagerCalmDown.java
@@ -15,16 +15,16 @@ public class VillagerCalmDown extends Behavior<Villager> {
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        final boolean boolean6 = VillagerPanicTrigger.isHurt(axw) || VillagerPanicTrigger.hasHostile(axw) || isCloseToEntityThatHurtMe(axw);
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        final boolean boolean6 = VillagerPanicTrigger.isHurt(bdp) || VillagerPanicTrigger.hasHostile(bdp) || isCloseToEntityThatHurtMe(bdp);
         if (!boolean6) {
-            axw.getBrain().<DamageSource>eraseMemory(MemoryModuleType.HURT_BY);
-            axw.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.HURT_BY_ENTITY);
-            axw.getBrain().updateActivity(xd.getDayTime(), xd.getGameTime());
+            bdp.getBrain().<DamageSource>eraseMemory(MemoryModuleType.HURT_BY);
+            bdp.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.HURT_BY_ENTITY);
+            bdp.getBrain().updateActivityFromSchedule(zd.getDayTime(), zd.getGameTime());
         }
     }
     
-    private static boolean isCloseToEntityThatHurtMe(final Villager axw) {
-        return axw.getBrain().<LivingEntity>getMemory(MemoryModuleType.HURT_BY_ENTITY).filter(akz -> akz.distanceToSqr(axw) <= 36.0).isPresent();
+    private static boolean isCloseToEntityThatHurtMe(final Villager bdp) {
+        return bdp.getBrain().<LivingEntity>getMemory(MemoryModuleType.HURT_BY_ENTITY).filter(aoy -> aoy.distanceToSqr(bdp) <= 36.0).isPresent();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java b/src/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
index 3469178..052f240 100644
--- a/src/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
+++ b/src/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
@@ -2,6 +2,7 @@ package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.AgableMob;
 import java.util.Set;
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.core.GlobalPos;
@@ -19,50 +20,57 @@ import com.google.common.collect.ImmutableList;
 import net.minecraft.world.entity.npc.VillagerProfession;
 
 public class VillagerGoalPackages {
-    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getCorePackage(final VillagerProfession axz, final float float2) {
-        return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(0, new Swim(0.4f, 0.8f)), Pair.of(0, new InteractWithDoor()), Pair.of(0, new LookAtTargetSink(45, 90)), Pair.of(0, new VillagerPanicTrigger()), Pair.of(0, new WakeUp()), Pair.of(0, new ReactToBell()), Pair.of(0, new SetRaidStatus()), Pair.of(1, new MoveToTargetSink(200)), Pair.of(2, new LookAndFollowTradingPlayerSink(float2)), Pair.of(5, new PickUpItems()), Pair.of(10, new AcquirePoi(axz.getJobPoiType(), MemoryModuleType.JOB_SITE, true)), Pair.of(10, new AcquirePoi(PoiType.HOME, MemoryModuleType.HOME, false)), Pair.of(10, new AcquirePoi(PoiType.MEETING, MemoryModuleType.MEETING_POINT, true)), Pair.of(10, new AssignProfessionFromJobSite()), Pair.of(10, new ResetProfession()));
+    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getCorePackage(final VillagerProfession bds, final float float2) {
+        return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(0, new Swim(0.8f)), Pair.of(0, new InteractWithDoor()), Pair.of(0, new LookAtTargetSink(45, 90)), Pair.of(0, new VillagerPanicTrigger()), Pair.of(0, new WakeUp()), Pair.of(0, new ReactToBell()), Pair.of(0, new SetRaidStatus()), Pair.of(0, new ValidateNearbyPoi(bds.getJobPoiType(), MemoryModuleType.JOB_SITE)), Pair.of(0, new ValidateNearbyPoi(bds.getJobPoiType(), MemoryModuleType.POTENTIAL_JOB_SITE)), Pair.of(1, new MoveToTargetSink(200)), Pair.of(2, new PoiCompetitorScan(bds)), Pair.of(3, new LookAndFollowTradingPlayerSink(float2)), Pair.of(5, new GoToWantedItem(float2, false, 4)), Pair.of(6, new AcquirePoi(bds.getJobPoiType(), MemoryModuleType.JOB_SITE, MemoryModuleType.POTENTIAL_JOB_SITE, true)), Pair.of(7, new GoToPotentialJobSite(float2)), Pair.of(8, new YieldJobSite(float2)), Pair.of(10, new AcquirePoi(PoiType.HOME, MemoryModuleType.HOME, false)), Pair.of(10, new AcquirePoi(PoiType.MEETING, MemoryModuleType.MEETING_POINT, true)), Pair.of(10, new AssignProfessionFromJobSite()), Pair.of(10, new ResetProfession()));
     }
     
-    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getWorkPackage(final VillagerProfession axz, final float float2) {
-        return ImmutableList.of(getMinimalLookBehavior(), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(5, new RunOne(ImmutableList.of(Pair.of((Object)new WorkAtPoi(), (Object)7), Pair.of((Object)new StrollAroundPoi(MemoryModuleType.JOB_SITE, 4), (Object)2), Pair.of((Object)new StrollToPoi(MemoryModuleType.JOB_SITE, 1, 10), (Object)5), Pair.of((Object)new StrollToPoiList(MemoryModuleType.SECONDARY_JOB_SITE, 0.4f, 1, 6, MemoryModuleType.JOB_SITE), (Object)5), Pair.of((Object)new HarvestFarmland(), (Object)((axz == VillagerProfession.FARMER) ? 2 : 5))))), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(10, new ShowTradesToPlayer(400, 1600)), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(10, new SetLookAndInteract(EntityType.PLAYER, 4)), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(2, new SetWalkTargetFromBlockMemory(MemoryModuleType.JOB_SITE, float2, 9, 100, 1200)), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(3, new GiveGiftToHero(100)), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(3, new ValidateNearbyPoi(axz.getJobPoiType(), MemoryModuleType.JOB_SITE)), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(99, new UpdateActivityFromSchedule()));
+    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getWorkPackage(final VillagerProfession bds, final float float2) {
+        WorkAtPoi atd3;
+        if (bds == VillagerProfession.FARMER) {
+            atd3 = new WorkAtComposter();
+        }
+        else {
+            atd3 = new WorkAtPoi();
+        }
+        return ImmutableList.of(getMinimalLookBehavior(), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(5, new RunOne(ImmutableList.of(Pair.of((Object)atd3, (Object)7), Pair.of((Object)new StrollAroundPoi(MemoryModuleType.JOB_SITE, 4), (Object)2), Pair.of((Object)new StrollToPoi(MemoryModuleType.JOB_SITE, 1, 10), (Object)5), Pair.of((Object)new StrollToPoiList(MemoryModuleType.SECONDARY_JOB_SITE, float2, 1, 6, MemoryModuleType.JOB_SITE), (Object)5), Pair.of((Object)new HarvestFarmland(), (Object)((bds == VillagerProfession.FARMER) ? 2 : 5)), Pair.of((Object)new UseBonemeal(), (Object)((bds == VillagerProfession.FARMER) ? 4 : 7))))), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(10, new ShowTradesToPlayer(400, 1600)), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(10, new SetLookAndInteract(EntityType.PLAYER, 4)), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(2, new SetWalkTargetFromBlockMemory(MemoryModuleType.JOB_SITE, float2, 9, 100, 1200)), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(3, new GiveGiftToHero(100)), (Pair<Integer, Behavior<LivingEntity>>)Pair.of(99, new UpdateActivityFromSchedule()));
     }
     
     public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getPlayPackage(final float float1) {
         return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(0, new MoveToTargetSink(100)), getFullLookBehavior(), Pair.of(5, new PlayTagWithOtherKids()), Pair.of(5, new RunOne(ImmutableMap.of(MemoryModuleType.VISIBLE_VILLAGER_BABIES, MemoryStatus.VALUE_ABSENT), ImmutableList.of(Pair.of((Object)InteractWith.<LivingEntity>of(EntityType.VILLAGER, 8, MemoryModuleType.INTERACTION_TARGET, float1, 2), (Object)2), Pair.of((Object)InteractWith.<LivingEntity>of(EntityType.CAT, 8, MemoryModuleType.INTERACTION_TARGET, float1, 2), (Object)1), Pair.of((Object)new VillageBoundRandomStroll(float1), (Object)1), Pair.of((Object)new SetWalkTargetFromLookTarget(float1, 2), (Object)1), Pair.of((Object)new JumpOnBed(float1), (Object)2), Pair.of((Object)new DoNothing(20, 40), (Object)2)))), Pair.of(99, new UpdateActivityFromSchedule()));
     }
     
-    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getRestPackage(final VillagerProfession axz, final float float2) {
+    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getRestPackage(final VillagerProfession bds, final float float2) {
         return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(2, new SetWalkTargetFromBlockMemory(MemoryModuleType.HOME, float2, 1, 150, 1200)), Pair.of(3, new ValidateNearbyPoi(PoiType.HOME, MemoryModuleType.HOME)), Pair.of(3, new SleepInBed()), Pair.of(5, new RunOne(ImmutableMap.of(MemoryModuleType.HOME, MemoryStatus.VALUE_ABSENT), ImmutableList.of(Pair.of((Object)new SetClosestHomeAsWalkTarget(float2), (Object)1), Pair.of((Object)new InsideBrownianWalk(float2), (Object)4), Pair.of((Object)new GoToClosestVillage(float2, 4), (Object)2), Pair.of((Object)new DoNothing(20, 40), (Object)2)))), getMinimalLookBehavior(), Pair.of(99, new UpdateActivityFromSchedule()));
     }
     
-    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getMeetPackage(final VillagerProfession axz, final float float2) {
+    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getMeetPackage(final VillagerProfession bds, final float float2) {
         return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(2, new RunOne(ImmutableList.of(Pair.of((Object)new StrollAroundPoi(MemoryModuleType.MEETING_POINT, 40), (Object)2), Pair.of((Object)new SocializeAtBell(), (Object)2)))), Pair.of(10, new ShowTradesToPlayer(400, 1600)), Pair.of(10, new SetLookAndInteract(EntityType.PLAYER, 4)), Pair.of(2, new SetWalkTargetFromBlockMemory(MemoryModuleType.MEETING_POINT, float2, 6, 100, 200)), Pair.of(3, new GiveGiftToHero(100)), Pair.of(3, new ValidateNearbyPoi(PoiType.MEETING, MemoryModuleType.MEETING_POINT)), Pair.of(3, new GateBehavior(ImmutableMap.of(), ImmutableSet.of(MemoryModuleType.INTERACTION_TARGET), GateBehavior.OrderPolicy.ORDERED, GateBehavior.RunningPolicy.RUN_ONE, ImmutableList.of(Pair.of((Object)new TradeWithVillager(), (Object)1)))), getFullLookBehavior(), Pair.of(99, new UpdateActivityFromSchedule()));
     }
     
-    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getIdlePackage(final VillagerProfession axz, final float float2) {
-        return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(2, new RunOne(ImmutableList.of(Pair.of((Object)InteractWith.<LivingEntity>of(EntityType.VILLAGER, 8, MemoryModuleType.INTERACTION_TARGET, float2, 2), (Object)2), Pair.of((Object)new InteractWith(EntityType.VILLAGER, 8, Villager::canBreed, Villager::canBreed, (MemoryModuleType<LivingEntity>)MemoryModuleType.BREED_TARGET, float2, 2), (Object)1), Pair.of((Object)InteractWith.<LivingEntity>of(EntityType.CAT, 8, MemoryModuleType.INTERACTION_TARGET, float2, 2), (Object)1), Pair.of((Object)new VillageBoundRandomStroll(float2), (Object)1), Pair.of((Object)new SetWalkTargetFromLookTarget(float2, 2), (Object)1), Pair.of((Object)new JumpOnBed(float2), (Object)1), Pair.of((Object)new DoNothing(30, 60), (Object)1)))), Pair.of(3, new GiveGiftToHero(100)), Pair.of(3, new SetLookAndInteract(EntityType.PLAYER, 4)), Pair.of(3, new ShowTradesToPlayer(400, 1600)), Pair.of(3, new GateBehavior(ImmutableMap.of(), ImmutableSet.of(MemoryModuleType.INTERACTION_TARGET), GateBehavior.OrderPolicy.ORDERED, GateBehavior.RunningPolicy.RUN_ONE, ImmutableList.of(Pair.of((Object)new TradeWithVillager(), (Object)1)))), Pair.of(3, new GateBehavior(ImmutableMap.of(), ImmutableSet.of(MemoryModuleType.BREED_TARGET), GateBehavior.OrderPolicy.ORDERED, GateBehavior.RunningPolicy.RUN_ONE, ImmutableList.of(Pair.of((Object)new MakeLove(), (Object)1)))), getFullLookBehavior(), Pair.of(99, new UpdateActivityFromSchedule()));
+    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getIdlePackage(final VillagerProfession bds, final float float2) {
+        return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(2, new RunOne(ImmutableList.of(Pair.of((Object)InteractWith.<LivingEntity>of(EntityType.VILLAGER, 8, MemoryModuleType.INTERACTION_TARGET, float2, 2), (Object)2), Pair.of((Object)new InteractWith(EntityType.VILLAGER, 8, AgableMob::canBreed, AgableMob::canBreed, (MemoryModuleType<LivingEntity>)MemoryModuleType.BREED_TARGET, float2, 2), (Object)1), Pair.of((Object)InteractWith.<LivingEntity>of(EntityType.CAT, 8, MemoryModuleType.INTERACTION_TARGET, float2, 2), (Object)1), Pair.of((Object)new VillageBoundRandomStroll(float2), (Object)1), Pair.of((Object)new SetWalkTargetFromLookTarget(float2, 2), (Object)1), Pair.of((Object)new JumpOnBed(float2), (Object)1), Pair.of((Object)new DoNothing(30, 60), (Object)1)))), Pair.of(3, new GiveGiftToHero(100)), Pair.of(3, new SetLookAndInteract(EntityType.PLAYER, 4)), Pair.of(3, new ShowTradesToPlayer(400, 1600)), Pair.of(3, new GateBehavior(ImmutableMap.of(), ImmutableSet.of(MemoryModuleType.INTERACTION_TARGET), GateBehavior.OrderPolicy.ORDERED, GateBehavior.RunningPolicy.RUN_ONE, ImmutableList.of(Pair.of((Object)new TradeWithVillager(), (Object)1)))), Pair.of(3, new GateBehavior(ImmutableMap.of(), ImmutableSet.of(MemoryModuleType.BREED_TARGET), GateBehavior.OrderPolicy.ORDERED, GateBehavior.RunningPolicy.RUN_ONE, ImmutableList.of(Pair.of((Object)new VillagerMakeLove(), (Object)1)))), getFullLookBehavior(), Pair.of(99, new UpdateActivityFromSchedule()));
     }
     
-    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getPanicPackage(final VillagerProfession axz, final float float2) {
+    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getPanicPackage(final VillagerProfession bds, final float float2) {
         final float float3 = float2 * 1.5f;
-        return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(0, new VillagerCalmDown()), Pair.of(1, new SetWalkTargetAwayFromEntity(MemoryModuleType.NEAREST_HOSTILE, float3)), Pair.of(1, new SetWalkTargetAwayFromEntity(MemoryModuleType.HURT_BY_ENTITY, float3)), Pair.of(3, new VillageBoundRandomStroll(float3, 2, 2)), getMinimalLookBehavior());
+        return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(0, new VillagerCalmDown()), Pair.of(1, SetWalkTargetAwayFrom.entity(MemoryModuleType.NEAREST_HOSTILE, float3, 6, false)), Pair.of(1, SetWalkTargetAwayFrom.entity(MemoryModuleType.HURT_BY_ENTITY, float3, 6, false)), Pair.of(3, new VillageBoundRandomStroll(float3, 2, 2)), getMinimalLookBehavior());
     }
     
-    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getPreRaidPackage(final VillagerProfession axz, final float float2) {
+    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getPreRaidPackage(final VillagerProfession bds, final float float2) {
         return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(0, new RingBell()), Pair.of(0, new RunOne(ImmutableList.of(Pair.of((Object)new SetWalkTargetFromBlockMemory(MemoryModuleType.MEETING_POINT, float2 * 1.5f, 2, 150, 200), (Object)6), Pair.of((Object)new VillageBoundRandomStroll(float2 * 1.5f), (Object)2)))), getMinimalLookBehavior(), Pair.of(99, new ResetRaidStatus()));
     }
     
-    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getRaidPackage(final VillagerProfession axz, final float float2) {
-        return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(0, new RunOne(ImmutableList.of(Pair.of((Object)new GoOutsideToCelebrate(float2), (Object)5), Pair.of((Object)new VictoryStroll(float2 * 1.1f), (Object)2)))), Pair.of(0, new Celebrate(600, 600)), Pair.of(2, new LocateHidingPlaceDuringRaid(24, float2 * 1.4f)), getMinimalLookBehavior(), Pair.of(99, new ResetRaidStatus()));
+    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getRaidPackage(final VillagerProfession bds, final float float2) {
+        return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(0, new RunOne(ImmutableList.of(Pair.of((Object)new GoOutsideToCelebrate(float2), (Object)5), Pair.of((Object)new VictoryStroll(float2 * 1.1f), (Object)2)))), Pair.of(0, new CelebrateVillagersSurvivedRaid(600, 600)), Pair.of(2, new LocateHidingPlaceDuringRaid(24, float2 * 1.4f)), getMinimalLookBehavior(), Pair.of(99, new ResetRaidStatus()));
     }
     
-    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getHidePackage(final VillagerProfession axz, final float float2) {
+    public static ImmutableList<Pair<Integer, ? extends Behavior<? super Villager>>> getHidePackage(final VillagerProfession bds, final float float2) {
         final int integer3 = 2;
-        return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(0, new SetHiddenState(15, 2)), Pair.of(1, new LocateHidingPlace(32, float2 * 1.25f, 2)), getMinimalLookBehavior());
+        return ImmutableList.<Pair<Integer, ? extends Behavior<? super Villager>>>of(Pair.of(0, new SetHiddenState(15, 3)), Pair.of(1, new LocateHidingPlace(32, float2 * 1.25f, 2)), getMinimalLookBehavior());
     }
     
     private static Pair<Integer, Behavior<LivingEntity>> getFullLookBehavior() {
-        return (Pair<Integer, Behavior<LivingEntity>>)Pair.of(5, new RunOne(ImmutableList.of(Pair.of((Object)new SetEntityLookTarget(EntityType.CAT, 8.0f), (Object)8), Pair.of((Object)new SetEntityLookTarget(EntityType.VILLAGER, 8.0f), (Object)2), Pair.of((Object)new SetEntityLookTarget(EntityType.PLAYER, 8.0f), (Object)2), Pair.of((Object)new SetEntityLookTarget(MobCategory.CREATURE, 8.0f), (Object)1), Pair.of((Object)new SetEntityLookTarget(MobCategory.WATER_CREATURE, 8.0f), (Object)1), Pair.of((Object)new SetEntityLookTarget(MobCategory.MONSTER, 8.0f), (Object)1), Pair.of((Object)new DoNothing(30, 60), (Object)2))));
+        return (Pair<Integer, Behavior<LivingEntity>>)Pair.of(5, new RunOne(ImmutableList.of(Pair.of((Object)new SetEntityLookTarget(EntityType.CAT, 8.0f), (Object)8), Pair.of((Object)new SetEntityLookTarget(EntityType.VILLAGER, 8.0f), (Object)2), Pair.of((Object)new SetEntityLookTarget(EntityType.PLAYER, 8.0f), (Object)2), Pair.of((Object)new SetEntityLookTarget(MobCategory.CREATURE, 8.0f), (Object)1), Pair.of((Object)new SetEntityLookTarget(MobCategory.WATER_CREATURE, 8.0f), (Object)1), Pair.of((Object)new SetEntityLookTarget(MobCategory.WATER_AMBIENT, 8.0f), (Object)1), Pair.of((Object)new SetEntityLookTarget(MobCategory.MONSTER, 8.0f), (Object)1), Pair.of((Object)new DoNothing(30, 60), (Object)2))));
     }
     
     private static Pair<Integer, Behavior<LivingEntity>> getMinimalLookBehavior() {
diff --git a/src/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java b/src/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
new file mode 100644
index 0000000..f238a86
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
@@ -0,0 +1,122 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.core.GlobalPos;
+import net.minecraft.world.level.pathfinder.Path;
+import net.minecraft.world.entity.ai.village.poi.PoiType;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.entity.EntityType;
+import java.util.Optional;
+import net.minecraft.network.protocol.game.DebugPackets;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.world.entity.AgableMob;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.npc.Villager;
+
+public class VillagerMakeLove extends Behavior<Villager> {
+    private long birthTimestamp;
+    
+    public VillagerMakeLove() {
+        super(ImmutableMap.<MemoryModuleType<AgableMob>, MemoryStatus>of(MemoryModuleType.BREED_TARGET, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<AgableMob>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT), 350, 350);
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        return this.isBreedingPossible(bdp);
+    }
+    
+    @Override
+    protected boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
+        return long3 <= this.birthTimestamp && this.isBreedingPossible(bdp);
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        final AgableMob aok6 = bdp.getBrain().<AgableMob>getMemory(MemoryModuleType.BREED_TARGET).get();
+        BehaviorUtils.lockGazeAndWalkToEachOther(bdp, aok6, 0.5f);
+        zd.broadcastEntityEvent(aok6, (byte)18);
+        zd.broadcastEntityEvent(bdp, (byte)18);
+        final int integer7 = 275 + bdp.getRandom().nextInt(50);
+        this.birthTimestamp = long3 + integer7;
+    }
+    
+    @Override
+    protected void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        final Villager bdp2 = bdp.getBrain().<Villager>getMemory((MemoryModuleType<Villager>)MemoryModuleType.BREED_TARGET).get();
+        if (bdp.distanceToSqr(bdp2) > 5.0) {
+            return;
+        }
+        BehaviorUtils.lockGazeAndWalkToEachOther(bdp, bdp2, 0.5f);
+        if (long3 >= this.birthTimestamp) {
+            bdp.eatAndDigestFood();
+            bdp2.eatAndDigestFood();
+            this.tryToGiveBirth(zd, bdp, bdp2);
+        }
+        else if (bdp.getRandom().nextInt(35) == 0) {
+            zd.broadcastEntityEvent(bdp2, (byte)12);
+            zd.broadcastEntityEvent(bdp, (byte)12);
+        }
+    }
+    
+    private void tryToGiveBirth(final ServerLevel zd, final Villager bdp2, final Villager bdp3) {
+        final Optional<BlockPos> optional5 = this.takeVacantBed(zd, bdp2);
+        if (!optional5.isPresent()) {
+            zd.broadcastEntityEvent(bdp3, (byte)13);
+            zd.broadcastEntityEvent(bdp2, (byte)13);
+        }
+        else {
+            final Optional<Villager> optional6 = this.breed(bdp2, bdp3);
+            if (optional6.isPresent()) {
+                this.giveBedToChild(zd, optional6.get(), optional5.get());
+            }
+            else {
+                zd.getPoiManager().release(optional5.get());
+                DebugPackets.sendPoiTicketCountPacket(zd, optional5.get());
+            }
+        }
+    }
+    
+    @Override
+    protected void tick(final ServerLevel zd, final Villager bdp, final long long3) {
+        bdp.getBrain().<AgableMob>eraseMemory(MemoryModuleType.BREED_TARGET);
+    }
+    
+    private boolean isBreedingPossible(final Villager bdp) {
+        final Brain<Villager> apr3 = bdp.getBrain();
+        final Optional<AgableMob> optional4 = apr3.<AgableMob>getMemory(MemoryModuleType.BREED_TARGET).filter(aok -> aok.getType() == EntityType.VILLAGER);
+        return optional4.isPresent() && BehaviorUtils.targetIsValid(apr3, MemoryModuleType.BREED_TARGET, EntityType.VILLAGER) && bdp.canBreed() && optional4.get().canBreed();
+    }
+    
+    private Optional<BlockPos> takeVacantBed(final ServerLevel zd, final Villager bdp) {
+        return zd.getPoiManager().take(PoiType.HOME.getPredicate(), fu -> this.canReach(bdp, fu), bdp.blockPosition(), 48);
+    }
+    
+    private boolean canReach(final Villager bdp, final BlockPos fu) {
+        final Path czf4 = bdp.getNavigation().createPath(fu, PoiType.HOME.getValidRange());
+        return czf4 != null && czf4.canReach();
+    }
+    
+    private Optional<Villager> breed(final Villager bdp1, final Villager bdp2) {
+        final Villager bdp3 = bdp1.getBreedOffspring((AgableMob)bdp2);
+        if (bdp3 == null) {
+            return Optional.<Villager>empty();
+        }
+        bdp1.setAge(6000);
+        bdp2.setAge(6000);
+        bdp3.setAge(-24000);
+        bdp3.moveTo(bdp1.getX(), bdp1.getY(), bdp1.getZ(), 0.0f, 0.0f);
+        bdp1.level.addFreshEntity(bdp3);
+        bdp1.level.broadcastEntityEvent(bdp3, (byte)12);
+        return Optional.<Villager>of(bdp3);
+    }
+    
+    private void giveBedToChild(final ServerLevel zd, final Villager bdp, final BlockPos fu) {
+        final GlobalPos gc5 = GlobalPos.of(zd.dimension(), fu);
+        bdp.getBrain().<GlobalPos>setMemory(MemoryModuleType.HOME, gc5);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java b/src/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
index 498d6a2..8c08867 100644
--- a/src/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
+++ b/src/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.entity.AgableMob;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
 import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
@@ -17,37 +18,37 @@ public class VillagerPanicTrigger extends Behavior<Villager> {
     }
     
     @Override
-    protected boolean canStillUse(final ServerLevel xd, final Villager axw, final long long3) {
-        return isHurt(axw) || hasHostile(axw);
+    protected boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
+        return isHurt(bdp) || hasHostile(bdp);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        if (isHurt(axw) || hasHostile(axw)) {
-            final Brain<?> alp6 = axw.getBrain();
-            if (!alp6.isActive(Activity.PANIC)) {
-                alp6.<Path>eraseMemory(MemoryModuleType.PATH);
-                alp6.<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
-                alp6.<PositionWrapper>eraseMemory(MemoryModuleType.LOOK_TARGET);
-                alp6.<Villager>eraseMemory(MemoryModuleType.BREED_TARGET);
-                alp6.<LivingEntity>eraseMemory(MemoryModuleType.INTERACTION_TARGET);
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        if (isHurt(bdp) || hasHostile(bdp)) {
+            final Brain<?> apr6 = bdp.getBrain();
+            if (!apr6.isActive(Activity.PANIC)) {
+                apr6.<Path>eraseMemory(MemoryModuleType.PATH);
+                apr6.<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+                apr6.<PositionTracker>eraseMemory(MemoryModuleType.LOOK_TARGET);
+                apr6.<AgableMob>eraseMemory(MemoryModuleType.BREED_TARGET);
+                apr6.<LivingEntity>eraseMemory(MemoryModuleType.INTERACTION_TARGET);
             }
-            alp6.setActivity(Activity.PANIC);
+            apr6.setActiveActivityIfPossible(Activity.PANIC);
         }
     }
     
     @Override
-    protected void tick(final ServerLevel xd, final Villager axw, final long long3) {
+    protected void tick(final ServerLevel zd, final Villager bdp, final long long3) {
         if (long3 % 100L == 0L) {
-            axw.spawnGolemIfNeeded(long3, 3);
+            bdp.spawnGolemIfNeeded(long3, 3);
         }
     }
     
-    public static boolean hasHostile(final LivingEntity akz) {
-        return akz.getBrain().hasMemoryValue(MemoryModuleType.NEAREST_HOSTILE);
+    public static boolean hasHostile(final LivingEntity aoy) {
+        return aoy.getBrain().hasMemoryValue(MemoryModuleType.NEAREST_HOSTILE);
     }
     
-    public static boolean isHurt(final LivingEntity akz) {
-        return akz.getBrain().hasMemoryValue(MemoryModuleType.HURT_BY);
+    public static boolean isHurt(final LivingEntity aoy) {
+        return aoy.getBrain().hasMemoryValue(MemoryModuleType.HURT_BY);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/WakeUp.java b/src/net/minecraft/world/entity/ai/behavior/WakeUp.java
index ead0ff6..0baf40a 100644
--- a/src/net/minecraft/world/entity/ai/behavior/WakeUp.java
+++ b/src/net/minecraft/world/entity/ai/behavior/WakeUp.java
@@ -12,12 +12,12 @@ public class WakeUp extends Behavior<LivingEntity> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final LivingEntity akz) {
-        return !akz.getBrain().isActive(Activity.REST) && akz.isSleeping();
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final LivingEntity aoy) {
+        return !aoy.getBrain().isActive(Activity.REST) && aoy.isSleeping();
     }
     
     @Override
-    protected void start(final ServerLevel xd, final LivingEntity akz, final long long3) {
-        akz.stopSleeping();
+    protected void start(final ServerLevel zd, final LivingEntity aoy, final long long3) {
+        aoy.stopSleeping();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/WeightedList.java b/src/net/minecraft/world/entity/ai/behavior/WeightedList.java
index b3e2d6e..37e3bc1 100644
--- a/src/net/minecraft/world/entity/ai/behavior/WeightedList.java
+++ b/src/net/minecraft/world/entity/ai/behavior/WeightedList.java
@@ -1,43 +1,33 @@
 package net.minecraft.world.entity.ai.behavior;
 
+import com.mojang.serialization.Dynamic;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
 import java.util.function.Supplier;
-import java.util.Comparator;
 import java.util.stream.Stream;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.Comparator;
 import java.util.function.Function;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 import com.google.common.collect.Lists;
 import java.util.Random;
 import java.util.List;
 
 public class WeightedList<U> {
-    protected final List<WeightedEntry<? extends U>> entries;
+    protected final List<WeightedEntry<U>> entries;
     private final Random random;
     
-    public WeightedList(final Random random) {
-        this.entries = Lists.newArrayList();
-        this.random = random;
-    }
-    
     public WeightedList() {
-        this(new Random());
+        this((List)Lists.newArrayList());
     }
     
-    public <T> WeightedList(final Dynamic<T> dynamic, final Function<Dynamic<T>, U> function) {
-        this();
-        final U object5;
-        final int integer6;
-        dynamic.asStream().forEach(dynamic -> dynamic.get("data").map(dynamic3 -> {
-            object5 = function.apply(dynamic3);
-            integer6 = dynamic.get("weight").asInt(1);
-            return this.add(object5, integer6);
-        }));
+    private WeightedList(final List<WeightedEntry<U>> list) {
+        this.random = new Random();
+        this.entries = Lists.newArrayList(list);
     }
     
-    public <T> T serialize(final DynamicOps<T> dynamicOps, final Function<U, Dynamic<T>> function) {
-        return (T)dynamicOps.createList((Stream)this.streamEntries().map(a -> dynamicOps.createMap((Map)ImmutableMap.builder().put(dynamicOps.createString("data"), function.apply(a.getData()).getValue()).put(dynamicOps.createString("weight"), dynamicOps.createInt(a.getWeight())).build())));
+    public static <U> Codec<WeightedList<U>> codec(final Codec<U> codec) {
+        return (Codec<WeightedList<U>>)WeightedEntry.<U>codec(codec).listOf().xmap((Function)WeightedList::new, atb -> atb.entries);
     }
     
     public WeightedList<U> add(final U object, final int integer) {
@@ -55,16 +45,16 @@ public class WeightedList<U> {
         return this;
     }
     
-    public Stream<? extends U> stream() {
-        return this.entries.stream().map(WeightedEntry::getData);
+    public boolean isEmpty() {
+        return this.entries.isEmpty();
     }
     
-    public Stream<WeightedEntry<? extends U>> streamEntries() {
-        return this.entries.stream();
+    public Stream<U> stream() {
+        return this.entries.stream().<U>map(WeightedEntry::getData);
     }
     
     public U getOne(final Random random) {
-        return (U)this.shuffle(random).stream().findFirst().<Throwable>orElseThrow(RuntimeException::new);
+        return this.shuffle(random).stream().findFirst().<Throwable>orElseThrow(RuntimeException::new);
     }
     
     @Override
@@ -72,7 +62,7 @@ public class WeightedList<U> {
         return "WeightedList[" + this.entries + "]";
     }
     
-    public class WeightedEntry<T> {
+    public static class WeightedEntry<T> {
         private final T data;
         private final int weight;
         private double randWeight;
@@ -94,13 +84,22 @@ public class WeightedList<U> {
             return this.data;
         }
         
-        public int getWeight() {
-            return this.weight;
-        }
-        
         @Override
         public String toString() {
             return "" + this.weight + ":" + this.data;
         }
+        
+        public static <E> Codec<WeightedEntry<E>> codec(final Codec<E> codec) {
+            return (Codec<WeightedEntry<E>>)new Codec<WeightedEntry<E>>() {
+                public <T> DataResult<Pair<WeightedEntry<E>, T>> decode(final DynamicOps<T> dynamicOps, final T object) {
+                    final Dynamic<T> dynamic4 = (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, object);
+                    return (DataResult<Pair<WeightedEntry<E>, T>>)dynamic4.get("data").flatMap((Function)codec::parse).map(object -> new WeightedEntry(object, dynamic4.get("weight").asInt(1))).map(a -> Pair.of(a, dynamicOps.empty()));
+                }
+                
+                public <T> DataResult<T> encode(final WeightedEntry<E> a, final DynamicOps<T> dynamicOps, final T object) {
+                    return (DataResult<T>)dynamicOps.mapBuilder().add("weight", dynamicOps.createInt(((WeightedEntry<Object>)a).weight)).add("data", codec.encodeStart((DynamicOps)dynamicOps, ((WeightedEntry<Object>)a).data)).build(object);
+                }
+            };
+        }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java b/src/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
new file mode 100644
index 0000000..1493b9b
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
@@ -0,0 +1,91 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.ComposterBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.Optional;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.core.GlobalPos;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.npc.Villager;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.Item;
+import java.util.List;
+
+public class WorkAtComposter extends WorkAtPoi {
+    private static final List<Item> COMPOSTABLE_ITEMS;
+    
+    @Override
+    protected void useWorkstation(final ServerLevel zd, final Villager bdp) {
+        final Optional<GlobalPos> optional4 = bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.JOB_SITE);
+        if (!optional4.isPresent()) {
+            return;
+        }
+        final GlobalPos gc5 = optional4.get();
+        final BlockState cfj6 = zd.getBlockState(gc5.pos());
+        if (cfj6.is(Blocks.COMPOSTER)) {
+            this.makeBread(bdp);
+            this.compostItems(zd, bdp, gc5, cfj6);
+        }
+    }
+    
+    private void compostItems(final ServerLevel zd, final Villager bdp, final GlobalPos gc, BlockState cfj) {
+        if (cfj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL) == 8) {
+            cfj = ComposterBlock.extractProduce(cfj, zd, gc.pos());
+        }
+        int integer6 = 20;
+        final int integer7 = 10;
+        final int[] arr8 = new int[WorkAtComposter.COMPOSTABLE_ITEMS.size()];
+        final SimpleContainer anm9 = bdp.getInventory();
+        final int integer8 = anm9.getContainerSize();
+        for (int integer9 = integer8 - 1; integer9 >= 0 && integer6 > 0; --integer9) {
+            final ItemStack bki12 = anm9.getItem(integer9);
+            final int integer10 = WorkAtComposter.COMPOSTABLE_ITEMS.indexOf(bki12.getItem());
+            if (integer10 != -1) {
+                final int integer11 = bki12.getCount();
+                final int integer12 = arr8[integer10] + integer11;
+                arr8[integer10] = integer12;
+                final int integer13 = Math.min(Math.min(integer12 - 10, integer6), integer11);
+                if (integer13 > 0) {
+                    integer6 -= integer13;
+                    for (int integer14 = 0; integer14 < integer13; ++integer14) {
+                        cfj = ComposterBlock.insertItem(cfj, zd, bki12, gc.pos());
+                        if (cfj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL) == 7) {
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    private void makeBread(final Villager bdp) {
+        final SimpleContainer anm3 = bdp.getInventory();
+        if (anm3.countItem(Items.BREAD) > 36) {
+            return;
+        }
+        final int integer4 = anm3.countItem(Items.WHEAT);
+        final int integer5 = 3;
+        final int integer6 = 3;
+        final int integer7 = Math.min(3, integer4 / 3);
+        if (integer7 == 0) {
+            return;
+        }
+        final int integer8 = integer7 * 3;
+        anm3.removeItemType(Items.WHEAT, integer8);
+        final ItemStack bki9 = anm3.addItem(new ItemStack(Items.BREAD, integer7));
+        if (!bki9.isEmpty()) {
+            bdp.spawnAtLocation(bki9, 0.5f);
+        }
+    }
+    
+    static {
+        COMPOSTABLE_ITEMS = ImmutableList.<Item>of(Items.WHEAT_SEEDS, Items.BEETROOT_SEEDS);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/behavior/WorkAtPoi.java b/src/net/minecraft/world/entity/ai/behavior/WorkAtPoi.java
index f0eca48..7500946 100644
--- a/src/net/minecraft/world/entity/ai/behavior/WorkAtPoi.java
+++ b/src/net/minecraft/world/entity/ai/behavior/WorkAtPoi.java
@@ -1,10 +1,9 @@
 package net.minecraft.world.entity.ai.behavior;
 
 import net.minecraft.world.entity.LivingEntity;
+import java.util.Optional;
 import net.minecraft.world.entity.ai.Brain;
-import net.minecraft.core.SerializableLong;
 import net.minecraft.core.Position;
-import java.util.Objects;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Map;
 import net.minecraft.core.GlobalPos;
@@ -21,26 +20,40 @@ public class WorkAtPoi extends Behavior<Villager> {
     }
     
     @Override
-    protected boolean checkExtraStartConditions(final ServerLevel xd, final Villager axw) {
-        if (xd.getGameTime() - this.lastCheck < 300L) {
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        if (zd.getGameTime() - this.lastCheck < 300L) {
             return false;
         }
-        if (xd.random.nextInt(2) != 0) {
+        if (zd.random.nextInt(2) != 0) {
             return false;
         }
-        this.lastCheck = xd.getGameTime();
-        final GlobalPos fr4 = axw.getBrain().<GlobalPos>getMemory(MemoryModuleType.JOB_SITE).get();
-        return Objects.equals(fr4.dimension(), xd.getDimension().getType()) && fr4.pos().closerThan(axw.position(), 1.73);
+        this.lastCheck = zd.getGameTime();
+        final GlobalPos gc4 = bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.JOB_SITE).get();
+        return gc4.dimension() == zd.dimension() && gc4.pos().closerThan(bdp.position(), 1.73);
     }
     
     @Override
-    protected void start(final ServerLevel xd, final Villager axw, final long long3) {
-        final Brain<Villager> alp6 = axw.getBrain();
-        alp6.<SerializableLong>setMemory(MemoryModuleType.LAST_WORKED_AT_POI, SerializableLong.of(long3));
-        alp6.<GlobalPos>getMemory(MemoryModuleType.JOB_SITE).ifPresent(fr -> alp6.<BlockPosWrapper>setMemory((MemoryModuleType<BlockPosWrapper>)MemoryModuleType.LOOK_TARGET, new BlockPosWrapper(fr.pos())));
-        axw.playWorkSound();
-        if (axw.shouldRestock()) {
-            axw.restock();
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        final Brain<Villager> apr6 = bdp.getBrain();
+        apr6.<Long>setMemory(MemoryModuleType.LAST_WORKED_AT_POI, long3);
+        apr6.<GlobalPos>getMemory(MemoryModuleType.JOB_SITE).ifPresent(gc -> apr6.<BlockPosTracker>setMemory((MemoryModuleType<BlockPosTracker>)MemoryModuleType.LOOK_TARGET, new BlockPosTracker(gc.pos())));
+        bdp.playWorkSound();
+        this.useWorkstation(zd, bdp);
+        if (bdp.shouldRestock()) {
+            bdp.restock();
         }
     }
+    
+    protected void useWorkstation(final ServerLevel zd, final Villager bdp) {
+    }
+    
+    @Override
+    protected boolean canStillUse(final ServerLevel zd, final Villager bdp, final long long3) {
+        final Optional<GlobalPos> optional6 = bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.JOB_SITE);
+        if (!optional6.isPresent()) {
+            return false;
+        }
+        final GlobalPos gc7 = optional6.get();
+        return gc7.dimension() == zd.dimension() && gc7.pos().closerThan(bdp.position(), 1.73);
+    }
 }
diff --git a/src/net/minecraft/world/entity/ai/behavior/YieldJobSite.java b/src/net/minecraft/world/entity/ai/behavior/YieldJobSite.java
new file mode 100644
index 0000000..9f901df
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/behavior/YieldJobSite.java
@@ -0,0 +1,77 @@
+package net.minecraft.world.entity.ai.behavior;
+
+import net.minecraft.world.entity.ai.memory.WalkTarget;
+import net.minecraft.world.level.pathfinder.Path;
+import net.minecraft.network.protocol.game.DebugPackets;
+import net.minecraft.world.entity.LivingEntity;
+import java.util.Optional;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.ai.village.poi.PoiType;
+import net.minecraft.world.entity.npc.VillagerProfession;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.core.GlobalPos;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.npc.Villager;
+
+public class YieldJobSite extends Behavior<Villager> {
+    private final float speedModifier;
+    
+    public YieldJobSite(final float float1) {
+        super(ImmutableMap.<MemoryModuleType<GlobalPos>, MemoryStatus>of(MemoryModuleType.POTENTIAL_JOB_SITE, MemoryStatus.VALUE_PRESENT, MemoryModuleType.JOB_SITE, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<GlobalPos>)MemoryModuleType.LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT));
+        this.speedModifier = float1;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Villager bdp) {
+        return !bdp.isBaby() && bdp.getVillagerData().getProfession() == VillagerProfession.NONE;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final Villager bdp, final long long3) {
+        final BlockPos fu6 = bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.POTENTIAL_JOB_SITE).get().pos();
+        final Optional<PoiType> optional7 = zd.getPoiManager().getType(fu6);
+        if (!optional7.isPresent()) {
+            return;
+        }
+        BehaviorUtils.getNearbyVillagersWithCondition(bdp, bdp -> this.nearbyWantsJobsite(optional7.get(), bdp, fu6)).findFirst().ifPresent(bdp4 -> this.yieldJobSite(zd, bdp, bdp4, fu6, bdp4.getBrain().<GlobalPos>getMemory(MemoryModuleType.JOB_SITE).isPresent()));
+    }
+    
+    private boolean nearbyWantsJobsite(final PoiType ayc, final Villager bdp, final BlockPos fu) {
+        final boolean boolean5 = bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.POTENTIAL_JOB_SITE).isPresent();
+        if (boolean5) {
+            return false;
+        }
+        final Optional<GlobalPos> optional6 = bdp.getBrain().<GlobalPos>getMemory(MemoryModuleType.JOB_SITE);
+        final VillagerProfession bds7 = bdp.getVillagerData().getProfession();
+        if (bdp.getVillagerData().getProfession() == VillagerProfession.NONE || !bds7.getJobPoiType().getPredicate().test(ayc)) {
+            return false;
+        }
+        if (!optional6.isPresent()) {
+            return this.canReachPos(bdp, fu, ayc);
+        }
+        return optional6.get().pos().equals(fu);
+    }
+    
+    private void yieldJobSite(final ServerLevel zd, final Villager bdp2, final Villager bdp3, final BlockPos fu, final boolean boolean5) {
+        this.eraseMemories(bdp2);
+        if (!boolean5) {
+            BehaviorUtils.setWalkAndLookTargetMemories(bdp3, fu, this.speedModifier, 1);
+            bdp3.getBrain().<GlobalPos>setMemory(MemoryModuleType.POTENTIAL_JOB_SITE, GlobalPos.of(zd.dimension(), fu));
+            DebugPackets.sendPoiTicketCountPacket(zd, fu);
+        }
+    }
+    
+    private boolean canReachPos(final Villager bdp, final BlockPos fu, final PoiType ayc) {
+        final Path czf5 = bdp.getNavigation().createPath(fu, ayc.getValidRange());
+        return czf5 != null && czf5.canReach();
+    }
+    
+    private void eraseMemories(final Villager bdp) {
+        bdp.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        bdp.getBrain().<PositionTracker>eraseMemory(MemoryModuleType.LOOK_TARGET);
+        bdp.getBrain().<GlobalPos>eraseMemory(MemoryModuleType.POTENTIAL_JOB_SITE);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/control/BodyRotationControl.java b/src/net/minecraft/world/entity/ai/control/BodyRotationControl.java
index cd73591..b665bf0 100644
--- a/src/net/minecraft/world/entity/ai/control/BodyRotationControl.java
+++ b/src/net/minecraft/world/entity/ai/control/BodyRotationControl.java
@@ -8,8 +8,8 @@ public class BodyRotationControl {
     private int headStableTime;
     private float lastStableYHeadRot;
     
-    public BodyRotationControl(final Mob ala) {
-        this.mob = ala;
+    public BodyRotationControl(final Mob aoz) {
+        this.mob = aoz;
     }
     
     public void clientTick() {
diff --git a/src/net/minecraft/world/entity/ai/control/DolphinLookControl.java b/src/net/minecraft/world/entity/ai/control/DolphinLookControl.java
index ad56410..2e51269 100644
--- a/src/net/minecraft/world/entity/ai/control/DolphinLookControl.java
+++ b/src/net/minecraft/world/entity/ai/control/DolphinLookControl.java
@@ -6,8 +6,8 @@ import net.minecraft.world.entity.Mob;
 public class DolphinLookControl extends LookControl {
     private final int maxYRotFromCenter;
     
-    public DolphinLookControl(final Mob ala, final int integer) {
-        super(ala);
+    public DolphinLookControl(final Mob aoz, final int integer) {
+        super(aoz);
         this.maxYRotFromCenter = integer;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/control/FlyingMoveControl.java b/src/net/minecraft/world/entity/ai/control/FlyingMoveControl.java
index 38e54e2..bbcace3 100644
--- a/src/net/minecraft/world/entity/ai/control/FlyingMoveControl.java
+++ b/src/net/minecraft/world/entity/ai/control/FlyingMoveControl.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.entity.ai.control;
 
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Mob;
 
@@ -8,8 +8,8 @@ public class FlyingMoveControl extends MoveControl {
     private final int maxTurn;
     private final boolean hoversInPlace;
     
-    public FlyingMoveControl(final Mob ala, final int integer, final boolean boolean3) {
-        super(ala);
+    public FlyingMoveControl(final Mob aoz, final int integer, final boolean boolean3) {
+        super(aoz);
         this.maxTurn = integer;
         this.hoversInPlace = boolean3;
     }
@@ -31,11 +31,11 @@ public class FlyingMoveControl extends MoveControl {
             final float float10 = (float)(Mth.atan2(double4, double2) * 57.2957763671875) - 90.0f;
             this.mob.yRot = this.rotlerp(this.mob.yRot, float10, 90.0f);
             float float11;
-            if (this.mob.onGround) {
-                float11 = (float)(this.speedModifier * this.mob.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue());
+            if (this.mob.isOnGround()) {
+                float11 = (float)(this.speedModifier * this.mob.getAttributeValue(Attributes.MOVEMENT_SPEED));
             }
             else {
-                float11 = (float)(this.speedModifier * this.mob.getAttribute(SharedMonsterAttributes.FLYING_SPEED).getValue());
+                float11 = (float)(this.speedModifier * this.mob.getAttributeValue(Attributes.FLYING_SPEED));
             }
             this.mob.setSpeed(float11);
             final double double6 = Mth.sqrt(double2 * double2 + double4 * double4);
diff --git a/src/net/minecraft/world/entity/ai/control/JumpControl.java b/src/net/minecraft/world/entity/ai/control/JumpControl.java
index 9b29de6..4936a4d 100644
--- a/src/net/minecraft/world/entity/ai/control/JumpControl.java
+++ b/src/net/minecraft/world/entity/ai/control/JumpControl.java
@@ -6,8 +6,8 @@ public class JumpControl {
     private final Mob mob;
     protected boolean jump;
     
-    public JumpControl(final Mob ala) {
-        this.mob = ala;
+    public JumpControl(final Mob aoz) {
+        this.mob = aoz;
     }
     
     public void jump() {
diff --git a/src/net/minecraft/world/entity/ai/control/LookControl.java b/src/net/minecraft/world/entity/ai/control/LookControl.java
index 3237553..65a780a 100644
--- a/src/net/minecraft/world/entity/ai/control/LookControl.java
+++ b/src/net/minecraft/world/entity/ai/control/LookControl.java
@@ -15,16 +15,16 @@ public class LookControl {
     protected double wantedY;
     protected double wantedZ;
     
-    public LookControl(final Mob ala) {
-        this.mob = ala;
+    public LookControl(final Mob aoz) {
+        this.mob = aoz;
     }
     
-    public void setLookAt(final Vec3 cvl) {
-        this.setLookAt(cvl.x, cvl.y, cvl.z);
+    public void setLookAt(final Vec3 dem) {
+        this.setLookAt(dem.x, dem.y, dem.z);
     }
     
-    public void setLookAt(final Entity akq, final float float2, final float float3) {
-        this.setLookAt(akq.getX(), getWantedY(akq), akq.getZ(), float2, float3);
+    public void setLookAt(final Entity aom, final float float2, final float float3) {
+        this.setLookAt(aom.getX(), getWantedY(aom), aom.getZ(), float2, float3);
     }
     
     public void setLookAt(final double double1, final double double2, final double double3) {
@@ -97,10 +97,10 @@ public class LookControl {
         return float1 + float5;
     }
     
-    private static double getWantedY(final Entity akq) {
-        if (akq instanceof LivingEntity) {
-            return akq.getEyeY();
+    private static double getWantedY(final Entity aom) {
+        if (aom instanceof LivingEntity) {
+            return aom.getEyeY();
         }
-        return (akq.getBoundingBox().minY + akq.getBoundingBox().maxY) / 2.0;
+        return (aom.getBoundingBox().minY + aom.getBoundingBox().maxY) / 2.0;
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/control/MoveControl.java b/src/net/minecraft/world/entity/ai/control/MoveControl.java
index 67bc133..b91f6ef 100644
--- a/src/net/minecraft/world/entity/ai/control/MoveControl.java
+++ b/src/net/minecraft/world/entity/ai/control/MoveControl.java
@@ -1,18 +1,18 @@
 package net.minecraft.world.entity.ai.control;
 
-import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.pathfinder.NodeEvaluator;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
+import net.minecraft.world.level.pathfinder.BlockPathTypes;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.core.Direction;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.Mob;
 
 public class MoveControl {
@@ -25,9 +25,9 @@ public class MoveControl {
     protected float strafeRight;
     protected Operation operation;
     
-    public MoveControl(final Mob ala) {
+    public MoveControl(final Mob aoz) {
         this.operation = Operation.WAIT;
-        this.mob = ala;
+        this.mob = aoz;
     }
     
     public boolean hasWanted() {
@@ -57,8 +57,8 @@ public class MoveControl {
     
     public void tick() {
         if (this.operation == Operation.STRAFE) {
-            final float float2 = (float)this.mob.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue();
-            float float3 = (float)this.speedModifier * float2;
+            final float float2 = (float)this.mob.getAttributeValue(Attributes.MOVEMENT_SPEED);
+            final float float3 = (float)this.speedModifier * float2;
             float float4 = this.strafeForwards;
             float float5 = this.strafeRight;
             float float6 = Mth.sqrt(float4 * float4 + float5 * float5);
@@ -72,14 +72,9 @@ public class MoveControl {
             final float float8 = Mth.cos(this.mob.yRot * 0.017453292f);
             final float float9 = float4 * float8 - float5 * float7;
             final float float10 = float5 * float8 + float4 * float7;
-            final PathNavigation arr11 = this.mob.getNavigation();
-            if (arr11 != null) {
-                final NodeEvaluator cqp12 = arr11.getNodeEvaluator();
-                if (cqp12 != null && cqp12.getBlockPathType(this.mob.level, Mth.floor(this.mob.getX() + float9), Mth.floor(this.mob.getY()), Mth.floor(this.mob.getZ() + float10)) != BlockPathTypes.WALKABLE) {
-                    this.strafeForwards = 1.0f;
-                    this.strafeRight = 0.0f;
-                    float3 = float2;
-                }
+            if (!this.isWalkable(float9, float10)) {
+                this.strafeForwards = 1.0f;
+                this.strafeRight = 0.0f;
             }
             this.mob.setSpeed(float3);
             this.mob.setZza(this.strafeForwards);
@@ -98,19 +93,19 @@ public class MoveControl {
             }
             final float float10 = (float)(Mth.atan2(double3, double2) * 57.2957763671875) - 90.0f;
             this.mob.yRot = this.rotlerp(this.mob.yRot, float10, 90.0f);
-            this.mob.setSpeed((float)(this.speedModifier * this.mob.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue()));
-            final BlockPos fk11 = new BlockPos(this.mob);
-            final BlockState byj12 = this.mob.level.getBlockState(fk11);
-            final Block bph13 = byj12.getBlock();
-            final VoxelShape cwf14 = byj12.getCollisionShape(this.mob.level, fk11);
-            if ((double4 > this.mob.maxUpStep && double2 * double2 + double3 * double3 < Math.max(1.0f, this.mob.getBbWidth())) || (!cwf14.isEmpty() && this.mob.getY() < cwf14.max(Direction.Axis.Y) + fk11.getY() && !bph13.is(BlockTags.DOORS) && !bph13.is(BlockTags.FENCES))) {
+            this.mob.setSpeed((float)(this.speedModifier * this.mob.getAttributeValue(Attributes.MOVEMENT_SPEED)));
+            final BlockPos fu11 = this.mob.blockPosition();
+            final BlockState cfj12 = this.mob.level.getBlockState(fu11);
+            final Block bvr13 = cfj12.getBlock();
+            final VoxelShape dfg14 = cfj12.getCollisionShape(this.mob.level, fu11);
+            if ((double4 > this.mob.maxUpStep && double2 * double2 + double3 * double3 < Math.max(1.0f, this.mob.getBbWidth())) || (!dfg14.isEmpty() && this.mob.getY() < dfg14.max(Direction.Axis.Y) + fu11.getY() && !bvr13.is(BlockTags.DOORS) && !bvr13.is(BlockTags.FENCES))) {
                 this.mob.getJumpControl().jump();
                 this.operation = Operation.JUMPING;
             }
         }
         else if (this.operation == Operation.JUMPING) {
-            this.mob.setSpeed((float)(this.speedModifier * this.mob.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue()));
-            if (this.mob.onGround) {
+            this.mob.setSpeed((float)(this.speedModifier * this.mob.getAttributeValue(Attributes.MOVEMENT_SPEED)));
+            if (this.mob.isOnGround()) {
                 this.operation = Operation.WAIT;
             }
         }
@@ -119,6 +114,17 @@ public class MoveControl {
         }
     }
     
+    private boolean isWalkable(final float float1, final float float2) {
+        final PathNavigation awv4 = this.mob.getNavigation();
+        if (awv4 != null) {
+            final NodeEvaluator cze5 = awv4.getNodeEvaluator();
+            if (cze5 != null && cze5.getBlockPathType(this.mob.level, Mth.floor(this.mob.getX() + float1), Mth.floor(this.mob.getY()), Mth.floor(this.mob.getZ() + float2)) != BlockPathTypes.WALKABLE) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
     protected float rotlerp(final float float1, final float float2, final float float3) {
         float float4 = Mth.wrapDegrees(float2 - float1);
         if (float4 > float3) {
diff --git a/src/net/minecraft/world/entity/ai/goal/AvoidEntityGoal.java b/src/net/minecraft/world/entity/ai/goal/AvoidEntityGoal.java
index a775426..d5684b1 100644
--- a/src/net/minecraft/world/entity/ai/goal/AvoidEntityGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/AvoidEntityGoal.java
@@ -25,25 +25,25 @@ public class AvoidEntityGoal<T extends LivingEntity> extends Goal {
     protected final Predicate<LivingEntity> predicateOnAvoidEntity;
     private final TargetingConditions avoidEntityTargeting;
     
-    public AvoidEntityGoal(final PathfinderMob alg, final Class<T> class2, final float float3, final double double4, final double double5) {
-        this(alg, class2, akz -> true, float3, double4, double5, (Predicate)EntitySelector.NO_CREATIVE_OR_SPECTATOR::test);
+    public AvoidEntityGoal(final PathfinderMob apg, final Class<T> class2, final float float3, final double double4, final double double5) {
+        this(apg, class2, aoy -> true, float3, double4, double5, (Predicate)EntitySelector.NO_CREATIVE_OR_SPECTATOR::test);
     }
     
-    public AvoidEntityGoal(final PathfinderMob alg, final Class<T> class2, final Predicate<LivingEntity> predicate3, final float float4, final double double5, final double double6, final Predicate<LivingEntity> predicate7) {
-        this.mob = alg;
+    public AvoidEntityGoal(final PathfinderMob apg, final Class<T> class2, final Predicate<LivingEntity> predicate3, final float float4, final double double5, final double double6, final Predicate<LivingEntity> predicate7) {
+        this.mob = apg;
         this.avoidClass = class2;
         this.avoidPredicate = predicate3;
         this.maxDist = float4;
         this.walkSpeedModifier = double5;
         this.sprintSpeedModifier = double6;
         this.predicateOnAvoidEntity = predicate7;
-        this.pathNav = alg.getNavigation();
+        this.pathNav = apg.getNavigation();
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
         this.avoidEntityTargeting = new TargetingConditions().range(float4).selector(predicate7.and(predicate3));
     }
     
-    public AvoidEntityGoal(final PathfinderMob alg, final Class<T> class2, final float float3, final double double4, final double double5, final Predicate<LivingEntity> predicate) {
-        this(alg, class2, akz -> true, float3, double4, double5, predicate);
+    public AvoidEntityGoal(final PathfinderMob apg, final Class<T> class2, final float float3, final double double4, final double double5, final Predicate<LivingEntity> predicate) {
+        this(apg, class2, aoy -> true, float3, double4, double5, predicate);
     }
     
     @Override
@@ -52,14 +52,14 @@ public class AvoidEntityGoal<T extends LivingEntity> extends Goal {
         if (this.toAvoid == null) {
             return false;
         }
-        final Vec3 cvl2 = RandomPos.getPosAvoid(this.mob, 16, 7, this.toAvoid.position());
-        if (cvl2 == null) {
+        final Vec3 dem2 = RandomPos.getPosAvoid(this.mob, 16, 7, this.toAvoid.position());
+        if (dem2 == null) {
             return false;
         }
-        if (this.toAvoid.distanceToSqr(cvl2.x, cvl2.y, cvl2.z) < this.toAvoid.distanceToSqr(this.mob)) {
+        if (this.toAvoid.distanceToSqr(dem2.x, dem2.y, dem2.z) < this.toAvoid.distanceToSqr(this.mob)) {
             return false;
         }
-        this.path = this.pathNav.createPath(cvl2.x, cvl2.y, cvl2.z, 0);
+        this.path = this.pathNav.createPath(dem2.x, dem2.y, dem2.z, 0);
         return this.path != null;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/BegGoal.java b/src/net/minecraft/world/entity/ai/goal/BegGoal.java
index dcf49e1..c237b0d 100644
--- a/src/net/minecraft/world/entity/ai/goal/BegGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/BegGoal.java
@@ -19,9 +19,9 @@ public class BegGoal extends Goal {
     private int lookTime;
     private final TargetingConditions begTargeting;
     
-    public BegGoal(final Wolf auc, final float float2) {
-        this.wolf = auc;
-        this.level = auc.level;
+    public BegGoal(final Wolf azk, final float float2) {
+        this.wolf = azk;
+        this.level = azk.level;
         this.lookDistance = float2;
         this.begTargeting = new TargetingConditions().range(float2).allowInvulnerable().allowSameTeam().allowNonAttackable();
         this.setFlags(EnumSet.<Flag>of(Flag.LOOK));
@@ -56,13 +56,13 @@ public class BegGoal extends Goal {
         --this.lookTime;
     }
     
-    private boolean playerHoldingInteresting(final Player ayj) {
-        for (final InteractionHand ajk6 : InteractionHand.values()) {
-            final ItemStack ben7 = ayj.getItemInHand(ajk6);
-            if (this.wolf.isTame() && ben7.getItem() == Items.BONE) {
+    private boolean playerHoldingInteresting(final Player bec) {
+        for (final InteractionHand anf6 : InteractionHand.values()) {
+            final ItemStack bki7 = bec.getItemInHand(anf6);
+            if (this.wolf.isTame() && bki7.getItem() == Items.BONE) {
                 return true;
             }
-            if (this.wolf.isFood(ben7)) {
+            if (this.wolf.isFood(bki7)) {
                 return true;
             }
         }
diff --git a/src/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
index 72d8481..3eb8e48 100644
--- a/src/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
@@ -13,15 +13,15 @@ public class BreakDoorGoal extends DoorInteractGoal {
     protected int lastBreakProgress;
     protected int doorBreakTime;
     
-    public BreakDoorGoal(final Mob ala, final Predicate<Difficulty> predicate) {
-        super(ala);
+    public BreakDoorGoal(final Mob aoz, final Predicate<Difficulty> predicate) {
+        super(aoz);
         this.lastBreakProgress = -1;
         this.doorBreakTime = -1;
         this.validDifficulties = predicate;
     }
     
-    public BreakDoorGoal(final Mob ala, final int integer, final Predicate<Difficulty> predicate) {
-        this(ala, predicate);
+    public BreakDoorGoal(final Mob aoz, final int integer, final Predicate<Difficulty> predicate) {
+        this(aoz, predicate);
         this.doorBreakTime = integer;
     }
     
@@ -73,7 +73,7 @@ public class BreakDoorGoal extends DoorInteractGoal {
         }
     }
     
-    private boolean isValidDifficulty(final Difficulty aji) {
-        return this.validDifficulties.test(aji);
+    private boolean isValidDifficulty(final Difficulty and) {
+        return this.validDifficulties.test(and);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/BreathAirGoal.java b/src/net/minecraft/world/entity/ai/goal/BreathAirGoal.java
index 3a45714..b1b0463 100644
--- a/src/net/minecraft/world/entity/ai/goal/BreathAirGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/BreathAirGoal.java
@@ -16,8 +16,8 @@ import net.minecraft.world.entity.PathfinderMob;
 public class BreathAirGoal extends Goal {
     private final PathfinderMob mob;
     
-    public BreathAirGoal(final PathfinderMob alg) {
-        this.mob = alg;
+    public BreathAirGoal(final PathfinderMob apg) {
+        this.mob = apg;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
     }
     
@@ -43,17 +43,17 @@ public class BreathAirGoal extends Goal {
     
     private void findAirPosition() {
         final Iterable<BlockPos> iterable2 = BlockPos.betweenClosed(Mth.floor(this.mob.getX() - 1.0), Mth.floor(this.mob.getY()), Mth.floor(this.mob.getZ() - 1.0), Mth.floor(this.mob.getX() + 1.0), Mth.floor(this.mob.getY() + 8.0), Mth.floor(this.mob.getZ() + 1.0));
-        BlockPos fk3 = null;
-        for (final BlockPos fk4 : iterable2) {
-            if (this.givesAir(this.mob.level, fk4)) {
-                fk3 = fk4;
+        BlockPos fu3 = null;
+        for (final BlockPos fu4 : iterable2) {
+            if (this.givesAir(this.mob.level, fu4)) {
+                fu3 = fu4;
                 break;
             }
         }
-        if (fk3 == null) {
-            fk3 = new BlockPos(this.mob.getX(), this.mob.getY() + 8.0, this.mob.getZ());
+        if (fu3 == null) {
+            fu3 = new BlockPos(this.mob.getX(), this.mob.getY() + 8.0, this.mob.getZ());
         }
-        this.mob.getNavigation().moveTo(fk3.getX(), fk3.getY() + 1, fk3.getZ(), 1.0);
+        this.mob.getNavigation().moveTo(fu3.getX(), fu3.getY() + 1, fu3.getZ(), 1.0);
     }
     
     @Override
@@ -63,8 +63,8 @@ public class BreathAirGoal extends Goal {
         this.mob.move(MoverType.SELF, this.mob.getDeltaMovement());
     }
     
-    private boolean givesAir(final LevelReader bjz, final BlockPos fk) {
-        final BlockState byj4 = bjz.getBlockState(fk);
-        return (bjz.getFluidState(fk).isEmpty() || byj4.getBlock() == Blocks.BUBBLE_COLUMN) && byj4.isPathfindable(bjz, fk, PathComputationType.LAND);
+    private boolean givesAir(final LevelReader bqd, final BlockPos fu) {
+        final BlockState cfj4 = bqd.getBlockState(fu);
+        return (bqd.getFluidState(fu).isEmpty() || cfj4.is(Blocks.BUBBLE_COLUMN)) && cfj4.isPathfindable(bqd, fu, PathComputationType.LAND);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/BreedGoal.java b/src/net/minecraft/world/entity/ai/goal/BreedGoal.java
index 05008cf..f3f6337 100644
--- a/src/net/minecraft/world/entity/ai/goal/BreedGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/BreedGoal.java
@@ -1,11 +1,5 @@
 package net.minecraft.world.entity.ai.goal;
 
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.ExperienceOrb;
-import net.minecraft.world.level.GameRules;
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.stats.Stats;
-import net.minecraft.world.entity.AgableMob;
 import javax.annotation.Nullable;
 import java.util.Iterator;
 import java.util.List;
@@ -25,13 +19,13 @@ public class BreedGoal extends Goal {
     private int loveTime;
     private final double speedModifier;
     
-    public BreedGoal(final Animal atc, final double double2) {
-        this(atc, double2, atc.getClass());
+    public BreedGoal(final Animal ayk, final double double2) {
+        this(ayk, double2, ayk.getClass());
     }
     
-    public BreedGoal(final Animal atc, final double double2, final Class<? extends Animal> class3) {
-        this.animal = atc;
-        this.level = atc.level;
+    public BreedGoal(final Animal ayk, final double double2, final Class<? extends Animal> class3) {
+        this.animal = ayk;
+        this.level = ayk.level;
         this.partnerClass = class3;
         this.speedModifier = double2;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
@@ -71,40 +65,18 @@ public class BreedGoal extends Goal {
     private Animal getFreePartner() {
         final List<Animal> list2 = this.level.<Animal>getNearbyEntities(this.partnerClass, BreedGoal.PARTNER_TARGETING, (LivingEntity)this.animal, this.animal.getBoundingBox().inflate(8.0));
         double double3 = Double.MAX_VALUE;
-        Animal atc5 = null;
-        for (final Animal atc6 : list2) {
-            if (this.animal.canMate(atc6) && this.animal.distanceToSqr(atc6) < double3) {
-                atc5 = atc6;
-                double3 = this.animal.distanceToSqr(atc6);
+        Animal ayk5 = null;
+        for (final Animal ayk6 : list2) {
+            if (this.animal.canMate(ayk6) && this.animal.distanceToSqr(ayk6) < double3) {
+                ayk5 = ayk6;
+                double3 = this.animal.distanceToSqr(ayk6);
             }
         }
-        return atc5;
+        return ayk5;
     }
     
     protected void breed() {
-        final AgableMob ako2 = this.animal.getBreedOffspring(this.partner);
-        if (ako2 == null) {
-            return;
-        }
-        ServerPlayer xe3 = this.animal.getLoveCause();
-        if (xe3 == null && this.partner.getLoveCause() != null) {
-            xe3 = this.partner.getLoveCause();
-        }
-        if (xe3 != null) {
-            xe3.awardStat(Stats.ANIMALS_BRED);
-            CriteriaTriggers.BRED_ANIMALS.trigger(xe3, this.animal, this.partner, ako2);
-        }
-        this.animal.setAge(6000);
-        this.partner.setAge(6000);
-        this.animal.resetLove();
-        this.partner.resetLove();
-        ako2.setAge(-24000);
-        ako2.moveTo(this.animal.getX(), this.animal.getY(), this.animal.getZ(), 0.0f, 0.0f);
-        this.level.addFreshEntity(ako2);
-        this.level.broadcastEntityEvent(this.animal, (byte)18);
-        if (this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
-            this.level.addFreshEntity(new ExperienceOrb(this.level, this.animal.getX(), this.animal.getY(), this.animal.getZ(), this.animal.getRandom().nextInt(7) + 1));
-        }
+        this.animal.spawnChildFromBreeding(this.level, this.partner);
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/ai/goal/CatLieOnBedGoal.java b/src/net/minecraft/world/entity/ai/goal/CatLieOnBedGoal.java
index 7ceb913..ca7f9db 100644
--- a/src/net/minecraft/world/entity/ai/goal/CatLieOnBedGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/CatLieOnBedGoal.java
@@ -1,5 +1,7 @@
 package net.minecraft.world.entity.ai.goal;
 
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
@@ -10,26 +12,26 @@ import net.minecraft.world.entity.animal.Cat;
 public class CatLieOnBedGoal extends MoveToBlockGoal {
     private final Cat cat;
     
-    public CatLieOnBedGoal(final Cat ate, final double double2, final int integer) {
-        super(ate, double2, integer, 6);
-        this.cat = ate;
+    public CatLieOnBedGoal(final Cat aym, final double double2, final int integer) {
+        super(aym, double2, integer, 6);
+        this.cat = aym;
         this.verticalSearchStart = -2;
         this.setFlags(EnumSet.<Flag>of(Flag.JUMP, Flag.MOVE));
     }
     
     @Override
     public boolean canUse() {
-        return this.cat.isTame() && !this.cat.isSitting() && !this.cat.isLying() && super.canUse();
+        return this.cat.isTame() && !this.cat.isOrderedToSit() && !this.cat.isLying() && super.canUse();
     }
     
     @Override
     public void start() {
         super.start();
-        this.cat.getSitGoal().wantToSit(false);
+        this.cat.setInSittingPose(false);
     }
     
     @Override
-    protected int nextStartTick(final PathfinderMob alg) {
+    protected int nextStartTick(final PathfinderMob apg) {
         return 40;
     }
     
@@ -42,7 +44,7 @@ public class CatLieOnBedGoal extends MoveToBlockGoal {
     @Override
     public void tick() {
         super.tick();
-        this.cat.getSitGoal().wantToSit(false);
+        this.cat.setInSittingPose(false);
         if (!this.isReachedTarget()) {
             this.cat.setLying(false);
         }
@@ -52,7 +54,7 @@ public class CatLieOnBedGoal extends MoveToBlockGoal {
     }
     
     @Override
-    protected boolean isValidTarget(final LevelReader bjz, final BlockPos fk) {
-        return bjz.isEmptyBlock(fk.above()) && bjz.getBlockState(fk).getBlock().is(BlockTags.BEDS);
+    protected boolean isValidTarget(final LevelReader bqd, final BlockPos fu) {
+        return bqd.isEmptyBlock(fu.above()) && bqd.getBlockState(fu).getBlock().is(BlockTags.BEDS);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/CatSitOnBlockGoal.java b/src/net/minecraft/world/entity/ai/goal/CatSitOnBlockGoal.java
index 1751a5d..d01e437 100644
--- a/src/net/minecraft/world/entity/ai/goal/CatSitOnBlockGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/CatSitOnBlockGoal.java
@@ -1,7 +1,9 @@
 package net.minecraft.world.entity.ai.goal;
 
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.level.block.state.properties.BedPart;
 import net.minecraft.world.level.block.BedBlock;
 import net.minecraft.tags.BlockTags;
@@ -18,50 +20,43 @@ import net.minecraft.world.entity.animal.Cat;
 public class CatSitOnBlockGoal extends MoveToBlockGoal {
     private final Cat cat;
     
-    public CatSitOnBlockGoal(final Cat ate, final double double2) {
-        super(ate, double2, 8);
-        this.cat = ate;
+    public CatSitOnBlockGoal(final Cat aym, final double double2) {
+        super(aym, double2, 8);
+        this.cat = aym;
     }
     
     @Override
     public boolean canUse() {
-        return this.cat.isTame() && !this.cat.isSitting() && super.canUse();
+        return this.cat.isTame() && !this.cat.isOrderedToSit() && super.canUse();
     }
     
     @Override
     public void start() {
         super.start();
-        this.cat.getSitGoal().wantToSit(false);
+        this.cat.setInSittingPose(false);
     }
     
     @Override
     public void stop() {
         super.stop();
-        this.cat.setSitting(false);
+        this.cat.setInSittingPose(false);
     }
     
     @Override
     public void tick() {
         super.tick();
-        this.cat.getSitGoal().wantToSit(false);
-        if (!this.isReachedTarget()) {
-            this.cat.setSitting(false);
-        }
-        else if (!this.cat.isSitting()) {
-            this.cat.setSitting(true);
-        }
+        this.cat.setInSittingPose(this.isReachedTarget());
     }
     
     @Override
-    protected boolean isValidTarget(final LevelReader bjz, final BlockPos fk) {
-        if (!bjz.isEmptyBlock(fk.above())) {
+    protected boolean isValidTarget(final LevelReader bqd, final BlockPos fu) {
+        if (!bqd.isEmptyBlock(fu.above())) {
             return false;
         }
-        final BlockState byj4 = bjz.getBlockState(fk);
-        final Block bph5 = byj4.getBlock();
-        if (bph5 == Blocks.CHEST) {
-            return ChestBlockEntity.getOpenCount(bjz, fk) < 1;
+        final BlockState cfj4 = bqd.getBlockState(fu);
+        if (cfj4.is(Blocks.CHEST)) {
+            return ChestBlockEntity.getOpenCount(bqd, fu) < 1;
         }
-        return (bph5 == Blocks.FURNACE && byj4.<Boolean>getValue((Property<Boolean>)FurnaceBlock.LIT)) || (bph5.is(BlockTags.BEDS) && byj4.<BedPart>getValue(BedBlock.PART) != BedPart.HEAD);
+        return (cfj4.is(Blocks.FURNACE) && cfj4.<Boolean>getValue((Property<Boolean>)FurnaceBlock.LIT)) || cfj4.is(BlockTags.BEDS, a -> a.<BedPart>getOptionalValue(BedBlock.PART).map(cfx -> cfx != BedPart.HEAD).orElse(true));
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/DolphinJumpGoal.java b/src/net/minecraft/world/entity/ai/goal/DolphinJumpGoal.java
index 7b81d79..4865907 100644
--- a/src/net/minecraft/world/entity/ai/goal/DolphinJumpGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/DolphinJumpGoal.java
@@ -2,12 +2,14 @@ package net.minecraft.world.entity.ai.goal;
 
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.util.Mth;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
-import net.minecraft.core.Direction;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.world.entity.animal.Dolphin;
 
 public class DolphinJumpGoal extends JumpGoal {
@@ -16,8 +18,8 @@ public class DolphinJumpGoal extends JumpGoal {
     private final int interval;
     private boolean breached;
     
-    public DolphinJumpGoal(final Dolphin ati, final int integer) {
-        this.dolphin = ati;
+    public DolphinJumpGoal(final Dolphin ayq, final int integer) {
+        this.dolphin = ayq;
         this.interval = integer;
     }
     
@@ -26,31 +28,31 @@ public class DolphinJumpGoal extends JumpGoal {
         if (this.dolphin.getRandom().nextInt(this.interval) != 0) {
             return false;
         }
-        final Direction fp2 = this.dolphin.getMotionDirection();
-        final int integer3 = fp2.getStepX();
-        final int integer4 = fp2.getStepZ();
-        final BlockPos fk5 = new BlockPos(this.dolphin);
+        final Direction fz2 = this.dolphin.getMotionDirection();
+        final int integer3 = fz2.getStepX();
+        final int integer4 = fz2.getStepZ();
+        final BlockPos fu5 = this.dolphin.blockPosition();
         for (final int integer5 : DolphinJumpGoal.STEPS_TO_CHECK) {
-            if (!this.waterIsClear(fk5, integer3, integer4, integer5) || !this.surfaceIsClear(fk5, integer3, integer4, integer5)) {
+            if (!this.waterIsClear(fu5, integer3, integer4, integer5) || !this.surfaceIsClear(fu5, integer3, integer4, integer5)) {
                 return false;
             }
         }
         return true;
     }
     
-    private boolean waterIsClear(final BlockPos fk, final int integer2, final int integer3, final int integer4) {
-        final BlockPos fk2 = fk.offset(integer2 * integer4, 0, integer3 * integer4);
-        return this.dolphin.level.getFluidState(fk2).is(FluidTags.WATER) && !this.dolphin.level.getBlockState(fk2).getMaterial().blocksMotion();
+    private boolean waterIsClear(final BlockPos fu, final int integer2, final int integer3, final int integer4) {
+        final BlockPos fu2 = fu.offset(integer2 * integer4, 0, integer3 * integer4);
+        return this.dolphin.level.getFluidState(fu2).is(FluidTags.WATER) && !this.dolphin.level.getBlockState(fu2).getMaterial().blocksMotion();
     }
     
-    private boolean surfaceIsClear(final BlockPos fk, final int integer2, final int integer3, final int integer4) {
-        return this.dolphin.level.getBlockState(fk.offset(integer2 * integer4, 1, integer3 * integer4)).isAir() && this.dolphin.level.getBlockState(fk.offset(integer2 * integer4, 2, integer3 * integer4)).isAir();
+    private boolean surfaceIsClear(final BlockPos fu, final int integer2, final int integer3, final int integer4) {
+        return this.dolphin.level.getBlockState(fu.offset(integer2 * integer4, 1, integer3 * integer4)).isAir() && this.dolphin.level.getBlockState(fu.offset(integer2 * integer4, 2, integer3 * integer4)).isAir();
     }
     
     @Override
     public boolean canContinueToUse() {
         final double double2 = this.dolphin.getDeltaMovement().y;
-        return (double2 * double2 >= 0.029999999329447746 || this.dolphin.xRot == 0.0f || Math.abs(this.dolphin.xRot) >= 10.0f || !this.dolphin.isInWater()) && !this.dolphin.onGround;
+        return (double2 * double2 >= 0.029999999329447746 || this.dolphin.xRot == 0.0f || Math.abs(this.dolphin.xRot) >= 10.0f || !this.dolphin.isInWater()) && !this.dolphin.isOnGround();
     }
     
     @Override
@@ -60,8 +62,8 @@ public class DolphinJumpGoal extends JumpGoal {
     
     @Override
     public void start() {
-        final Direction fp2 = this.dolphin.getMotionDirection();
-        this.dolphin.setDeltaMovement(this.dolphin.getDeltaMovement().add(fp2.getStepX() * 0.6, 0.7, fp2.getStepZ() * 0.6));
+        final Direction fz2 = this.dolphin.getMotionDirection();
+        this.dolphin.setDeltaMovement(this.dolphin.getDeltaMovement().add(fz2.getStepX() * 0.6, 0.7, fz2.getStepZ() * 0.6));
         this.dolphin.getNavigation().stop();
     }
     
@@ -74,19 +76,19 @@ public class DolphinJumpGoal extends JumpGoal {
     public void tick() {
         final boolean boolean2 = this.breached;
         if (!boolean2) {
-            final FluidState coj3 = this.dolphin.level.getFluidState(new BlockPos(this.dolphin));
-            this.breached = coj3.is(FluidTags.WATER);
+            final FluidState cxa3 = this.dolphin.level.getFluidState(this.dolphin.blockPosition());
+            this.breached = cxa3.is(FluidTags.WATER);
         }
         if (this.breached && !boolean2) {
             this.dolphin.playSound(SoundEvents.DOLPHIN_JUMP, 1.0f, 1.0f);
         }
-        final Vec3 cvl3 = this.dolphin.getDeltaMovement();
-        if (cvl3.y * cvl3.y < 0.029999999329447746 && this.dolphin.xRot != 0.0f) {
+        final Vec3 dem3 = this.dolphin.getDeltaMovement();
+        if (dem3.y * dem3.y < 0.029999999329447746 && this.dolphin.xRot != 0.0f) {
             this.dolphin.xRot = Mth.rotlerp(this.dolphin.xRot, 0.0f, 0.2f);
         }
         else {
-            final double double4 = Math.sqrt(Entity.getHorizontalDistanceSqr(cvl3));
-            final double double5 = Math.signum(-cvl3.y) * Math.acos(double4 / cvl3.length()) * 57.2957763671875;
+            final double double4 = Math.sqrt(Entity.getHorizontalDistanceSqr(dem3));
+            final double double5 = Math.signum(-dem3.y) * Math.acos(double4 / dem3.length()) * 57.2957763671875;
             this.dolphin.xRot = (float)double5;
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/goal/DoorInteractGoal.java b/src/net/minecraft/world/entity/ai/goal/DoorInteractGoal.java
index feb8eb3..07d7626 100644
--- a/src/net/minecraft/world/entity/ai/goal/DoorInteractGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/DoorInteractGoal.java
@@ -1,14 +1,11 @@
 package net.minecraft.world.entity.ai.goal;
 
-import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.pathfinder.Node;
 import net.minecraft.world.level.pathfinder.Path;
-import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.DoorBlock;
-import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Mob;
 
@@ -20,10 +17,10 @@ public abstract class DoorInteractGoal extends Goal {
     private float doorOpenDirX;
     private float doorOpenDirZ;
     
-    public DoorInteractGoal(final Mob ala) {
+    public DoorInteractGoal(final Mob aoz) {
         this.doorPos = BlockPos.ZERO;
-        this.mob = ala;
-        if (!(ala.getNavigation() instanceof GroundPathNavigation)) {
+        this.mob = aoz;
+        if (!this.hasGroundPathNavigation()) {
             throw new IllegalArgumentException("Unsupported mob type for DoorInteractGoal");
         }
     }
@@ -32,44 +29,47 @@ public abstract class DoorInteractGoal extends Goal {
         if (!this.hasDoor) {
             return false;
         }
-        final BlockState byj2 = this.mob.level.getBlockState(this.doorPos);
-        if (!(byj2.getBlock() instanceof DoorBlock)) {
+        final BlockState cfj2 = this.mob.level.getBlockState(this.doorPos);
+        if (!(cfj2.getBlock() instanceof DoorBlock)) {
             return this.hasDoor = false;
         }
-        return byj2.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN);
+        return cfj2.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN);
     }
     
     protected void setOpen(final boolean boolean1) {
         if (this.hasDoor) {
-            final BlockState byj3 = this.mob.level.getBlockState(this.doorPos);
-            if (byj3.getBlock() instanceof DoorBlock) {
-                ((DoorBlock)byj3.getBlock()).setOpen(this.mob.level, this.doorPos, boolean1);
+            final BlockState cfj3 = this.mob.level.getBlockState(this.doorPos);
+            if (cfj3.getBlock() instanceof DoorBlock) {
+                ((DoorBlock)cfj3.getBlock()).setOpen(this.mob.level, this.doorPos, boolean1);
             }
         }
     }
     
     @Override
     public boolean canUse() {
+        if (!this.hasGroundPathNavigation()) {
+            return false;
+        }
         if (!this.mob.horizontalCollision) {
             return false;
         }
-        final GroundPathNavigation arq2 = (GroundPathNavigation)this.mob.getNavigation();
-        final Path cqq3 = arq2.getPath();
-        if (cqq3 == null || cqq3.isDone() || !arq2.canOpenDoors()) {
+        final GroundPathNavigation awu2 = (GroundPathNavigation)this.mob.getNavigation();
+        final Path czf3 = awu2.getPath();
+        if (czf3 == null || czf3.isDone() || !awu2.canOpenDoors()) {
             return false;
         }
-        for (int integer4 = 0; integer4 < Math.min(cqq3.getIndex() + 2, cqq3.getSize()); ++integer4) {
-            final Node cqo5 = cqq3.get(integer4);
-            this.doorPos = new BlockPos(cqo5.x, cqo5.y + 1, cqo5.z);
+        for (int integer4 = 0; integer4 < Math.min(czf3.getIndex() + 2, czf3.getSize()); ++integer4) {
+            final Node czd5 = czf3.get(integer4);
+            this.doorPos = new BlockPos(czd5.x, czd5.y + 1, czd5.z);
             if (this.mob.distanceToSqr(this.doorPos.getX(), this.mob.getY(), this.doorPos.getZ()) <= 2.25) {
-                this.hasDoor = isDoor(this.mob.level, this.doorPos);
+                this.hasDoor = DoorBlock.isWoodenDoor(this.mob.level, this.doorPos);
                 if (this.hasDoor) {
                     return true;
                 }
             }
         }
-        this.doorPos = new BlockPos(this.mob).above();
-        return this.hasDoor = isDoor(this.mob.level, this.doorPos);
+        this.doorPos = this.mob.blockPosition().above();
+        return this.hasDoor = DoorBlock.isWoodenDoor(this.mob.level, this.doorPos);
     }
     
     @Override
@@ -80,22 +80,21 @@ public abstract class DoorInteractGoal extends Goal {
     @Override
     public void start() {
         this.passed = false;
-        this.doorOpenDirX = (float)(this.doorPos.getX() + 0.5f - this.mob.getX());
-        this.doorOpenDirZ = (float)(this.doorPos.getZ() + 0.5f - this.mob.getZ());
+        this.doorOpenDirX = (float)(this.doorPos.getX() + 0.5 - this.mob.getX());
+        this.doorOpenDirZ = (float)(this.doorPos.getZ() + 0.5 - this.mob.getZ());
     }
     
     @Override
     public void tick() {
-        final float float2 = (float)(this.doorPos.getX() + 0.5f - this.mob.getX());
-        final float float3 = (float)(this.doorPos.getZ() + 0.5f - this.mob.getZ());
+        final float float2 = (float)(this.doorPos.getX() + 0.5 - this.mob.getX());
+        final float float3 = (float)(this.doorPos.getZ() + 0.5 - this.mob.getZ());
         final float float4 = this.doorOpenDirX * float2 + this.doorOpenDirZ * float3;
         if (float4 < 0.0f) {
             this.passed = true;
         }
     }
     
-    public static boolean isDoor(final Level bjw, final BlockPos fk) {
-        final BlockState byj3 = bjw.getBlockState(fk);
-        return byj3.getBlock() instanceof DoorBlock && byj3.getMaterial() == Material.WOOD;
+    private boolean hasGroundPathNavigation() {
+        return this.mob.getNavigation() instanceof GroundPathNavigation;
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
index a520c46..b7bdbbf 100644
--- a/src/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
@@ -3,9 +3,9 @@ package net.minecraft.world.entity.ai.goal;
 import net.minecraft.world.level.block.state.predicate.BlockStatePredicate;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.GameRules;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.Blocks;
 import java.util.EnumSet;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.Mob;
@@ -18,9 +18,9 @@ public class EatBlockGoal extends Goal {
     private final Level level;
     private int eatAnimationTick;
     
-    public EatBlockGoal(final Mob ala) {
-        this.mob = ala;
-        this.level = ala.level;
+    public EatBlockGoal(final Mob aoz) {
+        this.mob = aoz;
+        this.level = aoz.level;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK, Flag.JUMP));
     }
     
@@ -29,8 +29,8 @@ public class EatBlockGoal extends Goal {
         if (this.mob.getRandom().nextInt(this.mob.isBaby() ? 50 : 1000) != 0) {
             return false;
         }
-        final BlockPos fk2 = new BlockPos(this.mob);
-        return EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(fk2)) || this.level.getBlockState(fk2.below()).getBlock() == Blocks.GRASS_BLOCK;
+        final BlockPos fu2 = this.mob.blockPosition();
+        return EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(fu2)) || this.level.getBlockState(fu2.below()).is(Blocks.GRASS_BLOCK);
     }
     
     @Override
@@ -60,19 +60,19 @@ public class EatBlockGoal extends Goal {
         if (this.eatAnimationTick != 4) {
             return;
         }
-        final BlockPos fk2 = new BlockPos(this.mob);
-        if (EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(fk2))) {
+        final BlockPos fu2 = this.mob.blockPosition();
+        if (EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(fu2))) {
             if (this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
-                this.level.destroyBlock(fk2, false);
+                this.level.destroyBlock(fu2, false);
             }
             this.mob.ate();
         }
         else {
-            final BlockPos fk3 = fk2.below();
-            if (this.level.getBlockState(fk3).getBlock() == Blocks.GRASS_BLOCK) {
+            final BlockPos fu3 = fu2.below();
+            if (this.level.getBlockState(fu3).is(Blocks.GRASS_BLOCK)) {
                 if (this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
-                    this.level.levelEvent(2001, fk3, Block.getId(Blocks.GRASS_BLOCK.defaultBlockState()));
-                    this.level.setBlock(fk3, Blocks.DIRT.defaultBlockState(), 2);
+                    this.level.levelEvent(2001, fu3, Block.getId(Blocks.GRASS_BLOCK.defaultBlockState()));
+                    this.level.setBlock(fu3, Blocks.DIRT.defaultBlockState(), 2);
                 }
                 this.mob.ate();
             }
diff --git a/src/net/minecraft/world/entity/ai/goal/FleeSunGoal.java b/src/net/minecraft/world/entity/ai/goal/FleeSunGoal.java
index 3e14404..3e181e0 100644
--- a/src/net/minecraft/world/entity/ai/goal/FleeSunGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/FleeSunGoal.java
@@ -1,12 +1,11 @@
 package net.minecraft.world.entity.ai.goal;
 
 import javax.annotation.Nullable;
+import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import java.util.EnumSet;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.PathfinderMob;
@@ -19,26 +18,26 @@ public class FleeSunGoal extends Goal {
     private final double speedModifier;
     private final Level level;
     
-    public FleeSunGoal(final PathfinderMob alg, final double double2) {
-        this.mob = alg;
+    public FleeSunGoal(final PathfinderMob apg, final double double2) {
+        this.mob = apg;
         this.speedModifier = double2;
-        this.level = alg.level;
+        this.level = apg.level;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
     }
     
     @Override
     public boolean canUse() {
-        return this.mob.getTarget() == null && this.level.isDay() && this.mob.isOnFire() && this.level.canSeeSky(new BlockPos(this.mob)) && this.mob.getItemBySlot(EquipmentSlot.HEAD).isEmpty() && this.setWantedPos();
+        return this.mob.getTarget() == null && this.level.isDay() && this.mob.isOnFire() && this.level.canSeeSky(this.mob.blockPosition()) && this.mob.getItemBySlot(EquipmentSlot.HEAD).isEmpty() && this.setWantedPos();
     }
     
     protected boolean setWantedPos() {
-        final Vec3 cvl2 = this.getHidePos();
-        if (cvl2 == null) {
+        final Vec3 dem2 = this.getHidePos();
+        if (dem2 == null) {
             return false;
         }
-        this.wantedX = cvl2.x;
-        this.wantedY = cvl2.y;
-        this.wantedZ = cvl2.z;
+        this.wantedX = dem2.x;
+        this.wantedY = dem2.y;
+        this.wantedZ = dem2.z;
         return true;
     }
     
@@ -55,11 +54,11 @@ public class FleeSunGoal extends Goal {
     @Nullable
     protected Vec3 getHidePos() {
         final Random random2 = this.mob.getRandom();
-        final BlockPos fk3 = new BlockPos(this.mob);
+        final BlockPos fu3 = this.mob.blockPosition();
         for (int integer4 = 0; integer4 < 10; ++integer4) {
-            final BlockPos fk4 = fk3.offset(random2.nextInt(20) - 10, random2.nextInt(6) - 3, random2.nextInt(20) - 10);
-            if (!this.level.canSeeSky(fk4) && this.mob.getWalkTargetValue(fk4) < 0.0f) {
-                return new Vec3(fk4);
+            final BlockPos fu4 = fu3.offset(random2.nextInt(20) - 10, random2.nextInt(6) - 3, random2.nextInt(20) - 10);
+            if (!this.level.canSeeSky(fu4) && this.mob.getWalkTargetValue(fu4) < 0.0f) {
+                return Vec3.atBottomCenterOf(fu4);
             }
         }
         return null;
diff --git a/src/net/minecraft/world/entity/ai/goal/FloatGoal.java b/src/net/minecraft/world/entity/ai/goal/FloatGoal.java
index 2681f7d..b57dbec 100644
--- a/src/net/minecraft/world/entity/ai/goal/FloatGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/FloatGoal.java
@@ -1,21 +1,23 @@
 package net.minecraft.world.entity.ai.goal;
 
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.FluidTags;
 import java.util.EnumSet;
 import net.minecraft.world.entity.Mob;
 
 public class FloatGoal extends Goal {
     private final Mob mob;
     
-    public FloatGoal(final Mob ala) {
-        this.mob = ala;
+    public FloatGoal(final Mob aoz) {
+        this.mob = aoz;
         this.setFlags(EnumSet.<Flag>of(Flag.JUMP));
-        ala.getNavigation().setCanFloat(true);
+        aoz.getNavigation().setCanFloat(true);
     }
     
     @Override
     public boolean canUse() {
-        final double double2 = (this.mob.getEyeHeight() < 0.4) ? 0.2 : 0.4;
-        return (this.mob.isInWater() && this.mob.getWaterHeight() > double2) || this.mob.isInLava();
+        return (this.mob.isInWater() && this.mob.getFluidHeight(FluidTags.WATER) > this.mob.getFluidJumpThreshold()) || this.mob.isInLava();
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/ai/goal/FollowBoatGoal.java b/src/net/minecraft/world/entity/ai/goal/FollowBoatGoal.java
index 367f312..cd5d5a1 100644
--- a/src/net/minecraft/world/entity/ai/goal/FollowBoatGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/FollowBoatGoal.java
@@ -9,26 +9,26 @@ import java.util.Iterator;
 import java.util.List;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.vehicle.Boat;
-import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.PathfinderMob;
 
 public class FollowBoatGoal extends Goal {
     private int timeToRecalcPath;
     private final PathfinderMob mob;
-    private LivingEntity following;
+    private Player following;
     private BoatGoals currentGoal;
     
-    public FollowBoatGoal(final PathfinderMob alg) {
-        this.mob = alg;
+    public FollowBoatGoal(final PathfinderMob apg) {
+        this.mob = apg;
     }
     
     @Override
     public boolean canUse() {
         final List<Boat> list2 = this.mob.level.<Boat>getEntitiesOfClass(Boat.class, this.mob.getBoundingBox().inflate(5.0));
         boolean boolean3 = false;
-        for (final Boat azz5 : list2) {
-            final Entity akq6 = azz5.getControllingPassenger();
-            if (akq6 instanceof LivingEntity && (Mth.abs(((LivingEntity)akq6).xxa) > 0.0f || Mth.abs(((LivingEntity)akq6).zza) > 0.0f)) {
+        for (final Boat bft5 : list2) {
+            final Entity aom6 = bft5.getControllingPassenger();
+            if (aom6 instanceof Player && (Mth.abs(((Player)aom6).xxa) > 0.0f || Mth.abs(((Player)aom6).zza) > 0.0f)) {
                 boolean3 = true;
                 break;
             }
@@ -49,9 +49,9 @@ public class FollowBoatGoal extends Goal {
     @Override
     public void start() {
         final List<Boat> list2 = this.mob.level.<Boat>getEntitiesOfClass(Boat.class, this.mob.getBoundingBox().inflate(5.0));
-        for (final Boat azz4 : list2) {
-            if (azz4.getControllingPassenger() != null && azz4.getControllingPassenger() instanceof LivingEntity) {
-                this.following = (LivingEntity)azz4.getControllingPassenger();
+        for (final Boat bft4 : list2) {
+            if (bft4.getControllingPassenger() != null && bft4.getControllingPassenger() instanceof Player) {
+                this.following = (Player)bft4.getControllingPassenger();
                 break;
             }
         }
@@ -67,7 +67,7 @@ public class FollowBoatGoal extends Goal {
     @Override
     public void tick() {
         final boolean boolean2 = Mth.abs(this.following.xxa) > 0.0f || Mth.abs(this.following.zza) > 0.0f;
-        final float float3 = (this.currentGoal == BoatGoals.GO_IN_BOAT_DIRECTION) ? (boolean2 ? 0.17999999f : 0.0f) : 0.135f;
+        final float float3 = (this.currentGoal == BoatGoals.GO_IN_BOAT_DIRECTION) ? (boolean2 ? 0.01f : 0.0f) : 0.015f;
         this.mob.moveRelative(float3, new Vec3(this.mob.xxa, this.mob.yya, this.mob.zza));
         this.mob.move(MoverType.SELF, this.mob.getDeltaMovement());
         final int timeToRecalcPath = this.timeToRecalcPath - 1;
@@ -77,18 +77,18 @@ public class FollowBoatGoal extends Goal {
         }
         this.timeToRecalcPath = 10;
         if (this.currentGoal == BoatGoals.GO_TO_BOAT) {
-            BlockPos fk4 = new BlockPos(this.following).relative(this.following.getDirection().getOpposite());
-            fk4 = fk4.offset(0, -1, 0);
-            this.mob.getNavigation().moveTo(fk4.getX(), fk4.getY(), fk4.getZ(), 1.0);
+            BlockPos fu4 = this.following.blockPosition().relative(this.following.getDirection().getOpposite());
+            fu4 = fu4.offset(0, -1, 0);
+            this.mob.getNavigation().moveTo(fu4.getX(), fu4.getY(), fu4.getZ(), 1.0);
             if (this.mob.distanceTo(this.following) < 4.0f) {
                 this.timeToRecalcPath = 0;
                 this.currentGoal = BoatGoals.GO_IN_BOAT_DIRECTION;
             }
         }
         else if (this.currentGoal == BoatGoals.GO_IN_BOAT_DIRECTION) {
-            final Direction fp4 = this.following.getMotionDirection();
-            final BlockPos fk5 = new BlockPos(this.following).relative(fp4, 10);
-            this.mob.getNavigation().moveTo(fk5.getX(), fk5.getY() - 1, fk5.getZ(), 1.0);
+            final Direction fz4 = this.following.getMotionDirection();
+            final BlockPos fu5 = this.following.blockPosition().relative(fz4, 10);
+            this.mob.getNavigation().moveTo(fu5.getX(), fu5.getY() - 1, fu5.getZ(), 1.0);
             if (this.mob.distanceTo(this.following) > 12.0f) {
                 this.timeToRecalcPath = 0;
                 this.currentGoal = BoatGoals.GO_TO_BOAT;
diff --git a/src/net/minecraft/world/entity/ai/goal/FollowFlockLeaderGoal.java b/src/net/minecraft/world/entity/ai/goal/FollowFlockLeaderGoal.java
index a90d364..852db2d 100644
--- a/src/net/minecraft/world/entity/ai/goal/FollowFlockLeaderGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/FollowFlockLeaderGoal.java
@@ -9,13 +9,13 @@ public class FollowFlockLeaderGoal extends Goal {
     private int timeToRecalcPath;
     private int nextStartTick;
     
-    public FollowFlockLeaderGoal(final AbstractSchoolingFish atb) {
-        this.mob = atb;
-        this.nextStartTick = this.nextStartTick(atb);
+    public FollowFlockLeaderGoal(final AbstractSchoolingFish ayj) {
+        this.mob = ayj;
+        this.nextStartTick = this.nextStartTick(ayj);
     }
     
-    protected int nextStartTick(final AbstractSchoolingFish atb) {
-        return 200 + atb.getRandom().nextInt(200) % 20;
+    protected int nextStartTick(final AbstractSchoolingFish ayj) {
+        return 200 + ayj.getRandom().nextInt(200) % 20;
     }
     
     @Override
@@ -31,10 +31,10 @@ public class FollowFlockLeaderGoal extends Goal {
             return false;
         }
         this.nextStartTick = this.nextStartTick(this.mob);
-        final Predicate<AbstractSchoolingFish> predicate2 = atb -> atb.canBeFollowed() || !atb.isFollower();
+        final Predicate<AbstractSchoolingFish> predicate2 = ayj -> ayj.canBeFollowed() || !ayj.isFollower();
         final List<AbstractSchoolingFish> list3 = this.mob.level.<AbstractSchoolingFish>getEntitiesOfClass(this.mob.getClass(), this.mob.getBoundingBox().inflate(8.0, 8.0, 8.0), predicate2);
-        final AbstractSchoolingFish atb2 = list3.stream().filter(AbstractSchoolingFish::canBeFollowed).findAny().orElse(this.mob);
-        atb2.addFollowers(list3.stream().filter(atb -> !atb.isFollower()));
+        final AbstractSchoolingFish ayj2 = list3.stream().filter(AbstractSchoolingFish::canBeFollowed).findAny().orElse(this.mob);
+        ayj2.addFollowers(list3.stream().filter(ayj -> !ayj.isFollower()));
         return this.mob.isFollower();
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/FollowMobGoal.java b/src/net/minecraft/world/entity/ai/goal/FollowMobGoal.java
index 98ce9bb..0f12321 100644
--- a/src/net/minecraft/world/entity/ai/goal/FollowMobGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/FollowMobGoal.java
@@ -23,15 +23,15 @@ public class FollowMobGoal extends Goal {
     private float oldWaterCost;
     private final float areaSize;
     
-    public FollowMobGoal(final Mob ala, final double double2, final float float3, final float float4) {
-        this.mob = ala;
-        this.followPredicate = (ala2 -> ala2 != null && ala.getClass() != ala2.getClass());
+    public FollowMobGoal(final Mob aoz, final double double2, final float float3, final float float4) {
+        this.mob = aoz;
+        this.followPredicate = (aoz2 -> aoz2 != null && aoz.getClass() != aoz2.getClass());
         this.speedModifier = double2;
-        this.navigation = ala.getNavigation();
+        this.navigation = aoz.getNavigation();
         this.stopDistance = float3;
         this.areaSize = float4;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
-        if (!(ala.getNavigation() instanceof GroundPathNavigation) && !(ala.getNavigation() instanceof FlyingPathNavigation)) {
+        if (!(aoz.getNavigation() instanceof GroundPathNavigation) && !(aoz.getNavigation() instanceof FlyingPathNavigation)) {
             throw new IllegalArgumentException("Unsupported mob type for FollowMobGoal");
         }
     }
@@ -40,11 +40,11 @@ public class FollowMobGoal extends Goal {
     public boolean canUse() {
         final List<Mob> list2 = this.mob.level.<Mob>getEntitiesOfClass(Mob.class, this.mob.getBoundingBox().inflate(this.areaSize), this.followPredicate);
         if (!list2.isEmpty()) {
-            for (final Mob ala4 : list2) {
-                if (ala4.isInvisible()) {
+            for (final Mob aoz4 : list2) {
+                if (aoz4.isInvisible()) {
                     continue;
                 }
-                this.followingMob = ala4;
+                this.followingMob = aoz4;
                 return true;
             }
         }
@@ -86,8 +86,8 @@ public class FollowMobGoal extends Goal {
         final double double5 = double2 * double2 + double3 * double3 + double4 * double4;
         if (double5 <= this.stopDistance * this.stopDistance) {
             this.navigation.stop();
-            final LookControl aol10 = this.followingMob.getLookControl();
-            if (double5 <= this.stopDistance || (aol10.getWantedX() == this.mob.getX() && aol10.getWantedY() == this.mob.getY() && aol10.getWantedZ() == this.mob.getZ())) {
+            final LookControl atl10 = this.followingMob.getLookControl();
+            if (double5 <= this.stopDistance || (atl10.getWantedX() == this.mob.getX() && atl10.getWantedY() == this.mob.getY() && atl10.getWantedZ() == this.mob.getZ())) {
                 final double double6 = this.followingMob.getX() - this.mob.getX();
                 final double double7 = this.followingMob.getZ() - this.mob.getZ();
                 this.navigation.moveTo(this.mob.getX() - double6, this.mob.getY(), this.mob.getZ() - double7, this.speedModifier);
diff --git a/src/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java b/src/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
index 2754bcc..00b9801 100644
--- a/src/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
@@ -28,42 +28,42 @@ public class FollowOwnerGoal extends Goal {
     private float oldWaterCost;
     private final boolean canFly;
     
-    public FollowOwnerGoal(final TamableAnimal alo, final double double2, final float float3, final float float4, final boolean boolean5) {
-        this.tamable = alo;
-        this.level = alo.level;
+    public FollowOwnerGoal(final TamableAnimal apq, final double double2, final float float3, final float float4, final boolean boolean5) {
+        this.tamable = apq;
+        this.level = apq.level;
         this.speedModifier = double2;
-        this.navigation = alo.getNavigation();
+        this.navigation = apq.getNavigation();
         this.startDistance = float3;
         this.stopDistance = float4;
         this.canFly = boolean5;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
-        if (!(alo.getNavigation() instanceof GroundPathNavigation) && !(alo.getNavigation() instanceof FlyingPathNavigation)) {
+        if (!(apq.getNavigation() instanceof GroundPathNavigation) && !(apq.getNavigation() instanceof FlyingPathNavigation)) {
             throw new IllegalArgumentException("Unsupported mob type for FollowOwnerGoal");
         }
     }
     
     @Override
     public boolean canUse() {
-        final LivingEntity akz2 = this.tamable.getOwner();
-        if (akz2 == null) {
+        final LivingEntity aoy2 = this.tamable.getOwner();
+        if (aoy2 == null) {
             return false;
         }
-        if (akz2.isSpectator()) {
+        if (aoy2.isSpectator()) {
             return false;
         }
-        if (this.tamable.isSitting()) {
+        if (this.tamable.isOrderedToSit()) {
             return false;
         }
-        if (this.tamable.distanceToSqr(akz2) < this.startDistance * this.startDistance) {
+        if (this.tamable.distanceToSqr(aoy2) < this.startDistance * this.startDistance) {
             return false;
         }
-        this.owner = akz2;
+        this.owner = aoy2;
         return true;
     }
     
     @Override
     public boolean canContinueToUse() {
-        return !this.navigation.isDone() && !this.tamable.isSitting() && this.tamable.distanceToSqr(this.owner) > this.stopDistance * this.stopDistance;
+        return !this.navigation.isDone() && !this.tamable.isOrderedToSit() && this.tamable.distanceToSqr(this.owner) > this.stopDistance * this.stopDistance;
     }
     
     @Override
@@ -101,12 +101,12 @@ public class FollowOwnerGoal extends Goal {
     }
     
     private void teleportToOwner() {
-        final BlockPos fk2 = new BlockPos(this.owner);
+        final BlockPos fu2 = this.owner.blockPosition();
         for (int integer3 = 0; integer3 < 10; ++integer3) {
             final int integer4 = this.randomIntInclusive(-3, 3);
             final int integer5 = this.randomIntInclusive(-1, 1);
             final int integer6 = this.randomIntInclusive(-3, 3);
-            final boolean boolean7 = this.maybeTeleportTo(fk2.getX() + integer4, fk2.getY() + integer5, fk2.getZ() + integer6);
+            final boolean boolean7 = this.maybeTeleportTo(fu2.getX() + integer4, fu2.getY() + integer5, fu2.getZ() + integer6);
             if (boolean7) {
                 return;
             }
@@ -120,22 +120,22 @@ public class FollowOwnerGoal extends Goal {
         if (!this.canTeleportTo(new BlockPos(integer1, integer2, integer3))) {
             return false;
         }
-        this.tamable.moveTo(integer1 + 0.5f, integer2, integer3 + 0.5f, this.tamable.yRot, this.tamable.xRot);
+        this.tamable.moveTo(integer1 + 0.5, integer2, integer3 + 0.5, this.tamable.yRot, this.tamable.xRot);
         this.navigation.stop();
         return true;
     }
     
-    private boolean canTeleportTo(final BlockPos fk) {
-        final BlockPathTypes cqm3 = WalkNodeEvaluator.getBlockPathTypeStatic(this.level, fk.getX(), fk.getY(), fk.getZ());
-        if (cqm3 != BlockPathTypes.WALKABLE) {
+    private boolean canTeleportTo(final BlockPos fu) {
+        final BlockPathTypes czb3 = WalkNodeEvaluator.getBlockPathTypeStatic(this.level, fu.mutable());
+        if (czb3 != BlockPathTypes.WALKABLE) {
             return false;
         }
-        final BlockState byj4 = this.level.getBlockState(fk.below());
-        if (!this.canFly && byj4.getBlock() instanceof LeavesBlock) {
+        final BlockState cfj4 = this.level.getBlockState(fu.below());
+        if (!this.canFly && cfj4.getBlock() instanceof LeavesBlock) {
             return false;
         }
-        final BlockPos fk2 = fk.subtract(new BlockPos(this.tamable));
-        return this.level.noCollision(this.tamable, this.tamable.getBoundingBox().move(fk2));
+        final BlockPos fu2 = fu.subtract(this.tamable.blockPosition());
+        return this.level.noCollision(this.tamable, this.tamable.getBoundingBox().move(fu2));
     }
     
     private int randomIntInclusive(final int integer1, final int integer2) {
diff --git a/src/net/minecraft/world/entity/ai/goal/FollowParentGoal.java b/src/net/minecraft/world/entity/ai/goal/FollowParentGoal.java
index 93bf48f..1c360c8 100644
--- a/src/net/minecraft/world/entity/ai/goal/FollowParentGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/FollowParentGoal.java
@@ -11,8 +11,8 @@ public class FollowParentGoal extends Goal {
     private final double speedModifier;
     private int timeToRecalcPath;
     
-    public FollowParentGoal(final Animal atc, final double double2) {
-        this.animal = atc;
+    public FollowParentGoal(final Animal ayk, final double double2) {
+        this.animal = ayk;
         this.speedModifier = double2;
     }
     
@@ -22,26 +22,26 @@ public class FollowParentGoal extends Goal {
             return false;
         }
         final List<Animal> list2 = this.animal.level.<Animal>getEntitiesOfClass(this.animal.getClass(), this.animal.getBoundingBox().inflate(8.0, 4.0, 8.0));
-        Animal atc3 = null;
+        Animal ayk3 = null;
         double double4 = Double.MAX_VALUE;
-        for (final Animal atc4 : list2) {
-            if (atc4.getAge() < 0) {
+        for (final Animal ayk4 : list2) {
+            if (ayk4.getAge() < 0) {
                 continue;
             }
-            final double double5 = this.animal.distanceToSqr(atc4);
+            final double double5 = this.animal.distanceToSqr(ayk4);
             if (double5 > double4) {
                 continue;
             }
             double4 = double5;
-            atc3 = atc4;
+            ayk3 = ayk4;
         }
-        if (atc3 == null) {
+        if (ayk3 == null) {
             return false;
         }
         if (double4 < 9.0) {
             return false;
         }
-        this.parent = atc3;
+        this.parent = ayk3;
         return true;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/net/minecraft/world/entity/ai/goal/GoalSelector.java
index 0282d35..e0062fa 100644
--- a/src/net/minecraft/world/entity/ai/goal/GoalSelector.java
+++ b/src/net/minecraft/world/entity/ai/goal/GoalSelector.java
@@ -7,6 +7,7 @@ import com.google.common.collect.Sets;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import net.minecraft.util.profiling.ProfilerFiller;
+import java.util.function.Supplier;
 import java.util.Set;
 import java.util.Map;
 import org.apache.logging.log4j.Logger;
@@ -16,53 +17,54 @@ public class GoalSelector {
     private static final WrappedGoal NO_GOAL;
     private final Map<Goal.Flag, WrappedGoal> lockedFlags;
     private final Set<WrappedGoal> availableGoals;
-    private final ProfilerFiller profiler;
+    private final Supplier<ProfilerFiller> profiler;
     private final EnumSet<Goal.Flag> disabledFlags;
     private int newGoalRate;
     
-    public GoalSelector(final ProfilerFiller aio) {
+    public GoalSelector(final Supplier<ProfilerFiller> supplier) {
         this.lockedFlags = new EnumMap<Goal.Flag, WrappedGoal>(Goal.Flag.class);
         this.availableGoals = Sets.newLinkedHashSet();
         this.disabledFlags = EnumSet.<Goal.Flag>noneOf(Goal.Flag.class);
         this.newGoalRate = 3;
-        this.profiler = aio;
+        this.profiler = supplier;
     }
     
-    public void addGoal(final int integer, final Goal apg) {
-        this.availableGoals.add(new WrappedGoal(integer, apg));
+    public void addGoal(final int integer, final Goal aug) {
+        this.availableGoals.add(new WrappedGoal(integer, aug));
     }
     
-    public void removeGoal(final Goal apg) {
-        this.availableGoals.stream().filter(aqv -> aqv.getGoal() == apg).filter(WrappedGoal::isRunning).forEach(WrappedGoal::stop);
-        this.availableGoals.removeIf(aqv -> aqv.getGoal() == apg);
+    public void removeGoal(final Goal aug) {
+        this.availableGoals.stream().filter(avx -> avx.getGoal() == aug).filter(WrappedGoal::isRunning).forEach(WrappedGoal::stop);
+        this.availableGoals.removeIf(avx -> avx.getGoal() == aug);
     }
     
     public void tick() {
-        this.profiler.push("goalCleanup");
-        this.getRunningGoals().filter(aqv -> !aqv.isRunning() || aqv.getFlags().stream().anyMatch(this.disabledFlags::contains) || !aqv.canContinueToUse()).forEach(Goal::stop);
-        this.lockedFlags.forEach((a, aqv) -> {
-            if (!aqv.isRunning()) {
+        final ProfilerFiller ami2 = this.profiler.get();
+        ami2.push("goalCleanup");
+        this.getRunningGoals().filter(avx -> !avx.isRunning() || avx.getFlags().stream().anyMatch(this.disabledFlags::contains) || !avx.canContinueToUse()).forEach(Goal::stop);
+        this.lockedFlags.forEach((a, avx) -> {
+            if (!avx.isRunning()) {
                 this.lockedFlags.remove(a);
             }
             return;
         });
-        this.profiler.pop();
-        this.profiler.push("goalUpdate");
-        final WrappedGoal aqv2;
-        this.availableGoals.stream().filter(aqv -> !aqv.isRunning()).filter(aqv -> aqv.getFlags().stream().noneMatch(this.disabledFlags::contains)).filter(aqv -> aqv.getFlags().stream().allMatch(a -> this.lockedFlags.getOrDefault(a, GoalSelector.NO_GOAL).canBeReplacedBy(aqv))).filter(WrappedGoal::canUse).forEach(aqv -> {
-            aqv.getFlags().forEach(a -> {
-                aqv2 = this.lockedFlags.getOrDefault(a, GoalSelector.NO_GOAL);
-                aqv2.stop();
-                this.lockedFlags.put(a, aqv);
+        ami2.pop();
+        ami2.push("goalUpdate");
+        final WrappedGoal avx2;
+        this.availableGoals.stream().filter(avx -> !avx.isRunning()).filter(avx -> avx.getFlags().stream().noneMatch(this.disabledFlags::contains)).filter(avx -> avx.getFlags().stream().allMatch(a -> this.lockedFlags.getOrDefault(a, GoalSelector.NO_GOAL).canBeReplacedBy(avx))).filter(WrappedGoal::canUse).forEach(avx -> {
+            avx.getFlags().forEach(a -> {
+                avx2 = this.lockedFlags.getOrDefault(a, GoalSelector.NO_GOAL);
+                avx2.stop();
+                this.lockedFlags.put(a, avx);
                 return;
             });
-            aqv.start();
+            avx.start();
             return;
         });
-        this.profiler.pop();
-        this.profiler.push("goalTick");
+        ami2.pop();
+        ami2.push("goalTick");
         this.getRunningGoals().forEach(WrappedGoal::tick);
-        this.profiler.pop();
+        ami2.pop();
     }
     
     public Stream<WrappedGoal> getRunningGoals() {
diff --git a/src/net/minecraft/world/entity/ai/goal/GolemRandomStrollInVillageGoal.java b/src/net/minecraft/world/entity/ai/goal/GolemRandomStrollInVillageGoal.java
new file mode 100644
index 0000000..c19a1f0
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/goal/GolemRandomStrollInVillageGoal.java
@@ -0,0 +1,105 @@
+package net.minecraft.world.entity.ai.goal;
+
+import net.minecraft.world.entity.ai.village.poi.PoiType;
+import java.util.function.Function;
+import net.minecraft.world.entity.ai.village.poi.PoiRecord;
+import net.minecraft.world.entity.ai.village.poi.PoiManager;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.SectionPos;
+import net.minecraft.core.Vec3i;
+import java.util.List;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.npc.Villager;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.ai.util.RandomPos;
+import javax.annotation.Nullable;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.PathfinderMob;
+
+public class GolemRandomStrollInVillageGoal extends RandomStrollGoal {
+    public GolemRandomStrollInVillageGoal(final PathfinderMob apg, final double double2) {
+        super(apg, double2, 240, false);
+    }
+    
+    @Nullable
+    @Override
+    protected Vec3 getPosition() {
+        final float float3 = this.mob.level.random.nextFloat();
+        if (this.mob.level.random.nextFloat() < 0.3f) {
+            return this.getPositionTowardsAnywhere();
+        }
+        Vec3 dem2;
+        if (float3 < 0.7f) {
+            dem2 = this.getPositionTowardsVillagerWhoWantsGolem();
+            if (dem2 == null) {
+                dem2 = this.getPositionTowardsPoi();
+            }
+        }
+        else {
+            dem2 = this.getPositionTowardsPoi();
+            if (dem2 == null) {
+                dem2 = this.getPositionTowardsVillagerWhoWantsGolem();
+            }
+        }
+        return (dem2 == null) ? this.getPositionTowardsAnywhere() : dem2;
+    }
+    
+    @Nullable
+    private Vec3 getPositionTowardsAnywhere() {
+        return RandomPos.getLandPos(this.mob, 10, 7);
+    }
+    
+    @Nullable
+    private Vec3 getPositionTowardsVillagerWhoWantsGolem() {
+        final ServerLevel zd2 = (ServerLevel)this.mob.level;
+        final List<Villager> list3 = zd2.<Villager>getEntities(EntityType.VILLAGER, this.mob.getBoundingBox().inflate(32.0), this::doesVillagerWantGolem);
+        if (list3.isEmpty()) {
+            return null;
+        }
+        final Villager bdp4 = list3.get(this.mob.level.random.nextInt(list3.size()));
+        final Vec3 dem5 = bdp4.position();
+        return RandomPos.getLandPosTowards(this.mob, 10, 7, dem5);
+    }
+    
+    @Nullable
+    private Vec3 getPositionTowardsPoi() {
+        final SectionPos go2 = this.getRandomVillageSection();
+        if (go2 == null) {
+            return null;
+        }
+        final BlockPos fu3 = this.getRandomPoiWithinSection(go2);
+        if (fu3 == null) {
+            return null;
+        }
+        return RandomPos.getLandPosTowards(this.mob, 10, 7, Vec3.atBottomCenterOf(fu3));
+    }
+    
+    @Nullable
+    private SectionPos getRandomVillageSection() {
+        final ServerLevel zd2 = (ServerLevel)this.mob.level;
+        final List<SectionPos> list3 = SectionPos.cube(SectionPos.of(this.mob), 2).filter(go -> zd2.sectionsToVillage(go) == 0).collect(Collectors.toList());
+        if (list3.isEmpty()) {
+            return null;
+        }
+        return list3.get(zd2.random.nextInt(list3.size()));
+    }
+    
+    @Nullable
+    private BlockPos getRandomPoiWithinSection(final SectionPos go) {
+        final ServerLevel zd3 = (ServerLevel)this.mob.level;
+        final PoiManager axz4 = zd3.getPoiManager();
+        final List<BlockPos> list5 = axz4.getInRange(ayc -> true, go.center(), 8, PoiManager.Occupancy.IS_OCCUPIED).map(PoiRecord::getPos).collect(Collectors.toList());
+        if (list5.isEmpty()) {
+            return null;
+        }
+        return list5.get(zd3.random.nextInt(list5.size()));
+    }
+    
+    private boolean doesVillagerWantGolem(final Villager bdp) {
+        return bdp.wantsToSpawnGolem(this.mob.level.getGameTime());
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/goal/InteractGoal.java b/src/net/minecraft/world/entity/ai/goal/InteractGoal.java
index 1597897..b0f16ea 100644
--- a/src/net/minecraft/world/entity/ai/goal/InteractGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/InteractGoal.java
@@ -5,8 +5,8 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Mob;
 
 public class InteractGoal extends LookAtPlayerGoal {
-    public InteractGoal(final Mob ala, final Class<? extends LivingEntity> class2, final float float3, final float float4) {
-        super(ala, class2, float3, float4);
+    public InteractGoal(final Mob aoz, final Class<? extends LivingEntity> class2, final float float3, final float float4) {
+        super(aoz, class2, float3, float4);
         this.setFlags(EnumSet.<Flag>of(Flag.LOOK, Flag.MOVE));
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/LandOnOwnersShoulderGoal.java b/src/net/minecraft/world/entity/ai/goal/LandOnOwnersShoulderGoal.java
index cc484c1..0958cb2 100644
--- a/src/net/minecraft/world/entity/ai/goal/LandOnOwnersShoulderGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/LandOnOwnersShoulderGoal.java
@@ -8,15 +8,15 @@ public class LandOnOwnersShoulderGoal extends Goal {
     private ServerPlayer owner;
     private boolean isSittingOnShoulder;
     
-    public LandOnOwnersShoulderGoal(final ShoulderRidingEntity atw) {
-        this.entity = atw;
+    public LandOnOwnersShoulderGoal(final ShoulderRidingEntity aze) {
+        this.entity = aze;
     }
     
     @Override
     public boolean canUse() {
-        final ServerPlayer xe2 = (ServerPlayer)this.entity.getOwner();
-        final boolean boolean3 = xe2 != null && !xe2.isSpectator() && !xe2.abilities.flying && !xe2.isInWater();
-        return !this.entity.isSitting() && boolean3 && this.entity.canSitOnShoulder();
+        final ServerPlayer ze2 = (ServerPlayer)this.entity.getOwner();
+        final boolean boolean3 = ze2 != null && !ze2.isSpectator() && !ze2.abilities.flying && !ze2.isInWater();
+        return !this.entity.isOrderedToSit() && boolean3 && this.entity.canSitOnShoulder();
     }
     
     @Override
@@ -32,7 +32,7 @@ public class LandOnOwnersShoulderGoal extends Goal {
     
     @Override
     public void tick() {
-        if (this.isSittingOnShoulder || this.entity.isSitting() || this.entity.isLeashed()) {
+        if (this.isSittingOnShoulder || this.entity.isInSittingPose() || this.entity.isLeashed()) {
             return;
         }
         if (this.entity.getBoundingBox().intersects(this.owner.getBoundingBox())) {
diff --git a/src/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.java
index 52d8ddc..28da428 100644
--- a/src/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.java
@@ -11,8 +11,8 @@ public class LeapAtTargetGoal extends Goal {
     private LivingEntity target;
     private final float yd;
     
-    public LeapAtTargetGoal(final Mob ala, final float float2) {
-        this.mob = ala;
+    public LeapAtTargetGoal(final Mob aoz, final float float2) {
+        this.mob = aoz;
         this.yd = float2;
         this.setFlags(EnumSet.<Flag>of(Flag.JUMP, Flag.MOVE));
     }
@@ -27,21 +27,21 @@ public class LeapAtTargetGoal extends Goal {
             return false;
         }
         final double double2 = this.mob.distanceToSqr(this.target);
-        return double2 >= 4.0 && double2 <= 16.0 && this.mob.onGround && this.mob.getRandom().nextInt(5) == 0;
+        return double2 >= 4.0 && double2 <= 16.0 && this.mob.isOnGround() && this.mob.getRandom().nextInt(5) == 0;
     }
     
     @Override
     public boolean canContinueToUse() {
-        return !this.mob.onGround;
+        return !this.mob.isOnGround();
     }
     
     @Override
     public void start() {
-        final Vec3 cvl2 = this.mob.getDeltaMovement();
-        Vec3 cvl3 = new Vec3(this.target.getX() - this.mob.getX(), 0.0, this.target.getZ() - this.mob.getZ());
-        if (cvl3.lengthSqr() > 1.0E-7) {
-            cvl3 = cvl3.normalize().scale(0.4).add(cvl2.scale(0.2));
+        final Vec3 dem2 = this.mob.getDeltaMovement();
+        Vec3 dem3 = new Vec3(this.target.getX() - this.mob.getX(), 0.0, this.target.getZ() - this.mob.getZ());
+        if (dem3.lengthSqr() > 1.0E-7) {
+            dem3 = dem3.normalize().scale(0.4).add(dem2.scale(0.2));
         }
-        this.mob.setDeltaMovement(cvl3.x, this.yd, cvl3.z);
+        this.mob.setDeltaMovement(dem3.x, this.yd, dem3.z);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/src/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
index d71dc20..0183aeb 100644
--- a/src/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
@@ -13,8 +13,8 @@ public class LlamaFollowCaravanGoal extends Goal {
     private double speedModifier;
     private int distCheckCounter;
     
-    public LlamaFollowCaravanGoal(final Llama auh, final double double2) {
-        this.llama = auh;
+    public LlamaFollowCaravanGoal(final Llama azp, final double double2) {
+        this.llama = azp;
         this.speedModifier = double2;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
     }
@@ -24,54 +24,54 @@ public class LlamaFollowCaravanGoal extends Goal {
         if (this.llama.isLeashed() || this.llama.inCaravan()) {
             return false;
         }
-        final EntityType<?> aku2;
-        final List<Entity> list2 = this.llama.level.getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), akq -> {
-            aku2 = akq.getType();
-            return aku2 == EntityType.LLAMA || aku2 == EntityType.TRADER_LLAMA;
+        final EntityType<?> aoq2;
+        final List<Entity> list2 = this.llama.level.getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), aom -> {
+            aoq2 = aom.getType();
+            return aoq2 == EntityType.LLAMA || aoq2 == EntityType.TRADER_LLAMA;
         });
-        Llama auh3 = null;
+        Llama azp3 = null;
         double double4 = Double.MAX_VALUE;
-        for (final Entity akq2 : list2) {
-            final Llama auh4 = (Llama)akq2;
-            if (auh4.inCaravan()) {
-                if (auh4.hasCaravanTail()) {
+        for (final Entity aom2 : list2) {
+            final Llama azp4 = (Llama)aom2;
+            if (azp4.inCaravan()) {
+                if (azp4.hasCaravanTail()) {
                     continue;
                 }
-                final double double5 = this.llama.distanceToSqr(auh4);
+                final double double5 = this.llama.distanceToSqr(azp4);
                 if (double5 > double4) {
                     continue;
                 }
                 double4 = double5;
-                auh3 = auh4;
+                azp3 = azp4;
             }
         }
-        if (auh3 == null) {
-            for (final Entity akq2 : list2) {
-                final Llama auh4 = (Llama)akq2;
-                if (!auh4.isLeashed()) {
+        if (azp3 == null) {
+            for (final Entity aom2 : list2) {
+                final Llama azp4 = (Llama)aom2;
+                if (!azp4.isLeashed()) {
                     continue;
                 }
-                if (auh4.hasCaravanTail()) {
+                if (azp4.hasCaravanTail()) {
                     continue;
                 }
-                final double double5 = this.llama.distanceToSqr(auh4);
+                final double double5 = this.llama.distanceToSqr(azp4);
                 if (double5 > double4) {
                     continue;
                 }
                 double4 = double5;
-                auh3 = auh4;
+                azp3 = azp4;
             }
         }
-        if (auh3 == null) {
+        if (azp3 == null) {
             return false;
         }
         if (double4 < 4.0) {
             return false;
         }
-        if (!auh3.isLeashed() && !this.firstIsLeashed(auh3, 1)) {
+        if (!azp3.isLeashed() && !this.firstIsLeashed(azp3, 1)) {
             return false;
         }
-        this.llama.joinCaravan(auh3);
+        this.llama.joinCaravan(azp3);
         return true;
     }
     
@@ -108,14 +108,14 @@ public class LlamaFollowCaravanGoal extends Goal {
         if (!this.llama.inCaravan()) {
             return;
         }
-        final Llama auh2 = this.llama.getCaravanHead();
-        final double double3 = this.llama.distanceTo(auh2);
+        final Llama azp2 = this.llama.getCaravanHead();
+        final double double3 = this.llama.distanceTo(azp2);
         final float float5 = 2.0f;
-        final Vec3 cvl6 = new Vec3(auh2.getX() - this.llama.getX(), auh2.getY() - this.llama.getY(), auh2.getZ() - this.llama.getZ()).normalize().scale(Math.max(double3 - 2.0, 0.0));
-        this.llama.getNavigation().moveTo(this.llama.getX() + cvl6.x, this.llama.getY() + cvl6.y, this.llama.getZ() + cvl6.z, this.speedModifier);
+        final Vec3 dem6 = new Vec3(azp2.getX() - this.llama.getX(), azp2.getY() - this.llama.getY(), azp2.getZ() - this.llama.getZ()).normalize().scale(Math.max(double3 - 2.0, 0.0));
+        this.llama.getNavigation().moveTo(this.llama.getX() + dem6.x, this.llama.getY() + dem6.y, this.llama.getZ() + dem6.z, this.speedModifier);
     }
     
-    private boolean firstIsLeashed(final Llama auh, int integer) {
-        return integer <= 8 && auh.inCaravan() && (auh.getCaravanHead().isLeashed() || this.firstIsLeashed(auh.getCaravanHead(), ++integer));
+    private boolean firstIsLeashed(final Llama azp, int integer) {
+        return integer <= 8 && azp.inCaravan() && (azp.getCaravanHead().isLeashed() || this.firstIsLeashed(azp.getCaravanHead(), ++integer));
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.java b/src/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.java
index 004d765..ea4854e 100644
--- a/src/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.java
@@ -17,18 +17,18 @@ public class LookAtPlayerGoal extends Goal {
     protected final Class<? extends LivingEntity> lookAtType;
     protected final TargetingConditions lookAtContext;
     
-    public LookAtPlayerGoal(final Mob ala, final Class<? extends LivingEntity> class2, final float float3) {
-        this(ala, class2, float3, 0.02f);
+    public LookAtPlayerGoal(final Mob aoz, final Class<? extends LivingEntity> class2, final float float3) {
+        this(aoz, class2, float3, 0.02f);
     }
     
-    public LookAtPlayerGoal(final Mob ala, final Class<? extends LivingEntity> class2, final float float3, final float float4) {
-        this.mob = ala;
+    public LookAtPlayerGoal(final Mob aoz, final Class<? extends LivingEntity> class2, final float float3, final float float4) {
+        this.mob = aoz;
         this.lookAtType = class2;
         this.lookDistance = float3;
         this.probability = float4;
         this.setFlags(EnumSet.<Flag>of(Flag.LOOK));
         if (class2 == Player.class) {
-            this.lookAtContext = new TargetingConditions().range(float3).allowSameTeam().allowInvulnerable().allowNonAttackable().selector(akz -> EntitySelector.notRiding(ala).test(akz));
+            this.lookAtContext = new TargetingConditions().range(float3).allowSameTeam().allowInvulnerable().allowNonAttackable().selector(aoy -> EntitySelector.notRiding(aoz).test(aoy));
         }
         else {
             this.lookAtContext = new TargetingConditions().range(float3).allowSameTeam().allowInvulnerable().allowNonAttackable();
diff --git a/src/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.java b/src/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.java
index 515e52e..d3faa6d 100644
--- a/src/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.java
@@ -8,9 +8,9 @@ import net.minecraft.world.entity.npc.AbstractVillager;
 public class LookAtTradingPlayerGoal extends LookAtPlayerGoal {
     private final AbstractVillager villager;
     
-    public LookAtTradingPlayerGoal(final AbstractVillager axs) {
-        super(axs, Player.class, 8.0f);
-        this.villager = axs;
+    public LookAtTradingPlayerGoal(final AbstractVillager bdk) {
+        super(bdk, Player.class, 8.0f);
+        this.villager = bdk;
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.java b/src/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.java
index 1d8b788..537ee92 100644
--- a/src/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.java
@@ -3,7 +3,6 @@ package net.minecraft.world.entity.ai.goal;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.EntitySelector;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Entity;
 import java.util.EnumSet;
@@ -12,68 +11,69 @@ import net.minecraft.world.entity.PathfinderMob;
 
 public class MeleeAttackGoal extends Goal {
     protected final PathfinderMob mob;
-    protected int attackTime;
     private final double speedModifier;
-    private final boolean trackTarget;
+    private final boolean followingTargetEvenIfNotSeen;
     private Path path;
-    private int timeToRecalcPath;
     private double pathedTargetX;
     private double pathedTargetY;
     private double pathedTargetZ;
-    protected final int attackInterval = 20;
-    private long lastUpdate;
+    private int ticksUntilNextPathRecalculation;
+    private int ticksUntilNextAttack;
+    private final int attackInterval = 20;
+    private long lastCanUseCheck;
     
-    public MeleeAttackGoal(final PathfinderMob alg, final double double2, final boolean boolean3) {
-        this.mob = alg;
+    public MeleeAttackGoal(final PathfinderMob apg, final double double2, final boolean boolean3) {
+        this.mob = apg;
         this.speedModifier = double2;
-        this.trackTarget = boolean3;
+        this.followingTargetEvenIfNotSeen = boolean3;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
     }
     
     @Override
     public boolean canUse() {
         final long long2 = this.mob.level.getGameTime();
-        if (long2 - this.lastUpdate < 20L) {
+        if (long2 - this.lastCanUseCheck < 20L) {
             return false;
         }
-        this.lastUpdate = long2;
-        final LivingEntity akz4 = this.mob.getTarget();
-        if (akz4 == null) {
+        this.lastCanUseCheck = long2;
+        final LivingEntity aoy4 = this.mob.getTarget();
+        if (aoy4 == null) {
             return false;
         }
-        if (!akz4.isAlive()) {
+        if (!aoy4.isAlive()) {
             return false;
         }
-        this.path = this.mob.getNavigation().createPath(akz4, 0);
-        return this.path != null || this.getAttackReachSqr(akz4) >= this.mob.distanceToSqr(akz4.getX(), akz4.getY(), akz4.getZ());
+        this.path = this.mob.getNavigation().createPath(aoy4, 0);
+        return this.path != null || this.getAttackReachSqr(aoy4) >= this.mob.distanceToSqr(aoy4.getX(), aoy4.getY(), aoy4.getZ());
     }
     
     @Override
     public boolean canContinueToUse() {
-        final LivingEntity akz2 = this.mob.getTarget();
-        if (akz2 == null) {
+        final LivingEntity aoy2 = this.mob.getTarget();
+        if (aoy2 == null) {
             return false;
         }
-        if (!akz2.isAlive()) {
+        if (!aoy2.isAlive()) {
             return false;
         }
-        if (!this.trackTarget) {
+        if (!this.followingTargetEvenIfNotSeen) {
             return !this.mob.getNavigation().isDone();
         }
-        return this.mob.isWithinRestriction(new BlockPos(akz2)) && (!(akz2 instanceof Player) || (!akz2.isSpectator() && !((Player)akz2).isCreative()));
+        return this.mob.isWithinRestriction(aoy2.blockPosition()) && (!(aoy2 instanceof Player) || (!aoy2.isSpectator() && !((Player)aoy2).isCreative()));
     }
     
     @Override
     public void start() {
         this.mob.getNavigation().moveTo(this.path, this.speedModifier);
         this.mob.setAggressive(true);
-        this.timeToRecalcPath = 0;
+        this.ticksUntilNextPathRecalculation = 0;
+        this.ticksUntilNextAttack = 0;
     }
     
     @Override
     public void stop() {
-        final LivingEntity akz2 = this.mob.getTarget();
-        if (!EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(akz2)) {
+        final LivingEntity aoy2 = this.mob.getTarget();
+        if (!EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(aoy2)) {
             this.mob.setTarget(null);
         }
         this.mob.setAggressive(false);
@@ -82,39 +82,55 @@ public class MeleeAttackGoal extends Goal {
     
     @Override
     public void tick() {
-        final LivingEntity akz2 = this.mob.getTarget();
-        this.mob.getLookControl().setLookAt(akz2, 30.0f, 30.0f);
-        final double double3 = this.mob.distanceToSqr(akz2.getX(), akz2.getY(), akz2.getZ());
-        --this.timeToRecalcPath;
-        if ((this.trackTarget || this.mob.getSensing().canSee(akz2)) && this.timeToRecalcPath <= 0 && ((this.pathedTargetX == 0.0 && this.pathedTargetY == 0.0 && this.pathedTargetZ == 0.0) || akz2.distanceToSqr(this.pathedTargetX, this.pathedTargetY, this.pathedTargetZ) >= 1.0 || this.mob.getRandom().nextFloat() < 0.05f)) {
-            this.pathedTargetX = akz2.getX();
-            this.pathedTargetY = akz2.getY();
-            this.pathedTargetZ = akz2.getZ();
-            this.timeToRecalcPath = 4 + this.mob.getRandom().nextInt(7);
+        final LivingEntity aoy2 = this.mob.getTarget();
+        this.mob.getLookControl().setLookAt(aoy2, 30.0f, 30.0f);
+        final double double3 = this.mob.distanceToSqr(aoy2.getX(), aoy2.getY(), aoy2.getZ());
+        this.ticksUntilNextPathRecalculation = Math.max(this.ticksUntilNextPathRecalculation - 1, 0);
+        if ((this.followingTargetEvenIfNotSeen || this.mob.getSensing().canSee(aoy2)) && this.ticksUntilNextPathRecalculation <= 0 && ((this.pathedTargetX == 0.0 && this.pathedTargetY == 0.0 && this.pathedTargetZ == 0.0) || aoy2.distanceToSqr(this.pathedTargetX, this.pathedTargetY, this.pathedTargetZ) >= 1.0 || this.mob.getRandom().nextFloat() < 0.05f)) {
+            this.pathedTargetX = aoy2.getX();
+            this.pathedTargetY = aoy2.getY();
+            this.pathedTargetZ = aoy2.getZ();
+            this.ticksUntilNextPathRecalculation = 4 + this.mob.getRandom().nextInt(7);
             if (double3 > 1024.0) {
-                this.timeToRecalcPath += 10;
+                this.ticksUntilNextPathRecalculation += 10;
             }
             else if (double3 > 256.0) {
-                this.timeToRecalcPath += 5;
+                this.ticksUntilNextPathRecalculation += 5;
             }
-            if (!this.mob.getNavigation().moveTo(akz2, this.speedModifier)) {
-                this.timeToRecalcPath += 15;
+            if (!this.mob.getNavigation().moveTo(aoy2, this.speedModifier)) {
+                this.ticksUntilNextPathRecalculation += 15;
             }
         }
-        this.attackTime = Math.max(this.attackTime - 1, 0);
-        this.checkAndPerformAttack(akz2, double3);
+        this.ticksUntilNextAttack = Math.max(this.ticksUntilNextAttack - 1, 0);
+        this.checkAndPerformAttack(aoy2, double3);
     }
     
-    protected void checkAndPerformAttack(final LivingEntity akz, final double double2) {
-        final double double3 = this.getAttackReachSqr(akz);
-        if (double2 <= double3 && this.attackTime <= 0) {
-            this.attackTime = 20;
+    protected void checkAndPerformAttack(final LivingEntity aoy, final double double2) {
+        final double double3 = this.getAttackReachSqr(aoy);
+        if (double2 <= double3 && this.ticksUntilNextAttack <= 0) {
+            this.resetAttackCooldown();
             this.mob.swing(InteractionHand.MAIN_HAND);
-            this.mob.doHurtTarget(akz);
+            this.mob.doHurtTarget(aoy);
         }
     }
     
-    protected double getAttackReachSqr(final LivingEntity akz) {
-        return this.mob.getBbWidth() * 2.0f * (this.mob.getBbWidth() * 2.0f) + akz.getBbWidth();
+    protected void resetAttackCooldown() {
+        this.ticksUntilNextAttack = 20;
+    }
+    
+    protected boolean isTimeToAttack() {
+        return this.ticksUntilNextAttack <= 0;
+    }
+    
+    protected int getTicksUntilNextAttack() {
+        return this.ticksUntilNextAttack;
+    }
+    
+    protected int getAttackInterval() {
+        return 20;
+    }
+    
+    protected double getAttackReachSqr(final LivingEntity aoy) {
+        return this.mob.getBbWidth() * 2.0f * (this.mob.getBbWidth() * 2.0f) + aoy.getBbWidth();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/MoveBackToVillage.java b/src/net/minecraft/world/entity/ai/goal/MoveBackToVillage.java
deleted file mode 100644
index 7ad26f4..0000000
--- a/src/net/minecraft/world/entity/ai/goal/MoveBackToVillage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package net.minecraft.world.entity.ai.goal;
-
-import javax.annotation.Nullable;
-import net.minecraft.world.entity.ai.util.RandomPos;
-import net.minecraft.core.Vec3i;
-import net.minecraft.world.entity.ai.behavior.BehaviorUtils;
-import net.minecraft.core.SectionPos;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.PathfinderMob;
-
-public class MoveBackToVillage extends RandomStrollGoal {
-    public MoveBackToVillage(final PathfinderMob alg, final double double2) {
-        super(alg, double2, 10);
-    }
-    
-    @Override
-    public boolean canUse() {
-        final ServerLevel xd2 = (ServerLevel)this.mob.level;
-        final BlockPos fk3 = new BlockPos(this.mob);
-        return !xd2.isVillage(fk3) && super.canUse();
-    }
-    
-    @Nullable
-    @Override
-    protected Vec3 getPosition() {
-        final ServerLevel xd2 = (ServerLevel)this.mob.level;
-        final BlockPos fk3 = new BlockPos(this.mob);
-        final SectionPos gd4 = SectionPos.of(fk3);
-        final SectionPos gd5 = BehaviorUtils.findSectionClosestToVillage(xd2, gd4, 2);
-        if (gd5 != gd4) {
-            return RandomPos.getPosTowards(this.mob, 10, 7, new Vec3(gd5.center()));
-        }
-        return null;
-    }
-}
diff --git a/src/net/minecraft/world/entity/ai/goal/MoveBackToVillageGoal.java b/src/net/minecraft/world/entity/ai/goal/MoveBackToVillageGoal.java
new file mode 100644
index 0000000..12a6ed2
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/goal/MoveBackToVillageGoal.java
@@ -0,0 +1,37 @@
+package net.minecraft.world.entity.ai.goal;
+
+import javax.annotation.Nullable;
+import net.minecraft.world.entity.ai.util.RandomPos;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.entity.ai.behavior.BehaviorUtils;
+import net.minecraft.core.SectionPos;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.PathfinderMob;
+
+public class MoveBackToVillageGoal extends RandomStrollGoal {
+    public MoveBackToVillageGoal(final PathfinderMob apg, final double double2, final boolean boolean3) {
+        super(apg, double2, 10, boolean3);
+    }
+    
+    @Override
+    public boolean canUse() {
+        final ServerLevel zd2 = (ServerLevel)this.mob.level;
+        final BlockPos fu3 = this.mob.blockPosition();
+        return !zd2.isVillage(fu3) && super.canUse();
+    }
+    
+    @Nullable
+    @Override
+    protected Vec3 getPosition() {
+        final ServerLevel zd2 = (ServerLevel)this.mob.level;
+        final BlockPos fu3 = this.mob.blockPosition();
+        final SectionPos go4 = SectionPos.of(fu3);
+        final SectionPos go5 = BehaviorUtils.findSectionClosestToVillage(zd2, go4, 2);
+        if (go5 != go4) {
+            return RandomPos.getPosTowards(this.mob, 10, 7, Vec3.atBottomCenterOf(go5.center()));
+        }
+        return null;
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.java b/src/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.java
index 0dff86a..677bc5f 100644
--- a/src/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.java
@@ -5,14 +5,14 @@ import java.util.Objects;
 import net.minecraft.core.Position;
 import net.minecraft.world.level.pathfinder.Node;
 import java.util.Optional;
+import net.minecraft.world.level.block.DoorBlock;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
 import net.minecraft.world.entity.ai.util.RandomPos;
 import net.minecraft.world.entity.ai.village.poi.PoiManager;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
 import java.util.EnumSet;
 import com.google.common.collect.Lists;
 import java.util.function.BooleanSupplier;
@@ -31,77 +31,80 @@ public class MoveThroughVillageGoal extends Goal {
     private final int distanceToPoi;
     private final BooleanSupplier canDealWithDoors;
     
-    public MoveThroughVillageGoal(final PathfinderMob alg, final double double2, final boolean boolean3, final int integer, final BooleanSupplier booleanSupplier) {
+    public MoveThroughVillageGoal(final PathfinderMob apg, final double double2, final boolean boolean3, final int integer, final BooleanSupplier booleanSupplier) {
         this.visited = Lists.newArrayList();
-        this.mob = alg;
+        this.mob = apg;
         this.speedModifier = double2;
         this.onlyAtNight = boolean3;
         this.distanceToPoi = integer;
         this.canDealWithDoors = booleanSupplier;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
-        if (!(alg.getNavigation() instanceof GroundPathNavigation)) {
+        if (!this.hasGroundPathNavigation()) {
             throw new IllegalArgumentException("Unsupported mob for MoveThroughVillageGoal");
         }
     }
     
     @Override
     public boolean canUse() {
+        if (!this.hasGroundPathNavigation()) {
+            return false;
+        }
         this.updateVisited();
         if (this.onlyAtNight && this.mob.level.isDay()) {
             return false;
         }
-        final ServerLevel xd2 = (ServerLevel)this.mob.level;
-        final BlockPos fk4 = new BlockPos(this.mob);
-        if (!xd2.closeToVillage(fk4, 6)) {
+        final ServerLevel zd2 = (ServerLevel)this.mob.level;
+        final BlockPos fu4 = this.mob.blockPosition();
+        if (!zd2.isCloseToVillage(fu4, 6)) {
             return false;
         }
         final ServerLevel serverLevel;
         Optional<BlockPos> optional5;
-        final Vec3i gg;
-        final Vec3 cvl4 = RandomPos.getLandPos(this.mob, 15, 7, fk3 -> {
-            if (!serverLevel.isVillage(fk3)) {
+        final Vec3i gr;
+        final Vec3 dem4 = RandomPos.getLandPos(this.mob, 15, 7, fu3 -> {
+            if (!serverLevel.isVillage(fu3)) {
                 return Double.NEGATIVE_INFINITY;
             }
             else {
-                optional5 = serverLevel.getPoiManager().find(PoiType.ALL, this::hasNotVisited, fk3, 10, PoiManager.Occupancy.IS_OCCUPIED);
+                optional5 = serverLevel.getPoiManager().find(PoiType.ALL, this::hasNotVisited, fu3, 10, PoiManager.Occupancy.IS_OCCUPIED);
                 if (!optional5.isPresent()) {
                     return Double.NEGATIVE_INFINITY;
                 }
                 else {
-                    return -optional5.get().distSqr(gg);
+                    return -optional5.get().distSqr(gr);
                 }
             }
         });
-        if (cvl4 == null) {
+        if (dem4 == null) {
             return false;
         }
-        final Optional<BlockPos> optional6 = xd2.getPoiManager().find(PoiType.ALL, this::hasNotVisited, new BlockPos(cvl4), 10, PoiManager.Occupancy.IS_OCCUPIED);
+        final Optional<BlockPos> optional6 = zd2.getPoiManager().find(PoiType.ALL, this::hasNotVisited, new BlockPos(dem4), 10, PoiManager.Occupancy.IS_OCCUPIED);
         if (!optional6.isPresent()) {
             return false;
         }
         this.poiPos = optional6.get().immutable();
-        final GroundPathNavigation arq6 = (GroundPathNavigation)this.mob.getNavigation();
-        final boolean boolean7 = arq6.canOpenDoors();
-        arq6.setCanOpenDoors(this.canDealWithDoors.getAsBoolean());
-        this.path = arq6.createPath(this.poiPos, 0);
-        arq6.setCanOpenDoors(boolean7);
+        final GroundPathNavigation awu6 = (GroundPathNavigation)this.mob.getNavigation();
+        final boolean boolean7 = awu6.canOpenDoors();
+        awu6.setCanOpenDoors(this.canDealWithDoors.getAsBoolean());
+        this.path = awu6.createPath(this.poiPos, 0);
+        awu6.setCanOpenDoors(boolean7);
         if (this.path == null) {
-            final Vec3 cvl5 = RandomPos.getPosTowards(this.mob, 10, 7, new Vec3(this.poiPos));
-            if (cvl5 == null) {
+            final Vec3 dem5 = RandomPos.getPosTowards(this.mob, 10, 7, Vec3.atBottomCenterOf(this.poiPos));
+            if (dem5 == null) {
                 return false;
             }
-            arq6.setCanOpenDoors(this.canDealWithDoors.getAsBoolean());
-            this.path = this.mob.getNavigation().createPath(cvl5.x, cvl5.y, cvl5.z, 0);
-            arq6.setCanOpenDoors(boolean7);
+            awu6.setCanOpenDoors(this.canDealWithDoors.getAsBoolean());
+            this.path = this.mob.getNavigation().createPath(dem5.x, dem5.y, dem5.z, 0);
+            awu6.setCanOpenDoors(boolean7);
             if (this.path == null) {
                 return false;
             }
         }
         for (int integer8 = 0; integer8 < this.path.getSize(); ++integer8) {
-            final Node cqo9 = this.path.get(integer8);
-            final BlockPos fk5 = new BlockPos(cqo9.x, cqo9.y + 1, cqo9.z);
-            if (DoorInteractGoal.isDoor(this.mob.level, fk5)) {
-                this.path = this.mob.getNavigation().createPath(cqo9.x, cqo9.y, cqo9.z, 0);
+            final Node czd9 = this.path.get(integer8);
+            final BlockPos fu5 = new BlockPos(czd9.x, czd9.y + 1, czd9.z);
+            if (DoorBlock.isWoodenDoor(this.mob.level, fu5)) {
+                this.path = this.mob.getNavigation().createPath(czd9.x, czd9.y, czd9.z, 0);
                 break;
             }
         }
@@ -125,9 +128,9 @@ public class MoveThroughVillageGoal extends Goal {
         }
     }
     
-    private boolean hasNotVisited(final BlockPos fk) {
-        for (final BlockPos fk2 : this.visited) {
-            if (Objects.equals(fk, fk2)) {
+    private boolean hasNotVisited(final BlockPos fu) {
+        for (final BlockPos fu2 : this.visited) {
+            if (Objects.equals(fu, fu2)) {
                 return false;
             }
         }
@@ -139,4 +142,8 @@ public class MoveThroughVillageGoal extends Goal {
             this.visited.remove(0);
         }
     }
+    
+    private boolean hasGroundPathNavigation() {
+        return this.mob.getNavigation() instanceof GroundPathNavigation;
+    }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java b/src/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
index 69edc94..4b66c43 100644
--- a/src/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
@@ -1,7 +1,6 @@
 package net.minecraft.world.entity.ai.goal;
 
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.Position;
 import net.minecraft.world.level.LevelReader;
 import java.util.EnumSet;
@@ -20,13 +19,13 @@ public abstract class MoveToBlockGoal extends Goal {
     private final int verticalSearchRange;
     protected int verticalSearchStart;
     
-    public MoveToBlockGoal(final PathfinderMob alg, final double double2, final int integer) {
-        this(alg, double2, integer, 1);
+    public MoveToBlockGoal(final PathfinderMob apg, final double double2, final int integer) {
+        this(apg, double2, integer, 1);
     }
     
-    public MoveToBlockGoal(final PathfinderMob alg, final double double2, final int integer3, final int integer4) {
+    public MoveToBlockGoal(final PathfinderMob apg, final double double2, final int integer3, final int integer4) {
         this.blockPos = BlockPos.ZERO;
-        this.mob = alg;
+        this.mob = apg;
         this.speedModifier = double2;
         this.searchRange = integer3;
         this.verticalSearchStart = 0;
@@ -44,8 +43,8 @@ public abstract class MoveToBlockGoal extends Goal {
         return this.findNearestBlock();
     }
     
-    protected int nextStartTick(final PathfinderMob alg) {
-        return 200 + alg.getRandom().nextInt(200);
+    protected int nextStartTick(final PathfinderMob apg) {
+        return 200 + apg.getRandom().nextInt(200);
     }
     
     @Override
@@ -94,13 +93,13 @@ public abstract class MoveToBlockGoal extends Goal {
     protected boolean findNearestBlock() {
         final int integer2 = this.searchRange;
         final int integer3 = this.verticalSearchRange;
-        final BlockPos fk4 = new BlockPos(this.mob);
+        final BlockPos fu4 = this.mob.blockPosition();
         final BlockPos.MutableBlockPos a5 = new BlockPos.MutableBlockPos();
         for (int integer4 = this.verticalSearchStart; integer4 <= integer3; integer4 = ((integer4 > 0) ? (-integer4) : (1 - integer4))) {
             for (int integer5 = 0; integer5 < integer2; ++integer5) {
                 for (int integer6 = 0; integer6 <= integer5; integer6 = ((integer6 > 0) ? (-integer6) : (1 - integer6))) {
                     for (int integer7 = (integer6 < integer5 && integer6 > -integer5) ? integer5 : 0; integer7 <= integer5; integer7 = ((integer7 > 0) ? (-integer7) : (1 - integer7))) {
-                        a5.set(fk4).move(integer6, integer4 - 1, integer7);
+                        a5.setWithOffset(fu4, integer6, integer4 - 1, integer7);
                         if (this.mob.isWithinRestriction(a5) && this.isValidTarget(this.mob.level, a5)) {
                             this.blockPos = a5;
                             return true;
@@ -112,5 +111,5 @@ public abstract class MoveToBlockGoal extends Goal {
         return false;
     }
     
-    protected abstract boolean isValidTarget(final LevelReader bjz, final BlockPos fk);
+    protected abstract boolean isValidTarget(final LevelReader bqd, final BlockPos fu);
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.java b/src/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.java
index a4425cb..cd47ea8 100644
--- a/src/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.java
@@ -13,8 +13,8 @@ public class MoveTowardsRestrictionGoal extends Goal {
     private double wantedZ;
     private final double speedModifier;
     
-    public MoveTowardsRestrictionGoal(final PathfinderMob alg, final double double2) {
-        this.mob = alg;
+    public MoveTowardsRestrictionGoal(final PathfinderMob apg, final double double2) {
+        this.mob = apg;
         this.speedModifier = double2;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
     }
@@ -24,13 +24,13 @@ public class MoveTowardsRestrictionGoal extends Goal {
         if (this.mob.isWithinRestriction()) {
             return false;
         }
-        final Vec3 cvl2 = RandomPos.getPosTowards(this.mob, 16, 7, new Vec3(this.mob.getRestrictCenter()));
-        if (cvl2 == null) {
+        final Vec3 dem2 = RandomPos.getPosTowards(this.mob, 16, 7, Vec3.atBottomCenterOf(this.mob.getRestrictCenter()));
+        if (dem2 == null) {
             return false;
         }
-        this.wantedX = cvl2.x;
-        this.wantedY = cvl2.y;
-        this.wantedZ = cvl2.z;
+        this.wantedX = dem2.x;
+        this.wantedY = dem2.y;
+        this.wantedZ = dem2.z;
         return true;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.java
index d404c6f..5cf7678 100644
--- a/src/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.java
@@ -16,8 +16,8 @@ public class MoveTowardsTargetGoal extends Goal {
     private final double speedModifier;
     private final float within;
     
-    public MoveTowardsTargetGoal(final PathfinderMob alg, final double double2, final float float3) {
-        this.mob = alg;
+    public MoveTowardsTargetGoal(final PathfinderMob apg, final double double2, final float float3) {
+        this.mob = apg;
         this.speedModifier = double2;
         this.within = float3;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
@@ -32,13 +32,13 @@ public class MoveTowardsTargetGoal extends Goal {
         if (this.target.distanceToSqr(this.mob) > this.within * this.within) {
             return false;
         }
-        final Vec3 cvl2 = RandomPos.getPosTowards(this.mob, 16, 7, this.target.position());
-        if (cvl2 == null) {
+        final Vec3 dem2 = RandomPos.getPosTowards(this.mob, 16, 7, this.target.position());
+        if (dem2 == null) {
             return false;
         }
-        this.wantedX = cvl2.x;
-        this.wantedY = cvl2.y;
-        this.wantedZ = cvl2.z;
+        this.wantedX = dem2.x;
+        this.wantedY = dem2.y;
+        this.wantedZ = dem2.z;
         return true;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.java b/src/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.java
index 518c786..51a6594 100644
--- a/src/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.java
@@ -12,19 +12,19 @@ public class OcelotAttackGoal extends Goal {
     private LivingEntity target;
     private int attackTime;
     
-    public OcelotAttackGoal(final Mob ala) {
-        this.mob = ala;
-        this.level = ala.level;
+    public OcelotAttackGoal(final Mob aoz) {
+        this.mob = aoz;
+        this.level = aoz.level;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
     }
     
     @Override
     public boolean canUse() {
-        final LivingEntity akz2 = this.mob.getTarget();
-        if (akz2 == null) {
+        final LivingEntity aoy2 = this.mob.getTarget();
+        if (aoy2 == null) {
             return false;
         }
-        this.target = akz2;
+        this.target = aoy2;
         return true;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.java b/src/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.java
index 5193fbc..c1607f7 100644
--- a/src/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.java
@@ -13,8 +13,8 @@ public class OfferFlowerGoal extends Goal {
     private Villager villager;
     private int tick;
     
-    public OfferFlowerGoal(final IronGolem atl) {
-        this.golem = atl;
+    public OfferFlowerGoal(final IronGolem ayt) {
+        this.golem = ayt;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/OpenDoorGoal.java b/src/net/minecraft/world/entity/ai/goal/OpenDoorGoal.java
index e0bf7bd..4138fa9 100644
--- a/src/net/minecraft/world/entity/ai/goal/OpenDoorGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/OpenDoorGoal.java
@@ -6,9 +6,9 @@ public class OpenDoorGoal extends DoorInteractGoal {
     private final boolean closeDoor;
     private int forgetTime;
     
-    public OpenDoorGoal(final Mob ala, final boolean boolean2) {
-        super(ala);
-        this.mob = ala;
+    public OpenDoorGoal(final Mob aoz, final boolean boolean2) {
+        super(aoz);
+        this.mob = aoz;
         this.closeDoor = boolean2;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/PanicGoal.java b/src/net/minecraft/world/entity/ai/goal/PanicGoal.java
index 81064ca..fb0ec47 100644
--- a/src/net/minecraft/world/entity/ai/goal/PanicGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/PanicGoal.java
@@ -2,6 +2,8 @@ package net.minecraft.world.entity.ai.goal;
 
 import javax.annotation.Nullable;
 import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.ai.util.RandomPos;
@@ -17,9 +19,10 @@ public class PanicGoal extends Goal {
     protected double posX;
     protected double posY;
     protected double posZ;
+    protected boolean isRunning;
     
-    public PanicGoal(final PathfinderMob alg, final double double2) {
-        this.mob = alg;
+    public PanicGoal(final PathfinderMob apg, final double double2) {
+        this.mob = apg;
         this.speedModifier = double2;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
     }
@@ -30,11 +33,11 @@ public class PanicGoal extends Goal {
             return false;
         }
         if (this.mob.isOnFire()) {
-            final BlockPos fk2 = this.lookForWater(this.mob.level, this.mob, 5, 4);
-            if (fk2 != null) {
-                this.posX = fk2.getX();
-                this.posY = fk2.getY();
-                this.posZ = fk2.getZ();
+            final BlockPos fu2 = this.lookForWater(this.mob.level, this.mob, 5, 4);
+            if (fu2 != null) {
+                this.posX = fu2.getX();
+                this.posY = fu2.getY();
+                this.posZ = fu2.getZ();
                 return true;
             }
         }
@@ -42,19 +45,29 @@ public class PanicGoal extends Goal {
     }
     
     protected boolean findRandomPosition() {
-        final Vec3 cvl2 = RandomPos.getPos(this.mob, 5, 4);
-        if (cvl2 == null) {
+        final Vec3 dem2 = RandomPos.getPos(this.mob, 5, 4);
+        if (dem2 == null) {
             return false;
         }
-        this.posX = cvl2.x;
-        this.posY = cvl2.y;
-        this.posZ = cvl2.z;
+        this.posX = dem2.x;
+        this.posY = dem2.y;
+        this.posZ = dem2.z;
         return true;
     }
     
+    public boolean isRunning() {
+        return this.isRunning;
+    }
+    
     @Override
     public void start() {
         this.mob.getNavigation().moveTo(this.posX, this.posY, this.posZ, this.speedModifier);
+        this.isRunning = true;
+    }
+    
+    @Override
+    public void stop() {
+        this.isRunning = false;
     }
     
     @Override
@@ -63,28 +76,28 @@ public class PanicGoal extends Goal {
     }
     
     @Nullable
-    protected BlockPos lookForWater(final BlockGetter bjg, final Entity akq, final int integer3, final int integer4) {
-        final BlockPos fk6 = new BlockPos(akq);
-        final int integer5 = fk6.getX();
-        final int integer6 = fk6.getY();
-        final int integer7 = fk6.getZ();
+    protected BlockPos lookForWater(final BlockGetter bpg, final Entity aom, final int integer3, final int integer4) {
+        final BlockPos fu6 = aom.blockPosition();
+        final int integer5 = fu6.getX();
+        final int integer6 = fu6.getY();
+        final int integer7 = fu6.getZ();
         float float10 = (float)(integer3 * integer3 * integer4 * 2);
-        BlockPos fk7 = null;
+        BlockPos fu7 = null;
         final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos();
         for (int integer8 = integer5 - integer3; integer8 <= integer5 + integer3; ++integer8) {
             for (int integer9 = integer6 - integer4; integer9 <= integer6 + integer4; ++integer9) {
                 for (int integer10 = integer7 - integer3; integer10 <= integer7 + integer3; ++integer10) {
                     a12.set(integer8, integer9, integer10);
-                    if (bjg.getFluidState(a12).is(FluidTags.WATER)) {
+                    if (bpg.getFluidState(a12).is(FluidTags.WATER)) {
                         final float float11 = (float)((integer8 - integer5) * (integer8 - integer5) + (integer9 - integer6) * (integer9 - integer6) + (integer10 - integer7) * (integer10 - integer7));
                         if (float11 < float10) {
                             float10 = float11;
-                            fk7 = new BlockPos(a12);
+                            fu7 = new BlockPos(a12);
                         }
                     }
                 }
             }
         }
-        return fk7;
+        return fu7;
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/PathfindToRaidGoal.java b/src/net/minecraft/world/entity/ai/goal/PathfindToRaidGoal.java
index 6d0b57b..b29be5b 100644
--- a/src/net/minecraft/world/entity/ai/goal/PathfindToRaidGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/PathfindToRaidGoal.java
@@ -3,6 +3,7 @@ package net.minecraft.world.entity.ai.goal;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import net.minecraft.core.BlockPos;
 import java.util.Collection;
 import net.minecraft.world.entity.raid.Raids;
 import com.google.common.collect.Sets;
@@ -11,8 +12,6 @@ import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.ai.util.RandomPos;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import java.util.EnumSet;
 import net.minecraft.world.entity.raid.Raider;
@@ -20,44 +19,44 @@ import net.minecraft.world.entity.raid.Raider;
 public class PathfindToRaidGoal<T extends Raider> extends Goal {
     private final T mob;
     
-    public PathfindToRaidGoal(final T azo) {
-        this.mob = azo;
+    public PathfindToRaidGoal(final T bfi) {
+        this.mob = bfi;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
     }
     
     @Override
     public boolean canUse() {
-        return this.mob.getTarget() == null && !this.mob.isVehicle() && this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && !((ServerLevel)this.mob.level).isVillage(new BlockPos(this.mob));
+        return this.mob.getTarget() == null && !this.mob.isVehicle() && this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && !((ServerLevel)this.mob.level).isVillage(this.mob.blockPosition());
     }
     
     @Override
     public boolean canContinueToUse() {
-        return this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && this.mob.level instanceof ServerLevel && !((ServerLevel)this.mob.level).isVillage(new BlockPos(this.mob));
+        return this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && this.mob.level instanceof ServerLevel && !((ServerLevel)this.mob.level).isVillage(this.mob.blockPosition());
     }
     
     @Override
     public void tick() {
         if (this.mob.hasActiveRaid()) {
-            final Raid azn2 = this.mob.getCurrentRaid();
+            final Raid bfh2 = this.mob.getCurrentRaid();
             if (this.mob.tickCount % 20 == 0) {
-                this.recruitNearby(azn2);
+                this.recruitNearby(bfh2);
             }
             if (!this.mob.isPathFinding()) {
-                final Vec3 cvl3 = RandomPos.getPosTowards(this.mob, 15, 4, new Vec3(azn2.getCenter()));
-                if (cvl3 != null) {
-                    this.mob.getNavigation().moveTo(cvl3.x, cvl3.y, cvl3.z, 1.0);
+                final Vec3 dem3 = RandomPos.getPosTowards(this.mob, 15, 4, Vec3.atBottomCenterOf(bfh2.getCenter()));
+                if (dem3 != null) {
+                    this.mob.getNavigation().moveTo(dem3.x, dem3.y, dem3.z, 1.0);
                 }
             }
         }
     }
     
-    private void recruitNearby(final Raid azn) {
-        if (azn.isActive()) {
+    private void recruitNearby(final Raid bfh) {
+        if (bfh.isActive()) {
             final Set<Raider> set3 = Sets.newHashSet();
-            final List<Raider> list4 = this.mob.level.<Raider>getEntitiesOfClass(Raider.class, this.mob.getBoundingBox().inflate(16.0), azo -> !azo.hasActiveRaid() && Raids.canJoinRaid(azo, azn));
+            final List<Raider> list4 = this.mob.level.<Raider>getEntitiesOfClass(Raider.class, this.mob.getBoundingBox().inflate(16.0), bfi -> !bfi.hasActiveRaid() && Raids.canJoinRaid(bfi, bfh));
             set3.addAll(list4);
-            for (final Raider azo2 : set3) {
-                azn.joinRaid(azn.getGroupsSpawned(), azo2, null, true);
+            for (final Raider bfi2 : set3) {
+                bfh.joinRaid(bfh.getGroupsSpawned(), bfi2, null, true);
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.java b/src/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.java
index 34219e3..ee62f9d 100644
--- a/src/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.java
@@ -9,8 +9,8 @@ public class RandomLookAroundGoal extends Goal {
     private double relZ;
     private int lookTime;
     
-    public RandomLookAroundGoal(final Mob ala) {
-        this.mob = ala;
+    public RandomLookAroundGoal(final Mob aoz) {
+        this.mob = aoz;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java b/src/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java
index 825f1f7..d9adf67 100644
--- a/src/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java
@@ -14,15 +14,21 @@ public class RandomStrollGoal extends Goal {
     protected final double speedModifier;
     protected int interval;
     protected boolean forceTrigger;
+    private boolean checkNoActionTime;
     
-    public RandomStrollGoal(final PathfinderMob alg, final double double2) {
-        this(alg, double2, 120);
+    public RandomStrollGoal(final PathfinderMob apg, final double double2) {
+        this(apg, double2, 120);
     }
     
-    public RandomStrollGoal(final PathfinderMob alg, final double double2, final int integer) {
-        this.mob = alg;
+    public RandomStrollGoal(final PathfinderMob apg, final double double2, final int integer) {
+        this(apg, double2, integer, true);
+    }
+    
+    public RandomStrollGoal(final PathfinderMob apg, final double double2, final int integer, final boolean boolean4) {
+        this.mob = apg;
         this.speedModifier = double2;
         this.interval = integer;
+        this.checkNoActionTime = boolean4;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
     }
     
@@ -32,20 +38,20 @@ public class RandomStrollGoal extends Goal {
             return false;
         }
         if (!this.forceTrigger) {
-            if (this.mob.getNoActionTime() >= 100) {
+            if (this.checkNoActionTime && this.mob.getNoActionTime() >= 100) {
                 return false;
             }
             if (this.mob.getRandom().nextInt(this.interval) != 0) {
                 return false;
             }
         }
-        final Vec3 cvl2 = this.getPosition();
-        if (cvl2 == null) {
+        final Vec3 dem2 = this.getPosition();
+        if (dem2 == null) {
             return false;
         }
-        this.wantedX = cvl2.x;
-        this.wantedY = cvl2.y;
-        this.wantedZ = cvl2.z;
+        this.wantedX = dem2.x;
+        this.wantedY = dem2.y;
+        this.wantedZ = dem2.z;
         this.forceTrigger = false;
         return true;
     }
diff --git a/src/net/minecraft/world/entity/ai/goal/RandomSwimmingGoal.java b/src/net/minecraft/world/entity/ai/goal/RandomSwimmingGoal.java
index 71ee648..96c01c7 100644
--- a/src/net/minecraft/world/entity/ai/goal/RandomSwimmingGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/RandomSwimmingGoal.java
@@ -9,15 +9,15 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.PathfinderMob;
 
 public class RandomSwimmingGoal extends RandomStrollGoal {
-    public RandomSwimmingGoal(final PathfinderMob alg, final double double2, final int integer) {
-        super(alg, double2, integer);
+    public RandomSwimmingGoal(final PathfinderMob apg, final double double2, final int integer) {
+        super(apg, double2, integer);
     }
     
     @Nullable
     @Override
     protected Vec3 getPosition() {
-        Vec3 cvl2 = RandomPos.getPos(this.mob, 10, 7);
-        for (int integer3 = 0; cvl2 != null && !this.mob.level.getBlockState(new BlockPos(cvl2)).isPathfindable(this.mob.level, new BlockPos(cvl2), PathComputationType.WATER) && integer3++ < 10; cvl2 = RandomPos.getPos(this.mob, 10, 7)) {}
-        return cvl2;
+        Vec3 dem2 = RandomPos.getPos(this.mob, 10, 7);
+        for (int integer3 = 0; dem2 != null && !this.mob.level.getBlockState(new BlockPos(dem2)).isPathfindable(this.mob.level, new BlockPos(dem2), PathComputationType.WATER) && integer3++ < 10; dem2 = RandomPos.getPos(this.mob, 10, 7)) {}
+        return dem2;
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/RangedAttackGoal.java b/src/net/minecraft/world/entity/ai/goal/RangedAttackGoal.java
index ea18552..cb65415 100644
--- a/src/net/minecraft/world/entity/ai/goal/RangedAttackGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/RangedAttackGoal.java
@@ -19,17 +19,17 @@ public class RangedAttackGoal extends Goal {
     private final float attackRadius;
     private final float attackRadiusSqr;
     
-    public RangedAttackGoal(final RangedAttackMob axb, final double double2, final int integer, final float float4) {
-        this(axb, double2, integer, integer, float4);
+    public RangedAttackGoal(final RangedAttackMob bcf, final double double2, final int integer, final float float4) {
+        this(bcf, double2, integer, integer, float4);
     }
     
-    public RangedAttackGoal(final RangedAttackMob axb, final double double2, final int integer3, final int integer4, final float float5) {
+    public RangedAttackGoal(final RangedAttackMob bcf, final double double2, final int integer3, final int integer4, final float float5) {
         this.attackTime = -1;
-        if (!(axb instanceof LivingEntity)) {
+        if (!(bcf instanceof LivingEntity)) {
             throw new IllegalArgumentException("ArrowAttackGoal requires Mob implements RangedAttackMob");
         }
-        this.rangedAttackMob = axb;
-        this.mob = (Mob)axb;
+        this.rangedAttackMob = bcf;
+        this.mob = (Mob)bcf;
         this.speedModifier = double2;
         this.attackIntervalMin = integer3;
         this.attackIntervalMax = integer4;
@@ -40,11 +40,11 @@ public class RangedAttackGoal extends Goal {
     
     @Override
     public boolean canUse() {
-        final LivingEntity akz2 = this.mob.getTarget();
-        if (akz2 == null || !akz2.isAlive()) {
+        final LivingEntity aoy2 = this.mob.getTarget();
+        if (aoy2 == null || !aoy2.isAlive()) {
             return false;
         }
-        this.target = akz2;
+        this.target = aoy2;
         return true;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java b/src/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
index 39babc3..940e799 100644
--- a/src/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
@@ -20,10 +20,10 @@ public class RangedBowAttackGoal<T extends Monster> extends Goal {
     private boolean strafingBackwards;
     private int strafingTime;
     
-    public RangedBowAttackGoal(final T aww, final double double2, final int integer, final float float4) {
+    public RangedBowAttackGoal(final T bcb, final double double2, final int integer, final float float4) {
         this.attackTime = -1;
         this.strafingTime = -1;
-        this.mob = aww;
+        this.mob = bcb;
         this.speedModifier = double2;
         this.attackIntervalMin = integer;
         this.attackRadiusSqr = float4 * float4;
@@ -40,7 +40,7 @@ public class RangedBowAttackGoal<T extends Monster> extends Goal {
     }
     
     protected boolean isHoldingBow() {
-        return ((Mob)this.mob).isHolding(Items.BOW);
+        return ((LivingEntity)this.mob).isHolding(Items.BOW);
     }
     
     @Override
@@ -65,12 +65,12 @@ public class RangedBowAttackGoal<T extends Monster> extends Goal {
     
     @Override
     public void tick() {
-        final LivingEntity akz2 = ((Mob)this.mob).getTarget();
-        if (akz2 == null) {
+        final LivingEntity aoy2 = ((Mob)this.mob).getTarget();
+        if (aoy2 == null) {
             return;
         }
-        final double double3 = ((Entity)this.mob).distanceToSqr(akz2.getX(), akz2.getY(), akz2.getZ());
-        final boolean boolean5 = ((Mob)this.mob).getSensing().canSee(akz2);
+        final double double3 = ((Entity)this.mob).distanceToSqr(aoy2.getX(), aoy2.getY(), aoy2.getZ());
+        final boolean boolean5 = ((Mob)this.mob).getSensing().canSee(aoy2);
         final boolean boolean6 = this.seeTime > 0;
         if (boolean5 != boolean6) {
             this.seeTime = 0;
@@ -82,7 +82,7 @@ public class RangedBowAttackGoal<T extends Monster> extends Goal {
             --this.seeTime;
         }
         if (double3 > this.attackRadiusSqr || this.seeTime < 20) {
-            ((Mob)this.mob).getNavigation().moveTo(akz2, this.speedModifier);
+            ((Mob)this.mob).getNavigation().moveTo(aoy2, this.speedModifier);
             this.strafingTime = -1;
         }
         else {
@@ -106,10 +106,10 @@ public class RangedBowAttackGoal<T extends Monster> extends Goal {
                 this.strafingBackwards = true;
             }
             ((Mob)this.mob).getMoveControl().strafe(this.strafingBackwards ? -0.5f : 0.5f, this.strafingClockwise ? 0.5f : -0.5f);
-            ((Mob)this.mob).lookAt(akz2, 30.0f, 30.0f);
+            ((Mob)this.mob).lookAt(aoy2, 30.0f, 30.0f);
         }
         else {
-            ((Mob)this.mob).getLookControl().setLookAt(akz2, 30.0f, 30.0f);
+            ((Mob)this.mob).getLookControl().setLookAt(aoy2, 30.0f, 30.0f);
         }
         if (((LivingEntity)this.mob).isUsingItem()) {
             if (!boolean5 && this.seeTime < -60) {
@@ -119,7 +119,7 @@ public class RangedBowAttackGoal<T extends Monster> extends Goal {
                 final int integer7 = ((LivingEntity)this.mob).getTicksUsingItem();
                 if (integer7 >= 20) {
                     ((LivingEntity)this.mob).stopUsingItem();
-                    ((RangedAttackMob)this.mob).performRangedAttack(akz2, BowItem.getPowerForTime(integer7));
+                    ((RangedAttackMob)this.mob).performRangedAttack(aoy2, BowItem.getPowerForTime(integer7));
                     this.attackTime = this.attackIntervalMin;
                 }
             }
diff --git a/src/net/minecraft/world/entity/ai/goal/RangedCrossbowAttackGoal.java b/src/net/minecraft/world/entity/ai/goal/RangedCrossbowAttackGoal.java
index b34b5d1..57a4b69 100644
--- a/src/net/minecraft/world/entity/ai/goal/RangedCrossbowAttackGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/RangedCrossbowAttackGoal.java
@@ -10,18 +10,21 @@ import net.minecraft.world.entity.monster.CrossbowAttackMob;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.Items;
 import java.util.EnumSet;
+import net.minecraft.util.IntRange;
 
 public class RangedCrossbowAttackGoal<T extends Monster> extends Goal {
+    public static final IntRange PATHFINDING_DELAY_RANGE;
     private final T mob;
     private CrossbowState crossbowState;
     private final double speedModifier;
     private final float attackRadiusSqr;
     private int seeTime;
     private int attackDelay;
+    private int updatePathDelay;
     
-    public RangedCrossbowAttackGoal(final T aww, final double double2, final float float3) {
+    public RangedCrossbowAttackGoal(final T bcb, final double double2, final float float3) {
         this.crossbowState = CrossbowState.UNCHARGED;
-        this.mob = aww;
+        this.mob = bcb;
         this.speedModifier = double2;
         this.attackRadiusSqr = float3 * float3;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
@@ -33,7 +36,7 @@ public class RangedCrossbowAttackGoal<T extends Monster> extends Goal {
     }
     
     private boolean isHoldingCrossbow() {
-        return ((Mob)this.mob).isHolding(Items.CROSSBOW);
+        return ((LivingEntity)this.mob).isHolding(Items.CROSSBOW);
     }
     
     @Override
@@ -60,11 +63,11 @@ public class RangedCrossbowAttackGoal<T extends Monster> extends Goal {
     
     @Override
     public void tick() {
-        final LivingEntity akz2 = ((Mob)this.mob).getTarget();
-        if (akz2 == null) {
+        final LivingEntity aoy2 = ((Mob)this.mob).getTarget();
+        if (aoy2 == null) {
             return;
         }
-        final boolean boolean3 = ((Mob)this.mob).getSensing().canSee(akz2);
+        final boolean boolean3 = ((Mob)this.mob).getSensing().canSee(aoy2);
         final boolean boolean4 = this.seeTime > 0;
         if (boolean3 != boolean4) {
             this.seeTime = 0;
@@ -75,15 +78,20 @@ public class RangedCrossbowAttackGoal<T extends Monster> extends Goal {
         else {
             --this.seeTime;
         }
-        final double double5 = ((Entity)this.mob).distanceToSqr(akz2);
+        final double double5 = ((Entity)this.mob).distanceToSqr(aoy2);
         final boolean boolean5 = (double5 > this.attackRadiusSqr || this.seeTime < 5) && this.attackDelay == 0;
         if (boolean5) {
-            ((Mob)this.mob).getNavigation().moveTo(akz2, this.canRun() ? this.speedModifier : (this.speedModifier * 0.5));
+            --this.updatePathDelay;
+            if (this.updatePathDelay <= 0) {
+                ((Mob)this.mob).getNavigation().moveTo(aoy2, this.canRun() ? this.speedModifier : (this.speedModifier * 0.5));
+                this.updatePathDelay = RangedCrossbowAttackGoal.PATHFINDING_DELAY_RANGE.randomValue(((LivingEntity)this.mob).getRandom());
+            }
         }
         else {
+            this.updatePathDelay = 0;
             ((Mob)this.mob).getNavigation().stop();
         }
-        ((Mob)this.mob).getLookControl().setLookAt(akz2, 30.0f, 30.0f);
+        ((Mob)this.mob).getLookControl().setLookAt(aoy2, 30.0f, 30.0f);
         if (this.crossbowState == CrossbowState.UNCHARGED) {
             if (!boolean5) {
                 ((LivingEntity)this.mob).startUsingItem(ProjectileUtil.getWeaponHoldingHand((LivingEntity)this.mob, Items.CROSSBOW));
@@ -96,8 +104,8 @@ public class RangedCrossbowAttackGoal<T extends Monster> extends Goal {
                 this.crossbowState = CrossbowState.UNCHARGED;
             }
             final int integer8 = ((LivingEntity)this.mob).getTicksUsingItem();
-            final ItemStack ben9 = ((LivingEntity)this.mob).getUseItem();
-            if (integer8 >= CrossbowItem.getChargeDuration(ben9)) {
+            final ItemStack bki9 = ((LivingEntity)this.mob).getUseItem();
+            if (integer8 >= CrossbowItem.getChargeDuration(bki9)) {
                 ((LivingEntity)this.mob).releaseUsingItem();
                 this.crossbowState = CrossbowState.CHARGED;
                 this.attackDelay = 20 + ((LivingEntity)this.mob).getRandom().nextInt(20);
@@ -111,9 +119,9 @@ public class RangedCrossbowAttackGoal<T extends Monster> extends Goal {
             }
         }
         else if (this.crossbowState == CrossbowState.READY_TO_ATTACK && boolean3) {
-            ((RangedAttackMob)this.mob).performRangedAttack(akz2, 1.0f);
-            final ItemStack ben10 = ((LivingEntity)this.mob).getItemInHand(ProjectileUtil.getWeaponHoldingHand((LivingEntity)this.mob, Items.CROSSBOW));
-            CrossbowItem.setCharged(ben10, false);
+            ((RangedAttackMob)this.mob).performRangedAttack(aoy2, 1.0f);
+            final ItemStack bki10 = ((LivingEntity)this.mob).getItemInHand(ProjectileUtil.getWeaponHoldingHand((LivingEntity)this.mob, Items.CROSSBOW));
+            CrossbowItem.setCharged(bki10, false);
             this.crossbowState = CrossbowState.UNCHARGED;
         }
     }
@@ -122,6 +130,10 @@ public class RangedCrossbowAttackGoal<T extends Monster> extends Goal {
         return this.crossbowState == CrossbowState.UNCHARGED;
     }
     
+    static {
+        PATHFINDING_DELAY_RANGE = new IntRange(20, 40);
+    }
+    
     enum CrossbowState {
         UNCHARGED, 
         CHARGING, 
diff --git a/src/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java b/src/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
index 341187e..7c1f368 100644
--- a/src/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
@@ -13,7 +13,6 @@ import net.minecraft.world.item.Items;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
@@ -28,10 +27,10 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
     private final Mob removerMob;
     private int ticksSinceReachedGoal;
     
-    public RemoveBlockGoal(final Block bph, final PathfinderMob alg, final double double3, final int integer) {
-        super(alg, double3, 24, integer);
-        this.blockToRemove = bph;
-        this.removerMob = alg;
+    public RemoveBlockGoal(final Block bvr, final PathfinderMob apg, final double double3, final int integer) {
+        super(apg, double3, 24, integer);
+        this.blockToRemove = bvr;
+        this.removerMob = apg;
     }
     
     @Override
@@ -67,45 +66,45 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
         this.ticksSinceReachedGoal = 0;
     }
     
-    public void playDestroyProgressSound(final LevelAccessor bjx, final BlockPos fk) {
+    public void playDestroyProgressSound(final LevelAccessor bqc, final BlockPos fu) {
     }
     
-    public void playBreakSound(final Level bjw, final BlockPos fk) {
+    public void playBreakSound(final Level bqb, final BlockPos fu) {
     }
     
     @Override
     public void tick() {
         super.tick();
-        final Level bjw2 = this.removerMob.level;
-        final BlockPos fk3 = new BlockPos(this.removerMob);
-        final BlockPos fk4 = this.getPosWithBlock(fk3, bjw2);
+        final Level bqb2 = this.removerMob.level;
+        final BlockPos fu3 = this.removerMob.blockPosition();
+        final BlockPos fu4 = this.getPosWithBlock(fu3, bqb2);
         final Random random5 = this.removerMob.getRandom();
-        if (this.isReachedTarget() && fk4 != null) {
+        if (this.isReachedTarget() && fu4 != null) {
             if (this.ticksSinceReachedGoal > 0) {
-                final Vec3 cvl6 = this.removerMob.getDeltaMovement();
-                this.removerMob.setDeltaMovement(cvl6.x, 0.3, cvl6.z);
-                if (!bjw2.isClientSide) {
+                final Vec3 dem6 = this.removerMob.getDeltaMovement();
+                this.removerMob.setDeltaMovement(dem6.x, 0.3, dem6.z);
+                if (!bqb2.isClientSide) {
                     final double double7 = 0.08;
-                    ((ServerLevel)bjw2).<ItemParticleOption>sendParticles(new ItemParticleOption(ParticleTypes.ITEM, new ItemStack(Items.EGG)), fk4.getX() + 0.5, fk4.getY() + 0.7, fk4.getZ() + 0.5, 3, (random5.nextFloat() - 0.5) * 0.08, (random5.nextFloat() - 0.5) * 0.08, (random5.nextFloat() - 0.5) * 0.08, 0.15000000596046448);
+                    ((ServerLevel)bqb2).<ItemParticleOption>sendParticles(new ItemParticleOption(ParticleTypes.ITEM, new ItemStack(Items.EGG)), fu4.getX() + 0.5, fu4.getY() + 0.7, fu4.getZ() + 0.5, 3, (random5.nextFloat() - 0.5) * 0.08, (random5.nextFloat() - 0.5) * 0.08, (random5.nextFloat() - 0.5) * 0.08, 0.15000000596046448);
                 }
             }
             if (this.ticksSinceReachedGoal % 2 == 0) {
-                final Vec3 cvl6 = this.removerMob.getDeltaMovement();
-                this.removerMob.setDeltaMovement(cvl6.x, -0.3, cvl6.z);
+                final Vec3 dem6 = this.removerMob.getDeltaMovement();
+                this.removerMob.setDeltaMovement(dem6.x, -0.3, dem6.z);
                 if (this.ticksSinceReachedGoal % 6 == 0) {
-                    this.playDestroyProgressSound(bjw2, this.blockPos);
+                    this.playDestroyProgressSound(bqb2, this.blockPos);
                 }
             }
             if (this.ticksSinceReachedGoal > 60) {
-                bjw2.removeBlock(fk4, false);
-                if (!bjw2.isClientSide) {
+                bqb2.removeBlock(fu4, false);
+                if (!bqb2.isClientSide) {
                     for (int integer6 = 0; integer6 < 20; ++integer6) {
                         final double double7 = random5.nextGaussian() * 0.02;
                         final double double8 = random5.nextGaussian() * 0.02;
                         final double double9 = random5.nextGaussian() * 0.02;
-                        ((ServerLevel)bjw2).<SimpleParticleType>sendParticles(ParticleTypes.POOF, fk4.getX() + 0.5, fk4.getY(), fk4.getZ() + 0.5, 1, double7, double8, double9, 0.15000000596046448);
+                        ((ServerLevel)bqb2).<SimpleParticleType>sendParticles(ParticleTypes.POOF, fu4.getX() + 0.5, fu4.getY(), fu4.getZ() + 0.5, 1, double7, double8, double9, 0.15000000596046448);
                     }
-                    this.playBreakSound(bjw2, fk4);
+                    this.playBreakSound(bqb2, fu4);
                 }
             }
             ++this.ticksSinceReachedGoal;
@@ -113,23 +112,23 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
     }
     
     @Nullable
-    private BlockPos getPosWithBlock(final BlockPos fk, final BlockGetter bjg) {
-        if (bjg.getBlockState(fk).getBlock() == this.blockToRemove) {
-            return fk;
+    private BlockPos getPosWithBlock(final BlockPos fu, final BlockGetter bpg) {
+        if (bpg.getBlockState(fu).is(this.blockToRemove)) {
+            return fu;
         }
         final BlockPos[] array;
-        final BlockPos[] arr4 = array = new BlockPos[] { fk.below(), fk.west(), fk.east(), fk.north(), fk.south(), fk.below().below() };
-        for (final BlockPos fk2 : array) {
-            if (bjg.getBlockState(fk2).getBlock() == this.blockToRemove) {
-                return fk2;
+        final BlockPos[] arr4 = array = new BlockPos[] { fu.below(), fu.west(), fu.east(), fu.north(), fu.south(), fu.below().below() };
+        for (final BlockPos fu2 : array) {
+            if (bpg.getBlockState(fu2).is(this.blockToRemove)) {
+                return fu2;
             }
         }
         return null;
     }
     
     @Override
-    protected boolean isValidTarget(final LevelReader bjz, final BlockPos fk) {
-        final ChunkAccess bzy4 = bjz.getChunk(fk.getX() >> 4, fk.getZ() >> 4, ChunkStatus.FULL, false);
-        return bzy4 != null && bzy4.getBlockState(fk).getBlock() == this.blockToRemove && bzy4.getBlockState(fk.above()).isAir() && bzy4.getBlockState(fk.above(2)).isAir();
+    protected boolean isValidTarget(final LevelReader bqd, final BlockPos fu) {
+        final ChunkAccess cgy4 = bqd.getChunk(fu.getX() >> 4, fu.getZ() >> 4, ChunkStatus.FULL, false);
+        return cgy4 != null && cgy4.getBlockState(fu).is(this.blockToRemove) && cgy4.getBlockState(fu.above()).isAir() && cgy4.getBlockState(fu.above(2)).isAir();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/RestrictSunGoal.java b/src/net/minecraft/world/entity/ai/goal/RestrictSunGoal.java
index 1a772ac..eea1963 100644
--- a/src/net/minecraft/world/entity/ai/goal/RestrictSunGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/RestrictSunGoal.java
@@ -7,8 +7,8 @@ import net.minecraft.world.entity.PathfinderMob;
 public class RestrictSunGoal extends Goal {
     private final PathfinderMob mob;
     
-    public RestrictSunGoal(final PathfinderMob alg) {
-        this.mob = alg;
+    public RestrictSunGoal(final PathfinderMob apg) {
+        this.mob = apg;
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java b/src/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
index 08dd5a6..c0aa875 100644
--- a/src/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
@@ -15,8 +15,8 @@ public class RunAroundLikeCrazyGoal extends Goal {
     private double posY;
     private double posZ;
     
-    public RunAroundLikeCrazyGoal(final AbstractHorse aue, final double double2) {
-        this.horse = aue;
+    public RunAroundLikeCrazyGoal(final AbstractHorse azm, final double double2) {
+        this.horse = azm;
         this.speedModifier = double2;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
     }
@@ -26,13 +26,13 @@ public class RunAroundLikeCrazyGoal extends Goal {
         if (this.horse.isTamed() || !this.horse.isVehicle()) {
             return false;
         }
-        final Vec3 cvl2 = RandomPos.getPos(this.horse, 5, 4);
-        if (cvl2 == null) {
+        final Vec3 dem2 = RandomPos.getPos(this.horse, 5, 4);
+        if (dem2 == null) {
             return false;
         }
-        this.posX = cvl2.x;
-        this.posY = cvl2.y;
-        this.posZ = cvl2.z;
+        this.posX = dem2.x;
+        this.posY = dem2.y;
+        this.posZ = dem2.z;
         return true;
     }
     
@@ -49,15 +49,15 @@ public class RunAroundLikeCrazyGoal extends Goal {
     @Override
     public void tick() {
         if (!this.horse.isTamed() && this.horse.getRandom().nextInt(50) == 0) {
-            final Entity akq2 = this.horse.getPassengers().get(0);
-            if (akq2 == null) {
+            final Entity aom2 = this.horse.getPassengers().get(0);
+            if (aom2 == null) {
                 return;
             }
-            if (akq2 instanceof Player) {
+            if (aom2 instanceof Player) {
                 final int integer3 = this.horse.getTemper();
                 final int integer4 = this.horse.getMaxTemper();
                 if (integer4 > 0 && this.horse.getRandom().nextInt(integer4) < integer3) {
-                    this.horse.tameWithName((Player)akq2);
+                    this.horse.tameWithName((Player)aom2);
                     return;
                 }
                 this.horse.modifyTemper(5);
diff --git a/src/net/minecraft/world/entity/ai/goal/SitGoal.java b/src/net/minecraft/world/entity/ai/goal/SitWhenOrderedToGoal.java
similarity index 58%
rename from src/net/minecraft/world/entity/ai/goal/SitGoal.java
rename to src/net/minecraft/world/entity/ai/goal/SitWhenOrderedToGoal.java
index 6fd0a70..662b3a6 100644
--- a/src/net/minecraft/world/entity/ai/goal/SitGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/SitWhenOrderedToGoal.java
@@ -5,18 +5,17 @@ import net.minecraft.world.entity.Entity;
 import java.util.EnumSet;
 import net.minecraft.world.entity.TamableAnimal;
 
-public class SitGoal extends Goal {
+public class SitWhenOrderedToGoal extends Goal {
     private final TamableAnimal mob;
-    private boolean wantToSit;
     
-    public SitGoal(final TamableAnimal alo) {
-        this.mob = alo;
+    public SitWhenOrderedToGoal(final TamableAnimal apq) {
+        this.mob = apq;
         this.setFlags(EnumSet.<Flag>of(Flag.JUMP, Flag.MOVE));
     }
     
     @Override
     public boolean canContinueToUse() {
-        return this.wantToSit;
+        return this.mob.isOrderedToSit();
     }
     
     @Override
@@ -27,25 +26,21 @@ public class SitGoal extends Goal {
         if (this.mob.isInWaterOrBubble()) {
             return false;
         }
-        if (!this.mob.onGround) {
+        if (!this.mob.isOnGround()) {
             return false;
         }
-        final LivingEntity akz2 = this.mob.getOwner();
-        return akz2 == null || ((this.mob.distanceToSqr(akz2) >= 144.0 || akz2.getLastHurtByMob() == null) && this.wantToSit);
+        final LivingEntity aoy2 = this.mob.getOwner();
+        return aoy2 == null || ((this.mob.distanceToSqr(aoy2) >= 144.0 || aoy2.getLastHurtByMob() == null) && this.mob.isOrderedToSit());
     }
     
     @Override
     public void start() {
         this.mob.getNavigation().stop();
-        this.mob.setSitting(true);
+        this.mob.setInSittingPose(true);
     }
     
     @Override
     public void stop() {
-        this.mob.setSitting(false);
-    }
-    
-    public void wantToSit(final boolean boolean1) {
-        this.wantToSit = boolean1;
+        this.mob.setInSittingPose(false);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/StrollThroughVillageGoal.java b/src/net/minecraft/world/entity/ai/goal/StrollThroughVillageGoal.java
index ef8b73d..2c7cee0 100644
--- a/src/net/minecraft/world/entity/ai/goal/StrollThroughVillageGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/StrollThroughVillageGoal.java
@@ -8,7 +8,6 @@ import net.minecraft.core.Position;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.ai.util.RandomPos;
 import net.minecraft.core.SectionPos;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.server.level.ServerLevel;
 import java.util.EnumSet;
 import javax.annotation.Nullable;
@@ -21,8 +20,8 @@ public class StrollThroughVillageGoal extends Goal {
     @Nullable
     private BlockPos wantedPos;
     
-    public StrollThroughVillageGoal(final PathfinderMob alg, final int integer) {
-        this.mob = alg;
+    public StrollThroughVillageGoal(final PathfinderMob apg, final int integer) {
+        this.mob = apg;
         this.interval = integer;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
     }
@@ -38,13 +37,13 @@ public class StrollThroughVillageGoal extends Goal {
         if (this.mob.getRandom().nextInt(this.interval) != 0) {
             return false;
         }
-        final ServerLevel xd2 = (ServerLevel)this.mob.level;
-        final BlockPos fk2 = new BlockPos(this.mob);
-        if (!xd2.closeToVillage(fk2, 6)) {
+        final ServerLevel zd2 = (ServerLevel)this.mob.level;
+        final BlockPos fu2 = this.mob.blockPosition();
+        if (!zd2.isCloseToVillage(fu2, 6)) {
             return false;
         }
-        final Vec3 cvl4 = RandomPos.getLandPos(this.mob, 15, 7, fk -> -xd2.sectionsToVillage(SectionPos.of(fk)));
-        this.wantedPos = ((cvl4 == null) ? null : new BlockPos(cvl4));
+        final Vec3 dem4 = RandomPos.getLandPos(this.mob, 15, 7, fu -> -zd2.sectionsToVillage(SectionPos.of(fu)));
+        this.wantedPos = ((dem4 == null) ? null : new BlockPos(dem4));
         return this.wantedPos != null;
     }
     
@@ -58,16 +57,16 @@ public class StrollThroughVillageGoal extends Goal {
         if (this.wantedPos == null) {
             return;
         }
-        final PathNavigation arr2 = this.mob.getNavigation();
-        if (arr2.isDone() && !this.wantedPos.closerThan(this.mob.position(), 10.0)) {
-            Vec3 cvl3 = new Vec3(this.wantedPos);
-            final Vec3 cvl4 = this.mob.position();
-            final Vec3 cvl5 = cvl4.subtract(cvl3);
-            cvl3 = cvl5.scale(0.4).add(cvl3);
-            final Vec3 cvl6 = cvl3.subtract(cvl4).normalize().scale(10.0).add(cvl4);
-            BlockPos fk7 = new BlockPos(cvl6);
-            fk7 = this.mob.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, fk7);
-            if (!arr2.moveTo(fk7.getX(), fk7.getY(), fk7.getZ(), 1.0)) {
+        final PathNavigation awv2 = this.mob.getNavigation();
+        if (awv2.isDone() && !this.wantedPos.closerThan(this.mob.position(), 10.0)) {
+            Vec3 dem3 = Vec3.atBottomCenterOf(this.wantedPos);
+            final Vec3 dem4 = this.mob.position();
+            final Vec3 dem5 = dem4.subtract(dem3);
+            dem3 = dem5.scale(0.4).add(dem3);
+            final Vec3 dem6 = dem3.subtract(dem4).normalize().scale(10.0).add(dem4);
+            BlockPos fu7 = new BlockPos(dem6);
+            fu7 = this.mob.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, fu7);
+            if (!awv2.moveTo(fu7.getX(), fu7.getY(), fu7.getZ(), 1.0)) {
                 this.moveRandomly();
             }
         }
@@ -75,7 +74,7 @@ public class StrollThroughVillageGoal extends Goal {
     
     private void moveRandomly() {
         final Random random2 = this.mob.getRandom();
-        final BlockPos fk3 = this.mob.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, new BlockPos(this.mob).offset(-8 + random2.nextInt(16), 0, -8 + random2.nextInt(16)));
-        this.mob.getNavigation().moveTo(fk3.getX(), fk3.getY(), fk3.getZ(), 1.0);
+        final BlockPos fu3 = this.mob.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.mob.blockPosition().offset(-8 + random2.nextInt(16), 0, -8 + random2.nextInt(16)));
+        this.mob.getNavigation().moveTo(fu3.getX(), fu3.getY(), fu3.getZ(), 1.0);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/SwellGoal.java b/src/net/minecraft/world/entity/ai/goal/SwellGoal.java
index cb4fbea..7933154 100644
--- a/src/net/minecraft/world/entity/ai/goal/SwellGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/SwellGoal.java
@@ -9,15 +9,15 @@ public class SwellGoal extends Goal {
     private final Creeper creeper;
     private LivingEntity target;
     
-    public SwellGoal(final Creeper awi) {
-        this.creeper = awi;
+    public SwellGoal(final Creeper bbn) {
+        this.creeper = bbn;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
     }
     
     @Override
     public boolean canUse() {
-        final LivingEntity akz2 = this.creeper.getTarget();
-        return this.creeper.getSwellDir() > 0 || (akz2 != null && this.creeper.distanceToSqr(akz2) < 9.0);
+        final LivingEntity aoy2 = this.creeper.getTarget();
+        return this.creeper.getSwellDir() > 0 || (aoy2 != null && this.creeper.distanceToSqr(aoy2) < 9.0);
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/ai/goal/TemptGoal.java b/src/net/minecraft/world/entity/ai/goal/TemptGoal.java
index e745793..557c92e 100644
--- a/src/net/minecraft/world/entity/ai/goal/TemptGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/TemptGoal.java
@@ -26,17 +26,17 @@ public class TemptGoal extends Goal {
     private final Ingredient items;
     private final boolean canScare;
     
-    public TemptGoal(final PathfinderMob alg, final double double2, final Ingredient bgt, final boolean boolean4) {
-        this(alg, double2, boolean4, bgt);
+    public TemptGoal(final PathfinderMob apg, final double double2, final Ingredient bmr, final boolean boolean4) {
+        this(apg, double2, boolean4, bmr);
     }
     
-    public TemptGoal(final PathfinderMob alg, final double double2, final boolean boolean3, final Ingredient bgt) {
-        this.mob = alg;
+    public TemptGoal(final PathfinderMob apg, final double double2, final boolean boolean3, final Ingredient bmr) {
+        this.mob = apg;
         this.speedModifier = double2;
-        this.items = bgt;
+        this.items = bmr;
         this.canScare = boolean3;
         this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
-        if (!(alg.getNavigation() instanceof GroundPathNavigation) && !(alg.getNavigation() instanceof FlyingPathNavigation)) {
+        if (!(apg.getNavigation() instanceof GroundPathNavigation) && !(apg.getNavigation() instanceof FlyingPathNavigation)) {
             throw new IllegalArgumentException("Unsupported mob type for TemptGoal");
         }
     }
@@ -51,8 +51,8 @@ public class TemptGoal extends Goal {
         return this.player != null && (this.shouldFollowItem(this.player.getMainHandItem()) || this.shouldFollowItem(this.player.getOffhandItem()));
     }
     
-    protected boolean shouldFollowItem(final ItemStack ben) {
-        return this.items.test(ben);
+    protected boolean shouldFollowItem(final ItemStack bki) {
+        return this.items.test(bki);
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.java b/src/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.java
index fb70cce..ed18a99 100644
--- a/src/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.java
@@ -8,8 +8,8 @@ import net.minecraft.world.entity.npc.AbstractVillager;
 public class TradeWithPlayerGoal extends Goal {
     private final AbstractVillager mob;
     
-    public TradeWithPlayerGoal(final AbstractVillager axs) {
-        this.mob = axs;
+    public TradeWithPlayerGoal(final AbstractVillager bdk) {
+        this.mob = bdk;
         this.setFlags(EnumSet.<Flag>of(Flag.JUMP, Flag.MOVE));
     }
     
@@ -21,14 +21,14 @@ public class TradeWithPlayerGoal extends Goal {
         if (this.mob.isInWater()) {
             return false;
         }
-        if (!this.mob.onGround) {
+        if (!this.mob.isOnGround()) {
             return false;
         }
         if (this.mob.hurtMarked) {
             return false;
         }
-        final Player ayj2 = this.mob.getTradingPlayer();
-        return ayj2 != null && this.mob.distanceToSqr(ayj2) <= 16.0 && ayj2.containerMenu != null;
+        final Player bec2 = this.mob.getTradingPlayer();
+        return bec2 != null && this.mob.distanceToSqr(bec2) <= 16.0 && bec2.containerMenu != null;
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/ai/goal/TryFindWaterGoal.java b/src/net/minecraft/world/entity/ai/goal/TryFindWaterGoal.java
index 6a4d613..05b51c3 100644
--- a/src/net/minecraft/world/entity/ai/goal/TryFindWaterGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/TryFindWaterGoal.java
@@ -1,36 +1,37 @@
 package net.minecraft.world.entity.ai.goal;
 
 import java.util.Iterator;
-import net.minecraft.util.Mth;
-import net.minecraft.tags.FluidTags;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.FluidTags;
 import net.minecraft.world.entity.PathfinderMob;
 
 public class TryFindWaterGoal extends Goal {
     private final PathfinderMob mob;
     
-    public TryFindWaterGoal(final PathfinderMob alg) {
-        this.mob = alg;
+    public TryFindWaterGoal(final PathfinderMob apg) {
+        this.mob = apg;
     }
     
     @Override
     public boolean canUse() {
-        return this.mob.onGround && !this.mob.level.getFluidState(new BlockPos(this.mob)).is(FluidTags.WATER);
+        return this.mob.isOnGround() && !this.mob.level.getFluidState(this.mob.blockPosition()).is(FluidTags.WATER);
     }
     
     @Override
     public void start() {
-        BlockPos fk2 = null;
+        BlockPos fu2 = null;
         final Iterable<BlockPos> iterable3 = BlockPos.betweenClosed(Mth.floor(this.mob.getX() - 2.0), Mth.floor(this.mob.getY() - 2.0), Mth.floor(this.mob.getZ() - 2.0), Mth.floor(this.mob.getX() + 2.0), Mth.floor(this.mob.getY()), Mth.floor(this.mob.getZ() + 2.0));
-        for (final BlockPos fk3 : iterable3) {
-            if (this.mob.level.getFluidState(fk3).is(FluidTags.WATER)) {
-                fk2 = fk3;
+        for (final BlockPos fu3 : iterable3) {
+            if (this.mob.level.getFluidState(fu3).is(FluidTags.WATER)) {
+                fu2 = fu3;
                 break;
             }
         }
-        if (fk2 != null) {
-            this.mob.getMoveControl().setWantedPosition(fk2.getX(), fk2.getY(), fk2.getZ(), 1.0);
+        if (fu2 != null) {
+            this.mob.getMoveControl().setWantedPosition(fu2.getX(), fu2.getY(), fu2.getZ(), 1.0);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/UseItemGoal.java b/src/net/minecraft/world/entity/ai/goal/UseItemGoal.java
index 217d20c..09e6396 100644
--- a/src/net/minecraft/world/entity/ai/goal/UseItemGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/UseItemGoal.java
@@ -14,10 +14,10 @@ public class UseItemGoal<T extends Mob> extends Goal {
     private final Predicate<? super T> canUseSelector;
     private final SoundEvent finishUsingSound;
     
-    public UseItemGoal(final T ala, final ItemStack ben, @Nullable final SoundEvent aah, final Predicate<? super T> predicate) {
-        this.mob = ala;
-        this.item = ben;
-        this.finishUsingSound = aah;
+    public UseItemGoal(final T aoz, final ItemStack bki, @Nullable final SoundEvent ack, final Predicate<? super T> predicate) {
+        this.mob = aoz;
+        this.item = bki;
+        this.finishUsingSound = ack;
         this.canUseSelector = predicate;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/WaterAvoidingRandomFlyingGoal.java b/src/net/minecraft/world/entity/ai/goal/WaterAvoidingRandomFlyingGoal.java
index 701361f..417f378 100644
--- a/src/net/minecraft/world/entity/ai/goal/WaterAvoidingRandomFlyingGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/WaterAvoidingRandomFlyingGoal.java
@@ -1,13 +1,13 @@
 package net.minecraft.world.entity.ai.goal;
 
-import net.minecraft.world.level.block.Block;
 import java.util.Iterator;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.LeavesBlock;
-import net.minecraft.core.Direction;
 import net.minecraft.core.Vec3i;
+import net.minecraft.core.Direction;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.ai.util.RandomPos;
@@ -15,37 +15,37 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.PathfinderMob;
 
 public class WaterAvoidingRandomFlyingGoal extends WaterAvoidingRandomStrollGoal {
-    public WaterAvoidingRandomFlyingGoal(final PathfinderMob alg, final double double2) {
-        super(alg, double2);
+    public WaterAvoidingRandomFlyingGoal(final PathfinderMob apg, final double double2) {
+        super(apg, double2);
     }
     
     @Nullable
     @Override
     protected Vec3 getPosition() {
-        Vec3 cvl2 = null;
+        Vec3 dem2 = null;
         if (this.mob.isInWater()) {
-            cvl2 = RandomPos.getLandPos(this.mob, 15, 15);
+            dem2 = RandomPos.getLandPos(this.mob, 15, 15);
         }
         if (this.mob.getRandom().nextFloat() >= this.probability) {
-            cvl2 = this.getTreePos();
+            dem2 = this.getTreePos();
         }
-        return (cvl2 == null) ? super.getPosition() : cvl2;
+        return (dem2 == null) ? super.getPosition() : dem2;
     }
     
     @Nullable
     private Vec3 getTreePos() {
-        final BlockPos fk2 = new BlockPos(this.mob);
+        final BlockPos fu2 = this.mob.blockPosition();
         final BlockPos.MutableBlockPos a3 = new BlockPos.MutableBlockPos();
         final BlockPos.MutableBlockPos a4 = new BlockPos.MutableBlockPos();
         final Iterable<BlockPos> iterable5 = BlockPos.betweenClosed(Mth.floor(this.mob.getX() - 3.0), Mth.floor(this.mob.getY() - 6.0), Mth.floor(this.mob.getZ() - 3.0), Mth.floor(this.mob.getX() + 3.0), Mth.floor(this.mob.getY() + 6.0), Mth.floor(this.mob.getZ() + 3.0));
-        for (final BlockPos fk3 : iterable5) {
-            if (fk2.equals(fk3)) {
+        for (final BlockPos fu3 : iterable5) {
+            if (fu2.equals(fu3)) {
                 continue;
             }
-            final Block bph8 = this.mob.level.getBlockState(a4.set(fk3).move(Direction.DOWN)).getBlock();
-            final boolean boolean9 = bph8 instanceof LeavesBlock || bph8.is(BlockTags.LOGS);
-            if (boolean9 && this.mob.level.isEmptyBlock(fk3) && this.mob.level.isEmptyBlock(a3.set(fk3).move(Direction.UP))) {
-                return new Vec3(fk3);
+            final Block bvr8 = this.mob.level.getBlockState(a4.setWithOffset(fu3, Direction.DOWN)).getBlock();
+            final boolean boolean9 = bvr8 instanceof LeavesBlock || bvr8.is(BlockTags.LOGS);
+            if (boolean9 && this.mob.level.isEmptyBlock(fu3) && this.mob.level.isEmptyBlock(a3.setWithOffset(fu3, Direction.UP))) {
+                return Vec3.atBottomCenterOf(fu3);
             }
         }
         return null;
diff --git a/src/net/minecraft/world/entity/ai/goal/WaterAvoidingRandomStrollGoal.java b/src/net/minecraft/world/entity/ai/goal/WaterAvoidingRandomStrollGoal.java
index cedb33c..c56c170 100644
--- a/src/net/minecraft/world/entity/ai/goal/WaterAvoidingRandomStrollGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/WaterAvoidingRandomStrollGoal.java
@@ -8,12 +8,12 @@ import net.minecraft.world.entity.PathfinderMob;
 public class WaterAvoidingRandomStrollGoal extends RandomStrollGoal {
     protected final float probability;
     
-    public WaterAvoidingRandomStrollGoal(final PathfinderMob alg, final double double2) {
-        this(alg, double2, 0.001f);
+    public WaterAvoidingRandomStrollGoal(final PathfinderMob apg, final double double2) {
+        this(apg, double2, 0.001f);
     }
     
-    public WaterAvoidingRandomStrollGoal(final PathfinderMob alg, final double double2, final float float3) {
-        super(alg, double2);
+    public WaterAvoidingRandomStrollGoal(final PathfinderMob apg, final double double2, final float float3) {
+        super(apg, double2);
         this.probability = float3;
     }
     
@@ -21,8 +21,8 @@ public class WaterAvoidingRandomStrollGoal extends RandomStrollGoal {
     @Override
     protected Vec3 getPosition() {
         if (this.mob.isInWaterOrBubble()) {
-            final Vec3 cvl2 = RandomPos.getLandPos(this.mob, 15, 7);
-            return (cvl2 == null) ? super.getPosition() : cvl2;
+            final Vec3 dem2 = RandomPos.getLandPos(this.mob, 15, 7);
+            return (dem2 == null) ? super.getPosition() : dem2;
         }
         if (this.mob.getRandom().nextFloat() >= this.probability) {
             return RandomPos.getLandPos(this.mob, 10, 7);
diff --git a/src/net/minecraft/world/entity/ai/goal/WrappedGoal.java b/src/net/minecraft/world/entity/ai/goal/WrappedGoal.java
index f7d058f..17bc203 100644
--- a/src/net/minecraft/world/entity/ai/goal/WrappedGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/WrappedGoal.java
@@ -8,13 +8,13 @@ public class WrappedGoal extends Goal {
     private final int priority;
     private boolean isRunning;
     
-    public WrappedGoal(final int integer, final Goal apg) {
+    public WrappedGoal(final int integer, final Goal aug) {
         this.priority = integer;
-        this.goal = apg;
+        this.goal = aug;
     }
     
-    public boolean canBeReplacedBy(final WrappedGoal aqv) {
-        return this.isInterruptable() && aqv.getPriority() < this.getPriority();
+    public boolean canBeReplacedBy(final WrappedGoal avx) {
+        return this.isInterruptable() && avx.getPriority() < this.getPriority();
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/ai/goal/ZombieAttackGoal.java b/src/net/minecraft/world/entity/ai/goal/ZombieAttackGoal.java
index 4d06f0b..dfa4af6 100644
--- a/src/net/minecraft/world/entity/ai/goal/ZombieAttackGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/ZombieAttackGoal.java
@@ -7,9 +7,9 @@ public class ZombieAttackGoal extends MeleeAttackGoal {
     private final Zombie zombie;
     private int raiseArmTicks;
     
-    public ZombieAttackGoal(final Zombie axp, final double double2, final boolean boolean3) {
-        super(axp, double2, boolean3);
-        this.zombie = axp;
+    public ZombieAttackGoal(final Zombie bcu, final double double2, final boolean boolean3) {
+        super(bcu, double2, boolean3);
+        this.zombie = bcu;
     }
     
     @Override
@@ -28,7 +28,7 @@ public class ZombieAttackGoal extends MeleeAttackGoal {
     public void tick() {
         super.tick();
         ++this.raiseArmTicks;
-        if (this.raiseArmTicks >= 5 && this.attackTime < 10) {
+        if (this.raiseArmTicks >= 5 && this.getTicksUntilNextAttack() < this.getAttackInterval() / 2) {
             this.zombie.setAggressive(true);
         }
         else {
diff --git a/src/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.java
index 2cb264e..9ec541e 100644
--- a/src/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.java
@@ -17,24 +17,24 @@ public class DefendVillageTargetGoal extends TargetGoal {
     private LivingEntity potentialTarget;
     private final TargetingConditions attackTargeting;
     
-    public DefendVillageTargetGoal(final IronGolem atl) {
-        super(atl, false, true);
+    public DefendVillageTargetGoal(final IronGolem ayt) {
+        super(ayt, false, true);
         this.attackTargeting = new TargetingConditions().range(64.0);
-        this.golem = atl;
+        this.golem = ayt;
         this.setFlags(EnumSet.<Flag>of(Flag.TARGET));
     }
     
     @Override
     public boolean canUse() {
-        final AABB cvf2 = this.golem.getBoundingBox().inflate(10.0, 8.0, 10.0);
-        final List<LivingEntity> list3 = this.golem.level.<LivingEntity>getNearbyEntities(Villager.class, this.attackTargeting, (LivingEntity)this.golem, cvf2);
-        final List<Player> list4 = this.golem.level.getNearbyPlayers(this.attackTargeting, this.golem, cvf2);
-        for (final LivingEntity akz6 : list3) {
-            final Villager axw7 = (Villager)akz6;
-            for (final Player ayj9 : list4) {
-                final int integer10 = axw7.getPlayerReputation(ayj9);
+        final AABB deg2 = this.golem.getBoundingBox().inflate(10.0, 8.0, 10.0);
+        final List<LivingEntity> list3 = this.golem.level.<LivingEntity>getNearbyEntities(Villager.class, this.attackTargeting, (LivingEntity)this.golem, deg2);
+        final List<Player> list4 = this.golem.level.getNearbyPlayers(this.attackTargeting, this.golem, deg2);
+        for (final LivingEntity aoy6 : list3) {
+            final Villager bdp7 = (Villager)aoy6;
+            for (final Player bec9 : list4) {
+                final int integer10 = bdp7.getPlayerReputation(bec9);
                 if (integer10 <= -100) {
-                    this.potentialTarget = ayj9;
+                    this.potentialTarget = bec9;
                 }
             }
         }
diff --git a/src/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java
index fafe709..3974ae8 100644
--- a/src/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java
@@ -6,6 +6,8 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.TamableAnimal;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.entity.EntityType;
 import java.util.EnumSet;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.Mob;
@@ -19,8 +21,8 @@ public class HurtByTargetGoal extends TargetGoal {
     private final Class<?>[] toIgnoreDamage;
     private Class<?>[] toIgnoreAlert;
     
-    public HurtByTargetGoal(final PathfinderMob alg, final Class<?>... arr) {
-        super(alg, true);
+    public HurtByTargetGoal(final PathfinderMob apg, final Class<?>... arr) {
+        super(apg, true);
         this.toIgnoreDamage = arr;
         this.setFlags(EnumSet.<Flag>of(Flag.TARGET));
     }
@@ -28,16 +30,19 @@ public class HurtByTargetGoal extends TargetGoal {
     @Override
     public boolean canUse() {
         final int integer2 = this.mob.getLastHurtByMobTimestamp();
-        final LivingEntity akz3 = this.mob.getLastHurtByMob();
-        if (integer2 == this.timestamp || akz3 == null) {
+        final LivingEntity aoy3 = this.mob.getLastHurtByMob();
+        if (integer2 == this.timestamp || aoy3 == null) {
+            return false;
+        }
+        if (aoy3.getType() == EntityType.PLAYER && this.mob.level.getGameRules().getBoolean(GameRules.RULE_UNIVERSAL_ANGER)) {
             return false;
         }
         for (final Class<?> class7 : this.toIgnoreDamage) {
-            if (class7.isAssignableFrom(akz3.getClass())) {
+            if (class7.isAssignableFrom(aoy3.getClass())) {
                 return false;
             }
         }
-        return this.canAttack(akz3, HurtByTargetGoal.HURT_BY_TARGETING);
+        return this.canAttack(aoy3, HurtByTargetGoal.HURT_BY_TARGETING);
     }
     
     public HurtByTargetGoal setAlertOthers(final Class<?>... arr) {
@@ -60,38 +65,39 @@ public class HurtByTargetGoal extends TargetGoal {
     
     protected void alertOthers() {
         final double double2 = this.getFollowDistance();
-        final List<Mob> list4 = this.mob.level.<Mob>getLoadedEntitiesOfClass(this.mob.getClass(), new AABB(this.mob.getX(), this.mob.getY(), this.mob.getZ(), this.mob.getX() + 1.0, this.mob.getY() + 1.0, this.mob.getZ() + 1.0).inflate(double2, 10.0, double2));
-        for (final Mob ala6 : list4) {
-            if (this.mob == ala6) {
+        final AABB deg4 = AABB.unitCubeFromLowerCorner(this.mob.position()).inflate(double2, 10.0, double2);
+        final List<Mob> list5 = this.mob.level.<Mob>getLoadedEntitiesOfClass(this.mob.getClass(), deg4);
+        for (final Mob aoz7 : list5) {
+            if (this.mob == aoz7) {
                 continue;
             }
-            if (ala6.getTarget() != null) {
+            if (aoz7.getTarget() != null) {
                 continue;
             }
-            if (this.mob instanceof TamableAnimal && ((TamableAnimal)this.mob).getOwner() != ((TamableAnimal)ala6).getOwner()) {
+            if (this.mob instanceof TamableAnimal && ((TamableAnimal)this.mob).getOwner() != ((TamableAnimal)aoz7).getOwner()) {
                 continue;
             }
-            if (ala6.isAlliedTo(this.mob.getLastHurtByMob())) {
+            if (aoz7.isAlliedTo(this.mob.getLastHurtByMob())) {
                 continue;
             }
             if (this.toIgnoreAlert != null) {
-                boolean boolean7 = false;
-                for (final Class<?> class11 : this.toIgnoreAlert) {
-                    if (ala6.getClass() == class11) {
-                        boolean7 = true;
+                boolean boolean8 = false;
+                for (final Class<?> class12 : this.toIgnoreAlert) {
+                    if (aoz7.getClass() == class12) {
+                        boolean8 = true;
                         break;
                     }
                 }
-                if (boolean7) {
+                if (boolean8) {
                     continue;
                 }
             }
-            this.alertOther(ala6, this.mob.getLastHurtByMob());
+            this.alertOther(aoz7, this.mob.getLastHurtByMob());
         }
     }
     
-    protected void alertOther(final Mob ala, final LivingEntity akz) {
-        ala.setTarget(akz);
+    protected void alertOther(final Mob aoz, final LivingEntity aoy) {
+        aoz.setTarget(aoy);
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.java
index 9688162..444f7b0 100644
--- a/src/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.java
@@ -17,16 +17,16 @@ public class NearestAttackableTargetGoal<T extends LivingEntity> extends TargetG
     protected LivingEntity target;
     protected TargetingConditions targetConditions;
     
-    public NearestAttackableTargetGoal(final Mob ala, final Class<T> class2, final boolean boolean3) {
-        this(ala, class2, boolean3, false);
+    public NearestAttackableTargetGoal(final Mob aoz, final Class<T> class2, final boolean boolean3) {
+        this(aoz, class2, boolean3, false);
     }
     
-    public NearestAttackableTargetGoal(final Mob ala, final Class<T> class2, final boolean boolean3, final boolean boolean4) {
-        this(ala, class2, 10, boolean3, boolean4, null);
+    public NearestAttackableTargetGoal(final Mob aoz, final Class<T> class2, final boolean boolean3, final boolean boolean4) {
+        this(aoz, class2, 10, boolean3, boolean4, null);
     }
     
-    public NearestAttackableTargetGoal(final Mob ala, final Class<T> class2, final int integer, final boolean boolean4, final boolean boolean5, @Nullable final Predicate<LivingEntity> predicate) {
-        super(ala, boolean4, boolean5);
+    public NearestAttackableTargetGoal(final Mob aoz, final Class<T> class2, final int integer, final boolean boolean4, final boolean boolean5, @Nullable final Predicate<LivingEntity> predicate) {
+        super(aoz, boolean4, boolean5);
         this.targetType = class2;
         this.randomInterval = integer;
         this.setFlags(EnumSet.<Flag>of(Flag.TARGET));
@@ -60,4 +60,8 @@ public class NearestAttackableTargetGoal<T extends LivingEntity> extends TargetG
         this.mob.setTarget(this.target);
         super.start();
     }
+    
+    public void setTarget(@Nullable final LivingEntity aoy) {
+        this.target = aoy;
+    }
 }
diff --git a/src/net/minecraft/world/entity/ai/goal/target/NearestAttackableWitchTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/target/NearestAttackableWitchTargetGoal.java
index f296561..4284d4c 100644
--- a/src/net/minecraft/world/entity/ai/goal/target/NearestAttackableWitchTargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/target/NearestAttackableWitchTargetGoal.java
@@ -9,8 +9,8 @@ import net.minecraft.world.entity.LivingEntity;
 public class NearestAttackableWitchTargetGoal<T extends LivingEntity> extends NearestAttackableTargetGoal<T> {
     private boolean canAttack;
     
-    public NearestAttackableWitchTargetGoal(final Raider azo, final Class<T> class2, final int integer, final boolean boolean4, final boolean boolean5, @Nullable final Predicate<LivingEntity> predicate) {
-        super(azo, class2, integer, boolean4, boolean5, predicate);
+    public NearestAttackableWitchTargetGoal(final Raider bfi, final Class<T> class2, final int integer, final boolean boolean4, final boolean boolean5, @Nullable final Predicate<LivingEntity> predicate) {
+        super(bfi, class2, integer, boolean4, boolean5, predicate);
         this.canAttack = true;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/target/NearestHealableRaiderTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/target/NearestHealableRaiderTargetGoal.java
index 2214e2d..0a01483 100644
--- a/src/net/minecraft/world/entity/ai/goal/target/NearestHealableRaiderTargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/target/NearestHealableRaiderTargetGoal.java
@@ -9,8 +9,8 @@ import net.minecraft.world.entity.LivingEntity;
 public class NearestHealableRaiderTargetGoal<T extends LivingEntity> extends NearestAttackableTargetGoal<T> {
     private int cooldown;
     
-    public NearestHealableRaiderTargetGoal(final Raider azo, final Class<T> class2, final boolean boolean3, @Nullable final Predicate<LivingEntity> predicate) {
-        super(azo, class2, 500, boolean3, false, predicate);
+    public NearestHealableRaiderTargetGoal(final Raider bfi, final Class<T> class2, final boolean boolean3, @Nullable final Predicate<LivingEntity> predicate) {
+        super(bfi, class2, 500, boolean3, false, predicate);
         this.cooldown = 0;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.java
index 3708071..01db003 100644
--- a/src/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.java
@@ -9,9 +9,9 @@ import net.minecraft.world.entity.LivingEntity;
 public class NonTameRandomTargetGoal<T extends LivingEntity> extends NearestAttackableTargetGoal<T> {
     private final TamableAnimal tamableMob;
     
-    public NonTameRandomTargetGoal(final TamableAnimal alo, final Class<T> class2, final boolean boolean3, @Nullable final Predicate<LivingEntity> predicate) {
-        super(alo, class2, 10, boolean3, false, predicate);
-        this.tamableMob = alo;
+    public NonTameRandomTargetGoal(final TamableAnimal apq, final Class<T> class2, final boolean boolean3, @Nullable final Predicate<LivingEntity> predicate) {
+        super(apq, class2, 10, boolean3, false, predicate);
+        this.tamableMob = apq;
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.java
index 75854be..cfaccd4 100644
--- a/src/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.java
@@ -12,32 +12,32 @@ public class OwnerHurtByTargetGoal extends TargetGoal {
     private LivingEntity ownerLastHurtBy;
     private int timestamp;
     
-    public OwnerHurtByTargetGoal(final TamableAnimal alo) {
-        super(alo, false);
-        this.tameAnimal = alo;
+    public OwnerHurtByTargetGoal(final TamableAnimal apq) {
+        super(apq, false);
+        this.tameAnimal = apq;
         this.setFlags(EnumSet.<Flag>of(Flag.TARGET));
     }
     
     @Override
     public boolean canUse() {
-        if (!this.tameAnimal.isTame() || this.tameAnimal.isSitting()) {
+        if (!this.tameAnimal.isTame() || this.tameAnimal.isOrderedToSit()) {
             return false;
         }
-        final LivingEntity akz2 = this.tameAnimal.getOwner();
-        if (akz2 == null) {
+        final LivingEntity aoy2 = this.tameAnimal.getOwner();
+        if (aoy2 == null) {
             return false;
         }
-        this.ownerLastHurtBy = akz2.getLastHurtByMob();
-        final int integer3 = akz2.getLastHurtByMobTimestamp();
-        return integer3 != this.timestamp && this.canAttack(this.ownerLastHurtBy, TargetingConditions.DEFAULT) && this.tameAnimal.wantsToAttack(this.ownerLastHurtBy, akz2);
+        this.ownerLastHurtBy = aoy2.getLastHurtByMob();
+        final int integer3 = aoy2.getLastHurtByMobTimestamp();
+        return integer3 != this.timestamp && this.canAttack(this.ownerLastHurtBy, TargetingConditions.DEFAULT) && this.tameAnimal.wantsToAttack(this.ownerLastHurtBy, aoy2);
     }
     
     @Override
     public void start() {
         this.mob.setTarget(this.ownerLastHurtBy);
-        final LivingEntity akz2 = this.tameAnimal.getOwner();
-        if (akz2 != null) {
-            this.timestamp = akz2.getLastHurtByMobTimestamp();
+        final LivingEntity aoy2 = this.tameAnimal.getOwner();
+        if (aoy2 != null) {
+            this.timestamp = aoy2.getLastHurtByMobTimestamp();
         }
         super.start();
     }
diff --git a/src/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.java
index 395bb1d..6cbb1ec 100644
--- a/src/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.java
@@ -12,32 +12,32 @@ public class OwnerHurtTargetGoal extends TargetGoal {
     private LivingEntity ownerLastHurt;
     private int timestamp;
     
-    public OwnerHurtTargetGoal(final TamableAnimal alo) {
-        super(alo, false);
-        this.tameAnimal = alo;
+    public OwnerHurtTargetGoal(final TamableAnimal apq) {
+        super(apq, false);
+        this.tameAnimal = apq;
         this.setFlags(EnumSet.<Flag>of(Flag.TARGET));
     }
     
     @Override
     public boolean canUse() {
-        if (!this.tameAnimal.isTame() || this.tameAnimal.isSitting()) {
+        if (!this.tameAnimal.isTame() || this.tameAnimal.isOrderedToSit()) {
             return false;
         }
-        final LivingEntity akz2 = this.tameAnimal.getOwner();
-        if (akz2 == null) {
+        final LivingEntity aoy2 = this.tameAnimal.getOwner();
+        if (aoy2 == null) {
             return false;
         }
-        this.ownerLastHurt = akz2.getLastHurtMob();
-        final int integer3 = akz2.getLastHurtMobTimestamp();
-        return integer3 != this.timestamp && this.canAttack(this.ownerLastHurt, TargetingConditions.DEFAULT) && this.tameAnimal.wantsToAttack(this.ownerLastHurt, akz2);
+        this.ownerLastHurt = aoy2.getLastHurtMob();
+        final int integer3 = aoy2.getLastHurtMobTimestamp();
+        return integer3 != this.timestamp && this.canAttack(this.ownerLastHurt, TargetingConditions.DEFAULT) && this.tameAnimal.wantsToAttack(this.ownerLastHurt, aoy2);
     }
     
     @Override
     public void start() {
         this.mob.setTarget(this.ownerLastHurt);
-        final LivingEntity akz2 = this.tameAnimal.getOwner();
-        if (akz2 != null) {
-            this.timestamp = akz2.getLastHurtMobTimestamp();
+        final LivingEntity aoy2 = this.tameAnimal.getOwner();
+        if (aoy2 != null) {
+            this.timestamp = aoy2.getLastHurtMobTimestamp();
         }
         super.start();
     }
diff --git a/src/net/minecraft/world/entity/ai/goal/target/ResetUniversalAngerTargetGoal.java b/src/net/minecraft/world/entity/ai/goal/target/ResetUniversalAngerTargetGoal.java
new file mode 100644
index 0000000..1f892bb
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/goal/target/ResetUniversalAngerTargetGoal.java
@@ -0,0 +1,47 @@
+package net.minecraft.world.entity.ai.goal.target;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import java.util.List;
+import net.minecraft.world.entity.NeutralMob;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.entity.ai.goal.Goal;
+
+public class ResetUniversalAngerTargetGoal<T extends Mob> extends Goal {
+    private final T mob;
+    private final boolean alertOthersOfSameType;
+    private int lastHurtByPlayerTimestamp;
+    
+    public ResetUniversalAngerTargetGoal(final T aoz, final boolean boolean2) {
+        this.mob = aoz;
+        this.alertOthersOfSameType = boolean2;
+    }
+    
+    @Override
+    public boolean canUse() {
+        return ((Mob)this.mob).level.getGameRules().getBoolean(GameRules.RULE_UNIVERSAL_ANGER) && this.wasHurtByPlayer();
+    }
+    
+    private boolean wasHurtByPlayer() {
+        return ((LivingEntity)this.mob).getLastHurtByMob() != null && ((LivingEntity)this.mob).getLastHurtByMob().getType() == EntityType.PLAYER && ((LivingEntity)this.mob).getLastHurtByMobTimestamp() > this.lastHurtByPlayerTimestamp;
+    }
+    
+    @Override
+    public void start() {
+        this.lastHurtByPlayerTimestamp = ((LivingEntity)this.mob).getLastHurtByMobTimestamp();
+        ((NeutralMob)this.mob).forgetCurrentTargetAndRefreshUniversalAnger();
+        if (this.alertOthersOfSameType) {
+            this.getNearbyMobsOfSameType().stream().filter(aoz -> aoz != this.mob).map(aoz -> aoz).forEach(NeutralMob::forgetCurrentTargetAndRefreshUniversalAnger);
+        }
+        super.start();
+    }
+    
+    private List<Mob> getNearbyMobsOfSameType() {
+        final double double2 = ((LivingEntity)this.mob).getAttributeValue(Attributes.FOLLOW_RANGE);
+        final AABB deg4 = AABB.unitCubeFromLowerCorner(((Entity)this.mob).position()).inflate(double2, 10.0, double2);
+        return ((Mob)this.mob).level.<Mob>getLoadedEntitiesOfClass(this.mob.getClass(), deg4);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/goal/target/TargetGoal.java b/src/net/minecraft/world/entity/ai/goal/target/TargetGoal.java
index 936dd64..2d69e42 100644
--- a/src/net/minecraft/world/entity/ai/goal/target/TargetGoal.java
+++ b/src/net/minecraft/world/entity/ai/goal/target/TargetGoal.java
@@ -3,11 +3,9 @@ package net.minecraft.world.entity.ai.goal.target;
 import net.minecraft.world.level.pathfinder.Node;
 import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.util.Mth;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import javax.annotation.Nullable;
-import net.minecraft.world.entity.ai.attributes.AttributeInstance;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.scores.Team;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.Entity;
@@ -25,56 +23,55 @@ public abstract class TargetGoal extends Goal {
     protected LivingEntity targetMob;
     protected int unseenMemoryTicks;
     
-    public TargetGoal(final Mob ala, final boolean boolean2) {
-        this(ala, boolean2, false);
+    public TargetGoal(final Mob aoz, final boolean boolean2) {
+        this(aoz, boolean2, false);
     }
     
-    public TargetGoal(final Mob ala, final boolean boolean2, final boolean boolean3) {
+    public TargetGoal(final Mob aoz, final boolean boolean2, final boolean boolean3) {
         this.unseenMemoryTicks = 60;
-        this.mob = ala;
+        this.mob = aoz;
         this.mustSee = boolean2;
         this.mustReach = boolean3;
     }
     
     @Override
     public boolean canContinueToUse() {
-        LivingEntity akz2 = this.mob.getTarget();
-        if (akz2 == null) {
-            akz2 = this.targetMob;
+        LivingEntity aoy2 = this.mob.getTarget();
+        if (aoy2 == null) {
+            aoy2 = this.targetMob;
         }
-        if (akz2 == null) {
+        if (aoy2 == null) {
             return false;
         }
-        if (!akz2.isAlive()) {
+        if (!aoy2.isAlive()) {
             return false;
         }
-        final Team cwn3 = this.mob.getTeam();
-        final Team cwn4 = akz2.getTeam();
-        if (cwn3 != null && cwn4 == cwn3) {
+        final Team dfo3 = this.mob.getTeam();
+        final Team dfo4 = aoy2.getTeam();
+        if (dfo3 != null && dfo4 == dfo3) {
             return false;
         }
         final double double5 = this.getFollowDistance();
-        if (this.mob.distanceToSqr(akz2) > double5 * double5) {
+        if (this.mob.distanceToSqr(aoy2) > double5 * double5) {
             return false;
         }
         if (this.mustSee) {
-            if (this.mob.getSensing().canSee(akz2)) {
+            if (this.mob.getSensing().canSee(aoy2)) {
                 this.unseenTicks = 0;
             }
             else if (++this.unseenTicks > this.unseenMemoryTicks) {
                 return false;
             }
         }
-        if (akz2 instanceof Player && ((Player)akz2).abilities.invulnerable) {
+        if (aoy2 instanceof Player && ((Player)aoy2).abilities.invulnerable) {
             return false;
         }
-        this.mob.setTarget(akz2);
+        this.mob.setTarget(aoy2);
         return true;
     }
     
     protected double getFollowDistance() {
-        final AttributeInstance alr2 = this.mob.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE);
-        return (alr2 == null) ? 16.0 : alr2.getValue();
+        return this.mob.getAttributeValue(Attributes.FOLLOW_RANGE);
     }
     
     @Override
@@ -90,14 +87,14 @@ public abstract class TargetGoal extends Goal {
         this.targetMob = null;
     }
     
-    protected boolean canAttack(@Nullable final LivingEntity akz, final TargetingConditions ask) {
-        if (akz == null) {
+    protected boolean canAttack(@Nullable final LivingEntity aoy, final TargetingConditions axs) {
+        if (aoy == null) {
             return false;
         }
-        if (!ask.test(this.mob, akz)) {
+        if (!axs.test(this.mob, aoy)) {
             return false;
         }
-        if (!this.mob.isWithinRestriction(new BlockPos(akz))) {
+        if (!this.mob.isWithinRestriction(aoy.blockPosition())) {
             return false;
         }
         if (this.mustReach) {
@@ -105,7 +102,7 @@ public abstract class TargetGoal extends Goal {
                 this.reachCache = 0;
             }
             if (this.reachCache == 0) {
-                this.reachCache = (this.canReach(akz) ? 1 : 2);
+                this.reachCache = (this.canReach(aoy) ? 1 : 2);
             }
             if (this.reachCache == 2) {
                 return false;
@@ -114,18 +111,18 @@ public abstract class TargetGoal extends Goal {
         return true;
     }
     
-    private boolean canReach(final LivingEntity akz) {
+    private boolean canReach(final LivingEntity aoy) {
         this.reachCacheTime = 10 + this.mob.getRandom().nextInt(5);
-        final Path cqq3 = this.mob.getNavigation().createPath(akz, 0);
-        if (cqq3 == null) {
+        final Path czf3 = this.mob.getNavigation().createPath(aoy, 0);
+        if (czf3 == null) {
             return false;
         }
-        final Node cqo4 = cqq3.last();
-        if (cqo4 == null) {
+        final Node czd4 = czf3.last();
+        if (czd4 == null) {
             return false;
         }
-        final int integer5 = cqo4.x - Mth.floor(akz.getX());
-        final int integer6 = cqo4.z - Mth.floor(akz.getZ());
+        final int integer5 = czd4.x - Mth.floor(aoy.getX());
+        final int integer6 = czd4.z - Mth.floor(aoy.getZ());
         return integer5 * integer5 + integer6 * integer6 <= 2.25;
     }
     
diff --git a/src/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/net/minecraft/world/entity/ai/gossip/GossipContainer.java
index 6613da4..2efcb12 100644
--- a/src/net/minecraft/world/entity/ai/gossip/GossipContainer.java
+++ b/src/net/minecraft/world/entity/ai/gossip/GossipContainer.java
@@ -3,12 +3,18 @@ package net.minecraft.world.entity.ai.gossip;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import java.util.Optional;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.Decoder;
 import com.google.common.collect.ImmutableMap;
+import java.util.function.Supplier;
+import net.minecraft.core.SerializableUUID;
+import com.mojang.serialization.DataResult;
+import java.util.Optional;
 import net.minecraft.Util;
 import java.util.function.Function;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.Dynamic;
+import com.mojang.serialization.DynamicOps;
 import java.util.function.Predicate;
 import java.util.function.BiFunction;
 import java.util.Set;
@@ -73,8 +79,8 @@ public class GossipContainer {
         return this.gossips.computeIfAbsent(uUID, uUID -> new EntityGossips());
     }
     
-    public void transferFrom(final GossipContainer ari, final Random random, final int integer) {
-        final Collection<GossipEntry> collection5 = ari.selectGossipsForTransfer(random, integer);
+    public void transferFrom(final GossipContainer awl, final Random random, final int integer) {
+        final Collection<GossipEntry> collection5 = awl.selectGossipsForTransfer(random, integer);
         final int integer2;
         collection5.forEach(b -> {
             integer2 = b.value - b.type.decayPerTransfer;
@@ -89,10 +95,10 @@ public class GossipContainer {
         return (a4 != null) ? a4.weightedValue(predicate) : 0;
     }
     
-    public void add(final UUID uUID, final GossipType arj, final int integer) {
+    public void add(final UUID uUID, final GossipType awm, final int integer) {
         final EntityGossips a5 = this.getOrCreate(uUID);
-        a5.entries.mergeInt(arj, integer, (integer2, integer3) -> this.mergeValuesForAddition(arj, integer2, integer3));
-        a5.makeSureValueIsntTooLowOrTooHigh(arj);
+        a5.entries.mergeInt(awm, integer, (integer2, integer3) -> this.mergeValuesForAddition(awm, integer2, integer3));
+        a5.makeSureValueIsntTooLowOrTooHigh(awm);
         if (a5.isEmpty()) {
             this.gossips.remove(uUID);
         }
@@ -103,16 +109,16 @@ public class GossipContainer {
     }
     
     public void update(final Dynamic<?> dynamic) {
-        dynamic.asStream().map(GossipEntry::load).flatMap(Util::toStream).forEach(b -> this.getOrCreate(b.target).entries.put(b.type, b.value));
+        dynamic.asStream().map(GossipEntry::load).flatMap(dataResult -> Util.toStream(dataResult.result())).forEach(b -> this.getOrCreate(b.target).entries.put(b.type, b.value));
     }
     
     private static int mergeValuesForTransfer(final int integer1, final int integer2) {
         return Math.max(integer1, integer2);
     }
     
-    private int mergeValuesForAddition(final GossipType arj, final int integer2, final int integer3) {
+    private int mergeValuesForAddition(final GossipType awm, final int integer2, final int integer3) {
         final int integer4 = integer2 + integer3;
-        return (integer4 > arj.max) ? Math.max(arj.max, integer2) : integer4;
+        return (integer4 > awm.max) ? Math.max(awm.max, integer2) : integer4;
     }
     
     static class GossipEntry {
@@ -120,9 +126,9 @@ public class GossipContainer {
         public final GossipType type;
         public final int value;
         
-        public GossipEntry(final UUID uUID, final GossipType arj, final int integer) {
+        public GossipEntry(final UUID uUID, final GossipType awm, final int integer) {
             this.target = uUID;
-            this.type = arj;
+            this.type = awm;
             this.value = integer;
         }
         
@@ -136,11 +142,11 @@ public class GossipContainer {
         }
         
         public <T> Dynamic<T> store(final DynamicOps<T> dynamicOps) {
-            return Util.<T>writeUUID("Target", this.target, (com.mojang.datafixers.Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("Type"), dynamicOps.createString(this.type.id), dynamicOps.createString("Value"), dynamicOps.createInt(this.value)))));
+            return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("Target"), SerializableUUID.CODEC.encodeStart((DynamicOps)dynamicOps, this.target).result().<Throwable>orElseThrow(RuntimeException::new), dynamicOps.createString("Type"), dynamicOps.createString(this.type.id), dynamicOps.createString("Value"), dynamicOps.createInt(this.value))));
         }
         
-        public static Optional<GossipEntry> load(final Dynamic<?> dynamic) {
-            return dynamic.get("Type").asString().map(GossipType::byId).<GossipEntry>flatMap(arj -> Util.readUUID("Target", dynamic).flatMap(uUID -> dynamic.get("Value").asNumber().map(number -> new GossipEntry(uUID, arj, number.intValue()))));
+        public static DataResult<GossipEntry> load(final Dynamic<?> dynamic) {
+            return (DataResult<GossipEntry>)DataResult.unbox(DataResult.instance().group((App)dynamic.get("Target").read((Decoder)SerializableUUID.CODEC), (App)dynamic.get("Type").asString().map((Function)GossipType::byId), (App)dynamic.get("Value").asNumber().map((Function)Number::intValue)).apply((Applicative)DataResult.instance(), GossipEntry::new));
         }
     }
     
@@ -177,18 +183,18 @@ public class GossipContainer {
             return this.entries.isEmpty();
         }
         
-        public void makeSureValueIsntTooLowOrTooHigh(final GossipType arj) {
-            final int integer3 = this.entries.getInt(arj);
-            if (integer3 > arj.max) {
-                this.entries.put(arj, arj.max);
+        public void makeSureValueIsntTooLowOrTooHigh(final GossipType awm) {
+            final int integer3 = this.entries.getInt(awm);
+            if (integer3 > awm.max) {
+                this.entries.put(awm, awm.max);
             }
             if (integer3 < 2) {
-                this.remove(arj);
+                this.remove(awm);
             }
         }
         
-        public void remove(final GossipType arj) {
-            this.entries.removeInt(arj);
+        public void remove(final GossipType awm) {
+            this.entries.removeInt(awm);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/gossip/GossipType.java b/src/net/minecraft/world/entity/ai/gossip/GossipType.java
index b518ab9..dbead7f 100644
--- a/src/net/minecraft/world/entity/ai/gossip/GossipType.java
+++ b/src/net/minecraft/world/entity/ai/gossip/GossipType.java
@@ -35,6 +35,6 @@ public enum GossipType {
     }
     
     static {
-        BY_ID = Stream.<GossipType>of(values()).collect(ImmutableMap.toImmutableMap(arj -> arj.id, Function.identity()));
+        BY_ID = Stream.<GossipType>of(values()).collect(ImmutableMap.toImmutableMap(awm -> awm.id, Function.identity()));
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/memory/ExpirableValue.java b/src/net/minecraft/world/entity/ai/memory/ExpirableValue.java
new file mode 100644
index 0000000..a8de33d
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/memory/ExpirableValue.java
@@ -0,0 +1,52 @@
+package net.minecraft.world.entity.ai.memory;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.datafixers.kinds.App;
+import java.util.Optional;
+import com.mojang.serialization.Codec;
+
+public class ExpirableValue<T> {
+    private final T value;
+    private long timeToLive;
+    
+    public ExpirableValue(final T object, final long long2) {
+        this.value = object;
+        this.timeToLive = long2;
+    }
+    
+    public void tick() {
+        if (this.canExpire()) {
+            --this.timeToLive;
+        }
+    }
+    
+    public static <T> ExpirableValue<T> of(final T object) {
+        return new ExpirableValue<T>(object, Long.MAX_VALUE);
+    }
+    
+    public static <T> ExpirableValue<T> of(final T object, final long long2) {
+        return new ExpirableValue<T>(object, long2);
+    }
+    
+    public T getValue() {
+        return this.value;
+    }
+    
+    public boolean hasExpired() {
+        return this.timeToLive <= 0L;
+    }
+    
+    @Override
+    public String toString() {
+        return this.value.toString() + (this.canExpire() ? (" (ttl: " + this.timeToLive + ")") : "");
+    }
+    
+    public boolean canExpire() {
+        return this.timeToLive != Long.MAX_VALUE;
+    }
+    
+    public static <T> Codec<ExpirableValue<T>> codec(final Codec<T> codec) {
+        return (Codec<ExpirableValue<T>>)RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)codec.fieldOf("value").forGetter(awo -> awo.value), (App)Codec.LONG.optionalFieldOf("ttl").forGetter(awo -> awo.canExpire() ? Optional.<Long>of(awo.timeToLive) : Optional.<Long>empty())).apply(instance, (object, optional) -> new ExpirableValue(object, optional.orElse(Long.MAX_VALUE))));
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/memory/MemoryModuleType.java b/src/net/minecraft/world/entity/ai/memory/MemoryModuleType.java
index c7c05e5..73c9cab 100644
--- a/src/net/minecraft/world/entity/ai/memory/MemoryModuleType.java
+++ b/src/net/minecraft/world/entity/ai/memory/MemoryModuleType.java
@@ -1,18 +1,23 @@
 package net.minecraft.world.entity.ai.memory;
 
+import net.minecraft.core.SerializableUUID;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Serializable;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
 import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import java.util.Optional;
-import net.minecraft.core.SerializableLong;
+import net.minecraft.world.entity.monster.piglin.Piglin;
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
+import java.util.UUID;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.core.BlockPos;
 import java.util.Set;
 import net.minecraft.world.level.pathfinder.Path;
-import net.minecraft.world.entity.npc.Villager;
-import net.minecraft.world.entity.ai.behavior.PositionWrapper;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.AgableMob;
+import net.minecraft.world.entity.ai.behavior.PositionTracker;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.LivingEntity;
 import java.util.List;
@@ -22,6 +27,7 @@ public class MemoryModuleType<U> {
     public static final MemoryModuleType<Void> DUMMY;
     public static final MemoryModuleType<GlobalPos> HOME;
     public static final MemoryModuleType<GlobalPos> JOB_SITE;
+    public static final MemoryModuleType<GlobalPos> POTENTIAL_JOB_SITE;
     public static final MemoryModuleType<GlobalPos> MEETING_POINT;
     public static final MemoryModuleType<List<GlobalPos>> SECONDARY_JOB_SITE;
     public static final MemoryModuleType<List<LivingEntity>> LIVING_ENTITIES;
@@ -29,28 +35,58 @@ public class MemoryModuleType<U> {
     public static final MemoryModuleType<List<LivingEntity>> VISIBLE_VILLAGER_BABIES;
     public static final MemoryModuleType<List<Player>> NEAREST_PLAYERS;
     public static final MemoryModuleType<Player> NEAREST_VISIBLE_PLAYER;
+    public static final MemoryModuleType<Player> NEAREST_VISIBLE_TARGETABLE_PLAYER;
     public static final MemoryModuleType<WalkTarget> WALK_TARGET;
-    public static final MemoryModuleType<PositionWrapper> LOOK_TARGET;
+    public static final MemoryModuleType<PositionTracker> LOOK_TARGET;
+    public static final MemoryModuleType<LivingEntity> ATTACK_TARGET;
+    public static final MemoryModuleType<Boolean> ATTACK_COOLING_DOWN;
     public static final MemoryModuleType<LivingEntity> INTERACTION_TARGET;
-    public static final MemoryModuleType<Villager> BREED_TARGET;
+    public static final MemoryModuleType<AgableMob> BREED_TARGET;
+    public static final MemoryModuleType<Entity> RIDE_TARGET;
     public static final MemoryModuleType<Path> PATH;
     public static final MemoryModuleType<List<GlobalPos>> INTERACTABLE_DOORS;
     public static final MemoryModuleType<Set<GlobalPos>> OPENED_DOORS;
     public static final MemoryModuleType<BlockPos> NEAREST_BED;
     public static final MemoryModuleType<DamageSource> HURT_BY;
     public static final MemoryModuleType<LivingEntity> HURT_BY_ENTITY;
+    public static final MemoryModuleType<LivingEntity> AVOID_TARGET;
     public static final MemoryModuleType<LivingEntity> NEAREST_HOSTILE;
     public static final MemoryModuleType<GlobalPos> HIDING_PLACE;
     public static final MemoryModuleType<Long> HEARD_BELL_TIME;
     public static final MemoryModuleType<Long> CANT_REACH_WALK_TARGET_SINCE;
     public static final MemoryModuleType<Long> GOLEM_LAST_SEEN_TIME;
-    public static final MemoryModuleType<SerializableLong> LAST_SLEPT;
-    public static final MemoryModuleType<SerializableLong> LAST_WOKEN;
-    public static final MemoryModuleType<SerializableLong> LAST_WORKED_AT_POI;
-    private final Optional<Function<Dynamic<?>, U>> deserializer;
+    public static final MemoryModuleType<Long> LAST_SLEPT;
+    public static final MemoryModuleType<Long> LAST_WOKEN;
+    public static final MemoryModuleType<Long> LAST_WORKED_AT_POI;
+    public static final MemoryModuleType<AgableMob> NEAREST_VISIBLE_ADULT;
+    public static final MemoryModuleType<ItemEntity> NEAREST_VISIBLE_WANTED_ITEM;
+    public static final MemoryModuleType<Mob> NEAREST_VISIBLE_NEMESIS;
+    public static final MemoryModuleType<UUID> ANGRY_AT;
+    public static final MemoryModuleType<Boolean> UNIVERSAL_ANGER;
+    public static final MemoryModuleType<Boolean> ADMIRING_ITEM;
+    public static final MemoryModuleType<Boolean> ADMIRING_DISABLED;
+    public static final MemoryModuleType<Boolean> HUNTED_RECENTLY;
+    public static final MemoryModuleType<BlockPos> CELEBRATE_LOCATION;
+    public static final MemoryModuleType<Boolean> DANCING;
+    public static final MemoryModuleType<Hoglin> NEAREST_VISIBLE_HUNTABLE_HOGLIN;
+    public static final MemoryModuleType<Hoglin> NEAREST_VISIBLE_BABY_HOGLIN;
+    public static final MemoryModuleType<Piglin> NEAREST_VISIBLE_BABY_PIGLIN;
+    public static final MemoryModuleType<Player> NEAREST_TARGETABLE_PLAYER_NOT_WEARING_GOLD;
+    public static final MemoryModuleType<List<Piglin>> NEAREST_ADULT_PIGLINS;
+    public static final MemoryModuleType<List<Piglin>> NEAREST_VISIBLE_ADULT_PIGLINS;
+    public static final MemoryModuleType<List<Hoglin>> NEAREST_VISIBLE_ADULT_HOGLINS;
+    public static final MemoryModuleType<Piglin> NEAREST_VISIBLE_ADULT_PIGLIN;
+    public static final MemoryModuleType<LivingEntity> NEAREST_VISIBLE_ZOMBIFIED;
+    public static final MemoryModuleType<Integer> VISIBLE_ADULT_PIGLIN_COUNT;
+    public static final MemoryModuleType<Integer> VISIBLE_ADULT_HOGLIN_COUNT;
+    public static final MemoryModuleType<Player> NEAREST_PLAYER_HOLDING_WANTED_ITEM;
+    public static final MemoryModuleType<Boolean> ATE_RECENTLY;
+    public static final MemoryModuleType<BlockPos> NEAREST_REPELLENT;
+    public static final MemoryModuleType<Boolean> PACIFIED;
+    private final Optional<Codec<ExpirableValue<U>>> codec;
     
-    private MemoryModuleType(final Optional<Function<Dynamic<?>, U>> optional) {
-        this.deserializer = optional;
+    private MemoryModuleType(final Optional<Codec<U>> optional) {
+        this.codec = optional.<Codec<ExpirableValue<U>>>map(ExpirableValue::codec);
     }
     
     @Override
@@ -58,46 +94,77 @@ public class MemoryModuleType<U> {
         return Registry.MEMORY_MODULE_TYPE.getKey(this).toString();
     }
     
-    public Optional<Function<Dynamic<?>, U>> getDeserializer() {
-        return this.deserializer;
+    public Optional<Codec<ExpirableValue<U>>> getCodec() {
+        return this.codec;
     }
     
-    private static <U extends Serializable> MemoryModuleType<U> register(final String string, final Optional<Function<Dynamic<?>, U>> optional) {
-        return Registry.<MemoryModuleType<U>>register(Registry.MEMORY_MODULE_TYPE, new ResourceLocation(string), new MemoryModuleType<U>(optional));
+    private static <U> MemoryModuleType<U> register(final String string, final Codec<U> codec) {
+        return Registry.<MemoryModuleType<?>, MemoryModuleType<U>>register(Registry.MEMORY_MODULE_TYPE, new ResourceLocation(string), new MemoryModuleType<U>(Optional.of((Codec<U>)codec)));
     }
     
     private static <U> MemoryModuleType<U> register(final String string) {
-        return Registry.<MemoryModuleType<U>>register(Registry.MEMORY_MODULE_TYPE, new ResourceLocation(string), new MemoryModuleType<U>(Optional.<Function<Dynamic<?>, U>>empty()));
+        return Registry.<MemoryModuleType<?>, MemoryModuleType<U>>register(Registry.MEMORY_MODULE_TYPE, new ResourceLocation(string), new MemoryModuleType<U>(Optional.<com.mojang.serialization.Codec<U>>empty()));
     }
     
     static {
         DUMMY = MemoryModuleType.<Void>register("dummy");
-        HOME = MemoryModuleType.<GlobalPos>register("home", Optional.of((Function<Dynamic<?>, U>)GlobalPos::of));
-        JOB_SITE = MemoryModuleType.<GlobalPos>register("job_site", Optional.of((Function<Dynamic<?>, U>)GlobalPos::of));
-        MEETING_POINT = MemoryModuleType.<GlobalPos>register("meeting_point", Optional.of((Function<Dynamic<?>, U>)GlobalPos::of));
+        HOME = MemoryModuleType.<GlobalPos>register("home", GlobalPos.CODEC);
+        JOB_SITE = MemoryModuleType.<GlobalPos>register("job_site", GlobalPos.CODEC);
+        POTENTIAL_JOB_SITE = MemoryModuleType.<GlobalPos>register("potential_job_site", GlobalPos.CODEC);
+        MEETING_POINT = MemoryModuleType.<GlobalPos>register("meeting_point", GlobalPos.CODEC);
         SECONDARY_JOB_SITE = MemoryModuleType.<List<GlobalPos>>register("secondary_job_site");
         LIVING_ENTITIES = MemoryModuleType.<List<LivingEntity>>register("mobs");
         VISIBLE_LIVING_ENTITIES = MemoryModuleType.<List<LivingEntity>>register("visible_mobs");
         VISIBLE_VILLAGER_BABIES = MemoryModuleType.<List<LivingEntity>>register("visible_villager_babies");
         NEAREST_PLAYERS = MemoryModuleType.<List<Player>>register("nearest_players");
         NEAREST_VISIBLE_PLAYER = MemoryModuleType.<Player>register("nearest_visible_player");
+        NEAREST_VISIBLE_TARGETABLE_PLAYER = MemoryModuleType.<Player>register("nearest_visible_targetable_player");
         WALK_TARGET = MemoryModuleType.<WalkTarget>register("walk_target");
-        LOOK_TARGET = MemoryModuleType.<PositionWrapper>register("look_target");
+        LOOK_TARGET = MemoryModuleType.<PositionTracker>register("look_target");
+        ATTACK_TARGET = MemoryModuleType.<LivingEntity>register("attack_target");
+        ATTACK_COOLING_DOWN = MemoryModuleType.<Boolean>register("attack_cooling_down");
         INTERACTION_TARGET = MemoryModuleType.<LivingEntity>register("interaction_target");
-        BREED_TARGET = MemoryModuleType.<Villager>register("breed_target");
+        BREED_TARGET = MemoryModuleType.<AgableMob>register("breed_target");
+        RIDE_TARGET = MemoryModuleType.<Entity>register("ride_target");
         PATH = MemoryModuleType.<Path>register("path");
         INTERACTABLE_DOORS = MemoryModuleType.<List<GlobalPos>>register("interactable_doors");
         OPENED_DOORS = MemoryModuleType.<Set<GlobalPos>>register("opened_doors");
         NEAREST_BED = MemoryModuleType.<BlockPos>register("nearest_bed");
         HURT_BY = MemoryModuleType.<DamageSource>register("hurt_by");
         HURT_BY_ENTITY = MemoryModuleType.<LivingEntity>register("hurt_by_entity");
+        AVOID_TARGET = MemoryModuleType.<LivingEntity>register("avoid_target");
         NEAREST_HOSTILE = MemoryModuleType.<LivingEntity>register("nearest_hostile");
         HIDING_PLACE = MemoryModuleType.<GlobalPos>register("hiding_place");
         HEARD_BELL_TIME = MemoryModuleType.<Long>register("heard_bell_time");
         CANT_REACH_WALK_TARGET_SINCE = MemoryModuleType.<Long>register("cant_reach_walk_target_since");
         GOLEM_LAST_SEEN_TIME = MemoryModuleType.<Long>register("golem_last_seen_time");
-        LAST_SLEPT = MemoryModuleType.<SerializableLong>register("last_slept", Optional.of((Function<Dynamic<?>, U>)SerializableLong::of));
-        LAST_WOKEN = MemoryModuleType.<SerializableLong>register("last_woken", Optional.of((Function<Dynamic<?>, U>)SerializableLong::of));
-        LAST_WORKED_AT_POI = MemoryModuleType.<SerializableLong>register("last_worked_at_poi", Optional.of((Function<Dynamic<?>, U>)SerializableLong::of));
+        LAST_SLEPT = MemoryModuleType.<Long>register("last_slept", (com.mojang.serialization.Codec<Long>)Codec.LONG);
+        LAST_WOKEN = MemoryModuleType.<Long>register("last_woken", (com.mojang.serialization.Codec<Long>)Codec.LONG);
+        LAST_WORKED_AT_POI = MemoryModuleType.<Long>register("last_worked_at_poi", (com.mojang.serialization.Codec<Long>)Codec.LONG);
+        NEAREST_VISIBLE_ADULT = MemoryModuleType.<AgableMob>register("nearest_visible_adult");
+        NEAREST_VISIBLE_WANTED_ITEM = MemoryModuleType.<ItemEntity>register("nearest_visible_wanted_item");
+        NEAREST_VISIBLE_NEMESIS = MemoryModuleType.<Mob>register("nearest_visible_nemesis");
+        ANGRY_AT = MemoryModuleType.<UUID>register("angry_at", SerializableUUID.CODEC);
+        UNIVERSAL_ANGER = MemoryModuleType.<Boolean>register("universal_anger", (com.mojang.serialization.Codec<Boolean>)Codec.BOOL);
+        ADMIRING_ITEM = MemoryModuleType.<Boolean>register("admiring_item", (com.mojang.serialization.Codec<Boolean>)Codec.BOOL);
+        ADMIRING_DISABLED = MemoryModuleType.<Boolean>register("admiring_disabled", (com.mojang.serialization.Codec<Boolean>)Codec.BOOL);
+        HUNTED_RECENTLY = MemoryModuleType.<Boolean>register("hunted_recently", (com.mojang.serialization.Codec<Boolean>)Codec.BOOL);
+        CELEBRATE_LOCATION = MemoryModuleType.<BlockPos>register("celebrate_location");
+        DANCING = MemoryModuleType.<Boolean>register("dancing");
+        NEAREST_VISIBLE_HUNTABLE_HOGLIN = MemoryModuleType.<Hoglin>register("nearest_visible_huntable_hoglin");
+        NEAREST_VISIBLE_BABY_HOGLIN = MemoryModuleType.<Hoglin>register("nearest_visible_baby_hoglin");
+        NEAREST_VISIBLE_BABY_PIGLIN = MemoryModuleType.<Piglin>register("nearest_visible_baby_piglin");
+        NEAREST_TARGETABLE_PLAYER_NOT_WEARING_GOLD = MemoryModuleType.<Player>register("nearest_targetable_player_not_wearing_gold");
+        NEAREST_ADULT_PIGLINS = MemoryModuleType.<List<Piglin>>register("nearest_adult_piglins");
+        NEAREST_VISIBLE_ADULT_PIGLINS = MemoryModuleType.<List<Piglin>>register("nearest_visible_adult_piglins");
+        NEAREST_VISIBLE_ADULT_HOGLINS = MemoryModuleType.<List<Hoglin>>register("nearest_visible_adult_hoglins");
+        NEAREST_VISIBLE_ADULT_PIGLIN = MemoryModuleType.<Piglin>register("nearest_visible_adult_piglin");
+        NEAREST_VISIBLE_ZOMBIFIED = MemoryModuleType.<LivingEntity>register("nearest_visible_zombified");
+        VISIBLE_ADULT_PIGLIN_COUNT = MemoryModuleType.<Integer>register("visible_adult_piglin_count");
+        VISIBLE_ADULT_HOGLIN_COUNT = MemoryModuleType.<Integer>register("visible_adult_hoglin_count");
+        NEAREST_PLAYER_HOLDING_WANTED_ITEM = MemoryModuleType.<Player>register("nearest_player_holding_wanted_item");
+        ATE_RECENTLY = MemoryModuleType.<Boolean>register("ate_recently");
+        NEAREST_REPELLENT = MemoryModuleType.<BlockPos>register("nearest_repellent");
+        PACIFIED = MemoryModuleType.<Boolean>register("pacified");
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/memory/WalkTarget.java b/src/net/minecraft/world/entity/ai/memory/WalkTarget.java
index 1c05916..16adb77 100644
--- a/src/net/minecraft/world/entity/ai/memory/WalkTarget.java
+++ b/src/net/minecraft/world/entity/ai/memory/WalkTarget.java
@@ -1,35 +1,35 @@
 package net.minecraft.world.entity.ai.memory;
 
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.entity.ai.behavior.BlockPosWrapper;
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.ai.behavior.PositionWrapper;
+import net.minecraft.world.entity.ai.behavior.PositionTracker;
 
 public class WalkTarget {
-    private final PositionWrapper target;
-    private final float speed;
+    private final PositionTracker target;
+    private final float speedModifier;
     private final int closeEnoughDist;
     
-    public WalkTarget(final BlockPos fk, final float float2, final int integer) {
-        this(new BlockPosWrapper(fk), float2, integer);
+    public WalkTarget(final BlockPos fu, final float float2, final int integer) {
+        this(new BlockPosTracker(fu), float2, integer);
     }
     
-    public WalkTarget(final Vec3 cvl, final float float2, final int integer) {
-        this(new BlockPosWrapper(new BlockPos(cvl)), float2, integer);
+    public WalkTarget(final Vec3 dem, final float float2, final int integer) {
+        this(new BlockPosTracker(new BlockPos(dem)), float2, integer);
     }
     
-    public WalkTarget(final PositionWrapper amz, final float float2, final int integer) {
-        this.target = amz;
-        this.speed = float2;
+    public WalkTarget(final PositionTracker arn, final float float2, final int integer) {
+        this.target = arn;
+        this.speedModifier = float2;
         this.closeEnoughDist = integer;
     }
     
-    public PositionWrapper getTarget() {
+    public PositionTracker getTarget() {
         return this.target;
     }
     
-    public float getSpeed() {
-        return this.speed;
+    public float getSpeedModifier() {
+        return this.speedModifier;
     }
     
     public int getCloseEnoughDist() {
diff --git a/src/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java b/src/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
index e792dbf..14ae4ac 100644
--- a/src/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
+++ b/src/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
@@ -1,9 +1,9 @@
 package net.minecraft.world.entity.ai.navigation;
 
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.game.DebugPackets;
 import net.minecraft.util.Mth;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.Vec3;
@@ -13,8 +13,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.Mob;
 
 public class FlyingPathNavigation extends PathNavigation {
-    public FlyingPathNavigation(final Mob ala, final Level bjw) {
-        super(ala, bjw);
+    public FlyingPathNavigation(final Mob aoz, final Level bqb) {
+        super(aoz, bqb);
     }
     
     @Override
@@ -34,8 +34,8 @@ public class FlyingPathNavigation extends PathNavigation {
     }
     
     @Override
-    public Path createPath(final Entity akq, final int integer) {
-        return this.createPath(new BlockPos(akq), integer);
+    public Path createPath(final Entity aom, final int integer) {
+        return this.createPath(aom.blockPosition(), integer);
     }
     
     @Override
@@ -48,11 +48,11 @@ public class FlyingPathNavigation extends PathNavigation {
             return;
         }
         if (this.canUpdatePath()) {
-            this.updatePath();
+            this.followThePath();
         }
         else if (this.path != null && this.path.getIndex() < this.path.getSize()) {
-            final Vec3 cvl2 = this.path.getPos(this.mob, this.path.getIndex());
-            if (Mth.floor(this.mob.getX()) == Mth.floor(cvl2.x) && Mth.floor(this.mob.getY()) == Mth.floor(cvl2.y) && Mth.floor(this.mob.getZ()) == Mth.floor(cvl2.z)) {
+            final Vec3 dem2 = this.path.getPos(this.mob, this.path.getIndex());
+            if (Mth.floor(this.mob.getX()) == Mth.floor(dem2.x) && Mth.floor(this.mob.getY()) == Mth.floor(dem2.y) && Mth.floor(this.mob.getZ()) == Mth.floor(dem2.z)) {
                 this.path.setIndex(this.path.getIndex() + 1);
             }
         }
@@ -60,18 +60,18 @@ public class FlyingPathNavigation extends PathNavigation {
         if (this.isDone()) {
             return;
         }
-        final Vec3 cvl2 = this.path.currentPos(this.mob);
-        this.mob.getMoveControl().setWantedPosition(cvl2.x, cvl2.y, cvl2.z, this.speedModifier);
+        final Vec3 dem2 = this.path.currentPos(this.mob);
+        this.mob.getMoveControl().setWantedPosition(dem2.x, dem2.y, dem2.z, this.speedModifier);
     }
     
     @Override
-    protected boolean canMoveDirectly(final Vec3 cvl1, final Vec3 cvl2, final int integer3, final int integer4, final int integer5) {
-        int integer6 = Mth.floor(cvl1.x);
-        int integer7 = Mth.floor(cvl1.y);
-        int integer8 = Mth.floor(cvl1.z);
-        double double10 = cvl2.x - cvl1.x;
-        double double11 = cvl2.y - cvl1.y;
-        double double12 = cvl2.z - cvl1.z;
+    protected boolean canMoveDirectly(final Vec3 dem1, final Vec3 dem2, final int integer3, final int integer4, final int integer5) {
+        int integer6 = Mth.floor(dem1.x);
+        int integer7 = Mth.floor(dem1.y);
+        int integer8 = Mth.floor(dem1.z);
+        double double10 = dem2.x - dem1.x;
+        double double11 = dem2.y - dem1.y;
+        double double12 = dem2.z - dem1.z;
         final double double13 = double10 * double10 + double11 * double11 + double12 * double12;
         if (double13 < 1.0E-8) {
             return false;
@@ -83,9 +83,9 @@ public class FlyingPathNavigation extends PathNavigation {
         final double double15 = 1.0 / Math.abs(double10);
         final double double16 = 1.0 / Math.abs(double11);
         final double double17 = 1.0 / Math.abs(double12);
-        double double18 = integer6 - cvl1.x;
-        double double19 = integer7 - cvl1.y;
-        double double20 = integer8 - cvl1.z;
+        double double18 = integer6 - dem1.x;
+        double double19 = integer7 - dem1.y;
+        double double20 = integer8 - dem1.z;
         if (double10 >= 0.0) {
             ++double18;
         }
@@ -101,9 +101,9 @@ public class FlyingPathNavigation extends PathNavigation {
         final int integer9 = (double10 < 0.0) ? -1 : 1;
         final int integer10 = (double11 < 0.0) ? -1 : 1;
         final int integer11 = (double12 < 0.0) ? -1 : 1;
-        final int integer12 = Mth.floor(cvl2.x);
-        final int integer13 = Mth.floor(cvl2.y);
-        final int integer14 = Mth.floor(cvl2.z);
+        final int integer12 = Mth.floor(dem2.x);
+        final int integer13 = Mth.floor(dem2.y);
+        final int integer14 = Mth.floor(dem2.z);
         int integer15 = integer12 - integer6;
         int integer16 = integer13 - integer7;
         int integer17 = integer14 - integer8;
@@ -136,7 +136,7 @@ public class FlyingPathNavigation extends PathNavigation {
     }
     
     @Override
-    public boolean isStableDestination(final BlockPos fk) {
-        return this.level.getBlockState(fk).entityCanStandOn(this.level, fk, this.mob);
+    public boolean isStableDestination(final BlockPos fu) {
+        return this.level.getBlockState(fu).entityCanStandOn(this.level, fu, this.mob);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java b/src/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
index c3b2ac0..209701b 100644
--- a/src/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
+++ b/src/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
@@ -20,8 +20,8 @@ import net.minecraft.world.entity.Mob;
 public class GroundPathNavigation extends PathNavigation {
     private boolean avoidSun;
     
-    public GroundPathNavigation(final Mob ala, final Level bjw) {
-        super(ala, bjw);
+    public GroundPathNavigation(final Mob aoz, final Level bqb) {
+        super(aoz, bqb);
     }
     
     @Override
@@ -32,7 +32,7 @@ public class GroundPathNavigation extends PathNavigation {
     
     @Override
     protected boolean canUpdatePath() {
-        return this.mob.onGround || this.isInLiquid() || this.mob.isPassenger();
+        return this.mob.isOnGround() || this.isInLiquid() || this.mob.isPassenger();
     }
     
     @Override
@@ -41,29 +41,29 @@ public class GroundPathNavigation extends PathNavigation {
     }
     
     @Override
-    public Path createPath(BlockPos fk, final int integer) {
-        if (this.level.getBlockState(fk).isAir()) {
-            BlockPos fk2;
-            for (fk2 = fk.below(); fk2.getY() > 0 && this.level.getBlockState(fk2).isAir(); fk2 = fk2.below()) {}
-            if (fk2.getY() > 0) {
-                return super.createPath(fk2.above(), integer);
+    public Path createPath(BlockPos fu, final int integer) {
+        if (this.level.getBlockState(fu).isAir()) {
+            BlockPos fu2;
+            for (fu2 = fu.below(); fu2.getY() > 0 && this.level.getBlockState(fu2).isAir(); fu2 = fu2.below()) {}
+            if (fu2.getY() > 0) {
+                return super.createPath(fu2.above(), integer);
             }
-            while (fk2.getY() < this.level.getMaxBuildHeight() && this.level.getBlockState(fk2).isAir()) {
-                fk2 = fk2.above();
+            while (fu2.getY() < this.level.getMaxBuildHeight() && this.level.getBlockState(fu2).isAir()) {
+                fu2 = fu2.above();
             }
-            fk = fk2;
+            fu = fu2;
         }
-        if (this.level.getBlockState(fk).getMaterial().isSolid()) {
-            BlockPos fk2;
-            for (fk2 = fk.above(); fk2.getY() < this.level.getMaxBuildHeight() && this.level.getBlockState(fk2).getMaterial().isSolid(); fk2 = fk2.above()) {}
-            return super.createPath(fk2, integer);
+        if (this.level.getBlockState(fu).getMaterial().isSolid()) {
+            BlockPos fu2;
+            for (fu2 = fu.above(); fu2.getY() < this.level.getMaxBuildHeight() && this.level.getBlockState(fu2).getMaterial().isSolid(); fu2 = fu2.above()) {}
+            return super.createPath(fu2, integer);
         }
-        return super.createPath(fk, integer);
+        return super.createPath(fu, integer);
     }
     
     @Override
-    public Path createPath(final Entity akq, final int integer) {
-        return this.createPath(new BlockPos(akq), integer);
+    public Path createPath(final Entity aom, final int integer) {
+        return this.createPath(aom.blockPosition(), integer);
     }
     
     private int getSurfaceY() {
@@ -71,11 +71,11 @@ public class GroundPathNavigation extends PathNavigation {
             return Mth.floor(this.mob.getY() + 0.5);
         }
         int integer2 = Mth.floor(this.mob.getY());
-        Block bph3 = this.level.getBlockState(new BlockPos(this.mob.getX(), integer2, this.mob.getZ())).getBlock();
+        Block bvr3 = this.level.getBlockState(new BlockPos(this.mob.getX(), integer2, this.mob.getZ())).getBlock();
         int integer3 = 0;
-        while (bph3 == Blocks.WATER) {
+        while (bvr3 == Blocks.WATER) {
             ++integer2;
-            bph3 = this.level.getBlockState(new BlockPos(this.mob.getX(), integer2, this.mob.getZ())).getBlock();
+            bvr3 = this.level.getBlockState(new BlockPos(this.mob.getX(), integer2, this.mob.getZ())).getBlock();
             if (++integer3 > 16) {
                 return Mth.floor(this.mob.getY());
             }
@@ -91,8 +91,8 @@ public class GroundPathNavigation extends PathNavigation {
                 return;
             }
             for (int integer2 = 0; integer2 < this.path.getSize(); ++integer2) {
-                final Node cqo3 = this.path.get(integer2);
-                if (this.level.canSeeSky(new BlockPos(cqo3.x, cqo3.y, cqo3.z))) {
+                final Node czd3 = this.path.get(integer2);
+                if (this.level.canSeeSky(new BlockPos(czd3.x, czd3.y, czd3.z))) {
                     this.path.truncate(integer2);
                     return;
                 }
@@ -101,11 +101,11 @@ public class GroundPathNavigation extends PathNavigation {
     }
     
     @Override
-    protected boolean canMoveDirectly(final Vec3 cvl1, final Vec3 cvl2, int integer3, final int integer4, int integer5) {
-        int integer6 = Mth.floor(cvl1.x);
-        int integer7 = Mth.floor(cvl1.z);
-        double double9 = cvl2.x - cvl1.x;
-        double double10 = cvl2.z - cvl1.z;
+    protected boolean canMoveDirectly(final Vec3 dem1, final Vec3 dem2, int integer3, final int integer4, int integer5) {
+        int integer6 = Mth.floor(dem1.x);
+        int integer7 = Mth.floor(dem1.z);
+        double double9 = dem2.x - dem1.x;
+        double double10 = dem2.z - dem1.z;
         final double double11 = double9 * double9 + double10 * double10;
         if (double11 < 1.0E-8) {
             return false;
@@ -115,15 +115,15 @@ public class GroundPathNavigation extends PathNavigation {
         double10 *= double12;
         integer3 += 2;
         integer5 += 2;
-        if (!this.canWalkOn(integer6, Mth.floor(cvl1.y), integer7, integer3, integer4, integer5, cvl1, double9, double10)) {
+        if (!this.canWalkOn(integer6, Mth.floor(dem1.y), integer7, integer3, integer4, integer5, dem1, double9, double10)) {
             return false;
         }
         integer3 -= 2;
         integer5 -= 2;
         final double double13 = 1.0 / Math.abs(double9);
         final double double14 = 1.0 / Math.abs(double10);
-        double double15 = integer6 - cvl1.x;
-        double double16 = integer7 - cvl1.z;
+        double double15 = integer6 - dem1.x;
+        double double16 = integer7 - dem1.z;
         if (double9 >= 0.0) {
             ++double15;
         }
@@ -134,8 +134,8 @@ public class GroundPathNavigation extends PathNavigation {
         double16 /= double10;
         final int integer8 = (double9 < 0.0) ? -1 : 1;
         final int integer9 = (double10 < 0.0) ? -1 : 1;
-        final int integer10 = Mth.floor(cvl2.x);
-        final int integer11 = Mth.floor(cvl2.z);
+        final int integer10 = Mth.floor(dem2.x);
+        final int integer11 = Mth.floor(dem2.z);
         int integer12 = integer10 - integer6;
         int integer13 = integer11 - integer7;
         while (integer12 * integer8 > 0 || integer13 * integer9 > 0) {
@@ -149,40 +149,34 @@ public class GroundPathNavigation extends PathNavigation {
                 integer7 += integer9;
                 integer13 = integer11 - integer7;
             }
-            if (!this.canWalkOn(integer6, Mth.floor(cvl1.y), integer7, integer3, integer4, integer5, cvl1, double9, double10)) {
+            if (!this.canWalkOn(integer6, Mth.floor(dem1.y), integer7, integer3, integer4, integer5, dem1, double9, double10)) {
                 return false;
             }
         }
         return true;
     }
     
-    private boolean canWalkOn(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final Vec3 cvl, final double double8, final double double9) {
+    private boolean canWalkOn(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final Vec3 dem, final double double8, final double double9) {
         final int integer7 = integer1 - integer4 / 2;
         final int integer8 = integer3 - integer6 / 2;
-        if (!this.canWalkAbove(integer7, integer2, integer8, integer4, integer5, integer6, cvl, double8, double9)) {
+        if (!this.canWalkAbove(integer7, integer2, integer8, integer4, integer5, integer6, dem, double8, double9)) {
             return false;
         }
         for (int integer9 = integer7; integer9 < integer7 + integer4; ++integer9) {
             for (int integer10 = integer8; integer10 < integer8 + integer6; ++integer10) {
-                final double double10 = integer9 + 0.5 - cvl.x;
-                final double double11 = integer10 + 0.5 - cvl.z;
+                final double double10 = integer9 + 0.5 - dem.x;
+                final double double11 = integer10 + 0.5 - dem.z;
                 if (double10 * double8 + double11 * double9 >= 0.0) {
-                    BlockPathTypes cqm21 = this.nodeEvaluator.getBlockPathType(this.level, integer9, integer2 - 1, integer10, this.mob, integer4, integer5, integer6, true, true);
-                    if (cqm21 == BlockPathTypes.WATER) {
+                    BlockPathTypes czb21 = this.nodeEvaluator.getBlockPathType(this.level, integer9, integer2 - 1, integer10, this.mob, integer4, integer5, integer6, true, true);
+                    if (!this.hasValidPathType(czb21)) {
                         return false;
                     }
-                    if (cqm21 == BlockPathTypes.LAVA) {
-                        return false;
-                    }
-                    if (cqm21 == BlockPathTypes.OPEN) {
-                        return false;
-                    }
-                    cqm21 = this.nodeEvaluator.getBlockPathType(this.level, integer9, integer2, integer10, this.mob, integer4, integer5, integer6, true, true);
-                    final float float22 = this.mob.getPathfindingMalus(cqm21);
+                    czb21 = this.nodeEvaluator.getBlockPathType(this.level, integer9, integer2, integer10, this.mob, integer4, integer5, integer6, true, true);
+                    final float float22 = this.mob.getPathfindingMalus(czb21);
                     if (float22 < 0.0f || float22 >= 8.0f) {
                         return false;
                     }
-                    if (cqm21 == BlockPathTypes.DAMAGE_FIRE || cqm21 == BlockPathTypes.DANGER_FIRE || cqm21 == BlockPathTypes.DAMAGE_OTHER) {
+                    if (czb21 == BlockPathTypes.DAMAGE_FIRE || czb21 == BlockPathTypes.DANGER_FIRE || czb21 == BlockPathTypes.DAMAGE_OTHER) {
                         return false;
                     }
                 }
@@ -191,14 +185,18 @@ public class GroundPathNavigation extends PathNavigation {
         return true;
     }
     
-    private boolean canWalkAbove(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final Vec3 cvl, final double double8, final double double9) {
-        for (final BlockPos fk14 : BlockPos.betweenClosed(new BlockPos(integer1, integer2, integer3), new BlockPos(integer1 + integer4 - 1, integer2 + integer5 - 1, integer3 + integer6 - 1))) {
-            final double double10 = fk14.getX() + 0.5 - cvl.x;
-            final double double11 = fk14.getZ() + 0.5 - cvl.z;
+    protected boolean hasValidPathType(final BlockPathTypes czb) {
+        return czb != BlockPathTypes.WATER && czb != BlockPathTypes.LAVA && czb != BlockPathTypes.OPEN;
+    }
+    
+    private boolean canWalkAbove(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final Vec3 dem, final double double8, final double double9) {
+        for (final BlockPos fu14 : BlockPos.betweenClosed(new BlockPos(integer1, integer2, integer3), new BlockPos(integer1 + integer4 - 1, integer2 + integer5 - 1, integer3 + integer6 - 1))) {
+            final double double10 = fu14.getX() + 0.5 - dem.x;
+            final double double11 = fu14.getZ() + 0.5 - dem.z;
             if (double10 * double8 + double11 * double9 < 0.0) {
                 continue;
             }
-            if (!this.level.getBlockState(fk14).isPathfindable(this.level, fk14, PathComputationType.LAND)) {
+            if (!this.level.getBlockState(fu14).isPathfindable(this.level, fu14, PathComputationType.LAND)) {
                 return false;
             }
         }
diff --git a/src/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/net/minecraft/world/entity/ai/navigation/PathNavigation.java
index 6783511..208456a 100644
--- a/src/net/minecraft/world/entity/ai/navigation/PathNavigation.java
+++ b/src/net/minecraft/world/entity/ai/navigation/PathNavigation.java
@@ -1,11 +1,10 @@
 package net.minecraft.world.entity.ai.navigation;
 
-import net.minecraft.core.Position;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.pathfinder.Node;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.Util;
+import net.minecraft.core.Position;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.pathfinder.WalkNodeEvaluator;
 import net.minecraft.network.protocol.game.DebugPackets;
@@ -17,12 +16,12 @@ import java.util.stream.Collectors;
 import java.util.Set;
 import java.util.stream.Stream;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.level.pathfinder.PathFinder;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.pathfinder.NodeEvaluator;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.world.level.Level;
@@ -34,11 +33,10 @@ public abstract class PathNavigation {
     @Nullable
     protected Path path;
     protected double speedModifier;
-    private final AttributeInstance followRange;
     protected int tick;
     protected int lastStuckCheck;
     protected Vec3 lastStuckCheckPos;
-    protected Vec3 timeoutCachedNode;
+    protected Vec3i timeoutCachedNode;
     protected long timeoutTimer;
     protected long lastTimeoutCheck;
     protected double timeoutLimit;
@@ -51,15 +49,14 @@ public abstract class PathNavigation {
     private float maxVisitedNodesMultiplier;
     private final PathFinder pathFinder;
     
-    public PathNavigation(final Mob ala, final Level bjw) {
+    public PathNavigation(final Mob aoz, final Level bqb) {
         this.lastStuckCheckPos = Vec3.ZERO;
-        this.timeoutCachedNode = Vec3.ZERO;
+        this.timeoutCachedNode = Vec3i.ZERO;
         this.maxDistanceToWaypoint = 0.5f;
         this.maxVisitedNodesMultiplier = 1.0f;
-        this.mob = ala;
-        this.level = bjw;
-        this.followRange = ala.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE);
-        final int integer4 = Mth.floor(this.followRange.getValue() * 16.0);
+        this.mob = aoz;
+        this.level = bqb;
+        final int integer4 = Mth.floor(aoz.getAttributeValue(Attributes.FOLLOW_RANGE) * 16.0);
         this.pathFinder = this.createPathFinder(integer4);
     }
     
@@ -110,13 +107,18 @@ public abstract class PathNavigation {
     }
     
     @Nullable
-    public Path createPath(final BlockPos fk, final int integer) {
-        return this.createPath(ImmutableSet.<BlockPos>of(fk), 8, false, integer);
+    public Path createPath(final Set<BlockPos> set, final int integer) {
+        return this.createPath(set, 8, false, integer);
     }
     
     @Nullable
-    public Path createPath(final Entity akq, final int integer) {
-        return this.createPath(ImmutableSet.<BlockPos>of(new BlockPos(akq)), 16, true, integer);
+    public Path createPath(final BlockPos fu, final int integer) {
+        return this.createPath(ImmutableSet.<BlockPos>of(fu), 8, false, integer);
+    }
+    
+    @Nullable
+    public Path createPath(final Entity aom, final int integer) {
+        return this.createPath(ImmutableSet.<BlockPos>of(aom.blockPosition()), 16, true, integer);
     }
     
     @Nullable
@@ -134,35 +136,36 @@ public abstract class PathNavigation {
             return this.path;
         }
         this.level.getProfiler().push("pathfind");
-        final float float6 = (float)this.followRange.getValue();
-        final BlockPos fk7 = boolean3 ? new BlockPos(this.mob).above() : new BlockPos(this.mob);
+        final float float6 = (float)this.mob.getAttributeValue(Attributes.FOLLOW_RANGE);
+        final BlockPos fu7 = boolean3 ? this.mob.blockPosition().above() : this.mob.blockPosition();
         final int integer5 = (int)(float6 + integer2);
-        final PathNavigationRegion bkh9 = new PathNavigationRegion(this.level, fk7.offset(-integer5, -integer5, -integer5), fk7.offset(integer5, integer5, integer5));
-        final Path cqq10 = this.pathFinder.findPath(bkh9, this.mob, set, float6, integer4, this.maxVisitedNodesMultiplier);
+        final PathNavigationRegion bql9 = new PathNavigationRegion(this.level, fu7.offset(-integer5, -integer5, -integer5), fu7.offset(integer5, integer5, integer5));
+        final Path czf10 = this.pathFinder.findPath(bql9, this.mob, set, float6, integer4, this.maxVisitedNodesMultiplier);
         this.level.getProfiler().pop();
-        if (cqq10 != null && cqq10.getTarget() != null) {
-            this.targetPos = cqq10.getTarget();
+        if (czf10 != null && czf10.getTarget() != null) {
+            this.targetPos = czf10.getTarget();
             this.reachRange = integer4;
+            this.resetStuckTimeout();
         }
-        return cqq10;
+        return czf10;
     }
     
     public boolean moveTo(final double double1, final double double2, final double double3, final double double4) {
         return this.moveTo(this.createPath(double1, double2, double3, 1), double4);
     }
     
-    public boolean moveTo(final Entity akq, final double double2) {
-        final Path cqq5 = this.createPath(akq, 1);
-        return cqq5 != null && this.moveTo(cqq5, double2);
+    public boolean moveTo(final Entity aom, final double double2) {
+        final Path czf5 = this.createPath(aom, 1);
+        return czf5 != null && this.moveTo(czf5, double2);
     }
     
-    public boolean moveTo(@Nullable final Path cqq, final double double2) {
-        if (cqq == null) {
+    public boolean moveTo(@Nullable final Path czf, final double double2) {
+        if (czf == null) {
             this.path = null;
             return false;
         }
-        if (!cqq.sameAs(this.path)) {
-            this.path = cqq;
+        if (!czf.sameAs(this.path)) {
+            this.path = czf;
         }
         if (this.isDone()) {
             return false;
@@ -172,9 +175,9 @@ public abstract class PathNavigation {
             return false;
         }
         this.speedModifier = double2;
-        final Vec3 cvl5 = this.getTempMobPos();
+        final Vec3 dem5 = this.getTempMobPos();
         this.lastStuckCheck = this.tick;
-        this.lastStuckCheckPos = cvl5;
+        this.lastStuckCheckPos = dem5;
         return true;
     }
     
@@ -192,12 +195,12 @@ public abstract class PathNavigation {
             return;
         }
         if (this.canUpdatePath()) {
-            this.updatePath();
+            this.followThePath();
         }
         else if (this.path != null && this.path.getIndex() < this.path.getSize()) {
-            final Vec3 cvl2 = this.getTempMobPos();
-            final Vec3 cvl3 = this.path.getPos(this.mob, this.path.getIndex());
-            if (cvl2.y > cvl3.y && !this.mob.onGround && Mth.floor(cvl2.x) == Mth.floor(cvl3.x) && Mth.floor(cvl2.z) == Mth.floor(cvl3.z)) {
+            final Vec3 dem2 = this.getTempMobPos();
+            final Vec3 dem3 = this.path.getPos(this.mob, this.path.getIndex());
+            if (dem2.y > dem3.y && !this.mob.isOnGround() && Mth.floor(dem2.x) == Mth.floor(dem3.x) && Mth.floor(dem2.z) == Mth.floor(dem3.z)) {
                 this.path.setIndex(this.path.getIndex() + 1);
             }
         }
@@ -205,49 +208,71 @@ public abstract class PathNavigation {
         if (this.isDone()) {
             return;
         }
-        final Vec3 cvl2 = this.path.currentPos(this.mob);
-        final BlockPos fk3 = new BlockPos(cvl2);
-        this.mob.getMoveControl().setWantedPosition(cvl2.x, this.level.getBlockState(fk3.below()).isAir() ? cvl2.y : WalkNodeEvaluator.getFloorLevel(this.level, fk3), cvl2.z, this.speedModifier);
+        final Vec3 dem2 = this.path.currentPos(this.mob);
+        final BlockPos fu3 = new BlockPos(dem2);
+        this.mob.getMoveControl().setWantedPosition(dem2.x, this.level.getBlockState(fu3.below()).isAir() ? dem2.y : WalkNodeEvaluator.getFloorLevel(this.level, fu3), dem2.z, this.speedModifier);
     }
     
-    protected void updatePath() {
-        final Vec3 cvl2 = this.getTempMobPos();
+    protected void followThePath() {
+        final Vec3 dem2 = this.getTempMobPos();
         this.maxDistanceToWaypoint = ((this.mob.getBbWidth() > 0.75f) ? (this.mob.getBbWidth() / 2.0f) : (0.75f - this.mob.getBbWidth() / 2.0f));
-        final Vec3 cvl3 = this.path.currentPos();
-        if (Math.abs(this.mob.getX() - (cvl3.x + 0.5)) < this.maxDistanceToWaypoint && Math.abs(this.mob.getZ() - (cvl3.z + 0.5)) < this.maxDistanceToWaypoint && Math.abs(this.mob.getY() - cvl3.y) < 1.0) {
+        final Vec3i gr3 = this.path.currentPos();
+        final double double4 = Math.abs(this.mob.getX() - (gr3.getX() + 0.5));
+        final double double5 = Math.abs(this.mob.getY() - gr3.getY());
+        final double double6 = Math.abs(this.mob.getZ() - (gr3.getZ() + 0.5));
+        final boolean boolean10 = double4 < this.maxDistanceToWaypoint && double6 < this.maxDistanceToWaypoint && double5 < 1.0;
+        if (boolean10 || (this.mob.canCutCorner(this.path.currentNode().type) && this.shouldTargetNextNodeInDirection(dem2))) {
             this.path.setIndex(this.path.getIndex() + 1);
         }
-        this.doStuckDetection(cvl2);
+        this.doStuckDetection(dem2);
     }
     
-    protected void doStuckDetection(final Vec3 cvl) {
+    private boolean shouldTargetNextNodeInDirection(final Vec3 dem) {
+        if (this.path.getSize() <= this.path.getIndex() + 1) {
+            return false;
+        }
+        final Vec3 dem2 = Vec3.atBottomCenterOf(this.path.get(this.path.getIndex()).asBlockPos());
+        if (!dem.closerThan(dem2, 2.0)) {
+            return false;
+        }
+        final Vec3 dem3 = Vec3.atBottomCenterOf(this.path.get(this.path.getIndex() + 1).asBlockPos());
+        final Vec3 dem4 = dem3.subtract(dem2);
+        final Vec3 dem5 = dem.subtract(dem2);
+        return dem4.dot(dem5) > 0.0;
+    }
+    
+    protected void doStuckDetection(final Vec3 dem) {
         if (this.tick - this.lastStuckCheck > 100) {
-            if (cvl.distanceToSqr(this.lastStuckCheckPos) < 2.25) {
+            if (dem.distanceToSqr(this.lastStuckCheckPos) < 2.25) {
                 this.stop();
             }
             this.lastStuckCheck = this.tick;
-            this.lastStuckCheckPos = cvl;
+            this.lastStuckCheckPos = dem;
         }
         if (this.path != null && !this.path.isDone()) {
-            final Vec3 cvl2 = this.path.currentPos();
-            if (cvl2.equals(this.timeoutCachedNode)) {
+            final Vec3i gr3 = this.path.currentPos();
+            if (gr3.equals(this.timeoutCachedNode)) {
                 this.timeoutTimer += Util.getMillis() - this.lastTimeoutCheck;
             }
             else {
-                this.timeoutCachedNode = cvl2;
-                final double double4 = cvl.distanceTo(this.timeoutCachedNode);
+                this.timeoutCachedNode = gr3;
+                final double double4 = dem.distanceTo(Vec3.atBottomCenterOf(this.timeoutCachedNode));
                 this.timeoutLimit = ((this.mob.getSpeed() > 0.0f) ? (double4 / this.mob.getSpeed() * 1000.0) : 0.0);
             }
             if (this.timeoutLimit > 0.0 && this.timeoutTimer > this.timeoutLimit * 3.0) {
-                this.timeoutCachedNode = Vec3.ZERO;
-                this.timeoutTimer = 0L;
-                this.timeoutLimit = 0.0;
+                this.resetStuckTimeout();
                 this.stop();
             }
             this.lastTimeoutCheck = Util.getMillis();
         }
     }
     
+    private void resetStuckTimeout() {
+        this.timeoutCachedNode = Vec3i.ZERO;
+        this.timeoutTimer = 0L;
+        this.timeoutLimit = 0.0;
+    }
+    
     public boolean isDone() {
         return this.path == null || this.path.isDone();
     }
@@ -273,24 +298,23 @@ public abstract class PathNavigation {
             return;
         }
         for (int integer2 = 0; integer2 < this.path.getSize(); ++integer2) {
-            final Node cqo3 = this.path.get(integer2);
-            final Node cqo4 = (integer2 + 1 < this.path.getSize()) ? this.path.get(integer2 + 1) : null;
-            final BlockState byj5 = this.level.getBlockState(new BlockPos(cqo3.x, cqo3.y, cqo3.z));
-            final Block bph6 = byj5.getBlock();
-            if (bph6 == Blocks.CAULDRON) {
-                this.path.set(integer2, cqo3.cloneMove(cqo3.x, cqo3.y + 1, cqo3.z));
-                if (cqo4 != null && cqo3.y >= cqo4.y) {
-                    this.path.set(integer2 + 1, cqo4.cloneMove(cqo4.x, cqo3.y + 1, cqo4.z));
+            final Node czd3 = this.path.get(integer2);
+            final Node czd4 = (integer2 + 1 < this.path.getSize()) ? this.path.get(integer2 + 1) : null;
+            final BlockState cfj5 = this.level.getBlockState(new BlockPos(czd3.x, czd3.y, czd3.z));
+            if (cfj5.is(Blocks.CAULDRON)) {
+                this.path.set(integer2, czd3.cloneMove(czd3.x, czd3.y + 1, czd3.z));
+                if (czd4 != null && czd3.y >= czd4.y) {
+                    this.path.set(integer2 + 1, czd4.cloneMove(czd4.x, czd3.y + 1, czd4.z));
                 }
             }
         }
     }
     
-    protected abstract boolean canMoveDirectly(final Vec3 cvl1, final Vec3 cvl2, final int integer3, final int integer4, final int integer5);
+    protected abstract boolean canMoveDirectly(final Vec3 dem1, final Vec3 dem2, final int integer3, final int integer4, final int integer5);
     
-    public boolean isStableDestination(final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        return this.level.getBlockState(fk2).isSolidRender(this.level, fk2);
+    public boolean isStableDestination(final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        return this.level.getBlockState(fu2).isSolidRender(this.level, fu2);
     }
     
     public NodeEvaluator getNodeEvaluator() {
@@ -305,13 +329,13 @@ public abstract class PathNavigation {
         return this.nodeEvaluator.canFloat();
     }
     
-    public void recomputePath(final BlockPos fk) {
+    public void recomputePath(final BlockPos fu) {
         if (this.path == null || this.path.isDone() || this.path.getSize() == 0) {
             return;
         }
-        final Node cqo3 = this.path.last();
-        final Vec3 cvl4 = new Vec3((cqo3.x + this.mob.getX()) / 2.0, (cqo3.y + this.mob.getY()) / 2.0, (cqo3.z + this.mob.getZ()) / 2.0);
-        if (fk.closerThan(cvl4, this.path.getSize() - this.path.getIndex())) {
+        final Node czd3 = this.path.last();
+        final Vec3 dem4 = new Vec3((czd3.x + this.mob.getX()) / 2.0, (czd3.y + this.mob.getY()) / 2.0, (czd3.z + this.mob.getZ()) / 2.0);
+        if (fu.closerThan(dem4, this.path.getSize() - this.path.getIndex())) {
             this.recomputePath();
         }
     }
diff --git a/src/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java b/src/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
index 39a9be6..1904b84 100644
--- a/src/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
+++ b/src/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
@@ -10,29 +10,29 @@ import net.minecraft.core.BlockPos;
 public class WallClimberNavigation extends GroundPathNavigation {
     private BlockPos pathToPosition;
     
-    public WallClimberNavigation(final Mob ala, final Level bjw) {
-        super(ala, bjw);
+    public WallClimberNavigation(final Mob aoz, final Level bqb) {
+        super(aoz, bqb);
     }
     
     @Override
-    public Path createPath(final BlockPos fk, final int integer) {
-        this.pathToPosition = fk;
-        return super.createPath(fk, integer);
+    public Path createPath(final BlockPos fu, final int integer) {
+        this.pathToPosition = fu;
+        return super.createPath(fu, integer);
     }
     
     @Override
-    public Path createPath(final Entity akq, final int integer) {
-        this.pathToPosition = new BlockPos(akq);
-        return super.createPath(akq, integer);
+    public Path createPath(final Entity aom, final int integer) {
+        this.pathToPosition = aom.blockPosition();
+        return super.createPath(aom, integer);
     }
     
     @Override
-    public boolean moveTo(final Entity akq, final double double2) {
-        final Path cqq5 = this.createPath(akq, 0);
-        if (cqq5 != null) {
-            return this.moveTo(cqq5, double2);
+    public boolean moveTo(final Entity aom, final double double2) {
+        final Path czf5 = this.createPath(aom, 0);
+        if (czf5 != null) {
+            return this.moveTo(czf5, double2);
         }
-        this.pathToPosition = new BlockPos(akq);
+        this.pathToPosition = aom.blockPosition();
         this.speedModifier = double2;
         return true;
     }
diff --git a/src/net/minecraft/world/entity/ai/navigation/WaterBoundPathNavigation.java b/src/net/minecraft/world/entity/ai/navigation/WaterBoundPathNavigation.java
index 167569b..bde3f0b 100644
--- a/src/net/minecraft/world/entity/ai/navigation/WaterBoundPathNavigation.java
+++ b/src/net/minecraft/world/entity/ai/navigation/WaterBoundPathNavigation.java
@@ -4,6 +4,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.level.ClipContext;
+import net.minecraft.core.Vec3i;
 import net.minecraft.Util;
 import net.minecraft.network.protocol.game.DebugPackets;
 import net.minecraft.util.Mth;
@@ -18,8 +19,8 @@ import net.minecraft.world.entity.Mob;
 public class WaterBoundPathNavigation extends PathNavigation {
     private boolean allowBreaching;
     
-    public WaterBoundPathNavigation(final Mob ala, final Level bjw) {
-        super(ala, bjw);
+    public WaterBoundPathNavigation(final Mob aoz, final Level bqb) {
+        super(aoz, bqb);
     }
     
     @Override
@@ -49,11 +50,11 @@ public class WaterBoundPathNavigation extends PathNavigation {
             return;
         }
         if (this.canUpdatePath()) {
-            this.updatePath();
+            this.followThePath();
         }
         else if (this.path != null && this.path.getIndex() < this.path.getSize()) {
-            final Vec3 cvl2 = this.path.getPos(this.mob, this.path.getIndex());
-            if (Mth.floor(this.mob.getX()) == Mth.floor(cvl2.x) && Mth.floor(this.mob.getY()) == Mth.floor(cvl2.y) && Mth.floor(this.mob.getZ()) == Mth.floor(cvl2.z)) {
+            final Vec3 dem2 = this.path.getPos(this.mob, this.path.getIndex());
+            if (Mth.floor(this.mob.getX()) == Mth.floor(dem2.x) && Mth.floor(this.mob.getY()) == Mth.floor(dem2.y) && Mth.floor(this.mob.getZ()) == Mth.floor(dem2.z)) {
                 this.path.setIndex(this.path.getIndex() + 1);
             }
         }
@@ -61,60 +62,60 @@ public class WaterBoundPathNavigation extends PathNavigation {
         if (this.isDone()) {
             return;
         }
-        final Vec3 cvl2 = this.path.currentPos(this.mob);
-        this.mob.getMoveControl().setWantedPosition(cvl2.x, cvl2.y, cvl2.z, this.speedModifier);
+        final Vec3 dem2 = this.path.currentPos(this.mob);
+        this.mob.getMoveControl().setWantedPosition(dem2.x, dem2.y, dem2.z, this.speedModifier);
     }
     
     @Override
-    protected void updatePath() {
+    protected void followThePath() {
         if (this.path == null) {
             return;
         }
-        final Vec3 cvl2 = this.getTempMobPos();
+        final Vec3 dem2 = this.getTempMobPos();
         final float float3 = this.mob.getBbWidth();
         float float4 = (float3 > 0.75f) ? (float3 / 2.0f) : (0.75f - float3 / 2.0f);
-        final Vec3 cvl3 = this.mob.getDeltaMovement();
-        if (Math.abs(cvl3.x) > 0.2 || Math.abs(cvl3.z) > 0.2) {
-            float4 *= (float)(cvl3.length() * 6.0);
+        final Vec3 dem3 = this.mob.getDeltaMovement();
+        if (Math.abs(dem3.x) > 0.2 || Math.abs(dem3.z) > 0.2) {
+            float4 *= (float)(dem3.length() * 6.0);
         }
         final int integer6 = 6;
-        Vec3 cvl4 = this.path.currentPos();
-        if (Math.abs(this.mob.getX() - (cvl4.x + 0.5)) < float4 && Math.abs(this.mob.getZ() - (cvl4.z + 0.5)) < float4 && Math.abs(this.mob.getY() - cvl4.y) < float4 * 2.0f) {
+        Vec3 dem4 = Vec3.atBottomCenterOf(this.path.currentPos());
+        if (Math.abs(this.mob.getX() - dem4.x) < float4 && Math.abs(this.mob.getZ() - dem4.z) < float4 && Math.abs(this.mob.getY() - dem4.y) < float4 * 2.0f) {
             this.path.next();
         }
         for (int integer7 = Math.min(this.path.getIndex() + 6, this.path.getSize() - 1); integer7 > this.path.getIndex(); --integer7) {
-            cvl4 = this.path.getPos(this.mob, integer7);
-            if (cvl4.distanceToSqr(cvl2) <= 36.0) {
-                if (this.canMoveDirectly(cvl2, cvl4, 0, 0, 0)) {
+            dem4 = this.path.getPos(this.mob, integer7);
+            if (dem4.distanceToSqr(dem2) <= 36.0) {
+                if (this.canMoveDirectly(dem2, dem4, 0, 0, 0)) {
                     this.path.setIndex(integer7);
                     break;
                 }
             }
         }
-        this.doStuckDetection(cvl2);
+        this.doStuckDetection(dem2);
     }
     
     @Override
-    protected void doStuckDetection(final Vec3 cvl) {
+    protected void doStuckDetection(final Vec3 dem) {
         if (this.tick - this.lastStuckCheck > 100) {
-            if (cvl.distanceToSqr(this.lastStuckCheckPos) < 2.25) {
+            if (dem.distanceToSqr(this.lastStuckCheckPos) < 2.25) {
                 this.stop();
             }
             this.lastStuckCheck = this.tick;
-            this.lastStuckCheckPos = cvl;
+            this.lastStuckCheckPos = dem;
         }
         if (this.path != null && !this.path.isDone()) {
-            final Vec3 cvl2 = this.path.currentPos();
-            if (cvl2.equals(this.timeoutCachedNode)) {
+            final Vec3i gr3 = this.path.currentPos();
+            if (gr3.equals(this.timeoutCachedNode)) {
                 this.timeoutTimer += Util.getMillis() - this.lastTimeoutCheck;
             }
             else {
-                this.timeoutCachedNode = cvl2;
-                final double double4 = cvl.distanceTo(this.timeoutCachedNode);
+                this.timeoutCachedNode = gr3;
+                final double double4 = dem.distanceTo(Vec3.atCenterOf(this.timeoutCachedNode));
                 this.timeoutLimit = ((this.mob.getSpeed() > 0.0f) ? (double4 / this.mob.getSpeed() * 100.0) : 0.0);
             }
             if (this.timeoutLimit > 0.0 && this.timeoutTimer > this.timeoutLimit * 2.0) {
-                this.timeoutCachedNode = Vec3.ZERO;
+                this.timeoutCachedNode = Vec3i.ZERO;
                 this.timeoutTimer = 0L;
                 this.timeoutLimit = 0.0;
                 this.stop();
@@ -124,14 +125,14 @@ public class WaterBoundPathNavigation extends PathNavigation {
     }
     
     @Override
-    protected boolean canMoveDirectly(final Vec3 cvl1, final Vec3 cvl2, final int integer3, final int integer4, final int integer5) {
-        final Vec3 cvl3 = new Vec3(cvl2.x, cvl2.y + this.mob.getBbHeight() * 0.5, cvl2.z);
-        return this.level.clip(new ClipContext(cvl1, cvl3, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this.mob)).getType() == HitResult.Type.MISS;
+    protected boolean canMoveDirectly(final Vec3 dem1, final Vec3 dem2, final int integer3, final int integer4, final int integer5) {
+        final Vec3 dem3 = new Vec3(dem2.x, dem2.y + this.mob.getBbHeight() * 0.5, dem2.z);
+        return this.level.clip(new ClipContext(dem1, dem3, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this.mob)).getType() == HitResult.Type.MISS;
     }
     
     @Override
-    public boolean isStableDestination(final BlockPos fk) {
-        return !this.level.getBlockState(fk).isSolidRender(this.level, fk);
+    public boolean isStableDestination(final BlockPos fu) {
+        return !this.level.getBlockState(fu).isSolidRender(this.level, fu);
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/ai/sensing/AdultSensor.java b/src/net/minecraft/world/entity/ai/sensing/AdultSensor.java
new file mode 100644
index 0000000..f2be767
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/sensing/AdultSensor.java
@@ -0,0 +1,27 @@
+package net.minecraft.world.entity.ai.sensing;
+
+import java.util.Optional;
+import net.minecraft.world.entity.LivingEntity;
+import java.util.List;
+import net.minecraft.server.level.ServerLevel;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.Set;
+import net.minecraft.world.entity.AgableMob;
+
+public class AdultSensor extends Sensor<AgableMob> {
+    @Override
+    public Set<MemoryModuleType<?>> requires() {
+        return ImmutableSet.of(MemoryModuleType.NEAREST_VISIBLE_ADULT, (MemoryModuleType<AgableMob>)MemoryModuleType.VISIBLE_LIVING_ENTITIES);
+    }
+    
+    @Override
+    protected void doTick(final ServerLevel zd, final AgableMob aok) {
+        aok.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).ifPresent(list -> this.setNearestVisibleAdult(aok, list));
+    }
+    
+    private void setNearestVisibleAdult(final AgableMob aok, final List<LivingEntity> list) {
+        final Optional<AgableMob> optional4 = list.stream().filter(aoy -> aoy.getType() == aok.getType()).<AgableMob>map(aoy -> aoy).filter(aok -> !aok.isBaby()).findFirst();
+        aok.getBrain().<AgableMob>setMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT, optional4);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/sensing/DummySensor.java b/src/net/minecraft/world/entity/ai/sensing/DummySensor.java
index df5fd97..c34bd1d 100644
--- a/src/net/minecraft/world/entity/ai/sensing/DummySensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/DummySensor.java
@@ -8,7 +8,7 @@ import net.minecraft.world.entity.LivingEntity;
 
 public class DummySensor extends Sensor<LivingEntity> {
     @Override
-    protected void doTick(final ServerLevel xd, final LivingEntity akz) {
+    protected void doTick(final ServerLevel zd, final LivingEntity aoy) {
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/ai/sensing/GolemSensor.java b/src/net/minecraft/world/entity/ai/sensing/GolemSensor.java
index 11e16f9..f631e44 100644
--- a/src/net/minecraft/world/entity/ai/sensing/GolemSensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/GolemSensor.java
@@ -20,8 +20,8 @@ public class GolemSensor extends Sensor<LivingEntity> {
     }
     
     @Override
-    protected void doTick(final ServerLevel xd, final LivingEntity akz) {
-        checkForNearbyGolem(xd.getGameTime(), akz);
+    protected void doTick(final ServerLevel zd, final LivingEntity aoy) {
+        checkForNearbyGolem(zd.getGameTime(), aoy);
     }
     
     @Override
@@ -29,15 +29,15 @@ public class GolemSensor extends Sensor<LivingEntity> {
         return ImmutableSet.of(MemoryModuleType.LIVING_ENTITIES);
     }
     
-    public static void checkForNearbyGolem(final long long1, final LivingEntity akz) {
-        final Brain<?> alp4 = akz.getBrain();
-        final Optional<List<LivingEntity>> optional5 = alp4.<List<LivingEntity>>getMemory(MemoryModuleType.LIVING_ENTITIES);
+    public static void checkForNearbyGolem(final long long1, final LivingEntity aoy) {
+        final Brain<?> apr4 = aoy.getBrain();
+        final Optional<List<LivingEntity>> optional5 = apr4.<List<LivingEntity>>getMemory(MemoryModuleType.LIVING_ENTITIES);
         if (!optional5.isPresent()) {
             return;
         }
-        final boolean boolean6 = optional5.get().stream().anyMatch(akz -> akz.getType().equals(EntityType.IRON_GOLEM));
+        final boolean boolean6 = optional5.get().stream().anyMatch(aoy -> aoy.getType().equals(EntityType.IRON_GOLEM));
         if (boolean6) {
-            alp4.<Long>setMemory(MemoryModuleType.GOLEM_LAST_SEEN_TIME, long1);
+            apr4.<Long>setMemory(MemoryModuleType.GOLEM_LAST_SEEN_TIME, long1);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/sensing/HoglinSpecificSensor.java b/src/net/minecraft/world/entity/ai/sensing/HoglinSpecificSensor.java
new file mode 100644
index 0000000..8368f2d
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/sensing/HoglinSpecificSensor.java
@@ -0,0 +1,54 @@
+package net.minecraft.world.entity.ai.sensing;
+
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import java.util.Iterator;
+import net.minecraft.world.entity.ai.Brain;
+import com.google.common.collect.Lists;
+import net.minecraft.world.entity.monster.piglin.Piglin;
+import java.util.Optional;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.LivingEntity;
+import java.util.List;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.Set;
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
+
+public class HoglinSpecificSensor extends Sensor<Hoglin> {
+    @Override
+    public Set<MemoryModuleType<?>> requires() {
+        return ImmutableSet.of(MemoryModuleType.VISIBLE_LIVING_ENTITIES, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.NEAREST_REPELLENT, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLIN, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.NEAREST_VISIBLE_ADULT_HOGLINS, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, new MemoryModuleType[0]);
+    }
+    
+    @Override
+    protected void doTick(final ServerLevel zd, final Hoglin bcx) {
+        final Brain<?> apr4 = bcx.getBrain();
+        apr4.<BlockPos>setMemory(MemoryModuleType.NEAREST_REPELLENT, this.findNearestRepellent(zd, bcx));
+        Optional<Piglin> optional5 = Optional.<Piglin>empty();
+        int integer6 = 0;
+        final List<Hoglin> list7 = Lists.newArrayList();
+        final List<LivingEntity> list8 = apr4.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).orElse(Lists.newArrayList());
+        for (final LivingEntity aoy10 : list8) {
+            if (aoy10 instanceof Piglin && !aoy10.isBaby()) {
+                ++integer6;
+                if (!optional5.isPresent()) {
+                    optional5 = Optional.<Piglin>of(aoy10);
+                }
+            }
+            if (aoy10 instanceof Hoglin && !aoy10.isBaby()) {
+                list7.add((Hoglin)aoy10);
+            }
+        }
+        apr4.<Piglin>setMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLIN, optional5);
+        apr4.<List<Hoglin>>setMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_HOGLINS, list7);
+        apr4.<Integer>setMemory(MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, integer6);
+        apr4.<Integer>setMemory(MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, list7.size());
+    }
+    
+    private Optional<BlockPos> findNearestRepellent(final ServerLevel zd, final Hoglin bcx) {
+        return BlockPos.findClosestMatch(bcx.blockPosition(), 8, 4, fu -> zd.getBlockState(fu).is(BlockTags.HOGLIN_REPELLENTS));
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/sensing/HurtBySensor.java b/src/net/minecraft/world/entity/ai/sensing/HurtBySensor.java
index 7a787bb..faeff2a 100644
--- a/src/net/minecraft/world/entity/ai/sensing/HurtBySensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/HurtBySensor.java
@@ -1,32 +1,39 @@
 package net.minecraft.world.entity.ai.sensing;
 
-import com.google.common.collect.ImmutableSet;
-import java.util.Set;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.Brain;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.damagesource.DamageSource;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.Set;
 import net.minecraft.world.entity.LivingEntity;
 
 public class HurtBySensor extends Sensor<LivingEntity> {
-    @Override
-    protected void doTick(final ServerLevel xd, final LivingEntity akz) {
-        final Brain<?> alp4 = akz.getBrain();
-        if (akz.getLastDamageSource() != null) {
-            alp4.<DamageSource>setMemory(MemoryModuleType.HURT_BY, akz.getLastDamageSource());
-            final Entity akq5 = alp4.<DamageSource>getMemory(MemoryModuleType.HURT_BY).get().getEntity();
-            if (akq5 instanceof LivingEntity) {
-                alp4.<LivingEntity>setMemory(MemoryModuleType.HURT_BY_ENTITY, (LivingEntity)akq5);
-            }
-        }
-        else {
-            alp4.<DamageSource>eraseMemory(MemoryModuleType.HURT_BY);
-        }
-    }
-    
     @Override
     public Set<MemoryModuleType<?>> requires() {
         return ImmutableSet.of(MemoryModuleType.HURT_BY, (MemoryModuleType<DamageSource>)MemoryModuleType.HURT_BY_ENTITY);
     }
+    
+    @Override
+    protected void doTick(final ServerLevel zd, final LivingEntity aoy) {
+        final Brain<?> apr4 = aoy.getBrain();
+        final DamageSource anw5 = aoy.getLastDamageSource();
+        if (anw5 != null) {
+            apr4.<DamageSource>setMemory(MemoryModuleType.HURT_BY, aoy.getLastDamageSource());
+            final Entity aom6 = anw5.getEntity();
+            if (aom6 instanceof LivingEntity) {
+                apr4.<LivingEntity>setMemory(MemoryModuleType.HURT_BY_ENTITY, (LivingEntity)aom6);
+            }
+        }
+        else {
+            apr4.<DamageSource>eraseMemory(MemoryModuleType.HURT_BY);
+        }
+        final Brain brain;
+        apr4.<LivingEntity>getMemory(MemoryModuleType.HURT_BY_ENTITY).ifPresent(aoy -> {
+            if (!aoy.isAlive() || aoy.level != zd) {
+                brain.eraseMemory(MemoryModuleType.HURT_BY_ENTITY);
+            }
+        });
+    }
 }
diff --git a/src/net/minecraft/world/entity/ai/sensing/InteractableDoorsSensor.java b/src/net/minecraft/world/entity/ai/sensing/InteractableDoorsSensor.java
index 4b13307..e12b1f2 100644
--- a/src/net/minecraft/world/entity/ai/sensing/InteractableDoorsSensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/InteractableDoorsSensor.java
@@ -3,39 +3,41 @@ package net.minecraft.world.entity.ai.sensing;
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 import net.minecraft.world.entity.ai.Brain;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import java.util.List;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.core.GlobalPos;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import com.google.common.collect.Lists;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.LivingEntity;
 
 public class InteractableDoorsSensor extends Sensor<LivingEntity> {
     @Override
-    protected void doTick(final ServerLevel xd, final LivingEntity akz) {
-        final DimensionType cbi4 = xd.getDimension().getType();
-        final BlockPos fk5 = new BlockPos(akz);
+    protected void doTick(final ServerLevel zd, final LivingEntity aoy) {
+        final ResourceKey<Level> ug4 = zd.dimension();
+        final BlockPos fu5 = aoy.blockPosition();
         final List<GlobalPos> list6 = Lists.newArrayList();
         for (int integer7 = -1; integer7 <= 1; ++integer7) {
             for (int integer8 = -1; integer8 <= 1; ++integer8) {
                 for (int integer9 = -1; integer9 <= 1; ++integer9) {
-                    final BlockPos fk6 = fk5.offset(integer7, integer8, integer9);
-                    if (xd.getBlockState(fk6).is(BlockTags.WOODEN_DOORS)) {
-                        list6.add(GlobalPos.of(cbi4, fk6));
+                    final BlockPos fu6 = fu5.offset(integer7, integer8, integer9);
+                    if (zd.getBlockState(fu6).is(BlockTags.WOODEN_DOORS)) {
+                        list6.add(GlobalPos.of(ug4, fu6));
                     }
                 }
             }
         }
-        final Brain<?> alp7 = akz.getBrain();
+        final Brain<?> apr7 = aoy.getBrain();
         if (!list6.isEmpty()) {
-            alp7.<List<GlobalPos>>setMemory(MemoryModuleType.INTERACTABLE_DOORS, list6);
+            apr7.<List<GlobalPos>>setMemory(MemoryModuleType.INTERACTABLE_DOORS, list6);
         }
         else {
-            alp7.<List<GlobalPos>>eraseMemory(MemoryModuleType.INTERACTABLE_DOORS);
+            apr7.<List<GlobalPos>>eraseMemory(MemoryModuleType.INTERACTABLE_DOORS);
         }
     }
     
diff --git a/src/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java b/src/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
index c061823..35cc4b6 100644
--- a/src/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
@@ -6,7 +6,6 @@ import net.minecraft.world.level.pathfinder.Path;
 import java.util.stream.Stream;
 import java.util.function.Predicate;
 import net.minecraft.world.entity.ai.village.poi.PoiManager;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.core.BlockPos;
@@ -33,16 +32,16 @@ public class NearestBedSensor extends Sensor<Mob> {
     }
     
     @Override
-    protected void doTick(final ServerLevel xd, final Mob ala) {
-        if (!ala.isBaby()) {
+    protected void doTick(final ServerLevel zd, final Mob aoz) {
+        if (!aoz.isBaby()) {
             return;
         }
         this.triedCount = 0;
-        this.lastUpdate = xd.getGameTime() + xd.getRandom().nextInt(20);
-        final PoiManager asr4 = xd.getPoiManager();
+        this.lastUpdate = zd.getGameTime() + zd.getRandom().nextInt(20);
+        final PoiManager axz4 = zd.getPoiManager();
         final long long3;
-        final Predicate<BlockPos> predicate5 = fk -> {
-            long3 = fk.asLong();
+        final Predicate<BlockPos> predicate5 = fu -> {
+            long3 = fu.asLong();
             if (this.batchCache.containsKey(long3)) {
                 return false;
             }
@@ -54,13 +53,13 @@ public class NearestBedSensor extends Sensor<Mob> {
                 return true;
             }
         };
-        final Stream<BlockPos> stream6 = asr4.findAll(PoiType.HOME.getPredicate(), predicate5, new BlockPos(ala), 48, PoiManager.Occupancy.ANY);
-        final Path cqq7 = ala.getNavigation().createPath(stream6, PoiType.HOME.getValidRange());
-        if (cqq7 != null && cqq7.canReach()) {
-            final BlockPos fk2 = cqq7.getTarget();
-            final Optional<PoiType> optional9 = asr4.getType(fk2);
+        final Stream<BlockPos> stream6 = axz4.findAll(PoiType.HOME.getPredicate(), predicate5, aoz.blockPosition(), 48, PoiManager.Occupancy.ANY);
+        final Path czf7 = aoz.getNavigation().createPath(stream6, PoiType.HOME.getValidRange());
+        if (czf7 != null && czf7.canReach()) {
+            final BlockPos fu2 = czf7.getTarget();
+            final Optional<PoiType> optional9 = axz4.getType(fu2);
             if (optional9.isPresent()) {
-                ala.getBrain().<BlockPos>setMemory(MemoryModuleType.NEAREST_BED, fk2);
+                aoz.getBrain().<BlockPos>setMemory(MemoryModuleType.NEAREST_BED, fu2);
             }
         }
         else if (this.triedCount < 5) {
diff --git a/src/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java b/src/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
new file mode 100644
index 0000000..6cdc0c8
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
@@ -0,0 +1,32 @@
+package net.minecraft.world.entity.ai.sensing;
+
+import net.minecraft.world.entity.LivingEntity;
+import java.util.List;
+import net.minecraft.world.entity.ai.Brain;
+import java.util.Optional;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.Entity;
+import java.util.function.ToDoubleFunction;
+import java.util.Comparator;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.item.ItemEntity;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.Set;
+import net.minecraft.world.entity.Mob;
+
+public class NearestItemSensor extends Sensor<Mob> {
+    @Override
+    public Set<MemoryModuleType<?>> requires() {
+        return ImmutableSet.of(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM);
+    }
+    
+    @Override
+    protected void doTick(final ServerLevel zd, final Mob aoz) {
+        final Brain<?> apr4 = aoz.getBrain();
+        final List<ItemEntity> list5 = zd.<ItemEntity>getEntitiesOfClass(ItemEntity.class, aoz.getBoundingBox().inflate(8.0, 4.0, 8.0), bbg -> true);
+        list5.sort(Comparator.comparingDouble(aoz::distanceToSqr));
+        final Optional<ItemEntity> optional6 = list5.stream().filter(bbg -> aoz.wantsToPickUp(bbg.getItem())).filter(bbg -> bbg.closerThan(aoz, 9.0)).filter(aoz::canSee).findFirst();
+        apr4.<ItemEntity>setMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, optional6);
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java b/src/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
index dd30f63..6e098db 100644
--- a/src/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
@@ -5,7 +5,6 @@ import java.util.Set;
 import net.minecraft.world.entity.ai.Brain;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
-import java.util.function.Predicate;
 import java.util.List;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import java.util.function.ToDoubleFunction;
@@ -18,12 +17,12 @@ public class NearestLivingEntitySensor extends Sensor<LivingEntity> {
     private static final TargetingConditions TARGETING;
     
     @Override
-    protected void doTick(final ServerLevel xd, final LivingEntity akz) {
-        final List<LivingEntity> list4 = xd.<LivingEntity>getEntitiesOfClass(LivingEntity.class, akz.getBoundingBox().inflate(16.0, 16.0, 16.0), akz2 -> akz2 != akz && akz2.isAlive());
-        list4.sort(Comparator.comparingDouble(akz::distanceToSqr));
-        final Brain<?> alp5 = akz.getBrain();
-        alp5.<List<LivingEntity>>setMemory(MemoryModuleType.LIVING_ENTITIES, list4);
-        alp5.<List<LivingEntity>>setMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES, list4.stream().filter(akz2 -> NearestLivingEntitySensor.TARGETING.test(akz, akz2)).filter(akz::canSee).collect(Collectors.toList()));
+    protected void doTick(final ServerLevel zd, final LivingEntity aoy) {
+        final List<LivingEntity> list4 = zd.<LivingEntity>getEntitiesOfClass(LivingEntity.class, aoy.getBoundingBox().inflate(16.0, 16.0, 16.0), aoy2 -> aoy2 != aoy && aoy2.isAlive());
+        list4.sort(Comparator.comparingDouble(aoy::distanceToSqr));
+        final Brain<?> apr5 = aoy.getBrain();
+        apr5.<List<LivingEntity>>setMemory(MemoryModuleType.LIVING_ENTITIES, list4);
+        apr5.<List<LivingEntity>>setMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES, list4.stream().filter(aoy2 -> NearestLivingEntitySensor.TARGETING.test(aoy, aoy2)).collect(Collectors.toList()));
     }
     
     @Override
@@ -32,6 +31,6 @@ public class NearestLivingEntitySensor extends Sensor<LivingEntity> {
     }
     
     static {
-        TARGETING = new TargetingConditions().range(16.0).allowSameTeam().allowNonAttackable().allowUnseeable();
+        TARGETING = new TargetingConditions().range(16.0).allowSameTeam().allowNonAttackable();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/sensing/PiglinSpecificSensor.java b/src/net/minecraft/world/entity/ai/sensing/PiglinSpecificSensor.java
new file mode 100644
index 0000000..a3c3f6a
--- /dev/null
+++ b/src/net/minecraft/world/entity/ai/sensing/PiglinSpecificSensor.java
@@ -0,0 +1,132 @@
+package net.minecraft.world.entity.ai.sensing;
+
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.CampfireBlock;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import java.util.Iterator;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.boss.wither.WitherBoss;
+import net.minecraft.world.entity.monster.WitherSkeleton;
+import net.minecraft.world.entity.monster.piglin.PiglinAi;
+import net.minecraft.world.entity.EntitySelector;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.monster.piglin.Piglin;
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
+import net.minecraft.world.entity.Mob;
+import java.util.Optional;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import java.util.List;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.Set;
+import net.minecraft.world.entity.LivingEntity;
+
+public class PiglinSpecificSensor extends Sensor<LivingEntity> {
+    @Override
+    public Set<MemoryModuleType<?>> requires() {
+        return ImmutableSet.of(MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryModuleType.LIVING_ENTITIES, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.NEAREST_VISIBLE_NEMESIS, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.NEAREST_TARGETABLE_PLAYER_NOT_WEARING_GOLD, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.NEAREST_PLAYER_HOLDING_WANTED_ITEM, (MemoryModuleType<List<LivingEntity>>)MemoryModuleType.NEAREST_VISIBLE_HUNTABLE_HOGLIN, MemoryModuleType.NEAREST_VISIBLE_BABY_HOGLIN, MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLINS, MemoryModuleType.NEAREST_ADULT_PIGLINS, MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, MemoryModuleType.NEAREST_REPELLENT);
+    }
+    
+    @Override
+    protected void doTick(final ServerLevel zd, final LivingEntity aoy) {
+        final Brain<?> apr4 = aoy.getBrain();
+        apr4.<BlockPos>setMemory(MemoryModuleType.NEAREST_REPELLENT, findNearestRepellent(zd, aoy));
+        Optional<Mob> optional5 = Optional.<Mob>empty();
+        Optional<Hoglin> optional6 = Optional.<Hoglin>empty();
+        Optional<Hoglin> optional7 = Optional.<Hoglin>empty();
+        Optional<Piglin> optional8 = Optional.<Piglin>empty();
+        Optional<LivingEntity> optional9 = Optional.<LivingEntity>empty();
+        Optional<Player> optional10 = Optional.<Player>empty();
+        Optional<Player> optional11 = Optional.<Player>empty();
+        int integer12 = 0;
+        final List<Piglin> list13 = Lists.newArrayList();
+        final List<Piglin> list14 = Lists.newArrayList();
+        final List<LivingEntity> list15 = apr4.<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).orElse(ImmutableList.of());
+        for (final LivingEntity aoy2 : list15) {
+            if (aoy2 instanceof Hoglin) {
+                final Hoglin bcx18 = (Hoglin)aoy2;
+                if (bcx18.isBaby() && !optional7.isPresent()) {
+                    optional7 = Optional.<Hoglin>of(bcx18);
+                }
+                else {
+                    if (!bcx18.isAdult()) {
+                        continue;
+                    }
+                    ++integer12;
+                    if (optional6.isPresent() || !bcx18.canBeHunted()) {
+                        continue;
+                    }
+                    optional6 = Optional.<Hoglin>of(bcx18);
+                }
+            }
+            else if (aoy2 instanceof Piglin) {
+                final Piglin bdc18 = (Piglin)aoy2;
+                if (bdc18.isBaby() && !optional8.isPresent()) {
+                    optional8 = Optional.<Piglin>of(bdc18);
+                }
+                else {
+                    if (!bdc18.isAdult()) {
+                        continue;
+                    }
+                    list13.add(bdc18);
+                }
+            }
+            else if (aoy2 instanceof Player) {
+                final Player bec18 = (Player)aoy2;
+                if (!optional10.isPresent() && EntitySelector.ATTACK_ALLOWED.test(aoy2) && !PiglinAi.isWearingGold(bec18)) {
+                    optional10 = Optional.<Player>of(bec18);
+                }
+                if (optional11.isPresent() || bec18.isSpectator() || !PiglinAi.isPlayerHoldingLovedItem(bec18)) {
+                    continue;
+                }
+                optional11 = Optional.<Player>of(bec18);
+            }
+            else if (!optional5.isPresent() && (aoy2 instanceof WitherSkeleton || aoy2 instanceof WitherBoss)) {
+                optional5 = Optional.<Mob>of(aoy2);
+            }
+            else {
+                if (optional9.isPresent() || !PiglinAi.isZombified(aoy2.getType())) {
+                    continue;
+                }
+                optional9 = Optional.<LivingEntity>of(aoy2);
+            }
+        }
+        final List<LivingEntity> list16 = apr4.<List<LivingEntity>>getMemory(MemoryModuleType.LIVING_ENTITIES).orElse(ImmutableList.of());
+        for (final LivingEntity aoy3 : list16) {
+            if (aoy3 instanceof Piglin && ((Piglin)aoy3).isAdult()) {
+                list14.add((Piglin)aoy3);
+            }
+        }
+        apr4.<Mob>setMemory(MemoryModuleType.NEAREST_VISIBLE_NEMESIS, optional5);
+        apr4.<Hoglin>setMemory(MemoryModuleType.NEAREST_VISIBLE_HUNTABLE_HOGLIN, optional6);
+        apr4.<Hoglin>setMemory(MemoryModuleType.NEAREST_VISIBLE_BABY_HOGLIN, optional7);
+        apr4.<Piglin>setMemory(MemoryModuleType.NEAREST_VISIBLE_BABY_PIGLIN, optional8);
+        apr4.<LivingEntity>setMemory(MemoryModuleType.NEAREST_VISIBLE_ZOMBIFIED, optional9);
+        apr4.<Player>setMemory(MemoryModuleType.NEAREST_TARGETABLE_PLAYER_NOT_WEARING_GOLD, optional10);
+        apr4.<Player>setMemory(MemoryModuleType.NEAREST_PLAYER_HOLDING_WANTED_ITEM, optional11);
+        apr4.<List<Piglin>>setMemory(MemoryModuleType.NEAREST_ADULT_PIGLINS, list14);
+        apr4.<List<Piglin>>setMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLINS, list13);
+        apr4.<Integer>setMemory(MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, list13.size());
+        apr4.<Integer>setMemory(MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, integer12);
+    }
+    
+    private static Optional<BlockPos> findNearestRepellent(final ServerLevel zd, final LivingEntity aoy) {
+        return BlockPos.findClosestMatch(aoy.blockPosition(), 8, 4, fu -> isValidRepellent(zd, fu));
+    }
+    
+    private static boolean isValidRepellent(final ServerLevel zd, final BlockPos fu) {
+        final BlockState cfj3 = zd.getBlockState(fu);
+        final boolean boolean4 = cfj3.is(BlockTags.PIGLIN_REPELLENTS);
+        if (boolean4 && cfj3.is(Blocks.SOUL_CAMPFIRE)) {
+            return CampfireBlock.isLitCampfire(cfj3);
+        }
+        return boolean4;
+    }
+}
diff --git a/src/net/minecraft/world/entity/ai/sensing/PlayerSensor.java b/src/net/minecraft/world/entity/ai/sensing/PlayerSensor.java
index 45a4bc9..bd8e396 100644
--- a/src/net/minecraft/world/entity/ai/sensing/PlayerSensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/PlayerSensor.java
@@ -1,10 +1,8 @@
 package net.minecraft.world.entity.ai.sensing;
 
 import net.minecraft.server.level.ServerPlayer;
-import com.google.common.collect.ImmutableSet;
-import java.util.Set;
 import net.minecraft.world.entity.ai.Brain;
-import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.Optional;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.function.ToDoubleFunction;
@@ -12,22 +10,35 @@ import java.util.Comparator;
 import net.minecraft.world.entity.Entity;
 import java.util.function.Predicate;
 import net.minecraft.world.entity.EntitySelector;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
 import java.util.List;
-import net.minecraft.server.level.ServerLevel;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import java.util.Set;
+import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import net.minecraft.world.entity.LivingEntity;
 
 public class PlayerSensor extends Sensor<LivingEntity> {
-    @Override
-    protected void doTick(final ServerLevel xd, final LivingEntity akz) {
-        final List<Player> list4 = xd.players().stream().filter(EntitySelector.NO_SPECTATORS).filter(xe -> akz.distanceToSqr(xe) < 256.0).sorted(Comparator.comparingDouble(akz::distanceToSqr)).collect(Collectors.toList());
-        final Brain<?> alp5 = akz.getBrain();
-        alp5.<List<Player>>setMemory(MemoryModuleType.NEAREST_PLAYERS, list4);
-        alp5.<Player>setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, list4.stream().filter(akz::canSee).findFirst());
-    }
+    private static final TargetingConditions TARGETING;
     
     @Override
     public Set<MemoryModuleType<?>> requires() {
-        return ImmutableSet.of(MemoryModuleType.NEAREST_PLAYERS, (MemoryModuleType<List<Player>>)MemoryModuleType.NEAREST_VISIBLE_PLAYER);
+        return ImmutableSet.of(MemoryModuleType.NEAREST_PLAYERS, (MemoryModuleType<List<Player>>)MemoryModuleType.NEAREST_VISIBLE_PLAYER, (MemoryModuleType<List<Player>>)MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER);
+    }
+    
+    @Override
+    protected void doTick(final ServerLevel zd, final LivingEntity aoy) {
+        final List<Player> list4 = zd.players().stream().filter(EntitySelector.NO_SPECTATORS).filter(ze -> aoy.distanceToSqr(ze) < 256.0).sorted(Comparator.comparingDouble(aoy::distanceToSqr)).collect(Collectors.toList());
+        final Brain<?> apr5 = aoy.getBrain();
+        apr5.<List<Player>>setMemory(MemoryModuleType.NEAREST_PLAYERS, list4);
+        final List<Player> list5 = list4.stream().filter(bec -> PlayerSensor.TARGETING.test(aoy, bec)).collect(Collectors.toList());
+        apr5.<Player>setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, list5.isEmpty() ? null : list5.get(0));
+        final Optional<Player> optional7 = list5.stream().filter(EntitySelector.ATTACK_ALLOWED).findFirst();
+        apr5.<Player>setMemory(MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, optional7);
+    }
+    
+    static {
+        TARGETING = new TargetingConditions().range(16.0).allowSameTeam().allowNonAttackable();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java b/src/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
index 1f9368e..4751096 100644
--- a/src/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
@@ -4,13 +4,13 @@ import net.minecraft.world.entity.LivingEntity;
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 import net.minecraft.world.entity.ai.Brain;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import java.util.List;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.core.GlobalPos;
 import com.google.common.collect.Lists;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.npc.Villager;
 
@@ -20,27 +20,27 @@ public class SecondaryPoiSensor extends Sensor<Villager> {
     }
     
     @Override
-    protected void doTick(final ServerLevel xd, final Villager axw) {
-        final DimensionType cbi4 = xd.getDimension().getType();
-        final BlockPos fk5 = new BlockPos(axw);
+    protected void doTick(final ServerLevel zd, final Villager bdp) {
+        final ResourceKey<Level> ug4 = zd.dimension();
+        final BlockPos fu5 = bdp.blockPosition();
         final List<GlobalPos> list6 = Lists.newArrayList();
         final int integer7 = 4;
         for (int integer8 = -4; integer8 <= 4; ++integer8) {
             for (int integer9 = -2; integer9 <= 2; ++integer9) {
                 for (int integer10 = -4; integer10 <= 4; ++integer10) {
-                    final BlockPos fk6 = fk5.offset(integer8, integer9, integer10);
-                    if (axw.getVillagerData().getProfession().getSecondaryPoi().contains(xd.getBlockState(fk6).getBlock())) {
-                        list6.add(GlobalPos.of(cbi4, fk6));
+                    final BlockPos fu6 = fu5.offset(integer8, integer9, integer10);
+                    if (bdp.getVillagerData().getProfession().getSecondaryPoi().contains(zd.getBlockState(fu6).getBlock())) {
+                        list6.add(GlobalPos.of(ug4, fu6));
                     }
                 }
             }
         }
-        final Brain<?> alp8 = axw.getBrain();
+        final Brain<?> apr8 = bdp.getBrain();
         if (!list6.isEmpty()) {
-            alp8.<List<GlobalPos>>setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list6);
+            apr8.<List<GlobalPos>>setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list6);
         }
         else {
-            alp8.<List<GlobalPos>>eraseMemory(MemoryModuleType.SECONDARY_JOB_SITE);
+            apr8.<List<GlobalPos>>eraseMemory(MemoryModuleType.SECONDARY_JOB_SITE);
         }
     }
     
diff --git a/src/net/minecraft/world/entity/ai/sensing/Sensing.java b/src/net/minecraft/world/entity/ai/sensing/Sensing.java
index 4f2c841..1db7931 100644
--- a/src/net/minecraft/world/entity/ai/sensing/Sensing.java
+++ b/src/net/minecraft/world/entity/ai/sensing/Sensing.java
@@ -10,10 +10,10 @@ public class Sensing {
     private final List<Entity> seen;
     private final List<Entity> unseen;
     
-    public Sensing(final Mob ala) {
+    public Sensing(final Mob aoz) {
         this.seen = Lists.newArrayList();
         this.unseen = Lists.newArrayList();
-        this.mob = ala;
+        this.mob = aoz;
     }
     
     public void tick() {
@@ -21,21 +21,21 @@ public class Sensing {
         this.unseen.clear();
     }
     
-    public boolean canSee(final Entity akq) {
-        if (this.seen.contains(akq)) {
+    public boolean canSee(final Entity aom) {
+        if (this.seen.contains(aom)) {
             return true;
         }
-        if (this.unseen.contains(akq)) {
+        if (this.unseen.contains(aom)) {
             return false;
         }
         this.mob.level.getProfiler().push("canSee");
-        final boolean boolean3 = this.mob.canSee(akq);
+        final boolean boolean3 = this.mob.canSee(aom);
         this.mob.level.getProfiler().pop();
         if (boolean3) {
-            this.seen.add(akq);
+            this.seen.add(aom);
         }
         else {
-            this.unseen.add(akq);
+            this.unseen.add(aom);
         }
         return boolean3;
     }
diff --git a/src/net/minecraft/world/entity/ai/sensing/Sensor.java b/src/net/minecraft/world/entity/ai/sensing/Sensor.java
index af8a96e..35fe468 100644
--- a/src/net/minecraft/world/entity/ai/sensing/Sensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/Sensor.java
@@ -20,16 +20,16 @@ public abstract class Sensor<E extends LivingEntity> {
         this(20);
     }
     
-    public final void tick(final ServerLevel xd, final E akz) {
+    public final void tick(final ServerLevel zd, final E aoy) {
         final long timeToTick = this.timeToTick - 1L;
         this.timeToTick = timeToTick;
         if (timeToTick <= 0L) {
             this.timeToTick = this.scanRate;
-            this.doTick(xd, akz);
+            this.doTick(zd, aoy);
         }
     }
     
-    protected abstract void doTick(final ServerLevel xd, final E akz);
+    protected abstract void doTick(final ServerLevel zd, final E aoy);
     
     public abstract Set<MemoryModuleType<?>> requires();
     
diff --git a/src/net/minecraft/world/entity/ai/sensing/SensorType.java b/src/net/minecraft/world/entity/ai/sensing/SensorType.java
index f0683b4..8dff8b8 100644
--- a/src/net/minecraft/world/entity/ai/sensing/SensorType.java
+++ b/src/net/minecraft/world/entity/ai/sensing/SensorType.java
@@ -6,6 +6,7 @@ import java.util.function.Supplier;
 
 public class SensorType<U extends Sensor<?>> {
     public static final SensorType<DummySensor> DUMMY;
+    public static final SensorType<NearestItemSensor> NEAREST_ITEMS;
     public static final SensorType<NearestLivingEntitySensor> NEAREST_LIVING_ENTITIES;
     public static final SensorType<PlayerSensor> NEAREST_PLAYERS;
     public static final SensorType<InteractableDoorsSensor> INTERACTABLE_DOORS;
@@ -15,6 +16,9 @@ public class SensorType<U extends Sensor<?>> {
     public static final SensorType<VillagerBabiesSensor> VILLAGER_BABIES;
     public static final SensorType<SecondaryPoiSensor> SECONDARY_POIS;
     public static final SensorType<GolemSensor> GOLEM_LAST_SEEN;
+    public static final SensorType<PiglinSpecificSensor> PIGLIN_SPECIFIC_SENSOR;
+    public static final SensorType<HoglinSpecificSensor> HOGLIN_SPECIFIC_SENSOR;
+    public static final SensorType<AdultSensor> NEAREST_ADULT;
     private final Supplier<U> factory;
     
     private SensorType(final Supplier<U> supplier) {
@@ -26,11 +30,12 @@ public class SensorType<U extends Sensor<?>> {
     }
     
     private static <U extends Sensor<?>> SensorType<U> register(final String string, final Supplier<U> supplier) {
-        return Registry.<SensorType<U>>register(Registry.SENSOR_TYPE, new ResourceLocation(string), new SensorType<U>(supplier));
+        return Registry.<SensorType<?>, SensorType<U>>register(Registry.SENSOR_TYPE, new ResourceLocation(string), new SensorType<U>(supplier));
     }
     
     static {
         DUMMY = SensorType.<DummySensor>register("dummy", DummySensor::new);
+        NEAREST_ITEMS = SensorType.<NearestItemSensor>register("nearest_items", NearestItemSensor::new);
         NEAREST_LIVING_ENTITIES = SensorType.<NearestLivingEntitySensor>register("nearest_living_entities", NearestLivingEntitySensor::new);
         NEAREST_PLAYERS = SensorType.<PlayerSensor>register("nearest_players", PlayerSensor::new);
         INTERACTABLE_DOORS = SensorType.<InteractableDoorsSensor>register("interactable_doors", InteractableDoorsSensor::new);
@@ -40,5 +45,8 @@ public class SensorType<U extends Sensor<?>> {
         VILLAGER_BABIES = SensorType.<VillagerBabiesSensor>register("villager_babies", VillagerBabiesSensor::new);
         SECONDARY_POIS = SensorType.<SecondaryPoiSensor>register("secondary_pois", SecondaryPoiSensor::new);
         GOLEM_LAST_SEEN = SensorType.<GolemSensor>register("golem_last_seen", GolemSensor::new);
+        PIGLIN_SPECIFIC_SENSOR = SensorType.<PiglinSpecificSensor>register("piglin_specific_sensor", PiglinSpecificSensor::new);
+        HOGLIN_SPECIFIC_SENSOR = SensorType.<HoglinSpecificSensor>register("hoglin_specific_sensor", HoglinSpecificSensor::new);
+        NEAREST_ADULT = SensorType.<AdultSensor>register("nearest_adult", AdultSensor::new);
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/sensing/VillagerBabiesSensor.java b/src/net/minecraft/world/entity/ai/sensing/VillagerBabiesSensor.java
index c1cf2ca..c1629b4 100644
--- a/src/net/minecraft/world/entity/ai/sensing/VillagerBabiesSensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/VillagerBabiesSensor.java
@@ -19,19 +19,19 @@ public class VillagerBabiesSensor extends Sensor<LivingEntity> {
     }
     
     @Override
-    protected void doTick(final ServerLevel xd, final LivingEntity akz) {
-        akz.getBrain().<List<LivingEntity>>setMemory(MemoryModuleType.VISIBLE_VILLAGER_BABIES, this.getNearestVillagerBabies(akz));
+    protected void doTick(final ServerLevel zd, final LivingEntity aoy) {
+        aoy.getBrain().<List<LivingEntity>>setMemory(MemoryModuleType.VISIBLE_VILLAGER_BABIES, this.getNearestVillagerBabies(aoy));
     }
     
-    private List<LivingEntity> getNearestVillagerBabies(final LivingEntity akz) {
-        return this.getVisibleEntities(akz).stream().filter(this::isVillagerBaby).collect(Collectors.toList());
+    private List<LivingEntity> getNearestVillagerBabies(final LivingEntity aoy) {
+        return this.getVisibleEntities(aoy).stream().filter(this::isVillagerBaby).collect(Collectors.toList());
     }
     
-    private boolean isVillagerBaby(final LivingEntity akz) {
-        return akz.getType() == EntityType.VILLAGER && akz.isBaby();
+    private boolean isVillagerBaby(final LivingEntity aoy) {
+        return aoy.getType() == EntityType.VILLAGER && aoy.isBaby();
     }
     
-    private List<LivingEntity> getVisibleEntities(final LivingEntity akz) {
-        return akz.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).orElse(Lists.newArrayList());
+    private List<LivingEntity> getVisibleEntities(final LivingEntity aoy) {
+        return aoy.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).orElse(Lists.newArrayList());
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/sensing/VillagerHostilesSensor.java b/src/net/minecraft/world/entity/ai/sensing/VillagerHostilesSensor.java
index 1c11bdf..3ca6de6 100644
--- a/src/net/minecraft/world/entity/ai/sensing/VillagerHostilesSensor.java
+++ b/src/net/minecraft/world/entity/ai/sensing/VillagerHostilesSensor.java
@@ -23,32 +23,32 @@ public class VillagerHostilesSensor extends Sensor<LivingEntity> {
     }
     
     @Override
-    protected void doTick(final ServerLevel xd, final LivingEntity akz) {
-        akz.getBrain().<LivingEntity>setMemory(MemoryModuleType.NEAREST_HOSTILE, this.getNearestHostile(akz));
+    protected void doTick(final ServerLevel zd, final LivingEntity aoy) {
+        aoy.getBrain().<LivingEntity>setMemory(MemoryModuleType.NEAREST_HOSTILE, this.getNearestHostile(aoy));
     }
     
-    private Optional<LivingEntity> getNearestHostile(final LivingEntity akz) {
-        return this.getVisibleEntities(akz).<LivingEntity>flatMap(list -> list.stream().filter(this::isHostile).filter(akz2 -> this.isClose(akz, akz2)).min((akz2, akz3) -> this.compareMobDistance(akz, akz2, akz3)));
+    private Optional<LivingEntity> getNearestHostile(final LivingEntity aoy) {
+        return this.getVisibleEntities(aoy).<LivingEntity>flatMap(list -> list.stream().filter(this::isHostile).filter(aoy2 -> this.isClose(aoy, aoy2)).min((aoy2, aoy3) -> this.compareMobDistance(aoy, aoy2, aoy3)));
     }
     
-    private Optional<List<LivingEntity>> getVisibleEntities(final LivingEntity akz) {
-        return akz.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES);
+    private Optional<List<LivingEntity>> getVisibleEntities(final LivingEntity aoy) {
+        return aoy.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES);
     }
     
-    private int compareMobDistance(final LivingEntity akz1, final LivingEntity akz2, final LivingEntity akz3) {
-        return Mth.floor(akz2.distanceToSqr(akz1) - akz3.distanceToSqr(akz1));
+    private int compareMobDistance(final LivingEntity aoy1, final LivingEntity aoy2, final LivingEntity aoy3) {
+        return Mth.floor(aoy2.distanceToSqr(aoy1) - aoy3.distanceToSqr(aoy1));
     }
     
-    private boolean isClose(final LivingEntity akz1, final LivingEntity akz2) {
-        final float float4 = VillagerHostilesSensor.ACCEPTABLE_DISTANCE_FROM_HOSTILES.get(akz2.getType());
-        return akz2.distanceToSqr(akz1) <= float4 * float4;
+    private boolean isClose(final LivingEntity aoy1, final LivingEntity aoy2) {
+        final float float4 = VillagerHostilesSensor.ACCEPTABLE_DISTANCE_FROM_HOSTILES.get(aoy2.getType());
+        return aoy2.distanceToSqr(aoy1) <= float4 * float4;
     }
     
-    private boolean isHostile(final LivingEntity akz) {
-        return VillagerHostilesSensor.ACCEPTABLE_DISTANCE_FROM_HOSTILES.containsKey(akz.getType());
+    private boolean isHostile(final LivingEntity aoy) {
+        return VillagerHostilesSensor.ACCEPTABLE_DISTANCE_FROM_HOSTILES.containsKey(aoy.getType());
     }
     
     static {
-        ACCEPTABLE_DISTANCE_FROM_HOSTILES = ImmutableMap.<EntityType<Drowned>, Float>builder().put(EntityType.DROWNED, 8.0f).put((EntityType<Drowned>)EntityType.EVOKER, 12.0f).put((EntityType<Drowned>)EntityType.HUSK, 8.0f).put((EntityType<Drowned>)EntityType.ILLUSIONER, 12.0f).put((EntityType<Drowned>)EntityType.PILLAGER, 15.0f).put((EntityType<Drowned>)EntityType.RAVAGER, 12.0f).put((EntityType<Drowned>)EntityType.VEX, 8.0f).put((EntityType<Drowned>)EntityType.VINDICATOR, 10.0f).put((EntityType<Drowned>)EntityType.ZOMBIE, 8.0f).put((EntityType<Drowned>)EntityType.ZOMBIE_VILLAGER, 8.0f).build();
+        ACCEPTABLE_DISTANCE_FROM_HOSTILES = ImmutableMap.<EntityType<Drowned>, Float>builder().put(EntityType.DROWNED, 8.0f).put((EntityType<Drowned>)EntityType.EVOKER, 12.0f).put((EntityType<Drowned>)EntityType.HUSK, 8.0f).put((EntityType<Drowned>)EntityType.ILLUSIONER, 12.0f).put((EntityType<Drowned>)EntityType.PILLAGER, 15.0f).put((EntityType<Drowned>)EntityType.RAVAGER, 12.0f).put((EntityType<Drowned>)EntityType.VEX, 8.0f).put((EntityType<Drowned>)EntityType.VINDICATOR, 10.0f).put((EntityType<Drowned>)EntityType.ZOGLIN, 10.0f).put((EntityType<Drowned>)EntityType.ZOMBIE, 8.0f).put((EntityType<Drowned>)EntityType.ZOMBIE_VILLAGER, 8.0f).build();
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
index 78b8f88..f078ff1 100644
--- a/src/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
+++ b/src/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
@@ -56,43 +56,43 @@ public class TargetingConditions {
         return this;
     }
     
-    public boolean test(@Nullable final LivingEntity akz1, final LivingEntity akz2) {
-        if (akz1 == akz2) {
+    public boolean test(@Nullable final LivingEntity aoy1, final LivingEntity aoy2) {
+        if (aoy1 == aoy2) {
             return false;
         }
-        if (akz2.isSpectator()) {
+        if (aoy2.isSpectator()) {
             return false;
         }
-        if (!akz2.isAlive()) {
+        if (!aoy2.isAlive()) {
             return false;
         }
-        if (!this.allowInvulnerable && akz2.isInvulnerable()) {
+        if (!this.allowInvulnerable && aoy2.isInvulnerable()) {
             return false;
         }
-        if (this.selector != null && !this.selector.test(akz2)) {
+        if (this.selector != null && !this.selector.test(aoy2)) {
             return false;
         }
-        if (akz1 != null) {
+        if (aoy1 != null) {
             if (!this.allowNonAttackable) {
-                if (!akz1.canAttack(akz2)) {
+                if (!aoy1.canAttack(aoy2)) {
                     return false;
                 }
-                if (!akz1.canAttackType(akz2.getType())) {
+                if (!aoy1.canAttackType(aoy2.getType())) {
                     return false;
                 }
             }
-            if (!this.allowSameTeam && akz1.isAlliedTo(akz2)) {
+            if (!this.allowSameTeam && aoy1.isAlliedTo(aoy2)) {
                 return false;
             }
             if (this.range > 0.0) {
-                final double double4 = this.testInvisible ? akz2.getVisibilityPercent(akz1) : 1.0;
+                final double double4 = this.testInvisible ? aoy2.getVisibilityPercent(aoy1) : 1.0;
                 final double double5 = this.range * double4;
-                final double double6 = akz1.distanceToSqr(akz2.getX(), akz2.getY(), akz2.getZ());
+                final double double6 = aoy1.distanceToSqr(aoy2.getX(), aoy2.getY(), aoy2.getZ());
                 if (double6 > double5 * double5) {
                     return false;
                 }
             }
-            if (!this.allowUnseeable && akz1 instanceof Mob && !((Mob)akz1).getSensing().canSee(akz2)) {
+            if (!this.allowUnseeable && aoy1 instanceof Mob && !((Mob)aoy1).getSensing().canSee(aoy2)) {
                 return false;
             }
         }
diff --git a/src/net/minecraft/world/entity/ai/util/RandomPos.java b/src/net/minecraft/world/entity/ai/util/RandomPos.java
index 468e3ec..89ff5fd 100644
--- a/src/net/minecraft/world/entity/ai/util/RandomPos.java
+++ b/src/net/minecraft/world/entity/ai/util/RandomPos.java
@@ -8,8 +8,9 @@ import net.minecraft.world.entity.ai.navigation.PathNavigation;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.pathfinder.WalkNodeEvaluator;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.Position;
 import net.minecraft.core.BlockPos;
 import java.util.function.ToDoubleFunction;
@@ -19,104 +20,110 @@ import net.minecraft.world.entity.PathfinderMob;
 
 public class RandomPos {
     @Nullable
-    public static Vec3 getPos(final PathfinderMob alg, final int integer2, final int integer3) {
-        return generateRandomPos(alg, integer2, integer3, 0, null, true, 1.5707963705062866, alg::getWalkTargetValue, false, 0, 0, true);
+    public static Vec3 getPos(final PathfinderMob apg, final int integer2, final int integer3) {
+        return generateRandomPos(apg, integer2, integer3, 0, null, true, 1.5707963705062866, apg::getWalkTargetValue, false, 0, 0, true);
     }
     
     @Nullable
-    public static Vec3 getAirPos(final PathfinderMob alg, final int integer2, final int integer3, final int integer4, @Nullable final Vec3 cvl, final double double6) {
-        return generateRandomPos(alg, integer2, integer3, integer4, cvl, true, double6, alg::getWalkTargetValue, true, 0, 0, false);
+    public static Vec3 getAirPos(final PathfinderMob apg, final int integer2, final int integer3, final int integer4, @Nullable final Vec3 dem, final double double6) {
+        return generateRandomPos(apg, integer2, integer3, integer4, dem, true, double6, apg::getWalkTargetValue, true, 0, 0, false);
     }
     
     @Nullable
-    public static Vec3 getLandPos(final PathfinderMob alg, final int integer2, final int integer3) {
-        return getLandPos(alg, integer2, integer3, alg::getWalkTargetValue);
+    public static Vec3 getLandPos(final PathfinderMob apg, final int integer2, final int integer3) {
+        return getLandPos(apg, integer2, integer3, apg::getWalkTargetValue);
     }
     
     @Nullable
-    public static Vec3 getLandPos(final PathfinderMob alg, final int integer2, final int integer3, final ToDoubleFunction<BlockPos> toDoubleFunction) {
-        return generateRandomPos(alg, integer2, integer3, 0, null, false, 0.0, toDoubleFunction, true, 0, 0, true);
+    public static Vec3 getLandPos(final PathfinderMob apg, final int integer2, final int integer3, final ToDoubleFunction<BlockPos> toDoubleFunction) {
+        return generateRandomPos(apg, integer2, integer3, 0, null, false, 0.0, toDoubleFunction, true, 0, 0, true);
     }
     
     @Nullable
-    public static Vec3 getAboveLandPos(final PathfinderMob alg, final int integer2, final int integer3, final Vec3 cvl, final float float5, final int integer6, final int integer7) {
-        return generateRandomPos(alg, integer2, integer3, 0, cvl, false, float5, alg::getWalkTargetValue, true, integer6, integer7, true);
+    public static Vec3 getAboveLandPos(final PathfinderMob apg, final int integer2, final int integer3, final Vec3 dem, final float float5, final int integer6, final int integer7) {
+        return generateRandomPos(apg, integer2, integer3, 0, dem, false, float5, apg::getWalkTargetValue, true, integer6, integer7, true);
     }
     
     @Nullable
-    public static Vec3 getPosTowards(final PathfinderMob alg, final int integer2, final int integer3, final Vec3 cvl) {
-        final Vec3 cvl2 = cvl.subtract(alg.getX(), alg.getY(), alg.getZ());
-        return generateRandomPos(alg, integer2, integer3, 0, cvl2, true, 1.5707963705062866, alg::getWalkTargetValue, false, 0, 0, true);
+    public static Vec3 getLandPosTowards(final PathfinderMob apg, final int integer2, final int integer3, final Vec3 dem) {
+        final Vec3 dem2 = dem.subtract(apg.getX(), apg.getY(), apg.getZ());
+        return generateRandomPos(apg, integer2, integer3, 0, dem2, false, 1.5707963705062866, apg::getWalkTargetValue, true, 0, 0, true);
     }
     
     @Nullable
-    public static Vec3 getPosTowards(final PathfinderMob alg, final int integer2, final int integer3, final Vec3 cvl, final double double5) {
-        final Vec3 cvl2 = cvl.subtract(alg.getX(), alg.getY(), alg.getZ());
-        return generateRandomPos(alg, integer2, integer3, 0, cvl2, true, double5, alg::getWalkTargetValue, false, 0, 0, true);
+    public static Vec3 getPosTowards(final PathfinderMob apg, final int integer2, final int integer3, final Vec3 dem) {
+        final Vec3 dem2 = dem.subtract(apg.getX(), apg.getY(), apg.getZ());
+        return generateRandomPos(apg, integer2, integer3, 0, dem2, true, 1.5707963705062866, apg::getWalkTargetValue, false, 0, 0, true);
     }
     
     @Nullable
-    public static Vec3 getAirPosTowards(final PathfinderMob alg, final int integer2, final int integer3, final int integer4, final Vec3 cvl, final double double6) {
-        final Vec3 cvl2 = cvl.subtract(alg.getX(), alg.getY(), alg.getZ());
-        return generateRandomPos(alg, integer2, integer3, integer4, cvl2, false, double6, alg::getWalkTargetValue, true, 0, 0, false);
+    public static Vec3 getPosTowards(final PathfinderMob apg, final int integer2, final int integer3, final Vec3 dem, final double double5) {
+        final Vec3 dem2 = dem.subtract(apg.getX(), apg.getY(), apg.getZ());
+        return generateRandomPos(apg, integer2, integer3, 0, dem2, true, double5, apg::getWalkTargetValue, false, 0, 0, true);
     }
     
     @Nullable
-    public static Vec3 getPosAvoid(final PathfinderMob alg, final int integer2, final int integer3, final Vec3 cvl) {
-        final Vec3 cvl2 = alg.position().subtract(cvl);
-        return generateRandomPos(alg, integer2, integer3, 0, cvl2, true, 1.5707963705062866, alg::getWalkTargetValue, false, 0, 0, true);
+    public static Vec3 getAirPosTowards(final PathfinderMob apg, final int integer2, final int integer3, final int integer4, final Vec3 dem, final double double6) {
+        final Vec3 dem2 = dem.subtract(apg.getX(), apg.getY(), apg.getZ());
+        return generateRandomPos(apg, integer2, integer3, integer4, dem2, false, double6, apg::getWalkTargetValue, true, 0, 0, false);
     }
     
     @Nullable
-    public static Vec3 getLandPosAvoid(final PathfinderMob alg, final int integer2, final int integer3, final Vec3 cvl) {
-        final Vec3 cvl2 = alg.position().subtract(cvl);
-        return generateRandomPos(alg, integer2, integer3, 0, cvl2, false, 1.5707963705062866, alg::getWalkTargetValue, true, 0, 0, true);
+    public static Vec3 getPosAvoid(final PathfinderMob apg, final int integer2, final int integer3, final Vec3 dem) {
+        final Vec3 dem2 = apg.position().subtract(dem);
+        return generateRandomPos(apg, integer2, integer3, 0, dem2, true, 1.5707963705062866, apg::getWalkTargetValue, false, 0, 0, true);
     }
     
     @Nullable
-    private static Vec3 generateRandomPos(final PathfinderMob alg, final int integer2, final int integer3, final int integer4, @Nullable final Vec3 cvl, final boolean boolean6, final double double7, final ToDoubleFunction<BlockPos> toDoubleFunction, final boolean boolean9, final int integer10, final int integer11, final boolean boolean12) {
-        final PathNavigation arr14 = alg.getNavigation();
-        final Random random15 = alg.getRandom();
-        final boolean boolean13 = alg.hasRestriction() && alg.getRestrictCenter().closerThan(alg.position(), alg.getRestrictRadius() + integer2 + 1.0);
+    public static Vec3 getLandPosAvoid(final PathfinderMob apg, final int integer2, final int integer3, final Vec3 dem) {
+        final Vec3 dem2 = apg.position().subtract(dem);
+        return generateRandomPos(apg, integer2, integer3, 0, dem2, false, 1.5707963705062866, apg::getWalkTargetValue, true, 0, 0, true);
+    }
+    
+    @Nullable
+    private static Vec3 generateRandomPos(final PathfinderMob apg, final int integer2, final int integer3, final int integer4, @Nullable final Vec3 dem, final boolean boolean6, final double double7, final ToDoubleFunction<BlockPos> toDoubleFunction, final boolean boolean9, final int integer10, final int integer11, final boolean boolean12) {
+        final PathNavigation awv14 = apg.getNavigation();
+        final Random random15 = apg.getRandom();
+        final boolean boolean13 = apg.hasRestriction() && apg.getRestrictCenter().closerThan(apg.position(), apg.getRestrictRadius() + integer2 + 1.0);
         boolean boolean14 = false;
         double double8 = Double.NEGATIVE_INFINITY;
-        BlockPos fk2 = new BlockPos(alg);
+        BlockPos fu2 = apg.blockPosition();
         for (int integer12 = 0; integer12 < 10; ++integer12) {
-            final BlockPos fk3 = getRandomDelta(random15, integer2, integer3, integer4, cvl, double7);
-            if (fk3 != null) {
-                int integer13 = fk3.getX();
-                final int integer14 = fk3.getY();
-                int integer15 = fk3.getZ();
-                if (alg.hasRestriction() && integer2 > 1) {
-                    final BlockPos fk4 = alg.getRestrictCenter();
-                    if (alg.getX() > fk4.getX()) {
+            final BlockPos fu3 = getRandomDelta(random15, integer2, integer3, integer4, dem, double7);
+            if (fu3 != null) {
+                int integer13 = fu3.getX();
+                final int integer14 = fu3.getY();
+                int integer15 = fu3.getZ();
+                if (apg.hasRestriction() && integer2 > 1) {
+                    final BlockPos fu4 = apg.getRestrictCenter();
+                    if (apg.getX() > fu4.getX()) {
                         integer13 -= random15.nextInt(integer2 / 2);
                     }
                     else {
                         integer13 += random15.nextInt(integer2 / 2);
                     }
-                    if (alg.getZ() > fk4.getZ()) {
+                    if (apg.getZ() > fu4.getZ()) {
                         integer15 -= random15.nextInt(integer2 / 2);
                     }
                     else {
                         integer15 += random15.nextInt(integer2 / 2);
                     }
                 }
-                BlockPos fk4 = new BlockPos(integer13 + alg.getX(), integer14 + alg.getY(), integer15 + alg.getZ());
-                if (fk4.getY() >= 0) {
-                    if (fk4.getY() <= alg.level.getMaxBuildHeight()) {
-                        if (!boolean13 || alg.isWithinRestriction(fk4)) {
-                            if (!boolean12 || arr14.isStableDestination(fk4)) {
+                BlockPos fu4 = new BlockPos(integer13 + apg.getX(), integer14 + apg.getY(), integer15 + apg.getZ());
+                if (fu4.getY() >= 0) {
+                    if (fu4.getY() <= apg.level.getMaxBuildHeight()) {
+                        if (!boolean13 || apg.isWithinRestriction(fu4)) {
+                            if (!boolean12 || awv14.isStableDestination(fu4)) {
                                 if (boolean9) {
-                                    fk4 = moveUpToAboveSolid(fk4, random15.nextInt(integer10 + 1) + integer11, alg.level.getMaxBuildHeight(), fk -> alg.level.getBlockState(fk).getMaterial().isSolid());
+                                    fu4 = moveUpToAboveSolid(fu4, random15.nextInt(integer10 + 1) + integer11, apg.level.getMaxBuildHeight(), fu -> apg.level.getBlockState(fu).getMaterial().isSolid());
                                 }
-                                if (boolean6 || !alg.level.getFluidState(fk4).is(FluidTags.WATER)) {
-                                    final BlockPathTypes cqm27 = WalkNodeEvaluator.getBlockPathTypeStatic(alg.level, fk4.getX(), fk4.getY(), fk4.getZ());
-                                    if (alg.getPathfindingMalus(cqm27) == 0.0f) {
-                                        final double double9 = toDoubleFunction.applyAsDouble(fk4);
+                                if (boolean6 || !apg.level.getFluidState(fu4).is(FluidTags.WATER)) {
+                                    final BlockPathTypes czb27 = WalkNodeEvaluator.getBlockPathTypeStatic(apg.level, fu4.mutable());
+                                    if (apg.getPathfindingMalus(czb27) == 0.0f) {
+                                        final double double9 = toDoubleFunction.applyAsDouble(fu4);
                                         if (double9 > double8) {
                                             double8 = double9;
-                                            fk2 = fk4;
+                                            fu2 = fu4;
                                             boolean14 = true;
                                         }
                                     }
@@ -128,20 +135,20 @@ public class RandomPos {
             }
         }
         if (boolean14) {
-            return new Vec3(fk2);
+            return Vec3.atBottomCenterOf(fu2);
         }
         return null;
     }
     
     @Nullable
-    private static BlockPos getRandomDelta(final Random random, final int integer2, final int integer3, final int integer4, @Nullable final Vec3 cvl, final double double6) {
-        if (cvl == null || double6 >= 3.141592653589793) {
+    private static BlockPos getRandomDelta(final Random random, final int integer2, final int integer3, final int integer4, @Nullable final Vec3 dem, final double double6) {
+        if (dem == null || double6 >= 3.141592653589793) {
             final int integer5 = random.nextInt(2 * integer2 + 1) - integer2;
             final int integer6 = random.nextInt(2 * integer3 + 1) - integer3 + integer4;
             final int integer7 = random.nextInt(2 * integer2 + 1) - integer2;
             return new BlockPos(integer5, integer6, integer7);
         }
-        final double double7 = Mth.atan2(cvl.z, cvl.x) - 1.5707963705062866;
+        final double double7 = Mth.atan2(dem.z, dem.x) - 1.5707963705062866;
         final double double8 = double7 + (2.0f * random.nextFloat() - 1.0f) * double6;
         final double double9 = Math.sqrt(random.nextDouble()) * Mth.SQRT_OF_TWO * integer2;
         final double double10 = -double9 * Math.sin(double8);
@@ -153,23 +160,23 @@ public class RandomPos {
         return new BlockPos(double10, integer8, double11);
     }
     
-    static BlockPos moveUpToAboveSolid(final BlockPos fk, final int integer2, final int integer3, final Predicate<BlockPos> predicate) {
+    static BlockPos moveUpToAboveSolid(final BlockPos fu, final int integer2, final int integer3, final Predicate<BlockPos> predicate) {
         if (integer2 < 0) {
             throw new IllegalArgumentException("aboveSolidAmount was " + integer2 + ", expected >= 0");
         }
-        if (predicate.test(fk)) {
-            BlockPos fk2;
-            for (fk2 = fk.above(); fk2.getY() < integer3 && predicate.test(fk2); fk2 = fk2.above()) {}
-            BlockPos fk3;
-            BlockPos fk4;
-            for (fk3 = fk2; fk3.getY() < integer3 && fk3.getY() - fk2.getY() < integer2; fk3 = fk4) {
-                fk4 = fk3.above();
-                if (predicate.test(fk4)) {
+        if (predicate.test(fu)) {
+            BlockPos fu2;
+            for (fu2 = fu.above(); fu2.getY() < integer3 && predicate.test(fu2); fu2 = fu2.above()) {}
+            BlockPos fu3;
+            BlockPos fu4;
+            for (fu3 = fu2; fu3.getY() < integer3 && fu3.getY() - fu2.getY() < integer2; fu3 = fu4) {
+                fu4 = fu3.above();
+                if (predicate.test(fu4)) {
                     break;
                 }
             }
-            return fk3;
+            return fu3;
         }
-        return fk;
+        return fu;
     }
 }
diff --git a/src/net/minecraft/world/entity/ai/village/VillageSiege.java b/src/net/minecraft/world/entity/ai/village/VillageSiege.java
index 592d614..df10f2d 100644
--- a/src/net/minecraft/world/entity/ai/village/VillageSiege.java
+++ b/src/net/minecraft/world/entity/ai/village/VillageSiege.java
@@ -1,15 +1,16 @@
 package net.minecraft.world.entity.ai.village;
 
 import javax.annotation.Nullable;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.entity.monster.Monster;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.MobSpawnType;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.monster.Zombie;
 import net.minecraft.world.entity.player.Player;
@@ -19,8 +20,9 @@ import net.minecraft.util.Mth;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.CustomSpawner;
 
-public class VillageSiege {
+public class VillageSiege implements CustomSpawner {
     private boolean hasSetupSiege;
     private State siegeState;
     private int zombiesToSpawn;
@@ -33,21 +35,22 @@ public class VillageSiege {
         this.siegeState = State.SIEGE_DONE;
     }
     
-    public int tick(final ServerLevel xd, final boolean boolean2, final boolean boolean3) {
-        if (xd.isDay() || !boolean2) {
+    @Override
+    public int tick(final ServerLevel zd, final boolean boolean2, final boolean boolean3) {
+        if (zd.isDay() || !boolean2) {
             this.siegeState = State.SIEGE_DONE;
             this.hasSetupSiege = false;
             return 0;
         }
-        final float float5 = xd.getTimeOfDay(0.0f);
+        final float float5 = zd.getTimeOfDay(0.0f);
         if (float5 == 0.5) {
-            this.siegeState = ((xd.random.nextInt(10) == 0) ? State.SIEGE_TONIGHT : State.SIEGE_DONE);
+            this.siegeState = ((zd.random.nextInt(10) == 0) ? State.SIEGE_TONIGHT : State.SIEGE_DONE);
         }
         if (this.siegeState == State.SIEGE_DONE) {
             return 0;
         }
         if (!this.hasSetupSiege) {
-            if (!this.tryToSetupSiege(xd)) {
+            if (!this.tryToSetupSiege(zd)) {
                 return 0;
             }
             this.hasSetupSiege = true;
@@ -58,7 +61,7 @@ public class VillageSiege {
         }
         this.nextSpawnTime = 2;
         if (this.zombiesToSpawn > 0) {
-            this.trySpawn(xd);
+            this.trySpawn(zd);
             --this.zombiesToSpawn;
         }
         else {
@@ -67,22 +70,22 @@ public class VillageSiege {
         return 1;
     }
     
-    private boolean tryToSetupSiege(final ServerLevel xd) {
-        for (final Player ayj4 : xd.players()) {
-            if (!ayj4.isSpectator()) {
-                final BlockPos fk5 = ayj4.getCommandSenderBlockPosition();
-                if (!xd.isVillage(fk5)) {
+    private boolean tryToSetupSiege(final ServerLevel zd) {
+        for (final Player bec4 : zd.players()) {
+            if (!bec4.isSpectator()) {
+                final BlockPos fu5 = bec4.blockPosition();
+                if (!zd.isVillage(fu5)) {
                     continue;
                 }
-                if (xd.getBiome(fk5).getBiomeCategory() == Biome.BiomeCategory.MUSHROOM) {
+                if (zd.getBiome(fu5).getBiomeCategory() == Biome.BiomeCategory.MUSHROOM) {
                     continue;
                 }
                 for (int integer6 = 0; integer6 < 10; ++integer6) {
-                    final float float7 = xd.random.nextFloat() * 6.2831855f;
-                    this.spawnX = fk5.getX() + Mth.floor(Mth.cos(float7) * 32.0f);
-                    this.spawnY = fk5.getY();
-                    this.spawnZ = fk5.getZ() + Mth.floor(Mth.sin(float7) * 32.0f);
-                    if (this.findRandomSpawnPos(xd, new BlockPos(this.spawnX, this.spawnY, this.spawnZ)) != null) {
+                    final float float7 = zd.random.nextFloat() * 6.2831855f;
+                    this.spawnX = fu5.getX() + Mth.floor(Mth.cos(float7) * 32.0f);
+                    this.spawnY = fu5.getY();
+                    this.spawnZ = fu5.getZ() + Mth.floor(Mth.sin(float7) * 32.0f);
+                    if (this.findRandomSpawnPos(zd, new BlockPos(this.spawnX, this.spawnY, this.spawnZ)) != null) {
                         this.nextSpawnTime = 0;
                         this.zombiesToSpawn = 20;
                         break;
@@ -94,34 +97,34 @@ public class VillageSiege {
         return false;
     }
     
-    private void trySpawn(final ServerLevel xd) {
-        final Vec3 cvl3 = this.findRandomSpawnPos(xd, new BlockPos(this.spawnX, this.spawnY, this.spawnZ));
-        if (cvl3 == null) {
+    private void trySpawn(final ServerLevel zd) {
+        final Vec3 dem3 = this.findRandomSpawnPos(zd, new BlockPos(this.spawnX, this.spawnY, this.spawnZ));
+        if (dem3 == null) {
             return;
         }
-        Zombie axp4;
+        Zombie bcu4;
         try {
-            axp4 = new Zombie(xd);
-            axp4.finalizeSpawn(xd, xd.getCurrentDifficultyAt(new BlockPos(axp4)), MobSpawnType.EVENT, null, null);
+            bcu4 = new Zombie(zd);
+            bcu4.finalizeSpawn(zd, zd.getCurrentDifficultyAt(bcu4.blockPosition()), MobSpawnType.EVENT, null, null);
         }
         catch (Exception exception5) {
             exception5.printStackTrace();
             return;
         }
-        axp4.moveTo(cvl3.x, cvl3.y, cvl3.z, xd.random.nextFloat() * 360.0f, 0.0f);
-        xd.addFreshEntity(axp4);
+        bcu4.moveTo(dem3.x, dem3.y, dem3.z, zd.random.nextFloat() * 360.0f, 0.0f);
+        zd.addFreshEntity(bcu4);
     }
     
     @Nullable
-    private Vec3 findRandomSpawnPos(final ServerLevel xd, final BlockPos fk) {
+    private Vec3 findRandomSpawnPos(final ServerLevel zd, final BlockPos fu) {
         for (int integer4 = 0; integer4 < 10; ++integer4) {
-            final int integer5 = fk.getX() + xd.random.nextInt(16) - 8;
-            final int integer6 = fk.getZ() + xd.random.nextInt(16) - 8;
-            final int integer7 = xd.getHeight(Heightmap.Types.WORLD_SURFACE, integer5, integer6);
-            final BlockPos fk2 = new BlockPos(integer5, integer7, integer6);
-            if (xd.isVillage(fk2)) {
-                if (Monster.checkMonsterSpawnRules(EntityType.ZOMBIE, xd, MobSpawnType.EVENT, fk2, xd.random)) {
-                    return new Vec3(fk2.getX() + 0.5, fk2.getY(), fk2.getZ() + 0.5);
+            final int integer5 = fu.getX() + zd.random.nextInt(16) - 8;
+            final int integer6 = fu.getZ() + zd.random.nextInt(16) - 8;
+            final int integer7 = zd.getHeight(Heightmap.Types.WORLD_SURFACE, integer5, integer6);
+            final BlockPos fu2 = new BlockPos(integer5, integer7, integer6);
+            if (zd.isVillage(fu2)) {
+                if (Monster.checkMonsterSpawnRules(EntityType.ZOMBIE, zd, MobSpawnType.EVENT, fu2, zd.random)) {
+                    return Vec3.atBottomCenterOf(fu2);
                 }
             }
         }
diff --git a/src/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/src/net/minecraft/world/entity/ai/village/poi/PoiManager.java
index 3b20c79..74bf906 100644
--- a/src/net/minecraft/world/entity/ai/village/poi/PoiManager.java
+++ b/src/net/minecraft/world/entity/ai/village/poi/PoiManager.java
@@ -6,8 +6,8 @@ import net.minecraft.server.level.SectionTracker;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.level.LevelReader;
-import java.util.function.BiConsumer;
 import net.minecraft.world.level.block.state.BlockState;
+import java.util.function.BiConsumer;
 import net.minecraft.Util;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import java.util.function.BooleanSupplier;
@@ -17,13 +17,12 @@ import java.util.stream.Collectors;
 import java.util.List;
 import java.util.Random;
 import java.util.Comparator;
-import java.util.Optional;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.IntStream;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.ChunkPos;
 import java.util.stream.Stream;
+import java.util.Optional;
 import java.util.function.Predicate;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.BlockPos;
@@ -38,87 +37,89 @@ public class PoiManager extends SectionStorage<PoiSection> {
     private final DistanceTracker distanceTracker;
     private final LongSet loadedChunks;
     
-    public PoiManager(final File file, final DataFixer dataFixer) {
-        super(file, PoiSection::new, PoiSection::new, dataFixer, DataFixTypes.POI_CHUNK);
+    public PoiManager(final File file, final DataFixer dataFixer, final boolean boolean3) {
+        super(file, PoiSection::codec, PoiSection::new, dataFixer, DataFixTypes.POI_CHUNK, boolean3);
         this.loadedChunks = (LongSet)new LongOpenHashSet();
         this.distanceTracker = new DistanceTracker();
     }
     
-    public void add(final BlockPos fk, final PoiType asu) {
-        this.getOrCreate(SectionPos.of(fk).asLong()).add(fk, asu);
+    public void add(final BlockPos fu, final PoiType ayc) {
+        this.getOrCreate(SectionPos.of(fu).asLong()).add(fu, ayc);
     }
     
-    public void remove(final BlockPos fk) {
-        this.getOrCreate(SectionPos.of(fk).asLong()).remove(fk);
+    public void remove(final BlockPos fu) {
+        this.getOrCreate(SectionPos.of(fu).asLong()).remove(fu);
     }
     
-    public long getCountInRange(final Predicate<PoiType> predicate, final BlockPos fk, final int integer, final Occupancy b) {
-        return this.getInRange(predicate, fk, integer, b).count();
+    public long getCountInRange(final Predicate<PoiType> predicate, final BlockPos fu, final int integer, final Occupancy b) {
+        return this.getInRange(predicate, fu, integer, b).count();
     }
     
-    public Stream<PoiRecord> getInSquare(final Predicate<PoiType> predicate, final BlockPos fk, final int integer, final Occupancy b) {
-        return ChunkPos.rangeClosed(new ChunkPos(fk), Math.floorDiv(integer, 16)).<PoiRecord>flatMap(bjh -> this.getInChunk(predicate, bjh, b));
+    public boolean existsAtPosition(final PoiType ayc, final BlockPos fu) {
+        final Optional<PoiType> optional4 = this.getOrCreate(SectionPos.of(fu).asLong()).getType(fu);
+        return optional4.isPresent() && optional4.get().equals(ayc);
     }
     
-    public Stream<PoiRecord> getInRange(final Predicate<PoiType> predicate, final BlockPos fk, final int integer, final Occupancy b) {
+    public Stream<PoiRecord> getInSquare(final Predicate<PoiType> predicate, final BlockPos fu, final int integer, final Occupancy b) {
+        final int integer2 = Math.floorDiv(integer, 16) + 1;
+        return ChunkPos.rangeClosed(new ChunkPos(fu), integer2).<PoiRecord>flatMap(bph -> this.getInChunk(predicate, bph, b));
+    }
+    
+    public Stream<PoiRecord> getInRange(final Predicate<PoiType> predicate, final BlockPos fu, final int integer, final Occupancy b) {
         final int integer2 = integer * integer;
-        return this.getInSquare(predicate, fk, integer, b).filter(ass -> ass.getPos().distSqr(fk) <= integer2);
+        return this.getInSquare(predicate, fu, integer, b).filter(aya -> aya.getPos().distSqr(fu) <= integer2);
     }
     
-    public Stream<PoiRecord> getInChunk(final Predicate<PoiType> predicate, final ChunkPos bjh, final Occupancy b) {
-        return IntStream.range(0, 16).boxed().<PoiRecord>flatMap(integer -> this.getInSection(predicate, SectionPos.of(bjh, integer).asLong(), b));
+    public Stream<PoiRecord> getInChunk(final Predicate<PoiType> predicate, final ChunkPos bph, final Occupancy b) {
+        return IntStream.range(0, 16).boxed().map(integer -> this.getOrLoad(SectionPos.of(bph, integer).asLong())).filter(Optional::isPresent).<PoiRecord>flatMap(optional -> optional.get().getRecords(predicate, b));
     }
     
-    private Stream<PoiRecord> getInSection(final Predicate<PoiType> predicate, final long long2, final Occupancy b) {
-        return this.getOrLoad(long2).<Stream<PoiRecord>>map(ast -> ast.getRecords(predicate, b)).orElseGet(Stream::empty);
+    public Stream<BlockPos> findAll(final Predicate<PoiType> predicate1, final Predicate<BlockPos> predicate2, final BlockPos fu, final int integer, final Occupancy b) {
+        return this.getInRange(predicate1, fu, integer, b).<BlockPos>map(PoiRecord::getPos).filter(predicate2);
     }
     
-    public Stream<BlockPos> findAll(final Predicate<PoiType> predicate1, final Predicate<BlockPos> predicate2, final BlockPos fk, final int integer, final Occupancy b) {
-        return this.getInRange(predicate1, fk, integer, b).<BlockPos>map(PoiRecord::getPos).filter(predicate2);
+    public Optional<BlockPos> find(final Predicate<PoiType> predicate1, final Predicate<BlockPos> predicate2, final BlockPos fu, final int integer, final Occupancy b) {
+        return this.findAll(predicate1, predicate2, fu, integer, b).findFirst();
     }
     
-    public Optional<BlockPos> find(final Predicate<PoiType> predicate1, final Predicate<BlockPos> predicate2, final BlockPos fk, final int integer, final Occupancy b) {
-        return this.findAll(predicate1, predicate2, fk, integer, b).findFirst();
+    public Optional<BlockPos> findClosest(final Predicate<PoiType> predicate, final BlockPos fu, final int integer, final Occupancy b) {
+        return this.getInRange(predicate, fu, integer, b).<BlockPos>map(PoiRecord::getPos).min(Comparator.comparingDouble(fu2 -> fu2.distSqr(fu)));
     }
     
-    public Optional<BlockPos> findClosest(final Predicate<PoiType> predicate1, final Predicate<BlockPos> predicate2, final BlockPos fk, final int integer, final Occupancy b) {
-        return this.getInRange(predicate1, fk, integer, b).<BlockPos>map(PoiRecord::getPos).sorted(Comparator.comparingDouble(fk2 -> fk2.distSqr(fk))).filter(predicate2).findFirst();
-    }
-    
-    public Optional<BlockPos> take(final Predicate<PoiType> predicate1, final Predicate<BlockPos> predicate2, final BlockPos fk, final int integer) {
-        return this.getInRange(predicate1, fk, integer, Occupancy.HAS_SPACE).filter(ass -> predicate2.test(ass.getPos())).findFirst().<BlockPos>map(ass -> {
-            ass.acquireTicket();
-            return ass.getPos();
+    public Optional<BlockPos> take(final Predicate<PoiType> predicate1, final Predicate<BlockPos> predicate2, final BlockPos fu, final int integer) {
+        return this.getInRange(predicate1, fu, integer, Occupancy.HAS_SPACE).filter(aya -> predicate2.test(aya.getPos())).findFirst().<BlockPos>map(aya -> {
+            aya.acquireTicket();
+            return aya.getPos();
         });
     }
     
-    public Optional<BlockPos> getRandom(final Predicate<PoiType> predicate1, final Predicate<BlockPos> predicate2, final Occupancy b, final BlockPos fk, final int integer, final Random random) {
-        final List<PoiRecord> list8 = this.getInRange(predicate1, fk, integer, b).collect(Collectors.toList());
+    public Optional<BlockPos> getRandom(final Predicate<PoiType> predicate1, final Predicate<BlockPos> predicate2, final Occupancy b, final BlockPos fu, final int integer, final Random random) {
+        final List<PoiRecord> list8 = this.getInRange(predicate1, fu, integer, b).collect(Collectors.toList());
         Collections.shuffle(list8, random);
-        return list8.stream().filter(ass -> predicate2.test(ass.getPos())).findFirst().<BlockPos>map(PoiRecord::getPos);
+        return list8.stream().filter(aya -> predicate2.test(aya.getPos())).findFirst().<BlockPos>map(PoiRecord::getPos);
     }
     
-    public boolean release(final BlockPos fk) {
-        return this.getOrCreate(SectionPos.of(fk).asLong()).release(fk);
+    public boolean release(final BlockPos fu) {
+        return this.getOrCreate(SectionPos.of(fu).asLong()).release(fu);
     }
     
-    public boolean exists(final BlockPos fk, final Predicate<PoiType> predicate) {
-        return this.getOrLoad(SectionPos.of(fk).asLong()).<Boolean>map(ast -> ast.exists(fk, predicate)).orElse(false);
+    public boolean exists(final BlockPos fu, final Predicate<PoiType> predicate) {
+        return this.getOrLoad(SectionPos.of(fu).asLong()).<Boolean>map(ayb -> ayb.exists(fu, predicate)).orElse(false);
     }
     
-    public Optional<PoiType> getType(final BlockPos fk) {
-        final PoiSection ast3 = this.getOrCreate(SectionPos.of(fk).asLong());
-        return ast3.getType(fk);
+    public Optional<PoiType> getType(final BlockPos fu) {
+        final PoiSection ayb3 = this.getOrCreate(SectionPos.of(fu).asLong());
+        return ayb3.getType(fu);
     }
     
-    public int sectionsToVillage(final SectionPos gd) {
+    public int sectionsToVillage(final SectionPos go) {
         this.distanceTracker.runAllUpdates();
-        return this.distanceTracker.getLevel(gd.asLong());
+        return this.distanceTracker.getLevel(go.asLong());
     }
     
     private boolean isVillageCenter(final long long1) {
         final Optional<PoiSection> optional4 = this.get(long1);
-        return optional4 != null && optional4.<Boolean>map(ast -> ast.getRecords(PoiType.ALL, Occupancy.IS_OCCUPIED).count() > 0L).orElse(false);
+        return optional4 != null && optional4.<Boolean>map(ayb -> ayb.getRecords(PoiType.ALL, Occupancy.IS_OCCUPIED).count() > 0L).orElse(false);
     }
     
     public void tick(final BooleanSupplier booleanSupplier) {
@@ -137,43 +138,43 @@ public class PoiManager extends SectionStorage<PoiSection> {
         this.distanceTracker.update(long1, this.distanceTracker.getLevelFromSource(long1), false);
     }
     
-    public void checkConsistencyWithBlocks(final ChunkPos bjh, final LevelChunkSection cam) {
-        final SectionPos gd4 = SectionPos.of(bjh, cam.bottomBlockY() >> 4);
-        final SectionPos gd5;
-        final SectionPos gd6;
-        PoiSection ast2;
-        Util.<PoiSection>ifElse(this.getOrLoad(gd4.asLong()), ast -> ast.refresh(biConsumer -> {
-            if (mayHavePoi(cam)) {
-                this.updateFromSection(cam, gd5, biConsumer);
+    public void checkConsistencyWithBlocks(final ChunkPos bph, final LevelChunkSection chk) {
+        final SectionPos go4 = SectionPos.of(bph, chk.bottomBlockY() >> 4);
+        final SectionPos go5;
+        final SectionPos go6;
+        PoiSection ayb2;
+        Util.<PoiSection>ifElse(this.getOrLoad(go4.asLong()), ayb -> ayb.refresh(biConsumer -> {
+            if (mayHavePoi(chk)) {
+                this.updateFromSection(chk, go5, biConsumer);
             }
         }), () -> {
-            if (mayHavePoi(cam)) {
-                ast2 = this.getOrCreate(gd6.asLong());
-                this.updateFromSection(cam, gd6, ast2::add);
+            if (mayHavePoi(chk)) {
+                ayb2 = this.getOrCreate(go6.asLong());
+                this.updateFromSection(chk, go6, ayb2::add);
             }
         });
     }
     
-    private static boolean mayHavePoi(final LevelChunkSection cam) {
-        return PoiType.allPoiStates().anyMatch(cam::maybeHas);
+    private static boolean mayHavePoi(final LevelChunkSection chk) {
+        return chk.maybeHas(PoiType.ALL_STATES::contains);
     }
     
-    private void updateFromSection(final LevelChunkSection cam, final SectionPos gd, final BiConsumer<BlockPos, PoiType> biConsumer) {
-        final BlockState byj4;
-        gd.blocksInside().forEach(fk -> {
-            byj4 = cam.getBlockState(SectionPos.sectionRelative(fk.getX()), SectionPos.sectionRelative(fk.getY()), SectionPos.sectionRelative(fk.getZ()));
-            PoiType.forState(byj4).ifPresent(asu -> biConsumer.accept(fk, asu));
+    private void updateFromSection(final LevelChunkSection chk, final SectionPos go, final BiConsumer<BlockPos, PoiType> biConsumer) {
+        final BlockState cfj4;
+        go.blocksInside().forEach(fu -> {
+            cfj4 = chk.getBlockState(SectionPos.sectionRelative(fu.getX()), SectionPos.sectionRelative(fu.getY()), SectionPos.sectionRelative(fu.getZ()));
+            PoiType.forState(cfj4).ifPresent(ayc -> biConsumer.accept(fu, ayc));
         });
     }
     
-    public void ensureLoadedAndValid(final LevelReader bjz, final BlockPos fk, final int integer) {
-        SectionPos.aroundChunk(new ChunkPos(fk), Math.floorDiv(integer, 16)).map(gd -> Pair.of(gd, this.getOrLoad(gd.asLong()))).filter(pair -> !((Optional)pair.getSecond()).map(PoiSection::isValid).orElse(false)).map(pair -> ((SectionPos)pair.getFirst()).chunk()).filter(bjh -> this.loadedChunks.add(bjh.toLong())).forEach(bjh -> bjz.getChunk(bjh.x, bjh.z, ChunkStatus.EMPTY));
+    public void ensureLoadedAndValid(final LevelReader bqd, final BlockPos fu, final int integer) {
+        SectionPos.aroundChunk(new ChunkPos(fu), Math.floorDiv(integer, 16)).map(go -> Pair.of(go, this.getOrLoad(go.asLong()))).filter(pair -> !((Optional)pair.getSecond()).map(PoiSection::isValid).orElse(false)).map(pair -> ((SectionPos)pair.getFirst()).chunk()).filter(bph -> this.loadedChunks.add(bph.toLong())).forEach(bph -> bqd.getChunk(bph.x, bph.z, ChunkStatus.EMPTY));
     }
     
     public enum Occupancy {
         HAS_SPACE(PoiRecord::hasSpace), 
         IS_OCCUPIED(PoiRecord::isOccupied), 
-        ANY(ass -> true);
+        ANY(aya -> true);
         
         private final Predicate<? super PoiRecord> test;
         
diff --git a/src/net/minecraft/world/entity/ai/village/poi/PoiRecord.java b/src/net/minecraft/world/entity/ai/village/poi/PoiRecord.java
index d175436..9390994 100644
--- a/src/net/minecraft/world/entity/ai/village/poi/PoiRecord.java
+++ b/src/net/minecraft/world/entity/ai/village/poi/PoiRecord.java
@@ -1,40 +1,32 @@
 package net.minecraft.world.entity.ai.village.poi;
 
+import com.mojang.datafixers.kinds.Applicative;
 import java.util.Objects;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.resources.ResourceLocation;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.Registry;
-import java.util.function.Function;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 import net.minecraft.core.BlockPos;
-import net.minecraft.util.Serializable;
 
-public class PoiRecord implements Serializable {
+public class PoiRecord {
     private final BlockPos pos;
     private final PoiType poiType;
     private int freeTickets;
     private final Runnable setDirty;
     
-    private PoiRecord(final BlockPos fk, final PoiType asu, final int integer, final Runnable runnable) {
-        this.pos = fk.immutable();
-        this.poiType = asu;
+    public static Codec<PoiRecord> codec(final Runnable runnable) {
+        return (Codec<PoiRecord>)RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockPos.CODEC.fieldOf("pos").forGetter(aya -> aya.pos), (App)Registry.POINT_OF_INTEREST_TYPE.fieldOf("type").forGetter(aya -> aya.poiType), (App)Codec.INT.fieldOf("free_tickets").withDefault(0).forGetter(aya -> aya.freeTickets), (App)RecordCodecBuilder.point(runnable)).apply(instance, PoiRecord::new));
+    }
+    
+    private PoiRecord(final BlockPos fu, final PoiType ayc, final int integer, final Runnable runnable) {
+        this.pos = fu.immutable();
+        this.poiType = ayc;
         this.freeTickets = integer;
         this.setDirty = runnable;
     }
     
-    public PoiRecord(final BlockPos fk, final PoiType asu, final Runnable runnable) {
-        this(fk, asu, asu.getMaxTickets(), runnable);
-    }
-    
-    public <T> PoiRecord(final Dynamic<T> dynamic, final Runnable runnable) {
-        this(dynamic.get("pos").map((Function)BlockPos::deserialize).orElse(new BlockPos(0, 0, 0)), Registry.POINT_OF_INTEREST_TYPE.get(new ResourceLocation(dynamic.get("type").asString(""))), dynamic.get("free_tickets").asInt(0), runnable);
-    }
-    
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("pos"), this.pos.<V>serialize((com.mojang.datafixers.types.DynamicOps<V>)dynamicOps), dynamicOps.createString("type"), dynamicOps.createString(Registry.POINT_OF_INTEREST_TYPE.getKey(this.poiType).toString()), dynamicOps.createString("free_tickets"), dynamicOps.createInt(this.freeTickets)));
+    public PoiRecord(final BlockPos fu, final PoiType ayc, final Runnable runnable) {
+        this(fu, ayc, ayc.getMaxTickets(), runnable);
     }
     
     protected boolean acquireTicket() {
diff --git a/src/net/minecraft/world/entity/ai/village/poi/PoiSection.java b/src/net/minecraft/world/entity/ai/village/poi/PoiSection.java
index 55999ef..d7f1e74 100644
--- a/src/net/minecraft/world/entity/ai/village/poi/PoiSection.java
+++ b/src/net/minecraft/world/entity/ai/village/poi/PoiSection.java
@@ -1,120 +1,111 @@
 package net.minecraft.world.entity.ai.village.poi;
 
 import org.apache.logging.log4j.LogManager;
+import com.mojang.datafixers.kinds.Applicative;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
 import java.util.Optional;
-import net.minecraft.Util;
 import com.google.common.collect.Sets;
 import net.minecraft.core.SectionPos;
 import org.apache.logging.log4j.util.Supplier;
 import net.minecraft.core.BlockPos;
 import java.util.stream.Stream;
 import java.util.function.Predicate;
-import com.mojang.datafixers.Dynamic;
 import com.google.common.collect.Maps;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
+import java.util.function.Consumer;
+import java.util.List;
+import net.minecraft.Util;
+import com.mojang.datafixers.kinds.App;
+import java.util.Collection;
+import com.google.common.collect.ImmutableList;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 import java.util.Set;
 import java.util.Map;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
 import org.apache.logging.log4j.Logger;
-import net.minecraft.util.Serializable;
 
-public class PoiSection implements Serializable {
+public class PoiSection {
     private static final Logger LOGGER;
     private final Short2ObjectMap<PoiRecord> records;
     private final Map<PoiType, Set<PoiRecord>> byType;
     private final Runnable setDirty;
     private boolean isValid;
     
-    public PoiSection(final Runnable runnable) {
-        this.records = (Short2ObjectMap<PoiRecord>)new Short2ObjectOpenHashMap();
-        this.byType = Maps.newHashMap();
-        this.setDirty = runnable;
-        this.isValid = true;
+    public static Codec<PoiSection> codec(final Runnable runnable) {
+        return (Codec<PoiSection>)RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)RecordCodecBuilder.point(runnable), (App)Codec.BOOL.optionalFieldOf("Valid", false).forGetter(ayb -> ayb.isValid), (App)PoiRecord.codec(runnable).listOf().fieldOf("Records").forGetter(ayb -> ImmutableList.copyOf(ayb.records.values()))).apply(instance, PoiSection::new)).withDefault((Consumer)Util.prefix("Failed to read POI section: ", PoiSection.LOGGER::error), () -> new PoiSection(runnable, false, ImmutableList.of()));
     }
     
-    public <T> PoiSection(final Runnable runnable, final Dynamic<T> dynamic) {
+    public PoiSection(final Runnable runnable) {
+        this(runnable, true, ImmutableList.of());
+    }
+    
+    private PoiSection(final Runnable runnable, final boolean boolean2, final List<PoiRecord> list) {
         this.records = (Short2ObjectMap<PoiRecord>)new Short2ObjectOpenHashMap();
         this.byType = Maps.newHashMap();
         this.setDirty = runnable;
-        try {
-            this.isValid = dynamic.get("Valid").asBoolean(false);
-            dynamic.get("Records").asStream().forEach(dynamic -> this.add(new PoiRecord(dynamic, runnable)));
-        }
-        catch (Exception exception4) {
-            PoiSection.LOGGER.error("Failed to load POI chunk", (Throwable)exception4);
-            this.clear();
-            this.isValid = false;
-        }
+        this.isValid = boolean2;
+        list.forEach(this::add);
     }
     
     public Stream<PoiRecord> getRecords(final Predicate<PoiType> predicate, final PoiManager.Occupancy b) {
         return this.byType.entrySet().stream().filter(entry -> predicate.test(entry.getKey())).<PoiRecord>flatMap(entry -> entry.getValue().stream()).filter(b.getTest());
     }
     
-    public void add(final BlockPos fk, final PoiType asu) {
-        if (this.add(new PoiRecord(fk, asu, this.setDirty))) {
-            PoiSection.LOGGER.debug("Added POI of type {} @ {}", new Supplier[] { () -> asu, () -> fk });
+    public void add(final BlockPos fu, final PoiType ayc) {
+        if (this.add(new PoiRecord(fu, ayc, this.setDirty))) {
+            PoiSection.LOGGER.debug("Added POI of type {} @ {}", new Supplier[] { () -> ayc, () -> fu });
             this.setDirty.run();
         }
     }
     
-    private boolean add(final PoiRecord ass) {
-        final BlockPos fk3 = ass.getPos();
-        final PoiType asu4 = ass.getPoiType();
-        final short short5 = SectionPos.sectionRelativePos(fk3);
-        final PoiRecord ass2 = (PoiRecord)this.records.get(short5);
-        if (ass2 == null) {
-            this.records.put(short5, ass);
-            this.byType.computeIfAbsent(asu4, asu -> Sets.newHashSet()).add(ass);
+    private boolean add(final PoiRecord aya) {
+        final BlockPos fu3 = aya.getPos();
+        final PoiType ayc4 = aya.getPoiType();
+        final short short5 = SectionPos.sectionRelativePos(fu3);
+        final PoiRecord aya2 = (PoiRecord)this.records.get(short5);
+        if (aya2 == null) {
+            this.records.put(short5, aya);
+            this.byType.computeIfAbsent(ayc4, ayc -> Sets.newHashSet()).add(aya);
             return true;
         }
-        if (asu4.equals(ass2.getPoiType())) {
+        if (ayc4.equals(aya2.getPoiType())) {
             return false;
         }
-        throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("POI data mismatch: already registered at " + fk3));
+        throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("POI data mismatch: already registered at " + fu3));
     }
     
-    public void remove(final BlockPos fk) {
-        final PoiRecord ass3 = (PoiRecord)this.records.remove(SectionPos.sectionRelativePos(fk));
-        if (ass3 == null) {
-            PoiSection.LOGGER.error("POI data mismatch: never registered at " + fk);
+    public void remove(final BlockPos fu) {
+        final PoiRecord aya3 = (PoiRecord)this.records.remove(SectionPos.sectionRelativePos(fu));
+        if (aya3 == null) {
+            PoiSection.LOGGER.error("POI data mismatch: never registered at " + fu);
             return;
         }
-        this.byType.get(ass3.getPoiType()).remove(ass3);
-        PoiSection.LOGGER.debug("Removed POI of type {} @ {}", new Supplier[] { ass3::getPoiType, ass3::getPos });
+        this.byType.get(aya3.getPoiType()).remove(aya3);
+        PoiSection.LOGGER.debug("Removed POI of type {} @ {}", new Supplier[] { aya3::getPoiType, aya3::getPos });
         this.setDirty.run();
     }
     
-    public boolean release(final BlockPos fk) {
-        final PoiRecord ass3 = (PoiRecord)this.records.get(SectionPos.sectionRelativePos(fk));
-        if (ass3 == null) {
-            throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("POI never registered at " + fk));
+    public boolean release(final BlockPos fu) {
+        final PoiRecord aya3 = (PoiRecord)this.records.get(SectionPos.sectionRelativePos(fu));
+        if (aya3 == null) {
+            throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("POI never registered at " + fu));
         }
-        final boolean boolean4 = ass3.releaseTicket();
+        final boolean boolean4 = aya3.releaseTicket();
         this.setDirty.run();
         return boolean4;
     }
     
-    public boolean exists(final BlockPos fk, final Predicate<PoiType> predicate) {
-        final short short4 = SectionPos.sectionRelativePos(fk);
-        final PoiRecord ass5 = (PoiRecord)this.records.get(short4);
-        return ass5 != null && predicate.test(ass5.getPoiType());
+    public boolean exists(final BlockPos fu, final Predicate<PoiType> predicate) {
+        final short short4 = SectionPos.sectionRelativePos(fu);
+        final PoiRecord aya5 = (PoiRecord)this.records.get(short4);
+        return aya5 != null && predicate.test(aya5.getPoiType());
     }
     
-    public Optional<PoiType> getType(final BlockPos fk) {
-        final short short3 = SectionPos.sectionRelativePos(fk);
-        final PoiRecord ass4 = (PoiRecord)this.records.get(short3);
-        return (ass4 != null) ? Optional.<PoiType>of(ass4.getPoiType()) : Optional.<PoiType>empty();
-    }
-    
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        final T object3 = (T)dynamicOps.createList((Stream)this.records.values().stream().map(ass -> ass.<T>serialize(dynamicOps)));
-        return (T)dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("Records"), object3, dynamicOps.createString("Valid"), dynamicOps.createBoolean(this.isValid)));
+    public Optional<PoiType> getType(final BlockPos fu) {
+        final short short3 = SectionPos.sectionRelativePos(fu);
+        final PoiRecord aya4 = (PoiRecord)this.records.get(short3);
+        return (aya4 != null) ? Optional.<PoiType>of(aya4.getPoiType()) : Optional.<PoiType>empty();
     }
     
     public void refresh(final Consumer<BiConsumer<BlockPos, PoiType>> consumer) {
@@ -123,11 +114,11 @@ public class PoiSection implements Serializable {
             this.clear();
             final short short5;
             final Short2ObjectMap short2ObjectMap4;
-            final PoiRecord ass6;
-            consumer.accept((fk, asu) -> {
-                short5 = SectionPos.sectionRelativePos(fk);
-                ass6 = (PoiRecord)short2ObjectMap4.computeIfAbsent(short5, integer -> new PoiRecord(fk, asu, this.setDirty));
-                this.add(ass6);
+            final PoiRecord aya6;
+            consumer.accept((fu, ayc) -> {
+                short5 = SectionPos.sectionRelativePos(fu);
+                aya6 = (PoiRecord)short2ObjectMap4.computeIfAbsent(short5, integer -> new PoiRecord(fu, ayc, this.setDirty));
+                this.add(aya6);
                 return;
             });
             this.isValid = true;
diff --git a/src/net/minecraft/world/entity/ai/village/poi/PoiType.java b/src/net/minecraft/world/entity/ai/village/poi/PoiType.java
index 648b1fc..22bf585 100644
--- a/src/net/minecraft/world/entity/ai/village/poi/PoiType.java
+++ b/src/net/minecraft/world/entity/ai/village/poi/PoiType.java
@@ -1,17 +1,19 @@
 package net.minecraft.world.entity.ai.village.poi;
 
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.block.Blocks;
+import com.google.common.base.Suppliers;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.function.Function;
 import net.minecraft.world.entity.npc.VillagerProfession;
+import java.util.stream.Stream;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.properties.BedPart;
 import net.minecraft.world.level.block.BedBlock;
 import net.minecraft.Util;
-import java.util.stream.Stream;
 import java.util.Optional;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.core.Registry;
@@ -20,11 +22,13 @@ import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.level.block.Block;
 import java.util.Map;
 import net.minecraft.world.level.block.state.BlockState;
-import java.util.Set;
 import java.util.function.Predicate;
+import java.util.Set;
+import java.util.function.Supplier;
 
 public class PoiType {
-    private static final Predicate<PoiType> ALL_JOBS;
+    private static final Supplier<Set<PoiType>> ALL_JOB_POI_TYPES;
+    public static final Predicate<PoiType> ALL_JOBS;
     public static final Predicate<PoiType> ALL;
     private static final Set<BlockState> BEDS;
     private static final Map<BlockState, PoiType> TYPE_BY_STATE;
@@ -48,14 +52,16 @@ public class PoiType {
     public static final PoiType BEEHIVE;
     public static final PoiType BEE_NEST;
     public static final PoiType NETHER_PORTAL;
+    public static final PoiType LODESTONE;
+    protected static final Set<BlockState> ALL_STATES;
     private final String name;
     private final Set<BlockState> matchingStates;
     private final int maxTickets;
     private final Predicate<PoiType> predicate;
     private final int validRange;
     
-    private static Set<BlockState> getBlockStates(final Block bph) {
-        return ImmutableSet.copyOf(bph.getStateDefinition().getPossibleStates());
+    private static Set<BlockState> getBlockStates(final Block bvr) {
+        return ImmutableSet.copyOf(bvr.getStateDefinition().getPossibleStates());
     }
     
     private PoiType(final String string, final Set<BlockState> set, final int integer3, final Predicate<PoiType> predicate, final int integer5) {
@@ -70,7 +76,7 @@ public class PoiType {
         this.name = string;
         this.matchingStates = ImmutableSet.copyOf(set);
         this.maxTickets = integer3;
-        this.predicate = (asu -> asu == this);
+        this.predicate = (ayc -> ayc == this);
         this.validRange = integer4;
     }
     
@@ -92,29 +98,29 @@ public class PoiType {
     }
     
     private static PoiType register(final String string, final Set<BlockState> set, final int integer3, final int integer4) {
-        return registerBlockStates(Registry.POINT_OF_INTEREST_TYPE.<PoiType>register(new ResourceLocation(string), new PoiType(string, set, integer3, integer4)));
+        return registerBlockStates(Registry.<PoiType, PoiType>register(Registry.POINT_OF_INTEREST_TYPE, new ResourceLocation(string), new PoiType(string, set, integer3, integer4)));
     }
     
     private static PoiType register(final String string, final Set<BlockState> set, final int integer3, final Predicate<PoiType> predicate, final int integer5) {
-        return registerBlockStates(Registry.POINT_OF_INTEREST_TYPE.<PoiType>register(new ResourceLocation(string), new PoiType(string, set, integer3, predicate, integer5)));
+        return registerBlockStates(Registry.<PoiType, PoiType>register(Registry.POINT_OF_INTEREST_TYPE, new ResourceLocation(string), new PoiType(string, set, integer3, predicate, integer5)));
     }
     
-    private static PoiType registerBlockStates(final PoiType asu) {
+    private static PoiType registerBlockStates(final PoiType ayc) {
         // 
         // This method could not be decompiled.
         // 
         // Original Bytecode:
         // 
         //     1: getfield        net/minecraft/world/entity/ai/village/poi/PoiType.matchingStates:Ljava/util/Set;
-        //     4: aload_0         /* asu */
+        //     4: aload_0         /* ayc */
         //     5: invokedynamic   BootstrapMethod #1, accept:(Lnet/minecraft/world/entity/ai/village/poi/PoiType;)Ljava/util/function/Consumer;
         //    10: invokeinterface java/util/Set.forEach:(Ljava/util/function/Consumer;)V
-        //    15: aload_0         /* asu */
+        //    15: aload_0         /* ayc */
         //    16: areturn        
         //    MethodParameters:
         //  Name  Flags  
         //  ----  -----
-        //  asu   
+        //  ayc   
         // 
         // The error that occurred was:
         // 
@@ -152,18 +158,15 @@ public class PoiType {
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    public static Optional<PoiType> forState(final BlockState byj) {
-        return Optional.<PoiType>ofNullable(PoiType.TYPE_BY_STATE.get(byj));
-    }
-    
-    public static Stream<BlockState> allPoiStates() {
-        return PoiType.TYPE_BY_STATE.keySet().stream();
+    public static Optional<PoiType> forState(final BlockState cfj) {
+        return Optional.<PoiType>ofNullable(PoiType.TYPE_BY_STATE.get(cfj));
     }
     
     static {
-        ALL_JOBS = (asu -> Registry.VILLAGER_PROFESSION.stream().map(VillagerProfession::getJobPoiType).collect(Collectors.toSet()).contains(asu));
-        ALL = (asu -> true);
-        BEDS = ImmutableList.<Block>of(Blocks.RED_BED, Blocks.BLACK_BED, Blocks.BLUE_BED, Blocks.BROWN_BED, Blocks.CYAN_BED, Blocks.GRAY_BED, Blocks.GREEN_BED, Blocks.LIGHT_BLUE_BED, Blocks.LIGHT_GRAY_BED, Blocks.LIME_BED, Blocks.MAGENTA_BED, Blocks.ORANGE_BED, Blocks.PINK_BED, Blocks.PURPLE_BED, Blocks.WHITE_BED, Blocks.YELLOW_BED).stream().flatMap(bph -> bph.getStateDefinition().getPossibleStates().stream()).filter(byj -> byj.<BedPart>getValue(BedBlock.PART) == BedPart.HEAD).collect(ImmutableSet.toImmutableSet());
+        ALL_JOB_POI_TYPES = Suppliers.<Set<? super Object>>memoize(() -> Registry.VILLAGER_PROFESSION.stream().map(VillagerProfession::getJobPoiType).collect(Collectors.toSet()));
+        ALL_JOBS = (ayc -> PoiType.ALL_JOB_POI_TYPES.get().contains(ayc));
+        ALL = (ayc -> true);
+        BEDS = ImmutableList.<Block>of(Blocks.RED_BED, Blocks.BLACK_BED, Blocks.BLUE_BED, Blocks.BROWN_BED, Blocks.CYAN_BED, Blocks.GRAY_BED, Blocks.GREEN_BED, Blocks.LIGHT_BLUE_BED, Blocks.LIGHT_GRAY_BED, Blocks.LIME_BED, Blocks.MAGENTA_BED, Blocks.ORANGE_BED, Blocks.PINK_BED, Blocks.PURPLE_BED, Blocks.WHITE_BED, Blocks.YELLOW_BED).stream().flatMap(bvr -> bvr.getStateDefinition().getPossibleStates().stream()).filter(cfj -> cfj.<BedPart>getValue(BedBlock.PART) == BedPart.HEAD).collect(ImmutableSet.toImmutableSet());
         TYPE_BY_STATE = Maps.newHashMap();
         UNEMPLOYED = register("unemployed", ImmutableSet.of(), 1, PoiType.ALL_JOBS, 1);
         ARMORER = register("armorer", getBlockStates(Blocks.BLAST_FURNACE), 1, 1);
@@ -185,5 +188,7 @@ public class PoiType {
         BEEHIVE = register("beehive", getBlockStates(Blocks.BEEHIVE), 0, 1);
         BEE_NEST = register("bee_nest", getBlockStates(Blocks.BEE_NEST), 0, 1);
         NETHER_PORTAL = register("nether_portal", getBlockStates(Blocks.NETHER_PORTAL), 0, 1);
+        LODESTONE = register("lodestone", getBlockStates(Blocks.LODESTONE), 0, 1);
+        ALL_STATES = (Set)new ObjectOpenHashSet((Collection)PoiType.TYPE_BY_STATE.keySet());
     }
 }
diff --git a/src/net/minecraft/world/entity/ambient/AmbientCreature.java b/src/net/minecraft/world/entity/ambient/AmbientCreature.java
index 474e782..e8d452e 100644
--- a/src/net/minecraft/world/entity/ambient/AmbientCreature.java
+++ b/src/net/minecraft/world/entity/ambient/AmbientCreature.java
@@ -6,12 +6,12 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.Mob;
 
 public abstract class AmbientCreature extends Mob {
-    protected AmbientCreature(final EntityType<? extends AmbientCreature> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AmbientCreature(final EntityType<? extends AmbientCreature> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
-    public boolean canBeLeashed(final Player ayj) {
+    public boolean canBeLeashed(final Player bec) {
         return false;
     }
 }
diff --git a/src/net/minecraft/world/entity/ambient/Bat.java b/src/net/minecraft/world/entity/ambient/Bat.java
index 675d525..3086881 100644
--- a/src/net/minecraft/world/entity/ambient/Bat.java
+++ b/src/net/minecraft/world/entity/ambient/Bat.java
@@ -7,7 +7,6 @@ import net.minecraft.world.entity.Pose;
 import java.time.temporal.TemporalField;
 import java.time.temporal.ChronoField;
 import java.time.LocalDate;
-import net.minecraft.world.entity.Mob;
 import java.util.Random;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.level.LevelAccessor;
@@ -19,7 +18,9 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
 import javax.annotation.Nullable;
@@ -36,8 +37,8 @@ public class Bat extends AmbientCreature {
     private static final TargetingConditions BAT_RESTING_TARGETING;
     private BlockPos targetPosition;
     
-    public Bat(final EntityType<? extends Bat> aku, final Level bjw) {
-        super(aku, bjw);
+    public Bat(final EntityType<? extends Bat> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.setResting(true);
     }
     
@@ -66,7 +67,7 @@ public class Bat extends AmbientCreature {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.BAT_HURT;
     }
     
@@ -81,17 +82,15 @@ public class Bat extends AmbientCreature {
     }
     
     @Override
-    protected void doPush(final Entity akq) {
+    protected void doPush(final Entity aom) {
     }
     
     @Override
     protected void pushEntities() {
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(6.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 6.0);
     }
     
     public boolean isResting() {
@@ -123,21 +122,26 @@ public class Bat extends AmbientCreature {
     @Override
     protected void customServerAiStep() {
         super.customServerAiStep();
-        final BlockPos fk2 = new BlockPos(this);
-        final BlockPos fk3 = fk2.above();
+        final BlockPos fu2 = this.blockPosition();
+        final BlockPos fu3 = fu2.above();
         if (this.isResting()) {
-            if (this.level.getBlockState(fk3).isRedstoneConductor(this.level, fk2)) {
+            final boolean boolean4 = this.isSilent();
+            if (this.level.getBlockState(fu3).isRedstoneConductor(this.level, fu2)) {
                 if (this.random.nextInt(200) == 0) {
                     this.yHeadRot = (float)this.random.nextInt(360);
                 }
                 if (this.level.getNearestPlayer(Bat.BAT_RESTING_TARGETING, this) != null) {
                     this.setResting(false);
-                    this.level.levelEvent(null, 1025, fk2, 0);
+                    if (!boolean4) {
+                        this.level.levelEvent(null, 1025, fu2, 0);
+                    }
                 }
             }
             else {
                 this.setResting(false);
-                this.level.levelEvent(null, 1025, fk2, 0);
+                if (!boolean4) {
+                    this.level.levelEvent(null, 1025, fu2, 0);
+                }
             }
         }
         else {
@@ -150,14 +154,14 @@ public class Bat extends AmbientCreature {
             final double double4 = this.targetPosition.getX() + 0.5 - this.getX();
             final double double5 = this.targetPosition.getY() + 0.1 - this.getY();
             final double double6 = this.targetPosition.getZ() + 0.5 - this.getZ();
-            final Vec3 cvl10 = this.getDeltaMovement();
-            final Vec3 cvl11 = cvl10.add((Math.signum(double4) * 0.5 - cvl10.x) * 0.10000000149011612, (Math.signum(double5) * 0.699999988079071 - cvl10.y) * 0.10000000149011612, (Math.signum(double6) * 0.5 - cvl10.z) * 0.10000000149011612);
-            this.setDeltaMovement(cvl11);
-            final float float12 = (float)(Mth.atan2(cvl11.z, cvl11.x) * 57.2957763671875) - 90.0f;
+            final Vec3 dem10 = this.getDeltaMovement();
+            final Vec3 dem11 = dem10.add((Math.signum(double4) * 0.5 - dem10.x) * 0.10000000149011612, (Math.signum(double5) * 0.699999988079071 - dem10.y) * 0.10000000149011612, (Math.signum(double6) * 0.5 - dem10.z) * 0.10000000149011612);
+            this.setDeltaMovement(dem11);
+            final float float12 = (float)(Mth.atan2(dem11.z, dem11.x) * 57.2957763671875) - 90.0f;
             final float float13 = Mth.wrapDegrees(float12 - this.yRot);
             this.zza = 0.5f;
             this.yRot += float13;
-            if (this.random.nextInt(100) == 0 && this.level.getBlockState(fk3).isRedstoneConductor(this.level, fk3)) {
+            if (this.random.nextInt(100) == 0 && this.level.getBlockState(fu3).isRedstoneConductor(this.level, fu3)) {
                 this.setResting(true);
             }
         }
@@ -174,7 +178,7 @@ public class Bat extends AmbientCreature {
     }
     
     @Override
-    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState byj, final BlockPos fk) {
+    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState cfj, final BlockPos fu) {
     }
     
     @Override
@@ -183,33 +187,33 @@ public class Bat extends AmbientCreature {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
         if (!this.level.isClientSide && this.isResting()) {
             this.setResting(false);
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.entityData.<Byte>set(Bat.DATA_ID_FLAGS, jt.getByte("BatFlags"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.entityData.<Byte>set(Bat.DATA_ID_FLAGS, le.getByte("BatFlags"));
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putByte("BatFlags", this.entityData.<Byte>get(Bat.DATA_ID_FLAGS));
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putByte("BatFlags", this.entityData.<Byte>get(Bat.DATA_ID_FLAGS));
     }
     
-    public static boolean checkBatSpawnRules(final EntityType<Bat> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        if (fk.getY() >= bjx.getSeaLevel()) {
+    public static boolean checkBatSpawnRules(final EntityType<Bat> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        if (fu.getY() >= bqc.getSeaLevel()) {
             return false;
         }
-        final int integer6 = bjx.getMaxLocalRawBrightness(fk);
+        final int integer6 = bqc.getMaxLocalRawBrightness(fu);
         int integer7 = 4;
         if (isHalloween()) {
             integer7 = 7;
@@ -217,7 +221,7 @@ public class Bat extends AmbientCreature {
         else if (random.nextBoolean()) {
             return false;
         }
-        return integer6 <= random.nextInt(integer7) && Mob.checkMobSpawnRules(aku, bjx, alc, fk, random);
+        return integer6 <= random.nextInt(integer7) && Mob.checkMobSpawnRules(aoq, bqc, apb, fu, random);
     }
     
     private static boolean isHalloween() {
@@ -228,8 +232,8 @@ public class Bat extends AmbientCreature {
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height / 2.0f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height / 2.0f;
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/animal/AbstractFish.java b/src/net/minecraft/world/entity/animal/AbstractFish.java
index be9a01f..8e5aaf8 100644
--- a/src/net/minecraft/world/entity/animal/AbstractFish.java
+++ b/src/net/minecraft/world/entity/animal/AbstractFish.java
@@ -1,22 +1,25 @@
 package net.minecraft.world.entity.animal;
 
 import net.minecraft.util.Mth;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.entity.ai.control.MoveControl;
 import net.minecraft.world.entity.ai.goal.RandomSwimmingGoal;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.MoverType;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.navigation.WaterBoundPathNavigation;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
 import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
@@ -31,7 +34,9 @@ import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.level.Level;
@@ -41,29 +46,27 @@ import net.minecraft.network.syncher.EntityDataAccessor;
 public abstract class AbstractFish extends WaterAnimal {
     private static final EntityDataAccessor<Boolean> FROM_BUCKET;
     
-    public AbstractFish(final EntityType<? extends AbstractFish> aku, final Level bjw) {
-        super(aku, bjw);
+    public AbstractFish(final EntityType<? extends AbstractFish> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.moveControl = new FishMoveControl(this);
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height * 0.65f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height * 0.65f;
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(3.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 3.0);
     }
     
     @Override
     public boolean requiresCustomPersistence() {
-        return this.fromBucket();
+        return super.requiresCustomPersistence() || this.fromBucket();
     }
     
-    public static boolean checkFishSpawnRules(final EntityType<? extends AbstractFish> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return bjx.getBlockState(fk).getBlock() == Blocks.WATER && bjx.getBlockState(fk.above()).getBlock() == Blocks.WATER;
+    public static boolean checkFishSpawnRules(final EntityType<? extends AbstractFish> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return bqc.getBlockState(fu).is(Blocks.WATER) && bqc.getBlockState(fu.above()).is(Blocks.WATER);
     }
     
     @Override
@@ -91,15 +94,15 @@ public abstract class AbstractFish extends WaterAnimal {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("FromBucket", this.fromBucket());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("FromBucket", this.fromBucket());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setFromBucket(jt.getBoolean("FromBucket"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setFromBucket(le.getBoolean("FromBucket"));
     }
     
     @Override
@@ -111,14 +114,14 @@ public abstract class AbstractFish extends WaterAnimal {
     }
     
     @Override
-    protected PathNavigation createNavigation(final Level bjw) {
-        return new WaterBoundPathNavigation(this, bjw);
+    protected PathNavigation createNavigation(final Level bqb) {
+        return new WaterBoundPathNavigation(this, bqb);
     }
     
     @Override
-    public void travel(final Vec3 cvl) {
+    public void travel(final Vec3 dem) {
         if (this.isEffectiveAi() && this.isInWater()) {
-            this.moveRelative(0.01f, cvl);
+            this.moveRelative(0.01f, dem);
             this.move(MoverType.SELF, this.getDeltaMovement());
             this.setDeltaMovement(this.getDeltaMovement().scale(0.9));
             if (this.getTarget() == null) {
@@ -126,7 +129,7 @@ public abstract class AbstractFish extends WaterAnimal {
             }
         }
         else {
-            super.travel(cvl);
+            super.travel(dem);
         }
     }
     
@@ -142,31 +145,31 @@ public abstract class AbstractFish extends WaterAnimal {
     }
     
     @Override
-    protected boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() == Items.WATER_BUCKET && this.isAlive()) {
+    protected InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (bki4.getItem() == Items.WATER_BUCKET && this.isAlive()) {
             this.playSound(SoundEvents.BUCKET_FILL_FISH, 1.0f, 1.0f);
-            ben4.shrink(1);
-            final ItemStack ben5 = this.getBucketItemStack();
-            this.saveToBucketTag(ben5);
+            bki4.shrink(1);
+            final ItemStack bki5 = this.getBucketItemStack();
+            this.saveToBucketTag(bki5);
             if (!this.level.isClientSide) {
-                CriteriaTriggers.FILLED_BUCKET.trigger((ServerPlayer)ayj, ben5);
+                CriteriaTriggers.FILLED_BUCKET.trigger((ServerPlayer)bec, bki5);
             }
-            if (ben4.isEmpty()) {
-                ayj.setItemInHand(ajk, ben5);
+            if (bki4.isEmpty()) {
+                bec.setItemInHand(anf, bki5);
             }
-            else if (!ayj.inventory.add(ben5)) {
-                ayj.drop(ben5, false);
+            else if (!bec.inventory.add(bki5)) {
+                bec.drop(bki5, false);
             }
             this.remove();
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        return super.mobInteract(ayj, ajk);
+        return super.mobInteract(bec, anf);
     }
     
-    protected void saveToBucketTag(final ItemStack ben) {
+    protected void saveToBucketTag(final ItemStack bki) {
         if (this.hasCustomName()) {
-            ben.setHoverName(this.getCustomName());
+            bki.setHoverName(this.getCustomName());
         }
     }
     
@@ -183,6 +186,10 @@ public abstract class AbstractFish extends WaterAnimal {
         return SoundEvents.FISH_SWIM;
     }
     
+    @Override
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
+    }
+    
     static {
         FROM_BUCKET = SynchedEntityData.<Boolean>defineId(AbstractFish.class, EntityDataSerializers.BOOLEAN);
     }
@@ -190,9 +197,9 @@ public abstract class AbstractFish extends WaterAnimal {
     static class FishSwimGoal extends RandomSwimmingGoal {
         private final AbstractFish fish;
         
-        public FishSwimGoal(final AbstractFish asz) {
-            super(asz, 1.0, 40);
-            this.fish = asz;
+        public FishSwimGoal(final AbstractFish ayh) {
+            super(ayh, 1.0, 40);
+            this.fish = ayh;
         }
         
         @Override
@@ -204,31 +211,34 @@ public abstract class AbstractFish extends WaterAnimal {
     static class FishMoveControl extends MoveControl {
         private final AbstractFish fish;
         
-        FishMoveControl(final AbstractFish asz) {
-            super(asz);
-            this.fish = asz;
+        FishMoveControl(final AbstractFish ayh) {
+            super(ayh);
+            this.fish = ayh;
         }
         
         @Override
         public void tick() {
-            if (this.fish.isUnderLiquid(FluidTags.WATER)) {
+            if (this.fish.isEyeInFluid(FluidTags.WATER)) {
                 this.fish.setDeltaMovement(this.fish.getDeltaMovement().add(0.0, 0.005, 0.0));
             }
             if (this.operation != Operation.MOVE_TO || this.fish.getNavigation().isDone()) {
                 this.fish.setSpeed(0.0f);
                 return;
             }
-            final double double2 = this.wantedX - this.fish.getX();
-            double double3 = this.wantedY - this.fish.getY();
-            final double double4 = this.wantedZ - this.fish.getZ();
-            final double double5 = Mth.sqrt(double2 * double2 + double3 * double3 + double4 * double4);
-            double3 /= double5;
-            final float float10 = (float)(Mth.atan2(double4, double2) * 57.2957763671875) - 90.0f;
-            this.fish.yRot = this.rotlerp(this.fish.yRot, float10, 90.0f);
-            this.fish.yBodyRot = this.fish.yRot;
-            final float float11 = (float)(this.speedModifier * this.fish.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue());
-            this.fish.setSpeed(Mth.lerp(0.125f, this.fish.getSpeed(), float11));
-            this.fish.setDeltaMovement(this.fish.getDeltaMovement().add(0.0, this.fish.getSpeed() * double3 * 0.1, 0.0));
+            final float float2 = (float)(this.speedModifier * this.fish.getAttributeValue(Attributes.MOVEMENT_SPEED));
+            this.fish.setSpeed(Mth.lerp(0.125f, this.fish.getSpeed(), float2));
+            final double double3 = this.wantedX - this.fish.getX();
+            final double double4 = this.wantedY - this.fish.getY();
+            final double double5 = this.wantedZ - this.fish.getZ();
+            if (double4 != 0.0) {
+                final double double6 = Mth.sqrt(double3 * double3 + double4 * double4 + double5 * double5);
+                this.fish.setDeltaMovement(this.fish.getDeltaMovement().add(0.0, this.fish.getSpeed() * (double4 / double6) * 0.1, 0.0));
+            }
+            if (double3 != 0.0 || double5 != 0.0) {
+                final float float3 = (float)(Mth.atan2(double5, double3) * 57.2957763671875) - 90.0f;
+                this.fish.yRot = this.rotlerp(this.fish.yRot, float3, 90.0f);
+                this.fish.yBodyRot = this.fish.yRot;
+            }
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/AbstractGolem.java b/src/net/minecraft/world/entity/animal/AbstractGolem.java
index fc090d4..693216f 100644
--- a/src/net/minecraft/world/entity/animal/AbstractGolem.java
+++ b/src/net/minecraft/world/entity/animal/AbstractGolem.java
@@ -8,8 +8,8 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.PathfinderMob;
 
 public abstract class AbstractGolem extends PathfinderMob {
-    protected AbstractGolem(final EntityType<? extends AbstractGolem> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AbstractGolem(final EntityType<? extends AbstractGolem> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -25,7 +25,7 @@ public abstract class AbstractGolem extends PathfinderMob {
     
     @Nullable
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return null;
     }
     
diff --git a/src/net/minecraft/world/entity/animal/AbstractSchoolingFish.java b/src/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
index 860ea19..02b9838 100644
--- a/src/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
+++ b/src/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
@@ -18,8 +18,8 @@ public abstract class AbstractSchoolingFish extends AbstractFish {
     private AbstractSchoolingFish leader;
     private int schoolSize;
     
-    public AbstractSchoolingFish(final EntityType<? extends AbstractSchoolingFish> aku, final Level bjw) {
-        super(aku, bjw);
+    public AbstractSchoolingFish(final EntityType<? extends AbstractSchoolingFish> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.schoolSize = 1;
     }
     
@@ -47,9 +47,9 @@ public abstract class AbstractSchoolingFish extends AbstractFish {
         return this.leader != null && this.leader.isAlive();
     }
     
-    public AbstractSchoolingFish startFollowing(final AbstractSchoolingFish atb) {
-        (this.leader = atb).addFollower();
-        return atb;
+    public AbstractSchoolingFish startFollowing(final AbstractSchoolingFish ayj) {
+        (this.leader = ayj).addFollower();
+        return ayj;
     }
     
     public void stopFollowing() {
@@ -95,27 +95,27 @@ public abstract class AbstractSchoolingFish extends AbstractFish {
     }
     
     public void addFollowers(final Stream<AbstractSchoolingFish> stream) {
-        stream.limit(this.getMaxSchoolSize() - this.schoolSize).filter(atb -> atb != this).forEach(atb -> atb.startFollowing(this));
+        stream.limit(this.getMaxSchoolSize() - this.schoolSize).filter(ayj -> ayj != this).forEach(ayj -> ayj.startFollowing(this));
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        super.finalizeSpawn(bjx, ajj, alc, alm, jt);
-        if (alm == null) {
-            alm = new SchoolSpawnGroupData(this);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        super.finalizeSpawn(bqc, ane, apb, apo, le);
+        if (apo == null) {
+            apo = new SchoolSpawnGroupData(this);
         }
         else {
-            this.startFollowing(((SchoolSpawnGroupData)alm).leader);
+            this.startFollowing(((SchoolSpawnGroupData)apo).leader);
         }
-        return alm;
+        return apo;
     }
     
     public static class SchoolSpawnGroupData implements SpawnGroupData {
         public final AbstractSchoolingFish leader;
         
-        public SchoolSpawnGroupData(final AbstractSchoolingFish atb) {
-            this.leader = atb;
+        public SchoolSpawnGroupData(final AbstractSchoolingFish ayj) {
+            this.leader = ayj;
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/Animal.java b/src/net/minecraft/world/entity/animal/Animal.java
index 66d54c4..c0689cb 100644
--- a/src/net/minecraft/world/entity/animal/Animal.java
+++ b/src/net/minecraft/world/entity/animal/Animal.java
@@ -1,8 +1,13 @@
 package net.minecraft.world.entity.animal;
 
+import net.minecraft.world.entity.ExperienceOrb;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.stats.Stats;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
 import javax.annotation.Nullable;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.ItemStack;
@@ -17,6 +22,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import java.util.UUID;
@@ -26,8 +32,10 @@ public abstract class Animal extends AgableMob {
     private int inLove;
     private UUID loveCause;
     
-    protected Animal(final EntityType<? extends Animal> aku, final Level bjw) {
-        super(aku, bjw);
+    protected Animal(final EntityType<? extends Animal> aoq, final Level bqb) {
+        super(aoq, bqb);
+        this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 16.0f);
+        this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, -1.0f);
     }
     
     @Override
@@ -56,45 +64,45 @@ public abstract class Animal extends AgableMob {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
         this.inLove = 0;
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
-    public float getWalkTargetValue(final BlockPos fk, final LevelReader bjz) {
-        if (bjz.getBlockState(fk.below()).getBlock() == Blocks.GRASS_BLOCK) {
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        if (bqd.getBlockState(fu.below()).is(Blocks.GRASS_BLOCK)) {
             return 10.0f;
         }
-        return bjz.getBrightness(fk) - 0.5f;
+        return bqd.getBrightness(fu) - 0.5f;
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("InLove", this.inLove);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("InLove", this.inLove);
         if (this.loveCause != null) {
-            jt.putUUID("LoveCause", this.loveCause);
+            le.putUUID("LoveCause", this.loveCause);
         }
     }
     
     @Override
-    public double getRidingHeight() {
+    public double getMyRidingOffset() {
         return 0.14;
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.inLove = jt.getInt("InLove");
-        this.loveCause = (jt.hasUUID("LoveCause") ? jt.getUUID("LoveCause") : null);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.inLove = le.getInt("InLove");
+        this.loveCause = (le.hasUUID("LoveCause") ? le.getUUID("LoveCause") : null);
     }
     
-    public static boolean checkAnimalSpawnRules(final EntityType<? extends Animal> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return bjx.getBlockState(fk.below()).getBlock() == Blocks.GRASS_BLOCK && bjx.getRawBrightness(fk, 0) > 8;
+    public static boolean checkAnimalSpawnRules(final EntityType<? extends Animal> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return bqc.getBlockState(fu.below()).is(Blocks.GRASS_BLOCK) && bqc.getRawBrightness(fu, 0) > 8;
     }
     
     @Override
@@ -108,36 +116,38 @@ public abstract class Animal extends AgableMob {
     }
     
     @Override
-    protected int getExperienceReward(final Player ayj) {
+    protected int getExperienceReward(final Player bec) {
         return 1 + this.level.random.nextInt(3);
     }
     
-    public boolean isFood(final ItemStack ben) {
-        return ben.getItem() == Items.WHEAT;
+    public boolean isFood(final ItemStack bki) {
+        return bki.getItem() == Items.WHEAT;
     }
     
-    @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (this.isFood(ben4)) {
-            if (!this.level.isClientSide && this.getAge() == 0 && this.canFallInLove()) {
-                this.usePlayerItem(ayj, ben4);
-                this.setInLove(ayj);
-                ayj.swing(ajk, true);
-                return true;
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (this.isFood(bki4)) {
+            final int integer5 = this.getAge();
+            if (!this.level.isClientSide && integer5 == 0 && this.canFallInLove()) {
+                this.usePlayerItem(bec, bki4);
+                this.setInLove(bec);
+                return InteractionResult.SUCCESS;
             }
             if (this.isBaby()) {
-                this.usePlayerItem(ayj, ben4);
-                this.ageUp((int)(-this.getAge() / 20 * 0.1f), true);
-                return true;
+                this.usePlayerItem(bec, bki4);
+                this.ageUp((int)(-integer5 / 20 * 0.1f), true);
+                return InteractionResult.sidedSuccess(this.level.isClientSide);
+            }
+            if (this.level.isClientSide) {
+                return InteractionResult.CONSUME;
             }
         }
-        return super.mobInteract(ayj, ajk);
+        return super.mobInteract(bec, anf);
     }
     
-    protected void usePlayerItem(final Player ayj, final ItemStack ben) {
-        if (!ayj.abilities.instabuild) {
-            ben.shrink(1);
+    protected void usePlayerItem(final Player bec, final ItemStack bki) {
+        if (!bec.abilities.instabuild) {
+            bki.shrink(1);
         }
     }
     
@@ -145,10 +155,10 @@ public abstract class Animal extends AgableMob {
         return this.inLove <= 0;
     }
     
-    public void setInLove(@Nullable final Player ayj) {
+    public void setInLove(@Nullable final Player bec) {
         this.inLove = 600;
-        if (ayj != null) {
-            this.loveCause = ayj.getUUID();
+        if (bec != null) {
+            this.loveCause = bec.getUUID();
         }
         this.level.broadcastEntityEvent(this, (byte)18);
     }
@@ -157,14 +167,18 @@ public abstract class Animal extends AgableMob {
         this.inLove = integer;
     }
     
+    public int getInLoveTime() {
+        return this.inLove;
+    }
+    
     @Nullable
     public ServerPlayer getLoveCause() {
         if (this.loveCause == null) {
             return null;
         }
-        final Player ayj2 = this.level.getPlayerByUUID(this.loveCause);
-        if (ayj2 instanceof ServerPlayer) {
-            return (ServerPlayer)ayj2;
+        final Player bec2 = this.level.getPlayerByUUID(this.loveCause);
+        if (bec2 instanceof ServerPlayer) {
+            return (ServerPlayer)bec2;
         }
         return null;
     }
@@ -177,8 +191,34 @@ public abstract class Animal extends AgableMob {
         this.inLove = 0;
     }
     
-    public boolean canMate(final Animal atc) {
-        return atc != this && atc.getClass() == this.getClass() && this.isInLove() && atc.isInLove();
+    public boolean canMate(final Animal ayk) {
+        return ayk != this && ayk.getClass() == this.getClass() && this.isInLove() && ayk.isInLove();
+    }
+    
+    public void spawnChildFromBreeding(final Level bqb, final Animal ayk) {
+        final AgableMob aok4 = this.getBreedOffspring(ayk);
+        if (aok4 == null) {
+            return;
+        }
+        ServerPlayer ze5 = this.getLoveCause();
+        if (ze5 == null && ayk.getLoveCause() != null) {
+            ze5 = ayk.getLoveCause();
+        }
+        if (ze5 != null) {
+            ze5.awardStat(Stats.ANIMALS_BRED);
+            CriteriaTriggers.BRED_ANIMALS.trigger(ze5, this, ayk, aok4);
+        }
+        this.setAge(6000);
+        ayk.setAge(6000);
+        this.resetLove();
+        ayk.resetLove();
+        aok4.setBaby(true);
+        aok4.moveTo(this.getX(), this.getY(), this.getZ(), 0.0f, 0.0f);
+        bqb.addFreshEntity(aok4);
+        bqb.broadcastEntityEvent(this, (byte)18);
+        if (bqb.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
+            bqb.addFreshEntity(new ExperienceOrb(bqb, this.getX(), this.getY(), this.getZ(), this.getRandom().nextInt(7) + 1));
+        }
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/animal/Bee.java b/src/net/minecraft/world/entity/animal/Bee.java
index dea83fa..17d3227 100644
--- a/src/net/minecraft/world/entity/animal/Bee.java
+++ b/src/net/minecraft/world/entity/animal/Bee.java
@@ -1,10 +1,9 @@
 package net.minecraft.world.entity.animal;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.core.Position;
 import net.minecraft.world.entity.ai.goal.MeleeAttackGoal;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SweetBerryBushBlock;
 import net.minecraft.world.level.block.StemBlock;
 import net.minecraft.world.level.block.CropBlock;
@@ -16,7 +15,6 @@ import java.util.function.Function;
 import net.minecraft.world.entity.ai.village.poi.PoiRecord;
 import net.minecraft.world.entity.ai.village.poi.PoiManager;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
-import net.minecraft.server.level.ServerLevel;
 import java.util.Iterator;
 import java.util.Optional;
 import net.minecraft.world.level.block.state.properties.Property;
@@ -29,8 +27,10 @@ import com.google.common.collect.Lists;
 import net.minecraft.world.level.pathfinder.Path;
 import java.util.List;
 import java.util.EnumSet;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
+import net.minecraft.util.TimeUtil;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import java.util.Random;
@@ -41,10 +41,12 @@ import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.AgableMob;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.ai.navigation.FlyingPathNavigation;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.network.protocol.game.DebugPackets;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -59,17 +61,19 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.Difficulty;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.nbt.Tag;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.ai.goal.target.ResetUniversalAngerTargetGoal;
 import net.minecraft.world.entity.ai.goal.FloatGoal;
 import net.minecraft.world.entity.ai.goal.FollowParentGoal;
 import net.minecraft.world.entity.ai.goal.TemptGoal;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.entity.ai.goal.BreedGoal;
@@ -84,12 +88,15 @@ import net.minecraft.world.entity.EntityType;
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
 import java.util.UUID;
+import net.minecraft.util.IntRange;
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.NeutralMob;
 
-public class Bee extends Animal implements FlyingAnimal {
+public class Bee extends Animal implements NeutralMob, FlyingAnimal {
     private static final EntityDataAccessor<Byte> DATA_FLAGS_ID;
-    private static final EntityDataAccessor<Integer> ANGER_TIME;
-    private UUID lastHurtByUUID;
+    private static final EntityDataAccessor<Integer> DATA_REMAINING_ANGER_TIME;
+    private static final IntRange PERSISTENT_ANGER_TIME;
+    private UUID persistentAngerTarget;
     private float rollAmount;
     private float rollAmountO;
     private int timeSinceSting;
@@ -107,15 +114,17 @@ public class Bee extends Animal implements FlyingAnimal {
     private BeeGoToKnownFlowerGoal goToKnownFlowerGoal;
     private int underWaterTicks;
     
-    public Bee(final EntityType<? extends Bee> aku, final Level bjw) {
-        super(aku, bjw);
+    public Bee(final EntityType<? extends Bee> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.remainingCooldownBeforeLocatingNewHive = 0;
         this.remainingCooldownBeforeLocatingNewFlower = 0;
         this.savedFlowerPos = null;
         this.hivePos = null;
         this.moveControl = new FlyingMoveControl(this, 20, true);
         this.lookControl = new BeeLookControl(this);
+        this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, -1.0f);
         this.setPathfindingMalus(BlockPathTypes.WATER, -1.0f);
+        this.setPathfindingMalus(BlockPathTypes.WATER_BORDER, 16.0f);
         this.setPathfindingMalus(BlockPathTypes.COCOA, -1.0f);
         this.setPathfindingMalus(BlockPathTypes.FENCE, -1.0f);
     }
@@ -124,12 +133,12 @@ public class Bee extends Animal implements FlyingAnimal {
     protected void defineSynchedData() {
         super.defineSynchedData();
         this.entityData.<Byte>define(Bee.DATA_FLAGS_ID, (Byte)0);
-        this.entityData.<Integer>define(Bee.ANGER_TIME, 0);
+        this.entityData.<Integer>define(Bee.DATA_REMAINING_ANGER_TIME, 0);
     }
     
     @Override
-    public float getWalkTargetValue(final BlockPos fk, final LevelReader bjz) {
-        if (bjz.getBlockState(fk).isAir()) {
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        if (bqd.getBlockState(fu).isAir()) {
             return 10.0f;
         }
         return 0.0f;
@@ -154,67 +163,52 @@ public class Bee extends Animal implements FlyingAnimal {
         this.goalSelector.addGoal(9, new FloatGoal(this));
         this.targetSelector.addGoal(1, new BeeHurtByOtherGoal(this).setAlertOthers(new Class[0]));
         this.targetSelector.addGoal(2, new BeeBecomeAngryTargetGoal(this));
+        this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         if (this.hasHive()) {
-            jt.put("HivePos", NbtUtils.writeBlockPos(this.getHivePos()));
+            le.put("HivePos", NbtUtils.writeBlockPos(this.getHivePos()));
         }
         if (this.hasSavedFlowerPos()) {
-            jt.put("FlowerPos", NbtUtils.writeBlockPos(this.getSavedFlowerPos()));
-        }
-        jt.putBoolean("HasNectar", this.hasNectar());
-        jt.putBoolean("HasStung", this.hasStung());
-        jt.putInt("TicksSincePollination", this.ticksWithoutNectarSinceExitingHive);
-        jt.putInt("CannotEnterHiveTicks", this.stayOutOfHiveCountdown);
-        jt.putInt("CropsGrownSincePollination", this.numCropsGrownSincePollination);
-        jt.putInt("Anger", this.getAngerTime());
-        if (this.lastHurtByUUID != null) {
-            jt.putString("HurtBy", this.lastHurtByUUID.toString());
-        }
-        else {
-            jt.putString("HurtBy", "");
+            le.put("FlowerPos", NbtUtils.writeBlockPos(this.getSavedFlowerPos()));
         }
+        le.putBoolean("HasNectar", this.hasNectar());
+        le.putBoolean("HasStung", this.hasStung());
+        le.putInt("TicksSincePollination", this.ticksWithoutNectarSinceExitingHive);
+        le.putInt("CannotEnterHiveTicks", this.stayOutOfHiveCountdown);
+        le.putInt("CropsGrownSincePollination", this.numCropsGrownSincePollination);
+        this.addPersistentAngerSaveData(le);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
+    public void readAdditionalSaveData(final CompoundTag le) {
         this.hivePos = null;
-        if (jt.contains("HivePos")) {
-            this.hivePos = NbtUtils.readBlockPos(jt.getCompound("HivePos"));
+        if (le.contains("HivePos")) {
+            this.hivePos = NbtUtils.readBlockPos(le.getCompound("HivePos"));
         }
         this.savedFlowerPos = null;
-        if (jt.contains("FlowerPos")) {
-            this.savedFlowerPos = NbtUtils.readBlockPos(jt.getCompound("FlowerPos"));
-        }
-        super.readAdditionalSaveData(jt);
-        this.setHasNectar(jt.getBoolean("HasNectar"));
-        this.setHasStung(jt.getBoolean("HasStung"));
-        this.setAngerTime(jt.getInt("Anger"));
-        this.ticksWithoutNectarSinceExitingHive = jt.getInt("TicksSincePollination");
-        this.stayOutOfHiveCountdown = jt.getInt("CannotEnterHiveTicks");
-        this.numCropsGrownSincePollination = jt.getInt("CropsGrownSincePollination");
-        final String string3 = jt.getString("HurtBy");
-        if (!string3.isEmpty()) {
-            this.lastHurtByUUID = UUID.fromString(string3);
-            final Player ayj4 = this.level.getPlayerByUUID(this.lastHurtByUUID);
-            this.setLastHurtByMob(ayj4);
-            if (ayj4 != null) {
-                this.lastHurtByPlayer = ayj4;
-                this.lastHurtByPlayerTime = this.getLastHurtByMobTimestamp();
-            }
+        if (le.contains("FlowerPos")) {
+            this.savedFlowerPos = NbtUtils.readBlockPos(le.getCompound("FlowerPos"));
         }
+        super.readAdditionalSaveData(le);
+        this.setHasNectar(le.getBoolean("HasNectar"));
+        this.setHasStung(le.getBoolean("HasStung"));
+        this.ticksWithoutNectarSinceExitingHive = le.getInt("TicksSincePollination");
+        this.stayOutOfHiveCountdown = le.getInt("CannotEnterHiveTicks");
+        this.numCropsGrownSincePollination = le.getInt("CropsGrownSincePollination");
+        this.readPersistentAngerSaveData((ServerLevel)this.level, le);
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        final boolean boolean3 = akq.hurt(DamageSource.sting(this), (float)(int)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue());
+    public boolean doHurtTarget(final Entity aom) {
+        final boolean boolean3 = aom.hurt(DamageSource.sting(this), (float)(int)this.getAttributeValue(Attributes.ATTACK_DAMAGE));
         if (boolean3) {
-            this.doEnchantDamageEffects(this, akq);
-            if (akq instanceof LivingEntity) {
-                ((LivingEntity)akq).setStingerCount(((LivingEntity)akq).getStingerCount() + 1);
+            this.doEnchantDamageEffects(this, aom);
+            if (aom instanceof LivingEntity) {
+                ((LivingEntity)aom).setStingerCount(((LivingEntity)aom).getStingerCount() + 1);
                 int integer4 = 0;
                 if (this.level.getDifficulty() == Difficulty.NORMAL) {
                     integer4 = 10;
@@ -223,11 +217,11 @@ public class Bee extends Animal implements FlyingAnimal {
                     integer4 = 18;
                 }
                 if (integer4 > 0) {
-                    ((LivingEntity)akq).addEffect(new MobEffectInstance(MobEffects.POISON, integer4 * 20, 0));
+                    ((LivingEntity)aom).addEffect(new MobEffectInstance(MobEffects.POISON, integer4 * 20, 0));
                 }
             }
             this.setHasStung(true);
-            this.setTarget(null);
+            this.stopBeingAngry();
             this.playSound(SoundEvents.BEE_STING, 1.0f, 1.0f);
         }
         return boolean3;
@@ -244,15 +238,15 @@ public class Bee extends Animal implements FlyingAnimal {
         this.updateRollAmount();
     }
     
-    private void spawnFluidParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final ParticleOptions gt) {
-        bjw.addParticle(gt, Mth.lerp(bjw.random.nextDouble(), double2, double3), double6, Mth.lerp(bjw.random.nextDouble(), double4, double5), 0.0, 0.0, 0.0);
+    private void spawnFluidParticle(final Level bqb, final double double2, final double double3, final double double4, final double double5, final double double6, final ParticleOptions hf) {
+        bqb.addParticle(hf, Mth.lerp(bqb.random.nextDouble(), double2, double3), double6, Mth.lerp(bqb.random.nextDouble(), double4, double5), 0.0, 0.0, 0.0);
     }
     
-    private void pathfindRandomlyTowards(final BlockPos fk) {
-        final Vec3 cvl3 = new Vec3(fk);
+    private void pathfindRandomlyTowards(final BlockPos fu) {
+        final Vec3 dem3 = Vec3.atBottomCenterOf(fu);
         int integer4 = 0;
-        final BlockPos fk2 = new BlockPos(this);
-        final int integer5 = (int)cvl3.y - fk2.getY();
+        final BlockPos fu2 = this.blockPosition();
+        final int integer5 = (int)dem3.y - fu2.getY();
         if (integer5 > 2) {
             integer4 = 4;
         }
@@ -261,17 +255,17 @@ public class Bee extends Animal implements FlyingAnimal {
         }
         int integer6 = 6;
         int integer7 = 8;
-        final int integer8 = fk2.distManhattan(fk);
+        final int integer8 = fu2.distManhattan(fu);
         if (integer8 < 15) {
             integer6 = integer8 / 2;
             integer7 = integer8 / 2;
         }
-        final Vec3 cvl4 = RandomPos.getAirPosTowards(this, integer6, integer7, integer4, cvl3, 0.3141592741012573);
-        if (cvl4 == null) {
+        final Vec3 dem4 = RandomPos.getAirPosTowards(this, integer6, integer7, integer4, dem3, 0.3141592741012573);
+        if (dem4 == null) {
             return;
         }
         this.navigation.setMaxVisitedNodesMultiplier(0.5f);
-        this.navigation.moveTo(cvl4.x, cvl4.y, cvl4.z, 1.0);
+        this.navigation.moveTo(dem4.x, dem4.y, dem4.z, 1.0);
     }
     
     @Nullable
@@ -283,8 +277,8 @@ public class Bee extends Animal implements FlyingAnimal {
         return this.savedFlowerPos != null;
     }
     
-    public void setSavedFlowerPos(final BlockPos fk) {
-        this.savedFlowerPos = fk;
+    public void setSavedFlowerPos(final BlockPos fu) {
+        this.savedFlowerPos = fu;
     }
     
     private boolean isTiredOfLookingForNectar() {
@@ -292,7 +286,7 @@ public class Bee extends Animal implements FlyingAnimal {
     }
     
     private boolean wantsToEnterHive() {
-        if (this.stayOutOfHiveCountdown > 0 || this.beePollinateGoal.isPollinating() || this.hasStung()) {
+        if (this.stayOutOfHiveCountdown > 0 || this.beePollinateGoal.isPollinating() || this.hasStung() || this.getTarget() != null) {
             return false;
         }
         final boolean boolean2 = this.isTiredOfLookingForNectar() || this.level.isRaining() || this.level.isNight() || this.hasNectar();
@@ -317,14 +311,6 @@ public class Bee extends Animal implements FlyingAnimal {
         }
     }
     
-    @Override
-    public void setLastHurtByMob(@Nullable final LivingEntity akz) {
-        super.setLastHurtByMob(akz);
-        if (akz != null) {
-            this.lastHurtByUUID = akz.getUUID();
-        }
-    }
-    
     @Override
     protected void customServerAiStep() {
         final boolean boolean2 = this.hasStung();
@@ -343,17 +329,12 @@ public class Bee extends Animal implements FlyingAnimal {
                 this.hurt(DamageSource.GENERIC, this.getHealth());
             }
         }
-        if (this.isAngry()) {
-            final int integer3 = this.getAngerTime();
-            this.setAngerTime(integer3 - 1);
-            final LivingEntity akz4 = this.getTarget();
-            if (integer3 == 0 && akz4 != null) {
-                this.makeAngry(akz4);
-            }
-        }
         if (!this.hasNectar()) {
             ++this.ticksWithoutNectarSinceExitingHive;
         }
+        if (!this.level.isClientSide) {
+            this.updatePersistentAnger((ServerLevel)this.level, false);
+        }
     }
     
     public void resetTicksWithoutNectarSinceExitingHive() {
@@ -364,25 +345,38 @@ public class Bee extends Animal implements FlyingAnimal {
         if (this.hivePos == null) {
             return false;
         }
-        final BlockEntity bwl2 = this.level.getBlockEntity(this.hivePos);
-        return bwl2 instanceof BeehiveBlockEntity && ((BeehiveBlockEntity)bwl2).isFireNearby();
+        final BlockEntity cdl2 = this.level.getBlockEntity(this.hivePos);
+        return cdl2 instanceof BeehiveBlockEntity && ((BeehiveBlockEntity)cdl2).isFireNearby();
     }
     
-    public boolean isAngry() {
-        return this.getAngerTime() > 0;
+    @Override
+    public int getRemainingPersistentAngerTime() {
+        return this.entityData.<Integer>get(Bee.DATA_REMAINING_ANGER_TIME);
     }
     
-    private int getAngerTime() {
-        return this.entityData.<Integer>get(Bee.ANGER_TIME);
+    @Override
+    public void setRemainingPersistentAngerTime(final int integer) {
+        this.entityData.<Integer>set(Bee.DATA_REMAINING_ANGER_TIME, integer);
     }
     
-    private void setAngerTime(final int integer) {
-        this.entityData.<Integer>set(Bee.ANGER_TIME, integer);
+    @Override
+    public UUID getPersistentAngerTarget() {
+        return this.persistentAngerTarget;
     }
     
-    private boolean doesHiveHaveSpace(final BlockPos fk) {
-        final BlockEntity bwl3 = this.level.getBlockEntity(fk);
-        return bwl3 instanceof BeehiveBlockEntity && !((BeehiveBlockEntity)bwl3).isFull();
+    @Override
+    public void setPersistentAngerTarget(@Nullable final UUID uUID) {
+        this.persistentAngerTarget = uUID;
+    }
+    
+    @Override
+    public void startPersistentAngerTimer() {
+        this.setRemainingPersistentAngerTime(Bee.PERSISTENT_ANGER_TIME.randomValue(this.random));
+    }
+    
+    private boolean doesHiveHaveSpace(final BlockPos fu) {
+        final BlockEntity cdl3 = this.level.getBlockEntity(fu);
+        return cdl3 instanceof BeehiveBlockEntity && !((BeehiveBlockEntity)cdl3).isFull();
     }
     
     public boolean hasHive() {
@@ -437,8 +431,8 @@ public class Bee extends Animal implements FlyingAnimal {
         if (!this.hasHive()) {
             return false;
         }
-        final BlockEntity bwl2 = this.level.getBlockEntity(this.hivePos);
-        return bwl2 != null && bwl2.getType() == BlockEntityType.BEEHIVE;
+        final BlockEntity cdl2 = this.level.getBlockEntity(this.hivePos);
+        return cdl2 != null && cdl2.getType() == BlockEntityType.BEEHIVE;
     }
     
     public boolean hasNectar() {
@@ -468,8 +462,8 @@ public class Bee extends Animal implements FlyingAnimal {
         this.setFlag(2, boolean1);
     }
     
-    private boolean isTooFarAway(final BlockPos fk) {
-        return !this.closerThan(fk, 48);
+    private boolean isTooFarAway(final BlockPos fu) {
+        return !this.closerThan(fu, 32);
     }
     
     private void setFlag(final int integer, final boolean boolean2) {
@@ -485,23 +479,16 @@ public class Bee extends Animal implements FlyingAnimal {
         return (this.entityData.<Byte>get(Bee.DATA_FLAGS_ID) & integer) != 0x0;
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.FLYING_SPEED);
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(10.0);
-        this.getAttribute(SharedMonsterAttributes.FLYING_SPEED).setBaseValue(0.6000000238418579);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.30000001192092896);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(2.0);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(48.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 10.0).add(Attributes.FLYING_SPEED, 0.6000000238418579).add(Attributes.MOVEMENT_SPEED, 0.30000001192092896).add(Attributes.ATTACK_DAMAGE, 2.0).add(Attributes.FOLLOW_RANGE, 48.0);
     }
     
     @Override
-    protected PathNavigation createNavigation(final Level bjw) {
-        final FlyingPathNavigation arp3 = new FlyingPathNavigation(this, bjw) {
+    protected PathNavigation createNavigation(final Level bqb) {
+        final FlyingPathNavigation awt3 = new FlyingPathNavigation(this, bqb) {
             @Override
-            public boolean isStableDestination(final BlockPos fk) {
-                return !this.level.getBlockState(fk.below()).isAir();
+            public boolean isStableDestination(final BlockPos fu) {
+                return !this.level.getBlockState(fu.below()).isAir();
             }
             
             @Override
@@ -512,23 +499,23 @@ public class Bee extends Animal implements FlyingAnimal {
                 super.tick();
             }
         };
-        arp3.setCanOpenDoors(false);
-        arp3.setCanFloat(false);
-        arp3.setCanPassDoors(true);
-        return arp3;
+        awt3.setCanOpenDoors(false);
+        awt3.setCanFloat(false);
+        awt3.setCanPassDoors(true);
+        return awt3;
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        return ben.getItem().is(ItemTags.FLOWERS);
+    public boolean isFood(final ItemStack bki) {
+        return bki.getItem().is(ItemTags.FLOWERS);
     }
     
-    private boolean isFlowerValid(final BlockPos fk) {
-        return this.level.isLoaded(fk) && this.level.getBlockState(fk).getBlock().is(BlockTags.FLOWERS);
+    private boolean isFlowerValid(final BlockPos fu) {
+        return this.level.isLoaded(fu) && this.level.getBlockState(fu).getBlock().is(BlockTags.FLOWERS);
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
     }
     
     @Override
@@ -537,7 +524,7 @@ public class Bee extends Animal implements FlyingAnimal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.BEE_HURT;
     }
     
@@ -552,16 +539,16 @@ public class Bee extends Animal implements FlyingAnimal {
     }
     
     @Override
-    public Bee getBreedOffspring(final AgableMob ako) {
+    public Bee getBreedOffspring(final AgableMob aok) {
         return EntityType.BEE.create(this.level);
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         if (this.isBaby()) {
-            return akr.height * 0.5f;
+            return aon.height * 0.5f;
         }
-        return akr.height * 0.5f;
+        return aon.height * 0.5f;
     }
     
     @Override
@@ -570,7 +557,7 @@ public class Bee extends Animal implements FlyingAnimal {
     }
     
     @Override
-    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState byj, final BlockPos fk) {
+    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState cfj, final BlockPos fu) {
     }
     
     @Override
@@ -583,25 +570,16 @@ public class Bee extends Animal implements FlyingAnimal {
         this.resetNumCropsGrownSincePollination();
     }
     
-    public boolean makeAngry(final Entity akq) {
-        this.setAngerTime(400 + this.random.nextInt(400));
-        if (akq instanceof LivingEntity) {
-            this.setLastHurtByMob((LivingEntity)akq);
-        }
-        return true;
-    }
-    
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        final Entity akq4 = ajz.getEntity();
-        if (!this.level.isClientSide && akq4 instanceof Player && !((Player)akq4).isCreative() && this.canSee(akq4) && !this.isNoAi()) {
+        final Entity aom4 = anw.getEntity();
+        if (!this.level.isClientSide) {
             this.beePollinateGoal.stopPollinating();
-            this.makeAngry(akq4);
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
@@ -610,35 +588,46 @@ public class Bee extends Animal implements FlyingAnimal {
     }
     
     @Override
-    protected void jumpInLiquid(final net.minecraft.tags.Tag<Fluid> aaz) {
+    protected void jumpInLiquid(final Tag<Fluid> adf) {
         this.setDeltaMovement(this.getDeltaMovement().add(0.0, 0.01, 0.0));
     }
     
-    private boolean closerThan(final BlockPos fk, final int integer) {
-        return fk.closerThan(new BlockPos(this), integer);
+    @Override
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, 0.5f * this.getEyeHeight(), this.getBbWidth() * 0.2f);
+    }
+    
+    private boolean closerThan(final BlockPos fu, final int integer) {
+        return fu.closerThan(this.blockPosition(), integer);
     }
     
     static {
         DATA_FLAGS_ID = SynchedEntityData.<Byte>defineId(Bee.class, EntityDataSerializers.BYTE);
-        ANGER_TIME = SynchedEntityData.<Integer>defineId(Bee.class, EntityDataSerializers.INT);
+        DATA_REMAINING_ANGER_TIME = SynchedEntityData.<Integer>defineId(Bee.class, EntityDataSerializers.INT);
+        PERSISTENT_ANGER_TIME = TimeUtil.rangeOfSeconds(20, 39);
     }
     
     class BeeHurtByOtherGoal extends HurtByTargetGoal {
-        BeeHurtByOtherGoal(final Bee atd2) {
-            super(atd2, new Class[0]);
+        BeeHurtByOtherGoal(final Bee ayl2) {
+            super(ayl2, new Class[0]);
         }
         
         @Override
-        protected void alertOther(final Mob ala, final LivingEntity akz) {
-            if (ala instanceof Bee && this.mob.canSee(akz) && ((Bee)ala).makeAngry(akz)) {
-                ala.setTarget(akz);
+        public boolean canContinueToUse() {
+            return Bee.this.isAngry() && super.canContinueToUse();
+        }
+        
+        @Override
+        protected void alertOther(final Mob aoz, final LivingEntity aoy) {
+            if (aoz instanceof Bee && this.mob.canSee(aoy)) {
+                aoz.setTarget(aoy);
             }
         }
     }
     
     static class BeeBecomeAngryTargetGoal extends NearestAttackableTargetGoal<Player> {
-        BeeBecomeAngryTargetGoal(final Bee atd) {
-            super(atd, Player.class, true);
+        BeeBecomeAngryTargetGoal(final Bee ayl) {
+            super(ayl, Player.class, 10, true, false, ayl::isAngryAt);
         }
         
         @Override
@@ -657,8 +646,8 @@ public class Bee extends Animal implements FlyingAnimal {
         }
         
         private boolean beeCanTarget() {
-            final Bee atd2 = (Bee)this.mob;
-            return atd2.isAngry() && !atd2.hasStung();
+            final Bee ayl2 = (Bee)this.mob;
+            return ayl2.isAngry() && !ayl2.hasStung();
         }
     }
     
@@ -698,28 +687,28 @@ public class Bee extends Animal implements FlyingAnimal {
         
         @Override
         public void start() {
-            final Vec3 cvl2 = this.findPos();
-            if (cvl2 != null) {
-                Bee.this.navigation.moveTo(Bee.this.navigation.createPath(new BlockPos(cvl2), 1), 1.0);
+            final Vec3 dem2 = this.findPos();
+            if (dem2 != null) {
+                Bee.this.navigation.moveTo(Bee.this.navigation.createPath(new BlockPos(dem2), 1), 1.0);
             }
         }
         
         @Nullable
         private Vec3 findPos() {
-            Vec3 cvl4;
-            if (Bee.this.isHiveValid() && !Bee.this.closerThan(Bee.this.hivePos, 40)) {
-                final Vec3 cvl3 = new Vec3(Bee.this.hivePos);
-                cvl4 = cvl3.subtract(Bee.this.position()).normalize();
+            Vec3 dem4;
+            if (Bee.this.isHiveValid() && !Bee.this.closerThan(Bee.this.hivePos, 22)) {
+                final Vec3 dem3 = Vec3.atCenterOf(Bee.this.hivePos);
+                dem4 = dem3.subtract(Bee.this.position()).normalize();
             }
             else {
-                cvl4 = Bee.this.getViewVector(0.0f);
+                dem4 = Bee.this.getViewVector(0.0f);
             }
             final int integer3 = 8;
-            final Vec3 cvl5 = RandomPos.getAboveLandPos(Bee.this, 8, 7, cvl4, 1.5707964f, 2, 1);
-            if (cvl5 != null) {
-                return cvl5;
+            final Vec3 dem5 = RandomPos.getAboveLandPos(Bee.this, 8, 7, dem4, 1.5707964f, 2, 1);
+            if (dem5 != null) {
+                return dem5;
             }
-            return RandomPos.getAirPos(Bee.this, 8, 4, -2, cvl4, 1.5707963705062866);
+            return RandomPos.getAirPos(Bee.this, 8, 4, -2, dem4, 1.5707963705062866);
         }
     }
     
@@ -728,6 +717,7 @@ public class Bee extends Animal implements FlyingAnimal {
         private List<BlockPos> blacklistedTargets;
         @Nullable
         private Path lastPath;
+        private int ticksStuck;
         
         BeeGoToHiveGoal() {
             this.travellingTicks = Bee.this.level.random.nextInt(10);
@@ -749,12 +739,14 @@ public class Bee extends Animal implements FlyingAnimal {
         @Override
         public void start() {
             this.travellingTicks = 0;
+            this.ticksStuck = 0;
             super.start();
         }
         
         @Override
         public void stop() {
             this.travellingTicks = 0;
+            this.ticksStuck = 0;
             Bee.this.navigation.stop();
             Bee.this.navigation.resetMaxVisitedNodesMultiplier();
         }
@@ -778,7 +770,11 @@ public class Bee extends Animal implements FlyingAnimal {
                     this.dropAndBlacklistHive();
                 }
                 else if (this.lastPath != null && Bee.this.navigation.getPath().sameAs(this.lastPath)) {
-                    this.dropHive();
+                    ++this.ticksStuck;
+                    if (this.ticksStuck > 60) {
+                        this.dropHive();
+                        this.ticksStuck = 0;
+                    }
                 }
                 else {
                     this.lastPath = Bee.this.navigation.getPath();
@@ -792,18 +788,18 @@ public class Bee extends Animal implements FlyingAnimal {
             Bee.this.pathfindRandomlyTowards(Bee.this.hivePos);
         }
         
-        private boolean pathfindDirectlyTowards(final BlockPos fk) {
+        private boolean pathfindDirectlyTowards(final BlockPos fu) {
             Bee.this.navigation.setMaxVisitedNodesMultiplier(10.0f);
-            Bee.this.navigation.moveTo(fk.getX(), fk.getY(), fk.getZ(), 1.0);
+            Bee.this.navigation.moveTo(fu.getX(), fu.getY(), fu.getZ(), 1.0);
             return Bee.this.navigation.getPath() != null && Bee.this.navigation.getPath().canReach();
         }
         
-        private boolean isTargetBlacklisted(final BlockPos fk) {
-            return this.blacklistedTargets.contains(fk);
+        private boolean isTargetBlacklisted(final BlockPos fu) {
+            return this.blacklistedTargets.contains(fu);
         }
         
-        private void blacklistTarget(final BlockPos fk) {
-            this.blacklistedTargets.add(fk);
+        private void blacklistTarget(final BlockPos fu) {
+            this.blacklistedTargets.add(fu);
             while (this.blacklistedTargets.size() > 3) {
                 this.blacklistedTargets.remove(0);
             }
@@ -825,12 +821,12 @@ public class Bee extends Animal implements FlyingAnimal {
             Bee.this.remainingCooldownBeforeLocatingNewHive = 200;
         }
         
-        private boolean hasReachedTarget(final BlockPos fk) {
-            if (Bee.this.closerThan(fk, 2)) {
+        private boolean hasReachedTarget(final BlockPos fu) {
+            if (Bee.this.closerThan(fu, 2)) {
                 return true;
             }
-            final Path cqq3 = Bee.this.navigation.getPath();
-            return cqq3 != null && cqq3.getTarget().equals(fk) && cqq3.canReach() && cqq3.isDone();
+            final Path czf3 = Bee.this.navigation.getPath();
+            return czf3 != null && czf3.getTarget().equals(fu) && czf3.canReach() && czf3.isDone();
         }
     }
     
@@ -891,8 +887,8 @@ public class Bee extends Animal implements FlyingAnimal {
     }
     
     class BeeLookControl extends LookControl {
-        BeeLookControl(final Mob ala) {
-            super(ala);
+        BeeLookControl(final Mob aoz) {
+            super(aoz);
         }
         
         @Override
@@ -918,17 +914,17 @@ public class Bee extends Animal implements FlyingAnimal {
         private int pollinatingTicks;
         
         BeePollinateGoal() {
-            this.VALID_POLLINATION_BLOCKS = (byj -> {
-                if (byj.is(BlockTags.TALL_FLOWERS)) {
-                    if (byj.getBlock() == Blocks.SUNFLOWER) {
-                        return byj.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.UPPER;
+            this.VALID_POLLINATION_BLOCKS = (cfj -> {
+                if (cfj.is(BlockTags.TALL_FLOWERS)) {
+                    if (cfj.is(Blocks.SUNFLOWER)) {
+                        return cfj.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.UPPER;
                     }
                     else {
                         return true;
                     }
                 }
                 else {
-                    return byj.is(BlockTags.SMALL_FLOWERS);
+                    return cfj.is(BlockTags.SMALL_FLOWERS);
                 }
             });
             this.successfulPollinatingTicks = 0;
@@ -1019,14 +1015,14 @@ public class Bee extends Animal implements FlyingAnimal {
                 Bee.this.savedFlowerPos = null;
                 return;
             }
-            final Vec3 cvl2 = new Vec3(Bee.this.savedFlowerPos).add(0.5, 0.6000000238418579, 0.5);
-            if (cvl2.distanceTo(Bee.this.position()) > 1.0) {
-                this.hoverPos = cvl2;
+            final Vec3 dem2 = Vec3.atBottomCenterOf(Bee.this.savedFlowerPos).add(0.0, 0.6000000238418579, 0.0);
+            if (dem2.distanceTo(Bee.this.position()) > 1.0) {
+                this.hoverPos = dem2;
                 this.setWantedPos();
                 return;
             }
             if (this.hoverPos == null) {
-                this.hoverPos = cvl2;
+                this.hoverPos = dem2;
             }
             final boolean boolean3 = Bee.this.position().distanceTo(this.hoverPos) <= 0.1;
             boolean boolean4 = true;
@@ -1035,15 +1031,15 @@ public class Bee extends Animal implements FlyingAnimal {
                 return;
             }
             if (boolean3) {
-                final boolean boolean5 = Bee.this.random.nextInt(100) == 0;
+                final boolean boolean5 = Bee.this.random.nextInt(25) == 0;
                 if (boolean5) {
-                    this.hoverPos = new Vec3(cvl2.x() + this.getOffset(), cvl2.y(), cvl2.z() + this.getOffset());
+                    this.hoverPos = new Vec3(dem2.x() + this.getOffset(), dem2.y(), dem2.z() + this.getOffset());
                     Bee.this.navigation.stop();
                 }
                 else {
                     boolean4 = false;
                 }
-                Bee.this.getLookControl().setLookAt(cvl2.x(), cvl2.y(), cvl2.z());
+                Bee.this.getLookControl().setLookAt(dem2.x(), dem2.y(), dem2.z());
             }
             if (boolean4) {
                 this.setWantedPos();
@@ -1068,14 +1064,14 @@ public class Bee extends Animal implements FlyingAnimal {
         }
         
         private Optional<BlockPos> findNearestBlock(final Predicate<BlockState> predicate, final double double2) {
-            final BlockPos fk5 = new BlockPos(Bee.this);
+            final BlockPos fu5 = Bee.this.blockPosition();
             final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
             for (int integer7 = 0; integer7 <= double2; integer7 = ((integer7 > 0) ? (-integer7) : (1 - integer7))) {
                 for (int integer8 = 0; integer8 < double2; ++integer8) {
                     for (int integer9 = 0; integer9 <= integer8; integer9 = ((integer9 > 0) ? (-integer9) : (1 - integer9))) {
                         for (int integer10 = (integer9 < integer8 && integer9 > -integer8) ? integer8 : 0; integer10 <= integer8; integer10 = ((integer10 > 0) ? (-integer10) : (1 - integer10))) {
-                            a6.set(fk5).move(integer9, integer7 - 1, integer10);
-                            if (fk5.closerThan(a6, double2) && predicate.test(Bee.this.level.getBlockState(a6))) {
+                            a6.setWithOffset(fu5, integer9, integer7 - 1, integer10);
+                            if (fu5.closerThan(a6, double2) && predicate.test(Bee.this.level.getBlockState(a6))) {
                                 return Optional.of(a6);
                             }
                         }
@@ -1107,9 +1103,9 @@ public class Bee extends Animal implements FlyingAnimal {
             if (list2.isEmpty()) {
                 return;
             }
-            for (final BlockPos fk4 : list2) {
-                if (!Bee.this.goToHiveGoal.isTargetBlacklisted(fk4)) {
-                    Bee.this.hivePos = fk4;
+            for (final BlockPos fu4 : list2) {
+                if (!Bee.this.goToHiveGoal.isTargetBlacklisted(fu4)) {
+                    Bee.this.hivePos = fu4;
                     return;
                 }
             }
@@ -1118,10 +1114,10 @@ public class Bee extends Animal implements FlyingAnimal {
         }
         
         private List<BlockPos> findNearbyHivesWithSpace() {
-            final BlockPos fk3 = new BlockPos(Bee.this);
-            final PoiManager asr3 = ((ServerLevel)Bee.this.level).getPoiManager();
-            final Stream<PoiRecord> stream4 = asr3.getInRange(asu -> asu == PoiType.BEEHIVE || asu == PoiType.BEE_NEST, fk3, 20, PoiManager.Occupancy.ANY);
-            return stream4.map(PoiRecord::getPos).filter(fk -> Bee.this.doesHiveHaveSpace(fk)).sorted(Comparator.comparingDouble(fk2 -> fk2.distSqr(fk3))).collect(Collectors.toList());
+            final BlockPos fu3 = Bee.this.blockPosition();
+            final PoiManager axz3 = ((ServerLevel)Bee.this.level).getPoiManager();
+            final Stream<PoiRecord> stream4 = axz3.getInRange(ayc -> ayc == PoiType.BEEHIVE || ayc == PoiType.BEE_NEST, fu3, 20, PoiManager.Occupancy.ANY);
+            return stream4.map(PoiRecord::getPos).filter(fu -> Bee.this.doesHiveHaveSpace(fu)).sorted(Comparator.comparingDouble(fu2 -> fu2.distSqr(fu3))).collect(Collectors.toList());
         }
     }
     
@@ -1145,36 +1141,36 @@ public class Bee extends Animal implements FlyingAnimal {
                 return;
             }
             for (int integer2 = 1; integer2 <= 2; ++integer2) {
-                final BlockPos fk3 = new BlockPos(Bee.this).below(integer2);
-                final BlockState byj4 = Bee.this.level.getBlockState(fk3);
-                final Block bph5 = byj4.getBlock();
+                final BlockPos fu3 = Bee.this.blockPosition().below(integer2);
+                final BlockState cfj4 = Bee.this.level.getBlockState(fu3);
+                final Block bvr5 = cfj4.getBlock();
                 boolean boolean6 = false;
-                IntegerProperty bzj7 = null;
-                if (bph5.is(BlockTags.BEE_GROWABLES)) {
-                    if (bph5 instanceof CropBlock) {
-                        final CropBlock bqk8 = (CropBlock)bph5;
-                        if (!bqk8.isMaxAge(byj4)) {
+                IntegerProperty cgi7 = null;
+                if (bvr5.is(BlockTags.BEE_GROWABLES)) {
+                    if (bvr5 instanceof CropBlock) {
+                        final CropBlock bwv8 = (CropBlock)bvr5;
+                        if (!bwv8.isMaxAge(cfj4)) {
                             boolean6 = true;
-                            bzj7 = bqk8.getAgeProperty();
+                            cgi7 = bwv8.getAgeProperty();
                         }
                     }
-                    else if (bph5 instanceof StemBlock) {
-                        final int integer3 = byj4.<Integer>getValue((Property<Integer>)StemBlock.AGE);
+                    else if (bvr5 instanceof StemBlock) {
+                        final int integer3 = cfj4.<Integer>getValue((Property<Integer>)StemBlock.AGE);
                         if (integer3 < 7) {
                             boolean6 = true;
-                            bzj7 = StemBlock.AGE;
+                            cgi7 = StemBlock.AGE;
                         }
                     }
-                    else if (bph5 == Blocks.SWEET_BERRY_BUSH) {
-                        final int integer3 = byj4.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE);
+                    else if (bvr5 == Blocks.SWEET_BERRY_BUSH) {
+                        final int integer3 = cfj4.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE);
                         if (integer3 < 3) {
                             boolean6 = true;
-                            bzj7 = SweetBerryBushBlock.AGE;
+                            cgi7 = SweetBerryBushBlock.AGE;
                         }
                     }
                     if (boolean6) {
-                        Bee.this.level.levelEvent(2005, fk3, 0);
-                        Bee.this.level.setBlockAndUpdate(fk3, ((AbstractStateHolder<O, BlockState>)byj4).<Comparable, Integer>setValue((Property<Comparable>)bzj7, byj4.<Integer>getValue((Property<Integer>)bzj7) + 1));
+                        Bee.this.level.levelEvent(2005, fu3, 0);
+                        Bee.this.level.setBlockAndUpdate(fu3, ((StateHolder<O, BlockState>)cfj4).<Comparable, Integer>setValue((Property<Comparable>)cgi7, cfj4.<Integer>getValue((Property<Integer>)cgi7) + 1));
                         Bee.this.incrementNumCropsGrownSincePollination();
                     }
                 }
@@ -1183,8 +1179,8 @@ public class Bee extends Animal implements FlyingAnimal {
     }
     
     class BeeAttackGoal extends MeleeAttackGoal {
-        BeeAttackGoal(final PathfinderMob alg, final double double3, final boolean boolean4) {
-            super(alg, double3, boolean4);
+        BeeAttackGoal(final PathfinderMob apg, final double double3, final boolean boolean4) {
+            super(apg, double3, boolean4);
         }
         
         @Override
@@ -1205,10 +1201,10 @@ public class Bee extends Animal implements FlyingAnimal {
         @Override
         public boolean canBeeUse() {
             if (Bee.this.hasHive() && Bee.this.wantsToEnterHive() && Bee.this.hivePos.closerThan(Bee.this.position(), 2.0)) {
-                final BlockEntity bwl2 = Bee.this.level.getBlockEntity(Bee.this.hivePos);
-                if (bwl2 instanceof BeehiveBlockEntity) {
-                    final BeehiveBlockEntity bwi3 = (BeehiveBlockEntity)bwl2;
-                    if (!bwi3.isFull()) {
+                final BlockEntity cdl2 = Bee.this.level.getBlockEntity(Bee.this.hivePos);
+                if (cdl2 instanceof BeehiveBlockEntity) {
+                    final BeehiveBlockEntity cdi3 = (BeehiveBlockEntity)cdl2;
+                    if (!cdi3.isFull()) {
                         return true;
                     }
                     Bee.this.hivePos = null;
@@ -1224,10 +1220,10 @@ public class Bee extends Animal implements FlyingAnimal {
         
         @Override
         public void start() {
-            final BlockEntity bwl2 = Bee.this.level.getBlockEntity(Bee.this.hivePos);
-            if (bwl2 instanceof BeehiveBlockEntity) {
-                final BeehiveBlockEntity bwi3 = (BeehiveBlockEntity)bwl2;
-                bwi3.addOccupant(Bee.this, Bee.this.hasNectar());
+            final BlockEntity cdl2 = Bee.this.level.getBlockEntity(Bee.this.hivePos);
+            if (cdl2 instanceof BeehiveBlockEntity) {
+                final BeehiveBlockEntity cdi3 = (BeehiveBlockEntity)cdl2;
+                cdi3.addOccupant(Bee.this, Bee.this.hasNectar());
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/animal/Cat.java b/src/net/minecraft/world/entity/animal/Cat.java
index ee51d91..b185a90 100644
--- a/src/net/minecraft/world/entity/animal/Cat.java
+++ b/src/net/minecraft/world/entity/animal/Cat.java
@@ -1,21 +1,24 @@
 package net.minecraft.world.entity.animal;
 
+import net.minecraft.core.Direction;
 import net.minecraft.world.level.storage.loot.LootTable;
 import java.util.Random;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.BedBlock;
-import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.EntitySelector;
 import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
 import net.minecraft.Util;
@@ -28,10 +31,10 @@ import java.util.HashMap;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.DyeItem;
-import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.DifficultyInstance;
@@ -40,7 +43,8 @@ import net.minecraft.world.entity.AgableMob;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.damagesource.DamageSource;
 import javax.annotation.Nullable;
 import net.minecraft.sounds.SoundEvents;
@@ -60,10 +64,10 @@ import net.minecraft.world.entity.ai.goal.LeapAtTargetGoal;
 import net.minecraft.world.entity.ai.goal.CatSitOnBlockGoal;
 import net.minecraft.world.entity.ai.goal.FollowOwnerGoal;
 import net.minecraft.world.entity.ai.goal.CatLieOnBedGoal;
+import net.minecraft.world.entity.ai.goal.SitWhenOrderedToGoal;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.goal.FloatGoal;
-import net.minecraft.world.entity.ai.goal.SitGoal;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.ai.goal.TemptGoal;
@@ -90,8 +94,8 @@ public class Cat extends TamableAnimal {
     private float relaxStateOneAmount;
     private float relaxStateOneAmountO;
     
-    public Cat(final EntityType<? extends Cat> aku, final Level bjw) {
-        super(aku, bjw);
+    public Cat(final EntityType<? extends Cat> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     public ResourceLocation getResourceLocation() {
@@ -100,11 +104,10 @@ public class Cat extends TamableAnimal {
     
     @Override
     protected void registerGoals() {
-        this.sitGoal = new SitGoal(this);
         this.temptGoal = new CatTemptGoal(this, 0.6, Cat.TEMPT_INGREDIENT, true);
         this.goalSelector.addGoal(1, new FloatGoal(this));
-        this.goalSelector.addGoal(1, new CatRelaxOnOwnerGoal(this));
-        this.goalSelector.addGoal(2, this.sitGoal);
+        this.goalSelector.addGoal(1, new SitWhenOrderedToGoal(this));
+        this.goalSelector.addGoal(2, new CatRelaxOnOwnerGoal(this));
         this.goalSelector.addGoal(3, this.temptGoal);
         this.goalSelector.addGoal(5, new CatLieOnBedGoal(this, 1.1, 8));
         this.goalSelector.addGoal(6, new FollowOwnerGoal(this, 1.0, 10.0f, 5.0f, false));
@@ -149,8 +152,8 @@ public class Cat extends TamableAnimal {
         return DyeColor.byId(this.entityData.<Integer>get(Cat.DATA_COLLAR_COLOR));
     }
     
-    public void setCollarColor(final DyeColor bdj) {
-        this.entityData.<Integer>set(Cat.DATA_COLLAR_COLOR, bdj.getId());
+    public void setCollarColor(final DyeColor bje) {
+        this.entityData.<Integer>set(Cat.DATA_COLLAR_COLOR, bje.getId());
     }
     
     @Override
@@ -163,18 +166,18 @@ public class Cat extends TamableAnimal {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("CatType", this.getCatType());
-        jt.putByte("CollarColor", (byte)this.getCollarColor().getId());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("CatType", this.getCatType());
+        le.putByte("CollarColor", (byte)this.getCollarColor().getId());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setCatType(jt.getInt("CatType"));
-        if (jt.contains("CollarColor", 99)) {
-            this.setCollarColor(DyeColor.byId(jt.getInt("CollarColor")));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setCatType(le.getInt("CatType"));
+        if (le.contains("CollarColor", 99)) {
+            this.setCollarColor(DyeColor.byId(le.getInt("CollarColor")));
         }
     }
     
@@ -225,7 +228,7 @@ public class Cat extends TamableAnimal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.CAT_HURT;
     }
     
@@ -234,12 +237,8 @@ public class Cat extends TamableAnimal {
         return SoundEvents.CAT_DEATH;
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(10.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.30000001192092896);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(3.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 10.0).add(Attributes.MOVEMENT_SPEED, 0.30000001192092896).add(Attributes.ATTACK_DAMAGE, 3.0);
     }
     
     @Override
@@ -248,20 +247,20 @@ public class Cat extends TamableAnimal {
     }
     
     @Override
-    protected void usePlayerItem(final Player ayj, final ItemStack ben) {
-        if (this.isFood(ben)) {
+    protected void usePlayerItem(final Player bec, final ItemStack bki) {
+        if (this.isFood(bki)) {
             this.playSound(SoundEvents.CAT_EAT, 1.0f, 1.0f);
         }
-        super.usePlayerItem(ayj, ben);
+        super.usePlayerItem(bec, bki);
     }
     
     private float getAttackDamage() {
-        return (float)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue();
+        return (float)this.getAttributeValue(Attributes.ATTACK_DAMAGE);
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        return akq.hurt(DamageSource.mobAttack(this), this.getAttackDamage());
+    public boolean doHurtTarget(final Entity aom) {
+        return aom.hurt(DamageSource.mobAttack(this), this.getAttackDamage());
     }
     
     @Override
@@ -317,123 +316,127 @@ public class Cat extends TamableAnimal {
     }
     
     @Override
-    public Cat getBreedOffspring(final AgableMob ako) {
-        final Cat ate3 = EntityType.CAT.create(this.level);
-        if (ako instanceof Cat) {
+    public Cat getBreedOffspring(final AgableMob aok) {
+        final Cat aym3 = EntityType.CAT.create(this.level);
+        if (aok instanceof Cat) {
             if (this.random.nextBoolean()) {
-                ate3.setCatType(this.getCatType());
+                aym3.setCatType(this.getCatType());
             }
             else {
-                ate3.setCatType(((Cat)ako).getCatType());
+                aym3.setCatType(((Cat)aok).getCatType());
             }
             if (this.isTame()) {
-                ate3.setOwnerUUID(this.getOwnerUUID());
-                ate3.setTame(true);
+                aym3.setOwnerUUID(this.getOwnerUUID());
+                aym3.setTame(true);
                 if (this.random.nextBoolean()) {
-                    ate3.setCollarColor(this.getCollarColor());
+                    aym3.setCollarColor(this.getCollarColor());
                 }
                 else {
-                    ate3.setCollarColor(((Cat)ako).getCollarColor());
+                    aym3.setCollarColor(((Cat)aok).getCollarColor());
                 }
             }
         }
-        return ate3;
+        return aym3;
     }
     
     @Override
-    public boolean canMate(final Animal atc) {
+    public boolean canMate(final Animal ayk) {
         if (!this.isTame()) {
             return false;
         }
-        if (!(atc instanceof Cat)) {
+        if (!(ayk instanceof Cat)) {
             return false;
         }
-        final Cat ate3 = (Cat)atc;
-        return ate3.isTame() && super.canMate(atc);
+        final Cat aym3 = (Cat)ayk;
+        return aym3.isTame() && super.canMate(ayk);
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        alm = super.finalizeSpawn(bjx, ajj, alc, alm, jt);
-        if (bjx.getMoonBrightness() > 0.9f) {
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        apo = super.finalizeSpawn(bqc, ane, apb, apo, le);
+        if (bqc.getMoonBrightness() > 0.9f) {
             this.setCatType(this.random.nextInt(11));
         }
         else {
             this.setCatType(this.random.nextInt(10));
         }
-        if (Feature.SWAMP_HUT.isInsideFeature(bjx, new BlockPos(this))) {
+        final Level bqb7 = bqc.getLevel();
+        if (bqb7 instanceof ServerLevel && ((ServerLevel)bqb7).structureFeatureManager().getStructureAt(this.blockPosition(), true, StructureFeature.SWAMP_HUT).isValid()) {
             this.setCatType(10);
             this.setPersistenceRequired();
         }
-        return alm;
+        return apo;
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        final Item bei5 = ben4.getItem();
-        if (ben4.getItem() instanceof SpawnEggItem) {
-            return super.mobInteract(ayj, ajk);
-        }
-        if (this.level.isClientSide) {
-            return (this.isTame() && this.isOwnedBy(ayj)) || this.isFood(ben4);
-        }
-        if (this.isTame()) {
-            if (this.isOwnedBy(ayj)) {
-                if (bei5 instanceof DyeItem) {
-                    final DyeColor bdj6 = ((DyeItem)bei5).getDyeColor();
-                    if (bdj6 != this.getCollarColor()) {
-                        this.setCollarColor(bdj6);
-                        if (!ayj.abilities.instabuild) {
-                            ben4.shrink(1);
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        final Item bke5 = bki4.getItem();
+        if (!this.level.isClientSide) {
+            if (this.isTame()) {
+                if (this.isOwnedBy(bec)) {
+                    if (bke5 instanceof DyeItem) {
+                        final DyeColor bje6 = ((DyeItem)bke5).getDyeColor();
+                        if (bje6 != this.getCollarColor()) {
+                            this.setCollarColor(bje6);
+                            if (!bec.abilities.instabuild) {
+                                bki4.shrink(1);
+                            }
+                            this.setPersistenceRequired();
+                            return InteractionResult.CONSUME;
                         }
-                        this.setPersistenceRequired();
-                        return true;
                     }
+                    else {
+                        if (bke5.isEdible() && this.isFood(bki4) && this.getHealth() < this.getMaxHealth()) {
+                            this.usePlayerItem(bec, bki4);
+                            this.heal((float)bke5.getFoodProperties().getNutrition());
+                            return InteractionResult.CONSUME;
+                        }
+                        final InteractionResult ang6 = super.mobInteract(bec, anf);
+                        if (!ang6.consumesAction() || this.isBaby()) {
+                            this.setOrderedToSit(!this.isOrderedToSit());
+                        }
+                        return ang6;
+                    }
+                }
+            }
+            else if (this.isFood(bki4)) {
+                this.usePlayerItem(bec, bki4);
+                if (this.random.nextInt(3) == 0) {
+                    this.tame(bec);
+                    this.setOrderedToSit(true);
+                    this.level.broadcastEntityEvent(this, (byte)7);
                 }
                 else {
-                    if (bei5.isEdible() && this.isFood(ben4) && this.getHealth() < this.getMaxHealth()) {
-                        this.usePlayerItem(ayj, ben4);
-                        this.heal((float)bei5.getFoodProperties().getNutrition());
-                        return true;
-                    }
-                    final boolean boolean6 = super.mobInteract(ayj, ajk);
-                    if (!boolean6 || this.isBaby()) {
-                        this.sitGoal.wantToSit(!this.isSitting());
-                    }
-                    return boolean6;
+                    this.level.broadcastEntityEvent(this, (byte)6);
                 }
+                this.setPersistenceRequired();
+                return InteractionResult.CONSUME;
             }
-        }
-        else if (this.isFood(ben4)) {
-            this.usePlayerItem(ayj, ben4);
-            if (this.random.nextInt(3) == 0) {
-                this.tame(ayj);
-                this.sitGoal.wantToSit(true);
-                this.level.broadcastEntityEvent(this, (byte)7);
+            final InteractionResult ang6 = super.mobInteract(bec, anf);
+            if (ang6.consumesAction()) {
+                this.setPersistenceRequired();
             }
-            else {
-                this.level.broadcastEntityEvent(this, (byte)6);
-            }
-            this.setPersistenceRequired();
-            return true;
+            return ang6;
         }
-        final boolean boolean6 = super.mobInteract(ayj, ajk);
-        if (boolean6) {
-            this.setPersistenceRequired();
+        if (this.isTame() && this.isOwnedBy(bec)) {
+            return InteractionResult.SUCCESS;
         }
-        return boolean6;
+        if (this.isFood(bki4) && (this.getHealth() < this.getMaxHealth() || !this.isTame())) {
+            return InteractionResult.SUCCESS;
+        }
+        return InteractionResult.PASS;
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        return Cat.TEMPT_INGREDIENT.test(ben);
+    public boolean isFood(final ItemStack bki) {
+        return Cat.TEMPT_INGREDIENT.test(bki);
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height * 0.5f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height * 0.5f;
     }
     
     @Override
@@ -476,9 +479,9 @@ public class Cat extends TamableAnimal {
     static class CatAvoidEntityGoal<T extends LivingEntity> extends AvoidEntityGoal<T> {
         private final Cat cat;
         
-        public CatAvoidEntityGoal(final Cat ate, final Class<T> class2, final float float3, final double double4, final double double5) {
-            super(ate, class2, float3, double4, double5, EntitySelector.NO_CREATIVE_OR_SPECTATOR::test);
-            this.cat = ate;
+        public CatAvoidEntityGoal(final Cat aym, final Class<T> class2, final float float3, final double double4, final double double5) {
+            super(aym, class2, float3, double4, double5, EntitySelector.NO_CREATIVE_OR_SPECTATOR::test);
+            this.cat = aym;
         }
         
         @Override
@@ -497,9 +500,9 @@ public class Cat extends TamableAnimal {
         private Player selectedPlayer;
         private final Cat cat;
         
-        public CatTemptGoal(final Cat ate, final double double2, final Ingredient bgt, final boolean boolean4) {
-            super(ate, double2, bgt, boolean4);
-            this.cat = ate;
+        public CatTemptGoal(final Cat aym, final double double2, final Ingredient bmr, final boolean boolean4) {
+            super(aym, double2, bmr, boolean4);
+            this.cat = aym;
         }
         
         @Override
@@ -530,8 +533,8 @@ public class Cat extends TamableAnimal {
         private BlockPos goalPos;
         private int onBedTicks;
         
-        public CatRelaxOnOwnerGoal(final Cat ate) {
-            this.cat = ate;
+        public CatRelaxOnOwnerGoal(final Cat aym) {
+            this.cat = aym;
         }
         
         @Override
@@ -539,23 +542,22 @@ public class Cat extends TamableAnimal {
             if (!this.cat.isTame()) {
                 return false;
             }
-            if (this.cat.isSitting()) {
+            if (this.cat.isOrderedToSit()) {
                 return false;
             }
-            final LivingEntity akz2 = this.cat.getOwner();
-            if (akz2 instanceof Player) {
-                this.ownerPlayer = (Player)akz2;
-                if (!akz2.isSleeping()) {
+            final LivingEntity aoy2 = this.cat.getOwner();
+            if (aoy2 instanceof Player) {
+                this.ownerPlayer = (Player)aoy2;
+                if (!aoy2.isSleeping()) {
                     return false;
                 }
                 if (this.cat.distanceToSqr(this.ownerPlayer) > 100.0) {
                     return false;
                 }
-                final BlockPos fk3 = new BlockPos(this.ownerPlayer);
-                final BlockState byj4 = this.cat.level.getBlockState(fk3);
-                if (byj4.getBlock().is(BlockTags.BEDS)) {
-                    final Direction fp5 = byj4.<Direction>getValue((Property<Direction>)BedBlock.FACING);
-                    this.goalPos = new BlockPos(fk3.getX() - fp5.getStepX(), fk3.getY(), fk3.getZ() - fp5.getStepZ());
+                final BlockPos fu3 = this.ownerPlayer.blockPosition();
+                final BlockState cfj4 = this.cat.level.getBlockState(fu3);
+                if (cfj4.getBlock().is(BlockTags.BEDS)) {
+                    this.goalPos = cfj4.<Comparable>getOptionalValue((Property<Comparable>)BedBlock.FACING).<BlockPos>map(fz -> fu3.relative(fz.getOpposite())).orElseGet(() -> new BlockPos(fu3));
                     return !this.spaceIsOccupied();
                 }
             }
@@ -564,8 +566,8 @@ public class Cat extends TamableAnimal {
         
         private boolean spaceIsOccupied() {
             final List<Cat> list2 = this.cat.level.<Cat>getEntitiesOfClass(Cat.class, new AABB(this.goalPos).inflate(2.0));
-            for (final Cat ate4 : list2) {
-                if (ate4 != this.cat && (ate4.isLying() || ate4.isRelaxStateOne())) {
+            for (final Cat aym4 : list2) {
+                if (aym4 != this.cat && (aym4.isLying() || aym4.isRelaxStateOne())) {
                     return true;
                 }
             }
@@ -574,13 +576,13 @@ public class Cat extends TamableAnimal {
         
         @Override
         public boolean canContinueToUse() {
-            return this.cat.isTame() && !this.cat.isSitting() && this.ownerPlayer != null && this.ownerPlayer.isSleeping() && this.goalPos != null && !this.spaceIsOccupied();
+            return this.cat.isTame() && !this.cat.isOrderedToSit() && this.ownerPlayer != null && this.ownerPlayer.isSleeping() && this.goalPos != null && !this.spaceIsOccupied();
         }
         
         @Override
         public void start() {
             if (this.goalPos != null) {
-                this.cat.getSitGoal().wantToSit(false);
+                this.cat.setInSittingPose(false);
                 this.cat.getNavigation().moveTo(this.goalPos.getX(), this.goalPos.getY(), this.goalPos.getZ(), 1.100000023841858);
             }
         }
@@ -600,21 +602,21 @@ public class Cat extends TamableAnimal {
         private void giveMorningGift() {
             final Random random2 = this.cat.getRandom();
             final BlockPos.MutableBlockPos a3 = new BlockPos.MutableBlockPos();
-            a3.set(this.cat);
+            a3.set(this.cat.blockPosition());
             this.cat.randomTeleport(a3.getX() + random2.nextInt(11) - 5, a3.getY() + random2.nextInt(5) - 2, a3.getZ() + random2.nextInt(11) - 5, false);
-            a3.set(this.cat);
-            final LootTable csa4 = this.cat.level.getServer().getLootTables().get(BuiltInLootTables.CAT_MORNING_GIFT);
+            a3.set(this.cat.blockPosition());
+            final LootTable daw4 = this.cat.level.getServer().getLootTables().get(BuiltInLootTables.CAT_MORNING_GIFT);
             final LootContext.Builder a4 = new LootContext.Builder((ServerLevel)this.cat.level).<BlockPos>withParameter(LootContextParams.BLOCK_POS, a3).<Entity>withParameter(LootContextParams.THIS_ENTITY, this.cat).withRandom(random2);
-            final List<ItemStack> list6 = csa4.getRandomItems(a4.create(LootContextParamSets.GIFT));
-            for (final ItemStack ben8 : list6) {
-                this.cat.level.addFreshEntity(new ItemEntity(this.cat.level, a3.getX() - Mth.sin(this.cat.yBodyRot * 0.017453292f), a3.getY(), a3.getZ() + Mth.cos(this.cat.yBodyRot * 0.017453292f), ben8));
+            final List<ItemStack> list6 = daw4.getRandomItems(a4.create(LootContextParamSets.GIFT));
+            for (final ItemStack bki8 : list6) {
+                this.cat.level.addFreshEntity(new ItemEntity(this.cat.level, a3.getX() - (double)Mth.sin(this.cat.yBodyRot * 0.017453292f), a3.getY(), a3.getZ() + (double)Mth.cos(this.cat.yBodyRot * 0.017453292f), bki8));
             }
         }
         
         @Override
         public void tick() {
             if (this.ownerPlayer != null && this.goalPos != null) {
-                this.cat.getSitGoal().wantToSit(false);
+                this.cat.setInSittingPose(false);
                 this.cat.getNavigation().moveTo(this.goalPos.getX(), this.goalPos.getY(), this.goalPos.getZ(), 1.100000023841858);
                 if (this.cat.distanceToSqr(this.ownerPlayer) < 2.5) {
                     ++this.onBedTicks;
diff --git a/src/net/minecraft/world/entity/animal/Chicken.java b/src/net/minecraft/world/entity/animal/Chicken.java
index eafdd62..44393f0 100644
--- a/src/net/minecraft/world/entity/animal/Chicken.java
+++ b/src/net/minecraft/world/entity/animal/Chicken.java
@@ -13,7 +13,8 @@ import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.Items;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
@@ -44,8 +45,8 @@ public class Chicken extends Animal {
     public int eggTime;
     public boolean isChickenJockey;
     
-    public Chicken(final EntityType<? extends Chicken> aku, final Level bjw) {
-        super(aku, bjw);
+    public Chicken(final EntityType<? extends Chicken> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.flapping = 1.0f;
         this.eggTime = this.random.nextInt(6000) + 6000;
         this.setPathfindingMalus(BlockPathTypes.WATER, 0.0f);
@@ -64,15 +65,12 @@ public class Chicken extends Animal {
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return this.isBaby() ? (akr.height * 0.85f) : (akr.height * 0.92f);
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return this.isBaby() ? (aon.height * 0.85f) : (aon.height * 0.92f);
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(4.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 4.0).add(Attributes.MOVEMENT_SPEED, 0.25);
     }
     
     @Override
@@ -86,9 +84,9 @@ public class Chicken extends Animal {
             this.flapping = 1.0f;
         }
         this.flapping *= (float)0.9;
-        final Vec3 cvl2 = this.getDeltaMovement();
-        if (!this.onGround && cvl2.y < 0.0) {
-            this.setDeltaMovement(cvl2.multiply(1.0, 0.6, 1.0));
+        final Vec3 dem2 = this.getDeltaMovement();
+        if (!this.onGround && dem2.y < 0.0) {
+            this.setDeltaMovement(dem2.multiply(1.0, 0.6, 1.0));
         }
         this.flap += this.flapping * 2.0f;
         if (!this.level.isClientSide && this.isAlive() && !this.isBaby() && !this.isChickenJockey() && --this.eggTime <= 0) {
@@ -109,7 +107,7 @@ public class Chicken extends Animal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.CHICKEN_HURT;
     }
     
@@ -119,59 +117,59 @@ public class Chicken extends Animal {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.CHICKEN_STEP, 0.15f, 1.0f);
     }
     
     @Override
-    public Chicken getBreedOffspring(final AgableMob ako) {
+    public Chicken getBreedOffspring(final AgableMob aok) {
         return EntityType.CHICKEN.create(this.level);
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        return Chicken.FOOD_ITEMS.test(ben);
+    public boolean isFood(final ItemStack bki) {
+        return Chicken.FOOD_ITEMS.test(bki);
     }
     
     @Override
-    protected int getExperienceReward(final Player ayj) {
+    protected int getExperienceReward(final Player bec) {
         if (this.isChickenJockey()) {
             return 10;
         }
-        return super.getExperienceReward(ayj);
+        return super.getExperienceReward(bec);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.isChickenJockey = jt.getBoolean("IsChickenJockey");
-        if (jt.contains("EggLayTime")) {
-            this.eggTime = jt.getInt("EggLayTime");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.isChickenJockey = le.getBoolean("IsChickenJockey");
+        if (le.contains("EggLayTime")) {
+            this.eggTime = le.getInt("EggLayTime");
         }
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("IsChickenJockey", this.isChickenJockey);
-        jt.putInt("EggLayTime", this.eggTime);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("IsChickenJockey", this.isChickenJockey);
+        le.putInt("EggLayTime", this.eggTime);
     }
     
     @Override
     public boolean removeWhenFarAway(final double double1) {
-        return this.isChickenJockey() && !this.isVehicle();
+        return this.isChickenJockey();
     }
     
     @Override
-    public void positionRider(final Entity akq) {
-        super.positionRider(akq);
+    public void positionRider(final Entity aom) {
+        super.positionRider(aom);
         final float float3 = Mth.sin(this.yBodyRot * 0.017453292f);
         final float float4 = Mth.cos(this.yBodyRot * 0.017453292f);
         final float float5 = 0.1f;
         final float float6 = 0.0f;
-        akq.setPos(this.getX() + 0.1f * float3, this.getY(0.5) + akq.getRidingHeight() + 0.0, this.getZ() - 0.1f * float4);
-        if (akq instanceof LivingEntity) {
-            ((LivingEntity)akq).yBodyRot = this.yBodyRot;
+        aom.setPos(this.getX() + 0.1f * float3, this.getY(0.5) + aom.getMyRidingOffset() + 0.0, this.getZ() - 0.1f * float4);
+        if (aom instanceof LivingEntity) {
+            ((LivingEntity)aom).yBodyRot = this.yBodyRot;
         }
     }
     
diff --git a/src/net/minecraft/world/entity/animal/Cod.java b/src/net/minecraft/world/entity/animal/Cod.java
index c84c69f..9658c49 100644
--- a/src/net/minecraft/world/entity/animal/Cod.java
+++ b/src/net/minecraft/world/entity/animal/Cod.java
@@ -10,8 +10,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Cod extends AbstractSchoolingFish {
-    public Cod(final EntityType<? extends Cod> aku, final Level bjw) {
-        super(aku, bjw);
+    public Cod(final EntityType<? extends Cod> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -30,7 +30,7 @@ public class Cod extends AbstractSchoolingFish {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.COD_HURT;
     }
     
diff --git a/src/net/minecraft/world/entity/animal/Cow.java b/src/net/minecraft/world/entity/animal/Cow.java
index b694e5a..a420cfd 100644
--- a/src/net/minecraft/world/entity/animal/Cow.java
+++ b/src/net/minecraft/world/entity/animal/Cow.java
@@ -4,13 +4,16 @@ import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.AgableMob;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.ItemUtils;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
@@ -31,8 +34,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Cow extends Animal {
-    public Cow(final EntityType<? extends Cow> aku, final Level bjw) {
-        super(aku, bjw);
+    public Cow(final EntityType<? extends Cow> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -47,11 +50,8 @@ public class Cow extends Animal {
         this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(10.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.20000000298023224);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 10.0).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224);
     }
     
     @Override
@@ -60,7 +60,7 @@ public class Cow extends Animal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.COW_HURT;
     }
     
@@ -70,7 +70,7 @@ public class Cow extends Animal {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.COW_STEP, 0.15f, 1.0f);
     }
     
@@ -80,31 +80,26 @@ public class Cow extends Animal {
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() == Items.BUCKET && !ayj.abilities.instabuild && !this.isBaby()) {
-            ayj.playSound(SoundEvents.COW_MILK, 1.0f, 1.0f);
-            ben4.shrink(1);
-            if (ben4.isEmpty()) {
-                ayj.setItemInHand(ajk, new ItemStack(Items.MILK_BUCKET));
-            }
-            else if (!ayj.inventory.add(new ItemStack(Items.MILK_BUCKET))) {
-                ayj.drop(new ItemStack(Items.MILK_BUCKET), false);
-            }
-            return true;
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (bki4.getItem() == Items.BUCKET && !this.isBaby()) {
+            bec.playSound(SoundEvents.COW_MILK, 1.0f, 1.0f);
+            final ItemStack bki5 = ItemUtils.createBucketResult(bki4, bec, Items.MILK_BUCKET.getDefaultInstance());
+            bec.setItemInHand(anf, bki5);
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        return super.mobInteract(ayj, ajk);
+        return super.mobInteract(bec, anf);
     }
     
     @Override
-    public Cow getBreedOffspring(final AgableMob ako) {
+    public Cow getBreedOffspring(final AgableMob aok) {
         return EntityType.COW.create(this.level);
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         if (this.isBaby()) {
-            return akr.height * 0.95f;
+            return aon.height * 0.95f;
         }
         return 1.3f;
     }
diff --git a/src/net/minecraft/world/entity/animal/Dolphin.java b/src/net/minecraft/world/entity/animal/Dolphin.java
index 8c44de8..73849eb 100644
--- a/src/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/net/minecraft/world/entity/animal/Dolphin.java
@@ -4,6 +4,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.entity.ai.util.RandomPos;
 import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
@@ -15,10 +16,14 @@ import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.world.entity.MoverType;
 import net.minecraft.core.Position;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.biome.Biomes;
 import java.util.Random;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.ItemTags;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.particles.ParticleOptions;
@@ -33,7 +38,8 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.navigation.WaterBoundPathNavigation;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
 import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
 import net.minecraft.world.entity.monster.Guardian;
@@ -68,12 +74,12 @@ import net.minecraft.network.syncher.EntityDataAccessor;
 public class Dolphin extends WaterAnimal {
     private static final EntityDataAccessor<BlockPos> TREASURE_POS;
     private static final EntityDataAccessor<Boolean> GOT_FISH;
-    private static final EntityDataAccessor<Integer> MOISNTESS_LEVEL;
+    private static final EntityDataAccessor<Integer> MOISTNESS_LEVEL;
     private static final TargetingConditions SWIM_WITH_PLAYER_TARGETING;
     public static final Predicate<ItemEntity> ALLOWED_ITEMS;
     
-    public Dolphin(final EntityType<? extends Dolphin> aku, final Level bjw) {
-        super(aku, bjw);
+    public Dolphin(final EntityType<? extends Dolphin> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.moveControl = new DolphinMoveControl(this);
         this.lookControl = new DolphinLookControl(this, 10);
         this.setCanPickUpLoot(true);
@@ -81,10 +87,10 @@ public class Dolphin extends WaterAnimal {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
         this.setAirSupply(this.getMaxAirSupply());
         this.xRot = 0.0f;
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     @Override
@@ -96,8 +102,8 @@ public class Dolphin extends WaterAnimal {
     protected void handleAirSupply(final int integer) {
     }
     
-    public void setTreasurePos(final BlockPos fk) {
-        this.entityData.<BlockPos>set(Dolphin.TREASURE_POS, fk);
+    public void setTreasurePos(final BlockPos fu) {
+        this.entityData.<BlockPos>set(Dolphin.TREASURE_POS, fu);
     }
     
     public BlockPos getTreasurePos() {
@@ -113,11 +119,11 @@ public class Dolphin extends WaterAnimal {
     }
     
     public int getMoistnessLevel() {
-        return this.entityData.<Integer>get(Dolphin.MOISNTESS_LEVEL);
+        return this.entityData.<Integer>get(Dolphin.MOISTNESS_LEVEL);
     }
     
     public void setMoisntessLevel(final int integer) {
-        this.entityData.<Integer>set(Dolphin.MOISNTESS_LEVEL, integer);
+        this.entityData.<Integer>set(Dolphin.MOISTNESS_LEVEL, integer);
     }
     
     @Override
@@ -125,28 +131,28 @@ public class Dolphin extends WaterAnimal {
         super.defineSynchedData();
         this.entityData.<BlockPos>define(Dolphin.TREASURE_POS, BlockPos.ZERO);
         this.entityData.<Boolean>define(Dolphin.GOT_FISH, false);
-        this.entityData.<Integer>define(Dolphin.MOISNTESS_LEVEL, 2400);
+        this.entityData.<Integer>define(Dolphin.MOISTNESS_LEVEL, 2400);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("TreasurePosX", this.getTreasurePos().getX());
-        jt.putInt("TreasurePosY", this.getTreasurePos().getY());
-        jt.putInt("TreasurePosZ", this.getTreasurePos().getZ());
-        jt.putBoolean("GotFish", this.gotFish());
-        jt.putInt("Moistness", this.getMoistnessLevel());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("TreasurePosX", this.getTreasurePos().getX());
+        le.putInt("TreasurePosY", this.getTreasurePos().getY());
+        le.putInt("TreasurePosZ", this.getTreasurePos().getZ());
+        le.putBoolean("GotFish", this.gotFish());
+        le.putInt("Moistness", this.getMoistnessLevel());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        final int integer3 = jt.getInt("TreasurePosX");
-        final int integer4 = jt.getInt("TreasurePosY");
-        final int integer5 = jt.getInt("TreasurePosZ");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        final int integer3 = le.getInt("TreasurePosX");
+        final int integer4 = le.getInt("TreasurePosY");
+        final int integer5 = le.getInt("TreasurePosZ");
         this.setTreasurePos(new BlockPos(integer3, integer4, integer5));
-        super.readAdditionalSaveData(jt);
-        this.setGotFish(jt.getBoolean("GotFish"));
-        this.setMoisntessLevel(jt.getInt("Moistness"));
+        super.readAdditionalSaveData(le);
+        this.setGotFish(le.getBoolean("GotFish"));
+        this.setMoisntessLevel(le.getInt("Moistness"));
     }
     
     @Override
@@ -166,25 +172,20 @@ public class Dolphin extends WaterAnimal {
         this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[] { Guardian.class }).setAlertOthers(new Class[0]));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(10.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(1.2000000476837158);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(3.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 10.0).add(Attributes.MOVEMENT_SPEED, 1.2000000476837158).add(Attributes.ATTACK_DAMAGE, 3.0);
     }
     
     @Override
-    protected PathNavigation createNavigation(final Level bjw) {
-        return new WaterBoundPathNavigation(this, bjw);
+    protected PathNavigation createNavigation(final Level bqb) {
+        return new WaterBoundPathNavigation(this, bqb);
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        final boolean boolean3 = akq.hurt(DamageSource.mobAttack(this), (float)(int)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue());
+    public boolean doHurtTarget(final Entity aom) {
+        final boolean boolean3 = aom.hurt(DamageSource.mobAttack(this), (float)(int)this.getAttributeValue(Attributes.ATTACK_DAMAGE));
         if (boolean3) {
-            this.doEnchantDamageEffects(this, akq);
+            this.doEnchantDamageEffects(this, aom);
             this.playSound(SoundEvents.DOLPHIN_ATTACK, 1.0f, 1.0f);
         }
         return boolean3;
@@ -201,7 +202,7 @@ public class Dolphin extends WaterAnimal {
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 0.3f;
     }
     
@@ -216,25 +217,26 @@ public class Dolphin extends WaterAnimal {
     }
     
     @Override
-    protected boolean canRide(final Entity akq) {
+    protected boolean canRide(final Entity aom) {
         return true;
     }
     
     @Override
-    public boolean canTakeItem(final ItemStack ben) {
-        final EquipmentSlot akv3 = Mob.getEquipmentSlotForItem(ben);
-        return this.getItemBySlot(akv3).isEmpty() && akv3 == EquipmentSlot.MAINHAND && super.canTakeItem(ben);
+    public boolean canTakeItem(final ItemStack bki) {
+        final EquipmentSlot aor3 = Mob.getEquipmentSlotForItem(bki);
+        return this.getItemBySlot(aor3).isEmpty() && aor3 == EquipmentSlot.MAINHAND && super.canTakeItem(bki);
     }
     
     @Override
-    protected void pickUpItem(final ItemEntity awb) {
+    protected void pickUpItem(final ItemEntity bbg) {
         if (this.getItemBySlot(EquipmentSlot.MAINHAND).isEmpty()) {
-            final ItemStack ben3 = awb.getItem();
-            if (this.canHoldItem(ben3)) {
-                this.setItemSlot(EquipmentSlot.MAINHAND, ben3);
+            final ItemStack bki3 = bbg.getItem();
+            if (this.canHoldItem(bki3)) {
+                this.onItemPickup(bbg);
+                this.setItemSlot(EquipmentSlot.MAINHAND, bki3);
                 this.handDropChances[EquipmentSlot.MAINHAND.getIndex()] = 2.0f;
-                this.take(awb, ben3.getCount());
-                awb.remove();
+                this.take(bbg, bki3.getCount());
+                bbg.remove();
             }
         }
     }
@@ -243,6 +245,7 @@ public class Dolphin extends WaterAnimal {
     public void tick() {
         super.tick();
         if (this.isNoAi()) {
+            this.setAirSupply(this.getMaxAirSupply());
             return;
         }
         if (this.isInWaterRainOrBubble()) {
@@ -261,13 +264,13 @@ public class Dolphin extends WaterAnimal {
             }
         }
         if (this.level.isClientSide && this.isInWater() && this.getDeltaMovement().lengthSqr() > 0.03) {
-            final Vec3 cvl2 = this.getViewVector(0.0f);
+            final Vec3 dem2 = this.getViewVector(0.0f);
             final float float3 = Mth.cos(this.yRot * 0.017453292f) * 0.3f;
             final float float4 = Mth.sin(this.yRot * 0.017453292f) * 0.3f;
             final float float5 = 1.2f - this.random.nextFloat() * 0.7f;
             for (int integer6 = 0; integer6 < 2; ++integer6) {
-                this.level.addParticle(ParticleTypes.DOLPHIN, this.getX() - cvl2.x * float5 + float3, this.getY() - cvl2.y, this.getZ() - cvl2.z * float5 + float4, 0.0, 0.0, 0.0);
-                this.level.addParticle(ParticleTypes.DOLPHIN, this.getX() - cvl2.x * float5 - float3, this.getY() - cvl2.y, this.getZ() - cvl2.z * float5 - float4, 0.0, 0.0, 0.0);
+                this.level.addParticle(ParticleTypes.DOLPHIN, this.getX() - dem2.x * float5 + float3, this.getY() - dem2.y, this.getZ() - dem2.z * float5 + float4, 0.0, 0.0, 0.0);
+                this.level.addParticle(ParticleTypes.DOLPHIN, this.getX() - dem2.x * float5 - float3, this.getY() - dem2.y, this.getZ() - dem2.z * float5 - float4, 0.0, 0.0, 0.0);
             }
         }
     }
@@ -282,37 +285,37 @@ public class Dolphin extends WaterAnimal {
         }
     }
     
-    private void addParticlesAroundSelf(final ParticleOptions gt) {
+    private void addParticlesAroundSelf(final ParticleOptions hf) {
         for (int integer3 = 0; integer3 < 7; ++integer3) {
             final double double4 = this.random.nextGaussian() * 0.01;
             final double double5 = this.random.nextGaussian() * 0.01;
             final double double6 = this.random.nextGaussian() * 0.01;
-            this.level.addParticle(gt, this.getRandomX(1.0), this.getRandomY() + 0.2, this.getRandomZ(1.0), double4, double5, double6);
+            this.level.addParticle(hf, this.getRandomX(1.0), this.getRandomY() + 0.2, this.getRandomZ(1.0), double4, double5, double6);
         }
     }
     
     @Override
-    protected boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (!ben4.isEmpty() && ben4.getItem().is(ItemTags.FISHES)) {
+    protected InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (!bki4.isEmpty() && bki4.getItem().is(ItemTags.FISHES)) {
             if (!this.level.isClientSide) {
                 this.playSound(SoundEvents.DOLPHIN_EAT, 1.0f, 1.0f);
             }
             this.setGotFish(true);
-            if (!ayj.abilities.instabuild) {
-                ben4.shrink(1);
+            if (!bec.abilities.instabuild) {
+                bki4.shrink(1);
             }
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        return super.mobInteract(ayj, ajk);
+        return super.mobInteract(bec, anf);
     }
     
-    public static boolean checkDolphinSpawnRules(final EntityType<Dolphin> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return fk.getY() > 45 && fk.getY() < bjx.getSeaLevel() && (bjx.getBiome(fk) != Biomes.OCEAN || bjx.getBiome(fk) != Biomes.DEEP_OCEAN) && bjx.getFluidState(fk).is(FluidTags.WATER);
+    public static boolean checkDolphinSpawnRules(final EntityType<Dolphin> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return fu.getY() > 45 && fu.getY() < bqc.getSeaLevel() && (bqc.getBiome(fu) != Biomes.OCEAN || bqc.getBiome(fu) != Biomes.DEEP_OCEAN) && bqc.getFluidState(fu).is(FluidTags.WATER);
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.DOLPHIN_HURT;
     }
     
@@ -339,14 +342,14 @@ public class Dolphin extends WaterAnimal {
     }
     
     protected boolean closeToNextPos() {
-        final BlockPos fk2 = this.getNavigation().getTargetPos();
-        return fk2 != null && fk2.closerThan(this.position(), 12.0);
+        final BlockPos fu2 = this.getNavigation().getTargetPos();
+        return fu2 != null && fu2.closerThan(this.position(), 12.0);
     }
     
     @Override
-    public void travel(final Vec3 cvl) {
+    public void travel(final Vec3 dem) {
         if (this.isEffectiveAi() && this.isInWater()) {
-            this.moveRelative(this.getSpeed(), cvl);
+            this.moveRelative(this.getSpeed(), dem);
             this.move(MoverType.SELF, this.getDeltaMovement());
             this.setDeltaMovement(this.getDeltaMovement().scale(0.9));
             if (this.getTarget() == null) {
@@ -354,29 +357,29 @@ public class Dolphin extends WaterAnimal {
             }
         }
         else {
-            super.travel(cvl);
+            super.travel(dem);
         }
     }
     
     @Override
-    public boolean canBeLeashed(final Player ayj) {
+    public boolean canBeLeashed(final Player bec) {
         return true;
     }
     
     static {
         TREASURE_POS = SynchedEntityData.<BlockPos>defineId(Dolphin.class, EntityDataSerializers.BLOCK_POS);
         GOT_FISH = SynchedEntityData.<Boolean>defineId(Dolphin.class, EntityDataSerializers.BOOLEAN);
-        MOISNTESS_LEVEL = SynchedEntityData.<Integer>defineId(Dolphin.class, EntityDataSerializers.INT);
+        MOISTNESS_LEVEL = SynchedEntityData.<Integer>defineId(Dolphin.class, EntityDataSerializers.INT);
         SWIM_WITH_PLAYER_TARGETING = new TargetingConditions().range(10.0).allowSameTeam().allowInvulnerable().allowUnseeable();
-        ALLOWED_ITEMS = (awb -> !awb.hasPickUpDelay() && awb.isAlive() && awb.isInWater());
+        ALLOWED_ITEMS = (bbg -> !bbg.hasPickUpDelay() && bbg.isAlive() && bbg.isInWater());
     }
     
     static class DolphinMoveControl extends MoveControl {
         private final Dolphin dolphin;
         
-        public DolphinMoveControl(final Dolphin ati) {
-            super(ati);
-            this.dolphin = ati;
+        public DolphinMoveControl(final Dolphin ayq) {
+            super(ayq);
+            this.dolphin = ayq;
         }
         
         @Override
@@ -403,7 +406,7 @@ public class Dolphin extends WaterAnimal {
             this.dolphin.yRot = this.rotlerp(this.dolphin.yRot, float10, 10.0f);
             this.dolphin.yBodyRot = this.dolphin.yRot;
             this.dolphin.yHeadRot = this.dolphin.yRot;
-            final float float11 = (float)(this.speedModifier * this.dolphin.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue());
+            final float float11 = (float)(this.speedModifier * this.dolphin.getAttributeValue(Attributes.MOVEMENT_SPEED));
             if (this.dolphin.isInWater()) {
                 this.dolphin.setSpeed(float11 * 0.02f);
                 float float12 = -(float)(Mth.atan2(double3, Mth.sqrt(double2 * double2 + double4 * double4)) * 57.2957763671875);
@@ -447,9 +450,9 @@ public class Dolphin extends WaterAnimal {
         
         @Override
         public void stop() {
-            final ItemStack ben2 = Dolphin.this.getItemBySlot(EquipmentSlot.MAINHAND);
-            if (!ben2.isEmpty()) {
-                this.drop(ben2);
+            final ItemStack bki2 = Dolphin.this.getItemBySlot(EquipmentSlot.MAINHAND);
+            if (!bki2.isEmpty()) {
+                this.drop(bki2);
                 Dolphin.this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
                 this.cooldown = Dolphin.this.tickCount + Dolphin.this.random.nextInt(100);
             }
@@ -458,9 +461,9 @@ public class Dolphin extends WaterAnimal {
         @Override
         public void tick() {
             final List<ItemEntity> list2 = Dolphin.this.level.<ItemEntity>getEntitiesOfClass(ItemEntity.class, Dolphin.this.getBoundingBox().inflate(8.0, 8.0, 8.0), Dolphin.ALLOWED_ITEMS);
-            final ItemStack ben3 = Dolphin.this.getItemBySlot(EquipmentSlot.MAINHAND);
-            if (!ben3.isEmpty()) {
-                this.drop(ben3);
+            final ItemStack bki3 = Dolphin.this.getItemBySlot(EquipmentSlot.MAINHAND);
+            if (!bki3.isEmpty()) {
+                this.drop(bki3);
                 Dolphin.this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
             }
             else if (!list2.isEmpty()) {
@@ -468,19 +471,19 @@ public class Dolphin extends WaterAnimal {
             }
         }
         
-        private void drop(final ItemStack ben) {
-            if (ben.isEmpty()) {
+        private void drop(final ItemStack bki) {
+            if (bki.isEmpty()) {
                 return;
             }
             final double double3 = Dolphin.this.getEyeY() - 0.30000001192092896;
-            final ItemEntity awb5 = new ItemEntity(Dolphin.this.level, Dolphin.this.getX(), double3, Dolphin.this.getZ(), ben);
-            awb5.setPickUpDelay(40);
-            awb5.setThrower(Dolphin.this.getUUID());
+            final ItemEntity bbg5 = new ItemEntity(Dolphin.this.level, Dolphin.this.getX(), double3, Dolphin.this.getZ(), bki);
+            bbg5.setPickUpDelay(40);
+            bbg5.setThrower(Dolphin.this.getUUID());
             final float float6 = 0.3f;
             final float float7 = Dolphin.this.random.nextFloat() * 6.2831855f;
             final float float8 = 0.02f * Dolphin.this.random.nextFloat();
-            awb5.setDeltaMovement(0.3f * -Mth.sin(Dolphin.this.yRot * 0.017453292f) * Mth.cos(Dolphin.this.xRot * 0.017453292f) + Mth.cos(float7) * float8, 0.3f * Mth.sin(Dolphin.this.xRot * 0.017453292f) * 1.5f, 0.3f * Mth.cos(Dolphin.this.yRot * 0.017453292f) * Mth.cos(Dolphin.this.xRot * 0.017453292f) + Mth.sin(float7) * float8);
-            Dolphin.this.level.addFreshEntity(awb5);
+            bbg5.setDeltaMovement(0.3f * -Mth.sin(Dolphin.this.yRot * 0.017453292f) * Mth.cos(Dolphin.this.xRot * 0.017453292f) + Mth.cos(float7) * float8, 0.3f * Mth.sin(Dolphin.this.xRot * 0.017453292f) * 1.5f, 0.3f * Mth.cos(Dolphin.this.yRot * 0.017453292f) * Mth.cos(Dolphin.this.xRot * 0.017453292f) + Mth.sin(float7) * float8);
+            Dolphin.this.level.addFreshEntity(bbg5);
         }
     }
     
@@ -489,8 +492,8 @@ public class Dolphin extends WaterAnimal {
         private final double speedModifier;
         private Player player;
         
-        DolphinSwimWithPlayerGoal(final Dolphin ati, final double double2) {
-            this.dolphin = ati;
+        DolphinSwimWithPlayerGoal(final Dolphin ayq, final double double2) {
+            this.dolphin = ayq;
             this.speedModifier = double2;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
         }
@@ -498,7 +501,7 @@ public class Dolphin extends WaterAnimal {
         @Override
         public boolean canUse() {
             this.player = this.dolphin.level.getNearestPlayer(Dolphin.SWIM_WITH_PLAYER_TARGETING, this.dolphin);
-            return this.player != null && this.player.isSwimming();
+            return this.player != null && this.player.isSwimming() && this.dolphin.getTarget() != this.player;
         }
         
         @Override
@@ -536,8 +539,8 @@ public class Dolphin extends WaterAnimal {
         private final Dolphin dolphin;
         private boolean stuck;
         
-        DolphinSwimToTreasureGoal(final Dolphin ati) {
-            this.dolphin = ati;
+        DolphinSwimToTreasureGoal(final Dolphin ayq) {
+            this.dolphin = ayq;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
         }
         
@@ -553,8 +556,8 @@ public class Dolphin extends WaterAnimal {
         
         @Override
         public boolean canContinueToUse() {
-            final BlockPos fk2 = this.dolphin.getTreasurePos();
-            return !new BlockPos(fk2.getX(), this.dolphin.getY(), fk2.getZ()).closerThan(this.dolphin.position(), 4.0) && !this.stuck && this.dolphin.getAirSupply() >= 100;
+            final BlockPos fu2 = this.dolphin.getTreasurePos();
+            return !new BlockPos(fu2.getX(), this.dolphin.getY(), fu2.getZ()).closerThan(this.dolphin.position(), 4.0) && !this.stuck && this.dolphin.getAirSupply() >= 100;
         }
         
         @Override
@@ -562,57 +565,58 @@ public class Dolphin extends WaterAnimal {
             if (!(this.dolphin.level instanceof ServerLevel)) {
                 return;
             }
-            final ServerLevel xd2 = (ServerLevel)this.dolphin.level;
+            final ServerLevel zd2 = (ServerLevel)this.dolphin.level;
             this.stuck = false;
             this.dolphin.getNavigation().stop();
-            final BlockPos fk3 = new BlockPos(this.dolphin);
-            final String string4 = (xd2.random.nextFloat() >= 0.5) ? "Ocean_Ruin" : "Shipwreck";
-            final BlockPos fk4 = xd2.findNearestMapFeature(string4, fk3, 50, false);
-            if (fk4 == null) {
-                final BlockPos fk5 = xd2.findNearestMapFeature(string4.equals("Ocean_Ruin") ? "Shipwreck" : "Ocean_Ruin", fk3, 50, false);
-                if (fk5 == null) {
+            final BlockPos fu3 = this.dolphin.blockPosition();
+            final StructureFeature<?> cml4 = ((zd2.random.nextFloat() >= 0.5) ? StructureFeature.OCEAN_RUIN : StructureFeature.SHIPWRECK);
+            final BlockPos fu4 = zd2.findNearestMapFeature(cml4, fu3, 50, false);
+            if (fu4 == null) {
+                final StructureFeature<?> cml5 = (cml4.equals(StructureFeature.OCEAN_RUIN) ? StructureFeature.SHIPWRECK : StructureFeature.OCEAN_RUIN);
+                final BlockPos fu5 = zd2.findNearestMapFeature(cml5, fu3, 50, false);
+                if (fu5 == null) {
                     this.stuck = true;
                     return;
                 }
-                this.dolphin.setTreasurePos(fk5);
+                this.dolphin.setTreasurePos(fu5);
             }
             else {
-                this.dolphin.setTreasurePos(fk4);
+                this.dolphin.setTreasurePos(fu4);
             }
-            xd2.broadcastEntityEvent(this.dolphin, (byte)38);
+            zd2.broadcastEntityEvent(this.dolphin, (byte)38);
         }
         
         @Override
         public void stop() {
-            final BlockPos fk2 = this.dolphin.getTreasurePos();
-            if (new BlockPos(fk2.getX(), this.dolphin.getY(), fk2.getZ()).closerThan(this.dolphin.position(), 4.0) || this.stuck) {
+            final BlockPos fu2 = this.dolphin.getTreasurePos();
+            if (new BlockPos(fu2.getX(), this.dolphin.getY(), fu2.getZ()).closerThan(this.dolphin.position(), 4.0) || this.stuck) {
                 this.dolphin.setGotFish(false);
             }
         }
         
         @Override
         public void tick() {
-            final Level bjw2 = this.dolphin.level;
+            final Level bqb2 = this.dolphin.level;
             if (this.dolphin.closeToNextPos() || this.dolphin.getNavigation().isDone()) {
-                final Vec3 cvl3 = new Vec3(this.dolphin.getTreasurePos());
-                Vec3 cvl4 = RandomPos.getPosTowards(this.dolphin, 16, 1, cvl3, 0.39269909262657166);
-                if (cvl4 == null) {
-                    cvl4 = RandomPos.getPosTowards(this.dolphin, 8, 4, cvl3);
+                final Vec3 dem3 = Vec3.atCenterOf(this.dolphin.getTreasurePos());
+                Vec3 dem4 = RandomPos.getPosTowards(this.dolphin, 16, 1, dem3, 0.39269909262657166);
+                if (dem4 == null) {
+                    dem4 = RandomPos.getPosTowards(this.dolphin, 8, 4, dem3);
                 }
-                if (cvl4 != null) {
-                    final BlockPos fk5 = new BlockPos(cvl4);
-                    if (!bjw2.getFluidState(fk5).is(FluidTags.WATER) || !bjw2.getBlockState(fk5).isPathfindable(bjw2, fk5, PathComputationType.WATER)) {
-                        cvl4 = RandomPos.getPosTowards(this.dolphin, 8, 5, cvl3);
+                if (dem4 != null) {
+                    final BlockPos fu5 = new BlockPos(dem4);
+                    if (!bqb2.getFluidState(fu5).is(FluidTags.WATER) || !bqb2.getBlockState(fu5).isPathfindable(bqb2, fu5, PathComputationType.WATER)) {
+                        dem4 = RandomPos.getPosTowards(this.dolphin, 8, 5, dem3);
                     }
                 }
-                if (cvl4 == null) {
+                if (dem4 == null) {
                     this.stuck = true;
                     return;
                 }
-                this.dolphin.getLookControl().setLookAt(cvl4.x, cvl4.y, cvl4.z, (float)(this.dolphin.getMaxHeadYRot() + 20), (float)this.dolphin.getMaxHeadXRot());
-                this.dolphin.getNavigation().moveTo(cvl4.x, cvl4.y, cvl4.z, 1.3);
-                if (bjw2.random.nextInt(80) == 0) {
-                    bjw2.broadcastEntityEvent(this.dolphin, (byte)38);
+                this.dolphin.getLookControl().setLookAt(dem4.x, dem4.y, dem4.z, (float)(this.dolphin.getMaxHeadYRot() + 20), (float)this.dolphin.getMaxHeadXRot());
+                this.dolphin.getNavigation().moveTo(dem4.x, dem4.y, dem4.z, 1.3);
+                if (bqb2.random.nextInt(80) == 0) {
+                    bqb2.broadcastEntityEvent(this.dolphin, (byte)38);
                 }
             }
         }
diff --git a/src/net/minecraft/world/entity/animal/Fox.java b/src/net/minecraft/world/entity/animal/Fox.java
index a1f144c..0dc7273 100644
--- a/src/net/minecraft/world/entity/animal/Fox.java
+++ b/src/net/minecraft/world/entity/animal/Fox.java
@@ -1,11 +1,14 @@
 package net.minecraft.world.entity.animal;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.nbt.IntArrayTag;
 import java.util.AbstractList;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
 import net.minecraft.world.entity.ai.goal.FollowParentGoal;
 import net.minecraft.world.entity.ai.control.LookControl;
 import net.minecraft.world.entity.ai.goal.JumpGoal;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.FluidTags;
 import net.minecraft.world.entity.ai.goal.FloatGoal;
 import net.minecraft.world.entity.ai.goal.StrollThroughVillageGoal;
 import net.minecraft.world.entity.ai.goal.PanicGoal;
@@ -18,7 +21,6 @@ import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import net.minecraft.world.entity.TamableAnimal;
 import net.minecraft.world.entity.monster.Monster;
 import net.minecraft.world.entity.ai.goal.FleeSunGoal;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.ExperienceOrb;
 import net.minecraft.world.level.GameRules;
@@ -41,6 +43,7 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.EntitySelector;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.item.Item;
 import java.util.Iterator;
@@ -52,14 +55,15 @@ import java.util.List;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.nbt.CompoundTag;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.AgableMob;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ItemParticleOption;
 import net.minecraft.core.particles.ParticleTypes;
@@ -108,8 +112,8 @@ public class Fox extends Animal {
     private float crouchAmountO;
     private int ticksSinceEaten;
     
-    public Fox(final EntityType<? extends Fox> aku, final Level bjw) {
-        super(aku, bjw);
+    public Fox(final EntityType<? extends Fox> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.lookControl = new FoxLookControl();
         this.moveControl = new FoxMoveControl();
         this.setPathfindingMalus(BlockPathTypes.DANGER_OTHER, 0.0f);
@@ -128,15 +132,16 @@ public class Fox extends Animal {
     
     @Override
     protected void registerGoals() {
-        this.landTargetGoal = new NearestAttackableTargetGoal<>(this, Animal.class, 10, false, false, akz -> akz instanceof Chicken || akz instanceof Rabbit);
+        this.landTargetGoal = new NearestAttackableTargetGoal<>(this, Animal.class, 10, false, false, aoy -> aoy instanceof Chicken || aoy instanceof Rabbit);
         this.turtleEggTargetGoal = new NearestAttackableTargetGoal<>(this, Turtle.class, 10, false, false, Turtle.BABY_ON_LAND_SELECTOR);
-        this.fishTargetGoal = new NearestAttackableTargetGoal<>(this, AbstractFish.class, 20, false, false, akz -> akz instanceof AbstractSchoolingFish);
+        this.fishTargetGoal = new NearestAttackableTargetGoal<>(this, AbstractFish.class, 20, false, false, aoy -> aoy instanceof AbstractSchoolingFish);
         this.goalSelector.addGoal(0, new FoxFloatGoal());
         this.goalSelector.addGoal(1, new FaceplantGoal());
         this.goalSelector.addGoal(2, new FoxPanicGoal(2.2));
         this.goalSelector.addGoal(3, new FoxBreedGoal(1.0));
-        this.goalSelector.addGoal(4, new AvoidEntityGoal<>(this, Player.class, 16.0f, 1.6, 1.4, akz -> Fox.AVOID_PLAYERS.test(akz) && !this.trusts(akz.getUUID()) && !this.isDefending()));
-        this.goalSelector.addGoal(4, new AvoidEntityGoal<>(this, Wolf.class, 8.0f, 1.6, 1.4, akz -> !akz.isTame() && !this.isDefending()));
+        this.goalSelector.addGoal(4, new AvoidEntityGoal<>(this, Player.class, 16.0f, 1.6, 1.4, aoy -> Fox.AVOID_PLAYERS.test(aoy) && !this.trusts(aoy.getUUID()) && !this.isDefending()));
+        this.goalSelector.addGoal(4, new AvoidEntityGoal<>(this, Wolf.class, 8.0f, 1.6, 1.4, aoy -> !aoy.isTame() && !this.isDefending()));
+        this.goalSelector.addGoal(4, new AvoidEntityGoal<>(this, PolarBear.class, 8.0f, 1.6, 1.4, aoy -> !this.isDefending()));
         this.goalSelector.addGoal(5, new StalkPreyGoal());
         this.goalSelector.addGoal(6, new FoxPounceGoal());
         this.goalSelector.addGoal(6, new SeekShelterGoal(1.25));
@@ -150,11 +155,11 @@ public class Fox extends Animal {
         this.goalSelector.addGoal(11, new FoxSearchForItemsGoal());
         this.goalSelector.addGoal(12, new FoxLookAtPlayerGoal(this, Player.class, 24.0f));
         this.goalSelector.addGoal(13, new PerchAndSearchGoal());
-        this.targetSelector.addGoal(3, new DefendTrustedTargetGoal(LivingEntity.class, false, false, akz -> Fox.TRUSTED_TARGET_SELECTOR.test(akz) && !this.trusts(akz.getUUID())));
+        this.targetSelector.addGoal(3, new DefendTrustedTargetGoal(LivingEntity.class, false, false, aoy -> Fox.TRUSTED_TARGET_SELECTOR.test(aoy) && !this.trusts(aoy.getUUID())));
     }
     
     @Override
-    public SoundEvent getEatingSound(final ItemStack ben) {
+    public SoundEvent getEatingSound(final ItemStack bki) {
         return SoundEvents.FOX_EAT;
     }
     
@@ -162,22 +167,22 @@ public class Fox extends Animal {
     public void aiStep() {
         if (!this.level.isClientSide && this.isAlive() && this.isEffectiveAi()) {
             ++this.ticksSinceEaten;
-            final ItemStack ben2 = this.getItemBySlot(EquipmentSlot.MAINHAND);
-            if (this.canEat(ben2)) {
+            final ItemStack bki2 = this.getItemBySlot(EquipmentSlot.MAINHAND);
+            if (this.canEat(bki2)) {
                 if (this.ticksSinceEaten > 600) {
-                    final ItemStack ben3 = ben2.finishUsingItem(this.level, this);
-                    if (!ben3.isEmpty()) {
-                        this.setItemSlot(EquipmentSlot.MAINHAND, ben3);
+                    final ItemStack bki3 = bki2.finishUsingItem(this.level, this);
+                    if (!bki3.isEmpty()) {
+                        this.setItemSlot(EquipmentSlot.MAINHAND, bki3);
                     }
                     this.ticksSinceEaten = 0;
                 }
                 else if (this.ticksSinceEaten > 560 && this.random.nextFloat() < 0.1f) {
-                    this.playSound(this.getEatingSound(ben2), 1.0f, 1.0f);
+                    this.playSound(this.getEatingSound(bki2), 1.0f, 1.0f);
                     this.level.broadcastEntityEvent(this, (byte)45);
                 }
             }
-            final LivingEntity akz3 = this.getTarget();
-            if (akz3 == null || !akz3.isAlive()) {
+            final LivingEntity aoy3 = this.getTarget();
+            if (aoy3 == null || !aoy3.isAlive()) {
                 this.setIsCrouching(false);
                 this.setIsInterested(false);
             }
@@ -195,48 +200,48 @@ public class Fox extends Animal {
     
     @Override
     protected boolean isImmobile() {
-        return this.getHealth() <= 0.0f;
+        return this.isDeadOrDying();
     }
     
-    private boolean canEat(final ItemStack ben) {
-        return ben.getItem().isEdible() && this.getTarget() == null && this.onGround && !this.isSleeping();
+    private boolean canEat(final ItemStack bki) {
+        return bki.getItem().isEdible() && this.getTarget() == null && this.onGround && !this.isSleeping();
     }
     
     @Override
-    protected void populateDefaultEquipmentSlots(final DifficultyInstance ajj) {
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
         if (this.random.nextFloat() < 0.2f) {
             final float float3 = this.random.nextFloat();
-            ItemStack ben4;
+            ItemStack bki4;
             if (float3 < 0.05f) {
-                ben4 = new ItemStack(Items.EMERALD);
+                bki4 = new ItemStack(Items.EMERALD);
             }
             else if (float3 < 0.2f) {
-                ben4 = new ItemStack(Items.EGG);
+                bki4 = new ItemStack(Items.EGG);
             }
             else if (float3 < 0.4f) {
-                ben4 = (this.random.nextBoolean() ? new ItemStack(Items.RABBIT_FOOT) : new ItemStack(Items.RABBIT_HIDE));
+                bki4 = (this.random.nextBoolean() ? new ItemStack(Items.RABBIT_FOOT) : new ItemStack(Items.RABBIT_HIDE));
             }
             else if (float3 < 0.6f) {
-                ben4 = new ItemStack(Items.WHEAT);
+                bki4 = new ItemStack(Items.WHEAT);
             }
             else if (float3 < 0.8f) {
-                ben4 = new ItemStack(Items.LEATHER);
+                bki4 = new ItemStack(Items.LEATHER);
             }
             else {
-                ben4 = new ItemStack(Items.FEATHER);
+                bki4 = new ItemStack(Items.FEATHER);
             }
-            this.setItemSlot(EquipmentSlot.MAINHAND, ben4);
+            this.setItemSlot(EquipmentSlot.MAINHAND, bki4);
         }
     }
     
     @Override
     public void handleEntityEvent(final byte byte1) {
         if (byte1 == 45) {
-            final ItemStack ben3 = this.getItemBySlot(EquipmentSlot.MAINHAND);
-            if (!ben3.isEmpty()) {
+            final ItemStack bki3 = this.getItemBySlot(EquipmentSlot.MAINHAND);
+            if (!bki3.isEmpty()) {
                 for (int integer4 = 0; integer4 < 8; ++integer4) {
-                    final Vec3 cvl5 = new Vec3((this.random.nextFloat() - 0.5) * 0.1, Math.random() * 0.1 + 0.1, 0.0).xRot(-this.xRot * 0.017453292f).yRot(-this.yRot * 0.017453292f);
-                    this.level.addParticle(new ItemParticleOption(ParticleTypes.ITEM, ben3), this.getX() + this.getLookAngle().x / 2.0, this.getY(), this.getZ() + this.getLookAngle().z / 2.0, cvl5.x, cvl5.y + 0.05, cvl5.z);
+                    final Vec3 dem5 = new Vec3((this.random.nextFloat() - 0.5) * 0.1, Math.random() * 0.1 + 0.1, 0.0).xRot(-this.xRot * 0.017453292f).yRot(-this.yRot * 0.017453292f);
+                    this.level.addParticle(new ItemParticleOption(ParticleTypes.ITEM, bki3), this.getX() + this.getLookAngle().x / 2.0, this.getY(), this.getZ() + this.getLookAngle().z / 2.0, dem5.x, dem5.y + 0.05, dem5.z);
                 }
             }
         }
@@ -245,44 +250,41 @@ public class Fox extends Animal {
         }
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.30000001192092896);
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(10.0);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(32.0);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(2.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896).add(Attributes.MAX_HEALTH, 10.0).add(Attributes.FOLLOW_RANGE, 32.0).add(Attributes.ATTACK_DAMAGE, 2.0);
     }
     
     @Override
-    public Fox getBreedOffspring(final AgableMob ako) {
-        final Fox atk3 = EntityType.FOX.create(this.level);
-        atk3.setFoxType(this.random.nextBoolean() ? this.getFoxType() : ((Fox)ako).getFoxType());
-        return atk3;
+    public Fox getBreedOffspring(final AgableMob aok) {
+        final Fox ays3 = EntityType.FOX.create(this.level);
+        ays3.setFoxType(this.random.nextBoolean() ? this.getFoxType() : ((Fox)aok).getFoxType());
+        return ays3;
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        final Biome bkt7 = bjx.getBiome(new BlockPos(this));
-        Type v8 = Type.byBiome(bkt7);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        final Biome bre7 = bqc.getBiome(this.blockPosition());
+        Type v8 = Type.byBiome(bre7);
         boolean boolean9 = false;
-        if (alm instanceof FoxGroupData) {
-            v8 = ((FoxGroupData)alm).type;
-            if (((FoxGroupData)alm).getGroupSize() >= 2) {
+        if (apo instanceof FoxGroupData) {
+            v8 = ((FoxGroupData)apo).type;
+            if (((FoxGroupData)apo).getGroupSize() >= 2) {
                 boolean9 = true;
             }
         }
         else {
-            alm = new FoxGroupData(v8);
+            apo = new FoxGroupData(v8);
         }
         this.setFoxType(v8);
         if (boolean9) {
             this.setAge(-24000);
         }
-        this.setTargetGoals();
-        this.populateDefaultEquipmentSlots(ajj);
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        if (bqc instanceof ServerLevel) {
+            this.setTargetGoals();
+        }
+        this.populateDefaultEquipmentSlots(ane);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     private void setTargetGoals() {
@@ -299,17 +301,17 @@ public class Fox extends Animal {
     }
     
     @Override
-    protected void usePlayerItem(final Player ayj, final ItemStack ben) {
-        if (this.isFood(ben)) {
-            this.playSound(this.getEatingSound(ben), 1.0f, 1.0f);
+    protected void usePlayerItem(final Player bec, final ItemStack bki) {
+        if (this.isFood(bki)) {
+            this.playSound(this.getEatingSound(bki), 1.0f, 1.0f);
         }
-        super.usePlayerItem(ayj, ben);
+        super.usePlayerItem(bec, bki);
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         if (this.isBaby()) {
-            return akr.height * 0.85f;
+            return aon.height * 0.85f;
         }
         return 0.4f;
     }
@@ -339,34 +341,36 @@ public class Fox extends Animal {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         final List<UUID> list3 = this.getTrustedUUIDs();
-        final ListTag jz4 = new ListTag();
+        final ListTag lk4 = new ListTag();
         for (final UUID uUID6 : list3) {
             if (uUID6 != null) {
-                ((AbstractList<CompoundTag>)jz4).add(NbtUtils.createUUIDTag(uUID6));
+                ((AbstractList<IntArrayTag>)lk4).add(NbtUtils.createUUID(uUID6));
             }
         }
-        jt.put("TrustedUUIDs", jz4);
-        jt.putBoolean("Sleeping", this.isSleeping());
-        jt.putString("Type", this.getFoxType().getName());
-        jt.putBoolean("Sitting", this.isSitting());
-        jt.putBoolean("Crouching", this.isCrouching());
+        le.put("Trusted", lk4);
+        le.putBoolean("Sleeping", this.isSleeping());
+        le.putString("Type", this.getFoxType().getName());
+        le.putBoolean("Sitting", this.isSitting());
+        le.putBoolean("Crouching", this.isCrouching());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        final ListTag jz3 = jt.getList("TrustedUUIDs", 10);
-        for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-            this.addTrustedUUID(NbtUtils.loadUUIDTag(jz3.getCompound(integer4)));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        final ListTag lk3 = le.getList("Trusted", 11);
+        for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+            this.addTrustedUUID(NbtUtils.loadUUID(lk3.get(integer4)));
+        }
+        this.setSleeping(le.getBoolean("Sleeping"));
+        this.setFoxType(Type.byName(le.getString("Type")));
+        this.setSitting(le.getBoolean("Sitting"));
+        this.setIsCrouching(le.getBoolean("Crouching"));
+        if (this.level instanceof ServerLevel) {
+            this.setTargetGoals();
         }
-        this.setSleeping(jt.getBoolean("Sleeping"));
-        this.setFoxType(Type.byName(jt.getString("Type")));
-        this.setSitting(jt.getBoolean("Sitting"));
-        this.setIsCrouching(jt.getBoolean("Crouching"));
-        this.setTargetGoals();
     }
     
     public boolean isSitting() {
@@ -416,47 +420,48 @@ public class Fox extends Animal {
     }
     
     @Override
-    public boolean canTakeItem(final ItemStack ben) {
-        final EquipmentSlot akv3 = Mob.getEquipmentSlotForItem(ben);
-        return this.getItemBySlot(akv3).isEmpty() && akv3 == EquipmentSlot.MAINHAND && super.canTakeItem(ben);
+    public boolean canTakeItem(final ItemStack bki) {
+        final EquipmentSlot aor3 = Mob.getEquipmentSlotForItem(bki);
+        return this.getItemBySlot(aor3).isEmpty() && aor3 == EquipmentSlot.MAINHAND && super.canTakeItem(bki);
     }
     
     @Override
-    protected boolean canHoldItem(final ItemStack ben) {
-        final Item bei3 = ben.getItem();
-        final ItemStack ben2 = this.getItemBySlot(EquipmentSlot.MAINHAND);
-        return ben2.isEmpty() || (this.ticksSinceEaten > 0 && bei3.isEdible() && !ben2.getItem().isEdible());
+    public boolean canHoldItem(final ItemStack bki) {
+        final Item bke3 = bki.getItem();
+        final ItemStack bki2 = this.getItemBySlot(EquipmentSlot.MAINHAND);
+        return bki2.isEmpty() || (this.ticksSinceEaten > 0 && bke3.isEdible() && !bki2.getItem().isEdible());
     }
     
-    private void spitOutItem(final ItemStack ben) {
-        if (ben.isEmpty() || this.level.isClientSide) {
+    private void spitOutItem(final ItemStack bki) {
+        if (bki.isEmpty() || this.level.isClientSide) {
             return;
         }
-        final ItemEntity awb3 = new ItemEntity(this.level, this.getX() + this.getLookAngle().x, this.getY() + 1.0, this.getZ() + this.getLookAngle().z, ben);
-        awb3.setPickUpDelay(40);
-        awb3.setThrower(this.getUUID());
+        final ItemEntity bbg3 = new ItemEntity(this.level, this.getX() + this.getLookAngle().x, this.getY() + 1.0, this.getZ() + this.getLookAngle().z, bki);
+        bbg3.setPickUpDelay(40);
+        bbg3.setThrower(this.getUUID());
         this.playSound(SoundEvents.FOX_SPIT, 1.0f, 1.0f);
-        this.level.addFreshEntity(awb3);
+        this.level.addFreshEntity(bbg3);
     }
     
-    private void dropItemStack(final ItemStack ben) {
-        final ItemEntity awb3 = new ItemEntity(this.level, this.getX(), this.getY(), this.getZ(), ben);
-        this.level.addFreshEntity(awb3);
+    private void dropItemStack(final ItemStack bki) {
+        final ItemEntity bbg3 = new ItemEntity(this.level, this.getX(), this.getY(), this.getZ(), bki);
+        this.level.addFreshEntity(bbg3);
     }
     
     @Override
-    protected void pickUpItem(final ItemEntity awb) {
-        final ItemStack ben3 = awb.getItem();
-        if (this.canHoldItem(ben3)) {
-            final int integer4 = ben3.getCount();
+    protected void pickUpItem(final ItemEntity bbg) {
+        final ItemStack bki3 = bbg.getItem();
+        if (this.canHoldItem(bki3)) {
+            final int integer4 = bki3.getCount();
             if (integer4 > 1) {
-                this.dropItemStack(ben3.split(integer4 - 1));
+                this.dropItemStack(bki3.split(integer4 - 1));
             }
             this.spitOutItem(this.getItemBySlot(EquipmentSlot.MAINHAND));
-            this.setItemSlot(EquipmentSlot.MAINHAND, ben3.split(1));
+            this.onItemPickup(bbg);
+            this.setItemSlot(EquipmentSlot.MAINHAND, bki3.split(1));
             this.handDropChances[EquipmentSlot.MAINHAND.getIndex()] = 2.0f;
-            this.take(awb, ben3.getCount());
-            awb.remove();
+            this.take(bbg, bki3.getCount());
+            bbg.remove();
             this.ticksSinceEaten = 0;
         }
     }
@@ -473,9 +478,9 @@ public class Fox extends Animal {
                 this.setSitting(false);
             }
             if (this.isFaceplanted() && this.level.random.nextFloat() < 0.2f) {
-                final BlockPos fk3 = new BlockPos(this);
-                final BlockState byj4 = this.level.getBlockState(fk3);
-                this.level.levelEvent(2001, fk3, Block.getId(byj4));
+                final BlockPos fu3 = this.blockPosition();
+                final BlockState cfj4 = this.level.getBlockState(fu3);
+                this.level.levelEvent(2001, fu3, Block.getId(cfj4));
             }
         }
         this.interestedAngleO = this.interestedAngle;
@@ -498,13 +503,13 @@ public class Fox extends Animal {
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        return ben.getItem() == Items.SWEET_BERRIES;
+    public boolean isFood(final ItemStack bki) {
+        return bki.getItem() == Items.SWEET_BERRIES;
     }
     
     @Override
-    protected void onOffspringSpawnedFromEgg(final Player ayj, final AgableMob ako) {
-        ((Fox)ako).addTrustedUUID(ayj.getUUID());
+    protected void onOffspringSpawnedFromEgg(final Player bec, final Mob aoz) {
+        ((Fox)aoz).addTrustedUUID(bec.getUUID());
     }
     
     public boolean isPouncing() {
@@ -545,11 +550,11 @@ public class Fox extends Animal {
     }
     
     @Override
-    public void setTarget(@Nullable final LivingEntity akz) {
-        if (this.isDefending() && akz == null) {
+    public void setTarget(@Nullable final LivingEntity aoy) {
+        if (this.isDefending() && aoy == null) {
             this.setDefending(false);
         }
-        super.setTarget(akz);
+        super.setTarget(aoy);
     }
     
     @Override
@@ -576,9 +581,9 @@ public class Fox extends Animal {
     
     @Override
     public void playAmbientSound() {
-        final SoundEvent aah2 = this.getAmbientSound();
-        if (aah2 == SoundEvents.FOX_SCREECH) {
-            this.playSound(aah2, 2.0f, this.getVoicePitch());
+        final SoundEvent ack2 = this.getAmbientSound();
+        if (ack2 == SoundEvents.FOX_SCREECH) {
+            this.playSound(ack2, 2.0f, this.getVoicePitch());
         }
         else {
             super.playAmbientSound();
@@ -602,7 +607,7 @@ public class Fox extends Animal {
     
     @Nullable
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.FOX_HURT;
     }
     
@@ -617,25 +622,25 @@ public class Fox extends Animal {
     }
     
     @Override
-    protected void dropAllDeathLoot(final DamageSource ajz) {
-        final ItemStack ben3 = this.getItemBySlot(EquipmentSlot.MAINHAND);
-        if (!ben3.isEmpty()) {
-            this.spawnAtLocation(ben3);
+    protected void dropAllDeathLoot(final DamageSource anw) {
+        final ItemStack bki3 = this.getItemBySlot(EquipmentSlot.MAINHAND);
+        if (!bki3.isEmpty()) {
+            this.spawnAtLocation(bki3);
             this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
         }
-        super.dropAllDeathLoot(ajz);
+        super.dropAllDeathLoot(anw);
     }
     
-    public static boolean isPathClear(final Fox atk, final LivingEntity akz) {
-        final double double3 = akz.getZ() - atk.getZ();
-        final double double4 = akz.getX() - atk.getX();
+    public static boolean isPathClear(final Fox ays, final LivingEntity aoy) {
+        final double double3 = aoy.getZ() - ays.getZ();
+        final double double4 = aoy.getX() - ays.getX();
         final double double5 = double3 / double4;
         final int integer9 = 6;
         for (int integer10 = 0; integer10 < 6; ++integer10) {
             final double double6 = (double5 == 0.0) ? 0.0 : (double3 * (integer10 / 6.0f));
             final double double7 = (double5 == 0.0) ? (double4 * (integer10 / 6.0f)) : (double6 / double5);
             for (int integer11 = 1; integer11 < 4; ++integer11) {
-                if (!atk.level.getBlockState(new BlockPos(atk.getX() + double7, atk.getY() + integer11, atk.getZ() + double6)).getMaterial().isReplaceable()) {
+                if (!ays.level.getBlockState(new BlockPos(ays.getX() + double7, ays.getY() + integer11, ays.getZ() + double6)).getMaterial().isReplaceable()) {
                     return false;
                 }
             }
@@ -643,24 +648,29 @@ public class Fox extends Animal {
         return true;
     }
     
+    @Override
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, 0.55f * this.getEyeHeight(), this.getBbWidth() * 0.4f);
+    }
+    
     static {
         DATA_TYPE_ID = SynchedEntityData.<Integer>defineId(Fox.class, EntityDataSerializers.INT);
         DATA_FLAGS_ID = SynchedEntityData.<Byte>defineId(Fox.class, EntityDataSerializers.BYTE);
         DATA_TRUSTED_ID_0 = SynchedEntityData.<Optional<UUID>>defineId(Fox.class, EntityDataSerializers.OPTIONAL_UUID);
         DATA_TRUSTED_ID_1 = SynchedEntityData.<Optional<UUID>>defineId(Fox.class, EntityDataSerializers.OPTIONAL_UUID);
-        ALLOWED_ITEMS = (awb -> !awb.hasPickUpDelay() && awb.isAlive());
-        LivingEntity akz2;
-        TRUSTED_TARGET_SELECTOR = (akq -> {
-            if (akq instanceof LivingEntity) {
-                akz2 = akq;
-                return akz2.getLastHurtMob() != null && akz2.getLastHurtMobTimestamp() < akz2.tickCount + 600;
+        ALLOWED_ITEMS = (bbg -> !bbg.hasPickUpDelay() && bbg.isAlive());
+        LivingEntity aoy2;
+        TRUSTED_TARGET_SELECTOR = (aom -> {
+            if (aom instanceof LivingEntity) {
+                aoy2 = aom;
+                return aoy2.getLastHurtMob() != null && aoy2.getLastHurtMobTimestamp() < aoy2.tickCount + 600;
             }
             else {
                 return false;
             }
         });
-        STALKABLE_PREY = (akq -> akq instanceof Chicken || akq instanceof Rabbit);
-        AVOID_PLAYERS = (akq -> !akq.isDiscrete() && EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(akq));
+        STALKABLE_PREY = (aom -> aom instanceof Chicken || aom instanceof Rabbit);
+        AVOID_PLAYERS = (aom -> !aom.isDiscrete() && EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(aom));
     }
     
     public enum Type {
@@ -702,8 +712,8 @@ public class Fox extends Animal {
             return Type.BY_ID[integer];
         }
         
-        public static Type byBiome(final Biome bkt) {
-            return Type.SNOW.getBiomes().contains(bkt) ? Type.SNOW : Type.RED;
+        public static Type byBiome(final Biome bre) {
+            return Type.SNOW.getBiomes().contains(bre) ? Type.SNOW : Type.RED;
         }
         
         static {
@@ -738,8 +748,8 @@ public class Fox extends Animal {
         @Override
         public void tick() {
             final List<ItemEntity> list2 = Fox.this.level.<ItemEntity>getEntitiesOfClass(ItemEntity.class, Fox.this.getBoundingBox().inflate(8.0, 8.0, 8.0), Fox.ALLOWED_ITEMS);
-            final ItemStack ben3 = Fox.this.getItemBySlot(EquipmentSlot.MAINHAND);
-            if (ben3.isEmpty() && !list2.isEmpty()) {
+            final ItemStack bki3 = Fox.this.getItemBySlot(EquipmentSlot.MAINHAND);
+            if (bki3.isEmpty() && !list2.isEmpty()) {
                 Fox.this.getNavigation().moveTo(list2.get(0), 1.2000000476837158);
             }
         }
@@ -776,8 +786,8 @@ public class Fox extends Animal {
             if (Fox.this.isSleeping()) {
                 return false;
             }
-            final LivingEntity akz2 = Fox.this.getTarget();
-            return akz2 != null && akz2.isAlive() && Fox.STALKABLE_PREY.test(akz2) && Fox.this.distanceToSqr(akz2) > 36.0 && !Fox.this.isCrouching() && !Fox.this.isInterested() && !Fox.this.jumping;
+            final LivingEntity aoy2 = Fox.this.getTarget();
+            return aoy2 != null && aoy2.isAlive() && Fox.STALKABLE_PREY.test(aoy2) && Fox.this.distanceToSqr(aoy2) > 36.0 && !Fox.this.isCrouching() && !Fox.this.isInterested() && !Fox.this.jumping;
         }
         
         @Override
@@ -788,12 +798,12 @@ public class Fox extends Animal {
         
         @Override
         public void stop() {
-            final LivingEntity akz2 = Fox.this.getTarget();
-            if (akz2 != null && Fox.isPathClear(Fox.this, akz2)) {
+            final LivingEntity aoy2 = Fox.this.getTarget();
+            if (aoy2 != null && Fox.isPathClear(Fox.this, aoy2)) {
                 Fox.this.setIsInterested(true);
                 Fox.this.setIsCrouching(true);
                 Fox.this.getNavigation().stop();
-                Fox.this.getLookControl().setLookAt(akz2, (float)Fox.this.getMaxHeadYRot(), (float)Fox.this.getMaxHeadXRot());
+                Fox.this.getLookControl().setLookAt(aoy2, (float)Fox.this.getMaxHeadYRot(), (float)Fox.this.getMaxHeadXRot());
             }
             else {
                 Fox.this.setIsInterested(false);
@@ -803,15 +813,15 @@ public class Fox extends Animal {
         
         @Override
         public void tick() {
-            final LivingEntity akz2 = Fox.this.getTarget();
-            Fox.this.getLookControl().setLookAt(akz2, (float)Fox.this.getMaxHeadYRot(), (float)Fox.this.getMaxHeadXRot());
-            if (Fox.this.distanceToSqr(akz2) <= 36.0) {
+            final LivingEntity aoy2 = Fox.this.getTarget();
+            Fox.this.getLookControl().setLookAt(aoy2, (float)Fox.this.getMaxHeadYRot(), (float)Fox.this.getMaxHeadXRot());
+            if (Fox.this.distanceToSqr(aoy2) <= 36.0) {
                 Fox.this.setIsInterested(true);
                 Fox.this.setIsCrouching(true);
                 Fox.this.getNavigation().stop();
             }
             else {
-                Fox.this.getNavigation().moveTo(akz2, 1.5);
+                Fox.this.getNavigation().moveTo(aoy2, 1.5);
             }
         }
     }
@@ -822,11 +832,11 @@ public class Fox extends Animal {
         }
         
         @Override
-        protected void checkAndPerformAttack(final LivingEntity akz, final double double2) {
-            final double double3 = this.getAttackReachSqr(akz);
-            if (double2 <= double3 && this.attackTime <= 0) {
-                this.attackTime = 20;
-                this.mob.doHurtTarget(akz);
+        protected void checkAndPerformAttack(final LivingEntity aoy, final double double2) {
+            final double double3 = this.getAttackReachSqr(aoy);
+            if (double2 <= double3 && this.isTimeToAttack()) {
+                this.resetAttackCooldown();
+                this.mob.doHurtTarget(aoy);
                 Fox.this.playSound(SoundEvents.FOX_BITE, 1.0f, 1.0f);
             }
         }
@@ -857,34 +867,33 @@ public class Fox extends Animal {
         
         @Override
         protected void breed() {
-            final Fox atk2 = (Fox)this.animal.getBreedOffspring(this.partner);
-            if (atk2 == null) {
+            final Fox ays2 = (Fox)this.animal.getBreedOffspring(this.partner);
+            if (ays2 == null) {
                 return;
             }
-            final ServerPlayer xe3 = this.animal.getLoveCause();
-            final ServerPlayer xe4 = this.partner.getLoveCause();
-            ServerPlayer xe5;
-            if ((xe5 = xe3) != null) {
-                atk2.addTrustedUUID(xe3.getUUID());
+            final ServerPlayer ze3 = this.animal.getLoveCause();
+            final ServerPlayer ze4 = this.partner.getLoveCause();
+            ServerPlayer ze5;
+            if ((ze5 = ze3) != null) {
+                ays2.addTrustedUUID(ze3.getUUID());
             }
             else {
-                xe5 = xe4;
+                ze5 = ze4;
             }
-            if (xe4 != null && xe3 != xe4) {
-                atk2.addTrustedUUID(xe4.getUUID());
+            if (ze4 != null && ze3 != ze4) {
+                ays2.addTrustedUUID(ze4.getUUID());
             }
-            if (xe5 != null) {
-                xe5.awardStat(Stats.ANIMALS_BRED);
-                CriteriaTriggers.BRED_ANIMALS.trigger(xe5, this.animal, this.partner, atk2);
+            if (ze5 != null) {
+                ze5.awardStat(Stats.ANIMALS_BRED);
+                CriteriaTriggers.BRED_ANIMALS.trigger(ze5, this.animal, this.partner, ays2);
             }
-            final int integer6 = 6000;
             this.animal.setAge(6000);
             this.partner.setAge(6000);
             this.animal.resetLove();
             this.partner.resetLove();
-            atk2.setAge(-24000);
-            atk2.moveTo(this.animal.getX(), this.animal.getY(), this.animal.getZ(), 0.0f, 0.0f);
-            this.level.addFreshEntity(atk2);
+            ays2.setAge(-24000);
+            ays2.moveTo(this.animal.getX(), this.animal.getY(), this.animal.getZ(), 0.0f, 0.0f);
+            this.level.addFreshEntity(ays2);
             this.level.broadcastEntityEvent(this.animal, (byte)18);
             if (this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
                 this.level.addFreshEntity(new ExperienceOrb(this.level, this.animal.getX(), this.animal.getY(), this.animal.getZ(), this.animal.getRandom().nextInt(7) + 1));
@@ -912,14 +921,14 @@ public class Fox extends Animal {
                     if (!(Fox.this.level instanceof ServerLevel)) {
                         continue;
                     }
-                    final Entity akq4 = ((ServerLevel)Fox.this.level).getEntity(uUID3);
-                    if (!(akq4 instanceof LivingEntity)) {
+                    final Entity aom4 = ((ServerLevel)Fox.this.level).getEntity(uUID3);
+                    if (!(aom4 instanceof LivingEntity)) {
                         continue;
                     }
-                    final LivingEntity akz5 = (LivingEntity)akq4;
-                    this.trustedLastHurt = akz5;
-                    this.trustedLastHurtBy = akz5.getLastHurtByMob();
-                    final int integer6 = akz5.getLastHurtByMobTimestamp();
+                    final LivingEntity aoy5 = (LivingEntity)aom4;
+                    this.trustedLastHurt = aoy5;
+                    this.trustedLastHurtBy = aoy5.getLastHurtByMob();
+                    final int integer6 = aoy5.getLastHurtByMobTimestamp();
                     return integer6 != this.timestamp && this.canAttack(this.trustedLastHurtBy, this.targetConditions);
                 }
             }
@@ -928,7 +937,7 @@ public class Fox extends Animal {
         
         @Override
         public void start() {
-            Fox.this.setTarget(this.trustedLastHurtBy);
+            this.setTarget(this.trustedLastHurtBy);
             this.target = this.trustedLastHurtBy;
             if (this.trustedLastHurt != null) {
                 this.timestamp = this.trustedLastHurt.getLastHurtByMobTimestamp();
@@ -961,8 +970,8 @@ public class Fox extends Animal {
                 return false;
             }
             this.interval = 100;
-            final BlockPos fk2 = new BlockPos(this.mob);
-            return Fox.this.level.isDay() && Fox.this.level.canSeeSky(fk2) && !((ServerLevel)Fox.this.level).isVillage(fk2) && this.setWantedPos();
+            final BlockPos fu2 = this.mob.blockPosition();
+            return Fox.this.level.isDay() && Fox.this.level.canSeeSky(fu2) && !((ServerLevel)Fox.this.level).isVillage(fu2) && this.setWantedPos();
         }
         
         @Override
@@ -974,17 +983,17 @@ public class Fox extends Animal {
     
     public class FoxAlertableEntitiesSelector implements Predicate<LivingEntity> {
         @Override
-        public boolean test(final LivingEntity akz) {
-            if (akz instanceof Fox) {
+        public boolean test(final LivingEntity aoy) {
+            if (aoy instanceof Fox) {
                 return false;
             }
-            if (akz instanceof Chicken || akz instanceof Rabbit || akz instanceof Monster) {
+            if (aoy instanceof Chicken || aoy instanceof Rabbit || aoy instanceof Monster) {
                 return true;
             }
-            if (akz instanceof TamableAnimal) {
-                return !((TamableAnimal)akz).isTame();
+            if (aoy instanceof TamableAnimal) {
+                return !((TamableAnimal)aoy).isTame();
             }
-            return (!(akz instanceof Player) || (!akz.isSpectator() && !((Player)akz).isCreative())) && !Fox.this.trusts(akz.getUUID()) && !akz.isSleeping() && !akz.isDiscrete();
+            return (!(aoy instanceof Player) || (!aoy.isSpectator() && !((Player)aoy).isCreative())) && !Fox.this.trusts(aoy.getUUID()) && !aoy.isSleeping() && !aoy.isDiscrete();
         }
     }
     
@@ -996,8 +1005,8 @@ public class Fox extends Animal {
         }
         
         protected boolean hasShelter() {
-            final BlockPos fk2 = new BlockPos(Fox.this);
-            return !Fox.this.level.canSeeSky(fk2) && Fox.this.getWalkTargetValue(fk2) >= 0.0f;
+            final BlockPos fu2 = new BlockPos(Fox.this.getX(), Fox.this.getBoundingBox().maxY, Fox.this.getZ());
+            return !Fox.this.level.canSeeSky(fu2) && Fox.this.getWalkTargetValue(fu2) >= 0.0f;
         }
         
         protected boolean alertable() {
@@ -1118,9 +1127,9 @@ public class Fox extends Animal {
         }
         
         @Override
-        protected boolean isValidTarget(final LevelReader bjz, final BlockPos fk) {
-            final BlockState byj4 = bjz.getBlockState(fk);
-            return byj4.getBlock() == Blocks.SWEET_BERRY_BUSH && byj4.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) >= 2;
+        protected boolean isValidTarget(final LevelReader bqd, final BlockPos fu) {
+            final BlockState cfj4 = bqd.getBlockState(fu);
+            return cfj4.is(Blocks.SWEET_BERRY_BUSH) && cfj4.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) >= 2;
         }
         
         @Override
@@ -1143,15 +1152,15 @@ public class Fox extends Animal {
             if (!Fox.this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
                 return;
             }
-            final BlockState byj2 = Fox.this.level.getBlockState(this.blockPos);
-            if (byj2.getBlock() != Blocks.SWEET_BERRY_BUSH) {
+            final BlockState cfj2 = Fox.this.level.getBlockState(this.blockPos);
+            if (!cfj2.is(Blocks.SWEET_BERRY_BUSH)) {
                 return;
             }
-            final int integer3 = byj2.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE);
-            ((AbstractStateHolder<Object, Object>)byj2).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, 1);
+            final int integer3 = cfj2.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE);
+            ((StateHolder<Object, Object>)cfj2).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, 1);
             int integer4 = 1 + Fox.this.level.random.nextInt(2) + ((integer3 == 3) ? 1 : 0);
-            final ItemStack ben5 = Fox.this.getItemBySlot(EquipmentSlot.MAINHAND);
-            if (ben5.isEmpty()) {
+            final ItemStack bki5 = Fox.this.getItemBySlot(EquipmentSlot.MAINHAND);
+            if (bki5.isEmpty()) {
                 Fox.this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.SWEET_BERRIES));
                 --integer4;
             }
@@ -1159,7 +1168,7 @@ public class Fox extends Animal {
                 Block.popResource(Fox.this.level, this.blockPos, new ItemStack(Items.SWEET_BERRIES, integer4));
             }
             Fox.this.playSound(SoundEvents.SWEET_BERRY_BUSH_PICK_BERRIES, 1.0f, 1.0f);
-            Fox.this.level.setBlock(this.blockPos, ((AbstractStateHolder<O, BlockState>)byj2).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, 1), 2);
+            Fox.this.level.setBlock(this.blockPos, ((StateHolder<O, BlockState>)cfj2).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, 1), 2);
         }
         
         @Override
@@ -1267,7 +1276,7 @@ public class Fox extends Animal {
         
         @Override
         public boolean canUse() {
-            return (Fox.this.isInWater() && Fox.this.getWaterHeight() > 0.25) || Fox.this.isInLava();
+            return (Fox.this.isInWater() && Fox.this.getFluidHeight(FluidTags.WATER) > 0.25) || Fox.this.isInLava();
         }
     }
     
@@ -1277,16 +1286,16 @@ public class Fox extends Animal {
             if (!Fox.this.isFullyCrouched()) {
                 return false;
             }
-            final LivingEntity akz2 = Fox.this.getTarget();
-            if (akz2 == null || !akz2.isAlive()) {
+            final LivingEntity aoy2 = Fox.this.getTarget();
+            if (aoy2 == null || !aoy2.isAlive()) {
                 return false;
             }
-            if (akz2.getMotionDirection() != akz2.getDirection()) {
+            if (aoy2.getMotionDirection() != aoy2.getDirection()) {
                 return false;
             }
-            final boolean boolean3 = Fox.isPathClear(Fox.this, akz2);
+            final boolean boolean3 = Fox.isPathClear(Fox.this, aoy2);
             if (!boolean3) {
-                Fox.this.getNavigation().createPath(akz2, 0);
+                Fox.this.getNavigation().createPath(aoy2, 0);
                 Fox.this.setIsCrouching(false);
                 Fox.this.setIsInterested(false);
             }
@@ -1295,8 +1304,8 @@ public class Fox extends Animal {
         
         @Override
         public boolean canContinueToUse() {
-            final LivingEntity akz2 = Fox.this.getTarget();
-            if (akz2 == null || !akz2.isAlive()) {
+            final LivingEntity aoy2 = Fox.this.getTarget();
+            if (aoy2 == null || !aoy2.isAlive()) {
                 return false;
             }
             final double double3 = Fox.this.getDeltaMovement().y;
@@ -1313,10 +1322,10 @@ public class Fox extends Animal {
             Fox.this.setJumping(true);
             Fox.this.setIsPouncing(true);
             Fox.this.setIsInterested(false);
-            final LivingEntity akz2 = Fox.this.getTarget();
-            Fox.this.getLookControl().setLookAt(akz2, 60.0f, 30.0f);
-            final Vec3 cvl3 = new Vec3(akz2.getX() - Fox.this.getX(), akz2.getY() - Fox.this.getY(), akz2.getZ() - Fox.this.getZ()).normalize();
-            Fox.this.setDeltaMovement(Fox.this.getDeltaMovement().add(cvl3.x * 0.8, 0.9, cvl3.z * 0.8));
+            final LivingEntity aoy2 = Fox.this.getTarget();
+            Fox.this.getLookControl().setLookAt(aoy2, 60.0f, 30.0f);
+            final Vec3 dem3 = new Vec3(aoy2.getX() - Fox.this.getX(), aoy2.getY() - Fox.this.getY(), aoy2.getZ() - Fox.this.getZ()).normalize();
+            Fox.this.setDeltaMovement(Fox.this.getDeltaMovement().add(dem3.x * 0.8, 0.9, dem3.z * 0.8));
             Fox.this.getNavigation().stop();
         }
         
@@ -1331,25 +1340,25 @@ public class Fox extends Animal {
         
         @Override
         public void tick() {
-            final LivingEntity akz2 = Fox.this.getTarget();
-            if (akz2 != null) {
-                Fox.this.getLookControl().setLookAt(akz2, 60.0f, 30.0f);
+            final LivingEntity aoy2 = Fox.this.getTarget();
+            if (aoy2 != null) {
+                Fox.this.getLookControl().setLookAt(aoy2, 60.0f, 30.0f);
             }
             if (!Fox.this.isFaceplanted()) {
-                final Vec3 cvl3 = Fox.this.getDeltaMovement();
-                if (cvl3.y * cvl3.y < 0.029999999329447746 && Fox.this.xRot != 0.0f) {
+                final Vec3 dem3 = Fox.this.getDeltaMovement();
+                if (dem3.y * dem3.y < 0.029999999329447746 && Fox.this.xRot != 0.0f) {
                     Fox.this.xRot = Mth.rotlerp(Fox.this.xRot, 0.0f, 0.2f);
                 }
                 else {
-                    final double double4 = Math.sqrt(Entity.getHorizontalDistanceSqr(cvl3));
-                    final double double5 = Math.signum(-cvl3.y) * Math.acos(double4 / cvl3.length()) * 57.2957763671875;
+                    final double double4 = Math.sqrt(Entity.getHorizontalDistanceSqr(dem3));
+                    final double double5 = Math.signum(-dem3.y) * Math.acos(double4 / dem3.length()) * 57.2957763671875;
                     Fox.this.xRot = (float)double5;
                 }
             }
-            if (akz2 != null && Fox.this.distanceTo(akz2) <= 2.0f) {
-                Fox.this.doHurtTarget(akz2);
+            if (aoy2 != null && Fox.this.distanceTo(aoy2) <= 2.0f) {
+                Fox.this.doHurtTarget(aoy2);
             }
-            else if (Fox.this.xRot > 0.0f && Fox.this.onGround && (float)Fox.this.getDeltaMovement().y != 0.0f && Fox.this.level.getBlockState(new BlockPos(Fox.this)).getBlock() == Blocks.SNOW) {
+            else if (Fox.this.xRot > 0.0f && Fox.this.onGround && (float)Fox.this.getDeltaMovement().y != 0.0f && Fox.this.level.getBlockState(Fox.this.blockPosition()).is(Blocks.SNOW)) {
                 Fox.this.xRot = 60.0f;
                 Fox.this.setTarget(null);
                 Fox.this.setFaceplanted(true);
@@ -1378,9 +1387,9 @@ public class Fox extends Animal {
     class FoxFollowParentGoal extends FollowParentGoal {
         private final Fox fox;
         
-        public FoxFollowParentGoal(final Fox atk2, final double double3) {
-            super(atk2, double3);
-            this.fox = atk2;
+        public FoxFollowParentGoal(final Fox ays2, final double double3) {
+            super(ays2, double3);
+            this.fox = ays2;
         }
         
         @Override
@@ -1401,8 +1410,8 @@ public class Fox extends Animal {
     }
     
     class FoxLookAtPlayerGoal extends LookAtPlayerGoal {
-        public FoxLookAtPlayerGoal(final Mob ala, final Class<? extends LivingEntity> class3, final float float4) {
-            super(ala, class3, float4);
+        public FoxLookAtPlayerGoal(final Mob aoz, final Class<? extends LivingEntity> class3, final float float4) {
+            super(aoz, class3, float4);
         }
         
         @Override
diff --git a/src/net/minecraft/world/entity/animal/IronGolem.java b/src/net/minecraft/world/entity/animal/IronGolem.java
index b195b98..13f6236 100644
--- a/src/net/minecraft/world/entity/animal/IronGolem.java
+++ b/src/net/minecraft/world/entity/animal/IronGolem.java
@@ -6,8 +6,10 @@ import java.util.Comparator;
 import java.util.stream.Stream;
 import java.util.Iterator;
 import java.util.List;
+import net.minecraft.util.TimeUtil;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.NaturalSpawner;
 import net.minecraft.world.level.BlockGetter;
@@ -15,22 +17,27 @@ import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.damagesource.DamageSource;
+import javax.annotation.Nullable;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.BlockParticleOption;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
-import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.entity.ai.goal.target.ResetUniversalAngerTargetGoal;
 import net.minecraft.world.entity.monster.Creeper;
 import net.minecraft.world.entity.monster.Enemy;
+import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.DefendVillageTargetGoal;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
@@ -38,25 +45,30 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal;
 import net.minecraft.world.entity.ai.goal.OfferFlowerGoal;
-import net.minecraft.world.entity.ai.goal.MoveThroughVillageGoal;
-import net.minecraft.world.entity.ai.goal.MoveBackToVillage;
+import net.minecraft.world.entity.ai.goal.GolemRandomStrollInVillageGoal;
+import net.minecraft.world.entity.ai.goal.MoveBackToVillageGoal;
 import net.minecraft.world.entity.ai.goal.MoveTowardsTargetGoal;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.ai.goal.MeleeAttackGoal;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
+import java.util.UUID;
+import net.minecraft.util.IntRange;
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.NeutralMob;
 
-public class IronGolem extends AbstractGolem {
+public class IronGolem extends AbstractGolem implements NeutralMob {
     protected static final EntityDataAccessor<Byte> DATA_FLAGS_ID;
     private int attackAnimationTick;
     private int offerFlowerTick;
+    private static final IntRange PERSISTENT_ANGER_TIME;
+    private int remainingPersistentAngerTime;
+    private UUID persistentAngerTarget;
     
-    public IronGolem(final EntityType<? extends IronGolem> aku, final Level bjw) {
-        super(aku, bjw);
+    public IronGolem(final EntityType<? extends IronGolem> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.maxUpStep = 1.0f;
     }
     
@@ -64,15 +76,16 @@ public class IronGolem extends AbstractGolem {
     protected void registerGoals() {
         this.goalSelector.addGoal(1, new MeleeAttackGoal(this, 1.0, true));
         this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9, 32.0f));
-        this.goalSelector.addGoal(2, new MoveBackToVillage(this, 0.6));
-        this.goalSelector.addGoal(3, new MoveThroughVillageGoal(this, 0.6, false, 4, () -> false));
+        this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6, false));
+        this.goalSelector.addGoal(4, new GolemRandomStrollInVillageGoal(this, 0.6));
         this.goalSelector.addGoal(5, new OfferFlowerGoal(this));
-        this.goalSelector.addGoal(6, new WaterAvoidingRandomStrollGoal(this, 0.6));
         this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 6.0f));
         this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
         this.targetSelector.addGoal(1, new DefendVillageTargetGoal(this));
         this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
-        this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Mob.class, 5, false, false, akz -> akz instanceof Enemy && !(akz instanceof Creeper)));
+        this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
+        this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Mob.class, 5, false, false, aoy -> aoy instanceof Enemy && !(aoy instanceof Creeper)));
+        this.targetSelector.addGoal(4, new ResetUniversalAngerTargetGoal<>(this, false));
     }
     
     @Override
@@ -81,13 +94,8 @@ public class IronGolem extends AbstractGolem {
         this.entityData.<Byte>define(IronGolem.DATA_FLAGS_ID, (Byte)0);
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(100.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25);
-        this.getAttribute(SharedMonsterAttributes.KNOCKBACK_RESISTANCE).setBaseValue(1.0);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(15.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 100.0).add(Attributes.MOVEMENT_SPEED, 0.25).add(Attributes.KNOCKBACK_RESISTANCE, 1.0).add(Attributes.ATTACK_DAMAGE, 15.0);
     }
     
     @Override
@@ -96,11 +104,11 @@ public class IronGolem extends AbstractGolem {
     }
     
     @Override
-    protected void doPush(final Entity akq) {
-        if (akq instanceof Enemy && !(akq instanceof Creeper) && this.getRandom().nextInt(20) == 0) {
-            this.setTarget((LivingEntity)akq);
+    protected void doPush(final Entity aom) {
+        if (aom instanceof Enemy && !(aom instanceof Creeper) && this.getRandom().nextInt(20) == 0) {
+            this.setTarget((LivingEntity)aom);
         }
-        super.doPush(akq);
+        super.doPush(aom);
     }
     
     @Override
@@ -116,53 +124,83 @@ public class IronGolem extends AbstractGolem {
             final int integer2 = Mth.floor(this.getX());
             final int integer3 = Mth.floor(this.getY() - 0.20000000298023224);
             final int integer4 = Mth.floor(this.getZ());
-            final BlockState byj5 = this.level.getBlockState(new BlockPos(integer2, integer3, integer4));
-            if (!byj5.isAir()) {
-                this.level.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, byj5), this.getX() + (this.random.nextFloat() - 0.5) * this.getBbWidth(), this.getY() + 0.1, this.getZ() + (this.random.nextFloat() - 0.5) * this.getBbWidth(), 4.0 * (this.random.nextFloat() - 0.5), 0.5, (this.random.nextFloat() - 0.5) * 4.0);
+            final BlockState cfj5 = this.level.getBlockState(new BlockPos(integer2, integer3, integer4));
+            if (!cfj5.isAir()) {
+                this.level.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, cfj5), this.getX() + (this.random.nextFloat() - 0.5) * this.getBbWidth(), this.getY() + 0.1, this.getZ() + (this.random.nextFloat() - 0.5) * this.getBbWidth(), 4.0 * (this.random.nextFloat() - 0.5), 0.5, (this.random.nextFloat() - 0.5) * 4.0);
             }
         }
+        if (!this.level.isClientSide) {
+            this.updatePersistentAnger((ServerLevel)this.level, true);
+        }
     }
     
     @Override
-    public boolean canAttackType(final EntityType<?> aku) {
-        return (!this.isPlayerCreated() || aku != EntityType.PLAYER) && aku != EntityType.CREEPER && super.canAttackType(aku);
+    public boolean canAttackType(final EntityType<?> aoq) {
+        return (!this.isPlayerCreated() || aoq != EntityType.PLAYER) && aoq != EntityType.CREEPER && super.canAttackType(aoq);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("PlayerCreated", this.isPlayerCreated());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("PlayerCreated", this.isPlayerCreated());
+        this.addPersistentAngerSaveData(le);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setPlayerCreated(jt.getBoolean("PlayerCreated"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setPlayerCreated(le.getBoolean("PlayerCreated"));
+        this.readPersistentAngerSaveData((ServerLevel)this.level, le);
+    }
+    
+    @Override
+    public void startPersistentAngerTimer() {
+        this.setRemainingPersistentAngerTime(IronGolem.PERSISTENT_ANGER_TIME.randomValue(this.random));
+    }
+    
+    @Override
+    public void setRemainingPersistentAngerTime(final int integer) {
+        this.remainingPersistentAngerTime = integer;
+    }
+    
+    @Override
+    public int getRemainingPersistentAngerTime() {
+        return this.remainingPersistentAngerTime;
+    }
+    
+    @Override
+    public void setPersistentAngerTarget(@Nullable final UUID uUID) {
+        this.persistentAngerTarget = uUID;
+    }
+    
+    @Override
+    public UUID getPersistentAngerTarget() {
+        return this.persistentAngerTarget;
     }
     
     private float getAttackDamage() {
-        return (float)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue();
+        return (float)this.getAttributeValue(Attributes.ATTACK_DAMAGE);
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
+    public boolean doHurtTarget(final Entity aom) {
         this.attackAnimationTick = 10;
         this.level.broadcastEntityEvent(this, (byte)4);
         final float float3 = this.getAttackDamage();
-        final float float4 = (float3 > 0.0f) ? (float3 / 2.0f + this.random.nextInt((int)float3)) : 0.0f;
-        final boolean boolean5 = akq.hurt(DamageSource.mobAttack(this), float4);
+        final float float4 = ((int)float3 > 0) ? (float3 / 2.0f + this.random.nextInt((int)float3)) : float3;
+        final boolean boolean5 = aom.hurt(DamageSource.mobAttack(this), float4);
         if (boolean5) {
-            akq.setDeltaMovement(akq.getDeltaMovement().add(0.0, 0.4000000059604645, 0.0));
-            this.doEnchantDamageEffects(this, akq);
+            aom.setDeltaMovement(aom.getDeltaMovement().add(0.0, 0.4000000059604645, 0.0));
+            this.doEnchantDamageEffects(this, aom);
         }
         this.playSound(SoundEvents.IRON_GOLEM_ATTACK, 1.0f, 1.0f);
         return boolean5;
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         final Crackiness a4 = this.getCrackiness();
-        final boolean boolean5 = super.hurt(ajz, float2);
+        final boolean boolean5 = super.hurt(anw, float2);
         if (boolean5 && this.getCrackiness() != a4) {
             this.playSound(SoundEvents.IRON_GOLEM_DAMAGE, 1.0f, 1.0f);
         }
@@ -206,7 +244,7 @@ public class IronGolem extends AbstractGolem {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.IRON_GOLEM_HURT;
     }
     
@@ -216,27 +254,27 @@ public class IronGolem extends AbstractGolem {
     }
     
     @Override
-    protected boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        final Item bei5 = ben4.getItem();
-        if (bei5 != Items.IRON_INGOT) {
-            return false;
+    protected InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        final Item bke5 = bki4.getItem();
+        if (bke5 != Items.IRON_INGOT) {
+            return InteractionResult.PASS;
         }
         final float float6 = this.getHealth();
         this.heal(25.0f);
         if (this.getHealth() == float6) {
-            return false;
+            return InteractionResult.PASS;
         }
         final float float7 = 1.0f + (this.random.nextFloat() - this.random.nextFloat()) * 0.2f;
         this.playSound(SoundEvents.IRON_GOLEM_REPAIR, 1.0f, float7);
-        if (!ayj.abilities.instabuild) {
-            ben4.shrink(1);
+        if (!bec.abilities.instabuild) {
+            bki4.shrink(1);
         }
-        return true;
+        return InteractionResult.sidedSuccess(this.level.isClientSide);
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.IRON_GOLEM_STEP, 1.0f, 1.0f);
     }
     
@@ -259,30 +297,36 @@ public class IronGolem extends AbstractGolem {
     }
     
     @Override
-    public void die(final DamageSource ajz) {
-        super.die(ajz);
+    public void die(final DamageSource anw) {
+        super.die(anw);
     }
     
     @Override
-    public boolean checkSpawnObstruction(final LevelReader bjz) {
-        final BlockPos fk3 = new BlockPos(this);
-        final BlockPos fk4 = fk3.below();
-        final BlockState byj5 = bjz.getBlockState(fk4);
-        if (byj5.entityCanStandOn(bjz, fk4, this)) {
+    public boolean checkSpawnObstruction(final LevelReader bqd) {
+        final BlockPos fu3 = this.blockPosition();
+        final BlockPos fu4 = fu3.below();
+        final BlockState cfj5 = bqd.getBlockState(fu4);
+        if (cfj5.entityCanStandOn(bqd, fu4, this)) {
             for (int integer6 = 1; integer6 < 3; ++integer6) {
-                final BlockPos fk5 = fk3.above(integer6);
-                final BlockState byj6 = bjz.getBlockState(fk5);
-                if (!NaturalSpawner.isValidEmptySpawnBlock(bjz, fk5, byj6, byj6.getFluidState())) {
+                final BlockPos fu5 = fu3.above(integer6);
+                final BlockState cfj6 = bqd.getBlockState(fu5);
+                if (!NaturalSpawner.isValidEmptySpawnBlock(bqd, fu5, cfj6, cfj6.getFluidState(), EntityType.IRON_GOLEM)) {
                     return false;
                 }
             }
-            return NaturalSpawner.isValidEmptySpawnBlock(bjz, fk3, bjz.getBlockState(fk3), Fluids.EMPTY.defaultFluidState()) && bjz.isUnobstructed(this);
+            return NaturalSpawner.isValidEmptySpawnBlock(bqd, fu3, bqd.getBlockState(fu3), Fluids.EMPTY.defaultFluidState(), EntityType.IRON_GOLEM) && bqd.isUnobstructed(this);
         }
         return false;
     }
     
+    @Override
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, 0.875f * this.getEyeHeight(), this.getBbWidth() * 0.4f);
+    }
+    
     static {
         DATA_FLAGS_ID = SynchedEntityData.<Byte>defineId(IronGolem.class, EntityDataSerializers.BYTE);
+        PERSISTENT_ANGER_TIME = TimeUtil.rangeOfSeconds(20, 39);
     }
     
     public enum Crackiness {
diff --git a/src/net/minecraft/world/entity/animal/MushroomCow.java b/src/net/minecraft/world/entity/animal/MushroomCow.java
index 0200e8e..00ef1c0 100644
--- a/src/net/minecraft/world/entity/animal/MushroomCow.java
+++ b/src/net/minecraft/world/entity/animal/MushroomCow.java
@@ -4,24 +4,33 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.world.entity.AgableMob;
-import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.FlowerBlock;
+import net.minecraft.world.item.BlockItem;
 import net.minecraft.nbt.CompoundTag;
-import org.apache.commons.lang3.tuple.Pair;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.tags.ItemTags;
 import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.core.particles.SimpleParticleType;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
+import java.util.Optional;
+import net.minecraft.sounds.SoundEvent;
+import org.apache.commons.lang3.tuple.Pair;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.ItemTags;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.item.ItemUtils;
 import net.minecraft.world.item.SuspiciousStewItem;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.world.entity.LightningBolt;
 import java.util.Random;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.level.LevelAccessor;
@@ -33,32 +42,33 @@ import net.minecraft.world.entity.EntityType;
 import java.util.UUID;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.Shearable;
 
-public class MushroomCow extends Cow {
+public class MushroomCow extends Cow implements Shearable {
     private static final EntityDataAccessor<String> DATA_TYPE;
     private MobEffect effect;
     private int effectDuration;
     private UUID lastLightningBoltUUID;
     
-    public MushroomCow(final EntityType<? extends MushroomCow> aku, final Level bjw) {
-        super(aku, bjw);
+    public MushroomCow(final EntityType<? extends MushroomCow> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
-    public float getWalkTargetValue(final BlockPos fk, final LevelReader bjz) {
-        if (bjz.getBlockState(fk.below()).getBlock() == Blocks.MYCELIUM) {
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        if (bqd.getBlockState(fu.below()).is(Blocks.MYCELIUM)) {
             return 10.0f;
         }
-        return bjz.getBrightness(fk) - 0.5f;
+        return bqd.getBrightness(fu) - 0.5f;
     }
     
-    public static boolean checkMushroomSpawnRules(final EntityType<MushroomCow> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return bjx.getBlockState(fk.below()).getBlock() == Blocks.MYCELIUM && bjx.getRawBrightness(fk, 0) > 8;
+    public static boolean checkMushroomSpawnRules(final EntityType<MushroomCow> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return bqc.getBlockState(fu.below()).is(Blocks.MYCELIUM) && bqc.getRawBrightness(fu, 0) > 8;
     }
     
     @Override
-    public void thunderHit(final LightningBolt avy) {
-        final UUID uUID3 = avy.getUUID();
+    public void thunderHit(final LightningBolt aox) {
+        final UUID uUID3 = aox.getUUID();
         if (!uUID3.equals(this.lastLightningBoltUUID)) {
             this.setMushroomType((this.getMushroomType() == MushroomType.RED) ? MushroomType.BROWN : MushroomType.RED);
             this.lastLightningBoltUUID = uUID3;
@@ -73,110 +83,129 @@ public class MushroomCow extends Cow {
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() == Items.BOWL && !this.isBaby() && !ayj.abilities.instabuild) {
-            ben4.shrink(1);
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (bki4.getItem() == Items.BOWL && !this.isBaby()) {
             boolean boolean6 = false;
-            ItemStack ben5;
+            ItemStack bki5;
             if (this.effect != null) {
                 boolean6 = true;
-                ben5 = new ItemStack(Items.SUSPICIOUS_STEW);
-                SuspiciousStewItem.saveMobEffect(ben5, this.effect, this.effectDuration);
+                bki5 = new ItemStack(Items.SUSPICIOUS_STEW);
+                SuspiciousStewItem.saveMobEffect(bki5, this.effect, this.effectDuration);
                 this.effect = null;
                 this.effectDuration = 0;
             }
             else {
-                ben5 = new ItemStack(Items.MUSHROOM_STEW);
+                bki5 = new ItemStack(Items.MUSHROOM_STEW);
             }
-            if (ben4.isEmpty()) {
-                ayj.setItemInHand(ajk, ben5);
-            }
-            else if (!ayj.inventory.add(ben5)) {
-                ayj.drop(ben5, false);
-            }
-            SoundEvent aah7;
+            final ItemStack bki6 = ItemUtils.createBucketResult(bki4, bec, bki5);
+            bec.setItemInHand(anf, bki6);
+            SoundEvent ack8;
             if (boolean6) {
-                aah7 = SoundEvents.MOOSHROOM_MILK_SUSPICIOUSLY;
+                ack8 = SoundEvents.MOOSHROOM_MILK_SUSPICIOUSLY;
             }
             else {
-                aah7 = SoundEvents.MOOSHROOM_MILK;
+                ack8 = SoundEvents.MOOSHROOM_MILK;
             }
-            this.playSound(aah7, 1.0f, 1.0f);
-            return true;
+            this.playSound(ack8, 1.0f, 1.0f);
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        if (ben4.getItem() == Items.SHEARS && !this.isBaby()) {
-            this.level.addParticle(ParticleTypes.EXPLOSION, this.getX(), this.getY(0.5), this.getZ(), 0.0, 0.0, 0.0);
+        if (bki4.getItem() == Items.SHEARS && this.readyForShearing()) {
+            this.shear(SoundSource.PLAYERS);
             if (!this.level.isClientSide) {
-                this.remove();
-                final Cow ath5 = EntityType.COW.create(this.level);
-                ath5.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
-                ath5.setHealth(this.getHealth());
-                ath5.yBodyRot = this.yBodyRot;
-                if (this.hasCustomName()) {
-                    ath5.setCustomName(this.getCustomName());
-                    ath5.setCustomNameVisible(this.isCustomNameVisible());
-                }
-                if (this.isPersistenceRequired()) {
-                    ath5.setPersistenceRequired();
-                }
-                ath5.setInvulnerable(this.isInvulnerable());
-                this.level.addFreshEntity(ath5);
-                for (int integer6 = 0; integer6 < 5; ++integer6) {
-                    this.level.addFreshEntity(new ItemEntity(this.level, this.getX(), this.getY(1.0), this.getZ(), new ItemStack(this.getMushroomType().blockState.getBlock())));
-                }
-                ben4.<Player>hurtAndBreak(1, ayj, ayj -> ayj.broadcastBreakEvent(ajk));
-                this.playSound(SoundEvents.MOOSHROOM_SHEAR, 1.0f, 1.0f);
+                bki4.<Player>hurtAndBreak(1, bec, bec -> bec.broadcastBreakEvent(anf));
             }
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        if (this.getMushroomType() == MushroomType.BROWN && ben4.getItem().is(ItemTags.SMALL_FLOWERS)) {
+        if (this.getMushroomType() == MushroomType.BROWN && bki4.getItem().is(ItemTags.SMALL_FLOWERS)) {
             if (this.effect != null) {
-                for (int integer7 = 0; integer7 < 2; ++integer7) {
-                    this.level.addParticle(ParticleTypes.SMOKE, this.getX() + this.random.nextFloat() / 2.0f, this.getY(0.5), this.getZ() + this.random.nextFloat() / 2.0f, 0.0, this.random.nextFloat() / 5.0f, 0.0);
+                for (int integer5 = 0; integer5 < 2; ++integer5) {
+                    this.level.addParticle(ParticleTypes.SMOKE, this.getX() + this.random.nextDouble() / 2.0, this.getY(0.5), this.getZ() + this.random.nextDouble() / 2.0, 0.0, this.random.nextDouble() / 5.0, 0.0);
                 }
             }
             else {
-                final Pair<MobEffect, Integer> pair5 = this.getEffectFromItemStack(ben4);
-                if (!ayj.abilities.instabuild) {
-                    ben4.shrink(1);
+                final Optional<Pair<MobEffect, Integer>> optional5 = this.getEffectFromItemStack(bki4);
+                if (!optional5.isPresent()) {
+                    return InteractionResult.PASS;
+                }
+                final Pair<MobEffect, Integer> pair6 = optional5.get();
+                if (!bec.abilities.instabuild) {
+                    bki4.shrink(1);
                 }
                 for (int integer6 = 0; integer6 < 4; ++integer6) {
-                    this.level.addParticle(ParticleTypes.EFFECT, this.getX() + this.random.nextFloat() / 2.0f, this.getY(0.5), this.getZ() + this.random.nextFloat() / 2.0f, 0.0, this.random.nextFloat() / 5.0f, 0.0);
+                    this.level.addParticle(ParticleTypes.EFFECT, this.getX() + this.random.nextDouble() / 2.0, this.getY(0.5), this.getZ() + this.random.nextDouble() / 2.0, 0.0, this.random.nextDouble() / 5.0, 0.0);
                 }
-                this.effect = (MobEffect)pair5.getLeft();
-                this.effectDuration = (int)pair5.getRight();
+                this.effect = (MobEffect)pair6.getLeft();
+                this.effectDuration = (int)pair6.getRight();
                 this.playSound(SoundEvents.MOOSHROOM_EAT, 2.0f, 1.0f);
             }
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        return super.mobInteract(ayj, ajk);
+        return super.mobInteract(bec, anf);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putString("Type", this.getMushroomType().type);
+    public void shear(final SoundSource acm) {
+        this.level.playSound(null, this, SoundEvents.MOOSHROOM_SHEAR, acm, 1.0f, 1.0f);
+        if (!this.level.isClientSide()) {
+            ((ServerLevel)this.level).<SimpleParticleType>sendParticles(ParticleTypes.EXPLOSION, this.getX(), this.getY(0.5), this.getZ(), 1, 0.0, 0.0, 0.0, 0.0);
+            this.remove();
+            final Cow ayp3 = EntityType.COW.create(this.level);
+            ayp3.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
+            ayp3.setHealth(this.getHealth());
+            ayp3.yBodyRot = this.yBodyRot;
+            if (this.hasCustomName()) {
+                ayp3.setCustomName(this.getCustomName());
+                ayp3.setCustomNameVisible(this.isCustomNameVisible());
+            }
+            if (this.isPersistenceRequired()) {
+                ayp3.setPersistenceRequired();
+            }
+            ayp3.setInvulnerable(this.isInvulnerable());
+            this.level.addFreshEntity(ayp3);
+            for (int integer4 = 0; integer4 < 5; ++integer4) {
+                this.level.addFreshEntity(new ItemEntity(this.level, this.getX(), this.getY(1.0), this.getZ(), new ItemStack(this.getMushroomType().blockState.getBlock())));
+            }
+        }
+    }
+    
+    @Override
+    public boolean readyForShearing() {
+        return this.isAlive() && !this.isBaby();
+    }
+    
+    @Override
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putString("Type", this.getMushroomType().type);
         if (this.effect != null) {
-            jt.putByte("EffectId", (byte)MobEffect.getId(this.effect));
-            jt.putInt("EffectDuration", this.effectDuration);
+            le.putByte("EffectId", (byte)MobEffect.getId(this.effect));
+            le.putInt("EffectDuration", this.effectDuration);
         }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setMushroomType(byType(jt.getString("Type")));
-        if (jt.contains("EffectId", 1)) {
-            this.effect = MobEffect.byId(jt.getByte("EffectId"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setMushroomType(byType(le.getString("Type")));
+        if (le.contains("EffectId", 1)) {
+            this.effect = MobEffect.byId(le.getByte("EffectId"));
         }
-        if (jt.contains("EffectDuration", 3)) {
-            this.effectDuration = jt.getInt("EffectDuration");
+        if (le.contains("EffectDuration", 3)) {
+            this.effectDuration = le.getInt("EffectDuration");
         }
     }
     
-    private Pair<MobEffect, Integer> getEffectFromItemStack(final ItemStack ben) {
-        final FlowerBlock brl3 = (FlowerBlock)((BlockItem)ben.getItem()).getBlock();
-        return (Pair<MobEffect, Integer>)Pair.of(brl3.getSuspiciousStewEffect(), brl3.getEffectDuration());
+    private Optional<Pair<MobEffect, Integer>> getEffectFromItemStack(final ItemStack bki) {
+        final Item bke3 = bki.getItem();
+        if (bke3 instanceof BlockItem) {
+            final Block bvr4 = ((BlockItem)bke3).getBlock();
+            if (bvr4 instanceof FlowerBlock) {
+                final FlowerBlock bxx5 = (FlowerBlock)bvr4;
+                return Optional.<Pair<MobEffect, Integer>>of(Pair.of(bxx5.getSuspiciousStewEffect(), bxx5.getEffectDuration()));
+            }
+        }
+        return Optional.<Pair<MobEffect, Integer>>empty();
     }
     
     private void setMushroomType(final MushroomType a) {
@@ -188,15 +217,15 @@ public class MushroomCow extends Cow {
     }
     
     @Override
-    public MushroomCow getBreedOffspring(final AgableMob ako) {
-        final MushroomCow atm3 = EntityType.MOOSHROOM.create(this.level);
-        atm3.setMushroomType(this.getOffspringType((MushroomCow)ako));
-        return atm3;
+    public MushroomCow getBreedOffspring(final AgableMob aok) {
+        final MushroomCow ayu3 = EntityType.MOOSHROOM.create(this.level);
+        ayu3.setMushroomType(this.getOffspringType((MushroomCow)aok));
+        return ayu3;
     }
     
-    private MushroomType getOffspringType(final MushroomCow atm) {
+    private MushroomType getOffspringType(final MushroomCow ayu) {
         final MushroomType a3 = this.getMushroomType();
-        final MushroomType a4 = atm.getMushroomType();
+        final MushroomType a4 = ayu.getMushroomType();
         MushroomType a5;
         if (a3 == a4 && this.random.nextInt(1024) == 0) {
             a5 = ((a3 == MushroomType.BROWN) ? MushroomType.RED : MushroomType.BROWN);
@@ -218,9 +247,9 @@ public class MushroomCow extends Cow {
         private final String type;
         private final BlockState blockState;
         
-        private MushroomType(final String string3, final BlockState byj) {
+        private MushroomType(final String string3, final BlockState cfj) {
             this.type = string3;
-            this.blockState = byj;
+            this.blockState = cfj;
         }
         
         public BlockState getBlockState() {
diff --git a/src/net/minecraft/world/entity/animal/Ocelot.java b/src/net/minecraft/world/entity/animal/Ocelot.java
index ff39046..aa1eb3f 100644
--- a/src/net/minecraft/world/entity/animal/Ocelot.java
+++ b/src/net/minecraft/world/entity/animal/Ocelot.java
@@ -7,10 +7,12 @@ import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.DifficultyInstance;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.LevelReader;
@@ -22,13 +24,15 @@ import net.minecraft.world.entity.AgableMob;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
 import javax.annotation.Nullable;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.LivingEntity;
@@ -54,8 +58,8 @@ public class Ocelot extends Animal {
     private OcelotAvoidEntityGoal<Player> ocelotAvoidPlayersGoal;
     private OcelotTemptGoal temptGoal;
     
-    public Ocelot(final EntityType<? extends Ocelot> aku, final Level bjw) {
-        super(aku, bjw);
+    public Ocelot(final EntityType<? extends Ocelot> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.reassessTrustingGoals();
     }
     
@@ -69,15 +73,15 @@ public class Ocelot extends Animal {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("Trusting", this.isTrusting());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("Trusting", this.isTrusting());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setTrusting(jt.getBoolean("Trusting"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setTrusting(le.getBoolean("Trusting"));
     }
     
     @Override
@@ -127,12 +131,8 @@ public class Ocelot extends Animal {
         return !this.isTrusting() && this.tickCount > 2400;
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(10.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.30000001192092896);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(3.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 10.0).add(Attributes.MOVEMENT_SPEED, 0.30000001192092896).add(Attributes.ATTACK_DAMAGE, 3.0);
     }
     
     @Override
@@ -152,7 +152,7 @@ public class Ocelot extends Animal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.OCELOT_HURT;
     }
     
@@ -162,24 +162,24 @@ public class Ocelot extends Animal {
     }
     
     private float getAttackDamage() {
-        return (float)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue();
+        return (float)this.getAttributeValue(Attributes.ATTACK_DAMAGE);
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        return akq.hurt(DamageSource.mobAttack(this), this.getAttackDamage());
+    public boolean doHurtTarget(final Entity aom) {
+        return aom.hurt(DamageSource.mobAttack(this), this.getAttackDamage());
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        return !this.isInvulnerableTo(ajz) && super.hurt(ajz, float2);
+    public boolean hurt(final DamageSource anw, final float float2) {
+        return !this.isInvulnerableTo(anw) && super.hurt(anw, float2);
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if ((this.temptGoal == null || this.temptGoal.isRunning()) && !this.isTrusting() && this.isFood(ben4) && ayj.distanceToSqr(this) < 9.0) {
-            this.usePlayerItem(ayj, ben4);
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if ((this.temptGoal == null || this.temptGoal.isRunning()) && !this.isTrusting() && this.isFood(bki4) && bec.distanceToSqr(this) < 9.0) {
+            this.usePlayerItem(bec, bki4);
             if (!this.level.isClientSide) {
                 if (this.random.nextInt(3) == 0) {
                     this.setTrusting(true);
@@ -191,9 +191,9 @@ public class Ocelot extends Animal {
                     this.level.broadcastEntityEvent(this, (byte)40);
                 }
             }
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        return super.mobInteract(ayj, ajk);
+        return super.mobInteract(bec, anf);
     }
     
     @Override
@@ -210,15 +210,15 @@ public class Ocelot extends Animal {
     }
     
     private void spawnTrustingParticles(final boolean boolean1) {
-        ParticleOptions gt3 = ParticleTypes.HEART;
+        ParticleOptions hf3 = ParticleTypes.HEART;
         if (!boolean1) {
-            gt3 = ParticleTypes.SMOKE;
+            hf3 = ParticleTypes.SMOKE;
         }
         for (int integer4 = 0; integer4 < 7; ++integer4) {
             final double double5 = this.random.nextGaussian() * 0.02;
             final double double6 = this.random.nextGaussian() * 0.02;
             final double double7 = this.random.nextGaussian() * 0.02;
-            this.level.addParticle(gt3, this.getRandomX(1.0), this.getRandomY() + 0.5, this.getRandomZ(1.0), double5, double6, double7);
+            this.level.addParticle(hf3, this.getRandomX(1.0), this.getRandomY() + 0.5, this.getRandomZ(1.0), double5, double6, double7);
         }
     }
     
@@ -233,29 +233,28 @@ public class Ocelot extends Animal {
     }
     
     @Override
-    public Ocelot getBreedOffspring(final AgableMob ako) {
+    public Ocelot getBreedOffspring(final AgableMob aok) {
         return EntityType.OCELOT.create(this.level);
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        return Ocelot.TEMPT_INGREDIENT.test(ben);
+    public boolean isFood(final ItemStack bki) {
+        return Ocelot.TEMPT_INGREDIENT.test(bki);
     }
     
-    public static boolean checkOcelotSpawnRules(final EntityType<Ocelot> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
+    public static boolean checkOcelotSpawnRules(final EntityType<Ocelot> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
         return random.nextInt(3) != 0;
     }
     
     @Override
-    public boolean checkSpawnObstruction(final LevelReader bjz) {
-        if (bjz.isUnobstructed(this) && !bjz.containsAnyLiquid(this.getBoundingBox())) {
-            final BlockPos fk3 = new BlockPos(this);
-            if (fk3.getY() < bjz.getSeaLevel()) {
+    public boolean checkSpawnObstruction(final LevelReader bqd) {
+        if (bqd.isUnobstructed(this) && !bqd.containsAnyLiquid(this.getBoundingBox())) {
+            final BlockPos fu3 = this.blockPosition();
+            if (fu3.getY() < bqd.getSeaLevel()) {
                 return false;
             }
-            final BlockState byj4 = bjz.getBlockState(fk3.below());
-            final Block bph5 = byj4.getBlock();
-            if (bph5 == Blocks.GRASS_BLOCK || byj4.is(BlockTags.LEAVES)) {
+            final BlockState cfj4 = bqd.getBlockState(fu3.below());
+            if (cfj4.is(Blocks.GRASS_BLOCK) || cfj4.is(BlockTags.LEAVES)) {
                 return true;
             }
         }
@@ -264,12 +263,17 @@ public class Ocelot extends Animal {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        if (alm == null) {
-            alm = new AgableMobGroupData();
-            ((AgableMobGroupData)alm).setBabySpawnChance(1.0f);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        if (apo == null) {
+            apo = new AgableMobGroupData();
+            ((AgableMobGroupData)apo).setBabySpawnChance(1.0f);
         }
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
+    }
+    
+    @Override
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, 0.5f * this.getEyeHeight(), this.getBbWidth() * 0.4f);
     }
     
     static {
@@ -280,9 +284,9 @@ public class Ocelot extends Animal {
     static class OcelotAvoidEntityGoal<T extends LivingEntity> extends AvoidEntityGoal<T> {
         private final Ocelot ocelot;
         
-        public OcelotAvoidEntityGoal(final Ocelot atn, final Class<T> class2, final float float3, final double double4, final double double5) {
-            super(atn, class2, float3, double4, double5, EntitySelector.NO_CREATIVE_OR_SPECTATOR::test);
-            this.ocelot = atn;
+        public OcelotAvoidEntityGoal(final Ocelot ayv, final Class<T> class2, final float float3, final double double4, final double double5) {
+            super(ayv, class2, float3, double4, double5, EntitySelector.NO_CREATIVE_OR_SPECTATOR::test);
+            this.ocelot = ayv;
         }
         
         @Override
@@ -299,9 +303,9 @@ public class Ocelot extends Animal {
     static class OcelotTemptGoal extends TemptGoal {
         private final Ocelot ocelot;
         
-        public OcelotTemptGoal(final Ocelot atn, final double double2, final Ingredient bgt, final boolean boolean4) {
-            super(atn, double2, bgt, boolean4);
-            this.ocelot = atn;
+        public OcelotTemptGoal(final Ocelot ayv, final double double2, final Ingredient bmr, final boolean boolean4) {
+            super(ayv, double2, bmr, boolean4);
+            this.ocelot = ayv;
         }
         
         @Override
diff --git a/src/net/minecraft/world/entity/animal/Panda.java b/src/net/minecraft/world/entity/animal/Panda.java
index 26d02f4..21fa761 100644
--- a/src/net/minecraft/world/entity/animal/Panda.java
+++ b/src/net/minecraft/world/entity/animal/Panda.java
@@ -20,7 +20,7 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
@@ -37,7 +37,8 @@ import net.minecraft.core.particles.ItemParticleOption;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal;
 import net.minecraft.world.entity.ai.goal.FollowParentGoal;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
@@ -86,8 +87,8 @@ public class Panda extends Animal {
     private PandaLookAtPlayerGoal lookAtPlayerGoal;
     private static final Predicate<ItemEntity> PANDA_ITEMS;
     
-    public Panda(final EntityType<? extends Panda> aku, final Level bjw) {
-        super(aku, bjw);
+    public Panda(final EntityType<? extends Panda> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.moveControl = new PandaMoveControl(this);
         if (!this.isBaby()) {
             this.setCanPickUpLoot(true);
@@ -95,9 +96,9 @@ public class Panda extends Animal {
     }
     
     @Override
-    public boolean canTakeItem(final ItemStack ben) {
-        final EquipmentSlot akv3 = Mob.getEquipmentSlotForItem(ben);
-        return this.getItemBySlot(akv3).isEmpty() && akv3 == EquipmentSlot.MAINHAND && super.canTakeItem(ben);
+    public boolean canTakeItem(final ItemStack bki) {
+        final EquipmentSlot aor3 = Mob.getEquipmentSlotForItem(bki);
+        return this.getItemBySlot(aor3).isEmpty() && aor3 == EquipmentSlot.MAINHAND && super.canTakeItem(bki);
     }
     
     public int getUnhappyCounter() {
@@ -215,28 +216,28 @@ public class Panda extends Animal {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putString("MainGene", this.getMainGene().getName());
-        jt.putString("HiddenGene", this.getHiddenGene().getName());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putString("MainGene", this.getMainGene().getName());
+        le.putString("HiddenGene", this.getHiddenGene().getName());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setMainGene(Gene.byName(jt.getString("MainGene")));
-        this.setHiddenGene(Gene.byName(jt.getString("HiddenGene")));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setMainGene(Gene.byName(le.getString("MainGene")));
+        this.setHiddenGene(Gene.byName(le.getString("HiddenGene")));
     }
     
     @Nullable
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
-        final Panda ato3 = EntityType.PANDA.create(this.level);
-        if (ako instanceof Panda) {
-            ato3.setGeneFromParents(this, (Panda)ako);
+    public AgableMob getBreedOffspring(final AgableMob aok) {
+        final Panda ayw3 = EntityType.PANDA.create(this.level);
+        if (aok instanceof Panda) {
+            ayw3.setGeneFromParents(this, (Panda)aok);
         }
-        ato3.setAttributes();
-        return ato3;
+        ayw3.setAttributes();
+        return ayw3;
     }
     
     @Override
@@ -260,11 +261,8 @@ public class Panda extends Animal {
         this.targetSelector.addGoal(1, new PandaHurtByTargetGoal(this, new Class[0]).setAlertOthers(new Class[0]));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.15000000596046448);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(6.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.15000000596046448).add(Attributes.ATTACK_DAMAGE, 6.0);
     }
     
     public Gene getVariant() {
@@ -293,17 +291,17 @@ public class Panda extends Animal {
     }
     
     @Override
-    public boolean canBeLeashed(final Player ayj) {
+    public boolean canBeLeashed(final Player bec) {
         return false;
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
+    public boolean doHurtTarget(final Entity aom) {
         this.playSound(SoundEvents.PANDA_BITE, 1.0f, 1.0f);
         if (!this.isAggressive()) {
             this.didBite = true;
         }
-        return super.doHurtTarget(akq);
+        return super.doHurtTarget(aom);
     }
     
     @Override
@@ -387,14 +385,14 @@ public class Panda extends Animal {
         if (this.getEatCounter() % 5 == 0) {
             this.playSound(SoundEvents.PANDA_EAT, 0.5f + 0.5f * this.random.nextInt(2), (this.random.nextFloat() - this.random.nextFloat()) * 0.2f + 1.0f);
             for (int integer2 = 0; integer2 < 6; ++integer2) {
-                Vec3 cvl3 = new Vec3((this.random.nextFloat() - 0.5) * 0.1, Math.random() * 0.1 + 0.1, (this.random.nextFloat() - 0.5) * 0.1);
-                cvl3 = cvl3.xRot(-this.xRot * 0.017453292f);
-                cvl3 = cvl3.yRot(-this.yRot * 0.017453292f);
+                Vec3 dem3 = new Vec3((this.random.nextFloat() - 0.5) * 0.1, Math.random() * 0.1 + 0.1, (this.random.nextFloat() - 0.5) * 0.1);
+                dem3 = dem3.xRot(-this.xRot * 0.017453292f);
+                dem3 = dem3.yRot(-this.yRot * 0.017453292f);
                 final double double4 = -this.random.nextFloat() * 0.6 - 0.3;
-                Vec3 cvl4 = new Vec3((this.random.nextFloat() - 0.5) * 0.8, double4, 1.0 + (this.random.nextFloat() - 0.5) * 0.4);
-                cvl4 = cvl4.yRot(-this.yBodyRot * 0.017453292f);
-                cvl4 = cvl4.add(this.getX(), this.getEyeY() + 1.0, this.getZ());
-                this.level.addParticle(new ItemParticleOption(ParticleTypes.ITEM, this.getItemBySlot(EquipmentSlot.MAINHAND)), cvl4.x, cvl4.y, cvl4.z, cvl3.x, cvl3.y + 0.05, cvl3.z);
+                Vec3 dem4 = new Vec3((this.random.nextFloat() - 0.5) * 0.8, double4, 1.0 + (this.random.nextFloat() - 0.5) * 0.4);
+                dem4 = dem4.yRot(-this.yBodyRot * 0.017453292f);
+                dem4 = dem4.add(this.getX(), this.getEyeY() + 1.0, this.getZ());
+                this.level.addParticle(new ItemParticleOption(ParticleTypes.ITEM, this.getItemBySlot(EquipmentSlot.MAINHAND)), dem4.x, dem4.y, dem4.z, dem3.x, dem3.y + 0.05, dem3.z);
             }
         }
     }
@@ -448,30 +446,30 @@ public class Panda extends Animal {
             return;
         }
         if (!this.level.isClientSide) {
-            final Vec3 cvl2 = this.getDeltaMovement();
+            final Vec3 dem2 = this.getDeltaMovement();
             if (this.rollCounter == 1) {
                 final float float3 = this.yRot * 0.017453292f;
                 final float float4 = this.isBaby() ? 0.1f : 0.2f;
-                this.rollDelta = new Vec3(cvl2.x + -Mth.sin(float3) * float4, 0.0, cvl2.z + Mth.cos(float3) * float4);
+                this.rollDelta = new Vec3(dem2.x + -Mth.sin(float3) * float4, 0.0, dem2.z + Mth.cos(float3) * float4);
                 this.setDeltaMovement(this.rollDelta.add(0.0, 0.27, 0.0));
             }
             else if (this.rollCounter == 7.0f || this.rollCounter == 15.0f || this.rollCounter == 23.0f) {
-                this.setDeltaMovement(0.0, this.onGround ? 0.27 : cvl2.y, 0.0);
+                this.setDeltaMovement(0.0, this.onGround ? 0.27 : dem2.y, 0.0);
             }
             else {
-                this.setDeltaMovement(this.rollDelta.x, cvl2.y, this.rollDelta.z);
+                this.setDeltaMovement(this.rollDelta.x, dem2.y, this.rollDelta.z);
             }
         }
     }
     
     private void afterSneeze() {
-        final Vec3 cvl2 = this.getDeltaMovement();
-        this.level.addParticle(ParticleTypes.SNEEZE, this.getX() - (this.getBbWidth() + 1.0f) * 0.5 * Mth.sin(this.yBodyRot * 0.017453292f), this.getEyeY() - 0.10000000149011612, this.getZ() + (this.getBbWidth() + 1.0f) * 0.5 * Mth.cos(this.yBodyRot * 0.017453292f), cvl2.x, 0.0, cvl2.z);
+        final Vec3 dem2 = this.getDeltaMovement();
+        this.level.addParticle(ParticleTypes.SNEEZE, this.getX() - (this.getBbWidth() + 1.0f) * 0.5 * Mth.sin(this.yBodyRot * 0.017453292f), this.getEyeY() - 0.10000000149011612, this.getZ() + (this.getBbWidth() + 1.0f) * 0.5 * Mth.cos(this.yBodyRot * 0.017453292f), dem2.x, 0.0, dem2.z);
         this.playSound(SoundEvents.PANDA_SNEEZE, 1.0f, 1.0f);
         final List<Panda> list3 = this.level.<Panda>getEntitiesOfClass(Panda.class, this.getBoundingBox().inflate(10.0));
-        for (final Panda ato5 : list3) {
-            if (!ato5.isBaby() && ato5.onGround && !ato5.isInWater() && ato5.canPerformAction()) {
-                ato5.jumpFromGround();
+        for (final Panda ayw5 : list3) {
+            if (!ayw5.isBaby() && ayw5.onGround && !ayw5.isInWater() && ayw5.canPerformAction()) {
+                ayw5.jumpFromGround();
             }
         }
         if (!this.level.isClientSide() && this.random.nextInt(700) == 0 && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@@ -480,53 +478,54 @@ public class Panda extends Animal {
     }
     
     @Override
-    protected void pickUpItem(final ItemEntity awb) {
-        if (this.getItemBySlot(EquipmentSlot.MAINHAND).isEmpty() && Panda.PANDA_ITEMS.test(awb)) {
-            final ItemStack ben3 = awb.getItem();
-            this.setItemSlot(EquipmentSlot.MAINHAND, ben3);
+    protected void pickUpItem(final ItemEntity bbg) {
+        if (this.getItemBySlot(EquipmentSlot.MAINHAND).isEmpty() && Panda.PANDA_ITEMS.test(bbg)) {
+            this.onItemPickup(bbg);
+            final ItemStack bki3 = bbg.getItem();
+            this.setItemSlot(EquipmentSlot.MAINHAND, bki3);
             this.handDropChances[EquipmentSlot.MAINHAND.getIndex()] = 2.0f;
-            this.take(awb, ben3.getCount());
-            awb.remove();
+            this.take(bbg, bki3.getCount());
+            bbg.remove();
         }
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         this.sit(false);
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
         this.setMainGene(Gene.getRandom(this.random));
         this.setHiddenGene(Gene.getRandom(this.random));
         this.setAttributes();
-        if (alm == null) {
-            alm = new AgableMobGroupData();
-            ((AgableMobGroupData)alm).setBabySpawnChance(0.2f);
+        if (apo == null) {
+            apo = new AgableMobGroupData();
+            ((AgableMobGroupData)apo).setBabySpawnChance(0.2f);
         }
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
-    public void setGeneFromParents(final Panda ato1, @Nullable final Panda ato2) {
-        if (ato2 == null) {
+    public void setGeneFromParents(final Panda ayw1, @Nullable final Panda ayw2) {
+        if (ayw2 == null) {
             if (this.random.nextBoolean()) {
-                this.setMainGene(ato1.getOneOfGenesRandomly());
+                this.setMainGene(ayw1.getOneOfGenesRandomly());
                 this.setHiddenGene(Gene.getRandom(this.random));
             }
             else {
                 this.setMainGene(Gene.getRandom(this.random));
-                this.setHiddenGene(ato1.getOneOfGenesRandomly());
+                this.setHiddenGene(ayw1.getOneOfGenesRandomly());
             }
         }
         else if (this.random.nextBoolean()) {
-            this.setMainGene(ato1.getOneOfGenesRandomly());
-            this.setHiddenGene(ato2.getOneOfGenesRandomly());
+            this.setMainGene(ayw1.getOneOfGenesRandomly());
+            this.setHiddenGene(ayw2.getOneOfGenesRandomly());
         }
         else {
-            this.setMainGene(ato2.getOneOfGenesRandomly());
-            this.setHiddenGene(ato1.getOneOfGenesRandomly());
+            this.setMainGene(ayw2.getOneOfGenesRandomly());
+            this.setHiddenGene(ayw1.getOneOfGenesRandomly());
         }
         if (this.random.nextInt(32) == 0) {
             this.setMainGene(Gene.getRandom(this.random));
@@ -545,10 +544,10 @@ public class Panda extends Animal {
     
     public void setAttributes() {
         if (this.isWeak()) {
-            this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(10.0);
+            this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(10.0);
         }
         if (this.isLazy()) {
-            this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.07000000029802322);
+            this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.07000000029802322);
         }
     }
     
@@ -561,47 +560,43 @@ public class Panda extends Animal {
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() instanceof SpawnEggItem) {
-            return super.mobInteract(ayj, ajk);
-        }
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
         if (this.isScared()) {
-            return false;
+            return InteractionResult.PASS;
         }
         if (this.isOnBack()) {
             this.setOnBack(false);
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        if (this.isFood(ben4)) {
+        if (this.isFood(bki4)) {
             if (this.getTarget() != null) {
                 this.gotBamboo = true;
             }
             if (this.isBaby()) {
-                this.usePlayerItem(ayj, ben4);
+                this.usePlayerItem(bec, bki4);
                 this.ageUp((int)(-this.getAge() / 20 * 0.1f), true);
             }
             else if (!this.level.isClientSide && this.getAge() == 0 && this.canFallInLove()) {
-                this.usePlayerItem(ayj, ben4);
-                this.setInLove(ayj);
+                this.usePlayerItem(bec, bki4);
+                this.setInLove(bec);
             }
             else {
                 if (this.level.isClientSide || this.isSitting() || this.isInWater()) {
-                    return false;
+                    return InteractionResult.PASS;
                 }
                 this.tryToSit();
                 this.eat(true);
-                final ItemStack ben5 = this.getItemBySlot(EquipmentSlot.MAINHAND);
-                if (!ben5.isEmpty() && !ayj.abilities.instabuild) {
-                    this.spawnAtLocation(ben5);
+                final ItemStack bki5 = this.getItemBySlot(EquipmentSlot.MAINHAND);
+                if (!bki5.isEmpty() && !bec.abilities.instabuild) {
+                    this.spawnAtLocation(bki5);
                 }
-                this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(ben4.getItem(), 1));
-                this.usePlayerItem(ayj, ben4);
+                this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(bki4.getItem(), 1));
+                this.usePlayerItem(bec, bki4);
             }
-            ayj.swing(ajk, true);
-            return true;
+            return InteractionResult.SUCCESS;
         }
-        return false;
+        return InteractionResult.PASS;
     }
     
     @Nullable
@@ -617,17 +612,17 @@ public class Panda extends Animal {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.PANDA_STEP, 0.15f, 1.0f);
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        return ben.getItem() == Blocks.BAMBOO.asItem();
+    public boolean isFood(final ItemStack bki) {
+        return bki.getItem() == Blocks.BAMBOO.asItem();
     }
     
-    private boolean isFoodOrCake(final ItemStack ben) {
-        return this.isFood(ben) || ben.getItem() == Blocks.CAKE.asItem();
+    private boolean isFoodOrCake(final ItemStack bki) {
+        return this.isFood(bki) || bki.getItem() == Blocks.CAKE.asItem();
     }
     
     @Nullable
@@ -638,7 +633,7 @@ public class Panda extends Animal {
     
     @Nullable
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.PANDA_HURT;
     }
     
@@ -654,10 +649,10 @@ public class Panda extends Animal {
         HIDDEN_GENE_ID = SynchedEntityData.<Byte>defineId(Panda.class, EntityDataSerializers.BYTE);
         DATA_ID_FLAGS = SynchedEntityData.<Byte>defineId(Panda.class, EntityDataSerializers.BYTE);
         BREED_TARGETING = new TargetingConditions().range(8.0).allowSameTeam().allowInvulnerable();
-        final Item bei2;
-        PANDA_ITEMS = (awb -> {
-            bei2 = awb.getItem().getItem();
-            return (bei2 == Blocks.BAMBOO.asItem() || bei2 == Blocks.CAKE.asItem()) && awb.isAlive() && !awb.hasPickUpDelay();
+        final Item bke2;
+        PANDA_ITEMS = (bbg -> {
+            bke2 = bbg.getItem().getItem();
+            return (bke2 == Blocks.BAMBOO.asItem() || bke2 == Blocks.CAKE.asItem()) && bbg.isAlive() && !bbg.hasPickUpDelay();
         });
     }
     
@@ -750,9 +745,9 @@ public class Panda extends Animal {
     static class PandaMoveControl extends MoveControl {
         private final Panda panda;
         
-        public PandaMoveControl(final Panda ato) {
-            super(ato);
-            this.panda = ato;
+        public PandaMoveControl(final Panda ayw) {
+            super(ayw);
+            this.panda = ayw;
         }
         
         @Override
@@ -767,9 +762,9 @@ public class Panda extends Animal {
     static class PandaAttackGoal extends MeleeAttackGoal {
         private final Panda panda;
         
-        public PandaAttackGoal(final Panda ato, final double double2, final boolean boolean3) {
-            super(ato, double2, boolean3);
-            this.panda = ato;
+        public PandaAttackGoal(final Panda ayw, final double double2, final boolean boolean3) {
+            super(ayw, double2, boolean3);
+            this.panda = ayw;
         }
         
         @Override
@@ -781,13 +776,13 @@ public class Panda extends Animal {
     static class PandaLookAtPlayerGoal extends LookAtPlayerGoal {
         private final Panda panda;
         
-        public PandaLookAtPlayerGoal(final Panda ato, final Class<? extends LivingEntity> class2, final float float3) {
-            super(ato, class2, float3);
-            this.panda = ato;
+        public PandaLookAtPlayerGoal(final Panda ayw, final Class<? extends LivingEntity> class2, final float float3) {
+            super(ayw, class2, float3);
+            this.panda = ayw;
         }
         
-        public void setTarget(final LivingEntity akz) {
-            this.lookAt = akz;
+        public void setTarget(final LivingEntity aoy) {
+            this.lookAt = aoy;
         }
         
         @Override
@@ -822,8 +817,8 @@ public class Panda extends Animal {
     static class PandaRollGoal extends Goal {
         private final Panda panda;
         
-        public PandaRollGoal(final Panda ato) {
-            this.panda = ato;
+        public PandaRollGoal(final Panda ayw) {
+            this.panda = ayw;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK, Flag.JUMP));
         }
         
@@ -846,7 +841,7 @@ public class Panda extends Animal {
             if (Math.abs(float4) > 0.5) {
                 integer4 += (int)(float4 / Math.abs(float4));
             }
-            return this.panda.level.getBlockState(new BlockPos(this.panda).offset(integer3, -1, integer4)).isAir() || (this.panda.isPlayful() && this.panda.random.nextInt(60) == 1) || this.panda.random.nextInt(500) == 1;
+            return this.panda.level.getBlockState(this.panda.blockPosition().offset(integer3, -1, integer4)).isAir() || (this.panda.isPlayful() && this.panda.random.nextInt(60) == 1) || this.panda.random.nextInt(500) == 1;
         }
         
         @Override
@@ -868,8 +863,8 @@ public class Panda extends Animal {
     static class PandaSneezeGoal extends Goal {
         private final Panda panda;
         
-        public PandaSneezeGoal(final Panda ato) {
-            this.panda = ato;
+        public PandaSneezeGoal(final Panda ayw) {
+            this.panda = ayw;
         }
         
         @Override
@@ -892,9 +887,9 @@ public class Panda extends Animal {
         private final Panda panda;
         private int unhappyCooldown;
         
-        public PandaBreedGoal(final Panda ato2, final double double3) {
-            super(ato2, double3);
-            this.panda = ato2;
+        public PandaBreedGoal(final Panda ayw2, final double double3) {
+            super(ayw2, double3);
+            this.panda = ayw2;
         }
         
         @Override
@@ -907,8 +902,8 @@ public class Panda extends Animal {
                     this.panda.setUnhappyCounter(32);
                     this.unhappyCooldown = this.panda.tickCount + 600;
                     if (this.panda.isEffectiveAi()) {
-                        final Player ayj2 = this.level.getNearestPlayer(Panda.BREED_TARGETING, this.panda);
-                        this.panda.lookAtPlayerGoal.setTarget(ayj2);
+                        final Player bec2 = this.level.getNearestPlayer(Panda.BREED_TARGETING, this.panda);
+                        this.panda.lookAtPlayerGoal.setTarget(bec2);
                     }
                 }
                 return false;
@@ -917,14 +912,14 @@ public class Panda extends Animal {
         }
         
         private boolean canFindBamboo() {
-            final BlockPos fk2 = new BlockPos(this.panda);
+            final BlockPos fu2 = this.panda.blockPosition();
             final BlockPos.MutableBlockPos a3 = new BlockPos.MutableBlockPos();
             for (int integer4 = 0; integer4 < 3; ++integer4) {
                 for (int integer5 = 0; integer5 < 8; ++integer5) {
                     for (int integer6 = 0; integer6 <= integer5; integer6 = ((integer6 > 0) ? (-integer6) : (1 - integer6))) {
                         for (int integer7 = (integer6 < integer5 && integer6 > -integer5) ? integer5 : 0; integer7 <= integer5; integer7 = ((integer7 > 0) ? (-integer7) : (1 - integer7))) {
-                            a3.set(fk2).move(integer6, integer4, integer7);
-                            if (this.level.getBlockState(a3).getBlock() == Blocks.BAMBOO) {
+                            a3.setWithOffset(fu2, integer6, integer4, integer7);
+                            if (this.level.getBlockState(a3).is(Blocks.BAMBOO)) {
                                 return true;
                             }
                         }
@@ -938,9 +933,9 @@ public class Panda extends Animal {
     static class PandaAvoidGoal<T extends LivingEntity> extends AvoidEntityGoal<T> {
         private final Panda panda;
         
-        public PandaAvoidGoal(final Panda ato, final Class<T> class2, final float float3, final double double4, final double double5) {
-            super(ato, class2, float3, double4, double5, EntitySelector.NO_SPECTATORS::test);
-            this.panda = ato;
+        public PandaAvoidGoal(final Panda ayw, final Class<T> class2, final float float3, final double double4, final double double5) {
+            super(ayw, class2, float3, double4, double5, EntitySelector.NO_SPECTATORS::test);
+            this.panda = ayw;
         }
         
         @Override
@@ -991,9 +986,9 @@ public class Panda extends Animal {
         
         @Override
         public void stop() {
-            final ItemStack ben2 = Panda.this.getItemBySlot(EquipmentSlot.MAINHAND);
-            if (!ben2.isEmpty()) {
-                Panda.this.spawnAtLocation(ben2);
+            final ItemStack bki2 = Panda.this.getItemBySlot(EquipmentSlot.MAINHAND);
+            if (!bki2.isEmpty()) {
+                Panda.this.spawnAtLocation(bki2);
                 Panda.this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
                 final int integer3 = Panda.this.isLazy() ? (Panda.this.random.nextInt(50) + 10) : (Panda.this.random.nextInt(150) + 10);
                 this.cooldown = Panda.this.tickCount + integer3 * 20;
@@ -1006,8 +1001,8 @@ public class Panda extends Animal {
         private final Panda panda;
         private int cooldown;
         
-        public PandaLieOnBackGoal(final Panda ato) {
-            this.panda = ato;
+        public PandaLieOnBackGoal(final Panda ayw) {
+            this.panda = ayw;
         }
         
         @Override
@@ -1036,9 +1031,9 @@ public class Panda extends Animal {
     static class PandaHurtByTargetGoal extends HurtByTargetGoal {
         private final Panda panda;
         
-        public PandaHurtByTargetGoal(final Panda ato, final Class<?>... arr) {
-            super(ato, arr);
-            this.panda = ato;
+        public PandaHurtByTargetGoal(final Panda ayw, final Class<?>... arr) {
+            super(ayw, arr);
+            this.panda = ayw;
         }
         
         @Override
@@ -1051,9 +1046,9 @@ public class Panda extends Animal {
         }
         
         @Override
-        protected void alertOther(final Mob ala, final LivingEntity akz) {
-            if (ala instanceof Panda && ((Panda)ala).isAggressive()) {
-                ala.setTarget(akz);
+        protected void alertOther(final Mob aoz, final LivingEntity aoy) {
+            if (aoz instanceof Panda && ((Panda)aoz).isAggressive()) {
+                aoz.setTarget(aoy);
             }
         }
     }
@@ -1061,9 +1056,9 @@ public class Panda extends Animal {
     static class PandaPanicGoal extends PanicGoal {
         private final Panda panda;
         
-        public PandaPanicGoal(final Panda ato, final double double2) {
-            super(ato, double2);
-            this.panda = ato;
+        public PandaPanicGoal(final Panda ayw, final double double2) {
+            super(ayw, double2);
+            this.panda = ayw;
         }
         
         @Override
@@ -1071,11 +1066,11 @@ public class Panda extends Animal {
             if (!this.panda.isOnFire()) {
                 return false;
             }
-            final BlockPos fk2 = this.lookForWater(this.mob.level, this.mob, 5, 4);
-            if (fk2 != null) {
-                this.posX = fk2.getX();
-                this.posY = fk2.getY();
-                this.posZ = fk2.getZ();
+            final BlockPos fu2 = this.lookForWater(this.mob.level, this.mob, 5, 4);
+            if (fu2 != null) {
+                this.posX = fu2.getX();
+                this.posY = fu2.getY();
+                this.posZ = fu2.getZ();
                 return true;
             }
             return this.findRandomPosition();
diff --git a/src/net/minecraft/world/entity/animal/Parrot.java b/src/net/minecraft/world/entity/animal/Parrot.java
index e3e1d06..32fb3ad 100644
--- a/src/net/minecraft/world/entity/animal/Parrot.java
+++ b/src/net/minecraft/world/entity/animal/Parrot.java
@@ -10,9 +10,10 @@ import net.minecraft.world.entity.monster.Blaze;
 import java.util.HashMap;
 import net.minecraft.sounds.SoundSource;
 import com.google.common.collect.Lists;
+import net.minecraft.world.Difficulty;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.LogBlock;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import java.util.Random;
 import net.minecraft.world.item.ItemStack;
@@ -20,23 +21,26 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import java.util.List;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.util.Mth;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.Position;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.ai.navigation.FlyingPathNavigation;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.FollowMobGoal;
 import net.minecraft.world.entity.ai.goal.LandOnOwnersShoulderGoal;
 import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomFlyingGoal;
 import net.minecraft.world.entity.ai.goal.FollowOwnerGoal;
+import net.minecraft.world.entity.TamableAnimal;
+import net.minecraft.world.entity.ai.goal.SitWhenOrderedToGoal;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
 import net.minecraft.world.entity.player.Player;
@@ -44,8 +48,6 @@ import net.minecraft.world.entity.ai.goal.FloatGoal;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.ai.goal.PanicGoal;
-import net.minecraft.world.entity.TamableAnimal;
-import net.minecraft.world.entity.ai.goal.SitGoal;
 import net.minecraft.world.entity.AgableMob;
 import net.minecraft.nbt.CompoundTag;
 import javax.annotation.Nullable;
@@ -80,8 +82,8 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
     private boolean partyParrot;
     private BlockPos jukebox;
     
-    public Parrot(final EntityType<? extends Parrot> aku, final Level bjw) {
-        super(aku, bjw);
+    public Parrot(final EntityType<? extends Parrot> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.flapping = 1.0f;
         this.moveControl = new FlyingMoveControl(this, 10, false);
         this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, -1.0f);
@@ -91,65 +93,66 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
         this.setVariant(this.random.nextInt(5));
-        if (alm == null) {
-            alm = new AgableMobGroupData();
-            ((AgableMobGroupData)alm).setShouldSpawnBaby(false);
+        if (apo == null) {
+            apo = new AgableMobGroupData();
+            ((AgableMobGroupData)apo).setShouldSpawnBaby(false);
         }
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
+    }
+    
+    @Override
+    public boolean isBaby() {
+        return false;
     }
     
     @Override
     protected void registerGoals() {
-        this.sitGoal = new SitGoal(this);
         this.goalSelector.addGoal(0, new PanicGoal(this, 1.25));
         this.goalSelector.addGoal(0, new FloatGoal(this));
         this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 8.0f));
-        this.goalSelector.addGoal(2, this.sitGoal);
+        this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this));
         this.goalSelector.addGoal(2, new FollowOwnerGoal(this, 1.0, 5.0f, 1.0f, true));
         this.goalSelector.addGoal(2, new WaterAvoidingRandomFlyingGoal(this, 1.0));
         this.goalSelector.addGoal(3, new LandOnOwnersShoulderGoal(this));
         this.goalSelector.addGoal(3, new FollowMobGoal(this, 1.0, 3.0f, 7.0f));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.FLYING_SPEED);
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(6.0);
-        this.getAttribute(SharedMonsterAttributes.FLYING_SPEED).setBaseValue(0.4000000059604645);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.20000000298023224);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 6.0).add(Attributes.FLYING_SPEED, 0.4000000059604645).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224);
     }
     
     @Override
-    protected PathNavigation createNavigation(final Level bjw) {
-        final FlyingPathNavigation arp3 = new FlyingPathNavigation(this, bjw);
-        arp3.setCanOpenDoors(false);
-        arp3.setCanFloat(true);
-        arp3.setCanPassDoors(true);
-        return arp3;
+    protected PathNavigation createNavigation(final Level bqb) {
+        final FlyingPathNavigation awt3 = new FlyingPathNavigation(this, bqb);
+        awt3.setCanOpenDoors(false);
+        awt3.setCanFloat(true);
+        awt3.setCanPassDoors(true);
+        return awt3;
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height * 0.6f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height * 0.6f;
     }
     
     @Override
     public void aiStep() {
-        imitateNearbyMobs(this.level, this);
-        if (this.jukebox == null || !this.jukebox.closerThan(this.position(), 3.46) || this.level.getBlockState(this.jukebox).getBlock() != Blocks.JUKEBOX) {
+        if (this.jukebox == null || !this.jukebox.closerThan(this.position(), 3.46) || !this.level.getBlockState(this.jukebox).is(Blocks.JUKEBOX)) {
             this.partyParrot = false;
             this.jukebox = null;
         }
+        if (this.level.random.nextInt(400) == 0) {
+            imitateNearbyMobs(this.level, this);
+        }
         super.aiStep();
         this.calculateFlapping();
     }
     
     @Override
-    public void setRecordPlayingNearby(final BlockPos fk, final boolean boolean2) {
-        this.jukebox = fk;
+    public void setRecordPlayingNearby(final BlockPos fu, final boolean boolean2) {
+        this.jukebox = fu;
         this.partyParrot = boolean2;
     }
     
@@ -166,23 +169,23 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
             this.flapping = 1.0f;
         }
         this.flapping *= (float)0.9;
-        final Vec3 cvl2 = this.getDeltaMovement();
-        if (!this.onGround && cvl2.y < 0.0) {
-            this.setDeltaMovement(cvl2.multiply(1.0, 0.6, 1.0));
+        final Vec3 dem2 = this.getDeltaMovement();
+        if (!this.onGround && dem2.y < 0.0) {
+            this.setDeltaMovement(dem2.multiply(1.0, 0.6, 1.0));
         }
         this.flap += this.flapping * 2.0f;
     }
     
-    private static boolean imitateNearbyMobs(final Level bjw, final Entity akq) {
-        if (!akq.isAlive() || akq.isSilent() || bjw.random.nextInt(50) != 0) {
+    public static boolean imitateNearbyMobs(final Level bqb, final Entity aom) {
+        if (!aom.isAlive() || aom.isSilent() || bqb.random.nextInt(2) != 0) {
             return false;
         }
-        final List<Mob> list3 = bjw.<Mob>getEntitiesOfClass(Mob.class, akq.getBoundingBox().inflate(20.0), Parrot.NOT_PARROT_PREDICATE);
+        final List<Mob> list3 = bqb.<Mob>getEntitiesOfClass(Mob.class, aom.getBoundingBox().inflate(20.0), Parrot.NOT_PARROT_PREDICATE);
         if (!list3.isEmpty()) {
-            final Mob ala4 = list3.get(bjw.random.nextInt(list3.size()));
-            if (!ala4.isSilent()) {
-                final SoundEvent aah5 = getImitatedSound(ala4.getType());
-                bjw.playSound(null, akq.getX(), akq.getY(), akq.getZ(), aah5, akq.getSoundSource(), 0.7f, getPitch(bjw.random));
+            final Mob aoz4 = list3.get(bqb.random.nextInt(list3.size()));
+            if (!aoz4.isSilent()) {
+                final SoundEvent ack5 = getImitatedSound(aoz4.getType());
+                bqb.playSound(null, aom.getX(), aom.getY(), aom.getZ(), ack5, aom.getSoundSource(), 0.7f, getPitch(bqb.random));
                 return true;
             }
         }
@@ -190,56 +193,53 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() instanceof SpawnEggItem) {
-            return super.mobInteract(ayj, ajk);
-        }
-        if (!this.isTame() && Parrot.TAME_FOOD.contains(ben4.getItem())) {
-            if (!ayj.abilities.instabuild) {
-                ben4.shrink(1);
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (!this.isTame() && Parrot.TAME_FOOD.contains(bki4.getItem())) {
+            if (!bec.abilities.instabuild) {
+                bki4.shrink(1);
             }
             if (!this.isSilent()) {
                 this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.PARROT_EAT, this.getSoundSource(), 1.0f, 1.0f + (this.random.nextFloat() - this.random.nextFloat()) * 0.2f);
             }
             if (!this.level.isClientSide) {
                 if (this.random.nextInt(10) == 0) {
-                    this.tame(ayj);
+                    this.tame(bec);
                     this.level.broadcastEntityEvent(this, (byte)7);
                 }
                 else {
                     this.level.broadcastEntityEvent(this, (byte)6);
                 }
             }
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        if (ben4.getItem() == Parrot.POISONOUS_FOOD) {
-            if (!ayj.abilities.instabuild) {
-                ben4.shrink(1);
+        if (bki4.getItem() == Parrot.POISONOUS_FOOD) {
+            if (!bec.abilities.instabuild) {
+                bki4.shrink(1);
             }
             this.addEffect(new MobEffectInstance(MobEffects.POISON, 900));
-            if (ayj.isCreative() || !this.isInvulnerable()) {
-                this.hurt(DamageSource.playerAttack(ayj), Float.MAX_VALUE);
+            if (bec.isCreative() || !this.isInvulnerable()) {
+                this.hurt(DamageSource.playerAttack(bec), Float.MAX_VALUE);
             }
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        if (!this.isFlying() && this.isTame() && this.isOwnedBy(ayj)) {
+        if (!this.isFlying() && this.isTame() && this.isOwnedBy(bec)) {
             if (!this.level.isClientSide) {
-                this.sitGoal.wantToSit(!this.isSitting());
+                this.setOrderedToSit(!this.isOrderedToSit());
             }
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        return super.mobInteract(ayj, ajk);
+        return super.mobInteract(bec, anf);
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
+    public boolean isFood(final ItemStack bki) {
         return false;
     }
     
-    public static boolean checkParrotSpawnRules(final EntityType<Parrot> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        final Block bph6 = bjx.getBlockState(fk.below()).getBlock();
-        return (bph6.is(BlockTags.LEAVES) || bph6 == Blocks.GRASS_BLOCK || bph6 instanceof LogBlock || bph6 == Blocks.AIR) && bjx.getRawBrightness(fk, 0) > 8;
+    public static boolean checkParrotSpawnRules(final EntityType<Parrot> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        final BlockState cfj6 = bqc.getBlockState(fu.below());
+        return (cfj6.is(BlockTags.LEAVES) || cfj6.is(Blocks.GRASS_BLOCK) || cfj6.is(BlockTags.LOGS) || cfj6.is(Blocks.AIR)) && bqc.getRawBrightness(fu, 0) > 8;
     }
     
     @Override
@@ -248,50 +248,44 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
     }
     
     @Override
-    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState byj, final BlockPos fk) {
+    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState cfj, final BlockPos fu) {
     }
     
     @Override
-    public boolean canMate(final Animal atc) {
+    public boolean canMate(final Animal ayk) {
         return false;
     }
     
     @Nullable
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
+    public AgableMob getBreedOffspring(final AgableMob aok) {
         return null;
     }
     
-    public static void playAmbientSound(final Level bjw, final Entity akq) {
-        if (!akq.isSilent() && !imitateNearbyMobs(bjw, akq) && bjw.random.nextInt(200) == 0) {
-            bjw.playSound(null, akq.getX(), akq.getY(), akq.getZ(), getAmbient(bjw.random), akq.getSoundSource(), 1.0f, getPitch(bjw.random));
-        }
-    }
-    
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        return akq.hurt(DamageSource.mobAttack(this), 3.0f);
+    public boolean doHurtTarget(final Entity aom) {
+        return aom.hurt(DamageSource.mobAttack(this), 3.0f);
     }
     
     @Nullable
     public SoundEvent getAmbientSound() {
-        return getAmbient(this.random);
+        return getAmbient(this.level, this.level.random);
     }
     
-    private static SoundEvent getAmbient(final Random random) {
-        if (random.nextInt(1000) == 0) {
-            final List<EntityType<?>> list2 = Lists.newArrayList(Parrot.MOB_SOUND_MAP.keySet());
-            return getImitatedSound(list2.get(random.nextInt(list2.size())));
+    public static SoundEvent getAmbient(final Level bqb, final Random random) {
+        if (bqb.getDifficulty() != Difficulty.PEACEFUL && random.nextInt(1000) == 0) {
+            final List<EntityType<?>> list3 = Lists.newArrayList(Parrot.MOB_SOUND_MAP.keySet());
+            return getImitatedSound(list3.get(random.nextInt(list3.size())));
         }
         return SoundEvents.PARROT_AMBIENT;
     }
     
-    private static SoundEvent getImitatedSound(final EntityType<?> aku) {
-        return Parrot.MOB_SOUND_MAP.getOrDefault(aku, SoundEvents.PARROT_AMBIENT);
+    private static SoundEvent getImitatedSound(final EntityType<?> aoq) {
+        return Parrot.MOB_SOUND_MAP.getOrDefault(aoq, SoundEvents.PARROT_AMBIENT);
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.PARROT_HURT;
     }
     
@@ -301,7 +295,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.PARROT_STEP, 0.15f, 1.0f);
     }
     
@@ -321,7 +315,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
         return getPitch(this.random);
     }
     
-    private static float getPitch(final Random random) {
+    public static float getPitch(final Random random) {
         return (random.nextFloat() - random.nextFloat()) * 0.2f + 1.0f;
     }
     
@@ -336,22 +330,20 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
     }
     
     @Override
-    protected void doPush(final Entity akq) {
-        if (akq instanceof Player) {
+    protected void doPush(final Entity aom) {
+        if (aom instanceof Player) {
             return;
         }
-        super.doPush(akq);
+        super.doPush(aom);
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        if (this.sitGoal != null) {
-            this.sitGoal.wantToSit(false);
-        }
-        return super.hurt(ajz, float2);
+        this.setOrderedToSit(false);
+        return super.hurt(anw, float2);
     }
     
     public int getVariant() {
@@ -369,27 +361,32 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("Variant", this.getVariant());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Variant", this.getVariant());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setVariant(jt.getInt("Variant"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setVariant(le.getInt("Variant"));
     }
     
     public boolean isFlying() {
         return !this.onGround;
     }
     
+    @Override
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, 0.5f * this.getEyeHeight(), this.getBbWidth() * 0.4f);
+    }
+    
     static {
         DATA_VARIANT_ID = SynchedEntityData.<Integer>defineId(Parrot.class, EntityDataSerializers.INT);
         NOT_PARROT_PREDICATE = new Predicate<Mob>() {
             @Override
-            public boolean test(@Nullable final Mob ala) {
-                return ala != null && Parrot.MOB_SOUND_MAP.containsKey(ala.getType());
+            public boolean test(@Nullable final Mob aoz) {
+                return aoz != null && Parrot.MOB_SOUND_MAP.containsKey(aoz.getType());
             }
         };
         POISONOUS_FOOD = Items.COOKIE;
@@ -405,10 +402,12 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
             hashMap.put((EntityType<Blaze>)EntityType.EVOKER, SoundEvents.PARROT_IMITATE_EVOKER);
             hashMap.put((EntityType<Blaze>)EntityType.GHAST, SoundEvents.PARROT_IMITATE_GHAST);
             hashMap.put((EntityType<Blaze>)EntityType.GUARDIAN, SoundEvents.PARROT_IMITATE_GUARDIAN);
+            hashMap.put((EntityType<Blaze>)EntityType.HOGLIN, SoundEvents.PARROT_IMITATE_HOGLIN);
             hashMap.put((EntityType<Blaze>)EntityType.HUSK, SoundEvents.PARROT_IMITATE_HUSK);
             hashMap.put((EntityType<Blaze>)EntityType.ILLUSIONER, SoundEvents.PARROT_IMITATE_ILLUSIONER);
             hashMap.put((EntityType<Blaze>)EntityType.MAGMA_CUBE, SoundEvents.PARROT_IMITATE_MAGMA_CUBE);
             hashMap.put((EntityType<Blaze>)EntityType.PHANTOM, SoundEvents.PARROT_IMITATE_PHANTOM);
+            hashMap.put((EntityType<Blaze>)EntityType.PIGLIN, SoundEvents.PARROT_IMITATE_PIGLIN);
             hashMap.put((EntityType<Blaze>)EntityType.PILLAGER, SoundEvents.PARROT_IMITATE_PILLAGER);
             hashMap.put((EntityType<Blaze>)EntityType.RAVAGER, SoundEvents.PARROT_IMITATE_RAVAGER);
             hashMap.put((EntityType<Blaze>)EntityType.SHULKER, SoundEvents.PARROT_IMITATE_SHULKER);
@@ -422,6 +421,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
             hashMap.put((EntityType<Blaze>)EntityType.WITCH, SoundEvents.PARROT_IMITATE_WITCH);
             hashMap.put((EntityType<Blaze>)EntityType.WITHER, SoundEvents.PARROT_IMITATE_WITHER);
             hashMap.put((EntityType<Blaze>)EntityType.WITHER_SKELETON, SoundEvents.PARROT_IMITATE_WITHER_SKELETON);
+            hashMap.put((EntityType<Blaze>)EntityType.ZOGLIN, SoundEvents.PARROT_IMITATE_ZOGLIN);
             hashMap.put((EntityType<Blaze>)EntityType.ZOMBIE, SoundEvents.PARROT_IMITATE_ZOMBIE);
             hashMap.put((EntityType<Blaze>)EntityType.ZOMBIE_VILLAGER, SoundEvents.PARROT_IMITATE_ZOMBIE_VILLAGER);
         });
diff --git a/src/net/minecraft/world/entity/animal/Pig.java b/src/net/minecraft/world/entity/animal/Pig.java
index 7ce95d3..412db4c 100644
--- a/src/net/minecraft/world/entity/animal/Pig.java
+++ b/src/net/minecraft/world/entity/animal/Pig.java
@@ -3,12 +3,20 @@ package net.minecraft.world.entity.animal;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.world.entity.AgableMob;
-import net.minecraft.util.Mth;
-import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.monster.PigZombie;
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.world.entity.monster.ZombifiedPiglin;
+import net.minecraft.world.Difficulty;
+import net.minecraft.world.entity.LightningBolt;
+import net.minecraft.world.phys.AABB;
+import com.google.common.collect.UnmodifiableIterator;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.entity.Pose;
+import net.minecraft.world.entity.vehicle.DismountHelper;
+import net.minecraft.core.Direction;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
@@ -18,7 +26,8 @@ import net.minecraft.sounds.SoundEvent;
 import net.minecraft.nbt.CompoundTag;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
@@ -36,19 +45,21 @@ import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.goal.FloatGoal;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.ItemBasedSteering;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.Saddleable;
+import net.minecraft.world.entity.ItemSteerable;
 
-public class Pig extends Animal {
+public class Pig extends Animal implements ItemSteerable, Saddleable {
     private static final EntityDataAccessor<Boolean> DATA_SADDLE_ID;
     private static final EntityDataAccessor<Integer> DATA_BOOST_TIME;
     private static final Ingredient FOOD_ITEMS;
-    private boolean boosting;
-    private int boostTime;
-    private int boostTimeTotal;
+    private final ItemBasedSteering steering;
     
-    public Pig(final EntityType<? extends Pig> aku, final Level bjw) {
-        super(aku, bjw);
+    public Pig(final EntityType<? extends Pig> aoq, final Level bqb) {
+        super(aoq, bqb);
+        this.steering = new ItemBasedSteering(this.entityData, Pig.DATA_BOOST_TIME, Pig.DATA_SADDLE_ID);
     }
     
     @Override
@@ -64,11 +75,8 @@ public class Pig extends Animal {
         this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(10.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 10.0).add(Attributes.MOVEMENT_SPEED, 0.25);
     }
     
     @Nullable
@@ -82,22 +90,20 @@ public class Pig extends Animal {
     
     @Override
     public boolean canBeControlledByRider() {
-        final Entity akq2 = this.getControllingPassenger();
-        if (!(akq2 instanceof Player)) {
+        final Entity aom2 = this.getControllingPassenger();
+        if (!(aom2 instanceof Player)) {
             return false;
         }
-        final Player ayj3 = (Player)akq2;
-        return ayj3.getMainHandItem().getItem() == Items.CARROT_ON_A_STICK || ayj3.getOffhandItem().getItem() == Items.CARROT_ON_A_STICK;
+        final Player bec3 = (Player)aom2;
+        return bec3.getMainHandItem().getItem() == Items.CARROT_ON_A_STICK || bec3.getOffhandItem().getItem() == Items.CARROT_ON_A_STICK;
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (Pig.DATA_BOOST_TIME.equals(sb) && this.level.isClientSide) {
-            this.boosting = true;
-            this.boostTime = 0;
-            this.boostTimeTotal = this.entityData.<Integer>get(Pig.DATA_BOOST_TIME);
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (Pig.DATA_BOOST_TIME.equals(tq) && this.level.isClientSide) {
+            this.steering.onSynced();
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     @Override
@@ -108,15 +114,15 @@ public class Pig extends Animal {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("Saddle", this.hasSaddle());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        this.steering.addAdditionalSaveData(le);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setSaddle(jt.getBoolean("Saddle"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.steering.readAdditionalSaveData(le);
     }
     
     @Override
@@ -125,7 +131,7 @@ public class Pig extends Animal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.PIG_HURT;
     }
     
@@ -135,129 +141,136 @@ public class Pig extends Animal {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.PIG_STEP, 0.15f, 1.0f);
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        if (super.mobInteract(ayj, ajk)) {
-            return true;
-        }
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() == Items.NAME_TAG) {
-            ben4.interactEnemy(ayj, this, ajk);
-            return true;
-        }
-        if (this.hasSaddle() && !this.isVehicle()) {
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final boolean boolean4 = this.isFood(bec.getItemInHand(anf));
+        if (!boolean4 && this.isSaddled() && !this.isVehicle()) {
             if (!this.level.isClientSide) {
-                ayj.startRiding(this);
+                bec.startRiding(this);
             }
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        return ben4.getItem() == Items.SADDLE && ben4.interactEnemy(ayj, this, ajk);
+        final InteractionResult ang5 = super.mobInteract(bec, anf);
+        if (ang5.consumesAction()) {
+            return ang5;
+        }
+        final ItemStack bki6 = bec.getItemInHand(anf);
+        if (bki6.getItem() == Items.SADDLE) {
+            return bki6.interactLivingEntity(bec, this, anf);
+        }
+        return InteractionResult.PASS;
+    }
+    
+    @Override
+    public boolean isSaddleable() {
+        return this.isAlive() && !this.isBaby();
     }
     
     @Override
     protected void dropEquipment() {
         super.dropEquipment();
-        if (this.hasSaddle()) {
+        if (this.isSaddled()) {
             this.spawnAtLocation(Items.SADDLE);
         }
     }
     
-    public boolean hasSaddle() {
-        return this.entityData.<Boolean>get(Pig.DATA_SADDLE_ID);
+    @Override
+    public boolean isSaddled() {
+        return this.steering.hasSaddle();
     }
     
-    public void setSaddle(final boolean boolean1) {
-        if (boolean1) {
-            this.entityData.<Boolean>set(Pig.DATA_SADDLE_ID, true);
-        }
-        else {
-            this.entityData.<Boolean>set(Pig.DATA_SADDLE_ID, false);
+    @Override
+    public void equipSaddle(@Nullable final SoundSource acm) {
+        this.steering.setSaddle(true);
+        if (acm != null) {
+            this.level.playSound(null, this, SoundEvents.PIG_SADDLE, acm, 0.5f, 1.0f);
         }
     }
     
     @Override
-    public void thunderHit(final LightningBolt avy) {
-        final PigZombie awz3 = EntityType.ZOMBIE_PIGMAN.create(this.level);
-        awz3.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.GOLDEN_SWORD));
-        awz3.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
-        awz3.setNoAi(this.isNoAi());
-        if (this.hasCustomName()) {
-            awz3.setCustomName(this.getCustomName());
-            awz3.setCustomNameVisible(this.isCustomNameVisible());
+    public Vec3 getDismountLocationForPassenger(final LivingEntity aoy) {
+        final Direction fz3 = this.getMotionDirection();
+        if (fz3.getAxis() == Direction.Axis.Y) {
+            return super.getDismountLocationForPassenger(aoy);
         }
-        this.level.addFreshEntity(awz3);
-        this.remove();
-    }
-    
-    @Override
-    public void travel(final Vec3 cvl) {
-        if (!this.isAlive()) {
-            return;
-        }
-        final Entity akq3 = this.getPassengers().isEmpty() ? null : this.getPassengers().get(0);
-        if (!this.isVehicle() || !this.canBeControlledByRider()) {
-            this.maxUpStep = 0.5f;
-            this.flyingSpeed = 0.02f;
-            super.travel(cvl);
-            return;
-        }
-        this.yRot = akq3.yRot;
-        this.yRotO = this.yRot;
-        this.xRot = akq3.xRot * 0.5f;
-        this.setRot(this.yRot, this.xRot);
-        this.yBodyRot = this.yRot;
-        this.yHeadRot = this.yRot;
-        this.maxUpStep = 1.0f;
-        this.flyingSpeed = this.getSpeed() * 0.1f;
-        if (this.boosting && this.boostTime++ > this.boostTimeTotal) {
-            this.boosting = false;
-        }
-        if (this.isControlledByLocalInstance()) {
-            float float4 = (float)this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue() * 0.225f;
-            if (this.boosting) {
-                float4 += float4 * 1.15f * Mth.sin(this.boostTime / (float)this.boostTimeTotal * 3.1415927f);
+        final int[][] arr4 = DismountHelper.offsetsForDirection(fz3);
+        final BlockPos fu5 = this.blockPosition();
+        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
+        for (final Pose apj8 : aoy.getDismountPoses()) {
+            final AABB deg9 = aoy.getLocalBoundsForPose(apj8);
+            for (final int[] arr5 : arr4) {
+                a6.set(fu5.getX() + arr5[0], fu5.getY(), fu5.getZ() + arr5[1]);
+                final double double14 = this.level.getRelativeFloorHeight(a6);
+                if (DismountHelper.isFloorValid(double14)) {
+                    final Vec3 dem16 = Vec3.upFromBottomCenterOf(a6, double14);
+                    if (DismountHelper.canDismountTo(this.level, aoy, deg9.move(dem16))) {
+                        aoy.setPose(apj8);
+                        return dem16;
+                    }
+                }
             }
-            this.setSpeed(float4);
-            super.travel(new Vec3(0.0, 0.0, 1.0));
-            this.lerpSteps = 0;
         }
-        else {
-            this.setDeltaMovement(Vec3.ZERO);
-        }
-        this.animationSpeedOld = this.animationSpeed;
-        final double double4 = this.getX() - this.xo;
-        final double double5 = this.getZ() - this.zo;
-        float float5 = Mth.sqrt(double4 * double4 + double5 * double5) * 4.0f;
-        if (float5 > 1.0f) {
-            float5 = 1.0f;
-        }
-        this.animationSpeed += (float5 - this.animationSpeed) * 0.4f;
-        this.animationPosition += this.animationSpeed;
-    }
-    
-    public boolean boost() {
-        if (this.boosting) {
-            return false;
-        }
-        this.boosting = true;
-        this.boostTime = 0;
-        this.boostTimeTotal = this.getRandom().nextInt(841) + 140;
-        this.getEntityData().<Integer>set(Pig.DATA_BOOST_TIME, this.boostTimeTotal);
-        return true;
+        return super.getDismountLocationForPassenger(aoy);
     }
     
     @Override
-    public Pig getBreedOffspring(final AgableMob ako) {
+    public void thunderHit(final LightningBolt aox) {
+        if (this.level.getDifficulty() != Difficulty.PEACEFUL) {
+            final ZombifiedPiglin bcw3 = EntityType.ZOMBIFIED_PIGLIN.create(this.level);
+            bcw3.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.GOLDEN_SWORD));
+            bcw3.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
+            bcw3.setNoAi(this.isNoAi());
+            bcw3.setBaby(this.isBaby());
+            if (this.hasCustomName()) {
+                bcw3.setCustomName(this.getCustomName());
+                bcw3.setCustomNameVisible(this.isCustomNameVisible());
+            }
+            bcw3.setPersistenceRequired();
+            this.level.addFreshEntity(bcw3);
+            this.remove();
+        }
+        else {
+            super.thunderHit(aox);
+        }
+    }
+    
+    @Override
+    public void travel(final Vec3 dem) {
+        this.travel(this, this.steering, dem);
+    }
+    
+    @Override
+    public float getSteeringSpeed() {
+        return (float)this.getAttributeValue(Attributes.MOVEMENT_SPEED) * 0.225f;
+    }
+    
+    @Override
+    public void travelWithInput(final Vec3 dem) {
+        super.travel(dem);
+    }
+    
+    @Override
+    public boolean boost() {
+        return this.steering.boost(this.getRandom());
+    }
+    
+    @Override
+    public Pig getBreedOffspring(final AgableMob aok) {
         return EntityType.PIG.create(this.level);
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        return Pig.FOOD_ITEMS.test(ben);
+    public boolean isFood(final ItemStack bki) {
+        return Pig.FOOD_ITEMS.test(bki);
+    }
+    
+    @Override
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, 0.6f * this.getEyeHeight(), this.getBbWidth() * 0.4f);
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/animal/PolarBear.java b/src/net/minecraft/world/entity/animal/PolarBear.java
index 03f1a1a..28c644e 100644
--- a/src/net/minecraft/world/entity/animal/PolarBear.java
+++ b/src/net/minecraft/world/entity/animal/PolarBear.java
@@ -5,10 +5,9 @@ import net.minecraft.world.entity.ai.goal.MeleeAttackGoal;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
+import net.minecraft.util.TimeUtil;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
-import net.minecraft.nbt.CompoundTag;
-import javax.annotation.Nullable;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.DifficultyInstance;
 import net.minecraft.world.entity.Entity;
@@ -19,6 +18,9 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
+import javax.annotation.Nullable;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.biome.Biomes;
@@ -26,7 +28,9 @@ import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.entity.ai.goal.target.ResetUniversalAngerTargetGoal;
 import java.util.function.Predicate;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
@@ -43,25 +47,31 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.AgableMob;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
+import java.util.UUID;
+import net.minecraft.util.IntRange;
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.NeutralMob;
 
-public class PolarBear extends Animal {
+public class PolarBear extends Animal implements NeutralMob {
     private static final EntityDataAccessor<Boolean> DATA_STANDING_ID;
     private float clientSideStandAnimationO;
     private float clientSideStandAnimation;
     private int warningSoundTicks;
+    private static final IntRange PERSISTENT_ANGER_TIME;
+    private int remainingPersistentAngerTime;
+    private UUID persistentAngerTarget;
     
-    public PolarBear(final EntityType<? extends PolarBear> aku, final Level bjw) {
-        super(aku, bjw);
+    public PolarBear(final EntityType<? extends PolarBear> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
+    public AgableMob getBreedOffspring(final AgableMob aok) {
         return EntityType.POLAR_BEAR.create(this.level);
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
+    public boolean isFood(final ItemStack bki) {
         return false;
     }
     
@@ -77,25 +87,58 @@ public class PolarBear extends Animal {
         this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
         this.targetSelector.addGoal(1, new PolarBearHurtByTargetGoal());
         this.targetSelector.addGoal(2, new PolarBearAttackPlayersGoal());
-        this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Fox.class, 10, true, true, null));
+        this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
+        this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, Fox.class, 10, true, true, null));
+        this.targetSelector.addGoal(5, new ResetUniversalAngerTargetGoal<>(this, false));
+    }
+    
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 30.0).add(Attributes.FOLLOW_RANGE, 20.0).add(Attributes.MOVEMENT_SPEED, 0.25).add(Attributes.ATTACK_DAMAGE, 6.0);
+    }
+    
+    public static boolean checkPolarBearSpawnRules(final EntityType<PolarBear> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        final Biome bre6 = bqc.getBiome(fu);
+        if (bre6 == Biomes.FROZEN_OCEAN || bre6 == Biomes.DEEP_FROZEN_OCEAN) {
+            return bqc.getRawBrightness(fu, 0) > 8 && bqc.getBlockState(fu.below()).is(Blocks.ICE);
+        }
+        return Animal.checkAnimalSpawnRules(aoq, bqc, apb, fu, random);
     }
     
     @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(30.0);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(20.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(6.0);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.readPersistentAngerSaveData((ServerLevel)this.level, le);
     }
     
-    public static boolean checkPolarBearSpawnRules(final EntityType<PolarBear> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        final Biome bkt6 = bjx.getBiome(fk);
-        if (bkt6 == Biomes.FROZEN_OCEAN || bkt6 == Biomes.DEEP_FROZEN_OCEAN) {
-            return bjx.getRawBrightness(fk, 0) > 8 && bjx.getBlockState(fk.below()).getBlock() == Blocks.ICE;
-        }
-        return Animal.checkAnimalSpawnRules(aku, bjx, alc, fk, random);
+    @Override
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        this.addPersistentAngerSaveData(le);
+    }
+    
+    @Override
+    public void startPersistentAngerTimer() {
+        this.setRemainingPersistentAngerTime(PolarBear.PERSISTENT_ANGER_TIME.randomValue(this.random));
+    }
+    
+    @Override
+    public void setRemainingPersistentAngerTime(final int integer) {
+        this.remainingPersistentAngerTime = integer;
+    }
+    
+    @Override
+    public int getRemainingPersistentAngerTime() {
+        return this.remainingPersistentAngerTime;
+    }
+    
+    @Override
+    public void setPersistentAngerTarget(@Nullable final UUID uUID) {
+        this.persistentAngerTarget = uUID;
+    }
+    
+    @Override
+    public UUID getPersistentAngerTarget() {
+        return this.persistentAngerTarget;
     }
     
     @Override
@@ -107,7 +150,7 @@ public class PolarBear extends Animal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.POLAR_BEAR_HURT;
     }
     
@@ -117,7 +160,7 @@ public class PolarBear extends Animal {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.POLAR_BEAR_STEP, 0.15f, 1.0f);
     }
     
@@ -152,23 +195,26 @@ public class PolarBear extends Animal {
         if (this.warningSoundTicks > 0) {
             --this.warningSoundTicks;
         }
+        if (!this.level.isClientSide) {
+            this.updatePersistentAnger((ServerLevel)this.level, true);
+        }
     }
     
     @Override
-    public EntityDimensions getDimensions(final Pose alj) {
+    public EntityDimensions getDimensions(final Pose apj) {
         if (this.clientSideStandAnimation > 0.0f) {
             final float float3 = this.clientSideStandAnimation / 6.0f;
             final float float4 = 1.0f + float3;
-            return super.getDimensions(alj).scale(1.0f, float4);
+            return super.getDimensions(apj).scale(1.0f, float4);
         }
-        return super.getDimensions(alj);
+        return super.getDimensions(apj);
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        final boolean boolean3 = akq.hurt(DamageSource.mobAttack(this), (float)(int)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue());
+    public boolean doHurtTarget(final Entity aom) {
+        final boolean boolean3 = aom.hurt(DamageSource.mobAttack(this), (float)(int)this.getAttributeValue(Attributes.ATTACK_DAMAGE));
         if (boolean3) {
-            this.doEnchantDamageEffects(this, akq);
+            this.doEnchantDamageEffects(this, aom);
         }
         return boolean3;
     }
@@ -191,16 +237,17 @@ public class PolarBear extends Animal {
     }
     
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        if (alm == null) {
-            alm = new AgableMobGroupData();
-            ((AgableMobGroupData)alm).setBabySpawnChance(1.0f);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        if (apo == null) {
+            apo = new AgableMobGroupData();
+            ((AgableMobGroupData)apo).setBabySpawnChance(1.0f);
         }
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     static {
         DATA_STANDING_ID = SynchedEntityData.<Boolean>defineId(PolarBear.class, EntityDataSerializers.BOOLEAN);
+        PERSISTENT_ANGER_TIME = TimeUtil.rangeOfSeconds(20, 39);
     }
     
     class PolarBearHurtByTargetGoal extends HurtByTargetGoal {
@@ -218,9 +265,9 @@ public class PolarBear extends Animal {
         }
         
         @Override
-        protected void alertOther(final Mob ala, final LivingEntity akz) {
-            if (ala instanceof PolarBear && !ala.isBaby()) {
-                super.alertOther(ala, akz);
+        protected void alertOther(final Mob aoz, final LivingEntity aoy) {
+            if (aoz instanceof PolarBear && !aoz.isBaby()) {
+                super.alertOther(aoz, aoy);
             }
         }
     }
@@ -237,8 +284,8 @@ public class PolarBear extends Animal {
             }
             if (super.canUse()) {
                 final List<PolarBear> list2 = PolarBear.this.level.<PolarBear>getEntitiesOfClass(PolarBear.class, PolarBear.this.getBoundingBox().inflate(8.0, 4.0, 8.0));
-                for (final PolarBear atr4 : list2) {
-                    if (atr4.isBaby()) {
+                for (final PolarBear ayz4 : list2) {
+                    if (ayz4.isBaby()) {
                         return true;
                     }
                 }
@@ -258,25 +305,25 @@ public class PolarBear extends Animal {
         }
         
         @Override
-        protected void checkAndPerformAttack(final LivingEntity akz, final double double2) {
-            final double double3 = this.getAttackReachSqr(akz);
-            if (double2 <= double3 && this.attackTime <= 0) {
-                this.attackTime = 20;
-                this.mob.doHurtTarget(akz);
+        protected void checkAndPerformAttack(final LivingEntity aoy, final double double2) {
+            final double double3 = this.getAttackReachSqr(aoy);
+            if (double2 <= double3 && this.isTimeToAttack()) {
+                this.resetAttackCooldown();
+                this.mob.doHurtTarget(aoy);
                 PolarBear.this.setStanding(false);
             }
             else if (double2 <= double3 * 2.0) {
-                if (this.attackTime <= 0) {
+                if (this.isTimeToAttack()) {
                     PolarBear.this.setStanding(false);
-                    this.attackTime = 20;
+                    this.resetAttackCooldown();
                 }
-                if (this.attackTime <= 10) {
+                if (this.getTicksUntilNextAttack() <= 10) {
                     PolarBear.this.setStanding(true);
                     PolarBear.this.playWarningSound();
                 }
             }
             else {
-                this.attackTime = 20;
+                this.resetAttackCooldown();
                 PolarBear.this.setStanding(false);
             }
         }
@@ -288,8 +335,8 @@ public class PolarBear extends Animal {
         }
         
         @Override
-        protected double getAttackReachSqr(final LivingEntity akz) {
-            return 4.0f + akz.getBbWidth();
+        protected double getAttackReachSqr(final LivingEntity aoy) {
+            return 4.0f + aoy.getBbWidth();
         }
     }
     
diff --git a/src/net/minecraft/world/entity/animal/Pufferfish.java b/src/net/minecraft/world/entity/animal/Pufferfish.java
index 1b4b944..09e223c 100644
--- a/src/net/minecraft/world/entity/animal/Pufferfish.java
+++ b/src/net/minecraft/world/entity/animal/Pufferfish.java
@@ -35,8 +35,8 @@ public class Pufferfish extends AbstractFish {
     private int deflateTimer;
     private static final Predicate<LivingEntity> NO_SPECTATORS_AND_NO_WATER_MOB;
     
-    public Pufferfish(final EntityType<? extends Pufferfish> aku, final Level bjw) {
-        super(aku, bjw);
+    public Pufferfish(final EntityType<? extends Pufferfish> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -54,23 +54,23 @@ public class Pufferfish extends AbstractFish {
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (Pufferfish.PUFF_STATE.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (Pufferfish.PUFF_STATE.equals(tq)) {
             this.refreshDimensions();
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("PuffState", this.getPuffState());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("PuffState", this.getPuffState());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setPuffState(jt.getInt("PuffState"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setPuffState(le.getInt("PuffState"));
     }
     
     @Override
@@ -118,28 +118,30 @@ public class Pufferfish extends AbstractFish {
         super.aiStep();
         if (this.isAlive() && this.getPuffState() > 0) {
             final List<Mob> list2 = this.level.<Mob>getEntitiesOfClass(Mob.class, this.getBoundingBox().inflate(0.3), Pufferfish.NO_SPECTATORS_AND_NO_WATER_MOB);
-            for (final Mob ala4 : list2) {
-                if (ala4.isAlive()) {
-                    this.touch(ala4);
+            for (final Mob aoz4 : list2) {
+                if (aoz4.isAlive()) {
+                    this.touch(aoz4);
                 }
             }
         }
     }
     
-    private void touch(final Mob ala) {
+    private void touch(final Mob aoz) {
         final int integer3 = this.getPuffState();
-        if (ala.hurt(DamageSource.mobAttack(this), (float)(1 + integer3))) {
-            ala.addEffect(new MobEffectInstance(MobEffects.POISON, 60 * integer3, 0));
+        if (aoz.hurt(DamageSource.mobAttack(this), (float)(1 + integer3))) {
+            aoz.addEffect(new MobEffectInstance(MobEffects.POISON, 60 * integer3, 0));
             this.playSound(SoundEvents.PUFFER_FISH_STING, 1.0f, 1.0f);
         }
     }
     
     @Override
-    public void playerTouch(final Player ayj) {
+    public void playerTouch(final Player bec) {
         final int integer3 = this.getPuffState();
-        if (ayj instanceof ServerPlayer && integer3 > 0 && ayj.hurt(DamageSource.mobAttack(this), (float)(1 + integer3))) {
-            ((ServerPlayer)ayj).connection.send(new ClientboundGameEventPacket(9, 0.0f));
-            ayj.addEffect(new MobEffectInstance(MobEffects.POISON, 60 * integer3, 0));
+        if (bec instanceof ServerPlayer && integer3 > 0 && bec.hurt(DamageSource.mobAttack(this), (float)(1 + integer3))) {
+            if (!this.isSilent()) {
+                ((ServerPlayer)bec).connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.PUFFER_FISH_STING, 0.0f));
+            }
+            bec.addEffect(new MobEffectInstance(MobEffects.POISON, 60 * integer3, 0));
         }
     }
     
@@ -154,7 +156,7 @@ public class Pufferfish extends AbstractFish {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.PUFFER_FISH_HURT;
     }
     
@@ -164,8 +166,8 @@ public class Pufferfish extends AbstractFish {
     }
     
     @Override
-    public EntityDimensions getDimensions(final Pose alj) {
-        return super.getDimensions(alj).scale(getScale(this.getPuffState()));
+    public EntityDimensions getDimensions(final Pose apj) {
+        return super.getDimensions(apj).scale(getScale(this.getPuffState()));
     }
     
     private static float getScale(final int integer) {
@@ -184,15 +186,15 @@ public class Pufferfish extends AbstractFish {
     
     static {
         PUFF_STATE = SynchedEntityData.<Integer>defineId(Pufferfish.class, EntityDataSerializers.INT);
-        NO_SPECTATORS_AND_NO_WATER_MOB = (akz -> {
-            if (akz == null) {
+        NO_SPECTATORS_AND_NO_WATER_MOB = (aoy -> {
+            if (aoy == null) {
                 return false;
             }
-            else if (akz instanceof Player && (akz.isSpectator() || akz.isCreative())) {
+            else if (aoy instanceof Player && (aoy.isSpectator() || aoy.isCreative())) {
                 return false;
             }
             else {
-                return akz.getMobType() != MobType.WATER;
+                return aoy.getMobType() != MobType.WATER;
             }
         });
     }
@@ -200,8 +202,8 @@ public class Pufferfish extends AbstractFish {
     static class PufferfishPuffGoal extends Goal {
         private final Pufferfish fish;
         
-        public PufferfishPuffGoal(final Pufferfish ats) {
-            this.fish = ats;
+        public PufferfishPuffGoal(final Pufferfish aza) {
+            this.fish = aza;
         }
         
         @Override
diff --git a/src/net/minecraft/world/entity/animal/Rabbit.java b/src/net/minecraft/world/entity/animal/Rabbit.java
index d9b7ae6..fe7a4fd 100644
--- a/src/net/minecraft/world/entity/animal/Rabbit.java
+++ b/src/net/minecraft/world/entity/animal/Rabbit.java
@@ -1,10 +1,10 @@
 package net.minecraft.world.entity.animal;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.entity.ai.goal.MeleeAttackGoal;
 import net.minecraft.world.entity.ai.goal.PanicGoal;
 import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.CarrotBlock;
 import net.minecraft.world.level.GameRules;
@@ -14,10 +14,10 @@ import net.minecraft.world.entity.ai.control.MoveControl;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.world.entity.ai.control.JumpControl;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 import java.util.Random;
-import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.biome.Biome;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
@@ -36,7 +36,8 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.pathfinder.Path;
@@ -70,8 +71,8 @@ public class Rabbit extends Animal {
     private int jumpDelayTicks;
     private int moreCarrotTicks;
     
-    public Rabbit(final EntityType<? extends Rabbit> aku, final Level bjw) {
-        super(aku, bjw);
+    public Rabbit(final EntityType<? extends Rabbit> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.jumpControl = new RabbitJumpControl(this);
         this.moveControl = new RabbitMoveControl(this);
         this.setSpeedModifier(0.0);
@@ -96,10 +97,10 @@ public class Rabbit extends Animal {
         if (this.horizontalCollision || (this.moveControl.hasWanted() && this.moveControl.getWantedY() > this.getY() + 0.5)) {
             return 0.5f;
         }
-        final Path cqq2 = this.navigation.getPath();
-        if (cqq2 != null && cqq2.getIndex() < cqq2.getSize()) {
-            final Vec3 cvl3 = cqq2.currentPos(this);
-            if (cvl3.y > this.getY() + 0.5) {
+        final Path czf2 = this.navigation.getPath();
+        if (czf2 != null && czf2.getIndex() < czf2.getSize()) {
+            final Vec3 dem3 = czf2.currentPos(this);
+            if (dem3.y > this.getY() + 0.5) {
                 return 0.5f;
             }
         }
@@ -172,10 +173,10 @@ public class Rabbit extends Animal {
                 this.checkLandingDelay();
             }
             if (this.getRabbitType() == 99 && this.jumpDelayTicks == 0) {
-                final LivingEntity akz2 = this.getTarget();
-                if (akz2 != null && this.distanceToSqr(akz2) < 16.0) {
-                    this.facePoint(akz2.getX(), akz2.getZ());
-                    this.moveControl.setWantedPosition(akz2.getX(), akz2.getY(), akz2.getZ(), this.moveControl.getSpeedModifier());
+                final LivingEntity aoy2 = this.getTarget();
+                if (aoy2 != null && this.distanceToSqr(aoy2) < 16.0) {
+                    this.facePoint(aoy2.getX(), aoy2.getZ());
+                    this.moveControl.setWantedPosition(aoy2.getX(), aoy2.getY(), aoy2.getZ(), this.moveControl.getSpeedModifier());
                     this.startJumping();
                     this.wasOnGround = true;
                 }
@@ -183,12 +184,12 @@ public class Rabbit extends Animal {
             final RabbitJumpControl d2 = (RabbitJumpControl)this.jumpControl;
             if (!d2.wantJump()) {
                 if (this.moveControl.hasWanted() && this.jumpDelayTicks == 0) {
-                    final Path cqq3 = this.navigation.getPath();
-                    Vec3 cvl4 = new Vec3(this.moveControl.getWantedX(), this.moveControl.getWantedY(), this.moveControl.getWantedZ());
-                    if (cqq3 != null && cqq3.getIndex() < cqq3.getSize()) {
-                        cvl4 = cqq3.currentPos(this);
+                    final Path czf3 = this.navigation.getPath();
+                    Vec3 dem4 = new Vec3(this.moveControl.getWantedX(), this.moveControl.getWantedY(), this.moveControl.getWantedZ());
+                    if (czf3 != null && czf3.getIndex() < czf3.getSize()) {
+                        dem4 = czf3.currentPos(this);
                     }
-                    this.facePoint(cvl4.x, cvl4.z);
+                    this.facePoint(dem4.x, dem4.z);
                     this.startJumping();
                 }
             }
@@ -200,7 +201,8 @@ public class Rabbit extends Animal {
     }
     
     @Override
-    public void updateSprintingState() {
+    public boolean canSpawnSprintParticle() {
+        return false;
     }
     
     private void facePoint(final double double1, final double double2) {
@@ -242,25 +244,22 @@ public class Rabbit extends Animal {
         }
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(3.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.30000001192092896);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 3.0).add(Attributes.MOVEMENT_SPEED, 0.30000001192092896);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("RabbitType", this.getRabbitType());
-        jt.putInt("MoreCarrotTicks", this.moreCarrotTicks);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("RabbitType", this.getRabbitType());
+        le.putInt("MoreCarrotTicks", this.moreCarrotTicks);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setRabbitType(jt.getInt("RabbitType"));
-        this.moreCarrotTicks = jt.getInt("MoreCarrotTicks");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setRabbitType(le.getInt("RabbitType"));
+        this.moreCarrotTicks = le.getInt("MoreCarrotTicks");
     }
     
     protected SoundEvent getJumpSound() {
@@ -273,7 +272,7 @@ public class Rabbit extends Animal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.RABBIT_HURT;
     }
     
@@ -283,12 +282,12 @@ public class Rabbit extends Animal {
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
+    public boolean doHurtTarget(final Entity aom) {
         if (this.getRabbitType() == 99) {
             this.playSound(SoundEvents.RABBIT_ATTACK, 1.0f, (this.random.nextFloat() - this.random.nextFloat()) * 0.2f + 1.0f);
-            return akq.hurt(DamageSource.mobAttack(this), 8.0f);
+            return aom.hurt(DamageSource.mobAttack(this), 8.0f);
         }
-        return akq.hurt(DamageSource.mobAttack(this), 3.0f);
+        return aom.hurt(DamageSource.mobAttack(this), 3.0f);
     }
     
     @Override
@@ -297,33 +296,33 @@ public class Rabbit extends Animal {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        return !this.isInvulnerableTo(ajz) && super.hurt(ajz, float2);
+    public boolean hurt(final DamageSource anw, final float float2) {
+        return !this.isInvulnerableTo(anw) && super.hurt(anw, float2);
     }
     
-    private boolean isTemptingItem(final Item bei) {
-        return bei == Items.CARROT || bei == Items.GOLDEN_CARROT || bei == Blocks.DANDELION.asItem();
+    private boolean isTemptingItem(final Item bke) {
+        return bke == Items.CARROT || bke == Items.GOLDEN_CARROT || bke == Blocks.DANDELION.asItem();
     }
     
     @Override
-    public Rabbit getBreedOffspring(final AgableMob ako) {
-        final Rabbit att3 = EntityType.RABBIT.create(this.level);
+    public Rabbit getBreedOffspring(final AgableMob aok) {
+        final Rabbit azb3 = EntityType.RABBIT.create(this.level);
         int integer4 = this.getRandomRabbitType(this.level);
         if (this.random.nextInt(20) != 0) {
-            if (ako instanceof Rabbit && this.random.nextBoolean()) {
-                integer4 = ((Rabbit)ako).getRabbitType();
+            if (aok instanceof Rabbit && this.random.nextBoolean()) {
+                integer4 = ((Rabbit)aok).getRabbitType();
             }
             else {
                 integer4 = this.getRabbitType();
             }
         }
-        att3.setRabbitType(integer4);
-        return att3;
+        azb3.setRabbitType(integer4);
+        return azb3;
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        return this.isTemptingItem(ben.getItem());
+    public boolean isFood(final ItemStack bki) {
+        return this.isTemptingItem(bki.getItem());
     }
     
     public int getRabbitType() {
@@ -332,13 +331,13 @@ public class Rabbit extends Animal {
     
     public void setRabbitType(final int integer) {
         if (integer == 99) {
-            this.getAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(8.0);
+            this.getAttribute(Attributes.ARMOR).setBaseValue(8.0);
             this.goalSelector.addGoal(4, new EvilRabbitAttackGoal(this));
             this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]).setAlertOthers(new Class[0]));
             this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
             this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Wolf.class, true));
             if (!this.hasCustomName()) {
-                this.setCustomName(new TranslatableComponent(Util.makeDescriptionId("entity", Rabbit.KILLER_BUNNY), new Object[0]));
+                this.setCustomName(new TranslatableComponent(Util.makeDescriptionId("entity", Rabbit.KILLER_BUNNY)));
             }
         }
         this.entityData.<Integer>set(Rabbit.DATA_TYPE_ID, integer);
@@ -346,33 +345,33 @@ public class Rabbit extends Animal {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        int integer7 = this.getRandomRabbitType(bjx);
-        if (alm instanceof RabbitGroupData) {
-            integer7 = ((RabbitGroupData)alm).rabbitType;
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        int integer7 = this.getRandomRabbitType(bqc);
+        if (apo instanceof RabbitGroupData) {
+            integer7 = ((RabbitGroupData)apo).rabbitType;
         }
         else {
-            alm = new RabbitGroupData(integer7);
+            apo = new RabbitGroupData(integer7);
         }
         this.setRabbitType(integer7);
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
-    private int getRandomRabbitType(final LevelAccessor bjx) {
-        final Biome bkt3 = bjx.getBiome(new BlockPos(this));
+    private int getRandomRabbitType(final LevelAccessor bqc) {
+        final Biome bre3 = bqc.getBiome(this.blockPosition());
         final int integer4 = this.random.nextInt(100);
-        if (bkt3.getPrecipitation() == Biome.Precipitation.SNOW) {
+        if (bre3.getPrecipitation() == Biome.Precipitation.SNOW) {
             return (integer4 < 80) ? 1 : 3;
         }
-        if (bkt3.getBiomeCategory() == Biome.BiomeCategory.DESERT) {
+        if (bre3.getBiomeCategory() == Biome.BiomeCategory.DESERT) {
             return 4;
         }
         return (integer4 < 50) ? 0 : ((integer4 < 90) ? 5 : 2);
     }
     
-    public static boolean checkRabbitSpawnRules(final EntityType<Rabbit> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        final Block bph6 = bjx.getBlockState(fk.below()).getBlock();
-        return (bph6 == Blocks.GRASS_BLOCK || bph6 == Blocks.SNOW || bph6 == Blocks.SAND) && bjx.getRawBrightness(fk, 0) > 8;
+    public static boolean checkRabbitSpawnRules(final EntityType<Rabbit> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        final BlockState cfj6 = bqc.getBlockState(fu.below());
+        return (cfj6.is(Blocks.GRASS_BLOCK) || cfj6.is(Blocks.SNOW) || cfj6.is(Blocks.SAND)) && bqc.getRawBrightness(fu, 0) > 8;
     }
     
     private boolean wantsMoreFood() {
@@ -382,7 +381,7 @@ public class Rabbit extends Animal {
     @Override
     public void handleEntityEvent(final byte byte1) {
         if (byte1 == 1) {
-            this.doSprintParticleEffect();
+            this.spawnSprintParticle();
             this.jumpDuration = 10;
             this.jumpTicks = 0;
         }
@@ -391,6 +390,11 @@ public class Rabbit extends Animal {
         }
     }
     
+    @Override
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, 0.6f * this.getEyeHeight(), this.getBbWidth() * 0.4f);
+    }
+    
     static {
         DATA_TYPE_ID = SynchedEntityData.<Integer>defineId(Rabbit.class, EntityDataSerializers.INT);
         KILLER_BUNNY = new ResourceLocation("killer_bunny");
@@ -409,9 +413,9 @@ public class Rabbit extends Animal {
         private final Rabbit rabbit;
         private boolean canJump;
         
-        public RabbitJumpControl(final Rabbit att2) {
-            super(att2);
-            this.rabbit = att2;
+        public RabbitJumpControl(final Rabbit azb2) {
+            super(azb2);
+            this.rabbit = azb2;
         }
         
         public boolean wantJump() {
@@ -439,9 +443,9 @@ public class Rabbit extends Animal {
         private final Rabbit rabbit;
         private double nextJumpSpeed;
         
-        public RabbitMoveControl(final Rabbit att) {
-            super(att);
-            this.rabbit = att;
+        public RabbitMoveControl(final Rabbit azb) {
+            super(azb);
+            this.rabbit = azb;
         }
         
         @Override
@@ -470,9 +474,9 @@ public class Rabbit extends Animal {
     static class RabbitAvoidEntityGoal<T extends LivingEntity> extends AvoidEntityGoal<T> {
         private final Rabbit rabbit;
         
-        public RabbitAvoidEntityGoal(final Rabbit att, final Class<T> class2, final float float3, final double double4, final double double5) {
-            super(att, class2, float3, double4, double5);
-            this.rabbit = att;
+        public RabbitAvoidEntityGoal(final Rabbit azb, final Class<T> class2, final float float3, final double double4, final double double5) {
+            super(azb, class2, float3, double4, double5);
+            this.rabbit = azb;
         }
         
         @Override
@@ -486,9 +490,9 @@ public class Rabbit extends Animal {
         private boolean wantsToRaid;
         private boolean canRaid;
         
-        public RaidGardenGoal(final Rabbit att) {
-            super(att, 0.699999988079071, 16);
-            this.rabbit = att;
+        public RaidGardenGoal(final Rabbit azb) {
+            super(azb, 0.699999988079071, 16);
+            this.rabbit = azb;
         }
         
         @Override
@@ -514,19 +518,19 @@ public class Rabbit extends Animal {
             super.tick();
             this.rabbit.getLookControl().setLookAt(this.blockPos.getX() + 0.5, this.blockPos.getY() + 1, this.blockPos.getZ() + 0.5, 10.0f, (float)this.rabbit.getMaxHeadXRot());
             if (this.isReachedTarget()) {
-                final Level bjw2 = this.rabbit.level;
-                final BlockPos fk3 = this.blockPos.above();
-                final BlockState byj4 = bjw2.getBlockState(fk3);
-                final Block bph5 = byj4.getBlock();
-                if (this.canRaid && bph5 instanceof CarrotBlock) {
-                    final Integer integer6 = byj4.<Integer>getValue((Property<Integer>)CarrotBlock.AGE);
+                final Level bqb2 = this.rabbit.level;
+                final BlockPos fu3 = this.blockPos.above();
+                final BlockState cfj4 = bqb2.getBlockState(fu3);
+                final Block bvr5 = cfj4.getBlock();
+                if (this.canRaid && bvr5 instanceof CarrotBlock) {
+                    final Integer integer6 = cfj4.<Integer>getValue((Property<Integer>)CarrotBlock.AGE);
                     if (integer6 == 0) {
-                        bjw2.setBlock(fk3, Blocks.AIR.defaultBlockState(), 2);
-                        bjw2.destroyBlock(fk3, true, this.rabbit);
+                        bqb2.setBlock(fu3, Blocks.AIR.defaultBlockState(), 2);
+                        bqb2.destroyBlock(fu3, true, this.rabbit);
                     }
                     else {
-                        bjw2.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)byj4).<Comparable, Integer>setValue((Property<Comparable>)CarrotBlock.AGE, integer6 - 1), 2);
-                        bjw2.levelEvent(2001, fk3, Block.getId(byj4));
+                        bqb2.setBlock(fu3, ((StateHolder<O, BlockState>)cfj4).<Comparable, Integer>setValue((Property<Comparable>)CarrotBlock.AGE, integer6 - 1), 2);
+                        bqb2.levelEvent(2001, fu3, Block.getId(cfj4));
                     }
                     this.rabbit.moreCarrotTicks = 40;
                 }
@@ -536,13 +540,13 @@ public class Rabbit extends Animal {
         }
         
         @Override
-        protected boolean isValidTarget(final LevelReader bjz, BlockPos fk) {
-            Block bph4 = bjz.getBlockState(fk).getBlock();
-            if (bph4 == Blocks.FARMLAND && this.wantsToRaid && !this.canRaid) {
-                fk = fk.above();
-                final BlockState byj5 = bjz.getBlockState(fk);
-                bph4 = byj5.getBlock();
-                if (bph4 instanceof CarrotBlock && ((CarrotBlock)bph4).isMaxAge(byj5)) {
+        protected boolean isValidTarget(final LevelReader bqd, BlockPos fu) {
+            Block bvr4 = bqd.getBlockState(fu).getBlock();
+            if (bvr4 == Blocks.FARMLAND && this.wantsToRaid && !this.canRaid) {
+                fu = fu.above();
+                final BlockState cfj5 = bqd.getBlockState(fu);
+                bvr4 = cfj5.getBlock();
+                if (bvr4 instanceof CarrotBlock && ((CarrotBlock)bvr4).isMaxAge(cfj5)) {
                     return this.canRaid = true;
                 }
             }
@@ -553,9 +557,9 @@ public class Rabbit extends Animal {
     static class RabbitPanicGoal extends PanicGoal {
         private final Rabbit rabbit;
         
-        public RabbitPanicGoal(final Rabbit att, final double double2) {
-            super(att, double2);
-            this.rabbit = att;
+        public RabbitPanicGoal(final Rabbit azb, final double double2) {
+            super(azb, double2);
+            this.rabbit = azb;
         }
         
         @Override
@@ -566,13 +570,13 @@ public class Rabbit extends Animal {
     }
     
     static class EvilRabbitAttackGoal extends MeleeAttackGoal {
-        public EvilRabbitAttackGoal(final Rabbit att) {
-            super(att, 1.4, true);
+        public EvilRabbitAttackGoal(final Rabbit azb) {
+            super(azb, 1.4, true);
         }
         
         @Override
-        protected double getAttackReachSqr(final LivingEntity akz) {
-            return 4.0f + akz.getBbWidth();
+        protected double getAttackReachSqr(final LivingEntity aoy) {
+            return 4.0f + aoy.getBbWidth();
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/Salmon.java b/src/net/minecraft/world/entity/animal/Salmon.java
index 8009cfc..75a852b 100644
--- a/src/net/minecraft/world/entity/animal/Salmon.java
+++ b/src/net/minecraft/world/entity/animal/Salmon.java
@@ -10,8 +10,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Salmon extends AbstractSchoolingFish {
-    public Salmon(final EntityType<? extends Salmon> aku, final Level bjw) {
-        super(aku, bjw);
+    public Salmon(final EntityType<? extends Salmon> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -35,7 +35,7 @@ public class Salmon extends AbstractSchoolingFish {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.SALMON_HURT;
     }
     
diff --git a/src/net/minecraft/world/entity/animal/Sheep.java b/src/net/minecraft/world/entity/animal/Sheep.java
index 88d196c..fa7f4e0 100644
--- a/src/net/minecraft/world/entity/animal/Sheep.java
+++ b/src/net/minecraft/world/entity/animal/Sheep.java
@@ -4,7 +4,6 @@ import java.util.stream.Collectors;
 import java.util.Arrays;
 import net.minecraft.Util;
 import com.google.common.collect.Maps;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.world.level.block.Blocks;
@@ -32,13 +31,17 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
@@ -61,29 +64,30 @@ import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.DyeColor;
 import java.util.Map;
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.Shearable;
 
-public class Sheep extends Animal {
+public class Sheep extends Animal implements Shearable {
     private static final EntityDataAccessor<Byte> DATA_WOOL_ID;
     private static final Map<DyeColor, ItemLike> ITEM_BY_DYE;
     private static final Map<DyeColor, float[]> COLORARRAY_BY_COLOR;
     private int eatAnimationTick;
     private EatBlockGoal eatBlockGoal;
     
-    private static float[] createSheepColor(final DyeColor bdj) {
-        if (bdj == DyeColor.WHITE) {
+    private static float[] createSheepColor(final DyeColor bje) {
+        if (bje == DyeColor.WHITE) {
             return new float[] { 0.9019608f, 0.9019608f, 0.9019608f };
         }
-        final float[] arr2 = bdj.getTextureDiffuseColors();
+        final float[] arr2 = bje.getTextureDiffuseColors();
         final float float3 = 0.75f;
         return new float[] { arr2[0] * 0.75f, arr2[1] * 0.75f, arr2[2] * 0.75f };
     }
     
-    public static float[] getColorArray(final DyeColor bdj) {
-        return Sheep.COLORARRAY_BY_COLOR.get(bdj);
+    public static float[] getColorArray(final DyeColor bje) {
+        return Sheep.COLORARRAY_BY_COLOR.get(bje);
     }
     
-    public Sheep(final EntityType<? extends Sheep> aku, final Level bjw) {
-        super(aku, bjw);
+    public Sheep(final EntityType<? extends Sheep> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -114,11 +118,8 @@ public class Sheep extends Animal {
         super.aiStep();
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(8.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.23000000417232513);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 8.0).add(Attributes.MOVEMENT_SPEED, 0.23000000417232513);
     }
     
     @Override
@@ -218,43 +219,48 @@ public class Sheep extends Animal {
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() == Items.SHEARS && !this.isSheared() && !this.isBaby()) {
-            this.shear();
-            if (!this.level.isClientSide) {
-                ben4.<Player>hurtAndBreak(1, ayj, ayj -> ayj.broadcastBreakEvent(ajk));
-            }
-            return true;
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (bki4.getItem() != Items.SHEARS) {
+            return super.mobInteract(bec, anf);
         }
-        return super.mobInteract(ayj, ajk);
-    }
-    
-    public void shear() {
-        if (!this.level.isClientSide) {
-            this.setSheared(true);
-            for (int integer2 = 1 + this.random.nextInt(3), integer3 = 0; integer3 < integer2; ++integer3) {
-                final ItemEntity awb4 = this.spawnAtLocation(Sheep.ITEM_BY_DYE.get(this.getColor()), 1);
-                if (awb4 != null) {
-                    awb4.setDeltaMovement(awb4.getDeltaMovement().add((this.random.nextFloat() - this.random.nextFloat()) * 0.1f, this.random.nextFloat() * 0.05f, (this.random.nextFloat() - this.random.nextFloat()) * 0.1f));
-                }
-            }
+        if (!this.level.isClientSide && this.readyForShearing()) {
+            this.shear(SoundSource.PLAYERS);
+            bki4.<Player>hurtAndBreak(1, bec, bec -> bec.broadcastBreakEvent(anf));
+            return InteractionResult.SUCCESS;
         }
-        this.playSound(SoundEvents.SHEEP_SHEAR, 1.0f, 1.0f);
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("Sheared", this.isSheared());
-        jt.putByte("Color", (byte)this.getColor().getId());
+    public void shear(final SoundSource acm) {
+        this.level.playSound(null, this, SoundEvents.SHEEP_SHEAR, acm, 1.0f, 1.0f);
+        this.setSheared(true);
+        for (int integer3 = 1 + this.random.nextInt(3), integer4 = 0; integer4 < integer3; ++integer4) {
+            final ItemEntity bbg5 = this.spawnAtLocation(Sheep.ITEM_BY_DYE.get(this.getColor()), 1);
+            if (bbg5 != null) {
+                bbg5.setDeltaMovement(bbg5.getDeltaMovement().add((this.random.nextFloat() - this.random.nextFloat()) * 0.1f, this.random.nextFloat() * 0.05f, (this.random.nextFloat() - this.random.nextFloat()) * 0.1f));
+            }
+        }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setSheared(jt.getBoolean("Sheared"));
-        this.setColor(DyeColor.byId(jt.getByte("Color")));
+    public boolean readyForShearing() {
+        return this.isAlive() && !this.isSheared() && !this.isBaby();
+    }
+    
+    @Override
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("Sheared", this.isSheared());
+        le.putByte("Color", (byte)this.getColor().getId());
+    }
+    
+    @Override
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setSheared(le.getBoolean("Sheared"));
+        this.setColor(DyeColor.byId(le.getByte("Color")));
     }
     
     @Override
@@ -263,7 +269,7 @@ public class Sheep extends Animal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.SHEEP_HURT;
     }
     
@@ -273,7 +279,7 @@ public class Sheep extends Animal {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.SHEEP_STEP, 0.15f, 1.0f);
     }
     
@@ -281,9 +287,9 @@ public class Sheep extends Animal {
         return DyeColor.byId(this.entityData.<Byte>get(Sheep.DATA_WOOL_ID) & 0xF);
     }
     
-    public void setColor(final DyeColor bdj) {
+    public void setColor(final DyeColor bje) {
         final byte byte3 = this.entityData.<Byte>get(Sheep.DATA_WOOL_ID);
-        this.entityData.<Byte>set(Sheep.DATA_WOOL_ID, (byte)((byte3 & 0xF0) | (bdj.getId() & 0xF)));
+        this.entityData.<Byte>set(Sheep.DATA_WOOL_ID, (byte)((byte3 & 0xF0) | (bje.getId() & 0xF)));
     }
     
     public boolean isSheared() {
@@ -321,11 +327,11 @@ public class Sheep extends Animal {
     }
     
     @Override
-    public Sheep getBreedOffspring(final AgableMob ako) {
-        final Sheep atv3 = (Sheep)ako;
-        final Sheep atv4 = EntityType.SHEEP.create(this.level);
-        atv4.setColor(this.getOffspringColor(this, atv3));
-        return atv4;
+    public Sheep getBreedOffspring(final AgableMob aok) {
+        final Sheep azd3 = (Sheep)aok;
+        final Sheep azd4 = EntityType.SHEEP.create(this.level);
+        azd4.setColor(this.getOffspringColor(this, azd3));
+        return azd4;
     }
     
     @Override
@@ -338,35 +344,35 @@ public class Sheep extends Animal {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        this.setColor(getRandomSheepColor(bjx.getRandom()));
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        this.setColor(getRandomSheepColor(bqc.getRandom()));
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
-    private DyeColor getOffspringColor(final Animal atc1, final Animal atc2) {
-        final DyeColor bdj4 = ((Sheep)atc1).getColor();
-        final DyeColor bdj5 = ((Sheep)atc2).getColor();
-        final CraftingContainer baz6 = makeContainer(bdj4, bdj5);
+    private DyeColor getOffspringColor(final Animal ayk1, final Animal ayk2) {
+        final DyeColor bje4 = ((Sheep)ayk1).getColor();
+        final DyeColor bje5 = ((Sheep)ayk2).getColor();
+        final CraftingContainer bgu6 = makeContainer(bje4, bje5);
         final Object o;
         final Object o2;
-        return this.level.getRecipeManager().<CraftingContainer, CraftingRecipe>getRecipeFor(RecipeType.CRAFTING, baz6, this.level).map(bgo -> bgo.assemble(baz6)).map(ItemStack::getItem).filter(DyeItem.class::isInstance).map(DyeItem.class::cast).<DyeColor>map(DyeItem::getDyeColor).orElseGet(() -> this.level.random.nextBoolean() ? o : o2);
+        return this.level.getRecipeManager().<CraftingContainer, CraftingRecipe>getRecipeFor(RecipeType.CRAFTING, bgu6, this.level).map(bmm -> bmm.assemble(bgu6)).map(ItemStack::getItem).filter(DyeItem.class::isInstance).map(DyeItem.class::cast).<DyeColor>map(DyeItem::getDyeColor).orElseGet(() -> this.level.random.nextBoolean() ? o : o2);
     }
     
-    private static CraftingContainer makeContainer(final DyeColor bdj1, final DyeColor bdj2) {
-        final CraftingContainer baz3 = new CraftingContainer(new AbstractContainerMenu(null, -1) {
+    private static CraftingContainer makeContainer(final DyeColor bje1, final DyeColor bje2) {
+        final CraftingContainer bgu3 = new CraftingContainer(new AbstractContainerMenu(null, -1) {
             @Override
-            public boolean stillValid(final Player ayj) {
+            public boolean stillValid(final Player bec) {
                 return false;
             }
         }, 2, 1);
-        baz3.setItem(0, new ItemStack(DyeItem.byColor(bdj1)));
-        baz3.setItem(1, new ItemStack(DyeItem.byColor(bdj2)));
-        return baz3;
+        bgu3.setItem(0, new ItemStack(DyeItem.byColor(bje1)));
+        bgu3.setItem(1, new ItemStack(DyeItem.byColor(bje2)));
+        return bgu3;
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return 0.95f * akr.height;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return 0.95f * aon.height;
     }
     
     static {
@@ -390,6 +396,6 @@ public class Sheep extends Animal {
             enumMap.put(DyeColor.BLACK, Blocks.BLACK_WOOL);
             return;
         });
-        COLORARRAY_BY_COLOR = Maps.<Enum, Object>newEnumMap(Arrays.<DyeColor>stream(DyeColor.values()).collect(Collectors.toMap(bdj -> bdj, Sheep::createSheepColor)));
+        COLORARRAY_BY_COLOR = Maps.<Enum, Object>newEnumMap(Arrays.<DyeColor>stream(DyeColor.values()).collect(Collectors.toMap(bje -> bje, Sheep::createSheepColor)));
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/ShoulderRidingEntity.java b/src/net/minecraft/world/entity/animal/ShoulderRidingEntity.java
index a6beb8d..650ca9e 100644
--- a/src/net/minecraft/world/entity/animal/ShoulderRidingEntity.java
+++ b/src/net/minecraft/world/entity/animal/ShoulderRidingEntity.java
@@ -9,15 +9,15 @@ import net.minecraft.world.entity.TamableAnimal;
 public abstract class ShoulderRidingEntity extends TamableAnimal {
     private int rideCooldownCounter;
     
-    protected ShoulderRidingEntity(final EntityType<? extends ShoulderRidingEntity> aku, final Level bjw) {
-        super(aku, bjw);
+    protected ShoulderRidingEntity(final EntityType<? extends ShoulderRidingEntity> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public boolean setEntityOnShoulder(final ServerPlayer xe) {
-        final CompoundTag jt3 = new CompoundTag();
-        jt3.putString("id", this.getEncodeId());
-        this.saveWithoutId(jt3);
-        if (xe.setEntityOnShoulder(jt3)) {
+    public boolean setEntityOnShoulder(final ServerPlayer ze) {
+        final CompoundTag le3 = new CompoundTag();
+        le3.putString("id", this.getEncodeId());
+        this.saveWithoutId(le3);
+        if (ze.setEntityOnShoulder(le3)) {
             this.remove();
             return true;
         }
diff --git a/src/net/minecraft/world/entity/animal/SnowGolem.java b/src/net/minecraft/world/entity/animal/SnowGolem.java
index 75e6706..b34bfbc 100644
--- a/src/net/minecraft/world/entity/animal/SnowGolem.java
+++ b/src/net/minecraft/world/entity/animal/SnowGolem.java
@@ -2,10 +2,14 @@ package net.minecraft.world.entity.animal;
 
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.world.phys.Vec3;
 import javax.annotation.Nullable;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
@@ -16,11 +20,12 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.GameRules;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.monster.Enemy;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
@@ -36,12 +41,13 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.world.entity.monster.RangedAttackMob;
+import net.minecraft.world.entity.Shearable;
 
-public class SnowGolem extends AbstractGolem implements RangedAttackMob {
+public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackMob {
     private static final EntityDataAccessor<Byte> DATA_PUMPKIN_ID;
     
-    public SnowGolem(final EntityType<? extends SnowGolem> aku, final Level bjw) {
-        super(aku, bjw);
+    public SnowGolem(final EntityType<? extends SnowGolem> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -50,14 +56,11 @@ public class SnowGolem extends AbstractGolem implements RangedAttackMob {
         this.goalSelector.addGoal(2, new WaterAvoidingRandomStrollGoal(this, 1.0, 1.0000001E-5f));
         this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0f));
         this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
-        this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Mob.class, 10, true, false, akz -> akz instanceof Enemy));
+        this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Mob.class, 10, true, false, aoy -> aoy instanceof Enemy));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(4.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.20000000298023224);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 4.0).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224);
     }
     
     @Override
@@ -67,19 +70,24 @@ public class SnowGolem extends AbstractGolem implements RangedAttackMob {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("Pumpkin", this.hasPumpkin());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("Pumpkin", this.hasPumpkin());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("Pumpkin")) {
-            this.setPumpkin(jt.getBoolean("Pumpkin"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("Pumpkin")) {
+            this.setPumpkin(le.getBoolean("Pumpkin"));
         }
     }
     
+    @Override
+    public boolean isSensitiveToWater() {
+        return true;
+    }
+    
     @Override
     public void aiStep() {
         super.aiStep();
@@ -87,57 +95,68 @@ public class SnowGolem extends AbstractGolem implements RangedAttackMob {
             int integer2 = Mth.floor(this.getX());
             int integer3 = Mth.floor(this.getY());
             int integer4 = Mth.floor(this.getZ());
-            if (this.isInWaterRainOrBubble()) {
-                this.hurt(DamageSource.DROWN, 1.0f);
-            }
             if (this.level.getBiome(new BlockPos(integer2, 0, integer4)).getTemperature(new BlockPos(integer2, integer3, integer4)) > 1.0f) {
                 this.hurt(DamageSource.ON_FIRE, 1.0f);
             }
             if (!this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
                 return;
             }
-            final BlockState byj5 = Blocks.SNOW.defaultBlockState();
+            final BlockState cfj5 = Blocks.SNOW.defaultBlockState();
             for (int integer5 = 0; integer5 < 4; ++integer5) {
                 integer2 = Mth.floor(this.getX() + (integer5 % 2 * 2 - 1) * 0.25f);
                 integer3 = Mth.floor(this.getY());
                 integer4 = Mth.floor(this.getZ() + (integer5 / 2 % 2 * 2 - 1) * 0.25f);
-                final BlockPos fk7 = new BlockPos(integer2, integer3, integer4);
-                if (this.level.getBlockState(fk7).isAir() && this.level.getBiome(fk7).getTemperature(fk7) < 0.8f && byj5.canSurvive(this.level, fk7)) {
-                    this.level.setBlockAndUpdate(fk7, byj5);
+                final BlockPos fu7 = new BlockPos(integer2, integer3, integer4);
+                if (this.level.getBlockState(fu7).isAir() && this.level.getBiome(fu7).getTemperature(fu7) < 0.8f && cfj5.canSurvive(this.level, fu7)) {
+                    this.level.setBlockAndUpdate(fu7, cfj5);
                 }
             }
         }
     }
     
     @Override
-    public void performRangedAttack(final LivingEntity akz, final float float2) {
-        final Snowball azc4 = new Snowball(this.level, this);
-        final double double5 = akz.getEyeY() - 1.100000023841858;
-        final double double6 = akz.getX() - this.getX();
-        final double double7 = double5 - azc4.getY();
-        final double double8 = akz.getZ() - this.getZ();
+    public void performRangedAttack(final LivingEntity aoy, final float float2) {
+        final Snowball bew4 = new Snowball(this.level, this);
+        final double double5 = aoy.getEyeY() - 1.100000023841858;
+        final double double6 = aoy.getX() - this.getX();
+        final double double7 = double5 - bew4.getY();
+        final double double8 = aoy.getZ() - this.getZ();
         final float float3 = Mth.sqrt(double6 * double6 + double8 * double8) * 0.2f;
-        azc4.shoot(double6, double7 + float3, double8, 1.6f, 12.0f);
-        this.playSound(SoundEvents.SNOW_GOLEM_SHOOT, 1.0f, 1.0f / (this.getRandom().nextFloat() * 0.4f + 0.8f));
-        this.level.addFreshEntity(azc4);
+        bew4.shoot(double6, double7 + float3, double8, 1.6f, 12.0f);
+        this.playSound(SoundEvents.SNOW_GOLEM_SHOOT, 1.0f, 0.4f / (this.getRandom().nextFloat() * 0.4f + 0.8f));
+        this.level.addFreshEntity(bew4);
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 1.7f;
     }
     
     @Override
-    protected boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() == Items.SHEARS && this.hasPumpkin()) {
+    protected InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (bki4.getItem() == Items.SHEARS && this.readyForShearing()) {
+            this.shear(SoundSource.PLAYERS);
             if (!this.level.isClientSide) {
-                this.setPumpkin(false);
-                ben4.<Player>hurtAndBreak(1, ayj, ayj -> ayj.broadcastBreakEvent(ajk));
+                bki4.<Player>hurtAndBreak(1, bec, bec -> bec.broadcastBreakEvent(anf));
             }
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        return false;
+        return InteractionResult.PASS;
+    }
+    
+    @Override
+    public void shear(final SoundSource acm) {
+        this.level.playSound(null, this, SoundEvents.SNOW_GOLEM_SHEAR, acm, 1.0f, 1.0f);
+        if (!this.level.isClientSide()) {
+            this.setPumpkin(false);
+            this.spawnAtLocation(new ItemStack(Items.CARVED_PUMPKIN), 1.7f);
+        }
+    }
+    
+    @Override
+    public boolean readyForShearing() {
+        return this.isAlive() && this.hasPumpkin();
     }
     
     public boolean hasPumpkin() {
@@ -162,7 +181,7 @@ public class SnowGolem extends AbstractGolem implements RangedAttackMob {
     
     @Nullable
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.SNOW_GOLEM_HURT;
     }
     
@@ -172,6 +191,11 @@ public class SnowGolem extends AbstractGolem implements RangedAttackMob {
         return SoundEvents.SNOW_GOLEM_DEATH;
     }
     
+    @Override
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, 0.75f * this.getEyeHeight(), this.getBbWidth() * 0.4f);
+    }
+    
     static {
         DATA_PUMPKIN_ID = SynchedEntityData.<Byte>defineId(SnowGolem.class, EntityDataSerializers.BYTE);
     }
diff --git a/src/net/minecraft/world/entity/animal/Squid.java b/src/net/minecraft/world/entity/animal/Squid.java
index b061481..8224de0 100644
--- a/src/net/minecraft/world/entity/animal/Squid.java
+++ b/src/net/minecraft/world/entity/animal/Squid.java
@@ -3,6 +3,8 @@ package net.minecraft.world.entity.animal;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.entity.LivingEntity;
 import java.util.Random;
@@ -22,7 +24,9 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
@@ -43,8 +47,8 @@ public class Squid extends WaterAnimal {
     private float ty;
     private float tz;
     
-    public Squid(final EntityType<? extends Squid> aku, final Level bjw) {
-        super(aku, bjw);
+    public Squid(final EntityType<? extends Squid> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.random.setSeed(this.getId());
         this.tentacleSpeed = 1.0f / (this.random.nextFloat() + 1.0f) * 0.2f;
     }
@@ -55,15 +59,13 @@ public class Squid extends WaterAnimal {
         this.goalSelector.addGoal(1, new SquidFleeGoal());
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(10.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 10.0);
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height * 0.5f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height * 0.5f;
     }
     
     @Override
@@ -72,7 +74,7 @@ public class Squid extends WaterAnimal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.SQUID_HURT;
     }
     
@@ -131,12 +133,12 @@ public class Squid extends WaterAnimal {
             if (!this.level.isClientSide) {
                 this.setDeltaMovement(this.tx * this.speed, this.ty * this.speed, this.tz * this.speed);
             }
-            final Vec3 cvl2 = this.getDeltaMovement();
-            final float float3 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl2));
-            this.yBodyRot += (-(float)Mth.atan2(cvl2.x, cvl2.z) * 57.295776f - this.yBodyRot) * 0.1f;
+            final Vec3 dem2 = this.getDeltaMovement();
+            final float float3 = Mth.sqrt(Entity.getHorizontalDistanceSqr(dem2));
+            this.yBodyRot += (-(float)Mth.atan2(dem2.x, dem2.z) * 57.295776f - this.yBodyRot) * 0.1f;
             this.yRot = this.yBodyRot;
             this.zBodyRot += (float)(3.141592653589793 * this.rotateSpeed * 1.5);
-            this.xBodyRot += (-(float)Mth.atan2(float3, cvl2.y) * 57.295776f - this.xBodyRot) * 0.1f;
+            this.xBodyRot += (-(float)Mth.atan2(float3, dem2.y) * 57.295776f - this.xBodyRot) * 0.1f;
         }
         else {
             this.tentacleAngle = Mth.abs(Mth.sin(this.tentacleMovement)) * 3.1415927f * 0.25f;
@@ -155,37 +157,37 @@ public class Squid extends WaterAnimal {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (super.hurt(ajz, float2) && this.getLastHurtByMob() != null) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (super.hurt(anw, float2) && this.getLastHurtByMob() != null) {
             this.spawnInk();
             return true;
         }
         return false;
     }
     
-    private Vec3 rotateVector(final Vec3 cvl) {
-        Vec3 cvl2 = cvl.xRot(this.xBodyRotO * 0.017453292f);
-        cvl2 = cvl2.yRot(-this.yBodyRotO * 0.017453292f);
-        return cvl2;
+    private Vec3 rotateVector(final Vec3 dem) {
+        Vec3 dem2 = dem.xRot(this.xBodyRotO * 0.017453292f);
+        dem2 = dem2.yRot(-this.yBodyRotO * 0.017453292f);
+        return dem2;
     }
     
     private void spawnInk() {
         this.playSound(SoundEvents.SQUID_SQUIRT, this.getSoundVolume(), this.getVoicePitch());
-        final Vec3 cvl2 = this.rotateVector(new Vec3(0.0, -1.0, 0.0)).add(this.getX(), this.getY(), this.getZ());
+        final Vec3 dem2 = this.rotateVector(new Vec3(0.0, -1.0, 0.0)).add(this.getX(), this.getY(), this.getZ());
         for (int integer3 = 0; integer3 < 30; ++integer3) {
-            final Vec3 cvl3 = this.rotateVector(new Vec3(this.random.nextFloat() * 0.6 - 0.3, -1.0, this.random.nextFloat() * 0.6 - 0.3));
-            final Vec3 cvl4 = cvl3.scale(0.3 + this.random.nextFloat() * 2.0f);
-            ((ServerLevel)this.level).<SimpleParticleType>sendParticles(ParticleTypes.SQUID_INK, cvl2.x, cvl2.y + 0.5, cvl2.z, 0, cvl4.x, cvl4.y, cvl4.z, 0.10000000149011612);
+            final Vec3 dem3 = this.rotateVector(new Vec3(this.random.nextFloat() * 0.6 - 0.3, -1.0, this.random.nextFloat() * 0.6 - 0.3));
+            final Vec3 dem4 = dem3.scale(0.3 + this.random.nextFloat() * 2.0f);
+            ((ServerLevel)this.level).<SimpleParticleType>sendParticles(ParticleTypes.SQUID_INK, dem2.x, dem2.y + 0.5, dem2.z, 0, dem4.x, dem4.y, dem4.z, 0.10000000149011612);
         }
     }
     
     @Override
-    public void travel(final Vec3 cvl) {
+    public void travel(final Vec3 dem) {
         this.move(MoverType.SELF, this.getDeltaMovement());
     }
     
-    public static boolean checkSquidSpawnRules(final EntityType<Squid> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return fk.getY() > 45 && fk.getY() < bjx.getSeaLevel();
+    public static boolean checkSquidSpawnRules(final EntityType<Squid> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return fu.getY() > 45 && fu.getY() < bqc.getSeaLevel();
     }
     
     @Override
@@ -211,8 +213,8 @@ public class Squid extends WaterAnimal {
     class SquidRandomMovementGoal extends Goal {
         private final Squid squid;
         
-        public SquidRandomMovementGoal(final Squid aty2) {
-            this.squid = aty2;
+        public SquidRandomMovementGoal(final Squid azg2) {
+            this.squid = azg2;
         }
         
         @Override
@@ -226,7 +228,7 @@ public class Squid extends WaterAnimal {
             if (integer2 > 100) {
                 this.squid.setMovementVector(0.0f, 0.0f, 0.0f);
             }
-            else if (this.squid.getRandom().nextInt(50) == 0 || !this.squid.wasInWater || !this.squid.hasMovementVector()) {
+            else if (this.squid.getRandom().nextInt(50) == 0 || !this.squid.wasTouchingWater || !this.squid.hasMovementVector()) {
                 final float float3 = this.squid.getRandom().nextFloat() * 6.2831855f;
                 final float float4 = Mth.cos(float3) * 0.2f;
                 final float float5 = -0.1f + this.squid.getRandom().nextFloat() * 0.2f;
@@ -244,8 +246,8 @@ public class Squid extends WaterAnimal {
         
         @Override
         public boolean canUse() {
-            final LivingEntity akz2 = Squid.this.getLastHurtByMob();
-            return Squid.this.isInWater() && akz2 != null && Squid.this.distanceToSqr(akz2) < 100.0;
+            final LivingEntity aoy2 = Squid.this.getLastHurtByMob();
+            return Squid.this.isInWater() && aoy2 != null && Squid.this.distanceToSqr(aoy2) < 100.0;
         }
         
         @Override
@@ -256,29 +258,29 @@ public class Squid extends WaterAnimal {
         @Override
         public void tick() {
             ++this.fleeTicks;
-            final LivingEntity akz2 = Squid.this.getLastHurtByMob();
-            if (akz2 == null) {
+            final LivingEntity aoy2 = Squid.this.getLastHurtByMob();
+            if (aoy2 == null) {
                 return;
             }
-            Vec3 cvl3 = new Vec3(Squid.this.getX() - akz2.getX(), Squid.this.getY() - akz2.getY(), Squid.this.getZ() - akz2.getZ());
-            final BlockState byj4 = Squid.this.level.getBlockState(new BlockPos(Squid.this.getX() + cvl3.x, Squid.this.getY() + cvl3.y, Squid.this.getZ() + cvl3.z));
-            final FluidState coj5 = Squid.this.level.getFluidState(new BlockPos(Squid.this.getX() + cvl3.x, Squid.this.getY() + cvl3.y, Squid.this.getZ() + cvl3.z));
-            if (coj5.is(FluidTags.WATER) || byj4.isAir()) {
-                final double double6 = cvl3.length();
+            Vec3 dem3 = new Vec3(Squid.this.getX() - aoy2.getX(), Squid.this.getY() - aoy2.getY(), Squid.this.getZ() - aoy2.getZ());
+            final BlockState cfj4 = Squid.this.level.getBlockState(new BlockPos(Squid.this.getX() + dem3.x, Squid.this.getY() + dem3.y, Squid.this.getZ() + dem3.z));
+            final FluidState cxa5 = Squid.this.level.getFluidState(new BlockPos(Squid.this.getX() + dem3.x, Squid.this.getY() + dem3.y, Squid.this.getZ() + dem3.z));
+            if (cxa5.is(FluidTags.WATER) || cfj4.isAir()) {
+                final double double6 = dem3.length();
                 if (double6 > 0.0) {
-                    cvl3.normalize();
+                    dem3.normalize();
                     float float8 = 3.0f;
                     if (double6 > 5.0) {
                         float8 -= (float)((double6 - 5.0) / 5.0);
                     }
                     if (float8 > 0.0f) {
-                        cvl3 = cvl3.scale(float8);
+                        dem3 = dem3.scale(float8);
                     }
                 }
-                if (byj4.isAir()) {
-                    cvl3 = cvl3.subtract(0.0, cvl3.y, 0.0);
+                if (cfj4.isAir()) {
+                    dem3 = dem3.subtract(0.0, dem3.y, 0.0);
                 }
-                Squid.this.setMovementVector((float)cvl3.x / 20.0f, (float)cvl3.y / 20.0f, (float)cvl3.z / 20.0f);
+                Squid.this.setMovementVector((float)dem3.x / 20.0f, (float)dem3.y / 20.0f, (float)dem3.z / 20.0f);
             }
             if (this.fleeTicks % 10 == 5) {
                 Squid.this.level.addParticle(ParticleTypes.BUBBLE, Squid.this.getX(), Squid.this.getY(), Squid.this.getZ(), 0.0, 0.0, 0.0);
diff --git a/src/net/minecraft/world/entity/animal/TropicalFish.java b/src/net/minecraft/world/entity/animal/TropicalFish.java
index 93f9de3..35b8837 100644
--- a/src/net/minecraft/world/entity/animal/TropicalFish.java
+++ b/src/net/minecraft/world/entity/animal/TropicalFish.java
@@ -4,6 +4,7 @@ import java.util.Locale;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.Util;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
@@ -30,12 +31,12 @@ public class TropicalFish extends AbstractSchoolingFish {
     public static final int[] COMMON_VARIANTS;
     private boolean isSchool;
     
-    private static int calculateVariant(final Pattern a, final DyeColor bdj2, final DyeColor bdj3) {
-        return (a.getBase() & 0xFF) | (a.getIndex() & 0xFF) << 8 | (bdj2.getId() & 0xFF) << 16 | (bdj3.getId() & 0xFF) << 24;
+    private static int calculateVariant(final Pattern a, final DyeColor bje2, final DyeColor bje3) {
+        return (a.getBase() & 0xFF) | (a.getIndex() & 0xFF) << 8 | (bje2.getId() & 0xFF) << 16 | (bje3.getId() & 0xFF) << 24;
     }
     
-    public TropicalFish(final EntityType<? extends TropicalFish> aku, final Level bjw) {
-        super(aku, bjw);
+    public TropicalFish(final EntityType<? extends TropicalFish> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.isSchool = true;
     }
     
@@ -64,15 +65,15 @@ public class TropicalFish extends AbstractSchoolingFish {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("Variant", this.getVariant());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Variant", this.getVariant());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setVariant(jt.getInt("Variant"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setVariant(le.getInt("Variant"));
     }
     
     public void setVariant(final int integer) {
@@ -89,10 +90,10 @@ public class TropicalFish extends AbstractSchoolingFish {
     }
     
     @Override
-    protected void saveToBucketTag(final ItemStack ben) {
-        super.saveToBucketTag(ben);
-        final CompoundTag jt3 = ben.getOrCreateTag();
-        jt3.putInt("BucketVariantTag", this.getVariant());
+    protected void saveToBucketTag(final ItemStack bki) {
+        super.saveToBucketTag(bki);
+        final CompoundTag le3 = bki.getOrCreateTag();
+        le3.putInt("BucketVariantTag", this.getVariant());
     }
     
     @Override
@@ -111,7 +112,7 @@ public class TropicalFish extends AbstractSchoolingFish {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.TROPICAL_FISH_HURT;
     }
     
@@ -161,30 +162,30 @@ public class TropicalFish extends AbstractSchoolingFish {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        alm = super.finalizeSpawn(bjx, ajj, alc, alm, jt);
-        if (jt != null && jt.contains("BucketVariantTag", 3)) {
-            this.setVariant(jt.getInt("BucketVariantTag"));
-            return alm;
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        apo = super.finalizeSpawn(bqc, ane, apb, apo, le);
+        if (le != null && le.contains("BucketVariantTag", 3)) {
+            this.setVariant(le.getInt("BucketVariantTag"));
+            return apo;
         }
         int integer7;
         int integer8;
         int integer9;
         int integer10;
-        if (alm instanceof TropicalFishGroupData) {
-            final TropicalFishGroupData b11 = (TropicalFishGroupData)alm;
+        if (apo instanceof TropicalFishGroupData) {
+            final TropicalFishGroupData b11 = (TropicalFishGroupData)apo;
             integer7 = b11.base;
             integer8 = b11.pattern;
             integer9 = b11.baseColor;
             integer10 = b11.patternColor;
         }
         else if (this.random.nextFloat() < 0.9) {
-            final int integer11 = TropicalFish.COMMON_VARIANTS[this.random.nextInt(TropicalFish.COMMON_VARIANTS.length)];
+            final int integer11 = Util.getRandom(TropicalFish.COMMON_VARIANTS, this.random);
             integer7 = (integer11 & 0xFF);
             integer8 = (integer11 & 0xFF00) >> 8;
             integer9 = (integer11 & 0xFF0000) >> 16;
             integer10 = (integer11 & 0xFF000000) >> 24;
-            alm = new TropicalFishGroupData(this, integer7, integer8, integer9, integer10);
+            apo = new TropicalFishGroupData(this, integer7, integer8, integer9, integer10);
         }
         else {
             this.isSchool = false;
@@ -194,7 +195,7 @@ public class TropicalFish extends AbstractSchoolingFish {
             integer10 = this.random.nextInt(15);
         }
         this.setVariant(integer7 | integer8 << 8 | integer9 << 16 | integer10 << 24);
-        return alm;
+        return apo;
     }
     
     static {
@@ -255,8 +256,8 @@ public class TropicalFish extends AbstractSchoolingFish {
         private final int baseColor;
         private final int patternColor;
         
-        private TropicalFishGroupData(final TropicalFish atz, final int integer2, final int integer3, final int integer4, final int integer5) {
-            super(atz);
+        private TropicalFishGroupData(final TropicalFish azh, final int integer2, final int integer3, final int integer4, final int integer5) {
+            super(azh);
             this.base = integer2;
             this.pattern = integer3;
             this.baseColor = integer4;
diff --git a/src/net/minecraft/world/entity/animal/Turtle.java b/src/net/minecraft/world/entity/animal/Turtle.java
index c42cd34..cb8ef34 100644
--- a/src/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/net/minecraft/world/entity/animal/Turtle.java
@@ -1,13 +1,12 @@
 package net.minecraft.world.entity.animal;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.pathfinder.TurtleNodeEvaluator;
 import net.minecraft.world.level.pathfinder.PathFinder;
 import net.minecraft.world.entity.ai.navigation.WaterBoundPathNavigation;
 import net.minecraft.world.entity.ai.control.MoveControl;
 import net.minecraft.world.entity.ai.goal.RandomStrollGoal;
 import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.level.block.TurtleEggBlock;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.entity.ai.goal.MoveToBlockGoal;
 import net.minecraft.server.level.ServerPlayer;
@@ -23,12 +22,12 @@ import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.ai.util.RandomPos;
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.ai.goal.PanicGoal;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.world.entity.LightningBolt;
 import net.minecraft.core.Position;
 import net.minecraft.world.entity.MoverType;
 import net.minecraft.world.phys.Vec3;
@@ -36,6 +35,8 @@ import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.item.ItemStack;
@@ -46,14 +47,16 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.MobType;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.TurtleEggBlock;
 import java.util.Random;
-import net.minecraft.world.entity.Entity;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
@@ -78,23 +81,23 @@ public class Turtle extends Animal {
     private int layEggCounter;
     public static final Predicate<LivingEntity> BABY_ON_LAND_SELECTOR;
     
-    public Turtle(final EntityType<? extends Turtle> aku, final Level bjw) {
-        super(aku, bjw);
+    public Turtle(final EntityType<? extends Turtle> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.setPathfindingMalus(BlockPathTypes.WATER, 0.0f);
         this.moveControl = new TurtleMoveControl(this);
         this.maxUpStep = 1.0f;
     }
     
-    public void setHomePos(final BlockPos fk) {
-        this.entityData.<BlockPos>set(Turtle.HOME_POS, fk);
+    public void setHomePos(final BlockPos fu) {
+        this.entityData.<BlockPos>set(Turtle.HOME_POS, fu);
     }
     
     private BlockPos getHomePos() {
         return this.entityData.<BlockPos>get(Turtle.HOME_POS);
     }
     
-    private void setTravelPos(final BlockPos fk) {
-        this.entityData.<BlockPos>set(Turtle.TRAVEL_POS, fk);
+    private void setTravelPos(final BlockPos fu) {
+        this.entityData.<BlockPos>set(Turtle.TRAVEL_POS, fu);
     }
     
     private BlockPos getTravelPos() {
@@ -146,41 +149,41 @@ public class Turtle extends Animal {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("HomePosX", this.getHomePos().getX());
-        jt.putInt("HomePosY", this.getHomePos().getY());
-        jt.putInt("HomePosZ", this.getHomePos().getZ());
-        jt.putBoolean("HasEgg", this.hasEgg());
-        jt.putInt("TravelPosX", this.getTravelPos().getX());
-        jt.putInt("TravelPosY", this.getTravelPos().getY());
-        jt.putInt("TravelPosZ", this.getTravelPos().getZ());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("HomePosX", this.getHomePos().getX());
+        le.putInt("HomePosY", this.getHomePos().getY());
+        le.putInt("HomePosZ", this.getHomePos().getZ());
+        le.putBoolean("HasEgg", this.hasEgg());
+        le.putInt("TravelPosX", this.getTravelPos().getX());
+        le.putInt("TravelPosY", this.getTravelPos().getY());
+        le.putInt("TravelPosZ", this.getTravelPos().getZ());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        final int integer3 = jt.getInt("HomePosX");
-        final int integer4 = jt.getInt("HomePosY");
-        final int integer5 = jt.getInt("HomePosZ");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        final int integer3 = le.getInt("HomePosX");
+        final int integer4 = le.getInt("HomePosY");
+        final int integer5 = le.getInt("HomePosZ");
         this.setHomePos(new BlockPos(integer3, integer4, integer5));
-        super.readAdditionalSaveData(jt);
-        this.setHasEgg(jt.getBoolean("HasEgg"));
-        final int integer6 = jt.getInt("TravelPosX");
-        final int integer7 = jt.getInt("TravelPosY");
-        final int integer8 = jt.getInt("TravelPosZ");
+        super.readAdditionalSaveData(le);
+        this.setHasEgg(le.getBoolean("HasEgg"));
+        final int integer6 = le.getInt("TravelPosX");
+        final int integer7 = le.getInt("TravelPosY");
+        final int integer8 = le.getInt("TravelPosZ");
         this.setTravelPos(new BlockPos(integer6, integer7, integer8));
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        this.setHomePos(new BlockPos(this));
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        this.setHomePos(this.blockPosition());
         this.setTravelPos(BlockPos.ZERO);
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
-    public static boolean checkTurtleSpawnRules(final EntityType<Turtle> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return fk.getY() < bjx.getSeaLevel() + 4 && bjx.getBlockState(fk.below()).getBlock() == Blocks.SAND && bjx.getRawBrightness(fk, 0) > 8;
+    public static boolean checkTurtleSpawnRules(final EntityType<Turtle> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return fu.getY() < bqc.getSeaLevel() + 4 && TurtleEggBlock.onSand(bqc, fu) && bqc.getRawBrightness(fu, 0) > 8;
     }
     
     @Override
@@ -196,15 +199,12 @@ public class Turtle extends Animal {
         this.goalSelector.addGoal(9, new TurtleRandomStrollGoal(this, 1.0, 100));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(30.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 30.0).add(Attributes.MOVEMENT_SPEED, 0.25);
     }
     
     @Override
-    public boolean isPushedByWater() {
+    public boolean isPushedByFluid() {
         return false;
     }
     
@@ -244,7 +244,7 @@ public class Turtle extends Animal {
     
     @Nullable
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         if (this.isBaby()) {
             return SoundEvents.TURTLE_HURT_BABY;
         }
@@ -261,9 +261,9 @@ public class Turtle extends Animal {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
-        final SoundEvent aah4 = this.isBaby() ? SoundEvents.TURTLE_SHAMBLE_BABY : SoundEvents.TURTLE_SHAMBLE;
-        this.playSound(aah4, 0.15f, 1.0f);
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
+        final SoundEvent ack4 = this.isBaby() ? SoundEvents.TURTLE_SHAMBLE_BABY : SoundEvents.TURTLE_SHAMBLE;
+        this.playSound(ack4, 0.15f, 1.0f);
     }
     
     @Override
@@ -282,39 +282,39 @@ public class Turtle extends Animal {
     }
     
     @Override
-    protected PathNavigation createNavigation(final Level bjw) {
-        return new TurtlePathNavigation(this, bjw);
+    protected PathNavigation createNavigation(final Level bqb) {
+        return new TurtlePathNavigation(this, bqb);
     }
     
     @Nullable
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
+    public AgableMob getBreedOffspring(final AgableMob aok) {
         return EntityType.TURTLE.create(this.level);
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        return ben.getItem() == Blocks.SEAGRASS.asItem();
+    public boolean isFood(final ItemStack bki) {
+        return bki.getItem() == Blocks.SEAGRASS.asItem();
     }
     
     @Override
-    public float getWalkTargetValue(final BlockPos fk, final LevelReader bjz) {
-        if (!this.isGoingHome() && bjz.getFluidState(fk).is(FluidTags.WATER)) {
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        if (!this.isGoingHome() && bqd.getFluidState(fu).is(FluidTags.WATER)) {
             return 10.0f;
         }
-        if (bjz.getBlockState(fk.below()).getBlock() == Blocks.SAND) {
+        if (TurtleEggBlock.onSand(bqd, fu)) {
             return 10.0f;
         }
-        return bjz.getBrightness(fk) - 0.5f;
+        return bqd.getBrightness(fu) - 0.5f;
     }
     
     @Override
     public void aiStep() {
         super.aiStep();
         if (this.isAlive() && this.isLayingEgg() && this.layEggCounter >= 1 && this.layEggCounter % 5 == 0) {
-            final BlockPos fk2 = new BlockPos(this);
-            if (this.level.getBlockState(fk2.below()).getBlock() == Blocks.SAND) {
-                this.level.levelEvent(2001, fk2, Block.getId(Blocks.SAND.defaultBlockState()));
+            final BlockPos fu2 = this.blockPosition();
+            if (TurtleEggBlock.onSand(this.level, fu2)) {
+                this.level.levelEvent(2001, fu2, Block.getId(Blocks.SAND.defaultBlockState()));
             }
         }
     }
@@ -328,9 +328,9 @@ public class Turtle extends Animal {
     }
     
     @Override
-    public void travel(final Vec3 cvl) {
+    public void travel(final Vec3 dem) {
         if (this.isEffectiveAi() && this.isInWater()) {
-            this.moveRelative(0.1f, cvl);
+            this.moveRelative(0.1f, dem);
             this.move(MoverType.SELF, this.getDeltaMovement());
             this.setDeltaMovement(this.getDeltaMovement().scale(0.9));
             if (this.getTarget() == null && (!this.isGoingHome() || !this.getHomePos().closerThan(this.position(), 20.0))) {
@@ -338,17 +338,17 @@ public class Turtle extends Animal {
             }
         }
         else {
-            super.travel(cvl);
+            super.travel(dem);
         }
     }
     
     @Override
-    public boolean canBeLeashed(final Player ayj) {
+    public boolean canBeLeashed(final Player bec) {
         return false;
     }
     
     @Override
-    public void thunderHit(final LightningBolt avy) {
+    public void thunderHit(final LightningBolt aox) {
         this.hurt(DamageSource.LIGHTNING_BOLT, Float.MAX_VALUE);
     }
     
@@ -359,12 +359,12 @@ public class Turtle extends Animal {
         TRAVEL_POS = SynchedEntityData.<BlockPos>defineId(Turtle.class, EntityDataSerializers.BLOCK_POS);
         GOING_HOME = SynchedEntityData.<Boolean>defineId(Turtle.class, EntityDataSerializers.BOOLEAN);
         TRAVELLING = SynchedEntityData.<Boolean>defineId(Turtle.class, EntityDataSerializers.BOOLEAN);
-        BABY_ON_LAND_SELECTOR = (akz -> akz.isBaby() && !akz.isInWater());
+        BABY_ON_LAND_SELECTOR = (aoy -> aoy.isBaby() && !aoy.isInWater());
     }
     
     static class TurtlePanicGoal extends PanicGoal {
-        TurtlePanicGoal(final Turtle aua, final double double2) {
-            super(aua, double2);
+        TurtlePanicGoal(final Turtle azi, final double double2) {
+            super(azi, double2);
         }
         
         @Override
@@ -372,11 +372,11 @@ public class Turtle extends Animal {
             if (this.mob.getLastHurtByMob() == null && !this.mob.isOnFire()) {
                 return false;
             }
-            final BlockPos fk2 = this.lookForWater(this.mob.level, this.mob, 7, 4);
-            if (fk2 != null) {
-                this.posX = fk2.getX();
-                this.posY = fk2.getY();
-                this.posZ = fk2.getZ();
+            final BlockPos fu2 = this.lookForWater(this.mob.level, this.mob, 7, 4);
+            if (fu2 != null) {
+                this.posX = fu2.getX();
+                this.posY = fu2.getY();
+                this.posZ = fu2.getZ();
                 return true;
             }
             return this.findRandomPosition();
@@ -388,8 +388,8 @@ public class Turtle extends Animal {
         private final double speedModifier;
         private boolean stuck;
         
-        TurtleTravelGoal(final Turtle aua, final double double2) {
-            this.turtle = aua;
+        TurtleTravelGoal(final Turtle azi, final double double2) {
+            this.turtle = azi;
             this.speedModifier = double2;
         }
         
@@ -409,8 +409,8 @@ public class Turtle extends Animal {
             if (integer5 + this.turtle.getY() > this.turtle.level.getSeaLevel() - 1) {
                 integer5 = 0;
             }
-            final BlockPos fk8 = new BlockPos(integer4 + this.turtle.getX(), integer5 + this.turtle.getY(), integer6 + this.turtle.getZ());
-            this.turtle.setTravelPos(fk8);
+            final BlockPos fu8 = new BlockPos(integer4 + this.turtle.getX(), integer5 + this.turtle.getY(), integer6 + this.turtle.getZ());
+            this.turtle.setTravelPos(fu8);
             this.turtle.setTravelling(true);
             this.stuck = false;
         }
@@ -418,24 +418,24 @@ public class Turtle extends Animal {
         @Override
         public void tick() {
             if (this.turtle.getNavigation().isDone()) {
-                final Vec3 cvl2 = new Vec3(this.turtle.getTravelPos());
-                Vec3 cvl3 = RandomPos.getPosTowards(this.turtle, 16, 3, cvl2, 0.3141592741012573);
-                if (cvl3 == null) {
-                    cvl3 = RandomPos.getPosTowards(this.turtle, 8, 7, cvl2);
+                final Vec3 dem2 = Vec3.atBottomCenterOf(this.turtle.getTravelPos());
+                Vec3 dem3 = RandomPos.getPosTowards(this.turtle, 16, 3, dem2, 0.3141592741012573);
+                if (dem3 == null) {
+                    dem3 = RandomPos.getPosTowards(this.turtle, 8, 7, dem2);
                 }
-                if (cvl3 != null) {
-                    final int integer4 = Mth.floor(cvl3.x);
-                    final int integer5 = Mth.floor(cvl3.z);
+                if (dem3 != null) {
+                    final int integer4 = Mth.floor(dem3.x);
+                    final int integer5 = Mth.floor(dem3.z);
                     final int integer6 = 34;
                     if (!this.turtle.level.hasChunksAt(integer4 - 34, 0, integer5 - 34, integer4 + 34, 0, integer5 + 34)) {
-                        cvl3 = null;
+                        dem3 = null;
                     }
                 }
-                if (cvl3 == null) {
+                if (dem3 == null) {
                     this.stuck = true;
                     return;
                 }
-                this.turtle.getNavigation().moveTo(cvl3.x, cvl3.y, cvl3.z, this.speedModifier);
+                this.turtle.getNavigation().moveTo(dem3.x, dem3.y, dem3.z, this.speedModifier);
             }
         }
         
@@ -457,8 +457,8 @@ public class Turtle extends Animal {
         private boolean stuck;
         private int closeToHomeTryTicks;
         
-        TurtleGoHomeGoal(final Turtle aua, final double double2) {
-            this.turtle = aua;
+        TurtleGoHomeGoal(final Turtle azi, final double double2) {
+            this.turtle = azi;
             this.speedModifier = double2;
         }
         
@@ -486,25 +486,25 @@ public class Turtle extends Animal {
         
         @Override
         public void tick() {
-            final BlockPos fk2 = this.turtle.getHomePos();
-            final boolean boolean3 = fk2.closerThan(this.turtle.position(), 16.0);
+            final BlockPos fu2 = this.turtle.getHomePos();
+            final boolean boolean3 = fu2.closerThan(this.turtle.position(), 16.0);
             if (boolean3) {
                 ++this.closeToHomeTryTicks;
             }
             if (this.turtle.getNavigation().isDone()) {
-                final Vec3 cvl4 = new Vec3(fk2);
-                Vec3 cvl5 = RandomPos.getPosTowards(this.turtle, 16, 3, cvl4, 0.3141592741012573);
-                if (cvl5 == null) {
-                    cvl5 = RandomPos.getPosTowards(this.turtle, 8, 7, cvl4);
+                final Vec3 dem4 = Vec3.atBottomCenterOf(fu2);
+                Vec3 dem5 = RandomPos.getPosTowards(this.turtle, 16, 3, dem4, 0.3141592741012573);
+                if (dem5 == null) {
+                    dem5 = RandomPos.getPosTowards(this.turtle, 8, 7, dem4);
                 }
-                if (cvl5 != null && !boolean3 && this.turtle.level.getBlockState(new BlockPos(cvl5)).getBlock() != Blocks.WATER) {
-                    cvl5 = RandomPos.getPosTowards(this.turtle, 16, 5, cvl4);
+                if (dem5 != null && !boolean3 && !this.turtle.level.getBlockState(new BlockPos(dem5)).is(Blocks.WATER)) {
+                    dem5 = RandomPos.getPosTowards(this.turtle, 16, 5, dem4);
                 }
-                if (cvl5 == null) {
+                if (dem5 == null) {
                     this.stuck = true;
                     return;
                 }
-                this.turtle.getNavigation().moveTo(cvl5.x, cvl5.y, cvl5.z, this.speedModifier);
+                this.turtle.getNavigation().moveTo(dem5.x, dem5.y, dem5.z, this.speedModifier);
             }
         }
     }
@@ -517,10 +517,10 @@ public class Turtle extends Animal {
         private int calmDown;
         private final Set<Item> items;
         
-        TurtleTemptGoal(final Turtle aua, final double double2, final Item bei) {
-            this.turtle = aua;
+        TurtleTemptGoal(final Turtle azi, final double double2, final Item bke) {
+            this.turtle = azi;
             this.speedModifier = double2;
-            this.items = Sets.<Item>newHashSet(bei);
+            this.items = Sets.<Item>newHashSet(bke);
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
         }
         
@@ -534,8 +534,8 @@ public class Turtle extends Animal {
             return this.player != null && (this.shouldFollowItem(this.player.getMainHandItem()) || this.shouldFollowItem(this.player.getOffhandItem()));
         }
         
-        private boolean shouldFollowItem(final ItemStack ben) {
-            return this.items.contains(ben.getItem());
+        private boolean shouldFollowItem(final ItemStack bki) {
+            return this.items.contains(bki.getItem());
         }
         
         @Override
@@ -569,9 +569,9 @@ public class Turtle extends Animal {
     static class TurtleBreedGoal extends BreedGoal {
         private final Turtle turtle;
         
-        TurtleBreedGoal(final Turtle aua, final double double2) {
-            super(aua, double2);
-            this.turtle = aua;
+        TurtleBreedGoal(final Turtle azi, final double double2) {
+            super(azi, double2);
+            this.turtle = azi;
         }
         
         @Override
@@ -581,13 +581,13 @@ public class Turtle extends Animal {
         
         @Override
         protected void breed() {
-            ServerPlayer xe2 = this.animal.getLoveCause();
-            if (xe2 == null && this.partner.getLoveCause() != null) {
-                xe2 = this.partner.getLoveCause();
+            ServerPlayer ze2 = this.animal.getLoveCause();
+            if (ze2 == null && this.partner.getLoveCause() != null) {
+                ze2 = this.partner.getLoveCause();
             }
-            if (xe2 != null) {
-                xe2.awardStat(Stats.ANIMALS_BRED);
-                CriteriaTriggers.BRED_ANIMALS.trigger(xe2, this.animal, this.partner, null);
+            if (ze2 != null) {
+                ze2.awardStat(Stats.ANIMALS_BRED);
+                CriteriaTriggers.BRED_ANIMALS.trigger(ze2, this.animal, this.partner, null);
             }
             this.turtle.setHasEgg(true);
             this.animal.resetLove();
@@ -602,9 +602,9 @@ public class Turtle extends Animal {
     static class TurtleLayEggGoal extends MoveToBlockGoal {
         private final Turtle turtle;
         
-        TurtleLayEggGoal(final Turtle aua, final double double2) {
-            super(aua, double2, 16);
-            this.turtle = aua;
+        TurtleLayEggGoal(final Turtle azi, final double double2) {
+            super(azi, double2, 16);
+            this.turtle = azi;
         }
         
         @Override
@@ -620,15 +620,15 @@ public class Turtle extends Animal {
         @Override
         public void tick() {
             super.tick();
-            final BlockPos fk2 = new BlockPos(this.turtle);
+            final BlockPos fu2 = this.turtle.blockPosition();
             if (!this.turtle.isInWater() && this.isReachedTarget()) {
                 if (this.turtle.layEggCounter < 1) {
                     this.turtle.setLayingEgg(true);
                 }
                 else if (this.turtle.layEggCounter > 200) {
-                    final Level bjw3 = this.turtle.level;
-                    bjw3.playSound(null, fk2, SoundEvents.TURTLE_LAY_EGG, SoundSource.BLOCKS, 0.3f, 0.9f + bjw3.random.nextFloat() * 0.2f);
-                    bjw3.setBlock(this.blockPos.above(), ((AbstractStateHolder<O, BlockState>)Blocks.TURTLE_EGG.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)TurtleEggBlock.EGGS, this.turtle.random.nextInt(4) + 1), 3);
+                    final Level bqb3 = this.turtle.level;
+                    bqb3.playSound(null, fu2, SoundEvents.TURTLE_LAY_EGG, SoundSource.BLOCKS, 0.3f, 0.9f + bqb3.random.nextFloat() * 0.2f);
+                    bqb3.setBlock(this.blockPos.above(), ((StateHolder<O, BlockState>)Blocks.TURTLE_EGG.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)TurtleEggBlock.EGGS, this.turtle.random.nextInt(4) + 1), 3);
                     this.turtle.setHasEgg(false);
                     this.turtle.setLayingEgg(false);
                     this.turtle.setInLoveTime(600);
@@ -640,21 +640,17 @@ public class Turtle extends Animal {
         }
         
         @Override
-        protected boolean isValidTarget(final LevelReader bjz, final BlockPos fk) {
-            if (!bjz.isEmptyBlock(fk.above())) {
-                return false;
-            }
-            final Block bph4 = bjz.getBlockState(fk).getBlock();
-            return bph4 == Blocks.SAND;
+        protected boolean isValidTarget(final LevelReader bqd, final BlockPos fu) {
+            return bqd.isEmptyBlock(fu.above()) && TurtleEggBlock.isSand(bqd, fu);
         }
     }
     
     static class TurtleRandomStrollGoal extends RandomStrollGoal {
         private final Turtle turtle;
         
-        private TurtleRandomStrollGoal(final Turtle aua, final double double2, final int integer) {
-            super(aua, double2, integer);
-            this.turtle = aua;
+        private TurtleRandomStrollGoal(final Turtle azi, final double double2, final int integer) {
+            super(azi, double2, integer);
+            this.turtle = azi;
         }
         
         @Override
@@ -666,9 +662,9 @@ public class Turtle extends Animal {
     static class TurtleGoToWaterGoal extends MoveToBlockGoal {
         private final Turtle turtle;
         
-        private TurtleGoToWaterGoal(final Turtle aua, final double double2) {
-            super(aua, aua.isBaby() ? 2.0 : double2, 24);
-            this.turtle = aua;
+        private TurtleGoToWaterGoal(final Turtle azi, final double double2) {
+            super(azi, azi.isBaby() ? 2.0 : double2, 24);
+            this.turtle = azi;
             this.verticalSearchStart = -1;
         }
         
@@ -691,18 +687,17 @@ public class Turtle extends Animal {
         }
         
         @Override
-        protected boolean isValidTarget(final LevelReader bjz, final BlockPos fk) {
-            final Block bph4 = bjz.getBlockState(fk).getBlock();
-            return bph4 == Blocks.WATER;
+        protected boolean isValidTarget(final LevelReader bqd, final BlockPos fu) {
+            return bqd.getBlockState(fu).is(Blocks.WATER);
         }
     }
     
     static class TurtleMoveControl extends MoveControl {
         private final Turtle turtle;
         
-        TurtleMoveControl(final Turtle aua) {
-            super(aua);
-            this.turtle = aua;
+        TurtleMoveControl(final Turtle azi) {
+            super(azi);
+            this.turtle = azi;
         }
         
         private void updateSpeed() {
@@ -735,15 +730,15 @@ public class Turtle extends Animal {
             final float float10 = (float)(Mth.atan2(double4, double2) * 57.2957763671875) - 90.0f;
             this.turtle.yRot = this.rotlerp(this.turtle.yRot, float10, 90.0f);
             this.turtle.yBodyRot = this.turtle.yRot;
-            final float float11 = (float)(this.speedModifier * this.turtle.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue());
+            final float float11 = (float)(this.speedModifier * this.turtle.getAttributeValue(Attributes.MOVEMENT_SPEED));
             this.turtle.setSpeed(Mth.lerp(0.125f, this.turtle.getSpeed(), float11));
             this.turtle.setDeltaMovement(this.turtle.getDeltaMovement().add(0.0, this.turtle.getSpeed() * double3 * 0.1, 0.0));
         }
     }
     
     static class TurtlePathNavigation extends WaterBoundPathNavigation {
-        TurtlePathNavigation(final Turtle aua, final Level bjw) {
-            super(aua, bjw);
+        TurtlePathNavigation(final Turtle azi, final Level bqb) {
+            super(azi, bqb);
         }
         
         @Override
@@ -758,14 +753,14 @@ public class Turtle extends Animal {
         }
         
         @Override
-        public boolean isStableDestination(final BlockPos fk) {
+        public boolean isStableDestination(final BlockPos fu) {
             if (this.mob instanceof Turtle) {
-                final Turtle aua3 = (Turtle)this.mob;
-                if (aua3.isTravelling()) {
-                    return this.level.getBlockState(fk).getBlock() == Blocks.WATER;
+                final Turtle azi3 = (Turtle)this.mob;
+                if (azi3.isTravelling()) {
+                    return this.level.getBlockState(fu).is(Blocks.WATER);
                 }
             }
-            return !this.level.getBlockState(fk.below()).isAir();
+            return !this.level.getBlockState(fu.below()).isAir();
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/WaterAnimal.java b/src/net/minecraft/world/entity/animal/WaterAnimal.java
index 3958d70..f3995e1 100644
--- a/src/net/minecraft/world/entity/animal/WaterAnimal.java
+++ b/src/net/minecraft/world/entity/animal/WaterAnimal.java
@@ -11,8 +11,8 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.PathfinderMob;
 
 public abstract class WaterAnimal extends PathfinderMob {
-    protected WaterAnimal(final EntityType<? extends WaterAnimal> aku, final Level bjw) {
-        super(aku, bjw);
+    protected WaterAnimal(final EntityType<? extends WaterAnimal> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.setPathfindingMalus(BlockPathTypes.WATER, 0.0f);
     }
     
@@ -27,8 +27,8 @@ public abstract class WaterAnimal extends PathfinderMob {
     }
     
     @Override
-    public boolean checkSpawnObstruction(final LevelReader bjz) {
-        return bjz.isUnobstructed(this);
+    public boolean checkSpawnObstruction(final LevelReader bqd) {
+        return bqd.isUnobstructed(this);
     }
     
     @Override
@@ -37,7 +37,7 @@ public abstract class WaterAnimal extends PathfinderMob {
     }
     
     @Override
-    protected int getExperienceReward(final Player ayj) {
+    protected int getExperienceReward(final Player bec) {
         return 1 + this.level.random.nextInt(3);
     }
     
@@ -62,12 +62,12 @@ public abstract class WaterAnimal extends PathfinderMob {
     }
     
     @Override
-    public boolean isPushedByWater() {
+    public boolean isPushedByFluid() {
         return false;
     }
     
     @Override
-    public boolean canBeLeashed(final Player ayj) {
+    public boolean canBeLeashed(final Player bec) {
         return false;
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/Wolf.java b/src/net/minecraft/world/entity/animal/Wolf.java
index 53e1f1d..734fba9 100644
--- a/src/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/net/minecraft/world/entity/animal/Wolf.java
@@ -1,19 +1,20 @@
 package net.minecraft.world.entity.animal;
 
 import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
+import net.minecraft.util.TimeUtil;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import java.util.Random;
 import net.minecraft.world.entity.animal.horse.AbstractHorse;
 import net.minecraft.world.entity.monster.Ghast;
 import net.minecraft.world.entity.monster.Creeper;
-import java.util.UUID;
 import net.minecraft.world.entity.AgableMob;
+import javax.annotation.Nullable;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.DyeItem;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.EntityDimensions;
@@ -25,16 +26,18 @@ import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.DyeColor;
-import javax.annotation.Nullable;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
-import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.entity.ai.goal.target.ResetUniversalAngerTargetGoal;
 import net.minecraft.world.entity.monster.AbstractSkeleton;
 import net.minecraft.world.entity.ai.goal.target.NonTameRandomTargetGoal;
+import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.OwnerHurtTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.OwnerHurtByTargetGoal;
@@ -49,20 +52,24 @@ import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.ai.goal.MeleeAttackGoal;
 import net.minecraft.world.entity.ai.goal.LeapAtTargetGoal;
 import net.minecraft.world.entity.animal.horse.Llama;
+import net.minecraft.world.entity.ai.goal.SitWhenOrderedToGoal;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.goal.FloatGoal;
-import net.minecraft.world.entity.ai.goal.SitGoal;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
+import java.util.UUID;
+import net.minecraft.util.IntRange;
 import net.minecraft.world.entity.LivingEntity;
 import java.util.function.Predicate;
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.NeutralMob;
 import net.minecraft.world.entity.TamableAnimal;
 
-public class Wolf extends TamableAnimal {
+public class Wolf extends TamableAnimal implements NeutralMob {
     private static final EntityDataAccessor<Boolean> DATA_INTERESTED_ID;
     private static final EntityDataAccessor<Integer> DATA_COLLAR_COLOR;
+    private static final EntityDataAccessor<Integer> DATA_REMAINING_ANGER_TIME;
     public static final Predicate<LivingEntity> PREY_SELECTOR;
     private float interestedAngle;
     private float interestedAngleO;
@@ -70,17 +77,18 @@ public class Wolf extends TamableAnimal {
     private boolean isShaking;
     private float shakeAnim;
     private float shakeAnimO;
+    private static final IntRange PERSISTENT_ANGER_TIME;
+    private UUID persistentAngerTarget;
     
-    public Wolf(final EntityType<? extends Wolf> aku, final Level bjw) {
-        super(aku, bjw);
+    public Wolf(final EntityType<? extends Wolf> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.setTame(false);
     }
     
     @Override
     protected void registerGoals() {
-        this.sitGoal = new SitGoal(this);
         this.goalSelector.addGoal(1, new FloatGoal(this));
-        this.goalSelector.addGoal(2, this.sitGoal);
+        this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this));
         this.goalSelector.addGoal(3, new WolfAvoidEntityGoal<>(this, Llama.class, 24.0f, 1.5, 1.5));
         this.goalSelector.addGoal(4, new LeapAtTargetGoal(this, 0.4f));
         this.goalSelector.addGoal(5, new MeleeAttackGoal(this, 1.0, true));
@@ -93,33 +101,15 @@ public class Wolf extends TamableAnimal {
         this.targetSelector.addGoal(1, new OwnerHurtByTargetGoal(this));
         this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
         this.targetSelector.addGoal(3, new HurtByTargetGoal(this, new Class[0]).setAlertOthers(new Class[0]));
-        this.targetSelector.addGoal(4, new NonTameRandomTargetGoal<>(this, Animal.class, false, Wolf.PREY_SELECTOR));
-        this.targetSelector.addGoal(4, new NonTameRandomTargetGoal<>(this, Turtle.class, false, Turtle.BABY_ON_LAND_SELECTOR));
-        this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, AbstractSkeleton.class, false));
+        this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
+        this.targetSelector.addGoal(5, new NonTameRandomTargetGoal<>(this, Animal.class, false, Wolf.PREY_SELECTOR));
+        this.targetSelector.addGoal(6, new NonTameRandomTargetGoal<>(this, Turtle.class, false, Turtle.BABY_ON_LAND_SELECTOR));
+        this.targetSelector.addGoal(7, new NearestAttackableTargetGoal<>(this, AbstractSkeleton.class, false));
+        this.targetSelector.addGoal(8, new ResetUniversalAngerTargetGoal<>(this, true));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.30000001192092896);
-        if (this.isTame()) {
-            this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(20.0);
-        }
-        else {
-            this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(8.0);
-        }
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(2.0);
-    }
-    
-    @Override
-    public void setTarget(@Nullable final LivingEntity akz) {
-        super.setTarget(akz);
-        if (akz == null) {
-            this.setAngry(false);
-        }
-        else if (!this.isTame()) {
-            this.setAngry(true);
-        }
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896).add(Attributes.MAX_HEALTH, 8.0).add(Attributes.ATTACK_DAMAGE, 2.0);
     }
     
     @Override
@@ -127,27 +117,28 @@ public class Wolf extends TamableAnimal {
         super.defineSynchedData();
         this.entityData.<Boolean>define(Wolf.DATA_INTERESTED_ID, false);
         this.entityData.<Integer>define(Wolf.DATA_COLLAR_COLOR, DyeColor.RED.getId());
+        this.entityData.<Integer>define(Wolf.DATA_REMAINING_ANGER_TIME, 0);
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.WOLF_STEP, 0.15f, 1.0f);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("Angry", this.isAngry());
-        jt.putByte("CollarColor", (byte)this.getCollarColor().getId());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putByte("CollarColor", (byte)this.getCollarColor().getId());
+        this.addPersistentAngerSaveData(le);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setAngry(jt.getBoolean("Angry"));
-        if (jt.contains("CollarColor", 99)) {
-            this.setCollarColor(DyeColor.byId(jt.getInt("CollarColor")));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("CollarColor", 99)) {
+            this.setCollarColor(DyeColor.byId(le.getInt("CollarColor")));
         }
+        this.readPersistentAngerSaveData((ServerLevel)this.level, le);
     }
     
     @Override
@@ -165,7 +156,7 @@ public class Wolf extends TamableAnimal {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.WOLF_HURT;
     }
     
@@ -188,8 +179,8 @@ public class Wolf extends TamableAnimal {
             this.shakeAnimO = 0.0f;
             this.level.broadcastEntityEvent(this, (byte)8);
         }
-        if (!this.level.isClientSide && this.getTarget() == null && this.isAngry()) {
-            this.setAngry(false);
+        if (!this.level.isClientSide) {
+            this.updatePersistentAnger((ServerLevel)this.level, true);
         }
     }
     
@@ -227,23 +218,23 @@ public class Wolf extends TamableAnimal {
             if (this.shakeAnim > 0.4f) {
                 final float float2 = (float)this.getY();
                 final int integer3 = (int)(Mth.sin((this.shakeAnim - 0.4f) * 3.1415927f) * 7.0f);
-                final Vec3 cvl4 = this.getDeltaMovement();
+                final Vec3 dem4 = this.getDeltaMovement();
                 for (int integer4 = 0; integer4 < integer3; ++integer4) {
                     final float float3 = (this.random.nextFloat() * 2.0f - 1.0f) * this.getBbWidth() * 0.5f;
                     final float float4 = (this.random.nextFloat() * 2.0f - 1.0f) * this.getBbWidth() * 0.5f;
-                    this.level.addParticle(ParticleTypes.SPLASH, this.getX() + float3, float2 + 0.8f, this.getZ() + float4, cvl4.x, cvl4.y, cvl4.z);
+                    this.level.addParticle(ParticleTypes.SPLASH, this.getX() + float3, float2 + 0.8f, this.getZ() + float4, dem4.x, dem4.y, dem4.z);
                 }
             }
         }
     }
     
     @Override
-    public void die(final DamageSource ajz) {
+    public void die(final DamageSource anw) {
         this.isWet = false;
         this.isShaking = false;
         this.shakeAnimO = 0.0f;
         this.shakeAnim = 0.0f;
-        super.die(ajz);
+        super.die(anw);
     }
     
     public boolean isWet() {
@@ -270,38 +261,36 @@ public class Wolf extends TamableAnimal {
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height * 0.8f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height * 0.8f;
     }
     
     @Override
     public int getMaxHeadXRot() {
-        if (this.isSitting()) {
+        if (this.isInSittingPose()) {
             return 20;
         }
         return super.getMaxHeadXRot();
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        final Entity akq4 = ajz.getEntity();
-        if (this.sitGoal != null) {
-            this.sitGoal.wantToSit(false);
-        }
-        if (akq4 != null && !(akq4 instanceof Player) && !(akq4 instanceof AbstractArrow)) {
+        final Entity aom4 = anw.getEntity();
+        this.setOrderedToSit(false);
+        if (aom4 != null && !(aom4 instanceof Player) && !(aom4 instanceof AbstractArrow)) {
             float2 = (float2 + 1.0f) / 2.0f;
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        final boolean boolean3 = akq.hurt(DamageSource.mobAttack(this), (float)(int)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue());
+    public boolean doHurtTarget(final Entity aom) {
+        final boolean boolean3 = aom.hurt(DamageSource.mobAttack(this), (float)(int)this.getAttributeValue(Attributes.ATTACK_DAMAGE));
         if (boolean3) {
-            this.doEnchantDamageEffects(this, akq);
+            this.doEnchantDamageEffects(this, aom);
         }
         return boolean3;
     }
@@ -310,72 +299,70 @@ public class Wolf extends TamableAnimal {
     public void setTame(final boolean boolean1) {
         super.setTame(boolean1);
         if (boolean1) {
-            this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(20.0);
+            this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(20.0);
             this.setHealth(20.0f);
         }
         else {
-            this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(8.0);
+            this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(8.0);
         }
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(4.0);
+        this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(4.0);
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        final Item bei5 = ben4.getItem();
-        if (ben4.getItem() instanceof SpawnEggItem) {
-            return super.mobInteract(ayj, ajk);
-        }
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        final Item bke5 = bki4.getItem();
         if (this.level.isClientSide) {
-            return this.isOwnedBy(ayj) || (bei5 == Items.BONE && !this.isAngry());
+            final boolean boolean6 = this.isOwnedBy(bec) || this.isTame() || (bke5 == Items.BONE && !this.isTame() && !this.isAngry());
+            return boolean6 ? InteractionResult.CONSUME : InteractionResult.PASS;
         }
         if (this.isTame()) {
-            if (bei5.isEdible() && bei5.getFoodProperties().isMeat() && this.getHealth() < this.getMaxHealth()) {
-                if (!ayj.abilities.instabuild) {
-                    ben4.shrink(1);
+            if (this.isFood(bki4) && this.getHealth() < this.getMaxHealth()) {
+                if (!bec.abilities.instabuild) {
+                    bki4.shrink(1);
                 }
-                this.heal((float)bei5.getFoodProperties().getNutrition());
-                return true;
+                this.heal((float)bke5.getFoodProperties().getNutrition());
+                return InteractionResult.SUCCESS;
             }
-            if (!(bei5 instanceof DyeItem)) {
-                final boolean boolean6 = super.mobInteract(ayj, ajk);
-                if (!boolean6 || this.isBaby()) {
-                    this.sitGoal.wantToSit(!this.isSitting());
+            if (bke5 instanceof DyeItem) {
+                final DyeColor bje6 = ((DyeItem)bke5).getDyeColor();
+                if (bje6 != this.getCollarColor()) {
+                    this.setCollarColor(bje6);
+                    if (!bec.abilities.instabuild) {
+                        bki4.shrink(1);
+                    }
+                    return InteractionResult.SUCCESS;
                 }
-                return boolean6;
             }
-            final DyeColor bdj6 = ((DyeItem)bei5).getDyeColor();
-            if (bdj6 != this.getCollarColor()) {
-                this.setCollarColor(bdj6);
-                if (!ayj.abilities.instabuild) {
-                    ben4.shrink(1);
+            else {
+                final InteractionResult ang6 = super.mobInteract(bec, anf);
+                if ((!ang6.consumesAction() || this.isBaby()) && this.isOwnedBy(bec)) {
+                    this.setOrderedToSit(!this.isOrderedToSit());
+                    this.jumping = false;
+                    this.navigation.stop();
+                    this.setTarget(null);
+                    return InteractionResult.SUCCESS;
                 }
-                return true;
-            }
-            if (this.isOwnedBy(ayj) && !this.isFood(ben4)) {
-                this.sitGoal.wantToSit(!this.isSitting());
-                this.jumping = false;
-                this.navigation.stop();
-                this.setTarget(null);
+                return ang6;
             }
         }
-        else if (bei5 == Items.BONE && !this.isAngry()) {
-            if (!ayj.abilities.instabuild) {
-                ben4.shrink(1);
+        else if (bke5 == Items.BONE && !this.isAngry()) {
+            if (!bec.abilities.instabuild) {
+                bki4.shrink(1);
             }
             if (this.random.nextInt(3) == 0) {
-                this.tame(ayj);
+                this.tame(bec);
                 this.navigation.stop();
                 this.setTarget(null);
-                this.sitGoal.wantToSit(true);
+                this.setOrderedToSit(true);
                 this.level.broadcastEntityEvent(this, (byte)7);
             }
             else {
                 this.level.broadcastEntityEvent(this, (byte)6);
             }
-            return true;
+            return InteractionResult.SUCCESS;
         }
-        return super.mobInteract(ayj, ajk);
+        return super.mobInteract(bec, anf);
     }
     
     @Override
@@ -401,9 +388,9 @@ public class Wolf extends TamableAnimal {
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        final Item bei3 = ben.getItem();
-        return bei3.isEdible() && bei3.getFoodProperties().isMeat();
+    public boolean isFood(final ItemStack bki) {
+        final Item bke3 = bki.getItem();
+        return bke3.isEdible() && bke3.getFoodProperties().isMeat();
     }
     
     @Override
@@ -411,37 +398,49 @@ public class Wolf extends TamableAnimal {
         return 8;
     }
     
-    public boolean isAngry() {
-        return (this.entityData.<Byte>get(Wolf.DATA_FLAGS_ID) & 0x2) != 0x0;
+    @Override
+    public int getRemainingPersistentAngerTime() {
+        return this.entityData.<Integer>get(Wolf.DATA_REMAINING_ANGER_TIME);
     }
     
-    public void setAngry(final boolean boolean1) {
-        final byte byte3 = this.entityData.<Byte>get(Wolf.DATA_FLAGS_ID);
-        if (boolean1) {
-            this.entityData.<Byte>set(Wolf.DATA_FLAGS_ID, (byte)(byte3 | 0x2));
-        }
-        else {
-            this.entityData.<Byte>set(Wolf.DATA_FLAGS_ID, (byte)(byte3 & 0xFFFFFFFD));
-        }
+    @Override
+    public void setRemainingPersistentAngerTime(final int integer) {
+        this.entityData.<Integer>set(Wolf.DATA_REMAINING_ANGER_TIME, integer);
+    }
+    
+    @Override
+    public void startPersistentAngerTimer() {
+        this.setRemainingPersistentAngerTime(Wolf.PERSISTENT_ANGER_TIME.randomValue(this.random));
+    }
+    
+    @Nullable
+    @Override
+    public UUID getPersistentAngerTarget() {
+        return this.persistentAngerTarget;
+    }
+    
+    @Override
+    public void setPersistentAngerTarget(@Nullable final UUID uUID) {
+        this.persistentAngerTarget = uUID;
     }
     
     public DyeColor getCollarColor() {
         return DyeColor.byId(this.entityData.<Integer>get(Wolf.DATA_COLLAR_COLOR));
     }
     
-    public void setCollarColor(final DyeColor bdj) {
-        this.entityData.<Integer>set(Wolf.DATA_COLLAR_COLOR, bdj.getId());
+    public void setCollarColor(final DyeColor bje) {
+        this.entityData.<Integer>set(Wolf.DATA_COLLAR_COLOR, bje.getId());
     }
     
     @Override
-    public Wolf getBreedOffspring(final AgableMob ako) {
-        final Wolf auc3 = EntityType.WOLF.create(this.level);
+    public Wolf getBreedOffspring(final AgableMob aok) {
+        final Wolf azk3 = EntityType.WOLF.create(this.level);
         final UUID uUID4 = this.getOwnerUUID();
         if (uUID4 != null) {
-            auc3.setOwnerUUID(uUID4);
-            auc3.setTame(true);
+            azk3.setOwnerUUID(uUID4);
+            azk3.setTame(true);
         }
-        return auc3;
+        return azk3;
     }
     
     public void setIsInterested(final boolean boolean1) {
@@ -449,18 +448,18 @@ public class Wolf extends TamableAnimal {
     }
     
     @Override
-    public boolean canMate(final Animal atc) {
-        if (atc == this) {
+    public boolean canMate(final Animal ayk) {
+        if (ayk == this) {
             return false;
         }
         if (!this.isTame()) {
             return false;
         }
-        if (!(atc instanceof Wolf)) {
+        if (!(ayk instanceof Wolf)) {
             return false;
         }
-        final Wolf auc3 = (Wolf)atc;
-        return auc3.isTame() && !auc3.isSitting() && this.isInLove() && auc3.isInLove();
+        final Wolf azk3 = (Wolf)ayk;
+        return azk3.isTame() && !azk3.isInSittingPose() && this.isInLove() && azk3.isInLove();
     }
     
     public boolean isInterested() {
@@ -468,38 +467,45 @@ public class Wolf extends TamableAnimal {
     }
     
     @Override
-    public boolean wantsToAttack(final LivingEntity akz1, final LivingEntity akz2) {
-        if (akz1 instanceof Creeper || akz1 instanceof Ghast) {
+    public boolean wantsToAttack(final LivingEntity aoy1, final LivingEntity aoy2) {
+        if (aoy1 instanceof Creeper || aoy1 instanceof Ghast) {
             return false;
         }
-        if (akz1 instanceof Wolf) {
-            final Wolf auc4 = (Wolf)akz1;
-            return !auc4.isTame() || auc4.getOwner() != akz2;
+        if (aoy1 instanceof Wolf) {
+            final Wolf azk4 = (Wolf)aoy1;
+            return !azk4.isTame() || azk4.getOwner() != aoy2;
         }
-        return (!(akz1 instanceof Player) || !(akz2 instanceof Player) || ((Player)akz2).canHarmPlayer((Player)akz1)) && (!(akz1 instanceof AbstractHorse) || !((AbstractHorse)akz1).isTamed()) && (!(akz1 instanceof TamableAnimal) || !((TamableAnimal)akz1).isTame());
+        return (!(aoy1 instanceof Player) || !(aoy2 instanceof Player) || ((Player)aoy2).canHarmPlayer((Player)aoy1)) && (!(aoy1 instanceof AbstractHorse) || !((AbstractHorse)aoy1).isTamed()) && (!(aoy1 instanceof TamableAnimal) || !((TamableAnimal)aoy1).isTame());
     }
     
     @Override
-    public boolean canBeLeashed(final Player ayj) {
-        return !this.isAngry() && super.canBeLeashed(ayj);
+    public boolean canBeLeashed(final Player bec) {
+        return !this.isAngry() && super.canBeLeashed(bec);
+    }
+    
+    @Override
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, 0.6f * this.getEyeHeight(), this.getBbWidth() * 0.4f);
     }
     
     static {
         DATA_INTERESTED_ID = SynchedEntityData.<Boolean>defineId(Wolf.class, EntityDataSerializers.BOOLEAN);
         DATA_COLLAR_COLOR = SynchedEntityData.<Integer>defineId(Wolf.class, EntityDataSerializers.INT);
-        final EntityType<?> aku2;
-        PREY_SELECTOR = (akz -> {
-            aku2 = akz.getType();
-            return aku2 == EntityType.SHEEP || aku2 == EntityType.RABBIT || aku2 == EntityType.FOX;
+        DATA_REMAINING_ANGER_TIME = SynchedEntityData.<Integer>defineId(Wolf.class, EntityDataSerializers.INT);
+        final EntityType<?> aoq2;
+        PREY_SELECTOR = (aoy -> {
+            aoq2 = aoy.getType();
+            return aoq2 == EntityType.SHEEP || aoq2 == EntityType.RABBIT || aoq2 == EntityType.FOX;
         });
+        PERSISTENT_ANGER_TIME = TimeUtil.rangeOfSeconds(20, 39);
     }
     
     class WolfAvoidEntityGoal<T extends LivingEntity> extends AvoidEntityGoal<T> {
         private final Wolf wolf;
         
-        public WolfAvoidEntityGoal(final Wolf auc2, final Class<T> class3, final float float4, final double double5, final double double6) {
-            super(auc2, class3, float4, double5, double6);
-            this.wolf = auc2;
+        public WolfAvoidEntityGoal(final Wolf azk2, final Class<T> class3, final float float4, final double double5, final double double6) {
+            super(azk2, class3, float4, double5, double6);
+            this.wolf = azk2;
         }
         
         @Override
@@ -507,8 +513,8 @@ public class Wolf extends TamableAnimal {
             return super.canUse() && this.toAvoid instanceof Llama && !this.wolf.isTame() && this.avoidLlama((Llama)this.toAvoid);
         }
         
-        private boolean avoidLlama(final Llama auh) {
-            return auh.getStrength() >= Wolf.this.random.nextInt(5);
+        private boolean avoidLlama(final Llama azp) {
+            return azp.getStrength() >= Wolf.this.random.nextInt(5);
         }
         
         @Override
diff --git a/src/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java b/src/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java
index 0efbd9f..46dfd09 100644
--- a/src/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java
+++ b/src/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java
@@ -4,9 +4,9 @@ import java.util.AbstractList;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
-import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -15,9 +15,8 @@ import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.network.syncher.EntityDataAccessor;
@@ -25,23 +24,24 @@ import net.minecraft.network.syncher.EntityDataAccessor;
 public abstract class AbstractChestedHorse extends AbstractHorse {
     private static final EntityDataAccessor<Boolean> DATA_ID_CHEST;
     
-    protected AbstractChestedHorse(final EntityType<? extends AbstractChestedHorse> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AbstractChestedHorse(final EntityType<? extends AbstractChestedHorse> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.canGallop = false;
     }
     
+    @Override
+    protected void randomizeAttributes() {
+        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.generateRandomMaxHealth());
+    }
+    
     @Override
     protected void defineSynchedData() {
         super.defineSynchedData();
         this.entityData.<Boolean>define(AbstractChestedHorse.DATA_ID_CHEST, false);
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(this.generateRandomMaxHealth());
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.17499999701976776);
-        this.getAttribute(AbstractChestedHorse.JUMP_STRENGTH).setBaseValue(0.5);
+    public static AttributeSupplier.Builder createBaseChestedHorseAttributes() {
+        return AbstractHorse.createBaseHorseAttributes().add(Attributes.MOVEMENT_SPEED, 0.17499999701976776).add(Attributes.JUMP_STRENGTH, 0.5);
     }
     
     public boolean hasChest() {
@@ -61,14 +61,8 @@ public abstract class AbstractChestedHorse extends AbstractHorse {
     }
     
     @Override
-    public double getRideHeight() {
-        return super.getRideHeight() - 0.25;
-    }
-    
-    @Override
-    protected SoundEvent getAngrySound() {
-        super.getAngrySound();
-        return SoundEvents.DONKEY_ANGRY;
+    public double getPassengersRidingOffset() {
+        return super.getPassengersRidingOffset() - 0.25;
     }
     
     @Override
@@ -83,109 +77,98 @@ public abstract class AbstractChestedHorse extends AbstractHorse {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("ChestedHorse", this.hasChest());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("ChestedHorse", this.hasChest());
         if (this.hasChest()) {
-            final ListTag jz3 = new ListTag();
+            final ListTag lk3 = new ListTag();
             for (int integer4 = 2; integer4 < this.inventory.getContainerSize(); ++integer4) {
-                final ItemStack ben5 = this.inventory.getItem(integer4);
-                if (!ben5.isEmpty()) {
-                    final CompoundTag jt2 = new CompoundTag();
-                    jt2.putByte("Slot", (byte)integer4);
-                    ben5.save(jt2);
-                    ((AbstractList<CompoundTag>)jz3).add(jt2);
+                final ItemStack bki5 = this.inventory.getItem(integer4);
+                if (!bki5.isEmpty()) {
+                    final CompoundTag le2 = new CompoundTag();
+                    le2.putByte("Slot", (byte)integer4);
+                    bki5.save(le2);
+                    ((AbstractList<CompoundTag>)lk3).add(le2);
                 }
             }
-            jt.put("Items", jz3);
+            le.put("Items", lk3);
         }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setChest(jt.getBoolean("ChestedHorse"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setChest(le.getBoolean("ChestedHorse"));
         if (this.hasChest()) {
-            final ListTag jz3 = jt.getList("Items", 10);
+            final ListTag lk3 = le.getList("Items", 10);
             this.createInventory();
-            for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-                final CompoundTag jt2 = jz3.getCompound(integer4);
-                final int integer5 = jt2.getByte("Slot") & 0xFF;
+            for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+                final CompoundTag le2 = lk3.getCompound(integer4);
+                final int integer5 = le2.getByte("Slot") & 0xFF;
                 if (integer5 >= 2 && integer5 < this.inventory.getContainerSize()) {
-                    this.inventory.setItem(integer5, ItemStack.of(jt2));
+                    this.inventory.setItem(integer5, ItemStack.of(le2));
                 }
             }
         }
-        this.updateEquipment();
+        this.updateContainerEquipment();
     }
     
     @Override
-    public boolean setSlot(final int integer, final ItemStack ben) {
+    public boolean setSlot(final int integer, final ItemStack bki) {
         if (integer == 499) {
-            if (this.hasChest() && ben.isEmpty()) {
+            if (this.hasChest() && bki.isEmpty()) {
                 this.setChest(false);
                 this.createInventory();
                 return true;
             }
-            if (!this.hasChest() && ben.getItem() == Blocks.CHEST.asItem()) {
+            if (!this.hasChest() && bki.getItem() == Blocks.CHEST.asItem()) {
                 this.setChest(true);
                 this.createInventory();
                 return true;
             }
         }
-        return super.setSlot(integer, ben);
+        return super.setSlot(integer, bki);
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() instanceof SpawnEggItem) {
-            return super.mobInteract(ayj, ajk);
-        }
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
         if (!this.isBaby()) {
-            if (this.isTamed() && ayj.isSecondaryUseActive()) {
-                this.openInventory(ayj);
-                return true;
+            if (this.isTamed() && bec.isSecondaryUseActive()) {
+                this.openInventory(bec);
+                return InteractionResult.sidedSuccess(this.level.isClientSide);
             }
             if (this.isVehicle()) {
-                return super.mobInteract(ayj, ajk);
+                return super.mobInteract(bec, anf);
             }
         }
-        if (!ben4.isEmpty()) {
-            boolean boolean5 = this.handleEating(ayj, ben4);
-            if (!boolean5) {
-                if (!this.isTamed() || ben4.getItem() == Items.NAME_TAG) {
-                    if (ben4.interactEnemy(ayj, this, ajk)) {
-                        return true;
-                    }
-                    this.makeMad();
-                    return true;
-                }
-                else {
-                    if (!this.hasChest() && ben4.getItem() == Blocks.CHEST.asItem()) {
-                        this.setChest(true);
-                        this.playChestEquipsSound();
-                        boolean5 = true;
-                        this.createInventory();
-                    }
-                    if (!this.isBaby() && !this.isSaddled() && ben4.getItem() == Items.SADDLE) {
-                        this.openInventory(ayj);
-                        return true;
-                    }
-                }
+        if (!bki4.isEmpty()) {
+            if (this.isFood(bki4)) {
+                return this.fedFood(bec, bki4);
             }
-            if (boolean5) {
-                if (!ayj.abilities.instabuild) {
-                    ben4.shrink(1);
+            if (!this.isTamed()) {
+                this.makeMad();
+                return InteractionResult.sidedSuccess(this.level.isClientSide);
+            }
+            if (!this.hasChest() && bki4.getItem() == Blocks.CHEST.asItem()) {
+                this.setChest(true);
+                this.playChestEquipsSound();
+                if (!bec.abilities.instabuild) {
+                    bki4.shrink(1);
                 }
-                return true;
+                this.createInventory();
+                return InteractionResult.sidedSuccess(this.level.isClientSide);
+            }
+            if (!this.isBaby() && !this.isSaddled() && bki4.getItem() == Items.SADDLE) {
+                this.openInventory(bec);
+                return InteractionResult.sidedSuccess(this.level.isClientSide);
             }
         }
         if (this.isBaby()) {
-            return super.mobInteract(ayj, ajk);
+            return super.mobInteract(bec, anf);
         }
-        this.doPlayerRide(ayj);
-        return true;
+        this.doPlayerRide(bec);
+        return InteractionResult.sidedSuccess(this.level.isClientSide);
     }
     
     protected void playChestEquipsSound() {
diff --git a/src/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/net/minecraft/world/entity/animal/horse/AbstractHorse.java
index c31ba1c..62e3a1a 100644
--- a/src/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+++ b/src/net/minecraft/world/entity/animal/horse/AbstractHorse.java
@@ -2,15 +2,19 @@ package net.minecraft.world.entity.animal.horse;
 
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
-import net.minecraft.world.entity.ai.attributes.RangedAttribute;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.DifficultyInstance;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.entity.HumanoidArm;
+import net.minecraft.world.phys.AABB;
+import com.google.common.collect.UnmodifiableIterator;
+import net.minecraft.core.Direction;
+import net.minecraft.world.entity.vehicle.DismountHelper;
+import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.AgableMob;
-import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import net.minecraft.server.players.OldUsersConverter;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
@@ -22,21 +26,24 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.Item;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
-import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.Container;
-import net.minecraft.world.item.ItemStack;
 import java.util.Iterator;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.MobType;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.sounds.SoundSource;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.ai.goal.FloatGoal;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
@@ -56,18 +63,19 @@ import net.minecraft.world.SimpleContainer;
 import java.util.UUID;
 import java.util.Optional;
 import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.world.entity.ai.attributes.Attribute;
+import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import net.minecraft.world.entity.LivingEntity;
 import java.util.function.Predicate;
+import net.minecraft.world.entity.Saddleable;
 import net.minecraft.world.entity.PlayerRideableJumping;
 import net.minecraft.world.ContainerListener;
 import net.minecraft.world.entity.animal.Animal;
 
-public abstract class AbstractHorse extends Animal implements ContainerListener, PlayerRideableJumping {
+public abstract class AbstractHorse extends Animal implements ContainerListener, PlayerRideableJumping, Saddleable {
     private static final Predicate<LivingEntity> PARENT_HORSE_SELECTOR;
     private static final TargetingConditions MOMMY_TARGETING;
-    protected static final Attribute JUMP_STRENGTH;
+    private static final Ingredient FOOD_ITEMS;
     private static final EntityDataAccessor<Byte> DATA_ID_FLAGS;
     private static final EntityDataAccessor<Optional<UUID>> DATA_ID_OWNER_UUID;
     private int eatingCounter;
@@ -89,8 +97,8 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     protected boolean canGallop;
     protected int gallopSoundCounter;
     
-    protected AbstractHorse(final EntityType<? extends AbstractHorse> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AbstractHorse(final EntityType<? extends AbstractHorse> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.canGallop = true;
         this.maxUpStep = 1.0f;
         this.createInventory();
@@ -158,11 +166,6 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
         this.isJumping = boolean1;
     }
     
-    @Override
-    public boolean canBeLeashed(final Player ayj) {
-        return super.canBeLeashed(ayj) && this.getMobType() != MobType.UNDEAD;
-    }
-    
     @Override
     protected void onLeashDistance(final float float1) {
         if (float1 > 6.0f && this.isEating()) {
@@ -186,8 +189,22 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
         this.setFlag(8, boolean1);
     }
     
-    public void setSaddled(final boolean boolean1) {
-        this.setFlag(4, boolean1);
+    @Override
+    public boolean isSaddleable() {
+        return this.isAlive() && !this.isBaby() && this.isTamed();
+    }
+    
+    @Override
+    public void equipSaddle(@Nullable final SoundSource acm) {
+        this.inventory.setItem(0, new ItemStack(Items.SADDLE));
+        if (acm != null) {
+            this.level.playSound(null, this, SoundEvents.HORSE_SADDLE, acm, 0.5f, 1.0f);
+        }
+    }
+    
+    @Override
+    public boolean isSaddled() {
+        return this.getFlag(4);
     }
     
     public int getTemper() {
@@ -204,12 +221,6 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
         return integer2;
     }
     
-    @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        final Entity akq4 = ajz.getEntity();
-        return (!this.isVehicle() || akq4 == null || !this.hasIndirectPassenger(akq4)) && super.hurt(ajz, float2);
-    }
-    
     @Override
     public boolean isPushable() {
         return !this.isVehicle();
@@ -218,7 +229,10 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     private void eating() {
         this.openMouth();
         if (!this.isSilent()) {
-            this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.HORSE_EAT, this.getSoundSource(), 1.0f, 1.0f + (this.random.nextFloat() - this.random.nextFloat()) * 0.2f);
+            final SoundEvent ack2 = this.getEatingSound();
+            if (ack2 != null) {
+                this.level.playSound(null, this.getX(), this.getY(), this.getZ(), ack2, this.getSoundSource(), 1.0f, 1.0f + (this.random.nextFloat() - this.random.nextFloat()) * 0.2f);
+            }
         }
     }
     
@@ -233,8 +247,8 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
         }
         this.hurt(DamageSource.FALL, (float)integer4);
         if (this.isVehicle()) {
-            for (final Entity akq6 : this.getIndirectPassengers()) {
-                akq6.hurt(DamageSource.FALL, (float)integer4);
+            for (final Entity aom6 : this.getIndirectPassengers()) {
+                aom6.hurt(DamageSource.FALL, (float)integer4);
             }
         }
         this.playBlockFallSound();
@@ -251,39 +265,44 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     }
     
     protected void createInventory() {
-        final SimpleContainer ajq2 = this.inventory;
+        final SimpleContainer anm2 = this.inventory;
         this.inventory = new SimpleContainer(this.getInventorySize());
-        if (ajq2 != null) {
-            ajq2.removeListener(this);
-            for (int integer3 = Math.min(ajq2.getContainerSize(), this.inventory.getContainerSize()), integer4 = 0; integer4 < integer3; ++integer4) {
-                final ItemStack ben5 = ajq2.getItem(integer4);
-                if (!ben5.isEmpty()) {
-                    this.inventory.setItem(integer4, ben5.copy());
+        if (anm2 != null) {
+            anm2.removeListener(this);
+            for (int integer3 = Math.min(anm2.getContainerSize(), this.inventory.getContainerSize()), integer4 = 0; integer4 < integer3; ++integer4) {
+                final ItemStack bki5 = anm2.getItem(integer4);
+                if (!bki5.isEmpty()) {
+                    this.inventory.setItem(integer4, bki5.copy());
                 }
             }
         }
         this.inventory.addListener(this);
-        this.updateEquipment();
+        this.updateContainerEquipment();
     }
     
-    protected void updateEquipment() {
+    protected void updateContainerEquipment() {
         if (this.level.isClientSide) {
             return;
         }
-        this.setSaddled(!this.inventory.getItem(0).isEmpty() && this.canBeSaddled());
+        this.setFlag(4, !this.inventory.getItem(0).isEmpty());
     }
     
     @Override
-    public void containerChanged(final Container aje) {
+    public void containerChanged(final Container amz) {
         final boolean boolean3 = this.isSaddled();
-        this.updateEquipment();
+        this.updateContainerEquipment();
         if (this.tickCount > 20 && !boolean3 && this.isSaddled()) {
             this.playSound(SoundEvents.HORSE_SADDLE, 0.5f, 1.0f);
         }
     }
     
     public double getCustomJump() {
-        return this.getAttribute(AbstractHorse.JUMP_STRENGTH).getValue();
+        return this.getAttributeValue(Attributes.JUMP_STRENGTH);
+    }
+    
+    @Nullable
+    protected SoundEvent getEatingSound() {
+        return null;
     }
     
     @Nullable
@@ -294,7 +313,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     
     @Nullable
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         if (this.random.nextInt(3) == 0) {
             this.stand();
         }
@@ -310,14 +329,6 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
         return null;
     }
     
-    public boolean canBeSaddled() {
-        return true;
-    }
-    
-    public boolean isSaddled() {
-        return this.getFlag(4);
-    }
-    
     @Nullable
     protected SoundEvent getAngrySound() {
         this.stand();
@@ -325,42 +336,38 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
-        if (byj.getMaterial().isLiquid()) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
+        if (cfj.getMaterial().isLiquid()) {
             return;
         }
-        final BlockState byj2 = this.level.getBlockState(fk.above());
-        SoundType bum5 = byj.getSoundType();
-        if (byj2.getBlock() == Blocks.SNOW) {
-            bum5 = byj2.getSoundType();
+        final BlockState cfj2 = this.level.getBlockState(fu.above());
+        SoundType cbh5 = cfj.getSoundType();
+        if (cfj2.is(Blocks.SNOW)) {
+            cbh5 = cfj2.getSoundType();
         }
         if (this.isVehicle() && this.canGallop) {
             ++this.gallopSoundCounter;
             if (this.gallopSoundCounter > 5 && this.gallopSoundCounter % 3 == 0) {
-                this.playGallopSound(bum5);
+                this.playGallopSound(cbh5);
             }
             else if (this.gallopSoundCounter <= 5) {
-                this.playSound(SoundEvents.HORSE_STEP_WOOD, bum5.getVolume() * 0.15f, bum5.getPitch());
+                this.playSound(SoundEvents.HORSE_STEP_WOOD, cbh5.getVolume() * 0.15f, cbh5.getPitch());
             }
         }
-        else if (bum5 == SoundType.WOOD) {
-            this.playSound(SoundEvents.HORSE_STEP_WOOD, bum5.getVolume() * 0.15f, bum5.getPitch());
+        else if (cbh5 == SoundType.WOOD) {
+            this.playSound(SoundEvents.HORSE_STEP_WOOD, cbh5.getVolume() * 0.15f, cbh5.getPitch());
         }
         else {
-            this.playSound(SoundEvents.HORSE_STEP, bum5.getVolume() * 0.15f, bum5.getPitch());
+            this.playSound(SoundEvents.HORSE_STEP, cbh5.getVolume() * 0.15f, cbh5.getPitch());
         }
     }
     
-    protected void playGallopSound(final SoundType bum) {
-        this.playSound(SoundEvents.HORSE_GALLOP, bum.getVolume() * 0.15f, bum.getPitch());
+    protected void playGallopSound(final SoundType cbh) {
+        this.playSound(SoundEvents.HORSE_GALLOP, cbh.getVolume() * 0.15f, cbh.getPitch());
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttributes().registerAttribute(AbstractHorse.JUMP_STRENGTH);
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(53.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.22499999403953552);
+    public static AttributeSupplier.Builder createBaseHorseAttributes() {
+        return Mob.createMobAttributes().add(Attributes.JUMP_STRENGTH).add(Attributes.MAX_HEALTH, 53.0).add(Attributes.MOVEMENT_SPEED, 0.22499999403953552);
     }
     
     @Override
@@ -382,53 +389,64 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
         return 400;
     }
     
-    public void openInventory(final Player ayj) {
-        if (!this.level.isClientSide && (!this.isVehicle() || this.hasPassenger(ayj)) && this.isTamed()) {
-            ayj.openHorseInventory(this, this.inventory);
+    public void openInventory(final Player bec) {
+        if (!this.level.isClientSide && (!this.isVehicle() || this.hasPassenger(bec)) && this.isTamed()) {
+            bec.openHorseInventory(this, this.inventory);
         }
     }
     
-    protected boolean handleEating(final Player ayj, final ItemStack ben) {
+    public InteractionResult fedFood(final Player bec, final ItemStack bki) {
+        final boolean boolean4 = this.handleEating(bec, bki);
+        if (!bec.abilities.instabuild) {
+            bki.shrink(1);
+        }
+        if (this.level.isClientSide) {
+            return InteractionResult.CONSUME;
+        }
+        return boolean4 ? InteractionResult.SUCCESS : InteractionResult.PASS;
+    }
+    
+    protected boolean handleEating(final Player bec, final ItemStack bki) {
         boolean boolean4 = false;
         float float5 = 0.0f;
         int integer6 = 0;
         int integer7 = 0;
-        final Item bei8 = ben.getItem();
-        if (bei8 == Items.WHEAT) {
+        final Item bke8 = bki.getItem();
+        if (bke8 == Items.WHEAT) {
             float5 = 2.0f;
             integer6 = 20;
             integer7 = 3;
         }
-        else if (bei8 == Items.SUGAR) {
+        else if (bke8 == Items.SUGAR) {
             float5 = 1.0f;
             integer6 = 30;
             integer7 = 3;
         }
-        else if (bei8 == Blocks.HAY_BLOCK.asItem()) {
+        else if (bke8 == Blocks.HAY_BLOCK.asItem()) {
             float5 = 20.0f;
             integer6 = 180;
         }
-        else if (bei8 == Items.APPLE) {
+        else if (bke8 == Items.APPLE) {
             float5 = 3.0f;
             integer6 = 60;
             integer7 = 3;
         }
-        else if (bei8 == Items.GOLDEN_CARROT) {
+        else if (bke8 == Items.GOLDEN_CARROT) {
             float5 = 4.0f;
             integer6 = 60;
             integer7 = 5;
-            if (this.isTamed() && this.getAge() == 0 && !this.isInLove()) {
+            if (!this.level.isClientSide && this.isTamed() && this.getAge() == 0 && !this.isInLove()) {
                 boolean4 = true;
-                this.setInLove(ayj);
+                this.setInLove(bec);
             }
         }
-        else if (bei8 == Items.GOLDEN_APPLE || bei8 == Items.ENCHANTED_GOLDEN_APPLE) {
+        else if (bke8 == Items.GOLDEN_APPLE || bke8 == Items.ENCHANTED_GOLDEN_APPLE) {
             float5 = 10.0f;
             integer6 = 240;
             integer7 = 10;
-            if (this.isTamed() && this.getAge() == 0 && !this.isInLove()) {
+            if (!this.level.isClientSide && this.isTamed() && this.getAge() == 0 && !this.isInLove()) {
                 boolean4 = true;
-                this.setInLove(ayj);
+                this.setInLove(bec);
             }
         }
         if (this.getHealth() < this.getMaxHealth() && float5 > 0.0f) {
@@ -454,13 +472,13 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
         return boolean4;
     }
     
-    protected void doPlayerRide(final Player ayj) {
+    protected void doPlayerRide(final Player bec) {
         this.setEating(false);
         this.setStanding(false);
         if (!this.level.isClientSide) {
-            ayj.yRot = this.yRot;
-            ayj.xRot = this.xRot;
-            ayj.startRiding(this);
+            bec.yRot = this.yRot;
+            bec.xRot = this.xRot;
+            bec.startRiding(this);
         }
     }
     
@@ -470,8 +488,8 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     }
     
     @Override
-    public boolean isFood(final ItemStack ben) {
-        return false;
+    public boolean isFood(final ItemStack bki) {
+        return AbstractHorse.FOOD_ITEMS.test(bki);
     }
     
     private void moveTail() {
@@ -485,10 +503,10 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
             return;
         }
         for (int integer2 = 0; integer2 < this.inventory.getContainerSize(); ++integer2) {
-            final ItemStack ben3 = this.inventory.getItem(integer2);
-            if (!ben3.isEmpty()) {
-                if (!EnchantmentHelper.hasVanishingCurse(ben3)) {
-                    this.spawnAtLocation(ben3);
+            final ItemStack bki3 = this.inventory.getItem(integer2);
+            if (!bki3.isEmpty()) {
+                if (!EnchantmentHelper.hasVanishingCurse(bki3)) {
+                    this.spawnAtLocation(bki3);
                 }
             }
         }
@@ -507,7 +525,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
             this.heal(1.0f);
         }
         if (this.canEatGrass()) {
-            if (!this.isEating() && !this.isVehicle() && this.random.nextInt(300) == 0 && this.level.getBlockState(new BlockPos(this).below()).getBlock() == Blocks.GRASS_BLOCK) {
+            if (!this.isEating() && !this.isVehicle() && this.random.nextInt(300) == 0 && this.level.getBlockState(this.blockPosition().below()).is(Blocks.GRASS_BLOCK)) {
                 this.setEating(true);
             }
             if (this.isEating() && ++this.eatingCounter > 50) {
@@ -520,9 +538,9 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     
     protected void followMommy() {
         if (this.isBred() && this.isBaby() && !this.isEating()) {
-            final LivingEntity akz2 = this.level.<LivingEntity>getNearestEntity(AbstractHorse.class, AbstractHorse.MOMMY_TARGETING, (LivingEntity)this, this.getX(), this.getY(), this.getZ(), this.getBoundingBox().inflate(16.0));
-            if (akz2 != null && this.distanceToSqr(akz2) > 4.0) {
-                this.navigation.createPath(akz2, 0);
+            final LivingEntity aoy2 = this.level.<LivingEntity>getNearestEntity(AbstractHorse.class, AbstractHorse.MOMMY_TARGETING, (LivingEntity)this, this.getX(), this.getY(), this.getZ(), this.getBoundingBox().inflate(16.0));
+            if (aoy2 != null && this.distanceToSqr(aoy2) > 4.0) {
+                this.navigation.createPath(aoy2, 0);
             }
         }
     }
@@ -621,42 +639,44 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     }
     
     public void makeMad() {
-        this.stand();
-        final SoundEvent aah2 = this.getAngrySound();
-        if (aah2 != null) {
-            this.playSound(aah2, this.getSoundVolume(), this.getVoicePitch());
+        if (!this.isStanding()) {
+            this.stand();
+            final SoundEvent ack2 = this.getAngrySound();
+            if (ack2 != null) {
+                this.playSound(ack2, this.getSoundVolume(), this.getVoicePitch());
+            }
         }
     }
     
-    public boolean tameWithName(final Player ayj) {
-        this.setOwnerUUID(ayj.getUUID());
+    public boolean tameWithName(final Player bec) {
+        this.setOwnerUUID(bec.getUUID());
         this.setTamed(true);
-        if (ayj instanceof ServerPlayer) {
-            CriteriaTriggers.TAME_ANIMAL.trigger((ServerPlayer)ayj, this);
+        if (bec instanceof ServerPlayer) {
+            CriteriaTriggers.TAME_ANIMAL.trigger((ServerPlayer)bec, this);
         }
         this.level.broadcastEntityEvent(this, (byte)7);
         return true;
     }
     
     @Override
-    public void travel(final Vec3 cvl) {
+    public void travel(final Vec3 dem) {
         if (!this.isAlive()) {
             return;
         }
         if (!this.isVehicle() || !this.canBeControlledByRider() || !this.isSaddled()) {
             this.flyingSpeed = 0.02f;
-            super.travel(cvl);
+            super.travel(dem);
             return;
         }
-        final LivingEntity akz3 = (LivingEntity)this.getControllingPassenger();
-        this.yRot = akz3.yRot;
+        final LivingEntity aoy3 = (LivingEntity)this.getControllingPassenger();
+        this.yRot = aoy3.yRot;
         this.yRotO = this.yRot;
-        this.xRot = akz3.xRot * 0.5f;
+        this.xRot = aoy3.xRot * 0.5f;
         this.setRot(this.yRot, this.xRot);
         this.yBodyRot = this.yRot;
         this.yHeadRot = this.yBodyRot;
-        float float4 = akz3.xxa * 0.5f;
-        float float5 = akz3.zza;
+        float float4 = aoy3.xxa * 0.5f;
+        float float5 = aoy3.zza;
         if (float5 <= 0.0f) {
             float5 *= 0.25f;
             this.gallopSoundCounter = 0;
@@ -674,39 +694,30 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
             else {
                 double7 = double6;
             }
-            final Vec3 cvl2 = this.getDeltaMovement();
-            this.setDeltaMovement(cvl2.x, double7, cvl2.z);
+            final Vec3 dem2 = this.getDeltaMovement();
+            this.setDeltaMovement(dem2.x, double7, dem2.z);
             this.setIsJumping(true);
             this.hasImpulse = true;
             if (float5 > 0.0f) {
                 final float float6 = Mth.sin(this.yRot * 0.017453292f);
                 final float float7 = Mth.cos(this.yRot * 0.017453292f);
                 this.setDeltaMovement(this.getDeltaMovement().add(-0.4f * float6 * this.playerJumpPendingScale, 0.0, 0.4f * float7 * this.playerJumpPendingScale));
-                this.playJumpSound();
             }
             this.playerJumpPendingScale = 0.0f;
         }
         this.flyingSpeed = this.getSpeed() * 0.1f;
         if (this.isControlledByLocalInstance()) {
-            this.setSpeed((float)this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue());
-            super.travel(new Vec3(float4, cvl.y, float5));
+            this.setSpeed((float)this.getAttributeValue(Attributes.MOVEMENT_SPEED));
+            super.travel(new Vec3(float4, dem.y, float5));
         }
-        else if (akz3 instanceof Player) {
+        else if (aoy3 instanceof Player) {
             this.setDeltaMovement(Vec3.ZERO);
         }
         if (this.onGround) {
             this.playerJumpPendingScale = 0.0f;
             this.setIsJumping(false);
         }
-        this.animationSpeedOld = this.animationSpeed;
-        final double double6 = this.getX() - this.xo;
-        double double7 = this.getZ() - this.zo;
-        float float8 = Mth.sqrt(double6 * double6 + double7 * double7) * 4.0f;
-        if (float8 > 1.0f) {
-            float8 = 1.0f;
-        }
-        this.animationSpeed += (float8 - this.animationSpeed) * 0.4f;
-        this.animationPosition += this.animationSpeed;
+        this.calculateEntityAnimation(this, false);
     }
     
     protected void playJumpSound() {
@@ -714,53 +725,49 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("EatingHaystack", this.isEating());
-        jt.putBoolean("Bred", this.isBred());
-        jt.putInt("Temper", this.getTemper());
-        jt.putBoolean("Tame", this.isTamed());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("EatingHaystack", this.isEating());
+        le.putBoolean("Bred", this.isBred());
+        le.putInt("Temper", this.getTemper());
+        le.putBoolean("Tame", this.isTamed());
         if (this.getOwnerUUID() != null) {
-            jt.putString("OwnerUUID", this.getOwnerUUID().toString());
+            le.putUUID("Owner", this.getOwnerUUID());
         }
         if (!this.inventory.getItem(0).isEmpty()) {
-            jt.put("SaddleItem", this.inventory.getItem(0).save(new CompoundTag()));
+            le.put("SaddleItem", this.inventory.getItem(0).save(new CompoundTag()));
         }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setEating(jt.getBoolean("EatingHaystack"));
-        this.setBred(jt.getBoolean("Bred"));
-        this.setTemper(jt.getInt("Temper"));
-        this.setTamed(jt.getBoolean("Tame"));
-        String string3;
-        if (jt.contains("OwnerUUID", 8)) {
-            string3 = jt.getString("OwnerUUID");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setEating(le.getBoolean("EatingHaystack"));
+        this.setBred(le.getBoolean("Bred"));
+        this.setTemper(le.getInt("Temper"));
+        this.setTamed(le.getBoolean("Tame"));
+        UUID uUID3;
+        if (le.hasUUID("Owner")) {
+            uUID3 = le.getUUID("Owner");
         }
         else {
-            final String string4 = jt.getString("Owner");
-            string3 = OldUsersConverter.convertMobOwnerIfNecessary(this.getServer(), string4);
+            final String string4 = le.getString("Owner");
+            uUID3 = OldUsersConverter.convertMobOwnerIfNecessary(this.getServer(), string4);
         }
-        if (!string3.isEmpty()) {
-            this.setOwnerUUID(UUID.fromString(string3));
+        if (uUID3 != null) {
+            this.setOwnerUUID(uUID3);
         }
-        final AttributeInstance alr4 = this.getAttributes().getInstance("Speed");
-        if (alr4 != null) {
-            this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(alr4.getBaseValue() * 0.25);
-        }
-        if (jt.contains("SaddleItem", 10)) {
-            final ItemStack ben5 = ItemStack.of(jt.getCompound("SaddleItem"));
-            if (ben5.getItem() == Items.SADDLE) {
-                this.inventory.setItem(0, ben5);
+        if (le.contains("SaddleItem", 10)) {
+            final ItemStack bki4 = ItemStack.of(le.getCompound("SaddleItem"));
+            if (bki4.getItem() == Items.SADDLE) {
+                this.inventory.setItem(0, bki4);
             }
         }
-        this.updateEquipment();
+        this.updateContainerEquipment();
     }
     
     @Override
-    public boolean canMate(final Animal atc) {
+    public boolean canMate(final Animal ayk) {
         return false;
     }
     
@@ -770,17 +777,17 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     
     @Nullable
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
+    public AgableMob getBreedOffspring(final AgableMob aok) {
         return null;
     }
     
-    protected void setOffspringAttributes(final AgableMob ako, final AbstractHorse aue) {
-        final double double4 = this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).getBaseValue() + ako.getAttribute(SharedMonsterAttributes.MAX_HEALTH).getBaseValue() + this.generateRandomMaxHealth();
-        aue.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(double4 / 3.0);
-        final double double5 = this.getAttribute(AbstractHorse.JUMP_STRENGTH).getBaseValue() + ako.getAttribute(AbstractHorse.JUMP_STRENGTH).getBaseValue() + this.generateRandomJumpStrength();
-        aue.getAttribute(AbstractHorse.JUMP_STRENGTH).setBaseValue(double5 / 3.0);
-        final double double6 = this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getBaseValue() + ako.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getBaseValue() + this.generateRandomSpeed();
-        aue.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(double6 / 3.0);
+    protected void setOffspringAttributes(final AgableMob aok, final AbstractHorse azm) {
+        final double double4 = this.getAttributeBaseValue(Attributes.MAX_HEALTH) + aok.getAttributeBaseValue(Attributes.MAX_HEALTH) + this.generateRandomMaxHealth();
+        azm.getAttribute(Attributes.MAX_HEALTH).setBaseValue(double4 / 3.0);
+        final double double5 = this.getAttributeBaseValue(Attributes.JUMP_STRENGTH) + aok.getAttributeBaseValue(Attributes.JUMP_STRENGTH) + this.generateRandomJumpStrength();
+        azm.getAttribute(Attributes.JUMP_STRENGTH).setBaseValue(double5 / 3.0);
+        final double double6 = this.getAttributeBaseValue(Attributes.MOVEMENT_SPEED) + aok.getAttributeBaseValue(Attributes.MOVEMENT_SPEED) + this.generateRandomSpeed();
+        azm.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(double6 / 3.0);
     }
     
     @Override
@@ -829,6 +836,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     public void handleStartJump(final int integer) {
         this.allowStandSliding = true;
         this.stand();
+        this.playJumpSound();
     }
     
     @Override
@@ -836,12 +844,12 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     }
     
     protected void spawnTamingParticles(final boolean boolean1) {
-        final ParticleOptions gt3 = boolean1 ? ParticleTypes.HEART : ParticleTypes.SMOKE;
+        final ParticleOptions hf3 = boolean1 ? ParticleTypes.HEART : ParticleTypes.SMOKE;
         for (int integer4 = 0; integer4 < 7; ++integer4) {
             final double double5 = this.random.nextGaussian() * 0.02;
             final double double6 = this.random.nextGaussian() * 0.02;
             final double double7 = this.random.nextGaussian() * 0.02;
-            this.level.addParticle(gt3, this.getRandomX(1.0), this.getRandomY() + 0.5, this.getRandomZ(1.0), double5, double6, double7);
+            this.level.addParticle(hf3, this.getRandomX(1.0), this.getRandomY() + 0.5, this.getRandomZ(1.0), double5, double6, double7);
         }
     }
     
@@ -859,20 +867,20 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     }
     
     @Override
-    public void positionRider(final Entity akq) {
-        super.positionRider(akq);
-        if (akq instanceof Mob) {
-            final Mob ala3 = (Mob)akq;
-            this.yBodyRot = ala3.yBodyRot;
+    public void positionRider(final Entity aom) {
+        super.positionRider(aom);
+        if (aom instanceof Mob) {
+            final Mob aoz3 = (Mob)aom;
+            this.yBodyRot = aoz3.yBodyRot;
         }
         if (this.standAnimO > 0.0f) {
             final float float3 = Mth.sin(this.yBodyRot * 0.017453292f);
             final float float4 = Mth.cos(this.yBodyRot * 0.017453292f);
             final float float5 = 0.7f * this.standAnimO;
             final float float6 = 0.15f * this.standAnimO;
-            akq.setPos(this.getX() + float5 * float3, this.getY() + this.getRideHeight() + akq.getRidingHeight() + float6, this.getZ() - float5 * float4);
-            if (akq instanceof LivingEntity) {
-                ((LivingEntity)akq).yBodyRot = this.yBodyRot;
+            aom.setPos(this.getX() + float5 * float3, this.getY() + this.getPassengersRidingOffset() + aom.getMyRidingOffset() + float6, this.getZ() - float5 * float4);
+            if (aom instanceof LivingEntity) {
+                ((LivingEntity)aom).yBodyRot = this.yBodyRot;
             }
         }
     }
@@ -890,41 +898,45 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     }
     
     @Override
-    public boolean onLadder() {
+    public boolean onClimbable() {
         return false;
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height * 0.95f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height * 0.95f;
     }
     
-    public boolean wearsArmor() {
+    public boolean canWearArmor() {
         return false;
     }
     
-    public boolean isArmor(final ItemStack ben) {
+    public boolean isWearingArmor() {
+        return !this.getItemBySlot(EquipmentSlot.CHEST).isEmpty();
+    }
+    
+    public boolean isArmor(final ItemStack bki) {
         return false;
     }
     
     @Override
-    public boolean setSlot(final int integer, final ItemStack ben) {
+    public boolean setSlot(final int integer, final ItemStack bki) {
         final int integer2 = integer - 400;
         if (integer2 >= 0 && integer2 < 2 && integer2 < this.inventory.getContainerSize()) {
-            if (integer2 == 0 && ben.getItem() != Items.SADDLE) {
+            if (integer2 == 0 && bki.getItem() != Items.SADDLE) {
                 return false;
             }
-            if (integer2 == 1 && (!this.wearsArmor() || !this.isArmor(ben))) {
+            if (integer2 == 1 && (!this.canWearArmor() || !this.isArmor(bki))) {
                 return false;
             }
-            this.inventory.setItem(integer2, ben);
-            this.updateEquipment();
+            this.inventory.setItem(integer2, bki);
+            this.updateContainerEquipment();
             return true;
         }
         else {
             final int integer3 = integer - 500 + 2;
             if (integer3 >= 2 && integer3 < this.inventory.getContainerSize()) {
-                this.inventory.setItem(integer3, ben);
+                this.inventory.setItem(integer3, bki);
                 return true;
             }
             return false;
@@ -941,19 +953,66 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
     }
     
     @Nullable
-    @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        if (alm == null) {
-            alm = new AgableMobGroupData();
-            ((AgableMobGroupData)alm).setBabySpawnChance(0.2f);
+    private Vec3 getDismountLocationInDirection(final Vec3 dem, final LivingEntity aoy) {
+        final double double4 = this.getX() + dem.x;
+        final double double5 = this.getBoundingBox().minY;
+        final double double6 = this.getZ() + dem.z;
+        final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
+        for (final Pose apj12 : aoy.getDismountPoses()) {
+            a10.set(double4, double5, double6);
+            final double double7 = this.getBoundingBox().maxY + 0.75;
+            do {
+                final double double8 = this.level.getRelativeFloorHeight(a10);
+                if (a10.getY() + double8 > double7) {
+                    break;
+                }
+                if (DismountHelper.isFloorValid(double8)) {
+                    final AABB deg17 = aoy.getLocalBoundsForPose(apj12);
+                    final Vec3 dem2 = new Vec3(double4, a10.getY() + double8, double6);
+                    if (DismountHelper.canDismountTo(this.level, aoy, deg17.move(dem2))) {
+                        aoy.setPose(apj12);
+                        return dem2;
+                    }
+                }
+                a10.move(Direction.UP);
+            } while (a10.getY() < double7);
         }
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return null;
+    }
+    
+    @Override
+    public Vec3 getDismountLocationForPassenger(final LivingEntity aoy) {
+        final Vec3 dem3 = Entity.getCollisionHorizontalEscapeVector(this.getBbWidth(), aoy.getBbWidth(), this.yRot + ((aoy.getMainArm() == HumanoidArm.RIGHT) ? 90.0f : -90.0f));
+        final Vec3 dem4 = this.getDismountLocationInDirection(dem3, aoy);
+        if (dem4 != null) {
+            return dem4;
+        }
+        final Vec3 dem5 = Entity.getCollisionHorizontalEscapeVector(this.getBbWidth(), aoy.getBbWidth(), this.yRot + ((aoy.getMainArm() == HumanoidArm.LEFT) ? 90.0f : -90.0f));
+        final Vec3 dem6 = this.getDismountLocationInDirection(dem5, aoy);
+        if (dem6 != null) {
+            return dem6;
+        }
+        return this.position();
+    }
+    
+    protected void randomizeAttributes() {
+    }
+    
+    @Nullable
+    @Override
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        if (apo == null) {
+            apo = new AgableMobGroupData();
+            ((AgableMobGroupData)apo).setBabySpawnChance(0.2f);
+        }
+        this.randomizeAttributes();
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     static {
-        PARENT_HORSE_SELECTOR = (akz -> akz instanceof AbstractHorse && akz.isBred());
+        PARENT_HORSE_SELECTOR = (aoy -> aoy instanceof AbstractHorse && aoy.isBred());
         MOMMY_TARGETING = new TargetingConditions().range(16.0).allowInvulnerable().allowSameTeam().allowUnseeable().selector(AbstractHorse.PARENT_HORSE_SELECTOR);
-        JUMP_STRENGTH = new RangedAttribute(null, "horse.jumpStrength", 0.7, 0.0, 2.0).importLegacyName("Jump Strength").setSyncable(true);
+        FOOD_ITEMS = Ingredient.of(Items.WHEAT, Items.SUGAR, Blocks.HAY_BLOCK.asItem(), Items.APPLE, Items.GOLDEN_CARROT, Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE);
         DATA_ID_FLAGS = SynchedEntityData.<Byte>defineId(AbstractHorse.class, EntityDataSerializers.BYTE);
         DATA_ID_OWNER_UUID = SynchedEntityData.<Optional<UUID>>defineId(AbstractHorse.class, EntityDataSerializers.OPTIONAL_UUID);
     }
diff --git a/src/net/minecraft/world/entity/animal/horse/Donkey.java b/src/net/minecraft/world/entity/animal/horse/Donkey.java
index 071ed5b..dcca54e 100644
--- a/src/net/minecraft/world/entity/animal/horse/Donkey.java
+++ b/src/net/minecraft/world/entity/animal/horse/Donkey.java
@@ -3,14 +3,15 @@ package net.minecraft.world.entity.animal.horse;
 import net.minecraft.world.entity.AgableMob;
 import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.world.damagesource.DamageSource;
+import javax.annotation.Nullable;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Donkey extends AbstractChestedHorse {
-    public Donkey(final EntityType<? extends Donkey> aku, final Level bjw) {
-        super(aku, bjw);
+    public Donkey(final EntityType<? extends Donkey> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -19,28 +20,40 @@ public class Donkey extends AbstractChestedHorse {
         return SoundEvents.DONKEY_AMBIENT;
     }
     
+    @Override
+    protected SoundEvent getAngrySound() {
+        super.getAngrySound();
+        return SoundEvents.DONKEY_ANGRY;
+    }
+    
     @Override
     protected SoundEvent getDeathSound() {
         super.getDeathSound();
         return SoundEvents.DONKEY_DEATH;
     }
     
+    @Nullable
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
-        super.getHurtSound(ajz);
+    protected SoundEvent getEatingSound() {
+        return SoundEvents.DONKEY_EAT;
+    }
+    
+    @Override
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        super.getHurtSound(anw);
         return SoundEvents.DONKEY_HURT;
     }
     
     @Override
-    public boolean canMate(final Animal atc) {
-        return atc != this && (atc instanceof Donkey || atc instanceof Horse) && this.canParent() && ((AbstractHorse)atc).canParent();
+    public boolean canMate(final Animal ayk) {
+        return ayk != this && (ayk instanceof Donkey || ayk instanceof Horse) && this.canParent() && ((AbstractHorse)ayk).canParent();
     }
     
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
-        final EntityType<? extends AbstractHorse> aku3 = (ako instanceof Horse) ? EntityType.MULE : EntityType.DONKEY;
-        final AbstractHorse aue4 = (AbstractHorse)aku3.create(this.level);
-        this.setOffspringAttributes(ako, aue4);
-        return aue4;
+    public AgableMob getBreedOffspring(final AgableMob aok) {
+        final EntityType<? extends AbstractHorse> aoq3 = (aok instanceof Horse) ? EntityType.MULE : EntityType.DONKEY;
+        final AbstractHorse azm4 = (AbstractHorse)aoq3.create(this.level);
+        this.setOffspringAttributes(aok, azm4);
+        return azm4;
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/horse/Horse.java b/src/net/minecraft/world/entity/animal/horse/Horse.java
index 314eefe..6a4c4a5 100644
--- a/src/net/minecraft/world/entity/animal/horse/Horse.java
+++ b/src/net/minecraft/world/entity/animal/horse/Horse.java
@@ -7,45 +7,45 @@ import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.DifficultyInstance;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.Util;
 import net.minecraft.world.entity.AgableMob;
 import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.damagesource.DamageSource;
+import javax.annotation.Nullable;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.item.HorseArmorItem;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
-import javax.annotation.Nullable;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import java.util.UUID;
 
 public class Horse extends AbstractHorse {
     private static final UUID ARMOR_MODIFIER_UUID;
     private static final EntityDataAccessor<Integer> DATA_ID_TYPE_VARIANT;
-    private static final String[] VARIANT_TEXTURES;
-    private static final String[] VARIANT_HASHES;
-    private static final String[] MARKING_TEXTURES;
-    private static final String[] MARKING_HASHES;
-    @Nullable
-    private String layerTextureHashName;
-    private final String[] layerTextureLayers;
     
-    public Horse(final EntityType<? extends Horse> aku, final Level bjw) {
-        super(aku, bjw);
-        this.layerTextureLayers = new String[2];
+    public Horse(final EntityType<? extends Horse> aoq, final Level bqb) {
+        super(aoq, bqb);
+    }
+    
+    @Override
+    protected void randomizeAttributes() {
+        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.generateRandomMaxHealth());
+        this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(this.generateRandomSpeed());
+        this.getAttribute(Attributes.JUMP_STRENGTH).setBaseValue(this.generateRandomJumpStrength());
     }
     
     @Override
@@ -55,11 +55,11 @@ public class Horse extends AbstractHorse {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("Variant", this.getVariant());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Variant", this.getTypeVariant());
         if (!this.inventory.getItem(1).isEmpty()) {
-            jt.put("ArmorItem", this.inventory.getItem(1).save(new CompoundTag()));
+            le.put("ArmorItem", this.inventory.getItem(1).save(new CompoundTag()));
         }
     }
     
@@ -67,112 +67,82 @@ public class Horse extends AbstractHorse {
         return this.getItemBySlot(EquipmentSlot.CHEST);
     }
     
-    private void setArmor(final ItemStack ben) {
-        this.setItemSlot(EquipmentSlot.CHEST, ben);
+    private void setArmor(final ItemStack bki) {
+        this.setItemSlot(EquipmentSlot.CHEST, bki);
         this.setDropChance(EquipmentSlot.CHEST, 0.0f);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setVariant(jt.getInt("Variant"));
-        if (jt.contains("ArmorItem", 10)) {
-            final ItemStack ben3 = ItemStack.of(jt.getCompound("ArmorItem"));
-            if (!ben3.isEmpty() && this.isArmor(ben3)) {
-                this.inventory.setItem(1, ben3);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setTypeVariant(le.getInt("Variant"));
+        if (le.contains("ArmorItem", 10)) {
+            final ItemStack bki3 = ItemStack.of(le.getCompound("ArmorItem"));
+            if (!bki3.isEmpty() && this.isArmor(bki3)) {
+                this.inventory.setItem(1, bki3);
             }
         }
-        this.updateEquipment();
+        this.updateContainerEquipment();
     }
     
-    public void setVariant(final int integer) {
+    private void setTypeVariant(final int integer) {
         this.entityData.<Integer>set(Horse.DATA_ID_TYPE_VARIANT, integer);
-        this.clearLayeredTextureInfo();
     }
     
-    public int getVariant() {
+    private int getTypeVariant() {
         return this.entityData.<Integer>get(Horse.DATA_ID_TYPE_VARIANT);
     }
     
-    private void clearLayeredTextureInfo() {
-        this.layerTextureHashName = null;
+    private void setVariantAndMarkings(final Variant azv, final Markings azq) {
+        this.setTypeVariant((azv.getId() & 0xFF) | (azq.getId() << 8 & 0xFF00));
     }
     
-    private void rebuildLayeredTextureInfo() {
-        final int integer2 = this.getVariant();
-        final int integer3 = (integer2 & 0xFF) % 7;
-        final int integer4 = ((integer2 & 0xFF00) >> 8) % 5;
-        this.layerTextureLayers[0] = Horse.VARIANT_TEXTURES[integer3];
-        this.layerTextureLayers[1] = Horse.MARKING_TEXTURES[integer4];
-        this.layerTextureHashName = "horse/" + Horse.VARIANT_HASHES[integer3] + Horse.MARKING_HASHES[integer4];
+    public Variant getVariant() {
+        return Variant.byId(this.getTypeVariant() & 0xFF);
     }
     
-    public String getLayeredTextureHashName() {
-        if (this.layerTextureHashName == null) {
-            this.rebuildLayeredTextureInfo();
-        }
-        return this.layerTextureHashName;
-    }
-    
-    public String[] getLayeredTextureLayers() {
-        if (this.layerTextureHashName == null) {
-            this.rebuildLayeredTextureInfo();
-        }
-        return this.layerTextureLayers;
+    public Markings getMarkings() {
+        return Markings.byId((this.getTypeVariant() & 0xFF00) >> 8);
     }
     
     @Override
-    protected void updateEquipment() {
-        super.updateEquipment();
+    protected void updateContainerEquipment() {
+        if (this.level.isClientSide) {
+            return;
+        }
+        super.updateContainerEquipment();
         this.setArmorEquipment(this.inventory.getItem(1));
         this.setDropChance(EquipmentSlot.CHEST, 0.0f);
     }
     
-    private void setArmorEquipment(final ItemStack ben) {
-        this.setArmor(ben);
+    private void setArmorEquipment(final ItemStack bki) {
+        this.setArmor(bki);
         if (!this.level.isClientSide) {
-            this.getAttribute(SharedMonsterAttributes.ARMOR).removeModifier(Horse.ARMOR_MODIFIER_UUID);
-            if (this.isArmor(ben)) {
-                final int integer3 = ((HorseArmorItem)ben.getItem()).getProtection();
+            this.getAttribute(Attributes.ARMOR).removeModifier(Horse.ARMOR_MODIFIER_UUID);
+            if (this.isArmor(bki)) {
+                final int integer3 = ((HorseArmorItem)bki.getItem()).getProtection();
                 if (integer3 != 0) {
-                    this.getAttribute(SharedMonsterAttributes.ARMOR).addModifier(new AttributeModifier(Horse.ARMOR_MODIFIER_UUID, "Horse armor bonus", integer3, AttributeModifier.Operation.ADDITION).setSerialize(false));
+                    this.getAttribute(Attributes.ARMOR).addTransientModifier(new AttributeModifier(Horse.ARMOR_MODIFIER_UUID, "Horse armor bonus", integer3, AttributeModifier.Operation.ADDITION));
                 }
             }
         }
     }
     
     @Override
-    public void containerChanged(final Container aje) {
-        final ItemStack ben3 = this.getArmor();
-        super.containerChanged(aje);
-        final ItemStack ben4 = this.getArmor();
-        if (this.tickCount > 20 && this.isArmor(ben4) && ben3 != ben4) {
+    public void containerChanged(final Container amz) {
+        final ItemStack bki3 = this.getArmor();
+        super.containerChanged(amz);
+        final ItemStack bki4 = this.getArmor();
+        if (this.tickCount > 20 && this.isArmor(bki4) && bki3 != bki4) {
             this.playSound(SoundEvents.HORSE_ARMOR, 0.5f, 1.0f);
         }
     }
     
     @Override
-    protected void playGallopSound(final SoundType bum) {
-        super.playGallopSound(bum);
+    protected void playGallopSound(final SoundType cbh) {
+        super.playGallopSound(cbh);
         if (this.random.nextInt(10) == 0) {
-            this.playSound(SoundEvents.HORSE_BREATHE, bum.getVolume() * 0.6f, bum.getPitch());
-        }
-    }
-    
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(this.generateRandomMaxHealth());
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(this.generateRandomSpeed());
-        this.getAttribute(Horse.JUMP_STRENGTH).setBaseValue(this.generateRandomJumpStrength());
-    }
-    
-    @Override
-    public void tick() {
-        super.tick();
-        if (this.level.isClientSide && this.entityData.isDirty()) {
-            this.entityData.clearDirty();
-            this.clearLayeredTextureInfo();
+            this.playSound(SoundEvents.HORSE_BREATHE, cbh.getVolume() * 0.6f, cbh.getPitch());
         }
     }
     
@@ -188,9 +158,15 @@ public class Horse extends AbstractHorse {
         return SoundEvents.HORSE_DEATH;
     }
     
+    @Nullable
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
-        super.getHurtSound(ajz);
+    protected SoundEvent getEatingSound() {
+        return SoundEvents.HORSE_EAT;
+    }
+    
+    @Override
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        super.getHurtSound(anw);
         return SoundEvents.HORSE_HURT;
     }
     
@@ -201,128 +177,119 @@ public class Horse extends AbstractHorse {
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        final boolean boolean5 = !ben4.isEmpty();
-        if (boolean5 && ben4.getItem() instanceof SpawnEggItem) {
-            return super.mobInteract(ayj, ajk);
-        }
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
         if (!this.isBaby()) {
-            if (this.isTamed() && ayj.isSecondaryUseActive()) {
-                this.openInventory(ayj);
-                return true;
+            if (this.isTamed() && bec.isSecondaryUseActive()) {
+                this.openInventory(bec);
+                return InteractionResult.sidedSuccess(this.level.isClientSide);
             }
             if (this.isVehicle()) {
-                return super.mobInteract(ayj, ajk);
+                return super.mobInteract(bec, anf);
             }
         }
-        if (boolean5) {
-            if (this.handleEating(ayj, ben4)) {
-                if (!ayj.abilities.instabuild) {
-                    ben4.shrink(1);
-                }
-                return true;
+        if (!bki4.isEmpty()) {
+            if (this.isFood(bki4)) {
+                return this.fedFood(bec, bki4);
             }
-            if (ben4.interactEnemy(ayj, this, ajk)) {
-                return true;
+            final InteractionResult ang5 = bki4.interactLivingEntity(bec, this, anf);
+            if (ang5.consumesAction()) {
+                return ang5;
             }
             if (!this.isTamed()) {
                 this.makeMad();
-                return true;
+                return InteractionResult.sidedSuccess(this.level.isClientSide);
             }
-            final boolean boolean6 = !this.isBaby() && !this.isSaddled() && ben4.getItem() == Items.SADDLE;
-            if (this.isArmor(ben4) || boolean6) {
-                this.openInventory(ayj);
-                return true;
+            final boolean boolean6 = !this.isBaby() && !this.isSaddled() && bki4.getItem() == Items.SADDLE;
+            if (this.isArmor(bki4) || boolean6) {
+                this.openInventory(bec);
+                return InteractionResult.sidedSuccess(this.level.isClientSide);
             }
         }
         if (this.isBaby()) {
-            return super.mobInteract(ayj, ajk);
+            return super.mobInteract(bec, anf);
         }
-        this.doPlayerRide(ayj);
-        return true;
+        this.doPlayerRide(bec);
+        return InteractionResult.sidedSuccess(this.level.isClientSide);
     }
     
     @Override
-    public boolean canMate(final Animal atc) {
-        return atc != this && (atc instanceof Donkey || atc instanceof Horse) && this.canParent() && ((AbstractHorse)atc).canParent();
+    public boolean canMate(final Animal ayk) {
+        return ayk != this && (ayk instanceof Donkey || ayk instanceof Horse) && this.canParent() && ((AbstractHorse)ayk).canParent();
     }
     
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
-        AbstractHorse aue3;
-        if (ako instanceof Donkey) {
-            aue3 = EntityType.MULE.create(this.level);
+    public AgableMob getBreedOffspring(final AgableMob aok) {
+        AbstractHorse azm3;
+        if (aok instanceof Donkey) {
+            azm3 = EntityType.MULE.create(this.level);
         }
         else {
-            final Horse aug4 = (Horse)ako;
-            aue3 = EntityType.HORSE.create(this.level);
+            final Horse azo4 = (Horse)aok;
+            azm3 = EntityType.HORSE.create(this.level);
             final int integer6 = this.random.nextInt(9);
-            int integer7;
+            Variant azv5;
             if (integer6 < 4) {
-                integer7 = (this.getVariant() & 0xFF);
+                azv5 = this.getVariant();
             }
             else if (integer6 < 8) {
-                integer7 = (aug4.getVariant() & 0xFF);
+                azv5 = azo4.getVariant();
             }
             else {
-                integer7 = this.random.nextInt(7);
+                azv5 = Util.<Variant>getRandom(Variant.values(), this.random);
             }
-            final int integer8 = this.random.nextInt(5);
-            if (integer8 < 2) {
-                integer7 |= (this.getVariant() & 0xFF00);
+            final int integer7 = this.random.nextInt(5);
+            Markings azq7;
+            if (integer7 < 2) {
+                azq7 = this.getMarkings();
             }
-            else if (integer8 < 4) {
-                integer7 |= (aug4.getVariant() & 0xFF00);
+            else if (integer7 < 4) {
+                azq7 = azo4.getMarkings();
             }
             else {
-                integer7 |= (this.random.nextInt(5) << 8 & 0xFF00);
+                azq7 = Util.<Markings>getRandom(Markings.values(), this.random);
             }
-            ((Horse)aue3).setVariant(integer7);
+            ((Horse)azm3).setVariantAndMarkings(azv5, azq7);
         }
-        this.setOffspringAttributes(ako, aue3);
-        return aue3;
+        this.setOffspringAttributes(aok, azm3);
+        return azm3;
     }
     
     @Override
-    public boolean wearsArmor() {
+    public boolean canWearArmor() {
         return true;
     }
     
     @Override
-    public boolean isArmor(final ItemStack ben) {
-        return ben.getItem() instanceof HorseArmorItem;
+    public boolean isArmor(final ItemStack bki) {
+        return bki.getItem() instanceof HorseArmorItem;
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        int integer7;
-        if (alm instanceof HorseGroupData) {
-            integer7 = ((HorseGroupData)alm).variant;
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        Variant azv7;
+        if (apo instanceof HorseGroupData) {
+            azv7 = ((HorseGroupData)apo).variant;
         }
         else {
-            integer7 = this.random.nextInt(7);
-            alm = new HorseGroupData(integer7);
+            azv7 = Util.<Variant>getRandom(Variant.values(), this.random);
+            apo = new HorseGroupData(azv7);
         }
-        this.setVariant(integer7 | this.random.nextInt(5) << 8);
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        this.setVariantAndMarkings(azv7, Util.<Markings>getRandom(Markings.values(), this.random));
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     static {
         ARMOR_MODIFIER_UUID = UUID.fromString("556E1665-8B10-40C8-8F9D-CF9B1667F295");
         DATA_ID_TYPE_VARIANT = SynchedEntityData.<Integer>defineId(Horse.class, EntityDataSerializers.INT);
-        VARIANT_TEXTURES = new String[] { "textures/entity/horse/horse_white.png", "textures/entity/horse/horse_creamy.png", "textures/entity/horse/horse_chestnut.png", "textures/entity/horse/horse_brown.png", "textures/entity/horse/horse_black.png", "textures/entity/horse/horse_gray.png", "textures/entity/horse/horse_darkbrown.png" };
-        VARIANT_HASHES = new String[] { "hwh", "hcr", "hch", "hbr", "hbl", "hgr", "hdb" };
-        MARKING_TEXTURES = new String[] { null, "textures/entity/horse/horse_markings_white.png", "textures/entity/horse/horse_markings_whitefield.png", "textures/entity/horse/horse_markings_whitedots.png", "textures/entity/horse/horse_markings_blackdots.png" };
-        MARKING_HASHES = new String[] { "", "wo_", "wmo", "wdo", "bdo" };
     }
     
     public static class HorseGroupData extends AgableMobGroupData {
-        public final int variant;
+        public final Variant variant;
         
-        public HorseGroupData(final int integer) {
-            this.variant = integer;
+        public HorseGroupData(final Variant azv) {
+            this.variant = azv;
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/horse/Llama.java b/src/net/minecraft/world/entity/animal/horse/Llama.java
index 8536657..64ace99 100644
--- a/src/net/minecraft/world/entity/animal/horse/Llama.java
+++ b/src/net/minecraft/world/entity/animal/horse/Llama.java
@@ -5,6 +5,7 @@ import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.world.level.ItemLike;
 import java.util.Iterator;
 import net.minecraft.world.entity.projectile.LlamaSpit;
 import net.minecraft.world.entity.AgableMob;
@@ -16,20 +17,21 @@ import net.minecraft.tags.ItemTags;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.DifficultyInstance;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.item.Item;
-import net.minecraft.sounds.SoundEvents;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
@@ -53,9 +55,11 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import javax.annotation.Nullable;
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.entity.monster.RangedAttackMob;
 
 public class Llama extends AbstractChestedHorse implements RangedAttackMob {
+    private static final Ingredient FOOD_ITEMS;
     private static final EntityDataAccessor<Integer> DATA_STRENGTH_ID;
     private static final EntityDataAccessor<Integer> DATA_SWAG_ID;
     private static final EntityDataAccessor<Integer> DATA_VARIANT_ID;
@@ -65,8 +69,8 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     @Nullable
     private Llama caravanTail;
     
-    public Llama(final EntityType<? extends Llama> aku, final Level bjw) {
-        super(aku, bjw);
+    public Llama(final EntityType<? extends Llama> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     public boolean isTraderLlama() {
@@ -87,24 +91,24 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("Variant", this.getVariant());
-        jt.putInt("Strength", this.getStrength());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Variant", this.getVariant());
+        le.putInt("Strength", this.getStrength());
         if (!this.inventory.getItem(1).isEmpty()) {
-            jt.put("DecorItem", this.inventory.getItem(1).save(new CompoundTag()));
+            le.put("DecorItem", this.inventory.getItem(1).save(new CompoundTag()));
         }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        this.setStrength(jt.getInt("Strength"));
-        super.readAdditionalSaveData(jt);
-        this.setVariant(jt.getInt("Variant"));
-        if (jt.contains("DecorItem", 10)) {
-            this.inventory.setItem(1, ItemStack.of(jt.getCompound("DecorItem")));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        this.setStrength(le.getInt("Strength"));
+        super.readAdditionalSaveData(le);
+        this.setVariant(le.getInt("Variant"));
+        if (le.contains("DecorItem", 10)) {
+            this.inventory.setItem(1, ItemStack.of(le.getCompound("DecorItem")));
         }
-        this.updateEquipment();
+        this.updateContainerEquipment();
     }
     
     @Override
@@ -123,10 +127,8 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
         this.targetSelector.addGoal(2, new LlamaAttackWolfGoal(this));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(40.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return AbstractChestedHorse.createBaseChestedHorseAttributes().add(Attributes.FOLLOW_RANGE, 40.0);
     }
     
     @Override
@@ -154,18 +156,18 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     }
     
     @Override
-    public void positionRider(final Entity akq) {
-        if (!this.hasPassenger(akq)) {
+    public void positionRider(final Entity aom) {
+        if (!this.hasPassenger(aom)) {
             return;
         }
         final float float3 = Mth.cos(this.yBodyRot * 0.017453292f);
         final float float4 = Mth.sin(this.yBodyRot * 0.017453292f);
         final float float5 = 0.3f;
-        akq.setPos(this.getX() + 0.3f * float4, this.getY() + this.getRideHeight() + akq.getRidingHeight(), this.getZ() - 0.3f * float3);
+        aom.setPos(this.getX() + 0.3f * float4, this.getY() + this.getPassengersRidingOffset() + aom.getMyRidingOffset(), this.getZ() - 0.3f * float3);
     }
     
     @Override
-    public double getRideHeight() {
+    public double getPassengersRidingOffset() {
         return this.getBbHeight() * 0.67;
     }
     
@@ -175,24 +177,29 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     }
     
     @Override
-    protected boolean handleEating(final Player ayj, final ItemStack ben) {
+    public boolean isFood(final ItemStack bki) {
+        return Llama.FOOD_ITEMS.test(bki);
+    }
+    
+    @Override
+    protected boolean handleEating(final Player bec, final ItemStack bki) {
         int integer4 = 0;
         int integer5 = 0;
         float float6 = 0.0f;
         boolean boolean7 = false;
-        final Item bei8 = ben.getItem();
-        if (bei8 == Items.WHEAT) {
+        final Item bke8 = bki.getItem();
+        if (bke8 == Items.WHEAT) {
             integer4 = 10;
             integer5 = 3;
             float6 = 2.0f;
         }
-        else if (bei8 == Blocks.HAY_BLOCK.asItem()) {
+        else if (bke8 == Blocks.HAY_BLOCK.asItem()) {
             integer4 = 90;
             integer5 = 6;
             float6 = 10.0f;
             if (this.isTamed() && this.getAge() == 0 && this.canFallInLove()) {
                 boolean7 = true;
-                this.setInLove(ayj);
+                this.setInLove(bec);
             }
         }
         if (this.getHealth() < this.getMaxHealth() && float6 > 0.0f) {
@@ -213,30 +220,33 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
             }
         }
         if (boolean7 && !this.isSilent()) {
-            this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.LLAMA_EAT, this.getSoundSource(), 1.0f, 1.0f + (this.random.nextFloat() - this.random.nextFloat()) * 0.2f);
+            final SoundEvent ack9 = this.getEatingSound();
+            if (ack9 != null) {
+                this.level.playSound(null, this.getX(), this.getY(), this.getZ(), this.getEatingSound(), this.getSoundSource(), 1.0f, 1.0f + (this.random.nextFloat() - this.random.nextFloat()) * 0.2f);
+            }
         }
         return boolean7;
     }
     
     @Override
     protected boolean isImmobile() {
-        return this.getHealth() <= 0.0f || this.isEating();
+        return this.isDeadOrDying() || this.isEating();
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
         this.setRandomStrength();
         int integer7;
-        if (alm instanceof LlamaGroupData) {
-            integer7 = ((LlamaGroupData)alm).variant;
+        if (apo instanceof LlamaGroupData) {
+            integer7 = ((LlamaGroupData)apo).variant;
         }
         else {
             integer7 = this.random.nextInt(4);
-            alm = new LlamaGroupData(integer7);
+            apo = new LlamaGroupData(integer7);
         }
         this.setVariant(integer7);
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     @Override
@@ -250,7 +260,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.LLAMA_HURT;
     }
     
@@ -259,8 +269,14 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
         return SoundEvents.LLAMA_DEATH;
     }
     
+    @Nullable
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected SoundEvent getEatingSound() {
+        return SoundEvents.LLAMA_EAT;
+    }
+    
+    @Override
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.LLAMA_STEP, 0.15f, 1.0f);
     }
     
@@ -271,9 +287,9 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     
     @Override
     public void makeMad() {
-        final SoundEvent aah2 = this.getAngrySound();
-        if (aah2 != null) {
-            this.playSound(aah2, this.getSoundVolume(), this.getVoicePitch());
+        final SoundEvent ack2 = this.getAngrySound();
+        if (ack2 != null) {
+            this.playSound(ack2, this.getSoundVolume(), this.getVoicePitch());
         }
     }
     
@@ -283,49 +299,54 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     }
     
     @Override
-    public boolean wearsArmor() {
+    public boolean canWearArmor() {
         return true;
     }
     
     @Override
-    public boolean isArmor(final ItemStack ben) {
-        final Item bei3 = ben.getItem();
-        return ItemTags.CARPETS.contains(bei3);
+    public boolean isWearingArmor() {
+        return !this.inventory.getItem(1).isEmpty();
     }
     
     @Override
-    public boolean canBeSaddled() {
+    public boolean isArmor(final ItemStack bki) {
+        final Item bke3 = bki.getItem();
+        return ItemTags.CARPETS.contains(bke3);
+    }
+    
+    @Override
+    public boolean isSaddleable() {
         return false;
     }
     
     @Override
-    public void containerChanged(final Container aje) {
-        final DyeColor bdj3 = this.getSwag();
-        super.containerChanged(aje);
-        final DyeColor bdj4 = this.getSwag();
-        if (this.tickCount > 20 && bdj4 != null && bdj4 != bdj3) {
+    public void containerChanged(final Container amz) {
+        final DyeColor bje3 = this.getSwag();
+        super.containerChanged(amz);
+        final DyeColor bje4 = this.getSwag();
+        if (this.tickCount > 20 && bje4 != null && bje4 != bje3) {
             this.playSound(SoundEvents.LLAMA_SWAG, 0.5f, 1.0f);
         }
     }
     
     @Override
-    protected void updateEquipment() {
+    protected void updateContainerEquipment() {
         if (this.level.isClientSide) {
             return;
         }
-        super.updateEquipment();
+        super.updateContainerEquipment();
         this.setSwag(getDyeColor(this.inventory.getItem(1)));
     }
     
-    private void setSwag(@Nullable final DyeColor bdj) {
-        this.entityData.<Integer>set(Llama.DATA_SWAG_ID, (bdj == null) ? -1 : bdj.getId());
+    private void setSwag(@Nullable final DyeColor bje) {
+        this.entityData.<Integer>set(Llama.DATA_SWAG_ID, (bje == null) ? -1 : bje.getId());
     }
     
     @Nullable
-    private static DyeColor getDyeColor(final ItemStack ben) {
-        final Block bph2 = Block.byItem(ben.getItem());
-        if (bph2 instanceof WoolCarpetBlock) {
-            return ((WoolCarpetBlock)bph2).getColor();
+    private static DyeColor getDyeColor(final ItemStack bki) {
+        final Block bvr2 = Block.byItem(bki.getItem());
+        if (bvr2 instanceof WoolCarpetBlock) {
+            return ((WoolCarpetBlock)bvr2).getColor();
         }
         return null;
     }
@@ -342,37 +363,39 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     }
     
     @Override
-    public boolean canMate(final Animal atc) {
-        return atc != this && atc instanceof Llama && this.canParent() && ((Llama)atc).canParent();
+    public boolean canMate(final Animal ayk) {
+        return ayk != this && ayk instanceof Llama && this.canParent() && ((Llama)ayk).canParent();
     }
     
     @Override
-    public Llama getBreedOffspring(final AgableMob ako) {
-        final Llama auh3 = this.makeBabyLlama();
-        this.setOffspringAttributes(ako, auh3);
-        final Llama auh4 = (Llama)ako;
-        int integer5 = this.random.nextInt(Math.max(this.getStrength(), auh4.getStrength())) + 1;
+    public Llama getBreedOffspring(final AgableMob aok) {
+        final Llama azp3 = this.makeBabyLlama();
+        this.setOffspringAttributes(aok, azp3);
+        final Llama azp4 = (Llama)aok;
+        int integer5 = this.random.nextInt(Math.max(this.getStrength(), azp4.getStrength())) + 1;
         if (this.random.nextFloat() < 0.03f) {
             ++integer5;
         }
-        auh3.setStrength(integer5);
-        auh3.setVariant(this.random.nextBoolean() ? this.getVariant() : auh4.getVariant());
-        return auh3;
+        azp3.setStrength(integer5);
+        azp3.setVariant(this.random.nextBoolean() ? this.getVariant() : azp4.getVariant());
+        return azp3;
     }
     
     protected Llama makeBabyLlama() {
         return EntityType.LLAMA.create(this.level);
     }
     
-    private void spit(final LivingEntity akz) {
-        final LlamaSpit ayx3 = new LlamaSpit(this.level, this);
-        final double double4 = akz.getX() - this.getX();
-        final double double5 = akz.getY(0.3333333333333333) - ayx3.getY();
-        final double double6 = akz.getZ() - this.getZ();
+    private void spit(final LivingEntity aoy) {
+        final LlamaSpit ber3 = new LlamaSpit(this.level, this);
+        final double double4 = aoy.getX() - this.getX();
+        final double double5 = aoy.getY(0.3333333333333333) - ber3.getY();
+        final double double6 = aoy.getZ() - this.getZ();
         final float float10 = Mth.sqrt(double4 * double4 + double6 * double6) * 0.2f;
-        ayx3.shoot(double4, double5 + float10, double6, 1.5f, 10.0f);
-        this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.LLAMA_SPIT, this.getSoundSource(), 1.0f, 1.0f + (this.random.nextFloat() - this.random.nextFloat()) * 0.2f);
-        this.level.addFreshEntity(ayx3);
+        ber3.shoot(double4, double5 + float10, double6, 1.5f, 10.0f);
+        if (!this.isSilent()) {
+            this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.LLAMA_SPIT, this.getSoundSource(), 1.0f, 1.0f + (this.random.nextFloat() - this.random.nextFloat()) * 0.2f);
+        }
+        this.level.addFreshEntity(ber3);
         this.didSpit = true;
     }
     
@@ -389,8 +412,8 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
         if (float1 >= 6.0f) {
             this.hurt(DamageSource.FALL, (float)integer4);
             if (this.isVehicle()) {
-                for (final Entity akq6 : this.getIndirectPassengers()) {
-                    akq6.hurt(DamageSource.FALL, (float)integer4);
+                for (final Entity aom6 : this.getIndirectPassengers()) {
+                    aom6.hurt(DamageSource.FALL, (float)integer4);
                 }
             }
         }
@@ -405,8 +428,8 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
         this.caravanHead = null;
     }
     
-    public void joinCaravan(final Llama auh) {
-        this.caravanHead = auh;
+    public void joinCaravan(final Llama azp) {
+        this.caravanHead = azp;
         this.caravanHead.caravanTail = this;
     }
     
@@ -441,11 +464,12 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     }
     
     @Override
-    public void performRangedAttack(final LivingEntity akz, final float float2) {
-        this.spit(akz);
+    public void performRangedAttack(final LivingEntity aoy, final float float2) {
+        this.spit(aoy);
     }
     
     static {
+        FOOD_ITEMS = Ingredient.of(Items.WHEAT, Blocks.HAY_BLOCK.asItem());
         DATA_STRENGTH_ID = SynchedEntityData.<Integer>defineId(Llama.class, EntityDataSerializers.INT);
         DATA_SWAG_ID = SynchedEntityData.<Integer>defineId(Llama.class, EntityDataSerializers.INT);
         DATA_VARIANT_ID = SynchedEntityData.<Integer>defineId(Llama.class, EntityDataSerializers.INT);
@@ -460,16 +484,16 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     }
     
     static class LlamaHurtByTargetGoal extends HurtByTargetGoal {
-        public LlamaHurtByTargetGoal(final Llama auh) {
-            super(auh, new Class[0]);
+        public LlamaHurtByTargetGoal(final Llama azp) {
+            super(azp, new Class[0]);
         }
         
         @Override
         public boolean canContinueToUse() {
             if (this.mob instanceof Llama) {
-                final Llama auh2 = (Llama)this.mob;
-                if (auh2.didSpit) {
-                    auh2.setDidSpit(false);
+                final Llama azp2 = (Llama)this.mob;
+                if (azp2.didSpit) {
+                    azp2.setDidSpit(false);
                     return false;
                 }
             }
@@ -478,8 +502,8 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
     }
     
     static class LlamaAttackWolfGoal extends NearestAttackableTargetGoal<Wolf> {
-        public LlamaAttackWolfGoal(final Llama auh) {
-            super(auh, Wolf.class, 16, false, true, akz -> !akz.isTame());
+        public LlamaAttackWolfGoal(final Llama azp) {
+            super(azp, Wolf.class, 16, false, true, aoy -> !aoy.isTame());
         }
         
         @Override
diff --git a/src/net/minecraft/world/entity/animal/horse/Markings.java b/src/net/minecraft/world/entity/animal/horse/Markings.java
new file mode 100644
index 0000000..0cc4831
--- /dev/null
+++ b/src/net/minecraft/world/entity/animal/horse/Markings.java
@@ -0,0 +1,31 @@
+package net.minecraft.world.entity.animal.horse;
+
+import java.util.Comparator;
+import java.util.Arrays;
+
+public enum Markings {
+    NONE(0), 
+    WHITE(1), 
+    WHITE_FIELD(2), 
+    WHITE_DOTS(3), 
+    BLACK_DOTS(4);
+    
+    private static final Markings[] BY_ID;
+    private final int id;
+    
+    private Markings(final int integer3) {
+        this.id = integer3;
+    }
+    
+    public int getId() {
+        return this.id;
+    }
+    
+    public static Markings byId(final int integer) {
+        return Markings.BY_ID[integer % Markings.BY_ID.length];
+    }
+    
+    static {
+        BY_ID = Arrays.<Markings>stream(values()).sorted(Comparator.comparingInt(Markings::getId)).<Markings>toArray(Markings[]::new);
+    }
+}
diff --git a/src/net/minecraft/world/entity/animal/horse/Mule.java b/src/net/minecraft/world/entity/animal/horse/Mule.java
index 9d93d6b..8cf4110 100644
--- a/src/net/minecraft/world/entity/animal/horse/Mule.java
+++ b/src/net/minecraft/world/entity/animal/horse/Mule.java
@@ -2,14 +2,15 @@ package net.minecraft.world.entity.animal.horse;
 
 import net.minecraft.world.entity.AgableMob;
 import net.minecraft.world.damagesource.DamageSource;
+import javax.annotation.Nullable;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Mule extends AbstractChestedHorse {
-    public Mule(final EntityType<? extends Mule> aku, final Level bjw) {
-        super(aku, bjw);
+    public Mule(final EntityType<? extends Mule> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -18,15 +19,27 @@ public class Mule extends AbstractChestedHorse {
         return SoundEvents.MULE_AMBIENT;
     }
     
+    @Override
+    protected SoundEvent getAngrySound() {
+        super.getAngrySound();
+        return SoundEvents.MULE_ANGRY;
+    }
+    
     @Override
     protected SoundEvent getDeathSound() {
         super.getDeathSound();
         return SoundEvents.MULE_DEATH;
     }
     
+    @Nullable
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
-        super.getHurtSound(ajz);
+    protected SoundEvent getEatingSound() {
+        return SoundEvents.MULE_EAT;
+    }
+    
+    @Override
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        super.getHurtSound(anw);
         return SoundEvents.MULE_HURT;
     }
     
@@ -36,7 +49,7 @@ public class Mule extends AbstractChestedHorse {
     }
     
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
+    public AgableMob getBreedOffspring(final AgableMob aok) {
         return EntityType.MULE.create(this.level);
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
index 9871a06..5af5d44 100644
--- a/src/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+++ b/src/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
@@ -3,7 +3,7 @@ package net.minecraft.world.entity.animal.horse;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import javax.annotation.Nullable;
@@ -13,9 +13,12 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.MobType;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
@@ -24,17 +27,18 @@ public class SkeletonHorse extends AbstractHorse {
     private boolean isTrap;
     private int trapTime;
     
-    public SkeletonHorse(final EntityType<? extends SkeletonHorse> aku, final Level bjw) {
-        super(aku, bjw);
+    public SkeletonHorse(final EntityType<? extends SkeletonHorse> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.skeletonTrapGoal = new SkeletonTrapGoal(this);
     }
     
+    public static AttributeSupplier.Builder createAttributes() {
+        return AbstractHorse.createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224);
+    }
+    
     @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(15.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.20000000298023224);
-        this.getAttribute(SkeletonHorse.JUMP_STRENGTH).setBaseValue(this.generateRandomJumpStrength());
+    protected void randomizeAttributes() {
+        this.getAttribute(Attributes.JUMP_STRENGTH).setBaseValue(this.generateRandomJumpStrength());
     }
     
     @Override
@@ -44,7 +48,7 @@ public class SkeletonHorse extends AbstractHorse {
     @Override
     protected SoundEvent getAmbientSound() {
         super.getAmbientSound();
-        if (this.isUnderLiquid(FluidTags.WATER)) {
+        if (this.isEyeInFluid(FluidTags.WATER)) {
             return SoundEvents.SKELETON_HORSE_AMBIENT_WATER;
         }
         return SoundEvents.SKELETON_HORSE_AMBIENT;
@@ -57,8 +61,8 @@ public class SkeletonHorse extends AbstractHorse {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
-        super.getHurtSound(ajz);
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        super.getHurtSound(anw);
         return SoundEvents.SKELETON_HORSE_HURT;
     }
     
@@ -105,8 +109,8 @@ public class SkeletonHorse extends AbstractHorse {
     }
     
     @Override
-    public double getRideHeight() {
-        return super.getRideHeight() - 0.1875;
+    public double getPassengersRidingOffset() {
+        return super.getPassengersRidingOffset() - 0.1875;
     }
     
     @Override
@@ -118,17 +122,17 @@ public class SkeletonHorse extends AbstractHorse {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("SkeletonTrap", this.isTrap());
-        jt.putInt("SkeletonTrapTime", this.trapTime);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("SkeletonTrap", this.isTrap());
+        le.putInt("SkeletonTrapTime", this.trapTime);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setTrap(jt.getBoolean("SkeletonTrap"));
-        this.trapTime = jt.getInt("SkeletonTrapTime");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setTrap(le.getBoolean("SkeletonTrap"));
+        this.trapTime = le.getInt("SkeletonTrapTime");
     }
     
     @Override
@@ -160,39 +164,37 @@ public class SkeletonHorse extends AbstractHorse {
     
     @Nullable
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
+    public AgableMob getBreedOffspring(final AgableMob aok) {
         return EntityType.SKELETON_HORSE.create(this.level);
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() instanceof SpawnEggItem) {
-            return super.mobInteract(ayj, ajk);
-        }
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
         if (!this.isTamed()) {
-            return false;
+            return InteractionResult.PASS;
         }
         if (this.isBaby()) {
-            return super.mobInteract(ayj, ajk);
+            return super.mobInteract(bec, anf);
         }
-        if (ayj.isSecondaryUseActive()) {
-            this.openInventory(ayj);
-            return true;
+        if (bec.isSecondaryUseActive()) {
+            this.openInventory(bec);
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
         if (this.isVehicle()) {
-            return super.mobInteract(ayj, ajk);
+            return super.mobInteract(bec, anf);
         }
-        if (!ben4.isEmpty()) {
-            if (ben4.getItem() == Items.SADDLE && !this.isSaddled()) {
-                this.openInventory(ayj);
-                return true;
+        if (!bki4.isEmpty()) {
+            if (bki4.getItem() == Items.SADDLE && !this.isSaddled()) {
+                this.openInventory(bec);
+                return InteractionResult.sidedSuccess(this.level.isClientSide);
             }
-            if (ben4.interactEnemy(ayj, this, ajk)) {
-                return true;
+            final InteractionResult ang5 = bki4.interactLivingEntity(bec, this, anf);
+            if (ang5.consumesAction()) {
+                return ang5;
             }
         }
-        this.doPlayerRide(ayj);
-        return true;
+        this.doPlayerRide(bec);
+        return InteractionResult.sidedSuccess(this.level.isClientSide);
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java b/src/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
index 3971825..cb7fadf 100644
--- a/src/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
+++ b/src/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
@@ -9,20 +9,18 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.MobSpawnType;
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.monster.Skeleton;
 import net.minecraft.world.DifficultyInstance;
-import net.minecraft.world.entity.global.LightningBolt;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LightningBolt;
 import net.minecraft.world.entity.ai.goal.Goal;
 
 public class SkeletonTrapGoal extends Goal {
     private final SkeletonHorse horse;
     
-    public SkeletonTrapGoal(final SkeletonHorse auj) {
-        this.horse = auj;
+    public SkeletonTrapGoal(final SkeletonHorse azs) {
+        this.horse = azs;
     }
     
     @Override
@@ -32,45 +30,48 @@ public class SkeletonTrapGoal extends Goal {
     
     @Override
     public void tick() {
-        final DifficultyInstance ajj2 = this.horse.level.getCurrentDifficultyAt(new BlockPos(this.horse));
+        final DifficultyInstance ane2 = this.horse.level.getCurrentDifficultyAt(this.horse.blockPosition());
         this.horse.setTrap(false);
         this.horse.setTamed(true);
         this.horse.setAge(0);
-        ((ServerLevel)this.horse.level).addGlobalEntity(new LightningBolt(this.horse.level, this.horse.getX(), this.horse.getY(), this.horse.getZ(), true));
-        final Skeleton axg3 = this.createSkeleton(ajj2, this.horse);
-        axg3.startRiding(this.horse);
-        for (int integer4 = 0; integer4 < 3; ++integer4) {
-            final AbstractHorse aue5 = this.createHorse(ajj2);
-            final Skeleton axg4 = this.createSkeleton(ajj2, aue5);
-            axg4.startRiding(aue5);
-            aue5.push(this.horse.getRandom().nextGaussian() * 0.5, 0.0, this.horse.getRandom().nextGaussian() * 0.5);
+        final LightningBolt aox3 = EntityType.LIGHTNING_BOLT.create(this.horse.level);
+        aox3.moveTo(this.horse.getX(), this.horse.getY(), this.horse.getZ());
+        aox3.setVisualOnly(true);
+        this.horse.level.addFreshEntity(aox3);
+        final Skeleton bcj4 = this.createSkeleton(ane2, this.horse);
+        bcj4.startRiding(this.horse);
+        for (int integer5 = 0; integer5 < 3; ++integer5) {
+            final AbstractHorse azm6 = this.createHorse(ane2);
+            final Skeleton bcj5 = this.createSkeleton(ane2, azm6);
+            bcj5.startRiding(azm6);
+            azm6.push(this.horse.getRandom().nextGaussian() * 0.5, 0.0, this.horse.getRandom().nextGaussian() * 0.5);
         }
     }
     
-    private AbstractHorse createHorse(final DifficultyInstance ajj) {
-        final SkeletonHorse auj3 = EntityType.SKELETON_HORSE.create(this.horse.level);
-        auj3.finalizeSpawn(this.horse.level, ajj, MobSpawnType.TRIGGERED, null, null);
-        auj3.setPos(this.horse.getX(), this.horse.getY(), this.horse.getZ());
-        auj3.invulnerableTime = 60;
-        auj3.setPersistenceRequired();
-        auj3.setTamed(true);
-        auj3.setAge(0);
-        auj3.level.addFreshEntity(auj3);
-        return auj3;
+    private AbstractHorse createHorse(final DifficultyInstance ane) {
+        final SkeletonHorse azs3 = EntityType.SKELETON_HORSE.create(this.horse.level);
+        azs3.finalizeSpawn(this.horse.level, ane, MobSpawnType.TRIGGERED, null, null);
+        azs3.setPos(this.horse.getX(), this.horse.getY(), this.horse.getZ());
+        azs3.invulnerableTime = 60;
+        azs3.setPersistenceRequired();
+        azs3.setTamed(true);
+        azs3.setAge(0);
+        azs3.level.addFreshEntity(azs3);
+        return azs3;
     }
     
-    private Skeleton createSkeleton(final DifficultyInstance ajj, final AbstractHorse aue) {
-        final Skeleton axg4 = EntityType.SKELETON.create(aue.level);
-        axg4.finalizeSpawn(aue.level, ajj, MobSpawnType.TRIGGERED, null, null);
-        axg4.setPos(aue.getX(), aue.getY(), aue.getZ());
-        axg4.invulnerableTime = 60;
-        axg4.setPersistenceRequired();
-        if (axg4.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
-            axg4.setItemSlot(EquipmentSlot.HEAD, new ItemStack(Items.IRON_HELMET));
+    private Skeleton createSkeleton(final DifficultyInstance ane, final AbstractHorse azm) {
+        final Skeleton bcj4 = EntityType.SKELETON.create(azm.level);
+        bcj4.finalizeSpawn(azm.level, ane, MobSpawnType.TRIGGERED, null, null);
+        bcj4.setPos(azm.getX(), azm.getY(), azm.getZ());
+        bcj4.invulnerableTime = 60;
+        bcj4.setPersistenceRequired();
+        if (bcj4.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
+            bcj4.setItemSlot(EquipmentSlot.HEAD, new ItemStack(Items.IRON_HELMET));
         }
-        axg4.setItemSlot(EquipmentSlot.MAINHAND, EnchantmentHelper.enchantItem(axg4.getRandom(), axg4.getMainHandItem(), (int)(5.0f + ajj.getSpecialMultiplier() * axg4.getRandom().nextInt(18)), false));
-        axg4.setItemSlot(EquipmentSlot.HEAD, EnchantmentHelper.enchantItem(axg4.getRandom(), axg4.getItemBySlot(EquipmentSlot.HEAD), (int)(5.0f + ajj.getSpecialMultiplier() * axg4.getRandom().nextInt(18)), false));
-        axg4.level.addFreshEntity(axg4);
-        return axg4;
+        bcj4.setItemSlot(EquipmentSlot.MAINHAND, EnchantmentHelper.enchantItem(bcj4.getRandom(), bcj4.getMainHandItem(), (int)(5.0f + ane.getSpecialMultiplier() * bcj4.getRandom().nextInt(18)), false));
+        bcj4.setItemSlot(EquipmentSlot.HEAD, EnchantmentHelper.enchantItem(bcj4.getRandom(), bcj4.getItemBySlot(EquipmentSlot.HEAD), (int)(5.0f + ane.getSpecialMultiplier() * bcj4.getRandom().nextInt(18)), false));
+        bcj4.level.addFreshEntity(bcj4);
+        return bcj4;
     }
 }
diff --git a/src/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/net/minecraft/world/entity/animal/horse/TraderLlama.java
index ebfc084..f62ee39 100644
--- a/src/net/minecraft/world/entity/animal/horse/TraderLlama.java
+++ b/src/net/minecraft/world/entity/animal/horse/TraderLlama.java
@@ -24,8 +24,8 @@ import net.minecraft.world.entity.EntityType;
 public class TraderLlama extends Llama {
     private int despawnDelay;
     
-    public TraderLlama(final EntityType<? extends TraderLlama> aku, final Level bjw) {
-        super(aku, bjw);
+    public TraderLlama(final EntityType<? extends TraderLlama> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.despawnDelay = 47999;
     }
     
@@ -40,16 +40,16 @@ public class TraderLlama extends Llama {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("DespawnDelay", this.despawnDelay);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("DespawnDelay", this.despawnDelay);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("DespawnDelay", 99)) {
-            this.despawnDelay = jt.getInt("DespawnDelay");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("DespawnDelay", 99)) {
+            this.despawnDelay = le.getInt("DespawnDelay");
         }
     }
     
@@ -61,12 +61,12 @@ public class TraderLlama extends Llama {
     }
     
     @Override
-    protected void doPlayerRide(final Player ayj) {
-        final Entity akq3 = this.getLeashHolder();
-        if (akq3 instanceof WanderingTrader) {
+    protected void doPlayerRide(final Player bec) {
+        final Entity aom3 = this.getLeashHolder();
+        if (aom3 instanceof WanderingTrader) {
             return;
         }
-        super.doPlayerRide(ayj);
+        super.doPlayerRide(bec);
     }
     
     @Override
@@ -102,15 +102,15 @@ public class TraderLlama extends Llama {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        if (alc == MobSpawnType.EVENT) {
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        if (apb == MobSpawnType.EVENT) {
             this.setAge(0);
         }
-        if (alm == null) {
-            alm = new AgableMobGroupData();
-            ((AgableMobGroupData)alm).setShouldSpawnBaby(false);
+        if (apo == null) {
+            apo = new AgableMobGroupData();
+            ((AgableMobGroupData)apo).setShouldSpawnBaby(false);
         }
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     public class TraderLlamaDefendWanderingTraderGoal extends TargetGoal {
@@ -118,9 +118,9 @@ public class TraderLlama extends Llama {
         private LivingEntity ownerLastHurtBy;
         private int timestamp;
         
-        public TraderLlamaDefendWanderingTraderGoal(final Llama auh) {
-            super(auh, false);
-            this.llama = auh;
+        public TraderLlamaDefendWanderingTraderGoal(final Llama azp) {
+            super(azp, false);
+            this.llama = azp;
             this.setFlags(EnumSet.<Flag>of(Flag.TARGET));
         }
         
@@ -129,22 +129,22 @@ public class TraderLlama extends Llama {
             if (!this.llama.isLeashed()) {
                 return false;
             }
-            final Entity akq2 = this.llama.getLeashHolder();
-            if (!(akq2 instanceof WanderingTrader)) {
+            final Entity aom2 = this.llama.getLeashHolder();
+            if (!(aom2 instanceof WanderingTrader)) {
                 return false;
             }
-            final WanderingTrader ayc3 = (WanderingTrader)akq2;
-            this.ownerLastHurtBy = ayc3.getLastHurtByMob();
-            final int integer4 = ayc3.getLastHurtByMobTimestamp();
+            final WanderingTrader bdv3 = (WanderingTrader)aom2;
+            this.ownerLastHurtBy = bdv3.getLastHurtByMob();
+            final int integer4 = bdv3.getLastHurtByMobTimestamp();
             return integer4 != this.timestamp && this.canAttack(this.ownerLastHurtBy, TargetingConditions.DEFAULT);
         }
         
         @Override
         public void start() {
             this.mob.setTarget(this.ownerLastHurtBy);
-            final Entity akq2 = this.llama.getLeashHolder();
-            if (akq2 instanceof WanderingTrader) {
-                this.timestamp = ((WanderingTrader)akq2).getLastHurtByMobTimestamp();
+            final Entity aom2 = this.llama.getLeashHolder();
+            if (aom2 instanceof WanderingTrader) {
+                this.timestamp = ((WanderingTrader)aom2).getLastHurtByMobTimestamp();
             }
             super.start();
         }
diff --git a/src/net/minecraft/world/entity/animal/horse/Variant.java b/src/net/minecraft/world/entity/animal/horse/Variant.java
new file mode 100644
index 0000000..798bc7c
--- /dev/null
+++ b/src/net/minecraft/world/entity/animal/horse/Variant.java
@@ -0,0 +1,33 @@
+package net.minecraft.world.entity.animal.horse;
+
+import java.util.Comparator;
+import java.util.Arrays;
+
+public enum Variant {
+    WHITE(0), 
+    CREAMY(1), 
+    CHESTNUT(2), 
+    BROWN(3), 
+    BLACK(4), 
+    GRAY(5), 
+    DARKBROWN(6);
+    
+    private static final Variant[] BY_ID;
+    private final int id;
+    
+    private Variant(final int integer3) {
+        this.id = integer3;
+    }
+    
+    public int getId() {
+        return this.id;
+    }
+    
+    public static Variant byId(final int integer) {
+        return Variant.BY_ID[integer % Variant.BY_ID.length];
+    }
+    
+    static {
+        BY_ID = Arrays.<Variant>stream(values()).sorted(Comparator.comparingInt(Variant::getId)).<Variant>toArray(Variant[]::new);
+    }
+}
diff --git a/src/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/net/minecraft/world/entity/animal/horse/ZombieHorse.java
index 26da62f..1245b2f 100644
--- a/src/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+++ b/src/net/minecraft/world/entity/animal/horse/ZombieHorse.java
@@ -3,7 +3,7 @@ package net.minecraft.world.entity.animal.horse;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import javax.annotation.Nullable;
@@ -12,21 +12,23 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.MobType;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class ZombieHorse extends AbstractHorse {
-    public ZombieHorse(final EntityType<? extends ZombieHorse> aku, final Level bjw) {
-        super(aku, bjw);
+    public ZombieHorse(final EntityType<? extends ZombieHorse> aoq, final Level bqb) {
+        super(aoq, bqb);
+    }
+    
+    public static AttributeSupplier.Builder createAttributes() {
+        return AbstractHorse.createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224);
     }
     
     @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(15.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.20000000298023224);
-        this.getAttribute(ZombieHorse.JUMP_STRENGTH).setBaseValue(this.generateRandomJumpStrength());
+    protected void randomizeAttributes() {
+        this.getAttribute(Attributes.JUMP_STRENGTH).setBaseValue(this.generateRandomJumpStrength());
     }
     
     @Override
@@ -47,47 +49,45 @@ public class ZombieHorse extends AbstractHorse {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
-        super.getHurtSound(ajz);
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        super.getHurtSound(anw);
         return SoundEvents.ZOMBIE_HORSE_HURT;
     }
     
     @Nullable
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
+    public AgableMob getBreedOffspring(final AgableMob aok) {
         return EntityType.ZOMBIE_HORSE.create(this.level);
     }
     
     @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() instanceof SpawnEggItem) {
-            return super.mobInteract(ayj, ajk);
-        }
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
         if (!this.isTamed()) {
-            return false;
+            return InteractionResult.PASS;
         }
         if (this.isBaby()) {
-            return super.mobInteract(ayj, ajk);
+            return super.mobInteract(bec, anf);
         }
-        if (ayj.isSecondaryUseActive()) {
-            this.openInventory(ayj);
-            return true;
+        if (bec.isSecondaryUseActive()) {
+            this.openInventory(bec);
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
         if (this.isVehicle()) {
-            return super.mobInteract(ayj, ajk);
+            return super.mobInteract(bec, anf);
         }
-        if (!ben4.isEmpty()) {
-            if (!this.isSaddled() && ben4.getItem() == Items.SADDLE) {
-                this.openInventory(ayj);
-                return true;
+        if (!bki4.isEmpty()) {
+            if (bki4.getItem() == Items.SADDLE && !this.isSaddled()) {
+                this.openInventory(bec);
+                return InteractionResult.sidedSuccess(this.level.isClientSide);
             }
-            if (ben4.interactEnemy(ayj, this, ajk)) {
-                return true;
+            final InteractionResult ang5 = bki4.interactLivingEntity(bec, this, anf);
+            if (ang5.consumesAction()) {
+                return ang5;
             }
         }
-        this.doPlayerRide(ayj);
-        return true;
+        this.doPlayerRide(bec);
+        return InteractionResult.sidedSuccess(this.level.isClientSide);
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/boss/EnderDragonPart.java b/src/net/minecraft/world/entity/boss/EnderDragonPart.java
index 3557ab6..618dbf9 100644
--- a/src/net/minecraft/world/entity/boss/EnderDragonPart.java
+++ b/src/net/minecraft/world/entity/boss/EnderDragonPart.java
@@ -13,11 +13,11 @@ public class EnderDragonPart extends Entity {
     public final String name;
     private final EntityDimensions size;
     
-    public EnderDragonPart(final EnderDragon aus, final String string, final float float3, final float float4) {
-        super(aus.getType(), aus.level);
+    public EnderDragonPart(final EnderDragon bac, final String string, final float float3, final float float4) {
+        super(bac.getType(), bac.level);
         this.size = EntityDimensions.scalable(float3, float4);
         this.refreshDimensions();
-        this.parentMob = aus;
+        this.parentMob = bac;
         this.name = string;
     }
     
@@ -26,11 +26,11 @@ public class EnderDragonPart extends Entity {
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
+    protected void readAdditionalSaveData(final CompoundTag le) {
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
+    protected void addAdditionalSaveData(final CompoundTag le) {
     }
     
     @Override
@@ -39,13 +39,13 @@ public class EnderDragonPart extends Entity {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        return !this.isInvulnerableTo(ajz) && this.parentMob.hurt(this, ajz, float2);
+    public boolean hurt(final DamageSource anw, final float float2) {
+        return !this.isInvulnerableTo(anw) && this.parentMob.hurt(this, anw, float2);
     }
     
     @Override
-    public boolean is(final Entity akq) {
-        return this == akq || this.parentMob == akq;
+    public boolean is(final Entity aom) {
+        return this == aom || this.parentMob == aom;
     }
     
     @Override
@@ -54,7 +54,7 @@ public class EnderDragonPart extends Entity {
     }
     
     @Override
-    public EntityDimensions getDimensions(final Pose alj) {
+    public EntityDimensions getDimensions(final Pose apj) {
         return this.size;
     }
 }
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
index b43ea36..348c3aa 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
@@ -11,8 +11,9 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.dimension.end.TheEndDimension;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.BaseFireBlock;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.core.BlockPos;
@@ -25,14 +26,14 @@ public class EndCrystal extends Entity {
     private static final EntityDataAccessor<Boolean> DATA_SHOW_BOTTOM;
     public int time;
     
-    public EndCrystal(final EntityType<? extends EndCrystal> aku, final Level bjw) {
-        super(aku, bjw);
+    public EndCrystal(final EntityType<? extends EndCrystal> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.blocksBuilding = true;
         this.time = this.random.nextInt(100000);
     }
     
-    public EndCrystal(final Level bjw, final double double2, final double double3, final double double4) {
-        this(EntityType.END_CRYSTAL, bjw);
+    public EndCrystal(final Level bqb, final double double2, final double double3, final double double4) {
+        this(EntityType.END_CRYSTAL, bqb);
         this.setPos(double2, double3, double4);
     }
     
@@ -50,29 +51,29 @@ public class EndCrystal extends Entity {
     @Override
     public void tick() {
         ++this.time;
-        if (!this.level.isClientSide) {
-            final BlockPos fk2 = new BlockPos(this);
-            if (this.level.dimension instanceof TheEndDimension && this.level.getBlockState(fk2).isAir()) {
-                this.level.setBlockAndUpdate(fk2, Blocks.FIRE.defaultBlockState());
+        if (this.level instanceof ServerLevel) {
+            final BlockPos fu2 = this.blockPosition();
+            if (((ServerLevel)this.level).dragonFight() != null && this.level.getBlockState(fu2).isAir()) {
+                this.level.setBlockAndUpdate(fu2, BaseFireBlock.getState(this.level, fu2));
             }
         }
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
+    protected void addAdditionalSaveData(final CompoundTag le) {
         if (this.getBeamTarget() != null) {
-            jt.put("BeamTarget", NbtUtils.writeBlockPos(this.getBeamTarget()));
+            le.put("BeamTarget", NbtUtils.writeBlockPos(this.getBeamTarget()));
         }
-        jt.putBoolean("ShowBottom", this.showsBottom());
+        le.putBoolean("ShowBottom", this.showsBottom());
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        if (jt.contains("BeamTarget", 10)) {
-            this.setBeamTarget(NbtUtils.readBlockPos(jt.getCompound("BeamTarget")));
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        if (le.contains("BeamTarget", 10)) {
+            this.setBeamTarget(NbtUtils.readBlockPos(le.getCompound("BeamTarget")));
         }
-        if (jt.contains("ShowBottom", 1)) {
-            this.setShowBottom(jt.getBoolean("ShowBottom"));
+        if (le.contains("ShowBottom", 1)) {
+            this.setShowBottom(le.getBoolean("ShowBottom"));
         }
     }
     
@@ -82,19 +83,19 @@ public class EndCrystal extends Entity {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        if (ajz.getEntity() instanceof EnderDragon) {
+        if (anw.getEntity() instanceof EnderDragon) {
             return false;
         }
         if (!this.removed && !this.level.isClientSide) {
             this.remove();
-            if (!ajz.isExplosion()) {
+            if (!anw.isExplosion()) {
                 this.level.explode(null, this.getX(), this.getY(), this.getZ(), 6.0f, Explosion.BlockInteraction.DESTROY);
             }
-            this.onDestroyedBy(ajz);
+            this.onDestroyedBy(anw);
         }
         return true;
     }
@@ -105,18 +106,17 @@ public class EndCrystal extends Entity {
         super.kill();
     }
     
-    private void onDestroyedBy(final DamageSource ajz) {
-        if (this.level.dimension instanceof TheEndDimension) {
-            final TheEndDimension cbn3 = (TheEndDimension)this.level.dimension;
-            final EndDragonFight cbm4 = cbn3.getDragonFight();
-            if (cbm4 != null) {
-                cbm4.onCrystalDestroyed(this, ajz);
+    private void onDestroyedBy(final DamageSource anw) {
+        if (this.level instanceof ServerLevel) {
+            final EndDragonFight cii3 = ((ServerLevel)this.level).dragonFight();
+            if (cii3 != null) {
+                cii3.onCrystalDestroyed(this, anw);
             }
         }
     }
     
-    public void setBeamTarget(@Nullable final BlockPos fk) {
-        this.getEntityData().<Optional<BlockPos>>set(EndCrystal.DATA_BEAM_TARGET, Optional.<BlockPos>ofNullable(fk));
+    public void setBeamTarget(@Nullable final BlockPos fu) {
+        this.getEntityData().<Optional<BlockPos>>set(EndCrystal.DATA_BEAM_TARGET, Optional.<BlockPos>ofNullable(fu));
     }
     
     @Nullable
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index e83796e..8c51ad0 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -37,8 +37,9 @@ import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
-import net.minecraft.world.level.dimension.end.TheEndDimension;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.pathfinder.BinaryHeap;
@@ -84,8 +85,8 @@ public class EnderDragon extends Mob implements Enemy {
     private final int[] nodeAdjacency;
     private final BinaryHeap openSet;
     
-    public EnderDragon(final EntityType<? extends EnderDragon> aku, final Level bjw) {
-        super(EntityType.ENDER_DRAGON, bjw);
+    public EnderDragon(final EntityType<? extends EnderDragon> aoq, final Level bqb) {
+        super(EntityType.ENDER_DRAGON, bqb);
         this.positions = new double[64][3];
         this.posPointer = -1;
         this.growlTime = 100;
@@ -104,8 +105,8 @@ public class EnderDragon extends Mob implements Enemy {
         this.setHealth(this.getMaxHealth());
         this.noPhysics = true;
         this.noCulling = true;
-        if (!bjw.isClientSide && bjw.dimension instanceof TheEndDimension) {
-            this.dragonFight = ((TheEndDimension)bjw.dimension).getDragonFight();
+        if (bqb instanceof ServerLevel) {
+            this.dragonFight = ((ServerLevel)bqb).dragonFight();
         }
         else {
             this.dragonFight = null;
@@ -113,10 +114,8 @@ public class EnderDragon extends Mob implements Enemy {
         this.phaseManager = new EnderDragonPhaseManager(this);
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(200.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0);
     }
     
     @Override
@@ -126,7 +125,7 @@ public class EnderDragon extends Mob implements Enemy {
     }
     
     public double[] getLatencyPos(final int integer, float float2) {
-        if (this.getHealth() <= 0.0f) {
+        if (this.isDeadOrDying()) {
             float2 = 0.0f;
         }
         float2 = 1.0f - float2;
@@ -160,7 +159,7 @@ public class EnderDragon extends Mob implements Enemy {
             }
         }
         this.oFlapTime = this.flapTime;
-        if (this.getHealth() <= 0.0f) {
+        if (this.isDeadOrDying()) {
             final float float2 = (this.random.nextFloat() - 0.5f) * 8.0f;
             final float float3 = (this.random.nextFloat() - 0.5f) * 4.0f;
             final float float4 = (this.random.nextFloat() - 0.5f) * 8.0f;
@@ -168,9 +167,9 @@ public class EnderDragon extends Mob implements Enemy {
             return;
         }
         this.checkCrystals();
-        final Vec3 cvl2 = this.getDeltaMovement();
-        float float3 = 0.2f / (Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl2)) * 10.0f + 1.0f);
-        float3 *= (float)Math.pow(2.0, cvl2.y);
+        final Vec3 dem2 = this.getDeltaMovement();
+        float float3 = 0.2f / (Mth.sqrt(Entity.getHorizontalDistanceSqr(dem2)) * 10.0f + 1.0f);
+        float3 *= (float)Math.pow(2.0, dem2.y);
         if (this.phaseManager.getCurrentPhase().isSitting()) {
             this.flapTime += 0.1f;
         }
@@ -211,19 +210,19 @@ public class EnderDragon extends Mob implements Enemy {
             this.phaseManager.getCurrentPhase().doClientTick();
         }
         else {
-            DragonPhaseInstance avd4 = this.phaseManager.getCurrentPhase();
-            avd4.doServerTick();
-            if (this.phaseManager.getCurrentPhase() != avd4) {
-                avd4 = this.phaseManager.getCurrentPhase();
-                avd4.doServerTick();
+            DragonPhaseInstance bam4 = this.phaseManager.getCurrentPhase();
+            bam4.doServerTick();
+            if (this.phaseManager.getCurrentPhase() != bam4) {
+                bam4 = this.phaseManager.getCurrentPhase();
+                bam4.doServerTick();
             }
-            final Vec3 cvl3 = avd4.getFlyTargetLocation();
-            if (cvl3 != null) {
-                final double double5 = cvl3.x - this.getX();
-                double double6 = cvl3.y - this.getY();
-                final double double7 = cvl3.z - this.getZ();
+            final Vec3 dem3 = bam4.getFlyTargetLocation();
+            if (dem3 != null) {
+                final double double5 = dem3.x - this.getX();
+                double double6 = dem3.y - this.getY();
+                final double double7 = dem3.z - this.getZ();
                 final double double8 = double5 * double5 + double6 * double6 + double7 * double7;
-                final float float5 = avd4.getFlySpeed();
+                final float float5 = bam4.getFlySpeed();
                 final double double9 = Mth.sqrt(double5 * double5 + double7 * double7);
                 if (double9 > 0.0) {
                     double6 = Mth.clamp(double6 / double9, -float5, float5);
@@ -231,11 +230,11 @@ public class EnderDragon extends Mob implements Enemy {
                 this.setDeltaMovement(this.getDeltaMovement().add(0.0, double6 * 0.01, 0.0));
                 this.yRot = Mth.wrapDegrees(this.yRot);
                 final double double10 = Mth.clamp(Mth.wrapDegrees(180.0 - Mth.atan2(double5, double7) * 57.2957763671875 - this.yRot), -50.0, 50.0);
-                final Vec3 cvl4 = cvl3.subtract(this.getX(), this.getY(), this.getZ()).normalize();
-                final Vec3 cvl5 = new Vec3(Mth.sin(this.yRot * 0.017453292f), this.getDeltaMovement().y, -Mth.cos(this.yRot * 0.017453292f)).normalize();
-                final float float6 = Math.max(((float)cvl5.dot(cvl4) + 0.5f) / 1.5f, 0.0f);
+                final Vec3 dem4 = dem3.subtract(this.getX(), this.getY(), this.getZ()).normalize();
+                final Vec3 dem5 = new Vec3(Mth.sin(this.yRot * 0.017453292f), this.getDeltaMovement().y, -Mth.cos(this.yRot * 0.017453292f)).normalize();
+                final float float6 = Math.max(((float)dem5.dot(dem4) + 0.5f) / 1.5f, 0.0f);
                 this.yRotA *= 0.8f;
-                this.yRotA += (float)(double10 * avd4.getTurnSpeed());
+                this.yRotA += (float)(double10 * bam4.getTurnSpeed());
                 this.yRot += this.yRotA * 0.1f;
                 final float float7 = (float)(2.0 / (double8 + 1.0));
                 final float float8 = 0.06f;
@@ -246,8 +245,8 @@ public class EnderDragon extends Mob implements Enemy {
                 else {
                     this.move(MoverType.SELF, this.getDeltaMovement());
                 }
-                final Vec3 cvl6 = this.getDeltaMovement().normalize();
-                final double double11 = 0.8 + 0.15 * (cvl6.dot(cvl5) + 1.0) / 2.0;
+                final Vec3 dem6 = this.getDeltaMovement().normalize();
+                final double double11 = 0.8 + 0.15 * (dem6.dot(dem5) + 1.0) / 2.0;
                 this.setDeltaMovement(this.getDeltaMovement().multiply(double11, 0.9100000262260437, double11));
             }
         }
@@ -278,15 +277,15 @@ public class EnderDragon extends Mob implements Enemy {
         this.tickPart(this.neck, float15 * 5.5f * float10, float17 + float11 * 5.5f, -float16 * 5.5f * float10);
         final double[] arr5 = this.getLatencyPos(5, 1.0f);
         for (int integer6 = 0; integer6 < 3; ++integer6) {
-            EnderDragonPart auq16 = null;
+            EnderDragonPart baa16 = null;
             if (integer6 == 0) {
-                auq16 = this.tail1;
+                baa16 = this.tail1;
             }
             if (integer6 == 1) {
-                auq16 = this.tail2;
+                baa16 = this.tail2;
             }
             if (integer6 == 2) {
-                auq16 = this.tail3;
+                baa16 = this.tail3;
             }
             final double[] arr6 = this.getLatencyPos(12 + integer6 * 2, 1.0f);
             final float float18 = this.yRot * 0.017453292f + this.rotWrap(arr6[0] - arr5[0]) * 0.017453292f;
@@ -294,7 +293,7 @@ public class EnderDragon extends Mob implements Enemy {
             final float float20 = Mth.cos(float18);
             final float float6 = 1.5f;
             final float float7 = (integer6 + 1) * 2.0f;
-            this.tickPart(auq16, -(float13 * 1.5f + float19 * float7) * float10, arr6[1] - arr5[1] - (float7 + 1.5f) * float11 + 1.5, (float14 * 1.5f + float20 * float7) * float10);
+            this.tickPart(baa16, -(float13 * 1.5f + float19 * float7) * float10, arr6[1] - arr5[1] - (float7 + 1.5f) * float11 + 1.5, (float14 * 1.5f + float20 * float7) * float10);
         }
         if (!this.level.isClientSide) {
             this.inWall = (this.checkWalls(this.head.getBoundingBox()) | this.checkWalls(this.neck.getBoundingBox()) | this.checkWalls(this.body.getBoundingBox()));
@@ -312,8 +311,8 @@ public class EnderDragon extends Mob implements Enemy {
         }
     }
     
-    private void tickPart(final EnderDragonPart auq, final double double2, final double double3, final double double4) {
-        auq.setPos(this.getX() + double2, this.getY() + double3, this.getZ() + double4);
+    private void tickPart(final EnderDragonPart baa, final double double2, final double double3, final double double4) {
+        baa.setPos(this.getX() + double2, this.getY() + double3, this.getZ() + double4);
     }
     
     private float getHeadYOffset() {
@@ -336,42 +335,42 @@ public class EnderDragon extends Mob implements Enemy {
         }
         if (this.random.nextInt(10) == 0) {
             final List<EndCrystal> list2 = this.level.<EndCrystal>getEntitiesOfClass(EndCrystal.class, this.getBoundingBox().inflate(32.0));
-            EndCrystal aur3 = null;
+            EndCrystal bab3 = null;
             double double4 = Double.MAX_VALUE;
-            for (final EndCrystal aur4 : list2) {
-                final double double5 = aur4.distanceToSqr(this);
+            for (final EndCrystal bab4 : list2) {
+                final double double5 = bab4.distanceToSqr(this);
                 if (double5 < double4) {
                     double4 = double5;
-                    aur3 = aur4;
+                    bab3 = bab4;
                 }
             }
-            this.nearestCrystal = aur3;
+            this.nearestCrystal = bab3;
         }
     }
     
     private void knockBack(final List<Entity> list) {
         final double double3 = (this.body.getBoundingBox().minX + this.body.getBoundingBox().maxX) / 2.0;
         final double double4 = (this.body.getBoundingBox().minZ + this.body.getBoundingBox().maxZ) / 2.0;
-        for (final Entity akq8 : list) {
-            if (akq8 instanceof LivingEntity) {
-                final double double5 = akq8.getX() - double3;
-                final double double6 = akq8.getZ() - double4;
+        for (final Entity aom8 : list) {
+            if (aom8 instanceof LivingEntity) {
+                final double double5 = aom8.getX() - double3;
+                final double double6 = aom8.getZ() - double4;
                 final double double7 = double5 * double5 + double6 * double6;
-                akq8.push(double5 / double7 * 4.0, 0.20000000298023224, double6 / double7 * 4.0);
-                if (this.phaseManager.getCurrentPhase().isSitting() || ((LivingEntity)akq8).getLastHurtByMobTimestamp() >= akq8.tickCount - 2) {
+                aom8.push(double5 / double7 * 4.0, 0.20000000298023224, double6 / double7 * 4.0);
+                if (this.phaseManager.getCurrentPhase().isSitting() || ((LivingEntity)aom8).getLastHurtByMobTimestamp() >= aom8.tickCount - 2) {
                     continue;
                 }
-                akq8.hurt(DamageSource.mobAttack(this), 5.0f);
-                this.doEnchantDamageEffects(this, akq8);
+                aom8.hurt(DamageSource.mobAttack(this), 5.0f);
+                this.doEnchantDamageEffects(this, aom8);
             }
         }
     }
     
     private void hurt(final List<Entity> list) {
-        for (final Entity akq4 : list) {
-            if (akq4 instanceof LivingEntity) {
-                akq4.hurt(DamageSource.mobAttack(this), 10.0f);
-                this.doEnchantDamageEffects(this, akq4);
+        for (final Entity aom4 : list) {
+            if (aom4 instanceof LivingEntity) {
+                aom4.hurt(DamageSource.mobAttack(this), 10.0f);
+                this.doEnchantDamageEffects(this, aom4);
             }
         }
     }
@@ -380,28 +379,28 @@ public class EnderDragon extends Mob implements Enemy {
         return (float)Mth.wrapDegrees(double1);
     }
     
-    private boolean checkWalls(final AABB cvf) {
-        final int integer3 = Mth.floor(cvf.minX);
-        final int integer4 = Mth.floor(cvf.minY);
-        final int integer5 = Mth.floor(cvf.minZ);
-        final int integer6 = Mth.floor(cvf.maxX);
-        final int integer7 = Mth.floor(cvf.maxY);
-        final int integer8 = Mth.floor(cvf.maxZ);
+    private boolean checkWalls(final AABB deg) {
+        final int integer3 = Mth.floor(deg.minX);
+        final int integer4 = Mth.floor(deg.minY);
+        final int integer5 = Mth.floor(deg.minZ);
+        final int integer6 = Mth.floor(deg.maxX);
+        final int integer7 = Mth.floor(deg.maxY);
+        final int integer8 = Mth.floor(deg.maxZ);
         boolean boolean9 = false;
         boolean boolean10 = false;
         for (int integer9 = integer3; integer9 <= integer6; ++integer9) {
             for (int integer10 = integer4; integer10 <= integer7; ++integer10) {
                 for (int integer11 = integer5; integer11 <= integer8; ++integer11) {
-                    final BlockPos fk14 = new BlockPos(integer9, integer10, integer11);
-                    final BlockState byj15 = this.level.getBlockState(fk14);
-                    final Block bph16 = byj15.getBlock();
-                    if (!byj15.isAir()) {
-                        if (byj15.getMaterial() != Material.FIRE) {
-                            if (!this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) || BlockTags.DRAGON_IMMUNE.contains(bph16)) {
+                    final BlockPos fu14 = new BlockPos(integer9, integer10, integer11);
+                    final BlockState cfj15 = this.level.getBlockState(fu14);
+                    final Block bvr16 = cfj15.getBlock();
+                    if (!cfj15.isAir()) {
+                        if (cfj15.getMaterial() != Material.FIRE) {
+                            if (!this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) || BlockTags.DRAGON_IMMUNE.contains(bvr16)) {
                                 boolean9 = true;
                             }
                             else {
-                                boolean10 = (this.level.removeBlock(fk14, false) || boolean10);
+                                boolean10 = (this.level.removeBlock(fu14, false) || boolean10);
                             }
                         }
                     }
@@ -409,27 +408,27 @@ public class EnderDragon extends Mob implements Enemy {
             }
         }
         if (boolean10) {
-            final BlockPos fk15 = new BlockPos(integer3 + this.random.nextInt(integer6 - integer3 + 1), integer4 + this.random.nextInt(integer7 - integer4 + 1), integer5 + this.random.nextInt(integer8 - integer5 + 1));
-            this.level.levelEvent(2008, fk15, 0);
+            final BlockPos fu15 = new BlockPos(integer3 + this.random.nextInt(integer6 - integer3 + 1), integer4 + this.random.nextInt(integer7 - integer4 + 1), integer5 + this.random.nextInt(integer8 - integer5 + 1));
+            this.level.levelEvent(2008, fu15, 0);
         }
         return boolean9;
     }
     
-    public boolean hurt(final EnderDragonPart auq, final DamageSource ajz, float float3) {
+    public boolean hurt(final EnderDragonPart baa, final DamageSource anw, float float3) {
         if (this.phaseManager.getCurrentPhase().getPhase() == EnderDragonPhase.DYING) {
             return false;
         }
-        float3 = this.phaseManager.getCurrentPhase().onHurt(ajz, float3);
-        if (auq != this.head) {
+        float3 = this.phaseManager.getCurrentPhase().onHurt(anw, float3);
+        if (baa != this.head) {
             float3 = float3 / 4.0f + Math.min(float3, 1.0f);
         }
         if (float3 < 0.01f) {
             return false;
         }
-        if (ajz.getEntity() instanceof Player || ajz.isExplosion()) {
+        if (anw.getEntity() instanceof Player || anw.isExplosion()) {
             final float float4 = this.getHealth();
-            this.reallyHurt(ajz, float3);
-            if (this.getHealth() <= 0.0f && !this.phaseManager.getCurrentPhase().isSitting()) {
+            this.reallyHurt(anw, float3);
+            if (this.isDeadOrDying() && !this.phaseManager.getCurrentPhase().isSitting()) {
                 this.setHealth(1.0f);
                 this.phaseManager.setPhase(EnderDragonPhase.DYING);
             }
@@ -445,15 +444,15 @@ public class EnderDragon extends Mob implements Enemy {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (ajz instanceof EntityDamageSource && ((EntityDamageSource)ajz).isThorns()) {
-            this.hurt(this.body, ajz, float2);
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (anw instanceof EntityDamageSource && ((EntityDamageSource)anw).isThorns()) {
+            this.hurt(this.body, anw, float2);
         }
         return false;
     }
     
-    protected boolean reallyHurt(final DamageSource ajz, final float float2) {
-        return super.hurt(ajz, float2);
+    protected boolean reallyHurt(final DamageSource anw, final float float2) {
+        return super.hurt(anw, float2);
     }
     
     @Override
@@ -486,8 +485,8 @@ public class EnderDragon extends Mob implements Enemy {
             if (this.dragonDeathTime > 150 && this.dragonDeathTime % 5 == 0 && boolean2) {
                 this.dropExperience(Mth.floor(integer3 * 0.08f));
             }
-            if (this.dragonDeathTime == 1) {
-                this.level.globalLevelEvent(1028, new BlockPos(this), 0);
+            if (this.dragonDeathTime == 1 && !this.isSilent()) {
+                this.level.globalLevelEvent(1028, this.blockPosition(), 0);
             }
         }
         this.move(MoverType.SELF, new Vec3(0.0, 0.10000000149011612, 0.0));
@@ -568,14 +567,14 @@ public class EnderDragon extends Mob implements Enemy {
     public int findClosestNode(final double double1, final double double2, final double double3) {
         float float8 = 10000.0f;
         int integer9 = 0;
-        final Node cqo10 = new Node(Mth.floor(double1), Mth.floor(double2), Mth.floor(double3));
+        final Node czd10 = new Node(Mth.floor(double1), Mth.floor(double2), Mth.floor(double3));
         int integer10 = 0;
         if (this.dragonFight == null || this.dragonFight.getCrystalsAlive() == 0) {
             integer10 = 12;
         }
         for (int integer11 = integer10; integer11 < 24; ++integer11) {
             if (this.nodes[integer11] != null) {
-                final float float9 = this.nodes[integer11].distanceToSqr(cqo10);
+                final float float9 = this.nodes[integer11].distanceToSqr(czd10);
                 if (float9 < float8) {
                     float8 = float9;
                     integer9 = integer11;
@@ -586,102 +585,102 @@ public class EnderDragon extends Mob implements Enemy {
     }
     
     @Nullable
-    public Path findPath(final int integer1, final int integer2, @Nullable final Node cqo) {
+    public Path findPath(final int integer1, final int integer2, @Nullable final Node czd) {
         for (int integer3 = 0; integer3 < 24; ++integer3) {
-            final Node cqo2 = this.nodes[integer3];
-            cqo2.closed = false;
-            cqo2.f = 0.0f;
-            cqo2.g = 0.0f;
-            cqo2.h = 0.0f;
-            cqo2.cameFrom = null;
-            cqo2.heapIdx = -1;
+            final Node czd2 = this.nodes[integer3];
+            czd2.closed = false;
+            czd2.f = 0.0f;
+            czd2.g = 0.0f;
+            czd2.h = 0.0f;
+            czd2.cameFrom = null;
+            czd2.heapIdx = -1;
         }
-        final Node cqo3 = this.nodes[integer1];
-        Node cqo2 = this.nodes[integer2];
-        cqo3.g = 0.0f;
-        cqo3.h = cqo3.distanceTo(cqo2);
-        cqo3.f = cqo3.h;
+        final Node czd3 = this.nodes[integer1];
+        Node czd2 = this.nodes[integer2];
+        czd3.g = 0.0f;
+        czd3.h = czd3.distanceTo(czd2);
+        czd3.f = czd3.h;
         this.openSet.clear();
-        this.openSet.insert(cqo3);
-        Node cqo4 = cqo3;
+        this.openSet.insert(czd3);
+        Node czd4 = czd3;
         int integer4 = 0;
         if (this.dragonFight == null || this.dragonFight.getCrystalsAlive() == 0) {
             integer4 = 12;
         }
         while (!this.openSet.isEmpty()) {
-            final Node cqo5 = this.openSet.pop();
-            if (cqo5.equals(cqo2)) {
-                if (cqo != null) {
-                    cqo.cameFrom = cqo2;
-                    cqo2 = cqo;
+            final Node czd5 = this.openSet.pop();
+            if (czd5.equals(czd2)) {
+                if (czd != null) {
+                    czd.cameFrom = czd2;
+                    czd2 = czd;
                 }
-                return this.reconstructPath(cqo3, cqo2);
+                return this.reconstructPath(czd3, czd2);
             }
-            if (cqo5.distanceTo(cqo2) < cqo4.distanceTo(cqo2)) {
-                cqo4 = cqo5;
+            if (czd5.distanceTo(czd2) < czd4.distanceTo(czd2)) {
+                czd4 = czd5;
             }
-            cqo5.closed = true;
+            czd5.closed = true;
             int integer5 = 0;
             for (int integer6 = 0; integer6 < 24; ++integer6) {
-                if (this.nodes[integer6] == cqo5) {
+                if (this.nodes[integer6] == czd5) {
                     integer5 = integer6;
                     break;
                 }
             }
             for (int integer6 = integer4; integer6 < 24; ++integer6) {
                 if ((this.nodeAdjacency[integer5] & 1 << integer6) > 0) {
-                    final Node cqo6 = this.nodes[integer6];
-                    if (!cqo6.closed) {
-                        final float float13 = cqo5.g + cqo5.distanceTo(cqo6);
-                        if (!cqo6.inOpenSet() || float13 < cqo6.g) {
-                            cqo6.cameFrom = cqo5;
-                            cqo6.g = float13;
-                            cqo6.h = cqo6.distanceTo(cqo2);
-                            if (cqo6.inOpenSet()) {
-                                this.openSet.changeCost(cqo6, cqo6.g + cqo6.h);
+                    final Node czd6 = this.nodes[integer6];
+                    if (!czd6.closed) {
+                        final float float13 = czd5.g + czd5.distanceTo(czd6);
+                        if (!czd6.inOpenSet() || float13 < czd6.g) {
+                            czd6.cameFrom = czd5;
+                            czd6.g = float13;
+                            czd6.h = czd6.distanceTo(czd2);
+                            if (czd6.inOpenSet()) {
+                                this.openSet.changeCost(czd6, czd6.g + czd6.h);
                             }
                             else {
-                                cqo6.f = cqo6.g + cqo6.h;
-                                this.openSet.insert(cqo6);
+                                czd6.f = czd6.g + czd6.h;
+                                this.openSet.insert(czd6);
                             }
                         }
                     }
                 }
             }
         }
-        if (cqo4 == cqo3) {
+        if (czd4 == czd3) {
             return null;
         }
         EnderDragon.LOGGER.debug("Failed to find path from {} to {}", integer1, integer2);
-        if (cqo != null) {
-            cqo.cameFrom = cqo4;
-            cqo4 = cqo;
+        if (czd != null) {
+            czd.cameFrom = czd4;
+            czd4 = czd;
         }
-        return this.reconstructPath(cqo3, cqo4);
+        return this.reconstructPath(czd3, czd4);
     }
     
-    private Path reconstructPath(final Node cqo1, final Node cqo2) {
+    private Path reconstructPath(final Node czd1, final Node czd2) {
         final List<Node> list4 = Lists.newArrayList();
-        Node cqo3 = cqo2;
-        list4.add(0, cqo3);
-        while (cqo3.cameFrom != null) {
-            cqo3 = cqo3.cameFrom;
-            list4.add(0, cqo3);
+        Node czd3 = czd2;
+        list4.add(0, czd3);
+        while (czd3.cameFrom != null) {
+            czd3 = czd3.cameFrom;
+            list4.add(0, czd3);
         }
-        return new Path(list4, new BlockPos(cqo2.x, cqo2.y, cqo2.z), true);
+        return new Path(list4, new BlockPos(czd2.x, czd2.y, czd2.z), true);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("DragonPhase", this.phaseManager.getCurrentPhase().getPhase().getId());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("DragonPhase", this.phaseManager.getCurrentPhase().getPhase().getId());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("DragonPhase")) {
-            this.phaseManager.setPhase(EnderDragonPhase.getById(jt.getInt("DragonPhase")));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("DragonPhase")) {
+            this.phaseManager.setPhase(EnderDragonPhase.getById(le.getInt("DragonPhase")));
         }
     }
     
@@ -709,7 +708,7 @@ public class EnderDragon extends Mob implements Enemy {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.ENDER_DRAGON_HURT;
     }
     
@@ -719,15 +718,15 @@ public class EnderDragon extends Mob implements Enemy {
     }
     
     public float getHeadPartYOffset(final int integer, final double[] arr2, final double[] arr3) {
-        final DragonPhaseInstance avd5 = this.phaseManager.getCurrentPhase();
-        final EnderDragonPhase<? extends DragonPhaseInstance> avj6 = avd5.getPhase();
+        final DragonPhaseInstance bam5 = this.phaseManager.getCurrentPhase();
+        final EnderDragonPhase<? extends DragonPhaseInstance> bas6 = bam5.getPhase();
         double double7;
-        if (avj6 == EnderDragonPhase.LANDING || avj6 == EnderDragonPhase.TAKEOFF) {
-            final BlockPos fk9 = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
-            final float float10 = Math.max(Mth.sqrt(fk9.distSqr(this.position(), true)) / 4.0f, 1.0f);
+        if (bas6 == EnderDragonPhase.LANDING || bas6 == EnderDragonPhase.TAKEOFF) {
+            final BlockPos fu9 = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
+            final float float10 = Math.max(Mth.sqrt(fu9.distSqr(this.position(), true)) / 4.0f, 1.0f);
             double7 = integer / float10;
         }
-        else if (avd5.isSitting()) {
+        else if (bam5.isSitting()) {
             double7 = integer;
         }
         else if (integer == 6) {
@@ -740,52 +739,52 @@ public class EnderDragon extends Mob implements Enemy {
     }
     
     public Vec3 getHeadLookVector(final float float1) {
-        final DragonPhaseInstance avd3 = this.phaseManager.getCurrentPhase();
-        final EnderDragonPhase<? extends DragonPhaseInstance> avj4 = avd3.getPhase();
-        Vec3 cvl5;
-        if (avj4 == EnderDragonPhase.LANDING || avj4 == EnderDragonPhase.TAKEOFF) {
-            final BlockPos fk6 = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
-            final float float2 = Math.max(Mth.sqrt(fk6.distSqr(this.position(), true)) / 4.0f, 1.0f);
+        final DragonPhaseInstance bam3 = this.phaseManager.getCurrentPhase();
+        final EnderDragonPhase<? extends DragonPhaseInstance> bas4 = bam3.getPhase();
+        Vec3 dem5;
+        if (bas4 == EnderDragonPhase.LANDING || bas4 == EnderDragonPhase.TAKEOFF) {
+            final BlockPos fu6 = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
+            final float float2 = Math.max(Mth.sqrt(fu6.distSqr(this.position(), true)) / 4.0f, 1.0f);
             final float float3 = 6.0f / float2;
             final float float4 = this.xRot;
             final float float5 = 1.5f;
             this.xRot = -float3 * 1.5f * 5.0f;
-            cvl5 = this.getViewVector(float1);
+            dem5 = this.getViewVector(float1);
             this.xRot = float4;
         }
-        else if (avd3.isSitting()) {
+        else if (bam3.isSitting()) {
             final float float6 = this.xRot;
             final float float2 = 1.5f;
             this.xRot = -45.0f;
-            cvl5 = this.getViewVector(float1);
+            dem5 = this.getViewVector(float1);
             this.xRot = float6;
         }
         else {
-            cvl5 = this.getViewVector(float1);
+            dem5 = this.getViewVector(float1);
         }
-        return cvl5;
+        return dem5;
     }
     
-    public void onCrystalDestroyed(final EndCrystal aur, final BlockPos fk, final DamageSource ajz) {
-        Player ayj5;
-        if (ajz.getEntity() instanceof Player) {
-            ayj5 = (Player)ajz.getEntity();
+    public void onCrystalDestroyed(final EndCrystal bab, final BlockPos fu, final DamageSource anw) {
+        Player bec5;
+        if (anw.getEntity() instanceof Player) {
+            bec5 = (Player)anw.getEntity();
         }
         else {
-            ayj5 = this.level.getNearestPlayer(EnderDragon.CRYSTAL_DESTROY_TARGETING, fk.getX(), fk.getY(), fk.getZ());
+            bec5 = this.level.getNearestPlayer(EnderDragon.CRYSTAL_DESTROY_TARGETING, fu.getX(), fu.getY(), fu.getZ());
         }
-        if (aur == this.nearestCrystal) {
-            this.hurt(this.head, DamageSource.explosion(ayj5), 10.0f);
+        if (bab == this.nearestCrystal) {
+            this.hurt(this.head, DamageSource.explosion(bec5), 10.0f);
         }
-        this.phaseManager.getCurrentPhase().onCrystalDestroyed(aur, fk, ajz, ayj5);
+        this.phaseManager.getCurrentPhase().onCrystalDestroyed(bab, fu, anw, bec5);
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (EnderDragon.DATA_PHASE.equals(sb) && this.level.isClientSide) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (EnderDragon.DATA_PHASE.equals(tq) && this.level.isClientSide) {
             this.phaseManager.setPhase(EnderDragonPhase.getById(this.getEntityData().<Integer>get(EnderDragon.DATA_PHASE)));
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     public EnderDragonPhaseManager getPhaseManager() {
@@ -798,12 +797,12 @@ public class EnderDragon extends Mob implements Enemy {
     }
     
     @Override
-    public boolean addEffect(final MobEffectInstance akk) {
+    public boolean addEffect(final MobEffectInstance aog) {
         return false;
     }
     
     @Override
-    protected boolean canRide(final Entity akq) {
+    protected boolean canRide(final Entity aom) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonPhaseInstance.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonPhaseInstance.java
index 1f6253d..1a2db75 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonPhaseInstance.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonPhaseInstance.java
@@ -13,8 +13,8 @@ import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
 public abstract class AbstractDragonPhaseInstance implements DragonPhaseInstance {
     protected final EnderDragon dragon;
     
-    public AbstractDragonPhaseInstance(final EnderDragon aus) {
-        this.dragon = aus;
+    public AbstractDragonPhaseInstance(final EnderDragon bac) {
+        this.dragon = bac;
     }
     
     @Override
@@ -31,7 +31,7 @@ public abstract class AbstractDragonPhaseInstance implements DragonPhaseInstance
     }
     
     @Override
-    public void onCrystalDestroyed(final EndCrystal aur, final BlockPos fk, final DamageSource ajz, @Nullable final Player ayj) {
+    public void onCrystalDestroyed(final EndCrystal bab, final BlockPos fu, final DamageSource anw, @Nullable final Player bec) {
     }
     
     @Override
@@ -54,7 +54,7 @@ public abstract class AbstractDragonPhaseInstance implements DragonPhaseInstance
     }
     
     @Override
-    public float onHurt(final DamageSource ajz, final float float2) {
+    public float onHurt(final DamageSource anw, final float float2) {
         return float2;
     }
     
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonSittingPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonSittingPhase.java
index 3e9e992..2e29aff 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonSittingPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonSittingPhase.java
@@ -5,8 +5,8 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
 
 public abstract class AbstractDragonSittingPhase extends AbstractDragonPhaseInstance {
-    public AbstractDragonSittingPhase(final EnderDragon aus) {
-        super(aus);
+    public AbstractDragonSittingPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
@@ -15,11 +15,11 @@ public abstract class AbstractDragonSittingPhase extends AbstractDragonPhaseInst
     }
     
     @Override
-    public float onHurt(final DamageSource ajz, final float float2) {
-        if (ajz.getDirectEntity() instanceof AbstractArrow) {
-            ajz.getDirectEntity().setSecondsOnFire(1);
+    public float onHurt(final DamageSource anw, final float float2) {
+        if (anw.getDirectEntity() instanceof AbstractArrow) {
+            anw.getDirectEntity().setSecondsOnFire(1);
             return 0.0f;
         }
-        return super.onHurt(ajz, float2);
+        return super.onHurt(anw, float2);
     }
 }
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.java
index 4b3f7bb..8181ff0 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.java
@@ -11,8 +11,8 @@ public class DragonChargePlayerPhase extends AbstractDragonPhaseInstance {
     private Vec3 targetLocation;
     private int timeSinceCharge;
     
-    public DragonChargePlayerPhase(final EnderDragon aus) {
-        super(aus);
+    public DragonChargePlayerPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
@@ -38,8 +38,8 @@ public class DragonChargePlayerPhase extends AbstractDragonPhaseInstance {
         this.timeSinceCharge = 0;
     }
     
-    public void setTarget(final Vec3 cvl) {
-        this.targetLocation = cvl;
+    public void setTarget(final Vec3 dem) {
+        this.targetLocation = dem;
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java
index 359d9a2..a4a0f56 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java
@@ -2,6 +2,7 @@ package net.minecraft.world.entity.boss.enderdragon.phases;
 
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.levelgen.feature.EndPodiumFeature;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.core.particles.ParticleOptions;
@@ -13,8 +14,8 @@ public class DragonDeathPhase extends AbstractDragonPhaseInstance {
     private Vec3 targetLocation;
     private int time;
     
-    public DragonDeathPhase(final EnderDragon aus) {
-        super(aus);
+    public DragonDeathPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
@@ -31,8 +32,8 @@ public class DragonDeathPhase extends AbstractDragonPhaseInstance {
     public void doServerTick() {
         ++this.time;
         if (this.targetLocation == null) {
-            final BlockPos fk2 = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.END_PODIUM_LOCATION);
-            this.targetLocation = new Vec3(fk2.getX(), fk2.getY(), fk2.getZ());
+            final BlockPos fu2 = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.END_PODIUM_LOCATION);
+            this.targetLocation = Vec3.atBottomCenterOf(fu2);
         }
         final double double2 = this.targetLocation.distanceToSqr(this.dragon.getX(), this.dragon.getY(), this.dragon.getZ());
         if (double2 < 100.0 || double2 > 22500.0 || this.dragon.horizontalCollision || this.dragon.verticalCollision) {
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java
index b94df5d..0c7dbab 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java
@@ -23,8 +23,8 @@ public class DragonHoldingPatternPhase extends AbstractDragonPhaseInstance {
     private Vec3 targetLocation;
     private boolean clockwise;
     
-    public DragonHoldingPatternPhase(final EnderDragon aus) {
-        super(aus);
+    public DragonHoldingPatternPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
@@ -54,19 +54,19 @@ public class DragonHoldingPatternPhase extends AbstractDragonPhaseInstance {
     
     private void findNewTarget() {
         if (this.currentPath != null && this.currentPath.isDone()) {
-            final BlockPos fk2 = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, new BlockPos(EndPodiumFeature.END_PODIUM_LOCATION));
+            final BlockPos fu2 = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, new BlockPos(EndPodiumFeature.END_PODIUM_LOCATION));
             final int integer3 = (this.dragon.getDragonFight() == null) ? 0 : this.dragon.getDragonFight().getCrystalsAlive();
             if (this.dragon.getRandom().nextInt(integer3 + 3) == 0) {
                 this.dragon.getPhaseManager().setPhase(EnderDragonPhase.LANDING_APPROACH);
                 return;
             }
             double double4 = 64.0;
-            final Player ayj6 = this.dragon.level.getNearestPlayer(DragonHoldingPatternPhase.NEW_TARGET_TARGETING, fk2.getX(), fk2.getY(), fk2.getZ());
-            if (ayj6 != null) {
-                double4 = fk2.distSqr(ayj6.position(), true) / 512.0;
+            final Player bec6 = this.dragon.level.getNearestPlayer(DragonHoldingPatternPhase.NEW_TARGET_TARGETING, fu2.getX(), fu2.getY(), fu2.getZ());
+            if (bec6 != null) {
+                double4 = fu2.distSqr(bec6.position(), true) / 512.0;
             }
-            if (ayj6 != null && !ayj6.abilities.invulnerable && (this.dragon.getRandom().nextInt(Mth.abs((int)double4) + 2) == 0 || this.dragon.getRandom().nextInt(integer3 + 2) == 0)) {
-                this.strafePlayer(ayj6);
+            if (bec6 != null && !bec6.abilities.invulnerable && (this.dragon.getRandom().nextInt(Mth.abs((int)double4) + 2) == 0 || this.dragon.getRandom().nextInt(integer3 + 2) == 0)) {
+                this.strafePlayer(bec6);
                 return;
             }
         }
@@ -102,29 +102,29 @@ public class DragonHoldingPatternPhase extends AbstractDragonPhaseInstance {
         this.navigateToNextPathNode();
     }
     
-    private void strafePlayer(final Player ayj) {
+    private void strafePlayer(final Player bec) {
         this.dragon.getPhaseManager().setPhase(EnderDragonPhase.STRAFE_PLAYER);
-        this.dragon.getPhaseManager().<DragonStrafePlayerPhase>getPhase(EnderDragonPhase.STRAFE_PLAYER).setTarget(ayj);
+        this.dragon.getPhaseManager().<DragonStrafePlayerPhase>getPhase(EnderDragonPhase.STRAFE_PLAYER).setTarget(bec);
     }
     
     private void navigateToNextPathNode() {
         if (this.currentPath != null && !this.currentPath.isDone()) {
-            final Vec3 cvl2 = this.currentPath.currentPos();
+            final Vec3i gr2 = this.currentPath.currentPos();
             this.currentPath.next();
-            final double double3 = cvl2.x;
-            final double double4 = cvl2.z;
+            final double double3 = gr2.getX();
+            final double double4 = gr2.getZ();
             double double5;
             do {
-                double5 = cvl2.y + this.dragon.getRandom().nextFloat() * 20.0f;
-            } while (double5 < cvl2.y);
+                double5 = gr2.getY() + this.dragon.getRandom().nextFloat() * 20.0f;
+            } while (double5 < gr2.getY());
             this.targetLocation = new Vec3(double3, double5, double4);
         }
     }
     
     @Override
-    public void onCrystalDestroyed(final EndCrystal aur, final BlockPos fk, final DamageSource ajz, @Nullable final Player ayj) {
-        if (ayj != null && !ayj.abilities.invulnerable) {
-            this.strafePlayer(ayj);
+    public void onCrystalDestroyed(final EndCrystal bab, final BlockPos fu, final DamageSource anw, @Nullable final Player bec) {
+        if (bec != null && !bec.abilities.invulnerable) {
+            this.strafePlayer(bec);
         }
     }
     
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoverPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoverPhase.java
index a6cf820..5b5e7f2 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoverPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoverPhase.java
@@ -7,8 +7,8 @@ import net.minecraft.world.phys.Vec3;
 public class DragonHoverPhase extends AbstractDragonPhaseInstance {
     private Vec3 targetLocation;
     
-    public DragonHoverPhase(final EnderDragon aus) {
-        super(aus);
+    public DragonHoverPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java
index 948fd12..68c74ce 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.entity.boss.enderdragon.phases;
 
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.pathfinder.Node;
@@ -16,8 +17,8 @@ public class DragonLandingApproachPhase extends AbstractDragonPhaseInstance {
     private Path currentPath;
     private Vec3 targetLocation;
     
-    public DragonLandingApproachPhase(final EnderDragon aus) {
-        super(aus);
+    public DragonLandingApproachPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
@@ -48,18 +49,18 @@ public class DragonLandingApproachPhase extends AbstractDragonPhaseInstance {
     private void findNewTarget() {
         if (this.currentPath == null || this.currentPath.isDone()) {
             final int integer2 = this.dragon.findClosestNode();
-            final BlockPos fk3 = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
-            final Player ayj4 = this.dragon.level.getNearestPlayer(DragonLandingApproachPhase.NEAR_EGG_TARGETING, fk3.getX(), fk3.getY(), fk3.getZ());
+            final BlockPos fu3 = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
+            final Player bec4 = this.dragon.level.getNearestPlayer(DragonLandingApproachPhase.NEAR_EGG_TARGETING, fu3.getX(), fu3.getY(), fu3.getZ());
             int integer3;
-            if (ayj4 != null) {
-                final Vec3 cvl6 = new Vec3(ayj4.getX(), 0.0, ayj4.getZ()).normalize();
-                integer3 = this.dragon.findClosestNode(-cvl6.x * 40.0, 105.0, -cvl6.z * 40.0);
+            if (bec4 != null) {
+                final Vec3 dem6 = new Vec3(bec4.getX(), 0.0, bec4.getZ()).normalize();
+                integer3 = this.dragon.findClosestNode(-dem6.x * 40.0, 105.0, -dem6.z * 40.0);
             }
             else {
-                integer3 = this.dragon.findClosestNode(40.0, fk3.getY(), 0.0);
+                integer3 = this.dragon.findClosestNode(40.0, fu3.getY(), 0.0);
             }
-            final Node cqo6 = new Node(fk3.getX(), fk3.getY(), fk3.getZ());
-            this.currentPath = this.dragon.findPath(integer2, integer3, cqo6);
+            final Node czd6 = new Node(fu3.getX(), fu3.getY(), fu3.getZ());
+            this.currentPath = this.dragon.findPath(integer2, integer3, czd6);
             if (this.currentPath != null) {
                 this.currentPath.next();
             }
@@ -72,14 +73,14 @@ public class DragonLandingApproachPhase extends AbstractDragonPhaseInstance {
     
     private void navigateToNextPathNode() {
         if (this.currentPath != null && !this.currentPath.isDone()) {
-            final Vec3 cvl2 = this.currentPath.currentPos();
+            final Vec3i gr2 = this.currentPath.currentPos();
             this.currentPath.next();
-            final double double3 = cvl2.x;
-            final double double4 = cvl2.z;
+            final double double3 = gr2.getX();
+            final double double4 = gr2.getZ();
             double double5;
             do {
-                double5 = cvl2.y + this.dragon.getRandom().nextFloat() * 20.0f;
-            } while (double5 < cvl2.y);
+                double5 = gr2.getY() + this.dragon.getRandom().nextFloat() * 20.0f;
+            } while (double5 < gr2.getY());
             this.targetLocation = new Vec3(double3, double5, double4);
         }
     }
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java
index f421c4d..270fc13 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java
@@ -15,14 +15,14 @@ import net.minecraft.world.phys.Vec3;
 public class DragonLandingPhase extends AbstractDragonPhaseInstance {
     private Vec3 targetLocation;
     
-    public DragonLandingPhase(final EnderDragon aus) {
-        super(aus);
+    public DragonLandingPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
     public void doClientTick() {
-        final Vec3 cvl2 = this.dragon.getHeadLookVector(1.0f).normalize();
-        cvl2.yRot(-0.7853982f);
+        final Vec3 dem2 = this.dragon.getHeadLookVector(1.0f).normalize();
+        dem2.yRot(-0.7853982f);
         final double double3 = this.dragon.head.getX();
         final double double4 = this.dragon.head.getY(0.5);
         final double double5 = this.dragon.head.getZ();
@@ -31,16 +31,16 @@ public class DragonLandingPhase extends AbstractDragonPhaseInstance {
             final double double6 = double3 + random10.nextGaussian() / 2.0;
             final double double7 = double4 + random10.nextGaussian() / 2.0;
             final double double8 = double5 + random10.nextGaussian() / 2.0;
-            final Vec3 cvl3 = this.dragon.getDeltaMovement();
-            this.dragon.level.addParticle(ParticleTypes.DRAGON_BREATH, double6, double7, double8, -cvl2.x * 0.07999999821186066 + cvl3.x, -cvl2.y * 0.30000001192092896 + cvl3.y, -cvl2.z * 0.07999999821186066 + cvl3.z);
-            cvl2.yRot(0.19634955f);
+            final Vec3 dem3 = this.dragon.getDeltaMovement();
+            this.dragon.level.addParticle(ParticleTypes.DRAGON_BREATH, double6, double7, double8, -dem2.x * 0.07999999821186066 + dem3.x, -dem2.y * 0.30000001192092896 + dem3.y, -dem2.z * 0.07999999821186066 + dem3.z);
+            dem2.yRot(0.19634955f);
         }
     }
     
     @Override
     public void doServerTick() {
         if (this.targetLocation == null) {
-            this.targetLocation = new Vec3(this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION));
+            this.targetLocation = Vec3.atBottomCenterOf(this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION));
         }
         if (this.targetLocation.distanceToSqr(this.dragon.getX(), this.dragon.getY(), this.dragon.getZ()) < 1.0) {
             this.dragon.getPhaseManager().<DragonSittingFlamingPhase>getPhase(EnderDragonPhase.SITTING_FLAMING).resetFlameCount();
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonPhaseInstance.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonPhaseInstance.java
index b806f00..520d131 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonPhaseInstance.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonPhaseInstance.java
@@ -14,7 +14,7 @@ public interface DragonPhaseInstance {
     
     void doServerTick();
     
-    void onCrystalDestroyed(final EndCrystal aur, final BlockPos fk, final DamageSource ajz, @Nullable final Player ayj);
+    void onCrystalDestroyed(final EndCrystal bab, final BlockPos fu, final DamageSource anw, @Nullable final Player bec);
     
     void begin();
     
@@ -29,5 +29,5 @@ public interface DragonPhaseInstance {
     @Nullable
     Vec3 getFlyTargetLocation();
     
-    float onHurt(final DamageSource ajz, final float float2);
+    float onHurt(final DamageSource anw, final float float2);
 }
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingAttackingPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingAttackingPhase.java
index 06ee375..9351ab7 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingAttackingPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingAttackingPhase.java
@@ -6,8 +6,8 @@ import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
 public class DragonSittingAttackingPhase extends AbstractDragonSittingPhase {
     private int attackingTicks;
     
-    public DragonSittingAttackingPhase(final EnderDragon aus) {
-        super(aus);
+    public DragonSittingAttackingPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
index dfef23f..d6c2fb4 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
@@ -17,16 +17,16 @@ public class DragonSittingFlamingPhase extends AbstractDragonSittingPhase {
     private int flameCount;
     private AreaEffectCloud flame;
     
-    public DragonSittingFlamingPhase(final EnderDragon aus) {
-        super(aus);
+    public DragonSittingFlamingPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
     public void doClientTick() {
         ++this.flameTicks;
         if (this.flameTicks % 2 == 0 && this.flameTicks < 10) {
-            final Vec3 cvl2 = this.dragon.getHeadLookVector(1.0f).normalize();
-            cvl2.yRot(-0.7853982f);
+            final Vec3 dem2 = this.dragon.getHeadLookVector(1.0f).normalize();
+            dem2.yRot(-0.7853982f);
             final double double3 = this.dragon.head.getX();
             final double double4 = this.dragon.head.getY(0.5);
             final double double5 = this.dragon.head.getZ();
@@ -35,9 +35,9 @@ public class DragonSittingFlamingPhase extends AbstractDragonSittingPhase {
                 final double double7 = double4 + this.dragon.getRandom().nextGaussian() / 2.0;
                 final double double8 = double5 + this.dragon.getRandom().nextGaussian() / 2.0;
                 for (int integer10 = 0; integer10 < 6; ++integer10) {
-                    this.dragon.level.addParticle(ParticleTypes.DRAGON_BREATH, double6, double7, double8, -cvl2.x * 0.07999999821186066 * integer10, -cvl2.y * 0.6000000238418579, -cvl2.z * 0.07999999821186066 * integer10);
+                    this.dragon.level.addParticle(ParticleTypes.DRAGON_BREATH, double6, double7, double8, -dem2.x * 0.07999999821186066 * integer10, -dem2.y * 0.6000000238418579, -dem2.z * 0.07999999821186066 * integer10);
                 }
-                cvl2.yRot(0.19634955f);
+                dem2.yRot(0.19634955f);
             }
         }
     }
@@ -54,10 +54,10 @@ public class DragonSittingFlamingPhase extends AbstractDragonSittingPhase {
             }
         }
         else if (this.flameTicks == 10) {
-            final Vec3 cvl2 = new Vec3(this.dragon.head.getX() - this.dragon.getX(), 0.0, this.dragon.head.getZ() - this.dragon.getZ()).normalize();
+            final Vec3 dem2 = new Vec3(this.dragon.head.getX() - this.dragon.getX(), 0.0, this.dragon.head.getZ() - this.dragon.getZ()).normalize();
             final float float3 = 5.0f;
-            final double double4 = this.dragon.head.getX() + cvl2.x * 5.0 / 2.0;
-            final double double5 = this.dragon.head.getZ() + cvl2.z * 5.0 / 2.0;
+            final double double4 = this.dragon.head.getX() + dem2.x * 5.0 / 2.0;
+            final double double5 = this.dragon.head.getZ() + dem2.z * 5.0 / 2.0;
             double double7;
             final double double6 = double7 = this.dragon.head.getY(0.5);
             final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos(double4, double7, double5);
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingScanningPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingScanningPhase.java
index 5d53e65..73cef9c 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingScanningPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingScanningPhase.java
@@ -11,27 +11,27 @@ public class DragonSittingScanningPhase extends AbstractDragonSittingPhase {
     private final TargetingConditions scanTargeting;
     private int scanningTime;
     
-    public DragonSittingScanningPhase(final EnderDragon aus) {
-        super(aus);
-        this.scanTargeting = new TargetingConditions().range(20.0).selector(akz -> Math.abs(akz.getY() - aus.getY()) <= 10.0);
+    public DragonSittingScanningPhase(final EnderDragon bac) {
+        super(bac);
+        this.scanTargeting = new TargetingConditions().range(20.0).selector(aoy -> Math.abs(aoy.getY() - bac.getY()) <= 10.0);
     }
     
     @Override
     public void doServerTick() {
         ++this.scanningTime;
-        LivingEntity akz2 = this.dragon.level.getNearestPlayer(this.scanTargeting, this.dragon, this.dragon.getX(), this.dragon.getY(), this.dragon.getZ());
-        if (akz2 != null) {
+        LivingEntity aoy2 = this.dragon.level.getNearestPlayer(this.scanTargeting, this.dragon, this.dragon.getX(), this.dragon.getY(), this.dragon.getZ());
+        if (aoy2 != null) {
             if (this.scanningTime > 25) {
                 this.dragon.getPhaseManager().setPhase(EnderDragonPhase.SITTING_ATTACKING);
             }
             else {
-                final Vec3 cvl3 = new Vec3(akz2.getX() - this.dragon.getX(), 0.0, akz2.getZ() - this.dragon.getZ()).normalize();
-                final Vec3 cvl4 = new Vec3(Mth.sin(this.dragon.yRot * 0.017453292f), 0.0, -Mth.cos(this.dragon.yRot * 0.017453292f)).normalize();
-                final float float5 = (float)cvl4.dot(cvl3);
+                final Vec3 dem3 = new Vec3(aoy2.getX() - this.dragon.getX(), 0.0, aoy2.getZ() - this.dragon.getZ()).normalize();
+                final Vec3 dem4 = new Vec3(Mth.sin(this.dragon.yRot * 0.017453292f), 0.0, -Mth.cos(this.dragon.yRot * 0.017453292f)).normalize();
+                final float float5 = (float)dem4.dot(dem3);
                 final float float6 = (float)(Math.acos(float5) * 57.2957763671875) + 0.5f;
                 if (float6 < 0.0f || float6 > 10.0f) {
-                    final double double7 = akz2.getX() - this.dragon.head.getX();
-                    final double double8 = akz2.getZ() - this.dragon.head.getZ();
+                    final double double7 = aoy2.getX() - this.dragon.head.getX();
+                    final double double8 = aoy2.getZ() - this.dragon.head.getZ();
                     final double double9 = Mth.clamp(Mth.wrapDegrees(180.0 - Mth.atan2(double7, double8) * 57.2957763671875 - this.dragon.yRot), -100.0, 100.0);
                     final EnderDragon dragon = this.dragon;
                     dragon.yRotA *= 0.8f;
@@ -48,11 +48,11 @@ public class DragonSittingScanningPhase extends AbstractDragonSittingPhase {
             }
         }
         else if (this.scanningTime >= 100) {
-            akz2 = this.dragon.level.getNearestPlayer(DragonSittingScanningPhase.CHARGE_TARGETING, this.dragon, this.dragon.getX(), this.dragon.getY(), this.dragon.getZ());
+            aoy2 = this.dragon.level.getNearestPlayer(DragonSittingScanningPhase.CHARGE_TARGETING, this.dragon, this.dragon.getX(), this.dragon.getY(), this.dragon.getZ());
             this.dragon.getPhaseManager().setPhase(EnderDragonPhase.TAKEOFF);
-            if (akz2 != null) {
+            if (aoy2 != null) {
                 this.dragon.getPhaseManager().setPhase(EnderDragonPhase.CHARGING_PLAYER);
-                this.dragon.getPhaseManager().<DragonChargePlayerPhase>getPhase(EnderDragonPhase.CHARGING_PLAYER).setTarget(new Vec3(akz2.getX(), akz2.getY(), akz2.getZ()));
+                this.dragon.getPhaseManager().<DragonChargePlayerPhase>getPhase(EnderDragonPhase.CHARGING_PLAYER).setTarget(new Vec3(aoy2.getX(), aoy2.getY(), aoy2.getZ()));
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
index 8929d3b..0554a90 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
@@ -2,10 +2,10 @@ package net.minecraft.world.entity.boss.enderdragon.phases;
 
 import org.apache.logging.log4j.LogManager;
 import javax.annotation.Nullable;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.pathfinder.Node;
 import net.minecraft.world.entity.projectile.DragonFireball;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
@@ -22,8 +22,8 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
     private LivingEntity attackTarget;
     private boolean holdingPatternClockwise;
     
-    public DragonStrafePlayerPhase(final EnderDragon aus) {
-        super(aus);
+    public DragonStrafePlayerPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
@@ -50,24 +50,26 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
         if (this.attackTarget.distanceToSqr(this.dragon) < 4096.0) {
             if (this.dragon.canSee(this.attackTarget)) {
                 ++this.fireballCharge;
-                final Vec3 cvl6 = new Vec3(this.attackTarget.getX() - this.dragon.getX(), 0.0, this.attackTarget.getZ() - this.dragon.getZ()).normalize();
-                final Vec3 cvl7 = new Vec3(Mth.sin(this.dragon.yRot * 0.017453292f), 0.0, -Mth.cos(this.dragon.yRot * 0.017453292f)).normalize();
-                final float float8 = (float)cvl7.dot(cvl6);
+                final Vec3 dem6 = new Vec3(this.attackTarget.getX() - this.dragon.getX(), 0.0, this.attackTarget.getZ() - this.dragon.getZ()).normalize();
+                final Vec3 dem7 = new Vec3(Mth.sin(this.dragon.yRot * 0.017453292f), 0.0, -Mth.cos(this.dragon.yRot * 0.017453292f)).normalize();
+                final float float8 = (float)dem7.dot(dem6);
                 float float9 = (float)(Math.acos(float8) * 57.2957763671875);
                 float9 += 0.5f;
                 if (this.fireballCharge >= 5 && float9 >= 0.0f && float9 < 10.0f) {
                     final double double6 = 1.0;
-                    final Vec3 cvl8 = this.dragon.getViewVector(1.0f);
-                    final double double8 = this.dragon.head.getX() - cvl8.x * 1.0;
+                    final Vec3 dem8 = this.dragon.getViewVector(1.0f);
+                    final double double8 = this.dragon.head.getX() - dem8.x * 1.0;
                     final double double9 = this.dragon.head.getY(0.5) + 0.5;
-                    final double double10 = this.dragon.head.getZ() - cvl8.z * 1.0;
+                    final double double10 = this.dragon.head.getZ() - dem8.z * 1.0;
                     final double double11 = this.attackTarget.getX() - double8;
                     final double double12 = this.attackTarget.getY(0.5) - double9;
                     final double double13 = this.attackTarget.getZ() - double10;
-                    this.dragon.level.levelEvent(null, 1017, new BlockPos(this.dragon), 0);
-                    final DragonFireball ayq25 = new DragonFireball(this.dragon.level, this.dragon, double11, double12, double13);
-                    ayq25.moveTo(double8, double9, double10, 0.0f, 0.0f);
-                    this.dragon.level.addFreshEntity(ayq25);
+                    if (!this.dragon.isSilent()) {
+                        this.dragon.level.levelEvent(null, 1017, this.dragon.blockPosition(), 0);
+                    }
+                    final DragonFireball bej25 = new DragonFireball(this.dragon.level, this.dragon, double11, double12, double13);
+                    bej25.moveTo(double8, double9, double10, 0.0f, 0.0f);
+                    this.dragon.level.addFreshEntity(bej25);
                     this.fireballCharge = 0;
                     if (this.currentPath != null) {
                         while (!this.currentPath.isDone()) {
@@ -121,14 +123,14 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
     
     private void navigateToNextPathNode() {
         if (this.currentPath != null && !this.currentPath.isDone()) {
-            final Vec3 cvl2 = this.currentPath.currentPos();
+            final Vec3i gr2 = this.currentPath.currentPos();
             this.currentPath.next();
-            final double double3 = cvl2.x;
-            final double double4 = cvl2.z;
+            final double double3 = gr2.getX();
+            final double double4 = gr2.getZ();
             double double5;
             do {
-                double5 = cvl2.y + this.dragon.getRandom().nextFloat() * 20.0f;
-            } while (double5 < cvl2.y);
+                double5 = gr2.getY() + this.dragon.getRandom().nextFloat() * 20.0f;
+            } while (double5 < gr2.getY());
             this.targetLocation = new Vec3(double3, double5, double4);
         }
     }
@@ -141,8 +143,8 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
         this.attackTarget = null;
     }
     
-    public void setTarget(final LivingEntity akz) {
-        this.attackTarget = akz;
+    public void setTarget(final LivingEntity aoy) {
+        this.attackTarget = aoy;
         final int integer3 = this.dragon.findClosestNode();
         final int integer4 = this.dragon.findClosestNode(this.attackTarget.getX(), this.attackTarget.getY(), this.attackTarget.getZ());
         final int integer5 = Mth.floor(this.attackTarget.getX());
@@ -152,8 +154,8 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
         final double double9 = Mth.sqrt(double7 * double7 + double8 * double8);
         final double double10 = Math.min(0.4000000059604645 + double9 / 80.0 - 1.0, 10.0);
         final int integer7 = Mth.floor(this.attackTarget.getY() + double10);
-        final Node cqo16 = new Node(integer5, integer7, integer6);
-        this.currentPath = this.dragon.findPath(integer3, integer4, cqo16);
+        final Node czd16 = new Node(integer5, integer7, integer6);
+        this.currentPath = this.dragon.findPath(integer3, integer4, czd16);
         if (this.currentPath != null) {
             this.currentPath.next();
             this.navigateToNextPathNode();
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java
index c5726df..471540d 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.entity.boss.enderdragon.phases;
 
 import javax.annotation.Nullable;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.pathfinder.Node;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Position;
@@ -15,8 +16,8 @@ public class DragonTakeoffPhase extends AbstractDragonPhaseInstance {
     private Path currentPath;
     private Vec3 targetLocation;
     
-    public DragonTakeoffPhase(final EnderDragon aus) {
-        super(aus);
+    public DragonTakeoffPhase(final EnderDragon bac) {
+        super(bac);
     }
     
     @Override
@@ -26,8 +27,8 @@ public class DragonTakeoffPhase extends AbstractDragonPhaseInstance {
             this.findNewTarget();
         }
         else {
-            final BlockPos fk2 = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
-            if (!fk2.closerThan(this.dragon.position(), 10.0)) {
+            final BlockPos fu2 = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
+            if (!fu2.closerThan(this.dragon.position(), 10.0)) {
                 this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
             }
         }
@@ -42,8 +43,8 @@ public class DragonTakeoffPhase extends AbstractDragonPhaseInstance {
     
     private void findNewTarget() {
         final int integer2 = this.dragon.findClosestNode();
-        final Vec3 cvl3 = this.dragon.getHeadLookVector(1.0f);
-        int integer3 = this.dragon.findClosestNode(-cvl3.x * 40.0, 105.0, -cvl3.z * 40.0);
+        final Vec3 dem3 = this.dragon.getHeadLookVector(1.0f);
+        int integer3 = this.dragon.findClosestNode(-dem3.x * 40.0, 105.0, -dem3.z * 40.0);
         if (this.dragon.getDragonFight() == null || this.dragon.getDragonFight().getCrystalsAlive() <= 0) {
             integer3 -= 12;
             integer3 &= 0x7;
@@ -63,13 +64,13 @@ public class DragonTakeoffPhase extends AbstractDragonPhaseInstance {
         if (this.currentPath != null) {
             this.currentPath.next();
             if (!this.currentPath.isDone()) {
-                final Vec3 cvl2 = this.currentPath.currentPos();
+                final Vec3i gr2 = this.currentPath.currentPos();
                 this.currentPath.next();
                 double double3;
                 do {
-                    double3 = cvl2.y + this.dragon.getRandom().nextFloat() * 20.0f;
-                } while (double3 < cvl2.y);
-                this.targetLocation = new Vec3(cvl2.x, double3, cvl2.z);
+                    double3 = gr2.getY() + this.dragon.getRandom().nextFloat() * 20.0f;
+                } while (double3 < gr2.getY());
+                this.targetLocation = new Vec3(gr2.getX(), double3, gr2.getZ());
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/EnderDragonPhase.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/EnderDragonPhase.java
index 2bdf092..d538c4b 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/EnderDragonPhase.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/EnderDragonPhase.java
@@ -27,10 +27,10 @@ public class EnderDragonPhase<T extends DragonPhaseInstance> {
         this.name = string;
     }
     
-    public DragonPhaseInstance createInstance(final EnderDragon aus) {
+    public DragonPhaseInstance createInstance(final EnderDragon bac) {
         try {
             final Constructor<? extends DragonPhaseInstance> constructor3 = this.getConstructor();
-            return (DragonPhaseInstance)constructor3.newInstance(aus);
+            return (DragonPhaseInstance)constructor3.newInstance(bac);
         }
         catch (Exception exception3) {
             throw new Error(exception3);
@@ -62,9 +62,9 @@ public class EnderDragonPhase<T extends DragonPhaseInstance> {
     }
     
     private static <T extends DragonPhaseInstance> EnderDragonPhase<T> create(final Class<T> class1, final String string) {
-        final EnderDragonPhase<T> avj3 = new EnderDragonPhase<T>(EnderDragonPhase.phases.length, class1, string);
+        final EnderDragonPhase<T> bas3 = new EnderDragonPhase<T>(EnderDragonPhase.phases.length, class1, string);
         EnderDragonPhase.phases = Arrays.<EnderDragonPhase<?>>copyOf(EnderDragonPhase.phases, EnderDragonPhase.phases.length + 1);
-        return (EnderDragonPhase<T>)(EnderDragonPhase.phases[avj3.getId()] = avj3);
+        return (EnderDragonPhase<T>)(EnderDragonPhase.phases[bas3.getId()] = bas3);
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/boss/enderdragon/phases/EnderDragonPhaseManager.java b/src/net/minecraft/world/entity/boss/enderdragon/phases/EnderDragonPhaseManager.java
index 68a90b8..bb70c71 100644
--- a/src/net/minecraft/world/entity/boss/enderdragon/phases/EnderDragonPhaseManager.java
+++ b/src/net/minecraft/world/entity/boss/enderdragon/phases/EnderDragonPhaseManager.java
@@ -10,24 +10,24 @@ public class EnderDragonPhaseManager {
     private final DragonPhaseInstance[] phases;
     private DragonPhaseInstance currentPhase;
     
-    public EnderDragonPhaseManager(final EnderDragon aus) {
+    public EnderDragonPhaseManager(final EnderDragon bac) {
         this.phases = new DragonPhaseInstance[EnderDragonPhase.getCount()];
-        this.dragon = aus;
+        this.dragon = bac;
         this.setPhase(EnderDragonPhase.HOVERING);
     }
     
-    public void setPhase(final EnderDragonPhase<?> avj) {
-        if (this.currentPhase != null && avj == this.currentPhase.getPhase()) {
+    public void setPhase(final EnderDragonPhase<?> bas) {
+        if (this.currentPhase != null && bas == this.currentPhase.getPhase()) {
             return;
         }
         if (this.currentPhase != null) {
             this.currentPhase.end();
         }
-        this.currentPhase = this.<DragonPhaseInstance>getPhase(avj);
+        this.currentPhase = this.<DragonPhaseInstance>getPhase(bas);
         if (!this.dragon.level.isClientSide) {
-            this.dragon.getEntityData().<Integer>set(EnderDragon.DATA_PHASE, avj.getId());
+            this.dragon.getEntityData().<Integer>set(EnderDragon.DATA_PHASE, bas.getId());
         }
-        EnderDragonPhaseManager.LOGGER.debug("Dragon is now in phase {} on the {}", avj, (this.dragon.level.isClientSide ? "client" : "server"));
+        EnderDragonPhaseManager.LOGGER.debug("Dragon is now in phase {} on the {}", bas, (this.dragon.level.isClientSide ? "client" : "server"));
         this.currentPhase.begin();
     }
     
@@ -35,10 +35,10 @@ public class EnderDragonPhaseManager {
         return this.currentPhase;
     }
     
-    public <T extends DragonPhaseInstance> T getPhase(final EnderDragonPhase<T> avj) {
-        final int integer3 = avj.getId();
+    public <T extends DragonPhaseInstance> T getPhase(final EnderDragonPhase<T> bas) {
+        final int integer3 = bas.getId();
         if (this.phases[integer3] == null) {
-            this.phases[integer3] = avj.createInstance(this.dragon);
+            this.phases[integer3] = bas.createInstance(this.dragon);
         }
         return (T)this.phases[integer3];
     }
diff --git a/src/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/net/minecraft/world/entity/boss/wither/WitherBoss.java
index c0aa590..b8485bb 100644
--- a/src/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -6,7 +6,8 @@ import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.MobType;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.level.ItemLike;
@@ -16,8 +17,8 @@ import net.minecraft.world.entity.projectile.WitherSkull;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.Difficulty;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.Difficulty;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.core.particles.ParticleOptions;
@@ -71,8 +72,8 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     private static final Predicate<LivingEntity> LIVING_ENTITY_SELECTOR;
     private static final TargetingConditions TARGETING_CONDITIONS;
     
-    public WitherBoss(final EntityType<? extends WitherBoss> aku, final Level bjw) {
-        super(aku, bjw);
+    public WitherBoss(final EntityType<? extends WitherBoss> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.xRotHeads = new float[2];
         this.yRotHeads = new float[2];
         this.xRotOHeads = new float[2];
@@ -106,23 +107,23 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("Invul", this.getInvulnerableTicks());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Invul", this.getInvulnerableTicks());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.setInvulnerableTicks(jt.getInt("Invul"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setInvulnerableTicks(le.getInt("Invul"));
         if (this.hasCustomName()) {
             this.bossEvent.setName(this.getDisplayName());
         }
     }
     
     @Override
-    public void setCustomName(@Nullable final Component lf) {
-        super.setCustomName(lf);
+    public void setCustomName(@Nullable final Component mr) {
+        super.setCustomName(mr);
         this.bossEvent.setName(this.getDisplayName());
     }
     
@@ -132,7 +133,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.WITHER_HURT;
     }
     
@@ -143,26 +144,26 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     
     @Override
     public void aiStep() {
-        Vec3 cvl2 = this.getDeltaMovement().multiply(1.0, 0.6, 1.0);
+        Vec3 dem2 = this.getDeltaMovement().multiply(1.0, 0.6, 1.0);
         if (!this.level.isClientSide && this.getAlternativeTarget(0) > 0) {
-            final Entity akq3 = this.level.getEntity(this.getAlternativeTarget(0));
-            if (akq3 != null) {
-                double double4 = cvl2.y;
-                if (this.getY() < akq3.getY() || (!this.isPowered() && this.getY() < akq3.getY() + 5.0)) {
+            final Entity aom3 = this.level.getEntity(this.getAlternativeTarget(0));
+            if (aom3 != null) {
+                double double4 = dem2.y;
+                if (this.getY() < aom3.getY() || (!this.isPowered() && this.getY() < aom3.getY() + 5.0)) {
                     double4 = Math.max(0.0, double4);
                     double4 += 0.3 - double4 * 0.6000000238418579;
                 }
-                cvl2 = new Vec3(cvl2.x, double4, cvl2.z);
-                final Vec3 cvl3 = new Vec3(akq3.getX() - this.getX(), 0.0, akq3.getZ() - this.getZ());
-                if (Entity.getHorizontalDistanceSqr(cvl3) > 9.0) {
-                    final Vec3 cvl4 = cvl3.normalize();
-                    cvl2 = cvl2.add(cvl4.x * 0.3 - cvl2.x * 0.6, 0.0, cvl4.z * 0.3 - cvl2.z * 0.6);
+                dem2 = new Vec3(dem2.x, double4, dem2.z);
+                final Vec3 dem3 = new Vec3(aom3.getX() - this.getX(), 0.0, aom3.getZ() - this.getZ());
+                if (Entity.getHorizontalDistanceSqr(dem3) > 9.0) {
+                    final Vec3 dem4 = dem3.normalize();
+                    dem2 = dem2.add(dem4.x * 0.3 - dem2.x * 0.6, 0.0, dem4.z * 0.3 - dem2.z * 0.6);
                 }
             }
         }
-        this.setDeltaMovement(cvl2);
-        if (Entity.getHorizontalDistanceSqr(cvl2) > 0.05) {
-            this.yRot = (float)Mth.atan2(cvl2.z, cvl2.x) * 57.295776f - 90.0f;
+        this.setDeltaMovement(dem2);
+        if (Entity.getHorizontalDistanceSqr(dem2) > 0.05) {
+            this.yRot = (float)Mth.atan2(dem2.z, dem2.x) * 57.295776f - 90.0f;
         }
         super.aiStep();
         for (int integer3 = 0; integer3 < 2; ++integer3) {
@@ -171,17 +172,17 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
         }
         for (int integer3 = 0; integer3 < 2; ++integer3) {
             final int integer4 = this.getAlternativeTarget(integer3 + 1);
-            Entity akq4 = null;
+            Entity aom4 = null;
             if (integer4 > 0) {
-                akq4 = this.level.getEntity(integer4);
+                aom4 = this.level.getEntity(integer4);
             }
-            if (akq4 != null) {
+            if (aom4 != null) {
                 final double double5 = this.getHeadX(integer3 + 1);
                 final double double6 = this.getHeadY(integer3 + 1);
                 final double double7 = this.getHeadZ(integer3 + 1);
-                final double double8 = akq4.getX() - double5;
-                final double double9 = akq4.getEyeY() - double6;
-                final double double10 = akq4.getZ() - double7;
+                final double double8 = aom4.getX() - double5;
+                final double double9 = aom4.getEyeY() - double6;
+                final double double10 = aom4.getZ() - double7;
                 final double double11 = Mth.sqrt(double8 * double8 + double10 * double10);
                 final float float20 = (float)(Mth.atan2(double10, double8) * 57.2957763671875) - 90.0f;
                 final float float21 = (float)(-(Mth.atan2(double9, double11) * 57.2957763671875));
@@ -216,7 +217,9 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
             if (integer2 <= 0) {
                 final Explosion.BlockInteraction a3 = this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? Explosion.BlockInteraction.DESTROY : Explosion.BlockInteraction.NONE;
                 this.level.explode(this, this.getX(), this.getEyeY(), this.getZ(), 7.0f, false, a3);
-                this.level.globalLevelEvent(1023, new BlockPos(this), 0);
+                if (!this.isSilent()) {
+                    this.level.globalLevelEvent(1023, this.blockPosition(), 0);
+                }
             }
             this.setInvulnerableTicks(integer2);
             if (this.tickCount % 10 == 0) {
@@ -239,15 +242,15 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
                 }
                 final int integer3 = this.getAlternativeTarget(integer2);
                 if (integer3 > 0) {
-                    final Entity akq4 = this.level.getEntity(integer3);
-                    if (akq4 == null || !akq4.isAlive() || this.distanceToSqr(akq4) > 900.0 || !this.canSee(akq4)) {
+                    final Entity aom4 = this.level.getEntity(integer3);
+                    if (aom4 == null || !aom4.isAlive() || this.distanceToSqr(aom4) > 900.0 || !this.canSee(aom4)) {
                         this.setAlternativeTarget(integer2, 0);
                     }
-                    else if (akq4 instanceof Player && ((Player)akq4).abilities.invulnerable) {
+                    else if (aom4 instanceof Player && ((Player)aom4).abilities.invulnerable) {
                         this.setAlternativeTarget(integer2, 0);
                     }
                     else {
-                        this.performRangedAttack(integer2 + 1, (LivingEntity)akq4);
+                        this.performRangedAttack(integer2 + 1, (LivingEntity)aom4);
                         this.nextHeadUpdate[integer2 - 1] = this.tickCount + 40 + this.random.nextInt(20);
                         this.idleHeadUpdates[integer2 - 1] = 0;
                     }
@@ -256,20 +259,20 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
                     final List<LivingEntity> list4 = this.level.<LivingEntity>getNearbyEntities(LivingEntity.class, WitherBoss.TARGETING_CONDITIONS, (LivingEntity)this, this.getBoundingBox().inflate(20.0, 8.0, 20.0));
                     int integer4 = 0;
                     while (integer4 < 10 && !list4.isEmpty()) {
-                        final LivingEntity akz6 = list4.get(this.random.nextInt(list4.size()));
-                        if (akz6 != this && akz6.isAlive() && this.canSee(akz6)) {
-                            if (!(akz6 instanceof Player)) {
-                                this.setAlternativeTarget(integer2, akz6.getId());
+                        final LivingEntity aoy6 = list4.get(this.random.nextInt(list4.size()));
+                        if (aoy6 != this && aoy6.isAlive() && this.canSee(aoy6)) {
+                            if (!(aoy6 instanceof Player)) {
+                                this.setAlternativeTarget(integer2, aoy6.getId());
                                 break;
                             }
-                            if (!((Player)akz6).abilities.invulnerable) {
-                                this.setAlternativeTarget(integer2, akz6.getId());
+                            if (!((Player)aoy6).abilities.invulnerable) {
+                                this.setAlternativeTarget(integer2, aoy6.getId());
                                 break;
                             }
                             break;
                         }
                         else {
-                            list4.remove(akz6);
+                            list4.remove(aoy6);
                             ++integer4;
                         }
                     }
@@ -295,16 +298,16 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
                             final int integer9 = integer3 + integer6;
                             final int integer10 = integer2 + integer8;
                             final int integer11 = integer5 + integer7;
-                            final BlockPos fk12 = new BlockPos(integer9, integer10, integer11);
-                            final BlockState byj13 = this.level.getBlockState(fk12);
-                            if (canDestroy(byj13)) {
-                                boolean5 = (this.level.destroyBlock(fk12, true, this) || boolean5);
+                            final BlockPos fu12 = new BlockPos(integer9, integer10, integer11);
+                            final BlockState cfj13 = this.level.getBlockState(fu12);
+                            if (canDestroy(cfj13)) {
+                                boolean5 = (this.level.destroyBlock(fu12, true, this) || boolean5);
                             }
                         }
                     }
                 }
                 if (boolean5) {
-                    this.level.levelEvent(null, 1022, new BlockPos(this), 0);
+                    this.level.levelEvent(null, 1022, this.blockPosition(), 0);
                 }
             }
         }
@@ -314,8 +317,8 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
         this.bossEvent.setPercent(this.getHealth() / this.getMaxHealth());
     }
     
-    public static boolean canDestroy(final BlockState byj) {
-        return !byj.isAir() && !BlockTags.WITHER_IMMUNE.contains(byj.getBlock());
+    public static boolean canDestroy(final BlockState cfj) {
+        return !cfj.isAir() && !BlockTags.WITHER_IMMUNE.contains(cfj.getBlock());
     }
     
     public void makeInvulnerable() {
@@ -324,19 +327,19 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     }
     
     @Override
-    public void makeStuckInBlock(final BlockState byj, final Vec3 cvl) {
+    public void makeStuckInBlock(final BlockState cfj, final Vec3 dem) {
     }
     
     @Override
-    public void startSeenByPlayer(final ServerPlayer xe) {
-        super.startSeenByPlayer(xe);
-        this.bossEvent.addPlayer(xe);
+    public void startSeenByPlayer(final ServerPlayer ze) {
+        super.startSeenByPlayer(ze);
+        this.bossEvent.addPlayer(ze);
     }
     
     @Override
-    public void stopSeenByPlayer(final ServerPlayer xe) {
-        super.stopSeenByPlayer(xe);
-        this.bossEvent.removePlayer(xe);
+    public void stopSeenByPlayer(final ServerPlayer ze) {
+        super.stopSeenByPlayer(ze);
+        this.bossEvent.removePlayer(ze);
     }
     
     private double getHeadX(final int integer) {
@@ -375,52 +378,55 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
         return float1 + float4;
     }
     
-    private void performRangedAttack(final int integer, final LivingEntity akz) {
-        this.performRangedAttack(integer, akz.getX(), akz.getY() + akz.getEyeHeight() * 0.5, akz.getZ(), integer == 0 && this.random.nextFloat() < 0.001f);
+    private void performRangedAttack(final int integer, final LivingEntity aoy) {
+        this.performRangedAttack(integer, aoy.getX(), aoy.getY() + aoy.getEyeHeight() * 0.5, aoy.getZ(), integer == 0 && this.random.nextFloat() < 0.001f);
     }
     
     private void performRangedAttack(final int integer, final double double2, final double double3, final double double4, final boolean boolean5) {
-        this.level.levelEvent(null, 1024, new BlockPos(this), 0);
+        if (!this.isSilent()) {
+            this.level.levelEvent(null, 1024, this.blockPosition(), 0);
+        }
         final double double5 = this.getHeadX(integer);
         final double double6 = this.getHeadY(integer);
         final double double7 = this.getHeadZ(integer);
         final double double8 = double2 - double5;
         final double double9 = double3 - double6;
         final double double10 = double4 - double7;
-        final WitherSkull azl22 = new WitherSkull(this.level, this, double8, double9, double10);
+        final WitherSkull bff22 = new WitherSkull(this.level, this, double8, double9, double10);
+        bff22.setOwner(this);
         if (boolean5) {
-            azl22.setDangerous(true);
+            bff22.setDangerous(true);
         }
-        azl22.setPosRaw(double5, double6, double7);
-        this.level.addFreshEntity(azl22);
+        bff22.setPosRaw(double5, double6, double7);
+        this.level.addFreshEntity(bff22);
     }
     
     @Override
-    public void performRangedAttack(final LivingEntity akz, final float float2) {
-        this.performRangedAttack(0, akz);
+    public void performRangedAttack(final LivingEntity aoy, final float float2) {
+        this.performRangedAttack(0, aoy);
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        if (ajz == DamageSource.DROWN || ajz.getEntity() instanceof WitherBoss) {
+        if (anw == DamageSource.DROWN || anw.getEntity() instanceof WitherBoss) {
             return false;
         }
-        if (this.getInvulnerableTicks() > 0 && ajz != DamageSource.OUT_OF_WORLD) {
+        if (this.getInvulnerableTicks() > 0 && anw != DamageSource.OUT_OF_WORLD) {
             return false;
         }
         if (this.isPowered()) {
-            final Entity akq4 = ajz.getDirectEntity();
-            if (akq4 instanceof AbstractArrow) {
+            final Entity aom4 = anw.getDirectEntity();
+            if (aom4 instanceof AbstractArrow) {
                 return false;
             }
         }
-        final Entity akq4 = ajz.getEntity();
-        if (akq4 != null) {
-            if (!(akq4 instanceof Player)) {
-                if (akq4 instanceof LivingEntity && ((LivingEntity)akq4).getMobType() == this.getMobType()) {
+        final Entity aom4 = anw.getEntity();
+        if (aom4 != null) {
+            if (!(aom4 instanceof Player)) {
+                if (aom4 instanceof LivingEntity && ((LivingEntity)aom4).getMobType() == this.getMobType()) {
                     return false;
                 }
             }
@@ -433,15 +439,15 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
             final int n = integer5;
             idleHeadUpdates[n] += 3;
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
-    protected void dropCustomDeathLoot(final DamageSource ajz, final int integer, final boolean boolean3) {
-        super.dropCustomDeathLoot(ajz, integer, boolean3);
-        final ItemEntity awb5 = this.spawnAtLocation(Items.NETHER_STAR);
-        if (awb5 != null) {
-            awb5.setExtendedLifetime();
+    protected void dropCustomDeathLoot(final DamageSource anw, final int integer, final boolean boolean3) {
+        super.dropCustomDeathLoot(anw, integer, boolean3);
+        final ItemEntity bbg5 = this.spawnAtLocation(Items.NETHER_STAR);
+        if (bbg5 != null) {
+            bbg5.setExtendedLifetime();
         }
     }
     
@@ -460,17 +466,12 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     }
     
     @Override
-    public boolean addEffect(final MobEffectInstance akk) {
+    public boolean addEffect(final MobEffectInstance aog) {
         return false;
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(300.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.6000000238418579);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(40.0);
-        this.getAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(4.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 300.0).add(Attributes.MOVEMENT_SPEED, 0.6000000238418579).add(Attributes.FOLLOW_RANGE, 40.0).add(Attributes.ARMOR, 4.0);
     }
     
     public float getHeadYRot(final int integer) {
@@ -508,7 +509,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     }
     
     @Override
-    protected boolean canRide(final Entity akq) {
+    protected boolean canRide(final Entity aom) {
         return false;
     }
     
@@ -518,8 +519,8 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     }
     
     @Override
-    public boolean canBeAffected(final MobEffectInstance akk) {
-        return akk.getEffect() != MobEffects.WITHER && super.canBeAffected(akk);
+    public boolean canBeAffected(final MobEffectInstance aog) {
+        return aog.getEffect() != MobEffects.WITHER && super.canBeAffected(aog);
     }
     
     static {
@@ -528,7 +529,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
         DATA_TARGET_C = SynchedEntityData.<Integer>defineId(WitherBoss.class, EntityDataSerializers.INT);
         DATA_TARGETS = ImmutableList.<EntityDataAccessor<Integer>>of(WitherBoss.DATA_TARGET_A, WitherBoss.DATA_TARGET_B, WitherBoss.DATA_TARGET_C);
         DATA_ID_INV = SynchedEntityData.<Integer>defineId(WitherBoss.class, EntityDataSerializers.INT);
-        LIVING_ENTITY_SELECTOR = (akz -> akz.getMobType() != MobType.UNDEAD && akz.attackable());
+        LIVING_ENTITY_SELECTOR = (aoy -> aoy.getMobType() != MobType.UNDEAD && aoy.attackable());
         TARGETING_CONDITIONS = new TargetingConditions().range(20.0).selector(WitherBoss.LIVING_ENTITY_SELECTOR);
     }
     
diff --git a/src/net/minecraft/world/entity/decoration/ArmorStand.java b/src/net/minecraft/world/entity/decoration/ArmorStand.java
index 17772b8..8816b38 100644
--- a/src/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/net/minecraft/world/entity/decoration/ArmorStand.java
@@ -4,7 +4,7 @@ import java.util.AbstractList;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.world.entity.vehicle.AbstractMinecart;
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.world.entity.LightningBolt;
 import javax.annotation.Nullable;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.HumanoidArm;
@@ -13,7 +13,6 @@ import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.BlockParticleOption;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.particles.ParticleTypes;
@@ -70,8 +69,8 @@ public class ArmorStand extends LivingEntity {
     private Rotations leftLegPose;
     private Rotations rightLegPose;
     
-    public ArmorStand(final EntityType<? extends ArmorStand> aku, final Level bjw) {
-        super(aku, bjw);
+    public ArmorStand(final EntityType<? extends ArmorStand> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.handItems = NonNullList.<ItemStack>withSize(2, ItemStack.EMPTY);
         this.armorItems = NonNullList.<ItemStack>withSize(4, ItemStack.EMPTY);
         this.headPose = ArmorStand.DEFAULT_HEAD_POSE;
@@ -83,8 +82,8 @@ public class ArmorStand extends LivingEntity {
         this.maxUpStep = 0.0f;
     }
     
-    public ArmorStand(final Level bjw, final double double2, final double double3, final double double4) {
-        this(EntityType.ARMOR_STAND, bjw);
+    public ArmorStand(final Level bqb, final double double2, final double double3, final double double4) {
+        this(EntityType.ARMOR_STAND, bqb);
         this.setPos(double2, double3, double4);
     }
     
@@ -129,13 +128,13 @@ public class ArmorStand extends LivingEntity {
     }
     
     @Override
-    public ItemStack getItemBySlot(final EquipmentSlot akv) {
-        switch (akv.getType()) {
+    public ItemStack getItemBySlot(final EquipmentSlot aor) {
+        switch (aor.getType()) {
             case HAND: {
-                return this.handItems.get(akv.getIndex());
+                return this.handItems.get(aor.getIndex());
             }
             case ARMOR: {
-                return this.armorItems.get(akv.getIndex());
+                return this.armorItems.get(aor.getIndex());
             }
             default: {
                 return ItemStack.EMPTY;
@@ -144,152 +143,152 @@ public class ArmorStand extends LivingEntity {
     }
     
     @Override
-    public void setItemSlot(final EquipmentSlot akv, final ItemStack ben) {
-        switch (akv.getType()) {
+    public void setItemSlot(final EquipmentSlot aor, final ItemStack bki) {
+        switch (aor.getType()) {
             case HAND: {
-                this.playEquipSound(ben);
-                this.handItems.set(akv.getIndex(), ben);
+                this.playEquipSound(bki);
+                this.handItems.set(aor.getIndex(), bki);
                 break;
             }
             case ARMOR: {
-                this.playEquipSound(ben);
-                this.armorItems.set(akv.getIndex(), ben);
+                this.playEquipSound(bki);
+                this.armorItems.set(aor.getIndex(), bki);
                 break;
             }
         }
     }
     
     @Override
-    public boolean setSlot(final int integer, final ItemStack ben) {
-        EquipmentSlot akv4;
+    public boolean setSlot(final int integer, final ItemStack bki) {
+        EquipmentSlot aor4;
         if (integer == 98) {
-            akv4 = EquipmentSlot.MAINHAND;
+            aor4 = EquipmentSlot.MAINHAND;
         }
         else if (integer == 99) {
-            akv4 = EquipmentSlot.OFFHAND;
+            aor4 = EquipmentSlot.OFFHAND;
         }
         else if (integer == 100 + EquipmentSlot.HEAD.getIndex()) {
-            akv4 = EquipmentSlot.HEAD;
+            aor4 = EquipmentSlot.HEAD;
         }
         else if (integer == 100 + EquipmentSlot.CHEST.getIndex()) {
-            akv4 = EquipmentSlot.CHEST;
+            aor4 = EquipmentSlot.CHEST;
         }
         else if (integer == 100 + EquipmentSlot.LEGS.getIndex()) {
-            akv4 = EquipmentSlot.LEGS;
+            aor4 = EquipmentSlot.LEGS;
         }
         else {
             if (integer != 100 + EquipmentSlot.FEET.getIndex()) {
                 return false;
             }
-            akv4 = EquipmentSlot.FEET;
+            aor4 = EquipmentSlot.FEET;
         }
-        if (ben.isEmpty() || Mob.isValidSlotForItem(akv4, ben) || akv4 == EquipmentSlot.HEAD) {
-            this.setItemSlot(akv4, ben);
+        if (bki.isEmpty() || Mob.isValidSlotForItem(aor4, bki) || aor4 == EquipmentSlot.HEAD) {
+            this.setItemSlot(aor4, bki);
             return true;
         }
         return false;
     }
     
     @Override
-    public boolean canTakeItem(final ItemStack ben) {
-        final EquipmentSlot akv3 = Mob.getEquipmentSlotForItem(ben);
-        return this.getItemBySlot(akv3).isEmpty() && !this.isDisabled(akv3);
+    public boolean canTakeItem(final ItemStack bki) {
+        final EquipmentSlot aor3 = Mob.getEquipmentSlotForItem(bki);
+        return this.getItemBySlot(aor3).isEmpty() && !this.isDisabled(aor3);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        final ListTag jz3 = new ListTag();
-        for (final ItemStack ben5 : this.armorItems) {
-            final CompoundTag jt2 = new CompoundTag();
-            if (!ben5.isEmpty()) {
-                ben5.save(jt2);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        final ListTag lk3 = new ListTag();
+        for (final ItemStack bki5 : this.armorItems) {
+            final CompoundTag le2 = new CompoundTag();
+            if (!bki5.isEmpty()) {
+                bki5.save(le2);
             }
-            ((AbstractList<CompoundTag>)jz3).add(jt2);
+            ((AbstractList<CompoundTag>)lk3).add(le2);
         }
-        jt.put("ArmorItems", jz3);
-        final ListTag jz4 = new ListTag();
-        for (final ItemStack ben6 : this.handItems) {
-            final CompoundTag jt3 = new CompoundTag();
-            if (!ben6.isEmpty()) {
-                ben6.save(jt3);
+        le.put("ArmorItems", lk3);
+        final ListTag lk4 = new ListTag();
+        for (final ItemStack bki6 : this.handItems) {
+            final CompoundTag le3 = new CompoundTag();
+            if (!bki6.isEmpty()) {
+                bki6.save(le3);
             }
-            ((AbstractList<CompoundTag>)jz4).add(jt3);
+            ((AbstractList<CompoundTag>)lk4).add(le3);
         }
-        jt.put("HandItems", jz4);
-        jt.putBoolean("Invisible", this.isInvisible());
-        jt.putBoolean("Small", this.isSmall());
-        jt.putBoolean("ShowArms", this.isShowArms());
-        jt.putInt("DisabledSlots", this.disabledSlots);
-        jt.putBoolean("NoBasePlate", this.isNoBasePlate());
+        le.put("HandItems", lk4);
+        le.putBoolean("Invisible", this.isInvisible());
+        le.putBoolean("Small", this.isSmall());
+        le.putBoolean("ShowArms", this.isShowArms());
+        le.putInt("DisabledSlots", this.disabledSlots);
+        le.putBoolean("NoBasePlate", this.isNoBasePlate());
         if (this.isMarker()) {
-            jt.putBoolean("Marker", this.isMarker());
+            le.putBoolean("Marker", this.isMarker());
         }
-        jt.put("Pose", this.writePose());
+        le.put("Pose", this.writePose());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("ArmorItems", 9)) {
-            final ListTag jz3 = jt.getList("ArmorItems", 10);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("ArmorItems", 9)) {
+            final ListTag lk3 = le.getList("ArmorItems", 10);
             for (int integer4 = 0; integer4 < this.armorItems.size(); ++integer4) {
-                this.armorItems.set(integer4, ItemStack.of(jz3.getCompound(integer4)));
+                this.armorItems.set(integer4, ItemStack.of(lk3.getCompound(integer4)));
             }
         }
-        if (jt.contains("HandItems", 9)) {
-            final ListTag jz3 = jt.getList("HandItems", 10);
+        if (le.contains("HandItems", 9)) {
+            final ListTag lk3 = le.getList("HandItems", 10);
             for (int integer4 = 0; integer4 < this.handItems.size(); ++integer4) {
-                this.handItems.set(integer4, ItemStack.of(jz3.getCompound(integer4)));
+                this.handItems.set(integer4, ItemStack.of(lk3.getCompound(integer4)));
             }
         }
-        this.setInvisible(jt.getBoolean("Invisible"));
-        this.setSmall(jt.getBoolean("Small"));
-        this.setShowArms(jt.getBoolean("ShowArms"));
-        this.disabledSlots = jt.getInt("DisabledSlots");
-        this.setNoBasePlate(jt.getBoolean("NoBasePlate"));
-        this.setMarker(jt.getBoolean("Marker"));
+        this.setInvisible(le.getBoolean("Invisible"));
+        this.setSmall(le.getBoolean("Small"));
+        this.setShowArms(le.getBoolean("ShowArms"));
+        this.disabledSlots = le.getInt("DisabledSlots");
+        this.setNoBasePlate(le.getBoolean("NoBasePlate"));
+        this.setMarker(le.getBoolean("Marker"));
         this.noPhysics = !this.hasPhysics();
-        final CompoundTag jt2 = jt.getCompound("Pose");
-        this.readPose(jt2);
+        final CompoundTag le2 = le.getCompound("Pose");
+        this.readPose(le2);
     }
     
-    private void readPose(final CompoundTag jt) {
-        final ListTag jz3 = jt.getList("Head", 5);
-        this.setHeadPose(jz3.isEmpty() ? ArmorStand.DEFAULT_HEAD_POSE : new Rotations(jz3));
-        final ListTag jz4 = jt.getList("Body", 5);
-        this.setBodyPose(jz4.isEmpty() ? ArmorStand.DEFAULT_BODY_POSE : new Rotations(jz4));
-        final ListTag jz5 = jt.getList("LeftArm", 5);
-        this.setLeftArmPose(jz5.isEmpty() ? ArmorStand.DEFAULT_LEFT_ARM_POSE : new Rotations(jz5));
-        final ListTag jz6 = jt.getList("RightArm", 5);
-        this.setRightArmPose(jz6.isEmpty() ? ArmorStand.DEFAULT_RIGHT_ARM_POSE : new Rotations(jz6));
-        final ListTag jz7 = jt.getList("LeftLeg", 5);
-        this.setLeftLegPose(jz7.isEmpty() ? ArmorStand.DEFAULT_LEFT_LEG_POSE : new Rotations(jz7));
-        final ListTag jz8 = jt.getList("RightLeg", 5);
-        this.setRightLegPose(jz8.isEmpty() ? ArmorStand.DEFAULT_RIGHT_LEG_POSE : new Rotations(jz8));
+    private void readPose(final CompoundTag le) {
+        final ListTag lk3 = le.getList("Head", 5);
+        this.setHeadPose(lk3.isEmpty() ? ArmorStand.DEFAULT_HEAD_POSE : new Rotations(lk3));
+        final ListTag lk4 = le.getList("Body", 5);
+        this.setBodyPose(lk4.isEmpty() ? ArmorStand.DEFAULT_BODY_POSE : new Rotations(lk4));
+        final ListTag lk5 = le.getList("LeftArm", 5);
+        this.setLeftArmPose(lk5.isEmpty() ? ArmorStand.DEFAULT_LEFT_ARM_POSE : new Rotations(lk5));
+        final ListTag lk6 = le.getList("RightArm", 5);
+        this.setRightArmPose(lk6.isEmpty() ? ArmorStand.DEFAULT_RIGHT_ARM_POSE : new Rotations(lk6));
+        final ListTag lk7 = le.getList("LeftLeg", 5);
+        this.setLeftLegPose(lk7.isEmpty() ? ArmorStand.DEFAULT_LEFT_LEG_POSE : new Rotations(lk7));
+        final ListTag lk8 = le.getList("RightLeg", 5);
+        this.setRightLegPose(lk8.isEmpty() ? ArmorStand.DEFAULT_RIGHT_LEG_POSE : new Rotations(lk8));
     }
     
     private CompoundTag writePose() {
-        final CompoundTag jt2 = new CompoundTag();
+        final CompoundTag le2 = new CompoundTag();
         if (!ArmorStand.DEFAULT_HEAD_POSE.equals(this.headPose)) {
-            jt2.put("Head", this.headPose.save());
+            le2.put("Head", this.headPose.save());
         }
         if (!ArmorStand.DEFAULT_BODY_POSE.equals(this.bodyPose)) {
-            jt2.put("Body", this.bodyPose.save());
+            le2.put("Body", this.bodyPose.save());
         }
         if (!ArmorStand.DEFAULT_LEFT_ARM_POSE.equals(this.leftArmPose)) {
-            jt2.put("LeftArm", this.leftArmPose.save());
+            le2.put("LeftArm", this.leftArmPose.save());
         }
         if (!ArmorStand.DEFAULT_RIGHT_ARM_POSE.equals(this.rightArmPose)) {
-            jt2.put("RightArm", this.rightArmPose.save());
+            le2.put("RightArm", this.rightArmPose.save());
         }
         if (!ArmorStand.DEFAULT_LEFT_LEG_POSE.equals(this.leftLegPose)) {
-            jt2.put("LeftLeg", this.leftLegPose.save());
+            le2.put("LeftLeg", this.leftLegPose.save());
         }
         if (!ArmorStand.DEFAULT_RIGHT_LEG_POSE.equals(this.rightLegPose)) {
-            jt2.put("RightLeg", this.rightLegPose.save());
+            le2.put("RightLeg", this.rightLegPose.save());
         }
-        return jt2;
+        return le2;
     }
     
     @Override
@@ -298,150 +297,150 @@ public class ArmorStand extends LivingEntity {
     }
     
     @Override
-    protected void doPush(final Entity akq) {
+    protected void doPush(final Entity aom) {
     }
     
     @Override
     protected void pushEntities() {
         final List<Entity> list2 = this.level.getEntities(this, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS);
         for (int integer3 = 0; integer3 < list2.size(); ++integer3) {
-            final Entity akq4 = list2.get(integer3);
-            if (this.distanceToSqr(akq4) <= 0.2) {
-                akq4.push(this);
+            final Entity aom4 = list2.get(integer3);
+            if (this.distanceToSqr(aom4) <= 0.2) {
+                aom4.push(this);
             }
         }
     }
     
     @Override
-    public InteractionResult interactAt(final Player ayj, final Vec3 cvl, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        if (this.isMarker() || ben5.getItem() == Items.NAME_TAG) {
+    public InteractionResult interactAt(final Player bec, final Vec3 dem, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        if (this.isMarker() || bki5.getItem() == Items.NAME_TAG) {
             return InteractionResult.PASS;
         }
-        if (ayj.isSpectator()) {
+        if (bec.isSpectator()) {
             return InteractionResult.SUCCESS;
         }
-        if (ayj.level.isClientSide) {
+        if (bec.level.isClientSide) {
             return InteractionResult.CONSUME;
         }
-        final EquipmentSlot akv6 = Mob.getEquipmentSlotForItem(ben5);
-        if (ben5.isEmpty()) {
-            final EquipmentSlot akv7 = this.getClickedSlot(cvl);
-            final EquipmentSlot akv8 = this.isDisabled(akv7) ? akv6 : akv7;
-            if (this.hasItemInSlot(akv8) && this.swapItem(ayj, akv8, ben5, ajk)) {
+        final EquipmentSlot aor6 = Mob.getEquipmentSlotForItem(bki5);
+        if (bki5.isEmpty()) {
+            final EquipmentSlot aor7 = this.getClickedSlot(dem);
+            final EquipmentSlot aor8 = this.isDisabled(aor7) ? aor6 : aor7;
+            if (this.hasItemInSlot(aor8) && this.swapItem(bec, aor8, bki5, anf)) {
                 return InteractionResult.SUCCESS;
             }
         }
         else {
-            if (this.isDisabled(akv6)) {
+            if (this.isDisabled(aor6)) {
                 return InteractionResult.FAIL;
             }
-            if (akv6.getType() == EquipmentSlot.Type.HAND && !this.isShowArms()) {
+            if (aor6.getType() == EquipmentSlot.Type.HAND && !this.isShowArms()) {
                 return InteractionResult.FAIL;
             }
-            if (this.swapItem(ayj, akv6, ben5, ajk)) {
+            if (this.swapItem(bec, aor6, bki5, anf)) {
                 return InteractionResult.SUCCESS;
             }
         }
         return InteractionResult.PASS;
     }
     
-    private EquipmentSlot getClickedSlot(final Vec3 cvl) {
-        EquipmentSlot akv3 = EquipmentSlot.MAINHAND;
+    private EquipmentSlot getClickedSlot(final Vec3 dem) {
+        EquipmentSlot aor3 = EquipmentSlot.MAINHAND;
         final boolean boolean4 = this.isSmall();
-        final double double5 = boolean4 ? (cvl.y * 2.0) : cvl.y;
-        final EquipmentSlot akv4 = EquipmentSlot.FEET;
-        if (double5 >= 0.1 && double5 < 0.1 + (boolean4 ? 0.8 : 0.45) && this.hasItemInSlot(akv4)) {
-            akv3 = EquipmentSlot.FEET;
+        final double double5 = boolean4 ? (dem.y * 2.0) : dem.y;
+        final EquipmentSlot aor4 = EquipmentSlot.FEET;
+        if (double5 >= 0.1 && double5 < 0.1 + (boolean4 ? 0.8 : 0.45) && this.hasItemInSlot(aor4)) {
+            aor3 = EquipmentSlot.FEET;
         }
         else if (double5 >= 0.9 + (boolean4 ? 0.3 : 0.0) && double5 < 0.9 + (boolean4 ? 1.0 : 0.7) && this.hasItemInSlot(EquipmentSlot.CHEST)) {
-            akv3 = EquipmentSlot.CHEST;
+            aor3 = EquipmentSlot.CHEST;
         }
         else if (double5 >= 0.4 && double5 < 0.4 + (boolean4 ? 1.0 : 0.8) && this.hasItemInSlot(EquipmentSlot.LEGS)) {
-            akv3 = EquipmentSlot.LEGS;
+            aor3 = EquipmentSlot.LEGS;
         }
         else if (double5 >= 1.6 && this.hasItemInSlot(EquipmentSlot.HEAD)) {
-            akv3 = EquipmentSlot.HEAD;
+            aor3 = EquipmentSlot.HEAD;
         }
         else if (!this.hasItemInSlot(EquipmentSlot.MAINHAND) && this.hasItemInSlot(EquipmentSlot.OFFHAND)) {
-            akv3 = EquipmentSlot.OFFHAND;
+            aor3 = EquipmentSlot.OFFHAND;
         }
-        return akv3;
+        return aor3;
     }
     
-    private boolean isDisabled(final EquipmentSlot akv) {
-        return (this.disabledSlots & 1 << akv.getFilterFlag()) != 0x0 || (akv.getType() == EquipmentSlot.Type.HAND && !this.isShowArms());
+    private boolean isDisabled(final EquipmentSlot aor) {
+        return (this.disabledSlots & 1 << aor.getFilterFlag()) != 0x0 || (aor.getType() == EquipmentSlot.Type.HAND && !this.isShowArms());
     }
     
-    private boolean swapItem(final Player ayj, final EquipmentSlot akv, final ItemStack ben, final InteractionHand ajk) {
-        final ItemStack ben2 = this.getItemBySlot(akv);
-        if (!ben2.isEmpty() && (this.disabledSlots & 1 << akv.getFilterFlag() + 8) != 0x0) {
+    private boolean swapItem(final Player bec, final EquipmentSlot aor, final ItemStack bki, final InteractionHand anf) {
+        final ItemStack bki2 = this.getItemBySlot(aor);
+        if (!bki2.isEmpty() && (this.disabledSlots & 1 << aor.getFilterFlag() + 8) != 0x0) {
             return false;
         }
-        if (ben2.isEmpty() && (this.disabledSlots & 1 << akv.getFilterFlag() + 16) != 0x0) {
+        if (bki2.isEmpty() && (this.disabledSlots & 1 << aor.getFilterFlag() + 16) != 0x0) {
             return false;
         }
-        if (ayj.abilities.instabuild && ben2.isEmpty() && !ben.isEmpty()) {
-            final ItemStack ben3 = ben.copy();
-            ben3.setCount(1);
-            this.setItemSlot(akv, ben3);
+        if (bec.abilities.instabuild && bki2.isEmpty() && !bki.isEmpty()) {
+            final ItemStack bki3 = bki.copy();
+            bki3.setCount(1);
+            this.setItemSlot(aor, bki3);
             return true;
         }
-        if (ben.isEmpty() || ben.getCount() <= 1) {
-            this.setItemSlot(akv, ben);
-            ayj.setItemInHand(ajk, ben2);
+        if (bki.isEmpty() || bki.getCount() <= 1) {
+            this.setItemSlot(aor, bki);
+            bec.setItemInHand(anf, bki2);
             return true;
         }
-        if (!ben2.isEmpty()) {
+        if (!bki2.isEmpty()) {
             return false;
         }
-        final ItemStack ben3 = ben.copy();
-        ben3.setCount(1);
-        this.setItemSlot(akv, ben3);
-        ben.shrink(1);
+        final ItemStack bki3 = bki.copy();
+        bki3.setCount(1);
+        this.setItemSlot(aor, bki3);
+        bki.shrink(1);
         return true;
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         if (this.level.isClientSide || this.removed) {
             return false;
         }
-        if (DamageSource.OUT_OF_WORLD.equals(ajz)) {
+        if (DamageSource.OUT_OF_WORLD.equals(anw)) {
             this.remove();
             return false;
         }
-        if (this.isInvulnerableTo(ajz) || this.invisible || this.isMarker()) {
+        if (this.isInvulnerableTo(anw) || this.invisible || this.isMarker()) {
             return false;
         }
-        if (ajz.isExplosion()) {
-            this.brokenByAnything(ajz);
+        if (anw.isExplosion()) {
+            this.brokenByAnything(anw);
             this.remove();
             return false;
         }
-        if (DamageSource.IN_FIRE.equals(ajz)) {
+        if (DamageSource.IN_FIRE.equals(anw)) {
             if (this.isOnFire()) {
-                this.causeDamage(ajz, 0.15f);
+                this.causeDamage(anw, 0.15f);
             }
             else {
                 this.setSecondsOnFire(5);
             }
             return false;
         }
-        if (DamageSource.ON_FIRE.equals(ajz) && this.getHealth() > 0.5f) {
-            this.causeDamage(ajz, 4.0f);
+        if (DamageSource.ON_FIRE.equals(anw) && this.getHealth() > 0.5f) {
+            this.causeDamage(anw, 4.0f);
             return false;
         }
-        final boolean boolean4 = ajz.getDirectEntity() instanceof AbstractArrow;
-        final boolean boolean5 = boolean4 && ((AbstractArrow)ajz.getDirectEntity()).getPierceLevel() > 0;
-        final boolean boolean6 = "player".equals(ajz.getMsgId());
+        final boolean boolean4 = anw.getDirectEntity() instanceof AbstractArrow;
+        final boolean boolean5 = boolean4 && ((AbstractArrow)anw.getDirectEntity()).getPierceLevel() > 0;
+        final boolean boolean6 = "player".equals(anw.getMsgId());
         if (!boolean6 && !boolean4) {
             return false;
         }
-        if (ajz.getEntity() instanceof Player && !((Player)ajz.getEntity()).abilities.mayBuild) {
+        if (anw.getEntity() instanceof Player && !((Player)anw.getEntity()).abilities.mayBuild) {
             return false;
         }
-        if (ajz.isCreativePlayer()) {
+        if (anw.isCreativePlayer()) {
             this.playBrokenSound();
             this.showBreakingParticles();
             this.remove();
@@ -449,7 +448,7 @@ public class ArmorStand extends LivingEntity {
         }
         final long long7 = this.level.getGameTime();
         if (long7 - this.lastHit <= 5L || boolean4) {
-            this.brokenByPlayer(ajz);
+            this.brokenByPlayer(anw);
             this.showBreakingParticles();
             this.remove();
         }
@@ -489,11 +488,11 @@ public class ArmorStand extends LivingEntity {
         }
     }
     
-    private void causeDamage(final DamageSource ajz, final float float2) {
+    private void causeDamage(final DamageSource anw, final float float2) {
         float float3 = this.getHealth();
         float3 -= float2;
         if (float3 <= 0.5f) {
-            this.brokenByAnything(ajz);
+            this.brokenByAnything(anw);
             this.remove();
         }
         else {
@@ -501,25 +500,25 @@ public class ArmorStand extends LivingEntity {
         }
     }
     
-    private void brokenByPlayer(final DamageSource ajz) {
-        Block.popResource(this.level, new BlockPos(this), new ItemStack(Items.ARMOR_STAND));
-        this.brokenByAnything(ajz);
+    private void brokenByPlayer(final DamageSource anw) {
+        Block.popResource(this.level, this.blockPosition(), new ItemStack(Items.ARMOR_STAND));
+        this.brokenByAnything(anw);
     }
     
-    private void brokenByAnything(final DamageSource ajz) {
+    private void brokenByAnything(final DamageSource anw) {
         this.playBrokenSound();
-        this.dropAllDeathLoot(ajz);
+        this.dropAllDeathLoot(anw);
         for (int integer3 = 0; integer3 < this.handItems.size(); ++integer3) {
-            final ItemStack ben4 = this.handItems.get(integer3);
-            if (!ben4.isEmpty()) {
-                Block.popResource(this.level, new BlockPos(this).above(), ben4);
+            final ItemStack bki4 = this.handItems.get(integer3);
+            if (!bki4.isEmpty()) {
+                Block.popResource(this.level, this.blockPosition().above(), bki4);
                 this.handItems.set(integer3, ItemStack.EMPTY);
             }
         }
         for (int integer3 = 0; integer3 < this.armorItems.size(); ++integer3) {
-            final ItemStack ben4 = this.armorItems.get(integer3);
-            if (!ben4.isEmpty()) {
-                Block.popResource(this.level, new BlockPos(this).above(), ben4);
+            final ItemStack bki4 = this.armorItems.get(integer3);
+            if (!bki4.isEmpty()) {
+                Block.popResource(this.level, this.blockPosition().above(), bki4);
                 this.armorItems.set(integer3, ItemStack.EMPTY);
             }
         }
@@ -537,21 +536,21 @@ public class ArmorStand extends LivingEntity {
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height * (this.isBaby() ? 0.5f : 0.9f);
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height * (this.isBaby() ? 0.5f : 0.9f);
     }
     
     @Override
-    public double getRidingHeight() {
+    public double getMyRidingOffset() {
         return this.isMarker() ? 0.0 : 0.10000000149011612;
     }
     
     @Override
-    public void travel(final Vec3 cvl) {
+    public void travel(final Vec3 dem) {
         if (!this.hasPhysics()) {
             return;
         }
-        super.travel(cvl);
+        super.travel(dem);
     }
     
     @Override
@@ -573,29 +572,29 @@ public class ArmorStand extends LivingEntity {
     @Override
     public void tick() {
         super.tick();
-        final Rotations gc2 = this.entityData.<Rotations>get(ArmorStand.DATA_HEAD_POSE);
-        if (!this.headPose.equals(gc2)) {
-            this.setHeadPose(gc2);
+        final Rotations gn2 = this.entityData.<Rotations>get(ArmorStand.DATA_HEAD_POSE);
+        if (!this.headPose.equals(gn2)) {
+            this.setHeadPose(gn2);
         }
-        final Rotations gc3 = this.entityData.<Rotations>get(ArmorStand.DATA_BODY_POSE);
-        if (!this.bodyPose.equals(gc3)) {
-            this.setBodyPose(gc3);
+        final Rotations gn3 = this.entityData.<Rotations>get(ArmorStand.DATA_BODY_POSE);
+        if (!this.bodyPose.equals(gn3)) {
+            this.setBodyPose(gn3);
         }
-        final Rotations gc4 = this.entityData.<Rotations>get(ArmorStand.DATA_LEFT_ARM_POSE);
-        if (!this.leftArmPose.equals(gc4)) {
-            this.setLeftArmPose(gc4);
+        final Rotations gn4 = this.entityData.<Rotations>get(ArmorStand.DATA_LEFT_ARM_POSE);
+        if (!this.leftArmPose.equals(gn4)) {
+            this.setLeftArmPose(gn4);
         }
-        final Rotations gc5 = this.entityData.<Rotations>get(ArmorStand.DATA_RIGHT_ARM_POSE);
-        if (!this.rightArmPose.equals(gc5)) {
-            this.setRightArmPose(gc5);
+        final Rotations gn5 = this.entityData.<Rotations>get(ArmorStand.DATA_RIGHT_ARM_POSE);
+        if (!this.rightArmPose.equals(gn5)) {
+            this.setRightArmPose(gn5);
         }
-        final Rotations gc6 = this.entityData.<Rotations>get(ArmorStand.DATA_LEFT_LEG_POSE);
-        if (!this.leftLegPose.equals(gc6)) {
-            this.setLeftLegPose(gc6);
+        final Rotations gn6 = this.entityData.<Rotations>get(ArmorStand.DATA_LEFT_LEG_POSE);
+        if (!this.leftLegPose.equals(gn6)) {
+            this.setLeftLegPose(gn6);
         }
-        final Rotations gc7 = this.entityData.<Rotations>get(ArmorStand.DATA_RIGHT_LEG_POSE);
-        if (!this.rightLegPose.equals(gc7)) {
-            this.setRightLegPose(gc7);
+        final Rotations gn7 = this.entityData.<Rotations>get(ArmorStand.DATA_RIGHT_LEG_POSE);
+        if (!this.rightLegPose.equals(gn7)) {
+            this.setRightLegPose(gn7);
         }
     }
     
@@ -674,34 +673,34 @@ public class ArmorStand extends LivingEntity {
         return byte1;
     }
     
-    public void setHeadPose(final Rotations gc) {
-        this.headPose = gc;
-        this.entityData.<Rotations>set(ArmorStand.DATA_HEAD_POSE, gc);
+    public void setHeadPose(final Rotations gn) {
+        this.headPose = gn;
+        this.entityData.<Rotations>set(ArmorStand.DATA_HEAD_POSE, gn);
     }
     
-    public void setBodyPose(final Rotations gc) {
-        this.bodyPose = gc;
-        this.entityData.<Rotations>set(ArmorStand.DATA_BODY_POSE, gc);
+    public void setBodyPose(final Rotations gn) {
+        this.bodyPose = gn;
+        this.entityData.<Rotations>set(ArmorStand.DATA_BODY_POSE, gn);
     }
     
-    public void setLeftArmPose(final Rotations gc) {
-        this.leftArmPose = gc;
-        this.entityData.<Rotations>set(ArmorStand.DATA_LEFT_ARM_POSE, gc);
+    public void setLeftArmPose(final Rotations gn) {
+        this.leftArmPose = gn;
+        this.entityData.<Rotations>set(ArmorStand.DATA_LEFT_ARM_POSE, gn);
     }
     
-    public void setRightArmPose(final Rotations gc) {
-        this.rightArmPose = gc;
-        this.entityData.<Rotations>set(ArmorStand.DATA_RIGHT_ARM_POSE, gc);
+    public void setRightArmPose(final Rotations gn) {
+        this.rightArmPose = gn;
+        this.entityData.<Rotations>set(ArmorStand.DATA_RIGHT_ARM_POSE, gn);
     }
     
-    public void setLeftLegPose(final Rotations gc) {
-        this.leftLegPose = gc;
-        this.entityData.<Rotations>set(ArmorStand.DATA_LEFT_LEG_POSE, gc);
+    public void setLeftLegPose(final Rotations gn) {
+        this.leftLegPose = gn;
+        this.entityData.<Rotations>set(ArmorStand.DATA_LEFT_LEG_POSE, gn);
     }
     
-    public void setRightLegPose(final Rotations gc) {
-        this.rightLegPose = gc;
-        this.entityData.<Rotations>set(ArmorStand.DATA_RIGHT_LEG_POSE, gc);
+    public void setRightLegPose(final Rotations gn) {
+        this.rightLegPose = gn;
+        this.entityData.<Rotations>set(ArmorStand.DATA_RIGHT_LEG_POSE, gn);
     }
     
     public Rotations getHeadPose() {
@@ -734,8 +733,8 @@ public class ArmorStand extends LivingEntity {
     }
     
     @Override
-    public boolean skipAttackInteraction(final Entity akq) {
-        return akq instanceof Player && !this.level.mayInteract((Player)akq, new BlockPos(this));
+    public boolean skipAttackInteraction(final Entity aom) {
+        return aom instanceof Player && !this.level.mayInteract((Player)aom, this.blockPosition());
     }
     
     @Override
@@ -750,7 +749,7 @@ public class ArmorStand extends LivingEntity {
     
     @Nullable
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.ARMOR_STAND_HIT;
     }
     
@@ -761,7 +760,7 @@ public class ArmorStand extends LivingEntity {
     }
     
     @Override
-    public void thunderHit(final LightningBolt avy) {
+    public void thunderHit(final LightningBolt aox) {
     }
     
     @Override
@@ -770,12 +769,12 @@ public class ArmorStand extends LivingEntity {
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (ArmorStand.DATA_CLIENT_FLAGS.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (ArmorStand.DATA_CLIENT_FLAGS.equals(tq)) {
             this.refreshDimensions();
             this.blocksBuilding = !this.isMarker();
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     @Override
@@ -784,7 +783,7 @@ public class ArmorStand extends LivingEntity {
     }
     
     @Override
-    public EntityDimensions getDimensions(final Pose alj) {
+    public EntityDimensions getDimensions(final Pose apj) {
         final float float3 = this.isMarker() ? 0.0f : (this.isBaby() ? 0.5f : 1.0f);
         return this.getType().getDimensions().scale(float3);
     }
@@ -803,6 +802,6 @@ public class ArmorStand extends LivingEntity {
         DATA_RIGHT_ARM_POSE = SynchedEntityData.<Rotations>defineId(ArmorStand.class, EntityDataSerializers.ROTATIONS);
         DATA_LEFT_LEG_POSE = SynchedEntityData.<Rotations>defineId(ArmorStand.class, EntityDataSerializers.ROTATIONS);
         DATA_RIGHT_LEG_POSE = SynchedEntityData.<Rotations>defineId(ArmorStand.class, EntityDataSerializers.ROTATIONS);
-        RIDABLE_MINECARTS = (akq -> akq instanceof AbstractMinecart && akq.getMinecartType() == AbstractMinecart.Type.RIDEABLE);
+        RIDABLE_MINECARTS = (aom -> aom instanceof AbstractMinecart && aom.getMinecartType() == AbstractMinecart.Type.RIDEABLE);
     }
 }
diff --git a/src/net/minecraft/world/entity/decoration/HangingEntity.java b/src/net/minecraft/world/entity/decoration/HangingEntity.java
index 282b5f6..44055f3 100644
--- a/src/net/minecraft/world/entity/decoration/HangingEntity.java
+++ b/src/net/minecraft/world/entity/decoration/HangingEntity.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.entity.decoration;
 
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.world.entity.LightningBolt;
 import net.minecraft.world.level.block.Mirror;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.Rotation;
@@ -30,24 +30,24 @@ public abstract class HangingEntity extends Entity {
     protected BlockPos pos;
     protected Direction direction;
     
-    protected HangingEntity(final EntityType<? extends HangingEntity> aku, final Level bjw) {
-        super(aku, bjw);
+    protected HangingEntity(final EntityType<? extends HangingEntity> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.direction = Direction.SOUTH;
     }
     
-    protected HangingEntity(final EntityType<? extends HangingEntity> aku, final Level bjw, final BlockPos fk) {
-        this(aku, bjw);
-        this.pos = fk;
+    protected HangingEntity(final EntityType<? extends HangingEntity> aoq, final Level bqb, final BlockPos fu) {
+        this(aoq, bqb);
+        this.pos = fu;
     }
     
     @Override
     protected void defineSynchedData() {
     }
     
-    protected void setDirection(final Direction fp) {
-        Validate.notNull(fp);
-        Validate.isTrue(fp.getAxis().isHorizontal());
-        this.direction = fp;
+    protected void setDirection(final Direction fz) {
+        Validate.notNull(fz);
+        Validate.isTrue(fz.getAxis().isHorizontal());
+        this.direction = fz;
         this.yRot = (float)(this.direction.get2DDataValue() * 90);
         this.yRotO = this.yRot;
         this.recalculateBoundingBox();
@@ -66,9 +66,9 @@ public abstract class HangingEntity extends Entity {
         double2 -= this.direction.getStepX() * 0.46875;
         double4 -= this.direction.getStepZ() * 0.46875;
         double3 += double7;
-        final Direction fp14 = this.direction.getCounterClockWise();
-        double2 += double6 * fp14.getStepX();
-        double4 += double6 * fp14.getStepZ();
+        final Direction fz14 = this.direction.getCounterClockWise();
+        double2 += double6 * fz14.getStepX();
+        double4 += double6 * fz14.getStepZ();
         this.setPosRaw(double2, double3, double4);
         double double8 = this.getWidth();
         double double9 = this.getHeight();
@@ -91,11 +91,16 @@ public abstract class HangingEntity extends Entity {
     
     @Override
     public void tick() {
-        if (this.checkInterval++ == 100 && !this.level.isClientSide) {
-            this.checkInterval = 0;
-            if (!this.removed && !this.survives()) {
-                this.remove();
-                this.dropItem(null);
+        if (!this.level.isClientSide) {
+            if (this.getY() < -64.0) {
+                this.outOfWorld();
+            }
+            if (this.checkInterval++ == 100) {
+                this.checkInterval = 0;
+                if (!this.removed && !this.survives()) {
+                    this.remove();
+                    this.dropItem(null);
+                }
             }
         }
     }
@@ -106,16 +111,16 @@ public abstract class HangingEntity extends Entity {
         }
         final int integer2 = Math.max(1, this.getWidth() / 16);
         final int integer3 = Math.max(1, this.getHeight() / 16);
-        final BlockPos fk4 = this.pos.relative(this.direction.getOpposite());
-        final Direction fp5 = this.direction.getCounterClockWise();
+        final BlockPos fu4 = this.pos.relative(this.direction.getOpposite());
+        final Direction fz5 = this.direction.getCounterClockWise();
         final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
         for (int integer4 = 0; integer4 < integer2; ++integer4) {
             for (int integer5 = 0; integer5 < integer3; ++integer5) {
                 final int integer6 = (integer2 - 1) / -2;
                 final int integer7 = (integer3 - 1) / -2;
-                a6.set(fk4).move(fp5, integer4 + integer6).move(Direction.UP, integer5 + integer7);
-                final BlockState byj11 = this.level.getBlockState(a6);
-                if (!byj11.getMaterial().isSolid() && !DiodeBlock.isDiode(byj11)) {
+                a6.set(fu4).move(fz5, integer4 + integer6).move(Direction.UP, integer5 + integer7);
+                final BlockState cfj11 = this.level.getBlockState(a6);
+                if (!cfj11.getMaterial().isSolid() && !DiodeBlock.isDiode(cfj11)) {
                     return false;
                 }
             }
@@ -129,10 +134,10 @@ public abstract class HangingEntity extends Entity {
     }
     
     @Override
-    public boolean skipAttackInteraction(final Entity akq) {
-        if (akq instanceof Player) {
-            final Player ayj3 = (Player)akq;
-            return !this.level.mayInteract(ayj3, this.pos) || this.hurt(DamageSource.playerAttack(ayj3), 0.0f);
+    public boolean skipAttackInteraction(final Entity aom) {
+        if (aom instanceof Player) {
+            final Player bec3 = (Player)aom;
+            return !this.level.mayInteract(bec3, this.pos) || this.hurt(DamageSource.playerAttack(bec3), 0.0f);
         }
         return false;
     }
@@ -143,21 +148,21 @@ public abstract class HangingEntity extends Entity {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
         if (!this.removed && !this.level.isClientSide) {
             this.remove();
             this.markHurt();
-            this.dropItem(ajz.getEntity());
+            this.dropItem(anw.getEntity());
         }
         return true;
     }
     
     @Override
-    public void move(final MoverType ale, final Vec3 cvl) {
-        if (!this.level.isClientSide && !this.removed && cvl.lengthSqr() > 0.0) {
+    public void move(final MoverType apd, final Vec3 dem) {
+        if (!this.level.isClientSide && !this.removed && dem.lengthSqr() > 0.0) {
             this.remove();
             this.dropItem(null);
         }
@@ -171,33 +176,33 @@ public abstract class HangingEntity extends Entity {
         }
     }
     
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putByte("Facing", (byte)this.direction.get2DDataValue());
-        final BlockPos fk3 = this.getPos();
-        jt.putInt("TileX", fk3.getX());
-        jt.putInt("TileY", fk3.getY());
-        jt.putInt("TileZ", fk3.getZ());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        le.putByte("Facing", (byte)this.direction.get2DDataValue());
+        final BlockPos fu3 = this.getPos();
+        le.putInt("TileX", fu3.getX());
+        le.putInt("TileY", fu3.getY());
+        le.putInt("TileZ", fu3.getZ());
     }
     
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        this.pos = new BlockPos(jt.getInt("TileX"), jt.getInt("TileY"), jt.getInt("TileZ"));
-        this.direction = Direction.from2DDataValue(jt.getByte("Facing"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        this.pos = new BlockPos(le.getInt("TileX"), le.getInt("TileY"), le.getInt("TileZ"));
+        this.direction = Direction.from2DDataValue(le.getByte("Facing"));
     }
     
     public abstract int getWidth();
     
     public abstract int getHeight();
     
-    public abstract void dropItem(@Nullable final Entity akq);
+    public abstract void dropItem(@Nullable final Entity aom);
     
     public abstract void playPlacementSound();
     
     @Override
-    public ItemEntity spawnAtLocation(final ItemStack ben, final float float2) {
-        final ItemEntity awb4 = new ItemEntity(this.level, this.getX() + this.direction.getStepX() * 0.15f, this.getY() + float2, this.getZ() + this.direction.getStepZ() * 0.15f, ben);
-        awb4.setDefaultPickUpDelay();
-        this.level.addFreshEntity(awb4);
-        return awb4;
+    public ItemEntity spawnAtLocation(final ItemStack bki, final float float2) {
+        final ItemEntity bbg4 = new ItemEntity(this.level, this.getX() + this.direction.getStepX() * 0.15f, this.getY() + float2, this.getZ() + this.direction.getStepZ() * 0.15f, bki);
+        bbg4.setDefaultPickUpDelay();
+        this.level.addFreshEntity(bbg4);
+        return bbg4;
     }
     
     @Override
@@ -217,9 +222,9 @@ public abstract class HangingEntity extends Entity {
     }
     
     @Override
-    public float rotate(final Rotation btu) {
+    public float rotate(final Rotation cap) {
         if (this.direction.getAxis() != Direction.Axis.Y) {
-            switch (btu) {
+            switch (cap) {
                 case CLOCKWISE_180: {
                     this.direction = this.direction.getOpposite();
                     break;
@@ -235,7 +240,7 @@ public abstract class HangingEntity extends Entity {
             }
         }
         final float float3 = Mth.wrapDegrees(this.yRot);
-        switch (btu) {
+        switch (cap) {
             case CLOCKWISE_180: {
                 return float3 + 180.0f;
             }
@@ -252,12 +257,12 @@ public abstract class HangingEntity extends Entity {
     }
     
     @Override
-    public float mirror(final Mirror bsu) {
-        return this.rotate(bsu.getRotation(this.direction));
+    public float mirror(final Mirror bzj) {
+        return this.rotate(bzj.getRotation(this.direction));
     }
     
     @Override
-    public void thunderHit(final LightningBolt avy) {
+    public void thunderHit(final LightningBolt aox) {
     }
     
     @Override
@@ -265,6 +270,6 @@ public abstract class HangingEntity extends Entity {
     }
     
     static {
-        HANGING_ENTITY = (akq -> akq instanceof HangingEntity);
+        HANGING_ENTITY = (aom -> aom instanceof HangingEntity);
     }
 }
diff --git a/src/net/minecraft/world/entity/decoration/ItemFrame.java b/src/net/minecraft/world/entity/decoration/ItemFrame.java
index 95ebc92..9ebaa83 100644
--- a/src/net/minecraft/world/entity/decoration/ItemFrame.java
+++ b/src/net/minecraft/world/entity/decoration/ItemFrame.java
@@ -5,6 +5,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.Packet;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
@@ -18,6 +19,8 @@ import net.minecraft.world.level.GameRules;
 import javax.annotation.Nullable;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.MoverType;
 import net.minecraft.world.level.block.state.BlockState;
 import java.util.function.Predicate;
 import net.minecraft.world.level.block.DiodeBlock;
@@ -39,20 +42,21 @@ public class ItemFrame extends HangingEntity {
     private static final EntityDataAccessor<ItemStack> DATA_ITEM;
     private static final EntityDataAccessor<Integer> DATA_ROTATION;
     private float dropChance;
+    private boolean fixed;
     
-    public ItemFrame(final EntityType<? extends ItemFrame> aku, final Level bjw) {
-        super(aku, bjw);
+    public ItemFrame(final EntityType<? extends ItemFrame> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.dropChance = 1.0f;
     }
     
-    public ItemFrame(final Level bjw, final BlockPos fk, final Direction fp) {
-        super(EntityType.ITEM_FRAME, bjw, fk);
+    public ItemFrame(final Level bqb, final BlockPos fu, final Direction fz) {
+        super(EntityType.ITEM_FRAME, bqb, fu);
         this.dropChance = 1.0f;
-        this.setDirection(fp);
+        this.setDirection(fz);
     }
     
     @Override
-    protected float getEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 0.0f;
     }
     
@@ -63,15 +67,15 @@ public class ItemFrame extends HangingEntity {
     }
     
     @Override
-    protected void setDirection(final Direction fp) {
-        Validate.notNull(fp);
-        this.direction = fp;
-        if (fp.getAxis().isHorizontal()) {
+    protected void setDirection(final Direction fz) {
+        Validate.notNull(fz);
+        this.direction = fz;
+        if (fz.getAxis().isHorizontal()) {
             this.xRot = 0.0f;
             this.yRot = (float)(this.direction.get2DDataValue() * 90);
         }
         else {
-            this.xRot = (float)(-90 * fp.getAxisDirection().getStep());
+            this.xRot = (float)(-90 * fz.getAxisDirection().getStep());
             this.yRot = 0.0f;
         }
         this.xRotO = this.xRot;
@@ -115,11 +119,28 @@ public class ItemFrame extends HangingEntity {
     
     @Override
     public boolean survives() {
+        if (this.fixed) {
+            return true;
+        }
         if (!this.level.noCollision(this)) {
             return false;
         }
-        final BlockState byj2 = this.level.getBlockState(this.pos.relative(this.direction.getOpposite()));
-        return (byj2.getMaterial().isSolid() || (this.direction.getAxis().isHorizontal() && DiodeBlock.isDiode(byj2))) && this.level.getEntities(this, this.getBoundingBox(), ItemFrame.HANGING_ENTITY).isEmpty();
+        final BlockState cfj2 = this.level.getBlockState(this.pos.relative(this.direction.getOpposite()));
+        return (cfj2.getMaterial().isSolid() || (this.direction.getAxis().isHorizontal() && DiodeBlock.isDiode(cfj2))) && this.level.getEntities(this, this.getBoundingBox(), ItemFrame.HANGING_ENTITY).isEmpty();
+    }
+    
+    @Override
+    public void move(final MoverType apd, final Vec3 dem) {
+        if (!this.fixed) {
+            super.move(apd, dem);
+        }
+    }
+    
+    @Override
+    public void push(final double double1, final double double2, final double double3) {
+        if (!this.fixed) {
+            super.push(double1, double2, double3);
+        }
     }
     
     @Override
@@ -134,18 +155,21 @@ public class ItemFrame extends HangingEntity {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.fixed) {
+            return (anw == DamageSource.OUT_OF_WORLD || anw.isCreativePlayer()) && super.hurt(anw, float2);
+        }
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        if (!ajz.isExplosion() && !this.getItem().isEmpty()) {
+        if (!anw.isExplosion() && !this.getItem().isEmpty()) {
             if (!this.level.isClientSide) {
-                this.dropItem(ajz.getEntity(), false);
+                this.dropItem(anw.getEntity(), false);
                 this.playSound(SoundEvents.ITEM_FRAME_REMOVE_ITEM, 1.0f, 1.0f);
             }
             return true;
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
@@ -166,9 +190,9 @@ public class ItemFrame extends HangingEntity {
     }
     
     @Override
-    public void dropItem(@Nullable final Entity akq) {
+    public void dropItem(@Nullable final Entity aom) {
         this.playSound(SoundEvents.ITEM_FRAME_BREAK, 1.0f, 1.0f);
-        this.dropItem(akq, true);
+        this.dropItem(aom, true);
     }
     
     @Override
@@ -176,59 +200,62 @@ public class ItemFrame extends HangingEntity {
         this.playSound(SoundEvents.ITEM_FRAME_PLACE, 1.0f, 1.0f);
     }
     
-    private void dropItem(@Nullable final Entity akq, final boolean boolean2) {
+    private void dropItem(@Nullable final Entity aom, final boolean boolean2) {
+        if (this.fixed) {
+            return;
+        }
         if (!this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
-            if (akq == null) {
+            if (aom == null) {
                 this.removeFramedMap(this.getItem());
             }
             return;
         }
-        ItemStack ben4 = this.getItem();
+        ItemStack bki4 = this.getItem();
         this.setItem(ItemStack.EMPTY);
-        if (akq instanceof Player) {
-            final Player ayj5 = (Player)akq;
-            if (ayj5.abilities.instabuild) {
-                this.removeFramedMap(ben4);
+        if (aom instanceof Player) {
+            final Player bec5 = (Player)aom;
+            if (bec5.abilities.instabuild) {
+                this.removeFramedMap(bki4);
                 return;
             }
         }
         if (boolean2) {
             this.spawnAtLocation(Items.ITEM_FRAME);
         }
-        if (!ben4.isEmpty()) {
-            ben4 = ben4.copy();
-            this.removeFramedMap(ben4);
+        if (!bki4.isEmpty()) {
+            bki4 = bki4.copy();
+            this.removeFramedMap(bki4);
             if (this.random.nextFloat() < this.dropChance) {
-                this.spawnAtLocation(ben4);
+                this.spawnAtLocation(bki4);
             }
         }
     }
     
-    private void removeFramedMap(final ItemStack ben) {
-        if (ben.getItem() == Items.FILLED_MAP) {
-            final MapItemSavedData crg3 = MapItem.getOrCreateSavedData(ben, this.level);
-            crg3.removedFromFrame(this.pos, this.getId());
-            crg3.setDirty(true);
+    private void removeFramedMap(final ItemStack bki) {
+        if (bki.getItem() == Items.FILLED_MAP) {
+            final MapItemSavedData czv3 = MapItem.getOrCreateSavedData(bki, this.level);
+            czv3.removedFromFrame(this.pos, this.getId());
+            czv3.setDirty(true);
         }
-        ben.setFramed(null);
+        bki.setEntityRepresentation(null);
     }
     
     public ItemStack getItem() {
         return this.getEntityData().<ItemStack>get(ItemFrame.DATA_ITEM);
     }
     
-    public void setItem(final ItemStack ben) {
-        this.setItem(ben, true);
+    public void setItem(final ItemStack bki) {
+        this.setItem(bki, true);
     }
     
-    public void setItem(ItemStack ben, final boolean boolean2) {
-        if (!ben.isEmpty()) {
-            ben = ben.copy();
-            ben.setCount(1);
-            ben.setFramed(this);
+    public void setItem(ItemStack bki, final boolean boolean2) {
+        if (!bki.isEmpty()) {
+            bki = bki.copy();
+            bki.setCount(1);
+            bki.setEntityRepresentation(this);
         }
-        this.getEntityData().<ItemStack>set(ItemFrame.DATA_ITEM, ben);
-        if (!ben.isEmpty()) {
+        this.getEntityData().<ItemStack>set(ItemFrame.DATA_ITEM, bki);
+        if (!bki.isEmpty()) {
             this.playSound(SoundEvents.ITEM_FRAME_ADD_ITEM, 1.0f, 1.0f);
         }
         if (boolean2 && this.pos != null) {
@@ -237,20 +264,20 @@ public class ItemFrame extends HangingEntity {
     }
     
     @Override
-    public boolean setSlot(final int integer, final ItemStack ben) {
+    public boolean setSlot(final int integer, final ItemStack bki) {
         if (integer == 0) {
-            this.setItem(ben);
+            this.setItem(bki);
             return true;
         }
         return false;
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (sb.equals(ItemFrame.DATA_ITEM)) {
-            final ItemStack ben3 = this.getItem();
-            if (!ben3.isEmpty() && ben3.getFrame() != this) {
-                ben3.setFramed(this);
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (tq.equals(ItemFrame.DATA_ITEM)) {
+            final ItemStack bki3 = this.getItem();
+            if (!bki3.isEmpty() && bki3.getFrame() != this) {
+                bki3.setEntityRepresentation(this);
             }
         }
     }
@@ -271,51 +298,58 @@ public class ItemFrame extends HangingEntity {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         if (!this.getItem().isEmpty()) {
-            jt.put("Item", this.getItem().save(new CompoundTag()));
-            jt.putByte("ItemRotation", (byte)this.getRotation());
-            jt.putFloat("ItemDropChance", this.dropChance);
+            le.put("Item", this.getItem().save(new CompoundTag()));
+            le.putByte("ItemRotation", (byte)this.getRotation());
+            le.putFloat("ItemDropChance", this.dropChance);
         }
-        jt.putByte("Facing", (byte)this.direction.get3DDataValue());
+        le.putByte("Facing", (byte)this.direction.get3DDataValue());
+        le.putBoolean("Invisible", this.isInvisible());
+        le.putBoolean("Fixed", this.fixed);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        final CompoundTag jt2 = jt.getCompound("Item");
-        if (jt2 != null && !jt2.isEmpty()) {
-            final ItemStack ben4 = ItemStack.of(jt2);
-            if (ben4.isEmpty()) {
-                ItemFrame.LOGGER.warn("Unable to load item from: {}", jt2);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        final CompoundTag le2 = le.getCompound("Item");
+        if (le2 != null && !le2.isEmpty()) {
+            final ItemStack bki4 = ItemStack.of(le2);
+            if (bki4.isEmpty()) {
+                ItemFrame.LOGGER.warn("Unable to load item from: {}", le2);
             }
-            final ItemStack ben5 = this.getItem();
-            if (!ben5.isEmpty() && !ItemStack.matches(ben4, ben5)) {
-                this.removeFramedMap(ben5);
+            final ItemStack bki5 = this.getItem();
+            if (!bki5.isEmpty() && !ItemStack.matches(bki4, bki5)) {
+                this.removeFramedMap(bki5);
             }
-            this.setItem(ben4, false);
-            this.setRotation(jt.getByte("ItemRotation"), false);
-            if (jt.contains("ItemDropChance", 99)) {
-                this.dropChance = jt.getFloat("ItemDropChance");
+            this.setItem(bki4, false);
+            this.setRotation(le.getByte("ItemRotation"), false);
+            if (le.contains("ItemDropChance", 99)) {
+                this.dropChance = le.getFloat("ItemDropChance");
             }
         }
-        this.setDirection(Direction.from3DDataValue(jt.getByte("Facing")));
+        this.setDirection(Direction.from3DDataValue(le.getByte("Facing")));
+        this.setInvisible(le.getBoolean("Invisible"));
+        this.fixed = le.getBoolean("Fixed");
     }
     
     @Override
-    public boolean interact(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
+    public InteractionResult interact(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
         final boolean boolean5 = !this.getItem().isEmpty();
-        final boolean boolean6 = !ben4.isEmpty();
+        final boolean boolean6 = !bki4.isEmpty();
+        if (this.fixed) {
+            return InteractionResult.PASS;
+        }
         if (this.level.isClientSide) {
-            return boolean5 || boolean6;
+            return (boolean5 || boolean6) ? InteractionResult.SUCCESS : InteractionResult.PASS;
         }
         if (!boolean5) {
-            if (boolean6) {
-                this.setItem(ben4);
-                if (!ayj.abilities.instabuild) {
-                    ben4.shrink(1);
+            if (boolean6 && !this.removed) {
+                this.setItem(bki4);
+                if (!bec.abilities.instabuild) {
+                    bki4.shrink(1);
                 }
             }
         }
@@ -323,7 +357,7 @@ public class ItemFrame extends HangingEntity {
             this.playSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 1.0f, 1.0f);
             this.setRotation(this.getRotation() + 1);
         }
-        return true;
+        return InteractionResult.CONSUME;
     }
     
     public int getAnalogOutput() {
diff --git a/src/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java b/src/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
index e59cbc4..5f3a650 100644
--- a/src/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
+++ b/src/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
@@ -2,10 +2,13 @@ package net.minecraft.world.entity.decoration;
 
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.Packet;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.world.entity.Mob;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.nbt.CompoundTag;
@@ -22,13 +25,13 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class LeashFenceKnotEntity extends HangingEntity {
-    public LeashFenceKnotEntity(final EntityType<? extends LeashFenceKnotEntity> aku, final Level bjw) {
-        super(aku, bjw);
+    public LeashFenceKnotEntity(final EntityType<? extends LeashFenceKnotEntity> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public LeashFenceKnotEntity(final Level bjw, final BlockPos fk) {
-        super(EntityType.LEASH_KNOT, bjw, fk);
-        this.setPos(fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5);
+    public LeashFenceKnotEntity(final Level bqb, final BlockPos fu) {
+        super(EntityType.LEASH_KNOT, bqb, fu);
+        this.setPos(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5);
         final float float4 = 0.125f;
         final float float5 = 0.1875f;
         final float float6 = 0.25f;
@@ -46,7 +49,7 @@ public class LeashFenceKnotEntity extends HangingEntity {
         this.setPosRaw(this.pos.getX() + 0.5, this.pos.getY() + 0.5, this.pos.getZ() + 0.5);
     }
     
-    public void setDirection(final Direction fp) {
+    public void setDirection(final Direction fz) {
     }
     
     @Override
@@ -60,7 +63,7 @@ public class LeashFenceKnotEntity extends HangingEntity {
     }
     
     @Override
-    protected float getEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getEyeHeight(final Pose apj, final EntityDimensions aon) {
         return -0.0625f;
     }
     
@@ -70,43 +73,43 @@ public class LeashFenceKnotEntity extends HangingEntity {
     }
     
     @Override
-    public void dropItem(@Nullable final Entity akq) {
+    public void dropItem(@Nullable final Entity aom) {
         this.playSound(SoundEvents.LEASH_KNOT_BREAK, 1.0f, 1.0f);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
+    public void addAdditionalSaveData(final CompoundTag le) {
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
+    public void readAdditionalSaveData(final CompoundTag le) {
     }
     
     @Override
-    public boolean interact(final Player ayj, final InteractionHand ajk) {
+    public InteractionResult interact(final Player bec, final InteractionHand anf) {
         if (this.level.isClientSide) {
-            return true;
+            return InteractionResult.SUCCESS;
         }
         boolean boolean4 = false;
         final double double5 = 7.0;
         final List<Mob> list7 = this.level.<Mob>getEntitiesOfClass(Mob.class, new AABB(this.getX() - 7.0, this.getY() - 7.0, this.getZ() - 7.0, this.getX() + 7.0, this.getY() + 7.0, this.getZ() + 7.0));
-        for (final Mob ala9 : list7) {
-            if (ala9.getLeashHolder() == ayj) {
-                ala9.setLeashedTo(this, true);
+        for (final Mob aoz9 : list7) {
+            if (aoz9.getLeashHolder() == bec) {
+                aoz9.setLeashedTo(this, true);
                 boolean4 = true;
             }
         }
         if (!boolean4) {
             this.remove();
-            if (ayj.abilities.instabuild) {
-                for (final Mob ala9 : list7) {
-                    if (ala9.isLeashed() && ala9.getLeashHolder() == this) {
-                        ala9.dropLeash(true, false);
+            if (bec.abilities.instabuild) {
+                for (final Mob aoz9 : list7) {
+                    if (aoz9.isLeashed() && aoz9.getLeashHolder() == this) {
+                        aoz9.dropLeash(true, false);
                     }
                 }
             }
         }
-        return true;
+        return InteractionResult.CONSUME;
     }
     
     @Override
@@ -114,20 +117,20 @@ public class LeashFenceKnotEntity extends HangingEntity {
         return this.level.getBlockState(this.pos).getBlock().is(BlockTags.FENCES);
     }
     
-    public static LeashFenceKnotEntity getOrCreateKnot(final Level bjw, final BlockPos fk) {
-        final int integer3 = fk.getX();
-        final int integer4 = fk.getY();
-        final int integer5 = fk.getZ();
-        final List<LeashFenceKnotEntity> list6 = bjw.<LeashFenceKnotEntity>getEntitiesOfClass(LeashFenceKnotEntity.class, new AABB(integer3 - 1.0, integer4 - 1.0, integer5 - 1.0, integer3 + 1.0, integer4 + 1.0, integer5 + 1.0));
-        for (final LeashFenceKnotEntity avs8 : list6) {
-            if (avs8.getPos().equals(fk)) {
-                return avs8;
+    public static LeashFenceKnotEntity getOrCreateKnot(final Level bqb, final BlockPos fu) {
+        final int integer3 = fu.getX();
+        final int integer4 = fu.getY();
+        final int integer5 = fu.getZ();
+        final List<LeashFenceKnotEntity> list6 = bqb.<LeashFenceKnotEntity>getEntitiesOfClass(LeashFenceKnotEntity.class, new AABB(integer3 - 1.0, integer4 - 1.0, integer5 - 1.0, integer3 + 1.0, integer4 + 1.0, integer5 + 1.0));
+        for (final LeashFenceKnotEntity bbb8 : list6) {
+            if (bbb8.getPos().equals(fu)) {
+                return bbb8;
             }
         }
-        final LeashFenceKnotEntity avs9 = new LeashFenceKnotEntity(bjw, fk);
-        bjw.addFreshEntity(avs9);
-        avs9.playPlacementSound();
-        return avs9;
+        final LeashFenceKnotEntity bbb9 = new LeashFenceKnotEntity(bqb, fu);
+        bqb.addFreshEntity(bbb9);
+        bbb9.playPlacementSound();
+        return bbb9;
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/decoration/Painting.java b/src/net/minecraft/world/entity/decoration/Painting.java
index c503c0b..3cbf6a2 100644
--- a/src/net/minecraft/world/entity/decoration/Painting.java
+++ b/src/net/minecraft/world/entity/decoration/Painting.java
@@ -23,20 +23,20 @@ import net.minecraft.world.entity.EntityType;
 public class Painting extends HangingEntity {
     public Motive motive;
     
-    public Painting(final EntityType<? extends Painting> aku, final Level bjw) {
-        super(aku, bjw);
+    public Painting(final EntityType<? extends Painting> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public Painting(final Level bjw, final BlockPos fk, final Direction fp) {
-        super(EntityType.PAINTING, bjw, fk);
+    public Painting(final Level bqb, final BlockPos fu, final Direction fz) {
+        super(EntityType.PAINTING, bqb, fu);
         final List<Motive> list5 = Lists.newArrayList();
         int integer6 = 0;
-        for (final Motive avt8 : Registry.MOTIVE) {
-            this.motive = avt8;
-            this.setDirection(fp);
+        for (final Motive bbc8 : Registry.MOTIVE) {
+            this.motive = bbc8;
+            this.setDirection(fz);
             if (this.survives()) {
-                list5.add(avt8);
-                final int integer7 = avt8.getWidth() * avt8.getHeight();
+                list5.add(bbc8);
+                final int integer7 = bbc8.getWidth() * bbc8.getHeight();
                 if (integer7 <= integer6) {
                     continue;
                 }
@@ -46,32 +46,32 @@ public class Painting extends HangingEntity {
         if (!list5.isEmpty()) {
             final Iterator<Motive> iterator7 = list5.iterator();
             while (iterator7.hasNext()) {
-                final Motive avt8 = iterator7.next();
-                if (avt8.getWidth() * avt8.getHeight() < integer6) {
+                final Motive bbc8 = iterator7.next();
+                if (bbc8.getWidth() * bbc8.getHeight() < integer6) {
                     iterator7.remove();
                 }
             }
             this.motive = list5.get(this.random.nextInt(list5.size()));
         }
-        this.setDirection(fp);
+        this.setDirection(fz);
     }
     
-    public Painting(final Level bjw, final BlockPos fk, final Direction fp, final Motive avt) {
-        this(bjw, fk, fp);
-        this.motive = avt;
-        this.setDirection(fp);
+    public Painting(final Level bqb, final BlockPos fu, final Direction fz, final Motive bbc) {
+        this(bqb, fu, fz);
+        this.motive = bbc;
+        this.setDirection(fz);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putString("Motive", Registry.MOTIVE.getKey(this.motive).toString());
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        le.putString("Motive", Registry.MOTIVE.getKey(this.motive).toString());
+        super.addAdditionalSaveData(le);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        this.motive = Registry.MOTIVE.get(ResourceLocation.tryParse(jt.getString("Motive")));
-        super.readAdditionalSaveData(jt);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        this.motive = Registry.MOTIVE.get(ResourceLocation.tryParse(le.getString("Motive")));
+        super.readAdditionalSaveData(le);
     }
     
     @Override
@@ -91,14 +91,14 @@ public class Painting extends HangingEntity {
     }
     
     @Override
-    public void dropItem(@Nullable final Entity akq) {
+    public void dropItem(@Nullable final Entity aom) {
         if (!this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
             return;
         }
         this.playSound(SoundEvents.PAINTING_BREAK, 1.0f, 1.0f);
-        if (akq instanceof Player) {
-            final Player ayj3 = (Player)akq;
-            if (ayj3.abilities.instabuild) {
+        if (aom instanceof Player) {
+            final Player bec3 = (Player)aom;
+            if (bec3.abilities.instabuild) {
                 return;
             }
         }
@@ -117,8 +117,8 @@ public class Painting extends HangingEntity {
     
     @Override
     public void lerpTo(final double double1, final double double2, final double double3, final float float4, final float float5, final int integer, final boolean boolean7) {
-        final BlockPos fk12 = this.pos.offset(double1 - this.getX(), double2 - this.getY(), double3 - this.getZ());
-        this.setPos(fk12.getX(), fk12.getY(), fk12.getZ());
+        final BlockPos fu12 = this.pos.offset(double1 - this.getX(), double2 - this.getY(), double3 - this.getZ());
+        this.setPos(fu12.getX(), fu12.getY(), fu12.getZ());
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/net/minecraft/world/entity/item/FallingBlockEntity.java
index 90218c2..bb8e569 100644
--- a/src/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.entity.item;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
@@ -13,7 +13,6 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.tags.BlockTags;
 import com.google.common.collect.Lists;
 import net.minecraft.util.Mth;
-import net.minecraft.nbt.Tag;
 import java.util.Iterator;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.phys.BlockHitResult;
@@ -32,6 +31,8 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.Direction;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.level.ClipContext;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.block.ConcretePowderBlock;
 import net.minecraft.world.entity.MoverType;
@@ -56,24 +57,24 @@ public class FallingBlockEntity extends Entity {
     public CompoundTag blockData;
     protected static final EntityDataAccessor<BlockPos> DATA_START_POS;
     
-    public FallingBlockEntity(final EntityType<? extends FallingBlockEntity> aku, final Level bjw) {
-        super(aku, bjw);
+    public FallingBlockEntity(final EntityType<? extends FallingBlockEntity> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.blockState = Blocks.SAND.defaultBlockState();
         this.dropItem = true;
         this.fallDamageMax = 40;
         this.fallDamageAmount = 2.0f;
     }
     
-    public FallingBlockEntity(final Level bjw, final double double2, final double double3, final double double4, final BlockState byj) {
-        this(EntityType.FALLING_BLOCK, bjw);
-        this.blockState = byj;
+    public FallingBlockEntity(final Level bqb, final double double2, final double double3, final double double4, final BlockState cfj) {
+        this(EntityType.FALLING_BLOCK, bqb);
+        this.blockState = cfj;
         this.blocksBuilding = true;
         this.setPos(double2, double3 + (1.0f - this.getBbHeight()) / 2.0f, double4);
         this.setDeltaMovement(Vec3.ZERO);
         this.xo = double2;
         this.yo = double3;
         this.zo = double4;
-        this.setStartPos(new BlockPos(this));
+        this.setStartPos(this.blockPosition());
     }
     
     @Override
@@ -81,8 +82,8 @@ public class FallingBlockEntity extends Entity {
         return false;
     }
     
-    public void setStartPos(final BlockPos fk) {
-        this.entityData.<BlockPos>set(FallingBlockEntity.DATA_START_POS, fk);
+    public void setStartPos(final BlockPos fu) {
+        this.entityData.<BlockPos>set(FallingBlockEntity.DATA_START_POS, fu);
     }
     
     public BlockPos getStartPos() {
@@ -110,11 +111,11 @@ public class FallingBlockEntity extends Entity {
             this.remove();
             return;
         }
-        final Block bph2 = this.blockState.getBlock();
+        final Block bvr2 = this.blockState.getBlock();
         if (this.time++ == 0) {
-            final BlockPos fk3 = new BlockPos(this);
-            if (this.level.getBlockState(fk3).getBlock() == bph2) {
-                this.level.removeBlock(fk3, false);
+            final BlockPos fu3 = this.blockPosition();
+            if (this.level.getBlockState(fu3).is(bvr2)) {
+                this.level.removeBlock(fu3, false);
             }
             else if (!this.level.isClientSide) {
                 this.remove();
@@ -126,68 +127,68 @@ public class FallingBlockEntity extends Entity {
         }
         this.move(MoverType.SELF, this.getDeltaMovement());
         if (!this.level.isClientSide) {
-            BlockPos fk3 = new BlockPos(this);
+            BlockPos fu3 = this.blockPosition();
             final boolean boolean4 = this.blockState.getBlock() instanceof ConcretePowderBlock;
-            boolean boolean5 = boolean4 && this.level.getFluidState(fk3).is(FluidTags.WATER);
+            boolean boolean5 = boolean4 && this.level.getFluidState(fu3).is(FluidTags.WATER);
             final double double6 = this.getDeltaMovement().lengthSqr();
             if (boolean4 && double6 > 1.0) {
-                final BlockHitResult cvg8 = this.level.clip(new ClipContext(new Vec3(this.xo, this.yo, this.zo), this.position(), ClipContext.Block.COLLIDER, ClipContext.Fluid.SOURCE_ONLY, this));
-                if (cvg8.getType() != HitResult.Type.MISS && this.level.getFluidState(cvg8.getBlockPos()).is(FluidTags.WATER)) {
-                    fk3 = cvg8.getBlockPos();
+                final BlockHitResult deh8 = this.level.clip(new ClipContext(new Vec3(this.xo, this.yo, this.zo), this.position(), ClipContext.Block.COLLIDER, ClipContext.Fluid.SOURCE_ONLY, this));
+                if (deh8.getType() != HitResult.Type.MISS && this.level.getFluidState(deh8.getBlockPos()).is(FluidTags.WATER)) {
+                    fu3 = deh8.getBlockPos();
                     boolean5 = true;
                 }
             }
             if (this.onGround || boolean5) {
-                final BlockState byj8 = this.level.getBlockState(fk3);
+                final BlockState cfj8 = this.level.getBlockState(fu3);
                 this.setDeltaMovement(this.getDeltaMovement().multiply(0.7, -0.5, 0.7));
-                if (byj8.getBlock() != Blocks.MOVING_PISTON) {
+                if (!cfj8.is(Blocks.MOVING_PISTON)) {
                     this.remove();
                     if (!this.cancelDrop) {
-                        final boolean boolean6 = byj8.canBeReplaced(new DirectionalPlaceContext(this.level, fk3, Direction.DOWN, ItemStack.EMPTY, Direction.UP));
-                        final boolean boolean7 = FallingBlock.isFree(this.level.getBlockState(fk3.below())) && (!boolean4 || !boolean5);
-                        final boolean boolean8 = this.blockState.canSurvive(this.level, fk3) && !boolean7;
+                        final boolean boolean6 = cfj8.canBeReplaced(new DirectionalPlaceContext(this.level, fu3, Direction.DOWN, ItemStack.EMPTY, Direction.UP));
+                        final boolean boolean7 = FallingBlock.isFree(this.level.getBlockState(fu3.below())) && (!boolean4 || !boolean5);
+                        final boolean boolean8 = this.blockState.canSurvive(this.level, fu3) && !boolean7;
                         if (boolean6 && boolean8) {
-                            if (this.blockState.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.WATERLOGGED) && this.level.getFluidState(fk3).getType() == Fluids.WATER) {
-                                this.blockState = ((AbstractStateHolder<O, BlockState>)this.blockState).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.WATERLOGGED, true);
+                            if (this.blockState.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.WATERLOGGED) && this.level.getFluidState(fu3).getType() == Fluids.WATER) {
+                                this.blockState = ((StateHolder<O, BlockState>)this.blockState).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.WATERLOGGED, true);
                             }
-                            if (this.level.setBlock(fk3, this.blockState, 3)) {
-                                if (bph2 instanceof FallingBlock) {
-                                    ((FallingBlock)bph2).onLand(this.level, fk3, this.blockState, byj8);
+                            if (this.level.setBlock(fu3, this.blockState, 3)) {
+                                if (bvr2 instanceof FallingBlock) {
+                                    ((FallingBlock)bvr2).onLand(this.level, fu3, this.blockState, cfj8, this);
                                 }
-                                if (this.blockData != null && bph2 instanceof EntityBlock) {
-                                    final BlockEntity bwl12 = this.level.getBlockEntity(fk3);
-                                    if (bwl12 != null) {
-                                        final CompoundTag jt13 = bwl12.save(new CompoundTag());
+                                if (this.blockData != null && bvr2 instanceof EntityBlock) {
+                                    final BlockEntity cdl12 = this.level.getBlockEntity(fu3);
+                                    if (cdl12 != null) {
+                                        final CompoundTag le13 = cdl12.save(new CompoundTag());
                                         for (final String string15 : this.blockData.getAllKeys()) {
-                                            final Tag kj16 = this.blockData.get(string15);
+                                            final net.minecraft.nbt.Tag lu16 = this.blockData.get(string15);
                                             if (!"x".equals(string15) && !"y".equals(string15)) {
                                                 if ("z".equals(string15)) {
                                                     continue;
                                                 }
-                                                jt13.put(string15, kj16.copy());
+                                                le13.put(string15, lu16.copy());
                                             }
                                         }
-                                        bwl12.load(jt13);
-                                        bwl12.setChanged();
+                                        cdl12.load(this.blockState, le13);
+                                        cdl12.setChanged();
                                     }
                                 }
                             }
                             else if (this.dropItem && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
-                                this.spawnAtLocation(bph2);
+                                this.spawnAtLocation(bvr2);
                             }
                         }
                         else if (this.dropItem && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
-                            this.spawnAtLocation(bph2);
+                            this.spawnAtLocation(bvr2);
                         }
                     }
-                    else if (bph2 instanceof FallingBlock) {
-                        ((FallingBlock)bph2).onBroken(this.level, fk3);
+                    else if (bvr2 instanceof FallingBlock) {
+                        ((FallingBlock)bvr2).onBroken(this.level, fu3, this);
                     }
                 }
             }
-            else if (!this.level.isClientSide && ((this.time > 100 && (fk3.getY() < 1 || fk3.getY() > 256)) || this.time > 600)) {
+            else if (!this.level.isClientSide && ((this.time > 100 && (fu3.getY() < 1 || fu3.getY() > 256)) || this.time > 600)) {
                 if (this.dropItem && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
-                    this.spawnAtLocation(bph2);
+                    this.spawnAtLocation(bvr2);
                 }
                 this.remove();
             }
@@ -202,17 +203,17 @@ public class FallingBlockEntity extends Entity {
             if (integer4 > 0) {
                 final List<Entity> list5 = Lists.newArrayList(this.level.getEntities(this, this.getBoundingBox()));
                 final boolean boolean6 = this.blockState.is(BlockTags.ANVIL);
-                final DamageSource ajz7 = boolean6 ? DamageSource.ANVIL : DamageSource.FALLING_BLOCK;
-                for (final Entity akq9 : list5) {
-                    akq9.hurt(ajz7, (float)Math.min(Mth.floor(integer4 * this.fallDamageAmount), this.fallDamageMax));
+                final DamageSource anw7 = boolean6 ? DamageSource.ANVIL : DamageSource.FALLING_BLOCK;
+                for (final Entity aom9 : list5) {
+                    aom9.hurt(anw7, (float)Math.min(Mth.floor(integer4 * this.fallDamageAmount), this.fallDamageMax));
                 }
                 if (boolean6 && this.random.nextFloat() < 0.05000000074505806 + integer4 * 0.05) {
-                    final BlockState byj8 = AnvilBlock.damage(this.blockState);
-                    if (byj8 == null) {
+                    final BlockState cfj8 = AnvilBlock.damage(this.blockState);
+                    if (cfj8 == null) {
                         this.cancelDrop = true;
                     }
                     else {
-                        this.blockState = byj8;
+                        this.blockState = cfj8;
                     }
                 }
             }
@@ -221,35 +222,35 @@ public class FallingBlockEntity extends Entity {
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        jt.put("BlockState", NbtUtils.writeBlockState(this.blockState));
-        jt.putInt("Time", this.time);
-        jt.putBoolean("DropItem", this.dropItem);
-        jt.putBoolean("HurtEntities", this.hurtEntities);
-        jt.putFloat("FallHurtAmount", this.fallDamageAmount);
-        jt.putInt("FallHurtMax", this.fallDamageMax);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        le.put("BlockState", NbtUtils.writeBlockState(this.blockState));
+        le.putInt("Time", this.time);
+        le.putBoolean("DropItem", this.dropItem);
+        le.putBoolean("HurtEntities", this.hurtEntities);
+        le.putFloat("FallHurtAmount", this.fallDamageAmount);
+        le.putInt("FallHurtMax", this.fallDamageMax);
         if (this.blockData != null) {
-            jt.put("TileEntityData", this.blockData);
+            le.put("TileEntityData", this.blockData);
         }
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        this.blockState = NbtUtils.readBlockState(jt.getCompound("BlockState"));
-        this.time = jt.getInt("Time");
-        if (jt.contains("HurtEntities", 99)) {
-            this.hurtEntities = jt.getBoolean("HurtEntities");
-            this.fallDamageAmount = jt.getFloat("FallHurtAmount");
-            this.fallDamageMax = jt.getInt("FallHurtMax");
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        this.blockState = NbtUtils.readBlockState(le.getCompound("BlockState"));
+        this.time = le.getInt("Time");
+        if (le.contains("HurtEntities", 99)) {
+            this.hurtEntities = le.getBoolean("HurtEntities");
+            this.fallDamageAmount = le.getFloat("FallHurtAmount");
+            this.fallDamageMax = le.getInt("FallHurtMax");
         }
         else if (this.blockState.is(BlockTags.ANVIL)) {
             this.hurtEntities = true;
         }
-        if (jt.contains("DropItem", 99)) {
-            this.dropItem = jt.getBoolean("DropItem");
+        if (le.contains("DropItem", 99)) {
+            this.dropItem = le.getBoolean("DropItem");
         }
-        if (jt.contains("TileEntityData", 10)) {
-            this.blockData = jt.getCompound("TileEntityData");
+        if (le.contains("TileEntityData", 10)) {
+            this.blockData = le.getCompound("TileEntityData");
         }
         if (this.blockState.isAir()) {
             this.blockState = Blocks.SAND.defaultBlockState();
@@ -270,9 +271,9 @@ public class FallingBlockEntity extends Entity {
     }
     
     @Override
-    public void fillCrashReportCategory(final CrashReportCategory i) {
-        super.fillCrashReportCategory(i);
-        i.setDetail("Immitating BlockState", this.blockState.toString());
+    public void fillCrashReportCategory(final CrashReportCategory k) {
+        super.fillCrashReportCategory(k);
+        k.setDetail("Immitating BlockState", this.blockState.toString());
     }
     
     public BlockState getBlockState() {
diff --git a/src/net/minecraft/world/entity/item/ItemEntity.java b/src/net/minecraft/world/entity/item/ItemEntity.java
index df0d53e..acb069d 100644
--- a/src/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/net/minecraft/world/entity/item/ItemEntity.java
@@ -5,15 +5,13 @@ import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.Packet;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.Item;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.nbt.Tag;
-import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.damagesource.DamageSource;
@@ -25,6 +23,8 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.Mth;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.MoverType;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
@@ -42,22 +42,31 @@ public class ItemEntity extends Entity {
     private UUID owner;
     public final float bobOffs;
     
-    public ItemEntity(final EntityType<? extends ItemEntity> aku, final Level bjw) {
-        super(aku, bjw);
+    public ItemEntity(final EntityType<? extends ItemEntity> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.health = 5;
         this.bobOffs = (float)(Math.random() * 3.141592653589793 * 2.0);
     }
     
-    public ItemEntity(final Level bjw, final double double2, final double double3, final double double4) {
-        this(EntityType.ITEM, bjw);
+    public ItemEntity(final Level bqb, final double double2, final double double3, final double double4) {
+        this(EntityType.ITEM, bqb);
         this.setPos(double2, double3, double4);
         this.yRot = this.random.nextFloat() * 360.0f;
         this.setDeltaMovement(this.random.nextDouble() * 0.2 - 0.1, 0.2, this.random.nextDouble() * 0.2 - 0.1);
     }
     
-    public ItemEntity(final Level bjw, final double double2, final double double3, final double double4, final ItemStack ben) {
-        this(bjw, double2, double3, double4);
-        this.setItem(ben);
+    public ItemEntity(final Level bqb, final double double2, final double double3, final double double4, final ItemStack bki) {
+        this(bqb, double2, double3, double4);
+        this.setItem(bki);
+    }
+    
+    private ItemEntity(final ItemEntity bbg) {
+        super(bbg.getType(), bbg.level);
+        this.health = 5;
+        this.setItem(bbg.getItem().copy());
+        this.copyPosition(bbg);
+        this.age = bbg.age;
+        this.bobOffs = bbg.bobOffs;
     }
     
     @Override
@@ -83,10 +92,13 @@ public class ItemEntity extends Entity {
         this.xo = this.getX();
         this.yo = this.getY();
         this.zo = this.getZ();
-        final Vec3 cvl2 = this.getDeltaMovement();
-        if (this.isUnderLiquid(FluidTags.WATER)) {
+        final Vec3 dem2 = this.getDeltaMovement();
+        if (this.isEyeInFluid(FluidTags.WATER)) {
             this.setUnderwaterMovement();
         }
+        else if (this.isEyeInFluid(FluidTags.LAVA)) {
+            this.setUnderLavaMovement();
+        }
         else if (!this.isNoGravity()) {
             this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.04, 0.0));
         }
@@ -113,8 +125,7 @@ public class ItemEntity extends Entity {
         final boolean boolean3 = Mth.floor(this.xo) != Mth.floor(this.getX()) || Mth.floor(this.yo) != Mth.floor(this.getY()) || Mth.floor(this.zo) != Mth.floor(this.getZ());
         final int integer4 = boolean3 ? 2 : 40;
         if (this.tickCount % integer4 == 0) {
-            if (this.level.getFluidState(new BlockPos(this)).is(FluidTags.LAVA)) {
-                this.setDeltaMovement((this.random.nextFloat() - this.random.nextFloat()) * 0.2f, 0.20000000298023224, (this.random.nextFloat() - this.random.nextFloat()) * 0.2f);
+            if (this.level.getFluidState(this.blockPosition()).is(FluidTags.LAVA) && !this.fireImmune()) {
                 this.playSound(SoundEvents.GENERIC_BURN, 0.4f, 2.0f + this.random.nextFloat() * 0.4f);
             }
             if (!this.level.isClientSide && this.isMergable()) {
@@ -124,9 +135,9 @@ public class ItemEntity extends Entity {
         if (this.age != -32768) {
             ++this.age;
         }
-        this.hasImpulse |= this.updateInWaterState();
+        this.hasImpulse |= this.updateInWaterStateAndDoFluidPushing();
         if (!this.level.isClientSide) {
-            final double double5 = this.getDeltaMovement().subtract(cvl2).lengthSqr();
+            final double double5 = this.getDeltaMovement().subtract(dem2).lengthSqr();
             if (double5 > 0.01) {
                 this.hasImpulse = true;
             }
@@ -137,18 +148,23 @@ public class ItemEntity extends Entity {
     }
     
     private void setUnderwaterMovement() {
-        final Vec3 cvl2 = this.getDeltaMovement();
-        this.setDeltaMovement(cvl2.x * 0.9900000095367432, cvl2.y + ((cvl2.y < 0.05999999865889549) ? 5.0E-4f : 0.0f), cvl2.z * 0.9900000095367432);
+        final Vec3 dem2 = this.getDeltaMovement();
+        this.setDeltaMovement(dem2.x * 0.9900000095367432, dem2.y + ((dem2.y < 0.05999999865889549) ? 5.0E-4f : 0.0f), dem2.z * 0.9900000095367432);
+    }
+    
+    private void setUnderLavaMovement() {
+        final Vec3 dem2 = this.getDeltaMovement();
+        this.setDeltaMovement(dem2.x * 0.949999988079071, dem2.y + ((dem2.y < 0.05999999865889549) ? 5.0E-4f : 0.0f), dem2.z * 0.949999988079071);
     }
     
     private void mergeWithNeighbours() {
         if (!this.isMergable()) {
             return;
         }
-        final List<ItemEntity> list2 = this.level.<ItemEntity>getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(0.5, 0.0, 0.5), awb -> awb != this && awb.isMergable());
-        for (final ItemEntity awb2 : list2) {
-            if (awb2.isMergable()) {
-                this.tryToMerge(awb2);
+        final List<ItemEntity> list2 = this.level.<ItemEntity>getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(0.5, 0.0, 0.5), bbg -> bbg != this && bbg.isMergable());
+        for (final ItemEntity bbg2 : list2) {
+            if (bbg2.isMergable()) {
+                this.tryToMerge(bbg2);
                 if (this.removed) {
                     break;
                 }
@@ -158,61 +174,64 @@ public class ItemEntity extends Entity {
     }
     
     private boolean isMergable() {
-        final ItemStack ben2 = this.getItem();
-        return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < 6000 && ben2.getCount() < ben2.getMaxStackSize();
+        final ItemStack bki2 = this.getItem();
+        return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < 6000 && bki2.getCount() < bki2.getMaxStackSize();
     }
     
-    private void tryToMerge(final ItemEntity awb) {
-        final ItemStack ben3 = this.getItem();
-        final ItemStack ben4 = awb.getItem();
-        if (!Objects.equals(this.getOwner(), awb.getOwner()) || !areMergable(ben3, ben4)) {
+    private void tryToMerge(final ItemEntity bbg) {
+        final ItemStack bki3 = this.getItem();
+        final ItemStack bki4 = bbg.getItem();
+        if (!Objects.equals(this.getOwner(), bbg.getOwner()) || !areMergable(bki3, bki4)) {
             return;
         }
-        if (ben4.getCount() < ben3.getCount()) {
-            merge(this, ben3, awb, ben4);
+        if (bki4.getCount() < bki3.getCount()) {
+            merge(this, bki3, bbg, bki4);
         }
         else {
-            merge(awb, ben4, this, ben3);
+            merge(bbg, bki4, this, bki3);
         }
     }
     
-    public static boolean areMergable(final ItemStack ben1, final ItemStack ben2) {
-        return ben2.getItem() == ben1.getItem() && ben2.getCount() + ben1.getCount() <= ben2.getMaxStackSize() && !(ben2.hasTag() ^ ben1.hasTag()) && (!ben2.hasTag() || ben2.getTag().equals(ben1.getTag()));
+    public static boolean areMergable(final ItemStack bki1, final ItemStack bki2) {
+        return bki2.getItem() == bki1.getItem() && bki2.getCount() + bki1.getCount() <= bki2.getMaxStackSize() && !(bki2.hasTag() ^ bki1.hasTag()) && (!bki2.hasTag() || bki2.getTag().equals(bki1.getTag()));
     }
     
-    public static ItemStack merge(final ItemStack ben1, final ItemStack ben2, final int integer) {
-        final int integer2 = Math.min(Math.min(ben1.getMaxStackSize(), integer) - ben1.getCount(), ben2.getCount());
-        final ItemStack ben3 = ben1.copy();
-        ben3.grow(integer2);
-        ben2.shrink(integer2);
-        return ben3;
+    public static ItemStack merge(final ItemStack bki1, final ItemStack bki2, final int integer) {
+        final int integer2 = Math.min(Math.min(bki1.getMaxStackSize(), integer) - bki1.getCount(), bki2.getCount());
+        final ItemStack bki3 = bki1.copy();
+        bki3.grow(integer2);
+        bki2.shrink(integer2);
+        return bki3;
     }
     
-    private static void merge(final ItemEntity awb, final ItemStack ben2, final ItemStack ben3) {
-        final ItemStack ben4 = merge(ben2, ben3, 64);
-        awb.setItem(ben4);
+    private static void merge(final ItemEntity bbg, final ItemStack bki2, final ItemStack bki3) {
+        final ItemStack bki4 = merge(bki2, bki3, 64);
+        bbg.setItem(bki4);
     }
     
-    private static void merge(final ItemEntity awb1, final ItemStack ben2, final ItemEntity awb3, final ItemStack ben4) {
-        merge(awb1, ben2, ben4);
-        awb1.pickupDelay = Math.max(awb1.pickupDelay, awb3.pickupDelay);
-        awb1.age = Math.min(awb1.age, awb3.age);
-        if (ben4.isEmpty()) {
-            awb3.remove();
+    private static void merge(final ItemEntity bbg1, final ItemStack bki2, final ItemEntity bbg3, final ItemStack bki4) {
+        merge(bbg1, bki2, bki4);
+        bbg1.pickupDelay = Math.max(bbg1.pickupDelay, bbg3.pickupDelay);
+        bbg1.age = Math.min(bbg1.age, bbg3.age);
+        if (bki4.isEmpty()) {
+            bbg3.remove();
         }
     }
     
     @Override
-    protected void burn(final int integer) {
-        this.hurt(DamageSource.IN_FIRE, (float)integer);
+    public boolean fireImmune() {
+        return this.getItem().getItem().isFireResistant() || super.fireImmune();
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        if (!this.getItem().isEmpty() && this.getItem().getItem() == Items.NETHER_STAR && ajz.isExplosion()) {
+        if (!this.getItem().isEmpty() && this.getItem().getItem() == Items.NETHER_STAR && anw.isExplosion()) {
+            return false;
+        }
+        if (!this.getItem().getItem().canBeHurtBy(anw)) {
             return false;
         }
         this.markHurt();
@@ -223,65 +242,66 @@ public class ItemEntity extends Entity {
         return false;
     }
     
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putShort("Health", (short)this.health);
-        jt.putShort("Age", (short)this.age);
-        jt.putShort("PickupDelay", (short)this.pickupDelay);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        le.putShort("Health", (short)this.health);
+        le.putShort("Age", (short)this.age);
+        le.putShort("PickupDelay", (short)this.pickupDelay);
         if (this.getThrower() != null) {
-            jt.put("Thrower", NbtUtils.createUUIDTag(this.getThrower()));
+            le.putUUID("Thrower", this.getThrower());
         }
         if (this.getOwner() != null) {
-            jt.put("Owner", NbtUtils.createUUIDTag(this.getOwner()));
+            le.putUUID("Owner", this.getOwner());
         }
         if (!this.getItem().isEmpty()) {
-            jt.put("Item", this.getItem().save(new CompoundTag()));
+            le.put("Item", this.getItem().save(new CompoundTag()));
         }
     }
     
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        this.health = jt.getShort("Health");
-        this.age = jt.getShort("Age");
-        if (jt.contains("PickupDelay")) {
-            this.pickupDelay = jt.getShort("PickupDelay");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        this.health = le.getShort("Health");
+        this.age = le.getShort("Age");
+        if (le.contains("PickupDelay")) {
+            this.pickupDelay = le.getShort("PickupDelay");
         }
-        if (jt.contains("Owner", 10)) {
-            this.owner = NbtUtils.loadUUIDTag(jt.getCompound("Owner"));
+        if (le.hasUUID("Owner")) {
+            this.owner = le.getUUID("Owner");
         }
-        if (jt.contains("Thrower", 10)) {
-            this.thrower = NbtUtils.loadUUIDTag(jt.getCompound("Thrower"));
+        if (le.hasUUID("Thrower")) {
+            this.thrower = le.getUUID("Thrower");
         }
-        final CompoundTag jt2 = jt.getCompound("Item");
-        this.setItem(ItemStack.of(jt2));
+        final CompoundTag le2 = le.getCompound("Item");
+        this.setItem(ItemStack.of(le2));
         if (this.getItem().isEmpty()) {
             this.remove();
         }
     }
     
     @Override
-    public void playerTouch(final Player ayj) {
+    public void playerTouch(final Player bec) {
         if (this.level.isClientSide) {
             return;
         }
-        final ItemStack ben3 = this.getItem();
-        final Item bei4 = ben3.getItem();
-        final int integer5 = ben3.getCount();
-        if (this.pickupDelay == 0 && (this.owner == null || this.owner.equals(ayj.getUUID())) && ayj.inventory.add(ben3)) {
-            ayj.take(this, integer5);
-            if (ben3.isEmpty()) {
+        final ItemStack bki3 = this.getItem();
+        final Item bke4 = bki3.getItem();
+        final int integer5 = bki3.getCount();
+        if (this.pickupDelay == 0 && (this.owner == null || this.owner.equals(bec.getUUID())) && bec.inventory.add(bki3)) {
+            bec.take(this, integer5);
+            if (bki3.isEmpty()) {
                 this.remove();
-                ben3.setCount(integer5);
+                bki3.setCount(integer5);
             }
-            ayj.awardStat(Stats.ITEM_PICKED_UP.get(bei4), integer5);
+            bec.awardStat(Stats.ITEM_PICKED_UP.get(bke4), integer5);
+            bec.onItemPickup(this);
         }
     }
     
     @Override
     public Component getName() {
-        final Component lf2 = this.getCustomName();
-        if (lf2 != null) {
-            return lf2;
+        final Component mr2 = this.getCustomName();
+        if (mr2 != null) {
+            return mr2;
         }
-        return new TranslatableComponent(this.getItem().getDescriptionId(), new Object[0]);
+        return new TranslatableComponent(this.getItem().getDescriptionId());
     }
     
     @Override
@@ -291,20 +311,28 @@ public class ItemEntity extends Entity {
     
     @Nullable
     @Override
-    public Entity changeDimension(final DimensionType cbi) {
-        final Entity akq3 = super.changeDimension(cbi);
-        if (!this.level.isClientSide && akq3 instanceof ItemEntity) {
-            ((ItemEntity)akq3).mergeWithNeighbours();
+    public Entity changeDimension(final ServerLevel zd) {
+        final Entity aom3 = super.changeDimension(zd);
+        if (!this.level.isClientSide && aom3 instanceof ItemEntity) {
+            ((ItemEntity)aom3).mergeWithNeighbours();
         }
-        return akq3;
+        return aom3;
     }
     
     public ItemStack getItem() {
         return this.getEntityData().<ItemStack>get(ItemEntity.DATA_ITEM);
     }
     
-    public void setItem(final ItemStack ben) {
-        this.getEntityData().<ItemStack>set(ItemEntity.DATA_ITEM, ben);
+    public void setItem(final ItemStack bki) {
+        this.getEntityData().<ItemStack>set(ItemEntity.DATA_ITEM, bki);
+    }
+    
+    @Override
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        super.onSyncedDataUpdated(tq);
+        if (ItemEntity.DATA_ITEM.equals(tq)) {
+            this.getItem().setEntityRepresentation(this);
+        }
     }
     
     @Nullable
@@ -358,11 +386,19 @@ public class ItemEntity extends Entity {
         this.age = 5999;
     }
     
+    public float getSpin(final float float1) {
+        return (this.getAge() + float1) / 20.0f + this.bobOffs;
+    }
+    
     @Override
     public Packet<?> getAddEntityPacket() {
         return new ClientboundAddEntityPacket(this);
     }
     
+    public ItemEntity copy() {
+        return new ItemEntity(this);
+    }
+    
     static {
         DATA_ITEM = SynchedEntityData.<ItemStack>defineId(ItemEntity.class, EntityDataSerializers.ITEM_STACK);
     }
diff --git a/src/net/minecraft/world/entity/item/PrimedTnt.java b/src/net/minecraft/world/entity/item/PrimedTnt.java
index a32f9b7..8348fdf 100644
--- a/src/net/minecraft/world/entity/item/PrimedTnt.java
+++ b/src/net/minecraft/world/entity/item/PrimedTnt.java
@@ -24,22 +24,22 @@ public class PrimedTnt extends Entity {
     private LivingEntity owner;
     private int life;
     
-    public PrimedTnt(final EntityType<? extends PrimedTnt> aku, final Level bjw) {
-        super(aku, bjw);
+    public PrimedTnt(final EntityType<? extends PrimedTnt> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.life = 80;
         this.blocksBuilding = true;
     }
     
-    public PrimedTnt(final Level bjw, final double double2, final double double3, final double double4, @Nullable final LivingEntity akz) {
-        this(EntityType.TNT, bjw);
+    public PrimedTnt(final Level bqb, final double double2, final double double3, final double double4, @Nullable final LivingEntity aoy) {
+        this(EntityType.TNT, bqb);
         this.setPos(double2, double3, double4);
-        final double double5 = bjw.random.nextDouble() * 6.2831854820251465;
+        final double double5 = bqb.random.nextDouble() * 6.2831854820251465;
         this.setDeltaMovement(-Math.sin(double5) * 0.02, 0.20000000298023224, -Math.cos(double5) * 0.02);
         this.setFuse(80);
         this.xo = double2;
         this.yo = double3;
         this.zo = double4;
-        this.owner = akz;
+        this.owner = aoy;
     }
     
     @Override
@@ -75,7 +75,7 @@ public class PrimedTnt extends Entity {
             }
         }
         else {
-            this.updateInWaterState();
+            this.updateInWaterStateAndDoFluidPushing();
             if (this.level.isClientSide) {
                 this.level.addParticle(ParticleTypes.SMOKE, this.getX(), this.getY() + 0.5, this.getZ(), 0.0, 0.0, 0.0);
             }
@@ -88,13 +88,13 @@ public class PrimedTnt extends Entity {
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putShort("Fuse", (short)this.getLife());
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        le.putShort("Fuse", (short)this.getLife());
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        this.setFuse(jt.getShort("Fuse"));
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        this.setFuse(le.getShort("Fuse"));
     }
     
     @Nullable
@@ -103,8 +103,8 @@ public class PrimedTnt extends Entity {
     }
     
     @Override
-    protected float getEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return 0.0f;
+    protected float getEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return 0.15f;
     }
     
     public void setFuse(final int integer) {
@@ -113,8 +113,8 @@ public class PrimedTnt extends Entity {
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (PrimedTnt.DATA_FUSE_ID.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (PrimedTnt.DATA_FUSE_ID.equals(tq)) {
             this.life = this.getFuse();
         }
     }
diff --git a/src/net/minecraft/world/entity/monster/AbstractIllager.java b/src/net/minecraft/world/entity/monster/AbstractIllager.java
index 3e68fa5..13c0198 100644
--- a/src/net/minecraft/world/entity/monster/AbstractIllager.java
+++ b/src/net/minecraft/world/entity/monster/AbstractIllager.java
@@ -8,8 +8,8 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.raid.Raider;
 
 public abstract class AbstractIllager extends Raider {
-    protected AbstractIllager(final EntityType<? extends AbstractIllager> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AbstractIllager(final EntityType<? extends AbstractIllager> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -38,8 +38,8 @@ public abstract class AbstractIllager extends Raider {
     }
     
     public class RaiderOpenDoorGoal extends OpenDoorGoal {
-        public RaiderOpenDoorGoal(final Raider azo) {
-            super(azo, false);
+        public RaiderOpenDoorGoal(final Raider bfi) {
+            super(bfi, false);
         }
         
         @Override
diff --git a/src/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/net/minecraft/world/entity/monster/AbstractSkeleton.java
index 902cbd0..3c1d6d9 100644
--- a/src/net/minecraft/world/entity/monster/AbstractSkeleton.java
+++ b/src/net/minecraft/world/entity/monster/AbstractSkeleton.java
@@ -2,6 +2,7 @@ package net.minecraft.world.entity.monster;
 
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
+import net.minecraft.world.item.ProjectileWeaponItem;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.sounds.SoundEvents;
@@ -26,6 +27,8 @@ import net.minecraft.world.entity.MobType;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.animal.Turtle;
 import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
@@ -51,8 +54,8 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
     private final RangedBowAttackGoal<AbstractSkeleton> bowGoal;
     private final MeleeAttackGoal meleeGoal;
     
-    protected AbstractSkeleton(final EntityType<? extends AbstractSkeleton> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AbstractSkeleton(final EntityType<? extends AbstractSkeleton> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.bowGoal = new RangedBowAttackGoal<AbstractSkeleton>(this, 1.0, 20, 15.0f);
         this.meleeGoal = new MeleeAttackGoal((PathfinderMob)this, 1.2, false) {
             @Override
@@ -84,14 +87,12 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.25);
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(this.getStepSound(), 0.15f, 1.0f);
     }
     
@@ -106,11 +107,11 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
     public void aiStep() {
         boolean boolean2 = this.isSunBurnTick();
         if (boolean2) {
-            final ItemStack ben3 = this.getItemBySlot(EquipmentSlot.HEAD);
-            if (!ben3.isEmpty()) {
-                if (ben3.isDamageableItem()) {
-                    ben3.setDamageValue(ben3.getDamageValue() + this.random.nextInt(2));
-                    if (ben3.getDamageValue() >= ben3.getMaxDamage()) {
+            final ItemStack bki3 = this.getItemBySlot(EquipmentSlot.HEAD);
+            if (!bki3.isEmpty()) {
+                if (bki3.isDamageableItem()) {
+                    bki3.setDamageValue(bki3.getDamageValue() + this.random.nextInt(2));
+                    if (bki3.getDamageValue() >= bki3.getMaxDamage()) {
                         this.broadcastBreakEvent(EquipmentSlot.HEAD);
                         this.setItemSlot(EquipmentSlot.HEAD, ItemStack.EMPTY);
                     }
@@ -128,25 +129,25 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
     public void rideTick() {
         super.rideTick();
         if (this.getVehicle() instanceof PathfinderMob) {
-            final PathfinderMob alg2 = (PathfinderMob)this.getVehicle();
-            this.yBodyRot = alg2.yBodyRot;
+            final PathfinderMob apg2 = (PathfinderMob)this.getVehicle();
+            this.yBodyRot = apg2.yBodyRot;
         }
     }
     
     @Override
-    protected void populateDefaultEquipmentSlots(final DifficultyInstance ajj) {
-        super.populateDefaultEquipmentSlots(ajj);
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
+        super.populateDefaultEquipmentSlots(ane);
         this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.BOW));
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        alm = super.finalizeSpawn(bjx, ajj, alc, alm, jt);
-        this.populateDefaultEquipmentSlots(ajj);
-        this.populateDefaultEquipmentEnchantments(ajj);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        apo = super.finalizeSpawn(bqc, ane, apb, apo, le);
+        this.populateDefaultEquipmentSlots(ane);
+        this.populateDefaultEquipmentEnchantments(ane);
         this.reassessWeaponGoal();
-        this.setCanPickUpLoot(this.random.nextFloat() < 0.55f * ajj.getSpecialMultiplier());
+        this.setCanPickUpLoot(this.random.nextFloat() < 0.55f * ane.getSpecialMultiplier());
         if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
             final LocalDate localDate7 = LocalDate.now();
             final int integer8 = localDate7.get(ChronoField.DAY_OF_MONTH);
@@ -156,7 +157,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
                 this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0f;
             }
         }
-        return alm;
+        return apo;
     }
     
     public void reassessWeaponGoal() {
@@ -165,8 +166,8 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
         }
         this.goalSelector.removeGoal(this.meleeGoal);
         this.goalSelector.removeGoal(this.bowGoal);
-        final ItemStack ben2 = this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW));
-        if (ben2.getItem() == Items.BOW) {
+        final ItemStack bki2 = this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW));
+        if (bki2.getItem() == Items.BOW) {
             int integer3 = 20;
             if (this.level.getDifficulty() != Difficulty.HARD) {
                 integer3 = 40;
@@ -180,43 +181,48 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
     }
     
     @Override
-    public void performRangedAttack(final LivingEntity akz, final float float2) {
-        final ItemStack ben4 = this.getProjectile(this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW)));
-        final AbstractArrow ayn5 = this.getArrow(ben4, float2);
-        final double double6 = akz.getX() - this.getX();
-        final double double7 = akz.getY(0.3333333333333333) - ayn5.getY();
-        final double double8 = akz.getZ() - this.getZ();
+    public void performRangedAttack(final LivingEntity aoy, final float float2) {
+        final ItemStack bki4 = this.getProjectile(this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW)));
+        final AbstractArrow beg5 = this.getArrow(bki4, float2);
+        final double double6 = aoy.getX() - this.getX();
+        final double double7 = aoy.getY(0.3333333333333333) - beg5.getY();
+        final double double8 = aoy.getZ() - this.getZ();
         final double double9 = Mth.sqrt(double6 * double6 + double8 * double8);
-        ayn5.shoot(double6, double7 + double9 * 0.20000000298023224, double8, 1.6f, (float)(14 - this.level.getDifficulty().getId() * 4));
+        beg5.shoot(double6, double7 + double9 * 0.20000000298023224, double8, 1.6f, (float)(14 - this.level.getDifficulty().getId() * 4));
         this.playSound(SoundEvents.SKELETON_SHOOT, 1.0f, 1.0f / (this.getRandom().nextFloat() * 0.4f + 0.8f));
-        this.level.addFreshEntity(ayn5);
+        this.level.addFreshEntity(beg5);
     }
     
-    protected AbstractArrow getArrow(final ItemStack ben, final float float2) {
-        return ProjectileUtil.getMobArrow(this, ben, float2);
+    protected AbstractArrow getArrow(final ItemStack bki, final float float2) {
+        return ProjectileUtil.getMobArrow(this, bki, float2);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
+    public boolean canFireProjectileWeapon(final ProjectileWeaponItem bkv) {
+        return bkv == Items.BOW;
+    }
+    
+    @Override
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
         this.reassessWeaponGoal();
     }
     
     @Override
-    public void setItemSlot(final EquipmentSlot akv, final ItemStack ben) {
-        super.setItemSlot(akv, ben);
+    public void setItemSlot(final EquipmentSlot aor, final ItemStack bki) {
+        super.setItemSlot(aor, bki);
         if (!this.level.isClientSide) {
             this.reassessWeaponGoal();
         }
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 1.74f;
     }
     
     @Override
-    public double getRidingHeight() {
+    public double getMyRidingOffset() {
         return -0.6;
     }
 }
diff --git a/src/net/minecraft/world/entity/monster/Blaze.java b/src/net/minecraft/world/entity/monster/Blaze.java
index 687ddae..8a51cb4 100644
--- a/src/net/minecraft/world/entity/monster/Blaze.java
+++ b/src/net/minecraft/world/entity/monster/Blaze.java
@@ -1,7 +1,6 @@
 package net.minecraft.world.entity.monster;
 
 import net.minecraft.world.entity.projectile.SmallFireball;
-import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import java.util.EnumSet;
 import net.minecraft.world.entity.Entity;
@@ -13,6 +12,8 @@ import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
@@ -34,8 +35,8 @@ public class Blaze extends Monster {
     private int nextHeightOffsetChangeTick;
     private static final EntityDataAccessor<Byte> DATA_FLAGS_ID;
     
-    public Blaze(final EntityType<? extends Blaze> aku, final Level bjw) {
-        super(aku, bjw);
+    public Blaze(final EntityType<? extends Blaze> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.allowedHeightOffset = 0.5f;
         this.setPathfindingMalus(BlockPathTypes.WATER, -1.0f);
         this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0f);
@@ -55,12 +56,8 @@ public class Blaze extends Monster {
         this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(6.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.23000000417232513);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(48.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.ATTACK_DAMAGE, 6.0).add(Attributes.MOVEMENT_SPEED, 0.23000000417232513).add(Attributes.FOLLOW_RANGE, 48.0);
     }
     
     @Override
@@ -75,7 +72,7 @@ public class Blaze extends Monster {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.BLAZE_HURT;
     }
     
@@ -105,20 +102,22 @@ public class Blaze extends Monster {
         super.aiStep();
     }
     
+    @Override
+    public boolean isSensitiveToWater() {
+        return true;
+    }
+    
     @Override
     protected void customServerAiStep() {
-        if (this.isInWaterRainOrBubble()) {
-            this.hurt(DamageSource.DROWN, 1.0f);
-        }
         --this.nextHeightOffsetChangeTick;
         if (this.nextHeightOffsetChangeTick <= 0) {
             this.nextHeightOffsetChangeTick = 100;
             this.allowedHeightOffset = 0.5f + (float)this.random.nextGaussian() * 3.0f;
         }
-        final LivingEntity akz2 = this.getTarget();
-        if (akz2 != null && akz2.getEyeY() > this.getEyeY() + this.allowedHeightOffset && this.canAttack(akz2)) {
-            final Vec3 cvl3 = this.getDeltaMovement();
-            this.setDeltaMovement(this.getDeltaMovement().add(0.0, (0.30000001192092896 - cvl3.y) * 0.30000001192092896, 0.0));
+        final LivingEntity aoy2 = this.getTarget();
+        if (aoy2 != null && aoy2.getEyeY() > this.getEyeY() + this.allowedHeightOffset && this.canAttack(aoy2)) {
+            final Vec3 dem3 = this.getDeltaMovement();
+            this.setDeltaMovement(this.getDeltaMovement().add(0.0, (0.30000001192092896 - dem3.y) * 0.30000001192092896, 0.0));
             this.hasImpulse = true;
         }
         super.customServerAiStep();
@@ -159,15 +158,15 @@ public class Blaze extends Monster {
         private int attackTime;
         private int lastSeen;
         
-        public BlazeAttackGoal(final Blaze awg) {
-            this.blaze = awg;
+        public BlazeAttackGoal(final Blaze bbl) {
+            this.blaze = bbl;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
         }
         
         @Override
         public boolean canUse() {
-            final LivingEntity akz2 = this.blaze.getTarget();
-            return akz2 != null && akz2.isAlive() && this.blaze.canAttack(akz2);
+            final LivingEntity aoy2 = this.blaze.getTarget();
+            return aoy2 != null && aoy2.isAlive() && this.blaze.canAttack(aoy2);
         }
         
         @Override
@@ -184,32 +183,32 @@ public class Blaze extends Monster {
         @Override
         public void tick() {
             --this.attackTime;
-            final LivingEntity akz2 = this.blaze.getTarget();
-            if (akz2 == null) {
+            final LivingEntity aoy2 = this.blaze.getTarget();
+            if (aoy2 == null) {
                 return;
             }
-            final boolean boolean3 = this.blaze.getSensing().canSee(akz2);
+            final boolean boolean3 = this.blaze.getSensing().canSee(aoy2);
             if (boolean3) {
                 this.lastSeen = 0;
             }
             else {
                 ++this.lastSeen;
             }
-            final double double4 = this.blaze.distanceToSqr(akz2);
+            final double double4 = this.blaze.distanceToSqr(aoy2);
             if (double4 < 4.0) {
                 if (!boolean3) {
                     return;
                 }
                 if (this.attackTime <= 0) {
                     this.attackTime = 20;
-                    this.blaze.doHurtTarget(akz2);
+                    this.blaze.doHurtTarget(aoy2);
                 }
-                this.blaze.getMoveControl().setWantedPosition(akz2.getX(), akz2.getY(), akz2.getZ(), 1.0);
+                this.blaze.getMoveControl().setWantedPosition(aoy2.getX(), aoy2.getY(), aoy2.getZ(), 1.0);
             }
             else if (double4 < this.getFollowDistance() * this.getFollowDistance() && boolean3) {
-                final double double5 = akz2.getX() - this.blaze.getX();
-                final double double6 = akz2.getY(0.5) - this.blaze.getY(0.5);
-                final double double7 = akz2.getZ() - this.blaze.getZ();
+                final double double5 = aoy2.getX() - this.blaze.getX();
+                final double double6 = aoy2.getY(0.5) - this.blaze.getY(0.5);
+                final double double7 = aoy2.getZ() - this.blaze.getZ();
                 if (this.attackTime <= 0) {
                     ++this.attackStep;
                     if (this.attackStep == 1) {
@@ -226,24 +225,26 @@ public class Blaze extends Monster {
                     }
                     if (this.attackStep > 1) {
                         final float float12 = Mth.sqrt(Mth.sqrt(double4)) * 0.5f;
-                        this.blaze.level.levelEvent(null, 1018, new BlockPos(this.blaze), 0);
+                        if (!this.blaze.isSilent()) {
+                            this.blaze.level.levelEvent(null, 1018, this.blaze.blockPosition(), 0);
+                        }
                         for (int integer13 = 0; integer13 < 1; ++integer13) {
-                            final SmallFireball azb14 = new SmallFireball(this.blaze.level, this.blaze, double5 + this.blaze.getRandom().nextGaussian() * float12, double6, double7 + this.blaze.getRandom().nextGaussian() * float12);
-                            azb14.setPos(azb14.getX(), this.blaze.getY(0.5) + 0.5, azb14.getZ());
-                            this.blaze.level.addFreshEntity(azb14);
+                            final SmallFireball bev14 = new SmallFireball(this.blaze.level, this.blaze, double5 + this.blaze.getRandom().nextGaussian() * float12, double6, double7 + this.blaze.getRandom().nextGaussian() * float12);
+                            bev14.setPos(bev14.getX(), this.blaze.getY(0.5) + 0.5, bev14.getZ());
+                            this.blaze.level.addFreshEntity(bev14);
                         }
                     }
                 }
-                this.blaze.getLookControl().setLookAt(akz2, 10.0f, 10.0f);
+                this.blaze.getLookControl().setLookAt(aoy2, 10.0f, 10.0f);
             }
             else if (this.lastSeen < 5) {
-                this.blaze.getMoveControl().setWantedPosition(akz2.getX(), akz2.getY(), akz2.getZ(), 1.0);
+                this.blaze.getMoveControl().setWantedPosition(aoy2.getX(), aoy2.getY(), aoy2.getZ(), 1.0);
             }
             super.tick();
         }
         
         private double getFollowDistance() {
-            return this.blaze.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).getValue();
+            return this.blaze.getAttributeValue(Attributes.FOLLOW_RANGE);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/monster/CaveSpider.java b/src/net/minecraft/world/entity/monster/CaveSpider.java
index ce50bbb..edb0f14 100644
--- a/src/net/minecraft/world/entity/monster/CaveSpider.java
+++ b/src/net/minecraft/world/entity/monster/CaveSpider.java
@@ -13,24 +13,24 @@ import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class CaveSpider extends Spider {
-    public CaveSpider(final EntityType<? extends CaveSpider> aku, final Level bjw) {
-        super(aku, bjw);
+    public CaveSpider(final EntityType<? extends CaveSpider> aoq, final Level bqb) {
+        super(aoq, bqb);
+    }
+    
+    public static AttributeSupplier.Builder createCaveSpider() {
+        return Spider.createAttributes().add(Attributes.MAX_HEALTH, 12.0);
     }
     
     @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(12.0);
-    }
-    
-    @Override
-    public boolean doHurtTarget(final Entity akq) {
-        if (super.doHurtTarget(akq)) {
-            if (akq instanceof LivingEntity) {
+    public boolean doHurtTarget(final Entity aom) {
+        if (super.doHurtTarget(aom)) {
+            if (aom instanceof LivingEntity) {
                 int integer3 = 0;
                 if (this.level.getDifficulty() == Difficulty.NORMAL) {
                     integer3 = 7;
@@ -39,7 +39,7 @@ public class CaveSpider extends Spider {
                     integer3 = 15;
                 }
                 if (integer3 > 0) {
-                    ((LivingEntity)akq).addEffect(new MobEffectInstance(MobEffects.POISON, integer3 * 20, 0));
+                    ((LivingEntity)aom).addEffect(new MobEffectInstance(MobEffects.POISON, integer3 * 20, 0));
                 }
             }
             return true;
@@ -49,12 +49,12 @@ public class CaveSpider extends Spider {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        return alm;
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        return apo;
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 0.45f;
     }
 }
diff --git a/src/net/minecraft/world/entity/monster/Creeper.java b/src/net/minecraft/world/entity/monster/Creeper.java
index 3457356..029598b 100644
--- a/src/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/net/minecraft/world/entity/monster/Creeper.java
@@ -9,8 +9,9 @@ import net.minecraft.world.entity.AreaEffectCloud;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.world.entity.LightningBolt;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.ItemLike;
@@ -19,6 +20,8 @@ import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
@@ -50,8 +53,8 @@ public class Creeper extends Monster implements PowerableMob {
     private int explosionRadius;
     private int droppedSkulls;
     
-    public Creeper(final EntityType<? extends Creeper> aku, final Level bjw) {
-        super(aku, bjw);
+    public Creeper(final EntityType<? extends Creeper> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.maxSwell = 30;
         this.explosionRadius = 3;
     }
@@ -70,10 +73,8 @@ public class Creeper extends Monster implements PowerableMob {
         this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.25);
     }
     
     @Override
@@ -103,27 +104,27 @@ public class Creeper extends Monster implements PowerableMob {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         if (this.entityData.<Boolean>get(Creeper.DATA_IS_POWERED)) {
-            jt.putBoolean("powered", true);
+            le.putBoolean("powered", true);
         }
-        jt.putShort("Fuse", (short)this.maxSwell);
-        jt.putByte("ExplosionRadius", (byte)this.explosionRadius);
-        jt.putBoolean("ignited", this.isIgnited());
+        le.putShort("Fuse", (short)this.maxSwell);
+        le.putByte("ExplosionRadius", (byte)this.explosionRadius);
+        le.putBoolean("ignited", this.isIgnited());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.entityData.<Boolean>set(Creeper.DATA_IS_POWERED, jt.getBoolean("powered"));
-        if (jt.contains("Fuse", 99)) {
-            this.maxSwell = jt.getShort("Fuse");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.entityData.<Boolean>set(Creeper.DATA_IS_POWERED, le.getBoolean("powered"));
+        if (le.contains("Fuse", 99)) {
+            this.maxSwell = le.getShort("Fuse");
         }
-        if (jt.contains("ExplosionRadius", 99)) {
-            this.explosionRadius = jt.getByte("ExplosionRadius");
+        if (le.contains("ExplosionRadius", 99)) {
+            this.explosionRadius = le.getByte("ExplosionRadius");
         }
-        if (jt.getBoolean("ignited")) {
+        if (le.getBoolean("ignited")) {
             this.ignite();
         }
     }
@@ -152,7 +153,7 @@ public class Creeper extends Monster implements PowerableMob {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.CREEPER_HURT;
     }
     
@@ -162,20 +163,20 @@ public class Creeper extends Monster implements PowerableMob {
     }
     
     @Override
-    protected void dropCustomDeathLoot(final DamageSource ajz, final int integer, final boolean boolean3) {
-        super.dropCustomDeathLoot(ajz, integer, boolean3);
-        final Entity akq5 = ajz.getEntity();
-        if (akq5 != this && akq5 instanceof Creeper) {
-            final Creeper awi6 = (Creeper)akq5;
-            if (awi6.canDropMobsSkull()) {
-                awi6.increaseDroppedSkulls();
+    protected void dropCustomDeathLoot(final DamageSource anw, final int integer, final boolean boolean3) {
+        super.dropCustomDeathLoot(anw, integer, boolean3);
+        final Entity aom5 = anw.getEntity();
+        if (aom5 != this && aom5 instanceof Creeper) {
+            final Creeper bbn6 = (Creeper)aom5;
+            if (bbn6.canDropMobsSkull()) {
+                bbn6.increaseDroppedSkulls();
                 this.spawnAtLocation(Items.CREEPER_HEAD);
             }
         }
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
+    public boolean doHurtTarget(final Entity aom) {
         return true;
     }
     
@@ -197,23 +198,23 @@ public class Creeper extends Monster implements PowerableMob {
     }
     
     @Override
-    public void thunderHit(final LightningBolt avy) {
-        super.thunderHit(avy);
+    public void thunderHit(final LightningBolt aox) {
+        super.thunderHit(aox);
         this.entityData.<Boolean>set(Creeper.DATA_IS_POWERED, true);
     }
     
     @Override
-    protected boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() == Items.FLINT_AND_STEEL) {
-            this.level.playSound(ayj, this.getX(), this.getY(), this.getZ(), SoundEvents.FLINTANDSTEEL_USE, this.getSoundSource(), 1.0f, this.random.nextFloat() * 0.4f + 0.8f);
+    protected InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (bki4.getItem() == Items.FLINT_AND_STEEL) {
+            this.level.playSound(bec, this.getX(), this.getY(), this.getZ(), SoundEvents.FLINTANDSTEEL_USE, this.getSoundSource(), 1.0f, this.random.nextFloat() * 0.4f + 0.8f);
             if (!this.level.isClientSide) {
                 this.ignite();
-                ben4.<Player>hurtAndBreak(1, ayj, ayj -> ayj.broadcastBreakEvent(ajk));
+                bki4.<Player>hurtAndBreak(1, bec, bec -> bec.broadcastBreakEvent(anf));
             }
-            return true;
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        return super.mobInteract(ayj, ajk);
+        return super.mobInteract(bec, anf);
     }
     
     private void explodeCreeper() {
@@ -230,16 +231,16 @@ public class Creeper extends Monster implements PowerableMob {
     private void spawnLingeringCloud() {
         final Collection<MobEffectInstance> collection2 = this.getActiveEffects();
         if (!collection2.isEmpty()) {
-            final AreaEffectCloud akp3 = new AreaEffectCloud(this.level, this.getX(), this.getY(), this.getZ());
-            akp3.setRadius(2.5f);
-            akp3.setRadiusOnUse(-0.5f);
-            akp3.setWaitTime(10);
-            akp3.setDuration(akp3.getDuration() / 2);
-            akp3.setRadiusPerTick(-akp3.getRadius() / akp3.getDuration());
-            for (final MobEffectInstance akk5 : collection2) {
-                akp3.addEffect(new MobEffectInstance(akk5));
+            final AreaEffectCloud aol3 = new AreaEffectCloud(this.level, this.getX(), this.getY(), this.getZ());
+            aol3.setRadius(2.5f);
+            aol3.setRadiusOnUse(-0.5f);
+            aol3.setWaitTime(10);
+            aol3.setDuration(aol3.getDuration() / 2);
+            aol3.setRadiusPerTick(-aol3.getRadius() / aol3.getDuration());
+            for (final MobEffectInstance aog5 : collection2) {
+                aol3.addEffect(new MobEffectInstance(aog5));
             }
-            this.level.addFreshEntity(akp3);
+            this.level.addFreshEntity(aol3);
         }
     }
     
diff --git a/src/net/minecraft/world/entity/monster/CrossbowAttackMob.java b/src/net/minecraft/world/entity/monster/CrossbowAttackMob.java
index 6d72664..3255b50 100644
--- a/src/net/minecraft/world/entity/monster/CrossbowAttackMob.java
+++ b/src/net/minecraft/world/entity/monster/CrossbowAttackMob.java
@@ -1,15 +1,62 @@
 package net.minecraft.world.entity.monster;
 
+import com.mojang.math.Quaternion;
+import com.mojang.math.Vector3f;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.Mth;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.item.CrossbowItem;
+import net.minecraft.world.entity.projectile.ProjectileUtil;
+import net.minecraft.world.item.Items;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.projectile.Projectile;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.LivingEntity;
 
-public interface CrossbowAttackMob {
+public interface CrossbowAttackMob extends RangedAttackMob {
     void setChargingCrossbow(final boolean boolean1);
     
-    void shootProjectile(final LivingEntity akz, final ItemStack ben, final Projectile ayy, final float float4);
+    void shootCrossbowProjectile(final LivingEntity aoy, final ItemStack bki, final Projectile bes, final float float4);
     
     @Nullable
     LivingEntity getTarget();
+    
+    void onCrossbowAttackPerformed();
+    
+    default void performCrossbowAttack(final LivingEntity aoy, final float float2) {
+        final InteractionHand anf4 = ProjectileUtil.getWeaponHoldingHand(aoy, Items.CROSSBOW);
+        final ItemStack bki5 = aoy.getItemInHand(anf4);
+        if (aoy.isHolding(Items.CROSSBOW)) {
+            CrossbowItem.performShooting(aoy.level, aoy, anf4, bki5, float2, (float)(14 - aoy.level.getDifficulty().getId() * 4));
+        }
+        this.onCrossbowAttackPerformed();
+    }
+    
+    default void shootCrossbowProjectile(final LivingEntity aoy1, final LivingEntity aoy2, final Projectile bes, final float float4, final float float5) {
+        final Entity aom7 = bes;
+        final double double8 = aoy2.getX() - aoy1.getX();
+        final double double9 = aoy2.getZ() - aoy1.getZ();
+        final double double10 = Mth.sqrt(double8 * double8 + double9 * double9);
+        final double double11 = aoy2.getY(0.3333333333333333) - aom7.getY() + double10 * 0.20000000298023224;
+        final Vector3f g16 = this.getProjectileShotVector(aoy1, new Vec3(double8, double11, double9), float4);
+        bes.shoot(g16.x(), g16.y(), g16.z(), float5, (float)(14 - aoy1.level.getDifficulty().getId() * 4));
+        aoy1.playSound(SoundEvents.CROSSBOW_SHOOT, 1.0f, 1.0f / (aoy1.getRandom().nextFloat() * 0.4f + 0.8f));
+    }
+    
+    default Vector3f getProjectileShotVector(final LivingEntity aoy, final Vec3 dem, final float float3) {
+        final Vec3 dem2 = dem.normalize();
+        Vec3 dem3 = dem2.cross(new Vec3(0.0, 1.0, 0.0));
+        if (dem3.lengthSqr() <= 1.0E-7) {
+            dem3 = dem2.cross(aoy.getUpVector(1.0f));
+        }
+        final Quaternion d7 = new Quaternion(new Vector3f(dem3), 90.0f, true);
+        final Vector3f g8 = new Vector3f(dem2);
+        g8.transform(d7);
+        final Quaternion d8 = new Quaternion(g8, float3, true);
+        final Vector3f g9 = new Vector3f(dem2);
+        g9.transform(d8);
+        return g9;
+    }
 }
diff --git a/src/net/minecraft/world/entity/monster/Drowned.java b/src/net/minecraft/world/entity/monster/Drowned.java
index c4b275f..7657b53 100644
--- a/src/net/minecraft/world/entity/monster/Drowned.java
+++ b/src/net/minecraft/world/entity/monster/Drowned.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.entity.monster;
 
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.ai.control.MoveControl;
 import net.minecraft.world.entity.ai.goal.ZombieAttackGoal;
 import net.minecraft.core.Vec3i;
@@ -24,6 +25,8 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.Difficulty;
 import java.util.Random;
@@ -59,13 +62,13 @@ public class Drowned extends Zombie implements RangedAttackMob {
     protected final WaterBoundPathNavigation waterNavigation;
     protected final GroundPathNavigation groundNavigation;
     
-    public Drowned(final EntityType<? extends Drowned> aku, final Level bjw) {
-        super(aku, bjw);
+    public Drowned(final EntityType<? extends Drowned> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.maxUpStep = 1.0f;
         this.moveControl = new DrownedMoveControl(this);
         this.setPathfindingMalus(BlockPathTypes.WATER, 0.0f);
-        this.waterNavigation = new WaterBoundPathNavigation(this, bjw);
-        this.groundNavigation = new GroundPathNavigation(this, bjw);
+        this.waterNavigation = new WaterBoundPathNavigation(this, bqb);
+        this.groundNavigation = new GroundPathNavigation(this, bqb);
     }
     
     @Override
@@ -76,7 +79,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
         this.goalSelector.addGoal(5, new DrownedGoToBeachGoal(this, 1.0));
         this.goalSelector.addGoal(6, new DrownedSwimUpGoal(this, 1.0, this.level.getSeaLevel()));
         this.goalSelector.addGoal(7, new RandomStrollGoal(this, 1.0));
-        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[] { Drowned.class }).setAlertOthers(PigZombie.class));
+        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[] { Drowned.class }).setAlertOthers(ZombifiedPiglin.class));
         this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::okTarget));
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false));
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
@@ -84,26 +87,26 @@ public class Drowned extends Zombie implements RangedAttackMob {
     }
     
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        alm = super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        apo = super.finalizeSpawn(bqc, ane, apb, apo, le);
         if (this.getItemBySlot(EquipmentSlot.OFFHAND).isEmpty() && this.random.nextFloat() < 0.03f) {
             this.setItemSlot(EquipmentSlot.OFFHAND, new ItemStack(Items.NAUTILUS_SHELL));
             this.handDropChances[EquipmentSlot.OFFHAND.getIndex()] = 2.0f;
         }
-        return alm;
+        return apo;
     }
     
-    public static boolean checkDrownedSpawnRules(final EntityType<Drowned> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        final Biome bkt6 = bjx.getBiome(fk);
-        final boolean boolean7 = bjx.getDifficulty() != Difficulty.PEACEFUL && Monster.isDarkEnoughToSpawn(bjx, fk, random) && (alc == MobSpawnType.SPAWNER || bjx.getFluidState(fk).is(FluidTags.WATER));
-        if (bkt6 == Biomes.RIVER || bkt6 == Biomes.FROZEN_RIVER) {
+    public static boolean checkDrownedSpawnRules(final EntityType<Drowned> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        final Biome bre6 = bqc.getBiome(fu);
+        final boolean boolean7 = bqc.getDifficulty() != Difficulty.PEACEFUL && Monster.isDarkEnoughToSpawn(bqc, fu, random) && (apb == MobSpawnType.SPAWNER || bqc.getFluidState(fu).is(FluidTags.WATER));
+        if (bre6 == Biomes.RIVER || bre6 == Biomes.FROZEN_RIVER) {
             return random.nextInt(15) == 0 && boolean7;
         }
-        return random.nextInt(40) == 0 && isDeepEnoughToSpawn(bjx, fk) && boolean7;
+        return random.nextInt(40) == 0 && isDeepEnoughToSpawn(bqc, fu) && boolean7;
     }
     
-    private static boolean isDeepEnoughToSpawn(final LevelAccessor bjx, final BlockPos fk) {
-        return fk.getY() < bjx.getSeaLevel() - 5;
+    private static boolean isDeepEnoughToSpawn(final LevelAccessor bqc, final BlockPos fu) {
+        return fu.getY() < bqc.getSeaLevel() - 5;
     }
     
     @Override
@@ -120,7 +123,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         if (this.isInWater()) {
             return SoundEvents.DROWNED_HURT_WATER;
         }
@@ -151,7 +154,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
     }
     
     @Override
-    protected void populateDefaultEquipmentSlots(final DifficultyInstance ajj) {
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
         if (this.random.nextFloat() > 0.9) {
             final int integer3 = this.random.nextInt(16);
             if (integer3 < 10) {
@@ -164,14 +167,14 @@ public class Drowned extends Zombie implements RangedAttackMob {
     }
     
     @Override
-    protected boolean canReplaceCurrentItem(final ItemStack ben1, final ItemStack ben2, final EquipmentSlot akv) {
-        if (ben2.getItem() == Items.NAUTILUS_SHELL) {
+    protected boolean canReplaceCurrentItem(final ItemStack bki1, final ItemStack bki2) {
+        if (bki2.getItem() == Items.NAUTILUS_SHELL) {
             return false;
         }
-        if (ben2.getItem() == Items.TRIDENT) {
-            return ben1.getItem() == Items.TRIDENT && ben1.getDamageValue() < ben2.getDamageValue();
+        if (bki2.getItem() == Items.TRIDENT) {
+            return bki1.getItem() == Items.TRIDENT && bki1.getDamageValue() < bki2.getDamageValue();
         }
-        return ben1.getItem() == Items.TRIDENT || super.canReplaceCurrentItem(ben1, ben2, akv);
+        return bki1.getItem() == Items.TRIDENT || super.canReplaceCurrentItem(bki1, bki2);
     }
     
     @Override
@@ -180,16 +183,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
     }
     
     @Override
-    public boolean checkSpawnObstruction(final LevelReader bjz) {
-        return bjz.isUnobstructed(this);
+    public boolean checkSpawnObstruction(final LevelReader bqd) {
+        return bqd.isUnobstructed(this);
     }
     
-    public boolean okTarget(@Nullable final LivingEntity akz) {
-        return akz != null && (!this.level.isDay() || akz.isInWater());
+    public boolean okTarget(@Nullable final LivingEntity aoy) {
+        return aoy != null && (!this.level.isDay() || aoy.isInWater());
     }
     
     @Override
-    public boolean isPushedByWater() {
+    public boolean isPushedByFluid() {
         return !this.isSwimming();
     }
     
@@ -197,19 +200,19 @@ public class Drowned extends Zombie implements RangedAttackMob {
         if (this.searchingForLand) {
             return true;
         }
-        final LivingEntity akz2 = this.getTarget();
-        return akz2 != null && akz2.isInWater();
+        final LivingEntity aoy2 = this.getTarget();
+        return aoy2 != null && aoy2.isInWater();
     }
     
     @Override
-    public void travel(final Vec3 cvl) {
+    public void travel(final Vec3 dem) {
         if (this.isEffectiveAi() && this.isInWater() && this.wantsToSwim()) {
-            this.moveRelative(0.01f, cvl);
+            this.moveRelative(0.01f, dem);
             this.move(MoverType.SELF, this.getDeltaMovement());
             this.setDeltaMovement(this.getDeltaMovement().scale(0.9));
         }
         else {
-            super.travel(cvl);
+            super.travel(dem);
         }
     }
     
@@ -228,11 +231,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
     }
     
     protected boolean closeToNextPos() {
-        final Path cqq2 = this.getNavigation().getPath();
-        if (cqq2 != null) {
-            final BlockPos fk3 = cqq2.getTarget();
-            if (fk3 != null) {
-                final double double4 = this.distanceToSqr(fk3.getX(), fk3.getY(), fk3.getZ());
+        final Path czf2 = this.getNavigation().getPath();
+        if (czf2 != null) {
+            final BlockPos fu3 = czf2.getTarget();
+            if (fu3 != null) {
+                final double double4 = this.distanceToSqr(fu3.getX(), fu3.getY(), fu3.getZ());
                 if (double4 < 4.0) {
                     return true;
                 }
@@ -242,15 +245,15 @@ public class Drowned extends Zombie implements RangedAttackMob {
     }
     
     @Override
-    public void performRangedAttack(final LivingEntity akz, final float float2) {
-        final ThrownTrident azk4 = new ThrownTrident(this.level, this, new ItemStack(Items.TRIDENT));
-        final double double5 = akz.getX() - this.getX();
-        final double double6 = akz.getY(0.3333333333333333) - azk4.getY();
-        final double double7 = akz.getZ() - this.getZ();
+    public void performRangedAttack(final LivingEntity aoy, final float float2) {
+        final ThrownTrident bfe4 = new ThrownTrident(this.level, this, new ItemStack(Items.TRIDENT));
+        final double double5 = aoy.getX() - this.getX();
+        final double double6 = aoy.getY(0.3333333333333333) - bfe4.getY();
+        final double double7 = aoy.getZ() - this.getZ();
         final double double8 = Mth.sqrt(double5 * double5 + double7 * double7);
-        azk4.shoot(double5, double6 + double8 * 0.20000000298023224, double7, 1.6f, (float)(14 - this.level.getDifficulty().getId() * 4));
+        bfe4.shoot(double5, double6 + double8 * 0.20000000298023224, double7, 1.6f, (float)(14 - this.level.getDifficulty().getId() * 4));
         this.playSound(SoundEvents.DROWNED_SHOOT, 1.0f, 1.0f / (this.getRandom().nextFloat() * 0.4f + 0.8f));
-        this.level.addFreshEntity(azk4);
+        this.level.addFreshEntity(bfe4);
     }
     
     public void setSearchingForLand(final boolean boolean1) {
@@ -260,9 +263,9 @@ public class Drowned extends Zombie implements RangedAttackMob {
     static class DrownedTridentAttackGoal extends RangedAttackGoal {
         private final Drowned drowned;
         
-        public DrownedTridentAttackGoal(final RangedAttackMob axb, final double double2, final int integer, final float float4) {
-            super(axb, double2, integer, float4);
-            this.drowned = (Drowned)axb;
+        public DrownedTridentAttackGoal(final RangedAttackMob bcf, final double double2, final int integer, final float float4) {
+            super(bcf, double2, integer, float4);
+            this.drowned = (Drowned)bcf;
         }
         
         @Override
@@ -291,8 +294,8 @@ public class Drowned extends Zombie implements RangedAttackMob {
         private final int seaLevel;
         private boolean stuck;
         
-        public DrownedSwimUpGoal(final Drowned awk, final double double2, final int integer) {
-            this.drowned = awk;
+        public DrownedSwimUpGoal(final Drowned bbp, final double double2, final int integer) {
+            this.drowned = bbp;
             this.speedModifier = double2;
             this.seaLevel = integer;
         }
@@ -310,12 +313,12 @@ public class Drowned extends Zombie implements RangedAttackMob {
         @Override
         public void tick() {
             if (this.drowned.getY() < this.seaLevel - 1 && (this.drowned.getNavigation().isDone() || this.drowned.closeToNextPos())) {
-                final Vec3 cvl2 = RandomPos.getPosTowards(this.drowned, 4, 8, new Vec3(this.drowned.getX(), this.seaLevel - 1, this.drowned.getZ()));
-                if (cvl2 == null) {
+                final Vec3 dem2 = RandomPos.getPosTowards(this.drowned, 4, 8, new Vec3(this.drowned.getX(), this.seaLevel - 1, this.drowned.getZ()));
+                if (dem2 == null) {
                     this.stuck = true;
                     return;
                 }
-                this.drowned.getNavigation().moveTo(cvl2.x, cvl2.y, cvl2.z, this.speedModifier);
+                this.drowned.getNavigation().moveTo(dem2.x, dem2.y, dem2.z, this.speedModifier);
             }
         }
         
@@ -334,9 +337,9 @@ public class Drowned extends Zombie implements RangedAttackMob {
     static class DrownedGoToBeachGoal extends MoveToBlockGoal {
         private final Drowned drowned;
         
-        public DrownedGoToBeachGoal(final Drowned awk, final double double2) {
-            super(awk, double2, 8, 2);
-            this.drowned = awk;
+        public DrownedGoToBeachGoal(final Drowned bbp, final double double2) {
+            super(bbp, double2, 8, 2);
+            this.drowned = bbp;
         }
         
         @Override
@@ -350,9 +353,9 @@ public class Drowned extends Zombie implements RangedAttackMob {
         }
         
         @Override
-        protected boolean isValidTarget(final LevelReader bjz, final BlockPos fk) {
-            final BlockPos fk2 = fk.above();
-            return bjz.isEmptyBlock(fk2) && bjz.isEmptyBlock(fk2.above()) && bjz.getBlockState(fk).entityCanStandOn(bjz, fk, this.drowned);
+        protected boolean isValidTarget(final LevelReader bqd, final BlockPos fu) {
+            final BlockPos fu2 = fu.above();
+            return bqd.isEmptyBlock(fu2) && bqd.isEmptyBlock(fu2.above()) && bqd.getBlockState(fu).entityCanStandOn(bqd, fu, this.drowned);
         }
         
         @Override
@@ -376,10 +379,10 @@ public class Drowned extends Zombie implements RangedAttackMob {
         private final double speedModifier;
         private final Level level;
         
-        public DrownedGoToWaterGoal(final PathfinderMob alg, final double double2) {
-            this.mob = alg;
+        public DrownedGoToWaterGoal(final PathfinderMob apg, final double double2) {
+            this.mob = apg;
             this.speedModifier = double2;
-            this.level = alg.level;
+            this.level = apg.level;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
         }
         
@@ -391,13 +394,13 @@ public class Drowned extends Zombie implements RangedAttackMob {
             if (this.mob.isInWater()) {
                 return false;
             }
-            final Vec3 cvl2 = this.getWaterPos();
-            if (cvl2 == null) {
+            final Vec3 dem2 = this.getWaterPos();
+            if (dem2 == null) {
                 return false;
             }
-            this.wantedX = cvl2.x;
-            this.wantedY = cvl2.y;
-            this.wantedZ = cvl2.z;
+            this.wantedX = dem2.x;
+            this.wantedY = dem2.y;
+            this.wantedZ = dem2.z;
             return true;
         }
         
@@ -414,11 +417,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
         @Nullable
         private Vec3 getWaterPos() {
             final Random random2 = this.mob.getRandom();
-            final BlockPos fk3 = new BlockPos(this.mob);
+            final BlockPos fu3 = this.mob.blockPosition();
             for (int integer4 = 0; integer4 < 10; ++integer4) {
-                final BlockPos fk4 = fk3.offset(random2.nextInt(20) - 10, 2 - random2.nextInt(8), random2.nextInt(20) - 10);
-                if (this.level.getBlockState(fk4).getBlock() == Blocks.WATER) {
-                    return new Vec3(fk4);
+                final BlockPos fu4 = fu3.offset(random2.nextInt(20) - 10, 2 - random2.nextInt(8), random2.nextInt(20) - 10);
+                if (this.level.getBlockState(fu4).is(Blocks.WATER)) {
+                    return Vec3.atBottomCenterOf(fu4);
                 }
             }
             return null;
@@ -428,9 +431,9 @@ public class Drowned extends Zombie implements RangedAttackMob {
     static class DrownedAttackGoal extends ZombieAttackGoal {
         private final Drowned drowned;
         
-        public DrownedAttackGoal(final Drowned awk, final double double2, final boolean boolean3) {
-            super(awk, double2, boolean3);
-            this.drowned = awk;
+        public DrownedAttackGoal(final Drowned bbp, final double double2, final boolean boolean3) {
+            super(bbp, double2, boolean3);
+            this.drowned = bbp;
         }
         
         @Override
@@ -447,16 +450,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
     static class DrownedMoveControl extends MoveControl {
         private final Drowned drowned;
         
-        public DrownedMoveControl(final Drowned awk) {
-            super(awk);
-            this.drowned = awk;
+        public DrownedMoveControl(final Drowned bbp) {
+            super(bbp);
+            this.drowned = bbp;
         }
         
         @Override
         public void tick() {
-            final LivingEntity akz2 = this.drowned.getTarget();
+            final LivingEntity aoy2 = this.drowned.getTarget();
             if (this.drowned.wantsToSwim() && this.drowned.isInWater()) {
-                if ((akz2 != null && akz2.getY() > this.drowned.getY()) || this.drowned.searchingForLand) {
+                if ((aoy2 != null && aoy2.getY() > this.drowned.getY()) || this.drowned.searchingForLand) {
                     this.drowned.setDeltaMovement(this.drowned.getDeltaMovement().add(0.0, 0.002, 0.0));
                 }
                 if (this.operation != Operation.MOVE_TO || this.drowned.getNavigation().isDone()) {
@@ -471,7 +474,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
                 final float float11 = (float)(Mth.atan2(double5, double3) * 57.2957763671875) - 90.0f;
                 this.drowned.yRot = this.rotlerp(this.drowned.yRot, float11, 90.0f);
                 this.drowned.yBodyRot = this.drowned.yRot;
-                final float float12 = (float)(this.speedModifier * this.drowned.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue());
+                final float float12 = (float)(this.speedModifier * this.drowned.getAttributeValue(Attributes.MOVEMENT_SPEED));
                 final float float13 = Mth.lerp(0.125f, this.drowned.getSpeed(), float12);
                 this.drowned.setSpeed(float13);
                 this.drowned.setDeltaMovement(this.drowned.getDeltaMovement().add(float13 * double3 * 0.005, float13 * double4 * 0.1, float13 * double5 * 0.005));
diff --git a/src/net/minecraft/world/entity/monster/ElderGuardian.java b/src/net/minecraft/world/entity/monster/ElderGuardian.java
index 4a7b4d4..ea5768a 100644
--- a/src/net/minecraft/world/entity/monster/ElderGuardian.java
+++ b/src/net/minecraft/world/entity/monster/ElderGuardian.java
@@ -3,7 +3,6 @@ package net.minecraft.world.entity.monster;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.world.effect.MobEffect;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
@@ -14,26 +13,24 @@ import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class ElderGuardian extends Guardian {
     public static final float ELDER_SIZE_SCALE;
     
-    public ElderGuardian(final EntityType<? extends ElderGuardian> aku, final Level bjw) {
-        super(aku, bjw);
+    public ElderGuardian(final EntityType<? extends ElderGuardian> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.setPersistenceRequired();
         if (this.randomStrollGoal != null) {
             this.randomStrollGoal.setInterval(400);
         }
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.30000001192092896);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(8.0);
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(80.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896).add(Attributes.ATTACK_DAMAGE, 8.0).add(Attributes.MAX_HEALTH, 80.0);
     }
     
     @Override
@@ -47,7 +44,7 @@ public class ElderGuardian extends Guardian {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return this.isInWaterOrBubble() ? SoundEvents.ELDER_GUARDIAN_HURT : SoundEvents.ELDER_GUARDIAN_HURT_LAND;
     }
     
@@ -66,20 +63,20 @@ public class ElderGuardian extends Guardian {
         super.customServerAiStep();
         final int integer2 = 1200;
         if ((this.tickCount + this.getId()) % 1200 == 0) {
-            final MobEffect aki3 = MobEffects.DIG_SLOWDOWN;
-            final List<ServerPlayer> list4 = ((ServerLevel)this.level).getPlayers(xe -> this.distanceToSqr(xe) < 2500.0 && xe.gameMode.isSurvival());
+            final MobEffect aoe3 = MobEffects.DIG_SLOWDOWN;
+            final List<ServerPlayer> list4 = ((ServerLevel)this.level).getPlayers(ze -> this.distanceToSqr(ze) < 2500.0 && ze.gameMode.isSurvival());
             final int integer3 = 2;
             final int integer4 = 6000;
             final int integer5 = 1200;
-            for (final ServerPlayer xe2 : list4) {
-                if (!xe2.hasEffect(aki3) || xe2.getEffect(aki3).getAmplifier() < 2 || xe2.getEffect(aki3).getDuration() < 1200) {
-                    xe2.connection.send(new ClientboundGameEventPacket(10, 0.0f));
-                    xe2.addEffect(new MobEffectInstance(aki3, 6000, 2));
+            for (final ServerPlayer ze2 : list4) {
+                if (!ze2.hasEffect(aoe3) || ze2.getEffect(aoe3).getAmplifier() < 2 || ze2.getEffect(aoe3).getDuration() < 1200) {
+                    ze2.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, this.isSilent() ? 0.0f : 1.0f));
+                    ze2.addEffect(new MobEffectInstance(aoe3, 6000, 2));
                 }
             }
         }
         if (!this.hasRestriction()) {
-            this.restrictTo(new BlockPos(this), 16);
+            this.restrictTo(this.blockPosition(), 16);
         }
     }
     
diff --git a/src/net/minecraft/world/entity/monster/EnderMan.java b/src/net/minecraft/world/entity/monster/EnderMan.java
index 0ec4727..a28a9d6 100644
--- a/src/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/net/minecraft/world/entity/monster/EnderMan.java
@@ -12,15 +12,17 @@ import net.minecraft.util.Mth;
 import net.minecraft.world.level.GameRules;
 import java.util.EnumSet;
 import net.minecraft.world.entity.ai.targeting.TargetingConditions;
+import net.minecraft.util.TimeUtil;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.world.damagesource.IndirectEntityDamageSource;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.entity.EntityDimensions;
@@ -29,14 +31,18 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import javax.annotation.Nullable;
-import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.entity.ai.goal.target.ResetUniversalAngerTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
+import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
 import net.minecraft.world.entity.player.Player;
@@ -49,6 +55,7 @@ import net.minecraft.world.entity.ai.goal.FloatGoal;
 import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.util.IntRange;
 import net.minecraft.world.entity.LivingEntity;
 import java.util.function.Predicate;
 import net.minecraft.world.level.block.state.BlockState;
@@ -56,8 +63,9 @@ import java.util.Optional;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import java.util.UUID;
+import net.minecraft.world.entity.NeutralMob;
 
-public class EnderMan extends Monster {
+public class EnderMan extends Monster implements NeutralMob {
     private static final UUID SPEED_MODIFIER_ATTACKING_UUID;
     private static final AttributeModifier SPEED_MODIFIER_ATTACKING;
     private static final EntityDataAccessor<Optional<BlockState>> DATA_CARRY_STATE;
@@ -66,9 +74,12 @@ public class EnderMan extends Monster {
     private static final Predicate<LivingEntity> ENDERMITE_SELECTOR;
     private int lastStareSound;
     private int targetChangeTime;
+    private static final IntRange PERSISTENT_ANGER_TIME;
+    private int remainingPersistentAngerTime;
+    private UUID persistentAngerTarget;
     
-    public EnderMan(final EntityType<? extends EnderMan> aku, final Level bjw) {
-        super(aku, bjw);
+    public EnderMan(final EntityType<? extends EnderMan> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.lastStareSound = Integer.MIN_VALUE;
         this.maxUpStep = 1.0f;
         this.setPathfindingMalus(BlockPathTypes.WATER, -1.0f);
@@ -84,35 +95,32 @@ public class EnderMan extends Monster {
         this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
         this.goalSelector.addGoal(10, new EndermanLeaveBlockGoal(this));
         this.goalSelector.addGoal(11, new EndermanTakeBlockGoal(this));
-        this.targetSelector.addGoal(1, new EndermanLookForPlayerGoal(this));
-        this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
-        this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Endermite.class, 10, true, false, EnderMan.ENDERMITE_SELECTOR));
+        this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
+        this.targetSelector.addGoal(2, new EndermanLookForPlayerGoal(this));
+        this.targetSelector.addGoal(3, new HurtByTargetGoal(this, new Class[0]));
+        this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, Endermite.class, 10, true, false, EnderMan.ENDERMITE_SELECTOR));
+        this.targetSelector.addGoal(5, new ResetUniversalAngerTargetGoal<>(this, false));
+    }
+    
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 40.0).add(Attributes.MOVEMENT_SPEED, 0.30000001192092896).add(Attributes.ATTACK_DAMAGE, 7.0).add(Attributes.FOLLOW_RANGE, 64.0);
     }
     
     @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(40.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.30000001192092896);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(7.0);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(64.0);
-    }
-    
-    @Override
-    public void setTarget(@Nullable final LivingEntity akz) {
-        super.setTarget(akz);
-        final AttributeInstance alr3 = this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED);
-        if (akz == null) {
+    public void setTarget(@Nullable final LivingEntity aoy) {
+        super.setTarget(aoy);
+        final AttributeInstance apt3 = this.getAttribute(Attributes.MOVEMENT_SPEED);
+        if (aoy == null) {
             this.targetChangeTime = 0;
             this.entityData.<Boolean>set(EnderMan.DATA_CREEPY, false);
             this.entityData.<Boolean>set(EnderMan.DATA_STARED_AT, false);
-            alr3.removeModifier(EnderMan.SPEED_MODIFIER_ATTACKING);
+            apt3.removeModifier(EnderMan.SPEED_MODIFIER_ATTACKING);
         }
         else {
             this.targetChangeTime = this.tickCount;
             this.entityData.<Boolean>set(EnderMan.DATA_CREEPY, true);
-            if (!alr3.hasModifier(EnderMan.SPEED_MODIFIER_ATTACKING)) {
-                alr3.addModifier(EnderMan.SPEED_MODIFIER_ATTACKING);
+            if (!apt3.hasModifier(EnderMan.SPEED_MODIFIER_ATTACKING)) {
+                apt3.addTransientModifier(EnderMan.SPEED_MODIFIER_ATTACKING);
             }
         }
     }
@@ -125,6 +133,31 @@ public class EnderMan extends Monster {
         this.entityData.<Boolean>define(EnderMan.DATA_STARED_AT, false);
     }
     
+    @Override
+    public void startPersistentAngerTimer() {
+        this.setRemainingPersistentAngerTime(EnderMan.PERSISTENT_ANGER_TIME.randomValue(this.random));
+    }
+    
+    @Override
+    public void setRemainingPersistentAngerTime(final int integer) {
+        this.remainingPersistentAngerTime = integer;
+    }
+    
+    @Override
+    public int getRemainingPersistentAngerTime() {
+        return this.remainingPersistentAngerTime;
+    }
+    
+    @Override
+    public void setPersistentAngerTarget(@Nullable final UUID uUID) {
+        this.persistentAngerTarget = uUID;
+    }
+    
+    @Override
+    public UUID getPersistentAngerTarget() {
+        return this.persistentAngerTarget;
+    }
+    
     public void playStareSound() {
         if (this.tickCount >= this.lastStareSound + 400) {
             this.lastStareSound = this.tickCount;
@@ -135,50 +168,52 @@ public class EnderMan extends Monster {
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (EnderMan.DATA_CREEPY.equals(sb) && this.hasBeenStaredAt() && this.level.isClientSide) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (EnderMan.DATA_CREEPY.equals(tq) && this.hasBeenStaredAt() && this.level.isClientSide) {
             this.playStareSound();
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        final BlockState byj3 = this.getCarriedBlock();
-        if (byj3 != null) {
-            jt.put("carriedBlockState", NbtUtils.writeBlockState(byj3));
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        final BlockState cfj3 = this.getCarriedBlock();
+        if (cfj3 != null) {
+            le.put("carriedBlockState", NbtUtils.writeBlockState(cfj3));
         }
+        this.addPersistentAngerSaveData(le);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        BlockState byj3 = null;
-        if (jt.contains("carriedBlockState", 10)) {
-            byj3 = NbtUtils.readBlockState(jt.getCompound("carriedBlockState"));
-            if (byj3.isAir()) {
-                byj3 = null;
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        BlockState cfj3 = null;
+        if (le.contains("carriedBlockState", 10)) {
+            cfj3 = NbtUtils.readBlockState(le.getCompound("carriedBlockState"));
+            if (cfj3.isAir()) {
+                cfj3 = null;
             }
         }
-        this.setCarriedBlock(byj3);
+        this.setCarriedBlock(cfj3);
+        this.readPersistentAngerSaveData((ServerLevel)this.level, le);
     }
     
-    private boolean isLookingAtMe(final Player ayj) {
-        final ItemStack ben3 = ayj.inventory.armor.get(3);
-        if (ben3.getItem() == Blocks.CARVED_PUMPKIN.asItem()) {
+    private boolean isLookingAtMe(final Player bec) {
+        final ItemStack bki3 = bec.inventory.armor.get(3);
+        if (bki3.getItem() == Blocks.CARVED_PUMPKIN.asItem()) {
             return false;
         }
-        final Vec3 cvl4 = ayj.getViewVector(1.0f).normalize();
-        Vec3 cvl5 = new Vec3(this.getX() - ayj.getX(), this.getEyeY() - ayj.getEyeY(), this.getZ() - ayj.getZ());
-        final double double6 = cvl5.length();
-        cvl5 = cvl5.normalize();
-        final double double7 = cvl4.dot(cvl5);
-        return double7 > 1.0 - 0.025 / double6 && ayj.canSee(this);
+        final Vec3 dem4 = bec.getViewVector(1.0f).normalize();
+        Vec3 dem5 = new Vec3(this.getX() - bec.getX(), this.getEyeY() - bec.getEyeY(), this.getZ() - bec.getZ());
+        final double double6 = dem5.length();
+        dem5 = dem5.normalize();
+        final double double7 = dem4.dot(dem5);
+        return double7 > 1.0 - 0.025 / double6 && bec.canSee(this);
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 2.55f;
     }
     
@@ -190,17 +225,22 @@ public class EnderMan extends Monster {
             }
         }
         this.jumping = false;
+        if (!this.level.isClientSide) {
+            this.updatePersistentAnger((ServerLevel)this.level, true);
+        }
         super.aiStep();
     }
     
+    @Override
+    public boolean isSensitiveToWater() {
+        return true;
+    }
+    
     @Override
     protected void customServerAiStep() {
-        if (this.isInWaterRainOrBubble()) {
-            this.hurt(DamageSource.DROWN, 1.0f);
-        }
         if (this.level.isDay() && this.tickCount >= this.targetChangeTime + 600) {
             final float float2 = this.getBrightness();
-            if (float2 > 0.5f && this.level.canSeeSky(new BlockPos(this)) && this.random.nextFloat() * 30.0f < (float2 - 0.4f) * 2.0f) {
+            if (float2 > 0.5f && this.level.canSeeSky(this.blockPosition()) && this.random.nextFloat() * 30.0f < (float2 - 0.4f) * 2.0f) {
                 this.setTarget(null);
                 this.teleport();
             }
@@ -218,13 +258,13 @@ public class EnderMan extends Monster {
         return this.teleport(double2, double3, double4);
     }
     
-    private boolean teleportTowards(final Entity akq) {
-        Vec3 cvl3 = new Vec3(this.getX() - akq.getX(), this.getY(0.5) - akq.getEyeY(), this.getZ() - akq.getZ());
-        cvl3 = cvl3.normalize();
+    private boolean teleportTowards(final Entity aom) {
+        Vec3 dem3 = new Vec3(this.getX() - aom.getX(), this.getY(0.5) - aom.getEyeY(), this.getZ() - aom.getZ());
+        dem3 = dem3.normalize();
         final double double4 = 16.0;
-        final double double5 = this.getX() + (this.random.nextDouble() - 0.5) * 8.0 - cvl3.x * 16.0;
-        final double double6 = this.getY() + (this.random.nextInt(16) - 8) - cvl3.y * 16.0;
-        final double double7 = this.getZ() + (this.random.nextDouble() - 0.5) * 8.0 - cvl3.z * 16.0;
+        final double double5 = this.getX() + (this.random.nextDouble() - 0.5) * 8.0 - dem3.x * 16.0;
+        final double double6 = this.getY() + (this.random.nextInt(16) - 8) - dem3.y * 16.0;
+        final double double7 = this.getZ() + (this.random.nextDouble() - 0.5) * 8.0 - dem3.z * 16.0;
         return this.teleport(double5, double6, double7);
     }
     
@@ -233,14 +273,14 @@ public class EnderMan extends Monster {
         while (a8.getY() > 0 && !this.level.getBlockState(a8).getMaterial().blocksMotion()) {
             a8.move(Direction.DOWN);
         }
-        final BlockState byj9 = this.level.getBlockState(a8);
-        final boolean boolean10 = byj9.getMaterial().blocksMotion();
-        final boolean boolean11 = byj9.getFluidState().is(FluidTags.WATER);
+        final BlockState cfj9 = this.level.getBlockState(a8);
+        final boolean boolean10 = cfj9.getMaterial().blocksMotion();
+        final boolean boolean11 = cfj9.getFluidState().is(FluidTags.WATER);
         if (!boolean10 || boolean11) {
             return false;
         }
         final boolean boolean12 = this.randomTeleport(double1, double2, double3, true);
-        if (boolean12) {
+        if (boolean12 && !this.isSilent()) {
             this.level.playSound(null, this.xo, this.yo, this.zo, SoundEvents.ENDERMAN_TELEPORT, this.getSoundSource(), 1.0f, 1.0f);
             this.playSound(SoundEvents.ENDERMAN_TELEPORT, 1.0f, 1.0f);
         }
@@ -253,7 +293,7 @@ public class EnderMan extends Monster {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.ENDERMAN_HURT;
     }
     
@@ -263,16 +303,16 @@ public class EnderMan extends Monster {
     }
     
     @Override
-    protected void dropCustomDeathLoot(final DamageSource ajz, final int integer, final boolean boolean3) {
-        super.dropCustomDeathLoot(ajz, integer, boolean3);
-        final BlockState byj5 = this.getCarriedBlock();
-        if (byj5 != null) {
-            this.spawnAtLocation(byj5.getBlock());
+    protected void dropCustomDeathLoot(final DamageSource anw, final int integer, final boolean boolean3) {
+        super.dropCustomDeathLoot(anw, integer, boolean3);
+        final BlockState cfj5 = this.getCarriedBlock();
+        if (cfj5 != null) {
+            this.spawnAtLocation(cfj5.getBlock());
         }
     }
     
-    public void setCarriedBlock(@Nullable final BlockState byj) {
-        this.entityData.<Optional<BlockState>>set(EnderMan.DATA_CARRY_STATE, Optional.<BlockState>ofNullable(byj));
+    public void setCarriedBlock(@Nullable final BlockState cfj) {
+        this.entityData.<Optional<BlockState>>set(EnderMan.DATA_CARRY_STATE, Optional.<BlockState>ofNullable(cfj));
     }
     
     @Nullable
@@ -281,11 +321,11 @@ public class EnderMan extends Monster {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        if (ajz instanceof IndirectEntityDamageSource || ajz == DamageSource.FIREWORKS) {
+        if (anw instanceof IndirectEntityDamageSource) {
             for (int integer4 = 0; integer4 < 64; ++integer4) {
                 if (this.teleport()) {
                     return true;
@@ -293,8 +333,8 @@ public class EnderMan extends Monster {
             }
             return false;
         }
-        final boolean boolean4 = super.hurt(ajz, float2);
-        if (!this.level.isClientSide() && ajz.isBypassArmor() && this.random.nextInt(10) != 0) {
+        final boolean boolean4 = super.hurt(anw, float2);
+        if (!this.level.isClientSide() && this.random.nextInt(10) != 0) {
             this.teleport();
         }
         return boolean4;
@@ -312,13 +352,19 @@ public class EnderMan extends Monster {
         this.entityData.<Boolean>set(EnderMan.DATA_STARED_AT, true);
     }
     
+    @Override
+    public boolean requiresCustomPersistence() {
+        return super.requiresCustomPersistence() || this.getCarriedBlock() != null;
+    }
+    
     static {
         SPEED_MODIFIER_ATTACKING_UUID = UUID.fromString("020E0DFB-87AE-4653-9556-831010E291A0");
-        SPEED_MODIFIER_ATTACKING = new AttributeModifier(EnderMan.SPEED_MODIFIER_ATTACKING_UUID, "Attacking speed boost", 0.15000000596046448, AttributeModifier.Operation.ADDITION).setSerialize(false);
+        SPEED_MODIFIER_ATTACKING = new AttributeModifier(EnderMan.SPEED_MODIFIER_ATTACKING_UUID, "Attacking speed boost", 0.15000000596046448, AttributeModifier.Operation.ADDITION);
         DATA_CARRY_STATE = SynchedEntityData.<Optional<BlockState>>defineId(EnderMan.class, EntityDataSerializers.BLOCK_STATE);
         DATA_CREEPY = SynchedEntityData.<Boolean>defineId(EnderMan.class, EntityDataSerializers.BOOLEAN);
         DATA_STARED_AT = SynchedEntityData.<Boolean>defineId(EnderMan.class, EntityDataSerializers.BOOLEAN);
-        ENDERMITE_SELECTOR = (akz -> akz instanceof Endermite && akz.isPlayerSpawned());
+        ENDERMITE_SELECTOR = (aoy -> aoy instanceof Endermite && aoy.isPlayerSpawned());
+        PERSISTENT_ANGER_TIME = TimeUtil.rangeOfSeconds(20, 39);
     }
     
     static class EndermanLookForPlayerGoal extends NearestAttackableTargetGoal<Player> {
@@ -329,11 +375,11 @@ public class EnderMan extends Monster {
         private final TargetingConditions startAggroTargetConditions;
         private final TargetingConditions continueAggroTargetConditions;
         
-        public EndermanLookForPlayerGoal(final EnderMan awm) {
-            super(awm, Player.class, false);
+        public EndermanLookForPlayerGoal(final EnderMan bbr) {
+            super(bbr, Player.class, false);
             this.continueAggroTargetConditions = new TargetingConditions().allowUnseeable();
-            this.enderman = awm;
-            this.startAggroTargetConditions = new TargetingConditions().range(this.getFollowDistance()).selector(akz -> awm.isLookingAtMe(akz));
+            this.enderman = bbr;
+            this.startAggroTargetConditions = new TargetingConditions().range(this.getFollowDistance()).selector(aoy -> bbr.isLookingAtMe(aoy));
         }
         
         @Override
@@ -369,6 +415,9 @@ public class EnderMan extends Monster {
         
         @Override
         public void tick() {
+            if (this.enderman.getTarget() == null) {
+                super.setTarget(null);
+            }
             if (this.pendingTarget != null) {
                 if (--this.aggroTime <= 0) {
                     this.target = this.pendingTarget;
@@ -397,8 +446,8 @@ public class EnderMan extends Monster {
         private final EnderMan enderman;
         private LivingEntity target;
         
-        public EndermanFreezeWhenLookedAt(final EnderMan awm) {
-            this.enderman = awm;
+        public EndermanFreezeWhenLookedAt(final EnderMan bbr) {
+            this.enderman = bbr;
             this.setFlags(EnumSet.<Flag>of(Flag.JUMP, Flag.MOVE));
         }
         
@@ -426,8 +475,8 @@ public class EnderMan extends Monster {
     static class EndermanLeaveBlockGoal extends Goal {
         private final EnderMan enderman;
         
-        public EndermanLeaveBlockGoal(final EnderMan awm) {
-            this.enderman = awm;
+        public EndermanLeaveBlockGoal(final EnderMan bbr) {
+            this.enderman = bbr;
         }
         
         @Override
@@ -438,31 +487,31 @@ public class EnderMan extends Monster {
         @Override
         public void tick() {
             final Random random2 = this.enderman.getRandom();
-            final LevelAccessor bjx3 = this.enderman.level;
+            final LevelAccessor bqc3 = this.enderman.level;
             final int integer4 = Mth.floor(this.enderman.getX() - 1.0 + random2.nextDouble() * 2.0);
             final int integer5 = Mth.floor(this.enderman.getY() + random2.nextDouble() * 2.0);
             final int integer6 = Mth.floor(this.enderman.getZ() - 1.0 + random2.nextDouble() * 2.0);
-            final BlockPos fk7 = new BlockPos(integer4, integer5, integer6);
-            final BlockState byj8 = bjx3.getBlockState(fk7);
-            final BlockPos fk8 = fk7.below();
-            final BlockState byj9 = bjx3.getBlockState(fk8);
-            final BlockState byj10 = this.enderman.getCarriedBlock();
-            if (byj10 != null && this.canPlaceBlock(bjx3, fk7, byj10, byj8, byj9, fk8)) {
-                bjx3.setBlock(fk7, byj10, 3);
+            final BlockPos fu7 = new BlockPos(integer4, integer5, integer6);
+            final BlockState cfj8 = bqc3.getBlockState(fu7);
+            final BlockPos fu8 = fu7.below();
+            final BlockState cfj9 = bqc3.getBlockState(fu8);
+            final BlockState cfj10 = this.enderman.getCarriedBlock();
+            if (cfj10 != null && this.canPlaceBlock(bqc3, fu7, cfj10, cfj8, cfj9, fu8)) {
+                bqc3.setBlock(fu7, cfj10, 3);
                 this.enderman.setCarriedBlock(null);
             }
         }
         
-        private boolean canPlaceBlock(final LevelReader bjz, final BlockPos fk2, final BlockState byj3, final BlockState byj4, final BlockState byj5, final BlockPos fk6) {
-            return byj4.isAir() && !byj5.isAir() && byj5.isCollisionShapeFullBlock(bjz, fk6) && byj3.canSurvive(bjz, fk2);
+        private boolean canPlaceBlock(final LevelReader bqd, final BlockPos fu2, final BlockState cfj3, final BlockState cfj4, final BlockState cfj5, final BlockPos fu6) {
+            return cfj4.isAir() && !cfj5.isAir() && cfj5.isCollisionShapeFullBlock(bqd, fu6) && cfj3.canSurvive(bqd, fu2);
         }
     }
     
     static class EndermanTakeBlockGoal extends Goal {
         private final EnderMan enderman;
         
-        public EndermanTakeBlockGoal(final EnderMan awm) {
-            this.enderman = awm;
+        public EndermanTakeBlockGoal(final EnderMan bbr) {
+            this.enderman = bbr;
         }
         
         @Override
@@ -473,20 +522,20 @@ public class EnderMan extends Monster {
         @Override
         public void tick() {
             final Random random2 = this.enderman.getRandom();
-            final Level bjw3 = this.enderman.level;
+            final Level bqb3 = this.enderman.level;
             final int integer4 = Mth.floor(this.enderman.getX() - 2.0 + random2.nextDouble() * 4.0);
             final int integer5 = Mth.floor(this.enderman.getY() + random2.nextDouble() * 3.0);
             final int integer6 = Mth.floor(this.enderman.getZ() - 2.0 + random2.nextDouble() * 4.0);
-            final BlockPos fk7 = new BlockPos(integer4, integer5, integer6);
-            final BlockState byj8 = bjw3.getBlockState(fk7);
-            final Block bph9 = byj8.getBlock();
-            final Vec3 cvl10 = new Vec3(Mth.floor(this.enderman.getX()) + 0.5, integer5 + 0.5, Mth.floor(this.enderman.getZ()) + 0.5);
-            final Vec3 cvl11 = new Vec3(integer4 + 0.5, integer5 + 0.5, integer6 + 0.5);
-            final BlockHitResult cvg12 = bjw3.clip(new ClipContext(cvl10, cvl11, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, this.enderman));
-            final boolean boolean13 = cvg12.getBlockPos().equals(fk7);
-            if (bph9.is(BlockTags.ENDERMAN_HOLDABLE) && boolean13) {
-                this.enderman.setCarriedBlock(byj8);
-                bjw3.removeBlock(fk7, false);
+            final BlockPos fu7 = new BlockPos(integer4, integer5, integer6);
+            final BlockState cfj8 = bqb3.getBlockState(fu7);
+            final Block bvr9 = cfj8.getBlock();
+            final Vec3 dem10 = new Vec3(Mth.floor(this.enderman.getX()) + 0.5, integer5 + 0.5, Mth.floor(this.enderman.getZ()) + 0.5);
+            final Vec3 dem11 = new Vec3(integer4 + 0.5, integer5 + 0.5, integer6 + 0.5);
+            final BlockHitResult deh12 = bqb3.clip(new ClipContext(dem10, dem11, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, this.enderman));
+            final boolean boolean13 = deh12.getBlockPos().equals(fu7);
+            if (bvr9.is(BlockTags.ENDERMAN_HOLDABLE) && boolean13) {
+                this.enderman.setCarriedBlock(cfj8);
+                bqb3.removeBlock(fu7, false);
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/monster/Endermite.java b/src/net/minecraft/world/entity/monster/Endermite.java
index 6a8cc5d..c5c4f33 100644
--- a/src/net/minecraft/world/entity/monster/Endermite.java
+++ b/src/net/minecraft/world/entity/monster/Endermite.java
@@ -12,6 +12,8 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
@@ -33,8 +35,8 @@ public class Endermite extends Monster {
     private int life;
     private boolean playerSpawned;
     
-    public Endermite(final EntityType<? extends Endermite> aku, final Level bjw) {
-        super(aku, bjw);
+    public Endermite(final EntityType<? extends Endermite> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.xpReward = 3;
     }
     
@@ -50,16 +52,12 @@ public class Endermite extends Monster {
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return 0.1f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return 0.13f;
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(8.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(2.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 8.0).add(Attributes.MOVEMENT_SPEED, 0.25).add(Attributes.ATTACK_DAMAGE, 2.0);
     }
     
     @Override
@@ -73,7 +71,7 @@ public class Endermite extends Monster {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.ENDERMITE_HURT;
     }
     
@@ -83,22 +81,22 @@ public class Endermite extends Monster {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.ENDERMITE_STEP, 0.15f, 1.0f);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.life = jt.getInt("Lifetime");
-        this.playerSpawned = jt.getBoolean("PlayerSpawned");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.life = le.getInt("Lifetime");
+        this.playerSpawned = le.getBoolean("PlayerSpawned");
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("Lifetime", this.life);
-        jt.putBoolean("PlayerSpawned", this.playerSpawned);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Lifetime", this.life);
+        le.putBoolean("PlayerSpawned", this.playerSpawned);
     }
     
     @Override
@@ -113,7 +111,7 @@ public class Endermite extends Monster {
     }
     
     @Override
-    public double getRidingHeight() {
+    public double getMyRidingOffset() {
         return 0.1;
     }
     
@@ -143,10 +141,10 @@ public class Endermite extends Monster {
         }
     }
     
-    public static boolean checkEndermiteSpawnRules(final EntityType<Endermite> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        if (Monster.checkAnyLightMonsterSpawnRules(aku, bjx, alc, fk, random)) {
-            final Player ayj6 = bjx.getNearestPlayer(fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5, 5.0, true);
-            return ayj6 == null;
+    public static boolean checkEndermiteSpawnRules(final EntityType<Endermite> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        if (Monster.checkAnyLightMonsterSpawnRules(aoq, bqc, apb, fu, random)) {
+            final Player bec6 = bqc.getNearestPlayer(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, 5.0, true);
+            return bec6 == null;
         }
         return false;
     }
diff --git a/src/net/minecraft/world/entity/monster/Evoker.java b/src/net/minecraft/world/entity/monster/Evoker.java
index 62d18d7..bb37023 100644
--- a/src/net/minecraft/world/entity/monster/Evoker.java
+++ b/src/net/minecraft/world/entity/monster/Evoker.java
@@ -22,6 +22,8 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.npc.AbstractVillager;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
@@ -43,8 +45,8 @@ import net.minecraft.world.entity.animal.Sheep;
 public class Evoker extends SpellcasterIllager {
     private Sheep wololoTarget;
     
-    public Evoker(final EntityType<? extends Evoker> aku, final Level bjw) {
-        super(aku, bjw);
+    public Evoker(final EntityType<? extends Evoker> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.xpReward = 10;
     }
     
@@ -66,12 +68,8 @@ public class Evoker extends SpellcasterIllager {
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, false));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.5);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(12.0);
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(24.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.FOLLOW_RANGE, 12.0).add(Attributes.MAX_HEALTH, 24.0);
     }
     
     @Override
@@ -80,8 +78,8 @@ public class Evoker extends SpellcasterIllager {
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
     }
     
     @Override
@@ -90,8 +88,8 @@ public class Evoker extends SpellcasterIllager {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
     }
     
     @Override
@@ -100,20 +98,20 @@ public class Evoker extends SpellcasterIllager {
     }
     
     @Override
-    public boolean isAlliedTo(final Entity akq) {
-        if (akq == null) {
+    public boolean isAlliedTo(final Entity aom) {
+        if (aom == null) {
             return false;
         }
-        if (akq == this) {
+        if (aom == this) {
             return true;
         }
-        if (super.isAlliedTo(akq)) {
+        if (super.isAlliedTo(aom)) {
             return true;
         }
-        if (akq instanceof Vex) {
-            return this.isAlliedTo(((Vex)akq).getOwner());
+        if (aom instanceof Vex) {
+            return this.isAlliedTo(((Vex)aom).getOwner());
         }
-        return akq instanceof LivingEntity && ((LivingEntity)akq).getMobType() == MobType.ILLAGER && this.getTeam() == null && akq.getTeam() == null;
+        return aom instanceof LivingEntity && ((LivingEntity)aom).getMobType() == MobType.ILLAGER && this.getTeam() == null && aom.getTeam() == null;
     }
     
     @Override
@@ -127,12 +125,12 @@ public class Evoker extends SpellcasterIllager {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.EVOKER_HURT;
     }
     
-    private void setWololoTarget(@Nullable final Sheep atv) {
-        this.wololoTarget = atv;
+    private void setWololoTarget(@Nullable final Sheep azd) {
+        this.wololoTarget = azd;
     }
     
     @Nullable
@@ -180,11 +178,11 @@ public class Evoker extends SpellcasterIllager {
         
         @Override
         protected void performSpellCasting() {
-            final LivingEntity akz2 = Evoker.this.getTarget();
-            final double double3 = Math.min(akz2.getY(), Evoker.this.getY());
-            final double double4 = Math.max(akz2.getY(), Evoker.this.getY()) + 1.0;
-            final float float7 = (float)Mth.atan2(akz2.getZ() - Evoker.this.getZ(), akz2.getX() - Evoker.this.getX());
-            if (Evoker.this.distanceToSqr(akz2) < 9.0) {
+            final LivingEntity aoy2 = Evoker.this.getTarget();
+            final double double3 = Math.min(aoy2.getY(), Evoker.this.getY());
+            final double double4 = Math.max(aoy2.getY(), Evoker.this.getY()) + 1.0;
+            final float float7 = (float)Mth.atan2(aoy2.getZ() - Evoker.this.getZ(), aoy2.getX() - Evoker.this.getX());
+            if (Evoker.this.distanceToSqr(aoy2) < 9.0) {
                 for (int integer8 = 0; integer8 < 5; ++integer8) {
                     final float float8 = float7 + integer8 * 3.1415927f * 0.4f;
                     this.createSpellEntity(Evoker.this.getX() + Mth.cos(float8) * 1.5, Evoker.this.getZ() + Mth.sin(float8) * 1.5, double3, double4, float8, 0);
@@ -204,27 +202,27 @@ public class Evoker extends SpellcasterIllager {
         }
         
         private void createSpellEntity(final double double1, final double double2, final double double3, final double double4, final float float5, final int integer) {
-            BlockPos fk12 = new BlockPos(double1, double4, double2);
+            BlockPos fu12 = new BlockPos(double1, double4, double2);
             boolean boolean13 = false;
             double double5 = 0.0;
             do {
-                final BlockPos fk13 = fk12.below();
-                final BlockState byj17 = Evoker.this.level.getBlockState(fk13);
-                if (byj17.isFaceSturdy(Evoker.this.level, fk13, Direction.UP)) {
-                    if (!Evoker.this.level.isEmptyBlock(fk12)) {
-                        final BlockState byj18 = Evoker.this.level.getBlockState(fk12);
-                        final VoxelShape cwf19 = byj18.getCollisionShape(Evoker.this.level, fk12);
-                        if (!cwf19.isEmpty()) {
-                            double5 = cwf19.max(Direction.Axis.Y);
+                final BlockPos fu13 = fu12.below();
+                final BlockState cfj17 = Evoker.this.level.getBlockState(fu13);
+                if (cfj17.isFaceSturdy(Evoker.this.level, fu13, Direction.UP)) {
+                    if (!Evoker.this.level.isEmptyBlock(fu12)) {
+                        final BlockState cfj18 = Evoker.this.level.getBlockState(fu12);
+                        final VoxelShape dfg19 = cfj18.getCollisionShape(Evoker.this.level, fu12);
+                        if (!dfg19.isEmpty()) {
+                            double5 = dfg19.max(Direction.Axis.Y);
                         }
                     }
                     boolean13 = true;
                     break;
                 }
-                fk12 = fk12.below();
-            } while (fk12.getY() >= Mth.floor(double3) - 1);
+                fu12 = fu12.below();
+            } while (fu12.getY() >= Mth.floor(double3) - 1);
             if (boolean13) {
-                Evoker.this.level.addFreshEntity(new EvokerFangs(Evoker.this.level, double1, fk12.getY() + double5, double2, float5, integer, Evoker.this));
+                Evoker.this.level.addFreshEntity(new EvokerFangs(Evoker.this.level, double1, fu12.getY() + double5, double2, float5, integer, Evoker.this));
             }
         }
         
@@ -268,14 +266,14 @@ public class Evoker extends SpellcasterIllager {
         @Override
         protected void performSpellCasting() {
             for (int integer2 = 0; integer2 < 3; ++integer2) {
-                final BlockPos fk3 = new BlockPos(Evoker.this).offset(-2 + Evoker.this.random.nextInt(5), 1, -2 + Evoker.this.random.nextInt(5));
-                final Vex axl4 = EntityType.VEX.create(Evoker.this.level);
-                axl4.moveTo(fk3, 0.0f, 0.0f);
-                axl4.finalizeSpawn(Evoker.this.level, Evoker.this.level.getCurrentDifficultyAt(fk3), MobSpawnType.MOB_SUMMONED, null, null);
-                axl4.setOwner(Evoker.this);
-                axl4.setBoundOrigin(fk3);
-                axl4.setLimitedLife(20 * (30 + Evoker.this.random.nextInt(90)));
-                Evoker.this.level.addFreshEntity(axl4);
+                final BlockPos fu3 = Evoker.this.blockPosition().offset(-2 + Evoker.this.random.nextInt(5), 1, -2 + Evoker.this.random.nextInt(5));
+                final Vex bcp4 = EntityType.VEX.create(Evoker.this.level);
+                bcp4.moveTo(fu3, 0.0f, 0.0f);
+                bcp4.finalizeSpawn(Evoker.this.level, Evoker.this.level.getCurrentDifficultyAt(fu3), MobSpawnType.MOB_SUMMONED, null, null);
+                bcp4.setOwner(Evoker.this);
+                bcp4.setBoundOrigin(fu3);
+                bcp4.setLimitedLife(20 * (30 + Evoker.this.random.nextInt(90)));
+                Evoker.this.level.addFreshEntity(bcp4);
             }
         }
         
@@ -294,7 +292,7 @@ public class Evoker extends SpellcasterIllager {
         private final TargetingConditions wololoTargeting;
         
         public EvokerWololoSpellGoal() {
-            this.wololoTargeting = new TargetingConditions().range(16.0).allowInvulnerable().selector(akz -> akz.getColor() == DyeColor.BLUE);
+            this.wololoTargeting = new TargetingConditions().range(16.0).allowInvulnerable().selector(aoy -> aoy.getColor() == DyeColor.BLUE);
         }
         
         @Override
@@ -332,9 +330,9 @@ public class Evoker extends SpellcasterIllager {
         
         @Override
         protected void performSpellCasting() {
-            final Sheep atv2 = Evoker.this.getWololoTarget();
-            if (atv2 != null && atv2.isAlive()) {
-                atv2.setColor(DyeColor.RED);
+            final Sheep azd2 = Evoker.this.getWololoTarget();
+            if (azd2 != null && azd2.isAlive()) {
+                azd2.setColor(DyeColor.RED);
             }
         }
         
diff --git a/src/net/minecraft/world/entity/monster/Ghast.java b/src/net/minecraft/world/entity/monster/Ghast.java
index ac780cc..e012363 100644
--- a/src/net/minecraft/world/entity/monster/Ghast.java
+++ b/src/net/minecraft/world/entity/monster/Ghast.java
@@ -20,6 +20,8 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.projectile.LargeFireball;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Mob;
@@ -35,8 +37,8 @@ public class Ghast extends FlyingMob implements Enemy {
     private static final EntityDataAccessor<Boolean> DATA_IS_CHARGING;
     private int explosionPower;
     
-    public Ghast(final EntityType<? extends Ghast> aku, final Level bjw) {
-        super(aku, bjw);
+    public Ghast(final EntityType<? extends Ghast> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.explosionPower = 1;
         this.xpReward = 5;
         this.moveControl = new GhastMoveControl(this);
@@ -47,7 +49,7 @@ public class Ghast extends FlyingMob implements Enemy {
         this.goalSelector.addGoal(5, new RandomFloatAroundGoal(this));
         this.goalSelector.addGoal(7, new GhastLookGoal(this));
         this.goalSelector.addGoal(7, new GhastShootFireballGoal(this));
-        this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, akz -> Math.abs(akz.getY() - this.getY()) <= 4.0));
+        this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, aoy -> Math.abs(aoy.getY() - this.getY()) <= 4.0));
     }
     
     public boolean isCharging() {
@@ -68,15 +70,15 @@ public class Ghast extends FlyingMob implements Enemy {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        if (ajz.getDirectEntity() instanceof LargeFireball && ajz.getEntity() instanceof Player) {
-            super.hurt(ajz, 1000.0f);
+        if (anw.getDirectEntity() instanceof LargeFireball && anw.getEntity() instanceof Player) {
+            super.hurt(anw, 1000.0f);
             return true;
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
@@ -85,11 +87,8 @@ public class Ghast extends FlyingMob implements Enemy {
         this.entityData.<Boolean>define(Ghast.DATA_IS_CHARGING, false);
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(10.0);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(100.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 10.0).add(Attributes.FOLLOW_RANGE, 100.0);
     }
     
     @Override
@@ -103,7 +102,7 @@ public class Ghast extends FlyingMob implements Enemy {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.GHAST_HURT;
     }
     
@@ -114,11 +113,11 @@ public class Ghast extends FlyingMob implements Enemy {
     
     @Override
     protected float getSoundVolume() {
-        return 10.0f;
+        return 5.0f;
     }
     
-    public static boolean checkGhastSpawnRules(final EntityType<Ghast> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return bjx.getDifficulty() != Difficulty.PEACEFUL && random.nextInt(20) == 0 && Mob.checkMobSpawnRules(aku, bjx, alc, fk, random);
+    public static boolean checkGhastSpawnRules(final EntityType<Ghast> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return bqc.getDifficulty() != Difficulty.PEACEFUL && random.nextInt(20) == 0 && Mob.checkMobSpawnRules(aoq, bqc, apb, fu, random);
     }
     
     @Override
@@ -127,21 +126,21 @@ public class Ghast extends FlyingMob implements Enemy {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("ExplosionPower", this.explosionPower);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("ExplosionPower", this.explosionPower);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("ExplosionPower", 99)) {
-            this.explosionPower = jt.getInt("ExplosionPower");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("ExplosionPower", 99)) {
+            this.explosionPower = le.getInt("ExplosionPower");
         }
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 2.6f;
     }
     
@@ -153,9 +152,9 @@ public class Ghast extends FlyingMob implements Enemy {
         private final Ghast ghast;
         private int floatDuration;
         
-        public GhastMoveControl(final Ghast awq) {
-            super(awq);
-            this.ghast = awq;
+        public GhastMoveControl(final Ghast bbv) {
+            super(bbv);
+            this.ghast = bbv;
         }
         
         @Override
@@ -165,11 +164,11 @@ public class Ghast extends FlyingMob implements Enemy {
             }
             if (this.floatDuration-- <= 0) {
                 this.floatDuration += this.ghast.getRandom().nextInt(5) + 2;
-                Vec3 cvl2 = new Vec3(this.wantedX - this.ghast.getX(), this.wantedY - this.ghast.getY(), this.wantedZ - this.ghast.getZ());
-                final double double3 = cvl2.length();
-                cvl2 = cvl2.normalize();
-                if (this.canReach(cvl2, Mth.ceil(double3))) {
-                    this.ghast.setDeltaMovement(this.ghast.getDeltaMovement().add(cvl2.scale(0.1)));
+                Vec3 dem2 = new Vec3(this.wantedX - this.ghast.getX(), this.wantedY - this.ghast.getY(), this.wantedZ - this.ghast.getZ());
+                final double double3 = dem2.length();
+                dem2 = dem2.normalize();
+                if (this.canReach(dem2, Mth.ceil(double3))) {
+                    this.ghast.setDeltaMovement(this.ghast.getDeltaMovement().add(dem2.scale(0.1)));
                 }
                 else {
                     this.operation = Operation.WAIT;
@@ -177,11 +176,11 @@ public class Ghast extends FlyingMob implements Enemy {
             }
         }
         
-        private boolean canReach(final Vec3 cvl, final int integer) {
-            AABB cvf4 = this.ghast.getBoundingBox();
+        private boolean canReach(final Vec3 dem, final int integer) {
+            AABB deg4 = this.ghast.getBoundingBox();
             for (int integer2 = 1; integer2 < integer; ++integer2) {
-                cvf4 = cvf4.move(cvl);
-                if (!this.ghast.level.noCollision(this.ghast, cvf4)) {
+                deg4 = deg4.move(dem);
+                if (!this.ghast.level.noCollision(this.ghast, deg4)) {
                     return false;
                 }
             }
@@ -192,20 +191,20 @@ public class Ghast extends FlyingMob implements Enemy {
     static class RandomFloatAroundGoal extends Goal {
         private final Ghast ghast;
         
-        public RandomFloatAroundGoal(final Ghast awq) {
-            this.ghast = awq;
+        public RandomFloatAroundGoal(final Ghast bbv) {
+            this.ghast = bbv;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
         }
         
         @Override
         public boolean canUse() {
-            final MoveControl aom2 = this.ghast.getMoveControl();
-            if (!aom2.hasWanted()) {
+            final MoveControl atm2 = this.ghast.getMoveControl();
+            if (!atm2.hasWanted()) {
                 return true;
             }
-            final double double3 = aom2.getWantedX() - this.ghast.getX();
-            final double double4 = aom2.getWantedY() - this.ghast.getY();
-            final double double5 = aom2.getWantedZ() - this.ghast.getZ();
+            final double double3 = atm2.getWantedX() - this.ghast.getX();
+            final double double4 = atm2.getWantedY() - this.ghast.getY();
+            final double double5 = atm2.getWantedZ() - this.ghast.getZ();
             final double double6 = double3 * double3 + double4 * double4 + double5 * double5;
             return double6 < 1.0 || double6 > 3600.0;
         }
@@ -228,8 +227,8 @@ public class Ghast extends FlyingMob implements Enemy {
     static class GhastLookGoal extends Goal {
         private final Ghast ghast;
         
-        public GhastLookGoal(final Ghast awq) {
-            this.ghast = awq;
+        public GhastLookGoal(final Ghast bbv) {
+            this.ghast = bbv;
             this.setFlags(EnumSet.<Flag>of(Flag.LOOK));
         }
         
@@ -241,16 +240,16 @@ public class Ghast extends FlyingMob implements Enemy {
         @Override
         public void tick() {
             if (this.ghast.getTarget() == null) {
-                final Vec3 cvl2 = this.ghast.getDeltaMovement();
-                this.ghast.yRot = -(float)Mth.atan2(cvl2.x, cvl2.z) * 57.295776f;
+                final Vec3 dem2 = this.ghast.getDeltaMovement();
+                this.ghast.yRot = -(float)Mth.atan2(dem2.x, dem2.z) * 57.295776f;
                 this.ghast.yBodyRot = this.ghast.yRot;
             }
             else {
-                final LivingEntity akz2 = this.ghast.getTarget();
+                final LivingEntity aoy2 = this.ghast.getTarget();
                 final double double3 = 64.0;
-                if (akz2.distanceToSqr(this.ghast) < 4096.0) {
-                    final double double4 = akz2.getX() - this.ghast.getX();
-                    final double double5 = akz2.getZ() - this.ghast.getZ();
+                if (aoy2.distanceToSqr(this.ghast) < 4096.0) {
+                    final double double4 = aoy2.getX() - this.ghast.getX();
+                    final double double5 = aoy2.getZ() - this.ghast.getZ();
                     this.ghast.yRot = -(float)Mth.atan2(double4, double5) * 57.295776f;
                     this.ghast.yBodyRot = this.ghast.yRot;
                 }
@@ -262,8 +261,8 @@ public class Ghast extends FlyingMob implements Enemy {
         private final Ghast ghast;
         public int chargeTime;
         
-        public GhastShootFireballGoal(final Ghast awq) {
-            this.ghast = awq;
+        public GhastShootFireballGoal(final Ghast bbv) {
+            this.ghast = bbv;
         }
         
         @Override
@@ -283,25 +282,27 @@ public class Ghast extends FlyingMob implements Enemy {
         
         @Override
         public void tick() {
-            final LivingEntity akz2 = this.ghast.getTarget();
+            final LivingEntity aoy2 = this.ghast.getTarget();
             final double double3 = 64.0;
-            if (akz2.distanceToSqr(this.ghast) < 4096.0 && this.ghast.canSee(akz2)) {
-                final Level bjw5 = this.ghast.level;
+            if (aoy2.distanceToSqr(this.ghast) < 4096.0 && this.ghast.canSee(aoy2)) {
+                final Level bqb5 = this.ghast.level;
                 ++this.chargeTime;
-                if (this.chargeTime == 10) {
-                    bjw5.levelEvent(null, 1015, new BlockPos(this.ghast), 0);
+                if (this.chargeTime == 10 && !this.ghast.isSilent()) {
+                    bqb5.levelEvent(null, 1015, this.ghast.blockPosition(), 0);
                 }
                 if (this.chargeTime == 20) {
                     final double double4 = 4.0;
-                    final Vec3 cvl8 = this.ghast.getViewVector(1.0f);
-                    final double double5 = akz2.getX() - (this.ghast.getX() + cvl8.x * 4.0);
-                    final double double6 = akz2.getY(0.5) - (0.5 + this.ghast.getY(0.5));
-                    final double double7 = akz2.getZ() - (this.ghast.getZ() + cvl8.z * 4.0);
-                    bjw5.levelEvent(null, 1016, new BlockPos(this.ghast), 0);
-                    final LargeFireball ayw15 = new LargeFireball(bjw5, this.ghast, double5, double6, double7);
-                    ayw15.explosionPower = this.ghast.getExplosionPower();
-                    ayw15.setPos(this.ghast.getX() + cvl8.x * 4.0, this.ghast.getY(0.5) + 0.5, ayw15.getZ() + cvl8.z * 4.0);
-                    bjw5.addFreshEntity(ayw15);
+                    final Vec3 dem8 = this.ghast.getViewVector(1.0f);
+                    final double double5 = aoy2.getX() - (this.ghast.getX() + dem8.x * 4.0);
+                    final double double6 = aoy2.getY(0.5) - (0.5 + this.ghast.getY(0.5));
+                    final double double7 = aoy2.getZ() - (this.ghast.getZ() + dem8.z * 4.0);
+                    if (!this.ghast.isSilent()) {
+                        bqb5.levelEvent(null, 1016, this.ghast.blockPosition(), 0);
+                    }
+                    final LargeFireball beq15 = new LargeFireball(bqb5, this.ghast, double5, double6, double7);
+                    beq15.explosionPower = this.ghast.getExplosionPower();
+                    beq15.setPos(this.ghast.getX() + dem8.x * 4.0, this.ghast.getY(0.5) + 0.5, beq15.getZ() + dem8.z * 4.0);
+                    bqb5.addFreshEntity(beq15);
                     this.chargeTime = -40;
                 }
             }
diff --git a/src/net/minecraft/world/entity/monster/Giant.java b/src/net/minecraft/world/entity/monster/Giant.java
index ddf62fe..acd9547 100644
--- a/src/net/minecraft/world/entity/monster/Giant.java
+++ b/src/net/minecraft/world/entity/monster/Giant.java
@@ -2,31 +2,29 @@ package net.minecraft.world.entity.monster;
 
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Giant extends Monster {
-    public Giant(final EntityType<? extends Giant> aku, final Level bjw) {
-        super(aku, bjw);
+    public Giant(final EntityType<? extends Giant> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 10.440001f;
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(100.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.5);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(50.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 100.0).add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.ATTACK_DAMAGE, 50.0);
     }
     
     @Override
-    public float getWalkTargetValue(final BlockPos fk, final LevelReader bjz) {
-        return bjz.getBrightness(fk) - 0.5f;
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        return bqd.getBrightness(fu) - 0.5f;
     }
 }
diff --git a/src/net/minecraft/world/entity/monster/Guardian.java b/src/net/minecraft/world/entity/monster/Guardian.java
index b43a0bb..529c483 100644
--- a/src/net/minecraft/world/entity/monster/Guardian.java
+++ b/src/net/minecraft/world/entity/monster/Guardian.java
@@ -14,6 +14,8 @@ import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.BlockPos;
@@ -27,6 +29,8 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.MobType;
 import net.minecraft.world.entity.ai.navigation.WaterBoundPathNavigation;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import java.util.function.Predicate;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import java.util.EnumSet;
@@ -47,18 +51,18 @@ import net.minecraft.network.syncher.EntityDataAccessor;
 public class Guardian extends Monster {
     private static final EntityDataAccessor<Boolean> DATA_ID_MOVING;
     private static final EntityDataAccessor<Integer> DATA_ID_ATTACK_TARGET;
-    protected float clientSideTailAnimation;
-    protected float clientSideTailAnimationO;
-    protected float clientSideTailAnimationSpeed;
-    protected float clientSideSpikesAnimation;
-    protected float clientSideSpikesAnimationO;
+    private float clientSideTailAnimation;
+    private float clientSideTailAnimationO;
+    private float clientSideTailAnimationSpeed;
+    private float clientSideSpikesAnimation;
+    private float clientSideSpikesAnimationO;
     private LivingEntity clientSideCachedAttackTarget;
     private int clientSideAttackTime;
     private boolean clientSideTouchedGround;
     protected RandomStrollGoal randomStrollGoal;
     
-    public Guardian(final EntityType<? extends Guardian> aku, final Level bjw) {
-        super(aku, bjw);
+    public Guardian(final EntityType<? extends Guardian> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.xpReward = 10;
         this.setPathfindingMalus(BlockPathTypes.WATER, 0.0f);
         this.moveControl = new GuardianMoveControl(this);
@@ -68,31 +72,26 @@ public class Guardian extends Monster {
     
     @Override
     protected void registerGoals() {
-        final MoveTowardsRestrictionGoal apu2 = new MoveTowardsRestrictionGoal(this, 1.0);
+        final MoveTowardsRestrictionGoal auv2 = new MoveTowardsRestrictionGoal(this, 1.0);
         this.randomStrollGoal = new RandomStrollGoal(this, 1.0, 80);
         this.goalSelector.addGoal(4, new GuardianAttackGoal(this));
-        this.goalSelector.addGoal(5, apu2);
+        this.goalSelector.addGoal(5, auv2);
         this.goalSelector.addGoal(7, this.randomStrollGoal);
         this.goalSelector.addGoal(8, new LookAtPlayerGoal(this, Player.class, 8.0f));
         this.goalSelector.addGoal(8, new LookAtPlayerGoal(this, Guardian.class, 12.0f, 0.01f));
         this.goalSelector.addGoal(9, new RandomLookAroundGoal(this));
         this.randomStrollGoal.setFlags(EnumSet.<Goal.Flag>of(Goal.Flag.MOVE, Goal.Flag.LOOK));
-        apu2.setFlags(EnumSet.<Goal.Flag>of(Goal.Flag.MOVE, Goal.Flag.LOOK));
+        auv2.setFlags(EnumSet.<Goal.Flag>of(Goal.Flag.MOVE, Goal.Flag.LOOK));
         this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, new GuardianAttackSelector(this)));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(6.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.5);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(16.0);
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(30.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.ATTACK_DAMAGE, 6.0).add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.FOLLOW_RANGE, 16.0).add(Attributes.MAX_HEALTH, 30.0);
     }
     
     @Override
-    protected PathNavigation createNavigation(final Level bjw) {
-        return new WaterBoundPathNavigation(this, bjw);
+    protected PathNavigation createNavigation(final Level bqb) {
+        return new WaterBoundPathNavigation(this, bqb);
     }
     
     @Override
@@ -143,17 +142,17 @@ public class Guardian extends Monster {
         if (this.clientSideCachedAttackTarget != null) {
             return this.clientSideCachedAttackTarget;
         }
-        final Entity akq2 = this.level.getEntity(this.entityData.<Integer>get(Guardian.DATA_ID_ATTACK_TARGET));
-        if (akq2 instanceof LivingEntity) {
-            return this.clientSideCachedAttackTarget = (LivingEntity)akq2;
+        final Entity aom2 = this.level.getEntity(this.entityData.<Integer>get(Guardian.DATA_ID_ATTACK_TARGET));
+        if (aom2 instanceof LivingEntity) {
+            return this.clientSideCachedAttackTarget = (LivingEntity)aom2;
         }
         return null;
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        super.onSyncedDataUpdated(sb);
-        if (Guardian.DATA_ID_ATTACK_TARGET.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        super.onSyncedDataUpdated(tq);
+        if (Guardian.DATA_ID_ATTACK_TARGET.equals(tq)) {
             this.clientSideAttackTime = 0;
             this.clientSideCachedAttackTarget = null;
         }
@@ -170,7 +169,7 @@ public class Guardian extends Monster {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return this.isInWaterOrBubble() ? SoundEvents.GUARDIAN_HURT : SoundEvents.GUARDIAN_HURT_LAND;
     }
     
@@ -185,16 +184,16 @@ public class Guardian extends Monster {
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height * 0.5f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height * 0.5f;
     }
     
     @Override
-    public float getWalkTargetValue(final BlockPos fk, final LevelReader bjz) {
-        if (bjz.getFluidState(fk).is(FluidTags.WATER)) {
-            return 10.0f + bjz.getBrightness(fk) - 0.5f;
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        if (bqd.getFluidState(fu).is(FluidTags.WATER)) {
+            return 10.0f + bqd.getBrightness(fu) - 0.5f;
         }
-        return super.getWalkTargetValue(fk, bjz);
+        return super.getWalkTargetValue(fu, bqd);
     }
     
     @Override
@@ -204,11 +203,11 @@ public class Guardian extends Monster {
                 this.clientSideTailAnimationO = this.clientSideTailAnimation;
                 if (!this.isInWater()) {
                     this.clientSideTailAnimationSpeed = 2.0f;
-                    final Vec3 cvl2 = this.getDeltaMovement();
-                    if (cvl2.y > 0.0 && this.clientSideTouchedGround && !this.isSilent()) {
+                    final Vec3 dem2 = this.getDeltaMovement();
+                    if (dem2.y > 0.0 && this.clientSideTouchedGround && !this.isSilent()) {
                         this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), this.getFlopSound(), this.getSoundSource(), 1.0f, 1.0f, false);
                     }
-                    this.clientSideTouchedGround = (cvl2.y < 0.0 && this.level.loadedAndEntityCanStandOn(new BlockPos(this).below(), this));
+                    this.clientSideTouchedGround = (dem2.y < 0.0 && this.level.loadedAndEntityCanStandOn(this.blockPosition().below(), this));
                 }
                 else if (this.isMoving()) {
                     if (this.clientSideTailAnimationSpeed < 0.5f) {
@@ -233,23 +232,23 @@ public class Guardian extends Monster {
                     this.clientSideSpikesAnimation += (1.0f - this.clientSideSpikesAnimation) * 0.06f;
                 }
                 if (this.isMoving() && this.isInWater()) {
-                    final Vec3 cvl2 = this.getViewVector(0.0f);
+                    final Vec3 dem2 = this.getViewVector(0.0f);
                     for (int integer3 = 0; integer3 < 2; ++integer3) {
-                        this.level.addParticle(ParticleTypes.BUBBLE, this.getRandomX(0.5) - cvl2.x * 1.5, this.getRandomY() - cvl2.y * 1.5, this.getRandomZ(0.5) - cvl2.z * 1.5, 0.0, 0.0, 0.0);
+                        this.level.addParticle(ParticleTypes.BUBBLE, this.getRandomX(0.5) - dem2.x * 1.5, this.getRandomY() - dem2.y * 1.5, this.getRandomZ(0.5) - dem2.z * 1.5, 0.0, 0.0, 0.0);
                     }
                 }
                 if (this.hasActiveAttackTarget()) {
                     if (this.clientSideAttackTime < this.getAttackDuration()) {
                         ++this.clientSideAttackTime;
                     }
-                    final LivingEntity akz2 = this.getActiveAttackTarget();
-                    if (akz2 != null) {
-                        this.getLookControl().setLookAt(akz2, 90.0f, 90.0f);
+                    final LivingEntity aoy2 = this.getActiveAttackTarget();
+                    if (aoy2 != null) {
+                        this.getLookControl().setLookAt(aoy2, 90.0f, 90.0f);
                         this.getLookControl().tick();
                         final double double3 = this.getAttackAnimationScale(0.0f);
-                        double double4 = akz2.getX() - this.getX();
-                        double double5 = akz2.getY(0.5) - this.getEyeY();
-                        double double6 = akz2.getZ() - this.getZ();
+                        double double4 = aoy2.getX() - this.getX();
+                        double double5 = aoy2.getY(0.5) - this.getEyeY();
+                        double double6 = aoy2.getZ() - this.getZ();
                         final double double7 = Math.sqrt(double4 * double4 + double5 * double5 + double6 * double6);
                         double4 /= double7;
                         double5 /= double7;
@@ -295,26 +294,26 @@ public class Guardian extends Monster {
     }
     
     @Override
-    public boolean checkSpawnObstruction(final LevelReader bjz) {
-        return bjz.isUnobstructed(this);
+    public boolean checkSpawnObstruction(final LevelReader bqd) {
+        return bqd.isUnobstructed(this);
     }
     
-    public static boolean checkGuardianSpawnRules(final EntityType<? extends Guardian> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return (random.nextInt(20) == 0 || !bjx.canSeeSkyFromBelowWater(fk)) && bjx.getDifficulty() != Difficulty.PEACEFUL && (alc == MobSpawnType.SPAWNER || bjx.getFluidState(fk).is(FluidTags.WATER));
+    public static boolean checkGuardianSpawnRules(final EntityType<? extends Guardian> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return (random.nextInt(20) == 0 || !bqc.canSeeSkyFromBelowWater(fu)) && bqc.getDifficulty() != Difficulty.PEACEFUL && (apb == MobSpawnType.SPAWNER || bqc.getFluidState(fu).is(FluidTags.WATER));
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (!this.isMoving() && !ajz.isMagic() && ajz.getDirectEntity() instanceof LivingEntity) {
-            final LivingEntity akz4 = (LivingEntity)ajz.getDirectEntity();
-            if (!ajz.isExplosion()) {
-                akz4.hurt(DamageSource.thorns(this), 2.0f);
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (!this.isMoving() && !anw.isMagic() && anw.getDirectEntity() instanceof LivingEntity) {
+            final LivingEntity aoy4 = (LivingEntity)anw.getDirectEntity();
+            if (!anw.isExplosion()) {
+                aoy4.hurt(DamageSource.thorns(this), 2.0f);
             }
         }
         if (this.randomStrollGoal != null) {
             this.randomStrollGoal.trigger();
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
@@ -323,9 +322,9 @@ public class Guardian extends Monster {
     }
     
     @Override
-    public void travel(final Vec3 cvl) {
+    public void travel(final Vec3 dem) {
         if (this.isEffectiveAi() && this.isInWater()) {
-            this.moveRelative(0.1f, cvl);
+            this.moveRelative(0.1f, dem);
             this.move(MoverType.SELF, this.getDeltaMovement());
             this.setDeltaMovement(this.getDeltaMovement().scale(0.9));
             if (!this.isMoving() && this.getTarget() == null) {
@@ -333,7 +332,7 @@ public class Guardian extends Monster {
             }
         }
         else {
-            super.travel(cvl);
+            super.travel(dem);
         }
     }
     
@@ -345,13 +344,13 @@ public class Guardian extends Monster {
     static class GuardianAttackSelector implements Predicate<LivingEntity> {
         private final Guardian guardian;
         
-        public GuardianAttackSelector(final Guardian aws) {
-            this.guardian = aws;
+        public GuardianAttackSelector(final Guardian bbx) {
+            this.guardian = bbx;
         }
         
         @Override
-        public boolean test(@Nullable final LivingEntity akz) {
-            return (akz instanceof Player || akz instanceof Squid) && akz.distanceToSqr(this.guardian) > 9.0;
+        public boolean test(@Nullable final LivingEntity aoy) {
+            return (aoy instanceof Player || aoy instanceof Squid) && aoy.distanceToSqr(this.guardian) > 9.0;
         }
     }
     
@@ -360,16 +359,16 @@ public class Guardian extends Monster {
         private int attackTime;
         private final boolean elder;
         
-        public GuardianAttackGoal(final Guardian aws) {
-            this.guardian = aws;
-            this.elder = (aws instanceof ElderGuardian);
+        public GuardianAttackGoal(final Guardian bbx) {
+            this.guardian = bbx;
+            this.elder = (bbx instanceof ElderGuardian);
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
         }
         
         @Override
         public boolean canUse() {
-            final LivingEntity akz2 = this.guardian.getTarget();
-            return akz2 != null && akz2.isAlive();
+            final LivingEntity aoy2 = this.guardian.getTarget();
+            return aoy2 != null && aoy2.isAlive();
         }
         
         @Override
@@ -394,17 +393,19 @@ public class Guardian extends Monster {
         
         @Override
         public void tick() {
-            final LivingEntity akz2 = this.guardian.getTarget();
+            final LivingEntity aoy2 = this.guardian.getTarget();
             this.guardian.getNavigation().stop();
-            this.guardian.getLookControl().setLookAt(akz2, 90.0f, 90.0f);
-            if (!this.guardian.canSee(akz2)) {
+            this.guardian.getLookControl().setLookAt(aoy2, 90.0f, 90.0f);
+            if (!this.guardian.canSee(aoy2)) {
                 this.guardian.setTarget(null);
                 return;
             }
             ++this.attackTime;
             if (this.attackTime == 0) {
                 this.guardian.setActiveAttackTarget(this.guardian.getTarget().getId());
-                this.guardian.level.broadcastEntityEvent(this.guardian, (byte)21);
+                if (!this.guardian.isSilent()) {
+                    this.guardian.level.broadcastEntityEvent(this.guardian, (byte)21);
+                }
             }
             else if (this.attackTime >= this.guardian.getAttackDuration()) {
                 float float3 = 1.0f;
@@ -414,8 +415,8 @@ public class Guardian extends Monster {
                 if (this.elder) {
                     float3 += 2.0f;
                 }
-                akz2.hurt(DamageSource.indirectMagic(this.guardian, this.guardian), float3);
-                akz2.hurt(DamageSource.mobAttack(this.guardian), (float)this.guardian.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue());
+                aoy2.hurt(DamageSource.indirectMagic(this.guardian, this.guardian), float3);
+                aoy2.hurt(DamageSource.mobAttack(this.guardian), (float)this.guardian.getAttributeValue(Attributes.ATTACK_DAMAGE));
                 this.guardian.setTarget(null);
             }
             super.tick();
@@ -425,9 +426,9 @@ public class Guardian extends Monster {
     static class GuardianMoveControl extends MoveControl {
         private final Guardian guardian;
         
-        public GuardianMoveControl(final Guardian aws) {
-            super(aws);
-            this.guardian = aws;
+        public GuardianMoveControl(final Guardian bbx) {
+            super(bbx);
+            this.guardian = bbx;
         }
         
         @Override
@@ -437,15 +438,15 @@ public class Guardian extends Monster {
                 this.guardian.setMoving(false);
                 return;
             }
-            final Vec3 cvl2 = new Vec3(this.wantedX - this.guardian.getX(), this.wantedY - this.guardian.getY(), this.wantedZ - this.guardian.getZ());
-            final double double3 = cvl2.length();
-            final double double4 = cvl2.x / double3;
-            final double double5 = cvl2.y / double3;
-            final double double6 = cvl2.z / double3;
-            final float float11 = (float)(Mth.atan2(cvl2.z, cvl2.x) * 57.2957763671875) - 90.0f;
+            final Vec3 dem2 = new Vec3(this.wantedX - this.guardian.getX(), this.wantedY - this.guardian.getY(), this.wantedZ - this.guardian.getZ());
+            final double double3 = dem2.length();
+            final double double4 = dem2.x / double3;
+            final double double5 = dem2.y / double3;
+            final double double6 = dem2.z / double3;
+            final float float11 = (float)(Mth.atan2(dem2.z, dem2.x) * 57.2957763671875) - 90.0f;
             this.guardian.yRot = this.rotlerp(this.guardian.yRot, float11, 90.0f);
             this.guardian.yBodyRot = this.guardian.yRot;
-            final float float12 = (float)(this.speedModifier * this.guardian.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue());
+            final float float12 = (float)(this.speedModifier * this.guardian.getAttributeValue(Attributes.MOVEMENT_SPEED));
             final float float13 = Mth.lerp(0.125f, this.guardian.getSpeed(), float12);
             this.guardian.setSpeed(float13);
             final double double7 = Math.sin((this.guardian.tickCount + this.guardian.getId()) * 0.5) * 0.05;
@@ -453,14 +454,14 @@ public class Guardian extends Monster {
             final double double9 = Math.sin(this.guardian.yRot * 0.017453292f);
             final double double10 = Math.sin((this.guardian.tickCount + this.guardian.getId()) * 0.75) * 0.05;
             this.guardian.setDeltaMovement(this.guardian.getDeltaMovement().add(double7 * double8, double10 * (double9 + double8) * 0.25 + float13 * double5 * 0.1, double7 * double9));
-            final LookControl aol22 = this.guardian.getLookControl();
+            final LookControl atl22 = this.guardian.getLookControl();
             final double double11 = this.guardian.getX() + double4 * 2.0;
             final double double12 = this.guardian.getEyeY() + double5 / double3;
             final double double13 = this.guardian.getZ() + double6 * 2.0;
-            double double14 = aol22.getWantedX();
-            double double15 = aol22.getWantedY();
-            double double16 = aol22.getWantedZ();
-            if (!aol22.isHasWanted()) {
+            double double14 = atl22.getWantedX();
+            double double15 = atl22.getWantedY();
+            double double16 = atl22.getWantedZ();
+            if (!atl22.isHasWanted()) {
                 double14 = double11;
                 double15 = double12;
                 double16 = double13;
diff --git a/src/net/minecraft/world/entity/monster/Husk.java b/src/net/minecraft/world/entity/monster/Husk.java
index 257f296..464c7d5 100644
--- a/src/net/minecraft/world/entity/monster/Husk.java
+++ b/src/net/minecraft/world/entity/monster/Husk.java
@@ -17,12 +17,12 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Husk extends Zombie {
-    public Husk(final EntityType<? extends Husk> aku, final Level bjw) {
-        super(aku, bjw);
+    public Husk(final EntityType<? extends Husk> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public static boolean checkHuskSpawnRules(final EntityType<Husk> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return Monster.checkMonsterSpawnRules(aku, bjx, alc, fk, random) && (alc == MobSpawnType.SPAWNER || bjx.canSeeSky(fk));
+    public static boolean checkHuskSpawnRules(final EntityType<Husk> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return Monster.checkMonsterSpawnRules(aoq, bqc, apb, fu, random) && (apb == MobSpawnType.SPAWNER || bqc.canSeeSky(fu));
     }
     
     @Override
@@ -36,7 +36,7 @@ public class Husk extends Zombie {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.HUSK_HURT;
     }
     
@@ -51,11 +51,11 @@ public class Husk extends Zombie {
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        final boolean boolean3 = super.doHurtTarget(akq);
-        if (boolean3 && this.getMainHandItem().isEmpty() && akq instanceof LivingEntity) {
-            final float float4 = this.level.getCurrentDifficultyAt(new BlockPos(this)).getEffectiveDifficulty();
-            ((LivingEntity)akq).addEffect(new MobEffectInstance(MobEffects.HUNGER, 140 * (int)float4));
+    public boolean doHurtTarget(final Entity aom) {
+        final boolean boolean3 = super.doHurtTarget(aom);
+        if (boolean3 && this.getMainHandItem().isEmpty() && aom instanceof LivingEntity) {
+            final float float4 = this.level.getCurrentDifficultyAt(this.blockPosition()).getEffectiveDifficulty();
+            ((LivingEntity)aom).addEffect(new MobEffectInstance(MobEffects.HUNGER, 140 * (int)float4));
         }
         return boolean3;
     }
@@ -67,8 +67,10 @@ public class Husk extends Zombie {
     
     @Override
     protected void doUnderWaterConversion() {
-        this.convertTo(EntityType.ZOMBIE);
-        this.level.levelEvent(null, 1041, new BlockPos(this), 0);
+        this.convertToZombieType(EntityType.ZOMBIE);
+        if (!this.isSilent()) {
+            this.level.levelEvent(null, 1041, this.blockPosition(), 0);
+        }
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/monster/Illusioner.java b/src/net/minecraft/world/entity/monster/Illusioner.java
index 5ce9ca7..1f17a29 100644
--- a/src/net/minecraft/world/entity/monster/Illusioner.java
+++ b/src/net/minecraft/world/entity/monster/Illusioner.java
@@ -1,7 +1,6 @@
 package net.minecraft.world.entity.monster;
 
 import net.minecraft.world.Difficulty;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.projectile.AbstractArrow;
@@ -25,6 +24,8 @@ import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.DifficultyInstance;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.npc.AbstractVillager;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
@@ -47,8 +48,8 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
     private int clientSideIllusionTicks;
     private final Vec3[][] clientSideIllusionOffsets;
     
-    public Illusioner(final EntityType<? extends Illusioner> aku, final Level bjw) {
-        super(aku, bjw);
+    public Illusioner(final EntityType<? extends Illusioner> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.xpReward = 5;
         this.clientSideIllusionOffsets = new Vec3[2][4];
         for (int integer4 = 0; integer4 < 4; ++integer4) {
@@ -74,18 +75,14 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, false).setUnseenMemoryTicks(300));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.5);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(18.0);
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(32.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.FOLLOW_RANGE, 18.0).add(Attributes.MAX_HEALTH, 32.0);
     }
     
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
         this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.BOW));
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     @Override
@@ -148,8 +145,8 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
     }
     
     @Override
-    public boolean isAlliedTo(final Entity akq) {
-        return super.isAlliedTo(akq) || (akq instanceof LivingEntity && ((LivingEntity)akq).getMobType() == MobType.ILLAGER && this.getTeam() == null && akq.getTeam() == null);
+    public boolean isAlliedTo(final Entity aom) {
+        return super.isAlliedTo(aom) || (aom instanceof LivingEntity && ((LivingEntity)aom).getMobType() == MobType.ILLAGER && this.getTeam() == null && aom.getTeam() == null);
     }
     
     @Override
@@ -163,7 +160,7 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.ILLUSIONER_HURT;
     }
     
@@ -177,16 +174,16 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
     }
     
     @Override
-    public void performRangedAttack(final LivingEntity akz, final float float2) {
-        final ItemStack ben4 = this.getProjectile(this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW)));
-        final AbstractArrow ayn5 = ProjectileUtil.getMobArrow(this, ben4, float2);
-        final double double6 = akz.getX() - this.getX();
-        final double double7 = akz.getY(0.3333333333333333) - ayn5.getY();
-        final double double8 = akz.getZ() - this.getZ();
+    public void performRangedAttack(final LivingEntity aoy, final float float2) {
+        final ItemStack bki4 = this.getProjectile(this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW)));
+        final AbstractArrow beg5 = ProjectileUtil.getMobArrow(this, bki4, float2);
+        final double double6 = aoy.getX() - this.getX();
+        final double double7 = aoy.getY(0.3333333333333333) - beg5.getY();
+        final double double8 = aoy.getZ() - this.getZ();
         final double double9 = Mth.sqrt(double6 * double6 + double8 * double8);
-        ayn5.shoot(double6, double7 + double9 * 0.20000000298023224, double8, 1.6f, (float)(14 - this.level.getDifficulty().getId() * 4));
+        beg5.shoot(double6, double7 + double9 * 0.20000000298023224, double8, 1.6f, (float)(14 - this.level.getDifficulty().getId() * 4));
         this.playSound(SoundEvents.SKELETON_SHOOT, 1.0f, 1.0f / (this.getRandom().nextFloat() * 0.4f + 0.8f));
-        this.level.addFreshEntity(ayn5);
+        this.level.addFreshEntity(beg5);
     }
     
     @Override
@@ -244,7 +241,7 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
         
         @Override
         public boolean canUse() {
-            return super.canUse() && Illusioner.this.getTarget() != null && Illusioner.this.getTarget().getId() != this.lastTargetId && Illusioner.this.level.getCurrentDifficultyAt(new BlockPos(Illusioner.this)).isHarderThan((float)Difficulty.NORMAL.ordinal());
+            return super.canUse() && Illusioner.this.getTarget() != null && Illusioner.this.getTarget().getId() != this.lastTargetId && Illusioner.this.level.getCurrentDifficultyAt(Illusioner.this.blockPosition()).isHarderThan((float)Difficulty.NORMAL.ordinal());
         }
         
         @Override
diff --git a/src/net/minecraft/world/entity/monster/MagmaCube.java b/src/net/minecraft/world/entity/monster/MagmaCube.java
index 0b632a9..895c566 100644
--- a/src/net/minecraft/world/entity/monster/MagmaCube.java
+++ b/src/net/minecraft/world/entity/monster/MagmaCube.java
@@ -18,33 +18,33 @@ import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class MagmaCube extends Slime {
-    public MagmaCube(final EntityType<? extends MagmaCube> aku, final Level bjw) {
-        super(aku, bjw);
+    public MagmaCube(final EntityType<? extends MagmaCube> aoq, final Level bqb) {
+        super(aoq, bqb);
+    }
+    
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.20000000298023224);
+    }
+    
+    public static boolean checkMagmaCubeSpawnRules(final EntityType<MagmaCube> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return bqc.getDifficulty() != Difficulty.PEACEFUL;
     }
     
     @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.20000000298023224);
-    }
-    
-    public static boolean checkMagmaCubeSpawnRules(final EntityType<MagmaCube> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return bjx.getDifficulty() != Difficulty.PEACEFUL;
-    }
-    
-    @Override
-    public boolean checkSpawnObstruction(final LevelReader bjz) {
-        return bjz.isUnobstructed(this) && !bjz.containsAnyLiquid(this.getBoundingBox());
+    public boolean checkSpawnObstruction(final LevelReader bqd) {
+        return bqd.isUnobstructed(this) && !bqd.containsAnyLiquid(this.getBoundingBox());
     }
     
     @Override
     protected void setSize(final int integer, final boolean boolean2) {
         super.setSize(integer, boolean2);
-        this.getAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(integer * 3);
+        this.getAttribute(Attributes.ARMOR).setBaseValue(integer * 3);
     }
     
     @Override
@@ -79,20 +79,20 @@ public class MagmaCube extends Slime {
     
     @Override
     protected void jumpFromGround() {
-        final Vec3 cvl2 = this.getDeltaMovement();
-        this.setDeltaMovement(cvl2.x, this.getJumpPower() + this.getSize() * 0.1f, cvl2.z);
+        final Vec3 dem2 = this.getDeltaMovement();
+        this.setDeltaMovement(dem2.x, this.getJumpPower() + this.getSize() * 0.1f, dem2.z);
         this.hasImpulse = true;
     }
     
     @Override
-    protected void jumpInLiquid(final Tag<Fluid> aaz) {
-        if (aaz == FluidTags.LAVA) {
-            final Vec3 cvl3 = this.getDeltaMovement();
-            this.setDeltaMovement(cvl3.x, 0.22f + this.getSize() * 0.05f, cvl3.z);
+    protected void jumpInLiquid(final Tag<Fluid> adf) {
+        if (adf == FluidTags.LAVA) {
+            final Vec3 dem3 = this.getDeltaMovement();
+            this.setDeltaMovement(dem3.x, 0.22f + this.getSize() * 0.05f, dem3.z);
             this.hasImpulse = true;
         }
         else {
-            super.jumpInLiquid(aaz);
+            super.jumpInLiquid(adf);
         }
     }
     
@@ -112,7 +112,7 @@ public class MagmaCube extends Slime {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         if (this.isTiny()) {
             return SoundEvents.MAGMA_CUBE_HURT_SMALL;
         }
diff --git a/src/net/minecraft/world/entity/monster/Monster.java b/src/net/minecraft/world/entity/monster/Monster.java
index 5ed462c..1d62a80 100644
--- a/src/net/minecraft/world/entity/monster/Monster.java
+++ b/src/net/minecraft/world/entity/monster/Monster.java
@@ -7,6 +7,8 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ProjectileWeaponItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.entity.MobSpawnType;
@@ -24,8 +26,8 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.PathfinderMob;
 
 public abstract class Monster extends PathfinderMob implements Enemy {
-    protected Monster(final EntityType<? extends Monster> aku, final Level bjw) {
-        super(aku, bjw);
+    protected Monster(final EntityType<? extends Monster> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.xpReward = 5;
     }
     
@@ -64,12 +66,12 @@ public abstract class Monster extends PathfinderMob implements Enemy {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        return !this.isInvulnerableTo(ajz) && super.hurt(ajz, float2);
+    public boolean hurt(final DamageSource anw, final float float2) {
+        return !this.isInvulnerableTo(anw) && super.hurt(anw, float2);
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.HOSTILE_HURT;
     }
     
@@ -87,30 +89,28 @@ public abstract class Monster extends PathfinderMob implements Enemy {
     }
     
     @Override
-    public float getWalkTargetValue(final BlockPos fk, final LevelReader bjz) {
-        return 0.5f - bjz.getBrightness(fk);
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        return 0.5f - bqd.getBrightness(fu);
     }
     
-    public static boolean isDarkEnoughToSpawn(final LevelAccessor bjx, final BlockPos fk, final Random random) {
-        if (bjx.getBrightness(LightLayer.SKY, fk) > random.nextInt(32)) {
+    public static boolean isDarkEnoughToSpawn(final LevelAccessor bqc, final BlockPos fu, final Random random) {
+        if (bqc.getBrightness(LightLayer.SKY, fu) > random.nextInt(32)) {
             return false;
         }
-        final int integer4 = bjx.getLevel().isThundering() ? bjx.getMaxLocalRawBrightness(fk, 10) : bjx.getMaxLocalRawBrightness(fk);
+        final int integer4 = bqc.getLevel().isThundering() ? bqc.getMaxLocalRawBrightness(fu, 10) : bqc.getMaxLocalRawBrightness(fu);
         return integer4 <= random.nextInt(8);
     }
     
-    public static boolean checkMonsterSpawnRules(final EntityType<? extends Monster> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return bjx.getDifficulty() != Difficulty.PEACEFUL && isDarkEnoughToSpawn(bjx, fk, random) && Mob.checkMobSpawnRules(aku, bjx, alc, fk, random);
+    public static boolean checkMonsterSpawnRules(final EntityType<? extends Monster> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return bqc.getDifficulty() != Difficulty.PEACEFUL && isDarkEnoughToSpawn(bqc, fu, random) && Mob.checkMobSpawnRules(aoq, bqc, apb, fu, random);
     }
     
-    public static boolean checkAnyLightMonsterSpawnRules(final EntityType<? extends Monster> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return bjx.getDifficulty() != Difficulty.PEACEFUL && Mob.checkMobSpawnRules(aku, bjx, alc, fk, random);
+    public static boolean checkAnyLightMonsterSpawnRules(final EntityType<? extends Monster> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return bqc.getDifficulty() != Difficulty.PEACEFUL && Mob.checkMobSpawnRules(aoq, bqc, apb, fu, random);
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE);
+    public static AttributeSupplier.Builder createMonsterAttributes() {
+        return Mob.createMobAttributes().add(Attributes.ATTACK_DAMAGE);
     }
     
     @Override
@@ -118,16 +118,21 @@ public abstract class Monster extends PathfinderMob implements Enemy {
         return true;
     }
     
-    public boolean isPreventingPlayerRest(final Player ayj) {
+    @Override
+    protected boolean shouldDropLoot() {
+        return true;
+    }
+    
+    public boolean isPreventingPlayerRest(final Player bec) {
         return true;
     }
     
     @Override
-    public ItemStack getProjectile(final ItemStack ben) {
-        if (ben.getItem() instanceof ProjectileWeaponItem) {
-            final Predicate<ItemStack> predicate3 = ((ProjectileWeaponItem)ben.getItem()).getSupportedHeldProjectiles();
-            final ItemStack ben2 = ProjectileWeaponItem.getHeldProjectile(this, predicate3);
-            return ben2.isEmpty() ? new ItemStack(Items.ARROW) : ben2;
+    public ItemStack getProjectile(final ItemStack bki) {
+        if (bki.getItem() instanceof ProjectileWeaponItem) {
+            final Predicate<ItemStack> predicate3 = ((ProjectileWeaponItem)bki.getItem()).getSupportedHeldProjectiles();
+            final ItemStack bki2 = ProjectileWeaponItem.getHeldProjectile(this, predicate3);
+            return bki2.isEmpty() ? new ItemStack(Items.ARROW) : bki2;
         }
         return ItemStack.EMPTY;
     }
diff --git a/src/net/minecraft/world/entity/monster/PatrollingMonster.java b/src/net/minecraft/world/entity/monster/PatrollingMonster.java
index caf7605..985887f 100644
--- a/src/net/minecraft/world/entity/monster/PatrollingMonster.java
+++ b/src/net/minecraft/world/entity/monster/PatrollingMonster.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.entity.monster;
 
+import net.minecraft.world.entity.Entity;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
@@ -8,7 +9,6 @@ import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.Position;
 import java.util.EnumSet;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.LightLayer;
 import java.util.Random;
 import net.minecraft.world.entity.raid.Raid;
@@ -31,8 +31,8 @@ public abstract class PatrollingMonster extends Monster {
     private boolean patrolLeader;
     private boolean patrolling;
     
-    protected PatrollingMonster(final EntityType<? extends PatrollingMonster> aku, final Level bjw) {
-        super(aku, bjw);
+    protected PatrollingMonster(final EntityType<? extends PatrollingMonster> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -42,27 +42,27 @@ public abstract class PatrollingMonster extends Monster {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         if (this.patrolTarget != null) {
-            jt.put("PatrolTarget", NbtUtils.writeBlockPos(this.patrolTarget));
+            le.put("PatrolTarget", NbtUtils.writeBlockPos(this.patrolTarget));
         }
-        jt.putBoolean("PatrolLeader", this.patrolLeader);
-        jt.putBoolean("Patrolling", this.patrolling);
+        le.putBoolean("PatrolLeader", this.patrolLeader);
+        le.putBoolean("Patrolling", this.patrolling);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("PatrolTarget")) {
-            this.patrolTarget = NbtUtils.readBlockPos(jt.getCompound("PatrolTarget"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("PatrolTarget")) {
+            this.patrolTarget = NbtUtils.readBlockPos(le.getCompound("PatrolTarget"));
         }
-        this.patrolLeader = jt.getBoolean("PatrolLeader");
-        this.patrolling = jt.getBoolean("Patrolling");
+        this.patrolLeader = le.getBoolean("PatrolLeader");
+        this.patrolling = le.getBoolean("Patrolling");
     }
     
     @Override
-    public double getRidingHeight() {
+    public double getMyRidingOffset() {
         return -0.45;
     }
     
@@ -72,22 +72,22 @@ public abstract class PatrollingMonster extends Monster {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        if (alc != MobSpawnType.PATROL && alc != MobSpawnType.EVENT && alc != MobSpawnType.STRUCTURE && this.random.nextFloat() < 0.06f && this.canBeLeader()) {
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        if (apb != MobSpawnType.PATROL && apb != MobSpawnType.EVENT && apb != MobSpawnType.STRUCTURE && this.random.nextFloat() < 0.06f && this.canBeLeader()) {
             this.patrolLeader = true;
         }
         if (this.isPatrolLeader()) {
             this.setItemSlot(EquipmentSlot.HEAD, Raid.getLeaderBannerInstance());
             this.setDropChance(EquipmentSlot.HEAD, 2.0f);
         }
-        if (alc == MobSpawnType.PATROL) {
+        if (apb == MobSpawnType.PATROL) {
             this.patrolling = true;
         }
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
-    public static boolean checkPatrollingMonsterSpawnRules(final EntityType<? extends PatrollingMonster> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return bjx.getBrightness(LightLayer.BLOCK, fk) <= 8 && Monster.checkAnyLightMonsterSpawnRules(aku, bjx, alc, fk, random);
+    public static boolean checkPatrollingMonsterSpawnRules(final EntityType<? extends PatrollingMonster> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return bqc.getBrightness(LightLayer.BLOCK, fu) <= 8 && Monster.checkAnyLightMonsterSpawnRules(aoq, bqc, apb, fu, random);
     }
     
     @Override
@@ -95,8 +95,8 @@ public abstract class PatrollingMonster extends Monster {
         return !this.patrolling || double1 > 16384.0;
     }
     
-    public void setPatrolTarget(final BlockPos fk) {
-        this.patrolTarget = fk;
+    public void setPatrolTarget(final BlockPos fu) {
+        this.patrolTarget = fu;
         this.patrolling = true;
     }
     
@@ -122,7 +122,7 @@ public abstract class PatrollingMonster extends Monster {
     }
     
     public void findPatrolTarget() {
-        this.patrolTarget = new BlockPos(this).offset(-500 + this.random.nextInt(1000), 0, -500 + this.random.nextInt(1000));
+        this.patrolTarget = this.blockPosition().offset(-500 + this.random.nextInt(1000), 0, -500 + this.random.nextInt(1000));
         this.patrolling = true;
     }
     
@@ -140,8 +140,8 @@ public abstract class PatrollingMonster extends Monster {
         private final double leaderSpeedModifier;
         private long cooldownUntil;
         
-        public LongDistancePatrolGoal(final T awx, final double double2, final double double3) {
-            this.mob = awx;
+        public LongDistancePatrolGoal(final T bcc, final double double2, final double double3) {
+            this.mob = bcc;
             this.speedModifier = double2;
             this.leaderSpeedModifier = double3;
             this.cooldownUntil = -1L;
@@ -165,27 +165,27 @@ public abstract class PatrollingMonster extends Monster {
         @Override
         public void tick() {
             final boolean boolean2 = this.mob.isPatrolLeader();
-            final PathNavigation arr3 = this.mob.getNavigation();
-            if (arr3.isDone()) {
+            final PathNavigation awv3 = this.mob.getNavigation();
+            if (awv3.isDone()) {
                 final List<PatrollingMonster> list4 = this.findPatrolCompanions();
                 if (this.mob.isPatrolling() && list4.isEmpty()) {
                     this.mob.setPatrolling(false);
                 }
                 else if (!boolean2 || !this.mob.getPatrolTarget().closerThan(this.mob.position(), 10.0)) {
-                    Vec3 cvl5 = new Vec3(this.mob.getPatrolTarget());
-                    final Vec3 cvl6 = this.mob.position();
-                    final Vec3 cvl7 = cvl6.subtract(cvl5);
-                    cvl5 = cvl7.yRot(90.0f).scale(0.4).add(cvl5);
-                    final Vec3 cvl8 = cvl5.subtract(cvl6).normalize().scale(10.0).add(cvl6);
-                    BlockPos fk9 = new BlockPos(cvl8);
-                    fk9 = this.mob.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, fk9);
-                    if (!arr3.moveTo(fk9.getX(), fk9.getY(), fk9.getZ(), boolean2 ? this.leaderSpeedModifier : this.speedModifier)) {
+                    Vec3 dem5 = Vec3.atBottomCenterOf(this.mob.getPatrolTarget());
+                    final Vec3 dem6 = this.mob.position();
+                    final Vec3 dem7 = dem6.subtract(dem5);
+                    dem5 = dem7.yRot(90.0f).scale(0.4).add(dem5);
+                    final Vec3 dem8 = dem5.subtract(dem6).normalize().scale(10.0).add(dem6);
+                    BlockPos fu9 = new BlockPos(dem8);
+                    fu9 = this.mob.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, fu9);
+                    if (!awv3.moveTo(fu9.getX(), fu9.getY(), fu9.getZ(), boolean2 ? this.leaderSpeedModifier : this.speedModifier)) {
                         this.moveRandomly();
                         this.cooldownUntil = this.mob.level.getGameTime() + 200L;
                     }
                     else if (boolean2) {
-                        for (final PatrollingMonster awx11 : list4) {
-                            awx11.setPatrolTarget(fk9);
+                        for (final PatrollingMonster bcc11 : list4) {
+                            bcc11.setPatrolTarget(fu9);
                         }
                     }
                 }
@@ -196,13 +196,13 @@ public abstract class PatrollingMonster extends Monster {
         }
         
         private List<PatrollingMonster> findPatrolCompanions() {
-            return this.mob.level.<PatrollingMonster>getEntitiesOfClass(PatrollingMonster.class, this.mob.getBoundingBox().inflate(16.0), awx -> awx.canJoinPatrol() && !awx.is(this.mob));
+            return this.mob.level.<PatrollingMonster>getEntitiesOfClass(PatrollingMonster.class, this.mob.getBoundingBox().inflate(16.0), bcc -> bcc.canJoinPatrol() && !bcc.is(this.mob));
         }
         
         private boolean moveRandomly() {
             final Random random2 = this.mob.getRandom();
-            final BlockPos fk3 = this.mob.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, new BlockPos(this.mob).offset(-8 + random2.nextInt(16), 0, -8 + random2.nextInt(16)));
-            return this.mob.getNavigation().moveTo(fk3.getX(), fk3.getY(), fk3.getZ(), this.speedModifier);
+            final BlockPos fu3 = this.mob.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.mob.blockPosition().offset(-8 + random2.nextInt(16), 0, -8 + random2.nextInt(16)));
+            return this.mob.getNavigation().moveTo(fu3.getX(), fu3.getY(), fu3.getZ(), this.speedModifier);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/monster/Phantom.java b/src/net/minecraft/world/entity/monster/Phantom.java
index 9d19c4f..ed64e04 100644
--- a/src/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/net/minecraft/world/entity/monster/Phantom.java
@@ -1,5 +1,7 @@
 package net.minecraft.world.entity.monster;
 
+import java.util.function.Function;
+import java.util.Comparator;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import java.util.Iterator;
@@ -13,6 +15,7 @@ import net.minecraft.core.Vec3i;
 import java.util.EnumSet;
 import net.minecraft.world.entity.ai.control.LookControl;
 import net.minecraft.world.entity.ai.control.MoveControl;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import java.util.Random;
@@ -20,7 +23,6 @@ import net.minecraft.world.entity.MobType;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.nbt.CompoundTag;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.SpawnGroupData;
@@ -32,6 +34,7 @@ import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.ai.control.BodyRotationControl;
@@ -49,8 +52,8 @@ public class Phantom extends FlyingMob implements Enemy {
     private BlockPos anchorPoint;
     private AttackPhase attackPhase;
     
-    public Phantom(final EntityType<? extends Phantom> aku, final Level bjw) {
-        super(aku, bjw);
+    public Phantom(final EntityType<? extends Phantom> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.moveTargetPoint = Vec3.ZERO;
         this.anchorPoint = BlockPos.ZERO;
         this.attackPhase = AttackPhase.CIRCLE;
@@ -72,12 +75,6 @@ public class Phantom extends FlyingMob implements Enemy {
         this.targetSelector.addGoal(1, new PhantomAttackPlayerTargetGoal());
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE);
-    }
-    
     @Override
     protected void defineSynchedData() {
         super.defineSynchedData();
@@ -90,7 +87,7 @@ public class Phantom extends FlyingMob implements Enemy {
     
     private void updatePhantomSizeInfo() {
         this.refreshDimensions();
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(6 + this.getPhantomSize());
+        this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(6 + this.getPhantomSize());
     }
     
     public int getPhantomSize() {
@@ -98,16 +95,16 @@ public class Phantom extends FlyingMob implements Enemy {
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return akr.height * 0.35f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height * 0.35f;
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (Phantom.ID_SIZE.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (Phantom.ID_SIZE.equals(tq)) {
             this.updatePhantomSizeInfo();
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     @Override
@@ -147,28 +144,28 @@ public class Phantom extends FlyingMob implements Enemy {
     }
     
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        this.anchorPoint = new BlockPos(this).above(5);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        this.anchorPoint = this.blockPosition().above(5);
         this.setPhantomSize(0);
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("AX")) {
-            this.anchorPoint = new BlockPos(jt.getInt("AX"), jt.getInt("AY"), jt.getInt("AZ"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("AX")) {
+            this.anchorPoint = new BlockPos(le.getInt("AX"), le.getInt("AY"), le.getInt("AZ"));
         }
-        this.setPhantomSize(jt.getInt("Size"));
+        this.setPhantomSize(le.getInt("Size"));
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("AX", this.anchorPoint.getX());
-        jt.putInt("AY", this.anchorPoint.getY());
-        jt.putInt("AZ", this.anchorPoint.getZ());
-        jt.putInt("Size", this.getPhantomSize());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("AX", this.anchorPoint.getX());
+        le.putInt("AY", this.anchorPoint.getY());
+        le.putInt("AZ", this.anchorPoint.getZ());
+        le.putInt("Size", this.getPhantomSize());
     }
     
     @Override
@@ -187,7 +184,7 @@ public class Phantom extends FlyingMob implements Enemy {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.PHANTOM_HURT;
     }
     
@@ -207,16 +204,16 @@ public class Phantom extends FlyingMob implements Enemy {
     }
     
     @Override
-    public boolean canAttackType(final EntityType<?> aku) {
+    public boolean canAttackType(final EntityType<?> aoq) {
         return true;
     }
     
     @Override
-    public EntityDimensions getDimensions(final Pose alj) {
+    public EntityDimensions getDimensions(final Pose apj) {
         final int integer3 = this.getPhantomSize();
-        final EntityDimensions akr4 = super.getDimensions(alj);
-        final float float5 = (akr4.width + 0.2f * integer3) / akr4.width;
-        return akr4.scale(float5);
+        final EntityDimensions aon4 = super.getDimensions(apj);
+        final float float5 = (aon4.width + 0.2f * integer3) / aon4.width;
+        return aon4.scale(float5);
     }
     
     static {
@@ -231,8 +228,8 @@ public class Phantom extends FlyingMob implements Enemy {
     class PhantomMoveControl extends MoveControl {
         private float speed;
         
-        public PhantomMoveControl(final Mob ala) {
-            super(ala);
+        public PhantomMoveControl(final Mob aoz) {
+            super(aoz);
             this.speed = 0.1f;
         }
         
@@ -270,14 +267,14 @@ public class Phantom extends FlyingMob implements Enemy {
             final double double8 = this.speed * Mth.cos(float10 * 0.017453292f) * Math.abs(float2 / double7);
             final double double9 = this.speed * Mth.sin(float10 * 0.017453292f) * Math.abs(float4 / double7);
             final double double10 = this.speed * Mth.sin(float9 * 0.017453292f) * Math.abs(float3 / double7);
-            final Vec3 cvl23 = Phantom.this.getDeltaMovement();
-            Phantom.this.setDeltaMovement(cvl23.add(new Vec3(double8, double10, double9).subtract(cvl23).scale(0.2)));
+            final Vec3 dem23 = Phantom.this.getDeltaMovement();
+            Phantom.this.setDeltaMovement(dem23.add(new Vec3(double8, double10, double9).subtract(dem23).scale(0.2)));
         }
     }
     
     class PhantomBodyRotationControl extends BodyRotationControl {
-        public PhantomBodyRotationControl(final Mob ala) {
-            super(ala);
+        public PhantomBodyRotationControl(final Mob aoz) {
+            super(aoz);
         }
         
         @Override
@@ -288,8 +285,8 @@ public class Phantom extends FlyingMob implements Enemy {
     }
     
     class PhantomLookControl extends LookControl {
-        public PhantomLookControl(final Mob ala) {
-            super(ala);
+        public PhantomLookControl(final Mob aoz) {
+            super(aoz);
         }
         
         @Override
@@ -348,11 +345,11 @@ public class Phantom extends FlyingMob implements Enemy {
             if (this.touchingTarget()) {
                 this.selectNext();
             }
-            if (Phantom.this.moveTargetPoint.y < Phantom.this.getY() && !Phantom.this.level.isEmptyBlock(new BlockPos(Phantom.this).below(1))) {
+            if (Phantom.this.moveTargetPoint.y < Phantom.this.getY() && !Phantom.this.level.isEmptyBlock(Phantom.this.blockPosition().below(1))) {
                 this.height = Math.max(1.0f, this.height);
                 this.selectNext();
             }
-            if (Phantom.this.moveTargetPoint.y > Phantom.this.getY() && !Phantom.this.level.isEmptyBlock(new BlockPos(Phantom.this).above(1))) {
+            if (Phantom.this.moveTargetPoint.y > Phantom.this.getY() && !Phantom.this.level.isEmptyBlock(Phantom.this.blockPosition().above(1))) {
                 this.height = Math.min(-1.0f, this.height);
                 this.selectNext();
             }
@@ -360,10 +357,10 @@ public class Phantom extends FlyingMob implements Enemy {
         
         private void selectNext() {
             if (BlockPos.ZERO.equals(Phantom.this.anchorPoint)) {
-                Phantom.this.anchorPoint = new BlockPos(Phantom.this);
+                Phantom.this.anchorPoint = Phantom.this.blockPosition();
             }
             this.angle += this.clockwise * 15.0f * 0.017453292f;
-            Phantom.this.moveTargetPoint = new Vec3(Phantom.this.anchorPoint).add(this.distance * Mth.cos(this.angle), -4.0f + this.height, this.distance * Mth.sin(this.angle));
+            Phantom.this.moveTargetPoint = Vec3.atLowerCornerOf(Phantom.this.anchorPoint).add(this.distance * Mth.cos(this.angle), -4.0f + this.height, this.distance * Mth.sin(this.angle));
         }
     }
     
@@ -378,14 +375,14 @@ public class Phantom extends FlyingMob implements Enemy {
         
         @Override
         public boolean canContinueToUse() {
-            final LivingEntity akz2 = Phantom.this.getTarget();
-            if (akz2 == null) {
+            final LivingEntity aoy2 = Phantom.this.getTarget();
+            if (aoy2 == null) {
                 return false;
             }
-            if (!akz2.isAlive()) {
+            if (!aoy2.isAlive()) {
                 return false;
             }
-            if (akz2 instanceof Player && (((Player)akz2).isSpectator() || ((Player)akz2).isCreative())) {
+            if (aoy2 instanceof Player && (((Player)aoy2).isSpectator() || ((Player)aoy2).isCreative())) {
                 return false;
             }
             if (!this.canUse()) {
@@ -394,8 +391,8 @@ public class Phantom extends FlyingMob implements Enemy {
             if (Phantom.this.tickCount % 20 == 0) {
                 final List<Cat> list3 = Phantom.this.level.<Cat>getEntitiesOfClass(Cat.class, Phantom.this.getBoundingBox().inflate(16.0), EntitySelector.ENTITY_STILL_ALIVE);
                 if (!list3.isEmpty()) {
-                    for (final Cat ate5 : list3) {
-                        ate5.hiss();
+                    for (final Cat aym5 : list3) {
+                        aym5.hiss();
                     }
                     return false;
                 }
@@ -415,12 +412,14 @@ public class Phantom extends FlyingMob implements Enemy {
         
         @Override
         public void tick() {
-            final LivingEntity akz2 = Phantom.this.getTarget();
-            Phantom.this.moveTargetPoint = new Vec3(akz2.getX(), akz2.getY(0.5), akz2.getZ());
-            if (Phantom.this.getBoundingBox().inflate(0.20000000298023224).intersects(akz2.getBoundingBox())) {
-                Phantom.this.doHurtTarget(akz2);
+            final LivingEntity aoy2 = Phantom.this.getTarget();
+            Phantom.this.moveTargetPoint = new Vec3(aoy2.getX(), aoy2.getY(0.5), aoy2.getZ());
+            if (Phantom.this.getBoundingBox().inflate(0.20000000298023224).intersects(aoy2.getBoundingBox())) {
+                Phantom.this.doHurtTarget(aoy2);
                 Phantom.this.attackPhase = AttackPhase.CIRCLE;
-                Phantom.this.level.levelEvent(1039, new BlockPos(Phantom.this), 0);
+                if (!Phantom.this.isSilent()) {
+                    Phantom.this.level.levelEvent(1039, Phantom.this.blockPosition(), 0);
+                }
             }
             else if (Phantom.this.horizontalCollision || Phantom.this.hurtTime > 0) {
                 Phantom.this.attackPhase = AttackPhase.CIRCLE;
@@ -436,8 +435,8 @@ public class Phantom extends FlyingMob implements Enemy {
         
         @Override
         public boolean canUse() {
-            final LivingEntity akz2 = Phantom.this.getTarget();
-            return akz2 != null && Phantom.this.canAttack(Phantom.this.getTarget(), TargetingConditions.DEFAULT);
+            final LivingEntity aoy2 = Phantom.this.getTarget();
+            return aoy2 != null && Phantom.this.canAttack(Phantom.this.getTarget(), TargetingConditions.DEFAULT);
         }
         
         @Override
@@ -466,7 +465,7 @@ public class Phantom extends FlyingMob implements Enemy {
         }
         
         private void setAnchorAboveTarget() {
-            Phantom.this.anchorPoint = new BlockPos(Phantom.this.getTarget()).above(20 + Phantom.this.random.nextInt(20));
+            Phantom.this.anchorPoint = Phantom.this.getTarget().blockPosition().above(20 + Phantom.this.random.nextInt(20));
             if (Phantom.this.anchorPoint.getY() < Phantom.this.level.getSeaLevel()) {
                 Phantom.this.anchorPoint = new BlockPos(Phantom.this.anchorPoint.getX(), Phantom.this.level.getSeaLevel() + 1, Phantom.this.anchorPoint.getZ());
             }
@@ -491,10 +490,10 @@ public class Phantom extends FlyingMob implements Enemy {
             this.nextScanTick = 60;
             final List<Player> list2 = Phantom.this.level.getNearbyPlayers(this.attackTargeting, Phantom.this, Phantom.this.getBoundingBox().inflate(16.0, 64.0, 16.0));
             if (!list2.isEmpty()) {
-                list2.sort((ayj1, ayj2) -> (ayj1.getY() > ayj2.getY()) ? -1 : 1);
-                for (final Player ayj3 : list2) {
-                    if (Phantom.this.canAttack(ayj3, TargetingConditions.DEFAULT)) {
-                        Phantom.this.setTarget(ayj3);
+                list2.sort(Comparator.<Object, Comparable>comparing(Entity::getY).reversed());
+                for (final Player bec4 : list2) {
+                    if (Phantom.this.canAttack(bec4, TargetingConditions.DEFAULT)) {
+                        Phantom.this.setTarget(bec4);
                         return true;
                     }
                 }
@@ -504,8 +503,8 @@ public class Phantom extends FlyingMob implements Enemy {
         
         @Override
         public boolean canContinueToUse() {
-            final LivingEntity akz2 = Phantom.this.getTarget();
-            return akz2 != null && Phantom.this.canAttack(akz2, TargetingConditions.DEFAULT);
+            final LivingEntity aoy2 = Phantom.this.getTarget();
+            return aoy2 != null && Phantom.this.canAttack(aoy2, TargetingConditions.DEFAULT);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/monster/PigZombie.java b/src/net/minecraft/world/entity/monster/PigZombie.java
deleted file mode 100644
index 5124c1d..0000000
--- a/src/net/minecraft/world/entity/monster/PigZombie.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package net.minecraft.world.entity.monster;
-
-import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
-import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.DifficultyInstance;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.Difficulty;
-import java.util.Random;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.MobSpawnType;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.ai.attributes.AttributeInstance;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.PathfinderMob;
-import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.entity.ai.goal.ZombieAttackGoal;
-import javax.annotation.Nullable;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.pathfinder.BlockPathTypes;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import java.util.UUID;
-
-public class PigZombie extends Zombie {
-    private static final UUID SPEED_MODIFIER_ATTACKING_UUID;
-    private static final AttributeModifier SPEED_MODIFIER_ATTACKING;
-    private int angerTime;
-    private int playAngrySoundIn;
-    private UUID lastHurtByUUID;
-    
-    public PigZombie(final EntityType<? extends PigZombie> aku, final Level bjw) {
-        super(aku, bjw);
-        this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0f);
-    }
-    
-    @Override
-    public void setLastHurtByMob(@Nullable final LivingEntity akz) {
-        super.setLastHurtByMob(akz);
-        if (akz != null) {
-            this.lastHurtByUUID = akz.getUUID();
-        }
-    }
-    
-    @Override
-    protected void addBehaviourGoals() {
-        this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0, false));
-        this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0));
-        this.targetSelector.addGoal(1, new PigZombieHurtByOtherGoal(this));
-        this.targetSelector.addGoal(2, new PigZombieAngerTargetGoal(this));
-    }
-    
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(PigZombie.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(0.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.23000000417232513);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(5.0);
-    }
-    
-    @Override
-    protected boolean convertsInWater() {
-        return false;
-    }
-    
-    @Override
-    protected void customServerAiStep() {
-        final AttributeInstance alr2 = this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED);
-        final LivingEntity akz3 = this.getLastHurtByMob();
-        if (this.isAngry()) {
-            if (!this.isBaby() && !alr2.hasModifier(PigZombie.SPEED_MODIFIER_ATTACKING)) {
-                alr2.addModifier(PigZombie.SPEED_MODIFIER_ATTACKING);
-            }
-            --this.angerTime;
-            final LivingEntity akz4 = (akz3 != null) ? akz3 : this.getTarget();
-            if (!this.isAngry() && akz4 != null) {
-                if (!this.canSee(akz4)) {
-                    this.setLastHurtByMob(null);
-                    this.setTarget(null);
-                }
-                else {
-                    this.angerTime = this.getAngerTime();
-                }
-            }
-        }
-        else if (alr2.hasModifier(PigZombie.SPEED_MODIFIER_ATTACKING)) {
-            alr2.removeModifier(PigZombie.SPEED_MODIFIER_ATTACKING);
-        }
-        if (this.playAngrySoundIn > 0 && --this.playAngrySoundIn == 0) {
-            this.playSound(SoundEvents.ZOMBIE_PIGMAN_ANGRY, this.getSoundVolume() * 2.0f, ((this.random.nextFloat() - this.random.nextFloat()) * 0.2f + 1.0f) * 1.8f);
-        }
-        if (this.isAngry() && this.lastHurtByUUID != null && akz3 == null) {
-            final Player ayj4 = this.level.getPlayerByUUID(this.lastHurtByUUID);
-            this.setLastHurtByMob(ayj4);
-            this.lastHurtByPlayer = ayj4;
-            this.lastHurtByPlayerTime = this.getLastHurtByMobTimestamp();
-        }
-        super.customServerAiStep();
-    }
-    
-    public static boolean checkPigZombieSpawnRules(final EntityType<PigZombie> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return bjx.getDifficulty() != Difficulty.PEACEFUL;
-    }
-    
-    @Override
-    public boolean checkSpawnObstruction(final LevelReader bjz) {
-        return bjz.isUnobstructed(this) && !bjz.containsAnyLiquid(this.getBoundingBox());
-    }
-    
-    @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putShort("Anger", (short)this.angerTime);
-        if (this.lastHurtByUUID != null) {
-            jt.putString("HurtBy", this.lastHurtByUUID.toString());
-        }
-        else {
-            jt.putString("HurtBy", "");
-        }
-    }
-    
-    @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.angerTime = jt.getShort("Anger");
-        final String string3 = jt.getString("HurtBy");
-        if (!string3.isEmpty()) {
-            this.lastHurtByUUID = UUID.fromString(string3);
-            final Player ayj4 = this.level.getPlayerByUUID(this.lastHurtByUUID);
-            this.setLastHurtByMob(ayj4);
-            if (ayj4 != null) {
-                this.lastHurtByPlayer = ayj4;
-                this.lastHurtByPlayerTime = this.getLastHurtByMobTimestamp();
-            }
-        }
-    }
-    
-    @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
-            return false;
-        }
-        final Entity akq4 = ajz.getEntity();
-        if (akq4 instanceof Player && !((Player)akq4).isCreative() && this.canSee(akq4)) {
-            this.makeAngry((LivingEntity)akq4);
-        }
-        return super.hurt(ajz, float2);
-    }
-    
-    private boolean makeAngry(final LivingEntity akz) {
-        this.angerTime = this.getAngerTime();
-        this.playAngrySoundIn = this.random.nextInt(40);
-        this.setLastHurtByMob(akz);
-        return true;
-    }
-    
-    private int getAngerTime() {
-        return 400 + this.random.nextInt(400);
-    }
-    
-    private boolean isAngry() {
-        return this.angerTime > 0;
-    }
-    
-    @Override
-    protected SoundEvent getAmbientSound() {
-        return SoundEvents.ZOMBIE_PIGMAN_AMBIENT;
-    }
-    
-    @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
-        return SoundEvents.ZOMBIE_PIGMAN_HURT;
-    }
-    
-    @Override
-    protected SoundEvent getDeathSound() {
-        return SoundEvents.ZOMBIE_PIGMAN_DEATH;
-    }
-    
-    @Override
-    protected void populateDefaultEquipmentSlots(final DifficultyInstance ajj) {
-        this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.GOLDEN_SWORD));
-    }
-    
-    @Override
-    protected ItemStack getSkull() {
-        return ItemStack.EMPTY;
-    }
-    
-    @Override
-    public boolean isPreventingPlayerRest(final Player ayj) {
-        return this.isAngry();
-    }
-    
-    static {
-        SPEED_MODIFIER_ATTACKING_UUID = UUID.fromString("49455A49-7EC5-45BA-B886-3B90B23A1718");
-        SPEED_MODIFIER_ATTACKING = new AttributeModifier(PigZombie.SPEED_MODIFIER_ATTACKING_UUID, "Attacking speed boost", 0.05, AttributeModifier.Operation.ADDITION).setSerialize(false);
-    }
-    
-    static class PigZombieHurtByOtherGoal extends HurtByTargetGoal {
-        public PigZombieHurtByOtherGoal(final PigZombie awz) {
-            super(awz, new Class[0]);
-            this.setAlertOthers(Zombie.class);
-        }
-        
-        @Override
-        protected void alertOther(final Mob ala, final LivingEntity akz) {
-            if (ala instanceof PigZombie && this.mob.canSee(akz) && ((PigZombie)ala).makeAngry(akz)) {
-                ala.setTarget(akz);
-            }
-        }
-    }
-    
-    static class PigZombieAngerTargetGoal extends NearestAttackableTargetGoal<Player> {
-        public PigZombieAngerTargetGoal(final PigZombie awz) {
-            super(awz, Player.class, true);
-        }
-        
-        @Override
-        public boolean canUse() {
-            return ((PigZombie)this.mob).isAngry() && super.canUse();
-        }
-    }
-}
diff --git a/src/net/minecraft/world/entity/monster/Pillager.java b/src/net/minecraft/world/entity/monster/Pillager.java
index b446c73..42211b2 100644
--- a/src/net/minecraft/world/entity/monster/Pillager.java
+++ b/src/net/minecraft/world/entity/monster/Pillager.java
@@ -8,14 +8,7 @@ import net.minecraft.world.Difficulty;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.BannerItem;
 import net.minecraft.world.entity.item.ItemEntity;
-import com.mojang.math.Quaternion;
-import com.mojang.math.Vector3f;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.util.Mth;
 import net.minecraft.world.entity.projectile.Projectile;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.item.CrossbowItem;
-import net.minecraft.world.entity.projectile.ProjectileUtil;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
@@ -33,15 +26,18 @@ import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.DifficultyInstance;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.ProjectileWeaponItem;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.npc.AbstractVillager;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
@@ -61,12 +57,12 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.network.syncher.EntityDataAccessor;
 
-public class Pillager extends AbstractIllager implements CrossbowAttackMob, RangedAttackMob {
+public class Pillager extends AbstractIllager implements CrossbowAttackMob {
     private static final EntityDataAccessor<Boolean> IS_CHARGING_CROSSBOW;
     private final SimpleContainer inventory;
     
-    public Pillager(final EntityType<? extends Pillager> aku, final Level bjw) {
-        super(aku, bjw);
+    public Pillager(final EntityType<? extends Pillager> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.inventory = new SimpleContainer(5);
     }
     
@@ -85,13 +81,8 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Rang
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.3499999940395355);
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(24.0);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(5.0);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(32.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.3499999940395355).add(Attributes.MAX_HEALTH, 24.0).add(Attributes.ATTACK_DAMAGE, 5.0).add(Attributes.FOLLOW_RANGE, 32.0);
     }
     
     @Override
@@ -100,6 +91,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Rang
         this.entityData.<Boolean>define(Pillager.IS_CHARGING_CROSSBOW, false);
     }
     
+    @Override
+    public boolean canFireProjectileWeapon(final ProjectileWeaponItem bkv) {
+        return bkv == Items.CROSSBOW;
+    }
+    
     public boolean isChargingCrossbow() {
         return this.entityData.<Boolean>get(Pillager.IS_CHARGING_CROSSBOW);
     }
@@ -110,16 +106,21 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Rang
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        final ListTag jz3 = new ListTag();
+    public void onCrossbowAttackPerformed() {
+        this.noActionTime = 0;
+    }
+    
+    @Override
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        final ListTag lk3 = new ListTag();
         for (int integer4 = 0; integer4 < this.inventory.getContainerSize(); ++integer4) {
-            final ItemStack ben5 = this.inventory.getItem(integer4);
-            if (!ben5.isEmpty()) {
-                ((AbstractList<CompoundTag>)jz3).add(ben5.save(new CompoundTag()));
+            final ItemStack bki5 = this.inventory.getItem(integer4);
+            if (!bki5.isEmpty()) {
+                ((AbstractList<CompoundTag>)lk3).add(bki5.save(new CompoundTag()));
             }
         }
-        jt.put("Inventory", jz3);
+        le.put("Inventory", lk3);
     }
     
     @Override
@@ -137,25 +138,25 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Rang
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        final ListTag jz3 = jt.getList("Inventory", 10);
-        for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-            final ItemStack ben5 = ItemStack.of(jz3.getCompound(integer4));
-            if (!ben5.isEmpty()) {
-                this.inventory.addItem(ben5);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        final ListTag lk3 = le.getList("Inventory", 10);
+        for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+            final ItemStack bki5 = ItemStack.of(lk3.getCompound(integer4));
+            if (!bki5.isEmpty()) {
+                this.inventory.addItem(bki5);
             }
         }
         this.setCanPickUpLoot(true);
     }
     
     @Override
-    public float getWalkTargetValue(final BlockPos fk, final LevelReader bjz) {
-        final Block bph4 = bjz.getBlockState(fk.below()).getBlock();
-        if (bph4 == Blocks.GRASS_BLOCK || bph4 == Blocks.SAND) {
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        final BlockState cfj4 = bqd.getBlockState(fu.below());
+        if (cfj4.is(Blocks.GRASS_BLOCK) || cfj4.is(Blocks.SAND)) {
             return 10.0f;
         }
-        return 0.5f - bjz.getBrightness(fk);
+        return 0.5f - bqd.getBrightness(fu);
     }
     
     @Override
@@ -165,26 +166,26 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Rang
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        this.populateDefaultEquipmentSlots(ajj);
-        this.populateDefaultEquipmentEnchantments(ajj);
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        this.populateDefaultEquipmentSlots(ane);
+        this.populateDefaultEquipmentEnchantments(ane);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     @Override
-    protected void populateDefaultEquipmentSlots(final DifficultyInstance ajj) {
-        final ItemStack ben3 = new ItemStack(Items.CROSSBOW);
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
+        final ItemStack bki3 = new ItemStack(Items.CROSSBOW);
         if (this.random.nextInt(300) == 0) {
             final Map<Enchantment, Integer> map4 = Maps.newHashMap();
             map4.put(Enchantments.PIERCING, 1);
-            EnchantmentHelper.setEnchantments(map4, ben3);
+            EnchantmentHelper.setEnchantments(map4, bki3);
         }
-        this.setItemSlot(EquipmentSlot.MAINHAND, ben3);
+        this.setItemSlot(EquipmentSlot.MAINHAND, bki3);
     }
     
     @Override
-    public boolean isAlliedTo(final Entity akq) {
-        return super.isAlliedTo(akq) || (akq instanceof LivingEntity && ((LivingEntity)akq).getMobType() == MobType.ILLAGER && this.getTeam() == null && akq.getTeam() == null);
+    public boolean isAlliedTo(final Entity aom) {
+        return super.isAlliedTo(aom) || (aom instanceof LivingEntity && ((LivingEntity)aom).getMobType() == MobType.ILLAGER && this.getTeam() == null && aom.getTeam() == null);
     }
     
     @Override
@@ -198,79 +199,53 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Rang
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.PILLAGER_HURT;
     }
     
     @Override
-    public void performRangedAttack(final LivingEntity akz, final float float2) {
-        final InteractionHand ajk4 = ProjectileUtil.getWeaponHoldingHand(this, Items.CROSSBOW);
-        final ItemStack ben5 = this.getItemInHand(ajk4);
-        if (this.isHolding(Items.CROSSBOW)) {
-            CrossbowItem.performShooting(this.level, this, ajk4, ben5, 1.6f, (float)(14 - this.level.getDifficulty().getId() * 4));
-        }
-        this.noActionTime = 0;
+    public void performRangedAttack(final LivingEntity aoy, final float float2) {
+        this.performCrossbowAttack(this, 1.6f);
     }
     
     @Override
-    public void shootProjectile(final LivingEntity akz, final ItemStack ben, final Projectile ayy, final float float4) {
-        final Entity akq6 = (Entity)ayy;
-        final double double7 = akz.getX() - this.getX();
-        final double double8 = akz.getZ() - this.getZ();
-        final double double9 = Mth.sqrt(double7 * double7 + double8 * double8);
-        final double double10 = akz.getY(0.3333333333333333) - akq6.getY() + double9 * 0.20000000298023224;
-        final Vector3f e15 = this.getProjectileShotVector(new Vec3(double7, double10, double8), float4);
-        ayy.shoot(e15.x(), e15.y(), e15.z(), 1.6f, (float)(14 - this.level.getDifficulty().getId() * 4));
-        this.playSound(SoundEvents.CROSSBOW_SHOOT, 1.0f, 1.0f / (this.getRandom().nextFloat() * 0.4f + 0.8f));
-    }
-    
-    private Vector3f getProjectileShotVector(final Vec3 cvl, final float float2) {
-        final Vec3 cvl2 = cvl.normalize();
-        Vec3 cvl3 = cvl2.cross(new Vec3(0.0, 1.0, 0.0));
-        if (cvl3.lengthSqr() <= 1.0E-7) {
-            cvl3 = cvl2.cross(this.getUpVector(1.0f));
-        }
-        final Quaternion c6 = new Quaternion(new Vector3f(cvl3), 90.0f, true);
-        final Vector3f e7 = new Vector3f(cvl2);
-        e7.transform(c6);
-        final Quaternion c7 = new Quaternion(e7, float2, true);
-        final Vector3f e8 = new Vector3f(cvl2);
-        e8.transform(c7);
-        return e8;
+    public void shootCrossbowProjectile(final LivingEntity aoy, final ItemStack bki, final Projectile bes, final float float4) {
+        this.shootCrossbowProjectile(this, aoy, bes, float4, 1.6f);
     }
     
     @Override
-    protected void pickUpItem(final ItemEntity awb) {
-        final ItemStack ben3 = awb.getItem();
-        if (ben3.getItem() instanceof BannerItem) {
-            super.pickUpItem(awb);
+    protected void pickUpItem(final ItemEntity bbg) {
+        final ItemStack bki3 = bbg.getItem();
+        if (bki3.getItem() instanceof BannerItem) {
+            super.pickUpItem(bbg);
         }
         else {
-            final Item bei4 = ben3.getItem();
-            if (this.wantsItem(bei4)) {
-                final ItemStack ben4 = this.inventory.addItem(ben3);
-                if (ben4.isEmpty()) {
-                    awb.remove();
+            final Item bke4 = bki3.getItem();
+            if (this.wantsItem(bke4)) {
+                this.onItemPickup(bbg);
+                final ItemStack bki4 = this.inventory.addItem(bki3);
+                if (bki4.isEmpty()) {
+                    bbg.remove();
                 }
                 else {
-                    ben3.setCount(ben4.getCount());
+                    bki3.setCount(bki4.getCount());
                 }
             }
         }
     }
     
-    private boolean wantsItem(final Item bei) {
-        return this.hasActiveRaid() && bei == Items.WHITE_BANNER;
+    private boolean wantsItem(final Item bke) {
+        return this.hasActiveRaid() && bke == Items.WHITE_BANNER;
     }
     
     @Override
-    public boolean setSlot(final int integer, final ItemStack ben) {
-        if (super.setSlot(integer, ben)) {
+    public boolean setSlot(final int integer, final ItemStack bki) {
+        if (super.setSlot(integer, bki)) {
             return true;
         }
         final int integer2 = integer - 300;
         if (integer2 >= 0 && integer2 < this.inventory.getContainerSize()) {
-            this.inventory.setItem(integer2, ben);
+            this.inventory.setItem(integer2, bki);
             return true;
         }
         return false;
@@ -278,20 +253,20 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Rang
     
     @Override
     public void applyRaidBuffs(final int integer, final boolean boolean2) {
-        final Raid azn4 = this.getCurrentRaid();
-        final boolean boolean3 = this.random.nextFloat() <= azn4.getEnchantOdds();
+        final Raid bfh4 = this.getCurrentRaid();
+        final boolean boolean3 = this.random.nextFloat() <= bfh4.getEnchantOdds();
         if (boolean3) {
-            final ItemStack ben6 = new ItemStack(Items.CROSSBOW);
+            final ItemStack bki6 = new ItemStack(Items.CROSSBOW);
             final Map<Enchantment, Integer> map7 = Maps.newHashMap();
-            if (integer > azn4.getNumGroups(Difficulty.NORMAL)) {
+            if (integer > bfh4.getNumGroups(Difficulty.NORMAL)) {
                 map7.put(Enchantments.QUICK_CHARGE, 2);
             }
-            else if (integer > azn4.getNumGroups(Difficulty.EASY)) {
+            else if (integer > bfh4.getNumGroups(Difficulty.EASY)) {
                 map7.put(Enchantments.QUICK_CHARGE, 1);
             }
             map7.put(Enchantments.MULTISHOT, 1);
-            EnchantmentHelper.setEnchantments(map7, ben6);
-            this.setItemSlot(EquipmentSlot.MAINHAND, ben6);
+            EnchantmentHelper.setEnchantments(map7, bki6);
+            this.setItemSlot(EquipmentSlot.MAINHAND, bki6);
         }
     }
     
diff --git a/src/net/minecraft/world/entity/monster/RangedAttackMob.java b/src/net/minecraft/world/entity/monster/RangedAttackMob.java
index 0672ed1..a2deeb4 100644
--- a/src/net/minecraft/world/entity/monster/RangedAttackMob.java
+++ b/src/net/minecraft/world/entity/monster/RangedAttackMob.java
@@ -3,5 +3,5 @@ package net.minecraft.world.entity.monster;
 import net.minecraft.world.entity.LivingEntity;
 
 public interface RangedAttackMob {
-    void performRangedAttack(final LivingEntity akz, final float float2);
+    void performRangedAttack(final LivingEntity aoy, final float float2);
 }
diff --git a/src/net/minecraft/world/entity/monster/Ravager.java b/src/net/minecraft/world/entity/monster/Ravager.java
index 088636b..0641634 100644
--- a/src/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/net/minecraft/world/entity/monster/Ravager.java
@@ -25,7 +25,10 @@ import net.minecraft.world.entity.ai.navigation.PathNavigation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.vehicle.Boat;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.EntityTypeTags;
 import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.npc.AbstractVillager;
@@ -51,8 +54,8 @@ public class Ravager extends Raider {
     private int stunnedTick;
     private int roarTick;
     
-    public Ravager(final EntityType<? extends Ravager> aku, final Level bjw) {
-        super(aku, bjw);
+    public Ravager(final EntityType<? extends Ravager> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.maxUpStep = 1.0f;
         this.xpReward = 20;
     }
@@ -81,31 +84,24 @@ public class Ravager extends Raider {
         this.goalSelector.setControlFlag(Goal.Flag.TARGET, boolean2);
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(100.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.3);
-        this.getAttribute(SharedMonsterAttributes.KNOCKBACK_RESISTANCE).setBaseValue(0.5);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(12.0);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_KNOCKBACK).setBaseValue(1.5);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(32.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 100.0).add(Attributes.MOVEMENT_SPEED, 0.3).add(Attributes.KNOCKBACK_RESISTANCE, 0.75).add(Attributes.ATTACK_DAMAGE, 12.0).add(Attributes.ATTACK_KNOCKBACK, 1.5).add(Attributes.FOLLOW_RANGE, 32.0);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("AttackTick", this.attackTick);
-        jt.putInt("StunTick", this.stunnedTick);
-        jt.putInt("RoarTick", this.roarTick);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("AttackTick", this.attackTick);
+        le.putInt("StunTick", this.stunnedTick);
+        le.putInt("RoarTick", this.roarTick);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.attackTick = jt.getInt("AttackTick");
-        this.stunnedTick = jt.getInt("StunTick");
-        this.roarTick = jt.getInt("RoarTick");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.attackTick = le.getInt("AttackTick");
+        this.stunnedTick = le.getInt("StunTick");
+        this.roarTick = le.getInt("RoarTick");
     }
     
     @Override
@@ -114,8 +110,8 @@ public class Ravager extends Raider {
     }
     
     @Override
-    protected PathNavigation createNavigation(final Level bjw) {
-        return new RavagerNavigation(this, bjw);
+    protected PathNavigation createNavigation(final Level bqb) {
+        return new RavagerNavigation(this, bqb);
     }
     
     @Override
@@ -124,7 +120,7 @@ public class Ravager extends Raider {
     }
     
     @Override
-    public double getRideHeight() {
+    public double getPassengersRidingOffset() {
         return 2.1;
     }
     
@@ -149,21 +145,21 @@ public class Ravager extends Raider {
             return;
         }
         if (this.isImmobile()) {
-            this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.0);
+            this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.0);
         }
         else {
             final double double2 = (this.getTarget() != null) ? 0.35 : 0.3;
-            final double double3 = this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getBaseValue();
-            this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(Mth.lerp(0.1, double3, double2));
+            final double double3 = this.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue();
+            this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(Mth.lerp(0.1, double3, double2));
         }
         if (this.horizontalCollision && this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
             boolean boolean2 = false;
-            final AABB cvf3 = this.getBoundingBox().inflate(0.2);
-            for (final BlockPos fk5 : BlockPos.betweenClosed(Mth.floor(cvf3.minX), Mth.floor(cvf3.minY), Mth.floor(cvf3.minZ), Mth.floor(cvf3.maxX), Mth.floor(cvf3.maxY), Mth.floor(cvf3.maxZ))) {
-                final BlockState byj6 = this.level.getBlockState(fk5);
-                final Block bph7 = byj6.getBlock();
-                if (bph7 instanceof LeavesBlock) {
-                    boolean2 = (this.level.destroyBlock(fk5, true, this) || boolean2);
+            final AABB deg3 = this.getBoundingBox().inflate(0.2);
+            for (final BlockPos fu5 : BlockPos.betweenClosed(Mth.floor(deg3.minX), Mth.floor(deg3.minY), Mth.floor(deg3.minZ), Mth.floor(deg3.maxX), Mth.floor(deg3.maxY), Mth.floor(deg3.maxZ))) {
+                final BlockState cfj6 = this.level.getBlockState(fu5);
+                final Block bvr7 = cfj6.getBlock();
+                if (bvr7 instanceof LeavesBlock) {
+                    boolean2 = (this.level.destroyBlock(fu5, true, this) || boolean2);
                 }
             }
             if (!boolean2 && this.onGround) {
@@ -204,50 +200,50 @@ public class Ravager extends Raider {
     }
     
     @Override
-    public boolean canSee(final Entity akq) {
-        return this.stunnedTick <= 0 && this.roarTick <= 0 && super.canSee(akq);
+    public boolean canSee(final Entity aom) {
+        return this.stunnedTick <= 0 && this.roarTick <= 0 && super.canSee(aom);
     }
     
     @Override
-    protected void blockedByShield(final LivingEntity akz) {
+    protected void blockedByShield(final LivingEntity aoy) {
         if (this.roarTick == 0) {
             if (this.random.nextDouble() < 0.5) {
                 this.stunnedTick = 40;
                 this.playSound(SoundEvents.RAVAGER_STUNNED, 1.0f, 1.0f);
                 this.level.broadcastEntityEvent(this, (byte)39);
-                akz.push(this);
+                aoy.push(this);
             }
             else {
-                this.strongKnockback(akz);
+                this.strongKnockback(aoy);
             }
-            akz.hurtMarked = true;
+            aoy.hurtMarked = true;
         }
     }
     
     private void roar() {
         if (this.isAlive()) {
             final List<Entity> list2 = this.level.<Entity>getEntitiesOfClass(LivingEntity.class, this.getBoundingBox().inflate(4.0), Ravager.NO_RAVAGER_AND_ALIVE);
-            for (final Entity akq4 : list2) {
-                if (!(akq4 instanceof AbstractIllager)) {
-                    akq4.hurt(DamageSource.mobAttack(this), 6.0f);
+            for (final Entity aom4 : list2) {
+                if (!(aom4 instanceof AbstractIllager)) {
+                    aom4.hurt(DamageSource.mobAttack(this), 6.0f);
                 }
-                this.strongKnockback(akq4);
+                this.strongKnockback(aom4);
             }
-            final Vec3 cvl3 = this.getBoundingBox().getCenter();
+            final Vec3 dem3 = this.getBoundingBox().getCenter();
             for (int integer4 = 0; integer4 < 40; ++integer4) {
                 final double double5 = this.random.nextGaussian() * 0.2;
                 final double double6 = this.random.nextGaussian() * 0.2;
                 final double double7 = this.random.nextGaussian() * 0.2;
-                this.level.addParticle(ParticleTypes.POOF, cvl3.x, cvl3.y, cvl3.z, double5, double6, double7);
+                this.level.addParticle(ParticleTypes.POOF, dem3.x, dem3.y, dem3.z, double5, double6, double7);
             }
         }
     }
     
-    private void strongKnockback(final Entity akq) {
-        final double double3 = akq.getX() - this.getX();
-        final double double4 = akq.getZ() - this.getZ();
+    private void strongKnockback(final Entity aom) {
+        final double double3 = aom.getX() - this.getX();
+        final double double4 = aom.getZ() - this.getZ();
         final double double5 = Math.max(double3 * double3 + double4 * double4, 0.001);
-        akq.push(double3 / double5 * 4.0, 0.2, double4 / double5 * 4.0);
+        aom.push(double3 / double5 * 4.0, 0.2, double4 / double5 * 4.0);
     }
     
     @Override
@@ -275,11 +271,11 @@ public class Ravager extends Raider {
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
+    public boolean doHurtTarget(final Entity aom) {
         this.attackTick = 10;
         this.level.broadcastEntityEvent(this, (byte)4);
         this.playSound(SoundEvents.RAVAGER_ATTACK, 1.0f, 1.0f);
-        return super.doHurtTarget(akq);
+        return super.doHurtTarget(aom);
     }
     
     @Nullable
@@ -289,7 +285,7 @@ public class Ravager extends Raider {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.RAVAGER_HURT;
     }
     
@@ -299,13 +295,13 @@ public class Ravager extends Raider {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.RAVAGER_STEP, 0.15f, 1.0f);
     }
     
     @Override
-    public boolean checkSpawnObstruction(final LevelReader bjz) {
-        return !bjz.containsAnyLiquid(this.getBoundingBox());
+    public boolean checkSpawnObstruction(final LevelReader bqd) {
+        return !bqd.containsAnyLiquid(this.getBoundingBox());
     }
     
     @Override
@@ -318,7 +314,7 @@ public class Ravager extends Raider {
     }
     
     static {
-        NO_RAVAGER_AND_ALIVE = (akq -> akq.isAlive() && !(akq instanceof Ravager));
+        NO_RAVAGER_AND_ALIVE = (aom -> aom.isAlive() && !(aom instanceof Ravager));
     }
     
     class RavagerMeleeAttackGoal extends MeleeAttackGoal {
@@ -327,15 +323,15 @@ public class Ravager extends Raider {
         }
         
         @Override
-        protected double getAttackReachSqr(final LivingEntity akz) {
+        protected double getAttackReachSqr(final LivingEntity aoy) {
             final float float3 = Ravager.this.getBbWidth() - 0.1f;
-            return float3 * 2.0f * (float3 * 2.0f) + akz.getBbWidth();
+            return float3 * 2.0f * (float3 * 2.0f) + aoy.getBbWidth();
         }
     }
     
     static class RavagerNavigation extends GroundPathNavigation {
-        public RavagerNavigation(final Mob ala, final Level bjw) {
-            super(ala, bjw);
+        public RavagerNavigation(final Mob aoz, final Level bqb) {
+            super(aoz, bqb);
         }
         
         @Override
@@ -350,11 +346,11 @@ public class Ravager extends Raider {
         }
         
         @Override
-        protected BlockPathTypes evaluateBlockPathType(final BlockGetter bjg, final boolean boolean2, final boolean boolean3, final BlockPos fk, final BlockPathTypes cqm) {
-            if (cqm == BlockPathTypes.LEAVES) {
+        protected BlockPathTypes evaluateBlockPathType(final BlockGetter bpg, final boolean boolean2, final boolean boolean3, final BlockPos fu, final BlockPathTypes czb) {
+            if (czb == BlockPathTypes.LEAVES) {
                 return BlockPathTypes.OPEN;
             }
-            return super.evaluateBlockPathType(bjg, boolean2, boolean3, fk, cqm);
+            return super.evaluateBlockPathType(bpg, boolean2, boolean3, fu, czb);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/monster/SharedMonsterAttributes.java b/src/net/minecraft/world/entity/monster/SharedMonsterAttributes.java
deleted file mode 100644
index 4a79418..0000000
--- a/src/net/minecraft/world/entity/monster/SharedMonsterAttributes.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package net.minecraft.world.entity.monster;
-
-import java.util.AbstractList;
-import net.minecraft.world.entity.ai.attributes.RangedAttribute;
-import org.apache.logging.log4j.LogManager;
-import javax.annotation.Nullable;
-import java.util.UUID;
-import java.util.Collection;
-import net.minecraft.nbt.Tag;
-import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import net.minecraft.nbt.CompoundTag;
-import java.util.Iterator;
-import net.minecraft.world.entity.ai.attributes.AttributeInstance;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.world.entity.ai.attributes.BaseAttributeMap;
-import net.minecraft.world.entity.ai.attributes.Attribute;
-import org.apache.logging.log4j.Logger;
-
-public class SharedMonsterAttributes {
-    private static final Logger LOGGER;
-    public static final Attribute MAX_HEALTH;
-    public static final Attribute FOLLOW_RANGE;
-    public static final Attribute KNOCKBACK_RESISTANCE;
-    public static final Attribute MOVEMENT_SPEED;
-    public static final Attribute FLYING_SPEED;
-    public static final Attribute ATTACK_DAMAGE;
-    public static final Attribute ATTACK_KNOCKBACK;
-    public static final Attribute ATTACK_SPEED;
-    public static final Attribute ARMOR;
-    public static final Attribute ARMOR_TOUGHNESS;
-    public static final Attribute LUCK;
-    
-    public static ListTag saveAttributes(final BaseAttributeMap alu) {
-        final ListTag jz2 = new ListTag();
-        for (final AttributeInstance alr4 : alu.getAttributes()) {
-            ((AbstractList<CompoundTag>)jz2).add(saveAttribute(alr4));
-        }
-        return jz2;
-    }
-    
-    private static CompoundTag saveAttribute(final AttributeInstance alr) {
-        final CompoundTag jt2 = new CompoundTag();
-        final Attribute alq3 = alr.getAttribute();
-        jt2.putString("Name", alq3.getName());
-        jt2.putDouble("Base", alr.getBaseValue());
-        final Collection<AttributeModifier> collection4 = alr.getModifiers();
-        if (collection4 != null && !collection4.isEmpty()) {
-            final ListTag jz5 = new ListTag();
-            for (final AttributeModifier als7 : collection4) {
-                if (als7.isSerializable()) {
-                    ((AbstractList<CompoundTag>)jz5).add(saveAttributeModifier(als7));
-                }
-            }
-            jt2.put("Modifiers", jz5);
-        }
-        return jt2;
-    }
-    
-    public static CompoundTag saveAttributeModifier(final AttributeModifier als) {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.putString("Name", als.getName());
-        jt2.putDouble("Amount", als.getAmount());
-        jt2.putInt("Operation", als.getOperation().toValue());
-        jt2.putUUID("UUID", als.getId());
-        return jt2;
-    }
-    
-    public static void loadAttributes(final BaseAttributeMap alu, final ListTag jz) {
-        for (int integer3 = 0; integer3 < jz.size(); ++integer3) {
-            final CompoundTag jt4 = jz.getCompound(integer3);
-            final AttributeInstance alr5 = alu.getInstance(jt4.getString("Name"));
-            if (alr5 == null) {
-                SharedMonsterAttributes.LOGGER.warn("Ignoring unknown attribute '{}'", jt4.getString("Name"));
-            }
-            else {
-                loadAttribute(alr5, jt4);
-            }
-        }
-    }
-    
-    private static void loadAttribute(final AttributeInstance alr, final CompoundTag jt) {
-        alr.setBaseValue(jt.getDouble("Base"));
-        if (jt.contains("Modifiers", 9)) {
-            final ListTag jz3 = jt.getList("Modifiers", 10);
-            for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-                final AttributeModifier als5 = loadAttributeModifier(jz3.getCompound(integer4));
-                if (als5 != null) {
-                    final AttributeModifier als6 = alr.getModifier(als5.getId());
-                    if (als6 != null) {
-                        alr.removeModifier(als6);
-                    }
-                    alr.addModifier(als5);
-                }
-            }
-        }
-    }
-    
-    @Nullable
-    public static AttributeModifier loadAttributeModifier(final CompoundTag jt) {
-        final UUID uUID2 = jt.getUUID("UUID");
-        try {
-            final AttributeModifier.Operation a3 = AttributeModifier.Operation.fromValue(jt.getInt("Operation"));
-            return new AttributeModifier(uUID2, jt.getString("Name"), jt.getDouble("Amount"), a3);
-        }
-        catch (Exception exception3) {
-            SharedMonsterAttributes.LOGGER.warn("Unable to create attribute: {}", exception3.getMessage());
-            return null;
-        }
-    }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-        MAX_HEALTH = new RangedAttribute(null, "generic.maxHealth", 20.0, 0.0, 1024.0).importLegacyName("Max Health").setSyncable(true);
-        FOLLOW_RANGE = new RangedAttribute(null, "generic.followRange", 32.0, 0.0, 2048.0).importLegacyName("Follow Range");
-        KNOCKBACK_RESISTANCE = new RangedAttribute(null, "generic.knockbackResistance", 0.0, 0.0, 1.0).importLegacyName("Knockback Resistance");
-        MOVEMENT_SPEED = new RangedAttribute(null, "generic.movementSpeed", 0.699999988079071, 0.0, 1024.0).importLegacyName("Movement Speed").setSyncable(true);
-        FLYING_SPEED = new RangedAttribute(null, "generic.flyingSpeed", 0.4000000059604645, 0.0, 1024.0).importLegacyName("Flying Speed").setSyncable(true);
-        ATTACK_DAMAGE = new RangedAttribute(null, "generic.attackDamage", 2.0, 0.0, 2048.0);
-        ATTACK_KNOCKBACK = new RangedAttribute(null, "generic.attackKnockback", 0.0, 0.0, 5.0);
-        ATTACK_SPEED = new RangedAttribute(null, "generic.attackSpeed", 4.0, 0.0, 1024.0).setSyncable(true);
-        ARMOR = new RangedAttribute(null, "generic.armor", 0.0, 0.0, 30.0).setSyncable(true);
-        ARMOR_TOUGHNESS = new RangedAttribute(null, "generic.armorToughness", 0.0, 0.0, 20.0).setSyncable(true);
-        LUCK = new RangedAttribute(null, "generic.luck", 0.0, -1024.0, 1024.0).setSyncable(true);
-    }
-}
diff --git a/src/net/minecraft/world/entity/monster/Shulker.java b/src/net/minecraft/world/entity/monster/Shulker.java
index e3e17ed..e2686e6 100644
--- a/src/net/minecraft/world/entity/monster/Shulker.java
+++ b/src/net/minecraft/world/entity/monster/Shulker.java
@@ -11,19 +11,24 @@ import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.projectile.AbstractArrow;
+import net.minecraft.world.ShulkerSharedHelper;
+import javax.annotation.Nullable;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.MoverType;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.piston.PistonHeadBlock;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.piston.PistonBaseBlock;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.entity.Entity;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.ai.control.BodyRotationControl;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
@@ -36,12 +41,6 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.nbt.CompoundTag;
-import javax.annotation.Nullable;
-import net.minecraft.world.entity.SpawnGroupData;
-import net.minecraft.world.entity.MobSpawnType;
-import net.minecraft.world.DifficultyInstance;
-import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.core.BlockPos;
@@ -64,26 +63,12 @@ public class Shulker extends AbstractGolem implements Enemy {
     private BlockPos oldAttachPosition;
     private int clientSideTeleportInterpolation;
     
-    public Shulker(final EntityType<? extends Shulker> aku, final Level bjw) {
-        super(aku, bjw);
-        this.yBodyRotO = 180.0f;
-        this.yBodyRot = 180.0f;
+    public Shulker(final EntityType<? extends Shulker> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.oldAttachPosition = null;
         this.xpReward = 5;
     }
     
-    @Nullable
-    @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        this.yBodyRot = 180.0f;
-        this.yBodyRotO = 180.0f;
-        this.yRot = 180.0f;
-        this.yRotO = 180.0f;
-        this.yHeadRot = 180.0f;
-        this.yHeadRotO = 180.0f;
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
-    }
-    
     @Override
     protected void registerGoals() {
         this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 8.0f));
@@ -123,7 +108,7 @@ public class Shulker extends AbstractGolem implements Enemy {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         if (this.isClosed()) {
             return SoundEvents.SHULKER_HURT_CLOSED;
         }
@@ -139,10 +124,8 @@ public class Shulker extends AbstractGolem implements Enemy {
         this.entityData.<Byte>define(Shulker.DATA_COLOR_ID, (Byte)16);
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(30.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 30.0);
     }
     
     @Override
@@ -151,15 +134,15 @@ public class Shulker extends AbstractGolem implements Enemy {
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.entityData.<Direction>set(Shulker.DATA_ATTACH_FACE_ID, Direction.from3DDataValue(jt.getByte("AttachFace")));
-        this.entityData.<Byte>set(Shulker.DATA_PEEK_ID, jt.getByte("Peek"));
-        this.entityData.<Byte>set(Shulker.DATA_COLOR_ID, jt.getByte("Color"));
-        if (jt.contains("APX")) {
-            final int integer3 = jt.getInt("APX");
-            final int integer4 = jt.getInt("APY");
-            final int integer5 = jt.getInt("APZ");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.entityData.<Direction>set(Shulker.DATA_ATTACH_FACE_ID, Direction.from3DDataValue(le.getByte("AttachFace")));
+        this.entityData.<Byte>set(Shulker.DATA_PEEK_ID, le.getByte("Peek"));
+        this.entityData.<Byte>set(Shulker.DATA_COLOR_ID, le.getByte("Color"));
+        if (le.contains("APX")) {
+            final int integer3 = le.getInt("APX");
+            final int integer4 = le.getInt("APY");
+            final int integer5 = le.getInt("APZ");
             this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>of(new BlockPos(integer3, integer4, integer5)));
         }
         else {
@@ -168,29 +151,29 @@ public class Shulker extends AbstractGolem implements Enemy {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putByte("AttachFace", (byte)this.entityData.<Direction>get(Shulker.DATA_ATTACH_FACE_ID).get3DDataValue());
-        jt.putByte("Peek", this.entityData.<Byte>get(Shulker.DATA_PEEK_ID));
-        jt.putByte("Color", this.entityData.<Byte>get(Shulker.DATA_COLOR_ID));
-        final BlockPos fk3 = this.getAttachPosition();
-        if (fk3 != null) {
-            jt.putInt("APX", fk3.getX());
-            jt.putInt("APY", fk3.getY());
-            jt.putInt("APZ", fk3.getZ());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putByte("AttachFace", (byte)this.entityData.<Direction>get(Shulker.DATA_ATTACH_FACE_ID).get3DDataValue());
+        le.putByte("Peek", this.entityData.<Byte>get(Shulker.DATA_PEEK_ID));
+        le.putByte("Color", this.entityData.<Byte>get(Shulker.DATA_COLOR_ID));
+        final BlockPos fu3 = this.getAttachPosition();
+        if (fu3 != null) {
+            le.putInt("APX", fu3.getX());
+            le.putInt("APY", fu3.getY());
+            le.putInt("APZ", fu3.getZ());
         }
     }
     
     @Override
     public void tick() {
         super.tick();
-        BlockPos fk2 = this.entityData.<Optional<BlockPos>>get(Shulker.DATA_ATTACH_POS_ID).orElse(null);
-        if (fk2 == null && !this.level.isClientSide) {
-            fk2 = new BlockPos(this);
-            this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>of(fk2));
+        BlockPos fu2 = this.entityData.<Optional<BlockPos>>get(Shulker.DATA_ATTACH_POS_ID).orElse(null);
+        if (fu2 == null && !this.level.isClientSide) {
+            fu2 = this.blockPosition();
+            this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>of(fu2));
         }
         if (this.isPassenger()) {
-            fk2 = null;
+            fu2 = null;
             final float float3 = this.getVehicle().yRot;
             this.yRot = float3;
             this.yBodyRot = float3;
@@ -198,23 +181,23 @@ public class Shulker extends AbstractGolem implements Enemy {
             this.clientSideTeleportInterpolation = 0;
         }
         else if (!this.level.isClientSide) {
-            final BlockState byj3 = this.level.getBlockState(fk2);
-            if (!byj3.isAir()) {
-                if (byj3.getBlock() == Blocks.MOVING_PISTON) {
-                    final Direction fp4 = byj3.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING);
-                    if (this.level.isEmptyBlock(fk2.relative(fp4))) {
-                        fk2 = fk2.relative(fp4);
-                        this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>of(fk2));
+            final BlockState cfj3 = this.level.getBlockState(fu2);
+            if (!cfj3.isAir()) {
+                if (cfj3.is(Blocks.MOVING_PISTON)) {
+                    final Direction fz4 = cfj3.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING);
+                    if (this.level.isEmptyBlock(fu2.relative(fz4))) {
+                        fu2 = fu2.relative(fz4);
+                        this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>of(fu2));
                     }
                     else {
                         this.teleportSomewhere();
                     }
                 }
-                else if (byj3.getBlock() == Blocks.PISTON_HEAD) {
-                    final Direction fp4 = byj3.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING);
-                    if (this.level.isEmptyBlock(fk2.relative(fp4))) {
-                        fk2 = fk2.relative(fp4);
-                        this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>of(fk2));
+                else if (cfj3.is(Blocks.PISTON_HEAD)) {
+                    final Direction fz4 = cfj3.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING);
+                    if (this.level.isEmptyBlock(fu2.relative(fz4))) {
+                        fu2 = fu2.relative(fz4);
+                        this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>of(fu2));
                     }
                     else {
                         this.teleportSomewhere();
@@ -224,25 +207,16 @@ public class Shulker extends AbstractGolem implements Enemy {
                     this.teleportSomewhere();
                 }
             }
-            BlockPos fk3 = fk2.relative(this.getAttachFace());
-            if (!this.level.loadedAndEntityCanStandOn(fk3, this)) {
-                boolean boolean5 = false;
-                for (final Direction fp5 : Direction.values()) {
-                    fk3 = fk2.relative(fp5);
-                    if (this.level.loadedAndEntityCanStandOn(fk3, this)) {
-                        this.entityData.<Direction>set(Shulker.DATA_ATTACH_FACE_ID, fp5);
-                        boolean5 = true;
-                        break;
-                    }
+            final Direction fz4 = this.getAttachFace();
+            if (!this.canAttachOnBlockFace(fu2, fz4)) {
+                final Direction fz5 = this.findAttachableFace(fu2);
+                if (fz5 != null) {
+                    this.entityData.<Direction>set(Shulker.DATA_ATTACH_FACE_ID, fz5);
                 }
-                if (!boolean5) {
+                else {
                     this.teleportSomewhere();
                 }
             }
-            final BlockPos fk4 = fk2.relative(this.getAttachFace().getOpposite());
-            if (this.level.loadedAndEntityCanStandOn(fk4, this)) {
-                this.teleportSomewhere();
-            }
         }
         final float float3 = this.getRawPeekAmount() * 0.01f;
         this.currentPeekAmountO = this.currentPeekAmount;
@@ -252,27 +226,27 @@ public class Shulker extends AbstractGolem implements Enemy {
         else if (this.currentPeekAmount < float3) {
             this.currentPeekAmount = Mth.clamp(this.currentPeekAmount + 0.05f, 0.0f, float3);
         }
-        if (fk2 != null) {
+        if (fu2 != null) {
             if (this.level.isClientSide) {
                 if (this.clientSideTeleportInterpolation > 0 && this.oldAttachPosition != null) {
                     --this.clientSideTeleportInterpolation;
                 }
                 else {
-                    this.oldAttachPosition = fk2;
+                    this.oldAttachPosition = fu2;
                 }
             }
-            this.setPosAndOldPos(fk2.getX() + 0.5, fk2.getY(), fk2.getZ() + 0.5);
+            this.setPosAndOldPos(fu2.getX() + 0.5, fu2.getY(), fu2.getZ() + 0.5);
             final double double4 = 0.5 - Mth.sin((0.5f + this.currentPeekAmount) * 3.1415927f) * 0.5;
             final double double5 = 0.5 - Mth.sin((0.5f + this.currentPeekAmountO) * 3.1415927f) * 0.5;
-            final Direction fp6 = this.getAttachFace().getOpposite();
-            this.setBoundingBox(new AABB(this.getX() - 0.5, this.getY(), this.getZ() - 0.5, this.getX() + 0.5, this.getY() + 1.0, this.getZ() + 0.5).expandTowards(fp6.getStepX() * double4, fp6.getStepY() * double4, fp6.getStepZ() * double4));
+            final Direction fz6 = this.getAttachFace().getOpposite();
+            this.setBoundingBox(new AABB(this.getX() - 0.5, this.getY(), this.getZ() - 0.5, this.getX() + 0.5, this.getY() + 1.0, this.getZ() + 0.5).expandTowards(fz6.getStepX() * double4, fz6.getStepY() * double4, fz6.getStepZ() * double4));
             final double double6 = double4 - double5;
             if (double6 > 0.0) {
                 final List<Entity> list11 = this.level.getEntities(this, this.getBoundingBox());
                 if (!list11.isEmpty()) {
-                    for (final Entity akq13 : list11) {
-                        if (!(akq13 instanceof Shulker) && !akq13.noPhysics) {
-                            akq13.move(MoverType.SHULKER, new Vec3(double6 * fp6.getStepX(), double6 * fp6.getStepY(), double6 * fp6.getStepZ()));
+                    for (final Entity aom13 : list11) {
+                        if (!(aom13 instanceof Shulker) && !aom13.noPhysics) {
+                            aom13.move(MoverType.SHULKER, new Vec3(double6 * fz6.getStepX(), double6 * fz6.getStepY(), double6 * fz6.getStepZ()));
                         }
                     }
                 }
@@ -281,12 +255,12 @@ public class Shulker extends AbstractGolem implements Enemy {
     }
     
     @Override
-    public void move(final MoverType ale, final Vec3 cvl) {
-        if (ale == MoverType.SHULKER_BOX) {
+    public void move(final MoverType apd, final Vec3 dem) {
+        if (apd == MoverType.SHULKER_BOX) {
             this.teleportSomewhere();
         }
         else {
-            super.move(ale, cvl);
+            super.move(apd, dem);
         }
     }
     
@@ -305,25 +279,33 @@ public class Shulker extends AbstractGolem implements Enemy {
         }
     }
     
+    @Nullable
+    protected Direction findAttachableFace(final BlockPos fu) {
+        for (final Direction fz6 : Direction.values()) {
+            if (this.canAttachOnBlockFace(fu, fz6)) {
+                return fz6;
+            }
+        }
+        return null;
+    }
+    
+    private boolean canAttachOnBlockFace(final BlockPos fu, final Direction fz) {
+        return this.level.loadedAndEntityCanStandOnFace(fu.relative(fz), this, fz.getOpposite()) && this.level.noCollision(this, ShulkerSharedHelper.openBoundingBox(fu, fz.getOpposite()));
+    }
+    
     protected boolean teleportSomewhere() {
         if (this.isNoAi() || !this.isAlive()) {
             return true;
         }
-        final BlockPos fk2 = new BlockPos(this);
+        final BlockPos fu2 = this.blockPosition();
         for (int integer3 = 0; integer3 < 5; ++integer3) {
-            final BlockPos fk3 = fk2.offset(8 - this.random.nextInt(17), 8 - this.random.nextInt(17), 8 - this.random.nextInt(17));
-            if (fk3.getY() > 0 && this.level.isEmptyBlock(fk3) && this.level.getWorldBorder().isWithinBounds(fk3) && this.level.noCollision(this, new AABB(fk3))) {
-                boolean boolean5 = false;
-                for (final Direction fp9 : Direction.values()) {
-                    if (this.level.loadedAndEntityCanStandOn(fk3.relative(fp9), this)) {
-                        this.entityData.<Direction>set(Shulker.DATA_ATTACH_FACE_ID, fp9);
-                        boolean5 = true;
-                        break;
-                    }
-                }
-                if (boolean5) {
+            final BlockPos fu3 = fu2.offset(8 - this.random.nextInt(17), 8 - this.random.nextInt(17), 8 - this.random.nextInt(17));
+            if (fu3.getY() > 0 && this.level.isEmptyBlock(fu3) && this.level.getWorldBorder().isWithinBounds(fu3) && this.level.noCollision(this, new AABB(fu3))) {
+                final Direction fz5 = this.findAttachableFace(fu3);
+                if (fz5 != null) {
+                    this.entityData.<Direction>set(Shulker.DATA_ATTACH_FACE_ID, fz5);
                     this.playSound(SoundEvents.SHULKER_TELEPORT, 1.0f, 1.0f);
-                    this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>of(fk3));
+                    this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>of(fu3));
                     this.entityData.<Byte>set(Shulker.DATA_PEEK_ID, (Byte)0);
                     this.setTarget(null);
                     return true;
@@ -337,26 +319,27 @@ public class Shulker extends AbstractGolem implements Enemy {
     public void aiStep() {
         super.aiStep();
         this.setDeltaMovement(Vec3.ZERO);
-        this.yBodyRotO = 180.0f;
-        this.yBodyRot = 180.0f;
-        this.yRot = 180.0f;
+        if (!this.isNoAi()) {
+            this.yBodyRotO = 0.0f;
+            this.yBodyRot = 0.0f;
+        }
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (Shulker.DATA_ATTACH_POS_ID.equals(sb) && this.level.isClientSide && !this.isPassenger()) {
-            final BlockPos fk3 = this.getAttachPosition();
-            if (fk3 != null) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (Shulker.DATA_ATTACH_POS_ID.equals(tq) && this.level.isClientSide && !this.isPassenger()) {
+            final BlockPos fu3 = this.getAttachPosition();
+            if (fu3 != null) {
                 if (this.oldAttachPosition == null) {
-                    this.oldAttachPosition = fk3;
+                    this.oldAttachPosition = fu3;
                 }
                 else {
                     this.clientSideTeleportInterpolation = 6;
                 }
-                this.setPosAndOldPos(fk3.getX() + 0.5, fk3.getY(), fk3.getZ() + 0.5);
+                this.setPosAndOldPos(fu3.getX() + 0.5, fu3.getY(), fu3.getZ() + 0.5);
             }
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     @Override
@@ -365,14 +348,14 @@ public class Shulker extends AbstractGolem implements Enemy {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         if (this.isClosed()) {
-            final Entity akq4 = ajz.getDirectEntity();
-            if (akq4 instanceof AbstractArrow) {
+            final Entity aom4 = anw.getDirectEntity();
+            if (aom4 instanceof AbstractArrow) {
                 return false;
             }
         }
-        if (super.hurt(ajz, float2)) {
+        if (super.hurt(anw, float2)) {
             if (this.getHealth() < this.getMaxHealth() * 0.5 && this.random.nextInt(4) == 0) {
                 this.teleportSomewhere();
             }
@@ -400,8 +383,8 @@ public class Shulker extends AbstractGolem implements Enemy {
         return this.entityData.<Optional<BlockPos>>get(Shulker.DATA_ATTACH_POS_ID).orElse(null);
     }
     
-    public void setAttachPosition(@Nullable final BlockPos fk) {
-        this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>ofNullable(fk));
+    public void setAttachPosition(@Nullable final BlockPos fu) {
+        this.entityData.<Optional<BlockPos>>set(Shulker.DATA_ATTACH_POS_ID, Optional.<BlockPos>ofNullable(fu));
     }
     
     public int getRawPeekAmount() {
@@ -410,9 +393,9 @@ public class Shulker extends AbstractGolem implements Enemy {
     
     public void setRawPeekAmount(final int integer) {
         if (!this.level.isClientSide) {
-            this.getAttribute(SharedMonsterAttributes.ARMOR).removeModifier(Shulker.COVERED_ARMOR_MODIFIER);
+            this.getAttribute(Attributes.ARMOR).removeModifier(Shulker.COVERED_ARMOR_MODIFIER);
             if (integer == 0) {
-                this.getAttribute(SharedMonsterAttributes.ARMOR).addModifier(Shulker.COVERED_ARMOR_MODIFIER);
+                this.getAttribute(Attributes.ARMOR).addPermanentModifier(Shulker.COVERED_ARMOR_MODIFIER);
                 this.playSound(SoundEvents.SHULKER_CLOSE, 1.0f, 1.0f);
             }
             else {
@@ -435,7 +418,7 @@ public class Shulker extends AbstractGolem implements Enemy {
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 0.5f;
     }
     
@@ -450,7 +433,7 @@ public class Shulker extends AbstractGolem implements Enemy {
     }
     
     @Override
-    public void push(final Entity akq) {
+    public void push(final Entity aom) {
     }
     
     @Override
@@ -473,7 +456,7 @@ public class Shulker extends AbstractGolem implements Enemy {
     
     static {
         COVERED_ARMOR_MODIFIER_UUID = UUID.fromString("7E0292F2-9434-48D5-A29F-9583AF7DF27F");
-        COVERED_ARMOR_MODIFIER = new AttributeModifier(Shulker.COVERED_ARMOR_MODIFIER_UUID, "Covered armor bonus", 20.0, AttributeModifier.Operation.ADDITION).setSerialize(false);
+        COVERED_ARMOR_MODIFIER = new AttributeModifier(Shulker.COVERED_ARMOR_MODIFIER_UUID, "Covered armor bonus", 20.0, AttributeModifier.Operation.ADDITION);
         DATA_ATTACH_FACE_ID = SynchedEntityData.<Direction>defineId(Shulker.class, EntityDataSerializers.DIRECTION);
         DATA_ATTACH_POS_ID = SynchedEntityData.<Optional<BlockPos>>defineId(Shulker.class, EntityDataSerializers.OPTIONAL_BLOCK_POS);
         DATA_PEEK_ID = SynchedEntityData.<Byte>defineId(Shulker.class, EntityDataSerializers.BYTE);
@@ -481,8 +464,8 @@ public class Shulker extends AbstractGolem implements Enemy {
     }
     
     class ShulkerBodyRotationControl extends BodyRotationControl {
-        public ShulkerBodyRotationControl(final Mob ala) {
-            super(ala);
+        public ShulkerBodyRotationControl(final Mob aoz) {
+            super(aoz);
         }
         
         @Override
@@ -534,8 +517,8 @@ public class Shulker extends AbstractGolem implements Enemy {
         
         @Override
         public boolean canUse() {
-            final LivingEntity akz2 = Shulker.this.getTarget();
-            return akz2 != null && akz2.isAlive() && Shulker.this.level.getDifficulty() != Difficulty.PEACEFUL;
+            final LivingEntity aoy2 = Shulker.this.getTarget();
+            return aoy2 != null && aoy2.isAlive() && Shulker.this.level.getDifficulty() != Difficulty.PEACEFUL;
         }
         
         @Override
@@ -555,13 +538,13 @@ public class Shulker extends AbstractGolem implements Enemy {
                 return;
             }
             --this.attackTime;
-            final LivingEntity akz2 = Shulker.this.getTarget();
-            Shulker.this.getLookControl().setLookAt(akz2, 180.0f, 180.0f);
-            final double double3 = Shulker.this.distanceToSqr(akz2);
+            final LivingEntity aoy2 = Shulker.this.getTarget();
+            Shulker.this.getLookControl().setLookAt(aoy2, 180.0f, 180.0f);
+            final double double3 = Shulker.this.distanceToSqr(aoy2);
             if (double3 < 400.0) {
                 if (this.attackTime <= 0) {
                     this.attackTime = 20 + Shulker.this.random.nextInt(10) * 20 / 2;
-                    Shulker.this.level.addFreshEntity(new ShulkerBullet(Shulker.this.level, Shulker.this, akz2, Shulker.this.getAttachFace().getAxis()));
+                    Shulker.this.level.addFreshEntity(new ShulkerBullet(Shulker.this.level, Shulker.this, aoy2, Shulker.this.getAttachFace().getAxis()));
                     Shulker.this.playSound(SoundEvents.SHULKER_SHOOT, 2.0f, (Shulker.this.random.nextFloat() - Shulker.this.random.nextFloat()) * 0.2f + 1.0f);
                 }
             }
@@ -573,8 +556,8 @@ public class Shulker extends AbstractGolem implements Enemy {
     }
     
     class ShulkerNearestAttackGoal extends NearestAttackableTargetGoal<Player> {
-        public ShulkerNearestAttackGoal(final Shulker axe2) {
-            super(axe2, Player.class, true);
+        public ShulkerNearestAttackGoal(final Shulker bch2) {
+            super(bch2, Player.class, true);
         }
         
         @Override
@@ -584,11 +567,11 @@ public class Shulker extends AbstractGolem implements Enemy {
         
         @Override
         protected AABB getTargetSearchArea(final double double1) {
-            final Direction fp4 = ((Shulker)this.mob).getAttachFace();
-            if (fp4.getAxis() == Direction.Axis.X) {
+            final Direction fz4 = ((Shulker)this.mob).getAttachFace();
+            if (fz4.getAxis() == Direction.Axis.X) {
                 return this.mob.getBoundingBox().inflate(4.0, double1, double1);
             }
-            if (fp4.getAxis() == Direction.Axis.Z) {
+            if (fz4.getAxis() == Direction.Axis.Z) {
                 return this.mob.getBoundingBox().inflate(double1, double1, 4.0);
             }
             return this.mob.getBoundingBox().inflate(double1, 4.0, double1);
@@ -596,8 +579,8 @@ public class Shulker extends AbstractGolem implements Enemy {
     }
     
     static class ShulkerDefenseAttackGoal extends NearestAttackableTargetGoal<LivingEntity> {
-        public ShulkerDefenseAttackGoal(final Shulker axe) {
-            super(axe, LivingEntity.class, 10, true, false, akz -> akz instanceof Enemy);
+        public ShulkerDefenseAttackGoal(final Shulker bch) {
+            super(bch, LivingEntity.class, 10, true, false, aoy -> aoy instanceof Enemy);
         }
         
         @Override
@@ -607,11 +590,11 @@ public class Shulker extends AbstractGolem implements Enemy {
         
         @Override
         protected AABB getTargetSearchArea(final double double1) {
-            final Direction fp4 = ((Shulker)this.mob).getAttachFace();
-            if (fp4.getAxis() == Direction.Axis.X) {
+            final Direction fz4 = ((Shulker)this.mob).getAttachFace();
+            if (fz4.getAxis() == Direction.Axis.X) {
                 return this.mob.getBoundingBox().inflate(4.0, double1, double1);
             }
-            if (fp4.getAxis() == Direction.Axis.Z) {
+            if (fz4.getAxis() == Direction.Axis.Z) {
                 return this.mob.getBoundingBox().inflate(double1, double1, 4.0);
             }
             return this.mob.getBoundingBox().inflate(double1, 4.0, double1);
diff --git a/src/net/minecraft/world/entity/monster/Silverfish.java b/src/net/minecraft/world/entity/monster/Silverfish.java
index ce84e8f..3b0e476 100644
--- a/src/net/minecraft/world/entity/monster/Silverfish.java
+++ b/src/net/minecraft/world/entity/monster/Silverfish.java
@@ -4,8 +4,8 @@ import java.util.EnumSet;
 import net.minecraft.core.Direction;
 import net.minecraft.world.entity.ai.goal.RandomStrollGoal;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.GameRules;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.GameRules;
 import net.minecraft.world.entity.MobType;
 import java.util.Random;
 import net.minecraft.world.entity.MobSpawnType;
@@ -18,6 +18,8 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
@@ -34,8 +36,8 @@ import net.minecraft.world.entity.EntityType;
 public class Silverfish extends Monster {
     private SilverfishWakeUpFriendsGoal friendsGoal;
     
-    public Silverfish(final EntityType<? extends Silverfish> aku, final Level bjw) {
-        super(aku, bjw);
+    public Silverfish(final EntityType<? extends Silverfish> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -50,21 +52,17 @@ public class Silverfish extends Monster {
     }
     
     @Override
-    public double getRidingHeight() {
+    public double getMyRidingOffset() {
         return 0.1;
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return 0.1f;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return 0.13f;
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(8.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(1.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 8.0).add(Attributes.MOVEMENT_SPEED, 0.25).add(Attributes.ATTACK_DAMAGE, 1.0);
     }
     
     @Override
@@ -78,7 +76,7 @@ public class Silverfish extends Monster {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.SILVERFISH_HURT;
     }
     
@@ -88,19 +86,19 @@ public class Silverfish extends Monster {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.SILVERFISH_STEP, 0.15f, 1.0f);
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        if ((ajz instanceof EntityDamageSource || ajz == DamageSource.MAGIC) && this.friendsGoal != null) {
+        if ((anw instanceof EntityDamageSource || anw == DamageSource.MAGIC) && this.friendsGoal != null) {
             this.friendsGoal.notifyHurt();
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
@@ -115,17 +113,17 @@ public class Silverfish extends Monster {
     }
     
     @Override
-    public float getWalkTargetValue(final BlockPos fk, final LevelReader bjz) {
-        if (InfestedBlock.isCompatibleHostBlock(bjz.getBlockState(fk.below()))) {
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        if (InfestedBlock.isCompatibleHostBlock(bqd.getBlockState(fu.below()))) {
             return 10.0f;
         }
-        return super.getWalkTargetValue(fk, bjz);
+        return super.getWalkTargetValue(fu, bqd);
     }
     
-    public static boolean checkSliverfishSpawnRules(final EntityType<Silverfish> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        if (Monster.checkAnyLightMonsterSpawnRules(aku, bjx, alc, fk, random)) {
-            final Player ayj6 = bjx.getNearestPlayer(fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5, 5.0, true);
-            return ayj6 == null;
+    public static boolean checkSliverfishSpawnRules(final EntityType<Silverfish> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        if (Monster.checkAnyLightMonsterSpawnRules(aoq, bqc, apb, fu, random)) {
+            final Player bec6 = bqc.getNearestPlayer(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, 5.0, true);
+            return bec6 == null;
         }
         return false;
     }
@@ -139,8 +137,8 @@ public class Silverfish extends Monster {
         private final Silverfish silverfish;
         private int lookForFriends;
         
-        public SilverfishWakeUpFriendsGoal(final Silverfish axf) {
-            this.silverfish = axf;
+        public SilverfishWakeUpFriendsGoal(final Silverfish bci) {
+            this.silverfish = bci;
         }
         
         public void notifyHurt() {
@@ -157,26 +155,26 @@ public class Silverfish extends Monster {
         @Override
         public void tick() {
             --this.lookForFriends;
-            Label_0241: {
+            Label_0237: {
                 if (this.lookForFriends <= 0) {
-                    final Level bjw2 = this.silverfish.level;
+                    final Level bqb2 = this.silverfish.level;
                     final Random random3 = this.silverfish.getRandom();
-                    final BlockPos fk4 = new BlockPos(this.silverfish);
+                    final BlockPos fu4 = this.silverfish.blockPosition();
                     for (int integer5 = 0; integer5 <= 5 && integer5 >= -5; integer5 = ((integer5 <= 0) ? 1 : 0) - integer5) {
                         for (int integer6 = 0; integer6 <= 10 && integer6 >= -10; integer6 = ((integer6 <= 0) ? 1 : 0) - integer6) {
                             for (int integer7 = 0; integer7 <= 10 && integer7 >= -10; integer7 = ((integer7 <= 0) ? 1 : 0) - integer7) {
-                                final BlockPos fk5 = fk4.offset(integer6, integer5, integer7);
-                                final BlockState byj9 = bjw2.getBlockState(fk5);
-                                final Block bph10 = byj9.getBlock();
-                                if (bph10 instanceof InfestedBlock) {
-                                    if (bjw2.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
-                                        bjw2.destroyBlock(fk5, true, this.silverfish);
+                                final BlockPos fu5 = fu4.offset(integer6, integer5, integer7);
+                                final BlockState cfj9 = bqb2.getBlockState(fu5);
+                                final Block bvr10 = cfj9.getBlock();
+                                if (bvr10 instanceof InfestedBlock) {
+                                    if (bqb2.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
+                                        bqb2.destroyBlock(fu5, true, this.silverfish);
                                     }
                                     else {
-                                        bjw2.setBlock(fk5, ((InfestedBlock)bph10).getHostBlock().defaultBlockState(), 3);
+                                        bqb2.setBlock(fu5, ((InfestedBlock)bvr10).getHostBlock().defaultBlockState(), 3);
                                     }
                                     if (random3.nextBoolean()) {
-                                        break Label_0241;
+                                        break Label_0237;
                                     }
                                 }
                             }
@@ -191,8 +189,8 @@ public class Silverfish extends Monster {
         private Direction selectedDirection;
         private boolean doMerge;
         
-        public SilverfishMergeWithStoneGoal(final Silverfish axf) {
-            super(axf, 1.0, 10);
+        public SilverfishMergeWithStoneGoal(final Silverfish bci) {
+            super(bci, 1.0, 10);
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
         }
         
@@ -206,10 +204,10 @@ public class Silverfish extends Monster {
             }
             final Random random2 = this.mob.getRandom();
             if (this.mob.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) && random2.nextInt(10) == 0) {
-                this.selectedDirection = Direction.getRandomFace(random2);
-                final BlockPos fk3 = new BlockPos(this.mob.getX(), this.mob.getY() + 0.5, this.mob.getZ()).relative(this.selectedDirection);
-                final BlockState byj4 = this.mob.level.getBlockState(fk3);
-                if (InfestedBlock.isCompatibleHostBlock(byj4)) {
+                this.selectedDirection = Direction.getRandom(random2);
+                final BlockPos fu3 = new BlockPos(this.mob.getX(), this.mob.getY() + 0.5, this.mob.getZ()).relative(this.selectedDirection);
+                final BlockState cfj4 = this.mob.level.getBlockState(fu3);
+                if (InfestedBlock.isCompatibleHostBlock(cfj4)) {
                     return this.doMerge = true;
                 }
             }
@@ -228,11 +226,11 @@ public class Silverfish extends Monster {
                 super.start();
                 return;
             }
-            final LevelAccessor bjx2 = this.mob.level;
-            final BlockPos fk3 = new BlockPos(this.mob.getX(), this.mob.getY() + 0.5, this.mob.getZ()).relative(this.selectedDirection);
-            final BlockState byj4 = bjx2.getBlockState(fk3);
-            if (InfestedBlock.isCompatibleHostBlock(byj4)) {
-                bjx2.setBlock(fk3, InfestedBlock.stateByHostBlock(byj4.getBlock()), 3);
+            final LevelAccessor bqc2 = this.mob.level;
+            final BlockPos fu3 = new BlockPos(this.mob.getX(), this.mob.getY() + 0.5, this.mob.getZ()).relative(this.selectedDirection);
+            final BlockState cfj4 = bqc2.getBlockState(fu3);
+            if (InfestedBlock.isCompatibleHostBlock(cfj4)) {
+                bqc2.setBlock(fu3, InfestedBlock.stateByHostBlock(cfj4.getBlock()), 3);
                 this.mob.spawnAnim();
                 this.mob.remove();
             }
diff --git a/src/net/minecraft/world/entity/monster/Skeleton.java b/src/net/minecraft/world/entity/monster/Skeleton.java
index fb86f78..576cd56 100644
--- a/src/net/minecraft/world/entity/monster/Skeleton.java
+++ b/src/net/minecraft/world/entity/monster/Skeleton.java
@@ -10,8 +10,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Skeleton extends AbstractSkeleton {
-    public Skeleton(final EntityType<? extends Skeleton> aku, final Level bjw) {
-        super(aku, bjw);
+    public Skeleton(final EntityType<? extends Skeleton> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -20,7 +20,7 @@ public class Skeleton extends AbstractSkeleton {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.SKELETON_HURT;
     }
     
@@ -35,13 +35,13 @@ public class Skeleton extends AbstractSkeleton {
     }
     
     @Override
-    protected void dropCustomDeathLoot(final DamageSource ajz, final int integer, final boolean boolean3) {
-        super.dropCustomDeathLoot(ajz, integer, boolean3);
-        final Entity akq5 = ajz.getEntity();
-        if (akq5 instanceof Creeper) {
-            final Creeper awi6 = (Creeper)akq5;
-            if (awi6.canDropMobsSkull()) {
-                awi6.increaseDroppedSkulls();
+    protected void dropCustomDeathLoot(final DamageSource anw, final int integer, final boolean boolean3) {
+        super.dropCustomDeathLoot(anw, integer, boolean3);
+        final Entity aom5 = anw.getEntity();
+        if (aom5 instanceof Creeper) {
+            final Creeper bbn6 = (Creeper)aom5;
+            if (bbn6.canDropMobsSkull()) {
+                bbn6.increaseDroppedSkulls();
                 this.spawnAtLocation(Items.SKELETON_SKULL);
             }
         }
diff --git a/src/net/minecraft/world/entity/monster/Slime.java b/src/net/minecraft/world/entity/monster/Slime.java
index 9601f57..0ab4176 100644
--- a/src/net/minecraft/world/entity/monster/Slime.java
+++ b/src/net/minecraft/world/entity/monster/Slime.java
@@ -12,9 +12,9 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.Difficulty;
-import net.minecraft.world.level.LevelType;
 import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.MobSpawnType;
@@ -27,11 +27,13 @@ import net.minecraft.world.entity.Pose;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.util.Mth;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.player.Player;
@@ -48,8 +50,8 @@ public class Slime extends Mob implements Enemy {
     public float oSquish;
     private boolean wasOnGround;
     
-    public Slime(final EntityType<? extends Slime> aku, final Level bjw) {
-        super(aku, bjw);
+    public Slime(final EntityType<? extends Slime> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.moveControl = new SlimeMoveControl(this);
     }
     
@@ -59,7 +61,7 @@ public class Slime extends Mob implements Enemy {
         this.goalSelector.addGoal(2, new SlimeAttackGoal(this));
         this.goalSelector.addGoal(3, new SlimeRandomDirectionGoal(this));
         this.goalSelector.addGoal(5, new SlimeKeepOnJumpingGoal(this));
-        this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, akz -> Math.abs(akz.getY() - this.getY()) <= 4.0));
+        this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, aoy -> Math.abs(aoy.getY() - this.getY()) <= 4.0));
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
     }
     
@@ -69,19 +71,13 @@ public class Slime extends Mob implements Enemy {
         this.entityData.<Integer>define(Slime.ID_SIZE, 1);
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE);
-    }
-    
     protected void setSize(final int integer, final boolean boolean2) {
         this.entityData.<Integer>set(Slime.ID_SIZE, integer);
         this.reapplyPosition();
         this.refreshDimensions();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(integer * integer);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.2f + 0.1f * integer);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(integer);
+        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(integer * integer);
+        this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.2f + 0.1f * integer);
+        this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(integer);
         if (boolean2) {
             this.setHealth(this.getMaxHealth());
         }
@@ -93,21 +89,21 @@ public class Slime extends Mob implements Enemy {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("Size", this.getSize() - 1);
-        jt.putBoolean("wasOnGround", this.wasOnGround);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Size", this.getSize() - 1);
+        le.putBoolean("wasOnGround", this.wasOnGround);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        int integer3 = jt.getInt("Size");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        int integer3 = le.getInt("Size");
         if (integer3 < 0) {
             integer3 = 0;
         }
         this.setSize(integer3 + 1, false);
-        super.readAdditionalSaveData(jt);
-        this.wasOnGround = jt.getBoolean("wasOnGround");
+        super.readAdditionalSaveData(le);
+        this.wasOnGround = le.getBoolean("wasOnGround");
     }
     
     public boolean isTiny() {
@@ -164,8 +160,8 @@ public class Slime extends Mob implements Enemy {
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (Slime.ID_SIZE.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (Slime.ID_SIZE.equals(tq)) {
             this.refreshDimensions();
             this.yRot = this.yHeadRot;
             this.yBodyRot = this.yHeadRot;
@@ -173,7 +169,7 @@ public class Slime extends Mob implements Enemy {
                 this.doWaterSplashEffect();
             }
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     @Override
@@ -184,54 +180,57 @@ public class Slime extends Mob implements Enemy {
     @Override
     public void remove() {
         final int integer2 = this.getSize();
-        if (!this.level.isClientSide && integer2 > 1 && this.getHealth() <= 0.0f) {
-            for (int integer3 = 2 + this.random.nextInt(3), integer4 = 0; integer4 < integer3; ++integer4) {
-                final float float5 = (integer4 % 2 - 0.5f) * integer2 / 4.0f;
-                final float float6 = (integer4 / 2 - 0.5f) * integer2 / 4.0f;
-                final Slime axh7 = (Slime)this.getType().create(this.level);
-                if (this.hasCustomName()) {
-                    axh7.setCustomName(this.getCustomName());
-                }
+        if (!this.level.isClientSide && integer2 > 1 && this.isDeadOrDying()) {
+            final Component mr3 = this.getCustomName();
+            final boolean boolean4 = this.isNoAi();
+            final float float5 = integer2 / 4.0f;
+            final int integer3 = integer2 / 2;
+            for (int integer4 = 2 + this.random.nextInt(3), integer5 = 0; integer5 < integer4; ++integer5) {
+                final float float6 = (integer5 % 2 - 0.5f) * float5;
+                final float float7 = (integer5 / 2 - 0.5f) * float5;
+                final Slime bck11 = (Slime)this.getType().create(this.level);
                 if (this.isPersistenceRequired()) {
-                    axh7.setPersistenceRequired();
+                    bck11.setPersistenceRequired();
                 }
-                axh7.setInvulnerable(this.isInvulnerable());
-                axh7.setSize(integer2 / 2, true);
-                axh7.moveTo(this.getX() + float5, this.getY() + 0.5, this.getZ() + float6, this.random.nextFloat() * 360.0f, 0.0f);
-                this.level.addFreshEntity(axh7);
+                bck11.setCustomName(mr3);
+                bck11.setNoAi(boolean4);
+                bck11.setInvulnerable(this.isInvulnerable());
+                bck11.setSize(integer3, true);
+                bck11.moveTo(this.getX() + float6, this.getY() + 0.5, this.getZ() + float7, this.random.nextFloat() * 360.0f, 0.0f);
+                this.level.addFreshEntity(bck11);
             }
         }
         super.remove();
     }
     
     @Override
-    public void push(final Entity akq) {
-        super.push(akq);
-        if (akq instanceof IronGolem && this.isDealsDamage()) {
-            this.dealDamage((LivingEntity)akq);
+    public void push(final Entity aom) {
+        super.push(aom);
+        if (aom instanceof IronGolem && this.isDealsDamage()) {
+            this.dealDamage((LivingEntity)aom);
         }
     }
     
     @Override
-    public void playerTouch(final Player ayj) {
+    public void playerTouch(final Player bec) {
         if (this.isDealsDamage()) {
-            this.dealDamage(ayj);
+            this.dealDamage(bec);
         }
     }
     
-    protected void dealDamage(final LivingEntity akz) {
+    protected void dealDamage(final LivingEntity aoy) {
         if (this.isAlive()) {
             final int integer3 = this.getSize();
-            if (this.distanceToSqr(akz) < 0.6 * integer3 * (0.6 * integer3) && this.canSee(akz) && akz.hurt(DamageSource.mobAttack(this), this.getAttackDamage())) {
+            if (this.distanceToSqr(aoy) < 0.6 * integer3 * (0.6 * integer3) && this.canSee(aoy) && aoy.hurt(DamageSource.mobAttack(this), this.getAttackDamage())) {
                 this.playSound(SoundEvents.SLIME_ATTACK, 1.0f, (this.random.nextFloat() - this.random.nextFloat()) * 0.2f + 1.0f);
-                this.doEnchantDamageEffects(this, akz);
+                this.doEnchantDamageEffects(this, aoy);
             }
         }
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return 0.625f * akr.height;
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return 0.625f * aon.height;
     }
     
     protected boolean isDealsDamage() {
@@ -239,11 +238,11 @@ public class Slime extends Mob implements Enemy {
     }
     
     protected float getAttackDamage() {
-        return (float)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue();
+        return (float)this.getAttributeValue(Attributes.ATTACK_DAMAGE);
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         if (this.isTiny()) {
             return SoundEvents.SLIME_HURT_SMALL;
         }
@@ -270,19 +269,19 @@ public class Slime extends Mob implements Enemy {
         return (this.getSize() == 1) ? this.getType().getDefaultLootTable() : BuiltInLootTables.EMPTY;
     }
     
-    public static boolean checkSlimeSpawnRules(final EntityType<Slime> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        if (bjx.getLevelData().getGeneratorType() == LevelType.FLAT && random.nextInt(4) != 1) {
-            return false;
-        }
-        if (bjx.getDifficulty() != Difficulty.PEACEFUL) {
-            final Biome bkt6 = bjx.getBiome(fk);
-            if (bkt6 == Biomes.SWAMP && fk.getY() > 50 && fk.getY() < 70 && random.nextFloat() < 0.5f && random.nextFloat() < bjx.getMoonBrightness() && bjx.getMaxLocalRawBrightness(fk) <= random.nextInt(8)) {
-                return Mob.checkMobSpawnRules(aku, bjx, alc, fk, random);
+    public static boolean checkSlimeSpawnRules(final EntityType<Slime> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        if (bqc.getDifficulty() != Difficulty.PEACEFUL) {
+            final Biome bre6 = bqc.getBiome(fu);
+            if (bre6 == Biomes.SWAMP && fu.getY() > 50 && fu.getY() < 70 && random.nextFloat() < 0.5f && random.nextFloat() < bqc.getMoonBrightness() && bqc.getMaxLocalRawBrightness(fu) <= random.nextInt(8)) {
+                return Mob.checkMobSpawnRules(aoq, bqc, apb, fu, random);
             }
-            final ChunkPos bjh7 = new ChunkPos(fk);
-            final boolean boolean8 = WorldgenRandom.seedSlimeChunk(bjh7.x, bjh7.z, bjx.getSeed(), 987234911L).nextInt(10) == 0;
-            if (random.nextInt(10) == 0 && boolean8 && fk.getY() < 40) {
-                return Mob.checkMobSpawnRules(aku, bjx, alc, fk, random);
+            if (!(bqc instanceof WorldGenLevel)) {
+                return false;
+            }
+            final ChunkPos bph7 = new ChunkPos(fu);
+            final boolean boolean8 = WorldgenRandom.seedSlimeChunk(bph7.x, bph7.z, ((WorldGenLevel)bqc).getSeed(), 987234911L).nextInt(10) == 0;
+            if (random.nextInt(10) == 0 && boolean8 && fu.getY() < 40) {
+                return Mob.checkMobSpawnRules(aoq, bqc, apb, fu, random);
             }
         }
         return false;
@@ -304,21 +303,26 @@ public class Slime extends Mob implements Enemy {
     
     @Override
     protected void jumpFromGround() {
-        final Vec3 cvl2 = this.getDeltaMovement();
-        this.setDeltaMovement(cvl2.x, this.getJumpPower(), cvl2.z);
+        final Vec3 dem2 = this.getDeltaMovement();
+        this.setDeltaMovement(dem2.x, this.getJumpPower(), dem2.z);
         this.hasImpulse = true;
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
         int integer7 = this.random.nextInt(3);
-        if (integer7 < 2 && this.random.nextFloat() < 0.5f * ajj.getSpecialMultiplier()) {
+        if (integer7 < 2 && this.random.nextFloat() < 0.5f * ane.getSpecialMultiplier()) {
             ++integer7;
         }
         final int integer8 = 1 << integer7;
         this.setSize(integer8, true);
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
+    }
+    
+    private float getSoundPitch() {
+        final float float2 = this.isTiny() ? 1.4f : 0.8f;
+        return ((this.random.nextFloat() - this.random.nextFloat()) * 0.2f + 1.0f) * float2;
     }
     
     protected SoundEvent getJumpSound() {
@@ -326,8 +330,8 @@ public class Slime extends Mob implements Enemy {
     }
     
     @Override
-    public EntityDimensions getDimensions(final Pose alj) {
-        return super.getDimensions(alj).scale(0.255f * this.getSize());
+    public EntityDimensions getDimensions(final Pose apj) {
+        return super.getDimensions(apj).scale(0.255f * this.getSize());
     }
     
     static {
@@ -340,10 +344,10 @@ public class Slime extends Mob implements Enemy {
         private final Slime slime;
         private boolean isAggressive;
         
-        public SlimeMoveControl(final Slime axh) {
-            super(axh);
-            this.slime = axh;
-            this.yRot = 180.0f * axh.yRot / 3.1415927f;
+        public SlimeMoveControl(final Slime bck) {
+            super(bck);
+            this.slime = bck;
+            this.yRot = 180.0f * bck.yRot / 3.1415927f;
         }
         
         public void setDirection(final float float1, final boolean boolean2) {
@@ -366,8 +370,8 @@ public class Slime extends Mob implements Enemy {
                 return;
             }
             this.operation = Operation.WAIT;
-            if (this.mob.onGround) {
-                this.mob.setSpeed((float)(this.speedModifier * this.mob.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue()));
+            if (this.mob.isOnGround()) {
+                this.mob.setSpeed((float)(this.speedModifier * this.mob.getAttributeValue(Attributes.MOVEMENT_SPEED)));
                 if (this.jumpDelay-- <= 0) {
                     this.jumpDelay = this.slime.getJumpDelay();
                     if (this.isAggressive) {
@@ -375,7 +379,7 @@ public class Slime extends Mob implements Enemy {
                     }
                     this.slime.getJumpControl().jump();
                     if (this.slime.doPlayJumpSound()) {
-                        this.slime.playSound(this.slime.getJumpSound(), this.slime.getSoundVolume(), ((this.slime.getRandom().nextFloat() - this.slime.getRandom().nextFloat()) * 0.2f + 1.0f) * 0.8f);
+                        this.slime.playSound(this.slime.getJumpSound(), this.slime.getSoundVolume(), this.slime.getSoundPitch());
                     }
                 }
                 else {
@@ -385,7 +389,7 @@ public class Slime extends Mob implements Enemy {
                 }
             }
             else {
-                this.mob.setSpeed((float)(this.speedModifier * this.mob.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue()));
+                this.mob.setSpeed((float)(this.speedModifier * this.mob.getAttributeValue(Attributes.MOVEMENT_SPEED)));
             }
         }
     }
@@ -394,15 +398,15 @@ public class Slime extends Mob implements Enemy {
         private final Slime slime;
         private int growTiredTimer;
         
-        public SlimeAttackGoal(final Slime axh) {
-            this.slime = axh;
+        public SlimeAttackGoal(final Slime bck) {
+            this.slime = bck;
             this.setFlags(EnumSet.<Flag>of(Flag.LOOK));
         }
         
         @Override
         public boolean canUse() {
-            final LivingEntity akz2 = this.slime.getTarget();
-            return akz2 != null && akz2.isAlive() && (!(akz2 instanceof Player) || !((Player)akz2).abilities.invulnerable) && this.slime.getMoveControl() instanceof SlimeMoveControl;
+            final LivingEntity aoy2 = this.slime.getTarget();
+            return aoy2 != null && aoy2.isAlive() && (!(aoy2 instanceof Player) || !((Player)aoy2).abilities.invulnerable) && this.slime.getMoveControl() instanceof SlimeMoveControl;
         }
         
         @Override
@@ -413,8 +417,8 @@ public class Slime extends Mob implements Enemy {
         
         @Override
         public boolean canContinueToUse() {
-            final LivingEntity akz2 = this.slime.getTarget();
-            return akz2 != null && akz2.isAlive() && (!(akz2 instanceof Player) || !((Player)akz2).abilities.invulnerable) && --this.growTiredTimer > 0;
+            final LivingEntity aoy2 = this.slime.getTarget();
+            return aoy2 != null && aoy2.isAlive() && (!(aoy2 instanceof Player) || !((Player)aoy2).abilities.invulnerable) && --this.growTiredTimer > 0;
         }
         
         @Override
@@ -429,8 +433,8 @@ public class Slime extends Mob implements Enemy {
         private float chosenDegrees;
         private int nextRandomizeTime;
         
-        public SlimeRandomDirectionGoal(final Slime axh) {
-            this.slime = axh;
+        public SlimeRandomDirectionGoal(final Slime bck) {
+            this.slime = bck;
             this.setFlags(EnumSet.<Flag>of(Flag.LOOK));
         }
         
@@ -454,10 +458,10 @@ public class Slime extends Mob implements Enemy {
     static class SlimeFloatGoal extends Goal {
         private final Slime slime;
         
-        public SlimeFloatGoal(final Slime axh) {
-            this.slime = axh;
+        public SlimeFloatGoal(final Slime bck) {
+            this.slime = bck;
             this.setFlags(EnumSet.<Flag>of(Flag.JUMP, Flag.MOVE));
-            axh.getNavigation().setCanFloat(true);
+            bck.getNavigation().setCanFloat(true);
         }
         
         @Override
@@ -477,8 +481,8 @@ public class Slime extends Mob implements Enemy {
     static class SlimeKeepOnJumpingGoal extends Goal {
         private final Slime slime;
         
-        public SlimeKeepOnJumpingGoal(final Slime axh) {
-            this.slime = axh;
+        public SlimeKeepOnJumpingGoal(final Slime bck) {
+            this.slime = bck;
             this.setFlags(EnumSet.<Flag>of(Flag.JUMP, Flag.MOVE));
         }
         
diff --git a/src/net/minecraft/world/entity/monster/SpellcasterIllager.java b/src/net/minecraft/world/entity/monster/SpellcasterIllager.java
index cab5ccf..5d85f31 100644
--- a/src/net/minecraft/world/entity/monster/SpellcasterIllager.java
+++ b/src/net/minecraft/world/entity/monster/SpellcasterIllager.java
@@ -22,8 +22,8 @@ public abstract class SpellcasterIllager extends AbstractIllager {
     protected int spellCastingTickCount;
     private IllagerSpell currentSpell;
     
-    protected SpellcasterIllager(final EntityType<? extends SpellcasterIllager> aku, final Level bjw) {
-        super(aku, bjw);
+    protected SpellcasterIllager(final EntityType<? extends SpellcasterIllager> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.currentSpell = IllagerSpell.NONE;
     }
     
@@ -34,15 +34,15 @@ public abstract class SpellcasterIllager extends AbstractIllager {
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.spellCastingTickCount = jt.getInt("SpellTicks");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.spellCastingTickCount = le.getInt("SpellTicks");
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("SpellTicks", this.spellCastingTickCount);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("SpellTicks", this.spellCastingTickCount);
     }
     
     @Override
@@ -148,14 +148,14 @@ public abstract class SpellcasterIllager extends AbstractIllager {
         
         @Override
         public boolean canUse() {
-            final LivingEntity akz2 = SpellcasterIllager.this.getTarget();
-            return akz2 != null && akz2.isAlive() && !SpellcasterIllager.this.isCastingSpell() && SpellcasterIllager.this.tickCount >= this.nextAttackTickCount;
+            final LivingEntity aoy2 = SpellcasterIllager.this.getTarget();
+            return aoy2 != null && aoy2.isAlive() && !SpellcasterIllager.this.isCastingSpell() && SpellcasterIllager.this.tickCount >= this.nextAttackTickCount;
         }
         
         @Override
         public boolean canContinueToUse() {
-            final LivingEntity akz2 = SpellcasterIllager.this.getTarget();
-            return akz2 != null && akz2.isAlive() && this.attackWarmupDelay > 0;
+            final LivingEntity aoy2 = SpellcasterIllager.this.getTarget();
+            return aoy2 != null && aoy2.isAlive() && this.attackWarmupDelay > 0;
         }
         
         @Override
@@ -163,9 +163,9 @@ public abstract class SpellcasterIllager extends AbstractIllager {
             this.attackWarmupDelay = this.getCastWarmupTime();
             SpellcasterIllager.this.spellCastingTickCount = this.getCastingTime();
             this.nextAttackTickCount = SpellcasterIllager.this.tickCount + this.getCastingInterval();
-            final SoundEvent aah2 = this.getSpellPrepareSound();
-            if (aah2 != null) {
-                SpellcasterIllager.this.playSound(aah2, 1.0f, 1.0f);
+            final SoundEvent ack2 = this.getSpellPrepareSound();
+            if (ack2 != null) {
+                SpellcasterIllager.this.playSound(ack2, 1.0f, 1.0f);
             }
             SpellcasterIllager.this.setIsCastingSpell(this.getSpell());
         }
diff --git a/src/net/minecraft/world/entity/monster/Spider.java b/src/net/minecraft/world/entity/monster/Spider.java
index 6557fe1..b098f0b 100644
--- a/src/net/minecraft/world/entity/monster/Spider.java
+++ b/src/net/minecraft/world/entity/monster/Spider.java
@@ -26,6 +26,8 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.navigation.WallClimberNavigation;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
 import net.minecraft.world.entity.animal.IronGolem;
@@ -47,8 +49,8 @@ import net.minecraft.network.syncher.EntityDataAccessor;
 public class Spider extends Monster {
     private static final EntityDataAccessor<Byte> DATA_FLAGS_ID;
     
-    public Spider(final EntityType<? extends Spider> aku, final Level bjw) {
-        super(aku, bjw);
+    public Spider(final EntityType<? extends Spider> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -65,13 +67,13 @@ public class Spider extends Monster {
     }
     
     @Override
-    public double getRideHeight() {
+    public double getPassengersRidingOffset() {
         return this.getBbHeight() * 0.5f;
     }
     
     @Override
-    protected PathNavigation createNavigation(final Level bjw) {
-        return new WallClimberNavigation(this, bjw);
+    protected PathNavigation createNavigation(final Level bqb) {
+        return new WallClimberNavigation(this, bqb);
     }
     
     @Override
@@ -88,11 +90,8 @@ public class Spider extends Monster {
         }
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(16.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.30000001192092896);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 16.0).add(Attributes.MOVEMENT_SPEED, 0.30000001192092896);
     }
     
     @Override
@@ -101,7 +100,7 @@ public class Spider extends Monster {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.SPIDER_HURT;
     }
     
@@ -111,19 +110,19 @@ public class Spider extends Monster {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(SoundEvents.SPIDER_STEP, 0.15f, 1.0f);
     }
     
     @Override
-    public boolean onLadder() {
+    public boolean onClimbable() {
         return this.isClimbing();
     }
     
     @Override
-    public void makeStuckInBlock(final BlockState byj, final Vec3 cvl) {
-        if (byj.getBlock() != Blocks.COBWEB) {
-            super.makeStuckInBlock(byj, cvl);
+    public void makeStuckInBlock(final BlockState cfj, final Vec3 dem) {
+        if (!cfj.is(Blocks.COBWEB)) {
+            super.makeStuckInBlock(cfj, dem);
         }
     }
     
@@ -133,8 +132,8 @@ public class Spider extends Monster {
     }
     
     @Override
-    public boolean canBeAffected(final MobEffectInstance akk) {
-        return akk.getEffect() != MobEffects.POISON && super.canBeAffected(akk);
+    public boolean canBeAffected(final MobEffectInstance aog) {
+        return aog.getEffect() != MobEffects.POISON && super.canBeAffected(aog);
     }
     
     public boolean isClimbing() {
@@ -154,32 +153,32 @@ public class Spider extends Monster {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        alm = super.finalizeSpawn(bjx, ajj, alc, alm, jt);
-        if (bjx.getRandom().nextInt(100) == 0) {
-            final Skeleton axg7 = EntityType.SKELETON.create(this.level);
-            axg7.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, 0.0f);
-            axg7.finalizeSpawn(bjx, ajj, alc, null, null);
-            bjx.addFreshEntity(axg7);
-            axg7.startRiding(this);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        apo = super.finalizeSpawn(bqc, ane, apb, apo, le);
+        if (bqc.getRandom().nextInt(100) == 0) {
+            final Skeleton bcj7 = EntityType.SKELETON.create(this.level);
+            bcj7.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, 0.0f);
+            bcj7.finalizeSpawn(bqc, ane, apb, null, null);
+            bcj7.startRiding(this);
+            bqc.addFreshEntity(bcj7);
         }
-        if (alm == null) {
-            alm = new SpiderEffectsGroupData();
-            if (bjx.getDifficulty() == Difficulty.HARD && bjx.getRandom().nextFloat() < 0.1f * ajj.getSpecialMultiplier()) {
-                ((SpiderEffectsGroupData)alm).setRandomEffect(bjx.getRandom());
+        if (apo == null) {
+            apo = new SpiderEffectsGroupData();
+            if (bqc.getDifficulty() == Difficulty.HARD && bqc.getRandom().nextFloat() < 0.1f * ane.getSpecialMultiplier()) {
+                ((SpiderEffectsGroupData)apo).setRandomEffect(bqc.getRandom());
             }
         }
-        if (alm instanceof SpiderEffectsGroupData) {
-            final MobEffect aki7 = ((SpiderEffectsGroupData)alm).effect;
-            if (aki7 != null) {
-                this.addEffect(new MobEffectInstance(aki7, Integer.MAX_VALUE));
+        if (apo instanceof SpiderEffectsGroupData) {
+            final MobEffect aoe7 = ((SpiderEffectsGroupData)apo).effect;
+            if (aoe7 != null) {
+                this.addEffect(new MobEffectInstance(aoe7, Integer.MAX_VALUE));
             }
         }
-        return alm;
+        return apo;
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 0.65f;
     }
     
@@ -208,8 +207,8 @@ public class Spider extends Monster {
     }
     
     static class SpiderAttackGoal extends MeleeAttackGoal {
-        public SpiderAttackGoal(final Spider axj) {
-            super(axj, 1.0, true);
+        public SpiderAttackGoal(final Spider bcm) {
+            super(bcm, 1.0, true);
         }
         
         @Override
@@ -228,14 +227,14 @@ public class Spider extends Monster {
         }
         
         @Override
-        protected double getAttackReachSqr(final LivingEntity akz) {
-            return 4.0f + akz.getBbWidth();
+        protected double getAttackReachSqr(final LivingEntity aoy) {
+            return 4.0f + aoy.getBbWidth();
         }
     }
     
     static class SpiderTargetGoal<T extends LivingEntity> extends NearestAttackableTargetGoal<T> {
-        public SpiderTargetGoal(final Spider axj, final Class<T> class2) {
-            super(axj, class2, true);
+        public SpiderTargetGoal(final Spider bcm, final Class<T> class2) {
+            super(bcm, class2, true);
         }
         
         @Override
diff --git a/src/net/minecraft/world/entity/monster/Stray.java b/src/net/minecraft/world/entity/monster/Stray.java
index 1f08ea3..29bbe43 100644
--- a/src/net/minecraft/world/entity/monster/Stray.java
+++ b/src/net/minecraft/world/entity/monster/Stray.java
@@ -16,12 +16,12 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Stray extends AbstractSkeleton {
-    public Stray(final EntityType<? extends Stray> aku, final Level bjw) {
-        super(aku, bjw);
+    public Stray(final EntityType<? extends Stray> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public static boolean checkStraySpawnRules(final EntityType<Stray> aku, final LevelAccessor bjx, final MobSpawnType alc, final BlockPos fk, final Random random) {
-        return Monster.checkMonsterSpawnRules(aku, bjx, alc, fk, random) && (alc == MobSpawnType.SPAWNER || bjx.canSeeSky(fk));
+    public static boolean checkStraySpawnRules(final EntityType<Stray> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return Monster.checkMonsterSpawnRules(aoq, bqc, apb, fu, random) && (apb == MobSpawnType.SPAWNER || bqc.canSeeSky(fu));
     }
     
     @Override
@@ -30,7 +30,7 @@ public class Stray extends AbstractSkeleton {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.STRAY_HURT;
     }
     
@@ -45,11 +45,11 @@ public class Stray extends AbstractSkeleton {
     }
     
     @Override
-    protected AbstractArrow getArrow(final ItemStack ben, final float float2) {
-        final AbstractArrow ayn4 = super.getArrow(ben, float2);
-        if (ayn4 instanceof Arrow) {
-            ((Arrow)ayn4).addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 600));
+    protected AbstractArrow getArrow(final ItemStack bki, final float float2) {
+        final AbstractArrow beg4 = super.getArrow(bki, float2);
+        if (beg4 instanceof Arrow) {
+            ((Arrow)beg4).addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 600));
         }
-        return ayn4;
+        return beg4;
     }
 }
diff --git a/src/net/minecraft/world/entity/monster/Strider.java b/src/net/minecraft/world/entity/monster/Strider.java
new file mode 100644
index 0000000..fcbcb87
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/Strider.java
@@ -0,0 +1,531 @@
+package net.minecraft.world.entity.monster;
+
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.pathfinder.WalkNodeEvaluator;
+import net.minecraft.world.level.pathfinder.PathFinder;
+import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
+import net.minecraft.network.syncher.SynchedEntityData;
+import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.world.entity.SpawnGroupData;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.entity.AgableMob;
+import net.minecraft.world.entity.ai.navigation.PathNavigation;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.level.block.LiquidBlock;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import com.google.common.collect.UnmodifiableIterator;
+import java.util.Iterator;
+import java.util.Set;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.entity.vehicle.DismountHelper;
+import net.minecraft.world.entity.Pose;
+import com.google.common.collect.Sets;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.item.Items;
+import net.minecraft.util.Mth;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
+import net.minecraft.world.entity.ai.goal.RandomStrollGoal;
+import net.minecraft.world.entity.ai.goal.FollowParentGoal;
+import net.minecraft.world.entity.ai.goal.BreedGoal;
+import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.entity.PathfinderMob;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.sounds.SoundEvents;
+import javax.annotation.Nullable;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.FluidTags;
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.pathfinder.BlockPathTypes;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.ai.goal.PanicGoal;
+import net.minecraft.world.entity.ai.goal.TemptGoal;
+import net.minecraft.world.entity.ItemBasedSteering;
+import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.entity.Saddleable;
+import net.minecraft.world.entity.ItemSteerable;
+import net.minecraft.world.entity.animal.Animal;
+
+public class Strider extends Animal implements ItemSteerable, Saddleable {
+    private static final Ingredient FOOD_ITEMS;
+    private static final Ingredient TEMPT_ITEMS;
+    private static final EntityDataAccessor<Integer> DATA_BOOST_TIME;
+    private static final EntityDataAccessor<Boolean> DATA_SUFFOCATING;
+    private static final EntityDataAccessor<Boolean> DATA_SADDLE_ID;
+    private final ItemBasedSteering steering;
+    private TemptGoal temptGoal;
+    private PanicGoal panicGoal;
+    
+    public Strider(final EntityType<? extends Strider> aoq, final Level bqb) {
+        super(aoq, bqb);
+        this.steering = new ItemBasedSteering(this.entityData, Strider.DATA_BOOST_TIME, Strider.DATA_SADDLE_ID);
+        this.blocksBuilding = true;
+        this.setPathfindingMalus(BlockPathTypes.WATER, -1.0f);
+        this.setPathfindingMalus(BlockPathTypes.LAVA, 0.0f);
+        this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 0.0f);
+        this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, 0.0f);
+    }
+    
+    public static boolean checkStriderSpawnRules(final EntityType<Strider> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        final BlockPos.MutableBlockPos a6 = fu.mutable();
+        do {
+            a6.move(Direction.UP);
+        } while (bqc.getFluidState(a6).is(FluidTags.LAVA));
+        return bqc.getBlockState(a6).isAir();
+    }
+    
+    @Override
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (Strider.DATA_BOOST_TIME.equals(tq) && this.level.isClientSide) {
+            this.steering.onSynced();
+        }
+        super.onSyncedDataUpdated(tq);
+    }
+    
+    @Override
+    protected void defineSynchedData() {
+        super.defineSynchedData();
+        this.entityData.<Integer>define(Strider.DATA_BOOST_TIME, 0);
+        this.entityData.<Boolean>define(Strider.DATA_SUFFOCATING, false);
+        this.entityData.<Boolean>define(Strider.DATA_SADDLE_ID, false);
+    }
+    
+    @Override
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        this.steering.addAdditionalSaveData(le);
+    }
+    
+    @Override
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.steering.readAdditionalSaveData(le);
+    }
+    
+    @Override
+    public boolean isSaddled() {
+        return this.steering.hasSaddle();
+    }
+    
+    @Override
+    public boolean isSaddleable() {
+        return this.isAlive() && !this.isBaby();
+    }
+    
+    @Override
+    public void equipSaddle(@Nullable final SoundSource acm) {
+        this.steering.setSaddle(true);
+        if (acm != null) {
+            this.level.playSound(null, this, SoundEvents.STRIDER_SADDLE, acm, 0.5f, 1.0f);
+        }
+    }
+    
+    @Override
+    protected void registerGoals() {
+        this.panicGoal = new PanicGoal(this, 1.65);
+        this.goalSelector.addGoal(1, this.panicGoal);
+        this.goalSelector.addGoal(3, new BreedGoal(this, 1.0));
+        this.temptGoal = new TemptGoal(this, 1.4, false, Strider.TEMPT_ITEMS);
+        this.goalSelector.addGoal(4, this.temptGoal);
+        this.goalSelector.addGoal(5, new FollowParentGoal(this, 1.1));
+        this.goalSelector.addGoal(7, new RandomStrollGoal(this, 1.0, 60));
+        this.goalSelector.addGoal(8, new LookAtPlayerGoal(this, Player.class, 8.0f));
+        this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
+        this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Strider.class, 8.0f));
+    }
+    
+    public void setSuffocating(final boolean boolean1) {
+        this.entityData.<Boolean>set(Strider.DATA_SUFFOCATING, boolean1);
+    }
+    
+    public boolean isSuffocating() {
+        if (this.getVehicle() instanceof Strider) {
+            return ((Strider)this.getVehicle()).isSuffocating();
+        }
+        return this.entityData.<Boolean>get(Strider.DATA_SUFFOCATING);
+    }
+    
+    @Override
+    public boolean canStandOnFluid(final Fluid cwz) {
+        return cwz.is(FluidTags.LAVA);
+    }
+    
+    @Nullable
+    @Override
+    public AABB getCollideAgainstBox(final Entity aom) {
+        if (aom.isPushable()) {
+            return aom.getBoundingBox();
+        }
+        return null;
+    }
+    
+    @Override
+    public boolean isPushable() {
+        return true;
+    }
+    
+    @Override
+    public double getPassengersRidingOffset() {
+        final float float2 = Math.min(0.25f, this.animationSpeed);
+        final float float3 = this.animationPosition;
+        return this.getBbHeight() - 0.2 + 0.12f * Mth.cos(float3 * 1.5f) * 2.0f * float2;
+    }
+    
+    @Override
+    public boolean canBeControlledByRider() {
+        final Entity aom2 = this.getControllingPassenger();
+        if (!(aom2 instanceof Player)) {
+            return false;
+        }
+        final Player bec3 = (Player)aom2;
+        return bec3.getMainHandItem().getItem() == Items.WARPED_FUNGUS_ON_A_STICK || bec3.getOffhandItem().getItem() == Items.WARPED_FUNGUS_ON_A_STICK;
+    }
+    
+    @Override
+    public boolean checkSpawnObstruction(final LevelReader bqd) {
+        return bqd.isUnobstructed(this);
+    }
+    
+    @Nullable
+    @Override
+    public Entity getControllingPassenger() {
+        if (this.getPassengers().isEmpty()) {
+            return null;
+        }
+        return this.getPassengers().get(0);
+    }
+    
+    @Override
+    public Vec3 getDismountLocationForPassenger(final LivingEntity aoy) {
+        final Vec3[] arr3 = { Entity.getCollisionHorizontalEscapeVector(this.getBbWidth(), aoy.getBbWidth(), aoy.yRot), Entity.getCollisionHorizontalEscapeVector(this.getBbWidth(), aoy.getBbWidth(), aoy.yRot - 22.5f), Entity.getCollisionHorizontalEscapeVector(this.getBbWidth(), aoy.getBbWidth(), aoy.yRot + 22.5f), Entity.getCollisionHorizontalEscapeVector(this.getBbWidth(), aoy.getBbWidth(), aoy.yRot - 45.0f), Entity.getCollisionHorizontalEscapeVector(this.getBbWidth(), aoy.getBbWidth(), aoy.yRot + 45.0f) };
+        final Set<BlockPos> set4 = Sets.newLinkedHashSet();
+        final double double5 = this.getBoundingBox().maxY;
+        final double double6 = this.getBoundingBox().minY - 0.5;
+        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos();
+        for (final Vec3 dem13 : arr3) {
+            a9.set(this.getX() + dem13.x, double5, this.getZ() + dem13.z);
+            for (double double7 = double5; double7 > double6; --double7) {
+                set4.add(a9.immutable());
+                a9.move(Direction.DOWN);
+            }
+        }
+        for (final BlockPos fu11 : set4) {
+            if (this.level.getFluidState(fu11).is(FluidTags.LAVA)) {
+                continue;
+            }
+            for (final Pose apj13 : aoy.getDismountPoses()) {
+                final double double7 = this.level.getRelativeFloorHeight(fu11);
+                if (DismountHelper.isFloorValid(double7)) {
+                    final AABB deg16 = aoy.getLocalBoundsForPose(apj13);
+                    final Vec3 dem14 = Vec3.upFromBottomCenterOf(fu11, double7);
+                    if (DismountHelper.canDismountTo(this.level, aoy, deg16.move(dem14))) {
+                        aoy.setPose(apj13);
+                        return dem14;
+                    }
+                    continue;
+                }
+            }
+        }
+        return new Vec3(this.getX(), this.getBoundingBox().maxY, this.getZ());
+    }
+    
+    @Override
+    public void travel(final Vec3 dem) {
+        this.setSpeed(this.getMoveSpeed());
+        this.travel(this, this.steering, dem);
+    }
+    
+    public float getMoveSpeed() {
+        return (float)this.getAttributeValue(Attributes.MOVEMENT_SPEED) * (this.isSuffocating() ? 0.66f : 1.0f);
+    }
+    
+    @Override
+    public float getSteeringSpeed() {
+        return (float)this.getAttributeValue(Attributes.MOVEMENT_SPEED) * (this.isSuffocating() ? 0.23f : 0.55f);
+    }
+    
+    @Override
+    public void travelWithInput(final Vec3 dem) {
+        super.travel(dem);
+    }
+    
+    @Override
+    protected float nextStep() {
+        return this.moveDist + 0.6f;
+    }
+    
+    @Override
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
+        this.playSound(this.isInLava() ? SoundEvents.STRIDER_STEP_LAVA : SoundEvents.STRIDER_STEP, 1.0f, 1.0f);
+    }
+    
+    @Override
+    public boolean boost() {
+        return this.steering.boost(this.getRandom());
+    }
+    
+    @Override
+    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState cfj, final BlockPos fu) {
+        this.checkInsideBlocks();
+        if (this.isInLava()) {
+            this.fallDistance = 0.0f;
+            return;
+        }
+        super.checkFallDamage(double1, boolean2, cfj, fu);
+    }
+    
+    @Override
+    public void tick() {
+        if (this.isBeingTempted() && this.random.nextInt(140) == 0) {
+            this.playSound(SoundEvents.STRIDER_HAPPY, 1.0f, this.getVoicePitch());
+        }
+        else if (this.isPanicking() && this.random.nextInt(60) == 0) {
+            this.playSound(SoundEvents.STRIDER_RETREAT, 1.0f, this.getVoicePitch());
+        }
+        final BlockState cfj2 = this.level.getBlockState(this.blockPosition());
+        final BlockState cfj3 = this.getBlockStateOn();
+        final boolean boolean4 = cfj2.is(BlockTags.STRIDER_WARM_BLOCKS) || cfj3.is(BlockTags.STRIDER_WARM_BLOCKS) || this.getFluidHeight(FluidTags.LAVA) > 0.0;
+        this.setSuffocating(!boolean4);
+        super.tick();
+        this.floatStrider();
+        this.checkInsideBlocks();
+    }
+    
+    private boolean isPanicking() {
+        return this.panicGoal != null && this.panicGoal.isRunning();
+    }
+    
+    private boolean isBeingTempted() {
+        return this.temptGoal != null && this.temptGoal.isRunning();
+    }
+    
+    @Override
+    protected boolean shouldPassengersInheritMalus() {
+        return true;
+    }
+    
+    private void floatStrider() {
+        if (this.isInLava()) {
+            final CollisionContext der2 = CollisionContext.of(this);
+            if (!der2.isAbove(LiquidBlock.STABLE_SHAPE, this.blockPosition(), true) || this.level.getFluidState(this.blockPosition().above()).is(FluidTags.LAVA)) {
+                this.setDeltaMovement(this.getDeltaMovement().scale(0.5).add(0.0, 0.05, 0.0));
+            }
+            else {
+                this.onGround = true;
+            }
+        }
+    }
+    
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.17499999701976776).add(Attributes.FOLLOW_RANGE, 16.0);
+    }
+    
+    @Override
+    protected SoundEvent getAmbientSound() {
+        if (this.isPanicking() || this.isBeingTempted()) {
+            return null;
+        }
+        return SoundEvents.STRIDER_AMBIENT;
+    }
+    
+    @Override
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        return SoundEvents.STRIDER_HURT;
+    }
+    
+    @Override
+    protected SoundEvent getDeathSound() {
+        return SoundEvents.STRIDER_DEATH;
+    }
+    
+    @Override
+    protected boolean canAddPassenger(final Entity aom) {
+        return this.getPassengers().isEmpty() && !this.isEyeInFluid(FluidTags.LAVA);
+    }
+    
+    @Override
+    public boolean isSensitiveToWater() {
+        return true;
+    }
+    
+    @Override
+    public boolean isOnFire() {
+        return false;
+    }
+    
+    @Override
+    protected PathNavigation createNavigation(final Level bqb) {
+        return new StriderPathNavigation(this, bqb);
+    }
+    
+    @Override
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        if (bqd.getBlockState(fu).getFluidState().is(FluidTags.LAVA)) {
+            return 10.0f;
+        }
+        return 0.0f;
+    }
+    
+    @Override
+    public Strider getBreedOffspring(final AgableMob aok) {
+        return EntityType.STRIDER.create(this.level);
+    }
+    
+    @Override
+    public boolean isFood(final ItemStack bki) {
+        return Strider.FOOD_ITEMS.test(bki);
+    }
+    
+    @Override
+    protected void dropEquipment() {
+        super.dropEquipment();
+        if (this.isSaddled()) {
+            this.spawnAtLocation(Items.SADDLE);
+        }
+    }
+    
+    @Override
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final boolean boolean4 = this.isFood(bec.getItemInHand(anf));
+        if (!boolean4 && this.isSaddled() && !this.isVehicle()) {
+            if (!this.level.isClientSide) {
+                bec.startRiding(this);
+            }
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
+        }
+        final InteractionResult ang5 = super.mobInteract(bec, anf);
+        if (ang5.consumesAction()) {
+            if (boolean4 && !this.isSilent()) {
+                this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.STRIDER_EAT, this.getSoundSource(), 1.0f, 1.0f + (this.random.nextFloat() - this.random.nextFloat()) * 0.2f);
+            }
+            return ang5;
+        }
+        final ItemStack bki6 = bec.getItemInHand(anf);
+        if (bki6.getItem() == Items.SADDLE) {
+            return bki6.interactLivingEntity(bec, this, anf);
+        }
+        return InteractionResult.PASS;
+    }
+    
+    @Override
+    public Vec3 getLeashOffset() {
+        return new Vec3(0.0, 0.6f * this.getEyeHeight(), this.getBbWidth() * 0.4f);
+    }
+    
+    @Nullable
+    @Override
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        SpawnGroupData apo2 = null;
+        StriderGroupData.Rider a7;
+        if (apo instanceof StriderGroupData) {
+            a7 = ((StriderGroupData)apo).rider;
+        }
+        else if (!this.isBaby()) {
+            if (this.random.nextInt(30) == 0) {
+                a7 = StriderGroupData.Rider.PIGLIN_RIDER;
+                apo2 = new Zombie.ZombieGroupData(Zombie.getSpawnAsBabyOdds(this.random), false);
+            }
+            else if (this.random.nextInt(10) == 0) {
+                a7 = StriderGroupData.Rider.BABY_RIDER;
+            }
+            else {
+                a7 = StriderGroupData.Rider.NO_RIDER;
+            }
+            apo = new StriderGroupData(a7);
+            ((AgableMobGroupData)apo).setBabySpawnChance((a7 == StriderGroupData.Rider.NO_RIDER) ? 0.5f : 0.0f);
+        }
+        else {
+            a7 = StriderGroupData.Rider.NO_RIDER;
+        }
+        Mob aoz9 = null;
+        if (a7 == StriderGroupData.Rider.BABY_RIDER) {
+            final Strider bco10 = EntityType.STRIDER.create(bqc.getLevel());
+            if (bco10 != null) {
+                aoz9 = bco10;
+                bco10.setAge(-24000);
+            }
+        }
+        else if (a7 == StriderGroupData.Rider.PIGLIN_RIDER) {
+            final ZombifiedPiglin bcw10 = EntityType.ZOMBIFIED_PIGLIN.create(bqc.getLevel());
+            if (bcw10 != null) {
+                aoz9 = bcw10;
+                this.equipSaddle(null);
+            }
+        }
+        if (aoz9 != null) {
+            aoz9.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, 0.0f);
+            aoz9.finalizeSpawn(bqc, ane, MobSpawnType.JOCKEY, apo2, null);
+            aoz9.startRiding(this, true);
+            bqc.addFreshEntity(aoz9);
+        }
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
+    }
+    
+    static {
+        FOOD_ITEMS = Ingredient.of(Items.WARPED_FUNGUS);
+        TEMPT_ITEMS = Ingredient.of(Items.WARPED_FUNGUS, Items.WARPED_FUNGUS_ON_A_STICK);
+        DATA_BOOST_TIME = SynchedEntityData.<Integer>defineId(Strider.class, EntityDataSerializers.INT);
+        DATA_SUFFOCATING = SynchedEntityData.<Boolean>defineId(Strider.class, EntityDataSerializers.BOOLEAN);
+        DATA_SADDLE_ID = SynchedEntityData.<Boolean>defineId(Strider.class, EntityDataSerializers.BOOLEAN);
+    }
+    
+    public static class StriderGroupData extends AgableMobGroupData {
+        public final Rider rider;
+        
+        public StriderGroupData(final Rider a) {
+            this.rider = a;
+        }
+        
+        public enum Rider {
+            NO_RIDER, 
+            BABY_RIDER, 
+            PIGLIN_RIDER;
+        }
+    }
+    
+    static class StriderPathNavigation extends GroundPathNavigation {
+        StriderPathNavigation(final Strider bco, final Level bqb) {
+            super(bco, bqb);
+        }
+        
+        @Override
+        protected PathFinder createPathFinder(final int integer) {
+            this.nodeEvaluator = new WalkNodeEvaluator();
+            return new PathFinder(this.nodeEvaluator, integer);
+        }
+        
+        @Override
+        protected boolean hasValidPathType(final BlockPathTypes czb) {
+            return czb == BlockPathTypes.LAVA || czb == BlockPathTypes.DAMAGE_FIRE || czb == BlockPathTypes.DANGER_FIRE || super.hasValidPathType(czb);
+        }
+        
+        @Override
+        public boolean isStableDestination(final BlockPos fu) {
+            return this.level.getBlockState(fu).is(Blocks.LAVA) || super.isStableDestination(fu);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/Vex.java b/src/net/minecraft/world/entity/monster/Vex.java
index aa8a9e5..d01a825 100644
--- a/src/net/minecraft/world/entity/monster/Vex.java
+++ b/src/net/minecraft/world/entity/monster/Vex.java
@@ -20,6 +20,8 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
@@ -47,15 +49,15 @@ public class Vex extends Monster {
     private boolean hasLimitedLife;
     private int limitedLifeTicks;
     
-    public Vex(final EntityType<? extends Vex> aku, final Level bjw) {
-        super(aku, bjw);
+    public Vex(final EntityType<? extends Vex> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.moveControl = new VexMoveControl(this);
         this.xpReward = 3;
     }
     
     @Override
-    public void move(final MoverType ale, final Vec3 cvl) {
-        super.move(ale, cvl);
+    public void move(final MoverType apd, final Vec3 dem) {
+        super.move(apd, dem);
         this.checkInsideBlocks();
     }
     
@@ -84,11 +86,8 @@ public class Vex extends Monster {
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Player.class, true));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(14.0);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(4.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 14.0).add(Attributes.ATTACK_DAMAGE, 4.0);
     }
     
     @Override
@@ -98,26 +97,26 @@ public class Vex extends Monster {
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("BoundX")) {
-            this.boundOrigin = new BlockPos(jt.getInt("BoundX"), jt.getInt("BoundY"), jt.getInt("BoundZ"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("BoundX")) {
+            this.boundOrigin = new BlockPos(le.getInt("BoundX"), le.getInt("BoundY"), le.getInt("BoundZ"));
         }
-        if (jt.contains("LifeTicks")) {
-            this.setLimitedLife(jt.getInt("LifeTicks"));
+        if (le.contains("LifeTicks")) {
+            this.setLimitedLife(le.getInt("LifeTicks"));
         }
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         if (this.boundOrigin != null) {
-            jt.putInt("BoundX", this.boundOrigin.getX());
-            jt.putInt("BoundY", this.boundOrigin.getY());
-            jt.putInt("BoundZ", this.boundOrigin.getZ());
+            le.putInt("BoundX", this.boundOrigin.getX());
+            le.putInt("BoundY", this.boundOrigin.getY());
+            le.putInt("BoundZ", this.boundOrigin.getZ());
         }
         if (this.hasLimitedLife) {
-            jt.putInt("LifeTicks", this.limitedLifeTicks);
+            le.putInt("LifeTicks", this.limitedLifeTicks);
         }
     }
     
@@ -130,8 +129,8 @@ public class Vex extends Monster {
         return this.boundOrigin;
     }
     
-    public void setBoundOrigin(@Nullable final BlockPos fk) {
-        this.boundOrigin = fk;
+    public void setBoundOrigin(@Nullable final BlockPos fu) {
+        this.boundOrigin = fu;
     }
     
     private boolean getVexFlag(final int integer) {
@@ -158,8 +157,8 @@ public class Vex extends Monster {
         this.setVexFlag(1, boolean1);
     }
     
-    public void setOwner(final Mob ala) {
-        this.owner = ala;
+    public void setOwner(final Mob aoz) {
+        this.owner = aoz;
     }
     
     public void setLimitedLife(final int integer) {
@@ -178,7 +177,7 @@ public class Vex extends Monster {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.VEX_HURT;
     }
     
@@ -189,14 +188,14 @@ public class Vex extends Monster {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        this.populateDefaultEquipmentSlots(ajj);
-        this.populateDefaultEquipmentEnchantments(ajj);
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        this.populateDefaultEquipmentSlots(ane);
+        this.populateDefaultEquipmentEnchantments(ane);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     @Override
-    protected void populateDefaultEquipmentSlots(final DifficultyInstance ajj) {
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
         this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.IRON_SWORD));
         this.setDropChance(EquipmentSlot.MAINHAND, 0.0f);
     }
@@ -206,8 +205,8 @@ public class Vex extends Monster {
     }
     
     class VexMoveControl extends MoveControl {
-        public VexMoveControl(final Vex axl2) {
-            super(axl2);
+        public VexMoveControl(final Vex bcp2) {
+            super(bcp2);
         }
         
         @Override
@@ -215,17 +214,17 @@ public class Vex extends Monster {
             if (this.operation != Operation.MOVE_TO) {
                 return;
             }
-            final Vec3 cvl2 = new Vec3(this.wantedX - Vex.this.getX(), this.wantedY - Vex.this.getY(), this.wantedZ - Vex.this.getZ());
-            final double double3 = cvl2.length();
+            final Vec3 dem2 = new Vec3(this.wantedX - Vex.this.getX(), this.wantedY - Vex.this.getY(), this.wantedZ - Vex.this.getZ());
+            final double double3 = dem2.length();
             if (double3 < Vex.this.getBoundingBox().getSize()) {
                 this.operation = Operation.WAIT;
                 Vex.this.setDeltaMovement(Vex.this.getDeltaMovement().scale(0.5));
             }
             else {
-                Vex.this.setDeltaMovement(Vex.this.getDeltaMovement().add(cvl2.scale(this.speedModifier * 0.05 / double3)));
+                Vex.this.setDeltaMovement(Vex.this.getDeltaMovement().add(dem2.scale(this.speedModifier * 0.05 / double3)));
                 if (Vex.this.getTarget() == null) {
-                    final Vec3 cvl3 = Vex.this.getDeltaMovement();
-                    Vex.this.yRot = -(float)Mth.atan2(cvl3.x, cvl3.z) * 57.295776f;
+                    final Vec3 dem3 = Vex.this.getDeltaMovement();
+                    Vex.this.yRot = -(float)Mth.atan2(dem3.x, dem3.z) * 57.295776f;
                     Vex.this.yBodyRot = Vex.this.yRot;
                 }
                 else {
@@ -255,9 +254,9 @@ public class Vex extends Monster {
         
         @Override
         public void start() {
-            final LivingEntity akz2 = Vex.this.getTarget();
-            final Vec3 cvl3 = akz2.getEyePosition(1.0f);
-            Vex.this.moveControl.setWantedPosition(cvl3.x, cvl3.y, cvl3.z, 1.0);
+            final LivingEntity aoy2 = Vex.this.getTarget();
+            final Vec3 dem3 = aoy2.getEyePosition(1.0f);
+            Vex.this.moveControl.setWantedPosition(dem3.x, dem3.y, dem3.z, 1.0);
             Vex.this.setIsCharging(true);
             Vex.this.playSound(SoundEvents.VEX_CHARGE, 1.0f, 1.0f);
         }
@@ -269,16 +268,16 @@ public class Vex extends Monster {
         
         @Override
         public void tick() {
-            final LivingEntity akz2 = Vex.this.getTarget();
-            if (Vex.this.getBoundingBox().intersects(akz2.getBoundingBox())) {
-                Vex.this.doHurtTarget(akz2);
+            final LivingEntity aoy2 = Vex.this.getTarget();
+            if (Vex.this.getBoundingBox().intersects(aoy2.getBoundingBox())) {
+                Vex.this.doHurtTarget(aoy2);
                 Vex.this.setIsCharging(false);
             }
             else {
-                final double double3 = Vex.this.distanceToSqr(akz2);
+                final double double3 = Vex.this.distanceToSqr(aoy2);
                 if (double3 < 9.0) {
-                    final Vec3 cvl5 = akz2.getEyePosition(1.0f);
-                    Vex.this.moveControl.setWantedPosition(cvl5.x, cvl5.y, cvl5.z, 1.0);
+                    final Vec3 dem5 = aoy2.getEyePosition(1.0f);
+                    Vex.this.moveControl.setWantedPosition(dem5.x, dem5.y, dem5.z, 1.0);
                 }
             }
         }
@@ -301,17 +300,17 @@ public class Vex extends Monster {
         
         @Override
         public void tick() {
-            BlockPos fk2 = Vex.this.getBoundOrigin();
-            if (fk2 == null) {
-                fk2 = new BlockPos(Vex.this);
+            BlockPos fu2 = Vex.this.getBoundOrigin();
+            if (fu2 == null) {
+                fu2 = Vex.this.blockPosition();
             }
             int integer3 = 0;
             while (integer3 < 3) {
-                final BlockPos fk3 = fk2.offset(Vex.this.random.nextInt(15) - 7, Vex.this.random.nextInt(11) - 5, Vex.this.random.nextInt(15) - 7);
-                if (Vex.this.level.isEmptyBlock(fk3)) {
-                    Vex.this.moveControl.setWantedPosition(fk3.getX() + 0.5, fk3.getY() + 0.5, fk3.getZ() + 0.5, 0.25);
+                final BlockPos fu3 = fu2.offset(Vex.this.random.nextInt(15) - 7, Vex.this.random.nextInt(11) - 5, Vex.this.random.nextInt(15) - 7);
+                if (Vex.this.level.isEmptyBlock(fu3)) {
+                    Vex.this.moveControl.setWantedPosition(fu3.getX() + 0.5, fu3.getY() + 0.5, fu3.getZ() + 0.5, 0.25);
                     if (Vex.this.getTarget() == null) {
-                        Vex.this.getLookControl().setLookAt(fk3.getX() + 0.5, fk3.getY() + 0.5, fk3.getZ() + 0.5, 180.0f, 20.0f);
+                        Vex.this.getLookControl().setLookAt(fu3.getX() + 0.5, fu3.getY() + 0.5, fu3.getZ() + 0.5, 180.0f, 20.0f);
                         break;
                     }
                     break;
@@ -326,8 +325,8 @@ public class Vex extends Monster {
     class VexCopyOwnerTargetGoal extends TargetGoal {
         private final TargetingConditions copyOwnerTargeting;
         
-        public VexCopyOwnerTargetGoal(final PathfinderMob alg) {
-            super(alg, false);
+        public VexCopyOwnerTargetGoal(final PathfinderMob apg) {
+            super(apg, false);
             this.copyOwnerTargeting = new TargetingConditions().allowUnseeable().ignoreInvisibilityTesting();
         }
         
diff --git a/src/net/minecraft/world/entity/monster/Vindicator.java b/src/net/minecraft/world/entity/monster/Vindicator.java
index da95b2e..6d113c6 100644
--- a/src/net/minecraft/world/entity/monster/Vindicator.java
+++ b/src/net/minecraft/world/entity/monster/Vindicator.java
@@ -13,6 +13,7 @@ import com.google.common.collect.Maps;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.MobType;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -25,9 +26,9 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
 import net.minecraft.world.entity.LivingEntity;
@@ -52,8 +53,8 @@ public class Vindicator extends AbstractIllager {
     private static final Predicate<Difficulty> DOOR_BREAKING_PREDICATE;
     private boolean isJohnny;
     
-    public Vindicator(final EntityType<? extends Vindicator> aku, final Level bjw) {
-        super(aku, bjw);
+    public Vindicator(final EntityType<? extends Vindicator> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -77,29 +78,24 @@ public class Vindicator extends AbstractIllager {
     @Override
     protected void customServerAiStep() {
         if (!this.isNoAi()) {
-            final PathNavigation arr2 = this.getNavigation();
-            if (arr2 instanceof GroundPathNavigation) {
-                final boolean boolean3 = ((ServerLevel)this.level).isRaided(new BlockPos(this));
-                ((GroundPathNavigation)arr2).setCanOpenDoors(boolean3);
+            final PathNavigation awv2 = this.getNavigation();
+            if (awv2 instanceof GroundPathNavigation) {
+                final boolean boolean3 = ((ServerLevel)this.level).isRaided(this.blockPosition());
+                ((GroundPathNavigation)awv2).setCanOpenDoors(boolean3);
             }
         }
         super.customServerAiStep();
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.3499999940395355);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(12.0);
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(24.0);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(5.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.3499999940395355).add(Attributes.FOLLOW_RANGE, 12.0).add(Attributes.MAX_HEALTH, 24.0).add(Attributes.ATTACK_DAMAGE, 5.0);
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         if (this.isJohnny) {
-            jt.putBoolean("Johnny", true);
+            le.putBoolean("Johnny", true);
         }
     }
     
@@ -115,10 +111,10 @@ public class Vindicator extends AbstractIllager {
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("Johnny", 99)) {
-            this.isJohnny = jt.getBoolean("Johnny");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("Johnny", 99)) {
+            this.isJohnny = le.getBoolean("Johnny");
         }
     }
     
@@ -129,30 +125,30 @@ public class Vindicator extends AbstractIllager {
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        final SpawnGroupData alm2 = super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        final SpawnGroupData apo2 = super.finalizeSpawn(bqc, ane, apb, apo, le);
         ((GroundPathNavigation)this.getNavigation()).setCanOpenDoors(true);
-        this.populateDefaultEquipmentSlots(ajj);
-        this.populateDefaultEquipmentEnchantments(ajj);
-        return alm2;
+        this.populateDefaultEquipmentSlots(ane);
+        this.populateDefaultEquipmentEnchantments(ane);
+        return apo2;
     }
     
     @Override
-    protected void populateDefaultEquipmentSlots(final DifficultyInstance ajj) {
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
         if (this.getCurrentRaid() == null) {
             this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.IRON_AXE));
         }
     }
     
     @Override
-    public boolean isAlliedTo(final Entity akq) {
-        return super.isAlliedTo(akq) || (akq instanceof LivingEntity && ((LivingEntity)akq).getMobType() == MobType.ILLAGER && this.getTeam() == null && akq.getTeam() == null);
+    public boolean isAlliedTo(final Entity aom) {
+        return super.isAlliedTo(aom) || (aom instanceof LivingEntity && ((LivingEntity)aom).getMobType() == MobType.ILLAGER && this.getTeam() == null && aom.getTeam() == null);
     }
     
     @Override
-    public void setCustomName(@Nullable final Component lf) {
-        super.setCustomName(lf);
-        if (!this.isJohnny && lf != null && lf.getString().equals("Johnny")) {
+    public void setCustomName(@Nullable final Component mr) {
+        super.setCustomName(mr);
+        if (!this.isJohnny && mr != null && mr.getString().equals("Johnny")) {
             this.isJohnny = true;
         }
     }
@@ -168,62 +164,62 @@ public class Vindicator extends AbstractIllager {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.VINDICATOR_HURT;
     }
     
     @Override
     public void applyRaidBuffs(final int integer, final boolean boolean2) {
-        final ItemStack ben4 = new ItemStack(Items.IRON_AXE);
-        final Raid azn5 = this.getCurrentRaid();
+        final ItemStack bki4 = new ItemStack(Items.IRON_AXE);
+        final Raid bfh5 = this.getCurrentRaid();
         int integer2 = 1;
-        if (integer > azn5.getNumGroups(Difficulty.NORMAL)) {
+        if (integer > bfh5.getNumGroups(Difficulty.NORMAL)) {
             integer2 = 2;
         }
-        final boolean boolean3 = this.random.nextFloat() <= azn5.getEnchantOdds();
+        final boolean boolean3 = this.random.nextFloat() <= bfh5.getEnchantOdds();
         if (boolean3) {
             final Map<Enchantment, Integer> map8 = Maps.newHashMap();
             map8.put(Enchantments.SHARPNESS, integer2);
-            EnchantmentHelper.setEnchantments(map8, ben4);
+            EnchantmentHelper.setEnchantments(map8, bki4);
         }
-        this.setItemSlot(EquipmentSlot.MAINHAND, ben4);
+        this.setItemSlot(EquipmentSlot.MAINHAND, bki4);
     }
     
     static {
-        DOOR_BREAKING_PREDICATE = (aji -> aji == Difficulty.NORMAL || aji == Difficulty.HARD);
+        DOOR_BREAKING_PREDICATE = (and -> and == Difficulty.NORMAL || and == Difficulty.HARD);
     }
     
     class VindicatorMeleeAttackGoal extends MeleeAttackGoal {
-        public VindicatorMeleeAttackGoal(final Vindicator axm2) {
-            super(axm2, 1.0, false);
+        public VindicatorMeleeAttackGoal(final Vindicator bcq2) {
+            super(bcq2, 1.0, false);
         }
         
         @Override
-        protected double getAttackReachSqr(final LivingEntity akz) {
+        protected double getAttackReachSqr(final LivingEntity aoy) {
             if (this.mob.getVehicle() instanceof Ravager) {
                 final float float3 = this.mob.getVehicle().getBbWidth() - 0.1f;
-                return float3 * 2.0f * (float3 * 2.0f) + akz.getBbWidth();
+                return float3 * 2.0f * (float3 * 2.0f) + aoy.getBbWidth();
             }
-            return super.getAttackReachSqr(akz);
+            return super.getAttackReachSqr(aoy);
         }
     }
     
     static class VindicatorBreakDoorGoal extends BreakDoorGoal {
-        public VindicatorBreakDoorGoal(final Mob ala) {
-            super(ala, 6, Vindicator.DOOR_BREAKING_PREDICATE);
+        public VindicatorBreakDoorGoal(final Mob aoz) {
+            super(aoz, 6, Vindicator.DOOR_BREAKING_PREDICATE);
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
         }
         
         @Override
         public boolean canContinueToUse() {
-            final Vindicator axm2 = (Vindicator)this.mob;
-            return axm2.hasActiveRaid() && super.canContinueToUse();
+            final Vindicator bcq2 = (Vindicator)this.mob;
+            return bcq2.hasActiveRaid() && super.canContinueToUse();
         }
         
         @Override
         public boolean canUse() {
-            final Vindicator axm2 = (Vindicator)this.mob;
-            return axm2.hasActiveRaid() && axm2.random.nextInt(10) == 0 && super.canUse();
+            final Vindicator bcq2 = (Vindicator)this.mob;
+            return bcq2.hasActiveRaid() && bcq2.random.nextInt(10) == 0 && super.canUse();
         }
         
         @Override
@@ -234,8 +230,8 @@ public class Vindicator extends AbstractIllager {
     }
     
     static class VindicatorJohnnyAttackGoal extends NearestAttackableTargetGoal<LivingEntity> {
-        public VindicatorJohnnyAttackGoal(final Vindicator axm) {
-            super(axm, LivingEntity.class, 0, true, true, LivingEntity::attackable);
+        public VindicatorJohnnyAttackGoal(final Vindicator bcq) {
+            super(bcq, LivingEntity.class, 0, true, true, LivingEntity::attackable);
         }
         
         @Override
diff --git a/src/net/minecraft/world/entity/monster/Witch.java b/src/net/minecraft/world/entity/monster/Witch.java
index a385389..6b02e15 100644
--- a/src/net/minecraft/world/entity/monster/Witch.java
+++ b/src/net/minecraft/world/entity/monster/Witch.java
@@ -17,12 +17,16 @@ import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.alchemy.Potions;
 import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.item.alchemy.PotionUtils;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
@@ -55,14 +59,14 @@ public class Witch extends Raider implements RangedAttackMob {
     private NearestHealableRaiderTargetGoal<Raider> healRaidersGoal;
     private NearestAttackableWitchTargetGoal<Player> attackPlayersGoal;
     
-    public Witch(final EntityType<? extends Witch> aku, final Level bjw) {
-        super(aku, bjw);
+    public Witch(final EntityType<? extends Witch> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
     protected void registerGoals() {
         super.registerGoals();
-        this.healRaidersGoal = new NearestHealableRaiderTargetGoal<Raider>(this, Raider.class, true, akz -> akz != null && this.hasActiveRaid() && akz.getType() != EntityType.WITCH);
+        this.healRaidersGoal = new NearestHealableRaiderTargetGoal<Raider>(this, Raider.class, true, aoy -> aoy != null && this.hasActiveRaid() && aoy.getType() != EntityType.WITCH);
         this.attackPlayersGoal = new NearestAttackableWitchTargetGoal<Player>(this, Player.class, 10, true, false, null);
         this.goalSelector.addGoal(1, new FloatGoal(this));
         this.goalSelector.addGoal(2, new RangedAttackGoal(this, 1.0, 60, 10.0f));
@@ -86,7 +90,7 @@ public class Witch extends Raider implements RangedAttackMob {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.WITCH_HURT;
     }
     
@@ -103,11 +107,8 @@ public class Witch extends Raider implements RangedAttackMob {
         return this.getEntityData().<Boolean>get(Witch.DATA_USING_ITEM);
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(26.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 26.0).add(Attributes.MOVEMENT_SPEED, 0.25);
     }
     
     @Override
@@ -123,41 +124,43 @@ public class Witch extends Raider implements RangedAttackMob {
             if (this.isDrinkingPotion()) {
                 if (this.usingTime-- <= 0) {
                     this.setUsingItem(false);
-                    final ItemStack ben2 = this.getMainHandItem();
+                    final ItemStack bki2 = this.getMainHandItem();
                     this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
-                    if (ben2.getItem() == Items.POTION) {
-                        final List<MobEffectInstance> list3 = PotionUtils.getMobEffects(ben2);
+                    if (bki2.getItem() == Items.POTION) {
+                        final List<MobEffectInstance> list3 = PotionUtils.getMobEffects(bki2);
                         if (list3 != null) {
-                            for (final MobEffectInstance akk5 : list3) {
-                                this.addEffect(new MobEffectInstance(akk5));
+                            for (final MobEffectInstance aog5 : list3) {
+                                this.addEffect(new MobEffectInstance(aog5));
                             }
                         }
                     }
-                    this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).removeModifier(Witch.SPEED_MODIFIER_DRINKING);
+                    this.getAttribute(Attributes.MOVEMENT_SPEED).removeModifier(Witch.SPEED_MODIFIER_DRINKING);
                 }
             }
             else {
-                Potion bgd2 = null;
-                if (this.random.nextFloat() < 0.15f && this.isUnderLiquid(FluidTags.WATER) && !this.hasEffect(MobEffects.WATER_BREATHING)) {
-                    bgd2 = Potions.WATER_BREATHING;
+                Potion bmb2 = null;
+                if (this.random.nextFloat() < 0.15f && this.isEyeInFluid(FluidTags.WATER) && !this.hasEffect(MobEffects.WATER_BREATHING)) {
+                    bmb2 = Potions.WATER_BREATHING;
                 }
                 else if (this.random.nextFloat() < 0.15f && (this.isOnFire() || (this.getLastDamageSource() != null && this.getLastDamageSource().isFire())) && !this.hasEffect(MobEffects.FIRE_RESISTANCE)) {
-                    bgd2 = Potions.FIRE_RESISTANCE;
+                    bmb2 = Potions.FIRE_RESISTANCE;
                 }
                 else if (this.random.nextFloat() < 0.05f && this.getHealth() < this.getMaxHealth()) {
-                    bgd2 = Potions.HEALING;
+                    bmb2 = Potions.HEALING;
                 }
                 else if (this.random.nextFloat() < 0.5f && this.getTarget() != null && !this.hasEffect(MobEffects.MOVEMENT_SPEED) && this.getTarget().distanceToSqr(this) > 121.0) {
-                    bgd2 = Potions.SWIFTNESS;
+                    bmb2 = Potions.SWIFTNESS;
                 }
-                if (bgd2 != null) {
-                    this.setItemSlot(EquipmentSlot.MAINHAND, PotionUtils.setPotion(new ItemStack(Items.POTION), bgd2));
+                if (bmb2 != null) {
+                    this.setItemSlot(EquipmentSlot.MAINHAND, PotionUtils.setPotion(new ItemStack(Items.POTION), bmb2));
                     this.usingTime = this.getMainHandItem().getUseDuration();
                     this.setUsingItem(true);
-                    this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.WITCH_DRINK, this.getSoundSource(), 1.0f, 0.8f + this.random.nextFloat() * 0.4f);
-                    final AttributeInstance alr3 = this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED);
-                    alr3.removeModifier(Witch.SPEED_MODIFIER_DRINKING);
-                    alr3.addModifier(Witch.SPEED_MODIFIER_DRINKING);
+                    if (!this.isSilent()) {
+                        this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.WITCH_DRINK, this.getSoundSource(), 1.0f, 0.8f + this.random.nextFloat() * 0.4f);
+                    }
+                    final AttributeInstance apt3 = this.getAttribute(Attributes.MOVEMENT_SPEED);
+                    apt3.removeModifier(Witch.SPEED_MODIFIER_DRINKING);
+                    apt3.addTransientModifier(Witch.SPEED_MODIFIER_DRINKING);
                 }
             }
             if (this.random.nextFloat() < 7.5E-4f) {
@@ -185,57 +188,59 @@ public class Witch extends Raider implements RangedAttackMob {
     }
     
     @Override
-    protected float getDamageAfterMagicAbsorb(final DamageSource ajz, float float2) {
-        float2 = super.getDamageAfterMagicAbsorb(ajz, float2);
-        if (ajz.getEntity() == this) {
+    protected float getDamageAfterMagicAbsorb(final DamageSource anw, float float2) {
+        float2 = super.getDamageAfterMagicAbsorb(anw, float2);
+        if (anw.getEntity() == this) {
             float2 = 0.0f;
         }
-        if (ajz.isMagic()) {
+        if (anw.isMagic()) {
             float2 *= (float)0.15;
         }
         return float2;
     }
     
     @Override
-    public void performRangedAttack(final LivingEntity akz, final float float2) {
+    public void performRangedAttack(final LivingEntity aoy, final float float2) {
         if (this.isDrinkingPotion()) {
             return;
         }
-        final Vec3 cvl4 = akz.getDeltaMovement();
-        final double double5 = akz.getX() + cvl4.x - this.getX();
-        final double double6 = akz.getEyeY() - 1.100000023841858 - this.getY();
-        final double double7 = akz.getZ() + cvl4.z - this.getZ();
+        final Vec3 dem4 = aoy.getDeltaMovement();
+        final double double5 = aoy.getX() + dem4.x - this.getX();
+        final double double6 = aoy.getEyeY() - 1.100000023841858 - this.getY();
+        final double double7 = aoy.getZ() + dem4.z - this.getZ();
         final float float3 = Mth.sqrt(double5 * double5 + double7 * double7);
-        Potion bgd12 = Potions.HARMING;
-        if (akz instanceof Raider) {
-            if (akz.getHealth() <= 4.0f) {
-                bgd12 = Potions.HEALING;
+        Potion bmb12 = Potions.HARMING;
+        if (aoy instanceof Raider) {
+            if (aoy.getHealth() <= 4.0f) {
+                bmb12 = Potions.HEALING;
             }
             else {
-                bgd12 = Potions.REGENERATION;
+                bmb12 = Potions.REGENERATION;
             }
             this.setTarget(null);
         }
-        else if (float3 >= 8.0f && !akz.hasEffect(MobEffects.MOVEMENT_SLOWDOWN)) {
-            bgd12 = Potions.SLOWNESS;
+        else if (float3 >= 8.0f && !aoy.hasEffect(MobEffects.MOVEMENT_SLOWDOWN)) {
+            bmb12 = Potions.SLOWNESS;
         }
-        else if (akz.getHealth() >= 8.0f && !akz.hasEffect(MobEffects.POISON)) {
-            bgd12 = Potions.POISON;
+        else if (aoy.getHealth() >= 8.0f && !aoy.hasEffect(MobEffects.POISON)) {
+            bmb12 = Potions.POISON;
         }
-        else if (float3 <= 3.0f && !akz.hasEffect(MobEffects.WEAKNESS) && this.random.nextFloat() < 0.25f) {
-            bgd12 = Potions.WEAKNESS;
+        else if (float3 <= 3.0f && !aoy.hasEffect(MobEffects.WEAKNESS) && this.random.nextFloat() < 0.25f) {
+            bmb12 = Potions.WEAKNESS;
         }
-        final ThrownPotion azj13 = new ThrownPotion(this.level, this);
-        azj13.setItem(PotionUtils.setPotion(new ItemStack(Items.SPLASH_POTION), bgd12));
-        final ThrownPotion thrownPotion = azj13;
+        final ThrownPotion bfd13 = new ThrownPotion(this.level, this);
+        bfd13.setItem(PotionUtils.setPotion(new ItemStack(Items.SPLASH_POTION), bmb12));
+        final ThrownPotion thrownPotion = bfd13;
         thrownPotion.xRot += 20.0f;
-        azj13.shoot(double5, double6 + float3 * 0.2f, double7, 0.75f, 8.0f);
-        this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.WITCH_THROW, this.getSoundSource(), 1.0f, 0.8f + this.random.nextFloat() * 0.4f);
-        this.level.addFreshEntity(azj13);
+        bfd13.shoot(double5, double6 + float3 * 0.2f, double7, 0.75f, 8.0f);
+        if (!this.isSilent()) {
+            this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.WITCH_THROW, this.getSoundSource(), 1.0f, 0.8f + this.random.nextFloat() * 0.4f);
+        }
+        this.level.addFreshEntity(bfd13);
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 1.62f;
     }
     
@@ -250,7 +255,7 @@ public class Witch extends Raider implements RangedAttackMob {
     
     static {
         SPEED_MODIFIER_DRINKING_UUID = UUID.fromString("5CD17E52-A79A-43D3-A529-90FDE04B181E");
-        SPEED_MODIFIER_DRINKING = new AttributeModifier(Witch.SPEED_MODIFIER_DRINKING_UUID, "Drinking speed penalty", -0.25, AttributeModifier.Operation.ADDITION).setSerialize(false);
+        SPEED_MODIFIER_DRINKING = new AttributeModifier(Witch.SPEED_MODIFIER_DRINKING_UUID, "Drinking speed penalty", -0.25, AttributeModifier.Operation.ADDITION);
         DATA_USING_ITEM = SynchedEntityData.<Boolean>defineId(Witch.class, EntityDataSerializers.BOOLEAN);
     }
 }
diff --git a/src/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/net/minecraft/world/entity/monster/WitherSkeleton.java
index d19c895..d9a410e 100644
--- a/src/net/minecraft/world/entity/monster/WitherSkeleton.java
+++ b/src/net/minecraft/world/entity/monster/WitherSkeleton.java
@@ -6,6 +6,7 @@ import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.nbt.CompoundTag;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.SpawnGroupData;
@@ -20,23 +21,33 @@ import net.minecraft.world.item.Items;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
+import net.minecraft.world.entity.monster.piglin.Piglin;
 import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class WitherSkeleton extends AbstractSkeleton {
-    public WitherSkeleton(final EntityType<? extends WitherSkeleton> aku, final Level bjw) {
-        super(aku, bjw);
+    public WitherSkeleton(final EntityType<? extends WitherSkeleton> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0f);
     }
     
+    @Override
+    protected void registerGoals() {
+        this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Piglin.class, true));
+        super.registerGoals();
+    }
+    
     @Override
     protected SoundEvent getAmbientSound() {
         return SoundEvents.WITHER_SKELETON_AMBIENT;
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.WITHER_SKELETON_HURT;
     }
     
@@ -51,61 +62,61 @@ public class WitherSkeleton extends AbstractSkeleton {
     }
     
     @Override
-    protected void dropCustomDeathLoot(final DamageSource ajz, final int integer, final boolean boolean3) {
-        super.dropCustomDeathLoot(ajz, integer, boolean3);
-        final Entity akq5 = ajz.getEntity();
-        if (akq5 instanceof Creeper) {
-            final Creeper awi6 = (Creeper)akq5;
-            if (awi6.canDropMobsSkull()) {
-                awi6.increaseDroppedSkulls();
+    protected void dropCustomDeathLoot(final DamageSource anw, final int integer, final boolean boolean3) {
+        super.dropCustomDeathLoot(anw, integer, boolean3);
+        final Entity aom5 = anw.getEntity();
+        if (aom5 instanceof Creeper) {
+            final Creeper bbn6 = (Creeper)aom5;
+            if (bbn6.canDropMobsSkull()) {
+                bbn6.increaseDroppedSkulls();
                 this.spawnAtLocation(Items.WITHER_SKELETON_SKULL);
             }
         }
     }
     
     @Override
-    protected void populateDefaultEquipmentSlots(final DifficultyInstance ajj) {
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
         this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.STONE_SWORD));
     }
     
     @Override
-    protected void populateDefaultEquipmentEnchantments(final DifficultyInstance ajj) {
+    protected void populateDefaultEquipmentEnchantments(final DifficultyInstance ane) {
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        final SpawnGroupData alm2 = super.finalizeSpawn(bjx, ajj, alc, alm, jt);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(4.0);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        final SpawnGroupData apo2 = super.finalizeSpawn(bqc, ane, apb, apo, le);
+        this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(4.0);
         this.reassessWeaponGoal();
-        return alm2;
+        return apo2;
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return 2.1f;
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        if (!super.doHurtTarget(akq)) {
+    public boolean doHurtTarget(final Entity aom) {
+        if (!super.doHurtTarget(aom)) {
             return false;
         }
-        if (akq instanceof LivingEntity) {
-            ((LivingEntity)akq).addEffect(new MobEffectInstance(MobEffects.WITHER, 200));
+        if (aom instanceof LivingEntity) {
+            ((LivingEntity)aom).addEffect(new MobEffectInstance(MobEffects.WITHER, 200));
         }
         return true;
     }
     
     @Override
-    protected AbstractArrow getArrow(final ItemStack ben, final float float2) {
-        final AbstractArrow ayn4 = super.getArrow(ben, float2);
-        ayn4.setSecondsOnFire(100);
-        return ayn4;
+    protected AbstractArrow getArrow(final ItemStack bki, final float float2) {
+        final AbstractArrow beg4 = super.getArrow(bki, float2);
+        beg4.setSecondsOnFire(100);
+        return beg4;
     }
     
     @Override
-    public boolean canBeAffected(final MobEffectInstance akk) {
-        return akk.getEffect() != MobEffects.WITHER && super.canBeAffected(akk);
+    public boolean canBeAffected(final MobEffectInstance aog) {
+        return aog.getEffect() != MobEffects.WITHER && super.canBeAffected(aog);
     }
 }
diff --git a/src/net/minecraft/world/entity/monster/Zoglin.java b/src/net/minecraft/world/entity/monster/Zoglin.java
new file mode 100644
index 0000000..4ac672f
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/Zoglin.java
@@ -0,0 +1,282 @@
+package net.minecraft.world.entity.monster;
+
+import net.minecraft.network.syncher.SynchedEntityData;
+import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.MobType;
+import net.minecraft.network.protocol.game.DebugPackets;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.ai.behavior.BehaviorUtils;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.entity.EntitySelector;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.LivingEntity;
+import java.util.Optional;
+import net.minecraft.world.entity.ai.behavior.StopAttackingIfTargetInvalid;
+import net.minecraft.world.entity.ai.behavior.MeleeAttack;
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetFromAttackTargetIfTargetOutOfReach;
+import java.util.List;
+import net.minecraft.world.entity.ai.behavior.DoNothing;
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetFromLookTarget;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.world.entity.ai.behavior.RandomStroll;
+import net.minecraft.util.IntRange;
+import net.minecraft.world.entity.ai.behavior.SetEntityLookTarget;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+import net.minecraft.world.entity.ai.behavior.MoveToTargetSink;
+import net.minecraft.world.entity.ai.behavior.LookAtTargetSink;
+import java.util.Set;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.schedule.Activity;
+import com.mojang.serialization.Dynamic;
+import java.util.Collection;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.sensing.Sensor;
+import net.minecraft.world.entity.ai.sensing.SensorType;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.monster.hoglin.HoglinBase;
+
+public class Zoglin extends Monster implements Enemy, HoglinBase {
+    private static final EntityDataAccessor<Boolean> DATA_BABY_ID;
+    private int attackAnimationRemainingTicks;
+    protected static final ImmutableList<? extends SensorType<? extends Sensor<? super Zoglin>>> SENSOR_TYPES;
+    protected static final ImmutableList<? extends MemoryModuleType<?>> MEMORY_TYPES;
+    
+    public Zoglin(final EntityType<? extends Zoglin> aoq, final Level bqb) {
+        super(aoq, bqb);
+        this.xpReward = 5;
+    }
+    
+    @Override
+    protected Brain.Provider<Zoglin> brainProvider() {
+        return Brain.<Zoglin>provider(Zoglin.MEMORY_TYPES, Zoglin.SENSOR_TYPES);
+    }
+    
+    @Override
+    protected Brain<?> makeBrain(final Dynamic<?> dynamic) {
+        final Brain<Zoglin> apr3 = this.brainProvider().makeBrain(dynamic);
+        initCoreActivity(apr3);
+        initIdleActivity(apr3);
+        initFightActivity(apr3);
+        apr3.setCoreActivities(ImmutableSet.<Activity>of(Activity.CORE));
+        apr3.setDefaultActivity(Activity.IDLE);
+        apr3.useDefaultActivity();
+        return apr3;
+    }
+    
+    private static void initCoreActivity(final Brain<Zoglin> apr) {
+        apr.addActivity(Activity.CORE, 0, ImmutableList.of(new LookAtTargetSink(45, 90), new MoveToTargetSink(200)));
+    }
+    
+    private static void initIdleActivity(final Brain<Zoglin> apr) {
+        apr.addActivity(Activity.IDLE, 10, ImmutableList.of(new Behavior(Zoglin::findNearestValidAttackTarget), new Behavior(new SetEntityLookTarget(8.0f), IntRange.of(30, 60)), new Behavior(ImmutableList.of(Pair.of(new RandomStroll(0.4f), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4f, 3), 2), Pair.of(new DoNothing(30, 60), 1)))));
+    }
+    
+    private static void initFightActivity(final Brain<Zoglin> apr) {
+        apr.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0f), new Behavior(Zoglin::isAdult, new MeleeAttack(40)), new Behavior(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid()), MemoryModuleType.ATTACK_TARGET);
+    }
+    
+    private Optional<? extends LivingEntity> findNearestValidAttackTarget() {
+        return this.getBrain().<List<LivingEntity>>getMemory(MemoryModuleType.VISIBLE_LIVING_ENTITIES).orElse(ImmutableList.of()).stream().filter(Zoglin::isTargetable).findFirst();
+    }
+    
+    private static boolean isTargetable(final LivingEntity aoy) {
+        final EntityType<?> aoq2 = aoy.getType();
+        return aoq2 != EntityType.ZOGLIN && aoq2 != EntityType.CREEPER && EntitySelector.ATTACK_ALLOWED.test(aoy);
+    }
+    
+    @Override
+    protected void defineSynchedData() {
+        super.defineSynchedData();
+        this.entityData.<Boolean>define(Zoglin.DATA_BABY_ID, false);
+    }
+    
+    @Override
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        super.onSyncedDataUpdated(tq);
+        if (Zoglin.DATA_BABY_ID.equals(tq)) {
+            this.refreshDimensions();
+        }
+    }
+    
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 40.0).add(Attributes.MOVEMENT_SPEED, 0.30000001192092896).add(Attributes.KNOCKBACK_RESISTANCE, 0.6000000238418579).add(Attributes.ATTACK_KNOCKBACK, 1.0).add(Attributes.ATTACK_DAMAGE, 6.0);
+    }
+    
+    public boolean isAdult() {
+        return !this.isBaby();
+    }
+    
+    @Override
+    public boolean doHurtTarget(final Entity aom) {
+        if (!(aom instanceof LivingEntity)) {
+            return false;
+        }
+        this.attackAnimationRemainingTicks = 10;
+        this.level.broadcastEntityEvent(this, (byte)4);
+        this.playSound(SoundEvents.ZOGLIN_ATTACK, 1.0f, this.getVoicePitch());
+        return HoglinBase.hurtAndThrowTarget(this, (LivingEntity)aom);
+    }
+    
+    @Override
+    protected void blockedByShield(final LivingEntity aoy) {
+        if (!this.isBaby()) {
+            HoglinBase.throwTarget(this, aoy);
+        }
+    }
+    
+    @Override
+    public boolean hurt(final DamageSource anw, final float float2) {
+        final boolean boolean4 = super.hurt(anw, float2);
+        if (this.level.isClientSide) {
+            return false;
+        }
+        if (!boolean4 || !(anw.getEntity() instanceof LivingEntity)) {
+            return boolean4;
+        }
+        final LivingEntity aoy5 = (LivingEntity)anw.getEntity();
+        if (EntitySelector.ATTACK_ALLOWED.test(aoy5) && !BehaviorUtils.isOtherTargetMuchFurtherAwayThanCurrentAttackTarget(this, aoy5, 4.0)) {
+            this.setAttackTarget(aoy5);
+        }
+        return boolean4;
+    }
+    
+    private void setAttackTarget(final LivingEntity aoy) {
+        this.brain.<Long>eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
+        this.brain.<LivingEntity>setMemoryWithExpiry(MemoryModuleType.ATTACK_TARGET, aoy, 200L);
+    }
+    
+    @Override
+    public Brain<Zoglin> getBrain() {
+        return (Brain<Zoglin>)super.getBrain();
+    }
+    
+    protected void updateActivity() {
+        final Activity bfl2 = this.brain.getActiveNonCoreActivity().orElse(null);
+        this.brain.setActiveActivityToFirstValid(ImmutableList.<Activity>of(Activity.FIGHT, Activity.IDLE));
+        final Activity bfl3 = this.brain.getActiveNonCoreActivity().orElse(null);
+        if (bfl3 == Activity.FIGHT && bfl2 != Activity.FIGHT) {
+            this.playAngrySound();
+        }
+        this.setAggressive(this.brain.hasMemoryValue(MemoryModuleType.ATTACK_TARGET));
+    }
+    
+    @Override
+    protected void customServerAiStep() {
+        this.level.getProfiler().push("zoglinBrain");
+        this.getBrain().tick((ServerLevel)this.level, this);
+        this.level.getProfiler().pop();
+        this.updateActivity();
+    }
+    
+    @Override
+    public void setBaby(final boolean boolean1) {
+        this.getEntityData().<Boolean>set(Zoglin.DATA_BABY_ID, boolean1);
+        if (!this.level.isClientSide && boolean1) {
+            this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(0.5);
+        }
+    }
+    
+    @Override
+    public boolean isBaby() {
+        return this.getEntityData().<Boolean>get(Zoglin.DATA_BABY_ID);
+    }
+    
+    @Override
+    public void aiStep() {
+        if (this.attackAnimationRemainingTicks > 0) {
+            --this.attackAnimationRemainingTicks;
+        }
+        super.aiStep();
+    }
+    
+    @Override
+    public void handleEntityEvent(final byte byte1) {
+        if (byte1 == 4) {
+            this.attackAnimationRemainingTicks = 10;
+            this.playSound(SoundEvents.ZOGLIN_ATTACK, 1.0f, this.getVoicePitch());
+        }
+        else {
+            super.handleEntityEvent(byte1);
+        }
+    }
+    
+    @Override
+    public int getAttackAnimationRemainingTicks() {
+        return this.attackAnimationRemainingTicks;
+    }
+    
+    @Override
+    protected SoundEvent getAmbientSound() {
+        if (this.level.isClientSide) {
+            return null;
+        }
+        if (this.brain.hasMemoryValue(MemoryModuleType.ATTACK_TARGET)) {
+            return SoundEvents.ZOGLIN_ANGRY;
+        }
+        return SoundEvents.ZOGLIN_AMBIENT;
+    }
+    
+    @Override
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        return SoundEvents.ZOGLIN_HURT;
+    }
+    
+    @Override
+    protected SoundEvent getDeathSound() {
+        return SoundEvents.ZOGLIN_DEATH;
+    }
+    
+    @Override
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
+        this.playSound(SoundEvents.ZOGLIN_STEP, 0.15f, 1.0f);
+    }
+    
+    protected void playAngrySound() {
+        this.playSound(SoundEvents.ZOGLIN_ANGRY, 1.0f, this.getVoicePitch());
+    }
+    
+    @Override
+    protected void sendDebugPackets() {
+        super.sendDebugPackets();
+        DebugPackets.sendEntityBrain(this);
+    }
+    
+    @Override
+    public MobType getMobType() {
+        return MobType.UNDEAD;
+    }
+    
+    @Override
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        if (this.isBaby()) {
+            le.putBoolean("IsBaby", true);
+        }
+    }
+    
+    @Override
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.getBoolean("IsBaby")) {
+            this.setBaby(true);
+        }
+    }
+    
+    static {
+        DATA_BABY_ID = SynchedEntityData.<Boolean>defineId(Zoglin.class, EntityDataSerializers.BOOLEAN);
+        SENSOR_TYPES = ImmutableList.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_PLAYERS);
+        MEMORY_TYPES = ImmutableList.of(MemoryModuleType.LIVING_ENTITIES, MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryModuleType.NEAREST_VISIBLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, MemoryModuleType.LOOK_TARGET, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.PATH, MemoryModuleType.ATTACK_TARGET, MemoryModuleType.ATTACK_COOLING_DOWN);
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/Zombie.java b/src/net/minecraft/world/entity/monster/Zombie.java
index da84ec9..d05d65e 100644
--- a/src/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/net/minecraft/world/entity/monster/Zombie.java
@@ -4,7 +4,6 @@ import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.entity.ai.goal.RemoveBlockGoal;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
-import net.minecraft.world.entity.ai.attributes.RangedAttribute;
 import java.util.Random;
 import java.util.List;
 import net.minecraft.world.level.block.Blocks;
@@ -16,9 +15,8 @@ import net.minecraft.world.entity.animal.Chicken;
 import javax.annotation.Nullable;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import net.minecraft.nbt.NbtOps;
-import net.minecraft.nbt.Tag;
 import net.minecraft.world.entity.npc.Villager;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.Items;
@@ -29,22 +27,25 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.SpawnGroupData;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.MobSpawnType;
-import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.NaturalSpawner;
+import net.minecraft.world.entity.SpawnPlacements;
+import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.SpawnEggItem;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.animal.Turtle;
 import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.entity.npc.AbstractVillager;
@@ -68,10 +69,8 @@ import java.util.function.Predicate;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import java.util.UUID;
-import net.minecraft.world.entity.ai.attributes.Attribute;
 
 public class Zombie extends Monster {
-    protected static final Attribute SPAWN_REINFORCEMENTS_CHANCE;
     private static final UUID SPEED_MODIFIER_BABY_UUID;
     private static final AttributeModifier SPEED_MODIFIER_BABY;
     private static final EntityDataAccessor<Boolean> DATA_BABY_ID;
@@ -83,13 +82,13 @@ public class Zombie extends Monster {
     private int inWaterTime;
     private int conversionTime;
     
-    public Zombie(final EntityType<? extends Zombie> aku, final Level bjw) {
-        super(aku, bjw);
+    public Zombie(final EntityType<? extends Zombie> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.breakDoorGoal = new BreakDoorGoal(this, Zombie.DOOR_BREAKING_PREDICATE);
     }
     
-    public Zombie(final Level bjw) {
-        this(EntityType.ZOMBIE, bjw);
+    public Zombie(final Level bqb) {
+        this(EntityType.ZOMBIE, bqb);
     }
     
     @Override
@@ -104,21 +103,15 @@ public class Zombie extends Monster {
         this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0, false));
         this.goalSelector.addGoal(6, new MoveThroughVillageGoal(this, 1.0, true, 4, this::canBreakDoors));
         this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0));
-        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]).setAlertOthers(PigZombie.class));
+        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]).setAlertOthers(ZombifiedPiglin.class));
         this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false));
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
         this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(35.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.23000000417232513);
-        this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(3.0);
-        this.getAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(2.0);
-        this.getAttributes().registerAttribute(Zombie.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * 0.10000000149011612);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.FOLLOW_RANGE, 35.0).add(Attributes.MOVEMENT_SPEED, 0.23000000417232513).add(Attributes.ATTACK_DAMAGE, 3.0).add(Attributes.ARMOR, 2.0).add(Attributes.SPAWN_REINFORCEMENTS_CHANCE);
     }
     
     @Override
@@ -166,30 +159,31 @@ public class Zombie extends Monster {
     }
     
     @Override
-    protected int getExperienceReward(final Player ayj) {
+    protected int getExperienceReward(final Player bec) {
         if (this.isBaby()) {
             this.xpReward *= (int)2.5f;
         }
-        return super.getExperienceReward(ayj);
+        return super.getExperienceReward(bec);
     }
     
+    @Override
     public void setBaby(final boolean boolean1) {
         this.getEntityData().<Boolean>set(Zombie.DATA_BABY_ID, boolean1);
         if (this.level != null && !this.level.isClientSide) {
-            final AttributeInstance alr3 = this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED);
-            alr3.removeModifier(Zombie.SPEED_MODIFIER_BABY);
+            final AttributeInstance apt3 = this.getAttribute(Attributes.MOVEMENT_SPEED);
+            apt3.removeModifier(Zombie.SPEED_MODIFIER_BABY);
             if (boolean1) {
-                alr3.addModifier(Zombie.SPEED_MODIFIER_BABY);
+                apt3.addTransientModifier(Zombie.SPEED_MODIFIER_BABY);
             }
         }
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (Zombie.DATA_BABY_ID.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (Zombie.DATA_BABY_ID.equals(tq)) {
             this.refreshDimensions();
         }
-        super.onSyncedDataUpdated(sb);
+        super.onSyncedDataUpdated(tq);
     }
     
     protected boolean convertsInWater() {
@@ -198,7 +192,7 @@ public class Zombie extends Monster {
     
     @Override
     public void tick() {
-        if (!this.level.isClientSide && this.isAlive()) {
+        if (!this.level.isClientSide && this.isAlive() && !this.isNoAi()) {
             if (this.isUnderWaterConverting()) {
                 --this.conversionTime;
                 if (this.conversionTime < 0) {
@@ -206,7 +200,7 @@ public class Zombie extends Monster {
                 }
             }
             else if (this.convertsInWater()) {
-                if (this.isUnderLiquid(FluidTags.WATER)) {
+                if (this.isEyeInFluid(FluidTags.WATER)) {
                     ++this.inWaterTime;
                     if (this.inWaterTime >= 600) {
                         this.startUnderWaterConversion(300);
@@ -225,11 +219,11 @@ public class Zombie extends Monster {
         if (this.isAlive()) {
             boolean boolean2 = this.isSunSensitive() && this.isSunBurnTick();
             if (boolean2) {
-                final ItemStack ben3 = this.getItemBySlot(EquipmentSlot.HEAD);
-                if (!ben3.isEmpty()) {
-                    if (ben3.isDamageableItem()) {
-                        ben3.setDamageValue(ben3.getDamageValue() + this.random.nextInt(2));
-                        if (ben3.getDamageValue() >= ben3.getMaxDamage()) {
+                final ItemStack bki3 = this.getItemBySlot(EquipmentSlot.HEAD);
+                if (!bki3.isEmpty()) {
+                    if (bki3.isDamageableItem()) {
+                        bki3.setDamageValue(bki3.getDamageValue() + this.random.nextInt(2));
+                        if (bki3.getDamageValue() >= bki3.getMaxDamage()) {
                             this.broadcastBreakEvent(EquipmentSlot.HEAD);
                             this.setItemSlot(EquipmentSlot.HEAD, ItemStack.EMPTY);
                         }
@@ -250,62 +244,18 @@ public class Zombie extends Monster {
     }
     
     protected void doUnderWaterConversion() {
-        this.convertTo(EntityType.DROWNED);
-        this.level.levelEvent(null, 1040, new BlockPos(this), 0);
+        this.convertToZombieType(EntityType.DROWNED);
+        if (!this.isSilent()) {
+            this.level.levelEvent(null, 1040, this.blockPosition(), 0);
+        }
     }
     
-    protected void convertTo(final EntityType<? extends Zombie> aku) {
-        if (this.removed) {
-            return;
+    protected void convertToZombieType(final EntityType<? extends Zombie> aoq) {
+        final Zombie bcu3 = this.<Zombie>convertTo(aoq);
+        if (bcu3 != null) {
+            bcu3.handleAttributes(bcu3.level.getCurrentDifficultyAt(bcu3.blockPosition()).getSpecialMultiplier());
+            bcu3.setCanBreakDoors(bcu3.supportsBreakDoorGoal() && this.canBreakDoors());
         }
-        final Zombie axp3 = (Zombie)aku.create(this.level);
-        axp3.copyPosition(this);
-        axp3.setCanPickUpLoot(this.canPickUpLoot());
-        axp3.setCanBreakDoors(axp3.supportsBreakDoorGoal() && this.canBreakDoors());
-        axp3.handleAttributes(axp3.level.getCurrentDifficultyAt(new BlockPos(axp3)).getSpecialMultiplier());
-        axp3.setBaby(this.isBaby());
-        axp3.setNoAi(this.isNoAi());
-        for (final EquipmentSlot akv7 : EquipmentSlot.values()) {
-            final ItemStack ben8 = this.getItemBySlot(akv7);
-            if (!ben8.isEmpty()) {
-                axp3.setItemSlot(akv7, ben8.copy());
-                axp3.setDropChance(akv7, this.getEquipmentDropChance(akv7));
-                ben8.setCount(0);
-            }
-        }
-        if (this.hasCustomName()) {
-            axp3.setCustomName(this.getCustomName());
-            axp3.setCustomNameVisible(this.isCustomNameVisible());
-        }
-        if (this.isPersistenceRequired()) {
-            axp3.setPersistenceRequired();
-        }
-        axp3.setInvulnerable(this.isInvulnerable());
-        this.level.addFreshEntity(axp3);
-        this.remove();
-    }
-    
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        final Item bei5 = ben4.getItem();
-        if (bei5 instanceof SpawnEggItem && ((SpawnEggItem)bei5).spawnsEntity(ben4.getTag(), this.getType())) {
-            if (!this.level.isClientSide) {
-                final Zombie axp6 = (Zombie)this.getType().create(this.level);
-                if (axp6 != null) {
-                    axp6.setBaby(true);
-                    axp6.moveTo(this.getX(), this.getY(), this.getZ(), 0.0f, 0.0f);
-                    this.level.addFreshEntity(axp6);
-                    if (ben4.hasCustomHoverName()) {
-                        axp6.setCustomName(ben4.getHoverName());
-                    }
-                    if (!ayj.abilities.instabuild) {
-                        ben4.shrink(1);
-                    }
-                }
-            }
-            return true;
-        }
-        return super.mobInteract(ayj, ajk);
     }
     
     protected boolean isSunSensitive() {
@@ -313,30 +263,32 @@ public class Zombie extends Monster {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (super.hurt(ajz, float2)) {
-            LivingEntity akz4 = this.getTarget();
-            if (akz4 == null && ajz.getEntity() instanceof LivingEntity) {
-                akz4 = (LivingEntity)ajz.getEntity();
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (super.hurt(anw, float2)) {
+            LivingEntity aoy4 = this.getTarget();
+            if (aoy4 == null && anw.getEntity() instanceof LivingEntity) {
+                aoy4 = (LivingEntity)anw.getEntity();
             }
-            if (akz4 != null && this.level.getDifficulty() == Difficulty.HARD && this.random.nextFloat() < this.getAttribute(Zombie.SPAWN_REINFORCEMENTS_CHANCE).getValue() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
+            if (aoy4 != null && this.level.getDifficulty() == Difficulty.HARD && this.random.nextFloat() < this.getAttributeValue(Attributes.SPAWN_REINFORCEMENTS_CHANCE) && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
                 final int integer5 = Mth.floor(this.getX());
                 final int integer6 = Mth.floor(this.getY());
                 final int integer7 = Mth.floor(this.getZ());
-                final Zombie axp8 = new Zombie(this.level);
+                final Zombie bcu8 = new Zombie(this.level);
                 for (int integer8 = 0; integer8 < 50; ++integer8) {
                     final int integer9 = integer5 + Mth.nextInt(this.random, 7, 40) * Mth.nextInt(this.random, -1, 1);
                     final int integer10 = integer6 + Mth.nextInt(this.random, 7, 40) * Mth.nextInt(this.random, -1, 1);
                     final int integer11 = integer7 + Mth.nextInt(this.random, 7, 40) * Mth.nextInt(this.random, -1, 1);
-                    final BlockPos fk13 = new BlockPos(integer9, integer10 - 1, integer11);
-                    if (this.level.getBlockState(fk13).entityCanStandOn(this.level, fk13, axp8) && this.level.getMaxLocalRawBrightness(new BlockPos(integer9, integer10, integer11)) < 10) {
-                        axp8.setPos(integer9, integer10, integer11);
-                        if (!this.level.hasNearbyAlivePlayer(integer9, integer10, integer11, 7.0) && this.level.isUnobstructed(axp8) && this.level.noCollision(axp8) && !this.level.containsAnyLiquid(axp8.getBoundingBox())) {
-                            this.level.addFreshEntity(axp8);
-                            axp8.setTarget(akz4);
-                            axp8.finalizeSpawn(this.level, this.level.getCurrentDifficultyAt(new BlockPos(axp8)), MobSpawnType.REINFORCEMENT, null, null);
-                            this.getAttribute(Zombie.SPAWN_REINFORCEMENTS_CHANCE).addModifier(new AttributeModifier("Zombie reinforcement caller charge", -0.05000000074505806, AttributeModifier.Operation.ADDITION));
-                            axp8.getAttribute(Zombie.SPAWN_REINFORCEMENTS_CHANCE).addModifier(new AttributeModifier("Zombie reinforcement callee charge", -0.05000000074505806, AttributeModifier.Operation.ADDITION));
+                    final BlockPos fu13 = new BlockPos(integer9, integer10, integer11);
+                    final EntityType<?> aoq14 = bcu8.getType();
+                    final SpawnPlacements.Type c15 = SpawnPlacements.getPlacementType(aoq14);
+                    if (NaturalSpawner.isSpawnPositionOk(c15, this.level, fu13, aoq14) && SpawnPlacements.checkSpawnRules(aoq14, this.level, MobSpawnType.REINFORCEMENT, fu13, this.level.random)) {
+                        bcu8.setPos(integer9, integer10, integer11);
+                        if (!this.level.hasNearbyAlivePlayer(integer9, integer10, integer11, 7.0) && this.level.isUnobstructed(bcu8) && this.level.noCollision(bcu8) && !this.level.containsAnyLiquid(bcu8.getBoundingBox())) {
+                            this.level.addFreshEntity(bcu8);
+                            bcu8.setTarget(aoy4);
+                            bcu8.finalizeSpawn(this.level, this.level.getCurrentDifficultyAt(bcu8.blockPosition()), MobSpawnType.REINFORCEMENT, null, null);
+                            this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).addPermanentModifier(new AttributeModifier("Zombie reinforcement caller charge", -0.05000000074505806, AttributeModifier.Operation.ADDITION));
+                            bcu8.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).addPermanentModifier(new AttributeModifier("Zombie reinforcement callee charge", -0.05000000074505806, AttributeModifier.Operation.ADDITION));
                             break;
                         }
                     }
@@ -348,12 +300,12 @@ public class Zombie extends Monster {
     }
     
     @Override
-    public boolean doHurtTarget(final Entity akq) {
-        final boolean boolean3 = super.doHurtTarget(akq);
+    public boolean doHurtTarget(final Entity aom) {
+        final boolean boolean3 = super.doHurtTarget(aom);
         if (boolean3) {
-            final float float4 = this.level.getCurrentDifficultyAt(new BlockPos(this)).getEffectiveDifficulty();
+            final float float4 = this.level.getCurrentDifficultyAt(this.blockPosition()).getEffectiveDifficulty();
             if (this.getMainHandItem().isEmpty() && this.isOnFire() && this.random.nextFloat() < float4 * 0.3f) {
-                akq.setSecondsOnFire(2 * (int)float4);
+                aom.setSecondsOnFire(2 * (int)float4);
             }
         }
         return boolean3;
@@ -365,7 +317,7 @@ public class Zombie extends Monster {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.ZOMBIE_HURT;
     }
     
@@ -379,7 +331,7 @@ public class Zombie extends Monster {
     }
     
     @Override
-    protected void playStepSound(final BlockPos fk, final BlockState byj) {
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
         this.playSound(this.getStepSound(), 0.15f, 1.0f);
     }
     
@@ -389,8 +341,8 @@ public class Zombie extends Monster {
     }
     
     @Override
-    protected void populateDefaultEquipmentSlots(final DifficultyInstance ajj) {
-        super.populateDefaultEquipmentSlots(ajj);
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
+        super.populateDefaultEquipmentSlots(ane);
         if (this.random.nextFloat() < ((this.level.getDifficulty() == Difficulty.HARD) ? 0.05f : 0.01f)) {
             final int integer3 = this.random.nextInt(3);
             if (integer3 == 0) {
@@ -403,103 +355,107 @@ public class Zombie extends Monster {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         if (this.isBaby()) {
-            jt.putBoolean("IsBaby", true);
+            le.putBoolean("IsBaby", true);
         }
-        jt.putBoolean("CanBreakDoors", this.canBreakDoors());
-        jt.putInt("InWaterTime", this.isInWater() ? this.inWaterTime : -1);
-        jt.putInt("DrownedConversionTime", this.isUnderWaterConverting() ? this.conversionTime : -1);
+        le.putBoolean("CanBreakDoors", this.canBreakDoors());
+        le.putInt("InWaterTime", this.isInWater() ? this.inWaterTime : -1);
+        le.putInt("DrownedConversionTime", this.isUnderWaterConverting() ? this.conversionTime : -1);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.getBoolean("IsBaby")) {
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.getBoolean("IsBaby")) {
             this.setBaby(true);
         }
-        this.setCanBreakDoors(jt.getBoolean("CanBreakDoors"));
-        this.inWaterTime = jt.getInt("InWaterTime");
-        if (jt.contains("DrownedConversionTime", 99) && jt.getInt("DrownedConversionTime") > -1) {
-            this.startUnderWaterConversion(jt.getInt("DrownedConversionTime"));
+        this.setCanBreakDoors(le.getBoolean("CanBreakDoors"));
+        this.inWaterTime = le.getInt("InWaterTime");
+        if (le.contains("DrownedConversionTime", 99) && le.getInt("DrownedConversionTime") > -1) {
+            this.startUnderWaterConversion(le.getInt("DrownedConversionTime"));
         }
     }
     
     @Override
-    public void killed(final LivingEntity akz) {
-        super.killed(akz);
-        if ((this.level.getDifficulty() == Difficulty.NORMAL || this.level.getDifficulty() == Difficulty.HARD) && akz instanceof Villager) {
+    public void killed(final LivingEntity aoy) {
+        super.killed(aoy);
+        if ((this.level.getDifficulty() == Difficulty.NORMAL || this.level.getDifficulty() == Difficulty.HARD) && aoy instanceof Villager) {
             if (this.level.getDifficulty() != Difficulty.HARD && this.random.nextBoolean()) {
                 return;
             }
-            final Villager axw3 = (Villager)akz;
-            final ZombieVillager axq4 = EntityType.ZOMBIE_VILLAGER.create(this.level);
-            axq4.copyPosition(axw3);
-            axw3.remove();
-            axq4.finalizeSpawn(this.level, this.level.getCurrentDifficultyAt(new BlockPos(axq4)), MobSpawnType.CONVERSION, new ZombieGroupData(false), null);
-            axq4.setVillagerData(axw3.getVillagerData());
-            axq4.setGossips((Tag)axw3.getGossips().store((com.mojang.datafixers.types.DynamicOps<Object>)NbtOps.INSTANCE).getValue());
-            axq4.setTradeOffers(axw3.getOffers().createTag());
-            axq4.setVillagerXp(axw3.getVillagerXp());
-            axq4.setBaby(axw3.isBaby());
-            axq4.setNoAi(axw3.isNoAi());
-            if (axw3.hasCustomName()) {
-                axq4.setCustomName(axw3.getCustomName());
-                axq4.setCustomNameVisible(axw3.isCustomNameVisible());
+            final Villager bdp3 = (Villager)aoy;
+            final ZombieVillager bcv4 = EntityType.ZOMBIE_VILLAGER.create(this.level);
+            bcv4.copyPosition(bdp3);
+            bdp3.remove();
+            bcv4.finalizeSpawn(this.level, this.level.getCurrentDifficultyAt(bcv4.blockPosition()), MobSpawnType.CONVERSION, new ZombieGroupData(false, true), null);
+            bcv4.setVillagerData(bdp3.getVillagerData());
+            bcv4.setGossips((net.minecraft.nbt.Tag)bdp3.getGossips().store((com.mojang.serialization.DynamicOps<Object>)NbtOps.INSTANCE).getValue());
+            bcv4.setTradeOffers(bdp3.getOffers().createTag());
+            bcv4.setVillagerXp(bdp3.getVillagerXp());
+            bcv4.setBaby(bdp3.isBaby());
+            bcv4.setNoAi(bdp3.isNoAi());
+            if (bdp3.hasCustomName()) {
+                bcv4.setCustomName(bdp3.getCustomName());
+                bcv4.setCustomNameVisible(bdp3.isCustomNameVisible());
             }
-            if (this.isPersistenceRequired()) {
-                axq4.setPersistenceRequired();
+            if (bdp3.isPersistenceRequired()) {
+                bcv4.setPersistenceRequired();
+            }
+            bcv4.setInvulnerable(this.isInvulnerable());
+            this.level.addFreshEntity(bcv4);
+            if (!this.isSilent()) {
+                this.level.levelEvent(null, 1026, this.blockPosition(), 0);
             }
-            axq4.setInvulnerable(this.isInvulnerable());
-            this.level.addFreshEntity(axq4);
-            this.level.levelEvent(null, 1026, new BlockPos(this), 0);
         }
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         return this.isBaby() ? 0.93f : 1.74f;
     }
     
     @Override
-    protected boolean canHoldItem(final ItemStack ben) {
-        return (ben.getItem() != Items.EGG || !this.isBaby() || !this.isPassenger()) && super.canHoldItem(ben);
+    public boolean canHoldItem(final ItemStack bki) {
+        return (bki.getItem() != Items.EGG || !this.isBaby() || !this.isPassenger()) && super.canHoldItem(bki);
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        alm = super.finalizeSpawn(bjx, ajj, alc, alm, jt);
-        final float float7 = ajj.getSpecialMultiplier();
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        apo = super.finalizeSpawn(bqc, ane, apb, apo, le);
+        final float float7 = ane.getSpecialMultiplier();
         this.setCanPickUpLoot(this.random.nextFloat() < 0.55f * float7);
-        if (alm == null) {
-            alm = new ZombieGroupData(bjx.getRandom().nextFloat() < 0.05f);
+        if (apo == null) {
+            apo = new ZombieGroupData(getSpawnAsBabyOdds(bqc.getRandom()), true);
         }
-        if (alm instanceof ZombieGroupData) {
-            final ZombieGroupData b8 = (ZombieGroupData)alm;
+        if (apo instanceof ZombieGroupData) {
+            final ZombieGroupData b8 = (ZombieGroupData)apo;
             if (b8.isBaby) {
                 this.setBaby(true);
-                if (bjx.getRandom().nextFloat() < 0.05) {
-                    final List<Chicken> list9 = bjx.<Chicken>getEntitiesOfClass(Chicken.class, this.getBoundingBox().inflate(5.0, 3.0, 5.0), EntitySelector.ENTITY_NOT_BEING_RIDDEN);
-                    if (!list9.isEmpty()) {
-                        final Chicken atf10 = list9.get(0);
-                        atf10.setChickenJockey(true);
-                        this.startRiding(atf10);
+                if (b8.canSpawnJockey) {
+                    if (bqc.getRandom().nextFloat() < 0.05) {
+                        final List<Chicken> list9 = bqc.<Chicken>getEntitiesOfClass(Chicken.class, this.getBoundingBox().inflate(5.0, 3.0, 5.0), EntitySelector.ENTITY_NOT_BEING_RIDDEN);
+                        if (!list9.isEmpty()) {
+                            final Chicken ayn10 = list9.get(0);
+                            ayn10.setChickenJockey(true);
+                            this.startRiding(ayn10);
+                        }
+                    }
+                    else if (bqc.getRandom().nextFloat() < 0.05) {
+                        final Chicken ayn11 = EntityType.CHICKEN.create(this.level);
+                        ayn11.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, 0.0f);
+                        ayn11.finalizeSpawn(bqc, ane, MobSpawnType.JOCKEY, null, null);
+                        ayn11.setChickenJockey(true);
+                        this.startRiding(ayn11);
+                        bqc.addFreshEntity(ayn11);
                     }
-                }
-                else if (bjx.getRandom().nextFloat() < 0.05) {
-                    final Chicken atf11 = EntityType.CHICKEN.create(this.level);
-                    atf11.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, 0.0f);
-                    atf11.finalizeSpawn(bjx, ajj, MobSpawnType.JOCKEY, null, null);
-                    atf11.setChickenJockey(true);
-                    bjx.addFreshEntity(atf11);
-                    this.startRiding(atf11);
                 }
             }
             this.setCanBreakDoors(this.supportsBreakDoorGoal() && this.random.nextFloat() < float7 * 0.1f);
-            this.populateDefaultEquipmentSlots(ajj);
-            this.populateDefaultEquipmentEnchantments(ajj);
+            this.populateDefaultEquipmentSlots(ane);
+            this.populateDefaultEquipmentEnchantments(ane);
         }
         if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
             final LocalDate localDate8 = LocalDate.now();
@@ -511,38 +467,47 @@ public class Zombie extends Monster {
             }
         }
         this.handleAttributes(float7);
-        return alm;
+        return apo;
+    }
+    
+    public static boolean getSpawnAsBabyOdds(final Random random) {
+        return random.nextFloat() < 0.05f;
     }
     
     protected void handleAttributes(final float float1) {
-        this.getAttribute(SharedMonsterAttributes.KNOCKBACK_RESISTANCE).addModifier(new AttributeModifier("Random spawn bonus", this.random.nextDouble() * 0.05000000074505806, AttributeModifier.Operation.ADDITION));
+        this.randomizeReinforcementsChance();
+        this.getAttribute(Attributes.KNOCKBACK_RESISTANCE).addPermanentModifier(new AttributeModifier("Random spawn bonus", this.random.nextDouble() * 0.05000000074505806, AttributeModifier.Operation.ADDITION));
         final double double3 = this.random.nextDouble() * 1.5 * float1;
         if (double3 > 1.0) {
-            this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).addModifier(new AttributeModifier("Random zombie-spawn bonus", double3, AttributeModifier.Operation.MULTIPLY_TOTAL));
+            this.getAttribute(Attributes.FOLLOW_RANGE).addPermanentModifier(new AttributeModifier("Random zombie-spawn bonus", double3, AttributeModifier.Operation.MULTIPLY_TOTAL));
         }
         if (this.random.nextFloat() < float1 * 0.05f) {
-            this.getAttribute(Zombie.SPAWN_REINFORCEMENTS_CHANCE).addModifier(new AttributeModifier("Leader zombie bonus", this.random.nextDouble() * 0.25 + 0.5, AttributeModifier.Operation.ADDITION));
-            this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).addModifier(new AttributeModifier("Leader zombie bonus", this.random.nextDouble() * 3.0 + 1.0, AttributeModifier.Operation.MULTIPLY_TOTAL));
+            this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).addPermanentModifier(new AttributeModifier("Leader zombie bonus", this.random.nextDouble() * 0.25 + 0.5, AttributeModifier.Operation.ADDITION));
+            this.getAttribute(Attributes.MAX_HEALTH).addPermanentModifier(new AttributeModifier("Leader zombie bonus", this.random.nextDouble() * 3.0 + 1.0, AttributeModifier.Operation.MULTIPLY_TOTAL));
             this.setCanBreakDoors(this.supportsBreakDoorGoal());
         }
     }
     
+    protected void randomizeReinforcementsChance() {
+        this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * 0.10000000149011612);
+    }
+    
     @Override
-    public double getRidingHeight() {
+    public double getMyRidingOffset() {
         return this.isBaby() ? 0.0 : -0.45;
     }
     
     @Override
-    protected void dropCustomDeathLoot(final DamageSource ajz, final int integer, final boolean boolean3) {
-        super.dropCustomDeathLoot(ajz, integer, boolean3);
-        final Entity akq5 = ajz.getEntity();
-        if (akq5 instanceof Creeper) {
-            final Creeper awi6 = (Creeper)akq5;
-            if (awi6.canDropMobsSkull()) {
-                awi6.increaseDroppedSkulls();
-                final ItemStack ben7 = this.getSkull();
-                if (!ben7.isEmpty()) {
-                    this.spawnAtLocation(ben7);
+    protected void dropCustomDeathLoot(final DamageSource anw, final int integer, final boolean boolean3) {
+        super.dropCustomDeathLoot(anw, integer, boolean3);
+        final Entity aom5 = anw.getEntity();
+        if (aom5 instanceof Creeper) {
+            final Creeper bbn6 = (Creeper)aom5;
+            if (bbn6.canDropMobsSkull()) {
+                bbn6.increaseDroppedSkulls();
+                final ItemStack bki7 = this.getSkull();
+                if (!bki7.isEmpty()) {
+                    this.spawnAtLocation(bki7);
                 }
             }
         }
@@ -553,36 +518,37 @@ public class Zombie extends Monster {
     }
     
     static {
-        SPAWN_REINFORCEMENTS_CHANCE = new RangedAttribute(null, "zombie.spawnReinforcements", 0.0, 0.0, 1.0).importLegacyName("Spawn Reinforcements Chance");
         SPEED_MODIFIER_BABY_UUID = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
         SPEED_MODIFIER_BABY = new AttributeModifier(Zombie.SPEED_MODIFIER_BABY_UUID, "Baby speed boost", 0.5, AttributeModifier.Operation.MULTIPLY_BASE);
         DATA_BABY_ID = SynchedEntityData.<Boolean>defineId(Zombie.class, EntityDataSerializers.BOOLEAN);
         DATA_SPECIAL_TYPE_ID = SynchedEntityData.<Integer>defineId(Zombie.class, EntityDataSerializers.INT);
         DATA_DROWNED_CONVERSION_ID = SynchedEntityData.<Boolean>defineId(Zombie.class, EntityDataSerializers.BOOLEAN);
-        DOOR_BREAKING_PREDICATE = (aji -> aji == Difficulty.HARD);
+        DOOR_BREAKING_PREDICATE = (and -> and == Difficulty.HARD);
     }
     
-    public class ZombieGroupData implements SpawnGroupData {
+    public static class ZombieGroupData implements SpawnGroupData {
         public final boolean isBaby;
+        public final boolean canSpawnJockey;
         
-        private ZombieGroupData(final boolean boolean2) {
-            this.isBaby = boolean2;
+        public ZombieGroupData(final boolean boolean1, final boolean boolean2) {
+            this.isBaby = boolean1;
+            this.canSpawnJockey = boolean2;
         }
     }
     
     class ZombieAttackTurtleEggGoal extends RemoveBlockGoal {
-        ZombieAttackTurtleEggGoal(final PathfinderMob alg, final double double3, final int integer) {
-            super(Blocks.TURTLE_EGG, alg, double3, integer);
+        ZombieAttackTurtleEggGoal(final PathfinderMob apg, final double double3, final int integer) {
+            super(Blocks.TURTLE_EGG, apg, double3, integer);
         }
         
         @Override
-        public void playDestroyProgressSound(final LevelAccessor bjx, final BlockPos fk) {
-            bjx.playSound(null, fk, SoundEvents.ZOMBIE_DESTROY_EGG, SoundSource.HOSTILE, 0.5f, 0.9f + Zombie.this.random.nextFloat() * 0.2f);
+        public void playDestroyProgressSound(final LevelAccessor bqc, final BlockPos fu) {
+            bqc.playSound(null, fu, SoundEvents.ZOMBIE_DESTROY_EGG, SoundSource.HOSTILE, 0.5f, 0.9f + Zombie.this.random.nextFloat() * 0.2f);
         }
         
         @Override
-        public void playBreakSound(final Level bjw, final BlockPos fk) {
-            bjw.playSound(null, fk, SoundEvents.TURTLE_EGG_BREAK, SoundSource.BLOCKS, 0.7f, 0.9f + bjw.random.nextFloat() * 0.2f);
+        public void playBreakSound(final Level bqb, final BlockPos fu) {
+            bqb.playSound(null, fu, SoundEvents.TURTLE_EGG_BREAK, SoundSource.BLOCKS, 0.7f, 0.9f + bqb.random.nextFloat() * 0.2f);
         }
         
         @Override
diff --git a/src/net/minecraft/world/entity/monster/ZombieVillager.java b/src/net/minecraft/world/entity/monster/ZombieVillager.java
index 5b4a774..2ed5661 100644
--- a/src/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/src/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -8,6 +8,7 @@ import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.BedBlock;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.ReputationEventHandler;
 import net.minecraft.world.entity.ai.village.ReputationEventType;
 import net.minecraft.advancements.CriteriaTriggers;
@@ -15,7 +16,6 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.MobSpawnType;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.trading.MerchantOffers;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -27,11 +27,14 @@ import javax.annotation.Nullable;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.server.level.ServerLevel;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.Dynamic;
+import java.util.function.Consumer;
+import com.mojang.serialization.DynamicOps;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.world.entity.npc.VillagerType;
 import net.minecraft.core.Registry;
@@ -54,8 +57,8 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
     private CompoundTag tradeOffers;
     private int villagerXp;
     
-    public ZombieVillager(final EntityType<? extends ZombieVillager> aku, final Level bjw) {
-        super(aku, bjw);
+    public ZombieVillager(final EntityType<? extends ZombieVillager> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.setVillagerData(this.getVillagerData().setProfession(Registry.VILLAGER_PROFESSION.getRandom(this.random)));
     }
     
@@ -67,39 +70,40 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.put("VillagerData", this.getVillagerData().<Tag>serialize((com.mojang.datafixers.types.DynamicOps<Tag>)NbtOps.INSTANCE));
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        VillagerData.CODEC.encodeStart((DynamicOps)NbtOps.INSTANCE, this.getVillagerData()).resultOrPartial((Consumer)ZombieVillager.LOGGER::error).ifPresent(lu -> le.put("VillagerData", lu));
         if (this.tradeOffers != null) {
-            jt.put("Offers", this.tradeOffers);
+            le.put("Offers", this.tradeOffers);
         }
         if (this.gossips != null) {
-            jt.put("Gossips", this.gossips);
+            le.put("Gossips", this.gossips);
         }
-        jt.putInt("ConversionTime", this.isConverting() ? this.villagerConversionTime : -1);
+        le.putInt("ConversionTime", this.isConverting() ? this.villagerConversionTime : -1);
         if (this.conversionStarter != null) {
-            jt.putUUID("ConversionPlayer", this.conversionStarter);
+            le.putUUID("ConversionPlayer", this.conversionStarter);
         }
-        jt.putInt("Xp", this.villagerXp);
+        le.putInt("Xp", this.villagerXp);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("VillagerData", 10)) {
-            this.setVillagerData(new VillagerData(new Dynamic((DynamicOps)NbtOps.INSTANCE, jt.get("VillagerData"))));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("VillagerData", 10)) {
+            final DataResult<VillagerData> dataResult3 = (DataResult<VillagerData>)VillagerData.CODEC.parse(new Dynamic((DynamicOps)NbtOps.INSTANCE, le.get("VillagerData")));
+            dataResult3.resultOrPartial((Consumer)ZombieVillager.LOGGER::error).ifPresent(this::setVillagerData);
         }
-        if (jt.contains("Offers", 10)) {
-            this.tradeOffers = jt.getCompound("Offers");
+        if (le.contains("Offers", 10)) {
+            this.tradeOffers = le.getCompound("Offers");
         }
-        if (jt.contains("Gossips", 10)) {
-            this.gossips = jt.getList("Gossips", 10);
+        if (le.contains("Gossips", 10)) {
+            this.gossips = le.getList("Gossips", 10);
         }
-        if (jt.contains("ConversionTime", 99) && jt.getInt("ConversionTime") > -1) {
-            this.startConverting(jt.hasUUID("ConversionPlayer") ? jt.getUUID("ConversionPlayer") : null, jt.getInt("ConversionTime"));
+        if (le.contains("ConversionTime", 99) && le.getInt("ConversionTime") > -1) {
+            this.startConverting(le.hasUUID("ConversionPlayer") ? le.getUUID("ConversionPlayer") : null, le.getInt("ConversionTime"));
         }
-        if (jt.contains("Xp", 3)) {
-            this.villagerXp = jt.getInt("Xp");
+        if (le.contains("Xp", 3)) {
+            this.villagerXp = le.getInt("Xp");
         }
     }
     
@@ -115,20 +119,21 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
         super.tick();
     }
     
-    @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (ben4.getItem() == Items.GOLDEN_APPLE && this.hasEffect(MobEffects.WEAKNESS)) {
-            if (!ayj.abilities.instabuild) {
-                ben4.shrink(1);
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (bki4.getItem() != Items.GOLDEN_APPLE) {
+            return super.mobInteract(bec, anf);
+        }
+        if (this.hasEffect(MobEffects.WEAKNESS)) {
+            if (!bec.abilities.instabuild) {
+                bki4.shrink(1);
             }
             if (!this.level.isClientSide) {
-                this.startConverting(ayj.getUUID(), this.random.nextInt(2401) + 3600);
-                ayj.swing(ajk, true);
+                this.startConverting(bec.getUUID(), this.random.nextInt(2401) + 3600);
             }
-            return true;
+            return InteractionResult.SUCCESS;
         }
-        return super.mobInteract(ayj, ajk);
+        return InteractionResult.CONSUME;
     }
     
     @Override
@@ -138,7 +143,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
     
     @Override
     public boolean removeWhenFarAway(final double double1) {
-        return !this.isConverting();
+        return !this.isConverting() && this.villagerXp == 0;
     }
     
     public boolean isConverting() {
@@ -165,55 +170,57 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
         super.handleEntityEvent(byte1);
     }
     
-    private void finishConversion(final ServerLevel xd) {
-        final Villager axw3 = EntityType.VILLAGER.create(xd);
-        for (final EquipmentSlot akv7 : EquipmentSlot.values()) {
-            final ItemStack ben8 = this.getItemBySlot(akv7);
-            if (!ben8.isEmpty()) {
-                if (EnchantmentHelper.hasBindingCurse(ben8)) {
-                    axw3.setSlot(akv7.getIndex() + 300, ben8);
+    private void finishConversion(final ServerLevel zd) {
+        final Villager bdp3 = EntityType.VILLAGER.create(zd);
+        for (final EquipmentSlot aor7 : EquipmentSlot.values()) {
+            final ItemStack bki8 = this.getItemBySlot(aor7);
+            if (!bki8.isEmpty()) {
+                if (EnchantmentHelper.hasBindingCurse(bki8)) {
+                    bdp3.setSlot(aor7.getIndex() + 300, bki8);
                 }
                 else {
-                    final double double9 = this.getEquipmentDropChance(akv7);
+                    final double double9 = this.getEquipmentDropChance(aor7);
                     if (double9 > 1.0) {
-                        this.spawnAtLocation(ben8);
+                        this.spawnAtLocation(bki8);
                     }
                 }
             }
         }
-        axw3.copyPosition(this);
-        axw3.setVillagerData(this.getVillagerData());
+        bdp3.copyPosition(this);
+        bdp3.setVillagerData(this.getVillagerData());
         if (this.gossips != null) {
-            axw3.setGossips(this.gossips);
+            bdp3.setGossips(this.gossips);
         }
         if (this.tradeOffers != null) {
-            axw3.setOffers(new MerchantOffers(this.tradeOffers));
+            bdp3.setOffers(new MerchantOffers(this.tradeOffers));
         }
-        axw3.setVillagerXp(this.villagerXp);
-        axw3.finalizeSpawn(xd, xd.getCurrentDifficultyAt(new BlockPos(axw3)), MobSpawnType.CONVERSION, null, null);
+        bdp3.setVillagerXp(this.villagerXp);
+        bdp3.finalizeSpawn(zd, zd.getCurrentDifficultyAt(bdp3.blockPosition()), MobSpawnType.CONVERSION, null, null);
         if (this.isBaby()) {
-            axw3.setAge(-24000);
+            bdp3.setAge(-24000);
         }
         this.remove();
-        axw3.setNoAi(this.isNoAi());
+        bdp3.setNoAi(this.isNoAi());
         if (this.hasCustomName()) {
-            axw3.setCustomName(this.getCustomName());
-            axw3.setCustomNameVisible(this.isCustomNameVisible());
+            bdp3.setCustomName(this.getCustomName());
+            bdp3.setCustomNameVisible(this.isCustomNameVisible());
         }
         if (this.isPersistenceRequired()) {
-            axw3.setPersistenceRequired();
+            bdp3.setPersistenceRequired();
         }
-        axw3.setInvulnerable(this.isInvulnerable());
-        xd.addFreshEntity(axw3);
+        bdp3.setInvulnerable(this.isInvulnerable());
+        zd.addFreshEntity(bdp3);
         if (this.conversionStarter != null) {
-            final Player ayj4 = xd.getPlayerByUUID(this.conversionStarter);
-            if (ayj4 instanceof ServerPlayer) {
-                CriteriaTriggers.CURED_ZOMBIE_VILLAGER.trigger((ServerPlayer)ayj4, this, axw3);
-                xd.onReputationEvent(ReputationEventType.ZOMBIE_VILLAGER_CURED, ayj4, axw3);
+            final Player bec4 = zd.getPlayerByUUID(this.conversionStarter);
+            if (bec4 instanceof ServerPlayer) {
+                CriteriaTriggers.CURED_ZOMBIE_VILLAGER.trigger((ServerPlayer)bec4, this, bdp3);
+                zd.onReputationEvent(ReputationEventType.ZOMBIE_VILLAGER_CURED, bec4, bdp3);
             }
         }
-        axw3.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 200, 0));
-        xd.levelEvent(null, 1027, new BlockPos(this), 0);
+        bdp3.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 200, 0));
+        if (!this.isSilent()) {
+            zd.levelEvent(null, 1027, this.blockPosition(), 0);
+        }
     }
     
     private int getConversionProgress() {
@@ -224,8 +231,8 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
             for (int integer4 = (int)this.getX() - 4; integer4 < (int)this.getX() + 4 && integer3 < 14; ++integer4) {
                 for (int integer5 = (int)this.getY() - 4; integer5 < (int)this.getY() + 4 && integer3 < 14; ++integer5) {
                     for (int integer6 = (int)this.getZ() - 4; integer6 < (int)this.getZ() + 4 && integer3 < 14; ++integer6) {
-                        final Block bph8 = this.level.getBlockState(a4.set(integer4, integer5, integer6)).getBlock();
-                        if (bph8 == Blocks.IRON_BARS || bph8 instanceof BedBlock) {
+                        final Block bvr8 = this.level.getBlockState(a4.set(integer4, integer5, integer6)).getBlock();
+                        if (bvr8 == Blocks.IRON_BARS || bvr8 instanceof BedBlock) {
                             if (this.random.nextFloat() < 0.3f) {
                                 ++integer2;
                             }
@@ -250,7 +257,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
         return SoundEvents.ZOMBIE_VILLAGER_AMBIENT;
     }
     
-    public SoundEvent getHurtSound(final DamageSource ajz) {
+    public SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.ZOMBIE_VILLAGER_HURT;
     }
     
@@ -267,27 +274,27 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
         return ItemStack.EMPTY;
     }
     
-    public void setTradeOffers(final CompoundTag jt) {
-        this.tradeOffers = jt;
+    public void setTradeOffers(final CompoundTag le) {
+        this.tradeOffers = le;
     }
     
-    public void setGossips(final Tag kj) {
-        this.gossips = kj;
+    public void setGossips(final Tag lu) {
+        this.gossips = lu;
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        this.setVillagerData(this.getVillagerData().setType(VillagerType.byBiome(bjx.getBiome(new BlockPos(this)))));
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        this.setVillagerData(this.getVillagerData().setType(VillagerType.byBiome(bqc.getBiome(this.blockPosition()))));
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
-    public void setVillagerData(final VillagerData axx) {
-        final VillagerData axx2 = this.getVillagerData();
-        if (axx2.getProfession() != axx.getProfession()) {
+    public void setVillagerData(final VillagerData bdq) {
+        final VillagerData bdq2 = this.getVillagerData();
+        if (bdq2.getProfession() != bdq.getProfession()) {
             this.tradeOffers = null;
         }
-        this.entityData.<VillagerData>set(ZombieVillager.DATA_VILLAGER_DATA, axx);
+        this.entityData.<VillagerData>set(ZombieVillager.DATA_VILLAGER_DATA, bdq);
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/net/minecraft/world/entity/monster/ZombifiedPiglin.java
new file mode 100644
index 0000000..e73824f
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/ZombifiedPiglin.java
@@ -0,0 +1,241 @@
+package net.minecraft.world.entity.monster;
+
+import net.minecraft.util.TimeUtil;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.Difficulty;
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.ai.attributes.AttributeInstance;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.entity.ai.goal.target.ResetUniversalAngerTargetGoal;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
+import net.minecraft.world.entity.PathfinderMob;
+import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal;
+import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.entity.ai.goal.ZombieAttackGoal;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.pathfinder.BlockPathTypes;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.util.IntRange;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import java.util.UUID;
+import net.minecraft.world.entity.NeutralMob;
+
+public class ZombifiedPiglin extends Zombie implements NeutralMob {
+    private static final UUID SPEED_MODIFIER_ATTACKING_UUID;
+    private static final AttributeModifier SPEED_MODIFIER_ATTACKING;
+    private static final IntRange FIRST_ANGER_SOUND_DELAY;
+    private int playFirstAngerSoundIn;
+    private static final IntRange PERSISTENT_ANGER_TIME;
+    private int remainingPersistentAngerTime;
+    private UUID persistentAngerTarget;
+    private static final IntRange ALERT_INTERVAL;
+    private int ticksUntilNextAlert;
+    
+    public ZombifiedPiglin(final EntityType<? extends ZombifiedPiglin> aoq, final Level bqb) {
+        super(aoq, bqb);
+        this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0f);
+    }
+    
+    @Override
+    public void setPersistentAngerTarget(@Nullable final UUID uUID) {
+        this.persistentAngerTarget = uUID;
+    }
+    
+    @Override
+    public double getMyRidingOffset() {
+        return this.isBaby() ? -0.16 : -0.45;
+    }
+    
+    @Override
+    protected void addBehaviourGoals() {
+        this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0, false));
+        this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0));
+        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]).setAlertOthers(new Class[0]));
+        this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
+        this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
+    }
+    
+    public static AttributeSupplier.Builder createAttributes() {
+        return Zombie.createAttributes().add(Attributes.SPAWN_REINFORCEMENTS_CHANCE, 0.0).add(Attributes.MOVEMENT_SPEED, 0.23000000417232513).add(Attributes.ATTACK_DAMAGE, 5.0);
+    }
+    
+    @Override
+    protected boolean convertsInWater() {
+        return false;
+    }
+    
+    @Override
+    protected void customServerAiStep() {
+        final AttributeInstance apt2 = this.getAttribute(Attributes.MOVEMENT_SPEED);
+        if (this.isAngry()) {
+            if (!this.isBaby() && !apt2.hasModifier(ZombifiedPiglin.SPEED_MODIFIER_ATTACKING)) {
+                apt2.addTransientModifier(ZombifiedPiglin.SPEED_MODIFIER_ATTACKING);
+            }
+            this.maybePlayFirstAngerSound();
+        }
+        else if (apt2.hasModifier(ZombifiedPiglin.SPEED_MODIFIER_ATTACKING)) {
+            apt2.removeModifier(ZombifiedPiglin.SPEED_MODIFIER_ATTACKING);
+        }
+        this.updatePersistentAnger((ServerLevel)this.level, true);
+        if (this.getTarget() != null) {
+            this.maybeAlertOthers();
+        }
+        if (this.isAngry()) {
+            this.lastHurtByPlayerTime = this.tickCount;
+        }
+        super.customServerAiStep();
+    }
+    
+    private void maybePlayFirstAngerSound() {
+        if (this.playFirstAngerSoundIn > 0) {
+            --this.playFirstAngerSoundIn;
+            if (this.playFirstAngerSoundIn == 0) {
+                this.playAngerSound();
+            }
+        }
+    }
+    
+    private void maybeAlertOthers() {
+        if (this.ticksUntilNextAlert > 0) {
+            --this.ticksUntilNextAlert;
+            return;
+        }
+        if (this.getSensing().canSee(this.getTarget())) {
+            this.alertOthers();
+        }
+        this.ticksUntilNextAlert = ZombifiedPiglin.ALERT_INTERVAL.randomValue(this.random);
+    }
+    
+    private void alertOthers() {
+        final double double2 = this.getAttributeValue(Attributes.FOLLOW_RANGE);
+        final AABB deg4 = AABB.unitCubeFromLowerCorner(this.position()).inflate(double2, 10.0, double2);
+        this.level.<Entity>getLoadedEntitiesOfClass(ZombifiedPiglin.class, deg4).stream().filter(bcw -> bcw != this).filter(bcw -> bcw.getTarget() == null).filter(bcw -> !bcw.isAlliedTo(this.getTarget())).forEach(bcw -> bcw.setTarget(this.getTarget()));
+    }
+    
+    private void playAngerSound() {
+        this.playSound(SoundEvents.ZOMBIFIED_PIGLIN_ANGRY, this.getSoundVolume() * 2.0f, this.getVoicePitch() * 1.8f);
+    }
+    
+    @Override
+    public void setTarget(@Nullable final LivingEntity aoy) {
+        if (this.getTarget() == null && aoy != null) {
+            this.playFirstAngerSoundIn = ZombifiedPiglin.FIRST_ANGER_SOUND_DELAY.randomValue(this.random);
+            this.ticksUntilNextAlert = ZombifiedPiglin.ALERT_INTERVAL.randomValue(this.random);
+        }
+        if (aoy instanceof Player) {
+            this.setLastHurtByPlayer((Player)aoy);
+        }
+        super.setTarget(aoy);
+    }
+    
+    @Override
+    public void startPersistentAngerTimer() {
+        this.setRemainingPersistentAngerTime(ZombifiedPiglin.PERSISTENT_ANGER_TIME.randomValue(this.random));
+    }
+    
+    public static boolean checkZombifiedPiglinSpawnRules(final EntityType<ZombifiedPiglin> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return bqc.getDifficulty() != Difficulty.PEACEFUL && bqc.getBlockState(fu.below()).getBlock() != Blocks.NETHER_WART_BLOCK;
+    }
+    
+    @Override
+    public boolean checkSpawnObstruction(final LevelReader bqd) {
+        return bqd.isUnobstructed(this) && !bqd.containsAnyLiquid(this.getBoundingBox());
+    }
+    
+    @Override
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        this.addPersistentAngerSaveData(le);
+    }
+    
+    @Override
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.readPersistentAngerSaveData((ServerLevel)this.level, le);
+    }
+    
+    @Override
+    public void setRemainingPersistentAngerTime(final int integer) {
+        this.remainingPersistentAngerTime = integer;
+    }
+    
+    @Override
+    public int getRemainingPersistentAngerTime() {
+        return this.remainingPersistentAngerTime;
+    }
+    
+    @Override
+    public boolean hurt(final DamageSource anw, final float float2) {
+        return !this.isInvulnerableTo(anw) && super.hurt(anw, float2);
+    }
+    
+    @Override
+    protected SoundEvent getAmbientSound() {
+        return this.isAngry() ? SoundEvents.ZOMBIFIED_PIGLIN_ANGRY : SoundEvents.ZOMBIFIED_PIGLIN_AMBIENT;
+    }
+    
+    @Override
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        return SoundEvents.ZOMBIFIED_PIGLIN_HURT;
+    }
+    
+    @Override
+    protected SoundEvent getDeathSound() {
+        return SoundEvents.ZOMBIFIED_PIGLIN_DEATH;
+    }
+    
+    @Override
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
+        this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.GOLDEN_SWORD));
+    }
+    
+    @Override
+    protected ItemStack getSkull() {
+        return ItemStack.EMPTY;
+    }
+    
+    @Override
+    protected void randomizeReinforcementsChance() {
+        this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(0.0);
+    }
+    
+    @Override
+    public UUID getPersistentAngerTarget() {
+        return this.persistentAngerTarget;
+    }
+    
+    @Override
+    public boolean isPreventingPlayerRest(final Player bec) {
+        return this.isAngryAt(bec);
+    }
+    
+    static {
+        SPEED_MODIFIER_ATTACKING_UUID = UUID.fromString("49455A49-7EC5-45BA-B886-3B90B23A1718");
+        SPEED_MODIFIER_ATTACKING = new AttributeModifier(ZombifiedPiglin.SPEED_MODIFIER_ATTACKING_UUID, "Attacking speed boost", 0.05, AttributeModifier.Operation.ADDITION);
+        FIRST_ANGER_SOUND_DELAY = TimeUtil.rangeOfSeconds(0, 1);
+        PERSISTENT_ANGER_TIME = TimeUtil.rangeOfSeconds(20, 39);
+        ALERT_INTERVAL = TimeUtil.rangeOfSeconds(4, 6);
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/net/minecraft/world/entity/monster/hoglin/Hoglin.java
new file mode 100644
index 0000000..448a8c2
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -0,0 +1,354 @@
+package net.minecraft.world.entity.monster.hoglin;
+
+import net.minecraft.network.syncher.SynchedEntityData;
+import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.network.protocol.game.DebugPackets;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.entity.AgableMob;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.monster.Zoglin;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.nbt.CompoundTag;
+import javax.annotation.Nullable;
+import net.minecraft.world.entity.SpawnGroupData;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.level.block.Blocks;
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.server.level.ServerLevel;
+import com.mojang.serialization.Dynamic;
+import java.util.Collection;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.sensing.Sensor;
+import net.minecraft.world.entity.ai.sensing.SensorType;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.monster.Enemy;
+import net.minecraft.world.entity.animal.Animal;
+
+public class Hoglin extends Animal implements Enemy, HoglinBase {
+    private static final EntityDataAccessor<Boolean> DATA_IMMUNE_TO_ZOMBIFICATION;
+    private int attackAnimationRemainingTicks;
+    private int timeInOverworld;
+    private boolean cannotBeHunted;
+    protected static final ImmutableList<? extends SensorType<? extends Sensor<? super Hoglin>>> SENSOR_TYPES;
+    protected static final ImmutableList<? extends MemoryModuleType<?>> MEMORY_TYPES;
+    
+    public Hoglin(final EntityType<? extends Hoglin> aoq, final Level bqb) {
+        super(aoq, bqb);
+        this.timeInOverworld = 0;
+        this.cannotBeHunted = false;
+        this.xpReward = 5;
+    }
+    
+    @Override
+    public boolean canBeLeashed(final Player bec) {
+        return !this.isLeashed();
+    }
+    
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 40.0).add(Attributes.MOVEMENT_SPEED, 0.30000001192092896).add(Attributes.KNOCKBACK_RESISTANCE, 0.6000000238418579).add(Attributes.ATTACK_KNOCKBACK, 1.0).add(Attributes.ATTACK_DAMAGE, 6.0);
+    }
+    
+    @Override
+    public boolean doHurtTarget(final Entity aom) {
+        if (!(aom instanceof LivingEntity)) {
+            return false;
+        }
+        this.attackAnimationRemainingTicks = 10;
+        this.level.broadcastEntityEvent(this, (byte)4);
+        this.playSound(SoundEvents.HOGLIN_ATTACK, 1.0f, this.getVoicePitch());
+        HoglinAi.onHitTarget(this, (LivingEntity)aom);
+        return HoglinBase.hurtAndThrowTarget(this, (LivingEntity)aom);
+    }
+    
+    @Override
+    protected void blockedByShield(final LivingEntity aoy) {
+        if (this.isAdult()) {
+            HoglinBase.throwTarget(this, aoy);
+        }
+    }
+    
+    @Override
+    public boolean hurt(final DamageSource anw, final float float2) {
+        final boolean boolean4 = super.hurt(anw, float2);
+        if (this.level.isClientSide) {
+            return false;
+        }
+        if (boolean4 && anw.getEntity() instanceof LivingEntity) {
+            HoglinAi.wasHurtBy(this, (LivingEntity)anw.getEntity());
+        }
+        return boolean4;
+    }
+    
+    @Override
+    protected Brain.Provider<Hoglin> brainProvider() {
+        return Brain.<Hoglin>provider(Hoglin.MEMORY_TYPES, Hoglin.SENSOR_TYPES);
+    }
+    
+    @Override
+    protected Brain<?> makeBrain(final Dynamic<?> dynamic) {
+        return HoglinAi.makeBrain(this.brainProvider().makeBrain(dynamic));
+    }
+    
+    @Override
+    public Brain<Hoglin> getBrain() {
+        return (Brain<Hoglin>)super.getBrain();
+    }
+    
+    @Override
+    protected void customServerAiStep() {
+        this.level.getProfiler().push("hoglinBrain");
+        this.getBrain().tick((ServerLevel)this.level, this);
+        this.level.getProfiler().pop();
+        HoglinAi.updateActivity(this);
+        if (this.isConverting()) {
+            ++this.timeInOverworld;
+            if (this.timeInOverworld > 300) {
+                this.playSound(SoundEvents.HOGLIN_CONVERTED_TO_ZOMBIFIED);
+                this.finishConversion((ServerLevel)this.level);
+            }
+        }
+        else {
+            this.timeInOverworld = 0;
+        }
+    }
+    
+    @Override
+    public void aiStep() {
+        if (this.attackAnimationRemainingTicks > 0) {
+            --this.attackAnimationRemainingTicks;
+        }
+        super.aiStep();
+    }
+    
+    @Override
+    protected void ageBoundaryReached() {
+        if (this.isBaby()) {
+            this.xpReward = 3;
+            this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(0.5);
+        }
+        else {
+            this.xpReward = 5;
+            this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(6.0);
+        }
+    }
+    
+    public static boolean checkHoglinSpawnRules(final EntityType<Hoglin> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return !bqc.getBlockState(fu.below()).is(Blocks.NETHER_WART_BLOCK);
+    }
+    
+    @Nullable
+    @Override
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        if (bqc.getRandom().nextFloat() < 0.2f) {
+            this.setBaby(true);
+        }
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
+    }
+    
+    @Override
+    public boolean removeWhenFarAway(final double double1) {
+        return !this.isPersistenceRequired();
+    }
+    
+    @Override
+    public float getWalkTargetValue(final BlockPos fu, final LevelReader bqd) {
+        if (HoglinAi.isPosNearNearestRepellent(this, fu)) {
+            return -1.0f;
+        }
+        if (bqd.getBlockState(fu.below()).is(Blocks.CRIMSON_NYLIUM)) {
+            return 10.0f;
+        }
+        return 0.0f;
+    }
+    
+    @Override
+    public double getPassengersRidingOffset() {
+        return this.getBbHeight() - (this.isBaby() ? 0.2 : 0.15);
+    }
+    
+    @Override
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final InteractionResult ang4 = super.mobInteract(bec, anf);
+        if (ang4.consumesAction()) {
+            this.setPersistenceRequired();
+        }
+        return ang4;
+    }
+    
+    @Override
+    public void handleEntityEvent(final byte byte1) {
+        if (byte1 == 4) {
+            this.attackAnimationRemainingTicks = 10;
+            this.playSound(SoundEvents.HOGLIN_ATTACK, 1.0f, this.getVoicePitch());
+        }
+        else {
+            super.handleEntityEvent(byte1);
+        }
+    }
+    
+    @Override
+    public int getAttackAnimationRemainingTicks() {
+        return this.attackAnimationRemainingTicks;
+    }
+    
+    @Override
+    protected boolean shouldDropExperience() {
+        return true;
+    }
+    
+    @Override
+    protected int getExperienceReward(final Player bec) {
+        return this.xpReward;
+    }
+    
+    private void finishConversion(final ServerLevel zd) {
+        final Zoglin bct3 = this.<Zoglin>convertTo(EntityType.ZOGLIN);
+        bct3.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 200, 0));
+    }
+    
+    @Override
+    public boolean isFood(final ItemStack bki) {
+        return bki.getItem() == Items.CRIMSON_FUNGUS;
+    }
+    
+    public boolean isAdult() {
+        return !this.isBaby();
+    }
+    
+    @Override
+    protected void defineSynchedData() {
+        super.defineSynchedData();
+        this.entityData.<Boolean>define(Hoglin.DATA_IMMUNE_TO_ZOMBIFICATION, false);
+    }
+    
+    @Override
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        if (this.isImmuneToZombification()) {
+            le.putBoolean("IsImmuneToZombification", true);
+        }
+        le.putInt("TimeInOverworld", this.timeInOverworld);
+        if (this.cannotBeHunted) {
+            le.putBoolean("CannotBeHunted", true);
+        }
+    }
+    
+    @Override
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setImmuneToZombification(le.getBoolean("IsImmuneToZombification"));
+        this.timeInOverworld = le.getInt("TimeInOverworld");
+        this.setCannotBeHunted(le.getBoolean("CannotBeHunted"));
+    }
+    
+    public void setImmuneToZombification(final boolean boolean1) {
+        this.getEntityData().<Boolean>set(Hoglin.DATA_IMMUNE_TO_ZOMBIFICATION, boolean1);
+    }
+    
+    private boolean isImmuneToZombification() {
+        return this.getEntityData().<Boolean>get(Hoglin.DATA_IMMUNE_TO_ZOMBIFICATION);
+    }
+    
+    public boolean isConverting() {
+        return !this.level.dimensionType().piglinSafe() && !this.isImmuneToZombification() && !this.isNoAi();
+    }
+    
+    private void setCannotBeHunted(final boolean boolean1) {
+        this.cannotBeHunted = boolean1;
+    }
+    
+    public boolean canBeHunted() {
+        return this.isAdult() && !this.cannotBeHunted;
+    }
+    
+    @Nullable
+    @Override
+    public AgableMob getBreedOffspring(final AgableMob aok) {
+        final Hoglin bcx3 = EntityType.HOGLIN.create(this.level);
+        if (bcx3 != null) {
+            bcx3.setPersistenceRequired();
+        }
+        return bcx3;
+    }
+    
+    @Override
+    public boolean canFallInLove() {
+        return !HoglinAi.isPacified(this) && super.canFallInLove();
+    }
+    
+    @Override
+    public SoundSource getSoundSource() {
+        return SoundSource.HOSTILE;
+    }
+    
+    @Override
+    protected SoundEvent getAmbientSound() {
+        if (this.level.isClientSide) {
+            return null;
+        }
+        return HoglinAi.getSoundForCurrentActivity(this).orElse(null);
+    }
+    
+    @Override
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        return SoundEvents.HOGLIN_HURT;
+    }
+    
+    @Override
+    protected SoundEvent getDeathSound() {
+        return SoundEvents.HOGLIN_DEATH;
+    }
+    
+    @Override
+    protected SoundEvent getSwimSound() {
+        return SoundEvents.HOSTILE_SWIM;
+    }
+    
+    @Override
+    protected SoundEvent getSwimSplashSound() {
+        return SoundEvents.HOSTILE_SPLASH;
+    }
+    
+    @Override
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
+        this.playSound(SoundEvents.HOGLIN_STEP, 0.15f, 1.0f);
+    }
+    
+    protected void playSound(final SoundEvent ack) {
+        this.playSound(ack, this.getSoundVolume(), this.getVoicePitch());
+    }
+    
+    @Override
+    protected void sendDebugPackets() {
+        super.sendDebugPackets();
+        DebugPackets.sendEntityBrain(this);
+    }
+    
+    static {
+        DATA_IMMUNE_TO_ZOMBIFICATION = SynchedEntityData.<Boolean>defineId(Hoglin.class, EntityDataSerializers.BOOLEAN);
+        SENSOR_TYPES = ImmutableList.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_PLAYERS, SensorType.NEAREST_ADULT, SensorType.HOGLIN_SPECIFIC_SENSOR);
+        MEMORY_TYPES = ImmutableList.of(MemoryModuleType.BREED_TARGET, MemoryModuleType.LIVING_ENTITIES, MemoryModuleType.VISIBLE_LIVING_ENTITIES, MemoryModuleType.NEAREST_VISIBLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, MemoryModuleType.LOOK_TARGET, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.PATH, MemoryModuleType.ATTACK_TARGET, MemoryModuleType.ATTACK_COOLING_DOWN, MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLIN, MemoryModuleType.AVOID_TARGET, MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, MemoryModuleType.NEAREST_VISIBLE_ADULT_HOGLINS, MemoryModuleType.NEAREST_VISIBLE_ADULT, MemoryModuleType.NEAREST_REPELLENT, MemoryModuleType.PACIFIED);
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/hoglin/HoglinAi.java b/src/net/minecraft/world/entity/monster/hoglin/HoglinAi.java
new file mode 100644
index 0000000..4747b50
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/hoglin/HoglinAi.java
@@ -0,0 +1,231 @@
+package net.minecraft.world.entity.monster.hoglin;
+
+import net.minecraft.util.TimeUtil;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.entity.EntitySelector;
+import net.minecraft.core.Vec3i;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.ai.memory.WalkTarget;
+import net.minecraft.world.entity.ai.behavior.BehaviorUtils;
+import net.minecraft.sounds.SoundEvent;
+import java.util.function.Consumer;
+import java.util.List;
+import net.minecraft.world.entity.ai.behavior.DoNothing;
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetFromLookTarget;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.world.entity.ai.behavior.RandomStroll;
+import net.minecraft.world.entity.ai.behavior.RunOne;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.ai.behavior.StopAttackingIfTargetInvalid;
+import net.minecraft.world.entity.AgableMob;
+import net.minecraft.world.entity.ai.behavior.MeleeAttack;
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetFromAttackTargetIfTargetOutOfReach;
+import net.minecraft.world.entity.ai.behavior.BabyFollowAdult;
+import net.minecraft.world.entity.ai.behavior.SetEntityLookTarget;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import java.util.Optional;
+import java.util.function.Function;
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom;
+import net.minecraft.world.entity.animal.Animal;
+import net.minecraft.world.entity.ai.behavior.AnimalMakeLove;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.ai.behavior.BecomePassiveIfMemoryPresent;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.entity.ai.behavior.MoveToTargetSink;
+import net.minecraft.world.entity.ai.behavior.LookAtTargetSink;
+import java.util.Set;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.schedule.Activity;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.util.IntRange;
+
+public class HoglinAi {
+    private static final IntRange RETREAT_DURATION;
+    private static final IntRange ADULT_FOLLOW_RANGE;
+    
+    protected static Brain<?> makeBrain(final Brain<Hoglin> apr) {
+        initCoreActivity(apr);
+        initIdleActivity(apr);
+        initFightActivity(apr);
+        initRetreatActivity(apr);
+        apr.setCoreActivities(ImmutableSet.<Activity>of(Activity.CORE));
+        apr.setDefaultActivity(Activity.IDLE);
+        apr.useDefaultActivity();
+        return apr;
+    }
+    
+    private static void initCoreActivity(final Brain<Hoglin> apr) {
+        apr.addActivity(Activity.CORE, 0, ImmutableList.of(new LookAtTargetSink(45, 90), new MoveToTargetSink(200)));
+    }
+    
+    private static void initIdleActivity(final Brain<Hoglin> apr) {
+        apr.addActivity(Activity.IDLE, 10, ImmutableList.of(new BecomePassiveIfMemoryPresent(MemoryModuleType.NEAREST_REPELLENT, 200), new AnimalMakeLove(EntityType.HOGLIN, 0.6f), SetWalkTargetAwayFrom.pos(MemoryModuleType.NEAREST_REPELLENT, 1.0f, 8, true), new Behavior(HoglinAi::findNearestValidAttackTarget), new Behavior(Hoglin::isAdult, SetWalkTargetAwayFrom.entity(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLIN, 0.4f, 8, false)), new Behavior(new SetEntityLookTarget(8.0f), IntRange.of(30, 60)), new BabyFollowAdult(HoglinAi.ADULT_FOLLOW_RANGE, 0.6f), createIdleMovementBehaviors()));
+    }
+    
+    private static void initFightActivity(final Brain<Hoglin> apr) {
+        apr.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new BecomePassiveIfMemoryPresent(MemoryModuleType.NEAREST_REPELLENT, 200), new AnimalMakeLove(EntityType.HOGLIN, 0.6f), new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0f), new Behavior(Hoglin::isAdult, new MeleeAttack(40)), new Behavior(AgableMob::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid(), new Behavior(HoglinAi::isBreeding, MemoryModuleType.ATTACK_TARGET)), MemoryModuleType.ATTACK_TARGET);
+    }
+    
+    private static void initRetreatActivity(final Brain<Hoglin> apr) {
+        apr.addActivityAndRemoveMemoryWhenStopped(Activity.AVOID, 10, ImmutableList.of(SetWalkTargetAwayFrom.entity(MemoryModuleType.AVOID_TARGET, 1.3f, 15, false), createIdleMovementBehaviors(), new Behavior(new SetEntityLookTarget(8.0f), IntRange.of(30, 60)), new Behavior(HoglinAi::wantsToStopFleeing, MemoryModuleType.AVOID_TARGET)), MemoryModuleType.AVOID_TARGET);
+    }
+    
+    private static RunOne<Hoglin> createIdleMovementBehaviors() {
+        return new RunOne<Hoglin>(ImmutableList.of(Pair.of(new RandomStroll(0.4f), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4f, 3), 2), Pair.of(new DoNothing(30, 60), 1)));
+    }
+    
+    protected static void updateActivity(final Hoglin bcx) {
+        final Brain<Hoglin> apr2 = bcx.getBrain();
+        final Activity bfl3 = apr2.getActiveNonCoreActivity().orElse(null);
+        apr2.setActiveActivityToFirstValid(ImmutableList.<Activity>of(Activity.FIGHT, Activity.AVOID, Activity.IDLE));
+        final Activity bfl4 = apr2.getActiveNonCoreActivity().orElse(null);
+        if (bfl3 != bfl4) {
+            getSoundForCurrentActivity(bcx).ifPresent(bcx::playSound);
+        }
+        bcx.setAggressive(apr2.hasMemoryValue(MemoryModuleType.ATTACK_TARGET));
+    }
+    
+    protected static void onHitTarget(final Hoglin bcx, final LivingEntity aoy) {
+        if (bcx.isBaby()) {
+            return;
+        }
+        if (aoy.getType() == EntityType.PIGLIN && piglinsOutnumberHoglins(bcx)) {
+            setAvoidTarget(bcx, aoy);
+            broadcastRetreat(bcx, aoy);
+            return;
+        }
+        broadcastAttackTarget(bcx, aoy);
+    }
+    
+    private static void broadcastRetreat(final Hoglin bcx, final LivingEntity aoy) {
+        getVisibleAdultHoglins(bcx).forEach(bcx -> retreatFromNearestTarget(bcx, aoy));
+    }
+    
+    private static void retreatFromNearestTarget(final Hoglin bcx, final LivingEntity aoy) {
+        LivingEntity aoy2 = aoy;
+        final Brain<Hoglin> apr4 = bcx.getBrain();
+        aoy2 = BehaviorUtils.getNearestTarget(bcx, apr4.<LivingEntity>getMemory(MemoryModuleType.AVOID_TARGET), aoy2);
+        aoy2 = BehaviorUtils.getNearestTarget(bcx, apr4.<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET), aoy2);
+        setAvoidTarget(bcx, aoy2);
+    }
+    
+    private static void setAvoidTarget(final Hoglin bcx, final LivingEntity aoy) {
+        bcx.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.ATTACK_TARGET);
+        bcx.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        bcx.getBrain().<LivingEntity>setMemoryWithExpiry(MemoryModuleType.AVOID_TARGET, aoy, HoglinAi.RETREAT_DURATION.randomValue(bcx.level.random));
+    }
+    
+    private static Optional<? extends LivingEntity> findNearestValidAttackTarget(final Hoglin bcx) {
+        if (isPacified(bcx) || isBreeding(bcx)) {
+            return Optional.empty();
+        }
+        return bcx.getBrain().getMemory(MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER);
+    }
+    
+    static boolean isPosNearNearestRepellent(final Hoglin bcx, final BlockPos fu) {
+        final Optional<BlockPos> optional3 = bcx.getBrain().<BlockPos>getMemory(MemoryModuleType.NEAREST_REPELLENT);
+        return optional3.isPresent() && optional3.get().closerThan(fu, 8.0);
+    }
+    
+    private static boolean wantsToStopFleeing(final Hoglin bcx) {
+        return bcx.isAdult() && !piglinsOutnumberHoglins(bcx);
+    }
+    
+    private static boolean piglinsOutnumberHoglins(final Hoglin bcx) {
+        if (bcx.isBaby()) {
+            return false;
+        }
+        final int integer2 = bcx.getBrain().<Integer>getMemory(MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT).orElse(0);
+        final int integer3 = bcx.getBrain().<Integer>getMemory(MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT).orElse(0) + 1;
+        return integer2 > integer3;
+    }
+    
+    protected static void wasHurtBy(final Hoglin bcx, final LivingEntity aoy) {
+        final Brain<Hoglin> apr3 = bcx.getBrain();
+        apr3.<Boolean>eraseMemory(MemoryModuleType.PACIFIED);
+        apr3.<AgableMob>eraseMemory(MemoryModuleType.BREED_TARGET);
+        if (bcx.isBaby()) {
+            retreatFromNearestTarget(bcx, aoy);
+            return;
+        }
+        maybeRetaliate(bcx, aoy);
+    }
+    
+    private static void maybeRetaliate(final Hoglin bcx, final LivingEntity aoy) {
+        if (bcx.getBrain().isActive(Activity.AVOID) && aoy.getType() == EntityType.PIGLIN) {
+            return;
+        }
+        if (!EntitySelector.ATTACK_ALLOWED.test(aoy)) {
+            return;
+        }
+        if (aoy.getType() == EntityType.HOGLIN) {
+            return;
+        }
+        if (BehaviorUtils.isOtherTargetMuchFurtherAwayThanCurrentAttackTarget(bcx, aoy, 4.0)) {
+            return;
+        }
+        setAttackTarget(bcx, aoy);
+        broadcastAttackTarget(bcx, aoy);
+    }
+    
+    private static void setAttackTarget(final Hoglin bcx, final LivingEntity aoy) {
+        final Brain<Hoglin> apr3 = bcx.getBrain();
+        apr3.<Long>eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
+        apr3.<AgableMob>eraseMemory(MemoryModuleType.BREED_TARGET);
+        apr3.<LivingEntity>setMemoryWithExpiry(MemoryModuleType.ATTACK_TARGET, aoy, 200L);
+    }
+    
+    private static void broadcastAttackTarget(final Hoglin bcx, final LivingEntity aoy) {
+        getVisibleAdultHoglins(bcx).forEach(bcx -> setAttackTargetIfCloserThanCurrent(bcx, aoy));
+    }
+    
+    private static void setAttackTargetIfCloserThanCurrent(final Hoglin bcx, final LivingEntity aoy) {
+        if (isPacified(bcx)) {
+            return;
+        }
+        final Optional<LivingEntity> optional3 = bcx.getBrain().<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET);
+        final LivingEntity aoy2 = BehaviorUtils.getNearestTarget(bcx, optional3, aoy);
+        setAttackTarget(bcx, aoy2);
+    }
+    
+    public static Optional<SoundEvent> getSoundForCurrentActivity(final Hoglin bcx) {
+        return bcx.getBrain().getActiveNonCoreActivity().<SoundEvent>map(bfl -> getSoundForActivity(bcx, bfl));
+    }
+    
+    private static SoundEvent getSoundForActivity(final Hoglin bcx, final Activity bfl) {
+        if (bfl == Activity.AVOID || bcx.isConverting()) {
+            return SoundEvents.HOGLIN_RETREAT;
+        }
+        if (bfl == Activity.FIGHT) {
+            return SoundEvents.HOGLIN_ANGRY;
+        }
+        if (isNearRepellent(bcx)) {
+            return SoundEvents.HOGLIN_RETREAT;
+        }
+        return SoundEvents.HOGLIN_AMBIENT;
+    }
+    
+    private static List<Hoglin> getVisibleAdultHoglins(final Hoglin bcx) {
+        return bcx.getBrain().<List<Hoglin>>getMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_HOGLINS).orElse(ImmutableList.of());
+    }
+    
+    private static boolean isNearRepellent(final Hoglin bcx) {
+        return bcx.getBrain().hasMemoryValue(MemoryModuleType.NEAREST_REPELLENT);
+    }
+    
+    private static boolean isBreeding(final Hoglin bcx) {
+        return bcx.getBrain().hasMemoryValue(MemoryModuleType.BREED_TARGET);
+    }
+    
+    protected static boolean isPacified(final Hoglin bcx) {
+        return bcx.getBrain().hasMemoryValue(MemoryModuleType.PACIFIED);
+    }
+    
+    static {
+        RETREAT_DURATION = TimeUtil.rangeOfSeconds(5, 20);
+        ADULT_FOLLOW_RANGE = IntRange.of(5, 16);
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/hoglin/HoglinBase.java b/src/net/minecraft/world/entity/monster/hoglin/HoglinBase.java
new file mode 100644
index 0000000..068a982
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/hoglin/HoglinBase.java
@@ -0,0 +1,47 @@
+package net.minecraft.world.entity.monster.hoglin;
+
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.LivingEntity;
+
+public interface HoglinBase {
+    int getAttackAnimationRemainingTicks();
+    
+    default boolean hurtAndThrowTarget(final LivingEntity aoy1, final LivingEntity aoy2) {
+        final float float4 = (float)aoy1.getAttributeValue(Attributes.ATTACK_DAMAGE);
+        float float5;
+        if (!aoy1.isBaby() && (int)float4 > 0) {
+            float5 = float4 / 2.0f + aoy1.level.random.nextInt((int)float4);
+        }
+        else {
+            float5 = float4;
+        }
+        final boolean boolean5 = aoy2.hurt(DamageSource.mobAttack(aoy1), float5);
+        if (boolean5) {
+            aoy1.doEnchantDamageEffects(aoy1, aoy2);
+            if (!aoy1.isBaby()) {
+                throwTarget(aoy1, aoy2);
+            }
+        }
+        return boolean5;
+    }
+    
+    default void throwTarget(final LivingEntity aoy1, final LivingEntity aoy2) {
+        final double double3 = aoy1.getAttributeValue(Attributes.ATTACK_KNOCKBACK);
+        final double double4 = aoy2.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE);
+        final double double5 = double3 - double4;
+        if (double5 <= 0.0) {
+            return;
+        }
+        final double double6 = aoy2.getX() - aoy1.getX();
+        final double double7 = aoy2.getZ() - aoy1.getZ();
+        final float float13 = (float)(aoy1.level.random.nextInt(21) - 10);
+        final double double8 = double5 * (aoy1.level.random.nextFloat() * 0.5f + 0.2f);
+        final Vec3 dem16 = new Vec3(double6, 0.0, double7).normalize().scale(double8).yRot(float13);
+        final double double9 = double5 * aoy1.level.random.nextFloat() * 0.5;
+        aoy2.push(dem16.x, double9, dem16.z);
+        aoy2.hurtMarked = true;
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/net/minecraft/world/entity/monster/piglin/Piglin.java
new file mode 100644
index 0000000..902bfe5
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -0,0 +1,507 @@
+package net.minecraft.world.entity.monster.piglin;
+
+import net.minecraft.world.entity.ai.behavior.PositionTracker;
+import net.minecraft.world.entity.ai.sensing.NearestLivingEntitySensor;
+import net.minecraft.network.syncher.SynchedEntityData;
+import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.network.protocol.game.DebugPackets;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.sounds.SoundEvent;
+import java.util.List;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.item.ProjectileWeaponItem;
+import net.minecraft.world.entity.projectile.Projectile;
+import net.minecraft.world.item.TieredItem;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.monster.ZombifiedPiglin;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.ai.attributes.AttributeInstance;
+import net.minecraft.world.entity.EntityDimensions;
+import net.minecraft.world.entity.Pose;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import com.mojang.serialization.Dynamic;
+import java.util.Collection;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.entity.EquipmentSlot;
+import javax.annotation.Nullable;
+import net.minecraft.world.entity.SpawnGroupData;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.level.block.Blocks;
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.item.ItemStack;
+import java.util.function.Consumer;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.nbt.Tag;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.pathfinder.BlockPathTypes;
+import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.sensing.Sensor;
+import net.minecraft.world.entity.ai.sensing.SensorType;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import java.util.UUID;
+import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.entity.monster.CrossbowAttackMob;
+import net.minecraft.world.entity.monster.Monster;
+
+public class Piglin extends Monster implements CrossbowAttackMob {
+    private static final EntityDataAccessor<Boolean> DATA_BABY_ID;
+    private static final EntityDataAccessor<Boolean> DATA_IMMUNE_TO_ZOMBIFICATION;
+    private static final EntityDataAccessor<Boolean> DATA_IS_CHARGING_CROSSBOW;
+    private static final EntityDataAccessor<Boolean> DATA_IS_DANCING;
+    private static final UUID SPEED_MODIFIER_BABY_UUID;
+    private static final AttributeModifier SPEED_MODIFIER_BABY;
+    private int timeInOverworld;
+    private final SimpleContainer inventory;
+    private boolean cannotHunt;
+    protected static final ImmutableList<SensorType<? extends Sensor<? super Piglin>>> SENSOR_TYPES;
+    protected static final ImmutableList<MemoryModuleType<?>> MEMORY_TYPES;
+    
+    public Piglin(final EntityType<? extends Monster> aoq, final Level bqb) {
+        super(aoq, bqb);
+        this.timeInOverworld = 0;
+        this.inventory = new SimpleContainer(8);
+        this.cannotHunt = false;
+        this.setCanPickUpLoot(true);
+        ((GroundPathNavigation)this.getNavigation()).setCanOpenDoors(true);
+        this.xpReward = 5;
+        this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 16.0f);
+        this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, -1.0f);
+    }
+    
+    @Override
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        if (this.isBaby()) {
+            le.putBoolean("IsBaby", true);
+        }
+        if (this.isImmuneToZombification()) {
+            le.putBoolean("IsImmuneToZombification", true);
+        }
+        if (this.cannotHunt) {
+            le.putBoolean("CannotHunt", true);
+        }
+        le.putInt("TimeInOverworld", this.timeInOverworld);
+        le.put("Inventory", this.inventory.createTag());
+    }
+    
+    @Override
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.setBaby(le.getBoolean("IsBaby"));
+        this.setImmuneToZombification(le.getBoolean("IsImmuneToZombification"));
+        this.setCannotHunt(le.getBoolean("CannotHunt"));
+        this.timeInOverworld = le.getInt("TimeInOverworld");
+        this.inventory.fromTag(le.getList("Inventory", 10));
+    }
+    
+    @Override
+    protected void dropCustomDeathLoot(final DamageSource anw, final int integer, final boolean boolean3) {
+        super.dropCustomDeathLoot(anw, integer, boolean3);
+        this.inventory.removeAllItems().forEach(this::spawnAtLocation);
+    }
+    
+    protected ItemStack addToInventory(final ItemStack bki) {
+        return this.inventory.addItem(bki);
+    }
+    
+    protected boolean canAddToInventory(final ItemStack bki) {
+        return this.inventory.canAddItem(bki);
+    }
+    
+    @Override
+    protected void defineSynchedData() {
+        super.defineSynchedData();
+        this.entityData.<Boolean>define(Piglin.DATA_BABY_ID, false);
+        this.entityData.<Boolean>define(Piglin.DATA_IS_CHARGING_CROSSBOW, false);
+        this.entityData.<Boolean>define(Piglin.DATA_IMMUNE_TO_ZOMBIFICATION, false);
+        this.entityData.<Boolean>define(Piglin.DATA_IS_DANCING, false);
+    }
+    
+    @Override
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        super.onSyncedDataUpdated(tq);
+        if (Piglin.DATA_BABY_ID.equals(tq)) {
+            this.refreshDimensions();
+        }
+    }
+    
+    public static AttributeSupplier.Builder createAttributes() {
+        return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 16.0).add(Attributes.MOVEMENT_SPEED, 0.3499999940395355).add(Attributes.ATTACK_DAMAGE, 5.0);
+    }
+    
+    public static boolean checkPiglinSpawnRules(final EntityType<Piglin> aoq, final LevelAccessor bqc, final MobSpawnType apb, final BlockPos fu, final Random random) {
+        return !bqc.getBlockState(fu.below()).is(Blocks.NETHER_WART_BLOCK);
+    }
+    
+    @Nullable
+    @Override
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        if (apb != MobSpawnType.STRUCTURE) {
+            if (bqc.getRandom().nextFloat() < 0.2f) {
+                this.setBaby(true);
+            }
+            else if (this.isAdult()) {
+                this.setItemSlot(EquipmentSlot.MAINHAND, this.createSpawnWeapon());
+            }
+        }
+        PiglinAi.initMemories(this);
+        this.populateDefaultEquipmentSlots(ane);
+        this.populateDefaultEquipmentEnchantments(ane);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
+    }
+    
+    @Override
+    protected boolean shouldDespawnInPeaceful() {
+        return false;
+    }
+    
+    @Override
+    public boolean removeWhenFarAway(final double double1) {
+        return !this.isPersistenceRequired();
+    }
+    
+    @Override
+    protected void populateDefaultEquipmentSlots(final DifficultyInstance ane) {
+        if (this.isAdult()) {
+            this.maybeWearArmor(EquipmentSlot.HEAD, new ItemStack(Items.GOLDEN_HELMET));
+            this.maybeWearArmor(EquipmentSlot.CHEST, new ItemStack(Items.GOLDEN_CHESTPLATE));
+            this.maybeWearArmor(EquipmentSlot.LEGS, new ItemStack(Items.GOLDEN_LEGGINGS));
+            this.maybeWearArmor(EquipmentSlot.FEET, new ItemStack(Items.GOLDEN_BOOTS));
+        }
+    }
+    
+    private void maybeWearArmor(final EquipmentSlot aor, final ItemStack bki) {
+        if (this.level.random.nextFloat() < 0.1f) {
+            this.setItemSlot(aor, bki);
+        }
+    }
+    
+    @Override
+    protected Brain.Provider<Piglin> brainProvider() {
+        return Brain.<Piglin>provider(Piglin.MEMORY_TYPES, Piglin.SENSOR_TYPES);
+    }
+    
+    @Override
+    protected Brain<?> makeBrain(final Dynamic<?> dynamic) {
+        return PiglinAi.makeBrain(this, this.brainProvider().makeBrain(dynamic));
+    }
+    
+    @Override
+    public Brain<Piglin> getBrain() {
+        return (Brain<Piglin>)super.getBrain();
+    }
+    
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final InteractionResult ang4 = super.mobInteract(bec, anf);
+        if (ang4.consumesAction()) {
+            return ang4;
+        }
+        if (this.level.isClientSide) {
+            final boolean boolean5 = PiglinAi.canAdmire(this, bec.getItemInHand(anf)) && this.getArmPose() != PiglinArmPose.ADMIRING_ITEM;
+            return boolean5 ? InteractionResult.SUCCESS : InteractionResult.PASS;
+        }
+        return PiglinAi.mobInteract(this, bec, anf);
+    }
+    
+    @Override
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return this.isBaby() ? 0.93f : 1.74f;
+    }
+    
+    @Override
+    public double getMyRidingOffset() {
+        return this.isBaby() ? -0.1 : -0.45;
+    }
+    
+    @Override
+    public double getPassengersRidingOffset() {
+        return this.getBbHeight() * 0.92;
+    }
+    
+    @Override
+    public void setBaby(final boolean boolean1) {
+        this.getEntityData().<Boolean>set(Piglin.DATA_BABY_ID, boolean1);
+        if (!this.level.isClientSide) {
+            final AttributeInstance apt3 = this.getAttribute(Attributes.MOVEMENT_SPEED);
+            apt3.removeModifier(Piglin.SPEED_MODIFIER_BABY);
+            if (boolean1) {
+                apt3.addTransientModifier(Piglin.SPEED_MODIFIER_BABY);
+            }
+        }
+    }
+    
+    @Override
+    public boolean isBaby() {
+        return this.getEntityData().<Boolean>get(Piglin.DATA_BABY_ID);
+    }
+    
+    public boolean isAdult() {
+        return !this.isBaby();
+    }
+    
+    public void setImmuneToZombification(final boolean boolean1) {
+        this.getEntityData().<Boolean>set(Piglin.DATA_IMMUNE_TO_ZOMBIFICATION, boolean1);
+    }
+    
+    private boolean isImmuneToZombification() {
+        return this.getEntityData().<Boolean>get(Piglin.DATA_IMMUNE_TO_ZOMBIFICATION);
+    }
+    
+    private void setCannotHunt(final boolean boolean1) {
+        this.cannotHunt = boolean1;
+    }
+    
+    protected boolean canHunt() {
+        return !this.cannotHunt;
+    }
+    
+    public boolean isConverting() {
+        return !this.level.dimensionType().piglinSafe() && !this.isImmuneToZombification() && !this.isNoAi();
+    }
+    
+    @Override
+    protected void customServerAiStep() {
+        this.level.getProfiler().push("piglinBrain");
+        this.getBrain().tick((ServerLevel)this.level, this);
+        this.level.getProfiler().pop();
+        PiglinAi.updateActivity(this);
+        if (this.isConverting()) {
+            ++this.timeInOverworld;
+        }
+        else {
+            this.timeInOverworld = 0;
+        }
+        if (this.timeInOverworld > 300) {
+            this.playSound(SoundEvents.PIGLIN_CONVERTED_TO_ZOMBIFIED);
+            this.finishConversion((ServerLevel)this.level);
+        }
+    }
+    
+    @Override
+    protected int getExperienceReward(final Player bec) {
+        return this.xpReward;
+    }
+    
+    private void finishConversion(final ServerLevel zd) {
+        PiglinAi.cancelAdmiring(this);
+        this.inventory.removeAllItems().forEach(this::spawnAtLocation);
+        final ZombifiedPiglin bcw3 = this.<ZombifiedPiglin>convertTo(EntityType.ZOMBIFIED_PIGLIN);
+        bcw3.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 200, 0));
+    }
+    
+    @Nullable
+    @Override
+    public LivingEntity getTarget() {
+        return this.brain.<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null);
+    }
+    
+    private ItemStack createSpawnWeapon() {
+        if (this.random.nextFloat() < 0.5) {
+            return new ItemStack(Items.CROSSBOW);
+        }
+        return new ItemStack(Items.GOLDEN_SWORD);
+    }
+    
+    private boolean isChargingCrossbow() {
+        return this.entityData.<Boolean>get(Piglin.DATA_IS_CHARGING_CROSSBOW);
+    }
+    
+    @Override
+    public void setChargingCrossbow(final boolean boolean1) {
+        this.entityData.<Boolean>set(Piglin.DATA_IS_CHARGING_CROSSBOW, boolean1);
+    }
+    
+    @Override
+    public void onCrossbowAttackPerformed() {
+        this.noActionTime = 0;
+    }
+    
+    public PiglinArmPose getArmPose() {
+        if (this.isDancing()) {
+            return PiglinArmPose.DANCING;
+        }
+        if (PiglinAi.isLovedItem(this.getOffhandItem().getItem())) {
+            return PiglinArmPose.ADMIRING_ITEM;
+        }
+        if (this.isAggressive() && this.isHoldingMeleeWeapon()) {
+            return PiglinArmPose.ATTACKING_WITH_MELEE_WEAPON;
+        }
+        if (this.isChargingCrossbow()) {
+            return PiglinArmPose.CROSSBOW_CHARGE;
+        }
+        if (this.isAggressive() && this.isHolding(Items.CROSSBOW)) {
+            return PiglinArmPose.CROSSBOW_HOLD;
+        }
+        return PiglinArmPose.DEFAULT;
+    }
+    
+    public boolean isDancing() {
+        return this.entityData.<Boolean>get(Piglin.DATA_IS_DANCING);
+    }
+    
+    public void setDancing(final boolean boolean1) {
+        this.entityData.<Boolean>set(Piglin.DATA_IS_DANCING, boolean1);
+    }
+    
+    private boolean isHoldingMeleeWeapon() {
+        return this.getMainHandItem().getItem() instanceof TieredItem;
+    }
+    
+    @Override
+    public boolean hurt(final DamageSource anw, final float float2) {
+        final boolean boolean4 = super.hurt(anw, float2);
+        if (this.level.isClientSide) {
+            return false;
+        }
+        if (boolean4 && anw.getEntity() instanceof LivingEntity) {
+            PiglinAi.wasHurtBy(this, (LivingEntity)anw.getEntity());
+        }
+        return boolean4;
+    }
+    
+    @Override
+    public void performRangedAttack(final LivingEntity aoy, final float float2) {
+        this.performCrossbowAttack(this, 1.6f);
+    }
+    
+    @Override
+    public void shootCrossbowProjectile(final LivingEntity aoy, final ItemStack bki, final Projectile bes, final float float4) {
+        this.shootCrossbowProjectile(this, aoy, bes, float4, 1.6f);
+    }
+    
+    @Override
+    public boolean canFireProjectileWeapon(final ProjectileWeaponItem bkv) {
+        return bkv == Items.CROSSBOW;
+    }
+    
+    protected void holdInMainHand(final ItemStack bki) {
+        this.setItemSlotAndDropWhenKilled(EquipmentSlot.MAINHAND, bki);
+    }
+    
+    protected void holdInOffHand(final ItemStack bki) {
+        if (bki.getItem() == PiglinAi.BARTERING_ITEM) {
+            this.setItemSlot(EquipmentSlot.OFFHAND, bki);
+            this.setGuaranteedDrop(EquipmentSlot.OFFHAND);
+        }
+        else {
+            this.setItemSlotAndDropWhenKilled(EquipmentSlot.OFFHAND, bki);
+        }
+    }
+    
+    @Override
+    public boolean wantsToPickUp(final ItemStack bki) {
+        return this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) && PiglinAi.wantsToPickup(this, bki);
+    }
+    
+    protected boolean canReplaceCurrentItem(final ItemStack bki) {
+        final EquipmentSlot aor3 = Mob.getEquipmentSlotForItem(bki);
+        final ItemStack bki2 = this.getItemBySlot(aor3);
+        return this.canReplaceCurrentItem(bki, bki2);
+    }
+    
+    @Override
+    protected boolean canReplaceCurrentItem(final ItemStack bki1, final ItemStack bki2) {
+        if (EnchantmentHelper.hasBindingCurse(bki2)) {
+            return false;
+        }
+        final boolean boolean4 = PiglinAi.isLovedItem(bki1.getItem()) || bki1.getItem() == Items.CROSSBOW;
+        final boolean boolean5 = PiglinAi.isLovedItem(bki2.getItem()) || bki2.getItem() == Items.CROSSBOW;
+        return (boolean4 && !boolean5) || ((boolean4 || !boolean5) && (!this.isAdult() || bki1.getItem() == Items.CROSSBOW || bki2.getItem() != Items.CROSSBOW) && super.canReplaceCurrentItem(bki1, bki2));
+    }
+    
+    @Override
+    protected void pickUpItem(final ItemEntity bbg) {
+        this.onItemPickup(bbg);
+        PiglinAi.pickUpItem(this, bbg);
+    }
+    
+    @Override
+    public boolean startRiding(Entity aom, final boolean boolean2) {
+        if (this.isBaby() && aom.getType() == EntityType.HOGLIN) {
+            aom = this.getTopPassenger(aom, 3);
+        }
+        return super.startRiding(aom, boolean2);
+    }
+    
+    private Entity getTopPassenger(final Entity aom, final int integer) {
+        final List<Entity> list4 = aom.getPassengers();
+        if (integer == 1 || list4.isEmpty()) {
+            return aom;
+        }
+        return this.getTopPassenger(list4.get(0), integer - 1);
+    }
+    
+    @Override
+    protected SoundEvent getAmbientSound() {
+        if (this.level.isClientSide) {
+            return null;
+        }
+        return PiglinAi.getSoundForCurrentActivity(this).orElse(null);
+    }
+    
+    @Override
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        return SoundEvents.PIGLIN_HURT;
+    }
+    
+    @Override
+    protected SoundEvent getDeathSound() {
+        return SoundEvents.PIGLIN_DEATH;
+    }
+    
+    @Override
+    protected void playStepSound(final BlockPos fu, final BlockState cfj) {
+        this.playSound(SoundEvents.PIGLIN_STEP, 0.15f, 1.0f);
+    }
+    
+    protected void playSound(final SoundEvent ack) {
+        this.playSound(ack, this.getSoundVolume(), this.getVoicePitch());
+    }
+    
+    @Override
+    protected void sendDebugPackets() {
+        super.sendDebugPackets();
+        DebugPackets.sendEntityBrain(this);
+    }
+    
+    static {
+        DATA_BABY_ID = SynchedEntityData.<Boolean>defineId(Piglin.class, EntityDataSerializers.BOOLEAN);
+        DATA_IMMUNE_TO_ZOMBIFICATION = SynchedEntityData.<Boolean>defineId(Piglin.class, EntityDataSerializers.BOOLEAN);
+        DATA_IS_CHARGING_CROSSBOW = SynchedEntityData.<Boolean>defineId(Piglin.class, EntityDataSerializers.BOOLEAN);
+        DATA_IS_DANCING = SynchedEntityData.<Boolean>defineId(Piglin.class, EntityDataSerializers.BOOLEAN);
+        SPEED_MODIFIER_BABY_UUID = UUID.fromString("766bfa64-11f3-11ea-8d71-362b9e155667");
+        SPEED_MODIFIER_BABY = new AttributeModifier(Piglin.SPEED_MODIFIER_BABY_UUID, "Baby speed boost", 0.20000000298023224, AttributeModifier.Operation.MULTIPLY_BASE);
+        SENSOR_TYPES = ImmutableList.<SensorType<NearestLivingEntitySensor>>of(SensorType.NEAREST_LIVING_ENTITIES, (SensorType<NearestLivingEntitySensor>)SensorType.NEAREST_PLAYERS, (SensorType<NearestLivingEntitySensor>)SensorType.NEAREST_ITEMS, (SensorType<NearestLivingEntitySensor>)SensorType.HURT_BY, (SensorType<NearestLivingEntitySensor>)SensorType.INTERACTABLE_DOORS, (SensorType<NearestLivingEntitySensor>)SensorType.PIGLIN_SPECIFIC_SENSOR);
+        MEMORY_TYPES = ImmutableList.<MemoryModuleType<PositionTracker>>of(MemoryModuleType.LOOK_TARGET, (MemoryModuleType<PositionTracker>)MemoryModuleType.INTERACTABLE_DOORS, (MemoryModuleType<PositionTracker>)MemoryModuleType.OPENED_DOORS, (MemoryModuleType<PositionTracker>)MemoryModuleType.LIVING_ENTITIES, (MemoryModuleType<PositionTracker>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, (MemoryModuleType<PositionTracker>)MemoryModuleType.NEAREST_VISIBLE_PLAYER, (MemoryModuleType<PositionTracker>)MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, (MemoryModuleType<PositionTracker>)MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLINS, (MemoryModuleType<PositionTracker>)MemoryModuleType.NEAREST_ADULT_PIGLINS, (MemoryModuleType<PositionTracker>)MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, (MemoryModuleType<PositionTracker>)MemoryModuleType.HURT_BY, (MemoryModuleType<PositionTracker>)MemoryModuleType.HURT_BY_ENTITY, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.ATTACK_TARGET, MemoryModuleType.ATTACK_COOLING_DOWN, MemoryModuleType.INTERACTION_TARGET, MemoryModuleType.PATH, MemoryModuleType.ANGRY_AT, MemoryModuleType.UNIVERSAL_ANGER, MemoryModuleType.AVOID_TARGET, MemoryModuleType.ADMIRING_ITEM, MemoryModuleType.ADMIRING_DISABLED, MemoryModuleType.CELEBRATE_LOCATION, MemoryModuleType.DANCING, MemoryModuleType.HUNTED_RECENTLY, MemoryModuleType.NEAREST_VISIBLE_BABY_HOGLIN, MemoryModuleType.NEAREST_VISIBLE_BABY_PIGLIN, MemoryModuleType.NEAREST_VISIBLE_NEMESIS, MemoryModuleType.NEAREST_VISIBLE_ZOMBIFIED, MemoryModuleType.RIDE_TARGET, MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, MemoryModuleType.NEAREST_VISIBLE_HUNTABLE_HOGLIN, MemoryModuleType.NEAREST_TARGETABLE_PLAYER_NOT_WEARING_GOLD, MemoryModuleType.NEAREST_PLAYER_HOLDING_WANTED_ITEM, MemoryModuleType.ATE_RECENTLY, MemoryModuleType.NEAREST_REPELLENT);
+    }
+    
+    public enum PiglinArmPose {
+        ATTACKING_WITH_MELEE_WEAPON, 
+        CROSSBOW_HOLD, 
+        CROSSBOW_CHARGE, 
+        ADMIRING_ITEM, 
+        DANCING, 
+        DEFAULT;
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/net/minecraft/world/entity/monster/piglin/PiglinAi.java
new file mode 100644
index 0000000..bb360d2
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/piglin/PiglinAi.java
@@ -0,0 +1,736 @@
+package net.minecraft.world.entity.monster.piglin;
+
+import net.minecraft.util.TimeUtil;
+import net.minecraft.world.entity.EntitySelector;
+import net.minecraft.world.entity.PathfinderMob;
+import net.minecraft.world.entity.ai.util.RandomPos;
+import java.util.UUID;
+import net.minecraft.world.entity.ai.behavior.RunSometimes;
+import net.minecraft.world.entity.ai.memory.WalkTarget;
+import net.minecraft.world.item.ArmorMaterials;
+import net.minecraft.world.item.ArmorItem;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.ItemTags;
+import java.util.Random;
+import net.minecraft.world.level.storage.loot.LootTable;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.storage.loot.BuiltInLootTables;
+import java.util.Iterator;
+import net.minecraft.world.entity.ai.behavior.BehaviorUtils;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.player.Player;
+import java.util.Collections;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
+import net.minecraft.sounds.SoundEvent;
+import java.util.function.Consumer;
+import net.minecraft.world.entity.ai.behavior.CopyMemoryWithExpiry;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.ai.behavior.RunIf;
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetFromLookTarget;
+import net.minecraft.world.entity.ai.behavior.InteractWith;
+import net.minecraft.world.entity.ai.behavior.RunOne;
+import java.util.function.BiPredicate;
+import net.minecraft.world.entity.ai.behavior.DismountOrSkipMounting;
+import net.minecraft.world.entity.ai.behavior.Mount;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom;
+import java.util.List;
+import net.minecraft.world.entity.ai.behavior.DoNothing;
+import net.minecraft.world.entity.ai.behavior.RandomStroll;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.world.entity.ai.behavior.GoToCelebrateLocation;
+import net.minecraft.world.entity.ai.behavior.CrossbowAttack;
+import net.minecraft.world.entity.ai.behavior.MeleeAttack;
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetFromAttackTargetIfTargetOutOfReach;
+import java.util.function.Predicate;
+import net.minecraft.world.entity.ai.behavior.BackUpIfTooClose;
+import net.minecraft.world.entity.ai.behavior.StopAttackingIfTargetInvalid;
+import net.minecraft.world.entity.ai.behavior.SetLookAndInteract;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import java.util.Optional;
+import java.util.function.Function;
+import net.minecraft.world.entity.ai.behavior.SetEntityLookTarget;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.entity.ai.behavior.StopBeingAngryIfTargetDead;
+import net.minecraft.world.entity.ai.behavior.StartCelebratingIfTargetDead;
+import net.minecraft.world.entity.ai.behavior.InteractWithDoor;
+import net.minecraft.world.entity.ai.behavior.MoveToTargetSink;
+import net.minecraft.world.entity.ai.behavior.LookAtTargetSink;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.schedule.Activity;
+import net.minecraft.world.entity.ai.Brain;
+import java.util.Set;
+import net.minecraft.util.IntRange;
+import net.minecraft.world.item.Item;
+
+public class PiglinAi {
+    public static final Item BARTERING_ITEM;
+    private static final IntRange TIME_BETWEEN_HUNTS;
+    private static final IntRange RIDE_START_INTERVAL;
+    private static final IntRange RIDE_DURATION;
+    private static final IntRange RETREAT_DURATION;
+    private static final IntRange AVOID_ZOMBIFIED_DURATION;
+    private static final IntRange BABY_AVOID_NEMESIS_DURATION;
+    private static final Set<Item> FOOD_ITEMS;
+    
+    protected static Brain<?> makeBrain(final Piglin bdc, final Brain<Piglin> apr) {
+        initCoreActivity(apr);
+        initIdleActivity(apr);
+        initAdmireItemActivity(apr);
+        initFightActivity(bdc, apr);
+        initCelebrateActivity(apr);
+        initRetreatActivity(apr);
+        initRideHoglinActivity(apr);
+        apr.setCoreActivities(ImmutableSet.<Activity>of(Activity.CORE));
+        apr.setDefaultActivity(Activity.IDLE);
+        apr.useDefaultActivity();
+        return apr;
+    }
+    
+    protected static void initMemories(final Piglin bdc) {
+        final int integer2 = PiglinAi.TIME_BETWEEN_HUNTS.randomValue(bdc.level.random);
+        bdc.getBrain().<Boolean>setMemoryWithExpiry(MemoryModuleType.HUNTED_RECENTLY, true, integer2);
+    }
+    
+    private static void initCoreActivity(final Brain<Piglin> apr) {
+        apr.addActivity(Activity.CORE, 0, ImmutableList.of(new LookAtTargetSink(45, 90), new MoveToTargetSink(200), new InteractWithDoor(), babyAvoidNemesis(), avoidZombified(), new StopHoldingItemIfNoLongerAdmiring(), new StartAdmiringItemIfSeen(120), new StartCelebratingIfTargetDead(300, PiglinAi::wantsToDance), new StopBeingAngryIfTargetDead()));
+    }
+    
+    private static void initIdleActivity(final Brain<Piglin> apr) {
+        apr.addActivity(Activity.IDLE, 10, ImmutableList.of(new SetEntityLookTarget(PiglinAi::isPlayerHoldingLovedItem, 14.0f), new Behavior(Piglin::isAdult, PiglinAi::findNearestValidAttackTarget), new Behavior(Piglin::canHunt, new StartHuntingHoglin<>()), avoidRepellent(), babySometimesRideBabyHoglin(), createIdleLookBehaviors(), createIdleMovementBehaviors(), new SetLookAndInteract(EntityType.PLAYER, 4)));
+    }
+    
+    private static void initFightActivity(final Piglin bdc, final Brain<Piglin> apr) {
+        apr.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new StopAttackingIfTargetInvalid(aoy -> !isNearestValidAttackTarget(bdc, aoy)), new Behavior(PiglinAi::hasCrossbow, new BackUpIfTooClose<>(5, 0.75f)), new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0f), new MeleeAttack(20), new CrossbowAttack(), new RememberIfHoglinWasKilled(), new Behavior(PiglinAi::isNearZombified, MemoryModuleType.ATTACK_TARGET)), MemoryModuleType.ATTACK_TARGET);
+    }
+    
+    private static void initCelebrateActivity(final Brain<Piglin> apr) {
+        apr.addActivityAndRemoveMemoryWhenStopped(Activity.CELEBRATE, 10, ImmutableList.of(avoidRepellent(), new SetEntityLookTarget(PiglinAi::isPlayerHoldingLovedItem, 14.0f), new Behavior(Piglin::isAdult, PiglinAi::findNearestValidAttackTarget), new Behavior(bdc -> !bdc.isDancing(), new GoToCelebrateLocation<>(2, 1.0f)), new Behavior(Piglin::isDancing, new GoToCelebrateLocation<>(4, 0.6f)), new Behavior(ImmutableList.of(Pair.of(new SetEntityLookTarget(EntityType.PIGLIN, 8.0f), 1), Pair.of(new RandomStroll(0.6f, 2, 1), 1), Pair.of(new DoNothing(10, 20), 1)))), MemoryModuleType.CELEBRATE_LOCATION);
+    }
+    
+    private static void initAdmireItemActivity(final Brain<Piglin> apr) {
+        apr.addActivityAndRemoveMemoryWhenStopped(Activity.ADMIRE_ITEM, 10, ImmutableList.of(new Behavior(PiglinAi::isNotHoldingLovedItemInOffHand, 1.0f, true, 9), new StopAdmiringIfItemTooFarAway(9)), MemoryModuleType.ADMIRING_ITEM);
+    }
+    
+    private static void initRetreatActivity(final Brain<Piglin> apr) {
+        apr.addActivityAndRemoveMemoryWhenStopped(Activity.AVOID, 10, ImmutableList.of(SetWalkTargetAwayFrom.entity(MemoryModuleType.AVOID_TARGET, 1.0f, 12, true), createIdleLookBehaviors(), createIdleMovementBehaviors(), new Behavior(PiglinAi::wantsToStopFleeing, MemoryModuleType.AVOID_TARGET)), MemoryModuleType.AVOID_TARGET);
+    }
+    
+    private static void initRideHoglinActivity(final Brain<Piglin> apr) {
+        apr.addActivityAndRemoveMemoryWhenStopped(Activity.RIDE, 10, ImmutableList.of(new Mount(0.8f), new SetEntityLookTarget(PiglinAi::isPlayerHoldingLovedItem, 8.0f), new Behavior(Entity::isPassenger, createIdleLookBehaviors()), new DismountOrSkipMounting(8, (BiPredicate<E, Entity>)PiglinAi::wantsToStopRiding)), MemoryModuleType.RIDE_TARGET);
+    }
+    
+    private static RunOne<Piglin> createIdleLookBehaviors() {
+        return new RunOne<Piglin>(ImmutableList.of(Pair.of(new SetEntityLookTarget(EntityType.PLAYER, 8.0f), 1), Pair.of(new SetEntityLookTarget(EntityType.PIGLIN, 8.0f), 1), Pair.of(new SetEntityLookTarget(8.0f), 1), Pair.of(new DoNothing(30, 60), 1)));
+    }
+    
+    private static RunOne<Piglin> createIdleMovementBehaviors() {
+        return new RunOne<Piglin>(ImmutableList.of(Pair.of(new RandomStroll(0.6f), 2), Pair.of(InteractWith.<LivingEntity>of(EntityType.PIGLIN, 8, MemoryModuleType.INTERACTION_TARGET, 0.6f, 2), 2), Pair.of(new RunIf(PiglinAi::doesntSeeAnyPlayerHoldingLovedItem, new SetWalkTargetFromLookTarget(0.6f, 3)), 2), Pair.of(new DoNothing(30, 60), 1)));
+    }
+    
+    private static SetWalkTargetAwayFrom<BlockPos> avoidRepellent() {
+        return SetWalkTargetAwayFrom.pos(MemoryModuleType.NEAREST_REPELLENT, 1.0f, 8, false);
+    }
+    
+    private static CopyMemoryWithExpiry<Piglin, LivingEntity> babyAvoidNemesis() {
+        return new CopyMemoryWithExpiry<Piglin, LivingEntity>(Piglin::isBaby, MemoryModuleType.NEAREST_VISIBLE_NEMESIS, MemoryModuleType.AVOID_TARGET, PiglinAi.BABY_AVOID_NEMESIS_DURATION);
+    }
+    
+    private static CopyMemoryWithExpiry<Piglin, LivingEntity> avoidZombified() {
+        return new CopyMemoryWithExpiry<Piglin, LivingEntity>(PiglinAi::isNearZombified, MemoryModuleType.NEAREST_VISIBLE_ZOMBIFIED, MemoryModuleType.AVOID_TARGET, PiglinAi.AVOID_ZOMBIFIED_DURATION);
+    }
+    
+    protected static void updateActivity(final Piglin bdc) {
+        final Brain<Piglin> apr2 = bdc.getBrain();
+        final Activity bfl3 = apr2.getActiveNonCoreActivity().orElse(null);
+        apr2.setActiveActivityToFirstValid(ImmutableList.<Activity>of(Activity.ADMIRE_ITEM, Activity.FIGHT, Activity.AVOID, Activity.CELEBRATE, Activity.RIDE, Activity.IDLE));
+        final Activity bfl4 = apr2.getActiveNonCoreActivity().orElse(null);
+        if (bfl3 != bfl4) {
+            getSoundForCurrentActivity(bdc).ifPresent(bdc::playSound);
+        }
+        bdc.setAggressive(apr2.hasMemoryValue(MemoryModuleType.ATTACK_TARGET));
+        if (!apr2.hasMemoryValue(MemoryModuleType.RIDE_TARGET) && isBabyRidingBaby(bdc)) {
+            bdc.stopRiding();
+        }
+        if (!apr2.hasMemoryValue(MemoryModuleType.CELEBRATE_LOCATION)) {
+            apr2.<Boolean>eraseMemory(MemoryModuleType.DANCING);
+        }
+        bdc.setDancing(apr2.hasMemoryValue(MemoryModuleType.DANCING));
+    }
+    
+    private static boolean isBabyRidingBaby(final Piglin bdc) {
+        if (!bdc.isBaby()) {
+            return false;
+        }
+        final Entity aom2 = bdc.getVehicle();
+        return (aom2 instanceof Piglin && ((Piglin)aom2).isBaby()) || (aom2 instanceof Hoglin && ((Hoglin)aom2).isBaby());
+    }
+    
+    protected static void pickUpItem(final Piglin bdc, final ItemEntity bbg) {
+        stopWalking(bdc);
+        ItemStack bki3;
+        if (bbg.getItem().getItem() == Items.GOLD_NUGGET) {
+            bdc.take(bbg, bbg.getItem().getCount());
+            bki3 = bbg.getItem();
+            bbg.remove();
+        }
+        else {
+            bdc.take(bbg, 1);
+            bki3 = removeOneItemFromItemEntity(bbg);
+        }
+        final Item bke4 = bki3.getItem();
+        if (isLovedItem(bke4)) {
+            holdInOffhand(bdc, bki3);
+            admireGoldItem(bdc);
+            return;
+        }
+        if (isFood(bke4) && !hasEatenRecently(bdc)) {
+            eat(bdc);
+            return;
+        }
+        final boolean boolean5 = bdc.equipItemIfPossible(bki3);
+        if (boolean5) {
+            return;
+        }
+        putInInventory(bdc, bki3);
+    }
+    
+    private static void holdInOffhand(final Piglin bdc, final ItemStack bki) {
+        if (isHoldingItemInOffHand(bdc)) {
+            bdc.spawnAtLocation(bdc.getItemInHand(InteractionHand.OFF_HAND));
+        }
+        bdc.holdInOffHand(bki);
+    }
+    
+    private static ItemStack removeOneItemFromItemEntity(final ItemEntity bbg) {
+        final ItemStack bki2 = bbg.getItem();
+        final ItemStack bki3 = bki2.split(1);
+        if (bki2.isEmpty()) {
+            bbg.remove();
+        }
+        else {
+            bbg.setItem(bki2);
+        }
+        return bki3;
+    }
+    
+    protected static void stopHoldingOffHandItem(final Piglin bdc, final boolean boolean2) {
+        final ItemStack bki3 = bdc.getItemInHand(InteractionHand.OFF_HAND);
+        bdc.setItemInHand(InteractionHand.OFF_HAND, ItemStack.EMPTY);
+        if (bdc.isAdult()) {
+            final boolean boolean3 = isBarterCurrency(bki3.getItem());
+            if (boolean2 && boolean3) {
+                throwItems(bdc, getBarterResponseItems(bdc));
+            }
+            else if (!boolean3) {
+                final boolean boolean4 = bdc.equipItemIfPossible(bki3);
+                if (!boolean4) {
+                    putInInventory(bdc, bki3);
+                }
+            }
+        }
+        else {
+            final boolean boolean3 = bdc.equipItemIfPossible(bki3);
+            if (!boolean3) {
+                final ItemStack bki4 = bdc.getMainHandItem();
+                if (isLovedItem(bki4.getItem())) {
+                    putInInventory(bdc, bki4);
+                }
+                else {
+                    throwItems(bdc, Collections.<ItemStack>singletonList(bki4));
+                }
+                bdc.holdInMainHand(bki3);
+            }
+        }
+    }
+    
+    protected static void cancelAdmiring(final Piglin bdc) {
+        if (isAdmiringItem(bdc) && !bdc.getOffhandItem().isEmpty()) {
+            bdc.spawnAtLocation(bdc.getOffhandItem());
+            bdc.setItemInHand(InteractionHand.OFF_HAND, ItemStack.EMPTY);
+        }
+    }
+    
+    private static void putInInventory(final Piglin bdc, final ItemStack bki) {
+        final ItemStack bki2 = bdc.addToInventory(bki);
+        throwItemsTowardRandomPos(bdc, Collections.<ItemStack>singletonList(bki2));
+    }
+    
+    private static void throwItems(final Piglin bdc, final List<ItemStack> list) {
+        final Optional<Player> optional3 = bdc.getBrain().<Player>getMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER);
+        if (optional3.isPresent()) {
+            throwItemsTowardPlayer(bdc, optional3.get(), list);
+        }
+        else {
+            throwItemsTowardRandomPos(bdc, list);
+        }
+    }
+    
+    private static void throwItemsTowardRandomPos(final Piglin bdc, final List<ItemStack> list) {
+        throwItemsTowardPos(bdc, list, getRandomNearbyPos(bdc));
+    }
+    
+    private static void throwItemsTowardPlayer(final Piglin bdc, final Player bec, final List<ItemStack> list) {
+        throwItemsTowardPos(bdc, list, bec.position());
+    }
+    
+    private static void throwItemsTowardPos(final Piglin bdc, final List<ItemStack> list, final Vec3 dem) {
+        if (!list.isEmpty()) {
+            bdc.swing(InteractionHand.OFF_HAND);
+            for (final ItemStack bki5 : list) {
+                BehaviorUtils.throwItem(bdc, bki5, dem.add(0.0, 1.0, 0.0));
+            }
+        }
+    }
+    
+    private static List<ItemStack> getBarterResponseItems(final Piglin bdc) {
+        final LootTable daw2 = bdc.level.getServer().getLootTables().get(BuiltInLootTables.PIGLIN_BARTERING);
+        final List<ItemStack> list3 = daw2.getRandomItems(new LootContext.Builder((ServerLevel)bdc.level).<Entity>withParameter(LootContextParams.THIS_ENTITY, bdc).withRandom(bdc.level.random).create(LootContextParamSets.PIGLIN_BARTER));
+        return list3;
+    }
+    
+    private static boolean wantsToDance(final LivingEntity aoy1, final LivingEntity aoy2) {
+        return aoy2.getType() == EntityType.HOGLIN && new Random(aoy1.level.getGameTime()).nextFloat() < 0.1f;
+    }
+    
+    protected static boolean wantsToPickup(final Piglin bdc, final ItemStack bki) {
+        final Item bke3 = bki.getItem();
+        if (bke3.is(ItemTags.PIGLIN_REPELLENTS)) {
+            return false;
+        }
+        if (isAdmiringDisabled(bdc) && bdc.getBrain().hasMemoryValue(MemoryModuleType.ATTACK_TARGET)) {
+            return false;
+        }
+        if (isBarterCurrency(bke3)) {
+            return isNotHoldingLovedItemInOffHand(bdc);
+        }
+        final boolean boolean4 = bdc.canAddToInventory(bki);
+        if (bke3 == Items.GOLD_NUGGET) {
+            return boolean4;
+        }
+        if (isFood(bke3)) {
+            return !hasEatenRecently(bdc) && boolean4;
+        }
+        if (isLovedItem(bke3)) {
+            return isNotHoldingLovedItemInOffHand(bdc) && boolean4;
+        }
+        return bdc.canReplaceCurrentItem(bki);
+    }
+    
+    protected static boolean isLovedItem(final Item bke) {
+        return bke.is(ItemTags.PIGLIN_LOVED);
+    }
+    
+    private static boolean wantsToStopRiding(final Piglin bdc, final Entity aom) {
+        if (aom instanceof Mob) {
+            final Mob aoz3 = (Mob)aom;
+            return !aoz3.isBaby() || !aoz3.isAlive() || wasHurtRecently(bdc) || wasHurtRecently(aoz3) || (aoz3 instanceof Piglin && aoz3.getVehicle() == null);
+        }
+        return false;
+    }
+    
+    private static boolean isNearestValidAttackTarget(final Piglin bdc, final LivingEntity aoy) {
+        return findNearestValidAttackTarget(bdc).filter(aoy2 -> aoy2 == aoy).isPresent();
+    }
+    
+    private static boolean isNearZombified(final Piglin bdc) {
+        final Brain<Piglin> apr2 = bdc.getBrain();
+        if (apr2.hasMemoryValue(MemoryModuleType.NEAREST_VISIBLE_ZOMBIFIED)) {
+            final LivingEntity aoy3 = apr2.<LivingEntity>getMemory(MemoryModuleType.NEAREST_VISIBLE_ZOMBIFIED).get();
+            return bdc.closerThan(aoy3, 6.0);
+        }
+        return false;
+    }
+    
+    private static Optional<? extends LivingEntity> findNearestValidAttackTarget(final Piglin bdc) {
+        final Brain<Piglin> apr2 = bdc.getBrain();
+        if (isNearZombified(bdc)) {
+            return Optional.empty();
+        }
+        final Optional<LivingEntity> optional3 = BehaviorUtils.getLivingEntityFromUUIDMemory(bdc, MemoryModuleType.ANGRY_AT);
+        if (optional3.isPresent() && isAttackAllowed(optional3.get())) {
+            return optional3;
+        }
+        if (apr2.hasMemoryValue(MemoryModuleType.UNIVERSAL_ANGER)) {
+            final Optional<Player> optional4 = apr2.<Player>getMemory(MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER);
+            if (optional4.isPresent()) {
+                return optional4;
+            }
+        }
+        final Optional<Mob> optional5 = apr2.<Mob>getMemory(MemoryModuleType.NEAREST_VISIBLE_NEMESIS);
+        if (optional5.isPresent()) {
+            return optional5;
+        }
+        final Optional<Player> optional6 = apr2.<Player>getMemory(MemoryModuleType.NEAREST_TARGETABLE_PLAYER_NOT_WEARING_GOLD);
+        if (optional6.isPresent() && isAttackAllowed(optional6.get())) {
+            return optional6;
+        }
+        return Optional.empty();
+    }
+    
+    public static void angerNearbyPiglins(final Player bec, final boolean boolean2) {
+        final List<Piglin> list3 = bec.level.<Piglin>getEntitiesOfClass(Piglin.class, bec.getBoundingBox().inflate(16.0));
+        list3.stream().filter(PiglinAi::isIdle).filter(bdc -> !boolean2 || BehaviorUtils.canSee(bdc, bec)).forEach(bdc -> {
+            if (bdc.level.getGameRules().getBoolean(GameRules.RULE_UNIVERSAL_ANGER)) {
+                setAngerTargetToNearestTargetablePlayerIfFound(bdc, bec);
+            }
+            else {
+                setAngerTarget(bdc, bec);
+            }
+        });
+    }
+    
+    public static InteractionResult mobInteract(final Piglin bdc, final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (canAdmire(bdc, bki4)) {
+            final ItemStack bki5 = bki4.split(1);
+            holdInOffhand(bdc, bki5);
+            admireGoldItem(bdc);
+            stopWalking(bdc);
+            return InteractionResult.CONSUME;
+        }
+        return InteractionResult.PASS;
+    }
+    
+    protected static boolean canAdmire(final Piglin bdc, final ItemStack bki) {
+        return !isAdmiringDisabled(bdc) && !isAdmiringItem(bdc) && bdc.isAdult() && isBarterCurrency(bki.getItem());
+    }
+    
+    protected static void wasHurtBy(final Piglin bdc, final LivingEntity aoy) {
+        if (aoy instanceof Piglin) {
+            return;
+        }
+        if (isHoldingItemInOffHand(bdc)) {
+            stopHoldingOffHandItem(bdc, false);
+        }
+        final Brain<Piglin> apr3 = bdc.getBrain();
+        apr3.<BlockPos>eraseMemory(MemoryModuleType.CELEBRATE_LOCATION);
+        apr3.<Boolean>eraseMemory(MemoryModuleType.DANCING);
+        apr3.<Boolean>eraseMemory(MemoryModuleType.ADMIRING_ITEM);
+        if (aoy instanceof Player) {
+            apr3.<Boolean>setMemoryWithExpiry(MemoryModuleType.ADMIRING_DISABLED, true, 400L);
+        }
+        final Brain brain;
+        getAvoidTarget(bdc).ifPresent(aoy3 -> {
+            if (aoy3.getType() != aoy.getType()) {
+                brain.eraseMemory(MemoryModuleType.AVOID_TARGET);
+            }
+            return;
+        });
+        if (bdc.isBaby()) {
+            apr3.<LivingEntity>setMemoryWithExpiry(MemoryModuleType.AVOID_TARGET, aoy, 100L);
+            if (isAttackAllowed(aoy)) {
+                broadcastAngerTarget(bdc, aoy);
+            }
+            return;
+        }
+        if (aoy.getType() == EntityType.HOGLIN && hoglinsOutnumberPiglins(bdc)) {
+            setAvoidTargetAndDontHuntForAWhile(bdc, aoy);
+            broadcastRetreat(bdc, aoy);
+            return;
+        }
+        maybeRetaliate(bdc, aoy);
+    }
+    
+    private static void maybeRetaliate(final Piglin bdc, final LivingEntity aoy) {
+        if (bdc.getBrain().isActive(Activity.AVOID)) {
+            return;
+        }
+        if (!isAttackAllowed(aoy)) {
+            return;
+        }
+        if (BehaviorUtils.isOtherTargetMuchFurtherAwayThanCurrentAttackTarget(bdc, aoy, 4.0)) {
+            return;
+        }
+        if (aoy.getType() == EntityType.PLAYER && bdc.level.getGameRules().getBoolean(GameRules.RULE_UNIVERSAL_ANGER)) {
+            setAngerTargetToNearestTargetablePlayerIfFound(bdc, aoy);
+            broadcastUniversalAnger(bdc);
+        }
+        else {
+            setAngerTarget(bdc, aoy);
+            broadcastAngerTarget(bdc, aoy);
+        }
+    }
+    
+    public static Optional<SoundEvent> getSoundForCurrentActivity(final Piglin bdc) {
+        return bdc.getBrain().getActiveNonCoreActivity().<SoundEvent>map(bfl -> getSoundForActivity(bdc, bfl));
+    }
+    
+    private static SoundEvent getSoundForActivity(final Piglin bdc, final Activity bfl) {
+        if (bfl == Activity.FIGHT) {
+            return SoundEvents.PIGLIN_ANGRY;
+        }
+        if (bdc.isConverting()) {
+            return SoundEvents.PIGLIN_RETREAT;
+        }
+        if (bfl == Activity.AVOID && isNearAvoidTarget(bdc)) {
+            return SoundEvents.PIGLIN_RETREAT;
+        }
+        if (bfl == Activity.ADMIRE_ITEM) {
+            return SoundEvents.PIGLIN_ADMIRING_ITEM;
+        }
+        if (bfl == Activity.CELEBRATE) {
+            return SoundEvents.PIGLIN_CELEBRATE;
+        }
+        if (seesPlayerHoldingLovedItem(bdc)) {
+            return SoundEvents.PIGLIN_JEALOUS;
+        }
+        if (isNearRepellent(bdc)) {
+            return SoundEvents.PIGLIN_RETREAT;
+        }
+        return SoundEvents.PIGLIN_AMBIENT;
+    }
+    
+    private static boolean isNearAvoidTarget(final Piglin bdc) {
+        final Brain<Piglin> apr2 = bdc.getBrain();
+        return apr2.hasMemoryValue(MemoryModuleType.AVOID_TARGET) && apr2.<LivingEntity>getMemory(MemoryModuleType.AVOID_TARGET).get().closerThan(bdc, 12.0);
+    }
+    
+    protected static boolean hasAnyoneNearbyHuntedRecently(final Piglin bdc) {
+        return bdc.getBrain().hasMemoryValue(MemoryModuleType.HUNTED_RECENTLY) || getVisibleAdultPiglins(bdc).stream().anyMatch(bdc -> bdc.getBrain().hasMemoryValue(MemoryModuleType.HUNTED_RECENTLY));
+    }
+    
+    private static List<Piglin> getVisibleAdultPiglins(final Piglin bdc) {
+        return bdc.getBrain().<List<Piglin>>getMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLINS).orElse(ImmutableList.of());
+    }
+    
+    private static List<Piglin> getAdultPiglins(final Piglin bdc) {
+        return bdc.getBrain().<List<Piglin>>getMemory(MemoryModuleType.NEAREST_ADULT_PIGLINS).orElse(ImmutableList.of());
+    }
+    
+    public static boolean isWearingGold(final LivingEntity aoy) {
+        final Iterable<ItemStack> iterable2 = aoy.getArmorSlots();
+        for (final ItemStack bki4 : iterable2) {
+            final Item bke5 = bki4.getItem();
+            if (bke5 instanceof ArmorItem && ((ArmorItem)bke5).getMaterial() == ArmorMaterials.GOLD) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    private static void stopWalking(final Piglin bdc) {
+        bdc.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        bdc.getNavigation().stop();
+    }
+    
+    private static RunSometimes<Piglin> babySometimesRideBabyHoglin() {
+        return new RunSometimes<Piglin>(new CopyMemoryWithExpiry(Piglin::isBaby, MemoryModuleType.NEAREST_VISIBLE_BABY_HOGLIN, (MemoryModuleType<Object>)MemoryModuleType.RIDE_TARGET, PiglinAi.RIDE_DURATION), PiglinAi.RIDE_START_INTERVAL);
+    }
+    
+    protected static void broadcastAngerTarget(final Piglin bdc, final LivingEntity aoy) {
+        getAdultPiglins(bdc).forEach(bdc -> {
+            if (aoy.getType() != EntityType.HOGLIN || (bdc.canHunt() && ((Hoglin)aoy).canBeHunted())) {
+                setAngerTargetIfCloserThanCurrent(bdc, aoy);
+            }
+        });
+    }
+    
+    protected static void broadcastUniversalAnger(final Piglin bdc) {
+        getAdultPiglins(bdc).forEach(bdc -> getNearestVisibleTargetablePlayer(bdc).ifPresent(bec -> setAngerTarget(bdc, bec)));
+    }
+    
+    protected static void broadcastDontKillAnyMoreHoglinsForAWhile(final Piglin bdc) {
+        getVisibleAdultPiglins(bdc).forEach(PiglinAi::dontKillAnyMoreHoglinsForAWhile);
+    }
+    
+    protected static void setAngerTarget(final Piglin bdc, final LivingEntity aoy) {
+        if (!isAttackAllowed(aoy)) {
+            return;
+        }
+        bdc.getBrain().<Long>eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
+        bdc.getBrain().<UUID>setMemoryWithExpiry(MemoryModuleType.ANGRY_AT, aoy.getUUID(), 600L);
+        if (aoy.getType() == EntityType.HOGLIN) {
+            dontKillAnyMoreHoglinsForAWhile(bdc);
+        }
+        if (aoy.getType() == EntityType.PLAYER && bdc.level.getGameRules().getBoolean(GameRules.RULE_UNIVERSAL_ANGER)) {
+            bdc.getBrain().<Boolean>setMemoryWithExpiry(MemoryModuleType.UNIVERSAL_ANGER, true, 600L);
+        }
+    }
+    
+    private static void setAngerTargetToNearestTargetablePlayerIfFound(final Piglin bdc, final LivingEntity aoy) {
+        final Optional<Player> optional3 = getNearestVisibleTargetablePlayer(bdc);
+        if (optional3.isPresent()) {
+            setAngerTarget(bdc, optional3.get());
+        }
+        else {
+            setAngerTarget(bdc, aoy);
+        }
+    }
+    
+    private static void setAngerTargetIfCloserThanCurrent(final Piglin bdc, final LivingEntity aoy) {
+        final Optional<LivingEntity> optional3 = getAngerTarget(bdc);
+        final LivingEntity aoy2 = BehaviorUtils.getNearestTarget(bdc, optional3, aoy);
+        if (optional3.isPresent() && optional3.get() == aoy2) {
+            return;
+        }
+        setAngerTarget(bdc, aoy2);
+    }
+    
+    private static Optional<LivingEntity> getAngerTarget(final Piglin bdc) {
+        return BehaviorUtils.getLivingEntityFromUUIDMemory(bdc, MemoryModuleType.ANGRY_AT);
+    }
+    
+    public static Optional<LivingEntity> getAvoidTarget(final Piglin bdc) {
+        if (bdc.getBrain().hasMemoryValue(MemoryModuleType.AVOID_TARGET)) {
+            return bdc.getBrain().<LivingEntity>getMemory(MemoryModuleType.AVOID_TARGET);
+        }
+        return Optional.<LivingEntity>empty();
+    }
+    
+    public static Optional<Player> getNearestVisibleTargetablePlayer(final Piglin bdc) {
+        if (bdc.getBrain().hasMemoryValue(MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER)) {
+            return bdc.getBrain().<Player>getMemory(MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER);
+        }
+        return Optional.<Player>empty();
+    }
+    
+    private static void broadcastRetreat(final Piglin bdc, final LivingEntity aoy) {
+        getVisibleAdultPiglins(bdc).forEach(bdc -> retreatFromNearestTarget(bdc, aoy));
+    }
+    
+    private static void retreatFromNearestTarget(final Piglin bdc, final LivingEntity aoy) {
+        final Brain<Piglin> apr3 = bdc.getBrain();
+        LivingEntity aoy2 = aoy;
+        aoy2 = BehaviorUtils.getNearestTarget(bdc, apr3.<LivingEntity>getMemory(MemoryModuleType.AVOID_TARGET), aoy2);
+        aoy2 = BehaviorUtils.getNearestTarget(bdc, apr3.<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET), aoy2);
+        setAvoidTargetAndDontHuntForAWhile(bdc, aoy2);
+    }
+    
+    private static boolean wantsToStopFleeing(final Piglin bdc) {
+        final Brain<Piglin> apr2 = bdc.getBrain();
+        if (!apr2.hasMemoryValue(MemoryModuleType.AVOID_TARGET)) {
+            return true;
+        }
+        final LivingEntity aoy3 = apr2.<LivingEntity>getMemory(MemoryModuleType.AVOID_TARGET).get();
+        final EntityType<?> aoq4 = aoy3.getType();
+        if (aoq4 == EntityType.HOGLIN) {
+            return piglinsEqualOrOutnumberHoglins(bdc);
+        }
+        return isZombified(aoq4) && !apr2.<LivingEntity>isMemoryValue(MemoryModuleType.NEAREST_VISIBLE_ZOMBIFIED, aoy3);
+    }
+    
+    private static boolean piglinsEqualOrOutnumberHoglins(final Piglin bdc) {
+        return !hoglinsOutnumberPiglins(bdc);
+    }
+    
+    private static boolean hoglinsOutnumberPiglins(final Piglin bdc) {
+        final int integer2 = bdc.getBrain().<Integer>getMemory(MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT).orElse(0) + 1;
+        final int integer3 = bdc.getBrain().<Integer>getMemory(MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT).orElse(0);
+        return integer3 > integer2;
+    }
+    
+    private static void setAvoidTargetAndDontHuntForAWhile(final Piglin bdc, final LivingEntity aoy) {
+        bdc.getBrain().<UUID>eraseMemory(MemoryModuleType.ANGRY_AT);
+        bdc.getBrain().<LivingEntity>eraseMemory(MemoryModuleType.ATTACK_TARGET);
+        bdc.getBrain().<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        bdc.getBrain().<LivingEntity>setMemoryWithExpiry(MemoryModuleType.AVOID_TARGET, aoy, PiglinAi.RETREAT_DURATION.randomValue(bdc.level.random));
+        dontKillAnyMoreHoglinsForAWhile(bdc);
+    }
+    
+    protected static void dontKillAnyMoreHoglinsForAWhile(final Piglin bdc) {
+        bdc.getBrain().<Boolean>setMemoryWithExpiry(MemoryModuleType.HUNTED_RECENTLY, true, PiglinAi.TIME_BETWEEN_HUNTS.randomValue(bdc.level.random));
+    }
+    
+    private static void eat(final Piglin bdc) {
+        bdc.getBrain().<Boolean>setMemoryWithExpiry(MemoryModuleType.ATE_RECENTLY, true, 200L);
+    }
+    
+    private static Vec3 getRandomNearbyPos(final Piglin bdc) {
+        final Vec3 dem2 = RandomPos.getLandPos(bdc, 4, 2);
+        return (dem2 == null) ? bdc.position() : dem2;
+    }
+    
+    private static boolean hasEatenRecently(final Piglin bdc) {
+        return bdc.getBrain().hasMemoryValue(MemoryModuleType.ATE_RECENTLY);
+    }
+    
+    protected static boolean isIdle(final Piglin bdc) {
+        return bdc.getBrain().isActive(Activity.IDLE);
+    }
+    
+    private static boolean hasCrossbow(final LivingEntity aoy) {
+        return aoy.isHolding(Items.CROSSBOW);
+    }
+    
+    private static void admireGoldItem(final LivingEntity aoy) {
+        aoy.getBrain().<Boolean>setMemoryWithExpiry(MemoryModuleType.ADMIRING_ITEM, true, 120L);
+    }
+    
+    private static boolean isAdmiringItem(final Piglin bdc) {
+        return bdc.getBrain().hasMemoryValue(MemoryModuleType.ADMIRING_ITEM);
+    }
+    
+    private static boolean isBarterCurrency(final Item bke) {
+        return bke == PiglinAi.BARTERING_ITEM;
+    }
+    
+    private static boolean isFood(final Item bke) {
+        return PiglinAi.FOOD_ITEMS.contains(bke);
+    }
+    
+    private static boolean isAttackAllowed(final LivingEntity aoy) {
+        return EntitySelector.ATTACK_ALLOWED.test(aoy);
+    }
+    
+    private static boolean isNearRepellent(final Piglin bdc) {
+        return bdc.getBrain().hasMemoryValue(MemoryModuleType.NEAREST_REPELLENT);
+    }
+    
+    private static boolean seesPlayerHoldingLovedItem(final LivingEntity aoy) {
+        return aoy.getBrain().hasMemoryValue(MemoryModuleType.NEAREST_PLAYER_HOLDING_WANTED_ITEM);
+    }
+    
+    private static boolean doesntSeeAnyPlayerHoldingLovedItem(final LivingEntity aoy) {
+        return !seesPlayerHoldingLovedItem(aoy);
+    }
+    
+    public static boolean isPlayerHoldingLovedItem(final LivingEntity aoy) {
+        return aoy.getType() == EntityType.PLAYER && aoy.isHolding(PiglinAi::isLovedItem);
+    }
+    
+    private static boolean isAdmiringDisabled(final Piglin bdc) {
+        return bdc.getBrain().hasMemoryValue(MemoryModuleType.ADMIRING_DISABLED);
+    }
+    
+    private static boolean wasHurtRecently(final LivingEntity aoy) {
+        return aoy.getBrain().hasMemoryValue(MemoryModuleType.HURT_BY);
+    }
+    
+    private static boolean isHoldingItemInOffHand(final Piglin bdc) {
+        return !bdc.getOffhandItem().isEmpty();
+    }
+    
+    private static boolean isNotHoldingLovedItemInOffHand(final Piglin bdc) {
+        return bdc.getOffhandItem().isEmpty() || !isLovedItem(bdc.getOffhandItem().getItem());
+    }
+    
+    public static boolean isZombified(final EntityType aoq) {
+        return aoq == EntityType.ZOMBIFIED_PIGLIN || aoq == EntityType.ZOGLIN;
+    }
+    
+    static {
+        BARTERING_ITEM = Items.GOLD_INGOT;
+        TIME_BETWEEN_HUNTS = TimeUtil.rangeOfSeconds(30, 120);
+        RIDE_START_INTERVAL = TimeUtil.rangeOfSeconds(10, 40);
+        RIDE_DURATION = TimeUtil.rangeOfSeconds(10, 30);
+        RETREAT_DURATION = TimeUtil.rangeOfSeconds(5, 20);
+        AVOID_ZOMBIFIED_DURATION = TimeUtil.rangeOfSeconds(5, 7);
+        BABY_AVOID_NEMESIS_DURATION = TimeUtil.rangeOfSeconds(5, 7);
+        FOOD_ITEMS = ImmutableSet.<Item>of(Items.PORKCHOP, Items.COOKED_PORKCHOP);
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/piglin/RememberIfHoglinWasKilled.java b/src/net/minecraft/world/entity/monster/piglin/RememberIfHoglinWasKilled.java
new file mode 100644
index 0000000..b0f1596
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/piglin/RememberIfHoglinWasKilled.java
@@ -0,0 +1,28 @@
+package net.minecraft.world.entity.monster.piglin;
+
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.world.entity.LivingEntity;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+
+public class RememberIfHoglinWasKilled<E extends Piglin> extends Behavior<E> {
+    public RememberIfHoglinWasKilled() {
+        super(ImmutableMap.<MemoryModuleType<LivingEntity>, MemoryStatus>of(MemoryModuleType.ATTACK_TARGET, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<LivingEntity>)MemoryModuleType.HUNTED_RECENTLY, MemoryStatus.REGISTERED));
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E bdc, final long long3) {
+        if (this.isAttackTargetDeadHoglin(bdc)) {
+            PiglinAi.dontKillAnyMoreHoglinsForAWhile(bdc);
+        }
+    }
+    
+    private boolean isAttackTargetDeadHoglin(final E bdc) {
+        final LivingEntity aoy3 = bdc.getBrain().<LivingEntity>getMemory(MemoryModuleType.ATTACK_TARGET).get();
+        return aoy3.getType() == EntityType.HOGLIN && aoy3.isDeadOrDying();
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/piglin/StartAdmiringItemIfSeen.java b/src/net/minecraft/world/entity/monster/piglin/StartAdmiringItemIfSeen.java
new file mode 100644
index 0000000..0a85cec
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/piglin/StartAdmiringItemIfSeen.java
@@ -0,0 +1,30 @@
+package net.minecraft.world.entity.monster.piglin;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.world.entity.item.ItemEntity;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+
+public class StartAdmiringItemIfSeen<E extends Piglin> extends Behavior<E> {
+    private final int admireDuration;
+    
+    public StartAdmiringItemIfSeen(final int integer) {
+        super(ImmutableMap.<MemoryModuleType<ItemEntity>, MemoryStatus>of(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<ItemEntity>)MemoryModuleType.ADMIRING_ITEM, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<ItemEntity>)MemoryModuleType.ADMIRING_DISABLED, MemoryStatus.VALUE_ABSENT));
+        this.admireDuration = integer;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E bdc) {
+        final ItemEntity bbg4 = bdc.getBrain().<ItemEntity>getMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM).get();
+        return PiglinAi.isLovedItem(bbg4.getItem().getItem());
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E bdc, final long long3) {
+        bdc.getBrain().<Boolean>setMemoryWithExpiry(MemoryModuleType.ADMIRING_ITEM, true, this.admireDuration);
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/piglin/StartHuntingHoglin.java b/src/net/minecraft/world/entity/monster/piglin/StartHuntingHoglin.java
new file mode 100644
index 0000000..d929fd9
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/piglin/StartHuntingHoglin.java
@@ -0,0 +1,30 @@
+package net.minecraft.world.entity.monster.piglin;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+
+public class StartHuntingHoglin<E extends Piglin> extends Behavior<E> {
+    public StartHuntingHoglin() {
+        super(ImmutableMap.<MemoryModuleType<Hoglin>, MemoryStatus>of(MemoryModuleType.NEAREST_VISIBLE_HUNTABLE_HOGLIN, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<Hoglin>)MemoryModuleType.ANGRY_AT, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<Hoglin>)MemoryModuleType.HUNTED_RECENTLY, MemoryStatus.VALUE_ABSENT, (MemoryModuleType<Hoglin>)MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLINS, MemoryStatus.REGISTERED));
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final Piglin bdc) {
+        return !bdc.isBaby() && !PiglinAi.hasAnyoneNearbyHuntedRecently(bdc);
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E bdc, final long long3) {
+        final Hoglin bcx6 = bdc.getBrain().<Hoglin>getMemory(MemoryModuleType.NEAREST_VISIBLE_HUNTABLE_HOGLIN).get();
+        PiglinAi.setAngerTarget(bdc, bcx6);
+        PiglinAi.dontKillAnyMoreHoglinsForAWhile(bdc);
+        PiglinAi.broadcastAngerTarget(bdc, bcx6);
+        PiglinAi.broadcastDontKillAnyMoreHoglinsForAWhile(bdc);
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/piglin/StopAdmiringIfItemTooFarAway.java b/src/net/minecraft/world/entity/monster/piglin/StopAdmiringIfItemTooFarAway.java
new file mode 100644
index 0000000..c2ccf96
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/piglin/StopAdmiringIfItemTooFarAway.java
@@ -0,0 +1,35 @@
+package net.minecraft.world.entity.monster.piglin;
+
+import net.minecraft.world.entity.LivingEntity;
+import java.util.Optional;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+
+public class StopAdmiringIfItemTooFarAway<E extends Piglin> extends Behavior<E> {
+    private final int maxDistanceToItem;
+    
+    public StopAdmiringIfItemTooFarAway(final int integer) {
+        super(ImmutableMap.<MemoryModuleType<Boolean>, MemoryStatus>of(MemoryModuleType.ADMIRING_ITEM, MemoryStatus.VALUE_PRESENT, (MemoryModuleType<Boolean>)MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, MemoryStatus.REGISTERED));
+        this.maxDistanceToItem = integer;
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E bdc) {
+        if (!bdc.getOffhandItem().isEmpty()) {
+            return false;
+        }
+        final Optional<ItemEntity> optional4 = bdc.getBrain().<ItemEntity>getMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM);
+        return !optional4.isPresent() || !optional4.get().closerThan(bdc, this.maxDistanceToItem);
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E bdc, final long long3) {
+        bdc.getBrain().<Boolean>eraseMemory(MemoryModuleType.ADMIRING_ITEM);
+    }
+}
diff --git a/src/net/minecraft/world/entity/monster/piglin/StopHoldingItemIfNoLongerAdmiring.java b/src/net/minecraft/world/entity/monster/piglin/StopHoldingItemIfNoLongerAdmiring.java
new file mode 100644
index 0000000..e73c9e8
--- /dev/null
+++ b/src/net/minecraft/world/entity/monster/piglin/StopHoldingItemIfNoLongerAdmiring.java
@@ -0,0 +1,26 @@
+package net.minecraft.world.entity.monster.piglin;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.Items;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+
+public class StopHoldingItemIfNoLongerAdmiring<E extends Piglin> extends Behavior<E> {
+    public StopHoldingItemIfNoLongerAdmiring() {
+        super(ImmutableMap.<MemoryModuleType<Boolean>, MemoryStatus>of(MemoryModuleType.ADMIRING_ITEM, MemoryStatus.VALUE_ABSENT));
+    }
+    
+    @Override
+    protected boolean checkExtraStartConditions(final ServerLevel zd, final E bdc) {
+        return !bdc.getOffhandItem().isEmpty() && bdc.getOffhandItem().getItem() != Items.SHIELD;
+    }
+    
+    @Override
+    protected void start(final ServerLevel zd, final E bdc, final long long3) {
+        PiglinAi.stopHoldingOffHandItem(bdc, true);
+    }
+}
diff --git a/src/net/minecraft/world/entity/npc/AbstractVillager.java b/src/net/minecraft/world/entity/npc/AbstractVillager.java
index 6916dd1..c28d07e 100644
--- a/src/net/minecraft/world/entity/npc/AbstractVillager.java
+++ b/src/net/minecraft/world/entity/npc/AbstractVillager.java
@@ -1,6 +1,5 @@
 package net.minecraft.world.entity.npc;
 
-import java.util.AbstractList;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import java.util.Iterator;
@@ -9,8 +8,7 @@ import com.google.common.collect.Sets;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.nbt.ListTag;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.nbt.Tag;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
@@ -25,6 +23,7 @@ import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.DifficultyInstance;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.SimpleContainer;
@@ -43,18 +42,20 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
     protected MerchantOffers offers;
     private final SimpleContainer inventory;
     
-    public AbstractVillager(final EntityType<? extends AbstractVillager> aku, final Level bjw) {
-        super(aku, bjw);
+    public AbstractVillager(final EntityType<? extends AbstractVillager> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.inventory = new SimpleContainer(8);
+        this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 16.0f);
+        this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, -1.0f);
     }
     
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        if (alm == null) {
-            alm = new AgableMobGroupData();
-            ((AgableMobGroupData)alm).setShouldSpawnBaby(false);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable SpawnGroupData apo, @Nullable final CompoundTag le) {
+        if (apo == null) {
+            apo = new AgableMobGroupData();
+            ((AgableMobGroupData)apo).setShouldSpawnBaby(false);
         }
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     public int getUnhappyCounter() {
@@ -71,7 +72,7 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
     }
     
     @Override
-    protected float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
+    protected float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
         if (this.isBaby()) {
             return 0.81f;
         }
@@ -85,8 +86,8 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
     }
     
     @Override
-    public void setTradingPlayer(@Nullable final Player ayj) {
-        this.tradingPlayer = ayj;
+    public void setTradingPlayer(@Nullable final Player bec) {
+        this.tradingPlayer = bec;
     }
     
     @Nullable
@@ -109,7 +110,7 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
     }
     
     @Override
-    public void overrideOffers(@Nullable final MerchantOffers bja) {
+    public void overrideOffers(@Nullable final MerchantOffers bpa) {
     }
     
     @Override
@@ -117,16 +118,16 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
     }
     
     @Override
-    public void notifyTrade(final MerchantOffer biz) {
-        biz.increaseUses();
+    public void notifyTrade(final MerchantOffer boz) {
+        boz.increaseUses();
         this.ambientSoundTime = -this.getAmbientSoundInterval();
-        this.rewardTradeXp(biz);
+        this.rewardTradeXp(boz);
         if (this.tradingPlayer instanceof ServerPlayer) {
-            CriteriaTriggers.TRADE.trigger((ServerPlayer)this.tradingPlayer, this, biz.getResult());
+            CriteriaTriggers.TRADE.trigger((ServerPlayer)this.tradingPlayer, this, boz.getResult());
         }
     }
     
-    protected abstract void rewardTradeXp(final MerchantOffer biz);
+    protected abstract void rewardTradeXp(final MerchantOffer boz);
     
     @Override
     public boolean showProgressBar() {
@@ -134,10 +135,10 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
     }
     
     @Override
-    public void notifyTradeUpdated(final ItemStack ben) {
+    public void notifyTradeUpdated(final ItemStack bki) {
         if (!this.level.isClientSide && this.ambientSoundTime > -this.getAmbientSoundInterval() + 20) {
             this.ambientSoundTime = -this.getAmbientSoundInterval();
-            this.playSound(this.getTradeUpdatedSound(!ben.isEmpty()), this.getSoundVolume(), this.getVoicePitch());
+            this.playSound(this.getTradeUpdatedSound(!bki.isEmpty()), this.getSoundVolume(), this.getVoicePitch());
         }
     }
     
@@ -155,42 +156,29 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        final MerchantOffers bja3 = this.getOffers();
-        if (!bja3.isEmpty()) {
-            jt.put("Offers", bja3.createTag());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        final MerchantOffers bpa3 = this.getOffers();
+        if (!bpa3.isEmpty()) {
+            le.put("Offers", bpa3.createTag());
         }
-        final ListTag jz4 = new ListTag();
-        for (int integer5 = 0; integer5 < this.inventory.getContainerSize(); ++integer5) {
-            final ItemStack ben6 = this.inventory.getItem(integer5);
-            if (!ben6.isEmpty()) {
-                ((AbstractList<CompoundTag>)jz4).add(ben6.save(new CompoundTag()));
-            }
-        }
-        jt.put("Inventory", jz4);
+        le.put("Inventory", this.inventory.createTag());
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("Offers", 10)) {
-            this.offers = new MerchantOffers(jt.getCompound("Offers"));
-        }
-        final ListTag jz3 = jt.getList("Inventory", 10);
-        for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-            final ItemStack ben5 = ItemStack.of(jz3.getCompound(integer4));
-            if (!ben5.isEmpty()) {
-                this.inventory.addItem(ben5);
-            }
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("Offers", 10)) {
+            this.offers = new MerchantOffers(le.getCompound("Offers"));
         }
+        this.inventory.fromTag(le.getList("Inventory", 10));
     }
     
     @Nullable
     @Override
-    public Entity changeDimension(final DimensionType cbi) {
+    public Entity changeDimension(final ServerLevel zd) {
         this.stopTrading();
-        return super.changeDimension(cbi);
+        return super.changeDimension(zd);
     }
     
     protected void stopTrading() {
@@ -198,22 +186,22 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
     }
     
     @Override
-    public void die(final DamageSource ajz) {
-        super.die(ajz);
+    public void die(final DamageSource anw) {
+        super.die(anw);
         this.stopTrading();
     }
     
-    protected void addParticlesAroundSelf(final ParticleOptions gt) {
+    protected void addParticlesAroundSelf(final ParticleOptions hf) {
         for (int integer3 = 0; integer3 < 5; ++integer3) {
             final double double4 = this.random.nextGaussian() * 0.02;
             final double double5 = this.random.nextGaussian() * 0.02;
             final double double6 = this.random.nextGaussian() * 0.02;
-            this.level.addParticle(gt, this.getRandomX(1.0), this.getRandomY() + 1.0, this.getRandomZ(1.0), double4, double5, double6);
+            this.level.addParticle(hf, this.getRandomX(1.0), this.getRandomY() + 1.0, this.getRandomZ(1.0), double4, double5, double6);
         }
     }
     
     @Override
-    public boolean canBeLeashed(final Player ayj) {
+    public boolean canBeLeashed(final Player bec) {
         return false;
     }
     
@@ -222,13 +210,13 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
     }
     
     @Override
-    public boolean setSlot(final int integer, final ItemStack ben) {
-        if (super.setSlot(integer, ben)) {
+    public boolean setSlot(final int integer, final ItemStack bki) {
+        if (super.setSlot(integer, bki)) {
             return true;
         }
         final int integer2 = integer - 300;
         if (integer2 >= 0 && integer2 < this.inventory.getContainerSize()) {
-            this.inventory.setItem(integer2, ben);
+            this.inventory.setItem(integer2, bki);
             return true;
         }
         return false;
@@ -241,7 +229,7 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
     
     protected abstract void updateTrades();
     
-    protected void addOffersFromItemListings(final MerchantOffers bja, final VillagerTrades.ItemListing[] arr, final int integer) {
+    protected void addOffersFromItemListings(final MerchantOffers bpa, final VillagerTrades.ItemListing[] arr, final int integer) {
         final Set<Integer> set5 = Sets.newHashSet();
         if (arr.length > integer) {
             while (set5.size() < integer) {
@@ -255,9 +243,9 @@ public abstract class AbstractVillager extends AgableMob implements Npc, Merchan
         }
         for (final Integer integer3 : set5) {
             final VillagerTrades.ItemListing f8 = arr[integer3];
-            final MerchantOffer biz9 = f8.getOffer(this, this.random);
-            if (biz9 != null) {
-                bja.add(biz9);
+            final MerchantOffer boz9 = f8.getOffer(this, this.random);
+            if (boz9 != null) {
+                bpa.add(boz9);
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/npc/CatSpawner.java b/src/net/minecraft/world/entity/npc/CatSpawner.java
index fd3a1c7..40926d6 100644
--- a/src/net/minecraft/world/entity/npc/CatSpawner.java
+++ b/src/net/minecraft/world/entity/npc/CatSpawner.java
@@ -1,32 +1,34 @@
 package net.minecraft.world.entity.npc;
 
+import net.minecraft.world.entity.Entity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.SpawnGroupData;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.MobSpawnType;
 import java.util.List;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.animal.Cat;
 import net.minecraft.world.entity.ai.village.poi.PoiManager;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
+import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.NaturalSpawner;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.SpawnPlacements;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.CustomSpawner;
 
-public class CatSpawner {
+public class CatSpawner implements CustomSpawner {
     private int nextTick;
     
-    public int tick(final ServerLevel xd, final boolean boolean2, final boolean boolean3) {
-        if (!boolean3 || !xd.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
+    @Override
+    public int tick(final ServerLevel zd, final boolean boolean2, final boolean boolean3) {
+        if (!boolean3 || !zd.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
             return 0;
         }
         --this.nextTick;
@@ -34,56 +36,56 @@ public class CatSpawner {
             return 0;
         }
         this.nextTick = 1200;
-        final Player ayj5 = xd.getRandomPlayer();
-        if (ayj5 == null) {
+        final Player bec5 = zd.getRandomPlayer();
+        if (bec5 == null) {
             return 0;
         }
-        final Random random6 = xd.random;
+        final Random random6 = zd.random;
         final int integer7 = (8 + random6.nextInt(24)) * (random6.nextBoolean() ? -1 : 1);
         final int integer8 = (8 + random6.nextInt(24)) * (random6.nextBoolean() ? -1 : 1);
-        final BlockPos fk9 = new BlockPos(ayj5).offset(integer7, 0, integer8);
-        if (!xd.hasChunksAt(fk9.getX() - 10, fk9.getY() - 10, fk9.getZ() - 10, fk9.getX() + 10, fk9.getY() + 10, fk9.getZ() + 10)) {
+        final BlockPos fu9 = bec5.blockPosition().offset(integer7, 0, integer8);
+        if (!zd.hasChunksAt(fu9.getX() - 10, fu9.getY() - 10, fu9.getZ() - 10, fu9.getX() + 10, fu9.getY() + 10, fu9.getZ() + 10)) {
             return 0;
         }
-        if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, xd, fk9, EntityType.CAT)) {
-            if (xd.closeToVillage(fk9, 2)) {
-                return this.spawnInVillage(xd, fk9);
+        if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, zd, fu9, EntityType.CAT)) {
+            if (zd.isCloseToVillage(fu9, 2)) {
+                return this.spawnInVillage(zd, fu9);
             }
-            if (Feature.SWAMP_HUT.isInsideFeature(xd, fk9)) {
-                return this.spawnInHut(xd, fk9);
+            if (zd.structureFeatureManager().getStructureAt(fu9, true, StructureFeature.SWAMP_HUT).isValid()) {
+                return this.spawnInHut(zd, fu9);
             }
         }
         return 0;
     }
     
-    private int spawnInVillage(final ServerLevel xd, final BlockPos fk) {
+    private int spawnInVillage(final ServerLevel zd, final BlockPos fu) {
         final int integer4 = 48;
-        if (xd.getPoiManager().getCountInRange(PoiType.HOME.getPredicate(), fk, 48, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
-            final List<Cat> list5 = xd.<Cat>getEntitiesOfClass(Cat.class, new AABB(fk).inflate(48.0, 8.0, 48.0));
+        if (zd.getPoiManager().getCountInRange(PoiType.HOME.getPredicate(), fu, 48, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
+            final List<Cat> list5 = zd.<Cat>getEntitiesOfClass(Cat.class, new AABB(fu).inflate(48.0, 8.0, 48.0));
             if (list5.size() < 5) {
-                return this.spawnCat(fk, xd);
+                return this.spawnCat(fu, zd);
             }
         }
         return 0;
     }
     
-    private int spawnInHut(final Level bjw, final BlockPos fk) {
+    private int spawnInHut(final Level bqb, final BlockPos fu) {
         final int integer4 = 16;
-        final List<Cat> list5 = bjw.<Cat>getEntitiesOfClass(Cat.class, new AABB(fk).inflate(16.0, 8.0, 16.0));
+        final List<Cat> list5 = bqb.<Cat>getEntitiesOfClass(Cat.class, new AABB(fu).inflate(16.0, 8.0, 16.0));
         if (list5.size() < 1) {
-            return this.spawnCat(fk, bjw);
+            return this.spawnCat(fu, bqb);
         }
         return 0;
     }
     
-    private int spawnCat(final BlockPos fk, final Level bjw) {
-        final Cat ate4 = EntityType.CAT.create(bjw);
-        if (ate4 == null) {
+    private int spawnCat(final BlockPos fu, final Level bqb) {
+        final Cat aym4 = EntityType.CAT.create(bqb);
+        if (aym4 == null) {
             return 0;
         }
-        ate4.finalizeSpawn(bjw, bjw.getCurrentDifficultyAt(fk), MobSpawnType.NATURAL, null, null);
-        ate4.moveTo(fk, 0.0f, 0.0f);
-        bjw.addFreshEntity(ate4);
+        aym4.finalizeSpawn(bqb, bqb.getCurrentDifficultyAt(fu), MobSpawnType.NATURAL, null, null);
+        aym4.moveTo(fu, 0.0f, 0.0f);
+        bqb.addFreshEntity(aym4);
         return 1;
     }
 }
diff --git a/src/net/minecraft/world/entity/npc/ClientSideMerchant.java b/src/net/minecraft/world/entity/npc/ClientSideMerchant.java
index e735205..6d3be07 100644
--- a/src/net/minecraft/world/entity/npc/ClientSideMerchant.java
+++ b/src/net/minecraft/world/entity/npc/ClientSideMerchant.java
@@ -17,9 +17,9 @@ public class ClientSideMerchant implements Merchant {
     private MerchantOffers offers;
     private int xp;
     
-    public ClientSideMerchant(final Player ayj) {
+    public ClientSideMerchant(final Player bec) {
         this.offers = new MerchantOffers();
-        this.source = ayj;
+        this.source = bec;
         this.container = new MerchantContainer(this);
     }
     
@@ -30,7 +30,7 @@ public class ClientSideMerchant implements Merchant {
     }
     
     @Override
-    public void setTradingPlayer(@Nullable final Player ayj) {
+    public void setTradingPlayer(@Nullable final Player bec) {
     }
     
     @Override
@@ -39,17 +39,17 @@ public class ClientSideMerchant implements Merchant {
     }
     
     @Override
-    public void overrideOffers(@Nullable final MerchantOffers bja) {
-        this.offers = bja;
+    public void overrideOffers(@Nullable final MerchantOffers bpa) {
+        this.offers = bpa;
     }
     
     @Override
-    public void notifyTrade(final MerchantOffer biz) {
-        biz.increaseUses();
+    public void notifyTrade(final MerchantOffer boz) {
+        boz.increaseUses();
     }
     
     @Override
-    public void notifyTradeUpdated(final ItemStack ben) {
+    public void notifyTradeUpdated(final ItemStack bki) {
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/npc/Villager.java b/src/net/minecraft/world/entity/npc/Villager.java
index 4981ea1..9f05080 100644
--- a/src/net/minecraft/world/entity/npc/Villager.java
+++ b/src/net/minecraft/world/entity/npc/Villager.java
@@ -4,19 +4,21 @@ import net.minecraft.world.entity.ai.sensing.NearestLivingEntitySensor;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
-import net.minecraft.core.SerializableLong;
+import net.minecraft.world.entity.ai.memory.WalkTarget;
 import net.minecraft.world.entity.ai.gossip.GossipType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.entity.animal.IronGolem;
 import net.minecraft.world.phys.AABB;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.monster.Witch;
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.world.Difficulty;
+import net.minecraft.world.entity.LightningBolt;
 import net.minecraft.world.entity.AgableMob;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
@@ -32,41 +34,46 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.network.protocol.game.DebugPackets;
 import java.util.Optional;
 import java.util.List;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ExperienceOrb;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.nbt.ListTag;
+import com.mojang.serialization.DataResult;
 import net.minecraft.world.item.trading.MerchantOffers;
 import net.minecraft.nbt.Tag;
+import java.util.function.Consumer;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Mth;
 import java.util.Iterator;
 import net.minecraft.world.item.trading.MerchantOffer;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.stats.Stats;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.raid.Raid;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.village.ReputationEventType;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import com.google.common.collect.ImmutableSet;
-import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.entity.ai.behavior.VillagerGoalPackages;
 import net.minecraft.world.entity.schedule.Activity;
 import net.minecraft.world.entity.schedule.Schedule;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
 import net.minecraft.server.level.ServerLevel;
+import com.mojang.serialization.Dynamic;
 import java.util.Collection;
 import net.minecraft.world.entity.ai.Brain;
-import com.mojang.datafixers.types.DynamicOps;
-import com.mojang.datafixers.Dynamic;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtOps;
 import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
@@ -102,22 +109,22 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     private long lastRestockGameTime;
     private int numberOfRestocksToday;
     private long lastRestockCheckDayTime;
+    private boolean assignProfessionWhenSpawned;
     private static final ImmutableList<MemoryModuleType<?>> MEMORY_TYPES;
     private static final ImmutableList<SensorType<? extends Sensor<? super Villager>>> SENSOR_TYPES;
     public static final Map<MemoryModuleType<GlobalPos>, BiPredicate<Villager, PoiType>> POI_MEMORIES;
     
-    public Villager(final EntityType<? extends Villager> aku, final Level bjw) {
-        this(aku, bjw, VillagerType.PLAINS);
+    public Villager(final EntityType<? extends Villager> aoq, final Level bqb) {
+        this(aoq, bqb, VillagerType.PLAINS);
     }
     
-    public Villager(final EntityType<? extends Villager> aku, final Level bjw, final VillagerType ayb) {
-        super(aku, bjw);
+    public Villager(final EntityType<? extends Villager> aoq, final Level bqb, final VillagerType bdu) {
+        super(aoq, bqb);
         this.gossips = new GossipContainer();
         ((GroundPathNavigation)this.getNavigation()).setCanOpenDoors(true);
         this.getNavigation().setCanFloat(true);
         this.setCanPickUpLoot(true);
-        this.setVillagerData(this.getVillagerData().setType(ayb).setProfession(VillagerProfession.NONE));
-        this.brain = this.makeBrain(new Dynamic((DynamicOps)NbtOps.INSTANCE, new CompoundTag()));
+        this.setVillagerData(this.getVillagerData().setType(bdu).setProfession(VillagerProfession.NONE));
     }
     
     @Override
@@ -126,42 +133,46 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
     
     @Override
-    protected Brain<?> makeBrain(final Dynamic<?> dynamic) {
-        final Brain<Villager> alp3 = new Brain<Villager>(Villager.MEMORY_TYPES, Villager.SENSOR_TYPES, dynamic);
-        this.registerBrainGoals(alp3);
-        return alp3;
+    protected Brain.Provider<Villager> brainProvider() {
+        return Brain.<Villager>provider(Villager.MEMORY_TYPES, Villager.SENSOR_TYPES);
     }
     
-    public void refreshBrain(final ServerLevel xd) {
-        final Brain<Villager> alp3 = this.getBrain();
-        alp3.stopAll(xd, this);
-        this.brain = alp3.copyWithoutGoals();
+    @Override
+    protected Brain<?> makeBrain(final Dynamic<?> dynamic) {
+        final Brain<Villager> apr3 = this.brainProvider().makeBrain(dynamic);
+        this.registerBrainGoals(apr3);
+        return apr3;
+    }
+    
+    public void refreshBrain(final ServerLevel zd) {
+        final Brain<Villager> apr3 = this.getBrain();
+        apr3.stopAll(zd, this);
+        this.brain = apr3.copyWithoutBehaviors();
         this.registerBrainGoals(this.getBrain());
     }
     
-    private void registerBrainGoals(final Brain<Villager> alp) {
-        final VillagerProfession axz3 = this.getVillagerData().getProfession();
-        final float float4 = (float)this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue();
+    private void registerBrainGoals(final Brain<Villager> apr) {
+        final VillagerProfession bds3 = this.getVillagerData().getProfession();
         if (this.isBaby()) {
-            alp.setSchedule(Schedule.VILLAGER_BABY);
-            alp.addActivity(Activity.PLAY, VillagerGoalPackages.getPlayPackage(float4));
+            apr.setSchedule(Schedule.VILLAGER_BABY);
+            apr.addActivity(Activity.PLAY, VillagerGoalPackages.getPlayPackage(0.5f));
         }
         else {
-            alp.setSchedule(Schedule.VILLAGER_DEFAULT);
-            alp.addActivity(Activity.WORK, VillagerGoalPackages.getWorkPackage(axz3, float4), ImmutableSet.of(Pair.of(MemoryModuleType.JOB_SITE, MemoryStatus.VALUE_PRESENT)));
+            apr.setSchedule(Schedule.VILLAGER_DEFAULT);
+            apr.addActivityWithConditions(Activity.WORK, VillagerGoalPackages.getWorkPackage(bds3, 0.5f), ImmutableSet.of(Pair.of(MemoryModuleType.JOB_SITE, MemoryStatus.VALUE_PRESENT)));
         }
-        alp.addActivity(Activity.CORE, VillagerGoalPackages.getCorePackage(axz3, float4));
-        alp.addActivity(Activity.MEET, VillagerGoalPackages.getMeetPackage(axz3, float4), ImmutableSet.of(Pair.of(MemoryModuleType.MEETING_POINT, MemoryStatus.VALUE_PRESENT)));
-        alp.addActivity(Activity.REST, VillagerGoalPackages.getRestPackage(axz3, float4));
-        alp.addActivity(Activity.IDLE, VillagerGoalPackages.getIdlePackage(axz3, float4));
-        alp.addActivity(Activity.PANIC, VillagerGoalPackages.getPanicPackage(axz3, float4));
-        alp.addActivity(Activity.PRE_RAID, VillagerGoalPackages.getPreRaidPackage(axz3, float4));
-        alp.addActivity(Activity.RAID, VillagerGoalPackages.getRaidPackage(axz3, float4));
-        alp.addActivity(Activity.HIDE, VillagerGoalPackages.getHidePackage(axz3, float4));
-        alp.setCoreActivities(ImmutableSet.<Activity>of(Activity.CORE));
-        alp.setDefaultActivity(Activity.IDLE);
-        alp.setActivity(Activity.IDLE);
-        alp.updateActivity(this.level.getDayTime(), this.level.getGameTime());
+        apr.addActivity(Activity.CORE, VillagerGoalPackages.getCorePackage(bds3, 0.5f));
+        apr.addActivityWithConditions(Activity.MEET, VillagerGoalPackages.getMeetPackage(bds3, 0.5f), ImmutableSet.of(Pair.of(MemoryModuleType.MEETING_POINT, MemoryStatus.VALUE_PRESENT)));
+        apr.addActivity(Activity.REST, VillagerGoalPackages.getRestPackage(bds3, 0.5f));
+        apr.addActivity(Activity.IDLE, VillagerGoalPackages.getIdlePackage(bds3, 0.5f));
+        apr.addActivity(Activity.PANIC, VillagerGoalPackages.getPanicPackage(bds3, 0.5f));
+        apr.addActivity(Activity.PRE_RAID, VillagerGoalPackages.getPreRaidPackage(bds3, 0.5f));
+        apr.addActivity(Activity.RAID, VillagerGoalPackages.getRaidPackage(bds3, 0.5f));
+        apr.addActivity(Activity.HIDE, VillagerGoalPackages.getHidePackage(bds3, 0.5f));
+        apr.setCoreActivities(ImmutableSet.<Activity>of(Activity.CORE));
+        apr.setDefaultActivity(Activity.IDLE);
+        apr.setActiveActivityIfPossible(Activity.IDLE);
+        apr.updateActivityFromSchedule(this.level.getDayTime(), this.level.getGameTime());
     }
     
     @Override
@@ -172,18 +183,22 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         }
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.5);
-        this.getAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(48.0);
+    public static AttributeSupplier.Builder createAttributes() {
+        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.FOLLOW_RANGE, 48.0);
+    }
+    
+    public boolean assignProfessionWhenSpawned() {
+        return this.assignProfessionWhenSpawned;
     }
     
     @Override
     protected void customServerAiStep() {
-        this.level.getProfiler().push("brain");
+        this.level.getProfiler().push("villagerBrain");
         this.getBrain().tick((ServerLevel)this.level, this);
         this.level.getProfiler().pop();
+        if (this.assignProfessionWhenSpawned) {
+            this.assignProfessionWhenSpawned = false;
+        }
         if (!this.isTrading() && this.updateMerchantTimer > 0) {
             --this.updateMerchantTimer;
             if (this.updateMerchantTimer <= 0) {
@@ -200,8 +215,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
             this.lastTradedPlayer = null;
         }
         if (!this.isNoAi() && this.random.nextInt(100) == 0) {
-            final Raid azn2 = ((ServerLevel)this.level).getRaidAt(new BlockPos(this));
-            if (azn2 != null && azn2.isActive() && !azn2.isOver()) {
+            final Raid bfh2 = ((ServerLevel)this.level).getRaidAt(this.blockPosition());
+            if (bfh2 != null && bfh2.isActive() && !bfh2.isOver()) {
                 this.level.broadcastEntityEvent(this, (byte)42);
             }
         }
@@ -220,35 +235,29 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         this.maybeDecayGossip();
     }
     
-    @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        final boolean boolean5 = ben4.getItem() == Items.NAME_TAG;
-        if (boolean5) {
-            ben4.interactEnemy(ayj, this, ajk);
-            return true;
-        }
-        if (ben4.getItem() == Items.VILLAGER_SPAWN_EGG || !this.isAlive() || this.isTrading() || this.isSleeping()) {
-            return super.mobInteract(ayj, ajk);
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (bki4.getItem() == Items.VILLAGER_SPAWN_EGG || !this.isAlive() || this.isTrading() || this.isSleeping()) {
+            return super.mobInteract(bec, anf);
         }
         if (this.isBaby()) {
             this.setUnhappy();
-            return super.mobInteract(ayj, ajk);
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
-        final boolean boolean6 = this.getOffers().isEmpty();
-        if (ajk == InteractionHand.MAIN_HAND) {
-            if (boolean6 && !this.level.isClientSide) {
+        final boolean boolean5 = this.getOffers().isEmpty();
+        if (anf == InteractionHand.MAIN_HAND) {
+            if (boolean5 && !this.level.isClientSide) {
                 this.setUnhappy();
             }
-            ayj.awardStat(Stats.TALKED_TO_VILLAGER);
+            bec.awardStat(Stats.TALKED_TO_VILLAGER);
         }
-        if (boolean6) {
-            return super.mobInteract(ayj, ajk);
+        if (boolean5) {
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
         if (!this.level.isClientSide && !this.offers.isEmpty()) {
-            this.startTrading(ayj);
+            this.startTrading(bec);
         }
-        return true;
+        return InteractionResult.sidedSuccess(this.level.isClientSide);
     }
     
     private void setUnhappy() {
@@ -258,16 +267,16 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         }
     }
     
-    private void startTrading(final Player ayj) {
-        this.updateSpecialPrices(ayj);
-        this.setTradingPlayer(ayj);
-        this.openTradingScreen(ayj, this.getDisplayName(), this.getVillagerData().getLevel());
+    private void startTrading(final Player bec) {
+        this.updateSpecialPrices(bec);
+        this.setTradingPlayer(bec);
+        this.openTradingScreen(bec, this.getDisplayName(), this.getVillagerData().getLevel());
     }
     
     @Override
-    public void setTradingPlayer(@Nullable final Player ayj) {
-        final boolean boolean3 = this.getTradingPlayer() != null && ayj == null;
-        super.setTradingPlayer(ayj);
+    public void setTradingPlayer(@Nullable final Player bec) {
+        final boolean boolean3 = this.getTradingPlayer() != null && bec == null;
+        super.setTradingPlayer(bec);
         if (boolean3) {
             this.stopTrading();
         }
@@ -280,8 +289,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
     
     private void resetSpecialPrices() {
-        for (final MerchantOffer biz3 : this.getOffers()) {
-            biz3.resetSpecialPriceDiff();
+        for (final MerchantOffer boz3 : this.getOffers()) {
+            boz3.resetSpecialPriceDiff();
         }
     }
     
@@ -292,19 +301,16 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     
     public void restock() {
         this.updateDemand();
-        for (final MerchantOffer biz3 : this.getOffers()) {
-            biz3.resetUses();
-        }
-        if (this.getVillagerData().getProfession() == VillagerProfession.FARMER) {
-            this.makeBread();
+        for (final MerchantOffer boz3 : this.getOffers()) {
+            boz3.resetUses();
         }
         this.lastRestockGameTime = this.level.getGameTime();
         ++this.numberOfRestocksToday;
     }
     
     private boolean needsToRestock() {
-        for (final MerchantOffer biz3 : this.getOffers()) {
-            if (biz3.needsRestock()) {
+        for (final MerchantOffer boz3 : this.getOffers()) {
+            if (boz3.needsRestock()) {
                 return true;
             }
         }
@@ -336,8 +342,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     private void catchUpDemand() {
         final int integer2 = 2 - this.numberOfRestocksToday;
         if (integer2 > 0) {
-            for (final MerchantOffer biz4 : this.getOffers()) {
-                biz4.resetUses();
+            for (final MerchantOffer boz4 : this.getOffers()) {
+                boz4.resetUses();
             }
         }
         for (int integer3 = 0; integer3 < integer2; ++integer3) {
@@ -346,25 +352,25 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
     
     private void updateDemand() {
-        for (final MerchantOffer biz3 : this.getOffers()) {
-            biz3.updateDemand();
+        for (final MerchantOffer boz3 : this.getOffers()) {
+            boz3.updateDemand();
         }
     }
     
-    private void updateSpecialPrices(final Player ayj) {
-        final int integer3 = this.getPlayerReputation(ayj);
+    private void updateSpecialPrices(final Player bec) {
+        final int integer3 = this.getPlayerReputation(bec);
         if (integer3 != 0) {
-            for (final MerchantOffer biz5 : this.getOffers()) {
-                biz5.addToSpecialPriceDiff(-Mth.floor(integer3 * biz5.getPriceMultiplier()));
+            for (final MerchantOffer boz5 : this.getOffers()) {
+                boz5.addToSpecialPriceDiff(-Mth.floor(integer3 * boz5.getPriceMultiplier()));
             }
         }
-        if (ayj.hasEffect(MobEffects.HERO_OF_THE_VILLAGE)) {
-            final MobEffectInstance akk4 = ayj.getEffect(MobEffects.HERO_OF_THE_VILLAGE);
-            final int integer4 = akk4.getAmplifier();
-            for (final MerchantOffer biz6 : this.getOffers()) {
+        if (bec.hasEffect(MobEffects.HERO_OF_THE_VILLAGE)) {
+            final MobEffectInstance aog4 = bec.getEffect(MobEffects.HERO_OF_THE_VILLAGE);
+            final int integer4 = aog4.getAmplifier();
+            for (final MerchantOffer boz6 : this.getOffers()) {
                 final double double8 = 0.3 + 0.0625 * integer4;
-                final int integer5 = (int)Math.floor(double8 * biz6.getBaseCostA().getCount());
-                biz6.addToSpecialPriceDiff(-Math.max(integer5, 1));
+                final int integer5 = (int)Math.floor(double8 * boz6.getBaseCostA().getCount());
+                boz6.addToSpecialPriceDiff(-Math.max(integer5, 1));
             }
         }
     }
@@ -376,41 +382,48 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.put("VillagerData", this.getVillagerData().<Tag>serialize((com.mojang.datafixers.types.DynamicOps<Tag>)NbtOps.INSTANCE));
-        jt.putByte("FoodLevel", this.foodLevel);
-        jt.put("Gossips", (Tag)this.gossips.store((com.mojang.datafixers.types.DynamicOps<Object>)NbtOps.INSTANCE).getValue());
-        jt.putInt("Xp", this.villagerXp);
-        jt.putLong("LastRestock", this.lastRestockGameTime);
-        jt.putLong("LastGossipDecay", this.lastGossipDecayTime);
-        jt.putInt("RestocksToday", this.numberOfRestocksToday);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        VillagerData.CODEC.encodeStart((DynamicOps)NbtOps.INSTANCE, this.getVillagerData()).resultOrPartial((Consumer)Villager.LOGGER::error).ifPresent(lu -> le.put("VillagerData", lu));
+        le.putByte("FoodLevel", this.foodLevel);
+        le.put("Gossips", (Tag)this.gossips.store((com.mojang.serialization.DynamicOps<Object>)NbtOps.INSTANCE).getValue());
+        le.putInt("Xp", this.villagerXp);
+        le.putLong("LastRestock", this.lastRestockGameTime);
+        le.putLong("LastGossipDecay", this.lastGossipDecayTime);
+        le.putInt("RestocksToday", this.numberOfRestocksToday);
+        if (this.assignProfessionWhenSpawned) {
+            le.putBoolean("AssignProfessionWhenSpawned", true);
+        }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("VillagerData", 10)) {
-            this.setVillagerData(new VillagerData(new Dynamic((DynamicOps)NbtOps.INSTANCE, jt.get("VillagerData"))));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("VillagerData", 10)) {
+            final DataResult<VillagerData> dataResult3 = (DataResult<VillagerData>)VillagerData.CODEC.parse(new Dynamic((DynamicOps)NbtOps.INSTANCE, le.get("VillagerData")));
+            dataResult3.resultOrPartial((Consumer)Villager.LOGGER::error).ifPresent(this::setVillagerData);
         }
-        if (jt.contains("Offers", 10)) {
-            this.offers = new MerchantOffers(jt.getCompound("Offers"));
+        if (le.contains("Offers", 10)) {
+            this.offers = new MerchantOffers(le.getCompound("Offers"));
         }
-        if (jt.contains("FoodLevel", 1)) {
-            this.foodLevel = jt.getByte("FoodLevel");
+        if (le.contains("FoodLevel", 1)) {
+            this.foodLevel = le.getByte("FoodLevel");
         }
-        final ListTag jz3 = jt.getList("Gossips", 10);
-        this.gossips.update(new Dynamic((DynamicOps)NbtOps.INSTANCE, jz3));
-        if (jt.contains("Xp", 3)) {
-            this.villagerXp = jt.getInt("Xp");
+        final ListTag lk3 = le.getList("Gossips", 10);
+        this.gossips.update(new Dynamic((DynamicOps)NbtOps.INSTANCE, lk3));
+        if (le.contains("Xp", 3)) {
+            this.villagerXp = le.getInt("Xp");
         }
-        this.lastRestockGameTime = jt.getLong("LastRestock");
-        this.lastGossipDecayTime = jt.getLong("LastGossipDecay");
+        this.lastRestockGameTime = le.getLong("LastRestock");
+        this.lastGossipDecayTime = le.getLong("LastGossipDecay");
         this.setCanPickUpLoot(true);
         if (this.level instanceof ServerLevel) {
             this.refreshBrain((ServerLevel)this.level);
         }
-        this.numberOfRestocksToday = jt.getInt("RestocksToday");
+        this.numberOfRestocksToday = le.getInt("RestocksToday");
+        if (le.contains("AssignProfessionWhenSpawned")) {
+            this.assignProfessionWhenSpawned = le.getBoolean("AssignProfessionWhenSpawned");
+        }
     }
     
     @Override
@@ -431,7 +444,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.VILLAGER_HURT;
     }
     
@@ -441,18 +454,18 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
     
     public void playWorkSound() {
-        final SoundEvent aah2 = this.getVillagerData().getProfession().getWorkSound();
-        if (aah2 != null) {
-            this.playSound(aah2, this.getSoundVolume(), this.getVoicePitch());
+        final SoundEvent ack2 = this.getVillagerData().getProfession().getWorkSound();
+        if (ack2 != null) {
+            this.playSound(ack2, this.getSoundVolume(), this.getVoicePitch());
         }
     }
     
-    public void setVillagerData(final VillagerData axx) {
-        final VillagerData axx2 = this.getVillagerData();
-        if (axx2.getProfession() != axx.getProfession()) {
+    public void setVillagerData(final VillagerData bdq) {
+        final VillagerData bdq2 = this.getVillagerData();
+        if (bdq2.getProfession() != bdq.getProfession()) {
             this.offers = null;
         }
-        this.entityData.<VillagerData>set(Villager.DATA_VILLAGER_DATA, axx);
+        this.entityData.<VillagerData>set(Villager.DATA_VILLAGER_DATA, bdq);
     }
     
     @Override
@@ -461,45 +474,45 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
     
     @Override
-    protected void rewardTradeXp(final MerchantOffer biz) {
+    protected void rewardTradeXp(final MerchantOffer boz) {
         int integer3 = 3 + this.random.nextInt(4);
-        this.villagerXp += biz.getXp();
+        this.villagerXp += boz.getXp();
         this.lastTradedPlayer = this.getTradingPlayer();
         if (this.shouldIncreaseLevel()) {
             this.updateMerchantTimer = 40;
             this.increaseProfessionLevelOnUpdate = true;
             integer3 += 5;
         }
-        if (biz.shouldRewardExp()) {
+        if (boz.shouldRewardExp()) {
             this.level.addFreshEntity(new ExperienceOrb(this.level, this.getX(), this.getY() + 0.5, this.getZ(), integer3));
         }
     }
     
     @Override
-    public void setLastHurtByMob(@Nullable final LivingEntity akz) {
-        if (akz != null && this.level instanceof ServerLevel) {
-            ((ServerLevel)this.level).onReputationEvent(ReputationEventType.VILLAGER_HURT, akz, this);
-            if (this.isAlive() && akz instanceof Player) {
+    public void setLastHurtByMob(@Nullable final LivingEntity aoy) {
+        if (aoy != null && this.level instanceof ServerLevel) {
+            ((ServerLevel)this.level).onReputationEvent(ReputationEventType.VILLAGER_HURT, aoy, this);
+            if (this.isAlive() && aoy instanceof Player) {
                 this.level.broadcastEntityEvent(this, (byte)13);
             }
         }
-        super.setLastHurtByMob(akz);
+        super.setLastHurtByMob(aoy);
     }
     
     @Override
-    public void die(final DamageSource ajz) {
-        Villager.LOGGER.info("Villager {} died, message: '{}'", this, ajz.getLocalizedDeathMessage(this).getString());
-        final Entity akq3 = ajz.getEntity();
-        if (akq3 != null) {
-            this.tellWitnessesThatIWasMurdered(akq3);
+    public void die(final DamageSource anw) {
+        Villager.LOGGER.info("Villager {} died, message: '{}'", this, anw.getLocalizedDeathMessage(this).getString());
+        final Entity aom3 = anw.getEntity();
+        if (aom3 != null) {
+            this.tellWitnessesThatIWasMurdered(aom3);
         }
         this.releasePoi(MemoryModuleType.HOME);
         this.releasePoi(MemoryModuleType.JOB_SITE);
         this.releasePoi(MemoryModuleType.MEETING_POINT);
-        super.die(ajz);
+        super.die(anw);
     }
     
-    private void tellWitnessesThatIWasMurdered(final Entity akq) {
+    private void tellWitnessesThatIWasMurdered(final Entity aom) {
         if (!(this.level instanceof ServerLevel)) {
             return;
         }
@@ -507,31 +520,34 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         if (!optional3.isPresent()) {
             return;
         }
-        final ServerLevel xd4 = (ServerLevel)this.level;
-        optional3.get().stream().filter(akz -> akz instanceof ReputationEventHandler).forEach(akz -> xd4.onReputationEvent(ReputationEventType.VILLAGER_KILLED, akq, akz));
+        final ServerLevel zd4 = (ServerLevel)this.level;
+        optional3.get().stream().filter(aoy -> aoy instanceof ReputationEventHandler).forEach(aoy -> zd4.onReputationEvent(ReputationEventType.VILLAGER_KILLED, aom, aoy));
     }
     
-    public void releasePoi(final MemoryModuleType<GlobalPos> arl) {
+    public void releasePoi(final MemoryModuleType<GlobalPos> awp) {
         if (!(this.level instanceof ServerLevel)) {
             return;
         }
         final MinecraftServer minecraftServer3 = ((ServerLevel)this.level).getServer();
-        final ServerLevel xd5;
-        final PoiManager asr6;
-        final Optional<PoiType> optional7;
-        final BiPredicate<Villager, PoiType> biPredicate8;
-        this.brain.<GlobalPos>getMemory(arl).ifPresent(fr -> {
-            xd5 = minecraftServer3.getLevel(fr.dimension());
-            asr6 = xd5.getPoiManager();
-            optional7 = asr6.getType(fr.pos());
-            biPredicate8 = Villager.POI_MEMORIES.get(arl);
-            if (optional7.isPresent() && biPredicate8.test(this, optional7.get())) {
-                asr6.release(fr.pos());
-                DebugPackets.sendPoiTicketCountPacket(xd5, fr.pos());
+        final ServerLevel zd5;
+        PoiManager axz6;
+        Optional<PoiType> optional7;
+        BiPredicate<Villager, PoiType> biPredicate8;
+        this.brain.<GlobalPos>getMemory(awp).ifPresent(gc -> {
+            zd5 = minecraftServer3.getLevel(gc.dimension());
+            if (zd5 != null) {
+                axz6 = zd5.getPoiManager();
+                optional7 = axz6.getType(gc.pos());
+                biPredicate8 = Villager.POI_MEMORIES.get(awp);
+                if (optional7.isPresent() && biPredicate8.test(this, optional7.get())) {
+                    axz6.release(gc.pos());
+                    DebugPackets.sendPoiTicketCountPacket(zd5, gc.pos());
+                }
             }
         });
     }
     
+    @Override
     public boolean canBreed() {
         return this.foodLevel + this.countFoodPointsInInventory() >= 12 && this.getAge() == 0;
     }
@@ -545,12 +561,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
             return;
         }
         for (int integer2 = 0; integer2 < this.getInventory().getContainerSize(); ++integer2) {
-            final ItemStack ben3 = this.getInventory().getItem(integer2);
-            if (!ben3.isEmpty()) {
-                final Integer integer3 = Villager.FOOD_POINTS.get(ben3.getItem());
+            final ItemStack bki3 = this.getInventory().getItem(integer2);
+            if (!bki3.isEmpty()) {
+                final Integer integer3 = Villager.FOOD_POINTS.get(bki3.getItem());
                 if (integer3 != null) {
                     int integer5;
-                    for (int integer4 = integer5 = ben3.getCount(); integer5 > 0; --integer5) {
+                    for (int integer4 = integer5 = bki3.getCount(); integer5 > 0; --integer5) {
                         this.foodLevel += (byte)integer3;
                         this.getInventory().removeItem(integer2, 1);
                         if (!this.hungry()) {
@@ -562,8 +578,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         }
     }
     
-    public int getPlayerReputation(final Player ayj) {
-        return this.gossips.getReputation(ayj.getUUID(), arj -> true);
+    public int getPlayerReputation(final Player bec) {
+        return this.gossips.getReputation(bec.getUUID(), awm -> true);
     }
     
     private void digestFood(final int integer) {
@@ -575,8 +591,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         this.digestFood(12);
     }
     
-    public void setOffers(final MerchantOffers bja) {
-        this.offers = bja;
+    public void setOffers(final MerchantOffers bpa) {
+        this.offers = bpa;
     }
     
     private boolean shouldIncreaseLevel() {
@@ -591,7 +607,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     
     @Override
     protected Component getTypeName() {
-        return new TranslatableComponent(this.getType().getDescriptionId() + '.' + Registry.VILLAGER_PROFESSION.getKey(this.getVillagerData().getProfession()).getPath(), new Object[0]);
+        return new TranslatableComponent(this.getType().getDescriptionId() + '.' + Registry.VILLAGER_PROFESSION.getKey(this.getVillagerData().getProfession()).getPath());
     }
     
     @Override
@@ -615,86 +631,83 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        if (alc == MobSpawnType.BREEDING) {
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        if (apb == MobSpawnType.BREEDING) {
             this.setVillagerData(this.getVillagerData().setProfession(VillagerProfession.NONE));
         }
-        if (alc == MobSpawnType.COMMAND || alc == MobSpawnType.SPAWN_EGG || alc == MobSpawnType.SPAWNER || alc == MobSpawnType.DISPENSER) {
-            this.setVillagerData(this.getVillagerData().setType(VillagerType.byBiome(bjx.getBiome(new BlockPos(this)))));
+        if (apb == MobSpawnType.COMMAND || apb == MobSpawnType.SPAWN_EGG || apb == MobSpawnType.SPAWNER || apb == MobSpawnType.DISPENSER) {
+            this.setVillagerData(this.getVillagerData().setType(VillagerType.byBiome(bqc.getBiome(this.blockPosition()))));
         }
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+        if (apb == MobSpawnType.STRUCTURE) {
+            this.assignProfessionWhenSpawned = true;
+        }
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     @Override
-    public Villager getBreedOffspring(final AgableMob ako) {
+    public Villager getBreedOffspring(final AgableMob aok) {
         final double double4 = this.random.nextDouble();
-        VillagerType ayb3;
+        VillagerType bdu3;
         if (double4 < 0.5) {
-            ayb3 = VillagerType.byBiome(this.level.getBiome(new BlockPos(this)));
+            bdu3 = VillagerType.byBiome(this.level.getBiome(this.blockPosition()));
         }
         else if (double4 < 0.75) {
-            ayb3 = this.getVillagerData().getType();
+            bdu3 = this.getVillagerData().getType();
         }
         else {
-            ayb3 = ((Villager)ako).getVillagerData().getType();
+            bdu3 = ((Villager)aok).getVillagerData().getType();
         }
-        final Villager axw6 = new Villager(EntityType.VILLAGER, this.level, ayb3);
-        axw6.finalizeSpawn(this.level, this.level.getCurrentDifficultyAt(new BlockPos(axw6)), MobSpawnType.BREEDING, null, null);
-        return axw6;
+        final Villager bdp6 = new Villager(EntityType.VILLAGER, this.level, bdu3);
+        bdp6.finalizeSpawn(this.level, this.level.getCurrentDifficultyAt(bdp6.blockPosition()), MobSpawnType.BREEDING, null, null);
+        return bdp6;
     }
     
     @Override
-    public void thunderHit(final LightningBolt avy) {
-        final Witch axn3 = EntityType.WITCH.create(this.level);
-        axn3.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
-        axn3.finalizeSpawn(this.level, this.level.getCurrentDifficultyAt(new BlockPos(axn3)), MobSpawnType.CONVERSION, null, null);
-        axn3.setNoAi(this.isNoAi());
-        if (this.hasCustomName()) {
-            axn3.setCustomName(this.getCustomName());
-            axn3.setCustomNameVisible(this.isCustomNameVisible());
+    public void thunderHit(final LightningBolt aox) {
+        if (this.level.getDifficulty() != Difficulty.PEACEFUL) {
+            Villager.LOGGER.info("Villager {} was struck by lightning {}.", this, aox);
+            final Witch bcr3 = EntityType.WITCH.create(this.level);
+            bcr3.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
+            bcr3.finalizeSpawn(this.level, this.level.getCurrentDifficultyAt(bcr3.blockPosition()), MobSpawnType.CONVERSION, null, null);
+            bcr3.setNoAi(this.isNoAi());
+            if (this.hasCustomName()) {
+                bcr3.setCustomName(this.getCustomName());
+                bcr3.setCustomNameVisible(this.isCustomNameVisible());
+            }
+            bcr3.setPersistenceRequired();
+            this.level.addFreshEntity(bcr3);
+            this.remove();
+        }
+        else {
+            super.thunderHit(aox);
         }
-        this.level.addFreshEntity(axn3);
-        this.remove();
     }
     
     @Override
-    protected void pickUpItem(final ItemEntity awb) {
-        final ItemStack ben3 = awb.getItem();
-        final Item bei4 = ben3.getItem();
-        if (this.wantToPickUp(bei4)) {
-            final SimpleContainer ajq5 = this.getInventory();
-            boolean boolean6 = false;
-            for (int integer7 = 0; integer7 < ajq5.getContainerSize(); ++integer7) {
-                final ItemStack ben4 = ajq5.getItem(integer7);
-                if (ben4.isEmpty() || (ben4.getItem() == bei4 && ben4.getCount() < ben4.getMaxStackSize())) {
-                    boolean6 = true;
-                    break;
-                }
-            }
-            if (!boolean6) {
+    protected void pickUpItem(final ItemEntity bbg) {
+        final ItemStack bki3 = bbg.getItem();
+        if (this.wantsToPickUp(bki3)) {
+            final SimpleContainer anm4 = this.getInventory();
+            final boolean boolean5 = anm4.canAddItem(bki3);
+            if (!boolean5) {
                 return;
             }
-            int integer7 = ajq5.countItem(bei4);
-            if (integer7 == 256) {
-                return;
-            }
-            if (integer7 > 256) {
-                ajq5.removeItemType(bei4, integer7 - 256);
-                return;
-            }
-            this.take(awb, ben3.getCount());
-            final ItemStack ben4 = ajq5.addItem(ben3);
-            if (ben4.isEmpty()) {
-                awb.remove();
+            this.onItemPickup(bbg);
+            this.take(bbg, bki3.getCount());
+            final ItemStack bki4 = anm4.addItem(bki3);
+            if (bki4.isEmpty()) {
+                bbg.remove();
             }
             else {
-                ben3.setCount(ben4.getCount());
+                bki3.setCount(bki4.getCount());
             }
         }
     }
     
-    public boolean wantToPickUp(final Item bei) {
-        return Villager.WANTED_ITEMS.contains(bei) || this.getVillagerData().getProfession().getRequestedItems().contains(bei);
+    @Override
+    public boolean wantsToPickUp(final ItemStack bki) {
+        final Item bke3 = bki.getItem();
+        return (Villager.WANTED_ITEMS.contains(bke3) || this.getVillagerData().getProfession().getRequestedItems().contains(bke3)) && this.getInventory().canAddItem(bki);
     }
     
     public boolean hasExcessFood() {
@@ -706,52 +719,36 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
     
     private int countFoodPointsInInventory() {
-        final SimpleContainer ajq2 = this.getInventory();
-        return Villager.FOOD_POINTS.entrySet().stream().mapToInt(entry -> ajq2.countItem(entry.getKey()) * (int)entry.getValue()).sum();
-    }
-    
-    private void makeBread() {
-        final SimpleContainer ajq2 = this.getInventory();
-        final int integer3 = ajq2.countItem(Items.WHEAT);
-        final int integer4 = integer3 / 3;
-        if (integer4 == 0) {
-            return;
-        }
-        final int integer5 = integer4 * 3;
-        ajq2.removeItemType(Items.WHEAT, integer5);
-        final ItemStack ben6 = ajq2.addItem(new ItemStack(Items.BREAD, integer4));
-        if (!ben6.isEmpty()) {
-            this.spawnAtLocation(ben6, 0.5f);
-        }
+        final SimpleContainer anm2 = this.getInventory();
+        return Villager.FOOD_POINTS.entrySet().stream().mapToInt(entry -> anm2.countItem(entry.getKey()) * (int)entry.getValue()).sum();
     }
     
     public boolean hasFarmSeeds() {
-        final SimpleContainer ajq2 = this.getInventory();
-        return ajq2.hasAnyOf(ImmutableSet.<Item>of(Items.WHEAT_SEEDS, Items.POTATO, Items.CARROT, Items.BEETROOT_SEEDS));
+        return this.getInventory().hasAnyOf(ImmutableSet.<Item>of(Items.WHEAT_SEEDS, Items.POTATO, Items.CARROT, Items.BEETROOT_SEEDS));
     }
     
     @Override
     protected void updateTrades() {
-        final VillagerData axx2 = this.getVillagerData();
-        final Int2ObjectMap<VillagerTrades.ItemListing[]> int2ObjectMap3 = VillagerTrades.TRADES.get(axx2.getProfession());
+        final VillagerData bdq2 = this.getVillagerData();
+        final Int2ObjectMap<VillagerTrades.ItemListing[]> int2ObjectMap3 = VillagerTrades.TRADES.get(bdq2.getProfession());
         if (int2ObjectMap3 == null || int2ObjectMap3.isEmpty()) {
             return;
         }
-        final VillagerTrades.ItemListing[] arr4 = (VillagerTrades.ItemListing[])int2ObjectMap3.get(axx2.getLevel());
+        final VillagerTrades.ItemListing[] arr4 = (VillagerTrades.ItemListing[])int2ObjectMap3.get(bdq2.getLevel());
         if (arr4 == null) {
             return;
         }
-        final MerchantOffers bja5 = this.getOffers();
-        this.addOffersFromItemListings(bja5, arr4, 2);
+        final MerchantOffers bpa5 = this.getOffers();
+        this.addOffersFromItemListings(bpa5, arr4, 2);
     }
     
-    public void gossip(final Villager axw, final long long2) {
-        if ((long2 >= this.lastGossipTime && long2 < this.lastGossipTime + 1200L) || (long2 >= axw.lastGossipTime && long2 < axw.lastGossipTime + 1200L)) {
+    public void gossip(final Villager bdp, final long long2) {
+        if ((long2 >= this.lastGossipTime && long2 < this.lastGossipTime + 1200L) || (long2 >= bdp.lastGossipTime && long2 < bdp.lastGossipTime + 1200L)) {
             return;
         }
-        this.gossips.transferFrom(axw.gossips, this.random, 10);
+        this.gossips.transferFrom(bdp.gossips, this.random, 10);
         this.lastGossipTime = long2;
-        this.spawnGolemIfNeeded(axw.lastGossipTime = long2, 5);
+        this.spawnGolemIfNeeded(bdp.lastGossipTime = long2, 5);
     }
     
     private void maybeDecayGossip() {
@@ -771,17 +768,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         if (!this.wantsToSpawnGolem(long1)) {
             return;
         }
-        final AABB cvf5 = this.getBoundingBox().inflate(10.0, 10.0, 10.0);
-        final List<Villager> list6 = this.level.<Villager>getEntitiesOfClass(Villager.class, cvf5);
-        final List<Villager> list7 = list6.stream().filter(axw -> axw.wantsToSpawnGolem(long1)).limit(5L).collect(Collectors.toList());
+        final AABB deg5 = this.getBoundingBox().inflate(10.0, 10.0, 10.0);
+        final List<Villager> list6 = this.level.<Villager>getEntitiesOfClass(Villager.class, deg5);
+        final List<Villager> list7 = list6.stream().filter(bdp -> bdp.wantsToSpawnGolem(long1)).limit(5L).collect(Collectors.toList());
         if (list7.size() < integer) {
             return;
         }
-        final IronGolem atl8 = this.trySpawnGolem();
-        if (atl8 == null) {
+        final IronGolem ayt8 = this.trySpawnGolem();
+        if (ayt8 == null) {
             return;
         }
-        list6.forEach(axw -> axw.sawGolem(long1));
+        list6.forEach(bdp -> bdp.sawGolem(long1));
     }
     
     private void sawGolem(final long long1) {
@@ -798,51 +795,61 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
     
     public boolean wantsToSpawnGolem(final long long1) {
-        final VillagerData axx4 = this.getVillagerData();
-        return axx4.getProfession() != VillagerProfession.NONE && axx4.getProfession() != VillagerProfession.NITWIT && this.golemSpawnConditionsMet(this.level.getGameTime()) && !this.hasSeenGolemRecently(long1);
+        return this.golemSpawnConditionsMet(this.level.getGameTime()) && !this.hasSeenGolemRecently(long1);
     }
     
     @Nullable
     private IronGolem trySpawnGolem() {
-        final BlockPos fk2 = new BlockPos(this);
+        final BlockPos fu2 = this.blockPosition();
         for (int integer3 = 0; integer3 < 10; ++integer3) {
             final double double4 = this.level.random.nextInt(16) - 8;
             final double double5 = this.level.random.nextInt(16) - 8;
-            double double6 = 6.0;
-            for (int integer4 = 0; integer4 >= -12; --integer4) {
-                final BlockPos fk3 = fk2.offset(double4, double6 + integer4, double5);
-                if ((this.level.getBlockState(fk3).isAir() || this.level.getBlockState(fk3).getMaterial().isLiquid()) && this.level.getBlockState(fk3.below()).getMaterial().isSolidBlocking()) {
-                    double6 += integer4;
-                    break;
+            final BlockPos fu3 = this.findSpawnPositionForGolemInColumn(fu2, double4, double5);
+            if (fu3 != null) {
+                final IronGolem ayt9 = EntityType.IRON_GOLEM.create(this.level, null, null, null, fu3, MobSpawnType.MOB_SUMMONED, false, false);
+                if (ayt9 != null) {
+                    if (ayt9.checkSpawnRules(this.level, MobSpawnType.MOB_SUMMONED) && ayt9.checkSpawnObstruction(this.level)) {
+                        this.level.addFreshEntity(ayt9);
+                        return ayt9;
+                    }
+                    ayt9.remove();
                 }
             }
-            final BlockPos fk4 = fk2.offset(double4, double6, double5);
-            final IronGolem atl11 = EntityType.IRON_GOLEM.create(this.level, null, null, null, fk4, MobSpawnType.MOB_SUMMONED, false, false);
-            if (atl11 != null) {
-                if (atl11.checkSpawnRules(this.level, MobSpawnType.MOB_SUMMONED) && atl11.checkSpawnObstruction(this.level)) {
-                    this.level.addFreshEntity(atl11);
-                    return atl11;
-                }
-                atl11.remove();
+        }
+        return null;
+    }
+    
+    @Nullable
+    private BlockPos findSpawnPositionForGolemInColumn(final BlockPos fu, final double double2, final double double3) {
+        final int integer7 = 6;
+        BlockPos fu2 = fu.offset(double2, 6.0, double3);
+        BlockState cfj9 = this.level.getBlockState(fu2);
+        for (int integer8 = 6; integer8 >= -6; --integer8) {
+            final BlockPos fu3 = fu2;
+            final BlockState cfj10 = cfj9;
+            fu2 = fu3.below();
+            cfj9 = this.level.getBlockState(fu2);
+            if ((cfj10.isAir() || cfj10.getMaterial().isLiquid()) && cfj9.getMaterial().isSolidBlocking()) {
+                return fu3;
             }
         }
         return null;
     }
     
     @Override
-    public void onReputationEventFrom(final ReputationEventType aso, final Entity akq) {
-        if (aso == ReputationEventType.ZOMBIE_VILLAGER_CURED) {
-            this.gossips.add(akq.getUUID(), GossipType.MAJOR_POSITIVE, 20);
-            this.gossips.add(akq.getUUID(), GossipType.MINOR_POSITIVE, 25);
+    public void onReputationEventFrom(final ReputationEventType axw, final Entity aom) {
+        if (axw == ReputationEventType.ZOMBIE_VILLAGER_CURED) {
+            this.gossips.add(aom.getUUID(), GossipType.MAJOR_POSITIVE, 20);
+            this.gossips.add(aom.getUUID(), GossipType.MINOR_POSITIVE, 25);
         }
-        else if (aso == ReputationEventType.TRADE) {
-            this.gossips.add(akq.getUUID(), GossipType.TRADING, 2);
+        else if (axw == ReputationEventType.TRADE) {
+            this.gossips.add(aom.getUUID(), GossipType.TRADING, 2);
         }
-        else if (aso == ReputationEventType.VILLAGER_HURT) {
-            this.gossips.add(akq.getUUID(), GossipType.MINOR_NEGATIVE, 25);
+        else if (axw == ReputationEventType.VILLAGER_HURT) {
+            this.gossips.add(aom.getUUID(), GossipType.MINOR_NEGATIVE, 25);
         }
-        else if (aso == ReputationEventType.VILLAGER_KILLED) {
-            this.gossips.add(akq.getUUID(), GossipType.MAJOR_NEGATIVE, 25);
+        else if (axw == ReputationEventType.VILLAGER_KILLED) {
+            this.gossips.add(aom.getUUID(), GossipType.MAJOR_NEGATIVE, 25);
         }
     }
     
@@ -864,8 +871,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         return this.gossips;
     }
     
-    public void setGossips(final Tag kj) {
-        this.gossips.update(new Dynamic((DynamicOps)NbtOps.INSTANCE, kj));
+    public void setGossips(final Tag lu) {
+        this.gossips.update(new Dynamic((DynamicOps)NbtOps.INSTANCE, lu));
     }
     
     @Override
@@ -875,29 +882,30 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
     
     @Override
-    public void startSleeping(final BlockPos fk) {
-        super.startSleeping(fk);
-        this.brain.<SerializableLong>setMemory(MemoryModuleType.LAST_SLEPT, SerializableLong.of(this.level.getGameTime()));
+    public void startSleeping(final BlockPos fu) {
+        super.startSleeping(fu);
+        this.brain.<Long>setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime());
+        this.brain.<WalkTarget>eraseMemory(MemoryModuleType.WALK_TARGET);
+        this.brain.<Long>eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
     }
     
     @Override
     public void stopSleeping() {
         super.stopSleeping();
-        this.brain.<SerializableLong>setMemory(MemoryModuleType.LAST_WOKEN, SerializableLong.of(this.level.getGameTime()));
+        this.brain.<Long>setMemory(MemoryModuleType.LAST_WOKEN, this.level.getGameTime());
     }
     
     private boolean golemSpawnConditionsMet(final long long1) {
-        final Optional<SerializableLong> optional4 = this.brain.<SerializableLong>getMemory(MemoryModuleType.LAST_SLEPT);
-        final Optional<SerializableLong> optional5 = this.brain.<SerializableLong>getMemory(MemoryModuleType.LAST_WORKED_AT_POI);
-        return optional4.isPresent() && optional5.isPresent() && long1 - optional4.get().value() < 24000L && long1 - optional5.get().value() < 36000L;
+        final Optional<Long> optional4 = this.brain.<Long>getMemory(MemoryModuleType.LAST_SLEPT);
+        return optional4.isPresent() && long1 - optional4.get() < 24000L;
     }
     
     static {
         DATA_VILLAGER_DATA = SynchedEntityData.<VillagerData>defineId(Villager.class, EntityDataSerializers.VILLAGER_DATA);
         FOOD_POINTS = ImmutableMap.<Item, Integer>of(Items.BREAD, Integer.valueOf(4), Items.POTATO, Integer.valueOf(1), Items.CARROT, Integer.valueOf(1), Items.BEETROOT, Integer.valueOf(1));
         WANTED_ITEMS = ImmutableSet.<Item>of(Items.BREAD, Items.POTATO, Items.CARROT, Items.WHEAT, Items.WHEAT_SEEDS, Items.BEETROOT, new Item[] { Items.BEETROOT_SEEDS });
-        MEMORY_TYPES = ImmutableList.<MemoryModuleType<GlobalPos>>of(MemoryModuleType.HOME, MemoryModuleType.JOB_SITE, MemoryModuleType.MEETING_POINT, (MemoryModuleType<GlobalPos>)MemoryModuleType.LIVING_ENTITIES, (MemoryModuleType<GlobalPos>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, (MemoryModuleType<GlobalPos>)MemoryModuleType.VISIBLE_VILLAGER_BABIES, (MemoryModuleType<GlobalPos>)MemoryModuleType.NEAREST_PLAYERS, (MemoryModuleType<GlobalPos>)MemoryModuleType.NEAREST_VISIBLE_PLAYER, (MemoryModuleType<GlobalPos>)MemoryModuleType.WALK_TARGET, (MemoryModuleType<GlobalPos>)MemoryModuleType.LOOK_TARGET, (MemoryModuleType<GlobalPos>)MemoryModuleType.INTERACTION_TARGET, (MemoryModuleType<GlobalPos>)MemoryModuleType.BREED_TARGET, MemoryModuleType.PATH, MemoryModuleType.INTERACTABLE_DOORS, MemoryModuleType.OPENED_DOORS, MemoryModuleType.NEAREST_BED, MemoryModuleType.HURT_BY, MemoryModuleType.HURT_BY_ENTITY, MemoryModuleType.NEAREST_HOSTILE, MemoryModuleType.SECONDARY_JOB_SITE, MemoryModuleType.HIDING_PLACE, MemoryModuleType.HEARD_BELL_TIME, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.LAST_SLEPT, MemoryModuleType.LAST_WOKEN, MemoryModuleType.LAST_WORKED_AT_POI, MemoryModuleType.GOLEM_LAST_SEEN_TIME);
-        SENSOR_TYPES = ImmutableList.<SensorType<NearestLivingEntitySensor>>of(SensorType.NEAREST_LIVING_ENTITIES, (SensorType<NearestLivingEntitySensor>)SensorType.NEAREST_PLAYERS, (SensorType<NearestLivingEntitySensor>)SensorType.INTERACTABLE_DOORS, (SensorType<NearestLivingEntitySensor>)SensorType.NEAREST_BED, (SensorType<NearestLivingEntitySensor>)SensorType.HURT_BY, (SensorType<NearestLivingEntitySensor>)SensorType.VILLAGER_HOSTILES, (SensorType<NearestLivingEntitySensor>)SensorType.VILLAGER_BABIES, (SensorType<NearestLivingEntitySensor>)SensorType.SECONDARY_POIS, (SensorType<NearestLivingEntitySensor>)SensorType.GOLEM_LAST_SEEN);
-        POI_MEMORIES = ImmutableMap.<MemoryModuleType<GlobalPos>, Object>of(MemoryModuleType.HOME, (axw, asu) -> asu == PoiType.HOME, MemoryModuleType.JOB_SITE, (axw, asu) -> axw.getVillagerData().getProfession().getJobPoiType() == asu, MemoryModuleType.MEETING_POINT, (axw, asu) -> asu == PoiType.MEETING);
+        MEMORY_TYPES = ImmutableList.<MemoryModuleType<GlobalPos>>of(MemoryModuleType.HOME, MemoryModuleType.JOB_SITE, MemoryModuleType.POTENTIAL_JOB_SITE, MemoryModuleType.MEETING_POINT, (MemoryModuleType<GlobalPos>)MemoryModuleType.LIVING_ENTITIES, (MemoryModuleType<GlobalPos>)MemoryModuleType.VISIBLE_LIVING_ENTITIES, (MemoryModuleType<GlobalPos>)MemoryModuleType.VISIBLE_VILLAGER_BABIES, (MemoryModuleType<GlobalPos>)MemoryModuleType.NEAREST_PLAYERS, (MemoryModuleType<GlobalPos>)MemoryModuleType.NEAREST_VISIBLE_PLAYER, (MemoryModuleType<GlobalPos>)MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, (MemoryModuleType<GlobalPos>)MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, (MemoryModuleType<GlobalPos>)MemoryModuleType.WALK_TARGET, MemoryModuleType.LOOK_TARGET, MemoryModuleType.INTERACTION_TARGET, MemoryModuleType.BREED_TARGET, MemoryModuleType.PATH, MemoryModuleType.INTERACTABLE_DOORS, MemoryModuleType.OPENED_DOORS, MemoryModuleType.NEAREST_BED, MemoryModuleType.HURT_BY, MemoryModuleType.HURT_BY_ENTITY, MemoryModuleType.NEAREST_HOSTILE, MemoryModuleType.SECONDARY_JOB_SITE, MemoryModuleType.HIDING_PLACE, MemoryModuleType.HEARD_BELL_TIME, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.LAST_SLEPT, MemoryModuleType.LAST_WOKEN, MemoryModuleType.LAST_WORKED_AT_POI, MemoryModuleType.GOLEM_LAST_SEEN_TIME);
+        SENSOR_TYPES = ImmutableList.<SensorType<NearestLivingEntitySensor>>of(SensorType.NEAREST_LIVING_ENTITIES, (SensorType<NearestLivingEntitySensor>)SensorType.NEAREST_PLAYERS, (SensorType<NearestLivingEntitySensor>)SensorType.NEAREST_ITEMS, (SensorType<NearestLivingEntitySensor>)SensorType.INTERACTABLE_DOORS, (SensorType<NearestLivingEntitySensor>)SensorType.NEAREST_BED, (SensorType<NearestLivingEntitySensor>)SensorType.HURT_BY, (SensorType<NearestLivingEntitySensor>)SensorType.VILLAGER_HOSTILES, (SensorType<NearestLivingEntitySensor>)SensorType.VILLAGER_BABIES, (SensorType<NearestLivingEntitySensor>)SensorType.SECONDARY_POIS, (SensorType<NearestLivingEntitySensor>)SensorType.GOLEM_LAST_SEEN);
+        POI_MEMORIES = ImmutableMap.<MemoryModuleType<GlobalPos>, Object>of(MemoryModuleType.HOME, (bdp, ayc) -> ayc == PoiType.HOME, MemoryModuleType.JOB_SITE, (bdp, ayc) -> bdp.getVillagerData().getProfession().getJobPoiType() == ayc, MemoryModuleType.POTENTIAL_JOB_SITE, (bdp, ayc) -> PoiType.ALL_JOBS.test(ayc), MemoryModuleType.MEETING_POINT, (bdp, ayc) -> ayc == PoiType.MEETING);
     }
 }
diff --git a/src/net/minecraft/world/entity/npc/VillagerData.java b/src/net/minecraft/world/entity/npc/VillagerData.java
index 2084674..a625036 100644
--- a/src/net/minecraft/world/entity/npc/VillagerData.java
+++ b/src/net/minecraft/world/entity/npc/VillagerData.java
@@ -1,28 +1,24 @@
 package net.minecraft.world.entity.npc;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.resources.ResourceLocation;
+import com.mojang.datafixers.kinds.Applicative;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 
 public class VillagerData {
     private static final int[] NEXT_LEVEL_XP_THRESHOLDS;
+    public static final Codec<VillagerData> CODEC;
     private final VillagerType type;
     private final VillagerProfession profession;
     private final int level;
     
-    public VillagerData(final VillagerType ayb, final VillagerProfession axz, final int integer) {
-        this.type = ayb;
-        this.profession = axz;
+    public VillagerData(final VillagerType bdu, final VillagerProfession bds, final int integer) {
+        this.type = bdu;
+        this.profession = bds;
         this.level = Math.max(1, integer);
     }
     
-    public VillagerData(final Dynamic<?> dynamic) {
-        this(Registry.VILLAGER_TYPE.get(ResourceLocation.tryParse(dynamic.get("type").asString(""))), Registry.VILLAGER_PROFESSION.get(ResourceLocation.tryParse(dynamic.get("profession").asString(""))), dynamic.get("level").asInt(1));
-    }
-    
     public VillagerType getType() {
         return this.type;
     }
@@ -35,22 +31,18 @@ public class VillagerData {
         return this.level;
     }
     
-    public VillagerData setType(final VillagerType ayb) {
-        return new VillagerData(ayb, this.profession, this.level);
+    public VillagerData setType(final VillagerType bdu) {
+        return new VillagerData(bdu, this.profession, this.level);
     }
     
-    public VillagerData setProfession(final VillagerProfession axz) {
-        return new VillagerData(this.type, axz, this.level);
+    public VillagerData setProfession(final VillagerProfession bds) {
+        return new VillagerData(this.type, bds, this.level);
     }
     
     public VillagerData setLevel(final int integer) {
         return new VillagerData(this.type, this.profession, integer);
     }
     
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("type"), dynamicOps.createString(Registry.VILLAGER_TYPE.getKey(this.type).toString()), dynamicOps.createString("profession"), dynamicOps.createString(Registry.VILLAGER_PROFESSION.getKey(this.profession).toString()), dynamicOps.createString("level"), dynamicOps.createInt(this.level)));
-    }
-    
     public static int getMinXpPerLevel(final int integer) {
         return canLevelUp(integer) ? VillagerData.NEXT_LEVEL_XP_THRESHOLDS[integer - 1] : 0;
     }
@@ -65,5 +57,6 @@ public class VillagerData {
     
     static {
         NEXT_LEVEL_XP_THRESHOLDS = new int[] { 0, 10, 70, 150, 250 };
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Registry.VILLAGER_TYPE.fieldOf("type").withDefault(() -> VillagerType.PLAINS).forGetter(bdq -> bdq.type), (App)Registry.VILLAGER_PROFESSION.fieldOf("profession").withDefault(() -> VillagerProfession.NONE).forGetter(bdq -> bdq.profession), (App)Codec.INT.fieldOf("level").withDefault(1).forGetter(bdq -> bdq.level)).apply(instance, VillagerData::new));
     }
 }
diff --git a/src/net/minecraft/world/entity/npc/VillagerProfession.java b/src/net/minecraft/world/entity/npc/VillagerProfession.java
index 7edc58c..1f758ca 100644
--- a/src/net/minecraft/world/entity/npc/VillagerProfession.java
+++ b/src/net/minecraft/world/entity/npc/VillagerProfession.java
@@ -35,12 +35,12 @@ public class VillagerProfession {
     @Nullable
     private final SoundEvent workSound;
     
-    private VillagerProfession(final String string, final PoiType asu, final ImmutableSet<Item> immutableSet3, final ImmutableSet<Block> immutableSet4, @Nullable final SoundEvent aah) {
+    private VillagerProfession(final String string, final PoiType ayc, final ImmutableSet<Item> immutableSet3, final ImmutableSet<Block> immutableSet4, @Nullable final SoundEvent ack) {
         this.name = string;
-        this.jobPoiType = asu;
+        this.jobPoiType = ayc;
         this.requestedItems = immutableSet3;
         this.secondaryPoi = immutableSet4;
-        this.workSound = aah;
+        this.workSound = ack;
     }
     
     public PoiType getJobPoiType() {
@@ -65,12 +65,12 @@ public class VillagerProfession {
         return this.name;
     }
     
-    static VillagerProfession register(final String string, final PoiType asu, @Nullable final SoundEvent aah) {
-        return register(string, asu, ImmutableSet.<Item>of(), ImmutableSet.<Block>of(), aah);
+    static VillagerProfession register(final String string, final PoiType ayc, @Nullable final SoundEvent ack) {
+        return register(string, ayc, ImmutableSet.<Item>of(), ImmutableSet.<Block>of(), ack);
     }
     
-    static VillagerProfession register(final String string, final PoiType asu, final ImmutableSet<Item> immutableSet3, final ImmutableSet<Block> immutableSet4, @Nullable final SoundEvent aah) {
-        return Registry.<VillagerProfession>register(Registry.VILLAGER_PROFESSION, new ResourceLocation(string), new VillagerProfession(string, asu, immutableSet3, immutableSet4, aah));
+    static VillagerProfession register(final String string, final PoiType ayc, final ImmutableSet<Item> immutableSet3, final ImmutableSet<Block> immutableSet4, @Nullable final SoundEvent ack) {
+        return Registry.<VillagerProfession, VillagerProfession>register(Registry.VILLAGER_PROFESSION, new ResourceLocation(string), new VillagerProfession(string, ayc, immutableSet3, immutableSet4, ack));
     }
     
     static {
@@ -79,7 +79,7 @@ public class VillagerProfession {
         BUTCHER = register("butcher", PoiType.BUTCHER, SoundEvents.VILLAGER_WORK_BUTCHER);
         CARTOGRAPHER = register("cartographer", PoiType.CARTOGRAPHER, SoundEvents.VILLAGER_WORK_CARTOGRAPHER);
         CLERIC = register("cleric", PoiType.CLERIC, SoundEvents.VILLAGER_WORK_CLERIC);
-        FARMER = register("farmer", PoiType.FARMER, ImmutableSet.<Item>of(Items.WHEAT, Items.WHEAT_SEEDS, Items.BEETROOT_SEEDS), ImmutableSet.<Block>of(Blocks.FARMLAND), SoundEvents.VILLAGER_WORK_FARMER);
+        FARMER = register("farmer", PoiType.FARMER, ImmutableSet.<Item>of(Items.WHEAT, Items.WHEAT_SEEDS, Items.BEETROOT_SEEDS, Items.BONE_MEAL), ImmutableSet.<Block>of(Blocks.FARMLAND), SoundEvents.VILLAGER_WORK_FARMER);
         FISHERMAN = register("fisherman", PoiType.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
         FLETCHER = register("fletcher", PoiType.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
         LEATHERWORKER = register("leatherworker", PoiType.LEATHERWORKER, SoundEvents.VILLAGER_WORK_LEATHERWORKER);
diff --git a/src/net/minecraft/world/entity/npc/VillagerTrades.java b/src/net/minecraft/world/entity/npc/VillagerTrades.java
index a3cce21..3920c30 100644
--- a/src/net/minecraft/world/entity/npc/VillagerTrades.java
+++ b/src/net/minecraft/world/entity/npc/VillagerTrades.java
@@ -1,12 +1,12 @@
 package net.minecraft.world.entity.npc;
 
+import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import java.util.Locale;
 import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.item.MapItem;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.EnchantedBookItem;
 import net.minecraft.world.item.enchantment.EnchantmentInstance;
@@ -36,6 +36,7 @@ import net.minecraft.Util;
 import com.google.common.collect.Maps;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.saveddata.maps.MapDecoration;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.level.block.Blocks;
@@ -130,7 +131,7 @@ public class VillagerTrades {
             hashMap.put(VillagerProfession.SHEPHERD, toIntMap(ImmutableMap.<Integer, ItemListing[]>of(Integer.valueOf(1), new ItemListing[] { new EmeraldForItems(Blocks.WHITE_WOOL, 18, 16, 2), new EmeraldForItems(Blocks.BROWN_WOOL, 18, 16, 2), new EmeraldForItems(Blocks.BLACK_WOOL, 18, 16, 2), new EmeraldForItems(Blocks.GRAY_WOOL, 18, 16, 2), new ItemsForEmeralds(Items.SHEARS, 2, 1, 1) }, Integer.valueOf(2), new ItemListing[] { new EmeraldForItems(Items.WHITE_DYE, 12, 16, 10), new EmeraldForItems(Items.GRAY_DYE, 12, 16, 10), new EmeraldForItems(Items.BLACK_DYE, 12, 16, 10), new EmeraldForItems(Items.LIGHT_BLUE_DYE, 12, 16, 10), new EmeraldForItems(Items.LIME_DYE, 12, 16, 10), new ItemsForEmeralds(Blocks.WHITE_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.ORANGE_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.MAGENTA_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.LIGHT_BLUE_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.YELLOW_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.LIME_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.PINK_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.GRAY_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.LIGHT_GRAY_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.CYAN_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.PURPLE_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.BLUE_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.BROWN_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.GREEN_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.RED_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.BLACK_WOOL, 1, 1, 16, 5), new ItemsForEmeralds(Blocks.WHITE_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.ORANGE_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.MAGENTA_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.LIGHT_BLUE_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.YELLOW_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.LIME_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.PINK_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.GRAY_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.LIGHT_GRAY_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.CYAN_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.PURPLE_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.BLUE_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.BROWN_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.GREEN_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.RED_CARPET, 1, 4, 16, 5), new ItemsForEmeralds(Blocks.BLACK_CARPET, 1, 4, 16, 5) }, Integer.valueOf(3), new ItemListing[] { new EmeraldForItems(Items.YELLOW_DYE, 12, 16, 20), new EmeraldForItems(Items.LIGHT_GRAY_DYE, 12, 16, 20), new EmeraldForItems(Items.ORANGE_DYE, 12, 16, 20), new EmeraldForItems(Items.RED_DYE, 12, 16, 20), new EmeraldForItems(Items.PINK_DYE, 12, 16, 20), new ItemsForEmeralds(Blocks.WHITE_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.YELLOW_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.RED_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.BLACK_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.BLUE_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.BROWN_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.CYAN_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.GRAY_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.GREEN_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.LIGHT_BLUE_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.LIGHT_GRAY_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.LIME_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.MAGENTA_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.ORANGE_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.PINK_BED, 3, 1, 12, 10), new ItemsForEmeralds(Blocks.PURPLE_BED, 3, 1, 12, 10) }, Integer.valueOf(4), new ItemListing[] { new EmeraldForItems(Items.BROWN_DYE, 12, 16, 30), new EmeraldForItems(Items.PURPLE_DYE, 12, 16, 30), new EmeraldForItems(Items.BLUE_DYE, 12, 16, 30), new EmeraldForItems(Items.GREEN_DYE, 12, 16, 30), new EmeraldForItems(Items.MAGENTA_DYE, 12, 16, 30), new EmeraldForItems(Items.CYAN_DYE, 12, 16, 30), new ItemsForEmeralds(Items.WHITE_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.BLUE_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.LIGHT_BLUE_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.RED_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.PINK_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.GREEN_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.LIME_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.GRAY_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.BLACK_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.PURPLE_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.MAGENTA_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.CYAN_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.BROWN_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.YELLOW_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.ORANGE_BANNER, 3, 1, 12, 15), new ItemsForEmeralds(Items.LIGHT_GRAY_BANNER, 3, 1, 12, 15) }, Integer.valueOf(5), new ItemListing[] { new ItemsForEmeralds(Items.PAINTING, 2, 3, 30) })));
             hashMap.put(VillagerProfession.FLETCHER, toIntMap(ImmutableMap.<Integer, ItemListing[]>of(Integer.valueOf(1), new ItemListing[] { new EmeraldForItems(Items.STICK, 32, 16, 2), new ItemsForEmeralds(Items.ARROW, 1, 16, 1), new ItemsAndEmeraldsToItems(Blocks.GRAVEL, 10, Items.FLINT, 10, 12, 1) }, Integer.valueOf(2), new ItemListing[] { new EmeraldForItems(Items.FLINT, 26, 12, 10), new ItemsForEmeralds(Items.BOW, 2, 1, 5) }, Integer.valueOf(3), new ItemListing[] { new EmeraldForItems(Items.STRING, 14, 16, 20), new ItemsForEmeralds(Items.CROSSBOW, 3, 1, 10) }, Integer.valueOf(4), new ItemListing[] { new EmeraldForItems(Items.FEATHER, 24, 16, 30), new EnchantedItemForEmeralds(Items.BOW, 2, 3, 15) }, Integer.valueOf(5), new ItemListing[] { new EmeraldForItems(Items.TRIPWIRE_HOOK, 8, 12, 30), new EnchantedItemForEmeralds(Items.CROSSBOW, 3, 3, 15), new TippedArrowForItemsAndEmeralds(Items.ARROW, 5, Items.TIPPED_ARROW, 5, 2, 12, 30) })));
             hashMap.put(VillagerProfession.LIBRARIAN, toIntMap(ImmutableMap.<Integer, ItemListing[]>builder().put(1, new ItemListing[] { new EmeraldForItems(Items.PAPER, 24, 16, 2), new EnchantBookForEmeralds(1), new ItemsForEmeralds(Blocks.BOOKSHELF, 9, 1, 12, 1) }).put(2, new ItemListing[] { new EmeraldForItems(Items.BOOK, 4, 12, 10), new EnchantBookForEmeralds(5), new ItemsForEmeralds(Items.LANTERN, 1, 1, 5) }).put(3, new ItemListing[] { new EmeraldForItems(Items.INK_SAC, 5, 12, 20), new EnchantBookForEmeralds(10), new ItemsForEmeralds(Items.GLASS, 1, 4, 10) }).put(4, new ItemListing[] { new EmeraldForItems(Items.WRITABLE_BOOK, 2, 12, 30), new EnchantBookForEmeralds(15), new ItemsForEmeralds(Items.CLOCK, 5, 1, 15), new ItemsForEmeralds(Items.COMPASS, 4, 1, 15) }).put(5, new ItemListing[] { new ItemsForEmeralds(Items.NAME_TAG, 20, 1, 30) }).build()));
-            hashMap.put(VillagerProfession.CARTOGRAPHER, toIntMap(ImmutableMap.<Integer, ItemListing[]>of(Integer.valueOf(1), new ItemListing[] { new EmeraldForItems(Items.PAPER, 24, 16, 2), new ItemsForEmeralds(Items.MAP, 7, 1, 1) }, Integer.valueOf(2), new ItemListing[] { new EmeraldForItems(Items.GLASS_PANE, 11, 16, 10), new TreasureMapForEmeralds(13, "Monument", MapDecoration.Type.MONUMENT, 12, 5) }, Integer.valueOf(3), new ItemListing[] { new EmeraldForItems(Items.COMPASS, 1, 12, 20), new TreasureMapForEmeralds(14, "Mansion", MapDecoration.Type.MANSION, 12, 10) }, Integer.valueOf(4), new ItemListing[] { new ItemsForEmeralds(Items.ITEM_FRAME, 7, 1, 15), new ItemsForEmeralds(Items.WHITE_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.BLUE_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.LIGHT_BLUE_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.RED_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.PINK_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.GREEN_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.LIME_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.GRAY_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.BLACK_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.PURPLE_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.MAGENTA_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.CYAN_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.BROWN_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.YELLOW_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.ORANGE_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.LIGHT_GRAY_BANNER, 3, 1, 15) }, Integer.valueOf(5), new ItemListing[] { new ItemsForEmeralds(Items.GLOBE_BANNER_PATTER, 8, 1, 30) })));
+            hashMap.put(VillagerProfession.CARTOGRAPHER, toIntMap(ImmutableMap.<Integer, ItemListing[]>of(Integer.valueOf(1), new ItemListing[] { new EmeraldForItems(Items.PAPER, 24, 16, 2), new ItemsForEmeralds(Items.MAP, 7, 1, 1) }, Integer.valueOf(2), new ItemListing[] { new EmeraldForItems(Items.GLASS_PANE, 11, 16, 10), new TreasureMapForEmeralds(13, StructureFeature.OCEAN_MONUMENT, MapDecoration.Type.MONUMENT, 12, 5) }, Integer.valueOf(3), new ItemListing[] { new EmeraldForItems(Items.COMPASS, 1, 12, 20), new TreasureMapForEmeralds(14, StructureFeature.WOODLAND_MANSION, MapDecoration.Type.MANSION, 12, 10) }, Integer.valueOf(4), new ItemListing[] { new ItemsForEmeralds(Items.ITEM_FRAME, 7, 1, 15), new ItemsForEmeralds(Items.WHITE_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.BLUE_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.LIGHT_BLUE_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.RED_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.PINK_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.GREEN_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.LIME_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.GRAY_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.BLACK_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.PURPLE_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.MAGENTA_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.CYAN_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.BROWN_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.YELLOW_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.ORANGE_BANNER, 3, 1, 15), new ItemsForEmeralds(Items.LIGHT_GRAY_BANNER, 3, 1, 15) }, Integer.valueOf(5), new ItemListing[] { new ItemsForEmeralds(Items.GLOBE_BANNER_PATTER, 8, 1, 30) })));
             hashMap.put(VillagerProfession.CLERIC, toIntMap(ImmutableMap.<Integer, ItemListing[]>of(Integer.valueOf(1), new ItemListing[] { new EmeraldForItems(Items.ROTTEN_FLESH, 32, 16, 2), new ItemsForEmeralds(Items.REDSTONE, 1, 2, 1) }, Integer.valueOf(2), new ItemListing[] { new EmeraldForItems(Items.GOLD_INGOT, 3, 12, 10), new ItemsForEmeralds(Items.LAPIS_LAZULI, 1, 1, 5) }, Integer.valueOf(3), new ItemListing[] { new EmeraldForItems(Items.RABBIT_FOOT, 2, 12, 20), new ItemsForEmeralds(Blocks.GLOWSTONE, 4, 1, 12, 10) }, Integer.valueOf(4), new ItemListing[] { new EmeraldForItems(Items.SCUTE, 4, 12, 30), new EmeraldForItems(Items.GLASS_BOTTLE, 9, 12, 30), new ItemsForEmeralds(Items.ENDER_PEARL, 5, 1, 15) }, Integer.valueOf(5), new ItemListing[] { new EmeraldForItems(Items.NETHER_WART, 22, 12, 30), new ItemsForEmeralds(Items.EXPERIENCE_BOTTLE, 3, 1, 30) })));
             armorer = VillagerProfession.ARMORER;
             1;
@@ -223,8 +224,8 @@ public class VillagerTrades {
         private final int villagerXp;
         private final float priceMultiplier;
         
-        public EmeraldForItems(final ItemLike bjv, final int integer2, final int integer3, final int integer4) {
-            this.item = bjv.asItem();
+        public EmeraldForItems(final ItemLike bqa, final int integer2, final int integer3, final int integer4) {
+            this.item = bqa.asItem();
             this.cost = integer2;
             this.maxUses = integer3;
             this.villagerXp = integer4;
@@ -232,9 +233,9 @@ public class VillagerTrades {
         }
         
         @Override
-        public MerchantOffer getOffer(final Entity akq, final Random random) {
-            final ItemStack ben4 = new ItemStack(this.item, this.cost);
-            return new MerchantOffer(ben4, new ItemStack(Items.EMERALD), this.maxUses, this.villagerXp, this.priceMultiplier);
+        public MerchantOffer getOffer(final Entity aom, final Random random) {
+            final ItemStack bki4 = new ItemStack(this.item, this.cost);
+            return new MerchantOffer(bki4, new ItemStack(Items.EMERALD), this.maxUses, this.villagerXp, this.priceMultiplier);
         }
     }
     
@@ -246,8 +247,8 @@ public class VillagerTrades {
         
         public EmeraldsForVillagerTypeItem(final int integer1, final int integer2, final int integer3, final Map<VillagerType, Item> map) {
             final IllegalStateException ex;
-            Registry.VILLAGER_TYPE.stream().filter(ayb -> !map.containsKey(ayb)).findAny().ifPresent(ayb -> {
-                new IllegalStateException("Missing trade for villager type: " + Registry.VILLAGER_TYPE.getKey(ayb));
+            Registry.VILLAGER_TYPE.stream().filter(bdu -> !map.containsKey(bdu)).findAny().ifPresent(bdu -> {
+                new IllegalStateException("Missing trade for villager type: " + Registry.VILLAGER_TYPE.getKey(bdu));
                 throw ex;
             });
             this.trades = map;
@@ -258,10 +259,10 @@ public class VillagerTrades {
         
         @Nullable
         @Override
-        public MerchantOffer getOffer(final Entity akq, final Random random) {
-            if (akq instanceof VillagerDataHolder) {
-                final ItemStack ben4 = new ItemStack(this.trades.get(((VillagerDataHolder)akq).getVillagerData().getType()), this.cost);
-                return new MerchantOffer(ben4, new ItemStack(Items.EMERALD), this.maxUses, this.villagerXp, 0.05f);
+        public MerchantOffer getOffer(final Entity aom, final Random random) {
+            if (aom instanceof VillagerDataHolder) {
+                final ItemStack bki4 = new ItemStack(this.trades.get(((VillagerDataHolder)aom).getVillagerData().getType()), this.cost);
+                return new MerchantOffer(bki4, new ItemStack(Items.EMERALD), this.maxUses, this.villagerXp, 0.05f);
             }
             return null;
         }
@@ -275,24 +276,24 @@ public class VillagerTrades {
         private final int villagerXp;
         private final float priceMultiplier;
         
-        public ItemsForEmeralds(final Block bph, final int integer2, final int integer3, final int integer4, final int integer5) {
-            this(new ItemStack(bph), integer2, integer3, integer4, integer5);
+        public ItemsForEmeralds(final Block bvr, final int integer2, final int integer3, final int integer4, final int integer5) {
+            this(new ItemStack(bvr), integer2, integer3, integer4, integer5);
         }
         
-        public ItemsForEmeralds(final Item bei, final int integer2, final int integer3, final int integer4) {
-            this(new ItemStack(bei), integer2, integer3, 12, integer4);
+        public ItemsForEmeralds(final Item bke, final int integer2, final int integer3, final int integer4) {
+            this(new ItemStack(bke), integer2, integer3, 12, integer4);
         }
         
-        public ItemsForEmeralds(final Item bei, final int integer2, final int integer3, final int integer4, final int integer5) {
-            this(new ItemStack(bei), integer2, integer3, integer4, integer5);
+        public ItemsForEmeralds(final Item bke, final int integer2, final int integer3, final int integer4, final int integer5) {
+            this(new ItemStack(bke), integer2, integer3, integer4, integer5);
         }
         
-        public ItemsForEmeralds(final ItemStack ben, final int integer2, final int integer3, final int integer4, final int integer5) {
-            this(ben, integer2, integer3, integer4, integer5, 0.05f);
+        public ItemsForEmeralds(final ItemStack bki, final int integer2, final int integer3, final int integer4, final int integer5) {
+            this(bki, integer2, integer3, integer4, integer5, 0.05f);
         }
         
-        public ItemsForEmeralds(final ItemStack ben, final int integer2, final int integer3, final int integer4, final int integer5, final float float6) {
-            this.itemStack = ben;
+        public ItemsForEmeralds(final ItemStack bki, final int integer2, final int integer3, final int integer4, final int integer5, final float float6) {
+            this.itemStack = bki;
             this.emeraldCost = integer2;
             this.numberOfItems = integer3;
             this.maxUses = integer4;
@@ -301,7 +302,7 @@ public class VillagerTrades {
         }
         
         @Override
-        public MerchantOffer getOffer(final Entity akq, final Random random) {
+        public MerchantOffer getOffer(final Entity aom, final Random random) {
             return new MerchantOffer(new ItemStack(Items.EMERALD, this.emeraldCost), new ItemStack(this.itemStack.getItem(), this.numberOfItems), this.maxUses, this.villagerXp, this.priceMultiplier);
         }
     }
@@ -312,8 +313,8 @@ public class VillagerTrades {
         final int xp;
         private final float priceMultiplier;
         
-        public SuspisciousStewForEmerald(final MobEffect aki, final int integer2, final int integer3) {
-            this.effect = aki;
+        public SuspisciousStewForEmerald(final MobEffect aoe, final int integer2, final int integer3) {
+            this.effect = aoe;
             this.duration = integer2;
             this.xp = integer3;
             this.priceMultiplier = 0.05f;
@@ -321,10 +322,10 @@ public class VillagerTrades {
         
         @Nullable
         @Override
-        public MerchantOffer getOffer(final Entity akq, final Random random) {
-            final ItemStack ben4 = new ItemStack(Items.SUSPICIOUS_STEW, 1);
-            SuspiciousStewItem.saveMobEffect(ben4, this.effect, this.duration);
-            return new MerchantOffer(new ItemStack(Items.EMERALD, 1), ben4, 12, this.xp, this.priceMultiplier);
+        public MerchantOffer getOffer(final Entity aom, final Random random) {
+            final ItemStack bki4 = new ItemStack(Items.SUSPICIOUS_STEW, 1);
+            SuspiciousStewItem.saveMobEffect(bki4, this.effect, this.duration);
+            return new MerchantOffer(new ItemStack(Items.EMERALD, 1), bki4, 12, this.xp, this.priceMultiplier);
         }
     }
     
@@ -335,12 +336,12 @@ public class VillagerTrades {
         private final int villagerXp;
         private final float priceMultiplier;
         
-        public EnchantedItemForEmeralds(final Item bei, final int integer2, final int integer3, final int integer4) {
-            this(bei, integer2, integer3, integer4, 0.05f);
+        public EnchantedItemForEmeralds(final Item bke, final int integer2, final int integer3, final int integer4) {
+            this(bke, integer2, integer3, integer4, 0.05f);
         }
         
-        public EnchantedItemForEmeralds(final Item bei, final int integer2, final int integer3, final int integer4, final float float5) {
-            this.itemStack = new ItemStack(bei);
+        public EnchantedItemForEmeralds(final Item bke, final int integer2, final int integer3, final int integer4, final float float5) {
+            this.itemStack = new ItemStack(bke);
             this.baseEmeraldCost = integer2;
             this.maxUses = integer3;
             this.villagerXp = integer4;
@@ -348,12 +349,12 @@ public class VillagerTrades {
         }
         
         @Override
-        public MerchantOffer getOffer(final Entity akq, final Random random) {
+        public MerchantOffer getOffer(final Entity aom, final Random random) {
             final int integer4 = 5 + random.nextInt(15);
-            final ItemStack ben5 = EnchantmentHelper.enchantItem(random, new ItemStack(this.itemStack.getItem()), integer4, false);
+            final ItemStack bki5 = EnchantmentHelper.enchantItem(random, new ItemStack(this.itemStack.getItem()), integer4, false);
             final int integer5 = Math.min(this.baseEmeraldCost + integer4, 64);
-            final ItemStack ben6 = new ItemStack(Items.EMERALD, integer5);
-            return new MerchantOffer(ben6, ben5, this.maxUses, this.villagerXp, this.priceMultiplier);
+            final ItemStack bki6 = new ItemStack(Items.EMERALD, integer5);
+            return new MerchantOffer(bki6, bki5, this.maxUses, this.villagerXp, this.priceMultiplier);
         }
     }
     
@@ -367,24 +368,24 @@ public class VillagerTrades {
         private final int fromCount;
         private final float priceMultiplier;
         
-        public TippedArrowForItemsAndEmeralds(final Item bei1, final int integer2, final Item bei3, final int integer4, final int integer5, final int integer6, final int integer7) {
-            this.toItem = new ItemStack(bei3);
+        public TippedArrowForItemsAndEmeralds(final Item bke1, final int integer2, final Item bke3, final int integer4, final int integer5, final int integer6, final int integer7) {
+            this.toItem = new ItemStack(bke3);
             this.emeraldCost = integer5;
             this.maxUses = integer6;
             this.villagerXp = integer7;
-            this.fromItem = bei1;
+            this.fromItem = bke1;
             this.fromCount = integer2;
             this.toCount = integer4;
             this.priceMultiplier = 0.05f;
         }
         
         @Override
-        public MerchantOffer getOffer(final Entity akq, final Random random) {
-            final ItemStack ben4 = new ItemStack(Items.EMERALD, this.emeraldCost);
-            final List<Potion> list5 = Registry.POTION.stream().filter(bgd -> !bgd.getEffects().isEmpty() && PotionBrewing.isBrewablePotion(bgd)).collect(Collectors.toList());
-            final Potion bgd2 = list5.get(random.nextInt(list5.size()));
-            final ItemStack ben5 = PotionUtils.setPotion(new ItemStack(this.toItem.getItem(), this.toCount), bgd2);
-            return new MerchantOffer(ben4, new ItemStack(this.fromItem, this.fromCount), ben5, this.maxUses, this.villagerXp, this.priceMultiplier);
+        public MerchantOffer getOffer(final Entity aom, final Random random) {
+            final ItemStack bki4 = new ItemStack(Items.EMERALD, this.emeraldCost);
+            final List<Potion> list5 = Registry.POTION.stream().filter(bmb -> !bmb.getEffects().isEmpty() && PotionBrewing.isBrewablePotion(bmb)).collect(Collectors.toList());
+            final Potion bmb2 = list5.get(random.nextInt(list5.size()));
+            final ItemStack bki5 = PotionUtils.setPotion(new ItemStack(this.toItem.getItem(), this.toCount), bmb2);
+            return new MerchantOffer(bki4, new ItemStack(this.fromItem, this.fromCount), bki5, this.maxUses, this.villagerXp, this.priceMultiplier);
         }
     }
     
@@ -394,21 +395,21 @@ public class VillagerTrades {
         private final int maxUses;
         private final int villagerXp;
         
-        public DyedArmorForEmeralds(final Item bei, final int integer) {
-            this(bei, integer, 12, 1);
+        public DyedArmorForEmeralds(final Item bke, final int integer) {
+            this(bke, integer, 12, 1);
         }
         
-        public DyedArmorForEmeralds(final Item bei, final int integer2, final int integer3, final int integer4) {
-            this.item = bei;
+        public DyedArmorForEmeralds(final Item bke, final int integer2, final int integer3, final int integer4) {
+            this.item = bke;
             this.value = integer2;
             this.maxUses = integer3;
             this.villagerXp = integer4;
         }
         
         @Override
-        public MerchantOffer getOffer(final Entity akq, final Random random) {
-            final ItemStack ben4 = new ItemStack(Items.EMERALD, this.value);
-            ItemStack ben5 = new ItemStack(this.item);
+        public MerchantOffer getOffer(final Entity aom, final Random random) {
+            final ItemStack bki4 = new ItemStack(Items.EMERALD, this.value);
+            ItemStack bki5 = new ItemStack(this.item);
             if (this.item instanceof DyeableArmorItem) {
                 final List<DyeItem> list6 = Lists.newArrayList();
                 list6.add(getRandomDye(random));
@@ -418,9 +419,9 @@ public class VillagerTrades {
                 if (random.nextFloat() > 0.8f) {
                     list6.add(getRandomDye(random));
                 }
-                ben5 = DyeableLeatherItem.dyeArmor(ben5, list6);
+                bki5 = DyeableLeatherItem.dyeArmor(bki5, list6);
             }
-            return new MerchantOffer(ben4, ben5, this.maxUses, this.villagerXp, 0.2f);
+            return new MerchantOffer(bki4, bki5, this.maxUses, this.villagerXp, 0.2f);
         }
         
         private static DyeItem getRandomDye(final Random random) {
@@ -436,31 +437,32 @@ public class VillagerTrades {
         }
         
         @Override
-        public MerchantOffer getOffer(final Entity akq, final Random random) {
-            final Enchantment bhx4 = Registry.ENCHANTMENT.getRandom(random);
-            final int integer5 = Mth.nextInt(random, bhx4.getMinLevel(), bhx4.getMaxLevel());
-            final ItemStack ben6 = EnchantedBookItem.createForEnchantment(new EnchantmentInstance(bhx4, integer5));
-            int integer6 = 2 + random.nextInt(5 + integer5 * 10) + 3 * integer5;
-            if (bhx4.isTreasureOnly()) {
-                integer6 *= 2;
+        public MerchantOffer getOffer(final Entity aom, final Random random) {
+            final List<Enchantment> list4 = Registry.ENCHANTMENT.stream().filter(Enchantment::isTradeable).collect(Collectors.toList());
+            final Enchantment bnw5 = list4.get(random.nextInt(list4.size()));
+            final int integer6 = Mth.nextInt(random, bnw5.getMinLevel(), bnw5.getMaxLevel());
+            final ItemStack bki7 = EnchantedBookItem.createForEnchantment(new EnchantmentInstance(bnw5, integer6));
+            int integer7 = 2 + random.nextInt(5 + integer6 * 10) + 3 * integer6;
+            if (bnw5.isTreasureOnly()) {
+                integer7 *= 2;
             }
-            if (integer6 > 64) {
-                integer6 = 64;
+            if (integer7 > 64) {
+                integer7 = 64;
             }
-            return new MerchantOffer(new ItemStack(Items.EMERALD, integer6), new ItemStack(Items.BOOK), ben6, 12, this.villagerXp, 0.2f);
+            return new MerchantOffer(new ItemStack(Items.EMERALD, integer7), new ItemStack(Items.BOOK), bki7, 12, this.villagerXp, 0.2f);
         }
     }
     
     static class TreasureMapForEmeralds implements ItemListing {
         private final int emeraldCost;
-        private final String destination;
+        private final StructureFeature<?> destination;
         private final MapDecoration.Type destinationType;
         private final int maxUses;
         private final int villagerXp;
         
-        public TreasureMapForEmeralds(final int integer1, final String string, final MapDecoration.Type a, final int integer4, final int integer5) {
+        public TreasureMapForEmeralds(final int integer1, final StructureFeature<?> cml, final MapDecoration.Type a, final int integer4, final int integer5) {
             this.emeraldCost = integer1;
-            this.destination = string;
+            this.destination = cml;
             this.destinationType = a;
             this.maxUses = integer4;
             this.villagerXp = integer5;
@@ -468,18 +470,18 @@ public class VillagerTrades {
         
         @Nullable
         @Override
-        public MerchantOffer getOffer(final Entity akq, final Random random) {
-            if (!(akq.level instanceof ServerLevel)) {
+        public MerchantOffer getOffer(final Entity aom, final Random random) {
+            if (!(aom.level instanceof ServerLevel)) {
                 return null;
             }
-            final ServerLevel xd4 = (ServerLevel)akq.level;
-            final BlockPos fk5 = xd4.findNearestMapFeature(this.destination, new BlockPos(akq), 100, true);
-            if (fk5 != null) {
-                final ItemStack ben6 = MapItem.create(xd4, fk5.getX(), fk5.getZ(), (byte)2, true, true);
-                MapItem.renderBiomePreviewMap(xd4, ben6);
-                MapItemSavedData.addTargetDecoration(ben6, fk5, "+", this.destinationType);
-                ben6.setHoverName(new TranslatableComponent("filled_map." + this.destination.toLowerCase(Locale.ROOT), new Object[0]));
-                return new MerchantOffer(new ItemStack(Items.EMERALD, this.emeraldCost), new ItemStack(Items.COMPASS), ben6, this.maxUses, this.villagerXp, 0.2f);
+            final ServerLevel zd4 = (ServerLevel)aom.level;
+            final BlockPos fu5 = zd4.findNearestMapFeature(this.destination, aom.blockPosition(), 100, true);
+            if (fu5 != null) {
+                final ItemStack bki6 = MapItem.create(zd4, fu5.getX(), fu5.getZ(), (byte)2, true, true);
+                MapItem.renderBiomePreviewMap(zd4, bki6);
+                MapItemSavedData.addTargetDecoration(bki6, fu5, "+", this.destinationType);
+                bki6.setHoverName(new TranslatableComponent("filled_map." + this.destination.getFeatureName().toLowerCase(Locale.ROOT)));
+                return new MerchantOffer(new ItemStack(Items.EMERALD, this.emeraldCost), new ItemStack(Items.COMPASS), bki6, this.maxUses, this.villagerXp, 0.2f);
             }
             return null;
         }
@@ -495,15 +497,15 @@ public class VillagerTrades {
         private final int villagerXp;
         private final float priceMultiplier;
         
-        public ItemsAndEmeraldsToItems(final ItemLike bjv, final int integer2, final Item bei, final int integer4, final int integer5, final int integer6) {
-            this(bjv, integer2, 1, bei, integer4, integer5, integer6);
+        public ItemsAndEmeraldsToItems(final ItemLike bqa, final int integer2, final Item bke, final int integer4, final int integer5, final int integer6) {
+            this(bqa, integer2, 1, bke, integer4, integer5, integer6);
         }
         
-        public ItemsAndEmeraldsToItems(final ItemLike bjv, final int integer2, final int integer3, final Item bei, final int integer5, final int integer6, final int integer7) {
-            this.fromItem = new ItemStack(bjv);
+        public ItemsAndEmeraldsToItems(final ItemLike bqa, final int integer2, final int integer3, final Item bke, final int integer5, final int integer6, final int integer7) {
+            this.fromItem = new ItemStack(bqa);
             this.fromCount = integer2;
             this.emeraldCost = integer3;
-            this.toItem = new ItemStack(bei);
+            this.toItem = new ItemStack(bke);
             this.toCount = integer5;
             this.maxUses = integer6;
             this.villagerXp = integer7;
@@ -512,13 +514,13 @@ public class VillagerTrades {
         
         @Nullable
         @Override
-        public MerchantOffer getOffer(final Entity akq, final Random random) {
+        public MerchantOffer getOffer(final Entity aom, final Random random) {
             return new MerchantOffer(new ItemStack(Items.EMERALD, this.emeraldCost), new ItemStack(this.fromItem.getItem(), this.fromCount), new ItemStack(this.toItem.getItem(), this.toCount), this.maxUses, this.villagerXp, this.priceMultiplier);
         }
     }
     
     public interface ItemListing {
         @Nullable
-        MerchantOffer getOffer(final Entity akq, final Random random);
+        MerchantOffer getOffer(final Entity aom, final Random random);
     }
 }
diff --git a/src/net/minecraft/world/entity/npc/VillagerType.java b/src/net/minecraft/world/entity/npc/VillagerType.java
index b8379b3..2d8a287 100644
--- a/src/net/minecraft/world/entity/npc/VillagerType.java
+++ b/src/net/minecraft/world/entity/npc/VillagerType.java
@@ -73,7 +73,7 @@ public interface VillagerType {
         });
     }
     
-    default VillagerType byBiome(final Biome bkt) {
-        return VillagerType.BY_BIOME.getOrDefault(bkt, VillagerType.PLAINS);
+    default VillagerType byBiome(final Biome bre) {
+        return VillagerType.BY_BIOME.getOrDefault(bre, VillagerType.PLAINS);
     }
 }
diff --git a/src/net/minecraft/world/entity/npc/WanderingTrader.java b/src/net/minecraft/world/entity/npc/WanderingTrader.java
index de39a92..46d955c 100644
--- a/src/net/minecraft/world/entity/npc/WanderingTrader.java
+++ b/src/net/minecraft/world/entity/npc/WanderingTrader.java
@@ -15,6 +15,7 @@ import net.minecraft.world.item.trading.MerchantOffer;
 import net.minecraft.world.item.trading.MerchantOffers;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.stats.Stats;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.AgableMob;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
@@ -25,6 +26,7 @@ import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal;
 import net.minecraft.world.entity.ai.goal.MoveTowardsRestrictionGoal;
 import net.minecraft.world.entity.ai.goal.LookAtTradingPlayerGoal;
 import net.minecraft.world.entity.ai.goal.PanicGoal;
+import net.minecraft.world.entity.monster.Zoglin;
 import net.minecraft.world.entity.monster.Illusioner;
 import net.minecraft.world.entity.monster.Pillager;
 import net.minecraft.world.entity.monster.Vex;
@@ -54,16 +56,16 @@ public class WanderingTrader extends AbstractVillager {
     private BlockPos wanderTarget;
     private int despawnDelay;
     
-    public WanderingTrader(final EntityType<? extends WanderingTrader> aku, final Level bjw) {
-        super(aku, bjw);
+    public WanderingTrader(final EntityType<? extends WanderingTrader> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.forcedLoading = true;
     }
     
     @Override
     protected void registerGoals() {
         this.goalSelector.addGoal(0, new FloatGoal(this));
-        this.goalSelector.addGoal(0, new UseItemGoal<>(this, PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.INVISIBILITY), SoundEvents.WANDERING_TRADER_DISAPPEARED, ayc -> !this.level.isDay() && !ayc.isInvisible()));
-        this.goalSelector.addGoal(0, new UseItemGoal<>(this, new ItemStack(Items.MILK_BUCKET), SoundEvents.WANDERING_TRADER_REAPPEARED, ayc -> this.level.isDay() && ayc.isInvisible()));
+        this.goalSelector.addGoal(0, new UseItemGoal<>(this, PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.INVISIBILITY), SoundEvents.WANDERING_TRADER_DISAPPEARED, bdv -> !this.level.isDay() && !bdv.isInvisible()));
+        this.goalSelector.addGoal(0, new UseItemGoal<>(this, new ItemStack(Items.MILK_BUCKET), SoundEvents.WANDERING_TRADER_REAPPEARED, bdv -> this.level.isDay() && bdv.isInvisible()));
         this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
         this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0f, 0.5, 0.5));
         this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Evoker.class, 12.0f, 0.5, 0.5));
@@ -71,6 +73,7 @@ public class WanderingTrader extends AbstractVillager {
         this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Vex.class, 8.0f, 0.5, 0.5));
         this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Pillager.class, 15.0f, 0.5, 0.5));
         this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Illusioner.class, 12.0f, 0.5, 0.5));
+        this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zoglin.class, 10.0f, 0.5, 0.5));
         this.goalSelector.addGoal(1, new PanicGoal(this, 0.5));
         this.goalSelector.addGoal(1, new LookAtTradingPlayerGoal(this));
         this.goalSelector.addGoal(2, new WanderToPositionGoal(this, 2.0, 0.35));
@@ -82,7 +85,7 @@ public class WanderingTrader extends AbstractVillager {
     
     @Nullable
     @Override
-    public AgableMob getBreedOffspring(final AgableMob ako) {
+    public AgableMob getBreedOffspring(final AgableMob aok) {
         return null;
     }
     
@@ -91,28 +94,22 @@ public class WanderingTrader extends AbstractVillager {
         return false;
     }
     
-    @Override
-    public boolean mobInteract(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        final boolean boolean5 = ben4.getItem() == Items.NAME_TAG;
-        if (boolean5) {
-            ben4.interactEnemy(ayj, this, ajk);
-            return true;
+    public InteractionResult mobInteract(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (bki4.getItem() == Items.VILLAGER_SPAWN_EGG || !this.isAlive() || this.isTrading() || this.isBaby()) {
+            return super.mobInteract(bec, anf);
         }
-        if (ben4.getItem() == Items.VILLAGER_SPAWN_EGG || !this.isAlive() || this.isTrading() || this.isBaby()) {
-            return super.mobInteract(ayj, ajk);
-        }
-        if (ajk == InteractionHand.MAIN_HAND) {
-            ayj.awardStat(Stats.TALKED_TO_VILLAGER);
+        if (anf == InteractionHand.MAIN_HAND) {
+            bec.awardStat(Stats.TALKED_TO_VILLAGER);
         }
         if (this.getOffers().isEmpty()) {
-            return super.mobInteract(ayj, ajk);
+            return InteractionResult.sidedSuccess(this.level.isClientSide);
         }
         if (!this.level.isClientSide) {
-            this.setTradingPlayer(ayj);
-            this.openTradingScreen(ayj, this.getDisplayName(), 1);
+            this.setTradingPlayer(bec);
+            this.openTradingScreen(bec, this.getDisplayName(), 1);
         }
-        return true;
+        return InteractionResult.sidedSuccess(this.level.isClientSide);
     }
     
     @Override
@@ -122,33 +119,33 @@ public class WanderingTrader extends AbstractVillager {
         if (arr2 == null || arr3 == null) {
             return;
         }
-        final MerchantOffers bja4 = this.getOffers();
-        this.addOffersFromItemListings(bja4, arr2, 5);
+        final MerchantOffers bpa4 = this.getOffers();
+        this.addOffersFromItemListings(bpa4, arr2, 5);
         final int integer5 = this.random.nextInt(arr3.length);
         final VillagerTrades.ItemListing f6 = arr3[integer5];
-        final MerchantOffer biz7 = f6.getOffer(this, this.random);
-        if (biz7 != null) {
-            bja4.add(biz7);
+        final MerchantOffer boz7 = f6.getOffer(this, this.random);
+        if (boz7 != null) {
+            bpa4.add(boz7);
         }
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("DespawnDelay", this.despawnDelay);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("DespawnDelay", this.despawnDelay);
         if (this.wanderTarget != null) {
-            jt.put("WanderTarget", NbtUtils.writeBlockPos(this.wanderTarget));
+            le.put("WanderTarget", NbtUtils.writeBlockPos(this.wanderTarget));
         }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("DespawnDelay", 99)) {
-            this.despawnDelay = jt.getInt("DespawnDelay");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("DespawnDelay", 99)) {
+            this.despawnDelay = le.getInt("DespawnDelay");
         }
-        if (jt.contains("WanderTarget")) {
-            this.wanderTarget = NbtUtils.readBlockPos(jt.getCompound("WanderTarget"));
+        if (le.contains("WanderTarget")) {
+            this.wanderTarget = NbtUtils.readBlockPos(le.getCompound("WanderTarget"));
         }
         this.setAge(Math.max(0, this.getAge()));
     }
@@ -159,8 +156,8 @@ public class WanderingTrader extends AbstractVillager {
     }
     
     @Override
-    protected void rewardTradeXp(final MerchantOffer biz) {
-        if (biz.shouldRewardExp()) {
+    protected void rewardTradeXp(final MerchantOffer boz) {
+        if (boz.shouldRewardExp()) {
             final int integer3 = 3 + this.random.nextInt(4);
             this.level.addFreshEntity(new ExperienceOrb(this.level, this.getX(), this.getY() + 0.5, this.getZ(), integer3));
         }
@@ -175,7 +172,7 @@ public class WanderingTrader extends AbstractVillager {
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
         return SoundEvents.WANDERING_TRADER_HURT;
     }
     
@@ -185,9 +182,9 @@ public class WanderingTrader extends AbstractVillager {
     }
     
     @Override
-    protected SoundEvent getDrinkingSound(final ItemStack ben) {
-        final Item bei3 = ben.getItem();
-        if (bei3 == Items.MILK_BUCKET) {
+    protected SoundEvent getDrinkingSound(final ItemStack bki) {
+        final Item bke3 = bki.getItem();
+        if (bke3 == Items.MILK_BUCKET) {
             return SoundEvents.WANDERING_TRADER_DRINK_MILK;
         }
         return SoundEvents.WANDERING_TRADER_DRINK_POTION;
@@ -225,8 +222,8 @@ public class WanderingTrader extends AbstractVillager {
         }
     }
     
-    public void setWanderTarget(@Nullable final BlockPos fk) {
-        this.wanderTarget = fk;
+    public void setWanderTarget(@Nullable final BlockPos fu) {
+        this.wanderTarget = fu;
     }
     
     @Nullable
@@ -239,8 +236,8 @@ public class WanderingTrader extends AbstractVillager {
         final double stopDistance;
         final double speedModifier;
         
-        WanderToPositionGoal(final WanderingTrader ayc2, final double double3, final double double4) {
-            this.trader = ayc2;
+        WanderToPositionGoal(final WanderingTrader bdv2, final double double3, final double double4) {
+            this.trader = bdv2;
             this.stopDistance = double3;
             this.speedModifier = double4;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
@@ -254,27 +251,27 @@ public class WanderingTrader extends AbstractVillager {
         
         @Override
         public boolean canUse() {
-            final BlockPos fk2 = this.trader.getWanderTarget();
-            return fk2 != null && this.isTooFarAway(fk2, this.stopDistance);
+            final BlockPos fu2 = this.trader.getWanderTarget();
+            return fu2 != null && this.isTooFarAway(fu2, this.stopDistance);
         }
         
         @Override
         public void tick() {
-            final BlockPos fk2 = this.trader.getWanderTarget();
-            if (fk2 != null && WanderingTrader.this.navigation.isDone()) {
-                if (this.isTooFarAway(fk2, 10.0)) {
-                    final Vec3 cvl3 = new Vec3(fk2.getX() - this.trader.getX(), fk2.getY() - this.trader.getY(), fk2.getZ() - this.trader.getZ()).normalize();
-                    final Vec3 cvl4 = cvl3.scale(10.0).add(this.trader.getX(), this.trader.getY(), this.trader.getZ());
-                    WanderingTrader.this.navigation.moveTo(cvl4.x, cvl4.y, cvl4.z, this.speedModifier);
+            final BlockPos fu2 = this.trader.getWanderTarget();
+            if (fu2 != null && WanderingTrader.this.navigation.isDone()) {
+                if (this.isTooFarAway(fu2, 10.0)) {
+                    final Vec3 dem3 = new Vec3(fu2.getX() - this.trader.getX(), fu2.getY() - this.trader.getY(), fu2.getZ() - this.trader.getZ()).normalize();
+                    final Vec3 dem4 = dem3.scale(10.0).add(this.trader.getX(), this.trader.getY(), this.trader.getZ());
+                    WanderingTrader.this.navigation.moveTo(dem4.x, dem4.y, dem4.z, this.speedModifier);
                 }
                 else {
-                    WanderingTrader.this.navigation.moveTo(fk2.getX(), fk2.getY(), fk2.getZ(), this.speedModifier);
+                    WanderingTrader.this.navigation.moveTo(fu2.getX(), fu2.getY(), fu2.getZ(), this.speedModifier);
                 }
             }
         }
         
-        private boolean isTooFarAway(final BlockPos fk, final double double2) {
-            return !fk.closerThan(this.trader.position(), double2);
+        private boolean isTooFarAway(final BlockPos fu, final double double2) {
+            return !fu.closerThan(this.trader.position(), double2);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
index e86f37e..6b4bbc3 100644
--- a/src/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
+++ b/src/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
@@ -1,14 +1,12 @@
 package net.minecraft.world.entity.npc;
 
 import java.util.Iterator;
-import net.minecraft.world.level.BlockGetter;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.NaturalSpawner;
 import net.minecraft.world.entity.SpawnPlacements;
 import net.minecraft.world.level.levelgen.Heightmap;
-import net.minecraft.world.entity.animal.horse.TraderLlama;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.animal.horse.TraderLlama;
 import java.util.Optional;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.network.chat.Component;
@@ -17,126 +15,132 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.ai.village.poi.PoiManager;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.GameRules;
-import net.minecraft.world.level.storage.LevelData;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.storage.ServerLevelData;
 import java.util.Random;
+import net.minecraft.world.level.CustomSpawner;
 
-public class WanderingTraderSpawner {
+public class WanderingTraderSpawner implements CustomSpawner {
     private final Random random;
-    private final ServerLevel level;
+    private final ServerLevelData serverLevelData;
     private int tickDelay;
     private int spawnDelay;
     private int spawnChance;
     
-    public WanderingTraderSpawner(final ServerLevel xd) {
+    public WanderingTraderSpawner(final ServerLevelData dak) {
         this.random = new Random();
-        this.level = xd;
+        this.serverLevelData = dak;
         this.tickDelay = 1200;
-        final LevelData crm3 = xd.getLevelData();
-        this.spawnDelay = crm3.getWanderingTraderSpawnDelay();
-        this.spawnChance = crm3.getWanderingTraderSpawnChance();
+        this.spawnDelay = dak.getWanderingTraderSpawnDelay();
+        this.spawnChance = dak.getWanderingTraderSpawnChance();
         if (this.spawnDelay == 0 && this.spawnChance == 0) {
-            crm3.setWanderingTraderSpawnDelay(this.spawnDelay = 24000);
-            crm3.setWanderingTraderSpawnChance(this.spawnChance = 25);
+            dak.setWanderingTraderSpawnDelay(this.spawnDelay = 24000);
+            dak.setWanderingTraderSpawnChance(this.spawnChance = 25);
         }
     }
     
-    public void tick() {
-        if (!this.level.getGameRules().getBoolean(GameRules.RULE_DO_TRADER_SPAWNING)) {
-            return;
+    @Override
+    public int tick(final ServerLevel zd, final boolean boolean2, final boolean boolean3) {
+        if (!zd.getGameRules().getBoolean(GameRules.RULE_DO_TRADER_SPAWNING)) {
+            return 0;
         }
         if (--this.tickDelay > 0) {
-            return;
+            return 0;
         }
         this.tickDelay = 1200;
-        final LevelData crm2 = this.level.getLevelData();
-        crm2.setWanderingTraderSpawnDelay(this.spawnDelay -= 1200);
+        this.spawnDelay -= 1200;
+        this.serverLevelData.setWanderingTraderSpawnDelay(this.spawnDelay);
         if (this.spawnDelay > 0) {
-            return;
+            return 0;
         }
         this.spawnDelay = 24000;
-        if (!this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
-            return;
+        if (!zd.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
+            return 0;
         }
-        final int integer3 = this.spawnChance;
-        crm2.setWanderingTraderSpawnChance(this.spawnChance = Mth.clamp(this.spawnChance + 25, 25, 75));
-        if (this.random.nextInt(100) > integer3) {
-            return;
+        final int integer5 = this.spawnChance;
+        this.spawnChance = Mth.clamp(this.spawnChance + 25, 25, 75);
+        this.serverLevelData.setWanderingTraderSpawnChance(this.spawnChance);
+        if (this.random.nextInt(100) > integer5) {
+            return 0;
         }
-        if (this.spawn()) {
+        if (this.spawn(zd)) {
             this.spawnChance = 25;
+            return 1;
         }
+        return 0;
     }
     
-    private boolean spawn() {
-        final Player ayj2 = this.level.getRandomPlayer();
-        if (ayj2 == null) {
+    private boolean spawn(final ServerLevel zd) {
+        final Player bec3 = zd.getRandomPlayer();
+        if (bec3 == null) {
             return true;
         }
         if (this.random.nextInt(10) != 0) {
             return false;
         }
-        final BlockPos fk3 = ayj2.getCommandSenderBlockPosition();
-        final int integer4 = 48;
-        final PoiManager asr5 = this.level.getPoiManager();
-        final Optional<BlockPos> optional6 = asr5.find(PoiType.MEETING.getPredicate(), fk -> true, fk3, 48, PoiManager.Occupancy.ANY);
-        final BlockPos fk4 = optional6.orElse(fk3);
-        final BlockPos fk5 = this.findSpawnPositionNear(fk4, 48);
-        if (fk5 != null && this.hasEnoughSpace(fk5)) {
-            if (this.level.getBiome(fk5) == Biomes.THE_VOID) {
+        final BlockPos fu4 = bec3.blockPosition();
+        final int integer5 = 48;
+        final PoiManager axz6 = zd.getPoiManager();
+        final Optional<BlockPos> optional7 = axz6.find(PoiType.MEETING.getPredicate(), fu -> true, fu4, 48, PoiManager.Occupancy.ANY);
+        final BlockPos fu5 = optional7.orElse(fu4);
+        final BlockPos fu6 = this.findSpawnPositionNear(zd, fu5, 48);
+        if (fu6 != null && this.hasEnoughSpace(zd, fu6)) {
+            if (zd.getBiome(fu6) == Biomes.THE_VOID) {
                 return false;
             }
-            final WanderingTrader ayc9 = EntityType.WANDERING_TRADER.spawn(this.level, null, null, null, fk5, MobSpawnType.EVENT, false, false);
-            if (ayc9 != null) {
-                for (int integer5 = 0; integer5 < 2; ++integer5) {
-                    this.tryToSpawnLlamaFor(ayc9, 4);
+            final WanderingTrader bdv10 = EntityType.WANDERING_TRADER.spawn(zd, null, null, null, fu6, MobSpawnType.EVENT, false, false);
+            if (bdv10 != null) {
+                for (int integer6 = 0; integer6 < 2; ++integer6) {
+                    this.tryToSpawnLlamaFor(bdv10, 4);
                 }
-                this.level.getLevelData().setWanderingTraderId(ayc9.getUUID());
-                ayc9.setDespawnDelay(48000);
-                ayc9.setWanderTarget(fk4);
-                ayc9.restrictTo(fk4, 16);
+                this.serverLevelData.setWanderingTraderId(bdv10.getUUID());
+                bdv10.setDespawnDelay(48000);
+                bdv10.setWanderTarget(fu5);
+                bdv10.restrictTo(fu5, 16);
                 return true;
             }
         }
         return false;
     }
     
-    private void tryToSpawnLlamaFor(final WanderingTrader ayc, final int integer) {
-        final BlockPos fk4 = this.findSpawnPositionNear(new BlockPos(ayc), integer);
-        if (fk4 == null) {
+    private void tryToSpawnLlamaFor(final WanderingTrader bdv, final int integer) {
+        final BlockPos fu4 = this.findSpawnPositionNear(bdv.level, bdv.blockPosition(), integer);
+        if (fu4 == null) {
             return;
         }
-        final TraderLlama aul5 = EntityType.TRADER_LLAMA.spawn(this.level, null, null, null, fk4, MobSpawnType.EVENT, false, false);
-        if (aul5 == null) {
+        final TraderLlama azu5 = EntityType.TRADER_LLAMA.spawn(bdv.level, null, null, null, fu4, MobSpawnType.EVENT, false, false);
+        if (azu5 == null) {
             return;
         }
-        aul5.setLeashedTo(ayc, true);
+        azu5.setLeashedTo(bdv, true);
     }
     
     @Nullable
-    private BlockPos findSpawnPositionNear(final BlockPos fk, final int integer) {
-        BlockPos fk2 = null;
+    private BlockPos findSpawnPositionNear(final LevelReader bqd, final BlockPos fu, final int integer) {
+        BlockPos fu2 = null;
         for (int integer2 = 0; integer2 < 10; ++integer2) {
-            final int integer3 = fk.getX() + this.random.nextInt(integer * 2) - integer;
-            final int integer4 = fk.getZ() + this.random.nextInt(integer * 2) - integer;
-            final int integer5 = this.level.getHeight(Heightmap.Types.WORLD_SURFACE, integer3, integer4);
-            final BlockPos fk3 = new BlockPos(integer3, integer5, integer4);
-            if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, this.level, fk3, EntityType.WANDERING_TRADER)) {
-                fk2 = fk3;
+            final int integer3 = fu.getX() + this.random.nextInt(integer * 2) - integer;
+            final int integer4 = fu.getZ() + this.random.nextInt(integer * 2) - integer;
+            final int integer5 = bqd.getHeight(Heightmap.Types.WORLD_SURFACE, integer3, integer4);
+            final BlockPos fu3 = new BlockPos(integer3, integer5, integer4);
+            if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, bqd, fu3, EntityType.WANDERING_TRADER)) {
+                fu2 = fu3;
                 break;
             }
         }
-        return fk2;
+        return fu2;
     }
     
-    private boolean hasEnoughSpace(final BlockPos fk) {
-        for (final BlockPos fk2 : BlockPos.betweenClosed(fk, fk.offset(1, 2, 1))) {
-            if (!this.level.getBlockState(fk2).getCollisionShape(this.level, fk2).isEmpty()) {
+    private boolean hasEnoughSpace(final BlockGetter bpg, final BlockPos fu) {
+        for (final BlockPos fu2 : BlockPos.betweenClosed(fu, fu.offset(1, 2, 1))) {
+            if (!bpg.getBlockState(fu2).getCollisionShape(bpg, fu2).isEmpty()) {
                 return false;
             }
         }
diff --git a/src/net/minecraft/world/entity/player/Abilities.java b/src/net/minecraft/world/entity/player/Abilities.java
index 46469d2..23482dd 100644
--- a/src/net/minecraft/world/entity/player/Abilities.java
+++ b/src/net/minecraft/world/entity/player/Abilities.java
@@ -18,31 +18,31 @@ public class Abilities {
         this.walkingSpeed = 0.1f;
     }
     
-    public void addSaveData(final CompoundTag jt) {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.putBoolean("invulnerable", this.invulnerable);
-        jt2.putBoolean("flying", this.flying);
-        jt2.putBoolean("mayfly", this.mayfly);
-        jt2.putBoolean("instabuild", this.instabuild);
-        jt2.putBoolean("mayBuild", this.mayBuild);
-        jt2.putFloat("flySpeed", this.flyingSpeed);
-        jt2.putFloat("walkSpeed", this.walkingSpeed);
-        jt.put("abilities", jt2);
+    public void addSaveData(final CompoundTag le) {
+        final CompoundTag le2 = new CompoundTag();
+        le2.putBoolean("invulnerable", this.invulnerable);
+        le2.putBoolean("flying", this.flying);
+        le2.putBoolean("mayfly", this.mayfly);
+        le2.putBoolean("instabuild", this.instabuild);
+        le2.putBoolean("mayBuild", this.mayBuild);
+        le2.putFloat("flySpeed", this.flyingSpeed);
+        le2.putFloat("walkSpeed", this.walkingSpeed);
+        le.put("abilities", le2);
     }
     
-    public void loadSaveData(final CompoundTag jt) {
-        if (jt.contains("abilities", 10)) {
-            final CompoundTag jt2 = jt.getCompound("abilities");
-            this.invulnerable = jt2.getBoolean("invulnerable");
-            this.flying = jt2.getBoolean("flying");
-            this.mayfly = jt2.getBoolean("mayfly");
-            this.instabuild = jt2.getBoolean("instabuild");
-            if (jt2.contains("flySpeed", 99)) {
-                this.flyingSpeed = jt2.getFloat("flySpeed");
-                this.walkingSpeed = jt2.getFloat("walkSpeed");
+    public void loadSaveData(final CompoundTag le) {
+        if (le.contains("abilities", 10)) {
+            final CompoundTag le2 = le.getCompound("abilities");
+            this.invulnerable = le2.getBoolean("invulnerable");
+            this.flying = le2.getBoolean("flying");
+            this.mayfly = le2.getBoolean("mayfly");
+            this.instabuild = le2.getBoolean("instabuild");
+            if (le2.contains("flySpeed", 99)) {
+                this.flyingSpeed = le2.getFloat("flySpeed");
+                this.walkingSpeed = le2.getFloat("walkSpeed");
             }
-            if (jt2.contains("mayBuild", 1)) {
-                this.mayBuild = jt2.getBoolean("mayBuild");
+            if (le2.contains("mayBuild", 1)) {
+                this.mayBuild = le2.getBoolean("mayBuild");
             }
         }
     }
diff --git a/src/net/minecraft/world/entity/player/Inventory.java b/src/net/minecraft/world/entity/player/Inventory.java
index c7dccfc..8ea4c3e 100644
--- a/src/net/minecraft/world/entity/player/Inventory.java
+++ b/src/net/minecraft/world/entity/player/Inventory.java
@@ -4,12 +4,12 @@ import java.util.AbstractList;
 import net.minecraft.tags.Tag;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ArmorItem;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.ContainerHelper;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.server.level.ServerPlayer;
@@ -21,6 +21,7 @@ import java.util.Iterator;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.ContainerHelper;
 import java.util.function.Predicate;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
@@ -39,13 +40,13 @@ public class Inventory implements Container, Nameable {
     private ItemStack carried;
     private int timesChanged;
     
-    public Inventory(final Player ayj) {
+    public Inventory(final Player bec) {
         this.items = NonNullList.<ItemStack>withSize(36, ItemStack.EMPTY);
         this.armor = NonNullList.<ItemStack>withSize(4, ItemStack.EMPTY);
         this.offhand = NonNullList.<ItemStack>withSize(1, ItemStack.EMPTY);
         this.compartments = ImmutableList.<NonNullList<ItemStack>>of(this.items, this.armor, this.offhand);
         this.carried = ItemStack.EMPTY;
-        this.player = ayj;
+        this.player = bec;
     }
     
     public ItemStack getSelected() {
@@ -59,12 +60,12 @@ public class Inventory implements Container, Nameable {
         return 9;
     }
     
-    private boolean hasRemainingSpaceForItem(final ItemStack ben1, final ItemStack ben2) {
-        return !ben1.isEmpty() && this.isSameItem(ben1, ben2) && ben1.isStackable() && ben1.getCount() < ben1.getMaxStackSize() && ben1.getCount() < this.getMaxStackSize();
+    private boolean hasRemainingSpaceForItem(final ItemStack bki1, final ItemStack bki2) {
+        return !bki1.isEmpty() && this.isSameItem(bki1, bki2) && bki1.isStackable() && bki1.getCount() < bki1.getMaxStackSize() && bki1.getCount() < this.getMaxStackSize();
     }
     
-    private boolean isSameItem(final ItemStack ben1, final ItemStack ben2) {
-        return ben1.getItem() == ben2.getItem() && ItemStack.tagMatches(ben1, ben2);
+    private boolean isSameItem(final ItemStack bki1, final ItemStack bki2) {
+        return bki1.getItem() == bki2.getItem() && ItemStack.tagMatches(bki1, bki2);
     }
     
     public int getFreeSlot() {
@@ -76,8 +77,8 @@ public class Inventory implements Container, Nameable {
         return -1;
     }
     
-    public void setPickedItem(final ItemStack ben) {
-        final int integer3 = this.findSlotMatchingItem(ben);
+    public void setPickedItem(final ItemStack bki) {
+        final int integer3 = this.findSlotMatchingItem(bki);
         if (isHotbarSlot(integer3)) {
             this.selected = integer3;
             return;
@@ -90,7 +91,7 @@ public class Inventory implements Container, Nameable {
                     this.items.set(integer4, this.items.get(this.selected));
                 }
             }
-            this.items.set(this.selected, ben);
+            this.items.set(this.selected, bki);
         }
         else {
             this.pickSlot(integer3);
@@ -99,28 +100,28 @@ public class Inventory implements Container, Nameable {
     
     public void pickSlot(final int integer) {
         this.selected = this.getSuitableHotbarSlot();
-        final ItemStack ben3 = this.items.get(this.selected);
+        final ItemStack bki3 = this.items.get(this.selected);
         this.items.set(this.selected, this.items.get(integer));
-        this.items.set(integer, ben3);
+        this.items.set(integer, bki3);
     }
     
     public static boolean isHotbarSlot(final int integer) {
         return integer >= 0 && integer < 9;
     }
     
-    public int findSlotMatchingItem(final ItemStack ben) {
+    public int findSlotMatchingItem(final ItemStack bki) {
         for (int integer3 = 0; integer3 < this.items.size(); ++integer3) {
-            if (!this.items.get(integer3).isEmpty() && this.isSameItem(ben, this.items.get(integer3))) {
+            if (!this.items.get(integer3).isEmpty() && this.isSameItem(bki, this.items.get(integer3))) {
                 return integer3;
             }
         }
         return -1;
     }
     
-    public int findSlotMatchingUnusedItem(final ItemStack ben) {
+    public int findSlotMatchingUnusedItem(final ItemStack bki) {
         for (int integer3 = 0; integer3 < this.items.size(); ++integer3) {
-            final ItemStack ben2 = this.items.get(integer3);
-            if (!this.items.get(integer3).isEmpty() && this.isSameItem(ben, this.items.get(integer3)) && !this.items.get(integer3).isDamaged() && !ben2.isEnchanted() && !ben2.hasCustomHoverName()) {
+            final ItemStack bki2 = this.items.get(integer3);
+            if (!this.items.get(integer3).isEmpty() && this.isSameItem(bki, this.items.get(integer3)) && !this.items.get(integer3).isDamaged() && !bki2.isEnchanted() && !bki2.hasCustomHoverName()) {
                 return integer3;
             }
         }
@@ -159,89 +160,65 @@ public class Inventory implements Container, Nameable {
         }
     }
     
-    public int clearInventory(final Predicate<ItemStack> predicate, final int integer) {
+    public int clearOrCountMatchingItems(final Predicate<ItemStack> predicate, final int integer, final Container amz) {
         int integer2 = 0;
-        for (int integer3 = 0; integer3 < this.getContainerSize(); ++integer3) {
-            final ItemStack ben6 = this.getItem(integer3);
-            if (!ben6.isEmpty()) {
-                if (predicate.test(ben6)) {
-                    final int integer4 = (integer <= 0) ? ben6.getCount() : Math.min(integer - integer2, ben6.getCount());
-                    integer2 += integer4;
-                    if (integer != 0) {
-                        ben6.shrink(integer4);
-                        if (ben6.isEmpty()) {
-                            this.setItem(integer3, ItemStack.EMPTY);
-                        }
-                        if (integer > 0 && integer2 >= integer) {
-                            return integer2;
-                        }
-                    }
-                }
-            }
-        }
-        if (!this.carried.isEmpty() && predicate.test(this.carried)) {
-            final int integer3 = (integer <= 0) ? this.carried.getCount() : Math.min(integer - integer2, this.carried.getCount());
-            integer2 += integer3;
-            if (integer != 0) {
-                this.carried.shrink(integer3);
-                if (this.carried.isEmpty()) {
-                    this.carried = ItemStack.EMPTY;
-                }
-                if (integer > 0 && integer2 >= integer) {
-                    return integer2;
-                }
-            }
+        final boolean boolean6 = integer == 0;
+        integer2 += ContainerHelper.clearOrCountMatchingItems(this, predicate, integer - integer2, boolean6);
+        integer2 += ContainerHelper.clearOrCountMatchingItems(amz, predicate, integer - integer2, boolean6);
+        integer2 += ContainerHelper.clearOrCountMatchingItems(this.carried, predicate, integer - integer2, boolean6);
+        if (this.carried.isEmpty()) {
+            this.carried = ItemStack.EMPTY;
         }
         return integer2;
     }
     
-    private int addResource(final ItemStack ben) {
-        int integer3 = this.getSlotWithRemainingSpace(ben);
+    private int addResource(final ItemStack bki) {
+        int integer3 = this.getSlotWithRemainingSpace(bki);
         if (integer3 == -1) {
             integer3 = this.getFreeSlot();
         }
         if (integer3 == -1) {
-            return ben.getCount();
+            return bki.getCount();
         }
-        return this.addResource(integer3, ben);
+        return this.addResource(integer3, bki);
     }
     
-    private int addResource(final int integer, final ItemStack ben) {
-        final Item bei4 = ben.getItem();
-        int integer2 = ben.getCount();
-        ItemStack ben2 = this.getItem(integer);
-        if (ben2.isEmpty()) {
-            ben2 = new ItemStack(bei4, 0);
-            if (ben.hasTag()) {
-                ben2.setTag(ben.getTag().copy());
+    private int addResource(final int integer, final ItemStack bki) {
+        final Item bke4 = bki.getItem();
+        int integer2 = bki.getCount();
+        ItemStack bki2 = this.getItem(integer);
+        if (bki2.isEmpty()) {
+            bki2 = new ItemStack(bke4, 0);
+            if (bki.hasTag()) {
+                bki2.setTag(bki.getTag().copy());
             }
-            this.setItem(integer, ben2);
+            this.setItem(integer, bki2);
         }
         int integer3 = integer2;
-        if (integer3 > ben2.getMaxStackSize() - ben2.getCount()) {
-            integer3 = ben2.getMaxStackSize() - ben2.getCount();
+        if (integer3 > bki2.getMaxStackSize() - bki2.getCount()) {
+            integer3 = bki2.getMaxStackSize() - bki2.getCount();
         }
-        if (integer3 > this.getMaxStackSize() - ben2.getCount()) {
-            integer3 = this.getMaxStackSize() - ben2.getCount();
+        if (integer3 > this.getMaxStackSize() - bki2.getCount()) {
+            integer3 = this.getMaxStackSize() - bki2.getCount();
         }
         if (integer3 == 0) {
             return integer2;
         }
         integer2 -= integer3;
-        ben2.grow(integer3);
-        ben2.setPopTime(5);
+        bki2.grow(integer3);
+        bki2.setPopTime(5);
         return integer2;
     }
     
-    public int getSlotWithRemainingSpace(final ItemStack ben) {
-        if (this.hasRemainingSpaceForItem(this.getItem(this.selected), ben)) {
+    public int getSlotWithRemainingSpace(final ItemStack bki) {
+        if (this.hasRemainingSpaceForItem(this.getItem(this.selected), bki)) {
             return this.selected;
         }
-        if (this.hasRemainingSpaceForItem(this.getItem(40), ben)) {
+        if (this.hasRemainingSpaceForItem(this.getItem(40), bki)) {
             return 40;
         }
         for (int integer3 = 0; integer3 < this.items.size(); ++integer3) {
-            if (this.hasRemainingSpaceForItem(this.items.get(integer3), ben)) {
+            if (this.hasRemainingSpaceForItem(this.items.get(integer3), bki)) {
                 return integer3;
             }
         }
@@ -249,83 +226,83 @@ public class Inventory implements Container, Nameable {
     }
     
     public void tick() {
-        for (final NonNullList<ItemStack> fy3 : this.compartments) {
-            for (int integer4 = 0; integer4 < fy3.size(); ++integer4) {
-                if (!fy3.get(integer4).isEmpty()) {
-                    fy3.get(integer4).inventoryTick(this.player.level, this.player, integer4, this.selected == integer4);
+        for (final NonNullList<ItemStack> gi3 : this.compartments) {
+            for (int integer4 = 0; integer4 < gi3.size(); ++integer4) {
+                if (!gi3.get(integer4).isEmpty()) {
+                    gi3.get(integer4).inventoryTick(this.player.level, this.player, integer4, this.selected == integer4);
                 }
             }
         }
     }
     
-    public boolean add(final ItemStack ben) {
-        return this.add(-1, ben);
+    public boolean add(final ItemStack bki) {
+        return this.add(-1, bki);
     }
     
-    public boolean add(int integer, final ItemStack ben) {
-        if (ben.isEmpty()) {
+    public boolean add(int integer, final ItemStack bki) {
+        if (bki.isEmpty()) {
             return false;
         }
         try {
-            if (!ben.isDamaged()) {
+            if (!bki.isDamaged()) {
                 int integer2;
                 do {
-                    integer2 = ben.getCount();
+                    integer2 = bki.getCount();
                     if (integer == -1) {
-                        ben.setCount(this.addResource(ben));
+                        bki.setCount(this.addResource(bki));
                     }
                     else {
-                        ben.setCount(this.addResource(integer, ben));
+                        bki.setCount(this.addResource(integer, bki));
                     }
-                } while (!ben.isEmpty() && ben.getCount() < integer2);
-                if (ben.getCount() == integer2 && this.player.abilities.instabuild) {
-                    ben.setCount(0);
+                } while (!bki.isEmpty() && bki.getCount() < integer2);
+                if (bki.getCount() == integer2 && this.player.abilities.instabuild) {
+                    bki.setCount(0);
                     return true;
                 }
-                return ben.getCount() < integer2;
+                return bki.getCount() < integer2;
             }
             else {
                 if (integer == -1) {
                     integer = this.getFreeSlot();
                 }
                 if (integer >= 0) {
-                    this.items.set(integer, ben.copy());
+                    this.items.set(integer, bki.copy());
                     this.items.get(integer).setPopTime(5);
-                    ben.setCount(0);
+                    bki.setCount(0);
                     return true;
                 }
                 if (this.player.abilities.instabuild) {
-                    ben.setCount(0);
+                    bki.setCount(0);
                     return true;
                 }
                 return false;
             }
         }
         catch (Throwable throwable4) {
-            final CrashReport h5 = CrashReport.forThrowable(throwable4, "Adding item to inventory");
-            final CrashReportCategory i6 = h5.addCategory("Item being added");
-            i6.setDetail("Item ID", Item.getId(ben.getItem()));
-            i6.setDetail("Item data", ben.getDamageValue());
-            i6.setDetail("Item name", () -> ben.getHoverName().getString());
-            throw new ReportedException(h5);
+            final CrashReport j5 = CrashReport.forThrowable(throwable4, "Adding item to inventory");
+            final CrashReportCategory k6 = j5.addCategory("Item being added");
+            k6.setDetail("Item ID", Item.getId(bki.getItem()));
+            k6.setDetail("Item data", bki.getDamageValue());
+            k6.setDetail("Item name", () -> bki.getHoverName().getString());
+            throw new ReportedException(j5);
         }
     }
     
-    public void placeItemBackInInventory(final Level bjw, final ItemStack ben) {
-        if (bjw.isClientSide) {
+    public void placeItemBackInInventory(final Level bqb, final ItemStack bki) {
+        if (bqb.isClientSide) {
             return;
         }
-        while (!ben.isEmpty()) {
-            int integer4 = this.getSlotWithRemainingSpace(ben);
+        while (!bki.isEmpty()) {
+            int integer4 = this.getSlotWithRemainingSpace(bki);
             if (integer4 == -1) {
                 integer4 = this.getFreeSlot();
             }
             if (integer4 == -1) {
-                this.player.drop(ben, false);
+                this.player.drop(bki, false);
                 break;
             }
-            final int integer5 = ben.getMaxStackSize() - this.getItem(integer4).getCount();
-            if (!this.add(integer4, ben.split(integer5))) {
+            final int integer5 = bki.getMaxStackSize() - this.getItem(integer4).getCount();
+            if (!this.add(integer4, bki.split(integer5))) {
                 continue;
             }
             ((ServerPlayer)this.player).connection.send(new ClientboundContainerSetSlotPacket(-2, integer4, this.getItem(integer4)));
@@ -335,12 +312,12 @@ public class Inventory implements Container, Nameable {
     @Override
     public ItemStack removeItem(int integer1, final int integer2) {
         List<ItemStack> list4 = null;
-        for (final NonNullList<ItemStack> fy6 : this.compartments) {
-            if (integer1 < fy6.size()) {
-                list4 = fy6;
+        for (final NonNullList<ItemStack> gi6 : this.compartments) {
+            if (integer1 < gi6.size()) {
+                list4 = gi6;
                 break;
             }
-            integer1 -= fy6.size();
+            integer1 -= gi6.size();
         }
         if (list4 != null && !list4.get(integer1).isEmpty()) {
             return ContainerHelper.removeItem(list4, integer1, integer2);
@@ -348,11 +325,11 @@ public class Inventory implements Container, Nameable {
         return ItemStack.EMPTY;
     }
     
-    public void removeItem(final ItemStack ben) {
-        for (final NonNullList<ItemStack> fy4 : this.compartments) {
-            for (int integer5 = 0; integer5 < fy4.size(); ++integer5) {
-                if (fy4.get(integer5) == ben) {
-                    fy4.set(integer5, ItemStack.EMPTY);
+    public void removeItem(final ItemStack bki) {
+        for (final NonNullList<ItemStack> gi4 : this.compartments) {
+            for (int integer5 = 0; integer5 < gi4.size(); ++integer5) {
+                if (gi4.get(integer5) == bki) {
+                    gi4.set(integer5, ItemStack.EMPTY);
                     break;
                 }
             }
@@ -361,86 +338,86 @@ public class Inventory implements Container, Nameable {
     
     @Override
     public ItemStack removeItemNoUpdate(int integer) {
-        NonNullList<ItemStack> fy3 = null;
-        for (final NonNullList<ItemStack> fy4 : this.compartments) {
-            if (integer < fy4.size()) {
-                fy3 = fy4;
+        NonNullList<ItemStack> gi3 = null;
+        for (final NonNullList<ItemStack> gi4 : this.compartments) {
+            if (integer < gi4.size()) {
+                gi3 = gi4;
                 break;
             }
-            integer -= fy4.size();
+            integer -= gi4.size();
         }
-        if (fy3 != null && !fy3.get(integer).isEmpty()) {
-            final ItemStack ben4 = fy3.get(integer);
-            fy3.set(integer, ItemStack.EMPTY);
-            return ben4;
+        if (gi3 != null && !gi3.get(integer).isEmpty()) {
+            final ItemStack bki4 = gi3.get(integer);
+            gi3.set(integer, ItemStack.EMPTY);
+            return bki4;
         }
         return ItemStack.EMPTY;
     }
     
     @Override
-    public void setItem(int integer, final ItemStack ben) {
-        NonNullList<ItemStack> fy4 = null;
-        for (final NonNullList<ItemStack> fy5 : this.compartments) {
-            if (integer < fy5.size()) {
-                fy4 = fy5;
+    public void setItem(int integer, final ItemStack bki) {
+        NonNullList<ItemStack> gi4 = null;
+        for (final NonNullList<ItemStack> gi5 : this.compartments) {
+            if (integer < gi5.size()) {
+                gi4 = gi5;
                 break;
             }
-            integer -= fy5.size();
+            integer -= gi5.size();
         }
-        if (fy4 != null) {
-            fy4.set(integer, ben);
+        if (gi4 != null) {
+            gi4.set(integer, bki);
         }
     }
     
-    public float getDestroySpeed(final BlockState byj) {
-        return this.items.get(this.selected).getDestroySpeed(byj);
+    public float getDestroySpeed(final BlockState cfj) {
+        return this.items.get(this.selected).getDestroySpeed(cfj);
     }
     
-    public ListTag save(final ListTag jz) {
+    public ListTag save(final ListTag lk) {
         for (int integer3 = 0; integer3 < this.items.size(); ++integer3) {
             if (!this.items.get(integer3).isEmpty()) {
-                final CompoundTag jt4 = new CompoundTag();
-                jt4.putByte("Slot", (byte)integer3);
-                this.items.get(integer3).save(jt4);
-                ((AbstractList<CompoundTag>)jz).add(jt4);
+                final CompoundTag le4 = new CompoundTag();
+                le4.putByte("Slot", (byte)integer3);
+                this.items.get(integer3).save(le4);
+                ((AbstractList<CompoundTag>)lk).add(le4);
             }
         }
         for (int integer3 = 0; integer3 < this.armor.size(); ++integer3) {
             if (!this.armor.get(integer3).isEmpty()) {
-                final CompoundTag jt4 = new CompoundTag();
-                jt4.putByte("Slot", (byte)(integer3 + 100));
-                this.armor.get(integer3).save(jt4);
-                ((AbstractList<CompoundTag>)jz).add(jt4);
+                final CompoundTag le4 = new CompoundTag();
+                le4.putByte("Slot", (byte)(integer3 + 100));
+                this.armor.get(integer3).save(le4);
+                ((AbstractList<CompoundTag>)lk).add(le4);
             }
         }
         for (int integer3 = 0; integer3 < this.offhand.size(); ++integer3) {
             if (!this.offhand.get(integer3).isEmpty()) {
-                final CompoundTag jt4 = new CompoundTag();
-                jt4.putByte("Slot", (byte)(integer3 + 150));
-                this.offhand.get(integer3).save(jt4);
-                ((AbstractList<CompoundTag>)jz).add(jt4);
+                final CompoundTag le4 = new CompoundTag();
+                le4.putByte("Slot", (byte)(integer3 + 150));
+                this.offhand.get(integer3).save(le4);
+                ((AbstractList<CompoundTag>)lk).add(le4);
             }
         }
-        return jz;
+        return lk;
     }
     
-    public void load(final ListTag jz) {
+    public void load(final ListTag lk) {
         this.items.clear();
         this.armor.clear();
         this.offhand.clear();
-        for (int integer3 = 0; integer3 < jz.size(); ++integer3) {
-            final CompoundTag jt4 = jz.getCompound(integer3);
-            final int integer4 = jt4.getByte("Slot") & 0xFF;
-            final ItemStack ben6 = ItemStack.of(jt4);
-            if (!ben6.isEmpty()) {
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            final CompoundTag le4 = lk.getCompound(integer3);
+            final int integer4 = le4.getByte("Slot") & 0xFF;
+            final ItemStack bki6 = ItemStack.of(le4);
+            if (!bki6.isEmpty()) {
                 if (integer4 >= 0 && integer4 < this.items.size()) {
-                    this.items.set(integer4, ben6);
+                    this.items.set(integer4, bki6);
                 }
                 else if (integer4 >= 100 && integer4 < this.armor.size() + 100) {
-                    this.armor.set(integer4 - 100, ben6);
+                    this.armor.set(integer4 - 100, bki6);
                 }
                 else if (integer4 >= 150 && integer4 < this.offhand.size() + 150) {
-                    this.offhand.set(integer4 - 150, ben6);
+                    this.offhand.set(integer4 - 150, bki6);
                 }
             }
         }
@@ -453,18 +430,18 @@ public class Inventory implements Container, Nameable {
     
     @Override
     public boolean isEmpty() {
-        for (final ItemStack ben3 : this.items) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.items) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
-        for (final ItemStack ben3 : this.armor) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.armor) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
-        for (final ItemStack ben3 : this.offhand) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.offhand) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
@@ -474,42 +451,40 @@ public class Inventory implements Container, Nameable {
     @Override
     public ItemStack getItem(int integer) {
         List<ItemStack> list3 = null;
-        for (final NonNullList<ItemStack> fy5 : this.compartments) {
-            if (integer < fy5.size()) {
-                list3 = fy5;
+        for (final NonNullList<ItemStack> gi5 : this.compartments) {
+            if (integer < gi5.size()) {
+                list3 = gi5;
                 break;
             }
-            integer -= fy5.size();
+            integer -= gi5.size();
         }
         return (list3 == null) ? ItemStack.EMPTY : list3.get(integer);
     }
     
     @Override
     public Component getName() {
-        return new TranslatableComponent("container.inventory", new Object[0]);
-    }
-    
-    public boolean canDestroy(final BlockState byj) {
-        return this.getItem(this.selected).canDestroySpecial(byj);
+        return new TranslatableComponent("container.inventory");
     }
     
     public ItemStack getArmor(final int integer) {
         return this.armor.get(integer);
     }
     
-    public void hurtArmor(float float1) {
-        if (float1 <= 0.0f) {
+    public void hurtArmor(final DamageSource anw, float float2) {
+        if (float2 <= 0.0f) {
             return;
         }
-        float1 /= 4.0f;
-        if (float1 < 1.0f) {
-            float1 = 1.0f;
+        float2 /= 4.0f;
+        if (float2 < 1.0f) {
+            float2 = 1.0f;
         }
-        for (int integer3 = 0; integer3 < this.armor.size(); ++integer3) {
-            final ItemStack ben4 = this.armor.get(integer3);
-            if (ben4.getItem() instanceof ArmorItem) {
-                final int integer4 = integer3;
-                ben4.<Player>hurtAndBreak((int)float1, this.player, ayj -> ayj.broadcastBreakEvent(EquipmentSlot.byTypeAndIndex(EquipmentSlot.Type.ARMOR, integer4)));
+        for (int integer4 = 0; integer4 < this.armor.size(); ++integer4) {
+            final ItemStack bki5 = this.armor.get(integer4);
+            if (!anw.isFire() || !bki5.getItem().isFireResistant()) {
+                if (bki5.getItem() instanceof ArmorItem) {
+                    final int integer5 = integer4;
+                    bki5.<Player>hurtAndBreak((int)float2, this.player, bec -> bec.broadcastBreakEvent(EquipmentSlot.byTypeAndIndex(EquipmentSlot.Type.ARMOR, integer5)));
+                }
             }
         }
     }
@@ -517,9 +492,9 @@ public class Inventory implements Container, Nameable {
     public void dropAll() {
         for (final List<ItemStack> list3 : this.compartments) {
             for (int integer4 = 0; integer4 < list3.size(); ++integer4) {
-                final ItemStack ben5 = list3.get(integer4);
-                if (!ben5.isEmpty()) {
-                    this.player.drop(ben5, true, false);
+                final ItemStack bki5 = list3.get(integer4);
+                if (!bki5.isEmpty()) {
+                    this.player.drop(bki5, true, false);
                     list3.set(integer4, ItemStack.EMPTY);
                 }
             }
@@ -535,8 +510,8 @@ public class Inventory implements Container, Nameable {
         return this.timesChanged;
     }
     
-    public void setCarried(final ItemStack ben) {
-        this.carried = ben;
+    public void setCarried(final ItemStack bki) {
+        this.carried = bki;
     }
     
     public ItemStack getCarried() {
@@ -544,14 +519,14 @@ public class Inventory implements Container, Nameable {
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return !this.player.removed && ayj.distanceToSqr(this.player) <= 64.0;
+    public boolean stillValid(final Player bec) {
+        return !this.player.removed && bec.distanceToSqr(this.player) <= 64.0;
     }
     
-    public boolean contains(final ItemStack ben) {
+    public boolean contains(final ItemStack bki) {
         for (final List<ItemStack> list4 : this.compartments) {
-            for (final ItemStack ben2 : list4) {
-                if (!ben2.isEmpty() && ben2.sameItem(ben)) {
+            for (final ItemStack bki2 : list4) {
+                if (!bki2.isEmpty() && bki2.sameItem(bki)) {
                     return true;
                 }
             }
@@ -559,10 +534,10 @@ public class Inventory implements Container, Nameable {
         return false;
     }
     
-    public boolean contains(final Tag<Item> aaz) {
+    public boolean contains(final Tag<Item> adf) {
         for (final List<ItemStack> list4 : this.compartments) {
-            for (final ItemStack ben6 : list4) {
-                if (!ben6.isEmpty() && aaz.contains(ben6.getItem())) {
+            for (final ItemStack bki6 : list4) {
+                if (!bki6.isEmpty() && adf.contains(bki6.getItem())) {
                     return true;
                 }
             }
@@ -570,11 +545,11 @@ public class Inventory implements Container, Nameable {
         return false;
     }
     
-    public void replaceWith(final Inventory ayi) {
+    public void replaceWith(final Inventory beb) {
         for (int integer3 = 0; integer3 < this.getContainerSize(); ++integer3) {
-            this.setItem(integer3, ayi.getItem(integer3));
+            this.setItem(integer3, beb.getItem(integer3));
         }
-        this.selected = ayi.selected;
+        this.selected = beb.selected;
     }
     
     @Override
@@ -584,9 +559,9 @@ public class Inventory implements Container, Nameable {
         }
     }
     
-    public void fillStackedContents(final StackedContents ayl) {
-        for (final ItemStack ben4 : this.items) {
-            ayl.accountSimpleStack(ben4);
+    public void fillStackedContents(final StackedContents bee) {
+        for (final ItemStack bki4 : this.items) {
+            bee.accountSimpleStack(bki4);
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/player/Player.java b/src/net/minecraft/world/entity/player/Player.java
index 8de0ad6..7485b9e 100644
--- a/src/net/minecraft/world/entity/player/Player.java
+++ b/src/net/minecraft/world/entity/player/Player.java
@@ -1,5 +1,7 @@
 package net.minecraft.world.entity.player;
 
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import com.google.common.collect.ImmutableMap;
@@ -8,33 +10,35 @@ import net.minecraft.advancements.CriteriaTriggers;
 import java.util.function.Predicate;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.ProjectileWeaponItem;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.item.ArmorItem;
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.scores.PlayerTeam;
 import net.minecraft.world.scores.Scoreboard;
 import net.minecraft.world.entity.TamableAnimal;
 import com.google.common.collect.Lists;
 import net.minecraft.network.chat.TextComponent;
+import net.minecraft.core.Direction;
 import net.minecraft.world.item.ElytraItem;
+import net.minecraft.world.entity.monster.Strider;
+import net.minecraft.world.entity.animal.Pig;
 import net.minecraft.world.entity.vehicle.Boat;
 import net.minecraft.world.entity.vehicle.AbstractMinecart;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.item.crafting.Recipe;
 import java.util.Collection;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.BedBlock;
-import java.util.Optional;
-import net.minecraft.world.entity.monster.Monster;
 import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.level.block.HorizontalDirectionalBlock;
-import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.RespawnAnchorBlock;
+import java.util.Optional;
 import net.minecraft.util.Unit;
 import com.mojang.datafixers.util.Either;
 import java.util.Iterator;
@@ -60,14 +64,13 @@ import net.minecraft.world.level.block.entity.StructureBlockEntity;
 import net.minecraft.world.level.block.entity.CommandBlockEntity;
 import net.minecraft.world.level.BaseCommandBlock;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
-import net.minecraft.world.InteractionHand;
 import net.minecraft.world.scores.Team;
 import net.minecraft.world.item.AxeItem;
-import net.minecraft.nbt.Tag;
 import net.minecraft.SharedConstants;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.world.effect.MobEffectUtil;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.stats.Stat;
@@ -75,11 +78,9 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.animal.Parrot;
 import java.util.List;
 import net.minecraft.world.phys.AABB;
-import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.Difficulty;
-import net.minecraft.world.entity.animal.Pig;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundSource;
@@ -89,21 +90,24 @@ import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.util.Mth;
 import net.minecraft.stats.Stats;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.pattern.BlockInWorld;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import javax.annotation.Nullable;
-import net.minecraft.world.entity.fishing.FishingHook;
+import net.minecraft.world.entity.projectile.FishingHook;
 import net.minecraft.world.item.ItemCooldowns;
 import net.minecraft.world.item.ItemStack;
 import com.mojang.authlib.GameProfile;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.food.FoodData;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.InventoryMenu;
@@ -142,8 +146,6 @@ public abstract class Player extends LivingEntity {
     public double zCloak;
     private int sleepCounter;
     protected boolean wasUnderwater;
-    private BlockPos respawnPosition;
-    private boolean respawnForced;
     public final Abilities abilities;
     public int experienceLevel;
     public int totalExperience;
@@ -158,8 +160,8 @@ public abstract class Player extends LivingEntity {
     @Nullable
     public FishingHook fishing;
     
-    public Player(final Level bjw, final GameProfile gameProfile) {
-        super(EntityType.PLAYER, bjw);
+    public Player(final Level bqb, final BlockPos fu, final GameProfile gameProfile) {
+        super(EntityType.PLAYER, bqb);
         this.inventory = new Inventory(this);
         this.enderChestInventory = new PlayerEnderChestContainer();
         this.foodData = new FoodData();
@@ -168,34 +170,28 @@ public abstract class Player extends LivingEntity {
         this.cooldowns = this.createItemCooldowns();
         this.setUUID(createPlayerUUID(gameProfile));
         this.gameProfile = gameProfile;
-        this.inventoryMenu = new InventoryMenu(this.inventory, !bjw.isClientSide, this);
+        this.inventoryMenu = new InventoryMenu(this.inventory, !bqb.isClientSide, this);
         this.containerMenu = this.inventoryMenu;
-        final BlockPos fk4 = bjw.getSharedSpawnPos();
-        this.moveTo(fk4.getX() + 0.5, fk4.getY() + 1, fk4.getZ() + 0.5, 0.0f, 0.0f);
+        this.moveTo(fu.getX() + 0.5, fu.getY() + 1, fu.getZ() + 0.5, 0.0f, 0.0f);
         this.rotOffs = 180.0f;
     }
     
-    public boolean blockActionRestricted(final Level bjw, final BlockPos fk, final GameType bjt) {
-        if (!bjt.isBlockPlacingRestricted()) {
+    public boolean blockActionRestricted(final Level bqb, final BlockPos fu, final GameType bpy) {
+        if (!bpy.isBlockPlacingRestricted()) {
             return false;
         }
-        if (bjt == GameType.SPECTATOR) {
+        if (bpy == GameType.SPECTATOR) {
             return true;
         }
         if (this.mayBuild()) {
             return false;
         }
-        final ItemStack ben5 = this.getMainHandItem();
-        return ben5.isEmpty() || !ben5.hasAdventureModeBreakTagForBlock(bjw.getTagManager(), new BlockInWorld(bjw, fk, false));
+        final ItemStack bki5 = this.getMainHandItem();
+        return bki5.isEmpty() || !bki5.hasAdventureModeBreakTagForBlock(bqb.getTagManager(), new BlockInWorld(bqb, fu, false));
     }
     
-    @Override
-    protected void registerAttributes() {
-        super.registerAttributes();
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(1.0);
-        this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.10000000149011612);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_SPEED);
-        this.getAttributes().registerAttribute(SharedMonsterAttributes.LUCK);
+    public static AttributeSupplier.Builder createAttributes() {
+        return LivingEntity.createLivingAttributes().add(Attributes.ATTACK_DAMAGE, 1.0).add(Attributes.MOVEMENT_SPEED, 0.10000000149011612).add(Attributes.ATTACK_SPEED).add(Attributes.LUCK);
     }
     
     @Override
@@ -239,9 +235,6 @@ public abstract class Player extends LivingEntity {
             this.closeContainer();
             this.containerMenu = this.inventoryMenu;
         }
-        if (this.isOnFire() && this.abilities.invulnerable) {
-            this.clearFire();
-        }
         this.moveCloak();
         if (!this.level.isClientSide) {
             this.foodData.tick(this);
@@ -263,12 +256,12 @@ public abstract class Player extends LivingEntity {
             this.setPos(double3, this.getY(), double4);
         }
         ++this.attackStrengthTicker;
-        final ItemStack ben7 = this.getMainHandItem();
-        if (!ItemStack.matches(this.lastItemInMainHand, ben7)) {
-            if (!ItemStack.isSameIgnoreDurability(this.lastItemInMainHand, ben7)) {
+        final ItemStack bki7 = this.getMainHandItem();
+        if (!ItemStack.matches(this.lastItemInMainHand, bki7)) {
+            if (!ItemStack.isSameIgnoreDurability(this.lastItemInMainHand, bki7)) {
                 this.resetAttackStrengthTicker();
             }
-            this.lastItemInMainHand = ben7.copy();
+            this.lastItemInMainHand = bki7.copy();
         }
         this.turtleHelmetTick();
         this.cooldowns.tick();
@@ -288,12 +281,12 @@ public abstract class Player extends LivingEntity {
     }
     
     protected boolean updateIsUnderwater() {
-        return this.wasUnderwater = this.isUnderLiquid(FluidTags.WATER, true);
+        return this.wasUnderwater = this.isEyeInFluid(FluidTags.WATER);
     }
     
     private void turtleHelmetTick() {
-        final ItemStack ben2 = this.getItemBySlot(EquipmentSlot.HEAD);
-        if (ben2.getItem() == Items.TURTLE_HELMET && !this.isUnderLiquid(FluidTags.WATER)) {
+        final ItemStack bki2 = this.getItemBySlot(EquipmentSlot.HEAD);
+        if (bki2.getItem() == Items.TURTLE_HELMET && !this.isEyeInFluid(FluidTags.WATER)) {
             this.addEffect(new MobEffectInstance(MobEffects.WATER_BREATHING, 200, 0, false, false, true));
         }
     }
@@ -343,36 +336,36 @@ public abstract class Player extends LivingEntity {
         if (!this.canEnterPose(Pose.SWIMMING)) {
             return;
         }
-        Pose alj2;
+        Pose apj2;
         if (this.isFallFlying()) {
-            alj2 = Pose.FALL_FLYING;
+            apj2 = Pose.FALL_FLYING;
         }
         else if (this.isSleeping()) {
-            alj2 = Pose.SLEEPING;
+            apj2 = Pose.SLEEPING;
         }
         else if (this.isSwimming()) {
-            alj2 = Pose.SWIMMING;
+            apj2 = Pose.SWIMMING;
         }
         else if (this.isAutoSpinAttack()) {
-            alj2 = Pose.SPIN_ATTACK;
+            apj2 = Pose.SPIN_ATTACK;
         }
         else if (this.isShiftKeyDown() && !this.abilities.flying) {
-            alj2 = Pose.CROUCHING;
+            apj2 = Pose.CROUCHING;
         }
         else {
-            alj2 = Pose.STANDING;
+            apj2 = Pose.STANDING;
         }
-        Pose alj3;
-        if (this.isSpectator() || this.isPassenger() || this.canEnterPose(alj2)) {
-            alj3 = alj2;
+        Pose apj3;
+        if (this.isSpectator() || this.isPassenger() || this.canEnterPose(apj2)) {
+            apj3 = apj2;
         }
         else if (this.canEnterPose(Pose.CROUCHING)) {
-            alj3 = Pose.CROUCHING;
+            apj3 = Pose.CROUCHING;
         }
         else {
-            alj3 = Pose.SWIMMING;
+            apj3 = Pose.SWIMMING;
         }
-        this.setPose(alj3);
+        this.setPose(apj3);
     }
     
     @Override
@@ -401,11 +394,11 @@ public abstract class Player extends LivingEntity {
     }
     
     @Override
-    public void playSound(final SoundEvent aah, final float float2, final float float3) {
-        this.level.playSound(this, this.getX(), this.getY(), this.getZ(), aah, this.getSoundSource(), float2, float3);
+    public void playSound(final SoundEvent ack, final float float2, final float float3) {
+        this.level.playSound(this, this.getX(), this.getY(), this.getZ(), ack, this.getSoundSource(), float2, float3);
     }
     
-    public void playNotifySound(final SoundEvent aah, final SoundSource aaj, final float float3, final float float4) {
+    public void playNotifySound(final SoundEvent ack, final SoundSource acm, final float float3, final float float4) {
     }
     
     @Override
@@ -437,12 +430,12 @@ public abstract class Player extends LivingEntity {
         }
     }
     
-    private void addParticlesAroundSelf(final ParticleOptions gt) {
+    private void addParticlesAroundSelf(final ParticleOptions hf) {
         for (int integer3 = 0; integer3 < 5; ++integer3) {
             final double double4 = this.random.nextGaussian() * 0.02;
             final double double5 = this.random.nextGaussian() * 0.02;
             final double double6 = this.random.nextGaussian() * 0.02;
-            this.level.addParticle(gt, this.getRandomX(1.0), this.getRandomY() + 1.0, this.getRandomZ(1.0), double4, double5, double6);
+            this.level.addParticle(hf, this.getRandomX(1.0), this.getRandomY() + 1.0, this.getRandomZ(1.0), double4, double5, double6);
         }
     }
     
@@ -452,7 +445,7 @@ public abstract class Player extends LivingEntity {
     
     @Override
     public void rideTick() {
-        if (!this.level.isClientSide && this.wantsToStopRiding() && this.isPassenger()) {
+        if (this.wantsToStopRiding() && this.isPassenger()) {
             this.stopRiding();
             this.setShiftKeyDown(false);
             return;
@@ -460,17 +453,10 @@ public abstract class Player extends LivingEntity {
         final double double2 = this.getX();
         final double double3 = this.getY();
         final double double4 = this.getZ();
-        final float float8 = this.yRot;
-        final float float9 = this.xRot;
         super.rideTick();
         this.oBob = this.bob;
         this.bob = 0.0f;
-        this.checkRidingStatistiscs(this.getX() - double2, this.getY() - double3, this.getZ() - double4);
-        if (this.getVehicle() instanceof Pig) {
-            this.xRot = float9;
-            this.yRot = float8;
-            this.yBodyRot = ((Pig)this.getVehicle()).yBodyRot;
-        }
+        this.checkRidingStatistics(this.getX() - double2, this.getY() - double3, this.getZ() - double4);
     }
     
     public void resetPos() {
@@ -503,36 +489,32 @@ public abstract class Player extends LivingEntity {
         this.inventory.tick();
         this.oBob = this.bob;
         super.aiStep();
-        final AttributeInstance alr2 = this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED);
-        if (!this.level.isClientSide) {
-            alr2.setBaseValue(this.abilities.getWalkingSpeed());
-        }
         this.flyingSpeed = 0.02f;
         if (this.isSprinting()) {
             this.flyingSpeed += (float)0.005999999865889549;
         }
-        this.setSpeed((float)alr2.getValue());
-        float float3;
-        if (!this.onGround || this.getHealth() <= 0.0f || this.isSwimming()) {
-            float3 = 0.0f;
+        this.setSpeed((float)this.getAttributeValue(Attributes.MOVEMENT_SPEED));
+        float float2;
+        if (!this.onGround || this.isDeadOrDying() || this.isSwimming()) {
+            float2 = 0.0f;
         }
         else {
-            float3 = Math.min(0.1f, Mth.sqrt(Entity.getHorizontalDistanceSqr(this.getDeltaMovement())));
+            float2 = Math.min(0.1f, Mth.sqrt(Entity.getHorizontalDistanceSqr(this.getDeltaMovement())));
         }
-        this.bob += (float3 - this.bob) * 0.4f;
+        this.bob += (float2 - this.bob) * 0.4f;
         if (this.getHealth() > 0.0f && !this.isSpectator()) {
-            AABB cvf4;
+            AABB deg3;
             if (this.isPassenger() && !this.getVehicle().removed) {
-                cvf4 = this.getBoundingBox().minmax(this.getVehicle().getBoundingBox()).inflate(1.0, 0.0, 1.0);
+                deg3 = this.getBoundingBox().minmax(this.getVehicle().getBoundingBox()).inflate(1.0, 0.0, 1.0);
             }
             else {
-                cvf4 = this.getBoundingBox().inflate(1.0, 0.5, 1.0);
+                deg3 = this.getBoundingBox().inflate(1.0, 0.5, 1.0);
             }
-            final List<Entity> list5 = this.level.getEntities(this, cvf4);
-            for (int integer6 = 0; integer6 < list5.size(); ++integer6) {
-                final Entity akq7 = list5.get(integer6);
-                if (!akq7.removed) {
-                    this.touch(akq7);
+            final List<Entity> list4 = this.level.getEntities(this, deg3);
+            for (int integer5 = 0; integer5 < list4.size(); ++integer5) {
+                final Entity aom6 = list4.get(integer5);
+                if (!aom6.removed) {
+                    this.touch(aom6);
                 }
             }
         }
@@ -543,15 +525,19 @@ public abstract class Player extends LivingEntity {
         }
     }
     
-    private void playShoulderEntityAmbientSound(@Nullable final CompoundTag jt) {
-        if ((jt != null && !jt.contains("Silent")) || !jt.getBoolean("Silent")) {
-            final String string3 = jt.getString("id");
-            EntityType.byString(string3).filter(aku -> aku == EntityType.PARROT).ifPresent(aku -> Parrot.playAmbientSound(this.level, this));
+    private void playShoulderEntityAmbientSound(@Nullable final CompoundTag le) {
+        if (le != null && (!le.contains("Silent") || !le.getBoolean("Silent")) && this.level.random.nextInt(200) == 0) {
+            final String string3 = le.getString("id");
+            EntityType.byString(string3).filter(aoq -> aoq == EntityType.PARROT).ifPresent(aoq -> {
+                if (!Parrot.imitateNearbyMobs(this.level, this)) {
+                    this.level.playSound(null, this.getX(), this.getY(), this.getZ(), Parrot.getAmbient(this.level, this.level.random), this.getSoundSource(), 1.0f, Parrot.getPitch(this.level.random));
+                }
+            });
         }
     }
     
-    private void touch(final Entity akq) {
-        akq.playerTouch(this);
+    private void touch(final Entity aom) {
+        aom.playerTouch(this);
     }
     
     public int getScore() {
@@ -568,13 +554,13 @@ public abstract class Player extends LivingEntity {
     }
     
     @Override
-    public void die(final DamageSource ajz) {
-        super.die(ajz);
+    public void die(final DamageSource anw) {
+        super.die(anw);
         this.reapplyPosition();
         if (!this.isSpectator()) {
-            this.dropAllDeathLoot(ajz);
+            this.dropAllDeathLoot(anw);
         }
-        if (ajz != null) {
+        if (anw != null) {
             this.setDeltaMovement(-Mth.cos((this.hurtDir + this.yRot) * 0.017453292f) * 0.1f, 0.10000000149011612, -Mth.sin((this.hurtDir + this.yRot) * 0.017453292f) * 0.1f);
         }
         else {
@@ -598,22 +584,22 @@ public abstract class Player extends LivingEntity {
     
     protected void destroyVanishingCursedItems() {
         for (int integer2 = 0; integer2 < this.inventory.getContainerSize(); ++integer2) {
-            final ItemStack ben3 = this.inventory.getItem(integer2);
-            if (!ben3.isEmpty() && EnchantmentHelper.hasVanishingCurse(ben3)) {
+            final ItemStack bki3 = this.inventory.getItem(integer2);
+            if (!bki3.isEmpty() && EnchantmentHelper.hasVanishingCurse(bki3)) {
                 this.inventory.removeItemNoUpdate(integer2);
             }
         }
     }
     
     @Override
-    protected SoundEvent getHurtSound(final DamageSource ajz) {
-        if (ajz == DamageSource.ON_FIRE) {
+    protected SoundEvent getHurtSound(final DamageSource anw) {
+        if (anw == DamageSource.ON_FIRE) {
             return SoundEvents.PLAYER_HURT_ON_FIRE;
         }
-        if (ajz == DamageSource.DROWN) {
+        if (anw == DamageSource.DROWN) {
             return SoundEvents.PLAYER_HURT_DROWN;
         }
-        if (ajz == DamageSource.SWEET_BERRY_BUSH) {
+        if (anw == DamageSource.SWEET_BERRY_BUSH) {
             return SoundEvents.PLAYER_HURT_SWEET_BERRY_BUSH;
         }
         return SoundEvents.PLAYER_HURT;
@@ -629,25 +615,28 @@ public abstract class Player extends LivingEntity {
     }
     
     @Nullable
-    public ItemEntity drop(final ItemStack ben, final boolean boolean2) {
-        return this.drop(ben, false, boolean2);
+    public ItemEntity drop(final ItemStack bki, final boolean boolean2) {
+        return this.drop(bki, false, boolean2);
     }
     
     @Nullable
-    public ItemEntity drop(final ItemStack ben, final boolean boolean2, final boolean boolean3) {
-        if (ben.isEmpty()) {
+    public ItemEntity drop(final ItemStack bki, final boolean boolean2, final boolean boolean3) {
+        if (bki.isEmpty()) {
             return null;
         }
+        if (this.level.isClientSide) {
+            this.swing(InteractionHand.MAIN_HAND);
+        }
         final double double5 = this.getEyeY() - 0.30000001192092896;
-        final ItemEntity awb7 = new ItemEntity(this.level, this.getX(), double5, this.getZ(), ben);
-        awb7.setPickUpDelay(40);
+        final ItemEntity bbg7 = new ItemEntity(this.level, this.getX(), double5, this.getZ(), bki);
+        bbg7.setPickUpDelay(40);
         if (boolean3) {
-            awb7.setThrower(this.getUUID());
+            bbg7.setThrower(this.getUUID());
         }
         if (boolean2) {
             final float float8 = this.random.nextFloat() * 0.5f;
             final float float9 = this.random.nextFloat() * 6.2831855f;
-            awb7.setDeltaMovement(-Mth.sin(float9) * float8, 0.20000000298023224, Mth.cos(float9) * float8);
+            bbg7.setDeltaMovement(-Mth.sin(float9) * float8, 0.20000000298023224, Mth.cos(float9) * float8);
         }
         else {
             final float float8 = 0.3f;
@@ -657,17 +646,17 @@ public abstract class Player extends LivingEntity {
             final float float12 = Mth.cos(this.yRot * 0.017453292f);
             final float float13 = this.random.nextFloat() * 6.2831855f;
             final float float14 = 0.02f * this.random.nextFloat();
-            awb7.setDeltaMovement(-float11 * float10 * 0.3f + Math.cos(float13) * float14, -float9 * 0.3f + 0.1f + (this.random.nextFloat() - this.random.nextFloat()) * 0.1f, float12 * float10 * 0.3f + Math.sin(float13) * float14);
+            bbg7.setDeltaMovement(-float11 * float10 * 0.3f + Math.cos(float13) * float14, -float9 * 0.3f + 0.1f + (this.random.nextFloat() - this.random.nextFloat()) * 0.1f, float12 * float10 * 0.3f + Math.sin(float13) * float14);
         }
-        return awb7;
+        return bbg7;
     }
     
-    public float getDestroySpeed(final BlockState byj) {
-        float float3 = this.inventory.getDestroySpeed(byj);
+    public float getDestroySpeed(final BlockState cfj) {
+        float float3 = this.inventory.getDestroySpeed(cfj);
         if (float3 > 1.0f) {
             final int integer4 = EnchantmentHelper.getBlockEfficiency(this);
-            final ItemStack ben5 = this.getMainHandItem();
-            if (integer4 > 0 && !ben5.isEmpty()) {
+            final ItemStack bki5 = this.getMainHandItem();
+            if (integer4 > 0 && !bki5.isEmpty()) {
                 float3 += integer4 * integer4 + 1;
             }
         }
@@ -696,7 +685,7 @@ public abstract class Player extends LivingEntity {
             }
             float3 *= float4;
         }
-        if (this.isUnderLiquid(FluidTags.WATER) && !EnchantmentHelper.hasAquaAffinity(this)) {
+        if (this.isEyeInFluid(FluidTags.WATER) && !EnchantmentHelper.hasAquaAffinity(this)) {
             float3 /= 5.0f;
         }
         if (!this.onGround) {
@@ -705,100 +694,91 @@ public abstract class Player extends LivingEntity {
         return float3;
     }
     
-    public boolean canDestroy(final BlockState byj) {
-        return byj.getMaterial().isAlwaysDestroyable() || this.inventory.canDestroy(byj);
+    public boolean hasCorrectToolForDrops(final BlockState cfj) {
+        return !cfj.requiresCorrectToolForDrops() || this.inventory.getSelected().isCorrectToolForDrops(cfj);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
         this.setUUID(createPlayerUUID(this.gameProfile));
-        final ListTag jz3 = jt.getList("Inventory", 10);
-        this.inventory.load(jz3);
-        this.inventory.selected = jt.getInt("SelectedItemSlot");
-        this.sleepCounter = jt.getShort("SleepTimer");
-        this.experienceProgress = jt.getFloat("XpP");
-        this.experienceLevel = jt.getInt("XpLevel");
-        this.totalExperience = jt.getInt("XpTotal");
-        this.enchantmentSeed = jt.getInt("XpSeed");
+        final ListTag lk3 = le.getList("Inventory", 10);
+        this.inventory.load(lk3);
+        this.inventory.selected = le.getInt("SelectedItemSlot");
+        this.sleepCounter = le.getShort("SleepTimer");
+        this.experienceProgress = le.getFloat("XpP");
+        this.experienceLevel = le.getInt("XpLevel");
+        this.totalExperience = le.getInt("XpTotal");
+        this.enchantmentSeed = le.getInt("XpSeed");
         if (this.enchantmentSeed == 0) {
             this.enchantmentSeed = this.random.nextInt();
         }
-        this.setScore(jt.getInt("Score"));
-        if (jt.contains("SpawnX", 99) && jt.contains("SpawnY", 99) && jt.contains("SpawnZ", 99)) {
-            this.respawnPosition = new BlockPos(jt.getInt("SpawnX"), jt.getInt("SpawnY"), jt.getInt("SpawnZ"));
-            this.respawnForced = jt.getBoolean("SpawnForced");
+        this.setScore(le.getInt("Score"));
+        this.foodData.readAdditionalSaveData(le);
+        this.abilities.loadSaveData(le);
+        this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(this.abilities.getWalkingSpeed());
+        if (le.contains("EnderItems", 9)) {
+            this.enderChestInventory.fromTag(le.getList("EnderItems", 10));
         }
-        this.foodData.readAdditionalSaveData(jt);
-        this.abilities.loadSaveData(jt);
-        if (jt.contains("EnderItems", 9)) {
-            this.enderChestInventory.fromTag(jt.getList("EnderItems", 10));
+        if (le.contains("ShoulderEntityLeft", 10)) {
+            this.setShoulderEntityLeft(le.getCompound("ShoulderEntityLeft"));
         }
-        if (jt.contains("ShoulderEntityLeft", 10)) {
-            this.setShoulderEntityLeft(jt.getCompound("ShoulderEntityLeft"));
-        }
-        if (jt.contains("ShoulderEntityRight", 10)) {
-            this.setShoulderEntityRight(jt.getCompound("ShoulderEntityRight"));
+        if (le.contains("ShoulderEntityRight", 10)) {
+            this.setShoulderEntityRight(le.getCompound("ShoulderEntityRight"));
         }
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
-        jt.put("Inventory", this.inventory.save(new ListTag()));
-        jt.putInt("SelectedItemSlot", this.inventory.selected);
-        jt.putShort("SleepTimer", (short)this.sleepCounter);
-        jt.putFloat("XpP", this.experienceProgress);
-        jt.putInt("XpLevel", this.experienceLevel);
-        jt.putInt("XpTotal", this.totalExperience);
-        jt.putInt("XpSeed", this.enchantmentSeed);
-        jt.putInt("Score", this.getScore());
-        if (this.respawnPosition != null) {
-            jt.putInt("SpawnX", this.respawnPosition.getX());
-            jt.putInt("SpawnY", this.respawnPosition.getY());
-            jt.putInt("SpawnZ", this.respawnPosition.getZ());
-            jt.putBoolean("SpawnForced", this.respawnForced);
-        }
-        this.foodData.addAdditionalSaveData(jt);
-        this.abilities.addSaveData(jt);
-        jt.put("EnderItems", this.enderChestInventory.createTag());
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
+        le.put("Inventory", this.inventory.save(new ListTag()));
+        le.putInt("SelectedItemSlot", this.inventory.selected);
+        le.putShort("SleepTimer", (short)this.sleepCounter);
+        le.putFloat("XpP", this.experienceProgress);
+        le.putInt("XpLevel", this.experienceLevel);
+        le.putInt("XpTotal", this.totalExperience);
+        le.putInt("XpSeed", this.enchantmentSeed);
+        le.putInt("Score", this.getScore());
+        this.foodData.addAdditionalSaveData(le);
+        this.abilities.addSaveData(le);
+        le.put("EnderItems", this.enderChestInventory.createTag());
         if (!this.getShoulderEntityLeft().isEmpty()) {
-            jt.put("ShoulderEntityLeft", this.getShoulderEntityLeft());
+            le.put("ShoulderEntityLeft", this.getShoulderEntityLeft());
         }
         if (!this.getShoulderEntityRight().isEmpty()) {
-            jt.put("ShoulderEntityRight", this.getShoulderEntityRight());
+            le.put("ShoulderEntityRight", this.getShoulderEntityRight());
         }
     }
     
     @Override
-    public boolean isInvulnerableTo(final DamageSource ajz) {
-        if (super.isInvulnerableTo(ajz)) {
+    public boolean isInvulnerableTo(final DamageSource anw) {
+        if (super.isInvulnerableTo(anw)) {
             return true;
         }
-        if (ajz == DamageSource.DROWN) {
+        if (anw == DamageSource.DROWN) {
             return !this.level.getGameRules().getBoolean(GameRules.RULE_DROWNING_DAMAGE);
         }
-        if (ajz == DamageSource.FALL) {
+        if (anw == DamageSource.FALL) {
             return !this.level.getGameRules().getBoolean(GameRules.RULE_FALL_DAMAGE);
         }
-        return ajz.isFire() && !this.level.getGameRules().getBoolean(GameRules.RULE_FIRE_DAMAGE);
+        return anw.isFire() && !this.level.getGameRules().getBoolean(GameRules.RULE_FIRE_DAMAGE);
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
-        if (this.abilities.invulnerable && !ajz.isBypassInvul()) {
+        if (this.abilities.invulnerable && !anw.isBypassInvul()) {
             return false;
         }
         this.noActionTime = 0;
-        if (this.getHealth() <= 0.0f) {
+        if (this.isDeadOrDying()) {
             return false;
         }
         this.removeEntitiesOnShoulder();
-        if (ajz.scalesWithDifficulty()) {
+        if (anw.scalesWithDifficulty()) {
             if (this.level.getDifficulty() == Difficulty.PEACEFUL) {
                 float2 = 0.0f;
             }
@@ -809,36 +789,42 @@ public abstract class Player extends LivingEntity {
                 float2 = float2 * 3.0f / 2.0f;
             }
         }
-        return float2 != 0.0f && super.hurt(ajz, float2);
+        return float2 != 0.0f && super.hurt(anw, float2);
     }
     
     @Override
-    protected void blockUsingShield(final LivingEntity akz) {
-        super.blockUsingShield(akz);
-        if (akz.getMainHandItem().getItem() instanceof AxeItem) {
+    protected void blockUsingShield(final LivingEntity aoy) {
+        super.blockUsingShield(aoy);
+        if (aoy.getMainHandItem().getItem() instanceof AxeItem) {
             this.disableShield(true);
         }
     }
     
-    public boolean canHarmPlayer(final Player ayj) {
-        final Team cwn3 = this.getTeam();
-        final Team cwn4 = ayj.getTeam();
-        return cwn3 == null || !cwn3.isAlliedTo(cwn4) || cwn3.isAllowFriendlyFire();
+    public boolean canHarmPlayer(final Player bec) {
+        final Team dfo3 = this.getTeam();
+        final Team dfo4 = bec.getTeam();
+        return dfo3 == null || !dfo3.isAlliedTo(dfo4) || dfo3.isAllowFriendlyFire();
     }
     
     @Override
-    protected void hurtArmor(final float float1) {
-        this.inventory.hurtArmor(float1);
+    protected void hurtArmor(final DamageSource anw, final float float2) {
+        this.inventory.hurtArmor(anw, float2);
     }
     
     @Override
     protected void hurtCurrentlyUsedShield(final float float1) {
-        if (float1 >= 3.0f && this.useItem.getItem() == Items.SHIELD) {
+        if (this.useItem.getItem() != Items.SHIELD) {
+            return;
+        }
+        if (!this.level.isClientSide) {
+            this.awardStat(Stats.ITEM_USED.get(this.useItem.getItem()));
+        }
+        if (float1 >= 3.0f) {
             final int integer3 = 1 + Mth.floor(float1);
-            final InteractionHand ajk4 = this.getUsedItemHand();
-            this.useItem.<Player>hurtAndBreak(integer3, this, ayj -> ayj.broadcastBreakEvent(ajk4));
+            final InteractionHand anf4 = this.getUsedItemHand();
+            this.useItem.<Player>hurtAndBreak(integer3, this, bec -> bec.broadcastBreakEvent(anf4));
             if (this.useItem.isEmpty()) {
-                if (ajk4 == InteractionHand.MAIN_HAND) {
+                if (anf4 == InteractionHand.MAIN_HAND) {
                     this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
                 }
                 else {
@@ -851,13 +837,13 @@ public abstract class Player extends LivingEntity {
     }
     
     @Override
-    protected void actuallyHurt(final DamageSource ajz, float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    protected void actuallyHurt(final DamageSource anw, float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return;
         }
-        float2 = this.getDamageAfterArmorAbsorb(ajz, float2);
+        float2 = this.getDamageAfterArmorAbsorb(anw, float2);
         final float float3;
-        float2 = (float3 = this.getDamageAfterMagicAbsorb(ajz, float2));
+        float2 = (float3 = this.getDamageAfterMagicAbsorb(anw, float2));
         float2 = Math.max(float2 - this.getAbsorptionAmount(), 0.0f);
         this.setAbsorptionAmount(this.getAbsorptionAmount() - (float3 - float2));
         final float float4 = float3 - float2;
@@ -867,80 +853,87 @@ public abstract class Player extends LivingEntity {
         if (float2 == 0.0f) {
             return;
         }
-        this.causeFoodExhaustion(ajz.getFoodExhaustion());
+        this.causeFoodExhaustion(anw.getFoodExhaustion());
         final float float5 = this.getHealth();
         this.setHealth(this.getHealth() - float2);
-        this.getCombatTracker().recordDamage(ajz, float5, float2);
+        this.getCombatTracker().recordDamage(anw, float5, float2);
         if (float2 < 3.4028235E37f) {
             this.awardStat(Stats.DAMAGE_TAKEN, Math.round(float2 * 10.0f));
         }
     }
     
-    public void openTextEdit(final SignBlockEntity bxh) {
+    @Override
+    protected boolean onSoulSpeedBlock() {
+        return !this.abilities.flying && super.onSoulSpeedBlock();
     }
     
-    public void openMinecartCommandBlock(final BaseCommandBlock bjc) {
+    public void openTextEdit(final SignBlockEntity ceh) {
     }
     
-    public void openCommandBlock(final CommandBlockEntity bwq) {
+    public void openMinecartCommandBlock(final BaseCommandBlock bpc) {
     }
     
-    public void openStructureBlock(final StructureBlockEntity bxl) {
+    public void openCommandBlock(final CommandBlockEntity cdq) {
     }
     
-    public void openJigsawBlock(final JigsawBlockEntity bxb) {
+    public void openStructureBlock(final StructureBlockEntity cel) {
     }
     
-    public void openHorseInventory(final AbstractHorse aue, final Container aje) {
+    public void openJigsawBlock(final JigsawBlockEntity ceb) {
     }
     
-    public OptionalInt openMenu(@Nullable final MenuProvider ajo) {
+    public void openHorseInventory(final AbstractHorse azm, final Container amz) {
+    }
+    
+    public OptionalInt openMenu(@Nullable final MenuProvider anj) {
         return OptionalInt.empty();
     }
     
-    public void sendMerchantOffers(final int integer1, final MerchantOffers bja, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6) {
+    public void sendMerchantOffers(final int integer1, final MerchantOffers bpa, final int integer3, final int integer4, final boolean boolean5, final boolean boolean6) {
     }
     
-    public void openItemGui(final ItemStack ben, final InteractionHand ajk) {
+    public void openItemGui(final ItemStack bki, final InteractionHand anf) {
     }
     
-    public InteractionResult interactOn(final Entity akq, final InteractionHand ajk) {
+    public InteractionResult interactOn(final Entity aom, final InteractionHand anf) {
         if (this.isSpectator()) {
-            if (akq instanceof MenuProvider) {
-                this.openMenu((MenuProvider)akq);
+            if (aom instanceof MenuProvider) {
+                this.openMenu((MenuProvider)aom);
             }
             return InteractionResult.PASS;
         }
-        ItemStack ben4 = this.getItemInHand(ajk);
-        final ItemStack ben5 = ben4.copy();
-        if (akq.interact(this, ajk)) {
-            if (this.abilities.instabuild && ben4 == this.getItemInHand(ajk) && ben4.getCount() < ben5.getCount()) {
-                ben4.setCount(ben5.getCount());
+        ItemStack bki4 = this.getItemInHand(anf);
+        final ItemStack bki5 = bki4.copy();
+        final InteractionResult ang6 = aom.interact(this, anf);
+        if (ang6.consumesAction()) {
+            if (this.abilities.instabuild && bki4 == this.getItemInHand(anf) && bki4.getCount() < bki5.getCount()) {
+                bki4.setCount(bki5.getCount());
             }
-            return InteractionResult.SUCCESS;
+            return ang6;
         }
-        if (!ben4.isEmpty() && akq instanceof LivingEntity) {
+        if (!bki4.isEmpty() && aom instanceof LivingEntity) {
             if (this.abilities.instabuild) {
-                ben4 = ben5;
+                bki4 = bki5;
             }
-            if (ben4.interactEnemy(this, (LivingEntity)akq, ajk)) {
-                if (ben4.isEmpty() && !this.abilities.instabuild) {
-                    this.setItemInHand(ajk, ItemStack.EMPTY);
+            final InteractionResult ang7 = bki4.interactLivingEntity(this, (LivingEntity)aom, anf);
+            if (ang7.consumesAction()) {
+                if (bki4.isEmpty() && !this.abilities.instabuild) {
+                    this.setItemInHand(anf, ItemStack.EMPTY);
                 }
-                return InteractionResult.SUCCESS;
+                return ang7;
             }
         }
         return InteractionResult.PASS;
     }
     
     @Override
-    public double getRidingHeight() {
+    public double getMyRidingOffset() {
         return -0.35;
     }
     
     @Override
-    public void stopRiding() {
-        super.stopRiding();
+    public void removeVehicle() {
+        super.removeVehicle();
         this.boardingCooldown = 0;
     }
     
@@ -949,11 +942,15 @@ public abstract class Player extends LivingEntity {
         return super.isImmobile() || this.isSleeping();
     }
     
+    public boolean isAffectedByFluids() {
+        return !this.abilities.flying;
+    }
+    
     @Override
-    protected Vec3 maybeBackOffFromEdge(Vec3 cvl, final MoverType ale) {
-        if ((ale == MoverType.SELF || ale == MoverType.PLAYER) && this.onGround && this.isStayingOnGroundSurface()) {
-            double double4 = cvl.x;
-            double double5 = cvl.z;
+    protected Vec3 maybeBackOffFromEdge(Vec3 dem, final MoverType apd) {
+        if ((apd == MoverType.SELF || apd == MoverType.PLAYER) && this.onGround && this.isStayingOnGroundSurface()) {
+            double double4 = dem.x;
+            double double5 = dem.z;
             final double double6 = 0.05;
             while (double4 != 0.0 && this.level.noCollision(this, this.getBoundingBox().move(double4, -this.maxUpStep, 0.0))) {
                 if (double4 < 0.05 && double4 >= -0.05) {
@@ -997,22 +994,22 @@ public abstract class Player extends LivingEntity {
                     double5 += 0.05;
                 }
             }
-            cvl = new Vec3(double4, cvl.y, double5);
+            dem = new Vec3(double4, dem.y, double5);
         }
-        return cvl;
+        return dem;
     }
     
-    public void attack(final Entity akq) {
-        if (!akq.isAttackable()) {
+    public void attack(final Entity aom) {
+        if (!aom.isAttackable()) {
             return;
         }
-        if (akq.skipAttackInteraction(this)) {
+        if (aom.skipAttackInteraction(this)) {
             return;
         }
-        float float3 = (float)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue();
+        float float3 = (float)this.getAttributeValue(Attributes.ATTACK_DAMAGE);
         float float4;
-        if (akq instanceof LivingEntity) {
-            float4 = EnchantmentHelper.getDamageBonus(this.getMainHandItem(), ((LivingEntity)akq).getMobType());
+        if (aom instanceof LivingEntity) {
+            float4 = EnchantmentHelper.getDamageBonus(this.getMainHandItem(), ((LivingEntity)aom).getMobType());
         }
         else {
             float4 = EnchantmentHelper.getDamageBonus(this.getMainHandItem(), MobType.UNDEFINED);
@@ -1031,7 +1028,7 @@ public abstract class Player extends LivingEntity {
                 ++integer8;
                 boolean7 = true;
             }
-            boolean boolean8 = boolean6 && this.fallDistance > 0.0f && !this.onGround && !this.onLadder() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && akq instanceof LivingEntity;
+            boolean boolean8 = boolean6 && this.fallDistance > 0.0f && !this.onGround && !this.onClimbable() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && aom instanceof LivingEntity;
             boolean8 = (boolean8 && !this.isSprinting());
             if (boolean8) {
                 float3 *= 1.5f;
@@ -1040,63 +1037,63 @@ public abstract class Player extends LivingEntity {
             boolean boolean9 = false;
             final double double11 = this.walkDist - this.walkDistO;
             if (boolean6 && !boolean8 && !boolean7 && this.onGround && double11 < this.getSpeed()) {
-                final ItemStack ben13 = this.getItemInHand(InteractionHand.MAIN_HAND);
-                if (ben13.getItem() instanceof SwordItem) {
+                final ItemStack bki13 = this.getItemInHand(InteractionHand.MAIN_HAND);
+                if (bki13.getItem() instanceof SwordItem) {
                     boolean9 = true;
                 }
             }
             float float6 = 0.0f;
             boolean boolean10 = false;
             final int integer9 = EnchantmentHelper.getFireAspect(this);
-            if (akq instanceof LivingEntity) {
-                float6 = ((LivingEntity)akq).getHealth();
-                if (integer9 > 0 && !akq.isOnFire()) {
+            if (aom instanceof LivingEntity) {
+                float6 = ((LivingEntity)aom).getHealth();
+                if (integer9 > 0 && !aom.isOnFire()) {
                     boolean10 = true;
-                    akq.setSecondsOnFire(1);
+                    aom.setSecondsOnFire(1);
                 }
             }
-            final Vec3 cvl16 = akq.getDeltaMovement();
-            final boolean boolean11 = akq.hurt(DamageSource.playerAttack(this), float3);
+            final Vec3 dem16 = aom.getDeltaMovement();
+            final boolean boolean11 = aom.hurt(DamageSource.playerAttack(this), float3);
             if (boolean11) {
                 if (integer8 > 0) {
-                    if (akq instanceof LivingEntity) {
-                        ((LivingEntity)akq).knockback(this, integer8 * 0.5f, Mth.sin(this.yRot * 0.017453292f), -Mth.cos(this.yRot * 0.017453292f));
+                    if (aom instanceof LivingEntity) {
+                        ((LivingEntity)aom).knockback(integer8 * 0.5f, Mth.sin(this.yRot * 0.017453292f), -Mth.cos(this.yRot * 0.017453292f));
                     }
                     else {
-                        akq.push(-Mth.sin(this.yRot * 0.017453292f) * integer8 * 0.5f, 0.1, Mth.cos(this.yRot * 0.017453292f) * integer8 * 0.5f);
+                        aom.push(-Mth.sin(this.yRot * 0.017453292f) * integer8 * 0.5f, 0.1, Mth.cos(this.yRot * 0.017453292f) * integer8 * 0.5f);
                     }
                     this.setDeltaMovement(this.getDeltaMovement().multiply(0.6, 1.0, 0.6));
                     this.setSprinting(false);
                 }
                 if (boolean9) {
                     final float float7 = 1.0f + EnchantmentHelper.getSweepingDamageRatio(this) * float3;
-                    final List<LivingEntity> list19 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, akq.getBoundingBox().inflate(1.0, 0.25, 1.0));
-                    for (final LivingEntity akz21 : list19) {
-                        if (akz21 != this && akz21 != akq) {
-                            if (this.isAlliedTo(akz21)) {
+                    final List<LivingEntity> list19 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, aom.getBoundingBox().inflate(1.0, 0.25, 1.0));
+                    for (final LivingEntity aoy21 : list19) {
+                        if (aoy21 != this && aoy21 != aom) {
+                            if (this.isAlliedTo(aoy21)) {
                                 continue;
                             }
-                            if (akz21 instanceof ArmorStand && ((ArmorStand)akz21).isMarker()) {
+                            if (aoy21 instanceof ArmorStand && ((ArmorStand)aoy21).isMarker()) {
                                 continue;
                             }
-                            if (this.distanceToSqr(akz21) >= 9.0) {
+                            if (this.distanceToSqr(aoy21) >= 9.0) {
                                 continue;
                             }
-                            akz21.knockback(this, 0.4f, Mth.sin(this.yRot * 0.017453292f), -Mth.cos(this.yRot * 0.017453292f));
-                            akz21.hurt(DamageSource.playerAttack(this), float7);
+                            aoy21.knockback(0.4f, Mth.sin(this.yRot * 0.017453292f), -Mth.cos(this.yRot * 0.017453292f));
+                            aoy21.hurt(DamageSource.playerAttack(this), float7);
                         }
                     }
                     this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_SWEEP, this.getSoundSource(), 1.0f, 1.0f);
                     this.sweepAttack();
                 }
-                if (akq instanceof ServerPlayer && akq.hurtMarked) {
-                    ((ServerPlayer)akq).connection.send(new ClientboundSetEntityMotionPacket(akq));
-                    akq.hurtMarked = false;
-                    akq.setDeltaMovement(cvl16);
+                if (aom instanceof ServerPlayer && aom.hurtMarked) {
+                    ((ServerPlayer)aom).connection.send(new ClientboundSetEntityMotionPacket(aom));
+                    aom.hurtMarked = false;
+                    aom.setDeltaMovement(dem16);
                 }
                 if (boolean8) {
                     this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_CRIT, this.getSoundSource(), 1.0f, 1.0f);
-                    this.crit(akq);
+                    this.crit(aom);
                 }
                 if (!boolean8 && !boolean9) {
                     if (boolean6) {
@@ -1107,33 +1104,33 @@ public abstract class Player extends LivingEntity {
                     }
                 }
                 if (float4 > 0.0f) {
-                    this.magicCrit(akq);
+                    this.magicCrit(aom);
                 }
-                this.setLastHurtMob(akq);
-                if (akq instanceof LivingEntity) {
-                    EnchantmentHelper.doPostHurtEffects((LivingEntity)akq, this);
+                this.setLastHurtMob(aom);
+                if (aom instanceof LivingEntity) {
+                    EnchantmentHelper.doPostHurtEffects((LivingEntity)aom, this);
                 }
-                EnchantmentHelper.doPostDamageEffects(this, akq);
-                final ItemStack ben14 = this.getMainHandItem();
-                Entity akq2 = akq;
-                if (akq instanceof EnderDragonPart) {
-                    akq2 = ((EnderDragonPart)akq).parentMob;
+                EnchantmentHelper.doPostDamageEffects(this, aom);
+                final ItemStack bki14 = this.getMainHandItem();
+                Entity aom2 = aom;
+                if (aom instanceof EnderDragonPart) {
+                    aom2 = ((EnderDragonPart)aom).parentMob;
                 }
-                if (!this.level.isClientSide && !ben14.isEmpty() && akq2 instanceof LivingEntity) {
-                    ben14.hurtEnemy((LivingEntity)akq2, this);
-                    if (ben14.isEmpty()) {
+                if (!this.level.isClientSide && !bki14.isEmpty() && aom2 instanceof LivingEntity) {
+                    bki14.hurtEnemy((LivingEntity)aom2, this);
+                    if (bki14.isEmpty()) {
                         this.setItemInHand(InteractionHand.MAIN_HAND, ItemStack.EMPTY);
                     }
                 }
-                if (akq instanceof LivingEntity) {
-                    final float float8 = float6 - ((LivingEntity)akq).getHealth();
+                if (aom instanceof LivingEntity) {
+                    final float float8 = float6 - ((LivingEntity)aom).getHealth();
                     this.awardStat(Stats.DAMAGE_DEALT, Math.round(float8 * 10.0f));
                     if (integer9 > 0) {
-                        akq.setSecondsOnFire(integer9 * 4);
+                        aom.setSecondsOnFire(integer9 * 4);
                     }
                     if (this.level instanceof ServerLevel && float8 > 2.0f) {
                         final int integer10 = (int)(float8 * 0.5);
-                        ((ServerLevel)this.level).<SimpleParticleType>sendParticles(ParticleTypes.DAMAGE_INDICATOR, akq.getX(), akq.getY(0.5), akq.getZ(), integer10, 0.1, 0.0, 0.1, 0.2);
+                        ((ServerLevel)this.level).<SimpleParticleType>sendParticles(ParticleTypes.DAMAGE_INDICATOR, aom.getX(), aom.getY(0.5), aom.getZ(), integer10, 0.1, 0.0, 0.1, 0.2);
                     }
                 }
                 this.causeFoodExhaustion(0.1f);
@@ -1141,15 +1138,15 @@ public abstract class Player extends LivingEntity {
             else {
                 this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_NODAMAGE, this.getSoundSource(), 1.0f, 1.0f);
                 if (boolean10) {
-                    akq.clearFire();
+                    aom.clearFire();
                 }
             }
         }
     }
     
     @Override
-    protected void doAutoAttackOnTouch(final LivingEntity akz) {
-        this.attack(akz);
+    protected void doAutoAttackOnTouch(final LivingEntity aoy) {
+        this.attack(aoy);
     }
     
     public void disableShield(final boolean boolean1) {
@@ -1164,10 +1161,10 @@ public abstract class Player extends LivingEntity {
         }
     }
     
-    public void crit(final Entity akq) {
+    public void crit(final Entity aom) {
     }
     
-    public void magicCrit(final Entity akq) {
+    public void magicCrit(final Entity aom) {
     }
     
     public void sweepAttack() {
@@ -1198,64 +1195,12 @@ public abstract class Player extends LivingEntity {
         return this.gameProfile;
     }
     
-    public Either<BedSleepingProblem, Unit> startSleepInBed(final BlockPos fk) {
-        final Direction fp3 = this.level.getBlockState(fk).<Direction>getValue((Property<Direction>)HorizontalDirectionalBlock.FACING);
-        if (!this.level.isClientSide) {
-            if (this.isSleeping() || !this.isAlive()) {
-                return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.OTHER_PROBLEM);
-            }
-            if (!this.level.dimension.isNaturalDimension()) {
-                return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.NOT_POSSIBLE_HERE);
-            }
-            if (this.level.isDay()) {
-                this.setRespawnPosition(fk, false, true);
-                return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.NOT_POSSIBLE_NOW);
-            }
-            if (!this.bedInRange(fk, fp3)) {
-                return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.TOO_FAR_AWAY);
-            }
-            if (this.bedBlocked(fk, fp3)) {
-                return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.OBSTRUCTED);
-            }
-            if (!this.isCreative()) {
-                final double double4 = 8.0;
-                final double double5 = 5.0;
-                final Vec3 cvl8 = new Vec3(fk.getX() + 0.5, fk.getY(), fk.getZ() + 0.5);
-                final List<Monster> list9 = this.level.<Monster>getEntitiesOfClass(Monster.class, new AABB(cvl8.x() - 8.0, cvl8.y() - 5.0, cvl8.z() - 8.0, cvl8.x() + 8.0, cvl8.y() + 5.0, cvl8.z() + 8.0), aww -> aww.isPreventingPlayerRest(this));
-                if (!list9.isEmpty()) {
-                    return (Either<BedSleepingProblem, Unit>)Either.left(BedSleepingProblem.NOT_SAFE);
-                }
-            }
-        }
-        this.startSleeping(fk);
+    public Either<BedSleepingProblem, Unit> startSleepInBed(final BlockPos fu) {
+        this.startSleeping(fu);
         this.sleepCounter = 0;
-        if (this.level instanceof ServerLevel) {
-            ((ServerLevel)this.level).updateSleepingPlayerList();
-        }
         return (Either<BedSleepingProblem, Unit>)Either.right(Unit.INSTANCE);
     }
     
-    @Override
-    public void startSleeping(final BlockPos fk) {
-        this.resetStat(Stats.CUSTOM.get(Stats.TIME_SINCE_REST));
-        this.setRespawnPosition(fk, false, true);
-        super.startSleeping(fk);
-    }
-    
-    private boolean bedInRange(final BlockPos fk, final Direction fp) {
-        return this.isReachableBedBlock(fk) || this.isReachableBedBlock(fk.relative(fp.getOpposite()));
-    }
-    
-    private boolean isReachableBedBlock(final BlockPos fk) {
-        final Vec3 cvl3 = new Vec3(fk.getX() + 0.5, fk.getY(), fk.getZ() + 0.5);
-        return Math.abs(this.getX() - cvl3.x()) <= 3.0 && Math.abs(this.getY() - cvl3.y()) <= 2.0 && Math.abs(this.getZ() - cvl3.z()) <= 3.0;
-    }
-    
-    private boolean bedBlocked(final BlockPos fk, final Direction fp) {
-        final BlockPos fk2 = fk.above();
-        return !this.freeAt(fk2) || !this.freeAt(fk2.relative(fp.getOpposite()));
-    }
-    
     public void stopSleepInBed(final boolean boolean1, final boolean boolean2) {
         super.stopSleeping();
         if (this.level instanceof ServerLevel && boolean2) {
@@ -1269,18 +1214,26 @@ public abstract class Player extends LivingEntity {
         this.stopSleepInBed(true, true);
     }
     
-    public static Optional<Vec3> checkBedValidRespawnPosition(final LevelReader bjz, final BlockPos fk, final boolean boolean3) {
-        final Block bph4 = bjz.getBlockState(fk).getBlock();
-        if (bph4 instanceof BedBlock) {
-            return BedBlock.findStandUpPosition(EntityType.PLAYER, bjz, fk, 0);
+    public static Optional<Vec3> findRespawnPositionAndUseSpawnBlock(final ServerLevel zd, final BlockPos fu, final boolean boolean3, final boolean boolean4) {
+        final BlockState cfj5 = zd.getBlockState(fu);
+        final Block bvr6 = cfj5.getBlock();
+        if (bvr6 instanceof RespawnAnchorBlock && cfj5.<Integer>getValue((Property<Integer>)RespawnAnchorBlock.CHARGE) > 0 && RespawnAnchorBlock.canSetSpawn(zd)) {
+            final Optional<Vec3> optional7 = RespawnAnchorBlock.findStandUpPosition(EntityType.PLAYER, zd, fu);
+            if (!boolean4 && optional7.isPresent()) {
+                zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj5).<Comparable, Integer>setValue((Property<Comparable>)RespawnAnchorBlock.CHARGE, cfj5.<Integer>getValue((Property<Integer>)RespawnAnchorBlock.CHARGE) - 1), 3);
+            }
+            return optional7;
+        }
+        if (bvr6 instanceof BedBlock && BedBlock.canSetSpawn(zd)) {
+            return BedBlock.findStandUpPosition(EntityType.PLAYER, zd, fu, 0);
         }
         if (!boolean3) {
             return Optional.<Vec3>empty();
         }
-        final boolean boolean4 = bph4.isPossibleToRespawnInThis();
-        final boolean boolean5 = bjz.getBlockState(fk.above()).getBlock().isPossibleToRespawnInThis();
-        if (boolean4 && boolean5) {
-            return Optional.<Vec3>of(new Vec3(fk.getX() + 0.5, fk.getY() + 0.1, fk.getZ() + 0.5));
+        final boolean boolean5 = bvr6.isPossibleToRespawnInThis();
+        final boolean boolean6 = zd.getBlockState(fu.above()).getBlock().isPossibleToRespawnInThis();
+        if (boolean5 && boolean6) {
+            return Optional.<Vec3>of(new Vec3(fu.getX() + 0.5, fu.getY() + 0.1, fu.getZ() + 0.5));
         }
         return Optional.<Vec3>empty();
     }
@@ -1293,47 +1246,25 @@ public abstract class Player extends LivingEntity {
         return this.sleepCounter;
     }
     
-    public void displayClientMessage(final Component lf, final boolean boolean2) {
+    public void displayClientMessage(final Component mr, final boolean boolean2) {
     }
     
-    public BlockPos getRespawnPosition() {
-        return this.respawnPosition;
+    public void awardStat(final ResourceLocation uh) {
+        this.awardStat(Stats.CUSTOM.get(uh));
     }
     
-    public boolean isRespawnForced() {
-        return this.respawnForced;
+    public void awardStat(final ResourceLocation uh, final int integer) {
+        this.awardStat(Stats.CUSTOM.get(uh), integer);
     }
     
-    public void setRespawnPosition(final BlockPos fk, final boolean boolean2, final boolean boolean3) {
-        if (fk != null) {
-            if (boolean3 && !fk.equals(this.respawnPosition)) {
-                this.sendMessage(new TranslatableComponent("block.minecraft.bed.set_spawn", new Object[0]));
-            }
-            this.respawnPosition = fk;
-            this.respawnForced = boolean2;
-        }
-        else {
-            this.respawnPosition = null;
-            this.respawnForced = false;
-        }
+    public void awardStat(final Stat<?> acr) {
+        this.awardStat(acr, 1);
     }
     
-    public void awardStat(final ResourceLocation sm) {
-        this.awardStat(Stats.CUSTOM.get(sm));
+    public void awardStat(final Stat<?> acr, final int integer) {
     }
     
-    public void awardStat(final ResourceLocation sm, final int integer) {
-        this.awardStat(Stats.CUSTOM.get(sm), integer);
-    }
-    
-    public void awardStat(final Stat<?> aao) {
-        this.awardStat(aao, 1);
-    }
-    
-    public void awardStat(final Stat<?> aao, final int integer) {
-    }
-    
-    public void resetStat(final Stat<?> aao) {
+    public void resetStat(final Stat<?> acr) {
     }
     
     public int awardRecipes(final Collection<Recipe<?>> collection) {
@@ -1359,7 +1290,7 @@ public abstract class Player extends LivingEntity {
     }
     
     @Override
-    public void travel(final Vec3 cvl) {
+    public void travel(final Vec3 dem) {
         final double double3 = this.getX();
         final double double4 = this.getY();
         final double double5 = this.getZ();
@@ -1367,23 +1298,23 @@ public abstract class Player extends LivingEntity {
             final double double6 = this.getLookAngle().y;
             final double double7 = (double6 < -0.2) ? 0.085 : 0.06;
             if (double6 <= 0.0 || this.jumping || !this.level.getBlockState(new BlockPos(this.getX(), this.getY() + 1.0 - 0.1, this.getZ())).getFluidState().isEmpty()) {
-                final Vec3 cvl2 = this.getDeltaMovement();
-                this.setDeltaMovement(cvl2.add(0.0, (double6 - cvl2.y) * double7, 0.0));
+                final Vec3 dem2 = this.getDeltaMovement();
+                this.setDeltaMovement(dem2.add(0.0, (double6 - dem2.y) * double7, 0.0));
             }
         }
         if (this.abilities.flying && !this.isPassenger()) {
             final double double6 = this.getDeltaMovement().y;
             final float float11 = this.flyingSpeed;
             this.flyingSpeed = this.abilities.getFlyingSpeed() * (this.isSprinting() ? 2 : 1);
-            super.travel(cvl);
-            final Vec3 cvl3 = this.getDeltaMovement();
-            this.setDeltaMovement(cvl3.x, double6 * 0.6, cvl3.z);
+            super.travel(dem);
+            final Vec3 dem3 = this.getDeltaMovement();
+            this.setDeltaMovement(dem3.x, double6 * 0.6, dem3.z);
             this.flyingSpeed = float11;
             this.fallDistance = 0.0f;
             this.setSharedFlag(7, false);
         }
         else {
-            super.travel(cvl);
+            super.travel(dem);
         }
         this.checkMovementStatistics(this.getX() - double3, this.getY() - double4, this.getZ() - double5);
     }
@@ -1398,13 +1329,13 @@ public abstract class Player extends LivingEntity {
         }
     }
     
-    protected boolean freeAt(final BlockPos fk) {
-        return !this.level.getBlockState(fk).isSuffocating(this.level, fk);
+    protected boolean freeAt(final BlockPos fu) {
+        return !this.level.getBlockState(fu).isSuffocating(this.level, fu);
     }
     
     @Override
     public float getSpeed() {
-        return (float)this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).getValue();
+        return (float)this.getAttributeValue(Attributes.MOVEMENT_SPEED);
     }
     
     public void checkMovementStatistics(final double double1, final double double2, final double double3) {
@@ -1418,7 +1349,7 @@ public abstract class Player extends LivingEntity {
                 this.causeFoodExhaustion(0.01f * integer8 * 0.01f);
             }
         }
-        else if (this.isUnderLiquid(FluidTags.WATER, true)) {
+        else if (this.isEyeInFluid(FluidTags.WATER)) {
             final int integer8 = Math.round(Mth.sqrt(double1 * double1 + double2 * double2 + double3 * double3) * 100.0f);
             if (integer8 > 0) {
                 this.awardStat(Stats.WALK_UNDER_WATER_ONE_CM, integer8);
@@ -1432,7 +1363,7 @@ public abstract class Player extends LivingEntity {
                 this.causeFoodExhaustion(0.01f * integer8 * 0.01f);
             }
         }
-        else if (this.onLadder()) {
+        else if (this.onClimbable()) {
             if (double2 > 0.0) {
                 this.awardStat(Stats.CLIMB_ONE_CM, (int)Math.round(double2 * 100.0));
             }
@@ -1466,22 +1397,26 @@ public abstract class Player extends LivingEntity {
         }
     }
     
-    private void checkRidingStatistiscs(final double double1, final double double2, final double double3) {
+    private void checkRidingStatistics(final double double1, final double double2, final double double3) {
         if (this.isPassenger()) {
             final int integer8 = Math.round(Mth.sqrt(double1 * double1 + double2 * double2 + double3 * double3) * 100.0f);
             if (integer8 > 0) {
-                if (this.getVehicle() instanceof AbstractMinecart) {
+                final Entity aom9 = this.getVehicle();
+                if (aom9 instanceof AbstractMinecart) {
                     this.awardStat(Stats.MINECART_ONE_CM, integer8);
                 }
-                else if (this.getVehicle() instanceof Boat) {
+                else if (aom9 instanceof Boat) {
                     this.awardStat(Stats.BOAT_ONE_CM, integer8);
                 }
-                else if (this.getVehicle() instanceof Pig) {
+                else if (aom9 instanceof Pig) {
                     this.awardStat(Stats.PIG_ONE_CM, integer8);
                 }
-                else if (this.getVehicle() instanceof AbstractHorse) {
+                else if (aom9 instanceof AbstractHorse) {
                     this.awardStat(Stats.HORSE_ONE_CM, integer8);
                 }
+                else if (aom9 instanceof Strider) {
+                    this.awardStat(Stats.STRIDER_ONE_CM, integer8);
+                }
             }
         }
     }
@@ -1498,9 +1433,9 @@ public abstract class Player extends LivingEntity {
     }
     
     public boolean tryToStartFallFlying() {
-        if (!this.onGround && !this.isFallFlying() && !this.isInWater()) {
-            final ItemStack ben2 = this.getItemBySlot(EquipmentSlot.CHEST);
-            if (ben2.getItem() == Items.ELYTRA && ElytraItem.isFlyEnabled(ben2)) {
+        if (!this.onGround && !this.isFallFlying() && !this.isInWater() && !this.hasEffect(MobEffects.LEVITATION)) {
+            final ItemStack bki2 = this.getItemBySlot(EquipmentSlot.CHEST);
+            if (bki2.getItem() == Items.ELYTRA && ElytraItem.isFlyEnabled(bki2)) {
                 this.startFallFlying();
                 return true;
             }
@@ -1533,14 +1468,14 @@ public abstract class Player extends LivingEntity {
     }
     
     @Override
-    public void killed(final LivingEntity akz) {
-        this.awardStat(Stats.ENTITY_KILLED.get(akz.getType()));
+    public void killed(final LivingEntity aoy) {
+        this.awardStat(Stats.ENTITY_KILLED.get(aoy.getType()));
     }
     
     @Override
-    public void makeStuckInBlock(final BlockState byj, final Vec3 cvl) {
+    public void makeStuckInBlock(final BlockState cfj, final Vec3 dem) {
         if (!this.abilities.flying) {
-            super.makeStuckInBlock(byj, cvl);
+            super.makeStuckInBlock(cfj, dem);
         }
     }
     
@@ -1570,7 +1505,7 @@ public abstract class Player extends LivingEntity {
         return this.enchantmentSeed;
     }
     
-    public void onEnchantmentPerformed(final ItemStack ben, final int integer) {
+    public void onEnchantmentPerformed(final ItemStack bki, final int integer) {
         this.experienceLevel -= integer;
         if (this.experienceLevel < 0) {
             this.experienceLevel = 0;
@@ -1629,17 +1564,17 @@ public abstract class Player extends LivingEntity {
         return this.abilities.mayBuild;
     }
     
-    public boolean mayUseItemAt(final BlockPos fk, final Direction fp, final ItemStack ben) {
+    public boolean mayUseItemAt(final BlockPos fu, final Direction fz, final ItemStack bki) {
         if (this.abilities.mayBuild) {
             return true;
         }
-        final BlockPos fk2 = fk.relative(fp.getOpposite());
-        final BlockInWorld byn6 = new BlockInWorld(this.level, fk2, false);
-        return ben.hasAdventureModePlaceTagForBlock(this.level.getTagManager(), byn6);
+        final BlockPos fu2 = fu.relative(fz.getOpposite());
+        final BlockInWorld cfn6 = new BlockInWorld(this.level, fu2, false);
+        return bki.hasAdventureModePlaceTagForBlock(this.level.getTagManager(), cfn6);
     }
     
     @Override
-    protected int getExperienceReward(final Player ayj) {
+    protected int getExperienceReward(final Player bec) {
         if (this.level.getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) || this.isSpectator()) {
             return 0;
         }
@@ -1668,7 +1603,7 @@ public abstract class Player extends LivingEntity {
     public void onUpdateAbilities() {
     }
     
-    public void setGameMode(final GameType bjt) {
+    public void setGameMode(final GameType bpy) {
     }
     
     @Override
@@ -1681,38 +1616,38 @@ public abstract class Player extends LivingEntity {
     }
     
     @Override
-    public ItemStack getItemBySlot(final EquipmentSlot akv) {
-        if (akv == EquipmentSlot.MAINHAND) {
+    public ItemStack getItemBySlot(final EquipmentSlot aor) {
+        if (aor == EquipmentSlot.MAINHAND) {
             return this.inventory.getSelected();
         }
-        if (akv == EquipmentSlot.OFFHAND) {
+        if (aor == EquipmentSlot.OFFHAND) {
             return this.inventory.offhand.get(0);
         }
-        if (akv.getType() == EquipmentSlot.Type.ARMOR) {
-            return this.inventory.armor.get(akv.getIndex());
+        if (aor.getType() == EquipmentSlot.Type.ARMOR) {
+            return this.inventory.armor.get(aor.getIndex());
         }
         return ItemStack.EMPTY;
     }
     
     @Override
-    public void setItemSlot(final EquipmentSlot akv, final ItemStack ben) {
-        if (akv == EquipmentSlot.MAINHAND) {
-            this.playEquipSound(ben);
-            this.inventory.items.set(this.inventory.selected, ben);
+    public void setItemSlot(final EquipmentSlot aor, final ItemStack bki) {
+        if (aor == EquipmentSlot.MAINHAND) {
+            this.playEquipSound(bki);
+            this.inventory.items.set(this.inventory.selected, bki);
         }
-        else if (akv == EquipmentSlot.OFFHAND) {
-            this.playEquipSound(ben);
-            this.inventory.offhand.set(0, ben);
+        else if (aor == EquipmentSlot.OFFHAND) {
+            this.playEquipSound(bki);
+            this.inventory.offhand.set(0, bki);
         }
-        else if (akv.getType() == EquipmentSlot.Type.ARMOR) {
-            this.playEquipSound(ben);
-            this.inventory.armor.set(akv.getIndex(), ben);
+        else if (aor.getType() == EquipmentSlot.Type.ARMOR) {
+            this.playEquipSound(bki);
+            this.inventory.armor.set(aor.getIndex(), bki);
         }
     }
     
-    public boolean addItem(final ItemStack ben) {
-        this.playEquipSound(ben);
-        return this.inventory.add(ben);
+    public boolean addItem(final ItemStack bki) {
+        this.playEquipSound(bki);
+        return this.inventory.add(bki);
     }
     
     @Override
@@ -1725,17 +1660,17 @@ public abstract class Player extends LivingEntity {
         return this.inventory.armor;
     }
     
-    public boolean setEntityOnShoulder(final CompoundTag jt) {
+    public boolean setEntityOnShoulder(final CompoundTag le) {
         if (this.isPassenger() || !this.onGround || this.isInWater()) {
             return false;
         }
         if (this.getShoulderEntityLeft().isEmpty()) {
-            this.setShoulderEntityLeft(jt);
+            this.setShoulderEntityLeft(le);
             this.timeEntitySatOnShoulder = this.level.getGameTime();
             return true;
         }
         if (this.getShoulderEntityRight().isEmpty()) {
-            this.setShoulderEntityRight(jt);
+            this.setShoulderEntityRight(le);
             this.timeEntitySatOnShoulder = this.level.getGameTime();
             return true;
         }
@@ -1751,14 +1686,14 @@ public abstract class Player extends LivingEntity {
         }
     }
     
-    private void respawnEntityOnShoulder(final CompoundTag jt) {
-        if (!this.level.isClientSide && !jt.isEmpty()) {
-            EntityType.create(jt, this.level).ifPresent(akq -> {
-                if (akq instanceof TamableAnimal) {
-                    akq.setOwnerUUID(this.uuid);
+    private void respawnEntityOnShoulder(final CompoundTag le) {
+        if (!this.level.isClientSide && !le.isEmpty()) {
+            EntityType.create(le, this.level).ifPresent(aom -> {
+                if (aom instanceof TamableAnimal) {
+                    aom.setOwnerUUID(this.uuid);
                 }
-                akq.setPos(this.getX(), this.getY() + 0.699999988079071, this.getZ());
-                ((ServerLevel)this.level).addWithUUID(akq);
+                aom.setPos(this.getX(), this.getY() + 0.699999988079071, this.getZ());
+                ((ServerLevel)this.level).addWithUUID(aom);
             });
         }
     }
@@ -1774,7 +1709,7 @@ public abstract class Player extends LivingEntity {
     public abstract boolean isCreative();
     
     @Override
-    public boolean isPushedByWater() {
+    public boolean isPushedByFluid() {
         return !this.abilities.flying;
     }
     
@@ -1784,21 +1719,21 @@ public abstract class Player extends LivingEntity {
     
     @Override
     public Component getDisplayName() {
-        final Component lf2 = PlayerTeam.formatNameForTeam(this.getTeam(), this.getName());
-        return this.decorateDisplayNameComponent(lf2);
+        final MutableComponent mx2 = PlayerTeam.formatNameForTeam(this.getTeam(), this.getName());
+        return this.decorateDisplayNameComponent(mx2);
     }
     
     public Component getDisplayNameWithUuid() {
         return new TextComponent("").append(this.getName()).append(" (").append(this.gameProfile.getId().toString()).append(")");
     }
     
-    private Component decorateDisplayNameComponent(final Component lf) {
+    private MutableComponent decorateDisplayNameComponent(final MutableComponent mx) {
         final String string3 = this.getGameProfile().getName();
-        final ClickEvent clickEvent;
+        final ClickEvent mp;
         final String s;
-        return lf.withStyle(ln -> {
+        return mx.withStyle(nb -> {
             new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/tell " + s + " ");
-            ln.setClickEvent(clickEvent).setHoverEvent(this.createHoverEvent()).setInsertion(s);
+            return nb.withClickEvent(mp).withHoverEvent(this.createHoverEvent()).withInsertion(s);
         });
     }
     
@@ -1807,8 +1742,8 @@ public abstract class Player extends LivingEntity {
         return this.getGameProfile().getName();
     }
     
-    public float getStandingEyeHeight(final Pose alj, final EntityDimensions akr) {
-        switch (alj) {
+    public float getStandingEyeHeight(final Pose apj, final EntityDimensions aon) {
+        switch (apj) {
             case SWIMMING:
             case FALL_FLYING:
             case SPIN_ATTACK: {
@@ -1848,57 +1783,57 @@ public abstract class Player extends LivingEntity {
         return UUID.nameUUIDFromBytes(("OfflinePlayer:" + string).getBytes(StandardCharsets.UTF_8));
     }
     
-    public boolean isModelPartShown(final PlayerModelPart ayk) {
-        return (this.getEntityData().<Byte>get(Player.DATA_PLAYER_MODE_CUSTOMISATION) & ayk.getMask()) == ayk.getMask();
+    public boolean isModelPartShown(final PlayerModelPart bed) {
+        return (this.getEntityData().<Byte>get(Player.DATA_PLAYER_MODE_CUSTOMISATION) & bed.getMask()) == bed.getMask();
     }
     
     @Override
-    public boolean setSlot(final int integer, final ItemStack ben) {
+    public boolean setSlot(final int integer, final ItemStack bki) {
         if (integer >= 0 && integer < this.inventory.items.size()) {
-            this.inventory.setItem(integer, ben);
+            this.inventory.setItem(integer, bki);
             return true;
         }
-        EquipmentSlot akv4;
+        EquipmentSlot aor4;
         if (integer == 100 + EquipmentSlot.HEAD.getIndex()) {
-            akv4 = EquipmentSlot.HEAD;
+            aor4 = EquipmentSlot.HEAD;
         }
         else if (integer == 100 + EquipmentSlot.CHEST.getIndex()) {
-            akv4 = EquipmentSlot.CHEST;
+            aor4 = EquipmentSlot.CHEST;
         }
         else if (integer == 100 + EquipmentSlot.LEGS.getIndex()) {
-            akv4 = EquipmentSlot.LEGS;
+            aor4 = EquipmentSlot.LEGS;
         }
         else if (integer == 100 + EquipmentSlot.FEET.getIndex()) {
-            akv4 = EquipmentSlot.FEET;
+            aor4 = EquipmentSlot.FEET;
         }
         else {
-            akv4 = null;
+            aor4 = null;
         }
         if (integer == 98) {
-            this.setItemSlot(EquipmentSlot.MAINHAND, ben);
+            this.setItemSlot(EquipmentSlot.MAINHAND, bki);
             return true;
         }
         if (integer == 99) {
-            this.setItemSlot(EquipmentSlot.OFFHAND, ben);
+            this.setItemSlot(EquipmentSlot.OFFHAND, bki);
             return true;
         }
-        if (akv4 != null) {
-            if (!ben.isEmpty()) {
-                if (ben.getItem() instanceof ArmorItem || ben.getItem() instanceof ElytraItem) {
-                    if (Mob.getEquipmentSlotForItem(ben) != akv4) {
+        if (aor4 != null) {
+            if (!bki.isEmpty()) {
+                if (bki.getItem() instanceof ArmorItem || bki.getItem() instanceof ElytraItem) {
+                    if (Mob.getEquipmentSlotForItem(bki) != aor4) {
                         return false;
                     }
                 }
-                else if (akv4 != EquipmentSlot.HEAD) {
+                else if (aor4 != EquipmentSlot.HEAD) {
                     return false;
                 }
             }
-            this.inventory.setItem(akv4.getIndex() + this.inventory.items.size(), ben);
+            this.inventory.setItem(aor4.getIndex() + this.inventory.items.size(), bki);
             return true;
         }
         final int integer2 = integer - 200;
         if (integer2 >= 0 && integer2 < this.enderChestInventory.getContainerSize()) {
-            this.enderChestInventory.setItem(integer2, ben);
+            this.enderChestInventory.setItem(integer2, bki);
             return true;
         }
         return false;
@@ -1912,33 +1847,38 @@ public abstract class Player extends LivingEntity {
         this.reducedDebugInfo = boolean1;
     }
     
+    @Override
+    public void setRemainingFireTicks(final int integer) {
+        super.setRemainingFireTicks(this.abilities.invulnerable ? Math.min(integer, 1) : integer);
+    }
+    
     @Override
     public HumanoidArm getMainArm() {
         return (this.entityData.<Byte>get(Player.DATA_PLAYER_MAIN_HAND) == 0) ? HumanoidArm.LEFT : HumanoidArm.RIGHT;
     }
     
-    public void setMainArm(final HumanoidArm aky) {
-        this.entityData.<Byte>set(Player.DATA_PLAYER_MAIN_HAND, (byte)((aky != HumanoidArm.LEFT) ? 1 : 0));
+    public void setMainArm(final HumanoidArm aou) {
+        this.entityData.<Byte>set(Player.DATA_PLAYER_MAIN_HAND, (byte)((aou != HumanoidArm.LEFT) ? 1 : 0));
     }
     
     public CompoundTag getShoulderEntityLeft() {
         return this.entityData.<CompoundTag>get(Player.DATA_SHOULDER_LEFT);
     }
     
-    protected void setShoulderEntityLeft(final CompoundTag jt) {
-        this.entityData.<CompoundTag>set(Player.DATA_SHOULDER_LEFT, jt);
+    protected void setShoulderEntityLeft(final CompoundTag le) {
+        this.entityData.<CompoundTag>set(Player.DATA_SHOULDER_LEFT, le);
     }
     
     public CompoundTag getShoulderEntityRight() {
         return this.entityData.<CompoundTag>get(Player.DATA_SHOULDER_RIGHT);
     }
     
-    protected void setShoulderEntityRight(final CompoundTag jt) {
-        this.entityData.<CompoundTag>set(Player.DATA_SHOULDER_RIGHT, jt);
+    protected void setShoulderEntityRight(final CompoundTag le) {
+        this.entityData.<CompoundTag>set(Player.DATA_SHOULDER_RIGHT, le);
     }
     
     public float getCurrentItemAttackStrengthDelay() {
-        return (float)(1.0 / this.getAttribute(SharedMonsterAttributes.ATTACK_SPEED).getValue() * 20.0);
+        return (float)(1.0 / this.getAttributeValue(Attributes.ATTACK_SPEED) * 20.0);
     }
     
     public float getAttackStrengthScale(final float float1) {
@@ -1959,7 +1899,7 @@ public abstract class Player extends LivingEntity {
     }
     
     public float getLuck() {
-        return (float)this.getAttribute(SharedMonsterAttributes.LUCK).getValue();
+        return (float)this.getAttributeValue(Attributes.LUCK);
     }
     
     public boolean canUseGameMasterBlocks() {
@@ -1967,45 +1907,55 @@ public abstract class Player extends LivingEntity {
     }
     
     @Override
-    public boolean canTakeItem(final ItemStack ben) {
-        final EquipmentSlot akv3 = Mob.getEquipmentSlotForItem(ben);
-        return this.getItemBySlot(akv3).isEmpty();
+    public boolean canTakeItem(final ItemStack bki) {
+        final EquipmentSlot aor3 = Mob.getEquipmentSlotForItem(bki);
+        return this.getItemBySlot(aor3).isEmpty();
     }
     
     @Override
-    public EntityDimensions getDimensions(final Pose alj) {
-        return Player.POSES.getOrDefault(alj, Player.STANDING_DIMENSIONS);
+    public EntityDimensions getDimensions(final Pose apj) {
+        return Player.POSES.getOrDefault(apj, Player.STANDING_DIMENSIONS);
     }
     
     @Override
-    public ItemStack getProjectile(final ItemStack ben) {
-        if (!(ben.getItem() instanceof ProjectileWeaponItem)) {
+    public ImmutableList<Pose> getDismountPoses() {
+        return ImmutableList.<Pose>of(Pose.STANDING, Pose.CROUCHING, Pose.SWIMMING);
+    }
+    
+    @Override
+    public ItemStack getProjectile(final ItemStack bki) {
+        if (!(bki.getItem() instanceof ProjectileWeaponItem)) {
             return ItemStack.EMPTY;
         }
-        Predicate<ItemStack> predicate3 = ((ProjectileWeaponItem)ben.getItem()).getSupportedHeldProjectiles();
-        final ItemStack ben2 = ProjectileWeaponItem.getHeldProjectile(this, predicate3);
-        if (!ben2.isEmpty()) {
-            return ben2;
+        Predicate<ItemStack> predicate3 = ((ProjectileWeaponItem)bki.getItem()).getSupportedHeldProjectiles();
+        final ItemStack bki2 = ProjectileWeaponItem.getHeldProjectile(this, predicate3);
+        if (!bki2.isEmpty()) {
+            return bki2;
         }
-        predicate3 = ((ProjectileWeaponItem)ben.getItem()).getAllSupportedProjectiles();
+        predicate3 = ((ProjectileWeaponItem)bki.getItem()).getAllSupportedProjectiles();
         for (int integer5 = 0; integer5 < this.inventory.getContainerSize(); ++integer5) {
-            final ItemStack ben3 = this.inventory.getItem(integer5);
-            if (predicate3.test(ben3)) {
-                return ben3;
+            final ItemStack bki3 = this.inventory.getItem(integer5);
+            if (predicate3.test(bki3)) {
+                return bki3;
             }
         }
         return this.abilities.instabuild ? new ItemStack(Items.ARROW) : ItemStack.EMPTY;
     }
     
     @Override
-    public ItemStack eat(final Level bjw, final ItemStack ben) {
-        this.getFoodData().eat(ben.getItem(), ben);
-        this.awardStat(Stats.ITEM_USED.get(ben.getItem()));
-        bjw.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_BURP, SoundSource.PLAYERS, 0.5f, bjw.random.nextFloat() * 0.1f + 0.9f);
+    public ItemStack eat(final Level bqb, final ItemStack bki) {
+        this.getFoodData().eat(bki.getItem(), bki);
+        this.awardStat(Stats.ITEM_USED.get(bki.getItem()));
+        bqb.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_BURP, SoundSource.PLAYERS, 0.5f, bqb.random.nextFloat() * 0.1f + 0.9f);
         if (this instanceof ServerPlayer) {
-            CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayer)this, ben);
+            CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayer)this, bki);
         }
-        return super.eat(bjw, ben);
+        return super.eat(bqb, bki);
+    }
+    
+    @Override
+    protected boolean shouldRemoveSoulSpeed(final BlockState cfj) {
+        return this.abilities.flying || super.shouldRemoveSoulSpeed(cfj);
     }
     
     static {
@@ -2021,11 +1971,11 @@ public abstract class Player extends LivingEntity {
     
     public enum BedSleepingProblem {
         NOT_POSSIBLE_HERE, 
-        NOT_POSSIBLE_NOW((Component)new TranslatableComponent("block.minecraft.bed.no_sleep", new Object[0])), 
-        TOO_FAR_AWAY((Component)new TranslatableComponent("block.minecraft.bed.too_far_away", new Object[0])), 
-        OBSTRUCTED((Component)new TranslatableComponent("block.minecraft.bed.obstructed", new Object[0])), 
+        NOT_POSSIBLE_NOW((Component)new TranslatableComponent("block.minecraft.bed.no_sleep")), 
+        TOO_FAR_AWAY((Component)new TranslatableComponent("block.minecraft.bed.too_far_away")), 
+        OBSTRUCTED((Component)new TranslatableComponent("block.minecraft.bed.obstructed")), 
         OTHER_PROBLEM, 
-        NOT_SAFE((Component)new TranslatableComponent("block.minecraft.bed.not_safe", new Object[0]));
+        NOT_SAFE((Component)new TranslatableComponent("block.minecraft.bed.not_safe"));
         
         @Nullable
         private final Component message;
@@ -2034,8 +1984,8 @@ public abstract class Player extends LivingEntity {
             this.message = null;
         }
         
-        private BedSleepingProblem(final Component lf) {
-            this.message = lf;
+        private BedSleepingProblem(final Component mr) {
+            this.message = mr;
         }
         
         @Nullable
diff --git a/src/net/minecraft/world/entity/player/PlayerModelPart.java b/src/net/minecraft/world/entity/player/PlayerModelPart.java
index 6a15522..4d7b2eb 100644
--- a/src/net/minecraft/world/entity/player/PlayerModelPart.java
+++ b/src/net/minecraft/world/entity/player/PlayerModelPart.java
@@ -21,7 +21,7 @@ public enum PlayerModelPart {
         this.bit = integer3;
         this.mask = 1 << integer3;
         this.id = string4;
-        this.name = new TranslatableComponent("options.modelPart." + string4, new Object[0]);
+        this.name = new TranslatableComponent("options.modelPart." + string4);
     }
     
     public int getMask() {
diff --git a/src/net/minecraft/world/entity/player/StackedContents.java b/src/net/minecraft/world/entity/player/StackedContents.java
index c8b92a7..ca177ed 100644
--- a/src/net/minecraft/world/entity/player/StackedContents.java
+++ b/src/net/minecraft/world/entity/player/StackedContents.java
@@ -28,26 +28,26 @@ public class StackedContents {
         this.contents = (Int2IntMap)new Int2IntOpenHashMap();
     }
     
-    public void accountSimpleStack(final ItemStack ben) {
-        if (!ben.isDamaged() && !ben.isEnchanted() && !ben.hasCustomHoverName()) {
-            this.accountStack(ben);
+    public void accountSimpleStack(final ItemStack bki) {
+        if (!bki.isDamaged() && !bki.isEnchanted() && !bki.hasCustomHoverName()) {
+            this.accountStack(bki);
         }
     }
     
-    public void accountStack(final ItemStack ben) {
-        this.accountStack(ben, 64);
+    public void accountStack(final ItemStack bki) {
+        this.accountStack(bki, 64);
     }
     
-    public void accountStack(final ItemStack ben, final int integer) {
-        if (!ben.isEmpty()) {
-            final int integer2 = getStackingIndex(ben);
-            final int integer3 = Math.min(integer, ben.getCount());
+    public void accountStack(final ItemStack bki, final int integer) {
+        if (!bki.isEmpty()) {
+            final int integer2 = getStackingIndex(bki);
+            final int integer3 = Math.min(integer, bki.getCount());
             this.put(integer2, integer3);
         }
     }
     
-    public static int getStackingIndex(final ItemStack ben) {
-        return Registry.ITEM.getId(ben.getItem());
+    public static int getStackingIndex(final ItemStack bki) {
+        return Registry.ITEM.getId(bki.getItem());
     }
     
     private boolean has(final int integer) {
@@ -67,20 +67,20 @@ public class StackedContents {
         this.contents.put(integer1, this.contents.get(integer1) + integer2);
     }
     
-    public boolean canCraft(final Recipe<?> bgw, @Nullable final IntList intList) {
-        return this.canCraft(bgw, intList, 1);
+    public boolean canCraft(final Recipe<?> bmu, @Nullable final IntList intList) {
+        return this.canCraft(bmu, intList, 1);
     }
     
-    public boolean canCraft(final Recipe<?> bgw, @Nullable final IntList intList, final int integer) {
-        return new RecipePicker(bgw).tryPick(integer, intList);
+    public boolean canCraft(final Recipe<?> bmu, @Nullable final IntList intList, final int integer) {
+        return new RecipePicker(bmu).tryPick(integer, intList);
     }
     
-    public int getBiggestCraftableStack(final Recipe<?> bgw, @Nullable final IntList intList) {
-        return this.getBiggestCraftableStack(bgw, Integer.MAX_VALUE, intList);
+    public int getBiggestCraftableStack(final Recipe<?> bmu, @Nullable final IntList intList) {
+        return this.getBiggestCraftableStack(bmu, Integer.MAX_VALUE, intList);
     }
     
-    public int getBiggestCraftableStack(final Recipe<?> bgw, final int integer, @Nullable final IntList intList) {
-        return new RecipePicker(bgw).tryPickAll(integer, intList);
+    public int getBiggestCraftableStack(final Recipe<?> bmu, final int integer, @Nullable final IntList intList) {
+        return new RecipePicker(bmu).tryPickAll(integer, intList);
     }
     
     public static ItemStack fromStackingIndex(final int integer) {
@@ -103,11 +103,11 @@ public class StackedContents {
         private final BitSet data;
         private final IntList path;
         
-        public RecipePicker(final Recipe<?> bgw) {
+        public RecipePicker(final Recipe<?> bmu) {
             this.ingredients = Lists.newArrayList();
             this.path = (IntList)new IntArrayList();
-            this.recipe = bgw;
-            this.ingredients.addAll(bgw.getIngredients());
+            this.recipe = bmu;
+            this.ingredients.addAll(bmu.getIngredients());
             this.ingredients.removeIf(Ingredient::isEmpty);
             this.ingredientCount = this.ingredients.size();
             this.items = this.getUniqueAvailableIngredientItems();
@@ -169,8 +169,8 @@ public class StackedContents {
         
         private int[] getUniqueAvailableIngredientItems() {
             final IntCollection intCollection2 = (IntCollection)new IntAVLTreeSet();
-            for (final Ingredient bgt4 : this.ingredients) {
-                intCollection2.addAll((IntCollection)bgt4.getStackingIds());
+            for (final Ingredient bmr4 : this.ingredients) {
+                intCollection2.addAll((IntCollection)bmr4.getStackingIds());
             }
             final IntIterator intIterator3 = intCollection2.iterator();
             while (intIterator3.hasNext()) {
@@ -278,9 +278,9 @@ public class StackedContents {
         
         private int getMinIngredientCount() {
             int integer2 = Integer.MAX_VALUE;
-            for (final Ingredient bgt4 : this.ingredients) {
+            for (final Ingredient bmr4 : this.ingredients) {
                 int integer3 = 0;
-                for (final int integer4 : bgt4.getStackingIds()) {
+                for (final int integer4 : bmr4.getStackingIds()) {
                     integer3 = Math.max(integer3, StackedContents.this.contents.get(integer4));
                 }
                 if (integer2 > 0) {
diff --git a/src/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/net/minecraft/world/entity/projectile/AbstractArrow.java
index 253fe5a..54c2c4b 100644
--- a/src/net/minecraft/world/entity/projectile/AbstractArrow.java
+++ b/src/net/minecraft/world/entity/projectile/AbstractArrow.java
@@ -7,12 +7,13 @@ import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.core.Registry;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.phys.BlockHitResult;
 import java.util.Arrays;
 import java.util.Collection;
 import net.minecraft.advancements.CriteriaTriggers;
@@ -22,10 +23,11 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.damagesource.DamageSource;
 import com.google.common.collect.Lists;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.entity.MoverType;
 import java.util.Iterator;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.phys.EntityHitResult;
@@ -33,26 +35,21 @@ import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Entity;
 import java.util.List;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import net.minecraft.sounds.SoundEvent;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.block.state.BlockState;
-import java.util.UUID;
-import java.util.Optional;
 import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.world.entity.Entity;
 
-public abstract class AbstractArrow extends Entity implements Projectile {
+public abstract class AbstractArrow extends Projectile {
     private static final EntityDataAccessor<Byte> ID_FLAGS;
-    protected static final EntityDataAccessor<Optional<UUID>> DATA_OWNERUUID_ID;
     private static final EntityDataAccessor<Byte> PIERCE_LEVEL;
     @Nullable
     private BlockState lastState;
@@ -60,37 +57,35 @@ public abstract class AbstractArrow extends Entity implements Projectile {
     protected int inGroundTime;
     public Pickup pickup;
     public int shakeTime;
-    public UUID ownerUUID;
     private int life;
-    private int flightTime;
     private double baseDamage;
     private int knockback;
     private SoundEvent soundEvent;
     private IntOpenHashSet piercingIgnoreEntityIds;
     private List<Entity> piercedAndKilledEntities;
     
-    protected AbstractArrow(final EntityType<? extends AbstractArrow> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AbstractArrow(final EntityType<? extends AbstractArrow> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.pickup = Pickup.DISALLOWED;
         this.baseDamage = 2.0;
         this.soundEvent = this.getDefaultHitGroundSoundEvent();
     }
     
-    protected AbstractArrow(final EntityType<? extends AbstractArrow> aku, final double double2, final double double3, final double double4, final Level bjw) {
-        this(aku, bjw);
+    protected AbstractArrow(final EntityType<? extends AbstractArrow> aoq, final double double2, final double double3, final double double4, final Level bqb) {
+        this(aoq, bqb);
         this.setPos(double2, double3, double4);
     }
     
-    protected AbstractArrow(final EntityType<? extends AbstractArrow> aku, final LivingEntity akz, final Level bjw) {
-        this(aku, akz.getX(), akz.getEyeY() - 0.10000000149011612, akz.getZ(), bjw);
-        this.setOwner(akz);
-        if (akz instanceof Player) {
+    protected AbstractArrow(final EntityType<? extends AbstractArrow> aoq, final LivingEntity aoy, final Level bqb) {
+        this(aoq, aoy.getX(), aoy.getEyeY() - 0.10000000149011612, aoy.getZ(), bqb);
+        this.setOwner(aoy);
+        if (aoy instanceof Player) {
             this.pickup = Pickup.ALLOWED;
         }
     }
     
-    public void setSoundEvent(final SoundEvent aah) {
-        this.soundEvent = aah;
+    public void setSoundEvent(final SoundEvent ack) {
+        this.soundEvent = ack;
     }
     
     @Override
@@ -106,27 +101,12 @@ public abstract class AbstractArrow extends Entity implements Projectile {
     @Override
     protected void defineSynchedData() {
         this.entityData.<Byte>define(AbstractArrow.ID_FLAGS, (Byte)0);
-        this.entityData.<Optional<UUID>>define(AbstractArrow.DATA_OWNERUUID_ID, Optional.<UUID>empty());
         this.entityData.<Byte>define(AbstractArrow.PIERCE_LEVEL, (Byte)0);
     }
     
-    public void shootFromRotation(final Entity akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        final float float7 = -Mth.sin(float3 * 0.017453292f) * Mth.cos(float2 * 0.017453292f);
-        final float float8 = -Mth.sin(float2 * 0.017453292f);
-        final float float9 = Mth.cos(float3 * 0.017453292f) * Mth.cos(float2 * 0.017453292f);
-        this.shoot(float7, float8, float9, float5, float6);
-        this.setDeltaMovement(this.getDeltaMovement().add(akq.getDeltaMovement().x, akq.onGround ? 0.0 : akq.getDeltaMovement().y, akq.getDeltaMovement().z));
-    }
-    
     @Override
     public void shoot(final double double1, final double double2, final double double3, final float float4, final float float5) {
-        final Vec3 cvl10 = new Vec3(double1, double2, double3).normalize().add(this.random.nextGaussian() * 0.007499999832361937 * float5, this.random.nextGaussian() * 0.007499999832361937 * float5, this.random.nextGaussian() * 0.007499999832361937 * float5).scale(float4);
-        this.setDeltaMovement(cvl10);
-        final float float6 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl10));
-        this.yRot = (float)(Mth.atan2(cvl10.x, cvl10.z) * 57.2957763671875);
-        this.xRot = (float)(Mth.atan2(cvl10.y, float6) * 57.2957763671875);
-        this.yRotO = this.yRot;
-        this.xRotO = this.xRot;
+        super.shoot(double1, double2, double3, float4, float5);
         this.life = 0;
     }
     
@@ -138,38 +118,30 @@ public abstract class AbstractArrow extends Entity implements Projectile {
     
     @Override
     public void lerpMotion(final double double1, final double double2, final double double3) {
-        this.setDeltaMovement(double1, double2, double3);
-        if (this.xRotO == 0.0f && this.yRotO == 0.0f) {
-            final float float8 = Mth.sqrt(double1 * double1 + double3 * double3);
-            this.xRot = (float)(Mth.atan2(double2, float8) * 57.2957763671875);
-            this.yRot = (float)(Mth.atan2(double1, double3) * 57.2957763671875);
-            this.xRotO = this.xRot;
-            this.yRotO = this.yRot;
-            this.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
-            this.life = 0;
-        }
+        super.lerpMotion(double1, double2, double3);
+        this.life = 0;
     }
     
     @Override
     public void tick() {
         super.tick();
         final boolean boolean2 = this.isNoPhysics();
-        Vec3 cvl3 = this.getDeltaMovement();
+        Vec3 dem3 = this.getDeltaMovement();
         if (this.xRotO == 0.0f && this.yRotO == 0.0f) {
-            final float float4 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl3));
-            this.yRot = (float)(Mth.atan2(cvl3.x, cvl3.z) * 57.2957763671875);
-            this.xRot = (float)(Mth.atan2(cvl3.y, float4) * 57.2957763671875);
+            final float float4 = Mth.sqrt(Entity.getHorizontalDistanceSqr(dem3));
+            this.yRot = (float)(Mth.atan2(dem3.x, dem3.z) * 57.2957763671875);
+            this.xRot = (float)(Mth.atan2(dem3.y, float4) * 57.2957763671875);
             this.yRotO = this.yRot;
             this.xRotO = this.xRot;
         }
-        final BlockPos fk4 = new BlockPos(this);
-        final BlockState byj5 = this.level.getBlockState(fk4);
-        if (!byj5.isAir() && !boolean2) {
-            final VoxelShape cwf6 = byj5.getCollisionShape(this.level, fk4);
-            if (!cwf6.isEmpty()) {
-                final Vec3 cvl4 = this.position();
-                for (final AABB cvf9 : cwf6.toAabbs()) {
-                    if (cvf9.move(fk4).contains(cvl4)) {
+        final BlockPos fu4 = this.blockPosition();
+        final BlockState cfj5 = this.level.getBlockState(fu4);
+        if (!cfj5.isAir() && !boolean2) {
+            final VoxelShape dfg6 = cfj5.getCollisionShape(this.level, fu4);
+            if (!dfg6.isEmpty()) {
+                final Vec3 dem4 = this.position();
+                for (final AABB deg9 : dfg6.toAabbs()) {
+                    if (deg9.move(fu4).contains(dem4)) {
                         this.inGround = true;
                         break;
                     }
@@ -183,11 +155,8 @@ public abstract class AbstractArrow extends Entity implements Projectile {
             this.clearFire();
         }
         if (this.inGround && !boolean2) {
-            if (this.lastState != byj5 && this.level.noCollision(this.getBoundingBox().inflate(0.06))) {
-                this.inGround = false;
-                this.setDeltaMovement(cvl3.multiply(this.random.nextFloat() * 0.2f, this.random.nextFloat() * 0.2f, this.random.nextFloat() * 0.2f));
-                this.life = 0;
-                this.flightTime = 0;
+            if (this.lastState != cfj5 && this.shouldFall()) {
+                this.startFalling();
             }
             else if (!this.level.isClientSide) {
                 this.tickDespawn();
@@ -196,42 +165,41 @@ public abstract class AbstractArrow extends Entity implements Projectile {
             return;
         }
         this.inGroundTime = 0;
-        ++this.flightTime;
-        final Vec3 cvl5 = this.position();
-        Vec3 cvl4 = cvl5.add(cvl3);
-        HitResult cvi8 = this.level.clip(new ClipContext(cvl5, cvl4, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this));
-        if (cvi8.getType() != HitResult.Type.MISS) {
-            cvl4 = cvi8.getLocation();
+        final Vec3 dem5 = this.position();
+        Vec3 dem4 = dem5.add(dem3);
+        HitResult dej8 = this.level.clip(new ClipContext(dem5, dem4, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this));
+        if (dej8.getType() != HitResult.Type.MISS) {
+            dem4 = dej8.getLocation();
         }
         while (!this.removed) {
-            EntityHitResult cvh9 = this.findHitEntity(cvl5, cvl4);
-            if (cvh9 != null) {
-                cvi8 = cvh9;
+            EntityHitResult dei9 = this.findHitEntity(dem5, dem4);
+            if (dei9 != null) {
+                dej8 = dei9;
             }
-            if (cvi8 != null && cvi8.getType() == HitResult.Type.ENTITY) {
-                final Entity akq10 = ((EntityHitResult)cvi8).getEntity();
-                final Entity akq11 = this.getOwner();
-                if (akq10 instanceof Player && akq11 instanceof Player && !((Player)akq11).canHarmPlayer((Player)akq10)) {
-                    cvi8 = null;
-                    cvh9 = null;
+            if (dej8 != null && dej8.getType() == HitResult.Type.ENTITY) {
+                final Entity aom10 = ((EntityHitResult)dej8).getEntity();
+                final Entity aom11 = this.getOwner();
+                if (aom10 instanceof Player && aom11 instanceof Player && !((Player)aom11).canHarmPlayer((Player)aom10)) {
+                    dej8 = null;
+                    dei9 = null;
                 }
             }
-            if (cvi8 != null && !boolean2) {
-                this.onHit(cvi8);
+            if (dej8 != null && !boolean2) {
+                this.onHit(dej8);
                 this.hasImpulse = true;
             }
-            if (cvh9 == null) {
+            if (dei9 == null) {
                 break;
             }
             if (this.getPierceLevel() <= 0) {
                 break;
             }
-            cvi8 = null;
+            dej8 = null;
         }
-        cvl3 = this.getDeltaMovement();
-        final double double9 = cvl3.x;
-        final double double10 = cvl3.y;
-        final double double11 = cvl3.z;
+        dem3 = this.getDeltaMovement();
+        final double double9 = dem3.x;
+        final double double10 = dem3.y;
+        final double double11 = dem3.z;
         if (this.isCritArrow()) {
             for (int integer15 = 0; integer15 < 4; ++integer15) {
                 this.level.addParticle(ParticleTypes.CRIT, this.getX() + double9 * integer15 / 4.0, this.getY() + double10 * integer15 / 4.0, this.getZ() + double11 * integer15 / 4.0, -double9, -double10 + 0.2, -double11);
@@ -240,7 +208,7 @@ public abstract class AbstractArrow extends Entity implements Projectile {
         final double double12 = this.getX() + double9;
         final double double13 = this.getY() + double10;
         final double double14 = this.getZ() + double11;
-        final float float5 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl3));
+        final float float5 = Mth.sqrt(Entity.getHorizontalDistanceSqr(dem3));
         if (boolean2) {
             this.yRot = (float)(Mth.atan2(-double9, -double11) * 57.2957763671875);
         }
@@ -248,20 +216,8 @@ public abstract class AbstractArrow extends Entity implements Projectile {
             this.yRot = (float)(Mth.atan2(double9, double11) * 57.2957763671875);
         }
         this.xRot = (float)(Mth.atan2(double10, float5) * 57.2957763671875);
-        while (this.xRot - this.xRotO < -180.0f) {
-            this.xRotO -= 360.0f;
-        }
-        while (this.xRot - this.xRotO >= 180.0f) {
-            this.xRotO += 360.0f;
-        }
-        while (this.yRot - this.yRotO < -180.0f) {
-            this.yRotO -= 360.0f;
-        }
-        while (this.yRot - this.yRotO >= 180.0f) {
-            this.yRotO += 360.0f;
-        }
-        this.xRot = Mth.lerp(0.2f, this.xRotO, this.xRot);
-        this.yRot = Mth.lerp(0.2f, this.yRotO, this.yRot);
+        this.xRot = Projectile.lerpRotation(this.xRotO, this.xRot);
+        this.yRot = Projectile.lerpRotation(this.yRotO, this.yRot);
         float float6 = 0.99f;
         final float float7 = 0.05f;
         if (this.isInWater()) {
@@ -271,15 +227,34 @@ public abstract class AbstractArrow extends Entity implements Projectile {
             }
             float6 = this.getWaterInertia();
         }
-        this.setDeltaMovement(cvl3.scale(float6));
+        this.setDeltaMovement(dem3.scale(float6));
         if (!this.isNoGravity() && !boolean2) {
-            final Vec3 cvl6 = this.getDeltaMovement();
-            this.setDeltaMovement(cvl6.x, cvl6.y - 0.05000000074505806, cvl6.z);
+            final Vec3 dem6 = this.getDeltaMovement();
+            this.setDeltaMovement(dem6.x, dem6.y - 0.05000000074505806, dem6.z);
         }
         this.setPos(double12, double13, double14);
         this.checkInsideBlocks();
     }
     
+    private boolean shouldFall() {
+        return this.inGround && this.level.noCollision(new AABB(this.position(), this.position()).inflate(0.06));
+    }
+    
+    private void startFalling() {
+        this.inGround = false;
+        final Vec3 dem2 = this.getDeltaMovement();
+        this.setDeltaMovement(dem2.multiply(this.random.nextFloat() * 0.2f, this.random.nextFloat() * 0.2f, this.random.nextFloat() * 0.2f));
+        this.life = 0;
+    }
+    
+    @Override
+    public void move(final MoverType apd, final Vec3 dem) {
+        super.move(apd, dem);
+        if (apd != MoverType.SELF && this.shouldFall()) {
+            this.startFalling();
+        }
+    }
+    
     protected void tickDespawn() {
         ++this.life;
         if (this.life >= 1200) {
@@ -287,31 +262,6 @@ public abstract class AbstractArrow extends Entity implements Projectile {
         }
     }
     
-    protected void onHit(final HitResult cvi) {
-        final HitResult.Type a3 = cvi.getType();
-        if (a3 == HitResult.Type.ENTITY) {
-            this.onHitEntity((EntityHitResult)cvi);
-        }
-        else if (a3 == HitResult.Type.BLOCK) {
-            final BlockHitResult cvg4 = (BlockHitResult)cvi;
-            final BlockState byj5 = this.level.getBlockState(cvg4.getBlockPos());
-            this.lastState = byj5;
-            final Vec3 cvl6 = cvg4.getLocation().subtract(this.getX(), this.getY(), this.getZ());
-            this.setDeltaMovement(cvl6);
-            final Vec3 cvl7 = cvl6.normalize().scale(0.05000000074505806);
-            this.setPosRaw(this.getX() - cvl7.x, this.getY() - cvl7.y, this.getZ() - cvl7.z);
-            this.playSound(this.getHitGroundSoundEvent(), 1.0f, 1.2f / (this.random.nextFloat() * 0.2f + 0.9f));
-            this.inGround = true;
-            this.shakeTime = 7;
-            this.setCritArrow(false);
-            this.setPierceLevel((byte)0);
-            this.setSoundEvent(SoundEvents.ARROW_HIT);
-            this.setShotFromCrossbow(false);
-            this.resetPiercedEntities();
-            byj5.onProjectileHit(this.level, byj5, cvg4, this);
-        }
-    }
-    
     private void resetPiercedEntities() {
         if (this.piercedAndKilledEntities != null) {
             this.piercedAndKilledEntities.clear();
@@ -321,10 +271,12 @@ public abstract class AbstractArrow extends Entity implements Projectile {
         }
     }
     
-    protected void onHitEntity(final EntityHitResult cvh) {
-        final Entity akq3 = cvh.getEntity();
+    @Override
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        final Entity aom3 = dei.getEntity();
         final float float4 = (float)this.getDeltaMovement().length();
-        int integer5 = Mth.ceil(Math.max(float4 * this.baseDamage, 0.0));
+        int integer5 = Mth.ceil(Mth.clamp(float4 * this.baseDamage, 0.0, 2.147483647E9));
         if (this.getPierceLevel() > 0) {
             if (this.piercingIgnoreEntityIds == null) {
                 this.piercingIgnoreEntityIds = new IntOpenHashSet(5);
@@ -336,60 +288,61 @@ public abstract class AbstractArrow extends Entity implements Projectile {
                 this.remove();
                 return;
             }
-            this.piercingIgnoreEntityIds.add(akq3.getId());
+            this.piercingIgnoreEntityIds.add(aom3.getId());
         }
         if (this.isCritArrow()) {
-            integer5 += this.random.nextInt(integer5 / 2 + 2);
+            final long long6 = this.random.nextInt(integer5 / 2 + 2);
+            integer5 = (int)Math.min(long6 + integer5, 2147483647L);
         }
-        final Entity akq4 = this.getOwner();
-        DamageSource ajz6;
-        if (akq4 == null) {
-            ajz6 = DamageSource.arrow(this, this);
+        final Entity aom4 = this.getOwner();
+        DamageSource anw6;
+        if (aom4 == null) {
+            anw6 = DamageSource.arrow(this, this);
         }
         else {
-            ajz6 = DamageSource.arrow(this, akq4);
-            if (akq4 instanceof LivingEntity) {
-                ((LivingEntity)akq4).setLastHurtMob(akq3);
+            anw6 = DamageSource.arrow(this, aom4);
+            if (aom4 instanceof LivingEntity) {
+                ((LivingEntity)aom4).setLastHurtMob(aom3);
             }
         }
-        final boolean boolean8 = akq3.getType() == EntityType.ENDERMAN;
-        final int integer6 = akq3.getRemainingFireTicks();
+        final boolean boolean8 = aom3.getType() == EntityType.ENDERMAN;
+        final int integer6 = aom3.getRemainingFireTicks();
         if (this.isOnFire() && !boolean8) {
-            akq3.setSecondsOnFire(5);
+            aom3.setSecondsOnFire(5);
         }
-        if (akq3.hurt(ajz6, (float)integer5)) {
+        if (aom3.hurt(anw6, (float)integer5)) {
             if (boolean8) {
                 return;
             }
-            if (akq3 instanceof LivingEntity) {
-                final LivingEntity akz10 = (LivingEntity)akq3;
+            if (aom3 instanceof LivingEntity) {
+                final LivingEntity aoy10 = (LivingEntity)aom3;
                 if (!this.level.isClientSide && this.getPierceLevel() <= 0) {
-                    akz10.setArrowCount(akz10.getArrowCount() + 1);
+                    aoy10.setArrowCount(aoy10.getArrowCount() + 1);
                 }
                 if (this.knockback > 0) {
-                    final Vec3 cvl11 = this.getDeltaMovement().multiply(1.0, 0.0, 1.0).normalize().scale(this.knockback * 0.6);
-                    if (cvl11.lengthSqr() > 0.0) {
-                        akz10.push(cvl11.x, 0.1, cvl11.z);
+                    final Vec3 dem11 = this.getDeltaMovement().multiply(1.0, 0.0, 1.0).normalize().scale(this.knockback * 0.6);
+                    if (dem11.lengthSqr() > 0.0) {
+                        aoy10.push(dem11.x, 0.1, dem11.z);
                     }
                 }
-                if (!this.level.isClientSide && akq4 instanceof LivingEntity) {
-                    EnchantmentHelper.doPostHurtEffects(akz10, akq4);
-                    EnchantmentHelper.doPostDamageEffects((LivingEntity)akq4, akz10);
+                if (!this.level.isClientSide && aom4 instanceof LivingEntity) {
+                    EnchantmentHelper.doPostHurtEffects(aoy10, aom4);
+                    EnchantmentHelper.doPostDamageEffects((LivingEntity)aom4, aoy10);
                 }
-                this.doPostHurtEffects(akz10);
-                if (akq4 != null && akz10 != akq4 && akz10 instanceof Player && akq4 instanceof ServerPlayer) {
-                    ((ServerPlayer)akq4).connection.send(new ClientboundGameEventPacket(6, 0.0f));
+                this.doPostHurtEffects(aoy10);
+                if (aom4 != null && aoy10 != aom4 && aoy10 instanceof Player && aom4 instanceof ServerPlayer && !this.isSilent()) {
+                    ((ServerPlayer)aom4).connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.ARROW_HIT_PLAYER, 0.0f));
                 }
-                if (!akq3.isAlive() && this.piercedAndKilledEntities != null) {
-                    this.piercedAndKilledEntities.add(akz10);
+                if (!aom3.isAlive() && this.piercedAndKilledEntities != null) {
+                    this.piercedAndKilledEntities.add(aoy10);
                 }
-                if (!this.level.isClientSide && akq4 instanceof ServerPlayer) {
-                    final ServerPlayer xe11 = (ServerPlayer)akq4;
+                if (!this.level.isClientSide && aom4 instanceof ServerPlayer) {
+                    final ServerPlayer ze11 = (ServerPlayer)aom4;
                     if (this.piercedAndKilledEntities != null && this.shotFromCrossbow()) {
-                        CriteriaTriggers.KILLED_BY_CROSSBOW.trigger(xe11, this.piercedAndKilledEntities, this.piercedAndKilledEntities.size());
+                        CriteriaTriggers.KILLED_BY_CROSSBOW.trigger(ze11, this.piercedAndKilledEntities);
                     }
-                    else if (!akq3.isAlive() && this.shotFromCrossbow()) {
-                        CriteriaTriggers.KILLED_BY_CROSSBOW.trigger(xe11, Arrays.<Entity>asList(akq3), 0);
+                    else if (!aom3.isAlive() && this.shotFromCrossbow()) {
+                        CriteriaTriggers.KILLED_BY_CROSSBOW.trigger(ze11, Arrays.<Entity>asList(aom3));
                     }
                 }
             }
@@ -399,11 +352,10 @@ public abstract class AbstractArrow extends Entity implements Projectile {
             }
         }
         else {
-            akq3.setRemainingFireTicks(integer6);
+            aom3.setRemainingFireTicks(integer6);
             this.setDeltaMovement(this.getDeltaMovement().scale(-0.1));
             this.yRot += 180.0f;
             this.yRotO += 180.0f;
-            this.flightTime = 0;
             if (!this.level.isClientSide && this.getDeltaMovement().lengthSqr() < 1.0E-7) {
                 if (this.pickup == Pickup.ALLOWED) {
                     this.spawnAtLocation(this.getPickupItem(), 0.1f);
@@ -413,6 +365,24 @@ public abstract class AbstractArrow extends Entity implements Projectile {
         }
     }
     
+    @Override
+    protected void onHitBlock(final BlockHitResult deh) {
+        this.lastState = this.level.getBlockState(deh.getBlockPos());
+        super.onHitBlock(deh);
+        final Vec3 dem3 = deh.getLocation().subtract(this.getX(), this.getY(), this.getZ());
+        this.setDeltaMovement(dem3);
+        final Vec3 dem4 = dem3.normalize().scale(0.05000000074505806);
+        this.setPosRaw(this.getX() - dem4.x, this.getY() - dem4.y, this.getZ() - dem4.z);
+        this.playSound(this.getHitGroundSoundEvent(), 1.0f, 1.2f / (this.random.nextFloat() * 0.2f + 0.9f));
+        this.inGround = true;
+        this.shakeTime = 7;
+        this.setCritArrow(false);
+        this.setPierceLevel((byte)0);
+        this.setSoundEvent(SoundEvents.ARROW_HIT);
+        this.setShotFromCrossbow(false);
+        this.resetPiercedEntities();
+    }
+    
     protected SoundEvent getDefaultHitGroundSoundEvent() {
         return SoundEvents.ARROW_HIT;
     }
@@ -421,85 +391,79 @@ public abstract class AbstractArrow extends Entity implements Projectile {
         return this.soundEvent;
     }
     
-    protected void doPostHurtEffects(final LivingEntity akz) {
+    protected void doPostHurtEffects(final LivingEntity aoy) {
     }
     
     @Nullable
-    protected EntityHitResult findHitEntity(final Vec3 cvl1, final Vec3 cvl2) {
-        return ProjectileUtil.getHitResult(this.level, this, cvl1, cvl2, this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(1.0), akq -> !akq.isSpectator() && akq.isAlive() && akq.isPickable() && (akq != this.getOwner() || this.flightTime >= 5) && (this.piercingIgnoreEntityIds == null || !this.piercingIgnoreEntityIds.contains(akq.getId())));
-    }
-    
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putShort("life", (short)this.life);
-        if (this.lastState != null) {
-            jt.put("inBlockState", NbtUtils.writeBlockState(this.lastState));
-        }
-        jt.putByte("shake", (byte)this.shakeTime);
-        jt.putBoolean("inGround", this.inGround);
-        jt.putByte("pickup", (byte)this.pickup.ordinal());
-        jt.putDouble("damage", this.baseDamage);
-        jt.putBoolean("crit", this.isCritArrow());
-        jt.putByte("PierceLevel", this.getPierceLevel());
-        if (this.ownerUUID != null) {
-            jt.putUUID("OwnerUUID", this.ownerUUID);
-        }
-        jt.putString("SoundEvent", Registry.SOUND_EVENT.getKey(this.soundEvent).toString());
-        jt.putBoolean("ShotFromCrossbow", this.shotFromCrossbow());
-    }
-    
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        this.life = jt.getShort("life");
-        if (jt.contains("inBlockState", 10)) {
-            this.lastState = NbtUtils.readBlockState(jt.getCompound("inBlockState"));
-        }
-        this.shakeTime = (jt.getByte("shake") & 0xFF);
-        this.inGround = jt.getBoolean("inGround");
-        if (jt.contains("damage", 99)) {
-            this.baseDamage = jt.getDouble("damage");
-        }
-        if (jt.contains("pickup", 99)) {
-            this.pickup = Pickup.byOrdinal(jt.getByte("pickup"));
-        }
-        else if (jt.contains("player", 99)) {
-            this.pickup = (jt.getBoolean("player") ? Pickup.ALLOWED : Pickup.DISALLOWED);
-        }
-        this.setCritArrow(jt.getBoolean("crit"));
-        this.setPierceLevel(jt.getByte("PierceLevel"));
-        if (jt.hasUUID("OwnerUUID")) {
-            this.ownerUUID = jt.getUUID("OwnerUUID");
-        }
-        if (jt.contains("SoundEvent", 8)) {
-            this.soundEvent = Registry.SOUND_EVENT.getOptional(new ResourceLocation(jt.getString("SoundEvent"))).orElse(this.getDefaultHitGroundSoundEvent());
-        }
-        this.setShotFromCrossbow(jt.getBoolean("ShotFromCrossbow"));
-    }
-    
-    public void setOwner(@Nullable final Entity akq) {
-        this.ownerUUID = ((akq == null) ? null : akq.getUUID());
-        if (akq instanceof Player) {
-            this.pickup = (((Player)akq).abilities.instabuild ? Pickup.CREATIVE_ONLY : Pickup.ALLOWED);
-        }
-    }
-    
-    @Nullable
-    public Entity getOwner() {
-        if (this.ownerUUID != null && this.level instanceof ServerLevel) {
-            return ((ServerLevel)this.level).getEntity(this.ownerUUID);
-        }
-        return null;
+    protected EntityHitResult findHitEntity(final Vec3 dem1, final Vec3 dem2) {
+        return ProjectileUtil.getEntityHitResult(this.level, this, dem1, dem2, this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(1.0), this::canHitEntity);
     }
     
     @Override
-    public void playerTouch(final Player ayj) {
+    protected boolean canHitEntity(final Entity aom) {
+        return super.canHitEntity(aom) && (this.piercingIgnoreEntityIds == null || !this.piercingIgnoreEntityIds.contains(aom.getId()));
+    }
+    
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putShort("life", (short)this.life);
+        if (this.lastState != null) {
+            le.put("inBlockState", NbtUtils.writeBlockState(this.lastState));
+        }
+        le.putByte("shake", (byte)this.shakeTime);
+        le.putBoolean("inGround", this.inGround);
+        le.putByte("pickup", (byte)this.pickup.ordinal());
+        le.putDouble("damage", this.baseDamage);
+        le.putBoolean("crit", this.isCritArrow());
+        le.putByte("PierceLevel", this.getPierceLevel());
+        le.putString("SoundEvent", Registry.SOUND_EVENT.getKey(this.soundEvent).toString());
+        le.putBoolean("ShotFromCrossbow", this.shotFromCrossbow());
+    }
+    
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.life = le.getShort("life");
+        if (le.contains("inBlockState", 10)) {
+            this.lastState = NbtUtils.readBlockState(le.getCompound("inBlockState"));
+        }
+        this.shakeTime = (le.getByte("shake") & 0xFF);
+        this.inGround = le.getBoolean("inGround");
+        if (le.contains("damage", 99)) {
+            this.baseDamage = le.getDouble("damage");
+        }
+        if (le.contains("pickup", 99)) {
+            this.pickup = Pickup.byOrdinal(le.getByte("pickup"));
+        }
+        else if (le.contains("player", 99)) {
+            this.pickup = (le.getBoolean("player") ? Pickup.ALLOWED : Pickup.DISALLOWED);
+        }
+        this.setCritArrow(le.getBoolean("crit"));
+        this.setPierceLevel(le.getByte("PierceLevel"));
+        if (le.contains("SoundEvent", 8)) {
+            this.soundEvent = Registry.SOUND_EVENT.getOptional(new ResourceLocation(le.getString("SoundEvent"))).orElse(this.getDefaultHitGroundSoundEvent());
+        }
+        this.setShotFromCrossbow(le.getBoolean("ShotFromCrossbow"));
+    }
+    
+    @Override
+    public void setOwner(@Nullable final Entity aom) {
+        super.setOwner(aom);
+        if (aom instanceof Player) {
+            this.pickup = (((Player)aom).abilities.instabuild ? Pickup.CREATIVE_ONLY : Pickup.ALLOWED);
+        }
+    }
+    
+    @Override
+    public void playerTouch(final Player bec) {
         if (this.level.isClientSide || (!this.inGround && !this.isNoPhysics()) || this.shakeTime > 0) {
             return;
         }
-        boolean boolean3 = this.pickup == Pickup.ALLOWED || (this.pickup == Pickup.CREATIVE_ONLY && ayj.abilities.instabuild) || (this.isNoPhysics() && this.getOwner().getUUID() == ayj.getUUID());
-        if (this.pickup == Pickup.ALLOWED && !ayj.inventory.add(this.getPickupItem())) {
+        boolean boolean3 = this.pickup == Pickup.ALLOWED || (this.pickup == Pickup.CREATIVE_ONLY && bec.abilities.instabuild) || (this.isNoPhysics() && this.getOwner().getUUID() == bec.getUUID());
+        if (this.pickup == Pickup.ALLOWED && !bec.inventory.add(this.getPickupItem())) {
             boolean3 = false;
         }
         if (boolean3) {
-            ayj.take(this, 1);
+            bec.take(this, 1);
             this.remove();
         }
     }
@@ -529,8 +493,8 @@ public abstract class AbstractArrow extends Entity implements Projectile {
     }
     
     @Override
-    protected float getEyeHeight(final Pose alj, final EntityDimensions akr) {
-        return 0.0f;
+    protected float getEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return 0.13f;
     }
     
     public void setCritArrow(final boolean boolean1) {
@@ -565,9 +529,9 @@ public abstract class AbstractArrow extends Entity implements Projectile {
         return this.entityData.<Byte>get(AbstractArrow.PIERCE_LEVEL);
     }
     
-    public void setEnchantmentEffectsFromEntity(final LivingEntity akz, final float float2) {
-        final int integer4 = EnchantmentHelper.getEnchantmentLevel(Enchantments.POWER_ARROWS, akz);
-        final int integer5 = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH_ARROWS, akz);
+    public void setEnchantmentEffectsFromEntity(final LivingEntity aoy, final float float2) {
+        final int integer4 = EnchantmentHelper.getEnchantmentLevel(Enchantments.POWER_ARROWS, aoy);
+        final int integer5 = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH_ARROWS, aoy);
         this.setBaseDamage(float2 * 2.0f + (this.random.nextGaussian() * 0.25 + this.level.getDifficulty().getId() * 0.11f));
         if (integer4 > 0) {
             this.setBaseDamage(this.getBaseDamage() + integer4 * 0.5 + 0.5);
@@ -575,7 +539,7 @@ public abstract class AbstractArrow extends Entity implements Projectile {
         if (integer5 > 0) {
             this.setKnockback(integer5);
         }
-        if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAMING_ARROWS, akz) > 0) {
+        if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAMING_ARROWS, aoy) > 0) {
             this.setSecondsOnFire(100);
         }
     }
@@ -601,13 +565,12 @@ public abstract class AbstractArrow extends Entity implements Projectile {
     
     @Override
     public Packet<?> getAddEntityPacket() {
-        final Entity akq2 = this.getOwner();
-        return new ClientboundAddEntityPacket(this, (akq2 == null) ? 0 : akq2.getId());
+        final Entity aom2 = this.getOwner();
+        return new ClientboundAddEntityPacket(this, (aom2 == null) ? 0 : aom2.getId());
     }
     
     static {
         ID_FLAGS = SynchedEntityData.<Byte>defineId(AbstractArrow.class, EntityDataSerializers.BYTE);
-        DATA_OWNERUUID_ID = SynchedEntityData.<Optional<UUID>>defineId(AbstractArrow.class, EntityDataSerializers.OPTIONAL_UUID);
         PIERCE_LEVEL = SynchedEntityData.<Byte>defineId(AbstractArrow.class, EntityDataSerializers.BYTE);
     }
     
diff --git a/src/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java b/src/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
index 4c682e5..62bfca2 100644
--- a/src/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
+++ b/src/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
@@ -6,55 +6,42 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.level.ClipContext;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Entity;
 
-public abstract class AbstractHurtingProjectile extends Entity {
-    public LivingEntity owner;
-    private int life;
-    private int flightTime;
+public abstract class AbstractHurtingProjectile extends Projectile {
     public double xPower;
     public double yPower;
     public double zPower;
     
-    protected AbstractHurtingProjectile(final EntityType<? extends AbstractHurtingProjectile> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AbstractHurtingProjectile(final EntityType<? extends AbstractHurtingProjectile> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public AbstractHurtingProjectile(final EntityType<? extends AbstractHurtingProjectile> aku, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final Level bjw) {
-        this(aku, bjw);
+    public AbstractHurtingProjectile(final EntityType<? extends AbstractHurtingProjectile> aoq, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final Level bqb) {
+        this(aoq, bqb);
         this.moveTo(double2, double3, double4, this.yRot, this.xRot);
-        this.setPos(double2, double3, double4);
+        this.reapplyPosition();
         final double double8 = Mth.sqrt(double5 * double5 + double6 * double6 + double7 * double7);
-        this.xPower = double5 / double8 * 0.1;
-        this.yPower = double6 / double8 * 0.1;
-        this.zPower = double7 / double8 * 0.1;
+        if (double8 != 0.0) {
+            this.xPower = double5 / double8 * 0.1;
+            this.yPower = double6 / double8 * 0.1;
+            this.zPower = double7 / double8 * 0.1;
+        }
     }
     
-    public AbstractHurtingProjectile(final EntityType<? extends AbstractHurtingProjectile> aku, final LivingEntity akz, double double3, double double4, double double5, final Level bjw) {
-        this(aku, bjw);
-        this.owner = akz;
-        this.moveTo(akz.getX(), akz.getY(), akz.getZ(), akz.yRot, akz.xRot);
-        this.reapplyPosition();
-        this.setDeltaMovement(Vec3.ZERO);
-        double3 += this.random.nextGaussian() * 0.4;
-        double4 += this.random.nextGaussian() * 0.4;
-        double5 += this.random.nextGaussian() * 0.4;
-        final double double6 = Mth.sqrt(double3 * double3 + double4 * double4 + double5 * double5);
-        this.xPower = double3 / double6 * 0.1;
-        this.yPower = double4 / double6 * 0.1;
-        this.zPower = double5 / double6 * 0.1;
+    public AbstractHurtingProjectile(final EntityType<? extends AbstractHurtingProjectile> aoq, final LivingEntity aoy, final double double3, final double double4, final double double5, final Level bqb) {
+        this(aoq, aoy.getX(), aoy.getY(), aoy.getZ(), double3, double4, double5, bqb);
+        this.setOwner(aoy);
+        this.setRot(aoy.yRot, aoy.xRot);
     }
     
     @Override
@@ -73,7 +60,8 @@ public abstract class AbstractHurtingProjectile extends Entity {
     
     @Override
     public void tick() {
-        if (!this.level.isClientSide && ((this.owner != null && this.owner.removed) || !this.level.hasChunkAt(new BlockPos(this)))) {
+        final Entity aom2 = this.getOwner();
+        if (!this.level.isClientSide && ((aom2 != null && aom2.removed) || !this.level.hasChunkAt(this.blockPosition()))) {
             this.remove();
             return;
         }
@@ -81,27 +69,31 @@ public abstract class AbstractHurtingProjectile extends Entity {
         if (this.shouldBurn()) {
             this.setSecondsOnFire(1);
         }
-        ++this.flightTime;
-        final HitResult cvi2 = ProjectileUtil.forwardsRaycast(this, true, this.flightTime >= 25, this.owner, ClipContext.Block.COLLIDER);
-        if (cvi2.getType() != HitResult.Type.MISS) {
-            this.onHit(cvi2);
+        final HitResult dej3 = ProjectileUtil.getHitResult(this, this::canHitEntity, ClipContext.Block.COLLIDER);
+        if (dej3.getType() != HitResult.Type.MISS) {
+            this.onHit(dej3);
         }
-        final Vec3 cvl3 = this.getDeltaMovement();
-        final double double4 = this.getX() + cvl3.x;
-        final double double5 = this.getY() + cvl3.y;
-        final double double6 = this.getZ() + cvl3.z;
+        final Vec3 dem4 = this.getDeltaMovement();
+        final double double5 = this.getX() + dem4.x;
+        final double double6 = this.getY() + dem4.y;
+        final double double7 = this.getZ() + dem4.z;
         ProjectileUtil.rotateTowardsMovement(this, 0.2f);
-        float float10 = this.getInertia();
+        float float11 = this.getInertia();
         if (this.isInWater()) {
-            for (int integer11 = 0; integer11 < 4; ++integer11) {
-                final float float11 = 0.25f;
-                this.level.addParticle(ParticleTypes.BUBBLE, double4 - cvl3.x * 0.25, double5 - cvl3.y * 0.25, double6 - cvl3.z * 0.25, cvl3.x, cvl3.y, cvl3.z);
+            for (int integer12 = 0; integer12 < 4; ++integer12) {
+                final float float12 = 0.25f;
+                this.level.addParticle(ParticleTypes.BUBBLE, double5 - dem4.x * 0.25, double6 - dem4.y * 0.25, double7 - dem4.z * 0.25, dem4.x, dem4.y, dem4.z);
             }
-            float10 = 0.8f;
+            float11 = 0.8f;
         }
-        this.setDeltaMovement(cvl3.add(this.xPower, this.yPower, this.zPower).scale(float10));
-        this.level.addParticle(this.getTrailParticle(), double4, double5 + 0.5, double6, 0.0, 0.0, 0.0);
-        this.setPos(double4, double5, double6);
+        this.setDeltaMovement(dem4.add(this.xPower, this.yPower, this.zPower).scale(float11));
+        this.level.addParticle(this.getTrailParticle(), double5, double6 + 0.5, double7, 0.0, 0.0, 0.0);
+        this.setPos(double5, double6, double7);
+    }
+    
+    @Override
+    protected boolean canHitEntity(final Entity aom) {
+        return super.canHitEntity(aom) && !aom.noPhysics;
     }
     
     protected boolean shouldBurn() {
@@ -116,39 +108,21 @@ public abstract class AbstractHurtingProjectile extends Entity {
         return 0.95f;
     }
     
-    protected void onHit(final HitResult cvi) {
-        final HitResult.Type a3 = cvi.getType();
-        if (a3 == HitResult.Type.BLOCK) {
-            final BlockHitResult cvg4 = (BlockHitResult)cvi;
-            final BlockState byj5 = this.level.getBlockState(cvg4.getBlockPos());
-            byj5.onProjectileHit(this.level, byj5, cvg4, this);
-        }
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.put("power", this.newDoubleList(this.xPower, this.yPower, this.zPower));
     }
     
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        final Vec3 cvl3 = this.getDeltaMovement();
-        jt.put("direction", this.newDoubleList(cvl3.x, cvl3.y, cvl3.z));
-        jt.put("power", this.newDoubleList(this.xPower, this.yPower, this.zPower));
-        jt.putInt("life", this.life);
-    }
-    
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        if (jt.contains("power", 9)) {
-            final ListTag jz3 = jt.getList("power", 6);
-            if (jz3.size() == 3) {
-                this.xPower = jz3.getDouble(0);
-                this.yPower = jz3.getDouble(1);
-                this.zPower = jz3.getDouble(2);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("power", 9)) {
+            final ListTag lk3 = le.getList("power", 6);
+            if (lk3.size() == 3) {
+                this.xPower = lk3.getDouble(0);
+                this.yPower = lk3.getDouble(1);
+                this.zPower = lk3.getDouble(2);
             }
         }
-        this.life = jt.getInt("life");
-        if (jt.contains("direction", 9) && jt.getList("direction", 6).size() == 3) {
-            final ListTag jz3 = jt.getList("direction", 6);
-            this.setDeltaMovement(jz3.getDouble(0), jz3.getDouble(1), jz3.getDouble(2));
-        }
-        else {
-            this.remove();
-        }
     }
     
     @Override
@@ -162,20 +136,19 @@ public abstract class AbstractHurtingProjectile extends Entity {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
         this.markHurt();
-        if (ajz.getEntity() != null) {
-            final Vec3 cvl4 = ajz.getEntity().getLookAngle();
-            this.setDeltaMovement(cvl4);
-            this.xPower = cvl4.x * 0.1;
-            this.yPower = cvl4.y * 0.1;
-            this.zPower = cvl4.z * 0.1;
-            if (ajz.getEntity() instanceof LivingEntity) {
-                this.owner = (LivingEntity)ajz.getEntity();
-            }
+        final Entity aom4 = anw.getEntity();
+        if (aom4 != null) {
+            final Vec3 dem5 = aom4.getLookAngle();
+            this.setDeltaMovement(dem5);
+            this.xPower = dem5.x * 0.1;
+            this.yPower = dem5.y * 0.1;
+            this.zPower = dem5.z * 0.1;
+            this.setOwner(aom4);
             return true;
         }
         return false;
@@ -188,7 +161,8 @@ public abstract class AbstractHurtingProjectile extends Entity {
     
     @Override
     public Packet<?> getAddEntityPacket() {
-        final int integer2 = (this.owner == null) ? 0 : this.owner.getId();
-        return new ClientboundAddEntityPacket(this.getId(), this.getUUID(), this.getX(), this.getY(), this.getZ(), this.xRot, this.yRot, this.getType(), integer2, new Vec3(this.xPower, this.yPower, this.zPower));
+        final Entity aom2 = this.getOwner();
+        final int integer3 = (aom2 == null) ? 0 : aom2.getId();
+        return new ClientboundAddEntityPacket(this.getId(), this.getUUID(), this.getX(), this.getY(), this.getZ(), this.xRot, this.yRot, this.getType(), integer3, new Vec3(this.xPower, this.yPower, this.zPower));
     }
 }
diff --git a/src/net/minecraft/world/entity/projectile/Arrow.java b/src/net/minecraft/world/entity/projectile/Arrow.java
index 81f2e7b..dc2edae 100644
--- a/src/net/minecraft/world/entity/projectile/Arrow.java
+++ b/src/net/minecraft/world/entity/projectile/Arrow.java
@@ -32,34 +32,34 @@ public class Arrow extends AbstractArrow {
     private final Set<MobEffectInstance> effects;
     private boolean fixedColor;
     
-    public Arrow(final EntityType<? extends Arrow> aku, final Level bjw) {
-        super(aku, bjw);
+    public Arrow(final EntityType<? extends Arrow> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.potion = Potions.EMPTY;
         this.effects = Sets.newHashSet();
     }
     
-    public Arrow(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.ARROW, double2, double3, double4, bjw);
+    public Arrow(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.ARROW, double2, double3, double4, bqb);
         this.potion = Potions.EMPTY;
         this.effects = Sets.newHashSet();
     }
     
-    public Arrow(final Level bjw, final LivingEntity akz) {
-        super(EntityType.ARROW, akz, bjw);
+    public Arrow(final Level bqb, final LivingEntity aoy) {
+        super(EntityType.ARROW, aoy, bqb);
         this.potion = Potions.EMPTY;
         this.effects = Sets.newHashSet();
     }
     
-    public void setEffectsFromItem(final ItemStack ben) {
-        if (ben.getItem() == Items.TIPPED_ARROW) {
-            this.potion = PotionUtils.getPotion(ben);
-            final Collection<MobEffectInstance> collection3 = PotionUtils.getCustomEffects(ben);
+    public void setEffectsFromItem(final ItemStack bki) {
+        if (bki.getItem() == Items.TIPPED_ARROW) {
+            this.potion = PotionUtils.getPotion(bki);
+            final Collection<MobEffectInstance> collection3 = PotionUtils.getCustomEffects(bki);
             if (!collection3.isEmpty()) {
-                for (final MobEffectInstance akk5 : collection3) {
-                    this.effects.add(new MobEffectInstance(akk5));
+                for (final MobEffectInstance aog5 : collection3) {
+                    this.effects.add(new MobEffectInstance(aog5));
                 }
             }
-            final int integer4 = getCustomColor(ben);
+            final int integer4 = getCustomColor(bki);
             if (integer4 == -1) {
                 this.updateColor();
             }
@@ -67,17 +67,17 @@ public class Arrow extends AbstractArrow {
                 this.setFixedColor(integer4);
             }
         }
-        else if (ben.getItem() == Items.ARROW) {
+        else if (bki.getItem() == Items.ARROW) {
             this.potion = Potions.EMPTY;
             this.effects.clear();
             this.entityData.<Integer>set(Arrow.ID_EFFECT_COLOR, -1);
         }
     }
     
-    public static int getCustomColor(final ItemStack ben) {
-        final CompoundTag jt2 = ben.getTag();
-        if (jt2 != null && jt2.contains("CustomPotionColor", 99)) {
-            return jt2.getInt("CustomPotionColor");
+    public static int getCustomColor(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTag();
+        if (le2 != null && le2.contains("CustomPotionColor", 99)) {
+            return le2.getInt("CustomPotionColor");
         }
         return -1;
     }
@@ -92,8 +92,8 @@ public class Arrow extends AbstractArrow {
         }
     }
     
-    public void addEffect(final MobEffectInstance akk) {
-        this.effects.add(akk);
+    public void addEffect(final MobEffectInstance aog) {
+        this.effects.add(aog);
         this.getEntityData().<Integer>set(Arrow.ID_EFFECT_COLOR, PotionUtils.getColor(PotionUtils.getAllEffects(this.potion, this.effects)));
     }
     
@@ -147,34 +147,34 @@ public class Arrow extends AbstractArrow {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         if (this.potion != Potions.EMPTY && this.potion != null) {
-            jt.putString("Potion", Registry.POTION.getKey(this.potion).toString());
+            le.putString("Potion", Registry.POTION.getKey(this.potion).toString());
         }
         if (this.fixedColor) {
-            jt.putInt("Color", this.getColor());
+            le.putInt("Color", this.getColor());
         }
         if (!this.effects.isEmpty()) {
-            final ListTag jz3 = new ListTag();
-            for (final MobEffectInstance akk5 : this.effects) {
-                ((AbstractList<CompoundTag>)jz3).add(akk5.save(new CompoundTag()));
+            final ListTag lk3 = new ListTag();
+            for (final MobEffectInstance aog5 : this.effects) {
+                ((AbstractList<CompoundTag>)lk3).add(aog5.save(new CompoundTag()));
             }
-            jt.put("CustomPotionEffects", jz3);
+            le.put("CustomPotionEffects", lk3);
         }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("Potion", 8)) {
-            this.potion = PotionUtils.getPotion(jt);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("Potion", 8)) {
+            this.potion = PotionUtils.getPotion(le);
         }
-        for (final MobEffectInstance akk4 : PotionUtils.getCustomEffects(jt)) {
-            this.addEffect(akk4);
+        for (final MobEffectInstance aog4 : PotionUtils.getCustomEffects(le)) {
+            this.addEffect(aog4);
         }
-        if (jt.contains("Color", 99)) {
-            this.setFixedColor(jt.getInt("Color"));
+        if (le.contains("Color", 99)) {
+            this.setFixedColor(le.getInt("Color"));
         }
         else {
             this.updateColor();
@@ -182,14 +182,14 @@ public class Arrow extends AbstractArrow {
     }
     
     @Override
-    protected void doPostHurtEffects(final LivingEntity akz) {
-        super.doPostHurtEffects(akz);
-        for (final MobEffectInstance akk4 : this.potion.getEffects()) {
-            akz.addEffect(new MobEffectInstance(akk4.getEffect(), Math.max(akk4.getDuration() / 8, 1), akk4.getAmplifier(), akk4.isAmbient(), akk4.isVisible()));
+    protected void doPostHurtEffects(final LivingEntity aoy) {
+        super.doPostHurtEffects(aoy);
+        for (final MobEffectInstance aog4 : this.potion.getEffects()) {
+            aoy.addEffect(new MobEffectInstance(aog4.getEffect(), Math.max(aog4.getDuration() / 8, 1), aog4.getAmplifier(), aog4.isAmbient(), aog4.isVisible()));
         }
         if (!this.effects.isEmpty()) {
-            for (final MobEffectInstance akk4 : this.effects) {
-                akz.addEffect(akk4);
+            for (final MobEffectInstance aog4 : this.effects) {
+                aoy.addEffect(aog4);
             }
         }
     }
@@ -199,13 +199,13 @@ public class Arrow extends AbstractArrow {
         if (this.effects.isEmpty() && this.potion == Potions.EMPTY) {
             return new ItemStack(Items.ARROW);
         }
-        final ItemStack ben2 = new ItemStack(Items.TIPPED_ARROW);
-        PotionUtils.setPotion(ben2, this.potion);
-        PotionUtils.setCustomEffects(ben2, this.effects);
+        final ItemStack bki2 = new ItemStack(Items.TIPPED_ARROW);
+        PotionUtils.setPotion(bki2, this.potion);
+        PotionUtils.setCustomEffects(bki2, this.effects);
         if (this.fixedColor) {
-            ben2.getOrCreateTag().putInt("CustomPotionColor", this.getColor());
+            bki2.getOrCreateTag().putInt("CustomPotionColor", this.getColor());
         }
-        return ben2;
+        return bki2;
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/projectile/DragonFireball.java b/src/net/minecraft/world/entity/projectile/DragonFireball.java
index 1e31f0d..e1f2546 100644
--- a/src/net/minecraft/world/entity/projectile/DragonFireball.java
+++ b/src/net/minecraft/world/entity/projectile/DragonFireball.java
@@ -3,13 +3,12 @@ package net.minecraft.world.entity.projectile;
 import net.minecraft.world.damagesource.DamageSource;
 import java.util.Iterator;
 import java.util.List;
-import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.entity.AreaEffectCloud;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.entity.LivingEntity;
@@ -17,44 +16,47 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class DragonFireball extends AbstractHurtingProjectile {
-    public DragonFireball(final EntityType<? extends DragonFireball> aku, final Level bjw) {
-        super(aku, bjw);
+    public DragonFireball(final EntityType<? extends DragonFireball> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public DragonFireball(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(EntityType.DRAGON_FIREBALL, double2, double3, double4, double5, double6, double7, bjw);
+    public DragonFireball(final Level bqb, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(EntityType.DRAGON_FIREBALL, double2, double3, double4, double5, double6, double7, bqb);
     }
     
-    public DragonFireball(final Level bjw, final LivingEntity akz, final double double3, final double double4, final double double5) {
-        super(EntityType.DRAGON_FIREBALL, akz, double3, double4, double5, bjw);
+    public DragonFireball(final Level bqb, final LivingEntity aoy, final double double3, final double double4, final double double5) {
+        super(EntityType.DRAGON_FIREBALL, aoy, double3, double4, double5, bqb);
     }
     
     @Override
-    protected void onHit(final HitResult cvi) {
-        super.onHit(cvi);
-        if (cvi.getType() == HitResult.Type.ENTITY && ((EntityHitResult)cvi).getEntity().is(this.owner)) {
+    protected void onHit(final HitResult dej) {
+        super.onHit(dej);
+        final Entity aom3 = this.getOwner();
+        if (dej.getType() == HitResult.Type.ENTITY && ((EntityHitResult)dej).getEntity().is(aom3)) {
             return;
         }
         if (!this.level.isClientSide) {
-            final List<LivingEntity> list3 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, this.getBoundingBox().inflate(4.0, 2.0, 4.0));
-            final AreaEffectCloud akp4 = new AreaEffectCloud(this.level, this.getX(), this.getY(), this.getZ());
-            akp4.setOwner(this.owner);
-            akp4.setParticle(ParticleTypes.DRAGON_BREATH);
-            akp4.setRadius(3.0f);
-            akp4.setDuration(600);
-            akp4.setRadiusPerTick((7.0f - akp4.getRadius()) / akp4.getDuration());
-            akp4.addEffect(new MobEffectInstance(MobEffects.HARM, 1, 1));
-            if (!list3.isEmpty()) {
-                for (final LivingEntity akz6 : list3) {
-                    final double double7 = this.distanceToSqr(akz6);
-                    if (double7 < 16.0) {
-                        akp4.setPos(akz6.getX(), akz6.getY(), akz6.getZ());
+            final List<LivingEntity> list4 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, this.getBoundingBox().inflate(4.0, 2.0, 4.0));
+            final AreaEffectCloud aol5 = new AreaEffectCloud(this.level, this.getX(), this.getY(), this.getZ());
+            if (aom3 instanceof LivingEntity) {
+                aol5.setOwner((LivingEntity)aom3);
+            }
+            aol5.setParticle(ParticleTypes.DRAGON_BREATH);
+            aol5.setRadius(3.0f);
+            aol5.setDuration(600);
+            aol5.setRadiusPerTick((7.0f - aol5.getRadius()) / aol5.getDuration());
+            aol5.addEffect(new MobEffectInstance(MobEffects.HARM, 1, 1));
+            if (!list4.isEmpty()) {
+                for (final LivingEntity aoy7 : list4) {
+                    final double double8 = this.distanceToSqr(aoy7);
+                    if (double8 < 16.0) {
+                        aol5.setPos(aoy7.getX(), aoy7.getY(), aoy7.getZ());
                         break;
                     }
                 }
             }
-            this.level.levelEvent(2006, new BlockPos(this), 0);
-            this.level.addFreshEntity(akp4);
+            this.level.levelEvent(2006, this.blockPosition(), this.isSilent() ? -1 : 1);
+            this.level.addFreshEntity(aol5);
             this.remove();
         }
     }
@@ -65,7 +67,7 @@ public class DragonFireball extends AbstractHurtingProjectile {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/entity/projectile/EvokerFangs.java b/src/net/minecraft/world/entity/projectile/EvokerFangs.java
index b978dc5..7fce58e 100644
--- a/src/net/minecraft/world/entity/projectile/EvokerFangs.java
+++ b/src/net/minecraft/world/entity/projectile/EvokerFangs.java
@@ -25,15 +25,15 @@ public class EvokerFangs extends Entity {
     private LivingEntity owner;
     private UUID ownerUUID;
     
-    public EvokerFangs(final EntityType<? extends EvokerFangs> aku, final Level bjw) {
-        super(aku, bjw);
+    public EvokerFangs(final EntityType<? extends EvokerFangs> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.lifeTicks = 22;
     }
     
-    public EvokerFangs(final Level bjw, final double double2, final double double3, final double double4, final float float5, final int integer, final LivingEntity akz) {
-        this(EntityType.EVOKER_FANGS, bjw);
+    public EvokerFangs(final Level bqb, final double double2, final double double3, final double double4, final float float5, final int integer, final LivingEntity aoy) {
+        this(EntityType.EVOKER_FANGS, bqb);
         this.warmupDelayTicks = integer;
-        this.setOwner(akz);
+        this.setOwner(aoy);
         this.yRot = float5 * 57.295776f;
         this.setPos(double2, double3, double4);
     }
@@ -42,35 +42,35 @@ public class EvokerFangs extends Entity {
     protected void defineSynchedData() {
     }
     
-    public void setOwner(@Nullable final LivingEntity akz) {
-        this.owner = akz;
-        this.ownerUUID = ((akz == null) ? null : akz.getUUID());
+    public void setOwner(@Nullable final LivingEntity aoy) {
+        this.owner = aoy;
+        this.ownerUUID = ((aoy == null) ? null : aoy.getUUID());
     }
     
     @Nullable
     public LivingEntity getOwner() {
         if (this.owner == null && this.ownerUUID != null && this.level instanceof ServerLevel) {
-            final Entity akq2 = ((ServerLevel)this.level).getEntity(this.ownerUUID);
-            if (akq2 instanceof LivingEntity) {
-                this.owner = (LivingEntity)akq2;
+            final Entity aom2 = ((ServerLevel)this.level).getEntity(this.ownerUUID);
+            if (aom2 instanceof LivingEntity) {
+                this.owner = (LivingEntity)aom2;
             }
         }
         return this.owner;
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        this.warmupDelayTicks = jt.getInt("Warmup");
-        if (jt.hasUUID("OwnerUUID")) {
-            this.ownerUUID = jt.getUUID("OwnerUUID");
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        this.warmupDelayTicks = le.getInt("Warmup");
+        if (le.hasUUID("Owner")) {
+            this.ownerUUID = le.getUUID("Owner");
         }
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putInt("Warmup", this.warmupDelayTicks);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        le.putInt("Warmup", this.warmupDelayTicks);
         if (this.ownerUUID != null) {
-            jt.putUUID("OwnerUUID", this.ownerUUID);
+            le.putUUID("Owner", this.ownerUUID);
         }
     }
     
@@ -96,8 +96,8 @@ public class EvokerFangs extends Entity {
         else if (--this.warmupDelayTicks < 0) {
             if (this.warmupDelayTicks == -8) {
                 final List<LivingEntity> list2 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, this.getBoundingBox().inflate(0.2, 0.0, 0.2));
-                for (final LivingEntity akz4 : list2) {
-                    this.dealDamageTo(akz4);
+                for (final LivingEntity aoy4 : list2) {
+                    this.dealDamageTo(aoy4);
                 }
             }
             if (!this.sentSpikeEvent) {
@@ -110,19 +110,19 @@ public class EvokerFangs extends Entity {
         }
     }
     
-    private void dealDamageTo(final LivingEntity akz) {
-        final LivingEntity akz2 = this.getOwner();
-        if (!akz.isAlive() || akz.isInvulnerable() || akz == akz2) {
+    private void dealDamageTo(final LivingEntity aoy) {
+        final LivingEntity aoy2 = this.getOwner();
+        if (!aoy.isAlive() || aoy.isInvulnerable() || aoy == aoy2) {
             return;
         }
-        if (akz2 == null) {
-            akz.hurt(DamageSource.MAGIC, 6.0f);
+        if (aoy2 == null) {
+            aoy.hurt(DamageSource.MAGIC, 6.0f);
         }
         else {
-            if (akz2.isAlliedTo(akz)) {
+            if (aoy2.isAlliedTo(aoy)) {
                 return;
             }
-            akz.hurt(DamageSource.indirectMagic(this, akz2), 6.0f);
+            aoy.hurt(DamageSource.indirectMagic(this, aoy2), 6.0f);
         }
     }
     
diff --git a/src/net/minecraft/world/entity/projectile/EyeOfEnder.java b/src/net/minecraft/world/entity/projectile/EyeOfEnder.java
index 9b3e407..4c5a14e 100644
--- a/src/net/minecraft/world/entity/projectile/EyeOfEnder.java
+++ b/src/net/minecraft/world/entity/projectile/EyeOfEnder.java
@@ -30,19 +30,19 @@ public class EyeOfEnder extends Entity implements ItemSupplier {
     private int life;
     private boolean surviveAfterDeath;
     
-    public EyeOfEnder(final EntityType<? extends EyeOfEnder> aku, final Level bjw) {
-        super(aku, bjw);
+    public EyeOfEnder(final EntityType<? extends EyeOfEnder> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public EyeOfEnder(final Level bjw, final double double2, final double double3, final double double4) {
-        this(EntityType.EYE_OF_ENDER, bjw);
+    public EyeOfEnder(final Level bqb, final double double2, final double double3, final double double4) {
+        this(EntityType.EYE_OF_ENDER, bqb);
         this.life = 0;
         this.setPos(double2, double3, double4);
     }
     
-    public void setItem(final ItemStack ben) {
-        if (ben.getItem() != Items.ENDER_EYE || ben.hasTag()) {
-            this.getEntityData().<ItemStack>set(EyeOfEnder.DATA_ITEM_STACK, (ItemStack)Util.<T>make((T)ben.copy(), ben -> ben.setCount(1)));
+    public void setItem(final ItemStack bki) {
+        if (bki.getItem() != Items.ENDER_EYE || bki.hasTag()) {
+            this.getEntityData().<ItemStack>set(EyeOfEnder.DATA_ITEM_STACK, (ItemStack)Util.<T>make((T)bki.copy(), bki -> bki.setCount(1)));
         }
     }
     
@@ -52,8 +52,8 @@ public class EyeOfEnder extends Entity implements ItemSupplier {
     
     @Override
     public ItemStack getItem() {
-        final ItemStack ben2 = this.getItemRaw();
-        return ben2.isEmpty() ? new ItemStack(Items.ENDER_EYE) : ben2;
+        final ItemStack bki2 = this.getItemRaw();
+        return bki2.isEmpty() ? new ItemStack(Items.ENDER_EYE) : bki2;
     }
     
     @Override
@@ -71,10 +71,10 @@ public class EyeOfEnder extends Entity implements ItemSupplier {
         return double1 < double2 * double2;
     }
     
-    public void signalTo(final BlockPos fk) {
-        final double double3 = fk.getX();
-        final int integer5 = fk.getY();
-        final double double4 = fk.getZ();
+    public void signalTo(final BlockPos fu) {
+        final double double3 = fu.getX();
+        final int integer5 = fu.getY();
+        final double double4 = fu.getZ();
         final double double5 = double3 - this.getX();
         final double double6 = double4 - this.getZ();
         final float float12 = Mth.sqrt(double5 * double5 + double6 * double6);
@@ -107,50 +107,36 @@ public class EyeOfEnder extends Entity implements ItemSupplier {
     @Override
     public void tick() {
         super.tick();
-        Vec3 cvl2 = this.getDeltaMovement();
-        final double double3 = this.getX() + cvl2.x;
-        final double double4 = this.getY() + cvl2.y;
-        final double double5 = this.getZ() + cvl2.z;
-        final float float9 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl2));
-        this.yRot = (float)(Mth.atan2(cvl2.x, cvl2.z) * 57.2957763671875);
-        this.xRot = (float)(Mth.atan2(cvl2.y, float9) * 57.2957763671875);
-        while (this.xRot - this.xRotO < -180.0f) {
-            this.xRotO -= 360.0f;
-        }
-        while (this.xRot - this.xRotO >= 180.0f) {
-            this.xRotO += 360.0f;
-        }
-        while (this.yRot - this.yRotO < -180.0f) {
-            this.yRotO -= 360.0f;
-        }
-        while (this.yRot - this.yRotO >= 180.0f) {
-            this.yRotO += 360.0f;
-        }
-        this.xRot = Mth.lerp(0.2f, this.xRotO, this.xRot);
-        this.yRot = Mth.lerp(0.2f, this.yRotO, this.yRot);
+        Vec3 dem2 = this.getDeltaMovement();
+        final double double3 = this.getX() + dem2.x;
+        final double double4 = this.getY() + dem2.y;
+        final double double5 = this.getZ() + dem2.z;
+        final float float9 = Mth.sqrt(Entity.getHorizontalDistanceSqr(dem2));
+        this.xRot = Projectile.lerpRotation(this.xRotO, (float)(Mth.atan2(dem2.y, float9) * 57.2957763671875));
+        this.yRot = Projectile.lerpRotation(this.yRotO, (float)(Mth.atan2(dem2.x, dem2.z) * 57.2957763671875));
         if (!this.level.isClientSide) {
             final double double6 = this.tx - double3;
             final double double7 = this.tz - double5;
             final float float10 = (float)Math.sqrt(double6 * double6 + double7 * double7);
             final float float11 = (float)Mth.atan2(double7, double6);
             double double8 = Mth.lerp(0.0025, float9, float10);
-            double double9 = cvl2.y;
+            double double9 = dem2.y;
             if (float10 < 1.0f) {
                 double8 *= 0.8;
                 double9 *= 0.8;
             }
             final int integer20 = (this.getY() < this.ty) ? 1 : -1;
-            cvl2 = new Vec3(Math.cos(float11) * double8, double9 + (integer20 - double9) * 0.014999999664723873, Math.sin(float11) * double8);
-            this.setDeltaMovement(cvl2);
+            dem2 = new Vec3(Math.cos(float11) * double8, double9 + (integer20 - double9) * 0.014999999664723873, Math.sin(float11) * double8);
+            this.setDeltaMovement(dem2);
         }
         final float float12 = 0.25f;
         if (this.isInWater()) {
             for (int integer21 = 0; integer21 < 4; ++integer21) {
-                this.level.addParticle(ParticleTypes.BUBBLE, double3 - cvl2.x * 0.25, double4 - cvl2.y * 0.25, double5 - cvl2.z * 0.25, cvl2.x, cvl2.y, cvl2.z);
+                this.level.addParticle(ParticleTypes.BUBBLE, double3 - dem2.x * 0.25, double4 - dem2.y * 0.25, double5 - dem2.z * 0.25, dem2.x, dem2.y, dem2.z);
             }
         }
         else {
-            this.level.addParticle(ParticleTypes.PORTAL, double3 - cvl2.x * 0.25 + this.random.nextDouble() * 0.6 - 0.3, double4 - cvl2.y * 0.25 - 0.5, double5 - cvl2.z * 0.25 + this.random.nextDouble() * 0.6 - 0.3, cvl2.x, cvl2.y, cvl2.z);
+            this.level.addParticle(ParticleTypes.PORTAL, double3 - dem2.x * 0.25 + this.random.nextDouble() * 0.6 - 0.3, double4 - dem2.y * 0.25 - 0.5, double5 - dem2.z * 0.25 + this.random.nextDouble() * 0.6 - 0.3, dem2.x, dem2.y, dem2.z);
         }
         if (!this.level.isClientSide) {
             this.setPos(double3, double4, double5);
@@ -162,7 +148,7 @@ public class EyeOfEnder extends Entity implements ItemSupplier {
                     this.level.addFreshEntity(new ItemEntity(this.level, this.getX(), this.getY(), this.getZ(), this.getItem()));
                 }
                 else {
-                    this.level.levelEvent(2003, new BlockPos(this), 0);
+                    this.level.levelEvent(2003, this.blockPosition(), 0);
                 }
             }
         }
@@ -171,16 +157,16 @@ public class EyeOfEnder extends Entity implements ItemSupplier {
         }
     }
     
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        final ItemStack ben3 = this.getItemRaw();
-        if (!ben3.isEmpty()) {
-            jt.put("Item", ben3.save(new CompoundTag()));
+    public void addAdditionalSaveData(final CompoundTag le) {
+        final ItemStack bki3 = this.getItemRaw();
+        if (!bki3.isEmpty()) {
+            le.put("Item", bki3.save(new CompoundTag()));
         }
     }
     
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        final ItemStack ben3 = ItemStack.of(jt.getCompound("Item"));
-        this.setItem(ben3);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        final ItemStack bki3 = ItemStack.of(le.getCompound("Item"));
+        this.setItem(bki3);
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/projectile/Fireball.java b/src/net/minecraft/world/entity/projectile/Fireball.java
index 700d1ec..82a7b3b 100644
--- a/src/net/minecraft/world/entity/projectile/Fireball.java
+++ b/src/net/minecraft/world/entity/projectile/Fireball.java
@@ -17,21 +17,21 @@ import net.minecraft.network.syncher.EntityDataAccessor;
 public abstract class Fireball extends AbstractHurtingProjectile implements ItemSupplier {
     private static final EntityDataAccessor<ItemStack> DATA_ITEM_STACK;
     
-    public Fireball(final EntityType<? extends Fireball> aku, final Level bjw) {
-        super(aku, bjw);
+    public Fireball(final EntityType<? extends Fireball> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public Fireball(final EntityType<? extends Fireball> aku, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final Level bjw) {
-        super(aku, double2, double3, double4, double5, double6, double7, bjw);
+    public Fireball(final EntityType<? extends Fireball> aoq, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7, final Level bqb) {
+        super(aoq, double2, double3, double4, double5, double6, double7, bqb);
     }
     
-    public Fireball(final EntityType<? extends Fireball> aku, final LivingEntity akz, final double double3, final double double4, final double double5, final Level bjw) {
-        super(aku, akz, double3, double4, double5, bjw);
+    public Fireball(final EntityType<? extends Fireball> aoq, final LivingEntity aoy, final double double3, final double double4, final double double5, final Level bqb) {
+        super(aoq, aoy, double3, double4, double5, bqb);
     }
     
-    public void setItem(final ItemStack ben) {
-        if (ben.getItem() != Items.FIRE_CHARGE || ben.hasTag()) {
-            this.getEntityData().<ItemStack>set(Fireball.DATA_ITEM_STACK, (ItemStack)Util.<T>make((T)ben.copy(), ben -> ben.setCount(1)));
+    public void setItem(final ItemStack bki) {
+        if (bki.getItem() != Items.FIRE_CHARGE || bki.hasTag()) {
+            this.getEntityData().<ItemStack>set(Fireball.DATA_ITEM_STACK, (ItemStack)Util.<T>make((T)bki.copy(), bki -> bki.setCount(1)));
         }
     }
     
@@ -41,8 +41,8 @@ public abstract class Fireball extends AbstractHurtingProjectile implements Item
     
     @Override
     public ItemStack getItem() {
-        final ItemStack ben2 = this.getItemRaw();
-        return ben2.isEmpty() ? new ItemStack(Items.FIRE_CHARGE) : ben2;
+        final ItemStack bki2 = this.getItemRaw();
+        return bki2.isEmpty() ? new ItemStack(Items.FIRE_CHARGE) : bki2;
     }
     
     @Override
@@ -51,19 +51,19 @@ public abstract class Fireball extends AbstractHurtingProjectile implements Item
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        final ItemStack ben3 = this.getItemRaw();
-        if (!ben3.isEmpty()) {
-            jt.put("Item", ben3.save(new CompoundTag()));
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        final ItemStack bki3 = this.getItemRaw();
+        if (!bki3.isEmpty()) {
+            le.put("Item", bki3.save(new CompoundTag()));
         }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        final ItemStack ben3 = ItemStack.of(jt.getCompound("Item"));
-        this.setItem(ben3);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        final ItemStack bki3 = ItemStack.of(le.getCompound("Item"));
+        this.setItem(bki3);
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
index 4c61848..8766c87 100644
--- a/src/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
+++ b/src/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
@@ -15,6 +15,7 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.core.Vec3i;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.particles.ParticleOptions;
@@ -24,16 +25,16 @@ import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.entity.MoverType;
-import net.minecraft.util.Mth;
+import javax.annotation.Nullable;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import java.util.OptionalInt;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.world.entity.Entity;
 
-public class FireworkRocketEntity extends Entity implements ItemSupplier, Projectile {
+public class FireworkRocketEntity extends Projectile implements ItemSupplier {
     private static final EntityDataAccessor<ItemStack> DATA_ID_FIREWORKS_ITEM;
     private static final EntityDataAccessor<OptionalInt> DATA_ATTACHED_TO_TARGET;
     private static final EntityDataAccessor<Boolean> DATA_SHOT_AT_ANGLE;
@@ -41,8 +42,42 @@ public class FireworkRocketEntity extends Entity implements ItemSupplier, Projec
     private int lifetime;
     private LivingEntity attachedToEntity;
     
-    public FireworkRocketEntity(final EntityType<? extends FireworkRocketEntity> aku, final Level bjw) {
-        super(aku, bjw);
+    public FireworkRocketEntity(final EntityType<? extends FireworkRocketEntity> aoq, final Level bqb) {
+        super(aoq, bqb);
+    }
+    
+    public FireworkRocketEntity(final Level bqb, final double double2, final double double3, final double double4, final ItemStack bki) {
+        super(EntityType.FIREWORK_ROCKET, bqb);
+        this.life = 0;
+        this.setPos(double2, double3, double4);
+        int integer10 = 1;
+        if (!bki.isEmpty() && bki.hasTag()) {
+            this.entityData.<ItemStack>set(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM, bki.copy());
+            integer10 += bki.getOrCreateTagElement("Fireworks").getByte("Flight");
+        }
+        this.setDeltaMovement(this.random.nextGaussian() * 0.001, 0.05, this.random.nextGaussian() * 0.001);
+        this.lifetime = 10 * integer10 + this.random.nextInt(6) + this.random.nextInt(7);
+    }
+    
+    public FireworkRocketEntity(final Level bqb, @Nullable final Entity aom, final double double3, final double double4, final double double5, final ItemStack bki) {
+        this(bqb, double3, double4, double5, bki);
+        this.setOwner(aom);
+    }
+    
+    public FireworkRocketEntity(final Level bqb, final ItemStack bki, final LivingEntity aoy) {
+        this(bqb, aoy, aoy.getX(), aoy.getY(), aoy.getZ(), bki);
+        this.entityData.<OptionalInt>set(FireworkRocketEntity.DATA_ATTACHED_TO_TARGET, OptionalInt.of(aoy.getId()));
+        this.attachedToEntity = aoy;
+    }
+    
+    public FireworkRocketEntity(final Level bqb, final ItemStack bki, final double double3, final double double4, final double double5, final boolean boolean6) {
+        this(bqb, double3, double4, double5, bki);
+        this.entityData.<Boolean>set(FireworkRocketEntity.DATA_SHOT_AT_ANGLE, boolean6);
+    }
+    
+    public FireworkRocketEntity(final Level bqb, final ItemStack bki, final Entity aom, final double double4, final double double5, final double double6, final boolean boolean7) {
+        this(bqb, bki, double4, double5, double6, boolean7);
+        this.setOwner(aom);
     }
     
     @Override
@@ -62,63 +97,27 @@ public class FireworkRocketEntity extends Entity implements ItemSupplier, Projec
         return super.shouldRender(double1, double2, double3) && !this.isAttachedToEntity();
     }
     
-    public FireworkRocketEntity(final Level bjw, final double double2, final double double3, final double double4, final ItemStack ben) {
-        super(EntityType.FIREWORK_ROCKET, bjw);
-        this.life = 0;
-        this.setPos(double2, double3, double4);
-        int integer10 = 1;
-        if (!ben.isEmpty() && ben.hasTag()) {
-            this.entityData.<ItemStack>set(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM, ben.copy());
-            integer10 += ben.getOrCreateTagElement("Fireworks").getByte("Flight");
-        }
-        this.setDeltaMovement(this.random.nextGaussian() * 0.001, 0.05, this.random.nextGaussian() * 0.001);
-        this.lifetime = 10 * integer10 + this.random.nextInt(6) + this.random.nextInt(7);
-    }
-    
-    public FireworkRocketEntity(final Level bjw, final ItemStack ben, final LivingEntity akz) {
-        this(bjw, akz.getX(), akz.getY(), akz.getZ(), ben);
-        this.entityData.<OptionalInt>set(FireworkRocketEntity.DATA_ATTACHED_TO_TARGET, OptionalInt.of(akz.getId()));
-        this.attachedToEntity = akz;
-    }
-    
-    public FireworkRocketEntity(final Level bjw, final ItemStack ben, final double double3, final double double4, final double double5, final boolean boolean6) {
-        this(bjw, double3, double4, double5, ben);
-        this.entityData.<Boolean>set(FireworkRocketEntity.DATA_SHOT_AT_ANGLE, boolean6);
-    }
-    
-    @Override
-    public void lerpMotion(final double double1, final double double2, final double double3) {
-        this.setDeltaMovement(double1, double2, double3);
-        if (this.xRotO == 0.0f && this.yRotO == 0.0f) {
-            final float float8 = Mth.sqrt(double1 * double1 + double3 * double3);
-            this.yRot = (float)(Mth.atan2(double1, double3) * 57.2957763671875);
-            this.xRot = (float)(Mth.atan2(double2, float8) * 57.2957763671875);
-            this.yRotO = this.yRot;
-            this.xRotO = this.xRot;
-        }
-    }
-    
     @Override
     public void tick() {
         super.tick();
         if (this.isAttachedToEntity()) {
             if (this.attachedToEntity == null) {
-                final Entity akq2;
+                final Entity aom3;
                 this.entityData.<OptionalInt>get(FireworkRocketEntity.DATA_ATTACHED_TO_TARGET).ifPresent(integer -> {
-                    akq2 = this.level.getEntity(integer);
-                    if (akq2 instanceof LivingEntity) {
-                        this.attachedToEntity = (LivingEntity)akq2;
+                    aom3 = this.level.getEntity(integer);
+                    if (aom3 instanceof LivingEntity) {
+                        this.attachedToEntity = (LivingEntity)aom3;
                     }
                     return;
                 });
             }
             if (this.attachedToEntity != null) {
                 if (this.attachedToEntity.isFallFlying()) {
-                    final Vec3 cvl2 = this.attachedToEntity.getLookAngle();
+                    final Vec3 dem2 = this.attachedToEntity.getLookAngle();
                     final double double3 = 1.5;
                     final double double4 = 0.1;
-                    final Vec3 cvl3 = this.attachedToEntity.getDeltaMovement();
-                    this.attachedToEntity.setDeltaMovement(cvl3.add(cvl2.x * 0.1 + (cvl2.x * 1.5 - cvl3.x) * 0.5, cvl2.y * 0.1 + (cvl2.y * 1.5 - cvl3.y) * 0.5, cvl2.z * 0.1 + (cvl2.z * 1.5 - cvl3.z) * 0.5));
+                    final Vec3 dem3 = this.attachedToEntity.getDeltaMovement();
+                    this.attachedToEntity.setDeltaMovement(dem3.add(dem2.x * 0.1 + (dem2.x * 1.5 - dem3.x) * 0.5, dem2.y * 0.1 + (dem2.y * 1.5 - dem3.y) * 0.5, dem2.z * 0.1 + (dem2.z * 1.5 - dem3.z) * 0.5));
                 }
                 this.setPos(this.attachedToEntity.getX(), this.attachedToEntity.getY(), this.attachedToEntity.getZ());
                 this.setDeltaMovement(this.attachedToEntity.getDeltaMovement());
@@ -128,31 +127,16 @@ public class FireworkRocketEntity extends Entity implements ItemSupplier, Projec
             if (!this.isShotAtAngle()) {
                 this.setDeltaMovement(this.getDeltaMovement().multiply(1.15, 1.0, 1.15).add(0.0, 0.04, 0.0));
             }
-            this.move(MoverType.SELF, this.getDeltaMovement());
+            final Vec3 dem2 = this.getDeltaMovement();
+            this.move(MoverType.SELF, dem2);
+            this.setDeltaMovement(dem2);
         }
-        final Vec3 cvl2 = this.getDeltaMovement();
-        final HitResult cvi3 = ProjectileUtil.getHitResult(this, this.getBoundingBox().expandTowards(cvl2).inflate(1.0), akq -> !akq.isSpectator() && akq.isAlive() && akq.isPickable(), ClipContext.Block.COLLIDER, true);
+        final HitResult dej2 = ProjectileUtil.getHitResult(this, this::canHitEntity, ClipContext.Block.COLLIDER);
         if (!this.noPhysics) {
-            this.performHitChecks(cvi3);
+            this.onHit(dej2);
             this.hasImpulse = true;
         }
-        final float float4 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl2));
-        this.yRot = (float)(Mth.atan2(cvl2.x, cvl2.z) * 57.2957763671875);
-        this.xRot = (float)(Mth.atan2(cvl2.y, float4) * 57.2957763671875);
-        while (this.xRot - this.xRotO < -180.0f) {
-            this.xRotO -= 360.0f;
-        }
-        while (this.xRot - this.xRotO >= 180.0f) {
-            this.xRotO += 360.0f;
-        }
-        while (this.yRot - this.yRotO < -180.0f) {
-            this.yRotO -= 360.0f;
-        }
-        while (this.yRot - this.yRotO >= 180.0f) {
-            this.yRotO += 360.0f;
-        }
-        this.xRot = Mth.lerp(0.2f, this.xRotO, this.xRot);
-        this.yRot = Mth.lerp(0.2f, this.yRotO, this.yRot);
+        this.updateRotation();
         if (this.life == 0 && !this.isSilent()) {
             this.level.playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.FIREWORK_ROCKET_LAUNCH, SoundSource.AMBIENT, 3.0f, 1.0f);
         }
@@ -171,59 +155,59 @@ public class FireworkRocketEntity extends Entity implements ItemSupplier, Projec
         this.remove();
     }
     
-    protected void performHitChecks(final HitResult cvi) {
-        if (cvi.getType() == HitResult.Type.ENTITY && !this.level.isClientSide) {
+    @Override
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        if (this.level.isClientSide) {
+            return;
+        }
+        this.explode();
+    }
+    
+    @Override
+    protected void onHitBlock(final BlockHitResult deh) {
+        final BlockPos fu3 = new BlockPos(deh.getBlockPos());
+        this.level.getBlockState(fu3).entityInside(this.level, fu3, this);
+        if (!this.level.isClientSide() && this.hasExplosion()) {
             this.explode();
         }
-        else if (this.collision) {
-            BlockPos fk3;
-            if (cvi.getType() == HitResult.Type.BLOCK) {
-                fk3 = new BlockPos(((BlockHitResult)cvi).getBlockPos());
-            }
-            else {
-                fk3 = new BlockPos(this);
-            }
-            this.level.getBlockState(fk3).entityInside(this.level, fk3, this);
-            if (this.hasExplosion()) {
-                this.explode();
-            }
-        }
+        super.onHitBlock(deh);
     }
     
     private boolean hasExplosion() {
-        final ItemStack ben2 = this.entityData.<ItemStack>get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
-        final CompoundTag jt3 = ben2.isEmpty() ? null : ben2.getTagElement("Fireworks");
-        final ListTag jz4 = (jt3 != null) ? jt3.getList("Explosions", 10) : null;
-        return jz4 != null && !jz4.isEmpty();
+        final ItemStack bki2 = this.entityData.<ItemStack>get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
+        final CompoundTag le3 = bki2.isEmpty() ? null : bki2.getTagElement("Fireworks");
+        final ListTag lk4 = (le3 != null) ? le3.getList("Explosions", 10) : null;
+        return lk4 != null && !lk4.isEmpty();
     }
     
     private void dealExplosionDamage() {
         float float2 = 0.0f;
-        final ItemStack ben3 = this.entityData.<ItemStack>get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
-        final CompoundTag jt4 = ben3.isEmpty() ? null : ben3.getTagElement("Fireworks");
-        final ListTag jz5 = (jt4 != null) ? jt4.getList("Explosions", 10) : null;
-        if (jz5 != null && !jz5.isEmpty()) {
-            float2 = 5.0f + jz5.size() * 2;
+        final ItemStack bki3 = this.entityData.<ItemStack>get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
+        final CompoundTag le4 = bki3.isEmpty() ? null : bki3.getTagElement("Fireworks");
+        final ListTag lk5 = (le4 != null) ? le4.getList("Explosions", 10) : null;
+        if (lk5 != null && !lk5.isEmpty()) {
+            float2 = 5.0f + lk5.size() * 2;
         }
         if (float2 > 0.0f) {
             if (this.attachedToEntity != null) {
-                this.attachedToEntity.hurt(DamageSource.FIREWORKS, 5.0f + jz5.size() * 2);
+                this.attachedToEntity.hurt(DamageSource.fireworks(this, this.getOwner()), 5.0f + lk5.size() * 2);
             }
             final double double6 = 5.0;
-            final Vec3 cvl8 = this.position();
+            final Vec3 dem8 = this.position();
             final List<LivingEntity> list9 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, this.getBoundingBox().inflate(5.0));
-            for (final LivingEntity akz11 : list9) {
-                if (akz11 == this.attachedToEntity) {
+            for (final LivingEntity aoy11 : list9) {
+                if (aoy11 == this.attachedToEntity) {
                     continue;
                 }
-                if (this.distanceToSqr(akz11) > 25.0) {
+                if (this.distanceToSqr(aoy11) > 25.0) {
                     continue;
                 }
                 boolean boolean12 = false;
                 for (int integer13 = 0; integer13 < 2; ++integer13) {
-                    final Vec3 cvl9 = new Vec3(akz11.getX(), akz11.getY(0.5 * integer13), akz11.getZ());
-                    final HitResult cvi15 = this.level.clip(new ClipContext(cvl8, cvl9, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this));
-                    if (cvi15.getType() == HitResult.Type.MISS) {
+                    final Vec3 dem9 = new Vec3(aoy11.getX(), aoy11.getY(0.5 * integer13), aoy11.getZ());
+                    final HitResult dej15 = this.level.clip(new ClipContext(dem8, dem9, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this));
+                    if (dej15.getType() == HitResult.Type.MISS) {
                         boolean12 = true;
                         break;
                     }
@@ -231,8 +215,8 @@ public class FireworkRocketEntity extends Entity implements ItemSupplier, Projec
                 if (!boolean12) {
                     continue;
                 }
-                final float float3 = float2 * (float)Math.sqrt((5.0 - this.distanceTo(akz11)) / 5.0);
-                akz11.hurt(DamageSource.FIREWORKS, float3);
+                final float float3 = float2 * (float)Math.sqrt((5.0 - this.distanceTo(aoy11)) / 5.0);
+                aoy11.hurt(DamageSource.fireworks(this, this.getOwner()), float3);
             }
         }
     }
@@ -254,41 +238,43 @@ public class FireworkRocketEntity extends Entity implements ItemSupplier, Projec
                 }
             }
             else {
-                final ItemStack ben3 = this.entityData.<ItemStack>get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
-                final CompoundTag jt4 = ben3.isEmpty() ? null : ben3.getTagElement("Fireworks");
-                final Vec3 cvl5 = this.getDeltaMovement();
-                this.level.createFireworks(this.getX(), this.getY(), this.getZ(), cvl5.x, cvl5.y, cvl5.z, jt4);
+                final ItemStack bki3 = this.entityData.<ItemStack>get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
+                final CompoundTag le4 = bki3.isEmpty() ? null : bki3.getTagElement("Fireworks");
+                final Vec3 dem5 = this.getDeltaMovement();
+                this.level.createFireworks(this.getX(), this.getY(), this.getZ(), dem5.x, dem5.y, dem5.z, le4);
             }
         }
         super.handleEntityEvent(byte1);
     }
     
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putInt("Life", this.life);
-        jt.putInt("LifeTime", this.lifetime);
-        final ItemStack ben3 = this.entityData.<ItemStack>get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
-        if (!ben3.isEmpty()) {
-            jt.put("FireworksItem", ben3.save(new CompoundTag()));
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Life", this.life);
+        le.putInt("LifeTime", this.lifetime);
+        final ItemStack bki3 = this.entityData.<ItemStack>get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
+        if (!bki3.isEmpty()) {
+            le.put("FireworksItem", bki3.save(new CompoundTag()));
         }
-        jt.putBoolean("ShotAtAngle", this.entityData.<Boolean>get(FireworkRocketEntity.DATA_SHOT_AT_ANGLE));
+        le.putBoolean("ShotAtAngle", this.entityData.<Boolean>get(FireworkRocketEntity.DATA_SHOT_AT_ANGLE));
     }
     
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        this.life = jt.getInt("Life");
-        this.lifetime = jt.getInt("LifeTime");
-        final ItemStack ben3 = ItemStack.of(jt.getCompound("FireworksItem"));
-        if (!ben3.isEmpty()) {
-            this.entityData.<ItemStack>set(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM, ben3);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.life = le.getInt("Life");
+        this.lifetime = le.getInt("LifeTime");
+        final ItemStack bki3 = ItemStack.of(le.getCompound("FireworksItem"));
+        if (!bki3.isEmpty()) {
+            this.entityData.<ItemStack>set(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM, bki3);
         }
-        if (jt.contains("ShotAtAngle")) {
-            this.entityData.<Boolean>set(FireworkRocketEntity.DATA_SHOT_AT_ANGLE, jt.getBoolean("ShotAtAngle"));
+        if (le.contains("ShotAtAngle")) {
+            this.entityData.<Boolean>set(FireworkRocketEntity.DATA_SHOT_AT_ANGLE, le.getBoolean("ShotAtAngle"));
         }
     }
     
     @Override
     public ItemStack getItem() {
-        final ItemStack ben2 = this.entityData.<ItemStack>get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
-        return ben2.isEmpty() ? new ItemStack(Items.FIREWORK_ROCKET) : ben2;
+        final ItemStack bki2 = this.entityData.<ItemStack>get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
+        return bki2.isEmpty() ? new ItemStack(Items.FIREWORK_ROCKET) : bki2;
     }
     
     @Override
@@ -301,21 +287,6 @@ public class FireworkRocketEntity extends Entity implements ItemSupplier, Projec
         return new ClientboundAddEntityPacket(this);
     }
     
-    @Override
-    public void shoot(double double1, double double2, double double3, final float float4, final float float5) {
-        final float float6 = Mth.sqrt(double1 * double1 + double2 * double2 + double3 * double3);
-        double1 /= float6;
-        double2 /= float6;
-        double3 /= float6;
-        double1 += this.random.nextGaussian() * 0.007499999832361937 * float5;
-        double2 += this.random.nextGaussian() * 0.007499999832361937 * float5;
-        double3 += this.random.nextGaussian() * 0.007499999832361937 * float5;
-        double1 *= float4;
-        double2 *= float4;
-        double3 *= float4;
-        this.setDeltaMovement(double1, double2, double3);
-    }
-    
     static {
         DATA_ID_FIREWORKS_ITEM = SynchedEntityData.<ItemStack>defineId(FireworkRocketEntity.class, EntityDataSerializers.ITEM_STACK);
         DATA_ATTACHED_TO_TARGET = SynchedEntityData.<OptionalInt>defineId(FireworkRocketEntity.class, EntityDataSerializers.OPTIONAL_UNSIGNED_INT);
diff --git a/src/net/minecraft/world/entity/fishing/FishingHook.java b/src/net/minecraft/world/entity/projectile/FishingHook.java
similarity index 51%
rename from src/net/minecraft/world/entity/fishing/FishingHook.java
rename to src/net/minecraft/world/entity/projectile/FishingHook.java
index 9997430..d7c6f1d 100644
--- a/src/net/minecraft/world/entity/fishing/FishingHook.java
+++ b/src/net/minecraft/world/entity/projectile/FishingHook.java
@@ -1,4 +1,4 @@
-package net.minecraft.world.entity.fishing;
+package net.minecraft.world.entity.projectile;
 
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
@@ -9,6 +9,7 @@ import java.util.Iterator;
 import java.util.List;
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.stats.Stats;
+import net.minecraft.world.item.Item;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.entity.ExperienceOrb;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
@@ -20,83 +21,91 @@ import java.util.Collections;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.block.Block;
+import java.util.function.Function;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.entity.projectile.ProjectileUtil;
-import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.MoverType;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.network.syncher.EntityDataAccessor;
+import java.util.Random;
 
-public class FishingHook extends Entity {
+public class FishingHook extends Projectile {
+    private final Random syncronizedRandom;
+    private boolean biting;
+    private int outOfWaterTime;
     private static final EntityDataAccessor<Integer> DATA_HOOKED_ENTITY;
-    private boolean inGround;
+    private static final EntityDataAccessor<Boolean> DATA_BITING;
     private int life;
-    private final Player owner;
-    private int flightTime;
     private int nibble;
     private int timeUntilLured;
     private int timeUntilHooked;
     private float fishAngle;
-    public Entity hookedIn;
+    private boolean openWater;
+    private Entity hookedIn;
     private FishHookState currentState;
     private final int luck;
     private final int lureSpeed;
     
-    private FishingHook(final Level bjw, final Player ayj, final int integer3, final int integer4) {
-        super(EntityType.FISHING_BOBBER, bjw);
+    private FishingHook(final Level bqb, final Player bec, final int integer3, final int integer4) {
+        super(EntityType.FISHING_BOBBER, bqb);
+        this.syncronizedRandom = new Random();
+        this.openWater = true;
         this.currentState = FishHookState.FLYING;
         this.noCulling = true;
-        this.owner = ayj;
-        this.owner.fishing = this;
+        this.setOwner(bec);
+        bec.fishing = this;
         this.luck = Math.max(0, integer3);
         this.lureSpeed = Math.max(0, integer4);
     }
     
-    public FishingHook(final Level bjw, final Player ayj, final double double3, final double double4, final double double5) {
-        this(bjw, ayj, 0, 0);
+    public FishingHook(final Level bqb, final Player bec, final double double3, final double double4, final double double5) {
+        this(bqb, bec, 0, 0);
         this.setPos(double3, double4, double5);
         this.xo = this.getX();
         this.yo = this.getY();
         this.zo = this.getZ();
     }
     
-    public FishingHook(final Player ayj, final Level bjw, final int integer3, final int integer4) {
-        this(bjw, ayj, integer3, integer4);
-        final float float6 = this.owner.xRot;
-        final float float7 = this.owner.yRot;
+    public FishingHook(final Player bec, final Level bqb, final int integer3, final int integer4) {
+        this(bqb, bec, integer3, integer4);
+        final float float6 = bec.xRot;
+        final float float7 = bec.yRot;
         final float float8 = Mth.cos(-float7 * 0.017453292f - 3.1415927f);
         final float float9 = Mth.sin(-float7 * 0.017453292f - 3.1415927f);
         final float float10 = -Mth.cos(-float6 * 0.017453292f);
         final float float11 = Mth.sin(-float6 * 0.017453292f);
-        final double double12 = this.owner.getX() - float9 * 0.3;
-        final double double13 = this.owner.getEyeY();
-        final double double14 = this.owner.getZ() - float8 * 0.3;
+        final double double12 = bec.getX() - float9 * 0.3;
+        final double double13 = bec.getEyeY();
+        final double double14 = bec.getZ() - float8 * 0.3;
         this.moveTo(double12, double13, double14, float7, float6);
-        Vec3 cvl18 = new Vec3(-float9, Mth.clamp(-(float11 / float10), -5.0f, 5.0f), -float8);
-        final double double15 = cvl18.length();
-        cvl18 = cvl18.multiply(0.6 / double15 + 0.5 + this.random.nextGaussian() * 0.0045, 0.6 / double15 + 0.5 + this.random.nextGaussian() * 0.0045, 0.6 / double15 + 0.5 + this.random.nextGaussian() * 0.0045);
-        this.setDeltaMovement(cvl18);
-        this.yRot = (float)(Mth.atan2(cvl18.x, cvl18.z) * 57.2957763671875);
-        this.xRot = (float)(Mth.atan2(cvl18.y, Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl18))) * 57.2957763671875);
+        Vec3 dem18 = new Vec3(-float9, Mth.clamp(-(float11 / float10), -5.0f, 5.0f), -float8);
+        final double double15 = dem18.length();
+        dem18 = dem18.multiply(0.6 / double15 + 0.5 + this.random.nextGaussian() * 0.0045, 0.6 / double15 + 0.5 + this.random.nextGaussian() * 0.0045, 0.6 / double15 + 0.5 + this.random.nextGaussian() * 0.0045);
+        this.setDeltaMovement(dem18);
+        this.yRot = (float)(Mth.atan2(dem18.x, dem18.z) * 57.2957763671875);
+        this.xRot = (float)(Mth.atan2(dem18.y, Mth.sqrt(Entity.getHorizontalDistanceSqr(dem18))) * 57.2957763671875);
         this.yRotO = this.yRot;
         this.xRotO = this.xRot;
     }
@@ -104,15 +113,22 @@ public class FishingHook extends Entity {
     @Override
     protected void defineSynchedData() {
         this.getEntityData().<Integer>define(FishingHook.DATA_HOOKED_ENTITY, 0);
+        this.getEntityData().<Boolean>define(FishingHook.DATA_BITING, false);
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        if (FishingHook.DATA_HOOKED_ENTITY.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        if (FishingHook.DATA_HOOKED_ENTITY.equals(tq)) {
             final int integer3 = this.getEntityData().<Integer>get(FishingHook.DATA_HOOKED_ENTITY);
             this.hookedIn = ((integer3 > 0) ? this.level.getEntity(integer3 - 1) : null);
         }
-        super.onSyncedDataUpdated(sb);
+        if (FishingHook.DATA_BITING.equals(tq)) {
+            this.biting = this.getEntityData().<Boolean>get(FishingHook.DATA_BITING);
+            if (this.biting) {
+                this.setDeltaMovement(this.getDeltaMovement().x, -0.4f * Mth.nextFloat(this.syncronizedRandom, 0.6f, 1.0f), this.getDeltaMovement().z);
+            }
+        }
+        super.onSyncedDataUpdated(tq);
     }
     
     @Override
@@ -127,48 +143,45 @@ public class FishingHook extends Entity {
     
     @Override
     public void tick() {
+        this.syncronizedRandom.setSeed(this.getUUID().getLeastSignificantBits() ^ this.level.getGameTime());
         super.tick();
-        if (this.owner == null) {
+        final Player bec2 = this.getPlayerOwner();
+        if (bec2 == null) {
             this.remove();
             return;
         }
-        if (!this.level.isClientSide && this.shouldStopFishing()) {
+        if (!this.level.isClientSide && this.shouldStopFishing(bec2)) {
             return;
         }
-        if (this.inGround) {
+        if (this.onGround) {
             ++this.life;
             if (this.life >= 1200) {
                 this.remove();
                 return;
             }
         }
-        float float2 = 0.0f;
-        final BlockPos fk3 = new BlockPos(this);
-        final FluidState coj4 = this.level.getFluidState(fk3);
-        if (coj4.is(FluidTags.WATER)) {
-            float2 = coj4.getHeight(this.level, fk3);
+        else {
+            this.life = 0;
         }
+        float float3 = 0.0f;
+        final BlockPos fu4 = this.blockPosition();
+        final FluidState cxa5 = this.level.getFluidState(fu4);
+        if (cxa5.is(FluidTags.WATER)) {
+            float3 = cxa5.getHeight(this.level, fu4);
+        }
+        final boolean boolean6 = float3 > 0.0f;
         if (this.currentState == FishHookState.FLYING) {
             if (this.hookedIn != null) {
                 this.setDeltaMovement(Vec3.ZERO);
                 this.currentState = FishHookState.HOOKED_IN_ENTITY;
                 return;
             }
-            if (float2 > 0.0f) {
+            if (boolean6) {
                 this.setDeltaMovement(this.getDeltaMovement().multiply(0.3, 0.2, 0.3));
                 this.currentState = FishHookState.BOBBING;
                 return;
             }
-            if (!this.level.isClientSide) {
-                this.checkCollision();
-            }
-            if (this.inGround || this.onGround || this.horizontalCollision) {
-                this.flightTime = 0;
-                this.setDeltaMovement(Vec3.ZERO);
-            }
-            else {
-                ++this.flightTime;
-            }
+            this.checkCollision();
         }
         else {
             if (this.currentState == FishHookState.HOOKED_IN_ENTITY) {
@@ -184,85 +197,94 @@ public class FishingHook extends Entity {
                 return;
             }
             if (this.currentState == FishHookState.BOBBING) {
-                final Vec3 cvl5 = this.getDeltaMovement();
-                double double6 = this.getY() + cvl5.y - fk3.getY() - float2;
-                if (Math.abs(double6) < 0.01) {
-                    double6 += Math.signum(double6) * 0.1;
+                final Vec3 dem7 = this.getDeltaMovement();
+                double double8 = this.getY() + dem7.y - fu4.getY() - float3;
+                if (Math.abs(double8) < 0.01) {
+                    double8 += Math.signum(double8) * 0.1;
                 }
-                this.setDeltaMovement(cvl5.x * 0.9, cvl5.y - double6 * this.random.nextFloat() * 0.2, cvl5.z * 0.9);
-                if (!this.level.isClientSide && float2 > 0.0f) {
-                    this.catchingFish(fk3);
+                this.setDeltaMovement(dem7.x * 0.9, dem7.y - double8 * this.random.nextFloat() * 0.2, dem7.z * 0.9);
+                if (this.nibble > 0 || this.timeUntilHooked > 0) {
+                    this.openWater = (this.openWater && this.outOfWaterTime < 10 && this.calculateOpenWater(fu4));
+                }
+                else {
+                    this.openWater = true;
+                }
+                if (boolean6) {
+                    this.outOfWaterTime = Math.max(0, this.outOfWaterTime - 1);
+                    if (this.biting) {
+                        this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.1 * this.syncronizedRandom.nextFloat() * this.syncronizedRandom.nextFloat(), 0.0));
+                    }
+                    if (!this.level.isClientSide) {
+                        this.catchingFish(fu4);
+                    }
+                }
+                else {
+                    this.outOfWaterTime = Math.min(10, this.outOfWaterTime + 1);
                 }
             }
         }
-        if (!coj4.is(FluidTags.WATER)) {
+        if (!cxa5.is(FluidTags.WATER)) {
             this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.03, 0.0));
         }
         this.move(MoverType.SELF, this.getDeltaMovement());
         this.updateRotation();
-        final double double7 = 0.92;
+        if (this.currentState == FishHookState.FLYING && (this.onGround || this.horizontalCollision)) {
+            this.setDeltaMovement(Vec3.ZERO);
+        }
+        final double double9 = 0.92;
         this.setDeltaMovement(this.getDeltaMovement().scale(0.92));
         this.reapplyPosition();
     }
     
-    private boolean shouldStopFishing() {
-        final ItemStack ben2 = this.owner.getMainHandItem();
-        final ItemStack ben3 = this.owner.getOffhandItem();
-        final boolean boolean4 = ben2.getItem() == Items.FISHING_ROD;
-        final boolean boolean5 = ben3.getItem() == Items.FISHING_ROD;
-        if (this.owner.removed || !this.owner.isAlive() || (!boolean4 && !boolean5) || this.distanceToSqr(this.owner) > 1024.0) {
+    private boolean shouldStopFishing(final Player bec) {
+        final ItemStack bki3 = bec.getMainHandItem();
+        final ItemStack bki4 = bec.getOffhandItem();
+        final boolean boolean5 = bki3.getItem() == Items.FISHING_ROD;
+        final boolean boolean6 = bki4.getItem() == Items.FISHING_ROD;
+        if (bec.removed || !bec.isAlive() || (!boolean5 && !boolean6) || this.distanceToSqr(bec) > 1024.0) {
             this.remove();
             return true;
         }
         return false;
     }
     
-    private void updateRotation() {
-        final Vec3 cvl2 = this.getDeltaMovement();
-        final float float3 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl2));
-        this.yRot = (float)(Mth.atan2(cvl2.x, cvl2.z) * 57.2957763671875);
-        this.xRot = (float)(Mth.atan2(cvl2.y, float3) * 57.2957763671875);
-        while (this.xRot - this.xRotO < -180.0f) {
-            this.xRotO -= 360.0f;
-        }
-        while (this.xRot - this.xRotO >= 180.0f) {
-            this.xRotO += 360.0f;
-        }
-        while (this.yRot - this.yRotO < -180.0f) {
-            this.yRotO -= 360.0f;
-        }
-        while (this.yRot - this.yRotO >= 180.0f) {
-            this.yRotO += 360.0f;
-        }
-        this.xRot = Mth.lerp(0.2f, this.xRotO, this.xRot);
-        this.yRot = Mth.lerp(0.2f, this.yRotO, this.yRot);
+    private void checkCollision() {
+        final HitResult dej2 = ProjectileUtil.getHitResult(this, this::canHitEntity, ClipContext.Block.COLLIDER);
+        this.onHit(dej2);
     }
     
-    private void checkCollision() {
-        final HitResult cvi2 = ProjectileUtil.getHitResult(this, this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(1.0), akq -> !akq.isSpectator() && (akq.isPickable() || akq instanceof ItemEntity) && (akq != this.owner || this.flightTime >= 5), ClipContext.Block.COLLIDER, true);
-        if (cvi2.getType() != HitResult.Type.MISS) {
-            if (cvi2.getType() == HitResult.Type.ENTITY) {
-                this.hookedIn = ((EntityHitResult)cvi2).getEntity();
-                this.setHookedEntity();
-            }
-            else {
-                this.inGround = true;
-            }
+    @Override
+    protected boolean canHitEntity(final Entity aom) {
+        return super.canHitEntity(aom) || (aom.isAlive() && aom instanceof ItemEntity);
+    }
+    
+    @Override
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        if (!this.level.isClientSide) {
+            this.hookedIn = dei.getEntity();
+            this.setHookedEntity();
         }
     }
     
+    @Override
+    protected void onHitBlock(final BlockHitResult deh) {
+        super.onHitBlock(deh);
+        this.setDeltaMovement(this.getDeltaMovement().normalize().scale(deh.distanceTo(this)));
+    }
+    
     private void setHookedEntity() {
         this.getEntityData().<Integer>set(FishingHook.DATA_HOOKED_ENTITY, this.hookedIn.getId() + 1);
     }
     
-    private void catchingFish(final BlockPos fk) {
-        final ServerLevel xd3 = (ServerLevel)this.level;
+    private void catchingFish(final BlockPos fu) {
+        final ServerLevel zd3 = (ServerLevel)this.level;
         int integer4 = 1;
-        final BlockPos fk2 = fk.above();
-        if (this.random.nextFloat() < 0.25f && this.level.isRainingAt(fk2)) {
+        final BlockPos fu2 = fu.above();
+        if (this.random.nextFloat() < 0.25f && this.level.isRainingAt(fu2)) {
             ++integer4;
         }
-        if (this.random.nextFloat() < 0.5f && !this.level.canSeeSky(fk2)) {
+        if (this.random.nextFloat() < 0.5f && !this.level.canSeeSky(fu2)) {
             --integer4;
         }
         if (this.nibble > 0) {
@@ -270,9 +292,7 @@ public class FishingHook extends Entity {
             if (this.nibble <= 0) {
                 this.timeUntilLured = 0;
                 this.timeUntilHooked = 0;
-            }
-            else {
-                this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.2 * this.random.nextFloat() * this.random.nextFloat(), 0.0));
+                this.getEntityData().<Boolean>set(FishingHook.DATA_BITING, false);
             }
         }
         else if (this.timeUntilHooked > 0) {
@@ -285,25 +305,24 @@ public class FishingHook extends Entity {
                 final double double9 = this.getX() + float7 * this.timeUntilHooked * 0.1f;
                 final double double10 = Mth.floor(this.getY()) + 1.0f;
                 final double double11 = this.getZ() + float8 * this.timeUntilHooked * 0.1f;
-                final Block bph15 = xd3.getBlockState(new BlockPos(double9, double10 - 1.0, double11)).getBlock();
-                if (bph15 == Blocks.WATER) {
+                final BlockState cfj15 = zd3.getBlockState(new BlockPos(double9, double10 - 1.0, double11));
+                if (cfj15.is(Blocks.WATER)) {
                     if (this.random.nextFloat() < 0.15f) {
-                        xd3.<SimpleParticleType>sendParticles(ParticleTypes.BUBBLE, double9, double10 - 0.10000000149011612, double11, 1, float7, 0.1, float8, 0.0);
+                        zd3.<SimpleParticleType>sendParticles(ParticleTypes.BUBBLE, double9, double10 - 0.10000000149011612, double11, 1, float7, 0.1, float8, 0.0);
                     }
                     final float float9 = float7 * 0.04f;
                     final float float10 = float8 * 0.04f;
-                    xd3.<SimpleParticleType>sendParticles(ParticleTypes.FISHING, double9, double10, double11, 0, float10, 0.01, -float9, 1.0);
-                    xd3.<SimpleParticleType>sendParticles(ParticleTypes.FISHING, double9, double10, double11, 0, -float10, 0.01, float9, 1.0);
+                    zd3.<SimpleParticleType>sendParticles(ParticleTypes.FISHING, double9, double10, double11, 0, float10, 0.01, -float9, 1.0);
+                    zd3.<SimpleParticleType>sendParticles(ParticleTypes.FISHING, double9, double10, double11, 0, -float10, 0.01, float9, 1.0);
                 }
             }
             else {
-                final Vec3 cvl6 = this.getDeltaMovement();
-                this.setDeltaMovement(cvl6.x, -0.4f * Mth.nextFloat(this.random, 0.6f, 1.0f), cvl6.z);
                 this.playSound(SoundEvents.FISHING_BOBBER_SPLASH, 0.25f, 1.0f + (this.random.nextFloat() - this.random.nextFloat()) * 0.4f);
                 final double double12 = this.getY() + 0.5;
-                xd3.<SimpleParticleType>sendParticles(ParticleTypes.BUBBLE, this.getX(), double12, this.getZ(), (int)(1.0f + this.getBbWidth() * 20.0f), this.getBbWidth(), 0.0, this.getBbWidth(), 0.20000000298023224);
-                xd3.<SimpleParticleType>sendParticles(ParticleTypes.FISHING, this.getX(), double12, this.getZ(), (int)(1.0f + this.getBbWidth() * 20.0f), this.getBbWidth(), 0.0, this.getBbWidth(), 0.20000000298023224);
+                zd3.<SimpleParticleType>sendParticles(ParticleTypes.BUBBLE, this.getX(), double12, this.getZ(), (int)(1.0f + this.getBbWidth() * 20.0f), this.getBbWidth(), 0.0, this.getBbWidth(), 0.20000000298023224);
+                zd3.<SimpleParticleType>sendParticles(ParticleTypes.FISHING, this.getX(), double12, this.getZ(), (int)(1.0f + this.getBbWidth() * 20.0f), this.getBbWidth(), 0.0, this.getBbWidth(), 0.20000000298023224);
                 this.nibble = Mth.nextInt(this.random, 20, 40);
+                this.getEntityData().<Boolean>set(FishingHook.DATA_BITING, true);
             }
         }
         else if (this.timeUntilLured > 0) {
@@ -324,9 +343,9 @@ public class FishingHook extends Entity {
                 final double double9 = this.getX() + Mth.sin(float7) * float8 * 0.1f;
                 final double double10 = Mth.floor(this.getY()) + 1.0f;
                 final double double11 = this.getZ() + Mth.cos(float7) * float8 * 0.1f;
-                final Block bph15 = xd3.getBlockState(new BlockPos(double9, double10 - 1.0, double11)).getBlock();
-                if (bph15 == Blocks.WATER) {
-                    xd3.<SimpleParticleType>sendParticles(ParticleTypes.SPLASH, double9, double10, double11, 2 + this.random.nextInt(2), 0.10000000149011612, 0.0, 0.10000000149011612, 0.0);
+                final BlockState cfj15 = zd3.getBlockState(new BlockPos(double9, double10 - 1.0, double11));
+                if (cfj15.is(Blocks.WATER)) {
+                    zd3.<SimpleParticleType>sendParticles(ParticleTypes.SPLASH, double9, double10, double11, 2 + this.random.nextInt(2), 0.10000000149011612, 0.0, 0.10000000149011612, 0.0);
                 }
             }
             if (this.timeUntilLured <= 0) {
@@ -340,48 +359,95 @@ public class FishingHook extends Entity {
         }
     }
     
-    public void addAdditionalSaveData(final CompoundTag jt) {
-    }
-    
-    public void readAdditionalSaveData(final CompoundTag jt) {
-    }
-    
-    public int retrieve(final ItemStack ben) {
-        if (this.level.isClientSide || this.owner == null) {
-            return 0;
-        }
-        int integer3 = 0;
-        if (this.hookedIn != null) {
-            this.bringInHookedEntity();
-            CriteriaTriggers.FISHING_ROD_HOOKED.trigger((ServerPlayer)this.owner, ben, this, Collections.emptyList());
-            this.level.broadcastEntityEvent(this, (byte)31);
-            integer3 = ((this.hookedIn instanceof ItemEntity) ? 3 : 5);
-        }
-        else if (this.nibble > 0) {
-            final LootContext.Builder a4 = new LootContext.Builder((ServerLevel)this.level).<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(this)).<ItemStack>withParameter(LootContextParams.TOOL, ben).withRandom(this.random).withLuck(this.luck + this.owner.getLuck());
-            final LootTable csa5 = this.level.getServer().getLootTables().get(BuiltInLootTables.FISHING);
-            final List<ItemStack> list6 = csa5.getRandomItems(a4.create(LootContextParamSets.FISHING));
-            CriteriaTriggers.FISHING_ROD_HOOKED.trigger((ServerPlayer)this.owner, ben, this, list6);
-            for (final ItemStack ben2 : list6) {
-                final ItemEntity awb9 = new ItemEntity(this.level, this.getX(), this.getY(), this.getZ(), ben2);
-                final double double10 = this.owner.getX() - this.getX();
-                final double double11 = this.owner.getY() - this.getY();
-                final double double12 = this.owner.getZ() - this.getZ();
-                final double double13 = 0.1;
-                awb9.setDeltaMovement(double10 * 0.1, double11 * 0.1 + Math.sqrt(Math.sqrt(double10 * double10 + double11 * double11 + double12 * double12)) * 0.08, double12 * 0.1);
-                this.level.addFreshEntity(awb9);
-                this.owner.level.addFreshEntity(new ExperienceOrb(this.owner.level, this.owner.getX(), this.owner.getY() + 0.5, this.owner.getZ() + 0.5, this.random.nextInt(6) + 1));
-                if (ben2.getItem().is(ItemTags.FISHES)) {
-                    this.owner.awardStat(Stats.FISH_CAUGHT, 1);
+    private boolean calculateOpenWater(final BlockPos fu) {
+        OpenWaterType b3 = OpenWaterType.INVALID;
+        for (int integer4 = -1; integer4 <= 2; ++integer4) {
+            final OpenWaterType b4 = this.getOpenWaterTypeForArea(fu.offset(-2, integer4, -2), fu.offset(2, integer4, 2));
+            switch (b4) {
+                case INVALID: {
+                    return false;
+                }
+                case ABOVE_WATER: {
+                    if (b3 == OpenWaterType.INVALID) {
+                        return false;
+                    }
+                    break;
+                }
+                case INSIDE_WATER: {
+                    if (b3 == OpenWaterType.ABOVE_WATER) {
+                        return false;
+                    }
+                    break;
                 }
             }
-            integer3 = 1;
+            b3 = b4;
         }
-        if (this.inGround) {
-            integer3 = 2;
+        return true;
+    }
+    
+    private OpenWaterType getOpenWaterTypeForArea(final BlockPos fu1, final BlockPos fu2) {
+        return BlockPos.betweenClosedStream(fu1, fu2).<OpenWaterType>map(this::getOpenWaterTypeForBlock).reduce((b1, b2) -> (b1 == b2) ? b1 : OpenWaterType.INVALID).orElse(OpenWaterType.INVALID);
+    }
+    
+    private OpenWaterType getOpenWaterTypeForBlock(final BlockPos fu) {
+        final BlockState cfj3 = this.level.getBlockState(fu);
+        if (cfj3.isAir() || cfj3.is(Blocks.LILY_PAD)) {
+            return OpenWaterType.ABOVE_WATER;
+        }
+        final FluidState cxa4 = cfj3.getFluidState();
+        if (cxa4.is(FluidTags.WATER) && cxa4.isSource() && cfj3.getCollisionShape(this.level, fu).isEmpty()) {
+            return OpenWaterType.INSIDE_WATER;
+        }
+        return OpenWaterType.INVALID;
+    }
+    
+    public boolean isOpenWaterFishing() {
+        return this.openWater;
+    }
+    
+    public void addAdditionalSaveData(final CompoundTag le) {
+    }
+    
+    public void readAdditionalSaveData(final CompoundTag le) {
+    }
+    
+    public int retrieve(final ItemStack bki) {
+        final Player bec3 = this.getPlayerOwner();
+        if (this.level.isClientSide || bec3 == null) {
+            return 0;
+        }
+        int integer4 = 0;
+        if (this.hookedIn != null) {
+            this.bringInHookedEntity();
+            CriteriaTriggers.FISHING_ROD_HOOKED.trigger((ServerPlayer)bec3, bki, this, Collections.emptyList());
+            this.level.broadcastEntityEvent(this, (byte)31);
+            integer4 = ((this.hookedIn instanceof ItemEntity) ? 3 : 5);
+        }
+        else if (this.nibble > 0) {
+            final LootContext.Builder a5 = new LootContext.Builder((ServerLevel)this.level).<BlockPos>withParameter(LootContextParams.BLOCK_POS, this.blockPosition()).<ItemStack>withParameter(LootContextParams.TOOL, bki).<Entity>withParameter(LootContextParams.THIS_ENTITY, this).withRandom(this.random).withLuck(this.luck + bec3.getLuck());
+            final LootTable daw6 = this.level.getServer().getLootTables().get(BuiltInLootTables.FISHING);
+            final List<ItemStack> list7 = daw6.getRandomItems(a5.create(LootContextParamSets.FISHING));
+            CriteriaTriggers.FISHING_ROD_HOOKED.trigger((ServerPlayer)bec3, bki, this, list7);
+            for (final ItemStack bki2 : list7) {
+                final ItemEntity bbg10 = new ItemEntity(this.level, this.getX(), this.getY(), this.getZ(), bki2);
+                final double double11 = bec3.getX() - this.getX();
+                final double double12 = bec3.getY() - this.getY();
+                final double double13 = bec3.getZ() - this.getZ();
+                final double double14 = 0.1;
+                bbg10.setDeltaMovement(double11 * 0.1, double12 * 0.1 + Math.sqrt(Math.sqrt(double11 * double11 + double12 * double12 + double13 * double13)) * 0.08, double13 * 0.1);
+                this.level.addFreshEntity(bbg10);
+                bec3.level.addFreshEntity(new ExperienceOrb(bec3.level, bec3.getX(), bec3.getY() + 0.5, bec3.getZ() + 0.5, this.random.nextInt(6) + 1));
+                if (bki2.getItem().is(ItemTags.FISHES)) {
+                    bec3.awardStat(Stats.FISH_CAUGHT, 1);
+                }
+            }
+            integer4 = 1;
+        }
+        if (this.onGround) {
+            integer4 = 2;
         }
         this.remove();
-        return integer3;
+        return integer4;
     }
     
     @Override
@@ -393,11 +459,12 @@ public class FishingHook extends Entity {
     }
     
     protected void bringInHookedEntity() {
-        if (this.owner == null) {
+        final Entity aom2 = this.getOwner();
+        if (aom2 == null) {
             return;
         }
-        final Vec3 cvl2 = new Vec3(this.owner.getX() - this.getX(), this.owner.getY() - this.getY(), this.owner.getZ() - this.getZ()).scale(0.1);
-        this.hookedIn.setDeltaMovement(this.hookedIn.getDeltaMovement().add(cvl2));
+        final Vec3 dem3 = new Vec3(aom2.getX() - this.getX(), aom2.getY() - this.getY(), aom2.getZ() - this.getZ()).scale(0.1);
+        this.hookedIn.setDeltaMovement(this.hookedIn.getDeltaMovement().add(dem3));
     }
     
     @Override
@@ -408,14 +475,21 @@ public class FishingHook extends Entity {
     @Override
     public void remove() {
         super.remove();
-        if (this.owner != null) {
-            this.owner.fishing = null;
+        final Player bec2 = this.getPlayerOwner();
+        if (bec2 != null) {
+            bec2.fishing = null;
         }
     }
     
     @Nullable
-    public Player getOwner() {
-        return this.owner;
+    public Player getPlayerOwner() {
+        final Entity aom2 = this.getOwner();
+        return (aom2 instanceof Player) ? ((Player)aom2) : null;
+    }
+    
+    @Nullable
+    public Entity getHookedIn() {
+        return this.hookedIn;
     }
     
     @Override
@@ -425,12 +499,13 @@ public class FishingHook extends Entity {
     
     @Override
     public Packet<?> getAddEntityPacket() {
-        final Entity akq2 = this.getOwner();
-        return new ClientboundAddEntityPacket(this, (akq2 == null) ? this.getId() : akq2.getId());
+        final Entity aom2 = this.getOwner();
+        return new ClientboundAddEntityPacket(this, (aom2 == null) ? this.getId() : aom2.getId());
     }
     
     static {
         DATA_HOOKED_ENTITY = SynchedEntityData.<Integer>defineId(FishingHook.class, EntityDataSerializers.INT);
+        DATA_BITING = SynchedEntityData.<Boolean>defineId(FishingHook.class, EntityDataSerializers.BOOLEAN);
     }
     
     enum FishHookState {
@@ -438,4 +513,10 @@ public class FishingHook extends Entity {
         HOOKED_IN_ENTITY, 
         BOBBING;
     }
+    
+    enum OpenWaterType {
+        ABOVE_WATER, 
+        INSIDE_WATER, 
+        INVALID;
+    }
 }
diff --git a/src/net/minecraft/world/entity/projectile/LargeFireball.java b/src/net/minecraft/world/entity/projectile/LargeFireball.java
index 5195c1f..ab3eb03 100644
--- a/src/net/minecraft/world/entity/projectile/LargeFireball.java
+++ b/src/net/minecraft/world/entity/projectile/LargeFireball.java
@@ -1,11 +1,11 @@
 package net.minecraft.world.entity.projectile;
 
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.Explosion;
-import net.minecraft.world.level.GameRules;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.phys.EntityHitResult;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.GameRules;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
@@ -14,30 +14,25 @@ import net.minecraft.world.entity.EntityType;
 public class LargeFireball extends Fireball {
     public int explosionPower;
     
-    public LargeFireball(final EntityType<? extends LargeFireball> aku, final Level bjw) {
-        super(aku, bjw);
+    public LargeFireball(final EntityType<? extends LargeFireball> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.explosionPower = 1;
     }
     
-    public LargeFireball(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(EntityType.FIREBALL, double2, double3, double4, double5, double6, double7, bjw);
+    public LargeFireball(final Level bqb, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(EntityType.FIREBALL, double2, double3, double4, double5, double6, double7, bqb);
         this.explosionPower = 1;
     }
     
-    public LargeFireball(final Level bjw, final LivingEntity akz, final double double3, final double double4, final double double5) {
-        super(EntityType.FIREBALL, akz, double3, double4, double5, bjw);
+    public LargeFireball(final Level bqb, final LivingEntity aoy, final double double3, final double double4, final double double5) {
+        super(EntityType.FIREBALL, aoy, double3, double4, double5, bqb);
         this.explosionPower = 1;
     }
     
     @Override
-    protected void onHit(final HitResult cvi) {
-        super.onHit(cvi);
+    protected void onHit(final HitResult dej) {
+        super.onHit(dej);
         if (!this.level.isClientSide) {
-            if (cvi.getType() == HitResult.Type.ENTITY) {
-                final Entity akq3 = ((EntityHitResult)cvi).getEntity();
-                akq3.hurt(DamageSource.fireball(this, this.owner), 6.0f);
-                this.doEnchantDamageEffects(this.owner, akq3);
-            }
             final boolean boolean3 = this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
             this.level.explode(null, this.getX(), this.getY(), this.getZ(), (float)this.explosionPower, boolean3, boolean3 ? Explosion.BlockInteraction.DESTROY : Explosion.BlockInteraction.NONE);
             this.remove();
@@ -45,16 +40,30 @@ public class LargeFireball extends Fireball {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("ExplosionPower", this.explosionPower);
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        if (this.level.isClientSide) {
+            return;
+        }
+        final Entity aom3 = dei.getEntity();
+        final Entity aom4 = this.getOwner();
+        aom3.hurt(DamageSource.fireball(this, aom4), 6.0f);
+        if (aom4 instanceof LivingEntity) {
+            this.doEnchantDamageEffects((LivingEntity)aom4, aom3);
+        }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("ExplosionPower", 99)) {
-            this.explosionPower = jt.getInt("ExplosionPower");
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("ExplosionPower", this.explosionPower);
+    }
+    
+    @Override
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("ExplosionPower", 99)) {
+            this.explosionPower = le.getInt("ExplosionPower");
         }
     }
 }
diff --git a/src/net/minecraft/world/entity/projectile/LlamaSpit.java b/src/net/minecraft/world/entity/projectile/LlamaSpit.java
index a4022f2..55c1d3f 100644
--- a/src/net/minecraft/world/entity/projectile/LlamaSpit.java
+++ b/src/net/minecraft/world/entity/projectile/LlamaSpit.java
@@ -2,46 +2,39 @@ package net.minecraft.world.entity.projectile;
 
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.Packet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
-import net.minecraft.nbt.Tag;
-import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.util.Mth;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.animal.horse.Llama;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.entity.animal.horse.Llama;
-import net.minecraft.world.entity.Entity;
 
-public class LlamaSpit extends Entity implements Projectile {
-    public Llama owner;
-    private CompoundTag ownerTag;
-    
-    public LlamaSpit(final EntityType<? extends LlamaSpit> aku, final Level bjw) {
-        super(aku, bjw);
+public class LlamaSpit extends Projectile {
+    public LlamaSpit(final EntityType<? extends LlamaSpit> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public LlamaSpit(final Level bjw, final Llama auh) {
-        this(EntityType.LLAMA_SPIT, bjw);
-        this.owner = auh;
-        this.setPos(auh.getX() - (auh.getBbWidth() + 1.0f) * 0.5 * Mth.sin(auh.yBodyRot * 0.017453292f), auh.getEyeY() - 0.10000000149011612, auh.getZ() + (auh.getBbWidth() + 1.0f) * 0.5 * Mth.cos(auh.yBodyRot * 0.017453292f));
+    public LlamaSpit(final Level bqb, final Llama azp) {
+        this(EntityType.LLAMA_SPIT, bqb);
+        super.setOwner(azp);
+        this.setPos(azp.getX() - (azp.getBbWidth() + 1.0f) * 0.5 * Mth.sin(azp.yBodyRot * 0.017453292f), azp.getEyeY() - 0.10000000149011612, azp.getZ() + (azp.getBbWidth() + 1.0f) * 0.5 * Mth.cos(azp.yBodyRot * 0.017453292f));
     }
     
-    public LlamaSpit(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        this(EntityType.LLAMA_SPIT, bjw);
+    public LlamaSpit(final Level bqb, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        this(EntityType.LLAMA_SPIT, bqb);
         this.setPos(double2, double3, double4);
         for (int integer15 = 0; integer15 < 7; ++integer15) {
             final double double8 = 0.4 + 0.1 * integer15;
-            bjw.addParticle(ParticleTypes.SPIT, double2, double3, double4, double5 * double8, double6, double7 * double8);
+            bqb.addParticle(ParticleTypes.SPIT, double2, double3, double4, double5 * double8, double6, double7 * double8);
         }
         this.setDeltaMovement(double5, double6, double7);
     }
@@ -49,37 +42,18 @@ public class LlamaSpit extends Entity implements Projectile {
     @Override
     public void tick() {
         super.tick();
-        if (this.ownerTag != null) {
-            this.restoreOwnerFromSave();
+        final Vec3 dem2 = this.getDeltaMovement();
+        final HitResult dej3 = ProjectileUtil.getHitResult(this, this::canHitEntity, ClipContext.Block.OUTLINE);
+        if (dej3 != null) {
+            this.onHit(dej3);
         }
-        final Vec3 cvl2 = this.getDeltaMovement();
-        final HitResult cvi3 = ProjectileUtil.getHitResult(this, this.getBoundingBox().expandTowards(cvl2).inflate(1.0), akq -> !akq.isSpectator() && akq != this.owner, ClipContext.Block.OUTLINE, true);
-        if (cvi3 != null) {
-            this.onHit(cvi3);
-        }
-        final double double4 = this.getX() + cvl2.x;
-        final double double5 = this.getY() + cvl2.y;
-        final double double6 = this.getZ() + cvl2.z;
-        final float float10 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl2));
-        this.yRot = (float)(Mth.atan2(cvl2.x, cvl2.z) * 57.2957763671875);
-        this.xRot = (float)(Mth.atan2(cvl2.y, float10) * 57.2957763671875);
-        while (this.xRot - this.xRotO < -180.0f) {
-            this.xRotO -= 360.0f;
-        }
-        while (this.xRot - this.xRotO >= 180.0f) {
-            this.xRotO += 360.0f;
-        }
-        while (this.yRot - this.yRotO < -180.0f) {
-            this.yRotO -= 360.0f;
-        }
-        while (this.yRot - this.yRotO >= 180.0f) {
-            this.yRotO += 360.0f;
-        }
-        this.xRot = Mth.lerp(0.2f, this.xRotO, this.xRot);
-        this.yRot = Mth.lerp(0.2f, this.yRotO, this.yRot);
-        final float float11 = 0.99f;
-        final float float12 = 0.06f;
-        if (!this.level.containsMaterial(this.getBoundingBox(), Material.AIR)) {
+        final double double4 = this.getX() + dem2.x;
+        final double double5 = this.getY() + dem2.y;
+        final double double6 = this.getZ() + dem2.z;
+        this.updateRotation();
+        final float float10 = 0.99f;
+        final float float11 = 0.06f;
+        if (this.level.getBlockStates(this.getBoundingBox()).noneMatch(BlockBehaviour.BlockStateBase::isAir)) {
             this.remove();
             return;
         }
@@ -87,7 +61,7 @@ public class LlamaSpit extends Entity implements Projectile {
             this.remove();
             return;
         }
-        this.setDeltaMovement(cvl2.scale(0.9900000095367432));
+        this.setDeltaMovement(dem2.scale(0.9900000095367432));
         if (!this.isNoGravity()) {
             this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.05999999865889549, 0.0));
         }
@@ -95,35 +69,18 @@ public class LlamaSpit extends Entity implements Projectile {
     }
     
     @Override
-    public void lerpMotion(final double double1, final double double2, final double double3) {
-        this.setDeltaMovement(double1, double2, double3);
-        if (this.xRotO == 0.0f && this.yRotO == 0.0f) {
-            final float float8 = Mth.sqrt(double1 * double1 + double3 * double3);
-            this.xRot = (float)(Mth.atan2(double2, float8) * 57.2957763671875);
-            this.yRot = (float)(Mth.atan2(double1, double3) * 57.2957763671875);
-            this.xRotO = this.xRot;
-            this.yRotO = this.yRot;
-            this.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        final Entity aom3 = this.getOwner();
+        if (aom3 instanceof LivingEntity) {
+            dei.getEntity().hurt(DamageSource.indirectMobAttack(this, (LivingEntity)aom3).setProjectile(), 1.0f);
         }
     }
     
     @Override
-    public void shoot(final double double1, final double double2, final double double3, final float float4, final float float5) {
-        final Vec3 cvl10 = new Vec3(double1, double2, double3).normalize().add(this.random.nextGaussian() * 0.007499999832361937 * float5, this.random.nextGaussian() * 0.007499999832361937 * float5, this.random.nextGaussian() * 0.007499999832361937 * float5).scale(float4);
-        this.setDeltaMovement(cvl10);
-        final float float6 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl10));
-        this.yRot = (float)(Mth.atan2(cvl10.x, double3) * 57.2957763671875);
-        this.xRot = (float)(Mth.atan2(cvl10.y, float6) * 57.2957763671875);
-        this.yRotO = this.yRot;
-        this.xRotO = this.xRot;
-    }
-    
-    public void onHit(final HitResult cvi) {
-        final HitResult.Type a3 = cvi.getType();
-        if (a3 == HitResult.Type.ENTITY && this.owner != null) {
-            ((EntityHitResult)cvi).getEntity().hurt(DamageSource.indirectMobAttack(this, this.owner).setProjectile(), 1.0f);
-        }
-        else if (a3 == HitResult.Type.BLOCK && !this.level.isClientSide) {
+    protected void onHitBlock(final BlockHitResult deh) {
+        super.onHitBlock(deh);
+        if (!this.level.isClientSide) {
             this.remove();
         }
     }
@@ -132,37 +89,6 @@ public class LlamaSpit extends Entity implements Projectile {
     protected void defineSynchedData() {
     }
     
-    @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        if (jt.contains("Owner", 10)) {
-            this.ownerTag = jt.getCompound("Owner");
-        }
-    }
-    
-    @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        if (this.owner != null) {
-            final CompoundTag jt2 = new CompoundTag();
-            final UUID uUID4 = this.owner.getUUID();
-            jt2.putUUID("OwnerUUID", uUID4);
-            jt.put("Owner", jt2);
-        }
-    }
-    
-    private void restoreOwnerFromSave() {
-        if (this.ownerTag != null && this.ownerTag.hasUUID("OwnerUUID")) {
-            final UUID uUID2 = this.ownerTag.getUUID("OwnerUUID");
-            final List<Llama> list3 = this.level.<Llama>getEntitiesOfClass(Llama.class, this.getBoundingBox().inflate(15.0));
-            for (final Llama auh5 : list3) {
-                if (auh5.getUUID().equals(uUID2)) {
-                    this.owner = auh5;
-                    break;
-                }
-            }
-        }
-        this.ownerTag = null;
-    }
-    
     @Override
     public Packet<?> getAddEntityPacket() {
         return new ClientboundAddEntityPacket(this);
diff --git a/src/net/minecraft/world/entity/projectile/Projectile.java b/src/net/minecraft/world/entity/projectile/Projectile.java
index 199e05d..583d7c3 100644
--- a/src/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/net/minecraft/world/entity/projectile/Projectile.java
@@ -1,5 +1,158 @@
 package net.minecraft.world.entity.projectile;
 
-public interface Projectile {
-    void shoot(final double double1, final double double2, final double double3, final float float4, final float float5);
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.EntityHitResult;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.util.Mth;
+import net.minecraft.world.phys.Vec3;
+import java.util.Iterator;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.server.level.ServerLevel;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.entity.EntityType;
+import java.util.UUID;
+import net.minecraft.world.entity.Entity;
+
+public abstract class Projectile extends Entity {
+    private UUID ownerUUID;
+    private int ownerNetworkId;
+    private boolean leftOwner;
+    
+    Projectile(final EntityType<? extends Projectile> aoq, final Level bqb) {
+        super(aoq, bqb);
+    }
+    
+    public void setOwner(@Nullable final Entity aom) {
+        if (aom != null) {
+            this.ownerUUID = aom.getUUID();
+            this.ownerNetworkId = aom.getId();
+        }
+    }
+    
+    @Nullable
+    public Entity getOwner() {
+        if (this.ownerUUID != null && this.level instanceof ServerLevel) {
+            return ((ServerLevel)this.level).getEntity(this.ownerUUID);
+        }
+        if (this.ownerNetworkId != 0) {
+            return this.level.getEntity(this.ownerNetworkId);
+        }
+        return null;
+    }
+    
+    @Override
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        if (this.ownerUUID != null) {
+            le.putUUID("Owner", this.ownerUUID);
+        }
+        if (this.leftOwner) {
+            le.putBoolean("LeftOwner", true);
+        }
+    }
+    
+    @Override
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        if (le.hasUUID("Owner")) {
+            this.ownerUUID = le.getUUID("Owner");
+        }
+        this.leftOwner = le.getBoolean("LeftOwner");
+    }
+    
+    @Override
+    public void tick() {
+        if (!this.leftOwner) {
+            this.leftOwner = this.checkLeftOwner();
+        }
+        super.tick();
+    }
+    
+    private boolean checkLeftOwner() {
+        final Entity aom2 = this.getOwner();
+        if (aom2 != null) {
+            for (final Entity aom3 : this.level.getEntities(this, this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(1.0), aom -> !aom.isSpectator() && aom.isPickable())) {
+                if (aom3.getRootVehicle() == aom2.getRootVehicle()) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    
+    public void shoot(final double double1, final double double2, final double double3, final float float4, final float float5) {
+        final Vec3 dem10 = new Vec3(double1, double2, double3).normalize().add(this.random.nextGaussian() * 0.007499999832361937 * float5, this.random.nextGaussian() * 0.007499999832361937 * float5, this.random.nextGaussian() * 0.007499999832361937 * float5).scale(float4);
+        this.setDeltaMovement(dem10);
+        final float float6 = Mth.sqrt(Entity.getHorizontalDistanceSqr(dem10));
+        this.yRot = (float)(Mth.atan2(dem10.x, dem10.z) * 57.2957763671875);
+        this.xRot = (float)(Mth.atan2(dem10.y, float6) * 57.2957763671875);
+        this.yRotO = this.yRot;
+        this.xRotO = this.xRot;
+    }
+    
+    public void shootFromRotation(final Entity aom, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        final float float7 = -Mth.sin(float3 * 0.017453292f) * Mth.cos(float2 * 0.017453292f);
+        final float float8 = -Mth.sin((float2 + float4) * 0.017453292f);
+        final float float9 = Mth.cos(float3 * 0.017453292f) * Mth.cos(float2 * 0.017453292f);
+        this.shoot(float7, float8, float9, float5, float6);
+        final Vec3 dem11 = aom.getDeltaMovement();
+        this.setDeltaMovement(this.getDeltaMovement().add(dem11.x, aom.isOnGround() ? 0.0 : dem11.y, dem11.z));
+    }
+    
+    protected void onHit(final HitResult dej) {
+        final HitResult.Type a3 = dej.getType();
+        if (a3 == HitResult.Type.ENTITY) {
+            this.onHitEntity((EntityHitResult)dej);
+        }
+        else if (a3 == HitResult.Type.BLOCK) {
+            this.onHitBlock((BlockHitResult)dej);
+        }
+    }
+    
+    protected void onHitEntity(final EntityHitResult dei) {
+    }
+    
+    protected void onHitBlock(final BlockHitResult deh) {
+        final BlockHitResult deh2 = deh;
+        final BlockState cfj4 = this.level.getBlockState(deh2.getBlockPos());
+        cfj4.onProjectileHit(this.level, cfj4, deh2, this);
+    }
+    
+    @Override
+    public void lerpMotion(final double double1, final double double2, final double double3) {
+        this.setDeltaMovement(double1, double2, double3);
+        if (this.xRotO == 0.0f && this.yRotO == 0.0f) {
+            final float float8 = Mth.sqrt(double1 * double1 + double3 * double3);
+            this.xRot = (float)(Mth.atan2(double2, float8) * 57.2957763671875);
+            this.yRot = (float)(Mth.atan2(double1, double3) * 57.2957763671875);
+            this.xRotO = this.xRot;
+            this.yRotO = this.yRot;
+            this.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, this.xRot);
+        }
+    }
+    
+    protected boolean canHitEntity(final Entity aom) {
+        if (aom.isSpectator() || !aom.isAlive() || !aom.isPickable()) {
+            return false;
+        }
+        final Entity aom2 = this.getOwner();
+        return aom2 == null || this.leftOwner || !aom2.isPassengerOfSameVehicle(aom);
+    }
+    
+    protected void updateRotation() {
+        final Vec3 dem2 = this.getDeltaMovement();
+        final float float3 = Mth.sqrt(Entity.getHorizontalDistanceSqr(dem2));
+        this.xRot = lerpRotation(this.xRotO, (float)(Mth.atan2(dem2.y, float3) * 57.2957763671875));
+        this.yRot = lerpRotation(this.yRotO, (float)(Mth.atan2(dem2.x, dem2.z) * 57.2957763671875));
+    }
+    
+    protected static float lerpRotation(float float1, final float float2) {
+        while (float2 - float1 < -180.0f) {
+            float1 -= 360.0f;
+        }
+        while (float2 - float1 >= 180.0f) {
+            float1 += 360.0f;
+        }
+        return Mth.lerp(0.2f, float1, float2);
+    }
 }
diff --git a/src/net/minecraft/world/entity/projectile/ProjectileUtil.java b/src/net/minecraft/world/entity/projectile/ProjectileUtil.java
index 6275d31..4034434 100644
--- a/src/net/minecraft/world/entity/projectile/ProjectileUtil.java
+++ b/src/net/minecraft/world/entity/projectile/ProjectileUtil.java
@@ -7,163 +7,138 @@ import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.util.Mth;
+import javax.annotation.Nullable;
 import java.util.Optional;
 import java.util.Iterator;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import java.util.Set;
-import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.Level;
-import java.util.function.Predicate;
 import net.minecraft.world.phys.AABB;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.level.ClipContext;
-import javax.annotation.Nullable;
+import java.util.function.Predicate;
 import net.minecraft.world.entity.Entity;
 
 public final class ProjectileUtil {
-    public static HitResult forwardsRaycast(final Entity akq1, final boolean boolean2, final boolean boolean3, @Nullable final Entity akq4, final ClipContext.Block a) {
-        return forwardsRaycast(akq1, boolean2, boolean3, akq4, a, true, akq3 -> !akq3.isSpectator() && akq3.isPickable() && (boolean3 || !akq3.is(akq4)) && !akq3.noPhysics, akq1.getBoundingBox().expandTowards(akq1.getDeltaMovement()).inflate(1.0));
-    }
-    
-    public static HitResult getHitResult(final Entity akq, final AABB cvf, final Predicate<Entity> predicate, final ClipContext.Block a, final boolean boolean5) {
-        return forwardsRaycast(akq, boolean5, false, null, a, false, predicate, cvf);
+    public static HitResult getHitResult(final Entity aom, final Predicate<Entity> predicate, final ClipContext.Block a) {
+        final Vec3 dem4 = aom.getDeltaMovement();
+        final Level bqb5 = aom.level;
+        final Vec3 dem5 = aom.position();
+        Vec3 dem6 = dem5.add(dem4);
+        HitResult dej8 = bqb5.clip(new ClipContext(dem5, dem6, a, ClipContext.Fluid.NONE, aom));
+        if (dej8.getType() != HitResult.Type.MISS) {
+            dem6 = dej8.getLocation();
+        }
+        final HitResult dej9 = getEntityHitResult(bqb5, aom, dem5, dem6, aom.getBoundingBox().expandTowards(aom.getDeltaMovement()).inflate(1.0), predicate);
+        if (dej9 != null) {
+            dej8 = dej9;
+        }
+        return dej8;
     }
     
     @Nullable
-    public static EntityHitResult getHitResult(final Level bjw, final Entity akq, final Vec3 cvl3, final Vec3 cvl4, final AABB cvf, final Predicate<Entity> predicate) {
-        return getHitResult(bjw, akq, cvl3, cvl4, cvf, predicate, Double.MAX_VALUE);
-    }
-    
-    private static HitResult forwardsRaycast(final Entity akq1, final boolean boolean2, final boolean boolean3, @Nullable final Entity akq4, final ClipContext.Block a, final boolean boolean6, final Predicate<Entity> predicate, final AABB cvf) {
-        final Vec3 cvl9 = akq1.getDeltaMovement();
-        final Level bjw10 = akq1.level;
-        final Vec3 cvl10 = akq1.position();
-        if (boolean6 && !bjw10.noCollision(akq1, akq1.getBoundingBox(), (Set<Entity>)((boolean3 || akq4 == null) ? ImmutableSet.of() : getIgnoredEntities(akq4)))) {
-            return new BlockHitResult(cvl10, Direction.getNearest(cvl9.x, cvl9.y, cvl9.z), new BlockPos(akq1), false);
-        }
-        Vec3 cvl11 = cvl10.add(cvl9);
-        HitResult cvi13 = bjw10.clip(new ClipContext(cvl10, cvl11, a, ClipContext.Fluid.NONE, akq1));
-        if (boolean2) {
-            if (cvi13.getType() != HitResult.Type.MISS) {
-                cvl11 = cvi13.getLocation();
-            }
-            final HitResult cvi14 = getHitResult(bjw10, akq1, cvl10, cvl11, cvf, predicate);
-            if (cvi14 != null) {
-                cvi13 = cvi14;
-            }
-        }
-        return cvi13;
-    }
-    
-    @Nullable
-    public static EntityHitResult getEntityHitResult(final Entity akq, final Vec3 cvl2, final Vec3 cvl3, final AABB cvf, final Predicate<Entity> predicate, final double double6) {
-        final Level bjw8 = akq.level;
+    public static EntityHitResult getEntityHitResult(final Entity aom, final Vec3 dem2, final Vec3 dem3, final AABB deg, final Predicate<Entity> predicate, final double double6) {
+        final Level bqb8 = aom.level;
         double double7 = double6;
-        Entity akq2 = null;
-        Vec3 cvl4 = null;
-        for (final Entity akq3 : bjw8.getEntities(akq, cvf, predicate)) {
-            final AABB cvf2 = akq3.getBoundingBox().inflate(akq3.getPickRadius());
-            final Optional<Vec3> optional16 = cvf2.clip(cvl2, cvl3);
-            if (cvf2.contains(cvl2)) {
+        Entity aom2 = null;
+        Vec3 dem4 = null;
+        for (final Entity aom3 : bqb8.getEntities(aom, deg, predicate)) {
+            final AABB deg2 = aom3.getBoundingBox().inflate(aom3.getPickRadius());
+            final Optional<Vec3> optional16 = deg2.clip(dem2, dem3);
+            if (deg2.contains(dem2)) {
                 if (double7 < 0.0) {
                     continue;
                 }
-                akq2 = akq3;
-                cvl4 = optional16.orElse(cvl2);
+                aom2 = aom3;
+                dem4 = optional16.orElse(dem2);
                 double7 = 0.0;
             }
             else {
                 if (!optional16.isPresent()) {
                     continue;
                 }
-                final Vec3 cvl5 = optional16.get();
-                final double double8 = cvl2.distanceToSqr(cvl5);
+                final Vec3 dem5 = optional16.get();
+                final double double8 = dem2.distanceToSqr(dem5);
                 if (double8 >= double7 && double7 != 0.0) {
                     continue;
                 }
-                if (akq3.getRootVehicle() == akq.getRootVehicle()) {
+                if (aom3.getRootVehicle() == aom.getRootVehicle()) {
                     if (double7 != 0.0) {
                         continue;
                     }
-                    akq2 = akq3;
-                    cvl4 = cvl5;
+                    aom2 = aom3;
+                    dem4 = dem5;
                 }
                 else {
-                    akq2 = akq3;
-                    cvl4 = cvl5;
+                    aom2 = aom3;
+                    dem4 = dem5;
                     double7 = double8;
                 }
             }
         }
-        if (akq2 == null) {
+        if (aom2 == null) {
             return null;
         }
-        return new EntityHitResult(akq2, cvl4);
+        return new EntityHitResult(aom2, dem4);
     }
     
     @Nullable
-    public static EntityHitResult getHitResult(final Level bjw, final Entity akq, final Vec3 cvl3, final Vec3 cvl4, final AABB cvf, final Predicate<Entity> predicate, final double double7) {
-        double double8 = double7;
-        Entity akq2 = null;
-        for (final Entity akq3 : bjw.getEntities(akq, cvf, predicate)) {
-            final AABB cvf2 = akq3.getBoundingBox().inflate(0.30000001192092896);
-            final Optional<Vec3> optional15 = cvf2.clip(cvl3, cvl4);
-            if (optional15.isPresent()) {
-                final double double9 = cvl3.distanceToSqr(optional15.get());
-                if (double9 >= double8) {
+    public static EntityHitResult getEntityHitResult(final Level bqb, final Entity aom, final Vec3 dem3, final Vec3 dem4, final AABB deg, final Predicate<Entity> predicate) {
+        double double7 = Double.MAX_VALUE;
+        Entity aom2 = null;
+        for (final Entity aom3 : bqb.getEntities(aom, deg, predicate)) {
+            final AABB deg2 = aom3.getBoundingBox().inflate(0.30000001192092896);
+            final Optional<Vec3> optional13 = deg2.clip(dem3, dem4);
+            if (optional13.isPresent()) {
+                final double double8 = dem3.distanceToSqr(optional13.get());
+                if (double8 >= double7) {
                     continue;
                 }
-                akq2 = akq3;
-                double8 = double9;
+                aom2 = aom3;
+                double7 = double8;
             }
         }
-        if (akq2 == null) {
+        if (aom2 == null) {
             return null;
         }
-        return new EntityHitResult(akq2);
+        return new EntityHitResult(aom2);
     }
     
-    private static Set<Entity> getIgnoredEntities(final Entity akq) {
-        final Entity akq2 = akq.getVehicle();
-        return (akq2 != null) ? ImmutableSet.<Entity>of(akq, akq2) : ImmutableSet.<Entity>of(akq);
+    public static final void rotateTowardsMovement(final Entity aom, final float float2) {
+        final Vec3 dem3 = aom.getDeltaMovement();
+        if (dem3.lengthSqr() == 0.0) {
+            return;
+        }
+        final float float3 = Mth.sqrt(Entity.getHorizontalDistanceSqr(dem3));
+        aom.yRot = (float)(Mth.atan2(dem3.z, dem3.x) * 57.2957763671875) + 90.0f;
+        aom.xRot = (float)(Mth.atan2(float3, dem3.y) * 57.2957763671875) - 90.0f;
+        while (aom.xRot - aom.xRotO < -180.0f) {
+            aom.xRotO -= 360.0f;
+        }
+        while (aom.xRot - aom.xRotO >= 180.0f) {
+            aom.xRotO += 360.0f;
+        }
+        while (aom.yRot - aom.yRotO < -180.0f) {
+            aom.yRotO -= 360.0f;
+        }
+        while (aom.yRot - aom.yRotO >= 180.0f) {
+            aom.yRotO += 360.0f;
+        }
+        aom.xRot = Mth.lerp(float2, aom.xRotO, aom.xRot);
+        aom.yRot = Mth.lerp(float2, aom.yRotO, aom.yRot);
     }
     
-    public static final void rotateTowardsMovement(final Entity akq, final float float2) {
-        final Vec3 cvl3 = akq.getDeltaMovement();
-        final float float3 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl3));
-        akq.yRot = (float)(Mth.atan2(cvl3.z, cvl3.x) * 57.2957763671875) + 90.0f;
-        akq.xRot = (float)(Mth.atan2(float3, cvl3.y) * 57.2957763671875) - 90.0f;
-        while (akq.xRot - akq.xRotO < -180.0f) {
-            akq.xRotO -= 360.0f;
-        }
-        while (akq.xRot - akq.xRotO >= 180.0f) {
-            akq.xRotO += 360.0f;
-        }
-        while (akq.yRot - akq.yRotO < -180.0f) {
-            akq.yRotO -= 360.0f;
-        }
-        while (akq.yRot - akq.yRotO >= 180.0f) {
-            akq.yRotO += 360.0f;
-        }
-        akq.xRot = Mth.lerp(float2, akq.xRotO, akq.xRot);
-        akq.yRot = Mth.lerp(float2, akq.yRotO, akq.yRot);
+    public static InteractionHand getWeaponHoldingHand(final LivingEntity aoy, final Item bke) {
+        return (aoy.getMainHandItem().getItem() == bke) ? InteractionHand.MAIN_HAND : InteractionHand.OFF_HAND;
     }
     
-    public static InteractionHand getWeaponHoldingHand(final LivingEntity akz, final Item bei) {
-        return (akz.getMainHandItem().getItem() == bei) ? InteractionHand.MAIN_HAND : InteractionHand.OFF_HAND;
-    }
-    
-    public static AbstractArrow getMobArrow(final LivingEntity akz, final ItemStack ben, final float float3) {
-        final ArrowItem bck4 = (ArrowItem)((ben.getItem() instanceof ArrowItem) ? ben.getItem() : Items.ARROW);
-        final AbstractArrow ayn5 = bck4.createArrow(akz.level, ben, akz);
-        ayn5.setEnchantmentEffectsFromEntity(akz, float3);
-        if (ben.getItem() == Items.TIPPED_ARROW && ayn5 instanceof Arrow) {
-            ((Arrow)ayn5).setEffectsFromItem(ben);
+    public static AbstractArrow getMobArrow(final LivingEntity aoy, final ItemStack bki, final float float3) {
+        final ArrowItem bih4 = (ArrowItem)((bki.getItem() instanceof ArrowItem) ? bki.getItem() : Items.ARROW);
+        final AbstractArrow beg5 = bih4.createArrow(aoy.level, bki, aoy);
+        beg5.setEnchantmentEffectsFromEntity(aoy, float3);
+        if (bki.getItem() == Items.TIPPED_ARROW && beg5 instanceof Arrow) {
+            ((Arrow)beg5).setEffectsFromItem(bki);
         }
-        return ayn5;
+        return beg5;
     }
 }
diff --git a/src/net/minecraft/world/entity/projectile/ShulkerBullet.java b/src/net/minecraft/world/entity/projectile/ShulkerBullet.java
index 51dd732..7a4ba73 100644
--- a/src/net/minecraft/world/entity/projectile/ShulkerBullet.java
+++ b/src/net/minecraft/world/entity/projectile/ShulkerBullet.java
@@ -4,39 +4,35 @@ import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.Vec3;
-import java.util.Iterator;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.Difficulty;
 import java.util.List;
 import net.minecraft.util.Mth;
 import com.google.common.collect.Lists;
 import net.minecraft.core.Position;
-import net.minecraft.nbt.Tag;
-import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.sounds.SoundSource;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.core.BlockPos;
 import java.util.UUID;
 import javax.annotation.Nullable;
 import net.minecraft.core.Direction;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Entity;
 
-public class ShulkerBullet extends Entity {
-    private LivingEntity owner;
+public class ShulkerBullet extends Projectile {
     private Entity finalTarget;
     @Nullable
     private Direction currentMoveDirection;
@@ -45,32 +41,28 @@ public class ShulkerBullet extends Entity {
     private double targetDeltaY;
     private double targetDeltaZ;
     @Nullable
-    private UUID ownerId;
-    private BlockPos lastKnownOwnerPos;
-    @Nullable
     private UUID targetId;
-    private BlockPos lastKnownTargetPos;
     
-    public ShulkerBullet(final EntityType<? extends ShulkerBullet> aku, final Level bjw) {
-        super(aku, bjw);
+    public ShulkerBullet(final EntityType<? extends ShulkerBullet> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.noPhysics = true;
     }
     
-    public ShulkerBullet(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        this(EntityType.SHULKER_BULLET, bjw);
+    public ShulkerBullet(final Level bqb, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        this(EntityType.SHULKER_BULLET, bqb);
         this.moveTo(double2, double3, double4, this.yRot, this.xRot);
         this.setDeltaMovement(double5, double6, double7);
     }
     
-    public ShulkerBullet(final Level bjw, final LivingEntity akz, final Entity akq, final Direction.Axis a) {
-        this(EntityType.SHULKER_BULLET, bjw);
-        this.owner = akz;
-        final BlockPos fk6 = new BlockPos(akz);
-        final double double7 = fk6.getX() + 0.5;
-        final double double8 = fk6.getY() + 0.5;
-        final double double9 = fk6.getZ() + 0.5;
+    public ShulkerBullet(final Level bqb, final LivingEntity aoy, final Entity aom, final Direction.Axis a) {
+        this(EntityType.SHULKER_BULLET, bqb);
+        this.setOwner(aoy);
+        final BlockPos fu6 = aoy.blockPosition();
+        final double double7 = fu6.getX() + 0.5;
+        final double double8 = fu6.getY() + 0.5;
+        final double double9 = fu6.getZ() + 0.5;
         this.moveTo(double7, double8, double9, this.yRot, this.xRot);
-        this.finalTarget = akq;
+        this.finalTarget = aom;
         this.currentMoveDirection = Direction.UP;
         this.selectNextMoveDirection(a);
     }
@@ -81,50 +73,32 @@ public class ShulkerBullet extends Entity {
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        if (this.owner != null) {
-            final BlockPos fk3 = new BlockPos(this.owner);
-            final CompoundTag jt2 = NbtUtils.createUUIDTag(this.owner.getUUID());
-            jt2.putInt("X", fk3.getX());
-            jt2.putInt("Y", fk3.getY());
-            jt2.putInt("Z", fk3.getZ());
-            jt.put("Owner", jt2);
-        }
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         if (this.finalTarget != null) {
-            final BlockPos fk3 = new BlockPos(this.finalTarget);
-            final CompoundTag jt2 = NbtUtils.createUUIDTag(this.finalTarget.getUUID());
-            jt2.putInt("X", fk3.getX());
-            jt2.putInt("Y", fk3.getY());
-            jt2.putInt("Z", fk3.getZ());
-            jt.put("Target", jt2);
+            le.putUUID("Target", this.finalTarget.getUUID());
         }
         if (this.currentMoveDirection != null) {
-            jt.putInt("Dir", this.currentMoveDirection.get3DDataValue());
+            le.putInt("Dir", this.currentMoveDirection.get3DDataValue());
         }
-        jt.putInt("Steps", this.flightSteps);
-        jt.putDouble("TXD", this.targetDeltaX);
-        jt.putDouble("TYD", this.targetDeltaY);
-        jt.putDouble("TZD", this.targetDeltaZ);
+        le.putInt("Steps", this.flightSteps);
+        le.putDouble("TXD", this.targetDeltaX);
+        le.putDouble("TYD", this.targetDeltaY);
+        le.putDouble("TZD", this.targetDeltaZ);
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        this.flightSteps = jt.getInt("Steps");
-        this.targetDeltaX = jt.getDouble("TXD");
-        this.targetDeltaY = jt.getDouble("TYD");
-        this.targetDeltaZ = jt.getDouble("TZD");
-        if (jt.contains("Dir", 99)) {
-            this.currentMoveDirection = Direction.from3DDataValue(jt.getInt("Dir"));
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.flightSteps = le.getInt("Steps");
+        this.targetDeltaX = le.getDouble("TXD");
+        this.targetDeltaY = le.getDouble("TYD");
+        this.targetDeltaZ = le.getDouble("TZD");
+        if (le.contains("Dir", 99)) {
+            this.currentMoveDirection = Direction.from3DDataValue(le.getInt("Dir"));
         }
-        if (jt.contains("Owner", 10)) {
-            final CompoundTag jt2 = jt.getCompound("Owner");
-            this.ownerId = NbtUtils.loadUUIDTag(jt2);
-            this.lastKnownOwnerPos = new BlockPos(jt2.getInt("X"), jt2.getInt("Y"), jt2.getInt("Z"));
-        }
-        if (jt.contains("Target", 10)) {
-            final CompoundTag jt2 = jt.getCompound("Target");
-            this.targetId = NbtUtils.loadUUIDTag(jt2);
-            this.lastKnownTargetPos = new BlockPos(jt2.getInt("X"), jt2.getInt("Y"), jt2.getInt("Z"));
+        if (le.hasUUID("Target")) {
+            this.targetId = le.getUUID("Target");
         }
     }
     
@@ -132,63 +106,63 @@ public class ShulkerBullet extends Entity {
     protected void defineSynchedData() {
     }
     
-    private void setMoveDirection(@Nullable final Direction fp) {
-        this.currentMoveDirection = fp;
+    private void setMoveDirection(@Nullable final Direction fz) {
+        this.currentMoveDirection = fz;
     }
     
     private void selectNextMoveDirection(@Nullable final Direction.Axis a) {
         double double4 = 0.5;
-        BlockPos fk3;
+        BlockPos fu3;
         if (this.finalTarget == null) {
-            fk3 = new BlockPos(this).below();
+            fu3 = this.blockPosition().below();
         }
         else {
             double4 = this.finalTarget.getBbHeight() * 0.5;
-            fk3 = new BlockPos(this.finalTarget.getX(), this.finalTarget.getY() + double4, this.finalTarget.getZ());
+            fu3 = new BlockPos(this.finalTarget.getX(), this.finalTarget.getY() + double4, this.finalTarget.getZ());
         }
-        double double5 = fk3.getX() + 0.5;
-        double double6 = fk3.getY() + double4;
-        double double7 = fk3.getZ() + 0.5;
-        Direction fp12 = null;
-        if (!fk3.closerThan(this.position(), 2.0)) {
-            final BlockPos fk4 = new BlockPos(this);
+        double double5 = fu3.getX() + 0.5;
+        double double6 = fu3.getY() + double4;
+        double double7 = fu3.getZ() + 0.5;
+        Direction fz12 = null;
+        if (!fu3.closerThan(this.position(), 2.0)) {
+            final BlockPos fu4 = this.blockPosition();
             final List<Direction> list14 = Lists.newArrayList();
             if (a != Direction.Axis.X) {
-                if (fk4.getX() < fk3.getX() && this.level.isEmptyBlock(fk4.east())) {
+                if (fu4.getX() < fu3.getX() && this.level.isEmptyBlock(fu4.east())) {
                     list14.add(Direction.EAST);
                 }
-                else if (fk4.getX() > fk3.getX() && this.level.isEmptyBlock(fk4.west())) {
+                else if (fu4.getX() > fu3.getX() && this.level.isEmptyBlock(fu4.west())) {
                     list14.add(Direction.WEST);
                 }
             }
             if (a != Direction.Axis.Y) {
-                if (fk4.getY() < fk3.getY() && this.level.isEmptyBlock(fk4.above())) {
+                if (fu4.getY() < fu3.getY() && this.level.isEmptyBlock(fu4.above())) {
                     list14.add(Direction.UP);
                 }
-                else if (fk4.getY() > fk3.getY() && this.level.isEmptyBlock(fk4.below())) {
+                else if (fu4.getY() > fu3.getY() && this.level.isEmptyBlock(fu4.below())) {
                     list14.add(Direction.DOWN);
                 }
             }
             if (a != Direction.Axis.Z) {
-                if (fk4.getZ() < fk3.getZ() && this.level.isEmptyBlock(fk4.south())) {
+                if (fu4.getZ() < fu3.getZ() && this.level.isEmptyBlock(fu4.south())) {
                     list14.add(Direction.SOUTH);
                 }
-                else if (fk4.getZ() > fk3.getZ() && this.level.isEmptyBlock(fk4.north())) {
+                else if (fu4.getZ() > fu3.getZ() && this.level.isEmptyBlock(fu4.north())) {
                     list14.add(Direction.NORTH);
                 }
             }
-            fp12 = Direction.getRandomFace(this.random);
+            fz12 = Direction.getRandom(this.random);
             if (list14.isEmpty()) {
-                for (int integer15 = 5; !this.level.isEmptyBlock(fk4.relative(fp12)) && integer15 > 0; fp12 = Direction.getRandomFace(this.random), --integer15) {}
+                for (int integer15 = 5; !this.level.isEmptyBlock(fu4.relative(fz12)) && integer15 > 0; fz12 = Direction.getRandom(this.random), --integer15) {}
             }
             else {
-                fp12 = list14.get(this.random.nextInt(list14.size()));
+                fz12 = list14.get(this.random.nextInt(list14.size()));
             }
-            double5 = this.getX() + fp12.getStepX();
-            double6 = this.getY() + fp12.getStepY();
-            double7 = this.getZ() + fp12.getStepZ();
+            double5 = this.getX() + fz12.getStepX();
+            double6 = this.getY() + fz12.getStepY();
+            double7 = this.getZ() + fz12.getStepZ();
         }
-        this.setMoveDirection(fp12);
+        this.setMoveDirection(fz12);
         final double double8 = double5 - this.getX();
         final double double9 = double6 - this.getY();
         final double double10 = double7 - this.getZ();
@@ -219,45 +193,31 @@ public class ShulkerBullet extends Entity {
         super.tick();
         if (!this.level.isClientSide) {
             if (this.finalTarget == null && this.targetId != null) {
-                final List<LivingEntity> list2 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, new AABB(this.lastKnownTargetPos.offset(-2, -2, -2), this.lastKnownTargetPos.offset(2, 2, 2)));
-                for (final LivingEntity akz4 : list2) {
-                    if (akz4.getUUID().equals(this.targetId)) {
-                        this.finalTarget = akz4;
-                        break;
-                    }
+                this.finalTarget = ((ServerLevel)this.level).getEntity(this.targetId);
+                if (this.finalTarget == null) {
+                    this.targetId = null;
                 }
-                this.targetId = null;
-            }
-            if (this.owner == null && this.ownerId != null) {
-                final List<LivingEntity> list2 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, new AABB(this.lastKnownOwnerPos.offset(-2, -2, -2), this.lastKnownOwnerPos.offset(2, 2, 2)));
-                for (final LivingEntity akz4 : list2) {
-                    if (akz4.getUUID().equals(this.ownerId)) {
-                        this.owner = akz4;
-                        break;
-                    }
-                }
-                this.ownerId = null;
             }
             if (this.finalTarget != null && this.finalTarget.isAlive() && (!(this.finalTarget instanceof Player) || !((Player)this.finalTarget).isSpectator())) {
                 this.targetDeltaX = Mth.clamp(this.targetDeltaX * 1.025, -1.0, 1.0);
                 this.targetDeltaY = Mth.clamp(this.targetDeltaY * 1.025, -1.0, 1.0);
                 this.targetDeltaZ = Mth.clamp(this.targetDeltaZ * 1.025, -1.0, 1.0);
-                final Vec3 cvl2 = this.getDeltaMovement();
-                this.setDeltaMovement(cvl2.add((this.targetDeltaX - cvl2.x) * 0.2, (this.targetDeltaY - cvl2.y) * 0.2, (this.targetDeltaZ - cvl2.z) * 0.2));
+                final Vec3 dem2 = this.getDeltaMovement();
+                this.setDeltaMovement(dem2.add((this.targetDeltaX - dem2.x) * 0.2, (this.targetDeltaY - dem2.y) * 0.2, (this.targetDeltaZ - dem2.z) * 0.2));
             }
             else if (!this.isNoGravity()) {
                 this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.04, 0.0));
             }
-            final HitResult cvi2 = ProjectileUtil.forwardsRaycast(this, true, false, this.owner, ClipContext.Block.COLLIDER);
-            if (cvi2.getType() != HitResult.Type.MISS) {
-                this.onHit(cvi2);
+            final HitResult dej2 = ProjectileUtil.getHitResult(this, this::canHitEntity, ClipContext.Block.COLLIDER);
+            if (dej2.getType() != HitResult.Type.MISS) {
+                this.onHit(dej2);
             }
         }
-        final Vec3 cvl2 = this.getDeltaMovement();
-        this.setPos(this.getX() + cvl2.x, this.getY() + cvl2.y, this.getZ() + cvl2.z);
+        final Vec3 dem2 = this.getDeltaMovement();
+        this.setPos(this.getX() + dem2.x, this.getY() + dem2.y, this.getZ() + dem2.z);
         ProjectileUtil.rotateTowardsMovement(this, 0.5f);
         if (this.level.isClientSide) {
-            this.level.addParticle(ParticleTypes.END_ROD, this.getX() - cvl2.x, this.getY() - cvl2.y + 0.15, this.getZ() - cvl2.z, 0.0, 0.0, 0.0);
+            this.level.addParticle(ParticleTypes.END_ROD, this.getX() - dem2.x, this.getY() - dem2.y + 0.15, this.getZ() - dem2.z, 0.0, 0.0, 0.0);
         }
         else if (this.finalTarget != null && !this.finalTarget.removed) {
             if (this.flightSteps > 0) {
@@ -267,14 +227,14 @@ public class ShulkerBullet extends Entity {
                 }
             }
             if (this.currentMoveDirection != null) {
-                final BlockPos fk3 = new BlockPos(this);
+                final BlockPos fu3 = this.blockPosition();
                 final Direction.Axis a4 = this.currentMoveDirection.getAxis();
-                if (this.level.loadedAndEntityCanStandOn(fk3.relative(this.currentMoveDirection), this)) {
+                if (this.level.loadedAndEntityCanStandOn(fu3.relative(this.currentMoveDirection), this)) {
                     this.selectNextMoveDirection(a4);
                 }
                 else {
-                    final BlockPos fk4 = new BlockPos(this.finalTarget);
-                    if ((a4 == Direction.Axis.X && fk3.getX() == fk4.getX()) || (a4 == Direction.Axis.Z && fk3.getZ() == fk4.getZ()) || (a4 == Direction.Axis.Y && fk3.getY() == fk4.getY())) {
+                    final BlockPos fu4 = this.finalTarget.blockPosition();
+                    if ((a4 == Direction.Axis.X && fu3.getX() == fu4.getX()) || (a4 == Direction.Axis.Z && fu3.getZ() == fu4.getZ()) || (a4 == Direction.Axis.Y && fu3.getY() == fu4.getY())) {
                         this.selectNextMoveDirection(a4);
                     }
                 }
@@ -282,6 +242,11 @@ public class ShulkerBullet extends Entity {
         }
     }
     
+    @Override
+    protected boolean canHitEntity(final Entity aom) {
+        return super.canHitEntity(aom) && !aom.noPhysics;
+    }
+    
     @Override
     public boolean isOnFire() {
         return false;
@@ -297,21 +262,31 @@ public class ShulkerBullet extends Entity {
         return 1.0f;
     }
     
-    protected void onHit(final HitResult cvi) {
-        if (cvi.getType() == HitResult.Type.ENTITY) {
-            final Entity akq3 = ((EntityHitResult)cvi).getEntity();
-            final boolean boolean4 = akq3.hurt(DamageSource.indirectMobAttack(this, this.owner).setProjectile(), 4.0f);
-            if (boolean4) {
-                this.doEnchantDamageEffects(this.owner, akq3);
-                if (akq3 instanceof LivingEntity) {
-                    ((LivingEntity)akq3).addEffect(new MobEffectInstance(MobEffects.LEVITATION, 200));
-                }
+    @Override
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        final Entity aom3 = dei.getEntity();
+        final Entity aom4 = this.getOwner();
+        final LivingEntity aoy5 = (aom4 instanceof LivingEntity) ? ((LivingEntity)aom4) : null;
+        final boolean boolean6 = aom3.hurt(DamageSource.indirectMobAttack(this, aoy5).setProjectile(), 4.0f);
+        if (boolean6) {
+            this.doEnchantDamageEffects(aoy5, aom3);
+            if (aom3 instanceof LivingEntity) {
+                ((LivingEntity)aom3).addEffect(new MobEffectInstance(MobEffects.LEVITATION, 200));
             }
         }
-        else {
-            ((ServerLevel)this.level).<SimpleParticleType>sendParticles(ParticleTypes.EXPLOSION, this.getX(), this.getY(), this.getZ(), 2, 0.2, 0.2, 0.2, 0.0);
-            this.playSound(SoundEvents.SHULKER_BULLET_HIT, 1.0f, 1.0f);
-        }
+    }
+    
+    @Override
+    protected void onHitBlock(final BlockHitResult deh) {
+        super.onHitBlock(deh);
+        ((ServerLevel)this.level).<SimpleParticleType>sendParticles(ParticleTypes.EXPLOSION, this.getX(), this.getY(), this.getZ(), 2, 0.2, 0.2, 0.2, 0.0);
+        this.playSound(SoundEvents.SHULKER_BULLET_HIT, 1.0f, 1.0f);
+    }
+    
+    @Override
+    protected void onHit(final HitResult dej) {
+        super.onHit(dej);
         this.remove();
     }
     
@@ -321,7 +296,7 @@ public class ShulkerBullet extends Entity {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         if (!this.level.isClientSide) {
             this.playSound(SoundEvents.SHULKER_BULLET_HURT, 1.0f, 1.0f);
             ((ServerLevel)this.level).<SimpleParticleType>sendParticles(ParticleTypes.CRIT, this.getX(), this.getY(), this.getZ(), 15, 0.2, 0.2, 0.2, 0.0);
diff --git a/src/net/minecraft/world/entity/projectile/SmallFireball.java b/src/net/minecraft/world/entity/projectile/SmallFireball.java
index 45ff589..0e5ef9f 100644
--- a/src/net/minecraft/world/entity/projectile/SmallFireball.java
+++ b/src/net/minecraft/world/entity/projectile/SmallFireball.java
@@ -1,56 +1,73 @@
 package net.minecraft.world.entity.projectile;
 
+import net.minecraft.world.phys.HitResult;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.BaseFireBlock;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.entity.Mob;
+import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class SmallFireball extends Fireball {
-    public SmallFireball(final EntityType<? extends SmallFireball> aku, final Level bjw) {
-        super(aku, bjw);
+    public SmallFireball(final EntityType<? extends SmallFireball> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public SmallFireball(final Level bjw, final LivingEntity akz, final double double3, final double double4, final double double5) {
-        super(EntityType.SMALL_FIREBALL, akz, double3, double4, double5, bjw);
+    public SmallFireball(final Level bqb, final LivingEntity aoy, final double double3, final double double4, final double double5) {
+        super(EntityType.SMALL_FIREBALL, aoy, double3, double4, double5, bqb);
     }
     
-    public SmallFireball(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(EntityType.SMALL_FIREBALL, double2, double3, double4, double5, double6, double7, bjw);
+    public SmallFireball(final Level bqb, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(EntityType.SMALL_FIREBALL, double2, double3, double4, double5, double6, double7, bqb);
     }
     
     @Override
-    protected void onHit(final HitResult cvi) {
-        super.onHit(cvi);
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        if (this.level.isClientSide) {
+            return;
+        }
+        final Entity aom3 = dei.getEntity();
+        if (!aom3.fireImmune()) {
+            final Entity aom4 = this.getOwner();
+            final int integer5 = aom3.getRemainingFireTicks();
+            aom3.setSecondsOnFire(5);
+            final boolean boolean6 = aom3.hurt(DamageSource.fireball(this, aom4), 5.0f);
+            if (!boolean6) {
+                aom3.setRemainingFireTicks(integer5);
+            }
+            else if (aom4 instanceof LivingEntity) {
+                this.doEnchantDamageEffects((LivingEntity)aom4, aom3);
+            }
+        }
+    }
+    
+    @Override
+    protected void onHitBlock(final BlockHitResult deh) {
+        super.onHitBlock(deh);
+        if (this.level.isClientSide) {
+            return;
+        }
+        final Entity aom3 = this.getOwner();
+        if (aom3 == null || !(aom3 instanceof Mob) || this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
+            final BlockHitResult deh2 = deh;
+            final BlockPos fu5 = deh2.getBlockPos().relative(deh2.getDirection());
+            if (this.level.isEmptyBlock(fu5)) {
+                this.level.setBlockAndUpdate(fu5, BaseFireBlock.getState(this.level, fu5));
+            }
+        }
+    }
+    
+    @Override
+    protected void onHit(final HitResult dej) {
+        super.onHit(dej);
         if (!this.level.isClientSide) {
-            if (cvi.getType() == HitResult.Type.ENTITY) {
-                final Entity akq3 = ((EntityHitResult)cvi).getEntity();
-                if (!akq3.fireImmune()) {
-                    final int integer4 = akq3.getRemainingFireTicks();
-                    akq3.setSecondsOnFire(5);
-                    final boolean boolean5 = akq3.hurt(DamageSource.fireball(this, this.owner), 5.0f);
-                    if (boolean5) {
-                        this.doEnchantDamageEffects(this.owner, akq3);
-                    }
-                    else {
-                        akq3.setRemainingFireTicks(integer4);
-                    }
-                }
-            }
-            else if (this.owner == null || !(this.owner instanceof Mob) || this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
-                final BlockHitResult cvg3 = (BlockHitResult)cvi;
-                final BlockPos fk4 = cvg3.getBlockPos().relative(cvg3.getDirection());
-                if (this.level.isEmptyBlock(fk4)) {
-                    this.level.setBlockAndUpdate(fk4, Blocks.FIRE.defaultBlockState());
-                }
-            }
             this.remove();
         }
     }
@@ -61,7 +78,7 @@ public class SmallFireball extends Fireball {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         return false;
     }
 }
diff --git a/src/net/minecraft/world/entity/projectile/Snowball.java b/src/net/minecraft/world/entity/projectile/Snowball.java
index f95ae74..5642f88 100644
--- a/src/net/minecraft/world/entity/projectile/Snowball.java
+++ b/src/net/minecraft/world/entity/projectile/Snowball.java
@@ -1,10 +1,10 @@
 package net.minecraft.world.entity.projectile;
 
+import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.monster.Blaze;
 import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.particles.ItemParticleOption;
 import net.minecraft.core.particles.ParticleTypes;
@@ -16,16 +16,16 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Snowball extends ThrowableItemProjectile {
-    public Snowball(final EntityType<? extends Snowball> aku, final Level bjw) {
-        super(aku, bjw);
+    public Snowball(final EntityType<? extends Snowball> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public Snowball(final Level bjw, final LivingEntity akz) {
-        super(EntityType.SNOWBALL, akz, bjw);
+    public Snowball(final Level bqb, final LivingEntity aoy) {
+        super(EntityType.SNOWBALL, aoy, bqb);
     }
     
-    public Snowball(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.SNOWBALL, double2, double3, double4, bjw);
+    public Snowball(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.SNOWBALL, double2, double3, double4, bqb);
     }
     
     @Override
@@ -34,27 +34,31 @@ public class Snowball extends ThrowableItemProjectile {
     }
     
     private ParticleOptions getParticle() {
-        final ItemStack ben2 = this.getItemRaw();
-        return ben2.isEmpty() ? ParticleTypes.ITEM_SNOWBALL : new ItemParticleOption(ParticleTypes.ITEM, ben2);
+        final ItemStack bki2 = this.getItemRaw();
+        return bki2.isEmpty() ? ParticleTypes.ITEM_SNOWBALL : new ItemParticleOption(ParticleTypes.ITEM, bki2);
     }
     
     @Override
     public void handleEntityEvent(final byte byte1) {
         if (byte1 == 3) {
-            final ParticleOptions gt3 = this.getParticle();
+            final ParticleOptions hf3 = this.getParticle();
             for (int integer4 = 0; integer4 < 8; ++integer4) {
-                this.level.addParticle(gt3, this.getX(), this.getY(), this.getZ(), 0.0, 0.0, 0.0);
+                this.level.addParticle(hf3, this.getX(), this.getY(), this.getZ(), 0.0, 0.0, 0.0);
             }
         }
     }
     
     @Override
-    protected void onHit(final HitResult cvi) {
-        if (cvi.getType() == HitResult.Type.ENTITY) {
-            final Entity akq3 = ((EntityHitResult)cvi).getEntity();
-            final int integer4 = (akq3 instanceof Blaze) ? 3 : 0;
-            akq3.hurt(DamageSource.thrown(this, this.getOwner()), (float)integer4);
-        }
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        final Entity aom3 = dei.getEntity();
+        final int integer4 = (aom3 instanceof Blaze) ? 3 : 0;
+        aom3.hurt(DamageSource.thrown(this, this.getOwner()), (float)integer4);
+    }
+    
+    @Override
+    protected void onHit(final HitResult dej) {
+        super.onHit(dej);
         if (!this.level.isClientSide) {
             this.level.broadcastEntityEvent(this, (byte)3);
             this.remove();
diff --git a/src/net/minecraft/world/entity/projectile/SpectralArrow.java b/src/net/minecraft/world/entity/projectile/SpectralArrow.java
index c43e1f8..b510ae4 100644
--- a/src/net/minecraft/world/entity/projectile/SpectralArrow.java
+++ b/src/net/minecraft/world/entity/projectile/SpectralArrow.java
@@ -15,18 +15,18 @@ import net.minecraft.world.entity.EntityType;
 public class SpectralArrow extends AbstractArrow {
     private int duration;
     
-    public SpectralArrow(final EntityType<? extends SpectralArrow> aku, final Level bjw) {
-        super(aku, bjw);
+    public SpectralArrow(final EntityType<? extends SpectralArrow> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.duration = 200;
     }
     
-    public SpectralArrow(final Level bjw, final LivingEntity akz) {
-        super(EntityType.SPECTRAL_ARROW, akz, bjw);
+    public SpectralArrow(final Level bqb, final LivingEntity aoy) {
+        super(EntityType.SPECTRAL_ARROW, aoy, bqb);
         this.duration = 200;
     }
     
-    public SpectralArrow(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.SPECTRAL_ARROW, double2, double3, double4, bjw);
+    public SpectralArrow(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.SPECTRAL_ARROW, double2, double3, double4, bqb);
         this.duration = 200;
     }
     
@@ -44,23 +44,23 @@ public class SpectralArrow extends AbstractArrow {
     }
     
     @Override
-    protected void doPostHurtEffects(final LivingEntity akz) {
-        super.doPostHurtEffects(akz);
-        final MobEffectInstance akk3 = new MobEffectInstance(MobEffects.GLOWING, this.duration, 0);
-        akz.addEffect(akk3);
+    protected void doPostHurtEffects(final LivingEntity aoy) {
+        super.doPostHurtEffects(aoy);
+        final MobEffectInstance aog3 = new MobEffectInstance(MobEffects.GLOWING, this.duration, 0);
+        aoy.addEffect(aog3);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("Duration")) {
-            this.duration = jt.getInt("Duration");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("Duration")) {
+            this.duration = le.getInt("Duration");
         }
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("Duration", this.duration);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Duration", this.duration);
     }
 }
diff --git a/src/net/minecraft/world/entity/projectile/ThrowableItemProjectile.java b/src/net/minecraft/world/entity/projectile/ThrowableItemProjectile.java
index 452e5f4..4508e83 100644
--- a/src/net/minecraft/world/entity/projectile/ThrowableItemProjectile.java
+++ b/src/net/minecraft/world/entity/projectile/ThrowableItemProjectile.java
@@ -17,21 +17,21 @@ import net.minecraft.network.syncher.EntityDataAccessor;
 public abstract class ThrowableItemProjectile extends ThrowableProjectile implements ItemSupplier {
     private static final EntityDataAccessor<ItemStack> DATA_ITEM_STACK;
     
-    public ThrowableItemProjectile(final EntityType<? extends ThrowableItemProjectile> aku, final Level bjw) {
-        super(aku, bjw);
+    public ThrowableItemProjectile(final EntityType<? extends ThrowableItemProjectile> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public ThrowableItemProjectile(final EntityType<? extends ThrowableItemProjectile> aku, final double double2, final double double3, final double double4, final Level bjw) {
-        super(aku, double2, double3, double4, bjw);
+    public ThrowableItemProjectile(final EntityType<? extends ThrowableItemProjectile> aoq, final double double2, final double double3, final double double4, final Level bqb) {
+        super(aoq, double2, double3, double4, bqb);
     }
     
-    public ThrowableItemProjectile(final EntityType<? extends ThrowableItemProjectile> aku, final LivingEntity akz, final Level bjw) {
-        super(aku, akz, bjw);
+    public ThrowableItemProjectile(final EntityType<? extends ThrowableItemProjectile> aoq, final LivingEntity aoy, final Level bqb) {
+        super(aoq, aoy, bqb);
     }
     
-    public void setItem(final ItemStack ben) {
-        if (ben.getItem() != this.getDefaultItem() || ben.hasTag()) {
-            this.getEntityData().<ItemStack>set(ThrowableItemProjectile.DATA_ITEM_STACK, (ItemStack)Util.<T>make((T)ben.copy(), ben -> ben.setCount(1)));
+    public void setItem(final ItemStack bki) {
+        if (bki.getItem() != this.getDefaultItem() || bki.hasTag()) {
+            this.getEntityData().<ItemStack>set(ThrowableItemProjectile.DATA_ITEM_STACK, (ItemStack)Util.<T>make((T)bki.copy(), bki -> bki.setCount(1)));
         }
     }
     
@@ -43,8 +43,8 @@ public abstract class ThrowableItemProjectile extends ThrowableProjectile implem
     
     @Override
     public ItemStack getItem() {
-        final ItemStack ben2 = this.getItemRaw();
-        return ben2.isEmpty() ? new ItemStack(this.getDefaultItem()) : ben2;
+        final ItemStack bki2 = this.getItemRaw();
+        return bki2.isEmpty() ? new ItemStack(this.getDefaultItem()) : bki2;
     }
     
     @Override
@@ -52,20 +52,18 @@ public abstract class ThrowableItemProjectile extends ThrowableProjectile implem
         this.getEntityData().<ItemStack>define(ThrowableItemProjectile.DATA_ITEM_STACK, ItemStack.EMPTY);
     }
     
-    @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        final ItemStack ben3 = this.getItemRaw();
-        if (!ben3.isEmpty()) {
-            jt.put("Item", ben3.save(new CompoundTag()));
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        final ItemStack bki3 = this.getItemRaw();
+        if (!bki3.isEmpty()) {
+            le.put("Item", bki3.save(new CompoundTag()));
         }
     }
     
-    @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        final ItemStack ben3 = ItemStack.of(jt.getCompound("Item"));
-        this.setItem(ben3);
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        final ItemStack bki3 = ItemStack.of(le.getCompound("Item"));
+        this.setItem(bki3);
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/projectile/ThrowableProjectile.java b/src/net/minecraft/world/entity/projectile/ThrowableProjectile.java
index 6680622..0175fa5 100644
--- a/src/net/minecraft/world/entity/projectile/ThrowableProjectile.java
+++ b/src/net/minecraft/world/entity/projectile/ThrowableProjectile.java
@@ -2,54 +2,35 @@ package net.minecraft.world.entity.projectile;
 
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.Packet;
-import javax.annotation.Nullable;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.nbt.Tag;
-import net.minecraft.nbt.NbtUtils;
-import net.minecraft.nbt.CompoundTag;
-import java.util.Iterator;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.util.Mth;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
-import java.util.UUID;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Entity;
 
-public abstract class ThrowableProjectile extends Entity implements Projectile {
-    private int xBlock;
-    private int yBlock;
-    private int zBlock;
-    protected boolean inGround;
-    public int shakeTime;
-    protected LivingEntity owner;
-    private UUID ownerId;
-    private Entity entityToIgnore;
-    private int timeToIgnore;
-    
-    protected ThrowableProjectile(final EntityType<? extends ThrowableProjectile> aku, final Level bjw) {
-        super(aku, bjw);
-        this.xBlock = -1;
-        this.yBlock = -1;
-        this.zBlock = -1;
+public abstract class ThrowableProjectile extends Projectile {
+    protected ThrowableProjectile(final EntityType<? extends ThrowableProjectile> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    protected ThrowableProjectile(final EntityType<? extends ThrowableProjectile> aku, final double double2, final double double3, final double double4, final Level bjw) {
-        this(aku, bjw);
+    protected ThrowableProjectile(final EntityType<? extends ThrowableProjectile> aoq, final double double2, final double double3, final double double4, final Level bqb) {
+        this(aoq, bqb);
         this.setPos(double2, double3, double4);
     }
     
-    protected ThrowableProjectile(final EntityType<? extends ThrowableProjectile> aku, final LivingEntity akz, final Level bjw) {
-        this(aku, akz.getX(), akz.getEyeY() - 0.10000000149011612, akz.getZ(), bjw);
-        this.owner = akz;
-        this.ownerId = akz.getUUID();
+    protected ThrowableProjectile(final EntityType<? extends ThrowableProjectile> aoq, final LivingEntity aoy, final Level bqb) {
+        this(aoq, aoy.getX(), aoy.getEyeY() - 0.10000000149011612, aoy.getZ(), bqb);
+        this.setOwner(aoy);
     }
     
     @Override
@@ -62,108 +43,49 @@ public abstract class ThrowableProjectile extends Entity implements Projectile {
         return double1 < double2 * double2;
     }
     
-    public void shootFromRotation(final Entity akq, final float float2, final float float3, final float float4, final float float5, final float float6) {
-        final float float7 = -Mth.sin(float3 * 0.017453292f) * Mth.cos(float2 * 0.017453292f);
-        final float float8 = -Mth.sin((float2 + float4) * 0.017453292f);
-        final float float9 = Mth.cos(float3 * 0.017453292f) * Mth.cos(float2 * 0.017453292f);
-        this.shoot(float7, float8, float9, float5, float6);
-        final Vec3 cvl11 = akq.getDeltaMovement();
-        this.setDeltaMovement(this.getDeltaMovement().add(cvl11.x, akq.onGround ? 0.0 : cvl11.y, cvl11.z));
-    }
-    
-    @Override
-    public void shoot(final double double1, final double double2, final double double3, final float float4, final float float5) {
-        final Vec3 cvl10 = new Vec3(double1, double2, double3).normalize().add(this.random.nextGaussian() * 0.007499999832361937 * float5, this.random.nextGaussian() * 0.007499999832361937 * float5, this.random.nextGaussian() * 0.007499999832361937 * float5).scale(float4);
-        this.setDeltaMovement(cvl10);
-        final float float6 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl10));
-        this.yRot = (float)(Mth.atan2(cvl10.x, cvl10.z) * 57.2957763671875);
-        this.xRot = (float)(Mth.atan2(cvl10.y, float6) * 57.2957763671875);
-        this.yRotO = this.yRot;
-        this.xRotO = this.xRot;
-    }
-    
-    @Override
-    public void lerpMotion(final double double1, final double double2, final double double3) {
-        this.setDeltaMovement(double1, double2, double3);
-        if (this.xRotO == 0.0f && this.yRotO == 0.0f) {
-            final float float8 = Mth.sqrt(double1 * double1 + double3 * double3);
-            this.yRot = (float)(Mth.atan2(double1, double3) * 57.2957763671875);
-            this.xRot = (float)(Mth.atan2(double2, float8) * 57.2957763671875);
-            this.yRotO = this.yRot;
-            this.xRotO = this.xRot;
-        }
-    }
-    
     @Override
     public void tick() {
         super.tick();
-        if (this.shakeTime > 0) {
-            --this.shakeTime;
-        }
-        if (this.inGround) {
-            this.inGround = false;
-            this.setDeltaMovement(this.getDeltaMovement().multiply(this.random.nextFloat() * 0.2f, this.random.nextFloat() * 0.2f, this.random.nextFloat() * 0.2f));
-        }
-        final AABB cvf2 = this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(1.0);
-        for (final Entity akq2 : this.level.getEntities(this, cvf2, akq -> !akq.isSpectator() && akq.isPickable())) {
-            if (akq2 == this.entityToIgnore) {
-                ++this.timeToIgnore;
-                break;
+        final HitResult dej2 = ProjectileUtil.getHitResult(this, this::canHitEntity, ClipContext.Block.OUTLINE);
+        boolean boolean3 = false;
+        if (dej2.getType() == HitResult.Type.BLOCK) {
+            final BlockPos fu4 = ((BlockHitResult)dej2).getBlockPos();
+            final BlockState cfj5 = this.level.getBlockState(fu4);
+            if (cfj5.is(Blocks.NETHER_PORTAL)) {
+                this.handleInsidePortal(fu4);
+                boolean3 = true;
             }
-            if (this.owner != null && this.tickCount < 2 && this.entityToIgnore == null) {
-                this.entityToIgnore = akq2;
-                this.timeToIgnore = 3;
-                break;
+            else if (cfj5.is(Blocks.END_GATEWAY)) {
+                final BlockEntity cdl6 = this.level.getBlockEntity(fu4);
+                if (cdl6 instanceof TheEndGatewayBlockEntity) {
+                    ((TheEndGatewayBlockEntity)cdl6).teleportEntity(this);
+                }
+                boolean3 = true;
             }
         }
-        final HitResult cvi3 = ProjectileUtil.getHitResult(this, cvf2, akq -> !akq.isSpectator() && akq.isPickable() && akq != this.entityToIgnore, ClipContext.Block.OUTLINE, true);
-        if (this.entityToIgnore != null && this.timeToIgnore-- <= 0) {
-            this.entityToIgnore = null;
+        if (dej2.getType() != HitResult.Type.MISS && !boolean3) {
+            this.onHit(dej2);
         }
-        if (cvi3.getType() != HitResult.Type.MISS) {
-            if (cvi3.getType() == HitResult.Type.BLOCK && this.level.getBlockState(((BlockHitResult)cvi3).getBlockPos()).getBlock() == Blocks.NETHER_PORTAL) {
-                this.handleInsidePortal(((BlockHitResult)cvi3).getBlockPos());
-            }
-            else {
-                this.onHit(cvi3);
-            }
-        }
-        final Vec3 cvl4 = this.getDeltaMovement();
-        final double double5 = this.getX() + cvl4.x;
-        final double double6 = this.getY() + cvl4.y;
-        final double double7 = this.getZ() + cvl4.z;
-        final float float11 = Mth.sqrt(Entity.getHorizontalDistanceSqr(cvl4));
-        this.yRot = (float)(Mth.atan2(cvl4.x, cvl4.z) * 57.2957763671875);
-        this.xRot = (float)(Mth.atan2(cvl4.y, float11) * 57.2957763671875);
-        while (this.xRot - this.xRotO < -180.0f) {
-            this.xRotO -= 360.0f;
-        }
-        while (this.xRot - this.xRotO >= 180.0f) {
-            this.xRotO += 360.0f;
-        }
-        while (this.yRot - this.yRotO < -180.0f) {
-            this.yRotO -= 360.0f;
-        }
-        while (this.yRot - this.yRotO >= 180.0f) {
-            this.yRotO += 360.0f;
-        }
-        this.xRot = Mth.lerp(0.2f, this.xRotO, this.xRot);
-        this.yRot = Mth.lerp(0.2f, this.yRotO, this.yRot);
-        float float13;
+        final Vec3 dem4 = this.getDeltaMovement();
+        final double double5 = this.getX() + dem4.x;
+        final double double6 = this.getY() + dem4.y;
+        final double double7 = this.getZ() + dem4.z;
+        this.updateRotation();
+        float float14;
         if (this.isInWater()) {
-            for (int integer13 = 0; integer13 < 4; ++integer13) {
-                final float float12 = 0.25f;
-                this.level.addParticle(ParticleTypes.BUBBLE, double5 - cvl4.x * 0.25, double6 - cvl4.y * 0.25, double7 - cvl4.z * 0.25, cvl4.x, cvl4.y, cvl4.z);
+            for (int integer12 = 0; integer12 < 4; ++integer12) {
+                final float float13 = 0.25f;
+                this.level.addParticle(ParticleTypes.BUBBLE, double5 - dem4.x * 0.25, double6 - dem4.y * 0.25, double7 - dem4.z * 0.25, dem4.x, dem4.y, dem4.z);
             }
-            float13 = 0.8f;
+            float14 = 0.8f;
         }
         else {
-            float13 = 0.99f;
+            float14 = 0.99f;
         }
-        this.setDeltaMovement(cvl4.scale(float13));
+        this.setDeltaMovement(dem4.scale(float14));
         if (!this.isNoGravity()) {
-            final Vec3 cvl5 = this.getDeltaMovement();
-            this.setDeltaMovement(cvl5.x, cvl5.y - this.getGravity(), cvl5.z);
+            final Vec3 dem5 = this.getDeltaMovement();
+            this.setDeltaMovement(dem5.x, dem5.y - this.getGravity(), dem5.z);
         }
         this.setPos(double5, double6, double7);
     }
@@ -172,45 +94,6 @@ public abstract class ThrowableProjectile extends Entity implements Projectile {
         return 0.03f;
     }
     
-    protected abstract void onHit(final HitResult cvi);
-    
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putInt("xTile", this.xBlock);
-        jt.putInt("yTile", this.yBlock);
-        jt.putInt("zTile", this.zBlock);
-        jt.putByte("shake", (byte)this.shakeTime);
-        jt.putBoolean("inGround", this.inGround);
-        if (this.ownerId != null) {
-            jt.put("owner", NbtUtils.createUUIDTag(this.ownerId));
-        }
-    }
-    
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        this.xBlock = jt.getInt("xTile");
-        this.yBlock = jt.getInt("yTile");
-        this.zBlock = jt.getInt("zTile");
-        this.shakeTime = (jt.getByte("shake") & 0xFF);
-        this.inGround = jt.getBoolean("inGround");
-        this.owner = null;
-        if (jt.contains("owner", 10)) {
-            this.ownerId = NbtUtils.loadUUIDTag(jt.getCompound("owner"));
-        }
-    }
-    
-    @Nullable
-    public LivingEntity getOwner() {
-        if ((this.owner == null || this.owner.removed) && this.ownerId != null && this.level instanceof ServerLevel) {
-            final Entity akq2 = ((ServerLevel)this.level).getEntity(this.ownerId);
-            if (akq2 instanceof LivingEntity) {
-                this.owner = (LivingEntity)akq2;
-            }
-            else {
-                this.owner = null;
-            }
-        }
-        return this.owner;
-    }
-    
     @Override
     public Packet<?> getAddEntityPacket() {
         return new ClientboundAddEntityPacket(this);
diff --git a/src/net/minecraft/world/entity/projectile/ThrownEgg.java b/src/net/minecraft/world/entity/projectile/ThrownEgg.java
index 9f6cd71..36251bb 100644
--- a/src/net/minecraft/world/entity/projectile/ThrownEgg.java
+++ b/src/net/minecraft/world/entity/projectile/ThrownEgg.java
@@ -3,10 +3,10 @@ package net.minecraft.world.entity.projectile;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.entity.animal.Chicken;
+import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.HitResult;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ItemParticleOption;
 import net.minecraft.core.particles.ParticleTypes;
@@ -15,16 +15,16 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class ThrownEgg extends ThrowableItemProjectile {
-    public ThrownEgg(final EntityType<? extends ThrownEgg> aku, final Level bjw) {
-        super(aku, bjw);
+    public ThrownEgg(final EntityType<? extends ThrownEgg> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public ThrownEgg(final Level bjw, final LivingEntity akz) {
-        super(EntityType.EGG, akz, bjw);
+    public ThrownEgg(final Level bqb, final LivingEntity aoy) {
+        super(EntityType.EGG, aoy, bqb);
     }
     
-    public ThrownEgg(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.EGG, double2, double3, double4, bjw);
+    public ThrownEgg(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.EGG, double2, double3, double4, bqb);
     }
     
     @Override
@@ -38,10 +38,14 @@ public class ThrownEgg extends ThrowableItemProjectile {
     }
     
     @Override
-    protected void onHit(final HitResult cvi) {
-        if (cvi.getType() == HitResult.Type.ENTITY) {
-            ((EntityHitResult)cvi).getEntity().hurt(DamageSource.thrown(this, this.getOwner()), 0.0f);
-        }
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        dei.getEntity().hurt(DamageSource.thrown(this, this.getOwner()), 0.0f);
+    }
+    
+    @Override
+    protected void onHit(final HitResult dej) {
+        super.onHit(dej);
         if (!this.level.isClientSide) {
             if (this.random.nextInt(8) == 0) {
                 int integer3 = 1;
@@ -49,10 +53,10 @@ public class ThrownEgg extends ThrowableItemProjectile {
                     integer3 = 4;
                 }
                 for (int integer4 = 0; integer4 < integer3; ++integer4) {
-                    final Chicken atf5 = EntityType.CHICKEN.create(this.level);
-                    atf5.setAge(-24000);
-                    atf5.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, 0.0f);
-                    this.level.addFreshEntity(atf5);
+                    final Chicken ayn5 = EntityType.CHICKEN.create(this.level);
+                    ayn5.setAge(-24000);
+                    ayn5.moveTo(this.getX(), this.getY(), this.getZ(), this.yRot, 0.0f);
+                    this.level.addFreshEntity(ayn5);
                 }
             }
             this.level.broadcastEntityEvent(this, (byte)3);
diff --git a/src/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
index 6aff2b3..48d3c0b 100644
--- a/src/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
+++ b/src/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
@@ -1,42 +1,34 @@
 package net.minecraft.world.entity.projectile;
 
 import javax.annotation.Nullable;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.monster.Endermite;
 import net.minecraft.world.level.GameRules;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
 
 public class ThrownEnderpearl extends ThrowableItemProjectile {
-    private LivingEntity originalOwner;
-    
-    public ThrownEnderpearl(final EntityType<? extends ThrownEnderpearl> aku, final Level bjw) {
-        super(aku, bjw);
+    public ThrownEnderpearl(final EntityType<? extends ThrownEnderpearl> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public ThrownEnderpearl(final Level bjw, final LivingEntity akz) {
-        super(EntityType.ENDER_PEARL, akz, bjw);
-        this.originalOwner = akz;
+    public ThrownEnderpearl(final Level bqb, final LivingEntity aoy) {
+        super(EntityType.ENDER_PEARL, aoy, bqb);
     }
     
-    public ThrownEnderpearl(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.ENDER_PEARL, double2, double3, double4, bjw);
+    public ThrownEnderpearl(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.ENDER_PEARL, double2, double3, double4, bqb);
     }
     
     @Override
@@ -45,56 +37,39 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
     }
     
     @Override
-    protected void onHit(final HitResult cvi) {
-        final LivingEntity akz3 = this.getOwner();
-        if (cvi.getType() == HitResult.Type.ENTITY) {
-            final Entity akq4 = ((EntityHitResult)cvi).getEntity();
-            if (akq4 == this.originalOwner) {
-                return;
-            }
-            akq4.hurt(DamageSource.thrown(this, akz3), 0.0f);
-        }
-        if (cvi.getType() == HitResult.Type.BLOCK) {
-            final BlockPos fk4 = ((BlockHitResult)cvi).getBlockPos();
-            final BlockEntity bwl5 = this.level.getBlockEntity(fk4);
-            if (bwl5 instanceof TheEndGatewayBlockEntity) {
-                final TheEndGatewayBlockEntity bxm6 = (TheEndGatewayBlockEntity)bwl5;
-                if (akz3 != null) {
-                    if (akz3 instanceof ServerPlayer) {
-                        CriteriaTriggers.ENTER_BLOCK.trigger((ServerPlayer)akz3, this.level.getBlockState(fk4));
-                    }
-                    bxm6.teleportEntity(akz3);
-                    this.remove();
-                    return;
-                }
-                bxm6.teleportEntity(this);
-                return;
-            }
-        }
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        dei.getEntity().hurt(DamageSource.thrown(this, this.getOwner()), 0.0f);
+    }
+    
+    @Override
+    protected void onHit(final HitResult dej) {
+        super.onHit(dej);
+        final Entity aom3 = this.getOwner();
         for (int integer4 = 0; integer4 < 32; ++integer4) {
             this.level.addParticle(ParticleTypes.PORTAL, this.getX(), this.getY() + this.random.nextDouble() * 2.0, this.getZ(), this.random.nextGaussian(), 0.0, this.random.nextGaussian());
         }
-        if (!this.level.isClientSide) {
-            if (akz3 instanceof ServerPlayer) {
-                final ServerPlayer xe4 = (ServerPlayer)akz3;
-                if (xe4.connection.getConnection().isConnected() && xe4.level == this.level && !xe4.isSleeping()) {
+        if (!this.level.isClientSide && !this.removed) {
+            if (aom3 instanceof ServerPlayer) {
+                final ServerPlayer ze4 = (ServerPlayer)aom3;
+                if (ze4.connection.getConnection().isConnected() && ze4.level == this.level && !ze4.isSleeping()) {
                     if (this.random.nextFloat() < 0.05f && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
-                        final Endermite awn5 = EntityType.ENDERMITE.create(this.level);
-                        awn5.setPlayerSpawned(true);
-                        awn5.moveTo(akz3.getX(), akz3.getY(), akz3.getZ(), akz3.yRot, akz3.xRot);
-                        this.level.addFreshEntity(awn5);
+                        final Endermite bbs5 = EntityType.ENDERMITE.create(this.level);
+                        bbs5.setPlayerSpawned(true);
+                        bbs5.moveTo(aom3.getX(), aom3.getY(), aom3.getZ(), aom3.yRot, aom3.xRot);
+                        this.level.addFreshEntity(bbs5);
                     }
-                    if (akz3.isPassenger()) {
-                        akz3.stopRiding();
+                    if (aom3.isPassenger()) {
+                        aom3.stopRiding();
                     }
-                    akz3.teleportTo(this.getX(), this.getY(), this.getZ());
-                    akz3.fallDistance = 0.0f;
-                    akz3.hurt(DamageSource.FALL, 5.0f);
+                    aom3.teleportTo(this.getX(), this.getY(), this.getZ());
+                    aom3.fallDistance = 0.0f;
+                    aom3.hurt(DamageSource.FALL, 5.0f);
                 }
             }
-            else if (akz3 != null) {
-                akz3.teleportTo(this.getX(), this.getY(), this.getZ());
-                akz3.fallDistance = 0.0f;
+            else if (aom3 != null) {
+                aom3.teleportTo(this.getX(), this.getY(), this.getZ());
+                aom3.fallDistance = 0.0f;
             }
             this.remove();
         }
@@ -102,8 +77,8 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
     
     @Override
     public void tick() {
-        final LivingEntity akz2 = this.getOwner();
-        if (akz2 != null && akz2 instanceof Player && !akz2.isAlive()) {
+        final Entity aom2 = this.getOwner();
+        if (aom2 instanceof Player && !aom2.isAlive()) {
             this.remove();
         }
         else {
@@ -113,10 +88,11 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
     
     @Nullable
     @Override
-    public Entity changeDimension(final DimensionType cbi) {
-        if (this.owner.dimension != cbi) {
-            this.owner = null;
+    public Entity changeDimension(final ServerLevel zd) {
+        final Entity aom3 = this.getOwner();
+        if (aom3 != null && aom3.level.dimension() != zd.dimension()) {
+            this.setOwner(null);
         }
-        return super.changeDimension(cbi);
+        return super.changeDimension(zd);
     }
 }
diff --git a/src/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java b/src/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java
index ba469aa..06c3b1b 100644
--- a/src/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java
+++ b/src/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java
@@ -1,10 +1,9 @@
 package net.minecraft.world.entity.projectile;
 
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ExperienceOrb;
 import net.minecraft.world.item.alchemy.PotionUtils;
 import net.minecraft.world.item.alchemy.Potions;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.Item;
@@ -13,16 +12,16 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class ThrownExperienceBottle extends ThrowableItemProjectile {
-    public ThrownExperienceBottle(final EntityType<? extends ThrownExperienceBottle> aku, final Level bjw) {
-        super(aku, bjw);
+    public ThrownExperienceBottle(final EntityType<? extends ThrownExperienceBottle> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public ThrownExperienceBottle(final Level bjw, final LivingEntity akz) {
-        super(EntityType.EXPERIENCE_BOTTLE, akz, bjw);
+    public ThrownExperienceBottle(final Level bqb, final LivingEntity aoy) {
+        super(EntityType.EXPERIENCE_BOTTLE, aoy, bqb);
     }
     
-    public ThrownExperienceBottle(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.EXPERIENCE_BOTTLE, double2, double3, double4, bjw);
+    public ThrownExperienceBottle(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.EXPERIENCE_BOTTLE, double2, double3, double4, bqb);
     }
     
     @Override
@@ -36,9 +35,10 @@ public class ThrownExperienceBottle extends ThrowableItemProjectile {
     }
     
     @Override
-    protected void onHit(final HitResult cvi) {
+    protected void onHit(final HitResult dej) {
+        super.onHit(dej);
         if (!this.level.isClientSide) {
-            this.level.levelEvent(2002, new BlockPos(this), PotionUtils.getColor(Potions.WATER));
+            this.level.levelEvent(2002, this.blockPosition(), PotionUtils.getColor(Potions.WATER));
             int integer3 = 3 + this.level.random.nextInt(5) + this.level.random.nextInt(5);
             while (integer3 > 0) {
                 final int integer4 = ExperienceOrb.getExperienceValue(integer3);
diff --git a/src/net/minecraft/world/entity/projectile/ThrownPotion.java b/src/net/minecraft/world/entity/projectile/ThrownPotion.java
index 89bba0d..4bd32cc 100644
--- a/src/net/minecraft/world/entity/projectile/ThrownPotion.java
+++ b/src/net/minecraft/world/entity/projectile/ThrownPotion.java
@@ -1,82 +1,58 @@
 package net.minecraft.world.entity.projectile;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import org.apache.logging.log4j.LogManager;
-import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.network.syncher.EntityDataSerializers;
-import net.minecraft.world.entity.monster.Blaze;
-import net.minecraft.world.entity.monster.EnderMan;
-import net.minecraft.nbt.Tag;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.level.block.CampfireBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.CampfireBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.AreaEffectCloud;
 import net.minecraft.world.effect.MobEffect;
 import javax.annotation.Nullable;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.EntityHitResult;
+import net.minecraft.world.phys.HitResult;
 import java.util.Iterator;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.effect.MobEffectInstance;
 import java.util.List;
 import net.minecraft.world.item.alchemy.Potion;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.EntityHitResult;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.Direction;
-import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.item.alchemy.Potions;
 import net.minecraft.world.item.alchemy.PotionUtils;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import java.util.function.Predicate;
-import org.apache.logging.log4j.Logger;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.network.syncher.EntityDataAccessor;
 
-public class ThrownPotion extends ThrowableProjectile implements ItemSupplier {
-    private static final EntityDataAccessor<ItemStack> DATA_ITEM_STACK;
-    private static final Logger LOGGER;
+public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplier {
     public static final Predicate<LivingEntity> WATER_SENSITIVE;
     
-    public ThrownPotion(final EntityType<? extends ThrownPotion> aku, final Level bjw) {
-        super(aku, bjw);
+    public ThrownPotion(final EntityType<? extends ThrownPotion> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public ThrownPotion(final Level bjw, final LivingEntity akz) {
-        super(EntityType.POTION, akz, bjw);
+    public ThrownPotion(final Level bqb, final LivingEntity aoy) {
+        super(EntityType.POTION, aoy, bqb);
     }
     
-    public ThrownPotion(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.POTION, double2, double3, double4, bjw);
+    public ThrownPotion(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.POTION, double2, double3, double4, bqb);
     }
     
     @Override
-    protected void defineSynchedData() {
-        this.getEntityData().<ItemStack>define(ThrownPotion.DATA_ITEM_STACK, ItemStack.EMPTY);
-    }
-    
-    @Override
-    public ItemStack getItem() {
-        final ItemStack ben2 = this.getEntityData().<ItemStack>get(ThrownPotion.DATA_ITEM_STACK);
-        if (ben2.getItem() != Items.SPLASH_POTION && ben2.getItem() != Items.LINGERING_POTION) {
-            if (this.level != null) {
-                ThrownPotion.LOGGER.error("ThrownPotion entity {} has no item?!", this.getId());
-            }
-            return new ItemStack(Items.SPLASH_POTION);
-        }
-        return ben2;
-    }
-    
-    public void setItem(final ItemStack ben) {
-        this.getEntityData().<ItemStack>set(ThrownPotion.DATA_ITEM_STACK, ben.copy());
+    protected Item getDefaultItem() {
+        return Items.SPLASH_POTION;
     }
     
     @Override
@@ -85,148 +61,137 @@ public class ThrownPotion extends ThrowableProjectile implements ItemSupplier {
     }
     
     @Override
-    protected void onHit(final HitResult cvi) {
+    protected void onHitBlock(final BlockHitResult deh) {
+        super.onHitBlock(deh);
         if (this.level.isClientSide) {
             return;
         }
-        final ItemStack ben3 = this.getItem();
-        final Potion bgd4 = PotionUtils.getPotion(ben3);
-        final List<MobEffectInstance> list5 = PotionUtils.getMobEffects(ben3);
-        final boolean boolean6 = bgd4 == Potions.WATER && list5.isEmpty();
-        if (cvi.getType() == HitResult.Type.BLOCK && boolean6) {
-            final BlockHitResult cvg7 = (BlockHitResult)cvi;
-            final Direction fp8 = cvg7.getDirection();
-            final BlockPos fk9 = cvg7.getBlockPos().relative(fp8);
-            this.dowseFire(fk9, fp8);
-            this.dowseFire(fk9.relative(fp8.getOpposite()), fp8);
-            for (final Direction fp9 : Direction.Plane.HORIZONTAL) {
-                this.dowseFire(fk9.relative(fp9), fp9);
+        final ItemStack bki3 = this.getItem();
+        final Potion bmb4 = PotionUtils.getPotion(bki3);
+        final List<MobEffectInstance> list5 = PotionUtils.getMobEffects(bki3);
+        final boolean boolean6 = bmb4 == Potions.WATER && list5.isEmpty();
+        final Direction fz7 = deh.getDirection();
+        final BlockPos fu8 = deh.getBlockPos();
+        final BlockPos fu9 = fu8.relative(fz7);
+        if (boolean6) {
+            this.dowseFire(fu9, fz7);
+            this.dowseFire(fu9.relative(fz7.getOpposite()), fz7);
+            for (final Direction fz8 : Direction.Plane.HORIZONTAL) {
+                this.dowseFire(fu9.relative(fz8), fz8);
             }
         }
+    }
+    
+    @Override
+    protected void onHit(final HitResult dej) {
+        super.onHit(dej);
+        if (this.level.isClientSide) {
+            return;
+        }
+        final ItemStack bki3 = this.getItem();
+        final Potion bmb4 = PotionUtils.getPotion(bki3);
+        final List<MobEffectInstance> list5 = PotionUtils.getMobEffects(bki3);
+        final boolean boolean6 = bmb4 == Potions.WATER && list5.isEmpty();
         if (boolean6) {
             this.applyWater();
         }
         else if (!list5.isEmpty()) {
             if (this.isLingering()) {
-                this.makeAreaOfEffectCloud(ben3, bgd4);
+                this.makeAreaOfEffectCloud(bki3, bmb4);
             }
             else {
-                this.applySplash(list5, (cvi.getType() == HitResult.Type.ENTITY) ? ((EntityHitResult)cvi).getEntity() : null);
+                this.applySplash(list5, (dej.getType() == HitResult.Type.ENTITY) ? ((EntityHitResult)dej).getEntity() : null);
             }
         }
-        final int integer7 = bgd4.hasInstantEffects() ? 2007 : 2002;
-        this.level.levelEvent(integer7, new BlockPos(this), PotionUtils.getColor(ben3));
+        final int integer7 = bmb4.hasInstantEffects() ? 2007 : 2002;
+        this.level.levelEvent(integer7, this.blockPosition(), PotionUtils.getColor(bki3));
         this.remove();
     }
     
     private void applyWater() {
-        final AABB cvf2 = this.getBoundingBox().inflate(4.0, 2.0, 4.0);
-        final List<LivingEntity> list3 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, cvf2, ThrownPotion.WATER_SENSITIVE);
+        final AABB deg2 = this.getBoundingBox().inflate(4.0, 2.0, 4.0);
+        final List<LivingEntity> list3 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, deg2, ThrownPotion.WATER_SENSITIVE);
         if (!list3.isEmpty()) {
-            for (final LivingEntity akz5 : list3) {
-                final double double6 = this.distanceToSqr(akz5);
-                if (double6 < 16.0 && isWaterSensitiveEntity(akz5)) {
-                    akz5.hurt(DamageSource.indirectMagic(akz5, this.getOwner()), 1.0f);
+            for (final LivingEntity aoy5 : list3) {
+                final double double6 = this.distanceToSqr(aoy5);
+                if (double6 < 16.0 && aoy5.isSensitiveToWater()) {
+                    aoy5.hurt(DamageSource.indirectMagic(aoy5, this.getOwner()), 1.0f);
                 }
             }
         }
     }
     
-    private void applySplash(final List<MobEffectInstance> list, @Nullable final Entity akq) {
-        final AABB cvf4 = this.getBoundingBox().inflate(4.0, 2.0, 4.0);
-        final List<LivingEntity> list2 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, cvf4);
+    private void applySplash(final List<MobEffectInstance> list, @Nullable final Entity aom) {
+        final AABB deg4 = this.getBoundingBox().inflate(4.0, 2.0, 4.0);
+        final List<LivingEntity> list2 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, deg4);
         if (!list2.isEmpty()) {
-            for (final LivingEntity akz7 : list2) {
-                if (!akz7.isAffectedByPotions()) {
+            for (final LivingEntity aoy7 : list2) {
+                if (!aoy7.isAffectedByPotions()) {
                     continue;
                 }
-                final double double8 = this.distanceToSqr(akz7);
+                final double double8 = this.distanceToSqr(aoy7);
                 if (double8 >= 16.0) {
                     continue;
                 }
                 double double9 = 1.0 - Math.sqrt(double8) / 4.0;
-                if (akz7 == akq) {
+                if (aoy7 == aom) {
                     double9 = 1.0;
                 }
-                for (final MobEffectInstance akk13 : list) {
-                    final MobEffect aki14 = akk13.getEffect();
-                    if (aki14.isInstantenous()) {
-                        aki14.applyInstantenousEffect(this, this.getOwner(), akz7, akk13.getAmplifier(), double9);
+                for (final MobEffectInstance aog13 : list) {
+                    final MobEffect aoe14 = aog13.getEffect();
+                    if (aoe14.isInstantenous()) {
+                        aoe14.applyInstantenousEffect(this, this.getOwner(), aoy7, aog13.getAmplifier(), double9);
                     }
                     else {
-                        final int integer15 = (int)(double9 * akk13.getDuration() + 0.5);
+                        final int integer15 = (int)(double9 * aog13.getDuration() + 0.5);
                         if (integer15 <= 20) {
                             continue;
                         }
-                        akz7.addEffect(new MobEffectInstance(aki14, integer15, akk13.getAmplifier(), akk13.isAmbient(), akk13.isVisible()));
+                        aoy7.addEffect(new MobEffectInstance(aoe14, integer15, aog13.getAmplifier(), aog13.isAmbient(), aog13.isVisible()));
                     }
                 }
             }
         }
     }
     
-    private void makeAreaOfEffectCloud(final ItemStack ben, final Potion bgd) {
-        final AreaEffectCloud akp4 = new AreaEffectCloud(this.level, this.getX(), this.getY(), this.getZ());
-        akp4.setOwner(this.getOwner());
-        akp4.setRadius(3.0f);
-        akp4.setRadiusOnUse(-0.5f);
-        akp4.setWaitTime(10);
-        akp4.setRadiusPerTick(-akp4.getRadius() / akp4.getDuration());
-        akp4.setPotion(bgd);
-        for (final MobEffectInstance akk6 : PotionUtils.getCustomEffects(ben)) {
-            akp4.addEffect(new MobEffectInstance(akk6));
+    private void makeAreaOfEffectCloud(final ItemStack bki, final Potion bmb) {
+        final AreaEffectCloud aol4 = new AreaEffectCloud(this.level, this.getX(), this.getY(), this.getZ());
+        final Entity aom5 = this.getOwner();
+        if (aom5 instanceof LivingEntity) {
+            aol4.setOwner((LivingEntity)aom5);
         }
-        final CompoundTag jt5 = ben.getTag();
-        if (jt5 != null && jt5.contains("CustomPotionColor", 99)) {
-            akp4.setFixedColor(jt5.getInt("CustomPotionColor"));
+        aol4.setRadius(3.0f);
+        aol4.setRadiusOnUse(-0.5f);
+        aol4.setWaitTime(10);
+        aol4.setRadiusPerTick(-aol4.getRadius() / aol4.getDuration());
+        aol4.setPotion(bmb);
+        for (final MobEffectInstance aog7 : PotionUtils.getCustomEffects(bki)) {
+            aol4.addEffect(new MobEffectInstance(aog7));
         }
-        this.level.addFreshEntity(akp4);
+        final CompoundTag le6 = bki.getTag();
+        if (le6 != null && le6.contains("CustomPotionColor", 99)) {
+            aol4.setFixedColor(le6.getInt("CustomPotionColor"));
+        }
+        this.level.addFreshEntity(aol4);
     }
     
     private boolean isLingering() {
         return this.getItem().getItem() == Items.LINGERING_POTION;
     }
     
-    private void dowseFire(final BlockPos fk, final Direction fp) {
-        final BlockState byj4 = this.level.getBlockState(fk);
-        final Block bph5 = byj4.getBlock();
-        if (bph5 == Blocks.FIRE) {
-            this.level.extinguishFire(null, fk.relative(fp), fp.getOpposite());
+    private void dowseFire(final BlockPos fu, final Direction fz) {
+        final BlockState cfj4 = this.level.getBlockState(fu);
+        if (cfj4.is(BlockTags.FIRE)) {
+            this.level.removeBlock(fu, false);
         }
-        else if (bph5 == Blocks.CAMPFIRE && byj4.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT)) {
-            this.level.levelEvent(null, 1009, fk, 0);
-            this.level.setBlockAndUpdate(fk, ((AbstractStateHolder<O, BlockState>)byj4).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.LIT, false));
+        else if (CampfireBlock.isLitCampfire(cfj4)) {
+            this.level.levelEvent(null, 1009, fu, 0);
+            CampfireBlock.dowse(this.level, fu, cfj4);
+            this.level.setBlockAndUpdate(fu, ((StateHolder<O, BlockState>)cfj4).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.LIT, false));
         }
     }
     
-    @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        final ItemStack ben3 = ItemStack.of(jt.getCompound("Potion"));
-        if (ben3.isEmpty()) {
-            this.remove();
-        }
-        else {
-            this.setItem(ben3);
-        }
-    }
-    
-    @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        final ItemStack ben3 = this.getItem();
-        if (!ben3.isEmpty()) {
-            jt.put("Potion", ben3.save(new CompoundTag()));
-        }
-    }
-    
-    private static boolean isWaterSensitiveEntity(final LivingEntity akz) {
-        return akz instanceof EnderMan || akz instanceof Blaze;
-    }
-    
     static {
-        DATA_ITEM_STACK = SynchedEntityData.<ItemStack>defineId(ThrownPotion.class, EntityDataSerializers.ITEM_STACK);
-        LOGGER = LogManager.getLogger();
-        WATER_SENSITIVE = ThrownPotion::isWaterSensitiveEntity;
+        WATER_SENSITIVE = LivingEntity::isSensitiveToWater;
     }
 }
diff --git a/src/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/net/minecraft/world/entity/projectile/ThrownTrident.java
index b42af39..2d6d087 100644
--- a/src/net/minecraft/world/entity/projectile/ThrownTrident.java
+++ b/src/net/minecraft/world/entity/projectile/ThrownTrident.java
@@ -7,7 +7,8 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.entity.global.LightningBolt;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.entity.LightningBolt;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.damagesource.DamageSource;
 import javax.annotation.Nullable;
@@ -32,21 +33,21 @@ public class ThrownTrident extends AbstractArrow {
     private boolean dealtDamage;
     public int clientSideReturnTridentTickCount;
     
-    public ThrownTrident(final EntityType<? extends ThrownTrident> aku, final Level bjw) {
-        super(aku, bjw);
+    public ThrownTrident(final EntityType<? extends ThrownTrident> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.tridentItem = new ItemStack(Items.TRIDENT);
     }
     
-    public ThrownTrident(final Level bjw, final LivingEntity akz, final ItemStack ben) {
-        super(EntityType.TRIDENT, akz, bjw);
+    public ThrownTrident(final Level bqb, final LivingEntity aoy, final ItemStack bki) {
+        super(EntityType.TRIDENT, aoy, bqb);
         this.tridentItem = new ItemStack(Items.TRIDENT);
-        this.tridentItem = ben.copy();
-        this.entityData.<Byte>set(ThrownTrident.ID_LOYALTY, (byte)EnchantmentHelper.getLoyalty(ben));
-        this.entityData.<Boolean>set(ThrownTrident.ID_FOIL, ben.hasFoil());
+        this.tridentItem = bki.copy();
+        this.entityData.<Byte>set(ThrownTrident.ID_LOYALTY, (byte)EnchantmentHelper.getLoyalty(bki));
+        this.entityData.<Boolean>set(ThrownTrident.ID_FOIL, bki.hasFoil());
     }
     
-    public ThrownTrident(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.TRIDENT, double2, double3, double4, bjw);
+    public ThrownTrident(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.TRIDENT, double2, double3, double4, bqb);
         this.tridentItem = new ItemStack(Items.TRIDENT);
     }
     
@@ -62,8 +63,8 @@ public class ThrownTrident extends AbstractArrow {
         if (this.inGroundTime > 4) {
             this.dealtDamage = true;
         }
-        final Entity akq2 = this.getOwner();
-        if ((this.dealtDamage || this.isNoPhysics()) && akq2 != null) {
+        final Entity aom2 = this.getOwner();
+        if ((this.dealtDamage || this.isNoPhysics()) && aom2 != null) {
             final int integer3 = this.entityData.<Byte>get(ThrownTrident.ID_LOYALTY);
             if (integer3 > 0 && !this.isAcceptibleReturnOwner()) {
                 if (!this.level.isClientSide && this.pickup == Pickup.ALLOWED) {
@@ -73,13 +74,13 @@ public class ThrownTrident extends AbstractArrow {
             }
             else if (integer3 > 0) {
                 this.setNoPhysics(true);
-                final Vec3 cvl4 = new Vec3(akq2.getX() - this.getX(), akq2.getEyeY() - this.getY(), akq2.getZ() - this.getZ());
-                this.setPosRaw(this.getX(), this.getY() + cvl4.y * 0.015 * integer3, this.getZ());
+                final Vec3 dem4 = new Vec3(aom2.getX() - this.getX(), aom2.getEyeY() - this.getY(), aom2.getZ() - this.getZ());
+                this.setPosRaw(this.getX(), this.getY() + dem4.y * 0.015 * integer3, this.getZ());
                 if (this.level.isClientSide) {
                     this.yOld = this.getY();
                 }
                 final double double5 = 0.05 * integer3;
-                this.setDeltaMovement(this.getDeltaMovement().scale(0.95).add(cvl4.normalize().scale(double5)));
+                this.setDeltaMovement(this.getDeltaMovement().scale(0.95).add(dem4.normalize().scale(double5)));
                 if (this.clientSideReturnTridentTickCount == 0) {
                     this.playSound(SoundEvents.TRIDENT_RETURN, 10.0f, 1.0f);
                 }
@@ -90,8 +91,8 @@ public class ThrownTrident extends AbstractArrow {
     }
     
     private boolean isAcceptibleReturnOwner() {
-        final Entity akq2 = this.getOwner();
-        return akq2 != null && akq2.isAlive() && (!(akq2 instanceof ServerPlayer) || !akq2.isSpectator());
+        final Entity aom2 = this.getOwner();
+        return aom2 != null && aom2.isAlive() && (!(aom2 instanceof ServerPlayer) || !aom2.isSpectator());
     }
     
     @Override
@@ -105,51 +106,52 @@ public class ThrownTrident extends AbstractArrow {
     
     @Nullable
     @Override
-    protected EntityHitResult findHitEntity(final Vec3 cvl1, final Vec3 cvl2) {
+    protected EntityHitResult findHitEntity(final Vec3 dem1, final Vec3 dem2) {
         if (this.dealtDamage) {
             return null;
         }
-        return super.findHitEntity(cvl1, cvl2);
+        return super.findHitEntity(dem1, dem2);
     }
     
     @Override
-    protected void onHitEntity(final EntityHitResult cvh) {
-        final Entity akq3 = cvh.getEntity();
+    protected void onHitEntity(final EntityHitResult dei) {
+        final Entity aom3 = dei.getEntity();
         float float4 = 8.0f;
-        if (akq3 instanceof LivingEntity) {
-            final LivingEntity akz5 = (LivingEntity)akq3;
-            float4 += EnchantmentHelper.getDamageBonus(this.tridentItem, akz5.getMobType());
+        if (aom3 instanceof LivingEntity) {
+            final LivingEntity aoy5 = (LivingEntity)aom3;
+            float4 += EnchantmentHelper.getDamageBonus(this.tridentItem, aoy5.getMobType());
         }
-        final Entity akq4 = this.getOwner();
-        final DamageSource ajz6 = DamageSource.trident(this, (akq4 == null) ? this : akq4);
+        final Entity aom4 = this.getOwner();
+        final DamageSource anw6 = DamageSource.trident(this, (aom4 == null) ? this : aom4);
         this.dealtDamage = true;
-        SoundEvent aah7 = SoundEvents.TRIDENT_HIT;
-        if (akq3.hurt(ajz6, float4)) {
-            if (akq3.getType() == EntityType.ENDERMAN) {
+        SoundEvent ack7 = SoundEvents.TRIDENT_HIT;
+        if (aom3.hurt(anw6, float4)) {
+            if (aom3.getType() == EntityType.ENDERMAN) {
                 return;
             }
-            if (akq3 instanceof LivingEntity) {
-                final LivingEntity akz6 = (LivingEntity)akq3;
-                if (akq4 instanceof LivingEntity) {
-                    EnchantmentHelper.doPostHurtEffects(akz6, akq4);
-                    EnchantmentHelper.doPostDamageEffects((LivingEntity)akq4, akz6);
+            if (aom3 instanceof LivingEntity) {
+                final LivingEntity aoy6 = (LivingEntity)aom3;
+                if (aom4 instanceof LivingEntity) {
+                    EnchantmentHelper.doPostHurtEffects(aoy6, aom4);
+                    EnchantmentHelper.doPostDamageEffects((LivingEntity)aom4, aoy6);
                 }
-                this.doPostHurtEffects(akz6);
+                this.doPostHurtEffects(aoy6);
             }
         }
         this.setDeltaMovement(this.getDeltaMovement().multiply(-0.01, -0.1, -0.01));
         float float5 = 1.0f;
         if (this.level instanceof ServerLevel && this.level.isThundering() && EnchantmentHelper.hasChanneling(this.tridentItem)) {
-            final BlockPos fk9 = akq3.getCommandSenderBlockPosition();
-            if (this.level.canSeeSky(fk9)) {
-                final LightningBolt avy10 = new LightningBolt(this.level, fk9.getX() + 0.5, fk9.getY(), fk9.getZ() + 0.5, false);
-                avy10.setCause((akq4 instanceof ServerPlayer) ? ((ServerPlayer)akq4) : null);
-                ((ServerLevel)this.level).addGlobalEntity(avy10);
-                aah7 = SoundEvents.TRIDENT_THUNDER;
+            final BlockPos fu9 = aom3.blockPosition();
+            if (this.level.canSeeSky(fu9)) {
+                final LightningBolt aox10 = EntityType.LIGHTNING_BOLT.create(this.level);
+                aox10.moveTo(Vec3.atBottomCenterOf(fu9));
+                aox10.setCause((aom4 instanceof ServerPlayer) ? ((ServerPlayer)aom4) : null);
+                this.level.addFreshEntity(aox10);
+                ack7 = SoundEvents.TRIDENT_THUNDER;
                 float5 = 5.0f;
             }
         }
-        this.playSound(aah7, float5, 1.0f);
+        this.playSound(ack7, float5, 1.0f);
     }
     
     @Override
@@ -158,29 +160,29 @@ public class ThrownTrident extends AbstractArrow {
     }
     
     @Override
-    public void playerTouch(final Player ayj) {
-        final Entity akq3 = this.getOwner();
-        if (akq3 != null && akq3.getUUID() != ayj.getUUID()) {
+    public void playerTouch(final Player bec) {
+        final Entity aom3 = this.getOwner();
+        if (aom3 != null && aom3.getUUID() != bec.getUUID()) {
             return;
         }
-        super.playerTouch(ayj);
+        super.playerTouch(bec);
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("Trident", 10)) {
-            this.tridentItem = ItemStack.of(jt.getCompound("Trident"));
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("Trident", 10)) {
+            this.tridentItem = ItemStack.of(le.getCompound("Trident"));
         }
-        this.dealtDamage = jt.getBoolean("DealtDamage");
+        this.dealtDamage = le.getBoolean("DealtDamage");
         this.entityData.<Byte>set(ThrownTrident.ID_LOYALTY, (byte)EnchantmentHelper.getLoyalty(this.tridentItem));
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.put("Trident", this.tridentItem.save(new CompoundTag()));
-        jt.putBoolean("DealtDamage", this.dealtDamage);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.put("Trident", this.tridentItem.save(new CompoundTag()));
+        le.putBoolean("DealtDamage", this.dealtDamage);
     }
     
     public void tickDespawn() {
diff --git a/src/net/minecraft/world/entity/projectile/WitherSkull.java b/src/net/minecraft/world/entity/projectile/WitherSkull.java
index d0f22c1..c04dfac 100644
--- a/src/net/minecraft/world/entity/projectile/WitherSkull.java
+++ b/src/net/minecraft/world/entity/projectile/WitherSkull.java
@@ -2,14 +2,14 @@ package net.minecraft.world.entity.projectile;
 
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.GameRules;
+import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.Difficulty;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.entity.boss.wither.WitherBoss;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.state.BlockState;
@@ -24,16 +24,16 @@ import net.minecraft.network.syncher.EntityDataAccessor;
 public class WitherSkull extends AbstractHurtingProjectile {
     private static final EntityDataAccessor<Boolean> DATA_DANGEROUS;
     
-    public WitherSkull(final EntityType<? extends WitherSkull> aku, final Level bjw) {
-        super(aku, bjw);
+    public WitherSkull(final EntityType<? extends WitherSkull> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public WitherSkull(final Level bjw, final LivingEntity akz, final double double3, final double double4, final double double5) {
-        super(EntityType.WITHER_SKULL, akz, double3, double4, double5, bjw);
+    public WitherSkull(final Level bqb, final LivingEntity aoy, final double double3, final double double4, final double double5) {
+        super(EntityType.WITHER_SKULL, aoy, double3, double4, double5, bqb);
     }
     
-    public WitherSkull(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
-        super(EntityType.WITHER_SKULL, double2, double3, double4, double5, double6, double7, bjw);
+    public WitherSkull(final Level bqb, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+        super(EntityType.WITHER_SKULL, double2, double3, double4, double5, double6, double7, bqb);
     }
     
     @Override
@@ -47,45 +47,55 @@ public class WitherSkull extends AbstractHurtingProjectile {
     }
     
     @Override
-    public float getBlockExplosionResistance(final Explosion bjp, final BlockGetter bjg, final BlockPos fk, final BlockState byj, final FluidState coj, final float float6) {
-        if (this.isDangerous() && WitherBoss.canDestroy(byj)) {
+    public float getBlockExplosionResistance(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final FluidState cxa, final float float6) {
+        if (this.isDangerous() && WitherBoss.canDestroy(cfj)) {
             return Math.min(0.8f, float6);
         }
         return float6;
     }
     
     @Override
-    protected void onHit(final HitResult cvi) {
-        super.onHit(cvi);
-        if (!this.level.isClientSide) {
-            if (cvi.getType() == HitResult.Type.ENTITY) {
-                final Entity akq3 = ((EntityHitResult)cvi).getEntity();
-                if (this.owner != null) {
-                    if (akq3.hurt(DamageSource.mobAttack(this.owner), 8.0f)) {
-                        if (akq3.isAlive()) {
-                            this.doEnchantDamageEffects(this.owner, akq3);
-                        }
-                        else {
-                            this.owner.heal(5.0f);
-                        }
-                    }
+    protected void onHitEntity(final EntityHitResult dei) {
+        super.onHitEntity(dei);
+        if (this.level.isClientSide) {
+            return;
+        }
+        final Entity aom3 = dei.getEntity();
+        final Entity aom4 = this.getOwner();
+        boolean boolean5;
+        if (aom4 instanceof LivingEntity) {
+            final LivingEntity aoy6 = (LivingEntity)aom4;
+            boolean5 = aom3.hurt(DamageSource.witherSkull(this, aoy6), 8.0f);
+            if (boolean5) {
+                if (aom3.isAlive()) {
+                    this.doEnchantDamageEffects(aoy6, aom3);
                 }
                 else {
-                    akq3.hurt(DamageSource.MAGIC, 5.0f);
-                }
-                if (akq3 instanceof LivingEntity) {
-                    int integer4 = 0;
-                    if (this.level.getDifficulty() == Difficulty.NORMAL) {
-                        integer4 = 10;
-                    }
-                    else if (this.level.getDifficulty() == Difficulty.HARD) {
-                        integer4 = 40;
-                    }
-                    if (integer4 > 0) {
-                        ((LivingEntity)akq3).addEffect(new MobEffectInstance(MobEffects.WITHER, 20 * integer4, 1));
-                    }
+                    aoy6.heal(5.0f);
                 }
             }
+        }
+        else {
+            boolean5 = aom3.hurt(DamageSource.MAGIC, 5.0f);
+        }
+        if (boolean5 && aom3 instanceof LivingEntity) {
+            int integer6 = 0;
+            if (this.level.getDifficulty() == Difficulty.NORMAL) {
+                integer6 = 10;
+            }
+            else if (this.level.getDifficulty() == Difficulty.HARD) {
+                integer6 = 40;
+            }
+            if (integer6 > 0) {
+                ((LivingEntity)aom3).addEffect(new MobEffectInstance(MobEffects.WITHER, 20 * integer6, 1));
+            }
+        }
+    }
+    
+    @Override
+    protected void onHit(final HitResult dej) {
+        super.onHit(dej);
+        if (!this.level.isClientSide) {
             final Explosion.BlockInteraction a3 = this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? Explosion.BlockInteraction.DESTROY : Explosion.BlockInteraction.NONE;
             this.level.explode(this, this.getX(), this.getY(), this.getZ(), 1.0f, false, a3);
             this.remove();
@@ -98,7 +108,7 @@ public class WitherSkull extends AbstractHurtingProjectile {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/entity/raid/Raid.java b/src/net/minecraft/world/entity/raid/Raid.java
index 9134e12..6a807fb 100644
--- a/src/net/minecraft/world/entity/raid/Raid.java
+++ b/src/net/minecraft/world/entity/raid/Raid.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.entity.raid;
 
+import net.minecraft.nbt.IntArrayTag;
 import java.util.AbstractList;
 import java.util.Locale;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -36,6 +37,7 @@ import java.util.Comparator;
 import net.minecraft.core.Vec3i;
 import java.util.function.Function;
 import net.minecraft.core.SectionPos;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.effect.MobEffectInstance;
@@ -47,11 +49,11 @@ import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.player.Player;
 import java.util.Iterator;
 import java.util.List;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.server.level.ServerPlayer;
 import java.util.function.Predicate;
 import net.minecraft.world.level.Level;
 import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.BossEvent;
 import com.google.common.collect.Sets;
@@ -94,7 +96,7 @@ public class Raid {
     private int celebrationTicks;
     private Optional<BlockPos> waveSpawnPos;
     
-    public Raid(final int integer, final ServerLevel xd, final BlockPos fk) {
+    public Raid(final int integer, final ServerLevel zd, final BlockPos fu) {
         this.groupToLeaderMap = Maps.newHashMap();
         this.groupRaiderMap = Maps.newHashMap();
         this.heroesOfTheVillage = Sets.newHashSet();
@@ -102,42 +104,40 @@ public class Raid {
         this.random = new Random();
         this.waveSpawnPos = Optional.<BlockPos>empty();
         this.id = integer;
-        this.level = xd;
+        this.level = zd;
         this.active = true;
         this.raidCooldownTicks = 300;
         this.raidEvent.setPercent(0.0f);
-        this.center = fk;
-        this.numGroups = this.getNumGroups(xd.getDifficulty());
+        this.center = fu;
+        this.numGroups = this.getNumGroups(zd.getDifficulty());
         this.status = RaidStatus.ONGOING;
     }
     
-    public Raid(final ServerLevel xd, final CompoundTag jt) {
+    public Raid(final ServerLevel zd, final CompoundTag le) {
         this.groupToLeaderMap = Maps.newHashMap();
         this.groupRaiderMap = Maps.newHashMap();
         this.heroesOfTheVillage = Sets.newHashSet();
         this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10);
         this.random = new Random();
         this.waveSpawnPos = Optional.<BlockPos>empty();
-        this.level = xd;
-        this.id = jt.getInt("Id");
-        this.started = jt.getBoolean("Started");
-        this.active = jt.getBoolean("Active");
-        this.ticksActive = jt.getLong("TicksActive");
-        this.badOmenLevel = jt.getInt("BadOmenLevel");
-        this.groupsSpawned = jt.getInt("GroupsSpawned");
-        this.raidCooldownTicks = jt.getInt("PreRaidTicks");
-        this.postRaidTicks = jt.getInt("PostRaidTicks");
-        this.totalHealth = jt.getFloat("TotalHealth");
-        this.center = new BlockPos(jt.getInt("CX"), jt.getInt("CY"), jt.getInt("CZ"));
-        this.numGroups = jt.getInt("NumGroups");
-        this.status = getByName(jt.getString("Status"));
+        this.level = zd;
+        this.id = le.getInt("Id");
+        this.started = le.getBoolean("Started");
+        this.active = le.getBoolean("Active");
+        this.ticksActive = le.getLong("TicksActive");
+        this.badOmenLevel = le.getInt("BadOmenLevel");
+        this.groupsSpawned = le.getInt("GroupsSpawned");
+        this.raidCooldownTicks = le.getInt("PreRaidTicks");
+        this.postRaidTicks = le.getInt("PostRaidTicks");
+        this.totalHealth = le.getFloat("TotalHealth");
+        this.center = new BlockPos(le.getInt("CX"), le.getInt("CY"), le.getInt("CZ"));
+        this.numGroups = le.getInt("NumGroups");
+        this.status = getByName(le.getString("Status"));
         this.heroesOfTheVillage.clear();
-        if (jt.contains("HeroesOfTheVillage", 9)) {
-            final ListTag jz4 = jt.getList("HeroesOfTheVillage", 10);
-            for (int integer5 = 0; integer5 < jz4.size(); ++integer5) {
-                final CompoundTag jt2 = jz4.getCompound(integer5);
-                final UUID uUID7 = jt2.getUUID("UUID");
-                this.heroesOfTheVillage.add(uUID7);
+        if (le.contains("HeroesOfTheVillage", 9)) {
+            final ListTag lk4 = le.getList("HeroesOfTheVillage", 11);
+            for (int integer5 = 0; integer5 < lk4.size(); ++integer5) {
+                this.heroesOfTheVillage.add(NbtUtils.loadUUID(lk4.get(integer5)));
             }
         }
     }
@@ -179,24 +179,24 @@ public class Raid {
     }
     
     private Predicate<ServerPlayer> validPlayer() {
-        final BlockPos fk3;
-        return xe -> {
-            fk3 = new BlockPos(xe);
-            return xe.isAlive() && this.level.getRaidAt(fk3) == this;
+        final BlockPos fu3;
+        return ze -> {
+            fu3 = ze.blockPosition();
+            return ze.isAlive() && this.level.getRaidAt(fu3) == this;
         };
     }
     
     private void updatePlayers() {
         final Set<ServerPlayer> set2 = Sets.newHashSet(this.raidEvent.getPlayers());
         final List<ServerPlayer> list3 = this.level.getPlayers(this.validPlayer());
-        for (final ServerPlayer xe5 : list3) {
-            if (!set2.contains(xe5)) {
-                this.raidEvent.addPlayer(xe5);
+        for (final ServerPlayer ze5 : list3) {
+            if (!set2.contains(ze5)) {
+                this.raidEvent.addPlayer(ze5);
             }
         }
-        for (final ServerPlayer xe5 : set2) {
-            if (!list3.contains(xe5)) {
-                this.raidEvent.removePlayer(xe5);
+        for (final ServerPlayer ze5 : set2) {
+            if (!list3.contains(ze5)) {
+                this.raidEvent.removePlayer(ze5);
             }
         }
     }
@@ -209,12 +209,12 @@ public class Raid {
         return this.badOmenLevel;
     }
     
-    public void absorbBadOmen(final Player ayj) {
-        if (ayj.hasEffect(MobEffects.BAD_OMEN)) {
-            this.badOmenLevel += ayj.getEffect(MobEffects.BAD_OMEN).getAmplifier() + 1;
+    public void absorbBadOmen(final Player bec) {
+        if (bec.hasEffect(MobEffects.BAD_OMEN)) {
+            this.badOmenLevel += bec.getEffect(MobEffects.BAD_OMEN).getAmplifier() + 1;
             this.badOmenLevel = Mth.clamp(this.badOmenLevel, 0, this.getMaxBadOmenLevel());
         }
-        ayj.removeEffect(MobEffects.BAD_OMEN);
+        bec.removeEffect(MobEffects.BAD_OMEN);
     }
     
     public void stop() {
@@ -304,12 +304,12 @@ public class Raid {
             boolean boolean3 = false;
             int integer5 = 0;
             while (this.shouldSpawnGroup()) {
-                final BlockPos fk6 = this.waveSpawnPos.isPresent() ? this.waveSpawnPos.get() : this.findRandomSpawnPos(integer5, 20);
-                if (fk6 != null) {
+                final BlockPos fu6 = this.waveSpawnPos.isPresent() ? this.waveSpawnPos.get() : this.findRandomSpawnPos(integer5, 20);
+                if (fu6 != null) {
                     this.started = true;
-                    this.spawnGroup(fk6);
+                    this.spawnGroup(fu6);
                     if (!boolean3) {
-                        this.playSound(fk6);
+                        this.playSound(fu6);
                         boolean3 = true;
                     }
                 }
@@ -328,16 +328,16 @@ public class Raid {
                 else {
                     this.status = RaidStatus.VICTORY;
                     for (final UUID uUID7 : this.heroesOfTheVillage) {
-                        final Entity akq8 = this.level.getEntity(uUID7);
-                        if (akq8 instanceof LivingEntity && !akq8.isSpectator()) {
-                            final LivingEntity akz9 = (LivingEntity)akq8;
-                            akz9.addEffect(new MobEffectInstance(MobEffects.HERO_OF_THE_VILLAGE, 48000, this.badOmenLevel - 1, false, false, true));
-                            if (!(akz9 instanceof ServerPlayer)) {
+                        final Entity aom8 = this.level.getEntity(uUID7);
+                        if (aom8 instanceof LivingEntity && !aom8.isSpectator()) {
+                            final LivingEntity aoy9 = (LivingEntity)aom8;
+                            aoy9.addEffect(new MobEffectInstance(MobEffects.HERO_OF_THE_VILLAGE, 48000, this.badOmenLevel - 1, false, false, true));
+                            if (!(aoy9 instanceof ServerPlayer)) {
                                 continue;
                             }
-                            final ServerPlayer xe10 = (ServerPlayer)akz9;
-                            xe10.awardStat(Stats.RAID_WIN);
-                            CriteriaTriggers.RAID_WIN.trigger(xe10);
+                            final ServerPlayer ze10 = (ServerPlayer)aoy9;
+                            ze10.awardStat(Stats.RAID_WIN);
+                            CriteriaTriggers.RAID_WIN.trigger(ze10);
                         }
                     }
                 }
@@ -366,14 +366,14 @@ public class Raid {
     
     private void moveRaidCenterToNearbyVillageSection() {
         final Stream<SectionPos> stream2 = SectionPos.cube(SectionPos.of(this.center), 2);
-        stream2.filter(this.level::isVillage).map(SectionPos::center).min(Comparator.comparingDouble(fk -> fk.distSqr(this.center))).ifPresent(this::setCenter);
+        stream2.filter(this.level::isVillage).map(SectionPos::center).min(Comparator.comparingDouble(fu -> fu.distSqr(this.center))).ifPresent(this::setCenter);
     }
     
     private Optional<BlockPos> getValidSpawnPos(final int integer) {
         for (int integer2 = 0; integer2 < 3; ++integer2) {
-            final BlockPos fk4 = this.findRandomSpawnPos(integer, 1);
-            if (fk4 != null) {
-                return Optional.<BlockPos>of(fk4);
+            final BlockPos fu4 = this.findRandomSpawnPos(integer, 1);
+            if (fu4 != null) {
+                return Optional.<BlockPos>of(fu4);
             }
         }
         return Optional.<BlockPos>empty();
@@ -407,84 +407,84 @@ public class Raid {
         final Set<Raider> set3 = Sets.newHashSet();
         while (iterator2.hasNext()) {
             final Set<Raider> set4 = iterator2.next();
-            for (final Raider azo6 : set4) {
-                final BlockPos fk7 = new BlockPos(azo6);
-                if (azo6.removed || azo6.dimension != this.level.getDimension().getType() || this.center.distSqr(fk7) >= 12544.0) {
-                    set3.add(azo6);
+            for (final Raider bfi6 : set4) {
+                final BlockPos fu7 = bfi6.blockPosition();
+                if (bfi6.removed || bfi6.level.dimension() != this.level.dimension() || this.center.distSqr(fu7) >= 12544.0) {
+                    set3.add(bfi6);
                 }
                 else {
-                    if (azo6.tickCount <= 600) {
+                    if (bfi6.tickCount <= 600) {
                         continue;
                     }
-                    if (this.level.getEntity(azo6.getUUID()) == null) {
-                        set3.add(azo6);
+                    if (this.level.getEntity(bfi6.getUUID()) == null) {
+                        set3.add(bfi6);
                     }
-                    if (!this.level.isVillage(fk7) && azo6.getNoActionTime() > 2400) {
-                        azo6.setTicksOutsideRaid(azo6.getTicksOutsideRaid() + 1);
+                    if (!this.level.isVillage(fu7) && bfi6.getNoActionTime() > 2400) {
+                        bfi6.setTicksOutsideRaid(bfi6.getTicksOutsideRaid() + 1);
                     }
-                    if (azo6.getTicksOutsideRaid() < 30) {
+                    if (bfi6.getTicksOutsideRaid() < 30) {
                         continue;
                     }
-                    set3.add(azo6);
+                    set3.add(bfi6);
                 }
             }
         }
-        for (final Raider azo7 : set3) {
-            this.removeFromRaid(azo7, true);
+        for (final Raider bfi7 : set3) {
+            this.removeFromRaid(bfi7, true);
         }
     }
     
-    private void playSound(final BlockPos fk) {
+    private void playSound(final BlockPos fu) {
         final float float3 = 13.0f;
         final int integer4 = 64;
         final Collection<ServerPlayer> collection5 = this.raidEvent.getPlayers();
-        for (final ServerPlayer xe7 : this.level.players()) {
-            final Vec3 cvl8 = xe7.position();
-            final Vec3 cvl9 = new Vec3(fk);
-            final float float4 = Mth.sqrt((cvl9.x - cvl8.x) * (cvl9.x - cvl8.x) + (cvl9.z - cvl8.z) * (cvl9.z - cvl8.z));
-            final double double11 = cvl8.x + 13.0f / float4 * (cvl9.x - cvl8.x);
-            final double double12 = cvl8.z + 13.0f / float4 * (cvl9.z - cvl8.z);
-            if (float4 <= 64.0f || collection5.contains(xe7)) {
-                xe7.connection.send(new ClientboundSoundPacket(SoundEvents.RAID_HORN, SoundSource.NEUTRAL, double11, xe7.getY(), double12, 64.0f, 1.0f));
+        for (final ServerPlayer ze7 : this.level.players()) {
+            final Vec3 dem8 = ze7.position();
+            final Vec3 dem9 = Vec3.atCenterOf(fu);
+            final float float4 = Mth.sqrt((dem9.x - dem8.x) * (dem9.x - dem8.x) + (dem9.z - dem8.z) * (dem9.z - dem8.z));
+            final double double11 = dem8.x + 13.0f / float4 * (dem9.x - dem8.x);
+            final double double12 = dem8.z + 13.0f / float4 * (dem9.z - dem8.z);
+            if (float4 <= 64.0f || collection5.contains(ze7)) {
+                ze7.connection.send(new ClientboundSoundPacket(SoundEvents.RAID_HORN, SoundSource.NEUTRAL, double11, ze7.getY(), double12, 64.0f, 1.0f));
             }
         }
     }
     
-    private void spawnGroup(final BlockPos fk) {
+    private void spawnGroup(final BlockPos fu) {
         boolean boolean3 = false;
         final int integer4 = this.groupsSpawned + 1;
         this.totalHealth = 0.0f;
-        final DifficultyInstance ajj5 = this.level.getCurrentDifficultyAt(fk);
+        final DifficultyInstance ane5 = this.level.getCurrentDifficultyAt(fu);
         final boolean boolean4 = this.shouldSpawnBonusGroup();
         for (final RaiderType b10 : RaiderType.VALUES) {
-            final int integer5 = this.getDefaultNumSpawns(b10, integer4, boolean4) + this.getPotentialBonusSpawns(b10, this.random, integer4, ajj5, boolean4);
+            final int integer5 = this.getDefaultNumSpawns(b10, integer4, boolean4) + this.getPotentialBonusSpawns(b10, this.random, integer4, ane5, boolean4);
             int integer6 = 0;
             for (int integer7 = 0; integer7 < integer5; ++integer7) {
-                final Raider azo14 = b10.entityType.create(this.level);
-                if (!boolean3 && azo14.canBeLeader()) {
-                    azo14.setPatrolLeader(true);
-                    this.setLeader(integer4, azo14);
+                final Raider bfi14 = b10.entityType.create(this.level);
+                if (!boolean3 && bfi14.canBeLeader()) {
+                    bfi14.setPatrolLeader(true);
+                    this.setLeader(integer4, bfi14);
                     boolean3 = true;
                 }
-                this.joinRaid(integer4, azo14, fk, false);
+                this.joinRaid(integer4, bfi14, fu, false);
                 if (b10.entityType == EntityType.RAVAGER) {
-                    Raider azo15 = null;
+                    Raider bfi15 = null;
                     if (integer4 == this.getNumGroups(Difficulty.NORMAL)) {
-                        azo15 = EntityType.PILLAGER.create(this.level);
+                        bfi15 = EntityType.PILLAGER.create(this.level);
                     }
                     else if (integer4 >= this.getNumGroups(Difficulty.HARD)) {
                         if (integer6 == 0) {
-                            azo15 = EntityType.EVOKER.create(this.level);
+                            bfi15 = EntityType.EVOKER.create(this.level);
                         }
                         else {
-                            azo15 = EntityType.VINDICATOR.create(this.level);
+                            bfi15 = EntityType.VINDICATOR.create(this.level);
                         }
                     }
                     ++integer6;
-                    if (azo15 != null) {
-                        this.joinRaid(integer4, azo15, fk, false);
-                        azo15.moveTo(fk, 0.0f, 0.0f);
-                        azo15.startRiding(azo14);
+                    if (bfi15 != null) {
+                        this.joinRaid(integer4, bfi15, fu, false);
+                        bfi15.moveTo(fu, 0.0f, 0.0f);
+                        bfi15.startRiding(bfi14);
                     }
                 }
             }
@@ -495,19 +495,19 @@ public class Raid {
         this.setDirty();
     }
     
-    public void joinRaid(final int integer, final Raider azo, @Nullable final BlockPos fk, final boolean boolean4) {
-        final boolean boolean5 = this.addWaveMob(integer, azo);
+    public void joinRaid(final int integer, final Raider bfi, @Nullable final BlockPos fu, final boolean boolean4) {
+        final boolean boolean5 = this.addWaveMob(integer, bfi);
         if (boolean5) {
-            azo.setCurrentRaid(this);
-            azo.setWave(integer);
-            azo.setCanJoinRaid(true);
-            azo.setTicksOutsideRaid(0);
-            if (!boolean4 && fk != null) {
-                azo.setPos(fk.getX() + 0.5, fk.getY() + 1.0, fk.getZ() + 0.5);
-                azo.finalizeSpawn(this.level, this.level.getCurrentDifficultyAt(fk), MobSpawnType.EVENT, null, null);
-                azo.applyRaidBuffs(integer, false);
-                azo.onGround = true;
-                this.level.addFreshEntity(azo);
+            bfi.setCurrentRaid(this);
+            bfi.setWave(integer);
+            bfi.setCanJoinRaid(true);
+            bfi.setTicksOutsideRaid(0);
+            if (!boolean4 && fu != null) {
+                bfi.setPos(fu.getX() + 0.5, fu.getY() + 1.0, fu.getZ() + 0.5);
+                bfi.finalizeSpawn(this.level, this.level.getCurrentDifficultyAt(fu), MobSpawnType.EVENT, null, null);
+                bfi.applyRaidBuffs(integer, false);
+                bfi.setOnGround(true);
+                this.level.addFreshEntity(bfi);
             }
         }
     }
@@ -519,8 +519,8 @@ public class Raid {
     public float getHealthOfLivingRaiders() {
         float float2 = 0.0f;
         for (final Set<Raider> set4 : this.groupRaiderMap.values()) {
-            for (final Raider azo6 : set4) {
-                float2 += azo6.getHealth();
+            for (final Raider bfi6 : set4) {
+                float2 += bfi6.getHealth();
             }
         }
         return float2;
@@ -534,15 +534,15 @@ public class Raid {
         return this.groupRaiderMap.values().stream().mapToInt(Set::size).sum();
     }
     
-    public void removeFromRaid(final Raider azo, final boolean boolean2) {
-        final Set<Raider> set4 = this.groupRaiderMap.get(azo.getWave());
+    public void removeFromRaid(final Raider bfi, final boolean boolean2) {
+        final Set<Raider> set4 = this.groupRaiderMap.get(bfi.getWave());
         if (set4 != null) {
-            final boolean boolean3 = set4.remove(azo);
+            final boolean boolean3 = set4.remove(bfi);
             if (boolean3) {
                 if (boolean2) {
-                    this.totalHealth -= azo.getHealth();
+                    this.totalHealth -= bfi.getHealth();
                 }
-                azo.setCurrentRaid(null);
+                bfi.setCurrentRaid(null);
                 this.updateBossbar();
                 this.setDirty();
             }
@@ -554,12 +554,13 @@ public class Raid {
     }
     
     public static ItemStack getLeaderBannerInstance() {
-        final ItemStack ben1 = new ItemStack(Items.WHITE_BANNER);
-        final CompoundTag jt2 = ben1.getOrCreateTagElement("BlockEntityTag");
-        final ListTag jz3 = new BannerPattern.Builder().addPattern(BannerPattern.RHOMBUS_MIDDLE, DyeColor.CYAN).addPattern(BannerPattern.STRIPE_BOTTOM, DyeColor.LIGHT_GRAY).addPattern(BannerPattern.STRIPE_CENTER, DyeColor.GRAY).addPattern(BannerPattern.BORDER, DyeColor.LIGHT_GRAY).addPattern(BannerPattern.STRIPE_MIDDLE, DyeColor.BLACK).addPattern(BannerPattern.HALF_HORIZONTAL, DyeColor.LIGHT_GRAY).addPattern(BannerPattern.CIRCLE_MIDDLE, DyeColor.LIGHT_GRAY).addPattern(BannerPattern.BORDER, DyeColor.BLACK).toListTag();
-        jt2.put("Patterns", jz3);
-        ben1.setHoverName(new TranslatableComponent("block.minecraft.ominous_banner", new Object[0]).withStyle(ChatFormatting.GOLD));
-        return ben1;
+        final ItemStack bki1 = new ItemStack(Items.WHITE_BANNER);
+        final CompoundTag le2 = bki1.getOrCreateTagElement("BlockEntityTag");
+        final ListTag lk3 = new BannerPattern.Builder().addPattern(BannerPattern.RHOMBUS_MIDDLE, DyeColor.CYAN).addPattern(BannerPattern.STRIPE_BOTTOM, DyeColor.LIGHT_GRAY).addPattern(BannerPattern.STRIPE_CENTER, DyeColor.GRAY).addPattern(BannerPattern.BORDER, DyeColor.LIGHT_GRAY).addPattern(BannerPattern.STRIPE_MIDDLE, DyeColor.BLACK).addPattern(BannerPattern.HALF_HORIZONTAL, DyeColor.LIGHT_GRAY).addPattern(BannerPattern.CIRCLE_MIDDLE, DyeColor.LIGHT_GRAY).addPattern(BannerPattern.BORDER, DyeColor.BLACK).toListTag();
+        le2.put("Patterns", lk3);
+        bki1.getOrCreateTag().putInt("HideFlags", 32);
+        bki1.setHoverName(new TranslatableComponent("block.minecraft.ominous_banner").withStyle(ChatFormatting.GOLD));
+        return bki1;
     }
     
     @Nullable
@@ -580,7 +581,7 @@ public class Raid {
             if (!this.level.isVillage(a8) || integer1 >= 2) {
                 if (this.level.hasChunksAt(a8.getX() - 10, a8.getY() - 10, a8.getZ() - 10, a8.getX() + 10, a8.getY() + 10, a8.getZ() + 10)) {
                     if (this.level.getChunkSource().isEntityTickingChunk(new ChunkPos(a8))) {
-                        if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, this.level, a8, EntityType.RAVAGER) || (this.level.getBlockState(a8.below()).getBlock() == Blocks.SNOW && this.level.getBlockState(a8).isAir())) {
+                        if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, this.level, a8, EntityType.RAVAGER) || (this.level.getBlockState(a8.below()).is(Blocks.SNOW) && this.level.getBlockState(a8).isAir())) {
                             return a8;
                         }
                     }
@@ -590,37 +591,37 @@ public class Raid {
         return null;
     }
     
-    private boolean addWaveMob(final int integer, final Raider azo) {
-        return this.addWaveMob(integer, azo, true);
+    private boolean addWaveMob(final int integer, final Raider bfi) {
+        return this.addWaveMob(integer, bfi, true);
     }
     
-    public boolean addWaveMob(final int integer, final Raider azo, final boolean boolean3) {
+    public boolean addWaveMob(final int integer, final Raider bfi, final boolean boolean3) {
         this.groupRaiderMap.computeIfAbsent(Integer.valueOf(integer), integer -> Sets.newHashSet());
         final Set<Raider> set5 = this.groupRaiderMap.get(integer);
-        Raider azo2 = null;
-        for (final Raider azo3 : set5) {
-            if (azo3.getUUID().equals(azo.getUUID())) {
-                azo2 = azo3;
+        Raider bfi2 = null;
+        for (final Raider bfi3 : set5) {
+            if (bfi3.getUUID().equals(bfi.getUUID())) {
+                bfi2 = bfi3;
                 break;
             }
         }
-        if (azo2 != null) {
-            set5.remove(azo2);
-            set5.add(azo);
+        if (bfi2 != null) {
+            set5.remove(bfi2);
+            set5.add(bfi);
         }
-        set5.add(azo);
+        set5.add(bfi);
         if (boolean3) {
-            this.totalHealth += azo.getHealth();
+            this.totalHealth += bfi.getHealth();
         }
         this.updateBossbar();
         this.setDirty();
         return true;
     }
     
-    public void setLeader(final int integer, final Raider azo) {
-        this.groupToLeaderMap.put(integer, azo);
-        azo.setItemSlot(EquipmentSlot.HEAD, getLeaderBannerInstance());
-        azo.setDropChance(EquipmentSlot.HEAD, 2.0f);
+    public void setLeader(final int integer, final Raider bfi) {
+        this.groupToLeaderMap.put(integer, bfi);
+        bfi.setItemSlot(EquipmentSlot.HEAD, getLeaderBannerInstance());
+        bfi.setDropChance(EquipmentSlot.HEAD, 2.0f);
     }
     
     public void removeLeader(final int integer) {
@@ -631,8 +632,8 @@ public class Raid {
         return this.center;
     }
     
-    private void setCenter(final BlockPos fk) {
-        this.center = fk;
+    private void setCenter(final BlockPos fu) {
+        this.center = fu;
     }
     
     public int getId() {
@@ -643,10 +644,10 @@ public class Raid {
         return boolean3 ? b.spawnsPerWaveBeforeBonus[this.numGroups] : b.spawnsPerWaveBeforeBonus[integer];
     }
     
-    private int getPotentialBonusSpawns(final RaiderType b, final Random random, final int integer, final DifficultyInstance ajj, final boolean boolean5) {
-        final Difficulty aji7 = ajj.getDifficulty();
-        final boolean boolean6 = aji7 == Difficulty.EASY;
-        final boolean boolean7 = aji7 == Difficulty.NORMAL;
+    private int getPotentialBonusSpawns(final RaiderType b, final Random random, final int integer, final DifficultyInstance ane, final boolean boolean5) {
+        final Difficulty and7 = ane.getDifficulty();
+        final boolean boolean6 = and7 == Difficulty.EASY;
+        final boolean boolean7 = and7 == Difficulty.NORMAL;
         int integer2 = 0;
         switch (b) {
             case WITCH: {
@@ -684,33 +685,31 @@ public class Raid {
         return this.active;
     }
     
-    public CompoundTag save(final CompoundTag jt) {
-        jt.putInt("Id", this.id);
-        jt.putBoolean("Started", this.started);
-        jt.putBoolean("Active", this.active);
-        jt.putLong("TicksActive", this.ticksActive);
-        jt.putInt("BadOmenLevel", this.badOmenLevel);
-        jt.putInt("GroupsSpawned", this.groupsSpawned);
-        jt.putInt("PreRaidTicks", this.raidCooldownTicks);
-        jt.putInt("PostRaidTicks", this.postRaidTicks);
-        jt.putFloat("TotalHealth", this.totalHealth);
-        jt.putInt("NumGroups", this.numGroups);
-        jt.putString("Status", this.status.getName());
-        jt.putInt("CX", this.center.getX());
-        jt.putInt("CY", this.center.getY());
-        jt.putInt("CZ", this.center.getZ());
-        final ListTag jz3 = new ListTag();
+    public CompoundTag save(final CompoundTag le) {
+        le.putInt("Id", this.id);
+        le.putBoolean("Started", this.started);
+        le.putBoolean("Active", this.active);
+        le.putLong("TicksActive", this.ticksActive);
+        le.putInt("BadOmenLevel", this.badOmenLevel);
+        le.putInt("GroupsSpawned", this.groupsSpawned);
+        le.putInt("PreRaidTicks", this.raidCooldownTicks);
+        le.putInt("PostRaidTicks", this.postRaidTicks);
+        le.putFloat("TotalHealth", this.totalHealth);
+        le.putInt("NumGroups", this.numGroups);
+        le.putString("Status", this.status.getName());
+        le.putInt("CX", this.center.getX());
+        le.putInt("CY", this.center.getY());
+        le.putInt("CZ", this.center.getZ());
+        final ListTag lk3 = new ListTag();
         for (final UUID uUID5 : this.heroesOfTheVillage) {
-            final CompoundTag jt2 = new CompoundTag();
-            jt2.putUUID("UUID", uUID5);
-            ((AbstractList<CompoundTag>)jz3).add(jt2);
+            ((AbstractList<IntArrayTag>)lk3).add(NbtUtils.createUUID(uUID5));
         }
-        jt.put("HeroesOfTheVillage", jz3);
-        return jt;
+        le.put("HeroesOfTheVillage", lk3);
+        return le;
     }
     
-    public int getNumGroups(final Difficulty aji) {
-        switch (aji) {
+    public int getNumGroups(final Difficulty and) {
+        switch (and) {
             case EASY: {
                 return 3;
             }
@@ -743,14 +742,14 @@ public class Raid {
         return 0.0f;
     }
     
-    public void addHeroOfTheVillage(final Entity akq) {
-        this.heroesOfTheVillage.add(akq.getUUID());
+    public void addHeroOfTheVillage(final Entity aom) {
+        this.heroesOfTheVillage.add(aom.getUUID());
     }
     
     static {
-        RAID_NAME_COMPONENT = new TranslatableComponent("event.minecraft.raid", new Object[0]);
-        VICTORY = new TranslatableComponent("event.minecraft.raid.victory", new Object[0]);
-        DEFEAT = new TranslatableComponent("event.minecraft.raid.defeat", new Object[0]);
+        RAID_NAME_COMPONENT = new TranslatableComponent("event.minecraft.raid");
+        VICTORY = new TranslatableComponent("event.minecraft.raid.victory");
+        DEFEAT = new TranslatableComponent("event.minecraft.raid.defeat");
         RAID_BAR_VICTORY_COMPONENT = Raid.RAID_NAME_COMPONENT.copy().append(" - ").append(Raid.VICTORY);
         RAID_BAR_DEFEAT_COMPONENT = Raid.RAID_NAME_COMPONENT.copy().append(" - ").append(Raid.DEFEAT);
     }
@@ -792,8 +791,8 @@ public class Raid {
         private final EntityType<? extends Raider> entityType;
         private final int[] spawnsPerWaveBeforeBonus;
         
-        private RaiderType(final EntityType<? extends Raider> aku, final int[] arr) {
-            this.entityType = aku;
+        private RaiderType(final EntityType<? extends Raider> aoq, final int[] arr) {
+            this.entityType = aoq;
             this.spawnsPerWaveBeforeBonus = arr;
         }
         
diff --git a/src/net/minecraft/world/entity/raid/Raider.java b/src/net/minecraft/world/entity/raid/Raider.java
index 95f1512..5b4cccc 100644
--- a/src/net/minecraft/world/entity/raid/Raider.java
+++ b/src/net/minecraft/world/entity/raid/Raider.java
@@ -24,6 +24,7 @@ import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.DifficultyInstance;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.util.Mth;
@@ -34,7 +35,6 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.ai.goal.PathfindToRaidGoal;
@@ -56,8 +56,8 @@ public abstract class Raider extends PatrollingMonster {
     private boolean canJoinRaid;
     private int ticksOutsideRaid;
     
-    protected Raider(final EntityType<? extends Raider> aku, final Level bjw) {
-        super(aku, bjw);
+    protected Raider(final EntityType<? extends Raider> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
     @Override
@@ -88,19 +88,19 @@ public abstract class Raider extends PatrollingMonster {
     @Override
     public void aiStep() {
         if (this.level instanceof ServerLevel && this.isAlive()) {
-            final Raid azn2 = this.getCurrentRaid();
+            final Raid bfh2 = this.getCurrentRaid();
             if (this.canJoinRaid()) {
-                if (azn2 == null) {
+                if (bfh2 == null) {
                     if (this.level.getGameTime() % 20L == 0L) {
-                        final Raid azn3 = ((ServerLevel)this.level).getRaidAt(new BlockPos(this));
-                        if (azn3 != null && Raids.canJoinRaid(this, azn3)) {
-                            azn3.joinRaid(azn3.getGroupsSpawned(), this, null, true);
+                        final Raid bfh3 = ((ServerLevel)this.level).getRaidAt(this.blockPosition());
+                        if (bfh3 != null && Raids.canJoinRaid(this, bfh3)) {
+                            bfh3.joinRaid(bfh3.getGroupsSpawned(), this, null, true);
                         }
                     }
                 }
                 else {
-                    final LivingEntity akz3 = this.getTarget();
-                    if (akz3 != null && (akz3.getType() == EntityType.PLAYER || akz3.getType() == EntityType.IRON_GOLEM)) {
+                    final LivingEntity aoy3 = this.getTarget();
+                    if (aoy3 != null && (aoy3.getType() == EntityType.PLAYER || aoy3.getType() == EntityType.IRON_GOLEM)) {
                         this.noActionTime = 0;
                     }
                 }
@@ -115,52 +115,52 @@ public abstract class Raider extends PatrollingMonster {
     }
     
     @Override
-    public void die(final DamageSource ajz) {
+    public void die(final DamageSource anw) {
         if (this.level instanceof ServerLevel) {
-            final Entity akq3 = ajz.getEntity();
-            final Raid azn4 = this.getCurrentRaid();
-            if (azn4 != null) {
+            final Entity aom3 = anw.getEntity();
+            final Raid bfh4 = this.getCurrentRaid();
+            if (bfh4 != null) {
                 if (this.isPatrolLeader()) {
-                    azn4.removeLeader(this.getWave());
+                    bfh4.removeLeader(this.getWave());
                 }
-                if (akq3 != null && akq3.getType() == EntityType.PLAYER) {
-                    azn4.addHeroOfTheVillage(akq3);
+                if (aom3 != null && aom3.getType() == EntityType.PLAYER) {
+                    bfh4.addHeroOfTheVillage(aom3);
                 }
-                azn4.removeFromRaid(this, false);
+                bfh4.removeFromRaid(this, false);
             }
-            if (this.isPatrolLeader() && azn4 == null && ((ServerLevel)this.level).getRaidAt(new BlockPos(this)) == null) {
-                final ItemStack ben5 = this.getItemBySlot(EquipmentSlot.HEAD);
-                Player ayj6 = null;
-                final Entity akq4 = akq3;
-                if (akq4 instanceof Player) {
-                    ayj6 = (Player)akq4;
+            if (this.isPatrolLeader() && bfh4 == null && ((ServerLevel)this.level).getRaidAt(this.blockPosition()) == null) {
+                final ItemStack bki5 = this.getItemBySlot(EquipmentSlot.HEAD);
+                Player bec6 = null;
+                final Entity aom4 = aom3;
+                if (aom4 instanceof Player) {
+                    bec6 = (Player)aom4;
                 }
-                else if (akq4 instanceof Wolf) {
-                    final Wolf auc8 = (Wolf)akq4;
-                    final LivingEntity akz9 = auc8.getOwner();
-                    if (auc8.isTame() && akz9 instanceof Player) {
-                        ayj6 = (Player)akz9;
+                else if (aom4 instanceof Wolf) {
+                    final Wolf azk8 = (Wolf)aom4;
+                    final LivingEntity aoy9 = azk8.getOwner();
+                    if (azk8.isTame() && aoy9 instanceof Player) {
+                        bec6 = (Player)aoy9;
                     }
                 }
-                if (!ben5.isEmpty() && ItemStack.matches(ben5, Raid.getLeaderBannerInstance()) && ayj6 != null) {
-                    final MobEffectInstance akk8 = ayj6.getEffect(MobEffects.BAD_OMEN);
+                if (!bki5.isEmpty() && ItemStack.matches(bki5, Raid.getLeaderBannerInstance()) && bec6 != null) {
+                    final MobEffectInstance aog8 = bec6.getEffect(MobEffects.BAD_OMEN);
                     int integer9 = 1;
-                    if (akk8 != null) {
-                        integer9 += akk8.getAmplifier();
-                        ayj6.removeEffectNoUpdate(MobEffects.BAD_OMEN);
+                    if (aog8 != null) {
+                        integer9 += aog8.getAmplifier();
+                        bec6.removeEffectNoUpdate(MobEffects.BAD_OMEN);
                     }
                     else {
                         --integer9;
                     }
-                    integer9 = Mth.clamp(integer9, 0, 5);
-                    final MobEffectInstance akk9 = new MobEffectInstance(MobEffects.BAD_OMEN, 120000, integer9, false, false, true);
+                    integer9 = Mth.clamp(integer9, 0, 4);
+                    final MobEffectInstance aog9 = new MobEffectInstance(MobEffects.BAD_OMEN, 120000, integer9, false, false, true);
                     if (!this.level.getGameRules().getBoolean(GameRules.RULE_DISABLE_RAIDS)) {
-                        ayj6.addEffect(akk9);
+                        bec6.addEffect(aog9);
                     }
                 }
             }
         }
-        super.die(ajz);
+        super.die(anw);
     }
     
     @Override
@@ -168,8 +168,8 @@ public abstract class Raider extends PatrollingMonster {
         return !this.hasActiveRaid();
     }
     
-    public void setCurrentRaid(@Nullable final Raid azn) {
-        this.raid = azn;
+    public void setCurrentRaid(@Nullable final Raid bfh) {
+        this.raid = bfh;
     }
     
     @Nullable
@@ -198,23 +198,23 @@ public abstract class Raider extends PatrollingMonster {
     }
     
     @Override
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("Wave", this.wave);
-        jt.putBoolean("CanJoinRaid", this.canJoinRaid);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("Wave", this.wave);
+        le.putBoolean("CanJoinRaid", this.canJoinRaid);
         if (this.raid != null) {
-            jt.putInt("RaidId", this.raid.getId());
+            le.putInt("RaidId", this.raid.getId());
         }
     }
     
     @Override
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.wave = jt.getInt("Wave");
-        this.canJoinRaid = jt.getBoolean("CanJoinRaid");
-        if (jt.contains("RaidId", 3)) {
+    public void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.wave = le.getInt("Wave");
+        this.canJoinRaid = le.getBoolean("CanJoinRaid");
+        if (le.contains("RaidId", 3)) {
             if (this.level instanceof ServerLevel) {
-                this.raid = ((ServerLevel)this.level).getRaids().get(jt.getInt("RaidId"));
+                this.raid = ((ServerLevel)this.level).getRaids().get(le.getInt("RaidId"));
             }
             if (this.raid != null) {
                 this.raid.addWaveMob(this.wave, this, false);
@@ -226,24 +226,25 @@ public abstract class Raider extends PatrollingMonster {
     }
     
     @Override
-    protected void pickUpItem(final ItemEntity awb) {
-        final ItemStack ben3 = awb.getItem();
+    protected void pickUpItem(final ItemEntity bbg) {
+        final ItemStack bki3 = bbg.getItem();
         final boolean boolean4 = this.hasActiveRaid() && this.getCurrentRaid().getLeader(this.getWave()) != null;
-        if (this.hasActiveRaid() && !boolean4 && ItemStack.matches(ben3, Raid.getLeaderBannerInstance())) {
-            final EquipmentSlot akv5 = EquipmentSlot.HEAD;
-            final ItemStack ben4 = this.getItemBySlot(akv5);
-            final double double7 = this.getEquipmentDropChance(akv5);
-            if (!ben4.isEmpty() && Math.max(this.random.nextFloat() - 0.1f, 0.0f) < double7) {
-                this.spawnAtLocation(ben4);
+        if (this.hasActiveRaid() && !boolean4 && ItemStack.matches(bki3, Raid.getLeaderBannerInstance())) {
+            final EquipmentSlot aor5 = EquipmentSlot.HEAD;
+            final ItemStack bki4 = this.getItemBySlot(aor5);
+            final double double7 = this.getEquipmentDropChance(aor5);
+            if (!bki4.isEmpty() && Math.max(this.random.nextFloat() - 0.1f, 0.0f) < double7) {
+                this.spawnAtLocation(bki4);
             }
-            this.setItemSlot(akv5, ben3);
-            this.take(awb, ben3.getCount());
-            awb.remove();
+            this.onItemPickup(bbg);
+            this.setItemSlot(aor5, bki3);
+            this.take(bbg, bki3.getCount());
+            bbg.remove();
             this.getCurrentRaid().setLeader(this.getWave(), this);
             this.setPatrolLeader(true);
         }
         else {
-            super.pickUpItem(awb);
+            super.pickUpItem(bbg);
         }
     }
     
@@ -254,7 +255,7 @@ public abstract class Raider extends PatrollingMonster {
     
     @Override
     public boolean requiresCustomPersistence() {
-        return this.getCurrentRaid() != null;
+        return super.requiresCustomPersistence() || this.getCurrentRaid() != null;
     }
     
     public int getTicksOutsideRaid() {
@@ -266,43 +267,43 @@ public abstract class Raider extends PatrollingMonster {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public boolean hurt(final DamageSource anw, final float float2) {
         if (this.hasActiveRaid()) {
             this.getCurrentRaid().updateBossbar();
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Nullable
     @Override
-    public SpawnGroupData finalizeSpawn(final LevelAccessor bjx, final DifficultyInstance ajj, final MobSpawnType alc, @Nullable final SpawnGroupData alm, @Nullable final CompoundTag jt) {
-        this.setCanJoinRaid(this.getType() != EntityType.WITCH || alc != MobSpawnType.NATURAL);
-        return super.finalizeSpawn(bjx, ajj, alc, alm, jt);
+    public SpawnGroupData finalizeSpawn(final LevelAccessor bqc, final DifficultyInstance ane, final MobSpawnType apb, @Nullable final SpawnGroupData apo, @Nullable final CompoundTag le) {
+        this.setCanJoinRaid(this.getType() != EntityType.WITCH || apb != MobSpawnType.NATURAL);
+        return super.finalizeSpawn(bqc, ane, apb, apo, le);
     }
     
     public abstract SoundEvent getCelebrateSound();
     
     static {
         IS_CELEBRATING = SynchedEntityData.<Boolean>defineId(Raider.class, EntityDataSerializers.BOOLEAN);
-        ALLOWED_ITEMS = (awb -> !awb.hasPickUpDelay() && awb.isAlive() && ItemStack.matches(awb.getItem(), Raid.getLeaderBannerInstance()));
+        ALLOWED_ITEMS = (bbg -> !bbg.hasPickUpDelay() && bbg.isAlive() && ItemStack.matches(bbg.getItem(), Raid.getLeaderBannerInstance()));
     }
     
     public class ObtainRaidLeaderBannerGoal<T extends Raider> extends Goal {
         private final T mob;
         
-        public ObtainRaidLeaderBannerGoal(final T azo2) {
-            this.mob = azo2;
+        public ObtainRaidLeaderBannerGoal(final T bfi2) {
+            this.mob = bfi2;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
         }
         
         @Override
         public boolean canUse() {
-            final Raid azn2 = this.mob.getCurrentRaid();
+            final Raid bfh2 = this.mob.getCurrentRaid();
             if (!this.mob.hasActiveRaid() || this.mob.getCurrentRaid().isOver() || !this.mob.canBeLeader() || ItemStack.matches(this.mob.getItemBySlot(EquipmentSlot.HEAD), Raid.getLeaderBannerInstance())) {
                 return false;
             }
-            final Raider azo3 = azn2.getLeader(this.mob.getWave());
-            if (azo3 == null || !azo3.isAlive()) {
+            final Raider bfi3 = bfh2.getLeader(this.mob.getWave());
+            if (bfi3 == null || !bfi3.isAlive()) {
                 final List<ItemEntity> list4 = this.mob.level.<ItemEntity>getEntitiesOfClass(ItemEntity.class, this.mob.getBoundingBox().inflate(16.0, 8.0, 16.0), Raider.ALLOWED_ITEMS);
                 if (!list4.isEmpty()) {
                     return this.mob.getNavigation().moveTo(list4.get(0), 1.149999976158142);
@@ -325,15 +326,15 @@ public abstract class Raider extends PatrollingMonster {
     public class RaiderCelebration extends Goal {
         private final Raider mob;
         
-        RaiderCelebration(final Raider azo2) {
-            this.mob = azo2;
+        RaiderCelebration(final Raider bfi2) {
+            this.mob = bfi2;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
         }
         
         @Override
         public boolean canUse() {
-            final Raid azn2 = this.mob.getCurrentRaid();
-            return this.mob.isAlive() && this.mob.getTarget() == null && azn2 != null && azn2.isLoss();
+            final Raid bfh2 = this.mob.getCurrentRaid();
+            return this.mob.isAlive() && this.mob.getTarget() == null && bfh2 != null && bfh2.isLoss();
         }
         
         @Override
@@ -365,17 +366,17 @@ public abstract class Raider extends PatrollingMonster {
         private final float hostileRadiusSqr;
         public final TargetingConditions shoutTargeting;
         
-        public HoldGroundAttackGoal(final AbstractIllager awe, final float float3) {
+        public HoldGroundAttackGoal(final AbstractIllager bbj, final float float3) {
             this.shoutTargeting = new TargetingConditions().range(8.0).allowNonAttackable().allowInvulnerable().allowSameTeam().allowUnseeable().ignoreInvisibilityTesting();
-            this.mob = awe;
+            this.mob = bbj;
             this.hostileRadiusSqr = float3 * float3;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE, Flag.LOOK));
         }
         
         @Override
         public boolean canUse() {
-            final LivingEntity akz2 = this.mob.getLastHurtByMob();
-            return this.mob.getCurrentRaid() == null && this.mob.isPatrolling() && this.mob.getTarget() != null && !this.mob.isAggressive() && (akz2 == null || akz2.getType() != EntityType.PLAYER);
+            final LivingEntity aoy2 = this.mob.getLastHurtByMob();
+            return this.mob.getCurrentRaid() == null && this.mob.isPatrolling() && this.mob.getTarget() != null && !this.mob.isAggressive() && (aoy2 == null || aoy2.getType() != EntityType.PLAYER);
         }
         
         @Override
@@ -383,20 +384,20 @@ public abstract class Raider extends PatrollingMonster {
             super.start();
             this.mob.getNavigation().stop();
             final List<Raider> list2 = this.mob.level.<Raider>getNearbyEntities(Raider.class, this.shoutTargeting, (LivingEntity)this.mob, this.mob.getBoundingBox().inflate(8.0, 8.0, 8.0));
-            for (final Raider azo4 : list2) {
-                azo4.setTarget(this.mob.getTarget());
+            for (final Raider bfi4 : list2) {
+                bfi4.setTarget(this.mob.getTarget());
             }
         }
         
         @Override
         public void stop() {
             super.stop();
-            final LivingEntity akz2 = this.mob.getTarget();
-            if (akz2 != null) {
+            final LivingEntity aoy2 = this.mob.getTarget();
+            if (aoy2 != null) {
                 final List<Raider> list3 = this.mob.level.<Raider>getNearbyEntities(Raider.class, this.shoutTargeting, (LivingEntity)this.mob, this.mob.getBoundingBox().inflate(8.0, 8.0, 8.0));
-                for (final Raider azo5 : list3) {
-                    azo5.setTarget(akz2);
-                    azo5.setAggressive(true);
+                for (final Raider bfi5 : list3) {
+                    bfi5.setTarget(aoy2);
+                    bfi5.setAggressive(true);
                 }
                 this.mob.setAggressive(true);
             }
@@ -404,12 +405,12 @@ public abstract class Raider extends PatrollingMonster {
         
         @Override
         public void tick() {
-            final LivingEntity akz2 = this.mob.getTarget();
-            if (akz2 == null) {
+            final LivingEntity aoy2 = this.mob.getTarget();
+            if (aoy2 == null) {
                 return;
             }
-            if (this.mob.distanceToSqr(akz2) > this.hostileRadiusSqr) {
-                this.mob.getLookControl().setLookAt(akz2, 30.0f, 30.0f);
+            if (this.mob.distanceToSqr(aoy2) > this.hostileRadiusSqr) {
+                this.mob.getLookControl().setLookAt(aoy2, 30.0f, 30.0f);
                 if (this.mob.random.nextInt(50) == 0) {
                     this.mob.playAmbientSound();
                 }
@@ -429,9 +430,9 @@ public abstract class Raider extends PatrollingMonster {
         private final int distanceToPoi;
         private boolean stuck;
         
-        public RaiderMoveThroughVillageGoal(final Raider azo, final double double2, final int integer) {
+        public RaiderMoveThroughVillageGoal(final Raider bfi, final double double2, final int integer) {
             this.visited = Lists.newArrayList();
-            this.raider = azo;
+            this.raider = bfi;
             this.speedModifier = double2;
             this.distanceToPoi = integer;
             this.setFlags(EnumSet.<Flag>of(Flag.MOVE));
@@ -448,9 +449,9 @@ public abstract class Raider extends PatrollingMonster {
         }
         
         private boolean hasSuitablePoi() {
-            final ServerLevel xd2 = (ServerLevel)this.raider.level;
-            final BlockPos fk3 = new BlockPos(this.raider);
-            final Optional<BlockPos> optional4 = xd2.getPoiManager().getRandom(asu -> asu == PoiType.HOME, this::hasNotVisited, PoiManager.Occupancy.ANY, fk3, 48, this.raider.random);
+            final ServerLevel zd2 = (ServerLevel)this.raider.level;
+            final BlockPos fu3 = this.raider.blockPosition();
+            final Optional<BlockPos> optional4 = zd2.getPoiManager().getRandom(ayc -> ayc == PoiType.HOME, this::hasNotVisited, PoiManager.Occupancy.ANY, fu3, 48, this.raider.random);
             if (!optional4.isPresent()) {
                 return false;
             }
@@ -481,22 +482,22 @@ public abstract class Raider extends PatrollingMonster {
         @Override
         public void tick() {
             if (this.raider.getNavigation().isDone()) {
-                final Vec3 cvl2 = new Vec3(this.poiPos);
-                Vec3 cvl3 = RandomPos.getPosTowards(this.raider, 16, 7, cvl2, 0.3141592741012573);
-                if (cvl3 == null) {
-                    cvl3 = RandomPos.getPosTowards(this.raider, 8, 7, cvl2);
+                final Vec3 dem2 = Vec3.atBottomCenterOf(this.poiPos);
+                Vec3 dem3 = RandomPos.getPosTowards(this.raider, 16, 7, dem2, 0.3141592741012573);
+                if (dem3 == null) {
+                    dem3 = RandomPos.getPosTowards(this.raider, 8, 7, dem2);
                 }
-                if (cvl3 == null) {
+                if (dem3 == null) {
                     this.stuck = true;
                     return;
                 }
-                this.raider.getNavigation().moveTo(cvl3.x, cvl3.y, cvl3.z, this.speedModifier);
+                this.raider.getNavigation().moveTo(dem3.x, dem3.y, dem3.z, this.speedModifier);
             }
         }
         
-        private boolean hasNotVisited(final BlockPos fk) {
-            for (final BlockPos fk2 : this.visited) {
-                if (Objects.equals(fk, fk2)) {
+        private boolean hasNotVisited(final BlockPos fu) {
+            for (final BlockPos fu2 : this.visited) {
+                if (Objects.equals(fu, fu2)) {
                     return false;
                 }
             }
diff --git a/src/net/minecraft/world/entity/raid/Raids.java b/src/net/minecraft/world/entity/raid/Raids.java
index 4fa0c3b..301cc03 100644
--- a/src/net/minecraft/world/entity/raid/Raids.java
+++ b/src/net/minecraft/world/entity/raid/Raids.java
@@ -2,17 +2,19 @@ package net.minecraft.world.entity.raid;
 
 import java.util.AbstractList;
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.level.dimension.Dimension;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.CompoundTag;
 import javax.annotation.Nullable;
+import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.network.protocol.Packet;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.network.protocol.game.ClientboundEntityEventPacket;
 import net.minecraft.world.effect.MobEffects;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.Vec3;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
@@ -20,9 +22,6 @@ import net.minecraft.world.entity.ai.village.poi.PoiManager;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.world.entity.ai.village.poi.PoiRecord;
 import java.util.List;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.server.level.ServerPlayer;
 import java.util.Iterator;
 import net.minecraft.network.protocol.game.DebugPackets;
@@ -38,10 +37,10 @@ public class Raids extends SavedData {
     private int nextAvailableID;
     private int tick;
     
-    public Raids(final ServerLevel xd) {
-        super(getFileId(xd.dimension));
+    public Raids(final ServerLevel zd) {
+        super(getFileId(zd.dimensionType()));
         this.raidMap = Maps.newHashMap();
-        this.level = xd;
+        this.level = zd;
         this.nextAvailableID = 1;
         this.setDirty();
     }
@@ -54,16 +53,16 @@ public class Raids extends SavedData {
         ++this.tick;
         final Iterator<Raid> iterator2 = this.raidMap.values().iterator();
         while (iterator2.hasNext()) {
-            final Raid azn3 = iterator2.next();
+            final Raid bfh3 = iterator2.next();
             if (this.level.getGameRules().getBoolean(GameRules.RULE_DISABLE_RAIDS)) {
-                azn3.stop();
+                bfh3.stop();
             }
-            if (azn3.isStopped()) {
+            if (bfh3.isStopped()) {
                 iterator2.remove();
                 this.setDirty();
             }
             else {
-                azn3.tick();
+                bfh3.tick();
             }
         }
         if (this.tick % 200 == 0) {
@@ -72,99 +71,99 @@ public class Raids extends SavedData {
         DebugPackets.sendRaids(this.level, this.raidMap.values());
     }
     
-    public static boolean canJoinRaid(final Raider azo, final Raid azn) {
-        return azo != null && azn != null && azn.getLevel() != null && azo.isAlive() && azo.canJoinRaid() && azo.getNoActionTime() <= 2400 && azo.level.getDimension().getType() == azn.getLevel().getDimension().getType();
+    public static boolean canJoinRaid(final Raider bfi, final Raid bfh) {
+        return bfi != null && bfh != null && bfh.getLevel() != null && bfi.isAlive() && bfi.canJoinRaid() && bfi.getNoActionTime() <= 2400 && bfi.level.dimensionType() == bfh.getLevel().dimensionType();
     }
     
     @Nullable
-    public Raid createOrExtendRaid(final ServerPlayer xe) {
-        if (xe.isSpectator()) {
+    public Raid createOrExtendRaid(final ServerPlayer ze) {
+        if (ze.isSpectator()) {
             return null;
         }
         if (this.level.getGameRules().getBoolean(GameRules.RULE_DISABLE_RAIDS)) {
             return null;
         }
-        final DimensionType cbi3 = xe.level.getDimension().getType();
-        if (cbi3 == DimensionType.NETHER) {
+        final DimensionType cif3 = ze.level.dimensionType();
+        if (!cif3.hasRaids()) {
             return null;
         }
-        final BlockPos fk4 = new BlockPos(xe);
-        final List<PoiRecord> list6 = this.level.getPoiManager().getInRange(PoiType.ALL, fk4, 64, PoiManager.Occupancy.IS_OCCUPIED).collect(Collectors.toList());
+        final BlockPos fu4 = ze.blockPosition();
+        final List<PoiRecord> list6 = this.level.getPoiManager().getInRange(PoiType.ALL, fu4, 64, PoiManager.Occupancy.IS_OCCUPIED).collect(Collectors.toList());
         int integer7 = 0;
-        Vec3 cvl8 = Vec3.ZERO;
-        for (final PoiRecord ass10 : list6) {
-            final BlockPos fk5 = ass10.getPos();
-            cvl8 = cvl8.add(fk5.getX(), fk5.getY(), fk5.getZ());
+        Vec3 dem8 = Vec3.ZERO;
+        for (final PoiRecord aya10 : list6) {
+            final BlockPos fu5 = aya10.getPos();
+            dem8 = dem8.add(fu5.getX(), fu5.getY(), fu5.getZ());
             ++integer7;
         }
-        BlockPos fk6;
+        BlockPos fu6;
         if (integer7 > 0) {
-            cvl8 = cvl8.scale(1.0 / integer7);
-            fk6 = new BlockPos(cvl8);
+            dem8 = dem8.scale(1.0 / integer7);
+            fu6 = new BlockPos(dem8);
         }
         else {
-            fk6 = fk4;
+            fu6 = fu4;
         }
-        final Raid azn9 = this.getOrCreateRaid(xe.getLevel(), fk6);
+        final Raid bfh9 = this.getOrCreateRaid(ze.getLevel(), fu6);
         boolean boolean10 = false;
-        if (!azn9.isStarted()) {
-            if (!this.raidMap.containsKey(azn9.getId())) {
-                this.raidMap.put(azn9.getId(), azn9);
+        if (!bfh9.isStarted()) {
+            if (!this.raidMap.containsKey(bfh9.getId())) {
+                this.raidMap.put(bfh9.getId(), bfh9);
             }
             boolean10 = true;
         }
-        else if (azn9.getBadOmenLevel() < azn9.getMaxBadOmenLevel()) {
+        else if (bfh9.getBadOmenLevel() < bfh9.getMaxBadOmenLevel()) {
             boolean10 = true;
         }
         else {
-            xe.removeEffect(MobEffects.BAD_OMEN);
-            xe.connection.send(new ClientboundEntityEventPacket(xe, (byte)43));
+            ze.removeEffect(MobEffects.BAD_OMEN);
+            ze.connection.send(new ClientboundEntityEventPacket(ze, (byte)43));
         }
         if (boolean10) {
-            azn9.absorbBadOmen(xe);
-            xe.connection.send(new ClientboundEntityEventPacket(xe, (byte)43));
-            if (!azn9.hasFirstWaveSpawned()) {
-                xe.awardStat(Stats.RAID_TRIGGER);
-                CriteriaTriggers.BAD_OMEN.trigger(xe);
+            bfh9.absorbBadOmen(ze);
+            ze.connection.send(new ClientboundEntityEventPacket(ze, (byte)43));
+            if (!bfh9.hasFirstWaveSpawned()) {
+                ze.awardStat(Stats.RAID_TRIGGER);
+                CriteriaTriggers.BAD_OMEN.trigger(ze);
             }
         }
         this.setDirty();
-        return azn9;
+        return bfh9;
     }
     
-    private Raid getOrCreateRaid(final ServerLevel xd, final BlockPos fk) {
-        final Raid azn4 = xd.getRaidAt(fk);
-        return (azn4 != null) ? azn4 : new Raid(this.getUniqueId(), xd, fk);
+    private Raid getOrCreateRaid(final ServerLevel zd, final BlockPos fu) {
+        final Raid bfh4 = zd.getRaidAt(fu);
+        return (bfh4 != null) ? bfh4 : new Raid(this.getUniqueId(), zd, fu);
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        this.nextAvailableID = jt.getInt("NextAvailableID");
-        this.tick = jt.getInt("Tick");
-        final ListTag jz3 = jt.getList("Raids", 10);
-        for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-            final CompoundTag jt2 = jz3.getCompound(integer4);
-            final Raid azn6 = new Raid(this.level, jt2);
-            this.raidMap.put(azn6.getId(), azn6);
+    public void load(final CompoundTag le) {
+        this.nextAvailableID = le.getInt("NextAvailableID");
+        this.tick = le.getInt("Tick");
+        final ListTag lk3 = le.getList("Raids", 10);
+        for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+            final CompoundTag le2 = lk3.getCompound(integer4);
+            final Raid bfh6 = new Raid(this.level, le2);
+            this.raidMap.put(bfh6.getId(), bfh6);
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        jt.putInt("NextAvailableID", this.nextAvailableID);
-        jt.putInt("Tick", this.tick);
-        final ListTag jz3 = new ListTag();
-        for (final Raid azn5 : this.raidMap.values()) {
-            final CompoundTag jt2 = new CompoundTag();
-            azn5.save(jt2);
-            ((AbstractList<CompoundTag>)jz3).add(jt2);
+    public CompoundTag save(final CompoundTag le) {
+        le.putInt("NextAvailableID", this.nextAvailableID);
+        le.putInt("Tick", this.tick);
+        final ListTag lk3 = new ListTag();
+        for (final Raid bfh5 : this.raidMap.values()) {
+            final CompoundTag le2 = new CompoundTag();
+            bfh5.save(le2);
+            ((AbstractList<CompoundTag>)lk3).add(le2);
         }
-        jt.put("Raids", jz3);
-        return jt;
+        le.put("Raids", lk3);
+        return le;
     }
     
-    public static String getFileId(final Dimension cbh) {
-        return "raids" + cbh.getType().getFileSuffix();
+    public static String getFileId(final DimensionType cif) {
+        return "raids" + cif.getFileSuffix();
     }
     
     private int getUniqueId() {
@@ -172,20 +171,20 @@ public class Raids extends SavedData {
     }
     
     @Nullable
-    public Raid getNearbyRaid(final BlockPos fk, final int integer) {
-        Raid azn4 = null;
+    public Raid getNearbyRaid(final BlockPos fu, final int integer) {
+        Raid bfh4 = null;
         double double5 = integer;
-        for (final Raid azn5 : this.raidMap.values()) {
-            final double double6 = azn5.getCenter().distSqr(fk);
-            if (!azn5.isActive()) {
+        for (final Raid bfh5 : this.raidMap.values()) {
+            final double double6 = bfh5.getCenter().distSqr(fu);
+            if (!bfh5.isActive()) {
                 continue;
             }
             if (double6 >= double5) {
                 continue;
             }
-            azn4 = azn5;
+            bfh4 = bfh5;
             double5 = double6;
         }
-        return azn4;
+        return bfh4;
     }
 }
diff --git a/src/net/minecraft/world/entity/schedule/Activity.java b/src/net/minecraft/world/entity/schedule/Activity.java
index 52d51c5..ae348ee 100644
--- a/src/net/minecraft/world/entity/schedule/Activity.java
+++ b/src/net/minecraft/world/entity/schedule/Activity.java
@@ -13,10 +13,17 @@ public class Activity {
     public static final Activity RAID;
     public static final Activity PRE_RAID;
     public static final Activity HIDE;
+    public static final Activity FIGHT;
+    public static final Activity CELEBRATE;
+    public static final Activity ADMIRE_ITEM;
+    public static final Activity AVOID;
+    public static final Activity RIDE;
     private final String name;
+    private final int hashCode;
     
     private Activity(final String string) {
         this.name = string;
+        this.hashCode = string.hashCode();
     }
     
     public String getName() {
@@ -27,6 +34,23 @@ public class Activity {
         return Registry.<Activity>register(Registry.ACTIVITY, string, new Activity(string));
     }
     
+    @Override
+    public boolean equals(final Object object) {
+        if (this == object) {
+            return true;
+        }
+        if (object == null || this.getClass() != object.getClass()) {
+            return false;
+        }
+        final Activity bfl3 = (Activity)object;
+        return this.name.equals(bfl3.name);
+    }
+    
+    @Override
+    public int hashCode() {
+        return this.hashCode;
+    }
+    
     @Override
     public String toString() {
         return this.getName();
@@ -43,5 +67,10 @@ public class Activity {
         RAID = register("raid");
         PRE_RAID = register("pre_raid");
         HIDE = register("hide");
+        FIGHT = register("fight");
+        CELEBRATE = register("celebrate");
+        ADMIRE_ITEM = register("admire_item");
+        AVOID = register("avoid");
+        RIDE = register("ride");
     }
 }
diff --git a/src/net/minecraft/world/entity/schedule/Schedule.java b/src/net/minecraft/world/entity/schedule/Schedule.java
index a8aac7d..543ea84 100644
--- a/src/net/minecraft/world/entity/schedule/Schedule.java
+++ b/src/net/minecraft/world/entity/schedule/Schedule.java
@@ -21,22 +21,22 @@ public class Schedule {
     }
     
     protected static ScheduleBuilder register(final String string) {
-        final Schedule azt2 = Registry.<Schedule>register(Registry.SCHEDULE, string, new Schedule());
-        return new ScheduleBuilder(azt2);
+        final Schedule bfn2 = Registry.<Schedule>register(Registry.SCHEDULE, string, new Schedule());
+        return new ScheduleBuilder(bfn2);
     }
     
-    protected void ensureTimelineExistsFor(final Activity azr) {
-        if (!this.timelines.containsKey(azr)) {
-            this.timelines.put(azr, new Timeline());
+    protected void ensureTimelineExistsFor(final Activity bfl) {
+        if (!this.timelines.containsKey(bfl)) {
+            this.timelines.put(bfl, new Timeline());
         }
     }
     
-    protected Timeline getTimelineFor(final Activity azr) {
-        return this.timelines.get(azr);
+    protected Timeline getTimelineFor(final Activity bfl) {
+        return this.timelines.get(bfl);
     }
     
-    protected List<Timeline> getAllTimelinesExceptFor(final Activity azr) {
-        return this.timelines.entrySet().stream().filter(entry -> entry.getKey() != azr).map(Map.Entry::getValue).collect(Collectors.toList());
+    protected List<Timeline> getAllTimelinesExceptFor(final Activity bfl) {
+        return this.timelines.entrySet().stream().filter(entry -> entry.getKey() != bfl).map(Map.Entry::getValue).collect(Collectors.toList());
     }
     
     public Activity getActivityAt(final int integer) {
diff --git a/src/net/minecraft/world/entity/schedule/ScheduleBuilder.java b/src/net/minecraft/world/entity/schedule/ScheduleBuilder.java
index 8823920..6a1be52 100644
--- a/src/net/minecraft/world/entity/schedule/ScheduleBuilder.java
+++ b/src/net/minecraft/world/entity/schedule/ScheduleBuilder.java
@@ -12,23 +12,23 @@ public class ScheduleBuilder {
     private final Schedule schedule;
     private final List<ActivityTransition> transitions;
     
-    public ScheduleBuilder(final Schedule azt) {
+    public ScheduleBuilder(final Schedule bfn) {
         this.transitions = Lists.newArrayList();
-        this.schedule = azt;
+        this.schedule = bfn;
     }
     
-    public ScheduleBuilder changeActivityAt(final int integer, final Activity azr) {
-        this.transitions.add(new ActivityTransition(integer, azr));
+    public ScheduleBuilder changeActivityAt(final int integer, final Activity bfl) {
+        this.transitions.add(new ActivityTransition(integer, bfl));
         return this;
     }
     
     public Schedule build() {
         this.transitions.stream().map(ActivityTransition::getActivity).collect(Collectors.toSet()).forEach(this.schedule::ensureTimelineExistsFor);
-        final Activity azr3;
+        final Activity bfl3;
         this.transitions.forEach(a -> {
-            azr3 = a.getActivity();
-            this.schedule.getAllTimelinesExceptFor(azr3).forEach(azv -> azv.addKeyframe(a.getTime(), 0.0f));
-            this.schedule.getTimelineFor(azr3).addKeyframe(a.getTime(), 1.0f);
+            bfl3 = a.getActivity();
+            this.schedule.getAllTimelinesExceptFor(bfl3).forEach(bfp -> bfp.addKeyframe(a.getTime(), 0.0f));
+            this.schedule.getTimelineFor(bfl3).addKeyframe(a.getTime(), 1.0f);
             return;
         });
         return this.schedule;
@@ -38,9 +38,9 @@ public class ScheduleBuilder {
         private final int time;
         private final Activity activity;
         
-        public ActivityTransition(final int integer, final Activity azr) {
+        public ActivityTransition(final int integer, final Activity bfl) {
             this.time = integer;
-            this.activity = azr;
+            this.activity = bfl;
         }
         
         public int getTime() {
diff --git a/src/net/minecraft/world/entity/schedule/Timeline.java b/src/net/minecraft/world/entity/schedule/Timeline.java
index 19da896..a865ebb 100644
--- a/src/net/minecraft/world/entity/schedule/Timeline.java
+++ b/src/net/minecraft/world/entity/schedule/Timeline.java
@@ -23,7 +23,7 @@ public class Timeline {
     private void sortAndDeduplicateKeyframes() {
         final Int2ObjectSortedMap<Keyframe> int2ObjectSortedMap2 = (Int2ObjectSortedMap<Keyframe>)new Int2ObjectAVLTreeMap();
         final Keyframe keyframe;
-        this.keyframes.forEach(azs -> keyframe = (Keyframe)int2ObjectSortedMap2.put(azs.getTimeStamp(), azs));
+        this.keyframes.forEach(bfm -> keyframe = (Keyframe)int2ObjectSortedMap2.put(bfm.getTimeStamp(), bfm));
         this.keyframes.clear();
         this.keyframes.addAll(int2ObjectSortedMap2.values());
         this.previousIndex = 0;
@@ -33,18 +33,18 @@ public class Timeline {
         if (this.keyframes.size() <= 0) {
             return 0.0f;
         }
-        final Keyframe azs3 = this.keyframes.get(this.previousIndex);
-        final Keyframe azs4 = this.keyframes.get(this.keyframes.size() - 1);
-        final boolean boolean5 = integer < azs3.getTimeStamp();
+        final Keyframe bfm3 = this.keyframes.get(this.previousIndex);
+        final Keyframe bfm4 = this.keyframes.get(this.keyframes.size() - 1);
+        final boolean boolean5 = integer < bfm3.getTimeStamp();
         final int integer2 = boolean5 ? 0 : this.previousIndex;
-        float float7 = boolean5 ? azs4.getValue() : azs3.getValue();
+        float float7 = boolean5 ? bfm4.getValue() : bfm3.getValue();
         for (int integer3 = integer2; integer3 < this.keyframes.size(); ++integer3) {
-            final Keyframe azs5 = this.keyframes.get(integer3);
-            if (azs5.getTimeStamp() > integer) {
+            final Keyframe bfm5 = this.keyframes.get(integer3);
+            if (bfm5.getTimeStamp() > integer) {
                 break;
             }
             this.previousIndex = integer3;
-            float7 = azs5.getValue();
+            float7 = bfm5.getValue();
         }
         return float7;
     }
diff --git a/src/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/net/minecraft/world/entity/vehicle/AbstractMinecart.java
index f31c359..0a8e989 100644
--- a/src/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+++ b/src/net/minecraft/world/entity/vehicle/AbstractMinecart.java
@@ -7,30 +7,34 @@ import net.minecraft.network.syncher.EntityDataSerializers;
 import java.util.EnumMap;
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.Packet;
-import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.BaseRailBlock;
 import net.minecraft.world.entity.MoverType;
 import java.util.Iterator;
 import java.util.List;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.entity.animal.IronGolem;
 import java.util.function.Predicate;
 import net.minecraft.world.entity.EntitySelector;
-import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.PoweredRailBlock;
-import net.minecraft.tags.BlockTags;
-import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.BaseRailBlock;
 import net.minecraft.util.Mth;
-import net.minecraft.core.Direction;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.EntityDimensions;
+import com.google.common.collect.UnmodifiableIterator;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.TrapDoorBlock;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.entity.LivingEntity;
 import javax.annotation.Nullable;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.block.Block;
@@ -42,6 +46,9 @@ import net.minecraft.core.Vec3i;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.level.block.state.properties.RailShape;
 import java.util.Map;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.entity.Pose;
+import com.google.common.collect.ImmutableMap;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.world.entity.Entity;
 
@@ -52,6 +59,7 @@ public abstract class AbstractMinecart extends Entity {
     private static final EntityDataAccessor<Integer> DATA_ID_DISPLAY_BLOCK;
     private static final EntityDataAccessor<Integer> DATA_ID_DISPLAY_OFFSET;
     private static final EntityDataAccessor<Boolean> DATA_ID_CUSTOM_DISPLAY;
+    private static final ImmutableMap<Pose, ImmutableList<Integer>> POSE_DISMOUNT_HEIGHTS;
     private boolean flipped;
     private static final Map<RailShape, Pair<Vec3i, Vec3i>> EXITS;
     private int lSteps;
@@ -64,13 +72,13 @@ public abstract class AbstractMinecart extends Entity {
     private double lyd;
     private double lzd;
     
-    protected AbstractMinecart(final EntityType<?> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AbstractMinecart(final EntityType<?> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.blocksBuilding = true;
     }
     
-    protected AbstractMinecart(final EntityType<?> aku, final Level bjw, final double double3, final double double4, final double double5) {
-        this(aku, bjw);
+    protected AbstractMinecart(final EntityType<?> aoq, final Level bqb, final double double3, final double double4, final double double5) {
+        this(aoq, bqb);
         this.setPos(double3, double4, double5);
         this.setDeltaMovement(Vec3.ZERO);
         this.xo = double3;
@@ -78,26 +86,26 @@ public abstract class AbstractMinecart extends Entity {
         this.zo = double5;
     }
     
-    public static AbstractMinecart createMinecart(final Level bjw, final double double2, final double double3, final double double4, final Type a) {
+    public static AbstractMinecart createMinecart(final Level bqb, final double double2, final double double3, final double double4, final Type a) {
         if (a == Type.CHEST) {
-            return new MinecartChest(bjw, double2, double3, double4);
+            return new MinecartChest(bqb, double2, double3, double4);
         }
         if (a == Type.FURNACE) {
-            return new MinecartFurnace(bjw, double2, double3, double4);
+            return new MinecartFurnace(bqb, double2, double3, double4);
         }
         if (a == Type.TNT) {
-            return new MinecartTNT(bjw, double2, double3, double4);
+            return new MinecartTNT(bqb, double2, double3, double4);
         }
         if (a == Type.SPAWNER) {
-            return new MinecartSpawner(bjw, double2, double3, double4);
+            return new MinecartSpawner(bqb, double2, double3, double4);
         }
         if (a == Type.HOPPER) {
-            return new MinecartHopper(bjw, double2, double3, double4);
+            return new MinecartHopper(bqb, double2, double3, double4);
         }
         if (a == Type.COMMAND_BLOCK) {
-            return new MinecartCommandBlock(bjw, double2, double3, double4);
+            return new MinecartCommandBlock(bqb, double2, double3, double4);
         }
-        return new Minecart(bjw, double2, double3, double4);
+        return new Minecart(bqb, double2, double3, double4);
     }
     
     @Override
@@ -117,9 +125,9 @@ public abstract class AbstractMinecart extends Entity {
     
     @Nullable
     @Override
-    public AABB getCollideAgainstBox(final Entity akq) {
-        if (akq.isPushable()) {
-            return akq.getBoundingBox();
+    public AABB getCollideAgainstBox(final Entity aom) {
+        if (aom.isPushable()) {
+            return aom.getBoundingBox();
         }
         return null;
     }
@@ -130,27 +138,75 @@ public abstract class AbstractMinecart extends Entity {
     }
     
     @Override
-    public double getRideHeight() {
+    public double getPassengersRidingOffset() {
         return 0.0;
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
+    public Vec3 getDismountLocationForPassenger(final LivingEntity aoy) {
+        final Direction fz3 = this.getMotionDirection();
+        if (fz3.getAxis() == Direction.Axis.Y) {
+            return super.getDismountLocationForPassenger(aoy);
+        }
+        final int[][] arr4 = DismountHelper.offsetsForDirection(fz3);
+        final BlockPos fu5 = this.blockPosition();
+        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
+        final ImmutableList<Pose> immutableList7 = aoy.getDismountPoses();
+        for (final Pose apj9 : immutableList7) {
+            final EntityDimensions aon10 = aoy.getDimensions(apj9);
+            final float float11 = Math.min(aon10.width, 1.0f) / 2.0f;
+            for (final int integer13 : AbstractMinecart.POSE_DISMOUNT_HEIGHTS.get(apj9)) {
+                for (final int[] arr5 : arr4) {
+                    a6.set(fu5.getX() + arr5[0], fu5.getY() + integer13, fu5.getZ() + arr5[1]);
+                    final double double18 = this.level.getRelativeFloorHeight(a6, cfj -> {
+                        if (cfj.is(BlockTags.CLIMBABLE)) {
+                            return true;
+                        }
+                        else {
+                            return cfj.getBlock() instanceof TrapDoorBlock && cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN);
+                        }
+                    });
+                    if (DismountHelper.isFloorValid(double18)) {
+                        final AABB deg20 = new AABB(-float11, double18, -float11, float11, double18 + aon10.height, float11);
+                        final Vec3 dem21 = Vec3.upFromBottomCenterOf(a6, double18);
+                        if (DismountHelper.canDismountTo(this.level, aoy, deg20.move(dem21))) {
+                            aoy.setPose(apj9);
+                            return dem21;
+                        }
+                    }
+                }
+            }
+        }
+        final double double19 = this.getBoundingBox().maxY;
+        a6.set(fu5.getX(), double19, fu5.getZ());
+        for (final Pose apj10 : immutableList7) {
+            final double double20 = aoy.getDimensions(apj10).height;
+            final double double21 = a6.getY() + this.level.getRelativeCeilingHeight(a6, double19 - a6.getY() + double20);
+            if (double19 + double20 <= double21) {
+                aoy.setPose(apj10);
+                break;
+            }
+        }
+        return super.getDismountLocationForPassenger(aoy);
+    }
+    
+    @Override
+    public boolean hurt(final DamageSource anw, final float float2) {
         if (this.level.isClientSide || this.removed) {
             return true;
         }
-        if (this.isInvulnerableTo(ajz)) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
         this.setHurtDir(-this.getHurtDir());
         this.setHurtTime(10);
         this.markHurt();
         this.setDamage(this.getDamage() + float2 * 10.0f);
-        final boolean boolean4 = ajz.getEntity() instanceof Player && ((Player)ajz.getEntity()).abilities.instabuild;
+        final boolean boolean4 = anw.getEntity() instanceof Player && ((Player)anw.getEntity()).abilities.instabuild;
         if (boolean4 || this.getDamage() > 40.0f) {
             this.ejectPassengers();
             if (!boolean4 || this.hasCustomName()) {
-                this.destroy(ajz);
+                this.destroy(anw);
             }
             else {
                 this.remove();
@@ -159,14 +215,23 @@ public abstract class AbstractMinecart extends Entity {
         return true;
     }
     
-    public void destroy(final DamageSource ajz) {
+    @Override
+    protected float getBlockSpeedFactor() {
+        final BlockState cfj2 = this.level.getBlockState(this.blockPosition());
+        if (cfj2.is(BlockTags.RAILS)) {
+            return 1.0f;
+        }
+        return super.getBlockSpeedFactor();
+    }
+    
+    public void destroy(final DamageSource anw) {
         this.remove();
         if (this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
-            final ItemStack ben3 = new ItemStack(Items.MINECART);
+            final ItemStack bki3 = new ItemStack(Items.MINECART);
             if (this.hasCustomName()) {
-                ben3.setHoverName(this.getCustomName());
+                bki3.setHoverName(this.getCustomName());
             }
-            this.spawnAtLocation(ben3);
+            this.spawnAtLocation(bki3);
         }
     }
     
@@ -182,8 +247,8 @@ public abstract class AbstractMinecart extends Entity {
         return !this.removed;
     }
     
-    private static Pair<Vec3i, Vec3i> exits(final RailShape bzn) {
-        return AbstractMinecart.EXITS.get(bzn);
+    private static Pair<Vec3i, Vec3i> exits(final RailShape cgm) {
+        return AbstractMinecart.EXITS.get(cgm);
     }
     
     @Override
@@ -230,12 +295,12 @@ public abstract class AbstractMinecart extends Entity {
         if (this.level.getBlockState(new BlockPos(integer2, integer3 - 1, integer4)).is(BlockTags.RAILS)) {
             --integer3;
         }
-        final BlockPos fk5 = new BlockPos(integer2, integer3, integer4);
-        final BlockState byj6 = this.level.getBlockState(fk5);
-        if (byj6.is(BlockTags.RAILS)) {
-            this.moveAlongTrack(fk5, byj6);
-            if (byj6.getBlock() == Blocks.ACTIVATOR_RAIL) {
-                this.activateMinecart(integer2, integer3, integer4, byj6.<Boolean>getValue((Property<Boolean>)PoweredRailBlock.POWERED));
+        final BlockPos fu5 = new BlockPos(integer2, integer3, integer4);
+        final BlockState cfj6 = this.level.getBlockState(fu5);
+        if (BaseRailBlock.isRail(cfj6)) {
+            this.moveAlongTrack(fu5, cfj6);
+            if (cfj6.is(Blocks.ACTIVATOR_RAIL)) {
+                this.activateMinecart(integer2, integer3, integer4, cfj6.<Boolean>getValue((Property<Boolean>)PoweredRailBlock.POWERED));
             }
         }
         else {
@@ -261,24 +326,24 @@ public abstract class AbstractMinecart extends Entity {
             final List<Entity> list13 = this.level.getEntities(this, this.getBoundingBox().inflate(0.20000000298023224, 0.0, 0.20000000298023224), EntitySelector.pushableBy(this));
             if (!list13.isEmpty()) {
                 for (int integer5 = 0; integer5 < list13.size(); ++integer5) {
-                    final Entity akq15 = list13.get(integer5);
-                    if (akq15 instanceof Player || akq15 instanceof IronGolem || akq15 instanceof AbstractMinecart || this.isVehicle() || akq15.isPassenger()) {
-                        akq15.push(this);
+                    final Entity aom15 = list13.get(integer5);
+                    if (aom15 instanceof Player || aom15 instanceof IronGolem || aom15 instanceof AbstractMinecart || this.isVehicle() || aom15.isPassenger()) {
+                        aom15.push(this);
                     }
                     else {
-                        akq15.startRiding(this);
+                        aom15.startRiding(this);
                     }
                 }
             }
         }
         else {
-            for (final Entity akq16 : this.level.getEntities(this, this.getBoundingBox().inflate(0.20000000298023224, 0.0, 0.20000000298023224))) {
-                if (!this.hasPassenger(akq16) && akq16.isPushable() && akq16 instanceof AbstractMinecart) {
-                    akq16.push(this);
+            for (final Entity aom16 : this.level.getEntities(this, this.getBoundingBox().inflate(0.20000000298023224, 0.0, 0.20000000298023224))) {
+                if (!this.hasPassenger(aom16) && aom16.isPushable() && aom16 instanceof AbstractMinecart) {
+                    aom16.push(this);
                 }
             }
         }
-        this.updateInWaterState();
+        this.updateInWaterStateAndDoFluidPushing();
     }
     
     protected double getMaxSpeed() {
@@ -290,8 +355,8 @@ public abstract class AbstractMinecart extends Entity {
     
     protected void comeOffTrack() {
         final double double2 = this.getMaxSpeed();
-        final Vec3 cvl4 = this.getDeltaMovement();
-        this.setDeltaMovement(Mth.clamp(cvl4.x, -double2, double2), cvl4.y, Mth.clamp(cvl4.z, -double2, double2));
+        final Vec3 dem4 = this.getDeltaMovement();
+        this.setDeltaMovement(Mth.clamp(dem4.x, -double2, double2), dem4.y, Mth.clamp(dem4.z, -double2, double2));
         if (this.onGround) {
             this.setDeltaMovement(this.getDeltaMovement().scale(0.5));
         }
@@ -301,67 +366,67 @@ public abstract class AbstractMinecart extends Entity {
         }
     }
     
-    protected void moveAlongTrack(final BlockPos fk, final BlockState byj) {
+    protected void moveAlongTrack(final BlockPos fu, final BlockState cfj) {
         this.fallDistance = 0.0f;
         double double4 = this.getX();
         double double5 = this.getY();
         double double6 = this.getZ();
-        final Vec3 cvl10 = this.getPos(double4, double5, double6);
-        double5 = fk.getY();
+        final Vec3 dem10 = this.getPos(double4, double5, double6);
+        double5 = fu.getY();
         boolean boolean11 = false;
         boolean boolean12 = false;
-        final BaseRailBlock boy13 = (BaseRailBlock)byj.getBlock();
-        if (boy13 == Blocks.POWERED_RAIL) {
-            boolean11 = byj.<Boolean>getValue((Property<Boolean>)PoweredRailBlock.POWERED);
+        final BaseRailBlock bvj13 = (BaseRailBlock)cfj.getBlock();
+        if (bvj13 == Blocks.POWERED_RAIL) {
+            boolean11 = cfj.<Boolean>getValue((Property<Boolean>)PoweredRailBlock.POWERED);
             boolean12 = !boolean11;
         }
         final double double7 = 0.0078125;
-        Vec3 cvl11 = this.getDeltaMovement();
-        final RailShape bzn17 = byj.<RailShape>getValue(boy13.getShapeProperty());
-        switch (bzn17) {
+        Vec3 dem11 = this.getDeltaMovement();
+        final RailShape cgm17 = cfj.<RailShape>getValue(bvj13.getShapeProperty());
+        switch (cgm17) {
             case ASCENDING_EAST: {
-                this.setDeltaMovement(cvl11.add(-0.0078125, 0.0, 0.0));
+                this.setDeltaMovement(dem11.add(-0.0078125, 0.0, 0.0));
                 ++double5;
                 break;
             }
             case ASCENDING_WEST: {
-                this.setDeltaMovement(cvl11.add(0.0078125, 0.0, 0.0));
+                this.setDeltaMovement(dem11.add(0.0078125, 0.0, 0.0));
                 ++double5;
                 break;
             }
             case ASCENDING_NORTH: {
-                this.setDeltaMovement(cvl11.add(0.0, 0.0, 0.0078125));
+                this.setDeltaMovement(dem11.add(0.0, 0.0, 0.0078125));
                 ++double5;
                 break;
             }
             case ASCENDING_SOUTH: {
-                this.setDeltaMovement(cvl11.add(0.0, 0.0, -0.0078125));
+                this.setDeltaMovement(dem11.add(0.0, 0.0, -0.0078125));
                 ++double5;
                 break;
             }
         }
-        cvl11 = this.getDeltaMovement();
-        final Pair<Vec3i, Vec3i> pair18 = exits(bzn17);
-        final Vec3i gg19 = (Vec3i)pair18.getFirst();
-        final Vec3i gg20 = (Vec3i)pair18.getSecond();
-        double double8 = gg20.getX() - gg19.getX();
-        double double9 = gg20.getZ() - gg19.getZ();
+        dem11 = this.getDeltaMovement();
+        final Pair<Vec3i, Vec3i> pair18 = exits(cgm17);
+        final Vec3i gr19 = (Vec3i)pair18.getFirst();
+        final Vec3i gr20 = (Vec3i)pair18.getSecond();
+        double double8 = gr20.getX() - gr19.getX();
+        double double9 = gr20.getZ() - gr19.getZ();
         final double double10 = Math.sqrt(double8 * double8 + double9 * double9);
-        final double double11 = cvl11.x * double8 + cvl11.z * double9;
+        final double double11 = dem11.x * double8 + dem11.z * double9;
         if (double11 < 0.0) {
             double8 = -double8;
             double9 = -double9;
         }
-        final double double12 = Math.min(2.0, Math.sqrt(Entity.getHorizontalDistanceSqr(cvl11)));
-        cvl11 = new Vec3(double12 * double8 / double10, cvl11.y, double12 * double9 / double10);
-        this.setDeltaMovement(cvl11);
-        final Entity akq31 = this.getPassengers().isEmpty() ? null : this.getPassengers().get(0);
-        if (akq31 instanceof Player) {
-            final Vec3 cvl12 = akq31.getDeltaMovement();
-            final double double13 = Entity.getHorizontalDistanceSqr(cvl12);
+        final double double12 = Math.min(2.0, Math.sqrt(Entity.getHorizontalDistanceSqr(dem11)));
+        dem11 = new Vec3(double12 * double8 / double10, dem11.y, double12 * double9 / double10);
+        this.setDeltaMovement(dem11);
+        final Entity aom31 = this.getPassengers().isEmpty() ? null : this.getPassengers().get(0);
+        if (aom31 instanceof Player) {
+            final Vec3 dem12 = aom31.getDeltaMovement();
+            final double double13 = Entity.getHorizontalDistanceSqr(dem12);
             final double double14 = Entity.getHorizontalDistanceSqr(this.getDeltaMovement());
             if (double13 > 1.0E-4 && double14 < 0.01) {
-                this.setDeltaMovement(this.getDeltaMovement().add(cvl12.x * 0.1, 0.0, cvl12.z * 0.1));
+                this.setDeltaMovement(this.getDeltaMovement().add(dem12.x * 0.1, 0.0, dem12.z * 0.1));
                 boolean12 = false;
             }
         }
@@ -374,18 +439,18 @@ public abstract class AbstractMinecart extends Entity {
                 this.setDeltaMovement(this.getDeltaMovement().multiply(0.5, 0.0, 0.5));
             }
         }
-        final double double15 = fk.getX() + 0.5 + gg19.getX() * 0.5;
-        final double double16 = fk.getZ() + 0.5 + gg19.getZ() * 0.5;
-        final double double17 = fk.getX() + 0.5 + gg20.getX() * 0.5;
-        final double double18 = fk.getZ() + 0.5 + gg20.getZ() * 0.5;
+        final double double15 = fu.getX() + 0.5 + gr19.getX() * 0.5;
+        final double double16 = fu.getZ() + 0.5 + gr19.getZ() * 0.5;
+        final double double17 = fu.getX() + 0.5 + gr20.getX() * 0.5;
+        final double double18 = fu.getZ() + 0.5 + gr20.getZ() * 0.5;
         double8 = double17 - double15;
         double9 = double18 - double16;
         double double19;
         if (double8 == 0.0) {
-            double19 = double6 - fk.getZ();
+            double19 = double6 - fu.getZ();
         }
         else if (double9 == 0.0) {
-            double19 = double4 - fk.getX();
+            double19 = double4 - fu.getX();
         }
         else {
             final double double20 = double4 - double15;
@@ -397,69 +462,69 @@ public abstract class AbstractMinecart extends Entity {
         this.setPos(double4, double5, double6);
         final double double20 = this.isVehicle() ? 0.75 : 1.0;
         final double double21 = this.getMaxSpeed();
-        cvl11 = this.getDeltaMovement();
-        this.move(MoverType.SELF, new Vec3(Mth.clamp(double20 * cvl11.x, -double21, double21), 0.0, Mth.clamp(double20 * cvl11.z, -double21, double21)));
-        if (gg19.getY() != 0 && Mth.floor(this.getX()) - fk.getX() == gg19.getX() && Mth.floor(this.getZ()) - fk.getZ() == gg19.getZ()) {
-            this.setPos(this.getX(), this.getY() + gg19.getY(), this.getZ());
+        dem11 = this.getDeltaMovement();
+        this.move(MoverType.SELF, new Vec3(Mth.clamp(double20 * dem11.x, -double21, double21), 0.0, Mth.clamp(double20 * dem11.z, -double21, double21)));
+        if (gr19.getY() != 0 && Mth.floor(this.getX()) - fu.getX() == gr19.getX() && Mth.floor(this.getZ()) - fu.getZ() == gr19.getZ()) {
+            this.setPos(this.getX(), this.getY() + gr19.getY(), this.getZ());
         }
-        else if (gg20.getY() != 0 && Mth.floor(this.getX()) - fk.getX() == gg20.getX() && Mth.floor(this.getZ()) - fk.getZ() == gg20.getZ()) {
-            this.setPos(this.getX(), this.getY() + gg20.getY(), this.getZ());
+        else if (gr20.getY() != 0 && Mth.floor(this.getX()) - fu.getX() == gr20.getX() && Mth.floor(this.getZ()) - fu.getZ() == gr20.getZ()) {
+            this.setPos(this.getX(), this.getY() + gr20.getY(), this.getZ());
         }
         this.applyNaturalSlowdown();
-        final Vec3 cvl13 = this.getPos(this.getX(), this.getY(), this.getZ());
-        if (cvl13 != null && cvl10 != null) {
-            final double double22 = (cvl10.y - cvl13.y) * 0.05;
-            final Vec3 cvl14 = this.getDeltaMovement();
-            final double double23 = Math.sqrt(Entity.getHorizontalDistanceSqr(cvl14));
+        final Vec3 dem13 = this.getPos(this.getX(), this.getY(), this.getZ());
+        if (dem13 != null && dem10 != null) {
+            final double double22 = (dem10.y - dem13.y) * 0.05;
+            final Vec3 dem14 = this.getDeltaMovement();
+            final double double23 = Math.sqrt(Entity.getHorizontalDistanceSqr(dem14));
             if (double23 > 0.0) {
-                this.setDeltaMovement(cvl14.multiply((double23 + double22) / double23, 1.0, (double23 + double22) / double23));
+                this.setDeltaMovement(dem14.multiply((double23 + double22) / double23, 1.0, (double23 + double22) / double23));
             }
-            this.setPos(this.getX(), cvl13.y, this.getZ());
+            this.setPos(this.getX(), dem13.y, this.getZ());
         }
         final int integer47 = Mth.floor(this.getX());
         final int integer48 = Mth.floor(this.getZ());
-        if (integer47 != fk.getX() || integer48 != fk.getZ()) {
-            final Vec3 cvl14 = this.getDeltaMovement();
-            final double double23 = Math.sqrt(Entity.getHorizontalDistanceSqr(cvl14));
-            this.setDeltaMovement(double23 * (integer47 - fk.getX()), cvl14.y, double23 * (integer48 - fk.getZ()));
+        if (integer47 != fu.getX() || integer48 != fu.getZ()) {
+            final Vec3 dem14 = this.getDeltaMovement();
+            final double double23 = Math.sqrt(Entity.getHorizontalDistanceSqr(dem14));
+            this.setDeltaMovement(double23 * (integer47 - fu.getX()), dem14.y, double23 * (integer48 - fu.getZ()));
         }
         if (boolean11) {
-            final Vec3 cvl14 = this.getDeltaMovement();
-            final double double23 = Math.sqrt(Entity.getHorizontalDistanceSqr(cvl14));
+            final Vec3 dem14 = this.getDeltaMovement();
+            final double double23 = Math.sqrt(Entity.getHorizontalDistanceSqr(dem14));
             if (double23 > 0.01) {
                 final double double24 = 0.06;
-                this.setDeltaMovement(cvl14.add(cvl14.x / double23 * 0.06, 0.0, cvl14.z / double23 * 0.06));
+                this.setDeltaMovement(dem14.add(dem14.x / double23 * 0.06, 0.0, dem14.z / double23 * 0.06));
             }
             else {
-                final Vec3 cvl15 = this.getDeltaMovement();
-                double double25 = cvl15.x;
-                double double26 = cvl15.z;
-                if (bzn17 == RailShape.EAST_WEST) {
-                    if (this.isRedstoneConductor(fk.west())) {
+                final Vec3 dem15 = this.getDeltaMovement();
+                double double25 = dem15.x;
+                double double26 = dem15.z;
+                if (cgm17 == RailShape.EAST_WEST) {
+                    if (this.isRedstoneConductor(fu.west())) {
                         double25 = 0.02;
                     }
-                    else if (this.isRedstoneConductor(fk.east())) {
+                    else if (this.isRedstoneConductor(fu.east())) {
                         double25 = -0.02;
                     }
                 }
                 else {
-                    if (bzn17 != RailShape.NORTH_SOUTH) {
+                    if (cgm17 != RailShape.NORTH_SOUTH) {
                         return;
                     }
-                    if (this.isRedstoneConductor(fk.north())) {
+                    if (this.isRedstoneConductor(fu.north())) {
                         double26 = 0.02;
                     }
-                    else if (this.isRedstoneConductor(fk.south())) {
+                    else if (this.isRedstoneConductor(fu.south())) {
                         double26 = -0.02;
                     }
                 }
-                this.setDeltaMovement(double25, cvl15.y, double26);
+                this.setDeltaMovement(double25, dem15.y, double26);
             }
         }
     }
     
-    private boolean isRedstoneConductor(final BlockPos fk) {
-        return this.level.getBlockState(fk).isRedstoneConductor(this.level, fk);
+    private boolean isRedstoneConductor(final BlockPos fu) {
+        return this.level.getBlockState(fu).isRedstoneConductor(this.level, fu);
     }
     
     protected void applyNaturalSlowdown() {
@@ -475,28 +540,28 @@ public abstract class AbstractMinecart extends Entity {
         if (this.level.getBlockState(new BlockPos(integer10, integer11 - 1, integer12)).is(BlockTags.RAILS)) {
             --integer11;
         }
-        final BlockState byj13 = this.level.getBlockState(new BlockPos(integer10, integer11, integer12));
-        if (byj13.is(BlockTags.RAILS)) {
-            final RailShape bzn14 = byj13.<RailShape>getValue(((BaseRailBlock)byj13.getBlock()).getShapeProperty());
+        final BlockState cfj13 = this.level.getBlockState(new BlockPos(integer10, integer11, integer12));
+        if (BaseRailBlock.isRail(cfj13)) {
+            final RailShape cgm14 = cfj13.<RailShape>getValue(((BaseRailBlock)cfj13.getBlock()).getShapeProperty());
             double2 = integer11;
-            if (bzn14.isAscending()) {
+            if (cgm14.isAscending()) {
                 double2 = integer11 + 1;
             }
-            final Pair<Vec3i, Vec3i> pair15 = exits(bzn14);
-            final Vec3i gg16 = (Vec3i)pair15.getFirst();
-            final Vec3i gg17 = (Vec3i)pair15.getSecond();
-            double double5 = gg17.getX() - gg16.getX();
-            double double6 = gg17.getZ() - gg16.getZ();
+            final Pair<Vec3i, Vec3i> pair15 = exits(cgm14);
+            final Vec3i gr16 = (Vec3i)pair15.getFirst();
+            final Vec3i gr17 = (Vec3i)pair15.getSecond();
+            double double5 = gr17.getX() - gr16.getX();
+            double double6 = gr17.getZ() - gr16.getZ();
             final double double7 = Math.sqrt(double5 * double5 + double6 * double6);
             double5 /= double7;
             double6 /= double7;
             double1 += double5 * double4;
             double3 += double6 * double4;
-            if (gg16.getY() != 0 && Mth.floor(double1) - integer10 == gg16.getX() && Mth.floor(double3) - integer12 == gg16.getZ()) {
-                double2 += gg16.getY();
+            if (gr16.getY() != 0 && Mth.floor(double1) - integer10 == gr16.getX() && Mth.floor(double3) - integer12 == gr16.getZ()) {
+                double2 += gr16.getY();
             }
-            else if (gg17.getY() != 0 && Mth.floor(double1) - integer10 == gg17.getX() && Mth.floor(double3) - integer12 == gg17.getZ()) {
-                double2 += gg17.getY();
+            else if (gr17.getY() != 0 && Mth.floor(double1) - integer10 == gr17.getX() && Mth.floor(double3) - integer12 == gr17.getZ()) {
+                double2 += gr17.getY();
             }
             return this.getPos(double1, double2, double3);
         }
@@ -511,18 +576,18 @@ public abstract class AbstractMinecart extends Entity {
         if (this.level.getBlockState(new BlockPos(integer8, integer9 - 1, integer10)).is(BlockTags.RAILS)) {
             --integer9;
         }
-        final BlockState byj11 = this.level.getBlockState(new BlockPos(integer8, integer9, integer10));
-        if (byj11.is(BlockTags.RAILS)) {
-            final RailShape bzn12 = byj11.<RailShape>getValue(((BaseRailBlock)byj11.getBlock()).getShapeProperty());
-            final Pair<Vec3i, Vec3i> pair13 = exits(bzn12);
-            final Vec3i gg14 = (Vec3i)pair13.getFirst();
-            final Vec3i gg15 = (Vec3i)pair13.getSecond();
-            final double double4 = integer8 + 0.5 + gg14.getX() * 0.5;
-            final double double5 = integer9 + 0.0625 + gg14.getY() * 0.5;
-            final double double6 = integer10 + 0.5 + gg14.getZ() * 0.5;
-            final double double7 = integer8 + 0.5 + gg15.getX() * 0.5;
-            final double double8 = integer9 + 0.0625 + gg15.getY() * 0.5;
-            final double double9 = integer10 + 0.5 + gg15.getZ() * 0.5;
+        final BlockState cfj11 = this.level.getBlockState(new BlockPos(integer8, integer9, integer10));
+        if (BaseRailBlock.isRail(cfj11)) {
+            final RailShape cgm12 = cfj11.<RailShape>getValue(((BaseRailBlock)cfj11.getBlock()).getShapeProperty());
+            final Pair<Vec3i, Vec3i> pair13 = exits(cgm12);
+            final Vec3i gr14 = (Vec3i)pair13.getFirst();
+            final Vec3i gr15 = (Vec3i)pair13.getSecond();
+            final double double4 = integer8 + 0.5 + gr14.getX() * 0.5;
+            final double double5 = integer9 + 0.0625 + gr14.getY() * 0.5;
+            final double double6 = integer10 + 0.5 + gr14.getZ() * 0.5;
+            final double double7 = integer8 + 0.5 + gr15.getX() * 0.5;
+            final double double8 = integer9 + 0.0625 + gr15.getY() * 0.5;
+            final double double9 = integer10 + 0.5 + gr15.getZ() * 0.5;
             final double double10 = double7 - double4;
             final double double11 = (double8 - double5) * 2.0;
             final double double12 = double9 - double6;
@@ -554,43 +619,43 @@ public abstract class AbstractMinecart extends Entity {
     
     @Override
     public AABB getBoundingBoxForCulling() {
-        final AABB cvf2 = this.getBoundingBox();
+        final AABB deg2 = this.getBoundingBox();
         if (this.hasCustomDisplay()) {
-            return cvf2.inflate(Math.abs(this.getDisplayOffset()) / 16.0);
+            return deg2.inflate(Math.abs(this.getDisplayOffset()) / 16.0);
         }
-        return cvf2;
+        return deg2;
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        if (jt.getBoolean("CustomDisplayTile")) {
-            this.setDisplayBlockState(NbtUtils.readBlockState(jt.getCompound("DisplayState")));
-            this.setDisplayOffset(jt.getInt("DisplayOffset"));
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        if (le.getBoolean("CustomDisplayTile")) {
+            this.setDisplayBlockState(NbtUtils.readBlockState(le.getCompound("DisplayState")));
+            this.setDisplayOffset(le.getInt("DisplayOffset"));
         }
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
+    protected void addAdditionalSaveData(final CompoundTag le) {
         if (this.hasCustomDisplay()) {
-            jt.putBoolean("CustomDisplayTile", true);
-            jt.put("DisplayState", NbtUtils.writeBlockState(this.getDisplayBlockState()));
-            jt.putInt("DisplayOffset", this.getDisplayOffset());
+            le.putBoolean("CustomDisplayTile", true);
+            le.put("DisplayState", NbtUtils.writeBlockState(this.getDisplayBlockState()));
+            le.putInt("DisplayOffset", this.getDisplayOffset());
         }
     }
     
     @Override
-    public void push(final Entity akq) {
+    public void push(final Entity aom) {
         if (this.level.isClientSide) {
             return;
         }
-        if (akq.noPhysics || this.noPhysics) {
+        if (aom.noPhysics || this.noPhysics) {
             return;
         }
-        if (this.hasPassenger(akq)) {
+        if (this.hasPassenger(aom)) {
             return;
         }
-        double double3 = akq.getX() - this.getX();
-        double double4 = akq.getZ() - this.getZ();
+        double double3 = aom.getX() - this.getX();
+        double double4 = aom.getZ() - this.getZ();
         double double5 = double3 * double3 + double4 * double4;
         if (double5 >= 9.999999747378752E-5) {
             double5 = Mth.sqrt(double5);
@@ -608,39 +673,39 @@ public abstract class AbstractMinecart extends Entity {
             double4 *= 1.0f - this.pushthrough;
             double3 *= 0.5;
             double4 *= 0.5;
-            if (akq instanceof AbstractMinecart) {
-                final double double7 = akq.getX() - this.getX();
-                final double double8 = akq.getZ() - this.getZ();
-                final Vec3 cvl15 = new Vec3(double7, 0.0, double8).normalize();
-                final Vec3 cvl16 = new Vec3(Mth.cos(this.yRot * 0.017453292f), 0.0, Mth.sin(this.yRot * 0.017453292f)).normalize();
-                final double double9 = Math.abs(cvl15.dot(cvl16));
+            if (aom instanceof AbstractMinecart) {
+                final double double7 = aom.getX() - this.getX();
+                final double double8 = aom.getZ() - this.getZ();
+                final Vec3 dem15 = new Vec3(double7, 0.0, double8).normalize();
+                final Vec3 dem16 = new Vec3(Mth.cos(this.yRot * 0.017453292f), 0.0, Mth.sin(this.yRot * 0.017453292f)).normalize();
+                final double double9 = Math.abs(dem15.dot(dem16));
                 if (double9 < 0.800000011920929) {
                     return;
                 }
-                final Vec3 cvl17 = this.getDeltaMovement();
-                final Vec3 cvl18 = akq.getDeltaMovement();
-                if (((AbstractMinecart)akq).getMinecartType() == Type.FURNACE && this.getMinecartType() != Type.FURNACE) {
-                    this.setDeltaMovement(cvl17.multiply(0.2, 1.0, 0.2));
-                    this.push(cvl18.x - double3, 0.0, cvl18.z - double4);
-                    akq.setDeltaMovement(cvl18.multiply(0.95, 1.0, 0.95));
+                final Vec3 dem17 = this.getDeltaMovement();
+                final Vec3 dem18 = aom.getDeltaMovement();
+                if (((AbstractMinecart)aom).getMinecartType() == Type.FURNACE && this.getMinecartType() != Type.FURNACE) {
+                    this.setDeltaMovement(dem17.multiply(0.2, 1.0, 0.2));
+                    this.push(dem18.x - double3, 0.0, dem18.z - double4);
+                    aom.setDeltaMovement(dem18.multiply(0.95, 1.0, 0.95));
                 }
-                else if (((AbstractMinecart)akq).getMinecartType() != Type.FURNACE && this.getMinecartType() == Type.FURNACE) {
-                    akq.setDeltaMovement(cvl18.multiply(0.2, 1.0, 0.2));
-                    akq.push(cvl17.x + double3, 0.0, cvl17.z + double4);
-                    this.setDeltaMovement(cvl17.multiply(0.95, 1.0, 0.95));
+                else if (((AbstractMinecart)aom).getMinecartType() != Type.FURNACE && this.getMinecartType() == Type.FURNACE) {
+                    aom.setDeltaMovement(dem18.multiply(0.2, 1.0, 0.2));
+                    aom.push(dem17.x + double3, 0.0, dem17.z + double4);
+                    this.setDeltaMovement(dem17.multiply(0.95, 1.0, 0.95));
                 }
                 else {
-                    final double double10 = (cvl18.x + cvl17.x) / 2.0;
-                    final double double11 = (cvl18.z + cvl17.z) / 2.0;
-                    this.setDeltaMovement(cvl17.multiply(0.2, 1.0, 0.2));
+                    final double double10 = (dem18.x + dem17.x) / 2.0;
+                    final double double11 = (dem18.z + dem17.z) / 2.0;
+                    this.setDeltaMovement(dem17.multiply(0.2, 1.0, 0.2));
                     this.push(double10 - double3, 0.0, double11 - double4);
-                    akq.setDeltaMovement(cvl18.multiply(0.2, 1.0, 0.2));
-                    akq.push(double10 + double3, 0.0, double11 + double4);
+                    aom.setDeltaMovement(dem18.multiply(0.2, 1.0, 0.2));
+                    aom.push(double10 + double3, 0.0, double11 + double4);
                 }
             }
             else {
                 this.push(-double3, 0.0, -double4);
-                akq.push(double3 / 4.0, 0.0, double4 / 4.0);
+                aom.push(double3 / 4.0, 0.0, double4 / 4.0);
             }
         }
     }
@@ -712,8 +777,8 @@ public abstract class AbstractMinecart extends Entity {
         return 6;
     }
     
-    public void setDisplayBlockState(final BlockState byj) {
-        this.getEntityData().<Integer>set(AbstractMinecart.DATA_ID_DISPLAY_BLOCK, Block.getId(byj));
+    public void setDisplayBlockState(final BlockState cfj) {
+        this.getEntityData().<Integer>set(AbstractMinecart.DATA_ID_DISPLAY_BLOCK, Block.getId(cfj));
         this.setCustomDisplay(true);
     }
     
@@ -742,33 +807,34 @@ public abstract class AbstractMinecart extends Entity {
         DATA_ID_DISPLAY_BLOCK = SynchedEntityData.<Integer>defineId(AbstractMinecart.class, EntityDataSerializers.INT);
         DATA_ID_DISPLAY_OFFSET = SynchedEntityData.<Integer>defineId(AbstractMinecart.class, EntityDataSerializers.INT);
         DATA_ID_CUSTOM_DISPLAY = SynchedEntityData.<Boolean>defineId(AbstractMinecart.class, EntityDataSerializers.BOOLEAN);
-        final Vec3i gg2;
-        final Vec3i gg3;
-        final Vec3i gg4;
-        final Vec3i gg5;
-        final Vec3i gg6;
-        final Vec3i gg7;
-        final Vec3i gg8;
-        final Vec3i gg9;
+        POSE_DISMOUNT_HEIGHTS = ImmutableMap.<Pose, ImmutableList<Integer>>of(Pose.STANDING, ImmutableList.<Integer>of(0, 1, -1), Pose.CROUCHING, ImmutableList.<Integer>of(0, 1, -1), Pose.SWIMMING, ImmutableList.<Integer>of(0, 1));
+        final Vec3i gr2;
+        final Vec3i gr3;
+        final Vec3i gr4;
+        final Vec3i gr5;
+        final Vec3i gr6;
+        final Vec3i gr7;
+        final Vec3i gr8;
+        final Vec3i gr9;
         EXITS = Util.<Map<RailShape, Pair<Vec3i, Vec3i>>>make(Maps.newEnumMap(RailShape.class), enumMap -> {
-            gg2 = Direction.WEST.getNormal();
-            gg3 = Direction.EAST.getNormal();
-            gg4 = Direction.NORTH.getNormal();
-            gg5 = Direction.SOUTH.getNormal();
-            gg6 = gg2.below();
-            gg7 = gg3.below();
-            gg8 = gg4.below();
-            gg9 = gg5.below();
-            enumMap.put(RailShape.NORTH_SOUTH, Pair.of(gg4, gg5));
-            enumMap.put(RailShape.EAST_WEST, Pair.of(gg2, gg3));
-            enumMap.put(RailShape.ASCENDING_EAST, Pair.of(gg6, gg3));
-            enumMap.put(RailShape.ASCENDING_WEST, Pair.of(gg2, gg7));
-            enumMap.put(RailShape.ASCENDING_NORTH, Pair.of(gg4, gg9));
-            enumMap.put(RailShape.ASCENDING_SOUTH, Pair.of(gg8, gg5));
-            enumMap.put(RailShape.SOUTH_EAST, Pair.of(gg5, gg3));
-            enumMap.put(RailShape.SOUTH_WEST, Pair.of(gg5, gg2));
-            enumMap.put(RailShape.NORTH_WEST, Pair.of(gg4, gg2));
-            enumMap.put(RailShape.NORTH_EAST, Pair.of(gg4, gg3));
+            gr2 = Direction.WEST.getNormal();
+            gr3 = Direction.EAST.getNormal();
+            gr4 = Direction.NORTH.getNormal();
+            gr5 = Direction.SOUTH.getNormal();
+            gr6 = gr2.below();
+            gr7 = gr3.below();
+            gr8 = gr4.below();
+            gr9 = gr5.below();
+            enumMap.put(RailShape.NORTH_SOUTH, Pair.of(gr4, gr5));
+            enumMap.put(RailShape.EAST_WEST, Pair.of(gr2, gr3));
+            enumMap.put(RailShape.ASCENDING_EAST, Pair.of(gr6, gr3));
+            enumMap.put(RailShape.ASCENDING_WEST, Pair.of(gr2, gr7));
+            enumMap.put(RailShape.ASCENDING_NORTH, Pair.of(gr4, gr9));
+            enumMap.put(RailShape.ASCENDING_SOUTH, Pair.of(gr8, gr5));
+            enumMap.put(RailShape.SOUTH_EAST, Pair.of(gr5, gr3));
+            enumMap.put(RailShape.SOUTH_WEST, Pair.of(gr5, gr2));
+            enumMap.put(RailShape.NORTH_WEST, Pair.of(gr4, gr2));
+            enumMap.put(RailShape.NORTH_EAST, Pair.of(gr4, gr3));
         });
     }
     
diff --git a/src/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
index 76d7fbe..14ebed3 100644
--- a/src/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+++ b/src/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
@@ -6,11 +6,13 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.server.level.ServerLevel;
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.server.level.ServerLevel;
 import java.util.List;
 import net.minecraft.world.ContainerHelper;
 import net.minecraft.world.entity.player.Player;
@@ -35,21 +37,21 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
     private ResourceLocation lootTable;
     private long lootTableSeed;
     
-    protected AbstractMinecartContainer(final EntityType<?> aku, final Level bjw) {
-        super(aku, bjw);
+    protected AbstractMinecartContainer(final EntityType<?> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.itemStacks = NonNullList.<ItemStack>withSize(36, ItemStack.EMPTY);
         this.dropEquipment = true;
     }
     
-    protected AbstractMinecartContainer(final EntityType<?> aku, final double double2, final double double3, final double double4, final Level bjw) {
-        super(aku, bjw, double2, double3, double4);
+    protected AbstractMinecartContainer(final EntityType<?> aoq, final double double2, final double double3, final double double4, final Level bqb) {
+        super(aoq, bqb, double2, double3, double4);
         this.itemStacks = NonNullList.<ItemStack>withSize(36, ItemStack.EMPTY);
         this.dropEquipment = true;
     }
     
     @Override
-    public void destroy(final DamageSource ajz) {
-        super.destroy(ajz);
+    public void destroy(final DamageSource anw) {
+        super.destroy(anw);
         if (this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
             Containers.dropContents(this.level, this, this);
         }
@@ -57,8 +59,8 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
     
     @Override
     public boolean isEmpty() {
-        for (final ItemStack ben3 : this.itemStacks) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.itemStacks) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
@@ -80,27 +82,27 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
     @Override
     public ItemStack removeItemNoUpdate(final int integer) {
         this.unpackLootTable(null);
-        final ItemStack ben3 = this.itemStacks.get(integer);
-        if (ben3.isEmpty()) {
+        final ItemStack bki3 = this.itemStacks.get(integer);
+        if (bki3.isEmpty()) {
             return ItemStack.EMPTY;
         }
         this.itemStacks.set(integer, ItemStack.EMPTY);
-        return ben3;
+        return bki3;
     }
     
     @Override
-    public void setItem(final int integer, final ItemStack ben) {
+    public void setItem(final int integer, final ItemStack bki) {
         this.unpackLootTable(null);
-        this.itemStacks.set(integer, ben);
-        if (!ben.isEmpty() && ben.getCount() > this.getMaxStackSize()) {
-            ben.setCount(this.getMaxStackSize());
+        this.itemStacks.set(integer, bki);
+        if (!bki.isEmpty() && bki.getCount() > this.getMaxStackSize()) {
+            bki.setCount(this.getMaxStackSize());
         }
     }
     
     @Override
-    public boolean setSlot(final int integer, final ItemStack ben) {
+    public boolean setSlot(final int integer, final ItemStack bki) {
         if (integer >= 0 && integer < this.getContainerSize()) {
-            this.setItem(integer, ben);
+            this.setItem(integer, bki);
             return true;
         }
         return false;
@@ -111,15 +113,15 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return !this.removed && ayj.distanceToSqr(this) <= 64.0;
+    public boolean stillValid(final Player bec) {
+        return !this.removed && bec.distanceToSqr(this) <= 64.0;
     }
     
     @Nullable
     @Override
-    public Entity changeDimension(final DimensionType cbi) {
+    public Entity changeDimension(final ServerLevel zd) {
         this.dropEquipment = false;
-        return super.changeDimension(cbi);
+        return super.changeDimension(zd);
     }
     
     @Override
@@ -131,36 +133,36 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
         if (this.lootTable != null) {
-            jt.putString("LootTable", this.lootTable.toString());
+            le.putString("LootTable", this.lootTable.toString());
             if (this.lootTableSeed != 0L) {
-                jt.putLong("LootTableSeed", this.lootTableSeed);
+                le.putLong("LootTableSeed", this.lootTableSeed);
             }
         }
         else {
-            ContainerHelper.saveAllItems(jt, this.itemStacks);
+            ContainerHelper.saveAllItems(le, this.itemStacks);
         }
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
         this.itemStacks = NonNullList.<ItemStack>withSize(this.getContainerSize(), ItemStack.EMPTY);
-        if (jt.contains("LootTable", 8)) {
-            this.lootTable = new ResourceLocation(jt.getString("LootTable"));
-            this.lootTableSeed = jt.getLong("LootTableSeed");
+        if (le.contains("LootTable", 8)) {
+            this.lootTable = new ResourceLocation(le.getString("LootTable"));
+            this.lootTableSeed = le.getLong("LootTableSeed");
         }
         else {
-            ContainerHelper.loadAllItems(jt, this.itemStacks);
+            ContainerHelper.loadAllItems(le, this.itemStacks);
         }
     }
     
     @Override
-    public boolean interact(final Player ayj, final InteractionHand ajk) {
-        ayj.openMenu(this);
-        return true;
+    public InteractionResult interact(final Player bec, final InteractionHand anf) {
+        bec.openMenu(this);
+        return InteractionResult.sidedSuccess(this.level.isClientSide);
     }
     
     @Override
@@ -173,15 +175,18 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
         this.setDeltaMovement(this.getDeltaMovement().multiply(float2, 0.0, float2));
     }
     
-    public void unpackLootTable(@Nullable final Player ayj) {
+    public void unpackLootTable(@Nullable final Player bec) {
         if (this.lootTable != null && this.level.getServer() != null) {
-            final LootTable csa3 = this.level.getServer().getLootTables().get(this.lootTable);
-            this.lootTable = null;
-            final LootContext.Builder a4 = new LootContext.Builder((ServerLevel)this.level).<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(this)).withOptionalRandomSeed(this.lootTableSeed);
-            if (ayj != null) {
-                a4.withLuck(ayj.getLuck()).<Entity>withParameter(LootContextParams.THIS_ENTITY, ayj);
+            final LootTable daw3 = this.level.getServer().getLootTables().get(this.lootTable);
+            if (bec instanceof ServerPlayer) {
+                CriteriaTriggers.GENERATE_LOOT.trigger((ServerPlayer)bec, this.lootTable);
             }
-            csa3.fill(this, a4.create(LootContextParamSets.CHEST));
+            this.lootTable = null;
+            final LootContext.Builder a4 = new LootContext.Builder((ServerLevel)this.level).<BlockPos>withParameter(LootContextParams.BLOCK_POS, this.blockPosition()).withOptionalRandomSeed(this.lootTableSeed);
+            if (bec != null) {
+                a4.withLuck(bec.getLuck()).<Entity>withParameter(LootContextParams.THIS_ENTITY, bec);
+            }
+            daw3.fill(this, a4.create(LootContextParamSets.CHEST));
         }
     }
     
@@ -191,20 +196,20 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
         this.itemStacks.clear();
     }
     
-    public void setLootTable(final ResourceLocation sm, final long long2) {
-        this.lootTable = sm;
+    public void setLootTable(final ResourceLocation uh, final long long2) {
+        this.lootTable = uh;
         this.lootTableSeed = long2;
     }
     
     @Nullable
     @Override
-    public AbstractContainerMenu createMenu(final int integer, final Inventory ayi, final Player ayj) {
-        if (this.lootTable == null || !ayj.isSpectator()) {
-            this.unpackLootTable(ayi.player);
-            return this.createMenu(integer, ayi);
+    public AbstractContainerMenu createMenu(final int integer, final Inventory beb, final Player bec) {
+        if (this.lootTable == null || !bec.isSpectator()) {
+            this.unpackLootTable(beb.player);
+            return this.createMenu(integer, beb);
         }
         return null;
     }
     
-    protected abstract AbstractContainerMenu createMenu(final int integer, final Inventory ayi);
+    protected abstract AbstractContainerMenu createMenu(final int integer, final Inventory beb);
 }
diff --git a/src/net/minecraft/world/entity/vehicle/Boat.java b/src/net/minecraft/world/entity/vehicle/Boat.java
index 8a641d7..0dec11b 100644
--- a/src/net/minecraft/world/entity/vehicle/Boat.java
+++ b/src/net/minecraft/world/entity/vehicle/Boat.java
@@ -5,8 +5,10 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.nbt.CompoundTag;
+import com.google.common.collect.UnmodifiableIterator;
 import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -15,6 +17,8 @@ import net.minecraft.world.level.block.WaterlilyBlock;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.BlockPos;
 import net.minecraft.sounds.SoundEvents;
@@ -36,10 +40,11 @@ import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.damagesource.IndirectEntityDamageSource;
 import net.minecraft.world.damagesource.DamageSource;
 import javax.annotation.Nullable;
 import net.minecraft.world.phys.AABB;
+import net.minecraft.world.entity.EntityDimensions;
+import net.minecraft.world.entity.Pose;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
@@ -79,14 +84,14 @@ public class Boat extends Entity {
     private float bubbleAngle;
     private float bubbleAngleO;
     
-    public Boat(final EntityType<? extends Boat> aku, final Level bjw) {
-        super(aku, bjw);
+    public Boat(final EntityType<? extends Boat> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.paddlePositions = new float[2];
         this.blocksBuilding = true;
     }
     
-    public Boat(final Level bjw, final double double2, final double double3, final double double4) {
-        this(EntityType.BOAT, bjw);
+    public Boat(final Level bqb, final double double2, final double double3, final double double4) {
+        this(EntityType.BOAT, bqb);
         this.setPos(double2, double3, double4);
         this.setDeltaMovement(Vec3.ZERO);
         this.xo = double2;
@@ -94,6 +99,11 @@ public class Boat extends Entity {
         this.zo = double4;
     }
     
+    @Override
+    protected float getEyeHeight(final Pose apj, final EntityDimensions aon) {
+        return aon.height;
+    }
+    
     @Override
     protected boolean isMovementNoisy() {
         return false;
@@ -112,9 +122,9 @@ public class Boat extends Entity {
     
     @Nullable
     @Override
-    public AABB getCollideAgainstBox(final Entity akq) {
-        if (akq.isPushable()) {
-            return akq.getBoundingBox();
+    public AABB getCollideAgainstBox(final Entity aom) {
+        if (aom.isPushable()) {
+            return aom.getBoundingBox();
         }
         return null;
     }
@@ -131,26 +141,23 @@ public class Boat extends Entity {
     }
     
     @Override
-    public double getRideHeight() {
+    public double getPassengersRidingOffset() {
         return -0.1;
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        if (this.isInvulnerableTo(ajz)) {
+    public boolean hurt(final DamageSource anw, final float float2) {
+        if (this.isInvulnerableTo(anw)) {
             return false;
         }
         if (this.level.isClientSide || this.removed) {
             return true;
         }
-        if (ajz instanceof IndirectEntityDamageSource && ajz.getEntity() != null && this.hasPassenger(ajz.getEntity())) {
-            return false;
-        }
         this.setHurtDir(-this.getHurtDir());
         this.setHurtTime(10);
         this.setDamage(this.getDamage() + float2 * 10.0f);
         this.markHurt();
-        final boolean boolean4 = ajz.getEntity() instanceof Player && ((Player)ajz.getEntity()).abilities.instabuild;
+        final boolean boolean4 = anw.getEntity() instanceof Player && ((Player)anw.getEntity()).abilities.instabuild;
         if (boolean4 || this.getDamage() > 40.0f) {
             if (!boolean4 && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
                 this.spawnAtLocation(this.getDropItem());
@@ -176,14 +183,14 @@ public class Boat extends Entity {
     }
     
     @Override
-    public void push(final Entity akq) {
-        if (akq instanceof Boat) {
-            if (akq.getBoundingBox().minY < this.getBoundingBox().maxY) {
-                super.push(akq);
+    public void push(final Entity aom) {
+        if (aom instanceof Boat) {
+            if (aom.getBoundingBox().minY < this.getBoundingBox().maxY) {
+                super.push(aom);
             }
         }
-        else if (akq.getBoundingBox().minY <= this.getBoundingBox().minY) {
-            super.push(akq);
+        else if (aom.getBoundingBox().minY <= this.getBoundingBox().minY) {
+            super.push(aom);
         }
     }
     
@@ -276,12 +283,12 @@ public class Boat extends Entity {
         for (int integer2 = 0; integer2 <= 1; ++integer2) {
             if (this.getPaddleState(integer2)) {
                 if (!this.isSilent() && this.paddlePositions[integer2] % 6.2831855f <= 0.7853981852531433 && (this.paddlePositions[integer2] + 0.39269909262657166) % 6.2831854820251465 >= 0.7853981852531433) {
-                    final SoundEvent aah3 = this.getPaddleSound();
-                    if (aah3 != null) {
-                        final Vec3 cvl4 = this.getViewVector(1.0f);
-                        final double double5 = (integer2 == 1) ? (-cvl4.z) : cvl4.z;
-                        final double double6 = (integer2 == 1) ? cvl4.x : (-cvl4.x);
-                        this.level.playSound(null, this.getX() + double5, this.getY(), this.getZ() + double6, aah3, this.getSoundSource(), 1.0f, 0.8f + 0.4f * this.random.nextFloat());
+                    final SoundEvent ack3 = this.getPaddleSound();
+                    if (ack3 != null) {
+                        final Vec3 dem4 = this.getViewVector(1.0f);
+                        final double double5 = (integer2 == 1) ? (-dem4.z) : dem4.z;
+                        final double double6 = (integer2 == 1) ? dem4.x : (-dem4.x);
+                        this.level.playSound(null, this.getX() + double5, this.getY(), this.getZ() + double6, ack3, this.getSoundSource(), 1.0f, 0.8f + 0.4f * this.random.nextFloat());
                     }
                 }
                 final float[] paddlePositions = this.paddlePositions;
@@ -297,13 +304,13 @@ public class Boat extends Entity {
         if (!list2.isEmpty()) {
             final boolean boolean3 = !this.level.isClientSide && !(this.getControllingPassenger() instanceof Player);
             for (int integer3 = 0; integer3 < list2.size(); ++integer3) {
-                final Entity akq5 = list2.get(integer3);
-                if (!akq5.hasPassenger(this)) {
-                    if (boolean3 && this.getPassengers().size() < 2 && !akq5.isPassenger() && akq5.getBbWidth() < this.getBbWidth() && akq5 instanceof LivingEntity && !(akq5 instanceof WaterAnimal) && !(akq5 instanceof Player)) {
-                        akq5.startRiding(this);
+                final Entity aom5 = list2.get(integer3);
+                if (!aom5.hasPassenger(this)) {
+                    if (boolean3 && this.getPassengers().size() < 2 && !aom5.isPassenger() && aom5.getBbWidth() < this.getBbWidth() && aom5 instanceof LivingEntity && !(aom5 instanceof WaterAnimal) && !(aom5 instanceof Player)) {
+                        aom5.startRiding(this);
                     }
                     else {
-                        this.push(akq5);
+                        this.push(aom5);
                     }
                 }
             }
@@ -334,13 +341,13 @@ public class Boat extends Entity {
                 final int integer3 = 60 - integer2 - 1;
                 if (integer3 > 0 && integer2 == 0) {
                     this.setBubbleTime(0);
-                    final Vec3 cvl4 = this.getDeltaMovement();
+                    final Vec3 dem4 = this.getDeltaMovement();
                     if (this.bubbleColumnDirectionIsDown) {
-                        this.setDeltaMovement(cvl4.add(0.0, -0.7, 0.0));
+                        this.setDeltaMovement(dem4.add(0.0, -0.7, 0.0));
                         this.ejectPassengers();
                     }
                     else {
-                        this.setDeltaMovement(cvl4.x, this.hasPassenger(Player.class) ? 2.7 : 0.6, cvl4.z);
+                        this.setDeltaMovement(dem4.x, this.hasPassenger(Player.class) ? 2.7 : 0.6, dem4.z);
                     }
                 }
                 this.isAboveBubbleColumn = false;
@@ -414,80 +421,78 @@ public class Boat extends Entity {
     }
     
     public float getWaterLevelAbove() {
-        final AABB cvf2 = this.getBoundingBox();
-        final int integer3 = Mth.floor(cvf2.minX);
-        final int integer4 = Mth.ceil(cvf2.maxX);
-        final int integer5 = Mth.floor(cvf2.maxY);
-        final int integer6 = Mth.ceil(cvf2.maxY - this.lastYd);
-        final int integer7 = Mth.floor(cvf2.minZ);
-        final int integer8 = Mth.ceil(cvf2.maxZ);
-        try (final BlockPos.PooledMutableBlockPos b9 = BlockPos.PooledMutableBlockPos.acquire()) {
-            int integer9 = integer5;
-        Label_0238_Outer:
-            while (integer9 < integer6) {
-                float float12 = 0.0f;
-                int integer10 = integer3;
-            Label_0238:
-                while (true) {
-                    while (integer10 < integer4) {
-                        for (int integer11 = integer7; integer11 < integer8; ++integer11) {
-                            b9.set(integer10, integer9, integer11);
-                            final FluidState coj15 = this.level.getFluidState(b9);
-                            if (coj15.is(FluidTags.WATER)) {
-                                float12 = Math.max(float12, coj15.getHeight(this.level, b9));
-                            }
-                            if (float12 >= 1.0f) {
-                                break Label_0238;
-                            }
+        final AABB deg2 = this.getBoundingBox();
+        final int integer3 = Mth.floor(deg2.minX);
+        final int integer4 = Mth.ceil(deg2.maxX);
+        final int integer5 = Mth.floor(deg2.maxY);
+        final int integer6 = Mth.ceil(deg2.maxY - this.lastYd);
+        final int integer7 = Mth.floor(deg2.minZ);
+        final int integer8 = Mth.ceil(deg2.maxZ);
+        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos();
+        int integer9 = integer5;
+    Label_0196_Outer:
+        while (integer9 < integer6) {
+            float float11 = 0.0f;
+            int integer10 = integer3;
+        Label_0196:
+            while (true) {
+                while (integer10 < integer4) {
+                    for (int integer11 = integer7; integer11 < integer8; ++integer11) {
+                        a9.set(integer10, integer9, integer11);
+                        final FluidState cxa14 = this.level.getFluidState(a9);
+                        if (cxa14.is(FluidTags.WATER)) {
+                            float11 = Math.max(float11, cxa14.getHeight(this.level, a9));
+                        }
+                        if (float11 >= 1.0f) {
+                            break Label_0196;
                         }
-                        ++integer10;
-                        continue Label_0238_Outer;
-                        ++integer9;
-                        continue Label_0238_Outer;
                     }
-                    if (float12 < 1.0f) {
-                        return b9.getY() + float12;
-                    }
-                    continue Label_0238;
+                    ++integer10;
+                    continue Label_0196_Outer;
+                    ++integer9;
+                    continue Label_0196_Outer;
                 }
+                if (float11 < 1.0f) {
+                    return a9.getY() + float11;
+                }
+                continue Label_0196;
             }
-            return (float)(integer6 + 1);
         }
+        return (float)(integer6 + 1);
     }
     
     public float getGroundFriction() {
-        final AABB cvf2 = this.getBoundingBox();
-        final AABB cvf3 = new AABB(cvf2.minX, cvf2.minY - 0.001, cvf2.minZ, cvf2.maxX, cvf2.minY, cvf2.maxZ);
-        final int integer4 = Mth.floor(cvf3.minX) - 1;
-        final int integer5 = Mth.ceil(cvf3.maxX) + 1;
-        final int integer6 = Mth.floor(cvf3.minY) - 1;
-        final int integer7 = Mth.ceil(cvf3.maxY) + 1;
-        final int integer8 = Mth.floor(cvf3.minZ) - 1;
-        final int integer9 = Mth.ceil(cvf3.maxZ) + 1;
-        final VoxelShape cwf10 = Shapes.create(cvf3);
+        final AABB deg2 = this.getBoundingBox();
+        final AABB deg3 = new AABB(deg2.minX, deg2.minY - 0.001, deg2.minZ, deg2.maxX, deg2.minY, deg2.maxZ);
+        final int integer4 = Mth.floor(deg3.minX) - 1;
+        final int integer5 = Mth.ceil(deg3.maxX) + 1;
+        final int integer6 = Mth.floor(deg3.minY) - 1;
+        final int integer7 = Mth.ceil(deg3.maxY) + 1;
+        final int integer8 = Mth.floor(deg3.minZ) - 1;
+        final int integer9 = Mth.ceil(deg3.maxZ) + 1;
+        final VoxelShape dfg10 = Shapes.create(deg3);
         float float11 = 0.0f;
         int integer10 = 0;
-        try (final BlockPos.PooledMutableBlockPos b13 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (int integer11 = integer4; integer11 < integer5; ++integer11) {
-                for (int integer12 = integer8; integer12 < integer9; ++integer12) {
-                    final int integer13 = ((integer11 == integer4 || integer11 == integer5 - 1) + (integer12 == integer8 || integer12 == integer9 - 1)) ? 1 : 0;
-                    if (integer13 != 2) {
-                        for (int integer14 = integer6; integer14 < integer7; ++integer14) {
-                            if (integer13 > 0) {
-                                if (integer14 == integer6) {
-                                    continue;
-                                }
-                                if (integer14 == integer7 - 1) {
-                                    continue;
-                                }
+        final BlockPos.MutableBlockPos a13 = new BlockPos.MutableBlockPos();
+        for (int integer11 = integer4; integer11 < integer5; ++integer11) {
+            for (int integer12 = integer8; integer12 < integer9; ++integer12) {
+                final int integer13 = ((integer11 == integer4 || integer11 == integer5 - 1) + (integer12 == integer8 || integer12 == integer9 - 1)) ? 1 : 0;
+                if (integer13 != 2) {
+                    for (int integer14 = integer6; integer14 < integer7; ++integer14) {
+                        if (integer13 > 0) {
+                            if (integer14 == integer6) {
+                                continue;
                             }
-                            b13.set(integer11, integer14, integer12);
-                            final BlockState byj19 = this.level.getBlockState(b13);
-                            if (!(byj19.getBlock() instanceof WaterlilyBlock)) {
-                                if (Shapes.joinIsNotEmpty(byj19.getCollisionShape(this.level, b13).move(integer11, integer14, integer12), cwf10, BooleanOp.AND)) {
-                                    float11 += byj19.getBlock().getFriction();
-                                    ++integer10;
-                                }
+                            if (integer14 == integer7 - 1) {
+                                continue;
+                            }
+                        }
+                        a13.set(integer11, integer14, integer12);
+                        final BlockState cfj18 = this.level.getBlockState(a13);
+                        if (!(cfj18.getBlock() instanceof WaterlilyBlock)) {
+                            if (Shapes.joinIsNotEmpty(cfj18.getCollisionShape(this.level, a13).move(integer11, integer14, integer12), dfg10, BooleanOp.AND)) {
+                                float11 += cfj18.getBlock().getFriction();
+                                ++integer10;
                             }
                         }
                     }
@@ -498,26 +503,25 @@ public class Boat extends Entity {
     }
     
     private boolean checkInWater() {
-        final AABB cvf2 = this.getBoundingBox();
-        final int integer3 = Mth.floor(cvf2.minX);
-        final int integer4 = Mth.ceil(cvf2.maxX);
-        final int integer5 = Mth.floor(cvf2.minY);
-        final int integer6 = Mth.ceil(cvf2.minY + 0.001);
-        final int integer7 = Mth.floor(cvf2.minZ);
-        final int integer8 = Mth.ceil(cvf2.maxZ);
+        final AABB deg2 = this.getBoundingBox();
+        final int integer3 = Mth.floor(deg2.minX);
+        final int integer4 = Mth.ceil(deg2.maxX);
+        final int integer5 = Mth.floor(deg2.minY);
+        final int integer6 = Mth.ceil(deg2.minY + 0.001);
+        final int integer7 = Mth.floor(deg2.minZ);
+        final int integer8 = Mth.ceil(deg2.maxZ);
         boolean boolean9 = false;
         this.waterLevel = Double.MIN_VALUE;
-        try (final BlockPos.PooledMutableBlockPos b10 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (int integer9 = integer3; integer9 < integer4; ++integer9) {
-                for (int integer10 = integer5; integer10 < integer6; ++integer10) {
-                    for (int integer11 = integer7; integer11 < integer8; ++integer11) {
-                        b10.set(integer9, integer10, integer11);
-                        final FluidState coj15 = this.level.getFluidState(b10);
-                        if (coj15.is(FluidTags.WATER)) {
-                            final float float16 = integer10 + coj15.getHeight(this.level, b10);
-                            this.waterLevel = Math.max(float16, this.waterLevel);
-                            boolean9 |= (cvf2.minY < float16);
-                        }
+        final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
+        for (int integer9 = integer3; integer9 < integer4; ++integer9) {
+            for (int integer10 = integer5; integer10 < integer6; ++integer10) {
+                for (int integer11 = integer7; integer11 < integer8; ++integer11) {
+                    a10.set(integer9, integer10, integer11);
+                    final FluidState cxa14 = this.level.getFluidState(a10);
+                    if (cxa14.is(FluidTags.WATER)) {
+                        final float float15 = integer10 + cxa14.getHeight(this.level, a10);
+                        this.waterLevel = Math.max(float15, this.waterLevel);
+                        boolean9 |= (deg2.minY < float15);
                     }
                 }
             }
@@ -527,27 +531,26 @@ public class Boat extends Entity {
     
     @Nullable
     private Status isUnderwater() {
-        final AABB cvf2 = this.getBoundingBox();
-        final double double3 = cvf2.maxY + 0.001;
-        final int integer5 = Mth.floor(cvf2.minX);
-        final int integer6 = Mth.ceil(cvf2.maxX);
-        final int integer7 = Mth.floor(cvf2.maxY);
+        final AABB deg2 = this.getBoundingBox();
+        final double double3 = deg2.maxY + 0.001;
+        final int integer5 = Mth.floor(deg2.minX);
+        final int integer6 = Mth.ceil(deg2.maxX);
+        final int integer7 = Mth.floor(deg2.maxY);
         final int integer8 = Mth.ceil(double3);
-        final int integer9 = Mth.floor(cvf2.minZ);
-        final int integer10 = Mth.ceil(cvf2.maxZ);
+        final int integer9 = Mth.floor(deg2.minZ);
+        final int integer10 = Mth.ceil(deg2.maxZ);
         boolean boolean11 = false;
-        try (final BlockPos.PooledMutableBlockPos b12 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (int integer11 = integer5; integer11 < integer6; ++integer11) {
-                for (int integer12 = integer7; integer12 < integer8; ++integer12) {
-                    for (int integer13 = integer9; integer13 < integer10; ++integer13) {
-                        b12.set(integer11, integer12, integer13);
-                        final FluidState coj17 = this.level.getFluidState(b12);
-                        if (coj17.is(FluidTags.WATER) && double3 < b12.getY() + coj17.getHeight(this.level, b12)) {
-                            if (!coj17.isSource()) {
-                                return Status.UNDER_FLOWING_WATER;
-                            }
-                            boolean11 = true;
+        final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos();
+        for (int integer11 = integer5; integer11 < integer6; ++integer11) {
+            for (int integer12 = integer7; integer12 < integer8; ++integer12) {
+                for (int integer13 = integer9; integer13 < integer10; ++integer13) {
+                    a12.set(integer11, integer12, integer13);
+                    final FluidState cxa16 = this.level.getFluidState(a12);
+                    if (cxa16.is(FluidTags.WATER) && double3 < a12.getY() + cxa16.getHeight(this.level, a12)) {
+                        if (!cxa16.isSource()) {
+                            return Status.UNDER_FLOWING_WATER;
                         }
+                        boolean11 = true;
                     }
                 }
             }
@@ -589,12 +592,12 @@ public class Boat extends Entity {
                     this.landFriction /= 2.0f;
                 }
             }
-            final Vec3 cvl8 = this.getDeltaMovement();
-            this.setDeltaMovement(cvl8.x * this.invFriction, cvl8.y + double3, cvl8.z * this.invFriction);
+            final Vec3 dem8 = this.getDeltaMovement();
+            this.setDeltaMovement(dem8.x * this.invFriction, dem8.y + double3, dem8.z * this.invFriction);
             this.deltaRotation *= this.invFriction;
             if (double4 > 0.0) {
-                final Vec3 cvl9 = this.getDeltaMovement();
-                this.setDeltaMovement(cvl9.x, (cvl9.y + double4 * 0.06153846016296973) * 0.75, cvl9.z);
+                final Vec3 dem9 = this.getDeltaMovement();
+                this.setDeltaMovement(dem9.x, (dem9.y + double4 * 0.06153846016296973) * 0.75, dem9.z);
             }
         }
     }
@@ -625,68 +628,109 @@ public class Boat extends Entity {
     }
     
     @Override
-    public void positionRider(final Entity akq) {
-        if (!this.hasPassenger(akq)) {
+    public void positionRider(final Entity aom) {
+        if (!this.hasPassenger(aom)) {
             return;
         }
         float float3 = 0.0f;
-        final float float4 = (float)((this.removed ? 0.009999999776482582 : this.getRideHeight()) + akq.getRidingHeight());
+        final float float4 = (float)((this.removed ? 0.009999999776482582 : this.getPassengersRidingOffset()) + aom.getMyRidingOffset());
         if (this.getPassengers().size() > 1) {
-            final int integer5 = this.getPassengers().indexOf(akq);
+            final int integer5 = this.getPassengers().indexOf(aom);
             if (integer5 == 0) {
                 float3 = 0.2f;
             }
             else {
                 float3 = -0.6f;
             }
-            if (akq instanceof Animal) {
+            if (aom instanceof Animal) {
                 float3 += (float)0.2;
             }
         }
-        final Vec3 cvl5 = new Vec3(float3, 0.0, 0.0).yRot(-this.yRot * 0.017453292f - 1.5707964f);
-        akq.setPos(this.getX() + cvl5.x, this.getY() + float4, this.getZ() + cvl5.z);
-        akq.yRot += this.deltaRotation;
-        akq.setYHeadRot(akq.getYHeadRot() + this.deltaRotation);
-        this.clampRotation(akq);
-        if (akq instanceof Animal && this.getPassengers().size() > 1) {
-            final int integer6 = (akq.getId() % 2 == 0) ? 90 : 270;
-            akq.setYBodyRot(((Animal)akq).yBodyRot + integer6);
-            akq.setYHeadRot(akq.getYHeadRot() + integer6);
+        final Vec3 dem5 = new Vec3(float3, 0.0, 0.0).yRot(-this.yRot * 0.017453292f - 1.5707964f);
+        aom.setPos(this.getX() + dem5.x, this.getY() + float4, this.getZ() + dem5.z);
+        aom.yRot += this.deltaRotation;
+        aom.setYHeadRot(aom.getYHeadRot() + this.deltaRotation);
+        this.clampRotation(aom);
+        if (aom instanceof Animal && this.getPassengers().size() > 1) {
+            final int integer6 = (aom.getId() % 2 == 0) ? 90 : 270;
+            aom.setYBodyRot(((Animal)aom).yBodyRot + integer6);
+            aom.setYHeadRot(aom.getYHeadRot() + integer6);
         }
     }
     
-    protected void clampRotation(final Entity akq) {
-        akq.setYBodyRot(this.yRot);
-        final float float3 = Mth.wrapDegrees(akq.yRot - this.yRot);
+    @Override
+    public Vec3 getDismountLocationForPassenger(final LivingEntity aoy) {
+        final Vec3 dem3 = Entity.getCollisionHorizontalEscapeVector(this.getBbWidth() * Mth.SQRT_OF_TWO, aoy.getBbWidth(), this.yRot);
+        final double double4 = this.getX() + dem3.x;
+        final double double5 = this.getZ() + dem3.z;
+        final BlockPos fu8 = new BlockPos(double4, this.getBoundingBox().maxY, double5);
+        final BlockPos fu9 = fu8.below();
+        if (!this.level.isWaterAt(fu9)) {
+            for (final Pose apj11 : aoy.getDismountPoses()) {
+                final AABB deg12 = aoy.getLocalBoundsForPose(apj11);
+                final double double6 = this.level.getRelativeFloorHeight(fu8);
+                if (DismountHelper.isFloorValid(double6)) {
+                    final Vec3 dem4 = new Vec3(double4, fu8.getY() + double6, double5);
+                    if (DismountHelper.canDismountTo(this.level, aoy, deg12.move(dem4))) {
+                        aoy.setPose(apj11);
+                        return dem4;
+                    }
+                }
+                final double double7 = this.level.getRelativeFloorHeight(fu9);
+                if (DismountHelper.isFloorValid(double7)) {
+                    final Vec3 dem5 = new Vec3(double4, fu9.getY() + double7, double5);
+                    if (DismountHelper.canDismountTo(this.level, aoy, deg12.move(dem5))) {
+                        aoy.setPose(apj11);
+                        return dem5;
+                    }
+                    continue;
+                }
+            }
+        }
+        return super.getDismountLocationForPassenger(aoy);
+    }
+    
+    protected void clampRotation(final Entity aom) {
+        aom.setYBodyRot(this.yRot);
+        final float float3 = Mth.wrapDegrees(aom.yRot - this.yRot);
         final float float4 = Mth.clamp(float3, -105.0f, 105.0f);
-        akq.yRotO += float4 - float3;
-        akq.setYHeadRot(akq.yRot += float4 - float3);
+        aom.yRotO += float4 - float3;
+        aom.setYHeadRot(aom.yRot += float4 - float3);
     }
     
     @Override
-    public void onPassengerTurned(final Entity akq) {
-        this.clampRotation(akq);
+    public void onPassengerTurned(final Entity aom) {
+        this.clampRotation(aom);
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putString("Type", this.getBoatType().getName());
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        le.putString("Type", this.getBoatType().getName());
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        if (jt.contains("Type", 8)) {
-            this.setType(Type.byName(jt.getString("Type")));
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        if (le.contains("Type", 8)) {
+            this.setType(Type.byName(le.getString("Type")));
         }
     }
     
     @Override
-    public boolean interact(final Player ayj, final InteractionHand ajk) {
-        return !ayj.isSecondaryUseActive() && (!this.level.isClientSide && this.outOfControlTicks < 60.0f) && ayj.startRiding(this);
+    public InteractionResult interact(final Player bec, final InteractionHand anf) {
+        if (bec.isSecondaryUseActive()) {
+            return InteractionResult.PASS;
+        }
+        if (this.outOfControlTicks >= 60.0f) {
+            return InteractionResult.PASS;
+        }
+        if (!this.level.isClientSide) {
+            return bec.startRiding(this) ? InteractionResult.CONSUME : InteractionResult.PASS;
+        }
+        return InteractionResult.SUCCESS;
     }
     
     @Override
-    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState byj, final BlockPos fk) {
+    protected void checkFallDamage(final double double1, final boolean boolean2, final BlockState cfj, final BlockPos fu) {
         this.lastYd = this.getDeltaMovement().y;
         if (this.isPassenger()) {
             return;
@@ -712,7 +756,7 @@ public class Boat extends Entity {
             }
             this.fallDistance = 0.0f;
         }
-        else if (!this.level.getFluidState(new BlockPos(this).below()).is(FluidTags.WATER) && double1 < 0.0) {
+        else if (!this.level.getFluidState(this.blockPosition().below()).is(FluidTags.WATER) && double1 < 0.0) {
             this.fallDistance -= (float)double1;
         }
     }
@@ -766,8 +810,8 @@ public class Boat extends Entity {
     }
     
     @Override
-    protected boolean canAddPassenger(final Entity akq) {
-        return this.getPassengers().size() < 2 && !this.isUnderLiquid(FluidTags.WATER);
+    protected boolean canAddPassenger(final Entity aom) {
+        return this.getPassengers().size() < 2 && !this.isEyeInFluid(FluidTags.WATER);
     }
     
     @Nullable
@@ -789,6 +833,11 @@ public class Boat extends Entity {
         return new ClientboundAddEntityPacket(this);
     }
     
+    @Override
+    public boolean isUnderWater() {
+        return this.status == Status.UNDER_WATER || this.status == Status.UNDER_FLOWING_WATER;
+    }
+    
     static {
         DATA_ID_HURT = SynchedEntityData.<Integer>defineId(Boat.class, EntityDataSerializers.INT);
         DATA_ID_HURTDIR = SynchedEntityData.<Integer>defineId(Boat.class, EntityDataSerializers.INT);
@@ -818,9 +867,9 @@ public class Boat extends Entity {
         private final String name;
         private final Block planks;
         
-        private Type(final Block bph, final String string4) {
+        private Type(final Block bvr, final String string4) {
             this.name = string4;
-            this.planks = bph;
+            this.planks = bvr;
         }
         
         public String getName() {
diff --git a/src/net/minecraft/world/entity/vehicle/DismountHelper.java b/src/net/minecraft/world/entity/vehicle/DismountHelper.java
new file mode 100644
index 0000000..b6115a8
--- /dev/null
+++ b/src/net/minecraft/world/entity/vehicle/DismountHelper.java
@@ -0,0 +1,25 @@
+package net.minecraft.world.entity.vehicle;
+
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.Level;
+import net.minecraft.core.Direction;
+
+public class DismountHelper {
+    public static int[][] offsetsForDirection(final Direction fz) {
+        final Direction fz2 = fz.getClockWise();
+        final Direction fz3 = fz2.getOpposite();
+        final Direction fz4 = fz.getOpposite();
+        return new int[][] { { fz2.getStepX(), fz2.getStepZ() }, { fz3.getStepX(), fz3.getStepZ() }, { fz4.getStepX() + fz2.getStepX(), fz4.getStepZ() + fz2.getStepZ() }, { fz4.getStepX() + fz3.getStepX(), fz4.getStepZ() + fz3.getStepZ() }, { fz.getStepX() + fz2.getStepX(), fz.getStepZ() + fz2.getStepZ() }, { fz.getStepX() + fz3.getStepX(), fz.getStepZ() + fz3.getStepZ() }, { fz4.getStepX(), fz4.getStepZ() }, { fz.getStepX(), fz.getStepZ() } };
+    }
+    
+    public static boolean isFloorValid(final double double1) {
+        return !Double.isInfinite(double1) && double1 < 1.0;
+    }
+    
+    public static boolean canDismountTo(final Level bqb, final LivingEntity aoy, final AABB deg) {
+        return bqb.getBlockCollisions(aoy, deg).allMatch(VoxelShape::isEmpty);
+    }
+}
diff --git a/src/net/minecraft/world/entity/vehicle/Minecart.java b/src/net/minecraft/world/entity/vehicle/Minecart.java
index c0de763..ad78380 100644
--- a/src/net/minecraft/world/entity/vehicle/Minecart.java
+++ b/src/net/minecraft/world/entity/vehicle/Minecart.java
@@ -1,32 +1,33 @@
 package net.minecraft.world.entity.vehicle;
 
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class Minecart extends AbstractMinecart {
-    public Minecart(final EntityType<?> aku, final Level bjw) {
-        super(aku, bjw);
+    public Minecart(final EntityType<?> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public Minecart(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.MINECART, bjw, double2, double3, double4);
+    public Minecart(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.MINECART, bqb, double2, double3, double4);
     }
     
     @Override
-    public boolean interact(final Player ayj, final InteractionHand ajk) {
-        if (ayj.isSecondaryUseActive()) {
-            return false;
+    public InteractionResult interact(final Player bec, final InteractionHand anf) {
+        if (bec.isSecondaryUseActive()) {
+            return InteractionResult.PASS;
         }
         if (this.isVehicle()) {
-            return true;
+            return InteractionResult.PASS;
         }
         if (!this.level.isClientSide) {
-            ayj.startRiding(this);
+            return bec.startRiding(this) ? InteractionResult.CONSUME : InteractionResult.PASS;
         }
-        return true;
+        return InteractionResult.SUCCESS;
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/vehicle/MinecartChest.java b/src/net/minecraft/world/entity/vehicle/MinecartChest.java
index b276141..3d85afe 100644
--- a/src/net/minecraft/world/entity/vehicle/MinecartChest.java
+++ b/src/net/minecraft/world/entity/vehicle/MinecartChest.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.entity.vehicle;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.ChestMenu;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -17,17 +17,17 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 
 public class MinecartChest extends AbstractMinecartContainer {
-    public MinecartChest(final EntityType<? extends MinecartChest> aku, final Level bjw) {
-        super(aku, bjw);
+    public MinecartChest(final EntityType<? extends MinecartChest> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public MinecartChest(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.CHEST_MINECART, double2, double3, double4, bjw);
+    public MinecartChest(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.CHEST_MINECART, double2, double3, double4, bqb);
     }
     
     @Override
-    public void destroy(final DamageSource ajz) {
-        super.destroy(ajz);
+    public void destroy(final DamageSource anw) {
+        super.destroy(anw);
         if (this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
             this.spawnAtLocation(Blocks.CHEST);
         }
@@ -45,7 +45,7 @@ public class MinecartChest extends AbstractMinecartContainer {
     
     @Override
     public BlockState getDefaultDisplayBlockState() {
-        return ((AbstractStateHolder<O, BlockState>)Blocks.CHEST.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, Direction.NORTH);
+        return ((StateHolder<O, BlockState>)Blocks.CHEST.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, Direction.NORTH);
     }
     
     @Override
@@ -53,7 +53,7 @@ public class MinecartChest extends AbstractMinecartContainer {
         return 8;
     }
     
-    public AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return ChestMenu.threeRows(integer, ayi, this);
+    public AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return ChestMenu.threeRows(integer, beb, this);
     }
 }
diff --git a/src/net/minecraft/world/entity/vehicle/MinecartCommandBlock.java b/src/net/minecraft/world/entity/vehicle/MinecartCommandBlock.java
index b1cdd07..79543da 100644
--- a/src/net/minecraft/world/entity/vehicle/MinecartCommandBlock.java
+++ b/src/net/minecraft/world/entity/vehicle/MinecartCommandBlock.java
@@ -7,6 +7,7 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.Blocks;
@@ -25,13 +26,13 @@ public class MinecartCommandBlock extends AbstractMinecart {
     private final BaseCommandBlock commandBlock;
     private int lastActivated;
     
-    public MinecartCommandBlock(final EntityType<? extends MinecartCommandBlock> aku, final Level bjw) {
-        super(aku, bjw);
+    public MinecartCommandBlock(final EntityType<? extends MinecartCommandBlock> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.commandBlock = new MinecartCommandBase();
     }
     
-    public MinecartCommandBlock(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.COMMAND_BLOCK_MINECART, bjw, double2, double3, double4);
+    public MinecartCommandBlock(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.COMMAND_BLOCK_MINECART, bqb, double2, double3, double4);
         this.commandBlock = new MinecartCommandBase();
     }
     
@@ -39,21 +40,21 @@ public class MinecartCommandBlock extends AbstractMinecart {
     protected void defineSynchedData() {
         super.defineSynchedData();
         this.getEntityData().<String>define(MinecartCommandBlock.DATA_ID_COMMAND_NAME, "");
-        this.getEntityData().<TextComponent>define((EntityDataAccessor<TextComponent>)MinecartCommandBlock.DATA_ID_LAST_OUTPUT, new TextComponent(""));
+        this.getEntityData().<Component>define(MinecartCommandBlock.DATA_ID_LAST_OUTPUT, TextComponent.EMPTY);
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.commandBlock.load(jt);
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.commandBlock.load(le);
         this.getEntityData().<String>set(MinecartCommandBlock.DATA_ID_COMMAND_NAME, this.getCommandBlock().getCommand());
         this.getEntityData().<Component>set(MinecartCommandBlock.DATA_ID_LAST_OUTPUT, this.getCommandBlock().getLastOutput());
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        this.commandBlock.save(jt);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        this.commandBlock.save(le);
     }
     
     @Override
@@ -79,21 +80,20 @@ public class MinecartCommandBlock extends AbstractMinecart {
     }
     
     @Override
-    public boolean interact(final Player ayj, final InteractionHand ajk) {
-        this.commandBlock.usedBy(ayj);
-        return true;
+    public InteractionResult interact(final Player bec, final InteractionHand anf) {
+        return this.commandBlock.usedBy(bec);
     }
     
     @Override
-    public void onSyncedDataUpdated(final EntityDataAccessor<?> sb) {
-        super.onSyncedDataUpdated(sb);
-        if (MinecartCommandBlock.DATA_ID_LAST_OUTPUT.equals(sb)) {
+    public void onSyncedDataUpdated(final EntityDataAccessor<?> tq) {
+        super.onSyncedDataUpdated(tq);
+        if (MinecartCommandBlock.DATA_ID_LAST_OUTPUT.equals(tq)) {
             try {
                 this.commandBlock.setLastOutput(this.getEntityData().<Component>get(MinecartCommandBlock.DATA_ID_LAST_OUTPUT));
             }
             catch (Throwable t) {}
         }
-        else if (MinecartCommandBlock.DATA_ID_COMMAND_NAME.equals(sb)) {
+        else if (MinecartCommandBlock.DATA_ID_COMMAND_NAME.equals(tq)) {
             this.commandBlock.setCommand(this.getEntityData().<String>get(MinecartCommandBlock.DATA_ID_COMMAND_NAME));
         }
     }
diff --git a/src/net/minecraft/world/entity/vehicle/MinecartFurnace.java b/src/net/minecraft/world/entity/vehicle/MinecartFurnace.java
index 1e2a125..c4c20b0 100644
--- a/src/net/minecraft/world/entity/vehicle/MinecartFurnace.java
+++ b/src/net/minecraft/world/entity/vehicle/MinecartFurnace.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.entity.vehicle;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.item.Items;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.network.syncher.EntityDataSerializers;
@@ -9,6 +9,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.FurnaceBlock;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.Vec3;
@@ -34,12 +35,12 @@ public class MinecartFurnace extends AbstractMinecart {
     public double zPush;
     private static final Ingredient INGREDIENT;
     
-    public MinecartFurnace(final EntityType<? extends MinecartFurnace> aku, final Level bjw) {
-        super(aku, bjw);
+    public MinecartFurnace(final EntityType<? extends MinecartFurnace> aoq, final Level bqb) {
+        super(aoq, bqb);
     }
     
-    public MinecartFurnace(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.FURNACE_MINECART, bjw, double2, double3, double4);
+    public MinecartFurnace(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.FURNACE_MINECART, bqb, double2, double3, double4);
     }
     
     @Override
@@ -77,26 +78,26 @@ public class MinecartFurnace extends AbstractMinecart {
     }
     
     @Override
-    public void destroy(final DamageSource ajz) {
-        super.destroy(ajz);
-        if (!ajz.isExplosion() && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
+    public void destroy(final DamageSource anw) {
+        super.destroy(anw);
+        if (!anw.isExplosion() && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
             this.spawnAtLocation(Blocks.FURNACE);
         }
     }
     
     @Override
-    protected void moveAlongTrack(final BlockPos fk, final BlockState byj) {
+    protected void moveAlongTrack(final BlockPos fu, final BlockState cfj) {
         final double double4 = 1.0E-4;
         final double double5 = 0.001;
-        super.moveAlongTrack(fk, byj);
-        final Vec3 cvl8 = this.getDeltaMovement();
-        final double double6 = Entity.getHorizontalDistanceSqr(cvl8);
+        super.moveAlongTrack(fu, cfj);
+        final Vec3 dem8 = this.getDeltaMovement();
+        final double double6 = Entity.getHorizontalDistanceSqr(dem8);
         final double double7 = this.xPush * this.xPush + this.zPush * this.zPush;
         if (double7 > 1.0E-4 && double6 > 0.001) {
             final double double8 = Mth.sqrt(double6);
             final double double9 = Mth.sqrt(double7);
-            this.xPush = cvl8.x / double8 * double9;
-            this.zPush = cvl8.z / double8 * double9;
+            this.xPush = dem8.x / double8 * double9;
+            this.zPush = dem8.z / double8 * double9;
         }
     }
     
@@ -116,35 +117,35 @@ public class MinecartFurnace extends AbstractMinecart {
     }
     
     @Override
-    public boolean interact(final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben4 = ayj.getItemInHand(ajk);
-        if (MinecartFurnace.INGREDIENT.test(ben4) && this.fuel + 3600 <= 32000) {
-            if (!ayj.abilities.instabuild) {
-                ben4.shrink(1);
+    public InteractionResult interact(final Player bec, final InteractionHand anf) {
+        final ItemStack bki4 = bec.getItemInHand(anf);
+        if (MinecartFurnace.INGREDIENT.test(bki4) && this.fuel + 3600 <= 32000) {
+            if (!bec.abilities.instabuild) {
+                bki4.shrink(1);
             }
             this.fuel += 3600;
         }
         if (this.fuel > 0) {
-            this.xPush = this.getX() - ayj.getX();
-            this.zPush = this.getZ() - ayj.getZ();
+            this.xPush = this.getX() - bec.getX();
+            this.zPush = this.getZ() - bec.getZ();
         }
-        return true;
+        return InteractionResult.sidedSuccess(this.level.isClientSide);
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putDouble("PushX", this.xPush);
-        jt.putDouble("PushZ", this.zPush);
-        jt.putShort("Fuel", (short)this.fuel);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putDouble("PushX", this.xPush);
+        le.putDouble("PushZ", this.zPush);
+        le.putShort("Fuel", (short)this.fuel);
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.xPush = jt.getDouble("PushX");
-        this.zPush = jt.getDouble("PushZ");
-        this.fuel = jt.getShort("Fuel");
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.xPush = le.getDouble("PushX");
+        this.zPush = le.getDouble("PushZ");
+        this.fuel = le.getShort("Fuel");
     }
     
     protected boolean hasFuel() {
@@ -157,7 +158,7 @@ public class MinecartFurnace extends AbstractMinecart {
     
     @Override
     public BlockState getDefaultDisplayBlockState() {
-        return (((AbstractStateHolder<O, BlockState>)Blocks.FURNACE.defaultBlockState()).setValue((Property<Comparable>)FurnaceBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)FurnaceBlock.LIT, this.hasFuel());
+        return (((StateHolder<O, BlockState>)Blocks.FURNACE.defaultBlockState()).setValue((Property<Comparable>)FurnaceBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)FurnaceBlock.LIT, this.hasFuel());
     }
     
     static {
diff --git a/src/net/minecraft/world/entity/vehicle/MinecartHopper.java b/src/net/minecraft/world/entity/vehicle/MinecartHopper.java
index 139bf56..cfc8a7e 100644
--- a/src/net/minecraft/world/entity/vehicle/MinecartHopper.java
+++ b/src/net/minecraft/world/entity/vehicle/MinecartHopper.java
@@ -13,7 +13,6 @@ import java.util.function.Predicate;
 import net.minecraft.world.entity.EntitySelector;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.level.block.entity.HopperBlockEntity;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.Level;
@@ -26,15 +25,15 @@ public class MinecartHopper extends AbstractMinecartContainer implements Hopper
     private int cooldownTime;
     private final BlockPos lastPosition;
     
-    public MinecartHopper(final EntityType<? extends MinecartHopper> aku, final Level bjw) {
-        super(aku, bjw);
+    public MinecartHopper(final EntityType<? extends MinecartHopper> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.enabled = true;
         this.cooldownTime = -1;
         this.lastPosition = BlockPos.ZERO;
     }
     
-    public MinecartHopper(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.HOPPER_MINECART, double2, double3, double4, bjw);
+    public MinecartHopper(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.HOPPER_MINECART, double2, double3, double4, bqb);
         this.enabled = true;
         this.cooldownTime = -1;
         this.lastPosition = BlockPos.ZERO;
@@ -100,8 +99,8 @@ public class MinecartHopper extends AbstractMinecartContainer implements Hopper
     public void tick() {
         super.tick();
         if (!this.level.isClientSide && this.isAlive() && this.isEnabled()) {
-            final BlockPos fk2 = new BlockPos(this);
-            if (fk2.equals(this.lastPosition)) {
+            final BlockPos fu2 = this.blockPosition();
+            if (fu2.equals(this.lastPosition)) {
                 --this.cooldownTime;
             }
             else {
@@ -129,25 +128,25 @@ public class MinecartHopper extends AbstractMinecartContainer implements Hopper
     }
     
     @Override
-    public void destroy(final DamageSource ajz) {
-        super.destroy(ajz);
+    public void destroy(final DamageSource anw) {
+        super.destroy(anw);
         if (this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
             this.spawnAtLocation(Blocks.HOPPER);
         }
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("TransferCooldown", this.cooldownTime);
-        jt.putBoolean("Enabled", this.enabled);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("TransferCooldown", this.cooldownTime);
+        le.putBoolean("Enabled", this.enabled);
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.cooldownTime = jt.getInt("TransferCooldown");
-        this.enabled = (!jt.contains("Enabled") || jt.getBoolean("Enabled"));
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.cooldownTime = le.getInt("TransferCooldown");
+        this.enabled = (!le.contains("Enabled") || le.getBoolean("Enabled"));
     }
     
     public void setCooldown(final int integer) {
@@ -158,7 +157,7 @@ public class MinecartHopper extends AbstractMinecartContainer implements Hopper
         return this.cooldownTime > 0;
     }
     
-    public AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return new HopperMenu(integer, ayi, this);
+    public AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return new HopperMenu(integer, beb, this);
     }
 }
diff --git a/src/net/minecraft/world/entity/vehicle/MinecartSpawner.java b/src/net/minecraft/world/entity/vehicle/MinecartSpawner.java
index a9cb89a..057ea9b 100644
--- a/src/net/minecraft/world/entity/vehicle/MinecartSpawner.java
+++ b/src/net/minecraft/world/entity/vehicle/MinecartSpawner.java
@@ -12,8 +12,8 @@ import net.minecraft.world.level.BaseSpawner;
 public class MinecartSpawner extends AbstractMinecart {
     private final BaseSpawner spawner;
     
-    public MinecartSpawner(final EntityType<? extends MinecartSpawner> aku, final Level bjw) {
-        super(aku, bjw);
+    public MinecartSpawner(final EntityType<? extends MinecartSpawner> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.spawner = new BaseSpawner() {
             @Override
             public void broadcastEvent(final int integer) {
@@ -27,13 +27,13 @@ public class MinecartSpawner extends AbstractMinecart {
             
             @Override
             public BlockPos getPos() {
-                return new BlockPos(MinecartSpawner.this);
+                return MinecartSpawner.this.blockPosition();
             }
         };
     }
     
-    public MinecartSpawner(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.SPAWNER_MINECART, bjw, double2, double3, double4);
+    public MinecartSpawner(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.SPAWNER_MINECART, bqb, double2, double3, double4);
         this.spawner = new BaseSpawner() {
             @Override
             public void broadcastEvent(final int integer) {
@@ -47,7 +47,7 @@ public class MinecartSpawner extends AbstractMinecart {
             
             @Override
             public BlockPos getPos() {
-                return new BlockPos(MinecartSpawner.this);
+                return MinecartSpawner.this.blockPosition();
             }
         };
     }
@@ -63,15 +63,15 @@ public class MinecartSpawner extends AbstractMinecart {
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        this.spawner.load(jt);
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        this.spawner.load(le);
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        this.spawner.save(jt);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        this.spawner.save(le);
     }
     
     @Override
diff --git a/src/net/minecraft/world/entity/vehicle/MinecartTNT.java b/src/net/minecraft/world/entity/vehicle/MinecartTNT.java
index 96b120d..a40ca90 100644
--- a/src/net/minecraft/world/entity/vehicle/MinecartTNT.java
+++ b/src/net/minecraft/world/entity/vehicle/MinecartTNT.java
@@ -1,6 +1,8 @@
 package net.minecraft.world.entity.vehicle;
 
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.core.BlockPos;
@@ -24,13 +26,13 @@ import net.minecraft.world.entity.EntityType;
 public class MinecartTNT extends AbstractMinecart {
     private int fuse;
     
-    public MinecartTNT(final EntityType<? extends MinecartTNT> aku, final Level bjw) {
-        super(aku, bjw);
+    public MinecartTNT(final EntityType<? extends MinecartTNT> aoq, final Level bqb) {
+        super(aoq, bqb);
         this.fuse = -1;
     }
     
-    public MinecartTNT(final Level bjw, final double double2, final double double3, final double double4) {
-        super(EntityType.TNT_MINECART, bjw, double2, double3, double4);
+    public MinecartTNT(final Level bqb, final double double2, final double double3, final double double4) {
+        super(EntityType.TNT_MINECART, bqb, double2, double3, double4);
         this.fuse = -1;
     }
     
@@ -63,29 +65,29 @@ public class MinecartTNT extends AbstractMinecart {
     }
     
     @Override
-    public boolean hurt(final DamageSource ajz, final float float2) {
-        final Entity akq4 = ajz.getDirectEntity();
-        if (akq4 instanceof AbstractArrow) {
-            final AbstractArrow ayn5 = (AbstractArrow)akq4;
-            if (ayn5.isOnFire()) {
-                this.explode(ayn5.getDeltaMovement().lengthSqr());
+    public boolean hurt(final DamageSource anw, final float float2) {
+        final Entity aom4 = anw.getDirectEntity();
+        if (aom4 instanceof AbstractArrow) {
+            final AbstractArrow beg5 = (AbstractArrow)aom4;
+            if (beg5.isOnFire()) {
+                this.explode(beg5.getDeltaMovement().lengthSqr());
             }
         }
-        return super.hurt(ajz, float2);
+        return super.hurt(anw, float2);
     }
     
     @Override
-    public void destroy(final DamageSource ajz) {
+    public void destroy(final DamageSource anw) {
         final double double3 = Entity.getHorizontalDistanceSqr(this.getDeltaMovement());
-        if (ajz.isFire() || ajz.isExplosion() || double3 >= 0.009999999776482582) {
+        if (anw.isFire() || anw.isExplosion() || double3 >= 0.009999999776482582) {
             if (this.fuse < 0) {
                 this.primeFuse();
                 this.fuse = this.random.nextInt(20) + this.random.nextInt(20);
             }
             return;
         }
-        super.destroy(ajz);
-        if (!ajz.isExplosion() && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
+        super.destroy(anw);
+        if (!anw.isExplosion() && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
             this.spawnAtLocation(Blocks.TNT);
         }
     }
@@ -146,29 +148,29 @@ public class MinecartTNT extends AbstractMinecart {
     }
     
     @Override
-    public float getBlockExplosionResistance(final Explosion bjp, final BlockGetter bjg, final BlockPos fk, final BlockState byj, final FluidState coj, final float float6) {
-        if (this.isPrimed() && (byj.is(BlockTags.RAILS) || bjg.getBlockState(fk.above()).is(BlockTags.RAILS))) {
+    public float getBlockExplosionResistance(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final FluidState cxa, final float float6) {
+        if (this.isPrimed() && (cfj.is(BlockTags.RAILS) || bpg.getBlockState(fu.above()).is(BlockTags.RAILS))) {
             return 0.0f;
         }
-        return super.getBlockExplosionResistance(bjp, bjg, fk, byj, coj, float6);
+        return super.getBlockExplosionResistance(bpt, bpg, fu, cfj, cxa, float6);
     }
     
     @Override
-    public boolean shouldBlockExplode(final Explosion bjp, final BlockGetter bjg, final BlockPos fk, final BlockState byj, final float float5) {
-        return (!this.isPrimed() || (!byj.is(BlockTags.RAILS) && !bjg.getBlockState(fk.above()).is(BlockTags.RAILS))) && super.shouldBlockExplode(bjp, bjg, fk, byj, float5);
+    public boolean shouldBlockExplode(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final float float5) {
+        return (!this.isPrimed() || (!cfj.is(BlockTags.RAILS) && !bpg.getBlockState(fu.above()).is(BlockTags.RAILS))) && super.shouldBlockExplode(bpt, bpg, fu, cfj, float5);
     }
     
     @Override
-    protected void readAdditionalSaveData(final CompoundTag jt) {
-        super.readAdditionalSaveData(jt);
-        if (jt.contains("TNTFuse", 99)) {
-            this.fuse = jt.getInt("TNTFuse");
+    protected void readAdditionalSaveData(final CompoundTag le) {
+        super.readAdditionalSaveData(le);
+        if (le.contains("TNTFuse", 99)) {
+            this.fuse = le.getInt("TNTFuse");
         }
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putInt("TNTFuse", this.fuse);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putInt("TNTFuse", this.fuse);
     }
 }
diff --git a/src/net/minecraft/world/food/FoodData.java b/src/net/minecraft/world/food/FoodData.java
index f7e2426..23f9170 100644
--- a/src/net/minecraft/world/food/FoodData.java
+++ b/src/net/minecraft/world/food/FoodData.java
@@ -26,39 +26,39 @@ public class FoodData {
         this.saturationLevel = Math.min(this.saturationLevel + integer * float2 * 2.0f, (float)this.foodLevel);
     }
     
-    public void eat(final Item bei, final ItemStack ben) {
-        if (bei.isEdible()) {
-            final FoodProperties bak4 = bei.getFoodProperties();
-            this.eat(bak4.getNutrition(), bak4.getSaturationModifier());
+    public void eat(final Item bke, final ItemStack bki) {
+        if (bke.isEdible()) {
+            final FoodProperties bgf4 = bke.getFoodProperties();
+            this.eat(bgf4.getNutrition(), bgf4.getSaturationModifier());
         }
     }
     
-    public void tick(final Player ayj) {
-        final Difficulty aji3 = ayj.level.getDifficulty();
+    public void tick(final Player bec) {
+        final Difficulty and3 = bec.level.getDifficulty();
         this.lastFoodLevel = this.foodLevel;
         if (this.exhaustionLevel > 4.0f) {
             this.exhaustionLevel -= 4.0f;
             if (this.saturationLevel > 0.0f) {
                 this.saturationLevel = Math.max(this.saturationLevel - 1.0f, 0.0f);
             }
-            else if (aji3 != Difficulty.PEACEFUL) {
+            else if (and3 != Difficulty.PEACEFUL) {
                 this.foodLevel = Math.max(this.foodLevel - 1, 0);
             }
         }
-        final boolean boolean4 = ayj.level.getGameRules().getBoolean(GameRules.RULE_NATURAL_REGENERATION);
-        if (boolean4 && this.saturationLevel > 0.0f && ayj.isHurt() && this.foodLevel >= 20) {
+        final boolean boolean4 = bec.level.getGameRules().getBoolean(GameRules.RULE_NATURAL_REGENERATION);
+        if (boolean4 && this.saturationLevel > 0.0f && bec.isHurt() && this.foodLevel >= 20) {
             ++this.tickTimer;
             if (this.tickTimer >= 10) {
                 final float float5 = Math.min(this.saturationLevel, 6.0f);
-                ayj.heal(float5 / 6.0f);
+                bec.heal(float5 / 6.0f);
                 this.addExhaustion(float5);
                 this.tickTimer = 0;
             }
         }
-        else if (boolean4 && this.foodLevel >= 18 && ayj.isHurt()) {
+        else if (boolean4 && this.foodLevel >= 18 && bec.isHurt()) {
             ++this.tickTimer;
             if (this.tickTimer >= 80) {
-                ayj.heal(1.0f);
+                bec.heal(1.0f);
                 this.addExhaustion(6.0f);
                 this.tickTimer = 0;
             }
@@ -66,8 +66,8 @@ public class FoodData {
         else if (this.foodLevel <= 0) {
             ++this.tickTimer;
             if (this.tickTimer >= 80) {
-                if (ayj.getHealth() > 10.0f || aji3 == Difficulty.HARD || (ayj.getHealth() > 1.0f && aji3 == Difficulty.NORMAL)) {
-                    ayj.hurt(DamageSource.STARVE, 1.0f);
+                if (bec.getHealth() > 10.0f || and3 == Difficulty.HARD || (bec.getHealth() > 1.0f && and3 == Difficulty.NORMAL)) {
+                    bec.hurt(DamageSource.STARVE, 1.0f);
                 }
                 this.tickTimer = 0;
             }
@@ -77,20 +77,20 @@ public class FoodData {
         }
     }
     
-    public void readAdditionalSaveData(final CompoundTag jt) {
-        if (jt.contains("foodLevel", 99)) {
-            this.foodLevel = jt.getInt("foodLevel");
-            this.tickTimer = jt.getInt("foodTickTimer");
-            this.saturationLevel = jt.getFloat("foodSaturationLevel");
-            this.exhaustionLevel = jt.getFloat("foodExhaustionLevel");
+    public void readAdditionalSaveData(final CompoundTag le) {
+        if (le.contains("foodLevel", 99)) {
+            this.foodLevel = le.getInt("foodLevel");
+            this.tickTimer = le.getInt("foodTickTimer");
+            this.saturationLevel = le.getFloat("foodSaturationLevel");
+            this.exhaustionLevel = le.getFloat("foodExhaustionLevel");
         }
     }
     
-    public void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putInt("foodLevel", this.foodLevel);
-        jt.putInt("foodTickTimer", this.tickTimer);
-        jt.putFloat("foodSaturationLevel", this.saturationLevel);
-        jt.putFloat("foodExhaustionLevel", this.exhaustionLevel);
+    public void addAdditionalSaveData(final CompoundTag le) {
+        le.putInt("foodLevel", this.foodLevel);
+        le.putInt("foodTickTimer", this.tickTimer);
+        le.putFloat("foodSaturationLevel", this.saturationLevel);
+        le.putFloat("foodExhaustionLevel", this.exhaustionLevel);
     }
     
     public int getFoodLevel() {
diff --git a/src/net/minecraft/world/food/FoodProperties.java b/src/net/minecraft/world/food/FoodProperties.java
index d2508cb..8b258b5 100644
--- a/src/net/minecraft/world/food/FoodProperties.java
+++ b/src/net/minecraft/world/food/FoodProperties.java
@@ -2,7 +2,7 @@ package net.minecraft.world.food;
 
 import com.google.common.collect.Lists;
 import net.minecraft.world.effect.MobEffectInstance;
-import org.apache.commons.lang3.tuple.Pair;
+import com.mojang.datafixers.util.Pair;
 import java.util.List;
 
 public class FoodProperties {
@@ -83,8 +83,8 @@ public class FoodProperties {
             return this;
         }
         
-        public Builder effect(final MobEffectInstance akk, final float float2) {
-            this.effects.add((Pair<MobEffectInstance, Float>)Pair.of(akk, float2));
+        public Builder effect(final MobEffectInstance aog, final float float2) {
+            this.effects.add((Pair<MobEffectInstance, Float>)Pair.of(aog, float2));
             return this;
         }
         
diff --git a/src/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/net/minecraft/world/inventory/AbstractContainerMenu.java
index 4acaff9..af48d0b 100644
--- a/src/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/src/net/minecraft/world/inventory/AbstractContainerMenu.java
@@ -6,6 +6,10 @@ import net.minecraft.util.Mth;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.CrashReportCategory;
+import net.minecraft.ReportedException;
+import net.minecraft.core.Registry;
+import net.minecraft.CrashReport;
 import java.util.Iterator;
 import net.minecraft.world.Container;
 import net.minecraft.world.level.block.Block;
@@ -32,7 +36,7 @@ public abstract class AbstractContainerMenu {
     private final List<ContainerListener> containerListeners;
     private final Set<Player> unSynchedPlayers;
     
-    protected AbstractContainerMenu(@Nullable final MenuType<?> bbo, final int integer) {
+    protected AbstractContainerMenu(@Nullable final MenuType<?> bhk, final int integer) {
         this.lastSlots = NonNullList.<ItemStack>create();
         this.slots = Lists.newArrayList();
         this.dataSlots = Lists.newArrayList();
@@ -40,17 +44,17 @@ public abstract class AbstractContainerMenu {
         this.quickcraftSlots = Sets.newHashSet();
         this.containerListeners = Lists.newArrayList();
         this.unSynchedPlayers = Sets.newHashSet();
-        this.menuType = bbo;
+        this.menuType = bhk;
         this.containerId = integer;
     }
     
-    protected static boolean stillValid(final ContainerLevelAccess bax, final Player ayj, final Block bph) {
-        return bax.<Boolean>evaluate((bjw, fk) -> {
-            if (bjw.getBlockState(fk).getBlock() != bph) {
+    protected static boolean stillValid(final ContainerLevelAccess bgs, final Player bec, final Block bvr) {
+        return bgs.<Boolean>evaluate((bqb, fu) -> {
+            if (!bqb.getBlockState(fu).is(bvr)) {
                 return false;
             }
             else {
-                return ayj.distanceToSqr(fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5) <= 64.0;
+                return bec.distanceToSqr(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5) <= 64.0;
             }
         }, Boolean.valueOf(true));
     }
@@ -62,82 +66,82 @@ public abstract class AbstractContainerMenu {
         return this.menuType;
     }
     
-    protected static void checkContainerSize(final Container aje, final int integer) {
-        final int integer2 = aje.getContainerSize();
+    protected static void checkContainerSize(final Container amz, final int integer) {
+        final int integer2 = amz.getContainerSize();
         if (integer2 < integer) {
             throw new IllegalArgumentException("Container size " + integer2 + " is smaller than expected " + integer);
         }
     }
     
-    protected static void checkContainerDataCount(final ContainerData baw, final int integer) {
-        final int integer2 = baw.getCount();
+    protected static void checkContainerDataCount(final ContainerData bgr, final int integer) {
+        final int integer2 = bgr.getCount();
         if (integer2 < integer) {
             throw new IllegalArgumentException("Container data count " + integer2 + " is smaller than expected " + integer);
         }
     }
     
-    protected Slot addSlot(final Slot bca) {
-        bca.index = this.slots.size();
-        this.slots.add(bca);
+    protected Slot addSlot(final Slot bhw) {
+        bhw.index = this.slots.size();
+        this.slots.add(bhw);
         this.lastSlots.add(ItemStack.EMPTY);
-        return bca;
+        return bhw;
     }
     
-    protected DataSlot addDataSlot(final DataSlot bbb) {
-        this.dataSlots.add(bbb);
-        return bbb;
+    protected DataSlot addDataSlot(final DataSlot bgw) {
+        this.dataSlots.add(bgw);
+        return bgw;
     }
     
-    protected void addDataSlots(final ContainerData baw) {
-        for (int integer3 = 0; integer3 < baw.getCount(); ++integer3) {
-            this.addDataSlot(DataSlot.forContainer(baw, integer3));
+    protected void addDataSlots(final ContainerData bgr) {
+        for (int integer3 = 0; integer3 < bgr.getCount(); ++integer3) {
+            this.addDataSlot(DataSlot.forContainer(bgr, integer3));
         }
     }
     
-    public void addSlotListener(final ContainerListener bay) {
-        if (this.containerListeners.contains(bay)) {
+    public void addSlotListener(final ContainerListener bgt) {
+        if (this.containerListeners.contains(bgt)) {
             return;
         }
-        this.containerListeners.add(bay);
-        bay.refreshContainer(this, this.getItems());
+        this.containerListeners.add(bgt);
+        bgt.refreshContainer(this, this.getItems());
         this.broadcastChanges();
     }
     
-    public void removeSlotListener(final ContainerListener bay) {
-        this.containerListeners.remove(bay);
+    public void removeSlotListener(final ContainerListener bgt) {
+        this.containerListeners.remove(bgt);
     }
     
     public NonNullList<ItemStack> getItems() {
-        final NonNullList<ItemStack> fy2 = NonNullList.<ItemStack>create();
+        final NonNullList<ItemStack> gi2 = NonNullList.<ItemStack>create();
         for (int integer3 = 0; integer3 < this.slots.size(); ++integer3) {
-            fy2.add(this.slots.get(integer3).getItem());
+            gi2.add(this.slots.get(integer3).getItem());
         }
-        return fy2;
+        return gi2;
     }
     
     public void broadcastChanges() {
         for (int integer2 = 0; integer2 < this.slots.size(); ++integer2) {
-            final ItemStack ben3 = this.slots.get(integer2).getItem();
-            ItemStack ben4 = this.lastSlots.get(integer2);
-            if (!ItemStack.matches(ben4, ben3)) {
-                ben4 = ben3.copy();
-                this.lastSlots.set(integer2, ben4);
-                for (final ContainerListener bay6 : this.containerListeners) {
-                    bay6.slotChanged(this, integer2, ben4);
+            final ItemStack bki3 = this.slots.get(integer2).getItem();
+            final ItemStack bki4 = this.lastSlots.get(integer2);
+            if (!ItemStack.matches(bki4, bki3)) {
+                final ItemStack bki5 = bki3.copy();
+                this.lastSlots.set(integer2, bki5);
+                for (final ContainerListener bgt7 : this.containerListeners) {
+                    bgt7.slotChanged(this, integer2, bki5);
                 }
             }
         }
         for (int integer2 = 0; integer2 < this.dataSlots.size(); ++integer2) {
-            final DataSlot bbb3 = this.dataSlots.get(integer2);
-            if (bbb3.checkAndClearUpdateFlag()) {
-                for (final ContainerListener bay7 : this.containerListeners) {
-                    bay7.setContainerData(this, integer2, bbb3.get());
+            final DataSlot bgw3 = this.dataSlots.get(integer2);
+            if (bgw3.checkAndClearUpdateFlag()) {
+                for (final ContainerListener bgt8 : this.containerListeners) {
+                    bgt8.setContainerData(this, integer2, bgw3.get());
                 }
             }
         }
     }
     
-    public boolean clickMenuButton(final Player ayj, final int integer) {
+    public boolean clickMenuButton(final Player bec, final int integer) {
         return false;
     }
     
@@ -145,29 +149,46 @@ public abstract class AbstractContainerMenu {
         return this.slots.get(integer);
     }
     
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        final Slot bca4 = this.slots.get(integer);
-        if (bca4 != null) {
-            return bca4.getItem();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        final Slot bhw4 = this.slots.get(integer);
+        if (bhw4 != null) {
+            return bhw4.getItem();
         }
         return ItemStack.EMPTY;
     }
     
-    public ItemStack clicked(final int integer1, final int integer2, final ClickType bav, final Player ayj) {
-        ItemStack ben6 = ItemStack.EMPTY;
-        final Inventory ayi7 = ayj.inventory;
-        if (bav == ClickType.QUICK_CRAFT) {
+    public ItemStack clicked(final int integer1, final int integer2, final ClickType bgq, final Player bec) {
+        try {
+            return this.doClick(integer1, integer2, bgq, bec);
+        }
+        catch (Exception exception6) {
+            final CrashReport j7 = CrashReport.forThrowable(exception6, "Container click");
+            final CrashReportCategory k8 = j7.addCategory("Click info");
+            k8.setDetail("Menu Type", () -> (this.menuType != null) ? Registry.MENU.getKey(this.menuType).toString() : "<no type>");
+            k8.setDetail("Menu Class", () -> this.getClass().getCanonicalName());
+            k8.setDetail("Slot Count", this.slots.size());
+            k8.setDetail("Slot", integer1);
+            k8.setDetail("Button", integer2);
+            k8.setDetail("Type", bgq);
+            throw new ReportedException(j7);
+        }
+    }
+    
+    private ItemStack doClick(final int integer1, final int integer2, final ClickType bgq, final Player bec) {
+        ItemStack bki6 = ItemStack.EMPTY;
+        final Inventory beb7 = bec.inventory;
+        if (bgq == ClickType.QUICK_CRAFT) {
             final int integer3 = this.quickcraftStatus;
             this.quickcraftStatus = getQuickcraftHeader(integer2);
             if ((integer3 != 1 || this.quickcraftStatus != 2) && integer3 != this.quickcraftStatus) {
                 this.resetQuickCraft();
             }
-            else if (ayi7.getCarried().isEmpty()) {
+            else if (beb7.getCarried().isEmpty()) {
                 this.resetQuickCraft();
             }
             else if (this.quickcraftStatus == 0) {
                 this.quickcraftType = getQuickcraftType(integer2);
-                if (isValidQuickcraftType(this.quickcraftType, ayj)) {
+                if (isValidQuickcraftType(this.quickcraftType, bec)) {
                     this.quickcraftStatus = 1;
                     this.quickcraftSlots.clear();
                 }
@@ -176,32 +197,32 @@ public abstract class AbstractContainerMenu {
                 }
             }
             else if (this.quickcraftStatus == 1) {
-                final Slot bca9 = this.slots.get(integer1);
-                final ItemStack ben7 = ayi7.getCarried();
-                if (bca9 != null && canItemQuickReplace(bca9, ben7, true) && bca9.mayPlace(ben7) && (this.quickcraftType == 2 || ben7.getCount() > this.quickcraftSlots.size()) && this.canDragTo(bca9)) {
-                    this.quickcraftSlots.add(bca9);
+                final Slot bhw9 = this.slots.get(integer1);
+                final ItemStack bki7 = beb7.getCarried();
+                if (bhw9 != null && canItemQuickReplace(bhw9, bki7, true) && bhw9.mayPlace(bki7) && (this.quickcraftType == 2 || bki7.getCount() > this.quickcraftSlots.size()) && this.canDragTo(bhw9)) {
+                    this.quickcraftSlots.add(bhw9);
                 }
             }
             else if (this.quickcraftStatus == 2) {
                 if (!this.quickcraftSlots.isEmpty()) {
-                    final ItemStack ben8 = ayi7.getCarried().copy();
-                    int integer4 = ayi7.getCarried().getCount();
-                    for (final Slot bca10 : this.quickcraftSlots) {
-                        final ItemStack ben9 = ayi7.getCarried();
-                        if (bca10 != null && canItemQuickReplace(bca10, ben9, true) && bca10.mayPlace(ben9) && (this.quickcraftType == 2 || ben9.getCount() >= this.quickcraftSlots.size()) && this.canDragTo(bca10)) {
-                            final ItemStack ben10 = ben8.copy();
-                            final int integer5 = bca10.hasItem() ? bca10.getItem().getCount() : 0;
-                            getQuickCraftSlotCount(this.quickcraftSlots, this.quickcraftType, ben10, integer5);
-                            final int integer6 = Math.min(ben10.getMaxStackSize(), bca10.getMaxStackSize(ben10));
-                            if (ben10.getCount() > integer6) {
-                                ben10.setCount(integer6);
+                    final ItemStack bki8 = beb7.getCarried().copy();
+                    int integer4 = beb7.getCarried().getCount();
+                    for (final Slot bhw10 : this.quickcraftSlots) {
+                        final ItemStack bki9 = beb7.getCarried();
+                        if (bhw10 != null && canItemQuickReplace(bhw10, bki9, true) && bhw10.mayPlace(bki9) && (this.quickcraftType == 2 || bki9.getCount() >= this.quickcraftSlots.size()) && this.canDragTo(bhw10)) {
+                            final ItemStack bki10 = bki8.copy();
+                            final int integer5 = bhw10.hasItem() ? bhw10.getItem().getCount() : 0;
+                            getQuickCraftSlotCount(this.quickcraftSlots, this.quickcraftType, bki10, integer5);
+                            final int integer6 = Math.min(bki10.getMaxStackSize(), bhw10.getMaxStackSize(bki10));
+                            if (bki10.getCount() > integer6) {
+                                bki10.setCount(integer6);
                             }
-                            integer4 -= ben10.getCount() - integer5;
-                            bca10.set(ben10);
+                            integer4 -= bki10.getCount() - integer5;
+                            bhw10.set(bki10);
                         }
                     }
-                    ben8.setCount(integer4);
-                    ayi7.setCarried(ben8);
+                    bki8.setCount(integer4);
+                    beb7.setCarried(bki8);
                 }
                 this.resetQuickCraft();
             }
@@ -212,175 +233,175 @@ public abstract class AbstractContainerMenu {
         else if (this.quickcraftStatus != 0) {
             this.resetQuickCraft();
         }
-        else if ((bav == ClickType.PICKUP || bav == ClickType.QUICK_MOVE) && (integer2 == 0 || integer2 == 1)) {
+        else if ((bgq == ClickType.PICKUP || bgq == ClickType.QUICK_MOVE) && (integer2 == 0 || integer2 == 1)) {
             if (integer1 == -999) {
-                if (!ayi7.getCarried().isEmpty()) {
+                if (!beb7.getCarried().isEmpty()) {
                     if (integer2 == 0) {
-                        ayj.drop(ayi7.getCarried(), true);
-                        ayi7.setCarried(ItemStack.EMPTY);
+                        bec.drop(beb7.getCarried(), true);
+                        beb7.setCarried(ItemStack.EMPTY);
                     }
                     if (integer2 == 1) {
-                        ayj.drop(ayi7.getCarried().split(1), true);
+                        bec.drop(beb7.getCarried().split(1), true);
                     }
                 }
             }
-            else if (bav == ClickType.QUICK_MOVE) {
+            else if (bgq == ClickType.QUICK_MOVE) {
                 if (integer1 < 0) {
                     return ItemStack.EMPTY;
                 }
-                final Slot bca11 = this.slots.get(integer1);
-                if (bca11 == null || !bca11.mayPickup(ayj)) {
+                final Slot bhw11 = this.slots.get(integer1);
+                if (bhw11 == null || !bhw11.mayPickup(bec)) {
                     return ItemStack.EMPTY;
                 }
-                for (ItemStack ben8 = this.quickMoveStack(ayj, integer1); !ben8.isEmpty() && ItemStack.isSame(bca11.getItem(), ben8); ben8 = this.quickMoveStack(ayj, integer1)) {
-                    ben6 = ben8.copy();
+                for (ItemStack bki8 = this.quickMoveStack(bec, integer1); !bki8.isEmpty() && ItemStack.isSame(bhw11.getItem(), bki8); bki8 = this.quickMoveStack(bec, integer1)) {
+                    bki6 = bki8.copy();
                 }
             }
             else {
                 if (integer1 < 0) {
                     return ItemStack.EMPTY;
                 }
-                final Slot bca11 = this.slots.get(integer1);
-                if (bca11 != null) {
-                    ItemStack ben8 = bca11.getItem();
-                    final ItemStack ben7 = ayi7.getCarried();
-                    if (!ben8.isEmpty()) {
-                        ben6 = ben8.copy();
+                final Slot bhw11 = this.slots.get(integer1);
+                if (bhw11 != null) {
+                    ItemStack bki8 = bhw11.getItem();
+                    final ItemStack bki7 = beb7.getCarried();
+                    if (!bki8.isEmpty()) {
+                        bki6 = bki8.copy();
                     }
-                    if (ben8.isEmpty()) {
-                        if (!ben7.isEmpty() && bca11.mayPlace(ben7)) {
-                            int integer7 = (integer2 == 0) ? ben7.getCount() : 1;
-                            if (integer7 > bca11.getMaxStackSize(ben7)) {
-                                integer7 = bca11.getMaxStackSize(ben7);
+                    if (bki8.isEmpty()) {
+                        if (!bki7.isEmpty() && bhw11.mayPlace(bki7)) {
+                            int integer7 = (integer2 == 0) ? bki7.getCount() : 1;
+                            if (integer7 > bhw11.getMaxStackSize(bki7)) {
+                                integer7 = bhw11.getMaxStackSize(bki7);
                             }
-                            bca11.set(ben7.split(integer7));
+                            bhw11.set(bki7.split(integer7));
                         }
                     }
-                    else if (bca11.mayPickup(ayj)) {
-                        if (ben7.isEmpty()) {
-                            if (ben8.isEmpty()) {
-                                bca11.set(ItemStack.EMPTY);
-                                ayi7.setCarried(ItemStack.EMPTY);
+                    else if (bhw11.mayPickup(bec)) {
+                        if (bki7.isEmpty()) {
+                            if (bki8.isEmpty()) {
+                                bhw11.set(ItemStack.EMPTY);
+                                beb7.setCarried(ItemStack.EMPTY);
                             }
                             else {
-                                final int integer7 = (integer2 == 0) ? ben8.getCount() : ((ben8.getCount() + 1) / 2);
-                                ayi7.setCarried(bca11.remove(integer7));
-                                if (ben8.isEmpty()) {
-                                    bca11.set(ItemStack.EMPTY);
+                                final int integer7 = (integer2 == 0) ? bki8.getCount() : ((bki8.getCount() + 1) / 2);
+                                beb7.setCarried(bhw11.remove(integer7));
+                                if (bki8.isEmpty()) {
+                                    bhw11.set(ItemStack.EMPTY);
                                 }
-                                bca11.onTake(ayj, ayi7.getCarried());
+                                bhw11.onTake(bec, beb7.getCarried());
                             }
                         }
-                        else if (bca11.mayPlace(ben7)) {
-                            if (consideredTheSameItem(ben8, ben7)) {
-                                int integer7 = (integer2 == 0) ? ben7.getCount() : 1;
-                                if (integer7 > bca11.getMaxStackSize(ben7) - ben8.getCount()) {
-                                    integer7 = bca11.getMaxStackSize(ben7) - ben8.getCount();
+                        else if (bhw11.mayPlace(bki7)) {
+                            if (consideredTheSameItem(bki8, bki7)) {
+                                int integer7 = (integer2 == 0) ? bki7.getCount() : 1;
+                                if (integer7 > bhw11.getMaxStackSize(bki7) - bki8.getCount()) {
+                                    integer7 = bhw11.getMaxStackSize(bki7) - bki8.getCount();
                                 }
-                                if (integer7 > ben7.getMaxStackSize() - ben8.getCount()) {
-                                    integer7 = ben7.getMaxStackSize() - ben8.getCount();
+                                if (integer7 > bki7.getMaxStackSize() - bki8.getCount()) {
+                                    integer7 = bki7.getMaxStackSize() - bki8.getCount();
                                 }
-                                ben7.shrink(integer7);
-                                ben8.grow(integer7);
+                                bki7.shrink(integer7);
+                                bki8.grow(integer7);
                             }
-                            else if (ben7.getCount() <= bca11.getMaxStackSize(ben7)) {
-                                bca11.set(ben7);
-                                ayi7.setCarried(ben8);
+                            else if (bki7.getCount() <= bhw11.getMaxStackSize(bki7)) {
+                                bhw11.set(bki7);
+                                beb7.setCarried(bki8);
                             }
                         }
-                        else if (ben7.getMaxStackSize() > 1 && consideredTheSameItem(ben8, ben7) && !ben8.isEmpty()) {
-                            final int integer7 = ben8.getCount();
-                            if (integer7 + ben7.getCount() <= ben7.getMaxStackSize()) {
-                                ben7.grow(integer7);
-                                ben8 = bca11.remove(integer7);
-                                if (ben8.isEmpty()) {
-                                    bca11.set(ItemStack.EMPTY);
+                        else if (bki7.getMaxStackSize() > 1 && consideredTheSameItem(bki8, bki7) && !bki8.isEmpty()) {
+                            final int integer7 = bki8.getCount();
+                            if (integer7 + bki7.getCount() <= bki7.getMaxStackSize()) {
+                                bki7.grow(integer7);
+                                bki8 = bhw11.remove(integer7);
+                                if (bki8.isEmpty()) {
+                                    bhw11.set(ItemStack.EMPTY);
                                 }
-                                bca11.onTake(ayj, ayi7.getCarried());
+                                bhw11.onTake(bec, beb7.getCarried());
                             }
                         }
                     }
-                    bca11.setChanged();
+                    bhw11.setChanged();
                 }
             }
         }
-        else if (bav == ClickType.SWAP && integer2 >= 0 && integer2 < 9) {
-            final Slot bca11 = this.slots.get(integer1);
-            final ItemStack ben8 = ayi7.getItem(integer2);
-            final ItemStack ben7 = bca11.getItem();
-            if (!ben8.isEmpty() || !ben7.isEmpty()) {
-                if (ben8.isEmpty()) {
-                    if (bca11.mayPickup(ayj)) {
-                        ayi7.setItem(integer2, ben7);
-                        bca11.onSwapCraft(ben7.getCount());
-                        bca11.set(ItemStack.EMPTY);
-                        bca11.onTake(ayj, ben7);
+        else if (bgq == ClickType.SWAP) {
+            final Slot bhw11 = this.slots.get(integer1);
+            final ItemStack bki8 = beb7.getItem(integer2);
+            final ItemStack bki7 = bhw11.getItem();
+            if (!bki8.isEmpty() || !bki7.isEmpty()) {
+                if (bki8.isEmpty()) {
+                    if (bhw11.mayPickup(bec)) {
+                        beb7.setItem(integer2, bki7);
+                        bhw11.onSwapCraft(bki7.getCount());
+                        bhw11.set(ItemStack.EMPTY);
+                        bhw11.onTake(bec, bki7);
                     }
                 }
-                else if (ben7.isEmpty()) {
-                    if (bca11.mayPlace(ben8)) {
-                        final int integer7 = bca11.getMaxStackSize(ben8);
-                        if (ben8.getCount() > integer7) {
-                            bca11.set(ben8.split(integer7));
+                else if (bki7.isEmpty()) {
+                    if (bhw11.mayPlace(bki8)) {
+                        final int integer7 = bhw11.getMaxStackSize(bki8);
+                        if (bki8.getCount() > integer7) {
+                            bhw11.set(bki8.split(integer7));
                         }
                         else {
-                            bca11.set(ben8);
-                            ayi7.setItem(integer2, ItemStack.EMPTY);
+                            bhw11.set(bki8);
+                            beb7.setItem(integer2, ItemStack.EMPTY);
                         }
                     }
                 }
-                else if (bca11.mayPickup(ayj) && bca11.mayPlace(ben8)) {
-                    final int integer7 = bca11.getMaxStackSize(ben8);
-                    if (ben8.getCount() > integer7) {
-                        bca11.set(ben8.split(integer7));
-                        bca11.onTake(ayj, ben7);
-                        if (!ayi7.add(ben7)) {
-                            ayj.drop(ben7, true);
+                else if (bhw11.mayPickup(bec) && bhw11.mayPlace(bki8)) {
+                    final int integer7 = bhw11.getMaxStackSize(bki8);
+                    if (bki8.getCount() > integer7) {
+                        bhw11.set(bki8.split(integer7));
+                        bhw11.onTake(bec, bki7);
+                        if (!beb7.add(bki7)) {
+                            bec.drop(bki7, true);
                         }
                     }
                     else {
-                        bca11.set(ben8);
-                        ayi7.setItem(integer2, ben7);
-                        bca11.onTake(ayj, ben7);
+                        bhw11.set(bki8);
+                        beb7.setItem(integer2, bki7);
+                        bhw11.onTake(bec, bki7);
                     }
                 }
             }
         }
-        else if (bav == ClickType.CLONE && ayj.abilities.instabuild && ayi7.getCarried().isEmpty() && integer1 >= 0) {
-            final Slot bca11 = this.slots.get(integer1);
-            if (bca11 != null && bca11.hasItem()) {
-                final ItemStack ben8 = bca11.getItem().copy();
-                ben8.setCount(ben8.getMaxStackSize());
-                ayi7.setCarried(ben8);
+        else if (bgq == ClickType.CLONE && bec.abilities.instabuild && beb7.getCarried().isEmpty() && integer1 >= 0) {
+            final Slot bhw11 = this.slots.get(integer1);
+            if (bhw11 != null && bhw11.hasItem()) {
+                final ItemStack bki8 = bhw11.getItem().copy();
+                bki8.setCount(bki8.getMaxStackSize());
+                beb7.setCarried(bki8);
             }
         }
-        else if (bav == ClickType.THROW && ayi7.getCarried().isEmpty() && integer1 >= 0) {
-            final Slot bca11 = this.slots.get(integer1);
-            if (bca11 != null && bca11.hasItem() && bca11.mayPickup(ayj)) {
-                final ItemStack ben8 = bca11.remove((integer2 == 0) ? 1 : bca11.getItem().getCount());
-                bca11.onTake(ayj, ben8);
-                ayj.drop(ben8, true);
+        else if (bgq == ClickType.THROW && beb7.getCarried().isEmpty() && integer1 >= 0) {
+            final Slot bhw11 = this.slots.get(integer1);
+            if (bhw11 != null && bhw11.hasItem() && bhw11.mayPickup(bec)) {
+                final ItemStack bki8 = bhw11.remove((integer2 == 0) ? 1 : bhw11.getItem().getCount());
+                bhw11.onTake(bec, bki8);
+                bec.drop(bki8, true);
             }
         }
-        else if (bav == ClickType.PICKUP_ALL && integer1 >= 0) {
-            final Slot bca11 = this.slots.get(integer1);
-            final ItemStack ben8 = ayi7.getCarried();
-            if (!ben8.isEmpty() && (bca11 == null || !bca11.hasItem() || !bca11.mayPickup(ayj))) {
+        else if (bgq == ClickType.PICKUP_ALL && integer1 >= 0) {
+            final Slot bhw11 = this.slots.get(integer1);
+            final ItemStack bki8 = beb7.getCarried();
+            if (!bki8.isEmpty() && (bhw11 == null || !bhw11.hasItem() || !bhw11.mayPickup(bec))) {
                 final int integer4 = (integer2 == 0) ? 0 : (this.slots.size() - 1);
                 final int integer7 = (integer2 == 0) ? 1 : -1;
                 for (int integer8 = 0; integer8 < 2; ++integer8) {
-                    for (int integer9 = integer4; integer9 >= 0 && integer9 < this.slots.size() && ben8.getCount() < ben8.getMaxStackSize(); integer9 += integer7) {
-                        final Slot bca12 = this.slots.get(integer9);
-                        if (bca12.hasItem() && canItemQuickReplace(bca12, ben8, true) && bca12.mayPickup(ayj) && this.canTakeItemForPickAll(ben8, bca12)) {
-                            final ItemStack ben11 = bca12.getItem();
-                            if (integer8 != 0 || ben11.getCount() != ben11.getMaxStackSize()) {
-                                final int integer6 = Math.min(ben8.getMaxStackSize() - ben8.getCount(), ben11.getCount());
-                                final ItemStack ben12 = bca12.remove(integer6);
-                                ben8.grow(integer6);
-                                if (ben12.isEmpty()) {
-                                    bca12.set(ItemStack.EMPTY);
+                    for (int integer9 = integer4; integer9 >= 0 && integer9 < this.slots.size() && bki8.getCount() < bki8.getMaxStackSize(); integer9 += integer7) {
+                        final Slot bhw12 = this.slots.get(integer9);
+                        if (bhw12.hasItem() && canItemQuickReplace(bhw12, bki8, true) && bhw12.mayPickup(bec) && this.canTakeItemForPickAll(bki8, bhw12)) {
+                            final ItemStack bki11 = bhw12.getItem();
+                            if (integer8 != 0 || bki11.getCount() != bki11.getMaxStackSize()) {
+                                final int integer6 = Math.min(bki8.getMaxStackSize() - bki8.getCount(), bki11.getCount());
+                                final ItemStack bki12 = bhw12.remove(integer6);
+                                bki8.grow(integer6);
+                                if (bki12.isEmpty()) {
+                                    bhw12.set(ItemStack.EMPTY);
                                 }
-                                bca12.onTake(ayj, ben12);
+                                bhw12.onTake(bec, bki12);
                             }
                         }
                     }
@@ -388,43 +409,43 @@ public abstract class AbstractContainerMenu {
             }
             this.broadcastChanges();
         }
-        return ben6;
+        return bki6;
     }
     
-    public static boolean consideredTheSameItem(final ItemStack ben1, final ItemStack ben2) {
-        return ben1.getItem() == ben2.getItem() && ItemStack.tagMatches(ben1, ben2);
+    public static boolean consideredTheSameItem(final ItemStack bki1, final ItemStack bki2) {
+        return bki1.getItem() == bki2.getItem() && ItemStack.tagMatches(bki1, bki2);
     }
     
-    public boolean canTakeItemForPickAll(final ItemStack ben, final Slot bca) {
+    public boolean canTakeItemForPickAll(final ItemStack bki, final Slot bhw) {
         return true;
     }
     
-    public void removed(final Player ayj) {
-        final Inventory ayi3 = ayj.inventory;
-        if (!ayi3.getCarried().isEmpty()) {
-            ayj.drop(ayi3.getCarried(), false);
-            ayi3.setCarried(ItemStack.EMPTY);
+    public void removed(final Player bec) {
+        final Inventory beb3 = bec.inventory;
+        if (!beb3.getCarried().isEmpty()) {
+            bec.drop(beb3.getCarried(), false);
+            beb3.setCarried(ItemStack.EMPTY);
         }
     }
     
-    protected void clearContainer(final Player ayj, final Level bjw, final Container aje) {
-        if (!ayj.isAlive() || (ayj instanceof ServerPlayer && ((ServerPlayer)ayj).hasDisconnected())) {
-            for (int integer5 = 0; integer5 < aje.getContainerSize(); ++integer5) {
-                ayj.drop(aje.removeItemNoUpdate(integer5), false);
+    protected void clearContainer(final Player bec, final Level bqb, final Container amz) {
+        if (!bec.isAlive() || (bec instanceof ServerPlayer && ((ServerPlayer)bec).hasDisconnected())) {
+            for (int integer5 = 0; integer5 < amz.getContainerSize(); ++integer5) {
+                bec.drop(amz.removeItemNoUpdate(integer5), false);
             }
             return;
         }
-        for (int integer5 = 0; integer5 < aje.getContainerSize(); ++integer5) {
-            ayj.inventory.placeItemBackInInventory(bjw, aje.removeItemNoUpdate(integer5));
+        for (int integer5 = 0; integer5 < amz.getContainerSize(); ++integer5) {
+            bec.inventory.placeItemBackInInventory(bqb, amz.removeItemNoUpdate(integer5));
         }
     }
     
-    public void slotsChanged(final Container aje) {
+    public void slotsChanged(final Container amz) {
         this.broadcastChanges();
     }
     
-    public void setItem(final int integer, final ItemStack ben) {
-        this.getSlot(integer).set(ben);
+    public void setItem(final int integer, final ItemStack bki) {
+        this.getSlot(integer).set(bki);
     }
     
     public void setAll(final List<ItemStack> list) {
@@ -437,33 +458,33 @@ public abstract class AbstractContainerMenu {
         this.dataSlots.get(integer1).set(integer2);
     }
     
-    public short backup(final Inventory ayi) {
+    public short backup(final Inventory beb) {
         return (short)(++this.changeUid);
     }
     
-    public boolean isSynched(final Player ayj) {
-        return !this.unSynchedPlayers.contains(ayj);
+    public boolean isSynched(final Player bec) {
+        return !this.unSynchedPlayers.contains(bec);
     }
     
-    public void setSynched(final Player ayj, final boolean boolean2) {
+    public void setSynched(final Player bec, final boolean boolean2) {
         if (boolean2) {
-            this.unSynchedPlayers.remove(ayj);
+            this.unSynchedPlayers.remove(bec);
         }
         else {
-            this.unSynchedPlayers.add(ayj);
+            this.unSynchedPlayers.add(bec);
         }
     }
     
-    public abstract boolean stillValid(final Player ayj);
+    public abstract boolean stillValid(final Player bec);
     
-    protected boolean moveItemStackTo(final ItemStack ben, final int integer2, final int integer3, final boolean boolean4) {
+    protected boolean moveItemStackTo(final ItemStack bki, final int integer2, final int integer3, final boolean boolean4) {
         boolean boolean5 = false;
         int integer4 = integer2;
         if (boolean4) {
             integer4 = integer3 - 1;
         }
-        if (ben.isStackable()) {
-            while (!ben.isEmpty()) {
+        if (bki.isStackable()) {
+            while (!bki.isEmpty()) {
                 if (boolean4) {
                     if (integer4 < integer2) {
                         break;
@@ -472,20 +493,20 @@ public abstract class AbstractContainerMenu {
                 else if (integer4 >= integer3) {
                     break;
                 }
-                final Slot bca8 = this.slots.get(integer4);
-                final ItemStack ben2 = bca8.getItem();
-                if (!ben2.isEmpty() && consideredTheSameItem(ben, ben2)) {
-                    final int integer5 = ben2.getCount() + ben.getCount();
-                    if (integer5 <= ben.getMaxStackSize()) {
-                        ben.setCount(0);
-                        ben2.setCount(integer5);
-                        bca8.setChanged();
+                final Slot bhw8 = this.slots.get(integer4);
+                final ItemStack bki2 = bhw8.getItem();
+                if (!bki2.isEmpty() && consideredTheSameItem(bki, bki2)) {
+                    final int integer5 = bki2.getCount() + bki.getCount();
+                    if (integer5 <= bki.getMaxStackSize()) {
+                        bki.setCount(0);
+                        bki2.setCount(integer5);
+                        bhw8.setChanged();
                         boolean5 = true;
                     }
-                    else if (ben2.getCount() < ben.getMaxStackSize()) {
-                        ben.shrink(ben.getMaxStackSize() - ben2.getCount());
-                        ben2.setCount(ben.getMaxStackSize());
-                        bca8.setChanged();
+                    else if (bki2.getCount() < bki.getMaxStackSize()) {
+                        bki.shrink(bki.getMaxStackSize() - bki2.getCount());
+                        bki2.setCount(bki.getMaxStackSize());
+                        bhw8.setChanged();
                         boolean5 = true;
                     }
                 }
@@ -497,7 +518,7 @@ public abstract class AbstractContainerMenu {
                 }
             }
         }
-        if (!ben.isEmpty()) {
+        if (!bki.isEmpty()) {
             if (boolean4) {
                 integer4 = integer3 - 1;
             }
@@ -513,16 +534,16 @@ public abstract class AbstractContainerMenu {
                 else if (integer4 >= integer3) {
                     break;
                 }
-                final Slot bca8 = this.slots.get(integer4);
-                final ItemStack ben2 = bca8.getItem();
-                if (ben2.isEmpty() && bca8.mayPlace(ben)) {
-                    if (ben.getCount() > bca8.getMaxStackSize()) {
-                        bca8.set(ben.split(bca8.getMaxStackSize()));
+                final Slot bhw8 = this.slots.get(integer4);
+                final ItemStack bki2 = bhw8.getItem();
+                if (bki2.isEmpty() && bhw8.mayPlace(bki)) {
+                    if (bki.getCount() > bhw8.getMaxStackSize()) {
+                        bhw8.set(bki.split(bhw8.getMaxStackSize()));
                     }
                     else {
-                        bca8.set(ben.split(ben.getCount()));
+                        bhw8.set(bki.split(bki.getCount()));
                     }
-                    bca8.setChanged();
+                    bhw8.setChanged();
                     boolean5 = true;
                     break;
                 }
@@ -549,8 +570,8 @@ public abstract class AbstractContainerMenu {
         return (integer1 & 0x3) | (integer2 & 0x3) << 2;
     }
     
-    public static boolean isValidQuickcraftType(final int integer, final Player ayj) {
-        return integer == 0 || integer == 1 || (integer == 2 && ayj.abilities.instabuild);
+    public static boolean isValidQuickcraftType(final int integer, final Player bec) {
+        return integer == 0 || integer == 1 || (integer == 2 && bec.abilities.instabuild);
     }
     
     protected void resetQuickCraft() {
@@ -558,57 +579,57 @@ public abstract class AbstractContainerMenu {
         this.quickcraftSlots.clear();
     }
     
-    public static boolean canItemQuickReplace(@Nullable final Slot bca, final ItemStack ben, final boolean boolean3) {
-        final boolean boolean4 = bca == null || !bca.hasItem();
-        if (!boolean4 && ben.sameItem(bca.getItem()) && ItemStack.tagMatches(bca.getItem(), ben)) {
-            return bca.getItem().getCount() + (boolean3 ? 0 : ben.getCount()) <= ben.getMaxStackSize();
+    public static boolean canItemQuickReplace(@Nullable final Slot bhw, final ItemStack bki, final boolean boolean3) {
+        final boolean boolean4 = bhw == null || !bhw.hasItem();
+        if (!boolean4 && bki.sameItem(bhw.getItem()) && ItemStack.tagMatches(bhw.getItem(), bki)) {
+            return bhw.getItem().getCount() + (boolean3 ? 0 : bki.getCount()) <= bki.getMaxStackSize();
         }
         return boolean4;
     }
     
-    public static void getQuickCraftSlotCount(final Set<Slot> set, final int integer2, final ItemStack ben, final int integer4) {
+    public static void getQuickCraftSlotCount(final Set<Slot> set, final int integer2, final ItemStack bki, final int integer4) {
         switch (integer2) {
             case 0: {
-                ben.setCount(Mth.floor(ben.getCount() / (float)set.size()));
+                bki.setCount(Mth.floor(bki.getCount() / (float)set.size()));
                 break;
             }
             case 1: {
-                ben.setCount(1);
+                bki.setCount(1);
                 break;
             }
             case 2: {
-                ben.setCount(ben.getItem().getMaxStackSize());
+                bki.setCount(bki.getItem().getMaxStackSize());
                 break;
             }
         }
-        ben.grow(integer4);
+        bki.grow(integer4);
     }
     
-    public boolean canDragTo(final Slot bca) {
+    public boolean canDragTo(final Slot bhw) {
         return true;
     }
     
-    public static int getRedstoneSignalFromBlockEntity(@Nullable final BlockEntity bwl) {
-        if (bwl instanceof Container) {
-            return getRedstoneSignalFromContainer((Container)bwl);
+    public static int getRedstoneSignalFromBlockEntity(@Nullable final BlockEntity cdl) {
+        if (cdl instanceof Container) {
+            return getRedstoneSignalFromContainer((Container)cdl);
         }
         return 0;
     }
     
-    public static int getRedstoneSignalFromContainer(@Nullable final Container aje) {
-        if (aje == null) {
+    public static int getRedstoneSignalFromContainer(@Nullable final Container amz) {
+        if (amz == null) {
             return 0;
         }
         int integer2 = 0;
         float float3 = 0.0f;
-        for (int integer3 = 0; integer3 < aje.getContainerSize(); ++integer3) {
-            final ItemStack ben5 = aje.getItem(integer3);
-            if (!ben5.isEmpty()) {
-                float3 += ben5.getCount() / (float)Math.min(aje.getMaxStackSize(), ben5.getMaxStackSize());
+        for (int integer3 = 0; integer3 < amz.getContainerSize(); ++integer3) {
+            final ItemStack bki5 = amz.getItem(integer3);
+            if (!bki5.isEmpty()) {
+                float3 += bki5.getCount() / (float)Math.min(amz.getMaxStackSize(), bki5.getMaxStackSize());
                 ++integer2;
             }
         }
-        float3 /= aje.getContainerSize();
+        float3 /= amz.getContainerSize();
         return Mth.floor(float3 * 14.0f) + ((integer2 > 0) ? 1 : 0);
     }
 }
diff --git a/src/net/minecraft/world/inventory/AbstractFurnaceMenu.java b/src/net/minecraft/world/inventory/AbstractFurnaceMenu.java
index f6d762d..1fbd7bb 100644
--- a/src/net/minecraft/world/inventory/AbstractFurnaceMenu.java
+++ b/src/net/minecraft/world/inventory/AbstractFurnaceMenu.java
@@ -20,36 +20,36 @@ public abstract class AbstractFurnaceMenu extends RecipeBookMenu<Container> {
     protected final Level level;
     private final RecipeType<? extends AbstractCookingRecipe> recipeType;
     
-    protected AbstractFurnaceMenu(final MenuType<?> bbo, final RecipeType<? extends AbstractCookingRecipe> bgz, final int integer, final Inventory ayi) {
-        this(bbo, bgz, integer, ayi, new SimpleContainer(3), new SimpleContainerData(4));
+    protected AbstractFurnaceMenu(final MenuType<?> bhk, final RecipeType<? extends AbstractCookingRecipe> bmx, final int integer, final Inventory beb) {
+        this(bhk, bmx, integer, beb, new SimpleContainer(3), new SimpleContainerData(4));
     }
     
-    protected AbstractFurnaceMenu(final MenuType<?> bbo, final RecipeType<? extends AbstractCookingRecipe> bgz, final int integer, final Inventory ayi, final Container aje, final ContainerData baw) {
-        super(bbo, integer);
-        this.recipeType = bgz;
-        AbstractContainerMenu.checkContainerSize(aje, 3);
-        AbstractContainerMenu.checkContainerDataCount(baw, 4);
-        this.container = aje;
-        this.data = baw;
-        this.level = ayi.player.level;
-        this.addSlot(new Slot(aje, 0, 56, 17));
-        this.addSlot(new FurnaceFuelSlot(this, aje, 1, 56, 53));
-        this.addSlot(new FurnaceResultSlot(ayi.player, aje, 2, 116, 35));
+    protected AbstractFurnaceMenu(final MenuType<?> bhk, final RecipeType<? extends AbstractCookingRecipe> bmx, final int integer, final Inventory beb, final Container amz, final ContainerData bgr) {
+        super(bhk, integer);
+        this.recipeType = bmx;
+        AbstractContainerMenu.checkContainerSize(amz, 3);
+        AbstractContainerMenu.checkContainerDataCount(bgr, 4);
+        this.container = amz;
+        this.data = bgr;
+        this.level = beb.player.level;
+        this.addSlot(new Slot(amz, 0, 56, 17));
+        this.addSlot(new FurnaceFuelSlot(this, amz, 1, 56, 53));
+        this.addSlot(new FurnaceResultSlot(beb.player, amz, 2, 116, 35));
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 8 + integer2 * 18, 142));
+            this.addSlot(new Slot(beb, integer2, 8 + integer2 * 18, 142));
         }
-        this.addDataSlots(baw);
+        this.addDataSlots(bgr);
     }
     
     @Override
-    public void fillCraftSlotsStackedContents(final StackedContents ayl) {
+    public void fillCraftSlotsStackedContents(final StackedContents bee) {
         if (this.container instanceof StackedContentsCompatible) {
-            ((StackedContentsCompatible)this.container).fillStackedContents(ayl);
+            ((StackedContentsCompatible)this.container).fillStackedContents(bee);
         }
     }
     
@@ -59,13 +59,13 @@ public abstract class AbstractFurnaceMenu extends RecipeBookMenu<Container> {
     }
     
     @Override
-    public void handlePlacement(final boolean boolean1, final Recipe<?> bgw, final ServerPlayer xe) {
-        new ServerPlaceSmeltingRecipe<>(this).recipeClicked(xe, bgw, boolean1);
+    public void handlePlacement(final boolean boolean1, final Recipe<?> bmu, final ServerPlayer ze) {
+        new ServerPlaceSmeltingRecipe<>(this).recipeClicked(ze, bmu, boolean1);
     }
     
     @Override
-    public boolean recipeMatches(final Recipe<? super Container> bgw) {
-        return bgw.matches(this.container, this.level);
+    public boolean recipeMatches(final Recipe<? super Container> bmu) {
+        return bmu.matches(this.container, this.level);
     }
     
     @Override
@@ -89,66 +89,66 @@ public abstract class AbstractFurnaceMenu extends RecipeBookMenu<Container> {
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.container.stillValid(ayj);
+    public boolean stillValid(final Player bec) {
+        return this.container.stillValid(bec);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if (integer == 2) {
-                if (!this.moveItemStackTo(ben5, 3, 39, true)) {
+                if (!this.moveItemStackTo(bki5, 3, 39, true)) {
                     return ItemStack.EMPTY;
                 }
-                bca5.onQuickCraft(ben5, ben4);
+                bhw5.onQuickCraft(bki5, bki4);
             }
             else if (integer == 1 || integer == 0) {
-                if (!this.moveItemStackTo(ben5, 3, 39, false)) {
+                if (!this.moveItemStackTo(bki5, 3, 39, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (this.canSmelt(ben5)) {
-                if (!this.moveItemStackTo(ben5, 0, 1, false)) {
+            else if (this.canSmelt(bki5)) {
+                if (!this.moveItemStackTo(bki5, 0, 1, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (this.isFuel(ben5)) {
-                if (!this.moveItemStackTo(ben5, 1, 2, false)) {
+            else if (this.isFuel(bki5)) {
+                if (!this.moveItemStackTo(bki5, 1, 2, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 3 && integer < 30) {
-                if (!this.moveItemStackTo(ben5, 30, 39, false)) {
+                if (!this.moveItemStackTo(bki5, 30, 39, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (integer >= 30 && integer < 39 && !this.moveItemStackTo(ben5, 3, 30, false)) {
+            else if (integer >= 30 && integer < 39 && !this.moveItemStackTo(bki5, 3, 30, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
-            if (ben5.getCount() == ben4.getCount()) {
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            bca5.onTake(ayj, ben5);
+            bhw5.onTake(bec, bki5);
         }
-        return ben4;
+        return bki4;
     }
     
-    protected boolean canSmelt(final ItemStack ben) {
-        return this.level.getRecipeManager().<SimpleContainer, Recipe>getRecipeFor((RecipeType<Recipe>)this.recipeType, new SimpleContainer(new ItemStack[] { ben }), this.level).isPresent();
+    protected boolean canSmelt(final ItemStack bki) {
+        return this.level.getRecipeManager().<SimpleContainer, Recipe>getRecipeFor((RecipeType<Recipe>)this.recipeType, new SimpleContainer(new ItemStack[] { bki }), this.level).isPresent();
     }
     
-    protected boolean isFuel(final ItemStack ben) {
-        return AbstractFurnaceBlockEntity.isFuel(ben);
+    protected boolean isFuel(final ItemStack bki) {
+        return AbstractFurnaceBlockEntity.isFuel(bki);
     }
     
     public int getBurnProgress() {
diff --git a/src/net/minecraft/world/inventory/AnvilMenu.java b/src/net/minecraft/world/inventory/AnvilMenu.java
index 24ed30c..1c6bb63 100644
--- a/src/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/net/minecraft/world/inventory/AnvilMenu.java
@@ -1,6 +1,8 @@
 package net.minecraft.world.inventory;
 
 import org.apache.logging.log4j.LogManager;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
 import java.util.Iterator;
 import java.util.Map;
 import net.minecraft.network.chat.Component;
@@ -10,189 +12,154 @@ import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.EnchantedBookItem;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.AnvilBlock;
-import net.minecraft.tags.BlockTags;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.SimpleContainer;
-import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.Container;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.entity.player.Inventory;
 import org.apache.logging.log4j.Logger;
 
-public class AnvilMenu extends AbstractContainerMenu {
+public class AnvilMenu extends ItemCombinerMenu {
     private static final Logger LOGGER;
-    private final Container resultSlots;
-    private final Container repairSlots;
-    private final DataSlot cost;
-    private final ContainerLevelAccess access;
     private int repairItemCountCost;
     private String itemName;
-    private final Player player;
+    private final DataSlot cost;
     
-    public AnvilMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, ContainerLevelAccess.NULL);
+    public AnvilMenu(final int integer, final Inventory beb) {
+        this(integer, beb, ContainerLevelAccess.NULL);
     }
     
-    public AnvilMenu(final int integer, final Inventory ayi, final ContainerLevelAccess bax) {
-        super(MenuType.ANVIL, integer);
-        this.resultSlots = new ResultContainer();
-        this.repairSlots = new SimpleContainer(2) {
-            @Override
-            public void setChanged() {
-                super.setChanged();
-                AnvilMenu.this.slotsChanged(this);
-            }
-        };
-        this.cost = DataSlot.standalone();
-        this.access = bax;
-        this.player = ayi.player;
-        this.addDataSlot(this.cost);
-        this.addSlot(new Slot(this.repairSlots, 0, 27, 47));
-        this.addSlot(new Slot(this.repairSlots, 1, 76, 47));
-        this.addSlot(new Slot(this.resultSlots, 2, 134, 47) {
-            @Override
-            public boolean mayPlace(final ItemStack ben) {
-                return false;
-            }
-            
-            @Override
-            public boolean mayPickup(final Player ayj) {
-                return (ayj.abilities.instabuild || ayj.experienceLevel >= AnvilMenu.this.cost.get()) && AnvilMenu.this.cost.get() > 0 && this.hasItem();
-            }
-            
-            @Override
-            public ItemStack onTake(final Player ayj, final ItemStack ben) {
-                if (!ayj.abilities.instabuild) {
-                    ayj.giveExperienceLevels(-AnvilMenu.this.cost.get());
-                }
-                AnvilMenu.this.repairSlots.setItem(0, ItemStack.EMPTY);
-                if (AnvilMenu.this.repairItemCountCost > 0) {
-                    final ItemStack ben2 = AnvilMenu.this.repairSlots.getItem(1);
-                    if (!ben2.isEmpty() && ben2.getCount() > AnvilMenu.this.repairItemCountCost) {
-                        ben2.shrink(AnvilMenu.this.repairItemCountCost);
-                        AnvilMenu.this.repairSlots.setItem(1, ben2);
-                    }
-                    else {
-                        AnvilMenu.this.repairSlots.setItem(1, ItemStack.EMPTY);
-                    }
-                }
-                else {
-                    AnvilMenu.this.repairSlots.setItem(1, ItemStack.EMPTY);
-                }
-                AnvilMenu.this.cost.set(0);
-                final BlockState byj4;
-                BlockState byj5;
-                bax.execute((bjw, fk) -> {
-                    byj4 = bjw.getBlockState(fk);
-                    if (!ayj.abilities.instabuild && byj4.is(BlockTags.ANVIL) && ayj.getRandom().nextFloat() < 0.12f) {
-                        byj5 = AnvilBlock.damage(byj4);
-                        if (byj5 == null) {
-                            bjw.removeBlock(fk, false);
-                            bjw.levelEvent(1029, fk, 0);
-                        }
-                        else {
-                            bjw.setBlock(fk, byj5, 2);
-                            bjw.levelEvent(1030, fk, 0);
-                        }
-                    }
-                    else {
-                        bjw.levelEvent(1030, fk, 0);
-                    }
-                    return;
-                });
-                return ben;
-            }
-        });
-        for (int integer2 = 0; integer2 < 3; ++integer2) {
-            for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
-            }
-        }
-        for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 8 + integer2 * 18, 142));
-        }
+    public AnvilMenu(final int integer, final Inventory beb, final ContainerLevelAccess bgs) {
+        super(MenuType.ANVIL, integer, beb, bgs);
+        this.addDataSlot(this.cost = DataSlot.standalone());
     }
     
     @Override
-    public void slotsChanged(final Container aje) {
-        super.slotsChanged(aje);
-        if (aje == this.repairSlots) {
-            this.createResult();
-        }
+    protected boolean isValidBlock(final BlockState cfj) {
+        return cfj.is(BlockTags.ANVIL);
     }
     
+    @Override
+    protected boolean mayPickup(final Player bec, final boolean boolean2) {
+        return (bec.abilities.instabuild || bec.experienceLevel >= this.cost.get()) && this.cost.get() > 0;
+    }
+    
+    @Override
+    protected ItemStack onTake(final Player bec, final ItemStack bki) {
+        if (!bec.abilities.instabuild) {
+            bec.giveExperienceLevels(-this.cost.get());
+        }
+        this.inputSlots.setItem(0, ItemStack.EMPTY);
+        if (this.repairItemCountCost > 0) {
+            final ItemStack bki2 = this.inputSlots.getItem(1);
+            if (!bki2.isEmpty() && bki2.getCount() > this.repairItemCountCost) {
+                bki2.shrink(this.repairItemCountCost);
+                this.inputSlots.setItem(1, bki2);
+            }
+            else {
+                this.inputSlots.setItem(1, ItemStack.EMPTY);
+            }
+        }
+        else {
+            this.inputSlots.setItem(1, ItemStack.EMPTY);
+        }
+        this.cost.set(0);
+        final BlockState cfj4;
+        BlockState cfj5;
+        this.access.execute((bqb, fu) -> {
+            cfj4 = bqb.getBlockState(fu);
+            if (!bec.abilities.instabuild && cfj4.is(BlockTags.ANVIL) && bec.getRandom().nextFloat() < 0.12f) {
+                cfj5 = AnvilBlock.damage(cfj4);
+                if (cfj5 == null) {
+                    bqb.removeBlock(fu, false);
+                    bqb.levelEvent(1029, fu, 0);
+                }
+                else {
+                    bqb.setBlock(fu, cfj5, 2);
+                    bqb.levelEvent(1030, fu, 0);
+                }
+            }
+            else {
+                bqb.levelEvent(1030, fu, 0);
+            }
+            return;
+        });
+        return bki;
+    }
+    
+    @Override
     public void createResult() {
-        final ItemStack ben2 = this.repairSlots.getItem(0);
+        final ItemStack bki2 = this.inputSlots.getItem(0);
         this.cost.set(1);
         int integer3 = 0;
         int integer4 = 0;
         int integer5 = 0;
-        if (ben2.isEmpty()) {
+        if (bki2.isEmpty()) {
             this.resultSlots.setItem(0, ItemStack.EMPTY);
             this.cost.set(0);
             return;
         }
-        ItemStack ben3 = ben2.copy();
-        final ItemStack ben4 = this.repairSlots.getItem(1);
-        final Map<Enchantment, Integer> map8 = EnchantmentHelper.getEnchantments(ben3);
-        integer4 += ben2.getBaseRepairCost() + (ben4.isEmpty() ? 0 : ben4.getBaseRepairCost());
+        ItemStack bki3 = bki2.copy();
+        final ItemStack bki4 = this.inputSlots.getItem(1);
+        final Map<Enchantment, Integer> map8 = EnchantmentHelper.getEnchantments(bki3);
+        integer4 += bki2.getBaseRepairCost() + (bki4.isEmpty() ? 0 : bki4.getBaseRepairCost());
         this.repairItemCountCost = 0;
-        if (!ben4.isEmpty()) {
-            final boolean boolean9 = ben4.getItem() == Items.ENCHANTED_BOOK && !EnchantedBookItem.getEnchantments(ben4).isEmpty();
-            if (ben3.isDamageableItem() && ben3.getItem().isValidRepairItem(ben2, ben4)) {
-                int integer6 = Math.min(ben3.getDamageValue(), ben3.getMaxDamage() / 4);
+        if (!bki4.isEmpty()) {
+            final boolean boolean9 = bki4.getItem() == Items.ENCHANTED_BOOK && !EnchantedBookItem.getEnchantments(bki4).isEmpty();
+            if (bki3.isDamageableItem() && bki3.getItem().isValidRepairItem(bki2, bki4)) {
+                int integer6 = Math.min(bki3.getDamageValue(), bki3.getMaxDamage() / 4);
                 if (integer6 <= 0) {
                     this.resultSlots.setItem(0, ItemStack.EMPTY);
                     this.cost.set(0);
                     return;
                 }
                 int integer7;
-                for (integer7 = 0; integer6 > 0 && integer7 < ben4.getCount(); integer6 = Math.min(ben3.getDamageValue(), ben3.getMaxDamage() / 4), ++integer7) {
-                    final int integer8 = ben3.getDamageValue() - integer6;
-                    ben3.setDamageValue(integer8);
+                for (integer7 = 0; integer6 > 0 && integer7 < bki4.getCount(); integer6 = Math.min(bki3.getDamageValue(), bki3.getMaxDamage() / 4), ++integer7) {
+                    final int integer8 = bki3.getDamageValue() - integer6;
+                    bki3.setDamageValue(integer8);
                     ++integer3;
                 }
                 this.repairItemCountCost = integer7;
             }
             else {
-                if (!boolean9 && (ben3.getItem() != ben4.getItem() || !ben3.isDamageableItem())) {
+                if (!boolean9 && (bki3.getItem() != bki4.getItem() || !bki3.isDamageableItem())) {
                     this.resultSlots.setItem(0, ItemStack.EMPTY);
                     this.cost.set(0);
                     return;
                 }
-                if (ben3.isDamageableItem() && !boolean9) {
-                    final int integer6 = ben2.getMaxDamage() - ben2.getDamageValue();
-                    final int integer7 = ben4.getMaxDamage() - ben4.getDamageValue();
-                    final int integer8 = integer7 + ben3.getMaxDamage() * 12 / 100;
+                if (bki3.isDamageableItem() && !boolean9) {
+                    final int integer6 = bki2.getMaxDamage() - bki2.getDamageValue();
+                    final int integer7 = bki4.getMaxDamage() - bki4.getDamageValue();
+                    final int integer8 = integer7 + bki3.getMaxDamage() * 12 / 100;
                     final int integer9 = integer6 + integer8;
-                    int integer10 = ben3.getMaxDamage() - integer9;
+                    int integer10 = bki3.getMaxDamage() - integer9;
                     if (integer10 < 0) {
                         integer10 = 0;
                     }
-                    if (integer10 < ben3.getDamageValue()) {
-                        ben3.setDamageValue(integer10);
+                    if (integer10 < bki3.getDamageValue()) {
+                        bki3.setDamageValue(integer10);
                         integer3 += 2;
                     }
                 }
-                final Map<Enchantment, Integer> map9 = EnchantmentHelper.getEnchantments(ben4);
+                final Map<Enchantment, Integer> map9 = EnchantmentHelper.getEnchantments(bki4);
                 boolean boolean10 = false;
                 boolean boolean11 = false;
-                for (final Enchantment bhx14 : map9.keySet()) {
-                    if (bhx14 == null) {
+                for (final Enchantment bnw14 : map9.keySet()) {
+                    if (bnw14 == null) {
                         continue;
                     }
-                    final int integer11 = map8.containsKey(bhx14) ? map8.get(bhx14) : 0;
-                    int integer12 = map9.get(bhx14);
+                    final int integer11 = map8.getOrDefault(bnw14, 0);
+                    int integer12 = map9.get(bnw14);
                     integer12 = ((integer11 == integer12) ? (integer12 + 1) : Math.max(integer12, integer11));
-                    boolean boolean12 = bhx14.canEnchant(ben2);
-                    if (this.player.abilities.instabuild || ben2.getItem() == Items.ENCHANTED_BOOK) {
+                    boolean boolean12 = bnw14.canEnchant(bki2);
+                    if (this.player.abilities.instabuild || bki2.getItem() == Items.ENCHANTED_BOOK) {
                         boolean12 = true;
                     }
-                    for (final Enchantment bhx15 : map8.keySet()) {
-                        if (bhx15 != bhx14 && !bhx14.isCompatibleWith(bhx15)) {
+                    for (final Enchantment bnw15 : map8.keySet()) {
+                        if (bnw15 != bnw14 && !bnw14.isCompatibleWith(bnw15)) {
                             boolean12 = false;
                             ++integer3;
                         }
@@ -202,12 +169,12 @@ public class AnvilMenu extends AbstractContainerMenu {
                     }
                     else {
                         boolean10 = true;
-                        if (integer12 > bhx14.getMaxLevel()) {
-                            integer12 = bhx14.getMaxLevel();
+                        if (integer12 > bnw14.getMaxLevel()) {
+                            integer12 = bnw14.getMaxLevel();
                         }
-                        map8.put(bhx14, integer12);
+                        map8.put(bnw14, integer12);
                         int integer13 = 0;
-                        switch (bhx14.getRarity()) {
+                        switch (bnw14.getRarity()) {
                             case COMMON: {
                                 integer13 = 1;
                                 break;
@@ -229,7 +196,7 @@ public class AnvilMenu extends AbstractContainerMenu {
                             integer13 = Math.max(1, integer13 / 2);
                         }
                         integer3 += integer13 * integer12;
-                        if (ben2.getCount() <= 1) {
+                        if (bki2.getCount() <= 1) {
                             continue;
                         }
                         integer3 = 40;
@@ -243,39 +210,39 @@ public class AnvilMenu extends AbstractContainerMenu {
             }
         }
         if (StringUtils.isBlank((CharSequence)this.itemName)) {
-            if (ben2.hasCustomHoverName()) {
+            if (bki2.hasCustomHoverName()) {
                 integer5 = 1;
                 integer3 += integer5;
-                ben3.resetHoverName();
+                bki3.resetHoverName();
             }
         }
-        else if (!this.itemName.equals(ben2.getHoverName().getString())) {
+        else if (!this.itemName.equals(bki2.getHoverName().getString())) {
             integer5 = 1;
             integer3 += integer5;
-            ben3.setHoverName(new TextComponent(this.itemName));
+            bki3.setHoverName(new TextComponent(this.itemName));
         }
         this.cost.set(integer4 + integer3);
         if (integer3 <= 0) {
-            ben3 = ItemStack.EMPTY;
+            bki3 = ItemStack.EMPTY;
         }
         if (integer5 == integer3 && integer5 > 0 && this.cost.get() >= 40) {
             this.cost.set(39);
         }
         if (this.cost.get() >= 40 && !this.player.abilities.instabuild) {
-            ben3 = ItemStack.EMPTY;
+            bki3 = ItemStack.EMPTY;
         }
-        if (!ben3.isEmpty()) {
-            int integer14 = ben3.getBaseRepairCost();
-            if (!ben4.isEmpty() && integer14 < ben4.getBaseRepairCost()) {
-                integer14 = ben4.getBaseRepairCost();
+        if (!bki3.isEmpty()) {
+            int integer14 = bki3.getBaseRepairCost();
+            if (!bki4.isEmpty() && integer14 < bki4.getBaseRepairCost()) {
+                integer14 = bki4.getBaseRepairCost();
             }
             if (integer5 != integer3 || integer5 == 0) {
                 integer14 = calculateIncreasedRepairCost(integer14);
             }
-            ben3.setRepairCost(integer14);
-            EnchantmentHelper.setEnchantments(map8, ben3);
+            bki3.setRepairCost(integer14);
+            EnchantmentHelper.setEnchantments(map8, bki3);
         }
-        this.resultSlots.setItem(0, ben3);
+        this.resultSlots.setItem(0, bki3);
         this.broadcastChanges();
     }
     
@@ -283,68 +250,15 @@ public class AnvilMenu extends AbstractContainerMenu {
         return integer * 2 + 1;
     }
     
-    @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        this.access.execute((bjw, fk) -> this.clearContainer(ayj, bjw, this.repairSlots));
-    }
-    
-    @Override
-    public boolean stillValid(final Player ayj) {
-        return this.access.<Boolean>evaluate((bjw, fk) -> {
-            if (!bjw.getBlockState(fk).is(BlockTags.ANVIL)) {
-                return false;
-            }
-            else {
-                return ayj.distanceToSqr(fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5) <= 64.0;
-            }
-        }, Boolean.valueOf(true));
-    }
-    
-    @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
-            if (integer == 2) {
-                if (!this.moveItemStackTo(ben5, 3, 39, true)) {
-                    return ItemStack.EMPTY;
-                }
-                bca5.onQuickCraft(ben5, ben4);
-            }
-            else if (integer == 0 || integer == 1) {
-                if (!this.moveItemStackTo(ben5, 3, 39, false)) {
-                    return ItemStack.EMPTY;
-                }
-            }
-            else if (integer >= 3 && integer < 39 && !this.moveItemStackTo(ben5, 0, 2, false)) {
-                return ItemStack.EMPTY;
-            }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
-            }
-            else {
-                bca5.setChanged();
-            }
-            if (ben5.getCount() == ben4.getCount()) {
-                return ItemStack.EMPTY;
-            }
-            bca5.onTake(ayj, ben5);
-        }
-        return ben4;
-    }
-    
     public void setItemName(final String string) {
         this.itemName = string;
         if (this.getSlot(2).hasItem()) {
-            final ItemStack ben3 = this.getSlot(2).getItem();
+            final ItemStack bki3 = this.getSlot(2).getItem();
             if (StringUtils.isBlank((CharSequence)string)) {
-                ben3.resetHoverName();
+                bki3.resetHoverName();
             }
             else {
-                ben3.setHoverName(new TextComponent(this.itemName));
+                bki3.setHoverName(new TextComponent(this.itemName));
             }
         }
         this.createResult();
diff --git a/src/net/minecraft/world/inventory/BeaconMenu.java b/src/net/minecraft/world/inventory/BeaconMenu.java
index 4bd73cf..df99490 100644
--- a/src/net/minecraft/world/inventory/BeaconMenu.java
+++ b/src/net/minecraft/world/inventory/BeaconMenu.java
@@ -1,11 +1,12 @@
 package net.minecraft.world.inventory;
 
-import net.minecraft.world.item.Item;
 import javax.annotation.Nullable;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Items;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.Container;
@@ -16,16 +17,16 @@ public class BeaconMenu extends AbstractContainerMenu {
     private final ContainerLevelAccess access;
     private final ContainerData beaconData;
     
-    public BeaconMenu(final int integer, final Container aje) {
-        this(integer, aje, new SimpleContainerData(3), ContainerLevelAccess.NULL);
+    public BeaconMenu(final int integer, final Container amz) {
+        this(integer, amz, new SimpleContainerData(3), ContainerLevelAccess.NULL);
     }
     
-    public BeaconMenu(final int integer, final Container aje, final ContainerData baw, final ContainerLevelAccess bax) {
+    public BeaconMenu(final int integer, final Container amz, final ContainerData bgr, final ContainerLevelAccess bgs) {
         super(MenuType.BEACON, integer);
         this.beacon = new SimpleContainer(1) {
             @Override
-            public boolean canPlaceItem(final int integer, final ItemStack ben) {
-                return ben.getItem() == Items.EMERALD || ben.getItem() == Items.DIAMOND || ben.getItem() == Items.GOLD_INGOT || ben.getItem() == Items.IRON_INGOT;
+            public boolean canPlaceItem(final int integer, final ItemStack bki) {
+                return bki.getItem().is(ItemTags.BEACON_PAYMENT_ITEMS);
             }
             
             @Override
@@ -33,38 +34,38 @@ public class BeaconMenu extends AbstractContainerMenu {
                 return 1;
             }
         };
-        AbstractContainerMenu.checkContainerDataCount(baw, 3);
-        this.beaconData = baw;
-        this.access = bax;
+        AbstractContainerMenu.checkContainerDataCount(bgr, 3);
+        this.beaconData = bgr;
+        this.access = bgs;
         this.addSlot(this.paymentSlot = new PaymentSlot(this.beacon, 0, 136, 110));
-        this.addDataSlots(baw);
+        this.addDataSlots(bgr);
         final int integer2 = 36;
         final int integer3 = 137;
         for (int integer4 = 0; integer4 < 3; ++integer4) {
             for (int integer5 = 0; integer5 < 9; ++integer5) {
-                this.addSlot(new Slot(aje, integer5 + integer4 * 9 + 9, 36 + integer5 * 18, 137 + integer4 * 18));
+                this.addSlot(new Slot(amz, integer5 + integer4 * 9 + 9, 36 + integer5 * 18, 137 + integer4 * 18));
             }
         }
         for (int integer4 = 0; integer4 < 9; ++integer4) {
-            this.addSlot(new Slot(aje, integer4, 36 + integer4 * 18, 195));
+            this.addSlot(new Slot(amz, integer4, 36 + integer4 * 18, 195));
         }
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        if (ayj.level.isClientSide) {
+    public void removed(final Player bec) {
+        super.removed(bec);
+        if (bec.level.isClientSide) {
             return;
         }
-        final ItemStack ben3 = this.paymentSlot.remove(this.paymentSlot.getMaxStackSize());
-        if (!ben3.isEmpty()) {
-            ayj.drop(ben3, false);
+        final ItemStack bki3 = this.paymentSlot.remove(this.paymentSlot.getMaxStackSize());
+        if (!bki3.isEmpty()) {
+            bec.drop(bki3, false);
         }
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return AbstractContainerMenu.stillValid(this.access, ayj, Blocks.BEACON);
+    public boolean stillValid(final Player bec) {
+        return AbstractContainerMenu.stillValid(this.access, bec, Blocks.BEACON);
     }
     
     @Override
@@ -74,48 +75,48 @@ public class BeaconMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if (integer == 0) {
-                if (!this.moveItemStackTo(ben5, 1, 37, true)) {
+                if (!this.moveItemStackTo(bki5, 1, 37, true)) {
                     return ItemStack.EMPTY;
                 }
-                bca5.onQuickCraft(ben5, ben4);
+                bhw5.onQuickCraft(bki5, bki4);
             }
-            else if (!this.paymentSlot.hasItem() && this.paymentSlot.mayPlace(ben5) && ben5.getCount() == 1) {
-                if (!this.moveItemStackTo(ben5, 0, 1, false)) {
+            else if (!this.paymentSlot.hasItem() && this.paymentSlot.mayPlace(bki5) && bki5.getCount() == 1) {
+                if (!this.moveItemStackTo(bki5, 0, 1, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 1 && integer < 28) {
-                if (!this.moveItemStackTo(ben5, 28, 37, false)) {
+                if (!this.moveItemStackTo(bki5, 28, 37, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 28 && integer < 37) {
-                if (!this.moveItemStackTo(ben5, 1, 28, false)) {
+                if (!this.moveItemStackTo(bki5, 1, 28, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (!this.moveItemStackTo(ben5, 1, 37, false)) {
+            else if (!this.moveItemStackTo(bki5, 1, 37, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
-            if (ben5.getCount() == ben4.getCount()) {
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            bca5.onTake(ayj, ben5);
+            bhw5.onTake(bec, bki5);
         }
-        return ben4;
+        return bki4;
     }
     
     public int getLevels() {
@@ -145,14 +146,13 @@ public class BeaconMenu extends AbstractContainerMenu {
     }
     
     class PaymentSlot extends Slot {
-        public PaymentSlot(final Container aje, final int integer3, final int integer4, final int integer5) {
-            super(aje, integer3, integer4, integer5);
+        public PaymentSlot(final Container amz, final int integer3, final int integer4, final int integer5) {
+            super(amz, integer3, integer4, integer5);
         }
         
         @Override
-        public boolean mayPlace(final ItemStack ben) {
-            final Item bei3 = ben.getItem();
-            return bei3 == Items.EMERALD || bei3 == Items.DIAMOND || bei3 == Items.GOLD_INGOT || bei3 == Items.IRON_INGOT;
+        public boolean mayPlace(final ItemStack bki) {
+            return bki.getItem().is(ItemTags.BEACON_PAYMENT_ITEMS);
         }
         
         @Override
diff --git a/src/net/minecraft/world/inventory/BlastFurnaceMenu.java b/src/net/minecraft/world/inventory/BlastFurnaceMenu.java
index 83bd689..0c9efd1 100644
--- a/src/net/minecraft/world/inventory/BlastFurnaceMenu.java
+++ b/src/net/minecraft/world/inventory/BlastFurnaceMenu.java
@@ -6,11 +6,11 @@ import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.entity.player.Inventory;
 
 public class BlastFurnaceMenu extends AbstractFurnaceMenu {
-    public BlastFurnaceMenu(final int integer, final Inventory ayi) {
-        super(MenuType.BLAST_FURNACE, RecipeType.BLASTING, integer, ayi);
+    public BlastFurnaceMenu(final int integer, final Inventory beb) {
+        super(MenuType.BLAST_FURNACE, RecipeType.BLASTING, integer, beb);
     }
     
-    public BlastFurnaceMenu(final int integer, final Inventory ayi, final Container aje, final ContainerData baw) {
-        super(MenuType.BLAST_FURNACE, RecipeType.BLASTING, integer, ayi, aje, baw);
+    public BlastFurnaceMenu(final int integer, final Inventory beb, final Container amz, final ContainerData bgr) {
+        super(MenuType.BLAST_FURNACE, RecipeType.BLASTING, integer, beb, amz, bgr);
     }
 }
diff --git a/src/net/minecraft/world/inventory/BrewingStandMenu.java b/src/net/minecraft/world/inventory/BrewingStandMenu.java
index fa6926d..f5fa102 100644
--- a/src/net/minecraft/world/inventory/BrewingStandMenu.java
+++ b/src/net/minecraft/world/inventory/BrewingStandMenu.java
@@ -18,90 +18,90 @@ public class BrewingStandMenu extends AbstractContainerMenu {
     private final ContainerData brewingStandData;
     private final Slot ingredientSlot;
     
-    public BrewingStandMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, new SimpleContainer(5), new SimpleContainerData(2));
+    public BrewingStandMenu(final int integer, final Inventory beb) {
+        this(integer, beb, new SimpleContainer(5), new SimpleContainerData(2));
     }
     
-    public BrewingStandMenu(final int integer, final Inventory ayi, final Container aje, final ContainerData baw) {
+    public BrewingStandMenu(final int integer, final Inventory beb, final Container amz, final ContainerData bgr) {
         super(MenuType.BREWING_STAND, integer);
-        AbstractContainerMenu.checkContainerSize(aje, 5);
-        AbstractContainerMenu.checkContainerDataCount(baw, 2);
-        this.brewingStand = aje;
-        this.brewingStandData = baw;
-        this.addSlot(new PotionSlot(aje, 0, 56, 51));
-        this.addSlot(new PotionSlot(aje, 1, 79, 58));
-        this.addSlot(new PotionSlot(aje, 2, 102, 51));
-        this.ingredientSlot = this.addSlot(new IngredientsSlot(aje, 3, 79, 17));
-        this.addSlot(new FuelSlot(aje, 4, 17, 17));
-        this.addDataSlots(baw);
+        AbstractContainerMenu.checkContainerSize(amz, 5);
+        AbstractContainerMenu.checkContainerDataCount(bgr, 2);
+        this.brewingStand = amz;
+        this.brewingStandData = bgr;
+        this.addSlot(new PotionSlot(amz, 0, 56, 51));
+        this.addSlot(new PotionSlot(amz, 1, 79, 58));
+        this.addSlot(new PotionSlot(amz, 2, 102, 51));
+        this.ingredientSlot = this.addSlot(new IngredientsSlot(amz, 3, 79, 17));
+        this.addSlot(new FuelSlot(amz, 4, 17, 17));
+        this.addDataSlots(bgr);
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 8 + integer2 * 18, 142));
+            this.addSlot(new Slot(beb, integer2, 8 + integer2 * 18, 142));
         }
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.brewingStand.stillValid(ayj);
+    public boolean stillValid(final Player bec) {
+        return this.brewingStand.stillValid(bec);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if ((integer >= 0 && integer <= 2) || integer == 3 || integer == 4) {
-                if (!this.moveItemStackTo(ben5, 5, 41, true)) {
+                if (!this.moveItemStackTo(bki5, 5, 41, true)) {
                     return ItemStack.EMPTY;
                 }
-                bca5.onQuickCraft(ben5, ben4);
+                bhw5.onQuickCraft(bki5, bki4);
             }
-            else if (FuelSlot.mayPlaceItem(ben4)) {
-                if (this.moveItemStackTo(ben5, 4, 5, false) || (this.ingredientSlot.mayPlace(ben5) && !this.moveItemStackTo(ben5, 3, 4, false))) {
+            else if (FuelSlot.mayPlaceItem(bki4)) {
+                if (this.moveItemStackTo(bki5, 4, 5, false) || (this.ingredientSlot.mayPlace(bki5) && !this.moveItemStackTo(bki5, 3, 4, false))) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (this.ingredientSlot.mayPlace(ben5)) {
-                if (!this.moveItemStackTo(ben5, 3, 4, false)) {
+            else if (this.ingredientSlot.mayPlace(bki5)) {
+                if (!this.moveItemStackTo(bki5, 3, 4, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (PotionSlot.mayPlaceItem(ben4) && ben4.getCount() == 1) {
-                if (!this.moveItemStackTo(ben5, 0, 3, false)) {
+            else if (PotionSlot.mayPlaceItem(bki4) && bki4.getCount() == 1) {
+                if (!this.moveItemStackTo(bki5, 0, 3, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 5 && integer < 32) {
-                if (!this.moveItemStackTo(ben5, 32, 41, false)) {
+                if (!this.moveItemStackTo(bki5, 32, 41, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 32 && integer < 41) {
-                if (!this.moveItemStackTo(ben5, 5, 32, false)) {
+                if (!this.moveItemStackTo(bki5, 5, 32, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (!this.moveItemStackTo(ben5, 5, 41, false)) {
+            else if (!this.moveItemStackTo(bki5, 5, 41, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
-            if (ben5.getCount() == ben4.getCount()) {
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            bca5.onTake(ayj, ben5);
+            bhw5.onTake(bec, bki5);
         }
-        return ben4;
+        return bki4;
     }
     
     public int getFuel() {
@@ -113,13 +113,13 @@ public class BrewingStandMenu extends AbstractContainerMenu {
     }
     
     static class PotionSlot extends Slot {
-        public PotionSlot(final Container aje, final int integer2, final int integer3, final int integer4) {
-            super(aje, integer2, integer3, integer4);
+        public PotionSlot(final Container amz, final int integer2, final int integer3, final int integer4) {
+            super(amz, integer2, integer3, integer4);
         }
         
         @Override
-        public boolean mayPlace(final ItemStack ben) {
-            return mayPlaceItem(ben);
+        public boolean mayPlace(final ItemStack bki) {
+            return mayPlaceItem(bki);
         }
         
         @Override
@@ -128,29 +128,29 @@ public class BrewingStandMenu extends AbstractContainerMenu {
         }
         
         @Override
-        public ItemStack onTake(final Player ayj, final ItemStack ben) {
-            final Potion bgd4 = PotionUtils.getPotion(ben);
-            if (ayj instanceof ServerPlayer) {
-                CriteriaTriggers.BREWED_POTION.trigger((ServerPlayer)ayj, bgd4);
+        public ItemStack onTake(final Player bec, final ItemStack bki) {
+            final Potion bmb4 = PotionUtils.getPotion(bki);
+            if (bec instanceof ServerPlayer) {
+                CriteriaTriggers.BREWED_POTION.trigger((ServerPlayer)bec, bmb4);
             }
-            super.onTake(ayj, ben);
-            return ben;
+            super.onTake(bec, bki);
+            return bki;
         }
         
-        public static boolean mayPlaceItem(final ItemStack ben) {
-            final Item bei2 = ben.getItem();
-            return bei2 == Items.POTION || bei2 == Items.SPLASH_POTION || bei2 == Items.LINGERING_POTION || bei2 == Items.GLASS_BOTTLE;
+        public static boolean mayPlaceItem(final ItemStack bki) {
+            final Item bke2 = bki.getItem();
+            return bke2 == Items.POTION || bke2 == Items.SPLASH_POTION || bke2 == Items.LINGERING_POTION || bke2 == Items.GLASS_BOTTLE;
         }
     }
     
     static class IngredientsSlot extends Slot {
-        public IngredientsSlot(final Container aje, final int integer2, final int integer3, final int integer4) {
-            super(aje, integer2, integer3, integer4);
+        public IngredientsSlot(final Container amz, final int integer2, final int integer3, final int integer4) {
+            super(amz, integer2, integer3, integer4);
         }
         
         @Override
-        public boolean mayPlace(final ItemStack ben) {
-            return PotionBrewing.isIngredient(ben);
+        public boolean mayPlace(final ItemStack bki) {
+            return PotionBrewing.isIngredient(bki);
         }
         
         @Override
@@ -160,17 +160,17 @@ public class BrewingStandMenu extends AbstractContainerMenu {
     }
     
     static class FuelSlot extends Slot {
-        public FuelSlot(final Container aje, final int integer2, final int integer3, final int integer4) {
-            super(aje, integer2, integer3, integer4);
+        public FuelSlot(final Container amz, final int integer2, final int integer3, final int integer4) {
+            super(amz, integer2, integer3, integer4);
         }
         
         @Override
-        public boolean mayPlace(final ItemStack ben) {
-            return mayPlaceItem(ben);
+        public boolean mayPlace(final ItemStack bki) {
+            return mayPlaceItem(bki);
         }
         
-        public static boolean mayPlaceItem(final ItemStack ben) {
-            return ben.getItem() == Items.BLAZE_POWDER;
+        public static boolean mayPlaceItem(final ItemStack bki) {
+            return bki.getItem() == Items.BLAZE_POWDER;
         }
         
         @Override
diff --git a/src/net/minecraft/world/inventory/CartographyTableMenu.java b/src/net/minecraft/world/inventory/CartographyTableMenu.java
index 8f93f35..311ee5f 100644
--- a/src/net/minecraft/world/inventory/CartographyTableMenu.java
+++ b/src/net/minecraft/world/inventory/CartographyTableMenu.java
@@ -22,11 +22,11 @@ public class CartographyTableMenu extends AbstractContainerMenu {
     public final Container container;
     private final ResultContainer resultContainer;
     
-    public CartographyTableMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, ContainerLevelAccess.NULL);
+    public CartographyTableMenu(final int integer, final Inventory beb) {
+        this(integer, beb, ContainerLevelAccess.NULL);
     }
     
-    public CartographyTableMenu(final int integer, final Inventory ayi, final ContainerLevelAccess bax) {
+    public CartographyTableMenu(final int integer, final Inventory beb, final ContainerLevelAccess bgs) {
         super(MenuType.CARTOGRAPHY_TABLE, integer);
         this.container = new SimpleContainer(2) {
             @Override
@@ -42,117 +42,117 @@ public class CartographyTableMenu extends AbstractContainerMenu {
                 super.setChanged();
             }
         };
-        this.access = bax;
+        this.access = bgs;
         this.addSlot(new Slot(this.container, 0, 15, 15) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
-                return ben.getItem() == Items.FILLED_MAP;
+            public boolean mayPlace(final ItemStack bki) {
+                return bki.getItem() == Items.FILLED_MAP;
             }
         });
         this.addSlot(new Slot(this.container, 1, 15, 52) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
-                final Item bei3 = ben.getItem();
-                return bei3 == Items.PAPER || bei3 == Items.MAP || bei3 == Items.GLASS_PANE;
+            public boolean mayPlace(final ItemStack bki) {
+                final Item bke3 = bki.getItem();
+                return bke3 == Items.PAPER || bke3 == Items.MAP || bke3 == Items.GLASS_PANE;
             }
         });
         this.addSlot(new Slot(this.resultContainer, 2, 145, 39) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
+            public boolean mayPlace(final ItemStack bki) {
                 return false;
             }
             
             @Override
             public ItemStack remove(final int integer) {
-                final ItemStack ben3 = super.remove(integer);
-                ItemStack ben5;
+                final ItemStack bki3 = super.remove(integer);
+                ItemStack bki5;
                 final ItemStack itemStack;
-                final ItemStack ben4 = bax.<ItemStack>evaluate((bjw, fk) -> {
+                final ItemStack bki4 = bgs.<ItemStack>evaluate((bqb, fu) -> {
                     if (!CartographyTableMenu.this.quickMoved && CartographyTableMenu.this.container.getItem(1).getItem() == Items.GLASS_PANE) {
-                        ben5 = MapItem.lockMap(bjw, CartographyTableMenu.this.container.getItem(0));
-                        if (ben5 != null) {
-                            ben5.setCount(1);
-                            return ben5;
+                        bki5 = MapItem.lockMap(bqb, CartographyTableMenu.this.container.getItem(0));
+                        if (bki5 != null) {
+                            bki5.setCount(1);
+                            return bki5;
                         }
                     }
                     return itemStack;
-                }).orElse(ben3);
+                }).orElse(bki3);
                 CartographyTableMenu.this.container.removeItem(0, 1);
                 CartographyTableMenu.this.container.removeItem(1, 1);
-                return ben4;
+                return bki4;
             }
             
             @Override
-            protected void onQuickCraft(final ItemStack ben, final int integer) {
+            protected void onQuickCraft(final ItemStack bki, final int integer) {
                 this.remove(integer);
-                super.onQuickCraft(ben, integer);
+                super.onQuickCraft(bki, integer);
             }
             
             @Override
-            public ItemStack onTake(final Player ayj, final ItemStack ben) {
-                ben.getItem().onCraftedBy(ben, ayj.level, ayj);
+            public ItemStack onTake(final Player bec, final ItemStack bki) {
+                bki.getItem().onCraftedBy(bki, bec.level, bec);
                 final long long4;
-                bax.execute((bjw, fk) -> {
-                    long4 = bjw.getGameTime();
+                bgs.execute((bqb, fu) -> {
+                    long4 = bqb.getGameTime();
                     if (CartographyTableMenu.this.lastSoundTime != long4) {
-                        bjw.playSound(null, fk, SoundEvents.UI_CARTOGRAPHY_TABLE_TAKE_RESULT, SoundSource.BLOCKS, 1.0f, 1.0f);
+                        bqb.playSound(null, fu, SoundEvents.UI_CARTOGRAPHY_TABLE_TAKE_RESULT, SoundSource.BLOCKS, 1.0f, 1.0f);
                         CartographyTableMenu.this.lastSoundTime = long4;
                     }
                     return;
                 });
-                return super.onTake(ayj, ben);
+                return super.onTake(bec, bki);
             }
         });
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 8 + integer2 * 18, 142));
+            this.addSlot(new Slot(beb, integer2, 8 + integer2 * 18, 142));
         }
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return AbstractContainerMenu.stillValid(this.access, ayj, Blocks.CARTOGRAPHY_TABLE);
+    public boolean stillValid(final Player bec) {
+        return AbstractContainerMenu.stillValid(this.access, bec, Blocks.CARTOGRAPHY_TABLE);
     }
     
     @Override
-    public void slotsChanged(final Container aje) {
-        final ItemStack ben3 = this.container.getItem(0);
-        final ItemStack ben4 = this.container.getItem(1);
-        final ItemStack ben5 = this.resultContainer.getItem(2);
-        if (!ben5.isEmpty() && (ben3.isEmpty() || ben4.isEmpty())) {
+    public void slotsChanged(final Container amz) {
+        final ItemStack bki3 = this.container.getItem(0);
+        final ItemStack bki4 = this.container.getItem(1);
+        final ItemStack bki5 = this.resultContainer.getItem(2);
+        if (!bki5.isEmpty() && (bki3.isEmpty() || bki4.isEmpty())) {
             this.resultContainer.removeItemNoUpdate(2);
         }
-        else if (!ben3.isEmpty() && !ben4.isEmpty()) {
-            this.setupResultSlot(ben3, ben4, ben5);
+        else if (!bki3.isEmpty() && !bki4.isEmpty()) {
+            this.setupResultSlot(bki3, bki4, bki5);
         }
     }
     
-    private void setupResultSlot(final ItemStack ben1, final ItemStack ben2, final ItemStack ben3) {
-        final Item bei7;
-        final MapItemSavedData crg8;
-        ItemStack ben4;
-        this.access.execute((bjw, fk) -> {
-            bei7 = ben2.getItem();
-            crg8 = MapItem.getSavedData(ben1, bjw);
-            if (crg8 != null) {
-                if (bei7 == Items.PAPER && !crg8.locked && crg8.scale < 4) {
-                    ben4 = ben1.copy();
-                    ben4.setCount(1);
-                    ben4.getOrCreateTag().putInt("map_scale_direction", 1);
+    private void setupResultSlot(final ItemStack bki1, final ItemStack bki2, final ItemStack bki3) {
+        final Item bke7;
+        final MapItemSavedData czv8;
+        ItemStack bki4;
+        this.access.execute((bqb, fu) -> {
+            bke7 = bki2.getItem();
+            czv8 = MapItem.getSavedData(bki1, bqb);
+            if (czv8 != null) {
+                if (bke7 == Items.PAPER && !czv8.locked && czv8.scale < 4) {
+                    bki4 = bki1.copy();
+                    bki4.setCount(1);
+                    bki4.getOrCreateTag().putInt("map_scale_direction", 1);
                     this.broadcastChanges();
                 }
-                else if (bei7 == Items.GLASS_PANE && !crg8.locked) {
-                    ben4 = ben1.copy();
-                    ben4.setCount(1);
+                else if (bke7 == Items.GLASS_PANE && !czv8.locked) {
+                    bki4 = bki1.copy();
+                    bki4.setCount(1);
                     this.broadcastChanges();
                 }
-                else if (bei7 == Items.MAP) {
-                    ben4 = ben1.copy();
-                    ben4.setCount(2);
+                else if (bke7 == Items.MAP) {
+                    bki4 = bki1.copy();
+                    bki4.setCount(2);
                     this.broadcastChanges();
                 }
                 else {
@@ -160,8 +160,8 @@ public class CartographyTableMenu extends AbstractContainerMenu {
                     this.broadcastChanges();
                     return;
                 }
-                if (!ItemStack.matches(ben4, ben3)) {
-                    this.resultContainer.setItem(2, ben4);
+                if (!ItemStack.matches(bki4, bki3)) {
+                    this.resultContainer.setItem(2, bki4);
                     this.broadcastChanges();
                 }
             }
@@ -169,82 +169,82 @@ public class CartographyTableMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public boolean canTakeItemForPickAll(final ItemStack ben, final Slot bca) {
-        return bca.container != this.resultContainer && super.canTakeItemForPickAll(ben, bca);
+    public boolean canTakeItemForPickAll(final ItemStack bki, final Slot bhw) {
+        return bhw.container != this.resultContainer && super.canTakeItemForPickAll(bki, bhw);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            ItemStack ben6;
-            final ItemStack ben5 = ben6 = bca5.getItem();
-            final Item bei8 = ben6.getItem();
-            ben4 = ben6.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            ItemStack bki6;
+            final ItemStack bki5 = bki6 = bhw5.getItem();
+            final Item bke8 = bki6.getItem();
+            bki4 = bki6.copy();
             if (integer == 2) {
                 if (this.container.getItem(1).getItem() == Items.GLASS_PANE) {
-                    final ItemStack ben7;
+                    final ItemStack bki7;
                     final ItemStack itemStack;
-                    ben6 = this.access.<ItemStack>evaluate((bjw, fk) -> {
-                        ben7 = MapItem.lockMap(bjw, this.container.getItem(0));
-                        if (ben7 != null) {
-                            ben7.setCount(1);
-                            return ben7;
+                    bki6 = this.access.<ItemStack>evaluate((bqb, fu) -> {
+                        bki7 = MapItem.lockMap(bqb, this.container.getItem(0));
+                        if (bki7 != null) {
+                            bki7.setCount(1);
+                            return bki7;
                         }
                         else {
                             return itemStack;
                         }
-                    }).orElse(ben6);
+                    }).orElse(bki6);
                 }
-                bei8.onCraftedBy(ben6, ayj.level, ayj);
-                if (!this.moveItemStackTo(ben6, 3, 39, true)) {
+                bke8.onCraftedBy(bki6, bec.level, bec);
+                if (!this.moveItemStackTo(bki6, 3, 39, true)) {
                     return ItemStack.EMPTY;
                 }
-                bca5.onQuickCraft(ben6, ben4);
+                bhw5.onQuickCraft(bki6, bki4);
             }
             else if (integer == 1 || integer == 0) {
-                if (!this.moveItemStackTo(ben6, 3, 39, false)) {
+                if (!this.moveItemStackTo(bki6, 3, 39, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (bei8 == Items.FILLED_MAP) {
-                if (!this.moveItemStackTo(ben6, 0, 1, false)) {
+            else if (bke8 == Items.FILLED_MAP) {
+                if (!this.moveItemStackTo(bki6, 0, 1, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (bei8 == Items.PAPER || bei8 == Items.MAP || bei8 == Items.GLASS_PANE) {
-                if (!this.moveItemStackTo(ben6, 1, 2, false)) {
+            else if (bke8 == Items.PAPER || bke8 == Items.MAP || bke8 == Items.GLASS_PANE) {
+                if (!this.moveItemStackTo(bki6, 1, 2, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 3 && integer < 30) {
-                if (!this.moveItemStackTo(ben6, 30, 39, false)) {
+                if (!this.moveItemStackTo(bki6, 30, 39, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (integer >= 30 && integer < 39 && !this.moveItemStackTo(ben6, 3, 30, false)) {
+            else if (integer >= 30 && integer < 39 && !this.moveItemStackTo(bki6, 3, 30, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben6.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki6.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
-            bca5.setChanged();
-            if (ben6.getCount() == ben4.getCount()) {
+            bhw5.setChanged();
+            if (bki6.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
             this.quickMoved = true;
-            bca5.onTake(ayj, ben6);
+            bhw5.onTake(bec, bki6);
             this.quickMoved = false;
             this.broadcastChanges();
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
+    public void removed(final Player bec) {
+        super.removed(bec);
         this.resultContainer.removeItemNoUpdate(2);
-        this.access.execute((bjw, fk) -> this.clearContainer(ayj, ayj.level, this.container));
+        this.access.execute((bqb, fu) -> this.clearContainer(bec, bec.level, this.container));
     }
 }
diff --git a/src/net/minecraft/world/inventory/ChestMenu.java b/src/net/minecraft/world/inventory/ChestMenu.java
index 5e454f8..63bdf4f 100644
--- a/src/net/minecraft/world/inventory/ChestMenu.java
+++ b/src/net/minecraft/world/inventory/ChestMenu.java
@@ -10,98 +10,98 @@ public class ChestMenu extends AbstractContainerMenu {
     private final Container container;
     private final int containerRows;
     
-    private ChestMenu(final MenuType<?> bbo, final int integer2, final Inventory ayi, final int integer4) {
-        this(bbo, integer2, ayi, new SimpleContainer(9 * integer4), integer4);
+    private ChestMenu(final MenuType<?> bhk, final int integer2, final Inventory beb, final int integer4) {
+        this(bhk, integer2, beb, new SimpleContainer(9 * integer4), integer4);
     }
     
-    public static ChestMenu oneRow(final int integer, final Inventory ayi) {
-        return new ChestMenu(MenuType.GENERIC_9x1, integer, ayi, 1);
+    public static ChestMenu oneRow(final int integer, final Inventory beb) {
+        return new ChestMenu(MenuType.GENERIC_9x1, integer, beb, 1);
     }
     
-    public static ChestMenu twoRows(final int integer, final Inventory ayi) {
-        return new ChestMenu(MenuType.GENERIC_9x2, integer, ayi, 2);
+    public static ChestMenu twoRows(final int integer, final Inventory beb) {
+        return new ChestMenu(MenuType.GENERIC_9x2, integer, beb, 2);
     }
     
-    public static ChestMenu threeRows(final int integer, final Inventory ayi) {
-        return new ChestMenu(MenuType.GENERIC_9x3, integer, ayi, 3);
+    public static ChestMenu threeRows(final int integer, final Inventory beb) {
+        return new ChestMenu(MenuType.GENERIC_9x3, integer, beb, 3);
     }
     
-    public static ChestMenu fourRows(final int integer, final Inventory ayi) {
-        return new ChestMenu(MenuType.GENERIC_9x4, integer, ayi, 4);
+    public static ChestMenu fourRows(final int integer, final Inventory beb) {
+        return new ChestMenu(MenuType.GENERIC_9x4, integer, beb, 4);
     }
     
-    public static ChestMenu fiveRows(final int integer, final Inventory ayi) {
-        return new ChestMenu(MenuType.GENERIC_9x5, integer, ayi, 5);
+    public static ChestMenu fiveRows(final int integer, final Inventory beb) {
+        return new ChestMenu(MenuType.GENERIC_9x5, integer, beb, 5);
     }
     
-    public static ChestMenu sixRows(final int integer, final Inventory ayi) {
-        return new ChestMenu(MenuType.GENERIC_9x6, integer, ayi, 6);
+    public static ChestMenu sixRows(final int integer, final Inventory beb) {
+        return new ChestMenu(MenuType.GENERIC_9x6, integer, beb, 6);
     }
     
-    public static ChestMenu threeRows(final int integer, final Inventory ayi, final Container aje) {
-        return new ChestMenu(MenuType.GENERIC_9x3, integer, ayi, aje, 3);
+    public static ChestMenu threeRows(final int integer, final Inventory beb, final Container amz) {
+        return new ChestMenu(MenuType.GENERIC_9x3, integer, beb, amz, 3);
     }
     
-    public static ChestMenu sixRows(final int integer, final Inventory ayi, final Container aje) {
-        return new ChestMenu(MenuType.GENERIC_9x6, integer, ayi, aje, 6);
+    public static ChestMenu sixRows(final int integer, final Inventory beb, final Container amz) {
+        return new ChestMenu(MenuType.GENERIC_9x6, integer, beb, amz, 6);
     }
     
-    public ChestMenu(final MenuType<?> bbo, final int integer2, final Inventory ayi, final Container aje, final int integer5) {
-        super(bbo, integer2);
-        AbstractContainerMenu.checkContainerSize(aje, integer5 * 9);
-        this.container = aje;
+    public ChestMenu(final MenuType<?> bhk, final int integer2, final Inventory beb, final Container amz, final int integer5) {
+        super(bhk, integer2);
+        AbstractContainerMenu.checkContainerSize(amz, integer5 * 9);
+        this.container = amz;
         this.containerRows = integer5;
-        aje.startOpen(ayi.player);
+        amz.startOpen(beb.player);
         final int integer6 = (this.containerRows - 4) * 18;
         for (int integer7 = 0; integer7 < this.containerRows; ++integer7) {
             for (int integer8 = 0; integer8 < 9; ++integer8) {
-                this.addSlot(new Slot(aje, integer8 + integer7 * 9, 8 + integer8 * 18, 18 + integer7 * 18));
+                this.addSlot(new Slot(amz, integer8 + integer7 * 9, 8 + integer8 * 18, 18 + integer7 * 18));
             }
         }
         for (int integer7 = 0; integer7 < 3; ++integer7) {
             for (int integer8 = 0; integer8 < 9; ++integer8) {
-                this.addSlot(new Slot(ayi, integer8 + integer7 * 9 + 9, 8 + integer8 * 18, 103 + integer7 * 18 + integer6));
+                this.addSlot(new Slot(beb, integer8 + integer7 * 9 + 9, 8 + integer8 * 18, 103 + integer7 * 18 + integer6));
             }
         }
         for (int integer7 = 0; integer7 < 9; ++integer7) {
-            this.addSlot(new Slot(ayi, integer7, 8 + integer7 * 18, 161 + integer6));
+            this.addSlot(new Slot(beb, integer7, 8 + integer7 * 18, 161 + integer6));
         }
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.container.stillValid(ayj);
+    public boolean stillValid(final Player bec) {
+        return this.container.stillValid(bec);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if (integer < this.containerRows * 9) {
-                if (!this.moveItemStackTo(ben5, this.containerRows * 9, this.slots.size(), true)) {
+                if (!this.moveItemStackTo(bki5, this.containerRows * 9, this.slots.size(), true)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (!this.moveItemStackTo(ben5, 0, this.containerRows * 9, false)) {
+            else if (!this.moveItemStackTo(bki5, 0, this.containerRows * 9, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        this.container.stopOpen(ayj);
+    public void removed(final Player bec) {
+        super.removed(bec);
+        this.container.stopOpen(bec);
     }
     
     public Container getContainer() {
diff --git a/src/net/minecraft/world/inventory/ContainerLevelAccess.java b/src/net/minecraft/world/inventory/ContainerLevelAccess.java
index a8abd63..ff77b52 100644
--- a/src/net/minecraft/world/inventory/ContainerLevelAccess.java
+++ b/src/net/minecraft/world/inventory/ContainerLevelAccess.java
@@ -14,11 +14,11 @@ public interface ContainerLevelAccess {
         }
     };
     
-    default ContainerLevelAccess create(final Level bjw, final BlockPos fk) {
+    default ContainerLevelAccess create(final Level bqb, final BlockPos fu) {
         return new ContainerLevelAccess() {
             @Override
             public <T> Optional<T> evaluate(final BiFunction<Level, BlockPos, T> biFunction) {
-                return Optional.<T>of(biFunction.apply(bjw, fk));
+                return Optional.<T>of(biFunction.apply(bqb, fu));
             }
         };
     }
@@ -30,8 +30,8 @@ public interface ContainerLevelAccess {
     }
     
     default void execute(final BiConsumer<Level, BlockPos> biConsumer) {
-        this.<Optional<Object>>evaluate((bjw, fk) -> {
-            biConsumer.accept(bjw, fk);
+        this.<Optional<Object>>evaluate((bqb, fu) -> {
+            biConsumer.accept(bqb, fu);
             return Optional.empty();
         });
     }
diff --git a/src/net/minecraft/world/inventory/ContainerListener.java b/src/net/minecraft/world/inventory/ContainerListener.java
index 88ac9e9..8258f28 100644
--- a/src/net/minecraft/world/inventory/ContainerListener.java
+++ b/src/net/minecraft/world/inventory/ContainerListener.java
@@ -4,9 +4,9 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.NonNullList;
 
 public interface ContainerListener {
-    void refreshContainer(final AbstractContainerMenu ban, final NonNullList<ItemStack> fy);
+    void refreshContainer(final AbstractContainerMenu bgi, final NonNullList<ItemStack> gi);
     
-    void slotChanged(final AbstractContainerMenu ban, final int integer, final ItemStack ben);
+    void slotChanged(final AbstractContainerMenu bgi, final int integer, final ItemStack bki);
     
-    void setContainerData(final AbstractContainerMenu ban, final int integer2, final int integer3);
+    void setContainerData(final AbstractContainerMenu bgi, final int integer2, final int integer3);
 }
diff --git a/src/net/minecraft/world/inventory/CraftingContainer.java b/src/net/minecraft/world/inventory/CraftingContainer.java
index 44053f2..6eaae22 100644
--- a/src/net/minecraft/world/inventory/CraftingContainer.java
+++ b/src/net/minecraft/world/inventory/CraftingContainer.java
@@ -15,9 +15,9 @@ public class CraftingContainer implements Container, StackedContentsCompatible {
     private final int height;
     private final AbstractContainerMenu menu;
     
-    public CraftingContainer(final AbstractContainerMenu ban, final int integer2, final int integer3) {
+    public CraftingContainer(final AbstractContainerMenu bgi, final int integer2, final int integer3) {
         this.items = NonNullList.<ItemStack>withSize(integer2 * integer3, ItemStack.EMPTY);
-        this.menu = ban;
+        this.menu = bgi;
         this.width = integer2;
         this.height = integer3;
     }
@@ -29,8 +29,8 @@ public class CraftingContainer implements Container, StackedContentsCompatible {
     
     @Override
     public boolean isEmpty() {
-        for (final ItemStack ben3 : this.items) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.items) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
@@ -52,16 +52,16 @@ public class CraftingContainer implements Container, StackedContentsCompatible {
     
     @Override
     public ItemStack removeItem(final int integer1, final int integer2) {
-        final ItemStack ben4 = ContainerHelper.removeItem(this.items, integer1, integer2);
-        if (!ben4.isEmpty()) {
+        final ItemStack bki4 = ContainerHelper.removeItem(this.items, integer1, integer2);
+        if (!bki4.isEmpty()) {
             this.menu.slotsChanged(this);
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public void setItem(final int integer, final ItemStack ben) {
-        this.items.set(integer, ben);
+    public void setItem(final int integer, final ItemStack bki) {
+        this.items.set(integer, bki);
         this.menu.slotsChanged(this);
     }
     
@@ -70,7 +70,7 @@ public class CraftingContainer implements Container, StackedContentsCompatible {
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
+    public boolean stillValid(final Player bec) {
         return true;
     }
     
@@ -88,9 +88,9 @@ public class CraftingContainer implements Container, StackedContentsCompatible {
     }
     
     @Override
-    public void fillStackedContents(final StackedContents ayl) {
-        for (final ItemStack ben4 : this.items) {
-            ayl.accountSimpleStack(ben4);
+    public void fillStackedContents(final StackedContents bee) {
+        for (final ItemStack bki4 : this.items) {
+            bee.accountSimpleStack(bki4);
         }
     }
 }
diff --git a/src/net/minecraft/world/inventory/CraftingMenu.java b/src/net/minecraft/world/inventory/CraftingMenu.java
index d6775bb..dbcd347 100644
--- a/src/net/minecraft/world/inventory/CraftingMenu.java
+++ b/src/net/minecraft/world/inventory/CraftingMenu.java
@@ -22,17 +22,17 @@ public class CraftingMenu extends RecipeBookMenu<CraftingContainer> {
     private final ContainerLevelAccess access;
     private final Player player;
     
-    public CraftingMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, ContainerLevelAccess.NULL);
+    public CraftingMenu(final int integer, final Inventory beb) {
+        this(integer, beb, ContainerLevelAccess.NULL);
     }
     
-    public CraftingMenu(final int integer, final Inventory ayi, final ContainerLevelAccess bax) {
+    public CraftingMenu(final int integer, final Inventory beb, final ContainerLevelAccess bgs) {
         super(MenuType.CRAFTING, integer);
         this.craftSlots = new CraftingContainer(this, 3, 3);
         this.resultSlots = new ResultContainer();
-        this.access = bax;
-        this.player = ayi.player;
-        this.addSlot(new ResultSlot(ayi.player, this.craftSlots, this.resultSlots, 0, 124, 35));
+        this.access = bgs;
+        this.player = beb.player;
+        this.addSlot(new ResultSlot(beb.player, this.craftSlots, this.resultSlots, 0, 124, 35));
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 3; ++integer3) {
                 this.addSlot(new Slot(this.craftSlots, integer3 + integer2 * 3, 30 + integer3 * 18, 17 + integer2 * 18));
@@ -40,39 +40,39 @@ public class CraftingMenu extends RecipeBookMenu<CraftingContainer> {
         }
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 8 + integer2 * 18, 142));
+            this.addSlot(new Slot(beb, integer2, 8 + integer2 * 18, 142));
         }
     }
     
-    protected static void slotChangedCraftingGrid(final int integer, final Level bjw, final Player ayj, final CraftingContainer baz, final ResultContainer bbv) {
-        if (bjw.isClientSide) {
+    protected static void slotChangedCraftingGrid(final int integer, final Level bqb, final Player bec, final CraftingContainer bgu, final ResultContainer bhr) {
+        if (bqb.isClientSide) {
             return;
         }
-        final ServerPlayer xe6 = (ServerPlayer)ayj;
-        ItemStack ben7 = ItemStack.EMPTY;
-        final Optional<CraftingRecipe> optional8 = bjw.getServer().getRecipeManager().<CraftingContainer, CraftingRecipe>getRecipeFor(RecipeType.CRAFTING, baz, bjw);
+        final ServerPlayer ze6 = (ServerPlayer)bec;
+        ItemStack bki7 = ItemStack.EMPTY;
+        final Optional<CraftingRecipe> optional8 = bqb.getServer().getRecipeManager().<CraftingContainer, CraftingRecipe>getRecipeFor(RecipeType.CRAFTING, bgu, bqb);
         if (optional8.isPresent()) {
-            final CraftingRecipe bgo9 = optional8.get();
-            if (bbv.setRecipeUsed(bjw, xe6, bgo9)) {
-                ben7 = bgo9.assemble(baz);
+            final CraftingRecipe bmm9 = optional8.get();
+            if (bhr.setRecipeUsed(bqb, ze6, bmm9)) {
+                bki7 = bmm9.assemble(bgu);
             }
         }
-        bbv.setItem(0, ben7);
-        xe6.connection.send(new ClientboundContainerSetSlotPacket(integer, 0, ben7));
+        bhr.setItem(0, bki7);
+        ze6.connection.send(new ClientboundContainerSetSlotPacket(integer, 0, bki7));
     }
     
     @Override
-    public void slotsChanged(final Container aje) {
-        this.access.execute((bjw, fk) -> slotChangedCraftingGrid(this.containerId, bjw, this.player, this.craftSlots, this.resultSlots));
+    public void slotsChanged(final Container amz) {
+        this.access.execute((bqb, fu) -> slotChangedCraftingGrid(this.containerId, bqb, this.player, this.craftSlots, this.resultSlots));
     }
     
     @Override
-    public void fillCraftSlotsStackedContents(final StackedContents ayl) {
-        this.craftSlots.fillStackedContents(ayl);
+    public void fillCraftSlotsStackedContents(final StackedContents bee) {
+        this.craftSlots.fillStackedContents(bee);
     }
     
     @Override
@@ -82,71 +82,71 @@ public class CraftingMenu extends RecipeBookMenu<CraftingContainer> {
     }
     
     @Override
-    public boolean recipeMatches(final Recipe<? super CraftingContainer> bgw) {
-        return bgw.matches(this.craftSlots, this.player.level);
+    public boolean recipeMatches(final Recipe<? super CraftingContainer> bmu) {
+        return bmu.matches(this.craftSlots, this.player.level);
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        this.access.execute((bjw, fk) -> this.clearContainer(ayj, bjw, this.craftSlots));
+    public void removed(final Player bec) {
+        super.removed(bec);
+        this.access.execute((bqb, fu) -> this.clearContainer(bec, bqb, this.craftSlots));
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return AbstractContainerMenu.stillValid(this.access, ayj, Blocks.CRAFTING_TABLE);
+    public boolean stillValid(final Player bec) {
+        return AbstractContainerMenu.stillValid(this.access, bec, Blocks.CRAFTING_TABLE);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if (integer == 0) {
-                final ItemStack ben7;
-                this.access.execute((bjw, fk) -> ben7.getItem().onCraftedBy(ben7, bjw, ayj));
-                if (!this.moveItemStackTo(ben5, 10, 46, true)) {
+                final ItemStack bki7;
+                this.access.execute((bqb, fu) -> bki7.getItem().onCraftedBy(bki7, bqb, bec));
+                if (!this.moveItemStackTo(bki5, 10, 46, true)) {
                     return ItemStack.EMPTY;
                 }
-                bca5.onQuickCraft(ben5, ben4);
+                bhw5.onQuickCraft(bki5, bki4);
             }
             else if (integer >= 10 && integer < 46) {
-                if (!this.moveItemStackTo(ben5, 1, 10, false)) {
+                if (!this.moveItemStackTo(bki5, 1, 10, false)) {
                     if (integer < 37) {
-                        if (!this.moveItemStackTo(ben5, 37, 46, false)) {
+                        if (!this.moveItemStackTo(bki5, 37, 46, false)) {
                             return ItemStack.EMPTY;
                         }
                     }
-                    else if (!this.moveItemStackTo(ben5, 10, 37, false)) {
+                    else if (!this.moveItemStackTo(bki5, 10, 37, false)) {
                         return ItemStack.EMPTY;
                     }
                 }
             }
-            else if (!this.moveItemStackTo(ben5, 10, 46, false)) {
+            else if (!this.moveItemStackTo(bki5, 10, 46, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
-            if (ben5.getCount() == ben4.getCount()) {
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            final ItemStack ben6 = bca5.onTake(ayj, ben5);
+            final ItemStack bki6 = bhw5.onTake(bec, bki5);
             if (integer == 0) {
-                ayj.drop(ben6, false);
+                bec.drop(bki6, false);
             }
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public boolean canTakeItemForPickAll(final ItemStack ben, final Slot bca) {
-        return bca.container != this.resultSlots && super.canTakeItemForPickAll(ben, bca);
+    public boolean canTakeItemForPickAll(final ItemStack bki, final Slot bhw) {
+        return bhw.container != this.resultSlots && super.canTakeItemForPickAll(bki, bhw);
     }
     
     @Override
diff --git a/src/net/minecraft/world/inventory/DataSlot.java b/src/net/minecraft/world/inventory/DataSlot.java
index 16a71a5..56ccef2 100644
--- a/src/net/minecraft/world/inventory/DataSlot.java
+++ b/src/net/minecraft/world/inventory/DataSlot.java
@@ -3,16 +3,16 @@ package net.minecraft.world.inventory;
 public abstract class DataSlot {
     private int prevValue;
     
-    public static DataSlot forContainer(final ContainerData baw, final int integer) {
+    public static DataSlot forContainer(final ContainerData bgr, final int integer) {
         return new DataSlot() {
             @Override
             public int get() {
-                return baw.get(integer);
+                return bgr.get(integer);
             }
             
             @Override
             public void set(final int integer) {
-                baw.set(integer, integer);
+                bgr.set(integer, integer);
             }
         };
     }
diff --git a/src/net/minecraft/world/inventory/DispenserMenu.java b/src/net/minecraft/world/inventory/DispenserMenu.java
index 95492f6..c13a95d 100644
--- a/src/net/minecraft/world/inventory/DispenserMenu.java
+++ b/src/net/minecraft/world/inventory/DispenserMenu.java
@@ -9,66 +9,66 @@ import net.minecraft.world.Container;
 public class DispenserMenu extends AbstractContainerMenu {
     private final Container dispenser;
     
-    public DispenserMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, new SimpleContainer(9));
+    public DispenserMenu(final int integer, final Inventory beb) {
+        this(integer, beb, new SimpleContainer(9));
     }
     
-    public DispenserMenu(final int integer, final Inventory ayi, final Container aje) {
+    public DispenserMenu(final int integer, final Inventory beb, final Container amz) {
         super(MenuType.GENERIC_3x3, integer);
-        AbstractContainerMenu.checkContainerSize(aje, 9);
-        (this.dispenser = aje).startOpen(ayi.player);
+        AbstractContainerMenu.checkContainerSize(amz, 9);
+        (this.dispenser = amz).startOpen(beb.player);
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 3; ++integer3) {
-                this.addSlot(new Slot(aje, integer3 + integer2 * 3, 62 + integer3 * 18, 17 + integer2 * 18));
+                this.addSlot(new Slot(amz, integer3 + integer2 * 3, 62 + integer3 * 18, 17 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 8 + integer2 * 18, 142));
+            this.addSlot(new Slot(beb, integer2, 8 + integer2 * 18, 142));
         }
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.dispenser.stillValid(ayj);
+    public boolean stillValid(final Player bec) {
+        return this.dispenser.stillValid(bec);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if (integer < 9) {
-                if (!this.moveItemStackTo(ben5, 9, 45, true)) {
+                if (!this.moveItemStackTo(bki5, 9, 45, true)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (!this.moveItemStackTo(ben5, 0, 9, false)) {
+            else if (!this.moveItemStackTo(bki5, 0, 9, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
-            if (ben5.getCount() == ben4.getCount()) {
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            bca5.onTake(ayj, ben5);
+            bhw5.onTake(bec, bki5);
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        this.dispenser.stopOpen(ayj);
+    public void removed(final Player bec) {
+        super.removed(bec);
+        this.dispenser.stopOpen(bec);
     }
 }
diff --git a/src/net/minecraft/world/inventory/EnchantmentMenu.java b/src/net/minecraft/world/inventory/EnchantmentMenu.java
index 23a0555..8753abd 100644
--- a/src/net/minecraft/world/inventory/EnchantmentMenu.java
+++ b/src/net/minecraft/world/inventory/EnchantmentMenu.java
@@ -1,7 +1,6 @@
 package net.minecraft.world.inventory;
 
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.advancements.CriteriaTriggers;
@@ -9,6 +8,8 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.item.EnchantedBookItem;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Player;
 import java.util.List;
 import net.minecraft.core.Registry;
@@ -31,11 +32,11 @@ public class EnchantmentMenu extends AbstractContainerMenu {
     public final int[] enchantClue;
     public final int[] levelClue;
     
-    public EnchantmentMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, ContainerLevelAccess.NULL);
+    public EnchantmentMenu(final int integer, final Inventory beb) {
+        this(integer, beb, ContainerLevelAccess.NULL);
     }
     
-    public EnchantmentMenu(final int integer, final Inventory ayi, final ContainerLevelAccess bax) {
+    public EnchantmentMenu(final int integer, final Inventory beb, final ContainerLevelAccess bgs) {
         super(MenuType.ENCHANTMENT, integer);
         this.enchantSlots = new SimpleContainer(2) {
             @Override
@@ -49,10 +50,10 @@ public class EnchantmentMenu extends AbstractContainerMenu {
         this.costs = new int[3];
         this.enchantClue = new int[] { -1, -1, -1 };
         this.levelClue = new int[] { -1, -1, -1 };
-        this.access = bax;
+        this.access = bgs;
         this.addSlot(new Slot(this.enchantSlots, 0, 15, 47) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
+            public boolean mayPlace(final ItemStack bki) {
                 return true;
             }
             
@@ -63,22 +64,22 @@ public class EnchantmentMenu extends AbstractContainerMenu {
         });
         this.addSlot(new Slot(this.enchantSlots, 1, 35, 47) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
-                return ben.getItem() == Items.LAPIS_LAZULI;
+            public boolean mayPlace(final ItemStack bki) {
+                return bki.getItem() == Items.LAPIS_LAZULI;
             }
         });
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 8 + integer2 * 18, 142));
+            this.addSlot(new Slot(beb, integer2, 8 + integer2 * 18, 142));
         }
         this.addDataSlot(DataSlot.shared(this.costs, 0));
         this.addDataSlot(DataSlot.shared(this.costs, 1));
         this.addDataSlot(DataSlot.shared(this.costs, 2));
-        this.addDataSlot(this.enchantmentSeed).set(ayi.player.getEnchantmentSeed());
+        this.addDataSlot(this.enchantmentSeed).set(beb.player.getEnchantmentSeed());
         this.addDataSlot(DataSlot.shared(this.enchantClue, 0));
         this.addDataSlot(DataSlot.shared(this.enchantClue, 1));
         this.addDataSlot(DataSlot.shared(this.enchantClue, 2));
@@ -88,10 +89,10 @@ public class EnchantmentMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public void slotsChanged(final Container aje) {
-        if (aje == this.enchantSlots) {
-            final ItemStack ben3 = aje.getItem(0);
-            if (ben3.isEmpty() || !ben3.isEnchantable()) {
+    public void slotsChanged(final Container amz) {
+        if (amz == this.enchantSlots) {
+            final ItemStack bki3 = amz.getItem(0);
+            if (bki3.isEmpty() || !bki3.isEnchantable()) {
                 for (int integer4 = 0; integer4 < 3; ++integer4) {
                     this.costs[integer4] = 0;
                     this.enchantClue[integer4] = -1;
@@ -106,30 +107,30 @@ public class EnchantmentMenu extends AbstractContainerMenu {
                 final ItemStack itemStack;
                 int integer9;
                 List<EnchantmentInstance> list7;
-                EnchantmentInstance bia8;
-                this.access.execute((bjw, fk) -> {
+                EnchantmentInstance bnz8;
+                this.access.execute((bqb, fu) -> {
                     integer5 = 0;
                     for (integer6 = -1; integer6 <= 1; ++integer6) {
                         for (integer7 = -1; integer7 <= 1; ++integer7) {
                             if (integer6 != 0 || integer7 != 0) {
-                                if (bjw.isEmptyBlock(fk.offset(integer7, 0, integer6)) && bjw.isEmptyBlock(fk.offset(integer7, 1, integer6))) {
-                                    if (bjw.getBlockState(fk.offset(integer7 * 2, 0, integer6 * 2)).getBlock() == Blocks.BOOKSHELF) {
+                                if (bqb.isEmptyBlock(fu.offset(integer7, 0, integer6)) && bqb.isEmptyBlock(fu.offset(integer7, 1, integer6))) {
+                                    if (bqb.getBlockState(fu.offset(integer7 * 2, 0, integer6 * 2)).is(Blocks.BOOKSHELF)) {
                                         ++integer5;
                                     }
-                                    if (bjw.getBlockState(fk.offset(integer7 * 2, 1, integer6 * 2)).getBlock() == Blocks.BOOKSHELF) {
+                                    if (bqb.getBlockState(fu.offset(integer7 * 2, 1, integer6 * 2)).is(Blocks.BOOKSHELF)) {
                                         ++integer5;
                                     }
                                     if (integer7 != 0 && integer6 != 0) {
-                                        if (bjw.getBlockState(fk.offset(integer7 * 2, 0, integer6)).getBlock() == Blocks.BOOKSHELF) {
+                                        if (bqb.getBlockState(fu.offset(integer7 * 2, 0, integer6)).is(Blocks.BOOKSHELF)) {
                                             ++integer5;
                                         }
-                                        if (bjw.getBlockState(fk.offset(integer7 * 2, 1, integer6)).getBlock() == Blocks.BOOKSHELF) {
+                                        if (bqb.getBlockState(fu.offset(integer7 * 2, 1, integer6)).is(Blocks.BOOKSHELF)) {
                                             ++integer5;
                                         }
-                                        if (bjw.getBlockState(fk.offset(integer7, 0, integer6 * 2)).getBlock() == Blocks.BOOKSHELF) {
+                                        if (bqb.getBlockState(fu.offset(integer7, 0, integer6 * 2)).is(Blocks.BOOKSHELF)) {
                                             ++integer5;
                                         }
-                                        if (bjw.getBlockState(fk.offset(integer7, 1, integer6 * 2)).getBlock() == Blocks.BOOKSHELF) {
+                                        if (bqb.getBlockState(fu.offset(integer7, 1, integer6 * 2)).is(Blocks.BOOKSHELF)) {
                                             ++integer5;
                                         }
                                     }
@@ -150,9 +151,9 @@ public class EnchantmentMenu extends AbstractContainerMenu {
                         if (this.costs[integer9] > 0) {
                             list7 = this.getEnchantmentList(itemStack, integer9, this.costs[integer9]);
                             if (list7 != null && !list7.isEmpty()) {
-                                bia8 = list7.get(this.random.nextInt(list7.size()));
-                                this.enchantClue[integer9] = Registry.ENCHANTMENT.getId(bia8.enchantment);
-                                this.levelClue[integer9] = bia8.level;
+                                bnz8 = list7.get(this.random.nextInt(list7.size()));
+                                this.enchantClue[integer9] = Registry.ENCHANTMENT.getId(bnz8.enchantment);
+                                this.levelClue[integer9] = bnz8.level;
                             }
                         }
                     }
@@ -163,78 +164,133 @@ public class EnchantmentMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public boolean clickMenuButton(final Player ayj, final int integer) {
-        final ItemStack ben4 = this.enchantSlots.getItem(0);
-        final ItemStack ben5 = this.enchantSlots.getItem(1);
-        final int integer2 = integer + 1;
-        if ((ben5.isEmpty() || ben5.getCount() < integer2) && !ayj.abilities.instabuild) {
-            return false;
-        }
-        if (this.costs[integer] > 0 && !ben4.isEmpty() && ((ayj.experienceLevel >= integer2 && ayj.experienceLevel >= this.costs[integer]) || ayj.abilities.instabuild)) {
-            final ItemStack itemStack;
-            ItemStack ben6;
-            final List<EnchantmentInstance> list10;
-            final int integer6;
-            boolean boolean11;
-            int integer5;
-            EnchantmentInstance bia13;
-            final ItemStack itemStack2;
-            this.access.execute((bjw, fk) -> {
-                ben6 = itemStack;
-                list10 = this.getEnchantmentList(ben6, integer, this.costs[integer]);
-                if (!list10.isEmpty()) {
-                    ayj.onEnchantmentPerformed(ben6, integer6);
-                    boolean11 = (ben6.getItem() == Items.BOOK);
-                    if (boolean11) {
-                        ben6 = new ItemStack(Items.ENCHANTED_BOOK);
-                        this.enchantSlots.setItem(0, ben6);
-                    }
-                    for (integer5 = 0; integer5 < list10.size(); ++integer5) {
-                        bia13 = list10.get(integer5);
-                        if (boolean11) {
-                            EnchantedBookItem.addEnchantment(ben6, bia13);
-                        }
-                        else {
-                            ben6.enchant(bia13.enchantment, bia13.level);
-                        }
-                    }
-                    if (!ayj.abilities.instabuild) {
-                        itemStack2.shrink(integer6);
-                        if (itemStack2.isEmpty()) {
-                            this.enchantSlots.setItem(1, ItemStack.EMPTY);
-                        }
-                    }
-                    ayj.awardStat(Stats.ENCHANT_ITEM);
-                    if (ayj instanceof ServerPlayer) {
-                        CriteriaTriggers.ENCHANTED_ITEM.trigger((ServerPlayer)ayj, ben6, integer6);
-                    }
-                    this.enchantSlots.setChanged();
-                    this.enchantmentSeed.set(ayj.getEnchantmentSeed());
-                    this.slotsChanged(this.enchantSlots);
-                    bjw.playSound(null, fk, SoundEvents.ENCHANTMENT_TABLE_USE, SoundSource.BLOCKS, 1.0f, bjw.random.nextFloat() * 0.1f + 0.9f);
-                }
-                return;
-            });
-            return true;
-        }
-        return false;
+    public boolean clickMenuButton(final Player bec, final int integer) {
+        // 
+        // This method could not be decompiled.
+        // 
+        // Original Bytecode:
+        // 
+        //     1: getfield        net/minecraft/world/inventory/EnchantmentMenu.enchantSlots:Lnet/minecraft/world/Container;
+        //     4: iconst_0       
+        //     5: invokeinterface net/minecraft/world/Container.getItem:(I)Lnet/minecraft/world/item/ItemStack;
+        //    10: astore_3        /* bki4 */
+        //    11: aload_0         /* this */
+        //    12: getfield        net/minecraft/world/inventory/EnchantmentMenu.enchantSlots:Lnet/minecraft/world/Container;
+        //    15: iconst_1       
+        //    16: invokeinterface net/minecraft/world/Container.getItem:(I)Lnet/minecraft/world/item/ItemStack;
+        //    21: astore          bki5
+        //    23: iload_2         /* integer */
+        //    24: iconst_1       
+        //    25: iadd           
+        //    26: istore          integer6
+        //    28: aload           bki5
+        //    30: invokevirtual   net/minecraft/world/item/ItemStack.isEmpty:()Z
+        //    33: ifne            46
+        //    36: aload           bki5
+        //    38: invokevirtual   net/minecraft/world/item/ItemStack.getCount:()I
+        //    41: iload           integer6
+        //    43: if_icmpge       58
+        //    46: aload_1         /* bec */
+        //    47: getfield        net/minecraft/world/entity/player/Player.abilities:Lnet/minecraft/world/entity/player/Abilities;
+        //    50: getfield        net/minecraft/world/entity/player/Abilities.instabuild:Z
+        //    53: ifne            58
+        //    56: iconst_0       
+        //    57: ireturn        
+        //    58: aload_0         /* this */
+        //    59: getfield        net/minecraft/world/inventory/EnchantmentMenu.costs:[I
+        //    62: iload_2         /* integer */
+        //    63: iaload         
+        //    64: ifle            130
+        //    67: aload_3         /* bki4 */
+        //    68: invokevirtual   net/minecraft/world/item/ItemStack.isEmpty:()Z
+        //    71: ifne            130
+        //    74: aload_1         /* bec */
+        //    75: getfield        net/minecraft/world/entity/player/Player.experienceLevel:I
+        //    78: iload           integer6
+        //    80: if_icmplt       96
+        //    83: aload_1         /* bec */
+        //    84: getfield        net/minecraft/world/entity/player/Player.experienceLevel:I
+        //    87: aload_0         /* this */
+        //    88: getfield        net/minecraft/world/inventory/EnchantmentMenu.costs:[I
+        //    91: iload_2         /* integer */
+        //    92: iaload         
+        //    93: if_icmpge       106
+        //    96: aload_1         /* bec */
+        //    97: getfield        net/minecraft/world/entity/player/Player.abilities:Lnet/minecraft/world/entity/player/Abilities;
+        //   100: getfield        net/minecraft/world/entity/player/Abilities.instabuild:Z
+        //   103: ifeq            130
+        //   106: aload_0         /* this */
+        //   107: getfield        net/minecraft/world/inventory/EnchantmentMenu.access:Lnet/minecraft/world/inventory/ContainerLevelAccess;
+        //   110: aload_0         /* this */
+        //   111: aload_3         /* bki4 */
+        //   112: iload_2         /* integer */
+        //   113: aload_1         /* bec */
+        //   114: iload           integer6
+        //   116: aload           bki5
+        //   118: invokedynamic   BootstrapMethod #1, accept:(Lnet/minecraft/world/inventory/EnchantmentMenu;Lnet/minecraft/world/item/ItemStack;ILnet/minecraft/world/entity/player/Player;ILnet/minecraft/world/item/ItemStack;)Ljava/util/function/BiConsumer;
+        //   123: invokeinterface net/minecraft/world/inventory/ContainerLevelAccess.execute:(Ljava/util/function/BiConsumer;)V
+        //   128: iconst_1       
+        //   129: ireturn        
+        //   130: iconst_0       
+        //   131: ireturn        
+        //    MethodParameters:
+        //  Name     Flags  
+        //  -------  -----
+        //  bec      
+        //  integer  
+        //    StackMapTable: 00 05 FE 00 2E 07 00 84 07 00 84 01 0B 25 09 FF 00 17 00 00 00 00
+        // 
+        // The error that occurred was:
+        // 
+        // java.lang.IllegalStateException: Could not infer any expression.
+        //     at com.strobel.decompiler.ast.TypeAnalysis.runInference(TypeAnalysis.java:374)
+        //     at com.strobel.decompiler.ast.TypeAnalysis.run(TypeAnalysis.java:96)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:344)
+        //     at com.strobel.decompiler.ast.AstOptimizer.optimize(AstOptimizer.java:42)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:214)
+        //     at com.strobel.decompiler.languages.java.ast.AstMethodBodyBuilder.createMethodBody(AstMethodBodyBuilder.java:99)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethodBody(AstBuilder.java:782)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createMethod(AstBuilder.java:675)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addTypeMembers(AstBuilder.java:552)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeCore(AstBuilder.java:519)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createTypeNoCache(AstBuilder.java:161)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.createType(AstBuilder.java:150)
+        //     at com.strobel.decompiler.languages.java.ast.AstBuilder.addType(AstBuilder.java:125)
+        //     at cuchaz.enigma.SourceProvider.getSources(SourceProvider.java:85)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.decompileClass(EnigmaProject.java:241)
+        //     at cuchaz.enigma.EnigmaProject$JarExport.lambda$decompile$1(EnigmaProject.java:230)
+        //     at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
+        //     at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654)
+        //     at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
+        //     at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:952)
+        //     at java.base/java.util.stream.ReduceOps$ReduceTask.doLeaf(ReduceOps.java:926)
+        //     at java.base/java.util.stream.AbstractTask.compute(AbstractTask.java:327)
+        //     at java.base/java.util.concurrent.CountedCompleter.exec(CountedCompleter.java:746)
+        //     at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
+        //     at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
+        //     at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
+        //     at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
+        //     at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:177)
+        // 
+        throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    private List<EnchantmentInstance> getEnchantmentList(final ItemStack ben, final int integer2, final int integer3) {
+    private List<EnchantmentInstance> getEnchantmentList(final ItemStack bki, final int integer2, final int integer3) {
         this.random.setSeed(this.enchantmentSeed.get() + integer2);
-        final List<EnchantmentInstance> list5 = EnchantmentHelper.selectEnchantment(this.random, ben, integer3, false);
-        if (ben.getItem() == Items.BOOK && list5.size() > 1) {
+        final List<EnchantmentInstance> list5 = EnchantmentHelper.selectEnchantment(this.random, bki, integer3, false);
+        if (bki.getItem() == Items.BOOK && list5.size() > 1) {
             list5.remove(this.random.nextInt(list5.size()));
         }
         return list5;
     }
     
     public int getGoldCount() {
-        final ItemStack ben2 = this.enchantSlots.getItem(1);
-        if (ben2.isEmpty()) {
+        final ItemStack bki2 = this.enchantSlots.getItem(1);
+        if (bki2.isEmpty()) {
             return 0;
         }
-        return ben2.getCount();
+        return bki2.getCount();
     }
     
     public int getEnchantmentSeed() {
@@ -242,62 +298,58 @@ public class EnchantmentMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        this.access.execute((bjw, fk) -> this.clearContainer(ayj, ayj.level, this.enchantSlots));
+    public void removed(final Player bec) {
+        super.removed(bec);
+        this.access.execute((bqb, fu) -> this.clearContainer(bec, bec.level, this.enchantSlots));
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return AbstractContainerMenu.stillValid(this.access, ayj, Blocks.ENCHANTING_TABLE);
+    public boolean stillValid(final Player bec) {
+        return AbstractContainerMenu.stillValid(this.access, bec, Blocks.ENCHANTING_TABLE);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if (integer == 0) {
-                if (!this.moveItemStackTo(ben5, 2, 38, true)) {
+                if (!this.moveItemStackTo(bki5, 2, 38, true)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer == 1) {
-                if (!this.moveItemStackTo(ben5, 2, 38, true)) {
+                if (!this.moveItemStackTo(bki5, 2, 38, true)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (ben5.getItem() == Items.LAPIS_LAZULI) {
-                if (!this.moveItemStackTo(ben5, 1, 2, true)) {
+            else if (bki5.getItem() == Items.LAPIS_LAZULI) {
+                if (!this.moveItemStackTo(bki5, 1, 2, true)) {
                     return ItemStack.EMPTY;
                 }
             }
             else {
-                if (this.slots.get(0).hasItem() || !this.slots.get(0).mayPlace(ben5)) {
+                if (this.slots.get(0).hasItem() || !this.slots.get(0).mayPlace(bki5)) {
                     return ItemStack.EMPTY;
                 }
-                if (ben5.hasTag() && ben5.getCount() == 1) {
-                    this.slots.get(0).set(ben5.copy());
-                    ben5.setCount(0);
-                }
-                else if (!ben5.isEmpty()) {
-                    this.slots.get(0).set(new ItemStack(ben5.getItem()));
-                    ben5.shrink(1);
-                }
+                final ItemStack bki6 = bki5.copy();
+                bki6.setCount(1);
+                bki5.shrink(1);
+                this.slots.get(0).set(bki6);
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
-            if (ben5.getCount() == ben4.getCount()) {
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            bca5.onTake(ayj, ben5);
+            bhw5.onTake(bec, bki5);
         }
-        return ben4;
+        return bki4;
     }
 }
diff --git a/src/net/minecraft/world/inventory/FurnaceFuelSlot.java b/src/net/minecraft/world/inventory/FurnaceFuelSlot.java
index 00336d9..2056753 100644
--- a/src/net/minecraft/world/inventory/FurnaceFuelSlot.java
+++ b/src/net/minecraft/world/inventory/FurnaceFuelSlot.java
@@ -7,22 +7,22 @@ import net.minecraft.world.Container;
 public class FurnaceFuelSlot extends Slot {
     private final AbstractFurnaceMenu menu;
     
-    public FurnaceFuelSlot(final AbstractFurnaceMenu bao, final Container aje, final int integer3, final int integer4, final int integer5) {
-        super(aje, integer3, integer4, integer5);
-        this.menu = bao;
+    public FurnaceFuelSlot(final AbstractFurnaceMenu bgj, final Container amz, final int integer3, final int integer4, final int integer5) {
+        super(amz, integer3, integer4, integer5);
+        this.menu = bgj;
     }
     
     @Override
-    public boolean mayPlace(final ItemStack ben) {
-        return this.menu.isFuel(ben) || isBucket(ben);
+    public boolean mayPlace(final ItemStack bki) {
+        return this.menu.isFuel(bki) || isBucket(bki);
     }
     
     @Override
-    public int getMaxStackSize(final ItemStack ben) {
-        return isBucket(ben) ? 1 : super.getMaxStackSize(ben);
+    public int getMaxStackSize(final ItemStack bki) {
+        return isBucket(bki) ? 1 : super.getMaxStackSize(bki);
     }
     
-    public static boolean isBucket(final ItemStack ben) {
-        return ben.getItem() == Items.BUCKET;
+    public static boolean isBucket(final ItemStack bki) {
+        return bki.getItem() == Items.BUCKET;
     }
 }
diff --git a/src/net/minecraft/world/inventory/FurnaceMenu.java b/src/net/minecraft/world/inventory/FurnaceMenu.java
index 38e65d2..726160a 100644
--- a/src/net/minecraft/world/inventory/FurnaceMenu.java
+++ b/src/net/minecraft/world/inventory/FurnaceMenu.java
@@ -6,11 +6,11 @@ import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.entity.player.Inventory;
 
 public class FurnaceMenu extends AbstractFurnaceMenu {
-    public FurnaceMenu(final int integer, final Inventory ayi) {
-        super(MenuType.FURNACE, RecipeType.SMELTING, integer, ayi);
+    public FurnaceMenu(final int integer, final Inventory beb) {
+        super(MenuType.FURNACE, RecipeType.SMELTING, integer, beb);
     }
     
-    public FurnaceMenu(final int integer, final Inventory ayi, final Container aje, final ContainerData baw) {
-        super(MenuType.FURNACE, RecipeType.SMELTING, integer, ayi, aje, baw);
+    public FurnaceMenu(final int integer, final Inventory beb, final Container amz, final ContainerData bgr) {
+        super(MenuType.FURNACE, RecipeType.SMELTING, integer, beb, amz, bgr);
     }
 }
diff --git a/src/net/minecraft/world/inventory/FurnaceResultSlot.java b/src/net/minecraft/world/inventory/FurnaceResultSlot.java
index 6c649dd..5e3b7bd 100644
--- a/src/net/minecraft/world/inventory/FurnaceResultSlot.java
+++ b/src/net/minecraft/world/inventory/FurnaceResultSlot.java
@@ -9,13 +9,13 @@ public class FurnaceResultSlot extends Slot {
     private final Player player;
     private int removeCount;
     
-    public FurnaceResultSlot(final Player ayj, final Container aje, final int integer3, final int integer4, final int integer5) {
-        super(aje, integer3, integer4, integer5);
-        this.player = ayj;
+    public FurnaceResultSlot(final Player bec, final Container amz, final int integer3, final int integer4, final int integer5) {
+        super(amz, integer3, integer4, integer5);
+        this.player = bec;
     }
     
     @Override
-    public boolean mayPlace(final ItemStack ben) {
+    public boolean mayPlace(final ItemStack bki) {
         return false;
     }
     
@@ -28,23 +28,23 @@ public class FurnaceResultSlot extends Slot {
     }
     
     @Override
-    public ItemStack onTake(final Player ayj, final ItemStack ben) {
-        this.checkTakeAchievements(ben);
-        super.onTake(ayj, ben);
-        return ben;
+    public ItemStack onTake(final Player bec, final ItemStack bki) {
+        this.checkTakeAchievements(bki);
+        super.onTake(bec, bki);
+        return bki;
     }
     
     @Override
-    protected void onQuickCraft(final ItemStack ben, final int integer) {
+    protected void onQuickCraft(final ItemStack bki, final int integer) {
         this.removeCount += integer;
-        this.checkTakeAchievements(ben);
+        this.checkTakeAchievements(bki);
     }
     
     @Override
-    protected void checkTakeAchievements(final ItemStack ben) {
-        ben.onCraftedBy(this.player.level, this.player, this.removeCount);
+    protected void checkTakeAchievements(final ItemStack bki) {
+        bki.onCraftedBy(this.player.level, this.player, this.removeCount);
         if (!this.player.level.isClientSide && this.container instanceof AbstractFurnaceBlockEntity) {
-            ((AbstractFurnaceBlockEntity)this.container).awardResetAndExperience(this.player);
+            ((AbstractFurnaceBlockEntity)this.container).awardUsedRecipesAndPopExperience(this.player);
         }
         this.removeCount = 0;
     }
diff --git a/src/net/minecraft/world/inventory/GrindstoneMenu.java b/src/net/minecraft/world/inventory/GrindstoneMenu.java
index 8e3ed4a..1609f5c 100644
--- a/src/net/minecraft/world/inventory/GrindstoneMenu.java
+++ b/src/net/minecraft/world/inventory/GrindstoneMenu.java
@@ -25,11 +25,11 @@ public class GrindstoneMenu extends AbstractContainerMenu {
     private final Container repairSlots;
     private final ContainerLevelAccess access;
     
-    public GrindstoneMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, ContainerLevelAccess.NULL);
+    public GrindstoneMenu(final int integer, final Inventory beb) {
+        this(integer, beb, ContainerLevelAccess.NULL);
     }
     
-    public GrindstoneMenu(final int integer, final Inventory ayi, final ContainerLevelAccess bax) {
+    public GrindstoneMenu(final int integer, final Inventory beb, final ContainerLevelAccess bgs) {
         super(MenuType.GRINDSTONE, integer);
         this.resultSlots = new ResultContainer();
         this.repairSlots = new SimpleContainer(2) {
@@ -39,63 +39,63 @@ public class GrindstoneMenu extends AbstractContainerMenu {
                 GrindstoneMenu.this.slotsChanged(this);
             }
         };
-        this.access = bax;
+        this.access = bgs;
         this.addSlot(new Slot(this.repairSlots, 0, 49, 19) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
-                return ben.isDamageableItem() || ben.getItem() == Items.ENCHANTED_BOOK || ben.isEnchanted();
+            public boolean mayPlace(final ItemStack bki) {
+                return bki.isDamageableItem() || bki.getItem() == Items.ENCHANTED_BOOK || bki.isEnchanted();
             }
         });
         this.addSlot(new Slot(this.repairSlots, 1, 49, 40) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
-                return ben.isDamageableItem() || ben.getItem() == Items.ENCHANTED_BOOK || ben.isEnchanted();
+            public boolean mayPlace(final ItemStack bki) {
+                return bki.isDamageableItem() || bki.getItem() == Items.ENCHANTED_BOOK || bki.isEnchanted();
             }
         });
         this.addSlot(new Slot(this.resultSlots, 2, 129, 34) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
+            public boolean mayPlace(final ItemStack bki) {
                 return false;
             }
             
             @Override
-            public ItemStack onTake(final Player ayj, final ItemStack ben) {
+            public ItemStack onTake(final Player bec, final ItemStack bki) {
                 int integer4;
                 int integer5;
-                bax.execute((bjw, fk) -> {
-                    integer4 = this.getExperienceAmount(bjw);
+                bgs.execute((bqb, fu) -> {
+                    integer4 = this.getExperienceAmount(bqb);
                     while (integer4 > 0) {
                         integer5 = ExperienceOrb.getExperienceValue(integer4);
                         integer4 -= integer5;
-                        bjw.addFreshEntity(new ExperienceOrb(bjw, fk.getX(), fk.getY() + 0.5, fk.getZ() + 0.5, integer5));
+                        bqb.addFreshEntity(new ExperienceOrb(bqb, fu.getX(), fu.getY() + 0.5, fu.getZ() + 0.5, integer5));
                     }
-                    bjw.levelEvent(1042, fk, 0);
+                    bqb.levelEvent(1042, fu, 0);
                     return;
                 });
                 GrindstoneMenu.this.repairSlots.setItem(0, ItemStack.EMPTY);
                 GrindstoneMenu.this.repairSlots.setItem(1, ItemStack.EMPTY);
-                return ben;
+                return bki;
             }
             
-            private int getExperienceAmount(final Level bjw) {
+            private int getExperienceAmount(final Level bqb) {
                 int integer3 = 0;
                 integer3 += this.getExperienceFromItem(GrindstoneMenu.this.repairSlots.getItem(0));
                 integer3 += this.getExperienceFromItem(GrindstoneMenu.this.repairSlots.getItem(1));
                 if (integer3 > 0) {
                     final int integer4 = (int)Math.ceil(integer3 / 2.0);
-                    return integer4 + bjw.random.nextInt(integer4);
+                    return integer4 + bqb.random.nextInt(integer4);
                 }
                 return 0;
             }
             
-            private int getExperienceFromItem(final ItemStack ben) {
+            private int getExperienceFromItem(final ItemStack bki) {
                 int integer3 = 0;
-                final Map<Enchantment, Integer> map4 = EnchantmentHelper.getEnchantments(ben);
+                final Map<Enchantment, Integer> map4 = EnchantmentHelper.getEnchantments(bki);
                 for (final Map.Entry<Enchantment, Integer> entry6 : map4.entrySet()) {
-                    final Enchantment bhx7 = entry6.getKey();
+                    final Enchantment bnw7 = entry6.getKey();
                     final Integer integer4 = entry6.getValue();
-                    if (!bhx7.isCurse()) {
-                        integer3 += bhx7.getMinCost(integer4);
+                    if (!bnw7.isCurse()) {
+                        integer3 += bnw7.getMinCost(integer4);
                     }
                 }
                 return integer3;
@@ -103,51 +103,51 @@ public class GrindstoneMenu extends AbstractContainerMenu {
         });
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 8 + integer2 * 18, 142));
+            this.addSlot(new Slot(beb, integer2, 8 + integer2 * 18, 142));
         }
     }
     
     @Override
-    public void slotsChanged(final Container aje) {
-        super.slotsChanged(aje);
-        if (aje == this.repairSlots) {
+    public void slotsChanged(final Container amz) {
+        super.slotsChanged(amz);
+        if (amz == this.repairSlots) {
             this.createResult();
         }
     }
     
     private void createResult() {
-        final ItemStack ben2 = this.repairSlots.getItem(0);
-        final ItemStack ben3 = this.repairSlots.getItem(1);
-        final boolean boolean4 = !ben2.isEmpty() || !ben3.isEmpty();
-        final boolean boolean5 = !ben2.isEmpty() && !ben3.isEmpty();
+        final ItemStack bki2 = this.repairSlots.getItem(0);
+        final ItemStack bki3 = this.repairSlots.getItem(1);
+        final boolean boolean4 = !bki2.isEmpty() || !bki3.isEmpty();
+        final boolean boolean5 = !bki2.isEmpty() && !bki3.isEmpty();
         if (boolean4) {
-            final boolean boolean6 = (!ben2.isEmpty() && ben2.getItem() != Items.ENCHANTED_BOOK && !ben2.isEnchanted()) || (!ben3.isEmpty() && ben3.getItem() != Items.ENCHANTED_BOOK && !ben3.isEnchanted());
-            if (ben2.getCount() > 1 || ben3.getCount() > 1 || (!boolean5 && boolean6)) {
+            final boolean boolean6 = (!bki2.isEmpty() && bki2.getItem() != Items.ENCHANTED_BOOK && !bki2.isEnchanted()) || (!bki3.isEmpty() && bki3.getItem() != Items.ENCHANTED_BOOK && !bki3.isEnchanted());
+            if (bki2.getCount() > 1 || bki3.getCount() > 1 || (!boolean5 && boolean6)) {
                 this.resultSlots.setItem(0, ItemStack.EMPTY);
                 this.broadcastChanges();
                 return;
             }
             int integer8 = 1;
             int integer12;
-            ItemStack ben4;
+            ItemStack bki4;
             if (boolean5) {
-                if (ben2.getItem() != ben3.getItem()) {
+                if (bki2.getItem() != bki3.getItem()) {
                     this.resultSlots.setItem(0, ItemStack.EMPTY);
                     this.broadcastChanges();
                     return;
                 }
-                final Item bei10 = ben2.getItem();
-                final int integer9 = bei10.getMaxDamage() - ben2.getDamageValue();
-                final int integer10 = bei10.getMaxDamage() - ben3.getDamageValue();
-                final int integer11 = integer9 + integer10 + bei10.getMaxDamage() * 5 / 100;
-                integer12 = Math.max(bei10.getMaxDamage() - integer11, 0);
-                ben4 = this.mergeEnchants(ben2, ben3);
-                if (!ben4.isDamageableItem()) {
-                    if (!ItemStack.matches(ben2, ben3)) {
+                final Item bke10 = bki2.getItem();
+                final int integer9 = bke10.getMaxDamage() - bki2.getDamageValue();
+                final int integer10 = bke10.getMaxDamage() - bki3.getDamageValue();
+                final int integer11 = integer9 + integer10 + bke10.getMaxDamage() * 5 / 100;
+                integer12 = Math.max(bke10.getMaxDamage() - integer11, 0);
+                bki4 = this.mergeEnchants(bki2, bki3);
+                if (!bki4.isDamageableItem()) {
+                    if (!ItemStack.matches(bki2, bki3)) {
                         this.resultSlots.setItem(0, ItemStack.EMPTY);
                         this.broadcastChanges();
                         return;
@@ -156,11 +156,11 @@ public class GrindstoneMenu extends AbstractContainerMenu {
                 }
             }
             else {
-                final boolean boolean7 = !ben2.isEmpty();
-                integer12 = (boolean7 ? ben2.getDamageValue() : ben3.getDamageValue());
-                ben4 = (boolean7 ? ben2 : ben3);
+                final boolean boolean7 = !bki2.isEmpty();
+                integer12 = (boolean7 ? bki2.getDamageValue() : bki3.getDamageValue());
+                bki4 = (boolean7 ? bki2 : bki3);
             }
-            this.resultSlots.setItem(0, this.removeNonCurses(ben4, integer12, integer8));
+            this.resultSlots.setItem(0, this.removeNonCurses(bki4, integer12, integer8));
         }
         else {
             this.resultSlots.setItem(0, ItemStack.EMPTY);
@@ -168,99 +168,99 @@ public class GrindstoneMenu extends AbstractContainerMenu {
         this.broadcastChanges();
     }
     
-    private ItemStack mergeEnchants(final ItemStack ben1, final ItemStack ben2) {
-        final ItemStack ben3 = ben1.copy();
-        final Map<Enchantment, Integer> map5 = EnchantmentHelper.getEnchantments(ben2);
+    private ItemStack mergeEnchants(final ItemStack bki1, final ItemStack bki2) {
+        final ItemStack bki3 = bki1.copy();
+        final Map<Enchantment, Integer> map5 = EnchantmentHelper.getEnchantments(bki2);
         for (final Map.Entry<Enchantment, Integer> entry7 : map5.entrySet()) {
-            final Enchantment bhx8 = entry7.getKey();
-            if (!bhx8.isCurse() || EnchantmentHelper.getItemEnchantmentLevel(bhx8, ben3) == 0) {
-                ben3.enchant(bhx8, entry7.getValue());
+            final Enchantment bnw8 = entry7.getKey();
+            if (!bnw8.isCurse() || EnchantmentHelper.getItemEnchantmentLevel(bnw8, bki3) == 0) {
+                bki3.enchant(bnw8, entry7.getValue());
             }
         }
-        return ben3;
+        return bki3;
     }
     
-    private ItemStack removeNonCurses(final ItemStack ben, final int integer2, final int integer3) {
-        ItemStack ben2 = ben.copy();
-        ben2.removeTagKey("Enchantments");
-        ben2.removeTagKey("StoredEnchantments");
+    private ItemStack removeNonCurses(final ItemStack bki, final int integer2, final int integer3) {
+        ItemStack bki2 = bki.copy();
+        bki2.removeTagKey("Enchantments");
+        bki2.removeTagKey("StoredEnchantments");
         if (integer2 > 0) {
-            ben2.setDamageValue(integer2);
+            bki2.setDamageValue(integer2);
         }
         else {
-            ben2.removeTagKey("Damage");
+            bki2.removeTagKey("Damage");
         }
-        ben2.setCount(integer3);
-        final Map<Enchantment, Integer> map6 = EnchantmentHelper.getEnchantments(ben).entrySet().stream().filter(entry -> entry.getKey().isCurse()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-        EnchantmentHelper.setEnchantments(map6, ben2);
-        ben2.setRepairCost(0);
-        if (ben2.getItem() == Items.ENCHANTED_BOOK && map6.size() == 0) {
-            ben2 = new ItemStack(Items.BOOK);
-            if (ben.hasCustomHoverName()) {
-                ben2.setHoverName(ben.getHoverName());
+        bki2.setCount(integer3);
+        final Map<Enchantment, Integer> map6 = EnchantmentHelper.getEnchantments(bki).entrySet().stream().filter(entry -> entry.getKey().isCurse()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        EnchantmentHelper.setEnchantments(map6, bki2);
+        bki2.setRepairCost(0);
+        if (bki2.getItem() == Items.ENCHANTED_BOOK && map6.size() == 0) {
+            bki2 = new ItemStack(Items.BOOK);
+            if (bki.hasCustomHoverName()) {
+                bki2.setHoverName(bki.getHoverName());
             }
         }
         for (int integer4 = 0; integer4 < map6.size(); ++integer4) {
-            ben2.setRepairCost(AnvilMenu.calculateIncreasedRepairCost(ben2.getBaseRepairCost()));
+            bki2.setRepairCost(AnvilMenu.calculateIncreasedRepairCost(bki2.getBaseRepairCost()));
         }
-        return ben2;
+        return bki2;
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        this.access.execute((bjw, fk) -> this.clearContainer(ayj, bjw, this.repairSlots));
+    public void removed(final Player bec) {
+        super.removed(bec);
+        this.access.execute((bqb, fu) -> this.clearContainer(bec, bqb, this.repairSlots));
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return AbstractContainerMenu.stillValid(this.access, ayj, Blocks.GRINDSTONE);
+    public boolean stillValid(final Player bec) {
+        return AbstractContainerMenu.stillValid(this.access, bec, Blocks.GRINDSTONE);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
-            final ItemStack ben6 = this.repairSlots.getItem(0);
-            final ItemStack ben7 = this.repairSlots.getItem(1);
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
+            final ItemStack bki6 = this.repairSlots.getItem(0);
+            final ItemStack bki7 = this.repairSlots.getItem(1);
             if (integer == 2) {
-                if (!this.moveItemStackTo(ben5, 3, 39, true)) {
+                if (!this.moveItemStackTo(bki5, 3, 39, true)) {
                     return ItemStack.EMPTY;
                 }
-                bca5.onQuickCraft(ben5, ben4);
+                bhw5.onQuickCraft(bki5, bki4);
             }
             else if (integer == 0 || integer == 1) {
-                if (!this.moveItemStackTo(ben5, 3, 39, false)) {
+                if (!this.moveItemStackTo(bki5, 3, 39, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (ben6.isEmpty() || ben7.isEmpty()) {
-                if (!this.moveItemStackTo(ben5, 0, 2, false)) {
+            else if (bki6.isEmpty() || bki7.isEmpty()) {
+                if (!this.moveItemStackTo(bki5, 0, 2, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 3 && integer < 30) {
-                if (!this.moveItemStackTo(ben5, 30, 39, false)) {
+                if (!this.moveItemStackTo(bki5, 30, 39, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (integer >= 30 && integer < 39 && !this.moveItemStackTo(ben5, 3, 30, false)) {
+            else if (integer >= 30 && integer < 39 && !this.moveItemStackTo(bki5, 3, 30, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
-            if (ben5.getCount() == ben4.getCount()) {
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            bca5.onTake(ayj, ben5);
+            bhw5.onTake(bec, bki5);
         }
-        return ben4;
+        return bki4;
     }
 }
diff --git a/src/net/minecraft/world/inventory/HopperMenu.java b/src/net/minecraft/world/inventory/HopperMenu.java
index 321e385..087da9a 100644
--- a/src/net/minecraft/world/inventory/HopperMenu.java
+++ b/src/net/minecraft/world/inventory/HopperMenu.java
@@ -9,61 +9,61 @@ import net.minecraft.world.Container;
 public class HopperMenu extends AbstractContainerMenu {
     private final Container hopper;
     
-    public HopperMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, new SimpleContainer(5));
+    public HopperMenu(final int integer, final Inventory beb) {
+        this(integer, beb, new SimpleContainer(5));
     }
     
-    public HopperMenu(final int integer, final Inventory ayi, final Container aje) {
+    public HopperMenu(final int integer, final Inventory beb, final Container amz) {
         super(MenuType.HOPPER, integer);
-        AbstractContainerMenu.checkContainerSize(this.hopper = aje, 5);
-        aje.startOpen(ayi.player);
+        AbstractContainerMenu.checkContainerSize(this.hopper = amz, 5);
+        amz.startOpen(beb.player);
         final int integer2 = 51;
         for (int integer3 = 0; integer3 < 5; ++integer3) {
-            this.addSlot(new Slot(aje, integer3, 44 + integer3 * 18, 20));
+            this.addSlot(new Slot(amz, integer3, 44 + integer3 * 18, 20));
         }
         for (int integer3 = 0; integer3 < 3; ++integer3) {
             for (int integer4 = 0; integer4 < 9; ++integer4) {
-                this.addSlot(new Slot(ayi, integer4 + integer3 * 9 + 9, 8 + integer4 * 18, integer3 * 18 + 51));
+                this.addSlot(new Slot(beb, integer4 + integer3 * 9 + 9, 8 + integer4 * 18, integer3 * 18 + 51));
             }
         }
         for (int integer3 = 0; integer3 < 9; ++integer3) {
-            this.addSlot(new Slot(ayi, integer3, 8 + integer3 * 18, 109));
+            this.addSlot(new Slot(beb, integer3, 8 + integer3 * 18, 109));
         }
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.hopper.stillValid(ayj);
+    public boolean stillValid(final Player bec) {
+        return this.hopper.stillValid(bec);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if (integer < this.hopper.getContainerSize()) {
-                if (!this.moveItemStackTo(ben5, this.hopper.getContainerSize(), this.slots.size(), true)) {
+                if (!this.moveItemStackTo(bki5, this.hopper.getContainerSize(), this.slots.size(), true)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (!this.moveItemStackTo(ben5, 0, this.hopper.getContainerSize(), false)) {
+            else if (!this.moveItemStackTo(bki5, 0, this.hopper.getContainerSize(), false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        this.hopper.stopOpen(ayj);
+    public void removed(final Player bec) {
+        super.removed(bec);
+        this.hopper.stopOpen(bec);
     }
 }
diff --git a/src/net/minecraft/world/inventory/HorseInventoryMenu.java b/src/net/minecraft/world/inventory/HorseInventoryMenu.java
index 43bef5b..8efabbf 100644
--- a/src/net/minecraft/world/inventory/HorseInventoryMenu.java
+++ b/src/net/minecraft/world/inventory/HorseInventoryMenu.java
@@ -13,33 +13,33 @@ public class HorseInventoryMenu extends AbstractContainerMenu {
     private final Container horseContainer;
     private final AbstractHorse horse;
     
-    public HorseInventoryMenu(final int integer, final Inventory ayi, final Container aje, final AbstractHorse aue) {
+    public HorseInventoryMenu(final int integer, final Inventory beb, final Container amz, final AbstractHorse azm) {
         super(null, integer);
-        this.horseContainer = aje;
-        this.horse = aue;
+        this.horseContainer = amz;
+        this.horse = azm;
         final int integer2 = 3;
-        aje.startOpen(ayi.player);
+        amz.startOpen(beb.player);
         final int integer3 = -18;
-        this.addSlot(new Slot(aje, 0, 8, 18) {
+        this.addSlot(new Slot(amz, 0, 8, 18) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
-                return ben.getItem() == Items.SADDLE && !this.hasItem() && aue.canBeSaddled();
+            public boolean mayPlace(final ItemStack bki) {
+                return bki.getItem() == Items.SADDLE && !this.hasItem() && azm.isSaddleable();
             }
             
             @Override
             public boolean isActive() {
-                return aue.canBeSaddled();
+                return azm.isSaddleable();
             }
         });
-        this.addSlot(new Slot(aje, 1, 8, 36) {
+        this.addSlot(new Slot(amz, 1, 8, 36) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
-                return aue.isArmor(ben);
+            public boolean mayPlace(final ItemStack bki) {
+                return azm.isArmor(bki);
             }
             
             @Override
             public boolean isActive() {
-                return aue.wearsArmor();
+                return azm.canWearArmor();
             }
             
             @Override
@@ -47,84 +47,84 @@ public class HorseInventoryMenu extends AbstractContainerMenu {
                 return 1;
             }
         });
-        if (aue instanceof AbstractChestedHorse && ((AbstractChestedHorse)aue).hasChest()) {
+        if (azm instanceof AbstractChestedHorse && ((AbstractChestedHorse)azm).hasChest()) {
             for (int integer4 = 0; integer4 < 3; ++integer4) {
-                for (int integer5 = 0; integer5 < ((AbstractChestedHorse)aue).getInventoryColumns(); ++integer5) {
-                    this.addSlot(new Slot(aje, 2 + integer5 + integer4 * ((AbstractChestedHorse)aue).getInventoryColumns(), 80 + integer5 * 18, 18 + integer4 * 18));
+                for (int integer5 = 0; integer5 < ((AbstractChestedHorse)azm).getInventoryColumns(); ++integer5) {
+                    this.addSlot(new Slot(amz, 2 + integer5 + integer4 * ((AbstractChestedHorse)azm).getInventoryColumns(), 80 + integer5 * 18, 18 + integer4 * 18));
                 }
             }
         }
         for (int integer4 = 0; integer4 < 3; ++integer4) {
             for (int integer5 = 0; integer5 < 9; ++integer5) {
-                this.addSlot(new Slot(ayi, integer5 + integer4 * 9 + 9, 8 + integer5 * 18, 102 + integer4 * 18 - 18));
+                this.addSlot(new Slot(beb, integer5 + integer4 * 9 + 9, 8 + integer5 * 18, 102 + integer4 * 18 - 18));
             }
         }
         for (int integer4 = 0; integer4 < 9; ++integer4) {
-            this.addSlot(new Slot(ayi, integer4, 8 + integer4 * 18, 142));
+            this.addSlot(new Slot(beb, integer4, 8 + integer4 * 18, 142));
         }
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.horseContainer.stillValid(ayj) && this.horse.isAlive() && this.horse.distanceTo(ayj) < 8.0f;
+    public boolean stillValid(final Player bec) {
+        return this.horseContainer.stillValid(bec) && this.horse.isAlive() && this.horse.distanceTo(bec) < 8.0f;
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             final int integer2 = this.horseContainer.getContainerSize();
             if (integer < integer2) {
-                if (!this.moveItemStackTo(ben5, integer2, this.slots.size(), true)) {
+                if (!this.moveItemStackTo(bki5, integer2, this.slots.size(), true)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (this.getSlot(1).mayPlace(ben5) && !this.getSlot(1).hasItem()) {
-                if (!this.moveItemStackTo(ben5, 1, 2, false)) {
+            else if (this.getSlot(1).mayPlace(bki5) && !this.getSlot(1).hasItem()) {
+                if (!this.moveItemStackTo(bki5, 1, 2, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (this.getSlot(0).mayPlace(ben5)) {
-                if (!this.moveItemStackTo(ben5, 0, 1, false)) {
+            else if (this.getSlot(0).mayPlace(bki5)) {
+                if (!this.moveItemStackTo(bki5, 0, 1, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (integer2 <= 2 || !this.moveItemStackTo(ben5, 2, integer2, false)) {
+            else if (integer2 <= 2 || !this.moveItemStackTo(bki5, 2, integer2, false)) {
                 final int integer3 = integer2;
                 final int integer5;
                 final int integer4 = integer5 = integer3 + 27;
                 final int integer6 = integer5 + 9;
                 if (integer >= integer5 && integer < integer6) {
-                    if (!this.moveItemStackTo(ben5, integer3, integer4, false)) {
+                    if (!this.moveItemStackTo(bki5, integer3, integer4, false)) {
                         return ItemStack.EMPTY;
                     }
                 }
                 else if (integer >= integer3 && integer < integer4) {
-                    if (!this.moveItemStackTo(ben5, integer5, integer6, false)) {
+                    if (!this.moveItemStackTo(bki5, integer5, integer6, false)) {
                         return ItemStack.EMPTY;
                     }
                 }
-                else if (!this.moveItemStackTo(ben5, integer5, integer4, false)) {
+                else if (!this.moveItemStackTo(bki5, integer5, integer4, false)) {
                     return ItemStack.EMPTY;
                 }
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        this.horseContainer.stopOpen(ayj);
+    public void removed(final Player bec) {
+        super.removed(bec);
+        this.horseContainer.stopOpen(bec);
     }
 }
diff --git a/src/net/minecraft/world/inventory/InventoryMenu.java b/src/net/minecraft/world/inventory/InventoryMenu.java
index a91c481..f727198 100644
--- a/src/net/minecraft/world/inventory/InventoryMenu.java
+++ b/src/net/minecraft/world/inventory/InventoryMenu.java
@@ -26,52 +26,52 @@ public class InventoryMenu extends RecipeBookMenu<CraftingContainer> {
     public final boolean active;
     private final Player owner;
     
-    public InventoryMenu(final Inventory ayi, final boolean boolean2, final Player ayj) {
+    public InventoryMenu(final Inventory beb, final boolean boolean2, final Player bec) {
         super(null, 0);
         this.craftSlots = new CraftingContainer(this, 2, 2);
         this.resultSlots = new ResultContainer();
         this.active = boolean2;
-        this.owner = ayj;
-        this.addSlot(new ResultSlot(ayi.player, this.craftSlots, this.resultSlots, 0, 154, 28));
+        this.owner = bec;
+        this.addSlot(new ResultSlot(beb.player, this.craftSlots, this.resultSlots, 0, 154, 28));
         for (int integer5 = 0; integer5 < 2; ++integer5) {
             for (int integer6 = 0; integer6 < 2; ++integer6) {
                 this.addSlot(new Slot(this.craftSlots, integer6 + integer5 * 2, 98 + integer6 * 18, 18 + integer5 * 18));
             }
         }
         for (int integer5 = 0; integer5 < 4; ++integer5) {
-            final EquipmentSlot akv6 = InventoryMenu.SLOT_IDS[integer5];
-            this.addSlot(new Slot(ayi, 39 - integer5, 8, 8 + integer5 * 18) {
+            final EquipmentSlot aor6 = InventoryMenu.SLOT_IDS[integer5];
+            this.addSlot(new Slot(beb, 39 - integer5, 8, 8 + integer5 * 18) {
                 @Override
                 public int getMaxStackSize() {
                     return 1;
                 }
                 
                 @Override
-                public boolean mayPlace(final ItemStack ben) {
-                    return akv6 == Mob.getEquipmentSlotForItem(ben);
+                public boolean mayPlace(final ItemStack bki) {
+                    return aor6 == Mob.getEquipmentSlotForItem(bki);
                 }
                 
                 @Override
-                public boolean mayPickup(final Player ayj) {
-                    final ItemStack ben3 = this.getItem();
-                    return (ben3.isEmpty() || ayj.isCreative() || !EnchantmentHelper.hasBindingCurse(ben3)) && super.mayPickup(ayj);
+                public boolean mayPickup(final Player bec) {
+                    final ItemStack bki3 = this.getItem();
+                    return (bki3.isEmpty() || bec.isCreative() || !EnchantmentHelper.hasBindingCurse(bki3)) && super.mayPickup(bec);
                 }
                 
                 @Override
                 public Pair<ResourceLocation, ResourceLocation> getNoItemIcon() {
-                    return (Pair<ResourceLocation, ResourceLocation>)Pair.of(InventoryMenu.BLOCK_ATLAS, InventoryMenu.TEXTURE_EMPTY_SLOTS[akv6.getIndex()]);
+                    return (Pair<ResourceLocation, ResourceLocation>)Pair.of(InventoryMenu.BLOCK_ATLAS, InventoryMenu.TEXTURE_EMPTY_SLOTS[aor6.getIndex()]);
                 }
             });
         }
         for (int integer5 = 0; integer5 < 3; ++integer5) {
             for (int integer6 = 0; integer6 < 9; ++integer6) {
-                this.addSlot(new Slot(ayi, integer6 + (integer5 + 1) * 9, 8 + integer6 * 18, 84 + integer5 * 18));
+                this.addSlot(new Slot(beb, integer6 + (integer5 + 1) * 9, 8 + integer6 * 18, 84 + integer5 * 18));
             }
         }
         for (int integer5 = 0; integer5 < 9; ++integer5) {
-            this.addSlot(new Slot(ayi, integer5, 8 + integer5 * 18, 142));
+            this.addSlot(new Slot(beb, integer5, 8 + integer5 * 18, 142));
         }
-        this.addSlot(new Slot(ayi, 40, 77, 62) {
+        this.addSlot(new Slot(beb, 40, 77, 62) {
             @Override
             public Pair<ResourceLocation, ResourceLocation> getNoItemIcon() {
                 return (Pair<ResourceLocation, ResourceLocation>)Pair.of(InventoryMenu.BLOCK_ATLAS, InventoryMenu.EMPTY_ARMOR_SLOT_SHIELD);
@@ -80,8 +80,8 @@ public class InventoryMenu extends RecipeBookMenu<CraftingContainer> {
     }
     
     @Override
-    public void fillCraftSlotsStackedContents(final StackedContents ayl) {
-        this.craftSlots.fillStackedContents(ayl);
+    public void fillCraftSlotsStackedContents(final StackedContents bee) {
+        this.craftSlots.fillStackedContents(bee);
     }
     
     @Override
@@ -91,98 +91,98 @@ public class InventoryMenu extends RecipeBookMenu<CraftingContainer> {
     }
     
     @Override
-    public boolean recipeMatches(final Recipe<? super CraftingContainer> bgw) {
-        return bgw.matches(this.craftSlots, this.owner.level);
+    public boolean recipeMatches(final Recipe<? super CraftingContainer> bmu) {
+        return bmu.matches(this.craftSlots, this.owner.level);
     }
     
     @Override
-    public void slotsChanged(final Container aje) {
+    public void slotsChanged(final Container amz) {
         CraftingMenu.slotChangedCraftingGrid(this.containerId, this.owner.level, this.owner, this.craftSlots, this.resultSlots);
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
+    public void removed(final Player bec) {
+        super.removed(bec);
         this.resultSlots.clearContent();
-        if (ayj.level.isClientSide) {
+        if (bec.level.isClientSide) {
             return;
         }
-        this.clearContainer(ayj, ayj.level, this.craftSlots);
+        this.clearContainer(bec, bec.level, this.craftSlots);
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
+    public boolean stillValid(final Player bec) {
         return true;
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
-            final EquipmentSlot akv7 = Mob.getEquipmentSlotForItem(ben4);
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
+            final EquipmentSlot aor7 = Mob.getEquipmentSlotForItem(bki4);
             if (integer == 0) {
-                if (!this.moveItemStackTo(ben5, 9, 45, true)) {
+                if (!this.moveItemStackTo(bki5, 9, 45, true)) {
                     return ItemStack.EMPTY;
                 }
-                bca5.onQuickCraft(ben5, ben4);
+                bhw5.onQuickCraft(bki5, bki4);
             }
             else if (integer >= 1 && integer < 5) {
-                if (!this.moveItemStackTo(ben5, 9, 45, false)) {
+                if (!this.moveItemStackTo(bki5, 9, 45, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 5 && integer < 9) {
-                if (!this.moveItemStackTo(ben5, 9, 45, false)) {
+                if (!this.moveItemStackTo(bki5, 9, 45, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (akv7.getType() == EquipmentSlot.Type.ARMOR && !this.slots.get(8 - akv7.getIndex()).hasItem()) {
-                final int integer2 = 8 - akv7.getIndex();
-                if (!this.moveItemStackTo(ben5, integer2, integer2 + 1, false)) {
+            else if (aor7.getType() == EquipmentSlot.Type.ARMOR && !this.slots.get(8 - aor7.getIndex()).hasItem()) {
+                final int integer2 = 8 - aor7.getIndex();
+                if (!this.moveItemStackTo(bki5, integer2, integer2 + 1, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (akv7 == EquipmentSlot.OFFHAND && !this.slots.get(45).hasItem()) {
-                if (!this.moveItemStackTo(ben5, 45, 46, false)) {
+            else if (aor7 == EquipmentSlot.OFFHAND && !this.slots.get(45).hasItem()) {
+                if (!this.moveItemStackTo(bki5, 45, 46, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 9 && integer < 36) {
-                if (!this.moveItemStackTo(ben5, 36, 45, false)) {
+                if (!this.moveItemStackTo(bki5, 36, 45, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 36 && integer < 45) {
-                if (!this.moveItemStackTo(ben5, 9, 36, false)) {
+                if (!this.moveItemStackTo(bki5, 9, 36, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (!this.moveItemStackTo(ben5, 9, 45, false)) {
+            else if (!this.moveItemStackTo(bki5, 9, 45, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
-            if (ben5.getCount() == ben4.getCount()) {
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            final ItemStack ben6 = bca5.onTake(ayj, ben5);
+            final ItemStack bki6 = bhw5.onTake(bec, bki5);
             if (integer == 0) {
-                ayj.drop(ben6, false);
+                bec.drop(bki6, false);
             }
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public boolean canTakeItemForPickAll(final ItemStack ben, final Slot bca) {
-        return bca.container != this.resultSlots && super.canTakeItemForPickAll(ben, bca);
+    public boolean canTakeItemForPickAll(final ItemStack bki, final Slot bhw) {
+        return bhw.container != this.resultSlots && super.canTakeItemForPickAll(bki, bhw);
     }
     
     @Override
@@ -205,6 +205,10 @@ public class InventoryMenu extends RecipeBookMenu<CraftingContainer> {
         return 5;
     }
     
+    public CraftingContainer getCraftSlots() {
+        return this.craftSlots;
+    }
+    
     static {
         BLOCK_ATLAS = new ResourceLocation("textures/atlas/blocks.png");
         EMPTY_ARMOR_SLOT_HELMET = new ResourceLocation("item/empty_armor_slot_helmet");
diff --git a/src/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/net/minecraft/world/inventory/ItemCombinerMenu.java
new file mode 100644
index 0000000..1a3bf90
--- /dev/null
+++ b/src/net/minecraft/world/inventory/ItemCombinerMenu.java
@@ -0,0 +1,134 @@
+package net.minecraft.world.inventory;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.entity.player.Inventory;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.Container;
+
+public abstract class ItemCombinerMenu extends AbstractContainerMenu {
+    protected final Container resultSlots;
+    protected final Container inputSlots;
+    protected final ContainerLevelAccess access;
+    protected final Player player;
+    
+    protected abstract boolean mayPickup(final Player bec, final boolean boolean2);
+    
+    protected abstract ItemStack onTake(final Player bec, final ItemStack bki);
+    
+    protected abstract boolean isValidBlock(final BlockState cfj);
+    
+    public ItemCombinerMenu(@Nullable final MenuType<?> bhk, final int integer, final Inventory beb, final ContainerLevelAccess bgs) {
+        super(bhk, integer);
+        this.resultSlots = new ResultContainer();
+        this.inputSlots = new SimpleContainer(2) {
+            @Override
+            public void setChanged() {
+                super.setChanged();
+                ItemCombinerMenu.this.slotsChanged(this);
+            }
+        };
+        this.access = bgs;
+        this.player = beb.player;
+        this.addSlot(new Slot(this.inputSlots, 0, 27, 47));
+        this.addSlot(new Slot(this.inputSlots, 1, 76, 47));
+        this.addSlot(new Slot(this.resultSlots, 2, 134, 47) {
+            @Override
+            public boolean mayPlace(final ItemStack bki) {
+                return false;
+            }
+            
+            @Override
+            public boolean mayPickup(final Player bec) {
+                return ItemCombinerMenu.this.mayPickup(bec, this.hasItem());
+            }
+            
+            @Override
+            public ItemStack onTake(final Player bec, final ItemStack bki) {
+                return ItemCombinerMenu.this.onTake(bec, bki);
+            }
+        });
+        for (int integer2 = 0; integer2 < 3; ++integer2) {
+            for (int integer3 = 0; integer3 < 9; ++integer3) {
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
+            }
+        }
+        for (int integer2 = 0; integer2 < 9; ++integer2) {
+            this.addSlot(new Slot(beb, integer2, 8 + integer2 * 18, 142));
+        }
+    }
+    
+    public abstract void createResult();
+    
+    @Override
+    public void slotsChanged(final Container amz) {
+        super.slotsChanged(amz);
+        if (amz == this.inputSlots) {
+            this.createResult();
+        }
+    }
+    
+    @Override
+    public void removed(final Player bec) {
+        super.removed(bec);
+        this.access.execute((bqb, fu) -> this.clearContainer(bec, bqb, this.inputSlots));
+    }
+    
+    @Override
+    public boolean stillValid(final Player bec) {
+        return this.access.<Boolean>evaluate((bqb, fu) -> {
+            if (!this.isValidBlock(bqb.getBlockState(fu))) {
+                return false;
+            }
+            else {
+                return bec.distanceToSqr(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5) <= 64.0;
+            }
+        }, Boolean.valueOf(true));
+    }
+    
+    protected boolean shouldQuickMoveToAdditionalSlot(final ItemStack bki) {
+        return false;
+    }
+    
+    @Override
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
+            if (integer == 2) {
+                if (!this.moveItemStackTo(bki5, 3, 39, true)) {
+                    return ItemStack.EMPTY;
+                }
+                bhw5.onQuickCraft(bki5, bki4);
+            }
+            else if (integer == 0 || integer == 1) {
+                if (!this.moveItemStackTo(bki5, 3, 39, false)) {
+                    return ItemStack.EMPTY;
+                }
+            }
+            else if (integer >= 3 && integer < 39) {
+                final int integer2 = this.shouldQuickMoveToAdditionalSlot(bki4) ? 1 : 0;
+                if (!this.moveItemStackTo(bki5, integer2, 2, false)) {
+                    return ItemStack.EMPTY;
+                }
+            }
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
+            }
+            else {
+                bhw5.setChanged();
+            }
+            if (bki5.getCount() == bki4.getCount()) {
+                return ItemStack.EMPTY;
+            }
+            bhw5.onTake(bec, bki5);
+        }
+        return bki4;
+    }
+}
diff --git a/src/net/minecraft/world/inventory/LecternMenu.java b/src/net/minecraft/world/inventory/LecternMenu.java
index 0152303..d5c74bb 100644
--- a/src/net/minecraft/world/inventory/LecternMenu.java
+++ b/src/net/minecraft/world/inventory/LecternMenu.java
@@ -13,24 +13,24 @@ public class LecternMenu extends AbstractContainerMenu {
         this(integer, new SimpleContainer(1), new SimpleContainerData(1));
     }
     
-    public LecternMenu(final int integer, final Container aje, final ContainerData baw) {
+    public LecternMenu(final int integer, final Container amz, final ContainerData bgr) {
         super(MenuType.LECTERN, integer);
-        AbstractContainerMenu.checkContainerSize(aje, 1);
-        AbstractContainerMenu.checkContainerDataCount(baw, 1);
-        this.lectern = aje;
-        this.lecternData = baw;
-        this.addSlot(new Slot(aje, 0, 0, 0) {
+        AbstractContainerMenu.checkContainerSize(amz, 1);
+        AbstractContainerMenu.checkContainerDataCount(bgr, 1);
+        this.lectern = amz;
+        this.lecternData = bgr;
+        this.addSlot(new Slot(amz, 0, 0, 0) {
             @Override
             public void setChanged() {
                 super.setChanged();
                 LecternMenu.this.slotsChanged(this.container);
             }
         });
-        this.addDataSlots(baw);
+        this.addDataSlots(bgr);
     }
     
     @Override
-    public boolean clickMenuButton(final Player ayj, final int integer) {
+    public boolean clickMenuButton(final Player bec, final int integer) {
         if (integer >= 100) {
             final int integer2 = integer - 100;
             this.setData(0, integer2);
@@ -48,13 +48,13 @@ public class LecternMenu extends AbstractContainerMenu {
                 return true;
             }
             case 3: {
-                if (!ayj.mayBuild()) {
+                if (!bec.mayBuild()) {
                     return false;
                 }
-                final ItemStack ben4 = this.lectern.removeItemNoUpdate(0);
+                final ItemStack bki4 = this.lectern.removeItemNoUpdate(0);
                 this.lectern.setChanged();
-                if (!ayj.inventory.add(ben4)) {
-                    ayj.drop(ben4, false);
+                if (!bec.inventory.add(bki4)) {
+                    bec.drop(bki4, false);
                 }
                 return true;
             }
@@ -71,8 +71,8 @@ public class LecternMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.lectern.stillValid(ayj);
+    public boolean stillValid(final Player bec) {
+        return this.lectern.stillValid(bec);
     }
     
     public ItemStack getBook() {
diff --git a/src/net/minecraft/world/inventory/LoomMenu.java b/src/net/minecraft/world/inventory/LoomMenu.java
index 70c9f49..13809b8 100644
--- a/src/net/minecraft/world/inventory/LoomMenu.java
+++ b/src/net/minecraft/world/inventory/LoomMenu.java
@@ -32,11 +32,11 @@ public class LoomMenu extends AbstractContainerMenu {
     private final Container inputContainer;
     private final Container outputContainer;
     
-    public LoomMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, ContainerLevelAccess.NULL);
+    public LoomMenu(final int integer, final Inventory beb) {
+        this(integer, beb, ContainerLevelAccess.NULL);
     }
     
-    public LoomMenu(final int integer, final Inventory ayi, final ContainerLevelAccess bax) {
+    public LoomMenu(final int integer, final Inventory beb, final ContainerLevelAccess bgs) {
         super(MenuType.LOOM, integer);
         this.selectedBannerPatternIndex = DataSlot.standalone();
         this.slotUpdateListener = (() -> {});
@@ -55,57 +55,57 @@ public class LoomMenu extends AbstractContainerMenu {
                 LoomMenu.this.slotUpdateListener.run();
             }
         };
-        this.access = bax;
+        this.access = bgs;
         this.bannerSlot = this.addSlot(new Slot(this.inputContainer, 0, 13, 26) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
-                return ben.getItem() instanceof BannerItem;
+            public boolean mayPlace(final ItemStack bki) {
+                return bki.getItem() instanceof BannerItem;
             }
         });
         this.dyeSlot = this.addSlot(new Slot(this.inputContainer, 1, 33, 26) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
-                return ben.getItem() instanceof DyeItem;
+            public boolean mayPlace(final ItemStack bki) {
+                return bki.getItem() instanceof DyeItem;
             }
         });
         this.patternSlot = this.addSlot(new Slot(this.inputContainer, 2, 23, 45) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
-                return ben.getItem() instanceof BannerPatternItem;
+            public boolean mayPlace(final ItemStack bki) {
+                return bki.getItem() instanceof BannerPatternItem;
             }
         });
         this.resultSlot = this.addSlot(new Slot(this.outputContainer, 0, 143, 58) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
+            public boolean mayPlace(final ItemStack bki) {
                 return false;
             }
             
             @Override
-            public ItemStack onTake(final Player ayj, final ItemStack ben) {
+            public ItemStack onTake(final Player bec, final ItemStack bki) {
                 LoomMenu.this.bannerSlot.remove(1);
                 LoomMenu.this.dyeSlot.remove(1);
                 if (!LoomMenu.this.bannerSlot.hasItem() || !LoomMenu.this.dyeSlot.hasItem()) {
                     LoomMenu.this.selectedBannerPatternIndex.set(0);
                 }
                 final long long4;
-                bax.execute((bjw, fk) -> {
-                    long4 = bjw.getGameTime();
+                bgs.execute((bqb, fu) -> {
+                    long4 = bqb.getGameTime();
                     if (LoomMenu.this.lastSoundTime != long4) {
-                        bjw.playSound(null, fk, SoundEvents.UI_LOOM_TAKE_RESULT, SoundSource.BLOCKS, 1.0f, 1.0f);
+                        bqb.playSound(null, fu, SoundEvents.UI_LOOM_TAKE_RESULT, SoundSource.BLOCKS, 1.0f, 1.0f);
                         LoomMenu.this.lastSoundTime = long4;
                     }
                     return;
                 });
-                return super.onTake(ayj, ben);
+                return super.onTake(bec, bki);
             }
         });
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 8 + integer2 * 18, 142));
+            this.addSlot(new Slot(beb, integer2, 8 + integer2 * 18, 142));
         }
         this.addDataSlot(this.selectedBannerPatternIndex);
     }
@@ -115,12 +115,12 @@ public class LoomMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return AbstractContainerMenu.stillValid(this.access, ayj, Blocks.LOOM);
+    public boolean stillValid(final Player bec) {
+        return AbstractContainerMenu.stillValid(this.access, bec, Blocks.LOOM);
     }
     
     @Override
-    public boolean clickMenuButton(final Player ayj, final int integer) {
+    public boolean clickMenuButton(final Player bec, final int integer) {
         if (integer > 0 && integer <= BannerPattern.AVAILABLE_PATTERNS) {
             this.selectedBannerPatternIndex.set(integer);
             this.setupResultSlot();
@@ -130,23 +130,23 @@ public class LoomMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public void slotsChanged(final Container aje) {
-        final ItemStack ben3 = this.bannerSlot.getItem();
-        final ItemStack ben4 = this.dyeSlot.getItem();
-        final ItemStack ben5 = this.patternSlot.getItem();
-        final ItemStack ben6 = this.resultSlot.getItem();
-        if (!ben6.isEmpty() && (ben3.isEmpty() || ben4.isEmpty() || this.selectedBannerPatternIndex.get() <= 0 || (this.selectedBannerPatternIndex.get() >= BannerPattern.COUNT - 5 && ben5.isEmpty()))) {
+    public void slotsChanged(final Container amz) {
+        final ItemStack bki3 = this.bannerSlot.getItem();
+        final ItemStack bki4 = this.dyeSlot.getItem();
+        final ItemStack bki5 = this.patternSlot.getItem();
+        final ItemStack bki6 = this.resultSlot.getItem();
+        if (!bki6.isEmpty() && (bki3.isEmpty() || bki4.isEmpty() || this.selectedBannerPatternIndex.get() <= 0 || (this.selectedBannerPatternIndex.get() >= BannerPattern.COUNT - BannerPattern.PATTERN_ITEM_COUNT && bki5.isEmpty()))) {
             this.resultSlot.set(ItemStack.EMPTY);
             this.selectedBannerPatternIndex.set(0);
         }
-        else if (!ben5.isEmpty() && ben5.getItem() instanceof BannerPatternItem) {
-            final CompoundTag jt7 = ben3.getOrCreateTagElement("BlockEntityTag");
-            final boolean boolean8 = jt7.contains("Patterns", 9) && !ben3.isEmpty() && jt7.getList("Patterns", 10).size() >= 6;
+        else if (!bki5.isEmpty() && bki5.getItem() instanceof BannerPatternItem) {
+            final CompoundTag le7 = bki3.getOrCreateTagElement("BlockEntityTag");
+            final boolean boolean8 = le7.contains("Patterns", 9) && !bki3.isEmpty() && le7.getList("Patterns", 10).size() >= 6;
             if (boolean8) {
                 this.selectedBannerPatternIndex.set(0);
             }
             else {
-                this.selectedBannerPatternIndex.set(((BannerPatternItem)ben5.getItem()).getBannerPattern().ordinal());
+                this.selectedBannerPatternIndex.set(((BannerPatternItem)bki5.getItem()).getBannerPattern().ordinal());
             }
         }
         this.setupResultSlot();
@@ -158,92 +158,92 @@ public class LoomMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if (integer == this.resultSlot.index) {
-                if (!this.moveItemStackTo(ben5, 4, 40, true)) {
+                if (!this.moveItemStackTo(bki5, 4, 40, true)) {
                     return ItemStack.EMPTY;
                 }
-                bca5.onQuickCraft(ben5, ben4);
+                bhw5.onQuickCraft(bki5, bki4);
             }
             else if (integer == this.dyeSlot.index || integer == this.bannerSlot.index || integer == this.patternSlot.index) {
-                if (!this.moveItemStackTo(ben5, 4, 40, false)) {
+                if (!this.moveItemStackTo(bki5, 4, 40, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (ben5.getItem() instanceof BannerItem) {
-                if (!this.moveItemStackTo(ben5, this.bannerSlot.index, this.bannerSlot.index + 1, false)) {
+            else if (bki5.getItem() instanceof BannerItem) {
+                if (!this.moveItemStackTo(bki5, this.bannerSlot.index, this.bannerSlot.index + 1, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (ben5.getItem() instanceof DyeItem) {
-                if (!this.moveItemStackTo(ben5, this.dyeSlot.index, this.dyeSlot.index + 1, false)) {
+            else if (bki5.getItem() instanceof DyeItem) {
+                if (!this.moveItemStackTo(bki5, this.dyeSlot.index, this.dyeSlot.index + 1, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (ben5.getItem() instanceof BannerPatternItem) {
-                if (!this.moveItemStackTo(ben5, this.patternSlot.index, this.patternSlot.index + 1, false)) {
+            else if (bki5.getItem() instanceof BannerPatternItem) {
+                if (!this.moveItemStackTo(bki5, this.patternSlot.index, this.patternSlot.index + 1, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 4 && integer < 31) {
-                if (!this.moveItemStackTo(ben5, 31, 40, false)) {
+                if (!this.moveItemStackTo(bki5, 31, 40, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (integer >= 31 && integer < 40 && !this.moveItemStackTo(ben5, 4, 31, false)) {
+            else if (integer >= 31 && integer < 40 && !this.moveItemStackTo(bki5, 4, 31, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
-            if (ben5.getCount() == ben4.getCount()) {
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            bca5.onTake(ayj, ben5);
+            bhw5.onTake(bec, bki5);
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        this.access.execute((bjw, fk) -> this.clearContainer(ayj, ayj.level, this.inputContainer));
+    public void removed(final Player bec) {
+        super.removed(bec);
+        this.access.execute((bqb, fu) -> this.clearContainer(bec, bec.level, this.inputContainer));
     }
     
     private void setupResultSlot() {
         if (this.selectedBannerPatternIndex.get() > 0) {
-            final ItemStack ben2 = this.bannerSlot.getItem();
-            final ItemStack ben3 = this.dyeSlot.getItem();
-            ItemStack ben4 = ItemStack.EMPTY;
-            if (!ben2.isEmpty() && !ben3.isEmpty()) {
-                ben4 = ben2.copy();
-                ben4.setCount(1);
-                final BannerPattern bwd5 = BannerPattern.values()[this.selectedBannerPatternIndex.get()];
-                final DyeColor bdj6 = ((DyeItem)ben3.getItem()).getDyeColor();
-                final CompoundTag jt7 = ben4.getOrCreateTagElement("BlockEntityTag");
-                ListTag jz8;
-                if (jt7.contains("Patterns", 9)) {
-                    jz8 = jt7.getList("Patterns", 10);
+            final ItemStack bki2 = this.bannerSlot.getItem();
+            final ItemStack bki3 = this.dyeSlot.getItem();
+            ItemStack bki4 = ItemStack.EMPTY;
+            if (!bki2.isEmpty() && !bki3.isEmpty()) {
+                bki4 = bki2.copy();
+                bki4.setCount(1);
+                final BannerPattern cdd5 = BannerPattern.values()[this.selectedBannerPatternIndex.get()];
+                final DyeColor bje6 = ((DyeItem)bki3.getItem()).getDyeColor();
+                final CompoundTag le7 = bki4.getOrCreateTagElement("BlockEntityTag");
+                ListTag lk8;
+                if (le7.contains("Patterns", 9)) {
+                    lk8 = le7.getList("Patterns", 10);
                 }
                 else {
-                    jz8 = new ListTag();
-                    jt7.put("Patterns", jz8);
+                    lk8 = new ListTag();
+                    le7.put("Patterns", lk8);
                 }
-                final CompoundTag jt8 = new CompoundTag();
-                jt8.putString("Pattern", bwd5.getHashname());
-                jt8.putInt("Color", bdj6.getId());
-                ((AbstractList<CompoundTag>)jz8).add(jt8);
+                final CompoundTag le8 = new CompoundTag();
+                le8.putString("Pattern", cdd5.getHashname());
+                le8.putInt("Color", bje6.getId());
+                ((AbstractList<CompoundTag>)lk8).add(le8);
             }
-            if (!ItemStack.matches(ben4, this.resultSlot.getItem())) {
-                this.resultSlot.set(ben4);
+            if (!ItemStack.matches(bki4, this.resultSlot.getItem())) {
+                this.resultSlot.set(bki4);
             }
         }
     }
diff --git a/src/net/minecraft/world/inventory/MenuConstructor.java b/src/net/minecraft/world/inventory/MenuConstructor.java
index 8c1595a..42fb3c1 100644
--- a/src/net/minecraft/world/inventory/MenuConstructor.java
+++ b/src/net/minecraft/world/inventory/MenuConstructor.java
@@ -7,5 +7,5 @@ import net.minecraft.world.entity.player.Inventory;
 @FunctionalInterface
 public interface MenuConstructor {
     @Nullable
-    AbstractContainerMenu createMenu(final int integer, final Inventory ayi, final Player ayj);
+    AbstractContainerMenu createMenu(final int integer, final Inventory beb, final Player bec);
 }
diff --git a/src/net/minecraft/world/inventory/MenuType.java b/src/net/minecraft/world/inventory/MenuType.java
index 271f300..5e9b2ae 100644
--- a/src/net/minecraft/world/inventory/MenuType.java
+++ b/src/net/minecraft/world/inventory/MenuType.java
@@ -24,6 +24,7 @@ public class MenuType<T extends AbstractContainerMenu> {
     public static final MenuType<LoomMenu> LOOM;
     public static final MenuType<MerchantMenu> MERCHANT;
     public static final MenuType<ShulkerBoxMenu> SHULKER_BOX;
+    public static final MenuType<SmithingMenu> SMITHING;
     public static final MenuType<SmokerMenu> SMOKER;
     public static final MenuType<CartographyTableMenu> CARTOGRAPHY_TABLE;
     public static final MenuType<StonecutterMenu> STONECUTTER;
@@ -37,8 +38,8 @@ public class MenuType<T extends AbstractContainerMenu> {
         this.constructor = a;
     }
     
-    public T create(final int integer, final Inventory ayi) {
-        return this.constructor.create(integer, ayi);
+    public T create(final int integer, final Inventory beb) {
+        return this.constructor.create(integer, beb);
     }
     
     static {
@@ -58,16 +59,17 @@ public class MenuType<T extends AbstractContainerMenu> {
         FURNACE = MenuType.<FurnaceMenu>register("furnace", FurnaceMenu::new);
         GRINDSTONE = MenuType.<GrindstoneMenu>register("grindstone", GrindstoneMenu::new);
         HOPPER = MenuType.<HopperMenu>register("hopper", HopperMenu::new);
-        LECTERN = MenuType.<LecternMenu>register("lectern", (integer, ayi) -> new LecternMenu(integer));
+        LECTERN = MenuType.<LecternMenu>register("lectern", (integer, beb) -> new LecternMenu(integer));
         LOOM = MenuType.<LoomMenu>register("loom", LoomMenu::new);
         MERCHANT = MenuType.<MerchantMenu>register("merchant", MerchantMenu::new);
         SHULKER_BOX = MenuType.<ShulkerBoxMenu>register("shulker_box", ShulkerBoxMenu::new);
+        SMITHING = MenuType.<SmithingMenu>register("smithing", SmithingMenu::new);
         SMOKER = MenuType.<SmokerMenu>register("smoker", SmokerMenu::new);
         CARTOGRAPHY_TABLE = MenuType.<CartographyTableMenu>register("cartography_table", CartographyTableMenu::new);
         STONECUTTER = MenuType.<StonecutterMenu>register("stonecutter", StonecutterMenu::new);
     }
     
     interface MenuSupplier<T extends AbstractContainerMenu> {
-        T create(final int integer, final Inventory ayi);
+        T create(final int integer, final Inventory beb);
     }
 }
diff --git a/src/net/minecraft/world/inventory/MerchantContainer.java b/src/net/minecraft/world/inventory/MerchantContainer.java
index b6ee0d3..a2f6a65 100644
--- a/src/net/minecraft/world/inventory/MerchantContainer.java
+++ b/src/net/minecraft/world/inventory/MerchantContainer.java
@@ -20,9 +20,9 @@ public class MerchantContainer implements Container {
     private int selectionHint;
     private int futureXp;
     
-    public MerchantContainer(final Merchant biy) {
+    public MerchantContainer(final Merchant boy) {
         this.itemStacks = NonNullList.<ItemStack>withSize(3, ItemStack.EMPTY);
-        this.merchant = biy;
+        this.merchant = boy;
     }
     
     @Override
@@ -32,8 +32,8 @@ public class MerchantContainer implements Container {
     
     @Override
     public boolean isEmpty() {
-        for (final ItemStack ben3 : this.itemStacks) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.itemStacks) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
@@ -47,15 +47,15 @@ public class MerchantContainer implements Container {
     
     @Override
     public ItemStack removeItem(final int integer1, final int integer2) {
-        final ItemStack ben4 = this.itemStacks.get(integer1);
-        if (integer1 == 2 && !ben4.isEmpty()) {
-            return ContainerHelper.removeItem(this.itemStacks, integer1, ben4.getCount());
+        final ItemStack bki4 = this.itemStacks.get(integer1);
+        if (integer1 == 2 && !bki4.isEmpty()) {
+            return ContainerHelper.removeItem(this.itemStacks, integer1, bki4.getCount());
         }
-        final ItemStack ben5 = ContainerHelper.removeItem(this.itemStacks, integer1, integer2);
-        if (!ben5.isEmpty() && this.isPaymentSlot(integer1)) {
+        final ItemStack bki5 = ContainerHelper.removeItem(this.itemStacks, integer1, integer2);
+        if (!bki5.isEmpty() && this.isPaymentSlot(integer1)) {
             this.updateSellItem();
         }
-        return ben5;
+        return bki5;
     }
     
     private boolean isPaymentSlot(final int integer) {
@@ -68,10 +68,10 @@ public class MerchantContainer implements Container {
     }
     
     @Override
-    public void setItem(final int integer, final ItemStack ben) {
-        this.itemStacks.set(integer, ben);
-        if (!ben.isEmpty() && ben.getCount() > this.getMaxStackSize()) {
-            ben.setCount(this.getMaxStackSize());
+    public void setItem(final int integer, final ItemStack bki) {
+        this.itemStacks.set(integer, bki);
+        if (!bki.isEmpty() && bki.getCount() > this.getMaxStackSize()) {
+            bki.setCount(this.getMaxStackSize());
         }
         if (this.isPaymentSlot(integer)) {
             this.updateSellItem();
@@ -79,8 +79,8 @@ public class MerchantContainer implements Container {
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.merchant.getTradingPlayer() == ayj;
+    public boolean stillValid(final Player bec) {
+        return this.merchant.getTradingPlayer() == bec;
     }
     
     @Override
@@ -90,32 +90,32 @@ public class MerchantContainer implements Container {
     
     public void updateSellItem() {
         this.activeOffer = null;
-        ItemStack ben2;
-        ItemStack ben3;
+        ItemStack bki2;
+        ItemStack bki3;
         if (this.itemStacks.get(0).isEmpty()) {
-            ben2 = this.itemStacks.get(1);
-            ben3 = ItemStack.EMPTY;
+            bki2 = this.itemStacks.get(1);
+            bki3 = ItemStack.EMPTY;
         }
         else {
-            ben2 = this.itemStacks.get(0);
-            ben3 = this.itemStacks.get(1);
+            bki2 = this.itemStacks.get(0);
+            bki3 = this.itemStacks.get(1);
         }
-        if (ben2.isEmpty()) {
+        if (bki2.isEmpty()) {
             this.setItem(2, ItemStack.EMPTY);
             this.futureXp = 0;
             return;
         }
-        final MerchantOffers bja4 = this.merchant.getOffers();
-        if (!bja4.isEmpty()) {
-            MerchantOffer biz5 = bja4.getRecipeFor(ben2, ben3, this.selectionHint);
-            if (biz5 == null || biz5.isOutOfStock()) {
-                this.activeOffer = biz5;
-                biz5 = bja4.getRecipeFor(ben3, ben2, this.selectionHint);
+        final MerchantOffers bpa4 = this.merchant.getOffers();
+        if (!bpa4.isEmpty()) {
+            MerchantOffer boz5 = bpa4.getRecipeFor(bki2, bki3, this.selectionHint);
+            if (boz5 == null || boz5.isOutOfStock()) {
+                this.activeOffer = boz5;
+                boz5 = bpa4.getRecipeFor(bki3, bki2, this.selectionHint);
             }
-            if (biz5 != null && !biz5.isOutOfStock()) {
-                this.activeOffer = biz5;
-                this.setItem(2, biz5.assemble());
-                this.futureXp = biz5.getXp();
+            if (boz5 != null && !boz5.isOutOfStock()) {
+                this.activeOffer = boz5;
+                this.setItem(2, boz5.assemble());
+                this.futureXp = boz5.getXp();
             }
             else {
                 this.setItem(2, ItemStack.EMPTY);
diff --git a/src/net/minecraft/world/inventory/MerchantMenu.java b/src/net/minecraft/world/inventory/MerchantMenu.java
index 57c44d9..df32d3d 100644
--- a/src/net/minecraft/world/inventory/MerchantMenu.java
+++ b/src/net/minecraft/world/inventory/MerchantMenu.java
@@ -19,24 +19,24 @@ public class MerchantMenu extends AbstractContainerMenu {
     private boolean showProgressBar;
     private boolean canRestock;
     
-    public MerchantMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, new ClientSideMerchant(ayi.player));
+    public MerchantMenu(final int integer, final Inventory beb) {
+        this(integer, beb, new ClientSideMerchant(beb.player));
     }
     
-    public MerchantMenu(final int integer, final Inventory ayi, final Merchant biy) {
+    public MerchantMenu(final int integer, final Inventory beb, final Merchant boy) {
         super(MenuType.MERCHANT, integer);
-        this.trader = biy;
-        this.tradeContainer = new MerchantContainer(biy);
+        this.trader = boy;
+        this.tradeContainer = new MerchantContainer(boy);
         this.addSlot(new Slot(this.tradeContainer, 0, 136, 37));
         this.addSlot(new Slot(this.tradeContainer, 1, 162, 37));
-        this.addSlot(new MerchantResultSlot(ayi.player, biy, this.tradeContainer, 2, 220, 37));
+        this.addSlot(new MerchantResultSlot(beb.player, boy, this.tradeContainer, 2, 220, 37));
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 108 + integer3 * 18, 84 + integer2 * 18));
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 108 + integer3 * 18, 84 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 108 + integer2 * 18, 142));
+            this.addSlot(new Slot(beb, integer2, 108 + integer2 * 18, 142));
         }
     }
     
@@ -45,9 +45,9 @@ public class MerchantMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public void slotsChanged(final Container aje) {
+    public void slotsChanged(final Container amz) {
         this.tradeContainer.updateSellItem();
-        super.slotsChanged(aje);
+        super.slotsChanged(amz);
     }
     
     public void setSelectionHint(final int integer) {
@@ -55,8 +55,8 @@ public class MerchantMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.trader.getTradingPlayer() == ayj;
+    public boolean stillValid(final Player bec) {
+        return this.trader.getTradingPlayer() == bec;
     }
     
     public int getTraderXp() {
@@ -88,78 +88,78 @@ public class MerchantMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public boolean canTakeItemForPickAll(final ItemStack ben, final Slot bca) {
+    public boolean canTakeItemForPickAll(final ItemStack bki, final Slot bhw) {
         return false;
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if (integer == 2) {
-                if (!this.moveItemStackTo(ben5, 3, 39, true)) {
+                if (!this.moveItemStackTo(bki5, 3, 39, true)) {
                     return ItemStack.EMPTY;
                 }
-                bca5.onQuickCraft(ben5, ben4);
+                bhw5.onQuickCraft(bki5, bki4);
                 this.playTradeSound();
             }
             else if (integer == 0 || integer == 1) {
-                if (!this.moveItemStackTo(ben5, 3, 39, false)) {
+                if (!this.moveItemStackTo(bki5, 3, 39, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 3 && integer < 30) {
-                if (!this.moveItemStackTo(ben5, 30, 39, false)) {
+                if (!this.moveItemStackTo(bki5, 30, 39, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (integer >= 30 && integer < 39 && !this.moveItemStackTo(ben5, 3, 30, false)) {
+            else if (integer >= 30 && integer < 39 && !this.moveItemStackTo(bki5, 3, 30, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
-            if (ben5.getCount() == ben4.getCount()) {
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            bca5.onTake(ayj, ben5);
+            bhw5.onTake(bec, bki5);
         }
-        return ben4;
+        return bki4;
     }
     
     private void playTradeSound() {
         if (!this.trader.getLevel().isClientSide) {
-            final Entity akq2 = (Entity)this.trader;
-            this.trader.getLevel().playLocalSound(akq2.getX(), akq2.getY(), akq2.getZ(), this.trader.getNotifyTradeSound(), SoundSource.NEUTRAL, 1.0f, 1.0f, false);
+            final Entity aom2 = (Entity)this.trader;
+            this.trader.getLevel().playLocalSound(aom2.getX(), aom2.getY(), aom2.getZ(), this.trader.getNotifyTradeSound(), SoundSource.NEUTRAL, 1.0f, 1.0f, false);
         }
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
+    public void removed(final Player bec) {
+        super.removed(bec);
         this.trader.setTradingPlayer(null);
         if (this.trader.getLevel().isClientSide) {
             return;
         }
-        if (!ayj.isAlive() || (ayj instanceof ServerPlayer && ((ServerPlayer)ayj).hasDisconnected())) {
-            ItemStack ben3 = this.tradeContainer.removeItemNoUpdate(0);
-            if (!ben3.isEmpty()) {
-                ayj.drop(ben3, false);
+        if (!bec.isAlive() || (bec instanceof ServerPlayer && ((ServerPlayer)bec).hasDisconnected())) {
+            ItemStack bki3 = this.tradeContainer.removeItemNoUpdate(0);
+            if (!bki3.isEmpty()) {
+                bec.drop(bki3, false);
             }
-            ben3 = this.tradeContainer.removeItemNoUpdate(1);
-            if (!ben3.isEmpty()) {
-                ayj.drop(ben3, false);
+            bki3 = this.tradeContainer.removeItemNoUpdate(1);
+            if (!bki3.isEmpty()) {
+                bec.drop(bki3, false);
             }
         }
         else {
-            ayj.inventory.placeItemBackInInventory(ayj.level, this.tradeContainer.removeItemNoUpdate(0));
-            ayj.inventory.placeItemBackInInventory(ayj.level, this.tradeContainer.removeItemNoUpdate(1));
+            bec.inventory.placeItemBackInInventory(bec.level, this.tradeContainer.removeItemNoUpdate(0));
+            bec.inventory.placeItemBackInInventory(bec.level, this.tradeContainer.removeItemNoUpdate(1));
         }
     }
     
@@ -167,42 +167,42 @@ public class MerchantMenu extends AbstractContainerMenu {
         if (this.getOffers().size() <= integer) {
             return;
         }
-        final ItemStack ben3 = this.tradeContainer.getItem(0);
-        if (!ben3.isEmpty()) {
-            if (!this.moveItemStackTo(ben3, 3, 39, true)) {
+        final ItemStack bki3 = this.tradeContainer.getItem(0);
+        if (!bki3.isEmpty()) {
+            if (!this.moveItemStackTo(bki3, 3, 39, true)) {
                 return;
             }
-            this.tradeContainer.setItem(0, ben3);
+            this.tradeContainer.setItem(0, bki3);
         }
-        final ItemStack ben4 = this.tradeContainer.getItem(1);
-        if (!ben4.isEmpty()) {
-            if (!this.moveItemStackTo(ben4, 3, 39, true)) {
+        final ItemStack bki4 = this.tradeContainer.getItem(1);
+        if (!bki4.isEmpty()) {
+            if (!this.moveItemStackTo(bki4, 3, 39, true)) {
                 return;
             }
-            this.tradeContainer.setItem(1, ben4);
+            this.tradeContainer.setItem(1, bki4);
         }
         if (this.tradeContainer.getItem(0).isEmpty() && this.tradeContainer.getItem(1).isEmpty()) {
-            final ItemStack ben5 = this.getOffers().get(integer).getCostA();
-            this.moveFromInventoryToPaymentSlot(0, ben5);
-            final ItemStack ben6 = this.getOffers().get(integer).getCostB();
-            this.moveFromInventoryToPaymentSlot(1, ben6);
+            final ItemStack bki5 = this.getOffers().get(integer).getCostA();
+            this.moveFromInventoryToPaymentSlot(0, bki5);
+            final ItemStack bki6 = this.getOffers().get(integer).getCostB();
+            this.moveFromInventoryToPaymentSlot(1, bki6);
         }
     }
     
-    private void moveFromInventoryToPaymentSlot(final int integer, final ItemStack ben) {
-        if (!ben.isEmpty()) {
+    private void moveFromInventoryToPaymentSlot(final int integer, final ItemStack bki) {
+        if (!bki.isEmpty()) {
             for (int integer2 = 3; integer2 < 39; ++integer2) {
-                final ItemStack ben2 = this.slots.get(integer2).getItem();
-                if (!ben2.isEmpty() && this.isSameItem(ben, ben2)) {
-                    final ItemStack ben3 = this.tradeContainer.getItem(integer);
-                    final int integer3 = ben3.isEmpty() ? 0 : ben3.getCount();
-                    final int integer4 = Math.min(ben.getMaxStackSize() - integer3, ben2.getCount());
-                    final ItemStack ben4 = ben2.copy();
+                final ItemStack bki2 = this.slots.get(integer2).getItem();
+                if (!bki2.isEmpty() && this.isSameItem(bki, bki2)) {
+                    final ItemStack bki3 = this.tradeContainer.getItem(integer);
+                    final int integer3 = bki3.isEmpty() ? 0 : bki3.getCount();
+                    final int integer4 = Math.min(bki.getMaxStackSize() - integer3, bki2.getCount());
+                    final ItemStack bki4 = bki2.copy();
                     final int integer5 = integer3 + integer4;
-                    ben2.shrink(integer4);
-                    ben4.setCount(integer5);
-                    this.tradeContainer.setItem(integer, ben4);
-                    if (integer5 >= ben.getMaxStackSize()) {
+                    bki2.shrink(integer4);
+                    bki4.setCount(integer5);
+                    this.tradeContainer.setItem(integer, bki4);
+                    if (integer5 >= bki.getMaxStackSize()) {
                         break;
                     }
                 }
@@ -210,12 +210,12 @@ public class MerchantMenu extends AbstractContainerMenu {
         }
     }
     
-    private boolean isSameItem(final ItemStack ben1, final ItemStack ben2) {
-        return ben1.getItem() == ben2.getItem() && ItemStack.tagMatches(ben1, ben2);
+    private boolean isSameItem(final ItemStack bki1, final ItemStack bki2) {
+        return bki1.getItem() == bki2.getItem() && ItemStack.tagMatches(bki1, bki2);
     }
     
-    public void setOffers(final MerchantOffers bja) {
-        this.trader.overrideOffers(bja);
+    public void setOffers(final MerchantOffers bpa) {
+        this.trader.overrideOffers(bpa);
     }
     
     public MerchantOffers getOffers() {
diff --git a/src/net/minecraft/world/inventory/MerchantResultSlot.java b/src/net/minecraft/world/inventory/MerchantResultSlot.java
index 59dbe1b..4de41ed 100644
--- a/src/net/minecraft/world/inventory/MerchantResultSlot.java
+++ b/src/net/minecraft/world/inventory/MerchantResultSlot.java
@@ -13,15 +13,15 @@ public class MerchantResultSlot extends Slot {
     private int removeCount;
     private final Merchant merchant;
     
-    public MerchantResultSlot(final Player ayj, final Merchant biy, final MerchantContainer bbp, final int integer4, final int integer5, final int integer6) {
-        super(bbp, integer4, integer5, integer6);
-        this.player = ayj;
-        this.merchant = biy;
-        this.slots = bbp;
+    public MerchantResultSlot(final Player bec, final Merchant boy, final MerchantContainer bhl, final int integer4, final int integer5, final int integer6) {
+        super(bhl, integer4, integer5, integer6);
+        this.player = bec;
+        this.merchant = boy;
+        this.slots = bhl;
     }
     
     @Override
-    public boolean mayPlace(final ItemStack ben) {
+    public boolean mayPlace(final ItemStack bki) {
         return false;
     }
     
@@ -34,32 +34,32 @@ public class MerchantResultSlot extends Slot {
     }
     
     @Override
-    protected void onQuickCraft(final ItemStack ben, final int integer) {
+    protected void onQuickCraft(final ItemStack bki, final int integer) {
         this.removeCount += integer;
-        this.checkTakeAchievements(ben);
+        this.checkTakeAchievements(bki);
     }
     
     @Override
-    protected void checkTakeAchievements(final ItemStack ben) {
-        ben.onCraftedBy(this.player.level, this.player, this.removeCount);
+    protected void checkTakeAchievements(final ItemStack bki) {
+        bki.onCraftedBy(this.player.level, this.player, this.removeCount);
         this.removeCount = 0;
     }
     
     @Override
-    public ItemStack onTake(final Player ayj, final ItemStack ben) {
-        this.checkTakeAchievements(ben);
-        final MerchantOffer biz4 = this.slots.getActiveOffer();
-        if (biz4 != null) {
-            final ItemStack ben2 = this.slots.getItem(0);
-            final ItemStack ben3 = this.slots.getItem(1);
-            if (biz4.take(ben2, ben3) || biz4.take(ben3, ben2)) {
-                this.merchant.notifyTrade(biz4);
-                ayj.awardStat(Stats.TRADED_WITH_VILLAGER);
-                this.slots.setItem(0, ben2);
-                this.slots.setItem(1, ben3);
+    public ItemStack onTake(final Player bec, final ItemStack bki) {
+        this.checkTakeAchievements(bki);
+        final MerchantOffer boz4 = this.slots.getActiveOffer();
+        if (boz4 != null) {
+            final ItemStack bki2 = this.slots.getItem(0);
+            final ItemStack bki3 = this.slots.getItem(1);
+            if (boz4.take(bki2, bki3) || boz4.take(bki3, bki2)) {
+                this.merchant.notifyTrade(boz4);
+                bec.awardStat(Stats.TRADED_WITH_VILLAGER);
+                this.slots.setItem(0, bki2);
+                this.slots.setItem(1, bki3);
             }
-            this.merchant.overrideXp(this.merchant.getVillagerXp() + biz4.getXp());
+            this.merchant.overrideXp(this.merchant.getVillagerXp() + boz4.getXp());
         }
-        return ben;
+        return bki;
     }
 }
diff --git a/src/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/src/net/minecraft/world/inventory/PlayerEnderChestContainer.java
index 4c52f8f..423ad37 100644
--- a/src/net/minecraft/world/inventory/PlayerEnderChestContainer.java
+++ b/src/net/minecraft/world/inventory/PlayerEnderChestContainer.java
@@ -15,56 +15,58 @@ public class PlayerEnderChestContainer extends SimpleContainer {
         super(27);
     }
     
-    public void setActiveChest(final EnderChestBlockEntity bwx) {
-        this.activeChest = bwx;
+    public void setActiveChest(final EnderChestBlockEntity cdx) {
+        this.activeChest = cdx;
     }
     
-    public void fromTag(final ListTag jz) {
+    @Override
+    public void fromTag(final ListTag lk) {
         for (int integer3 = 0; integer3 < this.getContainerSize(); ++integer3) {
             this.setItem(integer3, ItemStack.EMPTY);
         }
-        for (int integer3 = 0; integer3 < jz.size(); ++integer3) {
-            final CompoundTag jt4 = jz.getCompound(integer3);
-            final int integer4 = jt4.getByte("Slot") & 0xFF;
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            final CompoundTag le4 = lk.getCompound(integer3);
+            final int integer4 = le4.getByte("Slot") & 0xFF;
             if (integer4 >= 0 && integer4 < this.getContainerSize()) {
-                this.setItem(integer4, ItemStack.of(jt4));
+                this.setItem(integer4, ItemStack.of(le4));
             }
         }
     }
     
+    @Override
     public ListTag createTag() {
-        final ListTag jz2 = new ListTag();
+        final ListTag lk2 = new ListTag();
         for (int integer3 = 0; integer3 < this.getContainerSize(); ++integer3) {
-            final ItemStack ben4 = this.getItem(integer3);
-            if (!ben4.isEmpty()) {
-                final CompoundTag jt5 = new CompoundTag();
-                jt5.putByte("Slot", (byte)integer3);
-                ben4.save(jt5);
-                ((AbstractList<CompoundTag>)jz2).add(jt5);
+            final ItemStack bki4 = this.getItem(integer3);
+            if (!bki4.isEmpty()) {
+                final CompoundTag le5 = new CompoundTag();
+                le5.putByte("Slot", (byte)integer3);
+                bki4.save(le5);
+                ((AbstractList<CompoundTag>)lk2).add(le5);
             }
         }
-        return jz2;
+        return lk2;
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return (this.activeChest == null || this.activeChest.stillValid(ayj)) && super.stillValid(ayj);
+    public boolean stillValid(final Player bec) {
+        return (this.activeChest == null || this.activeChest.stillValid(bec)) && super.stillValid(bec);
     }
     
     @Override
-    public void startOpen(final Player ayj) {
+    public void startOpen(final Player bec) {
         if (this.activeChest != null) {
             this.activeChest.startOpen();
         }
-        super.startOpen(ayj);
+        super.startOpen(bec);
     }
     
     @Override
-    public void stopOpen(final Player ayj) {
+    public void stopOpen(final Player bec) {
         if (this.activeChest != null) {
             this.activeChest.stopOpen();
         }
-        super.stopOpen(ayj);
+        super.stopOpen(bec);
         this.activeChest = null;
     }
 }
diff --git a/src/net/minecraft/world/inventory/RecipeBookMenu.java b/src/net/minecraft/world/inventory/RecipeBookMenu.java
index 4b85f64..c5aeba2 100644
--- a/src/net/minecraft/world/inventory/RecipeBookMenu.java
+++ b/src/net/minecraft/world/inventory/RecipeBookMenu.java
@@ -7,19 +7,19 @@ import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.Container;
 
 public abstract class RecipeBookMenu<C extends Container> extends AbstractContainerMenu {
-    public RecipeBookMenu(final MenuType<?> bbo, final int integer) {
-        super(bbo, integer);
+    public RecipeBookMenu(final MenuType<?> bhk, final int integer) {
+        super(bhk, integer);
     }
     
-    public void handlePlacement(final boolean boolean1, final Recipe<?> bgw, final ServerPlayer xe) {
-        new ServerPlaceRecipe<>(this).recipeClicked(xe, bgw, boolean1);
+    public void handlePlacement(final boolean boolean1, final Recipe<?> bmu, final ServerPlayer ze) {
+        new ServerPlaceRecipe<>(this).recipeClicked(ze, bmu, boolean1);
     }
     
-    public abstract void fillCraftSlotsStackedContents(final StackedContents ayl);
+    public abstract void fillCraftSlotsStackedContents(final StackedContents bee);
     
     public abstract void clearCraftingContent();
     
-    public abstract boolean recipeMatches(final Recipe<? super C> bgw);
+    public abstract boolean recipeMatches(final Recipe<? super C> bmu);
     
     public abstract int getResultSlotIndex();
     
diff --git a/src/net/minecraft/world/inventory/RecipeHolder.java b/src/net/minecraft/world/inventory/RecipeHolder.java
index 105d32e..384edc0 100644
--- a/src/net/minecraft/world/inventory/RecipeHolder.java
+++ b/src/net/minecraft/world/inventory/RecipeHolder.java
@@ -10,22 +10,22 @@ import javax.annotation.Nullable;
 import net.minecraft.world.item.crafting.Recipe;
 
 public interface RecipeHolder {
-    void setRecipeUsed(@Nullable final Recipe<?> bgw);
+    void setRecipeUsed(@Nullable final Recipe<?> bmu);
     
     @Nullable
     Recipe<?> getRecipeUsed();
     
-    default void awardAndReset(final Player ayj) {
-        final Recipe<?> bgw3 = this.getRecipeUsed();
-        if (bgw3 != null && !bgw3.isSpecial()) {
-            ayj.awardRecipes(Collections.<Recipe<?>>singleton(bgw3));
+    default void awardUsedRecipes(final Player bec) {
+        final Recipe<?> bmu3 = this.getRecipeUsed();
+        if (bmu3 != null && !bmu3.isSpecial()) {
+            bec.awardRecipes(Collections.<Recipe<?>>singleton(bmu3));
             this.setRecipeUsed(null);
         }
     }
     
-    default boolean setRecipeUsed(final Level bjw, final ServerPlayer xe, final Recipe<?> bgw) {
-        if (bgw.isSpecial() || !bjw.getGameRules().getBoolean(GameRules.RULE_LIMITED_CRAFTING) || xe.getRecipeBook().contains(bgw)) {
-            this.setRecipeUsed(bgw);
+    default boolean setRecipeUsed(final Level bqb, final ServerPlayer ze, final Recipe<?> bmu) {
+        if (bmu.isSpecial() || !bqb.getGameRules().getBoolean(GameRules.RULE_LIMITED_CRAFTING) || ze.getRecipeBook().contains(bmu)) {
+            this.setRecipeUsed(bmu);
             return true;
         }
         return false;
diff --git a/src/net/minecraft/world/inventory/ResultContainer.java b/src/net/minecraft/world/inventory/ResultContainer.java
index 83f8a87..dab15c4 100644
--- a/src/net/minecraft/world/inventory/ResultContainer.java
+++ b/src/net/minecraft/world/inventory/ResultContainer.java
@@ -25,8 +25,8 @@ public class ResultContainer implements Container, RecipeHolder {
     
     @Override
     public boolean isEmpty() {
-        for (final ItemStack ben3 : this.itemStacks) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.itemStacks) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
@@ -49,8 +49,8 @@ public class ResultContainer implements Container, RecipeHolder {
     }
     
     @Override
-    public void setItem(final int integer, final ItemStack ben) {
-        this.itemStacks.set(0, ben);
+    public void setItem(final int integer, final ItemStack bki) {
+        this.itemStacks.set(0, bki);
     }
     
     @Override
@@ -58,7 +58,7 @@ public class ResultContainer implements Container, RecipeHolder {
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
+    public boolean stillValid(final Player bec) {
         return true;
     }
     
@@ -68,8 +68,8 @@ public class ResultContainer implements Container, RecipeHolder {
     }
     
     @Override
-    public void setRecipeUsed(@Nullable final Recipe<?> bgw) {
-        this.recipeUsed = bgw;
+    public void setRecipeUsed(@Nullable final Recipe<?> bmu) {
+        this.recipeUsed = bmu;
     }
     
     @Nullable
diff --git a/src/net/minecraft/world/inventory/ResultSlot.java b/src/net/minecraft/world/inventory/ResultSlot.java
index f94c1cd..39fbc5e 100644
--- a/src/net/minecraft/world/inventory/ResultSlot.java
+++ b/src/net/minecraft/world/inventory/ResultSlot.java
@@ -12,14 +12,14 @@ public class ResultSlot extends Slot {
     private final Player player;
     private int removeCount;
     
-    public ResultSlot(final Player ayj, final CraftingContainer baz, final Container aje, final int integer4, final int integer5, final int integer6) {
-        super(aje, integer4, integer5, integer6);
-        this.player = ayj;
-        this.craftSlots = baz;
+    public ResultSlot(final Player bec, final CraftingContainer bgu, final Container amz, final int integer4, final int integer5, final int integer6) {
+        super(amz, integer4, integer5, integer6);
+        this.player = bec;
+        this.craftSlots = bgu;
     }
     
     @Override
-    public boolean mayPlace(final ItemStack ben) {
+    public boolean mayPlace(final ItemStack bki) {
         return false;
     }
     
@@ -32,9 +32,9 @@ public class ResultSlot extends Slot {
     }
     
     @Override
-    protected void onQuickCraft(final ItemStack ben, final int integer) {
+    protected void onQuickCraft(final ItemStack bki, final int integer) {
         this.removeCount += integer;
-        this.checkTakeAchievements(ben);
+        this.checkTakeAchievements(bki);
     }
     
     @Override
@@ -43,40 +43,40 @@ public class ResultSlot extends Slot {
     }
     
     @Override
-    protected void checkTakeAchievements(final ItemStack ben) {
+    protected void checkTakeAchievements(final ItemStack bki) {
         if (this.removeCount > 0) {
-            ben.onCraftedBy(this.player.level, this.player, this.removeCount);
+            bki.onCraftedBy(this.player.level, this.player, this.removeCount);
         }
         if (this.container instanceof RecipeHolder) {
-            ((RecipeHolder)this.container).awardAndReset(this.player);
+            ((RecipeHolder)this.container).awardUsedRecipes(this.player);
         }
         this.removeCount = 0;
     }
     
     @Override
-    public ItemStack onTake(final Player ayj, final ItemStack ben) {
-        this.checkTakeAchievements(ben);
-        final NonNullList<ItemStack> fy4 = ayj.level.getRecipeManager().<CraftingContainer, CraftingRecipe>getRemainingItemsFor(RecipeType.CRAFTING, this.craftSlots, ayj.level);
-        for (int integer5 = 0; integer5 < fy4.size(); ++integer5) {
-            ItemStack ben2 = this.craftSlots.getItem(integer5);
-            final ItemStack ben3 = fy4.get(integer5);
-            if (!ben2.isEmpty()) {
+    public ItemStack onTake(final Player bec, final ItemStack bki) {
+        this.checkTakeAchievements(bki);
+        final NonNullList<ItemStack> gi4 = bec.level.getRecipeManager().<CraftingContainer, CraftingRecipe>getRemainingItemsFor(RecipeType.CRAFTING, this.craftSlots, bec.level);
+        for (int integer5 = 0; integer5 < gi4.size(); ++integer5) {
+            ItemStack bki2 = this.craftSlots.getItem(integer5);
+            final ItemStack bki3 = gi4.get(integer5);
+            if (!bki2.isEmpty()) {
                 this.craftSlots.removeItem(integer5, 1);
-                ben2 = this.craftSlots.getItem(integer5);
+                bki2 = this.craftSlots.getItem(integer5);
             }
-            if (!ben3.isEmpty()) {
-                if (ben2.isEmpty()) {
-                    this.craftSlots.setItem(integer5, ben3);
+            if (!bki3.isEmpty()) {
+                if (bki2.isEmpty()) {
+                    this.craftSlots.setItem(integer5, bki3);
                 }
-                else if (ItemStack.isSame(ben2, ben3) && ItemStack.tagMatches(ben2, ben3)) {
-                    ben3.grow(ben2.getCount());
-                    this.craftSlots.setItem(integer5, ben3);
+                else if (ItemStack.isSame(bki2, bki3) && ItemStack.tagMatches(bki2, bki3)) {
+                    bki3.grow(bki2.getCount());
+                    this.craftSlots.setItem(integer5, bki3);
                 }
-                else if (!this.player.inventory.add(ben3)) {
-                    this.player.drop(ben3, false);
+                else if (!this.player.inventory.add(bki3)) {
+                    this.player.drop(bki3, false);
                 }
             }
         }
-        return ben;
+        return bki;
     }
 }
diff --git a/src/net/minecraft/world/inventory/ShulkerBoxMenu.java b/src/net/minecraft/world/inventory/ShulkerBoxMenu.java
index c0f7ace..582b977 100644
--- a/src/net/minecraft/world/inventory/ShulkerBoxMenu.java
+++ b/src/net/minecraft/world/inventory/ShulkerBoxMenu.java
@@ -9,64 +9,64 @@ import net.minecraft.world.Container;
 public class ShulkerBoxMenu extends AbstractContainerMenu {
     private final Container container;
     
-    public ShulkerBoxMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, new SimpleContainer(27));
+    public ShulkerBoxMenu(final int integer, final Inventory beb) {
+        this(integer, beb, new SimpleContainer(27));
     }
     
-    public ShulkerBoxMenu(final int integer, final Inventory ayi, final Container aje) {
+    public ShulkerBoxMenu(final int integer, final Inventory beb, final Container amz) {
         super(MenuType.SHULKER_BOX, integer);
-        AbstractContainerMenu.checkContainerSize(aje, 27);
-        (this.container = aje).startOpen(ayi.player);
+        AbstractContainerMenu.checkContainerSize(amz, 27);
+        (this.container = amz).startOpen(beb.player);
         final int integer2 = 3;
         final int integer3 = 9;
         for (int integer4 = 0; integer4 < 3; ++integer4) {
             for (int integer5 = 0; integer5 < 9; ++integer5) {
-                this.addSlot(new ShulkerBoxSlot(aje, integer5 + integer4 * 9, 8 + integer5 * 18, 18 + integer4 * 18));
+                this.addSlot(new ShulkerBoxSlot(amz, integer5 + integer4 * 9, 8 + integer5 * 18, 18 + integer4 * 18));
             }
         }
         for (int integer4 = 0; integer4 < 3; ++integer4) {
             for (int integer5 = 0; integer5 < 9; ++integer5) {
-                this.addSlot(new Slot(ayi, integer5 + integer4 * 9 + 9, 8 + integer5 * 18, 84 + integer4 * 18));
+                this.addSlot(new Slot(beb, integer5 + integer4 * 9 + 9, 8 + integer5 * 18, 84 + integer4 * 18));
             }
         }
         for (int integer4 = 0; integer4 < 9; ++integer4) {
-            this.addSlot(new Slot(ayi, integer4, 8 + integer4 * 18, 142));
+            this.addSlot(new Slot(beb, integer4, 8 + integer4 * 18, 142));
         }
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.container.stillValid(ayj);
+    public boolean stillValid(final Player bec) {
+        return this.container.stillValid(bec);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            bki4 = bki5.copy();
             if (integer < this.container.getContainerSize()) {
-                if (!this.moveItemStackTo(ben5, this.container.getContainerSize(), this.slots.size(), true)) {
+                if (!this.moveItemStackTo(bki5, this.container.getContainerSize(), this.slots.size(), true)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (!this.moveItemStackTo(ben5, 0, this.container.getContainerSize(), false)) {
+            else if (!this.moveItemStackTo(bki5, 0, this.container.getContainerSize(), false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
             else {
-                bca5.setChanged();
+                bhw5.setChanged();
             }
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
-        this.container.stopOpen(ayj);
+    public void removed(final Player bec) {
+        super.removed(bec);
+        this.container.stopOpen(bec);
     }
 }
diff --git a/src/net/minecraft/world/inventory/ShulkerBoxSlot.java b/src/net/minecraft/world/inventory/ShulkerBoxSlot.java
index 83ff401..da63cf7 100644
--- a/src/net/minecraft/world/inventory/ShulkerBoxSlot.java
+++ b/src/net/minecraft/world/inventory/ShulkerBoxSlot.java
@@ -6,12 +6,12 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.Container;
 
 public class ShulkerBoxSlot extends Slot {
-    public ShulkerBoxSlot(final Container aje, final int integer2, final int integer3, final int integer4) {
-        super(aje, integer2, integer3, integer4);
+    public ShulkerBoxSlot(final Container amz, final int integer2, final int integer3, final int integer4) {
+        super(amz, integer2, integer3, integer4);
     }
     
     @Override
-    public boolean mayPlace(final ItemStack ben) {
-        return !(Block.byItem(ben.getItem()) instanceof ShulkerBoxBlock);
+    public boolean mayPlace(final ItemStack bki) {
+        return !(Block.byItem(bki.getItem()) instanceof ShulkerBoxBlock);
     }
 }
diff --git a/src/net/minecraft/world/inventory/Slot.java b/src/net/minecraft/world/inventory/Slot.java
index 8702cf9..585d81e 100644
--- a/src/net/minecraft/world/inventory/Slot.java
+++ b/src/net/minecraft/world/inventory/Slot.java
@@ -14,35 +14,35 @@ public class Slot {
     public final int x;
     public final int y;
     
-    public Slot(final Container aje, final int integer2, final int integer3, final int integer4) {
-        this.container = aje;
+    public Slot(final Container amz, final int integer2, final int integer3, final int integer4) {
+        this.container = amz;
         this.slot = integer2;
         this.x = integer3;
         this.y = integer4;
     }
     
-    public void onQuickCraft(final ItemStack ben1, final ItemStack ben2) {
-        final int integer4 = ben2.getCount() - ben1.getCount();
+    public void onQuickCraft(final ItemStack bki1, final ItemStack bki2) {
+        final int integer4 = bki2.getCount() - bki1.getCount();
         if (integer4 > 0) {
-            this.onQuickCraft(ben2, integer4);
+            this.onQuickCraft(bki2, integer4);
         }
     }
     
-    protected void onQuickCraft(final ItemStack ben, final int integer) {
+    protected void onQuickCraft(final ItemStack bki, final int integer) {
     }
     
     protected void onSwapCraft(final int integer) {
     }
     
-    protected void checkTakeAchievements(final ItemStack ben) {
+    protected void checkTakeAchievements(final ItemStack bki) {
     }
     
-    public ItemStack onTake(final Player ayj, final ItemStack ben) {
+    public ItemStack onTake(final Player bec, final ItemStack bki) {
         this.setChanged();
-        return ben;
+        return bki;
     }
     
-    public boolean mayPlace(final ItemStack ben) {
+    public boolean mayPlace(final ItemStack bki) {
         return true;
     }
     
@@ -54,8 +54,8 @@ public class Slot {
         return !this.getItem().isEmpty();
     }
     
-    public void set(final ItemStack ben) {
-        this.container.setItem(this.slot, ben);
+    public void set(final ItemStack bki) {
+        this.container.setItem(this.slot, bki);
         this.setChanged();
     }
     
@@ -67,7 +67,7 @@ public class Slot {
         return this.container.getMaxStackSize();
     }
     
-    public int getMaxStackSize(final ItemStack ben) {
+    public int getMaxStackSize(final ItemStack bki) {
         return this.getMaxStackSize();
     }
     
@@ -80,7 +80,7 @@ public class Slot {
         return this.container.removeItem(this.slot, integer);
     }
     
-    public boolean mayPickup(final Player ayj) {
+    public boolean mayPickup(final Player bec) {
         return true;
     }
     
diff --git a/src/net/minecraft/world/inventory/SmithingMenu.java b/src/net/minecraft/world/inventory/SmithingMenu.java
new file mode 100644
index 0000000..9c660fc
--- /dev/null
+++ b/src/net/minecraft/world/inventory/SmithingMenu.java
@@ -0,0 +1,73 @@
+package net.minecraft.world.inventory;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.Container;
+import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.entity.player.Inventory;
+import java.util.List;
+import javax.annotation.Nullable;
+import net.minecraft.world.item.crafting.UpgradeRecipe;
+import net.minecraft.world.level.Level;
+
+public class SmithingMenu extends ItemCombinerMenu {
+    private final Level level;
+    @Nullable
+    private UpgradeRecipe selectedRecipe;
+    private final List<UpgradeRecipe> recipes;
+    
+    public SmithingMenu(final int integer, final Inventory beb) {
+        this(integer, beb, ContainerLevelAccess.NULL);
+    }
+    
+    public SmithingMenu(final int integer, final Inventory beb, final ContainerLevelAccess bgs) {
+        super(MenuType.SMITHING, integer, beb, bgs);
+        this.level = beb.player.level;
+        this.recipes = this.level.getRecipeManager().<Container, UpgradeRecipe>getAllRecipesFor(RecipeType.SMITHING);
+    }
+    
+    @Override
+    protected boolean isValidBlock(final BlockState cfj) {
+        return cfj.is(Blocks.SMITHING_TABLE);
+    }
+    
+    @Override
+    protected boolean mayPickup(final Player bec, final boolean boolean2) {
+        return this.selectedRecipe != null && this.selectedRecipe.matches(this.inputSlots, this.level);
+    }
+    
+    @Override
+    protected ItemStack onTake(final Player bec, final ItemStack bki) {
+        this.shrinkStackInSlot(0);
+        this.shrinkStackInSlot(1);
+        this.access.execute((bqb, fu) -> bqb.levelEvent(1044, fu, 0));
+        return bki;
+    }
+    
+    private void shrinkStackInSlot(final int integer) {
+        final ItemStack bki3 = this.inputSlots.getItem(integer);
+        bki3.shrink(1);
+        this.inputSlots.setItem(integer, bki3);
+    }
+    
+    @Override
+    public void createResult() {
+        final List<UpgradeRecipe> list2 = this.level.getRecipeManager().<Container, UpgradeRecipe>getRecipesFor(RecipeType.SMITHING, this.inputSlots, this.level);
+        if (list2.isEmpty()) {
+            this.resultSlots.setItem(0, ItemStack.EMPTY);
+        }
+        else {
+            this.selectedRecipe = list2.get(0);
+            final ItemStack bki3 = this.selectedRecipe.assemble(this.inputSlots);
+            this.resultSlots.setItem(0, bki3);
+        }
+    }
+    
+    @Override
+    protected boolean shouldQuickMoveToAdditionalSlot(final ItemStack bki) {
+        return this.recipes.stream().anyMatch(bnl -> bnl.isAdditionIngredient(bki));
+    }
+}
diff --git a/src/net/minecraft/world/inventory/SmokerMenu.java b/src/net/minecraft/world/inventory/SmokerMenu.java
index f33240e..9192379 100644
--- a/src/net/minecraft/world/inventory/SmokerMenu.java
+++ b/src/net/minecraft/world/inventory/SmokerMenu.java
@@ -6,11 +6,11 @@ import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.entity.player.Inventory;
 
 public class SmokerMenu extends AbstractFurnaceMenu {
-    public SmokerMenu(final int integer, final Inventory ayi) {
-        super(MenuType.SMOKER, RecipeType.SMOKING, integer, ayi);
+    public SmokerMenu(final int integer, final Inventory beb) {
+        super(MenuType.SMOKER, RecipeType.SMOKING, integer, beb);
     }
     
-    public SmokerMenu(final int integer, final Inventory ayi, final Container aje, final ContainerData baw) {
-        super(MenuType.SMOKER, RecipeType.SMOKING, integer, ayi, aje, baw);
+    public SmokerMenu(final int integer, final Inventory beb, final Container amz, final ContainerData bgr) {
+        super(MenuType.SMOKER, RecipeType.SMOKING, integer, beb, amz, bgr);
     }
 }
diff --git a/src/net/minecraft/world/inventory/StackedContentsCompatible.java b/src/net/minecraft/world/inventory/StackedContentsCompatible.java
index 02a717a..d3f692f 100644
--- a/src/net/minecraft/world/inventory/StackedContentsCompatible.java
+++ b/src/net/minecraft/world/inventory/StackedContentsCompatible.java
@@ -3,5 +3,5 @@ package net.minecraft.world.inventory;
 import net.minecraft.world.entity.player.StackedContents;
 
 public interface StackedContentsCompatible {
-    void fillStackedContents(final StackedContents ayl);
+    void fillStackedContents(final StackedContents bee);
 }
diff --git a/src/net/minecraft/world/inventory/StonecutterMenu.java b/src/net/minecraft/world/inventory/StonecutterMenu.java
index 4ffbb26..45ea9d4 100644
--- a/src/net/minecraft/world/inventory/StonecutterMenu.java
+++ b/src/net/minecraft/world/inventory/StonecutterMenu.java
@@ -29,11 +29,11 @@ public class StonecutterMenu extends AbstractContainerMenu {
     public final Container container;
     private final ResultContainer resultContainer;
     
-    public StonecutterMenu(final int integer, final Inventory ayi) {
-        this(integer, ayi, ContainerLevelAccess.NULL);
+    public StonecutterMenu(final int integer, final Inventory beb) {
+        this(integer, beb, ContainerLevelAccess.NULL);
     }
     
-    public StonecutterMenu(final int integer, final Inventory ayi, final ContainerLevelAccess bax) {
+    public StonecutterMenu(final int integer, final Inventory beb, final ContainerLevelAccess bgs) {
         super(MenuType.STONECUTTER, integer);
         this.selectedRecipeIndex = DataSlot.standalone();
         this.recipes = Lists.newArrayList();
@@ -48,41 +48,41 @@ public class StonecutterMenu extends AbstractContainerMenu {
             }
         };
         this.resultContainer = new ResultContainer();
-        this.access = bax;
-        this.level = ayi.player.level;
+        this.access = bgs;
+        this.level = beb.player.level;
         this.inputSlot = this.addSlot(new Slot(this.container, 0, 20, 33));
         this.resultSlot = this.addSlot(new Slot(this.resultContainer, 1, 143, 33) {
             @Override
-            public boolean mayPlace(final ItemStack ben) {
+            public boolean mayPlace(final ItemStack bki) {
                 return false;
             }
             
             @Override
-            public ItemStack onTake(final Player ayj, final ItemStack ben) {
-                final ItemStack ben2 = StonecutterMenu.this.inputSlot.remove(1);
-                if (!ben2.isEmpty()) {
+            public ItemStack onTake(final Player bec, final ItemStack bki) {
+                final ItemStack bki2 = StonecutterMenu.this.inputSlot.remove(1);
+                if (!bki2.isEmpty()) {
                     StonecutterMenu.this.setupResultSlot();
                 }
-                ben.getItem().onCraftedBy(ben, ayj.level, ayj);
+                bki.getItem().onCraftedBy(bki, bec.level, bec);
                 final long long4;
-                bax.execute((bjw, fk) -> {
-                    long4 = bjw.getGameTime();
+                bgs.execute((bqb, fu) -> {
+                    long4 = bqb.getGameTime();
                     if (StonecutterMenu.this.lastSoundTime != long4) {
-                        bjw.playSound(null, fk, SoundEvents.UI_STONECUTTER_TAKE_RESULT, SoundSource.BLOCKS, 1.0f, 1.0f);
+                        bqb.playSound(null, fu, SoundEvents.UI_STONECUTTER_TAKE_RESULT, SoundSource.BLOCKS, 1.0f, 1.0f);
                         StonecutterMenu.this.lastSoundTime = long4;
                     }
                     return;
                 });
-                return super.onTake(ayj, ben);
+                return super.onTake(bec, bki);
             }
         });
         for (int integer2 = 0; integer2 < 3; ++integer2) {
             for (int integer3 = 0; integer3 < 9; ++integer3) {
-                this.addSlot(new Slot(ayi, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
+                this.addSlot(new Slot(beb, integer3 + integer2 * 9 + 9, 8 + integer3 * 18, 84 + integer2 * 18));
             }
         }
         for (int integer2 = 0; integer2 < 9; ++integer2) {
-            this.addSlot(new Slot(ayi, integer2, 8 + integer2 * 18, 142));
+            this.addSlot(new Slot(beb, integer2, 8 + integer2 * 18, 142));
         }
         this.addDataSlot(this.selectedRecipeIndex);
     }
@@ -104,41 +104,45 @@ public class StonecutterMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return AbstractContainerMenu.stillValid(this.access, ayj, Blocks.STONECUTTER);
+    public boolean stillValid(final Player bec) {
+        return AbstractContainerMenu.stillValid(this.access, bec, Blocks.STONECUTTER);
     }
     
     @Override
-    public boolean clickMenuButton(final Player ayj, final int integer) {
-        if (integer >= 0 && integer < this.recipes.size()) {
+    public boolean clickMenuButton(final Player bec, final int integer) {
+        if (this.isValidRecipeIndex(integer)) {
             this.selectedRecipeIndex.set(integer);
             this.setupResultSlot();
         }
         return true;
     }
     
+    private boolean isValidRecipeIndex(final int integer) {
+        return integer >= 0 && integer < this.recipes.size();
+    }
+    
     @Override
-    public void slotsChanged(final Container aje) {
-        final ItemStack ben3 = this.inputSlot.getItem();
-        if (ben3.getItem() != this.input.getItem()) {
-            this.input = ben3.copy();
-            this.setupRecipeList(aje, ben3);
+    public void slotsChanged(final Container amz) {
+        final ItemStack bki3 = this.inputSlot.getItem();
+        if (bki3.getItem() != this.input.getItem()) {
+            this.input = bki3.copy();
+            this.setupRecipeList(amz, bki3);
         }
     }
     
-    private void setupRecipeList(final Container aje, final ItemStack ben) {
+    private void setupRecipeList(final Container amz, final ItemStack bki) {
         this.recipes.clear();
         this.selectedRecipeIndex.set(-1);
         this.resultSlot.set(ItemStack.EMPTY);
-        if (!ben.isEmpty()) {
-            this.recipes = this.level.getRecipeManager().<Container, StonecutterRecipe>getRecipesFor(RecipeType.STONECUTTING, aje, this.level);
+        if (!bki.isEmpty()) {
+            this.recipes = this.level.getRecipeManager().<Container, StonecutterRecipe>getRecipesFor(RecipeType.STONECUTTING, amz, this.level);
         }
     }
     
     private void setupResultSlot() {
-        if (!this.recipes.isEmpty()) {
-            final StonecutterRecipe bhk2 = this.recipes.get(this.selectedRecipeIndex.get());
-            this.resultSlot.set(bhk2.assemble(this.container));
+        if (!this.recipes.isEmpty() && this.isValidRecipeIndex(this.selectedRecipeIndex.get())) {
+            final StonecutterRecipe bni2 = this.recipes.get(this.selectedRecipeIndex.get());
+            this.resultSlot.set(bni2.assemble(this.container));
         }
         else {
             this.resultSlot.set(ItemStack.EMPTY);
@@ -156,60 +160,60 @@ public class StonecutterMenu extends AbstractContainerMenu {
     }
     
     @Override
-    public boolean canTakeItemForPickAll(final ItemStack ben, final Slot bca) {
-        return bca.container != this.resultContainer && super.canTakeItemForPickAll(ben, bca);
+    public boolean canTakeItemForPickAll(final ItemStack bki, final Slot bhw) {
+        return bhw.container != this.resultContainer && super.canTakeItemForPickAll(bki, bhw);
     }
     
     @Override
-    public ItemStack quickMoveStack(final Player ayj, final int integer) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        final Slot bca5 = this.slots.get(integer);
-        if (bca5 != null && bca5.hasItem()) {
-            final ItemStack ben5 = bca5.getItem();
-            final Item bei7 = ben5.getItem();
-            ben4 = ben5.copy();
+    public ItemStack quickMoveStack(final Player bec, final int integer) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        final Slot bhw5 = this.slots.get(integer);
+        if (bhw5 != null && bhw5.hasItem()) {
+            final ItemStack bki5 = bhw5.getItem();
+            final Item bke7 = bki5.getItem();
+            bki4 = bki5.copy();
             if (integer == 1) {
-                bei7.onCraftedBy(ben5, ayj.level, ayj);
-                if (!this.moveItemStackTo(ben5, 2, 38, true)) {
+                bke7.onCraftedBy(bki5, bec.level, bec);
+                if (!this.moveItemStackTo(bki5, 2, 38, true)) {
                     return ItemStack.EMPTY;
                 }
-                bca5.onQuickCraft(ben5, ben4);
+                bhw5.onQuickCraft(bki5, bki4);
             }
             else if (integer == 0) {
-                if (!this.moveItemStackTo(ben5, 2, 38, false)) {
+                if (!this.moveItemStackTo(bki5, 2, 38, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (this.level.getRecipeManager().<SimpleContainer, StonecutterRecipe>getRecipeFor(RecipeType.STONECUTTING, new SimpleContainer(new ItemStack[] { ben5 }), this.level).isPresent()) {
-                if (!this.moveItemStackTo(ben5, 0, 1, false)) {
+            else if (this.level.getRecipeManager().<SimpleContainer, StonecutterRecipe>getRecipeFor(RecipeType.STONECUTTING, new SimpleContainer(new ItemStack[] { bki5 }), this.level).isPresent()) {
+                if (!this.moveItemStackTo(bki5, 0, 1, false)) {
                     return ItemStack.EMPTY;
                 }
             }
             else if (integer >= 2 && integer < 29) {
-                if (!this.moveItemStackTo(ben5, 29, 38, false)) {
+                if (!this.moveItemStackTo(bki5, 29, 38, false)) {
                     return ItemStack.EMPTY;
                 }
             }
-            else if (integer >= 29 && integer < 38 && !this.moveItemStackTo(ben5, 2, 29, false)) {
+            else if (integer >= 29 && integer < 38 && !this.moveItemStackTo(bki5, 2, 29, false)) {
                 return ItemStack.EMPTY;
             }
-            if (ben5.isEmpty()) {
-                bca5.set(ItemStack.EMPTY);
+            if (bki5.isEmpty()) {
+                bhw5.set(ItemStack.EMPTY);
             }
-            bca5.setChanged();
-            if (ben5.getCount() == ben4.getCount()) {
+            bhw5.setChanged();
+            if (bki5.getCount() == bki4.getCount()) {
                 return ItemStack.EMPTY;
             }
-            bca5.onTake(ayj, ben5);
+            bhw5.onTake(bec, bki5);
             this.broadcastChanges();
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
-    public void removed(final Player ayj) {
-        super.removed(ayj);
+    public void removed(final Player bec) {
+        super.removed(bec);
         this.resultContainer.removeItemNoUpdate(1);
-        this.access.execute((bjw, fk) -> this.clearContainer(ayj, ayj.level, this.container));
+        this.access.execute((bqb, fu) -> this.clearContainer(bec, bec.level, this.container));
     }
 }
diff --git a/src/net/minecraft/world/item/AirItem.java b/src/net/minecraft/world/item/AirItem.java
index cdbc8f2..236a3bf 100644
--- a/src/net/minecraft/world/item/AirItem.java
+++ b/src/net/minecraft/world/item/AirItem.java
@@ -10,9 +10,9 @@ import net.minecraft.world.level.block.Block;
 public class AirItem extends Item {
     private final Block block;
     
-    public AirItem(final Block bph, final Properties a) {
+    public AirItem(final Block bvr, final Properties a) {
         super(a);
-        this.block = bph;
+        this.block = bvr;
     }
     
     @Override
@@ -21,8 +21,8 @@ public class AirItem extends Item {
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        super.appendHoverText(ben, bjw, list, bfw);
-        this.block.appendHoverText(ben, bjw, list, bfw);
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        super.appendHoverText(bki, bqb, list, bls);
+        this.block.appendHoverText(bki, bqb, list, bls);
     }
 }
diff --git a/src/net/minecraft/world/item/ArmorItem.java b/src/net/minecraft/world/item/ArmorItem.java
index 935ba30..d04c4de 100644
--- a/src/net/minecraft/world/item/ArmorItem.java
+++ b/src/net/minecraft/world/item/ArmorItem.java
@@ -1,13 +1,12 @@
 package net.minecraft.world.item;
 
 import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
-import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import com.google.common.collect.Multimap;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import com.google.common.collect.ImmutableMultimap;
 import net.minecraft.world.level.ItemLike;
 import java.util.List;
 import net.minecraft.core.BlockPos;
@@ -21,42 +20,56 @@ import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.DispenserBlock;
 import net.minecraft.core.Direction;
 import net.minecraft.core.BlockSource;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.entity.ai.attributes.Attribute;
+import com.google.common.collect.Multimap;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.core.dispenser.DispenseItemBehavior;
 import java.util.UUID;
 
-public class ArmorItem extends Item {
+public class ArmorItem extends Item implements Wearable {
     private static final UUID[] ARMOR_MODIFIER_UUID_PER_SLOT;
     public static final DispenseItemBehavior DISPENSE_ITEM_BEHAVIOR;
     protected final EquipmentSlot slot;
-    protected final int defense;
-    protected final float toughness;
+    private final int defense;
+    private final float toughness;
+    protected final float knockbackResistance;
     protected final ArmorMaterial material;
+    private final Multimap<Attribute, AttributeModifier> defaultModifiers;
     
-    public static boolean dispenseArmor(final BlockSource fl, final ItemStack ben) {
-        final BlockPos fk3 = fl.getPos().relative(fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
-        final List<LivingEntity> list4 = fl.getLevel().<LivingEntity>getEntitiesOfClass(LivingEntity.class, new AABB(fk3), EntitySelector.NO_SPECTATORS.and(new EntitySelector.MobCanWearArmourEntitySelector(ben)));
+    public static boolean dispenseArmor(final BlockSource fv, final ItemStack bki) {
+        final BlockPos fu3 = fv.getPos().relative(fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING));
+        final List<LivingEntity> list4 = fv.getLevel().<LivingEntity>getEntitiesOfClass(LivingEntity.class, new AABB(fu3), EntitySelector.NO_SPECTATORS.and(new EntitySelector.MobCanWearArmorEntitySelector(bki)));
         if (list4.isEmpty()) {
             return false;
         }
-        final LivingEntity akz5 = list4.get(0);
-        final EquipmentSlot akv6 = Mob.getEquipmentSlotForItem(ben);
-        final ItemStack ben2 = ben.split(1);
-        akz5.setItemSlot(akv6, ben2);
-        if (akz5 instanceof Mob) {
-            ((Mob)akz5).setDropChance(akv6, 2.0f);
-            ((Mob)akz5).setPersistenceRequired();
+        final LivingEntity aoy5 = list4.get(0);
+        final EquipmentSlot aor6 = Mob.getEquipmentSlotForItem(bki);
+        final ItemStack bki2 = bki.split(1);
+        aoy5.setItemSlot(aor6, bki2);
+        if (aoy5 instanceof Mob) {
+            ((Mob)aoy5).setDropChance(aor6, 2.0f);
+            ((Mob)aoy5).setPersistenceRequired();
         }
         return true;
     }
     
-    public ArmorItem(final ArmorMaterial bch, final EquipmentSlot akv, final Properties a) {
-        super(a.defaultDurability(bch.getDurabilityForSlot(akv)));
-        this.material = bch;
-        this.slot = akv;
-        this.defense = bch.getDefenseForSlot(akv);
-        this.toughness = bch.getToughness();
+    public ArmorItem(final ArmorMaterial bie, final EquipmentSlot aor, final Properties a) {
+        super(a.defaultDurability(bie.getDurabilityForSlot(aor)));
+        this.material = bie;
+        this.slot = aor;
+        this.defense = bie.getDefenseForSlot(aor);
+        this.toughness = bie.getToughness();
+        this.knockbackResistance = bie.getKnockbackResistance();
         DispenserBlock.registerBehavior(this, ArmorItem.DISPENSE_ITEM_BEHAVIOR);
+        final ImmutableMultimap.Builder<Attribute, AttributeModifier> builder5 = ImmutableMultimap.<Attribute, AttributeModifier>builder();
+        final UUID uUID6 = ArmorItem.ARMOR_MODIFIER_UUID_PER_SLOT[aor.getIndex()];
+        builder5.put(Attributes.ARMOR, new AttributeModifier(uUID6, "Armor modifier", this.defense, AttributeModifier.Operation.ADDITION));
+        builder5.put(Attributes.ARMOR_TOUGHNESS, new AttributeModifier(uUID6, "Armor toughness", this.toughness, AttributeModifier.Operation.ADDITION));
+        if (bie == ArmorMaterials.NETHERITE) {
+            builder5.put(Attributes.KNOCKBACK_RESISTANCE, new AttributeModifier(uUID6, "Armor knockback resistance", this.knockbackResistance, AttributeModifier.Operation.ADDITION));
+        }
+        this.defaultModifiers = builder5.build();
     }
     
     public EquipmentSlot getSlot() {
@@ -73,43 +86,45 @@ public class ArmorItem extends Item {
     }
     
     @Override
-    public boolean isValidRepairItem(final ItemStack ben1, final ItemStack ben2) {
-        return this.material.getRepairIngredient().test(ben2) || super.isValidRepairItem(ben1, ben2);
+    public boolean isValidRepairItem(final ItemStack bki1, final ItemStack bki2) {
+        return this.material.getRepairIngredient().test(bki2) || super.isValidRepairItem(bki1, bki2);
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        final EquipmentSlot akv6 = Mob.getEquipmentSlotForItem(ben5);
-        final ItemStack ben6 = ayj.getItemBySlot(akv6);
-        if (ben6.isEmpty()) {
-            ayj.setItemSlot(akv6, ben5.copy());
-            ben5.setCount(0);
-            return InteractionResultHolder.<ItemStack>success(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        final EquipmentSlot aor6 = Mob.getEquipmentSlotForItem(bki5);
+        final ItemStack bki6 = bec.getItemBySlot(aor6);
+        if (bki6.isEmpty()) {
+            bec.setItemSlot(aor6, bki5.copy());
+            bki5.setCount(0);
+            return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
         }
-        return InteractionResultHolder.<ItemStack>fail(ben5);
+        return InteractionResultHolder.<ItemStack>fail(bki5);
     }
     
     @Override
-    public Multimap<String, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot akv) {
-        final Multimap<String, AttributeModifier> multimap3 = super.getDefaultAttributeModifiers(akv);
-        if (akv == this.slot) {
-            multimap3.put(SharedMonsterAttributes.ARMOR.getName(), new AttributeModifier(ArmorItem.ARMOR_MODIFIER_UUID_PER_SLOT[akv.getIndex()], "Armor modifier", this.defense, AttributeModifier.Operation.ADDITION));
-            multimap3.put(SharedMonsterAttributes.ARMOR_TOUGHNESS.getName(), new AttributeModifier(ArmorItem.ARMOR_MODIFIER_UUID_PER_SLOT[akv.getIndex()], "Armor toughness", this.toughness, AttributeModifier.Operation.ADDITION));
+    public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot aor) {
+        if (aor == this.slot) {
+            return this.defaultModifiers;
         }
-        return multimap3;
+        return super.getDefaultAttributeModifiers(aor);
     }
     
     public int getDefense() {
         return this.defense;
     }
     
+    public float getToughness() {
+        return this.toughness;
+    }
+    
     static {
         ARMOR_MODIFIER_UUID_PER_SLOT = new UUID[] { UUID.fromString("845DB27C-C624-495F-8C9F-6020A9A58B6B"), UUID.fromString("D8499B04-0E66-4726-AB29-64469D734E0D"), UUID.fromString("9F3D476D-C118-4544-8365-64846904B48E"), UUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150") };
         DISPENSE_ITEM_BEHAVIOR = new DefaultDispenseItemBehavior() {
             @Override
-            protected ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                return ArmorItem.dispenseArmor(fl, ben) ? ben : super.execute(fl, ben);
+            protected ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                return ArmorItem.dispenseArmor(fv, bki) ? bki : super.execute(fv, bki);
             }
         };
     }
diff --git a/src/net/minecraft/world/item/ArmorMaterial.java b/src/net/minecraft/world/item/ArmorMaterial.java
index 54f0310..21b9e9b 100644
--- a/src/net/minecraft/world/item/ArmorMaterial.java
+++ b/src/net/minecraft/world/item/ArmorMaterial.java
@@ -5,9 +5,9 @@ import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.EquipmentSlot;
 
 public interface ArmorMaterial {
-    int getDurabilityForSlot(final EquipmentSlot akv);
+    int getDurabilityForSlot(final EquipmentSlot aor);
     
-    int getDefenseForSlot(final EquipmentSlot akv);
+    int getDefenseForSlot(final EquipmentSlot aor);
     
     int getEnchantmentValue();
     
@@ -18,4 +18,6 @@ public interface ArmorMaterial {
     String getName();
     
     float getToughness();
+    
+    float getKnockbackResistance();
 }
diff --git a/src/net/minecraft/world/item/ArmorMaterials.java b/src/net/minecraft/world/item/ArmorMaterials.java
index 1b0d8aa..a568ca5 100644
--- a/src/net/minecraft/world/item/ArmorMaterials.java
+++ b/src/net/minecraft/world/item/ArmorMaterials.java
@@ -9,12 +9,13 @@ import net.minecraft.util.LazyLoadedValue;
 import net.minecraft.sounds.SoundEvent;
 
 public enum ArmorMaterials implements ArmorMaterial {
-    LEATHER("leather", 5, new int[] { 1, 2, 3, 1 }, 15, SoundEvents.ARMOR_EQUIP_LEATHER, 0.0f, () -> Ingredient.of(Items.LEATHER)), 
-    CHAIN("chainmail", 15, new int[] { 1, 4, 5, 2 }, 12, SoundEvents.ARMOR_EQUIP_CHAIN, 0.0f, () -> Ingredient.of(Items.IRON_INGOT)), 
-    IRON("iron", 15, new int[] { 2, 5, 6, 2 }, 9, SoundEvents.ARMOR_EQUIP_IRON, 0.0f, () -> Ingredient.of(Items.IRON_INGOT)), 
-    GOLD("gold", 7, new int[] { 1, 3, 5, 2 }, 25, SoundEvents.ARMOR_EQUIP_GOLD, 0.0f, () -> Ingredient.of(Items.GOLD_INGOT)), 
-    DIAMOND("diamond", 33, new int[] { 3, 6, 8, 3 }, 10, SoundEvents.ARMOR_EQUIP_DIAMOND, 2.0f, () -> Ingredient.of(Items.DIAMOND)), 
-    TURTLE("turtle", 25, new int[] { 2, 5, 6, 2 }, 9, SoundEvents.ARMOR_EQUIP_TURTLE, 0.0f, () -> Ingredient.of(Items.SCUTE));
+    LEATHER("leather", 5, new int[] { 1, 2, 3, 1 }, 15, SoundEvents.ARMOR_EQUIP_LEATHER, 0.0f, 0.0f, () -> Ingredient.of(Items.LEATHER)), 
+    CHAIN("chainmail", 15, new int[] { 1, 4, 5, 2 }, 12, SoundEvents.ARMOR_EQUIP_CHAIN, 0.0f, 0.0f, () -> Ingredient.of(Items.IRON_INGOT)), 
+    IRON("iron", 15, new int[] { 2, 5, 6, 2 }, 9, SoundEvents.ARMOR_EQUIP_IRON, 0.0f, 0.0f, () -> Ingredient.of(Items.IRON_INGOT)), 
+    GOLD("gold", 7, new int[] { 1, 3, 5, 2 }, 25, SoundEvents.ARMOR_EQUIP_GOLD, 0.0f, 0.0f, () -> Ingredient.of(Items.GOLD_INGOT)), 
+    DIAMOND("diamond", 33, new int[] { 3, 6, 8, 3 }, 10, SoundEvents.ARMOR_EQUIP_DIAMOND, 2.0f, 0.0f, () -> Ingredient.of(Items.DIAMOND)), 
+    TURTLE("turtle", 25, new int[] { 2, 5, 6, 2 }, 9, SoundEvents.ARMOR_EQUIP_TURTLE, 0.0f, 0.0f, () -> Ingredient.of(Items.SCUTE)), 
+    NETHERITE("netherite", 37, new int[] { 3, 6, 8, 3 }, 15, SoundEvents.ARMOR_EQUIP_NETHERITE, 3.0f, 0.1f, () -> Ingredient.of(Items.NETHERITE_INGOT));
     
     private static final int[] HEALTH_PER_SLOT;
     private final String name;
@@ -23,26 +24,28 @@ public enum ArmorMaterials implements ArmorMaterial {
     private final int enchantmentValue;
     private final SoundEvent sound;
     private final float toughness;
+    private final float knockbackResistance;
     private final LazyLoadedValue<Ingredient> repairIngredient;
     
-    private ArmorMaterials(final String string3, final int integer4, final int[] arr, final int integer6, final SoundEvent aah, final float float8, final Supplier<Ingredient> supplier) {
+    private ArmorMaterials(final String string3, final int integer4, final int[] arr, final int integer6, final SoundEvent ack, final float float8, final float float9, final Supplier<Ingredient> supplier) {
         this.name = string3;
         this.durabilityMultiplier = integer4;
         this.slotProtections = arr;
         this.enchantmentValue = integer6;
-        this.sound = aah;
+        this.sound = ack;
         this.toughness = float8;
+        this.knockbackResistance = float9;
         this.repairIngredient = new LazyLoadedValue<Ingredient>(supplier);
     }
     
     @Override
-    public int getDurabilityForSlot(final EquipmentSlot akv) {
-        return ArmorMaterials.HEALTH_PER_SLOT[akv.getIndex()] * this.durabilityMultiplier;
+    public int getDurabilityForSlot(final EquipmentSlot aor) {
+        return ArmorMaterials.HEALTH_PER_SLOT[aor.getIndex()] * this.durabilityMultiplier;
     }
     
     @Override
-    public int getDefenseForSlot(final EquipmentSlot akv) {
-        return this.slotProtections[akv.getIndex()];
+    public int getDefenseForSlot(final EquipmentSlot aor) {
+        return this.slotProtections[aor.getIndex()];
     }
     
     @Override
@@ -70,6 +73,11 @@ public enum ArmorMaterials implements ArmorMaterial {
         return this.toughness;
     }
     
+    @Override
+    public float getKnockbackResistance() {
+        return this.knockbackResistance;
+    }
+    
     static {
         HEALTH_PER_SLOT = new int[] { 13, 15, 16, 11 };
     }
diff --git a/src/net/minecraft/world/item/ArmorStandItem.java b/src/net/minecraft/world/item/ArmorStandItem.java
index e5ec3f1..6726d37 100644
--- a/src/net/minecraft/world/item/ArmorStandItem.java
+++ b/src/net/minecraft/world/item/ArmorStandItem.java
@@ -2,17 +2,17 @@ package net.minecraft.world.item;
 
 import net.minecraft.core.Rotations;
 import java.util.Random;
-import java.util.List;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.decoration.ArmorStand;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.decoration.ArmorStand;
 import net.minecraft.core.Direction;
 import net.minecraft.world.InteractionResult;
 
@@ -22,50 +22,39 @@ public class ArmorStandItem extends Item {
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Direction fp3 = bfz.getClickedFace();
-        if (fp3 == Direction.DOWN) {
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Direction fz3 = blv.getClickedFace();
+        if (fz3 == Direction.DOWN) {
             return InteractionResult.FAIL;
         }
-        final Level bjw4 = bfz.getLevel();
-        final BlockPlaceContext bcq5 = new BlockPlaceContext(bfz);
-        final BlockPos fk6 = bcq5.getClickedPos();
-        final BlockPos fk7 = fk6.above();
-        if (!bcq5.canPlace() || !bjw4.getBlockState(fk7).canBeReplaced(bcq5)) {
+        final Level bqb4 = blv.getLevel();
+        final BlockPlaceContext bin5 = new BlockPlaceContext(blv);
+        final BlockPos fu6 = bin5.getClickedPos();
+        final ItemStack bki7 = blv.getItemInHand();
+        final ArmorStand bay8 = EntityType.ARMOR_STAND.create(bqb4, bki7.getTag(), null, blv.getPlayer(), fu6, MobSpawnType.SPAWN_EGG, true, true);
+        if (!bqb4.noCollision(bay8) || !bqb4.getEntities(bay8, bay8.getBoundingBox()).isEmpty()) {
             return InteractionResult.FAIL;
         }
-        final double double8 = fk6.getX();
-        final double double9 = fk6.getY();
-        final double double10 = fk6.getZ();
-        final List<Entity> list14 = bjw4.getEntities(null, new AABB(double8, double9, double10, double8 + 1.0, double9 + 2.0, double10 + 1.0));
-        if (!list14.isEmpty()) {
-            return InteractionResult.FAIL;
+        if (!bqb4.isClientSide) {
+            final float float9 = Mth.floor((Mth.wrapDegrees(blv.getRotation() - 180.0f) + 22.5f) / 45.0f) * 45.0f;
+            bay8.moveTo(bay8.getX(), bay8.getY(), bay8.getZ(), float9, 0.0f);
+            this.randomizePose(bay8, bqb4.random);
+            bqb4.addFreshEntity(bay8);
+            bqb4.playSound(null, bay8.getX(), bay8.getY(), bay8.getZ(), SoundEvents.ARMOR_STAND_PLACE, SoundSource.BLOCKS, 0.75f, 0.8f);
         }
-        final ItemStack ben15 = bfz.getItemInHand();
-        if (!bjw4.isClientSide) {
-            bjw4.removeBlock(fk6, false);
-            bjw4.removeBlock(fk7, false);
-            final ArmorStand avp16 = new ArmorStand(bjw4, double8 + 0.5, double9, double10 + 0.5);
-            final float float17 = Mth.floor((Mth.wrapDegrees(bfz.getRotation() - 180.0f) + 22.5f) / 45.0f) * 45.0f;
-            avp16.moveTo(double8 + 0.5, double9, double10 + 0.5, float17, 0.0f);
-            this.randomizePose(avp16, bjw4.random);
-            EntityType.updateCustomEntityTag(bjw4, bfz.getPlayer(), avp16, ben15.getTag());
-            bjw4.addFreshEntity(avp16);
-            bjw4.playSound(null, avp16.getX(), avp16.getY(), avp16.getZ(), SoundEvents.ARMOR_STAND_PLACE, SoundSource.BLOCKS, 0.75f, 0.8f);
-        }
-        ben15.shrink(1);
-        return InteractionResult.SUCCESS;
+        bki7.shrink(1);
+        return InteractionResult.sidedSuccess(bqb4.isClientSide);
     }
     
-    private void randomizePose(final ArmorStand avp, final Random random) {
-        Rotations gc4 = avp.getHeadPose();
+    private void randomizePose(final ArmorStand bay, final Random random) {
+        Rotations gn4 = bay.getHeadPose();
         float float6 = random.nextFloat() * 5.0f;
         final float float7 = random.nextFloat() * 20.0f - 10.0f;
-        Rotations gc5 = new Rotations(gc4.getX() + float6, gc4.getY() + float7, gc4.getZ());
-        avp.setHeadPose(gc5);
-        gc4 = avp.getBodyPose();
+        Rotations gn5 = new Rotations(gn4.getX() + float6, gn4.getY() + float7, gn4.getZ());
+        bay.setHeadPose(gn5);
+        gn4 = bay.getBodyPose();
         float6 = random.nextFloat() * 10.0f - 5.0f;
-        gc5 = new Rotations(gc4.getX(), gc4.getY() + float6, gc4.getZ());
-        avp.setBodyPose(gc5);
+        gn5 = new Rotations(gn4.getX(), gn4.getY() + float6, gn4.getZ());
+        bay.setBodyPose(gn5);
     }
 }
diff --git a/src/net/minecraft/world/item/ArrowItem.java b/src/net/minecraft/world/item/ArrowItem.java
index 5d398c9..ef91d72 100644
--- a/src/net/minecraft/world/item/ArrowItem.java
+++ b/src/net/minecraft/world/item/ArrowItem.java
@@ -10,9 +10,9 @@ public class ArrowItem extends Item {
         super(a);
     }
     
-    public AbstractArrow createArrow(final Level bjw, final ItemStack ben, final LivingEntity akz) {
-        final Arrow ayp5 = new Arrow(bjw, akz);
-        ayp5.setEffectsFromItem(ben);
-        return ayp5;
+    public AbstractArrow createArrow(final Level bqb, final ItemStack bki, final LivingEntity aoy) {
+        final Arrow bei5 = new Arrow(bqb, aoy);
+        bei5.setEffectsFromItem(bki);
+        return bei5;
     }
 }
diff --git a/src/net/minecraft/world/item/AxeItem.java b/src/net/minecraft/world/item/AxeItem.java
index 774e467..24be8b9 100644
--- a/src/net/minecraft/world/item/AxeItem.java
+++ b/src/net/minecraft/world/item/AxeItem.java
@@ -1,9 +1,9 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
 import net.minecraft.world.level.block.Blocks;
+import com.google.common.collect.Sets;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Player;
@@ -13,51 +13,53 @@ import net.minecraft.world.level.block.RotatedPillarBlock;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.InteractionResult;
-import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.block.state.BlockState;
 import java.util.Map;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.material.Material;
 import java.util.Set;
 
 public class AxeItem extends DiggerItem {
-    private static final Set<Block> DIGGABLES;
+    private static final Set<Material> DIGGABLE_MATERIALS;
+    private static final Set<Block> OTHER_DIGGABLE_BLOCKS;
     protected static final Map<Block, Block> STRIPABLES;
     
-    protected AxeItem(final Tier bfs, final float float2, final float float3, final Properties a) {
-        super(float2, float3, bfs, AxeItem.DIGGABLES, a);
+    protected AxeItem(final Tier blo, final float float2, final float float3, final Properties a) {
+        super(float2, float3, blo, AxeItem.OTHER_DIGGABLE_BLOCKS, a);
     }
     
     @Override
-    public float getDestroySpeed(final ItemStack ben, final BlockState byj) {
-        final Material coo4 = byj.getMaterial();
-        if (coo4 == Material.WOOD || coo4 == Material.PLANT || coo4 == Material.REPLACEABLE_PLANT || coo4 == Material.BAMBOO) {
+    public float getDestroySpeed(final ItemStack bki, final BlockState cfj) {
+        final Material cxd4 = cfj.getMaterial();
+        if (AxeItem.DIGGABLE_MATERIALS.contains(cxd4)) {
             return this.speed;
         }
-        return super.getDestroySpeed(ben, byj);
+        return super.getDestroySpeed(bki, cfj);
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final BlockState byj5 = bjw3.getBlockState(fk4);
-        final Block bph6 = AxeItem.STRIPABLES.get(byj5.getBlock());
-        if (bph6 != null) {
-            final Player ayj2 = bfz.getPlayer();
-            bjw3.playSound(ayj2, fk4, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1.0f, 1.0f);
-            if (!bjw3.isClientSide) {
-                bjw3.setBlock(fk4, ((AbstractStateHolder<O, BlockState>)bph6.defaultBlockState()).<Direction.Axis, Comparable>setValue(RotatedPillarBlock.AXIS, (Comparable)byj5.<V>getValue((Property<V>)RotatedPillarBlock.AXIS)), 11);
-                if (ayj2 != null) {
-                    bfz.getItemInHand().<Player>hurtAndBreak(1, ayj2, ayj -> ayj.broadcastBreakEvent(bfz.getHand()));
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        final BlockState cfj5 = bqb3.getBlockState(fu4);
+        final Block bvr6 = AxeItem.STRIPABLES.get(cfj5.getBlock());
+        if (bvr6 != null) {
+            final Player bec2 = blv.getPlayer();
+            bqb3.playSound(bec2, fu4, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1.0f, 1.0f);
+            if (!bqb3.isClientSide) {
+                bqb3.setBlock(fu4, ((StateHolder<O, BlockState>)bvr6.defaultBlockState()).<Direction.Axis, Comparable>setValue(RotatedPillarBlock.AXIS, (Comparable)cfj5.<V>getValue((Property<V>)RotatedPillarBlock.AXIS)), 11);
+                if (bec2 != null) {
+                    blv.getItemInHand().<Player>hurtAndBreak(1, bec2, bec -> bec.broadcastBreakEvent(blv.getHand()));
                 }
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb3.isClientSide);
         }
         return InteractionResult.PASS;
     }
     
     static {
-        DIGGABLES = Sets.<Block>newHashSet(Blocks.OAK_PLANKS, Blocks.SPRUCE_PLANKS, Blocks.BIRCH_PLANKS, Blocks.JUNGLE_PLANKS, Blocks.ACACIA_PLANKS, Blocks.DARK_OAK_PLANKS, Blocks.BOOKSHELF, Blocks.OAK_WOOD, Blocks.SPRUCE_WOOD, Blocks.BIRCH_WOOD, Blocks.JUNGLE_WOOD, Blocks.ACACIA_WOOD, Blocks.DARK_OAK_WOOD, Blocks.OAK_LOG, Blocks.SPRUCE_LOG, Blocks.BIRCH_LOG, Blocks.JUNGLE_LOG, Blocks.ACACIA_LOG, Blocks.DARK_OAK_LOG, Blocks.CHEST, Blocks.PUMPKIN, Blocks.CARVED_PUMPKIN, Blocks.JACK_O_LANTERN, Blocks.MELON, Blocks.LADDER, Blocks.SCAFFOLDING, Blocks.OAK_BUTTON, Blocks.SPRUCE_BUTTON, Blocks.BIRCH_BUTTON, Blocks.JUNGLE_BUTTON, Blocks.DARK_OAK_BUTTON, Blocks.ACACIA_BUTTON, Blocks.OAK_PRESSURE_PLATE, Blocks.SPRUCE_PRESSURE_PLATE, Blocks.BIRCH_PRESSURE_PLATE, Blocks.JUNGLE_PRESSURE_PLATE, Blocks.DARK_OAK_PRESSURE_PLATE, Blocks.ACACIA_PRESSURE_PLATE);
-        STRIPABLES = new ImmutableMap.Builder<Block, Block>().put(Blocks.OAK_WOOD, Blocks.STRIPPED_OAK_WOOD).put(Blocks.OAK_LOG, Blocks.STRIPPED_OAK_LOG).put(Blocks.DARK_OAK_WOOD, Blocks.STRIPPED_DARK_OAK_WOOD).put(Blocks.DARK_OAK_LOG, Blocks.STRIPPED_DARK_OAK_LOG).put(Blocks.ACACIA_WOOD, Blocks.STRIPPED_ACACIA_WOOD).put(Blocks.ACACIA_LOG, Blocks.STRIPPED_ACACIA_LOG).put(Blocks.BIRCH_WOOD, Blocks.STRIPPED_BIRCH_WOOD).put(Blocks.BIRCH_LOG, Blocks.STRIPPED_BIRCH_LOG).put(Blocks.JUNGLE_WOOD, Blocks.STRIPPED_JUNGLE_WOOD).put(Blocks.JUNGLE_LOG, Blocks.STRIPPED_JUNGLE_LOG).put(Blocks.SPRUCE_WOOD, Blocks.STRIPPED_SPRUCE_WOOD).put(Blocks.SPRUCE_LOG, Blocks.STRIPPED_SPRUCE_LOG).build();
+        DIGGABLE_MATERIALS = Sets.<Material>newHashSet(Material.WOOD, Material.NETHER_WOOD, Material.PLANT, Material.REPLACEABLE_PLANT, Material.BAMBOO, Material.VEGETABLE);
+        OTHER_DIGGABLE_BLOCKS = Sets.<Block>newHashSet(Blocks.LADDER, Blocks.SCAFFOLDING, Blocks.OAK_BUTTON, Blocks.SPRUCE_BUTTON, Blocks.BIRCH_BUTTON, Blocks.JUNGLE_BUTTON, Blocks.DARK_OAK_BUTTON, Blocks.ACACIA_BUTTON, Blocks.CRIMSON_BUTTON, Blocks.WARPED_BUTTON);
+        STRIPABLES = new ImmutableMap.Builder<Block, Block>().put(Blocks.OAK_WOOD, Blocks.STRIPPED_OAK_WOOD).put(Blocks.OAK_LOG, Blocks.STRIPPED_OAK_LOG).put(Blocks.DARK_OAK_WOOD, Blocks.STRIPPED_DARK_OAK_WOOD).put(Blocks.DARK_OAK_LOG, Blocks.STRIPPED_DARK_OAK_LOG).put(Blocks.ACACIA_WOOD, Blocks.STRIPPED_ACACIA_WOOD).put(Blocks.ACACIA_LOG, Blocks.STRIPPED_ACACIA_LOG).put(Blocks.BIRCH_WOOD, Blocks.STRIPPED_BIRCH_WOOD).put(Blocks.BIRCH_LOG, Blocks.STRIPPED_BIRCH_LOG).put(Blocks.JUNGLE_WOOD, Blocks.STRIPPED_JUNGLE_WOOD).put(Blocks.JUNGLE_LOG, Blocks.STRIPPED_JUNGLE_LOG).put(Blocks.SPRUCE_WOOD, Blocks.STRIPPED_SPRUCE_WOOD).put(Blocks.SPRUCE_LOG, Blocks.STRIPPED_SPRUCE_LOG).put(Blocks.WARPED_STEM, Blocks.STRIPPED_WARPED_STEM).put(Blocks.WARPED_HYPHAE, Blocks.STRIPPED_WARPED_HYPHAE).put(Blocks.CRIMSON_STEM, Blocks.STRIPPED_CRIMSON_STEM).put(Blocks.CRIMSON_HYPHAE, Blocks.STRIPPED_CRIMSON_HYPHAE).build();
     }
 }
diff --git a/src/net/minecraft/world/item/BannerItem.java b/src/net/minecraft/world/item/BannerItem.java
index 3f043f8..68df34b 100644
--- a/src/net/minecraft/world/item/BannerItem.java
+++ b/src/net/minecraft/world/item/BannerItem.java
@@ -14,24 +14,24 @@ import net.minecraft.world.level.block.AbstractBannerBlock;
 import net.minecraft.world.level.block.Block;
 
 public class BannerItem extends StandingAndWallBlockItem {
-    public BannerItem(final Block bph1, final Block bph2, final Properties a) {
-        super(bph1, bph2, a);
-        Validate.isInstanceOf((Class)AbstractBannerBlock.class, bph1);
-        Validate.isInstanceOf((Class)AbstractBannerBlock.class, bph2);
+    public BannerItem(final Block bvr1, final Block bvr2, final Properties a) {
+        super(bvr1, bvr2, a);
+        Validate.isInstanceOf((Class)AbstractBannerBlock.class, bvr1);
+        Validate.isInstanceOf((Class)AbstractBannerBlock.class, bvr2);
     }
     
-    public static void appendHoverTextFromBannerBlockEntityTag(final ItemStack ben, final List<Component> list) {
-        final CompoundTag jt3 = ben.getTagElement("BlockEntityTag");
-        if (jt3 == null || !jt3.contains("Patterns")) {
+    public static void appendHoverTextFromBannerBlockEntityTag(final ItemStack bki, final List<Component> list) {
+        final CompoundTag le3 = bki.getTagElement("BlockEntityTag");
+        if (le3 == null || !le3.contains("Patterns")) {
             return;
         }
-        final ListTag jz4 = jt3.getList("Patterns", 10);
-        for (int integer5 = 0; integer5 < jz4.size() && integer5 < 6; ++integer5) {
-            final CompoundTag jt4 = jz4.getCompound(integer5);
-            final DyeColor bdj7 = DyeColor.byId(jt4.getInt("Color"));
-            final BannerPattern bwd8 = BannerPattern.byHash(jt4.getString("Pattern"));
-            if (bwd8 != null) {
-                list.add(new TranslatableComponent("block.minecraft.banner." + bwd8.getFilename() + '.' + bdj7.getName(), new Object[0]).withStyle(ChatFormatting.GRAY));
+        final ListTag lk4 = le3.getList("Patterns", 10);
+        for (int integer5 = 0; integer5 < lk4.size() && integer5 < 6; ++integer5) {
+            final CompoundTag le4 = lk4.getCompound(integer5);
+            final DyeColor bje7 = DyeColor.byId(le4.getInt("Color"));
+            final BannerPattern cdd8 = BannerPattern.byHash(le4.getString("Pattern"));
+            if (cdd8 != null) {
+                list.add(new TranslatableComponent("block.minecraft.banner." + cdd8.getFilename() + '.' + bje7.getName()).withStyle(ChatFormatting.GRAY));
             }
         }
     }
@@ -41,7 +41,7 @@ public class BannerItem extends StandingAndWallBlockItem {
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        appendHoverTextFromBannerBlockEntityTag(ben, list);
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        appendHoverTextFromBannerBlockEntityTag(bki, list);
     }
 }
diff --git a/src/net/minecraft/world/item/BannerPatternItem.java b/src/net/minecraft/world/item/BannerPatternItem.java
index a0256ca..f7cc35c 100644
--- a/src/net/minecraft/world/item/BannerPatternItem.java
+++ b/src/net/minecraft/world/item/BannerPatternItem.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.item;
 
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import java.util.List;
@@ -11,9 +12,9 @@ import net.minecraft.world.level.block.entity.BannerPattern;
 public class BannerPatternItem extends Item {
     private final BannerPattern bannerPattern;
     
-    public BannerPatternItem(final BannerPattern bwd, final Properties a) {
+    public BannerPatternItem(final BannerPattern cdd, final Properties a) {
         super(a);
-        this.bannerPattern = bwd;
+        this.bannerPattern = cdd;
     }
     
     public BannerPattern getBannerPattern() {
@@ -21,11 +22,11 @@ public class BannerPatternItem extends Item {
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
         list.add(this.getDisplayName().withStyle(ChatFormatting.GRAY));
     }
     
-    public Component getDisplayName() {
-        return new TranslatableComponent(this.getDescriptionId() + ".desc", new Object[0]);
+    public MutableComponent getDisplayName() {
+        return new TranslatableComponent(this.getDescriptionId() + ".desc");
     }
 }
diff --git a/src/net/minecraft/world/item/BedItem.java b/src/net/minecraft/world/item/BedItem.java
index 574bfcf..76b3eb2 100644
--- a/src/net/minecraft/world/item/BedItem.java
+++ b/src/net/minecraft/world/item/BedItem.java
@@ -4,12 +4,12 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Block;
 
 public class BedItem extends BlockItem {
-    public BedItem(final Block bph, final Properties a) {
-        super(bph, a);
+    public BedItem(final Block bvr, final Properties a) {
+        super(bvr, a);
     }
     
     @Override
-    protected boolean placeBlock(final BlockPlaceContext bcq, final BlockState byj) {
-        return bcq.getLevel().setBlock(bcq.getClickedPos(), byj, 26);
+    protected boolean placeBlock(final BlockPlaceContext bin, final BlockState cfj) {
+        return bin.getLevel().setBlock(bin.getClickedPos(), cfj, 26);
     }
 }
diff --git a/src/net/minecraft/world/item/BlockItem.java b/src/net/minecraft/world/item/BlockItem.java
index e8add36..392a7ff 100644
--- a/src/net/minecraft/world/item/BlockItem.java
+++ b/src/net/minecraft/world/item/BlockItem.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import java.util.Map;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.network.chat.Component;
@@ -33,133 +33,135 @@ public class BlockItem extends Item {
     @Deprecated
     private final Block block;
     
-    public BlockItem(final Block bph, final Properties a) {
+    public BlockItem(final Block bvr, final Properties a) {
         super(a);
-        this.block = bph;
+        this.block = bvr;
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final InteractionResult ajl3 = this.place(new BlockPlaceContext(bfz));
-        if (ajl3 != InteractionResult.SUCCESS && this.isEdible()) {
-            return this.use(bfz.level, bfz.player, bfz.hand).getResult();
+    public InteractionResult useOn(final UseOnContext blv) {
+        final InteractionResult ang3 = this.place(new BlockPlaceContext(blv));
+        if (!ang3.consumesAction() && this.isEdible()) {
+            return this.use(blv.level, blv.player, blv.hand).getResult();
         }
-        return ajl3;
+        return ang3;
     }
     
-    public InteractionResult place(final BlockPlaceContext bcq) {
-        if (!bcq.canPlace()) {
+    public InteractionResult place(final BlockPlaceContext bin) {
+        if (!bin.canPlace()) {
             return InteractionResult.FAIL;
         }
-        final BlockPlaceContext bcq2 = this.updatePlacementContext(bcq);
-        if (bcq2 == null) {
+        final BlockPlaceContext bin2 = this.updatePlacementContext(bin);
+        if (bin2 == null) {
             return InteractionResult.FAIL;
         }
-        final BlockState byj4 = this.getPlacementState(bcq2);
-        if (byj4 == null) {
+        final BlockState cfj4 = this.getPlacementState(bin2);
+        if (cfj4 == null) {
             return InteractionResult.FAIL;
         }
-        if (!this.placeBlock(bcq2, byj4)) {
+        if (!this.placeBlock(bin2, cfj4)) {
             return InteractionResult.FAIL;
         }
-        final BlockPos fk5 = bcq2.getClickedPos();
-        final Level bjw6 = bcq2.getLevel();
-        final Player ayj7 = bcq2.getPlayer();
-        final ItemStack ben8 = bcq2.getItemInHand();
-        BlockState byj5 = bjw6.getBlockState(fk5);
-        final Block bph10 = byj5.getBlock();
-        if (bph10 == byj4.getBlock()) {
-            byj5 = this.updateBlockStateFromTag(fk5, bjw6, ben8, byj5);
-            this.updateCustomBlockEntityTag(fk5, bjw6, ayj7, ben8, byj5);
-            bph10.setPlacedBy(bjw6, fk5, byj5, ayj7, ben8);
-            if (ayj7 instanceof ServerPlayer) {
-                CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer)ayj7, fk5, ben8);
+        final BlockPos fu5 = bin2.getClickedPos();
+        final Level bqb6 = bin2.getLevel();
+        final Player bec7 = bin2.getPlayer();
+        final ItemStack bki8 = bin2.getItemInHand();
+        BlockState cfj5 = bqb6.getBlockState(fu5);
+        final Block bvr10 = cfj5.getBlock();
+        if (bvr10 == cfj4.getBlock()) {
+            cfj5 = this.updateBlockStateFromTag(fu5, bqb6, bki8, cfj5);
+            this.updateCustomBlockEntityTag(fu5, bqb6, bec7, bki8, cfj5);
+            bvr10.setPlacedBy(bqb6, fu5, cfj5, bec7, bki8);
+            if (bec7 instanceof ServerPlayer) {
+                CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer)bec7, fu5, bki8);
             }
         }
-        final SoundType bum11 = byj5.getSoundType();
-        bjw6.playSound(ayj7, fk5, this.getPlaceSound(byj5), SoundSource.BLOCKS, (bum11.getVolume() + 1.0f) / 2.0f, bum11.getPitch() * 0.8f);
-        ben8.shrink(1);
-        return InteractionResult.SUCCESS;
+        final SoundType cbh11 = cfj5.getSoundType();
+        bqb6.playSound(bec7, fu5, this.getPlaceSound(cfj5), SoundSource.BLOCKS, (cbh11.getVolume() + 1.0f) / 2.0f, cbh11.getPitch() * 0.8f);
+        if (bec7 == null || !bec7.abilities.instabuild) {
+            bki8.shrink(1);
+        }
+        return InteractionResult.sidedSuccess(bqb6.isClientSide);
     }
     
-    protected SoundEvent getPlaceSound(final BlockState byj) {
-        return byj.getSoundType().getPlaceSound();
+    protected SoundEvent getPlaceSound(final BlockState cfj) {
+        return cfj.getSoundType().getPlaceSound();
     }
     
     @Nullable
-    public BlockPlaceContext updatePlacementContext(final BlockPlaceContext bcq) {
-        return bcq;
+    public BlockPlaceContext updatePlacementContext(final BlockPlaceContext bin) {
+        return bin;
     }
     
-    protected boolean updateCustomBlockEntityTag(final BlockPos fk, final Level bjw, @Nullable final Player ayj, final ItemStack ben, final BlockState byj) {
-        return updateCustomBlockEntityTag(bjw, ayj, fk, ben);
+    protected boolean updateCustomBlockEntityTag(final BlockPos fu, final Level bqb, @Nullable final Player bec, final ItemStack bki, final BlockState cfj) {
+        return updateCustomBlockEntityTag(bqb, bec, fu, bki);
     }
     
     @Nullable
-    protected BlockState getPlacementState(final BlockPlaceContext bcq) {
-        final BlockState byj3 = this.getBlock().getStateForPlacement(bcq);
-        return (byj3 != null && this.canPlace(bcq, byj3)) ? byj3 : null;
+    protected BlockState getPlacementState(final BlockPlaceContext bin) {
+        final BlockState cfj3 = this.getBlock().getStateForPlacement(bin);
+        return (cfj3 != null && this.canPlace(bin, cfj3)) ? cfj3 : null;
     }
     
-    private BlockState updateBlockStateFromTag(final BlockPos fk, final Level bjw, final ItemStack ben, final BlockState byj) {
-        BlockState byj2 = byj;
-        final CompoundTag jt7 = ben.getTag();
-        if (jt7 != null) {
-            final CompoundTag jt8 = jt7.getCompound("BlockStateTag");
-            final StateDefinition<Block, BlockState> byk9 = byj2.getBlock().getStateDefinition();
-            for (final String string11 : jt8.getAllKeys()) {
-                final Property<?> bzm12 = byk9.getProperty(string11);
-                if (bzm12 != null) {
-                    final String string12 = jt8.get(string11).getAsString();
-                    byj2 = BlockItem.updateState(byj2, bzm12, string12);
+    private BlockState updateBlockStateFromTag(final BlockPos fu, final Level bqb, final ItemStack bki, final BlockState cfj) {
+        BlockState cfj2 = cfj;
+        final CompoundTag le7 = bki.getTag();
+        if (le7 != null) {
+            final CompoundTag le8 = le7.getCompound("BlockStateTag");
+            final StateDefinition<Block, BlockState> cfk9 = cfj2.getBlock().getStateDefinition();
+            for (final String string11 : le8.getAllKeys()) {
+                final Property<?> cgl12 = cfk9.getProperty(string11);
+                if (cgl12 != null) {
+                    final String string12 = le8.get(string11).getAsString();
+                    cfj2 = BlockItem.updateState(cfj2, cgl12, string12);
                 }
             }
         }
-        if (byj2 != byj) {
-            bjw.setBlock(fk, byj2, 2);
+        if (cfj2 != cfj) {
+            bqb.setBlock(fu, cfj2, 2);
         }
-        return byj2;
+        return cfj2;
     }
     
-    private static <T extends Comparable<T>> BlockState updateState(final BlockState byj, final Property<T> bzm, final String string) {
-        return bzm.getValue(string).<BlockState>map(comparable -> (BlockState)((AbstractStateHolder<Object, Object>)byj).<T, Comparable>setValue(bzm, comparable)).orElse(byj);
+    private static <T extends Comparable<T>> BlockState updateState(final BlockState cfj, final Property<T> cgl, final String string) {
+        return cgl.getValue(string).<BlockState>map(comparable -> (BlockState)((StateHolder<Object, Object>)cfj).<T, Comparable>setValue(cgl, comparable)).orElse(cfj);
     }
     
-    protected boolean canPlace(final BlockPlaceContext bcq, final BlockState byj) {
-        final Player ayj4 = bcq.getPlayer();
-        final CollisionContext cvq5 = (ayj4 == null) ? CollisionContext.empty() : CollisionContext.of(ayj4);
-        return (!this.mustSurvive() || byj.canSurvive(bcq.getLevel(), bcq.getClickedPos())) && bcq.getLevel().isUnobstructed(byj, bcq.getClickedPos(), cvq5);
+    protected boolean canPlace(final BlockPlaceContext bin, final BlockState cfj) {
+        final Player bec4 = bin.getPlayer();
+        final CollisionContext der5 = (bec4 == null) ? CollisionContext.empty() : CollisionContext.of(bec4);
+        return (!this.mustSurvive() || cfj.canSurvive(bin.getLevel(), bin.getClickedPos())) && bin.getLevel().isUnobstructed(cfj, bin.getClickedPos(), der5);
     }
     
     protected boolean mustSurvive() {
         return true;
     }
     
-    protected boolean placeBlock(final BlockPlaceContext bcq, final BlockState byj) {
-        return bcq.getLevel().setBlock(bcq.getClickedPos(), byj, 11);
+    protected boolean placeBlock(final BlockPlaceContext bin, final BlockState cfj) {
+        return bin.getLevel().setBlock(bin.getClickedPos(), cfj, 11);
     }
     
-    public static boolean updateCustomBlockEntityTag(final Level bjw, @Nullable final Player ayj, final BlockPos fk, final ItemStack ben) {
-        final MinecraftServer minecraftServer5 = bjw.getServer();
+    public static boolean updateCustomBlockEntityTag(final Level bqb, @Nullable final Player bec, final BlockPos fu, final ItemStack bki) {
+        final MinecraftServer minecraftServer5 = bqb.getServer();
         if (minecraftServer5 == null) {
             return false;
         }
-        final CompoundTag jt6 = ben.getTagElement("BlockEntityTag");
-        if (jt6 != null) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 != null) {
-                if (!bjw.isClientSide && bwl7.onlyOpCanSetNbt() && (ayj == null || !ayj.canUseGameMasterBlocks())) {
+        final CompoundTag le6 = bki.getTagElement("BlockEntityTag");
+        if (le6 != null) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 != null) {
+                if (!bqb.isClientSide && cdl7.onlyOpCanSetNbt() && (bec == null || !bec.canUseGameMasterBlocks())) {
                     return false;
                 }
-                final CompoundTag jt7 = bwl7.save(new CompoundTag());
-                final CompoundTag jt8 = jt7.copy();
-                jt7.merge(jt6);
-                jt7.putInt("x", fk.getX());
-                jt7.putInt("y", fk.getY());
-                jt7.putInt("z", fk.getZ());
-                if (!jt7.equals(jt8)) {
-                    bwl7.load(jt7);
-                    bwl7.setChanged();
+                final CompoundTag le7 = cdl7.save(new CompoundTag());
+                final CompoundTag le8 = le7.copy();
+                le7.merge(le6);
+                le7.putInt("x", fu.getX());
+                le7.putInt("y", fu.getY());
+                le7.putInt("z", fu.getZ());
+                if (!le7.equals(le8)) {
+                    cdl7.load(bqb.getBlockState(fu), le7);
+                    cdl7.setChanged();
                     return true;
                 }
             }
@@ -173,23 +175,23 @@ public class BlockItem extends Item {
     }
     
     @Override
-    public void fillItemCategory(final CreativeModeTab bdd, final NonNullList<ItemStack> fy) {
-        if (this.allowdedIn(bdd)) {
-            this.getBlock().fillItemCategory(bdd, fy);
+    public void fillItemCategory(final CreativeModeTab biy, final NonNullList<ItemStack> gi) {
+        if (this.allowdedIn(biy)) {
+            this.getBlock().fillItemCategory(biy, gi);
         }
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        super.appendHoverText(ben, bjw, list, bfw);
-        this.getBlock().appendHoverText(ben, bjw, list, bfw);
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        super.appendHoverText(bki, bqb, list, bls);
+        this.getBlock().appendHoverText(bki, bqb, list, bls);
     }
     
     public Block getBlock() {
         return this.block;
     }
     
-    public void registerBlocks(final Map<Block, Item> map, final Item bei) {
-        map.put(this.getBlock(), bei);
+    public void registerBlocks(final Map<Block, Item> map, final Item bke) {
+        map.put(this.getBlock(), bke);
     }
 }
diff --git a/src/net/minecraft/world/item/BlockPlaceContext.java b/src/net/minecraft/world/item/BlockPlaceContext.java
index aa2ebaf..3d07d49 100644
--- a/src/net/minecraft/world/item/BlockPlaceContext.java
+++ b/src/net/minecraft/world/item/BlockPlaceContext.java
@@ -3,30 +3,34 @@ package net.minecraft.world.item;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.Direction;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionHand;
-import javax.annotation.Nullable;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 
 public class BlockPlaceContext extends UseOnContext {
     private final BlockPos relativePos;
     protected boolean replaceClicked;
     
-    public BlockPlaceContext(final UseOnContext bfz) {
-        this(bfz.getLevel(), bfz.getPlayer(), bfz.getHand(), bfz.getItemInHand(), bfz.hitResult);
+    public BlockPlaceContext(final Player bec, final InteractionHand anf, final ItemStack bki, final BlockHitResult deh) {
+        this(bec.level, bec, anf, bki, deh);
     }
     
-    protected BlockPlaceContext(final Level bjw, @Nullable final Player ayj, final InteractionHand ajk, final ItemStack ben, final BlockHitResult cvg) {
-        super(bjw, ayj, ajk, ben, cvg);
+    public BlockPlaceContext(final UseOnContext blv) {
+        this(blv.getLevel(), blv.getPlayer(), blv.getHand(), blv.getItemInHand(), blv.hitResult);
+    }
+    
+    protected BlockPlaceContext(final Level bqb, @Nullable final Player bec, final InteractionHand anf, final ItemStack bki, final BlockHitResult deh) {
+        super(bqb, bec, anf, bki, deh);
         this.replaceClicked = true;
-        this.relativePos = cvg.getBlockPos().relative(cvg.getDirection());
-        this.replaceClicked = bjw.getBlockState(cvg.getBlockPos()).canBeReplaced(this);
+        this.relativePos = deh.getBlockPos().relative(deh.getDirection());
+        this.replaceClicked = bqb.getBlockState(deh.getBlockPos()).canBeReplaced(this);
     }
     
-    public static BlockPlaceContext at(final BlockPlaceContext bcq, final BlockPos fk, final Direction fp) {
-        return new BlockPlaceContext(bcq.getLevel(), bcq.getPlayer(), bcq.getHand(), bcq.getItemInHand(), new BlockHitResult(new Vec3(fk.getX() + 0.5 + fp.getStepX() * 0.5, fk.getY() + 0.5 + fp.getStepY() * 0.5, fk.getZ() + 0.5 + fp.getStepZ() * 0.5), fp, fk, false));
+    public static BlockPlaceContext at(final BlockPlaceContext bin, final BlockPos fu, final Direction fz) {
+        return new BlockPlaceContext(bin.getLevel(), bin.getPlayer(), bin.getHand(), bin.getItemInHand(), new BlockHitResult(new Vec3(fu.getX() + 0.5 + fz.getStepX() * 0.5, fu.getY() + 0.5 + fz.getStepY() * 0.5, fu.getZ() + 0.5 + fz.getStepZ() * 0.5), fz, fu, false));
     }
     
     @Override
@@ -51,12 +55,12 @@ public class BlockPlaceContext extends UseOnContext {
         if (this.replaceClicked) {
             return arr2;
         }
-        Direction fp3;
+        Direction fz3;
         int integer4;
-        for (fp3 = this.getClickedFace(), integer4 = 0; integer4 < arr2.length && arr2[integer4] != fp3.getOpposite(); ++integer4) {}
+        for (fz3 = this.getClickedFace(), integer4 = 0; integer4 < arr2.length && arr2[integer4] != fz3.getOpposite(); ++integer4) {}
         if (integer4 > 0) {
             System.arraycopy(arr2, 0, arr2, 1, integer4);
-            arr2[0] = fp3.getOpposite();
+            arr2[0] = fz3.getOpposite();
         }
         return arr2;
     }
diff --git a/src/net/minecraft/world/item/BoatItem.java b/src/net/minecraft/world/item/BoatItem.java
index 3e98f80..e48d52e 100644
--- a/src/net/minecraft/world/item/BoatItem.java
+++ b/src/net/minecraft/world/item/BoatItem.java
@@ -27,41 +27,41 @@ public class BoatItem extends Item {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        final HitResult cvi6 = Item.getPlayerPOVHitResult(bjw, ayj, ClipContext.Fluid.ANY);
-        if (cvi6.getType() == HitResult.Type.MISS) {
-            return InteractionResultHolder.<ItemStack>pass(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        final HitResult dej6 = Item.getPlayerPOVHitResult(bqb, bec, ClipContext.Fluid.ANY);
+        if (dej6.getType() == HitResult.Type.MISS) {
+            return InteractionResultHolder.<ItemStack>pass(bki5);
         }
-        final Vec3 cvl7 = ayj.getViewVector(1.0f);
+        final Vec3 dem7 = bec.getViewVector(1.0f);
         final double double8 = 5.0;
-        final List<Entity> list10 = bjw.getEntities(ayj, ayj.getBoundingBox().expandTowards(cvl7.scale(5.0)).inflate(1.0), BoatItem.ENTITY_PREDICATE);
+        final List<Entity> list10 = bqb.getEntities(bec, bec.getBoundingBox().expandTowards(dem7.scale(5.0)).inflate(1.0), BoatItem.ENTITY_PREDICATE);
         if (!list10.isEmpty()) {
-            final Vec3 cvl8 = ayj.getEyePosition(1.0f);
-            for (final Entity akq13 : list10) {
-                final AABB cvf14 = akq13.getBoundingBox().inflate(akq13.getPickRadius());
-                if (cvf14.contains(cvl8)) {
-                    return InteractionResultHolder.<ItemStack>pass(ben5);
+            final Vec3 dem8 = bec.getEyePosition(1.0f);
+            for (final Entity aom13 : list10) {
+                final AABB deg14 = aom13.getBoundingBox().inflate(aom13.getPickRadius());
+                if (deg14.contains(dem8)) {
+                    return InteractionResultHolder.<ItemStack>pass(bki5);
                 }
             }
         }
-        if (cvi6.getType() != HitResult.Type.BLOCK) {
-            return InteractionResultHolder.<ItemStack>pass(ben5);
+        if (dej6.getType() != HitResult.Type.BLOCK) {
+            return InteractionResultHolder.<ItemStack>pass(bki5);
         }
-        final Boat azz11 = new Boat(bjw, cvi6.getLocation().x, cvi6.getLocation().y, cvi6.getLocation().z);
-        azz11.setType(this.type);
-        azz11.yRot = ayj.yRot;
-        if (!bjw.noCollision(azz11, azz11.getBoundingBox().inflate(-0.1))) {
-            return InteractionResultHolder.<ItemStack>fail(ben5);
+        final Boat bft11 = new Boat(bqb, dej6.getLocation().x, dej6.getLocation().y, dej6.getLocation().z);
+        bft11.setType(this.type);
+        bft11.yRot = bec.yRot;
+        if (!bqb.noCollision(bft11, bft11.getBoundingBox().inflate(-0.1))) {
+            return InteractionResultHolder.<ItemStack>fail(bki5);
         }
-        if (!bjw.isClientSide) {
-            bjw.addFreshEntity(azz11);
-            if (!ayj.abilities.instabuild) {
-                ben5.shrink(1);
+        if (!bqb.isClientSide) {
+            bqb.addFreshEntity(bft11);
+            if (!bec.abilities.instabuild) {
+                bki5.shrink(1);
             }
         }
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        return InteractionResultHolder.<ItemStack>success(ben5);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
     }
     
     static {
diff --git a/src/net/minecraft/world/item/BoneMealItem.java b/src/net/minecraft/world/item/BoneMealItem.java
index c61763a..c95eec5 100644
--- a/src/net/minecraft/world/item/BoneMealItem.java
+++ b/src/net/minecraft/world/item/BoneMealItem.java
@@ -1,11 +1,12 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.LevelReader;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.BaseCoralWallFanBlock;
 import net.minecraft.tags.BlockTags;
@@ -28,37 +29,37 @@ public class BoneMealItem extends Item {
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final BlockPos fk5 = fk4.relative(bfz.getClickedFace());
-        if (growCrop(bfz.getItemInHand(), bjw3, fk4)) {
-            if (!bjw3.isClientSide) {
-                bjw3.levelEvent(2005, fk4, 0);
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        final BlockPos fu5 = fu4.relative(blv.getClickedFace());
+        if (growCrop(blv.getItemInHand(), bqb3, fu4)) {
+            if (!bqb3.isClientSide) {
+                bqb3.levelEvent(2005, fu4, 0);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb3.isClientSide);
         }
-        final BlockState byj6 = bjw3.getBlockState(fk4);
-        final boolean boolean7 = byj6.isFaceSturdy(bjw3, fk4, bfz.getClickedFace());
-        if (boolean7 && growWaterPlant(bfz.getItemInHand(), bjw3, fk5, bfz.getClickedFace())) {
-            if (!bjw3.isClientSide) {
-                bjw3.levelEvent(2005, fk5, 0);
+        final BlockState cfj6 = bqb3.getBlockState(fu4);
+        final boolean boolean7 = cfj6.isFaceSturdy(bqb3, fu4, blv.getClickedFace());
+        if (boolean7 && growWaterPlant(blv.getItemInHand(), bqb3, fu5, blv.getClickedFace())) {
+            if (!bqb3.isClientSide) {
+                bqb3.levelEvent(2005, fu5, 0);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb3.isClientSide);
         }
         return InteractionResult.PASS;
     }
     
-    public static boolean growCrop(final ItemStack ben, final Level bjw, final BlockPos fk) {
-        final BlockState byj4 = bjw.getBlockState(fk);
-        if (byj4.getBlock() instanceof BonemealableBlock) {
-            final BonemealableBlock bpj5 = (BonemealableBlock)byj4.getBlock();
-            if (bpj5.isValidBonemealTarget(bjw, fk, byj4, bjw.isClientSide)) {
-                if (bjw instanceof ServerLevel) {
-                    if (bpj5.isBonemealSuccess(bjw, bjw.random, fk, byj4)) {
-                        bpj5.performBonemeal((ServerLevel)bjw, bjw.random, fk, byj4);
+    public static boolean growCrop(final ItemStack bki, final Level bqb, final BlockPos fu) {
+        final BlockState cfj4 = bqb.getBlockState(fu);
+        if (cfj4.getBlock() instanceof BonemealableBlock) {
+            final BonemealableBlock bvt5 = (BonemealableBlock)cfj4.getBlock();
+            if (bvt5.isValidBonemealTarget(bqb, fu, cfj4, bqb.isClientSide)) {
+                if (bqb instanceof ServerLevel) {
+                    if (bvt5.isBonemealSuccess(bqb, bqb.random, fu, cfj4)) {
+                        bvt5.performBonemeal((ServerLevel)bqb, bqb.random, fu, cfj4);
                     }
-                    ben.shrink(1);
+                    bki.shrink(1);
                 }
                 return true;
             }
@@ -66,70 +67,93 @@ public class BoneMealItem extends Item {
         return false;
     }
     
-    public static boolean growWaterPlant(final ItemStack ben, final Level bjw, final BlockPos fk, @Nullable final Direction fp) {
-        if (bjw.getBlockState(fk).getBlock() != Blocks.WATER || bjw.getFluidState(fk).getAmount() != 8) {
+    public static boolean growWaterPlant(final ItemStack bki, final Level bqb, final BlockPos fu, @Nullable final Direction fz) {
+        if (!bqb.getBlockState(fu).is(Blocks.WATER) || bqb.getFluidState(fu).getAmount() != 8) {
             return false;
         }
-        if (!(bjw instanceof ServerLevel)) {
+        if (!(bqb instanceof ServerLevel)) {
             return true;
         }
         int integer5 = 0;
-    Label_0043:
+    Label_0041:
         while (integer5 < 128) {
-            BlockPos fk2 = fk;
-            Biome bkt7 = bjw.getBiome(fk2);
-            BlockState byj8 = Blocks.SEAGRASS.defaultBlockState();
+            BlockPos fu2 = fu;
+            Biome bre7 = bqb.getBiome(fu2);
+            BlockState cfj8 = Blocks.SEAGRASS.defaultBlockState();
             while (true) {
                 for (int integer6 = 0; integer6 < integer5 / 16; ++integer6) {
-                    fk2 = fk2.offset(BoneMealItem.random.nextInt(3) - 1, (BoneMealItem.random.nextInt(3) - 1) * BoneMealItem.random.nextInt(3) / 2, BoneMealItem.random.nextInt(3) - 1);
-                    bkt7 = bjw.getBiome(fk2);
-                    if (bjw.getBlockState(fk2).isCollisionShapeFullBlock(bjw, fk2)) {
+                    fu2 = fu2.offset(BoneMealItem.random.nextInt(3) - 1, (BoneMealItem.random.nextInt(3) - 1) * BoneMealItem.random.nextInt(3) / 2, BoneMealItem.random.nextInt(3) - 1);
+                    bre7 = bqb.getBiome(fu2);
+                    if (bqb.getBlockState(fu2).isCollisionShapeFullBlock(bqb, fu2)) {
                         ++integer5;
-                        continue Label_0043;
+                        continue Label_0041;
                     }
                 }
-                if (bkt7 == Biomes.WARM_OCEAN || bkt7 == Biomes.DEEP_WARM_OCEAN) {
-                    if (integer5 == 0 && fp != null && fp.getAxis().isHorizontal()) {
-                        byj8 = ((AbstractStateHolder<O, BlockState>)BlockTags.WALL_CORALS.getRandomElement(bjw.random).defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, fp);
+                if (bre7 == Biomes.WARM_OCEAN || bre7 == Biomes.DEEP_WARM_OCEAN) {
+                    if (integer5 == 0 && fz != null && fz.getAxis().isHorizontal()) {
+                        cfj8 = ((StateHolder<O, BlockState>)BlockTags.WALL_CORALS.getRandomElement(bqb.random).defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, fz);
                     }
                     else if (BoneMealItem.random.nextInt(4) == 0) {
-                        byj8 = BlockTags.UNDERWATER_BONEMEALS.getRandomElement(BoneMealItem.random).defaultBlockState();
+                        cfj8 = BlockTags.UNDERWATER_BONEMEALS.getRandomElement(BoneMealItem.random).defaultBlockState();
                     }
                 }
-                if (byj8.getBlock().is(BlockTags.WALL_CORALS)) {
-                    for (int integer6 = 0; !byj8.canSurvive(bjw, fk2) && integer6 < 4; byj8 = ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Direction>setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, Direction.Plane.HORIZONTAL.getRandomDirection(BoneMealItem.random)), ++integer6) {}
+                if (cfj8.getBlock().is(BlockTags.WALL_CORALS)) {
+                    for (int integer6 = 0; !cfj8.canSurvive(bqb, fu2) && integer6 < 4; cfj8 = ((StateHolder<O, BlockState>)cfj8).<Comparable, Direction>setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, Direction.Plane.HORIZONTAL.getRandomDirection(BoneMealItem.random)), ++integer6) {}
                 }
-                if (!byj8.canSurvive(bjw, fk2)) {
+                if (!cfj8.canSurvive(bqb, fu2)) {
                     continue;
                 }
-                final BlockState byj9 = bjw.getBlockState(fk2);
-                if (byj9.getBlock() == Blocks.WATER && bjw.getFluidState(fk2).getAmount() == 8) {
-                    bjw.setBlock(fk2, byj8, 3);
+                final BlockState cfj9 = bqb.getBlockState(fu2);
+                if (cfj9.is(Blocks.WATER) && bqb.getFluidState(fu2).getAmount() == 8) {
+                    bqb.setBlock(fu2, cfj8, 3);
                     continue;
                 }
-                if (byj9.getBlock() == Blocks.SEAGRASS && BoneMealItem.random.nextInt(10) == 0) {
-                    ((BonemealableBlock)Blocks.SEAGRASS).performBonemeal((ServerLevel)bjw, BoneMealItem.random, fk2, byj9);
+                if (cfj9.is(Blocks.SEAGRASS) && BoneMealItem.random.nextInt(10) == 0) {
+                    ((BonemealableBlock)Blocks.SEAGRASS).performBonemeal((ServerLevel)bqb, BoneMealItem.random, fu2, cfj9);
                 }
                 continue;
             }
         }
-        ben.shrink(1);
+        bki.shrink(1);
         return true;
     }
     
-    public static void addGrowthParticles(final LevelAccessor bjx, final BlockPos fk, int integer) {
+    public static void addGrowthParticles(final LevelAccessor bqc, BlockPos fu, int integer) {
         if (integer == 0) {
             integer = 15;
         }
-        final BlockState byj4 = bjx.getBlockState(fk);
-        if (byj4.isAir()) {
+        final BlockState cfj4 = bqc.getBlockState(fu);
+        if (cfj4.isAir()) {
             return;
         }
+        double double5 = 0.5;
+        double double6;
+        if (cfj4.is(Blocks.WATER)) {
+            integer *= 3;
+            double6 = 1.0;
+            double5 = 3.0;
+        }
+        else if (cfj4.isSolidRender(bqc, fu)) {
+            fu = fu.above();
+            integer *= 3;
+            double5 = 3.0;
+            double6 = 1.0;
+        }
+        else {
+            double6 = cfj4.getShape(bqc, fu).max(Direction.Axis.Y);
+        }
+        bqc.addParticle(ParticleTypes.HAPPY_VILLAGER, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, 0.0, 0.0, 0.0);
         for (int integer2 = 0; integer2 < integer; ++integer2) {
-            final double double6 = BoneMealItem.random.nextGaussian() * 0.02;
             final double double7 = BoneMealItem.random.nextGaussian() * 0.02;
             final double double8 = BoneMealItem.random.nextGaussian() * 0.02;
-            bjx.addParticle(ParticleTypes.HAPPY_VILLAGER, fk.getX() + BoneMealItem.random.nextFloat(), fk.getY() + BoneMealItem.random.nextFloat() * byj4.getShape(bjx, fk).max(Direction.Axis.Y), fk.getZ() + BoneMealItem.random.nextFloat(), double6, double7, double8);
+            final double double9 = BoneMealItem.random.nextGaussian() * 0.02;
+            final double double10 = 0.5 - double5;
+            final double double11 = fu.getX() + double10 + BoneMealItem.random.nextDouble() * double5 * 2.0;
+            final double double12 = fu.getY() + BoneMealItem.random.nextDouble() * double6;
+            final double double13 = fu.getZ() + double10 + BoneMealItem.random.nextDouble() * double5 * 2.0;
+            if (!bqc.getBlockState(new BlockPos(double11, double12, double13).below()).isAir()) {
+                bqc.addParticle(ParticleTypes.HAPPY_VILLAGER, double11, double12, double13, double7, double8, double9);
+            }
         }
     }
 }
diff --git a/src/net/minecraft/world/item/BookItem.java b/src/net/minecraft/world/item/BookItem.java
index 6f86697..390facd 100644
--- a/src/net/minecraft/world/item/BookItem.java
+++ b/src/net/minecraft/world/item/BookItem.java
@@ -6,8 +6,8 @@ public class BookItem extends Item {
     }
     
     @Override
-    public boolean isEnchantable(final ItemStack ben) {
-        return ben.getCount() == 1;
+    public boolean isEnchantable(final ItemStack bki) {
+        return bki.getCount() == 1;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/BottleItem.java b/src/net/minecraft/world/item/BottleItem.java
index cba51c1..39e73f5 100644
--- a/src/net/minecraft/world/item/BottleItem.java
+++ b/src/net/minecraft/world/item/BottleItem.java
@@ -6,6 +6,8 @@ import net.minecraft.core.BlockPos;
 import java.util.List;
 import net.minecraft.world.item.alchemy.PotionUtils;
 import net.minecraft.world.item.alchemy.Potions;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
@@ -26,41 +28,41 @@ public class BottleItem extends Item {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final List<AreaEffectCloud> list5 = bjw.<AreaEffectCloud>getEntitiesOfClass(AreaEffectCloud.class, ayj.getBoundingBox().inflate(2.0), akp -> akp != null && akp.isAlive() && akp.getOwner() instanceof EnderDragon);
-        final ItemStack ben6 = ayj.getItemInHand(ajk);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final List<AreaEffectCloud> list5 = bqb.<AreaEffectCloud>getEntitiesOfClass(AreaEffectCloud.class, bec.getBoundingBox().inflate(2.0), aol -> aol != null && aol.isAlive() && aol.getOwner() instanceof EnderDragon);
+        final ItemStack bki6 = bec.getItemInHand(anf);
         if (!list5.isEmpty()) {
-            final AreaEffectCloud akp2 = list5.get(0);
-            akp2.setRadius(akp2.getRadius() - 0.5f);
-            bjw.playSound(null, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.BOTTLE_FILL_DRAGONBREATH, SoundSource.NEUTRAL, 1.0f, 1.0f);
-            return InteractionResultHolder.<ItemStack>success(this.turnBottleIntoItem(ben6, ayj, new ItemStack(Items.DRAGON_BREATH)));
+            final AreaEffectCloud aol2 = list5.get(0);
+            aol2.setRadius(aol2.getRadius() - 0.5f);
+            bqb.playSound(null, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.BOTTLE_FILL_DRAGONBREATH, SoundSource.NEUTRAL, 1.0f, 1.0f);
+            return InteractionResultHolder.<ItemStack>sidedSuccess(this.turnBottleIntoItem(bki6, bec, new ItemStack(Items.DRAGON_BREATH)), bqb.isClientSide());
         }
-        final HitResult cvi7 = Item.getPlayerPOVHitResult(bjw, ayj, ClipContext.Fluid.SOURCE_ONLY);
-        if (cvi7.getType() == HitResult.Type.MISS) {
-            return InteractionResultHolder.<ItemStack>pass(ben6);
+        final HitResult dej7 = Item.getPlayerPOVHitResult(bqb, bec, ClipContext.Fluid.SOURCE_ONLY);
+        if (dej7.getType() == HitResult.Type.MISS) {
+            return InteractionResultHolder.<ItemStack>pass(bki6);
         }
-        if (cvi7.getType() == HitResult.Type.BLOCK) {
-            final BlockPos fk8 = ((BlockHitResult)cvi7).getBlockPos();
-            if (!bjw.mayInteract(ayj, fk8)) {
-                return InteractionResultHolder.<ItemStack>pass(ben6);
+        if (dej7.getType() == HitResult.Type.BLOCK) {
+            final BlockPos fu8 = ((BlockHitResult)dej7).getBlockPos();
+            if (!bqb.mayInteract(bec, fu8)) {
+                return InteractionResultHolder.<ItemStack>pass(bki6);
             }
-            if (bjw.getFluidState(fk8).is(FluidTags.WATER)) {
-                bjw.playSound(ayj, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0f, 1.0f);
-                return InteractionResultHolder.<ItemStack>success(this.turnBottleIntoItem(ben6, ayj, PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER)));
+            if (bqb.getFluidState(fu8).is(FluidTags.WATER)) {
+                bqb.playSound(bec, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0f, 1.0f);
+                return InteractionResultHolder.<ItemStack>sidedSuccess(this.turnBottleIntoItem(bki6, bec, PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER)), bqb.isClientSide());
             }
         }
-        return InteractionResultHolder.<ItemStack>pass(ben6);
+        return InteractionResultHolder.<ItemStack>pass(bki6);
     }
     
-    protected ItemStack turnBottleIntoItem(final ItemStack ben1, final Player ayj, final ItemStack ben3) {
-        ben1.shrink(1);
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        if (ben1.isEmpty()) {
-            return ben3;
+    protected ItemStack turnBottleIntoItem(final ItemStack bki1, final Player bec, final ItemStack bki3) {
+        bki1.shrink(1);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        if (bki1.isEmpty()) {
+            return bki3;
         }
-        if (!ayj.inventory.add(ben3)) {
-            ayj.drop(ben3, false);
+        if (!bec.inventory.add(bki3)) {
+            bec.drop(bki3, false);
         }
-        return ben1;
+        return bki1;
     }
 }
diff --git a/src/net/minecraft/world/item/BowItem.java b/src/net/minecraft/world/item/BowItem.java
index eb1265f..ca31f89 100644
--- a/src/net/minecraft/world/item/BowItem.java
+++ b/src/net/minecraft/world/item/BowItem.java
@@ -15,77 +15,64 @@ import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
-import net.minecraft.resources.ResourceLocation;
 
-public class BowItem extends ProjectileWeaponItem {
+public class BowItem extends ProjectileWeaponItem implements Vanishable {
     public BowItem(final Properties a) {
         super(a);
-        this.addProperty(new ResourceLocation("pull"), (ben, bjw, akz) -> {
-            if (akz == null) {
-                return 0.0f;
-            }
-            else if (akz.getUseItem().getItem() != Items.BOW) {
-                return 0.0f;
-            }
-            else {
-                return (ben.getUseDuration() - akz.getUseItemRemainingTicks()) / 20.0f;
-            }
-        });
-        this.addProperty(new ResourceLocation("pulling"), (ben, bjw, akz) -> (akz != null && akz.isUsingItem() && akz.getUseItem() == ben) ? 1.0f : 0.0f);
     }
     
     @Override
-    public void releaseUsing(final ItemStack ben, final Level bjw, final LivingEntity akz, final int integer) {
-        if (!(akz instanceof Player)) {
+    public void releaseUsing(final ItemStack bki, final Level bqb, final LivingEntity aoy, final int integer) {
+        if (!(aoy instanceof Player)) {
             return;
         }
-        final Player ayj3 = (Player)akz;
-        final boolean boolean7 = ayj3.abilities.instabuild || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY_ARROWS, ben) > 0;
-        ItemStack ben2 = ayj3.getProjectile(ben);
-        if (ben2.isEmpty() && !boolean7) {
+        final Player bec3 = (Player)aoy;
+        final boolean boolean7 = bec3.abilities.instabuild || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY_ARROWS, bki) > 0;
+        ItemStack bki2 = bec3.getProjectile(bki);
+        if (bki2.isEmpty() && !boolean7) {
             return;
         }
-        if (ben2.isEmpty()) {
-            ben2 = new ItemStack(Items.ARROW);
+        if (bki2.isEmpty()) {
+            bki2 = new ItemStack(Items.ARROW);
         }
-        final int integer2 = this.getUseDuration(ben) - integer;
+        final int integer2 = this.getUseDuration(bki) - integer;
         final float float10 = getPowerForTime(integer2);
         if (float10 < 0.1) {
             return;
         }
-        final boolean boolean8 = boolean7 && ben2.getItem() == Items.ARROW;
-        if (!bjw.isClientSide) {
-            final ArrowItem bck12 = (ArrowItem)((ben2.getItem() instanceof ArrowItem) ? ben2.getItem() : Items.ARROW);
-            final AbstractArrow ayn13 = bck12.createArrow(bjw, ben2, ayj3);
-            ayn13.shootFromRotation(ayj3, ayj3.xRot, ayj3.yRot, 0.0f, float10 * 3.0f, 1.0f);
+        final boolean boolean8 = boolean7 && bki2.getItem() == Items.ARROW;
+        if (!bqb.isClientSide) {
+            final ArrowItem bih12 = (ArrowItem)((bki2.getItem() instanceof ArrowItem) ? bki2.getItem() : Items.ARROW);
+            final AbstractArrow beg13 = bih12.createArrow(bqb, bki2, bec3);
+            beg13.shootFromRotation(bec3, bec3.xRot, bec3.yRot, 0.0f, float10 * 3.0f, 1.0f);
             if (float10 == 1.0f) {
-                ayn13.setCritArrow(true);
+                beg13.setCritArrow(true);
             }
-            final int integer3 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.POWER_ARROWS, ben);
+            final int integer3 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.POWER_ARROWS, bki);
             if (integer3 > 0) {
-                ayn13.setBaseDamage(ayn13.getBaseDamage() + integer3 * 0.5 + 0.5);
+                beg13.setBaseDamage(beg13.getBaseDamage() + integer3 * 0.5 + 0.5);
             }
-            final int integer4 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.PUNCH_ARROWS, ben);
+            final int integer4 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.PUNCH_ARROWS, bki);
             if (integer4 > 0) {
-                ayn13.setKnockback(integer4);
+                beg13.setKnockback(integer4);
             }
-            if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FLAMING_ARROWS, ben) > 0) {
-                ayn13.setSecondsOnFire(100);
+            if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FLAMING_ARROWS, bki) > 0) {
+                beg13.setSecondsOnFire(100);
             }
-            ben.<Player>hurtAndBreak(1, ayj3, ayj2 -> ayj2.broadcastBreakEvent(ayj3.getUsedItemHand()));
-            if (boolean8 || (ayj3.abilities.instabuild && (ben2.getItem() == Items.SPECTRAL_ARROW || ben2.getItem() == Items.TIPPED_ARROW))) {
-                ayn13.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
+            bki.<Player>hurtAndBreak(1, bec3, bec2 -> bec2.broadcastBreakEvent(bec3.getUsedItemHand()));
+            if (boolean8 || (bec3.abilities.instabuild && (bki2.getItem() == Items.SPECTRAL_ARROW || bki2.getItem() == Items.TIPPED_ARROW))) {
+                beg13.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
             }
-            bjw.addFreshEntity(ayn13);
+            bqb.addFreshEntity(beg13);
         }
-        bjw.playSound(null, ayj3.getX(), ayj3.getY(), ayj3.getZ(), SoundEvents.ARROW_SHOOT, SoundSource.PLAYERS, 1.0f, 1.0f / (BowItem.random.nextFloat() * 0.4f + 1.2f) + float10 * 0.5f);
-        if (!boolean8 && !ayj3.abilities.instabuild) {
-            ben2.shrink(1);
-            if (ben2.isEmpty()) {
-                ayj3.inventory.removeItem(ben2);
+        bqb.playSound(null, bec3.getX(), bec3.getY(), bec3.getZ(), SoundEvents.ARROW_SHOOT, SoundSource.PLAYERS, 1.0f, 1.0f / (BowItem.random.nextFloat() * 0.4f + 1.2f) + float10 * 0.5f);
+        if (!boolean8 && !bec3.abilities.instabuild) {
+            bki2.shrink(1);
+            if (bki2.isEmpty()) {
+                bec3.inventory.removeItem(bki2);
             }
         }
-        ayj3.awardStat(Stats.ITEM_USED.get(this));
+        bec3.awardStat(Stats.ITEM_USED.get(this));
     }
     
     public static float getPowerForTime(final int integer) {
@@ -98,28 +85,33 @@ public class BowItem extends ProjectileWeaponItem {
     }
     
     @Override
-    public int getUseDuration(final ItemStack ben) {
+    public int getUseDuration(final ItemStack bki) {
         return 72000;
     }
     
     @Override
-    public UseAnim getUseAnimation(final ItemStack ben) {
+    public UseAnim getUseAnimation(final ItemStack bki) {
         return UseAnim.BOW;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        final boolean boolean6 = !ayj.getProjectile(ben5).isEmpty();
-        if (ayj.abilities.instabuild || boolean6) {
-            ayj.startUsingItem(ajk);
-            return InteractionResultHolder.<ItemStack>consume(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        final boolean boolean6 = !bec.getProjectile(bki5).isEmpty();
+        if (bec.abilities.instabuild || boolean6) {
+            bec.startUsingItem(anf);
+            return InteractionResultHolder.<ItemStack>consume(bki5);
         }
-        return InteractionResultHolder.<ItemStack>fail(ben5);
+        return InteractionResultHolder.<ItemStack>fail(bki5);
     }
     
     @Override
     public Predicate<ItemStack> getAllSupportedProjectiles() {
         return BowItem.ARROW_ONLY;
     }
+    
+    @Override
+    public int getDefaultProjectileRange() {
+        return 15;
+    }
 }
diff --git a/src/net/minecraft/world/item/BowlFoodItem.java b/src/net/minecraft/world/item/BowlFoodItem.java
index cdb8873..3fc0c4d 100644
--- a/src/net/minecraft/world/item/BowlFoodItem.java
+++ b/src/net/minecraft/world/item/BowlFoodItem.java
@@ -11,10 +11,10 @@ public class BowlFoodItem extends Item {
     }
     
     @Override
-    public ItemStack finishUsingItem(final ItemStack ben, final Level bjw, final LivingEntity akz) {
-        final ItemStack ben2 = super.finishUsingItem(ben, bjw, akz);
-        if (akz instanceof Player && ((Player)akz).abilities.instabuild) {
-            return ben2;
+    public ItemStack finishUsingItem(final ItemStack bki, final Level bqb, final LivingEntity aoy) {
+        final ItemStack bki2 = super.finishUsingItem(bki, bqb, aoy);
+        if (aoy instanceof Player && ((Player)aoy).abilities.instabuild) {
+            return bki2;
         }
         return new ItemStack(Items.BOWL);
     }
diff --git a/src/net/minecraft/world/item/BucketItem.java b/src/net/minecraft/world/item/BucketItem.java
index c98d5d3..c685196 100644
--- a/src/net/minecraft/world/item/BucketItem.java
+++ b/src/net/minecraft/world/item/BucketItem.java
@@ -2,6 +2,7 @@ package net.minecraft.world.item;
 
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundSource;
@@ -12,10 +13,11 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.LiquidBlockContainer;
-import net.minecraft.world.level.ItemLike;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.world.level.ItemLike;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
@@ -34,117 +36,106 @@ import net.minecraft.world.level.material.Fluid;
 public class BucketItem extends Item {
     private final Fluid content;
     
-    public BucketItem(final Fluid coi, final Properties a) {
+    public BucketItem(final Fluid cwz, final Properties a) {
         super(a);
-        this.content = coi;
+        this.content = cwz;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        final HitResult cvi6 = Item.getPlayerPOVHitResult(bjw, ayj, (this.content == Fluids.EMPTY) ? ClipContext.Fluid.SOURCE_ONLY : ClipContext.Fluid.NONE);
-        if (cvi6.getType() == HitResult.Type.MISS) {
-            return InteractionResultHolder.<ItemStack>pass(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        final HitResult dej6 = Item.getPlayerPOVHitResult(bqb, bec, (this.content == Fluids.EMPTY) ? ClipContext.Fluid.SOURCE_ONLY : ClipContext.Fluid.NONE);
+        if (dej6.getType() == HitResult.Type.MISS) {
+            return InteractionResultHolder.<ItemStack>pass(bki5);
         }
-        if (cvi6.getType() != HitResult.Type.BLOCK) {
-            return InteractionResultHolder.<ItemStack>pass(ben5);
+        if (dej6.getType() != HitResult.Type.BLOCK) {
+            return InteractionResultHolder.<ItemStack>pass(bki5);
         }
-        final BlockHitResult cvg7 = (BlockHitResult)cvi6;
-        final BlockPos fk8 = cvg7.getBlockPos();
-        final Direction fp9 = cvg7.getDirection();
-        final BlockPos fk9 = fk8.relative(fp9);
-        if (!bjw.mayInteract(ayj, fk8) || !ayj.mayUseItemAt(fk9, fp9, ben5)) {
-            return InteractionResultHolder.<ItemStack>fail(ben5);
+        final BlockHitResult deh7 = (BlockHitResult)dej6;
+        final BlockPos fu8 = deh7.getBlockPos();
+        final Direction fz9 = deh7.getDirection();
+        final BlockPos fu9 = fu8.relative(fz9);
+        if (!bqb.mayInteract(bec, fu8) || !bec.mayUseItemAt(fu9, fz9, bki5)) {
+            return InteractionResultHolder.<ItemStack>fail(bki5);
         }
         if (this.content == Fluids.EMPTY) {
-            final BlockState byj11 = bjw.getBlockState(fk8);
-            if (byj11.getBlock() instanceof BucketPickup) {
-                final Fluid coi12 = ((BucketPickup)byj11.getBlock()).takeLiquid(bjw, fk8, byj11);
-                if (coi12 != Fluids.EMPTY) {
-                    ayj.awardStat(Stats.ITEM_USED.get(this));
-                    ayj.playSound(coi12.is(FluidTags.LAVA) ? SoundEvents.BUCKET_FILL_LAVA : SoundEvents.BUCKET_FILL, 1.0f, 1.0f);
-                    final ItemStack ben6 = this.createResultItem(ben5, ayj, coi12.getBucket());
-                    if (!bjw.isClientSide) {
-                        CriteriaTriggers.FILLED_BUCKET.trigger((ServerPlayer)ayj, new ItemStack(coi12.getBucket()));
+            final BlockState cfj11 = bqb.getBlockState(fu8);
+            if (cfj11.getBlock() instanceof BucketPickup) {
+                final Fluid cwz12 = ((BucketPickup)cfj11.getBlock()).takeLiquid(bqb, fu8, cfj11);
+                if (cwz12 != Fluids.EMPTY) {
+                    bec.awardStat(Stats.ITEM_USED.get(this));
+                    bec.playSound(cwz12.is(FluidTags.LAVA) ? SoundEvents.BUCKET_FILL_LAVA : SoundEvents.BUCKET_FILL, 1.0f, 1.0f);
+                    final ItemStack bki6 = ItemUtils.createBucketResult(bki5, bec, new ItemStack(cwz12.getBucket()));
+                    if (!bqb.isClientSide) {
+                        CriteriaTriggers.FILLED_BUCKET.trigger((ServerPlayer)bec, new ItemStack(cwz12.getBucket()));
                     }
-                    return InteractionResultHolder.<ItemStack>success(ben6);
+                    return InteractionResultHolder.<ItemStack>sidedSuccess(bki6, bqb.isClientSide());
                 }
             }
-            return InteractionResultHolder.<ItemStack>fail(ben5);
+            return InteractionResultHolder.<ItemStack>fail(bki5);
         }
-        final BlockState byj11 = bjw.getBlockState(fk8);
-        final BlockPos fk10 = (byj11.getBlock() instanceof LiquidBlockContainer && this.content == Fluids.WATER) ? fk8 : fk9;
-        if (this.emptyBucket(ayj, bjw, fk10, cvg7)) {
-            this.checkExtraContent(bjw, ben5, fk10);
-            if (ayj instanceof ServerPlayer) {
-                CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer)ayj, fk10, ben5);
+        final BlockState cfj11 = bqb.getBlockState(fu8);
+        final BlockPos fu10 = (cfj11.getBlock() instanceof LiquidBlockContainer && this.content == Fluids.WATER) ? fu8 : fu9;
+        if (this.emptyBucket(bec, bqb, fu10, deh7)) {
+            this.checkExtraContent(bqb, bki5, fu10);
+            if (bec instanceof ServerPlayer) {
+                CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer)bec, fu10, bki5);
             }
-            ayj.awardStat(Stats.ITEM_USED.get(this));
-            return InteractionResultHolder.<ItemStack>success(this.getEmptySuccessItem(ben5, ayj));
+            bec.awardStat(Stats.ITEM_USED.get(this));
+            return InteractionResultHolder.<ItemStack>sidedSuccess(this.getEmptySuccessItem(bki5, bec), bqb.isClientSide());
         }
-        return InteractionResultHolder.<ItemStack>fail(ben5);
+        return InteractionResultHolder.<ItemStack>fail(bki5);
     }
     
-    protected ItemStack getEmptySuccessItem(final ItemStack ben, final Player ayj) {
-        if (!ayj.abilities.instabuild) {
+    protected ItemStack getEmptySuccessItem(final ItemStack bki, final Player bec) {
+        if (!bec.abilities.instabuild) {
             return new ItemStack(Items.BUCKET);
         }
-        return ben;
+        return bki;
     }
     
-    public void checkExtraContent(final Level bjw, final ItemStack ben, final BlockPos fk) {
+    public void checkExtraContent(final Level bqb, final ItemStack bki, final BlockPos fu) {
     }
     
-    private ItemStack createResultItem(final ItemStack ben, final Player ayj, final Item bei) {
-        if (ayj.abilities.instabuild) {
-            return ben;
-        }
-        ben.shrink(1);
-        if (ben.isEmpty()) {
-            return new ItemStack(bei);
-        }
-        if (!ayj.inventory.add(new ItemStack(bei))) {
-            ayj.drop(new ItemStack(bei), false);
-        }
-        return ben;
-    }
-    
-    public boolean emptyBucket(@Nullable final Player ayj, final Level bjw, final BlockPos fk, @Nullable final BlockHitResult cvg) {
+    public boolean emptyBucket(@Nullable final Player bec, final Level bqb, final BlockPos fu, @Nullable final BlockHitResult deh) {
         if (!(this.content instanceof FlowingFluid)) {
             return false;
         }
-        final BlockState byj6 = bjw.getBlockState(fk);
-        final Material coo7 = byj6.getMaterial();
-        final boolean boolean8 = byj6.canBeReplaced(this.content);
-        if (byj6.isAir() || boolean8 || (byj6.getBlock() instanceof LiquidBlockContainer && ((LiquidBlockContainer)byj6.getBlock()).canPlaceLiquid(bjw, fk, byj6, this.content))) {
-            if (bjw.dimension.isUltraWarm() && this.content.is(FluidTags.WATER)) {
-                final int integer9 = fk.getX();
-                final int integer10 = fk.getY();
-                final int integer11 = fk.getZ();
-                bjw.playSound(ayj, fk, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5f, 2.6f + (bjw.random.nextFloat() - bjw.random.nextFloat()) * 0.8f);
-                for (int integer12 = 0; integer12 < 8; ++integer12) {
-                    bjw.addParticle(ParticleTypes.LARGE_SMOKE, integer9 + Math.random(), integer10 + Math.random(), integer11 + Math.random(), 0.0, 0.0, 0.0);
-                }
-            }
-            else if (byj6.getBlock() instanceof LiquidBlockContainer && this.content == Fluids.WATER) {
-                if (((LiquidBlockContainer)byj6.getBlock()).placeLiquid(bjw, fk, byj6, ((FlowingFluid)this.content).getSource(false))) {
-                    this.playEmptySound(ayj, bjw, fk);
-                }
-            }
-            else {
-                if (!bjw.isClientSide && boolean8 && !coo7.isLiquid()) {
-                    bjw.destroyBlock(fk, true);
-                }
-                this.playEmptySound(ayj, bjw, fk);
-                bjw.setBlock(fk, this.content.defaultFluidState().createLegacyBlock(), 11);
+        final BlockState cfj6 = bqb.getBlockState(fu);
+        final Block bvr7 = cfj6.getBlock();
+        final Material cxd8 = cfj6.getMaterial();
+        final boolean boolean9 = cfj6.canBeReplaced(this.content);
+        final boolean boolean10 = cfj6.isAir() || boolean9 || (bvr7 instanceof LiquidBlockContainer && ((LiquidBlockContainer)bvr7).canPlaceLiquid(bqb, fu, cfj6, this.content));
+        if (!boolean10) {
+            return deh != null && this.emptyBucket(bec, bqb, deh.getBlockPos().relative(deh.getDirection()), null);
+        }
+        if (bqb.dimensionType().ultraWarm() && this.content.is(FluidTags.WATER)) {
+            final int integer11 = fu.getX();
+            final int integer12 = fu.getY();
+            final int integer13 = fu.getZ();
+            bqb.playSound(bec, fu, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5f, 2.6f + (bqb.random.nextFloat() - bqb.random.nextFloat()) * 0.8f);
+            for (int integer14 = 0; integer14 < 8; ++integer14) {
+                bqb.addParticle(ParticleTypes.LARGE_SMOKE, integer11 + Math.random(), integer12 + Math.random(), integer13 + Math.random(), 0.0, 0.0, 0.0);
             }
             return true;
         }
-        return cvg != null && this.emptyBucket(ayj, bjw, cvg.getBlockPos().relative(cvg.getDirection()), null);
+        if (bvr7 instanceof LiquidBlockContainer && this.content == Fluids.WATER) {
+            ((LiquidBlockContainer)bvr7).placeLiquid(bqb, fu, cfj6, ((FlowingFluid)this.content).getSource(false));
+            this.playEmptySound(bec, bqb, fu);
+            return true;
+        }
+        if (!bqb.isClientSide && boolean9 && !cxd8.isLiquid()) {
+            bqb.destroyBlock(fu, true);
+        }
+        if (bqb.setBlock(fu, this.content.defaultFluidState().createLegacyBlock(), 11) || cfj6.getFluidState().isSource()) {
+            this.playEmptySound(bec, bqb, fu);
+            return true;
+        }
+        return false;
     }
     
-    protected void playEmptySound(@Nullable final Player ayj, final LevelAccessor bjx, final BlockPos fk) {
-        final SoundEvent aah5 = this.content.is(FluidTags.LAVA) ? SoundEvents.BUCKET_EMPTY_LAVA : SoundEvents.BUCKET_EMPTY;
-        bjx.playSound(ayj, fk, aah5, SoundSource.BLOCKS, 1.0f, 1.0f);
+    protected void playEmptySound(@Nullable final Player bec, final LevelAccessor bqc, final BlockPos fu) {
+        final SoundEvent ack5 = this.content.is(FluidTags.LAVA) ? SoundEvents.BUCKET_EMPTY_LAVA : SoundEvents.BUCKET_EMPTY;
+        bqc.playSound(bec, fu, ack5, SoundSource.BLOCKS, 1.0f, 1.0f);
     }
 }
diff --git a/src/net/minecraft/world/item/CarrotOnAStickItem.java b/src/net/minecraft/world/item/CarrotOnAStickItem.java
deleted file mode 100644
index f1ed2a7..0000000
--- a/src/net/minecraft/world/item/CarrotOnAStickItem.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package net.minecraft.world.item;
-
-import net.minecraft.stats.Stat;
-import net.minecraft.stats.Stats;
-import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.entity.animal.Pig;
-import net.minecraft.world.InteractionResultHolder;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-
-public class CarrotOnAStickItem extends Item {
-    public CarrotOnAStickItem(final Properties a) {
-        super(a);
-    }
-    
-    @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        if (bjw.isClientSide) {
-            return InteractionResultHolder.<ItemStack>pass(ben5);
-        }
-        if (ayj.isPassenger() && ayj.getVehicle() instanceof Pig) {
-            final Pig atq6 = (Pig)ayj.getVehicle();
-            if (ben5.getMaxDamage() - ben5.getDamageValue() >= 7 && atq6.boost()) {
-                ben5.<Player>hurtAndBreak(7, ayj, ayj -> ayj.broadcastBreakEvent(ajk));
-                if (ben5.isEmpty()) {
-                    final ItemStack ben6 = new ItemStack(Items.FISHING_ROD);
-                    ben6.setTag(ben5.getTag());
-                    return InteractionResultHolder.<ItemStack>success(ben6);
-                }
-                return InteractionResultHolder.<ItemStack>success(ben5);
-            }
-        }
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        return InteractionResultHolder.<ItemStack>pass(ben5);
-    }
-}
diff --git a/src/net/minecraft/world/item/ChorusFruitItem.java b/src/net/minecraft/world/item/ChorusFruitItem.java
index b1aa54b..666b29c 100644
--- a/src/net/minecraft/world/item/ChorusFruitItem.java
+++ b/src/net/minecraft/world/item/ChorusFruitItem.java
@@ -1,8 +1,10 @@
 package net.minecraft.world.item;
 
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.entity.animal.Fox;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
@@ -13,29 +15,30 @@ public class ChorusFruitItem extends Item {
     }
     
     @Override
-    public ItemStack finishUsingItem(final ItemStack ben, final Level bjw, final LivingEntity akz) {
-        final ItemStack ben2 = super.finishUsingItem(ben, bjw, akz);
-        if (!bjw.isClientSide) {
-            final double double6 = akz.getX();
-            final double double7 = akz.getY();
-            final double double8 = akz.getZ();
+    public ItemStack finishUsingItem(final ItemStack bki, final Level bqb, final LivingEntity aoy) {
+        final ItemStack bki2 = super.finishUsingItem(bki, bqb, aoy);
+        if (!bqb.isClientSide) {
+            final double double6 = aoy.getX();
+            final double double7 = aoy.getY();
+            final double double8 = aoy.getZ();
             for (int integer12 = 0; integer12 < 16; ++integer12) {
-                final double double9 = akz.getX() + (akz.getRandom().nextDouble() - 0.5) * 16.0;
-                final double double10 = Mth.clamp(akz.getY() + (akz.getRandom().nextInt(16) - 8), 0.0, bjw.getHeight() - 1);
-                final double double11 = akz.getZ() + (akz.getRandom().nextDouble() - 0.5) * 16.0;
-                if (akz.isPassenger()) {
-                    akz.stopRiding();
+                final double double9 = aoy.getX() + (aoy.getRandom().nextDouble() - 0.5) * 16.0;
+                final double double10 = Mth.clamp(aoy.getY() + (aoy.getRandom().nextInt(16) - 8), 0.0, bqb.getHeight() - 1);
+                final double double11 = aoy.getZ() + (aoy.getRandom().nextDouble() - 0.5) * 16.0;
+                if (aoy.isPassenger()) {
+                    aoy.stopRiding();
                 }
-                if (akz.randomTeleport(double9, double10, double11, true)) {
-                    bjw.playSound(null, double6, double7, double8, SoundEvents.CHORUS_FRUIT_TELEPORT, SoundSource.PLAYERS, 1.0f, 1.0f);
-                    akz.playSound(SoundEvents.CHORUS_FRUIT_TELEPORT, 1.0f, 1.0f);
+                if (aoy.randomTeleport(double9, double10, double11, true)) {
+                    final SoundEvent ack19 = (aoy instanceof Fox) ? SoundEvents.FOX_TELEPORT : SoundEvents.CHORUS_FRUIT_TELEPORT;
+                    bqb.playSound(null, double6, double7, double8, ack19, SoundSource.PLAYERS, 1.0f, 1.0f);
+                    aoy.playSound(ack19, 1.0f, 1.0f);
                     break;
                 }
             }
-            if (akz instanceof Player) {
-                ((Player)akz).getCooldowns().addCooldown(this, 20);
+            if (aoy instanceof Player) {
+                ((Player)aoy).getCooldowns().addCooldown(this, 20);
             }
         }
-        return ben2;
+        return bki2;
     }
 }
diff --git a/src/net/minecraft/world/item/ClockItem.java b/src/net/minecraft/world/item/ClockItem.java
deleted file mode 100644
index 76b6adb..0000000
--- a/src/net/minecraft/world/item/ClockItem.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package net.minecraft.world.item;
-
-import net.minecraft.util.Mth;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import javax.annotation.Nullable;
-import net.minecraft.world.level.Level;
-import net.minecraft.resources.ResourceLocation;
-
-public class ClockItem extends Item {
-    public ClockItem(final Properties a) {
-        super(a);
-        this.addProperty(new ResourceLocation("time"), new ItemPropertyFunction() {
-            private double rotation;
-            private double rota;
-            private long lastUpdateTick;
-            
-            @Override
-            public float call(final ItemStack ben, @Nullable Level bjw, @Nullable final LivingEntity akz) {
-                final boolean boolean5 = akz != null;
-                final Entity akq6 = boolean5 ? akz : ben.getFrame();
-                if (bjw == null && akq6 != null) {
-                    bjw = akq6.level;
-                }
-                if (bjw == null) {
-                    return 0.0f;
-                }
-                double double7;
-                if (bjw.dimension.isNaturalDimension()) {
-                    double7 = bjw.getTimeOfDay(1.0f);
-                }
-                else {
-                    double7 = Math.random();
-                }
-                double7 = this.wobble(bjw, double7);
-                return (float)double7;
-            }
-            
-            private double wobble(final Level bjw, final double double2) {
-                if (bjw.getGameTime() != this.lastUpdateTick) {
-                    this.lastUpdateTick = bjw.getGameTime();
-                    double double3 = double2 - this.rotation;
-                    double3 = Mth.positiveModulo(double3 + 0.5, 1.0) - 0.5;
-                    this.rota += double3 * 0.1;
-                    this.rota *= 0.9;
-                    this.rotation = Mth.positiveModulo(this.rotation + this.rota, 1.0);
-                }
-                return this.rotation;
-            }
-        });
-    }
-}
diff --git a/src/net/minecraft/world/item/CompassItem.java b/src/net/minecraft/world/item/CompassItem.java
index 3ca6057..7009d34 100644
--- a/src/net/minecraft/world/item/CompassItem.java
+++ b/src/net/minecraft/world/item/CompassItem.java
@@ -1,69 +1,103 @@
 package net.minecraft.world.item;
 
+import org.apache.logging.log4j.LogManager;
+import java.util.function.Consumer;
+import net.minecraft.nbt.Tag;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.world.entity.ai.village.poi.PoiType;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.util.Mth;
-import net.minecraft.world.entity.decoration.ItemFrame;
-import net.minecraft.world.entity.LivingEntity;
-import javax.annotation.Nullable;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.world.level.Level;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.ResourceKey;
+import java.util.Optional;
+import net.minecraft.nbt.CompoundTag;
+import org.apache.logging.log4j.Logger;
 
-public class CompassItem extends Item {
+public class CompassItem extends Item implements Vanishable {
+    private static final Logger LOGGER;
+    
     public CompassItem(final Properties a) {
         super(a);
-        this.addProperty(new ResourceLocation("angle"), new ItemPropertyFunction() {
-            private double rotation;
-            private double rota;
-            private long lastUpdateTick;
-            
-            @Override
-            public float call(final ItemStack ben, @Nullable Level bjw, @Nullable final LivingEntity akz) {
-                if (akz == null && !ben.isFramed()) {
-                    return 0.0f;
-                }
-                final boolean boolean5 = akz != null;
-                final Entity akq6 = boolean5 ? akz : ben.getFrame();
-                if (bjw == null) {
-                    bjw = akq6.level;
-                }
-                double double11;
-                if (bjw.dimension.isNaturalDimension()) {
-                    double double9 = boolean5 ? akq6.yRot : this.getFrameRotation((ItemFrame)akq6);
-                    double9 = Mth.positiveModulo(double9 / 360.0, 1.0);
-                    final double double10 = this.getSpawnToAngle(bjw, akq6) / 6.2831854820251465;
-                    double11 = 0.5 - (double9 - 0.25 - double10);
-                }
-                else {
-                    double11 = Math.random();
-                }
-                if (boolean5) {
-                    double11 = this.wobble(bjw, double11);
-                }
-                return Mth.positiveModulo((float)double11, 1.0f);
+    }
+    
+    public static boolean isLodestoneCompass(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTag();
+        return le2 != null && (le2.contains("LodestoneDimension") || le2.contains("LodestonePos"));
+    }
+    
+    @Override
+    public boolean isFoil(final ItemStack bki) {
+        return isLodestoneCompass(bki) || super.isFoil(bki);
+    }
+    
+    public static Optional<ResourceKey<Level>> getLodestoneDimension(final CompoundTag le) {
+        return (Optional<ResourceKey<Level>>)Level.RESOURCE_KEY_CODEC.parse((DynamicOps)NbtOps.INSTANCE, le.get("LodestoneDimension")).result();
+    }
+    
+    @Override
+    public void inventoryTick(final ItemStack bki, final Level bqb, final Entity aom, final int integer, final boolean boolean5) {
+        if (bqb.isClientSide) {
+            return;
+        }
+        if (isLodestoneCompass(bki)) {
+            final CompoundTag le7 = bki.getOrCreateTag();
+            if (le7.contains("LodestoneTracked") && !le7.getBoolean("LodestoneTracked")) {
+                return;
             }
-            
-            private double wobble(final Level bjw, final double double2) {
-                if (bjw.getGameTime() != this.lastUpdateTick) {
-                    this.lastUpdateTick = bjw.getGameTime();
-                    double double3 = double2 - this.rotation;
-                    double3 = Mth.positiveModulo(double3 + 0.5, 1.0) - 0.5;
-                    this.rota += double3 * 0.1;
-                    this.rota *= 0.8;
-                    this.rotation = Mth.positiveModulo(this.rotation + this.rota, 1.0);
+            final Optional<ResourceKey<Level>> optional8 = getLodestoneDimension(le7);
+            if (optional8.isPresent() && optional8.get() == bqb.dimension() && le7.contains("LodestonePos") && !((ServerLevel)bqb).getPoiManager().existsAtPosition(PoiType.LODESTONE, NbtUtils.readBlockPos(le7.getCompound("LodestonePos")))) {
+                le7.remove("LodestonePos");
+            }
+        }
+    }
+    
+    @Override
+    public InteractionResult useOn(final UseOnContext blv) {
+        final BlockPos fu3 = blv.hitResult.getBlockPos();
+        if (blv.level.getBlockState(fu3).is(Blocks.LODESTONE)) {
+            blv.level.playSound(null, fu3, SoundEvents.LODESTONE_COMPASS_LOCK, SoundSource.PLAYERS, 1.0f, 1.0f);
+            final boolean boolean4 = !blv.player.abilities.instabuild && blv.itemStack.getCount() == 1;
+            if (boolean4) {
+                this.addLodestoneTags(blv.level.dimension(), fu3, blv.itemStack.getOrCreateTag());
+            }
+            else {
+                final ItemStack bki5 = new ItemStack(Items.COMPASS, 1);
+                final CompoundTag le6 = blv.itemStack.hasTag() ? blv.itemStack.getTag().copy() : new CompoundTag();
+                bki5.setTag(le6);
+                if (!blv.player.abilities.instabuild) {
+                    blv.itemStack.shrink(1);
+                }
+                this.addLodestoneTags(blv.level.dimension(), fu3, le6);
+                if (!blv.player.inventory.add(bki5)) {
+                    blv.player.drop(bki5, false);
                 }
-                return this.rotation;
             }
-            
-            private double getFrameRotation(final ItemFrame avr) {
-                return Mth.wrapDegrees(180 + avr.getDirection().get2DDataValue() * 90);
-            }
-            
-            private double getSpawnToAngle(final LevelAccessor bjx, final Entity akq) {
-                final BlockPos fk4 = bjx.getSharedSpawnPos();
-                return Math.atan2(fk4.getZ() - akq.getZ(), fk4.getX() - akq.getX());
-            }
-        });
+            return InteractionResult.sidedSuccess(blv.level.isClientSide);
+        }
+        return super.useOn(blv);
+    }
+    
+    private void addLodestoneTags(final ResourceKey<Level> ug, final BlockPos fu, final CompoundTag le) {
+        le.put("LodestonePos", NbtUtils.writeBlockPos(fu));
+        Level.RESOURCE_KEY_CODEC.encodeStart((DynamicOps)NbtOps.INSTANCE, ug).resultOrPartial((Consumer)CompassItem.LOGGER::error).ifPresent(lu -> le.put("LodestoneDimension", lu));
+        le.putBoolean("LodestoneTracked", true);
+    }
+    
+    @Override
+    public String getDescriptionId(final ItemStack bki) {
+        return isLodestoneCompass(bki) ? "item.minecraft.lodestone_compass" : super.getDescriptionId(bki);
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
     }
 }
diff --git a/src/net/minecraft/world/item/ComplexItem.java b/src/net/minecraft/world/item/ComplexItem.java
index 1267990..4a0e182 100644
--- a/src/net/minecraft/world/item/ComplexItem.java
+++ b/src/net/minecraft/world/item/ComplexItem.java
@@ -16,7 +16,7 @@ public class ComplexItem extends Item {
     }
     
     @Nullable
-    public Packet<?> getUpdatePacket(final ItemStack ben, final Level bjw, final Player ayj) {
+    public Packet<?> getUpdatePacket(final ItemStack bki, final Level bqb, final Player bec) {
         return null;
     }
 }
diff --git a/src/net/minecraft/world/item/CreativeModeTab.java b/src/net/minecraft/world/item/CreativeModeTab.java
index 426757c..429c611 100644
--- a/src/net/minecraft/world/item/CreativeModeTab.java
+++ b/src/net/minecraft/world/item/CreativeModeTab.java
@@ -123,10 +123,10 @@ public abstract class CreativeModeTab {
         return this;
     }
     
-    public boolean hasEnchantmentCategory(@Nullable final EnchantmentCategory bhy) {
-        if (bhy != null) {
-            for (final EnchantmentCategory bhy2 : this.enchantmentCategories) {
-                if (bhy2 == bhy) {
+    public boolean hasEnchantmentCategory(@Nullable final EnchantmentCategory bnx) {
+        if (bnx != null) {
+            for (final EnchantmentCategory bnx2 : this.enchantmentCategories) {
+                if (bnx2 == bnx) {
                     return true;
                 }
             }
@@ -134,9 +134,9 @@ public abstract class CreativeModeTab {
         return false;
     }
     
-    public void fillItemList(final NonNullList<ItemStack> fy) {
-        for (final Item bei4 : Registry.ITEM) {
-            bei4.fillItemCategory(this, fy);
+    public void fillItemList(final NonNullList<ItemStack> gi) {
+        for (final Item bke4 : Registry.ITEM) {
+            bke4.fillItemCategory(this, gi);
         }
     }
     
@@ -189,13 +189,13 @@ public abstract class CreativeModeTab {
             public ItemStack makeIcon() {
                 return new ItemStack(Items.IRON_AXE);
             }
-        }.setEnchantmentCategories(EnchantmentCategory.ALL, EnchantmentCategory.DIGGER, EnchantmentCategory.FISHING_ROD, EnchantmentCategory.BREAKABLE);
+        }.setEnchantmentCategories(EnchantmentCategory.VANISHABLE, EnchantmentCategory.DIGGER, EnchantmentCategory.FISHING_ROD, EnchantmentCategory.BREAKABLE);
         TAB_COMBAT = new CreativeModeTab(9, "combat") {
             @Override
             public ItemStack makeIcon() {
                 return new ItemStack(Items.GOLDEN_SWORD);
             }
-        }.setEnchantmentCategories(EnchantmentCategory.ALL, EnchantmentCategory.ARMOR, EnchantmentCategory.ARMOR_FEET, EnchantmentCategory.ARMOR_HEAD, EnchantmentCategory.ARMOR_LEGS, EnchantmentCategory.ARMOR_CHEST, EnchantmentCategory.BOW, EnchantmentCategory.WEAPON, EnchantmentCategory.WEARABLE, EnchantmentCategory.BREAKABLE, EnchantmentCategory.TRIDENT, EnchantmentCategory.CROSSBOW);
+        }.setEnchantmentCategories(EnchantmentCategory.VANISHABLE, EnchantmentCategory.ARMOR, EnchantmentCategory.ARMOR_FEET, EnchantmentCategory.ARMOR_HEAD, EnchantmentCategory.ARMOR_LEGS, EnchantmentCategory.ARMOR_CHEST, EnchantmentCategory.BOW, EnchantmentCategory.WEAPON, EnchantmentCategory.WEARABLE, EnchantmentCategory.BREAKABLE, EnchantmentCategory.TRIDENT, EnchantmentCategory.CROSSBOW);
         TAB_BREWING = new CreativeModeTab(10, "brewing") {
             @Override
             public ItemStack makeIcon() {
@@ -210,7 +210,7 @@ public abstract class CreativeModeTab {
             }
             
             @Override
-            public void fillItemList(final NonNullList<ItemStack> fy) {
+            public void fillItemList(final NonNullList<ItemStack> gi) {
                 throw new RuntimeException("Implement exception client-side.");
             }
             
diff --git a/src/net/minecraft/world/item/CrossbowItem.java b/src/net/minecraft/world/item/CrossbowItem.java
index 4300553..19a1736 100644
--- a/src/net/minecraft/world/item/CrossbowItem.java
+++ b/src/net/minecraft/world/item/CrossbowItem.java
@@ -15,11 +15,11 @@ import net.minecraft.server.level.ServerPlayer;
 import java.util.Random;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.projectile.Projectile;
-import net.minecraft.world.entity.Entity;
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
 import net.minecraft.world.entity.monster.CrossbowAttackMob;
 import net.minecraft.world.entity.projectile.AbstractArrow;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.projectile.FireworkRocketEntity;
 import com.google.common.collect.Lists;
 import java.util.List;
@@ -37,9 +37,8 @@ import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import java.util.function.Predicate;
-import net.minecraft.resources.ResourceLocation;
 
-public class CrossbowItem extends ProjectileWeaponItem {
+public class CrossbowItem extends ProjectileWeaponItem implements Vanishable {
     private boolean startSoundPlayed;
     private boolean midLoadSoundPlayed;
     
@@ -47,20 +46,6 @@ public class CrossbowItem extends ProjectileWeaponItem {
         super(a);
         this.startSoundPlayed = false;
         this.midLoadSoundPlayed = false;
-        this.addProperty(new ResourceLocation("pull"), (ben, bjw, akz) -> {
-            if (akz == null || ben.getItem() != this) {
-                return 0.0f;
-            }
-            else if (isCharged(ben)) {
-                return 0.0f;
-            }
-            else {
-                return (ben.getUseDuration() - akz.getUseItemRemainingTicks()) / (float)getChargeDuration(ben);
-            }
-        });
-        this.addProperty(new ResourceLocation("pulling"), (ben, bjw, akz) -> (akz != null && akz.isUsingItem() && akz.getUseItem() == ben && !isCharged(ben)) ? 1.0f : 0.0f);
-        this.addProperty(new ResourceLocation("charged"), (ben, bjw, akz) -> (akz != null && isCharged(ben)) ? 1.0f : 0.0f);
-        this.addProperty(new ResourceLocation("firework"), (ben, bjw, akz) -> (akz != null && isCharged(ben) && containsChargedProjectile(ben, Items.FIREWORK_ROCKET)) ? 1.0f : 0.0f);
     }
     
     @Override
@@ -74,194 +59,194 @@ public class CrossbowItem extends ProjectileWeaponItem {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        if (isCharged(ben5)) {
-            performShooting(bjw, ayj, ajk, ben5, getShootingPower(ben5), 1.0f);
-            setCharged(ben5, false);
-            return InteractionResultHolder.<ItemStack>consume(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        if (isCharged(bki5)) {
+            performShooting(bqb, bec, anf, bki5, getShootingPower(bki5), 1.0f);
+            setCharged(bki5, false);
+            return InteractionResultHolder.<ItemStack>consume(bki5);
         }
-        if (!ayj.getProjectile(ben5).isEmpty()) {
-            if (!isCharged(ben5)) {
+        if (!bec.getProjectile(bki5).isEmpty()) {
+            if (!isCharged(bki5)) {
                 this.startSoundPlayed = false;
                 this.midLoadSoundPlayed = false;
-                ayj.startUsingItem(ajk);
+                bec.startUsingItem(anf);
             }
-            return InteractionResultHolder.<ItemStack>consume(ben5);
+            return InteractionResultHolder.<ItemStack>consume(bki5);
         }
-        return InteractionResultHolder.<ItemStack>fail(ben5);
+        return InteractionResultHolder.<ItemStack>fail(bki5);
     }
     
     @Override
-    public void releaseUsing(final ItemStack ben, final Level bjw, final LivingEntity akz, final int integer) {
-        final int integer2 = this.getUseDuration(ben) - integer;
-        final float float7 = getPowerForTime(integer2, ben);
-        if (float7 >= 1.0f && !isCharged(ben) && tryLoadProjectiles(akz, ben)) {
-            setCharged(ben, true);
-            final SoundSource aaj8 = (akz instanceof Player) ? SoundSource.PLAYERS : SoundSource.HOSTILE;
-            bjw.playSound(null, akz.getX(), akz.getY(), akz.getZ(), SoundEvents.CROSSBOW_LOADING_END, aaj8, 1.0f, 1.0f / (CrossbowItem.random.nextFloat() * 0.5f + 1.0f) + 0.2f);
+    public void releaseUsing(final ItemStack bki, final Level bqb, final LivingEntity aoy, final int integer) {
+        final int integer2 = this.getUseDuration(bki) - integer;
+        final float float7 = getPowerForTime(integer2, bki);
+        if (float7 >= 1.0f && !isCharged(bki) && tryLoadProjectiles(aoy, bki)) {
+            setCharged(bki, true);
+            final SoundSource acm8 = (aoy instanceof Player) ? SoundSource.PLAYERS : SoundSource.HOSTILE;
+            bqb.playSound(null, aoy.getX(), aoy.getY(), aoy.getZ(), SoundEvents.CROSSBOW_LOADING_END, acm8, 1.0f, 1.0f / (CrossbowItem.random.nextFloat() * 0.5f + 1.0f) + 0.2f);
         }
     }
     
-    private static boolean tryLoadProjectiles(final LivingEntity akz, final ItemStack ben) {
-        final int integer3 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.MULTISHOT, ben);
+    private static boolean tryLoadProjectiles(final LivingEntity aoy, final ItemStack bki) {
+        final int integer3 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.MULTISHOT, bki);
         final int integer4 = (integer3 == 0) ? 1 : 3;
-        final boolean boolean5 = akz instanceof Player && ((Player)akz).abilities.instabuild;
-        ItemStack ben2 = akz.getProjectile(ben);
-        ItemStack ben3 = ben2.copy();
+        final boolean boolean5 = aoy instanceof Player && ((Player)aoy).abilities.instabuild;
+        ItemStack bki2 = aoy.getProjectile(bki);
+        ItemStack bki3 = bki2.copy();
         for (int integer5 = 0; integer5 < integer4; ++integer5) {
             if (integer5 > 0) {
-                ben2 = ben3.copy();
+                bki2 = bki3.copy();
             }
-            if (ben2.isEmpty() && boolean5) {
-                ben2 = new ItemStack(Items.ARROW);
-                ben3 = ben2.copy();
+            if (bki2.isEmpty() && boolean5) {
+                bki2 = new ItemStack(Items.ARROW);
+                bki3 = bki2.copy();
             }
-            if (!loadProjectile(akz, ben, ben2, integer5 > 0, boolean5)) {
+            if (!loadProjectile(aoy, bki, bki2, integer5 > 0, boolean5)) {
                 return false;
             }
         }
         return true;
     }
     
-    private static boolean loadProjectile(final LivingEntity akz, final ItemStack ben2, final ItemStack ben3, final boolean boolean4, final boolean boolean5) {
-        if (ben3.isEmpty()) {
+    private static boolean loadProjectile(final LivingEntity aoy, final ItemStack bki2, final ItemStack bki3, final boolean boolean4, final boolean boolean5) {
+        if (bki3.isEmpty()) {
             return false;
         }
-        final boolean boolean6 = boolean5 && ben3.getItem() instanceof ArrowItem;
-        ItemStack ben4;
+        final boolean boolean6 = boolean5 && bki3.getItem() instanceof ArrowItem;
+        ItemStack bki4;
         if (!boolean6 && !boolean5 && !boolean4) {
-            ben4 = ben3.split(1);
-            if (ben3.isEmpty() && akz instanceof Player) {
-                ((Player)akz).inventory.removeItem(ben3);
+            bki4 = bki3.split(1);
+            if (bki3.isEmpty() && aoy instanceof Player) {
+                ((Player)aoy).inventory.removeItem(bki3);
             }
         }
         else {
-            ben4 = ben3.copy();
+            bki4 = bki3.copy();
         }
-        addChargedProjectile(ben2, ben4);
+        addChargedProjectile(bki2, bki4);
         return true;
     }
     
-    public static boolean isCharged(final ItemStack ben) {
-        final CompoundTag jt2 = ben.getTag();
-        return jt2 != null && jt2.getBoolean("Charged");
+    public static boolean isCharged(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTag();
+        return le2 != null && le2.getBoolean("Charged");
     }
     
-    public static void setCharged(final ItemStack ben, final boolean boolean2) {
-        final CompoundTag jt3 = ben.getOrCreateTag();
-        jt3.putBoolean("Charged", boolean2);
+    public static void setCharged(final ItemStack bki, final boolean boolean2) {
+        final CompoundTag le3 = bki.getOrCreateTag();
+        le3.putBoolean("Charged", boolean2);
     }
     
-    private static void addChargedProjectile(final ItemStack ben1, final ItemStack ben2) {
-        final CompoundTag jt3 = ben1.getOrCreateTag();
-        ListTag jz4;
-        if (jt3.contains("ChargedProjectiles", 9)) {
-            jz4 = jt3.getList("ChargedProjectiles", 10);
+    private static void addChargedProjectile(final ItemStack bki1, final ItemStack bki2) {
+        final CompoundTag le3 = bki1.getOrCreateTag();
+        ListTag lk4;
+        if (le3.contains("ChargedProjectiles", 9)) {
+            lk4 = le3.getList("ChargedProjectiles", 10);
         }
         else {
-            jz4 = new ListTag();
+            lk4 = new ListTag();
         }
-        final CompoundTag jt4 = new CompoundTag();
-        ben2.save(jt4);
-        ((AbstractList<CompoundTag>)jz4).add(jt4);
-        jt3.put("ChargedProjectiles", jz4);
+        final CompoundTag le4 = new CompoundTag();
+        bki2.save(le4);
+        ((AbstractList<CompoundTag>)lk4).add(le4);
+        le3.put("ChargedProjectiles", lk4);
     }
     
-    private static List<ItemStack> getChargedProjectiles(final ItemStack ben) {
+    private static List<ItemStack> getChargedProjectiles(final ItemStack bki) {
         final List<ItemStack> list2 = Lists.newArrayList();
-        final CompoundTag jt3 = ben.getTag();
-        if (jt3 != null && jt3.contains("ChargedProjectiles", 9)) {
-            final ListTag jz4 = jt3.getList("ChargedProjectiles", 10);
-            if (jz4 != null) {
-                for (int integer5 = 0; integer5 < jz4.size(); ++integer5) {
-                    final CompoundTag jt4 = jz4.getCompound(integer5);
-                    list2.add(ItemStack.of(jt4));
+        final CompoundTag le3 = bki.getTag();
+        if (le3 != null && le3.contains("ChargedProjectiles", 9)) {
+            final ListTag lk4 = le3.getList("ChargedProjectiles", 10);
+            if (lk4 != null) {
+                for (int integer5 = 0; integer5 < lk4.size(); ++integer5) {
+                    final CompoundTag le4 = lk4.getCompound(integer5);
+                    list2.add(ItemStack.of(le4));
                 }
             }
         }
         return list2;
     }
     
-    private static void clearChargedProjectiles(final ItemStack ben) {
-        final CompoundTag jt2 = ben.getTag();
-        if (jt2 != null) {
-            final ListTag jz3 = jt2.getList("ChargedProjectiles", 9);
-            jz3.clear();
-            jt2.put("ChargedProjectiles", jz3);
+    private static void clearChargedProjectiles(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTag();
+        if (le2 != null) {
+            final ListTag lk3 = le2.getList("ChargedProjectiles", 9);
+            lk3.clear();
+            le2.put("ChargedProjectiles", lk3);
         }
     }
     
-    private static boolean containsChargedProjectile(final ItemStack ben, final Item bei) {
-        return getChargedProjectiles(ben).stream().anyMatch(ben -> ben.getItem() == bei);
+    public static boolean containsChargedProjectile(final ItemStack bki, final Item bke) {
+        return getChargedProjectiles(bki).stream().anyMatch(bki -> bki.getItem() == bke);
     }
     
-    private static void shootProjectile(final Level bjw, final LivingEntity akz, final InteractionHand ajk, final ItemStack ben4, final ItemStack ben5, final float float6, final boolean boolean7, final float float8, final float float9, final float float10) {
-        if (bjw.isClientSide) {
+    private static void shootProjectile(final Level bqb, final LivingEntity aoy, final InteractionHand anf, final ItemStack bki4, final ItemStack bki5, final float float6, final boolean boolean7, final float float8, final float float9, final float float10) {
+        if (bqb.isClientSide) {
             return;
         }
-        final boolean boolean8 = ben5.getItem() == Items.FIREWORK_ROCKET;
-        Projectile ayy12;
+        final boolean boolean8 = bki5.getItem() == Items.FIREWORK_ROCKET;
+        Projectile bes12;
         if (boolean8) {
-            ayy12 = new FireworkRocketEntity(bjw, ben5, akz.getX(), akz.getEyeY() - 0.15000000596046448, akz.getZ(), true);
+            bes12 = new FireworkRocketEntity(bqb, bki5, aoy, aoy.getX(), aoy.getEyeY() - 0.15000000596046448, aoy.getZ(), true);
         }
         else {
-            ayy12 = getArrow(bjw, akz, ben4, ben5);
+            bes12 = getArrow(bqb, aoy, bki4, bki5);
             if (boolean7 || float10 != 0.0f) {
-                ((AbstractArrow)ayy12).pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
+                ((AbstractArrow)bes12).pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
             }
         }
-        if (akz instanceof CrossbowAttackMob) {
-            final CrossbowAttackMob awj13 = (CrossbowAttackMob)akz;
-            awj13.shootProjectile(awj13.getTarget(), ben4, ayy12, float10);
+        if (aoy instanceof CrossbowAttackMob) {
+            final CrossbowAttackMob bbo13 = (CrossbowAttackMob)aoy;
+            bbo13.shootCrossbowProjectile(bbo13.getTarget(), bki4, bes12, float10);
         }
         else {
-            final Vec3 cvl13 = akz.getUpVector(1.0f);
-            final Quaternion c14 = new Quaternion(new Vector3f(cvl13), float10, true);
-            final Vec3 cvl14 = akz.getViewVector(1.0f);
-            final Vector3f e16 = new Vector3f(cvl14);
-            e16.transform(c14);
-            ayy12.shoot(e16.x(), e16.y(), e16.z(), float8, float9);
+            final Vec3 dem13 = aoy.getUpVector(1.0f);
+            final Quaternion d14 = new Quaternion(new Vector3f(dem13), float10, true);
+            final Vec3 dem14 = aoy.getViewVector(1.0f);
+            final Vector3f g16 = new Vector3f(dem14);
+            g16.transform(d14);
+            bes12.shoot(g16.x(), g16.y(), g16.z(), float8, float9);
         }
-        ben4.<LivingEntity>hurtAndBreak(boolean8 ? 3 : 1, akz, akz -> akz.broadcastBreakEvent(ajk));
-        bjw.addFreshEntity((Entity)ayy12);
-        bjw.playSound(null, akz.getX(), akz.getY(), akz.getZ(), SoundEvents.CROSSBOW_SHOOT, SoundSource.PLAYERS, 1.0f, float6);
+        bki4.<LivingEntity>hurtAndBreak(boolean8 ? 3 : 1, aoy, aoy -> aoy.broadcastBreakEvent(anf));
+        bqb.addFreshEntity(bes12);
+        bqb.playSound(null, aoy.getX(), aoy.getY(), aoy.getZ(), SoundEvents.CROSSBOW_SHOOT, SoundSource.PLAYERS, 1.0f, float6);
     }
     
-    private static AbstractArrow getArrow(final Level bjw, final LivingEntity akz, final ItemStack ben3, final ItemStack ben4) {
-        final ArrowItem bck5 = (ArrowItem)((ben4.getItem() instanceof ArrowItem) ? ben4.getItem() : Items.ARROW);
-        final AbstractArrow ayn6 = bck5.createArrow(bjw, ben4, akz);
-        if (akz instanceof Player) {
-            ayn6.setCritArrow(true);
+    private static AbstractArrow getArrow(final Level bqb, final LivingEntity aoy, final ItemStack bki3, final ItemStack bki4) {
+        final ArrowItem bih5 = (ArrowItem)((bki4.getItem() instanceof ArrowItem) ? bki4.getItem() : Items.ARROW);
+        final AbstractArrow beg6 = bih5.createArrow(bqb, bki4, aoy);
+        if (aoy instanceof Player) {
+            beg6.setCritArrow(true);
         }
-        ayn6.setSoundEvent(SoundEvents.CROSSBOW_HIT);
-        ayn6.setShotFromCrossbow(true);
-        final int integer7 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.PIERCING, ben3);
+        beg6.setSoundEvent(SoundEvents.CROSSBOW_HIT);
+        beg6.setShotFromCrossbow(true);
+        final int integer7 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.PIERCING, bki3);
         if (integer7 > 0) {
-            ayn6.setPierceLevel((byte)integer7);
+            beg6.setPierceLevel((byte)integer7);
         }
-        return ayn6;
+        return beg6;
     }
     
-    public static void performShooting(final Level bjw, final LivingEntity akz, final InteractionHand ajk, final ItemStack ben, final float float5, final float float6) {
-        final List<ItemStack> list7 = getChargedProjectiles(ben);
-        final float[] arr8 = getShotPitches(akz.getRandom());
+    public static void performShooting(final Level bqb, final LivingEntity aoy, final InteractionHand anf, final ItemStack bki, final float float5, final float float6) {
+        final List<ItemStack> list7 = getChargedProjectiles(bki);
+        final float[] arr8 = getShotPitches(aoy.getRandom());
         for (int integer9 = 0; integer9 < list7.size(); ++integer9) {
-            final ItemStack ben2 = list7.get(integer9);
-            final boolean boolean11 = akz instanceof Player && ((Player)akz).abilities.instabuild;
-            if (!ben2.isEmpty()) {
+            final ItemStack bki2 = list7.get(integer9);
+            final boolean boolean11 = aoy instanceof Player && ((Player)aoy).abilities.instabuild;
+            if (!bki2.isEmpty()) {
                 if (integer9 == 0) {
-                    shootProjectile(bjw, akz, ajk, ben, ben2, arr8[integer9], boolean11, float5, float6, 0.0f);
+                    shootProjectile(bqb, aoy, anf, bki, bki2, arr8[integer9], boolean11, float5, float6, 0.0f);
                 }
                 else if (integer9 == 1) {
-                    shootProjectile(bjw, akz, ajk, ben, ben2, arr8[integer9], boolean11, float5, float6, -10.0f);
+                    shootProjectile(bqb, aoy, anf, bki, bki2, arr8[integer9], boolean11, float5, float6, -10.0f);
                 }
                 else if (integer9 == 2) {
-                    shootProjectile(bjw, akz, ajk, ben, ben2, arr8[integer9], boolean11, float5, float6, 10.0f);
+                    shootProjectile(bqb, aoy, anf, bki, bki2, arr8[integer9], boolean11, float5, float6, 10.0f);
                 }
             }
         }
-        onCrossbowShot(bjw, akz, ben);
+        onCrossbowShot(bqb, aoy, bki);
     }
     
     private static float[] getShotPitches(final Random random) {
@@ -274,51 +259,51 @@ public class CrossbowItem extends ProjectileWeaponItem {
         return 1.0f / (CrossbowItem.random.nextFloat() * 0.5f + 1.8f) + float2;
     }
     
-    private static void onCrossbowShot(final Level bjw, final LivingEntity akz, final ItemStack ben) {
-        if (akz instanceof ServerPlayer) {
-            final ServerPlayer xe4 = (ServerPlayer)akz;
-            if (!bjw.isClientSide) {
-                CriteriaTriggers.SHOT_CROSSBOW.trigger(xe4, ben);
+    private static void onCrossbowShot(final Level bqb, final LivingEntity aoy, final ItemStack bki) {
+        if (aoy instanceof ServerPlayer) {
+            final ServerPlayer ze4 = (ServerPlayer)aoy;
+            if (!bqb.isClientSide) {
+                CriteriaTriggers.SHOT_CROSSBOW.trigger(ze4, bki);
             }
-            xe4.awardStat(Stats.ITEM_USED.get(ben.getItem()));
+            ze4.awardStat(Stats.ITEM_USED.get(bki.getItem()));
         }
-        clearChargedProjectiles(ben);
+        clearChargedProjectiles(bki);
     }
     
     @Override
-    public void onUseTick(final Level bjw, final LivingEntity akz, final ItemStack ben, final int integer) {
-        if (!bjw.isClientSide) {
-            final int integer2 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.QUICK_CHARGE, ben);
-            final SoundEvent aah7 = this.getStartSound(integer2);
-            final SoundEvent aah8 = (integer2 == 0) ? SoundEvents.CROSSBOW_LOADING_MIDDLE : null;
-            final float float9 = (ben.getUseDuration() - integer) / (float)getChargeDuration(ben);
+    public void onUseTick(final Level bqb, final LivingEntity aoy, final ItemStack bki, final int integer) {
+        if (!bqb.isClientSide) {
+            final int integer2 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.QUICK_CHARGE, bki);
+            final SoundEvent ack7 = this.getStartSound(integer2);
+            final SoundEvent ack8 = (integer2 == 0) ? SoundEvents.CROSSBOW_LOADING_MIDDLE : null;
+            final float float9 = (bki.getUseDuration() - integer) / (float)getChargeDuration(bki);
             if (float9 < 0.2f) {
                 this.startSoundPlayed = false;
                 this.midLoadSoundPlayed = false;
             }
             if (float9 >= 0.2f && !this.startSoundPlayed) {
                 this.startSoundPlayed = true;
-                bjw.playSound(null, akz.getX(), akz.getY(), akz.getZ(), aah7, SoundSource.PLAYERS, 0.5f, 1.0f);
+                bqb.playSound(null, aoy.getX(), aoy.getY(), aoy.getZ(), ack7, SoundSource.PLAYERS, 0.5f, 1.0f);
             }
-            if (float9 >= 0.5f && aah8 != null && !this.midLoadSoundPlayed) {
+            if (float9 >= 0.5f && ack8 != null && !this.midLoadSoundPlayed) {
                 this.midLoadSoundPlayed = true;
-                bjw.playSound(null, akz.getX(), akz.getY(), akz.getZ(), aah8, SoundSource.PLAYERS, 0.5f, 1.0f);
+                bqb.playSound(null, aoy.getX(), aoy.getY(), aoy.getZ(), ack8, SoundSource.PLAYERS, 0.5f, 1.0f);
             }
         }
     }
     
     @Override
-    public int getUseDuration(final ItemStack ben) {
-        return getChargeDuration(ben) + 3;
+    public int getUseDuration(final ItemStack bki) {
+        return getChargeDuration(bki) + 3;
     }
     
-    public static int getChargeDuration(final ItemStack ben) {
-        final int integer2 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.QUICK_CHARGE, ben);
+    public static int getChargeDuration(final ItemStack bki) {
+        final int integer2 = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.QUICK_CHARGE, bki);
         return (integer2 == 0) ? 25 : (25 - 5 * integer2);
     }
     
     @Override
-    public UseAnim getUseAnimation(final ItemStack ben) {
+    public UseAnim getUseAnimation(final ItemStack bki) {
         return UseAnim.CROSSBOW;
     }
     
@@ -339,8 +324,8 @@ public class CrossbowItem extends ProjectileWeaponItem {
         }
     }
     
-    private static float getPowerForTime(final int integer, final ItemStack ben) {
-        float float3 = integer / (float)getChargeDuration(ben);
+    private static float getPowerForTime(final int integer, final ItemStack bki) {
+        float float3 = integer / (float)getChargeDuration(bki);
         if (float3 > 1.0f) {
             float3 = 1.0f;
         }
@@ -348,16 +333,16 @@ public class CrossbowItem extends ProjectileWeaponItem {
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        final List<ItemStack> list2 = getChargedProjectiles(ben);
-        if (!isCharged(ben) || list2.isEmpty()) {
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        final List<ItemStack> list2 = getChargedProjectiles(bki);
+        if (!isCharged(bki) || list2.isEmpty()) {
             return;
         }
-        final ItemStack ben2 = list2.get(0);
-        list.add(new TranslatableComponent("item.minecraft.crossbow.projectile", new Object[0]).append(" ").append(ben2.getDisplayName()));
-        if (bfw.isAdvanced() && ben2.getItem() == Items.FIREWORK_ROCKET) {
+        final ItemStack bki2 = list2.get(0);
+        list.add(new TranslatableComponent("item.minecraft.crossbow.projectile").append(" ").append(bki2.getDisplayName()));
+        if (bls.isAdvanced() && bki2.getItem() == Items.FIREWORK_ROCKET) {
             final List<Component> list3 = Lists.newArrayList();
-            Items.FIREWORK_ROCKET.appendHoverText(ben2, bjw, list3, bfw);
+            Items.FIREWORK_ROCKET.appendHoverText(bki2, bqb, list3, bls);
             if (!list3.isEmpty()) {
                 for (int integer9 = 0; integer9 < list3.size(); ++integer9) {
                     list3.set(integer9, new TextComponent("  ").append(list3.get(integer9)).withStyle(ChatFormatting.GRAY));
@@ -367,10 +352,15 @@ public class CrossbowItem extends ProjectileWeaponItem {
         }
     }
     
-    private static float getShootingPower(final ItemStack ben) {
-        if (ben.getItem() == Items.CROSSBOW && containsChargedProjectile(ben, Items.FIREWORK_ROCKET)) {
+    private static float getShootingPower(final ItemStack bki) {
+        if (bki.getItem() == Items.CROSSBOW && containsChargedProjectile(bki, Items.FIREWORK_ROCKET)) {
             return 1.6f;
         }
         return 3.15f;
     }
+    
+    @Override
+    public int getDefaultProjectileRange() {
+        return 8;
+    }
 }
diff --git a/src/net/minecraft/world/item/DebugStickItem.java b/src/net/minecraft/world/item/DebugStickItem.java
index 8dfa403..52c4115 100644
--- a/src/net/minecraft/world/item/DebugStickItem.java
+++ b/src/net/minecraft/world/item/DebugStickItem.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.Util;
@@ -27,73 +27,73 @@ public class DebugStickItem extends Item {
     }
     
     @Override
-    public boolean isFoil(final ItemStack ben) {
+    public boolean isFoil(final ItemStack bki) {
         return true;
     }
     
     @Override
-    public boolean canAttackBlock(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj) {
-        if (!bjw.isClientSide) {
-            this.handleInteraction(ayj, byj, bjw, fk, false, ayj.getItemInHand(InteractionHand.MAIN_HAND));
+    public boolean canAttackBlock(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec) {
+        if (!bqb.isClientSide) {
+            this.handleInteraction(bec, cfj, bqb, fu, false, bec.getItemInHand(InteractionHand.MAIN_HAND));
         }
         return false;
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Player ayj3 = bfz.getPlayer();
-        final Level bjw4 = bfz.getLevel();
-        if (!bjw4.isClientSide && ayj3 != null) {
-            final BlockPos fk5 = bfz.getClickedPos();
-            this.handleInteraction(ayj3, bjw4.getBlockState(fk5), bjw4, fk5, true, bfz.getItemInHand());
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Player bec3 = blv.getPlayer();
+        final Level bqb4 = blv.getLevel();
+        if (!bqb4.isClientSide && bec3 != null) {
+            final BlockPos fu5 = blv.getClickedPos();
+            this.handleInteraction(bec3, bqb4.getBlockState(fu5), bqb4, fu5, true, blv.getItemInHand());
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.sidedSuccess(bqb4.isClientSide);
     }
     
-    private void handleInteraction(final Player ayj, final BlockState byj, final LevelAccessor bjx, final BlockPos fk, final boolean boolean5, final ItemStack ben) {
-        if (!ayj.canUseGameMasterBlocks()) {
+    private void handleInteraction(final Player bec, final BlockState cfj, final LevelAccessor bqc, final BlockPos fu, final boolean boolean5, final ItemStack bki) {
+        if (!bec.canUseGameMasterBlocks()) {
             return;
         }
-        final Block bph8 = byj.getBlock();
-        final StateDefinition<Block, BlockState> byk9 = bph8.getStateDefinition();
-        final Collection<Property<?>> collection10 = byk9.getProperties();
-        final String string11 = Registry.BLOCK.getKey(bph8).toString();
+        final Block bvr8 = cfj.getBlock();
+        final StateDefinition<Block, BlockState> cfk9 = bvr8.getStateDefinition();
+        final Collection<Property<?>> collection10 = cfk9.getProperties();
+        final String string11 = Registry.BLOCK.getKey(bvr8).toString();
         if (collection10.isEmpty()) {
-            message(ayj, new TranslatableComponent(this.getDescriptionId() + ".empty", new Object[] { string11 }));
+            message(bec, new TranslatableComponent(this.getDescriptionId() + ".empty", new Object[] { string11 }));
             return;
         }
-        final CompoundTag jt12 = ben.getOrCreateTagElement("DebugProperty");
-        final String string12 = jt12.getString(string11);
-        Property<?> bzm14 = byk9.getProperty(string12);
+        final CompoundTag le12 = bki.getOrCreateTagElement("DebugProperty");
+        final String string12 = le12.getString(string11);
+        Property<?> cgl14 = cfk9.getProperty(string12);
         if (boolean5) {
-            if (bzm14 == null) {
-                bzm14 = collection10.iterator().next();
+            if (cgl14 == null) {
+                cgl14 = collection10.iterator().next();
             }
-            final BlockState byj2 = DebugStickItem.cycleState(byj, bzm14, ayj.isSecondaryUseActive());
-            bjx.setBlock(fk, byj2, 18);
-            message(ayj, new TranslatableComponent(this.getDescriptionId() + ".update", new Object[] { bzm14.getName(), DebugStickItem.getNameHelper(byj2, bzm14) }));
+            final BlockState cfj2 = DebugStickItem.cycleState(cfj, cgl14, bec.isSecondaryUseActive());
+            bqc.setBlock(fu, cfj2, 18);
+            message(bec, new TranslatableComponent(this.getDescriptionId() + ".update", new Object[] { cgl14.getName(), DebugStickItem.getNameHelper(cfj2, cgl14) }));
         }
         else {
-            bzm14 = DebugStickItem.<Property<?>>getRelative(collection10, bzm14, ayj.isSecondaryUseActive());
-            final String string13 = bzm14.getName();
-            jt12.putString(string11, string13);
-            message(ayj, new TranslatableComponent(this.getDescriptionId() + ".select", new Object[] { string13, DebugStickItem.getNameHelper(byj, bzm14) }));
+            cgl14 = DebugStickItem.<Property<?>>getRelative(collection10, cgl14, bec.isSecondaryUseActive());
+            final String string13 = cgl14.getName();
+            le12.putString(string11, string13);
+            message(bec, new TranslatableComponent(this.getDescriptionId() + ".select", new Object[] { string13, DebugStickItem.getNameHelper(cfj, cgl14) }));
         }
     }
     
-    private static <T extends Comparable<T>> BlockState cycleState(final BlockState byj, final Property<T> bzm, final boolean boolean3) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<T, Comparable>setValue(bzm, (Comparable)DebugStickItem.<V>getRelative((Iterable<V>)bzm.getPossibleValues(), (V)byj.<T>getValue((Property<T>)bzm), boolean3));
+    private static <T extends Comparable<T>> BlockState cycleState(final BlockState cfj, final Property<T> cgl, final boolean boolean3) {
+        return ((StateHolder<O, BlockState>)cfj).<T, Comparable>setValue(cgl, (Comparable)DebugStickItem.<V>getRelative((Iterable<V>)cgl.getPossibleValues(), (V)cfj.<T>getValue((Property<T>)cgl), boolean3));
     }
     
     private static <T> T getRelative(final Iterable<T> iterable, @Nullable final T object, final boolean boolean3) {
         return boolean3 ? Util.<T>findPreviousInIterable(iterable, object) : Util.<T>findNextInIterable(iterable, object);
     }
     
-    private static void message(final Player ayj, final Component lf) {
-        ((ServerPlayer)ayj).sendMessage(lf, ChatType.GAME_INFO);
+    private static void message(final Player bec, final Component mr) {
+        ((ServerPlayer)bec).sendMessage(mr, ChatType.GAME_INFO, Util.NIL_UUID);
     }
     
-    private static <T extends Comparable<T>> String getNameHelper(final BlockState byj, final Property<T> bzm) {
-        return bzm.getName(byj.<T>getValue(bzm));
+    private static <T extends Comparable<T>> String getNameHelper(final BlockState cfj, final Property<T> cgl) {
+        return cgl.getName(cfj.<T>getValue(cgl));
     }
 }
diff --git a/src/net/minecraft/world/item/DiggerItem.java b/src/net/minecraft/world/item/DiggerItem.java
index 7ee89a5..8689f20 100644
--- a/src/net/minecraft/world/item/DiggerItem.java
+++ b/src/net/minecraft/world/item/DiggerItem.java
@@ -1,57 +1,64 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
-import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import com.google.common.collect.Multimap;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import com.google.common.collect.ImmutableMultimap;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.entity.ai.attributes.Attribute;
+import com.google.common.collect.Multimap;
 import net.minecraft.world.level.block.Block;
 import java.util.Set;
 
-public class DiggerItem extends TieredItem {
+public class DiggerItem extends TieredItem implements Vanishable {
     private final Set<Block> blocks;
     protected final float speed;
-    protected final float attackDamage;
-    protected final float attackSpeed;
+    private final float attackDamageBaseline;
+    private final Multimap<Attribute, AttributeModifier> defaultModifiers;
     
-    protected DiggerItem(final float float1, final float float2, final Tier bfs, final Set<Block> set, final Properties a) {
-        super(bfs, a);
+    protected DiggerItem(final float float1, final float float2, final Tier blo, final Set<Block> set, final Properties a) {
+        super(blo, a);
         this.blocks = set;
-        this.speed = bfs.getSpeed();
-        this.attackDamage = float1 + bfs.getAttackDamageBonus();
-        this.attackSpeed = float2;
+        this.speed = blo.getSpeed();
+        this.attackDamageBaseline = float1 + blo.getAttackDamageBonus();
+        final ImmutableMultimap.Builder<Attribute, AttributeModifier> builder7 = ImmutableMultimap.<Attribute, AttributeModifier>builder();
+        builder7.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(DiggerItem.BASE_ATTACK_DAMAGE_UUID, "Tool modifier", this.attackDamageBaseline, AttributeModifier.Operation.ADDITION));
+        builder7.put(Attributes.ATTACK_SPEED, new AttributeModifier(DiggerItem.BASE_ATTACK_SPEED_UUID, "Tool modifier", float2, AttributeModifier.Operation.ADDITION));
+        this.defaultModifiers = builder7.build();
     }
     
     @Override
-    public float getDestroySpeed(final ItemStack ben, final BlockState byj) {
-        return this.blocks.contains(byj.getBlock()) ? this.speed : 1.0f;
+    public float getDestroySpeed(final ItemStack bki, final BlockState cfj) {
+        return this.blocks.contains(cfj.getBlock()) ? this.speed : 1.0f;
     }
     
     @Override
-    public boolean hurtEnemy(final ItemStack ben, final LivingEntity akz2, final LivingEntity akz3) {
-        ben.<LivingEntity>hurtAndBreak(2, akz3, akz -> akz.broadcastBreakEvent(EquipmentSlot.MAINHAND));
+    public boolean hurtEnemy(final ItemStack bki, final LivingEntity aoy2, final LivingEntity aoy3) {
+        bki.<LivingEntity>hurtAndBreak(2, aoy3, aoy -> aoy.broadcastBreakEvent(EquipmentSlot.MAINHAND));
         return true;
     }
     
     @Override
-    public boolean mineBlock(final ItemStack ben, final Level bjw, final BlockState byj, final BlockPos fk, final LivingEntity akz) {
-        if (!bjw.isClientSide && byj.getDestroySpeed(bjw, fk) != 0.0f) {
-            ben.<LivingEntity>hurtAndBreak(1, akz, akz -> akz.broadcastBreakEvent(EquipmentSlot.MAINHAND));
+    public boolean mineBlock(final ItemStack bki, final Level bqb, final BlockState cfj, final BlockPos fu, final LivingEntity aoy) {
+        if (!bqb.isClientSide && cfj.getDestroySpeed(bqb, fu) != 0.0f) {
+            bki.<LivingEntity>hurtAndBreak(1, aoy, aoy -> aoy.broadcastBreakEvent(EquipmentSlot.MAINHAND));
         }
         return true;
     }
     
     @Override
-    public Multimap<String, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot akv) {
-        final Multimap<String, AttributeModifier> multimap3 = super.getDefaultAttributeModifiers(akv);
-        if (akv == EquipmentSlot.MAINHAND) {
-            multimap3.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(DiggerItem.BASE_ATTACK_DAMAGE_UUID, "Tool modifier", this.attackDamage, AttributeModifier.Operation.ADDITION));
-            multimap3.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(DiggerItem.BASE_ATTACK_SPEED_UUID, "Tool modifier", this.attackSpeed, AttributeModifier.Operation.ADDITION));
+    public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot aor) {
+        if (aor == EquipmentSlot.MAINHAND) {
+            return this.defaultModifiers;
         }
-        return multimap3;
+        return super.getDefaultAttributeModifiers(aor);
+    }
+    
+    public float getAttackDamage() {
+        return this.attackDamageBaseline;
     }
 }
diff --git a/src/net/minecraft/world/item/DirectionalPlaceContext.java b/src/net/minecraft/world/item/DirectionalPlaceContext.java
index 841c728..dd57e00 100644
--- a/src/net/minecraft/world/item/DirectionalPlaceContext.java
+++ b/src/net/minecraft/world/item/DirectionalPlaceContext.java
@@ -2,6 +2,7 @@ package net.minecraft.world.item;
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.core.BlockPos;
@@ -11,9 +12,9 @@ import net.minecraft.core.Direction;
 public class DirectionalPlaceContext extends BlockPlaceContext {
     private final Direction direction;
     
-    public DirectionalPlaceContext(final Level bjw, final BlockPos fk, final Direction fp3, final ItemStack ben, final Direction fp5) {
-        super(bjw, null, InteractionHand.MAIN_HAND, ben, new BlockHitResult(new Vec3(fk.getX() + 0.5, fk.getY(), fk.getZ() + 0.5), fp5, fk, false));
-        this.direction = fp3;
+    public DirectionalPlaceContext(final Level bqb, final BlockPos fu, final Direction fz3, final ItemStack bki, final Direction fz5) {
+        super(bqb, null, InteractionHand.MAIN_HAND, bki, new BlockHitResult(Vec3.atBottomCenterOf(fu), fz5, fu, false));
+        this.direction = fz3;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/DoubleHighBlockItem.java b/src/net/minecraft/world/item/DoubleHighBlockItem.java
index 88bfe06..203d2f1 100644
--- a/src/net/minecraft/world/item/DoubleHighBlockItem.java
+++ b/src/net/minecraft/world/item/DoubleHighBlockItem.java
@@ -5,13 +5,13 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Block;
 
 public class DoubleHighBlockItem extends BlockItem {
-    public DoubleHighBlockItem(final Block bph, final Properties a) {
-        super(bph, a);
+    public DoubleHighBlockItem(final Block bvr, final Properties a) {
+        super(bvr, a);
     }
     
     @Override
-    protected boolean placeBlock(final BlockPlaceContext bcq, final BlockState byj) {
-        bcq.getLevel().setBlock(bcq.getClickedPos().above(), Blocks.AIR.defaultBlockState(), 27);
-        return super.placeBlock(bcq, byj);
+    protected boolean placeBlock(final BlockPlaceContext bin, final BlockState cfj) {
+        bin.getLevel().setBlock(bin.getClickedPos().above(), Blocks.AIR.defaultBlockState(), 27);
+        return super.placeBlock(bin, cfj);
     }
 }
diff --git a/src/net/minecraft/world/item/DyeColor.java b/src/net/minecraft/world/item/DyeColor.java
index 0b1e25a..0102ae8 100644
--- a/src/net/minecraft/world/item/DyeColor.java
+++ b/src/net/minecraft/world/item/DyeColor.java
@@ -38,11 +38,11 @@ public enum DyeColor implements StringRepresentable {
     private final int fireworkColor;
     private final int textColor;
     
-    private DyeColor(final int integer3, final String string4, final int integer5, final MaterialColor cop, final int integer7, final int integer8) {
+    private DyeColor(final int integer3, final String string4, final int integer5, final MaterialColor cxe, final int integer7, final int integer8) {
         this.id = integer3;
         this.name = string4;
         this.textureDiffuseColor = integer5;
-        this.color = cop;
+        this.color = cxe;
         this.textColor = integer8;
         final int integer9 = (integer5 & 0xFF0000) >> 16;
         final int integer10 = (integer5 & 0xFF00) >> 8;
@@ -83,13 +83,13 @@ public enum DyeColor implements StringRepresentable {
         return DyeColor.BY_ID[integer];
     }
     
-    public static DyeColor byName(final String string, final DyeColor bdj) {
-        for (final DyeColor bdj2 : values()) {
-            if (bdj2.name.equals(string)) {
-                return bdj2;
+    public static DyeColor byName(final String string, final DyeColor bje) {
+        for (final DyeColor bje2 : values()) {
+            if (bje2.name.equals(string)) {
+                return bje2;
             }
         }
-        return bdj;
+        return bje;
     }
     
     @Nullable
@@ -109,6 +109,6 @@ public enum DyeColor implements StringRepresentable {
     
     static {
         BY_ID = Arrays.<DyeColor>stream(values()).sorted(Comparator.comparingInt(DyeColor::getId)).<DyeColor>toArray(DyeColor[]::new);
-        BY_FIREWORK_COLOR = new Int2ObjectOpenHashMap((Map)Arrays.<DyeColor>stream(values()).collect(Collectors.toMap(bdj -> bdj.fireworkColor, bdj -> bdj)));
+        BY_FIREWORK_COLOR = new Int2ObjectOpenHashMap((Map)Arrays.<DyeColor>stream(values()).collect(Collectors.toMap(bje -> bje.fireworkColor, bje -> bje)));
     }
 }
diff --git a/src/net/minecraft/world/item/DyeItem.java b/src/net/minecraft/world/item/DyeItem.java
index f16c5bf..0f23dae 100644
--- a/src/net/minecraft/world/item/DyeItem.java
+++ b/src/net/minecraft/world/item/DyeItem.java
@@ -2,6 +2,7 @@ package net.minecraft.world.item;
 
 import com.google.common.collect.Maps;
 import net.minecraft.world.entity.animal.Sheep;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
@@ -11,31 +12,33 @@ public class DyeItem extends Item {
     private static final Map<DyeColor, DyeItem> ITEM_BY_COLOR;
     private final DyeColor dyeColor;
     
-    public DyeItem(final DyeColor bdj, final Properties a) {
+    public DyeItem(final DyeColor bje, final Properties a) {
         super(a);
-        this.dyeColor = bdj;
-        DyeItem.ITEM_BY_COLOR.put(bdj, this);
+        this.dyeColor = bje;
+        DyeItem.ITEM_BY_COLOR.put(bje, this);
     }
     
     @Override
-    public boolean interactEnemy(final ItemStack ben, final Player ayj, final LivingEntity akz, final InteractionHand ajk) {
-        if (akz instanceof Sheep) {
-            final Sheep atv6 = (Sheep)akz;
-            if (atv6.isAlive() && !atv6.isSheared() && atv6.getColor() != this.dyeColor) {
-                atv6.setColor(this.dyeColor);
-                ben.shrink(1);
+    public InteractionResult interactLivingEntity(final ItemStack bki, final Player bec, final LivingEntity aoy, final InteractionHand anf) {
+        if (aoy instanceof Sheep) {
+            final Sheep azd6 = (Sheep)aoy;
+            if (azd6.isAlive() && !azd6.isSheared() && azd6.getColor() != this.dyeColor) {
+                if (!bec.level.isClientSide) {
+                    azd6.setColor(this.dyeColor);
+                    bki.shrink(1);
+                }
+                return InteractionResult.sidedSuccess(bec.level.isClientSide);
             }
-            return true;
         }
-        return false;
+        return InteractionResult.PASS;
     }
     
     public DyeColor getDyeColor() {
         return this.dyeColor;
     }
     
-    public static DyeItem byColor(final DyeColor bdj) {
-        return DyeItem.ITEM_BY_COLOR.get(bdj);
+    public static DyeItem byColor(final DyeColor bje) {
+        return DyeItem.ITEM_BY_COLOR.get(bje);
     }
     
     static {
diff --git a/src/net/minecraft/world/item/DyeableArmorItem.java b/src/net/minecraft/world/item/DyeableArmorItem.java
index bc03d0d..4f247b5 100644
--- a/src/net/minecraft/world/item/DyeableArmorItem.java
+++ b/src/net/minecraft/world/item/DyeableArmorItem.java
@@ -3,7 +3,7 @@ package net.minecraft.world.item;
 import net.minecraft.world.entity.EquipmentSlot;
 
 public class DyeableArmorItem extends ArmorItem implements DyeableLeatherItem {
-    public DyeableArmorItem(final ArmorMaterial bch, final EquipmentSlot akv, final Properties a) {
-        super(bch, akv, a);
+    public DyeableArmorItem(final ArmorMaterial bie, final EquipmentSlot aor, final Properties a) {
+        super(bie, aor, a);
     }
 }
diff --git a/src/net/minecraft/world/item/DyeableLeatherItem.java b/src/net/minecraft/world/item/DyeableLeatherItem.java
index e8de5e5..80e69f6 100644
--- a/src/net/minecraft/world/item/DyeableLeatherItem.java
+++ b/src/net/minecraft/world/item/DyeableLeatherItem.java
@@ -5,43 +5,43 @@ import java.util.List;
 import net.minecraft.nbt.CompoundTag;
 
 public interface DyeableLeatherItem {
-    default boolean hasCustomColor(final ItemStack ben) {
-        final CompoundTag jt3 = ben.getTagElement("display");
-        return jt3 != null && jt3.contains("color", 99);
+    default boolean hasCustomColor(final ItemStack bki) {
+        final CompoundTag le3 = bki.getTagElement("display");
+        return le3 != null && le3.contains("color", 99);
     }
     
-    default int getColor(final ItemStack ben) {
-        final CompoundTag jt3 = ben.getTagElement("display");
-        if (jt3 != null && jt3.contains("color", 99)) {
-            return jt3.getInt("color");
+    default int getColor(final ItemStack bki) {
+        final CompoundTag le3 = bki.getTagElement("display");
+        if (le3 != null && le3.contains("color", 99)) {
+            return le3.getInt("color");
         }
         return 10511680;
     }
     
-    default void clearColor(final ItemStack ben) {
-        final CompoundTag jt3 = ben.getTagElement("display");
-        if (jt3 != null && jt3.contains("color")) {
-            jt3.remove("color");
+    default void clearColor(final ItemStack bki) {
+        final CompoundTag le3 = bki.getTagElement("display");
+        if (le3 != null && le3.contains("color")) {
+            le3.remove("color");
         }
     }
     
-    default void setColor(final ItemStack ben, final int integer) {
-        ben.getOrCreateTagElement("display").putInt("color", integer);
+    default void setColor(final ItemStack bki, final int integer) {
+        bki.getOrCreateTagElement("display").putInt("color", integer);
     }
     
-    default ItemStack dyeArmor(final ItemStack ben, final List<DyeItem> list) {
-        ItemStack ben2 = ItemStack.EMPTY;
+    default ItemStack dyeArmor(final ItemStack bki, final List<DyeItem> list) {
+        ItemStack bki2 = ItemStack.EMPTY;
         final int[] arr4 = new int[3];
         int integer5 = 0;
         int integer6 = 0;
-        DyeableLeatherItem bdn7 = null;
-        final Item bei8 = ben.getItem();
-        if (bei8 instanceof DyeableLeatherItem) {
-            bdn7 = (DyeableLeatherItem)bei8;
-            ben2 = ben.copy();
-            ben2.setCount(1);
-            if (bdn7.hasCustomColor(ben)) {
-                final int integer7 = bdn7.getColor(ben2);
+        DyeableLeatherItem bji7 = null;
+        final Item bke8 = bki.getItem();
+        if (bke8 instanceof DyeableLeatherItem) {
+            bji7 = (DyeableLeatherItem)bke8;
+            bki2 = bki.copy();
+            bki2.setCount(1);
+            if (bji7.hasCustomColor(bki)) {
+                final int integer7 = bji7.getColor(bki2);
                 final float float10 = (integer7 >> 16 & 0xFF) / 255.0f;
                 final float float11 = (integer7 >> 8 & 0xFF) / 255.0f;
                 final float float12 = (integer7 & 0xFF) / 255.0f;
@@ -57,8 +57,8 @@ public interface DyeableLeatherItem {
                 array3[n3] += (int)(float12 * 255.0f);
                 ++integer6;
             }
-            for (final DyeItem bdk10 : list) {
-                final float[] arr5 = bdk10.getDyeColor().getTextureDiffuseColors();
+            for (final DyeItem bjf10 : list) {
+                final float[] arr5 = bjf10.getDyeColor().getTextureDiffuseColors();
                 final int integer8 = (int)(arr5[0] * 255.0f);
                 final int integer9 = (int)(arr5[1] * 255.0f);
                 final int integer10 = (int)(arr5[2] * 255.0f);
@@ -75,7 +75,7 @@ public interface DyeableLeatherItem {
                 ++integer6;
             }
         }
-        if (bdn7 == null) {
+        if (bji7 == null) {
             return ItemStack.EMPTY;
         }
         int integer7 = arr4[0] / integer6;
@@ -89,7 +89,7 @@ public interface DyeableLeatherItem {
         int integer10 = integer7;
         integer10 = (integer10 << 8) + integer11;
         integer10 = (integer10 << 8) + integer12;
-        bdn7.setColor(ben2, integer10);
-        return ben2;
+        bji7.setColor(bki2, integer10);
+        return bki2;
     }
 }
diff --git a/src/net/minecraft/world/item/EggItem.java b/src/net/minecraft/world/item/EggItem.java
index fb91d51..c30bc96 100644
--- a/src/net/minecraft/world/item/EggItem.java
+++ b/src/net/minecraft/world/item/EggItem.java
@@ -18,19 +18,19 @@ public class EggItem extends Item {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        bjw.playSound(null, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.EGG_THROW, SoundSource.PLAYERS, 0.5f, 0.4f / (EggItem.random.nextFloat() * 0.4f + 0.8f));
-        if (!bjw.isClientSide) {
-            final ThrownEgg azg6 = new ThrownEgg(bjw, ayj);
-            azg6.setItem(ben5);
-            azg6.shootFromRotation(ayj, ayj.xRot, ayj.yRot, 0.0f, 1.5f, 1.0f);
-            bjw.addFreshEntity(azg6);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        bqb.playSound(null, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.EGG_THROW, SoundSource.PLAYERS, 0.5f, 0.4f / (EggItem.random.nextFloat() * 0.4f + 0.8f));
+        if (!bqb.isClientSide) {
+            final ThrownEgg bfa6 = new ThrownEgg(bqb, bec);
+            bfa6.setItem(bki5);
+            bfa6.shootFromRotation(bec, bec.xRot, bec.yRot, 0.0f, 1.5f, 1.0f);
+            bqb.addFreshEntity(bfa6);
         }
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        if (!ayj.abilities.instabuild) {
-            ben5.shrink(1);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        if (!bec.abilities.instabuild) {
+            bki5.shrink(1);
         }
-        return InteractionResultHolder.<ItemStack>success(ben5);
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
     }
 }
diff --git a/src/net/minecraft/world/item/ElytraItem.java b/src/net/minecraft/world/item/ElytraItem.java
index d01b3c8..19c835a 100644
--- a/src/net/minecraft/world/item/ElytraItem.java
+++ b/src/net/minecraft/world/item/ElytraItem.java
@@ -1,6 +1,5 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.InteractionResultHolder;
@@ -9,34 +8,32 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.DispenserBlock;
-import net.minecraft.resources.ResourceLocation;
 
-public class ElytraItem extends Item {
+public class ElytraItem extends Item implements Wearable {
     public ElytraItem(final Properties a) {
         super(a);
-        this.addProperty(new ResourceLocation("broken"), (ben, bjw, akz) -> isFlyEnabled(ben) ? 0.0f : 1.0f);
         DispenserBlock.registerBehavior(this, ArmorItem.DISPENSE_ITEM_BEHAVIOR);
     }
     
-    public static boolean isFlyEnabled(final ItemStack ben) {
-        return ben.getDamageValue() < ben.getMaxDamage() - 1;
+    public static boolean isFlyEnabled(final ItemStack bki) {
+        return bki.getDamageValue() < bki.getMaxDamage() - 1;
     }
     
     @Override
-    public boolean isValidRepairItem(final ItemStack ben1, final ItemStack ben2) {
-        return ben2.getItem() == Items.PHANTOM_MEMBRANE;
+    public boolean isValidRepairItem(final ItemStack bki1, final ItemStack bki2) {
+        return bki2.getItem() == Items.PHANTOM_MEMBRANE;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        final EquipmentSlot akv6 = Mob.getEquipmentSlotForItem(ben5);
-        final ItemStack ben6 = ayj.getItemBySlot(akv6);
-        if (ben6.isEmpty()) {
-            ayj.setItemSlot(akv6, ben5.copy());
-            ben5.setCount(0);
-            return InteractionResultHolder.<ItemStack>success(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        final EquipmentSlot aor6 = Mob.getEquipmentSlotForItem(bki5);
+        final ItemStack bki6 = bec.getItemBySlot(aor6);
+        if (bki6.isEmpty()) {
+            bec.setItemSlot(aor6, bki5.copy());
+            bki5.setCount(0);
+            return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
         }
-        return InteractionResultHolder.<ItemStack>fail(ben5);
+        return InteractionResultHolder.<ItemStack>fail(bki5);
     }
 }
diff --git a/src/net/minecraft/world/item/EmptyMapItem.java b/src/net/minecraft/world/item/EmptyMapItem.java
index ef95baf..c5d389a 100644
--- a/src/net/minecraft/world/item/EmptyMapItem.java
+++ b/src/net/minecraft/world/item/EmptyMapItem.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.item;
 
+import net.minecraft.sounds.SoundEvents;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
 import net.minecraft.util.Mth;
@@ -14,19 +15,20 @@ public class EmptyMapItem extends ComplexItem {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = MapItem.create(bjw, Mth.floor(ayj.getX()), Mth.floor(ayj.getZ()), (byte)0, true, false);
-        final ItemStack ben6 = ayj.getItemInHand(ajk);
-        if (!ayj.abilities.instabuild) {
-            ben6.shrink(1);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = MapItem.create(bqb, Mth.floor(bec.getX()), Mth.floor(bec.getZ()), (byte)0, true, false);
+        final ItemStack bki6 = bec.getItemInHand(anf);
+        if (!bec.abilities.instabuild) {
+            bki6.shrink(1);
         }
-        if (ben6.isEmpty()) {
-            return InteractionResultHolder.<ItemStack>success(ben5);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        bec.playSound(SoundEvents.UI_CARTOGRAPHY_TABLE_TAKE_RESULT, 1.0f, 1.0f);
+        if (bki6.isEmpty()) {
+            return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
         }
-        if (!ayj.inventory.add(ben5.copy())) {
-            ayj.drop(ben5, false);
+        if (!bec.inventory.add(bki5.copy())) {
+            bec.drop(bki5, false);
         }
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        return InteractionResultHolder.<ItemStack>success(ben6);
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki6, bqb.isClientSide());
     }
 }
diff --git a/src/net/minecraft/world/item/EnchantedBookItem.java b/src/net/minecraft/world/item/EnchantedBookItem.java
index 516853e..26d2ccf 100644
--- a/src/net/minecraft/world/item/EnchantedBookItem.java
+++ b/src/net/minecraft/world/item/EnchantedBookItem.java
@@ -22,74 +22,74 @@ public class EnchantedBookItem extends Item {
     }
     
     @Override
-    public boolean isFoil(final ItemStack ben) {
+    public boolean isFoil(final ItemStack bki) {
         return true;
     }
     
     @Override
-    public boolean isEnchantable(final ItemStack ben) {
+    public boolean isEnchantable(final ItemStack bki) {
         return false;
     }
     
-    public static ListTag getEnchantments(final ItemStack ben) {
-        final CompoundTag jt2 = ben.getTag();
-        if (jt2 != null) {
-            return jt2.getList("StoredEnchantments", 10);
+    public static ListTag getEnchantments(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTag();
+        if (le2 != null) {
+            return le2.getList("StoredEnchantments", 10);
         }
         return new ListTag();
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        super.appendHoverText(ben, bjw, list, bfw);
-        ItemStack.appendEnchantmentNames(list, getEnchantments(ben));
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        super.appendHoverText(bki, bqb, list, bls);
+        ItemStack.appendEnchantmentNames(list, getEnchantments(bki));
     }
     
-    public static void addEnchantment(final ItemStack ben, final EnchantmentInstance bia) {
-        final ListTag jz3 = getEnchantments(ben);
+    public static void addEnchantment(final ItemStack bki, final EnchantmentInstance bnz) {
+        final ListTag lk3 = getEnchantments(bki);
         boolean boolean4 = true;
-        final ResourceLocation sm5 = Registry.ENCHANTMENT.getKey(bia.enchantment);
-        for (int integer6 = 0; integer6 < jz3.size(); ++integer6) {
-            final CompoundTag jt7 = jz3.getCompound(integer6);
-            final ResourceLocation sm6 = ResourceLocation.tryParse(jt7.getString("id"));
-            if (sm6 != null && sm6.equals(sm5)) {
-                if (jt7.getInt("lvl") < bia.level) {
-                    jt7.putShort("lvl", (short)bia.level);
+        final ResourceLocation uh5 = Registry.ENCHANTMENT.getKey(bnz.enchantment);
+        for (int integer6 = 0; integer6 < lk3.size(); ++integer6) {
+            final CompoundTag le7 = lk3.getCompound(integer6);
+            final ResourceLocation uh6 = ResourceLocation.tryParse(le7.getString("id"));
+            if (uh6 != null && uh6.equals(uh5)) {
+                if (le7.getInt("lvl") < bnz.level) {
+                    le7.putShort("lvl", (short)bnz.level);
                 }
                 boolean4 = false;
                 break;
             }
         }
         if (boolean4) {
-            final CompoundTag jt8 = new CompoundTag();
-            jt8.putString("id", String.valueOf(sm5));
-            jt8.putShort("lvl", (short)bia.level);
-            ((AbstractList<CompoundTag>)jz3).add(jt8);
+            final CompoundTag le8 = new CompoundTag();
+            le8.putString("id", String.valueOf(uh5));
+            le8.putShort("lvl", (short)bnz.level);
+            ((AbstractList<CompoundTag>)lk3).add(le8);
         }
-        ben.getOrCreateTag().put("StoredEnchantments", jz3);
+        bki.getOrCreateTag().put("StoredEnchantments", lk3);
     }
     
-    public static ItemStack createForEnchantment(final EnchantmentInstance bia) {
-        final ItemStack ben2 = new ItemStack(Items.ENCHANTED_BOOK);
-        addEnchantment(ben2, bia);
-        return ben2;
+    public static ItemStack createForEnchantment(final EnchantmentInstance bnz) {
+        final ItemStack bki2 = new ItemStack(Items.ENCHANTED_BOOK);
+        addEnchantment(bki2, bnz);
+        return bki2;
     }
     
     @Override
-    public void fillItemCategory(final CreativeModeTab bdd, final NonNullList<ItemStack> fy) {
-        if (bdd == CreativeModeTab.TAB_SEARCH) {
-            for (final Enchantment bhx5 : Registry.ENCHANTMENT) {
-                if (bhx5.category != null) {
-                    for (int integer6 = bhx5.getMinLevel(); integer6 <= bhx5.getMaxLevel(); ++integer6) {
-                        fy.add(createForEnchantment(new EnchantmentInstance(bhx5, integer6)));
+    public void fillItemCategory(final CreativeModeTab biy, final NonNullList<ItemStack> gi) {
+        if (biy == CreativeModeTab.TAB_SEARCH) {
+            for (final Enchantment bnw5 : Registry.ENCHANTMENT) {
+                if (bnw5.category != null) {
+                    for (int integer6 = bnw5.getMinLevel(); integer6 <= bnw5.getMaxLevel(); ++integer6) {
+                        gi.add(createForEnchantment(new EnchantmentInstance(bnw5, integer6)));
                     }
                 }
             }
         }
-        else if (bdd.getEnchantmentCategories().length != 0) {
-            for (final Enchantment bhx5 : Registry.ENCHANTMENT) {
-                if (bdd.hasEnchantmentCategory(bhx5.category)) {
-                    fy.add(createForEnchantment(new EnchantmentInstance(bhx5, bhx5.getMaxLevel())));
+        else if (biy.getEnchantmentCategories().length != 0) {
+            for (final Enchantment bnw5 : Registry.ENCHANTMENT) {
+                if (biy.hasEnchantmentCategory(bnw5.category)) {
+                    gi.add(createForEnchantment(new EnchantmentInstance(bnw5, bnw5.getMaxLevel())));
                 }
             }
         }
diff --git a/src/net/minecraft/world/item/EnchantedGoldenAppleItem.java b/src/net/minecraft/world/item/EnchantedGoldenAppleItem.java
index 8d82c39..75f571e 100644
--- a/src/net/minecraft/world/item/EnchantedGoldenAppleItem.java
+++ b/src/net/minecraft/world/item/EnchantedGoldenAppleItem.java
@@ -6,7 +6,7 @@ public class EnchantedGoldenAppleItem extends Item {
     }
     
     @Override
-    public boolean isFoil(final ItemStack ben) {
+    public boolean isFoil(final ItemStack bki) {
         return true;
     }
 }
diff --git a/src/net/minecraft/world/item/EndCrystalItem.java b/src/net/minecraft/world/item/EndCrystalItem.java
index 5f1b9ec..aa96c5a 100644
--- a/src/net/minecraft/world/item/EndCrystalItem.java
+++ b/src/net/minecraft/world/item/EndCrystalItem.java
@@ -5,8 +5,8 @@ import java.util.List;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.dimension.end.TheEndDimension;
 import net.minecraft.world.entity.boss.enderdragon.EndCrystal;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.block.Blocks;
@@ -18,39 +18,39 @@ public class EndCrystalItem extends Item {
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final BlockState byj5 = bjw3.getBlockState(fk4);
-        if (byj5.getBlock() != Blocks.OBSIDIAN && byj5.getBlock() != Blocks.BEDROCK) {
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        final BlockState cfj5 = bqb3.getBlockState(fu4);
+        if (!cfj5.is(Blocks.OBSIDIAN) && !cfj5.is(Blocks.BEDROCK)) {
             return InteractionResult.FAIL;
         }
-        final BlockPos fk5 = fk4.above();
-        if (!bjw3.isEmptyBlock(fk5)) {
+        final BlockPos fu5 = fu4.above();
+        if (!bqb3.isEmptyBlock(fu5)) {
             return InteractionResult.FAIL;
         }
-        final double double7 = fk5.getX();
-        final double double8 = fk5.getY();
-        final double double9 = fk5.getZ();
-        final List<Entity> list13 = bjw3.getEntities(null, new AABB(double7, double8, double9, double7 + 1.0, double8 + 2.0, double9 + 1.0));
+        final double double7 = fu5.getX();
+        final double double8 = fu5.getY();
+        final double double9 = fu5.getZ();
+        final List<Entity> list13 = bqb3.getEntities(null, new AABB(double7, double8, double9, double7 + 1.0, double8 + 2.0, double9 + 1.0));
         if (!list13.isEmpty()) {
             return InteractionResult.FAIL;
         }
-        if (!bjw3.isClientSide) {
-            final EndCrystal aur14 = new EndCrystal(bjw3, double7 + 0.5, double8, double9 + 0.5);
-            aur14.setShowBottom(false);
-            bjw3.addFreshEntity(aur14);
-            if (bjw3.dimension instanceof TheEndDimension) {
-                final EndDragonFight cbm15 = ((TheEndDimension)bjw3.dimension).getDragonFight();
-                cbm15.tryRespawn();
+        if (bqb3 instanceof ServerLevel) {
+            final EndCrystal bab14 = new EndCrystal(bqb3, double7 + 0.5, double8, double9 + 0.5);
+            bab14.setShowBottom(false);
+            bqb3.addFreshEntity(bab14);
+            final EndDragonFight cii15 = ((ServerLevel)bqb3).dragonFight();
+            if (cii15 != null) {
+                cii15.tryRespawn();
             }
         }
-        bfz.getItemInHand().shrink(1);
-        return InteractionResult.SUCCESS;
+        blv.getItemInHand().shrink(1);
+        return InteractionResult.sidedSuccess(bqb3.isClientSide);
     }
     
     @Override
-    public boolean isFoil(final ItemStack ben) {
+    public boolean isFoil(final ItemStack bki) {
         return true;
     }
 }
diff --git a/src/net/minecraft/world/item/EnderEyeItem.java b/src/net/minecraft/world/item/EnderEyeItem.java
index f874cbe..f8cce75 100644
--- a/src/net/minecraft/world/item/EnderEyeItem.java
+++ b/src/net/minecraft/world/item/EnderEyeItem.java
@@ -1,14 +1,15 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.projectile.EyeOfEnder;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.projectile.EyeOfEnder;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
@@ -33,63 +34,63 @@ public class EnderEyeItem extends Item {
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final BlockState byj5 = bjw3.getBlockState(fk4);
-        if (byj5.getBlock() != Blocks.END_PORTAL_FRAME || byj5.<Boolean>getValue((Property<Boolean>)EndPortalFrameBlock.HAS_EYE)) {
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        final BlockState cfj5 = bqb3.getBlockState(fu4);
+        if (!cfj5.is(Blocks.END_PORTAL_FRAME) || cfj5.<Boolean>getValue((Property<Boolean>)EndPortalFrameBlock.HAS_EYE)) {
             return InteractionResult.PASS;
         }
-        if (bjw3.isClientSide) {
+        if (bqb3.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        final BlockState byj6 = ((AbstractStateHolder<O, BlockState>)byj5).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, true);
-        Block.pushEntitiesUp(byj5, byj6, bjw3, fk4);
-        bjw3.setBlock(fk4, byj6, 2);
-        bjw3.updateNeighbourForOutputSignal(fk4, Blocks.END_PORTAL_FRAME);
-        bfz.getItemInHand().shrink(1);
-        bjw3.levelEvent(1503, fk4, 0);
-        final BlockPattern.BlockPatternMatch b7 = EndPortalFrameBlock.getOrCreatePortalShape().find(bjw3, fk4);
+        final BlockState cfj6 = ((StateHolder<O, BlockState>)cfj5).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, true);
+        Block.pushEntitiesUp(cfj5, cfj6, bqb3, fu4);
+        bqb3.setBlock(fu4, cfj6, 2);
+        bqb3.updateNeighbourForOutputSignal(fu4, Blocks.END_PORTAL_FRAME);
+        blv.getItemInHand().shrink(1);
+        bqb3.levelEvent(1503, fu4, 0);
+        final BlockPattern.BlockPatternMatch b7 = EndPortalFrameBlock.getOrCreatePortalShape().find(bqb3, fu4);
         if (b7 != null) {
-            final BlockPos fk5 = b7.getFrontTopLeft().offset(-3, 0, -3);
+            final BlockPos fu5 = b7.getFrontTopLeft().offset(-3, 0, -3);
             for (int integer9 = 0; integer9 < 3; ++integer9) {
                 for (int integer10 = 0; integer10 < 3; ++integer10) {
-                    bjw3.setBlock(fk5.offset(integer9, 0, integer10), Blocks.END_PORTAL.defaultBlockState(), 2);
+                    bqb3.setBlock(fu5.offset(integer9, 0, integer10), Blocks.END_PORTAL.defaultBlockState(), 2);
                 }
             }
-            bjw3.globalLevelEvent(1038, fk5.offset(1, 0, 1), 0);
+            bqb3.globalLevelEvent(1038, fu5.offset(1, 0, 1), 0);
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        final HitResult cvi6 = Item.getPlayerPOVHitResult(bjw, ayj, ClipContext.Fluid.NONE);
-        if (cvi6.getType() == HitResult.Type.BLOCK && bjw.getBlockState(((BlockHitResult)cvi6).getBlockPos()).getBlock() == Blocks.END_PORTAL_FRAME) {
-            return InteractionResultHolder.<ItemStack>pass(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        final HitResult dej6 = Item.getPlayerPOVHitResult(bqb, bec, ClipContext.Fluid.NONE);
+        if (dej6.getType() == HitResult.Type.BLOCK && bqb.getBlockState(((BlockHitResult)dej6).getBlockPos()).is(Blocks.END_PORTAL_FRAME)) {
+            return InteractionResultHolder.<ItemStack>pass(bki5);
         }
-        ayj.startUsingItem(ajk);
-        if (bjw instanceof ServerLevel) {
-            final BlockPos fk7 = ((ServerLevel)bjw).getChunkSource().getGenerator().findNearestMapFeature(bjw, "Stronghold", new BlockPos(ayj), 100, false);
-            if (fk7 != null) {
-                final EyeOfEnder ays8 = new EyeOfEnder(bjw, ayj.getX(), ayj.getY(0.5), ayj.getZ());
-                ays8.setItem(ben5);
-                ays8.signalTo(fk7);
-                bjw.addFreshEntity(ays8);
-                if (ayj instanceof ServerPlayer) {
-                    CriteriaTriggers.USED_ENDER_EYE.trigger((ServerPlayer)ayj, fk7);
+        bec.startUsingItem(anf);
+        if (bqb instanceof ServerLevel) {
+            final BlockPos fu7 = ((ServerLevel)bqb).getChunkSource().getGenerator().findNearestMapFeature((ServerLevel)bqb, StructureFeature.STRONGHOLD, bec.blockPosition(), 100, false);
+            if (fu7 != null) {
+                final EyeOfEnder bel8 = new EyeOfEnder(bqb, bec.getX(), bec.getY(0.5), bec.getZ());
+                bel8.setItem(bki5);
+                bel8.signalTo(fu7);
+                bqb.addFreshEntity(bel8);
+                if (bec instanceof ServerPlayer) {
+                    CriteriaTriggers.USED_ENDER_EYE.trigger((ServerPlayer)bec, fu7);
                 }
-                bjw.playSound(null, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.ENDER_EYE_LAUNCH, SoundSource.NEUTRAL, 0.5f, 0.4f / (EnderEyeItem.random.nextFloat() * 0.4f + 0.8f));
-                bjw.levelEvent(null, 1003, new BlockPos(ayj), 0);
-                if (!ayj.abilities.instabuild) {
-                    ben5.shrink(1);
+                bqb.playSound(null, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.ENDER_EYE_LAUNCH, SoundSource.NEUTRAL, 0.5f, 0.4f / (EnderEyeItem.random.nextFloat() * 0.4f + 0.8f));
+                bqb.levelEvent(null, 1003, bec.blockPosition(), 0);
+                if (!bec.abilities.instabuild) {
+                    bki5.shrink(1);
                 }
-                ayj.awardStat(Stats.ITEM_USED.get(this));
-                ayj.swing(ajk, true);
-                return InteractionResultHolder.<ItemStack>success(ben5);
+                bec.awardStat(Stats.ITEM_USED.get(this));
+                bec.swing(anf, true);
+                return InteractionResultHolder.<ItemStack>success(bki5);
             }
         }
-        return InteractionResultHolder.<ItemStack>consume(ben5);
+        return InteractionResultHolder.<ItemStack>consume(bki5);
     }
 }
diff --git a/src/net/minecraft/world/item/EnderpearlItem.java b/src/net/minecraft/world/item/EnderpearlItem.java
index 19b4d4f..839f462 100644
--- a/src/net/minecraft/world/item/EnderpearlItem.java
+++ b/src/net/minecraft/world/item/EnderpearlItem.java
@@ -18,20 +18,20 @@ public class EnderpearlItem extends Item {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        bjw.playSound(null, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.ENDER_PEARL_THROW, SoundSource.NEUTRAL, 0.5f, 0.4f / (EnderpearlItem.random.nextFloat() * 0.4f + 0.8f));
-        ayj.getCooldowns().addCooldown(this, 20);
-        if (!bjw.isClientSide) {
-            final ThrownEnderpearl azh6 = new ThrownEnderpearl(bjw, ayj);
-            azh6.setItem(ben5);
-            azh6.shootFromRotation(ayj, ayj.xRot, ayj.yRot, 0.0f, 1.5f, 1.0f);
-            bjw.addFreshEntity(azh6);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        bqb.playSound(null, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.ENDER_PEARL_THROW, SoundSource.NEUTRAL, 0.5f, 0.4f / (EnderpearlItem.random.nextFloat() * 0.4f + 0.8f));
+        bec.getCooldowns().addCooldown(this, 20);
+        if (!bqb.isClientSide) {
+            final ThrownEnderpearl bfb6 = new ThrownEnderpearl(bqb, bec);
+            bfb6.setItem(bki5);
+            bfb6.shootFromRotation(bec, bec.xRot, bec.yRot, 0.0f, 1.5f, 1.0f);
+            bqb.addFreshEntity(bfb6);
         }
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        if (!ayj.abilities.instabuild) {
-            ben5.shrink(1);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        if (!bec.abilities.instabuild) {
+            bki5.shrink(1);
         }
-        return InteractionResultHolder.<ItemStack>success(ben5);
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
     }
 }
diff --git a/src/net/minecraft/world/item/ExperienceBottleItem.java b/src/net/minecraft/world/item/ExperienceBottleItem.java
index 03f22aa..38a4000 100644
--- a/src/net/minecraft/world/item/ExperienceBottleItem.java
+++ b/src/net/minecraft/world/item/ExperienceBottleItem.java
@@ -18,24 +18,24 @@ public class ExperienceBottleItem extends Item {
     }
     
     @Override
-    public boolean isFoil(final ItemStack ben) {
+    public boolean isFoil(final ItemStack bki) {
         return true;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        bjw.playSound(null, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5f, 0.4f / (ExperienceBottleItem.random.nextFloat() * 0.4f + 0.8f));
-        if (!bjw.isClientSide) {
-            final ThrownExperienceBottle azi6 = new ThrownExperienceBottle(bjw, ayj);
-            azi6.setItem(ben5);
-            azi6.shootFromRotation(ayj, ayj.xRot, ayj.yRot, -20.0f, 0.7f, 1.0f);
-            bjw.addFreshEntity(azi6);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        bqb.playSound(null, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5f, 0.4f / (ExperienceBottleItem.random.nextFloat() * 0.4f + 0.8f));
+        if (!bqb.isClientSide) {
+            final ThrownExperienceBottle bfc6 = new ThrownExperienceBottle(bqb, bec);
+            bfc6.setItem(bki5);
+            bfc6.shootFromRotation(bec, bec.xRot, bec.yRot, -20.0f, 0.7f, 1.0f);
+            bqb.addFreshEntity(bfc6);
         }
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        if (!ayj.abilities.instabuild) {
-            ben5.shrink(1);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        if (!bec.abilities.instabuild) {
+            bki5.shrink(1);
         }
-        return InteractionResultHolder.<ItemStack>success(ben5);
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
     }
 }
diff --git a/src/net/minecraft/world/item/FireChargeItem.java b/src/net/minecraft/world/item/FireChargeItem.java
index 7e2b91a..f7b0c05 100644
--- a/src/net/minecraft/world/item/FireChargeItem.java
+++ b/src/net/minecraft/world/item/FireChargeItem.java
@@ -1,17 +1,17 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.FireBlock;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.BaseFireBlock;
 import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.CampfireBlock;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.InteractionResult;
 
 public class FireChargeItem extends Item {
@@ -20,34 +20,32 @@ public class FireChargeItem extends Item {
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        BlockPos fk4 = bfz.getClickedPos();
-        final BlockState byj5 = bjw3.getBlockState(fk4);
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        BlockPos fu4 = blv.getClickedPos();
+        final BlockState cfj5 = bqb3.getBlockState(fu4);
         boolean boolean6 = false;
-        if (byj5.getBlock() == Blocks.CAMPFIRE) {
-            if (!byj5.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT) && !byj5.<Boolean>getValue((Property<Boolean>)CampfireBlock.WATERLOGGED)) {
-                this.playSound(bjw3, fk4);
-                bjw3.setBlockAndUpdate(fk4, ((AbstractStateHolder<O, BlockState>)byj5).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.LIT, true));
-                boolean6 = true;
-            }
+        if (CampfireBlock.canLight(cfj5)) {
+            this.playSound(bqb3, fu4);
+            bqb3.setBlockAndUpdate(fu4, ((StateHolder<O, BlockState>)cfj5).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.LIT, true));
+            boolean6 = true;
         }
         else {
-            fk4 = fk4.relative(bfz.getClickedFace());
-            if (bjw3.getBlockState(fk4).isAir()) {
-                this.playSound(bjw3, fk4);
-                bjw3.setBlockAndUpdate(fk4, ((FireBlock)Blocks.FIRE).getStateForPlacement(bjw3, fk4));
+            fu4 = fu4.relative(blv.getClickedFace());
+            if (BaseFireBlock.canBePlacedAt(bqb3, fu4)) {
+                this.playSound(bqb3, fu4);
+                bqb3.setBlockAndUpdate(fu4, BaseFireBlock.getState(bqb3, fu4));
                 boolean6 = true;
             }
         }
         if (boolean6) {
-            bfz.getItemInHand().shrink(1);
-            return InteractionResult.SUCCESS;
+            blv.getItemInHand().shrink(1);
+            return InteractionResult.sidedSuccess(bqb3.isClientSide);
         }
         return InteractionResult.FAIL;
     }
     
-    private void playSound(final Level bjw, final BlockPos fk) {
-        bjw.playSound(null, fk, SoundEvents.FIRECHARGE_USE, SoundSource.BLOCKS, 1.0f, (FireChargeItem.random.nextFloat() - FireChargeItem.random.nextFloat()) * 0.2f + 1.0f);
+    private void playSound(final Level bqb, final BlockPos fu) {
+        bqb.playSound(null, fu, SoundEvents.FIRECHARGE_USE, SoundSource.BLOCKS, 1.0f, (FireChargeItem.random.nextFloat() - FireChargeItem.random.nextFloat()) * 0.2f + 1.0f);
     }
 }
diff --git a/src/net/minecraft/world/item/FireworkRocketItem.java b/src/net/minecraft/world/item/FireworkRocketItem.java
index f88779e..3d16359 100644
--- a/src/net/minecraft/world/item/FireworkRocketItem.java
+++ b/src/net/minecraft/world/item/FireworkRocketItem.java
@@ -29,49 +29,49 @@ public class FireworkRocketItem extends Item {
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        if (!bjw3.isClientSide) {
-            final ItemStack ben4 = bfz.getItemInHand();
-            final Vec3 cvl5 = bfz.getClickLocation();
-            final Direction fp6 = bfz.getClickedFace();
-            final FireworkRocketEntity ayu7 = new FireworkRocketEntity(bjw3, cvl5.x + fp6.getStepX() * 0.15, cvl5.y + fp6.getStepY() * 0.15, cvl5.z + fp6.getStepZ() * 0.15, ben4);
-            bjw3.addFreshEntity(ayu7);
-            ben4.shrink(1);
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        if (!bqb3.isClientSide) {
+            final ItemStack bki4 = blv.getItemInHand();
+            final Vec3 dem5 = blv.getClickLocation();
+            final Direction fz6 = blv.getClickedFace();
+            final FireworkRocketEntity ben7 = new FireworkRocketEntity(bqb3, blv.getPlayer(), dem5.x + fz6.getStepX() * 0.15, dem5.y + fz6.getStepY() * 0.15, dem5.z + fz6.getStepZ() * 0.15, bki4);
+            bqb3.addFreshEntity(ben7);
+            bki4.shrink(1);
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.sidedSuccess(bqb3.isClientSide);
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        if (ayj.isFallFlying()) {
-            final ItemStack ben5 = ayj.getItemInHand(ajk);
-            if (!bjw.isClientSide) {
-                bjw.addFreshEntity(new FireworkRocketEntity(bjw, ben5, ayj));
-                if (!ayj.abilities.instabuild) {
-                    ben5.shrink(1);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        if (bec.isFallFlying()) {
+            final ItemStack bki5 = bec.getItemInHand(anf);
+            if (!bqb.isClientSide) {
+                bqb.addFreshEntity(new FireworkRocketEntity(bqb, bki5, bec));
+                if (!bec.abilities.instabuild) {
+                    bki5.shrink(1);
                 }
             }
-            return InteractionResultHolder.<ItemStack>success(ayj.getItemInHand(ajk));
+            return InteractionResultHolder.<ItemStack>sidedSuccess(bec.getItemInHand(anf), bqb.isClientSide());
         }
-        return InteractionResultHolder.<ItemStack>pass(ayj.getItemInHand(ajk));
+        return InteractionResultHolder.<ItemStack>pass(bec.getItemInHand(anf));
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        final CompoundTag jt6 = ben.getTagElement("Fireworks");
-        if (jt6 == null) {
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        final CompoundTag le6 = bki.getTagElement("Fireworks");
+        if (le6 == null) {
             return;
         }
-        if (jt6.contains("Flight", 99)) {
-            list.add(new TranslatableComponent("item.minecraft.firework_rocket.flight", new Object[0]).append(" ").append(String.valueOf(jt6.getByte("Flight"))).withStyle(ChatFormatting.GRAY));
+        if (le6.contains("Flight", 99)) {
+            list.add(new TranslatableComponent("item.minecraft.firework_rocket.flight").append(" ").append(String.valueOf(le6.getByte("Flight"))).withStyle(ChatFormatting.GRAY));
         }
-        final ListTag jz7 = jt6.getList("Explosions", 10);
-        if (!jz7.isEmpty()) {
-            for (int integer8 = 0; integer8 < jz7.size(); ++integer8) {
-                final CompoundTag jt7 = jz7.getCompound(integer8);
+        final ListTag lk7 = le6.getList("Explosions", 10);
+        if (!lk7.isEmpty()) {
+            for (int integer8 = 0; integer8 < lk7.size(); ++integer8) {
+                final CompoundTag le7 = lk7.getCompound(integer8);
                 final List<Component> list2 = Lists.newArrayList();
-                FireworkStarItem.appendHoverText(jt7, list2);
+                FireworkStarItem.appendHoverText(le7, list2);
                 if (!list2.isEmpty()) {
                     for (int integer9 = 1; integer9 < list2.size(); ++integer9) {
                         list2.set(integer9, new TextComponent("  ").append(list2.get(integer9)).withStyle(ChatFormatting.GRAY));
diff --git a/src/net/minecraft/world/item/FireworkStarItem.java b/src/net/minecraft/world/item/FireworkStarItem.java
index b1b3691..e50a0f2 100644
--- a/src/net/minecraft/world/item/FireworkStarItem.java
+++ b/src/net/minecraft/world/item/FireworkStarItem.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.item;
 
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TranslatableComponent;
@@ -15,47 +16,47 @@ public class FireworkStarItem extends Item {
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        final CompoundTag jt6 = ben.getTagElement("Explosion");
-        if (jt6 != null) {
-            appendHoverText(jt6, list);
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        final CompoundTag le6 = bki.getTagElement("Explosion");
+        if (le6 != null) {
+            appendHoverText(le6, list);
         }
     }
     
-    public static void appendHoverText(final CompoundTag jt, final List<Component> list) {
-        final FireworkRocketItem.Shape a3 = FireworkRocketItem.Shape.byId(jt.getByte("Type"));
-        list.add(new TranslatableComponent("item.minecraft.firework_star.shape." + a3.getName(), new Object[0]).withStyle(ChatFormatting.GRAY));
-        final int[] arr4 = jt.getIntArray("Colors");
+    public static void appendHoverText(final CompoundTag le, final List<Component> list) {
+        final FireworkRocketItem.Shape a3 = FireworkRocketItem.Shape.byId(le.getByte("Type"));
+        list.add(new TranslatableComponent("item.minecraft.firework_star.shape." + a3.getName()).withStyle(ChatFormatting.GRAY));
+        final int[] arr4 = le.getIntArray("Colors");
         if (arr4.length > 0) {
             list.add(appendColors(new TextComponent("").withStyle(ChatFormatting.GRAY), arr4));
         }
-        final int[] arr5 = jt.getIntArray("FadeColors");
+        final int[] arr5 = le.getIntArray("FadeColors");
         if (arr5.length > 0) {
-            list.add(appendColors(new TranslatableComponent("item.minecraft.firework_star.fade_to", new Object[0]).append(" ").withStyle(ChatFormatting.GRAY), arr5));
+            list.add(appendColors(new TranslatableComponent("item.minecraft.firework_star.fade_to").append(" ").withStyle(ChatFormatting.GRAY), arr5));
         }
-        if (jt.getBoolean("Trail")) {
-            list.add(new TranslatableComponent("item.minecraft.firework_star.trail", new Object[0]).withStyle(ChatFormatting.GRAY));
+        if (le.getBoolean("Trail")) {
+            list.add(new TranslatableComponent("item.minecraft.firework_star.trail").withStyle(ChatFormatting.GRAY));
         }
-        if (jt.getBoolean("Flicker")) {
-            list.add(new TranslatableComponent("item.minecraft.firework_star.flicker", new Object[0]).withStyle(ChatFormatting.GRAY));
+        if (le.getBoolean("Flicker")) {
+            list.add(new TranslatableComponent("item.minecraft.firework_star.flicker").withStyle(ChatFormatting.GRAY));
         }
     }
     
-    private static Component appendColors(final Component lf, final int[] arr) {
+    private static Component appendColors(final MutableComponent mx, final int[] arr) {
         for (int integer3 = 0; integer3 < arr.length; ++integer3) {
             if (integer3 > 0) {
-                lf.append(", ");
+                mx.append(", ");
             }
-            lf.append(getColorName(arr[integer3]));
+            mx.append(getColorName(arr[integer3]));
         }
-        return lf;
+        return mx;
     }
     
     private static Component getColorName(final int integer) {
-        final DyeColor bdj2 = DyeColor.byFireworkColor(integer);
-        if (bdj2 == null) {
-            return new TranslatableComponent("item.minecraft.firework_star.custom_color", new Object[0]);
+        final DyeColor bje2 = DyeColor.byFireworkColor(integer);
+        if (bje2 == null) {
+            return new TranslatableComponent("item.minecraft.firework_star.custom_color");
         }
-        return new TranslatableComponent("item.minecraft.firework_star." + bdj2.getName(), new Object[0]);
+        return new TranslatableComponent("item.minecraft.firework_star." + bje2.getName());
     }
 }
diff --git a/src/net/minecraft/world/item/FishBucketItem.java b/src/net/minecraft/world/item/FishBucketItem.java
index 90fa9d3..e4045d7 100644
--- a/src/net/minecraft/world/item/FishBucketItem.java
+++ b/src/net/minecraft/world/item/FishBucketItem.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.item;
 
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.animal.TropicalFish;
@@ -22,52 +23,52 @@ import net.minecraft.world.entity.EntityType;
 public class FishBucketItem extends BucketItem {
     private final EntityType<?> type;
     
-    public FishBucketItem(final EntityType<?> aku, final Fluid coi, final Properties a) {
-        super(coi, a);
-        this.type = aku;
+    public FishBucketItem(final EntityType<?> aoq, final Fluid cwz, final Properties a) {
+        super(cwz, a);
+        this.type = aoq;
     }
     
     @Override
-    public void checkExtraContent(final Level bjw, final ItemStack ben, final BlockPos fk) {
-        if (!bjw.isClientSide) {
-            this.spawn(bjw, ben, fk);
+    public void checkExtraContent(final Level bqb, final ItemStack bki, final BlockPos fu) {
+        if (!bqb.isClientSide) {
+            this.spawn(bqb, bki, fu);
         }
     }
     
     @Override
-    protected void playEmptySound(@Nullable final Player ayj, final LevelAccessor bjx, final BlockPos fk) {
-        bjx.playSound(ayj, fk, SoundEvents.BUCKET_EMPTY_FISH, SoundSource.NEUTRAL, 1.0f, 1.0f);
+    protected void playEmptySound(@Nullable final Player bec, final LevelAccessor bqc, final BlockPos fu) {
+        bqc.playSound(bec, fu, SoundEvents.BUCKET_EMPTY_FISH, SoundSource.NEUTRAL, 1.0f, 1.0f);
     }
     
-    private void spawn(final Level bjw, final ItemStack ben, final BlockPos fk) {
-        final Entity akq5 = this.type.spawn(bjw, ben, null, fk, MobSpawnType.BUCKET, true, false);
-        if (akq5 != null) {
-            ((AbstractFish)akq5).setFromBucket(true);
+    private void spawn(final Level bqb, final ItemStack bki, final BlockPos fu) {
+        final Entity aom5 = this.type.spawn(bqb, bki, null, fu, MobSpawnType.BUCKET, true, false);
+        if (aom5 != null) {
+            ((AbstractFish)aom5).setFromBucket(true);
         }
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
         if (this.type == EntityType.TROPICAL_FISH) {
-            final CompoundTag jt6 = ben.getTag();
-            if (jt6 != null && jt6.contains("BucketVariantTag", 3)) {
-                final int integer7 = jt6.getInt("BucketVariantTag");
+            final CompoundTag le6 = bki.getTag();
+            if (le6 != null && le6.contains("BucketVariantTag", 3)) {
+                final int integer7 = le6.getInt("BucketVariantTag");
                 final ChatFormatting[] arr8 = { ChatFormatting.ITALIC, ChatFormatting.GRAY };
                 final String string9 = "color.minecraft." + TropicalFish.getBaseColor(integer7);
                 final String string10 = "color.minecraft." + TropicalFish.getPatternColor(integer7);
                 for (int integer8 = 0; integer8 < TropicalFish.COMMON_VARIANTS.length; ++integer8) {
                     if (integer7 == TropicalFish.COMMON_VARIANTS[integer8]) {
-                        list.add(new TranslatableComponent(TropicalFish.getPredefinedName(integer8), new Object[0]).withStyle(arr8));
+                        list.add(new TranslatableComponent(TropicalFish.getPredefinedName(integer8)).withStyle(arr8));
                         return;
                     }
                 }
-                list.add(new TranslatableComponent(TropicalFish.getFishTypeName(integer7), new Object[0]).withStyle(arr8));
-                final Component lf11 = new TranslatableComponent(string9, new Object[0]);
+                list.add(new TranslatableComponent(TropicalFish.getFishTypeName(integer7)).withStyle(arr8));
+                final MutableComponent mx11 = new TranslatableComponent(string9);
                 if (!string9.equals(string10)) {
-                    lf11.append(", ").append(new TranslatableComponent(string10, new Object[0]));
+                    mx11.append(", ").append(new TranslatableComponent(string10));
                 }
-                lf11.withStyle(arr8);
-                list.add(lf11);
+                mx11.withStyle(arr8);
+                list.add(mx11);
             }
         }
     }
diff --git a/src/net/minecraft/world/item/FishingRodItem.java b/src/net/minecraft/world/item/FishingRodItem.java
index eefc4df..1fef51d 100644
--- a/src/net/minecraft/world/item/FishingRodItem.java
+++ b/src/net/minecraft/world/item/FishingRodItem.java
@@ -1,59 +1,42 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.fishing.FishingHook;
+import net.minecraft.world.entity.projectile.FishingHook;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.Level;
 
-public class FishingRodItem extends Item {
+public class FishingRodItem extends Item implements Vanishable {
     public FishingRodItem(final Properties a) {
         super(a);
-        boolean boolean4;
-        boolean boolean5;
-        this.addProperty(new ResourceLocation("cast"), (ben, bjw, akz) -> {
-            if (akz == null) {
-                return 0.0f;
-            }
-            else {
-                boolean4 = (akz.getMainHandItem() == ben);
-                boolean5 = (akz.getOffhandItem() == ben);
-                if (akz.getMainHandItem().getItem() instanceof FishingRodItem) {
-                    boolean5 = false;
-                }
-                return ((boolean4 || boolean5) && akz instanceof Player && akz.fishing != null) ? 1.0f : 0.0f;
-            }
-        });
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        if (ayj.fishing != null) {
-            if (!bjw.isClientSide) {
-                final int integer6 = ayj.fishing.retrieve(ben5);
-                ben5.<Player>hurtAndBreak(integer6, ayj, ayj -> ayj.broadcastBreakEvent(ajk));
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        if (bec.fishing != null) {
+            if (!bqb.isClientSide) {
+                final int integer6 = bec.fishing.retrieve(bki5);
+                bki5.<Player>hurtAndBreak(integer6, bec, bec -> bec.broadcastBreakEvent(anf));
             }
-            bjw.playSound(null, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.FISHING_BOBBER_RETRIEVE, SoundSource.NEUTRAL, 1.0f, 0.4f / (FishingRodItem.random.nextFloat() * 0.4f + 0.8f));
+            bqb.playSound(null, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.FISHING_BOBBER_RETRIEVE, SoundSource.NEUTRAL, 1.0f, 0.4f / (FishingRodItem.random.nextFloat() * 0.4f + 0.8f));
         }
         else {
-            bjw.playSound(null, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.FISHING_BOBBER_THROW, SoundSource.NEUTRAL, 0.5f, 0.4f / (FishingRodItem.random.nextFloat() * 0.4f + 0.8f));
-            if (!bjw.isClientSide) {
-                final int integer6 = EnchantmentHelper.getFishingSpeedBonus(ben5);
-                final int integer7 = EnchantmentHelper.getFishingLuckBonus(ben5);
-                bjw.addFreshEntity(new FishingHook(ayj, bjw, integer7, integer6));
+            bqb.playSound(null, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.FISHING_BOBBER_THROW, SoundSource.NEUTRAL, 0.5f, 0.4f / (FishingRodItem.random.nextFloat() * 0.4f + 0.8f));
+            if (!bqb.isClientSide) {
+                final int integer6 = EnchantmentHelper.getFishingSpeedBonus(bki5);
+                final int integer7 = EnchantmentHelper.getFishingLuckBonus(bki5);
+                bqb.addFreshEntity(new FishingHook(bec, bqb, integer7, integer6));
             }
-            ayj.awardStat(Stats.ITEM_USED.get(this));
+            bec.awardStat(Stats.ITEM_USED.get(this));
         }
-        return InteractionResultHolder.<ItemStack>success(ben5);
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/FlintAndSteelItem.java b/src/net/minecraft/world/item/FlintAndSteelItem.java
index 6676d83..657d40b 100644
--- a/src/net/minecraft/world/item/FlintAndSteelItem.java
+++ b/src/net/minecraft/world/item/FlintAndSteelItem.java
@@ -1,23 +1,19 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import java.util.Iterator;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.NetherPortalBlock;
-import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.FireBlock;
+import net.minecraft.world.level.block.BaseFireBlock;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.block.CampfireBlock;
 import net.minecraft.world.InteractionResult;
 
 public class FlintAndSteelItem extends Item {
@@ -26,46 +22,31 @@ public class FlintAndSteelItem extends Item {
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Player ayj2 = bfz.getPlayer();
-        final LevelAccessor bjx4 = bfz.getLevel();
-        final BlockPos fk5 = bfz.getClickedPos();
-        final BlockState byj6 = bjx4.getBlockState(fk5);
-        if (canLightCampFire(byj6)) {
-            bjx4.playSound(ayj2, fk5, SoundEvents.FLINTANDSTEEL_USE, SoundSource.BLOCKS, 1.0f, FlintAndSteelItem.random.nextFloat() * 0.4f + 0.8f);
-            bjx4.setBlock(fk5, ((AbstractStateHolder<O, BlockState>)byj6).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.LIT, true), 11);
-            if (ayj2 != null) {
-                bfz.getItemInHand().<Player>hurtAndBreak(1, ayj2, ayj -> ayj.broadcastBreakEvent(bfz.getHand()));
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Player bec2 = blv.getPlayer();
+        final LevelAccessor bqc4 = blv.getLevel();
+        final BlockPos fu5 = blv.getClickedPos();
+        final BlockState cfj6 = bqc4.getBlockState(fu5);
+        if (CampfireBlock.canLight(cfj6)) {
+            bqc4.playSound(bec2, fu5, SoundEvents.FLINTANDSTEEL_USE, SoundSource.BLOCKS, 1.0f, FlintAndSteelItem.random.nextFloat() * 0.4f + 0.8f);
+            bqc4.setBlock(fu5, ((StateHolder<O, BlockState>)cfj6).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.LIT, true), 11);
+            if (bec2 != null) {
+                blv.getItemInHand().<Player>hurtAndBreak(1, bec2, bec -> bec.broadcastBreakEvent(blv.getHand()));
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqc4.isClientSide());
         }
-        final BlockPos fk6 = fk5.relative(bfz.getClickedFace());
-        if (canUse(bjx4.getBlockState(fk6), bjx4, fk6)) {
-            bjx4.playSound(ayj2, fk6, SoundEvents.FLINTANDSTEEL_USE, SoundSource.BLOCKS, 1.0f, FlintAndSteelItem.random.nextFloat() * 0.4f + 0.8f);
-            final BlockState byj7 = ((FireBlock)Blocks.FIRE).getStateForPlacement(bjx4, fk6);
-            bjx4.setBlock(fk6, byj7, 11);
-            final ItemStack ben9 = bfz.getItemInHand();
-            if (ayj2 instanceof ServerPlayer) {
-                CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer)ayj2, fk6, ben9);
-                ben9.<Player>hurtAndBreak(1, ayj2, ayj -> ayj.broadcastBreakEvent(bfz.getHand()));
+        final BlockPos fu6 = fu5.relative(blv.getClickedFace());
+        if (BaseFireBlock.canBePlacedAt(bqc4, fu6)) {
+            bqc4.playSound(bec2, fu6, SoundEvents.FLINTANDSTEEL_USE, SoundSource.BLOCKS, 1.0f, FlintAndSteelItem.random.nextFloat() * 0.4f + 0.8f);
+            final BlockState cfj7 = BaseFireBlock.getState(bqc4, fu6);
+            bqc4.setBlock(fu6, cfj7, 11);
+            final ItemStack bki9 = blv.getItemInHand();
+            if (bec2 instanceof ServerPlayer) {
+                CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer)bec2, fu6, bki9);
+                bki9.<Player>hurtAndBreak(1, bec2, bec -> bec.broadcastBreakEvent(blv.getHand()));
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqc4.isClientSide());
         }
         return InteractionResult.FAIL;
     }
-    
-    public static boolean canLightCampFire(final BlockState byj) {
-        return byj.getBlock() == Blocks.CAMPFIRE && !byj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED) && !byj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.LIT);
-    }
-    
-    public static boolean canUse(final BlockState byj, final LevelAccessor bjx, final BlockPos fk) {
-        final BlockState byj2 = ((FireBlock)Blocks.FIRE).getStateForPlacement(bjx, fk);
-        boolean boolean5 = false;
-        for (final Direction fp7 : Direction.Plane.HORIZONTAL) {
-            if (bjx.getBlockState(fk.relative(fp7)).getBlock() == Blocks.OBSIDIAN && ((NetherPortalBlock)Blocks.NETHER_PORTAL).isPortal(bjx, fk) != null) {
-                boolean5 = true;
-            }
-        }
-        return byj.isAir() && (byj2.canSurvive(bjx, fk) || boolean5);
-    }
 }
diff --git a/src/net/minecraft/world/item/FoodOnAStickItem.java b/src/net/minecraft/world/item/FoodOnAStickItem.java
new file mode 100644
index 0000000..e95f124
--- /dev/null
+++ b/src/net/minecraft/world/item/FoodOnAStickItem.java
@@ -0,0 +1,45 @@
+package net.minecraft.world.item;
+
+import net.minecraft.stats.Stat;
+import net.minecraft.stats.Stats;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.entity.ItemSteerable;
+import net.minecraft.world.InteractionResultHolder;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.entity.EntityType;
+
+public class FoodOnAStickItem<T extends Entity> extends Item {
+    private final EntityType<T> canInteractWith;
+    private final int consumeItemDamage;
+    
+    public FoodOnAStickItem(final Properties a, final EntityType<T> aoq, final int integer) {
+        super(a);
+        this.canInteractWith = aoq;
+        this.consumeItemDamage = integer;
+    }
+    
+    @Override
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        if (bqb.isClientSide) {
+            return InteractionResultHolder.<ItemStack>pass(bki5);
+        }
+        final Entity aom6 = bec.getVehicle();
+        if (bec.isPassenger() && aom6 instanceof ItemSteerable && aom6.getType() == this.canInteractWith) {
+            final ItemSteerable aow7 = (ItemSteerable)aom6;
+            if (aow7.boost()) {
+                bki5.<Player>hurtAndBreak(this.consumeItemDamage, bec, bec -> bec.broadcastBreakEvent(anf));
+                if (bki5.isEmpty()) {
+                    final ItemStack bki6 = new ItemStack(Items.FISHING_ROD);
+                    bki6.setTag(bki5.getTag());
+                    return InteractionResultHolder.<ItemStack>success(bki6);
+                }
+                return InteractionResultHolder.<ItemStack>success(bki5);
+            }
+        }
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        return InteractionResultHolder.<ItemStack>pass(bki5);
+    }
+}
diff --git a/src/net/minecraft/world/item/GameMasterBlockItem.java b/src/net/minecraft/world/item/GameMasterBlockItem.java
index 6ca22ad..69570cb 100644
--- a/src/net/minecraft/world/item/GameMasterBlockItem.java
+++ b/src/net/minecraft/world/item/GameMasterBlockItem.java
@@ -6,14 +6,14 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Block;
 
 public class GameMasterBlockItem extends BlockItem {
-    public GameMasterBlockItem(final Block bph, final Properties a) {
-        super(bph, a);
+    public GameMasterBlockItem(final Block bvr, final Properties a) {
+        super(bvr, a);
     }
     
     @Nullable
     @Override
-    protected BlockState getPlacementState(final BlockPlaceContext bcq) {
-        final Player ayj3 = bcq.getPlayer();
-        return (ayj3 == null || ayj3.canUseGameMasterBlocks()) ? super.getPlacementState(bcq) : null;
+    protected BlockState getPlacementState(final BlockPlaceContext bin) {
+        final Player bec3 = bin.getPlayer();
+        return (bec3 == null || bec3.canUseGameMasterBlocks()) ? super.getPlacementState(bin) : null;
     }
 }
diff --git a/src/net/minecraft/world/item/HangingEntityItem.java b/src/net/minecraft/world/item/HangingEntityItem.java
index 37e9236..9e4c2ef 100644
--- a/src/net/minecraft/world/item/HangingEntityItem.java
+++ b/src/net/minecraft/world/item/HangingEntityItem.java
@@ -15,48 +15,48 @@ import net.minecraft.world.entity.EntityType;
 public class HangingEntityItem extends Item {
     private final EntityType<? extends HangingEntity> type;
     
-    public HangingEntityItem(final EntityType<? extends HangingEntity> aku, final Properties a) {
+    public HangingEntityItem(final EntityType<? extends HangingEntity> aoq, final Properties a) {
         super(a);
-        this.type = aku;
+        this.type = aoq;
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final BlockPos fk3 = bfz.getClickedPos();
-        final Direction fp4 = bfz.getClickedFace();
-        final BlockPos fk4 = fk3.relative(fp4);
-        final Player ayj6 = bfz.getPlayer();
-        final ItemStack ben7 = bfz.getItemInHand();
-        if (ayj6 != null && !this.mayPlace(ayj6, fp4, ben7, fk4)) {
+    public InteractionResult useOn(final UseOnContext blv) {
+        final BlockPos fu3 = blv.getClickedPos();
+        final Direction fz4 = blv.getClickedFace();
+        final BlockPos fu4 = fu3.relative(fz4);
+        final Player bec6 = blv.getPlayer();
+        final ItemStack bki7 = blv.getItemInHand();
+        if (bec6 != null && !this.mayPlace(bec6, fz4, bki7, fu4)) {
             return InteractionResult.FAIL;
         }
-        final Level bjw8 = bfz.getLevel();
-        HangingEntity avq9;
+        final Level bqb8 = blv.getLevel();
+        HangingEntity baz9;
         if (this.type == EntityType.PAINTING) {
-            avq9 = new Painting(bjw8, fk4, fp4);
+            baz9 = new Painting(bqb8, fu4, fz4);
         }
         else {
             if (this.type != EntityType.ITEM_FRAME) {
-                return InteractionResult.SUCCESS;
+                return InteractionResult.sidedSuccess(bqb8.isClientSide);
             }
-            avq9 = new ItemFrame(bjw8, fk4, fp4);
+            baz9 = new ItemFrame(bqb8, fu4, fz4);
         }
-        final CompoundTag jt10 = ben7.getTag();
-        if (jt10 != null) {
-            EntityType.updateCustomEntityTag(bjw8, ayj6, avq9, jt10);
+        final CompoundTag le10 = bki7.getTag();
+        if (le10 != null) {
+            EntityType.updateCustomEntityTag(bqb8, bec6, baz9, le10);
         }
-        if (avq9.survives()) {
-            if (!bjw8.isClientSide) {
-                avq9.playPlacementSound();
-                bjw8.addFreshEntity(avq9);
+        if (baz9.survives()) {
+            if (!bqb8.isClientSide) {
+                baz9.playPlacementSound();
+                bqb8.addFreshEntity(baz9);
             }
-            ben7.shrink(1);
-            return InteractionResult.SUCCESS;
+            bki7.shrink(1);
+            return InteractionResult.sidedSuccess(bqb8.isClientSide);
         }
         return InteractionResult.CONSUME;
     }
     
-    protected boolean mayPlace(final Player ayj, final Direction fp, final ItemStack ben, final BlockPos fk) {
-        return !fp.getAxis().isVertical() && ayj.mayUseItemAt(fk, fp, ben);
+    protected boolean mayPlace(final Player bec, final Direction fz, final ItemStack bki, final BlockPos fu) {
+        return !fz.getAxis().isVertical() && bec.mayUseItemAt(fu, fz, bki);
     }
 }
diff --git a/src/net/minecraft/world/item/HoeItem.java b/src/net/minecraft/world/item/HoeItem.java
index 466b527..66d4b09 100644
--- a/src/net/minecraft/world/item/HoeItem.java
+++ b/src/net/minecraft/world/item/HoeItem.java
@@ -2,12 +2,8 @@ package net.minecraft.world.item;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
-import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import com.google.common.collect.Multimap;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.player.Player;
@@ -16,56 +12,41 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.core.Direction;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Block;
 import java.util.Map;
+import net.minecraft.world.level.block.Block;
+import java.util.Set;
 
-public class HoeItem extends TieredItem {
-    private final float attackSpeed;
+public class HoeItem extends DiggerItem {
+    private static final Set<Block> DIGGABLES;
     protected static final Map<Block, BlockState> TILLABLES;
     
-    public HoeItem(final Tier bfs, final float float2, final Properties a) {
-        super(bfs, a);
-        this.attackSpeed = float2;
+    protected HoeItem(final Tier blo, final int integer, final float float3, final Properties a) {
+        super((float)integer, float3, blo, HoeItem.DIGGABLES, a);
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        if (bfz.getClickedFace() != Direction.DOWN && bjw3.getBlockState(fk4.above()).isAir()) {
-            final BlockState byj5 = HoeItem.TILLABLES.get(bjw3.getBlockState(fk4).getBlock());
-            if (byj5 != null) {
-                final Player ayj2 = bfz.getPlayer();
-                bjw3.playSound(ayj2, fk4, SoundEvents.HOE_TILL, SoundSource.BLOCKS, 1.0f, 1.0f);
-                if (!bjw3.isClientSide) {
-                    bjw3.setBlock(fk4, byj5, 11);
-                    if (ayj2 != null) {
-                        bfz.getItemInHand().<Player>hurtAndBreak(1, ayj2, ayj -> ayj.broadcastBreakEvent(bfz.getHand()));
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        if (blv.getClickedFace() != Direction.DOWN && bqb3.getBlockState(fu4.above()).isAir()) {
+            final BlockState cfj5 = HoeItem.TILLABLES.get(bqb3.getBlockState(fu4).getBlock());
+            if (cfj5 != null) {
+                final Player bec2 = blv.getPlayer();
+                bqb3.playSound(bec2, fu4, SoundEvents.HOE_TILL, SoundSource.BLOCKS, 1.0f, 1.0f);
+                if (!bqb3.isClientSide) {
+                    bqb3.setBlock(fu4, cfj5, 11);
+                    if (bec2 != null) {
+                        blv.getItemInHand().<Player>hurtAndBreak(1, bec2, bec -> bec.broadcastBreakEvent(blv.getHand()));
                     }
                 }
-                return InteractionResult.SUCCESS;
+                return InteractionResult.sidedSuccess(bqb3.isClientSide);
             }
         }
         return InteractionResult.PASS;
     }
     
-    @Override
-    public boolean hurtEnemy(final ItemStack ben, final LivingEntity akz2, final LivingEntity akz3) {
-        ben.<LivingEntity>hurtAndBreak(1, akz3, akz -> akz.broadcastBreakEvent(EquipmentSlot.MAINHAND));
-        return true;
-    }
-    
-    @Override
-    public Multimap<String, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot akv) {
-        final Multimap<String, AttributeModifier> multimap3 = super.getDefaultAttributeModifiers(akv);
-        if (akv == EquipmentSlot.MAINHAND) {
-            multimap3.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(HoeItem.BASE_ATTACK_DAMAGE_UUID, "Weapon modifier", 0.0, AttributeModifier.Operation.ADDITION));
-            multimap3.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(HoeItem.BASE_ATTACK_SPEED_UUID, "Weapon modifier", this.attackSpeed, AttributeModifier.Operation.ADDITION));
-        }
-        return multimap3;
-    }
-    
     static {
+        DIGGABLES = ImmutableSet.<Block>of(Blocks.NETHER_WART_BLOCK, Blocks.WARPED_WART_BLOCK, Blocks.HAY_BLOCK, Blocks.DRIED_KELP_BLOCK, Blocks.TARGET, Blocks.SHROOMLIGHT, Blocks.SPONGE, Blocks.WET_SPONGE, Blocks.JUNGLE_LEAVES, Blocks.OAK_LEAVES, Blocks.SPRUCE_LEAVES, Blocks.DARK_OAK_LEAVES, Blocks.ACACIA_LEAVES, Blocks.BIRCH_LEAVES);
         TILLABLES = Maps.newHashMap(ImmutableMap.<Block, BlockState>of(Blocks.GRASS_BLOCK, Blocks.FARMLAND.defaultBlockState(), Blocks.GRASS_PATH, Blocks.FARMLAND.defaultBlockState(), Blocks.DIRT, Blocks.FARMLAND.defaultBlockState(), Blocks.COARSE_DIRT, Blocks.DIRT.defaultBlockState()));
     }
 }
diff --git a/src/net/minecraft/world/item/HoneyBottleItem.java b/src/net/minecraft/world/item/HoneyBottleItem.java
index 9e5e766..af70b11 100644
--- a/src/net/minecraft/world/item/HoneyBottleItem.java
+++ b/src/net/minecraft/world/item/HoneyBottleItem.java
@@ -20,36 +20,36 @@ public class HoneyBottleItem extends Item {
     }
     
     @Override
-    public ItemStack finishUsingItem(final ItemStack ben, final Level bjw, final LivingEntity akz) {
-        super.finishUsingItem(ben, bjw, akz);
-        if (akz instanceof ServerPlayer) {
-            final ServerPlayer xe5 = (ServerPlayer)akz;
-            CriteriaTriggers.CONSUME_ITEM.trigger(xe5, ben);
-            xe5.awardStat(Stats.ITEM_USED.get(this));
+    public ItemStack finishUsingItem(final ItemStack bki, final Level bqb, final LivingEntity aoy) {
+        super.finishUsingItem(bki, bqb, aoy);
+        if (aoy instanceof ServerPlayer) {
+            final ServerPlayer ze5 = (ServerPlayer)aoy;
+            CriteriaTriggers.CONSUME_ITEM.trigger(ze5, bki);
+            ze5.awardStat(Stats.ITEM_USED.get(this));
         }
-        if (!bjw.isClientSide) {
-            akz.removeEffect(MobEffects.POISON);
+        if (!bqb.isClientSide) {
+            aoy.removeEffect(MobEffects.POISON);
         }
-        if (ben.isEmpty()) {
+        if (bki.isEmpty()) {
             return new ItemStack(Items.GLASS_BOTTLE);
         }
-        if (akz instanceof Player && !((Player)akz).abilities.instabuild) {
-            final ItemStack ben2 = new ItemStack(Items.GLASS_BOTTLE);
-            final Player ayj6 = (Player)akz;
-            if (!ayj6.inventory.add(ben2)) {
-                ayj6.drop(ben2, false);
+        if (aoy instanceof Player && !((Player)aoy).abilities.instabuild) {
+            final ItemStack bki2 = new ItemStack(Items.GLASS_BOTTLE);
+            final Player bec6 = (Player)aoy;
+            if (!bec6.inventory.add(bki2)) {
+                bec6.drop(bki2, false);
             }
         }
-        return ben;
+        return bki;
     }
     
     @Override
-    public int getUseDuration(final ItemStack ben) {
+    public int getUseDuration(final ItemStack bki) {
         return 40;
     }
     
     @Override
-    public UseAnim getUseAnimation(final ItemStack ben) {
+    public UseAnim getUseAnimation(final ItemStack bki) {
         return UseAnim.DRINK;
     }
     
@@ -64,8 +64,7 @@ public class HoneyBottleItem extends Item {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        ayj.startUsingItem(ajk);
-        return InteractionResultHolder.<ItemStack>success(ayj.getItemInHand(ajk));
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        return ItemUtils.useDrink(bqb, bec, anf);
     }
 }
diff --git a/src/net/minecraft/world/item/Item.java b/src/net/minecraft/world/item/Item.java
index 268f568..d9dcc81 100644
--- a/src/net/minecraft/world/item/Item.java
+++ b/src/net/minecraft/world/item/Item.java
@@ -1,17 +1,19 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.entity.HumanoidArm;
+import com.google.common.collect.Maps;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.tags.Tag;
-import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableMultimap;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.entity.ai.attributes.Attribute;
 import com.google.common.collect.Multimap;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.util.Mth;
-import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.level.ClipContext;
 import java.util.List;
 import net.minecraft.world.entity.Entity;
@@ -27,11 +29,9 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
-import com.google.common.collect.Maps;
 import net.minecraft.core.Registry;
 import net.minecraft.world.food.FoodProperties;
 import javax.annotation.Nullable;
-import net.minecraft.resources.ResourceLocation;
 import java.util.Random;
 import java.util.UUID;
 import net.minecraft.world.level.block.Block;
@@ -40,27 +40,22 @@ import net.minecraft.world.level.ItemLike;
 
 public class Item implements ItemLike {
     public static final Map<Block, Item> BY_BLOCK;
-    private static final ItemPropertyFunction PROPERTY_DAMAGED;
-    private static final ItemPropertyFunction PROPERTY_DAMAGE;
-    private static final ItemPropertyFunction PROPERTY_LEFTHANDED;
-    private static final ItemPropertyFunction PROPERTY_COOLDOWN;
-    private static final ItemPropertyFunction PROPERTY_CUSTOM_MODEL_DATA;
     protected static final UUID BASE_ATTACK_DAMAGE_UUID;
     protected static final UUID BASE_ATTACK_SPEED_UUID;
     protected static final Random random;
-    private final Map<ResourceLocation, ItemPropertyFunction> properties;
     protected final CreativeModeTab category;
     private final Rarity rarity;
     private final int maxStackSize;
     private final int maxDamage;
+    private final boolean isFireResistant;
     private final Item craftingRemainingItem;
     @Nullable
     private String descriptionId;
     @Nullable
     private final FoodProperties foodProperties;
     
-    public static int getId(final Item bei) {
-        return (bei == null) ? 0 : Registry.ITEM.getId(bei);
+    public static int getId(final Item bke) {
+        return (bke == null) ? 0 : Registry.ITEM.getId(bke);
     }
     
     public static Item byId(final int integer) {
@@ -68,44 +63,28 @@ public class Item implements ItemLike {
     }
     
     @Deprecated
-    public static Item byBlock(final Block bph) {
-        return Item.BY_BLOCK.getOrDefault(bph, Items.AIR);
+    public static Item byBlock(final Block bvr) {
+        return Item.BY_BLOCK.getOrDefault(bvr, Items.AIR);
     }
     
     public Item(final Properties a) {
-        this.properties = Maps.newHashMap();
-        this.addProperty(new ResourceLocation("lefthanded"), Item.PROPERTY_LEFTHANDED);
-        this.addProperty(new ResourceLocation("cooldown"), Item.PROPERTY_COOLDOWN);
-        this.addProperty(new ResourceLocation("custom_model_data"), Item.PROPERTY_CUSTOM_MODEL_DATA);
         this.category = a.category;
         this.rarity = a.rarity;
         this.craftingRemainingItem = a.craftingRemainingItem;
         this.maxDamage = a.maxDamage;
         this.maxStackSize = a.maxStackSize;
         this.foodProperties = a.foodProperties;
-        if (this.maxDamage > 0) {
-            this.addProperty(new ResourceLocation("damaged"), Item.PROPERTY_DAMAGED);
-            this.addProperty(new ResourceLocation("damage"), Item.PROPERTY_DAMAGE);
-        }
+        this.isFireResistant = a.isFireResistant;
     }
     
-    public void onUseTick(final Level bjw, final LivingEntity akz, final ItemStack ben, final int integer) {
+    public void onUseTick(final Level bqb, final LivingEntity aoy, final ItemStack bki, final int integer) {
     }
     
-    @Nullable
-    public ItemPropertyFunction getProperty(final ResourceLocation sm) {
-        return this.properties.get(sm);
-    }
-    
-    public boolean hasProperties() {
-        return !this.properties.isEmpty();
-    }
-    
-    public boolean verifyTagAfterLoad(final CompoundTag jt) {
+    public boolean verifyTagAfterLoad(final CompoundTag le) {
         return false;
     }
     
-    public boolean canAttackBlock(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj) {
+    public boolean canAttackBlock(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec) {
         return true;
     }
     
@@ -114,35 +93,31 @@ public class Item implements ItemLike {
         return this;
     }
     
-    public final void addProperty(final ResourceLocation sm, final ItemPropertyFunction bem) {
-        this.properties.put(sm, bem);
-    }
-    
-    public InteractionResult useOn(final UseOnContext bfz) {
+    public InteractionResult useOn(final UseOnContext blv) {
         return InteractionResult.PASS;
     }
     
-    public float getDestroySpeed(final ItemStack ben, final BlockState byj) {
+    public float getDestroySpeed(final ItemStack bki, final BlockState cfj) {
         return 1.0f;
     }
     
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
         if (!this.isEdible()) {
-            return InteractionResultHolder.<ItemStack>pass(ayj.getItemInHand(ajk));
+            return InteractionResultHolder.<ItemStack>pass(bec.getItemInHand(anf));
         }
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        if (ayj.canEat(this.getFoodProperties().canAlwaysEat())) {
-            ayj.startUsingItem(ajk);
-            return InteractionResultHolder.<ItemStack>consume(ben5);
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        if (bec.canEat(this.getFoodProperties().canAlwaysEat())) {
+            bec.startUsingItem(anf);
+            return InteractionResultHolder.<ItemStack>consume(bki5);
         }
-        return InteractionResultHolder.<ItemStack>fail(ben5);
+        return InteractionResultHolder.<ItemStack>fail(bki5);
     }
     
-    public ItemStack finishUsingItem(final ItemStack ben, final Level bjw, final LivingEntity akz) {
+    public ItemStack finishUsingItem(final ItemStack bki, final Level bqb, final LivingEntity aoy) {
         if (this.isEdible()) {
-            return akz.eat(bjw, ben);
+            return aoy.eat(bqb, bki);
         }
-        return ben;
+        return bki;
     }
     
     public final int getMaxStackSize() {
@@ -157,24 +132,24 @@ public class Item implements ItemLike {
         return this.maxDamage > 0;
     }
     
-    public boolean hurtEnemy(final ItemStack ben, final LivingEntity akz2, final LivingEntity akz3) {
+    public boolean hurtEnemy(final ItemStack bki, final LivingEntity aoy2, final LivingEntity aoy3) {
         return false;
     }
     
-    public boolean mineBlock(final ItemStack ben, final Level bjw, final BlockState byj, final BlockPos fk, final LivingEntity akz) {
+    public boolean mineBlock(final ItemStack bki, final Level bqb, final BlockState cfj, final BlockPos fu, final LivingEntity aoy) {
         return false;
     }
     
-    public boolean canDestroySpecial(final BlockState byj) {
+    public boolean isCorrectToolForDrops(final BlockState cfj) {
         return false;
     }
     
-    public boolean interactEnemy(final ItemStack ben, final Player ayj, final LivingEntity akz, final InteractionHand ajk) {
-        return false;
+    public InteractionResult interactLivingEntity(final ItemStack bki, final Player bec, final LivingEntity aoy, final InteractionHand anf) {
+        return InteractionResult.PASS;
     }
     
     public Component getDescription() {
-        return new TranslatableComponent(this.getDescriptionId(), new Object[0]);
+        return new TranslatableComponent(this.getDescriptionId());
     }
     
     @Override
@@ -193,7 +168,7 @@ public class Item implements ItemLike {
         return this.getOrCreateDescriptionId();
     }
     
-    public String getDescriptionId(final ItemStack ben) {
+    public String getDescriptionId(final ItemStack bki) {
         return this.getDescriptionId();
     }
     
@@ -210,43 +185,43 @@ public class Item implements ItemLike {
         return this.craftingRemainingItem != null;
     }
     
-    public void inventoryTick(final ItemStack ben, final Level bjw, final Entity akq, final int integer, final boolean boolean5) {
+    public void inventoryTick(final ItemStack bki, final Level bqb, final Entity aom, final int integer, final boolean boolean5) {
     }
     
-    public void onCraftedBy(final ItemStack ben, final Level bjw, final Player ayj) {
+    public void onCraftedBy(final ItemStack bki, final Level bqb, final Player bec) {
     }
     
     public boolean isComplex() {
         return false;
     }
     
-    public UseAnim getUseAnimation(final ItemStack ben) {
-        return ben.getItem().isEdible() ? UseAnim.EAT : UseAnim.NONE;
+    public UseAnim getUseAnimation(final ItemStack bki) {
+        return bki.getItem().isEdible() ? UseAnim.EAT : UseAnim.NONE;
     }
     
-    public int getUseDuration(final ItemStack ben) {
-        if (ben.getItem().isEdible()) {
+    public int getUseDuration(final ItemStack bki) {
+        if (bki.getItem().isEdible()) {
             return this.getFoodProperties().isFastFood() ? 16 : 32;
         }
         return 0;
     }
     
-    public void releaseUsing(final ItemStack ben, final Level bjw, final LivingEntity akz, final int integer) {
+    public void releaseUsing(final ItemStack bki, final Level bqb, final LivingEntity aoy, final int integer) {
     }
     
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
     }
     
-    public Component getName(final ItemStack ben) {
-        return new TranslatableComponent(this.getDescriptionId(ben), new Object[0]);
+    public Component getName(final ItemStack bki) {
+        return new TranslatableComponent(this.getDescriptionId(bki));
     }
     
-    public boolean isFoil(final ItemStack ben) {
-        return ben.isEnchanted();
+    public boolean isFoil(final ItemStack bki) {
+        return bki.isEnchanted();
     }
     
-    public Rarity getRarity(final ItemStack ben) {
-        if (!ben.isEnchanted()) {
+    public Rarity getRarity(final ItemStack bki) {
+        if (!bki.isEnchanted()) {
             return this.rarity;
         }
         switch (this.rarity) {
@@ -263,14 +238,14 @@ public class Item implements ItemLike {
         }
     }
     
-    public boolean isEnchantable(final ItemStack ben) {
+    public boolean isEnchantable(final ItemStack bki) {
         return this.getMaxStackSize() == 1 && this.canBeDepleted();
     }
     
-    protected static HitResult getPlayerPOVHitResult(final Level bjw, final Player ayj, final ClipContext.Fluid b) {
-        final float float4 = ayj.xRot;
-        final float float5 = ayj.yRot;
-        final Vec3 cvl6 = ayj.getEyePosition(1.0f);
+    protected static BlockHitResult getPlayerPOVHitResult(final Level bqb, final Player bec, final ClipContext.Fluid b) {
+        final float float4 = bec.xRot;
+        final float float5 = bec.yRot;
+        final Vec3 dem6 = bec.getEyePosition(1.0f);
         final float float6 = Mth.cos(-float5 * 0.017453292f - 3.1415927f);
         final float float7 = Mth.sin(-float5 * 0.017453292f - 3.1415927f);
         final float float8 = -Mth.cos(-float4 * 0.017453292f);
@@ -279,23 +254,23 @@ public class Item implements ItemLike {
         final float float11 = float9;
         final float float12 = float6 * float8;
         final double double14 = 5.0;
-        final Vec3 cvl7 = cvl6.add(float10 * 5.0, float11 * 5.0, float12 * 5.0);
-        return bjw.clip(new ClipContext(cvl6, cvl7, ClipContext.Block.OUTLINE, b, ayj));
+        final Vec3 dem7 = dem6.add(float10 * 5.0, float11 * 5.0, float12 * 5.0);
+        return bqb.clip(new ClipContext(dem6, dem7, ClipContext.Block.OUTLINE, b, bec));
     }
     
     public int getEnchantmentValue() {
         return 0;
     }
     
-    public void fillItemCategory(final CreativeModeTab bdd, final NonNullList<ItemStack> fy) {
-        if (this.allowdedIn(bdd)) {
-            fy.add(new ItemStack(this));
+    public void fillItemCategory(final CreativeModeTab biy, final NonNullList<ItemStack> gi) {
+        if (this.allowdedIn(biy)) {
+            gi.add(new ItemStack(this));
         }
     }
     
-    protected boolean allowdedIn(final CreativeModeTab bdd) {
-        final CreativeModeTab bdd2 = this.getItemCategory();
-        return bdd2 != null && (bdd == CreativeModeTab.TAB_SEARCH || bdd == bdd2);
+    protected boolean allowdedIn(final CreativeModeTab biy) {
+        final CreativeModeTab biy2 = this.getItemCategory();
+        return biy2 != null && (biy == CreativeModeTab.TAB_SEARCH || biy == biy2);
     }
     
     @Nullable
@@ -303,24 +278,24 @@ public class Item implements ItemLike {
         return this.category;
     }
     
-    public boolean isValidRepairItem(final ItemStack ben1, final ItemStack ben2) {
+    public boolean isValidRepairItem(final ItemStack bki1, final ItemStack bki2) {
         return false;
     }
     
-    public Multimap<String, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot akv) {
-        return HashMultimap.create();
+    public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot aor) {
+        return ImmutableMultimap.of();
     }
     
-    public boolean useOnRelease(final ItemStack ben) {
-        return ben.getItem() == Items.CROSSBOW;
+    public boolean useOnRelease(final ItemStack bki) {
+        return bki.getItem() == Items.CROSSBOW;
     }
     
     public ItemStack getDefaultInstance() {
         return new ItemStack(this);
     }
     
-    public boolean is(final Tag<Item> aaz) {
-        return aaz.contains(this);
+    public boolean is(final Tag<Item> adf) {
+        return adf.contains(this);
     }
     
     public boolean isEdible() {
@@ -340,13 +315,16 @@ public class Item implements ItemLike {
         return SoundEvents.GENERIC_EAT;
     }
     
+    public boolean isFireResistant() {
+        return this.isFireResistant;
+    }
+    
+    public boolean canBeHurtBy(final DamageSource anw) {
+        return !this.isFireResistant || !anw.isFire();
+    }
+    
     static {
         BY_BLOCK = Maps.newHashMap();
-        PROPERTY_DAMAGED = ((ben, bjw, akz) -> ben.isDamaged() ? 1.0f : 0.0f);
-        PROPERTY_DAMAGE = ((ben, bjw, akz) -> Mth.clamp(ben.getDamageValue() / (float)ben.getMaxDamage(), 0.0f, 1.0f));
-        PROPERTY_LEFTHANDED = ((ben, bjw, akz) -> (akz == null || akz.getMainArm() == HumanoidArm.RIGHT) ? 0.0f : 1.0f);
-        PROPERTY_COOLDOWN = ((ben, bjw, akz) -> (akz instanceof Player) ? akz.getCooldowns().getCooldownPercent(ben.getItem(), 0.0f) : 0.0f);
-        PROPERTY_CUSTOM_MODEL_DATA = ((ben, bjw, akz) -> ben.hasTag() ? ((float)ben.getTag().getInt("CustomModelData")) : 0.0f);
         BASE_ATTACK_DAMAGE_UUID = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
         BASE_ATTACK_SPEED_UUID = UUID.fromString("FA233E1C-4180-4865-B01B-BCCE9785ACA3");
         random = new Random();
@@ -359,14 +337,15 @@ public class Item implements ItemLike {
         private CreativeModeTab category;
         private Rarity rarity;
         private FoodProperties foodProperties;
+        private boolean isFireResistant;
         
         public Properties() {
             this.maxStackSize = 64;
             this.rarity = Rarity.COMMON;
         }
         
-        public Properties food(final FoodProperties bak) {
-            this.foodProperties = bak;
+        public Properties food(final FoodProperties bgf) {
+            this.foodProperties = bgf;
             return this;
         }
         
@@ -388,18 +367,23 @@ public class Item implements ItemLike {
             return this;
         }
         
-        public Properties craftRemainder(final Item bei) {
-            this.craftingRemainingItem = bei;
+        public Properties craftRemainder(final Item bke) {
+            this.craftingRemainingItem = bke;
             return this;
         }
         
-        public Properties tab(final CreativeModeTab bdd) {
-            this.category = bdd;
+        public Properties tab(final CreativeModeTab biy) {
+            this.category = biy;
             return this;
         }
         
-        public Properties rarity(final Rarity bfa) {
-            this.rarity = bfa;
+        public Properties rarity(final Rarity bkw) {
+            this.rarity = bkw;
+            return this;
+        }
+        
+        public Properties fireResistant() {
+            this.isFireResistant = true;
             return this;
         }
     }
diff --git a/src/net/minecraft/world/item/ItemCooldowns.java b/src/net/minecraft/world/item/ItemCooldowns.java
index 0f99ef0..1b26229 100644
--- a/src/net/minecraft/world/item/ItemCooldowns.java
+++ b/src/net/minecraft/world/item/ItemCooldowns.java
@@ -13,12 +13,12 @@ public class ItemCooldowns {
         this.cooldowns = Maps.newHashMap();
     }
     
-    public boolean isOnCooldown(final Item bei) {
-        return this.getCooldownPercent(bei, 0.0f) > 0.0f;
+    public boolean isOnCooldown(final Item bke) {
+        return this.getCooldownPercent(bke, 0.0f) > 0.0f;
     }
     
-    public float getCooldownPercent(final Item bei, final float float2) {
-        final CooldownInstance a4 = this.cooldowns.get(bei);
+    public float getCooldownPercent(final Item bke, final float float2) {
+        final CooldownInstance a4 = this.cooldowns.get(bke);
         if (a4 != null) {
             final float float3 = (float)(a4.endTime - a4.startTime);
             final float float4 = a4.endTime - (this.tickCount + float2);
@@ -41,20 +41,20 @@ public class ItemCooldowns {
         }
     }
     
-    public void addCooldown(final Item bei, final int integer) {
-        this.cooldowns.put(bei, new CooldownInstance(this.tickCount, this.tickCount + integer));
-        this.onCooldownStarted(bei, integer);
+    public void addCooldown(final Item bke, final int integer) {
+        this.cooldowns.put(bke, new CooldownInstance(this.tickCount, this.tickCount + integer));
+        this.onCooldownStarted(bke, integer);
     }
     
-    public void removeCooldown(final Item bei) {
-        this.cooldowns.remove(bei);
-        this.onCooldownEnded(bei);
+    public void removeCooldown(final Item bke) {
+        this.cooldowns.remove(bke);
+        this.onCooldownEnded(bke);
     }
     
-    protected void onCooldownStarted(final Item bei, final int integer) {
+    protected void onCooldownStarted(final Item bke, final int integer) {
     }
     
-    protected void onCooldownEnded(final Item bei) {
+    protected void onCooldownEnded(final Item bke) {
     }
     
     class CooldownInstance {
diff --git a/src/net/minecraft/world/item/ItemFrameItem.java b/src/net/minecraft/world/item/ItemFrameItem.java
index f616b6e..9b987dc 100644
--- a/src/net/minecraft/world/item/ItemFrameItem.java
+++ b/src/net/minecraft/world/item/ItemFrameItem.java
@@ -13,7 +13,7 @@ public class ItemFrameItem extends HangingEntityItem {
     }
     
     @Override
-    protected boolean mayPlace(final Player ayj, final Direction fp, final ItemStack ben, final BlockPos fk) {
-        return !Level.isOutsideBuildHeight(fk) && ayj.mayUseItemAt(fk, fp, ben);
+    protected boolean mayPlace(final Player bec, final Direction fz, final ItemStack bki, final BlockPos fu) {
+        return !Level.isOutsideBuildHeight(fu) && bec.mayUseItemAt(fu, fz, bki);
     }
 }
diff --git a/src/net/minecraft/world/item/ItemNameBlockItem.java b/src/net/minecraft/world/item/ItemNameBlockItem.java
index 99913a4..39ec78d 100644
--- a/src/net/minecraft/world/item/ItemNameBlockItem.java
+++ b/src/net/minecraft/world/item/ItemNameBlockItem.java
@@ -3,8 +3,8 @@ package net.minecraft.world.item;
 import net.minecraft.world.level.block.Block;
 
 public class ItemNameBlockItem extends BlockItem {
-    public ItemNameBlockItem(final Block bph, final Properties a) {
-        super(bph, a);
+    public ItemNameBlockItem(final Block bvr, final Properties a) {
+        super(bvr, a);
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/ItemPropertyFunction.java b/src/net/minecraft/world/item/ItemPropertyFunction.java
deleted file mode 100644
index f4a3174..0000000
--- a/src/net/minecraft/world/item/ItemPropertyFunction.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package net.minecraft.world.item;
-
-import net.minecraft.world.entity.LivingEntity;
-import javax.annotation.Nullable;
-import net.minecraft.world.level.Level;
-
-public interface ItemPropertyFunction {
-    float call(final ItemStack ben, @Nullable final Level bjw, @Nullable final LivingEntity akz);
-}
diff --git a/src/net/minecraft/world/item/ItemStack.java b/src/net/minecraft/world/item/ItemStack.java
index 9e7805a..fe0ec51 100644
--- a/src/net/minecraft/world/item/ItemStack.java
+++ b/src/net/minecraft/world/item/ItemStack.java
@@ -1,7 +1,13 @@
 package net.minecraft.world.item;
 
 import java.util.AbstractList;
+import net.minecraft.Util;
 import org.apache.logging.log4j.LogManager;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
 import net.minecraft.sounds.SoundEvent;
 import java.util.function.Predicate;
 import net.minecraft.commands.arguments.blocks.BlockPredicateArgument;
@@ -9,6 +15,7 @@ import net.minecraft.tags.TagManager;
 import java.util.Objects;
 import net.minecraft.network.chat.HoverEvent;
 import com.google.common.collect.HashMultimap;
+import net.minecraft.world.entity.decoration.ItemFrame;
 import net.minecraft.world.item.enchantment.Enchantment;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.util.stream.Collector;
@@ -20,14 +27,15 @@ import net.minecraft.commands.arguments.blocks.BlockStateParser;
 import com.mojang.brigadier.StringReader;
 import java.util.Iterator;
 import com.google.common.collect.Multimap;
+import net.minecraft.network.chat.MutableComponent;
 import java.util.Collection;
 import net.minecraft.world.entity.MobType;
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.entity.ai.attributes.Attribute;
 import java.util.Map;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.network.chat.ComponentUtils;
-import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TextComponent;
@@ -36,8 +44,6 @@ import java.util.List;
 import com.google.gson.JsonParseException;
 import net.minecraft.network.chat.Component;
 import net.minecraft.nbt.ListTag;
-import net.minecraft.world.entity.Entity;
-import java.util.function.Consumer;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.world.item.enchantment.DigDurabilityEnchantment;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
@@ -59,43 +65,46 @@ import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.core.Registry;
+import java.util.function.Consumer;
+import java.util.Optional;
 import net.minecraft.world.level.ItemLike;
-import java.text.DecimalFormatSymbols;
-import java.util.Locale;
 import net.minecraft.world.level.block.state.pattern.BlockInWorld;
-import net.minecraft.world.entity.decoration.ItemFrame;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.chat.Style;
 import java.text.DecimalFormat;
 import org.apache.logging.log4j.Logger;
+import com.mojang.serialization.Codec;
 
 public final class ItemStack {
+    public static final Codec<ItemStack> CODEC;
     private static final Logger LOGGER;
     public static final ItemStack EMPTY;
     public static final DecimalFormat ATTRIBUTE_MODIFIER_FORMAT;
+    private static final Style LORE_STYLE;
     private int count;
     private int popTime;
     @Deprecated
     private final Item item;
     private CompoundTag tag;
     private boolean emptyCacheFlag;
-    private ItemFrame frame;
+    private Entity entityRepresentation;
     private BlockInWorld cachedBreakBlock;
     private boolean cachedBreakBlockResult;
     private BlockInWorld cachedPlaceBlock;
     private boolean cachedPlaceBlockResult;
     
-    private static DecimalFormat getAttributeDecimalFormat() {
-        final DecimalFormat decimalFormat1 = new DecimalFormat("#.##");
-        decimalFormat1.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT));
-        return decimalFormat1;
+    public ItemStack(final ItemLike bqa) {
+        this(bqa, 1);
     }
     
-    public ItemStack(final ItemLike bjv) {
-        this(bjv, 1);
+    private ItemStack(final ItemLike bqa, final int integer, final Optional<CompoundTag> optional) {
+        this(bqa, integer);
+        optional.ifPresent(this::setTag);
     }
     
-    public ItemStack(final ItemLike bjv, final int integer) {
-        this.item = ((bjv == null) ? null : bjv.asItem());
+    public ItemStack(final ItemLike bqa, final int integer) {
+        this.item = ((bqa == null) ? null : bqa.asItem());
         this.count = integer;
         if (this.item != null && this.item.canBeDepleted()) {
             this.setDamageValue(this.getDamageValue());
@@ -108,12 +117,12 @@ public final class ItemStack {
         this.emptyCacheFlag = this.isEmpty();
     }
     
-    private ItemStack(final CompoundTag jt) {
-        this.item = Registry.ITEM.get(new ResourceLocation(jt.getString("id")));
-        this.count = jt.getByte("Count");
-        if (jt.contains("tag", 10)) {
-            this.tag = jt.getCompound("tag");
-            this.getItem().verifyTagAfterLoad(jt);
+    private ItemStack(final CompoundTag le) {
+        this.item = Registry.ITEM.get(new ResourceLocation(le.getString("id")));
+        this.count = le.getByte("Count");
+        if (le.contains("tag", 10)) {
+            this.tag = le.getCompound("tag");
+            this.getItem().verifyTagAfterLoad(le);
         }
         if (this.getItem().canBeDepleted()) {
             this.setDamageValue(this.getDamageValue());
@@ -121,12 +130,12 @@ public final class ItemStack {
         this.updateEmptyCacheFlag();
     }
     
-    public static ItemStack of(final CompoundTag jt) {
+    public static ItemStack of(final CompoundTag le) {
         try {
-            return new ItemStack(jt);
+            return new ItemStack(le);
         }
         catch (RuntimeException runtimeException2) {
-            ItemStack.LOGGER.debug("Tried to load invalid item: {}", jt, runtimeException2);
+            ItemStack.LOGGER.debug("Tried to load invalid item: {}", le, runtimeException2);
             return ItemStack.EMPTY;
         }
     }
@@ -137,51 +146,51 @@ public final class ItemStack {
     
     public ItemStack split(final int integer) {
         final int integer2 = Math.min(integer, this.count);
-        final ItemStack ben4 = this.copy();
-        ben4.setCount(integer2);
+        final ItemStack bki4 = this.copy();
+        bki4.setCount(integer2);
         this.shrink(integer2);
-        return ben4;
+        return bki4;
     }
     
     public Item getItem() {
         return this.emptyCacheFlag ? Items.AIR : this.item;
     }
     
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Player ayj3 = bfz.getPlayer();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final BlockInWorld byn5 = new BlockInWorld(bfz.getLevel(), fk4, false);
-        if (ayj3 != null && !ayj3.abilities.mayBuild && !this.hasAdventureModePlaceTagForBlock(bfz.getLevel().getTagManager(), byn5)) {
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Player bec3 = blv.getPlayer();
+        final BlockPos fu4 = blv.getClickedPos();
+        final BlockInWorld cfn5 = new BlockInWorld(blv.getLevel(), fu4, false);
+        if (bec3 != null && !bec3.abilities.mayBuild && !this.hasAdventureModePlaceTagForBlock(blv.getLevel().getTagManager(), cfn5)) {
             return InteractionResult.PASS;
         }
-        final Item bei6 = this.getItem();
-        final InteractionResult ajl7 = bei6.useOn(bfz);
-        if (ayj3 != null && ajl7 == InteractionResult.SUCCESS) {
-            ayj3.awardStat(Stats.ITEM_USED.get(bei6));
+        final Item bke6 = this.getItem();
+        final InteractionResult ang7 = bke6.useOn(blv);
+        if (bec3 != null && ang7.consumesAction()) {
+            bec3.awardStat(Stats.ITEM_USED.get(bke6));
         }
-        return ajl7;
+        return ang7;
     }
     
-    public float getDestroySpeed(final BlockState byj) {
-        return this.getItem().getDestroySpeed(this, byj);
+    public float getDestroySpeed(final BlockState cfj) {
+        return this.getItem().getDestroySpeed(this, cfj);
     }
     
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        return this.getItem().use(bjw, ayj, ajk);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        return this.getItem().use(bqb, bec, anf);
     }
     
-    public ItemStack finishUsingItem(final Level bjw, final LivingEntity akz) {
-        return this.getItem().finishUsingItem(this, bjw, akz);
+    public ItemStack finishUsingItem(final Level bqb, final LivingEntity aoy) {
+        return this.getItem().finishUsingItem(this, bqb, aoy);
     }
     
-    public CompoundTag save(final CompoundTag jt) {
-        final ResourceLocation sm3 = Registry.ITEM.getKey(this.getItem());
-        jt.putString("id", (sm3 == null) ? "minecraft:air" : sm3.toString());
-        jt.putByte("Count", (byte)this.count);
+    public CompoundTag save(final CompoundTag le) {
+        final ResourceLocation uh3 = Registry.ITEM.getKey(this.getItem());
+        le.putString("id", (uh3 == null) ? "minecraft:air" : uh3.toString());
+        le.putByte("Count", (byte)this.count);
         if (this.tag != null) {
-            jt.put("tag", this.tag.copy());
+            le.put("tag", this.tag.copy());
         }
-        return jt;
+        return le;
     }
     
     public int getMaxStackSize() {
@@ -196,8 +205,8 @@ public final class ItemStack {
         if (this.emptyCacheFlag || this.getItem().getMaxDamage() <= 0) {
             return false;
         }
-        final CompoundTag jt2 = this.getTag();
-        return jt2 == null || !jt2.getBoolean("Unbreakable");
+        final CompoundTag le2 = this.getTag();
+        return le2 == null || !le2.getBoolean("Unbreakable");
     }
     
     public boolean isDamaged() {
@@ -216,7 +225,7 @@ public final class ItemStack {
         return this.getItem().getMaxDamage();
     }
     
-    public boolean hurt(int integer, final Random random, @Nullable final ServerPlayer xe) {
+    public boolean hurt(int integer, final Random random, @Nullable final ServerPlayer ze) {
         if (!this.isDamageableItem()) {
             return false;
         }
@@ -233,95 +242,95 @@ public final class ItemStack {
                 return false;
             }
         }
-        if (xe != null && integer != 0) {
-            CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(xe, this, this.getDamageValue() + integer);
+        if (ze != null && integer != 0) {
+            CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(ze, this, this.getDamageValue() + integer);
         }
         final int integer2 = this.getDamageValue() + integer;
         this.setDamageValue(integer2);
         return integer2 >= this.getMaxDamage();
     }
     
-    public <T extends LivingEntity> void hurtAndBreak(final int integer, final T akz, final Consumer<T> consumer) {
-        if (akz.level.isClientSide || (akz instanceof Player && ((Player)akz).abilities.instabuild)) {
+    public <T extends LivingEntity> void hurtAndBreak(final int integer, final T aoy, final Consumer<T> consumer) {
+        if (aoy.level.isClientSide || (aoy instanceof Player && ((Player)aoy).abilities.instabuild)) {
             return;
         }
         if (!this.isDamageableItem()) {
             return;
         }
-        if (this.hurt(integer, akz.getRandom(), (akz instanceof ServerPlayer) ? akz : null)) {
-            consumer.accept(akz);
-            final Item bei5 = this.getItem();
+        if (this.hurt(integer, aoy.getRandom(), (aoy instanceof ServerPlayer) ? aoy : null)) {
+            consumer.accept(aoy);
+            final Item bke5 = this.getItem();
             this.shrink(1);
-            if (akz instanceof Player) {
-                ((Player)akz).awardStat(Stats.ITEM_BROKEN.get(bei5));
+            if (aoy instanceof Player) {
+                ((Player)aoy).awardStat(Stats.ITEM_BROKEN.get(bke5));
             }
             this.setDamageValue(0);
         }
     }
     
-    public void hurtEnemy(final LivingEntity akz, final Player ayj) {
-        final Item bei4 = this.getItem();
-        if (bei4.hurtEnemy(this, akz, ayj)) {
-            ayj.awardStat(Stats.ITEM_USED.get(bei4));
+    public void hurtEnemy(final LivingEntity aoy, final Player bec) {
+        final Item bke4 = this.getItem();
+        if (bke4.hurtEnemy(this, aoy, bec)) {
+            bec.awardStat(Stats.ITEM_USED.get(bke4));
         }
     }
     
-    public void mineBlock(final Level bjw, final BlockState byj, final BlockPos fk, final Player ayj) {
-        final Item bei6 = this.getItem();
-        if (bei6.mineBlock(this, bjw, byj, fk, ayj)) {
-            ayj.awardStat(Stats.ITEM_USED.get(bei6));
+    public void mineBlock(final Level bqb, final BlockState cfj, final BlockPos fu, final Player bec) {
+        final Item bke6 = this.getItem();
+        if (bke6.mineBlock(this, bqb, cfj, fu, bec)) {
+            bec.awardStat(Stats.ITEM_USED.get(bke6));
         }
     }
     
-    public boolean canDestroySpecial(final BlockState byj) {
-        return this.getItem().canDestroySpecial(byj);
+    public boolean isCorrectToolForDrops(final BlockState cfj) {
+        return this.getItem().isCorrectToolForDrops(cfj);
     }
     
-    public boolean interactEnemy(final Player ayj, final LivingEntity akz, final InteractionHand ajk) {
-        return this.getItem().interactEnemy(this, ayj, akz, ajk);
+    public InteractionResult interactLivingEntity(final Player bec, final LivingEntity aoy, final InteractionHand anf) {
+        return this.getItem().interactLivingEntity(this, bec, aoy, anf);
     }
     
     public ItemStack copy() {
         if (this.isEmpty()) {
             return ItemStack.EMPTY;
         }
-        final ItemStack ben2 = new ItemStack(this.getItem(), this.count);
-        ben2.setPopTime(this.getPopTime());
+        final ItemStack bki2 = new ItemStack(this.getItem(), this.count);
+        bki2.setPopTime(this.getPopTime());
         if (this.tag != null) {
-            ben2.tag = this.tag.copy();
+            bki2.tag = this.tag.copy();
         }
-        return ben2;
+        return bki2;
     }
     
-    public static boolean tagMatches(final ItemStack ben1, final ItemStack ben2) {
-        return (ben1.isEmpty() && ben2.isEmpty()) || (!ben1.isEmpty() && !ben2.isEmpty() && (ben1.tag != null || ben2.tag == null) && (ben1.tag == null || ben1.tag.equals(ben2.tag)));
+    public static boolean tagMatches(final ItemStack bki1, final ItemStack bki2) {
+        return (bki1.isEmpty() && bki2.isEmpty()) || (!bki1.isEmpty() && !bki2.isEmpty() && (bki1.tag != null || bki2.tag == null) && (bki1.tag == null || bki1.tag.equals(bki2.tag)));
     }
     
-    public static boolean matches(final ItemStack ben1, final ItemStack ben2) {
-        return (ben1.isEmpty() && ben2.isEmpty()) || (!ben1.isEmpty() && !ben2.isEmpty() && ben1.matches(ben2));
+    public static boolean matches(final ItemStack bki1, final ItemStack bki2) {
+        return (bki1.isEmpty() && bki2.isEmpty()) || (!bki1.isEmpty() && !bki2.isEmpty() && bki1.matches(bki2));
     }
     
-    private boolean matches(final ItemStack ben) {
-        return this.count == ben.count && this.getItem() == ben.getItem() && (this.tag != null || ben.tag == null) && (this.tag == null || this.tag.equals(ben.tag));
+    private boolean matches(final ItemStack bki) {
+        return this.count == bki.count && this.getItem() == bki.getItem() && (this.tag != null || bki.tag == null) && (this.tag == null || this.tag.equals(bki.tag));
     }
     
-    public static boolean isSame(final ItemStack ben1, final ItemStack ben2) {
-        return ben1 == ben2 || (!ben1.isEmpty() && !ben2.isEmpty() && ben1.sameItem(ben2));
+    public static boolean isSame(final ItemStack bki1, final ItemStack bki2) {
+        return bki1 == bki2 || (!bki1.isEmpty() && !bki2.isEmpty() && bki1.sameItem(bki2));
     }
     
-    public static boolean isSameIgnoreDurability(final ItemStack ben1, final ItemStack ben2) {
-        return ben1 == ben2 || (!ben1.isEmpty() && !ben2.isEmpty() && ben1.sameItemStackIgnoreDurability(ben2));
+    public static boolean isSameIgnoreDurability(final ItemStack bki1, final ItemStack bki2) {
+        return bki1 == bki2 || (!bki1.isEmpty() && !bki2.isEmpty() && bki1.sameItemStackIgnoreDurability(bki2));
     }
     
-    public boolean sameItem(final ItemStack ben) {
-        return !ben.isEmpty() && this.getItem() == ben.getItem();
+    public boolean sameItem(final ItemStack bki) {
+        return !bki.isEmpty() && this.getItem() == bki.getItem();
     }
     
-    public boolean sameItemStackIgnoreDurability(final ItemStack ben) {
+    public boolean sameItemStackIgnoreDurability(final ItemStack bki) {
         if (this.isDamageableItem()) {
-            return !ben.isEmpty() && this.getItem() == ben.getItem();
+            return !bki.isEmpty() && this.getItem() == bki.getItem();
         }
-        return this.sameItem(ben);
+        return this.sameItem(bki);
     }
     
     public String getDescriptionId() {
@@ -333,18 +342,18 @@ public final class ItemStack {
         return this.count + " " + this.getItem();
     }
     
-    public void inventoryTick(final Level bjw, final Entity akq, final int integer, final boolean boolean4) {
+    public void inventoryTick(final Level bqb, final Entity aom, final int integer, final boolean boolean4) {
         if (this.popTime > 0) {
             --this.popTime;
         }
         if (this.getItem() != null) {
-            this.getItem().inventoryTick(this, bjw, akq, integer, boolean4);
+            this.getItem().inventoryTick(this, bqb, aom, integer, boolean4);
         }
     }
     
-    public void onCraftedBy(final Level bjw, final Player ayj, final int integer) {
-        ayj.awardStat(Stats.ITEM_CRAFTED.get(this.getItem()), integer);
-        this.getItem().onCraftedBy(this, bjw, ayj);
+    public void onCraftedBy(final Level bqb, final Player bec, final int integer) {
+        bec.awardStat(Stats.ITEM_CRAFTED.get(this.getItem()), integer);
+        this.getItem().onCraftedBy(this, bqb, bec);
     }
     
     public int getUseDuration() {
@@ -355,8 +364,8 @@ public final class ItemStack {
         return this.getItem().getUseAnimation(this);
     }
     
-    public void releaseUsing(final Level bjw, final LivingEntity akz, final int integer) {
-        this.getItem().releaseUsing(this, bjw, akz, integer);
+    public void releaseUsing(final Level bqb, final LivingEntity aoy, final int integer) {
+        this.getItem().releaseUsing(this, bqb, aoy, integer);
     }
     
     public boolean useOnRelease() {
@@ -381,9 +390,9 @@ public final class ItemStack {
     
     public CompoundTag getOrCreateTagElement(final String string) {
         if (this.tag == null || !this.tag.contains(string, 10)) {
-            final CompoundTag jt3 = new CompoundTag();
-            this.addTagElement(string, jt3);
-            return jt3;
+            final CompoundTag le3 = new CompoundTag();
+            this.addTagElement(string, le3);
+            return le3;
         }
         return this.tag.getCompound(string);
     }
@@ -412,46 +421,46 @@ public final class ItemStack {
         return new ListTag();
     }
     
-    public void setTag(@Nullable final CompoundTag jt) {
-        this.tag = jt;
+    public void setTag(@Nullable final CompoundTag le) {
+        this.tag = le;
         if (this.getItem().canBeDepleted()) {
             this.setDamageValue(this.getDamageValue());
         }
     }
     
     public Component getHoverName() {
-        final CompoundTag jt2 = this.getTagElement("display");
-        if (jt2 != null && jt2.contains("Name", 8)) {
+        final CompoundTag le2 = this.getTagElement("display");
+        if (le2 != null && le2.contains("Name", 8)) {
             try {
-                final Component lf3 = Component.Serializer.fromJson(jt2.getString("Name"));
-                if (lf3 != null) {
-                    return lf3;
+                final Component mr3 = Component.Serializer.fromJson(le2.getString("Name"));
+                if (mr3 != null) {
+                    return mr3;
                 }
-                jt2.remove("Name");
+                le2.remove("Name");
             }
             catch (JsonParseException jsonParseException3) {
-                jt2.remove("Name");
+                le2.remove("Name");
             }
         }
         return this.getItem().getName(this);
     }
     
-    public ItemStack setHoverName(@Nullable final Component lf) {
-        final CompoundTag jt3 = this.getOrCreateTagElement("display");
-        if (lf != null) {
-            jt3.putString("Name", Component.Serializer.toJson(lf));
+    public ItemStack setHoverName(@Nullable final Component mr) {
+        final CompoundTag le3 = this.getOrCreateTagElement("display");
+        if (mr != null) {
+            le3.putString("Name", Component.Serializer.toJson(mr));
         }
         else {
-            jt3.remove("Name");
+            le3.remove("Name");
         }
         return this;
     }
     
     public void resetHoverName() {
-        final CompoundTag jt2 = this.getTagElement("display");
-        if (jt2 != null) {
-            jt2.remove("Name");
-            if (jt2.isEmpty()) {
+        final CompoundTag le2 = this.getTagElement("display");
+        if (le2 != null) {
+            le2.remove("Name");
+            if (le2.isEmpty()) {
                 this.removeTagKey("display");
             }
         }
@@ -461,18 +470,18 @@ public final class ItemStack {
     }
     
     public boolean hasCustomHoverName() {
-        final CompoundTag jt2 = this.getTagElement("display");
-        return jt2 != null && jt2.contains("Name", 8);
+        final CompoundTag le2 = this.getTagElement("display");
+        return le2 != null && le2.contains("Name", 8);
     }
     
-    public List<Component> getTooltipLines(@Nullable final Player ayj, final TooltipFlag bfw) {
+    public List<Component> getTooltipLines(@Nullable final Player bec, final TooltipFlag bls) {
         final List<Component> list4 = Lists.newArrayList();
-        final Component lf5 = new TextComponent("").append(this.getHoverName()).withStyle(this.getRarity().color);
+        final MutableComponent mx5 = new TextComponent("").append(this.getHoverName()).withStyle(this.getRarity().color);
         if (this.hasCustomHoverName()) {
-            lf5.withStyle(ChatFormatting.ITALIC);
+            mx5.withStyle(ChatFormatting.ITALIC);
         }
-        list4.add(lf5);
-        if (!bfw.isAdvanced() && !this.hasCustomHoverName() && this.getItem() == Items.FILLED_MAP) {
+        list4.add(mx5);
+        if (!bls.isAdvanced() && !this.hasCustomHoverName() && this.getItem() == Items.FILLED_MAP) {
             list4.add(new TextComponent("#" + MapItem.getMapId(this)).withStyle(ChatFormatting.GRAY));
         }
         int integer6 = 0;
@@ -480,106 +489,109 @@ public final class ItemStack {
             integer6 = this.tag.getInt("HideFlags");
         }
         if ((integer6 & 0x20) == 0x0) {
-            this.getItem().appendHoverText(this, (ayj == null) ? null : ayj.level, list4, bfw);
+            this.getItem().appendHoverText(this, (bec == null) ? null : bec.level, list4, bls);
         }
         if (this.hasTag()) {
             if ((integer6 & 0x1) == 0x0) {
                 appendEnchantmentNames(list4, this.getEnchantmentTags());
             }
             if (this.tag.contains("display", 10)) {
-                final CompoundTag jt7 = this.tag.getCompound("display");
-                if (jt7.contains("color", 3)) {
-                    if (bfw.isAdvanced()) {
-                        list4.add(new TranslatableComponent("item.color", new Object[] { String.format("#%06X", jt7.getInt("color")) }).withStyle(ChatFormatting.GRAY));
+                final CompoundTag le7 = this.tag.getCompound("display");
+                if (le7.contains("color", 3)) {
+                    if (bls.isAdvanced()) {
+                        list4.add(new TranslatableComponent("item.color", new Object[] { String.format("#%06X", le7.getInt("color")) }).withStyle(ChatFormatting.GRAY));
                     }
                     else {
-                        list4.add(new TranslatableComponent("item.dyed", new Object[0]).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC));
+                        list4.add(new TranslatableComponent("item.dyed").withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC));
                     }
                 }
-                if (jt7.getTagType("Lore") == 9) {
-                    final ListTag jz8 = jt7.getList("Lore", 8);
-                    for (int integer7 = 0; integer7 < jz8.size(); ++integer7) {
-                        final String string10 = jz8.getString(integer7);
+                if (le7.getTagType("Lore") == 9) {
+                    final ListTag lk8 = le7.getList("Lore", 8);
+                    for (int integer7 = 0; integer7 < lk8.size(); ++integer7) {
+                        final String string10 = lk8.getString(integer7);
                         try {
-                            final Component lf6 = Component.Serializer.fromJson(string10);
-                            if (lf6 != null) {
-                                list4.add(ComponentUtils.mergeStyles(lf6, new Style().setColor(ChatFormatting.DARK_PURPLE).setItalic(true)));
+                            final MutableComponent mx6 = Component.Serializer.fromJson(string10);
+                            if (mx6 != null) {
+                                list4.add(ComponentUtils.mergeStyles(mx6, ItemStack.LORE_STYLE));
                             }
                         }
                         catch (JsonParseException jsonParseException11) {
-                            jt7.remove("Lore");
+                            le7.remove("Lore");
                         }
                     }
                 }
             }
         }
-        for (final EquipmentSlot akv10 : EquipmentSlot.values()) {
-            final Multimap<String, AttributeModifier> multimap11 = this.getAttributeModifiers(akv10);
+        for (final EquipmentSlot aor10 : EquipmentSlot.values()) {
+            final Multimap<Attribute, AttributeModifier> multimap11 = this.getAttributeModifiers(aor10);
             if (!multimap11.isEmpty() && (integer6 & 0x2) == 0x0) {
-                list4.add(new TextComponent(""));
-                list4.add(new TranslatableComponent("item.modifiers." + akv10.getName(), new Object[0]).withStyle(ChatFormatting.GRAY));
-                for (final Map.Entry<String, AttributeModifier> entry13 : multimap11.entries()) {
-                    final AttributeModifier als14 = entry13.getValue();
-                    double double15 = als14.getAmount();
+                list4.add(TextComponent.EMPTY);
+                list4.add(new TranslatableComponent("item.modifiers." + aor10.getName()).withStyle(ChatFormatting.GRAY));
+                for (final Map.Entry<Attribute, AttributeModifier> entry13 : multimap11.entries()) {
+                    final AttributeModifier apv14 = entry13.getValue();
+                    double double15 = apv14.getAmount();
                     boolean boolean19 = false;
-                    if (ayj != null) {
-                        if (als14.getId() == Item.BASE_ATTACK_DAMAGE_UUID) {
-                            double15 += ayj.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getBaseValue();
+                    if (bec != null) {
+                        if (apv14.getId() == Item.BASE_ATTACK_DAMAGE_UUID) {
+                            double15 += bec.getAttributeBaseValue(Attributes.ATTACK_DAMAGE);
                             double15 += EnchantmentHelper.getDamageBonus(this, MobType.UNDEFINED);
                             boolean19 = true;
                         }
-                        else if (als14.getId() == Item.BASE_ATTACK_SPEED_UUID) {
-                            double15 += ayj.getAttribute(SharedMonsterAttributes.ATTACK_SPEED).getBaseValue();
+                        else if (apv14.getId() == Item.BASE_ATTACK_SPEED_UUID) {
+                            double15 += bec.getAttributeBaseValue(Attributes.ATTACK_SPEED);
                             boolean19 = true;
                         }
                     }
                     double double16;
-                    if (als14.getOperation() == AttributeModifier.Operation.MULTIPLY_BASE || als14.getOperation() == AttributeModifier.Operation.MULTIPLY_TOTAL) {
+                    if (apv14.getOperation() == AttributeModifier.Operation.MULTIPLY_BASE || apv14.getOperation() == AttributeModifier.Operation.MULTIPLY_TOTAL) {
                         double16 = double15 * 100.0;
                     }
+                    else if (entry13.getKey().equals(Attributes.KNOCKBACK_RESISTANCE)) {
+                        double16 = double15 * 10.0;
+                    }
                     else {
                         double16 = double15;
                     }
                     if (boolean19) {
-                        list4.add(new TextComponent(" ").append(new TranslatableComponent("attribute.modifier.equals." + als14.getOperation().toValue(), new Object[] { ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(double16), new TranslatableComponent("attribute.name." + entry13.getKey(), new Object[0]) })).withStyle(ChatFormatting.DARK_GREEN));
+                        list4.add(new TextComponent(" ").append(new TranslatableComponent("attribute.modifier.equals." + apv14.getOperation().toValue(), new Object[] { ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(double16), new TranslatableComponent(entry13.getKey().getDescriptionId()) })).withStyle(ChatFormatting.DARK_GREEN));
                     }
                     else if (double15 > 0.0) {
-                        list4.add(new TranslatableComponent("attribute.modifier.plus." + als14.getOperation().toValue(), new Object[] { ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(double16), new TranslatableComponent("attribute.name." + entry13.getKey(), new Object[0]) }).withStyle(ChatFormatting.BLUE));
+                        list4.add(new TranslatableComponent("attribute.modifier.plus." + apv14.getOperation().toValue(), new Object[] { ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(double16), new TranslatableComponent(entry13.getKey().getDescriptionId()) }).withStyle(ChatFormatting.BLUE));
                     }
                     else {
                         if (double15 >= 0.0) {
                             continue;
                         }
                         double16 *= -1.0;
-                        list4.add(new TranslatableComponent("attribute.modifier.take." + als14.getOperation().toValue(), new Object[] { ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(double16), new TranslatableComponent("attribute.name." + entry13.getKey(), new Object[0]) }).withStyle(ChatFormatting.RED));
+                        list4.add(new TranslatableComponent("attribute.modifier.take." + apv14.getOperation().toValue(), new Object[] { ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(double16), new TranslatableComponent(entry13.getKey().getDescriptionId()) }).withStyle(ChatFormatting.RED));
                     }
                 }
             }
         }
         if (this.hasTag() && this.getTag().getBoolean("Unbreakable") && (integer6 & 0x4) == 0x0) {
-            list4.add(new TranslatableComponent("item.unbreakable", new Object[0]).withStyle(ChatFormatting.BLUE));
+            list4.add(new TranslatableComponent("item.unbreakable").withStyle(ChatFormatting.BLUE));
         }
         if (this.hasTag() && this.tag.contains("CanDestroy", 9) && (integer6 & 0x8) == 0x0) {
-            final ListTag jz9 = this.tag.getList("CanDestroy", 8);
-            if (!jz9.isEmpty()) {
-                list4.add(new TextComponent(""));
-                list4.add(new TranslatableComponent("item.canBreak", new Object[0]).withStyle(ChatFormatting.GRAY));
-                for (int integer8 = 0; integer8 < jz9.size(); ++integer8) {
-                    list4.addAll(expandBlockState(jz9.getString(integer8)));
+            final ListTag lk9 = this.tag.getList("CanDestroy", 8);
+            if (!lk9.isEmpty()) {
+                list4.add(TextComponent.EMPTY);
+                list4.add(new TranslatableComponent("item.canBreak").withStyle(ChatFormatting.GRAY));
+                for (int integer8 = 0; integer8 < lk9.size(); ++integer8) {
+                    list4.addAll(expandBlockState(lk9.getString(integer8)));
                 }
             }
         }
         if (this.hasTag() && this.tag.contains("CanPlaceOn", 9) && (integer6 & 0x10) == 0x0) {
-            final ListTag jz9 = this.tag.getList("CanPlaceOn", 8);
-            if (!jz9.isEmpty()) {
-                list4.add(new TextComponent(""));
-                list4.add(new TranslatableComponent("item.canPlace", new Object[0]).withStyle(ChatFormatting.GRAY));
-                for (int integer8 = 0; integer8 < jz9.size(); ++integer8) {
-                    list4.addAll(expandBlockState(jz9.getString(integer8)));
+            final ListTag lk9 = this.tag.getList("CanPlaceOn", 8);
+            if (!lk9.isEmpty()) {
+                list4.add(TextComponent.EMPTY);
+                list4.add(new TranslatableComponent("item.canPlace").withStyle(ChatFormatting.GRAY));
+                for (int integer8 = 0; integer8 < lk9.size(); ++integer8) {
+                    list4.addAll(expandBlockState(lk9.getString(integer8)));
                 }
             }
         }
-        if (bfw.isAdvanced()) {
+        if (bls.isAdvanced()) {
             if (this.isDamaged()) {
                 list4.add(new TranslatableComponent("item.durability", new Object[] { this.getMaxDamage() - this.getDamageValue(), this.getMaxDamage() }));
             }
@@ -591,35 +603,35 @@ public final class ItemStack {
         return list4;
     }
     
-    public static void appendEnchantmentNames(final List<Component> list, final ListTag jz) {
-        for (int integer3 = 0; integer3 < jz.size(); ++integer3) {
-            final CompoundTag jt4 = jz.getCompound(integer3);
-            Registry.ENCHANTMENT.getOptional(ResourceLocation.tryParse(jt4.getString("id"))).ifPresent(bhx -> list.add(bhx.getFullname(jt4.getInt("lvl"))));
+    public static void appendEnchantmentNames(final List<Component> list, final ListTag lk) {
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            final CompoundTag le4 = lk.getCompound(integer3);
+            Registry.ENCHANTMENT.getOptional(ResourceLocation.tryParse(le4.getString("id"))).ifPresent(bnw -> list.add(bnw.getFullname(le4.getInt("lvl"))));
         }
     }
     
     private static Collection<Component> expandBlockState(final String string) {
         try {
-            final BlockStateParser dv2 = new BlockStateParser(new StringReader(string), true).parse(true);
-            final BlockState byj3 = dv2.getState();
-            final ResourceLocation sm4 = dv2.getTag();
-            final boolean boolean5 = byj3 != null;
-            final boolean boolean6 = sm4 != null;
+            final BlockStateParser ef2 = new BlockStateParser(new StringReader(string), true).parse(true);
+            final BlockState cfj3 = ef2.getState();
+            final ResourceLocation uh4 = ef2.getTag();
+            final boolean boolean5 = cfj3 != null;
+            final boolean boolean6 = uh4 != null;
             if (boolean5 || boolean6) {
                 if (boolean5) {
-                    return Lists.newArrayList(byj3.getBlock().getName().withStyle(ChatFormatting.DARK_GRAY));
+                    return Lists.<Component>newArrayList(cfj3.getBlock().getName().withStyle(ChatFormatting.DARK_GRAY));
                 }
-                final net.minecraft.tags.Tag<Block> aaz7 = BlockTags.getAllTags().getTag(sm4);
-                if (aaz7 != null) {
-                    final Collection<Block> collection8 = aaz7.getValues();
+                final net.minecraft.tags.Tag<Block> adf7 = BlockTags.getAllTags().getTag(uh4);
+                if (adf7 != null) {
+                    final Collection<Block> collection8 = adf7.getValues();
                     if (!collection8.isEmpty()) {
-                        return collection8.stream().map(Block::getName).map(lf -> lf.withStyle(ChatFormatting.DARK_GRAY)).collect(Collectors.toList());
+                        return collection8.stream().map(Block::getName).map(mx -> mx.withStyle(ChatFormatting.DARK_GRAY)).collect(Collectors.toList());
                     }
                 }
             }
         }
         catch (CommandSyntaxException ex) {}
-        return Lists.newArrayList(new TextComponent("missingno").withStyle(ChatFormatting.DARK_GRAY));
+        return Lists.<Component>newArrayList(new TextComponent("missingno").withStyle(ChatFormatting.DARK_GRAY));
     }
     
     public boolean hasFoil() {
@@ -634,37 +646,42 @@ public final class ItemStack {
         return this.getItem().isEnchantable(this) && !this.isEnchanted();
     }
     
-    public void enchant(final Enchantment bhx, final int integer) {
+    public void enchant(final Enchantment bnw, final int integer) {
         this.getOrCreateTag();
         if (!this.tag.contains("Enchantments", 9)) {
             this.tag.put("Enchantments", new ListTag());
         }
-        final ListTag jz4 = this.tag.getList("Enchantments", 10);
-        final CompoundTag jt5 = new CompoundTag();
-        jt5.putString("id", String.valueOf(Registry.ENCHANTMENT.getKey(bhx)));
-        jt5.putShort("lvl", (byte)integer);
-        ((AbstractList<CompoundTag>)jz4).add(jt5);
+        final ListTag lk4 = this.tag.getList("Enchantments", 10);
+        final CompoundTag le5 = new CompoundTag();
+        le5.putString("id", String.valueOf(Registry.ENCHANTMENT.getKey(bnw)));
+        le5.putShort("lvl", (byte)integer);
+        ((AbstractList<CompoundTag>)lk4).add(le5);
     }
     
     public boolean isEnchanted() {
         return this.tag != null && this.tag.contains("Enchantments", 9) && !this.tag.getList("Enchantments", 10).isEmpty();
     }
     
-    public void addTagElement(final String string, final Tag kj) {
-        this.getOrCreateTag().put(string, kj);
+    public void addTagElement(final String string, final Tag lu) {
+        this.getOrCreateTag().put(string, lu);
     }
     
     public boolean isFramed() {
-        return this.frame != null;
+        return this.entityRepresentation instanceof ItemFrame;
     }
     
-    public void setFramed(@Nullable final ItemFrame avr) {
-        this.frame = avr;
+    public void setEntityRepresentation(@Nullable final Entity aom) {
+        this.entityRepresentation = aom;
     }
     
     @Nullable
     public ItemFrame getFrame() {
-        return this.emptyCacheFlag ? null : this.frame;
+        return (this.entityRepresentation instanceof ItemFrame) ? ((ItemFrame)this.getEntityRepresentation()) : null;
+    }
+    
+    @Nullable
+    public Entity getEntityRepresentation() {
+        return this.emptyCacheFlag ? null : this.entityRepresentation;
     }
     
     public int getBaseRepairCost() {
@@ -678,79 +695,78 @@ public final class ItemStack {
         this.getOrCreateTag().putInt("RepairCost", integer);
     }
     
-    public Multimap<String, AttributeModifier> getAttributeModifiers(final EquipmentSlot akv) {
-        Multimap<String, AttributeModifier> multimap3;
+    public Multimap<Attribute, AttributeModifier> getAttributeModifiers(final EquipmentSlot aor) {
+        Multimap<Attribute, AttributeModifier> multimap3;
         if (this.hasTag() && this.tag.contains("AttributeModifiers", 9)) {
             multimap3 = HashMultimap.create();
-            final ListTag jz4 = this.tag.getList("AttributeModifiers", 10);
-            for (int integer5 = 0; integer5 < jz4.size(); ++integer5) {
-                final CompoundTag jt6 = jz4.getCompound(integer5);
-                final AttributeModifier als2 = SharedMonsterAttributes.loadAttributeModifier(jt6);
-                if (als2 != null) {
-                    if (!jt6.contains("Slot", 8) || jt6.getString("Slot").equals(akv.getName())) {
-                        if (als2.getId().getLeastSignificantBits() != 0L && als2.getId().getMostSignificantBits() != 0L) {
-                            multimap3.put(jt6.getString("AttributeName"), als2);
+            final ListTag lk4 = this.tag.getList("AttributeModifiers", 10);
+            for (int integer5 = 0; integer5 < lk4.size(); ++integer5) {
+                final CompoundTag le6 = lk4.getCompound(integer5);
+                if (!le6.contains("Slot", 8) || le6.getString("Slot").equals(aor.getName())) {
+                    final Optional<Attribute> optional7 = Registry.ATTRIBUTE.getOptional(ResourceLocation.tryParse(le6.getString("AttributeName")));
+                    if (optional7.isPresent()) {
+                        final AttributeModifier apv8 = AttributeModifier.load(le6);
+                        if (apv8 != null) {
+                            if (apv8.getId().getLeastSignificantBits() != 0L && apv8.getId().getMostSignificantBits() != 0L) {
+                                multimap3.put(optional7.get(), apv8);
+                            }
                         }
                     }
                 }
             }
         }
         else {
-            multimap3 = this.getItem().getDefaultAttributeModifiers(akv);
+            multimap3 = this.getItem().getDefaultAttributeModifiers(aor);
         }
-        multimap3.values().forEach(als -> als.setSerialize(false));
         return multimap3;
     }
     
-    public void addAttributeModifier(final String string, final AttributeModifier als, @Nullable final EquipmentSlot akv) {
+    public void addAttributeModifier(final Attribute aps, final AttributeModifier apv, @Nullable final EquipmentSlot aor) {
         this.getOrCreateTag();
         if (!this.tag.contains("AttributeModifiers", 9)) {
             this.tag.put("AttributeModifiers", new ListTag());
         }
-        final ListTag jz5 = this.tag.getList("AttributeModifiers", 10);
-        final CompoundTag jt6 = SharedMonsterAttributes.saveAttributeModifier(als);
-        jt6.putString("AttributeName", string);
-        if (akv != null) {
-            jt6.putString("Slot", akv.getName());
+        final ListTag lk5 = this.tag.getList("AttributeModifiers", 10);
+        final CompoundTag le6 = apv.save();
+        le6.putString("AttributeName", Registry.ATTRIBUTE.getKey(aps).toString());
+        if (aor != null) {
+            le6.putString("Slot", aor.getName());
         }
-        ((AbstractList<CompoundTag>)jz5).add(jt6);
+        ((AbstractList<CompoundTag>)lk5).add(le6);
     }
     
     public Component getDisplayName() {
-        final Component lf2 = new TextComponent("").append(this.getHoverName());
+        final MutableComponent mx2 = new TextComponent("").append(this.getHoverName());
         if (this.hasCustomHoverName()) {
-            lf2.withStyle(ChatFormatting.ITALIC);
+            mx2.withStyle(ChatFormatting.ITALIC);
         }
-        final Component lf3 = ComponentUtils.wrapInSquareBrackets(lf2);
+        final MutableComponent mx3 = ComponentUtils.wrapInSquareBrackets(mx2);
         if (!this.emptyCacheFlag) {
-            final CompoundTag jt4 = this.save(new CompoundTag());
-            final HoverEvent hoverEvent;
-            final CompoundTag compoundTag;
-            lf3.withStyle(this.getRarity().color).withStyle(ln -> {
-                new HoverEvent(HoverEvent.Action.SHOW_ITEM, new TextComponent(compoundTag.toString()));
-                ln.setHoverEvent(hoverEvent);
-                return;
+            final HoverEvent mv;
+            mx3.withStyle(this.getRarity().color).withStyle(nb -> {
+                new HoverEvent(HoverEvent.Action.SHOW_ITEM, new HoverEvent.ItemStackInfo(this));
+                return nb.withHoverEvent(mv);
             });
         }
-        return lf3;
+        return mx3;
     }
     
-    private static boolean areSameBlocks(final BlockInWorld byn1, @Nullable final BlockInWorld byn2) {
-        return byn2 != null && byn1.getState() == byn2.getState() && ((byn1.getEntity() == null && byn2.getEntity() == null) || (byn1.getEntity() != null && byn2.getEntity() != null && Objects.equals(byn1.getEntity().save(new CompoundTag()), byn2.getEntity().save(new CompoundTag()))));
+    private static boolean areSameBlocks(final BlockInWorld cfn1, @Nullable final BlockInWorld cfn2) {
+        return cfn2 != null && cfn1.getState() == cfn2.getState() && ((cfn1.getEntity() == null && cfn2.getEntity() == null) || (cfn1.getEntity() != null && cfn2.getEntity() != null && Objects.equals(cfn1.getEntity().save(new CompoundTag()), cfn2.getEntity().save(new CompoundTag()))));
     }
     
-    public boolean hasAdventureModeBreakTagForBlock(final TagManager abb, final BlockInWorld byn) {
-        if (areSameBlocks(byn, this.cachedBreakBlock)) {
+    public boolean hasAdventureModeBreakTagForBlock(final TagManager adh, final BlockInWorld cfn) {
+        if (areSameBlocks(cfn, this.cachedBreakBlock)) {
             return this.cachedBreakBlockResult;
         }
-        this.cachedBreakBlock = byn;
+        this.cachedBreakBlock = cfn;
         if (this.hasTag() && this.tag.contains("CanDestroy", 9)) {
-            final ListTag jz4 = this.tag.getList("CanDestroy", 8);
-            for (int integer5 = 0; integer5 < jz4.size(); ++integer5) {
-                final String string6 = jz4.getString(integer5);
+            final ListTag lk4 = this.tag.getList("CanDestroy", 8);
+            for (int integer5 = 0; integer5 < lk4.size(); ++integer5) {
+                final String string6 = lk4.getString(integer5);
                 try {
-                    final Predicate<BlockInWorld> predicate7 = BlockPredicateArgument.blockPredicate().parse(new StringReader(string6)).create(abb);
-                    if (predicate7.test(byn)) {
+                    final Predicate<BlockInWorld> predicate7 = BlockPredicateArgument.blockPredicate().parse(new StringReader(string6)).create(adh);
+                    if (predicate7.test(cfn)) {
                         return this.cachedBreakBlockResult = true;
                     }
                 }
@@ -760,18 +776,18 @@ public final class ItemStack {
         return this.cachedBreakBlockResult = false;
     }
     
-    public boolean hasAdventureModePlaceTagForBlock(final TagManager abb, final BlockInWorld byn) {
-        if (areSameBlocks(byn, this.cachedPlaceBlock)) {
+    public boolean hasAdventureModePlaceTagForBlock(final TagManager adh, final BlockInWorld cfn) {
+        if (areSameBlocks(cfn, this.cachedPlaceBlock)) {
             return this.cachedPlaceBlockResult;
         }
-        this.cachedPlaceBlock = byn;
+        this.cachedPlaceBlock = cfn;
         if (this.hasTag() && this.tag.contains("CanPlaceOn", 9)) {
-            final ListTag jz4 = this.tag.getList("CanPlaceOn", 8);
-            for (int integer5 = 0; integer5 < jz4.size(); ++integer5) {
-                final String string6 = jz4.getString(integer5);
+            final ListTag lk4 = this.tag.getList("CanPlaceOn", 8);
+            for (int integer5 = 0; integer5 < lk4.size(); ++integer5) {
+                final String string6 = lk4.getString(integer5);
                 try {
-                    final Predicate<BlockInWorld> predicate7 = BlockPredicateArgument.blockPredicate().parse(new StringReader(string6)).create(abb);
-                    if (predicate7.test(byn)) {
+                    final Predicate<BlockInWorld> predicate7 = BlockPredicateArgument.blockPredicate().parse(new StringReader(string6)).create(adh);
+                    if (predicate7.test(cfn)) {
                         return this.cachedPlaceBlockResult = true;
                     }
                 }
@@ -806,8 +822,8 @@ public final class ItemStack {
         this.grow(-integer);
     }
     
-    public void onUseTick(final Level bjw, final LivingEntity akz, final int integer) {
-        this.getItem().onUseTick(bjw, akz, this, integer);
+    public void onUseTick(final Level bqb, final LivingEntity aoy, final int integer) {
+        this.getItem().onUseTick(bqb, aoy, this, integer);
     }
     
     public boolean isEdible() {
@@ -823,8 +839,10 @@ public final class ItemStack {
     }
     
     static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Registry.ITEM.fieldOf("id").forGetter(bki -> bki.item), (App)Codec.INT.fieldOf("Count").forGetter(bki -> bki.count), (App)CompoundTag.CODEC.optionalFieldOf("tag").forGetter(bki -> Optional.<CompoundTag>ofNullable(bki.tag))).apply(instance, ItemStack::new));
         LOGGER = LogManager.getLogger();
         EMPTY = new ItemStack((ItemLike)null);
-        ATTRIBUTE_MODIFIER_FORMAT = getAttributeDecimalFormat();
+        ATTRIBUTE_MODIFIER_FORMAT = Util.<DecimalFormat>make(new DecimalFormat("#.##"), decimalFormat -> decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT)));
+        LORE_STYLE = Style.EMPTY.withColor(ChatFormatting.DARK_PURPLE).withItalic(true);
     }
 }
diff --git a/src/net/minecraft/world/item/ItemUtils.java b/src/net/minecraft/world/item/ItemUtils.java
new file mode 100644
index 0000000..47fb90d
--- /dev/null
+++ b/src/net/minecraft/world/item/ItemUtils.java
@@ -0,0 +1,30 @@
+package net.minecraft.world.item;
+
+import net.minecraft.world.InteractionResultHolder;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+
+public class ItemUtils {
+    public static InteractionResultHolder<ItemStack> useDrink(final Level bqb, final Player bec, final InteractionHand anf) {
+        bec.startUsingItem(anf);
+        return InteractionResultHolder.<ItemStack>consume(bec.getItemInHand(anf));
+    }
+    
+    public static ItemStack createBucketResult(final ItemStack bki1, final Player bec, final ItemStack bki3) {
+        if (bec.abilities.instabuild) {
+            if (!bec.inventory.contains(bki3)) {
+                bec.inventory.add(bki3);
+            }
+            return bki1;
+        }
+        bki1.shrink(1);
+        if (bki1.isEmpty()) {
+            return bki3;
+        }
+        if (!bec.inventory.add(bki3)) {
+            bec.drop(bki3, false);
+        }
+        return bki1;
+    }
+}
diff --git a/src/net/minecraft/world/item/Items.java b/src/net/minecraft/world/item/Items.java
index f6a3e54..aac78a0 100644
--- a/src/net/minecraft/world/item/Items.java
+++ b/src/net/minecraft/world/item/Items.java
@@ -28,6 +28,8 @@ public class Items {
     public static final Item DIRT;
     public static final Item COARSE_DIRT;
     public static final Item PODZOL;
+    public static final Item CRIMSON_NYLIUM;
+    public static final Item WARPED_NYLIUM;
     public static final Item COBBLESTONE;
     public static final Item OAK_PLANKS;
     public static final Item SPRUCE_PLANKS;
@@ -35,6 +37,8 @@ public class Items {
     public static final Item JUNGLE_PLANKS;
     public static final Item ACACIA_PLANKS;
     public static final Item DARK_OAK_PLANKS;
+    public static final Item CRIMSON_PLANKS;
+    public static final Item WARPED_PLANKS;
     public static final Item OAK_SAPLING;
     public static final Item SPRUCE_SAPLING;
     public static final Item BIRCH_SAPLING;
@@ -48,30 +52,39 @@ public class Items {
     public static final Item GOLD_ORE;
     public static final Item IRON_ORE;
     public static final Item COAL_ORE;
+    public static final Item NETHER_GOLD_ORE;
     public static final Item OAK_LOG;
     public static final Item SPRUCE_LOG;
     public static final Item BIRCH_LOG;
     public static final Item JUNGLE_LOG;
     public static final Item ACACIA_LOG;
     public static final Item DARK_OAK_LOG;
+    public static final Item CRIMSON_STEM;
+    public static final Item WARPED_STEM;
     public static final Item STRIPPED_OAK_LOG;
     public static final Item STRIPPED_SPRUCE_LOG;
     public static final Item STRIPPED_BIRCH_LOG;
     public static final Item STRIPPED_JUNGLE_LOG;
     public static final Item STRIPPED_ACACIA_LOG;
     public static final Item STRIPPED_DARK_OAK_LOG;
+    public static final Item STRIPPED_CRIMSON_STEM;
+    public static final Item STRIPPED_WARPED_STEM;
     public static final Item STRIPPED_OAK_WOOD;
     public static final Item STRIPPED_SPRUCE_WOOD;
     public static final Item STRIPPED_BIRCH_WOOD;
     public static final Item STRIPPED_JUNGLE_WOOD;
     public static final Item STRIPPED_ACACIA_WOOD;
     public static final Item STRIPPED_DARK_OAK_WOOD;
+    public static final Item STRIPPED_CRIMSON_HYPHAE;
+    public static final Item STRIPPED_WARPED_HYPHAE;
     public static final Item OAK_WOOD;
     public static final Item SPRUCE_WOOD;
     public static final Item BIRCH_WOOD;
     public static final Item JUNGLE_WOOD;
     public static final Item ACACIA_WOOD;
     public static final Item DARK_OAK_WOOD;
+    public static final Item CRIMSON_HYPHAE;
+    public static final Item WARPED_HYPHAE;
     public static final Item OAK_LEAVES;
     public static final Item SPRUCE_LEAVES;
     public static final Item BIRCH_LEAVES;
@@ -129,6 +142,16 @@ public class Items {
     public static final Item WITHER_ROSE;
     public static final Item BROWN_MUSHROOM;
     public static final Item RED_MUSHROOM;
+    public static final Item CRIMSON_FUNGUS;
+    public static final Item WARPED_FUNGUS;
+    public static final Item CRIMSON_ROOTS;
+    public static final Item WARPED_ROOTS;
+    public static final Item NETHER_SPROUTS;
+    public static final Item WEEPING_VINES;
+    public static final Item TWISTING_VINES;
+    public static final Item SUGAR_CANE;
+    public static final Item KELP;
+    public static final Item BAMBOO;
     public static final Item GOLD_BLOCK;
     public static final Item IRON_BLOCK;
     public static final Item OAK_SLAB;
@@ -137,6 +160,8 @@ public class Items {
     public static final Item JUNGLE_SLAB;
     public static final Item ACACIA_SLAB;
     public static final Item DARK_OAK_SLAB;
+    public static final Item CRIMSON_SLAB;
+    public static final Item WARPED_SLAB;
     public static final Item STONE_SLAB;
     public static final Item SMOOTH_STONE_SLAB;
     public static final Item SANDSTONE_SLAB;
@@ -188,9 +213,11 @@ public class Items {
     public static final Item JUNGLE_PRESSURE_PLATE;
     public static final Item ACACIA_PRESSURE_PLATE;
     public static final Item DARK_OAK_PRESSURE_PLATE;
+    public static final Item CRIMSON_PRESSURE_PLATE;
+    public static final Item WARPED_PRESSURE_PLATE;
+    public static final Item POLISHED_BLACKSTONE_PRESSURE_PLATE;
     public static final Item REDSTONE_ORE;
     public static final Item REDSTONE_TORCH;
-    public static final Item STONE_BUTTON;
     public static final Item SNOW;
     public static final Item ICE;
     public static final Item SNOW_BLOCK;
@@ -203,10 +230,16 @@ public class Items {
     public static final Item JUNGLE_FENCE;
     public static final Item ACACIA_FENCE;
     public static final Item DARK_OAK_FENCE;
+    public static final Item CRIMSON_FENCE;
+    public static final Item WARPED_FENCE;
     public static final Item PUMPKIN;
     public static final Item CARVED_PUMPKIN;
     public static final Item NETHERRACK;
     public static final Item SOUL_SAND;
+    public static final Item SOUL_SOIL;
+    public static final Item BASALT;
+    public static final Item POLISHED_BASALT;
+    public static final Item SOUL_TORCH;
     public static final Item GLOWSTONE;
     public static final Item JACK_O_LANTERN;
     public static final Item OAK_TRAPDOOR;
@@ -215,6 +248,8 @@ public class Items {
     public static final Item JUNGLE_TRAPDOOR;
     public static final Item ACACIA_TRAPDOOR;
     public static final Item DARK_OAK_TRAPDOOR;
+    public static final Item CRIMSON_TRAPDOOR;
+    public static final Item WARPED_TRAPDOOR;
     public static final Item INFESTED_STONE;
     public static final Item INFESTED_COBBLESTONE;
     public static final Item INFESTED_STONE_BRICKS;
@@ -229,6 +264,7 @@ public class Items {
     public static final Item RED_MUSHROOM_BLOCK;
     public static final Item MUSHROOM_STEM;
     public static final Item IRON_BARS;
+    public static final Item CHAIN;
     public static final Item GLASS_PANE;
     public static final Item MELON;
     public static final Item VINE;
@@ -238,11 +274,15 @@ public class Items {
     public static final Item JUNGLE_FENCE_GATE;
     public static final Item ACACIA_FENCE_GATE;
     public static final Item DARK_OAK_FENCE_GATE;
+    public static final Item CRIMSON_FENCE_GATE;
+    public static final Item WARPED_FENCE_GATE;
     public static final Item BRICK_STAIRS;
     public static final Item STONE_BRICK_STAIRS;
     public static final Item MYCELIUM;
     public static final Item LILY_PAD;
     public static final Item NETHER_BRICKS;
+    public static final Item CRACKED_NETHER_BRICKS;
+    public static final Item CHISELED_NETHER_BRICKS;
     public static final Item NETHER_BRICK_FENCE;
     public static final Item NETHER_BRICK_STAIRS;
     public static final Item ENCHANTING_TABLE;
@@ -259,6 +299,8 @@ public class Items {
     public static final Item SPRUCE_STAIRS;
     public static final Item BIRCH_STAIRS;
     public static final Item JUNGLE_STAIRS;
+    public static final Item CRIMSON_STAIRS;
+    public static final Item WARPED_STAIRS;
     public static final Item COMMAND_BLOCK;
     public static final Item BEACON;
     public static final Item COBBLESTONE_WALL;
@@ -275,12 +317,19 @@ public class Items {
     public static final Item SANDSTONE_WALL;
     public static final Item END_STONE_BRICK_WALL;
     public static final Item DIORITE_WALL;
+    public static final Item BLACKSTONE_WALL;
+    public static final Item POLISHED_BLACKSTONE_WALL;
+    public static final Item POLISHED_BLACKSTONE_BRICK_WALL;
+    public static final Item STONE_BUTTON;
     public static final Item OAK_BUTTON;
     public static final Item SPRUCE_BUTTON;
     public static final Item BIRCH_BUTTON;
     public static final Item JUNGLE_BUTTON;
     public static final Item ACACIA_BUTTON;
     public static final Item DARK_OAK_BUTTON;
+    public static final Item CRIMSON_BUTTON;
+    public static final Item WARPED_BUTTON;
+    public static final Item POLISHED_BLACKSTONE_BUTTON;
     public static final Item ANVIL;
     public static final Item CHIPPED_ANVIL;
     public static final Item DAMAGED_ANVIL;
@@ -293,6 +342,7 @@ public class Items {
     public static final Item HOPPER;
     public static final Item CHISELED_QUARTZ_BLOCK;
     public static final Item QUARTZ_BLOCK;
+    public static final Item QUARTZ_BRICKS;
     public static final Item QUARTZ_PILLAR;
     public static final Item QUARTZ_STAIRS;
     public static final Item ACTIVATOR_RAIL;
@@ -392,6 +442,7 @@ public class Items {
     public static final Item CHAIN_COMMAND_BLOCK;
     public static final Item MAGMA_BLOCK;
     public static final Item NETHER_WART_BLOCK;
+    public static final Item WARPED_WART_BLOCK;
     public static final Item RED_NETHER_BRICKS;
     public static final Item BONE_BLOCK;
     public static final Item STRUCTURE_VOID;
@@ -529,11 +580,12 @@ public class Items {
     public static final Item JUNGLE_DOOR;
     public static final Item ACACIA_DOOR;
     public static final Item DARK_OAK_DOOR;
+    public static final Item CRIMSON_DOOR;
+    public static final Item WARPED_DOOR;
     public static final Item REPEATER;
     public static final Item COMPARATOR;
     public static final Item STRUCTURE_BLOCK;
     public static final Item JIGSAW;
-    public static final Item COMPOSTER;
     public static final Item TURTLE_HELMET;
     public static final Item SCUTE;
     public static final Item IRON_SHOVEL;
@@ -548,6 +600,8 @@ public class Items {
     public static final Item DIAMOND;
     public static final Item IRON_INGOT;
     public static final Item GOLD_INGOT;
+    public static final Item NETHERITE_INGOT;
+    public static final Item NETHERITE_SCRAP;
     public static final Item IRON_SWORD;
     public static final Item WOODEN_SWORD;
     public static final Item WOODEN_SHOVEL;
@@ -568,6 +622,10 @@ public class Items {
     public static final Item GOLDEN_SHOVEL;
     public static final Item GOLDEN_PICKAXE;
     public static final Item GOLDEN_AXE;
+    public static final Item NETHERITE_SWORD;
+    public static final Item NETHERITE_SHOVEL;
+    public static final Item NETHERITE_PICKAXE;
+    public static final Item NETHERITE_AXE;
     public static final Item STRING;
     public static final Item FEATHER;
     public static final Item GUNPOWDER;
@@ -576,6 +634,7 @@ public class Items {
     public static final Item IRON_HOE;
     public static final Item DIAMOND_HOE;
     public static final Item GOLDEN_HOE;
+    public static final Item NETHERITE_HOE;
     public static final Item WHEAT_SEEDS;
     public static final Item WHEAT;
     public static final Item BREAD;
@@ -599,6 +658,10 @@ public class Items {
     public static final Item GOLDEN_CHESTPLATE;
     public static final Item GOLDEN_LEGGINGS;
     public static final Item GOLDEN_BOOTS;
+    public static final Item NETHERITE_HELMET;
+    public static final Item NETHERITE_CHESTPLATE;
+    public static final Item NETHERITE_LEGGINGS;
+    public static final Item NETHERITE_BOOTS;
     public static final Item FLINT;
     public static final Item PORKCHOP;
     public static final Item COOKED_PORKCHOP;
@@ -611,6 +674,8 @@ public class Items {
     public static final Item JUNGLE_SIGN;
     public static final Item ACACIA_SIGN;
     public static final Item DARK_OAK_SIGN;
+    public static final Item CRIMSON_SIGN;
+    public static final Item WARPED_SIGN;
     public static final Item BUCKET;
     public static final Item WATER_BUCKET;
     public static final Item LAVA_BUCKET;
@@ -627,10 +692,7 @@ public class Items {
     public static final Item TROPICAL_FISH_BUCKET;
     public static final Item BRICK;
     public static final Item CLAY_BALL;
-    public static final Item SUGAR_CANE;
-    public static final Item KELP;
     public static final Item DRIED_KELP_BLOCK;
-    public static final Item BAMBOO;
     public static final Item PAPER;
     public static final Item BOOK;
     public static final Item SLIME_BALL;
@@ -732,6 +794,7 @@ public class Items {
     public static final Item FOX_SPAWN_EGG;
     public static final Item GHAST_SPAWN_EGG;
     public static final Item GUARDIAN_SPAWN_EGG;
+    public static final Item HOGLIN_SPAWN_EGG;
     public static final Item HORSE_SPAWN_EGG;
     public static final Item HUSK_SPAWN_EGG;
     public static final Item LLAMA_SPAWN_EGG;
@@ -743,6 +806,7 @@ public class Items {
     public static final Item PARROT_SPAWN_EGG;
     public static final Item PHANTOM_SPAWN_EGG;
     public static final Item PIG_SPAWN_EGG;
+    public static final Item PIGLIN_SPAWN_EGG;
     public static final Item PILLAGER_SPAWN_EGG;
     public static final Item POLAR_BEAR_SPAWN_EGG;
     public static final Item PUFFERFISH_SPAWN_EGG;
@@ -758,6 +822,7 @@ public class Items {
     public static final Item SPIDER_SPAWN_EGG;
     public static final Item SQUID_SPAWN_EGG;
     public static final Item STRAY_SPAWN_EGG;
+    public static final Item STRIDER_SPAWN_EGG;
     public static final Item TRADER_LLAMA_SPAWN_EGG;
     public static final Item TROPICAL_FISH_SPAWN_EGG;
     public static final Item TURTLE_SPAWN_EGG;
@@ -768,10 +833,11 @@ public class Items {
     public static final Item WITCH_SPAWN_EGG;
     public static final Item WITHER_SKELETON_SPAWN_EGG;
     public static final Item WOLF_SPAWN_EGG;
+    public static final Item ZOGLIN_SPAWN_EGG;
     public static final Item ZOMBIE_SPAWN_EGG;
     public static final Item ZOMBIE_HORSE_SPAWN_EGG;
-    public static final Item ZOMBIE_PIGMAN_SPAWN_EGG;
     public static final Item ZOMBIE_VILLAGER_SPAWN_EGG;
+    public static final Item ZOMBIFIED_PIGLIN_SPAWN_EGG;
     public static final Item EXPERIENCE_BOTTLE;
     public static final Item FIRE_CHARGE;
     public static final Item WRITABLE_BOOK;
@@ -792,6 +858,7 @@ public class Items {
     public static final Item CREEPER_HEAD;
     public static final Item DRAGON_HEAD;
     public static final Item CARROT_ON_A_STICK;
+    public static final Item WARPED_FUNGUS_ON_A_STICK;
     public static final Item NETHER_STAR;
     public static final Item PUMPKIN_PIE;
     public static final Item FIREWORK_ROCKET;
@@ -869,6 +936,7 @@ public class Items {
     public static final Item MUSIC_DISC_WARD;
     public static final Item MUSIC_DISC_11;
     public static final Item MUSIC_DISC_WAIT;
+    public static final Item MUSIC_DISC_PIGSTEP;
     public static final Item TRIDENT;
     public static final Item PHANTOM_MEMBRANE;
     public static final Item NAUTILUS_SHELL;
@@ -881,6 +949,8 @@ public class Items {
     public static final Item SKULL_BANNER_PATTERN;
     public static final Item MOJANG_BANNER_PATTERN;
     public static final Item GLOBE_BANNER_PATTER;
+    public static final Item PIGLIN_BANNER_PATTERN;
+    public static final Item COMPOSTER;
     public static final Item BARREL;
     public static final Item SMOKER;
     public static final Item BLAST_FURNACE;
@@ -892,40 +962,61 @@ public class Items {
     public static final Item STONECUTTER;
     public static final Item BELL;
     public static final Item LANTERN;
+    public static final Item SOUL_LANTERN;
     public static final Item SWEET_BERRIES;
     public static final Item CAMPFIRE;
+    public static final Item SOUL_CAMPFIRE;
+    public static final Item SHROOMLIGHT;
     public static final Item HONEYCOMB;
     public static final Item BEE_NEST;
     public static final Item BEEHIVE;
     public static final Item HONEY_BOTTLE;
     public static final Item HONEY_BLOCK;
     public static final Item HONEYCOMB_BLOCK;
+    public static final Item LODESTONE;
+    public static final Item NETHERITE_BLOCK;
+    public static final Item ANCIENT_DEBRIS;
+    public static final Item TARGET;
+    public static final Item CRYING_OBSIDIAN;
+    public static final Item BLACKSTONE;
+    public static final Item BLACKSTONE_SLAB;
+    public static final Item BLACKSTONE_STAIRS;
+    public static final Item GILDED_BLACKSTONE;
+    public static final Item POLISHED_BLACKSTONE;
+    public static final Item POLISHED_BLACKSTONE_SLAB;
+    public static final Item POLISHED_BLACKSTONE_STAIRS;
+    public static final Item CHISELED_POLISHED_BLACKSTONE;
+    public static final Item POLISHED_BLACKSTONE_BRICKS;
+    public static final Item POLISHED_BLACKSTONE_BRICK_SLAB;
+    public static final Item POLISHED_BLACKSTONE_BRICK_STAIRS;
+    public static final Item CRACKED_POLISHED_BLACKSTONE_BRICKS;
+    public static final Item RESPAWN_ANCHOR;
     
-    private static Item registerBlock(final Block bph) {
-        return registerBlock(new BlockItem(bph, new Item.Properties()));
+    private static Item registerBlock(final Block bvr) {
+        return registerBlock(new BlockItem(bvr, new Item.Properties()));
     }
     
-    private static Item registerBlock(final Block bph, final CreativeModeTab bdd) {
-        return registerBlock(new BlockItem(bph, new Item.Properties().tab(bdd)));
+    private static Item registerBlock(final Block bvr, final CreativeModeTab biy) {
+        return registerBlock(new BlockItem(bvr, new Item.Properties().tab(biy)));
     }
     
-    private static Item registerBlock(final BlockItem bcp) {
-        return registerBlock(bcp.getBlock(), bcp);
+    private static Item registerBlock(final BlockItem bim) {
+        return registerBlock(bim.getBlock(), bim);
     }
     
-    protected static Item registerBlock(final Block bph, final Item bei) {
-        return registerItem(Registry.BLOCK.getKey(bph), bei);
+    protected static Item registerBlock(final Block bvr, final Item bke) {
+        return registerItem(Registry.BLOCK.getKey(bvr), bke);
     }
     
-    private static Item registerItem(final String string, final Item bei) {
-        return registerItem(new ResourceLocation(string), bei);
+    private static Item registerItem(final String string, final Item bke) {
+        return registerItem(new ResourceLocation(string), bke);
     }
     
-    private static Item registerItem(final ResourceLocation sm, final Item bei) {
-        if (bei instanceof BlockItem) {
-            ((BlockItem)bei).registerBlocks(Item.BY_BLOCK, bei);
+    private static Item registerItem(final ResourceLocation uh, final Item bke) {
+        if (bke instanceof BlockItem) {
+            ((BlockItem)bke).registerBlocks(Item.BY_BLOCK, bke);
         }
-        return Registry.<Item>register(Registry.ITEM, sm, bei);
+        return Registry.<Item, Item>register(Registry.ITEM, uh, bke);
     }
     
     static {
@@ -941,6 +1032,8 @@ public class Items {
         DIRT = registerBlock(Blocks.DIRT, CreativeModeTab.TAB_BUILDING_BLOCKS);
         COARSE_DIRT = registerBlock(Blocks.COARSE_DIRT, CreativeModeTab.TAB_BUILDING_BLOCKS);
         PODZOL = registerBlock(Blocks.PODZOL, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        CRIMSON_NYLIUM = registerBlock(Blocks.CRIMSON_NYLIUM, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        WARPED_NYLIUM = registerBlock(Blocks.WARPED_NYLIUM, CreativeModeTab.TAB_BUILDING_BLOCKS);
         COBBLESTONE = registerBlock(Blocks.COBBLESTONE, CreativeModeTab.TAB_BUILDING_BLOCKS);
         OAK_PLANKS = registerBlock(Blocks.OAK_PLANKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         SPRUCE_PLANKS = registerBlock(Blocks.SPRUCE_PLANKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
@@ -948,6 +1041,8 @@ public class Items {
         JUNGLE_PLANKS = registerBlock(Blocks.JUNGLE_PLANKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         ACACIA_PLANKS = registerBlock(Blocks.ACACIA_PLANKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         DARK_OAK_PLANKS = registerBlock(Blocks.DARK_OAK_PLANKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        CRIMSON_PLANKS = registerBlock(Blocks.CRIMSON_PLANKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        WARPED_PLANKS = registerBlock(Blocks.WARPED_PLANKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         OAK_SAPLING = registerBlock(Blocks.OAK_SAPLING, CreativeModeTab.TAB_DECORATIONS);
         SPRUCE_SAPLING = registerBlock(Blocks.SPRUCE_SAPLING, CreativeModeTab.TAB_DECORATIONS);
         BIRCH_SAPLING = registerBlock(Blocks.BIRCH_SAPLING, CreativeModeTab.TAB_DECORATIONS);
@@ -961,30 +1056,39 @@ public class Items {
         GOLD_ORE = registerBlock(Blocks.GOLD_ORE, CreativeModeTab.TAB_BUILDING_BLOCKS);
         IRON_ORE = registerBlock(Blocks.IRON_ORE, CreativeModeTab.TAB_BUILDING_BLOCKS);
         COAL_ORE = registerBlock(Blocks.COAL_ORE, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        NETHER_GOLD_ORE = registerBlock(Blocks.NETHER_GOLD_ORE, CreativeModeTab.TAB_BUILDING_BLOCKS);
         OAK_LOG = registerBlock(Blocks.OAK_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
         SPRUCE_LOG = registerBlock(Blocks.SPRUCE_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
         BIRCH_LOG = registerBlock(Blocks.BIRCH_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
         JUNGLE_LOG = registerBlock(Blocks.JUNGLE_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
         ACACIA_LOG = registerBlock(Blocks.ACACIA_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
         DARK_OAK_LOG = registerBlock(Blocks.DARK_OAK_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        CRIMSON_STEM = registerBlock(Blocks.CRIMSON_STEM, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        WARPED_STEM = registerBlock(Blocks.WARPED_STEM, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_OAK_LOG = registerBlock(Blocks.STRIPPED_OAK_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_SPRUCE_LOG = registerBlock(Blocks.STRIPPED_SPRUCE_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_BIRCH_LOG = registerBlock(Blocks.STRIPPED_BIRCH_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_JUNGLE_LOG = registerBlock(Blocks.STRIPPED_JUNGLE_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_ACACIA_LOG = registerBlock(Blocks.STRIPPED_ACACIA_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_DARK_OAK_LOG = registerBlock(Blocks.STRIPPED_DARK_OAK_LOG, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        STRIPPED_CRIMSON_STEM = registerBlock(Blocks.STRIPPED_CRIMSON_STEM, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        STRIPPED_WARPED_STEM = registerBlock(Blocks.STRIPPED_WARPED_STEM, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_OAK_WOOD = registerBlock(Blocks.STRIPPED_OAK_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_SPRUCE_WOOD = registerBlock(Blocks.STRIPPED_SPRUCE_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_BIRCH_WOOD = registerBlock(Blocks.STRIPPED_BIRCH_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_JUNGLE_WOOD = registerBlock(Blocks.STRIPPED_JUNGLE_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_ACACIA_WOOD = registerBlock(Blocks.STRIPPED_ACACIA_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRIPPED_DARK_OAK_WOOD = registerBlock(Blocks.STRIPPED_DARK_OAK_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        STRIPPED_CRIMSON_HYPHAE = registerBlock(Blocks.STRIPPED_CRIMSON_HYPHAE, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        STRIPPED_WARPED_HYPHAE = registerBlock(Blocks.STRIPPED_WARPED_HYPHAE, CreativeModeTab.TAB_BUILDING_BLOCKS);
         OAK_WOOD = registerBlock(Blocks.OAK_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
         SPRUCE_WOOD = registerBlock(Blocks.SPRUCE_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
         BIRCH_WOOD = registerBlock(Blocks.BIRCH_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
         JUNGLE_WOOD = registerBlock(Blocks.JUNGLE_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
         ACACIA_WOOD = registerBlock(Blocks.ACACIA_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
         DARK_OAK_WOOD = registerBlock(Blocks.DARK_OAK_WOOD, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        CRIMSON_HYPHAE = registerBlock(Blocks.CRIMSON_HYPHAE, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        WARPED_HYPHAE = registerBlock(Blocks.WARPED_HYPHAE, CreativeModeTab.TAB_BUILDING_BLOCKS);
         OAK_LEAVES = registerBlock(Blocks.OAK_LEAVES, CreativeModeTab.TAB_DECORATIONS);
         SPRUCE_LEAVES = registerBlock(Blocks.SPRUCE_LEAVES, CreativeModeTab.TAB_DECORATIONS);
         BIRCH_LEAVES = registerBlock(Blocks.BIRCH_LEAVES, CreativeModeTab.TAB_DECORATIONS);
@@ -1042,6 +1146,16 @@ public class Items {
         WITHER_ROSE = registerBlock(Blocks.WITHER_ROSE, CreativeModeTab.TAB_DECORATIONS);
         BROWN_MUSHROOM = registerBlock(Blocks.BROWN_MUSHROOM, CreativeModeTab.TAB_DECORATIONS);
         RED_MUSHROOM = registerBlock(Blocks.RED_MUSHROOM, CreativeModeTab.TAB_DECORATIONS);
+        CRIMSON_FUNGUS = registerBlock(Blocks.CRIMSON_FUNGUS, CreativeModeTab.TAB_DECORATIONS);
+        WARPED_FUNGUS = registerBlock(Blocks.WARPED_FUNGUS, CreativeModeTab.TAB_DECORATIONS);
+        CRIMSON_ROOTS = registerBlock(Blocks.CRIMSON_ROOTS, CreativeModeTab.TAB_DECORATIONS);
+        WARPED_ROOTS = registerBlock(Blocks.WARPED_ROOTS, CreativeModeTab.TAB_DECORATIONS);
+        NETHER_SPROUTS = registerBlock(Blocks.NETHER_SPROUTS, CreativeModeTab.TAB_DECORATIONS);
+        WEEPING_VINES = registerBlock(Blocks.WEEPING_VINES, CreativeModeTab.TAB_DECORATIONS);
+        TWISTING_VINES = registerBlock(Blocks.TWISTING_VINES, CreativeModeTab.TAB_DECORATIONS);
+        SUGAR_CANE = registerBlock(Blocks.SUGAR_CANE, CreativeModeTab.TAB_DECORATIONS);
+        KELP = registerBlock(Blocks.KELP, CreativeModeTab.TAB_DECORATIONS);
+        BAMBOO = registerBlock(Blocks.BAMBOO, CreativeModeTab.TAB_DECORATIONS);
         GOLD_BLOCK = registerBlock(Blocks.GOLD_BLOCK, CreativeModeTab.TAB_BUILDING_BLOCKS);
         IRON_BLOCK = registerBlock(Blocks.IRON_BLOCK, CreativeModeTab.TAB_BUILDING_BLOCKS);
         OAK_SLAB = registerBlock(Blocks.OAK_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
@@ -1050,6 +1164,8 @@ public class Items {
         JUNGLE_SLAB = registerBlock(Blocks.JUNGLE_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
         ACACIA_SLAB = registerBlock(Blocks.ACACIA_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
         DARK_OAK_SLAB = registerBlock(Blocks.DARK_OAK_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        CRIMSON_SLAB = registerBlock(Blocks.CRIMSON_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        WARPED_SLAB = registerBlock(Blocks.WARPED_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STONE_SLAB = registerBlock(Blocks.STONE_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
         SMOOTH_STONE_SLAB = registerBlock(Blocks.SMOOTH_STONE_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
         SANDSTONE_SLAB = registerBlock(Blocks.SANDSTONE_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
@@ -1101,9 +1217,11 @@ public class Items {
         JUNGLE_PRESSURE_PLATE = registerBlock(Blocks.JUNGLE_PRESSURE_PLATE, CreativeModeTab.TAB_REDSTONE);
         ACACIA_PRESSURE_PLATE = registerBlock(Blocks.ACACIA_PRESSURE_PLATE, CreativeModeTab.TAB_REDSTONE);
         DARK_OAK_PRESSURE_PLATE = registerBlock(Blocks.DARK_OAK_PRESSURE_PLATE, CreativeModeTab.TAB_REDSTONE);
+        CRIMSON_PRESSURE_PLATE = registerBlock(Blocks.CRIMSON_PRESSURE_PLATE, CreativeModeTab.TAB_REDSTONE);
+        WARPED_PRESSURE_PLATE = registerBlock(Blocks.WARPED_PRESSURE_PLATE, CreativeModeTab.TAB_REDSTONE);
+        POLISHED_BLACKSTONE_PRESSURE_PLATE = registerBlock(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE, CreativeModeTab.TAB_REDSTONE);
         REDSTONE_ORE = registerBlock(Blocks.REDSTONE_ORE, CreativeModeTab.TAB_BUILDING_BLOCKS);
         REDSTONE_TORCH = registerBlock(new StandingAndWallBlockItem(Blocks.REDSTONE_TORCH, Blocks.REDSTONE_WALL_TORCH, new Item.Properties().tab(CreativeModeTab.TAB_REDSTONE)));
-        STONE_BUTTON = registerBlock(Blocks.STONE_BUTTON, CreativeModeTab.TAB_REDSTONE);
         SNOW = registerBlock(Blocks.SNOW, CreativeModeTab.TAB_DECORATIONS);
         ICE = registerBlock(Blocks.ICE, CreativeModeTab.TAB_BUILDING_BLOCKS);
         SNOW_BLOCK = registerBlock(Blocks.SNOW_BLOCK, CreativeModeTab.TAB_BUILDING_BLOCKS);
@@ -1116,10 +1234,16 @@ public class Items {
         JUNGLE_FENCE = registerBlock(Blocks.JUNGLE_FENCE, CreativeModeTab.TAB_DECORATIONS);
         ACACIA_FENCE = registerBlock(Blocks.ACACIA_FENCE, CreativeModeTab.TAB_DECORATIONS);
         DARK_OAK_FENCE = registerBlock(Blocks.DARK_OAK_FENCE, CreativeModeTab.TAB_DECORATIONS);
+        CRIMSON_FENCE = registerBlock(Blocks.CRIMSON_FENCE, CreativeModeTab.TAB_DECORATIONS);
+        WARPED_FENCE = registerBlock(Blocks.WARPED_FENCE, CreativeModeTab.TAB_DECORATIONS);
         PUMPKIN = registerBlock(Blocks.PUMPKIN, CreativeModeTab.TAB_BUILDING_BLOCKS);
         CARVED_PUMPKIN = registerBlock(Blocks.CARVED_PUMPKIN, CreativeModeTab.TAB_BUILDING_BLOCKS);
         NETHERRACK = registerBlock(Blocks.NETHERRACK, CreativeModeTab.TAB_BUILDING_BLOCKS);
         SOUL_SAND = registerBlock(Blocks.SOUL_SAND, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        SOUL_SOIL = registerBlock(Blocks.SOUL_SOIL, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        BASALT = registerBlock(Blocks.BASALT, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        POLISHED_BASALT = registerBlock(Blocks.POLISHED_BASALT, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        SOUL_TORCH = registerBlock(new StandingAndWallBlockItem(Blocks.SOUL_TORCH, Blocks.SOUL_WALL_TORCH, new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
         GLOWSTONE = registerBlock(Blocks.GLOWSTONE, CreativeModeTab.TAB_BUILDING_BLOCKS);
         JACK_O_LANTERN = registerBlock(Blocks.JACK_O_LANTERN, CreativeModeTab.TAB_BUILDING_BLOCKS);
         OAK_TRAPDOOR = registerBlock(Blocks.OAK_TRAPDOOR, CreativeModeTab.TAB_REDSTONE);
@@ -1128,6 +1252,8 @@ public class Items {
         JUNGLE_TRAPDOOR = registerBlock(Blocks.JUNGLE_TRAPDOOR, CreativeModeTab.TAB_REDSTONE);
         ACACIA_TRAPDOOR = registerBlock(Blocks.ACACIA_TRAPDOOR, CreativeModeTab.TAB_REDSTONE);
         DARK_OAK_TRAPDOOR = registerBlock(Blocks.DARK_OAK_TRAPDOOR, CreativeModeTab.TAB_REDSTONE);
+        CRIMSON_TRAPDOOR = registerBlock(Blocks.CRIMSON_TRAPDOOR, CreativeModeTab.TAB_REDSTONE);
+        WARPED_TRAPDOOR = registerBlock(Blocks.WARPED_TRAPDOOR, CreativeModeTab.TAB_REDSTONE);
         INFESTED_STONE = registerBlock(Blocks.INFESTED_STONE, CreativeModeTab.TAB_DECORATIONS);
         INFESTED_COBBLESTONE = registerBlock(Blocks.INFESTED_COBBLESTONE, CreativeModeTab.TAB_DECORATIONS);
         INFESTED_STONE_BRICKS = registerBlock(Blocks.INFESTED_STONE_BRICKS, CreativeModeTab.TAB_DECORATIONS);
@@ -1142,6 +1268,7 @@ public class Items {
         RED_MUSHROOM_BLOCK = registerBlock(Blocks.RED_MUSHROOM_BLOCK, CreativeModeTab.TAB_DECORATIONS);
         MUSHROOM_STEM = registerBlock(Blocks.MUSHROOM_STEM, CreativeModeTab.TAB_DECORATIONS);
         IRON_BARS = registerBlock(Blocks.IRON_BARS, CreativeModeTab.TAB_DECORATIONS);
+        CHAIN = registerBlock(Blocks.CHAIN, CreativeModeTab.TAB_DECORATIONS);
         GLASS_PANE = registerBlock(Blocks.GLASS_PANE, CreativeModeTab.TAB_DECORATIONS);
         MELON = registerBlock(Blocks.MELON, CreativeModeTab.TAB_BUILDING_BLOCKS);
         VINE = registerBlock(Blocks.VINE, CreativeModeTab.TAB_DECORATIONS);
@@ -1151,11 +1278,15 @@ public class Items {
         JUNGLE_FENCE_GATE = registerBlock(Blocks.JUNGLE_FENCE_GATE, CreativeModeTab.TAB_REDSTONE);
         ACACIA_FENCE_GATE = registerBlock(Blocks.ACACIA_FENCE_GATE, CreativeModeTab.TAB_REDSTONE);
         DARK_OAK_FENCE_GATE = registerBlock(Blocks.DARK_OAK_FENCE_GATE, CreativeModeTab.TAB_REDSTONE);
+        CRIMSON_FENCE_GATE = registerBlock(Blocks.CRIMSON_FENCE_GATE, CreativeModeTab.TAB_REDSTONE);
+        WARPED_FENCE_GATE = registerBlock(Blocks.WARPED_FENCE_GATE, CreativeModeTab.TAB_REDSTONE);
         BRICK_STAIRS = registerBlock(Blocks.BRICK_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STONE_BRICK_STAIRS = registerBlock(Blocks.STONE_BRICK_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         MYCELIUM = registerBlock(Blocks.MYCELIUM, CreativeModeTab.TAB_BUILDING_BLOCKS);
         LILY_PAD = registerBlock(new WaterLilyBlockItem(Blocks.LILY_PAD, new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
         NETHER_BRICKS = registerBlock(Blocks.NETHER_BRICKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        CRACKED_NETHER_BRICKS = registerBlock(Blocks.CRACKED_NETHER_BRICKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        CHISELED_NETHER_BRICKS = registerBlock(Blocks.CHISELED_NETHER_BRICKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         NETHER_BRICK_FENCE = registerBlock(Blocks.NETHER_BRICK_FENCE, CreativeModeTab.TAB_DECORATIONS);
         NETHER_BRICK_STAIRS = registerBlock(Blocks.NETHER_BRICK_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         ENCHANTING_TABLE = registerBlock(Blocks.ENCHANTING_TABLE, CreativeModeTab.TAB_DECORATIONS);
@@ -1172,6 +1303,8 @@ public class Items {
         SPRUCE_STAIRS = registerBlock(Blocks.SPRUCE_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         BIRCH_STAIRS = registerBlock(Blocks.BIRCH_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         JUNGLE_STAIRS = registerBlock(Blocks.JUNGLE_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        CRIMSON_STAIRS = registerBlock(Blocks.CRIMSON_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        WARPED_STAIRS = registerBlock(Blocks.WARPED_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         COMMAND_BLOCK = registerBlock(new GameMasterBlockItem(Blocks.COMMAND_BLOCK, new Item.Properties().rarity(Rarity.EPIC)));
         BEACON = registerBlock(new BlockItem(Blocks.BEACON, new Item.Properties().tab(CreativeModeTab.TAB_MISC).rarity(Rarity.RARE)));
         COBBLESTONE_WALL = registerBlock(Blocks.COBBLESTONE_WALL, CreativeModeTab.TAB_DECORATIONS);
@@ -1188,12 +1321,19 @@ public class Items {
         SANDSTONE_WALL = registerBlock(Blocks.SANDSTONE_WALL, CreativeModeTab.TAB_DECORATIONS);
         END_STONE_BRICK_WALL = registerBlock(Blocks.END_STONE_BRICK_WALL, CreativeModeTab.TAB_DECORATIONS);
         DIORITE_WALL = registerBlock(Blocks.DIORITE_WALL, CreativeModeTab.TAB_DECORATIONS);
+        BLACKSTONE_WALL = registerBlock(Blocks.BLACKSTONE_WALL, CreativeModeTab.TAB_DECORATIONS);
+        POLISHED_BLACKSTONE_WALL = registerBlock(Blocks.POLISHED_BLACKSTONE_WALL, CreativeModeTab.TAB_DECORATIONS);
+        POLISHED_BLACKSTONE_BRICK_WALL = registerBlock(Blocks.POLISHED_BLACKSTONE_BRICK_WALL, CreativeModeTab.TAB_DECORATIONS);
+        STONE_BUTTON = registerBlock(Blocks.STONE_BUTTON, CreativeModeTab.TAB_REDSTONE);
         OAK_BUTTON = registerBlock(Blocks.OAK_BUTTON, CreativeModeTab.TAB_REDSTONE);
         SPRUCE_BUTTON = registerBlock(Blocks.SPRUCE_BUTTON, CreativeModeTab.TAB_REDSTONE);
         BIRCH_BUTTON = registerBlock(Blocks.BIRCH_BUTTON, CreativeModeTab.TAB_REDSTONE);
         JUNGLE_BUTTON = registerBlock(Blocks.JUNGLE_BUTTON, CreativeModeTab.TAB_REDSTONE);
         ACACIA_BUTTON = registerBlock(Blocks.ACACIA_BUTTON, CreativeModeTab.TAB_REDSTONE);
         DARK_OAK_BUTTON = registerBlock(Blocks.DARK_OAK_BUTTON, CreativeModeTab.TAB_REDSTONE);
+        CRIMSON_BUTTON = registerBlock(Blocks.CRIMSON_BUTTON, CreativeModeTab.TAB_REDSTONE);
+        WARPED_BUTTON = registerBlock(Blocks.WARPED_BUTTON, CreativeModeTab.TAB_REDSTONE);
+        POLISHED_BLACKSTONE_BUTTON = registerBlock(Blocks.POLISHED_BLACKSTONE_BUTTON, CreativeModeTab.TAB_REDSTONE);
         ANVIL = registerBlock(Blocks.ANVIL, CreativeModeTab.TAB_DECORATIONS);
         CHIPPED_ANVIL = registerBlock(Blocks.CHIPPED_ANVIL, CreativeModeTab.TAB_DECORATIONS);
         DAMAGED_ANVIL = registerBlock(Blocks.DAMAGED_ANVIL, CreativeModeTab.TAB_DECORATIONS);
@@ -1206,6 +1346,7 @@ public class Items {
         HOPPER = registerBlock(Blocks.HOPPER, CreativeModeTab.TAB_REDSTONE);
         CHISELED_QUARTZ_BLOCK = registerBlock(Blocks.CHISELED_QUARTZ_BLOCK, CreativeModeTab.TAB_BUILDING_BLOCKS);
         QUARTZ_BLOCK = registerBlock(Blocks.QUARTZ_BLOCK, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        QUARTZ_BRICKS = registerBlock(Blocks.QUARTZ_BRICKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         QUARTZ_PILLAR = registerBlock(Blocks.QUARTZ_PILLAR, CreativeModeTab.TAB_BUILDING_BLOCKS);
         QUARTZ_STAIRS = registerBlock(Blocks.QUARTZ_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         ACTIVATOR_RAIL = registerBlock(Blocks.ACTIVATOR_RAIL, CreativeModeTab.TAB_TRANSPORTATION);
@@ -1305,6 +1446,7 @@ public class Items {
         CHAIN_COMMAND_BLOCK = registerBlock(new GameMasterBlockItem(Blocks.CHAIN_COMMAND_BLOCK, new Item.Properties().rarity(Rarity.EPIC)));
         MAGMA_BLOCK = registerBlock(Blocks.MAGMA_BLOCK, CreativeModeTab.TAB_BUILDING_BLOCKS);
         NETHER_WART_BLOCK = registerBlock(Blocks.NETHER_WART_BLOCK, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        WARPED_WART_BLOCK = registerBlock(Blocks.WARPED_WART_BLOCK, CreativeModeTab.TAB_BUILDING_BLOCKS);
         RED_NETHER_BRICKS = registerBlock(Blocks.RED_NETHER_BRICKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
         BONE_BLOCK = registerBlock(Blocks.BONE_BLOCK, CreativeModeTab.TAB_BUILDING_BLOCKS);
         STRUCTURE_VOID = registerBlock(Blocks.STRUCTURE_VOID);
@@ -1442,11 +1584,12 @@ public class Items {
         JUNGLE_DOOR = registerBlock(new DoubleHighBlockItem(Blocks.JUNGLE_DOOR, new Item.Properties().tab(CreativeModeTab.TAB_REDSTONE)));
         ACACIA_DOOR = registerBlock(new DoubleHighBlockItem(Blocks.ACACIA_DOOR, new Item.Properties().tab(CreativeModeTab.TAB_REDSTONE)));
         DARK_OAK_DOOR = registerBlock(new DoubleHighBlockItem(Blocks.DARK_OAK_DOOR, new Item.Properties().tab(CreativeModeTab.TAB_REDSTONE)));
+        CRIMSON_DOOR = registerBlock(new DoubleHighBlockItem(Blocks.CRIMSON_DOOR, new Item.Properties().tab(CreativeModeTab.TAB_REDSTONE)));
+        WARPED_DOOR = registerBlock(new DoubleHighBlockItem(Blocks.WARPED_DOOR, new Item.Properties().tab(CreativeModeTab.TAB_REDSTONE)));
         REPEATER = registerBlock(Blocks.REPEATER, CreativeModeTab.TAB_REDSTONE);
         COMPARATOR = registerBlock(Blocks.COMPARATOR, CreativeModeTab.TAB_REDSTONE);
         STRUCTURE_BLOCK = registerBlock(new GameMasterBlockItem(Blocks.STRUCTURE_BLOCK, new Item.Properties().rarity(Rarity.EPIC)));
         JIGSAW = registerBlock(new GameMasterBlockItem(Blocks.JIGSAW, new Item.Properties().rarity(Rarity.EPIC)));
-        COMPOSTER = registerBlock(Blocks.COMPOSTER, CreativeModeTab.TAB_MISC);
         TURTLE_HELMET = registerItem("turtle_helmet", new ArmorItem(ArmorMaterials.TURTLE, EquipmentSlot.HEAD, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT)));
         SCUTE = registerItem("scute", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
         IRON_SHOVEL = registerItem("iron_shovel", new ShovelItem(Tiers.IRON, 1.5f, -3.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
@@ -1461,6 +1604,8 @@ public class Items {
         DIAMOND = registerItem("diamond", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
         IRON_INGOT = registerItem("iron_ingot", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
         GOLD_INGOT = registerItem("gold_ingot", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
+        NETHERITE_INGOT = registerItem("netherite_ingot", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS).fireResistant()));
+        NETHERITE_SCRAP = registerItem("netherite_scrap", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS).fireResistant()));
         IRON_SWORD = registerItem("iron_sword", new SwordItem(Tiers.IRON, 3, -2.4f, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT)));
         WOODEN_SWORD = registerItem("wooden_sword", new SwordItem(Tiers.WOOD, 3, -2.4f, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT)));
         WOODEN_SHOVEL = registerItem("wooden_shovel", new ShovelItem(Tiers.WOOD, 1.5f, -3.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
@@ -1481,14 +1626,19 @@ public class Items {
         GOLDEN_SHOVEL = registerItem("golden_shovel", new ShovelItem(Tiers.GOLD, 1.5f, -3.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
         GOLDEN_PICKAXE = registerItem("golden_pickaxe", new PickaxeItem(Tiers.GOLD, 1, -2.8f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
         GOLDEN_AXE = registerItem("golden_axe", new AxeItem(Tiers.GOLD, 6.0f, -3.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
+        NETHERITE_SWORD = registerItem("netherite_sword", new SwordItem(Tiers.NETHERITE, 3, -2.4f, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT).fireResistant()));
+        NETHERITE_SHOVEL = registerItem("netherite_shovel", new ShovelItem(Tiers.NETHERITE, 1.5f, -3.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).fireResistant()));
+        NETHERITE_PICKAXE = registerItem("netherite_pickaxe", new PickaxeItem(Tiers.NETHERITE, 1, -2.8f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).fireResistant()));
+        NETHERITE_AXE = registerItem("netherite_axe", new AxeItem(Tiers.NETHERITE, 5.0f, -3.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).fireResistant()));
         STRING = registerItem("string", new ItemNameBlockItem(Blocks.TRIPWIRE, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         FEATHER = registerItem("feather", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
         GUNPOWDER = registerItem("gunpowder", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
-        WOODEN_HOE = registerItem("wooden_hoe", new HoeItem(Tiers.WOOD, -3.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
-        STONE_HOE = registerItem("stone_hoe", new HoeItem(Tiers.STONE, -2.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
-        IRON_HOE = registerItem("iron_hoe", new HoeItem(Tiers.IRON, -1.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
-        DIAMOND_HOE = registerItem("diamond_hoe", new HoeItem(Tiers.DIAMOND, 0.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
-        GOLDEN_HOE = registerItem("golden_hoe", new HoeItem(Tiers.GOLD, -3.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
+        WOODEN_HOE = registerItem("wooden_hoe", new HoeItem(Tiers.WOOD, 0, -3.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
+        STONE_HOE = registerItem("stone_hoe", new HoeItem(Tiers.STONE, -1, -2.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
+        IRON_HOE = registerItem("iron_hoe", new HoeItem(Tiers.IRON, -2, -1.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
+        DIAMOND_HOE = registerItem("diamond_hoe", new HoeItem(Tiers.DIAMOND, -3, 0.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
+        GOLDEN_HOE = registerItem("golden_hoe", new HoeItem(Tiers.GOLD, 0, -3.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
+        NETHERITE_HOE = registerItem("netherite_hoe", new HoeItem(Tiers.NETHERITE, -4, 0.0f, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).fireResistant()));
         WHEAT_SEEDS = registerItem("wheat_seeds", new ItemNameBlockItem(Blocks.WHEAT, new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
         WHEAT = registerItem("wheat", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
         BREAD = registerItem("bread", new Item(new Item.Properties().tab(CreativeModeTab.TAB_FOOD).food(Foods.BREAD)));
@@ -1512,6 +1662,10 @@ public class Items {
         GOLDEN_CHESTPLATE = registerItem("golden_chestplate", new ArmorItem(ArmorMaterials.GOLD, EquipmentSlot.CHEST, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT)));
         GOLDEN_LEGGINGS = registerItem("golden_leggings", new ArmorItem(ArmorMaterials.GOLD, EquipmentSlot.LEGS, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT)));
         GOLDEN_BOOTS = registerItem("golden_boots", new ArmorItem(ArmorMaterials.GOLD, EquipmentSlot.FEET, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT)));
+        NETHERITE_HELMET = registerItem("netherite_helmet", new ArmorItem(ArmorMaterials.NETHERITE, EquipmentSlot.HEAD, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT).fireResistant()));
+        NETHERITE_CHESTPLATE = registerItem("netherite_chestplate", new ArmorItem(ArmorMaterials.NETHERITE, EquipmentSlot.CHEST, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT).fireResistant()));
+        NETHERITE_LEGGINGS = registerItem("netherite_leggings", new ArmorItem(ArmorMaterials.NETHERITE, EquipmentSlot.LEGS, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT).fireResistant()));
+        NETHERITE_BOOTS = registerItem("netherite_boots", new ArmorItem(ArmorMaterials.NETHERITE, EquipmentSlot.FEET, new Item.Properties().tab(CreativeModeTab.TAB_COMBAT).fireResistant()));
         FLINT = registerItem("flint", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
         PORKCHOP = registerItem("porkchop", new Item(new Item.Properties().tab(CreativeModeTab.TAB_FOOD).food(Foods.PORKCHOP)));
         COOKED_PORKCHOP = registerItem("cooked_porkchop", new Item(new Item.Properties().tab(CreativeModeTab.TAB_FOOD).food(Foods.COOKED_PORKCHOP)));
@@ -1524,6 +1678,8 @@ public class Items {
         JUNGLE_SIGN = registerItem("jungle_sign", new SignItem(new Item.Properties().stacksTo(16).tab(CreativeModeTab.TAB_DECORATIONS), Blocks.JUNGLE_SIGN, Blocks.JUNGLE_WALL_SIGN));
         ACACIA_SIGN = registerItem("acacia_sign", new SignItem(new Item.Properties().stacksTo(16).tab(CreativeModeTab.TAB_DECORATIONS), Blocks.ACACIA_SIGN, Blocks.ACACIA_WALL_SIGN));
         DARK_OAK_SIGN = registerItem("dark_oak_sign", new SignItem(new Item.Properties().stacksTo(16).tab(CreativeModeTab.TAB_DECORATIONS), Blocks.DARK_OAK_SIGN, Blocks.DARK_OAK_WALL_SIGN));
+        CRIMSON_SIGN = registerItem("crimson_sign", new SignItem(new Item.Properties().stacksTo(16).tab(CreativeModeTab.TAB_DECORATIONS), Blocks.CRIMSON_SIGN, Blocks.CRIMSON_WALL_SIGN));
+        WARPED_SIGN = registerItem("warped_sign", new SignItem(new Item.Properties().stacksTo(16).tab(CreativeModeTab.TAB_DECORATIONS), Blocks.WARPED_SIGN, Blocks.WARPED_WALL_SIGN));
         BUCKET = registerItem("bucket", new BucketItem(Fluids.EMPTY, new Item.Properties().stacksTo(16).tab(CreativeModeTab.TAB_MISC)));
         WATER_BUCKET = registerItem("water_bucket", new BucketItem(Fluids.WATER, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
         LAVA_BUCKET = registerItem("lava_bucket", new BucketItem(Fluids.LAVA, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
@@ -1540,10 +1696,7 @@ public class Items {
         TROPICAL_FISH_BUCKET = registerItem("tropical_fish_bucket", new FishBucketItem(EntityType.TROPICAL_FISH, Fluids.WATER, new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
         BRICK = registerItem("brick", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
         CLAY_BALL = registerItem("clay_ball", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
-        SUGAR_CANE = registerBlock(Blocks.SUGAR_CANE, CreativeModeTab.TAB_MISC);
-        KELP = registerBlock(Blocks.KELP, CreativeModeTab.TAB_MISC);
         DRIED_KELP_BLOCK = registerBlock(Blocks.DRIED_KELP_BLOCK, CreativeModeTab.TAB_BUILDING_BLOCKS);
-        BAMBOO = registerBlock(Blocks.BAMBOO, CreativeModeTab.TAB_MATERIALS);
         PAPER = registerItem("paper", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         BOOK = registerItem("book", new BookItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         SLIME_BALL = registerItem("slime_ball", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
@@ -1552,7 +1705,7 @@ public class Items {
         EGG = registerItem("egg", new EggItem(new Item.Properties().stacksTo(16).tab(CreativeModeTab.TAB_MATERIALS)));
         COMPASS = registerItem("compass", new CompassItem(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
         FISHING_ROD = registerItem("fishing_rod", new FishingRodItem(new Item.Properties().durability(64).tab(CreativeModeTab.TAB_TOOLS)));
-        CLOCK = registerItem("clock", new ClockItem(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
+        CLOCK = registerItem("clock", new Item(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)));
         GLOWSTONE_DUST = registerItem("glowstone_dust", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
         COD = registerItem("cod", new Item(new Item.Properties().tab(CreativeModeTab.TAB_FOOD).food(Foods.COD)));
         SALMON = registerItem("salmon", new Item(new Item.Properties().tab(CreativeModeTab.TAB_FOOD).food(Foods.SALMON)));
@@ -1645,6 +1798,7 @@ public class Items {
         FOX_SPAWN_EGG = registerItem("fox_spawn_egg", new SpawnEggItem(EntityType.FOX, 14005919, 13396256, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         GHAST_SPAWN_EGG = registerItem("ghast_spawn_egg", new SpawnEggItem(EntityType.GHAST, 16382457, 12369084, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         GUARDIAN_SPAWN_EGG = registerItem("guardian_spawn_egg", new SpawnEggItem(EntityType.GUARDIAN, 5931634, 15826224, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
+        HOGLIN_SPAWN_EGG = registerItem("hoglin_spawn_egg", new SpawnEggItem(EntityType.HOGLIN, 13004373, 6251620, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         HORSE_SPAWN_EGG = registerItem("horse_spawn_egg", new SpawnEggItem(EntityType.HORSE, 12623485, 15656192, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         HUSK_SPAWN_EGG = registerItem("husk_spawn_egg", new SpawnEggItem(EntityType.HUSK, 7958625, 15125652, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         LLAMA_SPAWN_EGG = registerItem("llama_spawn_egg", new SpawnEggItem(EntityType.LLAMA, 12623485, 10051392, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
@@ -1656,6 +1810,7 @@ public class Items {
         PARROT_SPAWN_EGG = registerItem("parrot_spawn_egg", new SpawnEggItem(EntityType.PARROT, 894731, 16711680, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         PHANTOM_SPAWN_EGG = registerItem("phantom_spawn_egg", new SpawnEggItem(EntityType.PHANTOM, 4411786, 8978176, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         PIG_SPAWN_EGG = registerItem("pig_spawn_egg", new SpawnEggItem(EntityType.PIG, 15771042, 14377823, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
+        PIGLIN_SPAWN_EGG = registerItem("piglin_spawn_egg", new SpawnEggItem(EntityType.PIGLIN, 10051392, 16380836, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         PILLAGER_SPAWN_EGG = registerItem("pillager_spawn_egg", new SpawnEggItem(EntityType.PILLAGER, 5451574, 9804699, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         POLAR_BEAR_SPAWN_EGG = registerItem("polar_bear_spawn_egg", new SpawnEggItem(EntityType.POLAR_BEAR, 15921906, 9803152, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         PUFFERFISH_SPAWN_EGG = registerItem("pufferfish_spawn_egg", new SpawnEggItem(EntityType.PUFFERFISH, 16167425, 3654642, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
@@ -1671,6 +1826,7 @@ public class Items {
         SPIDER_SPAWN_EGG = registerItem("spider_spawn_egg", new SpawnEggItem(EntityType.SPIDER, 3419431, 11013646, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         SQUID_SPAWN_EGG = registerItem("squid_spawn_egg", new SpawnEggItem(EntityType.SQUID, 2243405, 7375001, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         STRAY_SPAWN_EGG = registerItem("stray_spawn_egg", new SpawnEggItem(EntityType.STRAY, 6387319, 14543594, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
+        STRIDER_SPAWN_EGG = registerItem("strider_spawn_egg", new SpawnEggItem(EntityType.STRIDER, 10236982, 5065037, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         TRADER_LLAMA_SPAWN_EGG = registerItem("trader_llama_spawn_egg", new SpawnEggItem(EntityType.TRADER_LLAMA, 15377456, 4547222, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         TROPICAL_FISH_SPAWN_EGG = registerItem("tropical_fish_spawn_egg", new SpawnEggItem(EntityType.TROPICAL_FISH, 15690005, 16775663, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         TURTLE_SPAWN_EGG = registerItem("turtle_spawn_egg", new SpawnEggItem(EntityType.TURTLE, 15198183, 44975, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
@@ -1681,10 +1837,11 @@ public class Items {
         WITCH_SPAWN_EGG = registerItem("witch_spawn_egg", new SpawnEggItem(EntityType.WITCH, 3407872, 5349438, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         WITHER_SKELETON_SPAWN_EGG = registerItem("wither_skeleton_spawn_egg", new SpawnEggItem(EntityType.WITHER_SKELETON, 1315860, 4672845, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         WOLF_SPAWN_EGG = registerItem("wolf_spawn_egg", new SpawnEggItem(EntityType.WOLF, 14144467, 13545366, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
+        ZOGLIN_SPAWN_EGG = registerItem("zoglin_spawn_egg", new SpawnEggItem(EntityType.ZOGLIN, 13004373, 15132390, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         ZOMBIE_SPAWN_EGG = registerItem("zombie_spawn_egg", new SpawnEggItem(EntityType.ZOMBIE, 44975, 7969893, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         ZOMBIE_HORSE_SPAWN_EGG = registerItem("zombie_horse_spawn_egg", new SpawnEggItem(EntityType.ZOMBIE_HORSE, 3232308, 9945732, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
-        ZOMBIE_PIGMAN_SPAWN_EGG = registerItem("zombie_pigman_spawn_egg", new SpawnEggItem(EntityType.ZOMBIE_PIGMAN, 15373203, 5009705, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         ZOMBIE_VILLAGER_SPAWN_EGG = registerItem("zombie_villager_spawn_egg", new SpawnEggItem(EntityType.ZOMBIE_VILLAGER, 5651507, 7969893, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
+        ZOMBIFIED_PIGLIN_SPAWN_EGG = registerItem("zombified_piglin_spawn_egg", new SpawnEggItem(EntityType.ZOMBIFIED_PIGLIN, 15373203, 5009705, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         EXPERIENCE_BOTTLE = registerItem("experience_bottle", new ExperienceBottleItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).rarity(Rarity.UNCOMMON)));
         FIRE_CHARGE = registerItem("fire_charge", new FireChargeItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
         WRITABLE_BOOK = registerItem("writable_book", new WritableBookItem(new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
@@ -1704,7 +1861,8 @@ public class Items {
         ZOMBIE_HEAD = registerBlock(new StandingAndWallBlockItem(Blocks.ZOMBIE_HEAD, Blocks.ZOMBIE_WALL_HEAD, new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS).rarity(Rarity.UNCOMMON)));
         CREEPER_HEAD = registerBlock(new StandingAndWallBlockItem(Blocks.CREEPER_HEAD, Blocks.CREEPER_WALL_HEAD, new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS).rarity(Rarity.UNCOMMON)));
         DRAGON_HEAD = registerBlock(new StandingAndWallBlockItem(Blocks.DRAGON_HEAD, Blocks.DRAGON_WALL_HEAD, new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS).rarity(Rarity.UNCOMMON)));
-        CARROT_ON_A_STICK = registerItem("carrot_on_a_stick", new CarrotOnAStickItem(new Item.Properties().durability(25).tab(CreativeModeTab.TAB_TRANSPORTATION)));
+        CARROT_ON_A_STICK = registerItem("carrot_on_a_stick", new FoodOnAStickItem<>(new Item.Properties().durability(25).tab(CreativeModeTab.TAB_TRANSPORTATION), EntityType.PIG, 7));
+        WARPED_FUNGUS_ON_A_STICK = registerItem("warped_fungus_on_a_stick", new FoodOnAStickItem<>(new Item.Properties().durability(100).tab(CreativeModeTab.TAB_TRANSPORTATION), EntityType.STRIDER, 1));
         NETHER_STAR = registerItem("nether_star", new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS).rarity(Rarity.UNCOMMON)));
         PUMPKIN_PIE = registerItem("pumpkin_pie", new Item(new Item.Properties().tab(CreativeModeTab.TAB_FOOD).food(Foods.PUMPKIN_PIE)));
         FIREWORK_ROCKET = registerItem("firework_rocket", new FireworkRocketItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
@@ -1782,6 +1940,7 @@ public class Items {
         MUSIC_DISC_WARD = registerItem("music_disc_ward", new RecordItem(10, SoundEvents.MUSIC_DISC_WARD, new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC).rarity(Rarity.RARE)));
         MUSIC_DISC_11 = registerItem("music_disc_11", new RecordItem(11, SoundEvents.MUSIC_DISC_11, new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC).rarity(Rarity.RARE)));
         MUSIC_DISC_WAIT = registerItem("music_disc_wait", new RecordItem(12, SoundEvents.MUSIC_DISC_WAIT, new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC).rarity(Rarity.RARE)));
+        MUSIC_DISC_PIGSTEP = registerItem("music_disc_pigstep", new RecordItem(13, SoundEvents.MUSIC_DISC_PIGSTEP, new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC).rarity(Rarity.RARE)));
         TRIDENT = registerItem("trident", new TridentItem(new Item.Properties().durability(250).tab(CreativeModeTab.TAB_COMBAT)));
         PHANTOM_MEMBRANE = registerItem("phantom_membrane", new Item(new Item.Properties().tab(CreativeModeTab.TAB_BREWING)));
         NAUTILUS_SHELL = registerItem("nautilus_shell", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
@@ -1794,6 +1953,8 @@ public class Items {
         SKULL_BANNER_PATTERN = registerItem("skull_banner_pattern", new BannerPatternItem(BannerPattern.SKULL, new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC).rarity(Rarity.UNCOMMON)));
         MOJANG_BANNER_PATTERN = registerItem("mojang_banner_pattern", new BannerPatternItem(BannerPattern.MOJANG, new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC).rarity(Rarity.EPIC)));
         GLOBE_BANNER_PATTER = registerItem("globe_banner_pattern", new BannerPatternItem(BannerPattern.GLOBE, new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
+        PIGLIN_BANNER_PATTERN = registerItem("piglin_banner_pattern", new BannerPatternItem(BannerPattern.PIGLIN, new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
+        COMPOSTER = registerBlock(Blocks.COMPOSTER, CreativeModeTab.TAB_DECORATIONS);
         BARREL = registerBlock(Blocks.BARREL, CreativeModeTab.TAB_DECORATIONS);
         SMOKER = registerBlock(Blocks.SMOKER, CreativeModeTab.TAB_DECORATIONS);
         BLAST_FURNACE = registerBlock(Blocks.BLAST_FURNACE, CreativeModeTab.TAB_DECORATIONS);
@@ -1805,13 +1966,34 @@ public class Items {
         STONECUTTER = registerBlock(Blocks.STONECUTTER, CreativeModeTab.TAB_DECORATIONS);
         BELL = registerBlock(Blocks.BELL, CreativeModeTab.TAB_DECORATIONS);
         LANTERN = registerBlock(Blocks.LANTERN, CreativeModeTab.TAB_DECORATIONS);
+        SOUL_LANTERN = registerBlock(Blocks.SOUL_LANTERN, CreativeModeTab.TAB_DECORATIONS);
         SWEET_BERRIES = registerItem("sweet_berries", new ItemNameBlockItem(Blocks.SWEET_BERRY_BUSH, new Item.Properties().tab(CreativeModeTab.TAB_FOOD).food(Foods.SWEET_BERRIES)));
         CAMPFIRE = registerBlock(Blocks.CAMPFIRE, CreativeModeTab.TAB_DECORATIONS);
+        SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE, CreativeModeTab.TAB_DECORATIONS);
+        SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT, CreativeModeTab.TAB_DECORATIONS);
         HONEYCOMB = registerItem("honeycomb", new Item(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
         BEE_NEST = registerBlock(Blocks.BEE_NEST, CreativeModeTab.TAB_DECORATIONS);
         BEEHIVE = registerBlock(Blocks.BEEHIVE, CreativeModeTab.TAB_DECORATIONS);
         HONEY_BOTTLE = registerItem("honey_bottle", new HoneyBottleItem(new Item.Properties().craftRemainder(Items.GLASS_BOTTLE).food(Foods.HONEY_BOTTLE).tab(CreativeModeTab.TAB_FOOD).stacksTo(16)));
         HONEY_BLOCK = registerBlock(Blocks.HONEY_BLOCK, CreativeModeTab.TAB_DECORATIONS);
         HONEYCOMB_BLOCK = registerBlock(Blocks.HONEYCOMB_BLOCK, CreativeModeTab.TAB_DECORATIONS);
+        LODESTONE = registerBlock(Blocks.LODESTONE, CreativeModeTab.TAB_DECORATIONS);
+        NETHERITE_BLOCK = registerBlock(new BlockItem(Blocks.NETHERITE_BLOCK, new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS).fireResistant()));
+        ANCIENT_DEBRIS = registerBlock(new BlockItem(Blocks.ANCIENT_DEBRIS, new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS).fireResistant()));
+        TARGET = registerBlock(Blocks.TARGET, CreativeModeTab.TAB_REDSTONE);
+        CRYING_OBSIDIAN = registerBlock(Blocks.CRYING_OBSIDIAN, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        BLACKSTONE = registerBlock(Blocks.BLACKSTONE, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        BLACKSTONE_SLAB = registerBlock(Blocks.BLACKSTONE_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        BLACKSTONE_STAIRS = registerBlock(Blocks.BLACKSTONE_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        GILDED_BLACKSTONE = registerBlock(Blocks.GILDED_BLACKSTONE, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        POLISHED_BLACKSTONE = registerBlock(Blocks.POLISHED_BLACKSTONE, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        POLISHED_BLACKSTONE_SLAB = registerBlock(Blocks.POLISHED_BLACKSTONE_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        POLISHED_BLACKSTONE_STAIRS = registerBlock(Blocks.POLISHED_BLACKSTONE_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        CHISELED_POLISHED_BLACKSTONE = registerBlock(Blocks.CHISELED_POLISHED_BLACKSTONE, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        POLISHED_BLACKSTONE_BRICKS = registerBlock(Blocks.POLISHED_BLACKSTONE_BRICKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        POLISHED_BLACKSTONE_BRICK_SLAB = registerBlock(Blocks.POLISHED_BLACKSTONE_BRICK_SLAB, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        POLISHED_BLACKSTONE_BRICK_STAIRS = registerBlock(Blocks.POLISHED_BLACKSTONE_BRICK_STAIRS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        CRACKED_POLISHED_BLACKSTONE_BRICKS = registerBlock(Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS, CreativeModeTab.TAB_BUILDING_BLOCKS);
+        RESPAWN_ANCHOR = registerBlock(Blocks.RESPAWN_ANCHOR, CreativeModeTab.TAB_DECORATIONS);
     }
 }
diff --git a/src/net/minecraft/world/item/KnowledgeBookItem.java b/src/net/minecraft/world/item/KnowledgeBookItem.java
index 6a466fb..412fb86 100644
--- a/src/net/minecraft/world/item/KnowledgeBookItem.java
+++ b/src/net/minecraft/world/item/KnowledgeBookItem.java
@@ -26,33 +26,33 @@ public class KnowledgeBookItem extends Item {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        final CompoundTag jt6 = ben5.getTag();
-        if (!ayj.abilities.instabuild) {
-            ayj.setItemInHand(ajk, ItemStack.EMPTY);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        final CompoundTag le6 = bki5.getTag();
+        if (!bec.abilities.instabuild) {
+            bec.setItemInHand(anf, ItemStack.EMPTY);
         }
-        if (jt6 == null || !jt6.contains("Recipes", 9)) {
-            KnowledgeBookItem.LOGGER.error("Tag not valid: {}", jt6);
-            return InteractionResultHolder.<ItemStack>fail(ben5);
+        if (le6 == null || !le6.contains("Recipes", 9)) {
+            KnowledgeBookItem.LOGGER.error("Tag not valid: {}", le6);
+            return InteractionResultHolder.<ItemStack>fail(bki5);
         }
-        if (!bjw.isClientSide) {
-            final ListTag jz7 = jt6.getList("Recipes", 8);
+        if (!bqb.isClientSide) {
+            final ListTag lk7 = le6.getList("Recipes", 8);
             final List<Recipe<?>> list8 = Lists.newArrayList();
-            final RecipeManager bgx9 = bjw.getServer().getRecipeManager();
-            for (int integer10 = 0; integer10 < jz7.size(); ++integer10) {
-                final String string11 = jz7.getString(integer10);
-                final Optional<? extends Recipe<?>> optional12 = bgx9.byKey(new ResourceLocation(string11));
+            final RecipeManager bmv9 = bqb.getServer().getRecipeManager();
+            for (int integer10 = 0; integer10 < lk7.size(); ++integer10) {
+                final String string11 = lk7.getString(integer10);
+                final Optional<? extends Recipe<?>> optional12 = bmv9.byKey(new ResourceLocation(string11));
                 if (!optional12.isPresent()) {
                     KnowledgeBookItem.LOGGER.error("Invalid recipe: {}", string11);
-                    return InteractionResultHolder.<ItemStack>fail(ben5);
+                    return InteractionResultHolder.<ItemStack>fail(bki5);
                 }
                 list8.add(optional12.get());
             }
-            ayj.awardRecipes(list8);
-            ayj.awardStat(Stats.ITEM_USED.get(this));
+            bec.awardRecipes(list8);
+            bec.awardStat(Stats.ITEM_USED.get(this));
         }
-        return InteractionResultHolder.<ItemStack>success(ben5);
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
     }
     
     static {
diff --git a/src/net/minecraft/world/item/LeadItem.java b/src/net/minecraft/world/item/LeadItem.java
index ed960ee..02e7c9f 100644
--- a/src/net/minecraft/world/item/LeadItem.java
+++ b/src/net/minecraft/world/item/LeadItem.java
@@ -7,9 +7,10 @@ import net.minecraft.world.entity.decoration.LeashFenceKnotEntity;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.InteractionResult;
 
@@ -19,34 +20,34 @@ public class LeadItem extends Item {
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final Block bph5 = bjw3.getBlockState(fk4).getBlock();
-        if (bph5.is(BlockTags.FENCES)) {
-            final Player ayj6 = bfz.getPlayer();
-            if (!bjw3.isClientSide && ayj6 != null) {
-                bindPlayerMobs(ayj6, bjw3, fk4);
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        final Block bvr5 = bqb3.getBlockState(fu4).getBlock();
+        if (bvr5.is(BlockTags.FENCES)) {
+            final Player bec6 = blv.getPlayer();
+            if (!bqb3.isClientSide && bec6 != null) {
+                bindPlayerMobs(bec6, bqb3, fu4);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb3.isClientSide);
         }
         return InteractionResult.PASS;
     }
     
-    public static InteractionResult bindPlayerMobs(final Player ayj, final Level bjw, final BlockPos fk) {
-        LeashFenceKnotEntity avs4 = null;
+    public static InteractionResult bindPlayerMobs(final Player bec, final Level bqb, final BlockPos fu) {
+        LeashFenceKnotEntity bbb4 = null;
         boolean boolean5 = false;
         final double double6 = 7.0;
-        final int integer8 = fk.getX();
-        final int integer9 = fk.getY();
-        final int integer10 = fk.getZ();
-        final List<Mob> list11 = bjw.<Mob>getEntitiesOfClass(Mob.class, new AABB(integer8 - 7.0, integer9 - 7.0, integer10 - 7.0, integer8 + 7.0, integer9 + 7.0, integer10 + 7.0));
-        for (final Mob ala13 : list11) {
-            if (ala13.getLeashHolder() == ayj) {
-                if (avs4 == null) {
-                    avs4 = LeashFenceKnotEntity.getOrCreateKnot(bjw, fk);
+        final int integer8 = fu.getX();
+        final int integer9 = fu.getY();
+        final int integer10 = fu.getZ();
+        final List<Mob> list11 = bqb.<Mob>getEntitiesOfClass(Mob.class, new AABB(integer8 - 7.0, integer9 - 7.0, integer10 - 7.0, integer8 + 7.0, integer9 + 7.0, integer10 + 7.0));
+        for (final Mob aoz13 : list11) {
+            if (aoz13.getLeashHolder() == bec) {
+                if (bbb4 == null) {
+                    bbb4 = LeashFenceKnotEntity.getOrCreateKnot(bqb, fu);
                 }
-                ala13.setLeashedTo(avs4, true);
+                aoz13.setLeashedTo(bbb4, true);
                 boolean5 = true;
             }
         }
diff --git a/src/net/minecraft/world/item/LingeringPotionItem.java b/src/net/minecraft/world/item/LingeringPotionItem.java
index dcf22a7..5d8596a 100644
--- a/src/net/minecraft/world/item/LingeringPotionItem.java
+++ b/src/net/minecraft/world/item/LingeringPotionItem.java
@@ -17,13 +17,13 @@ public class LingeringPotionItem extends ThrowablePotionItem {
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        PotionUtils.addPotionTooltip(ben, list, 0.25f);
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        PotionUtils.addPotionTooltip(bki, list, 0.25f);
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        bjw.playSound(null, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.LINGERING_POTION_THROW, SoundSource.NEUTRAL, 0.5f, 0.4f / (LingeringPotionItem.random.nextFloat() * 0.4f + 0.8f));
-        return super.use(bjw, ayj, ajk);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        bqb.playSound(null, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.LINGERING_POTION_THROW, SoundSource.NEUTRAL, 0.5f, 0.4f / (LingeringPotionItem.random.nextFloat() * 0.4f + 0.8f));
+        return super.use(bqb, bec, anf);
     }
 }
diff --git a/src/net/minecraft/world/item/MapItem.java b/src/net/minecraft/world/item/MapItem.java
index dfc14fe..83177e0 100644
--- a/src/net/minecraft/world/item/MapItem.java
+++ b/src/net/minecraft/world/item/MapItem.java
@@ -1,6 +1,8 @@
 package net.minecraft.world.item;
 
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.ChatFormatting;
@@ -8,7 +10,6 @@ import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import java.util.List;
 import net.minecraft.network.protocol.Packet;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.core.Direction;
@@ -28,8 +29,9 @@ import com.google.common.collect.LinkedHashMultiset;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.server.level.ServerLevel;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
 import net.minecraft.world.level.ItemLike;
@@ -40,59 +42,59 @@ public class MapItem extends ComplexItem {
         super(a);
     }
     
-    public static ItemStack create(final Level bjw, final int integer2, final int integer3, final byte byte4, final boolean boolean5, final boolean boolean6) {
-        final ItemStack ben7 = new ItemStack(Items.FILLED_MAP);
-        createAndStoreSavedData(ben7, bjw, integer2, integer3, byte4, boolean5, boolean6, bjw.dimension.getType());
-        return ben7;
+    public static ItemStack create(final Level bqb, final int integer2, final int integer3, final byte byte4, final boolean boolean5, final boolean boolean6) {
+        final ItemStack bki7 = new ItemStack(Items.FILLED_MAP);
+        createAndStoreSavedData(bki7, bqb, integer2, integer3, byte4, boolean5, boolean6, bqb.dimension());
+        return bki7;
     }
     
     @Nullable
-    public static MapItemSavedData getSavedData(final ItemStack ben, final Level bjw) {
-        return bjw.getMapData(makeKey(getMapId(ben)));
+    public static MapItemSavedData getSavedData(final ItemStack bki, final Level bqb) {
+        return bqb.getMapData(makeKey(getMapId(bki)));
     }
     
     @Nullable
-    public static MapItemSavedData getOrCreateSavedData(final ItemStack ben, final Level bjw) {
-        MapItemSavedData crg3 = getSavedData(ben, bjw);
-        if (crg3 == null && !bjw.isClientSide) {
-            crg3 = createAndStoreSavedData(ben, bjw, bjw.getLevelData().getXSpawn(), bjw.getLevelData().getZSpawn(), 3, false, false, bjw.dimension.getType());
+    public static MapItemSavedData getOrCreateSavedData(final ItemStack bki, final Level bqb) {
+        MapItemSavedData czv3 = getSavedData(bki, bqb);
+        if (czv3 == null && bqb instanceof ServerLevel) {
+            czv3 = createAndStoreSavedData(bki, bqb, bqb.getLevelData().getXSpawn(), bqb.getLevelData().getZSpawn(), 3, false, false, bqb.dimension());
         }
-        return crg3;
+        return czv3;
     }
     
-    public static int getMapId(final ItemStack ben) {
-        final CompoundTag jt2 = ben.getTag();
-        return (jt2 != null && jt2.contains("map", 99)) ? jt2.getInt("map") : 0;
+    public static int getMapId(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTag();
+        return (le2 != null && le2.contains("map", 99)) ? le2.getInt("map") : 0;
     }
     
-    private static MapItemSavedData createAndStoreSavedData(final ItemStack ben, final Level bjw, final int integer3, final int integer4, final int integer5, final boolean boolean6, final boolean boolean7, final DimensionType cbi) {
-        final int integer6 = bjw.getFreeMapId();
-        final MapItemSavedData crg10 = new MapItemSavedData(makeKey(integer6));
-        crg10.setProperties(integer3, integer4, integer5, boolean6, boolean7, cbi);
-        bjw.setMapData(crg10);
-        ben.getOrCreateTag().putInt("map", integer6);
-        return crg10;
+    private static MapItemSavedData createAndStoreSavedData(final ItemStack bki, final Level bqb, final int integer3, final int integer4, final int integer5, final boolean boolean6, final boolean boolean7, final ResourceKey<Level> ug) {
+        final int integer6 = bqb.getFreeMapId();
+        final MapItemSavedData czv10 = new MapItemSavedData(makeKey(integer6));
+        czv10.setProperties(integer3, integer4, integer5, boolean6, boolean7, ug);
+        bqb.setMapData(czv10);
+        bki.getOrCreateTag().putInt("map", integer6);
+        return czv10;
     }
     
     public static String makeKey(final int integer) {
         return "map_" + integer;
     }
     
-    public void update(final Level bjw, final Entity akq, final MapItemSavedData crg) {
-        if (bjw.dimension.getType() != crg.dimension || !(akq instanceof Player)) {
+    public void update(final Level bqb, final Entity aom, final MapItemSavedData czv) {
+        if (bqb.dimension() != czv.dimension || !(aom instanceof Player)) {
             return;
         }
-        final int integer5 = 1 << crg.scale;
-        final int integer6 = crg.x;
-        final int integer7 = crg.z;
-        final int integer8 = Mth.floor(akq.getX() - integer6) / integer5 + 64;
-        final int integer9 = Mth.floor(akq.getZ() - integer7) / integer5 + 64;
+        final int integer5 = 1 << czv.scale;
+        final int integer6 = czv.x;
+        final int integer7 = czv.z;
+        final int integer8 = Mth.floor(aom.getX() - integer6) / integer5 + 64;
+        final int integer9 = Mth.floor(aom.getZ() - integer7) / integer5 + 64;
         int integer10 = 128 / integer5;
-        if (bjw.dimension.isHasCeiling()) {
+        if (bqb.dimensionType().hasCeiling()) {
             integer10 /= 2;
         }
         final MapItemSavedData.HoldingPlayer holdingPlayer;
-        final MapItemSavedData.HoldingPlayer a11 = holdingPlayer = crg.getHoldingPlayer((Player)akq);
+        final MapItemSavedData.HoldingPlayer a11 = holdingPlayer = czv.getHoldingPlayer((Player)aom);
         ++holdingPlayer.step;
         boolean boolean12 = false;
         for (int integer11 = integer8 - integer10 + 1; integer11 < integer8 + integer10; ++integer11) {
@@ -108,21 +110,21 @@ public class MapItem extends ComplexItem {
                             final int integer15 = (integer6 / integer5 + integer11 - 64) * integer5;
                             final int integer16 = (integer7 / integer5 + integer12 - 64) * integer5;
                             final Multiset<MaterialColor> multiset22 = LinkedHashMultiset.create();
-                            final LevelChunk cal23 = bjw.getChunkAt(new BlockPos(integer15, 0, integer16));
-                            if (!cal23.isEmpty()) {
-                                final ChunkPos bjh24 = cal23.getPos();
+                            final LevelChunk chj23 = bqb.getChunkAt(new BlockPos(integer15, 0, integer16));
+                            if (!chj23.isEmpty()) {
+                                final ChunkPos bph24 = chj23.getPos();
                                 final int integer17 = integer15 & 0xF;
                                 final int integer18 = integer16 & 0xF;
                                 int integer19 = 0;
                                 double double15 = 0.0;
-                                if (bjw.dimension.isHasCeiling()) {
+                                if (bqb.dimensionType().hasCeiling()) {
                                     int integer20 = integer15 + integer16 * 231871;
                                     integer20 = integer20 * integer20 * 31287121 + integer20 * 11;
                                     if ((integer20 >> 20 & 0x1) == 0x0) {
-                                        multiset22.add(Blocks.DIRT.defaultBlockState().getMapColor(bjw, BlockPos.ZERO), 10);
+                                        multiset22.add(Blocks.DIRT.defaultBlockState().getMapColor(bqb, BlockPos.ZERO), 10);
                                     }
                                     else {
-                                        multiset22.add(Blocks.STONE.defaultBlockState().getMapColor(bjw, BlockPos.ZERO), 100);
+                                        multiset22.add(Blocks.STONE.defaultBlockState().getMapColor(bqb, BlockPos.ZERO), 100);
                                     }
                                     double15 = 100.0;
                                 }
@@ -131,32 +133,32 @@ public class MapItem extends ComplexItem {
                                     final BlockPos.MutableBlockPos a13 = new BlockPos.MutableBlockPos();
                                     for (int integer21 = 0; integer21 < integer5; ++integer21) {
                                         for (int integer22 = 0; integer22 < integer5; ++integer22) {
-                                            int integer23 = cal23.getHeight(Heightmap.Types.WORLD_SURFACE, integer21 + integer17, integer22 + integer18) + 1;
-                                            BlockState byj35;
+                                            int integer23 = chj23.getHeight(Heightmap.Types.WORLD_SURFACE, integer21 + integer17, integer22 + integer18) + 1;
+                                            BlockState cfj35;
                                             if (integer23 > 1) {
                                                 do {
                                                     --integer23;
-                                                    a12.set(bjh24.getMinBlockX() + integer21 + integer17, integer23, bjh24.getMinBlockZ() + integer22 + integer18);
-                                                    byj35 = cal23.getBlockState(a12);
-                                                } while (byj35.getMapColor(bjw, a12) == MaterialColor.NONE && integer23 > 0);
-                                                if (integer23 > 0 && !byj35.getFluidState().isEmpty()) {
+                                                    a12.set(bph24.getMinBlockX() + integer21 + integer17, integer23, bph24.getMinBlockZ() + integer22 + integer18);
+                                                    cfj35 = chj23.getBlockState(a12);
+                                                } while (cfj35.getMapColor(bqb, a12) == MaterialColor.NONE && integer23 > 0);
+                                                if (integer23 > 0 && !cfj35.getFluidState().isEmpty()) {
                                                     int integer24 = integer23 - 1;
                                                     a13.set(a12);
-                                                    BlockState byj36;
+                                                    BlockState cfj36;
                                                     do {
                                                         a13.setY(integer24--);
-                                                        byj36 = cal23.getBlockState(a13);
+                                                        cfj36 = chj23.getBlockState(a13);
                                                         ++integer19;
-                                                    } while (integer24 > 0 && !byj36.getFluidState().isEmpty());
-                                                    byj35 = this.getCorrectStateForFluidBlock(bjw, byj35, a12);
+                                                    } while (integer24 > 0 && !cfj36.getFluidState().isEmpty());
+                                                    cfj35 = this.getCorrectStateForFluidBlock(bqb, cfj35, a12);
                                                 }
                                             }
                                             else {
-                                                byj35 = Blocks.BEDROCK.defaultBlockState();
+                                                cfj35 = Blocks.BEDROCK.defaultBlockState();
                                             }
-                                            crg.checkBanners(bjw, bjh24.getMinBlockX() + integer21 + integer17, bjh24.getMinBlockZ() + integer22 + integer18);
+                                            czv.checkBanners(bqb, bph24.getMinBlockX() + integer21 + integer17, bph24.getMinBlockZ() + integer22 + integer18);
                                             double15 += integer23 / (double)(integer5 * integer5);
-                                            multiset22.add(byj35.getMapColor(bjw, a12));
+                                            multiset22.add(cfj35.getMapColor(bqb, a12));
                                         }
                                     }
                                 }
@@ -169,8 +171,8 @@ public class MapItem extends ComplexItem {
                                 if (double16 < -0.6) {
                                     integer21 = 0;
                                 }
-                                final MaterialColor cop33 = Iterables.<MaterialColor>getFirst(Multisets.<MaterialColor>copyHighestCountFirst(multiset22), MaterialColor.NONE);
-                                if (cop33 == MaterialColor.WATER) {
+                                final MaterialColor cxe33 = Iterables.<MaterialColor>getFirst(Multisets.<MaterialColor>copyHighestCountFirst(multiset22), MaterialColor.NONE);
+                                if (cxe33 == MaterialColor.WATER) {
                                     double16 = integer19 * 0.1 + (integer11 + integer12 & 0x1) * 0.2;
                                     integer21 = 1;
                                     if (double16 < 0.5) {
@@ -184,11 +186,11 @@ public class MapItem extends ComplexItem {
                                 if (integer12 >= 0) {
                                     if (integer13 * integer13 + integer14 * integer14 < integer10 * integer10) {
                                         if (!boolean13 || (integer11 + integer12 & 0x1) != 0x0) {
-                                            final byte byte34 = crg.colors[integer11 + integer12 * 128];
-                                            final byte byte35 = (byte)(cop33.id * 4 + integer21);
+                                            final byte byte34 = czv.colors[integer11 + integer12 * 128];
+                                            final byte byte35 = (byte)(cxe33.id * 4 + integer21);
                                             if (byte34 != byte35) {
-                                                crg.colors[integer11 + integer12 * 128] = byte35;
-                                                crg.setDirty(integer11, integer12);
+                                                czv.colors[integer11 + integer12 * 128] = byte35;
+                                                czv.setDirty(integer11, integer12);
                                                 boolean12 = true;
                                             }
                                         }
@@ -202,39 +204,39 @@ public class MapItem extends ComplexItem {
         }
     }
     
-    private BlockState getCorrectStateForFluidBlock(final Level bjw, final BlockState byj, final BlockPos fk) {
-        final FluidState coj5 = byj.getFluidState();
-        if (!coj5.isEmpty() && !byj.isFaceSturdy(bjw, fk, Direction.UP)) {
-            return coj5.createLegacyBlock();
+    private BlockState getCorrectStateForFluidBlock(final Level bqb, final BlockState cfj, final BlockPos fu) {
+        final FluidState cxa5 = cfj.getFluidState();
+        if (!cxa5.isEmpty() && !cfj.isFaceSturdy(bqb, fu, Direction.UP)) {
+            return cxa5.createLegacyBlock();
         }
-        return byj;
+        return cfj;
     }
     
     private static boolean isLand(final Biome[] arr, final int integer2, final int integer3, final int integer4) {
         return arr[integer3 * integer2 + integer4 * integer2 * 128 * integer2].getDepth() >= 0.0f;
     }
     
-    public static void renderBiomePreviewMap(final ServerLevel xd, final ItemStack ben) {
-        final MapItemSavedData crg3 = getOrCreateSavedData(ben, xd);
-        if (crg3 == null) {
+    public static void renderBiomePreviewMap(final ServerLevel zd, final ItemStack bki) {
+        final MapItemSavedData czv3 = getOrCreateSavedData(bki, zd);
+        if (czv3 == null) {
             return;
         }
-        if (xd.dimension.getType() != crg3.dimension) {
+        if (zd.dimension() != czv3.dimension) {
             return;
         }
-        final int integer4 = 1 << crg3.scale;
-        final int integer5 = crg3.x;
-        final int integer6 = crg3.z;
+        final int integer4 = 1 << czv3.scale;
+        final int integer5 = czv3.x;
+        final int integer6 = czv3.z;
         final Biome[] arr7 = new Biome[128 * integer4 * 128 * integer4];
         for (int integer7 = 0; integer7 < 128 * integer4; ++integer7) {
             for (int integer8 = 0; integer8 < 128 * integer4; ++integer8) {
-                arr7[integer7 * 128 * integer4 + integer8] = xd.getBiome(new BlockPos((integer5 / integer4 - 64) * integer4 + integer8, 0, (integer6 / integer4 - 64) * integer4 + integer7));
+                arr7[integer7 * 128 * integer4 + integer8] = zd.getBiome(new BlockPos((integer5 / integer4 - 64) * integer4 + integer8, 0, (integer6 / integer4 - 64) * integer4 + integer7));
             }
         }
         for (int integer7 = 0; integer7 < 128; ++integer7) {
             for (int integer8 = 0; integer8 < 128; ++integer8) {
                 if (integer7 > 0 && integer8 > 0 && integer7 < 127 && integer8 < 127) {
-                    final Biome bkt10 = arr7[integer7 * integer4 + integer8 * integer4 * 128 * integer4];
+                    final Biome bre10 = arr7[integer7 * integer4 + integer8 * integer4 * 128 * integer4];
                     int integer9 = 8;
                     if (isLand(arr7, integer4, integer7 - 1, integer8 - 1)) {
                         --integer9;
@@ -261,9 +263,9 @@ public class MapItem extends ComplexItem {
                         --integer9;
                     }
                     int integer10 = 3;
-                    MaterialColor cop13 = MaterialColor.NONE;
-                    if (bkt10.getDepth() < 0.0f) {
-                        cop13 = MaterialColor.COLOR_ORANGE;
+                    MaterialColor cxe13 = MaterialColor.NONE;
+                    if (bre10.getDepth() < 0.0f) {
+                        cxe13 = MaterialColor.COLOR_ORANGE;
                         if (integer9 > 7 && integer8 % 2 == 0) {
                             integer10 = (integer7 + (int)(Mth.sin(integer8 + 0.0f) * 7.0f)) / 8 % 5;
                             if (integer10 == 3) {
@@ -274,7 +276,7 @@ public class MapItem extends ComplexItem {
                             }
                         }
                         else if (integer9 > 7) {
-                            cop13 = MaterialColor.NONE;
+                            cxe13 = MaterialColor.NONE;
                         }
                         else if (integer9 > 5) {
                             integer10 = 1;
@@ -287,7 +289,7 @@ public class MapItem extends ComplexItem {
                         }
                     }
                     else if (integer9 > 0) {
-                        cop13 = MaterialColor.COLOR_BROWN;
+                        cxe13 = MaterialColor.COLOR_BROWN;
                         if (integer9 > 3) {
                             integer10 = 1;
                         }
@@ -295,9 +297,9 @@ public class MapItem extends ComplexItem {
                             integer10 = 3;
                         }
                     }
-                    if (cop13 != MaterialColor.NONE) {
-                        crg3.colors[integer7 + integer8 * 128] = (byte)(cop13.id * 4 + integer10);
-                        crg3.setDirty(integer7, integer8);
+                    if (cxe13 != MaterialColor.NONE) {
+                        czv3.colors[integer7 + integer8 * 128] = (byte)(cxe13.id * 4 + integer10);
+                        czv3.setDirty(integer7, integer8);
                     }
                 }
             }
@@ -305,94 +307,94 @@ public class MapItem extends ComplexItem {
     }
     
     @Override
-    public void inventoryTick(final ItemStack ben, final Level bjw, final Entity akq, final int integer, final boolean boolean5) {
-        if (bjw.isClientSide) {
+    public void inventoryTick(final ItemStack bki, final Level bqb, final Entity aom, final int integer, final boolean boolean5) {
+        if (bqb.isClientSide) {
             return;
         }
-        final MapItemSavedData crg7 = getOrCreateSavedData(ben, bjw);
-        if (crg7 == null) {
+        final MapItemSavedData czv7 = getOrCreateSavedData(bki, bqb);
+        if (czv7 == null) {
             return;
         }
-        if (akq instanceof Player) {
-            final Player ayj8 = (Player)akq;
-            crg7.tickCarriedBy(ayj8, ben);
+        if (aom instanceof Player) {
+            final Player bec8 = (Player)aom;
+            czv7.tickCarriedBy(bec8, bki);
         }
-        if (!crg7.locked && (boolean5 || (akq instanceof Player && ((Player)akq).getOffhandItem() == ben))) {
-            this.update(bjw, akq, crg7);
+        if (!czv7.locked && (boolean5 || (aom instanceof Player && ((Player)aom).getOffhandItem() == bki))) {
+            this.update(bqb, aom, czv7);
         }
     }
     
     @Nullable
     @Override
-    public Packet<?> getUpdatePacket(final ItemStack ben, final Level bjw, final Player ayj) {
-        return getOrCreateSavedData(ben, bjw).getUpdatePacket(ben, bjw, ayj);
+    public Packet<?> getUpdatePacket(final ItemStack bki, final Level bqb, final Player bec) {
+        return getOrCreateSavedData(bki, bqb).getUpdatePacket(bki, bqb, bec);
     }
     
     @Override
-    public void onCraftedBy(final ItemStack ben, final Level bjw, final Player ayj) {
-        final CompoundTag jt5 = ben.getTag();
-        if (jt5 != null && jt5.contains("map_scale_direction", 99)) {
-            scaleMap(ben, bjw, jt5.getInt("map_scale_direction"));
-            jt5.remove("map_scale_direction");
+    public void onCraftedBy(final ItemStack bki, final Level bqb, final Player bec) {
+        final CompoundTag le5 = bki.getTag();
+        if (le5 != null && le5.contains("map_scale_direction", 99)) {
+            scaleMap(bki, bqb, le5.getInt("map_scale_direction"));
+            le5.remove("map_scale_direction");
         }
     }
     
-    protected static void scaleMap(final ItemStack ben, final Level bjw, final int integer) {
-        final MapItemSavedData crg4 = getOrCreateSavedData(ben, bjw);
-        if (crg4 != null) {
-            createAndStoreSavedData(ben, bjw, crg4.x, crg4.z, Mth.clamp(crg4.scale + integer, 0, 4), crg4.trackingPosition, crg4.unlimitedTracking, crg4.dimension);
+    protected static void scaleMap(final ItemStack bki, final Level bqb, final int integer) {
+        final MapItemSavedData czv4 = getOrCreateSavedData(bki, bqb);
+        if (czv4 != null) {
+            createAndStoreSavedData(bki, bqb, czv4.x, czv4.z, Mth.clamp(czv4.scale + integer, 0, 4), czv4.trackingPosition, czv4.unlimitedTracking, czv4.dimension);
         }
     }
     
     @Nullable
-    public static ItemStack lockMap(final Level bjw, final ItemStack ben) {
-        final MapItemSavedData crg3 = getOrCreateSavedData(ben, bjw);
-        if (crg3 != null) {
-            final ItemStack ben2 = ben.copy();
-            final MapItemSavedData crg4 = createAndStoreSavedData(ben2, bjw, 0, 0, crg3.scale, crg3.trackingPosition, crg3.unlimitedTracking, crg3.dimension);
-            crg4.lockData(crg3);
-            return ben2;
+    public static ItemStack lockMap(final Level bqb, final ItemStack bki) {
+        final MapItemSavedData czv3 = getOrCreateSavedData(bki, bqb);
+        if (czv3 != null) {
+            final ItemStack bki2 = bki.copy();
+            final MapItemSavedData czv4 = createAndStoreSavedData(bki2, bqb, 0, 0, czv3.scale, czv3.trackingPosition, czv3.unlimitedTracking, czv3.dimension);
+            czv4.lockData(czv3);
+            return bki2;
         }
         return null;
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        final MapItemSavedData crg6 = (bjw == null) ? null : getOrCreateSavedData(ben, bjw);
-        if (crg6 != null && crg6.locked) {
-            list.add(new TranslatableComponent("filled_map.locked", new Object[] { getMapId(ben) }).withStyle(ChatFormatting.GRAY));
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        final MapItemSavedData czv6 = (bqb == null) ? null : getOrCreateSavedData(bki, bqb);
+        if (czv6 != null && czv6.locked) {
+            list.add(new TranslatableComponent("filled_map.locked", new Object[] { getMapId(bki) }).withStyle(ChatFormatting.GRAY));
         }
-        if (bfw.isAdvanced()) {
-            if (crg6 != null) {
-                list.add(new TranslatableComponent("filled_map.id", new Object[] { getMapId(ben) }).withStyle(ChatFormatting.GRAY));
-                list.add(new TranslatableComponent("filled_map.scale", new Object[] { 1 << crg6.scale }).withStyle(ChatFormatting.GRAY));
-                list.add(new TranslatableComponent("filled_map.level", new Object[] { crg6.scale, 4 }).withStyle(ChatFormatting.GRAY));
+        if (bls.isAdvanced()) {
+            if (czv6 != null) {
+                list.add(new TranslatableComponent("filled_map.id", new Object[] { getMapId(bki) }).withStyle(ChatFormatting.GRAY));
+                list.add(new TranslatableComponent("filled_map.scale", new Object[] { 1 << czv6.scale }).withStyle(ChatFormatting.GRAY));
+                list.add(new TranslatableComponent("filled_map.level", new Object[] { czv6.scale, 4 }).withStyle(ChatFormatting.GRAY));
             }
             else {
-                list.add(new TranslatableComponent("filled_map.unknown", new Object[0]).withStyle(ChatFormatting.GRAY));
+                list.add(new TranslatableComponent("filled_map.unknown").withStyle(ChatFormatting.GRAY));
             }
         }
     }
     
-    public static int getColor(final ItemStack ben) {
-        final CompoundTag jt2 = ben.getTagElement("display");
-        if (jt2 != null && jt2.contains("MapColor", 99)) {
-            final int integer3 = jt2.getInt("MapColor");
+    public static int getColor(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTagElement("display");
+        if (le2 != null && le2.contains("MapColor", 99)) {
+            final int integer3 = le2.getInt("MapColor");
             return 0xFF000000 | (integer3 & 0xFFFFFF);
         }
         return -12173266;
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final BlockState byj3 = bfz.getLevel().getBlockState(bfz.getClickedPos());
-        if (byj3.is(BlockTags.BANNERS)) {
-            if (!bfz.level.isClientSide) {
-                final MapItemSavedData crg4 = getOrCreateSavedData(bfz.getItemInHand(), bfz.getLevel());
-                crg4.toggleBanner(bfz.getLevel(), bfz.getClickedPos());
+    public InteractionResult useOn(final UseOnContext blv) {
+        final BlockState cfj3 = blv.getLevel().getBlockState(blv.getClickedPos());
+        if (cfj3.is(BlockTags.BANNERS)) {
+            if (!blv.level.isClientSide) {
+                final MapItemSavedData czv4 = getOrCreateSavedData(blv.getItemInHand(), blv.getLevel());
+                czv4.toggleBanner(blv.getLevel(), blv.getClickedPos());
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(blv.level.isClientSide);
         }
-        return super.useOn(bfz);
+        return super.useOn(blv);
     }
 }
diff --git a/src/net/minecraft/world/item/MilkBucketItem.java b/src/net/minecraft/world/item/MilkBucketItem.java
index e45bacc..0590123 100644
--- a/src/net/minecraft/world/item/MilkBucketItem.java
+++ b/src/net/minecraft/world/item/MilkBucketItem.java
@@ -17,37 +17,36 @@ public class MilkBucketItem extends Item {
     }
     
     @Override
-    public ItemStack finishUsingItem(final ItemStack ben, final Level bjw, final LivingEntity akz) {
-        if (akz instanceof ServerPlayer) {
-            final ServerPlayer xe5 = (ServerPlayer)akz;
-            CriteriaTriggers.CONSUME_ITEM.trigger(xe5, ben);
-            xe5.awardStat(Stats.ITEM_USED.get(this));
+    public ItemStack finishUsingItem(final ItemStack bki, final Level bqb, final LivingEntity aoy) {
+        if (aoy instanceof ServerPlayer) {
+            final ServerPlayer ze5 = (ServerPlayer)aoy;
+            CriteriaTriggers.CONSUME_ITEM.trigger(ze5, bki);
+            ze5.awardStat(Stats.ITEM_USED.get(this));
         }
-        if (akz instanceof Player && !((Player)akz).abilities.instabuild) {
-            ben.shrink(1);
+        if (aoy instanceof Player && !((Player)aoy).abilities.instabuild) {
+            bki.shrink(1);
         }
-        if (!bjw.isClientSide) {
-            akz.removeAllEffects();
+        if (!bqb.isClientSide) {
+            aoy.removeAllEffects();
         }
-        if (ben.isEmpty()) {
+        if (bki.isEmpty()) {
             return new ItemStack(Items.BUCKET);
         }
-        return ben;
+        return bki;
     }
     
     @Override
-    public int getUseDuration(final ItemStack ben) {
+    public int getUseDuration(final ItemStack bki) {
         return 32;
     }
     
     @Override
-    public UseAnim getUseAnimation(final ItemStack ben) {
+    public UseAnim getUseAnimation(final ItemStack bki) {
         return UseAnim.DRINK;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        ayj.startUsingItem(ajk);
-        return InteractionResultHolder.<ItemStack>success(ayj.getItemInHand(ajk));
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        return ItemUtils.useDrink(bqb, bec, anf);
     }
 }
diff --git a/src/net/minecraft/world/item/MinecartItem.java b/src/net/minecraft/world/item/MinecartItem.java
index 552ebc8..ceb9d31 100644
--- a/src/net/minecraft/world/item/MinecartItem.java
+++ b/src/net/minecraft/world/item/MinecartItem.java
@@ -10,6 +10,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.state.properties.RailShape;
 import net.minecraft.world.level.block.BaseRailBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.level.ItemLike;
@@ -28,46 +30,46 @@ public class MinecartItem extends Item {
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final BlockState byj5 = bjw3.getBlockState(fk4);
-        if (!byj5.is(BlockTags.RAILS)) {
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        final BlockState cfj5 = bqb3.getBlockState(fu4);
+        if (!cfj5.is(BlockTags.RAILS)) {
             return InteractionResult.FAIL;
         }
-        final ItemStack ben6 = bfz.getItemInHand();
-        if (!bjw3.isClientSide) {
-            final RailShape bzn7 = (byj5.getBlock() instanceof BaseRailBlock) ? byj5.<RailShape>getValue(((BaseRailBlock)byj5.getBlock()).getShapeProperty()) : RailShape.NORTH_SOUTH;
+        final ItemStack bki6 = blv.getItemInHand();
+        if (!bqb3.isClientSide) {
+            final RailShape cgm7 = (cfj5.getBlock() instanceof BaseRailBlock) ? cfj5.<RailShape>getValue(((BaseRailBlock)cfj5.getBlock()).getShapeProperty()) : RailShape.NORTH_SOUTH;
             double double8 = 0.0;
-            if (bzn7.isAscending()) {
+            if (cgm7.isAscending()) {
                 double8 = 0.5;
             }
-            final AbstractMinecart azx10 = AbstractMinecart.createMinecart(bjw3, fk4.getX() + 0.5, fk4.getY() + 0.0625 + double8, fk4.getZ() + 0.5, this.type);
-            if (ben6.hasCustomHoverName()) {
-                azx10.setCustomName(ben6.getHoverName());
+            final AbstractMinecart bfr10 = AbstractMinecart.createMinecart(bqb3, fu4.getX() + 0.5, fu4.getY() + 0.0625 + double8, fu4.getZ() + 0.5, this.type);
+            if (bki6.hasCustomHoverName()) {
+                bfr10.setCustomName(bki6.getHoverName());
             }
-            bjw3.addFreshEntity(azx10);
+            bqb3.addFreshEntity(bfr10);
         }
-        ben6.shrink(1);
-        return InteractionResult.SUCCESS;
+        bki6.shrink(1);
+        return InteractionResult.sidedSuccess(bqb3.isClientSide);
     }
     
     static {
         DISPENSE_ITEM_BEHAVIOR = new DefaultDispenseItemBehavior() {
             private final DefaultDispenseItemBehavior defaultDispenseItemBehavior = new DefaultDispenseItemBehavior();
             
-            public ItemStack execute(final BlockSource fl, final ItemStack ben) {
-                final Direction fp4 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-                final Level bjw5 = fl.getLevel();
-                final double double6 = fl.x() + fp4.getStepX() * 1.125;
-                final double double7 = Math.floor(fl.y()) + fp4.getStepY();
-                final double double8 = fl.z() + fp4.getStepZ() * 1.125;
-                final BlockPos fk12 = fl.getPos().relative(fp4);
-                final BlockState byj13 = bjw5.getBlockState(fk12);
-                final RailShape bzn14 = (byj13.getBlock() instanceof BaseRailBlock) ? byj13.<RailShape>getValue(((BaseRailBlock)byj13.getBlock()).getShapeProperty()) : RailShape.NORTH_SOUTH;
+            public ItemStack execute(final BlockSource fv, final ItemStack bki) {
+                final Direction fz4 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+                final Level bqb5 = fv.getLevel();
+                final double double6 = fv.x() + fz4.getStepX() * 1.125;
+                final double double7 = Math.floor(fv.y()) + fz4.getStepY();
+                final double double8 = fv.z() + fz4.getStepZ() * 1.125;
+                final BlockPos fu12 = fv.getPos().relative(fz4);
+                final BlockState cfj13 = bqb5.getBlockState(fu12);
+                final RailShape cgm14 = (cfj13.getBlock() instanceof BaseRailBlock) ? cfj13.<RailShape>getValue(((BaseRailBlock)cfj13.getBlock()).getShapeProperty()) : RailShape.NORTH_SOUTH;
                 double double9;
-                if (byj13.is(BlockTags.RAILS)) {
-                    if (bzn14.isAscending()) {
+                if (cfj13.is(BlockTags.RAILS)) {
+                    if (cgm14.isAscending()) {
                         double9 = 0.6;
                     }
                     else {
@@ -75,30 +77,30 @@ public class MinecartItem extends Item {
                     }
                 }
                 else {
-                    if (!byj13.isAir() || !bjw5.getBlockState(fk12.below()).is(BlockTags.RAILS)) {
-                        return this.defaultDispenseItemBehavior.dispense(fl, ben);
+                    if (!cfj13.isAir() || !bqb5.getBlockState(fu12.below()).is(BlockTags.RAILS)) {
+                        return this.defaultDispenseItemBehavior.dispense(fv, bki);
                     }
-                    final BlockState byj14 = bjw5.getBlockState(fk12.below());
-                    final RailShape bzn15 = (byj14.getBlock() instanceof BaseRailBlock) ? byj14.<RailShape>getValue(((BaseRailBlock)byj14.getBlock()).getShapeProperty()) : RailShape.NORTH_SOUTH;
-                    if (fp4 == Direction.DOWN || !bzn15.isAscending()) {
+                    final BlockState cfj14 = bqb5.getBlockState(fu12.below());
+                    final RailShape cgm15 = (cfj14.getBlock() instanceof BaseRailBlock) ? cfj14.<RailShape>getValue(((BaseRailBlock)cfj14.getBlock()).getShapeProperty()) : RailShape.NORTH_SOUTH;
+                    if (fz4 == Direction.DOWN || !cgm15.isAscending()) {
                         double9 = -0.9;
                     }
                     else {
                         double9 = -0.4;
                     }
                 }
-                final AbstractMinecart azx17 = AbstractMinecart.createMinecart(bjw5, double6, double7 + double9, double8, ((MinecartItem)ben.getItem()).type);
-                if (ben.hasCustomHoverName()) {
-                    azx17.setCustomName(ben.getHoverName());
+                final AbstractMinecart bfr17 = AbstractMinecart.createMinecart(bqb5, double6, double7 + double9, double8, ((MinecartItem)bki.getItem()).type);
+                if (bki.hasCustomHoverName()) {
+                    bfr17.setCustomName(bki.getHoverName());
                 }
-                bjw5.addFreshEntity(azx17);
-                ben.shrink(1);
-                return ben;
+                bqb5.addFreshEntity(bfr17);
+                bki.shrink(1);
+                return bki;
             }
             
             @Override
-            protected void playSound(final BlockSource fl) {
-                fl.getLevel().levelEvent(1000, fl.getPos(), 0);
+            protected void playSound(final BlockSource fv) {
+                fv.getLevel().levelEvent(1000, fv.getPos(), 0);
             }
         };
     }
diff --git a/src/net/minecraft/world/item/NameTagItem.java b/src/net/minecraft/world/item/NameTagItem.java
index bc6db66..b84030c 100644
--- a/src/net/minecraft/world/item/NameTagItem.java
+++ b/src/net/minecraft/world/item/NameTagItem.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.item;
 
 import net.minecraft.world.entity.Mob;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
@@ -11,17 +12,17 @@ public class NameTagItem extends Item {
     }
     
     @Override
-    public boolean interactEnemy(final ItemStack ben, final Player ayj, final LivingEntity akz, final InteractionHand ajk) {
-        if (ben.hasCustomHoverName() && !(akz instanceof Player)) {
-            if (akz.isAlive()) {
-                akz.setCustomName(ben.getHoverName());
-                if (akz instanceof Mob) {
-                    ((Mob)akz).setPersistenceRequired();
+    public InteractionResult interactLivingEntity(final ItemStack bki, final Player bec, final LivingEntity aoy, final InteractionHand anf) {
+        if (bki.hasCustomHoverName() && !(aoy instanceof Player)) {
+            if (!bec.level.isClientSide && aoy.isAlive()) {
+                aoy.setCustomName(bki.getHoverName());
+                if (aoy instanceof Mob) {
+                    ((Mob)aoy).setPersistenceRequired();
                 }
-                ben.shrink(1);
+                bki.shrink(1);
             }
-            return true;
+            return InteractionResult.sidedSuccess(bec.level.isClientSide);
         }
-        return false;
+        return InteractionResult.PASS;
     }
 }
diff --git a/src/net/minecraft/world/item/PickaxeItem.java b/src/net/minecraft/world/item/PickaxeItem.java
index 1420dcf..2f22f80 100644
--- a/src/net/minecraft/world/item/PickaxeItem.java
+++ b/src/net/minecraft/world/item/PickaxeItem.java
@@ -10,37 +10,36 @@ import java.util.Set;
 public class PickaxeItem extends DiggerItem {
     private static final Set<Block> DIGGABLES;
     
-    protected PickaxeItem(final Tier bfs, final int integer, final float float3, final Properties a) {
-        super((float)integer, float3, bfs, PickaxeItem.DIGGABLES, a);
+    protected PickaxeItem(final Tier blo, final int integer, final float float3, final Properties a) {
+        super((float)integer, float3, blo, PickaxeItem.DIGGABLES, a);
     }
     
     @Override
-    public boolean canDestroySpecial(final BlockState byj) {
-        final Block bph3 = byj.getBlock();
-        final int integer4 = this.getTier().getLevel();
-        if (bph3 == Blocks.OBSIDIAN) {
-            return integer4 == 3;
+    public boolean isCorrectToolForDrops(final BlockState cfj) {
+        final int integer3 = this.getTier().getLevel();
+        if (cfj.is(Blocks.OBSIDIAN) || cfj.is(Blocks.CRYING_OBSIDIAN) || cfj.is(Blocks.NETHERITE_BLOCK) || cfj.is(Blocks.RESPAWN_ANCHOR) || cfj.is(Blocks.ANCIENT_DEBRIS)) {
+            return integer3 >= 3;
         }
-        if (bph3 == Blocks.DIAMOND_BLOCK || bph3 == Blocks.DIAMOND_ORE || bph3 == Blocks.EMERALD_ORE || bph3 == Blocks.EMERALD_BLOCK || bph3 == Blocks.GOLD_BLOCK || bph3 == Blocks.GOLD_ORE || bph3 == Blocks.REDSTONE_ORE) {
-            return integer4 >= 2;
+        if (cfj.is(Blocks.DIAMOND_BLOCK) || cfj.is(Blocks.DIAMOND_ORE) || cfj.is(Blocks.EMERALD_ORE) || cfj.is(Blocks.EMERALD_BLOCK) || cfj.is(Blocks.GOLD_BLOCK) || cfj.is(Blocks.GOLD_ORE) || cfj.is(Blocks.REDSTONE_ORE)) {
+            return integer3 >= 2;
         }
-        if (bph3 == Blocks.IRON_BLOCK || bph3 == Blocks.IRON_ORE || bph3 == Blocks.LAPIS_BLOCK || bph3 == Blocks.LAPIS_ORE) {
-            return integer4 >= 1;
+        if (cfj.is(Blocks.IRON_BLOCK) || cfj.is(Blocks.IRON_ORE) || cfj.is(Blocks.LAPIS_BLOCK) || cfj.is(Blocks.LAPIS_ORE)) {
+            return integer3 >= 1;
         }
-        final Material coo5 = byj.getMaterial();
-        return coo5 == Material.STONE || coo5 == Material.METAL || coo5 == Material.HEAVY_METAL;
+        final Material cxd4 = cfj.getMaterial();
+        return cxd4 == Material.STONE || cxd4 == Material.METAL || cxd4 == Material.HEAVY_METAL || cfj.is(Blocks.NETHER_GOLD_ORE);
     }
     
     @Override
-    public float getDestroySpeed(final ItemStack ben, final BlockState byj) {
-        final Material coo4 = byj.getMaterial();
-        if (coo4 == Material.METAL || coo4 == Material.HEAVY_METAL || coo4 == Material.STONE) {
+    public float getDestroySpeed(final ItemStack bki, final BlockState cfj) {
+        final Material cxd4 = cfj.getMaterial();
+        if (cxd4 == Material.METAL || cxd4 == Material.HEAVY_METAL || cxd4 == Material.STONE) {
             return this.speed;
         }
-        return super.getDestroySpeed(ben, byj);
+        return super.getDestroySpeed(bki, cfj);
     }
     
     static {
-        DIGGABLES = ImmutableSet.<Block>of(Blocks.ACTIVATOR_RAIL, Blocks.COAL_ORE, Blocks.COBBLESTONE, Blocks.DETECTOR_RAIL, Blocks.DIAMOND_BLOCK, Blocks.DIAMOND_ORE, Blocks.POWERED_RAIL, Blocks.GOLD_BLOCK, Blocks.GOLD_ORE, Blocks.ICE, Blocks.IRON_BLOCK, Blocks.IRON_ORE, Blocks.LAPIS_BLOCK, Blocks.LAPIS_ORE, Blocks.MOSSY_COBBLESTONE, Blocks.NETHERRACK, Blocks.PACKED_ICE, Blocks.BLUE_ICE, Blocks.RAIL, Blocks.REDSTONE_ORE, Blocks.SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.RED_SANDSTONE, Blocks.STONE, Blocks.GRANITE, Blocks.POLISHED_GRANITE, Blocks.DIORITE, Blocks.POLISHED_DIORITE, Blocks.ANDESITE, Blocks.POLISHED_ANDESITE, Blocks.STONE_SLAB, Blocks.SMOOTH_STONE_SLAB, Blocks.SANDSTONE_SLAB, Blocks.PETRIFIED_OAK_SLAB, Blocks.COBBLESTONE_SLAB, Blocks.BRICK_SLAB, Blocks.STONE_BRICK_SLAB, Blocks.NETHER_BRICK_SLAB, Blocks.QUARTZ_SLAB, Blocks.RED_SANDSTONE_SLAB, Blocks.PURPUR_SLAB, Blocks.SMOOTH_QUARTZ, Blocks.SMOOTH_RED_SANDSTONE, Blocks.SMOOTH_SANDSTONE, Blocks.SMOOTH_STONE, Blocks.STONE_BUTTON, Blocks.STONE_PRESSURE_PLATE, Blocks.POLISHED_GRANITE_SLAB, Blocks.SMOOTH_RED_SANDSTONE_SLAB, Blocks.MOSSY_STONE_BRICK_SLAB, Blocks.POLISHED_DIORITE_SLAB, Blocks.MOSSY_COBBLESTONE_SLAB, Blocks.END_STONE_BRICK_SLAB, Blocks.SMOOTH_SANDSTONE_SLAB, Blocks.SMOOTH_QUARTZ_SLAB, Blocks.GRANITE_SLAB, Blocks.ANDESITE_SLAB, Blocks.RED_NETHER_BRICK_SLAB, Blocks.POLISHED_ANDESITE_SLAB, Blocks.DIORITE_SLAB, Blocks.SHULKER_BOX, Blocks.BLACK_SHULKER_BOX, Blocks.BLUE_SHULKER_BOX, Blocks.BROWN_SHULKER_BOX, Blocks.CYAN_SHULKER_BOX, Blocks.GRAY_SHULKER_BOX, Blocks.GREEN_SHULKER_BOX, Blocks.LIGHT_BLUE_SHULKER_BOX, Blocks.LIGHT_GRAY_SHULKER_BOX, Blocks.LIME_SHULKER_BOX, Blocks.MAGENTA_SHULKER_BOX, Blocks.ORANGE_SHULKER_BOX, Blocks.PINK_SHULKER_BOX, Blocks.PURPLE_SHULKER_BOX, Blocks.RED_SHULKER_BOX, Blocks.WHITE_SHULKER_BOX, Blocks.YELLOW_SHULKER_BOX);
+        DIGGABLES = ImmutableSet.<Block>of(Blocks.ACTIVATOR_RAIL, Blocks.COAL_ORE, Blocks.COBBLESTONE, Blocks.DETECTOR_RAIL, Blocks.DIAMOND_BLOCK, Blocks.DIAMOND_ORE, Blocks.POWERED_RAIL, Blocks.GOLD_BLOCK, Blocks.GOLD_ORE, Blocks.NETHER_GOLD_ORE, Blocks.ICE, Blocks.IRON_BLOCK, Blocks.IRON_ORE, Blocks.LAPIS_BLOCK, Blocks.LAPIS_ORE, Blocks.MOSSY_COBBLESTONE, Blocks.NETHERRACK, Blocks.PACKED_ICE, Blocks.BLUE_ICE, Blocks.RAIL, Blocks.REDSTONE_ORE, Blocks.SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.RED_SANDSTONE, Blocks.STONE, Blocks.GRANITE, Blocks.POLISHED_GRANITE, Blocks.DIORITE, Blocks.POLISHED_DIORITE, Blocks.ANDESITE, Blocks.POLISHED_ANDESITE, Blocks.STONE_SLAB, Blocks.SMOOTH_STONE_SLAB, Blocks.SANDSTONE_SLAB, Blocks.PETRIFIED_OAK_SLAB, Blocks.COBBLESTONE_SLAB, Blocks.BRICK_SLAB, Blocks.STONE_BRICK_SLAB, Blocks.NETHER_BRICK_SLAB, Blocks.QUARTZ_SLAB, Blocks.RED_SANDSTONE_SLAB, Blocks.PURPUR_SLAB, Blocks.SMOOTH_QUARTZ, Blocks.SMOOTH_RED_SANDSTONE, Blocks.SMOOTH_SANDSTONE, Blocks.SMOOTH_STONE, Blocks.STONE_BUTTON, Blocks.STONE_PRESSURE_PLATE, Blocks.POLISHED_GRANITE_SLAB, Blocks.SMOOTH_RED_SANDSTONE_SLAB, Blocks.MOSSY_STONE_BRICK_SLAB, Blocks.POLISHED_DIORITE_SLAB, Blocks.MOSSY_COBBLESTONE_SLAB, Blocks.END_STONE_BRICK_SLAB, Blocks.SMOOTH_SANDSTONE_SLAB, Blocks.SMOOTH_QUARTZ_SLAB, Blocks.GRANITE_SLAB, Blocks.ANDESITE_SLAB, Blocks.RED_NETHER_BRICK_SLAB, Blocks.POLISHED_ANDESITE_SLAB, Blocks.DIORITE_SLAB, Blocks.SHULKER_BOX, Blocks.BLACK_SHULKER_BOX, Blocks.BLUE_SHULKER_BOX, Blocks.BROWN_SHULKER_BOX, Blocks.CYAN_SHULKER_BOX, Blocks.GRAY_SHULKER_BOX, Blocks.GREEN_SHULKER_BOX, Blocks.LIGHT_BLUE_SHULKER_BOX, Blocks.LIGHT_GRAY_SHULKER_BOX, Blocks.LIME_SHULKER_BOX, Blocks.MAGENTA_SHULKER_BOX, Blocks.ORANGE_SHULKER_BOX, Blocks.PINK_SHULKER_BOX, Blocks.PURPLE_SHULKER_BOX, Blocks.RED_SHULKER_BOX, Blocks.WHITE_SHULKER_BOX, Blocks.YELLOW_SHULKER_BOX, Blocks.PISTON, Blocks.STICKY_PISTON, Blocks.PISTON_HEAD);
     }
 }
diff --git a/src/net/minecraft/world/item/PlayerHeadItem.java b/src/net/minecraft/world/item/PlayerHeadItem.java
index adf9eef..1fd332d 100644
--- a/src/net/minecraft/world/item/PlayerHeadItem.java
+++ b/src/net/minecraft/world/item/PlayerHeadItem.java
@@ -12,38 +12,38 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.block.Block;
 
 public class PlayerHeadItem extends StandingAndWallBlockItem {
-    public PlayerHeadItem(final Block bph1, final Block bph2, final Properties a) {
-        super(bph1, bph2, a);
+    public PlayerHeadItem(final Block bvr1, final Block bvr2, final Properties a) {
+        super(bvr1, bvr2, a);
     }
     
     @Override
-    public Component getName(final ItemStack ben) {
-        if (ben.getItem() == Items.PLAYER_HEAD && ben.hasTag()) {
+    public Component getName(final ItemStack bki) {
+        if (bki.getItem() == Items.PLAYER_HEAD && bki.hasTag()) {
             String string3 = null;
-            final CompoundTag jt4 = ben.getTag();
-            if (jt4.contains("SkullOwner", 8)) {
-                string3 = jt4.getString("SkullOwner");
+            final CompoundTag le4 = bki.getTag();
+            if (le4.contains("SkullOwner", 8)) {
+                string3 = le4.getString("SkullOwner");
             }
-            else if (jt4.contains("SkullOwner", 10)) {
-                final CompoundTag jt5 = jt4.getCompound("SkullOwner");
-                if (jt5.contains("Name", 8)) {
-                    string3 = jt5.getString("Name");
+            else if (le4.contains("SkullOwner", 10)) {
+                final CompoundTag le5 = le4.getCompound("SkullOwner");
+                if (le5.contains("Name", 8)) {
+                    string3 = le5.getString("Name");
                 }
             }
             if (string3 != null) {
                 return new TranslatableComponent(this.getDescriptionId() + ".named", new Object[] { string3 });
             }
         }
-        return super.getName(ben);
+        return super.getName(bki);
     }
     
     @Override
-    public boolean verifyTagAfterLoad(final CompoundTag jt) {
-        super.verifyTagAfterLoad(jt);
-        if (jt.contains("SkullOwner", 8) && !StringUtils.isBlank((CharSequence)jt.getString("SkullOwner"))) {
-            GameProfile gameProfile3 = new GameProfile((UUID)null, jt.getString("SkullOwner"));
+    public boolean verifyTagAfterLoad(final CompoundTag le) {
+        super.verifyTagAfterLoad(le);
+        if (le.contains("SkullOwner", 8) && !StringUtils.isBlank((CharSequence)le.getString("SkullOwner"))) {
+            GameProfile gameProfile3 = new GameProfile((UUID)null, le.getString("SkullOwner"));
             gameProfile3 = SkullBlockEntity.updateGameprofile(gameProfile3);
-            jt.put("SkullOwner", NbtUtils.writeGameProfile(new CompoundTag(), gameProfile3));
+            le.put("SkullOwner", NbtUtils.writeGameProfile(new CompoundTag(), gameProfile3));
             return true;
         }
         return false;
diff --git a/src/net/minecraft/world/item/PotionItem.java b/src/net/minecraft/world/item/PotionItem.java
index 3a8682b..4bf7965 100644
--- a/src/net/minecraft/world/item/PotionItem.java
+++ b/src/net/minecraft/world/item/PotionItem.java
@@ -33,76 +33,75 @@ public class PotionItem extends Item {
     }
     
     @Override
-    public ItemStack finishUsingItem(final ItemStack ben, final Level bjw, final LivingEntity akz) {
-        final Player ayj5 = (akz instanceof Player) ? ((Player)akz) : null;
-        if (ayj5 instanceof ServerPlayer) {
-            CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayer)ayj5, ben);
+    public ItemStack finishUsingItem(final ItemStack bki, final Level bqb, final LivingEntity aoy) {
+        final Player bec5 = (aoy instanceof Player) ? ((Player)aoy) : null;
+        if (bec5 instanceof ServerPlayer) {
+            CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayer)bec5, bki);
         }
-        if (!bjw.isClientSide) {
-            final List<MobEffectInstance> list6 = PotionUtils.getMobEffects(ben);
-            for (final MobEffectInstance akk8 : list6) {
-                if (akk8.getEffect().isInstantenous()) {
-                    akk8.getEffect().applyInstantenousEffect(ayj5, ayj5, akz, akk8.getAmplifier(), 1.0);
+        if (!bqb.isClientSide) {
+            final List<MobEffectInstance> list6 = PotionUtils.getMobEffects(bki);
+            for (final MobEffectInstance aog8 : list6) {
+                if (aog8.getEffect().isInstantenous()) {
+                    aog8.getEffect().applyInstantenousEffect(bec5, bec5, aoy, aog8.getAmplifier(), 1.0);
                 }
                 else {
-                    akz.addEffect(new MobEffectInstance(akk8));
+                    aoy.addEffect(new MobEffectInstance(aog8));
                 }
             }
         }
-        if (ayj5 != null) {
-            ayj5.awardStat(Stats.ITEM_USED.get(this));
-            if (!ayj5.abilities.instabuild) {
-                ben.shrink(1);
+        if (bec5 != null) {
+            bec5.awardStat(Stats.ITEM_USED.get(this));
+            if (!bec5.abilities.instabuild) {
+                bki.shrink(1);
             }
         }
-        if (ayj5 == null || !ayj5.abilities.instabuild) {
-            if (ben.isEmpty()) {
+        if (bec5 == null || !bec5.abilities.instabuild) {
+            if (bki.isEmpty()) {
                 return new ItemStack(Items.GLASS_BOTTLE);
             }
-            if (ayj5 != null) {
-                ayj5.inventory.add(new ItemStack(Items.GLASS_BOTTLE));
+            if (bec5 != null) {
+                bec5.inventory.add(new ItemStack(Items.GLASS_BOTTLE));
             }
         }
-        return ben;
+        return bki;
     }
     
     @Override
-    public int getUseDuration(final ItemStack ben) {
+    public int getUseDuration(final ItemStack bki) {
         return 32;
     }
     
     @Override
-    public UseAnim getUseAnimation(final ItemStack ben) {
+    public UseAnim getUseAnimation(final ItemStack bki) {
         return UseAnim.DRINK;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        ayj.startUsingItem(ajk);
-        return InteractionResultHolder.<ItemStack>success(ayj.getItemInHand(ajk));
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        return ItemUtils.useDrink(bqb, bec, anf);
     }
     
     @Override
-    public String getDescriptionId(final ItemStack ben) {
-        return PotionUtils.getPotion(ben).getName(this.getDescriptionId() + ".effect.");
+    public String getDescriptionId(final ItemStack bki) {
+        return PotionUtils.getPotion(bki).getName(this.getDescriptionId() + ".effect.");
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        PotionUtils.addPotionTooltip(ben, list, 1.0f);
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        PotionUtils.addPotionTooltip(bki, list, 1.0f);
     }
     
     @Override
-    public boolean isFoil(final ItemStack ben) {
-        return super.isFoil(ben) || !PotionUtils.getMobEffects(ben).isEmpty();
+    public boolean isFoil(final ItemStack bki) {
+        return super.isFoil(bki) || !PotionUtils.getMobEffects(bki).isEmpty();
     }
     
     @Override
-    public void fillItemCategory(final CreativeModeTab bdd, final NonNullList<ItemStack> fy) {
-        if (this.allowdedIn(bdd)) {
-            for (final Potion bgd5 : Registry.POTION) {
-                if (bgd5 != Potions.EMPTY) {
-                    fy.add(PotionUtils.setPotion(new ItemStack(this), bgd5));
+    public void fillItemCategory(final CreativeModeTab biy, final NonNullList<ItemStack> gi) {
+        if (this.allowdedIn(biy)) {
+            for (final Potion bmb5 : Registry.POTION) {
+                if (bmb5 != Potions.EMPTY) {
+                    gi.add(PotionUtils.setPotion(new ItemStack(this), bmb5));
                 }
             }
         }
diff --git a/src/net/minecraft/world/item/ProjectileWeaponItem.java b/src/net/minecraft/world/item/ProjectileWeaponItem.java
index 272c5e3..e6caf1b 100644
--- a/src/net/minecraft/world/item/ProjectileWeaponItem.java
+++ b/src/net/minecraft/world/item/ProjectileWeaponItem.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.item;
 
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.LivingEntity;
@@ -19,12 +20,12 @@ public abstract class ProjectileWeaponItem extends Item {
     
     public abstract Predicate<ItemStack> getAllSupportedProjectiles();
     
-    public static ItemStack getHeldProjectile(final LivingEntity akz, final Predicate<ItemStack> predicate) {
-        if (predicate.test(akz.getItemInHand(InteractionHand.OFF_HAND))) {
-            return akz.getItemInHand(InteractionHand.OFF_HAND);
+    public static ItemStack getHeldProjectile(final LivingEntity aoy, final Predicate<ItemStack> predicate) {
+        if (predicate.test(aoy.getItemInHand(InteractionHand.OFF_HAND))) {
+            return aoy.getItemInHand(InteractionHand.OFF_HAND);
         }
-        if (predicate.test(akz.getItemInHand(InteractionHand.MAIN_HAND))) {
-            return akz.getItemInHand(InteractionHand.MAIN_HAND);
+        if (predicate.test(aoy.getItemInHand(InteractionHand.MAIN_HAND))) {
+            return aoy.getItemInHand(InteractionHand.MAIN_HAND);
         }
         return ItemStack.EMPTY;
     }
@@ -34,8 +35,10 @@ public abstract class ProjectileWeaponItem extends Item {
         return 1;
     }
     
+    public abstract int getDefaultProjectileRange();
+    
     static {
-        ARROW_ONLY = (ben -> ben.getItem().is(ItemTags.ARROWS));
-        ARROW_OR_FIREWORK = ProjectileWeaponItem.ARROW_ONLY.or(ben -> ben.getItem() == Items.FIREWORK_ROCKET);
+        ARROW_ONLY = (bki -> bki.getItem().is(ItemTags.ARROWS));
+        ARROW_OR_FIREWORK = ProjectileWeaponItem.ARROW_ONLY.or(bki -> bki.getItem() == Items.FIREWORK_ROCKET);
     }
 }
diff --git a/src/net/minecraft/world/item/Rarity.java b/src/net/minecraft/world/item/Rarity.java
index 7c76a42..e1cfd94 100644
--- a/src/net/minecraft/world/item/Rarity.java
+++ b/src/net/minecraft/world/item/Rarity.java
@@ -10,7 +10,7 @@ public enum Rarity {
     
     public final ChatFormatting color;
     
-    private Rarity(final ChatFormatting g) {
-        this.color = g;
+    private Rarity(final ChatFormatting i) {
+        this.color = i;
     }
 }
diff --git a/src/net/minecraft/world/item/RecordItem.java b/src/net/minecraft/world/item/RecordItem.java
index 49ce3e0..b106180 100644
--- a/src/net/minecraft/world/item/RecordItem.java
+++ b/src/net/minecraft/world/item/RecordItem.java
@@ -2,6 +2,7 @@ package net.minecraft.world.item;
 
 import com.google.common.collect.Maps;
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import java.util.List;
@@ -24,32 +25,32 @@ public class RecordItem extends Item {
     private final int analogOutput;
     private final SoundEvent sound;
     
-    protected RecordItem(final int integer, final SoundEvent aah, final Properties a) {
+    protected RecordItem(final int integer, final SoundEvent ack, final Properties a) {
         super(a);
         this.analogOutput = integer;
-        this.sound = aah;
+        this.sound = ack;
         RecordItem.BY_NAME.put(this.sound, this);
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final BlockState byj5 = bjw3.getBlockState(fk4);
-        if (byj5.getBlock() != Blocks.JUKEBOX || byj5.<Boolean>getValue((Property<Boolean>)JukeboxBlock.HAS_RECORD)) {
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        final BlockState cfj5 = bqb3.getBlockState(fu4);
+        if (!cfj5.is(Blocks.JUKEBOX) || cfj5.<Boolean>getValue((Property<Boolean>)JukeboxBlock.HAS_RECORD)) {
             return InteractionResult.PASS;
         }
-        final ItemStack ben6 = bfz.getItemInHand();
-        if (!bjw3.isClientSide) {
-            ((JukeboxBlock)Blocks.JUKEBOX).setRecord(bjw3, fk4, byj5, ben6);
-            bjw3.levelEvent(null, 1010, fk4, Item.getId(this));
-            ben6.shrink(1);
-            final Player ayj7 = bfz.getPlayer();
-            if (ayj7 != null) {
-                ayj7.awardStat(Stats.PLAY_RECORD);
+        final ItemStack bki6 = blv.getItemInHand();
+        if (!bqb3.isClientSide) {
+            ((JukeboxBlock)Blocks.JUKEBOX).setRecord(bqb3, fu4, cfj5, bki6);
+            bqb3.levelEvent(null, 1010, fu4, Item.getId(this));
+            bki6.shrink(1);
+            final Player bec7 = blv.getPlayer();
+            if (bec7 != null) {
+                bec7.awardStat(Stats.PLAY_RECORD);
             }
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.sidedSuccess(bqb3.isClientSide);
     }
     
     public int getAnalogOutput() {
@@ -57,17 +58,17 @@ public class RecordItem extends Item {
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
         list.add(this.getDisplayName().withStyle(ChatFormatting.GRAY));
     }
     
-    public Component getDisplayName() {
-        return new TranslatableComponent(this.getDescriptionId() + ".desc", new Object[0]);
+    public MutableComponent getDisplayName() {
+        return new TranslatableComponent(this.getDescriptionId() + ".desc");
     }
     
     @Nullable
-    public static RecordItem getBySound(final SoundEvent aah) {
-        return RecordItem.BY_NAME.get(aah);
+    public static RecordItem getBySound(final SoundEvent ack) {
+        return RecordItem.BY_NAME.get(ack);
     }
     
     public SoundEvent getSound() {
diff --git a/src/net/minecraft/world/item/SaddleItem.java b/src/net/minecraft/world/item/SaddleItem.java
index fc7bc15..e406778 100644
--- a/src/net/minecraft/world/item/SaddleItem.java
+++ b/src/net/minecraft/world/item/SaddleItem.java
@@ -1,8 +1,8 @@
 package net.minecraft.world.item;
 
 import net.minecraft.sounds.SoundSource;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.entity.animal.Pig;
+import net.minecraft.world.entity.Saddleable;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
@@ -13,16 +13,17 @@ public class SaddleItem extends Item {
     }
     
     @Override
-    public boolean interactEnemy(final ItemStack ben, final Player ayj, final LivingEntity akz, final InteractionHand ajk) {
-        if (akz instanceof Pig) {
-            final Pig atq6 = (Pig)akz;
-            if (atq6.isAlive() && !atq6.hasSaddle() && !atq6.isBaby()) {
-                atq6.setSaddle(true);
-                atq6.level.playSound(ayj, atq6.getX(), atq6.getY(), atq6.getZ(), SoundEvents.PIG_SADDLE, SoundSource.NEUTRAL, 0.5f, 1.0f);
-                ben.shrink(1);
-                return true;
+    public InteractionResult interactLivingEntity(final ItemStack bki, final Player bec, final LivingEntity aoy, final InteractionHand anf) {
+        if (aoy instanceof Saddleable && aoy.isAlive()) {
+            final Saddleable apm6 = (Saddleable)aoy;
+            if (!apm6.isSaddled() && apm6.isSaddleable()) {
+                if (!bec.level.isClientSide) {
+                    apm6.equipSaddle(SoundSource.NEUTRAL);
+                    bki.shrink(1);
+                }
+                return InteractionResult.sidedSuccess(bec.level.isClientSide);
             }
         }
-        return false;
+        return InteractionResult.PASS;
     }
 }
diff --git a/src/net/minecraft/world/item/ScaffoldingBlockItem.java b/src/net/minecraft/world/item/ScaffoldingBlockItem.java
index 824dc4d..bf4627b 100644
--- a/src/net/minecraft/world/item/ScaffoldingBlockItem.java
+++ b/src/net/minecraft/world/item/ScaffoldingBlockItem.java
@@ -6,60 +6,62 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.ScaffoldingBlock;
 import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundChatPacket;
+import net.minecraft.Util;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
 
 public class ScaffoldingBlockItem extends BlockItem {
-    public ScaffoldingBlockItem(final Block bph, final Properties a) {
-        super(bph, a);
+    public ScaffoldingBlockItem(final Block bvr, final Properties a) {
+        super(bvr, a);
     }
     
     @Nullable
     @Override
-    public BlockPlaceContext updatePlacementContext(final BlockPlaceContext bcq) {
-        final BlockPos fk3 = bcq.getClickedPos();
-        final Level bjw4 = bcq.getLevel();
-        BlockState byj5 = bjw4.getBlockState(fk3);
-        final Block bph6 = this.getBlock();
-        if (byj5.getBlock() == bph6) {
-            Direction fp7;
-            if (bcq.isSecondaryUseActive()) {
-                fp7 = (bcq.isInside() ? bcq.getClickedFace().getOpposite() : bcq.getClickedFace());
+    public BlockPlaceContext updatePlacementContext(final BlockPlaceContext bin) {
+        final BlockPos fu3 = bin.getClickedPos();
+        final Level bqb4 = bin.getLevel();
+        BlockState cfj5 = bqb4.getBlockState(fu3);
+        final Block bvr6 = this.getBlock();
+        if (cfj5.is(bvr6)) {
+            Direction fz7;
+            if (bin.isSecondaryUseActive()) {
+                fz7 = (bin.isInside() ? bin.getClickedFace().getOpposite() : bin.getClickedFace());
             }
             else {
-                fp7 = ((bcq.getClickedFace() == Direction.UP) ? bcq.getHorizontalDirection() : Direction.UP);
+                fz7 = ((bin.getClickedFace() == Direction.UP) ? bin.getHorizontalDirection() : Direction.UP);
             }
             int integer8 = 0;
-            final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos(fk3).move(fp7);
+            final BlockPos.MutableBlockPos a9 = fu3.mutable().move(fz7);
             while (integer8 < 7) {
-                if (!bjw4.isClientSide && !Level.isInWorldBounds(a9)) {
-                    final Player ayj10 = bcq.getPlayer();
-                    final int integer9 = bjw4.getMaxBuildHeight();
-                    if (ayj10 instanceof ServerPlayer && a9.getY() >= integer9) {
-                        final ClientboundChatPacket mm12 = new ClientboundChatPacket(new TranslatableComponent("build.tooHigh", new Object[] { integer9 }).withStyle(ChatFormatting.RED), ChatType.GAME_INFO);
-                        ((ServerPlayer)ayj10).connection.send(mm12);
+                if (!bqb4.isClientSide && !Level.isInWorldBounds(a9)) {
+                    final Player bec10 = bin.getPlayer();
+                    final int integer9 = bqb4.getMaxBuildHeight();
+                    if (bec10 instanceof ServerPlayer && a9.getY() >= integer9) {
+                        final ClientboundChatPacket oa12 = new ClientboundChatPacket(new TranslatableComponent("build.tooHigh", new Object[] { integer9 }).withStyle(ChatFormatting.RED), ChatType.GAME_INFO, Util.NIL_UUID);
+                        ((ServerPlayer)bec10).connection.send(oa12);
                         break;
                     }
                     break;
                 }
                 else {
-                    byj5 = bjw4.getBlockState(a9);
-                    if (byj5.getBlock() != this.getBlock()) {
-                        if (byj5.canBeReplaced(bcq)) {
-                            return BlockPlaceContext.at(bcq, a9, fp7);
+                    cfj5 = bqb4.getBlockState(a9);
+                    if (!cfj5.is(this.getBlock())) {
+                        if (cfj5.canBeReplaced(bin)) {
+                            return BlockPlaceContext.at(bin, a9, fz7);
                         }
                         break;
                     }
                     else {
-                        a9.move(fp7);
-                        if (!fp7.getAxis().isHorizontal()) {
+                        a9.move(fz7);
+                        if (!fz7.getAxis().isHorizontal()) {
                             continue;
                         }
                         ++integer8;
@@ -68,10 +70,10 @@ public class ScaffoldingBlockItem extends BlockItem {
             }
             return null;
         }
-        if (ScaffoldingBlock.getDistance(bjw4, fk3) == 7) {
+        if (ScaffoldingBlock.getDistance(bqb4, fu3) == 7) {
             return null;
         }
-        return bcq;
+        return bin;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/ServerItemCooldowns.java b/src/net/minecraft/world/item/ServerItemCooldowns.java
index 7b1e8d9..4e4f97b 100644
--- a/src/net/minecraft/world/item/ServerItemCooldowns.java
+++ b/src/net/minecraft/world/item/ServerItemCooldowns.java
@@ -7,19 +7,19 @@ import net.minecraft.server.level.ServerPlayer;
 public class ServerItemCooldowns extends ItemCooldowns {
     private final ServerPlayer player;
     
-    public ServerItemCooldowns(final ServerPlayer xe) {
-        this.player = xe;
+    public ServerItemCooldowns(final ServerPlayer ze) {
+        this.player = ze;
     }
     
     @Override
-    protected void onCooldownStarted(final Item bei, final int integer) {
-        super.onCooldownStarted(bei, integer);
-        this.player.connection.send(new ClientboundCooldownPacket(bei, integer));
+    protected void onCooldownStarted(final Item bke, final int integer) {
+        super.onCooldownStarted(bke, integer);
+        this.player.connection.send(new ClientboundCooldownPacket(bke, integer));
     }
     
     @Override
-    protected void onCooldownEnded(final Item bei) {
-        super.onCooldownEnded(bei);
-        this.player.connection.send(new ClientboundCooldownPacket(bei, 0));
+    protected void onCooldownEnded(final Item bke) {
+        super.onCooldownEnded(bke);
+        this.player.connection.send(new ClientboundCooldownPacket(bke, 0));
     }
 }
diff --git a/src/net/minecraft/world/item/ShearsItem.java b/src/net/minecraft/world/item/ShearsItem.java
index c417041..25d8845 100644
--- a/src/net/minecraft/world/item/ShearsItem.java
+++ b/src/net/minecraft/world/item/ShearsItem.java
@@ -1,9 +1,10 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.tags.BlockTags;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.BlockState;
@@ -15,29 +16,26 @@ public class ShearsItem extends Item {
     }
     
     @Override
-    public boolean mineBlock(final ItemStack ben, final Level bjw, final BlockState byj, final BlockPos fk, final LivingEntity akz) {
-        if (!bjw.isClientSide) {
-            ben.<LivingEntity>hurtAndBreak(1, akz, akz -> akz.broadcastBreakEvent(EquipmentSlot.MAINHAND));
+    public boolean mineBlock(final ItemStack bki, final Level bqb, final BlockState cfj, final BlockPos fu, final LivingEntity aoy) {
+        if (!bqb.isClientSide && !cfj.getBlock().is(BlockTags.FIRE)) {
+            bki.<LivingEntity>hurtAndBreak(1, aoy, aoy -> aoy.broadcastBreakEvent(EquipmentSlot.MAINHAND));
         }
-        final Block bph7 = byj.getBlock();
-        return byj.is(BlockTags.LEAVES) || bph7 == Blocks.COBWEB || bph7 == Blocks.GRASS || bph7 == Blocks.FERN || bph7 == Blocks.DEAD_BUSH || bph7 == Blocks.VINE || bph7 == Blocks.TRIPWIRE || bph7.is(BlockTags.WOOL) || super.mineBlock(ben, bjw, byj, fk, akz);
+        return cfj.is(BlockTags.LEAVES) || cfj.is(Blocks.COBWEB) || cfj.is(Blocks.GRASS) || cfj.is(Blocks.FERN) || cfj.is(Blocks.DEAD_BUSH) || cfj.is(Blocks.VINE) || cfj.is(Blocks.TRIPWIRE) || cfj.is(BlockTags.WOOL) || super.mineBlock(bki, bqb, cfj, fu, aoy);
     }
     
     @Override
-    public boolean canDestroySpecial(final BlockState byj) {
-        final Block bph3 = byj.getBlock();
-        return bph3 == Blocks.COBWEB || bph3 == Blocks.REDSTONE_WIRE || bph3 == Blocks.TRIPWIRE;
+    public boolean isCorrectToolForDrops(final BlockState cfj) {
+        return cfj.is(Blocks.COBWEB) || cfj.is(Blocks.REDSTONE_WIRE) || cfj.is(Blocks.TRIPWIRE);
     }
     
     @Override
-    public float getDestroySpeed(final ItemStack ben, final BlockState byj) {
-        final Block bph4 = byj.getBlock();
-        if (bph4 == Blocks.COBWEB || byj.is(BlockTags.LEAVES)) {
+    public float getDestroySpeed(final ItemStack bki, final BlockState cfj) {
+        if (cfj.is(Blocks.COBWEB) || cfj.is(BlockTags.LEAVES)) {
             return 15.0f;
         }
-        if (bph4.is(BlockTags.WOOL)) {
+        if (cfj.is(BlockTags.WOOL)) {
             return 5.0f;
         }
-        return super.getDestroySpeed(ben, byj);
+        return super.getDestroySpeed(bki, cfj);
     }
 }
diff --git a/src/net/minecraft/world/item/ShieldItem.java b/src/net/minecraft/world/item/ShieldItem.java
index 3306589..f12e94b 100644
--- a/src/net/minecraft/world/item/ShieldItem.java
+++ b/src/net/minecraft/world/item/ShieldItem.java
@@ -1,6 +1,5 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.InteractionHand;
@@ -11,51 +10,49 @@ import javax.annotation.Nullable;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.DispenserBlock;
-import net.minecraft.resources.ResourceLocation;
 
 public class ShieldItem extends Item {
     public ShieldItem(final Properties a) {
         super(a);
-        this.addProperty(new ResourceLocation("blocking"), (ben, bjw, akz) -> (akz != null && akz.isUsingItem() && akz.getUseItem() == ben) ? 1.0f : 0.0f);
         DispenserBlock.registerBehavior(this, ArmorItem.DISPENSE_ITEM_BEHAVIOR);
     }
     
     @Override
-    public String getDescriptionId(final ItemStack ben) {
-        if (ben.getTagElement("BlockEntityTag") != null) {
-            return this.getDescriptionId() + '.' + getColor(ben).getName();
+    public String getDescriptionId(final ItemStack bki) {
+        if (bki.getTagElement("BlockEntityTag") != null) {
+            return this.getDescriptionId() + '.' + getColor(bki).getName();
         }
-        return super.getDescriptionId(ben);
+        return super.getDescriptionId(bki);
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        BannerItem.appendHoverTextFromBannerBlockEntityTag(ben, list);
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        BannerItem.appendHoverTextFromBannerBlockEntityTag(bki, list);
     }
     
     @Override
-    public UseAnim getUseAnimation(final ItemStack ben) {
+    public UseAnim getUseAnimation(final ItemStack bki) {
         return UseAnim.BLOCK;
     }
     
     @Override
-    public int getUseDuration(final ItemStack ben) {
+    public int getUseDuration(final ItemStack bki) {
         return 72000;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        ayj.startUsingItem(ajk);
-        return InteractionResultHolder.<ItemStack>consume(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        bec.startUsingItem(anf);
+        return InteractionResultHolder.<ItemStack>consume(bki5);
     }
     
     @Override
-    public boolean isValidRepairItem(final ItemStack ben1, final ItemStack ben2) {
-        return ItemTags.PLANKS.contains(ben2.getItem()) || super.isValidRepairItem(ben1, ben2);
+    public boolean isValidRepairItem(final ItemStack bki1, final ItemStack bki2) {
+        return ItemTags.PLANKS.contains(bki2.getItem()) || super.isValidRepairItem(bki1, bki2);
     }
     
-    public static DyeColor getColor(final ItemStack ben) {
-        return DyeColor.byId(ben.getOrCreateTagElement("BlockEntityTag").getInt("Base"));
+    public static DyeColor getColor(final ItemStack bki) {
+        return DyeColor.byId(bki.getOrCreateTagElement("BlockEntityTag").getInt("Base"));
     }
 }
diff --git a/src/net/minecraft/world/item/ShovelItem.java b/src/net/minecraft/world/item/ShovelItem.java
index f0b1e25..89e5f8b 100644
--- a/src/net/minecraft/world/item/ShovelItem.java
+++ b/src/net/minecraft/world/item/ShovelItem.java
@@ -1,11 +1,12 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.CampfireBlock;
@@ -23,49 +24,51 @@ public class ShovelItem extends DiggerItem {
     private static final Set<Block> DIGGABLES;
     protected static final Map<Block, BlockState> FLATTENABLES;
     
-    public ShovelItem(final Tier bfs, final float float2, final float float3, final Properties a) {
-        super(float2, float3, bfs, ShovelItem.DIGGABLES, a);
+    public ShovelItem(final Tier blo, final float float2, final float float3, final Properties a) {
+        super(float2, float3, blo, ShovelItem.DIGGABLES, a);
     }
     
     @Override
-    public boolean canDestroySpecial(final BlockState byj) {
-        final Block bph3 = byj.getBlock();
-        return bph3 == Blocks.SNOW || bph3 == Blocks.SNOW_BLOCK;
+    public boolean isCorrectToolForDrops(final BlockState cfj) {
+        return cfj.is(Blocks.SNOW) || cfj.is(Blocks.SNOW_BLOCK);
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final BlockState byj5 = bjw3.getBlockState(fk4);
-        if (bfz.getClickedFace() == Direction.DOWN) {
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        final BlockState cfj5 = bqb3.getBlockState(fu4);
+        if (blv.getClickedFace() == Direction.DOWN) {
             return InteractionResult.PASS;
         }
-        final Player ayj2 = bfz.getPlayer();
-        final BlockState byj6 = ShovelItem.FLATTENABLES.get(byj5.getBlock());
-        BlockState byj7 = null;
-        if (byj6 != null && bjw3.getBlockState(fk4.above()).isAir()) {
-            bjw3.playSound(ayj2, fk4, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0f, 1.0f);
-            byj7 = byj6;
+        final Player bec2 = blv.getPlayer();
+        final BlockState cfj6 = ShovelItem.FLATTENABLES.get(cfj5.getBlock());
+        BlockState cfj7 = null;
+        if (cfj6 != null && bqb3.getBlockState(fu4.above()).isAir()) {
+            bqb3.playSound(bec2, fu4, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0f, 1.0f);
+            cfj7 = cfj6;
         }
-        else if (byj5.getBlock() instanceof CampfireBlock && byj5.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT)) {
-            bjw3.levelEvent(null, 1009, fk4, 0);
-            byj7 = ((AbstractStateHolder<O, BlockState>)byj5).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.LIT, false);
+        else if (cfj5.getBlock() instanceof CampfireBlock && cfj5.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT)) {
+            if (!bqb3.isClientSide()) {
+                bqb3.levelEvent(null, 1009, fu4, 0);
+            }
+            CampfireBlock.dowse(bqb3, fu4, cfj5);
+            cfj7 = ((StateHolder<O, BlockState>)cfj5).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.LIT, false);
         }
-        if (byj7 != null) {
-            if (!bjw3.isClientSide) {
-                bjw3.setBlock(fk4, byj7, 11);
-                if (ayj2 != null) {
-                    bfz.getItemInHand().<Player>hurtAndBreak(1, ayj2, ayj -> ayj.broadcastBreakEvent(bfz.getHand()));
+        if (cfj7 != null) {
+            if (!bqb3.isClientSide) {
+                bqb3.setBlock(fu4, cfj7, 11);
+                if (bec2 != null) {
+                    blv.getItemInHand().<Player>hurtAndBreak(1, bec2, bec -> bec.broadcastBreakEvent(blv.getHand()));
                 }
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb3.isClientSide);
         }
         return InteractionResult.PASS;
     }
     
     static {
-        DIGGABLES = Sets.<Block>newHashSet(Blocks.CLAY, Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.FARMLAND, Blocks.GRASS_BLOCK, Blocks.GRAVEL, Blocks.MYCELIUM, Blocks.SAND, Blocks.RED_SAND, Blocks.SNOW_BLOCK, Blocks.SNOW, Blocks.SOUL_SAND, Blocks.GRASS_PATH, Blocks.WHITE_CONCRETE_POWDER, Blocks.ORANGE_CONCRETE_POWDER, Blocks.MAGENTA_CONCRETE_POWDER, Blocks.LIGHT_BLUE_CONCRETE_POWDER, Blocks.YELLOW_CONCRETE_POWDER, Blocks.LIME_CONCRETE_POWDER, Blocks.PINK_CONCRETE_POWDER, Blocks.GRAY_CONCRETE_POWDER, Blocks.LIGHT_GRAY_CONCRETE_POWDER, Blocks.CYAN_CONCRETE_POWDER, Blocks.PURPLE_CONCRETE_POWDER, Blocks.BLUE_CONCRETE_POWDER, Blocks.BROWN_CONCRETE_POWDER, Blocks.GREEN_CONCRETE_POWDER, Blocks.RED_CONCRETE_POWDER, Blocks.BLACK_CONCRETE_POWDER);
+        DIGGABLES = Sets.<Block>newHashSet(Blocks.CLAY, Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.FARMLAND, Blocks.GRASS_BLOCK, Blocks.GRAVEL, Blocks.MYCELIUM, Blocks.SAND, Blocks.RED_SAND, Blocks.SNOW_BLOCK, Blocks.SNOW, Blocks.SOUL_SAND, Blocks.GRASS_PATH, Blocks.WHITE_CONCRETE_POWDER, Blocks.ORANGE_CONCRETE_POWDER, Blocks.MAGENTA_CONCRETE_POWDER, Blocks.LIGHT_BLUE_CONCRETE_POWDER, Blocks.YELLOW_CONCRETE_POWDER, Blocks.LIME_CONCRETE_POWDER, Blocks.PINK_CONCRETE_POWDER, Blocks.GRAY_CONCRETE_POWDER, Blocks.LIGHT_GRAY_CONCRETE_POWDER, Blocks.CYAN_CONCRETE_POWDER, Blocks.PURPLE_CONCRETE_POWDER, Blocks.BLUE_CONCRETE_POWDER, Blocks.BROWN_CONCRETE_POWDER, Blocks.GREEN_CONCRETE_POWDER, Blocks.RED_CONCRETE_POWDER, Blocks.BLACK_CONCRETE_POWDER, Blocks.SOUL_SOIL);
         FLATTENABLES = Maps.newHashMap(ImmutableMap.<Block, BlockState>of(Blocks.GRASS_BLOCK, Blocks.GRASS_PATH.defaultBlockState()));
     }
 }
diff --git a/src/net/minecraft/world/item/SignItem.java b/src/net/minecraft/world/item/SignItem.java
index ca73a63..9fac4fc 100644
--- a/src/net/minecraft/world/item/SignItem.java
+++ b/src/net/minecraft/world/item/SignItem.java
@@ -9,15 +9,15 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.Block;
 
 public class SignItem extends StandingAndWallBlockItem {
-    public SignItem(final Properties a, final Block bph2, final Block bph3) {
-        super(bph2, bph3, a);
+    public SignItem(final Properties a, final Block bvr2, final Block bvr3) {
+        super(bvr2, bvr3, a);
     }
     
     @Override
-    protected boolean updateCustomBlockEntityTag(final BlockPos fk, final Level bjw, @Nullable final Player ayj, final ItemStack ben, final BlockState byj) {
-        final boolean boolean7 = super.updateCustomBlockEntityTag(fk, bjw, ayj, ben, byj);
-        if (!bjw.isClientSide && !boolean7 && ayj != null) {
-            ayj.openTextEdit((SignBlockEntity)bjw.getBlockEntity(fk));
+    protected boolean updateCustomBlockEntityTag(final BlockPos fu, final Level bqb, @Nullable final Player bec, final ItemStack bki, final BlockState cfj) {
+        final boolean boolean7 = super.updateCustomBlockEntityTag(fu, bqb, bec, bki, cfj);
+        if (!bqb.isClientSide && !boolean7 && bec != null) {
+            bec.openTextEdit((SignBlockEntity)bqb.getBlockEntity(fu));
         }
         return boolean7;
     }
diff --git a/src/net/minecraft/world/item/SimpleFoiledItem.java b/src/net/minecraft/world/item/SimpleFoiledItem.java
index 0a8c488..83f4677 100644
--- a/src/net/minecraft/world/item/SimpleFoiledItem.java
+++ b/src/net/minecraft/world/item/SimpleFoiledItem.java
@@ -6,7 +6,7 @@ public class SimpleFoiledItem extends Item {
     }
     
     @Override
-    public boolean isFoil(final ItemStack ben) {
+    public boolean isFoil(final ItemStack bki) {
         return true;
     }
 }
diff --git a/src/net/minecraft/world/item/SnowballItem.java b/src/net/minecraft/world/item/SnowballItem.java
index a4c46af..13b3221 100644
--- a/src/net/minecraft/world/item/SnowballItem.java
+++ b/src/net/minecraft/world/item/SnowballItem.java
@@ -18,19 +18,19 @@ public class SnowballItem extends Item {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        bjw.playSound(null, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.SNOWBALL_THROW, SoundSource.NEUTRAL, 0.5f, 0.4f / (SnowballItem.random.nextFloat() * 0.4f + 0.8f));
-        if (!bjw.isClientSide) {
-            final Snowball azc6 = new Snowball(bjw, ayj);
-            azc6.setItem(ben5);
-            azc6.shootFromRotation(ayj, ayj.xRot, ayj.yRot, 0.0f, 1.5f, 1.0f);
-            bjw.addFreshEntity(azc6);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        bqb.playSound(null, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.SNOWBALL_THROW, SoundSource.NEUTRAL, 0.5f, 0.4f / (SnowballItem.random.nextFloat() * 0.4f + 0.8f));
+        if (!bqb.isClientSide) {
+            final Snowball bew6 = new Snowball(bqb, bec);
+            bew6.setItem(bki5);
+            bew6.shootFromRotation(bec, bec.xRot, bec.yRot, 0.0f, 1.5f, 1.0f);
+            bqb.addFreshEntity(bew6);
         }
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        if (!ayj.abilities.instabuild) {
-            ben5.shrink(1);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        if (!bec.abilities.instabuild) {
+            bki5.shrink(1);
         }
-        return InteractionResultHolder.<ItemStack>success(ben5);
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
     }
 }
diff --git a/src/net/minecraft/world/item/SpawnEggItem.java b/src/net/minecraft/world/item/SpawnEggItem.java
index a108d3b..239fae7 100644
--- a/src/net/minecraft/world/item/SpawnEggItem.java
+++ b/src/net/minecraft/world/item/SpawnEggItem.java
@@ -1,6 +1,11 @@
 package net.minecraft.world.item;
 
 import com.google.common.collect.Maps;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.AgableMob;
+import java.util.Optional;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.Mob;
 import com.google.common.collect.Iterables;
 import javax.annotation.Nullable;
 import net.minecraft.nbt.CompoundTag;
@@ -15,7 +20,6 @@ import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.BaseSpawner;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
@@ -35,82 +39,81 @@ public class SpawnEggItem extends Item {
     private final int color2;
     private final EntityType<?> defaultType;
     
-    public SpawnEggItem(final EntityType<?> aku, final int integer2, final int integer3, final Properties a) {
+    public SpawnEggItem(final EntityType<?> aoq, final int integer2, final int integer3, final Properties a) {
         super(a);
-        this.defaultType = aku;
+        this.defaultType = aoq;
         this.color1 = integer2;
         this.color2 = integer3;
-        SpawnEggItem.BY_ID.put(aku, this);
+        SpawnEggItem.BY_ID.put(aoq, this);
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        if (bjw3.isClientSide) {
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        if (bqb3.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        final ItemStack ben4 = bfz.getItemInHand();
-        final BlockPos fk5 = bfz.getClickedPos();
-        final Direction fp6 = bfz.getClickedFace();
-        final BlockState byj7 = bjw3.getBlockState(fk5);
-        final Block bph8 = byj7.getBlock();
-        if (bph8 == Blocks.SPAWNER) {
-            final BlockEntity bwl9 = bjw3.getBlockEntity(fk5);
-            if (bwl9 instanceof SpawnerBlockEntity) {
-                final BaseSpawner bjd10 = ((SpawnerBlockEntity)bwl9).getSpawner();
-                final EntityType<?> aku11 = this.getType(ben4.getTag());
-                bjd10.setEntityId(aku11);
-                bwl9.setChanged();
-                bjw3.sendBlockUpdated(fk5, byj7, byj7, 3);
-                ben4.shrink(1);
-                return InteractionResult.SUCCESS;
+        final ItemStack bki4 = blv.getItemInHand();
+        final BlockPos fu5 = blv.getClickedPos();
+        final Direction fz6 = blv.getClickedFace();
+        final BlockState cfj7 = bqb3.getBlockState(fu5);
+        if (cfj7.is(Blocks.SPAWNER)) {
+            final BlockEntity cdl8 = bqb3.getBlockEntity(fu5);
+            if (cdl8 instanceof SpawnerBlockEntity) {
+                final BaseSpawner bpd9 = ((SpawnerBlockEntity)cdl8).getSpawner();
+                final EntityType<?> aoq10 = this.getType(bki4.getTag());
+                bpd9.setEntityId(aoq10);
+                cdl8.setChanged();
+                bqb3.sendBlockUpdated(fu5, cfj7, cfj7, 3);
+                bki4.shrink(1);
+                return InteractionResult.CONSUME;
             }
         }
-        BlockPos fk6;
-        if (byj7.getCollisionShape(bjw3, fk5).isEmpty()) {
-            fk6 = fk5;
+        BlockPos fu6;
+        if (cfj7.getCollisionShape(bqb3, fu5).isEmpty()) {
+            fu6 = fu5;
         }
         else {
-            fk6 = fk5.relative(fp6);
+            fu6 = fu5.relative(fz6);
         }
-        final EntityType<?> aku12 = this.getType(ben4.getTag());
-        if (aku12.spawn(bjw3, ben4, bfz.getPlayer(), fk6, MobSpawnType.SPAWN_EGG, true, !Objects.equals(fk5, fk6) && fp6 == Direction.UP) != null) {
-            ben4.shrink(1);
+        final EntityType<?> aoq11 = this.getType(bki4.getTag());
+        if (aoq11.spawn(bqb3, bki4, blv.getPlayer(), fu6, MobSpawnType.SPAWN_EGG, true, !Objects.equals(fu5, fu6) && fz6 == Direction.UP) != null) {
+            bki4.shrink(1);
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        final HitResult cvi6 = Item.getPlayerPOVHitResult(bjw, ayj, ClipContext.Fluid.SOURCE_ONLY);
-        if (cvi6.getType() != HitResult.Type.BLOCK) {
-            return InteractionResultHolder.<ItemStack>pass(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        final HitResult dej6 = Item.getPlayerPOVHitResult(bqb, bec, ClipContext.Fluid.SOURCE_ONLY);
+        if (dej6.getType() != HitResult.Type.BLOCK) {
+            return InteractionResultHolder.<ItemStack>pass(bki5);
         }
-        if (bjw.isClientSide) {
-            return InteractionResultHolder.<ItemStack>success(ben5);
+        if (bqb.isClientSide) {
+            return InteractionResultHolder.<ItemStack>success(bki5);
         }
-        final BlockHitResult cvg7 = (BlockHitResult)cvi6;
-        final BlockPos fk8 = cvg7.getBlockPos();
-        if (!(bjw.getBlockState(fk8).getBlock() instanceof LiquidBlock)) {
-            return InteractionResultHolder.<ItemStack>pass(ben5);
+        final BlockHitResult deh7 = (BlockHitResult)dej6;
+        final BlockPos fu8 = deh7.getBlockPos();
+        if (!(bqb.getBlockState(fu8).getBlock() instanceof LiquidBlock)) {
+            return InteractionResultHolder.<ItemStack>pass(bki5);
         }
-        if (!bjw.mayInteract(ayj, fk8) || !ayj.mayUseItemAt(fk8, cvg7.getDirection(), ben5)) {
-            return InteractionResultHolder.<ItemStack>fail(ben5);
+        if (!bqb.mayInteract(bec, fu8) || !bec.mayUseItemAt(fu8, deh7.getDirection(), bki5)) {
+            return InteractionResultHolder.<ItemStack>fail(bki5);
         }
-        final EntityType<?> aku9 = this.getType(ben5.getTag());
-        if (aku9.spawn(bjw, ben5, ayj, fk8, MobSpawnType.SPAWN_EGG, false, false) == null) {
-            return InteractionResultHolder.<ItemStack>pass(ben5);
+        final EntityType<?> aoq9 = this.getType(bki5.getTag());
+        if (aoq9.spawn(bqb, bki5, bec, fu8, MobSpawnType.SPAWN_EGG, false, false) == null) {
+            return InteractionResultHolder.<ItemStack>pass(bki5);
         }
-        if (!ayj.abilities.instabuild) {
-            ben5.shrink(1);
+        if (!bec.abilities.instabuild) {
+            bki5.shrink(1);
         }
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        return InteractionResultHolder.<ItemStack>success(ben5);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        return InteractionResultHolder.<ItemStack>consume(bki5);
     }
     
-    public boolean spawnsEntity(@Nullable final CompoundTag jt, final EntityType<?> aku) {
-        return Objects.equals(this.getType(jt), aku);
+    public boolean spawnsEntity(@Nullable final CompoundTag le, final EntityType<?> aoq) {
+        return Objects.equals(this.getType(le), aoq);
     }
     
     public int getColor(final int integer) {
@@ -118,24 +121,53 @@ public class SpawnEggItem extends Item {
     }
     
     @Nullable
-    public static SpawnEggItem byId(@Nullable final EntityType<?> aku) {
-        return SpawnEggItem.BY_ID.get(aku);
+    public static SpawnEggItem byId(@Nullable final EntityType<?> aoq) {
+        return SpawnEggItem.BY_ID.get(aoq);
     }
     
     public static Iterable<SpawnEggItem> eggs() {
         return Iterables.<SpawnEggItem>unmodifiableIterable(SpawnEggItem.BY_ID.values());
     }
     
-    public EntityType<?> getType(@Nullable final CompoundTag jt) {
-        if (jt != null && jt.contains("EntityTag", 10)) {
-            final CompoundTag jt2 = jt.getCompound("EntityTag");
-            if (jt2.contains("id", 8)) {
-                return EntityType.byString(jt2.getString("id")).orElse(this.defaultType);
+    public EntityType<?> getType(@Nullable final CompoundTag le) {
+        if (le != null && le.contains("EntityTag", 10)) {
+            final CompoundTag le2 = le.getCompound("EntityTag");
+            if (le2.contains("id", 8)) {
+                return EntityType.byString(le2.getString("id")).orElse(this.defaultType);
             }
         }
         return this.defaultType;
     }
     
+    public Optional<Mob> spawnOffspringFromSpawnEgg(final Player bec, final Mob aoz, final EntityType<? extends Mob> aoq, final Level bqb, final Vec3 dem, final ItemStack bki) {
+        if (!this.spawnsEntity(bki.getTag(), aoq)) {
+            return Optional.<Mob>empty();
+        }
+        Mob aoz2;
+        if (aoz instanceof AgableMob) {
+            aoz2 = ((AgableMob)aoz).getBreedOffspring((AgableMob)aoz);
+        }
+        else {
+            aoz2 = (Mob)aoq.create(bqb);
+        }
+        if (aoz2 == null) {
+            return Optional.<Mob>empty();
+        }
+        aoz2.setBaby(true);
+        if (!aoz2.isBaby()) {
+            return Optional.<Mob>empty();
+        }
+        aoz2.moveTo(dem.x(), dem.y(), dem.z(), 0.0f, 0.0f);
+        bqb.addFreshEntity(aoz2);
+        if (bki.hasCustomHoverName()) {
+            aoz2.setCustomName(bki.getHoverName());
+        }
+        if (!bec.abilities.instabuild) {
+            bki.shrink(1);
+        }
+        return Optional.<Mob>of(aoz2);
+    }
+    
     static {
         BY_ID = Maps.newIdentityHashMap();
     }
diff --git a/src/net/minecraft/world/item/SpectralArrowItem.java b/src/net/minecraft/world/item/SpectralArrowItem.java
index 804116f..707020b 100644
--- a/src/net/minecraft/world/item/SpectralArrowItem.java
+++ b/src/net/minecraft/world/item/SpectralArrowItem.java
@@ -11,7 +11,7 @@ public class SpectralArrowItem extends ArrowItem {
     }
     
     @Override
-    public AbstractArrow createArrow(final Level bjw, final ItemStack ben, final LivingEntity akz) {
-        return new SpectralArrow(bjw, akz);
+    public AbstractArrow createArrow(final Level bqb, final ItemStack bki, final LivingEntity aoy) {
+        return new SpectralArrow(bqb, aoy);
     }
 }
diff --git a/src/net/minecraft/world/item/SplashPotionItem.java b/src/net/minecraft/world/item/SplashPotionItem.java
index 555e80e..3f2b62a 100644
--- a/src/net/minecraft/world/item/SplashPotionItem.java
+++ b/src/net/minecraft/world/item/SplashPotionItem.java
@@ -13,8 +13,8 @@ public class SplashPotionItem extends ThrowablePotionItem {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        bjw.playSound(null, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.SPLASH_POTION_THROW, SoundSource.PLAYERS, 0.5f, 0.4f / (SplashPotionItem.random.nextFloat() * 0.4f + 0.8f));
-        return super.use(bjw, ayj, ajk);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        bqb.playSound(null, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.SPLASH_POTION_THROW, SoundSource.PLAYERS, 0.5f, 0.4f / (SplashPotionItem.random.nextFloat() * 0.4f + 0.8f));
+        return super.use(bqb, bec, anf);
     }
 }
diff --git a/src/net/minecraft/world/item/StandingAndWallBlockItem.java b/src/net/minecraft/world/item/StandingAndWallBlockItem.java
index c1ce0eb..e2c19d4 100644
--- a/src/net/minecraft/world/item/StandingAndWallBlockItem.java
+++ b/src/net/minecraft/world/item/StandingAndWallBlockItem.java
@@ -12,33 +12,33 @@ import net.minecraft.world.level.block.Block;
 public class StandingAndWallBlockItem extends BlockItem {
     protected final Block wallBlock;
     
-    public StandingAndWallBlockItem(final Block bph1, final Block bph2, final Properties a) {
-        super(bph1, a);
-        this.wallBlock = bph2;
+    public StandingAndWallBlockItem(final Block bvr1, final Block bvr2, final Properties a) {
+        super(bvr1, a);
+        this.wallBlock = bvr2;
     }
     
     @Nullable
     @Override
-    protected BlockState getPlacementState(final BlockPlaceContext bcq) {
-        final BlockState byj3 = this.wallBlock.getStateForPlacement(bcq);
-        BlockState byj4 = null;
-        final LevelReader bjz5 = bcq.getLevel();
-        final BlockPos fk6 = bcq.getClickedPos();
-        for (final Direction fp10 : bcq.getNearestLookingDirections()) {
-            if (fp10 != Direction.UP) {
-                final BlockState byj5 = (fp10 == Direction.DOWN) ? this.getBlock().getStateForPlacement(bcq) : byj3;
-                if (byj5 != null && byj5.canSurvive(bjz5, fk6)) {
-                    byj4 = byj5;
+    protected BlockState getPlacementState(final BlockPlaceContext bin) {
+        final BlockState cfj3 = this.wallBlock.getStateForPlacement(bin);
+        BlockState cfj4 = null;
+        final LevelReader bqd5 = bin.getLevel();
+        final BlockPos fu6 = bin.getClickedPos();
+        for (final Direction fz10 : bin.getNearestLookingDirections()) {
+            if (fz10 != Direction.UP) {
+                final BlockState cfj5 = (fz10 == Direction.DOWN) ? this.getBlock().getStateForPlacement(bin) : cfj3;
+                if (cfj5 != null && cfj5.canSurvive(bqd5, fu6)) {
+                    cfj4 = cfj5;
                     break;
                 }
             }
         }
-        return (byj4 != null && bjz5.isUnobstructed(byj4, fk6, CollisionContext.empty())) ? byj4 : null;
+        return (cfj4 != null && bqd5.isUnobstructed(cfj4, fu6, CollisionContext.empty())) ? cfj4 : null;
     }
     
     @Override
-    public void registerBlocks(final Map<Block, Item> map, final Item bei) {
-        super.registerBlocks(map, bei);
-        map.put(this.wallBlock, bei);
+    public void registerBlocks(final Map<Block, Item> map, final Item bke) {
+        super.registerBlocks(map, bke);
+        map.put(this.wallBlock, bke);
     }
 }
diff --git a/src/net/minecraft/world/item/SuspiciousStewItem.java b/src/net/minecraft/world/item/SuspiciousStewItem.java
index 1692036..01a6b75 100644
--- a/src/net/minecraft/world/item/SuspiciousStewItem.java
+++ b/src/net/minecraft/world/item/SuspiciousStewItem.java
@@ -16,36 +16,36 @@ public class SuspiciousStewItem extends Item {
         super(a);
     }
     
-    public static void saveMobEffect(final ItemStack ben, final MobEffect aki, final int integer) {
-        final CompoundTag jt4 = ben.getOrCreateTag();
-        final ListTag jz5 = jt4.getList("Effects", 9);
-        final CompoundTag jt5 = new CompoundTag();
-        jt5.putByte("EffectId", (byte)MobEffect.getId(aki));
-        jt5.putInt("EffectDuration", integer);
-        ((AbstractList<CompoundTag>)jz5).add(jt5);
-        jt4.put("Effects", jz5);
+    public static void saveMobEffect(final ItemStack bki, final MobEffect aoe, final int integer) {
+        final CompoundTag le4 = bki.getOrCreateTag();
+        final ListTag lk5 = le4.getList("Effects", 9);
+        final CompoundTag le5 = new CompoundTag();
+        le5.putByte("EffectId", (byte)MobEffect.getId(aoe));
+        le5.putInt("EffectDuration", integer);
+        ((AbstractList<CompoundTag>)lk5).add(le5);
+        le4.put("Effects", lk5);
     }
     
     @Override
-    public ItemStack finishUsingItem(final ItemStack ben, final Level bjw, final LivingEntity akz) {
-        final ItemStack ben2 = super.finishUsingItem(ben, bjw, akz);
-        final CompoundTag jt6 = ben.getTag();
-        if (jt6 != null && jt6.contains("Effects", 9)) {
-            final ListTag jz7 = jt6.getList("Effects", 10);
-            for (int integer8 = 0; integer8 < jz7.size(); ++integer8) {
+    public ItemStack finishUsingItem(final ItemStack bki, final Level bqb, final LivingEntity aoy) {
+        final ItemStack bki2 = super.finishUsingItem(bki, bqb, aoy);
+        final CompoundTag le6 = bki.getTag();
+        if (le6 != null && le6.contains("Effects", 9)) {
+            final ListTag lk7 = le6.getList("Effects", 10);
+            for (int integer8 = 0; integer8 < lk7.size(); ++integer8) {
                 int integer9 = 160;
-                final CompoundTag jt7 = jz7.getCompound(integer8);
-                if (jt7.contains("EffectDuration", 3)) {
-                    integer9 = jt7.getInt("EffectDuration");
+                final CompoundTag le7 = lk7.getCompound(integer8);
+                if (le7.contains("EffectDuration", 3)) {
+                    integer9 = le7.getInt("EffectDuration");
                 }
-                final MobEffect aki11 = MobEffect.byId(jt7.getByte("EffectId"));
-                if (aki11 != null) {
-                    akz.addEffect(new MobEffectInstance(aki11, integer9));
+                final MobEffect aoe11 = MobEffect.byId(le7.getByte("EffectId"));
+                if (aoe11 != null) {
+                    aoy.addEffect(new MobEffectInstance(aoe11, integer9));
                 }
             }
         }
-        if (akz instanceof Player && ((Player)akz).abilities.instabuild) {
-            return ben2;
+        if (aoy instanceof Player && ((Player)aoy).abilities.instabuild) {
+            return bki2;
         }
         return new ItemStack(Items.BOWL);
     }
diff --git a/src/net/minecraft/world/item/SwordItem.java b/src/net/minecraft/world/item/SwordItem.java
index 6f6896d..d7525c1 100644
--- a/src/net/minecraft/world/item/SwordItem.java
+++ b/src/net/minecraft/world/item/SwordItem.java
@@ -1,12 +1,10 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
-import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import com.google.common.collect.Multimap;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.block.Blocks;
@@ -14,15 +12,23 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import com.google.common.collect.ImmutableMultimap;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.entity.ai.attributes.Attribute;
+import com.google.common.collect.Multimap;
 
-public class SwordItem extends TieredItem {
+public class SwordItem extends TieredItem implements Vanishable {
     private final float attackDamage;
-    private final float attackSpeed;
+    private final Multimap<Attribute, AttributeModifier> defaultModifiers;
     
-    public SwordItem(final Tier bfs, final int integer, final float float3, final Properties a) {
-        super(bfs, a);
-        this.attackSpeed = float3;
-        this.attackDamage = integer + bfs.getAttackDamageBonus();
+    public SwordItem(final Tier blo, final int integer, final float float3, final Properties a) {
+        super(blo, a);
+        this.attackDamage = integer + blo.getAttackDamageBonus();
+        final ImmutableMultimap.Builder<Attribute, AttributeModifier> builder6 = ImmutableMultimap.<Attribute, AttributeModifier>builder();
+        builder6.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(SwordItem.BASE_ATTACK_DAMAGE_UUID, "Weapon modifier", this.attackDamage, AttributeModifier.Operation.ADDITION));
+        builder6.put(Attributes.ATTACK_SPEED, new AttributeModifier(SwordItem.BASE_ATTACK_SPEED_UUID, "Weapon modifier", float3, AttributeModifier.Operation.ADDITION));
+        this.defaultModifiers = builder6.build();
     }
     
     public float getDamage() {
@@ -30,49 +36,46 @@ public class SwordItem extends TieredItem {
     }
     
     @Override
-    public boolean canAttackBlock(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj) {
-        return !ayj.isCreative();
+    public boolean canAttackBlock(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec) {
+        return !bec.isCreative();
     }
     
     @Override
-    public float getDestroySpeed(final ItemStack ben, final BlockState byj) {
-        final Block bph4 = byj.getBlock();
-        if (bph4 == Blocks.COBWEB) {
+    public float getDestroySpeed(final ItemStack bki, final BlockState cfj) {
+        if (cfj.is(Blocks.COBWEB)) {
             return 15.0f;
         }
-        final Material coo5 = byj.getMaterial();
-        if (coo5 == Material.PLANT || coo5 == Material.REPLACEABLE_PLANT || coo5 == Material.CORAL || byj.is(BlockTags.LEAVES) || coo5 == Material.VEGETABLE) {
+        final Material cxd4 = cfj.getMaterial();
+        if (cxd4 == Material.PLANT || cxd4 == Material.REPLACEABLE_PLANT || cxd4 == Material.CORAL || cfj.is(BlockTags.LEAVES) || cxd4 == Material.VEGETABLE) {
             return 1.5f;
         }
         return 1.0f;
     }
     
     @Override
-    public boolean hurtEnemy(final ItemStack ben, final LivingEntity akz2, final LivingEntity akz3) {
-        ben.<LivingEntity>hurtAndBreak(1, akz3, akz -> akz.broadcastBreakEvent(EquipmentSlot.MAINHAND));
+    public boolean hurtEnemy(final ItemStack bki, final LivingEntity aoy2, final LivingEntity aoy3) {
+        bki.<LivingEntity>hurtAndBreak(1, aoy3, aoy -> aoy.broadcastBreakEvent(EquipmentSlot.MAINHAND));
         return true;
     }
     
     @Override
-    public boolean mineBlock(final ItemStack ben, final Level bjw, final BlockState byj, final BlockPos fk, final LivingEntity akz) {
-        if (byj.getDestroySpeed(bjw, fk) != 0.0f) {
-            ben.<LivingEntity>hurtAndBreak(2, akz, akz -> akz.broadcastBreakEvent(EquipmentSlot.MAINHAND));
+    public boolean mineBlock(final ItemStack bki, final Level bqb, final BlockState cfj, final BlockPos fu, final LivingEntity aoy) {
+        if (cfj.getDestroySpeed(bqb, fu) != 0.0f) {
+            bki.<LivingEntity>hurtAndBreak(2, aoy, aoy -> aoy.broadcastBreakEvent(EquipmentSlot.MAINHAND));
         }
         return true;
     }
     
     @Override
-    public boolean canDestroySpecial(final BlockState byj) {
-        return byj.getBlock() == Blocks.COBWEB;
+    public boolean isCorrectToolForDrops(final BlockState cfj) {
+        return cfj.is(Blocks.COBWEB);
     }
     
     @Override
-    public Multimap<String, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot akv) {
-        final Multimap<String, AttributeModifier> multimap3 = super.getDefaultAttributeModifiers(akv);
-        if (akv == EquipmentSlot.MAINHAND) {
-            multimap3.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(SwordItem.BASE_ATTACK_DAMAGE_UUID, "Weapon modifier", this.attackDamage, AttributeModifier.Operation.ADDITION));
-            multimap3.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(SwordItem.BASE_ATTACK_SPEED_UUID, "Weapon modifier", this.attackSpeed, AttributeModifier.Operation.ADDITION));
+    public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot aor) {
+        if (aor == EquipmentSlot.MAINHAND) {
+            return this.defaultModifiers;
         }
-        return multimap3;
+        return super.getDefaultAttributeModifiers(aor);
     }
 }
diff --git a/src/net/minecraft/world/item/ThrowablePotionItem.java b/src/net/minecraft/world/item/ThrowablePotionItem.java
index 51097f9..1a942eb 100644
--- a/src/net/minecraft/world/item/ThrowablePotionItem.java
+++ b/src/net/minecraft/world/item/ThrowablePotionItem.java
@@ -16,18 +16,18 @@ public class ThrowablePotionItem extends PotionItem {
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        if (!bjw.isClientSide) {
-            final ThrownPotion azj6 = new ThrownPotion(bjw, ayj);
-            azj6.setItem(ben5);
-            azj6.shootFromRotation(ayj, ayj.xRot, ayj.yRot, -20.0f, 0.5f, 1.0f);
-            bjw.addFreshEntity(azj6);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        if (!bqb.isClientSide) {
+            final ThrownPotion bfd6 = new ThrownPotion(bqb, bec);
+            bfd6.setItem(bki5);
+            bfd6.shootFromRotation(bec, bec.xRot, bec.yRot, -20.0f, 0.5f, 1.0f);
+            bqb.addFreshEntity(bfd6);
         }
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        if (!ayj.abilities.instabuild) {
-            ben5.shrink(1);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        if (!bec.abilities.instabuild) {
+            bki5.shrink(1);
         }
-        return InteractionResultHolder.<ItemStack>success(ben5);
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
     }
 }
diff --git a/src/net/minecraft/world/item/TieredItem.java b/src/net/minecraft/world/item/TieredItem.java
index ccba608..8b3e644 100644
--- a/src/net/minecraft/world/item/TieredItem.java
+++ b/src/net/minecraft/world/item/TieredItem.java
@@ -3,9 +3,9 @@ package net.minecraft.world.item;
 public class TieredItem extends Item {
     private final Tier tier;
     
-    public TieredItem(final Tier bfs, final Properties a) {
-        super(a.defaultDurability(bfs.getUses()));
-        this.tier = bfs;
+    public TieredItem(final Tier blo, final Properties a) {
+        super(a.defaultDurability(blo.getUses()));
+        this.tier = blo;
     }
     
     public Tier getTier() {
@@ -18,7 +18,7 @@ public class TieredItem extends Item {
     }
     
     @Override
-    public boolean isValidRepairItem(final ItemStack ben1, final ItemStack ben2) {
-        return this.tier.getRepairIngredient().test(ben2) || super.isValidRepairItem(ben1, ben2);
+    public boolean isValidRepairItem(final ItemStack bki1, final ItemStack bki2) {
+        return this.tier.getRepairIngredient().test(bki2) || super.isValidRepairItem(bki1, bki2);
     }
 }
diff --git a/src/net/minecraft/world/item/Tiers.java b/src/net/minecraft/world/item/Tiers.java
index 1d460ab..7f110b0 100644
--- a/src/net/minecraft/world/item/Tiers.java
+++ b/src/net/minecraft/world/item/Tiers.java
@@ -1,7 +1,7 @@
 package net.minecraft.world.item;
 
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.ItemTags;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.ItemLike;
 import java.util.function.Supplier;
 import net.minecraft.world.item.crafting.Ingredient;
@@ -9,10 +9,11 @@ import net.minecraft.util.LazyLoadedValue;
 
 public enum Tiers implements Tier {
     WOOD(0, 59, 2.0f, 0.0f, 15, () -> Ingredient.of(ItemTags.PLANKS)), 
-    STONE(1, 131, 4.0f, 1.0f, 5, () -> Ingredient.of(Blocks.COBBLESTONE)), 
+    STONE(1, 131, 4.0f, 1.0f, 5, () -> Ingredient.of(ItemTags.STONE_TOOL_MATERIALS)), 
     IRON(2, 250, 6.0f, 2.0f, 14, () -> Ingredient.of(Items.IRON_INGOT)), 
     DIAMOND(3, 1561, 8.0f, 3.0f, 10, () -> Ingredient.of(Items.DIAMOND)), 
-    GOLD(0, 32, 12.0f, 0.0f, 22, () -> Ingredient.of(Items.GOLD_INGOT));
+    GOLD(0, 32, 12.0f, 0.0f, 22, () -> Ingredient.of(Items.GOLD_INGOT)), 
+    NETHERITE(4, 2031, 9.0f, 4.0f, 15, () -> Ingredient.of(Items.NETHERITE_INGOT));
     
     private final int level;
     private final int uses;
diff --git a/src/net/minecraft/world/item/TippedArrowItem.java b/src/net/minecraft/world/item/TippedArrowItem.java
index a875fad..8c563ac 100644
--- a/src/net/minecraft/world/item/TippedArrowItem.java
+++ b/src/net/minecraft/world/item/TippedArrowItem.java
@@ -23,23 +23,23 @@ public class TippedArrowItem extends ArrowItem {
     }
     
     @Override
-    public void fillItemCategory(final CreativeModeTab bdd, final NonNullList<ItemStack> fy) {
-        if (this.allowdedIn(bdd)) {
-            for (final Potion bgd5 : Registry.POTION) {
-                if (!bgd5.getEffects().isEmpty()) {
-                    fy.add(PotionUtils.setPotion(new ItemStack(this), bgd5));
+    public void fillItemCategory(final CreativeModeTab biy, final NonNullList<ItemStack> gi) {
+        if (this.allowdedIn(biy)) {
+            for (final Potion bmb5 : Registry.POTION) {
+                if (!bmb5.getEffects().isEmpty()) {
+                    gi.add(PotionUtils.setPotion(new ItemStack(this), bmb5));
                 }
             }
         }
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        PotionUtils.addPotionTooltip(ben, list, 0.125f);
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        PotionUtils.addPotionTooltip(bki, list, 0.125f);
     }
     
     @Override
-    public String getDescriptionId(final ItemStack ben) {
-        return PotionUtils.getPotion(ben).getName(this.getDescriptionId() + ".effect.");
+    public String getDescriptionId(final ItemStack bki) {
+        return PotionUtils.getPotion(bki).getName(this.getDescriptionId() + ".effect.");
     }
 }
diff --git a/src/net/minecraft/world/item/TridentItem.java b/src/net/minecraft/world/item/TridentItem.java
index 4577c68..bd45aa6 100644
--- a/src/net/minecraft/world/item/TridentItem.java
+++ b/src/net/minecraft/world/item/TridentItem.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.entity.monster.SharedMonsterAttributes;
-import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import com.google.common.collect.Multimap;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.InteractionResultHolder;
@@ -24,62 +21,71 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import com.google.common.collect.ImmutableMultimap;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.entity.ai.attributes.Attribute;
+import com.google.common.collect.Multimap;
 
-public class TridentItem extends Item {
+public class TridentItem extends Item implements Vanishable {
+    private final Multimap<Attribute, AttributeModifier> defaultModifiers;
+    
     public TridentItem(final Properties a) {
         super(a);
-        this.addProperty(new ResourceLocation("throwing"), (ben, bjw, akz) -> (akz != null && akz.isUsingItem() && akz.getUseItem() == ben) ? 1.0f : 0.0f);
+        final ImmutableMultimap.Builder<Attribute, AttributeModifier> builder3 = ImmutableMultimap.<Attribute, AttributeModifier>builder();
+        builder3.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(TridentItem.BASE_ATTACK_DAMAGE_UUID, "Tool modifier", 8.0, AttributeModifier.Operation.ADDITION));
+        builder3.put(Attributes.ATTACK_SPEED, new AttributeModifier(TridentItem.BASE_ATTACK_SPEED_UUID, "Tool modifier", -2.9000000953674316, AttributeModifier.Operation.ADDITION));
+        this.defaultModifiers = builder3.build();
     }
     
     @Override
-    public boolean canAttackBlock(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj) {
-        return !ayj.isCreative();
+    public boolean canAttackBlock(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec) {
+        return !bec.isCreative();
     }
     
     @Override
-    public UseAnim getUseAnimation(final ItemStack ben) {
+    public UseAnim getUseAnimation(final ItemStack bki) {
         return UseAnim.SPEAR;
     }
     
     @Override
-    public int getUseDuration(final ItemStack ben) {
+    public int getUseDuration(final ItemStack bki) {
         return 72000;
     }
     
     @Override
-    public void releaseUsing(final ItemStack ben, final Level bjw, final LivingEntity akz, final int integer) {
-        if (!(akz instanceof Player)) {
+    public void releaseUsing(final ItemStack bki, final Level bqb, final LivingEntity aoy, final int integer) {
+        if (!(aoy instanceof Player)) {
             return;
         }
-        final Player ayj2 = (Player)akz;
-        final int integer2 = this.getUseDuration(ben) - integer;
+        final Player bec2 = (Player)aoy;
+        final int integer2 = this.getUseDuration(bki) - integer;
         if (integer2 < 10) {
             return;
         }
-        final int integer3 = EnchantmentHelper.getRiptide(ben);
-        if (integer3 > 0 && !ayj2.isInWaterOrRain()) {
+        final int integer3 = EnchantmentHelper.getRiptide(bki);
+        if (integer3 > 0 && !bec2.isInWaterOrRain()) {
             return;
         }
-        if (!bjw.isClientSide) {
-            ben.<Player>hurtAndBreak(1, ayj2, ayj -> ayj.broadcastBreakEvent(akz.getUsedItemHand()));
+        if (!bqb.isClientSide) {
+            bki.<Player>hurtAndBreak(1, bec2, bec -> bec.broadcastBreakEvent(aoy.getUsedItemHand()));
             if (integer3 == 0) {
-                final ThrownTrident azk9 = new ThrownTrident(bjw, ayj2, ben);
-                azk9.shootFromRotation(ayj2, ayj2.xRot, ayj2.yRot, 0.0f, 2.5f + integer3 * 0.5f, 1.0f);
-                if (ayj2.abilities.instabuild) {
-                    azk9.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
+                final ThrownTrident bfe9 = new ThrownTrident(bqb, bec2, bki);
+                bfe9.shootFromRotation(bec2, bec2.xRot, bec2.yRot, 0.0f, 2.5f + integer3 * 0.5f, 1.0f);
+                if (bec2.abilities.instabuild) {
+                    bfe9.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
                 }
-                bjw.addFreshEntity(azk9);
-                bjw.playSound(null, azk9, SoundEvents.TRIDENT_THROW, SoundSource.PLAYERS, 1.0f, 1.0f);
-                if (!ayj2.abilities.instabuild) {
-                    ayj2.inventory.removeItem(ben);
+                bqb.addFreshEntity(bfe9);
+                bqb.playSound(null, bfe9, SoundEvents.TRIDENT_THROW, SoundSource.PLAYERS, 1.0f, 1.0f);
+                if (!bec2.abilities.instabuild) {
+                    bec2.inventory.removeItem(bki);
                 }
             }
         }
-        ayj2.awardStat(Stats.ITEM_USED.get(this));
+        bec2.awardStat(Stats.ITEM_USED.get(this));
         if (integer3 > 0) {
-            final float float9 = ayj2.yRot;
-            final float float10 = ayj2.xRot;
+            final float float9 = bec2.yRot;
+            final float float10 = bec2.xRot;
             float float11 = -Mth.sin(float9 * 0.017453292f) * Mth.cos(float10 * 0.017453292f);
             float float12 = -Mth.sin(float10 * 0.017453292f);
             float float13 = Mth.cos(float9 * 0.017453292f) * Mth.cos(float10 * 0.017453292f);
@@ -88,61 +94,59 @@ public class TridentItem extends Item {
             float11 *= float15 / float14;
             float12 *= float15 / float14;
             float13 *= float15 / float14;
-            ayj2.push(float11, float12, float13);
-            ayj2.startAutoSpinAttack(20);
-            if (ayj2.onGround) {
+            bec2.push(float11, float12, float13);
+            bec2.startAutoSpinAttack(20);
+            if (bec2.isOnGround()) {
                 final float float16 = 1.1999999f;
-                ayj2.move(MoverType.SELF, new Vec3(0.0, 1.1999999284744263, 0.0));
+                bec2.move(MoverType.SELF, new Vec3(0.0, 1.1999999284744263, 0.0));
             }
-            SoundEvent aah16;
+            SoundEvent ack16;
             if (integer3 >= 3) {
-                aah16 = SoundEvents.TRIDENT_RIPTIDE_3;
+                ack16 = SoundEvents.TRIDENT_RIPTIDE_3;
             }
             else if (integer3 == 2) {
-                aah16 = SoundEvents.TRIDENT_RIPTIDE_2;
+                ack16 = SoundEvents.TRIDENT_RIPTIDE_2;
             }
             else {
-                aah16 = SoundEvents.TRIDENT_RIPTIDE_1;
+                ack16 = SoundEvents.TRIDENT_RIPTIDE_1;
             }
-            bjw.playSound(null, ayj2, aah16, SoundSource.PLAYERS, 1.0f, 1.0f);
+            bqb.playSound(null, bec2, ack16, SoundSource.PLAYERS, 1.0f, 1.0f);
         }
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        if (ben5.getDamageValue() >= ben5.getMaxDamage() - 1) {
-            return InteractionResultHolder.<ItemStack>fail(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        if (bki5.getDamageValue() >= bki5.getMaxDamage() - 1) {
+            return InteractionResultHolder.<ItemStack>fail(bki5);
         }
-        if (EnchantmentHelper.getRiptide(ben5) > 0 && !ayj.isInWaterOrRain()) {
-            return InteractionResultHolder.<ItemStack>fail(ben5);
+        if (EnchantmentHelper.getRiptide(bki5) > 0 && !bec.isInWaterOrRain()) {
+            return InteractionResultHolder.<ItemStack>fail(bki5);
         }
-        ayj.startUsingItem(ajk);
-        return InteractionResultHolder.<ItemStack>consume(ben5);
+        bec.startUsingItem(anf);
+        return InteractionResultHolder.<ItemStack>consume(bki5);
     }
     
     @Override
-    public boolean hurtEnemy(final ItemStack ben, final LivingEntity akz2, final LivingEntity akz3) {
-        ben.<LivingEntity>hurtAndBreak(1, akz3, akz -> akz.broadcastBreakEvent(EquipmentSlot.MAINHAND));
+    public boolean hurtEnemy(final ItemStack bki, final LivingEntity aoy2, final LivingEntity aoy3) {
+        bki.<LivingEntity>hurtAndBreak(1, aoy3, aoy -> aoy.broadcastBreakEvent(EquipmentSlot.MAINHAND));
         return true;
     }
     
     @Override
-    public boolean mineBlock(final ItemStack ben, final Level bjw, final BlockState byj, final BlockPos fk, final LivingEntity akz) {
-        if (byj.getDestroySpeed(bjw, fk) != 0.0) {
-            ben.<LivingEntity>hurtAndBreak(2, akz, akz -> akz.broadcastBreakEvent(EquipmentSlot.MAINHAND));
+    public boolean mineBlock(final ItemStack bki, final Level bqb, final BlockState cfj, final BlockPos fu, final LivingEntity aoy) {
+        if (cfj.getDestroySpeed(bqb, fu) != 0.0) {
+            bki.<LivingEntity>hurtAndBreak(2, aoy, aoy -> aoy.broadcastBreakEvent(EquipmentSlot.MAINHAND));
         }
         return true;
     }
     
     @Override
-    public Multimap<String, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot akv) {
-        final Multimap<String, AttributeModifier> multimap3 = super.getDefaultAttributeModifiers(akv);
-        if (akv == EquipmentSlot.MAINHAND) {
-            multimap3.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(TridentItem.BASE_ATTACK_DAMAGE_UUID, "Tool modifier", 8.0, AttributeModifier.Operation.ADDITION));
-            multimap3.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(TridentItem.BASE_ATTACK_SPEED_UUID, "Tool modifier", -2.9000000953674316, AttributeModifier.Operation.ADDITION));
+    public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(final EquipmentSlot aor) {
+        if (aor == EquipmentSlot.MAINHAND) {
+            return this.defaultModifiers;
         }
-        return multimap3;
+        return super.getDefaultAttributeModifiers(aor);
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/UseOnContext.java b/src/net/minecraft/world/item/UseOnContext.java
index ffff17d..10d0a2f 100644
--- a/src/net/minecraft/world/item/UseOnContext.java
+++ b/src/net/minecraft/world/item/UseOnContext.java
@@ -16,16 +16,16 @@ public class UseOnContext {
     protected final Level level;
     protected final ItemStack itemStack;
     
-    public UseOnContext(final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        this(ayj.level, ayj, ajk, ayj.getItemInHand(ajk), cvg);
+    public UseOnContext(final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        this(bec.level, bec, anf, bec.getItemInHand(anf), deh);
     }
     
-    protected UseOnContext(final Level bjw, @Nullable final Player ayj, final InteractionHand ajk, final ItemStack ben, final BlockHitResult cvg) {
-        this.player = ayj;
-        this.hand = ajk;
-        this.hitResult = cvg;
-        this.itemStack = ben;
-        this.level = bjw;
+    protected UseOnContext(final Level bqb, @Nullable final Player bec, final InteractionHand anf, final ItemStack bki, final BlockHitResult deh) {
+        this.player = bec;
+        this.hand = anf;
+        this.hitResult = deh;
+        this.itemStack = bki;
+        this.level = bqb;
     }
     
     public BlockPos getClickedPos() {
diff --git a/src/net/minecraft/world/item/Vanishable.java b/src/net/minecraft/world/item/Vanishable.java
new file mode 100644
index 0000000..65d39b4
--- /dev/null
+++ b/src/net/minecraft/world/item/Vanishable.java
@@ -0,0 +1,4 @@
+package net.minecraft.world.item;
+
+public interface Vanishable {
+}
diff --git a/src/net/minecraft/world/item/WaterLilyBlockItem.java b/src/net/minecraft/world/item/WaterLilyBlockItem.java
index 1586523..d88eb4b 100644
--- a/src/net/minecraft/world/item/WaterLilyBlockItem.java
+++ b/src/net/minecraft/world/item/WaterLilyBlockItem.java
@@ -1,20 +1,6 @@
 package net.minecraft.world.item;
 
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.stats.Stat;
-import net.minecraft.stats.Stats;
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.InteractionHand;
@@ -24,46 +10,20 @@ import net.minecraft.world.InteractionResult;
 import net.minecraft.world.level.block.Block;
 
 public class WaterLilyBlockItem extends BlockItem {
-    public WaterLilyBlockItem(final Block bph, final Properties a) {
-        super(bph, a);
+    public WaterLilyBlockItem(final Block bvr, final Properties a) {
+        super(bvr, a);
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
+    public InteractionResult useOn(final UseOnContext blv) {
         return InteractionResult.PASS;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        final HitResult cvi6 = Item.getPlayerPOVHitResult(bjw, ayj, ClipContext.Fluid.SOURCE_ONLY);
-        if (cvi6.getType() == HitResult.Type.MISS) {
-            return InteractionResultHolder.<ItemStack>pass(ben5);
-        }
-        if (cvi6.getType() == HitResult.Type.BLOCK) {
-            final BlockHitResult cvg7 = (BlockHitResult)cvi6;
-            final BlockPos fk8 = cvg7.getBlockPos();
-            final Direction fp9 = cvg7.getDirection();
-            if (!bjw.mayInteract(ayj, fk8) || !ayj.mayUseItemAt(fk8.relative(fp9), fp9, ben5)) {
-                return InteractionResultHolder.<ItemStack>fail(ben5);
-            }
-            final BlockPos fk9 = fk8.above();
-            final BlockState byj11 = bjw.getBlockState(fk8);
-            final Material coo12 = byj11.getMaterial();
-            final FluidState coj13 = bjw.getFluidState(fk8);
-            if ((coj13.getType() == Fluids.WATER || coo12 == Material.ICE) && bjw.isEmptyBlock(fk9)) {
-                bjw.setBlock(fk9, Blocks.LILY_PAD.defaultBlockState(), 11);
-                if (ayj instanceof ServerPlayer) {
-                    CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer)ayj, fk9, ben5);
-                }
-                if (!ayj.abilities.instabuild) {
-                    ben5.shrink(1);
-                }
-                ayj.awardStat(Stats.ITEM_USED.get(this));
-                bjw.playSound(ayj, fk8, SoundEvents.LILY_PAD_PLACE, SoundSource.BLOCKS, 1.0f, 1.0f);
-                return InteractionResultHolder.<ItemStack>success(ben5);
-            }
-        }
-        return InteractionResultHolder.<ItemStack>fail(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final BlockHitResult deh5 = Item.getPlayerPOVHitResult(bqb, bec, ClipContext.Fluid.SOURCE_ONLY);
+        final BlockHitResult deh6 = deh5.withPosition(deh5.getBlockPos().above());
+        final InteractionResult ang7 = super.useOn(new UseOnContext(bec, anf, deh6));
+        return new InteractionResultHolder<ItemStack>(ang7, bec.getItemInHand(anf));
     }
 }
diff --git a/src/net/minecraft/world/item/Wearable.java b/src/net/minecraft/world/item/Wearable.java
new file mode 100644
index 0000000..a698299
--- /dev/null
+++ b/src/net/minecraft/world/item/Wearable.java
@@ -0,0 +1,4 @@
+package net.minecraft.world.item;
+
+public interface Wearable extends Vanishable {
+}
diff --git a/src/net/minecraft/world/item/WritableBookItem.java b/src/net/minecraft/world/item/WritableBookItem.java
index f2471e0..2605734 100644
--- a/src/net/minecraft/world/item/WritableBookItem.java
+++ b/src/net/minecraft/world/item/WritableBookItem.java
@@ -21,34 +21,34 @@ public class WritableBookItem extends Item {
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final BlockState byj5 = bjw3.getBlockState(fk4);
-        if (byj5.getBlock() == Blocks.LECTERN) {
-            return LecternBlock.tryPlaceBook(bjw3, fk4, byj5, bfz.getItemInHand()) ? InteractionResult.SUCCESS : InteractionResult.PASS;
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        final BlockState cfj5 = bqb3.getBlockState(fu4);
+        if (cfj5.is(Blocks.LECTERN)) {
+            return LecternBlock.tryPlaceBook(bqb3, fu4, cfj5, blv.getItemInHand()) ? InteractionResult.sidedSuccess(bqb3.isClientSide) : InteractionResult.PASS;
         }
         return InteractionResult.PASS;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        ayj.openItemGui(ben5, ajk);
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        return InteractionResultHolder.<ItemStack>success(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        bec.openItemGui(bki5, anf);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
     }
     
-    public static boolean makeSureTagIsValid(@Nullable final CompoundTag jt) {
-        if (jt == null) {
+    public static boolean makeSureTagIsValid(@Nullable final CompoundTag le) {
+        if (le == null) {
             return false;
         }
-        if (!jt.contains("pages", 9)) {
+        if (!le.contains("pages", 9)) {
             return false;
         }
-        final ListTag jz2 = jt.getList("pages", 8);
-        for (int integer3 = 0; integer3 < jz2.size(); ++integer3) {
-            final String string4 = jz2.getString(integer3);
+        final ListTag lk2 = le.getList("pages", 8);
+        for (int integer3 = 0; integer3 < lk2.size(); ++integer3) {
+            final String string4 = lk2.getString(integer3);
             if (string4.length() > 32767) {
                 return false;
             }
diff --git a/src/net/minecraft/world/item/WrittenBookItem.java b/src/net/minecraft/world/item/WrittenBookItem.java
index 136b25e..01097f1 100644
--- a/src/net/minecraft/world/item/WrittenBookItem.java
+++ b/src/net/minecraft/world/item/WrittenBookItem.java
@@ -31,97 +31,97 @@ public class WrittenBookItem extends Item {
         super(a);
     }
     
-    public static boolean makeSureTagIsValid(@Nullable final CompoundTag jt) {
-        if (!WritableBookItem.makeSureTagIsValid(jt)) {
+    public static boolean makeSureTagIsValid(@Nullable final CompoundTag le) {
+        if (!WritableBookItem.makeSureTagIsValid(le)) {
             return false;
         }
-        if (!jt.contains("title", 8)) {
+        if (!le.contains("title", 8)) {
             return false;
         }
-        final String string2 = jt.getString("title");
-        return string2.length() <= 32 && jt.contains("author", 8);
+        final String string2 = le.getString("title");
+        return string2.length() <= 32 && le.contains("author", 8);
     }
     
-    public static int getGeneration(final ItemStack ben) {
-        return ben.getTag().getInt("generation");
+    public static int getGeneration(final ItemStack bki) {
+        return bki.getTag().getInt("generation");
     }
     
-    public static int getPageCount(final ItemStack ben) {
-        final CompoundTag jt2 = ben.getTag();
-        return (jt2 != null) ? jt2.getList("pages", 8).size() : 0;
+    public static int getPageCount(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTag();
+        return (le2 != null) ? le2.getList("pages", 8).size() : 0;
     }
     
     @Override
-    public Component getName(final ItemStack ben) {
-        if (ben.hasTag()) {
-            final CompoundTag jt3 = ben.getTag();
-            final String string4 = jt3.getString("title");
+    public Component getName(final ItemStack bki) {
+        if (bki.hasTag()) {
+            final CompoundTag le3 = bki.getTag();
+            final String string4 = le3.getString("title");
             if (!StringUtil.isNullOrEmpty(string4)) {
                 return new TextComponent(string4);
             }
         }
-        return super.getName(ben);
+        return super.getName(bki);
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final Level bjw, final List<Component> list, final TooltipFlag bfw) {
-        if (ben.hasTag()) {
-            final CompoundTag jt6 = ben.getTag();
-            final String string7 = jt6.getString("author");
+    public void appendHoverText(final ItemStack bki, @Nullable final Level bqb, final List<Component> list, final TooltipFlag bls) {
+        if (bki.hasTag()) {
+            final CompoundTag le6 = bki.getTag();
+            final String string7 = le6.getString("author");
             if (!StringUtil.isNullOrEmpty(string7)) {
                 list.add(new TranslatableComponent("book.byAuthor", new Object[] { string7 }).withStyle(ChatFormatting.GRAY));
             }
-            list.add(new TranslatableComponent("book.generation." + jt6.getInt("generation"), new Object[0]).withStyle(ChatFormatting.GRAY));
+            list.add(new TranslatableComponent("book.generation." + le6.getInt("generation")).withStyle(ChatFormatting.GRAY));
         }
     }
     
     @Override
-    public InteractionResult useOn(final UseOnContext bfz) {
-        final Level bjw3 = bfz.getLevel();
-        final BlockPos fk4 = bfz.getClickedPos();
-        final BlockState byj5 = bjw3.getBlockState(fk4);
-        if (byj5.getBlock() == Blocks.LECTERN) {
-            return LecternBlock.tryPlaceBook(bjw3, fk4, byj5, bfz.getItemInHand()) ? InteractionResult.SUCCESS : InteractionResult.PASS;
+    public InteractionResult useOn(final UseOnContext blv) {
+        final Level bqb3 = blv.getLevel();
+        final BlockPos fu4 = blv.getClickedPos();
+        final BlockState cfj5 = bqb3.getBlockState(fu4);
+        if (cfj5.is(Blocks.LECTERN)) {
+            return LecternBlock.tryPlaceBook(bqb3, fu4, cfj5, blv.getItemInHand()) ? InteractionResult.sidedSuccess(bqb3.isClientSide) : InteractionResult.PASS;
         }
         return InteractionResult.PASS;
     }
     
     @Override
-    public InteractionResultHolder<ItemStack> use(final Level bjw, final Player ayj, final InteractionHand ajk) {
-        final ItemStack ben5 = ayj.getItemInHand(ajk);
-        ayj.openItemGui(ben5, ajk);
-        ayj.awardStat(Stats.ITEM_USED.get(this));
-        return InteractionResultHolder.<ItemStack>success(ben5);
+    public InteractionResultHolder<ItemStack> use(final Level bqb, final Player bec, final InteractionHand anf) {
+        final ItemStack bki5 = bec.getItemInHand(anf);
+        bec.openItemGui(bki5, anf);
+        bec.awardStat(Stats.ITEM_USED.get(this));
+        return InteractionResultHolder.<ItemStack>sidedSuccess(bki5, bqb.isClientSide());
     }
     
-    public static boolean resolveBookComponents(final ItemStack ben, @Nullable final CommandSourceStack cq, @Nullable final Player ayj) {
-        final CompoundTag jt4 = ben.getTag();
-        if (jt4 == null || jt4.getBoolean("resolved")) {
+    public static boolean resolveBookComponents(final ItemStack bki, @Nullable final CommandSourceStack cz, @Nullable final Player bec) {
+        final CompoundTag le4 = bki.getTag();
+        if (le4 == null || le4.getBoolean("resolved")) {
             return false;
         }
-        jt4.putBoolean("resolved", true);
-        if (!makeSureTagIsValid(jt4)) {
+        le4.putBoolean("resolved", true);
+        if (!makeSureTagIsValid(le4)) {
             return false;
         }
-        final ListTag jz5 = jt4.getList("pages", 8);
-        for (int integer6 = 0; integer6 < jz5.size(); ++integer6) {
-            final String string7 = jz5.getString(integer6);
-            Component lf8;
+        final ListTag lk5 = le4.getList("pages", 8);
+        for (int integer6 = 0; integer6 < lk5.size(); ++integer6) {
+            final String string7 = lk5.getString(integer6);
+            Component mr8;
             try {
-                lf8 = Component.Serializer.fromJsonLenient(string7);
-                lf8 = ComponentUtils.updateForEntity(cq, lf8, ayj, 0);
+                mr8 = Component.Serializer.fromJsonLenient(string7);
+                mr8 = ComponentUtils.updateForEntity(cz, mr8, bec, 0);
             }
             catch (Exception exception9) {
-                lf8 = new TextComponent(string7);
+                mr8 = new TextComponent(string7);
             }
-            jz5.set(integer6, StringTag.valueOf(Component.Serializer.toJson(lf8)));
+            lk5.set(integer6, StringTag.valueOf(Component.Serializer.toJson(mr8)));
         }
-        jt4.put("pages", jz5);
+        le4.put("pages", lk5);
         return true;
     }
     
     @Override
-    public boolean isFoil(final ItemStack ben) {
+    public boolean isFoil(final ItemStack bki) {
         return true;
     }
 }
diff --git a/src/net/minecraft/world/item/alchemy/Potion.java b/src/net/minecraft/world/item/alchemy/Potion.java
index 2155f8a..7b5b412 100644
--- a/src/net/minecraft/world/item/alchemy/Potion.java
+++ b/src/net/minecraft/world/item/alchemy/Potion.java
@@ -35,8 +35,8 @@ public class Potion {
     
     public boolean hasInstantEffects() {
         if (!this.effects.isEmpty()) {
-            for (final MobEffectInstance akk3 : this.effects) {
-                if (akk3.getEffect().isInstantenous()) {
+            for (final MobEffectInstance aog3 : this.effects) {
+                if (aog3.getEffect().isInstantenous()) {
                     return true;
                 }
             }
diff --git a/src/net/minecraft/world/item/alchemy/PotionBrewing.java b/src/net/minecraft/world/item/alchemy/PotionBrewing.java
index 8ec4dc8..0f7c7d9 100644
--- a/src/net/minecraft/world/item/alchemy/PotionBrewing.java
+++ b/src/net/minecraft/world/item/alchemy/PotionBrewing.java
@@ -18,81 +18,81 @@ public class PotionBrewing {
     private static final List<Ingredient> ALLOWED_CONTAINERS;
     private static final Predicate<ItemStack> ALLOWED_CONTAINER;
     
-    public static boolean isIngredient(final ItemStack ben) {
-        return isContainerIngredient(ben) || isPotionIngredient(ben);
+    public static boolean isIngredient(final ItemStack bki) {
+        return isContainerIngredient(bki) || isPotionIngredient(bki);
     }
     
-    protected static boolean isContainerIngredient(final ItemStack ben) {
+    protected static boolean isContainerIngredient(final ItemStack bki) {
         for (int integer2 = 0, integer3 = PotionBrewing.CONTAINER_MIXES.size(); integer2 < integer3; ++integer2) {
-            if (((Mix<Object>)PotionBrewing.CONTAINER_MIXES.get(integer2)).ingredient.test(ben)) {
+            if (((Mix<Object>)PotionBrewing.CONTAINER_MIXES.get(integer2)).ingredient.test(bki)) {
                 return true;
             }
         }
         return false;
     }
     
-    protected static boolean isPotionIngredient(final ItemStack ben) {
+    protected static boolean isPotionIngredient(final ItemStack bki) {
         for (int integer2 = 0, integer3 = PotionBrewing.POTION_MIXES.size(); integer2 < integer3; ++integer2) {
-            if (((Mix<Object>)PotionBrewing.POTION_MIXES.get(integer2)).ingredient.test(ben)) {
+            if (((Mix<Object>)PotionBrewing.POTION_MIXES.get(integer2)).ingredient.test(bki)) {
                 return true;
             }
         }
         return false;
     }
     
-    public static boolean isBrewablePotion(final Potion bgd) {
+    public static boolean isBrewablePotion(final Potion bmb) {
         for (int integer2 = 0, integer3 = PotionBrewing.POTION_MIXES.size(); integer2 < integer3; ++integer2) {
-            if (((Mix<Object>)PotionBrewing.POTION_MIXES.get(integer2)).to == bgd) {
+            if (((Mix<Object>)PotionBrewing.POTION_MIXES.get(integer2)).to == bmb) {
                 return true;
             }
         }
         return false;
     }
     
-    public static boolean hasMix(final ItemStack ben1, final ItemStack ben2) {
-        return PotionBrewing.ALLOWED_CONTAINER.test(ben1) && (hasContainerMix(ben1, ben2) || hasPotionMix(ben1, ben2));
+    public static boolean hasMix(final ItemStack bki1, final ItemStack bki2) {
+        return PotionBrewing.ALLOWED_CONTAINER.test(bki1) && (hasContainerMix(bki1, bki2) || hasPotionMix(bki1, bki2));
     }
     
-    protected static boolean hasContainerMix(final ItemStack ben1, final ItemStack ben2) {
-        final Item bei3 = ben1.getItem();
+    protected static boolean hasContainerMix(final ItemStack bki1, final ItemStack bki2) {
+        final Item bke3 = bki1.getItem();
         for (int integer4 = 0, integer5 = PotionBrewing.CONTAINER_MIXES.size(); integer4 < integer5; ++integer4) {
             final Mix<Item> a6 = PotionBrewing.CONTAINER_MIXES.get(integer4);
-            if (((Mix<Object>)a6).from == bei3 && ((Mix<Object>)a6).ingredient.test(ben2)) {
+            if (((Mix<Object>)a6).from == bke3 && ((Mix<Object>)a6).ingredient.test(bki2)) {
                 return true;
             }
         }
         return false;
     }
     
-    protected static boolean hasPotionMix(final ItemStack ben1, final ItemStack ben2) {
-        final Potion bgd3 = PotionUtils.getPotion(ben1);
+    protected static boolean hasPotionMix(final ItemStack bki1, final ItemStack bki2) {
+        final Potion bmb3 = PotionUtils.getPotion(bki1);
         for (int integer4 = 0, integer5 = PotionBrewing.POTION_MIXES.size(); integer4 < integer5; ++integer4) {
             final Mix<Potion> a6 = PotionBrewing.POTION_MIXES.get(integer4);
-            if (((Mix<Object>)a6).from == bgd3 && ((Mix<Object>)a6).ingredient.test(ben2)) {
+            if (((Mix<Object>)a6).from == bmb3 && ((Mix<Object>)a6).ingredient.test(bki2)) {
                 return true;
             }
         }
         return false;
     }
     
-    public static ItemStack mix(final ItemStack ben1, final ItemStack ben2) {
-        if (!ben2.isEmpty()) {
-            final Potion bgd3 = PotionUtils.getPotion(ben2);
-            final Item bei4 = ben2.getItem();
+    public static ItemStack mix(final ItemStack bki1, final ItemStack bki2) {
+        if (!bki2.isEmpty()) {
+            final Potion bmb3 = PotionUtils.getPotion(bki2);
+            final Item bke4 = bki2.getItem();
             for (int integer5 = 0, integer6 = PotionBrewing.CONTAINER_MIXES.size(); integer5 < integer6; ++integer5) {
                 final Mix<Item> a7 = PotionBrewing.CONTAINER_MIXES.get(integer5);
-                if (((Mix<Object>)a7).from == bei4 && ((Mix<Object>)a7).ingredient.test(ben1)) {
-                    return PotionUtils.setPotion(new ItemStack((ItemLike)((Mix<Object>)a7).to), bgd3);
+                if (((Mix<Object>)a7).from == bke4 && ((Mix<Object>)a7).ingredient.test(bki1)) {
+                    return PotionUtils.setPotion(new ItemStack((ItemLike)((Mix<Object>)a7).to), bmb3);
                 }
             }
             for (int integer5 = 0, integer6 = PotionBrewing.POTION_MIXES.size(); integer5 < integer6; ++integer5) {
                 final Mix<Potion> a8 = PotionBrewing.POTION_MIXES.get(integer5);
-                if (((Mix<Object>)a8).from == bgd3 && ((Mix<Object>)a8).ingredient.test(ben1)) {
-                    return PotionUtils.setPotion(new ItemStack(bei4), (Potion)((Mix<Object>)a8).to);
+                if (((Mix<Object>)a8).from == bmb3 && ((Mix<Object>)a8).ingredient.test(bki1)) {
+                    return PotionUtils.setPotion(new ItemStack(bke4), (Potion)((Mix<Object>)a8).to);
                 }
             }
         }
-        return ben2;
+        return bki2;
     }
     
     public static void bootStrap() {
@@ -158,25 +158,25 @@ public class PotionBrewing {
         addMix(Potions.SLOW_FALLING, Items.REDSTONE, Potions.LONG_SLOW_FALLING);
     }
     
-    private static void addContainerRecipe(final Item bei1, final Item bei2, final Item bei3) {
-        if (!(bei1 instanceof PotionItem)) {
-            throw new IllegalArgumentException("Expected a potion, got: " + Registry.ITEM.getKey(bei1));
+    private static void addContainerRecipe(final Item bke1, final Item bke2, final Item bke3) {
+        if (!(bke1 instanceof PotionItem)) {
+            throw new IllegalArgumentException("Expected a potion, got: " + Registry.ITEM.getKey(bke1));
         }
-        if (!(bei3 instanceof PotionItem)) {
-            throw new IllegalArgumentException("Expected a potion, got: " + Registry.ITEM.getKey(bei3));
+        if (!(bke3 instanceof PotionItem)) {
+            throw new IllegalArgumentException("Expected a potion, got: " + Registry.ITEM.getKey(bke3));
         }
-        PotionBrewing.CONTAINER_MIXES.add(new Mix<Item>(bei1, Ingredient.of(bei2), bei3));
+        PotionBrewing.CONTAINER_MIXES.add(new Mix<Item>(bke1, Ingredient.of(bke2), bke3));
     }
     
-    private static void addContainer(final Item bei) {
-        if (!(bei instanceof PotionItem)) {
-            throw new IllegalArgumentException("Expected a potion, got: " + Registry.ITEM.getKey(bei));
+    private static void addContainer(final Item bke) {
+        if (!(bke instanceof PotionItem)) {
+            throw new IllegalArgumentException("Expected a potion, got: " + Registry.ITEM.getKey(bke));
         }
-        PotionBrewing.ALLOWED_CONTAINERS.add(Ingredient.of(bei));
+        PotionBrewing.ALLOWED_CONTAINERS.add(Ingredient.of(bke));
     }
     
-    private static void addMix(final Potion bgd1, final Item bei, final Potion bgd3) {
-        PotionBrewing.POTION_MIXES.add(new Mix<Potion>(bgd1, Ingredient.of(bei), bgd3));
+    private static void addMix(final Potion bmb1, final Item bke, final Potion bmb3) {
+        PotionBrewing.POTION_MIXES.add(new Mix<Potion>(bmb1, Ingredient.of(bke), bmb3));
     }
     
     static {
@@ -184,12 +184,12 @@ public class PotionBrewing {
         CONTAINER_MIXES = Lists.newArrayList();
         ALLOWED_CONTAINERS = Lists.newArrayList();
         final Iterator<Ingredient> iterator;
-        Ingredient bgt3;
-        ALLOWED_CONTAINER = (ben -> {
+        Ingredient bmr3;
+        ALLOWED_CONTAINER = (bki -> {
             PotionBrewing.ALLOWED_CONTAINERS.iterator();
             while (iterator.hasNext()) {
-                bgt3 = iterator.next();
-                if (bgt3.test(ben)) {
+                bmr3 = iterator.next();
+                if (bmr3.test(bki)) {
                     return true;
                 }
             }
@@ -202,9 +202,9 @@ public class PotionBrewing {
         private final Ingredient ingredient;
         private final T to;
         
-        public Mix(final T object1, final Ingredient bgt, final T object3) {
+        public Mix(final T object1, final Ingredient bmr, final T object3) {
             this.from = object1;
-            this.ingredient = bgt;
+            this.ingredient = bmr;
             this.to = object3;
         }
     }
diff --git a/src/net/minecraft/world/item/alchemy/PotionUtils.java b/src/net/minecraft/world/item/alchemy/PotionUtils.java
index 175110b..4021deb 100644
--- a/src/net/minecraft/world/item/alchemy/PotionUtils.java
+++ b/src/net/minecraft/world/item/alchemy/PotionUtils.java
@@ -2,9 +2,10 @@ package net.minecraft.world.item.alchemy;
 
 import java.util.AbstractList;
 import net.minecraft.world.effect.MobEffect;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.world.effect.MobEffectUtil;
-import net.minecraft.util.Tuple;
+import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import java.util.Map;
@@ -25,57 +26,57 @@ import java.util.List;
 import net.minecraft.world.item.ItemStack;
 
 public class PotionUtils {
-    public static List<MobEffectInstance> getMobEffects(final ItemStack ben) {
-        return getAllEffects(ben.getTag());
+    public static List<MobEffectInstance> getMobEffects(final ItemStack bki) {
+        return getAllEffects(bki.getTag());
     }
     
-    public static List<MobEffectInstance> getAllEffects(final Potion bgd, final Collection<MobEffectInstance> collection) {
+    public static List<MobEffectInstance> getAllEffects(final Potion bmb, final Collection<MobEffectInstance> collection) {
         final List<MobEffectInstance> list3 = Lists.newArrayList();
-        list3.addAll(bgd.getEffects());
+        list3.addAll(bmb.getEffects());
         list3.addAll(collection);
         return list3;
     }
     
-    public static List<MobEffectInstance> getAllEffects(@Nullable final CompoundTag jt) {
+    public static List<MobEffectInstance> getAllEffects(@Nullable final CompoundTag le) {
         final List<MobEffectInstance> list2 = Lists.newArrayList();
-        list2.addAll(getPotion(jt).getEffects());
-        getCustomEffects(jt, list2);
+        list2.addAll(getPotion(le).getEffects());
+        getCustomEffects(le, list2);
         return list2;
     }
     
-    public static List<MobEffectInstance> getCustomEffects(final ItemStack ben) {
-        return getCustomEffects(ben.getTag());
+    public static List<MobEffectInstance> getCustomEffects(final ItemStack bki) {
+        return getCustomEffects(bki.getTag());
     }
     
-    public static List<MobEffectInstance> getCustomEffects(@Nullable final CompoundTag jt) {
+    public static List<MobEffectInstance> getCustomEffects(@Nullable final CompoundTag le) {
         final List<MobEffectInstance> list2 = Lists.newArrayList();
-        getCustomEffects(jt, list2);
+        getCustomEffects(le, list2);
         return list2;
     }
     
-    public static void getCustomEffects(@Nullable final CompoundTag jt, final List<MobEffectInstance> list) {
-        if (jt != null && jt.contains("CustomPotionEffects", 9)) {
-            final ListTag jz3 = jt.getList("CustomPotionEffects", 10);
-            for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-                final CompoundTag jt2 = jz3.getCompound(integer4);
-                final MobEffectInstance akk6 = MobEffectInstance.load(jt2);
-                if (akk6 != null) {
-                    list.add(akk6);
+    public static void getCustomEffects(@Nullable final CompoundTag le, final List<MobEffectInstance> list) {
+        if (le != null && le.contains("CustomPotionEffects", 9)) {
+            final ListTag lk3 = le.getList("CustomPotionEffects", 10);
+            for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+                final CompoundTag le2 = lk3.getCompound(integer4);
+                final MobEffectInstance aog6 = MobEffectInstance.load(le2);
+                if (aog6 != null) {
+                    list.add(aog6);
                 }
             }
         }
     }
     
-    public static int getColor(final ItemStack ben) {
-        final CompoundTag jt2 = ben.getTag();
-        if (jt2 != null && jt2.contains("CustomPotionColor", 99)) {
-            return jt2.getInt("CustomPotionColor");
+    public static int getColor(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTag();
+        if (le2 != null && le2.contains("CustomPotionColor", 99)) {
+            return le2.getInt("CustomPotionColor");
         }
-        return (getPotion(ben) == Potions.EMPTY) ? 16253176 : getColor(getMobEffects(ben));
+        return (getPotion(bki) == Potions.EMPTY) ? 16253176 : getColor(getMobEffects(bki));
     }
     
-    public static int getColor(final Potion bgd) {
-        return (bgd == Potions.EMPTY) ? 16253176 : getColor(bgd.getEffects());
+    public static int getColor(final Potion bmb) {
+        return (bmb == Potions.EMPTY) ? 16253176 : getColor(bmb.getEffects());
     }
     
     public static int getColor(final Collection<MobEffectInstance> collection) {
@@ -87,12 +88,12 @@ public class PotionUtils {
         float float4 = 0.0f;
         float float5 = 0.0f;
         int integer3 = 0;
-        for (final MobEffectInstance akk8 : collection) {
-            if (!akk8.isVisible()) {
+        for (final MobEffectInstance aog8 : collection) {
+            if (!aog8.isVisible()) {
                 continue;
             }
-            final int integer4 = akk8.getEffect().getColor();
-            final int integer5 = akk8.getAmplifier() + 1;
+            final int integer4 = aog8.getEffect().getColor();
+            final int integer5 = aog8.getAmplifier() + 1;
             float3 += integer5 * (integer4 >> 16 & 0xFF) / 255.0f;
             float4 += integer5 * (integer4 >> 8 & 0xFF) / 255.0f;
             float5 += integer5 * (integer4 >> 0 & 0xFF) / 255.0f;
@@ -107,90 +108,90 @@ public class PotionUtils {
         return (int)float3 << 16 | (int)float4 << 8 | (int)float5;
     }
     
-    public static Potion getPotion(final ItemStack ben) {
-        return getPotion(ben.getTag());
+    public static Potion getPotion(final ItemStack bki) {
+        return getPotion(bki.getTag());
     }
     
-    public static Potion getPotion(@Nullable final CompoundTag jt) {
-        if (jt == null) {
+    public static Potion getPotion(@Nullable final CompoundTag le) {
+        if (le == null) {
             return Potions.EMPTY;
         }
-        return Potion.byName(jt.getString("Potion"));
+        return Potion.byName(le.getString("Potion"));
     }
     
-    public static ItemStack setPotion(final ItemStack ben, final Potion bgd) {
-        final ResourceLocation sm3 = Registry.POTION.getKey(bgd);
-        if (bgd == Potions.EMPTY) {
-            ben.removeTagKey("Potion");
+    public static ItemStack setPotion(final ItemStack bki, final Potion bmb) {
+        final ResourceLocation uh3 = Registry.POTION.getKey(bmb);
+        if (bmb == Potions.EMPTY) {
+            bki.removeTagKey("Potion");
         }
         else {
-            ben.getOrCreateTag().putString("Potion", sm3.toString());
+            bki.getOrCreateTag().putString("Potion", uh3.toString());
         }
-        return ben;
+        return bki;
     }
     
-    public static ItemStack setCustomEffects(final ItemStack ben, final Collection<MobEffectInstance> collection) {
+    public static ItemStack setCustomEffects(final ItemStack bki, final Collection<MobEffectInstance> collection) {
         if (collection.isEmpty()) {
-            return ben;
+            return bki;
         }
-        final CompoundTag jt3 = ben.getOrCreateTag();
-        final ListTag jz4 = jt3.getList("CustomPotionEffects", 9);
-        for (final MobEffectInstance akk6 : collection) {
-            ((AbstractList<CompoundTag>)jz4).add(akk6.save(new CompoundTag()));
+        final CompoundTag le3 = bki.getOrCreateTag();
+        final ListTag lk4 = le3.getList("CustomPotionEffects", 9);
+        for (final MobEffectInstance aog6 : collection) {
+            ((AbstractList<CompoundTag>)lk4).add(aog6.save(new CompoundTag()));
         }
-        jt3.put("CustomPotionEffects", jz4);
-        return ben;
+        le3.put("CustomPotionEffects", lk4);
+        return bki;
     }
     
-    public static void addPotionTooltip(final ItemStack ben, final List<Component> list, final float float3) {
-        final List<MobEffectInstance> list2 = getMobEffects(ben);
-        final List<Tuple<String, AttributeModifier>> list3 = Lists.newArrayList();
+    public static void addPotionTooltip(final ItemStack bki, final List<Component> list, final float float3) {
+        final List<MobEffectInstance> list2 = getMobEffects(bki);
+        final List<Pair<Attribute, AttributeModifier>> list3 = Lists.newArrayList();
         if (list2.isEmpty()) {
-            list.add(new TranslatableComponent("effect.none", new Object[0]).withStyle(ChatFormatting.GRAY));
+            list.add(new TranslatableComponent("effect.none").withStyle(ChatFormatting.GRAY));
         }
         else {
-            for (final MobEffectInstance akk7 : list2) {
-                final Component lf8 = new TranslatableComponent(akk7.getDescriptionId(), new Object[0]);
-                final MobEffect aki9 = akk7.getEffect();
-                final Map<Attribute, AttributeModifier> map10 = aki9.getAttributeModifiers();
+            for (final MobEffectInstance aog7 : list2) {
+                final MutableComponent mx8 = new TranslatableComponent(aog7.getDescriptionId());
+                final MobEffect aoe9 = aog7.getEffect();
+                final Map<Attribute, AttributeModifier> map10 = aoe9.getAttributeModifiers();
                 if (!map10.isEmpty()) {
                     for (final Map.Entry<Attribute, AttributeModifier> entry12 : map10.entrySet()) {
-                        final AttributeModifier als13 = entry12.getValue();
-                        final AttributeModifier als14 = new AttributeModifier(als13.getName(), aki9.getAttributeModifierValue(akk7.getAmplifier(), als13), als13.getOperation());
-                        list3.add(new Tuple<String, AttributeModifier>(entry12.getKey().getName(), als14));
+                        final AttributeModifier apv13 = entry12.getValue();
+                        final AttributeModifier apv14 = new AttributeModifier(apv13.getName(), aoe9.getAttributeModifierValue(aog7.getAmplifier(), apv13), apv13.getOperation());
+                        list3.add((Pair<Attribute, AttributeModifier>)new Pair(entry12.getKey(), apv14));
                     }
                 }
-                if (akk7.getAmplifier() > 0) {
-                    lf8.append(" ").append(new TranslatableComponent("potion.potency." + akk7.getAmplifier(), new Object[0]));
+                if (aog7.getAmplifier() > 0) {
+                    mx8.append(" ").append(new TranslatableComponent("potion.potency." + aog7.getAmplifier()));
                 }
-                if (akk7.getDuration() > 20) {
-                    lf8.append(" (").append(MobEffectUtil.formatDuration(akk7, float3)).append(")");
+                if (aog7.getDuration() > 20) {
+                    mx8.append(" (").append(MobEffectUtil.formatDuration(aog7, float3)).append(")");
                 }
-                list.add(lf8.withStyle(aki9.getCategory().getTooltipFormatting()));
+                list.add(mx8.withStyle(aoe9.getCategory().getTooltipFormatting()));
             }
         }
         if (!list3.isEmpty()) {
-            list.add(new TextComponent(""));
-            list.add(new TranslatableComponent("potion.whenDrank", new Object[0]).withStyle(ChatFormatting.DARK_PURPLE));
-            for (final Tuple<String, AttributeModifier> abz7 : list3) {
-                final AttributeModifier als15 = abz7.getB();
-                final double double9 = als15.getAmount();
+            list.add(TextComponent.EMPTY);
+            list.add(new TranslatableComponent("potion.whenDrank").withStyle(ChatFormatting.DARK_PURPLE));
+            for (final Pair<Attribute, AttributeModifier> pair7 : list3) {
+                final AttributeModifier apv15 = (AttributeModifier)pair7.getSecond();
+                final double double9 = apv15.getAmount();
                 double double10;
-                if (als15.getOperation() == AttributeModifier.Operation.MULTIPLY_BASE || als15.getOperation() == AttributeModifier.Operation.MULTIPLY_TOTAL) {
-                    double10 = als15.getAmount() * 100.0;
+                if (apv15.getOperation() == AttributeModifier.Operation.MULTIPLY_BASE || apv15.getOperation() == AttributeModifier.Operation.MULTIPLY_TOTAL) {
+                    double10 = apv15.getAmount() * 100.0;
                 }
                 else {
-                    double10 = als15.getAmount();
+                    double10 = apv15.getAmount();
                 }
                 if (double9 > 0.0) {
-                    list.add(new TranslatableComponent("attribute.modifier.plus." + als15.getOperation().toValue(), new Object[] { ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(double10), new TranslatableComponent("attribute.name." + abz7.getA(), new Object[0]) }).withStyle(ChatFormatting.BLUE));
+                    list.add(new TranslatableComponent("attribute.modifier.plus." + apv15.getOperation().toValue(), new Object[] { ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(double10), new TranslatableComponent(((Attribute)pair7.getFirst()).getDescriptionId()) }).withStyle(ChatFormatting.BLUE));
                 }
                 else {
                     if (double9 >= 0.0) {
                         continue;
                     }
                     double10 *= -1.0;
-                    list.add(new TranslatableComponent("attribute.modifier.take." + als15.getOperation().toValue(), new Object[] { ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(double10), new TranslatableComponent("attribute.name." + abz7.getA(), new Object[0]) }).withStyle(ChatFormatting.RED));
+                    list.add(new TranslatableComponent("attribute.modifier.take." + apv15.getOperation().toValue(), new Object[] { ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(double10), new TranslatableComponent(((Attribute)pair7.getFirst()).getDescriptionId()) }).withStyle(ChatFormatting.RED));
                 }
             }
         }
diff --git a/src/net/minecraft/world/item/alchemy/Potions.java b/src/net/minecraft/world/item/alchemy/Potions.java
index a9763d7..f107b31 100644
--- a/src/net/minecraft/world/item/alchemy/Potions.java
+++ b/src/net/minecraft/world/item/alchemy/Potions.java
@@ -49,8 +49,8 @@ public class Potions {
     public static final Potion SLOW_FALLING;
     public static final Potion LONG_SLOW_FALLING;
     
-    private static Potion register(final String string, final Potion bgd) {
-        return Registry.<Potion>register(Registry.POTION, string, bgd);
+    private static Potion register(final String string, final Potion bmb) {
+        return Registry.<Potion>register(Registry.POTION, string, bmb);
     }
     
     static {
diff --git a/src/net/minecraft/world/item/crafting/AbstractCookingRecipe.java b/src/net/minecraft/world/item/crafting/AbstractCookingRecipe.java
index 2191d24..f7560d6 100644
--- a/src/net/minecraft/world/item/crafting/AbstractCookingRecipe.java
+++ b/src/net/minecraft/world/item/crafting/AbstractCookingRecipe.java
@@ -15,23 +15,23 @@ public abstract class AbstractCookingRecipe implements Recipe<Container> {
     protected final float experience;
     protected final int cookingTime;
     
-    public AbstractCookingRecipe(final RecipeType<?> bgz, final ResourceLocation sm, final String string, final Ingredient bgt, final ItemStack ben, final float float6, final int integer) {
-        this.type = bgz;
-        this.id = sm;
+    public AbstractCookingRecipe(final RecipeType<?> bmx, final ResourceLocation uh, final String string, final Ingredient bmr, final ItemStack bki, final float float6, final int integer) {
+        this.type = bmx;
+        this.id = uh;
         this.group = string;
-        this.ingredient = bgt;
-        this.result = ben;
+        this.ingredient = bmr;
+        this.result = bki;
         this.experience = float6;
         this.cookingTime = integer;
     }
     
     @Override
-    public boolean matches(final Container aje, final Level bjw) {
-        return this.ingredient.test(aje.getItem(0));
+    public boolean matches(final Container amz, final Level bqb) {
+        return this.ingredient.test(amz.getItem(0));
     }
     
     @Override
-    public ItemStack assemble(final Container aje) {
+    public ItemStack assemble(final Container amz) {
         return this.result.copy();
     }
     
@@ -42,9 +42,9 @@ public abstract class AbstractCookingRecipe implements Recipe<Container> {
     
     @Override
     public NonNullList<Ingredient> getIngredients() {
-        final NonNullList<Ingredient> fy2 = NonNullList.<Ingredient>create();
-        fy2.add(this.ingredient);
-        return fy2;
+        final NonNullList<Ingredient> gi2 = NonNullList.<Ingredient>create();
+        gi2.add(this.ingredient);
+        return gi2;
     }
     
     public float getExperience() {
diff --git a/src/net/minecraft/world/item/crafting/ArmorDyeRecipe.java b/src/net/minecraft/world/item/crafting/ArmorDyeRecipe.java
index 240f0b2..02e1abe 100644
--- a/src/net/minecraft/world/item/crafting/ArmorDyeRecipe.java
+++ b/src/net/minecraft/world/item/crafting/ArmorDyeRecipe.java
@@ -12,60 +12,60 @@ import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.resources.ResourceLocation;
 
 public class ArmorDyeRecipe extends CustomRecipe {
-    public ArmorDyeRecipe(final ResourceLocation sm) {
-        super(sm);
+    public ArmorDyeRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
-        ItemStack ben4 = ItemStack.EMPTY;
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
+        ItemStack bki4 = ItemStack.EMPTY;
         final List<ItemStack> list5 = Lists.newArrayList();
-        for (int integer6 = 0; integer6 < baz.getContainerSize(); ++integer6) {
-            final ItemStack ben5 = baz.getItem(integer6);
-            if (!ben5.isEmpty()) {
-                if (ben5.getItem() instanceof DyeableLeatherItem) {
-                    if (!ben4.isEmpty()) {
+        for (int integer6 = 0; integer6 < bgu.getContainerSize(); ++integer6) {
+            final ItemStack bki5 = bgu.getItem(integer6);
+            if (!bki5.isEmpty()) {
+                if (bki5.getItem() instanceof DyeableLeatherItem) {
+                    if (!bki4.isEmpty()) {
                         return false;
                     }
-                    ben4 = ben5;
+                    bki4 = bki5;
                 }
                 else {
-                    if (!(ben5.getItem() instanceof DyeItem)) {
+                    if (!(bki5.getItem() instanceof DyeItem)) {
                         return false;
                     }
-                    list5.add(ben5);
+                    list5.add(bki5);
                 }
             }
         }
-        return !ben4.isEmpty() && !list5.isEmpty();
+        return !bki4.isEmpty() && !list5.isEmpty();
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
+    public ItemStack assemble(final CraftingContainer bgu) {
         final List<DyeItem> list3 = Lists.newArrayList();
-        ItemStack ben4 = ItemStack.EMPTY;
-        for (int integer5 = 0; integer5 < baz.getContainerSize(); ++integer5) {
-            final ItemStack ben5 = baz.getItem(integer5);
-            if (!ben5.isEmpty()) {
-                final Item bei7 = ben5.getItem();
-                if (bei7 instanceof DyeableLeatherItem) {
-                    if (!ben4.isEmpty()) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        for (int integer5 = 0; integer5 < bgu.getContainerSize(); ++integer5) {
+            final ItemStack bki5 = bgu.getItem(integer5);
+            if (!bki5.isEmpty()) {
+                final Item bke7 = bki5.getItem();
+                if (bke7 instanceof DyeableLeatherItem) {
+                    if (!bki4.isEmpty()) {
                         return ItemStack.EMPTY;
                     }
-                    ben4 = ben5.copy();
+                    bki4 = bki5.copy();
                 }
                 else {
-                    if (!(bei7 instanceof DyeItem)) {
+                    if (!(bke7 instanceof DyeItem)) {
                         return ItemStack.EMPTY;
                     }
-                    list3.add((DyeItem)bei7);
+                    list3.add((DyeItem)bke7);
                 }
             }
         }
-        if (ben4.isEmpty() || list3.isEmpty()) {
+        if (bki4.isEmpty() || list3.isEmpty()) {
             return ItemStack.EMPTY;
         }
-        return DyeableLeatherItem.dyeArmor(ben4, list3);
+        return DyeableLeatherItem.dyeArmor(bki4, list3);
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/BannerDuplicateRecipe.java b/src/net/minecraft/world/item/crafting/BannerDuplicateRecipe.java
index be376f4..0152248 100644
--- a/src/net/minecraft/world/item/crafting/BannerDuplicateRecipe.java
+++ b/src/net/minecraft/world/item/crafting/BannerDuplicateRecipe.java
@@ -13,57 +13,57 @@ import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.resources.ResourceLocation;
 
 public class BannerDuplicateRecipe extends CustomRecipe {
-    public BannerDuplicateRecipe(final ResourceLocation sm) {
-        super(sm);
+    public BannerDuplicateRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
-        DyeColor bdj4 = null;
-        ItemStack ben5 = null;
-        ItemStack ben6 = null;
-        for (int integer7 = 0; integer7 < baz.getContainerSize(); ++integer7) {
-            final ItemStack ben7 = baz.getItem(integer7);
-            final Item bei9 = ben7.getItem();
-            if (bei9 instanceof BannerItem) {
-                final BannerItem bcm10 = (BannerItem)bei9;
-                if (bdj4 == null) {
-                    bdj4 = bcm10.getColor();
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
+        DyeColor bje4 = null;
+        ItemStack bki5 = null;
+        ItemStack bki6 = null;
+        for (int integer7 = 0; integer7 < bgu.getContainerSize(); ++integer7) {
+            final ItemStack bki7 = bgu.getItem(integer7);
+            final Item bke9 = bki7.getItem();
+            if (bke9 instanceof BannerItem) {
+                final BannerItem bij10 = (BannerItem)bke9;
+                if (bje4 == null) {
+                    bje4 = bij10.getColor();
                 }
-                else if (bdj4 != bcm10.getColor()) {
+                else if (bje4 != bij10.getColor()) {
                     return false;
                 }
-                final int integer8 = BannerBlockEntity.getPatternCount(ben7);
+                final int integer8 = BannerBlockEntity.getPatternCount(bki7);
                 if (integer8 > 6) {
                     return false;
                 }
                 if (integer8 > 0) {
-                    if (ben5 != null) {
+                    if (bki5 != null) {
                         return false;
                     }
-                    ben5 = ben7;
+                    bki5 = bki7;
                 }
                 else {
-                    if (ben6 != null) {
+                    if (bki6 != null) {
                         return false;
                     }
-                    ben6 = ben7;
+                    bki6 = bki7;
                 }
             }
         }
-        return ben5 != null && ben6 != null;
+        return bki5 != null && bki6 != null;
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
-        for (int integer3 = 0; integer3 < baz.getContainerSize(); ++integer3) {
-            final ItemStack ben4 = baz.getItem(integer3);
-            if (!ben4.isEmpty()) {
-                final int integer4 = BannerBlockEntity.getPatternCount(ben4);
+    public ItemStack assemble(final CraftingContainer bgu) {
+        for (int integer3 = 0; integer3 < bgu.getContainerSize(); ++integer3) {
+            final ItemStack bki4 = bgu.getItem(integer3);
+            if (!bki4.isEmpty()) {
+                final int integer4 = BannerBlockEntity.getPatternCount(bki4);
                 if (integer4 > 0 && integer4 <= 6) {
-                    final ItemStack ben5 = ben4.copy();
-                    ben5.setCount(1);
-                    return ben5;
+                    final ItemStack bki5 = bki4.copy();
+                    bki5.setCount(1);
+                    return bki5;
                 }
             }
         }
@@ -71,22 +71,22 @@ public class BannerDuplicateRecipe extends CustomRecipe {
     }
     
     @Override
-    public NonNullList<ItemStack> getRemainingItems(final CraftingContainer baz) {
-        final NonNullList<ItemStack> fy3 = NonNullList.<ItemStack>withSize(baz.getContainerSize(), ItemStack.EMPTY);
-        for (int integer4 = 0; integer4 < fy3.size(); ++integer4) {
-            final ItemStack ben5 = baz.getItem(integer4);
-            if (!ben5.isEmpty()) {
-                if (ben5.getItem().hasCraftingRemainingItem()) {
-                    fy3.set(integer4, new ItemStack(ben5.getItem().getCraftingRemainingItem()));
+    public NonNullList<ItemStack> getRemainingItems(final CraftingContainer bgu) {
+        final NonNullList<ItemStack> gi3 = NonNullList.<ItemStack>withSize(bgu.getContainerSize(), ItemStack.EMPTY);
+        for (int integer4 = 0; integer4 < gi3.size(); ++integer4) {
+            final ItemStack bki5 = bgu.getItem(integer4);
+            if (!bki5.isEmpty()) {
+                if (bki5.getItem().hasCraftingRemainingItem()) {
+                    gi3.set(integer4, new ItemStack(bki5.getItem().getCraftingRemainingItem()));
                 }
-                else if (ben5.hasTag() && BannerBlockEntity.getPatternCount(ben5) > 0) {
-                    final ItemStack ben6 = ben5.copy();
-                    ben6.setCount(1);
-                    fy3.set(integer4, ben6);
+                else if (bki5.hasTag() && BannerBlockEntity.getPatternCount(bki5) > 0) {
+                    final ItemStack bki6 = bki5.copy();
+                    bki6.setCount(1);
+                    gi3.set(integer4, bki6);
                 }
             }
         }
-        return fy3;
+        return gi3;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/BlastingRecipe.java b/src/net/minecraft/world/item/crafting/BlastingRecipe.java
index 3ee76f9..e7cf6ca 100644
--- a/src/net/minecraft/world/item/crafting/BlastingRecipe.java
+++ b/src/net/minecraft/world/item/crafting/BlastingRecipe.java
@@ -6,8 +6,8 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.resources.ResourceLocation;
 
 public class BlastingRecipe extends AbstractCookingRecipe {
-    public BlastingRecipe(final ResourceLocation sm, final String string, final Ingredient bgt, final ItemStack ben, final float float5, final int integer) {
-        super(RecipeType.BLASTING, sm, string, bgt, ben, float5, integer);
+    public BlastingRecipe(final ResourceLocation uh, final String string, final Ingredient bmr, final ItemStack bki, final float float5, final int integer) {
+        super(RecipeType.BLASTING, uh, string, bmr, bki, float5, integer);
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/BookCloningRecipe.java b/src/net/minecraft/world/item/crafting/BookCloningRecipe.java
index 988478f..b4b7e52 100644
--- a/src/net/minecraft/world/item/crafting/BookCloningRecipe.java
+++ b/src/net/minecraft/world/item/crafting/BookCloningRecipe.java
@@ -12,81 +12,81 @@ import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.resources.ResourceLocation;
 
 public class BookCloningRecipe extends CustomRecipe {
-    public BookCloningRecipe(final ResourceLocation sm) {
-        super(sm);
+    public BookCloningRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
         int integer4 = 0;
-        ItemStack ben5 = ItemStack.EMPTY;
-        for (int integer5 = 0; integer5 < baz.getContainerSize(); ++integer5) {
-            final ItemStack ben6 = baz.getItem(integer5);
-            if (!ben6.isEmpty()) {
-                if (ben6.getItem() == Items.WRITTEN_BOOK) {
-                    if (!ben5.isEmpty()) {
+        ItemStack bki5 = ItemStack.EMPTY;
+        for (int integer5 = 0; integer5 < bgu.getContainerSize(); ++integer5) {
+            final ItemStack bki6 = bgu.getItem(integer5);
+            if (!bki6.isEmpty()) {
+                if (bki6.getItem() == Items.WRITTEN_BOOK) {
+                    if (!bki5.isEmpty()) {
                         return false;
                     }
-                    ben5 = ben6;
+                    bki5 = bki6;
                 }
                 else {
-                    if (ben6.getItem() != Items.WRITABLE_BOOK) {
+                    if (bki6.getItem() != Items.WRITABLE_BOOK) {
                         return false;
                     }
                     ++integer4;
                 }
             }
         }
-        return !ben5.isEmpty() && ben5.hasTag() && integer4 > 0;
+        return !bki5.isEmpty() && bki5.hasTag() && integer4 > 0;
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
+    public ItemStack assemble(final CraftingContainer bgu) {
         int integer3 = 0;
-        ItemStack ben4 = ItemStack.EMPTY;
-        for (int integer4 = 0; integer4 < baz.getContainerSize(); ++integer4) {
-            final ItemStack ben5 = baz.getItem(integer4);
-            if (!ben5.isEmpty()) {
-                if (ben5.getItem() == Items.WRITTEN_BOOK) {
-                    if (!ben4.isEmpty()) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        for (int integer4 = 0; integer4 < bgu.getContainerSize(); ++integer4) {
+            final ItemStack bki5 = bgu.getItem(integer4);
+            if (!bki5.isEmpty()) {
+                if (bki5.getItem() == Items.WRITTEN_BOOK) {
+                    if (!bki4.isEmpty()) {
                         return ItemStack.EMPTY;
                     }
-                    ben4 = ben5;
+                    bki4 = bki5;
                 }
                 else {
-                    if (ben5.getItem() != Items.WRITABLE_BOOK) {
+                    if (bki5.getItem() != Items.WRITABLE_BOOK) {
                         return ItemStack.EMPTY;
                     }
                     ++integer3;
                 }
             }
         }
-        if (ben4.isEmpty() || !ben4.hasTag() || integer3 < 1 || WrittenBookItem.getGeneration(ben4) >= 2) {
+        if (bki4.isEmpty() || !bki4.hasTag() || integer3 < 1 || WrittenBookItem.getGeneration(bki4) >= 2) {
             return ItemStack.EMPTY;
         }
-        final ItemStack ben6 = new ItemStack(Items.WRITTEN_BOOK, integer3);
-        final CompoundTag jt6 = ben4.getTag().copy();
-        jt6.putInt("generation", WrittenBookItem.getGeneration(ben4) + 1);
-        ben6.setTag(jt6);
-        return ben6;
+        final ItemStack bki6 = new ItemStack(Items.WRITTEN_BOOK, integer3);
+        final CompoundTag le6 = bki4.getTag().copy();
+        le6.putInt("generation", WrittenBookItem.getGeneration(bki4) + 1);
+        bki6.setTag(le6);
+        return bki6;
     }
     
     @Override
-    public NonNullList<ItemStack> getRemainingItems(final CraftingContainer baz) {
-        final NonNullList<ItemStack> fy3 = NonNullList.<ItemStack>withSize(baz.getContainerSize(), ItemStack.EMPTY);
-        for (int integer4 = 0; integer4 < fy3.size(); ++integer4) {
-            final ItemStack ben5 = baz.getItem(integer4);
-            if (ben5.getItem().hasCraftingRemainingItem()) {
-                fy3.set(integer4, new ItemStack(ben5.getItem().getCraftingRemainingItem()));
+    public NonNullList<ItemStack> getRemainingItems(final CraftingContainer bgu) {
+        final NonNullList<ItemStack> gi3 = NonNullList.<ItemStack>withSize(bgu.getContainerSize(), ItemStack.EMPTY);
+        for (int integer4 = 0; integer4 < gi3.size(); ++integer4) {
+            final ItemStack bki5 = bgu.getItem(integer4);
+            if (bki5.getItem().hasCraftingRemainingItem()) {
+                gi3.set(integer4, new ItemStack(bki5.getItem().getCraftingRemainingItem()));
             }
-            else if (ben5.getItem() instanceof WrittenBookItem) {
-                final ItemStack ben6 = ben5.copy();
-                ben6.setCount(1);
-                fy3.set(integer4, ben6);
+            else if (bki5.getItem() instanceof WrittenBookItem) {
+                final ItemStack bki6 = bki5.copy();
+                bki6.setCount(1);
+                gi3.set(integer4, bki6);
                 break;
             }
         }
-        return fy3;
+        return gi3;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/CampfireCookingRecipe.java b/src/net/minecraft/world/item/crafting/CampfireCookingRecipe.java
index 3d542f6..3a0bdb6 100644
--- a/src/net/minecraft/world/item/crafting/CampfireCookingRecipe.java
+++ b/src/net/minecraft/world/item/crafting/CampfireCookingRecipe.java
@@ -6,8 +6,8 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.resources.ResourceLocation;
 
 public class CampfireCookingRecipe extends AbstractCookingRecipe {
-    public CampfireCookingRecipe(final ResourceLocation sm, final String string, final Ingredient bgt, final ItemStack ben, final float float5, final int integer) {
-        super(RecipeType.CAMPFIRE_COOKING, sm, string, bgt, ben, float5, integer);
+    public CampfireCookingRecipe(final ResourceLocation uh, final String string, final Ingredient bmr, final ItemStack bki, final float float5, final int integer) {
+        super(RecipeType.CAMPFIRE_COOKING, uh, string, bmr, bki, float5, integer);
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/CustomRecipe.java b/src/net/minecraft/world/item/crafting/CustomRecipe.java
index 99d9644..b039a82 100644
--- a/src/net/minecraft/world/item/crafting/CustomRecipe.java
+++ b/src/net/minecraft/world/item/crafting/CustomRecipe.java
@@ -6,8 +6,8 @@ import net.minecraft.resources.ResourceLocation;
 public abstract class CustomRecipe implements CraftingRecipe {
     private final ResourceLocation id;
     
-    public CustomRecipe(final ResourceLocation sm) {
-        this.id = sm;
+    public CustomRecipe(final ResourceLocation uh) {
+        this.id = uh;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/FireworkRocketRecipe.java b/src/net/minecraft/world/item/crafting/FireworkRocketRecipe.java
index 950cf33..2ee52f1 100644
--- a/src/net/minecraft/world/item/crafting/FireworkRocketRecipe.java
+++ b/src/net/minecraft/world/item/crafting/FireworkRocketRecipe.java
@@ -17,29 +17,29 @@ public class FireworkRocketRecipe extends CustomRecipe {
     private static final Ingredient GUNPOWDER_INGREDIENT;
     private static final Ingredient STAR_INGREDIENT;
     
-    public FireworkRocketRecipe(final ResourceLocation sm) {
-        super(sm);
+    public FireworkRocketRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
         boolean boolean4 = false;
         int integer5 = 0;
-        for (int integer6 = 0; integer6 < baz.getContainerSize(); ++integer6) {
-            final ItemStack ben7 = baz.getItem(integer6);
-            if (!ben7.isEmpty()) {
-                if (FireworkRocketRecipe.PAPER_INGREDIENT.test(ben7)) {
+        for (int integer6 = 0; integer6 < bgu.getContainerSize(); ++integer6) {
+            final ItemStack bki7 = bgu.getItem(integer6);
+            if (!bki7.isEmpty()) {
+                if (FireworkRocketRecipe.PAPER_INGREDIENT.test(bki7)) {
                     if (boolean4) {
                         return false;
                     }
                     boolean4 = true;
                 }
-                else if (FireworkRocketRecipe.GUNPOWDER_INGREDIENT.test(ben7)) {
+                else if (FireworkRocketRecipe.GUNPOWDER_INGREDIENT.test(bki7)) {
                     if (++integer5 > 3) {
                         return false;
                     }
                 }
-                else if (!FireworkRocketRecipe.STAR_INGREDIENT.test(ben7)) {
+                else if (!FireworkRocketRecipe.STAR_INGREDIENT.test(bki7)) {
                     return false;
                 }
             }
@@ -48,30 +48,30 @@ public class FireworkRocketRecipe extends CustomRecipe {
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
-        final ItemStack ben3 = new ItemStack(Items.FIREWORK_ROCKET, 3);
-        final CompoundTag jt4 = ben3.getOrCreateTagElement("Fireworks");
-        final ListTag jz5 = new ListTag();
+    public ItemStack assemble(final CraftingContainer bgu) {
+        final ItemStack bki3 = new ItemStack(Items.FIREWORK_ROCKET, 3);
+        final CompoundTag le4 = bki3.getOrCreateTagElement("Fireworks");
+        final ListTag lk5 = new ListTag();
         int integer6 = 0;
-        for (int integer7 = 0; integer7 < baz.getContainerSize(); ++integer7) {
-            final ItemStack ben4 = baz.getItem(integer7);
-            if (!ben4.isEmpty()) {
-                if (FireworkRocketRecipe.GUNPOWDER_INGREDIENT.test(ben4)) {
+        for (int integer7 = 0; integer7 < bgu.getContainerSize(); ++integer7) {
+            final ItemStack bki4 = bgu.getItem(integer7);
+            if (!bki4.isEmpty()) {
+                if (FireworkRocketRecipe.GUNPOWDER_INGREDIENT.test(bki4)) {
                     ++integer6;
                 }
-                else if (FireworkRocketRecipe.STAR_INGREDIENT.test(ben4)) {
-                    final CompoundTag jt5 = ben4.getTagElement("Explosion");
-                    if (jt5 != null) {
-                        ((AbstractList<CompoundTag>)jz5).add(jt5);
+                else if (FireworkRocketRecipe.STAR_INGREDIENT.test(bki4)) {
+                    final CompoundTag le5 = bki4.getTagElement("Explosion");
+                    if (le5 != null) {
+                        ((AbstractList<CompoundTag>)lk5).add(le5);
                     }
                 }
             }
         }
-        jt4.putByte("Flight", (byte)integer6);
-        if (!jz5.isEmpty()) {
-            jt4.put("Explosions", jz5);
+        le4.putByte("Flight", (byte)integer6);
+        if (!lk5.isEmpty()) {
+            le4.put("Explosions", lk5);
         }
-        return ben3;
+        return bki3;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/FireworkStarFadeRecipe.java b/src/net/minecraft/world/item/crafting/FireworkStarFadeRecipe.java
index b1cc5ed..7a9676d 100644
--- a/src/net/minecraft/world/item/crafting/FireworkStarFadeRecipe.java
+++ b/src/net/minecraft/world/item/crafting/FireworkStarFadeRecipe.java
@@ -15,22 +15,22 @@ import net.minecraft.resources.ResourceLocation;
 public class FireworkStarFadeRecipe extends CustomRecipe {
     private static final Ingredient STAR_INGREDIENT;
     
-    public FireworkStarFadeRecipe(final ResourceLocation sm) {
-        super(sm);
+    public FireworkStarFadeRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
         boolean boolean4 = false;
         boolean boolean5 = false;
-        for (int integer6 = 0; integer6 < baz.getContainerSize(); ++integer6) {
-            final ItemStack ben7 = baz.getItem(integer6);
-            if (!ben7.isEmpty()) {
-                if (ben7.getItem() instanceof DyeItem) {
+        for (int integer6 = 0; integer6 < bgu.getContainerSize(); ++integer6) {
+            final ItemStack bki7 = bgu.getItem(integer6);
+            if (!bki7.isEmpty()) {
+                if (bki7.getItem() instanceof DyeItem) {
                     boolean4 = true;
                 }
                 else {
-                    if (!FireworkStarFadeRecipe.STAR_INGREDIENT.test(ben7)) {
+                    if (!FireworkStarFadeRecipe.STAR_INGREDIENT.test(bki7)) {
                         return false;
                     }
                     if (boolean5) {
@@ -44,25 +44,25 @@ public class FireworkStarFadeRecipe extends CustomRecipe {
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
+    public ItemStack assemble(final CraftingContainer bgu) {
         final List<Integer> list3 = Lists.newArrayList();
-        ItemStack ben4 = null;
-        for (int integer5 = 0; integer5 < baz.getContainerSize(); ++integer5) {
-            final ItemStack ben5 = baz.getItem(integer5);
-            final Item bei7 = ben5.getItem();
-            if (bei7 instanceof DyeItem) {
-                list3.add(((DyeItem)bei7).getDyeColor().getFireworkColor());
+        ItemStack bki4 = null;
+        for (int integer5 = 0; integer5 < bgu.getContainerSize(); ++integer5) {
+            final ItemStack bki5 = bgu.getItem(integer5);
+            final Item bke7 = bki5.getItem();
+            if (bke7 instanceof DyeItem) {
+                list3.add(((DyeItem)bke7).getDyeColor().getFireworkColor());
             }
-            else if (FireworkStarFadeRecipe.STAR_INGREDIENT.test(ben5)) {
-                ben4 = ben5.copy();
-                ben4.setCount(1);
+            else if (FireworkStarFadeRecipe.STAR_INGREDIENT.test(bki5)) {
+                bki4 = bki5.copy();
+                bki4.setCount(1);
             }
         }
-        if (ben4 == null || list3.isEmpty()) {
+        if (bki4 == null || list3.isEmpty()) {
             return ItemStack.EMPTY;
         }
-        ben4.getOrCreateTagElement("Explosion").putIntArray("FadeColors", list3);
-        return ben4;
+        bki4.getOrCreateTagElement("Explosion").putIntArray("FadeColors", list3);
+        return bki4;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/FireworkStarRecipe.java b/src/net/minecraft/world/item/crafting/FireworkStarRecipe.java
index 24aa1b9..6c5e074 100644
--- a/src/net/minecraft/world/item/crafting/FireworkStarRecipe.java
+++ b/src/net/minecraft/world/item/crafting/FireworkStarRecipe.java
@@ -25,46 +25,46 @@ public class FireworkStarRecipe extends CustomRecipe {
     private static final Map<Item, FireworkRocketItem.Shape> SHAPE_BY_ITEM;
     private static final Ingredient GUNPOWDER_INGREDIENT;
     
-    public FireworkStarRecipe(final ResourceLocation sm) {
-        super(sm);
+    public FireworkStarRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
         boolean boolean4 = false;
         boolean boolean5 = false;
         boolean boolean6 = false;
         boolean boolean7 = false;
         boolean boolean8 = false;
-        for (int integer9 = 0; integer9 < baz.getContainerSize(); ++integer9) {
-            final ItemStack ben10 = baz.getItem(integer9);
-            if (!ben10.isEmpty()) {
-                if (FireworkStarRecipe.SHAPE_INGREDIENT.test(ben10)) {
+        for (int integer9 = 0; integer9 < bgu.getContainerSize(); ++integer9) {
+            final ItemStack bki10 = bgu.getItem(integer9);
+            if (!bki10.isEmpty()) {
+                if (FireworkStarRecipe.SHAPE_INGREDIENT.test(bki10)) {
                     if (boolean6) {
                         return false;
                     }
                     boolean6 = true;
                 }
-                else if (FireworkStarRecipe.FLICKER_INGREDIENT.test(ben10)) {
+                else if (FireworkStarRecipe.FLICKER_INGREDIENT.test(bki10)) {
                     if (boolean8) {
                         return false;
                     }
                     boolean8 = true;
                 }
-                else if (FireworkStarRecipe.TRAIL_INGREDIENT.test(ben10)) {
+                else if (FireworkStarRecipe.TRAIL_INGREDIENT.test(bki10)) {
                     if (boolean7) {
                         return false;
                     }
                     boolean7 = true;
                 }
-                else if (FireworkStarRecipe.GUNPOWDER_INGREDIENT.test(ben10)) {
+                else if (FireworkStarRecipe.GUNPOWDER_INGREDIENT.test(bki10)) {
                     if (boolean4) {
                         return false;
                     }
                     boolean4 = true;
                 }
                 else {
-                    if (!(ben10.getItem() instanceof DyeItem)) {
+                    if (!(bki10.getItem() instanceof DyeItem)) {
                         return false;
                     }
                     boolean5 = true;
@@ -75,31 +75,31 @@ public class FireworkStarRecipe extends CustomRecipe {
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
-        final ItemStack ben3 = new ItemStack(Items.FIREWORK_STAR);
-        final CompoundTag jt4 = ben3.getOrCreateTagElement("Explosion");
+    public ItemStack assemble(final CraftingContainer bgu) {
+        final ItemStack bki3 = new ItemStack(Items.FIREWORK_STAR);
+        final CompoundTag le4 = bki3.getOrCreateTagElement("Explosion");
         FireworkRocketItem.Shape a5 = FireworkRocketItem.Shape.SMALL_BALL;
         final List<Integer> list6 = Lists.newArrayList();
-        for (int integer7 = 0; integer7 < baz.getContainerSize(); ++integer7) {
-            final ItemStack ben4 = baz.getItem(integer7);
-            if (!ben4.isEmpty()) {
-                if (FireworkStarRecipe.SHAPE_INGREDIENT.test(ben4)) {
-                    a5 = FireworkStarRecipe.SHAPE_BY_ITEM.get(ben4.getItem());
+        for (int integer7 = 0; integer7 < bgu.getContainerSize(); ++integer7) {
+            final ItemStack bki4 = bgu.getItem(integer7);
+            if (!bki4.isEmpty()) {
+                if (FireworkStarRecipe.SHAPE_INGREDIENT.test(bki4)) {
+                    a5 = FireworkStarRecipe.SHAPE_BY_ITEM.get(bki4.getItem());
                 }
-                else if (FireworkStarRecipe.FLICKER_INGREDIENT.test(ben4)) {
-                    jt4.putBoolean("Flicker", true);
+                else if (FireworkStarRecipe.FLICKER_INGREDIENT.test(bki4)) {
+                    le4.putBoolean("Flicker", true);
                 }
-                else if (FireworkStarRecipe.TRAIL_INGREDIENT.test(ben4)) {
-                    jt4.putBoolean("Trail", true);
+                else if (FireworkStarRecipe.TRAIL_INGREDIENT.test(bki4)) {
+                    le4.putBoolean("Trail", true);
                 }
-                else if (ben4.getItem() instanceof DyeItem) {
-                    list6.add(((DyeItem)ben4.getItem()).getDyeColor().getFireworkColor());
+                else if (bki4.getItem() instanceof DyeItem) {
+                    list6.add(((DyeItem)bki4.getItem()).getDyeColor().getFireworkColor());
                 }
             }
         }
-        jt4.putIntArray("Colors", list6);
-        jt4.putByte("Type", (byte)a5.getId());
-        return ben3;
+        le4.putIntArray("Colors", list6);
+        le4.putByte("Type", (byte)a5.getId());
+        return bki3;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/Ingredient.java b/src/net/minecraft/world/item/crafting/Ingredient.java
index 476f2d1..f028e29 100644
--- a/src/net/minecraft/world/item/crafting/Ingredient.java
+++ b/src/net/minecraft/world/item/crafting/Ingredient.java
@@ -5,7 +5,7 @@ import java.util.List;
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.Collection;
-import net.minecraft.tags.ItemTags;
+import net.minecraft.tags.SerializationTags;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import com.google.gson.JsonParseException;
@@ -15,6 +15,7 @@ import java.util.stream.StreamSupport;
 import com.google.gson.JsonSyntaxException;
 import net.minecraft.world.item.Item;
 import net.minecraft.tags.Tag;
+import java.util.function.Function;
 import net.minecraft.world.level.ItemLike;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -31,14 +32,13 @@ import net.minecraft.world.item.ItemStack;
 import java.util.function.Predicate;
 
 public final class Ingredient implements Predicate<ItemStack> {
-    private static final Predicate<? super Value> NON_ALL_EMPTY;
     public static final Ingredient EMPTY;
     private final Value[] values;
     private ItemStack[] itemStacks;
     private IntList stackingIds;
     
     private Ingredient(final Stream<? extends Value> stream) {
-        this.values = stream.filter(Ingredient.NON_ALL_EMPTY).<Value>toArray(Value[]::new);
+        this.values = stream.<Value>toArray(Value[]::new);
     }
     
     public ItemStack[] getItems() {
@@ -53,16 +53,16 @@ public final class Ingredient implements Predicate<ItemStack> {
     }
     
     @Override
-    public boolean test(@Nullable final ItemStack ben) {
-        if (ben == null) {
+    public boolean test(@Nullable final ItemStack bki) {
+        if (bki == null) {
             return false;
         }
-        if (this.values.length == 0) {
-            return ben.isEmpty();
-        }
         this.dissolve();
-        for (final ItemStack ben2 : this.itemStacks) {
-            if (ben2.getItem() == ben.getItem()) {
+        if (this.itemStacks.length == 0) {
+            return bki.isEmpty();
+        }
+        for (final ItemStack bki2 : this.itemStacks) {
+            if (bki2.getItem() == bki.getItem()) {
                 return true;
             }
         }
@@ -73,19 +73,19 @@ public final class Ingredient implements Predicate<ItemStack> {
         if (this.stackingIds == null) {
             this.dissolve();
             this.stackingIds = (IntList)new IntArrayList(this.itemStacks.length);
-            for (final ItemStack ben5 : this.itemStacks) {
-                this.stackingIds.add(StackedContents.getStackingIndex(ben5));
+            for (final ItemStack bki5 : this.itemStacks) {
+                this.stackingIds.add(StackedContents.getStackingIndex(bki5));
             }
             this.stackingIds.sort((Comparator)IntComparators.NATURAL_COMPARATOR);
         }
         return this.stackingIds;
     }
     
-    public void toNetwork(final FriendlyByteBuf kv) {
+    public void toNetwork(final FriendlyByteBuf mg) {
         this.dissolve();
-        kv.writeVarInt(this.itemStacks.length);
+        mg.writeVarInt(this.itemStacks.length);
         for (int integer3 = 0; integer3 < this.itemStacks.length; ++integer3) {
-            kv.writeItem(this.itemStacks[integer3]);
+            mg.writeItem(this.itemStacks[integer3]);
         }
     }
     
@@ -105,29 +105,29 @@ public final class Ingredient implements Predicate<ItemStack> {
     }
     
     private static Ingredient fromValues(final Stream<? extends Value> stream) {
-        final Ingredient bgt2 = new Ingredient(stream);
-        return (bgt2.values.length == 0) ? Ingredient.EMPTY : bgt2;
+        final Ingredient bmr2 = new Ingredient(stream);
+        return (bmr2.values.length == 0) ? Ingredient.EMPTY : bmr2;
     }
     
     public static Ingredient of(final ItemLike... arr) {
-        final ItemValue itemValue;
-        return fromValues(Arrays.<ItemLike>stream(arr).map(bjv -> {
-            new ItemValue(new ItemStack(bjv));
-            return itemValue;
-        }));
+        return of(Arrays.<ItemLike>stream(arr).<ItemStack>map(ItemStack::new));
     }
     
     public static Ingredient of(final ItemStack... arr) {
-        return fromValues(Arrays.<ItemStack>stream(arr).map(ben -> new ItemValue(ben)));
+        return of(Arrays.<ItemStack>stream(arr));
     }
     
-    public static Ingredient of(final Tag<Item> aaz) {
-        return fromValues(Stream.<TagValue>of(new TagValue((Tag)aaz)));
+    public static Ingredient of(final Stream<ItemStack> stream) {
+        return fromValues(stream.filter(bki -> !bki.isEmpty()).map(bki -> new ItemValue(bki)));
     }
     
-    public static Ingredient fromNetwork(final FriendlyByteBuf kv) {
-        final int integer2 = kv.readVarInt();
-        return fromValues(Stream.generate(() -> new ItemValue(kv.readItem())).limit(integer2));
+    public static Ingredient of(final Tag<Item> adf) {
+        return fromValues(Stream.<TagValue>of(new TagValue((Tag)adf)));
+    }
+    
+    public static Ingredient fromNetwork(final FriendlyByteBuf mg) {
+        final int integer2 = mg.readVarInt();
+        return fromValues(Stream.generate(() -> new ItemValue(mg.readItem())).limit(integer2));
     }
     
     public static Ingredient fromJson(@Nullable final JsonElement jsonElement) {
@@ -147,41 +147,40 @@ public final class Ingredient implements Predicate<ItemStack> {
         return fromValues(StreamSupport.<JsonElement>stream(jsonArray2.spliterator(), false).map(jsonElement -> valueFromJson(GsonHelper.convertToJsonObject(jsonElement, "item"))));
     }
     
-    public static Value valueFromJson(final JsonObject jsonObject) {
+    private static Value valueFromJson(final JsonObject jsonObject) {
         if (jsonObject.has("item") && jsonObject.has("tag")) {
             throw new JsonParseException("An ingredient entry is either a tag or an item, not both");
         }
         if (jsonObject.has("item")) {
-            final ResourceLocation sm2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "item"));
+            final ResourceLocation uh2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "item"));
             final Object o;
             final Object obj;
-            final Item bei3 = Registry.ITEM.getOptional(sm2).<Throwable>orElseThrow(() -> {
+            final Item bke3 = Registry.ITEM.getOptional(uh2).<Throwable>orElseThrow(() -> {
                 new JsonSyntaxException("Unknown item '" + obj + "'");
                 return o;
             });
-            return new ItemValue(new ItemStack(bei3));
+            return new ItemValue(new ItemStack(bke3));
         }
         if (!jsonObject.has("tag")) {
             throw new JsonParseException("An ingredient entry needs either a tag or an item");
         }
-        final ResourceLocation sm2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "tag"));
-        final Tag<Item> aaz3 = ItemTags.getAllTags().getTag(sm2);
-        if (aaz3 == null) {
-            throw new JsonSyntaxException("Unknown item tag '" + sm2 + "'");
+        final ResourceLocation uh2 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "tag"));
+        final Tag<Item> adf3 = SerializationTags.getInstance().getItems().getTag(uh2);
+        if (adf3 == null) {
+            throw new JsonSyntaxException("Unknown item tag '" + uh2 + "'");
         }
-        return new TagValue((Tag)aaz3);
+        return new TagValue((Tag)adf3);
     }
     
     static {
-        NON_ALL_EMPTY = (c -> !c.getItems().stream().allMatch(ItemStack::isEmpty));
         EMPTY = new Ingredient(Stream.empty());
     }
     
     static class ItemValue implements Value {
         private final ItemStack item;
         
-        private ItemValue(final ItemStack ben) {
-            this.item = ben;
+        private ItemValue(final ItemStack bki) {
+            this.item = bki;
         }
         
         @Override
@@ -200,15 +199,15 @@ public final class Ingredient implements Predicate<ItemStack> {
     static class TagValue implements Value {
         private final Tag<Item> tag;
         
-        private TagValue(final Tag<Item> aaz) {
-            this.tag = aaz;
+        private TagValue(final Tag<Item> adf) {
+            this.tag = adf;
         }
         
         @Override
         public Collection<ItemStack> getItems() {
             final List<ItemStack> list2 = Lists.newArrayList();
-            for (final Item bei4 : this.tag.getValues()) {
-                list2.add(new ItemStack(bei4));
+            for (final Item bke4 : this.tag.getValues()) {
+                list2.add(new ItemStack(bke4));
             }
             return list2;
         }
@@ -216,7 +215,7 @@ public final class Ingredient implements Predicate<ItemStack> {
         @Override
         public JsonObject serialize() {
             final JsonObject jsonObject2 = new JsonObject();
-            jsonObject2.addProperty("tag", this.tag.getId().toString());
+            jsonObject2.addProperty("tag", SerializationTags.getInstance().getItems().getIdOrThrow(this.tag).toString());
             return jsonObject2;
         }
     }
diff --git a/src/net/minecraft/world/item/crafting/MapCloningRecipe.java b/src/net/minecraft/world/item/crafting/MapCloningRecipe.java
index 7984357..24f23bb 100644
--- a/src/net/minecraft/world/item/crafting/MapCloningRecipe.java
+++ b/src/net/minecraft/world/item/crafting/MapCloningRecipe.java
@@ -8,61 +8,61 @@ import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.resources.ResourceLocation;
 
 public class MapCloningRecipe extends CustomRecipe {
-    public MapCloningRecipe(final ResourceLocation sm) {
-        super(sm);
+    public MapCloningRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
         int integer4 = 0;
-        ItemStack ben5 = ItemStack.EMPTY;
-        for (int integer5 = 0; integer5 < baz.getContainerSize(); ++integer5) {
-            final ItemStack ben6 = baz.getItem(integer5);
-            if (!ben6.isEmpty()) {
-                if (ben6.getItem() == Items.FILLED_MAP) {
-                    if (!ben5.isEmpty()) {
+        ItemStack bki5 = ItemStack.EMPTY;
+        for (int integer5 = 0; integer5 < bgu.getContainerSize(); ++integer5) {
+            final ItemStack bki6 = bgu.getItem(integer5);
+            if (!bki6.isEmpty()) {
+                if (bki6.getItem() == Items.FILLED_MAP) {
+                    if (!bki5.isEmpty()) {
                         return false;
                     }
-                    ben5 = ben6;
+                    bki5 = bki6;
                 }
                 else {
-                    if (ben6.getItem() != Items.MAP) {
+                    if (bki6.getItem() != Items.MAP) {
                         return false;
                     }
                     ++integer4;
                 }
             }
         }
-        return !ben5.isEmpty() && integer4 > 0;
+        return !bki5.isEmpty() && integer4 > 0;
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
+    public ItemStack assemble(final CraftingContainer bgu) {
         int integer3 = 0;
-        ItemStack ben4 = ItemStack.EMPTY;
-        for (int integer4 = 0; integer4 < baz.getContainerSize(); ++integer4) {
-            final ItemStack ben5 = baz.getItem(integer4);
-            if (!ben5.isEmpty()) {
-                if (ben5.getItem() == Items.FILLED_MAP) {
-                    if (!ben4.isEmpty()) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        for (int integer4 = 0; integer4 < bgu.getContainerSize(); ++integer4) {
+            final ItemStack bki5 = bgu.getItem(integer4);
+            if (!bki5.isEmpty()) {
+                if (bki5.getItem() == Items.FILLED_MAP) {
+                    if (!bki4.isEmpty()) {
                         return ItemStack.EMPTY;
                     }
-                    ben4 = ben5;
+                    bki4 = bki5;
                 }
                 else {
-                    if (ben5.getItem() != Items.MAP) {
+                    if (bki5.getItem() != Items.MAP) {
                         return ItemStack.EMPTY;
                     }
                     ++integer3;
                 }
             }
         }
-        if (ben4.isEmpty() || integer3 < 1) {
+        if (bki4.isEmpty() || integer3 < 1) {
             return ItemStack.EMPTY;
         }
-        final ItemStack ben6 = ben4.copy();
-        ben6.setCount(integer3 + 1);
-        return ben6;
+        final ItemStack bki6 = bki4.copy();
+        bki6.setCount(integer3 + 1);
+        return bki6;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/MapExtendingRecipe.java b/src/net/minecraft/world/item/crafting/MapExtendingRecipe.java
index 1dc224a..fc898b5 100644
--- a/src/net/minecraft/world/item/crafting/MapExtendingRecipe.java
+++ b/src/net/minecraft/world/item/crafting/MapExtendingRecipe.java
@@ -14,33 +14,33 @@ import net.minecraft.world.level.ItemLike;
 import net.minecraft.resources.ResourceLocation;
 
 public class MapExtendingRecipe extends ShapedRecipe {
-    public MapExtendingRecipe(final ResourceLocation sm) {
-        super(sm, "", 3, 3, NonNullList.<Ingredient>of(Ingredient.EMPTY, new Ingredient[] { Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER), Ingredient.of(Items.FILLED_MAP), Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER) }), new ItemStack(Items.MAP));
+    public MapExtendingRecipe(final ResourceLocation uh) {
+        super(uh, "", 3, 3, NonNullList.<Ingredient>of(Ingredient.EMPTY, new Ingredient[] { Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER), Ingredient.of(Items.FILLED_MAP), Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER), Ingredient.of(Items.PAPER) }), new ItemStack(Items.MAP));
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
-        if (!super.matches(baz, bjw)) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
+        if (!super.matches(bgu, bqb)) {
             return false;
         }
-        ItemStack ben4 = ItemStack.EMPTY;
-        for (int integer5 = 0; integer5 < baz.getContainerSize() && ben4.isEmpty(); ++integer5) {
-            final ItemStack ben5 = baz.getItem(integer5);
-            if (ben5.getItem() == Items.FILLED_MAP) {
-                ben4 = ben5;
+        ItemStack bki4 = ItemStack.EMPTY;
+        for (int integer5 = 0; integer5 < bgu.getContainerSize() && bki4.isEmpty(); ++integer5) {
+            final ItemStack bki5 = bgu.getItem(integer5);
+            if (bki5.getItem() == Items.FILLED_MAP) {
+                bki4 = bki5;
             }
         }
-        if (ben4.isEmpty()) {
+        if (bki4.isEmpty()) {
             return false;
         }
-        final MapItemSavedData crg5 = MapItem.getOrCreateSavedData(ben4, bjw);
-        return crg5 != null && !this.isExplorationMap(crg5) && crg5.scale < 4;
+        final MapItemSavedData czv5 = MapItem.getOrCreateSavedData(bki4, bqb);
+        return czv5 != null && !this.isExplorationMap(czv5) && czv5.scale < 4;
     }
     
-    private boolean isExplorationMap(final MapItemSavedData crg) {
-        if (crg.decorations != null) {
-            for (final MapDecoration crd4 : crg.decorations.values()) {
-                if (crd4.getType() == MapDecoration.Type.MANSION || crd4.getType() == MapDecoration.Type.MONUMENT) {
+    private boolean isExplorationMap(final MapItemSavedData czv) {
+        if (czv.decorations != null) {
+            for (final MapDecoration czs4 : czv.decorations.values()) {
+                if (czs4.getType() == MapDecoration.Type.MANSION || czs4.getType() == MapDecoration.Type.MONUMENT) {
                     return true;
                 }
             }
@@ -49,18 +49,18 @@ public class MapExtendingRecipe extends ShapedRecipe {
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
-        ItemStack ben3 = ItemStack.EMPTY;
-        for (int integer4 = 0; integer4 < baz.getContainerSize() && ben3.isEmpty(); ++integer4) {
-            final ItemStack ben4 = baz.getItem(integer4);
-            if (ben4.getItem() == Items.FILLED_MAP) {
-                ben3 = ben4;
+    public ItemStack assemble(final CraftingContainer bgu) {
+        ItemStack bki3 = ItemStack.EMPTY;
+        for (int integer4 = 0; integer4 < bgu.getContainerSize() && bki3.isEmpty(); ++integer4) {
+            final ItemStack bki4 = bgu.getItem(integer4);
+            if (bki4.getItem() == Items.FILLED_MAP) {
+                bki3 = bki4;
             }
         }
-        ben3 = ben3.copy();
-        ben3.setCount(1);
-        ben3.getOrCreateTag().putInt("map_scale_direction", 1);
-        return ben3;
+        bki3 = bki3.copy();
+        bki3.setCount(1);
+        bki3.getOrCreateTag().putInt("map_scale_direction", 1);
+        return bki3;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/Recipe.java b/src/net/minecraft/world/item/crafting/Recipe.java
index b20a980..1a2576b 100644
--- a/src/net/minecraft/world/item/crafting/Recipe.java
+++ b/src/net/minecraft/world/item/crafting/Recipe.java
@@ -10,23 +10,23 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.Container;
 
 public interface Recipe<C extends Container> {
-    boolean matches(final C aje, final Level bjw);
+    boolean matches(final C amz, final Level bqb);
     
-    ItemStack assemble(final C aje);
+    ItemStack assemble(final C amz);
     
     boolean canCraftInDimensions(final int integer1, final int integer2);
     
     ItemStack getResultItem();
     
-    default NonNullList<ItemStack> getRemainingItems(final C aje) {
-        final NonNullList<ItemStack> fy3 = NonNullList.<ItemStack>withSize(aje.getContainerSize(), ItemStack.EMPTY);
-        for (int integer4 = 0; integer4 < fy3.size(); ++integer4) {
-            final Item bei5 = aje.getItem(integer4).getItem();
-            if (bei5.hasCraftingRemainingItem()) {
-                fy3.set(integer4, new ItemStack(bei5.getCraftingRemainingItem()));
+    default NonNullList<ItemStack> getRemainingItems(final C amz) {
+        final NonNullList<ItemStack> gi3 = NonNullList.<ItemStack>withSize(amz.getContainerSize(), ItemStack.EMPTY);
+        for (int integer4 = 0; integer4 < gi3.size(); ++integer4) {
+            final Item bke5 = amz.getItem(integer4).getItem();
+            if (bke5.hasCraftingRemainingItem()) {
+                gi3.set(integer4, new ItemStack(bke5.getCraftingRemainingItem()));
             }
         }
-        return fy3;
+        return gi3;
     }
     
     default NonNullList<Ingredient> getIngredients() {
diff --git a/src/net/minecraft/world/item/crafting/RecipeManager.java b/src/net/minecraft/world/item/crafting/RecipeManager.java
index a8d0865..1c3d513 100644
--- a/src/net/minecraft/world/item/crafting/RecipeManager.java
+++ b/src/net/minecraft/world/item/crafting/RecipeManager.java
@@ -4,7 +4,7 @@ import org.apache.logging.log4j.LogManager;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import net.minecraft.core.Registry;
-import net.minecraft.util.GsonHelper;
+import com.google.gson.JsonObject;
 import java.util.stream.Stream;
 import java.util.Collection;
 import java.util.function.Predicate;
@@ -12,8 +12,8 @@ import java.util.Objects;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.NonNullList;
 import java.util.Collections;
-import java.util.stream.Collectors;
 import java.util.Comparator;
+import java.util.stream.Collectors;
 import java.util.List;
 import net.minecraft.Util;
 import java.util.Optional;
@@ -23,10 +23,11 @@ import java.util.Iterator;
 import java.util.stream.Collector;
 import java.util.function.Function;
 import com.google.gson.JsonParseException;
+import net.minecraft.util.GsonHelper;
 import com.google.common.collect.Maps;
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.server.packs.resources.ResourceManager;
-import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
@@ -46,51 +47,55 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
     }
     
     @Override
-    protected void apply(final Map<ResourceLocation, JsonObject> map, final ResourceManager zb, final ProfilerFiller aio) {
+    protected void apply(final Map<ResourceLocation, JsonElement> map, final ResourceManager abc, final ProfilerFiller ami) {
         this.hasErrors = false;
         final Map<RecipeType<?>, ImmutableMap.Builder<ResourceLocation, Recipe<?>>> map2 = Maps.newHashMap();
-        for (final Map.Entry<ResourceLocation, JsonObject> entry2 : map.entrySet()) {
-            final ResourceLocation sm8 = entry2.getKey();
+        for (final Map.Entry<ResourceLocation, JsonElement> entry2 : map.entrySet()) {
+            final ResourceLocation uh8 = entry2.getKey();
             try {
-                final Recipe<?> bgw9 = fromJson(sm8, entry2.getValue());
-                map2.computeIfAbsent(bgw9.getType(), bgz -> ImmutableMap.builder()).put(sm8, bgw9);
+                final Recipe<?> bmu9 = fromJson(uh8, GsonHelper.convertToJsonObject(entry2.getValue(), "top element"));
+                map2.computeIfAbsent(bmu9.getType(), bmx -> ImmutableMap.builder()).put(uh8, bmu9);
             }
             catch (JsonParseException | IllegalArgumentException ex2) {
                 final RuntimeException ex;
                 final RuntimeException runtimeException9 = ex;
-                RecipeManager.LOGGER.error("Parsing error loading recipe {}", sm8, runtimeException9);
+                RecipeManager.LOGGER.error("Parsing error loading recipe {}", uh8, runtimeException9);
             }
         }
         this.recipes = map2.entrySet().stream().collect(ImmutableMap.toImmutableMap(Map.Entry::getKey, entry -> entry.getValue().build()));
         RecipeManager.LOGGER.info("Loaded {} recipes", map2.size());
     }
     
-    public <C extends Container, T extends Recipe<C>> Optional<T> getRecipeFor(final RecipeType<T> bgz, final C aje, final Level bjw) {
-        return this.<Container, T>byType(bgz).values().stream().<T>flatMap(bgw -> Util.toStream(bgz.<C>tryMatch(bgw, bjw, aje))).findFirst();
+    public <C extends Container, T extends Recipe<C>> Optional<T> getRecipeFor(final RecipeType<T> bmx, final C amz, final Level bqb) {
+        return this.<Container, T>byType(bmx).values().stream().<T>flatMap(bmu -> Util.toStream(bmx.<C>tryMatch(bmu, bqb, amz))).findFirst();
     }
     
-    public <C extends Container, T extends Recipe<C>> List<T> getRecipesFor(final RecipeType<T> bgz, final C aje, final Level bjw) {
-        return this.<Container, T>byType(bgz).values().stream().flatMap(bgw -> Util.toStream(bgz.<C>tryMatch(bgw, bjw, aje))).sorted(Comparator.comparing(bgw -> bgw.getResultItem().getDescriptionId())).collect(Collectors.toList());
+    public <C extends Container, T extends Recipe<C>> List<T> getAllRecipesFor(final RecipeType<T> bmx) {
+        return this.<Container, T>byType(bmx).values().stream().map(bmu -> bmu).collect(Collectors.toList());
     }
     
-    private <C extends Container, T extends Recipe<C>> Map<ResourceLocation, Recipe<C>> byType(final RecipeType<T> bgz) {
-        return (Map<ResourceLocation, Recipe<C>>)this.recipes.getOrDefault(bgz, Collections.<ResourceLocation, Recipe<?>>emptyMap());
+    public <C extends Container, T extends Recipe<C>> List<T> getRecipesFor(final RecipeType<T> bmx, final C amz, final Level bqb) {
+        return this.<Container, T>byType(bmx).values().stream().flatMap(bmu -> Util.toStream(bmx.<C>tryMatch(bmu, bqb, amz))).sorted(Comparator.comparing(bmu -> bmu.getResultItem().getDescriptionId())).collect(Collectors.toList());
     }
     
-    public <C extends Container, T extends Recipe<C>> NonNullList<ItemStack> getRemainingItemsFor(final RecipeType<T> bgz, final C aje, final Level bjw) {
-        final Optional<T> optional5 = this.<C, T>getRecipeFor(bgz, aje, bjw);
+    private <C extends Container, T extends Recipe<C>> Map<ResourceLocation, Recipe<C>> byType(final RecipeType<T> bmx) {
+        return (Map<ResourceLocation, Recipe<C>>)this.recipes.getOrDefault(bmx, Collections.<ResourceLocation, Recipe<?>>emptyMap());
+    }
+    
+    public <C extends Container, T extends Recipe<C>> NonNullList<ItemStack> getRemainingItemsFor(final RecipeType<T> bmx, final C amz, final Level bqb) {
+        final Optional<T> optional5 = this.<C, T>getRecipeFor(bmx, amz, bqb);
         if (optional5.isPresent()) {
-            return optional5.get().getRemainingItems(aje);
+            return optional5.get().getRemainingItems(amz);
         }
-        final NonNullList<ItemStack> fy6 = NonNullList.<ItemStack>withSize(aje.getContainerSize(), ItemStack.EMPTY);
-        for (int integer7 = 0; integer7 < fy6.size(); ++integer7) {
-            fy6.set(integer7, aje.getItem(integer7));
+        final NonNullList<ItemStack> gi6 = NonNullList.<ItemStack>withSize(amz.getContainerSize(), ItemStack.EMPTY);
+        for (int integer7 = 0; integer7 < gi6.size(); ++integer7) {
+            gi6.set(integer7, amz.getItem(integer7));
         }
-        return fy6;
+        return gi6;
     }
     
-    public Optional<? extends Recipe<?>> byKey(final ResourceLocation sm) {
-        return this.recipes.values().stream().map(map -> map.get(sm)).filter(Objects::nonNull).findFirst();
+    public Optional<? extends Recipe<?>> byKey(final ResourceLocation uh) {
+        return this.recipes.values().stream().map(map -> map.get(uh)).filter(Objects::nonNull).findFirst();
     }
     
     public Collection<Recipe<?>> getRecipes() {
@@ -101,14 +106,14 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
         return this.recipes.values().stream().<ResourceLocation>flatMap(map -> map.keySet().stream());
     }
     
-    public static Recipe<?> fromJson(final ResourceLocation sm, final JsonObject jsonObject) {
+    public static Recipe<?> fromJson(final ResourceLocation uh, final JsonObject jsonObject) {
         final String string3 = GsonHelper.getAsString(jsonObject, "type");
         final Object o;
         final String str;
         return Registry.RECIPE_SERIALIZER.getOptional(new ResourceLocation(string3)).<Throwable>orElseThrow(() -> {
             new JsonSyntaxException("Invalid or unsupported recipe type '" + str + "'");
             return o;
-        }).fromJson(sm, jsonObject);
+        }).fromJson(uh, jsonObject);
     }
     
     public void replaceRecipes(final Iterable<Recipe<?>> iterable) {
@@ -123,7 +128,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
         //     8: astore_2        /* map3 */
         //     9: aload_1         /* iterable */
         //    10: aload_2         /* map3 */
-        //    11: invokedynamic   BootstrapMethod #11, accept:(Ljava/util/Map;)Ljava/util/function/Consumer;
+        //    11: invokedynamic   BootstrapMethod #12, accept:(Ljava/util/Map;)Ljava/util/function/Consumer;
         //    16: invokeinterface java/lang/Iterable.forEach:(Ljava/util/function/Consumer;)V
         //    21: aload_0         /* this */
         //    22: aload_2         /* map3 */
diff --git a/src/net/minecraft/world/item/crafting/RecipeSerializer.java b/src/net/minecraft/world/item/crafting/RecipeSerializer.java
index 254e02a..65619be 100644
--- a/src/net/minecraft/world/item/crafting/RecipeSerializer.java
+++ b/src/net/minecraft/world/item/crafting/RecipeSerializer.java
@@ -26,14 +26,15 @@ public interface RecipeSerializer<T extends Recipe<?>> {
     public static final SimpleCookingSerializer<SmokingRecipe> SMOKING_RECIPE = RecipeSerializer.<SimpleCookingSerializer<SmokingRecipe>, Recipe>register("smoking", new SimpleCookingSerializer<SmokingRecipe>(SmokingRecipe::new, 100));
     public static final SimpleCookingSerializer<CampfireCookingRecipe> CAMPFIRE_COOKING_RECIPE = RecipeSerializer.<SimpleCookingSerializer<CampfireCookingRecipe>, Recipe>register("campfire_cooking", new SimpleCookingSerializer<CampfireCookingRecipe>(CampfireCookingRecipe::new, 100));
     public static final RecipeSerializer<StonecutterRecipe> STONECUTTER = RecipeSerializer.<SingleItemRecipe.Serializer<StonecutterRecipe>, Recipe>register("stonecutting", new SingleItemRecipe.Serializer<StonecutterRecipe>(StonecutterRecipe::new));
+    public static final RecipeSerializer<UpgradeRecipe> SMITHING = RecipeSerializer.<UpgradeRecipe.Serializer, Recipe>register("smithing", new UpgradeRecipe.Serializer());
     
-    T fromJson(final ResourceLocation sm, final JsonObject jsonObject);
+    T fromJson(final ResourceLocation uh, final JsonObject jsonObject);
     
-    T fromNetwork(final ResourceLocation sm, final FriendlyByteBuf kv);
+    T fromNetwork(final ResourceLocation uh, final FriendlyByteBuf mg);
     
-    void toNetwork(final FriendlyByteBuf kv, final T bgw);
+    void toNetwork(final FriendlyByteBuf mg, final T bmu);
     
-    default <S extends RecipeSerializer<T>, T extends Recipe<?>> S register(final String string, final S bgy) {
-        return Registry.<S>register(Registry.RECIPE_SERIALIZER, string, bgy);
+    default <S extends RecipeSerializer<T>, T extends Recipe<?>> S register(final String string, final S bmw) {
+        return Registry.<S>register(Registry.RECIPE_SERIALIZER, string, bmw);
     }
 }
diff --git a/src/net/minecraft/world/item/crafting/RecipeType.java b/src/net/minecraft/world/item/crafting/RecipeType.java
index 0798f9a..02016cf 100644
--- a/src/net/minecraft/world/item/crafting/RecipeType.java
+++ b/src/net/minecraft/world/item/crafting/RecipeType.java
@@ -13,6 +13,7 @@ public interface RecipeType<T extends Recipe<?>> {
     public static final RecipeType<SmokingRecipe> SMOKING = RecipeType.<SmokingRecipe>register("smoking");
     public static final RecipeType<CampfireCookingRecipe> CAMPFIRE_COOKING = RecipeType.<CampfireCookingRecipe>register("campfire_cooking");
     public static final RecipeType<StonecutterRecipe> STONECUTTING = RecipeType.<StonecutterRecipe>register("stonecutting");
+    public static final RecipeType<UpgradeRecipe> SMITHING = RecipeType.<UpgradeRecipe>register("smithing");
     
     default <T extends Recipe<?>> RecipeType<T> register(final String string) {
         return Registry.register(Registry.RECIPE_TYPE, new ResourceLocation(string), new RecipeType<T>() {
@@ -23,7 +24,7 @@ public interface RecipeType<T extends Recipe<?>> {
         });
     }
     
-    default <C extends Container> Optional<T> tryMatch(final Recipe<C> bgw, final Level bjw, final C aje) {
-        return (Optional<T>)(bgw.matches(aje, bjw) ? Optional.<Recipe<C>>of(bgw) : Optional.<Recipe<C>>empty());
+    default <C extends Container> Optional<T> tryMatch(final Recipe<C> bmu, final Level bqb, final C amz) {
+        return (Optional<T>)(bmu.matches(amz, bqb) ? Optional.<Recipe<C>>of(bmu) : Optional.<Recipe<C>>empty());
     }
 }
diff --git a/src/net/minecraft/world/item/crafting/RepairItemRecipe.java b/src/net/minecraft/world/item/crafting/RepairItemRecipe.java
index 926fdf9..71c608f 100644
--- a/src/net/minecraft/world/item/crafting/RepairItemRecipe.java
+++ b/src/net/minecraft/world/item/crafting/RepairItemRecipe.java
@@ -1,7 +1,12 @@
 package net.minecraft.world.item.crafting;
 
 import net.minecraft.world.Container;
+import java.util.Map;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.core.Registry;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
+import com.google.common.collect.Maps;
 import net.minecraft.world.level.ItemLike;
 import java.util.List;
 import net.minecraft.world.item.ItemStack;
@@ -11,20 +16,20 @@ import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.resources.ResourceLocation;
 
 public class RepairItemRecipe extends CustomRecipe {
-    public RepairItemRecipe(final ResourceLocation sm) {
-        super(sm);
+    public RepairItemRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
         final List<ItemStack> list4 = Lists.newArrayList();
-        for (int integer5 = 0; integer5 < baz.getContainerSize(); ++integer5) {
-            final ItemStack ben6 = baz.getItem(integer5);
-            if (!ben6.isEmpty()) {
-                list4.add(ben6);
+        for (int integer5 = 0; integer5 < bgu.getContainerSize(); ++integer5) {
+            final ItemStack bki6 = bgu.getItem(integer5);
+            if (!bki6.isEmpty()) {
+                list4.add(bki6);
                 if (list4.size() > 1) {
-                    final ItemStack ben7 = list4.get(0);
-                    if (ben6.getItem() != ben7.getItem() || ben7.getCount() != 1 || ben6.getCount() != 1 || !ben7.getItem().canBeDepleted()) {
+                    final ItemStack bki7 = list4.get(0);
+                    if (bki6.getItem() != bki7.getItem() || bki7.getCount() != 1 || bki6.getCount() != 1 || !bki7.getItem().canBeDepleted()) {
                         return false;
                     }
                 }
@@ -34,35 +39,52 @@ public class RepairItemRecipe extends CustomRecipe {
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
+    public ItemStack assemble(final CraftingContainer bgu) {
         final List<ItemStack> list3 = Lists.newArrayList();
-        for (int integer4 = 0; integer4 < baz.getContainerSize(); ++integer4) {
-            final ItemStack ben5 = baz.getItem(integer4);
-            if (!ben5.isEmpty()) {
-                list3.add(ben5);
+        for (int integer4 = 0; integer4 < bgu.getContainerSize(); ++integer4) {
+            final ItemStack bki5 = bgu.getItem(integer4);
+            if (!bki5.isEmpty()) {
+                list3.add(bki5);
                 if (list3.size() > 1) {
-                    final ItemStack ben6 = list3.get(0);
-                    if (ben5.getItem() != ben6.getItem() || ben6.getCount() != 1 || ben5.getCount() != 1 || !ben6.getItem().canBeDepleted()) {
+                    final ItemStack bki6 = list3.get(0);
+                    if (bki5.getItem() != bki6.getItem() || bki6.getCount() != 1 || bki5.getCount() != 1 || !bki6.getItem().canBeDepleted()) {
                         return ItemStack.EMPTY;
                     }
                 }
             }
         }
         if (list3.size() == 2) {
-            final ItemStack ben7 = list3.get(0);
-            final ItemStack ben5 = list3.get(1);
-            if (ben7.getItem() == ben5.getItem() && ben7.getCount() == 1 && ben5.getCount() == 1 && ben7.getItem().canBeDepleted()) {
-                final Item bei6 = ben7.getItem();
-                final int integer5 = bei6.getMaxDamage() - ben7.getDamageValue();
-                final int integer6 = bei6.getMaxDamage() - ben5.getDamageValue();
-                final int integer7 = integer5 + integer6 + bei6.getMaxDamage() * 5 / 100;
-                int integer8 = bei6.getMaxDamage() - integer7;
+            final ItemStack bki7 = list3.get(0);
+            final ItemStack bki5 = list3.get(1);
+            if (bki7.getItem() == bki5.getItem() && bki7.getCount() == 1 && bki5.getCount() == 1 && bki7.getItem().canBeDepleted()) {
+                final Item bke6 = bki7.getItem();
+                final int integer5 = bke6.getMaxDamage() - bki7.getDamageValue();
+                final int integer6 = bke6.getMaxDamage() - bki5.getDamageValue();
+                final int integer7 = integer5 + integer6 + bke6.getMaxDamage() * 5 / 100;
+                int integer8 = bke6.getMaxDamage() - integer7;
                 if (integer8 < 0) {
                     integer8 = 0;
                 }
-                final ItemStack ben8 = new ItemStack(ben7.getItem());
-                ben8.setDamageValue(integer8);
-                return ben8;
+                final ItemStack bki8 = new ItemStack(bki7.getItem());
+                bki8.setDamageValue(integer8);
+                final Map<Enchantment, Integer> map12 = Maps.newHashMap();
+                final Map<Enchantment, Integer> map13 = EnchantmentHelper.getEnchantments(bki7);
+                final Map<Enchantment, Integer> map14 = EnchantmentHelper.getEnchantments(bki5);
+                final Map<K, Integer> map15;
+                final Map<K, Integer> map16;
+                final int integer9;
+                final Map<Enchantment, Integer> map17;
+                Registry.ENCHANTMENT.stream().filter(Enchantment::isCurse).forEach(bnw -> {
+                    integer9 = Math.max(map15.getOrDefault(bnw, 0), map16.getOrDefault(bnw, 0));
+                    if (integer9 > 0) {
+                        map17.put(bnw, integer9);
+                    }
+                    return;
+                });
+                if (!map12.isEmpty()) {
+                    EnchantmentHelper.setEnchantments(map12, bki8);
+                }
+                return bki8;
             }
         }
         return ItemStack.EMPTY;
diff --git a/src/net/minecraft/world/item/crafting/ShapedRecipe.java b/src/net/minecraft/world/item/crafting/ShapedRecipe.java
index cb4f750..9f37934 100644
--- a/src/net/minecraft/world/item/crafting/ShapedRecipe.java
+++ b/src/net/minecraft/world/item/crafting/ShapedRecipe.java
@@ -31,13 +31,13 @@ public class ShapedRecipe implements CraftingRecipe {
     private final ResourceLocation id;
     private final String group;
     
-    public ShapedRecipe(final ResourceLocation sm, final String string, final int integer3, final int integer4, final NonNullList<Ingredient> fy, final ItemStack ben) {
-        this.id = sm;
+    public ShapedRecipe(final ResourceLocation uh, final String string, final int integer3, final int integer4, final NonNullList<Ingredient> gi, final ItemStack bki) {
+        this.id = uh;
         this.group = string;
         this.width = integer3;
         this.height = integer4;
-        this.recipeItems = fy;
-        this.result = ben;
+        this.recipeItems = gi;
+        this.result = bki;
     }
     
     @Override
@@ -71,13 +71,13 @@ public class ShapedRecipe implements CraftingRecipe {
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
-        for (int integer4 = 0; integer4 <= baz.getWidth() - this.width; ++integer4) {
-            for (int integer5 = 0; integer5 <= baz.getHeight() - this.height; ++integer5) {
-                if (this.matches(baz, integer4, integer5, true)) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
+        for (int integer4 = 0; integer4 <= bgu.getWidth() - this.width; ++integer4) {
+            for (int integer5 = 0; integer5 <= bgu.getHeight() - this.height; ++integer5) {
+                if (this.matches(bgu, integer4, integer5, true)) {
                     return true;
                 }
-                if (this.matches(baz, integer4, integer5, false)) {
+                if (this.matches(bgu, integer4, integer5, false)) {
                     return true;
                 }
             }
@@ -85,21 +85,21 @@ public class ShapedRecipe implements CraftingRecipe {
         return false;
     }
     
-    private boolean matches(final CraftingContainer baz, final int integer2, final int integer3, final boolean boolean4) {
-        for (int integer4 = 0; integer4 < baz.getWidth(); ++integer4) {
-            for (int integer5 = 0; integer5 < baz.getHeight(); ++integer5) {
+    private boolean matches(final CraftingContainer bgu, final int integer2, final int integer3, final boolean boolean4) {
+        for (int integer4 = 0; integer4 < bgu.getWidth(); ++integer4) {
+            for (int integer5 = 0; integer5 < bgu.getHeight(); ++integer5) {
                 final int integer6 = integer4 - integer2;
                 final int integer7 = integer5 - integer3;
-                Ingredient bgt10 = Ingredient.EMPTY;
+                Ingredient bmr10 = Ingredient.EMPTY;
                 if (integer6 >= 0 && integer7 >= 0 && integer6 < this.width && integer7 < this.height) {
                     if (boolean4) {
-                        bgt10 = this.recipeItems.get(this.width - integer6 - 1 + integer7 * this.width);
+                        bmr10 = this.recipeItems.get(this.width - integer6 - 1 + integer7 * this.width);
                     }
                     else {
-                        bgt10 = this.recipeItems.get(integer6 + integer7 * this.width);
+                        bmr10 = this.recipeItems.get(integer6 + integer7 * this.width);
                     }
                 }
-                if (!bgt10.test(baz.getItem(integer4 + integer5 * baz.getWidth()))) {
+                if (!bmr10.test(bgu.getItem(integer4 + integer5 * bgu.getWidth()))) {
                     return false;
                 }
             }
@@ -108,7 +108,7 @@ public class ShapedRecipe implements CraftingRecipe {
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
+    public ItemStack assemble(final CraftingContainer bgu) {
         return this.getResultItem().copy();
     }
     
@@ -121,24 +121,24 @@ public class ShapedRecipe implements CraftingRecipe {
     }
     
     private static NonNullList<Ingredient> dissolvePattern(final String[] arr, final Map<String, Ingredient> map, final int integer3, final int integer4) {
-        final NonNullList<Ingredient> fy5 = NonNullList.<Ingredient>withSize(integer3 * integer4, Ingredient.EMPTY);
+        final NonNullList<Ingredient> gi5 = NonNullList.<Ingredient>withSize(integer3 * integer4, Ingredient.EMPTY);
         final Set<String> set6 = Sets.newHashSet(map.keySet());
         set6.remove(" ");
         for (int integer5 = 0; integer5 < arr.length; ++integer5) {
             for (int integer6 = 0; integer6 < arr[integer5].length(); ++integer6) {
                 final String string9 = arr[integer5].substring(integer6, integer6 + 1);
-                final Ingredient bgt10 = map.get(string9);
-                if (bgt10 == null) {
+                final Ingredient bmr10 = map.get(string9);
+                if (bmr10 == null) {
                     throw new JsonSyntaxException("Pattern references symbol '" + string9 + "' but it's not defined in the key");
                 }
                 set6.remove(string9);
-                fy5.set(integer6 + integer3 * integer5, bgt10);
+                gi5.set(integer6 + integer3 * integer5, bmr10);
             }
         }
         if (!set6.isEmpty()) {
             throw new JsonSyntaxException("Key defines symbols that aren't used in pattern: " + set6);
         }
-        return fy5;
+        return gi5;
     }
     
     @VisibleForTesting
@@ -224,7 +224,7 @@ public class ShapedRecipe implements CraftingRecipe {
         final String string2 = GsonHelper.getAsString(jsonObject, "item");
         final Object o;
         final String str;
-        final Item bei3 = Registry.ITEM.getOptional(new ResourceLocation(string2)).<Throwable>orElseThrow(() -> {
+        final Item bke3 = Registry.ITEM.getOptional(new ResourceLocation(string2)).<Throwable>orElseThrow(() -> {
             new JsonSyntaxException("Unknown item '" + str + "'");
             return o;
         });
@@ -232,44 +232,44 @@ public class ShapedRecipe implements CraftingRecipe {
             throw new JsonParseException("Disallowed data tag found");
         }
         final int integer4 = GsonHelper.getAsInt(jsonObject, "count", 1);
-        return new ItemStack(bei3, integer4);
+        return new ItemStack(bke3, integer4);
     }
     
     public static class Serializer implements RecipeSerializer<ShapedRecipe> {
         @Override
-        public ShapedRecipe fromJson(final ResourceLocation sm, final JsonObject jsonObject) {
+        public ShapedRecipe fromJson(final ResourceLocation uh, final JsonObject jsonObject) {
             final String string4 = GsonHelper.getAsString(jsonObject, "group", "");
             final Map<String, Ingredient> map5 = keyFromJson(GsonHelper.getAsJsonObject(jsonObject, "key"));
             final String[] arr6 = ShapedRecipe.shrink(patternFromJson(GsonHelper.getAsJsonArray(jsonObject, "pattern")));
             final int integer7 = arr6[0].length();
             final int integer8 = arr6.length;
-            final NonNullList<Ingredient> fy9 = dissolvePattern(arr6, map5, integer7, integer8);
-            final ItemStack ben10 = ShapedRecipe.itemFromJson(GsonHelper.getAsJsonObject(jsonObject, "result"));
-            return new ShapedRecipe(sm, string4, integer7, integer8, fy9, ben10);
+            final NonNullList<Ingredient> gi9 = dissolvePattern(arr6, map5, integer7, integer8);
+            final ItemStack bki10 = ShapedRecipe.itemFromJson(GsonHelper.getAsJsonObject(jsonObject, "result"));
+            return new ShapedRecipe(uh, string4, integer7, integer8, gi9, bki10);
         }
         
         @Override
-        public ShapedRecipe fromNetwork(final ResourceLocation sm, final FriendlyByteBuf kv) {
-            final int integer4 = kv.readVarInt();
-            final int integer5 = kv.readVarInt();
-            final String string6 = kv.readUtf(32767);
-            final NonNullList<Ingredient> fy7 = NonNullList.<Ingredient>withSize(integer4 * integer5, Ingredient.EMPTY);
-            for (int integer6 = 0; integer6 < fy7.size(); ++integer6) {
-                fy7.set(integer6, Ingredient.fromNetwork(kv));
+        public ShapedRecipe fromNetwork(final ResourceLocation uh, final FriendlyByteBuf mg) {
+            final int integer4 = mg.readVarInt();
+            final int integer5 = mg.readVarInt();
+            final String string6 = mg.readUtf(32767);
+            final NonNullList<Ingredient> gi7 = NonNullList.<Ingredient>withSize(integer4 * integer5, Ingredient.EMPTY);
+            for (int integer6 = 0; integer6 < gi7.size(); ++integer6) {
+                gi7.set(integer6, Ingredient.fromNetwork(mg));
             }
-            final ItemStack ben8 = kv.readItem();
-            return new ShapedRecipe(sm, string6, integer4, integer5, fy7, ben8);
+            final ItemStack bki8 = mg.readItem();
+            return new ShapedRecipe(uh, string6, integer4, integer5, gi7, bki8);
         }
         
         @Override
-        public void toNetwork(final FriendlyByteBuf kv, final ShapedRecipe bhb) {
-            kv.writeVarInt(bhb.width);
-            kv.writeVarInt(bhb.height);
-            kv.writeUtf(bhb.group);
-            for (final Ingredient bgt5 : bhb.recipeItems) {
-                bgt5.toNetwork(kv);
+        public void toNetwork(final FriendlyByteBuf mg, final ShapedRecipe bmz) {
+            mg.writeVarInt(bmz.width);
+            mg.writeVarInt(bmz.height);
+            mg.writeUtf(bmz.group);
+            for (final Ingredient bmr5 : bmz.recipeItems) {
+                bmr5.toNetwork(mg);
             }
-            kv.writeItem(bhb.result);
+            mg.writeItem(bmz.result);
         }
     }
 }
diff --git a/src/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/net/minecraft/world/item/crafting/ShapelessRecipe.java
index dacc986..65f2119 100644
--- a/src/net/minecraft/world/item/crafting/ShapelessRecipe.java
+++ b/src/net/minecraft/world/item/crafting/ShapelessRecipe.java
@@ -21,11 +21,11 @@ public class ShapelessRecipe implements CraftingRecipe {
     private final ItemStack result;
     private final NonNullList<Ingredient> ingredients;
     
-    public ShapelessRecipe(final ResourceLocation sm, final String string, final ItemStack ben, final NonNullList<Ingredient> fy) {
-        this.id = sm;
+    public ShapelessRecipe(final ResourceLocation uh, final String string, final ItemStack bki, final NonNullList<Ingredient> gi) {
+        this.id = uh;
         this.group = string;
-        this.result = ben;
-        this.ingredients = fy;
+        this.result = bki;
+        this.ingredients = gi;
     }
     
     @Override
@@ -54,21 +54,21 @@ public class ShapelessRecipe implements CraftingRecipe {
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
-        final StackedContents ayl4 = new StackedContents();
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
+        final StackedContents bee4 = new StackedContents();
         int integer5 = 0;
-        for (int integer6 = 0; integer6 < baz.getContainerSize(); ++integer6) {
-            final ItemStack ben7 = baz.getItem(integer6);
-            if (!ben7.isEmpty()) {
+        for (int integer6 = 0; integer6 < bgu.getContainerSize(); ++integer6) {
+            final ItemStack bki7 = bgu.getItem(integer6);
+            if (!bki7.isEmpty()) {
                 ++integer5;
-                ayl4.accountStack(ben7, 1);
+                bee4.accountStack(bki7, 1);
             }
         }
-        return integer5 == this.ingredients.size() && ayl4.canCraft(this, null);
+        return integer5 == this.ingredients.size() && bee4.canCraft(this, null);
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
+    public ItemStack assemble(final CraftingContainer bgu) {
         return this.result.copy();
     }
     
@@ -79,50 +79,50 @@ public class ShapelessRecipe implements CraftingRecipe {
     
     public static class Serializer implements RecipeSerializer<ShapelessRecipe> {
         @Override
-        public ShapelessRecipe fromJson(final ResourceLocation sm, final JsonObject jsonObject) {
+        public ShapelessRecipe fromJson(final ResourceLocation uh, final JsonObject jsonObject) {
             final String string4 = GsonHelper.getAsString(jsonObject, "group", "");
-            final NonNullList<Ingredient> fy5 = itemsFromJson(GsonHelper.getAsJsonArray(jsonObject, "ingredients"));
-            if (fy5.isEmpty()) {
+            final NonNullList<Ingredient> gi5 = itemsFromJson(GsonHelper.getAsJsonArray(jsonObject, "ingredients"));
+            if (gi5.isEmpty()) {
                 throw new JsonParseException("No ingredients for shapeless recipe");
             }
-            if (fy5.size() > 9) {
+            if (gi5.size() > 9) {
                 throw new JsonParseException("Too many ingredients for shapeless recipe");
             }
-            final ItemStack ben6 = ShapedRecipe.itemFromJson(GsonHelper.getAsJsonObject(jsonObject, "result"));
-            return new ShapelessRecipe(sm, string4, ben6, fy5);
+            final ItemStack bki6 = ShapedRecipe.itemFromJson(GsonHelper.getAsJsonObject(jsonObject, "result"));
+            return new ShapelessRecipe(uh, string4, bki6, gi5);
         }
         
         private static NonNullList<Ingredient> itemsFromJson(final JsonArray jsonArray) {
-            final NonNullList<Ingredient> fy2 = NonNullList.<Ingredient>create();
+            final NonNullList<Ingredient> gi2 = NonNullList.<Ingredient>create();
             for (int integer3 = 0; integer3 < jsonArray.size(); ++integer3) {
-                final Ingredient bgt4 = Ingredient.fromJson(jsonArray.get(integer3));
-                if (!bgt4.isEmpty()) {
-                    fy2.add(bgt4);
+                final Ingredient bmr4 = Ingredient.fromJson(jsonArray.get(integer3));
+                if (!bmr4.isEmpty()) {
+                    gi2.add(bmr4);
                 }
             }
-            return fy2;
+            return gi2;
         }
         
         @Override
-        public ShapelessRecipe fromNetwork(final ResourceLocation sm, final FriendlyByteBuf kv) {
-            final String string4 = kv.readUtf(32767);
-            final int integer5 = kv.readVarInt();
-            final NonNullList<Ingredient> fy6 = NonNullList.<Ingredient>withSize(integer5, Ingredient.EMPTY);
-            for (int integer6 = 0; integer6 < fy6.size(); ++integer6) {
-                fy6.set(integer6, Ingredient.fromNetwork(kv));
+        public ShapelessRecipe fromNetwork(final ResourceLocation uh, final FriendlyByteBuf mg) {
+            final String string4 = mg.readUtf(32767);
+            final int integer5 = mg.readVarInt();
+            final NonNullList<Ingredient> gi6 = NonNullList.<Ingredient>withSize(integer5, Ingredient.EMPTY);
+            for (int integer6 = 0; integer6 < gi6.size(); ++integer6) {
+                gi6.set(integer6, Ingredient.fromNetwork(mg));
             }
-            final ItemStack ben7 = kv.readItem();
-            return new ShapelessRecipe(sm, string4, ben7, fy6);
+            final ItemStack bki7 = mg.readItem();
+            return new ShapelessRecipe(uh, string4, bki7, gi6);
         }
         
         @Override
-        public void toNetwork(final FriendlyByteBuf kv, final ShapelessRecipe bhc) {
-            kv.writeUtf(bhc.group);
-            kv.writeVarInt(bhc.ingredients.size());
-            for (final Ingredient bgt5 : bhc.ingredients) {
-                bgt5.toNetwork(kv);
+        public void toNetwork(final FriendlyByteBuf mg, final ShapelessRecipe bna) {
+            mg.writeUtf(bna.group);
+            mg.writeVarInt(bna.ingredients.size());
+            for (final Ingredient bmr5 : bna.ingredients) {
+                bmr5.toNetwork(mg);
             }
-            kv.writeItem(bhc.result);
+            mg.writeItem(bna.result);
         }
     }
 }
diff --git a/src/net/minecraft/world/item/crafting/ShieldDecorationRecipe.java b/src/net/minecraft/world/item/crafting/ShieldDecorationRecipe.java
index a3c8953..8658d33 100644
--- a/src/net/minecraft/world/item/crafting/ShieldDecorationRecipe.java
+++ b/src/net/minecraft/world/item/crafting/ShieldDecorationRecipe.java
@@ -11,63 +11,63 @@ import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.resources.ResourceLocation;
 
 public class ShieldDecorationRecipe extends CustomRecipe {
-    public ShieldDecorationRecipe(final ResourceLocation sm) {
-        super(sm);
+    public ShieldDecorationRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
-        ItemStack ben4 = ItemStack.EMPTY;
-        ItemStack ben5 = ItemStack.EMPTY;
-        for (int integer6 = 0; integer6 < baz.getContainerSize(); ++integer6) {
-            final ItemStack ben6 = baz.getItem(integer6);
-            if (!ben6.isEmpty()) {
-                if (ben6.getItem() instanceof BannerItem) {
-                    if (!ben5.isEmpty()) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
+        ItemStack bki4 = ItemStack.EMPTY;
+        ItemStack bki5 = ItemStack.EMPTY;
+        for (int integer6 = 0; integer6 < bgu.getContainerSize(); ++integer6) {
+            final ItemStack bki6 = bgu.getItem(integer6);
+            if (!bki6.isEmpty()) {
+                if (bki6.getItem() instanceof BannerItem) {
+                    if (!bki5.isEmpty()) {
                         return false;
                     }
-                    ben5 = ben6;
+                    bki5 = bki6;
                 }
                 else {
-                    if (ben6.getItem() != Items.SHIELD) {
+                    if (bki6.getItem() != Items.SHIELD) {
                         return false;
                     }
-                    if (!ben4.isEmpty()) {
+                    if (!bki4.isEmpty()) {
                         return false;
                     }
-                    if (ben6.getTagElement("BlockEntityTag") != null) {
+                    if (bki6.getTagElement("BlockEntityTag") != null) {
                         return false;
                     }
-                    ben4 = ben6;
+                    bki4 = bki6;
                 }
             }
         }
-        return !ben4.isEmpty() && !ben5.isEmpty();
+        return !bki4.isEmpty() && !bki5.isEmpty();
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
-        ItemStack ben3 = ItemStack.EMPTY;
-        ItemStack ben4 = ItemStack.EMPTY;
-        for (int integer5 = 0; integer5 < baz.getContainerSize(); ++integer5) {
-            final ItemStack ben5 = baz.getItem(integer5);
-            if (!ben5.isEmpty()) {
-                if (ben5.getItem() instanceof BannerItem) {
-                    ben3 = ben5;
+    public ItemStack assemble(final CraftingContainer bgu) {
+        ItemStack bki3 = ItemStack.EMPTY;
+        ItemStack bki4 = ItemStack.EMPTY;
+        for (int integer5 = 0; integer5 < bgu.getContainerSize(); ++integer5) {
+            final ItemStack bki5 = bgu.getItem(integer5);
+            if (!bki5.isEmpty()) {
+                if (bki5.getItem() instanceof BannerItem) {
+                    bki3 = bki5;
                 }
-                else if (ben5.getItem() == Items.SHIELD) {
-                    ben4 = ben5.copy();
+                else if (bki5.getItem() == Items.SHIELD) {
+                    bki4 = bki5.copy();
                 }
             }
         }
-        if (ben4.isEmpty()) {
-            return ben4;
+        if (bki4.isEmpty()) {
+            return bki4;
         }
-        final CompoundTag jt5 = ben3.getTagElement("BlockEntityTag");
-        final CompoundTag jt6 = (jt5 == null) ? new CompoundTag() : jt5.copy();
-        jt6.putInt("Base", ((BannerItem)ben3.getItem()).getColor().getId());
-        ben4.addTagElement("BlockEntityTag", jt6);
-        return ben4;
+        final CompoundTag le5 = bki3.getTagElement("BlockEntityTag");
+        final CompoundTag le6 = (le5 == null) ? new CompoundTag() : le5.copy();
+        le6.putInt("Base", ((BannerItem)bki3.getItem()).getColor().getId());
+        bki4.addTagElement("BlockEntityTag", le6);
+        return bki4;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/ShulkerBoxColoring.java b/src/net/minecraft/world/item/crafting/ShulkerBoxColoring.java
index c85378c..7a59045 100644
--- a/src/net/minecraft/world/item/crafting/ShulkerBoxColoring.java
+++ b/src/net/minecraft/world/item/crafting/ShulkerBoxColoring.java
@@ -12,22 +12,22 @@ import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.resources.ResourceLocation;
 
 public class ShulkerBoxColoring extends CustomRecipe {
-    public ShulkerBoxColoring(final ResourceLocation sm) {
-        super(sm);
+    public ShulkerBoxColoring(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
         int integer4 = 0;
         int integer5 = 0;
-        for (int integer6 = 0; integer6 < baz.getContainerSize(); ++integer6) {
-            final ItemStack ben7 = baz.getItem(integer6);
-            if (!ben7.isEmpty()) {
-                if (Block.byItem(ben7.getItem()) instanceof ShulkerBoxBlock) {
+        for (int integer6 = 0; integer6 < bgu.getContainerSize(); ++integer6) {
+            final ItemStack bki7 = bgu.getItem(integer6);
+            if (!bki7.isEmpty()) {
+                if (Block.byItem(bki7.getItem()) instanceof ShulkerBoxBlock) {
                     ++integer4;
                 }
                 else {
-                    if (!(ben7.getItem() instanceof DyeItem)) {
+                    if (!(bki7.getItem() instanceof DyeItem)) {
                         return false;
                     }
                     ++integer5;
@@ -41,26 +41,26 @@ public class ShulkerBoxColoring extends CustomRecipe {
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
-        ItemStack ben3 = ItemStack.EMPTY;
-        DyeItem bdk4 = (DyeItem)Items.WHITE_DYE;
-        for (int integer5 = 0; integer5 < baz.getContainerSize(); ++integer5) {
-            final ItemStack ben4 = baz.getItem(integer5);
-            if (!ben4.isEmpty()) {
-                final Item bei7 = ben4.getItem();
-                if (Block.byItem(bei7) instanceof ShulkerBoxBlock) {
-                    ben3 = ben4;
+    public ItemStack assemble(final CraftingContainer bgu) {
+        ItemStack bki3 = ItemStack.EMPTY;
+        DyeItem bjf4 = (DyeItem)Items.WHITE_DYE;
+        for (int integer5 = 0; integer5 < bgu.getContainerSize(); ++integer5) {
+            final ItemStack bki4 = bgu.getItem(integer5);
+            if (!bki4.isEmpty()) {
+                final Item bke7 = bki4.getItem();
+                if (Block.byItem(bke7) instanceof ShulkerBoxBlock) {
+                    bki3 = bki4;
                 }
-                else if (bei7 instanceof DyeItem) {
-                    bdk4 = (DyeItem)bei7;
+                else if (bke7 instanceof DyeItem) {
+                    bjf4 = (DyeItem)bke7;
                 }
             }
         }
-        final ItemStack ben5 = ShulkerBoxBlock.getColoredItemStack(bdk4.getDyeColor());
-        if (ben3.hasTag()) {
-            ben5.setTag(ben3.getTag().copy());
+        final ItemStack bki5 = ShulkerBoxBlock.getColoredItemStack(bjf4.getDyeColor());
+        if (bki3.hasTag()) {
+            bki5.setTag(bki3.getTag().copy());
         }
-        return ben5;
+        return bki5;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/SimpleCookingSerializer.java b/src/net/minecraft/world/item/crafting/SimpleCookingSerializer.java
index 9fd5dbc..e91c576 100644
--- a/src/net/minecraft/world/item/crafting/SimpleCookingSerializer.java
+++ b/src/net/minecraft/world/item/crafting/SimpleCookingSerializer.java
@@ -19,43 +19,43 @@ public class SimpleCookingSerializer<T extends AbstractCookingRecipe> implements
     }
     
     @Override
-    public T fromJson(final ResourceLocation sm, final JsonObject jsonObject) {
+    public T fromJson(final ResourceLocation uh, final JsonObject jsonObject) {
         final String string4 = GsonHelper.getAsString(jsonObject, "group", "");
         final JsonElement jsonElement5 = GsonHelper.isArrayNode(jsonObject, "ingredient") ? GsonHelper.getAsJsonArray(jsonObject, "ingredient") : GsonHelper.getAsJsonObject(jsonObject, "ingredient");
-        final Ingredient bgt6 = Ingredient.fromJson(jsonElement5);
+        final Ingredient bmr6 = Ingredient.fromJson(jsonElement5);
         final String string5 = GsonHelper.getAsString(jsonObject, "result");
-        final ResourceLocation sm2 = new ResourceLocation(string5);
+        final ResourceLocation uh2 = new ResourceLocation(string5);
         final Object o;
         final String str;
-        final ItemStack ben9 = new ItemStack(Registry.ITEM.getOptional(sm2).<Throwable>orElseThrow(() -> {
+        final ItemStack bki9 = new ItemStack(Registry.ITEM.getOptional(uh2).<Throwable>orElseThrow(() -> {
             new IllegalStateException("Item: " + str + " does not exist");
             return o;
         }));
         final float float10 = GsonHelper.getAsFloat(jsonObject, "experience", 0.0f);
         final int integer11 = GsonHelper.getAsInt(jsonObject, "cookingtime", this.defaultCookingTime);
-        return this.factory.create(sm, string4, bgt6, ben9, float10, integer11);
+        return this.factory.create(uh, string4, bmr6, bki9, float10, integer11);
     }
     
     @Override
-    public T fromNetwork(final ResourceLocation sm, final FriendlyByteBuf kv) {
-        final String string4 = kv.readUtf(32767);
-        final Ingredient bgt5 = Ingredient.fromNetwork(kv);
-        final ItemStack ben6 = kv.readItem();
-        final float float7 = kv.readFloat();
-        final int integer8 = kv.readVarInt();
-        return this.factory.create(sm, string4, bgt5, ben6, float7, integer8);
+    public T fromNetwork(final ResourceLocation uh, final FriendlyByteBuf mg) {
+        final String string4 = mg.readUtf(32767);
+        final Ingredient bmr5 = Ingredient.fromNetwork(mg);
+        final ItemStack bki6 = mg.readItem();
+        final float float7 = mg.readFloat();
+        final int integer8 = mg.readVarInt();
+        return this.factory.create(uh, string4, bmr5, bki6, float7, integer8);
     }
     
     @Override
-    public void toNetwork(final FriendlyByteBuf kv, final T bgi) {
-        kv.writeUtf(bgi.group);
-        bgi.ingredient.toNetwork(kv);
-        kv.writeItem(bgi.result);
-        kv.writeFloat(bgi.experience);
-        kv.writeVarInt(bgi.cookingTime);
+    public void toNetwork(final FriendlyByteBuf mg, final T bmg) {
+        mg.writeUtf(bmg.group);
+        bmg.ingredient.toNetwork(mg);
+        mg.writeItem(bmg.result);
+        mg.writeFloat(bmg.experience);
+        mg.writeVarInt(bmg.cookingTime);
     }
     
     interface CookieBaker<T extends AbstractCookingRecipe> {
-        T create(final ResourceLocation sm, final String string, final Ingredient bgt, final ItemStack ben, final float float5, final int integer);
+        T create(final ResourceLocation uh, final String string, final Ingredient bmr, final ItemStack bki, final float float5, final int integer);
     }
 }
diff --git a/src/net/minecraft/world/item/crafting/SimpleRecipeSerializer.java b/src/net/minecraft/world/item/crafting/SimpleRecipeSerializer.java
index f3bce47..ec4071c 100644
--- a/src/net/minecraft/world/item/crafting/SimpleRecipeSerializer.java
+++ b/src/net/minecraft/world/item/crafting/SimpleRecipeSerializer.java
@@ -13,16 +13,16 @@ public class SimpleRecipeSerializer<T extends Recipe<?>> implements RecipeSerial
     }
     
     @Override
-    public T fromJson(final ResourceLocation sm, final JsonObject jsonObject) {
-        return this.constructor.apply(sm);
+    public T fromJson(final ResourceLocation uh, final JsonObject jsonObject) {
+        return this.constructor.apply(uh);
     }
     
     @Override
-    public T fromNetwork(final ResourceLocation sm, final FriendlyByteBuf kv) {
-        return this.constructor.apply(sm);
+    public T fromNetwork(final ResourceLocation uh, final FriendlyByteBuf mg) {
+        return this.constructor.apply(uh);
     }
     
     @Override
-    public void toNetwork(final FriendlyByteBuf kv, final T bgw) {
+    public void toNetwork(final FriendlyByteBuf mg, final T bmu) {
     }
 }
diff --git a/src/net/minecraft/world/item/crafting/SingleItemRecipe.java b/src/net/minecraft/world/item/crafting/SingleItemRecipe.java
index e17ba56..63c13d1 100644
--- a/src/net/minecraft/world/item/crafting/SingleItemRecipe.java
+++ b/src/net/minecraft/world/item/crafting/SingleItemRecipe.java
@@ -20,13 +20,13 @@ public abstract class SingleItemRecipe implements Recipe<Container> {
     protected final ResourceLocation id;
     protected final String group;
     
-    public SingleItemRecipe(final RecipeType<?> bgz, final RecipeSerializer<?> bgy, final ResourceLocation sm, final String string, final Ingredient bgt, final ItemStack ben) {
-        this.type = bgz;
-        this.serializer = bgy;
-        this.id = sm;
+    public SingleItemRecipe(final RecipeType<?> bmx, final RecipeSerializer<?> bmw, final ResourceLocation uh, final String string, final Ingredient bmr, final ItemStack bki) {
+        this.type = bmx;
+        this.serializer = bmw;
+        this.id = uh;
         this.group = string;
-        this.ingredient = bgt;
-        this.result = ben;
+        this.ingredient = bmr;
+        this.result = bki;
     }
     
     @Override
@@ -56,9 +56,9 @@ public abstract class SingleItemRecipe implements Recipe<Container> {
     
     @Override
     public NonNullList<Ingredient> getIngredients() {
-        final NonNullList<Ingredient> fy2 = NonNullList.<Ingredient>create();
-        fy2.add(this.ingredient);
-        return fy2;
+        final NonNullList<Ingredient> gi2 = NonNullList.<Ingredient>create();
+        gi2.add(this.ingredient);
+        return gi2;
     }
     
     @Override
@@ -67,7 +67,7 @@ public abstract class SingleItemRecipe implements Recipe<Container> {
     }
     
     @Override
-    public ItemStack assemble(final Container aje) {
+    public ItemStack assemble(final Container amz) {
         return this.result.copy();
     }
     
@@ -79,38 +79,38 @@ public abstract class SingleItemRecipe implements Recipe<Container> {
         }
         
         @Override
-        public T fromJson(final ResourceLocation sm, final JsonObject jsonObject) {
+        public T fromJson(final ResourceLocation uh, final JsonObject jsonObject) {
             final String string4 = GsonHelper.getAsString(jsonObject, "group", "");
-            Ingredient bgt5;
+            Ingredient bmr5;
             if (GsonHelper.isArrayNode(jsonObject, "ingredient")) {
-                bgt5 = Ingredient.fromJson(GsonHelper.getAsJsonArray(jsonObject, "ingredient"));
+                bmr5 = Ingredient.fromJson(GsonHelper.getAsJsonArray(jsonObject, "ingredient"));
             }
             else {
-                bgt5 = Ingredient.fromJson(GsonHelper.getAsJsonObject(jsonObject, "ingredient"));
+                bmr5 = Ingredient.fromJson(GsonHelper.getAsJsonObject(jsonObject, "ingredient"));
             }
             final String string5 = GsonHelper.getAsString(jsonObject, "result");
             final int integer7 = GsonHelper.getAsInt(jsonObject, "count");
-            final ItemStack ben8 = new ItemStack(Registry.ITEM.get(new ResourceLocation(string5)), integer7);
-            return this.factory.create(sm, string4, bgt5, ben8);
+            final ItemStack bki8 = new ItemStack(Registry.ITEM.get(new ResourceLocation(string5)), integer7);
+            return this.factory.create(uh, string4, bmr5, bki8);
         }
         
         @Override
-        public T fromNetwork(final ResourceLocation sm, final FriendlyByteBuf kv) {
-            final String string4 = kv.readUtf(32767);
-            final Ingredient bgt5 = Ingredient.fromNetwork(kv);
-            final ItemStack ben6 = kv.readItem();
-            return this.factory.create(sm, string4, bgt5, ben6);
+        public T fromNetwork(final ResourceLocation uh, final FriendlyByteBuf mg) {
+            final String string4 = mg.readUtf(32767);
+            final Ingredient bmr5 = Ingredient.fromNetwork(mg);
+            final ItemStack bki6 = mg.readItem();
+            return this.factory.create(uh, string4, bmr5, bki6);
         }
         
         @Override
-        public void toNetwork(final FriendlyByteBuf kv, final T bhh) {
-            kv.writeUtf(bhh.group);
-            bhh.ingredient.toNetwork(kv);
-            kv.writeItem(bhh.result);
+        public void toNetwork(final FriendlyByteBuf mg, final T bnf) {
+            mg.writeUtf(bnf.group);
+            bnf.ingredient.toNetwork(mg);
+            mg.writeItem(bnf.result);
         }
         
         interface SingleItemMaker<T extends SingleItemRecipe> {
-            T create(final ResourceLocation sm, final String string, final Ingredient bgt, final ItemStack ben);
+            T create(final ResourceLocation uh, final String string, final Ingredient bmr, final ItemStack bki);
         }
     }
 }
diff --git a/src/net/minecraft/world/item/crafting/SmeltingRecipe.java b/src/net/minecraft/world/item/crafting/SmeltingRecipe.java
index 917f00b..478e9aa 100644
--- a/src/net/minecraft/world/item/crafting/SmeltingRecipe.java
+++ b/src/net/minecraft/world/item/crafting/SmeltingRecipe.java
@@ -6,8 +6,8 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.resources.ResourceLocation;
 
 public class SmeltingRecipe extends AbstractCookingRecipe {
-    public SmeltingRecipe(final ResourceLocation sm, final String string, final Ingredient bgt, final ItemStack ben, final float float5, final int integer) {
-        super(RecipeType.SMELTING, sm, string, bgt, ben, float5, integer);
+    public SmeltingRecipe(final ResourceLocation uh, final String string, final Ingredient bmr, final ItemStack bki, final float float5, final int integer) {
+        super(RecipeType.SMELTING, uh, string, bmr, bki, float5, integer);
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/SmokingRecipe.java b/src/net/minecraft/world/item/crafting/SmokingRecipe.java
index e44649b..ea6cb6c 100644
--- a/src/net/minecraft/world/item/crafting/SmokingRecipe.java
+++ b/src/net/minecraft/world/item/crafting/SmokingRecipe.java
@@ -6,8 +6,8 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.resources.ResourceLocation;
 
 public class SmokingRecipe extends AbstractCookingRecipe {
-    public SmokingRecipe(final ResourceLocation sm, final String string, final Ingredient bgt, final ItemStack ben, final float float5, final int integer) {
-        super(RecipeType.SMOKING, sm, string, bgt, ben, float5, integer);
+    public SmokingRecipe(final ResourceLocation uh, final String string, final Ingredient bmr, final ItemStack bki, final float float5, final int integer) {
+        super(RecipeType.SMOKING, uh, string, bmr, bki, float5, integer);
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/StonecutterRecipe.java b/src/net/minecraft/world/item/crafting/StonecutterRecipe.java
index d8a0fd5..dbb2ccf 100644
--- a/src/net/minecraft/world/item/crafting/StonecutterRecipe.java
+++ b/src/net/minecraft/world/item/crafting/StonecutterRecipe.java
@@ -8,13 +8,13 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.resources.ResourceLocation;
 
 public class StonecutterRecipe extends SingleItemRecipe {
-    public StonecutterRecipe(final ResourceLocation sm, final String string, final Ingredient bgt, final ItemStack ben) {
-        super(RecipeType.STONECUTTING, RecipeSerializer.STONECUTTER, sm, string, bgt, ben);
+    public StonecutterRecipe(final ResourceLocation uh, final String string, final Ingredient bmr, final ItemStack bki) {
+        super(RecipeType.STONECUTTING, RecipeSerializer.STONECUTTER, uh, string, bmr, bki);
     }
     
     @Override
-    public boolean matches(final Container aje, final Level bjw) {
-        return this.ingredient.test(aje.getItem(0));
+    public boolean matches(final Container amz, final Level bqb) {
+        return this.ingredient.test(amz.getItem(0));
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/SuspiciousStewRecipe.java b/src/net/minecraft/world/item/crafting/SuspiciousStewRecipe.java
index c484af6..0b98d3d 100644
--- a/src/net/minecraft/world/item/crafting/SuspiciousStewRecipe.java
+++ b/src/net/minecraft/world/item/crafting/SuspiciousStewRecipe.java
@@ -8,6 +8,8 @@ import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.Level;
@@ -15,30 +17,30 @@ import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.resources.ResourceLocation;
 
 public class SuspiciousStewRecipe extends CustomRecipe {
-    public SuspiciousStewRecipe(final ResourceLocation sm) {
-        super(sm);
+    public SuspiciousStewRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
         boolean boolean4 = false;
         boolean boolean5 = false;
         boolean boolean6 = false;
         boolean boolean7 = false;
-        for (int integer8 = 0; integer8 < baz.getContainerSize(); ++integer8) {
-            final ItemStack ben9 = baz.getItem(integer8);
-            if (!ben9.isEmpty()) {
-                if (ben9.getItem() == Blocks.BROWN_MUSHROOM.asItem() && !boolean6) {
+        for (int integer8 = 0; integer8 < bgu.getContainerSize(); ++integer8) {
+            final ItemStack bki9 = bgu.getItem(integer8);
+            if (!bki9.isEmpty()) {
+                if (bki9.getItem() == Blocks.BROWN_MUSHROOM.asItem() && !boolean6) {
                     boolean6 = true;
                 }
-                else if (ben9.getItem() == Blocks.RED_MUSHROOM.asItem() && !boolean5) {
+                else if (bki9.getItem() == Blocks.RED_MUSHROOM.asItem() && !boolean5) {
                     boolean5 = true;
                 }
-                else if (ben9.getItem().is(ItemTags.SMALL_FLOWERS) && !boolean4) {
+                else if (bki9.getItem().is(ItemTags.SMALL_FLOWERS) && !boolean4) {
                     boolean4 = true;
                 }
                 else {
-                    if (ben9.getItem() != Items.BOWL || boolean7) {
+                    if (bki9.getItem() != Items.BOWL || boolean7) {
                         return false;
                     }
                     boolean7 = true;
@@ -49,24 +51,24 @@ public class SuspiciousStewRecipe extends CustomRecipe {
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
-        ItemStack ben3 = ItemStack.EMPTY;
-        for (int integer4 = 0; integer4 < baz.getContainerSize(); ++integer4) {
-            final ItemStack ben4 = baz.getItem(integer4);
-            if (!ben4.isEmpty()) {
-                if (ben4.getItem().is(ItemTags.SMALL_FLOWERS)) {
-                    ben3 = ben4;
+    public ItemStack assemble(final CraftingContainer bgu) {
+        ItemStack bki3 = ItemStack.EMPTY;
+        for (int integer4 = 0; integer4 < bgu.getContainerSize(); ++integer4) {
+            final ItemStack bki4 = bgu.getItem(integer4);
+            if (!bki4.isEmpty()) {
+                if (bki4.getItem().is(ItemTags.SMALL_FLOWERS)) {
+                    bki3 = bki4;
                     break;
                 }
             }
         }
-        final ItemStack ben5 = new ItemStack(Items.SUSPICIOUS_STEW, 1);
-        if (ben3.getItem() instanceof BlockItem && ((BlockItem)ben3.getItem()).getBlock() instanceof FlowerBlock) {
-            final FlowerBlock brl5 = (FlowerBlock)((BlockItem)ben3.getItem()).getBlock();
-            final MobEffect aki6 = brl5.getSuspiciousStewEffect();
-            SuspiciousStewItem.saveMobEffect(ben5, aki6, brl5.getEffectDuration());
+        final ItemStack bki5 = new ItemStack(Items.SUSPICIOUS_STEW, 1);
+        if (bki3.getItem() instanceof BlockItem && ((BlockItem)bki3.getItem()).getBlock() instanceof FlowerBlock) {
+            final FlowerBlock bxx5 = (FlowerBlock)((BlockItem)bki3.getItem()).getBlock();
+            final MobEffect aoe6 = bxx5.getSuspiciousStewEffect();
+            SuspiciousStewItem.saveMobEffect(bki5, aoe6, bxx5.getEffectDuration());
         }
-        return ben5;
+        return bki5;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/TippedArrowRecipe.java b/src/net/minecraft/world/item/crafting/TippedArrowRecipe.java
index cf80412..7ce5dc5 100644
--- a/src/net/minecraft/world/item/crafting/TippedArrowRecipe.java
+++ b/src/net/minecraft/world/item/crafting/TippedArrowRecipe.java
@@ -13,28 +13,28 @@ import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.resources.ResourceLocation;
 
 public class TippedArrowRecipe extends CustomRecipe {
-    public TippedArrowRecipe(final ResourceLocation sm) {
-        super(sm);
+    public TippedArrowRecipe(final ResourceLocation uh) {
+        super(uh);
     }
     
     @Override
-    public boolean matches(final CraftingContainer baz, final Level bjw) {
-        if (baz.getWidth() != 3 || baz.getHeight() != 3) {
+    public boolean matches(final CraftingContainer bgu, final Level bqb) {
+        if (bgu.getWidth() != 3 || bgu.getHeight() != 3) {
             return false;
         }
-        for (int integer4 = 0; integer4 < baz.getWidth(); ++integer4) {
-            for (int integer5 = 0; integer5 < baz.getHeight(); ++integer5) {
-                final ItemStack ben6 = baz.getItem(integer4 + integer5 * baz.getWidth());
-                if (ben6.isEmpty()) {
+        for (int integer4 = 0; integer4 < bgu.getWidth(); ++integer4) {
+            for (int integer5 = 0; integer5 < bgu.getHeight(); ++integer5) {
+                final ItemStack bki6 = bgu.getItem(integer4 + integer5 * bgu.getWidth());
+                if (bki6.isEmpty()) {
                     return false;
                 }
-                final Item bei7 = ben6.getItem();
+                final Item bke7 = bki6.getItem();
                 if (integer4 == 1 && integer5 == 1) {
-                    if (bei7 != Items.LINGERING_POTION) {
+                    if (bke7 != Items.LINGERING_POTION) {
                         return false;
                     }
                 }
-                else if (bei7 != Items.ARROW) {
+                else if (bke7 != Items.ARROW) {
                     return false;
                 }
             }
@@ -43,15 +43,15 @@ public class TippedArrowRecipe extends CustomRecipe {
     }
     
     @Override
-    public ItemStack assemble(final CraftingContainer baz) {
-        final ItemStack ben3 = baz.getItem(1 + baz.getWidth());
-        if (ben3.getItem() != Items.LINGERING_POTION) {
+    public ItemStack assemble(final CraftingContainer bgu) {
+        final ItemStack bki3 = bgu.getItem(1 + bgu.getWidth());
+        if (bki3.getItem() != Items.LINGERING_POTION) {
             return ItemStack.EMPTY;
         }
-        final ItemStack ben4 = new ItemStack(Items.TIPPED_ARROW, 8);
-        PotionUtils.setPotion(ben4, PotionUtils.getPotion(ben3));
-        PotionUtils.setCustomEffects(ben4, PotionUtils.getCustomEffects(ben3));
-        return ben4;
+        final ItemStack bki4 = new ItemStack(Items.TIPPED_ARROW, 8);
+        PotionUtils.setPotion(bki4, PotionUtils.getPotion(bki3));
+        PotionUtils.setCustomEffects(bki4, PotionUtils.getCustomEffects(bki3));
+        return bki4;
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/crafting/UpgradeRecipe.java b/src/net/minecraft/world/item/crafting/UpgradeRecipe.java
new file mode 100644
index 0000000..4537225
--- /dev/null
+++ b/src/net/minecraft/world/item/crafting/UpgradeRecipe.java
@@ -0,0 +1,101 @@
+package net.minecraft.world.item.crafting;
+
+import net.minecraft.network.FriendlyByteBuf;
+import com.google.gson.JsonElement;
+import net.minecraft.util.GsonHelper;
+import com.google.gson.JsonObject;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.Container;
+
+public class UpgradeRecipe implements Recipe<Container> {
+    private final Ingredient base;
+    private final Ingredient addition;
+    private final ItemStack result;
+    private final ResourceLocation id;
+    
+    public UpgradeRecipe(final ResourceLocation uh, final Ingredient bmr2, final Ingredient bmr3, final ItemStack bki) {
+        this.id = uh;
+        this.base = bmr2;
+        this.addition = bmr3;
+        this.result = bki;
+    }
+    
+    @Override
+    public boolean matches(final Container amz, final Level bqb) {
+        return this.base.test(amz.getItem(0)) && this.addition.test(amz.getItem(1));
+    }
+    
+    @Override
+    public ItemStack assemble(final Container amz) {
+        final ItemStack bki3 = this.result.copy();
+        final CompoundTag le4 = amz.getItem(0).getTag();
+        if (le4 != null) {
+            bki3.setTag(le4.copy());
+        }
+        return bki3;
+    }
+    
+    @Override
+    public boolean canCraftInDimensions(final int integer1, final int integer2) {
+        return integer1 * integer2 >= 2;
+    }
+    
+    @Override
+    public ItemStack getResultItem() {
+        return this.result;
+    }
+    
+    public boolean isAdditionIngredient(final ItemStack bki) {
+        return this.addition.test(bki);
+    }
+    
+    @Override
+    public ItemStack getToastSymbol() {
+        return new ItemStack(Blocks.SMITHING_TABLE);
+    }
+    
+    @Override
+    public ResourceLocation getId() {
+        return this.id;
+    }
+    
+    @Override
+    public RecipeSerializer<?> getSerializer() {
+        return RecipeSerializer.SMITHING;
+    }
+    
+    @Override
+    public RecipeType<?> getType() {
+        return RecipeType.SMITHING;
+    }
+    
+    public static class Serializer implements RecipeSerializer<UpgradeRecipe> {
+        @Override
+        public UpgradeRecipe fromJson(final ResourceLocation uh, final JsonObject jsonObject) {
+            final Ingredient bmr4 = Ingredient.fromJson(GsonHelper.getAsJsonObject(jsonObject, "base"));
+            final Ingredient bmr5 = Ingredient.fromJson(GsonHelper.getAsJsonObject(jsonObject, "addition"));
+            final ItemStack bki6 = ShapedRecipe.itemFromJson(GsonHelper.getAsJsonObject(jsonObject, "result"));
+            return new UpgradeRecipe(uh, bmr4, bmr5, bki6);
+        }
+        
+        @Override
+        public UpgradeRecipe fromNetwork(final ResourceLocation uh, final FriendlyByteBuf mg) {
+            final Ingredient bmr4 = Ingredient.fromNetwork(mg);
+            final Ingredient bmr5 = Ingredient.fromNetwork(mg);
+            final ItemStack bki6 = mg.readItem();
+            return new UpgradeRecipe(uh, bmr4, bmr5, bki6);
+        }
+        
+        @Override
+        public void toNetwork(final FriendlyByteBuf mg, final UpgradeRecipe bnl) {
+            bnl.base.toNetwork(mg);
+            bnl.addition.toNetwork(mg);
+            mg.writeItem(bnl.result);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java b/src/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
index 0a20c43..676ac11 100644
--- a/src/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
@@ -22,7 +22,7 @@ public class ArrowInfiniteEnchantment extends Enchantment {
         return 1;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return !(bhx instanceof MendingEnchantment) && super.checkCompatibility(bhx);
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return !(bnw instanceof MendingEnchantment) && super.checkCompatibility(bnw);
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/ArrowPiercingEnchantment.java b/src/net/minecraft/world/item/enchantment/ArrowPiercingEnchantment.java
index 6c70911..64bd387 100644
--- a/src/net/minecraft/world/item/enchantment/ArrowPiercingEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/ArrowPiercingEnchantment.java
@@ -22,7 +22,7 @@ public class ArrowPiercingEnchantment extends Enchantment {
         return 4;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return super.checkCompatibility(bhx) && bhx != Enchantments.MULTISHOT;
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return super.checkCompatibility(bnw) && bnw != Enchantments.MULTISHOT;
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/DamageEnchantment.java b/src/net/minecraft/world/item/enchantment/DamageEnchantment.java
index 9bd870d..e4f0284 100644
--- a/src/net/minecraft/world/item/enchantment/DamageEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/DamageEnchantment.java
@@ -37,35 +37,35 @@ public class DamageEnchantment extends Enchantment {
     }
     
     @Override
-    public float getDamageBonus(final int integer, final MobType ald) {
+    public float getDamageBonus(final int integer, final MobType apc) {
         if (this.type == 0) {
             return 1.0f + Math.max(0, integer - 1) * 0.5f;
         }
-        if (this.type == 1 && ald == MobType.UNDEAD) {
+        if (this.type == 1 && apc == MobType.UNDEAD) {
             return integer * 2.5f;
         }
-        if (this.type == 2 && ald == MobType.ARTHROPOD) {
+        if (this.type == 2 && apc == MobType.ARTHROPOD) {
             return integer * 2.5f;
         }
         return 0.0f;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return !(bhx instanceof DamageEnchantment);
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return !(bnw instanceof DamageEnchantment);
     }
     
     @Override
-    public boolean canEnchant(final ItemStack ben) {
-        return ben.getItem() instanceof AxeItem || super.canEnchant(ben);
+    public boolean canEnchant(final ItemStack bki) {
+        return bki.getItem() instanceof AxeItem || super.canEnchant(bki);
     }
     
     @Override
-    public void doPostAttack(final LivingEntity akz, final Entity akq, final int integer) {
-        if (akq instanceof LivingEntity) {
-            final LivingEntity akz2 = (LivingEntity)akq;
-            if (this.type == 2 && akz2.getMobType() == MobType.ARTHROPOD) {
-                final int integer2 = 20 + akz.getRandom().nextInt(10 * integer);
-                akz2.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, integer2, 3));
+    public void doPostAttack(final LivingEntity aoy, final Entity aom, final int integer) {
+        if (aom instanceof LivingEntity) {
+            final LivingEntity aoy2 = (LivingEntity)aom;
+            if (this.type == 2 && aoy2.getMobType() == MobType.ARTHROPOD) {
+                final int integer2 = 20 + aoy.getRandom().nextInt(10 * integer);
+                aoy2.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, integer2, 3));
             }
         }
     }
diff --git a/src/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.java b/src/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.java
index 890e134..b008f41 100644
--- a/src/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.java
@@ -26,11 +26,11 @@ public class DigDurabilityEnchantment extends Enchantment {
     }
     
     @Override
-    public boolean canEnchant(final ItemStack ben) {
-        return ben.isDamageableItem() || super.canEnchant(ben);
+    public boolean canEnchant(final ItemStack bki) {
+        return bki.isDamageableItem() || super.canEnchant(bki);
     }
     
-    public static boolean shouldIgnoreDurabilityDrop(final ItemStack ben, final int integer, final Random random) {
-        return (!(ben.getItem() instanceof ArmorItem) || random.nextFloat() >= 0.6f) && random.nextInt(integer + 1) > 0;
+    public static boolean shouldIgnoreDurabilityDrop(final ItemStack bki, final int integer, final Random random) {
+        return (!(bki.getItem() instanceof ArmorItem) || random.nextFloat() >= 0.6f) && random.nextInt(integer + 1) > 0;
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/DiggingEnchantment.java b/src/net/minecraft/world/item/enchantment/DiggingEnchantment.java
index 64923a8..774dc7b 100644
--- a/src/net/minecraft/world/item/enchantment/DiggingEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/DiggingEnchantment.java
@@ -25,7 +25,7 @@ public class DiggingEnchantment extends Enchantment {
     }
     
     @Override
-    public boolean canEnchant(final ItemStack ben) {
-        return ben.getItem() == Items.SHEARS || super.canEnchant(ben);
+    public boolean canEnchant(final ItemStack bki) {
+        return bki.getItem() == Items.SHEARS || super.canEnchant(bki);
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/Enchantment.java b/src/net/minecraft/world/item/enchantment/Enchantment.java
index a0bb140..7898f6f 100644
--- a/src/net/minecraft/world/item/enchantment/Enchantment.java
+++ b/src/net/minecraft/world/item/enchantment/Enchantment.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.item.enchantment;
 
 import net.minecraft.world.entity.Entity;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
@@ -18,8 +19,7 @@ import net.minecraft.world.entity.EquipmentSlot;
 public abstract class Enchantment {
     private final EquipmentSlot[] slots;
     private final Rarity rarity;
-    @Nullable
-    public EnchantmentCategory category;
+    public final EnchantmentCategory category;
     @Nullable
     protected String descriptionId;
     
@@ -28,18 +28,18 @@ public abstract class Enchantment {
         return Registry.ENCHANTMENT.byId(integer);
     }
     
-    protected Enchantment(final Rarity a, final EnchantmentCategory bhy, final EquipmentSlot[] arr) {
+    protected Enchantment(final Rarity a, final EnchantmentCategory bnx, final EquipmentSlot[] arr) {
         this.rarity = a;
-        this.category = bhy;
+        this.category = bnx;
         this.slots = arr;
     }
     
-    public Map<EquipmentSlot, ItemStack> getSlotItems(final LivingEntity akz) {
+    public Map<EquipmentSlot, ItemStack> getSlotItems(final LivingEntity aoy) {
         final Map<EquipmentSlot, ItemStack> map3 = Maps.newEnumMap(EquipmentSlot.class);
-        for (final EquipmentSlot akv7 : this.slots) {
-            final ItemStack ben8 = akz.getItemBySlot(akv7);
-            if (!ben8.isEmpty()) {
-                map3.put(akv7, ben8);
+        for (final EquipmentSlot aor7 : this.slots) {
+            final ItemStack bki8 = aoy.getItemBySlot(aor7);
+            if (!bki8.isEmpty()) {
+                map3.put(aor7, bki8);
             }
         }
         return map3;
@@ -65,20 +65,20 @@ public abstract class Enchantment {
         return this.getMinCost(integer) + 5;
     }
     
-    public int getDamageProtection(final int integer, final DamageSource ajz) {
+    public int getDamageProtection(final int integer, final DamageSource anw) {
         return 0;
     }
     
-    public float getDamageBonus(final int integer, final MobType ald) {
+    public float getDamageBonus(final int integer, final MobType apc) {
         return 0.0f;
     }
     
-    public final boolean isCompatibleWith(final Enchantment bhx) {
-        return this.checkCompatibility(bhx) && bhx.checkCompatibility(this);
+    public final boolean isCompatibleWith(final Enchantment bnw) {
+        return this.checkCompatibility(bnw) && bnw.checkCompatibility(this);
     }
     
-    protected boolean checkCompatibility(final Enchantment bhx) {
-        return this != bhx;
+    protected boolean checkCompatibility(final Enchantment bnw) {
+        return this != bnw;
     }
     
     protected String getOrCreateDescriptionId() {
@@ -93,27 +93,27 @@ public abstract class Enchantment {
     }
     
     public Component getFullname(final int integer) {
-        final Component lf3 = new TranslatableComponent(this.getDescriptionId(), new Object[0]);
+        final MutableComponent mx3 = new TranslatableComponent(this.getDescriptionId());
         if (this.isCurse()) {
-            lf3.withStyle(ChatFormatting.RED);
+            mx3.withStyle(ChatFormatting.RED);
         }
         else {
-            lf3.withStyle(ChatFormatting.GRAY);
+            mx3.withStyle(ChatFormatting.GRAY);
         }
         if (integer != 1 || this.getMaxLevel() != 1) {
-            lf3.append(" ").append(new TranslatableComponent("enchantment.level." + integer, new Object[0]));
+            mx3.append(" ").append(new TranslatableComponent("enchantment.level." + integer));
         }
-        return lf3;
+        return mx3;
     }
     
-    public boolean canEnchant(final ItemStack ben) {
-        return this.category.canEnchant(ben.getItem());
+    public boolean canEnchant(final ItemStack bki) {
+        return this.category.canEnchant(bki.getItem());
     }
     
-    public void doPostAttack(final LivingEntity akz, final Entity akq, final int integer) {
+    public void doPostAttack(final LivingEntity aoy, final Entity aom, final int integer) {
     }
     
-    public void doPostHurt(final LivingEntity akz, final Entity akq, final int integer) {
+    public void doPostHurt(final LivingEntity aoy, final Entity aom, final int integer) {
     }
     
     public boolean isTreasureOnly() {
@@ -124,6 +124,14 @@ public abstract class Enchantment {
         return false;
     }
     
+    public boolean isTradeable() {
+        return true;
+    }
+    
+    public boolean isDiscoverable() {
+        return true;
+    }
+    
     public enum Rarity {
         COMMON(10), 
         UNCOMMON(5), 
diff --git a/src/net/minecraft/world/item/enchantment/EnchantmentCategory.java b/src/net/minecraft/world/item/enchantment/EnchantmentCategory.java
index ec2d8f3..3a61b72 100644
--- a/src/net/minecraft/world/item/enchantment/EnchantmentCategory.java
+++ b/src/net/minecraft/world/item/enchantment/EnchantmentCategory.java
@@ -1,10 +1,9 @@
 package net.minecraft.world.item.enchantment;
 
+import net.minecraft.world.item.Vanishable;
 import net.minecraft.world.item.CrossbowItem;
-import net.minecraft.world.level.block.CarvedPumpkinBlock;
-import net.minecraft.world.level.block.AbstractSkullBlock;
-import net.minecraft.world.item.ElytraItem;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.item.Wearable;
 import net.minecraft.world.item.BowItem;
 import net.minecraft.world.item.TridentItem;
 import net.minecraft.world.item.FishingRodItem;
@@ -15,98 +14,90 @@ import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.Item;
 
 public enum EnchantmentCategory {
-    ALL {
-        @Override
-        public boolean canEnchant(final Item bei) {
-            for (final EnchantmentCategory bhy6 : EnchantmentCategory.values()) {
-                if (bhy6 != EnchantmentCategory.ALL) {
-                    if (bhy6.canEnchant(bei)) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-    }, 
     ARMOR {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof ArmorItem;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof ArmorItem;
         }
     }, 
     ARMOR_FEET {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof ArmorItem && ((ArmorItem)bei).getSlot() == EquipmentSlot.FEET;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof ArmorItem && ((ArmorItem)bke).getSlot() == EquipmentSlot.FEET;
         }
     }, 
     ARMOR_LEGS {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof ArmorItem && ((ArmorItem)bei).getSlot() == EquipmentSlot.LEGS;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof ArmorItem && ((ArmorItem)bke).getSlot() == EquipmentSlot.LEGS;
         }
     }, 
     ARMOR_CHEST {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof ArmorItem && ((ArmorItem)bei).getSlot() == EquipmentSlot.CHEST;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof ArmorItem && ((ArmorItem)bke).getSlot() == EquipmentSlot.CHEST;
         }
     }, 
     ARMOR_HEAD {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof ArmorItem && ((ArmorItem)bei).getSlot() == EquipmentSlot.HEAD;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof ArmorItem && ((ArmorItem)bke).getSlot() == EquipmentSlot.HEAD;
         }
     }, 
     WEAPON {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof SwordItem;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof SwordItem;
         }
     }, 
     DIGGER {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof DiggerItem;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof DiggerItem;
         }
     }, 
     FISHING_ROD {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof FishingRodItem;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof FishingRodItem;
         }
     }, 
     TRIDENT {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof TridentItem;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof TridentItem;
         }
     }, 
     BREAKABLE {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei.canBeDepleted();
+        public boolean canEnchant(final Item bke) {
+            return bke.canBeDepleted();
         }
     }, 
     BOW {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof BowItem;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof BowItem;
         }
     }, 
     WEARABLE {
         @Override
-        public boolean canEnchant(final Item bei) {
-            final Block bph3 = Block.byItem(bei);
-            return bei instanceof ArmorItem || bei instanceof ElytraItem || bph3 instanceof AbstractSkullBlock || bph3 instanceof CarvedPumpkinBlock;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof Wearable || Block.byItem(bke) instanceof Wearable;
         }
     }, 
     CROSSBOW {
         @Override
-        public boolean canEnchant(final Item bei) {
-            return bei instanceof CrossbowItem;
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof CrossbowItem;
+        }
+    }, 
+    VANISHABLE {
+        @Override
+        public boolean canEnchant(final Item bke) {
+            return bke instanceof Vanishable || Block.byItem(bke) instanceof Vanishable || EnchantmentCategory$14.BREAKABLE.canEnchant(bke);
         }
     };
     
-    public abstract boolean canEnchant(final Item bei);
+    public abstract boolean canEnchant(final Item bke);
 }
diff --git a/src/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/net/minecraft/world/item/enchantment/EnchantmentHelper.java
index 0995251..b8accf3 100644
--- a/src/net/minecraft/world/item/enchantment/EnchantmentHelper.java
+++ b/src/net/minecraft/world/item/enchantment/EnchantmentHelper.java
@@ -7,9 +7,10 @@ import net.minecraft.util.WeighedRandom;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.Item;
 import java.util.Random;
-import javax.annotation.Nullable;
 import java.util.List;
 import com.google.common.collect.Lists;
+import java.util.function.Predicate;
+import javax.annotation.Nullable;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.Entity;
@@ -32,128 +33,128 @@ import net.minecraft.core.Registry;
 import net.minecraft.world.item.ItemStack;
 
 public class EnchantmentHelper {
-    public static int getItemEnchantmentLevel(final Enchantment bhx, final ItemStack ben) {
-        if (ben.isEmpty()) {
+    public static int getItemEnchantmentLevel(final Enchantment bnw, final ItemStack bki) {
+        if (bki.isEmpty()) {
             return 0;
         }
-        final ResourceLocation sm3 = Registry.ENCHANTMENT.getKey(bhx);
-        final ListTag jz4 = ben.getEnchantmentTags();
-        for (int integer5 = 0; integer5 < jz4.size(); ++integer5) {
-            final CompoundTag jt6 = jz4.getCompound(integer5);
-            final ResourceLocation sm4 = ResourceLocation.tryParse(jt6.getString("id"));
-            if (sm4 != null && sm4.equals(sm3)) {
-                return Mth.clamp(jt6.getInt("lvl"), 0, 255);
+        final ResourceLocation uh3 = Registry.ENCHANTMENT.getKey(bnw);
+        final ListTag lk4 = bki.getEnchantmentTags();
+        for (int integer5 = 0; integer5 < lk4.size(); ++integer5) {
+            final CompoundTag le6 = lk4.getCompound(integer5);
+            final ResourceLocation uh4 = ResourceLocation.tryParse(le6.getString("id"));
+            if (uh4 != null && uh4.equals(uh3)) {
+                return Mth.clamp(le6.getInt("lvl"), 0, 255);
             }
         }
         return 0;
     }
     
-    public static Map<Enchantment, Integer> getEnchantments(final ItemStack ben) {
-        final ListTag jz2 = (ben.getItem() == Items.ENCHANTED_BOOK) ? EnchantedBookItem.getEnchantments(ben) : ben.getEnchantmentTags();
-        return deserializeEnchantments(jz2);
+    public static Map<Enchantment, Integer> getEnchantments(final ItemStack bki) {
+        final ListTag lk2 = (bki.getItem() == Items.ENCHANTED_BOOK) ? EnchantedBookItem.getEnchantments(bki) : bki.getEnchantmentTags();
+        return deserializeEnchantments(lk2);
     }
     
-    public static Map<Enchantment, Integer> deserializeEnchantments(final ListTag jz) {
+    public static Map<Enchantment, Integer> deserializeEnchantments(final ListTag lk) {
         final Map<Enchantment, Integer> map2 = Maps.newLinkedHashMap();
-        for (int integer3 = 0; integer3 < jz.size(); ++integer3) {
-            final CompoundTag jt4 = jz.getCompound(integer3);
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            final CompoundTag le4 = lk.getCompound(integer3);
             final Integer n;
-            Registry.ENCHANTMENT.getOptional(ResourceLocation.tryParse(jt4.getString("id"))).ifPresent(bhx -> n = map2.put(bhx, jt4.getInt("lvl")));
+            Registry.ENCHANTMENT.getOptional(ResourceLocation.tryParse(le4.getString("id"))).ifPresent(bnw -> n = map2.put(bnw, le4.getInt("lvl")));
         }
         return map2;
     }
     
-    public static void setEnchantments(final Map<Enchantment, Integer> map, final ItemStack ben) {
-        final ListTag jz3 = new ListTag();
+    public static void setEnchantments(final Map<Enchantment, Integer> map, final ItemStack bki) {
+        final ListTag lk3 = new ListTag();
         for (final Map.Entry<Enchantment, Integer> entry5 : map.entrySet()) {
-            final Enchantment bhx6 = entry5.getKey();
-            if (bhx6 == null) {
+            final Enchantment bnw6 = entry5.getKey();
+            if (bnw6 == null) {
                 continue;
             }
             final int integer7 = entry5.getValue();
-            final CompoundTag jt8 = new CompoundTag();
-            jt8.putString("id", String.valueOf(Registry.ENCHANTMENT.getKey(bhx6)));
-            jt8.putShort("lvl", (short)integer7);
-            ((AbstractList<CompoundTag>)jz3).add(jt8);
-            if (ben.getItem() != Items.ENCHANTED_BOOK) {
+            final CompoundTag le8 = new CompoundTag();
+            le8.putString("id", String.valueOf(Registry.ENCHANTMENT.getKey(bnw6)));
+            le8.putShort("lvl", (short)integer7);
+            ((AbstractList<CompoundTag>)lk3).add(le8);
+            if (bki.getItem() != Items.ENCHANTED_BOOK) {
                 continue;
             }
-            EnchantedBookItem.addEnchantment(ben, new EnchantmentInstance(bhx6, integer7));
+            EnchantedBookItem.addEnchantment(bki, new EnchantmentInstance(bnw6, integer7));
         }
-        if (jz3.isEmpty()) {
-            ben.removeTagKey("Enchantments");
+        if (lk3.isEmpty()) {
+            bki.removeTagKey("Enchantments");
         }
-        else if (ben.getItem() != Items.ENCHANTED_BOOK) {
-            ben.addTagElement("Enchantments", jz3);
+        else if (bki.getItem() != Items.ENCHANTED_BOOK) {
+            bki.addTagElement("Enchantments", lk3);
         }
     }
     
-    private static void runIterationOnItem(final EnchantmentVisitor a, final ItemStack ben) {
-        if (ben.isEmpty()) {
+    private static void runIterationOnItem(final EnchantmentVisitor a, final ItemStack bki) {
+        if (bki.isEmpty()) {
             return;
         }
-        final ListTag jz3 = ben.getEnchantmentTags();
-        for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-            final String string5 = jz3.getCompound(integer4).getString("id");
-            final int integer5 = jz3.getCompound(integer4).getInt("lvl");
-            Registry.ENCHANTMENT.getOptional(ResourceLocation.tryParse(string5)).ifPresent(bhx -> a.accept(bhx, integer5));
+        final ListTag lk3 = bki.getEnchantmentTags();
+        for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+            final String string5 = lk3.getCompound(integer4).getString("id");
+            final int integer5 = lk3.getCompound(integer4).getInt("lvl");
+            Registry.ENCHANTMENT.getOptional(ResourceLocation.tryParse(string5)).ifPresent(bnw -> a.accept(bnw, integer5));
         }
     }
     
     private static void runIterationOnInventory(final EnchantmentVisitor a, final Iterable<ItemStack> iterable) {
-        for (final ItemStack ben4 : iterable) {
-            runIterationOnItem(a, ben4);
+        for (final ItemStack bki4 : iterable) {
+            runIterationOnItem(a, bki4);
         }
     }
     
-    public static int getDamageProtection(final Iterable<ItemStack> iterable, final DamageSource ajz) {
+    public static int getDamageProtection(final Iterable<ItemStack> iterable, final DamageSource anw) {
         final MutableInt mutableInt3 = new MutableInt();
-        runIterationOnInventory((bhx, integer) -> mutableInt3.add(bhx.getDamageProtection(integer, ajz)), iterable);
+        runIterationOnInventory((bnw, integer) -> mutableInt3.add(bnw.getDamageProtection(integer, anw)), iterable);
         return mutableInt3.intValue();
     }
     
-    public static float getDamageBonus(final ItemStack ben, final MobType ald) {
+    public static float getDamageBonus(final ItemStack bki, final MobType apc) {
         final MutableFloat mutableFloat3 = new MutableFloat();
-        runIterationOnItem((bhx, integer) -> mutableFloat3.add(bhx.getDamageBonus(integer, ald)), ben);
+        runIterationOnItem((bnw, integer) -> mutableFloat3.add(bnw.getDamageBonus(integer, apc)), bki);
         return mutableFloat3.floatValue();
     }
     
-    public static float getSweepingDamageRatio(final LivingEntity akz) {
-        final int integer2 = getEnchantmentLevel(Enchantments.SWEEPING_EDGE, akz);
+    public static float getSweepingDamageRatio(final LivingEntity aoy) {
+        final int integer2 = getEnchantmentLevel(Enchantments.SWEEPING_EDGE, aoy);
         if (integer2 > 0) {
             return SweepingEdgeEnchantment.getSweepingDamageRatio(integer2);
         }
         return 0.0f;
     }
     
-    public static void doPostHurtEffects(final LivingEntity akz, final Entity akq) {
-        final EnchantmentVisitor a3 = (bhx, integer) -> bhx.doPostHurt(akz, akq, integer);
-        if (akz != null) {
-            runIterationOnInventory(a3, akz.getAllSlots());
+    public static void doPostHurtEffects(final LivingEntity aoy, final Entity aom) {
+        final EnchantmentVisitor a3 = (bnw, integer) -> bnw.doPostHurt(aoy, aom, integer);
+        if (aoy != null) {
+            runIterationOnInventory(a3, aoy.getAllSlots());
         }
-        if (akq instanceof Player) {
-            runIterationOnItem(a3, akz.getMainHandItem());
+        if (aom instanceof Player) {
+            runIterationOnItem(a3, aoy.getMainHandItem());
         }
     }
     
-    public static void doPostDamageEffects(final LivingEntity akz, final Entity akq) {
-        final EnchantmentVisitor a3 = (bhx, integer) -> bhx.doPostAttack(akz, akq, integer);
-        if (akz != null) {
-            runIterationOnInventory(a3, akz.getAllSlots());
+    public static void doPostDamageEffects(final LivingEntity aoy, final Entity aom) {
+        final EnchantmentVisitor a3 = (bnw, integer) -> bnw.doPostAttack(aoy, aom, integer);
+        if (aoy != null) {
+            runIterationOnInventory(a3, aoy.getAllSlots());
         }
-        if (akz instanceof Player) {
-            runIterationOnItem(a3, akz.getMainHandItem());
+        if (aoy instanceof Player) {
+            runIterationOnItem(a3, aoy.getMainHandItem());
         }
     }
     
-    public static int getEnchantmentLevel(final Enchantment bhx, final LivingEntity akz) {
-        final Iterable<ItemStack> iterable3 = bhx.getSlotItems(akz).values();
+    public static int getEnchantmentLevel(final Enchantment bnw, final LivingEntity aoy) {
+        final Iterable<ItemStack> iterable3 = bnw.getSlotItems(aoy).values();
         if (iterable3 == null) {
             return 0;
         }
         int integer4 = 0;
-        for (final ItemStack ben6 : iterable3) {
-            final int integer5 = getItemEnchantmentLevel(bhx, ben6);
+        for (final ItemStack bki6 : iterable3) {
+            final int integer5 = getItemEnchantmentLevel(bnw, bki6);
             if (integer5 > integer4) {
                 integer4 = integer5;
             }
@@ -161,85 +162,94 @@ public class EnchantmentHelper {
         return integer4;
     }
     
-    public static int getKnockbackBonus(final LivingEntity akz) {
-        return getEnchantmentLevel(Enchantments.KNOCKBACK, akz);
+    public static int getKnockbackBonus(final LivingEntity aoy) {
+        return getEnchantmentLevel(Enchantments.KNOCKBACK, aoy);
     }
     
-    public static int getFireAspect(final LivingEntity akz) {
-        return getEnchantmentLevel(Enchantments.FIRE_ASPECT, akz);
+    public static int getFireAspect(final LivingEntity aoy) {
+        return getEnchantmentLevel(Enchantments.FIRE_ASPECT, aoy);
     }
     
-    public static int getRespiration(final LivingEntity akz) {
-        return getEnchantmentLevel(Enchantments.RESPIRATION, akz);
+    public static int getRespiration(final LivingEntity aoy) {
+        return getEnchantmentLevel(Enchantments.RESPIRATION, aoy);
     }
     
-    public static int getDepthStrider(final LivingEntity akz) {
-        return getEnchantmentLevel(Enchantments.DEPTH_STRIDER, akz);
+    public static int getDepthStrider(final LivingEntity aoy) {
+        return getEnchantmentLevel(Enchantments.DEPTH_STRIDER, aoy);
     }
     
-    public static int getBlockEfficiency(final LivingEntity akz) {
-        return getEnchantmentLevel(Enchantments.BLOCK_EFFICIENCY, akz);
+    public static int getBlockEfficiency(final LivingEntity aoy) {
+        return getEnchantmentLevel(Enchantments.BLOCK_EFFICIENCY, aoy);
     }
     
-    public static int getFishingLuckBonus(final ItemStack ben) {
-        return getItemEnchantmentLevel(Enchantments.FISHING_LUCK, ben);
+    public static int getFishingLuckBonus(final ItemStack bki) {
+        return getItemEnchantmentLevel(Enchantments.FISHING_LUCK, bki);
     }
     
-    public static int getFishingSpeedBonus(final ItemStack ben) {
-        return getItemEnchantmentLevel(Enchantments.FISHING_SPEED, ben);
+    public static int getFishingSpeedBonus(final ItemStack bki) {
+        return getItemEnchantmentLevel(Enchantments.FISHING_SPEED, bki);
     }
     
-    public static int getMobLooting(final LivingEntity akz) {
-        return getEnchantmentLevel(Enchantments.MOB_LOOTING, akz);
+    public static int getMobLooting(final LivingEntity aoy) {
+        return getEnchantmentLevel(Enchantments.MOB_LOOTING, aoy);
     }
     
-    public static boolean hasAquaAffinity(final LivingEntity akz) {
-        return getEnchantmentLevel(Enchantments.AQUA_AFFINITY, akz) > 0;
+    public static boolean hasAquaAffinity(final LivingEntity aoy) {
+        return getEnchantmentLevel(Enchantments.AQUA_AFFINITY, aoy) > 0;
     }
     
-    public static boolean hasFrostWalker(final LivingEntity akz) {
-        return getEnchantmentLevel(Enchantments.FROST_WALKER, akz) > 0;
+    public static boolean hasFrostWalker(final LivingEntity aoy) {
+        return getEnchantmentLevel(Enchantments.FROST_WALKER, aoy) > 0;
     }
     
-    public static boolean hasBindingCurse(final ItemStack ben) {
-        return getItemEnchantmentLevel(Enchantments.BINDING_CURSE, ben) > 0;
+    public static boolean hasSoulSpeed(final LivingEntity aoy) {
+        return getEnchantmentLevel(Enchantments.SOUL_SPEED, aoy) > 0;
     }
     
-    public static boolean hasVanishingCurse(final ItemStack ben) {
-        return getItemEnchantmentLevel(Enchantments.VANISHING_CURSE, ben) > 0;
+    public static boolean hasBindingCurse(final ItemStack bki) {
+        return getItemEnchantmentLevel(Enchantments.BINDING_CURSE, bki) > 0;
     }
     
-    public static int getLoyalty(final ItemStack ben) {
-        return getItemEnchantmentLevel(Enchantments.LOYALTY, ben);
+    public static boolean hasVanishingCurse(final ItemStack bki) {
+        return getItemEnchantmentLevel(Enchantments.VANISHING_CURSE, bki) > 0;
     }
     
-    public static int getRiptide(final ItemStack ben) {
-        return getItemEnchantmentLevel(Enchantments.RIPTIDE, ben);
+    public static int getLoyalty(final ItemStack bki) {
+        return getItemEnchantmentLevel(Enchantments.LOYALTY, bki);
     }
     
-    public static boolean hasChanneling(final ItemStack ben) {
-        return getItemEnchantmentLevel(Enchantments.CHANNELING, ben) > 0;
+    public static int getRiptide(final ItemStack bki) {
+        return getItemEnchantmentLevel(Enchantments.RIPTIDE, bki);
+    }
+    
+    public static boolean hasChanneling(final ItemStack bki) {
+        return getItemEnchantmentLevel(Enchantments.CHANNELING, bki) > 0;
     }
     
     @Nullable
-    public static Map.Entry<EquipmentSlot, ItemStack> getRandomItemWith(final Enchantment bhx, final LivingEntity akz) {
-        final Map<EquipmentSlot, ItemStack> map3 = bhx.getSlotItems(akz);
-        if (map3.isEmpty()) {
-            return null;
-        }
-        final List<Map.Entry<EquipmentSlot, ItemStack>> list4 = Lists.newArrayList();
-        for (final Map.Entry<EquipmentSlot, ItemStack> entry6 : map3.entrySet()) {
-            final ItemStack ben7 = entry6.getValue();
-            if (!ben7.isEmpty() && getItemEnchantmentLevel(bhx, ben7) > 0) {
-                list4.add(entry6);
-            }
-        }
-        return list4.isEmpty() ? null : list4.get(akz.getRandom().nextInt(list4.size()));
+    public static Map.Entry<EquipmentSlot, ItemStack> getRandomItemWith(final Enchantment bnw, final LivingEntity aoy) {
+        return getRandomItemWith(bnw, aoy, bki -> true);
     }
     
-    public static int getEnchantmentCost(final Random random, final int integer2, int integer3, final ItemStack ben) {
-        final Item bei5 = ben.getItem();
-        final int integer4 = bei5.getEnchantmentValue();
+    @Nullable
+    public static Map.Entry<EquipmentSlot, ItemStack> getRandomItemWith(final Enchantment bnw, final LivingEntity aoy, final Predicate<ItemStack> predicate) {
+        final Map<EquipmentSlot, ItemStack> map4 = bnw.getSlotItems(aoy);
+        if (map4.isEmpty()) {
+            return null;
+        }
+        final List<Map.Entry<EquipmentSlot, ItemStack>> list5 = Lists.newArrayList();
+        for (final Map.Entry<EquipmentSlot, ItemStack> entry7 : map4.entrySet()) {
+            final ItemStack bki8 = entry7.getValue();
+            if (!bki8.isEmpty() && getItemEnchantmentLevel(bnw, bki8) > 0 && predicate.test(bki8)) {
+                list5.add(entry7);
+            }
+        }
+        return list5.isEmpty() ? null : list5.get(aoy.getRandom().nextInt(list5.size()));
+    }
+    
+    public static int getEnchantmentCost(final Random random, final int integer2, int integer3, final ItemStack bki) {
+        final Item bke5 = bki.getItem();
+        final int integer4 = bke5.getEnchantmentValue();
         if (integer4 <= 0) {
             return 0;
         }
@@ -256,34 +266,34 @@ public class EnchantmentHelper {
         return Math.max(integer5, integer3 * 2);
     }
     
-    public static ItemStack enchantItem(final Random random, ItemStack ben, final int integer, final boolean boolean4) {
-        final List<EnchantmentInstance> list5 = selectEnchantment(random, ben, integer, boolean4);
-        final boolean boolean5 = ben.getItem() == Items.BOOK;
+    public static ItemStack enchantItem(final Random random, ItemStack bki, final int integer, final boolean boolean4) {
+        final List<EnchantmentInstance> list5 = selectEnchantment(random, bki, integer, boolean4);
+        final boolean boolean5 = bki.getItem() == Items.BOOK;
         if (boolean5) {
-            ben = new ItemStack(Items.ENCHANTED_BOOK);
+            bki = new ItemStack(Items.ENCHANTED_BOOK);
         }
-        for (final EnchantmentInstance bia8 : list5) {
+        for (final EnchantmentInstance bnz8 : list5) {
             if (boolean5) {
-                EnchantedBookItem.addEnchantment(ben, bia8);
+                EnchantedBookItem.addEnchantment(bki, bnz8);
             }
             else {
-                ben.enchant(bia8.enchantment, bia8.level);
+                bki.enchant(bnz8.enchantment, bnz8.level);
             }
         }
-        return ben;
+        return bki;
     }
     
-    public static List<EnchantmentInstance> selectEnchantment(final Random random, final ItemStack ben, int integer, final boolean boolean4) {
+    public static List<EnchantmentInstance> selectEnchantment(final Random random, final ItemStack bki, int integer, final boolean boolean4) {
         final List<EnchantmentInstance> list5 = Lists.newArrayList();
-        final Item bei6 = ben.getItem();
-        final int integer2 = bei6.getEnchantmentValue();
+        final Item bke6 = bki.getItem();
+        final int integer2 = bke6.getEnchantmentValue();
         if (integer2 <= 0) {
             return list5;
         }
         integer += 1 + random.nextInt(integer2 / 4 + 1) + random.nextInt(integer2 / 4 + 1);
         final float float8 = (random.nextFloat() + random.nextFloat() - 1.0f) * 0.15f;
         integer = Mth.clamp(Math.round(integer + integer * float8), 1, Integer.MAX_VALUE);
-        final List<EnchantmentInstance> list6 = getAvailableEnchantmentResults(integer, ben, boolean4);
+        final List<EnchantmentInstance> list6 = getAvailableEnchantmentResults(integer, bki, boolean4);
         if (!list6.isEmpty()) {
             list5.add(WeighedRandom.<EnchantmentInstance>getRandomItem(random, list6));
             while (random.nextInt(50) <= integer) {
@@ -298,38 +308,41 @@ public class EnchantmentHelper {
         return list5;
     }
     
-    public static void filterCompatibleEnchantments(final List<EnchantmentInstance> list, final EnchantmentInstance bia) {
+    public static void filterCompatibleEnchantments(final List<EnchantmentInstance> list, final EnchantmentInstance bnz) {
         final Iterator<EnchantmentInstance> iterator3 = list.iterator();
         while (iterator3.hasNext()) {
-            if (!bia.enchantment.isCompatibleWith(iterator3.next().enchantment)) {
+            if (!bnz.enchantment.isCompatibleWith(iterator3.next().enchantment)) {
                 iterator3.remove();
             }
         }
     }
     
-    public static boolean isEnchantmentCompatible(final Collection<Enchantment> collection, final Enchantment bhx) {
-        for (final Enchantment bhx2 : collection) {
-            if (!bhx2.isCompatibleWith(bhx)) {
+    public static boolean isEnchantmentCompatible(final Collection<Enchantment> collection, final Enchantment bnw) {
+        for (final Enchantment bnw2 : collection) {
+            if (!bnw2.isCompatibleWith(bnw)) {
                 return false;
             }
         }
         return true;
     }
     
-    public static List<EnchantmentInstance> getAvailableEnchantmentResults(final int integer, final ItemStack ben, final boolean boolean3) {
+    public static List<EnchantmentInstance> getAvailableEnchantmentResults(final int integer, final ItemStack bki, final boolean boolean3) {
         final List<EnchantmentInstance> list4 = Lists.newArrayList();
-        final Item bei5 = ben.getItem();
-        final boolean boolean4 = ben.getItem() == Items.BOOK;
-        for (final Enchantment bhx8 : Registry.ENCHANTMENT) {
-            if (bhx8.isTreasureOnly() && !boolean3) {
+        final Item bke5 = bki.getItem();
+        final boolean boolean4 = bki.getItem() == Items.BOOK;
+        for (final Enchantment bnw8 : Registry.ENCHANTMENT) {
+            if (bnw8.isTreasureOnly() && !boolean3) {
                 continue;
             }
-            if (!bhx8.category.canEnchant(bei5) && !boolean4) {
+            if (!bnw8.isDiscoverable()) {
                 continue;
             }
-            for (int integer2 = bhx8.getMaxLevel(); integer2 > bhx8.getMinLevel() - 1; --integer2) {
-                if (integer >= bhx8.getMinCost(integer2) && integer <= bhx8.getMaxCost(integer2)) {
-                    list4.add(new EnchantmentInstance(bhx8, integer2));
+            if (!bnw8.category.canEnchant(bke5) && !boolean4) {
+                continue;
+            }
+            for (int integer2 = bnw8.getMaxLevel(); integer2 > bnw8.getMinLevel() - 1; --integer2) {
+                if (integer >= bnw8.getMinCost(integer2) && integer <= bnw8.getMaxCost(integer2)) {
+                    list4.add(new EnchantmentInstance(bnw8, integer2));
                     break;
                 }
             }
@@ -339,6 +352,6 @@ public class EnchantmentHelper {
     
     @FunctionalInterface
     interface EnchantmentVisitor {
-        void accept(final Enchantment bhx, final int integer);
+        void accept(final Enchantment bnw, final int integer);
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/EnchantmentInstance.java b/src/net/minecraft/world/item/enchantment/EnchantmentInstance.java
index 634e647..48215d2 100644
--- a/src/net/minecraft/world/item/enchantment/EnchantmentInstance.java
+++ b/src/net/minecraft/world/item/enchantment/EnchantmentInstance.java
@@ -6,9 +6,9 @@ public class EnchantmentInstance extends WeighedRandom.WeighedRandomItem {
     public final Enchantment enchantment;
     public final int level;
     
-    public EnchantmentInstance(final Enchantment bhx, final int integer) {
-        super(bhx.getRarity().getWeight());
-        this.enchantment = bhx;
+    public EnchantmentInstance(final Enchantment bnw, final int integer) {
+        super(bnw.getRarity().getWeight());
+        this.enchantment = bnw;
         this.level = integer;
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/Enchantments.java b/src/net/minecraft/world/item/enchantment/Enchantments.java
index b5cd740..52860e8 100644
--- a/src/net/minecraft/world/item/enchantment/Enchantments.java
+++ b/src/net/minecraft/world/item/enchantment/Enchantments.java
@@ -16,6 +16,7 @@ public class Enchantments {
     public static final Enchantment DEPTH_STRIDER;
     public static final Enchantment FROST_WALKER;
     public static final Enchantment BINDING_CURSE;
+    public static final Enchantment SOUL_SPEED;
     public static final Enchantment SHARPNESS;
     public static final Enchantment SMITE;
     public static final Enchantment BANE_OF_ARTHROPODS;
@@ -43,8 +44,8 @@ public class Enchantments {
     public static final Enchantment MENDING;
     public static final Enchantment VANISHING_CURSE;
     
-    private static Enchantment register(final String string, final Enchantment bhx) {
-        return Registry.<Enchantment>register(Registry.ENCHANTMENT, string, bhx);
+    private static Enchantment register(final String string, final Enchantment bnw) {
+        return Registry.<Enchantment>register(Registry.ENCHANTMENT, string, bnw);
     }
     
     static {
@@ -60,6 +61,7 @@ public class Enchantments {
         DEPTH_STRIDER = register("depth_strider", new WaterWalkerEnchantment(Enchantment.Rarity.RARE, Enchantments.ARMOR_SLOTS));
         FROST_WALKER = register("frost_walker", new FrostWalkerEnchantment(Enchantment.Rarity.RARE, new EquipmentSlot[] { EquipmentSlot.FEET }));
         BINDING_CURSE = register("binding_curse", new BindingCurseEnchantment(Enchantment.Rarity.VERY_RARE, Enchantments.ARMOR_SLOTS));
+        SOUL_SPEED = register("soul_speed", new SoulSpeedEnchantment(Enchantment.Rarity.VERY_RARE, new EquipmentSlot[] { EquipmentSlot.FEET }));
         SHARPNESS = register("sharpness", new DamageEnchantment(Enchantment.Rarity.COMMON, 0, new EquipmentSlot[] { EquipmentSlot.MAINHAND }));
         SMITE = register("smite", new DamageEnchantment(Enchantment.Rarity.UNCOMMON, 1, new EquipmentSlot[] { EquipmentSlot.MAINHAND }));
         BANE_OF_ARTHROPODS = register("bane_of_arthropods", new DamageEnchantment(Enchantment.Rarity.UNCOMMON, 2, new EquipmentSlot[] { EquipmentSlot.MAINHAND }));
diff --git a/src/net/minecraft/world/item/enchantment/FishingSpeedEnchantment.java b/src/net/minecraft/world/item/enchantment/FishingSpeedEnchantment.java
index 7ebcb5c..0f06f0d 100644
--- a/src/net/minecraft/world/item/enchantment/FishingSpeedEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/FishingSpeedEnchantment.java
@@ -3,8 +3,8 @@ package net.minecraft.world.item.enchantment;
 import net.minecraft.world.entity.EquipmentSlot;
 
 public class FishingSpeedEnchantment extends Enchantment {
-    protected FishingSpeedEnchantment(final Rarity a, final EnchantmentCategory bhy, final EquipmentSlot... arr) {
-        super(a, bhy, arr);
+    protected FishingSpeedEnchantment(final Rarity a, final EnchantmentCategory bnx, final EquipmentSlot... arr) {
+        super(a, bnx, arr);
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/enchantment/FrostWalkerEnchantment.java b/src/net/minecraft/world/item/enchantment/FrostWalkerEnchantment.java
index e5b5f36..29fb6ea 100644
--- a/src/net/minecraft/world/item/enchantment/FrostWalkerEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/FrostWalkerEnchantment.java
@@ -40,31 +40,31 @@ public class FrostWalkerEnchantment extends Enchantment {
         return 2;
     }
     
-    public static void onEntityMoved(final LivingEntity akz, final Level bjw, final BlockPos fk, final int integer) {
-        if (!akz.onGround) {
+    public static void onEntityMoved(final LivingEntity aoy, final Level bqb, final BlockPos fu, final int integer) {
+        if (!aoy.isOnGround()) {
             return;
         }
-        final BlockState byj5 = Blocks.FROSTED_ICE.defaultBlockState();
+        final BlockState cfj5 = Blocks.FROSTED_ICE.defaultBlockState();
         final float float6 = (float)Math.min(16, 2 + integer);
         final BlockPos.MutableBlockPos a7 = new BlockPos.MutableBlockPos();
-        for (final BlockPos fk2 : BlockPos.betweenClosed(fk.offset(-float6, -1.0, -float6), fk.offset(float6, -1.0, float6))) {
-            if (fk2.closerThan(akz.position(), float6)) {
-                a7.set(fk2.getX(), fk2.getY() + 1, fk2.getZ());
-                final BlockState byj6 = bjw.getBlockState(a7);
-                if (!byj6.isAir()) {
+        for (final BlockPos fu2 : BlockPos.betweenClosed(fu.offset(-float6, -1.0, -float6), fu.offset(float6, -1.0, float6))) {
+            if (fu2.closerThan(aoy.position(), float6)) {
+                a7.set(fu2.getX(), fu2.getY() + 1, fu2.getZ());
+                final BlockState cfj6 = bqb.getBlockState(a7);
+                if (!cfj6.isAir()) {
                     continue;
                 }
-                final BlockState byj7 = bjw.getBlockState(fk2);
-                if (byj7.getMaterial() != Material.WATER || byj7.<Integer>getValue((Property<Integer>)LiquidBlock.LEVEL) != 0 || !byj5.canSurvive(bjw, fk2) || !bjw.isUnobstructed(byj5, fk2, CollisionContext.empty())) {
+                final BlockState cfj7 = bqb.getBlockState(fu2);
+                if (cfj7.getMaterial() != Material.WATER || cfj7.<Integer>getValue((Property<Integer>)LiquidBlock.LEVEL) != 0 || !cfj5.canSurvive(bqb, fu2) || !bqb.isUnobstructed(cfj5, fu2, CollisionContext.empty())) {
                     continue;
                 }
-                bjw.setBlockAndUpdate(fk2, byj5);
-                bjw.getBlockTicks().scheduleTick(fk2, Blocks.FROSTED_ICE, Mth.nextInt(akz.getRandom(), 60, 120));
+                bqb.setBlockAndUpdate(fu2, cfj5);
+                bqb.getBlockTicks().scheduleTick(fu2, Blocks.FROSTED_ICE, Mth.nextInt(aoy.getRandom(), 60, 120));
             }
         }
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return super.checkCompatibility(bhx) && bhx != Enchantments.DEPTH_STRIDER;
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return super.checkCompatibility(bnw) && bnw != Enchantments.DEPTH_STRIDER;
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/LootBonusEnchantment.java b/src/net/minecraft/world/item/enchantment/LootBonusEnchantment.java
index d5f99fe..a8588a1 100644
--- a/src/net/minecraft/world/item/enchantment/LootBonusEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/LootBonusEnchantment.java
@@ -3,8 +3,8 @@ package net.minecraft.world.item.enchantment;
 import net.minecraft.world.entity.EquipmentSlot;
 
 public class LootBonusEnchantment extends Enchantment {
-    protected LootBonusEnchantment(final Rarity a, final EnchantmentCategory bhy, final EquipmentSlot... arr) {
-        super(a, bhy, arr);
+    protected LootBonusEnchantment(final Rarity a, final EnchantmentCategory bnx, final EquipmentSlot... arr) {
+        super(a, bnx, arr);
     }
     
     @Override
@@ -22,7 +22,7 @@ public class LootBonusEnchantment extends Enchantment {
         return 3;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return super.checkCompatibility(bhx) && bhx != Enchantments.SILK_TOUCH;
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return super.checkCompatibility(bnw) && bnw != Enchantments.SILK_TOUCH;
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/MultiShotEnchantment.java b/src/net/minecraft/world/item/enchantment/MultiShotEnchantment.java
index b5e50fc..ee20de1 100644
--- a/src/net/minecraft/world/item/enchantment/MultiShotEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/MultiShotEnchantment.java
@@ -22,7 +22,7 @@ public class MultiShotEnchantment extends Enchantment {
         return 1;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return super.checkCompatibility(bhx) && bhx != Enchantments.PIERCING;
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return super.checkCompatibility(bnw) && bnw != Enchantments.PIERCING;
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/ProtectionEnchantment.java b/src/net/minecraft/world/item/enchantment/ProtectionEnchantment.java
index 0989a5c..33ea58c 100644
--- a/src/net/minecraft/world/item/enchantment/ProtectionEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/ProtectionEnchantment.java
@@ -9,11 +9,8 @@ public class ProtectionEnchantment extends Enchantment {
     public final Type type;
     
     public ProtectionEnchantment(final Rarity a, final Type a, final EquipmentSlot... arr) {
-        super(a, EnchantmentCategory.ARMOR, arr);
+        super(a, (a == Type.FALL) ? EnchantmentCategory.ARMOR_FEET : EnchantmentCategory.ARMOR, arr);
         this.type = a;
-        if (a == Type.FALL) {
-            this.category = EnchantmentCategory.ARMOR_FEET;
-        }
     }
     
     @Override
@@ -32,46 +29,46 @@ public class ProtectionEnchantment extends Enchantment {
     }
     
     @Override
-    public int getDamageProtection(final int integer, final DamageSource ajz) {
-        if (ajz.isBypassInvul()) {
+    public int getDamageProtection(final int integer, final DamageSource anw) {
+        if (anw.isBypassInvul()) {
             return 0;
         }
         if (this.type == Type.ALL) {
             return integer;
         }
-        if (this.type == Type.FIRE && ajz.isFire()) {
+        if (this.type == Type.FIRE && anw.isFire()) {
             return integer * 2;
         }
-        if (this.type == Type.FALL && ajz == DamageSource.FALL) {
+        if (this.type == Type.FALL && anw == DamageSource.FALL) {
             return integer * 3;
         }
-        if (this.type == Type.EXPLOSION && ajz.isExplosion()) {
+        if (this.type == Type.EXPLOSION && anw.isExplosion()) {
             return integer * 2;
         }
-        if (this.type == Type.PROJECTILE && ajz.isProjectile()) {
+        if (this.type == Type.PROJECTILE && anw.isProjectile()) {
             return integer * 2;
         }
         return 0;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        if (bhx instanceof ProtectionEnchantment) {
-            final ProtectionEnchantment bik3 = (ProtectionEnchantment)bhx;
-            return this.type != bik3.type && (this.type == Type.FALL || bik3.type == Type.FALL);
+    public boolean checkCompatibility(final Enchantment bnw) {
+        if (bnw instanceof ProtectionEnchantment) {
+            final ProtectionEnchantment boj3 = (ProtectionEnchantment)bnw;
+            return this.type != boj3.type && (this.type == Type.FALL || boj3.type == Type.FALL);
         }
-        return super.checkCompatibility(bhx);
+        return super.checkCompatibility(bnw);
     }
     
-    public static int getFireAfterDampener(final LivingEntity akz, int integer) {
-        final int integer2 = EnchantmentHelper.getEnchantmentLevel(Enchantments.FIRE_PROTECTION, akz);
+    public static int getFireAfterDampener(final LivingEntity aoy, int integer) {
+        final int integer2 = EnchantmentHelper.getEnchantmentLevel(Enchantments.FIRE_PROTECTION, aoy);
         if (integer2 > 0) {
             integer -= Mth.floor(integer * (integer2 * 0.15f));
         }
         return integer;
     }
     
-    public static double getExplosionKnockbackAfterDampener(final LivingEntity akz, double double2) {
-        final int integer4 = EnchantmentHelper.getEnchantmentLevel(Enchantments.BLAST_PROTECTION, akz);
+    public static double getExplosionKnockbackAfterDampener(final LivingEntity aoy, double double2) {
+        final int integer4 = EnchantmentHelper.getEnchantmentLevel(Enchantments.BLAST_PROTECTION, aoy);
         if (integer4 > 0) {
             double2 -= Mth.floor(double2 * (integer4 * 0.15f));
         }
diff --git a/src/net/minecraft/world/item/enchantment/SoulSpeedEnchantment.java b/src/net/minecraft/world/item/enchantment/SoulSpeedEnchantment.java
new file mode 100644
index 0000000..4e13a58
--- /dev/null
+++ b/src/net/minecraft/world/item/enchantment/SoulSpeedEnchantment.java
@@ -0,0 +1,39 @@
+package net.minecraft.world.item.enchantment;
+
+import net.minecraft.world.entity.EquipmentSlot;
+
+public class SoulSpeedEnchantment extends Enchantment {
+    public SoulSpeedEnchantment(final Rarity a, final EquipmentSlot... arr) {
+        super(a, EnchantmentCategory.ARMOR_FEET, arr);
+    }
+    
+    @Override
+    public int getMinCost(final int integer) {
+        return integer * 10;
+    }
+    
+    @Override
+    public int getMaxCost(final int integer) {
+        return this.getMinCost(integer) + 15;
+    }
+    
+    @Override
+    public boolean isTreasureOnly() {
+        return true;
+    }
+    
+    @Override
+    public boolean isTradeable() {
+        return false;
+    }
+    
+    @Override
+    public boolean isDiscoverable() {
+        return false;
+    }
+    
+    @Override
+    public int getMaxLevel() {
+        return 3;
+    }
+}
diff --git a/src/net/minecraft/world/item/enchantment/ThornsEnchantment.java b/src/net/minecraft/world/item/enchantment/ThornsEnchantment.java
index 6b1b836..bef4f1d 100644
--- a/src/net/minecraft/world/item/enchantment/ThornsEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/ThornsEnchantment.java
@@ -30,24 +30,24 @@ public class ThornsEnchantment extends Enchantment {
     }
     
     @Override
-    public boolean canEnchant(final ItemStack ben) {
-        return ben.getItem() instanceof ArmorItem || super.canEnchant(ben);
+    public boolean canEnchant(final ItemStack bki) {
+        return bki.getItem() instanceof ArmorItem || super.canEnchant(bki);
     }
     
     @Override
-    public void doPostHurt(final LivingEntity akz, final Entity akq, final int integer) {
-        final Random random5 = akz.getRandom();
-        final Map.Entry<EquipmentSlot, ItemStack> entry6 = EnchantmentHelper.getRandomItemWith(Enchantments.THORNS, akz);
+    public void doPostHurt(final LivingEntity aoy, final Entity aom, final int integer) {
+        final Random random5 = aoy.getRandom();
+        final Map.Entry<EquipmentSlot, ItemStack> entry6 = EnchantmentHelper.getRandomItemWith(Enchantments.THORNS, aoy);
         if (shouldHit(integer, random5)) {
-            if (akq != null) {
-                akq.hurt(DamageSource.thorns(akz), (float)getDamage(integer, random5));
+            if (aom != null) {
+                aom.hurt(DamageSource.thorns(aoy), (float)getDamage(integer, random5));
             }
             if (entry6 != null) {
-                entry6.getValue().<LivingEntity>hurtAndBreak(3, akz, akz -> akz.broadcastBreakEvent(entry6.getKey()));
+                entry6.getValue().<LivingEntity>hurtAndBreak(3, aoy, aoy -> aoy.broadcastBreakEvent(entry6.getKey()));
             }
         }
         else if (entry6 != null) {
-            entry6.getValue().<LivingEntity>hurtAndBreak(1, akz, akz -> akz.broadcastBreakEvent(entry6.getKey()));
+            entry6.getValue().<LivingEntity>hurtAndBreak(1, aoy, aoy -> aoy.broadcastBreakEvent(entry6.getKey()));
         }
     }
     
diff --git a/src/net/minecraft/world/item/enchantment/TridentChannelingEnchantment.java b/src/net/minecraft/world/item/enchantment/TridentChannelingEnchantment.java
index f3cda8a..4da93a6 100644
--- a/src/net/minecraft/world/item/enchantment/TridentChannelingEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/TridentChannelingEnchantment.java
@@ -22,7 +22,7 @@ public class TridentChannelingEnchantment extends Enchantment {
         return 1;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return super.checkCompatibility(bhx);
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return super.checkCompatibility(bnw);
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/TridentImpalerEnchantment.java b/src/net/minecraft/world/item/enchantment/TridentImpalerEnchantment.java
index 7a63759..a88463e 100644
--- a/src/net/minecraft/world/item/enchantment/TridentImpalerEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/TridentImpalerEnchantment.java
@@ -24,8 +24,8 @@ public class TridentImpalerEnchantment extends Enchantment {
     }
     
     @Override
-    public float getDamageBonus(final int integer, final MobType ald) {
-        if (ald == MobType.WATER) {
+    public float getDamageBonus(final int integer, final MobType apc) {
+        if (apc == MobType.WATER) {
             return integer * 2.5f;
         }
         return 0.0f;
diff --git a/src/net/minecraft/world/item/enchantment/TridentLoyaltyEnchantment.java b/src/net/minecraft/world/item/enchantment/TridentLoyaltyEnchantment.java
index 214da88..a46e1a2 100644
--- a/src/net/minecraft/world/item/enchantment/TridentLoyaltyEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/TridentLoyaltyEnchantment.java
@@ -22,7 +22,7 @@ public class TridentLoyaltyEnchantment extends Enchantment {
         return 3;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return super.checkCompatibility(bhx);
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return super.checkCompatibility(bnw);
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/TridentRiptideEnchantment.java b/src/net/minecraft/world/item/enchantment/TridentRiptideEnchantment.java
index 2230578..a0f53f5 100644
--- a/src/net/minecraft/world/item/enchantment/TridentRiptideEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/TridentRiptideEnchantment.java
@@ -22,7 +22,7 @@ public class TridentRiptideEnchantment extends Enchantment {
         return 3;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return super.checkCompatibility(bhx) && bhx != Enchantments.LOYALTY && bhx != Enchantments.CHANNELING;
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return super.checkCompatibility(bnw) && bnw != Enchantments.LOYALTY && bnw != Enchantments.CHANNELING;
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/UntouchingEnchantment.java b/src/net/minecraft/world/item/enchantment/UntouchingEnchantment.java
index 664f9f4..cce6539 100644
--- a/src/net/minecraft/world/item/enchantment/UntouchingEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/UntouchingEnchantment.java
@@ -22,7 +22,7 @@ public class UntouchingEnchantment extends Enchantment {
         return 1;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return super.checkCompatibility(bhx) && bhx != Enchantments.BLOCK_FORTUNE;
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return super.checkCompatibility(bnw) && bnw != Enchantments.BLOCK_FORTUNE;
     }
 }
diff --git a/src/net/minecraft/world/item/enchantment/VanishingCurseEnchantment.java b/src/net/minecraft/world/item/enchantment/VanishingCurseEnchantment.java
index efa5449..687270c 100644
--- a/src/net/minecraft/world/item/enchantment/VanishingCurseEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/VanishingCurseEnchantment.java
@@ -4,7 +4,7 @@ import net.minecraft.world.entity.EquipmentSlot;
 
 public class VanishingCurseEnchantment extends Enchantment {
     public VanishingCurseEnchantment(final Rarity a, final EquipmentSlot... arr) {
-        super(a, EnchantmentCategory.ALL, arr);
+        super(a, EnchantmentCategory.VANISHABLE, arr);
     }
     
     @Override
diff --git a/src/net/minecraft/world/item/enchantment/WaterWalkerEnchantment.java b/src/net/minecraft/world/item/enchantment/WaterWalkerEnchantment.java
index f6fa984..c6562bb 100644
--- a/src/net/minecraft/world/item/enchantment/WaterWalkerEnchantment.java
+++ b/src/net/minecraft/world/item/enchantment/WaterWalkerEnchantment.java
@@ -22,7 +22,7 @@ public class WaterWalkerEnchantment extends Enchantment {
         return 3;
     }
     
-    public boolean checkCompatibility(final Enchantment bhx) {
-        return super.checkCompatibility(bhx) && bhx != Enchantments.FROST_WALKER;
+    public boolean checkCompatibility(final Enchantment bnw) {
+        return super.checkCompatibility(bnw) && bnw != Enchantments.FROST_WALKER;
     }
 }
diff --git a/src/net/minecraft/world/item/trading/Merchant.java b/src/net/minecraft/world/item/trading/Merchant.java
index e6e6cd5..62d9861 100644
--- a/src/net/minecraft/world/item/trading/Merchant.java
+++ b/src/net/minecraft/world/item/trading/Merchant.java
@@ -14,18 +14,18 @@ import javax.annotation.Nullable;
 import net.minecraft.world.entity.player.Player;
 
 public interface Merchant {
-    void setTradingPlayer(@Nullable final Player ayj);
+    void setTradingPlayer(@Nullable final Player bec);
     
     @Nullable
     Player getTradingPlayer();
     
     MerchantOffers getOffers();
     
-    void overrideOffers(@Nullable final MerchantOffers bja);
+    void overrideOffers(@Nullable final MerchantOffers bpa);
     
-    void notifyTrade(final MerchantOffer biz);
+    void notifyTrade(final MerchantOffer boz);
     
-    void notifyTradeUpdated(final ItemStack ben);
+    void notifyTradeUpdated(final ItemStack bki);
     
     Level getLevel();
     
@@ -41,12 +41,12 @@ public interface Merchant {
         return false;
     }
     
-    default void openTradingScreen(final Player ayj, final Component lf, final int integer) {
-        final OptionalInt optionalInt5 = ayj.openMenu(new SimpleMenuProvider((integer, ayi, ayj) -> new MerchantMenu(integer, ayi, this), lf));
+    default void openTradingScreen(final Player bec, final Component mr, final int integer) {
+        final OptionalInt optionalInt5 = bec.openMenu(new SimpleMenuProvider((integer, beb, bec) -> new MerchantMenu(integer, beb, this), mr));
         if (optionalInt5.isPresent()) {
-            final MerchantOffers bja6 = this.getOffers();
-            if (!bja6.isEmpty()) {
-                ayj.sendMerchantOffers(optionalInt5.getAsInt(), bja6, integer, this.getVillagerXp(), this.showProgressBar(), this.canRestock());
+            final MerchantOffers bpa6 = this.getOffers();
+            if (!bpa6.isEmpty()) {
+                bec.sendMerchantOffers(optionalInt5.getAsInt(), bpa6, integer, this.getVillagerXp(), this.showProgressBar(), this.canRestock());
             }
         }
     }
diff --git a/src/net/minecraft/world/item/trading/MerchantOffer.java b/src/net/minecraft/world/item/trading/MerchantOffer.java
index 0ad256c..dac3a24 100644
--- a/src/net/minecraft/world/item/trading/MerchantOffer.java
+++ b/src/net/minecraft/world/item/trading/MerchantOffer.java
@@ -18,50 +18,50 @@ public class MerchantOffer {
     private float priceMultiplier;
     private int xp;
     
-    public MerchantOffer(final CompoundTag jt) {
+    public MerchantOffer(final CompoundTag le) {
         this.rewardExp = true;
         this.xp = 1;
-        this.baseCostA = ItemStack.of(jt.getCompound("buy"));
-        this.costB = ItemStack.of(jt.getCompound("buyB"));
-        this.result = ItemStack.of(jt.getCompound("sell"));
-        this.uses = jt.getInt("uses");
-        if (jt.contains("maxUses", 99)) {
-            this.maxUses = jt.getInt("maxUses");
+        this.baseCostA = ItemStack.of(le.getCompound("buy"));
+        this.costB = ItemStack.of(le.getCompound("buyB"));
+        this.result = ItemStack.of(le.getCompound("sell"));
+        this.uses = le.getInt("uses");
+        if (le.contains("maxUses", 99)) {
+            this.maxUses = le.getInt("maxUses");
         }
         else {
             this.maxUses = 4;
         }
-        if (jt.contains("rewardExp", 1)) {
-            this.rewardExp = jt.getBoolean("rewardExp");
+        if (le.contains("rewardExp", 1)) {
+            this.rewardExp = le.getBoolean("rewardExp");
         }
-        if (jt.contains("xp", 3)) {
-            this.xp = jt.getInt("xp");
+        if (le.contains("xp", 3)) {
+            this.xp = le.getInt("xp");
         }
-        if (jt.contains("priceMultiplier", 5)) {
-            this.priceMultiplier = jt.getFloat("priceMultiplier");
+        if (le.contains("priceMultiplier", 5)) {
+            this.priceMultiplier = le.getFloat("priceMultiplier");
         }
-        this.specialPriceDiff = jt.getInt("specialPrice");
-        this.demand = jt.getInt("demand");
+        this.specialPriceDiff = le.getInt("specialPrice");
+        this.demand = le.getInt("demand");
     }
     
-    public MerchantOffer(final ItemStack ben1, final ItemStack ben2, final int integer3, final int integer4, final float float5) {
-        this(ben1, ItemStack.EMPTY, ben2, integer3, integer4, float5);
+    public MerchantOffer(final ItemStack bki1, final ItemStack bki2, final int integer3, final int integer4, final float float5) {
+        this(bki1, ItemStack.EMPTY, bki2, integer3, integer4, float5);
     }
     
-    public MerchantOffer(final ItemStack ben1, final ItemStack ben2, final ItemStack ben3, final int integer4, final int integer5, final float float6) {
-        this(ben1, ben2, ben3, 0, integer4, integer5, float6);
+    public MerchantOffer(final ItemStack bki1, final ItemStack bki2, final ItemStack bki3, final int integer4, final int integer5, final float float6) {
+        this(bki1, bki2, bki3, 0, integer4, integer5, float6);
     }
     
-    public MerchantOffer(final ItemStack ben1, final ItemStack ben2, final ItemStack ben3, final int integer4, final int integer5, final int integer6, final float float7) {
-        this(ben1, ben2, ben3, integer4, integer5, integer6, float7, 0);
+    public MerchantOffer(final ItemStack bki1, final ItemStack bki2, final ItemStack bki3, final int integer4, final int integer5, final int integer6, final float float7) {
+        this(bki1, bki2, bki3, integer4, integer5, integer6, float7, 0);
     }
     
-    public MerchantOffer(final ItemStack ben1, final ItemStack ben2, final ItemStack ben3, final int integer4, final int integer5, final int integer6, final float float7, final int integer8) {
+    public MerchantOffer(final ItemStack bki1, final ItemStack bki2, final ItemStack bki3, final int integer4, final int integer5, final int integer6, final float float7, final int integer8) {
         this.rewardExp = true;
         this.xp = 1;
-        this.baseCostA = ben1;
-        this.costB = ben2;
-        this.result = ben3;
+        this.baseCostA = bki1;
+        this.costB = bki2;
+        this.result = bki3;
         this.uses = integer4;
         this.maxUses = integer5;
         this.xp = integer6;
@@ -75,10 +75,10 @@ public class MerchantOffer {
     
     public ItemStack getCostA() {
         final int integer2 = this.baseCostA.getCount();
-        final ItemStack ben3 = this.baseCostA.copy();
+        final ItemStack bki3 = this.baseCostA.copy();
         final int integer3 = Math.max(0, Mth.floor(integer2 * this.demand * this.priceMultiplier));
-        ben3.setCount(Mth.clamp(integer2 + integer3 + this.specialPriceDiff, 1, this.baseCostA.getItem().getMaxStackSize()));
-        return ben3;
+        bki3.setCount(Mth.clamp(integer2 + integer3 + this.specialPriceDiff, 1, this.baseCostA.getItem().getMaxStackSize()));
+        return bki3;
     }
     
     public ItemStack getCostB() {
@@ -158,42 +158,42 @@ public class MerchantOffer {
     }
     
     public CompoundTag createTag() {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.put("buy", this.baseCostA.save(new CompoundTag()));
-        jt2.put("sell", this.result.save(new CompoundTag()));
-        jt2.put("buyB", this.costB.save(new CompoundTag()));
-        jt2.putInt("uses", this.uses);
-        jt2.putInt("maxUses", this.maxUses);
-        jt2.putBoolean("rewardExp", this.rewardExp);
-        jt2.putInt("xp", this.xp);
-        jt2.putFloat("priceMultiplier", this.priceMultiplier);
-        jt2.putInt("specialPrice", this.specialPriceDiff);
-        jt2.putInt("demand", this.demand);
-        return jt2;
+        final CompoundTag le2 = new CompoundTag();
+        le2.put("buy", this.baseCostA.save(new CompoundTag()));
+        le2.put("sell", this.result.save(new CompoundTag()));
+        le2.put("buyB", this.costB.save(new CompoundTag()));
+        le2.putInt("uses", this.uses);
+        le2.putInt("maxUses", this.maxUses);
+        le2.putBoolean("rewardExp", this.rewardExp);
+        le2.putInt("xp", this.xp);
+        le2.putFloat("priceMultiplier", this.priceMultiplier);
+        le2.putInt("specialPrice", this.specialPriceDiff);
+        le2.putInt("demand", this.demand);
+        return le2;
     }
     
-    public boolean satisfiedBy(final ItemStack ben1, final ItemStack ben2) {
-        return this.isRequiredItem(ben1, this.getCostA()) && ben1.getCount() >= this.getCostA().getCount() && this.isRequiredItem(ben2, this.costB) && ben2.getCount() >= this.costB.getCount();
+    public boolean satisfiedBy(final ItemStack bki1, final ItemStack bki2) {
+        return this.isRequiredItem(bki1, this.getCostA()) && bki1.getCount() >= this.getCostA().getCount() && this.isRequiredItem(bki2, this.costB) && bki2.getCount() >= this.costB.getCount();
     }
     
-    private boolean isRequiredItem(final ItemStack ben1, final ItemStack ben2) {
-        if (ben2.isEmpty() && ben1.isEmpty()) {
+    private boolean isRequiredItem(final ItemStack bki1, final ItemStack bki2) {
+        if (bki2.isEmpty() && bki1.isEmpty()) {
             return true;
         }
-        final ItemStack ben3 = ben1.copy();
-        if (ben3.getItem().canBeDepleted()) {
-            ben3.setDamageValue(ben3.getDamageValue());
+        final ItemStack bki3 = bki1.copy();
+        if (bki3.getItem().canBeDepleted()) {
+            bki3.setDamageValue(bki3.getDamageValue());
         }
-        return ItemStack.isSame(ben3, ben2) && (!ben2.hasTag() || (ben3.hasTag() && NbtUtils.compareNbt(ben2.getTag(), ben3.getTag(), false)));
+        return ItemStack.isSame(bki3, bki2) && (!bki2.hasTag() || (bki3.hasTag() && NbtUtils.compareNbt(bki2.getTag(), bki3.getTag(), false)));
     }
     
-    public boolean take(final ItemStack ben1, final ItemStack ben2) {
-        if (!this.satisfiedBy(ben1, ben2)) {
+    public boolean take(final ItemStack bki1, final ItemStack bki2) {
+        if (!this.satisfiedBy(bki1, bki2)) {
             return false;
         }
-        ben1.shrink(this.getCostA().getCount());
+        bki1.shrink(this.getCostA().getCount());
         if (!this.getCostB().isEmpty()) {
-            ben2.shrink(this.getCostB().getCount());
+            bki2.shrink(this.getCostB().getCount());
         }
         return true;
     }
diff --git a/src/net/minecraft/world/item/trading/MerchantOffers.java b/src/net/minecraft/world/item/trading/MerchantOffers.java
index 3928356..8bb03ff 100644
--- a/src/net/minecraft/world/item/trading/MerchantOffers.java
+++ b/src/net/minecraft/world/item/trading/MerchantOffers.java
@@ -13,86 +13,86 @@ public class MerchantOffers extends ArrayList<MerchantOffer> {
     public MerchantOffers() {
     }
     
-    public MerchantOffers(final CompoundTag jt) {
-        final ListTag jz3 = jt.getList("Recipes", 10);
-        for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-            this.add(new MerchantOffer(jz3.getCompound(integer4)));
+    public MerchantOffers(final CompoundTag le) {
+        final ListTag lk3 = le.getList("Recipes", 10);
+        for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+            this.add(new MerchantOffer(lk3.getCompound(integer4)));
         }
     }
     
     @Nullable
-    public MerchantOffer getRecipeFor(final ItemStack ben1, final ItemStack ben2, final int integer) {
+    public MerchantOffer getRecipeFor(final ItemStack bki1, final ItemStack bki2, final int integer) {
         if (integer <= 0 || integer >= this.size()) {
             for (int integer2 = 0; integer2 < this.size(); ++integer2) {
-                final MerchantOffer biz6 = this.get(integer2);
-                if (biz6.satisfiedBy(ben1, ben2)) {
-                    return biz6;
+                final MerchantOffer boz6 = this.get(integer2);
+                if (boz6.satisfiedBy(bki1, bki2)) {
+                    return boz6;
                 }
             }
             return null;
         }
-        final MerchantOffer biz7 = this.get(integer);
-        if (biz7.satisfiedBy(ben1, ben2)) {
-            return biz7;
+        final MerchantOffer boz7 = this.get(integer);
+        if (boz7.satisfiedBy(bki1, bki2)) {
+            return boz7;
         }
         return null;
     }
     
-    public void writeToStream(final FriendlyByteBuf kv) {
-        kv.writeByte((byte)(this.size() & 0xFF));
+    public void writeToStream(final FriendlyByteBuf mg) {
+        mg.writeByte((byte)(this.size() & 0xFF));
         for (int integer3 = 0; integer3 < this.size(); ++integer3) {
-            final MerchantOffer biz4 = this.get(integer3);
-            kv.writeItem(biz4.getBaseCostA());
-            kv.writeItem(biz4.getResult());
-            final ItemStack ben5 = biz4.getCostB();
-            kv.writeBoolean(!ben5.isEmpty());
-            if (!ben5.isEmpty()) {
-                kv.writeItem(ben5);
+            final MerchantOffer boz4 = this.get(integer3);
+            mg.writeItem(boz4.getBaseCostA());
+            mg.writeItem(boz4.getResult());
+            final ItemStack bki5 = boz4.getCostB();
+            mg.writeBoolean(!bki5.isEmpty());
+            if (!bki5.isEmpty()) {
+                mg.writeItem(bki5);
             }
-            kv.writeBoolean(biz4.isOutOfStock());
-            kv.writeInt(biz4.getUses());
-            kv.writeInt(biz4.getMaxUses());
-            kv.writeInt(biz4.getXp());
-            kv.writeInt(biz4.getSpecialPriceDiff());
-            kv.writeFloat(biz4.getPriceMultiplier());
-            kv.writeInt(biz4.getDemand());
+            mg.writeBoolean(boz4.isOutOfStock());
+            mg.writeInt(boz4.getUses());
+            mg.writeInt(boz4.getMaxUses());
+            mg.writeInt(boz4.getXp());
+            mg.writeInt(boz4.getSpecialPriceDiff());
+            mg.writeFloat(boz4.getPriceMultiplier());
+            mg.writeInt(boz4.getDemand());
         }
     }
     
-    public static MerchantOffers createFromStream(final FriendlyByteBuf kv) {
-        final MerchantOffers bja2 = new MerchantOffers();
-        for (int integer3 = kv.readByte() & 0xFF, integer4 = 0; integer4 < integer3; ++integer4) {
-            final ItemStack ben5 = kv.readItem();
-            final ItemStack ben6 = kv.readItem();
-            ItemStack ben7 = ItemStack.EMPTY;
-            if (kv.readBoolean()) {
-                ben7 = kv.readItem();
+    public static MerchantOffers createFromStream(final FriendlyByteBuf mg) {
+        final MerchantOffers bpa2 = new MerchantOffers();
+        for (int integer3 = mg.readByte() & 0xFF, integer4 = 0; integer4 < integer3; ++integer4) {
+            final ItemStack bki5 = mg.readItem();
+            final ItemStack bki6 = mg.readItem();
+            ItemStack bki7 = ItemStack.EMPTY;
+            if (mg.readBoolean()) {
+                bki7 = mg.readItem();
             }
-            final boolean boolean8 = kv.readBoolean();
-            final int integer5 = kv.readInt();
-            final int integer6 = kv.readInt();
-            final int integer7 = kv.readInt();
-            final int integer8 = kv.readInt();
-            final float float13 = kv.readFloat();
-            final int integer9 = kv.readInt();
-            final MerchantOffer biz15 = new MerchantOffer(ben5, ben7, ben6, integer5, integer6, integer7, float13, integer9);
+            final boolean boolean8 = mg.readBoolean();
+            final int integer5 = mg.readInt();
+            final int integer6 = mg.readInt();
+            final int integer7 = mg.readInt();
+            final int integer8 = mg.readInt();
+            final float float13 = mg.readFloat();
+            final int integer9 = mg.readInt();
+            final MerchantOffer boz15 = new MerchantOffer(bki5, bki7, bki6, integer5, integer6, integer7, float13, integer9);
             if (boolean8) {
-                biz15.setToOutOfStock();
+                boz15.setToOutOfStock();
             }
-            biz15.setSpecialPriceDiff(integer8);
-            bja2.add(biz15);
+            boz15.setSpecialPriceDiff(integer8);
+            bpa2.add(boz15);
         }
-        return bja2;
+        return bpa2;
     }
     
     public CompoundTag createTag() {
-        final CompoundTag jt2 = new CompoundTag();
-        final ListTag jz3 = new ListTag();
+        final CompoundTag le2 = new CompoundTag();
+        final ListTag lk3 = new ListTag();
         for (int integer4 = 0; integer4 < this.size(); ++integer4) {
-            final MerchantOffer biz5 = this.get(integer4);
-            ((AbstractList<CompoundTag>)jz3).add(biz5.createTag());
+            final MerchantOffer boz5 = this.get(integer4);
+            ((AbstractList<CompoundTag>)lk3).add(boz5.createTag());
         }
-        jt2.put("Recipes", jz3);
-        return jt2;
+        le2.put("Recipes", lk3);
+        return le2;
     }
 }
diff --git a/src/net/minecraft/world/level/BaseCommandBlock.java b/src/net/minecraft/world/level/BaseCommandBlock.java
index 9a43c71..af909da 100644
--- a/src/net/minecraft/world/level/BaseCommandBlock.java
+++ b/src/net/minecraft/world/level/BaseCommandBlock.java
@@ -2,10 +2,11 @@ package net.minecraft.world.level;
 
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Date;
-import javax.annotation.Nullable;
+import java.util.UUID;
 import net.minecraft.CrashReportCategory;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.ReportedException;
@@ -15,6 +16,7 @@ import com.mojang.brigadier.ResultConsumer;
 import net.minecraft.util.StringUtil;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.TextComponent;
+import javax.annotation.Nullable;
 import net.minecraft.network.chat.Component;
 import java.text.SimpleDateFormat;
 import net.minecraft.commands.CommandSource;
@@ -26,6 +28,7 @@ public abstract class BaseCommandBlock implements CommandSource {
     private boolean updateLastExecution;
     private int successCount;
     private boolean trackOutput;
+    @Nullable
     private Component lastOutput;
     private String command;
     private Component name;
@@ -47,36 +50,36 @@ public abstract class BaseCommandBlock implements CommandSource {
     }
     
     public Component getLastOutput() {
-        return (this.lastOutput == null) ? new TextComponent("") : this.lastOutput;
+        return (this.lastOutput == null) ? TextComponent.EMPTY : this.lastOutput;
     }
     
-    public CompoundTag save(final CompoundTag jt) {
-        jt.putString("Command", this.command);
-        jt.putInt("SuccessCount", this.successCount);
-        jt.putString("CustomName", Component.Serializer.toJson(this.name));
-        jt.putBoolean("TrackOutput", this.trackOutput);
+    public CompoundTag save(final CompoundTag le) {
+        le.putString("Command", this.command);
+        le.putInt("SuccessCount", this.successCount);
+        le.putString("CustomName", Component.Serializer.toJson(this.name));
+        le.putBoolean("TrackOutput", this.trackOutput);
         if (this.lastOutput != null && this.trackOutput) {
-            jt.putString("LastOutput", Component.Serializer.toJson(this.lastOutput));
+            le.putString("LastOutput", Component.Serializer.toJson(this.lastOutput));
         }
-        jt.putBoolean("UpdateLastExecution", this.updateLastExecution);
+        le.putBoolean("UpdateLastExecution", this.updateLastExecution);
         if (this.updateLastExecution && this.lastExecution > 0L) {
-            jt.putLong("LastExecution", this.lastExecution);
+            le.putLong("LastExecution", this.lastExecution);
         }
-        return jt;
+        return le;
     }
     
-    public void load(final CompoundTag jt) {
-        this.command = jt.getString("Command");
-        this.successCount = jt.getInt("SuccessCount");
-        if (jt.contains("CustomName", 8)) {
-            this.setName(Component.Serializer.fromJson(jt.getString("CustomName")));
+    public void load(final CompoundTag le) {
+        this.command = le.getString("Command");
+        this.successCount = le.getInt("SuccessCount");
+        if (le.contains("CustomName", 8)) {
+            this.setName(Component.Serializer.fromJson(le.getString("CustomName")));
         }
-        if (jt.contains("TrackOutput", 1)) {
-            this.trackOutput = jt.getBoolean("TrackOutput");
+        if (le.contains("TrackOutput", 1)) {
+            this.trackOutput = le.getBoolean("TrackOutput");
         }
-        if (jt.contains("LastOutput", 8) && this.trackOutput) {
+        if (le.contains("LastOutput", 8) && this.trackOutput) {
             try {
-                this.lastOutput = Component.Serializer.fromJson(jt.getString("LastOutput"));
+                this.lastOutput = Component.Serializer.fromJson(le.getString("LastOutput"));
             }
             catch (Throwable throwable3) {
                 this.lastOutput = new TextComponent(throwable3.getMessage());
@@ -85,11 +88,11 @@ public abstract class BaseCommandBlock implements CommandSource {
         else {
             this.lastOutput = null;
         }
-        if (jt.contains("UpdateLastExecution")) {
-            this.updateLastExecution = jt.getBoolean("UpdateLastExecution");
+        if (le.contains("UpdateLastExecution")) {
+            this.updateLastExecution = le.getBoolean("UpdateLastExecution");
         }
-        if (this.updateLastExecution && jt.contains("LastExecution")) {
-            this.lastExecution = jt.getLong("LastExecution");
+        if (this.updateLastExecution && le.contains("LastExecution")) {
+            this.lastExecution = le.getLong("LastExecution");
         }
         else {
             this.lastExecution = -1L;
@@ -105,8 +108,8 @@ public abstract class BaseCommandBlock implements CommandSource {
         return this.command;
     }
     
-    public boolean performCommand(final Level bjw) {
-        if (bjw.isClientSide || bjw.getGameTime() == this.lastExecution) {
+    public boolean performCommand(final Level bqb) {
+        if (bqb.isClientSide || bqb.getGameTime() == this.lastExecution) {
             return false;
         }
         if ("Searge".equalsIgnoreCase(this.command)) {
@@ -116,26 +119,26 @@ public abstract class BaseCommandBlock implements CommandSource {
         }
         this.successCount = 0;
         final MinecraftServer minecraftServer3 = this.getLevel().getServer();
-        if (minecraftServer3 != null && minecraftServer3.isInitialized() && minecraftServer3.isCommandBlockEnabled() && !StringUtil.isNullOrEmpty(this.command)) {
+        if (minecraftServer3.isCommandBlockEnabled() && !StringUtil.isNullOrEmpty(this.command)) {
             try {
                 this.lastOutput = null;
-                final CommandSourceStack cq4 = this.createCommandSourceStack().withCallback((ResultConsumer<CommandSourceStack>)((commandContext, boolean2, integer) -> {
+                final CommandSourceStack cz4 = this.createCommandSourceStack().withCallback((ResultConsumer<CommandSourceStack>)((commandContext, boolean2, integer) -> {
                     if (boolean2) {
                         ++this.successCount;
                     }
                 }));
-                minecraftServer3.getCommands().performCommand(cq4, this.command);
+                minecraftServer3.getCommands().performCommand(cz4, this.command);
             }
             catch (Throwable throwable4) {
-                final CrashReport h5 = CrashReport.forThrowable(throwable4, "Executing command block");
-                final CrashReportCategory i6 = h5.addCategory("Command to be executed");
-                i6.setDetail("Command", this::getCommand);
-                i6.setDetail("Name", () -> this.getName().getString());
-                throw new ReportedException(h5);
+                final CrashReport j5 = CrashReport.forThrowable(throwable4, "Executing command block");
+                final CrashReportCategory k6 = j5.addCategory("Command to be executed");
+                k6.setDetail("Command", this::getCommand);
+                k6.setDetail("Name", () -> this.getName().getString());
+                throw new ReportedException(j5);
             }
         }
         if (this.updateLastExecution) {
-            this.lastExecution = bjw.getGameTime();
+            this.lastExecution = bqb.getGameTime();
         }
         else {
             this.lastExecution = -1L;
@@ -147,9 +150,9 @@ public abstract class BaseCommandBlock implements CommandSource {
         return this.name;
     }
     
-    public void setName(@Nullable final Component lf) {
-        if (lf != null) {
-            this.name = lf;
+    public void setName(@Nullable final Component mr) {
+        if (mr != null) {
+            this.name = mr;
         }
         else {
             this.name = BaseCommandBlock.DEFAULT_NAME;
@@ -157,9 +160,9 @@ public abstract class BaseCommandBlock implements CommandSource {
     }
     
     @Override
-    public void sendMessage(final Component lf) {
+    public void sendMessage(final Component mr, final UUID uUID) {
         if (this.trackOutput) {
-            this.lastOutput = new TextComponent("[" + BaseCommandBlock.TIME_FORMAT.format(new Date()) + "] ").append(lf);
+            this.lastOutput = new TextComponent("[" + BaseCommandBlock.TIME_FORMAT.format(new Date()) + "] ").append(mr);
             this.onUpdated();
         }
     }
@@ -168,8 +171,8 @@ public abstract class BaseCommandBlock implements CommandSource {
     
     public abstract void onUpdated();
     
-    public void setLastOutput(@Nullable final Component lf) {
-        this.lastOutput = lf;
+    public void setLastOutput(@Nullable final Component mr) {
+        this.lastOutput = mr;
     }
     
     public void setTrackOutput(final boolean boolean1) {
@@ -180,14 +183,14 @@ public abstract class BaseCommandBlock implements CommandSource {
         return this.trackOutput;
     }
     
-    public boolean usedBy(final Player ayj) {
-        if (!ayj.canUseGameMasterBlocks()) {
-            return false;
+    public InteractionResult usedBy(final Player bec) {
+        if (!bec.canUseGameMasterBlocks()) {
+            return InteractionResult.PASS;
         }
-        if (ayj.getCommandSenderWorld().isClientSide) {
-            ayj.openMinecartCommandBlock(this);
+        if (bec.getCommandSenderWorld().isClientSide) {
+            bec.openMinecartCommandBlock(this);
         }
-        return true;
+        return InteractionResult.sidedSuccess(bec.level.isClientSide);
     }
     
     public abstract Vec3 getPosition();
diff --git a/src/net/minecraft/world/level/BaseSpawner.java b/src/net/minecraft/world/level/BaseSpawner.java
index deadefb..cb3153b 100644
--- a/src/net/minecraft/world/level/BaseSpawner.java
+++ b/src/net/minecraft/world/level/BaseSpawner.java
@@ -62,20 +62,20 @@ public abstract class BaseSpawner {
         try {
             return StringUtil.isNullOrEmpty(string2) ? null : new ResourceLocation(string2);
         }
-        catch (ResourceLocationException r3) {
-            final BlockPos fk4 = this.getPos();
-            BaseSpawner.LOGGER.warn("Invalid entity id '{}' at spawner {}:[{},{},{}]", string2, this.getLevel().dimension.getType(), fk4.getX(), fk4.getY(), fk4.getZ());
+        catch (ResourceLocationException t3) {
+            final BlockPos fu4 = this.getPos();
+            BaseSpawner.LOGGER.warn("Invalid entity id '{}' at spawner {}:[{},{},{}]", string2, this.getLevel().dimension().location(), fu4.getX(), fu4.getY(), fu4.getZ());
             return null;
         }
     }
     
-    public void setEntityId(final EntityType<?> aku) {
-        this.nextSpawnData.getTag().putString("id", Registry.ENTITY_TYPE.getKey(aku).toString());
+    public void setEntityId(final EntityType<?> aoq) {
+        this.nextSpawnData.getTag().putString("id", Registry.ENTITY_TYPE.getKey(aoq).toString());
     }
     
     private boolean isNearPlayer() {
-        final BlockPos fk2 = this.getPos();
-        return this.getLevel().hasNearbyAlivePlayer(fk2.getX() + 0.5, fk2.getY() + 0.5, fk2.getZ() + 0.5, this.requiredPlayerRange);
+        final BlockPos fu2 = this.getPos();
+        return this.getLevel().hasNearbyAlivePlayer(fu2.getX() + 0.5, fu2.getY() + 0.5, fu2.getZ() + 0.5, this.requiredPlayerRange);
     }
     
     public void tick() {
@@ -83,14 +83,14 @@ public abstract class BaseSpawner {
             this.oSpin = this.spin;
             return;
         }
-        final Level bjw2 = this.getLevel();
-        final BlockPos fk3 = this.getPos();
-        if (bjw2.isClientSide) {
-            final double double4 = fk3.getX() + (double)bjw2.random.nextFloat();
-            final double double5 = fk3.getY() + (double)bjw2.random.nextFloat();
-            final double double6 = fk3.getZ() + (double)bjw2.random.nextFloat();
-            bjw2.addParticle(ParticleTypes.SMOKE, double4, double5, double6, 0.0, 0.0, 0.0);
-            bjw2.addParticle(ParticleTypes.FLAME, double4, double5, double6, 0.0, 0.0, 0.0);
+        final Level bqb2 = this.getLevel();
+        final BlockPos fu3 = this.getPos();
+        if (bqb2.isClientSide) {
+            final double double4 = fu3.getX() + bqb2.random.nextDouble();
+            final double double5 = fu3.getY() + bqb2.random.nextDouble();
+            final double double6 = fu3.getZ() + bqb2.random.nextDouble();
+            bqb2.addParticle(ParticleTypes.SMOKE, double4, double5, double6, 0.0, 0.0, 0.0);
+            bqb2.addParticle(ParticleTypes.FLAME, double4, double5, double6, 0.0, 0.0, 0.0);
             if (this.spawnDelay > 0) {
                 --this.spawnDelay;
             }
@@ -107,49 +107,49 @@ public abstract class BaseSpawner {
             }
             boolean boolean4 = false;
             for (int integer5 = 0; integer5 < this.spawnCount; ++integer5) {
-                final CompoundTag jt6 = this.nextSpawnData.getTag();
-                final Optional<EntityType<?>> optional7 = EntityType.by(jt6);
+                final CompoundTag le6 = this.nextSpawnData.getTag();
+                final Optional<EntityType<?>> optional7 = EntityType.by(le6);
                 if (!optional7.isPresent()) {
                     this.delay();
                     return;
                 }
-                final ListTag jz8 = jt6.getList("Pos", 6);
-                final int integer6 = jz8.size();
-                final double double7 = (integer6 >= 1) ? jz8.getDouble(0) : (fk3.getX() + (bjw2.random.nextDouble() - bjw2.random.nextDouble()) * this.spawnRange + 0.5);
-                final double double8 = (integer6 >= 2) ? jz8.getDouble(1) : (fk3.getY() + bjw2.random.nextInt(3) - 1);
-                final double double9 = (integer6 >= 3) ? jz8.getDouble(2) : (fk3.getZ() + (bjw2.random.nextDouble() - bjw2.random.nextDouble()) * this.spawnRange + 0.5);
-                if (bjw2.noCollision(optional7.get().getAABB(double7, double8, double9))) {
-                    if (SpawnPlacements.<Entity>checkSpawnRules(optional7.get(), bjw2.getLevel(), MobSpawnType.SPAWNER, new BlockPos(double7, double8, double9), bjw2.getRandom())) {
-                        final Entity akq2 = EntityType.loadEntityRecursive(jt6, bjw2, akq -> {
-                            akq.moveTo(double7, double8, double9, akq.yRot, akq.xRot);
-                            return akq;
+                final ListTag lk8 = le6.getList("Pos", 6);
+                final int integer6 = lk8.size();
+                final double double7 = (integer6 >= 1) ? lk8.getDouble(0) : (fu3.getX() + (bqb2.random.nextDouble() - bqb2.random.nextDouble()) * this.spawnRange + 0.5);
+                final double double8 = (integer6 >= 2) ? lk8.getDouble(1) : (fu3.getY() + bqb2.random.nextInt(3) - 1);
+                final double double9 = (integer6 >= 3) ? lk8.getDouble(2) : (fu3.getZ() + (bqb2.random.nextDouble() - bqb2.random.nextDouble()) * this.spawnRange + 0.5);
+                if (bqb2.noCollision(optional7.get().getAABB(double7, double8, double9))) {
+                    if (SpawnPlacements.<Entity>checkSpawnRules(optional7.get(), bqb2.getLevel(), MobSpawnType.SPAWNER, new BlockPos(double7, double8, double9), bqb2.getRandom())) {
+                        final Entity aom2 = EntityType.loadEntityRecursive(le6, bqb2, aom -> {
+                            aom.moveTo(double7, double8, double9, aom.yRot, aom.xRot);
+                            return aom;
                         });
-                        if (akq2 == null) {
+                        if (aom2 == null) {
                             this.delay();
                             return;
                         }
-                        final int integer7 = bjw2.<Entity>getEntitiesOfClass(akq2.getClass(), new AABB(fk3.getX(), fk3.getY(), fk3.getZ(), fk3.getX() + 1, fk3.getY() + 1, fk3.getZ() + 1).inflate(this.spawnRange)).size();
+                        final int integer7 = bqb2.<Entity>getEntitiesOfClass(aom2.getClass(), new AABB(fu3.getX(), fu3.getY(), fu3.getZ(), fu3.getX() + 1, fu3.getY() + 1, fu3.getZ() + 1).inflate(this.spawnRange)).size();
                         if (integer7 >= this.maxNearbyEntities) {
                             this.delay();
                             return;
                         }
-                        akq2.moveTo(akq2.getX(), akq2.getY(), akq2.getZ(), bjw2.random.nextFloat() * 360.0f, 0.0f);
-                        if (akq2 instanceof Mob) {
-                            final Mob ala18 = (Mob)akq2;
-                            if (!ala18.checkSpawnRules(bjw2, MobSpawnType.SPAWNER)) {
+                        aom2.moveTo(aom2.getX(), aom2.getY(), aom2.getZ(), bqb2.random.nextFloat() * 360.0f, 0.0f);
+                        if (aom2 instanceof Mob) {
+                            final Mob aoz18 = (Mob)aom2;
+                            if (!aoz18.checkSpawnRules(bqb2, MobSpawnType.SPAWNER)) {
                                 continue;
                             }
-                            if (!ala18.checkSpawnObstruction(bjw2)) {
+                            if (!aoz18.checkSpawnObstruction(bqb2)) {
                                 continue;
                             }
                             if (this.nextSpawnData.getTag().size() == 1 && this.nextSpawnData.getTag().contains("id", 8)) {
-                                ((Mob)akq2).finalizeSpawn(bjw2, bjw2.getCurrentDifficultyAt(new BlockPos(akq2)), MobSpawnType.SPAWNER, null, null);
+                                ((Mob)aom2).finalizeSpawn(bqb2, bqb2.getCurrentDifficultyAt(aom2.blockPosition()), MobSpawnType.SPAWNER, null, null);
                             }
                         }
-                        this.addWithPassengers(akq2);
-                        bjw2.levelEvent(2004, fk3, 0);
-                        if (akq2 instanceof Mob) {
-                            ((Mob)akq2).spawnAnim();
+                        this.addWithPassengers(aom2);
+                        bqb2.levelEvent(2004, fu3, 0);
+                        if (aom2 instanceof Mob) {
+                            ((Mob)aom2).spawnAnim();
                         }
                         boolean4 = true;
                     }
@@ -161,12 +161,12 @@ public abstract class BaseSpawner {
         }
     }
     
-    private void addWithPassengers(final Entity akq) {
-        if (!this.getLevel().addFreshEntity(akq)) {
+    private void addWithPassengers(final Entity aom) {
+        if (!this.getLevel().addFreshEntity(aom)) {
             return;
         }
-        for (final Entity akq2 : akq.getPassengers()) {
-            this.addWithPassengers(akq2);
+        for (final Entity aom2 : aom.getPassengers()) {
+            this.addWithPassengers(aom2);
         }
     }
     
@@ -183,62 +183,62 @@ public abstract class BaseSpawner {
         this.broadcastEvent(1);
     }
     
-    public void load(final CompoundTag jt) {
-        this.spawnDelay = jt.getShort("Delay");
+    public void load(final CompoundTag le) {
+        this.spawnDelay = le.getShort("Delay");
         this.spawnPotentials.clear();
-        if (jt.contains("SpawnPotentials", 9)) {
-            final ListTag jz3 = jt.getList("SpawnPotentials", 10);
-            for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-                this.spawnPotentials.add(new SpawnData(jz3.getCompound(integer4)));
+        if (le.contains("SpawnPotentials", 9)) {
+            final ListTag lk3 = le.getList("SpawnPotentials", 10);
+            for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+                this.spawnPotentials.add(new SpawnData(lk3.getCompound(integer4)));
             }
         }
-        if (jt.contains("SpawnData", 10)) {
-            this.setNextSpawnData(new SpawnData(1, jt.getCompound("SpawnData")));
+        if (le.contains("SpawnData", 10)) {
+            this.setNextSpawnData(new SpawnData(1, le.getCompound("SpawnData")));
         }
         else if (!this.spawnPotentials.isEmpty()) {
             this.setNextSpawnData(WeighedRandom.<SpawnData>getRandomItem(this.getLevel().random, this.spawnPotentials));
         }
-        if (jt.contains("MinSpawnDelay", 99)) {
-            this.minSpawnDelay = jt.getShort("MinSpawnDelay");
-            this.maxSpawnDelay = jt.getShort("MaxSpawnDelay");
-            this.spawnCount = jt.getShort("SpawnCount");
+        if (le.contains("MinSpawnDelay", 99)) {
+            this.minSpawnDelay = le.getShort("MinSpawnDelay");
+            this.maxSpawnDelay = le.getShort("MaxSpawnDelay");
+            this.spawnCount = le.getShort("SpawnCount");
         }
-        if (jt.contains("MaxNearbyEntities", 99)) {
-            this.maxNearbyEntities = jt.getShort("MaxNearbyEntities");
-            this.requiredPlayerRange = jt.getShort("RequiredPlayerRange");
+        if (le.contains("MaxNearbyEntities", 99)) {
+            this.maxNearbyEntities = le.getShort("MaxNearbyEntities");
+            this.requiredPlayerRange = le.getShort("RequiredPlayerRange");
         }
-        if (jt.contains("SpawnRange", 99)) {
-            this.spawnRange = jt.getShort("SpawnRange");
+        if (le.contains("SpawnRange", 99)) {
+            this.spawnRange = le.getShort("SpawnRange");
         }
         if (this.getLevel() != null) {
             this.displayEntity = null;
         }
     }
     
-    public CompoundTag save(final CompoundTag jt) {
-        final ResourceLocation sm3 = this.getEntityId();
-        if (sm3 == null) {
-            return jt;
+    public CompoundTag save(final CompoundTag le) {
+        final ResourceLocation uh3 = this.getEntityId();
+        if (uh3 == null) {
+            return le;
         }
-        jt.putShort("Delay", (short)this.spawnDelay);
-        jt.putShort("MinSpawnDelay", (short)this.minSpawnDelay);
-        jt.putShort("MaxSpawnDelay", (short)this.maxSpawnDelay);
-        jt.putShort("SpawnCount", (short)this.spawnCount);
-        jt.putShort("MaxNearbyEntities", (short)this.maxNearbyEntities);
-        jt.putShort("RequiredPlayerRange", (short)this.requiredPlayerRange);
-        jt.putShort("SpawnRange", (short)this.spawnRange);
-        jt.put("SpawnData", this.nextSpawnData.getTag().copy());
-        final ListTag jz4 = new ListTag();
+        le.putShort("Delay", (short)this.spawnDelay);
+        le.putShort("MinSpawnDelay", (short)this.minSpawnDelay);
+        le.putShort("MaxSpawnDelay", (short)this.maxSpawnDelay);
+        le.putShort("SpawnCount", (short)this.spawnCount);
+        le.putShort("MaxNearbyEntities", (short)this.maxNearbyEntities);
+        le.putShort("RequiredPlayerRange", (short)this.requiredPlayerRange);
+        le.putShort("SpawnRange", (short)this.spawnRange);
+        le.put("SpawnData", this.nextSpawnData.getTag().copy());
+        final ListTag lk4 = new ListTag();
         if (this.spawnPotentials.isEmpty()) {
-            ((AbstractList<CompoundTag>)jz4).add(this.nextSpawnData.save());
+            ((AbstractList<CompoundTag>)lk4).add(this.nextSpawnData.save());
         }
         else {
-            for (final SpawnData bkk6 : this.spawnPotentials) {
-                ((AbstractList<CompoundTag>)jz4).add(bkk6.save());
+            for (final SpawnData bqp6 : this.spawnPotentials) {
+                ((AbstractList<CompoundTag>)lk4).add(bqp6.save());
             }
         }
-        jt.put("SpawnPotentials", jz4);
-        return jt;
+        le.put("SpawnPotentials", lk4);
+        return le;
     }
     
     @Nullable
@@ -246,7 +246,7 @@ public abstract class BaseSpawner {
         if (this.displayEntity == null) {
             this.displayEntity = EntityType.loadEntityRecursive(this.nextSpawnData.getTag(), this.getLevel(), Function.<Entity>identity());
             if (this.nextSpawnData.getTag().size() == 1 && this.nextSpawnData.getTag().contains("id", 8) && this.displayEntity instanceof Mob) {
-                ((Mob)this.displayEntity).finalizeSpawn(this.getLevel(), this.getLevel().getCurrentDifficultyAt(new BlockPos(this.displayEntity)), MobSpawnType.SPAWNER, null, null);
+                ((Mob)this.displayEntity).finalizeSpawn(this.getLevel(), this.getLevel().getCurrentDifficultyAt(this.displayEntity.blockPosition()), MobSpawnType.SPAWNER, null, null);
             }
         }
         return this.displayEntity;
@@ -260,8 +260,8 @@ public abstract class BaseSpawner {
         return false;
     }
     
-    public void setNextSpawnData(final SpawnData bkk) {
-        this.nextSpawnData = bkk;
+    public void setNextSpawnData(final SpawnData bqp) {
+        this.nextSpawnData = bqp;
     }
     
     public abstract void broadcastEvent(final int integer);
diff --git a/src/net/minecraft/world/level/BlockAndTintGetter.java b/src/net/minecraft/world/level/BlockAndTintGetter.java
index 1090adf..2cbd7df 100644
--- a/src/net/minecraft/world/level/BlockAndTintGetter.java
+++ b/src/net/minecraft/world/level/BlockAndTintGetter.java
@@ -2,21 +2,24 @@ package net.minecraft.world.level;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.core.Direction;
 
 public interface BlockAndTintGetter extends BlockGetter {
+    float getShade(final Direction fz, final boolean boolean2);
+    
     LevelLightEngine getLightEngine();
     
-    int getBlockTint(final BlockPos fk, final ColorResolver colorResolver);
+    int getBlockTint(final BlockPos fu, final ColorResolver colorResolver);
     
-    default int getBrightness(final LightLayer bkf, final BlockPos fk) {
-        return this.getLightEngine().getLayerListener(bkf).getLightValue(fk);
+    default int getBrightness(final LightLayer bqi, final BlockPos fu) {
+        return this.getLightEngine().getLayerListener(bqi).getLightValue(fu);
     }
     
-    default int getRawBrightness(final BlockPos fk, final int integer) {
-        return this.getLightEngine().getRawBrightness(fk, integer);
+    default int getRawBrightness(final BlockPos fu, final int integer) {
+        return this.getLightEngine().getRawBrightness(fu, integer);
     }
     
-    default boolean canSeeSky(final BlockPos fk) {
-        return this.getBrightness(LightLayer.SKY, fk) >= this.getMaxLightLevel();
+    default boolean canSeeSky(final BlockPos fu) {
+        return this.getBrightness(LightLayer.SKY, fu) >= this.getMaxLightLevel();
     }
 }
diff --git a/src/net/minecraft/world/level/BlockEventData.java b/src/net/minecraft/world/level/BlockEventData.java
index 086364a..fcfc53b 100644
--- a/src/net/minecraft/world/level/BlockEventData.java
+++ b/src/net/minecraft/world/level/BlockEventData.java
@@ -9,9 +9,9 @@ public class BlockEventData {
     private final int paramA;
     private final int paramB;
     
-    public BlockEventData(final BlockPos fk, final Block bph, final int integer3, final int integer4) {
-        this.pos = fk;
-        this.block = bph;
+    public BlockEventData(final BlockPos fu, final Block bvr, final int integer3, final int integer4) {
+        this.pos = fu;
+        this.block = bvr;
         this.paramA = integer3;
         this.paramB = integer4;
     }
@@ -35,8 +35,8 @@ public class BlockEventData {
     @Override
     public boolean equals(final Object object) {
         if (object instanceof BlockEventData) {
-            final BlockEventData bjf3 = (BlockEventData)object;
-            return this.pos.equals(bjf3.pos) && this.paramA == bjf3.paramA && this.paramB == bjf3.paramB && this.block == bjf3.block;
+            final BlockEventData bpf3 = (BlockEventData)object;
+            return this.pos.equals(bpf3.pos) && this.paramA == bpf3.paramA && this.paramB == bpf3.paramB && this.block == bpf3.block;
         }
         return false;
     }
diff --git a/src/net/minecraft/world/level/BlockGetter.java b/src/net/minecraft/world/level/BlockGetter.java
index 289474d..caf51b3 100644
--- a/src/net/minecraft/world/level/BlockGetter.java
+++ b/src/net/minecraft/world/level/BlockGetter.java
@@ -1,12 +1,14 @@
 package net.minecraft.world.level;
 
 import net.minecraft.util.Mth;
-import java.util.function.Function;
 import java.util.function.BiFunction;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.Direction;
 import net.minecraft.world.phys.BlockHitResult;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.state.BlockState;
 import javax.annotation.Nullable;
@@ -15,14 +17,14 @@ import net.minecraft.core.BlockPos;
 
 public interface BlockGetter {
     @Nullable
-    BlockEntity getBlockEntity(final BlockPos fk);
+    BlockEntity getBlockEntity(final BlockPos fu);
     
-    BlockState getBlockState(final BlockPos fk);
+    BlockState getBlockState(final BlockPos fu);
     
-    FluidState getFluidState(final BlockPos fk);
+    FluidState getFluidState(final BlockPos fu);
     
-    default int getLightEmission(final BlockPos fk) {
-        return this.getBlockState(fk).getLightEmission();
+    default int getLightEmission(final BlockPos fu) {
+        return this.getBlockState(fu).getLightEmission();
     }
     
     default int getMaxLightLevel() {
@@ -33,65 +35,69 @@ public interface BlockGetter {
         return 256;
     }
     
-    default BlockHitResult clip(final ClipContext bjj) {
-        final BlockState byj4;
-        final FluidState coj5;
-        final Vec3 cvl6;
-        final Vec3 cvl7;
-        final VoxelShape cwf8;
-        final BlockHitResult cvg9;
-        final VoxelShape cwf9;
-        final BlockHitResult cvg10;
+    default Stream<BlockState> getBlockStates(final AABB deg) {
+        return BlockPos.betweenClosedStream(deg).<BlockState>map(this::getBlockState);
+    }
+    
+    default BlockHitResult clip(final ClipContext bpj) {
+        final BlockState cfj4;
+        final FluidState cxa5;
+        final Vec3 dem6;
+        final Vec3 dem7;
+        final VoxelShape dfg8;
+        final BlockHitResult deh9;
+        final VoxelShape dfg9;
+        final BlockHitResult deh10;
         final double double12;
         final double double13;
-        final Vec3 cvl8;
-        return BlockGetter.<BlockHitResult>traverseBlocks(bjj, (bjj, fk) -> {
-            byj4 = this.getBlockState(fk);
-            coj5 = this.getFluidState(fk);
-            cvl6 = bjj.getFrom();
-            cvl7 = bjj.getTo();
-            cwf8 = bjj.getBlockShape(byj4, this, fk);
-            cvg9 = this.clipWithInteractionOverride(cvl6, cvl7, fk, cwf8, byj4);
-            cwf9 = bjj.getFluidShape(coj5, this, fk);
-            cvg10 = cwf9.clip(cvl6, cvl7, fk);
-            double12 = ((cvg9 == null) ? Double.MAX_VALUE : bjj.getFrom().distanceToSqr(cvg9.getLocation()));
-            double13 = ((cvg10 == null) ? Double.MAX_VALUE : bjj.getFrom().distanceToSqr(cvg10.getLocation()));
-            return (double12 <= double13) ? cvg9 : cvg10;
-        }, bjj -> {
-            cvl8 = bjj.getFrom().subtract(bjj.getTo());
-            return BlockHitResult.miss(bjj.getTo(), Direction.getNearest(cvl8.x, cvl8.y, cvl8.z), new BlockPos(bjj.getTo()));
+        final Vec3 dem8;
+        return BlockGetter.<BlockHitResult>traverseBlocks(bpj, (bpj, fu) -> {
+            cfj4 = this.getBlockState(fu);
+            cxa5 = this.getFluidState(fu);
+            dem6 = bpj.getFrom();
+            dem7 = bpj.getTo();
+            dfg8 = bpj.getBlockShape(cfj4, this, fu);
+            deh9 = this.clipWithInteractionOverride(dem6, dem7, fu, dfg8, cfj4);
+            dfg9 = bpj.getFluidShape(cxa5, this, fu);
+            deh10 = dfg9.clip(dem6, dem7, fu);
+            double12 = ((deh9 == null) ? Double.MAX_VALUE : bpj.getFrom().distanceToSqr(deh9.getLocation()));
+            double13 = ((deh10 == null) ? Double.MAX_VALUE : bpj.getFrom().distanceToSqr(deh10.getLocation()));
+            return (double12 <= double13) ? deh9 : deh10;
+        }, bpj -> {
+            dem8 = bpj.getFrom().subtract(bpj.getTo());
+            return BlockHitResult.miss(bpj.getTo(), Direction.getNearest(dem8.x, dem8.y, dem8.z), new BlockPos(bpj.getTo()));
         });
     }
     
     @Nullable
-    default BlockHitResult clipWithInteractionOverride(final Vec3 cvl1, final Vec3 cvl2, final BlockPos fk, final VoxelShape cwf, final BlockState byj) {
-        final BlockHitResult cvg7 = cwf.clip(cvl1, cvl2, fk);
-        if (cvg7 != null) {
-            final BlockHitResult cvg8 = byj.getInteractionShape(this, fk).clip(cvl1, cvl2, fk);
-            if (cvg8 != null && cvg8.getLocation().subtract(cvl1).lengthSqr() < cvg7.getLocation().subtract(cvl1).lengthSqr()) {
-                return cvg7.withDirection(cvg8.getDirection());
+    default BlockHitResult clipWithInteractionOverride(final Vec3 dem1, final Vec3 dem2, final BlockPos fu, final VoxelShape dfg, final BlockState cfj) {
+        final BlockHitResult deh7 = dfg.clip(dem1, dem2, fu);
+        if (deh7 != null) {
+            final BlockHitResult deh8 = cfj.getInteractionShape(this, fu).clip(dem1, dem2, fu);
+            if (deh8 != null && deh8.getLocation().subtract(dem1).lengthSqr() < deh7.getLocation().subtract(dem1).lengthSqr()) {
+                return deh7.withDirection(deh8.getDirection());
             }
         }
-        return cvg7;
+        return deh7;
     }
     
-    default <T> T traverseBlocks(final ClipContext bjj, final BiFunction<ClipContext, BlockPos, T> biFunction, final Function<ClipContext, T> function) {
-        final Vec3 cvl4 = bjj.getFrom();
-        final Vec3 cvl5 = bjj.getTo();
-        if (cvl4.equals(cvl5)) {
-            return function.apply(bjj);
+    default <T> T traverseBlocks(final ClipContext bpj, final BiFunction<ClipContext, BlockPos, T> biFunction, final Function<ClipContext, T> function) {
+        final Vec3 dem4 = bpj.getFrom();
+        final Vec3 dem5 = bpj.getTo();
+        if (dem4.equals(dem5)) {
+            return function.apply(bpj);
         }
-        final double double6 = Mth.lerp(-1.0E-7, cvl5.x, cvl4.x);
-        final double double7 = Mth.lerp(-1.0E-7, cvl5.y, cvl4.y);
-        final double double8 = Mth.lerp(-1.0E-7, cvl5.z, cvl4.z);
-        final double double9 = Mth.lerp(-1.0E-7, cvl4.x, cvl5.x);
-        final double double10 = Mth.lerp(-1.0E-7, cvl4.y, cvl5.y);
-        final double double11 = Mth.lerp(-1.0E-7, cvl4.z, cvl5.z);
+        final double double6 = Mth.lerp(-1.0E-7, dem5.x, dem4.x);
+        final double double7 = Mth.lerp(-1.0E-7, dem5.y, dem4.y);
+        final double double8 = Mth.lerp(-1.0E-7, dem5.z, dem4.z);
+        final double double9 = Mth.lerp(-1.0E-7, dem4.x, dem5.x);
+        final double double10 = Mth.lerp(-1.0E-7, dem4.y, dem5.y);
+        final double double11 = Mth.lerp(-1.0E-7, dem4.z, dem5.z);
         int integer18 = Mth.floor(double9);
         int integer19 = Mth.floor(double10);
         int integer20 = Mth.floor(double11);
         final BlockPos.MutableBlockPos a21 = new BlockPos.MutableBlockPos(integer18, integer19, integer20);
-        final T object22 = biFunction.apply(bjj, a21);
+        final T object22 = biFunction.apply(bpj, a21);
         if (object22 != null) {
             return object22;
         }
@@ -126,11 +132,11 @@ public interface BlockGetter {
                 integer20 += integer23;
                 double20 += double17;
             }
-            final T object23 = biFunction.apply(bjj, a21.set(integer18, integer19, integer20));
+            final T object23 = biFunction.apply(bpj, a21.set(integer18, integer19, integer20));
             if (object23 != null) {
                 return object23;
             }
         }
-        return function.apply(bjj);
+        return function.apply(bpj);
     }
 }
diff --git a/src/net/minecraft/world/level/ChunkPos.java b/src/net/minecraft/world/level/ChunkPos.java
index b986d1f..dd862d7 100644
--- a/src/net/minecraft/world/level/ChunkPos.java
+++ b/src/net/minecraft/world/level/ChunkPos.java
@@ -18,9 +18,9 @@ public class ChunkPos {
         this.z = integer2;
     }
     
-    public ChunkPos(final BlockPos fk) {
-        this.x = fk.getX() >> 4;
-        this.z = fk.getZ() >> 4;
+    public ChunkPos(final BlockPos fu) {
+        this.x = fu.getX() >> 4;
+        this.z = fu.getZ() >> 4;
     }
     
     public ChunkPos(final long long1) {
@@ -57,8 +57,8 @@ public class ChunkPos {
             return true;
         }
         if (object instanceof ChunkPos) {
-            final ChunkPos bjh3 = (ChunkPos)object;
-            return this.x == bjh3.x && this.z == bjh3.z;
+            final ChunkPos bph3 = (ChunkPos)object;
+            return this.x == bph3.x && this.z == bph3.z;
         }
         return false;
     }
@@ -105,22 +105,22 @@ public class ChunkPos {
     }
     
     public BlockPos getWorldPosition() {
-        return new BlockPos(this.x << 4, 0, this.z << 4);
+        return new BlockPos(this.getMinBlockX(), 0, this.getMinBlockZ());
     }
     
-    public int getChessboardDistance(final ChunkPos bjh) {
-        return Math.max(Math.abs(this.x - bjh.x), Math.abs(this.z - bjh.z));
+    public int getChessboardDistance(final ChunkPos bph) {
+        return Math.max(Math.abs(this.x - bph.x), Math.abs(this.z - bph.z));
     }
     
-    public static Stream<ChunkPos> rangeClosed(final ChunkPos bjh, final int integer) {
-        return rangeClosed(new ChunkPos(bjh.x - integer, bjh.z - integer), new ChunkPos(bjh.x + integer, bjh.z + integer));
+    public static Stream<ChunkPos> rangeClosed(final ChunkPos bph, final int integer) {
+        return rangeClosed(new ChunkPos(bph.x - integer, bph.z - integer), new ChunkPos(bph.x + integer, bph.z + integer));
     }
     
-    public static Stream<ChunkPos> rangeClosed(final ChunkPos bjh1, final ChunkPos bjh2) {
-        final int integer3 = Math.abs(bjh1.x - bjh2.x) + 1;
-        final int integer4 = Math.abs(bjh1.z - bjh2.z) + 1;
-        final int integer5 = (bjh1.x < bjh2.x) ? 1 : -1;
-        final int integer6 = (bjh1.z < bjh2.z) ? 1 : -1;
+    public static Stream<ChunkPos> rangeClosed(final ChunkPos bph1, final ChunkPos bph2) {
+        final int integer3 = Math.abs(bph1.x - bph2.x) + 1;
+        final int integer4 = Math.abs(bph1.z - bph2.z) + 1;
+        final int integer5 = (bph1.x < bph2.x) ? 1 : -1;
+        final int integer6 = (bph1.z < bph2.z) ? 1 : -1;
         return StreamSupport.<ChunkPos>stream((Spliterator<ChunkPos>)new Spliterators.AbstractSpliterator<ChunkPos>((long)(integer3 * integer4), 64) {
             @Nullable
             private ChunkPos pos;
@@ -128,16 +128,16 @@ public class ChunkPos {
             @Override
             public boolean tryAdvance(final Consumer<? super ChunkPos> consumer) {
                 if (this.pos == null) {
-                    this.pos = bjh1;
+                    this.pos = bph1;
                 }
                 else {
                     final int integer3 = this.pos.x;
                     final int integer4 = this.pos.z;
-                    if (integer3 == bjh2.x) {
-                        if (integer4 == bjh2.z) {
+                    if (integer3 == bph2.x) {
+                        if (integer4 == bph2.z) {
                             return false;
                         }
-                        this.pos = new ChunkPos(bjh1.x, integer4 + integer6);
+                        this.pos = new ChunkPos(bph1.x, integer4 + integer6);
                     }
                     else {
                         this.pos = new ChunkPos(integer3 + integer5, integer4);
diff --git a/src/net/minecraft/world/level/ChunkTickList.java b/src/net/minecraft/world/level/ChunkTickList.java
index 3b74492..01b23cb 100644
--- a/src/net/minecraft/world/level/ChunkTickList.java
+++ b/src/net/minecraft/world/level/ChunkTickList.java
@@ -1,66 +1,93 @@
 package net.minecraft.world.level;
 
+import java.util.AbstractList;
+import com.google.common.collect.Lists;
+import java.util.Iterator;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
-import com.google.common.collect.Sets;
-import java.util.List;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 import net.minecraft.resources.ResourceLocation;
 import java.util.function.Function;
-import java.util.Set;
+import java.util.List;
 
 public class ChunkTickList<T> implements TickList<T> {
-    private final Set<TickNextTickData<T>> ticks;
+    private final List<ScheduledTick<T>> ticks;
     private final Function<T, ResourceLocation> toId;
     
-    public ChunkTickList(final Function<T, ResourceLocation> function, final List<TickNextTickData<T>> list) {
-        this(function, (Set)Sets.newHashSet(list));
+    public ChunkTickList(final Function<T, ResourceLocation> function, final List<TickNextTickData<T>> list, final long long3) {
+        this(function, (List)list.stream().map(bqs -> new ScheduledTick(bqs.getType(), bqs.pos, (int)(bqs.triggerTick - long3), bqs.priority)).collect(Collectors.toList()));
     }
     
-    private ChunkTickList(final Function<T, ResourceLocation> function, final Set<TickNextTickData<T>> set) {
-        this.ticks = set;
+    private ChunkTickList(final Function<T, ResourceLocation> function, final List<ScheduledTick<T>> list) {
+        this.ticks = list;
         this.toId = function;
     }
     
     @Override
-    public boolean hasScheduledTick(final BlockPos fk, final T object) {
+    public boolean hasScheduledTick(final BlockPos fu, final T object) {
         return false;
     }
     
     @Override
-    public void scheduleTick(final BlockPos fk, final T object, final int integer, final TickPriority bkn) {
-        this.ticks.add(new TickNextTickData<T>(fk, object, integer, bkn));
+    public void scheduleTick(final BlockPos fu, final T object, final int integer, final TickPriority bqt) {
+        this.ticks.add(new ScheduledTick<T>(object, fu, integer, bqt));
     }
     
     @Override
-    public boolean willTickThisTick(final BlockPos fk, final T object) {
+    public boolean willTickThisTick(final BlockPos fu, final T object) {
         return false;
     }
     
-    @Override
-    public void addAll(final Stream<TickNextTickData<T>> stream) {
-        stream.forEach(this.ticks::add);
+    public ListTag save() {
+        final ListTag lk2 = new ListTag();
+        for (final ScheduledTick<T> a4 : this.ticks) {
+            final CompoundTag le5 = new CompoundTag();
+            le5.putString("i", this.toId.apply((T)((ScheduledTick<Object>)a4).type).toString());
+            le5.putInt("x", a4.pos.getX());
+            le5.putInt("y", a4.pos.getY());
+            le5.putInt("z", a4.pos.getZ());
+            le5.putInt("t", a4.delay);
+            le5.putInt("p", a4.priority.getValue());
+            ((AbstractList<CompoundTag>)lk2).add(le5);
+        }
+        return lk2;
     }
     
-    public Stream<TickNextTickData<T>> ticks() {
-        return this.ticks.stream();
-    }
-    
-    public ListTag save(final long long1) {
-        return ServerTickList.<T>saveTickList(this.toId, this.ticks, long1);
-    }
-    
-    public static <T> ChunkTickList<T> create(final ListTag jz, final Function<T, ResourceLocation> function2, final Function<ResourceLocation, T> function3) {
-        final Set<TickNextTickData<T>> set4 = Sets.newHashSet();
-        for (int integer5 = 0; integer5 < jz.size(); ++integer5) {
-            final CompoundTag jt6 = jz.getCompound(integer5);
-            final T object7 = function3.apply(new ResourceLocation(jt6.getString("i")));
+    public static <T> ChunkTickList<T> create(final ListTag lk, final Function<T, ResourceLocation> function2, final Function<ResourceLocation, T> function3) {
+        final List<ScheduledTick<T>> list4 = Lists.newArrayList();
+        for (int integer5 = 0; integer5 < lk.size(); ++integer5) {
+            final CompoundTag le6 = lk.getCompound(integer5);
+            final T object7 = function3.apply(new ResourceLocation(le6.getString("i")));
             if (object7 != null) {
-                set4.add(new TickNextTickData<T>(new BlockPos(jt6.getInt("x"), jt6.getInt("y"), jt6.getInt("z")), object7, jt6.getInt("t"), TickPriority.byValue(jt6.getInt("p"))));
+                final BlockPos fu8 = new BlockPos(le6.getInt("x"), le6.getInt("y"), le6.getInt("z"));
+                list4.add(new ScheduledTick<T>(object7, fu8, le6.getInt("t"), TickPriority.byValue(le6.getInt("p"))));
             }
         }
-        return new ChunkTickList<T>(function2, set4);
+        return new ChunkTickList<T>(function2, list4);
+    }
+    
+    public void copyOut(final TickList<T> bqr) {
+        this.ticks.forEach(a -> bqr.scheduleTick(a.pos, (T)a.type, a.delay, a.priority));
+    }
+    
+    static class ScheduledTick<T> {
+        private final T type;
+        public final BlockPos pos;
+        public final int delay;
+        public final TickPriority priority;
+        
+        private ScheduledTick(final T object, final BlockPos fu, final int integer, final TickPriority bqt) {
+            this.type = object;
+            this.pos = fu;
+            this.delay = integer;
+            this.priority = bqt;
+        }
+        
+        @Override
+        public String toString() {
+            return this.type + ": " + this.pos + ", " + this.delay + ", " + this.priority;
+        }
     }
 }
diff --git a/src/net/minecraft/world/level/ClipContext.java b/src/net/minecraft/world/level/ClipContext.java
index f844f57..cb63f2d 100644
--- a/src/net/minecraft/world/level/ClipContext.java
+++ b/src/net/minecraft/world/level/ClipContext.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level;
 
 import java.util.function.Predicate;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -17,12 +18,12 @@ public class ClipContext {
     private final Fluid fluid;
     private final CollisionContext collisionContext;
     
-    public ClipContext(final Vec3 cvl1, final Vec3 cvl2, final Block a, final Fluid b, final Entity akq) {
-        this.from = cvl1;
-        this.to = cvl2;
+    public ClipContext(final Vec3 dem1, final Vec3 dem2, final Block a, final Fluid b, final Entity aom) {
+        this.from = dem1;
+        this.to = dem2;
         this.block = a;
         this.fluid = b;
-        this.collisionContext = CollisionContext.of(akq);
+        this.collisionContext = CollisionContext.of(aom);
     }
     
     public Vec3 getTo() {
@@ -33,17 +34,18 @@ public class ClipContext {
         return this.from;
     }
     
-    public VoxelShape getBlockShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return this.block.get(byj, bjg, fk, this.collisionContext);
+    public VoxelShape getBlockShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return this.block.get(cfj, bpg, fu, this.collisionContext);
     }
     
-    public VoxelShape getFluidShape(final FluidState coj, final BlockGetter bjg, final BlockPos fk) {
-        return this.fluid.canPick(coj) ? coj.getShape(bjg, fk) : Shapes.empty();
+    public VoxelShape getFluidShape(final FluidState cxa, final BlockGetter bpg, final BlockPos fu) {
+        return this.fluid.canPick(cxa) ? cxa.getShape(bpg, fu) : Shapes.empty();
     }
     
     public enum Block implements ShapeGetter {
-        COLLIDER(BlockState::getCollisionShape), 
-        OUTLINE(BlockState::getShape);
+        COLLIDER(BlockBehaviour.BlockStateBase::getCollisionShape), 
+        OUTLINE(BlockBehaviour.BlockStateBase::getShape), 
+        VISUAL(BlockBehaviour.BlockStateBase::getVisualShape);
         
         private final ShapeGetter shapeGetter;
         
@@ -52,15 +54,15 @@ public class ClipContext {
         }
         
         @Override
-        public VoxelShape get(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-            return this.shapeGetter.get(byj, bjg, fk, cvq);
+        public VoxelShape get(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+            return this.shapeGetter.get(cfj, bpg, fu, der);
         }
     }
     
     public enum Fluid {
-        NONE(coj -> false), 
+        NONE(cxa -> false), 
         SOURCE_ONLY(FluidState::isSource), 
-        ANY(coj -> !coj.isEmpty());
+        ANY(cxa -> !cxa.isEmpty());
         
         private final Predicate<FluidState> canPick;
         
@@ -68,12 +70,12 @@ public class ClipContext {
             this.canPick = predicate;
         }
         
-        public boolean canPick(final FluidState coj) {
-            return this.canPick.test(coj);
+        public boolean canPick(final FluidState cxa) {
+            return this.canPick.test(cxa);
         }
     }
     
     public interface ShapeGetter {
-        VoxelShape get(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq);
+        VoxelShape get(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der);
     }
 }
diff --git a/src/net/minecraft/world/level/CollisionGetter.java b/src/net/minecraft/world/level/CollisionGetter.java
index 9850d19..702abab 100644
--- a/src/net/minecraft/world/level/CollisionGetter.java
+++ b/src/net/minecraft/world/level/CollisionGetter.java
@@ -1,17 +1,10 @@
 package net.minecraft.world.level;
 
+import java.util.function.BiPredicate;
 import java.util.Spliterator;
 import java.util.stream.StreamSupport;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.phys.shapes.BooleanOp;
-import java.util.function.Consumer;
-import java.util.Spliterators;
-import net.minecraft.core.Cursor3D;
-import net.minecraft.util.Mth;
-import com.google.common.collect.Streams;
 import java.util.stream.Stream;
-import java.util.Set;
-import java.util.Collections;
+import java.util.function.Predicate;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.CollisionContext;
@@ -28,100 +21,46 @@ public interface CollisionGetter extends BlockGetter {
     @Nullable
     BlockGetter getChunkForCollisions(final int integer1, final int integer2);
     
-    default boolean isUnobstructed(@Nullable final Entity akq, final VoxelShape cwf) {
+    default boolean isUnobstructed(@Nullable final Entity aom, final VoxelShape dfg) {
         return true;
     }
     
-    default boolean isUnobstructed(final BlockState byj, final BlockPos fk, final CollisionContext cvq) {
-        final VoxelShape cwf5 = byj.getCollisionShape(this, fk, cvq);
-        return cwf5.isEmpty() || this.isUnobstructed(null, cwf5.move(fk.getX(), fk.getY(), fk.getZ()));
+    default boolean isUnobstructed(final BlockState cfj, final BlockPos fu, final CollisionContext der) {
+        final VoxelShape dfg5 = cfj.getCollisionShape(this, fu, der);
+        return dfg5.isEmpty() || this.isUnobstructed(null, dfg5.move(fu.getX(), fu.getY(), fu.getZ()));
     }
     
-    default boolean isUnobstructed(final Entity akq) {
-        return this.isUnobstructed(akq, Shapes.create(akq.getBoundingBox()));
+    default boolean isUnobstructed(final Entity aom) {
+        return this.isUnobstructed(aom, Shapes.create(aom.getBoundingBox()));
     }
     
-    default boolean noCollision(final AABB cvf) {
-        return this.noCollision(null, cvf, Collections.<Entity>emptySet());
+    default boolean noCollision(final AABB deg) {
+        return this.noCollision(null, deg, aom -> true);
     }
     
-    default boolean noCollision(final Entity akq) {
-        return this.noCollision(akq, akq.getBoundingBox(), Collections.<Entity>emptySet());
+    default boolean noCollision(final Entity aom) {
+        return this.noCollision(aom, aom.getBoundingBox(), aom -> true);
     }
     
-    default boolean noCollision(final Entity akq, final AABB cvf) {
-        return this.noCollision(akq, cvf, Collections.<Entity>emptySet());
+    default boolean noCollision(final Entity aom, final AABB deg) {
+        return this.noCollision(aom, deg, aom -> true);
     }
     
-    default boolean noCollision(@Nullable final Entity akq, final AABB cvf, final Set<Entity> set) {
-        return this.getCollisions(akq, cvf, set).allMatch(VoxelShape::isEmpty);
+    default boolean noCollision(@Nullable final Entity aom, final AABB deg, final Predicate<Entity> predicate) {
+        return this.getCollisions(aom, deg, predicate).allMatch(VoxelShape::isEmpty);
     }
     
-    default Stream<VoxelShape> getEntityCollisions(@Nullable final Entity akq, final AABB cvf, final Set<Entity> set) {
-        return Stream.<VoxelShape>empty();
+    Stream<VoxelShape> getEntityCollisions(@Nullable final Entity aom, final AABB deg, final Predicate<Entity> predicate);
+    
+    default Stream<VoxelShape> getCollisions(@Nullable final Entity aom, final AABB deg, final Predicate<Entity> predicate) {
+        return Stream.<VoxelShape>concat(this.getBlockCollisions(aom, deg), this.getEntityCollisions(aom, deg, predicate));
     }
     
-    default Stream<VoxelShape> getCollisions(@Nullable final Entity akq, final AABB cvf, final Set<Entity> set) {
-        return Streams.<VoxelShape>concat(new Stream[] { this.getBlockCollisions(akq, cvf), this.getEntityCollisions(akq, cvf, set) });
+    default Stream<VoxelShape> getBlockCollisions(@Nullable final Entity aom, final AABB deg) {
+        return StreamSupport.<VoxelShape>stream((Spliterator<VoxelShape>)new CollisionSpliterator(this, aom, deg), false);
     }
     
-    default Stream<VoxelShape> getBlockCollisions(@Nullable final Entity akq, final AABB cvf) {
-        final int integer4 = Mth.floor(cvf.minX - 1.0E-7) - 1;
-        final int integer5 = Mth.floor(cvf.maxX + 1.0E-7) + 1;
-        final int integer6 = Mth.floor(cvf.minY - 1.0E-7) - 1;
-        final int integer7 = Mth.floor(cvf.maxY + 1.0E-7) + 1;
-        final int integer8 = Mth.floor(cvf.minZ - 1.0E-7) - 1;
-        final int integer9 = Mth.floor(cvf.maxZ + 1.0E-7) + 1;
-        final CollisionContext cvq10 = (akq == null) ? CollisionContext.empty() : CollisionContext.of(akq);
-        final Cursor3D fn11 = new Cursor3D(integer4, integer6, integer8, integer5, integer7, integer9);
-        final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos();
-        final VoxelShape cwf13 = Shapes.create(cvf);
-        return StreamSupport.<VoxelShape>stream((Spliterator<VoxelShape>)new Spliterators.AbstractSpliterator<VoxelShape>(Long.MAX_VALUE, 1280) {
-            boolean checkedBorder = akq == null;
-            
-            @Override
-            public boolean tryAdvance(final Consumer<? super VoxelShape> consumer) {
-                if (!this.checkedBorder) {
-                    this.checkedBorder = true;
-                    final VoxelShape cwf3 = CollisionGetter.this.getWorldBorder().getCollisionShape();
-                    final boolean boolean4 = Shapes.joinIsNotEmpty(cwf3, Shapes.create(akq.getBoundingBox().deflate(1.0E-7)), BooleanOp.AND);
-                    final boolean boolean5 = Shapes.joinIsNotEmpty(cwf3, Shapes.create(akq.getBoundingBox().inflate(1.0E-7)), BooleanOp.AND);
-                    if (!boolean4 && boolean5) {
-                        consumer.accept(cwf3);
-                        return true;
-                    }
-                }
-                while (fn11.advance()) {
-                    final int integer3 = fn11.nextX();
-                    final int integer4 = fn11.nextY();
-                    final int integer5 = fn11.nextZ();
-                    final int integer6 = fn11.getNextType();
-                    if (integer6 == 3) {
-                        continue;
-                    }
-                    final int integer7 = integer3 >> 4;
-                    final int integer8 = integer5 >> 4;
-                    final BlockGetter bjg9 = CollisionGetter.this.getChunkForCollisions(integer7, integer8);
-                    if (bjg9 == null) {
-                        continue;
-                    }
-                    a12.set(integer3, integer4, integer5);
-                    final BlockState byj10 = bjg9.getBlockState(a12);
-                    if (integer6 == 1 && !byj10.hasLargeCollisionShape()) {
-                        continue;
-                    }
-                    if (integer6 == 2 && byj10.getBlock() != Blocks.MOVING_PISTON) {
-                        continue;
-                    }
-                    final VoxelShape cwf4 = byj10.getCollisionShape(CollisionGetter.this, a12, cvq10);
-                    final VoxelShape cwf5 = cwf4.move(integer3, integer4, integer5);
-                    if (Shapes.joinIsNotEmpty(cwf13, cwf5, BooleanOp.AND)) {
-                        consumer.accept(cwf5);
-                        return true;
-                    }
-                }
-                return false;
-            }
-        }, false);
+    default Stream<VoxelShape> getBlockCollisions(@Nullable final Entity aom, final AABB deg, final BiPredicate<BlockState, BlockPos> biPredicate) {
+        return StreamSupport.<VoxelShape>stream((Spliterator<VoxelShape>)new CollisionSpliterator(this, aom, deg, biPredicate), false);
     }
 }
diff --git a/src/net/minecraft/world/level/CollisionSpliterator.java b/src/net/minecraft/world/level/CollisionSpliterator.java
new file mode 100644
index 0000000..99e9e9b
--- /dev/null
+++ b/src/net/minecraft/world/level/CollisionSpliterator.java
@@ -0,0 +1,142 @@
+package net.minecraft.world.level;
+
+import net.minecraft.world.level.border.WorldBorder;
+import java.util.Objects;
+import net.minecraft.world.phys.shapes.BooleanOp;
+import net.minecraft.world.level.block.Blocks;
+import java.util.function.Consumer;
+import net.minecraft.util.Mth;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.function.BiPredicate;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Cursor3D;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.AABB;
+import javax.annotation.Nullable;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import java.util.Spliterators;
+
+public class CollisionSpliterator extends Spliterators.AbstractSpliterator<VoxelShape> {
+    @Nullable
+    private final Entity source;
+    private final AABB box;
+    private final CollisionContext context;
+    private final Cursor3D cursor;
+    private final BlockPos.MutableBlockPos pos;
+    private final VoxelShape entityShape;
+    private final CollisionGetter collisionGetter;
+    private boolean needsBorderCheck;
+    private final BiPredicate<BlockState, BlockPos> predicate;
+    
+    public CollisionSpliterator(final CollisionGetter bpk, @Nullable final Entity aom, final AABB deg) {
+        this(bpk, aom, deg, (cfj, fu) -> true);
+    }
+    
+    public CollisionSpliterator(final CollisionGetter bpk, @Nullable final Entity aom, final AABB deg, final BiPredicate<BlockState, BlockPos> biPredicate) {
+        super(Long.MAX_VALUE, 1280);
+        this.context = ((aom == null) ? CollisionContext.empty() : CollisionContext.of(aom));
+        this.pos = new BlockPos.MutableBlockPos();
+        this.entityShape = Shapes.create(deg);
+        this.collisionGetter = bpk;
+        this.needsBorderCheck = (aom != null);
+        this.source = aom;
+        this.box = deg;
+        this.predicate = biPredicate;
+        final int integer6 = Mth.floor(deg.minX - 1.0E-7) - 1;
+        final int integer7 = Mth.floor(deg.maxX + 1.0E-7) + 1;
+        final int integer8 = Mth.floor(deg.minY - 1.0E-7) - 1;
+        final int integer9 = Mth.floor(deg.maxY + 1.0E-7) + 1;
+        final int integer10 = Mth.floor(deg.minZ - 1.0E-7) - 1;
+        final int integer11 = Mth.floor(deg.maxZ + 1.0E-7) + 1;
+        this.cursor = new Cursor3D(integer6, integer8, integer10, integer7, integer9, integer11);
+    }
+    
+    @Override
+    public boolean tryAdvance(final Consumer<? super VoxelShape> consumer) {
+        return (this.needsBorderCheck && this.worldBorderCheck(consumer)) || this.collisionCheck(consumer);
+    }
+    
+    boolean collisionCheck(final Consumer<? super VoxelShape> consumer) {
+        while (this.cursor.advance()) {
+            final int integer3 = this.cursor.nextX();
+            final int integer4 = this.cursor.nextY();
+            final int integer5 = this.cursor.nextZ();
+            final int integer6 = this.cursor.getNextType();
+            if (integer6 == 3) {
+                continue;
+            }
+            final BlockGetter bpg7 = this.getChunk(integer3, integer5);
+            if (bpg7 == null) {
+                continue;
+            }
+            this.pos.set(integer3, integer4, integer5);
+            final BlockState cfj8 = bpg7.getBlockState(this.pos);
+            if (!this.predicate.test(cfj8, this.pos)) {
+                continue;
+            }
+            if (integer6 == 1 && !cfj8.hasLargeCollisionShape()) {
+                continue;
+            }
+            if (integer6 == 2 && !cfj8.is(Blocks.MOVING_PISTON)) {
+                continue;
+            }
+            final VoxelShape dfg9 = cfj8.getCollisionShape(this.collisionGetter, this.pos, this.context);
+            if (dfg9 == Shapes.block()) {
+                if (this.box.intersects(integer3, integer4, integer5, integer3 + 1.0, integer4 + 1.0, integer5 + 1.0)) {
+                    consumer.accept(dfg9.move(integer3, integer4, integer5));
+                    return true;
+                }
+                continue;
+            }
+            else {
+                final VoxelShape dfg10 = dfg9.move(integer3, integer4, integer5);
+                if (Shapes.joinIsNotEmpty(dfg10, this.entityShape, BooleanOp.AND)) {
+                    consumer.accept(dfg10);
+                    return true;
+                }
+                continue;
+            }
+        }
+        return false;
+    }
+    
+    @Nullable
+    private BlockGetter getChunk(final int integer1, final int integer2) {
+        final int integer3 = integer1 >> 4;
+        final int integer4 = integer2 >> 4;
+        return this.collisionGetter.getChunkForCollisions(integer3, integer4);
+    }
+    
+    boolean worldBorderCheck(final Consumer<? super VoxelShape> consumer) {
+        Objects.<Entity>requireNonNull(this.source);
+        this.needsBorderCheck = false;
+        final WorldBorder cgw3 = this.collisionGetter.getWorldBorder();
+        final AABB deg4 = this.source.getBoundingBox();
+        if (!isBoxFullyWithinWorldBorder(cgw3, deg4)) {
+            final VoxelShape dfg5 = cgw3.getCollisionShape();
+            if (!isOutsideBorder(dfg5, deg4) && isCloseToBorder(dfg5, deg4)) {
+                consumer.accept(dfg5);
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    private static boolean isCloseToBorder(final VoxelShape dfg, final AABB deg) {
+        return Shapes.joinIsNotEmpty(dfg, Shapes.create(deg.inflate(1.0E-7)), BooleanOp.AND);
+    }
+    
+    private static boolean isOutsideBorder(final VoxelShape dfg, final AABB deg) {
+        return Shapes.joinIsNotEmpty(dfg, Shapes.create(deg.deflate(1.0E-7)), BooleanOp.AND);
+    }
+    
+    public static boolean isBoxFullyWithinWorldBorder(final WorldBorder cgw, final AABB deg) {
+        final double double3 = Mth.floor(cgw.getMinX());
+        final double double4 = Mth.floor(cgw.getMinZ());
+        final double double5 = Mth.ceil(cgw.getMaxX());
+        final double double6 = Mth.ceil(cgw.getMaxZ());
+        return deg.minX > double3 && deg.minX < double5 && deg.minZ > double4 && deg.minZ < double6 && deg.maxX > double3 && deg.maxX < double5 && deg.maxZ > double4 && deg.maxZ < double6;
+    }
+}
diff --git a/src/net/minecraft/world/level/ColorResolver.java b/src/net/minecraft/world/level/ColorResolver.java
index ca87227..e0f5106 100644
--- a/src/net/minecraft/world/level/ColorResolver.java
+++ b/src/net/minecraft/world/level/ColorResolver.java
@@ -3,5 +3,5 @@ package net.minecraft.world.level;
 import net.minecraft.world.level.biome.Biome;
 
 public interface ColorResolver {
-    int getColor(final Biome bkt, final double double2, final double double3);
+    int getColor(final Biome bre, final double double2, final double double3);
 }
diff --git a/src/net/minecraft/world/level/CustomSpawner.java b/src/net/minecraft/world/level/CustomSpawner.java
new file mode 100644
index 0000000..b7b2122
--- /dev/null
+++ b/src/net/minecraft/world/level/CustomSpawner.java
@@ -0,0 +1,7 @@
+package net.minecraft.world.level;
+
+import net.minecraft.server.level.ServerLevel;
+
+public interface CustomSpawner {
+    int tick(final ServerLevel zd, final boolean boolean2, final boolean boolean3);
+}
diff --git a/src/net/minecraft/world/level/DataPackConfig.java b/src/net/minecraft/world/level/DataPackConfig.java
new file mode 100644
index 0000000..3b9dd06
--- /dev/null
+++ b/src/net/minecraft/world/level/DataPackConfig.java
@@ -0,0 +1,35 @@
+package net.minecraft.world.level;
+
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.Collection;
+import com.google.common.collect.ImmutableList;
+import java.util.List;
+import com.mojang.serialization.Codec;
+
+public class DataPackConfig {
+    public static final DataPackConfig DEFAULT;
+    public static final Codec<DataPackConfig> CODEC;
+    private final List<String> enabled;
+    private final List<String> disabled;
+    
+    public DataPackConfig(final List<String> list1, final List<String> list2) {
+        this.enabled = ImmutableList.copyOf(list1);
+        this.disabled = ImmutableList.copyOf(list2);
+    }
+    
+    public List<String> getEnabled() {
+        return this.enabled;
+    }
+    
+    public List<String> getDisabled() {
+        return this.disabled;
+    }
+    
+    static {
+        DEFAULT = new DataPackConfig(ImmutableList.<String>of("vanilla"), ImmutableList.of());
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.STRING.listOf().fieldOf("Enabled").forGetter(bpn -> bpn.enabled), (App)Codec.STRING.listOf().fieldOf("Disabled").forGetter(bpn -> bpn.disabled)).apply(instance, (BiFunction)DataPackConfig::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/DefaultExplosionDamageCalculator.java b/src/net/minecraft/world/level/DefaultExplosionDamageCalculator.java
new file mode 100644
index 0000000..bc0cb80
--- /dev/null
+++ b/src/net/minecraft/world/level/DefaultExplosionDamageCalculator.java
@@ -0,0 +1,23 @@
+package net.minecraft.world.level;
+
+import java.util.Optional;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
+
+public enum DefaultExplosionDamageCalculator implements ExplosionDamageCalculator {
+    INSTANCE;
+    
+    @Override
+    public Optional<Float> getBlockExplosionResistance(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final FluidState cxa) {
+        if (cfj.isAir() && cxa.isEmpty()) {
+            return Optional.<Float>empty();
+        }
+        return Optional.<Float>of(Math.max(cfj.getBlock().getExplosionResistance(), cxa.getExplosionResistance()));
+    }
+    
+    @Override
+    public boolean shouldBlockExplode(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final float float5) {
+        return true;
+    }
+}
diff --git a/src/net/minecraft/world/level/EmptyBlockGetter.java b/src/net/minecraft/world/level/EmptyBlockGetter.java
index b608496..22355f3 100644
--- a/src/net/minecraft/world/level/EmptyBlockGetter.java
+++ b/src/net/minecraft/world/level/EmptyBlockGetter.java
@@ -13,17 +13,17 @@ public enum EmptyBlockGetter implements BlockGetter {
     
     @Nullable
     @Override
-    public BlockEntity getBlockEntity(final BlockPos fk) {
+    public BlockEntity getBlockEntity(final BlockPos fu) {
         return null;
     }
     
     @Override
-    public BlockState getBlockState(final BlockPos fk) {
+    public BlockState getBlockState(final BlockPos fu) {
         return Blocks.AIR.defaultBlockState();
     }
     
     @Override
-    public FluidState getFluidState(final BlockPos fk) {
+    public FluidState getFluidState(final BlockPos fu) {
         return Fluids.EMPTY.defaultFluidState();
     }
 }
diff --git a/src/net/minecraft/world/level/EmptyTickList.java b/src/net/minecraft/world/level/EmptyTickList.java
index 9aa0dd7..cdf7a4f 100644
--- a/src/net/minecraft/world/level/EmptyTickList.java
+++ b/src/net/minecraft/world/level/EmptyTickList.java
@@ -1,6 +1,5 @@
 package net.minecraft.world.level;
 
-import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 
 public class EmptyTickList<T> implements TickList<T> {
@@ -11,27 +10,23 @@ public class EmptyTickList<T> implements TickList<T> {
     }
     
     @Override
-    public boolean hasScheduledTick(final BlockPos fk, final T object) {
+    public boolean hasScheduledTick(final BlockPos fu, final T object) {
         return false;
     }
     
     @Override
-    public void scheduleTick(final BlockPos fk, final T object, final int integer) {
+    public void scheduleTick(final BlockPos fu, final T object, final int integer) {
     }
     
     @Override
-    public void scheduleTick(final BlockPos fk, final T object, final int integer, final TickPriority bkn) {
+    public void scheduleTick(final BlockPos fu, final T object, final int integer, final TickPriority bqt) {
     }
     
     @Override
-    public boolean willTickThisTick(final BlockPos fk, final T object) {
+    public boolean willTickThisTick(final BlockPos fu, final T object) {
         return false;
     }
     
-    @Override
-    public void addAll(final Stream<TickNextTickData<T>> stream) {
-    }
-    
     static {
         INSTANCE = new EmptyTickList<>();
     }
diff --git a/src/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java b/src/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java
new file mode 100644
index 0000000..468ffa5
--- /dev/null
+++ b/src/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java
@@ -0,0 +1,25 @@
+package net.minecraft.world.level;
+
+import java.util.Optional;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.Entity;
+
+class EntityBasedExplosionDamageCalculator implements ExplosionDamageCalculator {
+    private final Entity source;
+    
+    EntityBasedExplosionDamageCalculator(final Entity aom) {
+        this.source = aom;
+    }
+    
+    @Override
+    public Optional<Float> getBlockExplosionResistance(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final FluidState cxa) {
+        return DefaultExplosionDamageCalculator.INSTANCE.getBlockExplosionResistance(bpt, bpg, fu, cfj, cxa).<Float>map(float6 -> this.source.getBlockExplosionResistance(bpt, bpg, fu, cfj, cxa, float6));
+    }
+    
+    @Override
+    public boolean shouldBlockExplode(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final float float5) {
+        return this.source.shouldBlockExplode(bpt, bpg, fu, cfj, float5);
+    }
+}
diff --git a/src/net/minecraft/world/level/EntityGetter.java b/src/net/minecraft/world/level/EntityGetter.java
index 02b71b0..e7bb8b6 100644
--- a/src/net/minecraft/world/level/EntityGetter.java
+++ b/src/net/minecraft/world/level/EntityGetter.java
@@ -4,11 +4,10 @@ import java.util.UUID;
 import com.google.common.collect.Lists;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.targeting.TargetingConditions;
-import java.util.Iterator;
 import java.util.function.Function;
 import java.util.Objects;
 import java.util.stream.Stream;
-import java.util.Set;
+import java.util.Iterator;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -21,61 +20,79 @@ import javax.annotation.Nullable;
 import net.minecraft.world.entity.Entity;
 
 public interface EntityGetter {
-    List<Entity> getEntities(@Nullable final Entity akq, final AABB cvf, @Nullable final Predicate<? super Entity> predicate);
+    List<Entity> getEntities(@Nullable final Entity aom, final AABB deg, @Nullable final Predicate<? super Entity> predicate);
     
-     <T extends Entity> List<T> getEntitiesOfClass(final Class<? extends T> class1, final AABB cvf, @Nullable final Predicate<? super T> predicate);
+     <T extends Entity> List<T> getEntitiesOfClass(final Class<? extends T> class1, final AABB deg, @Nullable final Predicate<? super T> predicate);
     
-    default <T extends Entity> List<T> getLoadedEntitiesOfClass(final Class<? extends T> class1, final AABB cvf, @Nullable final Predicate<? super T> predicate) {
-        return this.getEntitiesOfClass(class1, cvf, predicate);
+    default <T extends Entity> List<T> getLoadedEntitiesOfClass(final Class<? extends T> class1, final AABB deg, @Nullable final Predicate<? super T> predicate) {
+        return this.getEntitiesOfClass(class1, deg, predicate);
     }
     
     List<? extends Player> players();
     
-    default List<Entity> getEntities(@Nullable final Entity akq, final AABB cvf) {
-        return this.getEntities(akq, cvf, EntitySelector.NO_SPECTATORS);
+    default List<Entity> getEntities(@Nullable final Entity aom, final AABB deg) {
+        return this.getEntities(aom, deg, EntitySelector.NO_SPECTATORS);
     }
     
-    default boolean isUnobstructed(@Nullable final Entity akq, final VoxelShape cwf) {
-        return cwf.isEmpty() || this.getEntities(akq, cwf.bounds()).stream().filter(akq2 -> !akq2.removed && akq2.blocksBuilding && (akq == null || !akq2.isPassengerOfSameVehicle(akq))).noneMatch(akq -> Shapes.joinIsNotEmpty(cwf, Shapes.create(akq.getBoundingBox()), BooleanOp.AND));
+    default boolean isUnobstructed(@Nullable final Entity aom, final VoxelShape dfg) {
+        if (dfg.isEmpty()) {
+            return true;
+        }
+        for (final Entity aom2 : this.getEntities(aom, dfg.bounds())) {
+            if (!aom2.removed && aom2.blocksBuilding && (aom == null || !aom2.isPassengerOfSameVehicle(aom)) && Shapes.joinIsNotEmpty(dfg, Shapes.create(aom2.getBoundingBox()), BooleanOp.AND)) {
+                return false;
+            }
+        }
+        return true;
     }
     
-    default <T extends Entity> List<T> getEntitiesOfClass(final Class<? extends T> class1, final AABB cvf) {
-        return this.<T>getEntitiesOfClass(class1, cvf, EntitySelector.NO_SPECTATORS);
+    default <T extends Entity> List<T> getEntitiesOfClass(final Class<? extends T> class1, final AABB deg) {
+        return this.<T>getEntitiesOfClass(class1, deg, EntitySelector.NO_SPECTATORS);
     }
     
-    default <T extends Entity> List<T> getLoadedEntitiesOfClass(final Class<? extends T> class1, final AABB cvf) {
-        return this.<T>getLoadedEntitiesOfClass(class1, cvf, EntitySelector.NO_SPECTATORS);
+    default <T extends Entity> List<T> getLoadedEntitiesOfClass(final Class<? extends T> class1, final AABB deg) {
+        return this.<T>getLoadedEntitiesOfClass(class1, deg, EntitySelector.NO_SPECTATORS);
     }
     
-    default Stream<VoxelShape> getEntityCollisions(@Nullable final Entity akq, final AABB cvf, final Set<Entity> set) {
-        if (cvf.getSize() < 1.0E-7) {
+    default Stream<VoxelShape> getEntityCollisions(@Nullable final Entity aom, final AABB deg, final Predicate<Entity> predicate) {
+        if (deg.getSize() < 1.0E-7) {
             return Stream.<VoxelShape>empty();
         }
-        final AABB cvf2 = cvf.inflate(1.0E-7);
-        return this.getEntities(akq, cvf2).stream().filter(akq -> !set.contains(akq)).filter(akq2 -> akq == null || !akq.isPassengerOfSameVehicle(akq2)).flatMap(akq2 -> Stream.<AABB>of(new AABB[] { akq2.getCollideBox(), (akq == null) ? null : akq.getCollideAgainstBox(akq2) })).filter(Objects::nonNull).filter(cvf2::intersects).<VoxelShape>map(Shapes::create);
+        final AABB deg2 = deg.inflate(1.0E-7);
+        AABB deg3;
+        final AABB deg4;
+        return this.getEntities(aom, deg2, predicate.and(aom2 -> aom == null || !aom.isPassengerOfSameVehicle(aom2))).stream().flatMap(aom3 -> {
+            if (aom != null) {
+                deg3 = aom.getCollideAgainstBox(aom3);
+                if (deg3 != null && deg3.intersects(deg4)) {
+                    return Stream.<AABB>of(new AABB[] { aom3.getCollideBox(), deg3 });
+                }
+            }
+            return Stream.<AABB>of(aom3.getCollideBox());
+        }).filter(Objects::nonNull).<VoxelShape>map(Shapes::create);
     }
     
     @Nullable
     default Player getNearestPlayer(final double double1, final double double2, final double double3, final double double4, @Nullable final Predicate<Entity> predicate) {
         double double5 = -1.0;
-        Player ayj13 = null;
-        for (final Player ayj14 : this.players()) {
-            if (predicate != null && !predicate.test(ayj14)) {
+        Player bec13 = null;
+        for (final Player bec14 : this.players()) {
+            if (predicate != null && !predicate.test(bec14)) {
                 continue;
             }
-            final double double6 = ayj14.distanceToSqr(double1, double2, double3);
+            final double double6 = bec14.distanceToSqr(double1, double2, double3);
             if ((double4 >= 0.0 && double6 >= double4 * double4) || (double5 != -1.0 && double6 >= double5)) {
                 continue;
             }
             double5 = double6;
-            ayj13 = ayj14;
+            bec13 = bec14;
         }
-        return ayj13;
+        return bec13;
     }
     
     @Nullable
-    default Player getNearestPlayer(final Entity akq, final double double2) {
-        return this.getNearestPlayer(akq.getX(), akq.getY(), akq.getZ(), double2, false);
+    default Player getNearestPlayer(final Entity aom, final double double2) {
+        return this.getNearestPlayer(aom.getX(), aom.getY(), aom.getZ(), double2, false);
     }
     
     @Nullable
@@ -84,31 +101,13 @@ public interface EntityGetter {
         return this.getNearestPlayer(double1, double2, double3, double4, predicate11);
     }
     
-    @Nullable
-    default Player getNearestPlayerIgnoreY(final double double1, final double double2, final double double3) {
-        double double4 = -1.0;
-        Player ayj10 = null;
-        for (final Player ayj11 : this.players()) {
-            if (!EntitySelector.NO_SPECTATORS.test(ayj11)) {
-                continue;
-            }
-            final double double5 = ayj11.distanceToSqr(double1, ayj11.getY(), double2);
-            if ((double3 >= 0.0 && double5 >= double3 * double3) || (double4 != -1.0 && double5 >= double4)) {
-                continue;
-            }
-            double4 = double5;
-            ayj10 = ayj11;
-        }
-        return ayj10;
-    }
-    
     default boolean hasNearbyAlivePlayer(final double double1, final double double2, final double double3, final double double4) {
-        for (final Player ayj11 : this.players()) {
-            if (EntitySelector.NO_SPECTATORS.test(ayj11)) {
-                if (!EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(ayj11)) {
+        for (final Player bec11 : this.players()) {
+            if (EntitySelector.NO_SPECTATORS.test(bec11)) {
+                if (!EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(bec11)) {
                     continue;
                 }
-                final double double5 = ayj11.distanceToSqr(double1, double2, double3);
+                final double double5 = bec11.distanceToSqr(double1, double2, double3);
                 if (double4 < 0.0 || double5 < double4 * double4) {
                     return true;
                 }
@@ -119,64 +118,64 @@ public interface EntityGetter {
     }
     
     @Nullable
-    default Player getNearestPlayer(final TargetingConditions ask, final LivingEntity akz) {
-        return this.<Player>getNearestEntity(this.players(), ask, akz, akz.getX(), akz.getY(), akz.getZ());
+    default Player getNearestPlayer(final TargetingConditions axs, final LivingEntity aoy) {
+        return this.<Player>getNearestEntity(this.players(), axs, aoy, aoy.getX(), aoy.getY(), aoy.getZ());
     }
     
     @Nullable
-    default Player getNearestPlayer(final TargetingConditions ask, final LivingEntity akz, final double double3, final double double4, final double double5) {
-        return this.<Player>getNearestEntity(this.players(), ask, akz, double3, double4, double5);
+    default Player getNearestPlayer(final TargetingConditions axs, final LivingEntity aoy, final double double3, final double double4, final double double5) {
+        return this.<Player>getNearestEntity(this.players(), axs, aoy, double3, double4, double5);
     }
     
     @Nullable
-    default Player getNearestPlayer(final TargetingConditions ask, final double double2, final double double3, final double double4) {
-        return this.<Player>getNearestEntity(this.players(), ask, (LivingEntity)null, double2, double3, double4);
+    default Player getNearestPlayer(final TargetingConditions axs, final double double2, final double double3, final double double4) {
+        return this.<Player>getNearestEntity(this.players(), axs, (LivingEntity)null, double2, double3, double4);
     }
     
     @Nullable
-    default <T extends LivingEntity> T getNearestEntity(final Class<? extends T> class1, final TargetingConditions ask, @Nullable final LivingEntity akz, final double double4, final double double5, final double double6, final AABB cvf) {
-        return this.<T>getNearestEntity(this.getEntitiesOfClass(class1, cvf, null), ask, akz, double4, double5, double6);
+    default <T extends LivingEntity> T getNearestEntity(final Class<? extends T> class1, final TargetingConditions axs, @Nullable final LivingEntity aoy, final double double4, final double double5, final double double6, final AABB deg) {
+        return this.<T>getNearestEntity(this.getEntitiesOfClass(class1, deg, null), axs, aoy, double4, double5, double6);
     }
     
     @Nullable
-    default <T extends LivingEntity> T getNearestLoadedEntity(final Class<? extends T> class1, final TargetingConditions ask, @Nullable final LivingEntity akz, final double double4, final double double5, final double double6, final AABB cvf) {
-        return this.<T>getNearestEntity(this.getLoadedEntitiesOfClass(class1, cvf, null), ask, akz, double4, double5, double6);
+    default <T extends LivingEntity> T getNearestLoadedEntity(final Class<? extends T> class1, final TargetingConditions axs, @Nullable final LivingEntity aoy, final double double4, final double double5, final double double6, final AABB deg) {
+        return this.<T>getNearestEntity(this.getLoadedEntitiesOfClass(class1, deg, null), axs, aoy, double4, double5, double6);
     }
     
     @Nullable
-    default <T extends LivingEntity> T getNearestEntity(final List<? extends T> list, final TargetingConditions ask, @Nullable final LivingEntity akz, final double double4, final double double5, final double double6) {
+    default <T extends LivingEntity> T getNearestEntity(final List<? extends T> list, final TargetingConditions axs, @Nullable final LivingEntity aoy, final double double4, final double double5, final double double6) {
         double double7 = -1.0;
-        T akz2 = null;
-        for (final T akz3 : list) {
-            if (!ask.test(akz, akz3)) {
+        T aoy2 = null;
+        for (final T aoy3 : list) {
+            if (!axs.test(aoy, aoy3)) {
                 continue;
             }
-            final double double8 = akz3.distanceToSqr(double4, double5, double6);
+            final double double8 = aoy3.distanceToSqr(double4, double5, double6);
             if (double7 != -1.0 && double8 >= double7) {
                 continue;
             }
             double7 = double8;
-            akz2 = akz3;
+            aoy2 = aoy3;
         }
-        return akz2;
+        return aoy2;
     }
     
-    default List<Player> getNearbyPlayers(final TargetingConditions ask, final LivingEntity akz, final AABB cvf) {
+    default List<Player> getNearbyPlayers(final TargetingConditions axs, final LivingEntity aoy, final AABB deg) {
         final List<Player> list5 = Lists.newArrayList();
-        for (final Player ayj7 : this.players()) {
-            if (cvf.contains(ayj7.getX(), ayj7.getY(), ayj7.getZ()) && ask.test(akz, ayj7)) {
-                list5.add(ayj7);
+        for (final Player bec7 : this.players()) {
+            if (deg.contains(bec7.getX(), bec7.getY(), bec7.getZ()) && axs.test(aoy, bec7)) {
+                list5.add(bec7);
             }
         }
         return list5;
     }
     
-    default <T extends LivingEntity> List<T> getNearbyEntities(final Class<? extends T> class1, final TargetingConditions ask, final LivingEntity akz, final AABB cvf) {
-        final List<T> list6 = this.<T>getEntitiesOfClass(class1, cvf, null);
+    default <T extends LivingEntity> List<T> getNearbyEntities(final Class<? extends T> class1, final TargetingConditions axs, final LivingEntity aoy, final AABB deg) {
+        final List<T> list6 = this.<T>getEntitiesOfClass(class1, deg, null);
         final List<T> list7 = Lists.newArrayList();
-        for (final T akz2 : list6) {
-            if (ask.test(akz, akz2)) {
-                list7.add(akz2);
+        for (final T aoy2 : list6) {
+            if (axs.test(aoy, aoy2)) {
+                list7.add(aoy2);
             }
         }
         return list7;
@@ -185,9 +184,9 @@ public interface EntityGetter {
     @Nullable
     default Player getPlayerByUUID(final UUID uUID) {
         for (int integer3 = 0; integer3 < this.players().size(); ++integer3) {
-            final Player ayj4 = (Player)this.players().get(integer3);
-            if (uUID.equals(ayj4.getUUID())) {
-                return ayj4;
+            final Player bec4 = (Player)this.players().get(integer3);
+            if (uUID.equals(bec4.getUUID())) {
+                return bec4;
             }
         }
         return null;
diff --git a/src/net/minecraft/world/level/Explosion.java b/src/net/minecraft/world/level/Explosion.java
index 7609b91..3d64ee6 100644
--- a/src/net/minecraft/world/level/Explosion.java
+++ b/src/net/minecraft/world/level/Explosion.java
@@ -1,10 +1,10 @@
 package net.minecraft.world.level;
 
-import net.minecraft.world.entity.projectile.AbstractHurtingProjectile;
-import net.minecraft.world.entity.item.PrimedTnt;
+import net.minecraft.world.entity.projectile.Projectile;
 import net.minecraft.world.entity.item.ItemEntity;
 import it.unimi.dsi.fastutil.objects.ObjectListIterator;
 import java.util.Iterator;
+import net.minecraft.world.level.block.BaseFireBlock;
 import net.minecraft.world.level.block.Block;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.level.block.Blocks;
@@ -19,11 +19,13 @@ import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
+import java.util.Optional;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.state.BlockState;
 import java.util.Set;
 import net.minecraft.world.item.enchantment.ProtectionEnchantment;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.item.PrimedTnt;
 import com.google.common.collect.Sets;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.HitResult;
@@ -52,39 +54,49 @@ public class Explosion {
     @Nullable
     private final Entity source;
     private final float radius;
-    private DamageSource damageSource;
+    private final DamageSource damageSource;
+    private final ExplosionDamageCalculator damageCalculator;
     private final List<BlockPos> toBlow;
     private final Map<Player, Vec3> hitPlayers;
     
-    public Explosion(final Level bjw, @Nullable final Entity akq, final double double3, final double double4, final double double5, final float float6, final List<BlockPos> list) {
-        this(bjw, akq, double3, double4, double5, float6, false, BlockInteraction.DESTROY, list);
+    public Explosion(final Level bqb, @Nullable final Entity aom, final double double3, final double double4, final double double5, final float float6, final List<BlockPos> list) {
+        this(bqb, aom, double3, double4, double5, float6, false, BlockInteraction.DESTROY, list);
     }
     
-    public Explosion(final Level bjw, @Nullable final Entity akq, final double double3, final double double4, final double double5, final float float6, final boolean boolean7, final BlockInteraction a, final List<BlockPos> list) {
-        this(bjw, akq, double3, double4, double5, float6, boolean7, a);
+    public Explosion(final Level bqb, @Nullable final Entity aom, final double double3, final double double4, final double double5, final float float6, final boolean boolean7, final BlockInteraction a, final List<BlockPos> list) {
+        this(bqb, aom, double3, double4, double5, float6, boolean7, a);
         this.toBlow.addAll(list);
     }
     
-    public Explosion(final Level bjw, @Nullable final Entity akq, final double double3, final double double4, final double double5, final float float6, final boolean boolean7, final BlockInteraction a) {
+    public Explosion(final Level bqb, @Nullable final Entity aom, final double double3, final double double4, final double double5, final float float6, final boolean boolean7, final BlockInteraction a) {
+        this(bqb, aom, null, null, double3, double4, double5, float6, boolean7, a);
+    }
+    
+    public Explosion(final Level bqb, @Nullable final Entity aom, @Nullable final DamageSource anw, @Nullable final ExplosionDamageCalculator bpu, final double double5, final double double6, final double double7, final float float8, final boolean boolean9, final BlockInteraction a) {
         this.random = new Random();
         this.toBlow = Lists.newArrayList();
         this.hitPlayers = Maps.newHashMap();
-        this.level = bjw;
-        this.source = akq;
-        this.radius = float6;
-        this.x = double3;
-        this.y = double4;
-        this.z = double5;
-        this.fire = boolean7;
+        this.level = bqb;
+        this.source = aom;
+        this.radius = float8;
+        this.x = double5;
+        this.y = double6;
+        this.z = double7;
+        this.fire = boolean9;
         this.blockInteraction = a;
-        this.damageSource = DamageSource.explosion(this);
+        this.damageSource = ((anw == null) ? DamageSource.explosion(this) : anw);
+        this.damageCalculator = ((bpu == null) ? this.makeDamageCalculator(aom) : bpu);
     }
     
-    public static float getSeenPercent(final Vec3 cvl, final Entity akq) {
-        final AABB cvf3 = akq.getBoundingBox();
-        final double double4 = 1.0 / ((cvf3.maxX - cvf3.minX) * 2.0 + 1.0);
-        final double double5 = 1.0 / ((cvf3.maxY - cvf3.minY) * 2.0 + 1.0);
-        final double double6 = 1.0 / ((cvf3.maxZ - cvf3.minZ) * 2.0 + 1.0);
+    private ExplosionDamageCalculator makeDamageCalculator(@Nullable final Entity aom) {
+        return (aom == null) ? DefaultExplosionDamageCalculator.INSTANCE : new EntityBasedExplosionDamageCalculator(aom);
+    }
+    
+    public static float getSeenPercent(final Vec3 dem, final Entity aom) {
+        final AABB deg3 = aom.getBoundingBox();
+        final double double4 = 1.0 / ((deg3.maxX - deg3.minX) * 2.0 + 1.0);
+        final double double5 = 1.0 / ((deg3.maxY - deg3.minY) * 2.0 + 1.0);
+        final double double6 = 1.0 / ((deg3.maxZ - deg3.minZ) * 2.0 + 1.0);
         final double double7 = (1.0 - Math.floor(1.0 / double4) * double4) / 2.0;
         final double double8 = (1.0 - Math.floor(1.0 / double6) * double6) / 2.0;
         if (double4 < 0.0 || double5 < 0.0 || double6 < 0.0) {
@@ -95,11 +107,11 @@ public class Explosion {
         for (float float16 = 0.0f; float16 <= 1.0f; float16 += (float)double4) {
             for (float float17 = 0.0f; float17 <= 1.0f; float17 += (float)double5) {
                 for (float float18 = 0.0f; float18 <= 1.0f; float18 += (float)double6) {
-                    final double double9 = Mth.lerp(float16, cvf3.minX, cvf3.maxX);
-                    final double double10 = Mth.lerp(float17, cvf3.minY, cvf3.maxY);
-                    final double double11 = Mth.lerp(float18, cvf3.minZ, cvf3.maxZ);
-                    final Vec3 cvl2 = new Vec3(double9 + double7, double10, double11 + double8);
-                    if (akq.level.clip(new ClipContext(cvl2, cvl, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, akq)).getType() == HitResult.Type.MISS) {
+                    final double double9 = Mth.lerp(float16, deg3.minX, deg3.maxX);
+                    final double double10 = Mth.lerp(float17, deg3.minY, deg3.maxY);
+                    final double double11 = Mth.lerp(float18, deg3.minZ, deg3.maxZ);
+                    final Vec3 dem2 = new Vec3(double9 + double7, double10, double11 + double8);
+                    if (aom.level.clip(new ClipContext(dem2, dem, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, aom)).getType() == HitResult.Type.MISS) {
                         ++integer14;
                     }
                     ++integer15;
@@ -129,18 +141,15 @@ public class Explosion {
                         double double13 = this.z;
                         final float float16 = 0.3f;
                         while (float15 > 0.0f) {
-                            final BlockPos fk23 = new BlockPos(double11, double12, double13);
-                            final BlockState byj24 = this.level.getBlockState(fk23);
-                            final FluidState coj25 = this.level.getFluidState(fk23);
-                            if (!byj24.isAir() || !coj25.isEmpty()) {
-                                float float17 = Math.max(byj24.getBlock().getExplosionResistance(), coj25.getExplosionResistance());
-                                if (this.source != null) {
-                                    float17 = this.source.getBlockExplosionResistance(this, this.level, fk23, byj24, coj25, float17);
-                                }
-                                float15 -= (float17 + 0.3f) * 0.3f;
+                            final BlockPos fu23 = new BlockPos(double11, double12, double13);
+                            final BlockState cfj24 = this.level.getBlockState(fu23);
+                            final FluidState cxa25 = this.level.getFluidState(fu23);
+                            final Optional<Float> optional26 = this.damageCalculator.getBlockExplosionResistance(this, this.level, fu23, cfj24, cxa25);
+                            if (optional26.isPresent()) {
+                                float15 -= (optional26.get() + 0.3f) * 0.3f;
                             }
-                            if (float15 > 0.0f && (this.source == null || this.source.shouldBlockExplode(this, this.level, fk23, byj24, float15))) {
-                                set2.add(fk23);
+                            if (float15 > 0.0f && this.damageCalculator.shouldBlockExplode(this, this.level, fu23, cfj24, float15)) {
+                                set2.add(fu23);
                             }
                             double11 += double7 * 0.30000001192092896;
                             double12 += double8 * 0.30000001192092896;
@@ -152,40 +161,40 @@ public class Explosion {
             }
         }
         this.toBlow.addAll(set2);
-        final float float18 = this.radius * 2.0f;
-        int integer5 = Mth.floor(this.x - float18 - 1.0);
-        int integer6 = Mth.floor(this.x + float18 + 1.0);
-        final int integer7 = Mth.floor(this.y - float18 - 1.0);
-        final int integer8 = Mth.floor(this.y + float18 + 1.0);
-        final int integer9 = Mth.floor(this.z - float18 - 1.0);
-        final int integer10 = Mth.floor(this.z + float18 + 1.0);
+        final float float17 = this.radius * 2.0f;
+        int integer5 = Mth.floor(this.x - float17 - 1.0);
+        int integer6 = Mth.floor(this.x + float17 + 1.0);
+        final int integer7 = Mth.floor(this.y - float17 - 1.0);
+        final int integer8 = Mth.floor(this.y + float17 + 1.0);
+        final int integer9 = Mth.floor(this.z - float17 - 1.0);
+        final int integer10 = Mth.floor(this.z + float17 + 1.0);
         final List<Entity> list11 = this.level.getEntities(this.source, new AABB(integer5, integer7, integer9, integer6, integer8, integer10));
-        final Vec3 cvl12 = new Vec3(this.x, this.y, this.z);
+        final Vec3 dem12 = new Vec3(this.x, this.y, this.z);
         for (int integer11 = 0; integer11 < list11.size(); ++integer11) {
-            final Entity akq14 = list11.get(integer11);
-            if (!akq14.ignoreExplosion()) {
-                final double double14 = Mth.sqrt(akq14.distanceToSqr(cvl12)) / float18;
+            final Entity aom14 = list11.get(integer11);
+            if (!aom14.ignoreExplosion()) {
+                final double double14 = Mth.sqrt(aom14.distanceToSqr(dem12)) / float17;
                 if (double14 <= 1.0) {
-                    double double15 = akq14.getX() - this.x;
-                    double double16 = akq14.getEyeY() - this.y;
-                    double double17 = akq14.getZ() - this.z;
+                    double double15 = aom14.getX() - this.x;
+                    double double16 = ((aom14 instanceof PrimedTnt) ? aom14.getY() : aom14.getEyeY()) - this.y;
+                    double double17 = aom14.getZ() - this.z;
                     final double double18 = Mth.sqrt(double15 * double15 + double16 * double16 + double17 * double17);
                     if (double18 != 0.0) {
                         double15 /= double18;
                         double16 /= double18;
                         double17 /= double18;
-                        final double double19 = getSeenPercent(cvl12, akq14);
+                        final double double19 = getSeenPercent(dem12, aom14);
                         final double double20 = (1.0 - double14) * double19;
-                        akq14.hurt(this.getDamageSource(), (float)(int)((double20 * double20 + double20) / 2.0 * 7.0 * float18 + 1.0));
+                        aom14.hurt(this.getDamageSource(), (float)(int)((double20 * double20 + double20) / 2.0 * 7.0 * float17 + 1.0));
                         double double21 = double20;
-                        if (akq14 instanceof LivingEntity) {
-                            double21 = ProtectionEnchantment.getExplosionKnockbackAfterDampener((LivingEntity)akq14, double20);
+                        if (aom14 instanceof LivingEntity) {
+                            double21 = ProtectionEnchantment.getExplosionKnockbackAfterDampener((LivingEntity)aom14, double20);
                         }
-                        akq14.setDeltaMovement(akq14.getDeltaMovement().add(double15 * double21, double16 * double21, double17 * double21));
-                        if (akq14 instanceof Player) {
-                            final Player ayj31 = (Player)akq14;
-                            if (!ayj31.isSpectator() && (!ayj31.isCreative() || !ayj31.abilities.flying)) {
-                                this.hitPlayers.put(ayj31, new Vec3(double15 * double20, double16 * double20, double17 * double20));
+                        aom14.setDeltaMovement(aom14.getDeltaMovement().add(double15 * double21, double16 * double21, double17 * double21));
+                        if (aom14 instanceof Player) {
+                            final Player bec31 = (Player)aom14;
+                            if (!bec31.isSpectator() && (!bec31.isCreative() || !bec31.abilities.flying)) {
+                                this.hitPlayers.put(bec31, new Vec3(double15 * double20, double16 * double20, double17 * double20));
                             }
                         }
                     }
@@ -210,22 +219,22 @@ public class Explosion {
         if (boolean2) {
             final ObjectArrayList<Pair<ItemStack, BlockPos>> objectArrayList4 = (ObjectArrayList<Pair<ItemStack, BlockPos>>)new ObjectArrayList();
             Collections.shuffle(this.toBlow, this.level.random);
-            for (final BlockPos fk6 : this.toBlow) {
-                final BlockState byj7 = this.level.getBlockState(fk6);
-                final Block bph8 = byj7.getBlock();
-                if (!byj7.isAir()) {
-                    final BlockPos fk7 = fk6.immutable();
+            for (final BlockPos fu6 : this.toBlow) {
+                final BlockState cfj7 = this.level.getBlockState(fu6);
+                final Block bvr8 = cfj7.getBlock();
+                if (!cfj7.isAir()) {
+                    final BlockPos fu7 = fu6.immutable();
                     this.level.getProfiler().push("explosion_blocks");
-                    if (bph8.dropFromExplosion(this) && this.level instanceof ServerLevel) {
-                        final BlockEntity bwl10 = bph8.isEntityBlock() ? this.level.getBlockEntity(fk6) : null;
-                        final LootContext.Builder a11 = new LootContext.Builder((ServerLevel)this.level).withRandom(this.level.random).<BlockPos>withParameter(LootContextParams.BLOCK_POS, fk6).<ItemStack>withParameter(LootContextParams.TOOL, ItemStack.EMPTY).<BlockEntity>withOptionalParameter(LootContextParams.BLOCK_ENTITY, bwl10).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, this.source);
+                    if (bvr8.dropFromExplosion(this) && this.level instanceof ServerLevel) {
+                        final BlockEntity cdl10 = bvr8.isEntityBlock() ? this.level.getBlockEntity(fu6) : null;
+                        final LootContext.Builder a11 = new LootContext.Builder((ServerLevel)this.level).withRandom(this.level.random).<BlockPos>withParameter(LootContextParams.BLOCK_POS, fu6).<ItemStack>withParameter(LootContextParams.TOOL, ItemStack.EMPTY).<BlockEntity>withOptionalParameter(LootContextParams.BLOCK_ENTITY, cdl10).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, this.source);
                         if (this.blockInteraction == BlockInteraction.DESTROY) {
                             a11.<Float>withParameter(LootContextParams.EXPLOSION_RADIUS, this.radius);
                         }
-                        byj7.getDrops(a11).forEach(ben -> addBlockDrops(objectArrayList4, ben, fk7));
+                        cfj7.getDrops(a11).forEach(bki -> addBlockDrops(objectArrayList4, bki, fu7));
                     }
-                    this.level.setBlock(fk6, Blocks.AIR.defaultBlockState(), 3);
-                    bph8.wasExploded(this.level, fk6, this);
+                    this.level.setBlock(fu6, Blocks.AIR.defaultBlockState(), 3);
+                    bvr8.wasExploded(this.level, fu6, this);
                     this.level.getProfiler().pop();
                 }
             }
@@ -234,37 +243,33 @@ public class Explosion {
             }
         }
         if (this.fire) {
-            for (final BlockPos fk8 : this.toBlow) {
-                if (this.random.nextInt(3) == 0 && this.level.getBlockState(fk8).isAir() && this.level.getBlockState(fk8.below()).isSolidRender(this.level, fk8.below())) {
-                    this.level.setBlockAndUpdate(fk8, Blocks.FIRE.defaultBlockState());
+            for (final BlockPos fu8 : this.toBlow) {
+                if (this.random.nextInt(3) == 0 && this.level.getBlockState(fu8).isAir() && this.level.getBlockState(fu8.below()).isSolidRender(this.level, fu8.below())) {
+                    this.level.setBlockAndUpdate(fu8, BaseFireBlock.getState(this.level, fu8));
                 }
             }
         }
     }
     
-    private static void addBlockDrops(final ObjectArrayList<Pair<ItemStack, BlockPos>> objectArrayList, final ItemStack ben, final BlockPos fk) {
+    private static void addBlockDrops(final ObjectArrayList<Pair<ItemStack, BlockPos>> objectArrayList, final ItemStack bki, final BlockPos fu) {
         for (int integer4 = objectArrayList.size(), integer5 = 0; integer5 < integer4; ++integer5) {
             final Pair<ItemStack, BlockPos> pair6 = (Pair<ItemStack, BlockPos>)objectArrayList.get(integer5);
-            final ItemStack ben2 = (ItemStack)pair6.getFirst();
-            if (ItemEntity.areMergable(ben2, ben)) {
-                final ItemStack ben3 = ItemEntity.merge(ben2, ben, 16);
-                objectArrayList.set(integer5, Pair.of((Object)ben3, pair6.getSecond()));
-                if (ben.isEmpty()) {
+            final ItemStack bki2 = (ItemStack)pair6.getFirst();
+            if (ItemEntity.areMergable(bki2, bki)) {
+                final ItemStack bki3 = ItemEntity.merge(bki2, bki, 16);
+                objectArrayList.set(integer5, Pair.of((Object)bki3, pair6.getSecond()));
+                if (bki.isEmpty()) {
                     return;
                 }
             }
         }
-        objectArrayList.add(Pair.of((Object)ben, (Object)fk));
+        objectArrayList.add(Pair.of((Object)bki, (Object)fu));
     }
     
     public DamageSource getDamageSource() {
         return this.damageSource;
     }
     
-    public void setDamageSource(final DamageSource ajz) {
-        this.damageSource = ajz;
-    }
-    
     public Map<Player, Vec3> getHitPlayers() {
         return this.hitPlayers;
     }
@@ -280,8 +285,11 @@ public class Explosion {
         if (this.source instanceof LivingEntity) {
             return (LivingEntity)this.source;
         }
-        if (this.source instanceof AbstractHurtingProjectile) {
-            return ((AbstractHurtingProjectile)this.source).owner;
+        if (this.source instanceof Projectile) {
+            final Entity aom2 = ((Projectile)this.source).getOwner();
+            if (aom2 instanceof LivingEntity) {
+                return (LivingEntity)aom2;
+            }
         }
         return null;
     }
diff --git a/src/net/minecraft/world/level/ExplosionDamageCalculator.java b/src/net/minecraft/world/level/ExplosionDamageCalculator.java
new file mode 100644
index 0000000..6e43ff8
--- /dev/null
+++ b/src/net/minecraft/world/level/ExplosionDamageCalculator.java
@@ -0,0 +1,12 @@
+package net.minecraft.world.level;
+
+import java.util.Optional;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
+
+public interface ExplosionDamageCalculator {
+    Optional<Float> getBlockExplosionResistance(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final FluidState cxa);
+    
+    boolean shouldBlockExplode(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final float float5);
+}
diff --git a/src/net/minecraft/world/level/ForcedChunksSavedData.java b/src/net/minecraft/world/level/ForcedChunksSavedData.java
index 31a1070..2dfc364 100644
--- a/src/net/minecraft/world/level/ForcedChunksSavedData.java
+++ b/src/net/minecraft/world/level/ForcedChunksSavedData.java
@@ -14,14 +14,14 @@ public class ForcedChunksSavedData extends SavedData {
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        this.chunks = (LongSet)new LongOpenHashSet(jt.getLongArray("Forced"));
+    public void load(final CompoundTag le) {
+        this.chunks = (LongSet)new LongOpenHashSet(le.getLongArray("Forced"));
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        jt.putLongArray("Forced", this.chunks.toLongArray());
-        return jt;
+    public CompoundTag save(final CompoundTag le) {
+        le.putLongArray("Forced", this.chunks.toLongArray());
+        return le;
     }
     
     public LongSet getChunks() {
diff --git a/src/net/minecraft/world/level/GameRules.java b/src/net/minecraft/world/level/GameRules.java
index 9bac102..4bda431 100644
--- a/src/net/minecraft/world/level/GameRules.java
+++ b/src/net/minecraft/world/level/GameRules.java
@@ -2,7 +2,6 @@ package net.minecraft.world.level;
 
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
-import javax.annotation.Nullable;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.commands.Commands;
 import net.minecraft.commands.CommandSourceStack;
@@ -20,11 +19,14 @@ import java.util.Iterator;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
 import net.minecraft.server.level.ServerPlayer;
+import javax.annotation.Nullable;
 import net.minecraft.server.MinecraftServer;
+import java.util.function.Consumer;
 import net.minecraft.nbt.CompoundTag;
 import java.util.stream.Collector;
 import java.util.function.Function;
 import com.google.common.collect.ImmutableMap;
+import com.mojang.serialization.DynamicLike;
 import java.util.Map;
 import org.apache.logging.log4j.Logger;
 
@@ -62,122 +64,178 @@ public class GameRules {
     public static final Key<BooleanValue> RULE_FIRE_DAMAGE;
     public static final Key<BooleanValue> RULE_DO_PATROL_SPAWNING;
     public static final Key<BooleanValue> RULE_DO_TRADER_SPAWNING;
+    public static final Key<BooleanValue> RULE_FORGIVE_DEAD_PLAYERS;
+    public static final Key<BooleanValue> RULE_UNIVERSAL_ANGER;
     private final Map<Key<?>, Value<?>> rules;
     
-    private static <T extends Value<T>> Key<T> register(final String string, final Type<T> e) {
-        final Key<T> d3 = new Key<T>(string);
-        final Type<?> e2 = GameRules.GAME_RULE_TYPES.put(d3, e);
-        if (e2 != null) {
+    private static <T extends Value<T>> Key<T> register(final String string, final Category b, final Type<T> f) {
+        final Key<T> e4 = new Key<T>(string, b);
+        final Type<?> f2 = GameRules.GAME_RULE_TYPES.put(e4, f);
+        if (f2 != null) {
             throw new IllegalStateException("Duplicate game rule registration for " + string);
         }
-        return d3;
+        return e4;
+    }
+    
+    public GameRules(final DynamicLike<?> dynamicLike) {
+        this();
+        this.loadFromTag(dynamicLike);
     }
     
     public GameRules() {
         this.rules = GameRules.GAME_RULE_TYPES.entrySet().stream().collect(ImmutableMap.toImmutableMap(Map.Entry::getKey, entry -> entry.getValue().createRule()));
     }
     
-    public <T extends Value<T>> T getRule(final Key<T> d) {
-        return (T)this.rules.get(d);
+    private GameRules(final Map<Key<?>, Value<?>> map) {
+        this.rules = map;
+    }
+    
+    public <T extends Value<T>> T getRule(final Key<T> e) {
+        return (T)this.rules.get(e);
     }
     
     public CompoundTag createTag() {
-        final CompoundTag jt2 = new CompoundTag();
-        this.rules.forEach((d, f) -> jt2.putString(d.id, f.serialize()));
-        return jt2;
+        final CompoundTag le2 = new CompoundTag();
+        this.rules.forEach((e, g) -> le2.putString(e.id, g.serialize()));
+        return le2;
     }
     
-    public void loadFromTag(final CompoundTag jt) {
-        this.rules.forEach((d, f) -> {
-            if (jt.contains(d.id)) {
-                f.deserialize(jt.getString(d.id));
-            }
-        });
+    private void loadFromTag(final DynamicLike<?> dynamicLike) {
+        this.rules.forEach((e, g) -> dynamicLike.get(e.id).asString().result().ifPresent(g::deserialize));
     }
     
-    public static void visitGameRuleTypes(final GameRuleTypeVisitor b) {
-        GameRules.GAME_RULE_TYPES.forEach((d, e) -> GameRules.<Value>cap(b, d, e));
+    public GameRules copy() {
+        return new GameRules(this.rules.entrySet().stream().collect(ImmutableMap.toImmutableMap(Map.Entry::getKey, entry -> entry.getValue().copy())));
     }
     
-    private static <T extends Value<T>> void cap(final GameRuleTypeVisitor b, final Key<?> d, final Type<?> e) {
-        final Key<T> d2 = (Key<T>)d;
-        final Type<T> e2 = (Type<T>)e;
-        b.<T>visit(d2, e2);
+    public static void visitGameRuleTypes(final GameRuleTypeVisitor c) {
+        GameRules.GAME_RULE_TYPES.forEach((e, f) -> GameRules.<Value>callVisitorCap(c, e, f));
     }
     
-    public boolean getBoolean(final Key<BooleanValue> d) {
-        return this.<BooleanValue>getRule(d).get();
+    private static <T extends Value<T>> void callVisitorCap(final GameRuleTypeVisitor c, final Key<?> e, final Type<?> f) {
+        final Key<T> e2 = (Key<T>)e;
+        final Type<T> f2 = (Type<T>)f;
+        c.<T>visit(e2, f2);
+        f2.callVisitor(c, e2);
     }
     
-    public int getInt(final Key<IntegerValue> d) {
-        return this.<IntegerValue>getRule(d).get();
+    public void assignFrom(final GameRules bpx, @Nullable final MinecraftServer minecraftServer) {
+        bpx.rules.keySet().forEach(e -> this.<Value>assignCap(e, bpx, minecraftServer));
+    }
+    
+    private <T extends Value<T>> void assignCap(final Key<T> e, final GameRules bpx, @Nullable final MinecraftServer minecraftServer) {
+        final T g5 = bpx.<T>getRule(e);
+        this.<T>getRule(e).setFrom(g5, minecraftServer);
+    }
+    
+    public boolean getBoolean(final Key<BooleanValue> e) {
+        return this.<BooleanValue>getRule(e).get();
+    }
+    
+    public int getInt(final Key<IntegerValue> e) {
+        return this.<IntegerValue>getRule(e).get();
     }
     
     static {
         LOGGER = LogManager.getLogger();
-        GAME_RULE_TYPES = Maps.newTreeMap(Comparator.<Object, Comparable>comparing(d -> d.id));
-        RULE_DOFIRETICK = GameRules.<BooleanValue>register("doFireTick", create(true));
-        RULE_MOBGRIEFING = GameRules.<BooleanValue>register("mobGriefing", create(true));
-        RULE_KEEPINVENTORY = GameRules.<BooleanValue>register("keepInventory", create(false));
-        RULE_DOMOBSPAWNING = GameRules.<BooleanValue>register("doMobSpawning", create(true));
-        RULE_DOMOBLOOT = GameRules.<BooleanValue>register("doMobLoot", create(true));
-        RULE_DOBLOCKDROPS = GameRules.<BooleanValue>register("doTileDrops", create(true));
-        RULE_DOENTITYDROPS = GameRules.<BooleanValue>register("doEntityDrops", create(true));
-        RULE_COMMANDBLOCKOUTPUT = GameRules.<BooleanValue>register("commandBlockOutput", create(true));
-        RULE_NATURAL_REGENERATION = GameRules.<BooleanValue>register("naturalRegeneration", create(true));
-        RULE_DAYLIGHT = GameRules.<BooleanValue>register("doDaylightCycle", create(true));
-        RULE_LOGADMINCOMMANDS = GameRules.<BooleanValue>register("logAdminCommands", create(true));
-        RULE_SHOWDEATHMESSAGES = GameRules.<BooleanValue>register("showDeathMessages", create(true));
-        RULE_RANDOMTICKING = GameRules.<IntegerValue>register("randomTickSpeed", create(3));
-        RULE_SENDCOMMANDFEEDBACK = GameRules.<BooleanValue>register("sendCommandFeedback", create(true));
+        GAME_RULE_TYPES = Maps.newTreeMap(Comparator.<Object, Comparable>comparing(e -> e.id));
+        RULE_DOFIRETICK = GameRules.<BooleanValue>register("doFireTick", Category.UPDATES, create(true));
+        RULE_MOBGRIEFING = GameRules.<BooleanValue>register("mobGriefing", Category.MOBS, create(true));
+        RULE_KEEPINVENTORY = GameRules.<BooleanValue>register("keepInventory", Category.PLAYER, create(false));
+        RULE_DOMOBSPAWNING = GameRules.<BooleanValue>register("doMobSpawning", Category.SPAWNING, create(true));
+        RULE_DOMOBLOOT = GameRules.<BooleanValue>register("doMobLoot", Category.DROPS, create(true));
+        RULE_DOBLOCKDROPS = GameRules.<BooleanValue>register("doTileDrops", Category.DROPS, create(true));
+        RULE_DOENTITYDROPS = GameRules.<BooleanValue>register("doEntityDrops", Category.DROPS, create(true));
+        RULE_COMMANDBLOCKOUTPUT = GameRules.<BooleanValue>register("commandBlockOutput", Category.CHAT, create(true));
+        RULE_NATURAL_REGENERATION = GameRules.<BooleanValue>register("naturalRegeneration", Category.PLAYER, create(true));
+        RULE_DAYLIGHT = GameRules.<BooleanValue>register("doDaylightCycle", Category.UPDATES, create(true));
+        RULE_LOGADMINCOMMANDS = GameRules.<BooleanValue>register("logAdminCommands", Category.CHAT, create(true));
+        RULE_SHOWDEATHMESSAGES = GameRules.<BooleanValue>register("showDeathMessages", Category.CHAT, create(true));
+        RULE_RANDOMTICKING = GameRules.<IntegerValue>register("randomTickSpeed", Category.UPDATES, create(3));
+        RULE_SENDCOMMANDFEEDBACK = GameRules.<BooleanValue>register("sendCommandFeedback", Category.CHAT, create(true));
         final int byte3;
         final Iterator<ServerPlayer> iterator;
-        ServerPlayer xe5;
-        RULE_REDUCEDDEBUGINFO = GameRules.<BooleanValue>register("reducedDebugInfo", create(false, (minecraftServer, a) -> {
+        ServerPlayer ze5;
+        RULE_REDUCEDDEBUGINFO = GameRules.<BooleanValue>register("reducedDebugInfo", Category.MISC, create(false, (minecraftServer, a) -> {
             byte3 = (a.get() ? 22 : 23);
             minecraftServer.getPlayerList().getPlayers().iterator();
             while (iterator.hasNext()) {
-                xe5 = iterator.next();
-                xe5.connection.send(new ClientboundEntityEventPacket(xe5, (byte)byte3));
+                ze5 = iterator.next();
+                ze5.connection.send(new ClientboundEntityEventPacket(ze5, (byte)byte3));
             }
             return;
         }));
-        RULE_SPECTATORSGENERATECHUNKS = GameRules.<BooleanValue>register("spectatorsGenerateChunks", create(true));
-        RULE_SPAWN_RADIUS = GameRules.<IntegerValue>register("spawnRadius", create(10));
-        RULE_DISABLE_ELYTRA_MOVEMENT_CHECK = GameRules.<BooleanValue>register("disableElytraMovementCheck", create(false));
-        RULE_MAX_ENTITY_CRAMMING = GameRules.<IntegerValue>register("maxEntityCramming", create(24));
-        RULE_WEATHER_CYCLE = GameRules.<BooleanValue>register("doWeatherCycle", create(true));
-        RULE_LIMITED_CRAFTING = GameRules.<BooleanValue>register("doLimitedCrafting", create(false));
-        RULE_MAX_COMMAND_CHAIN_LENGTH = GameRules.<IntegerValue>register("maxCommandChainLength", create(65536));
-        RULE_ANNOUNCE_ADVANCEMENTS = GameRules.<BooleanValue>register("announceAdvancements", create(true));
-        RULE_DISABLE_RAIDS = GameRules.<BooleanValue>register("disableRaids", create(false));
-        RULE_DOINSOMNIA = GameRules.<BooleanValue>register("doInsomnia", create(true));
+        RULE_SPECTATORSGENERATECHUNKS = GameRules.<BooleanValue>register("spectatorsGenerateChunks", Category.PLAYER, create(true));
+        RULE_SPAWN_RADIUS = GameRules.<IntegerValue>register("spawnRadius", Category.PLAYER, create(10));
+        RULE_DISABLE_ELYTRA_MOVEMENT_CHECK = GameRules.<BooleanValue>register("disableElytraMovementCheck", Category.PLAYER, create(false));
+        RULE_MAX_ENTITY_CRAMMING = GameRules.<IntegerValue>register("maxEntityCramming", Category.MOBS, create(24));
+        RULE_WEATHER_CYCLE = GameRules.<BooleanValue>register("doWeatherCycle", Category.UPDATES, create(true));
+        RULE_LIMITED_CRAFTING = GameRules.<BooleanValue>register("doLimitedCrafting", Category.PLAYER, create(false));
+        RULE_MAX_COMMAND_CHAIN_LENGTH = GameRules.<IntegerValue>register("maxCommandChainLength", Category.MISC, create(65536));
+        RULE_ANNOUNCE_ADVANCEMENTS = GameRules.<BooleanValue>register("announceAdvancements", Category.CHAT, create(true));
+        RULE_DISABLE_RAIDS = GameRules.<BooleanValue>register("disableRaids", Category.MOBS, create(false));
+        RULE_DOINSOMNIA = GameRules.<BooleanValue>register("doInsomnia", Category.SPAWNING, create(true));
         final Iterator<ServerPlayer> iterator2;
-        ServerPlayer xe6;
+        ServerPlayer ze6;
         ServerGamePacketListenerImpl connection;
-        final ClientboundGameEventPacket lt;
-        RULE_DO_IMMEDIATE_RESPAWN = GameRules.<BooleanValue>register("doImmediateRespawn", create(false, (minecraftServer, a) -> {
+        final ClientboundGameEventPacket ni;
+        RULE_DO_IMMEDIATE_RESPAWN = GameRules.<BooleanValue>register("doImmediateRespawn", Category.PLAYER, create(false, (minecraftServer, a) -> {
             minecraftServer.getPlayerList().getPlayers().iterator();
             while (iterator2.hasNext()) {
-                xe6 = iterator2.next();
-                connection = xe6.connection;
-                new ClientboundGameEventPacket(11, a.get() ? 1.0f : 0.0f);
-                connection.send(lt);
+                ze6 = iterator2.next();
+                connection = ze6.connection;
+                new ClientboundGameEventPacket(ClientboundGameEventPacket.IMMEDIATE_RESPAWN, a.get() ? 1.0f : 0.0f);
+                connection.send(ni);
             }
             return;
         }));
-        RULE_DROWNING_DAMAGE = GameRules.<BooleanValue>register("drowningDamage", create(true));
-        RULE_FALL_DAMAGE = GameRules.<BooleanValue>register("fallDamage", create(true));
-        RULE_FIRE_DAMAGE = GameRules.<BooleanValue>register("fireDamage", create(true));
-        RULE_DO_PATROL_SPAWNING = GameRules.<BooleanValue>register("doPatrolSpawning", create(true));
-        RULE_DO_TRADER_SPAWNING = GameRules.<BooleanValue>register("doTraderSpawning", create(true));
+        RULE_DROWNING_DAMAGE = GameRules.<BooleanValue>register("drowningDamage", Category.PLAYER, create(true));
+        RULE_FALL_DAMAGE = GameRules.<BooleanValue>register("fallDamage", Category.PLAYER, create(true));
+        RULE_FIRE_DAMAGE = GameRules.<BooleanValue>register("fireDamage", Category.PLAYER, create(true));
+        RULE_DO_PATROL_SPAWNING = GameRules.<BooleanValue>register("doPatrolSpawning", Category.SPAWNING, create(true));
+        RULE_DO_TRADER_SPAWNING = GameRules.<BooleanValue>register("doTraderSpawning", Category.SPAWNING, create(true));
+        RULE_FORGIVE_DEAD_PLAYERS = GameRules.<BooleanValue>register("forgiveDeadPlayers", Category.MOBS, create(true));
+        RULE_UNIVERSAL_ANGER = GameRules.<BooleanValue>register("universalAnger", Category.MOBS, create(false));
+    }
+    
+    public enum Category {
+        PLAYER("gamerule.category.player"), 
+        MOBS("gamerule.category.mobs"), 
+        SPAWNING("gamerule.category.spawning"), 
+        DROPS("gamerule.category.drops"), 
+        UPDATES("gamerule.category.updates"), 
+        CHAT("gamerule.category.chat"), 
+        MISC("gamerule.category.misc");
+        
+        private final String descriptionId;
+        
+        private Category(final String string3) {
+            this.descriptionId = string3;
+        }
+        
+        public String getDescriptionId() {
+            return this.descriptionId;
+        }
+    }
+    
+    public interface GameRuleTypeVisitor {
+        default <T extends Value<T>> void visit(final Key<T> e, final Type<T> f) {
+        }
+        
+        default void visitBoolean(final Key<BooleanValue> e, final Type<BooleanValue> f) {
+        }
+        
+        default void visitInteger(final Key<IntegerValue> e, final Type<IntegerValue> f) {
+        }
     }
     
     public static final class Key<T extends Value<T>> {
         private final String id;
+        private final Category category;
         
-        public Key(final String string) {
+        public Key(final String string, final Category b) {
             this.id = string;
+            this.category = b;
         }
         
         @Override
@@ -198,17 +256,27 @@ public class GameRules {
         public String getId() {
             return this.id;
         }
+        
+        public String getDescriptionId() {
+            return "gamerule." + this.id;
+        }
+        
+        public Category getCategory() {
+            return this.category;
+        }
     }
     
     public static class Type<T extends Value<T>> {
         private final Supplier<ArgumentType<?>> argument;
         private final Function<Type<T>, T> constructor;
         private final BiConsumer<MinecraftServer, T> callback;
+        private final VisitorCaller<T> visitorCaller;
         
-        private Type(final Supplier<ArgumentType<?>> supplier, final Function<Type<T>, T> function, final BiConsumer<MinecraftServer, T> biConsumer) {
+        private Type(final Supplier<ArgumentType<?>> supplier, final Function<Type<T>, T> function, final BiConsumer<MinecraftServer, T> biConsumer, final VisitorCaller<T> h) {
             this.argument = supplier;
             this.constructor = function;
             this.callback = biConsumer;
+            this.visitorCaller = h;
         }
         
         public RequiredArgumentBuilder<CommandSourceStack, ?> createArgument(final String string) {
@@ -218,13 +286,17 @@ public class GameRules {
         public T createRule() {
             return this.constructor.apply(this);
         }
+        
+        public void callVisitor(final GameRuleTypeVisitor c, final Key<T> e) {
+            this.visitorCaller.call(c, e, this);
+        }
     }
     
     public abstract static class Value<T extends Value<T>> {
-        private final Type<T> type;
+        protected final Type<T> type;
         
-        public Value(final Type<T> e) {
-            this.type = e;
+        public Value(final Type<T> f) {
+            this.type = f;
         }
         
         protected abstract void updateFromArgument(final CommandContext<CommandSourceStack> commandContext, final String string);
@@ -242,7 +314,7 @@ public class GameRules {
         
         protected abstract void deserialize(final String string);
         
-        protected abstract String serialize();
+        public abstract String serialize();
         
         @Override
         public String toString() {
@@ -252,21 +324,25 @@ public class GameRules {
         public abstract int getCommandResult();
         
         protected abstract T getSelf();
+        
+        protected abstract T copy();
+        
+        public abstract void setFrom(final T g, @Nullable final MinecraftServer minecraftServer);
     }
     
     public static class IntegerValue extends Value<IntegerValue> {
         private int value;
         
         private static Type<IntegerValue> create(final int integer, final BiConsumer<MinecraftServer, IntegerValue> biConsumer) {
-            return new Type<IntegerValue>((Supplier)IntegerArgumentType::integer, e -> new IntegerValue(e, integer), (BiConsumer)biConsumer);
+            return new Type<IntegerValue>((Supplier)IntegerArgumentType::integer, f -> new IntegerValue(f, integer), (BiConsumer)biConsumer, GameRuleTypeVisitor::visitInteger);
         }
         
         private static Type<IntegerValue> create(final int integer) {
-            return create(integer, (minecraftServer, c) -> {});
+            return create(integer, (minecraftServer, d) -> {});
         }
         
-        public IntegerValue(final Type<IntegerValue> e, final int integer) {
-            super(e);
+        public IntegerValue(final Type<IntegerValue> f, final int integer) {
+            super(f);
             this.value = integer;
         }
         
@@ -280,7 +356,7 @@ public class GameRules {
         }
         
         @Override
-        protected String serialize() {
+        public String serialize() {
             return Integer.toString(this.value);
         }
         
@@ -289,6 +365,16 @@ public class GameRules {
             this.value = safeParse(string);
         }
         
+        public boolean tryDeserialize(final String string) {
+            try {
+                this.value = Integer.parseInt(string);
+                return true;
+            }
+            catch (NumberFormatException ex) {
+                return false;
+            }
+        }
+        
         private static int safeParse(final String string) {
             if (!string.isEmpty()) {
                 try {
@@ -310,21 +396,32 @@ public class GameRules {
         protected IntegerValue getSelf() {
             return this;
         }
+        
+        @Override
+        protected IntegerValue copy() {
+            return new IntegerValue((Type<IntegerValue>)this.type, this.value);
+        }
+        
+        @Override
+        public void setFrom(final IntegerValue d, @Nullable final MinecraftServer minecraftServer) {
+            this.value = d.value;
+            this.onChanged(minecraftServer);
+        }
     }
     
     public static class BooleanValue extends Value<BooleanValue> {
         private boolean value;
         
         private static Type<BooleanValue> create(final boolean boolean1, final BiConsumer<MinecraftServer, BooleanValue> biConsumer) {
-            return new Type<BooleanValue>((Supplier)BoolArgumentType::bool, e -> new BooleanValue(e, boolean1), (BiConsumer)biConsumer);
+            return new Type<BooleanValue>((Supplier)BoolArgumentType::bool, f -> new BooleanValue(f, boolean1), (BiConsumer)biConsumer, GameRuleTypeVisitor::visitBoolean);
         }
         
         private static Type<BooleanValue> create(final boolean boolean1) {
             return create(boolean1, (minecraftServer, a) -> {});
         }
         
-        public BooleanValue(final Type<BooleanValue> e, final boolean boolean2) {
-            super(e);
+        public BooleanValue(final Type<BooleanValue> f, final boolean boolean2) {
+            super(f);
             this.value = boolean2;
         }
         
@@ -343,7 +440,7 @@ public class GameRules {
         }
         
         @Override
-        protected String serialize() {
+        public String serialize() {
             return Boolean.toString(this.value);
         }
         
@@ -361,10 +458,20 @@ public class GameRules {
         protected BooleanValue getSelf() {
             return this;
         }
+        
+        @Override
+        protected BooleanValue copy() {
+            return new BooleanValue((Type<BooleanValue>)this.type, this.value);
+        }
+        
+        @Override
+        public void setFrom(final BooleanValue a, @Nullable final MinecraftServer minecraftServer) {
+            this.value = a.value;
+            this.onChanged(minecraftServer);
+        }
     }
     
-    @FunctionalInterface
-    public interface GameRuleTypeVisitor {
-         <T extends Value<T>> void visit(final Key<T> d, final Type<T> e);
+    interface VisitorCaller<T extends Value<T>> {
+        void call(final GameRuleTypeVisitor c, final Key<T> e, final Type<T> f);
     }
 }
diff --git a/src/net/minecraft/world/level/GameType.java b/src/net/minecraft/world/level/GameType.java
index 53462c1..ab5283f 100644
--- a/src/net/minecraft/world/level/GameType.java
+++ b/src/net/minecraft/world/level/GameType.java
@@ -28,28 +28,28 @@ public enum GameType {
     }
     
     public Component getDisplayName() {
-        return new TranslatableComponent("gameMode." + this.name, new Object[0]);
+        return new TranslatableComponent("gameMode." + this.name);
     }
     
-    public void updatePlayerAbilities(final Abilities ayg) {
+    public void updatePlayerAbilities(final Abilities bdz) {
         if (this == GameType.CREATIVE) {
-            ayg.mayfly = true;
-            ayg.instabuild = true;
-            ayg.invulnerable = true;
+            bdz.mayfly = true;
+            bdz.instabuild = true;
+            bdz.invulnerable = true;
         }
         else if (this == GameType.SPECTATOR) {
-            ayg.mayfly = true;
-            ayg.instabuild = false;
-            ayg.invulnerable = true;
-            ayg.flying = true;
+            bdz.mayfly = true;
+            bdz.instabuild = false;
+            bdz.invulnerable = true;
+            bdz.flying = true;
         }
         else {
-            ayg.mayfly = false;
-            ayg.instabuild = false;
-            ayg.invulnerable = false;
-            ayg.flying = false;
+            bdz.mayfly = false;
+            bdz.instabuild = false;
+            bdz.invulnerable = false;
+            bdz.flying = false;
         }
-        ayg.mayBuild = !this.isBlockPlacingRestricted();
+        bdz.mayBuild = !this.isBlockPlacingRestricted();
     }
     
     public boolean isBlockPlacingRestricted() {
@@ -68,25 +68,25 @@ public enum GameType {
         return byId(integer, GameType.SURVIVAL);
     }
     
-    public static GameType byId(final int integer, final GameType bjt) {
-        for (final GameType bjt2 : values()) {
-            if (bjt2.id == integer) {
-                return bjt2;
+    public static GameType byId(final int integer, final GameType bpy) {
+        for (final GameType bpy2 : values()) {
+            if (bpy2.id == integer) {
+                return bpy2;
             }
         }
-        return bjt;
+        return bpy;
     }
     
     public static GameType byName(final String string) {
         return byName(string, GameType.SURVIVAL);
     }
     
-    public static GameType byName(final String string, final GameType bjt) {
-        for (final GameType bjt2 : values()) {
-            if (bjt2.name.equals(string)) {
-                return bjt2;
+    public static GameType byName(final String string, final GameType bpy) {
+        for (final GameType bpy2 : values()) {
+            if (bpy2.name.equals(string)) {
+                return bpy2;
             }
         }
-        return bjt;
+        return bpy;
     }
 }
diff --git a/src/net/minecraft/world/level/Level.java b/src/net/minecraft/world/level/Level.java
index 988c81b..a809c4f 100644
--- a/src/net/minecraft/world/level/Level.java
+++ b/src/net/minecraft/world/level/Level.java
@@ -1,5 +1,7 @@
 package net.minecraft.world.level;
 
+import java.util.function.Function;
+import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.tags.TagManager;
 import net.minecraft.world.item.crafting.RecipeManager;
@@ -9,20 +11,17 @@ import net.minecraft.world.scores.Scoreboard;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
 import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.storage.LevelData;
 import net.minecraft.world.entity.EntityType;
-import java.util.function.Predicate;
+import net.minecraft.world.level.chunk.ChunkSource;
+import net.minecraft.world.phys.AABB;
 import java.io.IOException;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate;
-import net.minecraft.world.level.material.Material;
-import net.minecraft.util.Mth;
-import net.minecraft.world.phys.AABB;
 import java.util.function.Consumer;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import java.util.Iterator;
 import java.util.Collection;
 import net.minecraft.world.level.block.entity.TickableBlockEntity;
-import org.apache.logging.log4j.util.Supplier;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvent;
@@ -36,6 +35,7 @@ import net.minecraft.CrashReportCategory;
 import net.minecraft.core.Registry;
 import net.minecraft.CrashReport;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.BaseFireBlock;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.Block;
@@ -43,33 +43,42 @@ import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.util.Mth;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.BlockState;
+import java.util.function.Predicate;
 import net.minecraft.core.BlockPos;
 import javax.annotation.Nullable;
 import net.minecraft.server.MinecraftServer;
 import com.google.common.collect.Lists;
-import java.util.function.BiFunction;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.world.level.border.WorldBorder;
 import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.world.level.storage.LevelData;
-import net.minecraft.world.level.chunk.ChunkSource;
-import net.minecraft.world.level.dimension.Dimension;
+import java.util.function.Supplier;
+import net.minecraft.world.level.storage.WritableLevelData;
+import net.minecraft.world.level.dimension.DimensionType;
 import java.util.Random;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import java.util.List;
 import net.minecraft.core.Direction;
+import net.minecraft.resources.ResourceKey;
+import com.mojang.serialization.Codec;
 import org.apache.logging.log4j.Logger;
 
 public abstract class Level implements LevelAccessor, AutoCloseable {
     protected static final Logger LOGGER;
+    public static final Codec<ResourceKey<Level>> RESOURCE_KEY_CODEC;
+    public static final ResourceKey<Level> OVERWORLD;
+    public static final ResourceKey<Level> NETHER;
+    public static final ResourceKey<Level> END;
     private static final Direction[] DIRECTIONS;
     public final List<BlockEntity> blockEntityList;
     public final List<BlockEntity> tickableBlockEntities;
     protected final List<BlockEntity> pendingBlockEntities;
     protected final List<BlockEntity> blockEntitiesToUnload;
     private final Thread thread;
+    private final boolean isDebug;
     private int skyDarken;
     protected int randValue;
     protected final int addend = 1013904223;
@@ -78,30 +87,48 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     protected float oThunderLevel;
     protected float thunderLevel;
     public final Random random;
-    public final Dimension dimension;
-    protected final ChunkSource chunkSource;
-    protected final LevelData levelData;
-    private final ProfilerFiller profiler;
+    private final DimensionType dimensionType;
+    protected final WritableLevelData levelData;
+    private final Supplier<ProfilerFiller> profiler;
     public final boolean isClientSide;
     protected boolean updatingBlockEntities;
     private final WorldBorder worldBorder;
     private final BiomeManager biomeManager;
+    private final ResourceKey<Level> dimension;
+    private final ResourceKey<DimensionType> dimensionTypeKey;
     
-    protected Level(final LevelData crm, final DimensionType cbi, final BiFunction<Level, Dimension, ChunkSource> biFunction, final ProfilerFiller aio, final boolean boolean5) {
+    protected Level(final WritableLevelData dam, final ResourceKey<Level> ug2, final ResourceKey<DimensionType> ug3, final DimensionType cif, final Supplier<ProfilerFiller> supplier, final boolean boolean6, final boolean boolean7, final long long8) {
         this.blockEntityList = Lists.newArrayList();
         this.tickableBlockEntities = Lists.newArrayList();
         this.pendingBlockEntities = Lists.newArrayList();
         this.blockEntitiesToUnload = Lists.newArrayList();
         this.randValue = new Random().nextInt();
         this.random = new Random();
-        this.profiler = aio;
-        this.levelData = crm;
-        this.dimension = cbi.create(this);
-        this.chunkSource = biFunction.apply(this, this.dimension);
-        this.isClientSide = boolean5;
-        this.worldBorder = this.dimension.createWorldBorder();
+        this.profiler = supplier;
+        this.levelData = dam;
+        this.dimensionType = cif;
+        this.dimension = ug2;
+        this.dimensionTypeKey = ug3;
+        this.isClientSide = boolean6;
+        if (cif.shrunk()) {
+            this.worldBorder = new WorldBorder() {
+                @Override
+                public double getCenterX() {
+                    return super.getCenterX() / 8.0;
+                }
+                
+                @Override
+                public double getCenterZ() {
+                    return super.getCenterZ() / 8.0;
+                }
+            };
+        }
+        else {
+            this.worldBorder = new WorldBorder();
+        }
         this.thread = Thread.currentThread();
-        this.biomeManager = new BiomeManager(this, boolean5 ? crm.getSeed() : LevelData.obfuscateSeed(crm.getSeed()), cbi.getBiomeZoomer());
+        this.biomeManager = new BiomeManager(this, long8, cif.getBiomeZoomer());
+        this.isDebug = boolean7;
     }
     
     @Override
@@ -114,30 +141,67 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         return null;
     }
     
-    public void validateSpawn() {
-        this.setSpawnPos(new BlockPos(8, 64, 8));
+    public static boolean isInWorldBounds(final BlockPos fu) {
+        return !isOutsideBuildHeight(fu) && isInWorldBoundsHorizontal(fu);
     }
     
-    public BlockState getTopBlockState(final BlockPos fk) {
-        BlockPos fk2;
-        for (fk2 = new BlockPos(fk.getX(), this.getSeaLevel(), fk.getZ()); !this.isEmptyBlock(fk2.above()); fk2 = fk2.above()) {}
-        return this.getBlockState(fk2);
+    public static boolean isInSpawnableBounds(final BlockPos fu) {
+        return !isOutsideSpawnableHeight(fu.getY()) && isInWorldBoundsHorizontal(fu);
     }
     
-    public static boolean isInWorldBounds(final BlockPos fk) {
-        return !isOutsideBuildHeight(fk) && fk.getX() >= -30000000 && fk.getZ() >= -30000000 && fk.getX() < 30000000 && fk.getZ() < 30000000;
+    private static boolean isInWorldBoundsHorizontal(final BlockPos fu) {
+        return fu.getX() >= -30000000 && fu.getZ() >= -30000000 && fu.getX() < 30000000 && fu.getZ() < 30000000;
     }
     
-    public static boolean isOutsideBuildHeight(final BlockPos fk) {
-        return isOutsideBuildHeight(fk.getY());
+    private static boolean isOutsideSpawnableHeight(final int integer) {
+        return integer < -20000000 || integer >= 20000000;
+    }
+    
+    public static boolean isOutsideBuildHeight(final BlockPos fu) {
+        return isOutsideBuildHeight(fu.getY());
     }
     
     public static boolean isOutsideBuildHeight(final int integer) {
         return integer < 0 || integer >= 256;
     }
     
-    public LevelChunk getChunkAt(final BlockPos fk) {
-        return this.getChunk(fk.getX() >> 4, fk.getZ() >> 4);
+    public double getRelativeFloorHeight(final BlockPos fu) {
+        return this.getRelativeFloorHeight(fu, cfj -> false);
+    }
+    
+    public double getRelativeFloorHeight(final BlockPos fu, final Predicate<BlockState> predicate) {
+        final BlockState cfj4 = this.getBlockState(fu);
+        final VoxelShape dfg5 = predicate.test(cfj4) ? Shapes.empty() : cfj4.getCollisionShape(this, fu);
+        if (!dfg5.isEmpty()) {
+            return dfg5.max(Direction.Axis.Y);
+        }
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj5 = this.getBlockState(fu2);
+        final VoxelShape dfg6 = predicate.test(cfj5) ? Shapes.empty() : cfj5.getCollisionShape(this, fu2);
+        final double double9 = dfg6.max(Direction.Axis.Y);
+        if (double9 >= 1.0) {
+            return double9 - 1.0;
+        }
+        return Double.NEGATIVE_INFINITY;
+    }
+    
+    public double getRelativeCeilingHeight(final BlockPos fu, final double double2) {
+        final BlockPos.MutableBlockPos a5 = fu.mutable();
+        final int integer6 = Mth.ceil(double2);
+        int integer7 = 0;
+        while (integer7 < integer6) {
+            final VoxelShape dfg8 = this.getBlockState(a5).getCollisionShape(this, a5);
+            if (!dfg8.isEmpty()) {
+                return integer7 + dfg8.min(Direction.Axis.Y);
+            }
+            ++integer7;
+            a5.move(Direction.UP);
+        }
+        return Double.POSITIVE_INFINITY;
+    }
+    
+    public LevelChunk getChunkAt(final BlockPos fu) {
+        return this.getChunk(fu.getX() >> 4, fu.getZ() >> 4);
     }
     
     @Override
@@ -146,149 +210,149 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     
     @Override
-    public ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus cae, final boolean boolean4) {
-        final ChunkAccess bzy6 = this.chunkSource.getChunk(integer1, integer2, cae, boolean4);
-        if (bzy6 == null && boolean4) {
+    public ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus chc, final boolean boolean4) {
+        final ChunkAccess cgy6 = this.getChunkSource().getChunk(integer1, integer2, chc, boolean4);
+        if (cgy6 == null && boolean4) {
             throw new IllegalStateException("Should always be able to create a chunk!");
         }
-        return bzy6;
+        return cgy6;
     }
     
     @Override
-    public boolean setBlock(final BlockPos fk, final BlockState byj, final int integer) {
-        if (isOutsideBuildHeight(fk)) {
+    public boolean setBlock(final BlockPos fu, final BlockState cfj, final int integer) {
+        return this.setBlock(fu, cfj, integer, 512);
+    }
+    
+    @Override
+    public boolean setBlock(final BlockPos fu, final BlockState cfj, final int integer3, final int integer4) {
+        if (isOutsideBuildHeight(fu)) {
             return false;
         }
-        if (!this.isClientSide && this.levelData.getGeneratorType() == LevelType.DEBUG_ALL_BLOCK_STATES) {
+        if (!this.isClientSide && this.isDebug()) {
             return false;
         }
-        final LevelChunk cal5 = this.getChunkAt(fk);
-        final Block bph6 = byj.getBlock();
-        final BlockState byj2 = cal5.setBlockState(fk, byj, (integer & 0x40) != 0x0);
-        if (byj2 != null) {
-            final BlockState byj3 = this.getBlockState(fk);
-            if (byj3 != byj2 && (byj3.getLightBlock(this, fk) != byj2.getLightBlock(this, fk) || byj3.getLightEmission() != byj2.getLightEmission() || byj3.useShapeForLightOcclusion() || byj2.useShapeForLightOcclusion())) {
-                this.profiler.push("queueCheckLight");
-                this.getChunkSource().getLightEngine().checkBlock(fk);
-                this.profiler.pop();
+        final LevelChunk chj6 = this.getChunkAt(fu);
+        final Block bvr7 = cfj.getBlock();
+        final BlockState cfj2 = chj6.setBlockState(fu, cfj, (integer3 & 0x40) != 0x0);
+        if (cfj2 != null) {
+            final BlockState cfj3 = this.getBlockState(fu);
+            if (cfj3 != cfj2 && (cfj3.getLightBlock(this, fu) != cfj2.getLightBlock(this, fu) || cfj3.getLightEmission() != cfj2.getLightEmission() || cfj3.useShapeForLightOcclusion() || cfj2.useShapeForLightOcclusion())) {
+                this.getProfiler().push("queueCheckLight");
+                this.getChunkSource().getLightEngine().checkBlock(fu);
+                this.getProfiler().pop();
             }
-            if (byj3 == byj) {
-                if (byj2 != byj3) {
-                    this.setBlocksDirty(fk, byj2, byj3);
+            if (cfj3 == cfj) {
+                if (cfj2 != cfj3) {
+                    this.setBlocksDirty(fu, cfj2, cfj3);
                 }
-                if ((integer & 0x2) != 0x0 && (!this.isClientSide || (integer & 0x4) == 0x0) && (this.isClientSide || (cal5.getFullStatus() != null && cal5.getFullStatus().isOrAfter(ChunkHolder.FullChunkStatus.TICKING)))) {
-                    this.sendBlockUpdated(fk, byj2, byj, integer);
+                if ((integer3 & 0x2) != 0x0 && (!this.isClientSide || (integer3 & 0x4) == 0x0) && (this.isClientSide || (chj6.getFullStatus() != null && chj6.getFullStatus().isOrAfter(ChunkHolder.FullChunkStatus.TICKING)))) {
+                    this.sendBlockUpdated(fu, cfj2, cfj, integer3);
                 }
-                if (!this.isClientSide && (integer & 0x1) != 0x0) {
-                    this.blockUpdated(fk, byj2.getBlock());
-                    if (byj.hasAnalogOutputSignal()) {
-                        this.updateNeighbourForOutputSignal(fk, bph6);
+                if ((integer3 & 0x1) != 0x0) {
+                    this.blockUpdated(fu, cfj2.getBlock());
+                    if (!this.isClientSide && cfj.hasAnalogOutputSignal()) {
+                        this.updateNeighbourForOutputSignal(fu, bvr7);
                     }
                 }
-                if ((integer & 0x10) == 0x0) {
-                    final int integer2 = integer & 0xFFFFFFFE;
-                    byj2.updateIndirectNeighbourShapes(this, fk, integer2);
-                    byj.updateNeighbourShapes(this, fk, integer2);
-                    byj.updateIndirectNeighbourShapes(this, fk, integer2);
+                if ((integer3 & 0x10) == 0x0 && integer4 > 0) {
+                    final int integer5 = integer3 & 0xFFFFFFDE;
+                    cfj2.updateIndirectNeighbourShapes(this, fu, integer5, integer4 - 1);
+                    cfj.updateNeighbourShapes(this, fu, integer5, integer4 - 1);
+                    cfj.updateIndirectNeighbourShapes(this, fu, integer5, integer4 - 1);
                 }
-                this.onBlockStateChange(fk, byj2, byj3);
+                this.onBlockStateChange(fu, cfj2, cfj3);
             }
             return true;
         }
         return false;
     }
     
-    public void onBlockStateChange(final BlockPos fk, final BlockState byj2, final BlockState byj3) {
+    public void onBlockStateChange(final BlockPos fu, final BlockState cfj2, final BlockState cfj3) {
     }
     
     @Override
-    public boolean removeBlock(final BlockPos fk, final boolean boolean2) {
-        final FluidState coj4 = this.getFluidState(fk);
-        return this.setBlock(fk, coj4.createLegacyBlock(), 0x3 | (boolean2 ? 64 : 0));
+    public boolean removeBlock(final BlockPos fu, final boolean boolean2) {
+        final FluidState cxa4 = this.getFluidState(fu);
+        return this.setBlock(fu, cxa4.createLegacyBlock(), 0x3 | (boolean2 ? 64 : 0));
     }
     
     @Override
-    public boolean destroyBlock(final BlockPos fk, final boolean boolean2, @Nullable final Entity akq) {
-        final BlockState byj5 = this.getBlockState(fk);
-        if (byj5.isAir()) {
+    public boolean destroyBlock(final BlockPos fu, final boolean boolean2, @Nullable final Entity aom, final int integer) {
+        final BlockState cfj6 = this.getBlockState(fu);
+        if (cfj6.isAir()) {
             return false;
         }
-        final FluidState coj6 = this.getFluidState(fk);
-        this.levelEvent(2001, fk, Block.getId(byj5));
+        final FluidState cxa7 = this.getFluidState(fu);
+        if (!(cfj6.getBlock() instanceof BaseFireBlock)) {
+            this.levelEvent(2001, fu, Block.getId(cfj6));
+        }
         if (boolean2) {
-            final BlockEntity bwl7 = byj5.getBlock().isEntityBlock() ? this.getBlockEntity(fk) : null;
-            Block.dropResources(byj5, this, fk, bwl7, akq, ItemStack.EMPTY);
+            final BlockEntity cdl8 = cfj6.getBlock().isEntityBlock() ? this.getBlockEntity(fu) : null;
+            Block.dropResources(cfj6, this, fu, cdl8, aom, ItemStack.EMPTY);
         }
-        return this.setBlock(fk, coj6.createLegacyBlock(), 3);
+        return this.setBlock(fu, cxa7.createLegacyBlock(), 3, integer);
     }
     
-    public boolean setBlockAndUpdate(final BlockPos fk, final BlockState byj) {
-        return this.setBlock(fk, byj, 3);
+    public boolean setBlockAndUpdate(final BlockPos fu, final BlockState cfj) {
+        return this.setBlock(fu, cfj, 3);
     }
     
-    public abstract void sendBlockUpdated(final BlockPos fk, final BlockState byj2, final BlockState byj3, final int integer);
+    public abstract void sendBlockUpdated(final BlockPos fu, final BlockState cfj2, final BlockState cfj3, final int integer);
     
-    @Override
-    public void blockUpdated(final BlockPos fk, final Block bph) {
-        if (this.levelData.getGeneratorType() != LevelType.DEBUG_ALL_BLOCK_STATES) {
-            this.updateNeighborsAt(fk, bph);
+    public void setBlocksDirty(final BlockPos fu, final BlockState cfj2, final BlockState cfj3) {
+    }
+    
+    public void updateNeighborsAt(final BlockPos fu, final Block bvr) {
+        this.neighborChanged(fu.west(), bvr, fu);
+        this.neighborChanged(fu.east(), bvr, fu);
+        this.neighborChanged(fu.below(), bvr, fu);
+        this.neighborChanged(fu.above(), bvr, fu);
+        this.neighborChanged(fu.north(), bvr, fu);
+        this.neighborChanged(fu.south(), bvr, fu);
+    }
+    
+    public void updateNeighborsAtExceptFromFacing(final BlockPos fu, final Block bvr, final Direction fz) {
+        if (fz != Direction.WEST) {
+            this.neighborChanged(fu.west(), bvr, fu);
+        }
+        if (fz != Direction.EAST) {
+            this.neighborChanged(fu.east(), bvr, fu);
+        }
+        if (fz != Direction.DOWN) {
+            this.neighborChanged(fu.below(), bvr, fu);
+        }
+        if (fz != Direction.UP) {
+            this.neighborChanged(fu.above(), bvr, fu);
+        }
+        if (fz != Direction.NORTH) {
+            this.neighborChanged(fu.north(), bvr, fu);
+        }
+        if (fz != Direction.SOUTH) {
+            this.neighborChanged(fu.south(), bvr, fu);
         }
     }
     
-    public void setBlocksDirty(final BlockPos fk, final BlockState byj2, final BlockState byj3) {
-    }
-    
-    public void updateNeighborsAt(final BlockPos fk, final Block bph) {
-        this.neighborChanged(fk.west(), bph, fk);
-        this.neighborChanged(fk.east(), bph, fk);
-        this.neighborChanged(fk.below(), bph, fk);
-        this.neighborChanged(fk.above(), bph, fk);
-        this.neighborChanged(fk.north(), bph, fk);
-        this.neighborChanged(fk.south(), bph, fk);
-    }
-    
-    public void updateNeighborsAtExceptFromFacing(final BlockPos fk, final Block bph, final Direction fp) {
-        if (fp != Direction.WEST) {
-            this.neighborChanged(fk.west(), bph, fk);
-        }
-        if (fp != Direction.EAST) {
-            this.neighborChanged(fk.east(), bph, fk);
-        }
-        if (fp != Direction.DOWN) {
-            this.neighborChanged(fk.below(), bph, fk);
-        }
-        if (fp != Direction.UP) {
-            this.neighborChanged(fk.above(), bph, fk);
-        }
-        if (fp != Direction.NORTH) {
-            this.neighborChanged(fk.north(), bph, fk);
-        }
-        if (fp != Direction.SOUTH) {
-            this.neighborChanged(fk.south(), bph, fk);
-        }
-    }
-    
-    public void neighborChanged(final BlockPos fk1, final Block bph, final BlockPos fk3) {
+    public void neighborChanged(final BlockPos fu1, final Block bvr, final BlockPos fu3) {
         if (this.isClientSide) {
             return;
         }
-        final BlockState byj5 = this.getBlockState(fk1);
+        final BlockState cfj5 = this.getBlockState(fu1);
         try {
-            byj5.neighborChanged(this, fk1, bph, fk3, false);
+            cfj5.neighborChanged(this, fu1, bvr, fu3, false);
         }
         catch (Throwable throwable6) {
-            final CrashReport h7 = CrashReport.forThrowable(throwable6, "Exception while updating neighbours");
-            final CrashReportCategory i8 = h7.addCategory("Block being updated");
-            i8.setDetail("Source block type", () -> {
+            final CrashReport j7 = CrashReport.forThrowable(throwable6, "Exception while updating neighbours");
+            final CrashReportCategory k8 = j7.addCategory("Block being updated");
+            k8.setDetail("Source block type", () -> {
                 try {
-                    return String.format("ID #%s (%s // %s)", Registry.BLOCK.getKey(bph), bph.getDescriptionId(), bph.getClass().getCanonicalName());
+                    return String.format("ID #%s (%s // %s)", Registry.BLOCK.getKey(bvr), bvr.getDescriptionId(), bvr.getClass().getCanonicalName());
                 }
                 catch (Throwable throwable7) {
-                    return "ID #" + Registry.BLOCK.getKey(bph);
+                    return "ID #" + Registry.BLOCK.getKey(bvr);
                 }
             });
-            CrashReportCategory.populateBlockDetails(i8, fk1, byj5);
-            throw new ReportedException(h7);
+            CrashReportCategory.populateBlockDetails(k8, fu1, cfj5);
+            throw new ReportedException(j7);
         }
     }
     
@@ -313,54 +377,54 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     
     @Override
-    public BlockState getBlockState(final BlockPos fk) {
-        if (isOutsideBuildHeight(fk)) {
+    public BlockState getBlockState(final BlockPos fu) {
+        if (isOutsideBuildHeight(fu)) {
             return Blocks.VOID_AIR.defaultBlockState();
         }
-        final LevelChunk cal3 = this.getChunk(fk.getX() >> 4, fk.getZ() >> 4);
-        return cal3.getBlockState(fk);
+        final LevelChunk chj3 = this.getChunk(fu.getX() >> 4, fu.getZ() >> 4);
+        return chj3.getBlockState(fu);
     }
     
     @Override
-    public FluidState getFluidState(final BlockPos fk) {
-        if (isOutsideBuildHeight(fk)) {
+    public FluidState getFluidState(final BlockPos fu) {
+        if (isOutsideBuildHeight(fu)) {
             return Fluids.EMPTY.defaultFluidState();
         }
-        final LevelChunk cal3 = this.getChunkAt(fk);
-        return cal3.getFluidState(fk);
+        final LevelChunk chj3 = this.getChunkAt(fu);
+        return chj3.getFluidState(fu);
     }
     
     public boolean isDay() {
-        return this.dimension.getType() == DimensionType.OVERWORLD && this.skyDarken < 4;
+        return !this.dimensionType().hasFixedTime() && this.skyDarken < 4;
     }
     
     public boolean isNight() {
-        return this.dimension.getType() == DimensionType.OVERWORLD && !this.isDay();
+        return !this.dimensionType().hasFixedTime() && !this.isDay();
     }
     
     @Override
-    public void playSound(@Nullable final Player ayj, final BlockPos fk, final SoundEvent aah, final SoundSource aaj, final float float5, final float float6) {
-        this.playSound(ayj, fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5, aah, aaj, float5, float6);
+    public void playSound(@Nullable final Player bec, final BlockPos fu, final SoundEvent ack, final SoundSource acm, final float float5, final float float6) {
+        this.playSound(bec, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, ack, acm, float5, float6);
     }
     
-    public abstract void playSound(@Nullable final Player ayj, final double double2, final double double3, final double double4, final SoundEvent aah, final SoundSource aaj, final float float7, final float float8);
+    public abstract void playSound(@Nullable final Player bec, final double double2, final double double3, final double double4, final SoundEvent ack, final SoundSource acm, final float float7, final float float8);
     
-    public abstract void playSound(@Nullable final Player ayj, final Entity akq, final SoundEvent aah, final SoundSource aaj, final float float5, final float float6);
+    public abstract void playSound(@Nullable final Player bec, final Entity aom, final SoundEvent ack, final SoundSource acm, final float float5, final float float6);
     
-    public void playLocalSound(final double double1, final double double2, final double double3, final SoundEvent aah, final SoundSource aaj, final float float6, final float float7, final boolean boolean8) {
+    public void playLocalSound(final double double1, final double double2, final double double3, final SoundEvent ack, final SoundSource acm, final float float6, final float float7, final boolean boolean8) {
     }
     
     @Override
-    public void addParticle(final ParticleOptions gt, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+    public void addParticle(final ParticleOptions hf, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
     }
     
-    public void addParticle(final ParticleOptions gt, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+    public void addParticle(final ParticleOptions hf, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
     }
     
-    public void addAlwaysVisibleParticle(final ParticleOptions gt, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
+    public void addAlwaysVisibleParticle(final ParticleOptions hf, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7) {
     }
     
-    public void addAlwaysVisibleParticle(final ParticleOptions gt, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
+    public void addAlwaysVisibleParticle(final ParticleOptions hf, final boolean boolean2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8) {
     }
     
     public float getSunAngle(final float float1) {
@@ -368,18 +432,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         return float2 * 6.2831855f;
     }
     
-    public boolean addBlockEntity(final BlockEntity bwl) {
+    public boolean addBlockEntity(final BlockEntity cdl) {
         if (this.updatingBlockEntities) {
-            Level.LOGGER.error("Adding block entity while ticking: {} @ {}", new Supplier[] { () -> Registry.BLOCK_ENTITY_TYPE.getKey(bwl.getType()), bwl::getBlockPos });
+            Level.LOGGER.error("Adding block entity while ticking: {} @ {}", new org.apache.logging.log4j.util.Supplier[] { () -> Registry.BLOCK_ENTITY_TYPE.getKey(cdl.getType()), cdl::getBlockPos });
         }
-        final boolean boolean3 = this.blockEntityList.add(bwl);
-        if (boolean3 && bwl instanceof TickableBlockEntity) {
-            this.tickableBlockEntities.add(bwl);
+        final boolean boolean3 = this.blockEntityList.add(cdl);
+        if (boolean3 && cdl instanceof TickableBlockEntity) {
+            this.tickableBlockEntities.add(cdl);
         }
         if (this.isClientSide) {
-            final BlockPos fk4 = bwl.getBlockPos();
-            final BlockState byj5 = this.getBlockState(fk4);
-            this.sendBlockUpdated(fk4, byj5, byj5, 2);
+            final BlockPos fu4 = cdl.getBlockPos();
+            final BlockState cfj5 = this.getBlockState(fu4);
+            this.sendBlockUpdated(fu4, cfj5, cfj5, 2);
         }
         return boolean3;
     }
@@ -389,15 +453,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
             this.pendingBlockEntities.addAll(collection);
         }
         else {
-            for (final BlockEntity bwl4 : collection) {
-                this.addBlockEntity(bwl4);
+            for (final BlockEntity cdl4 : collection) {
+                this.addBlockEntity(cdl4);
             }
         }
     }
     
     public void tickBlockEntities() {
-        final ProfilerFiller aio2 = this.getProfiler();
-        aio2.push("blockEntities");
+        final ProfilerFiller ami2 = this.getProfiler();
+        ami2.push("blockEntities");
         if (!this.blockEntitiesToUnload.isEmpty()) {
             this.tickableBlockEntities.removeAll(this.blockEntitiesToUnload);
             this.blockEntityList.removeAll(this.blockEntitiesToUnload);
@@ -406,268 +470,177 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         this.updatingBlockEntities = true;
         final Iterator<BlockEntity> iterator3 = this.tickableBlockEntities.iterator();
         while (iterator3.hasNext()) {
-            final BlockEntity bwl4 = iterator3.next();
-            if (!bwl4.isRemoved() && bwl4.hasLevel()) {
-                final BlockPos fk5 = bwl4.getBlockPos();
-                if (this.chunkSource.isTickingChunk(fk5) && this.getWorldBorder().isWithinBounds(fk5)) {
+            final BlockEntity cdl4 = iterator3.next();
+            if (!cdl4.isRemoved() && cdl4.hasLevel()) {
+                final BlockPos fu5 = cdl4.getBlockPos();
+                if (this.getChunkSource().isTickingChunk(fu5) && this.getWorldBorder().isWithinBounds(fu5)) {
                     try {
-                        aio2.push(() -> String.valueOf(BlockEntityType.getKey(bwl4.getType())));
-                        if (bwl4.getType().isValid(this.getBlockState(fk5).getBlock())) {
-                            ((TickableBlockEntity)bwl4).tick();
+                        ami2.push(() -> String.valueOf(BlockEntityType.getKey(cdl4.getType())));
+                        if (cdl4.getType().isValid(this.getBlockState(fu5).getBlock())) {
+                            ((TickableBlockEntity)cdl4).tick();
                         }
                         else {
-                            bwl4.logInvalidState();
+                            cdl4.logInvalidState();
                         }
-                        aio2.pop();
+                        ami2.pop();
                     }
                     catch (Throwable throwable6) {
-                        final CrashReport h7 = CrashReport.forThrowable(throwable6, "Ticking block entity");
-                        final CrashReportCategory i8 = h7.addCategory("Block entity being ticked");
-                        bwl4.fillCrashReportCategory(i8);
-                        throw new ReportedException(h7);
+                        final CrashReport j7 = CrashReport.forThrowable(throwable6, "Ticking block entity");
+                        final CrashReportCategory k8 = j7.addCategory("Block entity being ticked");
+                        cdl4.fillCrashReportCategory(k8);
+                        throw new ReportedException(j7);
                     }
                 }
             }
-            if (bwl4.isRemoved()) {
+            if (cdl4.isRemoved()) {
                 iterator3.remove();
-                this.blockEntityList.remove(bwl4);
-                if (!this.hasChunkAt(bwl4.getBlockPos())) {
+                this.blockEntityList.remove(cdl4);
+                if (!this.hasChunkAt(cdl4.getBlockPos())) {
                     continue;
                 }
-                this.getChunkAt(bwl4.getBlockPos()).removeBlockEntity(bwl4.getBlockPos());
+                this.getChunkAt(cdl4.getBlockPos()).removeBlockEntity(cdl4.getBlockPos());
             }
         }
         this.updatingBlockEntities = false;
-        aio2.popPush("pendingBlockEntities");
+        ami2.popPush("pendingBlockEntities");
         if (!this.pendingBlockEntities.isEmpty()) {
             for (int integer4 = 0; integer4 < this.pendingBlockEntities.size(); ++integer4) {
-                final BlockEntity bwl5 = this.pendingBlockEntities.get(integer4);
-                if (!bwl5.isRemoved()) {
-                    if (!this.blockEntityList.contains(bwl5)) {
-                        this.addBlockEntity(bwl5);
+                final BlockEntity cdl5 = this.pendingBlockEntities.get(integer4);
+                if (!cdl5.isRemoved()) {
+                    if (!this.blockEntityList.contains(cdl5)) {
+                        this.addBlockEntity(cdl5);
                     }
-                    if (this.hasChunkAt(bwl5.getBlockPos())) {
-                        final LevelChunk cal6 = this.getChunkAt(bwl5.getBlockPos());
-                        final BlockState byj7 = cal6.getBlockState(bwl5.getBlockPos());
-                        cal6.setBlockEntity(bwl5.getBlockPos(), bwl5);
-                        this.sendBlockUpdated(bwl5.getBlockPos(), byj7, byj7, 3);
+                    if (this.hasChunkAt(cdl5.getBlockPos())) {
+                        final LevelChunk chj6 = this.getChunkAt(cdl5.getBlockPos());
+                        final BlockState cfj7 = chj6.getBlockState(cdl5.getBlockPos());
+                        chj6.setBlockEntity(cdl5.getBlockPos(), cdl5);
+                        this.sendBlockUpdated(cdl5.getBlockPos(), cfj7, cfj7, 3);
                     }
                 }
             }
             this.pendingBlockEntities.clear();
         }
-        aio2.pop();
+        ami2.pop();
     }
     
-    public void guardEntityTick(final Consumer<Entity> consumer, final Entity akq) {
+    public void guardEntityTick(final Consumer<Entity> consumer, final Entity aom) {
         try {
-            consumer.accept(akq);
+            consumer.accept(aom);
         }
         catch (Throwable throwable4) {
-            final CrashReport h5 = CrashReport.forThrowable(throwable4, "Ticking entity");
-            final CrashReportCategory i6 = h5.addCategory("Entity being ticked");
-            akq.fillCrashReportCategory(i6);
-            throw new ReportedException(h5);
+            final CrashReport j5 = CrashReport.forThrowable(throwable4, "Ticking entity");
+            final CrashReportCategory k6 = j5.addCategory("Entity being ticked");
+            aom.fillCrashReportCategory(k6);
+            throw new ReportedException(j5);
         }
     }
     
-    public boolean containsAnyBlocks(final AABB cvf) {
-        final int integer3 = Mth.floor(cvf.minX);
-        final int integer4 = Mth.ceil(cvf.maxX);
-        final int integer5 = Mth.floor(cvf.minY);
-        final int integer6 = Mth.ceil(cvf.maxY);
-        final int integer7 = Mth.floor(cvf.minZ);
-        final int integer8 = Mth.ceil(cvf.maxZ);
-        try (final BlockPos.PooledMutableBlockPos b9 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (int integer9 = integer3; integer9 < integer4; ++integer9) {
-                for (int integer10 = integer5; integer10 < integer6; ++integer10) {
-                    for (int integer11 = integer7; integer11 < integer8; ++integer11) {
-                        final BlockState byj14 = this.getBlockState(b9.set(integer9, integer10, integer11));
-                        if (!byj14.isAir()) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-        return false;
+    public Explosion explode(@Nullable final Entity aom, final double double2, final double double3, final double double4, final float float5, final Explosion.BlockInteraction a) {
+        return this.explode(aom, null, null, double2, double3, double4, float5, false, a);
     }
     
-    public boolean containsFireBlock(final AABB cvf) {
-        final int integer3 = Mth.floor(cvf.minX);
-        final int integer4 = Mth.ceil(cvf.maxX);
-        final int integer5 = Mth.floor(cvf.minY);
-        final int integer6 = Mth.ceil(cvf.maxY);
-        final int integer7 = Mth.floor(cvf.minZ);
-        final int integer8 = Mth.ceil(cvf.maxZ);
-        if (this.hasChunksAt(integer3, integer5, integer7, integer4, integer6, integer8)) {
-            try (final BlockPos.PooledMutableBlockPos b9 = BlockPos.PooledMutableBlockPos.acquire()) {
-                for (int integer9 = integer3; integer9 < integer4; ++integer9) {
-                    for (int integer10 = integer5; integer10 < integer6; ++integer10) {
-                        for (int integer11 = integer7; integer11 < integer8; ++integer11) {
-                            final Block bph14 = this.getBlockState(b9.set(integer9, integer10, integer11)).getBlock();
-                            if (bph14 == Blocks.FIRE || bph14 == Blocks.LAVA) {
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
+    public Explosion explode(@Nullable final Entity aom, final double double2, final double double3, final double double4, final float float5, final boolean boolean6, final Explosion.BlockInteraction a) {
+        return this.explode(aom, null, null, double2, double3, double4, float5, boolean6, a);
     }
     
-    @Nullable
-    public BlockState containsBlock(final AABB cvf, final Block bph) {
-        final int integer4 = Mth.floor(cvf.minX);
-        final int integer5 = Mth.ceil(cvf.maxX);
-        final int integer6 = Mth.floor(cvf.minY);
-        final int integer7 = Mth.ceil(cvf.maxY);
-        final int integer8 = Mth.floor(cvf.minZ);
-        final int integer9 = Mth.ceil(cvf.maxZ);
-        if (this.hasChunksAt(integer4, integer6, integer8, integer5, integer7, integer9)) {
-            try (final BlockPos.PooledMutableBlockPos b10 = BlockPos.PooledMutableBlockPos.acquire()) {
-                for (int integer10 = integer4; integer10 < integer5; ++integer10) {
-                    for (int integer11 = integer6; integer11 < integer7; ++integer11) {
-                        for (int integer12 = integer8; integer12 < integer9; ++integer12) {
-                            final BlockState byj15 = this.getBlockState(b10.set(integer10, integer11, integer12));
-                            if (byj15.getBlock() == bph) {
-                                return byj15;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-    
-    public boolean containsMaterial(final AABB cvf, final Material coo) {
-        final int integer4 = Mth.floor(cvf.minX);
-        final int integer5 = Mth.ceil(cvf.maxX);
-        final int integer6 = Mth.floor(cvf.minY);
-        final int integer7 = Mth.ceil(cvf.maxY);
-        final int integer8 = Mth.floor(cvf.minZ);
-        final int integer9 = Mth.ceil(cvf.maxZ);
-        final BlockMaterialPredicate byr10 = BlockMaterialPredicate.forMaterial(coo);
-        return BlockPos.betweenClosedStream(integer4, integer6, integer8, integer5 - 1, integer7 - 1, integer9 - 1).anyMatch(fk -> byr10.test(this.getBlockState(fk)));
-    }
-    
-    public Explosion explode(@Nullable final Entity akq, final double double2, final double double3, final double double4, final float float5, final Explosion.BlockInteraction a) {
-        return this.explode(akq, null, double2, double3, double4, float5, false, a);
-    }
-    
-    public Explosion explode(@Nullable final Entity akq, final double double2, final double double3, final double double4, final float float5, final boolean boolean6, final Explosion.BlockInteraction a) {
-        return this.explode(akq, null, double2, double3, double4, float5, boolean6, a);
-    }
-    
-    public Explosion explode(@Nullable final Entity akq, @Nullable final DamageSource ajz, final double double3, final double double4, final double double5, final float float6, final boolean boolean7, final Explosion.BlockInteraction a) {
-        final Explosion bjp13 = new Explosion(this, akq, double3, double4, double5, float6, boolean7, a);
-        if (ajz != null) {
-            bjp13.setDamageSource(ajz);
-        }
-        bjp13.explode();
-        bjp13.finalizeExplosion(true);
-        return bjp13;
-    }
-    
-    public boolean extinguishFire(@Nullable final Player ayj, BlockPos fk, final Direction fp) {
-        fk = fk.relative(fp);
-        if (this.getBlockState(fk).getBlock() == Blocks.FIRE) {
-            this.levelEvent(ayj, 1009, fk, 0);
-            this.removeBlock(fk, false);
-            return true;
-        }
-        return false;
+    public Explosion explode(@Nullable final Entity aom, @Nullable final DamageSource anw, @Nullable final ExplosionDamageCalculator bpu, final double double4, final double double5, final double double6, final float float7, final boolean boolean8, final Explosion.BlockInteraction a) {
+        final Explosion bpt14 = new Explosion(this, aom, anw, bpu, double4, double5, double6, float7, boolean8, a);
+        bpt14.explode();
+        bpt14.finalizeExplosion(true);
+        return bpt14;
     }
     
     public String gatherChunkSourceStats() {
-        return this.chunkSource.gatherStats();
+        return this.getChunkSource().gatherStats();
     }
     
     @Nullable
     @Override
-    public BlockEntity getBlockEntity(final BlockPos fk) {
-        if (isOutsideBuildHeight(fk)) {
+    public BlockEntity getBlockEntity(final BlockPos fu) {
+        if (isOutsideBuildHeight(fu)) {
             return null;
         }
         if (!this.isClientSide && Thread.currentThread() != this.thread) {
             return null;
         }
-        BlockEntity bwl3 = null;
+        BlockEntity cdl3 = null;
         if (this.updatingBlockEntities) {
-            bwl3 = this.getPendingBlockEntityAt(fk);
+            cdl3 = this.getPendingBlockEntityAt(fu);
         }
-        if (bwl3 == null) {
-            bwl3 = this.getChunkAt(fk).getBlockEntity(fk, LevelChunk.EntityCreationType.IMMEDIATE);
+        if (cdl3 == null) {
+            cdl3 = this.getChunkAt(fu).getBlockEntity(fu, LevelChunk.EntityCreationType.IMMEDIATE);
         }
-        if (bwl3 == null) {
-            bwl3 = this.getPendingBlockEntityAt(fk);
+        if (cdl3 == null) {
+            cdl3 = this.getPendingBlockEntityAt(fu);
         }
-        return bwl3;
+        return cdl3;
     }
     
     @Nullable
-    private BlockEntity getPendingBlockEntityAt(final BlockPos fk) {
+    private BlockEntity getPendingBlockEntityAt(final BlockPos fu) {
         for (int integer3 = 0; integer3 < this.pendingBlockEntities.size(); ++integer3) {
-            final BlockEntity bwl4 = this.pendingBlockEntities.get(integer3);
-            if (!bwl4.isRemoved() && bwl4.getBlockPos().equals(fk)) {
-                return bwl4;
+            final BlockEntity cdl4 = this.pendingBlockEntities.get(integer3);
+            if (!cdl4.isRemoved() && cdl4.getBlockPos().equals(fu)) {
+                return cdl4;
             }
         }
         return null;
     }
     
-    public void setBlockEntity(final BlockPos fk, @Nullable final BlockEntity bwl) {
-        if (isOutsideBuildHeight(fk)) {
+    public void setBlockEntity(final BlockPos fu, @Nullable final BlockEntity cdl) {
+        if (isOutsideBuildHeight(fu)) {
             return;
         }
-        if (bwl != null && !bwl.isRemoved()) {
+        if (cdl != null && !cdl.isRemoved()) {
             if (this.updatingBlockEntities) {
-                bwl.setLevelAndPosition(this, fk);
+                cdl.setLevelAndPosition(this, fu);
                 final Iterator<BlockEntity> iterator4 = this.pendingBlockEntities.iterator();
                 while (iterator4.hasNext()) {
-                    final BlockEntity bwl2 = iterator4.next();
-                    if (bwl2.getBlockPos().equals(fk)) {
-                        bwl2.setRemoved();
+                    final BlockEntity cdl2 = iterator4.next();
+                    if (cdl2.getBlockPos().equals(fu)) {
+                        cdl2.setRemoved();
                         iterator4.remove();
                     }
                 }
-                this.pendingBlockEntities.add(bwl);
+                this.pendingBlockEntities.add(cdl);
             }
             else {
-                this.getChunkAt(fk).setBlockEntity(fk, bwl);
-                this.addBlockEntity(bwl);
+                this.getChunkAt(fu).setBlockEntity(fu, cdl);
+                this.addBlockEntity(cdl);
             }
         }
     }
     
-    public void removeBlockEntity(final BlockPos fk) {
-        final BlockEntity bwl3 = this.getBlockEntity(fk);
-        if (bwl3 != null && this.updatingBlockEntities) {
-            bwl3.setRemoved();
-            this.pendingBlockEntities.remove(bwl3);
+    public void removeBlockEntity(final BlockPos fu) {
+        final BlockEntity cdl3 = this.getBlockEntity(fu);
+        if (cdl3 != null && this.updatingBlockEntities) {
+            cdl3.setRemoved();
+            this.pendingBlockEntities.remove(cdl3);
         }
         else {
-            if (bwl3 != null) {
-                this.pendingBlockEntities.remove(bwl3);
-                this.blockEntityList.remove(bwl3);
-                this.tickableBlockEntities.remove(bwl3);
+            if (cdl3 != null) {
+                this.pendingBlockEntities.remove(cdl3);
+                this.blockEntityList.remove(cdl3);
+                this.tickableBlockEntities.remove(cdl3);
             }
-            this.getChunkAt(fk).removeBlockEntity(fk);
+            this.getChunkAt(fu).removeBlockEntity(fu);
         }
     }
     
-    public boolean isLoaded(final BlockPos fk) {
-        return !isOutsideBuildHeight(fk) && this.chunkSource.hasChunk(fk.getX() >> 4, fk.getZ() >> 4);
+    public boolean isLoaded(final BlockPos fu) {
+        return !isOutsideBuildHeight(fu) && this.getChunkSource().hasChunk(fu.getX() >> 4, fu.getZ() >> 4);
     }
     
-    public boolean loadedAndEntityCanStandOn(final BlockPos fk, final Entity akq) {
-        if (isOutsideBuildHeight(fk)) {
+    public boolean loadedAndEntityCanStandOnFace(final BlockPos fu, final Entity aom, final Direction fz) {
+        if (isOutsideBuildHeight(fu)) {
             return false;
         }
-        final ChunkAccess bzy4 = this.getChunk(fk.getX() >> 4, fk.getZ() >> 4, ChunkStatus.FULL, false);
-        return bzy4 != null && bzy4.getBlockState(fk).entityCanStandOn(this, fk, akq);
+        final ChunkAccess cgy5 = this.getChunk(fu.getX() >> 4, fu.getZ() >> 4, ChunkStatus.FULL, false);
+        return cgy5 != null && cgy5.getBlockState(fu).entityCanStandOnFace(this, fu, aom, fz);
+    }
+    
+    public boolean loadedAndEntityCanStandOn(final BlockPos fu, final Entity aom) {
+        return this.loadedAndEntityCanStandOnFace(fu, aom, Direction.UP);
     }
     
     public void updateSkyBrightness() {
@@ -692,7 +665,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     
     @Override
     public void close() throws IOException {
-        this.chunkSource.close();
+        this.getChunkSource().close();
     }
     
     @Nullable
@@ -702,36 +675,37 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     
     @Override
-    public List<Entity> getEntities(@Nullable final Entity akq, final AABB cvf, @Nullable final Predicate<? super Entity> predicate) {
+    public List<Entity> getEntities(@Nullable final Entity aom, final AABB deg, @Nullable final Predicate<? super Entity> predicate) {
         this.getProfiler().incrementCounter("getEntities");
         final List<Entity> list5 = Lists.newArrayList();
-        final int integer6 = Mth.floor((cvf.minX - 2.0) / 16.0);
-        final int integer7 = Mth.floor((cvf.maxX + 2.0) / 16.0);
-        final int integer8 = Mth.floor((cvf.minZ - 2.0) / 16.0);
-        final int integer9 = Mth.floor((cvf.maxZ + 2.0) / 16.0);
+        final int integer6 = Mth.floor((deg.minX - 2.0) / 16.0);
+        final int integer7 = Mth.floor((deg.maxX + 2.0) / 16.0);
+        final int integer8 = Mth.floor((deg.minZ - 2.0) / 16.0);
+        final int integer9 = Mth.floor((deg.maxZ + 2.0) / 16.0);
+        final ChunkSource chb10 = this.getChunkSource();
         for (int integer10 = integer6; integer10 <= integer7; ++integer10) {
             for (int integer11 = integer8; integer11 <= integer9; ++integer11) {
-                final LevelChunk cal12 = this.getChunkSource().getChunk(integer10, integer11, false);
-                if (cal12 != null) {
-                    cal12.getEntities(akq, cvf, list5, predicate);
+                final LevelChunk chj13 = chb10.getChunk(integer10, integer11, false);
+                if (chj13 != null) {
+                    chj13.getEntities(aom, deg, list5, predicate);
                 }
             }
         }
         return list5;
     }
     
-    public <T extends Entity> List<T> getEntities(@Nullable final EntityType<T> aku, final AABB cvf, final Predicate<? super T> predicate) {
+    public <T extends Entity> List<T> getEntities(@Nullable final EntityType<T> aoq, final AABB deg, final Predicate<? super T> predicate) {
         this.getProfiler().incrementCounter("getEntities");
-        final int integer5 = Mth.floor((cvf.minX - 2.0) / 16.0);
-        final int integer6 = Mth.ceil((cvf.maxX + 2.0) / 16.0);
-        final int integer7 = Mth.floor((cvf.minZ - 2.0) / 16.0);
-        final int integer8 = Mth.ceil((cvf.maxZ + 2.0) / 16.0);
+        final int integer5 = Mth.floor((deg.minX - 2.0) / 16.0);
+        final int integer6 = Mth.ceil((deg.maxX + 2.0) / 16.0);
+        final int integer7 = Mth.floor((deg.minZ - 2.0) / 16.0);
+        final int integer8 = Mth.ceil((deg.maxZ + 2.0) / 16.0);
         final List<T> list9 = Lists.newArrayList();
         for (int integer9 = integer5; integer9 < integer6; ++integer9) {
             for (int integer10 = integer7; integer10 < integer8; ++integer10) {
-                final LevelChunk cal12 = this.getChunkSource().getChunk(integer9, integer10, false);
-                if (cal12 != null) {
-                    cal12.<Entity>getEntities(aku, cvf, list9, predicate);
+                final LevelChunk chj12 = this.getChunkSource().getChunk(integer9, integer10, false);
+                if (chj12 != null) {
+                    chj12.<Entity>getEntities(aoq, deg, list9, predicate);
                 }
             }
         }
@@ -739,19 +713,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     
     @Override
-    public <T extends Entity> List<T> getEntitiesOfClass(final Class<? extends T> class1, final AABB cvf, @Nullable final Predicate<? super T> predicate) {
+    public <T extends Entity> List<T> getEntitiesOfClass(final Class<? extends T> class1, final AABB deg, @Nullable final Predicate<? super T> predicate) {
         this.getProfiler().incrementCounter("getEntities");
-        final int integer5 = Mth.floor((cvf.minX - 2.0) / 16.0);
-        final int integer6 = Mth.ceil((cvf.maxX + 2.0) / 16.0);
-        final int integer7 = Mth.floor((cvf.minZ - 2.0) / 16.0);
-        final int integer8 = Mth.ceil((cvf.maxZ + 2.0) / 16.0);
+        final int integer5 = Mth.floor((deg.minX - 2.0) / 16.0);
+        final int integer6 = Mth.ceil((deg.maxX + 2.0) / 16.0);
+        final int integer7 = Mth.floor((deg.minZ - 2.0) / 16.0);
+        final int integer8 = Mth.ceil((deg.maxZ + 2.0) / 16.0);
         final List<T> list9 = Lists.newArrayList();
-        final ChunkSource cad10 = this.getChunkSource();
+        final ChunkSource chb10 = this.getChunkSource();
         for (int integer9 = integer5; integer9 < integer6; ++integer9) {
             for (int integer10 = integer7; integer10 < integer8; ++integer10) {
-                final LevelChunk cal13 = cad10.getChunk(integer9, integer10, false);
-                if (cal13 != null) {
-                    cal13.<T>getEntitiesOfClass(class1, cvf, list9, predicate);
+                final LevelChunk chj13 = chb10.getChunk(integer9, integer10, false);
+                if (chj13 != null) {
+                    chj13.<T>getEntitiesOfClass(class1, deg, list9, predicate);
                 }
             }
         }
@@ -759,19 +733,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     
     @Override
-    public <T extends Entity> List<T> getLoadedEntitiesOfClass(final Class<? extends T> class1, final AABB cvf, @Nullable final Predicate<? super T> predicate) {
+    public <T extends Entity> List<T> getLoadedEntitiesOfClass(final Class<? extends T> class1, final AABB deg, @Nullable final Predicate<? super T> predicate) {
         this.getProfiler().incrementCounter("getLoadedEntities");
-        final int integer5 = Mth.floor((cvf.minX - 2.0) / 16.0);
-        final int integer6 = Mth.ceil((cvf.maxX + 2.0) / 16.0);
-        final int integer7 = Mth.floor((cvf.minZ - 2.0) / 16.0);
-        final int integer8 = Mth.ceil((cvf.maxZ + 2.0) / 16.0);
+        final int integer5 = Mth.floor((deg.minX - 2.0) / 16.0);
+        final int integer6 = Mth.ceil((deg.maxX + 2.0) / 16.0);
+        final int integer7 = Mth.floor((deg.minZ - 2.0) / 16.0);
+        final int integer8 = Mth.ceil((deg.maxZ + 2.0) / 16.0);
         final List<T> list9 = Lists.newArrayList();
-        final ChunkSource cad10 = this.getChunkSource();
+        final ChunkSource chb10 = this.getChunkSource();
         for (int integer9 = integer5; integer9 < integer6; ++integer9) {
             for (int integer10 = integer7; integer10 < integer8; ++integer10) {
-                final LevelChunk cal13 = cad10.getChunkNow(integer9, integer10);
-                if (cal13 != null) {
-                    cal13.<T>getEntitiesOfClass(class1, cvf, list9, predicate);
+                final LevelChunk chj13 = chb10.getChunkNow(integer9, integer10);
+                if (chj13 != null) {
+                    chj13.<T>getEntitiesOfClass(class1, deg, list9, predicate);
                 }
             }
         }
@@ -781,9 +755,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     @Nullable
     public abstract Entity getEntity(final int integer);
     
-    public void blockEntityChanged(final BlockPos fk, final BlockEntity bwl) {
-        if (this.hasChunkAt(fk)) {
-            this.getChunkAt(fk).markUnsaved();
+    public void blockEntityChanged(final BlockPos fu, final BlockEntity cdl) {
+        if (this.hasChunkAt(fu)) {
+            this.getChunkAt(fu).markUnsaved();
         }
     }
     
@@ -797,59 +771,56 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         return this;
     }
     
-    public LevelType getGeneratorType() {
-        return this.levelData.getGeneratorType();
-    }
-    
-    public int getDirectSignalTo(final BlockPos fk) {
+    public int getDirectSignalTo(final BlockPos fu) {
         int integer3 = 0;
-        integer3 = Math.max(integer3, this.getDirectSignal(fk.below(), Direction.DOWN));
+        integer3 = Math.max(integer3, this.getDirectSignal(fu.below(), Direction.DOWN));
         if (integer3 >= 15) {
             return integer3;
         }
-        integer3 = Math.max(integer3, this.getDirectSignal(fk.above(), Direction.UP));
+        integer3 = Math.max(integer3, this.getDirectSignal(fu.above(), Direction.UP));
         if (integer3 >= 15) {
             return integer3;
         }
-        integer3 = Math.max(integer3, this.getDirectSignal(fk.north(), Direction.NORTH));
+        integer3 = Math.max(integer3, this.getDirectSignal(fu.north(), Direction.NORTH));
         if (integer3 >= 15) {
             return integer3;
         }
-        integer3 = Math.max(integer3, this.getDirectSignal(fk.south(), Direction.SOUTH));
+        integer3 = Math.max(integer3, this.getDirectSignal(fu.south(), Direction.SOUTH));
         if (integer3 >= 15) {
             return integer3;
         }
-        integer3 = Math.max(integer3, this.getDirectSignal(fk.west(), Direction.WEST));
+        integer3 = Math.max(integer3, this.getDirectSignal(fu.west(), Direction.WEST));
         if (integer3 >= 15) {
             return integer3;
         }
-        integer3 = Math.max(integer3, this.getDirectSignal(fk.east(), Direction.EAST));
+        integer3 = Math.max(integer3, this.getDirectSignal(fu.east(), Direction.EAST));
         if (integer3 >= 15) {
             return integer3;
         }
         return integer3;
     }
     
-    public boolean hasSignal(final BlockPos fk, final Direction fp) {
-        return this.getSignal(fk, fp) > 0;
+    public boolean hasSignal(final BlockPos fu, final Direction fz) {
+        return this.getSignal(fu, fz) > 0;
     }
     
-    public int getSignal(final BlockPos fk, final Direction fp) {
-        final BlockState byj4 = this.getBlockState(fk);
-        if (byj4.isRedstoneConductor(this, fk)) {
-            return this.getDirectSignalTo(fk);
+    public int getSignal(final BlockPos fu, final Direction fz) {
+        final BlockState cfj4 = this.getBlockState(fu);
+        final int integer5 = cfj4.getSignal(this, fu, fz);
+        if (cfj4.isRedstoneConductor(this, fu)) {
+            return Math.max(integer5, this.getDirectSignalTo(fu));
         }
-        return byj4.getSignal(this, fk, fp);
+        return integer5;
     }
     
-    public boolean hasNeighborSignal(final BlockPos fk) {
-        return this.getSignal(fk.below(), Direction.DOWN) > 0 || this.getSignal(fk.above(), Direction.UP) > 0 || this.getSignal(fk.north(), Direction.NORTH) > 0 || this.getSignal(fk.south(), Direction.SOUTH) > 0 || this.getSignal(fk.west(), Direction.WEST) > 0 || this.getSignal(fk.east(), Direction.EAST) > 0;
+    public boolean hasNeighborSignal(final BlockPos fu) {
+        return this.getSignal(fu.below(), Direction.DOWN) > 0 || this.getSignal(fu.above(), Direction.UP) > 0 || this.getSignal(fu.north(), Direction.NORTH) > 0 || this.getSignal(fu.south(), Direction.SOUTH) > 0 || this.getSignal(fu.west(), Direction.WEST) > 0 || this.getSignal(fu.east(), Direction.EAST) > 0;
     }
     
-    public int getBestNeighborSignal(final BlockPos fk) {
+    public int getBestNeighborSignal(final BlockPos fu) {
         int integer3 = 0;
-        for (final Direction fp7 : Level.DIRECTIONS) {
-            final int integer4 = this.getSignal(fk.relative(fp7), fp7);
+        for (final Direction fz7 : Level.DIRECTIONS) {
+            final int integer4 = this.getSignal(fu.relative(fz7), fz7);
             if (integer4 >= 15) {
                 return 15;
             }
@@ -863,15 +834,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     public void disconnect() {
     }
     
-    public void setGameTime(final long long1) {
-        this.levelData.setGameTime(long1);
-    }
-    
-    @Override
-    public long getSeed() {
-        return this.levelData.getSeed();
-    }
-    
     public long getGameTime() {
         return this.levelData.getGameTime();
     }
@@ -880,44 +842,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         return this.levelData.getDayTime();
     }
     
-    public void setDayTime(final long long1) {
-        this.levelData.setDayTime(long1);
-    }
-    
-    protected void tickTime() {
-        this.setGameTime(this.levelData.getGameTime() + 1L);
-        if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
-            this.setDayTime(this.levelData.getDayTime() + 1L);
-        }
-    }
-    
-    @Override
-    public BlockPos getSharedSpawnPos() {
-        BlockPos fk2 = new BlockPos(this.levelData.getXSpawn(), this.levelData.getYSpawn(), this.levelData.getZSpawn());
-        if (!this.getWorldBorder().isWithinBounds(fk2)) {
-            fk2 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, new BlockPos(this.getWorldBorder().getCenterX(), 0.0, this.getWorldBorder().getCenterZ()));
-        }
-        return fk2;
-    }
-    
-    public void setSpawnPos(final BlockPos fk) {
-        this.levelData.setSpawn(fk);
-    }
-    
-    public boolean mayInteract(final Player ayj, final BlockPos fk) {
+    public boolean mayInteract(final Player bec, final BlockPos fu) {
         return true;
     }
     
-    public void broadcastEntityEvent(final Entity akq, final byte byte2) {
+    public void broadcastEntityEvent(final Entity aom, final byte byte2) {
     }
     
-    @Override
-    public ChunkSource getChunkSource() {
-        return this.chunkSource;
-    }
-    
-    public void blockEvent(final BlockPos fk, final Block bph, final int integer3, final int integer4) {
-        this.getBlockState(fk).triggerEvent(this, fk, integer3, integer4);
+    public void blockEvent(final BlockPos fu, final Block bvr, final int integer3, final int integer4) {
+        this.getBlockState(fu).triggerEvent(this, fu, integer3, integer4);
     }
     
     @Override
@@ -948,87 +881,93 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     
     public boolean isThundering() {
-        return this.dimension.isHasSkyLight() && !this.dimension.isHasCeiling() && this.getThunderLevel(1.0f) > 0.9;
+        return this.dimensionType().hasSkyLight() && !this.dimensionType().hasCeiling() && this.getThunderLevel(1.0f) > 0.9;
     }
     
     public boolean isRaining() {
         return this.getRainLevel(1.0f) > 0.2;
     }
     
-    public boolean isRainingAt(final BlockPos fk) {
-        return this.isRaining() && this.canSeeSky(fk) && this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, fk).getY() <= fk.getY() && this.getBiome(fk).getPrecipitation() == Biome.Precipitation.RAIN;
+    public boolean isRainingAt(final BlockPos fu) {
+        if (!this.isRaining()) {
+            return false;
+        }
+        if (!this.canSeeSky(fu)) {
+            return false;
+        }
+        if (this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, fu).getY() > fu.getY()) {
+            return false;
+        }
+        final Biome bre3 = this.getBiome(fu);
+        return bre3.getPrecipitation() == Biome.Precipitation.RAIN && bre3.getTemperature(fu) >= 0.15f;
     }
     
-    public boolean isHumidAt(final BlockPos fk) {
-        final Biome bkt3 = this.getBiome(fk);
-        return bkt3.isHumid();
+    public boolean isHumidAt(final BlockPos fu) {
+        final Biome bre3 = this.getBiome(fu);
+        return bre3.isHumid();
     }
     
     @Nullable
     public abstract MapItemSavedData getMapData(final String string);
     
-    public abstract void setMapData(final MapItemSavedData crg);
+    public abstract void setMapData(final MapItemSavedData czv);
     
     public abstract int getFreeMapId();
     
-    public void globalLevelEvent(final int integer1, final BlockPos fk, final int integer3) {
+    public void globalLevelEvent(final int integer1, final BlockPos fu, final int integer3) {
     }
     
-    public int getHeight() {
-        return this.dimension.isHasCeiling() ? 128 : 256;
-    }
-    
-    public CrashReportCategory fillReportDetails(final CrashReport h) {
-        final CrashReportCategory i3 = h.addCategory("Affected level", 1);
-        i3.setDetail("All players", () -> this.players().size() + " total; " + this.players());
-        i3.setDetail("Chunk stats", this.chunkSource::gatherStats);
-        i3.setDetail("Level dimension", () -> this.dimension.getType().toString());
+    public CrashReportCategory fillReportDetails(final CrashReport j) {
+        final CrashReportCategory k3 = j.addCategory("Affected level", 1);
+        k3.setDetail("All players", () -> this.players().size() + " total; " + this.players());
+        k3.setDetail("Chunk stats", this.getChunkSource()::gatherStats);
+        k3.setDetail("Level dimension", () -> this.dimension().location().toString());
         try {
-            this.levelData.fillCrashReportCategory(i3);
+            this.levelData.fillCrashReportCategory(k3);
         }
         catch (Throwable throwable4) {
-            i3.setDetailError("Level Data Unobtainable", throwable4);
+            k3.setDetailError("Level Data Unobtainable", throwable4);
         }
-        return i3;
+        return k3;
     }
     
-    public abstract void destroyBlockProgress(final int integer1, final BlockPos fk, final int integer3);
+    public abstract void destroyBlockProgress(final int integer1, final BlockPos fu, final int integer3);
     
-    public void createFireworks(final double double1, final double double2, final double double3, final double double4, final double double5, final double double6, @Nullable final CompoundTag jt) {
+    public void createFireworks(final double double1, final double double2, final double double3, final double double4, final double double5, final double double6, @Nullable final CompoundTag le) {
     }
     
     public abstract Scoreboard getScoreboard();
     
-    public void updateNeighbourForOutputSignal(final BlockPos fk, final Block bph) {
-        for (final Direction fp5 : Direction.Plane.HORIZONTAL) {
-            BlockPos fk2 = fk.relative(fp5);
-            if (this.hasChunkAt(fk2)) {
-                BlockState byj7 = this.getBlockState(fk2);
-                if (byj7.getBlock() == Blocks.COMPARATOR) {
-                    byj7.neighborChanged(this, fk2, bph, fk, false);
+    public void updateNeighbourForOutputSignal(final BlockPos fu, final Block bvr) {
+        for (final Direction fz5 : Direction.Plane.HORIZONTAL) {
+            BlockPos fu2 = fu.relative(fz5);
+            if (this.hasChunkAt(fu2)) {
+                BlockState cfj7 = this.getBlockState(fu2);
+                if (cfj7.is(Blocks.COMPARATOR)) {
+                    cfj7.neighborChanged(this, fu2, bvr, fu, false);
                 }
                 else {
-                    if (!byj7.isRedstoneConductor(this, fk2)) {
+                    if (!cfj7.isRedstoneConductor(this, fu2)) {
                         continue;
                     }
-                    fk2 = fk2.relative(fp5);
-                    byj7 = this.getBlockState(fk2);
-                    if (byj7.getBlock() != Blocks.COMPARATOR) {
+                    fu2 = fu2.relative(fz5);
+                    cfj7 = this.getBlockState(fu2);
+                    if (!cfj7.is(Blocks.COMPARATOR)) {
                         continue;
                     }
-                    byj7.neighborChanged(this, fk2, bph, fk, false);
+                    cfj7.neighborChanged(this, fu2, bvr, fu, false);
                 }
             }
         }
     }
     
     @Override
-    public DifficultyInstance getCurrentDifficultyAt(final BlockPos fk) {
+    public DifficultyInstance getCurrentDifficultyAt(final BlockPos fu) {
         long long3 = 0L;
         float float5 = 0.0f;
-        if (this.hasChunkAt(fk)) {
+        if (this.hasChunkAt(fu)) {
             float5 = this.getMoonBrightness();
-            long3 = this.getChunkAt(fk).getInhabitedTime();
+            long3 = this.getChunkAt(fu).getInhabitedTime();
         }
         return new DifficultyInstance(this.getDifficulty(), this.getDayTime(), long3, float5);
     }
@@ -1046,12 +985,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         return this.worldBorder;
     }
     
-    public void sendPacketToServer(final Packet<?> lt) {
+    public void sendPacketToServer(final Packet<?> ni) {
         throw new UnsupportedOperationException("Can't send packets to server unless you're on the client.");
     }
     
     @Override
-    public Dimension getDimension() {
+    public DimensionType dimensionType() {
+        return this.dimensionType;
+    }
+    
+    public ResourceKey<DimensionType> dimensionTypeKey() {
+        return this.dimensionTypeKey;
+    }
+    
+    public ResourceKey<Level> dimension() {
         return this.dimension;
     }
     
@@ -1061,8 +1008,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     
     @Override
-    public boolean isStateAtPosition(final BlockPos fk, final Predicate<BlockState> predicate) {
-        return predicate.test(this.getBlockState(fk));
+    public boolean isStateAtPosition(final BlockPos fu, final Predicate<BlockState> predicate) {
+        return predicate.test(this.getBlockState(fu));
     }
     
     public abstract RecipeManager getRecipeManager();
@@ -1080,6 +1027,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     
     public ProfilerFiller getProfiler() {
+        return this.profiler.get();
+    }
+    
+    public Supplier<ProfilerFiller> getProfilerSupplier() {
         return this.profiler;
     }
     
@@ -1088,8 +1039,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         return this.biomeManager;
     }
     
+    public final boolean isDebug() {
+        return this.isDebug;
+    }
+    
     static {
         LOGGER = LogManager.getLogger();
+        RESOURCE_KEY_CODEC = ResourceLocation.CODEC.xmap((Function)ResourceKey.<Level>elementKey(Registry.DIMENSION_REGISTRY), (Function)ResourceKey::location);
+        OVERWORLD = ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, new ResourceLocation("overworld"));
+        NETHER = ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, new ResourceLocation("the_nether"));
+        END = ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, new ResourceLocation("the_end"));
         DIRECTIONS = Direction.values();
     }
 }
diff --git a/src/net/minecraft/world/level/LevelAccessor.java b/src/net/minecraft/world/level/LevelAccessor.java
index 898108c..290070b 100644
--- a/src/net/minecraft/world/level/LevelAccessor.java
+++ b/src/net/minecraft/world/level/LevelAccessor.java
@@ -3,7 +3,7 @@ package net.minecraft.world.level;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import java.util.stream.Stream;
-import java.util.Set;
+import java.util.function.Predicate;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.core.particles.ParticleOptions;
@@ -19,21 +19,19 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.storage.LevelData;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.dimension.Dimension;
+import net.minecraft.world.level.dimension.DimensionType;
 
 public interface LevelAccessor extends EntityGetter, LevelReader, LevelSimulatedRW {
-    long getSeed();
-    
     default float getMoonBrightness() {
-        return Dimension.MOON_BRIGHTNESS_PER_PHASE[this.getDimension().getMoonPhase(this.getLevelData().getDayTime())];
+        return DimensionType.MOON_BRIGHTNESS_PER_PHASE[this.dimensionType().moonPhase(this.getLevelData().getDayTime())];
     }
     
     default float getTimeOfDay(final float float1) {
-        return this.getDimension().getTimeOfDay(this.getLevelData().getDayTime(), float1);
+        return this.dimensionType().timeOfDay(this.getLevelData().getDayTime());
     }
     
     default int getMoonPhase() {
-        return this.getDimension().getMoonPhase(this.getLevelData().getDayTime());
+        return this.dimensionType().moonPhase(this.getLevelData().getDayTime());
     }
     
     TickList<Block> getBlockTicks();
@@ -44,7 +42,7 @@ public interface LevelAccessor extends EntityGetter, LevelReader, LevelSimulated
     
     LevelData getLevelData();
     
-    DifficultyInstance getCurrentDifficultyAt(final BlockPos fk);
+    DifficultyInstance getCurrentDifficultyAt(final BlockPos fu);
     
     default Difficulty getDifficulty() {
         return this.getLevelData().getDifficulty();
@@ -58,29 +56,32 @@ public interface LevelAccessor extends EntityGetter, LevelReader, LevelSimulated
     
     Random getRandom();
     
-    void blockUpdated(final BlockPos fk, final Block bph);
-    
-    BlockPos getSharedSpawnPos();
-    
-    void playSound(@Nullable final Player ayj, final BlockPos fk, final SoundEvent aah, final SoundSource aaj, final float float5, final float float6);
-    
-    void addParticle(final ParticleOptions gt, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7);
-    
-    void levelEvent(@Nullable final Player ayj, final int integer2, final BlockPos fk, final int integer4);
-    
-    default void levelEvent(final int integer1, final BlockPos fk, final int integer3) {
-        this.levelEvent(null, integer1, fk, integer3);
+    default void blockUpdated(final BlockPos fu, final Block bvr) {
     }
     
-    default Stream<VoxelShape> getEntityCollisions(@Nullable final Entity akq, final AABB cvf, final Set<Entity> set) {
-        return super.getEntityCollisions(akq, cvf, set);
+    void playSound(@Nullable final Player bec, final BlockPos fu, final SoundEvent ack, final SoundSource acm, final float float5, final float float6);
+    
+    void addParticle(final ParticleOptions hf, final double double2, final double double3, final double double4, final double double5, final double double6, final double double7);
+    
+    void levelEvent(@Nullable final Player bec, final int integer2, final BlockPos fu, final int integer4);
+    
+    default int getHeight() {
+        return this.dimensionType().logicalHeight();
     }
     
-    default boolean isUnobstructed(@Nullable final Entity akq, final VoxelShape cwf) {
-        return super.isUnobstructed(akq, cwf);
+    default void levelEvent(final int integer1, final BlockPos fu, final int integer3) {
+        this.levelEvent(null, integer1, fu, integer3);
     }
     
-    default BlockPos getHeightmapPos(final Heightmap.Types a, final BlockPos fk) {
-        return super.getHeightmapPos(a, fk);
+    default Stream<VoxelShape> getEntityCollisions(@Nullable final Entity aom, final AABB deg, final Predicate<Entity> predicate) {
+        return super.getEntityCollisions(aom, deg, predicate);
+    }
+    
+    default boolean isUnobstructed(@Nullable final Entity aom, final VoxelShape dfg) {
+        return super.isUnobstructed(aom, dfg);
+    }
+    
+    default BlockPos getHeightmapPos(final Heightmap.Types a, final BlockPos fu) {
+        return super.getHeightmapPos(a, fu);
     }
 }
diff --git a/src/net/minecraft/world/level/LevelConflictException.java b/src/net/minecraft/world/level/LevelConflictException.java
deleted file mode 100644
index 54aa8b1..0000000
--- a/src/net/minecraft/world/level/LevelConflictException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.minecraft.world.level;
-
-public class LevelConflictException extends Exception {
-    public LevelConflictException(final String string) {
-        super(string);
-    }
-}
diff --git a/src/net/minecraft/world/level/LevelReader.java b/src/net/minecraft/world/level/LevelReader.java
index ab7d734..a306b28 100644
--- a/src/net/minecraft/world/level/LevelReader.java
+++ b/src/net/minecraft/world/level/LevelReader.java
@@ -1,11 +1,14 @@
 package net.minecraft.world.level;
 
-import net.minecraft.util.Mth;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.Direction;
+import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.dimension.Dimension;
+import java.util.stream.Stream;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.Heightmap;
@@ -16,7 +19,7 @@ import net.minecraft.world.level.biome.BiomeManager;
 
 public interface LevelReader extends BlockAndTintGetter, CollisionGetter, BiomeManager.NoiseBiomeSource {
     @Nullable
-    ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus cae, final boolean boolean4);
+    ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus chc, final boolean boolean4);
     
     @Deprecated
     boolean hasChunk(final int integer1, final int integer2);
@@ -27,18 +30,31 @@ public interface LevelReader extends BlockAndTintGetter, CollisionGetter, BiomeM
     
     BiomeManager getBiomeManager();
     
-    default Biome getBiome(final BlockPos fk) {
-        return this.getBiomeManager().getBiome(fk);
+    default Biome getBiome(final BlockPos fu) {
+        return this.getBiomeManager().getBiome(fu);
     }
     
-    default int getBlockTint(final BlockPos fk, final ColorResolver colorResolver) {
-        return colorResolver.getColor(this.getBiome(fk), fk.getX(), fk.getZ());
+    default Stream<BlockState> getBlockStatesIfLoaded(final AABB deg) {
+        final int integer3 = Mth.floor(deg.minX);
+        final int integer4 = Mth.floor(deg.maxX);
+        final int integer5 = Mth.floor(deg.minY);
+        final int integer6 = Mth.floor(deg.maxY);
+        final int integer7 = Mth.floor(deg.minZ);
+        final int integer8 = Mth.floor(deg.maxZ);
+        if (this.hasChunksAt(integer3, integer5, integer7, integer4, integer6, integer8)) {
+            return this.getBlockStates(deg);
+        }
+        return Stream.<BlockState>empty();
+    }
+    
+    default int getBlockTint(final BlockPos fu, final ColorResolver colorResolver) {
+        return colorResolver.getColor(this.getBiome(fu), fu.getX(), fu.getZ());
     }
     
     default Biome getNoiseBiome(final int integer1, final int integer2, final int integer3) {
-        final ChunkAccess bzy5 = this.getChunk(integer1 >> 2, integer3 >> 2, ChunkStatus.BIOMES, false);
-        if (bzy5 != null && bzy5.getBiomes() != null) {
-            return bzy5.getBiomes().getNoiseBiome(integer1, integer2, integer3);
+        final ChunkAccess cgy5 = this.getChunk(integer1 >> 2, integer3 >> 2, ChunkStatus.BIOMES, false);
+        if (cgy5 != null && cgy5.getBiomes() != null) {
+            return cgy5.getBiomes().getNoiseBiome(integer1, integer2, integer3);
         }
         return this.getUncachedNoiseBiome(integer1, integer2, integer3);
     }
@@ -47,29 +63,30 @@ public interface LevelReader extends BlockAndTintGetter, CollisionGetter, BiomeM
     
     boolean isClientSide();
     
+    @Deprecated
     int getSeaLevel();
     
-    Dimension getDimension();
+    DimensionType dimensionType();
     
-    default BlockPos getHeightmapPos(final Heightmap.Types a, final BlockPos fk) {
-        return new BlockPos(fk.getX(), this.getHeight(a, fk.getX(), fk.getZ()), fk.getZ());
+    default BlockPos getHeightmapPos(final Heightmap.Types a, final BlockPos fu) {
+        return new BlockPos(fu.getX(), this.getHeight(a, fu.getX(), fu.getZ()), fu.getZ());
     }
     
-    default boolean isEmptyBlock(final BlockPos fk) {
-        return this.getBlockState(fk).isAir();
+    default boolean isEmptyBlock(final BlockPos fu) {
+        return this.getBlockState(fu).isAir();
     }
     
-    default boolean canSeeSkyFromBelowWater(final BlockPos fk) {
-        if (fk.getY() >= this.getSeaLevel()) {
-            return this.canSeeSky(fk);
+    default boolean canSeeSkyFromBelowWater(final BlockPos fu) {
+        if (fu.getY() >= this.getSeaLevel()) {
+            return this.canSeeSky(fu);
         }
-        BlockPos fk2 = new BlockPos(fk.getX(), this.getSeaLevel(), fk.getZ());
-        if (!this.canSeeSky(fk2)) {
+        BlockPos fu2 = new BlockPos(fu.getX(), this.getSeaLevel(), fu.getZ());
+        if (!this.canSeeSky(fu2)) {
             return false;
         }
-        for (fk2 = fk2.below(); fk2.getY() > fk.getY(); fk2 = fk2.below()) {
-            final BlockState byj4 = this.getBlockState(fk2);
-            if (byj4.getLightBlock(this, fk2) > 0 && !byj4.getMaterial().isLiquid()) {
+        for (fu2 = fu2.below(); fu2.getY() > fu.getY(); fu2 = fu2.below()) {
+            final BlockState cfj4 = this.getBlockState(fu2);
+            if (cfj4.getLightBlock(this, fu2) > 0 && !cfj4.getMaterial().isLiquid()) {
                 return false;
             }
         }
@@ -77,24 +94,24 @@ public interface LevelReader extends BlockAndTintGetter, CollisionGetter, BiomeM
     }
     
     @Deprecated
-    default float getBrightness(final BlockPos fk) {
-        return this.getDimension().getBrightness(this.getMaxLocalRawBrightness(fk));
+    default float getBrightness(final BlockPos fu) {
+        return this.dimensionType().brightness(this.getMaxLocalRawBrightness(fu));
     }
     
-    default int getDirectSignal(final BlockPos fk, final Direction fp) {
-        return this.getBlockState(fk).getDirectSignal(this, fk, fp);
+    default int getDirectSignal(final BlockPos fu, final Direction fz) {
+        return this.getBlockState(fu).getDirectSignal(this, fu, fz);
     }
     
-    default ChunkAccess getChunk(final BlockPos fk) {
-        return this.getChunk(fk.getX() >> 4, fk.getZ() >> 4);
+    default ChunkAccess getChunk(final BlockPos fu) {
+        return this.getChunk(fu.getX() >> 4, fu.getZ() >> 4);
     }
     
     default ChunkAccess getChunk(final int integer1, final int integer2) {
         return this.getChunk(integer1, integer2, ChunkStatus.FULL, true);
     }
     
-    default ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus cae) {
-        return this.getChunk(integer1, integer2, cae, true);
+    default ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus chc) {
+        return this.getChunk(integer1, integer2, chc, true);
     }
     
     @Nullable
@@ -102,25 +119,24 @@ public interface LevelReader extends BlockAndTintGetter, CollisionGetter, BiomeM
         return this.getChunk(integer1, integer2, ChunkStatus.EMPTY, false);
     }
     
-    default boolean isWaterAt(final BlockPos fk) {
-        return this.getFluidState(fk).is(FluidTags.WATER);
+    default boolean isWaterAt(final BlockPos fu) {
+        return this.getFluidState(fu).is(FluidTags.WATER);
     }
     
-    default boolean containsAnyLiquid(final AABB cvf) {
-        final int integer3 = Mth.floor(cvf.minX);
-        final int integer4 = Mth.ceil(cvf.maxX);
-        final int integer5 = Mth.floor(cvf.minY);
-        final int integer6 = Mth.ceil(cvf.maxY);
-        final int integer7 = Mth.floor(cvf.minZ);
-        final int integer8 = Mth.ceil(cvf.maxZ);
-        try (final BlockPos.PooledMutableBlockPos b9 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (int integer9 = integer3; integer9 < integer4; ++integer9) {
-                for (int integer10 = integer5; integer10 < integer6; ++integer10) {
-                    for (int integer11 = integer7; integer11 < integer8; ++integer11) {
-                        final BlockState byj14 = this.getBlockState(b9.set(integer9, integer10, integer11));
-                        if (!byj14.getFluidState().isEmpty()) {
-                            return true;
-                        }
+    default boolean containsAnyLiquid(final AABB deg) {
+        final int integer3 = Mth.floor(deg.minX);
+        final int integer4 = Mth.ceil(deg.maxX);
+        final int integer5 = Mth.floor(deg.minY);
+        final int integer6 = Mth.ceil(deg.maxY);
+        final int integer7 = Mth.floor(deg.minZ);
+        final int integer8 = Mth.ceil(deg.maxZ);
+        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos();
+        for (int integer9 = integer3; integer9 < integer4; ++integer9) {
+            for (int integer10 = integer5; integer10 < integer6; ++integer10) {
+                for (int integer11 = integer7; integer11 < integer8; ++integer11) {
+                    final BlockState cfj13 = this.getBlockState(a9.set(integer9, integer10, integer11));
+                    if (!cfj13.getFluidState().isEmpty()) {
+                        return true;
                     }
                 }
             }
@@ -128,25 +144,25 @@ public interface LevelReader extends BlockAndTintGetter, CollisionGetter, BiomeM
         return false;
     }
     
-    default int getMaxLocalRawBrightness(final BlockPos fk) {
-        return this.getMaxLocalRawBrightness(fk, this.getSkyDarken());
+    default int getMaxLocalRawBrightness(final BlockPos fu) {
+        return this.getMaxLocalRawBrightness(fu, this.getSkyDarken());
     }
     
-    default int getMaxLocalRawBrightness(final BlockPos fk, final int integer) {
-        if (fk.getX() < -30000000 || fk.getZ() < -30000000 || fk.getX() >= 30000000 || fk.getZ() >= 30000000) {
+    default int getMaxLocalRawBrightness(final BlockPos fu, final int integer) {
+        if (fu.getX() < -30000000 || fu.getZ() < -30000000 || fu.getX() >= 30000000 || fu.getZ() >= 30000000) {
             return 15;
         }
-        return this.getRawBrightness(fk, integer);
+        return this.getRawBrightness(fu, integer);
     }
     
     @Deprecated
-    default boolean hasChunkAt(final BlockPos fk) {
-        return this.hasChunk(fk.getX() >> 4, fk.getZ() >> 4);
+    default boolean hasChunkAt(final BlockPos fu) {
+        return this.hasChunk(fu.getX() >> 4, fu.getZ() >> 4);
     }
     
     @Deprecated
-    default boolean hasChunksAt(final BlockPos fk1, final BlockPos fk2) {
-        return this.hasChunksAt(fk1.getX(), fk1.getY(), fk1.getZ(), fk2.getX(), fk2.getY(), fk2.getZ());
+    default boolean hasChunksAt(final BlockPos fu1, final BlockPos fu2) {
+        return this.hasChunksAt(fu1.getX(), fu1.getY(), fu1.getZ(), fu2.getX(), fu2.getY(), fu2.getZ());
     }
     
     @Deprecated
diff --git a/src/net/minecraft/world/level/LevelSettings.java b/src/net/minecraft/world/level/LevelSettings.java
index 3e2c51f..c5211e8 100644
--- a/src/net/minecraft/world/level/LevelSettings.java
+++ b/src/net/minecraft/world/level/LevelSettings.java
@@ -1,76 +1,74 @@
 package net.minecraft.world.level;
 
-import net.minecraft.world.level.storage.LevelData;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
+import com.mojang.serialization.DynamicLike;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.world.Difficulty;
 
 public final class LevelSettings {
-    private final long seed;
+    private final String levelName;
     private final GameType gameType;
-    private final boolean generateMapFeatures;
     private final boolean hardcore;
-    private final LevelType levelType;
-    private boolean allowCommands;
-    private boolean startingBonusItems;
-    private JsonElement levelTypeOptions;
+    private final Difficulty difficulty;
+    private final boolean allowCommands;
+    private final GameRules gameRules;
+    private final DataPackConfig dataPackConfig;
     
-    public LevelSettings(final long long1, final GameType bjt, final boolean boolean3, final boolean boolean4, final LevelType bkd) {
-        this.levelTypeOptions = new JsonObject();
-        this.seed = long1;
-        this.gameType = bjt;
-        this.generateMapFeatures = boolean3;
-        this.hardcore = boolean4;
-        this.levelType = bkd;
+    public LevelSettings(final String string, final GameType bpy, final boolean boolean3, final Difficulty and, final boolean boolean5, final GameRules bpx, final DataPackConfig bpn) {
+        this.levelName = string;
+        this.gameType = bpy;
+        this.hardcore = boolean3;
+        this.difficulty = and;
+        this.allowCommands = boolean5;
+        this.gameRules = bpx;
+        this.dataPackConfig = bpn;
     }
     
-    public LevelSettings(final LevelData crm) {
-        this(crm.getSeed(), crm.getGameType(), crm.isGenerateMapFeatures(), crm.isHardcore(), crm.getGeneratorType());
+    public static LevelSettings parse(final Dynamic<?> dynamic, final DataPackConfig bpn) {
+        final GameType bpy3 = GameType.byId(dynamic.get("GameType").asInt(0));
+        return new LevelSettings(dynamic.get("LevelName").asString(""), bpy3, dynamic.get("hardcore").asBoolean(false), dynamic.get("Difficulty").asNumber().map(number -> Difficulty.byId(number.byteValue())).result().orElse(Difficulty.NORMAL), dynamic.get("allowCommands").asBoolean(bpy3 == GameType.CREATIVE), new GameRules(dynamic.get("GameRules")), bpn);
     }
     
-    public LevelSettings enableStartingBonusItems() {
-        this.startingBonusItems = true;
-        return this;
+    public String levelName() {
+        return this.levelName;
     }
     
-    public LevelSettings enableSinglePlayerCommands() {
-        this.allowCommands = true;
-        return this;
-    }
-    
-    public LevelSettings setLevelTypeOptions(final JsonElement jsonElement) {
-        this.levelTypeOptions = jsonElement;
-        return this;
-    }
-    
-    public boolean hasStartingBonusItems() {
-        return this.startingBonusItems;
-    }
-    
-    public long getSeed() {
-        return this.seed;
-    }
-    
-    public GameType getGameType() {
+    public GameType gameType() {
         return this.gameType;
     }
     
-    public boolean isHardcore() {
+    public boolean hardcore() {
         return this.hardcore;
     }
     
-    public boolean isGenerateMapFeatures() {
-        return this.generateMapFeatures;
+    public Difficulty difficulty() {
+        return this.difficulty;
     }
     
-    public LevelType getLevelType() {
-        return this.levelType;
-    }
-    
-    public boolean getAllowCommands() {
+    public boolean allowCommands() {
         return this.allowCommands;
     }
     
-    public JsonElement getLevelTypeOptions() {
-        return this.levelTypeOptions;
+    public GameRules gameRules() {
+        return this.gameRules;
+    }
+    
+    public DataPackConfig getDataPackConfig() {
+        return this.dataPackConfig;
+    }
+    
+    public LevelSettings withGameType(final GameType bpy) {
+        return new LevelSettings(this.levelName, bpy, this.hardcore, this.difficulty, this.allowCommands, this.gameRules, this.dataPackConfig);
+    }
+    
+    public LevelSettings withDifficulty(final Difficulty and) {
+        return new LevelSettings(this.levelName, this.gameType, this.hardcore, and, this.allowCommands, this.gameRules, this.dataPackConfig);
+    }
+    
+    public LevelSettings withDataPackConfig(final DataPackConfig bpn) {
+        return new LevelSettings(this.levelName, this.gameType, this.hardcore, this.difficulty, this.allowCommands, this.gameRules, bpn);
+    }
+    
+    public LevelSettings copy() {
+        return new LevelSettings(this.levelName, this.gameType, this.hardcore, this.difficulty, this.allowCommands, this.gameRules.copy(), this.dataPackConfig);
     }
 }
diff --git a/src/net/minecraft/world/level/LevelSimulatedReader.java b/src/net/minecraft/world/level/LevelSimulatedReader.java
index 63110f6..964876d 100644
--- a/src/net/minecraft/world/level/LevelSimulatedReader.java
+++ b/src/net/minecraft/world/level/LevelSimulatedReader.java
@@ -6,7 +6,7 @@ import java.util.function.Predicate;
 import net.minecraft.core.BlockPos;
 
 public interface LevelSimulatedReader {
-    boolean isStateAtPosition(final BlockPos fk, final Predicate<BlockState> predicate);
+    boolean isStateAtPosition(final BlockPos fu, final Predicate<BlockState> predicate);
     
-    BlockPos getHeightmapPos(final Heightmap.Types a, final BlockPos fk);
+    BlockPos getHeightmapPos(final Heightmap.Types a, final BlockPos fu);
 }
diff --git a/src/net/minecraft/world/level/LevelType.java b/src/net/minecraft/world/level/LevelType.java
deleted file mode 100644
index 22f7bd1..0000000
--- a/src/net/minecraft/world/level/LevelType.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package net.minecraft.world.level;
-
-import javax.annotation.Nullable;
-
-public class LevelType {
-    public static final LevelType[] LEVEL_TYPES;
-    public static final LevelType NORMAL;
-    public static final LevelType FLAT;
-    public static final LevelType LARGE_BIOMES;
-    public static final LevelType AMPLIFIED;
-    public static final LevelType CUSTOMIZED;
-    public static final LevelType BUFFET;
-    public static final LevelType DEBUG_ALL_BLOCK_STATES;
-    public static final LevelType NORMAL_1_1;
-    private final int id;
-    private final String generatorName;
-    private final String generatorSerialization;
-    private final int version;
-    private boolean selectable;
-    private boolean replacement;
-    private boolean hasHelpText;
-    private boolean hasCustomOptions;
-    
-    private LevelType(final int integer, final String string) {
-        this(integer, string, string, 0);
-    }
-    
-    private LevelType(final int integer1, final String string, final int integer3) {
-        this(integer1, string, string, integer3);
-    }
-    
-    private LevelType(final int integer1, final String string2, final String string3, final int integer4) {
-        this.generatorName = string2;
-        this.generatorSerialization = string3;
-        this.version = integer4;
-        this.selectable = true;
-        this.id = integer1;
-        LevelType.LEVEL_TYPES[integer1] = this;
-    }
-    
-    public String getName() {
-        return this.generatorName;
-    }
-    
-    public String getSerialization() {
-        return this.generatorSerialization;
-    }
-    
-    public String getDescriptionId() {
-        return "generator." + this.generatorName;
-    }
-    
-    public String getHelpTextId() {
-        return this.getDescriptionId() + ".info";
-    }
-    
-    public int getVersion() {
-        return this.version;
-    }
-    
-    public LevelType getReplacementForVersion(final int integer) {
-        if (this == LevelType.NORMAL && integer == 0) {
-            return LevelType.NORMAL_1_1;
-        }
-        return this;
-    }
-    
-    public boolean hasCustomOptions() {
-        return this.hasCustomOptions;
-    }
-    
-    public LevelType setCustomOptions(final boolean boolean1) {
-        this.hasCustomOptions = boolean1;
-        return this;
-    }
-    
-    private LevelType setSelectableByUser(final boolean boolean1) {
-        this.selectable = boolean1;
-        return this;
-    }
-    
-    public boolean isSelectable() {
-        return this.selectable;
-    }
-    
-    private LevelType setHasReplacement() {
-        this.replacement = true;
-        return this;
-    }
-    
-    public boolean hasReplacement() {
-        return this.replacement;
-    }
-    
-    @Nullable
-    public static LevelType getLevelType(final String string) {
-        for (final LevelType bkd5 : LevelType.LEVEL_TYPES) {
-            if (bkd5 != null && bkd5.generatorName.equalsIgnoreCase(string)) {
-                return bkd5;
-            }
-        }
-        return null;
-    }
-    
-    public int getId() {
-        return this.id;
-    }
-    
-    public boolean hasHelpText() {
-        return this.hasHelpText;
-    }
-    
-    private LevelType setHasHelpText() {
-        this.hasHelpText = true;
-        return this;
-    }
-    
-    static {
-        LEVEL_TYPES = new LevelType[16];
-        NORMAL = new LevelType(0, "default", 1).setHasReplacement();
-        FLAT = new LevelType(1, "flat").setCustomOptions(true);
-        LARGE_BIOMES = new LevelType(2, "largeBiomes");
-        AMPLIFIED = new LevelType(3, "amplified").setHasHelpText();
-        CUSTOMIZED = new LevelType(4, "customized", "normal", 0).setCustomOptions(true).setSelectableByUser(false);
-        BUFFET = new LevelType(5, "buffet").setCustomOptions(true);
-        DEBUG_ALL_BLOCK_STATES = new LevelType(6, "debug_all_block_states");
-        NORMAL_1_1 = new LevelType(8, "default_1_1", 0).setSelectableByUser(false);
-    }
-}
diff --git a/src/net/minecraft/world/level/LevelWriter.java b/src/net/minecraft/world/level/LevelWriter.java
index ec57a7c..e77ac0f 100644
--- a/src/net/minecraft/world/level/LevelWriter.java
+++ b/src/net/minecraft/world/level/LevelWriter.java
@@ -6,17 +6,25 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 
 public interface LevelWriter {
-    boolean setBlock(final BlockPos fk, final BlockState byj, final int integer);
+    boolean setBlock(final BlockPos fu, final BlockState cfj, final int integer3, final int integer4);
     
-    boolean removeBlock(final BlockPos fk, final boolean boolean2);
-    
-    default boolean destroyBlock(final BlockPos fk, final boolean boolean2) {
-        return this.destroyBlock(fk, boolean2, null);
+    default boolean setBlock(final BlockPos fu, final BlockState cfj, final int integer) {
+        return this.setBlock(fu, cfj, integer, 512);
     }
     
-    boolean destroyBlock(final BlockPos fk, final boolean boolean2, @Nullable final Entity akq);
+    boolean removeBlock(final BlockPos fu, final boolean boolean2);
     
-    default boolean addFreshEntity(final Entity akq) {
+    default boolean destroyBlock(final BlockPos fu, final boolean boolean2) {
+        return this.destroyBlock(fu, boolean2, null);
+    }
+    
+    default boolean destroyBlock(final BlockPos fu, final boolean boolean2, @Nullable final Entity aom) {
+        return this.destroyBlock(fu, boolean2, aom, 512);
+    }
+    
+    boolean destroyBlock(final BlockPos fu, final boolean boolean2, @Nullable final Entity aom, final int integer);
+    
+    default boolean addFreshEntity(final Entity aom) {
         return false;
     }
 }
diff --git a/src/net/minecraft/world/level/NaturalSpawner.java b/src/net/minecraft/world/level/NaturalSpawner.java
index 9720343..eada67d 100644
--- a/src/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/net/minecraft/world/level/NaturalSpawner.java
@@ -1,126 +1,171 @@
 package net.minecraft.world.level;
 
+import java.util.function.Consumer;
+import it.unimi.dsi.fastutil.objects.Object2IntMaps;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraft.tags.FluidTags;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.levelgen.Heightmap;
-import javax.annotation.Nullable;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import net.minecraft.world.level.block.Blocks;
 import java.util.List;
 import net.minecraft.util.WeighedRandom;
 import java.util.Random;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.SpawnGroupData;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.entity.Entity;
+import javax.annotation.Nullable;
 import net.minecraft.core.Registry;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.SpawnPlacements;
 import java.util.Objects;
 import net.minecraft.core.Position;
 import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.SpawnGroupData;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.util.Mth;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.biome.BiomeManager;
+import net.minecraft.world.level.biome.NearestNeighborBiomeZoomer;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.core.BlockPos;
+import java.util.Iterator;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.entity.Mob;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.MobCategory;
 import org.apache.logging.log4j.Logger;
 
 public final class NaturalSpawner {
     private static final Logger LOGGER;
+    private static final int MAGIC_NUMBER;
+    private static final MobCategory[] SPAWNING_CATEGORIES;
     
-    public static void spawnCategoryForChunk(final MobCategory alb, final ServerLevel xd, final LevelChunk cal, final BlockPos fk) {
-        final ChunkGenerator<?> caa5 = xd.getChunkSource().getGenerator();
-        int integer6 = 0;
-        final BlockPos fk2 = getRandomPosWithin(xd, cal);
-        final int integer7 = fk2.getX();
-        final int integer8 = fk2.getY();
-        final int integer9 = fk2.getZ();
-        if (integer8 < 1) {
+    public static SpawnState createState(final int integer, final Iterable<Entity> iterable, final ChunkGetter b) {
+        final PotentialCalculator bqn4 = new PotentialCalculator();
+        final Object2IntOpenHashMap<MobCategory> object2IntOpenHashMap5 = (Object2IntOpenHashMap<MobCategory>)new Object2IntOpenHashMap();
+        for (final Entity aom7 : iterable) {
+            if (aom7 instanceof Mob) {
+                final Mob aoz8 = (Mob)aom7;
+                if (aoz8.isPersistenceRequired()) {
+                    continue;
+                }
+                if (aoz8.requiresCustomPersistence()) {
+                    continue;
+                }
+            }
+            final MobCategory apa8 = aom7.getType().getCategory();
+            if (apa8 == MobCategory.MISC) {
+                continue;
+            }
+            final BlockPos fu9 = aom7.blockPosition();
+            final long long10 = ChunkPos.asLong(fu9.getX() >> 4, fu9.getZ() >> 4);
+            final BlockPos fu10;
+            final Biome bre7;
+            final Entity entity;
+            final Biome.MobSpawnCost e8;
+            final PotentialCalculator potentialCalculator;
+            final Object2IntOpenHashMap object2IntOpenHashMap6;
+            final Object o;
+            b.query(long10, chj -> {
+                bre7 = getRoughBiome(fu10, chj);
+                e8 = bre7.getMobSpawnCost(entity.getType());
+                if (e8 != null) {
+                    potentialCalculator.addCharge(entity.blockPosition(), e8.getCharge());
+                }
+                object2IntOpenHashMap6.addTo(o, 1);
+                return;
+            });
+        }
+        return new SpawnState(integer, (Object2IntOpenHashMap)object2IntOpenHashMap5, bqn4);
+    }
+    
+    private static Biome getRoughBiome(final BlockPos fu, final ChunkAccess cgy) {
+        return NearestNeighborBiomeZoomer.INSTANCE.getBiome(0L, fu.getX(), fu.getY(), fu.getZ(), cgy.getBiomes());
+    }
+    
+    public static void spawnForChunk(final ServerLevel zd, final LevelChunk chj, final SpawnState d, final boolean boolean4, final boolean boolean5, final boolean boolean6) {
+        zd.getProfiler().push("spawner");
+        for (final MobCategory apa10 : NaturalSpawner.SPAWNING_CATEGORIES) {
+            if ((boolean4 || !apa10.isFriendly()) && (boolean5 || apa10.isFriendly()) && (boolean6 || !apa10.isPersistent()) && d.canSpawnForCategory(apa10)) {
+                spawnCategoryForChunk(apa10, zd, chj, (aoq, fu, cgy) -> d.canSpawn(aoq, fu, cgy), (aoz, cgy) -> d.afterSpawn(aoz, cgy));
+            }
+        }
+        zd.getProfiler().pop();
+    }
+    
+    public static void spawnCategoryForChunk(final MobCategory apa, final ServerLevel zd, final LevelChunk chj, final SpawnPredicate c, final AfterSpawnCallback a) {
+        final BlockPos fu6 = getRandomPosWithin(zd, chj);
+        if (fu6.getY() < 1) {
             return;
         }
-        final BlockState byj11 = cal.getBlockState(fk2);
-        if (byj11.isRedstoneConductor(cal, fk2)) {
+        spawnCategoryForPosition(apa, zd, chj, fu6, c, a);
+    }
+    
+    public static void spawnCategoryForPosition(final MobCategory apa, final ServerLevel zd, final ChunkAccess cgy, final BlockPos fu, final SpawnPredicate c, final AfterSpawnCallback a) {
+        final StructureFeatureManager bqq7 = zd.structureFeatureManager();
+        final ChunkGenerator cha8 = zd.getChunkSource().getGenerator();
+        final int integer9 = fu.getY();
+        final BlockState cfj10 = cgy.getBlockState(fu);
+        if (cfj10.isRedstoneConductor(cgy, fu)) {
             return;
         }
-        final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos();
-        for (int integer10 = 0; integer10 < 3; ++integer10) {
-            int integer11 = integer7;
-            int integer12 = integer9;
-            final int integer13 = 6;
-            Biome.SpawnerData e17 = null;
-            SpawnGroupData alm18 = null;
-            int integer14 = Mth.ceil(Math.random() * 4.0);
-            int integer15 = 0;
-            for (int integer16 = 0; integer16 < integer14; ++integer16) {
-                integer11 += xd.random.nextInt(6) - xd.random.nextInt(6);
-                integer12 += xd.random.nextInt(6) - xd.random.nextInt(6);
-                a12.set(integer11, integer8, integer12);
-                final float float22 = integer11 + 0.5f;
-                final float float23 = integer12 + 0.5f;
-                final Player ayj24 = xd.getNearestPlayerIgnoreY(float22, float23, -1.0);
-                if (ayj24 != null) {
-                    final double double25 = ayj24.distanceToSqr(float22, integer8, float23);
-                    if (double25 > 576.0) {
-                        if (!fk.closerThan(new Vec3(float22, integer8, float23), 24.0)) {
-                            final ChunkPos bjh27 = new ChunkPos(a12);
-                            if (Objects.equals(bjh27, cal.getPos()) || xd.getChunkSource().isEntityTickingChunk(bjh27)) {
-                                if (e17 == null) {
-                                    e17 = getRandomSpawnMobAt(caa5, alb, xd.random, a12);
-                                    if (e17 == null) {
-                                        break;
-                                    }
-                                    integer14 = e17.minCount + xd.random.nextInt(1 + e17.maxCount - e17.minCount);
+        final BlockPos.MutableBlockPos a2 = new BlockPos.MutableBlockPos();
+        int integer10 = 0;
+        for (int integer11 = 0; integer11 < 3; ++integer11) {
+            int integer12 = fu.getX();
+            int integer13 = fu.getZ();
+            final int integer14 = 6;
+            Biome.SpawnerData g17 = null;
+            SpawnGroupData apo18 = null;
+            int integer15 = Mth.ceil(zd.random.nextFloat() * 4.0f);
+            int integer16 = 0;
+            for (int integer17 = 0; integer17 < integer15; ++integer17) {
+                integer12 += zd.random.nextInt(6) - zd.random.nextInt(6);
+                integer13 += zd.random.nextInt(6) - zd.random.nextInt(6);
+                a2.set(integer12, integer9, integer13);
+                final double double22 = integer12 + 0.5;
+                final double double23 = integer13 + 0.5;
+                final Player bec26 = zd.getNearestPlayer(double22, integer9, double23, -1.0, false);
+                if (bec26 != null) {
+                    final double double24 = bec26.distanceToSqr(double22, integer9, double23);
+                    if (isRightDistanceToPlayerAndSpawnPoint(zd, cgy, a2, double24)) {
+                        if (g17 == null) {
+                            g17 = getRandomSpawnMobAt(zd, bqq7, cha8, apa, zd.random, a2);
+                            if (g17 == null) {
+                                break;
+                            }
+                            integer15 = g17.minCount + zd.random.nextInt(1 + g17.maxCount - g17.minCount);
+                        }
+                        if (isValidSpawnPostitionForType(zd, apa, bqq7, cha8, g17, a2, double24)) {
+                            if (c.test(g17.type, a2, cgy)) {
+                                final Mob aoz29 = getMobForSpawn(zd, g17.type);
+                                if (aoz29 == null) {
+                                    return;
                                 }
-                                if (e17.type.getCategory() != MobCategory.MISC) {
-                                    if (e17.type.canSpawnFarFromPlayer() || double25 <= 16384.0) {
-                                        final EntityType<?> aku28 = e17.type;
-                                        if (aku28.canSummon()) {
-                                            if (canSpawnMobAt(caa5, alb, e17, a12)) {
-                                                final SpawnPlacements.Type c29 = SpawnPlacements.getPlacementType(aku28);
-                                                if (isSpawnPositionOk(c29, xd, a12, aku28)) {
-                                                    if (SpawnPlacements.checkSpawnRules(aku28, xd, MobSpawnType.NATURAL, a12, xd.random)) {
-                                                        if (xd.noCollision(aku28.getAABB(float22, integer8, float23))) {
-                                                            Mob ala30;
-                                                            try {
-                                                                final Entity akq31 = (Entity)aku28.create(xd);
-                                                                if (!(akq31 instanceof Mob)) {
-                                                                    throw new IllegalStateException("Trying to spawn a non-mob: " + Registry.ENTITY_TYPE.getKey(aku28));
-                                                                }
-                                                                ala30 = (Mob)akq31;
-                                                            }
-                                                            catch (Exception exception31) {
-                                                                NaturalSpawner.LOGGER.warn("Failed to create mob", (Throwable)exception31);
-                                                                return;
-                                                            }
-                                                            ala30.moveTo(float22, integer8, float23, xd.random.nextFloat() * 360.0f, 0.0f);
-                                                            if (double25 <= 16384.0 || !ala30.removeWhenFarAway(double25)) {
-                                                                if (ala30.checkSpawnRules(xd, MobSpawnType.NATURAL)) {
-                                                                    if (ala30.checkSpawnObstruction(xd)) {
-                                                                        alm18 = ala30.finalizeSpawn(xd, xd.getCurrentDifficultyAt(new BlockPos(ala30)), MobSpawnType.NATURAL, alm18, null);
-                                                                        ++integer6;
-                                                                        ++integer15;
-                                                                        xd.addFreshEntity(ala30);
-                                                                        if (integer6 >= ala30.getMaxSpawnClusterSize()) {
-                                                                            return;
-                                                                        }
-                                                                        if (ala30.isMaxGroupSizeReached(integer15)) {
-                                                                            break;
-                                                                        }
-                                                                    }
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
+                                aoz29.moveTo(double22, integer9, double23, zd.random.nextFloat() * 360.0f, 0.0f);
+                                if (isValidPositionForMob(zd, aoz29, double24)) {
+                                    apo18 = aoz29.finalizeSpawn(zd, zd.getCurrentDifficultyAt(aoz29.blockPosition()), MobSpawnType.NATURAL, apo18, null);
+                                    ++integer10;
+                                    ++integer16;
+                                    zd.addFreshEntity(aoz29);
+                                    a.run(aoz29, cgy);
+                                    if (integer10 >= aoz29.getMaxSpawnClusterSize()) {
+                                        return;
+                                    }
+                                    if (aoz29.isMaxGroupSizeReached(integer16)) {
+                                        break;
                                     }
                                 }
                             }
@@ -131,66 +176,126 @@ public final class NaturalSpawner {
         }
     }
     
+    private static boolean isRightDistanceToPlayerAndSpawnPoint(final ServerLevel zd, final ChunkAccess cgy, final BlockPos.MutableBlockPos a, final double double4) {
+        if (double4 <= 576.0) {
+            return false;
+        }
+        if (zd.getSharedSpawnPos().closerThan(new Vec3(a.getX() + 0.5, a.getY(), a.getZ() + 0.5), 24.0)) {
+            return false;
+        }
+        final ChunkPos bph6 = new ChunkPos(a);
+        return Objects.equals(bph6, cgy.getPos()) || zd.getChunkSource().isEntityTickingChunk(bph6);
+    }
+    
+    private static boolean isValidSpawnPostitionForType(final ServerLevel zd, final MobCategory apa, final StructureFeatureManager bqq, final ChunkGenerator cha, final Biome.SpawnerData g, final BlockPos.MutableBlockPos a, final double double7) {
+        final EntityType<?> aoq9 = g.type;
+        if (aoq9.getCategory() == MobCategory.MISC) {
+            return false;
+        }
+        if (!aoq9.canSpawnFarFromPlayer() && double7 > aoq9.getCategory().getDespawnDistance() * aoq9.getCategory().getDespawnDistance()) {
+            return false;
+        }
+        if (!aoq9.canSummon() || !canSpawnMobAt(zd, bqq, cha, apa, g, a)) {
+            return false;
+        }
+        final SpawnPlacements.Type c10 = SpawnPlacements.getPlacementType(aoq9);
+        return isSpawnPositionOk(c10, zd, a, aoq9) && SpawnPlacements.checkSpawnRules(aoq9, zd, MobSpawnType.NATURAL, a, zd.random) && zd.noCollision(aoq9.getAABB(a.getX() + 0.5, a.getY(), a.getZ() + 0.5));
+    }
+    
     @Nullable
-    private static Biome.SpawnerData getRandomSpawnMobAt(final ChunkGenerator<?> caa, final MobCategory alb, final Random random, final BlockPos fk) {
-        final List<Biome.SpawnerData> list5 = caa.getMobsAt(alb, fk);
-        if (list5.isEmpty()) {
+    private static Mob getMobForSpawn(final ServerLevel zd, final EntityType<?> aoq) {
+        Mob aoz3;
+        try {
+            final Entity aom4 = (Entity)aoq.create(zd);
+            if (!(aom4 instanceof Mob)) {
+                throw new IllegalStateException("Trying to spawn a non-mob: " + Registry.ENTITY_TYPE.getKey(aoq));
+            }
+            aoz3 = (Mob)aom4;
+        }
+        catch (Exception exception4) {
+            NaturalSpawner.LOGGER.warn("Failed to create mob", (Throwable)exception4);
             return null;
         }
-        return WeighedRandom.<Biome.SpawnerData>getRandomItem(random, list5);
+        return aoz3;
     }
     
-    private static boolean canSpawnMobAt(final ChunkGenerator<?> caa, final MobCategory alb, final Biome.SpawnerData e, final BlockPos fk) {
-        final List<Biome.SpawnerData> list5 = caa.getMobsAt(alb, fk);
-        return !list5.isEmpty() && list5.contains(e);
+    private static boolean isValidPositionForMob(final ServerLevel zd, final Mob aoz, final double double3) {
+        return (double3 <= aoz.getType().getCategory().getDespawnDistance() * aoz.getType().getCategory().getDespawnDistance() || !aoz.removeWhenFarAway(double3)) && aoz.checkSpawnRules(zd, MobSpawnType.NATURAL) && aoz.checkSpawnObstruction(zd);
     }
     
-    private static BlockPos getRandomPosWithin(final Level bjw, final LevelChunk cal) {
-        final ChunkPos bjh3 = cal.getPos();
-        final int integer4 = bjh3.getMinBlockX() + bjw.random.nextInt(16);
-        final int integer5 = bjh3.getMinBlockZ() + bjw.random.nextInt(16);
-        final int integer6 = cal.getHeight(Heightmap.Types.WORLD_SURFACE, integer4, integer5) + 1;
-        final int integer7 = bjw.random.nextInt(integer6 + 1);
+    @Nullable
+    private static Biome.SpawnerData getRandomSpawnMobAt(final ServerLevel zd, final StructureFeatureManager bqq, final ChunkGenerator cha, final MobCategory apa, final Random random, final BlockPos fu) {
+        final Biome bre7 = zd.getBiome(fu);
+        if (apa == MobCategory.WATER_AMBIENT && bre7.getBiomeCategory() == Biome.BiomeCategory.RIVER && random.nextFloat() < 0.98f) {
+            return null;
+        }
+        final List<Biome.SpawnerData> list8 = mobsAt(zd, bqq, cha, apa, fu, bre7);
+        if (list8.isEmpty()) {
+            return null;
+        }
+        return WeighedRandom.<Biome.SpawnerData>getRandomItem(random, list8);
+    }
+    
+    private static boolean canSpawnMobAt(final ServerLevel zd, final StructureFeatureManager bqq, final ChunkGenerator cha, final MobCategory apa, final Biome.SpawnerData g, final BlockPos fu) {
+        return mobsAt(zd, bqq, cha, apa, fu, null).contains(g);
+    }
+    
+    private static List<Biome.SpawnerData> mobsAt(final ServerLevel zd, final StructureFeatureManager bqq, final ChunkGenerator cha, final MobCategory apa, final BlockPos fu, @Nullable final Biome bre) {
+        if (apa == MobCategory.MONSTER && zd.getBlockState(fu.below()).getBlock() == Blocks.NETHER_BRICKS && bqq.getStructureAt(fu, false, StructureFeature.NETHER_BRIDGE).isValid()) {
+            return StructureFeature.NETHER_BRIDGE.getSpecialEnemies();
+        }
+        return cha.getMobsAt((bre != null) ? bre : zd.getBiome(fu), bqq, apa, fu);
+    }
+    
+    private static BlockPos getRandomPosWithin(final Level bqb, final LevelChunk chj) {
+        final ChunkPos bph3 = chj.getPos();
+        final int integer4 = bph3.getMinBlockX() + bqb.random.nextInt(16);
+        final int integer5 = bph3.getMinBlockZ() + bqb.random.nextInt(16);
+        final int integer6 = chj.getHeight(Heightmap.Types.WORLD_SURFACE, integer4, integer5) + 1;
+        final int integer7 = bqb.random.nextInt(integer6 + 1);
         return new BlockPos(integer4, integer7, integer5);
     }
     
-    public static boolean isValidEmptySpawnBlock(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final FluidState coj) {
-        return !byj.isCollisionShapeFullBlock(bjg, fk) && !byj.isSignalSource() && coj.isEmpty() && !byj.is(BlockTags.RAILS);
+    public static boolean isValidEmptySpawnBlock(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final FluidState cxa, final EntityType aoq) {
+        return !cfj.isCollisionShapeFullBlock(bpg, fu) && !cfj.isSignalSource() && cxa.isEmpty() && !cfj.is(BlockTags.PREVENT_MOB_SPAWNING_INSIDE) && !aoq.isBlockDangerous(cfj);
     }
     
-    public static boolean isSpawnPositionOk(final SpawnPlacements.Type c, final LevelReader bjz, final BlockPos fk, @Nullable final EntityType<?> aku) {
+    public static boolean isSpawnPositionOk(final SpawnPlacements.Type c, final LevelReader bqd, final BlockPos fu, @Nullable final EntityType<?> aoq) {
         if (c == SpawnPlacements.Type.NO_RESTRICTIONS) {
             return true;
         }
-        if (aku == null || !bjz.getWorldBorder().isWithinBounds(fk)) {
+        if (aoq == null || !bqd.getWorldBorder().isWithinBounds(fu)) {
             return false;
         }
-        final BlockState byj5 = bjz.getBlockState(fk);
-        final FluidState coj6 = bjz.getFluidState(fk);
-        final BlockPos fk2 = fk.above();
-        final BlockPos fk3 = fk.below();
+        final BlockState cfj5 = bqd.getBlockState(fu);
+        final FluidState cxa6 = bqd.getFluidState(fu);
+        final BlockPos fu2 = fu.above();
+        final BlockPos fu3 = fu.below();
         switch (c) {
             case IN_WATER: {
-                return coj6.is(FluidTags.WATER) && bjz.getFluidState(fk3).is(FluidTags.WATER) && !bjz.getBlockState(fk2).isRedstoneConductor(bjz, fk2);
+                return cxa6.is(FluidTags.WATER) && bqd.getFluidState(fu3).is(FluidTags.WATER) && !bqd.getBlockState(fu2).isRedstoneConductor(bqd, fu2);
+            }
+            case IN_LAVA: {
+                return cxa6.is(FluidTags.LAVA);
             }
             default: {
-                final BlockState byj6 = bjz.getBlockState(fk3);
-                return byj6.isValidSpawn(bjz, fk3, aku) && isValidEmptySpawnBlock(bjz, fk, byj5, coj6) && isValidEmptySpawnBlock(bjz, fk2, bjz.getBlockState(fk2), bjz.getFluidState(fk2));
+                final BlockState cfj6 = bqd.getBlockState(fu3);
+                return cfj6.isValidSpawn(bqd, fu3, aoq) && isValidEmptySpawnBlock(bqd, fu, cfj5, cxa6, aoq) && isValidEmptySpawnBlock(bqd, fu2, bqd.getBlockState(fu2), bqd.getFluidState(fu2), aoq);
             }
         }
     }
     
-    public static void spawnMobsForChunkGeneration(final LevelAccessor bjx, final Biome bkt, final int integer3, final int integer4, final Random random) {
-        final List<Biome.SpawnerData> list6 = bkt.getMobs(MobCategory.CREATURE);
+    public static void spawnMobsForChunkGeneration(final LevelAccessor bqc, final Biome bre, final int integer3, final int integer4, final Random random) {
+        final List<Biome.SpawnerData> list6 = bre.getMobs(MobCategory.CREATURE);
         if (list6.isEmpty()) {
             return;
         }
         final int integer5 = integer3 << 4;
         final int integer6 = integer4 << 4;
-        while (random.nextFloat() < bkt.getCreatureProbability()) {
-            final Biome.SpawnerData e9 = WeighedRandom.<Biome.SpawnerData>getRandomItem(random, list6);
-            final int integer7 = e9.minCount + random.nextInt(1 + e9.maxCount - e9.minCount);
-            SpawnGroupData alm11 = null;
+        while (random.nextFloat() < bre.getCreatureProbability()) {
+            final Biome.SpawnerData g9 = WeighedRandom.<Biome.SpawnerData>getRandomItem(random, list6);
+            final int integer7 = g9.minCount + random.nextInt(1 + g9.maxCount - g9.minCount);
+            SpawnGroupData apo11 = null;
             int integer8 = integer5 + random.nextInt(16);
             int integer9 = integer6 + random.nextInt(16);
             final int integer10 = integer8;
@@ -198,31 +303,31 @@ public final class NaturalSpawner {
             for (int integer12 = 0; integer12 < integer7; ++integer12) {
                 boolean boolean17 = false;
                 for (int integer13 = 0; !boolean17 && integer13 < 4; ++integer13) {
-                    final BlockPos fk19 = getTopNonCollidingPos(bjx, e9.type, integer8, integer9);
-                    if (e9.type.canSummon() && isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, bjx, fk19, e9.type)) {
-                        final float float20 = e9.type.getWidth();
+                    final BlockPos fu19 = getTopNonCollidingPos(bqc, g9.type, integer8, integer9);
+                    if (g9.type.canSummon() && isSpawnPositionOk(SpawnPlacements.getPlacementType(g9.type), bqc, fu19, g9.type)) {
+                        final float float20 = g9.type.getWidth();
                         final double double21 = Mth.clamp(integer8, integer5 + (double)float20, integer5 + 16.0 - float20);
                         final double double22 = Mth.clamp(integer9, integer6 + (double)float20, integer6 + 16.0 - float20);
-                        if (!bjx.noCollision(e9.type.getAABB(double21, fk19.getY(), double22))) {
+                        if (!bqc.noCollision(g9.type.getAABB(double21, fu19.getY(), double22))) {
                             continue;
                         }
-                        if (!SpawnPlacements.<Entity>checkSpawnRules(e9.type, bjx, MobSpawnType.CHUNK_GENERATION, new BlockPos(double21, fk19.getY(), double22), bjx.getRandom())) {
+                        if (!SpawnPlacements.<Entity>checkSpawnRules(g9.type, bqc, MobSpawnType.CHUNK_GENERATION, new BlockPos(double21, fu19.getY(), double22), bqc.getRandom())) {
                             continue;
                         }
-                        Entity akq25;
+                        Entity aom25;
                         try {
-                            akq25 = (Entity)e9.type.create(bjx.getLevel());
+                            aom25 = (Entity)g9.type.create(bqc.getLevel());
                         }
                         catch (Exception exception26) {
                             NaturalSpawner.LOGGER.warn("Failed to create mob", (Throwable)exception26);
                             continue;
                         }
-                        akq25.moveTo(double21, fk19.getY(), double22, random.nextFloat() * 360.0f, 0.0f);
-                        if (akq25 instanceof Mob) {
-                            final Mob ala26 = (Mob)akq25;
-                            if (ala26.checkSpawnRules(bjx, MobSpawnType.CHUNK_GENERATION) && ala26.checkSpawnObstruction(bjx)) {
-                                alm11 = ala26.finalizeSpawn(bjx, bjx.getCurrentDifficultyAt(new BlockPos(ala26)), MobSpawnType.CHUNK_GENERATION, alm11, null);
-                                bjx.addFreshEntity(ala26);
+                        aom25.moveTo(double21, fu19.getY(), double22, random.nextFloat() * 360.0f, 0.0f);
+                        if (aom25 instanceof Mob) {
+                            final Mob aoz26 = (Mob)aom25;
+                            if (aoz26.checkSpawnRules(bqc, MobSpawnType.CHUNK_GENERATION) && aoz26.checkSpawnObstruction(bqc)) {
+                                apo11 = aoz26.finalizeSpawn(bqc, bqc.getCurrentDifficultyAt(aoz26.blockPosition()), MobSpawnType.CHUNK_GENERATION, apo11, null);
+                                bqc.addFreshEntity(aoz26);
                                 boolean17 = true;
                             }
                         }
@@ -233,16 +338,112 @@ public final class NaturalSpawner {
         }
     }
     
-    private static BlockPos getTopNonCollidingPos(final LevelReader bjz, @Nullable final EntityType<?> aku, final int integer3, final int integer4) {
-        final BlockPos fk5 = new BlockPos(integer3, bjz.getHeight(SpawnPlacements.getHeightmapType(aku), integer3, integer4), integer4);
-        final BlockPos fk6 = fk5.below();
-        if (bjz.getBlockState(fk6).isPathfindable(bjz, fk6, PathComputationType.LAND)) {
-            return fk6;
+    private static BlockPos getTopNonCollidingPos(final LevelReader bqd, final EntityType<?> aoq, final int integer3, final int integer4) {
+        final int integer5 = bqd.getHeight(SpawnPlacements.getHeightmapType(aoq), integer3, integer4);
+        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos(integer3, integer5, integer4);
+        if (bqd.dimensionType().hasCeiling()) {
+            do {
+                a6.move(Direction.DOWN);
+            } while (!bqd.getBlockState(a6).isAir());
+            do {
+                a6.move(Direction.DOWN);
+            } while (bqd.getBlockState(a6).isAir() && a6.getY() > 0);
         }
-        return fk5;
+        if (SpawnPlacements.getPlacementType(aoq) == SpawnPlacements.Type.ON_GROUND) {
+            final BlockPos fu7 = a6.below();
+            if (bqd.getBlockState(fu7).isPathfindable(bqd, fu7, PathComputationType.LAND)) {
+                return fu7;
+            }
+        }
+        return a6.immutable();
     }
     
     static {
         LOGGER = LogManager.getLogger();
+        MAGIC_NUMBER = (int)Math.pow(17.0, 2.0);
+        SPAWNING_CATEGORIES = Stream.<MobCategory>of(MobCategory.values()).filter(apa -> apa != MobCategory.MISC).<MobCategory>toArray(MobCategory[]::new);
+    }
+    
+    public static class SpawnState {
+        private final int spawnableChunkCount;
+        private final Object2IntOpenHashMap<MobCategory> mobCategoryCounts;
+        private final PotentialCalculator spawnPotential;
+        private final Object2IntMap<MobCategory> unmodifiableMobCategoryCounts;
+        @Nullable
+        private BlockPos lastCheckedPos;
+        @Nullable
+        private EntityType<?> lastCheckedType;
+        private double lastCharge;
+        
+        private SpawnState(final int integer, final Object2IntOpenHashMap<MobCategory> object2IntOpenHashMap, final PotentialCalculator bqn) {
+            this.spawnableChunkCount = integer;
+            this.mobCategoryCounts = object2IntOpenHashMap;
+            this.spawnPotential = bqn;
+            this.unmodifiableMobCategoryCounts = (Object2IntMap<MobCategory>)Object2IntMaps.unmodifiable((Object2IntMap)object2IntOpenHashMap);
+        }
+        
+        private boolean canSpawn(final EntityType<?> aoq, final BlockPos fu, final ChunkAccess cgy) {
+            this.lastCheckedPos = fu;
+            this.lastCheckedType = aoq;
+            final Biome bre5 = getRoughBiome(fu, cgy);
+            final Biome.MobSpawnCost e6 = bre5.getMobSpawnCost(aoq);
+            if (e6 == null) {
+                this.lastCharge = 0.0;
+                return true;
+            }
+            final double double7 = e6.getCharge();
+            this.lastCharge = double7;
+            final double double8 = this.spawnPotential.getPotentialEnergyChange(fu, double7);
+            return double8 <= e6.getEnergyBudget();
+        }
+        
+        private void afterSpawn(final Mob aoz, final ChunkAccess cgy) {
+            final EntityType<?> aoq4 = aoz.getType();
+            final BlockPos fu7 = aoz.blockPosition();
+            double double5;
+            if (fu7.equals(this.lastCheckedPos) && aoq4 == this.lastCheckedType) {
+                double5 = this.lastCharge;
+            }
+            else {
+                final Biome bre8 = getRoughBiome(fu7, cgy);
+                final Biome.MobSpawnCost e9 = bre8.getMobSpawnCost(aoq4);
+                if (e9 != null) {
+                    double5 = e9.getCharge();
+                }
+                else {
+                    double5 = 0.0;
+                }
+            }
+            this.spawnPotential.addCharge(fu7, double5);
+            this.mobCategoryCounts.addTo(aoq4.getCategory(), 1);
+        }
+        
+        public int getSpawnableChunkCount() {
+            return this.spawnableChunkCount;
+        }
+        
+        public Object2IntMap<MobCategory> getMobCategoryCounts() {
+            return this.unmodifiableMobCategoryCounts;
+        }
+        
+        private boolean canSpawnForCategory(final MobCategory apa) {
+            final int integer3 = apa.getMaxInstancesPerChunk() * this.spawnableChunkCount / NaturalSpawner.MAGIC_NUMBER;
+            return this.mobCategoryCounts.getInt(apa) < integer3;
+        }
+    }
+    
+    @FunctionalInterface
+    public interface ChunkGetter {
+        void query(final long long1, final Consumer<LevelChunk> consumer);
+    }
+    
+    @FunctionalInterface
+    public interface AfterSpawnCallback {
+        void run(final Mob aoz, final ChunkAccess cgy);
+    }
+    
+    @FunctionalInterface
+    public interface SpawnPredicate {
+        boolean test(final EntityType<?> aoq, final BlockPos fu, final ChunkAccess cgy);
     }
 }
diff --git a/src/net/minecraft/world/level/NoiseColumn.java b/src/net/minecraft/world/level/NoiseColumn.java
new file mode 100644
index 0000000..3207c93
--- /dev/null
+++ b/src/net/minecraft/world/level/NoiseColumn.java
@@ -0,0 +1,36 @@
+package net.minecraft.world.level;
+
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.block.Blocks;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
+
+public final class NoiseColumn implements BlockGetter {
+    private final BlockState[] column;
+    
+    public NoiseColumn(final BlockState[] arr) {
+        this.column = arr;
+    }
+    
+    @Nullable
+    @Override
+    public BlockEntity getBlockEntity(final BlockPos fu) {
+        return null;
+    }
+    
+    @Override
+    public BlockState getBlockState(final BlockPos fu) {
+        final int integer3 = fu.getY();
+        if (integer3 < 0 || integer3 >= this.column.length) {
+            return Blocks.AIR.defaultBlockState();
+        }
+        return this.column[integer3];
+    }
+    
+    @Override
+    public FluidState getFluidState(final BlockPos fu) {
+        return this.getBlockState(fu).getFluidState();
+    }
+}
diff --git a/src/net/minecraft/world/level/PathNavigationRegion.java b/src/net/minecraft/world/level/PathNavigationRegion.java
index 66eb093..4bca6c7 100644
--- a/src/net/minecraft/world/level/PathNavigationRegion.java
+++ b/src/net/minecraft/world/level/PathNavigationRegion.java
@@ -2,6 +2,11 @@ package net.minecraft.world.level;
 
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import java.util.stream.Stream;
+import java.util.function.Predicate;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import javax.annotation.Nullable;
@@ -19,24 +24,24 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter {
     protected boolean allEmpty;
     protected final Level level;
     
-    public PathNavigationRegion(final Level bjw, final BlockPos fk2, final BlockPos fk3) {
-        this.level = bjw;
-        this.centerX = fk2.getX() >> 4;
-        this.centerZ = fk2.getZ() >> 4;
-        final int integer5 = fk3.getX() >> 4;
-        final int integer6 = fk3.getZ() >> 4;
+    public PathNavigationRegion(final Level bqb, final BlockPos fu2, final BlockPos fu3) {
+        this.level = bqb;
+        this.centerX = fu2.getX() >> 4;
+        this.centerZ = fu2.getZ() >> 4;
+        final int integer5 = fu3.getX() >> 4;
+        final int integer6 = fu3.getZ() >> 4;
         this.chunks = new ChunkAccess[integer5 - this.centerX + 1][integer6 - this.centerZ + 1];
-        final ChunkSource cad7 = bjw.getChunkSource();
+        final ChunkSource chb7 = bqb.getChunkSource();
         this.allEmpty = true;
         for (int integer7 = this.centerX; integer7 <= integer5; ++integer7) {
             for (int integer8 = this.centerZ; integer8 <= integer6; ++integer8) {
-                this.chunks[integer7 - this.centerX][integer8 - this.centerZ] = cad7.getChunkNow(integer7, integer8);
+                this.chunks[integer7 - this.centerX][integer8 - this.centerZ] = chb7.getChunkNow(integer7, integer8);
             }
         }
-        for (int integer7 = fk2.getX() >> 4; integer7 <= fk3.getX() >> 4; ++integer7) {
-            for (int integer8 = fk2.getZ() >> 4; integer8 <= fk3.getZ() >> 4; ++integer8) {
-                final ChunkAccess bzy10 = this.chunks[integer7 - this.centerX][integer8 - this.centerZ];
-                if (bzy10 != null && !bzy10.isYSpaceEmpty(fk2.getY(), fk3.getY())) {
+        for (int integer7 = fu2.getX() >> 4; integer7 <= fu3.getX() >> 4; ++integer7) {
+            for (int integer8 = fu2.getZ() >> 4; integer8 <= fu3.getZ() >> 4; ++integer8) {
+                final ChunkAccess cgy10 = this.chunks[integer7 - this.centerX][integer8 - this.centerZ];
+                if (cgy10 != null && !cgy10.isYSpaceEmpty(fu2.getY(), fu3.getY())) {
                     this.allEmpty = false;
                     return;
                 }
@@ -44,8 +49,8 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter {
         }
     }
     
-    private ChunkAccess getChunk(final BlockPos fk) {
-        return this.getChunk(fk.getX() >> 4, fk.getZ() >> 4);
+    private ChunkAccess getChunk(final BlockPos fu) {
+        return this.getChunk(fu.getX() >> 4, fu.getZ() >> 4);
     }
     
     private ChunkAccess getChunk(final int integer1, final int integer2) {
@@ -54,8 +59,8 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter {
         if (integer3 < 0 || integer3 >= this.chunks.length || integer4 < 0 || integer4 >= this.chunks[integer3].length) {
             return new EmptyLevelChunk(this.level, new ChunkPos(integer1, integer2));
         }
-        final ChunkAccess bzy6 = this.chunks[integer3][integer4];
-        return (bzy6 != null) ? bzy6 : new EmptyLevelChunk(this.level, new ChunkPos(integer1, integer2));
+        final ChunkAccess cgy6 = this.chunks[integer3][integer4];
+        return (cgy6 != null) ? cgy6 : new EmptyLevelChunk(this.level, new ChunkPos(integer1, integer2));
     }
     
     @Override
@@ -70,26 +75,36 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter {
     
     @Nullable
     @Override
-    public BlockEntity getBlockEntity(final BlockPos fk) {
-        final ChunkAccess bzy3 = this.getChunk(fk);
-        return bzy3.getBlockEntity(fk);
+    public BlockEntity getBlockEntity(final BlockPos fu) {
+        final ChunkAccess cgy3 = this.getChunk(fu);
+        return cgy3.getBlockEntity(fu);
     }
     
     @Override
-    public BlockState getBlockState(final BlockPos fk) {
-        if (Level.isOutsideBuildHeight(fk)) {
+    public BlockState getBlockState(final BlockPos fu) {
+        if (Level.isOutsideBuildHeight(fu)) {
             return Blocks.AIR.defaultBlockState();
         }
-        final ChunkAccess bzy3 = this.getChunk(fk);
-        return bzy3.getBlockState(fk);
+        final ChunkAccess cgy3 = this.getChunk(fu);
+        return cgy3.getBlockState(fu);
     }
     
     @Override
-    public FluidState getFluidState(final BlockPos fk) {
-        if (Level.isOutsideBuildHeight(fk)) {
+    public Stream<VoxelShape> getEntityCollisions(@Nullable final Entity aom, final AABB deg, final Predicate<Entity> predicate) {
+        return Stream.<VoxelShape>empty();
+    }
+    
+    @Override
+    public Stream<VoxelShape> getCollisions(@Nullable final Entity aom, final AABB deg, final Predicate<Entity> predicate) {
+        return this.getBlockCollisions(aom, deg);
+    }
+    
+    @Override
+    public FluidState getFluidState(final BlockPos fu) {
+        if (Level.isOutsideBuildHeight(fu)) {
             return Fluids.EMPTY.defaultFluidState();
         }
-        final ChunkAccess bzy3 = this.getChunk(fk);
-        return bzy3.getFluidState(fk);
+        final ChunkAccess cgy3 = this.getChunk(fu);
+        return cgy3.getFluidState(fu);
     }
 }
diff --git a/src/net/minecraft/world/level/PortalForcer.java b/src/net/minecraft/world/level/PortalForcer.java
index ef6ff38..eaeca70 100644
--- a/src/net/minecraft/world/level/PortalForcer.java
+++ b/src/net/minecraft/world/level/PortalForcer.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Blocks;
@@ -17,11 +17,11 @@ import net.minecraft.world.entity.ai.village.poi.PoiManager;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.world.entity.ai.village.poi.PoiRecord;
 import java.util.List;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.pattern.BlockPattern;
 import net.minecraft.core.Direction;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
@@ -30,48 +30,48 @@ public class PortalForcer {
     private final ServerLevel level;
     private final Random random;
     
-    public PortalForcer(final ServerLevel xd) {
-        this.level = xd;
-        this.random = new Random(xd.getSeed());
+    public PortalForcer(final ServerLevel zd) {
+        this.level = zd;
+        this.random = new Random(zd.getSeed());
     }
     
-    public boolean findAndMoveToPortal(final Entity akq, final float float2) {
-        final Vec3 cvl4 = akq.getPortalEntranceOffset();
-        final Direction fp5 = akq.getPortalEntranceForwards();
-        final BlockPattern.PortalInfo c6 = this.findPortal(new BlockPos(akq), akq.getDeltaMovement(), fp5, cvl4.x, cvl4.y, akq instanceof Player);
+    public boolean findAndMoveToPortal(final Entity aom, final float float2) {
+        final Vec3 dem4 = aom.getPortalEntranceOffset();
+        final Direction fz5 = aom.getPortalEntranceForwards();
+        final BlockPattern.PortalInfo c6 = this.findPortal(aom.blockPosition(), aom.getDeltaMovement(), fz5, dem4.x, dem4.y, aom instanceof Player);
         if (c6 == null) {
             return false;
         }
-        final Vec3 cvl5 = c6.pos;
-        final Vec3 cvl6 = c6.speed;
-        akq.setDeltaMovement(cvl6);
-        akq.yRot = float2 + c6.angle;
-        akq.forceMove(cvl5.x, cvl5.y, cvl5.z);
+        final Vec3 dem5 = c6.pos;
+        final Vec3 dem6 = c6.speed;
+        aom.setDeltaMovement(dem6);
+        aom.yRot = float2 + c6.angle;
+        aom.moveTo(dem5.x, dem5.y, dem5.z);
         return true;
     }
     
     @Nullable
-    public BlockPattern.PortalInfo findPortal(final BlockPos fk, final Vec3 cvl, final Direction fp, final double double4, final double double5, final boolean boolean6) {
-        final PoiManager asr10 = this.level.getPoiManager();
-        asr10.ensureLoadedAndValid(this.level, fk, 128);
-        final List<PoiRecord> list11 = asr10.getInSquare(asu -> asu == PoiType.NETHER_PORTAL, fk, 128, PoiManager.Occupancy.ANY).collect(Collectors.toList());
-        final Optional<PoiRecord> optional12 = list11.stream().min(Comparator.comparingDouble(ass -> ass.getPos().distSqr(fk)).thenComparingInt(ass -> ass.getPos().getY()));
-        final BlockPos fk2;
+    public BlockPattern.PortalInfo findPortal(final BlockPos fu, final Vec3 dem, final Direction fz, final double double4, final double double5, final boolean boolean6) {
+        final PoiManager axz10 = this.level.getPoiManager();
+        axz10.ensureLoadedAndValid(this.level, fu, 128);
+        final List<PoiRecord> list11 = axz10.getInSquare(ayc -> ayc == PoiType.NETHER_PORTAL, fu, 128, PoiManager.Occupancy.ANY).collect(Collectors.toList());
+        final Optional<PoiRecord> optional12 = list11.stream().min(Comparator.comparingDouble(aya -> aya.getPos().distSqr(fu)).thenComparingInt(aya -> aya.getPos().getY()));
+        final BlockPos fu2;
         final BlockPattern.BlockPatternMatch b10;
-        return optional12.<BlockPattern.PortalInfo>map(ass -> {
-            fk2 = ass.getPos();
-            this.level.getChunkSource().<BlockPos>addRegionTicket(TicketType.PORTAL, new ChunkPos(fk2), 3, fk2);
-            b10 = NetherPortalBlock.getPortalShape(this.level, fk2);
-            return b10.getPortalOutput(fp, fk2, double5, cvl, double4);
+        return optional12.<BlockPattern.PortalInfo>map(aya -> {
+            fu2 = aya.getPos();
+            this.level.getChunkSource().<BlockPos>addRegionTicket(TicketType.PORTAL, new ChunkPos(fu2), 3, fu2);
+            b10 = NetherPortalBlock.getPortalShape(this.level, fu2);
+            return b10.getPortalOutput(fz, fu2, double5, dem, double4);
         }).orElse(null);
     }
     
-    public boolean createPortal(final Entity akq) {
+    public boolean createPortal(final Entity aom) {
         final int integer3 = 16;
         double double4 = -1.0;
-        final int integer4 = Mth.floor(akq.getX());
-        final int integer5 = Mth.floor(akq.getY());
-        final int integer6 = Mth.floor(akq.getZ());
+        final int integer4 = Mth.floor(aom.getX());
+        final int integer5 = Mth.floor(aom.getY());
+        final int integer6 = Mth.floor(aom.getZ());
         int integer7 = integer4;
         int integer8 = integer5;
         int integer9 = integer6;
@@ -79,9 +79,9 @@ public class PortalForcer {
         final int integer11 = this.random.nextInt(4);
         final BlockPos.MutableBlockPos a14 = new BlockPos.MutableBlockPos();
         for (int integer12 = integer4 - 16; integer12 <= integer4 + 16; ++integer12) {
-            final double double5 = integer12 + 0.5 - akq.getX();
+            final double double5 = integer12 + 0.5 - aom.getX();
             for (int integer13 = integer6 - 16; integer13 <= integer6 + 16; ++integer13) {
-                final double double6 = integer13 + 0.5 - akq.getZ();
+                final double double6 = integer13 + 0.5 - aom.getZ();
             Label_0463:
                 for (int integer14 = this.level.getHeight() - 1; integer14 >= 0; --integer14) {
                     if (this.level.isEmptyBlock(a14.set(integer12, integer14, integer13))) {
@@ -111,7 +111,7 @@ public class PortalForcer {
                                     }
                                 }
                             }
-                            final double double7 = integer14 + 0.5 - akq.getY();
+                            final double double7 = integer14 + 0.5 - aom.getY();
                             final double double8 = double5 * double5 + double7 * double7 + double6 * double6;
                             if (double4 < 0.0 || double8 < double4) {
                                 double4 = double8;
@@ -127,9 +127,9 @@ public class PortalForcer {
         }
         if (double4 < 0.0) {
             for (int integer12 = integer4 - 16; integer12 <= integer4 + 16; ++integer12) {
-                final double double5 = integer12 + 0.5 - akq.getX();
+                final double double5 = integer12 + 0.5 - aom.getX();
                 for (int integer13 = integer6 - 16; integer13 <= integer6 + 16; ++integer13) {
-                    final double double6 = integer13 + 0.5 - akq.getZ();
+                    final double double6 = integer13 + 0.5 - aom.getZ();
                 Label_0837:
                     for (int integer14 = this.level.getHeight() - 1; integer14 >= 0; --integer14) {
                         if (this.level.isEmptyBlock(a14.set(integer12, integer14, integer13))) {
@@ -153,7 +153,7 @@ public class PortalForcer {
                                         }
                                     }
                                 }
-                                final double double7 = integer14 + 0.5 - akq.getY();
+                                final double double7 = integer14 + 0.5 - aom.getY();
                                 final double double8 = double5 * double5 + double7 * double7 + double6 * double6;
                                 if (double4 < 0.0 || double8 < double4) {
                                     double4 = double8;
@@ -201,11 +201,11 @@ public class PortalForcer {
                 }
             }
         }
-        final BlockState byj21 = ((AbstractStateHolder<O, BlockState>)Blocks.NETHER_PORTAL.defaultBlockState()).<Direction.Axis, Direction.Axis>setValue(NetherPortalBlock.AXIS, (integer26 == 0) ? Direction.Axis.Z : Direction.Axis.X);
+        final BlockState cfj21 = ((StateHolder<O, BlockState>)Blocks.NETHER_PORTAL.defaultBlockState()).<Direction.Axis, Direction.Axis>setValue(NetherPortalBlock.AXIS, (integer26 == 0) ? Direction.Axis.Z : Direction.Axis.X);
         for (int integer15 = 0; integer15 < 2; ++integer15) {
             for (int integer16 = 0; integer16 < 3; ++integer16) {
                 a14.set(integer24 + integer15 * integer26, integer25 + integer16, integer13 + integer15 * integer27);
-                this.level.setBlock(a14, byj21, 18);
+                this.level.setBlock(a14, cfj21, 18);
             }
         }
         return true;
diff --git a/src/net/minecraft/world/level/PotentialCalculator.java b/src/net/minecraft/world/level/PotentialCalculator.java
new file mode 100644
index 0000000..2ebe135
--- /dev/null
+++ b/src/net/minecraft/world/level/PotentialCalculator.java
@@ -0,0 +1,50 @@
+package net.minecraft.world.level;
+
+import net.minecraft.core.Vec3i;
+import java.util.Iterator;
+import net.minecraft.core.BlockPos;
+import com.google.common.collect.Lists;
+import java.util.List;
+
+public class PotentialCalculator {
+    private final List<PointCharge> charges;
+    
+    public PotentialCalculator() {
+        this.charges = Lists.newArrayList();
+    }
+    
+    public void addCharge(final BlockPos fu, final double double2) {
+        if (double2 != 0.0) {
+            this.charges.add(new PointCharge(fu, double2));
+        }
+    }
+    
+    public double getPotentialEnergyChange(final BlockPos fu, final double double2) {
+        if (double2 == 0.0) {
+            return 0.0;
+        }
+        double double3 = 0.0;
+        for (final PointCharge a8 : this.charges) {
+            double3 += a8.getPotentialChange(fu);
+        }
+        return double3 * double2;
+    }
+    
+    static class PointCharge {
+        private final BlockPos pos;
+        private final double charge;
+        
+        public PointCharge(final BlockPos fu, final double double2) {
+            this.pos = fu;
+            this.charge = double2;
+        }
+        
+        public double getPotentialChange(final BlockPos fu) {
+            final double double3 = this.pos.distSqr(fu);
+            if (double3 == 0.0) {
+                return Double.POSITIVE_INFINITY;
+            }
+            return this.charge / Math.sqrt(double3);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/ServerTickList.java b/src/net/minecraft/world/level/ServerTickList.java
index 01378a2..fa0e165 100644
--- a/src/net/minecraft/world/level/ServerTickList.java
+++ b/src/net/minecraft/world/level/ServerTickList.java
@@ -8,7 +8,6 @@ import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.Collection;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Iterator;
 import net.minecraft.server.level.ServerChunkCache;
@@ -33,7 +32,6 @@ import java.util.function.Predicate;
 public class ServerTickList<T> implements TickList<T> {
     protected final Predicate<T> ignore;
     private final Function<T, ResourceLocation> toId;
-    private final Function<ResourceLocation, T> fromId;
     private final Set<TickNextTickData<T>> tickNextTickSet;
     private final TreeSet<TickNextTickData<T>> tickNextTickList;
     private final ServerLevel level;
@@ -41,15 +39,14 @@ public class ServerTickList<T> implements TickList<T> {
     private final List<TickNextTickData<T>> alreadyTicked;
     private final Consumer<TickNextTickData<T>> ticker;
     
-    public ServerTickList(final ServerLevel xd, final Predicate<T> predicate, final Function<T, ResourceLocation> function3, final Function<ResourceLocation, T> function4, final Consumer<TickNextTickData<T>> consumer) {
+    public ServerTickList(final ServerLevel zd, final Predicate<T> predicate, final Function<T, ResourceLocation> function, final Consumer<TickNextTickData<T>> consumer) {
         this.tickNextTickSet = Sets.newHashSet();
         this.tickNextTickList = Sets.<TickNextTickData<T>>newTreeSet(TickNextTickData.createTimeComparator());
         this.currentlyTicking = Queues.newArrayDeque();
         this.alreadyTicked = Lists.newArrayList();
         this.ignore = predicate;
-        this.toId = function3;
-        this.fromId = function4;
-        this.level = xd;
+        this.toId = function;
+        this.level = zd;
         this.ticker = consumer;
     }
     
@@ -61,39 +58,39 @@ public class ServerTickList<T> implements TickList<T> {
         if (integer2 > 65536) {
             integer2 = 65536;
         }
-        final ServerChunkCache xb3 = this.level.getChunkSource();
+        final ServerChunkCache zb3 = this.level.getChunkSource();
         final Iterator<TickNextTickData<T>> iterator4 = this.tickNextTickList.iterator();
         this.level.getProfiler().push("cleaning");
         while (integer2 > 0 && iterator4.hasNext()) {
-            final TickNextTickData<T> bkm5 = iterator4.next();
-            if (bkm5.delay > this.level.getGameTime()) {
+            final TickNextTickData<T> bqs5 = iterator4.next();
+            if (bqs5.triggerTick > this.level.getGameTime()) {
                 break;
             }
-            if (!xb3.isTickingChunk(bkm5.pos)) {
+            if (!zb3.isTickingChunk(bqs5.pos)) {
                 continue;
             }
             iterator4.remove();
-            this.tickNextTickSet.remove(bkm5);
-            this.currentlyTicking.add(bkm5);
+            this.tickNextTickSet.remove(bqs5);
+            this.currentlyTicking.add(bqs5);
             --integer2;
         }
         this.level.getProfiler().popPush("ticking");
-        TickNextTickData<T> bkm5;
-        while ((bkm5 = this.currentlyTicking.poll()) != null) {
-            if (xb3.isTickingChunk(bkm5.pos)) {
+        TickNextTickData<T> bqs5;
+        while ((bqs5 = this.currentlyTicking.poll()) != null) {
+            if (zb3.isTickingChunk(bqs5.pos)) {
                 try {
-                    this.alreadyTicked.add(bkm5);
-                    this.ticker.accept(bkm5);
+                    this.alreadyTicked.add(bqs5);
+                    this.ticker.accept(bqs5);
                     continue;
                 }
                 catch (Throwable throwable6) {
-                    final CrashReport h7 = CrashReport.forThrowable(throwable6, "Exception while ticking");
-                    final CrashReportCategory i8 = h7.addCategory("Block being ticked");
-                    CrashReportCategory.populateBlockDetails(i8, bkm5.pos, null);
-                    throw new ReportedException(h7);
+                    final CrashReport j7 = CrashReport.forThrowable(throwable6, "Exception while ticking");
+                    final CrashReportCategory k8 = j7.addCategory("Block being ticked");
+                    CrashReportCategory.populateBlockDetails(k8, bqs5.pos, null);
+                    throw new ReportedException(j7);
                 }
             }
-            this.scheduleTick(bkm5.pos, bkm5.getType(), 0);
+            this.scheduleTick(bqs5.pos, bqs5.getType(), 0);
         }
         this.level.getProfiler().pop();
         this.alreadyTicked.clear();
@@ -101,101 +98,96 @@ public class ServerTickList<T> implements TickList<T> {
     }
     
     @Override
-    public boolean willTickThisTick(final BlockPos fk, final T object) {
-        return this.currentlyTicking.contains(new TickNextTickData(fk, object));
+    public boolean willTickThisTick(final BlockPos fu, final T object) {
+        return this.currentlyTicking.contains(new TickNextTickData(fu, object));
     }
     
-    @Override
-    public void addAll(final Stream<TickNextTickData<T>> stream) {
-        stream.forEach(this::addTickData);
-    }
-    
-    public List<TickNextTickData<T>> fetchTicksInChunk(final ChunkPos bjh, final boolean boolean2, final boolean boolean3) {
-        final int integer5 = (bjh.x << 4) - 2;
+    public List<TickNextTickData<T>> fetchTicksInChunk(final ChunkPos bph, final boolean boolean2, final boolean boolean3) {
+        final int integer5 = (bph.x << 4) - 2;
         final int integer6 = integer5 + 16 + 2;
-        final int integer7 = (bjh.z << 4) - 2;
+        final int integer7 = (bph.z << 4) - 2;
         final int integer8 = integer7 + 16 + 2;
         return this.fetchTicksInArea(new BoundingBox(integer5, 0, integer7, integer6, 256, integer8), boolean2, boolean3);
     }
     
-    public List<TickNextTickData<T>> fetchTicksInArea(final BoundingBox clb, final boolean boolean2, final boolean boolean3) {
-        List<TickNextTickData<T>> list5 = this.fetchTicksInArea(null, this.tickNextTickList, clb, boolean2);
+    public List<TickNextTickData<T>> fetchTicksInArea(final BoundingBox ctd, final boolean boolean2, final boolean boolean3) {
+        List<TickNextTickData<T>> list5 = this.fetchTicksInArea(null, this.tickNextTickList, ctd, boolean2);
         if (boolean2 && list5 != null) {
             this.tickNextTickSet.removeAll(list5);
         }
-        list5 = this.fetchTicksInArea(list5, this.currentlyTicking, clb, boolean2);
+        list5 = this.fetchTicksInArea(list5, this.currentlyTicking, ctd, boolean2);
         if (!boolean3) {
-            list5 = this.fetchTicksInArea(list5, this.alreadyTicked, clb, boolean2);
+            list5 = this.fetchTicksInArea(list5, this.alreadyTicked, ctd, boolean2);
         }
         return (list5 == null) ? Collections.<TickNextTickData<T>>emptyList() : list5;
     }
     
     @Nullable
-    private List<TickNextTickData<T>> fetchTicksInArea(@Nullable List<TickNextTickData<T>> list, final Collection<TickNextTickData<T>> collection, final BoundingBox clb, final boolean boolean4) {
+    private List<TickNextTickData<T>> fetchTicksInArea(@Nullable List<TickNextTickData<T>> list, final Collection<TickNextTickData<T>> collection, final BoundingBox ctd, final boolean boolean4) {
         final Iterator<TickNextTickData<T>> iterator6 = collection.iterator();
         while (iterator6.hasNext()) {
-            final TickNextTickData<T> bkm7 = iterator6.next();
-            final BlockPos fk8 = bkm7.pos;
-            if (fk8.getX() >= clb.x0 && fk8.getX() < clb.x1 && fk8.getZ() >= clb.z0 && fk8.getZ() < clb.z1) {
+            final TickNextTickData<T> bqs7 = iterator6.next();
+            final BlockPos fu8 = bqs7.pos;
+            if (fu8.getX() >= ctd.x0 && fu8.getX() < ctd.x1 && fu8.getZ() >= ctd.z0 && fu8.getZ() < ctd.z1) {
                 if (boolean4) {
                     iterator6.remove();
                 }
                 if (list == null) {
                     list = Lists.newArrayList();
                 }
-                list.add(bkm7);
+                list.add(bqs7);
             }
         }
         return list;
     }
     
-    public void copy(final BoundingBox clb, final BlockPos fk) {
-        final List<TickNextTickData<T>> list4 = this.fetchTicksInArea(clb, false, false);
-        for (final TickNextTickData<T> bkm6 : list4) {
-            if (clb.isInside(bkm6.pos)) {
-                final BlockPos fk2 = bkm6.pos.offset(fk);
-                final T object8 = bkm6.getType();
-                this.addTickData(new TickNextTickData<T>(fk2, object8, bkm6.delay, bkm6.priority));
+    public void copy(final BoundingBox ctd, final BlockPos fu) {
+        final List<TickNextTickData<T>> list4 = this.fetchTicksInArea(ctd, false, false);
+        for (final TickNextTickData<T> bqs6 : list4) {
+            if (ctd.isInside(bqs6.pos)) {
+                final BlockPos fu2 = bqs6.pos.offset(fu);
+                final T object8 = bqs6.getType();
+                this.addTickData(new TickNextTickData<T>(fu2, object8, bqs6.triggerTick, bqs6.priority));
             }
         }
     }
     
-    public ListTag save(final ChunkPos bjh) {
-        final List<TickNextTickData<T>> list3 = this.fetchTicksInChunk(bjh, false, true);
+    public ListTag save(final ChunkPos bph) {
+        final List<TickNextTickData<T>> list3 = this.fetchTicksInChunk(bph, false, true);
         return ServerTickList.<T>saveTickList(this.toId, list3, this.level.getGameTime());
     }
     
-    public static <T> ListTag saveTickList(final Function<T, ResourceLocation> function, final Iterable<TickNextTickData<T>> iterable, final long long3) {
-        final ListTag jz5 = new ListTag();
-        for (final TickNextTickData<T> bkm7 : iterable) {
-            final CompoundTag jt8 = new CompoundTag();
-            jt8.putString("i", function.apply(bkm7.getType()).toString());
-            jt8.putInt("x", bkm7.pos.getX());
-            jt8.putInt("y", bkm7.pos.getY());
-            jt8.putInt("z", bkm7.pos.getZ());
-            jt8.putInt("t", (int)(bkm7.delay - long3));
-            jt8.putInt("p", bkm7.priority.getValue());
-            ((AbstractList<CompoundTag>)jz5).add(jt8);
+    private static <T> ListTag saveTickList(final Function<T, ResourceLocation> function, final Iterable<TickNextTickData<T>> iterable, final long long3) {
+        final ListTag lk5 = new ListTag();
+        for (final TickNextTickData<T> bqs7 : iterable) {
+            final CompoundTag le8 = new CompoundTag();
+            le8.putString("i", function.apply(bqs7.getType()).toString());
+            le8.putInt("x", bqs7.pos.getX());
+            le8.putInt("y", bqs7.pos.getY());
+            le8.putInt("z", bqs7.pos.getZ());
+            le8.putInt("t", (int)(bqs7.triggerTick - long3));
+            le8.putInt("p", bqs7.priority.getValue());
+            ((AbstractList<CompoundTag>)lk5).add(le8);
         }
-        return jz5;
+        return lk5;
     }
     
     @Override
-    public boolean hasScheduledTick(final BlockPos fk, final T object) {
-        return this.tickNextTickSet.contains(new TickNextTickData(fk, object));
+    public boolean hasScheduledTick(final BlockPos fu, final T object) {
+        return this.tickNextTickSet.contains(new TickNextTickData(fu, object));
     }
     
     @Override
-    public void scheduleTick(final BlockPos fk, final T object, final int integer, final TickPriority bkn) {
+    public void scheduleTick(final BlockPos fu, final T object, final int integer, final TickPriority bqt) {
         if (!this.ignore.test(object)) {
-            this.addTickData(new TickNextTickData<T>(fk, object, integer + this.level.getGameTime(), bkn));
+            this.addTickData(new TickNextTickData<T>(fu, object, integer + this.level.getGameTime(), bqt));
         }
     }
     
-    private void addTickData(final TickNextTickData<T> bkm) {
-        if (!this.tickNextTickSet.contains(bkm)) {
-            this.tickNextTickSet.add(bkm);
-            this.tickNextTickList.add(bkm);
+    private void addTickData(final TickNextTickData<T> bqs) {
+        if (!this.tickNextTickSet.contains(bqs)) {
+            this.tickNextTickSet.add(bqs);
+            this.tickNextTickList.add(bqs);
         }
     }
     
diff --git a/src/net/minecraft/world/level/SpawnData.java b/src/net/minecraft/world/level/SpawnData.java
index f0ebe61..c8f6f25 100644
--- a/src/net/minecraft/world/level/SpawnData.java
+++ b/src/net/minecraft/world/level/SpawnData.java
@@ -13,26 +13,27 @@ public class SpawnData extends WeighedRandom.WeighedRandomItem {
         (this.tag = new CompoundTag()).putString("id", "minecraft:pig");
     }
     
-    public SpawnData(final CompoundTag jt) {
-        this(jt.contains("Weight", 99) ? jt.getInt("Weight") : 1, jt.getCompound("Entity"));
+    public SpawnData(final CompoundTag le) {
+        this(le.contains("Weight", 99) ? le.getInt("Weight") : 1, le.getCompound("Entity"));
     }
     
-    public SpawnData(final int integer, final CompoundTag jt) {
+    public SpawnData(final int integer, final CompoundTag le) {
         super(integer);
-        this.tag = jt;
+        this.tag = le;
+        final ResourceLocation uh4 = ResourceLocation.tryParse(le.getString("id"));
+        if (uh4 != null) {
+            le.putString("id", uh4.toString());
+        }
+        else {
+            le.putString("id", "minecraft:pig");
+        }
     }
     
     public CompoundTag save() {
-        final CompoundTag jt2 = new CompoundTag();
-        if (!this.tag.contains("id", 8)) {
-            this.tag.putString("id", "minecraft:pig");
-        }
-        else if (!this.tag.getString("id").contains(":")) {
-            this.tag.putString("id", new ResourceLocation(this.tag.getString("id")).toString());
-        }
-        jt2.put("Entity", this.tag);
-        jt2.putInt("Weight", this.weight);
-        return jt2;
+        final CompoundTag le2 = new CompoundTag();
+        le2.put("Entity", this.tag);
+        le2.putInt("Weight", this.weight);
+        return le2;
     }
     
     public CompoundTag getTag() {
diff --git a/src/net/minecraft/world/level/StructureFeatureManager.java b/src/net/minecraft/world/level/StructureFeatureManager.java
new file mode 100644
index 0000000..3485aa1
--- /dev/null
+++ b/src/net/minecraft/world/level/StructureFeatureManager.java
@@ -0,0 +1,58 @@
+package net.minecraft.world.level;
+
+import net.minecraft.world.level.levelgen.structure.StructurePiece;
+import java.util.Optional;
+import com.mojang.datafixers.DataFixUtils;
+import net.minecraft.core.Vec3i;
+import net.minecraft.core.BlockPos;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.chunk.FeatureAccess;
+import net.minecraft.world.level.chunk.ChunkStatus;
+import net.minecraft.world.level.levelgen.structure.StructureStart;
+import java.util.stream.Stream;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import net.minecraft.core.SectionPos;
+import net.minecraft.server.level.WorldGenRegion;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+
+public class StructureFeatureManager {
+    private final LevelAccessor level;
+    private final WorldGenSettings worldGenSettings;
+    
+    public StructureFeatureManager(final LevelAccessor bqc, final WorldGenSettings cix) {
+        this.level = bqc;
+        this.worldGenSettings = cix;
+    }
+    
+    public StructureFeatureManager forWorldGenRegion(final WorldGenRegion zj) {
+        if (zj.getLevel() != this.level) {
+            throw new IllegalStateException("Using invalid feature manager (source level: " + zj.getLevel() + ", region: " + zj);
+        }
+        return new StructureFeatureManager(zj, this.worldGenSettings);
+    }
+    
+    public Stream<? extends StructureStart<?>> startsForFeature(final SectionPos go, final StructureFeature<?> cml) {
+        return this.level.getChunk(go.x(), go.z(), ChunkStatus.STRUCTURE_REFERENCES).getReferencesForFeature(cml).stream().map(long1 -> SectionPos.of(new ChunkPos(long1), 0)).map(go -> this.getStartForFeature(go, cml, this.level.getChunk(go.x(), go.z(), ChunkStatus.STRUCTURE_STARTS))).filter(ctz -> ctz != null && ctz.isValid());
+    }
+    
+    @Nullable
+    public StructureStart<?> getStartForFeature(final SectionPos go, final StructureFeature<?> cml, final FeatureAccess chf) {
+        return chf.getStartForFeature(cml);
+    }
+    
+    public void setStartForFeature(final SectionPos go, final StructureFeature<?> cml, final StructureStart<?> ctz, final FeatureAccess chf) {
+        chf.setStartForFeature(cml, ctz);
+    }
+    
+    public void addReferenceForFeature(final SectionPos go, final StructureFeature<?> cml, final long long3, final FeatureAccess chf) {
+        chf.addReferenceForFeature(cml, long3);
+    }
+    
+    public boolean shouldGenerateFeatures() {
+        return this.worldGenSettings.generateFeatures();
+    }
+    
+    public StructureStart<?> getStructureAt(final BlockPos fu, final boolean boolean2, final StructureFeature<?> cml) {
+        return DataFixUtils.orElse((Optional)this.startsForFeature(SectionPos.of(fu), cml).filter(ctz -> ctz.getBoundingBox().isInside(fu)).filter(ctz -> !boolean2 || ctz.getPieces().stream().anyMatch(cty -> cty.getBoundingBox().isInside(fu))).findFirst(), StructureStart.INVALID_START);
+    }
+}
diff --git a/src/net/minecraft/world/level/TickList.java b/src/net/minecraft/world/level/TickList.java
index 865184d..0094747 100644
--- a/src/net/minecraft/world/level/TickList.java
+++ b/src/net/minecraft/world/level/TickList.java
@@ -1,18 +1,15 @@
 package net.minecraft.world.level;
 
-import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 
 public interface TickList<T> {
-    boolean hasScheduledTick(final BlockPos fk, final T object);
+    boolean hasScheduledTick(final BlockPos fu, final T object);
     
-    default void scheduleTick(final BlockPos fk, final T object, final int integer) {
-        this.scheduleTick(fk, object, integer, TickPriority.NORMAL);
+    default void scheduleTick(final BlockPos fu, final T object, final int integer) {
+        this.scheduleTick(fu, object, integer, TickPriority.NORMAL);
     }
     
-    void scheduleTick(final BlockPos fk, final T object, final int integer, final TickPriority bkn);
+    void scheduleTick(final BlockPos fu, final T object, final int integer, final TickPriority bqt);
     
-    boolean willTickThisTick(final BlockPos fk, final T object);
-    
-    void addAll(final Stream<TickNextTickData<T>> stream);
+    boolean willTickThisTick(final BlockPos fu, final T object);
 }
diff --git a/src/net/minecraft/world/level/TickNextTickData.java b/src/net/minecraft/world/level/TickNextTickData.java
index ad40f7f..7b5883f 100644
--- a/src/net/minecraft/world/level/TickNextTickData.java
+++ b/src/net/minecraft/world/level/TickNextTickData.java
@@ -7,27 +7,27 @@ public class TickNextTickData<T> {
     private static long counter;
     private final T type;
     public final BlockPos pos;
-    public final long delay;
+    public final long triggerTick;
     public final TickPriority priority;
     private final long c;
     
-    public TickNextTickData(final BlockPos fk, final T object) {
-        this(fk, object, 0L, TickPriority.NORMAL);
+    public TickNextTickData(final BlockPos fu, final T object) {
+        this(fu, object, 0L, TickPriority.NORMAL);
     }
     
-    public TickNextTickData(final BlockPos fk, final T object, final long long3, final TickPriority bkn) {
+    public TickNextTickData(final BlockPos fu, final T object, final long long3, final TickPriority bqt) {
         this.c = TickNextTickData.counter++;
-        this.pos = fk.immutable();
+        this.pos = fu.immutable();
         this.type = object;
-        this.delay = long3;
-        this.priority = bkn;
+        this.triggerTick = long3;
+        this.priority = bqt;
     }
     
     @Override
     public boolean equals(final Object object) {
         if (object instanceof TickNextTickData) {
-            final TickNextTickData<?> bkm3 = object;
-            return this.pos.equals(bkm3.pos) && this.type == bkm3.type;
+            final TickNextTickData<?> bqs3 = object;
+            return this.pos.equals(bqs3.pos) && this.type == bqs3.type;
         }
         return false;
     }
@@ -38,12 +38,12 @@ public class TickNextTickData<T> {
     }
     
     public static <T> Comparator<TickNextTickData<T>> createTimeComparator() {
-        return Comparator.<TickNextTickData<T>>comparingLong(bkm -> bkm.delay).<Comparable>thenComparing(bkm -> bkm.priority).thenComparingLong(bkm -> bkm.c);
+        return Comparator.<TickNextTickData<T>>comparingLong(bqs -> bqs.triggerTick).<Comparable>thenComparing(bqs -> bqs.priority).thenComparingLong(bqs -> bqs.c);
     }
     
     @Override
     public String toString() {
-        return this.type + ": " + this.pos + ", " + this.delay + ", " + this.priority + ", " + this.c;
+        return this.type + ": " + this.pos + ", " + this.triggerTick + ", " + this.priority + ", " + this.c;
     }
     
     public T getType() {
diff --git a/src/net/minecraft/world/level/TickPriority.java b/src/net/minecraft/world/level/TickPriority.java
index a62c9f9..4d5993c 100644
--- a/src/net/minecraft/world/level/TickPriority.java
+++ b/src/net/minecraft/world/level/TickPriority.java
@@ -16,9 +16,9 @@ public enum TickPriority {
     }
     
     public static TickPriority byValue(final int integer) {
-        for (final TickPriority bkn5 : values()) {
-            if (bkn5.value == integer) {
-                return bkn5;
+        for (final TickPriority bqt5 : values()) {
+            if (bqt5.value == integer) {
+                return bqt5;
             }
         }
         if (integer < TickPriority.EXTREMELY_HIGH.value) {
diff --git a/src/net/minecraft/world/level/WorldGenLevel.java b/src/net/minecraft/world/level/WorldGenLevel.java
new file mode 100644
index 0000000..387202d
--- /dev/null
+++ b/src/net/minecraft/world/level/WorldGenLevel.java
@@ -0,0 +1,5 @@
+package net.minecraft.world.level;
+
+public interface WorldGenLevel extends LevelAccessor {
+    long getSeed();
+}
diff --git a/src/net/minecraft/world/level/biome/AmbientAdditionsSettings.java b/src/net/minecraft/world/level/biome/AmbientAdditionsSettings.java
new file mode 100644
index 0000000..2bd4d66
--- /dev/null
+++ b/src/net/minecraft/world/level/biome/AmbientAdditionsSettings.java
@@ -0,0 +1,31 @@
+package net.minecraft.world.level.biome;
+
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.sounds.SoundEvent;
+import com.mojang.serialization.Codec;
+
+public class AmbientAdditionsSettings {
+    public static final Codec<AmbientAdditionsSettings> CODEC;
+    private SoundEvent soundEvent;
+    private double tickChance;
+    
+    public AmbientAdditionsSettings(final SoundEvent ack, final double double2) {
+        this.soundEvent = ack;
+        this.tickChance = double2;
+    }
+    
+    public SoundEvent getSoundEvent() {
+        return this.soundEvent;
+    }
+    
+    public double getTickChance() {
+        return this.tickChance;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)SoundEvent.CODEC.fieldOf("sound").forGetter(bqv -> bqv.soundEvent), (App)Codec.DOUBLE.fieldOf("tick_chance").forGetter(bqv -> bqv.tickChance)).apply(instance, (BiFunction)AmbientAdditionsSettings::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/biome/AmbientMoodSettings.java b/src/net/minecraft/world/level/biome/AmbientMoodSettings.java
new file mode 100644
index 0000000..4ecc452
--- /dev/null
+++ b/src/net/minecraft/world/level/biome/AmbientMoodSettings.java
@@ -0,0 +1,45 @@
+package net.minecraft.world.level.biome;
+
+import net.minecraft.sounds.SoundEvents;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.sounds.SoundEvent;
+import com.mojang.serialization.Codec;
+
+public class AmbientMoodSettings {
+    public static final Codec<AmbientMoodSettings> CODEC;
+    public static final AmbientMoodSettings LEGACY_CAVE_SETTINGS;
+    private SoundEvent soundEvent;
+    private int tickDelay;
+    private int blockSearchExtent;
+    private double soundPositionOffset;
+    
+    public AmbientMoodSettings(final SoundEvent ack, final int integer2, final int integer3, final double double4) {
+        this.soundEvent = ack;
+        this.tickDelay = integer2;
+        this.blockSearchExtent = integer3;
+        this.soundPositionOffset = double4;
+    }
+    
+    public SoundEvent getSoundEvent() {
+        return this.soundEvent;
+    }
+    
+    public int getTickDelay() {
+        return this.tickDelay;
+    }
+    
+    public int getBlockSearchExtent() {
+        return this.blockSearchExtent;
+    }
+    
+    public double getSoundPositionOffset() {
+        return this.soundPositionOffset;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)SoundEvent.CODEC.fieldOf("sound").forGetter(bqw -> bqw.soundEvent), (App)Codec.INT.fieldOf("tick_delay").forGetter(bqw -> bqw.tickDelay), (App)Codec.INT.fieldOf("block_search_extent").forGetter(bqw -> bqw.blockSearchExtent), (App)Codec.DOUBLE.fieldOf("offset").forGetter(bqw -> bqw.soundPositionOffset)).apply(instance, AmbientMoodSettings::new));
+        LEGACY_CAVE_SETTINGS = new AmbientMoodSettings(SoundEvents.AMBIENT_CAVE, 6000, 8, 2.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/biome/AmbientParticleSettings.java b/src/net/minecraft/world/level/biome/AmbientParticleSettings.java
new file mode 100644
index 0000000..b878185
--- /dev/null
+++ b/src/net/minecraft/world/level/biome/AmbientParticleSettings.java
@@ -0,0 +1,33 @@
+package net.minecraft.world.level.biome;
+
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import net.minecraft.core.particles.ParticleTypes;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.Random;
+import net.minecraft.core.particles.ParticleOptions;
+import com.mojang.serialization.Codec;
+
+public class AmbientParticleSettings {
+    public static final Codec<AmbientParticleSettings> CODEC;
+    private final ParticleOptions options;
+    private final float probability;
+    
+    public AmbientParticleSettings(final ParticleOptions hf, final float float2) {
+        this.options = hf;
+        this.probability = float2;
+    }
+    
+    public ParticleOptions getOptions() {
+        return this.options;
+    }
+    
+    public boolean canSpawn(final Random random) {
+        return random.nextFloat() <= this.probability;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)ParticleTypes.CODEC.fieldOf("options").forGetter(bqx -> bqx.options), (App)Codec.FLOAT.fieldOf("probability").forGetter(bqx -> bqx.probability)).apply(instance, (BiFunction)AmbientParticleSettings::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/biome/BadlandsBiome.java b/src/net/minecraft/world/level/biome/BadlandsBiome.java
index eef6129..9bc6bdb 100644
--- a/src/net/minecraft/world/level/biome/BadlandsBiome.java
+++ b/src/net/minecraft/world/level/biome/BadlandsBiome.java
@@ -2,21 +2,18 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class BadlandsBiome extends Biome {
     public BadlandsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(0.1f).scale(0.2f).temperature(2.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.MESA)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(0.1f).scale(0.2f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(-0.25f, -0.5f, 0.5f, 0.2f, 1.0f))));
+        BiomeDefaultFeatures.addDefaultOverworldLandMesaStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/BadlandsPlateauBiome.java b/src/net/minecraft/world/level/biome/BadlandsPlateauBiome.java
index 51a46d8..e1e5529 100644
--- a/src/net/minecraft/world/level/biome/BadlandsPlateauBiome.java
+++ b/src/net/minecraft/world/level/biome/BadlandsPlateauBiome.java
@@ -2,21 +2,18 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class BadlandsPlateauBiome extends Biome {
     public BadlandsPlateauBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(1.5f).scale(0.025f).temperature(2.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.MESA)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(1.5f).scale(0.025f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(-0.25f, -0.5f, 0.65f, 0.2f, 1.0f))));
+        BiomeDefaultFeatures.addDefaultOverworldLandMesaStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/BambooJungleBiome.java b/src/net/minecraft/world/level/biome/BambooJungleBiome.java
index 479e785..00f3d58 100644
--- a/src/net/minecraft/world/level/biome/BambooJungleBiome.java
+++ b/src/net/minecraft/world/level/biome/BambooJungleBiome.java
@@ -2,22 +2,19 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class BambooJungleBiome extends Biome {
     public BambooJungleBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.1f).scale(0.2f).temperature(0.95f).downfall(0.9f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.JUNGLE_TEMPLE.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.1f).scale(0.2f).temperature(0.95f).downfall(0.9f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.5f, 0.5f, 0.0f, 0.2f, 1.0f))));
+        this.addStructureStart(BiomeDefaultFeatures.JUNGLE_TEMPLE);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_JUNGLE);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/BambooJungleHillsBiome.java b/src/net/minecraft/world/level/biome/BambooJungleHillsBiome.java
index f15c4a9..955c9fe 100644
--- a/src/net/minecraft/world/level/biome/BambooJungleHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/BambooJungleHillsBiome.java
@@ -2,22 +2,19 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class BambooJungleHillsBiome extends Biome {
     public BambooJungleHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.45f).scale(0.3f).temperature(0.95f).downfall(0.9f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.JUNGLE_TEMPLE.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.45f).scale(0.3f).temperature(0.95f).downfall(0.9f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.5f, 0.5f, 0.25f, 0.2f, 1.0f))));
+        this.addStructureStart(BiomeDefaultFeatures.JUNGLE_TEMPLE);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_JUNGLE);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/BasaltDeltasBiome.java b/src/net/minecraft/world/level/biome/BasaltDeltasBiome.java
new file mode 100644
index 0000000..50b63f2
--- /dev/null
+++ b/src/net/minecraft/world/level/biome/BasaltDeltasBiome.java
@@ -0,0 +1,55 @@
+package net.minecraft.world.level.biome;
+
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
+import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
+import net.minecraft.world.level.levelgen.carver.WorldCarver;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.sounds.Musics;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
+import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
+
+public class BasaltDeltasBiome extends Biome {
+    protected BasaltDeltasBiome() {
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.BASALT_DELTAS, SurfaceBuilder.CONFIG_BASALT_DELTAS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.NETHER).depth(0.1f).scale(0.2f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(4341314).fogColor(6840176).ambientParticle(new AmbientParticleSettings(ParticleTypes.WHITE_ASH, 0.118093334f)).ambientLoopSound(SoundEvents.AMBIENT_BASALT_DELTAS_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_BASALT_DELTAS_MOOD, 6000, 8, 2.0)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_BASALT_DELTAS_ADDITIONS, 0.0111)).backgroundMusic(Musics.createGameMusic(SoundEvents.MUSIC_BIOME_BASALT_DELTAS)).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(-0.5f, 0.0f, 0.0f, 0.0f, 0.175f))));
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_NETHER);
+        this.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.NETHER_CAVE, (C)new ProbabilityFeatureConfiguration(0.2f)));
+        this.addStructureStart(BiomeDefaultFeatures.NETHER_BRIDGE);
+        this.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.DELTA_FEATURE.configured(BiomeDefaultFeatures.BASALT_DELTA_FEATURE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(40))));
+        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.LAVA_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_VERY_BIASED_RANGE.configured(new CountRangeDecoratorConfiguration(40, 8, 16, 256))));
+        this.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.BASALT_COLUMNS.configured(BiomeDefaultFeatures.SMALL_BASALT_COLUMN_FEATURE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(4))));
+        this.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.BASALT_COLUMNS.configured(BiomeDefaultFeatures.LARGE_BASALT_COLUMN_FEATURE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(2))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.REPLACE_BLOBS.configured(BiomeDefaultFeatures.BASALT_BLOBS_FEATURE_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(75, 0, 0, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.REPLACE_BLOBS.configured(BiomeDefaultFeatures.BLACKSTONE_BLOBS_FEATURE_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(25, 0, 0, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.BASALT_DELTA_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(16, 4, 8, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.FIRE_CONFIG).decorated(FeatureDecorator.FIRE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SOUL_FIRE_CONFIG).decorated(FeatureDecorator.FIRE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.GLOWSTONE_BLOB.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.LIGHT_GEM_CHANCE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.GLOWSTONE_BLOB.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.CHANCE_RANGE.configured(new ChanceRangeDecoratorConfiguration(0.5f, 0, 0, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.CHANCE_RANGE.configured(new ChanceRangeDecoratorConfiguration(0.5f, 0, 0, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, Blocks.MAGMA_BLOCK.defaultBlockState(), 33)).decorated(FeatureDecorator.MAGMA.configured(new FrequencyDecoratorConfiguration(4))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.CLOSED_NETHER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(32, 10, 20, 128))));
+        BiomeDefaultFeatures.addNetherOres(this, 20, 32);
+        BiomeDefaultFeatures.addAncientDebris(this);
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.GHAST, 40, 1, 1));
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.MAGMA_CUBE, 100, 2, 5));
+        this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.STRIDER, 60, 1, 2));
+    }
+}
diff --git a/src/net/minecraft/world/level/biome/BeachBiome.java b/src/net/minecraft/world/level/biome/BeachBiome.java
index 9dcddf9..9e9af01 100644
--- a/src/net/minecraft/world/level/biome/BeachBiome.java
+++ b/src/net/minecraft/world/level/biome/BeachBiome.java
@@ -2,22 +2,20 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class BeachBiome extends Biome {
     public BeachBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_DESERT).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.BEACH).depth(0.0f).scale(0.025f).temperature(0.8f).downfall(0.4f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<BuriedTreasureConfiguration>addStructureStart(Feature.BURIED_TREASURE.configured(new BuriedTreasureConfiguration(0.01f)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(true)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_DESERT).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.BEACH).depth(0.0f).scale(0.025f).temperature(0.8f).downfall(0.4f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.0f, 0.0f, -0.1f, 0.0f, 0.9935f))));
+        this.addStructureStart(BiomeDefaultFeatures.MINESHAFT);
+        this.addStructureStart(BiomeDefaultFeatures.BURIED_TREASURE);
+        this.addStructureStart(BiomeDefaultFeatures.SHIPWRECH_BEACHED);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/Biome.java b/src/net/minecraft/world/level/biome/Biome.java
index f48cdbc..90357b4 100644
--- a/src/net/minecraft/world/level/biome/Biome.java
+++ b/src/net/minecraft/world/level/biome/Biome.java
@@ -1,14 +1,21 @@
 package net.minecraft.world.level.biome;
 
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.util.WeighedRandom;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 import java.util.Arrays;
 import com.google.common.collect.Sets;
 import org.apache.logging.log4j.LogManager;
+import net.minecraft.resources.ResourceLocation;
+import com.mojang.datafixers.kinds.Applicative;
+import java.util.stream.Collector;
+import java.util.Comparator;
+import net.minecraft.util.StringRepresentable;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.structure.StructureStart;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration;
+import net.minecraft.sounds.Music;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -18,11 +25,13 @@ import java.util.Iterator;
 import net.minecraft.ReportedException;
 import net.minecraft.CrashReport;
 import java.util.Random;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.core.SectionPos;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.StructureFeatureManager;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.state.BlockState;
@@ -32,15 +41,24 @@ import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
+import java.util.function.Consumer;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import java.util.stream.Stream;
+import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.function.Function;
+import java.util.Optional;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.Util;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Lists;
 import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
 import net.minecraft.world.level.levelgen.carver.WorldCarver;
 import net.minecraft.core.Registry;
 import it.unimi.dsi.fastutil.longs.Long2FloatLinkedOpenHashMap;
+import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
@@ -52,10 +70,12 @@ import javax.annotation.Nullable;
 import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise;
 import net.minecraft.core.IdMapper;
 import java.util.Set;
+import com.mojang.serialization.Codec;
 import org.apache.logging.log4j.Logger;
 
-public abstract class Biome {
+public class Biome {
     public static final Logger LOGGER;
+    public static final Codec<Biome> CODEC;
     public static final Set<Biome> EXPLORABLE_BIOMES;
     public static final IdMapper<Biome> MUTATED_BIOMES;
     protected static final PerlinSimplexNoise TEMPERATURE_NOISE;
@@ -66,36 +86,34 @@ public abstract class Biome {
     protected final float scale;
     protected final float temperature;
     protected final float downfall;
-    protected final int waterColor;
-    protected final int waterFogColor;
     private final int skyColor;
     @Nullable
     protected final String parent;
     protected final ConfiguredSurfaceBuilder<?> surfaceBuilder;
     protected final BiomeCategory biomeCategory;
     protected final Precipitation precipitation;
+    protected final BiomeSpecialEffects specialEffects;
     protected final Map<GenerationStep.Carving, List<ConfiguredWorldCarver<?>>> carvers;
     protected final Map<GenerationStep.Decoration, List<ConfiguredFeature<?, ?>>> features;
     protected final List<ConfiguredFeature<?, ?>> flowerFeatures;
-    protected final Map<StructureFeature<?>, FeatureConfiguration> validFeatureStarts;
+    private final Map<StructureFeature<?>, ConfiguredStructureFeature<?, ?>> validFeatureStarts;
     private final Map<MobCategory, List<SpawnerData>> spawners;
+    private final Map<EntityType<?>, MobSpawnCost> mobSpawnCosts;
+    private final List<ClimateParameters> optimalParameters;
     private final ThreadLocal<Long2FloatLinkedOpenHashMap> temperatureCache;
     
     @Nullable
-    public static Biome getMutatedVariant(final Biome bkt) {
-        return Biome.MUTATED_BIOMES.byId(Registry.BIOME.getId(bkt));
+    public static Biome getMutatedVariant(final Biome bre) {
+        return Biome.MUTATED_BIOMES.byId(Registry.BIOME.getId(bre));
     }
     
-    public static <C extends CarverConfiguration> ConfiguredWorldCarver<C> makeCarver(final WorldCarver<C> cco, final C cch) {
-        return new ConfiguredWorldCarver<C>(cco, cch);
+    public static <C extends CarverConfiguration> ConfiguredWorldCarver<C> makeCarver(final WorldCarver<C> cjh, final C cja) {
+        return new ConfiguredWorldCarver<C>(cjh, cja);
     }
     
     protected Biome(final BiomeBuilder a) {
-        this.carvers = Maps.newHashMap();
-        this.features = Maps.newHashMap();
         this.flowerFeatures = Lists.newArrayList();
-        this.validFeatureStarts = Maps.newHashMap();
-        this.spawners = Maps.newHashMap();
+        this.mobSpawnCosts = Maps.newHashMap();
         final Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap2;
         this.temperatureCache = ThreadLocal.<Long2FloatLinkedOpenHashMap>withInitial(() -> Util.<Long2FloatLinkedOpenHashMap>make(() -> {
             long2FloatLinkedOpenHashMap2 = new Long2FloatLinkedOpenHashMap(1024, 0.25f) {
@@ -105,7 +123,7 @@ public abstract class Biome {
             long2FloatLinkedOpenHashMap2.defaultReturnValue(Float.NaN);
             return long2FloatLinkedOpenHashMap2;
         }));
-        if (a.surfaceBuilder == null || a.precipitation == null || a.biomeCategory == null || a.depth == null || a.scale == null || a.temperature == null || a.downfall == null || a.waterColor == null || a.waterFogColor == null) {
+        if (a.surfaceBuilder == null || a.precipitation == null || a.biomeCategory == null || a.depth == null || a.scale == null || a.temperature == null || a.downfall == null || a.specialEffects == null) {
             throw new IllegalStateException("You are missing parameters to build a proper biome for " + this.getClass().getSimpleName() + "\n" + a);
         }
         this.surfaceBuilder = a.surfaceBuilder;
@@ -115,18 +133,52 @@ public abstract class Biome {
         this.scale = a.scale;
         this.temperature = a.temperature;
         this.downfall = a.downfall;
-        this.waterColor = a.waterColor;
-        this.waterFogColor = a.waterFogColor;
         this.skyColor = this.calculateSkyColor();
         this.parent = a.parent;
+        this.optimalParameters = (List<ClimateParameters>)((a.optimalParameters != null) ? a.optimalParameters : ImmutableList.of());
+        this.specialEffects = a.specialEffects;
+        this.carvers = Maps.newHashMap();
+        this.validFeatureStarts = Maps.newHashMap();
+        this.features = Maps.newHashMap();
         for (final GenerationStep.Decoration b6 : GenerationStep.Decoration.values()) {
             this.features.put(b6, Lists.newArrayList());
         }
-        for (final MobCategory alb6 : MobCategory.values()) {
-            this.spawners.put(alb6, Lists.newArrayList());
+        this.spawners = Maps.newHashMap();
+        for (final MobCategory apa6 : MobCategory.values()) {
+            this.spawners.put(apa6, Lists.newArrayList());
         }
     }
     
+    private Biome(final Precipitation f, final BiomeCategory b, final float float3, final float float4, final float float5, final float float6, final BiomeSpecialEffects bri, final int integer, final ConfiguredSurfaceBuilder<?> cvj, final Map<GenerationStep.Carving, List<ConfiguredWorldCarver<?>>> map10, final Map<GenerationStep.Decoration, List<ConfiguredFeature<?, ?>>> map11, final List<ConfiguredStructureFeature<?, ?>> list12, final Map<MobCategory, List<SpawnerData>> map13, final List<ClimateParameters> list14, final Optional<String> optional) {
+        this.flowerFeatures = Lists.newArrayList();
+        this.mobSpawnCosts = Maps.newHashMap();
+        final Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap2;
+        this.temperatureCache = ThreadLocal.<Long2FloatLinkedOpenHashMap>withInitial(() -> Util.<Long2FloatLinkedOpenHashMap>make(() -> {
+            long2FloatLinkedOpenHashMap2 = new Long2FloatLinkedOpenHashMap(1024, 0.25f) {
+                protected void rehash(final int integer) {
+                }
+            };
+            long2FloatLinkedOpenHashMap2.defaultReturnValue(Float.NaN);
+            return long2FloatLinkedOpenHashMap2;
+        }));
+        this.precipitation = f;
+        this.biomeCategory = b;
+        this.depth = float3;
+        this.scale = float4;
+        this.temperature = float5;
+        this.downfall = float6;
+        this.specialEffects = bri;
+        this.skyColor = integer;
+        this.surfaceBuilder = cvj;
+        this.carvers = map10;
+        this.features = map11;
+        this.validFeatureStarts = list12.stream().collect(Collectors.toMap(ckc -> ckc.feature, Function.identity()));
+        this.spawners = map13;
+        this.optimalParameters = list14;
+        this.parent = optional.orElse(null);
+        map11.values().stream().flatMap(Collection::stream).filter(ckb -> ckb.feature == Feature.DECORATED_FLOWER).forEach(this.flowerFeatures::add);
+    }
+    
     public boolean isMutated() {
         return this.parent != null;
     }
@@ -142,12 +194,21 @@ public abstract class Biome {
         return this.skyColor;
     }
     
-    protected void addSpawn(final MobCategory alb, final SpawnerData e) {
-        this.spawners.get(alb).add(e);
+    protected void addSpawn(final MobCategory apa, final SpawnerData g) {
+        this.spawners.get(apa).add(g);
     }
     
-    public List<SpawnerData> getMobs(final MobCategory alb) {
-        return this.spawners.get(alb);
+    protected void addMobCharge(final EntityType<?> aoq, final double double2, final double double3) {
+        this.mobSpawnCosts.put(aoq, new MobSpawnCost(double3, double2));
+    }
+    
+    public List<SpawnerData> getMobs(final MobCategory apa) {
+        return this.spawners.get(apa);
+    }
+    
+    @Nullable
+    public MobSpawnCost getMobSpawnCost(final EntityType<?> aoq) {
+        return this.mobSpawnCosts.get(aoq);
     }
     
     public Precipitation getPrecipitation() {
@@ -162,22 +223,22 @@ public abstract class Biome {
         return 0.1f;
     }
     
-    protected float getTemperatureNoCache(final BlockPos fk) {
-        if (fk.getY() > 64) {
-            final float float3 = (float)(Biome.TEMPERATURE_NOISE.getValue(fk.getX() / 8.0f, fk.getZ() / 8.0f, false) * 4.0);
-            return this.getTemperature() - (float3 + fk.getY() - 64.0f) * 0.05f / 30.0f;
+    protected float getTemperatureNoCache(final BlockPos fu) {
+        if (fu.getY() > 64) {
+            final float float3 = (float)(Biome.TEMPERATURE_NOISE.getValue(fu.getX() / 8.0f, fu.getZ() / 8.0f, false) * 4.0);
+            return this.getTemperature() - (float3 + fu.getY() - 64.0f) * 0.05f / 30.0f;
         }
         return this.getTemperature();
     }
     
-    public final float getTemperature(final BlockPos fk) {
-        final long long3 = fk.asLong();
+    public final float getTemperature(final BlockPos fu) {
+        final long long3 = fu.asLong();
         final Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap5 = this.temperatureCache.get();
         final float float6 = long2FloatLinkedOpenHashMap5.get(long3);
         if (!Float.isNaN(float6)) {
             return float6;
         }
-        final float float7 = this.getTemperatureNoCache(fk);
+        final float float7 = this.getTemperatureNoCache(fu);
         if (long2FloatLinkedOpenHashMap5.size() == 1024) {
             long2FloatLinkedOpenHashMap5.removeFirstFloat();
         }
@@ -185,22 +246,22 @@ public abstract class Biome {
         return float7;
     }
     
-    public boolean shouldFreeze(final LevelReader bjz, final BlockPos fk) {
-        return this.shouldFreeze(bjz, fk, true);
+    public boolean shouldFreeze(final LevelReader bqd, final BlockPos fu) {
+        return this.shouldFreeze(bqd, fu, true);
     }
     
-    public boolean shouldFreeze(final LevelReader bjz, final BlockPos fk, final boolean boolean3) {
-        if (this.getTemperature(fk) >= 0.15f) {
+    public boolean shouldFreeze(final LevelReader bqd, final BlockPos fu, final boolean boolean3) {
+        if (this.getTemperature(fu) >= 0.15f) {
             return false;
         }
-        if (fk.getY() >= 0 && fk.getY() < 256 && bjz.getBrightness(LightLayer.BLOCK, fk) < 10) {
-            final BlockState byj5 = bjz.getBlockState(fk);
-            final FluidState coj6 = bjz.getFluidState(fk);
-            if (coj6.getType() == Fluids.WATER && byj5.getBlock() instanceof LiquidBlock) {
+        if (fu.getY() >= 0 && fu.getY() < 256 && bqd.getBrightness(LightLayer.BLOCK, fu) < 10) {
+            final BlockState cfj5 = bqd.getBlockState(fu);
+            final FluidState cxa6 = bqd.getFluidState(fu);
+            if (cxa6.getType() == Fluids.WATER && cfj5.getBlock() instanceof LiquidBlock) {
                 if (!boolean3) {
                     return true;
                 }
-                final boolean boolean4 = bjz.isWaterAt(fk.west()) && bjz.isWaterAt(fk.east()) && bjz.isWaterAt(fk.north()) && bjz.isWaterAt(fk.south());
+                final boolean boolean4 = bqd.isWaterAt(fu.west()) && bqd.isWaterAt(fu.east()) && bqd.isWaterAt(fu.north()) && bqd.isWaterAt(fu.south());
                 if (!boolean4) {
                     return true;
                 }
@@ -209,45 +270,48 @@ public abstract class Biome {
         return false;
     }
     
-    public boolean shouldSnow(final LevelReader bjz, final BlockPos fk) {
-        if (this.getTemperature(fk) >= 0.15f) {
+    public boolean shouldSnow(final LevelReader bqd, final BlockPos fu) {
+        if (this.getTemperature(fu) >= 0.15f) {
             return false;
         }
-        if (fk.getY() >= 0 && fk.getY() < 256 && bjz.getBrightness(LightLayer.BLOCK, fk) < 10) {
-            final BlockState byj4 = bjz.getBlockState(fk);
-            if (byj4.isAir() && Blocks.SNOW.defaultBlockState().canSurvive(bjz, fk)) {
+        if (fu.getY() >= 0 && fu.getY() < 256 && bqd.getBrightness(LightLayer.BLOCK, fu) < 10) {
+            final BlockState cfj4 = bqd.getBlockState(fu);
+            if (cfj4.isAir() && Blocks.SNOW.defaultBlockState().canSurvive(bqd, fu)) {
                 return true;
             }
         }
         return false;
     }
     
-    public void addFeature(final GenerationStep.Decoration b, final ConfiguredFeature<?, ?> cdc) {
-        if (cdc.feature == Feature.DECORATED_FLOWER) {
-            this.flowerFeatures.add(cdc);
+    public void addFeature(final GenerationStep.Decoration b, final ConfiguredFeature<?, ?> ckb) {
+        if (ckb.feature == Feature.DECORATED_FLOWER) {
+            this.flowerFeatures.add(ckb);
         }
-        this.features.get(b).add(cdc);
+        this.features.get(b).add(ckb);
     }
     
-    public <C extends CarverConfiguration> void addCarver(final GenerationStep.Carving a, final ConfiguredWorldCarver<C> ccj) {
-        this.carvers.computeIfAbsent(a, a -> Lists.newArrayList()).add(ccj);
+    public <C extends CarverConfiguration> void addCarver(final GenerationStep.Carving a, final ConfiguredWorldCarver<C> cjc) {
+        this.carvers.computeIfAbsent(a, a -> Lists.newArrayList()).add(cjc);
     }
     
     public List<ConfiguredWorldCarver<?>> getCarvers(final GenerationStep.Carving a) {
         return this.carvers.computeIfAbsent(a, a -> Lists.newArrayList());
     }
     
-    public <C extends FeatureConfiguration> void addStructureStart(final ConfiguredFeature<C, ? extends StructureFeature<C>> cdc) {
-        this.validFeatureStarts.put(cdc.feature, cdc.config);
+    public void addStructureStart(final ConfiguredStructureFeature<?, ?> ckc) {
+        this.validFeatureStarts.put(ckc.feature, ckc);
     }
     
-    public <C extends FeatureConfiguration> boolean isValidStart(final StructureFeature<C> cfl) {
-        return this.validFeatureStarts.containsKey(cfl);
+    public boolean isValidStart(final StructureFeature<?> cml) {
+        return this.validFeatureStarts.containsKey(cml);
     }
     
-    @Nullable
-    public <C extends FeatureConfiguration> C getStructureConfiguration(final StructureFeature<C> cfl) {
-        return (C)this.validFeatureStarts.get(cfl);
+    public Iterable<ConfiguredStructureFeature<?, ?>> structures() {
+        return this.validFeatureStarts.values();
+    }
+    
+    public ConfiguredStructureFeature<?, ?> withBiomeConfig(final ConfiguredStructureFeature<?, ?> ckc) {
+        return this.validFeatureStarts.getOrDefault(ckc.feature, ckc);
     }
     
     public List<ConfiguredFeature<?, ?>> getFlowerFeatures() {
@@ -258,20 +322,47 @@ public abstract class Biome {
         return this.features.get(b);
     }
     
-    public void generate(final GenerationStep.Decoration b, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final LevelAccessor bjx, final long long4, final WorldgenRandom ccf, final BlockPos fk) {
-        int integer9 = 0;
-        for (final ConfiguredFeature<?, ?> cdc11 : this.features.get(b)) {
-            ccf.setFeatureSeed(long4, integer9, b.ordinal());
-            try {
-                cdc11.place(bjx, caa, ccf, fk);
+    public void generate(final GenerationStep.Decoration b, final StructureFeatureManager bqq, final ChunkGenerator cha, final WorldGenLevel bqu, final long long5, final WorldgenRandom ciy, final BlockPos fu) {
+        int integer10 = 0;
+        if (bqq.shouldGenerateFeatures()) {
+            for (final StructureFeature<?> cml12 : Registry.STRUCTURE_FEATURE) {
+                if (cml12.step() != b) {
+                    continue;
+                }
+                ciy.setFeatureSeed(long5, integer10, b.ordinal());
+                final int integer11 = fu.getX() >> 4;
+                final int integer12 = fu.getZ() >> 4;
+                final int integer13 = integer11 << 4;
+                final int integer14 = integer12 << 4;
+                try {
+                    final int integer15;
+                    final int integer16;
+                    bqq.startsForFeature(SectionPos.of(fu), cml12).forEach(ctz -> ctz.placeInChunk(bqu, bqq, cha, ciy, new BoundingBox(integer15, integer16, integer15 + 15, integer16 + 15), new ChunkPos(integer11, integer12)));
+                }
+                catch (Exception exception17) {
+                    final CrashReport j18 = CrashReport.forThrowable(exception17, "Feature placement");
+                    j18.addCategory("Feature").setDetail("Id", Registry.STRUCTURE_FEATURE.getKey(cml12)).setDetail("Description", () -> cml12.toString());
+                    throw new ReportedException(j18);
+                }
+                ++integer10;
             }
-            catch (Exception exception12) {
-                final CrashReport h13 = CrashReport.forThrowable(exception12, "Feature placement");
-                h13.addCategory("Feature").setDetail("Id", Registry.FEATURE.getKey(cdc11.feature)).setDetail("Description", () -> cdc11.feature.toString());
-                throw new ReportedException(h13);
-            }
-            ++integer9;
         }
+        for (final ConfiguredFeature<?, ?> ckb12 : this.features.get(b)) {
+            ciy.setFeatureSeed(long5, integer10, b.ordinal());
+            try {
+                ckb12.place(bqu, bqq, cha, ciy, fu);
+            }
+            catch (Exception exception18) {
+                final CrashReport j19 = CrashReport.forThrowable(exception18, "Feature placement");
+                j19.addCategory("Feature").setDetail("Id", Registry.FEATURE.getKey(ckb12.feature)).setDetail("Config", ckb12.config).setDetail("Description", () -> ckb12.feature.toString());
+                throw new ReportedException(j19);
+            }
+            ++integer10;
+        }
+    }
+    
+    public int getFogColor() {
+        return this.specialEffects.getFogColor();
     }
     
     public int getGrassColor(final double double1, final double double2) {
@@ -286,9 +377,9 @@ public abstract class Biome {
         return FoliageColor.get(double2, double3);
     }
     
-    public void buildSurfaceAt(final Random random, final ChunkAccess bzy, final int integer3, final int integer4, final int integer5, final double double6, final BlockState byj7, final BlockState byj8, final int integer9, final long long10) {
+    public void buildSurfaceAt(final Random random, final ChunkAccess cgy, final int integer3, final int integer4, final int integer5, final double double6, final BlockState cfj7, final BlockState cfj8, final int integer9, final long long10) {
         this.surfaceBuilder.initNoise(long10);
-        this.surfaceBuilder.apply(random, bzy, this, integer3, integer4, integer5, double6, byj7, byj8, integer9, long10);
+        this.surfaceBuilder.apply(random, cgy, this, integer3, integer4, integer5, double6, cfj7, cfj8, integer9, long10);
     }
     
     public BiomeTempCategory getTemperatureCategory() {
@@ -313,7 +404,7 @@ public abstract class Biome {
     }
     
     public Component getName() {
-        return new TranslatableComponent(this.getDescriptionId(), new Object[0]);
+        return new TranslatableComponent(this.getDescriptionId());
     }
     
     public String getDescriptionId() {
@@ -331,12 +422,36 @@ public abstract class Biome {
         return this.temperature;
     }
     
+    public BiomeSpecialEffects getSpecialEffects() {
+        return this.specialEffects;
+    }
+    
     public final int getWaterColor() {
-        return this.waterColor;
+        return this.specialEffects.getWaterColor();
     }
     
     public final int getWaterFogColor() {
-        return this.waterFogColor;
+        return this.specialEffects.getWaterFogColor();
+    }
+    
+    public Optional<AmbientParticleSettings> getAmbientParticle() {
+        return this.specialEffects.getAmbientParticleSettings();
+    }
+    
+    public Optional<SoundEvent> getAmbientLoop() {
+        return this.specialEffects.getAmbientLoopSoundEvent();
+    }
+    
+    public Optional<AmbientMoodSettings> getAmbientMood() {
+        return this.specialEffects.getAmbientMoodSettings();
+    }
+    
+    public Optional<AmbientAdditionsSettings> getAmbientAdditions() {
+        return this.specialEffects.getAmbientAdditionsSettings();
+    }
+    
+    public Optional<Music> getBackgroundMusic() {
+        return this.specialEffects.getBackgroundMusic();
     }
     
     public final BiomeCategory getBiomeCategory() {
@@ -351,6 +466,10 @@ public abstract class Biome {
         return (SurfaceBuilderConfiguration)this.surfaceBuilder.getSurfaceBuilderConfiguration();
     }
     
+    public Stream<ClimateParameters> optimalParameters() {
+        return this.optimalParameters.stream();
+    }
+    
     @Nullable
     public String getParent() {
         return this.parent;
@@ -358,10 +477,11 @@ public abstract class Biome {
     
     static {
         LOGGER = LogManager.getLogger();
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Precipitation.CODEC.fieldOf("precipitation").forGetter(bre -> bre.precipitation), (App)BiomeCategory.CODEC.fieldOf("category").forGetter(bre -> bre.biomeCategory), (App)Codec.FLOAT.fieldOf("depth").forGetter(bre -> bre.depth), (App)Codec.FLOAT.fieldOf("scale").forGetter(bre -> bre.scale), (App)Codec.FLOAT.fieldOf("temperature").forGetter(bre -> bre.temperature), (App)Codec.FLOAT.fieldOf("downfall").forGetter(bre -> bre.downfall), (App)BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter(bre -> bre.specialEffects), (App)Codec.INT.fieldOf("sky_color").forGetter(bre -> bre.skyColor), (App)ConfiguredSurfaceBuilder.CODEC.fieldOf("surface_builder").forGetter(bre -> bre.surfaceBuilder), (App)Codec.simpleMap((Codec)GenerationStep.Carving.CODEC, ConfiguredWorldCarver.CODEC.listOf().promotePartial((Consumer)Util.prefix("Carver: ", Biome.LOGGER::error)), StringRepresentable.keys(GenerationStep.Carving.values())).fieldOf("carvers").forGetter(bre -> bre.carvers), (App)Codec.simpleMap((Codec)GenerationStep.Decoration.CODEC, ConfiguredFeature.CODEC.listOf().promotePartial((Consumer)Util.prefix("Feature: ", Biome.LOGGER::error)), StringRepresentable.keys(GenerationStep.Decoration.values())).fieldOf("features").forGetter(bre -> bre.features), (App)ConfiguredStructureFeature.CODEC.listOf().promotePartial((Consumer)Util.prefix("Structure start: ", Biome.LOGGER::error)).fieldOf("starts").forGetter(bre -> bre.validFeatureStarts.values().stream().sorted(Comparator.comparing(ckc -> Registry.STRUCTURE_FEATURE.getKey(ckc.feature))).collect(Collectors.<ConfiguredStructureFeature<?, ?>>toList())), (App)Codec.simpleMap((Codec)MobCategory.CODEC, SpawnerData.CODEC.listOf().promotePartial((Consumer)Util.prefix("Spawn data: ", Biome.LOGGER::error)), StringRepresentable.keys(MobCategory.values())).fieldOf("spawners").forGetter(bre -> bre.spawners), (App)ClimateParameters.CODEC.listOf().fieldOf("climate_parameters").forGetter(bre -> bre.optimalParameters), (App)Codec.STRING.optionalFieldOf("parent").forGetter(bre -> Optional.<String>ofNullable(bre.parent))).apply(instance, Biome::new));
         EXPLORABLE_BIOMES = Sets.newHashSet();
         MUTATED_BIOMES = new IdMapper<Biome>();
-        TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(1234L), 0, 0);
-        BIOME_INFO_NOISE = new PerlinSimplexNoise(new WorldgenRandom(2345L), 0, 0);
+        TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(1234L), ImmutableList.<Integer>of(0));
+        BIOME_INFO_NOISE = new PerlinSimplexNoise(new WorldgenRandom(2345L), ImmutableList.<Integer>of(0));
     }
     
     public enum BiomeTempCategory {
@@ -386,7 +506,7 @@ public abstract class Biome {
         }
     }
     
-    public enum BiomeCategory {
+    public enum BiomeCategory implements StringRepresentable {
         NONE("none"), 
         TAIGA("taiga"), 
         EXTREME_HILLS("extreme_hills"), 
@@ -405,6 +525,7 @@ public abstract class Biome {
         MUSHROOM("mushroom"), 
         NETHER("nether");
         
+        public static final Codec<BiomeCategory> CODEC;
         private static final Map<String, BiomeCategory> BY_NAME;
         private final String name;
         
@@ -416,16 +537,27 @@ public abstract class Biome {
             return this.name;
         }
         
+        public static BiomeCategory byName(final String string) {
+            return BiomeCategory.BY_NAME.get(string);
+        }
+        
+        @Override
+        public String getSerializedName() {
+            return this.name;
+        }
+        
         static {
+            CODEC = StringRepresentable.<BiomeCategory>fromEnum(BiomeCategory::values, BiomeCategory::byName);
             BY_NAME = Arrays.<BiomeCategory>stream(values()).collect(Collectors.toMap(BiomeCategory::getName, b -> b));
         }
     }
     
-    public enum Precipitation {
+    public enum Precipitation implements StringRepresentable {
         NONE("none"), 
         RAIN("rain"), 
         SNOW("snow");
         
+        public static final Codec<Precipitation> CODEC;
         private static final Map<String, Precipitation> BY_NAME;
         private final String name;
         
@@ -437,19 +569,48 @@ public abstract class Biome {
             return this.name;
         }
         
+        public static Precipitation byName(final String string) {
+            return Precipitation.BY_NAME.get(string);
+        }
+        
+        @Override
+        public String getSerializedName() {
+            return this.name;
+        }
+        
         static {
-            BY_NAME = Arrays.<Precipitation>stream(values()).collect(Collectors.toMap(Precipitation::getName, d -> d));
+            CODEC = StringRepresentable.<Precipitation>fromEnum(Precipitation::values, Precipitation::byName);
+            BY_NAME = Arrays.<Precipitation>stream(values()).collect(Collectors.toMap(Precipitation::getName, f -> f));
+        }
+    }
+    
+    public static class MobSpawnCost {
+        private final double energyBudget;
+        private final double charge;
+        
+        public MobSpawnCost(final double double1, final double double2) {
+            this.energyBudget = double1;
+            this.charge = double2;
+        }
+        
+        public double getEnergyBudget() {
+            return this.energyBudget;
+        }
+        
+        public double getCharge() {
+            return this.charge;
         }
     }
     
     public static class SpawnerData extends WeighedRandom.WeighedRandomItem {
+        public static final Codec<SpawnerData> CODEC;
         public final EntityType<?> type;
         public final int minCount;
         public final int maxCount;
         
-        public SpawnerData(final EntityType<?> aku, final int integer2, final int integer3, final int integer4) {
+        public SpawnerData(final EntityType<?> aoq, final int integer2, final int integer3, final int integer4) {
             super(integer2);
-            this.type = aku;
+            this.type = ((aoq.getCategory() == MobCategory.MISC) ? EntityType.PIG : aoq);
             this.minCount = integer3;
             this.maxCount = integer4;
         }
@@ -458,6 +619,10 @@ public abstract class Biome {
         public String toString() {
             return EntityType.getKey(this.type) + "*(" + this.minCount + "-" + this.maxCount + "):" + this.weight;
         }
+        
+        static {
+            CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Registry.ENTITY_TYPE.fieldOf("type").forGetter(g -> g.type), (App)Codec.INT.fieldOf("weight").forGetter(g -> g.weight), (App)Codec.INT.fieldOf("minCount").forGetter(g -> g.minCount), (App)Codec.INT.fieldOf("maxCount").forGetter(g -> g.maxCount)).apply(instance, SpawnerData::new));
+        }
     }
     
     public static class BiomeBuilder {
@@ -476,24 +641,24 @@ public abstract class Biome {
         @Nullable
         private Float downfall;
         @Nullable
-        private Integer waterColor;
-        @Nullable
-        private Integer waterFogColor;
-        @Nullable
         private String parent;
+        @Nullable
+        private List<ClimateParameters> optimalParameters;
+        @Nullable
+        private BiomeSpecialEffects specialEffects;
         
-        public <SC extends SurfaceBuilderConfiguration> BiomeBuilder surfaceBuilder(final SurfaceBuilder<SC> cng, final SC cni) {
-            this.surfaceBuilder = new ConfiguredSurfaceBuilder<>(cng, cni);
+        public <SC extends SurfaceBuilderConfiguration> BiomeBuilder surfaceBuilder(final SurfaceBuilder<SC> cvw, final SC cvy) {
+            this.surfaceBuilder = new ConfiguredSurfaceBuilder<>(cvw, cvy);
             return this;
         }
         
-        public BiomeBuilder surfaceBuilder(final ConfiguredSurfaceBuilder<?> cmw) {
-            this.surfaceBuilder = cmw;
+        public BiomeBuilder surfaceBuilder(final ConfiguredSurfaceBuilder<?> cvj) {
+            this.surfaceBuilder = cvj;
             return this;
         }
         
-        public BiomeBuilder precipitation(final Precipitation d) {
-            this.precipitation = d;
+        public BiomeBuilder precipitation(final Precipitation f) {
+            this.precipitation = f;
             return this;
         }
         
@@ -522,24 +687,70 @@ public abstract class Biome {
             return this;
         }
         
-        public BiomeBuilder waterColor(final int integer) {
-            this.waterColor = integer;
-            return this;
-        }
-        
-        public BiomeBuilder waterFogColor(final int integer) {
-            this.waterFogColor = integer;
-            return this;
-        }
-        
         public BiomeBuilder parent(@Nullable final String string) {
             this.parent = string;
             return this;
         }
         
+        public BiomeBuilder optimalParameters(final List<ClimateParameters> list) {
+            this.optimalParameters = list;
+            return this;
+        }
+        
+        public BiomeBuilder specialEffects(final BiomeSpecialEffects bri) {
+            this.specialEffects = bri;
+            return this;
+        }
+        
         @Override
         public String toString() {
-            return "BiomeBuilder{\nsurfaceBuilder=" + this.surfaceBuilder + ",\nprecipitation=" + this.precipitation + ",\nbiomeCategory=" + this.biomeCategory + ",\ndepth=" + this.depth + ",\nscale=" + this.scale + ",\ntemperature=" + this.temperature + ",\ndownfall=" + this.downfall + ",\nwaterColor=" + this.waterColor + ",\nwaterFogColor=" + this.waterFogColor + ",\nparent='" + this.parent + '\'' + "\n" + '}';
+            return "BiomeBuilder{\nsurfaceBuilder=" + this.surfaceBuilder + ",\nprecipitation=" + this.precipitation + ",\nbiomeCategory=" + this.biomeCategory + ",\ndepth=" + this.depth + ",\nscale=" + this.scale + ",\ntemperature=" + this.temperature + ",\ndownfall=" + this.downfall + ",\nspecialEffects=" + this.specialEffects + ",\nparent='" + this.parent + '\'' + "\n" + '}';
+        }
+    }
+    
+    public static class ClimateParameters {
+        public static final Codec<ClimateParameters> CODEC;
+        private final float temperature;
+        private final float humidity;
+        private final float altitude;
+        private final float weirdness;
+        private final float offset;
+        
+        public ClimateParameters(final float float1, final float float2, final float float3, final float float4, final float float5) {
+            this.temperature = float1;
+            this.humidity = float2;
+            this.altitude = float3;
+            this.weirdness = float4;
+            this.offset = float5;
+        }
+        
+        @Override
+        public boolean equals(final Object object) {
+            if (this == object) {
+                return true;
+            }
+            if (object == null || this.getClass() != object.getClass()) {
+                return false;
+            }
+            final ClimateParameters d3 = (ClimateParameters)object;
+            return Float.compare(d3.temperature, this.temperature) == 0 && Float.compare(d3.humidity, this.humidity) == 0 && Float.compare(d3.altitude, this.altitude) == 0 && Float.compare(d3.weirdness, this.weirdness) == 0;
+        }
+        
+        @Override
+        public int hashCode() {
+            int integer2 = (this.temperature != 0.0f) ? Float.floatToIntBits(this.temperature) : 0;
+            integer2 = 31 * integer2 + ((this.humidity != 0.0f) ? Float.floatToIntBits(this.humidity) : 0);
+            integer2 = 31 * integer2 + ((this.altitude != 0.0f) ? Float.floatToIntBits(this.altitude) : 0);
+            integer2 = 31 * integer2 + ((this.weirdness != 0.0f) ? Float.floatToIntBits(this.weirdness) : 0);
+            return integer2;
+        }
+        
+        public float fitness(final ClimateParameters d) {
+            return (this.temperature - d.temperature) * (this.temperature - d.temperature) + (this.humidity - d.humidity) * (this.humidity - d.humidity) + (this.altitude - d.altitude) * (this.altitude - d.altitude) + (this.weirdness - d.weirdness) * (this.weirdness - d.weirdness) + (this.offset - d.offset) * (this.offset - d.offset);
+        }
+        
+        static {
+            CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.FLOAT.fieldOf("temperature").forGetter(d -> d.temperature), (App)Codec.FLOAT.fieldOf("humidity").forGetter(d -> d.humidity), (App)Codec.FLOAT.fieldOf("altitude").forGetter(d -> d.altitude), (App)Codec.FLOAT.fieldOf("weirdness").forGetter(d -> d.weirdness), (App)Codec.FLOAT.fieldOf("offset").forGetter(d -> d.offset)).apply(instance, ClimateParameters::new));
         }
     }
 }
diff --git a/src/net/minecraft/world/level/biome/BiomeDefaultFeatures.java b/src/net/minecraft/world/level/biome/BiomeDefaultFeatures.java
index dea5ab1..d500b02 100644
--- a/src/net/minecraft/world/level/biome/BiomeDefaultFeatures.java
+++ b/src/net/minecraft/world/level/biome/BiomeDefaultFeatures.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.biome;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.levelgen.feature.stateproviders.RotatedBlockProvider;
 import net.minecraft.world.level.levelgen.feature.blockplacers.ColumnPlacer;
@@ -13,22 +14,44 @@ import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider;
 import net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer;
 import net.minecraft.world.level.levelgen.feature.blockplacers.SimpleBlockPlacer;
+import net.minecraft.world.level.levelgen.feature.trunkplacers.MegaJungleTrunkPlacer;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.MegaJungleFoliagePlacer;
 import net.minecraft.world.level.levelgen.feature.treedecorators.AlterGroundDecorator;
-import net.minecraft.world.level.levelgen.feature.treedecorators.BeehiveDecorator;
+import net.minecraft.world.level.levelgen.feature.trunkplacers.GiantTrunkPlacer;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.MegaPineFoliagePlacer;
+import net.minecraft.world.level.levelgen.feature.featuresize.ThreeLayersFeatureSize;
+import net.minecraft.world.level.levelgen.feature.trunkplacers.DarkOakTrunkPlacer;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.DarkOakFoliagePlacer;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.BushFoliagePlacer;
+import java.util.OptionalInt;
+import net.minecraft.world.level.levelgen.feature.trunkplacers.FancyTrunkPlacer;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.FancyFoliagePlacer;
+import net.minecraft.world.level.levelgen.feature.trunkplacers.ForkingTrunkPlacer;
 import net.minecraft.world.level.levelgen.feature.foliageplacers.AcaciaFoliagePlacer;
 import net.minecraft.world.level.levelgen.feature.foliageplacers.SpruceFoliagePlacer;
 import net.minecraft.world.level.levelgen.feature.foliageplacers.PineFoliagePlacer;
-import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator;
 import net.minecraft.world.level.levelgen.feature.treedecorators.LeaveVineDecorator;
 import net.minecraft.world.level.levelgen.feature.treedecorators.TrunkVineDecorator;
 import net.minecraft.world.level.levelgen.feature.treedecorators.CocoaDecorator;
+import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator;
+import net.minecraft.world.level.levelgen.feature.featuresize.FeatureSize;
+import net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer;
 import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
 import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;
+import net.minecraft.world.level.levelgen.feature.featuresize.TwoLayersFeatureSize;
+import net.minecraft.world.level.levelgen.feature.trunkplacers.StraightTrunkPlacer;
 import net.minecraft.world.level.levelgen.feature.foliageplacers.BlobFoliagePlacer;
 import net.minecraft.world.level.levelgen.feature.stateproviders.SimpleStateProvider;
+import net.minecraft.world.level.levelgen.feature.RuinedPortalFeature;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Map;
+import net.minecraft.world.level.levelgen.feature.BastionPieces;
+import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
+import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
 import net.minecraft.world.level.block.HugeMushroomBlock;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.SweetBerryBushBlock;
+import net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration;
 import net.minecraft.world.level.levelgen.placement.CarvingMaskDecoratorConfiguration;
@@ -49,23 +72,16 @@ import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfigurat
 import java.util.List;
 import net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration;
 import com.google.common.collect.Lists;
+import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
+import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockConfiguration;
 import net.minecraft.world.level.levelgen.placement.DepthAverageConfigation;
 import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
-import net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
-import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
+import net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
+import net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
 import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
@@ -73,12 +89,25 @@ import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeat
 import net.minecraft.world.level.levelgen.carver.WorldCarver;
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration;
+import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.treedecorators.BeehiveDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.RuinedPortalConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.MultiJigsawConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.block.state.BlockState;
 
 public class BiomeDefaultFeatures {
@@ -136,7 +165,10 @@ public class BiomeDefaultFeatures {
     private static final BlockState PUMPKIN;
     private static final BlockState SWEET_BERRY_BUSH;
     private static final BlockState FIRE;
+    private static final BlockState SOUL_FIRE;
     private static final BlockState NETHERRACK;
+    private static final BlockState SOUL_SOIL;
+    private static final BlockState CRIMSON_ROOTS;
     private static final BlockState LILY_PAD;
     private static final BlockState SNOW;
     private static final BlockState JACK_O_LANTERN;
@@ -146,30 +178,71 @@ public class BiomeDefaultFeatures {
     private static final BlockState HUGE_RED_MUSHROOM;
     private static final BlockState HUGE_BROWN_MUSHROOM;
     private static final BlockState HUGE_MUSHROOM_STEM;
-    public static final SmallTreeConfiguration NORMAL_TREE_CONFIG;
-    public static final SmallTreeConfiguration JUNGLE_TREE_CONFIG;
-    public static final SmallTreeConfiguration JUNGLE_TREE_NOVINE_CONFIG;
-    public static final SmallTreeConfiguration PINE_TREE_CONFIG;
-    public static final SmallTreeConfiguration SPRUCE_TREE_CONFIG;
-    public static final SmallTreeConfiguration ACACIA_TREE_CONFIG;
-    public static final SmallTreeConfiguration BIRCH_TREE_CONFIG;
-    public static final SmallTreeConfiguration BIRCH_TREE_WITH_BEES_0002_CONFIG;
-    public static final SmallTreeConfiguration SUPER_BIRCH_TREE_WITH_BEES_0002_CONFIG;
-    public static final SmallTreeConfiguration SWAMP_TREE_CONFIG;
-    public static final SmallTreeConfiguration FANCY_TREE_CONFIG;
-    public static final SmallTreeConfiguration NORMAL_TREE_WITH_BEES_005_CONFIG;
-    public static final SmallTreeConfiguration FANCY_TREE_WITH_BEES_0002_CONFIG;
-    public static final SmallTreeConfiguration FANCY_TREE_WITH_BEES_005_CONFIG;
-    public static final SmallTreeConfiguration NORMAL_TREE_WITH_BEES_0002_CONFIG;
-    public static final SmallTreeConfiguration NORMAL_TREE_WITH_BEES_002_CONFIG;
-    public static final SmallTreeConfiguration FANCY_TREE_WITH_BEES_002_CONFIG;
-    public static final SmallTreeConfiguration BIRCH_TREE_WITH_BEES_002_CONFIG;
-    public static final SmallTreeConfiguration BIRCH_TREE_WITH_BEES_005_CONFIG;
+    private static final BlockState NETHER_GOLD_ORE;
+    private static final BlockState NETHER_QUARTZ_ORE;
+    private static final BlockState WARPED_STEM;
+    private static final BlockState WARPED_WART_BLOCK;
+    private static final BlockState NETHER_WART_BLOCK;
+    private static final BlockState CRIMSON_STEM;
+    private static final BlockState SHROOMLIGHT;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> PILLAGER_OUTPOST;
+    public static final ConfiguredStructureFeature<MineshaftConfiguration, ? extends StructureFeature<MineshaftConfiguration>> MINESHAFT;
+    public static final ConfiguredStructureFeature<MineshaftConfiguration, ? extends StructureFeature<MineshaftConfiguration>> MINESHAFT_MESA;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> WOODLAND_MANSION;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> JUNGLE_TEMPLE;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> DESERT_PYRAMID;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> IGLOO;
+    public static final ConfiguredStructureFeature<ShipwreckConfiguration, ? extends StructureFeature<ShipwreckConfiguration>> SHIPWRECK;
+    public static final ConfiguredStructureFeature<ShipwreckConfiguration, ? extends StructureFeature<ShipwreckConfiguration>> SHIPWRECH_BEACHED;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> SWAMP_HUT;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> STRONGHOLD;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> OCEAN_MONUMENT;
+    public static final ConfiguredStructureFeature<OceanRuinConfiguration, ? extends StructureFeature<OceanRuinConfiguration>> OCEAN_RUIN_COLD;
+    public static final ConfiguredStructureFeature<OceanRuinConfiguration, ? extends StructureFeature<OceanRuinConfiguration>> OCEAN_RUIN_WARM;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> NETHER_BRIDGE;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> NETHER_FOSSIL;
+    public static final ConfiguredStructureFeature<NoneFeatureConfiguration, ? extends StructureFeature<NoneFeatureConfiguration>> END_CITY;
+    public static final ConfiguredStructureFeature<BuriedTreasureConfiguration, ? extends StructureFeature<BuriedTreasureConfiguration>> BURIED_TREASURE;
+    public static final ConfiguredStructureFeature<MultiJigsawConfiguration, ? extends StructureFeature<MultiJigsawConfiguration>> BASTION_REMNANT;
+    public static final ConfiguredStructureFeature<JigsawConfiguration, ? extends StructureFeature<JigsawConfiguration>> VILLAGE_PLAINS;
+    public static final ConfiguredStructureFeature<JigsawConfiguration, ? extends StructureFeature<JigsawConfiguration>> VILLAGE_DESERT;
+    public static final ConfiguredStructureFeature<JigsawConfiguration, ? extends StructureFeature<JigsawConfiguration>> VILLAGE_SAVANNA;
+    public static final ConfiguredStructureFeature<JigsawConfiguration, ? extends StructureFeature<JigsawConfiguration>> VILLAGE_SNOVY;
+    public static final ConfiguredStructureFeature<JigsawConfiguration, ? extends StructureFeature<JigsawConfiguration>> VILLAGE_TAIGA;
+    public static final ConfiguredStructureFeature<RuinedPortalConfiguration, ? extends StructureFeature<RuinedPortalConfiguration>> RUINED_PORTAL_STANDARD;
+    public static final ConfiguredStructureFeature<RuinedPortalConfiguration, ? extends StructureFeature<RuinedPortalConfiguration>> RUINED_PORTAL_DESERT;
+    public static final ConfiguredStructureFeature<RuinedPortalConfiguration, ? extends StructureFeature<RuinedPortalConfiguration>> RUINED_PORTAL_JUNGLE;
+    public static final ConfiguredStructureFeature<RuinedPortalConfiguration, ? extends StructureFeature<RuinedPortalConfiguration>> RUINED_PORTAL_SWAMP;
+    public static final ConfiguredStructureFeature<RuinedPortalConfiguration, ? extends StructureFeature<RuinedPortalConfiguration>> RUINED_PORTAL_MOUNTAIN;
+    public static final ConfiguredStructureFeature<RuinedPortalConfiguration, ? extends StructureFeature<RuinedPortalConfiguration>> RUINED_PORTAL_OCEAN;
+    public static final ConfiguredStructureFeature<RuinedPortalConfiguration, ? extends StructureFeature<RuinedPortalConfiguration>> RUINED_PORTAL_NETHER;
+    public static final TreeConfiguration NORMAL_TREE_CONFIG;
+    private static final BeehiveDecorator BEEHIVE_0002;
+    private static final BeehiveDecorator BEEHIVE_002;
+    private static final BeehiveDecorator BEEHIVE_005;
+    public static final TreeConfiguration NORMAL_TREE_WITH_BEES_0002_CONFIG;
+    public static final TreeConfiguration NORMAL_TREE_WITH_BEES_002_CONFIG;
+    public static final TreeConfiguration NORMAL_TREE_WITH_BEES_005_CONFIG;
+    public static final TreeConfiguration JUNGLE_TREE_CONFIG;
+    public static final TreeConfiguration JUNGLE_TREE_NOVINE_CONFIG;
+    public static final TreeConfiguration PINE_TREE_CONFIG;
+    public static final TreeConfiguration SPRUCE_TREE_CONFIG;
+    public static final TreeConfiguration ACACIA_TREE_CONFIG;
+    public static final TreeConfiguration BIRCH_TREE_CONFIG;
+    public static final TreeConfiguration BIRCH_TREE_WITH_BEES_0002_CONFIG;
+    public static final TreeConfiguration BIRCH_TREE_WITH_BEES_002_CONFIG;
+    public static final TreeConfiguration BIRCH_TREE_WITH_BEES_005_CONFIG;
+    public static final TreeConfiguration SUPER_BIRCH_TREE_WITH_BEES_0002_CONFIG;
+    public static final TreeConfiguration SWAMP_TREE_CONFIG;
+    public static final TreeConfiguration FANCY_TREE_CONFIG;
+    public static final TreeConfiguration FANCY_TREE_WITH_BEES_0002_CONFIG;
+    public static final TreeConfiguration FANCY_TREE_WITH_BEES_002_CONFIG;
+    public static final TreeConfiguration FANCY_TREE_WITH_BEES_005_CONFIG;
     public static final TreeConfiguration JUNGLE_BUSH_CONFIG;
-    public static final MegaTreeConfiguration DARK_OAK_TREE_CONFIG;
-    public static final MegaTreeConfiguration MEGA_SPRUCE_TREE_CONFIG;
-    public static final MegaTreeConfiguration MEGA_PINE_TREE_CONFIG;
-    public static final MegaTreeConfiguration MEGA_JUNGLE_TREE_CONFIG;
+    public static final TreeConfiguration DARK_OAK_TREE_CONFIG;
+    public static final TreeConfiguration MEGA_SPRUCE_TREE_CONFIG;
+    public static final TreeConfiguration MEGA_PINE_TREE_CONFIG;
+    public static final TreeConfiguration MEGA_JUNGLE_TREE_CONFIG;
     public static final RandomPatchConfiguration DEFAULT_GRASS_CONFIG;
     public static final RandomPatchConfiguration TAIGA_GRASS_CONFIG;
     public static final RandomPatchConfiguration JUNGLE_GRASS_CONFIG;
@@ -182,10 +255,12 @@ public class BiomeDefaultFeatures {
     public static final RandomPatchConfiguration MELON_CONFIG;
     public static final RandomPatchConfiguration PUMPKIN_CONFIG;
     public static final RandomPatchConfiguration SWEET_BERRY_BUSH_CONFIG;
-    public static final RandomPatchConfiguration HELL_FIRE_CONFIG;
+    public static final RandomPatchConfiguration FIRE_CONFIG;
+    public static final RandomPatchConfiguration SOUL_FIRE_CONFIG;
     public static final RandomPatchConfiguration WATERLILLY_CONFIG;
     public static final RandomPatchConfiguration RED_MUSHROOM_CONFIG;
     public static final RandomPatchConfiguration BROWN_MUSHROOM_CONFIG;
+    public static final RandomPatchConfiguration CRIMSON_ROOTS_CONFIG;
     public static final RandomPatchConfiguration DOUBLE_LILAC_CONFIG;
     public static final RandomPatchConfiguration DOUBLE_ROSE_BUSH_CONFIG;
     public static final RandomPatchConfiguration DOUBLE_PEONY_CONFIG;
@@ -199,343 +274,379 @@ public class BiomeDefaultFeatures {
     public static final BlockPileConfiguration MELON_PILE_CONFIG;
     public static final BlockPileConfiguration PUMPKIN_PILE_CONFIG;
     public static final BlockPileConfiguration ICE_PILE_CONFIG;
+    public static final FluidState WATER_STATE;
+    public static final FluidState LAVA_STATE;
     public static final SpringConfiguration WATER_SPRING_CONFIG;
     public static final SpringConfiguration LAVA_SPRING_CONFIG;
     public static final SpringConfiguration OPEN_NETHER_SPRING_CONFIG;
+    public static final SpringConfiguration BASALT_DELTA_SPRING_CONFIG;
     public static final SpringConfiguration CLOSED_NETHER_SPRING_CONFIG;
+    public static final SpringConfiguration OPEN_NETHER_SPRING_SOUL_SAND_CONFIG;
+    public static final SpringConfiguration CLOSED_NETHER_SPRING_SOUL_SAND_CONFIG;
+    public static final ColumnFeatureConfiguration SMALL_BASALT_COLUMN_FEATURE_CONFIG;
+    public static final ColumnFeatureConfiguration LARGE_BASALT_COLUMN_FEATURE_CONFIG;
+    public static final ReplaceSpheroidConfiguration BASALT_BLOBS_FEATURE_CONFIG;
+    public static final ReplaceSpheroidConfiguration BLACKSTONE_BLOBS_FEATURE_CONFIG;
+    public static final DeltaFeatureConfiguration BASALT_DELTA_FEATURE_CONFIG;
     public static final HugeMushroomFeatureConfiguration HUGE_RED_MUSHROOM_CONFIG;
     public static final HugeMushroomFeatureConfiguration HUGE_BROWN_MUSHROOM_CONFIG;
+    public static final BlockPileConfiguration CRIMSON_FOREST_CONFIG;
+    public static final BlockPileConfiguration WARPED_FOREST_CONFIG;
+    public static final BlockPileConfiguration NETHER_SPROUTS_CONFIG;
     
-    public static void addDefaultCarvers(final Biome bkt) {
-        bkt.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.CAVE, (C)new ProbabilityFeatureConfiguration(0.14285715f)));
-        bkt.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.CANYON, (C)new ProbabilityFeatureConfiguration(0.02f)));
+    public static void addDefaultOverworldLandMesaStructures(final Biome bre) {
+        bre.addStructureStart(BiomeDefaultFeatures.MINESHAFT_MESA);
+        bre.addStructureStart(BiomeDefaultFeatures.STRONGHOLD);
     }
     
-    public static void addOceanCarvers(final Biome bkt) {
-        bkt.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.CAVE, (C)new ProbabilityFeatureConfiguration(0.06666667f)));
-        bkt.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.CANYON, (C)new ProbabilityFeatureConfiguration(0.02f)));
-        bkt.<CarverConfiguration>addCarver(GenerationStep.Carving.LIQUID, Biome.makeCarver((WorldCarver<C>)WorldCarver.UNDERWATER_CANYON, (C)new ProbabilityFeatureConfiguration(0.02f)));
-        bkt.<CarverConfiguration>addCarver(GenerationStep.Carving.LIQUID, Biome.makeCarver((WorldCarver<C>)WorldCarver.UNDERWATER_CAVE, (C)new ProbabilityFeatureConfiguration(0.06666667f)));
+    public static void addDefaultOverworldLandStructures(final Biome bre) {
+        bre.addStructureStart(BiomeDefaultFeatures.MINESHAFT);
+        bre.addStructureStart(BiomeDefaultFeatures.STRONGHOLD);
     }
     
-    public static void addStructureFeaturePlacement(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_STRUCTURES, Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004000000189989805, MineshaftFeature.Type.NORMAL)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.PILLAGER_OUTPOST.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_STRUCTURES, Feature.STRONGHOLD.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.SWAMP_HUT.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.DESERT_PYRAMID.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.JUNGLE_TEMPLE.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.IGLOO.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.OCEAN_MONUMENT.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.WOODLAND_MANSION.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.COLD, 0.3f, 0.9f)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_STRUCTURES, Feature.BURIED_TREASURE.configured(new BuriedTreasureConfiguration(0.01f)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.VILLAGE.configured(new VillageConfiguration("village/plains/town_centers", 6)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
+    public static void addDefaultOverworldOceanStructures(final Biome bre) {
+        bre.addStructureStart(BiomeDefaultFeatures.MINESHAFT);
+        bre.addStructureStart(BiomeDefaultFeatures.SHIPWRECK);
     }
     
-    public static void addDefaultLakes(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, Feature.LAKE.configured(new BlockStateConfiguration(BiomeDefaultFeatures.WATER)).decorated(FeatureDecorator.WATER_LAKE.configured(new ChanceDecoratorConfiguration(4))));
-        bkt.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, Feature.LAKE.configured(new BlockStateConfiguration(BiomeDefaultFeatures.LAVA)).decorated(FeatureDecorator.LAVA_LAKE.configured(new ChanceDecoratorConfiguration(80))));
+    public static void addDefaultCarvers(final Biome bre) {
+        bre.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.CAVE, (C)new ProbabilityFeatureConfiguration(0.14285715f)));
+        bre.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.CANYON, (C)new ProbabilityFeatureConfiguration(0.02f)));
     }
     
-    public static void addDesertLakes(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, Feature.LAKE.configured(new BlockStateConfiguration(BiomeDefaultFeatures.LAVA)).decorated(FeatureDecorator.LAVA_LAKE.configured(new ChanceDecoratorConfiguration(80))));
+    public static void addOceanCarvers(final Biome bre) {
+        bre.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.CAVE, (C)new ProbabilityFeatureConfiguration(0.06666667f)));
+        bre.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.CANYON, (C)new ProbabilityFeatureConfiguration(0.02f)));
+        bre.<CarverConfiguration>addCarver(GenerationStep.Carving.LIQUID, Biome.makeCarver((WorldCarver<C>)WorldCarver.UNDERWATER_CANYON, (C)new ProbabilityFeatureConfiguration(0.02f)));
+        bre.<CarverConfiguration>addCarver(GenerationStep.Carving.LIQUID, Biome.makeCarver((WorldCarver<C>)WorldCarver.UNDERWATER_CAVE, (C)new ProbabilityFeatureConfiguration(0.06666667f)));
     }
     
-    public static void addDefaultMonsterRoom(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_STRUCTURES, Feature.MONSTER_ROOM.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.DUNGEONS.configured(new ChanceDecoratorConfiguration(8))));
+    public static void addDefaultLakes(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.LAKES, Feature.LAKE.configured(new BlockStateConfiguration(BiomeDefaultFeatures.WATER)).decorated(FeatureDecorator.WATER_LAKE.configured(new ChanceDecoratorConfiguration(4))));
+        bre.addFeature(GenerationStep.Decoration.LAKES, Feature.LAKE.configured(new BlockStateConfiguration(BiomeDefaultFeatures.LAVA)).decorated(FeatureDecorator.LAVA_LAKE.configured(new ChanceDecoratorConfiguration(80))));
     }
     
-    public static void addDefaultUndergroundVariety(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.DIRT, 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 256))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.GRAVEL, 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(8, 0, 0, 256))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.GRANITE, 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 80))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.DIORITE, 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 80))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.ANDESITE, 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 80))));
+    public static void addDesertLakes(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.LAKES, Feature.LAKE.configured(new BlockStateConfiguration(BiomeDefaultFeatures.LAVA)).decorated(FeatureDecorator.LAVA_LAKE.configured(new ChanceDecoratorConfiguration(80))));
     }
     
-    public static void addDefaultOres(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.COAL_ORE, 17)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(20, 0, 0, 128))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.IRON_ORE, 9)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(20, 0, 0, 64))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.GOLD_ORE, 9)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(2, 0, 0, 32))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.REDSTONE_ORE, 8)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(8, 0, 0, 16))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.DIAMOND_ORE, 8)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(1, 0, 0, 16))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.LAPIS_ORE, 7)).decorated(FeatureDecorator.COUNT_DEPTH_AVERAGE.configured(new DepthAverageConfigation(1, 16, 16))));
+    public static void addDefaultMonsterRoom(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_STRUCTURES, Feature.MONSTER_ROOM.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.DUNGEONS.configured(new ChanceDecoratorConfiguration(8))));
     }
     
-    public static void addExtraGold(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.GOLD_ORE, 9)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(20, 32, 32, 80))));
+    public static void addDefaultUndergroundVariety(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.DIRT, 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 256))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.GRAVEL, 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(8, 0, 0, 256))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.GRANITE, 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 80))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.DIORITE, 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 80))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.ANDESITE, 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 80))));
     }
     
-    public static void addExtraEmeralds(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.EMERALD_ORE.configured(new ReplaceBlockConfiguration(BiomeDefaultFeatures.STONE, BiomeDefaultFeatures.EMERALD_ORE)).decorated(FeatureDecorator.EMERALD_ORE.configured(DecoratorConfiguration.NONE)));
+    public static void addDefaultOres(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.COAL_ORE, 17)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(20, 0, 0, 128))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.IRON_ORE, 9)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(20, 0, 0, 64))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.GOLD_ORE, 9)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(2, 0, 0, 32))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.REDSTONE_ORE, 8)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(8, 0, 0, 16))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.DIAMOND_ORE, 8)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(1, 0, 0, 16))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.LAPIS_ORE, 7)).decorated(FeatureDecorator.COUNT_DEPTH_AVERAGE.configured(new DepthAverageConfigation(1, 16, 16))));
     }
     
-    public static void addInfestedStone(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.INFESTED_STONE, 9)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(7, 0, 0, 64))));
+    public static void addExtraGold(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.GOLD_ORE, 9)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(20, 32, 32, 80))));
     }
     
-    public static void addDefaultSoftDisks(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new DiskConfiguration(BiomeDefaultFeatures.SAND, 7, 2, Lists.<BlockState>newArrayList(BiomeDefaultFeatures.DIRT, BiomeDefaultFeatures.GRASS_BLOCK))).decorated(FeatureDecorator.COUNT_TOP_SOLID.configured(new FrequencyDecoratorConfiguration(3))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new DiskConfiguration(BiomeDefaultFeatures.CLAY, 4, 1, Lists.<BlockState>newArrayList(BiomeDefaultFeatures.DIRT, BiomeDefaultFeatures.CLAY))).decorated(FeatureDecorator.COUNT_TOP_SOLID.configured(new FrequencyDecoratorConfiguration(1))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new DiskConfiguration(BiomeDefaultFeatures.GRAVEL, 6, 2, Lists.<BlockState>newArrayList(BiomeDefaultFeatures.DIRT, BiomeDefaultFeatures.GRASS_BLOCK))).decorated(FeatureDecorator.COUNT_TOP_SOLID.configured(new FrequencyDecoratorConfiguration(1))));
+    public static void addExtraEmeralds(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.EMERALD_ORE.configured(new ReplaceBlockConfiguration(BiomeDefaultFeatures.STONE, BiomeDefaultFeatures.EMERALD_ORE)).decorated(FeatureDecorator.EMERALD_ORE.configured(DecoratorConfiguration.NONE)));
     }
     
-    public static void addSwampClayDisk(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new DiskConfiguration(BiomeDefaultFeatures.CLAY, 4, 1, Lists.<BlockState>newArrayList(BiomeDefaultFeatures.DIRT, BiomeDefaultFeatures.CLAY))).decorated(FeatureDecorator.COUNT_TOP_SOLID.configured(new FrequencyDecoratorConfiguration(1))));
+    public static void addInfestedStone(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NATURAL_STONE, BiomeDefaultFeatures.INFESTED_STONE, 9)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(7, 0, 0, 64))));
     }
     
-    public static void addMossyStoneBlock(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, Feature.FOREST_ROCK.configured(new BlockBlobConfiguration(BiomeDefaultFeatures.MOSSY_COBBLESTONE, 0)).decorated(FeatureDecorator.FOREST_ROCK.configured(new FrequencyDecoratorConfiguration(3))));
+    public static void addDefaultSoftDisks(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new DiskConfiguration(BiomeDefaultFeatures.SAND, 7, 2, Lists.<BlockState>newArrayList(BiomeDefaultFeatures.DIRT, BiomeDefaultFeatures.GRASS_BLOCK))).decorated(FeatureDecorator.COUNT_TOP_SOLID.configured(new FrequencyDecoratorConfiguration(3))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new DiskConfiguration(BiomeDefaultFeatures.CLAY, 4, 1, Lists.<BlockState>newArrayList(BiomeDefaultFeatures.DIRT, BiomeDefaultFeatures.CLAY))).decorated(FeatureDecorator.COUNT_TOP_SOLID.configured(new FrequencyDecoratorConfiguration(1))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new DiskConfiguration(BiomeDefaultFeatures.GRAVEL, 6, 2, Lists.<BlockState>newArrayList(BiomeDefaultFeatures.DIRT, BiomeDefaultFeatures.GRASS_BLOCK))).decorated(FeatureDecorator.COUNT_TOP_SOLID.configured(new FrequencyDecoratorConfiguration(1))));
     }
     
-    public static void addFerns(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.LARGE_FERN_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(7))));
+    public static void addSwampClayDisk(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new DiskConfiguration(BiomeDefaultFeatures.CLAY, 4, 1, Lists.<BlockState>newArrayList(BiomeDefaultFeatures.DIRT, BiomeDefaultFeatures.CLAY))).decorated(FeatureDecorator.COUNT_TOP_SOLID.configured(new FrequencyDecoratorConfiguration(1))));
     }
     
-    public static void addBerryBushes(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SWEET_BERRY_BUSH_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(12))));
+    public static void addMossyStoneBlock(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, Feature.FOREST_ROCK.configured(new BlockBlobConfiguration(BiomeDefaultFeatures.MOSSY_COBBLESTONE, 0)).decorated(FeatureDecorator.FOREST_ROCK.configured(new FrequencyDecoratorConfiguration(3))));
     }
     
-    public static void addSparseBerryBushes(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SWEET_BERRY_BUSH_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
+    public static void addFerns(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.LARGE_FERN_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(7))));
     }
     
-    public static void addLightBambooVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.BAMBOO.configured(new ProbabilityFeatureConfiguration(0.0f)).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(16))));
+    public static void addBerryBushes(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SWEET_BERRY_BUSH_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(12))));
     }
     
-    public static void addBambooVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.BAMBOO.configured(new ProbabilityFeatureConfiguration(0.2f)).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP_NOISE_BIASED.configured(new NoiseCountFactorDecoratorConfiguration(160, 80.0, 0.3, Heightmap.Types.WORLD_SURFACE_WG))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.05f), Feature.JUNGLE_GROUND_BUSH.configured(BiomeDefaultFeatures.JUNGLE_BUSH_CONFIG).weighted(0.15f), (WeightedConfiguredFeature<SmallTreeConfiguration>)Feature.MEGA_JUNGLE_TREE.configured(BiomeDefaultFeatures.MEGA_JUNGLE_TREE_CONFIG).weighted(0.7f)), Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.JUNGLE_GRASS_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(30, 0.1f, 1))));
+    public static void addSparseBerryBushes(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SWEET_BERRY_BUSH_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
     }
     
-    public static void addTaigaTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.PINE_TREE_CONFIG).weighted(0.33333334f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
+    public static void addLightBambooVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.BAMBOO.configured(new ProbabilityFeatureConfiguration(0.0f)).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(16))));
     }
     
-    public static void addWaterTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(0, 0.1f, 1))));
+    public static void addBambooVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.BAMBOO.configured(new ProbabilityFeatureConfiguration(0.2f)).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP_NOISE_BIASED.configured(new NoiseCountFactorDecoratorConfiguration(160, 80.0, 0.3, Heightmap.Types.WORLD_SURFACE_WG))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.05f), Feature.TREE.configured(BiomeDefaultFeatures.JUNGLE_BUSH_CONFIG).weighted(0.15f), Feature.TREE.configured(BiomeDefaultFeatures.MEGA_JUNGLE_TREE_CONFIG).weighted(0.7f)), Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.JUNGLE_GRASS_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(30, 0.1f, 1))));
     }
     
-    public static void addBirchTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_WITH_BEES_0002_CONFIG).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
+    public static void addTaigaTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.PINE_TREE_CONFIG).weighted(0.33333334f)), Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
     }
     
-    public static void addOtherBirchTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_WITH_BEES_0002_CONFIG).weighted(0.2f), Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_WITH_BEES_0002_CONFIG).weighted(0.1f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_WITH_BEES_0002_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
+    public static void addWaterTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f)), Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(0, 0.1f, 1))));
     }
     
-    public static void addTallBirchTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SUPER_BIRCH_TREE_WITH_BEES_0002_CONFIG).weighted(0.5f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_WITH_BEES_0002_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
+    public static void addBirchTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_WITH_BEES_0002_CONFIG).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
     }
     
-    public static void addSavannaTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.ACACIA_TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG).weighted(0.8f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(1, 0.1f, 1))));
+    public static void addOtherBirchTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_WITH_BEES_0002_CONFIG).weighted(0.2f), Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_WITH_BEES_0002_CONFIG).weighted(0.1f)), Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_WITH_BEES_0002_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
     }
     
-    public static void addShatteredSavannaTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.ACACIA_TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG).weighted(0.8f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(2, 0.1f, 1))));
+    public static void addTallBirchTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.SUPER_BIRCH_TREE_WITH_BEES_0002_CONFIG).weighted(0.5f)), Feature.TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_WITH_BEES_0002_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
     }
     
-    public static void addMountainTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG).weighted(0.666f), Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(0, 0.1f, 1))));
+    public static void addSavannaTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG).weighted(0.8f)), Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(1, 0.1f, 1))));
     }
     
-    public static void addMountainEdgeTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG).weighted(0.666f), Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(3, 0.1f, 1))));
+    public static void addShatteredSavannaTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG).weighted(0.8f)), Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(2, 0.1f, 1))));
     }
     
-    public static void addJungleTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f), Feature.JUNGLE_GROUND_BUSH.configured(BiomeDefaultFeatures.JUNGLE_BUSH_CONFIG).weighted(0.5f), (WeightedConfiguredFeature<SmallTreeConfiguration>)Feature.MEGA_JUNGLE_TREE.configured(BiomeDefaultFeatures.MEGA_JUNGLE_TREE_CONFIG).weighted(0.33333334f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.JUNGLE_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(50, 0.1f, 1))));
+    public static void addMountainTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG).weighted(0.666f), Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f)), Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(0, 0.1f, 1))));
     }
     
-    public static void addJungleEdgeTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f), Feature.JUNGLE_GROUND_BUSH.configured(BiomeDefaultFeatures.JUNGLE_BUSH_CONFIG).weighted(0.5f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.JUNGLE_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(2, 0.1f, 1))));
+    public static void addMountainEdgeTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG).weighted(0.666f), Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f)), Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(3, 0.1f, 1))));
     }
     
-    public static void addBadlandsTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(5, 0.1f, 1))));
+    public static void addJungleTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f), Feature.TREE.configured(BiomeDefaultFeatures.JUNGLE_BUSH_CONFIG).weighted(0.5f), Feature.TREE.configured(BiomeDefaultFeatures.MEGA_JUNGLE_TREE_CONFIG).weighted(0.33333334f)), Feature.TREE.configured(BiomeDefaultFeatures.JUNGLE_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(50, 0.1f, 1))));
     }
     
-    public static void addSnowyTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(0, 0.1f, 1))));
+    public static void addJungleEdgeTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f), Feature.TREE.configured(BiomeDefaultFeatures.JUNGLE_BUSH_CONFIG).weighted(0.5f)), Feature.TREE.configured(BiomeDefaultFeatures.JUNGLE_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(2, 0.1f, 1))));
     }
     
-    public static void addGiantSpruceTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.MEGA_SPRUCE_TREE.configured(BiomeDefaultFeatures.MEGA_SPRUCE_TREE_CONFIG).weighted(0.33333334f), (WeightedConfiguredFeature<MegaTreeConfiguration>)Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.PINE_TREE_CONFIG).weighted(0.33333334f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
+    public static void addBadlandsTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(5, 0.1f, 1))));
     }
     
-    public static void addGiantTrees(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.MEGA_SPRUCE_TREE.configured(BiomeDefaultFeatures.MEGA_SPRUCE_TREE_CONFIG).weighted(0.025641026f), Feature.MEGA_SPRUCE_TREE.configured(BiomeDefaultFeatures.MEGA_PINE_TREE_CONFIG).weighted(0.30769232f), (WeightedConfiguredFeature<MegaTreeConfiguration>)Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.PINE_TREE_CONFIG).weighted(0.33333334f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
+    public static void addSnowyTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(0, 0.1f, 1))));
     }
     
-    public static void addJungleGrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.JUNGLE_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(25))));
+    public static void addGiantSpruceTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.MEGA_SPRUCE_TREE_CONFIG).weighted(0.33333334f), Feature.TREE.configured(BiomeDefaultFeatures.PINE_TREE_CONFIG).weighted(0.33333334f)), Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
     }
     
-    public static void addSavannaGrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TALL_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(7))));
+    public static void addGiantTrees(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.MEGA_SPRUCE_TREE_CONFIG).weighted(0.025641026f), Feature.TREE.configured(BiomeDefaultFeatures.MEGA_PINE_TREE_CONFIG).weighted(0.30769232f), Feature.TREE.configured(BiomeDefaultFeatures.PINE_TREE_CONFIG).weighted(0.33333334f)), Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(10, 0.1f, 1))));
     }
     
-    public static void addShatteredSavannaGrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(5))));
+    public static void addJungleGrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.JUNGLE_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(25))));
     }
     
-    public static void addSavannaExtraGrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(20))));
+    public static void addSavannaGrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TALL_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(7))));
     }
     
-    public static void addBadlandGrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEAD_BUSH_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(20))));
+    public static void addShatteredSavannaGrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(5))));
     }
     
-    public static void addForestFlowers(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_RANDOM_SELECTOR.configured(new RandomRandomFeatureConfiguration(ImmutableList.of(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DOUBLE_LILAC_CONFIG), Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DOUBLE_ROSE_BUSH_CONFIG), Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DOUBLE_PEONY_CONFIG), Feature.FLOWER.configured(BiomeDefaultFeatures.GENERAL_FOREST_FLOWER_CONFIG)), 0)).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(5))));
+    public static void addSavannaExtraGrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(20))));
     }
     
-    public static void addForestGrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(2))));
+    public static void addBadlandGrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEAD_BUSH_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(20))));
     }
     
-    public static void addSwampVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SWAMP_TREE_CONFIG).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(2, 0.1f, 1))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.FLOWER.configured(BiomeDefaultFeatures.SwAMP_FLOWER_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(1))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(5))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEAD_BUSH_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.WATERLILLY_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(4))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP.configured(new FrequencyChanceDecoratorConfiguration(8, 0.25f))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP_DOUBLE.configured(new FrequencyChanceDecoratorConfiguration(8, 0.125f))));
+    public static void addForestFlowers(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_RANDOM_SELECTOR.configured(new RandomRandomFeatureConfiguration(ImmutableList.of(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DOUBLE_LILAC_CONFIG), Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DOUBLE_ROSE_BUSH_CONFIG), Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DOUBLE_PEONY_CONFIG), Feature.FLOWER.configured(BiomeDefaultFeatures.GENERAL_FOREST_FLOWER_CONFIG)), 0)).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(5))));
     }
     
-    public static void addMushroomFieldVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_BOOLEAN_SELECTOR.configured(new RandomBooleanFeatureConfiguration(Feature.HUGE_RED_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_RED_MUSHROOM_CONFIG), Feature.HUGE_BROWN_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_BROWN_MUSHROOM_CONFIG))).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(1))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP.configured(new FrequencyChanceDecoratorConfiguration(1, 0.25f))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP_DOUBLE.configured(new FrequencyChanceDecoratorConfiguration(1, 0.125f))));
+    public static void addForestGrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(2))));
     }
     
-    public static void addPlainVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_WITH_BEES_005_CONFIG).weighted(0.33333334f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_WITH_BEES_005_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(0, 0.05f, 1))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.FLOWER.configured(BiomeDefaultFeatures.PLAIN_FLOWER_CONFIG).decorated(FeatureDecorator.NOISE_HEIGHTMAP_32.configured(new NoiseDependantDecoratorConfiguration(-0.8, 15, 4))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.NOISE_HEIGHTMAP_DOUBLE.configured(new NoiseDependantDecoratorConfiguration(-0.8, 5, 10))));
+    public static void addSwampVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.TREE.configured(BiomeDefaultFeatures.SWAMP_TREE_CONFIG).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(2, 0.1f, 1))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.FLOWER.configured(BiomeDefaultFeatures.SwAMP_FLOWER_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(1))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(5))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEAD_BUSH_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.WATERLILLY_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(4))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP.configured(new FrequencyChanceDecoratorConfiguration(8, 0.25f))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP_DOUBLE.configured(new FrequencyChanceDecoratorConfiguration(8, 0.125f))));
     }
     
-    public static void addDesertVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEAD_BUSH_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(2))));
+    public static void addMushroomFieldVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_BOOLEAN_SELECTOR.configured(new RandomBooleanFeatureConfiguration(Feature.HUGE_RED_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_RED_MUSHROOM_CONFIG), Feature.HUGE_BROWN_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_BROWN_MUSHROOM_CONFIG))).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(1))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP.configured(new FrequencyChanceDecoratorConfiguration(1, 0.25f))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP_DOUBLE.configured(new FrequencyChanceDecoratorConfiguration(1, 0.125f))));
     }
     
-    public static void addGiantTaigaVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TAIGA_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(7))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEAD_BUSH_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP.configured(new FrequencyChanceDecoratorConfiguration(3, 0.25f))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP_DOUBLE.configured(new FrequencyChanceDecoratorConfiguration(3, 0.125f))));
+    public static void addPlainVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_WITH_BEES_005_CONFIG).weighted(0.33333334f)), Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_WITH_BEES_005_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(0, 0.05f, 1))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.FLOWER.configured(BiomeDefaultFeatures.PLAIN_FLOWER_CONFIG).decorated(FeatureDecorator.NOISE_HEIGHTMAP_32.configured(new NoiseDependantDecoratorConfiguration(-0.8, 15, 4))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.NOISE_HEIGHTMAP_DOUBLE.configured(new NoiseDependantDecoratorConfiguration(-0.8, 5, 10))));
     }
     
-    public static void addDefaultFlowers(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.FLOWER.configured(BiomeDefaultFeatures.DEFAULT_FLOWER_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(2))));
+    public static void addDesertVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEAD_BUSH_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(2))));
     }
     
-    public static void addWarmFlowers(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.FLOWER.configured(BiomeDefaultFeatures.DEFAULT_FLOWER_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(4))));
+    public static void addGiantTaigaVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TAIGA_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(7))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEAD_BUSH_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP.configured(new FrequencyChanceDecoratorConfiguration(3, 0.25f))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP_DOUBLE.configured(new FrequencyChanceDecoratorConfiguration(3, 0.125f))));
     }
     
-    public static void addDefaultGrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
+    public static void addDefaultFlowers(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.FLOWER.configured(BiomeDefaultFeatures.DEFAULT_FLOWER_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(2))));
     }
     
-    public static void addTaigaGrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TAIGA_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP.configured(new FrequencyChanceDecoratorConfiguration(1, 0.25f))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP_DOUBLE.configured(new FrequencyChanceDecoratorConfiguration(1, 0.125f))));
+    public static void addWarmFlowers(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.FLOWER.configured(BiomeDefaultFeatures.DEFAULT_FLOWER_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(4))));
     }
     
-    public static void addPlainGrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TALL_GRASS_CONFIG).decorated(FeatureDecorator.NOISE_HEIGHTMAP_32.configured(new NoiseDependantDecoratorConfiguration(-0.8, 0, 7))));
+    public static void addDefaultGrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DEFAULT_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
     }
     
-    public static void addDefaultMushrooms(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(4))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(8))));
+    public static void addTaigaGrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TAIGA_GRASS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP.configured(new FrequencyChanceDecoratorConfiguration(1, 0.25f))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.COUNT_CHANCE_HEIGHTMAP_DOUBLE.configured(new FrequencyChanceDecoratorConfiguration(1, 0.125f))));
     }
     
-    public static void addDefaultExtraVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SUGAR_CANE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(10))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.PUMPKIN_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(32))));
+    public static void addPlainGrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TALL_GRASS_CONFIG).decorated(FeatureDecorator.NOISE_HEIGHTMAP_32.configured(new NoiseDependantDecoratorConfiguration(-0.8, 0, 7))));
     }
     
-    public static void addBadlandExtraVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SUGAR_CANE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(13))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.PUMPKIN_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(32))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.CACTUS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(5))));
+    public static void addDefaultMushrooms(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(4))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(8))));
     }
     
-    public static void addJungleExtraVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.MELON_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.VINES.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_HEIGHT_64.configured(new FrequencyDecoratorConfiguration(50))));
+    public static void addDefaultExtraVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SUGAR_CANE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(10))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.PUMPKIN_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(32))));
     }
     
-    public static void addDesertExtraVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SUGAR_CANE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(60))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.PUMPKIN_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(32))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.CACTUS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(10))));
+    public static void addBadlandExtraVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SUGAR_CANE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(13))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.PUMPKIN_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(32))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.CACTUS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(5))));
     }
     
-    public static void addSwampExtraVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SUGAR_CANE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(20))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.PUMPKIN_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(32))));
+    public static void addJungleExtraVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.MELON_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(1))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.VINES.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_HEIGHT_64.configured(new FrequencyDecoratorConfiguration(50))));
     }
     
-    public static void addDesertExtraDecoration(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.DESERT_WELL.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.CHANCE_HEIGHTMAP.configured(new ChanceDecoratorConfiguration(1000))));
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.FOSSIL.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.CHANCE_PASSTHROUGH.configured(new ChanceDecoratorConfiguration(64))));
+    public static void addDesertExtraVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SUGAR_CANE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(60))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.PUMPKIN_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(32))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.CACTUS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(10))));
     }
     
-    public static void addSwampExtraDecoration(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.FOSSIL.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.CHANCE_PASSTHROUGH.configured(new ChanceDecoratorConfiguration(64))));
+    public static void addSwampExtraVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SUGAR_CANE_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyDecoratorConfiguration(20))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.PUMPKIN_CONFIG).decorated(FeatureDecorator.CHANCE_HEIGHTMAP_DOUBLE.configured(new ChanceDecoratorConfiguration(32))));
     }
     
-    public static void addColdOceanExtraVegetation(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.KELP.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP_NOISE_BIASED.configured(new NoiseCountFactorDecoratorConfiguration(120, 80.0, 0.0, Heightmap.Types.OCEAN_FLOOR_WG))));
+    public static void addDesertExtraDecoration(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.DESERT_WELL.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.CHANCE_HEIGHTMAP.configured(new ChanceDecoratorConfiguration(1000))));
     }
     
-    public static void addDefaultSeagrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SIMPLE_BLOCK.configured(new SimpleBlockConfiguration(BiomeDefaultFeatures.SEAGRASS, new BlockState[] { BiomeDefaultFeatures.STONE }, new BlockState[] { BiomeDefaultFeatures.WATER }, new BlockState[] { BiomeDefaultFeatures.WATER })).decorated(FeatureDecorator.CARVING_MASK.configured(new CarvingMaskDecoratorConfiguration(GenerationStep.Carving.LIQUID, 0.1f))));
+    public static void addFossilDecoration(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_STRUCTURES, Feature.FOSSIL.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.CHANCE_PASSTHROUGH.configured(new ChanceDecoratorConfiguration(64))));
     }
     
-    public static void addWarmSeagrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SEAGRASS.configured(new SeagrassFeatureConfiguration(80, 0.3)).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP.configured(DecoratorConfiguration.NONE)));
+    public static void addColdOceanExtraVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.KELP.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP_NOISE_BIASED.configured(new NoiseCountFactorDecoratorConfiguration(120, 80.0, 0.0, Heightmap.Types.OCEAN_FLOOR_WG))));
     }
     
-    public static void addDeepWarmSeagrass(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SEAGRASS.configured(new SeagrassFeatureConfiguration(80, 0.8)).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP.configured(DecoratorConfiguration.NONE)));
+    public static void addDefaultSeagrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SIMPLE_BLOCK.configured(new SimpleBlockConfiguration(BiomeDefaultFeatures.SEAGRASS, ImmutableList.<BlockState>of(BiomeDefaultFeatures.STONE), ImmutableList.<BlockState>of(BiomeDefaultFeatures.WATER), ImmutableList.<BlockState>of(BiomeDefaultFeatures.WATER))).decorated(FeatureDecorator.CARVING_MASK.configured(new CarvingMaskDecoratorConfiguration(GenerationStep.Carving.LIQUID, 0.1f))));
     }
     
-    public static void addLukeWarmKelp(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.KELP.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP_NOISE_BIASED.configured(new NoiseCountFactorDecoratorConfiguration(80, 80.0, 0.0, Heightmap.Types.OCEAN_FLOOR_WG))));
+    public static void addWarmSeagrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SEAGRASS.configured(new SeagrassFeatureConfiguration(80, 0.3)).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP.configured(DecoratorConfiguration.NONE)));
     }
     
-    public static void addDefaultSprings(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.WATER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_BIASED_RANGE.configured(new CountRangeDecoratorConfiguration(50, 8, 8, 256))));
-        bkt.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.LAVA_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_VERY_BIASED_RANGE.configured(new CountRangeDecoratorConfiguration(20, 8, 16, 256))));
+    public static void addDeepWarmSeagrass(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SEAGRASS.configured(new SeagrassFeatureConfiguration(80, 0.8)).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP.configured(DecoratorConfiguration.NONE)));
     }
     
-    public static void addIcebergs(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, Feature.ICEBERG.configured(new BlockStateConfiguration(BiomeDefaultFeatures.PACKED_ICE)).decorated(FeatureDecorator.ICEBERG.configured(new ChanceDecoratorConfiguration(16))));
-        bkt.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, Feature.ICEBERG.configured(new BlockStateConfiguration(BiomeDefaultFeatures.BLUE_ICE)).decorated(FeatureDecorator.ICEBERG.configured(new ChanceDecoratorConfiguration(200))));
+    public static void addLukeWarmKelp(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.KELP.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP_NOISE_BIASED.configured(new NoiseCountFactorDecoratorConfiguration(80, 80.0, 0.0, Heightmap.Types.OCEAN_FLOOR_WG))));
     }
     
-    public static void addBlueIce(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.BLUE_ICE.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.RANDOM_COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(20, 30, 32, 64))));
+    public static void addDefaultSprings(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.WATER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_BIASED_RANGE.configured(new CountRangeDecoratorConfiguration(50, 8, 8, 256))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.LAVA_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_VERY_BIASED_RANGE.configured(new CountRangeDecoratorConfiguration(20, 8, 16, 256))));
     }
     
-    public static void addSurfaceFreezing(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, Feature.FREEZE_TOP_LAYER.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
+    public static void addIcebergs(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, Feature.ICEBERG.configured(new BlockStateConfiguration(BiomeDefaultFeatures.PACKED_ICE)).decorated(FeatureDecorator.ICEBERG.configured(new ChanceDecoratorConfiguration(16))));
+        bre.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, Feature.ICEBERG.configured(new BlockStateConfiguration(BiomeDefaultFeatures.BLUE_ICE)).decorated(FeatureDecorator.ICEBERG.configured(new ChanceDecoratorConfiguration(200))));
     }
     
-    public static void addEndCity(final Biome bkt) {
-        bkt.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.END_CITY.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
+    public static void addBlueIce(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.BLUE_ICE.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.RANDOM_COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(20, 30, 32, 64))));
+    }
+    
+    public static void addSurfaceFreezing(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, Feature.FREEZE_TOP_LAYER.configured(FeatureConfiguration.NONE));
+    }
+    
+    public static void addNetherDefaultOres(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, Blocks.GRAVEL.defaultBlockState(), 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(2, 5, 0, 37))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, Blocks.BLACKSTONE.defaultBlockState(), 33)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(2, 5, 10, 37))));
+        addNetherOres(bre, 10, 16);
+        addAncientDebris(bre);
+    }
+    
+    public static void addNetherOres(final Biome bre, final int integer2, final int integer3) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, BiomeDefaultFeatures.NETHER_GOLD_ORE, 10)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(integer2, 10, 20, 128))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, BiomeDefaultFeatures.NETHER_QUARTZ_ORE, 14)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(integer3, 10, 20, 128))));
+    }
+    
+    public static void addAncientDebris(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.NO_SURFACE_ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHER_ORE_REPLACEABLES, Blocks.ANCIENT_DEBRIS.defaultBlockState(), 3)).decorated(FeatureDecorator.COUNT_DEPTH_AVERAGE.configured(new DepthAverageConfigation(1, 16, 8))));
+        bre.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.NO_SURFACE_ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHER_ORE_REPLACEABLES, Blocks.ANCIENT_DEBRIS.defaultBlockState(), 2)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(1, 8, 16, 128))));
+    }
+    
+    public static void addCrimsonForestVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.HUGE_FUNGUS.configured(HugeFungusConfiguration.HUGE_CRIMSON_FUNGI_NOT_PLANTED_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(8))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.NETHER_FOREST_VEGETATION.configured(BiomeDefaultFeatures.CRIMSON_FOREST_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(6))));
+    }
+    
+    public static void addWarpedForestVegetation(final Biome bre) {
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.HUGE_FUNGUS.configured(HugeFungusConfiguration.HUGE_WARPED_FUNGI_NOT_PLANTED_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(8))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.NETHER_FOREST_VEGETATION.configured(BiomeDefaultFeatures.WARPED_FOREST_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(5))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.NETHER_FOREST_VEGETATION.configured(BiomeDefaultFeatures.NETHER_SPROUTS_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(4))));
+        bre.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.TWISTING_VINES.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 128))));
     }
     
     static {
@@ -591,58 +702,104 @@ public class BiomeDefaultFeatures {
         DEAD_BUSH = Blocks.DEAD_BUSH.defaultBlockState();
         MELON = Blocks.MELON.defaultBlockState();
         PUMPKIN = Blocks.PUMPKIN.defaultBlockState();
-        SWEET_BERRY_BUSH = ((AbstractStateHolder<O, BlockState>)Blocks.SWEET_BERRY_BUSH.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, 3);
+        SWEET_BERRY_BUSH = ((StateHolder<O, BlockState>)Blocks.SWEET_BERRY_BUSH.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, 3);
         FIRE = Blocks.FIRE.defaultBlockState();
+        SOUL_FIRE = Blocks.SOUL_FIRE.defaultBlockState();
         NETHERRACK = Blocks.NETHERRACK.defaultBlockState();
+        SOUL_SOIL = Blocks.SOUL_SOIL.defaultBlockState();
+        CRIMSON_ROOTS = Blocks.CRIMSON_ROOTS.defaultBlockState();
         LILY_PAD = Blocks.LILY_PAD.defaultBlockState();
         SNOW = Blocks.SNOW.defaultBlockState();
         JACK_O_LANTERN = Blocks.JACK_O_LANTERN.defaultBlockState();
         SUNFLOWER = Blocks.SUNFLOWER.defaultBlockState();
         CACTUS = Blocks.CACTUS.defaultBlockState();
         SUGAR_CANE = Blocks.SUGAR_CANE.defaultBlockState();
-        HUGE_RED_MUSHROOM = ((AbstractStateHolder<O, BlockState>)Blocks.RED_MUSHROOM_BLOCK.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.DOWN, false);
-        HUGE_BROWN_MUSHROOM = (((AbstractStateHolder<O, BlockState>)Blocks.BROWN_MUSHROOM_BLOCK.defaultBlockState()).setValue((Property<Comparable>)HugeMushroomBlock.UP, true)).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.DOWN, false);
-        HUGE_MUSHROOM_STEM = (((AbstractStateHolder<O, BlockState>)Blocks.MUSHROOM_STEM.defaultBlockState()).setValue((Property<Comparable>)HugeMushroomBlock.UP, false)).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.DOWN, false);
-        NORMAL_TREE_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(4).heightRandA(2).foliageHeight(3).ignoreVines().build();
-        JUNGLE_TREE_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(4).heightRandA(8).foliageHeight(3).decorators(ImmutableList.<TreeDecorator>of(new CocoaDecorator(0.2f), new TrunkVineDecorator(), new LeaveVineDecorator())).ignoreVines().build();
-        JUNGLE_TREE_NOVINE_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(4).heightRandA(8).foliageHeight(3).ignoreVines().build();
-        PINE_TREE_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LEAVES), new PineFoliagePlacer(1, 0)).baseHeight(7).heightRandA(4).trunkTopOffset(1).foliageHeight(3).foliageHeightRandom(1).ignoreVines().build();
-        SPRUCE_TREE_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LEAVES), new SpruceFoliagePlacer(2, 1)).baseHeight(6).heightRandA(3).trunkHeight(1).trunkHeightRandom(1).trunkTopOffsetRandom(2).ignoreVines().build();
-        ACACIA_TREE_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.ACACIA_LOG), new SimpleStateProvider(BiomeDefaultFeatures.ACACIA_LEAVES), new AcaciaFoliagePlacer(2, 0)).baseHeight(5).heightRandA(2).heightRandB(2).trunkHeight(0).ignoreVines().build();
-        BIRCH_TREE_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LOG), new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(5).heightRandA(2).foliageHeight(3).ignoreVines().build();
-        BIRCH_TREE_WITH_BEES_0002_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LOG), new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(5).heightRandA(2).foliageHeight(3).ignoreVines().decorators(ImmutableList.of(new BeehiveDecorator(0.002f))).build();
-        SUPER_BIRCH_TREE_WITH_BEES_0002_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LOG), new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(5).heightRandA(2).heightRandB(6).foliageHeight(3).ignoreVines().decorators(ImmutableList.of(new BeehiveDecorator(0.002f))).build();
-        SWAMP_TREE_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(3, 0)).baseHeight(5).heightRandA(3).foliageHeight(3).maxWaterDepth(1).decorators(ImmutableList.of(new LeaveVineDecorator())).build();
-        FANCY_TREE_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(0, 0)).build();
-        NORMAL_TREE_WITH_BEES_005_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(4).heightRandA(2).foliageHeight(3).ignoreVines().decorators(ImmutableList.of(new BeehiveDecorator(0.05f))).build();
-        FANCY_TREE_WITH_BEES_0002_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(0, 0)).decorators(ImmutableList.of(new BeehiveDecorator(0.002f))).build();
-        FANCY_TREE_WITH_BEES_005_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(0, 0)).decorators(ImmutableList.of(new BeehiveDecorator(0.05f))).build();
-        NORMAL_TREE_WITH_BEES_0002_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(4).heightRandA(2).foliageHeight(3).ignoreVines().decorators(ImmutableList.of(new BeehiveDecorator(0.002f))).build();
-        NORMAL_TREE_WITH_BEES_002_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(4).heightRandA(2).foliageHeight(3).ignoreVines().decorators(ImmutableList.of(new BeehiveDecorator(0.02f))).build();
-        FANCY_TREE_WITH_BEES_002_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(0, 0)).decorators(ImmutableList.of(new BeehiveDecorator(0.02f))).build();
-        BIRCH_TREE_WITH_BEES_002_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LOG), new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(5).heightRandA(2).foliageHeight(3).ignoreVines().decorators(ImmutableList.of(new BeehiveDecorator(0.02f))).build();
-        BIRCH_TREE_WITH_BEES_005_CONFIG = new SmallTreeConfiguration.SmallTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LOG), new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LEAVES), new BlobFoliagePlacer(2, 0)).baseHeight(5).heightRandA(2).foliageHeight(3).ignoreVines().decorators(ImmutableList.of(new BeehiveDecorator(0.05f))).build();
-        JUNGLE_BUSH_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES)).baseHeight(4).build();
-        DARK_OAK_TREE_CONFIG = new MegaTreeConfiguration.MegaTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.DARK_OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.DARK_OAK_LEAVES)).baseHeight(6).build();
-        MEGA_SPRUCE_TREE_CONFIG = new MegaTreeConfiguration.MegaTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LEAVES)).baseHeight(13).heightInterval(15).crownHeight(13).decorators(ImmutableList.of(new AlterGroundDecorator(new SimpleStateProvider(BiomeDefaultFeatures.PODZOL)))).build();
-        MEGA_PINE_TREE_CONFIG = new MegaTreeConfiguration.MegaTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LEAVES)).baseHeight(13).heightInterval(15).crownHeight(3).decorators(ImmutableList.of(new AlterGroundDecorator(new SimpleStateProvider(BiomeDefaultFeatures.PODZOL)))).build();
-        MEGA_JUNGLE_TREE_CONFIG = new MegaTreeConfiguration.MegaTreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LEAVES)).baseHeight(10).heightInterval(20).decorators(ImmutableList.<TreeDecorator>of(new TrunkVineDecorator(), new LeaveVineDecorator())).build();
-        DEFAULT_GRASS_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.GRASS), new SimpleBlockPlacer()).tries(32).build();
-        TAIGA_GRASS_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new WeightedStateProvider().add(BiomeDefaultFeatures.GRASS, 1).add(BiomeDefaultFeatures.FERN, 4), new SimpleBlockPlacer()).tries(32).build();
-        JUNGLE_GRASS_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new WeightedStateProvider().add(BiomeDefaultFeatures.GRASS, 3).add(BiomeDefaultFeatures.FERN, 1), new SimpleBlockPlacer()).blacklist(ImmutableSet.<BlockState>of(BiomeDefaultFeatures.PODZOL)).tries(32).build();
-        GENERAL_FOREST_FLOWER_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.LILY_OF_THE_VALLEY), new SimpleBlockPlacer()).tries(64).build();
-        SwAMP_FLOWER_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BLUE_ORCHID), new SimpleBlockPlacer()).tries(64).build();
-        DEFAULT_FLOWER_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new WeightedStateProvider().add(BiomeDefaultFeatures.POPPY, 2).add(BiomeDefaultFeatures.DANDELION, 1), new SimpleBlockPlacer()).tries(64).build();
-        PLAIN_FLOWER_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new PlainFlowerProvider(), new SimpleBlockPlacer()).tries(64).build();
-        FOREST_FLOWER_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new ForestFlowerProvider(), new SimpleBlockPlacer()).tries(64).build();
-        DEAD_BUSH_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.DEAD_BUSH), new SimpleBlockPlacer()).tries(4).build();
-        MELON_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.MELON), new SimpleBlockPlacer()).tries(64).whitelist(ImmutableSet.<Block>of(BiomeDefaultFeatures.GRASS_BLOCK.getBlock())).canReplace().noProjection().build();
-        PUMPKIN_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.PUMPKIN), new SimpleBlockPlacer()).tries(64).whitelist(ImmutableSet.<Block>of(BiomeDefaultFeatures.GRASS_BLOCK.getBlock())).noProjection().build();
-        SWEET_BERRY_BUSH_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SWEET_BERRY_BUSH), new SimpleBlockPlacer()).tries(64).whitelist(ImmutableSet.<Block>of(BiomeDefaultFeatures.GRASS_BLOCK.getBlock())).noProjection().build();
-        HELL_FIRE_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.FIRE), new SimpleBlockPlacer()).tries(64).whitelist(ImmutableSet.<Block>of(BiomeDefaultFeatures.NETHERRACK.getBlock())).noProjection().build();
-        WATERLILLY_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.LILY_PAD), new SimpleBlockPlacer()).tries(10).build();
-        RED_MUSHROOM_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.RED_MUSHROOM), new SimpleBlockPlacer()).tries(64).noProjection().build();
-        BROWN_MUSHROOM_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BROWN_MUSHROOM), new SimpleBlockPlacer()).tries(64).noProjection().build();
+        HUGE_RED_MUSHROOM = ((StateHolder<O, BlockState>)Blocks.RED_MUSHROOM_BLOCK.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.DOWN, false);
+        HUGE_BROWN_MUSHROOM = (((StateHolder<O, BlockState>)Blocks.BROWN_MUSHROOM_BLOCK.defaultBlockState()).setValue((Property<Comparable>)HugeMushroomBlock.UP, true)).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.DOWN, false);
+        HUGE_MUSHROOM_STEM = (((StateHolder<O, BlockState>)Blocks.MUSHROOM_STEM.defaultBlockState()).setValue((Property<Comparable>)HugeMushroomBlock.UP, false)).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.DOWN, false);
+        NETHER_GOLD_ORE = Blocks.NETHER_GOLD_ORE.defaultBlockState();
+        NETHER_QUARTZ_ORE = Blocks.NETHER_QUARTZ_ORE.defaultBlockState();
+        WARPED_STEM = Blocks.WARPED_STEM.defaultBlockState();
+        WARPED_WART_BLOCK = Blocks.WARPED_WART_BLOCK.defaultBlockState();
+        NETHER_WART_BLOCK = Blocks.NETHER_WART_BLOCK.defaultBlockState();
+        CRIMSON_STEM = Blocks.CRIMSON_STEM.defaultBlockState();
+        SHROOMLIGHT = Blocks.SHROOMLIGHT.defaultBlockState();
+        PILLAGER_OUTPOST = StructureFeature.PILLAGER_OUTPOST.configured(NoneFeatureConfiguration.INSTANCE);
+        MINESHAFT = StructureFeature.MINESHAFT.configured(new MineshaftConfiguration(0.004000000189989805, MineshaftFeature.Type.NORMAL));
+        MINESHAFT_MESA = StructureFeature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.MESA));
+        WOODLAND_MANSION = StructureFeature.WOODLAND_MANSION.configured(NoneFeatureConfiguration.INSTANCE);
+        JUNGLE_TEMPLE = StructureFeature.JUNGLE_TEMPLE.configured(NoneFeatureConfiguration.INSTANCE);
+        DESERT_PYRAMID = StructureFeature.DESERT_PYRAMID.configured(NoneFeatureConfiguration.INSTANCE);
+        IGLOO = StructureFeature.IGLOO.configured(NoneFeatureConfiguration.INSTANCE);
+        SHIPWRECK = StructureFeature.SHIPWRECK.configured(new ShipwreckConfiguration(false));
+        SHIPWRECH_BEACHED = StructureFeature.SHIPWRECK.configured(new ShipwreckConfiguration(true));
+        SWAMP_HUT = StructureFeature.SWAMP_HUT.configured(NoneFeatureConfiguration.INSTANCE);
+        STRONGHOLD = StructureFeature.STRONGHOLD.configured(NoneFeatureConfiguration.INSTANCE);
+        OCEAN_MONUMENT = StructureFeature.OCEAN_MONUMENT.configured(NoneFeatureConfiguration.INSTANCE);
+        OCEAN_RUIN_COLD = StructureFeature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.COLD, 0.3f, 0.9f));
+        OCEAN_RUIN_WARM = StructureFeature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.WARM, 0.3f, 0.9f));
+        NETHER_BRIDGE = StructureFeature.NETHER_BRIDGE.configured(NoneFeatureConfiguration.INSTANCE);
+        NETHER_FOSSIL = StructureFeature.NETHER_FOSSIL.configured(NoneFeatureConfiguration.INSTANCE);
+        END_CITY = StructureFeature.END_CITY.configured(NoneFeatureConfiguration.INSTANCE);
+        BURIED_TREASURE = StructureFeature.BURIED_TREASURE.configured(new BuriedTreasureConfiguration(0.01f));
+        BASTION_REMNANT = StructureFeature.BASTION_REMNANT.configured(new MultiJigsawConfiguration(BastionPieces.POOLS));
+        VILLAGE_PLAINS = StructureFeature.VILLAGE.configured(new JigsawConfiguration(new ResourceLocation("village/plains/town_centers"), 6));
+        VILLAGE_DESERT = StructureFeature.VILLAGE.configured(new JigsawConfiguration(new ResourceLocation("village/desert/town_centers"), 6));
+        VILLAGE_SAVANNA = StructureFeature.VILLAGE.configured(new JigsawConfiguration(new ResourceLocation("village/savanna/town_centers"), 6));
+        VILLAGE_SNOVY = StructureFeature.VILLAGE.configured(new JigsawConfiguration(new ResourceLocation("village/snowy/town_centers"), 6));
+        VILLAGE_TAIGA = StructureFeature.VILLAGE.configured(new JigsawConfiguration(new ResourceLocation("village/taiga/town_centers"), 6));
+        RUINED_PORTAL_STANDARD = StructureFeature.RUINED_PORTAL.configured(new RuinedPortalConfiguration(RuinedPortalFeature.Type.STANDARD));
+        RUINED_PORTAL_DESERT = StructureFeature.RUINED_PORTAL.configured(new RuinedPortalConfiguration(RuinedPortalFeature.Type.DESERT));
+        RUINED_PORTAL_JUNGLE = StructureFeature.RUINED_PORTAL.configured(new RuinedPortalConfiguration(RuinedPortalFeature.Type.JUNGLE));
+        RUINED_PORTAL_SWAMP = StructureFeature.RUINED_PORTAL.configured(new RuinedPortalConfiguration(RuinedPortalFeature.Type.SWAMP));
+        RUINED_PORTAL_MOUNTAIN = StructureFeature.RUINED_PORTAL.configured(new RuinedPortalConfiguration(RuinedPortalFeature.Type.MOUNTAIN));
+        RUINED_PORTAL_OCEAN = StructureFeature.RUINED_PORTAL.configured(new RuinedPortalConfiguration(RuinedPortalFeature.Type.OCEAN));
+        RUINED_PORTAL_NETHER = StructureFeature.RUINED_PORTAL.configured(new RuinedPortalConfiguration(RuinedPortalFeature.Type.NETHER));
+        NORMAL_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(2, 0, 0, 0, 3), new StraightTrunkPlacer(4, 2, 0), new TwoLayersFeatureSize(1, 0, 1)).ignoreVines().build();
+        BEEHIVE_0002 = new BeehiveDecorator(0.002f);
+        BEEHIVE_002 = new BeehiveDecorator(0.02f);
+        BEEHIVE_005 = new BeehiveDecorator(0.05f);
+        NORMAL_TREE_WITH_BEES_0002_CONFIG = BiomeDefaultFeatures.NORMAL_TREE_CONFIG.withDecorators(ImmutableList.of(BiomeDefaultFeatures.BEEHIVE_0002));
+        NORMAL_TREE_WITH_BEES_002_CONFIG = BiomeDefaultFeatures.NORMAL_TREE_CONFIG.withDecorators(ImmutableList.of(BiomeDefaultFeatures.BEEHIVE_002));
+        NORMAL_TREE_WITH_BEES_005_CONFIG = BiomeDefaultFeatures.NORMAL_TREE_CONFIG.withDecorators(ImmutableList.of(BiomeDefaultFeatures.BEEHIVE_005));
+        JUNGLE_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LEAVES), new BlobFoliagePlacer(2, 0, 0, 0, 3), new StraightTrunkPlacer(4, 8, 0), new TwoLayersFeatureSize(1, 0, 1)).decorators(ImmutableList.<TreeDecorator>of(new CocoaDecorator(0.2f), TrunkVineDecorator.INSTANCE, LeaveVineDecorator.INSTANCE)).ignoreVines().build();
+        JUNGLE_TREE_NOVINE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LEAVES), new BlobFoliagePlacer(2, 0, 0, 0, 3), new StraightTrunkPlacer(4, 8, 0), new TwoLayersFeatureSize(1, 0, 1)).ignoreVines().build();
+        PINE_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LEAVES), new PineFoliagePlacer(1, 0, 1, 0, 3, 1), new StraightTrunkPlacer(6, 4, 0), new TwoLayersFeatureSize(2, 0, 2)).ignoreVines().build();
+        SPRUCE_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LEAVES), new SpruceFoliagePlacer(2, 1, 0, 2, 1, 1), new StraightTrunkPlacer(5, 2, 1), new TwoLayersFeatureSize(2, 0, 2)).ignoreVines().build();
+        ACACIA_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.ACACIA_LOG), new SimpleStateProvider(BiomeDefaultFeatures.ACACIA_LEAVES), new AcaciaFoliagePlacer(2, 0, 0, 0), new ForkingTrunkPlacer(5, 2, 2), new TwoLayersFeatureSize(1, 0, 2)).ignoreVines().build();
+        BIRCH_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LOG), new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LEAVES), new BlobFoliagePlacer(2, 0, 0, 0, 3), new StraightTrunkPlacer(5, 2, 0), new TwoLayersFeatureSize(1, 0, 1)).ignoreVines().build();
+        BIRCH_TREE_WITH_BEES_0002_CONFIG = BiomeDefaultFeatures.BIRCH_TREE_CONFIG.withDecorators(ImmutableList.of(BiomeDefaultFeatures.BEEHIVE_0002));
+        BIRCH_TREE_WITH_BEES_002_CONFIG = BiomeDefaultFeatures.BIRCH_TREE_CONFIG.withDecorators(ImmutableList.of(BiomeDefaultFeatures.BEEHIVE_002));
+        BIRCH_TREE_WITH_BEES_005_CONFIG = BiomeDefaultFeatures.BIRCH_TREE_CONFIG.withDecorators(ImmutableList.of(BiomeDefaultFeatures.BEEHIVE_005));
+        SUPER_BIRCH_TREE_WITH_BEES_0002_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LOG), new SimpleStateProvider(BiomeDefaultFeatures.BIRCH_LEAVES), new BlobFoliagePlacer(2, 0, 0, 0, 3), new StraightTrunkPlacer(5, 2, 6), new TwoLayersFeatureSize(1, 0, 1)).ignoreVines().decorators(ImmutableList.of(BiomeDefaultFeatures.BEEHIVE_0002)).build();
+        SWAMP_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BlobFoliagePlacer(3, 0, 0, 0, 3), new StraightTrunkPlacer(5, 3, 0), new TwoLayersFeatureSize(1, 0, 1)).maxWaterDepth(1).decorators(ImmutableList.of(LeaveVineDecorator.INSTANCE)).build();
+        FANCY_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new FancyFoliagePlacer(2, 0, 4, 0, 4), new FancyTrunkPlacer(3, 11, 0), new TwoLayersFeatureSize(0, 0, 0, OptionalInt.of(4))).ignoreVines().heightmap(Heightmap.Types.MOTION_BLOCKING).build();
+        FANCY_TREE_WITH_BEES_0002_CONFIG = BiomeDefaultFeatures.FANCY_TREE_CONFIG.withDecorators(ImmutableList.of(BiomeDefaultFeatures.BEEHIVE_0002));
+        FANCY_TREE_WITH_BEES_002_CONFIG = BiomeDefaultFeatures.FANCY_TREE_CONFIG.withDecorators(ImmutableList.of(BiomeDefaultFeatures.BEEHIVE_002));
+        FANCY_TREE_WITH_BEES_005_CONFIG = BiomeDefaultFeatures.FANCY_TREE_CONFIG.withDecorators(ImmutableList.of(BiomeDefaultFeatures.BEEHIVE_005));
+        JUNGLE_BUSH_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.OAK_LEAVES), new BushFoliagePlacer(2, 0, 1, 0, 2), new StraightTrunkPlacer(1, 0, 0), new TwoLayersFeatureSize(0, 0, 0)).heightmap(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES).build();
+        DARK_OAK_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.DARK_OAK_LOG), new SimpleStateProvider(BiomeDefaultFeatures.DARK_OAK_LEAVES), new DarkOakFoliagePlacer(0, 0, 0, 0), new DarkOakTrunkPlacer(6, 2, 1), new ThreeLayersFeatureSize(1, 1, 0, 1, 2, OptionalInt.empty())).maxWaterDepth(Integer.MAX_VALUE).heightmap(Heightmap.Types.MOTION_BLOCKING).ignoreVines().build();
+        MEGA_SPRUCE_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LEAVES), new MegaPineFoliagePlacer(0, 0, 0, 0, 4, 13), new GiantTrunkPlacer(13, 2, 14), new TwoLayersFeatureSize(1, 1, 2)).decorators(ImmutableList.of(new AlterGroundDecorator(new SimpleStateProvider(BiomeDefaultFeatures.PODZOL)))).build();
+        MEGA_PINE_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.SPRUCE_LEAVES), new MegaPineFoliagePlacer(0, 0, 0, 0, 4, 3), new GiantTrunkPlacer(13, 2, 14), new TwoLayersFeatureSize(1, 1, 2)).decorators(ImmutableList.of(new AlterGroundDecorator(new SimpleStateProvider(BiomeDefaultFeatures.PODZOL)))).build();
+        MEGA_JUNGLE_TREE_CONFIG = new TreeConfiguration.TreeConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LOG), new SimpleStateProvider(BiomeDefaultFeatures.JUNGLE_LEAVES), new MegaJungleFoliagePlacer(2, 0, 0, 0, 2), new MegaJungleTrunkPlacer(10, 2, 19), new TwoLayersFeatureSize(1, 1, 2)).decorators(ImmutableList.<TreeDecorator>of(TrunkVineDecorator.INSTANCE, LeaveVineDecorator.INSTANCE)).build();
+        DEFAULT_GRASS_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.GRASS), SimpleBlockPlacer.INSTANCE).tries(32).build();
+        TAIGA_GRASS_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new WeightedStateProvider().add(BiomeDefaultFeatures.GRASS, 1).add(BiomeDefaultFeatures.FERN, 4), SimpleBlockPlacer.INSTANCE).tries(32).build();
+        JUNGLE_GRASS_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new WeightedStateProvider().add(BiomeDefaultFeatures.GRASS, 3).add(BiomeDefaultFeatures.FERN, 1), SimpleBlockPlacer.INSTANCE).blacklist(ImmutableSet.<BlockState>of(BiomeDefaultFeatures.PODZOL)).tries(32).build();
+        GENERAL_FOREST_FLOWER_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.LILY_OF_THE_VALLEY), SimpleBlockPlacer.INSTANCE).tries(64).build();
+        SwAMP_FLOWER_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BLUE_ORCHID), SimpleBlockPlacer.INSTANCE).tries(64).build();
+        DEFAULT_FLOWER_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new WeightedStateProvider().add(BiomeDefaultFeatures.POPPY, 2).add(BiomeDefaultFeatures.DANDELION, 1), SimpleBlockPlacer.INSTANCE).tries(64).build();
+        PLAIN_FLOWER_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(PlainFlowerProvider.INSTANCE, SimpleBlockPlacer.INSTANCE).tries(64).build();
+        FOREST_FLOWER_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(ForestFlowerProvider.INSTANCE, SimpleBlockPlacer.INSTANCE).tries(64).build();
+        DEAD_BUSH_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.DEAD_BUSH), SimpleBlockPlacer.INSTANCE).tries(4).build();
+        MELON_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.MELON), SimpleBlockPlacer.INSTANCE).tries(64).whitelist(ImmutableSet.<Block>of(BiomeDefaultFeatures.GRASS_BLOCK.getBlock())).canReplace().noProjection().build();
+        PUMPKIN_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.PUMPKIN), SimpleBlockPlacer.INSTANCE).tries(64).whitelist(ImmutableSet.<Block>of(BiomeDefaultFeatures.GRASS_BLOCK.getBlock())).noProjection().build();
+        SWEET_BERRY_BUSH_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SWEET_BERRY_BUSH), SimpleBlockPlacer.INSTANCE).tries(64).whitelist(ImmutableSet.<Block>of(BiomeDefaultFeatures.GRASS_BLOCK.getBlock())).noProjection().build();
+        FIRE_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.FIRE), SimpleBlockPlacer.INSTANCE).tries(64).whitelist(ImmutableSet.<Block>of(BiomeDefaultFeatures.NETHERRACK.getBlock())).noProjection().build();
+        SOUL_FIRE_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.SOUL_FIRE), new SimpleBlockPlacer()).tries(64).whitelist(ImmutableSet.<Block>of(BiomeDefaultFeatures.SOUL_SOIL.getBlock())).noProjection().build();
+        WATERLILLY_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.LILY_PAD), SimpleBlockPlacer.INSTANCE).tries(10).build();
+        RED_MUSHROOM_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.RED_MUSHROOM), SimpleBlockPlacer.INSTANCE).tries(64).noProjection().build();
+        BROWN_MUSHROOM_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.BROWN_MUSHROOM), SimpleBlockPlacer.INSTANCE).tries(64).noProjection().build();
+        CRIMSON_ROOTS_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.CRIMSON_ROOTS), new SimpleBlockPlacer()).tries(64).noProjection().build();
         DOUBLE_LILAC_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.LILAC), new DoublePlantPlacer()).tries(64).noProjection().build();
         DOUBLE_ROSE_BUSH_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.ROSE_BUSH), new DoublePlantPlacer()).tries(64).noProjection().build();
         DOUBLE_PEONY_CONFIG = new RandomPatchConfiguration.GrassConfigurationBuilder(new SimpleStateProvider(BiomeDefaultFeatures.PEONY), new DoublePlantPlacer()).tries(64).noProjection().build();
@@ -656,11 +813,24 @@ public class BiomeDefaultFeatures {
         MELON_PILE_CONFIG = new BlockPileConfiguration(new SimpleStateProvider(BiomeDefaultFeatures.MELON));
         PUMPKIN_PILE_CONFIG = new BlockPileConfiguration(new WeightedStateProvider().add(BiomeDefaultFeatures.PUMPKIN, 19).add(BiomeDefaultFeatures.JACK_O_LANTERN, 1));
         ICE_PILE_CONFIG = new BlockPileConfiguration(new WeightedStateProvider().add(BiomeDefaultFeatures.BLUE_ICE, 1).add(BiomeDefaultFeatures.PACKED_ICE, 5));
-        WATER_SPRING_CONFIG = new SpringConfiguration(Fluids.WATER.defaultFluidState(), true, 4, 1, ImmutableSet.<Block>of(Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE));
-        LAVA_SPRING_CONFIG = new SpringConfiguration(Fluids.LAVA.defaultFluidState(), true, 4, 1, ImmutableSet.<Block>of(Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE));
-        OPEN_NETHER_SPRING_CONFIG = new SpringConfiguration(Fluids.LAVA.defaultFluidState(), false, 4, 1, ImmutableSet.<Block>of(Blocks.NETHERRACK));
-        CLOSED_NETHER_SPRING_CONFIG = new SpringConfiguration(Fluids.LAVA.defaultFluidState(), false, 5, 0, ImmutableSet.<Block>of(Blocks.NETHERRACK));
+        WATER_STATE = Fluids.WATER.defaultFluidState();
+        LAVA_STATE = Fluids.LAVA.defaultFluidState();
+        WATER_SPRING_CONFIG = new SpringConfiguration(BiomeDefaultFeatures.WATER_STATE, true, 4, 1, ImmutableSet.<Block>of(Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE));
+        LAVA_SPRING_CONFIG = new SpringConfiguration(BiomeDefaultFeatures.LAVA_STATE, true, 4, 1, ImmutableSet.<Block>of(Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE));
+        OPEN_NETHER_SPRING_CONFIG = new SpringConfiguration(BiomeDefaultFeatures.LAVA_STATE, false, 4, 1, ImmutableSet.<Block>of(Blocks.NETHERRACK));
+        BASALT_DELTA_SPRING_CONFIG = new SpringConfiguration(BiomeDefaultFeatures.LAVA_STATE, true, 4, 1, ImmutableSet.<Block>of(Blocks.NETHERRACK, Blocks.SOUL_SAND, Blocks.GRAVEL, Blocks.MAGMA_BLOCK, Blocks.BLACKSTONE));
+        CLOSED_NETHER_SPRING_CONFIG = new SpringConfiguration(BiomeDefaultFeatures.LAVA_STATE, false, 5, 0, ImmutableSet.<Block>of(Blocks.NETHERRACK));
+        OPEN_NETHER_SPRING_SOUL_SAND_CONFIG = new SpringConfiguration(BiomeDefaultFeatures.LAVA_STATE, false, 4, 1, ImmutableSet.<Block>of(Blocks.SOUL_SAND));
+        CLOSED_NETHER_SPRING_SOUL_SAND_CONFIG = new SpringConfiguration(BiomeDefaultFeatures.LAVA_STATE, false, 5, 0, ImmutableSet.<Block>of(Blocks.SOUL_SAND));
+        SMALL_BASALT_COLUMN_FEATURE_CONFIG = new ColumnFeatureConfiguration.Builder().horizontalReach(1).heightRange(1, 4).build();
+        LARGE_BASALT_COLUMN_FEATURE_CONFIG = new ColumnFeatureConfiguration.Builder().horizontalReach(2, 3).heightRange(5, 10).build();
+        BASALT_BLOBS_FEATURE_CONFIG = new ReplaceSpheroidConfiguration.Builder().minimumReach(new Vec3i(3, 3, 3)).maximumReach(new Vec3i(7, 7, 7)).targetBlockState(Blocks.NETHERRACK.defaultBlockState()).replaceWithBlockState(Blocks.BASALT.defaultBlockState()).build();
+        BLACKSTONE_BLOBS_FEATURE_CONFIG = new ReplaceSpheroidConfiguration.Builder().minimumReach(new Vec3i(3, 3, 3)).maximumReach(new Vec3i(7, 7, 7)).targetBlockState(Blocks.NETHERRACK.defaultBlockState()).replaceWithBlockState(Blocks.BLACKSTONE.defaultBlockState()).build();
+        BASALT_DELTA_FEATURE_CONFIG = new DeltaFeatureConfiguration.Builder().contents(Blocks.LAVA.defaultBlockState()).radius(3, 7).rim(Blocks.MAGMA_BLOCK.defaultBlockState(), 2).build();
         HUGE_RED_MUSHROOM_CONFIG = new HugeMushroomFeatureConfiguration(new SimpleStateProvider(BiomeDefaultFeatures.HUGE_RED_MUSHROOM), new SimpleStateProvider(BiomeDefaultFeatures.HUGE_MUSHROOM_STEM), 2);
         HUGE_BROWN_MUSHROOM_CONFIG = new HugeMushroomFeatureConfiguration(new SimpleStateProvider(BiomeDefaultFeatures.HUGE_BROWN_MUSHROOM), new SimpleStateProvider(BiomeDefaultFeatures.HUGE_MUSHROOM_STEM), 3);
+        CRIMSON_FOREST_CONFIG = new BlockPileConfiguration(new WeightedStateProvider().add(Blocks.CRIMSON_ROOTS.defaultBlockState(), 87).add(Blocks.CRIMSON_FUNGUS.defaultBlockState(), 11).add(Blocks.WARPED_FUNGUS.defaultBlockState(), 1));
+        WARPED_FOREST_CONFIG = new BlockPileConfiguration(new WeightedStateProvider().add(Blocks.WARPED_ROOTS.defaultBlockState(), 85).add(Blocks.CRIMSON_ROOTS.defaultBlockState(), 1).add(Blocks.WARPED_FUNGUS.defaultBlockState(), 13).add(Blocks.CRIMSON_FUNGUS.defaultBlockState(), 1));
+        NETHER_SPROUTS_CONFIG = new BlockPileConfiguration(new SimpleStateProvider(Blocks.NETHER_SPROUTS.defaultBlockState()));
     }
 }
diff --git a/src/net/minecraft/world/level/biome/BiomeManager.java b/src/net/minecraft/world/level/biome/BiomeManager.java
index f57a292..f472e60 100644
--- a/src/net/minecraft/world/level/biome/BiomeManager.java
+++ b/src/net/minecraft/world/level/biome/BiomeManager.java
@@ -1,24 +1,48 @@
 package net.minecraft.world.level.biome;
 
+import net.minecraft.util.Mth;
 import net.minecraft.core.BlockPos;
+import com.google.common.hash.Hashing;
 
 public class BiomeManager {
     private final NoiseBiomeSource noiseBiomeSource;
     private final long biomeZoomSeed;
     private final BiomeZoomer zoomer;
     
-    public BiomeManager(final NoiseBiomeSource a, final long long2, final BiomeZoomer bkz) {
+    public BiomeManager(final NoiseBiomeSource a, final long long2, final BiomeZoomer brj) {
         this.noiseBiomeSource = a;
         this.biomeZoomSeed = long2;
-        this.zoomer = bkz;
+        this.zoomer = brj;
     }
     
-    public BiomeManager withDifferentSource(final BiomeSource bkw) {
-        return new BiomeManager(bkw, this.biomeZoomSeed, this.zoomer);
+    public static long obfuscateSeed(final long long1) {
+        return Hashing.sha256().hashLong(long1).asLong();
     }
     
-    public Biome getBiome(final BlockPos fk) {
-        return this.zoomer.getBiome(this.biomeZoomSeed, fk.getX(), fk.getY(), fk.getZ(), this.noiseBiomeSource);
+    public BiomeManager withDifferentSource(final BiomeSource brh) {
+        return new BiomeManager(brh, this.biomeZoomSeed, this.zoomer);
+    }
+    
+    public Biome getBiome(final BlockPos fu) {
+        return this.zoomer.getBiome(this.biomeZoomSeed, fu.getX(), fu.getY(), fu.getZ(), this.noiseBiomeSource);
+    }
+    
+    public Biome getNoiseBiomeAtPosition(final double double1, final double double2, final double double3) {
+        final int integer8 = Mth.floor(double1) >> 2;
+        final int integer9 = Mth.floor(double2) >> 2;
+        final int integer10 = Mth.floor(double3) >> 2;
+        return this.getNoiseBiomeAtQuart(integer8, integer9, integer10);
+    }
+    
+    public Biome getNoiseBiomeAtPosition(final BlockPos fu) {
+        final int integer3 = fu.getX() >> 2;
+        final int integer4 = fu.getY() >> 2;
+        final int integer5 = fu.getZ() >> 2;
+        return this.getNoiseBiomeAtQuart(integer3, integer4, integer5);
+    }
+    
+    public Biome getNoiseBiomeAtQuart(final int integer1, final int integer2, final int integer3) {
+        return this.noiseBiomeSource.getNoiseBiome(integer1, integer2, integer3);
     }
     
     public interface NoiseBiomeSource {
diff --git a/src/net/minecraft/world/level/biome/BiomeSource.java b/src/net/minecraft/world/level/biome/BiomeSource.java
index 97960a9..2b2d081 100644
--- a/src/net/minecraft/world/level/biome/BiomeSource.java
+++ b/src/net/minecraft/world/level/biome/BiomeSource.java
@@ -1,8 +1,9 @@
 package net.minecraft.world.level.biome;
 
 import com.google.common.collect.Lists;
+import java.util.function.Function;
+import net.minecraft.core.Registry;
 import java.util.Iterator;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
@@ -13,23 +14,33 @@ import java.util.Set;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import java.util.Map;
 import java.util.List;
+import com.mojang.serialization.Codec;
 
 public abstract class BiomeSource implements BiomeManager.NoiseBiomeSource {
+    public static final Codec<BiomeSource> CODEC;
     private static final List<Biome> PLAYER_SPAWN_BIOMES;
     protected final Map<StructureFeature<?>, Boolean> supportedStructures;
     protected final Set<BlockState> surfaceBlocks;
-    protected final Set<Biome> possibleBiomes;
+    protected final List<Biome> possibleBiomes;
     
-    protected BiomeSource(final Set<Biome> set) {
+    protected BiomeSource(final List<Biome> list) {
         this.supportedStructures = Maps.newHashMap();
         this.surfaceBlocks = Sets.newHashSet();
-        this.possibleBiomes = set;
+        this.possibleBiomes = list;
     }
     
+    protected abstract Codec<? extends BiomeSource> codec();
+    
+    public abstract BiomeSource withSeed(final long long1);
+    
     public List<Biome> getPlayerSpawnBiomes() {
         return BiomeSource.PLAYER_SPAWN_BIOMES;
     }
     
+    public List<Biome> possibleBiomes() {
+        return this.possibleBiomes;
+    }
+    
     public Set<Biome> getBiomesWithin(final int integer1, final int integer2, final int integer3, final int integer4) {
         final int integer5 = integer1 - integer4 >> 2;
         final int integer6 = integer2 - integer4 >> 2;
@@ -56,48 +67,65 @@ public abstract class BiomeSource implements BiomeManager.NoiseBiomeSource {
     
     @Nullable
     public BlockPos findBiomeHorizontal(final int integer1, final int integer2, final int integer3, final int integer4, final List<Biome> list, final Random random) {
-        final int integer5 = integer1 - integer4 >> 2;
-        final int integer6 = integer3 - integer4 >> 2;
-        final int integer7 = integer1 + integer4 >> 2;
-        final int integer8 = integer3 + integer4 >> 2;
-        final int integer9 = integer7 - integer5 + 1;
-        final int integer10 = integer8 - integer6 + 1;
-        final int integer11 = integer2 >> 2;
-        BlockPos fk15 = null;
-        int integer12 = 0;
-        for (int integer13 = 0; integer13 < integer10; ++integer13) {
-            for (int integer14 = 0; integer14 < integer9; ++integer14) {
-                final int integer15 = integer5 + integer14;
-                final int integer16 = integer6 + integer13;
-                if (list.contains(this.getNoiseBiome(integer15, integer11, integer16))) {
-                    if (fk15 == null || random.nextInt(integer12 + 1) == 0) {
-                        fk15 = new BlockPos(integer15 << 2, integer2, integer16 << 2);
+        return this.findBiomeHorizontal(integer1, integer2, integer3, integer4, 1, list, random, false);
+    }
+    
+    @Nullable
+    public BlockPos findBiomeHorizontal(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final List<Biome> list, final Random random, final boolean boolean8) {
+        final int integer6 = integer1 >> 2;
+        final int integer7 = integer3 >> 2;
+        final int integer8 = integer4 >> 2;
+        final int integer9 = integer2 >> 2;
+        BlockPos fu14 = null;
+        int integer10 = 0;
+        int integer12;
+        for (int integer11 = integer12 = (boolean8 ? 0 : integer8); integer12 <= integer8; integer12 += integer5) {
+            for (int integer13 = -integer12; integer13 <= integer12; integer13 += integer5) {
+                final boolean boolean9 = Math.abs(integer13) == integer12;
+                for (int integer14 = -integer12; integer14 <= integer12; integer14 += integer5) {
+                    if (boolean8) {
+                        final boolean boolean10 = Math.abs(integer14) == integer12;
+                        if (!boolean10 && !boolean9) {
+                            continue;
+                        }
+                    }
+                    final int integer15 = integer6 + integer14;
+                    final int integer16 = integer7 + integer13;
+                    if (list.contains(this.getNoiseBiome(integer15, integer9, integer16))) {
+                        if (fu14 == null || random.nextInt(integer10 + 1) == 0) {
+                            fu14 = new BlockPos(integer15 << 2, integer2, integer16 << 2);
+                            if (boolean8) {
+                                return fu14;
+                            }
+                        }
+                        ++integer10;
                     }
-                    ++integer12;
                 }
             }
         }
-        return fk15;
+        return fu14;
     }
     
-    public float getHeightValue(final int integer1, final int integer2) {
-        return 0.0f;
-    }
-    
-    public boolean canGenerateStructure(final StructureFeature<?> cfl) {
-        return this.supportedStructures.computeIfAbsent(cfl, cfl -> this.possibleBiomes.stream().anyMatch(bkt -> bkt.<FeatureConfiguration>isValidStart(cfl)));
+    public boolean canGenerateStructure(final StructureFeature<?> cml) {
+        return this.supportedStructures.computeIfAbsent(cml, cml -> this.possibleBiomes.stream().anyMatch(bre -> bre.isValidStart(cml)));
     }
     
     public Set<BlockState> getSurfaceBlocks() {
         if (this.surfaceBlocks.isEmpty()) {
-            for (final Biome bkt3 : this.possibleBiomes) {
-                this.surfaceBlocks.add(bkt3.getSurfaceBuilderConfig().getTopMaterial());
+            for (final Biome bre3 : this.possibleBiomes) {
+                this.surfaceBlocks.add(bre3.getSurfaceBuilderConfig().getTopMaterial());
             }
         }
         return this.surfaceBlocks;
     }
     
     static {
+        Registry.<Codec<FixedBiomeSource>>register(Registry.BIOME_SOURCE, "fixed", FixedBiomeSource.CODEC);
+        Registry.<Codec<MultiNoiseBiomeSource>>register(Registry.BIOME_SOURCE, "multi_noise", MultiNoiseBiomeSource.CODEC);
+        Registry.<Codec<CheckerboardColumnBiomeSource>>register(Registry.BIOME_SOURCE, "checkerboard", CheckerboardColumnBiomeSource.CODEC);
+        Registry.<Codec<OverworldBiomeSource>>register(Registry.BIOME_SOURCE, "vanilla_layered", OverworldBiomeSource.CODEC);
+        Registry.<Codec<TheEndBiomeSource>>register(Registry.BIOME_SOURCE, "the_end", TheEndBiomeSource.CODEC);
+        CODEC = Registry.BIOME_SOURCE.dispatchStable((Function)BiomeSource::codec, (Function)Function.identity());
         PLAYER_SPAWN_BIOMES = Lists.<Biome>newArrayList(Biomes.FOREST, Biomes.PLAINS, Biomes.TAIGA, Biomes.TAIGA_HILLS, Biomes.WOODED_HILLS, Biomes.JUNGLE, Biomes.JUNGLE_HILLS);
     }
 }
diff --git a/src/net/minecraft/world/level/biome/BiomeSourceSettings.java b/src/net/minecraft/world/level/biome/BiomeSourceSettings.java
deleted file mode 100644
index aa48e11..0000000
--- a/src/net/minecraft/world/level/biome/BiomeSourceSettings.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package net.minecraft.world.level.biome;
-
-public interface BiomeSourceSettings {
-}
diff --git a/src/net/minecraft/world/level/biome/BiomeSourceType.java b/src/net/minecraft/world/level/biome/BiomeSourceType.java
deleted file mode 100644
index 4f7427f..0000000
--- a/src/net/minecraft/world/level/biome/BiomeSourceType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package net.minecraft.world.level.biome;
-
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.storage.LevelData;
-import java.util.function.Function;
-
-public class BiomeSourceType<C extends BiomeSourceSettings, T extends BiomeSource> {
-    public static final BiomeSourceType<CheckerboardBiomeSourceSettings, CheckerboardColumnBiomeSource> CHECKERBOARD;
-    public static final BiomeSourceType<FixedBiomeSourceSettings, FixedBiomeSource> FIXED;
-    public static final BiomeSourceType<OverworldBiomeSourceSettings, OverworldBiomeSource> VANILLA_LAYERED;
-    public static final BiomeSourceType<TheEndBiomeSourceSettings, TheEndBiomeSource> THE_END;
-    private final Function<C, T> factory;
-    private final Function<LevelData, C> settingsFactory;
-    
-    private static <C extends BiomeSourceSettings, T extends BiomeSource> BiomeSourceType<C, T> register(final String string, final Function<C, T> function2, final Function<LevelData, C> function3) {
-        return Registry.<BiomeSourceType<C, T>>register(Registry.BIOME_SOURCE_TYPE, string, new BiomeSourceType<C, T>(function2, function3));
-    }
-    
-    private BiomeSourceType(final Function<C, T> function1, final Function<LevelData, C> function2) {
-        this.factory = function1;
-        this.settingsFactory = function2;
-    }
-    
-    public T create(final C bkx) {
-        return this.factory.apply(bkx);
-    }
-    
-    public C createSettings(final LevelData crm) {
-        return this.settingsFactory.apply(crm);
-    }
-    
-    static {
-        CHECKERBOARD = BiomeSourceType.<CheckerboardBiomeSourceSettings, CheckerboardColumnBiomeSource>register("checkerboard", CheckerboardColumnBiomeSource::new, CheckerboardBiomeSourceSettings::new);
-        FIXED = BiomeSourceType.<FixedBiomeSourceSettings, FixedBiomeSource>register("fixed", FixedBiomeSource::new, FixedBiomeSourceSettings::new);
-        VANILLA_LAYERED = BiomeSourceType.<OverworldBiomeSourceSettings, OverworldBiomeSource>register("vanilla_layered", OverworldBiomeSource::new, OverworldBiomeSourceSettings::new);
-        THE_END = BiomeSourceType.<TheEndBiomeSourceSettings, TheEndBiomeSource>register("the_end", TheEndBiomeSource::new, TheEndBiomeSourceSettings::new);
-    }
-}
diff --git a/src/net/minecraft/world/level/biome/BiomeSpecialEffects.java b/src/net/minecraft/world/level/biome/BiomeSpecialEffects.java
new file mode 100644
index 0000000..03df7b5
--- /dev/null
+++ b/src/net/minecraft/world/level/biome/BiomeSpecialEffects.java
@@ -0,0 +1,135 @@
+package net.minecraft.world.level.biome;
+
+import java.util.OptionalInt;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.sounds.Music;
+import net.minecraft.sounds.SoundEvent;
+import java.util.Optional;
+import com.mojang.serialization.Codec;
+
+public class BiomeSpecialEffects {
+    public static final Codec<BiomeSpecialEffects> CODEC;
+    private final int fogColor;
+    private final int waterColor;
+    private final int waterFogColor;
+    private final Optional<AmbientParticleSettings> ambientParticleSettings;
+    private final Optional<SoundEvent> ambientLoopSoundEvent;
+    private final Optional<AmbientMoodSettings> ambientMoodSettings;
+    private final Optional<AmbientAdditionsSettings> ambientAdditionsSettings;
+    private final Optional<Music> backgroundMusic;
+    
+    private BiomeSpecialEffects(final int integer1, final int integer2, final int integer3, final Optional<AmbientParticleSettings> optional4, final Optional<SoundEvent> optional5, final Optional<AmbientMoodSettings> optional6, final Optional<AmbientAdditionsSettings> optional7, final Optional<Music> optional8) {
+        this.fogColor = integer1;
+        this.waterColor = integer2;
+        this.waterFogColor = integer3;
+        this.ambientParticleSettings = optional4;
+        this.ambientLoopSoundEvent = optional5;
+        this.ambientMoodSettings = optional6;
+        this.ambientAdditionsSettings = optional7;
+        this.backgroundMusic = optional8;
+    }
+    
+    public int getFogColor() {
+        return this.fogColor;
+    }
+    
+    public int getWaterColor() {
+        return this.waterColor;
+    }
+    
+    public int getWaterFogColor() {
+        return this.waterFogColor;
+    }
+    
+    public Optional<AmbientParticleSettings> getAmbientParticleSettings() {
+        return this.ambientParticleSettings;
+    }
+    
+    public Optional<SoundEvent> getAmbientLoopSoundEvent() {
+        return this.ambientLoopSoundEvent;
+    }
+    
+    public Optional<AmbientMoodSettings> getAmbientMoodSettings() {
+        return this.ambientMoodSettings;
+    }
+    
+    public Optional<AmbientAdditionsSettings> getAmbientAdditionsSettings() {
+        return this.ambientAdditionsSettings;
+    }
+    
+    public Optional<Music> getBackgroundMusic() {
+        return this.backgroundMusic;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("fog_color").forGetter(bri -> bri.fogColor), (App)Codec.INT.fieldOf("water_color").forGetter(bri -> bri.waterColor), (App)Codec.INT.fieldOf("water_fog_color").forGetter(bri -> bri.waterFogColor), (App)AmbientParticleSettings.CODEC.optionalFieldOf("particle").forGetter(bri -> bri.ambientParticleSettings), (App)SoundEvent.CODEC.optionalFieldOf("ambient_sound").forGetter(bri -> bri.ambientLoopSoundEvent), (App)AmbientMoodSettings.CODEC.optionalFieldOf("mood_sound").forGetter(bri -> bri.ambientMoodSettings), (App)AmbientAdditionsSettings.CODEC.optionalFieldOf("additions_sound").forGetter(bri -> bri.ambientAdditionsSettings), (App)Music.CODEC.optionalFieldOf("music").forGetter(bri -> bri.backgroundMusic)).apply(instance, BiomeSpecialEffects::new));
+    }
+    
+    public static class Builder {
+        private OptionalInt fogColor;
+        private OptionalInt waterColor;
+        private OptionalInt waterFogColor;
+        private Optional<AmbientParticleSettings> ambientParticle;
+        private Optional<SoundEvent> ambientLoopSoundEvent;
+        private Optional<AmbientMoodSettings> ambientMoodSettings;
+        private Optional<AmbientAdditionsSettings> ambientAdditionsSettings;
+        private Optional<Music> backgroundMusic;
+        
+        public Builder() {
+            this.fogColor = OptionalInt.empty();
+            this.waterColor = OptionalInt.empty();
+            this.waterFogColor = OptionalInt.empty();
+            this.ambientParticle = Optional.<AmbientParticleSettings>empty();
+            this.ambientLoopSoundEvent = Optional.<SoundEvent>empty();
+            this.ambientMoodSettings = Optional.<AmbientMoodSettings>empty();
+            this.ambientAdditionsSettings = Optional.<AmbientAdditionsSettings>empty();
+            this.backgroundMusic = Optional.<Music>empty();
+        }
+        
+        public Builder fogColor(final int integer) {
+            this.fogColor = OptionalInt.of(integer);
+            return this;
+        }
+        
+        public Builder waterColor(final int integer) {
+            this.waterColor = OptionalInt.of(integer);
+            return this;
+        }
+        
+        public Builder waterFogColor(final int integer) {
+            this.waterFogColor = OptionalInt.of(integer);
+            return this;
+        }
+        
+        public Builder ambientParticle(final AmbientParticleSettings bqx) {
+            this.ambientParticle = Optional.<AmbientParticleSettings>of(bqx);
+            return this;
+        }
+        
+        public Builder ambientLoopSound(final SoundEvent ack) {
+            this.ambientLoopSoundEvent = Optional.<SoundEvent>of(ack);
+            return this;
+        }
+        
+        public Builder ambientMoodSound(final AmbientMoodSettings bqw) {
+            this.ambientMoodSettings = Optional.<AmbientMoodSettings>of(bqw);
+            return this;
+        }
+        
+        public Builder ambientAdditionsSound(final AmbientAdditionsSettings bqv) {
+            this.ambientAdditionsSettings = Optional.<AmbientAdditionsSettings>of(bqv);
+            return this;
+        }
+        
+        public Builder backgroundMusic(final Music aci) {
+            this.backgroundMusic = Optional.<Music>of(aci);
+            return this;
+        }
+        
+        public BiomeSpecialEffects build() {
+            return new BiomeSpecialEffects(this.fogColor.<Throwable>orElseThrow(() -> new IllegalStateException("Missing 'fog' color.")), this.waterColor.<Throwable>orElseThrow(() -> new IllegalStateException("Missing 'water' color.")), this.waterFogColor.<Throwable>orElseThrow(() -> new IllegalStateException("Missing 'water fog' color.")), this.ambientParticle, this.ambientLoopSoundEvent, this.ambientMoodSettings, this.ambientAdditionsSettings, this.backgroundMusic, null);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/biome/Biomes.java b/src/net/minecraft/world/level/biome/Biomes.java
index 2eb8577..f8c09f4 100644
--- a/src/net/minecraft/world/level/biome/Biomes.java
+++ b/src/net/minecraft/world/level/biome/Biomes.java
@@ -15,7 +15,7 @@ public abstract class Biomes {
     public static final Biome TAIGA;
     public static final Biome SWAMP;
     public static final Biome RIVER;
-    public static final Biome NETHER;
+    public static final Biome NETHER_WASTES;
     public static final Biome THE_END;
     public static final Biome FROZEN_OCEAN;
     public static final Biome FROZEN_RIVER;
@@ -82,13 +82,17 @@ public abstract class Biomes {
     public static final Biome MODIFIED_BADLANDS_PLATEAU;
     public static final Biome BAMBOO_JUNGLE;
     public static final Biome BAMBOO_JUNGLE_HILLS;
+    public static final Biome SOUL_SAND_VALLEY;
+    public static final Biome CRIMSON_FOREST;
+    public static final Biome WARPED_FOREST;
+    public static final Biome BASALT_DELTAS;
     
-    private static Biome register(final int integer, final String string, final Biome bkt) {
-        Registry.<Biome>registerMapping(Registry.BIOME, integer, string, bkt);
-        if (bkt.isMutated()) {
-            Biome.MUTATED_BIOMES.addMapping(bkt, Registry.BIOME.getId(Registry.BIOME.get(new ResourceLocation(bkt.parent))));
+    private static Biome register(final int integer, final String string, final Biome bre) {
+        Registry.<Biome, Biome>registerMapping(Registry.BIOME, integer, string, bre);
+        if (bre.isMutated()) {
+            Biome.MUTATED_BIOMES.addMapping(bre, Registry.BIOME.getId(Registry.BIOME.get(new ResourceLocation(bre.parent))));
         }
-        return bkt;
+        return bre;
     }
     
     static {
@@ -101,7 +105,7 @@ public abstract class Biomes {
         TAIGA = register(5, "taiga", new TaigaBiome());
         SWAMP = register(6, "swamp", new SwampBiome());
         RIVER = register(7, "river", new RiverBiome());
-        NETHER = register(8, "nether", new NetherBiome());
+        NETHER_WASTES = register(8, "nether_wastes", new NetherWastesBiome());
         THE_END = register(9, "the_end", new TheEndBiome());
         FROZEN_OCEAN = register(10, "frozen_ocean", new FrozenOceanBiome());
         FROZEN_RIVER = register(11, "frozen_river", new FrozenRiverBiome());
@@ -168,6 +172,10 @@ public abstract class Biomes {
         MODIFIED_BADLANDS_PLATEAU = register(167, "modified_badlands_plateau", new ModifiedBadlandsPlateauBiome());
         BAMBOO_JUNGLE = register(168, "bamboo_jungle", new BambooJungleBiome());
         BAMBOO_JUNGLE_HILLS = register(169, "bamboo_jungle_hills", new BambooJungleHillsBiome());
+        SOUL_SAND_VALLEY = register(170, "soul_sand_valley", new SoulSandValleyBiome());
+        CRIMSON_FOREST = register(171, "crimson_forest", new CrimsonForestBiome());
+        WARPED_FOREST = register(172, "warped_forest", new WarpedForestBiome());
+        BASALT_DELTAS = register(173, "basalt_deltas", new BasaltDeltasBiome());
         Collections.<Biome>addAll(Biome.EXPLORABLE_BIOMES, new Biome[] { Biomes.OCEAN, Biomes.PLAINS, Biomes.DESERT, Biomes.MOUNTAINS, Biomes.FOREST, Biomes.TAIGA, Biomes.SWAMP, Biomes.RIVER, Biomes.FROZEN_RIVER, Biomes.SNOWY_TUNDRA, Biomes.SNOWY_MOUNTAINS, Biomes.MUSHROOM_FIELDS, Biomes.MUSHROOM_FIELD_SHORE, Biomes.BEACH, Biomes.DESERT_HILLS, Biomes.WOODED_HILLS, Biomes.TAIGA_HILLS, Biomes.JUNGLE, Biomes.JUNGLE_HILLS, Biomes.JUNGLE_EDGE, Biomes.DEEP_OCEAN, Biomes.STONE_SHORE, Biomes.SNOWY_BEACH, Biomes.BIRCH_FOREST, Biomes.BIRCH_FOREST_HILLS, Biomes.DARK_FOREST, Biomes.SNOWY_TAIGA, Biomes.SNOWY_TAIGA_HILLS, Biomes.GIANT_TREE_TAIGA, Biomes.GIANT_TREE_TAIGA_HILLS, Biomes.WOODED_MOUNTAINS, Biomes.SAVANNA, Biomes.SAVANNA_PLATEAU, Biomes.BADLANDS, Biomes.WOODED_BADLANDS_PLATEAU, Biomes.BADLANDS_PLATEAU });
     }
 }
diff --git a/src/net/minecraft/world/level/biome/BirchForestBiome.java b/src/net/minecraft/world/level/biome/BirchForestBiome.java
index 42e47d0..d714899 100644
--- a/src/net/minecraft/world/level/biome/BirchForestBiome.java
+++ b/src/net/minecraft/world/level/biome/BirchForestBiome.java
@@ -2,21 +2,18 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class BirchForestBiome extends Biome {
     public BirchForestBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.1f).scale(0.2f).temperature(0.6f).downfall(0.6f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.1f).scale(0.2f).temperature(0.6f).downfall(0.6f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(-0.1f, 0.2f, 0.0f, 0.0f, 1.0f))));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addForestFlowers(this);
diff --git a/src/net/minecraft/world/level/biome/BirchForestHillsBiome.java b/src/net/minecraft/world/level/biome/BirchForestHillsBiome.java
index ac379b5..9111ea2 100644
--- a/src/net/minecraft/world/level/biome/BirchForestHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/BirchForestHillsBiome.java
@@ -2,21 +2,18 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class BirchForestHillsBiome extends Biome {
     public BirchForestHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.45f).scale(0.3f).temperature(0.6f).downfall(0.6f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.45f).scale(0.3f).temperature(0.6f).downfall(0.6f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(-0.1f, 0.2f, 0.25f, 0.0f, 1.0f))));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addForestFlowers(this);
diff --git a/src/net/minecraft/world/level/biome/CheckerboardBiomeSourceSettings.java b/src/net/minecraft/world/level/biome/CheckerboardBiomeSourceSettings.java
deleted file mode 100644
index 42dbfd5..0000000
--- a/src/net/minecraft/world/level/biome/CheckerboardBiomeSourceSettings.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package net.minecraft.world.level.biome;
-
-import net.minecraft.world.level.storage.LevelData;
-
-public class CheckerboardBiomeSourceSettings implements BiomeSourceSettings {
-    private Biome[] allowedBiomes;
-    private int size;
-    
-    public CheckerboardBiomeSourceSettings(final LevelData crm) {
-        this.allowedBiomes = new Biome[] { Biomes.PLAINS };
-        this.size = 1;
-    }
-    
-    public CheckerboardBiomeSourceSettings setAllowedBiomes(final Biome[] arr) {
-        this.allowedBiomes = arr;
-        return this;
-    }
-    
-    public CheckerboardBiomeSourceSettings setSize(final int integer) {
-        this.size = integer;
-        return this;
-    }
-    
-    public Biome[] getAllowedBiomes() {
-        return this.allowedBiomes;
-    }
-    
-    public int getSize() {
-        return this.size;
-    }
-}
diff --git a/src/net/minecraft/world/level/biome/CheckerboardColumnBiomeSource.java b/src/net/minecraft/world/level/biome/CheckerboardColumnBiomeSource.java
index b6a5678..1a8db62 100644
--- a/src/net/minecraft/world/level/biome/CheckerboardColumnBiomeSource.java
+++ b/src/net/minecraft/world/level/biome/CheckerboardColumnBiomeSource.java
@@ -1,20 +1,45 @@
 package net.minecraft.world.level.biome;
 
-import java.util.Set;
-import com.google.common.collect.ImmutableSet;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import net.minecraft.util.Codecs;
+import net.minecraft.core.Registry;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.Collection;
+import com.google.common.collect.ImmutableList;
+import java.util.List;
+import com.mojang.serialization.Codec;
 
 public class CheckerboardColumnBiomeSource extends BiomeSource {
-    private final Biome[] allowedBiomes;
+    public static final Codec<CheckerboardColumnBiomeSource> CODEC;
+    private final List<Biome> allowedBiomes;
     private final int bitShift;
+    private final int size;
     
-    public CheckerboardColumnBiomeSource(final CheckerboardBiomeSourceSettings bld) {
-        super(ImmutableSet.<Biome>copyOf(bld.getAllowedBiomes()));
-        this.allowedBiomes = bld.getAllowedBiomes();
-        this.bitShift = bld.getSize() + 2;
+    public CheckerboardColumnBiomeSource(final List<Biome> list, final int integer) {
+        super(ImmutableList.copyOf(list));
+        this.allowedBiomes = list;
+        this.bitShift = integer + 2;
+        this.size = integer;
+    }
+    
+    @Override
+    protected Codec<? extends BiomeSource> codec() {
+        return CheckerboardColumnBiomeSource.CODEC;
+    }
+    
+    @Override
+    public BiomeSource withSeed(final long long1) {
+        return this;
     }
     
     @Override
     public Biome getNoiseBiome(final int integer1, final int integer2, final int integer3) {
-        return this.allowedBiomes[Math.abs(((integer1 >> this.bitShift) + (integer3 >> this.bitShift)) % this.allowedBiomes.length)];
+        return this.allowedBiomes.get(Math.floorMod((integer1 >> this.bitShift) + (integer3 >> this.bitShift), this.allowedBiomes.size()));
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Registry.BIOME.listOf().fieldOf("biomes").forGetter(brn -> brn.allowedBiomes), (App)Codecs.intRange(0, 62).fieldOf("scale").withDefault(2).forGetter(brn -> brn.size)).apply(instance, (BiFunction)CheckerboardColumnBiomeSource::new));
     }
 }
diff --git a/src/net/minecraft/world/level/biome/ColdOceanBiome.java b/src/net/minecraft/world/level/biome/ColdOceanBiome.java
index b75d3fb..721bd8b 100644
--- a/src/net/minecraft/world/level/biome/ColdOceanBiome.java
+++ b/src/net/minecraft/world/level/biome/ColdOceanBiome.java
@@ -6,24 +6,19 @@ import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class ColdOceanBiome extends Biome {
     public ColdOceanBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.0f).scale(0.1f).temperature(0.5f).downfall(0.5f).waterColor(4020182).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<OceanRuinConfiguration>addStructureStart(Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.COLD, 0.3f, 0.9f)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.0f).scale(0.1f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4020182).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldOceanStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_RUIN_COLD);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_OCEAN);
         BiomeDefaultFeatures.addOceanCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -40,8 +35,8 @@ public class ColdOceanBiome extends Biome {
         BiomeDefaultFeatures.addColdOceanExtraVegetation(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 3, 1, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.COD, 15, 3, 6));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SALMON, 15, 1, 5));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.COD, 15, 3, 6));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.SALMON, 15, 1, 5));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ZOMBIE, 95, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/CrimsonForestBiome.java b/src/net/minecraft/world/level/biome/CrimsonForestBiome.java
new file mode 100644
index 0000000..c343090
--- /dev/null
+++ b/src/net/minecraft/world/level/biome/CrimsonForestBiome.java
@@ -0,0 +1,50 @@
+package net.minecraft.world.level.biome;
+
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
+import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
+import net.minecraft.world.level.levelgen.carver.WorldCarver;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.sounds.Musics;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
+import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
+
+public class CrimsonForestBiome extends Biome {
+    protected CrimsonForestBiome() {
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.NETHER_FOREST, SurfaceBuilder.CONFIG_CRIMSON_FOREST).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.NETHER).depth(0.1f).scale(0.2f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(3343107).ambientParticle(new AmbientParticleSettings(ParticleTypes.CRIMSON_SPORE, 0.025f)).ambientLoopSound(SoundEvents.AMBIENT_CRIMSON_FOREST_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_CRIMSON_FOREST_MOOD, 6000, 8, 2.0)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_CRIMSON_FOREST_ADDITIONS, 0.0111)).backgroundMusic(Musics.createGameMusic(SoundEvents.MUSIC_BIOME_CRIMSON_FOREST)).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.4f, 0.0f, 0.0f, 0.0f, 0.0f))));
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_NETHER);
+        this.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.NETHER_CAVE, (C)new ProbabilityFeatureConfiguration(0.2f)));
+        this.addStructureStart(BiomeDefaultFeatures.NETHER_BRIDGE);
+        this.addStructureStart(BiomeDefaultFeatures.BASTION_REMNANT);
+        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.LAVA_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_VERY_BIASED_RANGE.configured(new CountRangeDecoratorConfiguration(20, 8, 16, 256))));
+        BiomeDefaultFeatures.addDefaultMushrooms(this);
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.OPEN_NETHER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(8, 4, 8, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.FIRE_CONFIG).decorated(FeatureDecorator.FIRE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.GLOWSTONE_BLOB.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.LIGHT_GEM_CHANCE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.GLOWSTONE_BLOB.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, Blocks.MAGMA_BLOCK.defaultBlockState(), 33)).decorated(FeatureDecorator.MAGMA.configured(new FrequencyDecoratorConfiguration(4))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.CLOSED_NETHER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(16, 10, 20, 128))));
+        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.WEEPING_VINES.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 128))));
+        BiomeDefaultFeatures.addCrimsonForestVegetation(this);
+        BiomeDefaultFeatures.addNetherDefaultOres(this);
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ZOMBIFIED_PIGLIN, 1, 2, 4));
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.HOGLIN, 9, 3, 4));
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.PIGLIN, 5, 3, 4));
+        this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.STRIDER, 60, 1, 2));
+    }
+}
diff --git a/src/net/minecraft/world/level/biome/DarkForestBiome.java b/src/net/minecraft/world/level/biome/DarkForestBiome.java
index aa9535d..dabb50c 100644
--- a/src/net/minecraft/world/level/biome/DarkForestBiome.java
+++ b/src/net/minecraft/world/level/biome/DarkForestBiome.java
@@ -11,26 +11,22 @@ import net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureCo
 import net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature;
 import com.google.common.collect.ImmutableList;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class DarkForestBiome extends Biome {
     public DarkForestBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.1f).scale(0.2f).temperature(0.7f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.WOODLAND_MANSION.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.1f).scale(0.2f).temperature(0.7f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.WOODLAND_MANSION);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
-        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.HUGE_BROWN_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_BROWN_MUSHROOM_CONFIG).weighted(0.025f), Feature.HUGE_RED_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_RED_MUSHROOM_CONFIG).weighted(0.05f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.DARK_OAK_TREE.configured(BiomeDefaultFeatures.DARK_OAK_TREE_CONFIG).weighted(0.6666667f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_CONFIG).weighted(0.2f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.DARK_OAK_TREE.configured(DecoratorConfiguration.NONE)));
+        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.HUGE_BROWN_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_BROWN_MUSHROOM_CONFIG).weighted(0.025f), Feature.HUGE_RED_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_RED_MUSHROOM_CONFIG).weighted(0.05f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.TREE.configured(BiomeDefaultFeatures.DARK_OAK_TREE_CONFIG).weighted(0.6666667f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_CONFIG).weighted(0.2f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f)), Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.DARK_OAK_TREE.configured(DecoratorConfiguration.NONE)));
         BiomeDefaultFeatures.addForestFlowers(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
         BiomeDefaultFeatures.addDefaultOres(this);
diff --git a/src/net/minecraft/world/level/biome/DarkForestHillsBiome.java b/src/net/minecraft/world/level/biome/DarkForestHillsBiome.java
index 597da0c..69665b9 100644
--- a/src/net/minecraft/world/level/biome/DarkForestHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/DarkForestHillsBiome.java
@@ -11,26 +11,22 @@ import net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureCo
 import net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature;
 import com.google.common.collect.ImmutableList;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class DarkForestHillsBiome extends Biome {
     public DarkForestHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.2f).scale(0.4f).temperature(0.7f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent("dark_forest"));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.WOODLAND_MANSION.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.2f).scale(0.4f).temperature(0.7f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("dark_forest"));
+        this.addStructureStart(BiomeDefaultFeatures.WOODLAND_MANSION);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
-        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.HUGE_RED_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_RED_MUSHROOM_CONFIG).weighted(0.025f), Feature.HUGE_BROWN_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_BROWN_MUSHROOM_CONFIG).weighted(0.05f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.DARK_OAK_TREE.configured(BiomeDefaultFeatures.DARK_OAK_TREE_CONFIG).weighted(0.6666667f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_CONFIG).weighted(0.2f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.DARK_OAK_TREE.configured(DecoratorConfiguration.NONE)));
+        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.HUGE_RED_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_RED_MUSHROOM_CONFIG).weighted(0.025f), Feature.HUGE_BROWN_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_BROWN_MUSHROOM_CONFIG).weighted(0.05f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.TREE.configured(BiomeDefaultFeatures.DARK_OAK_TREE_CONFIG).weighted(0.6666667f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_CONFIG).weighted(0.2f), (WeightedConfiguredFeature<HugeMushroomFeatureConfiguration>)Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_CONFIG).weighted(0.1f)), Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG))).decorated(FeatureDecorator.DARK_OAK_TREE.configured(DecoratorConfiguration.NONE)));
         BiomeDefaultFeatures.addForestFlowers(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
         BiomeDefaultFeatures.addDefaultOres(this);
diff --git a/src/net/minecraft/world/level/biome/DeepColdOceanBiome.java b/src/net/minecraft/world/level/biome/DeepColdOceanBiome.java
index 01176d1..ec95ce2 100644
--- a/src/net/minecraft/world/level/biome/DeepColdOceanBiome.java
+++ b/src/net/minecraft/world/level/biome/DeepColdOceanBiome.java
@@ -6,27 +6,20 @@ import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class DeepColdOceanBiome extends Biome {
     public DeepColdOceanBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.8f).scale(0.1f).temperature(0.5f).downfall(0.5f).waterColor(4020182).waterFogColor(329011).parent(null));
-        this.<OceanRuinConfiguration>addStructureStart(Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.COLD, 0.3f, 0.9f)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.OCEAN_MONUMENT.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.8f).scale(0.1f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4020182).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_RUIN_COLD);
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_MONUMENT);
+        BiomeDefaultFeatures.addDefaultOverworldOceanStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_OCEAN);
         BiomeDefaultFeatures.addOceanCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -43,8 +36,8 @@ public class DeepColdOceanBiome extends Biome {
         BiomeDefaultFeatures.addColdOceanExtraVegetation(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 3, 1, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.COD, 15, 3, 6));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SALMON, 15, 1, 5));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.COD, 15, 3, 6));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.SALMON, 15, 1, 5));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ZOMBIE, 95, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/DeepFrozenOceanBiome.java b/src/net/minecraft/world/level/biome/DeepFrozenOceanBiome.java
index 9c0e57c..c2fa25d 100644
--- a/src/net/minecraft/world/level/biome/DeepFrozenOceanBiome.java
+++ b/src/net/minecraft/world/level/biome/DeepFrozenOceanBiome.java
@@ -1,17 +1,12 @@
 package net.minecraft.world.level.biome;
 
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise;
@@ -20,13 +15,12 @@ public class DeepFrozenOceanBiome extends Biome {
     protected static final PerlinSimplexNoise FROZEN_TEMPERATURE_NOISE;
     
     public DeepFrozenOceanBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.FROZEN_OCEAN, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.8f).scale(0.1f).temperature(0.5f).downfall(0.5f).waterColor(3750089).waterFogColor(329011).parent(null));
-        this.<OceanRuinConfiguration>addStructureStart(Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.COLD, 0.3f, 0.9f)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.OCEAN_MONUMENT.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.FROZEN_OCEAN, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.8f).scale(0.1f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(3750089).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_RUIN_COLD);
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_MONUMENT);
+        BiomeDefaultFeatures.addDefaultOverworldOceanStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_OCEAN);
         BiomeDefaultFeatures.addOceanCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addIcebergs(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
@@ -42,7 +36,7 @@ public class DeepFrozenOceanBiome extends Biome {
         BiomeDefaultFeatures.addDefaultSprings(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 1, 1, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SALMON, 15, 1, 5));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.SALMON, 15, 1, 5));
         this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.POLAR_BEAR, 1, 1, 2));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
@@ -57,25 +51,25 @@ public class DeepFrozenOceanBiome extends Biome {
     }
     
     @Override
-    protected float getTemperatureNoCache(final BlockPos fk) {
+    protected float getTemperatureNoCache(final BlockPos fu) {
         float float3 = this.getTemperature();
-        final double double4 = DeepFrozenOceanBiome.FROZEN_TEMPERATURE_NOISE.getValue(fk.getX() * 0.05, fk.getZ() * 0.05, false) * 7.0;
-        final double double5 = DeepFrozenOceanBiome.BIOME_INFO_NOISE.getValue(fk.getX() * 0.2, fk.getZ() * 0.2, false);
+        final double double4 = DeepFrozenOceanBiome.FROZEN_TEMPERATURE_NOISE.getValue(fu.getX() * 0.05, fu.getZ() * 0.05, false) * 7.0;
+        final double double5 = DeepFrozenOceanBiome.BIOME_INFO_NOISE.getValue(fu.getX() * 0.2, fu.getZ() * 0.2, false);
         final double double6 = double4 + double5;
         if (double6 < 0.3) {
-            final double double7 = DeepFrozenOceanBiome.BIOME_INFO_NOISE.getValue(fk.getX() * 0.09, fk.getZ() * 0.09, false);
+            final double double7 = DeepFrozenOceanBiome.BIOME_INFO_NOISE.getValue(fu.getX() * 0.09, fu.getZ() * 0.09, false);
             if (double7 < 0.8) {
                 float3 = 0.2f;
             }
         }
-        if (fk.getY() > 64) {
-            final float float4 = (float)(DeepFrozenOceanBiome.TEMPERATURE_NOISE.getValue(fk.getX() / 8.0f, fk.getZ() / 8.0f, false) * 4.0);
-            return float3 - (float4 + fk.getY() - 64.0f) * 0.05f / 30.0f;
+        if (fu.getY() > 64) {
+            final float float4 = (float)(DeepFrozenOceanBiome.TEMPERATURE_NOISE.getValue(fu.getX() / 8.0f, fu.getZ() / 8.0f, false) * 4.0);
+            return float3 - (float4 + fu.getY() - 64.0f) * 0.05f / 30.0f;
         }
         return float3;
     }
     
     static {
-        FROZEN_TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(3456L), 2, 0);
+        FROZEN_TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(3456L), ImmutableList.<Integer>of(-2, -1, 0));
     }
 }
diff --git a/src/net/minecraft/world/level/biome/DeepLukeWarmOceanBiome.java b/src/net/minecraft/world/level/biome/DeepLukeWarmOceanBiome.java
index 43c0b9f..9d21ebb 100644
--- a/src/net/minecraft/world/level/biome/DeepLukeWarmOceanBiome.java
+++ b/src/net/minecraft/world/level/biome/DeepLukeWarmOceanBiome.java
@@ -2,26 +2,18 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class DeepLukeWarmOceanBiome extends Biome {
     public DeepLukeWarmOceanBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_OCEAN_SAND).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.8f).scale(0.1f).temperature(0.5f).downfall(0.5f).waterColor(4566514).waterFogColor(267827).parent(null));
-        this.<OceanRuinConfiguration>addStructureStart(Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.WARM, 0.3f, 0.9f)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.OCEAN_MONUMENT.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_OCEAN_SAND).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.8f).scale(0.1f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4566514).waterFogColor(267827).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_RUIN_WARM);
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_MONUMENT);
+        BiomeDefaultFeatures.addDefaultOverworldOceanStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_OCEAN);
         BiomeDefaultFeatures.addOceanCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -38,9 +30,9 @@ public class DeepLukeWarmOceanBiome extends Biome {
         BiomeDefaultFeatures.addLukeWarmKelp(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 8, 1, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.COD, 8, 3, 6));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.PUFFERFISH, 5, 1, 3));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.COD, 8, 3, 6));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.PUFFERFISH, 5, 1, 3));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8));
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.DOLPHIN, 2, 1, 2));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/DeepOceanBiome.java b/src/net/minecraft/world/level/biome/DeepOceanBiome.java
index 2fcc00b..47ed6cb 100644
--- a/src/net/minecraft/world/level/biome/DeepOceanBiome.java
+++ b/src/net/minecraft/world/level/biome/DeepOceanBiome.java
@@ -6,27 +6,20 @@ import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class DeepOceanBiome extends Biome {
     public DeepOceanBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.8f).scale(0.1f).temperature(0.5f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.OCEAN_MONUMENT.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)));
-        this.<OceanRuinConfiguration>addStructureStart(Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.COLD, 0.3f, 0.9f)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.8f).scale(0.1f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_MONUMENT);
+        BiomeDefaultFeatures.addDefaultOverworldOceanStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_RUIN_COLD);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_OCEAN);
         BiomeDefaultFeatures.addOceanCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -43,7 +36,7 @@ public final class DeepOceanBiome extends Biome {
         BiomeDefaultFeatures.addColdOceanExtraVegetation(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 1, 1, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.COD, 10, 3, 6));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.COD, 10, 3, 6));
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.DOLPHIN, 1, 1, 2));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/DeepWarmOceanBiome.java b/src/net/minecraft/world/level/biome/DeepWarmOceanBiome.java
index 60ba8f7..426bdfb 100644
--- a/src/net/minecraft/world/level/biome/DeepWarmOceanBiome.java
+++ b/src/net/minecraft/world/level/biome/DeepWarmOceanBiome.java
@@ -2,26 +2,18 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class DeepWarmOceanBiome extends Biome {
     public DeepWarmOceanBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_FULL_SAND).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.8f).scale(0.1f).temperature(0.5f).downfall(0.5f).waterColor(4445678).waterFogColor(270131).parent(null));
-        this.<OceanRuinConfiguration>addStructureStart(Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.WARM, 0.3f, 0.9f)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.OCEAN_MONUMENT.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_FULL_SAND).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.8f).scale(0.1f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4445678).waterFogColor(270131).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_RUIN_WARM);
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_MONUMENT);
+        BiomeDefaultFeatures.addDefaultOverworldOceanStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_OCEAN);
         BiomeDefaultFeatures.addOceanCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -37,7 +29,7 @@ public class DeepWarmOceanBiome extends Biome {
         BiomeDefaultFeatures.addDefaultSeagrass(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 5, 1, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8));
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.DOLPHIN, 2, 1, 2));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/DesertBiome.java b/src/net/minecraft/world/level/biome/DesertBiome.java
index f147724..c083240 100644
--- a/src/net/minecraft/world/level/biome/DesertBiome.java
+++ b/src/net/minecraft/world/level/biome/DesertBiome.java
@@ -2,25 +2,22 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class DesertBiome extends Biome {
     public DesertBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_DESERT).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.DESERT).depth(0.125f).scale(0.05f).temperature(2.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<VillageConfiguration>addStructureStart(Feature.VILLAGE.configured(new VillageConfiguration("village/desert/town_centers", 6)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.PILLAGER_OUTPOST.configured(FeatureConfiguration.NONE));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.DESERT_PYRAMID.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_DESERT).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.DESERT).depth(0.125f).scale(0.05f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.5f, -0.5f, 0.0f, 0.0f, 1.0f))));
+        this.addStructureStart(BiomeDefaultFeatures.VILLAGE_DESERT);
+        this.addStructureStart(BiomeDefaultFeatures.PILLAGER_OUTPOST);
+        this.addStructureStart(BiomeDefaultFeatures.DESERT_PYRAMID);
+        BiomeDefaultFeatures.addFossilDecoration(this);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_DESERT);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDesertLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/DesertHillsBiome.java b/src/net/minecraft/world/level/biome/DesertHillsBiome.java
index 58174c8..5c7c6bc 100644
--- a/src/net/minecraft/world/level/biome/DesertHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/DesertHillsBiome.java
@@ -2,22 +2,17 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class DesertHillsBiome extends Biome {
     public DesertHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_DESERT).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.DESERT).depth(0.45f).scale(0.3f).temperature(2.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.DESERT_PYRAMID.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_DESERT).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.DESERT).depth(0.45f).scale(0.3f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.DESERT_PYRAMID);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_DESERT);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDesertLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/DesertLakesBiome.java b/src/net/minecraft/world/level/biome/DesertLakesBiome.java
index ff1f1f8..ef7ead8 100644
--- a/src/net/minecraft/world/level/biome/DesertLakesBiome.java
+++ b/src/net/minecraft/world/level/biome/DesertLakesBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class DesertLakesBiome extends Biome {
     public DesertLakesBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_DESERT).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.DESERT).depth(0.225f).scale(0.25f).temperature(2.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent("desert"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_DESERT).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.DESERT).depth(0.225f).scale(0.25f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("desert"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_DESERT);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDesertLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/EndBarrensBiome.java b/src/net/minecraft/world/level/biome/EndBarrensBiome.java
index 4f58e78..544d158 100644
--- a/src/net/minecraft/world/level/biome/EndBarrensBiome.java
+++ b/src/net/minecraft/world/level/biome/EndBarrensBiome.java
@@ -7,8 +7,7 @@ import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class EndBarrensBiome extends Biome {
     public EndBarrensBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_THEEND).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.THEEND).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
-        BiomeDefaultFeatures.addEndCity(this);
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_THEEND).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.THEEND).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(10518688).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ENDERMAN, 10, 4, 4));
     }
     
diff --git a/src/net/minecraft/world/level/biome/EndHighlandsBiome.java b/src/net/minecraft/world/level/biome/EndHighlandsBiome.java
index 8ab6ab7..bbffaf1 100644
--- a/src/net/minecraft/world/level/biome/EndHighlandsBiome.java
+++ b/src/net/minecraft/world/level/biome/EndHighlandsBiome.java
@@ -2,24 +2,23 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration;
-import net.minecraft.world.level.dimension.end.TheEndDimension;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class EndHighlandsBiome extends Biome {
     public EndHighlandsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_THEEND).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.THEEND).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.END_CITY.configured(FeatureConfiguration.NONE));
-        this.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.END_GATEWAY.configured(EndGatewayConfiguration.knownExit(TheEndDimension.END_SPAWN_POINT, true)).decorated(FeatureDecorator.END_GATEWAY.configured(DecoratorConfiguration.NONE)));
-        BiomeDefaultFeatures.addEndCity(this);
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_THEEND).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.THEEND).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(10518688).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.END_CITY);
+        this.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.END_GATEWAY.configured(EndGatewayConfiguration.knownExit(ServerLevel.END_SPAWN_POINT, true)).decorated(FeatureDecorator.END_GATEWAY.configured(DecoratorConfiguration.NONE)));
         this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.CHORUS_PLANT.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.CHORUS_PLANT.configured(DecoratorConfiguration.NONE)));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ENDERMAN, 10, 4, 4));
     }
diff --git a/src/net/minecraft/world/level/biome/EndMidlandsBiome.java b/src/net/minecraft/world/level/biome/EndMidlandsBiome.java
index 539461a..d37b1cf 100644
--- a/src/net/minecraft/world/level/biome/EndMidlandsBiome.java
+++ b/src/net/minecraft/world/level/biome/EndMidlandsBiome.java
@@ -2,17 +2,14 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class EndMidlandsBiome extends Biome {
     public EndMidlandsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_THEEND).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.THEEND).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.END_CITY.configured(FeatureConfiguration.NONE));
-        BiomeDefaultFeatures.addEndCity(this);
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_THEEND).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.THEEND).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(10518688).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.END_CITY);
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ENDERMAN, 10, 4, 4));
     }
     
diff --git a/src/net/minecraft/world/level/biome/ErodedBadlandsBiome.java b/src/net/minecraft/world/level/biome/ErodedBadlandsBiome.java
index 9b79049..af7cd3f 100644
--- a/src/net/minecraft/world/level/biome/ErodedBadlandsBiome.java
+++ b/src/net/minecraft/world/level/biome/ErodedBadlandsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class ErodedBadlandsBiome extends Biome {
     public ErodedBadlandsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.ERODED_BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(0.1f).scale(0.2f).temperature(2.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent("badlands"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.MESA)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.ERODED_BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(0.1f).scale(0.2f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("badlands"));
+        BiomeDefaultFeatures.addDefaultOverworldLandMesaStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/FixedBiomeSource.java b/src/net/minecraft/world/level/biome/FixedBiomeSource.java
index d1120ce..bb9ff96 100644
--- a/src/net/minecraft/world/level/biome/FixedBiomeSource.java
+++ b/src/net/minecraft/world/level/biome/FixedBiomeSource.java
@@ -1,19 +1,33 @@
 package net.minecraft.world.level.biome;
 
+import java.util.function.Function;
+import net.minecraft.core.Registry;
 import com.google.common.collect.Sets;
+import java.util.Set;
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
 import java.util.List;
-import java.util.Set;
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableList;
+import com.mojang.serialization.Codec;
 
 public class FixedBiomeSource extends BiomeSource {
+    public static final Codec<FixedBiomeSource> CODEC;
     private final Biome biome;
     
-    public FixedBiomeSource(final FixedBiomeSourceSettings blv) {
-        super(ImmutableSet.<Biome>of(blv.getBiome()));
-        this.biome = blv.getBiome();
+    public FixedBiomeSource(final Biome bre) {
+        super(ImmutableList.<Biome>of(bre));
+        this.biome = bre;
+    }
+    
+    @Override
+    protected Codec<? extends BiomeSource> codec() {
+        return FixedBiomeSource.CODEC;
+    }
+    
+    @Override
+    public BiomeSource withSeed(final long long1) {
+        return this;
     }
     
     @Override
@@ -23,15 +37,22 @@ public class FixedBiomeSource extends BiomeSource {
     
     @Nullable
     @Override
-    public BlockPos findBiomeHorizontal(final int integer1, final int integer2, final int integer3, final int integer4, final List<Biome> list, final Random random) {
-        if (list.contains(this.biome)) {
-            return new BlockPos(integer1 - integer4 + random.nextInt(integer4 * 2 + 1), integer2, integer3 - integer4 + random.nextInt(integer4 * 2 + 1));
+    public BlockPos findBiomeHorizontal(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final List<Biome> list, final Random random, final boolean boolean8) {
+        if (!list.contains(this.biome)) {
+            return null;
         }
-        return null;
+        if (boolean8) {
+            return new BlockPos(integer1, integer2, integer3);
+        }
+        return new BlockPos(integer1 - integer4 + random.nextInt(integer4 * 2 + 1), integer2, integer3 - integer4 + random.nextInt(integer4 * 2 + 1));
     }
     
     @Override
     public Set<Biome> getBiomesWithin(final int integer1, final int integer2, final int integer3, final int integer4) {
         return Sets.<Biome>newHashSet(this.biome);
     }
+    
+    static {
+        CODEC = Registry.BIOME.fieldOf("biome").xmap((Function)FixedBiomeSource::new, bse -> bse.biome).stable().codec();
+    }
 }
diff --git a/src/net/minecraft/world/level/biome/FixedBiomeSourceSettings.java b/src/net/minecraft/world/level/biome/FixedBiomeSourceSettings.java
deleted file mode 100644
index 9073752..0000000
--- a/src/net/minecraft/world/level/biome/FixedBiomeSourceSettings.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.minecraft.world.level.biome;
-
-import net.minecraft.world.level.storage.LevelData;
-
-public class FixedBiomeSourceSettings implements BiomeSourceSettings {
-    private Biome biome;
-    
-    public FixedBiomeSourceSettings(final LevelData crm) {
-        this.biome = Biomes.PLAINS;
-    }
-    
-    public FixedBiomeSourceSettings setBiome(final Biome bkt) {
-        this.biome = bkt;
-        return this;
-    }
-    
-    public Biome getBiome() {
-        return this.biome;
-    }
-}
diff --git a/src/net/minecraft/world/level/biome/ForestBiome.java b/src/net/minecraft/world/level/biome/ForestBiome.java
index a9f5b22..52d500c 100644
--- a/src/net/minecraft/world/level/biome/ForestBiome.java
+++ b/src/net/minecraft/world/level/biome/ForestBiome.java
@@ -2,22 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class ForestBiome extends Biome {
     public ForestBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.1f).scale(0.2f).temperature(0.7f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.1f).scale(0.2f).temperature(0.7f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addForestFlowers(this);
diff --git a/src/net/minecraft/world/level/biome/ForestFlowerBiome.java b/src/net/minecraft/world/level/biome/ForestFlowerBiome.java
index 2d310e0..7e60b5b 100644
--- a/src/net/minecraft/world/level/biome/ForestFlowerBiome.java
+++ b/src/net/minecraft/world/level/biome/ForestFlowerBiome.java
@@ -4,7 +4,7 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.levelgen.placement.FrequencyWithExtraChanceDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature;
 import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
@@ -13,29 +13,25 @@ import net.minecraft.world.level.levelgen.feature.configurations.RandomRandomFea
 import net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import com.google.common.collect.ImmutableList;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class ForestFlowerBiome extends Biome {
     public ForestFlowerBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.1f).scale(0.4f).temperature(0.7f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent("forest"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.1f).scale(0.4f).temperature(0.7f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("forest"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_RANDOM_SELECTOR.configured(new RandomRandomFeatureConfiguration(ImmutableList.of(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DOUBLE_LILAC_CONFIG), Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DOUBLE_ROSE_BUSH_CONFIG), Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.DOUBLE_PEONY_CONFIG), Feature.FLOWER.configured(BiomeDefaultFeatures.GENERAL_FOREST_FLOWER_CONFIG)), 2)).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(5))));
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
         BiomeDefaultFeatures.addDefaultOres(this);
         BiomeDefaultFeatures.addDefaultSoftDisks(this);
-        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_WITH_BEES_002_CONFIG).weighted(0.2f), Feature.FANCY_TREE.configured(BiomeDefaultFeatures.FANCY_TREE_WITH_BEES_002_CONFIG).weighted(0.1f)), Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_WITH_BEES_002_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(6, 0.1f, 1))));
+        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.RANDOM_SELECTOR.configured(new RandomFeatureConfiguration(ImmutableList.of(Feature.TREE.configured(BiomeDefaultFeatures.BIRCH_TREE_WITH_BEES_002_CONFIG).weighted(0.2f), Feature.TREE.configured(BiomeDefaultFeatures.FANCY_TREE_WITH_BEES_002_CONFIG).weighted(0.1f)), Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_WITH_BEES_002_CONFIG))).decorated(FeatureDecorator.COUNT_EXTRA_HEIGHTMAP.configured(new FrequencyWithExtraChanceDecoratorConfiguration(6, 0.1f, 1))));
         this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.FLOWER.configured(BiomeDefaultFeatures.FOREST_FLOWER_CONFIG).decorated(FeatureDecorator.COUNT_HEIGHTMAP_32.configured(new FrequencyDecoratorConfiguration(100))));
         BiomeDefaultFeatures.addDefaultGrass(this);
         BiomeDefaultFeatures.addDefaultMushrooms(this);
diff --git a/src/net/minecraft/world/level/biome/FrozenOceanBiome.java b/src/net/minecraft/world/level/biome/FrozenOceanBiome.java
index 7c3fd94..57da385 100644
--- a/src/net/minecraft/world/level/biome/FrozenOceanBiome.java
+++ b/src/net/minecraft/world/level/biome/FrozenOceanBiome.java
@@ -1,15 +1,12 @@
 package net.minecraft.world.level.biome;
 
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise;
@@ -18,12 +15,11 @@ public final class FrozenOceanBiome extends Biome {
     protected static final PerlinSimplexNoise FROZEN_TEMPERATURE_NOISE;
     
     public FrozenOceanBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.FROZEN_OCEAN, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.OCEAN).depth(-1.0f).scale(0.1f).temperature(0.0f).downfall(0.5f).waterColor(3750089).waterFogColor(329011).parent(null));
-        this.<OceanRuinConfiguration>addStructureStart(Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.COLD, 0.3f, 0.9f)));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.FROZEN_OCEAN, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.OCEAN).depth(-1.0f).scale(0.1f).temperature(0.0f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(3750089).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_RUIN_COLD);
+        BiomeDefaultFeatures.addDefaultOverworldOceanStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_OCEAN);
         BiomeDefaultFeatures.addOceanCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addIcebergs(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
@@ -39,7 +35,7 @@ public final class FrozenOceanBiome extends Biome {
         BiomeDefaultFeatures.addDefaultSprings(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 1, 1, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SALMON, 15, 1, 5));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.SALMON, 15, 1, 5));
         this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.POLAR_BEAR, 1, 1, 2));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
@@ -54,25 +50,25 @@ public final class FrozenOceanBiome extends Biome {
     }
     
     @Override
-    protected float getTemperatureNoCache(final BlockPos fk) {
+    protected float getTemperatureNoCache(final BlockPos fu) {
         float float3 = this.getTemperature();
-        final double double4 = FrozenOceanBiome.FROZEN_TEMPERATURE_NOISE.getValue(fk.getX() * 0.05, fk.getZ() * 0.05, false) * 7.0;
-        final double double5 = FrozenOceanBiome.BIOME_INFO_NOISE.getValue(fk.getX() * 0.2, fk.getZ() * 0.2, false);
+        final double double4 = FrozenOceanBiome.FROZEN_TEMPERATURE_NOISE.getValue(fu.getX() * 0.05, fu.getZ() * 0.05, false) * 7.0;
+        final double double5 = FrozenOceanBiome.BIOME_INFO_NOISE.getValue(fu.getX() * 0.2, fu.getZ() * 0.2, false);
         final double double6 = double4 + double5;
         if (double6 < 0.3) {
-            final double double7 = FrozenOceanBiome.BIOME_INFO_NOISE.getValue(fk.getX() * 0.09, fk.getZ() * 0.09, false);
+            final double double7 = FrozenOceanBiome.BIOME_INFO_NOISE.getValue(fu.getX() * 0.09, fu.getZ() * 0.09, false);
             if (double7 < 0.8) {
                 float3 = 0.2f;
             }
         }
-        if (fk.getY() > 64) {
-            final float float4 = (float)(FrozenOceanBiome.TEMPERATURE_NOISE.getValue(fk.getX() / 8.0f, fk.getZ() / 8.0f, false) * 4.0);
-            return float3 - (float4 + fk.getY() - 64.0f) * 0.05f / 30.0f;
+        if (fu.getY() > 64) {
+            final float float4 = (float)(FrozenOceanBiome.TEMPERATURE_NOISE.getValue(fu.getX() / 8.0f, fu.getZ() / 8.0f, false) * 4.0);
+            return float3 - (float4 + fu.getY() - 64.0f) * 0.05f / 30.0f;
         }
         return float3;
     }
     
     static {
-        FROZEN_TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(3456L), 2, 0);
+        FROZEN_TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(3456L), ImmutableList.<Integer>of(-2, -1, 0));
     }
 }
diff --git a/src/net/minecraft/world/level/biome/FrozenRiverBiome.java b/src/net/minecraft/world/level/biome/FrozenRiverBiome.java
index 35a3dcd..43cb189 100644
--- a/src/net/minecraft/world/level/biome/FrozenRiverBiome.java
+++ b/src/net/minecraft/world/level/biome/FrozenRiverBiome.java
@@ -2,18 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class FrozenRiverBiome extends Biome {
     public FrozenRiverBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.RIVER).depth(-0.5f).scale(0.0f).temperature(0.0f).downfall(0.5f).waterColor(3750089).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.RIVER).depth(-0.5f).scale(0.0f).temperature(0.0f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(3750089).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.MINESHAFT);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -27,7 +25,7 @@ public final class FrozenRiverBiome extends Biome {
         BiomeDefaultFeatures.addDefaultSprings(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 2, 1, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SALMON, 5, 1, 5));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.SALMON, 5, 1, 5));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ZOMBIE, 95, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/GiantSpruceTaigaBiome.java b/src/net/minecraft/world/level/biome/GiantSpruceTaigaBiome.java
index bb4f466..015d7d3 100644
--- a/src/net/minecraft/world/level/biome/GiantSpruceTaigaBiome.java
+++ b/src/net/minecraft/world/level/biome/GiantSpruceTaigaBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class GiantSpruceTaigaBiome extends Biome {
     public GiantSpruceTaigaBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GIANT_TREE_TAIGA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.2f).scale(0.2f).temperature(0.25f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent("giant_tree_taiga"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GIANT_TREE_TAIGA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.2f).scale(0.2f).temperature(0.25f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("giant_tree_taiga"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addMossyStoneBlock(this);
diff --git a/src/net/minecraft/world/level/biome/GiantSpruceTaigaHillsMutatedBiome.java b/src/net/minecraft/world/level/biome/GiantSpruceTaigaHillsMutatedBiome.java
index 369836a..c474bfc 100644
--- a/src/net/minecraft/world/level/biome/GiantSpruceTaigaHillsMutatedBiome.java
+++ b/src/net/minecraft/world/level/biome/GiantSpruceTaigaHillsMutatedBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class GiantSpruceTaigaHillsMutatedBiome extends Biome {
     public GiantSpruceTaigaHillsMutatedBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GIANT_TREE_TAIGA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.2f).scale(0.2f).temperature(0.25f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent("giant_tree_taiga_hills"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GIANT_TREE_TAIGA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.2f).scale(0.2f).temperature(0.25f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("giant_tree_taiga_hills"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addMossyStoneBlock(this);
diff --git a/src/net/minecraft/world/level/biome/GiantTreeTaigaBiome.java b/src/net/minecraft/world/level/biome/GiantTreeTaigaBiome.java
index 53ba715..7835b4a 100644
--- a/src/net/minecraft/world/level/biome/GiantTreeTaigaBiome.java
+++ b/src/net/minecraft/world/level/biome/GiantTreeTaigaBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class GiantTreeTaigaBiome extends Biome {
     public GiantTreeTaigaBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GIANT_TREE_TAIGA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.2f).scale(0.2f).temperature(0.3f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GIANT_TREE_TAIGA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.2f).scale(0.2f).temperature(0.3f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addMossyStoneBlock(this);
diff --git a/src/net/minecraft/world/level/biome/GiantTreeTaigaHillsBiome.java b/src/net/minecraft/world/level/biome/GiantTreeTaigaHillsBiome.java
index 35392e7..b5c7574 100644
--- a/src/net/minecraft/world/level/biome/GiantTreeTaigaHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/GiantTreeTaigaHillsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class GiantTreeTaigaHillsBiome extends Biome {
     public GiantTreeTaigaHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GIANT_TREE_TAIGA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.45f).scale(0.3f).temperature(0.3f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GIANT_TREE_TAIGA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.45f).scale(0.3f).temperature(0.3f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addMossyStoneBlock(this);
diff --git a/src/net/minecraft/world/level/biome/GravellyMountainsBiome.java b/src/net/minecraft/world/level/biome/GravellyMountainsBiome.java
index e1f9a61..5f85cd7 100644
--- a/src/net/minecraft/world/level/biome/GravellyMountainsBiome.java
+++ b/src/net/minecraft/world/level/biome/GravellyMountainsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class GravellyMountainsBiome extends Biome {
     protected GravellyMountainsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GRAVELLY_MOUNTAIN, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.EXTREME_HILLS).depth(1.0f).scale(0.5f).temperature(0.2f).downfall(0.3f).waterColor(4159204).waterFogColor(329011).parent("mountains"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GRAVELLY_MOUNTAIN, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.EXTREME_HILLS).depth(1.0f).scale(0.5f).temperature(0.2f).downfall(0.3f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("mountains"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/IceSpikesBiome.java b/src/net/minecraft/world/level/biome/IceSpikesBiome.java
index 96e9df7..be6338d 100644
--- a/src/net/minecraft/world/level/biome/IceSpikesBiome.java
+++ b/src/net/minecraft/world/level/biome/IceSpikesBiome.java
@@ -5,23 +5,20 @@ import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureRadiusConfiguration;
 import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class IceSpikesBiome extends Biome {
     public IceSpikesBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, new SurfaceBuilderBaseConfiguration(Blocks.SNOW_BLOCK.defaultBlockState(), Blocks.DIRT.defaultBlockState(), Blocks.GRAVEL.defaultBlockState())).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.ICY).depth(0.425f).scale(0.45000002f).temperature(0.0f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent("snowy_tundra"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, new SurfaceBuilderBaseConfiguration(Blocks.SNOW_BLOCK.defaultBlockState(), Blocks.DIRT.defaultBlockState(), Blocks.GRAVEL.defaultBlockState())).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.ICY).depth(0.425f).scale(0.45000002f).temperature(0.0f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("snowy_tundra"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         this.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.ICE_SPIKE.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_HEIGHTMAP.configured(new FrequencyDecoratorConfiguration(3))));
diff --git a/src/net/minecraft/world/level/biome/JungleBiome.java b/src/net/minecraft/world/level/biome/JungleBiome.java
index 6ee9268..f7ddbec 100644
--- a/src/net/minecraft/world/level/biome/JungleBiome.java
+++ b/src/net/minecraft/world/level/biome/JungleBiome.java
@@ -2,22 +2,19 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class JungleBiome extends Biome {
     public JungleBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.1f).scale(0.2f).temperature(0.95f).downfall(0.9f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.JUNGLE_TEMPLE.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.1f).scale(0.2f).temperature(0.95f).downfall(0.9f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.5f, 0.5f, 0.0f, 0.0f, 1.0f))));
+        this.addStructureStart(BiomeDefaultFeatures.JUNGLE_TEMPLE);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_JUNGLE);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/JungleEdgeBiome.java b/src/net/minecraft/world/level/biome/JungleEdgeBiome.java
index 10c2397..7e4aa96 100644
--- a/src/net/minecraft/world/level/biome/JungleEdgeBiome.java
+++ b/src/net/minecraft/world/level/biome/JungleEdgeBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class JungleEdgeBiome extends Biome {
     public JungleEdgeBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.1f).scale(0.2f).temperature(0.95f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.1f).scale(0.2f).temperature(0.95f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_JUNGLE);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/JungleHillsBiome.java b/src/net/minecraft/world/level/biome/JungleHillsBiome.java
index 4ea03f7..0d59cd5 100644
--- a/src/net/minecraft/world/level/biome/JungleHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/JungleHillsBiome.java
@@ -2,22 +2,17 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class JungleHillsBiome extends Biome {
     public JungleHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.45f).scale(0.3f).temperature(0.95f).downfall(0.9f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.JUNGLE_TEMPLE.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.45f).scale(0.3f).temperature(0.95f).downfall(0.9f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.JUNGLE_TEMPLE);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_JUNGLE);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/LukeWarmOceanBiome.java b/src/net/minecraft/world/level/biome/LukeWarmOceanBiome.java
index 8cd2308..389e060 100644
--- a/src/net/minecraft/world/level/biome/LukeWarmOceanBiome.java
+++ b/src/net/minecraft/world/level/biome/LukeWarmOceanBiome.java
@@ -2,23 +2,17 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class LukeWarmOceanBiome extends Biome {
     public LukeWarmOceanBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_OCEAN_SAND).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.0f).scale(0.1f).temperature(0.5f).downfall(0.5f).waterColor(4566514).waterFogColor(267827).parent(null));
-        this.<OceanRuinConfiguration>addStructureStart(Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.WARM, 0.3f, 0.9f)));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_OCEAN_SAND).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.0f).scale(0.1f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4566514).waterFogColor(267827).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_RUIN_WARM);
+        BiomeDefaultFeatures.addDefaultOverworldOceanStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_OCEAN);
         BiomeDefaultFeatures.addOceanCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -34,9 +28,9 @@ public class LukeWarmOceanBiome extends Biome {
         BiomeDefaultFeatures.addLukeWarmKelp(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 10, 1, 2));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.COD, 15, 3, 6));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.PUFFERFISH, 5, 1, 3));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.COD, 15, 3, 6));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.PUFFERFISH, 5, 1, 3));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8));
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.DOLPHIN, 2, 1, 2));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/ModifiedBadlandsPlateauBiome.java b/src/net/minecraft/world/level/biome/ModifiedBadlandsPlateauBiome.java
index 7bc79c0..c5f25e1 100644
--- a/src/net/minecraft/world/level/biome/ModifiedBadlandsPlateauBiome.java
+++ b/src/net/minecraft/world/level/biome/ModifiedBadlandsPlateauBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class ModifiedBadlandsPlateauBiome extends Biome {
     public ModifiedBadlandsPlateauBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(0.45f).scale(0.3f).temperature(2.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent("badlands_plateau"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.MESA)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(0.45f).scale(0.3f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("badlands_plateau"));
+        BiomeDefaultFeatures.addDefaultOverworldLandMesaStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/ModifiedGravellyMountainsBiome.java b/src/net/minecraft/world/level/biome/ModifiedGravellyMountainsBiome.java
index 71f76eb..4d1879b 100644
--- a/src/net/minecraft/world/level/biome/ModifiedGravellyMountainsBiome.java
+++ b/src/net/minecraft/world/level/biome/ModifiedGravellyMountainsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class ModifiedGravellyMountainsBiome extends Biome {
     protected ModifiedGravellyMountainsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GRAVELLY_MOUNTAIN, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.EXTREME_HILLS).depth(1.0f).scale(0.5f).temperature(0.2f).downfall(0.3f).waterColor(4159204).waterFogColor(329011).parent("wooded_mountains"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.GRAVELLY_MOUNTAIN, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.EXTREME_HILLS).depth(1.0f).scale(0.5f).temperature(0.2f).downfall(0.3f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("wooded_mountains"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/ModifiedJungleBiome.java b/src/net/minecraft/world/level/biome/ModifiedJungleBiome.java
index ff22c6e..96495f6 100644
--- a/src/net/minecraft/world/level/biome/ModifiedJungleBiome.java
+++ b/src/net/minecraft/world/level/biome/ModifiedJungleBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class ModifiedJungleBiome extends Biome {
     public ModifiedJungleBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.2f).scale(0.4f).temperature(0.95f).downfall(0.9f).waterColor(4159204).waterFogColor(329011).parent("jungle"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.2f).scale(0.4f).temperature(0.95f).downfall(0.9f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("jungle"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_JUNGLE);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/ModifiedJungleEdgeBiome.java b/src/net/minecraft/world/level/biome/ModifiedJungleEdgeBiome.java
index 87412ab..da62566 100644
--- a/src/net/minecraft/world/level/biome/ModifiedJungleEdgeBiome.java
+++ b/src/net/minecraft/world/level/biome/ModifiedJungleEdgeBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class ModifiedJungleEdgeBiome extends Biome {
     public ModifiedJungleEdgeBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.2f).scale(0.4f).temperature(0.95f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent("jungle_edge"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.JUNGLE).depth(0.2f).scale(0.4f).temperature(0.95f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("jungle_edge"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_JUNGLE);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/ModifiedWoodedBadlandsPlateauBiome.java b/src/net/minecraft/world/level/biome/ModifiedWoodedBadlandsPlateauBiome.java
index 225271b..b90d762 100644
--- a/src/net/minecraft/world/level/biome/ModifiedWoodedBadlandsPlateauBiome.java
+++ b/src/net/minecraft/world/level/biome/ModifiedWoodedBadlandsPlateauBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class ModifiedWoodedBadlandsPlateauBiome extends Biome {
     public ModifiedWoodedBadlandsPlateauBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.WOODED_BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(0.45f).scale(0.3f).temperature(2.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent("wooded_badlands_plateau"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.MESA)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.WOODED_BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(0.45f).scale(0.3f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("wooded_badlands_plateau"));
+        BiomeDefaultFeatures.addDefaultOverworldLandMesaStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/MountainBiome.java b/src/net/minecraft/world/level/biome/MountainBiome.java
index 9802ddd..bc99891 100644
--- a/src/net/minecraft/world/level/biome/MountainBiome.java
+++ b/src/net/minecraft/world/level/biome/MountainBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class MountainBiome extends Biome {
     protected MountainBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.MOUNTAIN, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.EXTREME_HILLS).depth(1.0f).scale(0.5f).temperature(0.2f).downfall(0.3f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.MOUNTAIN, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.EXTREME_HILLS).depth(1.0f).scale(0.5f).temperature(0.2f).downfall(0.3f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/MountainEdgeBiome.java b/src/net/minecraft/world/level/biome/MountainEdgeBiome.java
index e73ecac..c6e2af5 100644
--- a/src/net/minecraft/world/level/biome/MountainEdgeBiome.java
+++ b/src/net/minecraft/world/level/biome/MountainEdgeBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class MountainEdgeBiome extends Biome {
     protected MountainEdgeBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.EXTREME_HILLS).depth(0.8f).scale(0.3f).temperature(0.2f).downfall(0.3f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.EXTREME_HILLS).depth(0.8f).scale(0.3f).temperature(0.2f).downfall(0.3f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/MultiNoiseBiomeSource.java b/src/net/minecraft/world/level/biome/MultiNoiseBiomeSource.java
new file mode 100644
index 0000000..86142a0
--- /dev/null
+++ b/src/net/minecraft/world/level/biome/MultiNoiseBiomeSource.java
@@ -0,0 +1,116 @@
+package net.minecraft.world.level.biome;
+
+import com.google.common.collect.Maps;
+import com.mojang.serialization.DataResult;
+import java.util.function.LongFunction;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Map;
+import com.mojang.datafixers.kinds.Applicative;
+import java.util.function.BiFunction;
+import net.minecraft.core.Registry;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.datafixers.util.Either;
+import java.util.stream.Stream;
+import java.util.Objects;
+import java.util.Comparator;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import java.util.stream.IntStream;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.function.Function;
+import java.util.Optional;
+import com.mojang.datafixers.util.Pair;
+import java.util.List;
+import net.minecraft.world.level.levelgen.synth.NormalNoise;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
+
+public class MultiNoiseBiomeSource extends BiomeSource {
+    public static final MapCodec<MultiNoiseBiomeSource> DIRECT_CODEC;
+    public static final Codec<MultiNoiseBiomeSource> CODEC;
+    private final NormalNoise temperatureNoise;
+    private final NormalNoise humidityNoise;
+    private final NormalNoise altitudeNoise;
+    private final NormalNoise weirdnessNoise;
+    private final List<Pair<Biome.ClimateParameters, Biome>> parameters;
+    private final boolean useY;
+    private final long seed;
+    private final Optional<Preset> preset;
+    
+    private MultiNoiseBiomeSource(final long long1, final List<Pair<Biome.ClimateParameters, Biome>> list) {
+        this(long1, list, Optional.<Preset>empty());
+    }
+    
+    public MultiNoiseBiomeSource(final long long1, final List<Pair<Biome.ClimateParameters, Biome>> list, final Optional<Preset> optional) {
+        super(list.stream().map(Pair::getSecond).collect(Collectors.toList()));
+        this.seed = long1;
+        this.preset = optional;
+        final IntStream intStream6 = IntStream.rangeClosed(-7, -6);
+        final IntStream intStream7 = IntStream.rangeClosed(-7, -6);
+        final IntStream intStream8 = IntStream.rangeClosed(-7, -6);
+        final IntStream intStream9 = IntStream.rangeClosed(-7, -6);
+        this.temperatureNoise = new NormalNoise(new WorldgenRandom(long1), intStream6);
+        this.humidityNoise = new NormalNoise(new WorldgenRandom(long1 + 1L), intStream7);
+        this.altitudeNoise = new NormalNoise(new WorldgenRandom(long1 + 2L), intStream8);
+        this.weirdnessNoise = new NormalNoise(new WorldgenRandom(long1 + 3L), intStream9);
+        this.parameters = list;
+        this.useY = false;
+    }
+    
+    private static MultiNoiseBiomeSource defaultNether(final long long1) {
+        final ImmutableList<Biome> immutableList3 = ImmutableList.<Biome>of(Biomes.NETHER_WASTES, Biomes.SOUL_SAND_VALLEY, Biomes.CRIMSON_FOREST, Biomes.WARPED_FOREST, Biomes.BASALT_DELTAS);
+        return new MultiNoiseBiomeSource(long1, immutableList3.stream().flatMap(bre -> bre.optimalParameters().map(d -> Pair.of(d, bre))).collect(ImmutableList.toImmutableList()), Optional.<Preset>of(Preset.NETHER));
+    }
+    
+    @Override
+    protected Codec<? extends BiomeSource> codec() {
+        return MultiNoiseBiomeSource.CODEC;
+    }
+    
+    @Override
+    public BiomeSource withSeed(final long long1) {
+        return new MultiNoiseBiomeSource(long1, this.parameters, this.preset);
+    }
+    
+    @Override
+    public Biome getNoiseBiome(final int integer1, final int integer2, final int integer3) {
+        final int integer4 = this.useY ? integer2 : 0;
+        final Biome.ClimateParameters d6 = new Biome.ClimateParameters((float)this.temperatureNoise.getValue(integer1, integer4, integer3), (float)this.humidityNoise.getValue(integer1, integer4, integer3), (float)this.altitudeNoise.getValue(integer1, integer4, integer3), (float)this.weirdnessNoise.getValue(integer1, integer4, integer3), 0.0f);
+        return this.parameters.stream().min(Comparator.comparing(pair -> ((Biome.ClimateParameters)pair.getFirst()).fitness(d6))).<Biome>map(Pair::getSecond).orElse(Biomes.THE_VOID);
+    }
+    
+    public boolean stable(final long long1) {
+        return this.seed == long1 && Objects.equals(this.preset, Optional.<Preset>of(Preset.NETHER));
+    }
+    
+    static {
+        DIRECT_CODEC = RecordCodecBuilder.mapCodec(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.LONG.fieldOf("seed").forGetter(btc -> btc.seed), (App)RecordCodecBuilder.create(instance -> instance.group((App)Biome.ClimateParameters.CODEC.fieldOf("parameters").forGetter((Function)Pair::getFirst), (App)Registry.BIOME.fieldOf("biome").forGetter((Function)Pair::getSecond)).apply((Applicative)instance, (BiFunction)Pair::of)).listOf().fieldOf("biomes").forGetter(btc -> btc.parameters)).apply(instance, (BiFunction)MultiNoiseBiomeSource::new));
+        CODEC = Codec.mapEither((MapCodec)Preset.CODEC, (MapCodec)MultiNoiseBiomeSource.DIRECT_CODEC).xmap(either -> (MultiNoiseBiomeSource)either.map(pair -> ((Preset)pair.getFirst()).biomeSource((long)pair.getSecond()), (Function)Function.identity()), btc -> btc.preset.map(a -> Either.left(Pair.of((Object)a, (Object)btc.seed))).orElseGet(() -> Either.right(btc))).codec();
+    }
+    
+    public static class Preset {
+        private static final Map<ResourceLocation, Preset> BY_NAME;
+        public static final MapCodec<Pair<Preset, Long>> CODEC;
+        public static final Preset NETHER;
+        private final ResourceLocation name;
+        private final LongFunction<MultiNoiseBiomeSource> biomeSource;
+        
+        public Preset(final ResourceLocation uh, final LongFunction<MultiNoiseBiomeSource> longFunction) {
+            this.name = uh;
+            this.biomeSource = longFunction;
+            Preset.BY_NAME.put(uh, this);
+        }
+        
+        public MultiNoiseBiomeSource biomeSource(final long long1) {
+            return this.biomeSource.apply(long1);
+        }
+        
+        static {
+            BY_NAME = Maps.newHashMap();
+            CODEC = Codec.mapPair(ResourceLocation.CODEC.flatXmap(uh -> Optional.<Preset>ofNullable(Preset.BY_NAME.get(uh)).map(DataResult::success).orElseGet(() -> DataResult.error("Unknown preset: " + uh)), a -> DataResult.success(a.name)).fieldOf("preset"), Codec.LONG.fieldOf("seed")).stable();
+            NETHER = new Preset(new ResourceLocation("nether"), long1 -> defaultNether(long1));
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/biome/MushroomFieldsBiome.java b/src/net/minecraft/world/level/biome/MushroomFieldsBiome.java
index 43768bd..beab058 100644
--- a/src/net/minecraft/world/level/biome/MushroomFieldsBiome.java
+++ b/src/net/minecraft/world/level/biome/MushroomFieldsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class MushroomFieldsBiome extends Biome {
     public MushroomFieldsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_MYCELIUM).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.MUSHROOM).depth(0.2f).scale(0.3f).temperature(0.9f).downfall(1.0f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_MYCELIUM).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.MUSHROOM).depth(0.2f).scale(0.3f).temperature(0.9f).downfall(1.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/MushroomFieldsShoreBiome.java b/src/net/minecraft/world/level/biome/MushroomFieldsShoreBiome.java
index d11d3d2..02b629c 100644
--- a/src/net/minecraft/world/level/biome/MushroomFieldsShoreBiome.java
+++ b/src/net/minecraft/world/level/biome/MushroomFieldsShoreBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class MushroomFieldsShoreBiome extends Biome {
     public MushroomFieldsShoreBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_MYCELIUM).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.MUSHROOM).depth(0.0f).scale(0.025f).temperature(0.9f).downfall(1.0f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_MYCELIUM).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.MUSHROOM).depth(0.0f).scale(0.025f).temperature(0.9f).downfall(1.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/NearestNeighborBiomeZoomer.java b/src/net/minecraft/world/level/biome/NearestNeighborBiomeZoomer.java
new file mode 100644
index 0000000..13ac1e3
--- /dev/null
+++ b/src/net/minecraft/world/level/biome/NearestNeighborBiomeZoomer.java
@@ -0,0 +1,10 @@
+package net.minecraft.world.level.biome;
+
+public enum NearestNeighborBiomeZoomer implements BiomeZoomer {
+    INSTANCE;
+    
+    @Override
+    public Biome getBiome(final long long1, final int integer2, final int integer3, final int integer4, final BiomeManager.NoiseBiomeSource a) {
+        return a.getNoiseBiome(integer2 >> 2, integer3 >> 2, integer4 >> 2);
+    }
+}
diff --git a/src/net/minecraft/world/level/biome/NetherBiome.java b/src/net/minecraft/world/level/biome/NetherWastesBiome.java
similarity index 69%
rename from src/net/minecraft/world/level/biome/NetherBiome.java
rename to src/net/minecraft/world/level/biome/NetherWastesBiome.java
index 0db63ed..672afac 100644
--- a/src/net/minecraft/world/level/biome/NetherBiome.java
+++ b/src/net/minecraft/world/level/biome/NetherWastesBiome.java
@@ -5,42 +5,48 @@ import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
-import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
-import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
+import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
 import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
 import net.minecraft.world.level.levelgen.carver.WorldCarver;
 import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.sounds.Musics;
+import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
-public final class NetherBiome extends Biome {
-    protected NetherBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.NETHER, SurfaceBuilder.CONFIG_HELL).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.NETHER).depth(0.1f).scale(0.2f).temperature(2.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.NETHER_BRIDGE.configured(FeatureConfiguration.NONE));
-        this.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.HELL_CAVE, (C)new ProbabilityFeatureConfiguration(0.2f)));
+public final class NetherWastesBiome extends Biome {
+    protected NetherWastesBiome() {
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.NETHER, SurfaceBuilder.CONFIG_HELL).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.NETHER).depth(0.1f).scale(0.2f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(3344392).ambientLoopSound(SoundEvents.AMBIENT_NETHER_WASTES_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_NETHER_WASTES_MOOD, 6000, 8, 2.0)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_NETHER_WASTES_ADDITIONS, 0.0111)).backgroundMusic(Musics.createGameMusic(SoundEvents.MUSIC_BIOME_NETHER_WASTES)).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.0f, 0.0f, 0.0f, 0.0f, 0.0f))));
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_NETHER);
+        this.addStructureStart(BiomeDefaultFeatures.NETHER_BRIDGE);
+        this.addStructureStart(BiomeDefaultFeatures.BASTION_REMNANT);
+        this.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.NETHER_CAVE, (C)new ProbabilityFeatureConfiguration(0.2f)));
         this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.LAVA_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_VERY_BIASED_RANGE.configured(new CountRangeDecoratorConfiguration(20, 8, 16, 256))));
         BiomeDefaultFeatures.addDefaultMushrooms(this);
-        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.NETHER_BRIDGE.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
         this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.OPEN_NETHER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(8, 4, 8, 128))));
-        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.HELL_FIRE_CONFIG).decorated(FeatureDecorator.HELL_FIRE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.FIRE_CONFIG).decorated(FeatureDecorator.FIRE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SOUL_FIRE_CONFIG).decorated(FeatureDecorator.FIRE.configured(new FrequencyDecoratorConfiguration(10))));
         this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.GLOWSTONE_BLOB.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.LIGHT_GEM_CHANCE.configured(new FrequencyDecoratorConfiguration(10))));
         this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.GLOWSTONE_BLOB.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 128))));
         this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.BROWN_MUSHROOM_CONFIG).decorated(FeatureDecorator.CHANCE_RANGE.configured(new ChanceRangeDecoratorConfiguration(0.5f, 0, 0, 128))));
         this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.RED_MUSHROOM_CONFIG).decorated(FeatureDecorator.CHANCE_RANGE.configured(new ChanceRangeDecoratorConfiguration(0.5f, 0, 0, 128))));
-        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, Blocks.NETHER_QUARTZ_ORE.defaultBlockState(), 14)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(16, 10, 20, 128))));
         this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, Blocks.MAGMA_BLOCK.defaultBlockState(), 33)).decorated(FeatureDecorator.MAGMA.configured(new FrequencyDecoratorConfiguration(4))));
         this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.CLOSED_NETHER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(16, 10, 20, 128))));
+        BiomeDefaultFeatures.addNetherDefaultOres(this);
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.GHAST, 50, 4, 4));
-        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ZOMBIE_PIGMAN, 100, 4, 4));
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ZOMBIFIED_PIGLIN, 100, 4, 4));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.MAGMA_CUBE, 2, 4, 4));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ENDERMAN, 1, 4, 4));
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.PIGLIN, 15, 4, 4));
+        this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.STRIDER, 60, 1, 2));
     }
 }
diff --git a/src/net/minecraft/world/level/biome/OceanBiome.java b/src/net/minecraft/world/level/biome/OceanBiome.java
index eebef9f..d9dc59e 100644
--- a/src/net/minecraft/world/level/biome/OceanBiome.java
+++ b/src/net/minecraft/world/level/biome/OceanBiome.java
@@ -6,24 +6,21 @@ import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class OceanBiome extends Biome {
     public OceanBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.0f).scale(0.1f).temperature(0.5f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)));
-        this.<OceanRuinConfiguration>addStructureStart(Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.COLD, 0.3f, 0.9f)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.0f).scale(0.1f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.0f, 0.0f, -0.5f, 0.0f, 1.0f))));
+        BiomeDefaultFeatures.addDefaultOverworldOceanStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_RUIN_COLD);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_OCEAN);
         BiomeDefaultFeatures.addOceanCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -40,7 +37,7 @@ public final class OceanBiome extends Biome {
         BiomeDefaultFeatures.addColdOceanExtraVegetation(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 1, 1, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.COD, 10, 3, 6));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.COD, 10, 3, 6));
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.DOLPHIN, 1, 1, 2));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/OverworldBiomeSource.java b/src/net/minecraft/world/level/biome/OverworldBiomeSource.java
index 27c1968..d562896 100644
--- a/src/net/minecraft/world/level/biome/OverworldBiomeSource.java
+++ b/src/net/minecraft/world/level/biome/OverworldBiomeSource.java
@@ -1,17 +1,39 @@
 package net.minecraft.world.level.biome;
 
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableList;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.serialization.Lifecycle;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.newbiome.layer.Layers;
-import java.util.Set;
+import java.util.List;
 import net.minecraft.world.level.newbiome.layer.Layer;
+import com.mojang.serialization.Codec;
 
 public class OverworldBiomeSource extends BiomeSource {
+    public static final Codec<OverworldBiomeSource> CODEC;
     private final Layer noiseBiomeLayer;
-    private static final Set<Biome> POSSIBLE_BIOMES;
+    private static final List<Biome> POSSIBLE_BIOMES;
+    private final long seed;
+    private final boolean legacyBiomeInitLayer;
+    private final boolean largeBiomes;
     
-    public OverworldBiomeSource(final OverworldBiomeSourceSettings bmz) {
+    public OverworldBiomeSource(final long long1, final boolean boolean2, final boolean boolean3) {
         super(OverworldBiomeSource.POSSIBLE_BIOMES);
-        this.noiseBiomeLayer = Layers.getDefaultLayer(bmz.getSeed(), bmz.getGeneratorType(), bmz.getGeneratorSettings());
+        this.seed = long1;
+        this.legacyBiomeInitLayer = boolean2;
+        this.largeBiomes = boolean3;
+        this.noiseBiomeLayer = Layers.getDefaultLayer(long1, boolean2, boolean3 ? 6 : 4, 4);
+    }
+    
+    @Override
+    protected Codec<? extends BiomeSource> codec() {
+        return OverworldBiomeSource.CODEC;
+    }
+    
+    @Override
+    public BiomeSource withSeed(final long long1) {
+        return new OverworldBiomeSource(long1, this.legacyBiomeInitLayer, this.largeBiomes);
     }
     
     @Override
@@ -20,6 +42,7 @@ public class OverworldBiomeSource extends BiomeSource {
     }
     
     static {
-        POSSIBLE_BIOMES = ImmutableSet.<Biome>of(Biomes.OCEAN, Biomes.PLAINS, Biomes.DESERT, Biomes.MOUNTAINS, Biomes.FOREST, Biomes.TAIGA, Biomes.SWAMP, Biomes.RIVER, Biomes.FROZEN_OCEAN, Biomes.FROZEN_RIVER, Biomes.SNOWY_TUNDRA, Biomes.SNOWY_MOUNTAINS, Biomes.MUSHROOM_FIELDS, Biomes.MUSHROOM_FIELD_SHORE, Biomes.BEACH, Biomes.DESERT_HILLS, Biomes.WOODED_HILLS, Biomes.TAIGA_HILLS, Biomes.MOUNTAIN_EDGE, Biomes.JUNGLE, Biomes.JUNGLE_HILLS, Biomes.JUNGLE_EDGE, Biomes.DEEP_OCEAN, Biomes.STONE_SHORE, Biomes.SNOWY_BEACH, Biomes.BIRCH_FOREST, Biomes.BIRCH_FOREST_HILLS, Biomes.DARK_FOREST, Biomes.SNOWY_TAIGA, Biomes.SNOWY_TAIGA_HILLS, Biomes.GIANT_TREE_TAIGA, Biomes.GIANT_TREE_TAIGA_HILLS, Biomes.WOODED_MOUNTAINS, Biomes.SAVANNA, Biomes.SAVANNA_PLATEAU, Biomes.BADLANDS, Biomes.WOODED_BADLANDS_PLATEAU, Biomes.BADLANDS_PLATEAU, Biomes.WARM_OCEAN, Biomes.LUKEWARM_OCEAN, Biomes.COLD_OCEAN, Biomes.DEEP_WARM_OCEAN, Biomes.DEEP_LUKEWARM_OCEAN, Biomes.DEEP_COLD_OCEAN, Biomes.DEEP_FROZEN_OCEAN, Biomes.SUNFLOWER_PLAINS, Biomes.DESERT_LAKES, Biomes.GRAVELLY_MOUNTAINS, Biomes.FLOWER_FOREST, Biomes.TAIGA_MOUNTAINS, Biomes.SWAMP_HILLS, Biomes.ICE_SPIKES, Biomes.MODIFIED_JUNGLE, Biomes.MODIFIED_JUNGLE_EDGE, Biomes.TALL_BIRCH_FOREST, Biomes.TALL_BIRCH_HILLS, Biomes.DARK_FOREST_HILLS, Biomes.SNOWY_TAIGA_MOUNTAINS, Biomes.GIANT_SPRUCE_TAIGA, Biomes.GIANT_SPRUCE_TAIGA_HILLS, Biomes.MODIFIED_GRAVELLY_MOUNTAINS, Biomes.SHATTERED_SAVANNA, Biomes.SHATTERED_SAVANNA_PLATEAU, Biomes.ERODED_BADLANDS, Biomes.MODIFIED_WOODED_BADLANDS_PLATEAU, Biomes.MODIFIED_BADLANDS_PLATEAU);
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.LONG.fieldOf("seed").stable().forGetter(bti -> bti.seed), (App)Codec.BOOL.optionalFieldOf("legacy_biome_init_layer", false, Lifecycle.stable()).forGetter(bti -> bti.legacyBiomeInitLayer), (App)Codec.BOOL.fieldOf("large_biomes").withDefault(false).stable().forGetter(bti -> bti.largeBiomes)).apply(instance, ((RecordCodecBuilder.Instance)instance).stable(OverworldBiomeSource::new)));
+        POSSIBLE_BIOMES = ImmutableList.<Biome>of(Biomes.OCEAN, Biomes.PLAINS, Biomes.DESERT, Biomes.MOUNTAINS, Biomes.FOREST, Biomes.TAIGA, Biomes.SWAMP, Biomes.RIVER, Biomes.FROZEN_OCEAN, Biomes.FROZEN_RIVER, Biomes.SNOWY_TUNDRA, Biomes.SNOWY_MOUNTAINS, Biomes.MUSHROOM_FIELDS, Biomes.MUSHROOM_FIELD_SHORE, Biomes.BEACH, Biomes.DESERT_HILLS, Biomes.WOODED_HILLS, Biomes.TAIGA_HILLS, Biomes.MOUNTAIN_EDGE, Biomes.JUNGLE, Biomes.JUNGLE_HILLS, Biomes.JUNGLE_EDGE, Biomes.DEEP_OCEAN, Biomes.STONE_SHORE, Biomes.SNOWY_BEACH, Biomes.BIRCH_FOREST, Biomes.BIRCH_FOREST_HILLS, Biomes.DARK_FOREST, Biomes.SNOWY_TAIGA, Biomes.SNOWY_TAIGA_HILLS, Biomes.GIANT_TREE_TAIGA, Biomes.GIANT_TREE_TAIGA_HILLS, Biomes.WOODED_MOUNTAINS, Biomes.SAVANNA, Biomes.SAVANNA_PLATEAU, Biomes.BADLANDS, Biomes.WOODED_BADLANDS_PLATEAU, Biomes.BADLANDS_PLATEAU, Biomes.WARM_OCEAN, Biomes.LUKEWARM_OCEAN, Biomes.COLD_OCEAN, Biomes.DEEP_WARM_OCEAN, Biomes.DEEP_LUKEWARM_OCEAN, Biomes.DEEP_COLD_OCEAN, Biomes.DEEP_FROZEN_OCEAN, Biomes.SUNFLOWER_PLAINS, Biomes.DESERT_LAKES, Biomes.GRAVELLY_MOUNTAINS, Biomes.FLOWER_FOREST, Biomes.TAIGA_MOUNTAINS, Biomes.SWAMP_HILLS, Biomes.ICE_SPIKES, Biomes.MODIFIED_JUNGLE, Biomes.MODIFIED_JUNGLE_EDGE, Biomes.TALL_BIRCH_FOREST, Biomes.TALL_BIRCH_HILLS, Biomes.DARK_FOREST_HILLS, Biomes.SNOWY_TAIGA_MOUNTAINS, Biomes.GIANT_SPRUCE_TAIGA, Biomes.GIANT_SPRUCE_TAIGA_HILLS, Biomes.MODIFIED_GRAVELLY_MOUNTAINS, Biomes.SHATTERED_SAVANNA, Biomes.SHATTERED_SAVANNA_PLATEAU, Biomes.ERODED_BADLANDS, Biomes.MODIFIED_WOODED_BADLANDS_PLATEAU, Biomes.MODIFIED_BADLANDS_PLATEAU);
     }
 }
diff --git a/src/net/minecraft/world/level/biome/OverworldBiomeSourceSettings.java b/src/net/minecraft/world/level/biome/OverworldBiomeSourceSettings.java
deleted file mode 100644
index e4a532d..0000000
--- a/src/net/minecraft/world/level/biome/OverworldBiomeSourceSettings.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.minecraft.world.level.biome;
-
-import net.minecraft.world.level.storage.LevelData;
-import net.minecraft.world.level.levelgen.OverworldGeneratorSettings;
-import net.minecraft.world.level.LevelType;
-
-public class OverworldBiomeSourceSettings implements BiomeSourceSettings {
-    private final long seed;
-    private final LevelType generatorType;
-    private OverworldGeneratorSettings generatorSettings;
-    
-    public OverworldBiomeSourceSettings(final LevelData crm) {
-        this.generatorSettings = new OverworldGeneratorSettings();
-        this.seed = crm.getSeed();
-        this.generatorType = crm.getGeneratorType();
-    }
-    
-    public OverworldBiomeSourceSettings setGeneratorSettings(final OverworldGeneratorSettings cbz) {
-        this.generatorSettings = cbz;
-        return this;
-    }
-    
-    public long getSeed() {
-        return this.seed;
-    }
-    
-    public LevelType getGeneratorType() {
-        return this.generatorType;
-    }
-    
-    public OverworldGeneratorSettings getGeneratorSettings() {
-        return this.generatorSettings;
-    }
-}
diff --git a/src/net/minecraft/world/level/biome/PlainsBiome.java b/src/net/minecraft/world/level/biome/PlainsBiome.java
index 03e90ca..0bf05a1 100644
--- a/src/net/minecraft/world/level/biome/PlainsBiome.java
+++ b/src/net/minecraft/world/level/biome/PlainsBiome.java
@@ -2,24 +2,20 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class PlainsBiome extends Biome {
     protected PlainsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.PLAINS).depth(0.125f).scale(0.05f).temperature(0.8f).downfall(0.4f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<VillageConfiguration>addStructureStart(Feature.VILLAGE.configured(new VillageConfiguration("village/plains/town_centers", 6)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.PILLAGER_OUTPOST.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.PLAINS).depth(0.125f).scale(0.05f).temperature(0.8f).downfall(0.4f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.0f, 0.0f, 0.0f, 0.0f, 1.0f))));
+        this.addStructureStart(BiomeDefaultFeatures.VILLAGE_PLAINS);
+        this.addStructureStart(BiomeDefaultFeatures.PILLAGER_OUTPOST);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addPlainGrass(this);
diff --git a/src/net/minecraft/world/level/biome/RiverBiome.java b/src/net/minecraft/world/level/biome/RiverBiome.java
index 2d97cf5..364cfd1 100644
--- a/src/net/minecraft/world/level/biome/RiverBiome.java
+++ b/src/net/minecraft/world/level/biome/RiverBiome.java
@@ -6,19 +6,18 @@ import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class RiverBiome extends Biome {
     public RiverBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.RIVER).depth(-0.5f).scale(0.0f).temperature(0.5f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.RIVER).depth(-0.5f).scale(0.0f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.MINESHAFT);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -33,7 +32,7 @@ public final class RiverBiome extends Biome {
         this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SEAGRASS.configured(new SeagrassFeatureConfiguration(48, 0.4)).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP.configured(DecoratorConfiguration.NONE)));
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 2, 1, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SALMON, 5, 1, 5));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.SALMON, 5, 1, 5));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ZOMBIE, 95, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/SavannaBiome.java b/src/net/minecraft/world/level/biome/SavannaBiome.java
index a2c97f5..746d954 100644
--- a/src/net/minecraft/world/level/biome/SavannaBiome.java
+++ b/src/net/minecraft/world/level/biome/SavannaBiome.java
@@ -2,24 +2,18 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SavannaBiome extends Biome {
     protected SavannaBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.SAVANNA).depth(0.125f).scale(0.05f).temperature(1.2f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<VillageConfiguration>addStructureStart(Feature.VILLAGE.configured(new VillageConfiguration("village/savanna/town_centers", 6)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.PILLAGER_OUTPOST.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.SAVANNA).depth(0.125f).scale(0.05f).temperature(1.2f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.VILLAGE_SAVANNA);
+        this.addStructureStart(BiomeDefaultFeatures.PILLAGER_OUTPOST);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addSavannaGrass(this);
diff --git a/src/net/minecraft/world/level/biome/SavannaPlateauBiome.java b/src/net/minecraft/world/level/biome/SavannaPlateauBiome.java
index 10ddb72..1a2f9a6 100644
--- a/src/net/minecraft/world/level/biome/SavannaPlateauBiome.java
+++ b/src/net/minecraft/world/level/biome/SavannaPlateauBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SavannaPlateauBiome extends Biome {
     protected SavannaPlateauBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.SAVANNA).depth(1.5f).scale(0.025f).temperature(1.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.SAVANNA).depth(1.5f).scale(0.025f).temperature(1.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addSavannaGrass(this);
diff --git a/src/net/minecraft/world/level/biome/ShatteredSavannaBiome.java b/src/net/minecraft/world/level/biome/ShatteredSavannaBiome.java
index d6bce23..2649ecc 100644
--- a/src/net/minecraft/world/level/biome/ShatteredSavannaBiome.java
+++ b/src/net/minecraft/world/level/biome/ShatteredSavannaBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class ShatteredSavannaBiome extends Biome {
     public ShatteredSavannaBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.SHATTERED_SAVANNA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.SAVANNA).depth(0.3625f).scale(1.225f).temperature(1.1f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent("savanna"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.SHATTERED_SAVANNA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.SAVANNA).depth(0.3625f).scale(1.225f).temperature(1.1f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("savanna"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/ShatteredSavannaPlateauBiome.java b/src/net/minecraft/world/level/biome/ShatteredSavannaPlateauBiome.java
index 5f78d80..3500e91 100644
--- a/src/net/minecraft/world/level/biome/ShatteredSavannaPlateauBiome.java
+++ b/src/net/minecraft/world/level/biome/ShatteredSavannaPlateauBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class ShatteredSavannaPlateauBiome extends Biome {
     public ShatteredSavannaPlateauBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.SHATTERED_SAVANNA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.SAVANNA).depth(1.05f).scale(1.2125001f).temperature(1.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent("savanna_plateau"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.SHATTERED_SAVANNA, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.SAVANNA).depth(1.05f).scale(1.2125001f).temperature(1.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("savanna_plateau"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/SmallEndIslandsBiome.java b/src/net/minecraft/world/level/biome/SmallEndIslandsBiome.java
index 1e626e3..0b24f69 100644
--- a/src/net/minecraft/world/level/biome/SmallEndIslandsBiome.java
+++ b/src/net/minecraft/world/level/biome/SmallEndIslandsBiome.java
@@ -13,9 +13,8 @@ import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class SmallEndIslandsBiome extends Biome {
     public SmallEndIslandsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_THEEND).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.THEEND).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_THEEND).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.THEEND).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(10518688).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
         this.addFeature(GenerationStep.Decoration.RAW_GENERATION, Feature.END_ISLAND.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.END_ISLAND.configured(DecoratorConfiguration.NONE)));
-        BiomeDefaultFeatures.addEndCity(this);
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ENDERMAN, 10, 4, 4));
     }
     
diff --git a/src/net/minecraft/world/level/biome/SnowyBeachBiome.java b/src/net/minecraft/world/level/biome/SnowyBeachBiome.java
index 3aae671..321d386 100644
--- a/src/net/minecraft/world/level/biome/SnowyBeachBiome.java
+++ b/src/net/minecraft/world/level/biome/SnowyBeachBiome.java
@@ -2,22 +2,18 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SnowyBeachBiome extends Biome {
     public SnowyBeachBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_DESERT).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.BEACH).depth(0.0f).scale(0.025f).temperature(0.05f).downfall(0.3f).waterColor(4020182).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<BuriedTreasureConfiguration>addStructureStart(Feature.BURIED_TREASURE.configured(new BuriedTreasureConfiguration(0.01f)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(true)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_DESERT).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.BEACH).depth(0.0f).scale(0.025f).temperature(0.05f).downfall(0.3f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4020182).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.MINESHAFT);
+        this.addStructureStart(BiomeDefaultFeatures.BURIED_TREASURE);
+        this.addStructureStart(BiomeDefaultFeatures.SHIPWRECH_BEACHED);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/SnowyMountainsBiome.java b/src/net/minecraft/world/level/biome/SnowyMountainsBiome.java
index 32a9b76..10bc397 100644
--- a/src/net/minecraft/world/level/biome/SnowyMountainsBiome.java
+++ b/src/net/minecraft/world/level/biome/SnowyMountainsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SnowyMountainsBiome extends Biome {
     public SnowyMountainsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.ICY).depth(0.45f).scale(0.3f).temperature(0.0f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.ICY).depth(0.45f).scale(0.3f).temperature(0.0f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/SnowyTaigaBiome.java b/src/net/minecraft/world/level/biome/SnowyTaigaBiome.java
index 3edb8e6..33ea60a 100644
--- a/src/net/minecraft/world/level/biome/SnowyTaigaBiome.java
+++ b/src/net/minecraft/world/level/biome/SnowyTaigaBiome.java
@@ -2,22 +2,17 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SnowyTaigaBiome extends Biome {
     public SnowyTaigaBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.TAIGA).depth(0.2f).scale(0.2f).temperature(-0.5f).downfall(0.4f).waterColor(4020182).waterFogColor(329011).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.IGLOO.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.TAIGA).depth(0.2f).scale(0.2f).temperature(-0.5f).downfall(0.4f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4020182).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.IGLOO);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addFerns(this);
diff --git a/src/net/minecraft/world/level/biome/SnowyTaigaHillsBiome.java b/src/net/minecraft/world/level/biome/SnowyTaigaHillsBiome.java
index f60edf6..18123ae 100644
--- a/src/net/minecraft/world/level/biome/SnowyTaigaHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/SnowyTaigaHillsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SnowyTaigaHillsBiome extends Biome {
     public SnowyTaigaHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.TAIGA).depth(0.45f).scale(0.3f).temperature(-0.5f).downfall(0.4f).waterColor(4020182).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.TAIGA).depth(0.45f).scale(0.3f).temperature(-0.5f).downfall(0.4f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4020182).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addFerns(this);
diff --git a/src/net/minecraft/world/level/biome/SnowyTaigaMountainsBiome.java b/src/net/minecraft/world/level/biome/SnowyTaigaMountainsBiome.java
index 8053c1c..85aff4a 100644
--- a/src/net/minecraft/world/level/biome/SnowyTaigaMountainsBiome.java
+++ b/src/net/minecraft/world/level/biome/SnowyTaigaMountainsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SnowyTaigaMountainsBiome extends Biome {
     public SnowyTaigaMountainsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.TAIGA).depth(0.3f).scale(0.4f).temperature(-0.5f).downfall(0.4f).waterColor(4020182).waterFogColor(329011).parent("snowy_taiga"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.TAIGA).depth(0.3f).scale(0.4f).temperature(-0.5f).downfall(0.4f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4020182).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("snowy_taiga"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addFerns(this);
diff --git a/src/net/minecraft/world/level/biome/SnowyTundraBiome.java b/src/net/minecraft/world/level/biome/SnowyTundraBiome.java
index fdc9c26..5112e7b 100644
--- a/src/net/minecraft/world/level/biome/SnowyTundraBiome.java
+++ b/src/net/minecraft/world/level/biome/SnowyTundraBiome.java
@@ -2,25 +2,21 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SnowyTundraBiome extends Biome {
     public SnowyTundraBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.ICY).depth(0.125f).scale(0.05f).temperature(0.0f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<VillageConfiguration>addStructureStart(Feature.VILLAGE.configured(new VillageConfiguration("village/snowy/town_centers", 6)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.IGLOO.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.PILLAGER_OUTPOST.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.SNOW).biomeCategory(BiomeCategory.ICY).depth(0.125f).scale(0.05f).temperature(0.0f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(-0.5f, -0.5f, 0.0f, 0.0f, 1.0f))));
+        this.addStructureStart(BiomeDefaultFeatures.VILLAGE_SNOVY);
+        this.addStructureStart(BiomeDefaultFeatures.IGLOO);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.PILLAGER_OUTPOST);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/SoulSandValleyBiome.java b/src/net/minecraft/world/level/biome/SoulSandValleyBiome.java
new file mode 100644
index 0000000..c527b89
--- /dev/null
+++ b/src/net/minecraft/world/level/biome/SoulSandValleyBiome.java
@@ -0,0 +1,59 @@
+package net.minecraft.world.level.biome;
+
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
+import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
+import net.minecraft.world.level.levelgen.carver.WorldCarver;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.sounds.Musics;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
+import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
+
+public class SoulSandValleyBiome extends Biome {
+    protected SoulSandValleyBiome() {
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.SOUL_SAND_VALLEY, SurfaceBuilder.CONFIG_SOUL_SAND_VALLEY).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.NETHER).depth(0.1f).scale(0.2f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(1787717).ambientParticle(new AmbientParticleSettings(ParticleTypes.ASH, 0.00625f)).ambientLoopSound(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_MOOD, 6000, 8, 2.0)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_ADDITIONS, 0.0111)).backgroundMusic(Musics.createGameMusic(SoundEvents.MUSIC_BIOME_SOUL_SAND_VALLEY)).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.0f, -0.5f, 0.0f, 0.0f, 0.0f))));
+        this.addStructureStart(BiomeDefaultFeatures.NETHER_BRIDGE);
+        this.addStructureStart(BiomeDefaultFeatures.NETHER_FOSSIL);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_NETHER);
+        this.addStructureStart(BiomeDefaultFeatures.BASTION_REMNANT);
+        this.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.NETHER_CAVE, (C)new ProbabilityFeatureConfiguration(0.2f)));
+        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.LAVA_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_VERY_BIASED_RANGE.configured(new CountRangeDecoratorConfiguration(20, 8, 16, 256))));
+        this.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, Feature.BASALT_PILLAR.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.OPEN_NETHER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(8, 4, 8, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.GLOWSTONE_BLOB.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.LIGHT_GEM_CHANCE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.GLOWSTONE_BLOB.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.CRIMSON_ROOTS_CONFIG).decorated(FeatureDecorator.CHANCE_RANGE.configured(new ChanceRangeDecoratorConfiguration(1.0f, 0, 0, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.FIRE_CONFIG).decorated(FeatureDecorator.FIRE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SOUL_FIRE_CONFIG).decorated(FeatureDecorator.FIRE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, Blocks.MAGMA_BLOCK.defaultBlockState(), 33)).decorated(FeatureDecorator.MAGMA.configured(new FrequencyDecoratorConfiguration(4))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.CLOSED_NETHER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(16, 10, 20, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, Blocks.SOUL_SAND.defaultBlockState(), 12)).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(12, 0, 0, 32))));
+        BiomeDefaultFeatures.addNetherDefaultOres(this);
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SKELETON, 20, 5, 5));
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.GHAST, 50, 4, 4));
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ENDERMAN, 1, 4, 4));
+        this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.STRIDER, 60, 1, 2));
+        final double double2 = 0.7;
+        final double double3 = 0.15;
+        this.addMobCharge(EntityType.SKELETON, 0.7, 0.15);
+        this.addMobCharge(EntityType.GHAST, 0.7, 0.15);
+        this.addMobCharge(EntityType.ENDERMAN, 0.7, 0.15);
+        this.addMobCharge(EntityType.STRIDER, 0.7, 0.15);
+    }
+}
diff --git a/src/net/minecraft/world/level/biome/StoneShoreBiome.java b/src/net/minecraft/world/level/biome/StoneShoreBiome.java
index fa8b065..cc1a3f9 100644
--- a/src/net/minecraft/world/level/biome/StoneShoreBiome.java
+++ b/src/net/minecraft/world/level/biome/StoneShoreBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class StoneShoreBiome extends Biome {
     public StoneShoreBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_STONE).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.NONE).depth(0.1f).scale(0.8f).temperature(0.2f).downfall(0.3f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_STONE).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.NONE).depth(0.1f).scale(0.8f).temperature(0.2f).downfall(0.3f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/SunflowerPlainsBiome.java b/src/net/minecraft/world/level/biome/SunflowerPlainsBiome.java
index c642594..2500c1d 100644
--- a/src/net/minecraft/world/level/biome/SunflowerPlainsBiome.java
+++ b/src/net/minecraft/world/level/biome/SunflowerPlainsBiome.java
@@ -5,22 +5,18 @@ import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SunflowerPlainsBiome extends Biome {
     protected SunflowerPlainsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.PLAINS).depth(0.125f).scale(0.05f).temperature(0.8f).downfall(0.4f).waterColor(4159204).waterFogColor(329011).parent("plains"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.PLAINS).depth(0.125f).scale(0.05f).temperature(0.8f).downfall(0.4f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("plains"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addPlainGrass(this);
diff --git a/src/net/minecraft/world/level/biome/SwampBiome.java b/src/net/minecraft/world/level/biome/SwampBiome.java
index d2905a1..1d81bdd 100644
--- a/src/net/minecraft/world/level/biome/SwampBiome.java
+++ b/src/net/minecraft/world/level/biome/SwampBiome.java
@@ -6,22 +6,20 @@ import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
 import net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SwampBiome extends Biome {
     protected SwampBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.SWAMP, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.SWAMP).depth(-0.2f).scale(0.1f).temperature(0.8f).downfall(0.9f).waterColor(6388580).waterFogColor(2302743).parent(null));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.SWAMP_HUT.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.SWAMP, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.SWAMP).depth(-0.2f).scale(0.1f).temperature(0.8f).downfall(0.9f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(6388580).waterFogColor(2302743).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.SWAMP_HUT);
+        this.addStructureStart(BiomeDefaultFeatures.MINESHAFT);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_SWAMP);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
+        BiomeDefaultFeatures.addFossilDecoration(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -32,7 +30,6 @@ public final class SwampBiome extends Biome {
         BiomeDefaultFeatures.addSwampExtraVegetation(this);
         BiomeDefaultFeatures.addDefaultSprings(this);
         this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SEAGRASS.configured(new SeagrassFeatureConfiguration(64, 0.6)).decorated(FeatureDecorator.TOP_SOLID_HEIGHTMAP.configured(DecoratorConfiguration.NONE)));
-        BiomeDefaultFeatures.addSwampExtraDecoration(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.SHEEP, 12, 4, 4));
         this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.PIG, 10, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/SwampHillsBiome.java b/src/net/minecraft/world/level/biome/SwampHillsBiome.java
index 22a3edc..bfd9214 100644
--- a/src/net/minecraft/world/level/biome/SwampHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/SwampHillsBiome.java
@@ -2,18 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class SwampHillsBiome extends Biome {
     protected SwampHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.SWAMP, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.SWAMP).depth(-0.1f).scale(0.3f).temperature(0.8f).downfall(0.9f).waterColor(6388580).waterFogColor(2302743).parent("swamp"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.SWAMP, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.SWAMP).depth(-0.1f).scale(0.3f).temperature(0.8f).downfall(0.9f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(6388580).waterFogColor(2302743).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("swamp"));
+        this.addStructureStart(BiomeDefaultFeatures.MINESHAFT);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_SWAMP);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -23,7 +21,7 @@ public final class SwampHillsBiome extends Biome {
         BiomeDefaultFeatures.addDefaultMushrooms(this);
         BiomeDefaultFeatures.addSwampExtraVegetation(this);
         BiomeDefaultFeatures.addDefaultSprings(this);
-        BiomeDefaultFeatures.addSwampExtraDecoration(this);
+        BiomeDefaultFeatures.addFossilDecoration(this);
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.SHEEP, 12, 4, 4));
         this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.PIG, 10, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/TaigaBiome.java b/src/net/minecraft/world/level/biome/TaigaBiome.java
index 64b80b9..e809452 100644
--- a/src/net/minecraft/world/level/biome/TaigaBiome.java
+++ b/src/net/minecraft/world/level/biome/TaigaBiome.java
@@ -2,24 +2,18 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class TaigaBiome extends Biome {
     public TaigaBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.2f).scale(0.2f).temperature(0.25f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<VillageConfiguration>addStructureStart(Feature.VILLAGE.configured(new VillageConfiguration("village/taiga/town_centers", 6)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.PILLAGER_OUTPOST.configured(FeatureConfiguration.NONE));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.2f).scale(0.2f).temperature(0.25f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addStructureStart(BiomeDefaultFeatures.VILLAGE_TAIGA);
+        this.addStructureStart(BiomeDefaultFeatures.PILLAGER_OUTPOST);
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addFerns(this);
diff --git a/src/net/minecraft/world/level/biome/TaigaHillsBiome.java b/src/net/minecraft/world/level/biome/TaigaHillsBiome.java
index 7b02ce7..f3a3baa 100644
--- a/src/net/minecraft/world/level/biome/TaigaHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/TaigaHillsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class TaigaHillsBiome extends Biome {
     public TaigaHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.45f).scale(0.3f).temperature(0.25f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.45f).scale(0.3f).temperature(0.25f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addFerns(this);
diff --git a/src/net/minecraft/world/level/biome/TaigaMountainsBiome.java b/src/net/minecraft/world/level/biome/TaigaMountainsBiome.java
index bd6f4cf..99ce89a 100644
--- a/src/net/minecraft/world/level/biome/TaigaMountainsBiome.java
+++ b/src/net/minecraft/world/level/biome/TaigaMountainsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class TaigaMountainsBiome extends Biome {
     public TaigaMountainsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.3f).scale(0.4f).temperature(0.25f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent("taiga"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.TAIGA).depth(0.3f).scale(0.4f).temperature(0.25f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("taiga"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addFerns(this);
diff --git a/src/net/minecraft/world/level/biome/TallBirchForestBiome.java b/src/net/minecraft/world/level/biome/TallBirchForestBiome.java
index 2a48c8c..37f7571 100644
--- a/src/net/minecraft/world/level/biome/TallBirchForestBiome.java
+++ b/src/net/minecraft/world/level/biome/TallBirchForestBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class TallBirchForestBiome extends Biome {
     public TallBirchForestBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.2f).scale(0.4f).temperature(0.6f).downfall(0.6f).waterColor(4159204).waterFogColor(329011).parent("birch_forest"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.2f).scale(0.4f).temperature(0.6f).downfall(0.6f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("birch_forest"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addForestFlowers(this);
diff --git a/src/net/minecraft/world/level/biome/TallBirchHillsBiome.java b/src/net/minecraft/world/level/biome/TallBirchHillsBiome.java
index 3507068..f79998e 100644
--- a/src/net/minecraft/world/level/biome/TallBirchHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/TallBirchHillsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class TallBirchHillsBiome extends Biome {
     public TallBirchHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.55f).scale(0.5f).temperature(0.6f).downfall(0.6f).waterColor(4159204).waterFogColor(329011).parent("birch_forest_hills"));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.55f).scale(0.5f).temperature(0.6f).downfall(0.6f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent("birch_forest_hills"));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addForestFlowers(this);
diff --git a/src/net/minecraft/world/level/biome/TheEndBiome.java b/src/net/minecraft/world/level/biome/TheEndBiome.java
index acd0107..65bdb4a 100644
--- a/src/net/minecraft/world/level/biome/TheEndBiome.java
+++ b/src/net/minecraft/world/level/biome/TheEndBiome.java
@@ -2,9 +2,7 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
-import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
-import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
+import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.feature.SpikeFeature;
 import java.util.List;
@@ -17,9 +15,8 @@ import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class TheEndBiome extends Biome {
     public TheEndBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_THEEND).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.THEEND).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.END_SPIKE.configured(new SpikeConfiguration(false, ImmutableList.of(), null)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-        BiomeDefaultFeatures.addEndCity(this);
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_THEEND).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.THEEND).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(10518688).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, Feature.END_SPIKE.configured(new SpikeConfiguration(false, ImmutableList.of(), (BlockPos)null)));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ENDERMAN, 10, 4, 4));
     }
     
diff --git a/src/net/minecraft/world/level/biome/TheEndBiomeSource.java b/src/net/minecraft/world/level/biome/TheEndBiomeSource.java
index e70ef3c..d7d1578 100644
--- a/src/net/minecraft/world/level/biome/TheEndBiomeSource.java
+++ b/src/net/minecraft/world/level/biome/TheEndBiomeSource.java
@@ -1,21 +1,36 @@
 package net.minecraft.world.level.biome;
 
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableList;
+import java.util.function.Function;
 import net.minecraft.util.Mth;
 import java.util.Random;
-import java.util.Set;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
+import java.util.List;
 import net.minecraft.world.level.levelgen.synth.SimplexNoise;
+import com.mojang.serialization.Codec;
 
 public class TheEndBiomeSource extends BiomeSource {
+    public static final Codec<TheEndBiomeSource> CODEC;
     private final SimplexNoise islandNoise;
-    private final WorldgenRandom random;
-    private static final Set<Biome> POSSIBLE_BIOMES;
+    private static final List<Biome> POSSIBLE_BIOMES;
+    private final long seed;
     
-    public TheEndBiomeSource(final TheEndBiomeSourceSettings bny) {
+    public TheEndBiomeSource(final long long1) {
         super(TheEndBiomeSource.POSSIBLE_BIOMES);
-        (this.random = new WorldgenRandom(bny.getSeed())).consumeCount(17292);
-        this.islandNoise = new SimplexNoise(this.random);
+        this.seed = long1;
+        final WorldgenRandom ciy4 = new WorldgenRandom(long1);
+        ciy4.consumeCount(17292);
+        this.islandNoise = new SimplexNoise(ciy4);
+    }
+    
+    @Override
+    protected Codec<? extends BiomeSource> codec() {
+        return TheEndBiomeSource.CODEC;
+    }
+    
+    @Override
+    public BiomeSource withSeed(final long long1) {
+        return new TheEndBiomeSource(long1);
     }
     
     @Override
@@ -25,7 +40,7 @@ public class TheEndBiomeSource extends BiomeSource {
         if (integer4 * (long)integer4 + integer5 * (long)integer5 <= 4096L) {
             return Biomes.THE_END;
         }
-        final float float7 = this.getHeightValue(integer4 * 2 + 1, integer5 * 2 + 1);
+        final float float7 = getHeightValue(this.islandNoise, integer4 * 2 + 1, integer5 * 2 + 1);
         if (float7 > 40.0f) {
             return Biomes.END_HIGHLANDS;
         }
@@ -38,22 +53,25 @@ public class TheEndBiomeSource extends BiomeSource {
         return Biomes.END_BARRENS;
     }
     
-    @Override
-    public float getHeightValue(final int integer1, final int integer2) {
-        final int integer3 = integer1 / 2;
+    public boolean stable(final long long1) {
+        return this.seed == long1;
+    }
+    
+    public static float getHeightValue(final SimplexNoise cwg, final int integer2, final int integer3) {
         final int integer4 = integer2 / 2;
-        final int integer5 = integer1 % 2;
+        final int integer5 = integer3 / 2;
         final int integer6 = integer2 % 2;
-        float float8 = 100.0f - Mth.sqrt((float)(integer1 * integer1 + integer2 * integer2)) * 8.0f;
+        final int integer7 = integer3 % 2;
+        float float8 = 100.0f - Mth.sqrt((float)(integer2 * integer2 + integer3 * integer3)) * 8.0f;
         float8 = Mth.clamp(float8, -100.0f, 80.0f);
-        for (int integer7 = -12; integer7 <= 12; ++integer7) {
-            for (int integer8 = -12; integer8 <= 12; ++integer8) {
-                final long long11 = integer3 + integer7;
-                final long long12 = integer4 + integer8;
-                if (long11 * long11 + long12 * long12 > 4096L && this.islandNoise.getValue((double)long11, (double)long12) < -0.8999999761581421) {
+        for (int integer8 = -12; integer8 <= 12; ++integer8) {
+            for (int integer9 = -12; integer9 <= 12; ++integer9) {
+                final long long11 = integer4 + integer8;
+                final long long12 = integer5 + integer9;
+                if (long11 * long11 + long12 * long12 > 4096L && cwg.getValue((double)long11, (double)long12) < -0.8999999761581421) {
                     final float float9 = (Mth.abs((float)long11) * 3439.0f + Mth.abs((float)long12) * 147.0f) % 13.0f + 9.0f;
-                    final float float10 = (float)(integer5 - integer7 * 2);
-                    final float float11 = (float)(integer6 - integer8 * 2);
+                    final float float10 = (float)(integer6 - integer8 * 2);
+                    final float float11 = (float)(integer7 - integer9 * 2);
                     float float12 = 100.0f - Mth.sqrt(float10 * float10 + float11 * float11) * float9;
                     float12 = Mth.clamp(float12, -100.0f, 80.0f);
                     float8 = Math.max(float8, float12);
@@ -64,6 +82,7 @@ public class TheEndBiomeSource extends BiomeSource {
     }
     
     static {
-        POSSIBLE_BIOMES = ImmutableSet.<Biome>of(Biomes.THE_END, Biomes.END_HIGHLANDS, Biomes.END_MIDLANDS, Biomes.SMALL_END_ISLANDS, Biomes.END_BARRENS);
+        CODEC = Codec.LONG.fieldOf("seed").xmap((Function)TheEndBiomeSource::new, buh -> buh.seed).stable().codec();
+        POSSIBLE_BIOMES = ImmutableList.<Biome>of(Biomes.THE_END, Biomes.END_HIGHLANDS, Biomes.END_MIDLANDS, Biomes.SMALL_END_ISLANDS, Biomes.END_BARRENS);
     }
 }
diff --git a/src/net/minecraft/world/level/biome/TheEndBiomeSourceSettings.java b/src/net/minecraft/world/level/biome/TheEndBiomeSourceSettings.java
deleted file mode 100644
index 306d3a5..0000000
--- a/src/net/minecraft/world/level/biome/TheEndBiomeSourceSettings.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package net.minecraft.world.level.biome;
-
-import net.minecraft.world.level.storage.LevelData;
-
-public class TheEndBiomeSourceSettings implements BiomeSourceSettings {
-    private final long seed;
-    
-    public TheEndBiomeSourceSettings(final LevelData crm) {
-        this.seed = crm.getSeed();
-    }
-    
-    public long getSeed() {
-        return this.seed;
-    }
-}
diff --git a/src/net/minecraft/world/level/biome/TheVoidBiome.java b/src/net/minecraft/world/level/biome/TheVoidBiome.java
index 200e17c..1142f6d 100644
--- a/src/net/minecraft/world/level/biome/TheVoidBiome.java
+++ b/src/net/minecraft/world/level/biome/TheVoidBiome.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.level.biome;
 
-import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
-import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
-import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
+import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.GenerationStep;
@@ -11,7 +9,7 @@ import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class TheVoidBiome extends Biome {
     public TheVoidBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.NOPE, SurfaceBuilder.CONFIG_STONE).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.NONE).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, Feature.VOID_START_PLATFORM.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.NOPE, SurfaceBuilder.CONFIG_STONE).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.NONE).depth(0.1f).scale(0.2f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        this.addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, Feature.VOID_START_PLATFORM.configured(FeatureConfiguration.NONE));
     }
 }
diff --git a/src/net/minecraft/world/level/biome/WarmOceanBiome.java b/src/net/minecraft/world/level/biome/WarmOceanBiome.java
index b1a37e1..4a18649 100644
--- a/src/net/minecraft/world/level/biome/WarmOceanBiome.java
+++ b/src/net/minecraft/world/level/biome/WarmOceanBiome.java
@@ -7,30 +7,25 @@ import net.minecraft.world.level.levelgen.feature.configurations.CountFeatureCon
 import net.minecraft.world.level.levelgen.placement.NoiseCountFactorDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
-import java.util.List;
 import net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
-import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public class WarmOceanBiome extends Biome {
     public WarmOceanBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_FULL_SAND).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.0f).scale(0.1f).temperature(0.5f).downfall(0.5f).waterColor(4445678).waterFogColor(270131).parent(null));
-        this.<OceanRuinConfiguration>addStructureStart(Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.WARM, 0.3f, 0.9f)));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<ShipwreckConfiguration>addStructureStart(Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_FULL_SAND).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.OCEAN).depth(-1.0f).scale(0.1f).temperature(0.5f).downfall(0.5f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4445678).waterFogColor(270131).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.0f, 0.0f, -0.25f, 0.0f, 1.0f))));
+        this.addStructureStart(BiomeDefaultFeatures.OCEAN_RUIN_WARM);
+        BiomeDefaultFeatures.addDefaultOverworldOceanStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_OCEAN);
         BiomeDefaultFeatures.addOceanCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
@@ -47,8 +42,8 @@ public class WarmOceanBiome extends Biome {
         this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SEA_PICKLE.configured(new CountFeatureConfiguration(20)).decorated(FeatureDecorator.CHANCE_TOP_SOLID_HEIGHTMAP.configured(new ChanceDecoratorConfiguration(16))));
         BiomeDefaultFeatures.addSurfaceFreezing(this);
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.SQUID, 10, 4, 4));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.PUFFERFISH, 15, 1, 3));
-        this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.PUFFERFISH, 15, 1, 3));
+        this.addSpawn(MobCategory.WATER_AMBIENT, new SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8));
         this.addSpawn(MobCategory.WATER_CREATURE, new SpawnerData(EntityType.DOLPHIN, 2, 1, 2));
         this.addSpawn(MobCategory.AMBIENT, new SpawnerData(EntityType.BAT, 10, 8, 8));
         this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.SPIDER, 100, 4, 4));
diff --git a/src/net/minecraft/world/level/biome/WarpedForestBiome.java b/src/net/minecraft/world/level/biome/WarpedForestBiome.java
new file mode 100644
index 0000000..d6a6854
--- /dev/null
+++ b/src/net/minecraft/world/level/biome/WarpedForestBiome.java
@@ -0,0 +1,49 @@
+package net.minecraft.world.level.biome;
+
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
+import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
+import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
+import net.minecraft.world.level.levelgen.carver.WorldCarver;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.sounds.Musics;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
+import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
+
+public class WarpedForestBiome extends Biome {
+    protected WarpedForestBiome() {
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.NETHER_FOREST, SurfaceBuilder.CONFIG_WARPED_FOREST).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.NETHER).depth(0.1f).scale(0.2f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(1705242).ambientParticle(new AmbientParticleSettings(ParticleTypes.WARPED_SPORE, 0.01428f)).ambientLoopSound(SoundEvents.AMBIENT_WARPED_FOREST_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_WARPED_FOREST_MOOD, 6000, 8, 2.0)).ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMBIENT_WARPED_FOREST_ADDITIONS, 0.0111)).backgroundMusic(Musics.createGameMusic(SoundEvents.MUSIC_BIOME_WARPED_FOREST)).build()).parent(null).optimalParameters(ImmutableList.<ClimateParameters>of(new ClimateParameters(0.0f, 0.5f, 0.0f, 0.0f, 0.375f))));
+        this.addStructureStart(BiomeDefaultFeatures.NETHER_BRIDGE);
+        this.addStructureStart(BiomeDefaultFeatures.BASTION_REMNANT);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_NETHER);
+        this.<CarverConfiguration>addCarver(GenerationStep.Carving.AIR, Biome.makeCarver((WorldCarver<C>)WorldCarver.NETHER_CAVE, (C)new ProbabilityFeatureConfiguration(0.2f)));
+        this.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.LAVA_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_VERY_BIASED_RANGE.configured(new CountRangeDecoratorConfiguration(20, 8, 16, 256))));
+        BiomeDefaultFeatures.addDefaultMushrooms(this);
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.OPEN_NETHER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(8, 4, 8, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.FIRE_CONFIG).decorated(FeatureDecorator.FIRE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SOUL_FIRE_CONFIG).decorated(FeatureDecorator.FIRE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.GLOWSTONE_BLOB.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.LIGHT_GEM_CHANCE.configured(new FrequencyDecoratorConfiguration(10))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.GLOWSTONE_BLOB.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(10, 0, 0, 128))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.ORE.configured(new OreConfiguration(OreConfiguration.Predicates.NETHERRACK, Blocks.MAGMA_BLOCK.defaultBlockState(), 33)).decorated(FeatureDecorator.MAGMA.configured(new FrequencyDecoratorConfiguration(4))));
+        this.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, Feature.SPRING.configured(BiomeDefaultFeatures.CLOSED_NETHER_SPRING_CONFIG).decorated(FeatureDecorator.COUNT_RANGE.configured(new CountRangeDecoratorConfiguration(16, 10, 20, 128))));
+        BiomeDefaultFeatures.addWarpedForestVegetation(this);
+        BiomeDefaultFeatures.addNetherDefaultOres(this);
+        this.addSpawn(MobCategory.MONSTER, new SpawnerData(EntityType.ENDERMAN, 1, 4, 4));
+        this.addSpawn(MobCategory.CREATURE, new SpawnerData(EntityType.STRIDER, 60, 1, 2));
+        this.addMobCharge(EntityType.ENDERMAN, 1.0, 0.12);
+    }
+}
diff --git a/src/net/minecraft/world/level/biome/WoodedBadlandsBiome.java b/src/net/minecraft/world/level/biome/WoodedBadlandsBiome.java
index c82432d..b08f3b3 100644
--- a/src/net/minecraft/world/level/biome/WoodedBadlandsBiome.java
+++ b/src/net/minecraft/world/level/biome/WoodedBadlandsBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class WoodedBadlandsBiome extends Biome {
     public WoodedBadlandsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.WOODED_BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(1.5f).scale(0.025f).temperature(2.0f).downfall(0.0f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.MESA)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.WOODED_BADLANDS, SurfaceBuilder.CONFIG_BADLANDS).precipitation(Precipitation.NONE).biomeCategory(BiomeCategory.MESA).depth(1.5f).scale(0.025f).temperature(2.0f).downfall(0.0f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandMesaStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/biome/WoodedHillsBiome.java b/src/net/minecraft/world/level/biome/WoodedHillsBiome.java
index 5a2dc84..e25d6e4 100644
--- a/src/net/minecraft/world/level/biome/WoodedHillsBiome.java
+++ b/src/net/minecraft/world/level/biome/WoodedHillsBiome.java
@@ -2,22 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class WoodedHillsBiome extends Biome {
     public WoodedHillsBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.45f).scale(0.3f).temperature(0.7f).downfall(0.8f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.FOREST).depth(0.45f).scale(0.3f).temperature(0.7f).downfall(0.8f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addForestFlowers(this);
diff --git a/src/net/minecraft/world/level/biome/WoodedMountainBiome.java b/src/net/minecraft/world/level/biome/WoodedMountainBiome.java
index 80c9bdd..edc7357 100644
--- a/src/net/minecraft/world/level/biome/WoodedMountainBiome.java
+++ b/src/net/minecraft/world/level/biome/WoodedMountainBiome.java
@@ -2,21 +2,16 @@ package net.minecraft.world.level.biome;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder;
 
 public final class WoodedMountainBiome extends Biome {
     protected WoodedMountainBiome() {
-        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.EXTREME_HILLS).depth(1.0f).scale(0.5f).temperature(0.2f).downfall(0.3f).waterColor(4159204).waterFogColor(329011).parent(null));
-        this.<MineshaftConfiguration>addStructureStart(Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)));
-        this.<NoneFeatureConfiguration>addStructureStart(Feature.STRONGHOLD.configured(FeatureConfiguration.NONE));
+        super(new BiomeBuilder().<SurfaceBuilderBaseConfiguration>surfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS).precipitation(Precipitation.RAIN).biomeCategory(BiomeCategory.EXTREME_HILLS).depth(1.0f).scale(0.5f).temperature(0.2f).downfall(0.3f).specialEffects(new BiomeSpecialEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).parent(null));
+        BiomeDefaultFeatures.addDefaultOverworldLandStructures(this);
+        this.addStructureStart(BiomeDefaultFeatures.RUINED_PORTAL_MOUNTAIN);
         BiomeDefaultFeatures.addDefaultCarvers(this);
-        BiomeDefaultFeatures.addStructureFeaturePlacement(this);
         BiomeDefaultFeatures.addDefaultLakes(this);
         BiomeDefaultFeatures.addDefaultMonsterRoom(this);
         BiomeDefaultFeatures.addDefaultUndergroundVariety(this);
diff --git a/src/net/minecraft/world/level/block/AbstractBannerBlock.java b/src/net/minecraft/world/level/block/AbstractBannerBlock.java
index 9c93327..03ee671 100644
--- a/src/net/minecraft/world/level/block/AbstractBannerBlock.java
+++ b/src/net/minecraft/world/level/block/AbstractBannerBlock.java
@@ -9,14 +9,15 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BannerBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.item.DyeColor;
 
 public abstract class AbstractBannerBlock extends BaseEntityBlock {
     private final DyeColor color;
     
-    protected AbstractBannerBlock(final DyeColor bdj, final Properties c) {
+    protected AbstractBannerBlock(final DyeColor bje, final Properties c) {
         super(c);
-        this.color = bdj;
+        this.color = bje;
     }
     
     @Override
@@ -25,27 +26,27 @@ public abstract class AbstractBannerBlock extends BaseEntityBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new BannerBlockEntity(this.color);
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, @Nullable final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof BannerBlockEntity) {
-                ((BannerBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof BannerBlockEntity) {
+                ((BannerBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
-        final BlockEntity bwl5 = bjg.getBlockEntity(fk);
-        if (bwl5 instanceof BannerBlockEntity) {
-            return ((BannerBlockEntity)bwl5).getItem(byj);
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        final BlockEntity cdl5 = bpg.getBlockEntity(fu);
+        if (cdl5 instanceof BannerBlockEntity) {
+            return ((BannerBlockEntity)cdl5).getItem(cfj);
         }
-        return super.getCloneItemStack(bjg, fk, byj);
+        return super.getCloneItemStack(bpg, fu, cfj);
     }
     
     public DyeColor getColor() {
diff --git a/src/net/minecraft/world/level/block/AbstractChestBlock.java b/src/net/minecraft/world/level/block/AbstractChestBlock.java
index 03a99a4..851ac1c 100644
--- a/src/net/minecraft/world/level/block/AbstractChestBlock.java
+++ b/src/net/minecraft/world/level/block/AbstractChestBlock.java
@@ -4,6 +4,7 @@ import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import java.util.function.Supplier;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -16,5 +17,5 @@ public abstract class AbstractChestBlock<E extends BlockEntity> extends BaseEnti
         this.blockEntityType = supplier;
     }
     
-    public abstract DoubleBlockCombiner.NeighborCombineResult<? extends ChestBlockEntity> combine(final BlockState byj, final Level bjw, final BlockPos fk, final boolean boolean4);
+    public abstract DoubleBlockCombiner.NeighborCombineResult<? extends ChestBlockEntity> combine(final BlockState cfj, final Level bqb, final BlockPos fu, final boolean boolean4);
 }
diff --git a/src/net/minecraft/world/level/block/AbstractFurnaceBlock.java b/src/net/minecraft/world/level/block/AbstractFurnaceBlock.java
index 5468955..4936c08 100644
--- a/src/net/minecraft/world/level/block/AbstractFurnaceBlock.java
+++ b/src/net/minecraft/world/level/block/AbstractFurnaceBlock.java
@@ -1,8 +1,11 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.Container;
 import net.minecraft.world.Containers;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -19,6 +22,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 
@@ -28,76 +32,72 @@ public abstract class AbstractFurnaceBlock extends BaseEntityBlock {
     
     protected AbstractFurnaceBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)AbstractFurnaceBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)AbstractFurnaceBlock.LIT, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)AbstractFurnaceBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)AbstractFurnaceBlock.LIT, false));
     }
     
     @Override
-    public int getLightEmission(final BlockState byj) {
-        return byj.<Boolean>getValue((Property<Boolean>)AbstractFurnaceBlock.LIT) ? super.getLightEmission(byj) : 0;
-    }
-    
-    @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        this.openContainer(bjw, fk, ayj);
-        return InteractionResult.SUCCESS;
+        this.openContainer(bqb, fu, bec);
+        return InteractionResult.CONSUME;
     }
     
-    protected abstract void openContainer(final Level bjw, final BlockPos fk, final Player ayj);
+    protected abstract void openContainer(final Level bqb, final BlockPos fu, final Player bec);
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)AbstractFurnaceBlock.FACING, bcq.getHorizontalDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)AbstractFurnaceBlock.FACING, bin.getHorizontalDirection().getOpposite());
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof AbstractFurnaceBlockEntity) {
-                ((AbstractFurnaceBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof AbstractFurnaceBlockEntity) {
+                ((AbstractFurnaceBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof AbstractFurnaceBlockEntity) {
-            Containers.dropContents(bjw, fk, (Container)bwl7);
-            bjw.updateNeighbourForOutputSignal(fk, this);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof AbstractFurnaceBlockEntity) {
+            Containers.dropContents(bqb, fu, (Container)cdl7);
+            ((AbstractFurnaceBlockEntity)cdl7).getRecipesToAwardAndPopExperience(bqb, Vec3.atCenterOf(fu));
+            bqb.updateNeighbourForOutputSignal(fu, this);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(bjw.getBlockEntity(fk));
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(bqb.getBlockEntity(fu));
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)AbstractFurnaceBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)AbstractFurnaceBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)AbstractFurnaceBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)AbstractFurnaceBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)AbstractFurnaceBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)AbstractFurnaceBlock.FACING)));
     }
     
     @Override
@@ -107,6 +107,6 @@ public abstract class AbstractFurnaceBlock extends BaseEntityBlock {
     
     static {
         FACING = HorizontalDirectionalBlock.FACING;
-        LIT = RedstoneTorchBlock.LIT;
+        LIT = BlockStateProperties.LIT;
     }
 }
diff --git a/src/net/minecraft/world/level/block/AbstractGlassBlock.java b/src/net/minecraft/world/level/block/AbstractGlassBlock.java
index 058aae9..b29b221 100644
--- a/src/net/minecraft/world/level/block/AbstractGlassBlock.java
+++ b/src/net/minecraft/world/level/block/AbstractGlassBlock.java
@@ -1,9 +1,12 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public abstract class AbstractGlassBlock extends HalfTransparentBlock {
     protected AbstractGlassBlock(final Properties c) {
@@ -11,27 +14,17 @@ public abstract class AbstractGlassBlock extends HalfTransparentBlock {
     }
     
     @Override
-    public float getShadeBrightness(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public VoxelShape getVisualShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return Shapes.empty();
+    }
+    
+    @Override
+    public float getShadeBrightness(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return 1.0f;
     }
     
     @Override
-    public boolean propagatesSkylightDown(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public boolean propagatesSkylightDown(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return true;
     }
-    
-    @Override
-    public boolean isSuffocating(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return false;
-    }
-    
-    @Override
-    public boolean isRedstoneConductor(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return false;
-    }
-    
-    @Override
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return false;
-    }
 }
diff --git a/src/net/minecraft/world/level/block/AbstractSkullBlock.java b/src/net/minecraft/world/level/block/AbstractSkullBlock.java
index de45ad9..32c8361 100644
--- a/src/net/minecraft/world/level/block/AbstractSkullBlock.java
+++ b/src/net/minecraft/world/level/block/AbstractSkullBlock.java
@@ -1,10 +1,15 @@
 package net.minecraft.world.level.block;
 
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.entity.SkullBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.item.Wearable;
 
-public abstract class AbstractSkullBlock extends BaseEntityBlock {
+public abstract class AbstractSkullBlock extends BaseEntityBlock implements Wearable {
     private final SkullBlock.Type type;
     
     public AbstractSkullBlock(final SkullBlock.Type a, final Properties c) {
@@ -13,11 +18,16 @@ public abstract class AbstractSkullBlock extends BaseEntityBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new SkullBlockEntity();
     }
     
     public SkullBlock.Type getType() {
         return this.type;
     }
+    
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        return false;
+    }
 }
diff --git a/src/net/minecraft/world/level/block/AirBlock.java b/src/net/minecraft/world/level/block/AirBlock.java
index d958074..529e569 100644
--- a/src/net/minecraft/world/level/block/AirBlock.java
+++ b/src/net/minecraft/world/level/block/AirBlock.java
@@ -6,6 +6,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class AirBlock extends Block {
     protected AirBlock(final Properties c) {
@@ -13,17 +14,12 @@ public class AirBlock extends Block {
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.INVISIBLE;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return Shapes.empty();
     }
-    
-    @Override
-    public boolean isAir(final BlockState byj) {
-        return true;
-    }
 }
diff --git a/src/net/minecraft/world/level/block/AnvilBlock.java b/src/net/minecraft/world/level/block/AnvilBlock.java
index fbf1ee4..d04891b 100644
--- a/src/net/minecraft/world/level/block/AnvilBlock.java
+++ b/src/net/minecraft/world/level/block/AnvilBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.entity.player.Inventory;
@@ -26,6 +26,7 @@ import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
@@ -45,69 +46,72 @@ public class AnvilBlock extends FallingBlock {
     
     public AnvilBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)AnvilBlock.FACING, Direction.NORTH));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)AnvilBlock.FACING, Direction.NORTH));
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)AnvilBlock.FACING, bcq.getHorizontalDirection().getClockWise());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)AnvilBlock.FACING, bin.getHorizontalDirection().getClockWise());
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        ayj.openMenu(byj.getMenuProvider(bjw, fk));
-        ayj.awardStat(Stats.INTERACT_WITH_ANVIL);
-        return InteractionResult.SUCCESS;
+        bec.openMenu(cfj.getMenuProvider(bqb, fu));
+        bec.awardStat(Stats.INTERACT_WITH_ANVIL);
+        return InteractionResult.CONSUME;
     }
     
     @Nullable
     @Override
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return new SimpleMenuProvider((integer, ayi, ayj) -> new AnvilMenu(integer, ayi, ContainerLevelAccess.create(bjw, fk)), AnvilBlock.CONTAINER_TITLE);
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return new SimpleMenuProvider((integer, beb, bec) -> new AnvilMenu(integer, beb, ContainerLevelAccess.create(bqb, fu)), AnvilBlock.CONTAINER_TITLE);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final Direction fp6 = byj.<Direction>getValue((Property<Direction>)AnvilBlock.FACING);
-        if (fp6.getAxis() == Direction.Axis.X) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final Direction fz6 = cfj.<Direction>getValue((Property<Direction>)AnvilBlock.FACING);
+        if (fz6.getAxis() == Direction.Axis.X) {
             return AnvilBlock.X_AXIS_AABB;
         }
         return AnvilBlock.Z_AXIS_AABB;
     }
     
     @Override
-    protected void falling(final FallingBlockEntity awa) {
-        awa.setHurtsEntities(true);
+    protected void falling(final FallingBlockEntity bbf) {
+        bbf.setHurtsEntities(true);
     }
     
     @Override
-    public void onLand(final Level bjw, final BlockPos fk, final BlockState byj3, final BlockState byj4) {
-        bjw.levelEvent(1031, fk, 0);
+    public void onLand(final Level bqb, final BlockPos fu, final BlockState cfj3, final BlockState cfj4, final FallingBlockEntity bbf) {
+        if (!bbf.isSilent()) {
+            bqb.levelEvent(1031, fu, 0);
+        }
     }
     
     @Override
-    public void onBroken(final Level bjw, final BlockPos fk) {
-        bjw.levelEvent(1029, fk, 0);
+    public void onBroken(final Level bqb, final BlockPos fu, final FallingBlockEntity bbf) {
+        if (!bbf.isSilent()) {
+            bqb.levelEvent(1029, fu, 0);
+        }
     }
     
     @Nullable
-    public static BlockState damage(final BlockState byj) {
-        final Block bph2 = byj.getBlock();
-        if (bph2 == Blocks.ANVIL) {
-            return ((AbstractStateHolder<O, BlockState>)Blocks.CHIPPED_ANVIL.defaultBlockState()).<Comparable, Comparable>setValue((Property<Comparable>)AnvilBlock.FACING, (Comparable)byj.<V>getValue((Property<V>)AnvilBlock.FACING));
+    public static BlockState damage(final BlockState cfj) {
+        if (cfj.is(Blocks.ANVIL)) {
+            return ((StateHolder<O, BlockState>)Blocks.CHIPPED_ANVIL.defaultBlockState()).<Comparable, Comparable>setValue((Property<Comparable>)AnvilBlock.FACING, (Comparable)cfj.<V>getValue((Property<V>)AnvilBlock.FACING));
         }
-        if (bph2 == Blocks.CHIPPED_ANVIL) {
-            return ((AbstractStateHolder<O, BlockState>)Blocks.DAMAGED_ANVIL.defaultBlockState()).<Comparable, Comparable>setValue((Property<Comparable>)AnvilBlock.FACING, (Comparable)byj.<V>getValue((Property<V>)AnvilBlock.FACING));
+        if (cfj.is(Blocks.CHIPPED_ANVIL)) {
+            return ((StateHolder<O, BlockState>)Blocks.DAMAGED_ANVIL.defaultBlockState()).<Comparable, Comparable>setValue((Property<Comparable>)AnvilBlock.FACING, (Comparable)cfj.<V>getValue((Property<V>)AnvilBlock.FACING));
         }
         return null;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)AnvilBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)AnvilBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)AnvilBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)AnvilBlock.FACING)));
     }
     
     @Override
@@ -116,10 +120,15 @@ public class AnvilBlock extends FallingBlock {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
+    @Override
+    public int getDustColor(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.getMapColor(bpg, fu).col;
+    }
+    
     static {
         FACING = HorizontalDirectionalBlock.FACING;
         BASE = Block.box(2.0, 0.0, 2.0, 14.0, 4.0, 14.0);
@@ -131,6 +140,6 @@ public class AnvilBlock extends FallingBlock {
         Z_TOP = Block.box(3.0, 10.0, 0.0, 13.0, 16.0, 16.0);
         X_AXIS_AABB = Shapes.or(AnvilBlock.BASE, AnvilBlock.X_LEG1, AnvilBlock.X_LEG2, AnvilBlock.X_TOP);
         Z_AXIS_AABB = Shapes.or(AnvilBlock.BASE, AnvilBlock.Z_LEG1, AnvilBlock.Z_LEG2, AnvilBlock.Z_TOP);
-        CONTAINER_TITLE = new TranslatableComponent("container.repair", new Object[0]);
+        CONTAINER_TITLE = new TranslatableComponent("container.repair");
     }
 }
diff --git a/src/net/minecraft/world/level/block/AttachedStemBlock.java b/src/net/minecraft/world/level/block/AttachedStemBlock.java
index 7fb7976..2ae0334 100644
--- a/src/net/minecraft/world/level/block/AttachedStemBlock.java
+++ b/src/net/minecraft/world/level/block/AttachedStemBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -14,6 +14,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
 import java.util.Map;
@@ -24,28 +25,28 @@ public class AttachedStemBlock extends BushBlock {
     private final StemGrownBlock fruit;
     private static final Map<Direction, VoxelShape> AABBS;
     
-    protected AttachedStemBlock(final StemGrownBlock buv, final Properties c) {
+    protected AttachedStemBlock(final StemGrownBlock cbq, final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)AttachedStemBlock.FACING, Direction.NORTH));
-        this.fruit = buv;
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)AttachedStemBlock.FACING, Direction.NORTH));
+        this.fruit = cbq;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return AttachedStemBlock.AABBS.get(byj.getValue((Property<Object>)AttachedStemBlock.FACING));
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return AttachedStemBlock.AABBS.get(cfj.getValue((Property<Object>)AttachedStemBlock.FACING));
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj3.getBlock() != this.fruit && fp == byj1.<Direction>getValue((Property<Direction>)AttachedStemBlock.FACING)) {
-            return ((AbstractStateHolder<O, BlockState>)this.fruit.getStem().defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)StemBlock.AGE, 7);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj3.is(this.fruit) && fz == cfj1.<Direction>getValue((Property<Direction>)AttachedStemBlock.FACING)) {
+            return ((StateHolder<O, BlockState>)this.fruit.getStem().defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)StemBlock.AGE, 7);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.getBlock() == Blocks.FARMLAND;
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.is(Blocks.FARMLAND);
     }
     
     protected Item getSeedItem() {
@@ -59,18 +60,18 @@ public class AttachedStemBlock extends BushBlock {
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return new ItemStack(this.getSeedItem());
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)AttachedStemBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)AttachedStemBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)AttachedStemBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)AttachedStemBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)AttachedStemBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)AttachedStemBlock.FACING)));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/BambooBlock.java b/src/net/minecraft/world/level/block/BambooBlock.java
index d280ae9..c6e8313 100644
--- a/src/net/minecraft/world/level/block/BambooBlock.java
+++ b/src/net/minecraft/world/level/block/BambooBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.item.SwordItem;
 import net.minecraft.world.entity.player.Player;
@@ -12,6 +12,7 @@ import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.pathfinder.PathComputationType;
@@ -22,6 +23,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BambooLeaves;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
@@ -37,7 +39,7 @@ public class BambooBlock extends Block implements BonemealableBlock {
     
     public BambooBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BambooBlock.AGE, 0)).setValue(BambooBlock.LEAVES, BambooLeaves.NONE)).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.STAGE, 0));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BambooBlock.AGE, 0)).setValue(BambooBlock.LEAVES, BambooLeaves.NONE)).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.STAGE, 0));
     }
     
     @Override
@@ -51,151 +53,158 @@ public class BambooBlock extends Block implements BonemealableBlock {
     }
     
     @Override
-    public boolean propagatesSkylightDown(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public boolean propagatesSkylightDown(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return true;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final VoxelShape cwf6 = (byj.<BambooLeaves>getValue(BambooBlock.LEAVES) == BambooLeaves.LARGE) ? BambooBlock.LARGE_SHAPE : BambooBlock.SMALL_SHAPE;
-        final Vec3 cvl7 = byj.getOffset(bjg, fk);
-        return cwf6.move(cvl7.x, cvl7.y, cvl7.z);
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final VoxelShape dfg6 = (cfj.<BambooLeaves>getValue(BambooBlock.LEAVES) == BambooLeaves.LARGE) ? BambooBlock.LARGE_SHAPE : BambooBlock.SMALL_SHAPE;
+        final Vec3 dem7 = cfj.getOffset(bpg, fu);
+        return dfg6.move(dem7.x, dem7.y, dem7.z);
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final Vec3 cvl6 = byj.getOffset(bjg, fk);
-        return BambooBlock.COLLISION_SHAPE.move(cvl6.x, cvl6.y, cvl6.z);
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final Vec3 dem6 = cfj.getOffset(bpg, fu);
+        return BambooBlock.COLLISION_SHAPE.move(dem6.x, dem6.y, dem6.z);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final FluidState coj3 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        if (!coj3.isEmpty()) {
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final FluidState cxa3 = bin.getLevel().getFluidState(bin.getClickedPos());
+        if (!cxa3.isEmpty()) {
             return null;
         }
-        final BlockState byj4 = bcq.getLevel().getBlockState(bcq.getClickedPos().below());
-        if (!byj4.is(BlockTags.BAMBOO_PLANTABLE_ON)) {
+        final BlockState cfj4 = bin.getLevel().getBlockState(bin.getClickedPos().below());
+        if (!cfj4.is(BlockTags.BAMBOO_PLANTABLE_ON)) {
             return null;
         }
-        final Block bph5 = byj4.getBlock();
-        if (bph5 == Blocks.BAMBOO_SAPLING) {
-            return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.AGE, 0);
+        if (cfj4.is(Blocks.BAMBOO_SAPLING)) {
+            return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.AGE, 0);
         }
-        if (bph5 == Blocks.BAMBOO) {
-            final int integer6 = (byj4.<Integer>getValue((Property<Integer>)BambooBlock.AGE) > 0) ? 1 : 0;
-            return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.AGE, integer6);
+        if (cfj4.is(Blocks.BAMBOO)) {
+            final int integer5 = (cfj4.<Integer>getValue((Property<Integer>)BambooBlock.AGE) > 0) ? 1 : 0;
+            return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.AGE, integer5);
         }
         return Blocks.BAMBOO_SAPLING.defaultBlockState();
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.canSurvive(xd, fk)) {
-            xd.destroyBlock(fk, true);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.canSurvive(zd, fu)) {
+            zd.destroyBlock(fu, true);
+        }
+    }
+    
+    @Override
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)BambooBlock.STAGE) == 0;
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (cfj.<Integer>getValue((Property<Integer>)BambooBlock.STAGE) != 0) {
             return;
         }
-        if (byj.<Integer>getValue((Property<Integer>)BambooBlock.STAGE) != 0) {
-            return;
-        }
-        if (random.nextInt(3) == 0 && xd.isEmptyBlock(fk.above()) && xd.getRawBrightness(fk.above(), 0) >= 9) {
-            final int integer6 = this.getHeightBelowUpToMax(xd, fk) + 1;
+        if (random.nextInt(3) == 0 && zd.isEmptyBlock(fu.above()) && zd.getRawBrightness(fu.above(), 0) >= 9) {
+            final int integer6 = this.getHeightBelowUpToMax(zd, fu) + 1;
             if (integer6 < 16) {
-                this.growBamboo(byj, xd, fk, random, integer6);
+                this.growBamboo(cfj, zd, fu, random, integer6);
             }
         }
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return bjz.getBlockState(fk.below()).is(BlockTags.BAMBOO_PLANTABLE_ON);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return bqd.getBlockState(fu.below()).is(BlockTags.BAMBOO_PLANTABLE_ON);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj1.canSurvive(bqc, fu5)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
         }
-        if (fp == Direction.UP && byj3.getBlock() == Blocks.BAMBOO && byj3.<Integer>getValue((Property<Integer>)BambooBlock.AGE) > byj1.<Integer>getValue((Property<Integer>)BambooBlock.AGE)) {
-            bjx.setBlock(fk5, ((AbstractStateHolder<O, BlockState>)byj1).<Comparable>cycle((Property<Comparable>)BambooBlock.AGE), 2);
+        if (fz == Direction.UP && cfj3.is(Blocks.BAMBOO) && cfj3.<Integer>getValue((Property<Integer>)BambooBlock.AGE) > cfj1.<Integer>getValue((Property<Integer>)BambooBlock.AGE)) {
+            bqc.setBlock(fu5, ((StateHolder<O, BlockState>)cfj1).<Comparable>cycle((Property<Comparable>)BambooBlock.AGE), 2);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        final int integer6 = this.getHeightAboveUpToMax(bjg, fk);
-        final int integer7 = this.getHeightBelowUpToMax(bjg, fk);
-        return integer6 + integer7 + 1 < 16 && bjg.getBlockState(fk.above(integer6)).<Integer>getValue((Property<Integer>)BambooBlock.STAGE) != 1;
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        final int integer6 = this.getHeightAboveUpToMax(bpg, fu);
+        final int integer7 = this.getHeightBelowUpToMax(bpg, fu);
+        return integer6 + integer7 + 1 < 16 && bpg.getBlockState(fu.above(integer6)).<Integer>getValue((Property<Integer>)BambooBlock.STAGE) != 1;
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        int integer6 = this.getHeightAboveUpToMax(xd, fk);
-        final int integer7 = this.getHeightBelowUpToMax(xd, fk);
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        int integer6 = this.getHeightAboveUpToMax(zd, fu);
+        final int integer7 = this.getHeightBelowUpToMax(zd, fu);
         int integer8 = integer6 + integer7 + 1;
         for (int integer9 = 1 + random.nextInt(2), integer10 = 0; integer10 < integer9; ++integer10) {
-            final BlockPos fk2 = fk.above(integer6);
-            final BlockState byj2 = xd.getBlockState(fk2);
-            if (integer8 >= 16 || byj2.<Integer>getValue((Property<Integer>)BambooBlock.STAGE) == 1 || !xd.isEmptyBlock(fk2.above())) {
+            final BlockPos fu2 = fu.above(integer6);
+            final BlockState cfj2 = zd.getBlockState(fu2);
+            if (integer8 >= 16 || cfj2.<Integer>getValue((Property<Integer>)BambooBlock.STAGE) == 1 || !zd.isEmptyBlock(fu2.above())) {
                 return;
             }
-            this.growBamboo(byj2, xd, fk2, random, integer8);
+            this.growBamboo(cfj2, zd, fu2, random, integer8);
             ++integer6;
             ++integer8;
         }
     }
     
     @Override
-    public float getDestroyProgress(final BlockState byj, final Player ayj, final BlockGetter bjg, final BlockPos fk) {
-        if (ayj.getMainHandItem().getItem() instanceof SwordItem) {
+    public float getDestroyProgress(final BlockState cfj, final Player bec, final BlockGetter bpg, final BlockPos fu) {
+        if (bec.getMainHandItem().getItem() instanceof SwordItem) {
             return 1.0f;
         }
-        return super.getDestroyProgress(byj, ayj, bjg, fk);
+        return super.getDestroyProgress(cfj, bec, bpg, fu);
     }
     
-    protected void growBamboo(final BlockState byj, final Level bjw, final BlockPos fk, final Random random, final int integer) {
-        final BlockState byj2 = bjw.getBlockState(fk.below());
-        final BlockPos fk2 = fk.below(2);
-        final BlockState byj3 = bjw.getBlockState(fk2);
-        BambooLeaves byx10 = BambooLeaves.NONE;
+    protected void growBamboo(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random, final int integer) {
+        final BlockState cfj2 = bqb.getBlockState(fu.below());
+        final BlockPos fu2 = fu.below(2);
+        final BlockState cfj3 = bqb.getBlockState(fu2);
+        BambooLeaves cfw10 = BambooLeaves.NONE;
         if (integer >= 1) {
-            if (byj2.getBlock() != Blocks.BAMBOO || byj2.<BambooLeaves>getValue(BambooBlock.LEAVES) == BambooLeaves.NONE) {
-                byx10 = BambooLeaves.SMALL;
+            if (!cfj2.is(Blocks.BAMBOO) || cfj2.<BambooLeaves>getValue(BambooBlock.LEAVES) == BambooLeaves.NONE) {
+                cfw10 = BambooLeaves.SMALL;
             }
-            else if (byj2.getBlock() == Blocks.BAMBOO && byj2.<BambooLeaves>getValue(BambooBlock.LEAVES) != BambooLeaves.NONE) {
-                byx10 = BambooLeaves.LARGE;
-                if (byj3.getBlock() == Blocks.BAMBOO) {
-                    bjw.setBlock(fk.below(), ((AbstractStateHolder<O, BlockState>)byj2).<BambooLeaves, BambooLeaves>setValue(BambooBlock.LEAVES, BambooLeaves.SMALL), 3);
-                    bjw.setBlock(fk2, ((AbstractStateHolder<O, BlockState>)byj3).<BambooLeaves, BambooLeaves>setValue(BambooBlock.LEAVES, BambooLeaves.NONE), 3);
+            else if (cfj2.is(Blocks.BAMBOO) && cfj2.<BambooLeaves>getValue(BambooBlock.LEAVES) != BambooLeaves.NONE) {
+                cfw10 = BambooLeaves.LARGE;
+                if (cfj3.is(Blocks.BAMBOO)) {
+                    bqb.setBlock(fu.below(), ((StateHolder<O, BlockState>)cfj2).<BambooLeaves, BambooLeaves>setValue(BambooBlock.LEAVES, BambooLeaves.SMALL), 3);
+                    bqb.setBlock(fu2, ((StateHolder<O, BlockState>)cfj3).<BambooLeaves, BambooLeaves>setValue(BambooBlock.LEAVES, BambooLeaves.NONE), 3);
                 }
             }
         }
-        final int integer2 = (byj.<Integer>getValue((Property<Integer>)BambooBlock.AGE) == 1 || byj3.getBlock() == Blocks.BAMBOO) ? 1 : 0;
+        final int integer2 = (cfj.<Integer>getValue((Property<Integer>)BambooBlock.AGE) == 1 || cfj3.is(Blocks.BAMBOO)) ? 1 : 0;
         final int integer3 = ((integer >= 11 && random.nextFloat() < 0.25f) || integer == 15) ? 1 : 0;
-        bjw.setBlock(fk.above(), ((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)BambooBlock.AGE, integer2)).setValue(BambooBlock.LEAVES, byx10)).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.STAGE, integer3), 3);
+        bqb.setBlock(fu.above(), ((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)BambooBlock.AGE, integer2)).setValue(BambooBlock.LEAVES, cfw10)).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.STAGE, integer3), 3);
     }
     
-    protected int getHeightAboveUpToMax(final BlockGetter bjg, final BlockPos fk) {
+    protected int getHeightAboveUpToMax(final BlockGetter bpg, final BlockPos fu) {
         int integer4;
-        for (integer4 = 0; integer4 < 16 && bjg.getBlockState(fk.above(integer4 + 1)).getBlock() == Blocks.BAMBOO; ++integer4) {}
+        for (integer4 = 0; integer4 < 16 && bpg.getBlockState(fu.above(integer4 + 1)).is(Blocks.BAMBOO); ++integer4) {}
         return integer4;
     }
     
-    protected int getHeightBelowUpToMax(final BlockGetter bjg, final BlockPos fk) {
+    protected int getHeightBelowUpToMax(final BlockGetter bpg, final BlockPos fu) {
         int integer4;
-        for (integer4 = 0; integer4 < 16 && bjg.getBlockState(fk.below(integer4 + 1)).getBlock() == Blocks.BAMBOO; ++integer4) {}
+        for (integer4 = 0; integer4 < 16 && bpg.getBlockState(fu.below(integer4 + 1)).is(Blocks.BAMBOO); ++integer4) {}
         return integer4;
     }
     
diff --git a/src/net/minecraft/world/level/block/BambooSaplingBlock.java b/src/net/minecraft/world/level/block/BambooSaplingBlock.java
index d533a0d..1eb6418 100644
--- a/src/net/minecraft/world/level/block/BambooSaplingBlock.java
+++ b/src/net/minecraft/world/level/block/BambooSaplingBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.properties.BambooLeaves;
 import net.minecraft.world.item.SwordItem;
@@ -10,6 +10,7 @@ import net.minecraft.world.item.Items;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.Level;
@@ -20,6 +21,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class BambooSaplingBlock extends Block implements BonemealableBlock {
@@ -35,64 +37,64 @@ public class BambooSaplingBlock extends Block implements BonemealableBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final Vec3 cvl6 = byj.getOffset(bjg, fk);
-        return BambooSaplingBlock.SAPLING_SHAPE.move(cvl6.x, cvl6.y, cvl6.z);
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final Vec3 dem6 = cfj.getOffset(bpg, fu);
+        return BambooSaplingBlock.SAPLING_SHAPE.move(dem6.x, dem6.y, dem6.z);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (random.nextInt(3) == 0 && xd.isEmptyBlock(fk.above()) && xd.getRawBrightness(fk.above(), 0) >= 9) {
-            this.growBamboo(xd, fk);
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (random.nextInt(3) == 0 && zd.isEmptyBlock(fu.above()) && zd.getRawBrightness(fu.above(), 0) >= 9) {
+            this.growBamboo(zd, fu);
         }
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return bjz.getBlockState(fk.below()).is(BlockTags.BAMBOO_PLANTABLE_ON);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return bqd.getBlockState(fu.below()).is(BlockTags.BAMBOO_PLANTABLE_ON);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        if (fp == Direction.UP && byj3.getBlock() == Blocks.BAMBOO) {
-            bjx.setBlock(fk5, Blocks.BAMBOO.defaultBlockState(), 2);
+        if (fz == Direction.UP && cfj3.is(Blocks.BAMBOO)) {
+            bqc.setBlock(fu5, Blocks.BAMBOO.defaultBlockState(), 2);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return new ItemStack(Items.BAMBOO);
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        return bjg.getBlockState(fk.above()).isAir();
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        return bpg.getBlockState(fu.above()).isAir();
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        this.growBamboo(xd, fk);
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        this.growBamboo(zd, fu);
     }
     
     @Override
-    public float getDestroyProgress(final BlockState byj, final Player ayj, final BlockGetter bjg, final BlockPos fk) {
-        if (ayj.getMainHandItem().getItem() instanceof SwordItem) {
+    public float getDestroyProgress(final BlockState cfj, final Player bec, final BlockGetter bpg, final BlockPos fu) {
+        if (bec.getMainHandItem().getItem() instanceof SwordItem) {
             return 1.0f;
         }
-        return super.getDestroyProgress(byj, ayj, bjg, fk);
+        return super.getDestroyProgress(cfj, bec, bpg, fu);
     }
     
-    protected void growBamboo(final Level bjw, final BlockPos fk) {
-        bjw.setBlock(fk.above(), ((AbstractStateHolder<O, BlockState>)Blocks.BAMBOO.defaultBlockState()).<BambooLeaves, BambooLeaves>setValue(BambooBlock.LEAVES, BambooLeaves.SMALL), 3);
+    protected void growBamboo(final Level bqb, final BlockPos fu) {
+        bqb.setBlock(fu.above(), ((StateHolder<O, BlockState>)Blocks.BAMBOO.defaultBlockState()).<BambooLeaves, BambooLeaves>setValue(BambooBlock.LEAVES, BambooLeaves.SMALL), 3);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/BannerBlock.java b/src/net/minecraft/world/level/block/BannerBlock.java
index b1853c9..99b5864 100644
--- a/src/net/minecraft/world/level/block/BannerBlock.java
+++ b/src/net/minecraft/world/level/block/BannerBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.Maps;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -14,6 +14,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.item.DyeColor;
 import java.util.Map;
@@ -24,43 +25,43 @@ public class BannerBlock extends AbstractBannerBlock {
     private static final Map<DyeColor, Block> BY_COLOR;
     private static final VoxelShape SHAPE;
     
-    public BannerBlock(final DyeColor bdj, final Properties c) {
-        super(bdj, c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)BannerBlock.ROTATION, 0));
-        BannerBlock.BY_COLOR.put(bdj, this);
+    public BannerBlock(final DyeColor bje, final Properties c) {
+        super(bje, c);
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)BannerBlock.ROTATION, 0));
+        BannerBlock.BY_COLOR.put(bje, this);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return bjz.getBlockState(fk.below()).getMaterial().isSolid();
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return bqd.getBlockState(fu.below()).getMaterial().isSolid();
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return BannerBlock.SHAPE;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)BannerBlock.ROTATION, Mth.floor((180.0f + bcq.getRotation()) * 16.0f / 360.0f + 0.5) & 0xF);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)BannerBlock.ROTATION, Mth.floor((180.0f + bin.getRotation()) * 16.0f / 360.0f + 0.5) & 0xF);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)BannerBlock.ROTATION, btu.rotate(byj.<Integer>getValue((Property<Integer>)BannerBlock.ROTATION), 16));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)BannerBlock.ROTATION, cap.rotate(cfj.<Integer>getValue((Property<Integer>)BannerBlock.ROTATION), 16));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)BannerBlock.ROTATION, bsu.mirror(byj.<Integer>getValue((Property<Integer>)BannerBlock.ROTATION), 16));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)BannerBlock.ROTATION, bzj.mirror(cfj.<Integer>getValue((Property<Integer>)BannerBlock.ROTATION), 16));
     }
     
     @Override
@@ -68,8 +69,8 @@ public class BannerBlock extends AbstractBannerBlock {
         a.add(BannerBlock.ROTATION);
     }
     
-    public static Block byColor(final DyeColor bdj) {
-        return BannerBlock.BY_COLOR.getOrDefault(bdj, Blocks.WHITE_BANNER);
+    public static Block byColor(final DyeColor bje) {
+        return BannerBlock.BY_COLOR.getOrDefault(bje, Blocks.WHITE_BANNER);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/BarrelBlock.java b/src/net/minecraft/world/level/block/BarrelBlock.java
index c32d1cc..2687173 100644
--- a/src/net/minecraft/world/level/block/BarrelBlock.java
+++ b/src/net/minecraft/world/level/block/BarrelBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -14,6 +14,7 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.Containers;
 import net.minecraft.world.Container;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.entity.monster.piglin.PiglinAi;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.level.block.entity.BarrelBlockEntity;
@@ -26,6 +27,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 
@@ -35,82 +37,83 @@ public class BarrelBlock extends BaseEntityBlock {
     
     public BarrelBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BarrelBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)BarrelBlock.OPEN, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BarrelBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)BarrelBlock.OPEN, false));
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk);
-        if (bwl8 instanceof BarrelBlockEntity) {
-            ayj.openMenu((MenuProvider)bwl8);
-            ayj.awardStat(Stats.OPEN_BARREL);
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu);
+        if (cdl8 instanceof BarrelBlockEntity) {
+            bec.openMenu((MenuProvider)cdl8);
+            bec.awardStat(Stats.OPEN_BARREL);
+            PiglinAi.angerNearbyPiglins(bec, true);
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof Container) {
-            Containers.dropContents(bjw, fk, (Container)bwl7);
-            bjw.updateNeighbourForOutputSignal(fk, this);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof Container) {
+            Containers.dropContents(bqb, fu, (Container)cdl7);
+            bqb.updateNeighbourForOutputSignal(fu, this);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        final BlockEntity bwl6 = xd.getBlockEntity(fk);
-        if (bwl6 instanceof BarrelBlockEntity) {
-            ((BarrelBlockEntity)bwl6).recheckOpen();
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final BlockEntity cdl6 = zd.getBlockEntity(fu);
+        if (cdl6 instanceof BarrelBlockEntity) {
+            ((BarrelBlockEntity)cdl6).recheckOpen();
         }
     }
     
     @Nullable
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new BarrelBlockEntity();
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, @Nullable final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof BarrelBlockEntity) {
-                ((BarrelBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof BarrelBlockEntity) {
+                ((BarrelBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(bjw.getBlockEntity(fk));
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(bqb.getBlockEntity(fu));
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)BarrelBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)BarrelBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)BarrelBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)BarrelBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)BarrelBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)BarrelBlock.FACING)));
     }
     
     @Override
@@ -119,8 +122,8 @@ public class BarrelBlock extends BaseEntityBlock {
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BarrelBlock.FACING, bcq.getNearestLookingDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BarrelBlock.FACING, bin.getNearestLookingDirection().getOpposite());
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/BarrierBlock.java b/src/net/minecraft/world/level/block/BarrierBlock.java
index d7c0aea..5b0825f 100644
--- a/src/net/minecraft/world/level/block/BarrierBlock.java
+++ b/src/net/minecraft/world/level/block/BarrierBlock.java
@@ -1,9 +1,9 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class BarrierBlock extends Block {
     protected BarrierBlock(final Properties c) {
@@ -11,22 +11,17 @@ public class BarrierBlock extends Block {
     }
     
     @Override
-    public boolean propagatesSkylightDown(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public boolean propagatesSkylightDown(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return true;
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.INVISIBLE;
     }
     
     @Override
-    public float getShadeBrightness(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public float getShadeBrightness(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return 1.0f;
     }
-    
-    @Override
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return false;
-    }
 }
diff --git a/src/net/minecraft/world/level/block/BaseCoralFanBlock.java b/src/net/minecraft/world/level/block/BaseCoralFanBlock.java
index 70f9da3..42232ee 100644
--- a/src/net/minecraft/world/level/block/BaseCoralFanBlock.java
+++ b/src/net/minecraft/world/level/block/BaseCoralFanBlock.java
@@ -4,6 +4,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class BaseCoralFanBlock extends BaseCoralPlantTypeBlock {
@@ -14,7 +15,7 @@ public class BaseCoralFanBlock extends BaseCoralPlantTypeBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return BaseCoralFanBlock.AABB;
     }
     
diff --git a/src/net/minecraft/world/level/block/BaseCoralPlantBlock.java b/src/net/minecraft/world/level/block/BaseCoralPlantBlock.java
index 119b521..ce18ad3 100644
--- a/src/net/minecraft/world/level/block/BaseCoralPlantBlock.java
+++ b/src/net/minecraft/world/level/block/BaseCoralPlantBlock.java
@@ -4,6 +4,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class BaseCoralPlantBlock extends BaseCoralPlantTypeBlock {
@@ -14,7 +15,7 @@ public class BaseCoralPlantBlock extends BaseCoralPlantTypeBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return BaseCoralPlantBlock.SHAPE;
     }
     
diff --git a/src/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java b/src/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
index 531122a..f66c5f8 100644
--- a/src/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
+++ b/src/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.LevelReader;
@@ -9,6 +9,8 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.item.BlockPlaceContext;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.BlockGetter;
@@ -16,6 +18,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
@@ -25,21 +28,21 @@ public class BaseCoralPlantTypeBlock extends Block implements SimpleWaterloggedB
     
     protected BaseCoralPlantTypeBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)BaseCoralPlantTypeBlock.WATERLOGGED, true));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)BaseCoralPlantTypeBlock.WATERLOGGED, true));
     }
     
-    protected void tryScheduleDieTick(final BlockState byj, final LevelAccessor bjx, final BlockPos fk) {
-        if (!scanForWater(byj, bjx, fk)) {
-            bjx.getBlockTicks().scheduleTick(fk, this, 60 + bjx.getRandom().nextInt(40));
+    protected void tryScheduleDieTick(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu) {
+        if (!scanForWater(cfj, bqc, fu)) {
+            bqc.getBlockTicks().scheduleTick(fu, this, 60 + bqc.getRandom().nextInt(40));
         }
     }
     
-    protected static boolean scanForWater(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        if (byj.<Boolean>getValue((Property<Boolean>)BaseCoralPlantTypeBlock.WATERLOGGED)) {
+    protected static boolean scanForWater(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)BaseCoralPlantTypeBlock.WATERLOGGED)) {
             return true;
         }
-        for (final Direction fp7 : Direction.values()) {
-            if (bjg.getFluidState(fk.relative(fp7)).is(FluidTags.WATER)) {
+        for (final Direction fz7 : Direction.values()) {
+            if (bpg.getFluidState(fu.relative(fz7)).is(FluidTags.WATER)) {
                 return true;
             }
         }
@@ -48,31 +51,31 @@ public class BaseCoralPlantTypeBlock extends Block implements SimpleWaterloggedB
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final FluidState coj3 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)BaseCoralPlantTypeBlock.WATERLOGGED, coj3.is(FluidTags.WATER) && coj3.getAmount() == 8);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final FluidState cxa3 = bin.getLevel().getFluidState(bin.getClickedPos());
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)BaseCoralPlantTypeBlock.WATERLOGGED, cxa3.is(FluidTags.WATER) && cxa3.getAmount() == 8);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return BaseCoralPlantTypeBlock.AABB;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)BaseCoralPlantTypeBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)BaseCoralPlantTypeBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        if (fp == Direction.DOWN && !this.canSurvive(byj1, bjx, fk5)) {
+        if (fz == Direction.DOWN && !this.canSurvive(cfj1, bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        return bjz.getBlockState(fk2).isFaceSturdy(bjz, fk2, Direction.UP);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        return bqd.getBlockState(fu2).isFaceSturdy(bqd, fu2, Direction.UP);
     }
     
     @Override
@@ -81,11 +84,11 @@ public class BaseCoralPlantTypeBlock extends Block implements SimpleWaterloggedB
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)BaseCoralPlantTypeBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)BaseCoralPlantTypeBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/BaseCoralWallFanBlock.java b/src/net/minecraft/world/level/block/BaseCoralWallFanBlock.java
index 0c16b4f..8a3f53b 100644
--- a/src/net/minecraft/world/level/block/BaseCoralWallFanBlock.java
+++ b/src/net/minecraft/world/level/block/BaseCoralWallFanBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ImmutableMap;
 import javax.annotation.Nullable;
@@ -14,6 +14,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
 import java.util.Map;
@@ -25,22 +26,22 @@ public class BaseCoralWallFanBlock extends BaseCoralFanBlock {
     
     protected BaseCoralWallFanBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)BaseCoralWallFanBlock.WATERLOGGED, true));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)BaseCoralWallFanBlock.WATERLOGGED, true));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return BaseCoralWallFanBlock.SHAPES.get(byj.getValue((Property<Object>)BaseCoralWallFanBlock.FACING));
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return BaseCoralWallFanBlock.SHAPES.get(cfj.getValue((Property<Object>)BaseCoralWallFanBlock.FACING));
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)BaseCoralWallFanBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)BaseCoralWallFanBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)BaseCoralWallFanBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)BaseCoralWallFanBlock.FACING)));
     }
     
     @Override
@@ -49,37 +50,37 @@ public class BaseCoralWallFanBlock extends BaseCoralFanBlock {
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)BaseCoralWallFanBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)BaseCoralWallFanBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        if (fp.getOpposite() == byj1.<Direction>getValue((Property<Direction>)BaseCoralWallFanBlock.FACING) && !byj1.canSurvive(bjx, fk5)) {
+        if (fz.getOpposite() == cfj1.<Direction>getValue((Property<Direction>)BaseCoralWallFanBlock.FACING) && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return byj1;
+        return cfj1;
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)BaseCoralWallFanBlock.FACING);
-        final BlockPos fk2 = fk.relative(fp5.getOpposite());
-        final BlockState byj2 = bjz.getBlockState(fk2);
-        return byj2.isFaceSturdy(bjz, fk2, fp5);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)BaseCoralWallFanBlock.FACING);
+        final BlockPos fu2 = fu.relative(fz5.getOpposite());
+        final BlockState cfj2 = bqd.getBlockState(fu2);
+        return cfj2.isFaceSturdy(bqd, fu2, fz5);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        BlockState byj3 = super.getStateForPlacement(bcq);
-        final LevelReader bjz4 = bcq.getLevel();
-        final BlockPos fk5 = bcq.getClickedPos();
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        BlockState cfj3 = super.getStateForPlacement(bin);
+        final LevelReader bqd4 = bin.getLevel();
+        final BlockPos fu5 = bin.getClickedPos();
         final Direction[] nearestLookingDirections;
-        final Direction[] arr6 = nearestLookingDirections = bcq.getNearestLookingDirections();
-        for (final Direction fp10 : nearestLookingDirections) {
-            if (fp10.getAxis().isHorizontal()) {
-                byj3 = ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Direction>setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, fp10.getOpposite());
-                if (byj3.canSurvive(bjz4, fk5)) {
-                    return byj3;
+        final Direction[] arr6 = nearestLookingDirections = bin.getNearestLookingDirections();
+        for (final Direction fz10 : nearestLookingDirections) {
+            if (fz10.getAxis().isHorizontal()) {
+                cfj3 = ((StateHolder<O, BlockState>)cfj3).<Comparable, Direction>setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, fz10.getOpposite());
+                if (cfj3.canSurvive(bqd4, fu5)) {
+                    return cfj3;
                 }
             }
         }
diff --git a/src/net/minecraft/world/level/block/BaseEntityBlock.java b/src/net/minecraft/world/level/block/BaseEntityBlock.java
index 6d2f77c..2336402 100644
--- a/src/net/minecraft/world/level/block/BaseEntityBlock.java
+++ b/src/net/minecraft/world/level/block/BaseEntityBlock.java
@@ -6,6 +6,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public abstract class BaseEntityBlock extends Block implements EntityBlock {
     protected BaseEntityBlock(final Properties c) {
@@ -13,21 +14,21 @@ public abstract class BaseEntityBlock extends Block implements EntityBlock {
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.INVISIBLE;
     }
     
     @Override
-    public boolean triggerEvent(final BlockState byj, final Level bjw, final BlockPos fk, final int integer4, final int integer5) {
-        super.triggerEvent(byj, bjw, fk, integer4, integer5);
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        return bwl7 != null && bwl7.triggerEvent(integer4, integer5);
+    public boolean triggerEvent(final BlockState cfj, final Level bqb, final BlockPos fu, final int integer4, final int integer5) {
+        super.triggerEvent(cfj, bqb, fu, integer4, integer5);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        return cdl7 != null && cdl7.triggerEvent(integer4, integer5);
     }
     
     @Nullable
     @Override
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        return (bwl5 instanceof MenuProvider) ? bwl5 : null;
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        return (cdl5 instanceof MenuProvider) ? cdl5 : null;
     }
 }
diff --git a/src/net/minecraft/world/level/block/BaseFireBlock.java b/src/net/minecraft/world/level/block/BaseFireBlock.java
new file mode 100644
index 0000000..905dc38
--- /dev/null
+++ b/src/net/minecraft/world/level/block/BaseFireBlock.java
@@ -0,0 +1,173 @@
+package net.minecraft.world.level.block;
+
+import java.util.Iterator;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.core.Direction;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.sounds.SoundEvents;
+import java.util.Random;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.item.BlockPlaceContext;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public abstract class BaseFireBlock extends Block {
+    private final float fireDamage;
+    protected static final VoxelShape UP_AABB;
+    protected static final VoxelShape DOWN_AABB;
+    protected static final VoxelShape WEST_AABB;
+    protected static final VoxelShape EAST_AABB;
+    protected static final VoxelShape NORTH_AABB;
+    protected static final VoxelShape SOUTH_AABB;
+    
+    public BaseFireBlock(final Properties c, final float float2) {
+        super(c);
+        this.fireDamage = float2;
+    }
+    
+    @Override
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return getState(bin.getLevel(), bin.getClickedPos());
+    }
+    
+    public static BlockState getState(final BlockGetter bpg, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj4 = bpg.getBlockState(fu2);
+        if (SoulFireBlock.canSurviveOnBlock(cfj4.getBlock())) {
+            return Blocks.SOUL_FIRE.defaultBlockState();
+        }
+        return ((FireBlock)Blocks.FIRE).getStateForPlacement(bpg, fu);
+    }
+    
+    @Override
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return BaseFireBlock.DOWN_AABB;
+    }
+    
+    @Override
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (random.nextInt(24) == 0) {
+            bqb.playLocalSound(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, SoundEvents.FIRE_AMBIENT, SoundSource.BLOCKS, 1.0f + random.nextFloat(), random.nextFloat() * 0.7f + 0.3f, false);
+        }
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj2 = bqb.getBlockState(fu2);
+        if (this.canBurn(cfj2) || cfj2.isFaceSturdy(bqb, fu2, Direction.UP)) {
+            for (int integer8 = 0; integer8 < 3; ++integer8) {
+                final double double9 = fu.getX() + random.nextDouble();
+                final double double10 = fu.getY() + random.nextDouble() * 0.5 + 0.5;
+                final double double11 = fu.getZ() + random.nextDouble();
+                bqb.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
+            }
+        }
+        else {
+            if (this.canBurn(bqb.getBlockState(fu.west()))) {
+                for (int integer8 = 0; integer8 < 2; ++integer8) {
+                    final double double9 = fu.getX() + random.nextDouble() * 0.10000000149011612;
+                    final double double10 = fu.getY() + random.nextDouble();
+                    final double double11 = fu.getZ() + random.nextDouble();
+                    bqb.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
+                }
+            }
+            if (this.canBurn(bqb.getBlockState(fu.east()))) {
+                for (int integer8 = 0; integer8 < 2; ++integer8) {
+                    final double double9 = fu.getX() + 1 - random.nextDouble() * 0.10000000149011612;
+                    final double double10 = fu.getY() + random.nextDouble();
+                    final double double11 = fu.getZ() + random.nextDouble();
+                    bqb.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
+                }
+            }
+            if (this.canBurn(bqb.getBlockState(fu.north()))) {
+                for (int integer8 = 0; integer8 < 2; ++integer8) {
+                    final double double9 = fu.getX() + random.nextDouble();
+                    final double double10 = fu.getY() + random.nextDouble();
+                    final double double11 = fu.getZ() + random.nextDouble() * 0.10000000149011612;
+                    bqb.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
+                }
+            }
+            if (this.canBurn(bqb.getBlockState(fu.south()))) {
+                for (int integer8 = 0; integer8 < 2; ++integer8) {
+                    final double double9 = fu.getX() + random.nextDouble();
+                    final double double10 = fu.getY() + random.nextDouble();
+                    final double double11 = fu.getZ() + 1 - random.nextDouble() * 0.10000000149011612;
+                    bqb.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
+                }
+            }
+            if (this.canBurn(bqb.getBlockState(fu.above()))) {
+                for (int integer8 = 0; integer8 < 2; ++integer8) {
+                    final double double9 = fu.getX() + random.nextDouble();
+                    final double double10 = fu.getY() + 1 - random.nextDouble() * 0.10000000149011612;
+                    final double double11 = fu.getZ() + random.nextDouble();
+                    bqb.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
+                }
+            }
+        }
+    }
+    
+    protected abstract boolean canBurn(final BlockState cfj);
+    
+    @Override
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (!aom.fireImmune()) {
+            aom.setRemainingFireTicks(aom.getRemainingFireTicks() + 1);
+            if (aom.getRemainingFireTicks() == 0) {
+                aom.setSecondsOnFire(8);
+            }
+            aom.hurt(DamageSource.IN_FIRE, this.fireDamage);
+        }
+        super.entityInside(cfj, bqb, fu, aom);
+    }
+    
+    @Override
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj4.is(cfj1.getBlock())) {
+            return;
+        }
+        if ((bqb.dimension() == Level.OVERWORLD || bqb.dimension() == Level.NETHER) && NetherPortalBlock.trySpawnPortal(bqb, fu)) {
+            return;
+        }
+        if (!cfj1.canSurvive(bqb, fu)) {
+            bqb.removeBlock(fu, false);
+        }
+    }
+    
+    @Override
+    public void playerWillDestroy(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        if (!bqb.isClientSide()) {
+            bqb.levelEvent(null, 1009, fu, 0);
+        }
+    }
+    
+    public static boolean canBePlacedAt(final LevelAccessor bqc, final BlockPos fu) {
+        final BlockState cfj3 = bqc.getBlockState(fu);
+        final BlockState cfj4 = getState(bqc, fu);
+        return cfj3.isAir() && (cfj4.canSurvive(bqc, fu) || isPortal(bqc, fu));
+    }
+    
+    private static boolean isPortal(final LevelAccessor bqc, final BlockPos fu) {
+        for (final Direction fz4 : Direction.Plane.HORIZONTAL) {
+            if (bqc.getBlockState(fu.relative(fz4)).is(Blocks.OBSIDIAN) && NetherPortalBlock.isPortal(bqc, fu) != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    static {
+        UP_AABB = Block.box(0.0, 15.0, 0.0, 16.0, 16.0, 16.0);
+        DOWN_AABB = Block.box(0.0, 0.0, 0.0, 16.0, 1.0, 16.0);
+        WEST_AABB = Block.box(0.0, 0.0, 0.0, 1.0, 16.0, 16.0);
+        EAST_AABB = Block.box(15.0, 0.0, 0.0, 16.0, 16.0, 16.0);
+        NORTH_AABB = Block.box(0.0, 0.0, 0.0, 16.0, 16.0, 1.0);
+        SOUTH_AABB = Block.box(0.0, 0.0, 15.0, 16.0, 16.0, 16.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/BasePressurePlateBlock.java b/src/net/minecraft/world/level/block/BasePressurePlateBlock.java
index c3944ee..aabce80 100644
--- a/src/net/minecraft/world/level/block/BasePressurePlateBlock.java
+++ b/src/net/minecraft/world/level/block/BasePressurePlateBlock.java
@@ -6,13 +6,14 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Level;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -26,12 +27,11 @@ public abstract class BasePressurePlateBlock extends Block {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return (this.getSignalForState(byj) > 0) ? BasePressurePlateBlock.PRESSED_AABB : BasePressurePlateBlock.AABB;
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return (this.getSignalForState(cfj) > 0) ? BasePressurePlateBlock.PRESSED_AABB : BasePressurePlateBlock.AABB;
     }
     
-    @Override
-    public int getTickDelay(final LevelReader bjz) {
+    protected int getPressedTime() {
         return 20;
     }
     
@@ -41,107 +41,107 @@ public abstract class BasePressurePlateBlock extends Block {
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        return Block.canSupportRigidBlock(bjz, fk2) || Block.canSupportCenter(bjz, fk2, Direction.UP);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        return Block.canSupportRigidBlock(bqd, fu2) || Block.canSupportCenter(bqd, fu2, Direction.UP);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        final int integer6 = this.getSignalForState(byj);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final int integer6 = this.getSignalForState(cfj);
         if (integer6 > 0) {
-            this.checkPressed(xd, fk, byj, integer6);
+            this.checkPressed(zd, fu, cfj, integer6);
         }
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (bjw.isClientSide) {
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (bqb.isClientSide) {
             return;
         }
-        final int integer6 = this.getSignalForState(byj);
+        final int integer6 = this.getSignalForState(cfj);
         if (integer6 == 0) {
-            this.checkPressed(bjw, fk, byj, integer6);
+            this.checkPressed(bqb, fu, cfj, integer6);
         }
     }
     
-    protected void checkPressed(final Level bjw, final BlockPos fk, final BlockState byj, final int integer) {
-        final int integer2 = this.getSignalStrength(bjw, fk);
+    protected void checkPressed(final Level bqb, final BlockPos fu, final BlockState cfj, final int integer) {
+        final int integer2 = this.getSignalStrength(bqb, fu);
         final boolean boolean7 = integer > 0;
         final boolean boolean8 = integer2 > 0;
         if (integer != integer2) {
-            final BlockState byj2 = this.setSignalForState(byj, integer2);
-            bjw.setBlock(fk, byj2, 2);
-            this.updateNeighbours(bjw, fk);
-            bjw.setBlocksDirty(fk, byj, byj2);
+            final BlockState cfj2 = this.setSignalForState(cfj, integer2);
+            bqb.setBlock(fu, cfj2, 2);
+            this.updateNeighbours(bqb, fu);
+            bqb.setBlocksDirty(fu, cfj, cfj2);
         }
         if (!boolean8 && boolean7) {
-            this.playOffSound(bjw, fk);
+            this.playOffSound(bqb, fu);
         }
         else if (boolean8 && !boolean7) {
-            this.playOnSound(bjw, fk);
+            this.playOnSound(bqb, fu);
         }
         if (boolean8) {
-            bjw.getBlockTicks().scheduleTick(new BlockPos(fk), this, this.getTickDelay(bjw));
+            bqb.getBlockTicks().scheduleTick(new BlockPos(fu), this, this.getPressedTime());
         }
     }
     
-    protected abstract void playOnSound(final LevelAccessor bjx, final BlockPos fk);
+    protected abstract void playOnSound(final LevelAccessor bqc, final BlockPos fu);
     
-    protected abstract void playOffSound(final LevelAccessor bjx, final BlockPos fk);
+    protected abstract void playOffSound(final LevelAccessor bqc, final BlockPos fu);
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (boolean5 || byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (boolean5 || cfj1.is(cfj4.getBlock())) {
             return;
         }
-        if (this.getSignalForState(byj1) > 0) {
-            this.updateNeighbours(bjw, fk);
+        if (this.getSignalForState(cfj1) > 0) {
+            this.updateNeighbours(bqb, fu);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
-    protected void updateNeighbours(final Level bjw, final BlockPos fk) {
-        bjw.updateNeighborsAt(fk, this);
-        bjw.updateNeighborsAt(fk.below(), this);
+    protected void updateNeighbours(final Level bqb, final BlockPos fu) {
+        bqb.updateNeighborsAt(fu, this);
+        bqb.updateNeighborsAt(fu.below(), this);
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return this.getSignalForState(byj);
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return this.getSignalForState(cfj);
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (fp == Direction.UP) {
-            return this.getSignalForState(byj);
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (fz == Direction.UP) {
+            return this.getSignalForState(cfj);
         }
         return 0;
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.DESTROY;
     }
     
-    protected abstract int getSignalStrength(final Level bjw, final BlockPos fk);
+    protected abstract int getSignalStrength(final Level bqb, final BlockPos fu);
     
-    protected abstract int getSignalForState(final BlockState byj);
+    protected abstract int getSignalForState(final BlockState cfj);
     
-    protected abstract BlockState setSignalForState(final BlockState byj, final int integer);
+    protected abstract BlockState setSignalForState(final BlockState cfj, final int integer);
     
     static {
         PRESSED_AABB = Block.box(1.0, 0.0, 1.0, 15.0, 0.5, 15.0);
diff --git a/src/net/minecraft/world/level/block/BaseRailBlock.java b/src/net/minecraft/world/level/block/BaseRailBlock.java
index 84b58f3..70e1d3a 100644
--- a/src/net/minecraft/world/level/block/BaseRailBlock.java
+++ b/src/net/minecraft/world/level/block/BaseRailBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.BlockPlaceContext;
@@ -9,6 +9,8 @@ import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.properties.RailShape;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
@@ -20,12 +22,12 @@ public abstract class BaseRailBlock extends Block {
     protected static final VoxelShape HALF_BLOCK_AABB;
     private final boolean isStraight;
     
-    public static boolean isRail(final Level bjw, final BlockPos fk) {
-        return isRail(bjw.getBlockState(fk));
+    public static boolean isRail(final Level bqb, final BlockPos fu) {
+        return isRail(bqb.getBlockState(fu));
     }
     
-    public static boolean isRail(final BlockState byj) {
-        return byj.is(BlockTags.RAILS);
+    public static boolean isRail(final BlockState cfj) {
+        return cfj.is(BlockTags.RAILS) && cfj.getBlock() instanceof BaseRailBlock;
     }
     
     protected BaseRailBlock(final boolean boolean1, final Properties c) {
@@ -38,111 +40,112 @@ public abstract class BaseRailBlock extends Block {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final RailShape bzn6 = (byj.getBlock() == this) ? byj.<RailShape>getValue(this.getShapeProperty()) : null;
-        if (bzn6 != null && bzn6.isAscending()) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final RailShape cgm6 = cfj.is(this) ? cfj.<RailShape>getValue(this.getShapeProperty()) : null;
+        if (cgm6 != null && cgm6.isAscending()) {
             return BaseRailBlock.HALF_BLOCK_AABB;
         }
         return BaseRailBlock.FLAT_AABB;
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return Block.canSupportRigidBlock(bjz, fk.below());
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return Block.canSupportRigidBlock(bqd, fu.below());
     }
     
     @Override
-    public void onPlace(BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj4.getBlock() == byj1.getBlock()) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj4.is(cfj1.getBlock())) {
             return;
         }
-        byj1 = this.updateDir(bjw, fk, byj1, true);
+        this.updateState(cfj1, bqb, fu, boolean5);
+    }
+    
+    protected BlockState updateState(BlockState cfj, final Level bqb, final BlockPos fu, final boolean boolean4) {
+        cfj = this.updateDir(bqb, fu, cfj, true);
         if (this.isStraight) {
-            byj1.neighborChanged(bjw, fk, this, fk, boolean5);
+            cfj.neighborChanged(bqb, fu, this, fu, boolean4);
         }
+        return cfj;
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (bjw.isClientSide) {
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (bqb.isClientSide) {
             return;
         }
-        final RailShape bzn8 = byj.<RailShape>getValue(this.getShapeProperty());
-        boolean boolean7 = false;
-        final BlockPos fk6 = fk3.below();
-        if (!Block.canSupportRigidBlock(bjw, fk6)) {
-            boolean7 = true;
-        }
-        final BlockPos fk7 = fk3.east();
-        if (bzn8 == RailShape.ASCENDING_EAST && !Block.canSupportRigidBlock(bjw, fk7)) {
-            boolean7 = true;
-        }
-        else {
-            final BlockPos fk8 = fk3.west();
-            if (bzn8 == RailShape.ASCENDING_WEST && !Block.canSupportRigidBlock(bjw, fk8)) {
-                boolean7 = true;
-            }
-            else {
-                final BlockPos fk9 = fk3.north();
-                if (bzn8 == RailShape.ASCENDING_NORTH && !Block.canSupportRigidBlock(bjw, fk9)) {
-                    boolean7 = true;
-                }
-                else {
-                    final BlockPos fk10 = fk3.south();
-                    if (bzn8 == RailShape.ASCENDING_SOUTH && !Block.canSupportRigidBlock(bjw, fk10)) {
-                        boolean7 = true;
-                    }
-                }
-            }
-        }
-        if (boolean7 && !bjw.isEmptyBlock(fk3)) {
+        final RailShape cgm8 = cfj.<RailShape>getValue(this.getShapeProperty());
+        if (shouldBeRemoved(fu3, bqb, cgm8) && !bqb.isEmptyBlock(fu3)) {
             if (!boolean6) {
-                Block.dropResources(byj, bjw, fk3);
+                Block.dropResources(cfj, bqb, fu3);
             }
-            bjw.removeBlock(fk3, boolean6);
+            bqb.removeBlock(fu3, boolean6);
         }
         else {
-            this.updateState(byj, bjw, fk3, bph);
+            this.updateState(cfj, bqb, fu3, bvr);
         }
     }
     
-    protected void updateState(final BlockState byj, final Level bjw, final BlockPos fk, final Block bph) {
+    private static boolean shouldBeRemoved(final BlockPos fu, final Level bqb, final RailShape cgm) {
+        if (!Block.canSupportRigidBlock(bqb, fu.below())) {
+            return true;
+        }
+        switch (cgm) {
+            case ASCENDING_EAST: {
+                return !Block.canSupportRigidBlock(bqb, fu.east());
+            }
+            case ASCENDING_WEST: {
+                return !Block.canSupportRigidBlock(bqb, fu.west());
+            }
+            case ASCENDING_NORTH: {
+                return !Block.canSupportRigidBlock(bqb, fu.north());
+            }
+            case ASCENDING_SOUTH: {
+                return !Block.canSupportRigidBlock(bqb, fu.south());
+            }
+            default: {
+                return false;
+            }
+        }
     }
     
-    protected BlockState updateDir(final Level bjw, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        if (bjw.isClientSide) {
-            return byj;
+    protected void updateState(final BlockState cfj, final Level bqb, final BlockPos fu, final Block bvr) {
+    }
+    
+    protected BlockState updateDir(final Level bqb, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        if (bqb.isClientSide) {
+            return cfj;
         }
-        final RailShape bzn6 = byj.<RailShape>getValue(this.getShapeProperty());
-        return new RailState(bjw, fk, byj).place(bjw.hasNeighborSignal(fk), boolean4, bzn6).getState();
+        final RailShape cgm6 = cfj.<RailShape>getValue(this.getShapeProperty());
+        return new RailState(bqb, fu, cfj).place(bqb.hasNeighborSignal(fu), boolean4, cgm6).getState();
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.NORMAL;
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
         if (boolean5) {
             return;
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
-        if (byj1.<RailShape>getValue(this.getShapeProperty()).isAscending()) {
-            bjw.updateNeighborsAt(fk.above(), this);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
+        if (cfj1.<RailShape>getValue(this.getShapeProperty()).isAscending()) {
+            bqb.updateNeighborsAt(fu.above(), this);
         }
         if (this.isStraight) {
-            bjw.updateNeighborsAt(fk, this);
-            bjw.updateNeighborsAt(fk.below(), this);
+            bqb.updateNeighborsAt(fu, this);
+            bqb.updateNeighborsAt(fu.below(), this);
         }
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockState byj3 = super.defaultBlockState();
-        final Direction fp4 = bcq.getHorizontalDirection();
-        final boolean boolean5 = fp4 == Direction.EAST || fp4 == Direction.WEST;
-        return ((AbstractStateHolder<O, BlockState>)byj3).<RailShape, RailShape>setValue(this.getShapeProperty(), boolean5 ? RailShape.EAST_WEST : RailShape.NORTH_SOUTH);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockState cfj3 = super.defaultBlockState();
+        final Direction fz4 = bin.getHorizontalDirection();
+        final boolean boolean5 = fz4 == Direction.EAST || fz4 == Direction.WEST;
+        return ((StateHolder<O, BlockState>)cfj3).<RailShape, RailShape>setValue(this.getShapeProperty(), boolean5 ? RailShape.EAST_WEST : RailShape.NORTH_SOUTH);
     }
     
     public abstract Property<RailShape> getShapeProperty();
diff --git a/src/net/minecraft/world/level/block/BeaconBlock.java b/src/net/minecraft/world/level/block/BeaconBlock.java
index db68064..87abb9a 100644
--- a/src/net/minecraft/world/level/block/BeaconBlock.java
+++ b/src/net/minecraft/world/level/block/BeaconBlock.java
@@ -15,6 +15,7 @@ import net.minecraft.world.level.block.entity.BeaconBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class BeaconBlock extends BaseEntityBlock implements BeaconBeamBlock {
     public BeaconBlock(final Properties c) {
@@ -27,39 +28,34 @@ public class BeaconBlock extends BaseEntityBlock implements BeaconBeamBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new BeaconBlockEntity();
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk);
-        if (bwl8 instanceof BeaconBlockEntity) {
-            ayj.openMenu((MenuProvider)bwl8);
-            ayj.awardStat(Stats.INTERACT_WITH_BEACON);
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu);
+        if (cdl8 instanceof BeaconBlockEntity) {
+            bec.openMenu((MenuProvider)cdl8);
+            bec.awardStat(Stats.INTERACT_WITH_BEACON);
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public boolean isRedstoneConductor(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return false;
-    }
-    
-    @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof BeaconBlockEntity) {
-                ((BeaconBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof BeaconBlockEntity) {
+                ((BeaconBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
diff --git a/src/net/minecraft/world/level/block/BedBlock.java b/src/net/minecraft/world/level/block/BedBlock.java
index cabc99a..e8710e2 100644
--- a/src/net/minecraft/world/level/block/BedBlock.java
+++ b/src/net/minecraft/world/level/block/BedBlock.java
@@ -1,22 +1,21 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.util.Mth;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BedBlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.material.PushReaction;
+import java.util.function.Predicate;
 import java.util.Optional;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.item.BlockPlaceContext;
-import net.minecraft.stats.Stat;
-import net.minecraft.stats.Stats;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.phys.Vec3;
 import java.util.List;
@@ -25,10 +24,10 @@ import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.npc.Villager;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.world.level.ExplosionDamageCalculator;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionHand;
@@ -36,11 +35,11 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import javax.annotation.Nullable;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
@@ -61,64 +60,60 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
     protected static final VoxelShape EAST_SHAPE;
     private final DyeColor color;
     
-    public BedBlock(final DyeColor bdj, final Properties c) {
+    public BedBlock(final DyeColor bje, final Properties c) {
         super(c);
-        this.color = bdj;
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue(BedBlock.PART, BedPart.FOOT)).<Comparable, Boolean>setValue((Property<Comparable>)BedBlock.OCCUPIED, false));
-    }
-    
-    @Override
-    public MaterialColor getMapColor(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        if (byj.<BedPart>getValue(BedBlock.PART) == BedPart.FOOT) {
-            return this.color.getMaterialColor();
-        }
-        return MaterialColor.WOOL;
+        this.color = bje;
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue(BedBlock.PART, BedPart.FOOT)).<Comparable, Boolean>setValue((Property<Comparable>)BedBlock.OCCUPIED, false));
     }
     
     @Nullable
-    public static Direction getBedOrientation(final BlockGetter bjg, final BlockPos fk) {
-        final BlockState byj3 = bjg.getBlockState(fk);
-        return (byj3.getBlock() instanceof BedBlock) ? byj3.<Direction>getValue((Property<Direction>)BedBlock.FACING) : null;
+    public static Direction getBedOrientation(final BlockGetter bpg, final BlockPos fu) {
+        final BlockState cfj3 = bpg.getBlockState(fu);
+        return (cfj3.getBlock() instanceof BedBlock) ? cfj3.<Direction>getValue((Property<Direction>)BedBlock.FACING) : null;
     }
     
     @Override
-    public InteractionResult use(BlockState byj, final Level bjw, BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(BlockState cfj, final Level bqb, BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.CONSUME;
         }
-        if (byj.<BedPart>getValue(BedBlock.PART) != BedPart.HEAD) {
-            fk = fk.relative(byj.<Direction>getValue((Property<Direction>)BedBlock.FACING));
-            byj = bjw.getBlockState(fk);
-            if (byj.getBlock() != this) {
+        if (cfj.<BedPart>getValue(BedBlock.PART) != BedPart.HEAD) {
+            fu = fu.relative(cfj.<Direction>getValue((Property<Direction>)BedBlock.FACING));
+            cfj = bqb.getBlockState(fu);
+            if (!cfj.is(this)) {
                 return InteractionResult.CONSUME;
             }
         }
-        if (!bjw.dimension.mayRespawn() || bjw.getBiome(fk) == Biomes.NETHER) {
-            bjw.removeBlock(fk, false);
-            final BlockPos fk2 = fk.relative(byj.<Direction>getValue((Property<Direction>)BedBlock.FACING).getOpposite());
-            if (bjw.getBlockState(fk2).getBlock() == this) {
-                bjw.removeBlock(fk2, false);
+        if (!canSetSpawn(bqb)) {
+            bqb.removeBlock(fu, false);
+            final BlockPos fu2 = fu.relative(cfj.<Direction>getValue((Property<Direction>)BedBlock.FACING).getOpposite());
+            if (bqb.getBlockState(fu2).is(this)) {
+                bqb.removeBlock(fu2, false);
             }
-            bjw.explode(null, DamageSource.netherBedExplosion(), fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5, 5.0f, true, Explosion.BlockInteraction.DESTROY);
+            bqb.explode(null, DamageSource.badRespawnPointExplosion(), null, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, 5.0f, true, Explosion.BlockInteraction.DESTROY);
             return InteractionResult.SUCCESS;
         }
-        if (byj.<Boolean>getValue((Property<Boolean>)BedBlock.OCCUPIED)) {
-            if (!this.kickVillagerOutOfBed(bjw, fk)) {
-                ayj.displayClientMessage(new TranslatableComponent("block.minecraft.bed.occupied", new Object[0]), true);
+        if (cfj.<Boolean>getValue((Property<Boolean>)BedBlock.OCCUPIED)) {
+            if (!this.kickVillagerOutOfBed(bqb, fu)) {
+                bec.displayClientMessage(new TranslatableComponent("block.minecraft.bed.occupied"), true);
             }
             return InteractionResult.SUCCESS;
         }
-        ayj.startSleepInBed(fk).ifLeft(a -> {
+        bec.startSleepInBed(fu).ifLeft(a -> {
             if (a != null) {
-                ayj.displayClientMessage(a.getMessage(), true);
+                bec.displayClientMessage(a.getMessage(), true);
             }
             return;
         });
         return InteractionResult.SUCCESS;
     }
     
-    private boolean kickVillagerOutOfBed(final Level bjw, final BlockPos fk) {
-        final List<Villager> list4 = bjw.<Villager>getEntitiesOfClass(Villager.class, new AABB(fk), LivingEntity::isSleeping);
+    public static boolean canSetSpawn(final Level bqb) {
+        return bqb.dimensionType().bedWorks();
+    }
+    
+    private boolean kickVillagerOutOfBed(final Level bqb, final BlockPos fu) {
+        final List<Villager> list4 = bqb.<Villager>getEntitiesOfClass(Villager.class, new AABB(fu), LivingEntity::isSleeping);
         if (list4.isEmpty()) {
             return false;
         }
@@ -127,82 +122,75 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
     }
     
     @Override
-    public void fallOn(final Level bjw, final BlockPos fk, final Entity akq, final float float4) {
-        super.fallOn(bjw, fk, akq, float4 * 0.5f);
+    public void fallOn(final Level bqb, final BlockPos fu, final Entity aom, final float float4) {
+        super.fallOn(bqb, fu, aom, float4 * 0.5f);
     }
     
     @Override
-    public void updateEntityAfterFallOn(final BlockGetter bjg, final Entity akq) {
-        if (akq.isSuppressingBounce()) {
-            super.updateEntityAfterFallOn(bjg, akq);
+    public void updateEntityAfterFallOn(final BlockGetter bpg, final Entity aom) {
+        if (aom.isSuppressingBounce()) {
+            super.updateEntityAfterFallOn(bpg, aom);
         }
         else {
-            this.bounceUp(akq);
+            this.bounceUp(aom);
         }
     }
     
-    private void bounceUp(final Entity akq) {
-        final Vec3 cvl3 = akq.getDeltaMovement();
-        if (cvl3.y < 0.0) {
-            final double double4 = (akq instanceof LivingEntity) ? 1.0 : 0.8;
-            akq.setDeltaMovement(cvl3.x, -cvl3.y * 0.6600000262260437 * double4, cvl3.z);
+    private void bounceUp(final Entity aom) {
+        final Vec3 dem3 = aom.getDeltaMovement();
+        if (dem3.y < 0.0) {
+            final double double4 = (aom instanceof LivingEntity) ? 1.0 : 0.8;
+            aom.setDeltaMovement(dem3.x, -dem3.y * 0.6600000262260437 * double4, dem3.z);
         }
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp != getNeighbourDirection(byj1.<BedPart>getValue(BedBlock.PART), byj1.<Direction>getValue((Property<Direction>)BedBlock.FACING))) {
-            return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz != getNeighbourDirection(cfj1.<BedPart>getValue(BedBlock.PART), cfj1.<Direction>getValue((Property<Direction>)BedBlock.FACING))) {
+            return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
         }
-        if (byj3.getBlock() == this && byj3.<BedPart>getValue(BedBlock.PART) != byj1.<BedPart>getValue(BedBlock.PART)) {
-            return ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Comparable>setValue((Property<Comparable>)BedBlock.OCCUPIED, (Comparable)byj3.<V>getValue((Property<V>)BedBlock.OCCUPIED));
+        if (cfj3.is(this) && cfj3.<BedPart>getValue(BedBlock.PART) != cfj1.<BedPart>getValue(BedBlock.PART)) {
+            return ((StateHolder<O, BlockState>)cfj1).<Comparable, Comparable>setValue((Property<Comparable>)BedBlock.OCCUPIED, (Comparable)cfj3.<V>getValue((Property<V>)BedBlock.OCCUPIED));
         }
         return Blocks.AIR.defaultBlockState();
     }
     
-    private static Direction getNeighbourDirection(final BedPart byy, final Direction fp) {
-        return (byy == BedPart.FOOT) ? fp : fp.getOpposite();
+    private static Direction getNeighbourDirection(final BedPart cfx, final Direction fz) {
+        return (cfx == BedPart.FOOT) ? fz : fz.getOpposite();
     }
     
     @Override
-    public void playerDestroy(final Level bjw, final Player ayj, final BlockPos fk, final BlockState byj, @Nullable final BlockEntity bwl, final ItemStack ben) {
-        super.playerDestroy(bjw, ayj, fk, Blocks.AIR.defaultBlockState(), bwl, ben);
-    }
-    
-    @Override
-    public void playerWillDestroy(final Level bjw, final BlockPos fk, final BlockState byj, final Player ayj) {
-        final BedPart byy6 = byj.<BedPart>getValue(BedBlock.PART);
-        final BlockPos fk2 = fk.relative(getNeighbourDirection(byy6, byj.<Direction>getValue((Property<Direction>)BedBlock.FACING)));
-        final BlockState byj2 = bjw.getBlockState(fk2);
-        if (byj2.getBlock() == this && byj2.<BedPart>getValue(BedBlock.PART) != byy6) {
-            bjw.setBlock(fk2, Blocks.AIR.defaultBlockState(), 35);
-            bjw.levelEvent(ayj, 2001, fk2, Block.getId(byj2));
-            if (!bjw.isClientSide && !ayj.isCreative()) {
-                final ItemStack ben9 = ayj.getMainHandItem();
-                Block.dropResources(byj, bjw, fk, null, ayj, ben9);
-                Block.dropResources(byj2, bjw, fk2, null, ayj, ben9);
+    public void playerWillDestroy(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        if (!bqb.isClientSide && bec.isCreative()) {
+            final BedPart cfx6 = cfj.<BedPart>getValue(BedBlock.PART);
+            if (cfx6 == BedPart.FOOT) {
+                final BlockPos fu2 = fu.relative(getNeighbourDirection(cfx6, cfj.<Direction>getValue((Property<Direction>)BedBlock.FACING)));
+                final BlockState cfj2 = bqb.getBlockState(fu2);
+                if (cfj2.getBlock() == this && cfj2.<BedPart>getValue(BedBlock.PART) == BedPart.HEAD) {
+                    bqb.setBlock(fu2, Blocks.AIR.defaultBlockState(), 35);
+                    bqb.levelEvent(bec, 2001, fu2, Block.getId(cfj2));
+                }
             }
-            ayj.awardStat(Stats.BLOCK_MINED.get(this));
         }
-        super.playerWillDestroy(bjw, fk, byj, ayj);
+        super.playerWillDestroy(bqb, fu, cfj, bec);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final Direction fp3 = bcq.getHorizontalDirection();
-        final BlockPos fk4 = bcq.getClickedPos();
-        final BlockPos fk5 = fk4.relative(fp3);
-        if (bcq.getLevel().getBlockState(fk5).canBeReplaced(bcq)) {
-            return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BedBlock.FACING, fp3);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final Direction fz3 = bin.getHorizontalDirection();
+        final BlockPos fu4 = bin.getClickedPos();
+        final BlockPos fu5 = fu4.relative(fz3);
+        if (bin.getLevel().getBlockState(fu5).canBeReplaced(bin)) {
+            return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BedBlock.FACING, fz3);
         }
         return null;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final Direction fp6 = getConnectedDirection(byj).getOpposite();
-        switch (fp6) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final Direction fz6 = getConnectedDirection(cfj).getOpposite();
+        switch (fz6) {
             case NORTH: {
                 return BedBlock.NORTH_SHAPE;
             }
@@ -218,33 +206,33 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
         }
     }
     
-    public static Direction getConnectedDirection(final BlockState byj) {
-        final Direction fp2 = byj.<Direction>getValue((Property<Direction>)BedBlock.FACING);
-        return (byj.<BedPart>getValue(BedBlock.PART) == BedPart.HEAD) ? fp2.getOpposite() : fp2;
+    public static Direction getConnectedDirection(final BlockState cfj) {
+        final Direction fz2 = cfj.<Direction>getValue((Property<Direction>)BedBlock.FACING);
+        return (cfj.<BedPart>getValue(BedBlock.PART) == BedPart.HEAD) ? fz2.getOpposite() : fz2;
     }
     
-    public static DoubleBlockCombiner.BlockType getBlockType(final BlockState byj) {
-        final BedPart byy2 = byj.<BedPart>getValue(BedBlock.PART);
-        if (byy2 == BedPart.HEAD) {
+    public static DoubleBlockCombiner.BlockType getBlockType(final BlockState cfj) {
+        final BedPart cfx2 = cfj.<BedPart>getValue(BedBlock.PART);
+        if (cfx2 == BedPart.HEAD) {
             return DoubleBlockCombiner.BlockType.FIRST;
         }
         return DoubleBlockCombiner.BlockType.SECOND;
     }
     
-    public static Optional<Vec3> findStandUpPosition(final EntityType<?> aku, final LevelReader bjz, final BlockPos fk, int integer) {
-        final Direction fp5 = bjz.getBlockState(fk).<Direction>getValue((Property<Direction>)BedBlock.FACING);
-        final int integer2 = fk.getX();
-        final int integer3 = fk.getY();
-        final int integer4 = fk.getZ();
+    public static Optional<Vec3> findStandUpPosition(final EntityType<?> aoq, final LevelReader bqd, final BlockPos fu, int integer) {
+        final Direction fz5 = bqd.getBlockState(fu).<Direction>getValue((Property<Direction>)BedBlock.FACING);
+        final int integer2 = fu.getX();
+        final int integer3 = fu.getY();
+        final int integer4 = fu.getZ();
         for (int integer5 = 0; integer5 <= 1; ++integer5) {
-            final int integer6 = integer2 - fp5.getStepX() * integer5 - 1;
-            final int integer7 = integer4 - fp5.getStepZ() * integer5 - 1;
+            final int integer6 = integer2 - fz5.getStepX() * integer5 - 1;
+            final int integer7 = integer4 - fz5.getStepZ() * integer5 - 1;
             final int integer8 = integer6 + 2;
             final int integer9 = integer7 + 2;
             for (int integer10 = integer6; integer10 <= integer8; ++integer10) {
                 for (int integer11 = integer7; integer11 <= integer9; ++integer11) {
-                    final BlockPos fk2 = new BlockPos(integer10, integer3, integer11);
-                    final Optional<Vec3> optional17 = getStandingLocationAtOrBelow(aku, bjz, fk2);
+                    final BlockPos fu2 = new BlockPos(integer10, integer3, integer11);
+                    final Optional<Vec3> optional17 = getStandingLocationAtOrBelow(aoq, bqd, fu2);
                     if (optional17.isPresent()) {
                         if (integer <= 0) {
                             return optional17;
@@ -257,38 +245,38 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
         return Optional.<Vec3>empty();
     }
     
-    protected static Optional<Vec3> getStandingLocationAtOrBelow(final EntityType<?> aku, final LevelReader bjz, final BlockPos fk) {
-        final VoxelShape cwf4 = bjz.getBlockState(fk).getCollisionShape(bjz, fk);
-        if (cwf4.max(Direction.Axis.Y) > 0.4375) {
+    public static Optional<Vec3> getStandingLocationAtOrBelow(final EntityType<?> aoq, final LevelReader bqd, final BlockPos fu) {
+        final VoxelShape dfg4 = bqd.getBlockState(fu).getCollisionShape(bqd, fu);
+        if (dfg4.max(Direction.Axis.Y) > 0.4375) {
             return Optional.<Vec3>empty();
         }
-        final BlockPos.MutableBlockPos a5 = new BlockPos.MutableBlockPos(fk);
-        while (a5.getY() >= 0 && fk.getY() - a5.getY() <= 2 && bjz.getBlockState(a5).getCollisionShape(bjz, a5).isEmpty()) {
+        final BlockPos.MutableBlockPos a5 = fu.mutable();
+        while (a5.getY() >= 0 && fu.getY() - a5.getY() <= 2 && bqd.getBlockState(a5).getCollisionShape(bqd, a5).isEmpty()) {
             a5.move(Direction.DOWN);
         }
-        final VoxelShape cwf5 = bjz.getBlockState(a5).getCollisionShape(bjz, a5);
-        if (cwf5.isEmpty()) {
+        final VoxelShape dfg5 = bqd.getBlockState(a5).getCollisionShape(bqd, a5);
+        if (dfg5.isEmpty()) {
             return Optional.<Vec3>empty();
         }
-        final double double7 = a5.getY() + cwf5.max(Direction.Axis.Y) + 2.0E-7;
-        if (fk.getY() - double7 > 2.0) {
+        final double double7 = a5.getY() + dfg5.max(Direction.Axis.Y) + 2.0E-7;
+        if (fu.getY() - double7 > 2.0) {
             return Optional.<Vec3>empty();
         }
-        final float float9 = aku.getWidth() / 2.0f;
-        final Vec3 cvl10 = new Vec3(a5.getX() + 0.5, double7, a5.getZ() + 0.5);
-        if (bjz.noCollision(new AABB(cvl10.x - float9, cvl10.y, cvl10.z - float9, cvl10.x + float9, cvl10.y + aku.getHeight(), cvl10.z + float9))) {
-            return Optional.<Vec3>of(cvl10);
+        final Vec3 dem9 = new Vec3(a5.getX() + 0.5, double7, a5.getZ() + 0.5);
+        final AABB deg10 = aoq.getAABB(dem9.x, dem9.y, dem9.z);
+        if (bqd.noCollision(deg10) && bqd.getBlockStates(deg10.expandTowards(0.0, -0.20000000298023224, 0.0)).noneMatch(aoq::isBlockDangerous)) {
+            return Optional.<Vec3>of(dem9);
         }
         return Optional.<Vec3>empty();
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.DESTROY;
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.ENTITYBLOCK_ANIMATED;
     }
     
@@ -298,18 +286,18 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new BedBlockEntity(this.color);
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, @Nullable final LivingEntity akz, final ItemStack ben) {
-        super.setPlacedBy(bjw, fk, byj, akz, ben);
-        if (!bjw.isClientSide) {
-            final BlockPos fk2 = fk.relative(byj.<Direction>getValue((Property<Direction>)BedBlock.FACING));
-            bjw.setBlock(fk2, ((AbstractStateHolder<O, BlockState>)byj).<BedPart, BedPart>setValue(BedBlock.PART, BedPart.HEAD), 3);
-            bjw.blockUpdated(fk, Blocks.AIR);
-            byj.updateNeighbourShapes(bjw, fk, 3);
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
+        super.setPlacedBy(bqb, fu, cfj, aoy, bki);
+        if (!bqb.isClientSide) {
+            final BlockPos fu2 = fu.relative(cfj.<Direction>getValue((Property<Direction>)BedBlock.FACING));
+            bqb.setBlock(fu2, ((StateHolder<O, BlockState>)cfj).<BedPart, BedPart>setValue(BedBlock.PART, BedPart.HEAD), 3);
+            bqb.blockUpdated(fu, Blocks.AIR);
+            cfj.updateNeighbourShapes(bqb, fu, 3);
         }
     }
     
@@ -318,13 +306,13 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
     }
     
     @Override
-    public long getSeed(final BlockState byj, final BlockPos fk) {
-        final BlockPos fk2 = fk.relative((Direction)byj.<Direction>getValue((Property<Direction>)BedBlock.FACING), (int)((byj.<BedPart>getValue(BedBlock.PART) != BedPart.HEAD) ? 1 : 0));
-        return Mth.getSeed(fk2.getX(), fk.getY(), fk2.getZ());
+    public long getSeed(final BlockState cfj, final BlockPos fu) {
+        final BlockPos fu2 = fu.relative((Direction)cfj.<Direction>getValue((Property<Direction>)BedBlock.FACING), (int)((cfj.<BedPart>getValue(BedBlock.PART) != BedPart.HEAD) ? 1 : 0));
+        return Mth.getSeed(fu2.getX(), fu.getY(), fu2.getZ());
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/BedrockBlock.java b/src/net/minecraft/world/level/block/BedrockBlock.java
deleted file mode 100644
index dd8bddb..0000000
--- a/src/net/minecraft/world/level/block/BedrockBlock.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package net.minecraft.world.level.block;
-
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.state.BlockState;
-
-public class BedrockBlock extends Block {
-    public BedrockBlock(final Properties c) {
-        super(c);
-    }
-    
-    @Override
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return false;
-    }
-}
diff --git a/src/net/minecraft/world/level/block/BeehiveBlock.java b/src/net/minecraft/world/level/block/BeehiveBlock.java
index cfd9df3..802a9da 100644
--- a/src/net/minecraft/world/level/block/BeehiveBlock.java
+++ b/src/net/minecraft/world/level/block/BeehiveBlock.java
@@ -1,7 +1,8 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.Util;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.vehicle.MinecartTNT;
 import net.minecraft.world.entity.boss.wither.WitherBoss;
@@ -10,8 +11,8 @@ import net.minecraft.world.entity.monster.Creeper;
 import net.minecraft.world.entity.item.PrimedTnt;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -20,6 +21,7 @@ import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.util.Mth;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.BlockGetter;
 import java.util.Random;
@@ -32,7 +34,7 @@ import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.Items;
 import java.util.Iterator;
 import java.util.List;
-import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.animal.Bee;
 import net.minecraft.server.level.ServerPlayer;
@@ -48,169 +50,166 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.core.Direction;
 
 public class BeehiveBlock extends BaseEntityBlock {
-    public static final Direction[] SPAWN_DIRECTIONS;
+    private static final Direction[] SPAWN_DIRECTIONS;
     public static final DirectionProperty FACING;
     public static final IntegerProperty HONEY_LEVEL;
     
     public BeehiveBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BeehiveBlock.HONEY_LEVEL, 0)).<Comparable, Direction>setValue((Property<Comparable>)BeehiveBlock.FACING, Direction.NORTH));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BeehiveBlock.HONEY_LEVEL, 0)).<Comparable, Direction>setValue((Property<Comparable>)BeehiveBlock.FACING, Direction.NORTH));
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return byj.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL);
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return cfj.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL);
     }
     
     @Override
-    public void playerDestroy(final Level bjw, final Player ayj, final BlockPos fk, final BlockState byj, @Nullable final BlockEntity bwl, final ItemStack ben) {
-        super.playerDestroy(bjw, ayj, fk, byj, bwl, ben);
-        if (!bjw.isClientSide && bwl instanceof BeehiveBlockEntity) {
-            final BeehiveBlockEntity bwi8 = (BeehiveBlockEntity)bwl;
-            if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, ben) == 0) {
-                bwi8.emptyAllLivingFromHive(ayj, byj, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY);
-                bjw.updateNeighbourForOutputSignal(fk, this);
-                this.angerNearbyBees(bjw, fk);
+    public void playerDestroy(final Level bqb, final Player bec, final BlockPos fu, final BlockState cfj, @Nullable final BlockEntity cdl, final ItemStack bki) {
+        super.playerDestroy(bqb, bec, fu, cfj, cdl, bki);
+        if (!bqb.isClientSide && cdl instanceof BeehiveBlockEntity) {
+            final BeehiveBlockEntity cdi8 = (BeehiveBlockEntity)cdl;
+            if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, bki) == 0) {
+                cdi8.emptyAllLivingFromHive(bec, cfj, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY);
+                bqb.updateNeighbourForOutputSignal(fu, this);
+                this.angerNearbyBees(bqb, fu);
             }
-            CriteriaTriggers.BEE_NEST_DESTROYED.trigger((ServerPlayer)ayj, byj.getBlock(), ben, bwi8.getOccupantCount());
+            CriteriaTriggers.BEE_NEST_DESTROYED.trigger((ServerPlayer)bec, cfj.getBlock(), bki, cdi8.getOccupantCount());
         }
     }
     
-    private void angerNearbyBees(final Level bjw, final BlockPos fk) {
-        final List<Bee> list4 = bjw.<Bee>getEntitiesOfClass(Bee.class, new AABB(fk).inflate(8.0, 6.0, 8.0));
+    private void angerNearbyBees(final Level bqb, final BlockPos fu) {
+        final List<Bee> list4 = bqb.<Bee>getEntitiesOfClass(Bee.class, new AABB(fu).inflate(8.0, 6.0, 8.0));
         if (!list4.isEmpty()) {
-            final List<Player> list5 = bjw.<Player>getEntitiesOfClass(Player.class, new AABB(fk).inflate(8.0, 6.0, 8.0));
+            final List<Player> list5 = bqb.<Player>getEntitiesOfClass(Player.class, new AABB(fu).inflate(8.0, 6.0, 8.0));
             final int integer6 = list5.size();
-            for (final Bee atd8 : list4) {
-                if (atd8.getTarget() == null) {
-                    atd8.makeAngry(list5.get(bjw.random.nextInt(integer6)));
+            for (final Bee ayl8 : list4) {
+                if (ayl8.getTarget() == null) {
+                    ayl8.setTarget(list5.get(bqb.random.nextInt(integer6)));
                 }
             }
         }
     }
     
-    public static void dropHoneycomb(final Level bjw, final BlockPos fk) {
-        Block.popResource(bjw, fk, new ItemStack(Items.HONEYCOMB, 3));
+    public static void dropHoneycomb(final Level bqb, final BlockPos fu) {
+        Block.popResource(bqb, fu, new ItemStack(Items.HONEYCOMB, 3));
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final ItemStack ben8 = ayj.getItemInHand(ajk);
-        final ItemStack ben9 = ben8.copy();
-        final int integer10 = byj.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL);
-        boolean boolean11 = false;
-        if (integer10 >= 5) {
-            if (ben8.getItem() == Items.SHEARS) {
-                bjw.playSound(ayj, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.BEEHIVE_SHEAR, SoundSource.NEUTRAL, 1.0f, 1.0f);
-                dropHoneycomb(bjw, fk);
-                ben8.<Player>hurtAndBreak(1, ayj, ayj -> ayj.broadcastBreakEvent(ajk));
-                boolean11 = true;
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final ItemStack bki8 = bec.getItemInHand(anf);
+        final int integer9 = cfj.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL);
+        boolean boolean10 = false;
+        if (integer9 >= 5) {
+            if (bki8.getItem() == Items.SHEARS) {
+                bqb.playSound(bec, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.BEEHIVE_SHEAR, SoundSource.NEUTRAL, 1.0f, 1.0f);
+                dropHoneycomb(bqb, fu);
+                bki8.<Player>hurtAndBreak(1, bec, bec -> bec.broadcastBreakEvent(anf));
+                boolean10 = true;
             }
-            else if (ben8.getItem() == Items.GLASS_BOTTLE) {
-                ben8.shrink(1);
-                bjw.playSound(ayj, ayj.getX(), ayj.getY(), ayj.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0f, 1.0f);
-                if (ben8.isEmpty()) {
-                    ayj.setItemInHand(ajk, new ItemStack(Items.HONEY_BOTTLE));
+            else if (bki8.getItem() == Items.GLASS_BOTTLE) {
+                bki8.shrink(1);
+                bqb.playSound(bec, bec.getX(), bec.getY(), bec.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0f, 1.0f);
+                if (bki8.isEmpty()) {
+                    bec.setItemInHand(anf, new ItemStack(Items.HONEY_BOTTLE));
                 }
-                else if (!ayj.inventory.add(new ItemStack(Items.HONEY_BOTTLE))) {
-                    ayj.drop(new ItemStack(Items.HONEY_BOTTLE), false);
+                else if (!bec.inventory.add(new ItemStack(Items.HONEY_BOTTLE))) {
+                    bec.drop(new ItemStack(Items.HONEY_BOTTLE), false);
                 }
-                boolean11 = true;
+                boolean10 = true;
             }
         }
-        if (boolean11) {
-            if (!CampfireBlock.isSmokeyPos(bjw, fk, 5)) {
-                if (this.hiveContainsBees(bjw, fk)) {
-                    this.angerNearbyBees(bjw, fk);
+        if (boolean10) {
+            if (!CampfireBlock.isSmokeyPos(bqb, fu)) {
+                if (this.hiveContainsBees(bqb, fu)) {
+                    this.angerNearbyBees(bqb, fu);
                 }
-                this.releaseBeesAndResetHoneyLevel(bjw, byj, fk, ayj, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY);
+                this.releaseBeesAndResetHoneyLevel(bqb, cfj, fu, bec, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY);
             }
             else {
-                this.resetHoneyLevel(bjw, byj, fk);
-                if (ayj instanceof ServerPlayer) {
-                    CriteriaTriggers.SAFELY_HARVEST_HONEY.trigger((ServerPlayer)ayj, fk, ben9);
-                }
+                this.resetHoneyLevel(bqb, cfj, fu);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
-        return super.use(byj, bjw, fk, ayj, ajk, cvg);
+        return super.use(cfj, bqb, fu, bec, anf, deh);
     }
     
-    private boolean hiveContainsBees(final Level bjw, final BlockPos fk) {
-        final BlockEntity bwl4 = bjw.getBlockEntity(fk);
-        if (bwl4 instanceof BeehiveBlockEntity) {
-            final BeehiveBlockEntity bwi5 = (BeehiveBlockEntity)bwl4;
-            return !bwi5.isEmpty();
+    private boolean hiveContainsBees(final Level bqb, final BlockPos fu) {
+        final BlockEntity cdl4 = bqb.getBlockEntity(fu);
+        if (cdl4 instanceof BeehiveBlockEntity) {
+            final BeehiveBlockEntity cdi5 = (BeehiveBlockEntity)cdl4;
+            return !cdi5.isEmpty();
         }
         return false;
     }
     
-    public void releaseBeesAndResetHoneyLevel(final Level bjw, final BlockState byj, final BlockPos fk, @Nullable final Player ayj, final BeehiveBlockEntity.BeeReleaseStatus b) {
-        this.resetHoneyLevel(bjw, byj, fk);
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof BeehiveBlockEntity) {
-            final BeehiveBlockEntity bwi8 = (BeehiveBlockEntity)bwl7;
-            bwi8.emptyAllLivingFromHive(ayj, byj, b);
+    public void releaseBeesAndResetHoneyLevel(final Level bqb, final BlockState cfj, final BlockPos fu, @Nullable final Player bec, final BeehiveBlockEntity.BeeReleaseStatus b) {
+        this.resetHoneyLevel(bqb, cfj, fu);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof BeehiveBlockEntity) {
+            final BeehiveBlockEntity cdi8 = (BeehiveBlockEntity)cdl7;
+            cdi8.emptyAllLivingFromHive(bec, cfj, b);
         }
     }
     
-    public void resetHoneyLevel(final Level bjw, final BlockState byj, final BlockPos fk) {
-        bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)BeehiveBlock.HONEY_LEVEL, 0), 3);
+    public void resetHoneyLevel(final Level bqb, final BlockState cfj, final BlockPos fu) {
+        bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)BeehiveBlock.HONEY_LEVEL, 0), 3);
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (byj.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL) >= 5) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (cfj.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL) >= 5) {
             for (int integer6 = 0; integer6 < random.nextInt(1) + 1; ++integer6) {
-                this.trySpawnDripParticles(bjw, fk, byj);
+                this.trySpawnDripParticles(bqb, fu, cfj);
             }
         }
     }
     
-    private void trySpawnDripParticles(final Level bjw, final BlockPos fk, final BlockState byj) {
-        if (!byj.getFluidState().isEmpty() || bjw.random.nextFloat() < 0.3f) {
+    private void trySpawnDripParticles(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        if (!cfj.getFluidState().isEmpty() || bqb.random.nextFloat() < 0.3f) {
             return;
         }
-        final VoxelShape cwf5 = byj.getCollisionShape(bjw, fk);
-        final double double6 = cwf5.max(Direction.Axis.Y);
-        if (double6 >= 1.0 && !byj.is(BlockTags.IMPERMEABLE)) {
-            final double double7 = cwf5.min(Direction.Axis.Y);
+        final VoxelShape dfg5 = cfj.getCollisionShape(bqb, fu);
+        final double double6 = dfg5.max(Direction.Axis.Y);
+        if (double6 >= 1.0 && !cfj.is(BlockTags.IMPERMEABLE)) {
+            final double double7 = dfg5.min(Direction.Axis.Y);
             if (double7 > 0.0) {
-                this.spawnParticle(bjw, fk, cwf5, fk.getY() + double7 - 0.05);
+                this.spawnParticle(bqb, fu, dfg5, fu.getY() + double7 - 0.05);
             }
             else {
-                final BlockPos fk2 = fk.below();
-                final BlockState byj2 = bjw.getBlockState(fk2);
-                final VoxelShape cwf6 = byj2.getCollisionShape(bjw, fk2);
-                final double double8 = cwf6.max(Direction.Axis.Y);
-                if ((double8 < 1.0 || !byj2.isCollisionShapeFullBlock(bjw, fk2)) && byj2.getFluidState().isEmpty()) {
-                    this.spawnParticle(bjw, fk, cwf5, fk.getY() - 0.05);
+                final BlockPos fu2 = fu.below();
+                final BlockState cfj2 = bqb.getBlockState(fu2);
+                final VoxelShape dfg6 = cfj2.getCollisionShape(bqb, fu2);
+                final double double8 = dfg6.max(Direction.Axis.Y);
+                if ((double8 < 1.0 || !cfj2.isCollisionShapeFullBlock(bqb, fu2)) && cfj2.getFluidState().isEmpty()) {
+                    this.spawnParticle(bqb, fu, dfg5, fu.getY() - 0.05);
                 }
             }
         }
     }
     
-    private void spawnParticle(final Level bjw, final BlockPos fk, final VoxelShape cwf, final double double4) {
-        this.spawnFluidParticle(bjw, fk.getX() + cwf.min(Direction.Axis.X), fk.getX() + cwf.max(Direction.Axis.X), fk.getZ() + cwf.min(Direction.Axis.Z), fk.getZ() + cwf.max(Direction.Axis.Z), double4);
+    private void spawnParticle(final Level bqb, final BlockPos fu, final VoxelShape dfg, final double double4) {
+        this.spawnFluidParticle(bqb, fu.getX() + dfg.min(Direction.Axis.X), fu.getX() + dfg.max(Direction.Axis.X), fu.getZ() + dfg.min(Direction.Axis.Z), fu.getZ() + dfg.max(Direction.Axis.Z), double4);
     }
     
-    private void spawnFluidParticle(final Level bjw, final double double2, final double double3, final double double4, final double double5, final double double6) {
-        bjw.addParticle(ParticleTypes.DRIPPING_HONEY, Mth.lerp(bjw.random.nextDouble(), double2, double3), double6, Mth.lerp(bjw.random.nextDouble(), double4, double5), 0.0, 0.0, 0.0);
+    private void spawnFluidParticle(final Level bqb, final double double2, final double double3, final double double4, final double double5, final double double6) {
+        bqb.addParticle(ParticleTypes.DRIPPING_HONEY, Mth.lerp(bqb.random.nextDouble(), double2, double3), double6, Mth.lerp(bqb.random.nextDouble(), double4, double5), 0.0, 0.0, 0.0);
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BeehiveBlock.FACING, bcq.getHorizontalDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BeehiveBlock.FACING, bin.getHorizontalDirection().getOpposite());
     }
     
     @Override
@@ -219,67 +218,71 @@ public class BeehiveBlock extends BaseEntityBlock {
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Nullable
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new BeehiveBlockEntity();
     }
     
     @Override
-    public void playerWillDestroy(final Level bjw, final BlockPos fk, final BlockState byj, final Player ayj) {
-        if (!bjw.isClientSide && ayj.isCreative() && bjw.getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS)) {
-            final BlockEntity bwl6 = bjw.getBlockEntity(fk);
-            if (bwl6 instanceof BeehiveBlockEntity) {
-                final BeehiveBlockEntity bwi7 = (BeehiveBlockEntity)bwl6;
-                final ItemStack ben8 = new ItemStack(this);
-                final int integer9 = byj.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL);
-                final boolean boolean10 = !bwi7.isEmpty();
+    public void playerWillDestroy(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        if (!bqb.isClientSide && bec.isCreative() && bqb.getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS)) {
+            final BlockEntity cdl6 = bqb.getBlockEntity(fu);
+            if (cdl6 instanceof BeehiveBlockEntity) {
+                final BeehiveBlockEntity cdi7 = (BeehiveBlockEntity)cdl6;
+                final ItemStack bki8 = new ItemStack(this);
+                final int integer9 = cfj.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL);
+                final boolean boolean10 = !cdi7.isEmpty();
                 if (!boolean10 && integer9 == 0) {
                     return;
                 }
                 if (boolean10) {
-                    final CompoundTag jt11 = new CompoundTag();
-                    jt11.put("Bees", bwi7.writeBees());
-                    ben8.addTagElement("BlockEntityTag", jt11);
+                    final CompoundTag le11 = new CompoundTag();
+                    le11.put("Bees", cdi7.writeBees());
+                    bki8.addTagElement("BlockEntityTag", le11);
                 }
-                final CompoundTag jt11 = new CompoundTag();
-                jt11.putInt("honey_level", integer9);
-                ben8.addTagElement("BlockStateTag", jt11);
-                final ItemEntity awb12 = new ItemEntity(bjw, fk.getX(), fk.getY(), fk.getZ(), ben8);
-                awb12.setDefaultPickUpDelay();
-                bjw.addFreshEntity(awb12);
+                final CompoundTag le11 = new CompoundTag();
+                le11.putInt("honey_level", integer9);
+                bki8.addTagElement("BlockStateTag", le11);
+                final ItemEntity bbg12 = new ItemEntity(bqb, fu.getX(), fu.getY(), fu.getZ(), bki8);
+                bbg12.setDefaultPickUpDelay();
+                bqb.addFreshEntity(bbg12);
             }
         }
-        super.playerWillDestroy(bjw, fk, byj, ayj);
+        super.playerWillDestroy(bqb, fu, cfj, bec);
     }
     
     @Override
-    public List<ItemStack> getDrops(final BlockState byj, final LootContext.Builder a) {
-        final Entity akq4 = a.<Entity>getOptionalParameter(LootContextParams.THIS_ENTITY);
-        if (akq4 instanceof PrimedTnt || akq4 instanceof Creeper || akq4 instanceof WitherSkull || akq4 instanceof WitherBoss || akq4 instanceof MinecartTNT) {
-            final BlockEntity bwl5 = a.<BlockEntity>getOptionalParameter(LootContextParams.BLOCK_ENTITY);
-            if (bwl5 instanceof BeehiveBlockEntity) {
-                final BeehiveBlockEntity bwi6 = (BeehiveBlockEntity)bwl5;
-                bwi6.emptyAllLivingFromHive(null, byj, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY);
+    public List<ItemStack> getDrops(final BlockState cfj, final LootContext.Builder a) {
+        final Entity aom4 = a.<Entity>getOptionalParameter(LootContextParams.THIS_ENTITY);
+        if (aom4 instanceof PrimedTnt || aom4 instanceof Creeper || aom4 instanceof WitherSkull || aom4 instanceof WitherBoss || aom4 instanceof MinecartTNT) {
+            final BlockEntity cdl5 = a.<BlockEntity>getOptionalParameter(LootContextParams.BLOCK_ENTITY);
+            if (cdl5 instanceof BeehiveBlockEntity) {
+                final BeehiveBlockEntity cdi6 = (BeehiveBlockEntity)cdl5;
+                cdi6.emptyAllLivingFromHive(null, cfj, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY);
             }
         }
-        return super.getDrops(byj, a);
+        return super.getDrops(cfj, a);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (bjx.getBlockState(fk6).getBlock() instanceof FireBlock) {
-            final BlockEntity bwl8 = bjx.getBlockEntity(fk5);
-            if (bwl8 instanceof BeehiveBlockEntity) {
-                final BeehiveBlockEntity bwi9 = (BeehiveBlockEntity)bwl8;
-                bwi9.emptyAllLivingFromHive(null, byj1, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (bqc.getBlockState(fu6).getBlock() instanceof FireBlock) {
+            final BlockEntity cdl8 = bqc.getBlockEntity(fu5);
+            if (cdl8 instanceof BeehiveBlockEntity) {
+                final BeehiveBlockEntity cdi9 = (BeehiveBlockEntity)cdl8;
+                cdi9.emptyAllLivingFromHive(null, cfj1, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY);
             }
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
+    }
+    
+    public static Direction getRandomOffset(final Random random) {
+        return Util.<Direction>getRandom(BeehiveBlock.SPAWN_DIRECTIONS, random);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/BeetrootBlock.java b/src/net/minecraft/world/level/block/BeetrootBlock.java
index f7a51a6..90c12eb 100644
--- a/src/net/minecraft/world/level/block/BeetrootBlock.java
+++ b/src/net/minecraft/world/level/block/BeetrootBlock.java
@@ -12,6 +12,7 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -39,15 +40,15 @@ public class BeetrootBlock extends CropBlock {
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
         if (random.nextInt(3) != 0) {
-            super.tick(byj, xd, fk, random);
+            super.randomTick(cfj, zd, fu, random);
         }
     }
     
     @Override
-    protected int getBonemealAgeIncrease(final Level bjw) {
-        return super.getBonemealAgeIncrease(bjw) / 3;
+    protected int getBonemealAgeIncrease(final Level bqb) {
+        return super.getBonemealAgeIncrease(bqb) / 3;
     }
     
     @Override
@@ -56,8 +57,8 @@ public class BeetrootBlock extends CropBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return BeetrootBlock.SHAPE_BY_AGE[byj.<Integer>getValue((Property<Integer>)this.getAgeProperty())];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return BeetrootBlock.SHAPE_BY_AGE[cfj.<Integer>getValue((Property<Integer>)this.getAgeProperty())];
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/BellBlock.java b/src/net/minecraft/world/level/block/BellBlock.java
index 52c2f74..2abe0f4 100644
--- a/src/net/minecraft/world/level/block/BellBlock.java
+++ b/src/net/minecraft/world/level/block/BellBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
@@ -19,15 +19,16 @@ import net.minecraft.stats.Stats;
 import javax.annotation.Nullable;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.projectile.Projectile;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.BellAttachType;
@@ -36,7 +37,7 @@ import net.minecraft.world.level.block.state.properties.DirectionProperty;
 
 public class BellBlock extends BaseEntityBlock {
     public static final DirectionProperty FACING;
-    private static final EnumProperty<BellAttachType> ATTACHMENT;
+    public static final EnumProperty<BellAttachType> ATTACHMENT;
     public static final BooleanProperty POWERED;
     private static final VoxelShape NORTH_SOUTH_FLOOR_SHAPE;
     private static final VoxelShape EAST_WEST_FLOOR_SHAPE;
@@ -53,61 +54,59 @@ public class BellBlock extends BaseEntityBlock {
     
     public BellBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BellBlock.FACING, Direction.NORTH)).setValue(BellBlock.ATTACHMENT, BellAttachType.FLOOR)).<Comparable, Boolean>setValue((Property<Comparable>)BellBlock.POWERED, false));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BellBlock.FACING, Direction.NORTH)).setValue(BellBlock.ATTACHMENT, BellAttachType.FLOOR)).<Comparable, Boolean>setValue((Property<Comparable>)BellBlock.POWERED, false));
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        final boolean boolean7 = bjw.hasNeighborSignal(fk3);
-        if (boolean7 != byj.<Boolean>getValue((Property<Boolean>)BellBlock.POWERED)) {
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        final boolean boolean7 = bqb.hasNeighborSignal(fu3);
+        if (boolean7 != cfj.<Boolean>getValue((Property<Boolean>)BellBlock.POWERED)) {
             if (boolean7) {
-                this.attemptToRing(bjw, fk3, null);
+                this.attemptToRing(bqb, fu3, null);
             }
-            bjw.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)BellBlock.POWERED, boolean7), 3);
+            bqb.setBlock(fu3, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)BellBlock.POWERED, boolean7), 3);
         }
     }
     
     @Override
-    public void onProjectileHit(final Level bjw, final BlockState byj, final BlockHitResult cvg, final Entity akq) {
-        if (akq instanceof AbstractArrow) {
-            final Entity akq2 = ((AbstractArrow)akq).getOwner();
-            final Player ayj7 = (akq2 instanceof Player) ? ((Player)akq2) : null;
-            this.onHit(bjw, byj, cvg, ayj7, true);
-        }
+    public void onProjectileHit(final Level bqb, final BlockState cfj, final BlockHitResult deh, final Projectile bes) {
+        final Entity aom6 = bes.getOwner();
+        final Player bec7 = (aom6 instanceof Player) ? ((Player)aom6) : null;
+        this.onHit(bqb, cfj, deh, bec7, true);
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        return this.onHit(bjw, byj, cvg, ayj, true) ? InteractionResult.SUCCESS : InteractionResult.PASS;
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        return this.onHit(bqb, cfj, deh, bec, true) ? InteractionResult.sidedSuccess(bqb.isClientSide) : InteractionResult.PASS;
     }
     
-    public boolean onHit(final Level bjw, final BlockState byj, final BlockHitResult cvg, @Nullable final Player ayj, final boolean boolean5) {
-        final Direction fp7 = cvg.getDirection();
-        final BlockPos fk8 = cvg.getBlockPos();
-        final boolean boolean6 = !boolean5 || this.isProperHit(byj, fp7, cvg.getLocation().y - fk8.getY());
+    public boolean onHit(final Level bqb, final BlockState cfj, final BlockHitResult deh, @Nullable final Player bec, final boolean boolean5) {
+        final Direction fz7 = deh.getDirection();
+        final BlockPos fu8 = deh.getBlockPos();
+        final boolean boolean6 = !boolean5 || this.isProperHit(cfj, fz7, deh.getLocation().y - fu8.getY());
         if (boolean6) {
-            final boolean boolean7 = this.attemptToRing(bjw, fk8, fp7);
-            if (boolean7 && ayj != null) {
-                ayj.awardStat(Stats.BELL_RING);
+            final boolean boolean7 = this.attemptToRing(bqb, fu8, fz7);
+            if (boolean7 && bec != null) {
+                bec.awardStat(Stats.BELL_RING);
             }
             return true;
         }
         return false;
     }
     
-    private boolean isProperHit(final BlockState byj, final Direction fp, final double double3) {
-        if (fp.getAxis() == Direction.Axis.Y || double3 > 0.8123999834060669) {
+    private boolean isProperHit(final BlockState cfj, final Direction fz, final double double3) {
+        if (fz.getAxis() == Direction.Axis.Y || double3 > 0.8123999834060669) {
             return false;
         }
-        final Direction fp2 = byj.<Direction>getValue((Property<Direction>)BellBlock.FACING);
-        final BellAttachType byz7 = byj.<BellAttachType>getValue(BellBlock.ATTACHMENT);
-        switch (byz7) {
+        final Direction fz2 = cfj.<Direction>getValue((Property<Direction>)BellBlock.FACING);
+        final BellAttachType cfy7 = cfj.<BellAttachType>getValue(BellBlock.ATTACHMENT);
+        switch (cfy7) {
             case FLOOR: {
-                return fp2.getAxis() == fp.getAxis();
+                return fz2.getAxis() == fz.getAxis();
             }
             case SINGLE_WALL:
             case DOUBLE_WALL: {
-                return fp2.getAxis() != fp.getAxis();
+                return fz2.getAxis() != fz.getAxis();
             }
             case CEILING: {
                 return true;
@@ -118,46 +117,46 @@ public class BellBlock extends BaseEntityBlock {
         }
     }
     
-    public boolean attemptToRing(final Level bjw, final BlockPos fk, @Nullable Direction fp) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        if (!bjw.isClientSide && bwl5 instanceof BellBlockEntity) {
-            if (fp == null) {
-                fp = bjw.getBlockState(fk).<Direction>getValue((Property<Direction>)BellBlock.FACING);
+    public boolean attemptToRing(final Level bqb, final BlockPos fu, @Nullable Direction fz) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        if (!bqb.isClientSide && cdl5 instanceof BellBlockEntity) {
+            if (fz == null) {
+                fz = bqb.getBlockState(fu).<Direction>getValue((Property<Direction>)BellBlock.FACING);
             }
-            ((BellBlockEntity)bwl5).onHit(fp);
-            bjw.playSound(null, fk, SoundEvents.BELL_BLOCK, SoundSource.BLOCKS, 2.0f, 1.0f);
+            ((BellBlockEntity)cdl5).onHit(fz);
+            bqb.playSound(null, fu, SoundEvents.BELL_BLOCK, SoundSource.BLOCKS, 2.0f, 1.0f);
             return true;
         }
         return false;
     }
     
-    private VoxelShape getVoxelShape(final BlockState byj) {
-        final Direction fp3 = byj.<Direction>getValue((Property<Direction>)BellBlock.FACING);
-        final BellAttachType byz4 = byj.<BellAttachType>getValue(BellBlock.ATTACHMENT);
-        if (byz4 == BellAttachType.FLOOR) {
-            if (fp3 == Direction.NORTH || fp3 == Direction.SOUTH) {
+    private VoxelShape getVoxelShape(final BlockState cfj) {
+        final Direction fz3 = cfj.<Direction>getValue((Property<Direction>)BellBlock.FACING);
+        final BellAttachType cfy4 = cfj.<BellAttachType>getValue(BellBlock.ATTACHMENT);
+        if (cfy4 == BellAttachType.FLOOR) {
+            if (fz3 == Direction.NORTH || fz3 == Direction.SOUTH) {
                 return BellBlock.NORTH_SOUTH_FLOOR_SHAPE;
             }
             return BellBlock.EAST_WEST_FLOOR_SHAPE;
         }
         else {
-            if (byz4 == BellAttachType.CEILING) {
+            if (cfy4 == BellAttachType.CEILING) {
                 return BellBlock.CEILING_SHAPE;
             }
-            if (byz4 == BellAttachType.DOUBLE_WALL) {
-                if (fp3 == Direction.NORTH || fp3 == Direction.SOUTH) {
+            if (cfy4 == BellAttachType.DOUBLE_WALL) {
+                if (fz3 == Direction.NORTH || fz3 == Direction.SOUTH) {
                     return BellBlock.NORTH_SOUTH_BETWEEN;
                 }
                 return BellBlock.EAST_WEST_BETWEEN;
             }
             else {
-                if (fp3 == Direction.NORTH) {
+                if (fz3 == Direction.NORTH) {
                     return BellBlock.TO_NORTH;
                 }
-                if (fp3 == Direction.SOUTH) {
+                if (fz3 == Direction.SOUTH) {
                     return BellBlock.TO_SOUTH;
                 }
-                if (fp3 == Direction.EAST) {
+                if (fz3 == Direction.EAST) {
                     return BellBlock.TO_EAST;
                 }
                 return BellBlock.TO_WEST;
@@ -166,73 +165,77 @@ public class BellBlock extends BaseEntityBlock {
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return this.getVoxelShape(byj);
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.getVoxelShape(cfj);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return this.getVoxelShape(byj);
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.getVoxelShape(cfj);
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final Direction fp4 = bcq.getClickedFace();
-        final BlockPos fk5 = bcq.getClickedPos();
-        final Level bjw6 = bcq.getLevel();
-        final Direction.Axis a7 = fp4.getAxis();
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final Direction fz4 = bin.getClickedFace();
+        final BlockPos fu5 = bin.getClickedPos();
+        final Level bqb6 = bin.getLevel();
+        final Direction.Axis a7 = fz4.getAxis();
         if (a7 == Direction.Axis.Y) {
-            final BlockState byj3 = (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue(BellBlock.ATTACHMENT, (fp4 == Direction.DOWN) ? BellAttachType.CEILING : BellAttachType.FLOOR)).<Comparable, Direction>setValue((Property<Comparable>)BellBlock.FACING, bcq.getHorizontalDirection());
-            if (byj3.canSurvive(bcq.getLevel(), fk5)) {
-                return byj3;
+            final BlockState cfj3 = (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue(BellBlock.ATTACHMENT, (fz4 == Direction.DOWN) ? BellAttachType.CEILING : BellAttachType.FLOOR)).<Comparable, Direction>setValue((Property<Comparable>)BellBlock.FACING, bin.getHorizontalDirection());
+            if (cfj3.canSurvive(bin.getLevel(), fu5)) {
+                return cfj3;
             }
         }
         else {
-            final boolean boolean8 = (a7 == Direction.Axis.X && bjw6.getBlockState(fk5.west()).isFaceSturdy(bjw6, fk5.west(), Direction.EAST) && bjw6.getBlockState(fk5.east()).isFaceSturdy(bjw6, fk5.east(), Direction.WEST)) || (a7 == Direction.Axis.Z && bjw6.getBlockState(fk5.north()).isFaceSturdy(bjw6, fk5.north(), Direction.SOUTH) && bjw6.getBlockState(fk5.south()).isFaceSturdy(bjw6, fk5.south(), Direction.NORTH));
-            BlockState byj3 = (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)BellBlock.FACING, fp4.getOpposite())).<BellAttachType, BellAttachType>setValue(BellBlock.ATTACHMENT, boolean8 ? BellAttachType.DOUBLE_WALL : BellAttachType.SINGLE_WALL);
-            if (byj3.canSurvive(bcq.getLevel(), bcq.getClickedPos())) {
-                return byj3;
+            final boolean boolean8 = (a7 == Direction.Axis.X && bqb6.getBlockState(fu5.west()).isFaceSturdy(bqb6, fu5.west(), Direction.EAST) && bqb6.getBlockState(fu5.east()).isFaceSturdy(bqb6, fu5.east(), Direction.WEST)) || (a7 == Direction.Axis.Z && bqb6.getBlockState(fu5.north()).isFaceSturdy(bqb6, fu5.north(), Direction.SOUTH) && bqb6.getBlockState(fu5.south()).isFaceSturdy(bqb6, fu5.south(), Direction.NORTH));
+            BlockState cfj3 = (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)BellBlock.FACING, fz4.getOpposite())).<BellAttachType, BellAttachType>setValue(BellBlock.ATTACHMENT, boolean8 ? BellAttachType.DOUBLE_WALL : BellAttachType.SINGLE_WALL);
+            if (cfj3.canSurvive(bin.getLevel(), bin.getClickedPos())) {
+                return cfj3;
             }
-            final boolean boolean9 = bjw6.getBlockState(fk5.below()).isFaceSturdy(bjw6, fk5.below(), Direction.UP);
-            byj3 = ((AbstractStateHolder<O, BlockState>)byj3).<BellAttachType, BellAttachType>setValue(BellBlock.ATTACHMENT, boolean9 ? BellAttachType.FLOOR : BellAttachType.CEILING);
-            if (byj3.canSurvive(bcq.getLevel(), bcq.getClickedPos())) {
-                return byj3;
+            final boolean boolean9 = bqb6.getBlockState(fu5.below()).isFaceSturdy(bqb6, fu5.below(), Direction.UP);
+            cfj3 = ((StateHolder<O, BlockState>)cfj3).<BellAttachType, BellAttachType>setValue(BellBlock.ATTACHMENT, boolean9 ? BellAttachType.FLOOR : BellAttachType.CEILING);
+            if (cfj3.canSurvive(bin.getLevel(), bin.getClickedPos())) {
+                return cfj3;
             }
         }
         return null;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        final BellAttachType byz8 = byj1.<BellAttachType>getValue(BellBlock.ATTACHMENT);
-        final Direction fp2 = getConnectedDirection(byj1).getOpposite();
-        if (fp2 == fp && !byj1.canSurvive(bjx, fk5) && byz8 != BellAttachType.DOUBLE_WALL) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        final BellAttachType cfy8 = cfj1.<BellAttachType>getValue(BellBlock.ATTACHMENT);
+        final Direction fz2 = getConnectedDirection(cfj1).getOpposite();
+        if (fz2 == fz && !cfj1.canSurvive(bqc, fu5) && cfy8 != BellAttachType.DOUBLE_WALL) {
             return Blocks.AIR.defaultBlockState();
         }
-        if (fp.getAxis() == byj1.<Direction>getValue((Property<Direction>)BellBlock.FACING).getAxis()) {
-            if (byz8 == BellAttachType.DOUBLE_WALL && !byj3.isFaceSturdy(bjx, fk6, fp)) {
-                return (((AbstractStateHolder<O, BlockState>)byj1).setValue(BellBlock.ATTACHMENT, BellAttachType.SINGLE_WALL)).<Comparable, Direction>setValue((Property<Comparable>)BellBlock.FACING, fp.getOpposite());
+        if (fz.getAxis() == cfj1.<Direction>getValue((Property<Direction>)BellBlock.FACING).getAxis()) {
+            if (cfy8 == BellAttachType.DOUBLE_WALL && !cfj3.isFaceSturdy(bqc, fu6, fz)) {
+                return (((StateHolder<O, BlockState>)cfj1).setValue(BellBlock.ATTACHMENT, BellAttachType.SINGLE_WALL)).<Comparable, Direction>setValue((Property<Comparable>)BellBlock.FACING, fz.getOpposite());
             }
-            if (byz8 == BellAttachType.SINGLE_WALL && fp2.getOpposite() == fp && byj3.isFaceSturdy(bjx, fk6, byj1.<Direction>getValue((Property<Direction>)BellBlock.FACING))) {
-                return ((AbstractStateHolder<O, BlockState>)byj1).<BellAttachType, BellAttachType>setValue(BellBlock.ATTACHMENT, BellAttachType.DOUBLE_WALL);
+            if (cfy8 == BellAttachType.SINGLE_WALL && fz2.getOpposite() == fz && cfj3.isFaceSturdy(bqc, fu6, cfj1.<Direction>getValue((Property<Direction>)BellBlock.FACING))) {
+                return ((StateHolder<O, BlockState>)cfj1).<BellAttachType, BellAttachType>setValue(BellBlock.ATTACHMENT, BellAttachType.DOUBLE_WALL);
             }
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return FaceAttachedHorizontalDirectionalBlock.canAttach(bjz, fk, getConnectedDirection(byj).getOpposite());
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final Direction fz5 = getConnectedDirection(cfj).getOpposite();
+        if (fz5 == Direction.UP) {
+            return Block.canSupportCenter(bqd, fu.above(), Direction.DOWN);
+        }
+        return FaceAttachedHorizontalDirectionalBlock.canAttach(bqd, fu, fz5);
     }
     
-    private static Direction getConnectedDirection(final BlockState byj) {
-        switch (byj.<BellAttachType>getValue(BellBlock.ATTACHMENT)) {
+    private static Direction getConnectedDirection(final BlockState cfj) {
+        switch (cfj.<BellAttachType>getValue(BellBlock.ATTACHMENT)) {
             case CEILING: {
                 return Direction.DOWN;
             }
@@ -240,13 +243,13 @@ public class BellBlock extends BaseEntityBlock {
                 return Direction.UP;
             }
             default: {
-                return byj.<Direction>getValue((Property<Direction>)BellBlock.FACING).getOpposite();
+                return cfj.<Direction>getValue((Property<Direction>)BellBlock.FACING).getOpposite();
             }
         }
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.DESTROY;
     }
     
@@ -257,12 +260,12 @@ public class BellBlock extends BaseEntityBlock {
     
     @Nullable
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new BellBlockEntity();
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/BlastFurnaceBlock.java b/src/net/minecraft/world/level/block/BlastFurnaceBlock.java
index a6b64cb..33c6501 100644
--- a/src/net/minecraft/world/level/block/BlastFurnaceBlock.java
+++ b/src/net/minecraft/world/level/block/BlastFurnaceBlock.java
@@ -16,6 +16,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlastFurnaceBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class BlastFurnaceBlock extends AbstractFurnaceBlock {
     protected BlastFurnaceBlock(final Properties c) {
@@ -23,37 +24,37 @@ public class BlastFurnaceBlock extends AbstractFurnaceBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new BlastFurnaceBlockEntity();
     }
     
     @Override
-    protected void openContainer(final Level bjw, final BlockPos fk, final Player ayj) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        if (bwl5 instanceof BlastFurnaceBlockEntity) {
-            ayj.openMenu((MenuProvider)bwl5);
-            ayj.awardStat(Stats.INTERACT_WITH_BLAST_FURNACE);
+    protected void openContainer(final Level bqb, final BlockPos fu, final Player bec) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        if (cdl5 instanceof BlastFurnaceBlockEntity) {
+            bec.openMenu((MenuProvider)cdl5);
+            bec.awardStat(Stats.INTERACT_WITH_BLAST_FURNACE);
         }
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)BlastFurnaceBlock.LIT)) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)BlastFurnaceBlock.LIT)) {
             return;
         }
-        final double double6 = fk.getX() + 0.5;
-        final double double7 = fk.getY();
-        final double double8 = fk.getZ() + 0.5;
+        final double double6 = fu.getX() + 0.5;
+        final double double7 = fu.getY();
+        final double double8 = fu.getZ() + 0.5;
         if (random.nextDouble() < 0.1) {
-            bjw.playLocalSound(double6, double7, double8, SoundEvents.BLASTFURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0f, 1.0f, false);
+            bqb.playLocalSound(double6, double7, double8, SoundEvents.BLASTFURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0f, 1.0f, false);
         }
-        final Direction fp12 = byj.<Direction>getValue((Property<Direction>)BlastFurnaceBlock.FACING);
-        final Direction.Axis a13 = fp12.getAxis();
+        final Direction fz12 = cfj.<Direction>getValue((Property<Direction>)BlastFurnaceBlock.FACING);
+        final Direction.Axis a13 = fz12.getAxis();
         final double double9 = 0.52;
         final double double10 = random.nextDouble() * 0.6 - 0.3;
-        final double double11 = (a13 == Direction.Axis.X) ? (fp12.getStepX() * 0.52) : double10;
+        final double double11 = (a13 == Direction.Axis.X) ? (fz12.getStepX() * 0.52) : double10;
         final double double12 = random.nextDouble() * 9.0 / 16.0;
-        final double double13 = (a13 == Direction.Axis.Z) ? (fp12.getStepZ() * 0.52) : double10;
-        bjw.addParticle(ParticleTypes.SMOKE, double6 + double11, double7 + double12, double8 + double13, 0.0, 0.0, 0.0);
+        final double double13 = (a13 == Direction.Axis.Z) ? (fz12.getStepZ() * 0.52) : double10;
+        bqb.addParticle(ParticleTypes.SMOKE, double6 + double11, double7 + double12, double8 + double13, 0.0, 0.0, 0.0);
     }
 }
diff --git a/src/net/minecraft/world/level/block/Block.java b/src/net/minecraft/world/level/block/Block.java
index 87606e5..7054e32 100644
--- a/src/net/minecraft/world/level/block/Block.java
+++ b/src/net/minecraft/world/level/block/Block.java
@@ -1,58 +1,41 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.item.DyeColor;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.CacheBuilder;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.material.Fluids;
-import net.minecraft.world.level.material.FluidState;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.monster.piglin.PiglinAi;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.level.material.PushReaction;
 import net.minecraft.Util;
+import net.minecraft.core.Registry;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.entity.ExperienceOrb;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.level.GameRules;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.storage.loot.LootTable;
-import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import java.util.Collections;
-import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.core.Registry;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.network.protocol.game.DebugPackets;
-import java.util.Random;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.server.level.ServerLevel;
+import java.util.Random;
 import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraft.world.item.BlockPlaceContext;
-import net.minecraft.tags.FluidTags;
-import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.Tag;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.tags.Tag;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Stream;
+import net.minecraft.core.Direction;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.BooleanOp;
@@ -63,279 +46,132 @@ import net.minecraft.world.item.BlockItem;
 import it.unimi.dsi.fastutil.objects.Object2ByteLinkedOpenHashMap;
 import net.minecraft.world.item.Item;
 import javax.annotation.Nullable;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.world.level.material.MaterialColor;
-import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import com.google.common.cache.LoadingCache;
-import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.IdMapper;
 import org.apache.logging.log4j.Logger;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
-public class Block implements ItemLike {
+public class Block extends BlockBehaviour implements ItemLike {
     protected static final Logger LOGGER;
     public static final IdMapper<BlockState> BLOCK_STATE_REGISTRY;
-    private static final Direction[] UPDATE_SHAPE_ORDER;
     private static final LoadingCache<VoxelShape, Boolean> SHAPE_FULL_BLOCK_CACHE;
     private static final VoxelShape RIGID_SUPPORT_SHAPE;
     private static final VoxelShape CENTER_SUPPORT_SHAPE;
-    protected final int lightEmission;
-    protected final float destroySpeed;
-    protected final float explosionResistance;
-    protected final boolean isTicking;
-    protected final SoundType soundType;
-    protected final Material material;
-    protected final MaterialColor materialColor;
-    private final float friction;
-    private final float speedFactor;
-    private final float jumpFactor;
     protected final StateDefinition<Block, BlockState> stateDefinition;
     private BlockState defaultBlockState;
-    protected final boolean hasCollision;
-    private final boolean dynamicShape;
-    private final boolean canOcclude;
-    @Nullable
-    private ResourceLocation drops;
     @Nullable
     private String descriptionId;
     @Nullable
     private Item item;
     private static final ThreadLocal<Object2ByteLinkedOpenHashMap<BlockStatePairKey>> OCCLUSION_CACHE;
     
-    public static int getId(@Nullable final BlockState byj) {
-        if (byj == null) {
+    public static int getId(@Nullable final BlockState cfj) {
+        if (cfj == null) {
             return 0;
         }
-        final int integer2 = Block.BLOCK_STATE_REGISTRY.getId(byj);
+        final int integer2 = Block.BLOCK_STATE_REGISTRY.getId(cfj);
         return (integer2 == -1) ? 0 : integer2;
     }
     
     public static BlockState stateById(final int integer) {
-        final BlockState byj2 = Block.BLOCK_STATE_REGISTRY.byId(integer);
-        return (byj2 == null) ? Blocks.AIR.defaultBlockState() : byj2;
+        final BlockState cfj2 = Block.BLOCK_STATE_REGISTRY.byId(integer);
+        return (cfj2 == null) ? Blocks.AIR.defaultBlockState() : cfj2;
     }
     
-    public static Block byItem(@Nullable final Item bei) {
-        if (bei instanceof BlockItem) {
-            return ((BlockItem)bei).getBlock();
+    public static Block byItem(@Nullable final Item bke) {
+        if (bke instanceof BlockItem) {
+            return ((BlockItem)bke).getBlock();
         }
         return Blocks.AIR;
     }
     
-    public static BlockState pushEntitiesUp(final BlockState byj1, final BlockState byj2, final Level bjw, final BlockPos fk) {
-        final VoxelShape cwf5 = Shapes.joinUnoptimized(byj1.getCollisionShape(bjw, fk), byj2.getCollisionShape(bjw, fk), BooleanOp.ONLY_SECOND).move(fk.getX(), fk.getY(), fk.getZ());
-        final List<Entity> list6 = bjw.getEntities(null, cwf5.bounds());
-        for (final Entity akq8 : list6) {
-            final double double9 = Shapes.collide(Direction.Axis.Y, akq8.getBoundingBox().move(0.0, 1.0, 0.0), Stream.<VoxelShape>of(cwf5), -1.0);
-            akq8.teleportTo(akq8.getX(), akq8.getY() + 1.0 + double9, akq8.getZ());
+    public static BlockState pushEntitiesUp(final BlockState cfj1, final BlockState cfj2, final Level bqb, final BlockPos fu) {
+        final VoxelShape dfg5 = Shapes.joinUnoptimized(cfj1.getCollisionShape(bqb, fu), cfj2.getCollisionShape(bqb, fu), BooleanOp.ONLY_SECOND).move(fu.getX(), fu.getY(), fu.getZ());
+        final List<Entity> list6 = bqb.getEntities(null, dfg5.bounds());
+        for (final Entity aom8 : list6) {
+            final double double9 = Shapes.collide(Direction.Axis.Y, aom8.getBoundingBox().move(0.0, 1.0, 0.0), Stream.<VoxelShape>of(dfg5), -1.0);
+            aom8.teleportTo(aom8.getX(), aom8.getY() + 1.0 + double9, aom8.getZ());
         }
-        return byj2;
+        return cfj2;
     }
     
     public static VoxelShape box(final double double1, final double double2, final double double3, final double double4, final double double5, final double double6) {
         return Shapes.box(double1 / 16.0, double2 / 16.0, double3 / 16.0, double4 / 16.0, double5 / 16.0, double6 / 16.0);
     }
     
-    @Deprecated
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return byj.isFaceSturdy(bjg, fk, Direction.UP) && this.lightEmission < 14;
+    public boolean is(final Tag<Block> adf) {
+        return adf.contains(this);
     }
     
-    @Deprecated
-    public boolean isAir(final BlockState byj) {
-        return false;
+    public boolean is(final Block bvr) {
+        return this == bvr;
     }
     
-    @Deprecated
-    public int getLightEmission(final BlockState byj) {
-        return this.lightEmission;
-    }
-    
-    @Deprecated
-    public Material getMaterial(final BlockState byj) {
-        return this.material;
-    }
-    
-    @Deprecated
-    public MaterialColor getMapColor(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return this.materialColor;
-    }
-    
-    @Deprecated
-    public void updateNeighbourShapes(final BlockState byj, final LevelAccessor bjx, final BlockPos fk, final int integer) {
-        try (final BlockPos.PooledMutableBlockPos b6 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (final Direction fp11 : Block.UPDATE_SHAPE_ORDER) {
-                b6.set((Vec3i)fk).move(fp11);
-                final BlockState byj2 = bjx.getBlockState(b6);
-                final BlockState byj3 = byj2.updateShape(fp11.getOpposite(), byj, bjx, b6, fk);
-                updateOrDestroy(byj2, byj3, bjx, b6, integer);
-            }
-        }
-    }
-    
-    public boolean is(final Tag<Block> aaz) {
-        return aaz.contains(this);
-    }
-    
-    public static BlockState updateFromNeighbourShapes(final BlockState byj, final LevelAccessor bjx, final BlockPos fk) {
-        BlockState byj2 = byj;
+    public static BlockState updateFromNeighbourShapes(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu) {
+        BlockState cfj2 = cfj;
         final BlockPos.MutableBlockPos a5 = new BlockPos.MutableBlockPos();
-        for (final Direction fp9 : Block.UPDATE_SHAPE_ORDER) {
-            a5.set(fk).move(fp9);
-            byj2 = byj2.updateShape(fp9, bjx.getBlockState(a5), bjx, fk, a5);
+        for (final Direction fz9 : Block.UPDATE_SHAPE_ORDER) {
+            a5.setWithOffset(fu, fz9);
+            cfj2 = cfj2.updateShape(fz9, bqc.getBlockState(a5), bqc, fu, a5);
         }
-        return byj2;
+        return cfj2;
     }
     
-    public static void updateOrDestroy(final BlockState byj1, final BlockState byj2, final LevelAccessor bjx, final BlockPos fk, final int integer) {
-        if (byj2 != byj1) {
-            if (byj2.isAir()) {
-                if (!bjx.isClientSide()) {
-                    bjx.destroyBlock(fk, (integer & 0x20) == 0x0);
+    public static void updateOrDestroy(final BlockState cfj1, final BlockState cfj2, final LevelAccessor bqc, final BlockPos fu, final int integer) {
+        updateOrDestroy(cfj1, cfj2, bqc, fu, integer, 512);
+    }
+    
+    public static void updateOrDestroy(final BlockState cfj1, final BlockState cfj2, final LevelAccessor bqc, final BlockPos fu, final int integer5, final int integer6) {
+        if (cfj2 != cfj1) {
+            if (cfj2.isAir()) {
+                if (!bqc.isClientSide()) {
+                    bqc.destroyBlock(fu, (integer5 & 0x20) == 0x0, null, integer6);
                 }
             }
             else {
-                bjx.setBlock(fk, byj2, integer & 0xFFFFFFDF);
+                bqc.setBlock(fu, cfj2, integer5 & 0xFFFFFFDF, integer6);
             }
         }
     }
     
-    @Deprecated
-    public void updateIndirectNeighbourShapes(final BlockState byj, final LevelAccessor bjx, final BlockPos fk, final int integer) {
-    }
-    
-    @Deprecated
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        return byj1;
-    }
-    
-    @Deprecated
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return byj;
-    }
-    
-    @Deprecated
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj;
-    }
-    
     public Block(final Properties c) {
+        super(c);
         final StateDefinition.Builder<Block, BlockState> a3 = new StateDefinition.Builder<Block, BlockState>(this);
         this.createBlockStateDefinition(a3);
-        this.material = c.material;
-        this.materialColor = c.materialColor;
-        this.hasCollision = c.hasCollision;
-        this.soundType = c.soundType;
-        this.lightEmission = c.lightEmission;
-        this.explosionResistance = c.explosionResistance;
-        this.destroySpeed = c.destroyTime;
-        this.isTicking = c.isTicking;
-        this.friction = c.friction;
-        this.speedFactor = c.speedFactor;
-        this.jumpFactor = c.jumpFactor;
-        this.dynamicShape = c.dynamicShape;
-        this.drops = c.drops;
-        this.canOcclude = c.canOcclude;
-        this.stateDefinition = a3.<BlockState>create(BlockState::new);
+        this.stateDefinition = a3.create(Block::defaultBlockState, BlockState::new);
         this.registerDefaultState(this.stateDefinition.any());
     }
     
-    public static boolean isExceptionForConnection(final Block bph) {
-        return bph instanceof LeavesBlock || bph == Blocks.BARRIER || bph == Blocks.CARVED_PUMPKIN || bph == Blocks.JACK_O_LANTERN || bph == Blocks.MELON || bph == Blocks.PUMPKIN || bph.is(BlockTags.SHULKER_BOXES);
+    public static boolean isExceptionForConnection(final Block bvr) {
+        return bvr instanceof LeavesBlock || bvr == Blocks.BARRIER || bvr == Blocks.CARVED_PUMPKIN || bvr == Blocks.JACK_O_LANTERN || bvr == Blocks.MELON || bvr == Blocks.PUMPKIN || bvr.is(BlockTags.SHULKER_BOXES);
     }
     
-    @Deprecated
-    public boolean isRedstoneConductor(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.getMaterial().isSolidBlocking() && byj.isCollisionShapeFullBlock(bjg, fk) && !byj.isSignalSource();
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return this.isRandomlyTicking;
     }
     
-    @Deprecated
-    public boolean isSuffocating(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return this.material.blocksMotion() && byj.isCollisionShapeFullBlock(bjg, fk);
-    }
-    
-    @Deprecated
-    public boolean isViewBlocking(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.isSuffocating(bjg, fk);
-    }
-    
-    @Deprecated
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
-        switch (cqr) {
-            case LAND: {
-                return !byj.isCollisionShapeFullBlock(bjg, fk);
-            }
-            case WATER: {
-                return bjg.getFluidState(fk).is(FluidTags.WATER);
-            }
-            case AIR: {
-                return !byj.isCollisionShapeFullBlock(bjg, fk);
-            }
-            default: {
-                return false;
-            }
-        }
-    }
-    
-    @Deprecated
-    public RenderShape getRenderShape(final BlockState byj) {
-        return RenderShape.MODEL;
-    }
-    
-    @Deprecated
-    public boolean canBeReplaced(final BlockState byj, final BlockPlaceContext bcq) {
-        return this.material.isReplaceable() && (bcq.getItemInHand().isEmpty() || bcq.getItemInHand().getItem() != this.asItem());
-    }
-    
-    @Deprecated
-    public boolean canBeReplaced(final BlockState byj, final Fluid coi) {
-        return this.material.isReplaceable() || !this.material.isSolid();
-    }
-    
-    @Deprecated
-    public float getDestroySpeed(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return this.destroySpeed;
-    }
-    
-    public boolean isRandomlyTicking(final BlockState byj) {
-        return this.isTicking;
-    }
-    
-    public boolean isEntityBlock() {
-        return this instanceof EntityBlock;
-    }
-    
-    @Deprecated
-    public boolean hasPostProcess(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return false;
-    }
-    
-    @Deprecated
-    public boolean emissiveRendering(final BlockState byj) {
-        return false;
-    }
-    
-    public static boolean shouldRenderFace(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        final BlockPos fk2 = fk.relative(fp);
-        final BlockState byj2 = bjg.getBlockState(fk2);
-        if (byj.skipRendering(byj2, fp)) {
+    public static boolean shouldRenderFace(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        final BlockPos fu2 = fu.relative(fz);
+        final BlockState cfj2 = bpg.getBlockState(fu2);
+        if (cfj.skipRendering(cfj2, fz)) {
             return false;
         }
-        if (!byj2.canOcclude()) {
+        if (!cfj2.canOcclude()) {
             return true;
         }
-        final BlockStatePairKey a7 = new BlockStatePairKey(byj, byj2, fp);
+        final BlockStatePairKey a7 = new BlockStatePairKey(cfj, cfj2, fz);
         final Object2ByteLinkedOpenHashMap<BlockStatePairKey> object2ByteLinkedOpenHashMap8 = Block.OCCLUSION_CACHE.get();
         final byte byte9 = object2ByteLinkedOpenHashMap8.getAndMoveToFirst(a7);
         if (byte9 != 127) {
             return byte9 != 0;
         }
-        final VoxelShape cwf10 = byj.getFaceOcclusionShape(bjg, fk, fp);
-        final VoxelShape cwf11 = byj2.getFaceOcclusionShape(bjg, fk2, fp.getOpposite());
-        final boolean boolean12 = Shapes.joinIsNotEmpty(cwf10, cwf11, BooleanOp.ONLY_FIRST);
+        final VoxelShape dfg10 = cfj.getFaceOcclusionShape(bpg, fu, fz);
+        final VoxelShape dfg11 = cfj2.getFaceOcclusionShape(bpg, fu2, fz.getOpposite());
+        final boolean boolean12 = Shapes.joinIsNotEmpty(dfg10, dfg11, BooleanOp.ONLY_FIRST);
         if (object2ByteLinkedOpenHashMap8.size() == 2048) {
             object2ByteLinkedOpenHashMap8.removeLastByte();
         }
@@ -343,206 +179,89 @@ public class Block implements ItemLike {
         return boolean12;
     }
     
-    @Deprecated
-    public final boolean canOcclude(final BlockState byj) {
-        return this.canOcclude;
+    public static boolean canSupportRigidBlock(final BlockGetter bpg, final BlockPos fu) {
+        final BlockState cfj3 = bpg.getBlockState(fu);
+        return (cfj3.isCollisionShapeFullBlock(bpg, fu) && cfj3.isFaceSturdy(bpg, fu, Direction.UP)) || !Shapes.joinIsNotEmpty(cfj3.getBlockSupportShape(bpg, fu).getFaceShape(Direction.UP), Block.RIGID_SUPPORT_SHAPE, BooleanOp.ONLY_SECOND);
     }
     
-    @Deprecated
-    public boolean skipRendering(final BlockState byj1, final BlockState byj2, final Direction fp) {
-        return false;
+    public static boolean canSupportCenter(final LevelReader bqd, final BlockPos fu, final Direction fz) {
+        final BlockState cfj4 = bqd.getBlockState(fu);
+        return (fz != Direction.DOWN || !cfj4.is(BlockTags.UNSTABLE_BOTTOM_CENTER)) && !Shapes.joinIsNotEmpty(cfj4.getBlockSupportShape(bqd, fu).getFaceShape(fz), Block.CENTER_SUPPORT_SHAPE, BooleanOp.ONLY_SECOND);
     }
     
-    @Deprecated
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return Shapes.block();
+    public static boolean isFaceSturdy(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return isFaceFull(cfj.getBlockSupportShape(bpg, fu), fz);
     }
     
-    @Deprecated
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return this.hasCollision ? byj.getShape(bjg, fk) : Shapes.empty();
+    public static boolean isFaceFull(final VoxelShape dfg, final Direction fz) {
+        final VoxelShape dfg2 = dfg.getFaceShape(fz);
+        return isShapeFullBlock(dfg2);
     }
     
-    @Deprecated
-    public VoxelShape getOcclusionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.getShape(bjg, fk);
+    public static boolean isShapeFullBlock(final VoxelShape dfg) {
+        return Block.SHAPE_FULL_BLOCK_CACHE.getUnchecked(dfg);
     }
     
-    @Deprecated
-    public VoxelShape getInteractionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return Shapes.empty();
+    public boolean propagatesSkylightDown(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return !isShapeFullBlock(cfj.getShape(bpg, fu)) && cfj.getFluidState().isEmpty();
     }
     
-    public static boolean canSupportRigidBlock(final BlockGetter bjg, final BlockPos fk) {
-        final BlockState byj3 = bjg.getBlockState(fk);
-        return !byj3.is(BlockTags.LEAVES) && !Shapes.joinIsNotEmpty(byj3.getCollisionShape(bjg, fk).getFaceShape(Direction.UP), Block.RIGID_SUPPORT_SHAPE, BooleanOp.ONLY_SECOND);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
     }
     
-    public static boolean canSupportCenter(final LevelReader bjz, final BlockPos fk, final Direction fp) {
-        final BlockState byj4 = bjz.getBlockState(fk);
-        return !byj4.is(BlockTags.LEAVES) && !Shapes.joinIsNotEmpty(byj4.getCollisionShape(bjz, fk).getFaceShape(fp), Block.CENTER_SUPPORT_SHAPE, BooleanOp.ONLY_SECOND);
+    public void destroy(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj) {
     }
     
-    public static boolean isFaceSturdy(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return !byj.is(BlockTags.LEAVES) && isFaceFull(byj.getCollisionShape(bjg, fk), fp);
+    public static List<ItemStack> getDrops(final BlockState cfj, final ServerLevel zd, final BlockPos fu, @Nullable final BlockEntity cdl) {
+        final LootContext.Builder a5 = new LootContext.Builder(zd).withRandom(zd.random).<BlockPos>withParameter(LootContextParams.BLOCK_POS, fu).<ItemStack>withParameter(LootContextParams.TOOL, ItemStack.EMPTY).<BlockEntity>withOptionalParameter(LootContextParams.BLOCK_ENTITY, cdl);
+        return cfj.getDrops(a5);
     }
     
-    public static boolean isFaceFull(final VoxelShape cwf, final Direction fp) {
-        final VoxelShape cwf2 = cwf.getFaceShape(fp);
-        return isShapeFullBlock(cwf2);
+    public static List<ItemStack> getDrops(final BlockState cfj, final ServerLevel zd, final BlockPos fu, @Nullable final BlockEntity cdl, @Nullable final Entity aom, final ItemStack bki) {
+        final LootContext.Builder a7 = new LootContext.Builder(zd).withRandom(zd.random).<BlockPos>withParameter(LootContextParams.BLOCK_POS, fu).<ItemStack>withParameter(LootContextParams.TOOL, bki).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, aom).<BlockEntity>withOptionalParameter(LootContextParams.BLOCK_ENTITY, cdl);
+        return cfj.getDrops(a7);
     }
     
-    public static boolean isShapeFullBlock(final VoxelShape cwf) {
-        return Block.SHAPE_FULL_BLOCK_CACHE.getUnchecked(cwf);
-    }
-    
-    @Deprecated
-    public final boolean isSolidRender(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.canOcclude() && isShapeFullBlock(byj.getOcclusionShape(bjg, fk));
-    }
-    
-    public boolean propagatesSkylightDown(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return !isShapeFullBlock(byj.getShape(bjg, fk)) && byj.getFluidState().isEmpty();
-    }
-    
-    @Deprecated
-    public int getLightBlock(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        if (byj.isSolidRender(bjg, fk)) {
-            return bjg.getMaxLightLevel();
+    public static void dropResources(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        if (bqb instanceof ServerLevel) {
+            getDrops(cfj, (ServerLevel)bqb, fu, null).forEach(bki -> popResource(bqb, fu, bki));
         }
-        return byj.propagatesSkylightDown(bjg, fk) ? 0 : 1;
+        cfj.spawnAfterBreak(bqb, fu, ItemStack.EMPTY);
     }
     
-    @Deprecated
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
-        return false;
-    }
-    
-    @Deprecated
-    public void randomTick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        this.tick(byj, xd, fk, random);
-    }
-    
-    @Deprecated
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-    }
-    
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-    }
-    
-    public void destroy(final LevelAccessor bjx, final BlockPos fk, final BlockState byj) {
-    }
-    
-    @Deprecated
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        DebugPackets.sendNeighborsUpdatePacket(bjw, fk3);
-    }
-    
-    public int getTickDelay(final LevelReader bjz) {
-        return 10;
-    }
-    
-    @Nullable
-    @Deprecated
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return null;
-    }
-    
-    @Deprecated
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-    }
-    
-    @Deprecated
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (this.isEntityBlock() && byj1.getBlock() != byj4.getBlock()) {
-            bjw.removeBlockEntity(fk);
+    public static void dropResources(final BlockState cfj, final Level bqb, final BlockPos fu, @Nullable final BlockEntity cdl) {
+        if (bqb instanceof ServerLevel) {
+            getDrops(cfj, (ServerLevel)bqb, fu, cdl).forEach(bki -> popResource(bqb, fu, bki));
         }
+        cfj.spawnAfterBreak(bqb, fu, ItemStack.EMPTY);
     }
     
-    @Deprecated
-    public float getDestroyProgress(final BlockState byj, final Player ayj, final BlockGetter bjg, final BlockPos fk) {
-        final float float6 = byj.getDestroySpeed(bjg, fk);
-        if (float6 == -1.0f) {
-            return 0.0f;
+    public static void dropResources(final BlockState cfj, final Level bqb, final BlockPos fu, @Nullable final BlockEntity cdl, final Entity aom, final ItemStack bki) {
+        if (bqb instanceof ServerLevel) {
+            getDrops(cfj, (ServerLevel)bqb, fu, cdl, aom, bki).forEach(bki -> popResource(bqb, fu, bki));
         }
-        final int integer7 = ayj.canDestroy(byj) ? 30 : 100;
-        return ayj.getDestroySpeed(byj) / float6 / integer7;
+        cfj.spawnAfterBreak(bqb, fu, bki);
     }
     
-    @Deprecated
-    public void spawnAfterBreak(final BlockState byj, final Level bjw, final BlockPos fk, final ItemStack ben) {
-    }
-    
-    public ResourceLocation getLootTable() {
-        if (this.drops == null) {
-            final ResourceLocation sm2 = Registry.BLOCK.getKey(this);
-            this.drops = new ResourceLocation(sm2.getNamespace(), "blocks/" + sm2.getPath());
-        }
-        return this.drops;
-    }
-    
-    @Deprecated
-    public List<ItemStack> getDrops(final BlockState byj, final LootContext.Builder a) {
-        final ResourceLocation sm4 = this.getLootTable();
-        if (sm4 == BuiltInLootTables.EMPTY) {
-            return Collections.<ItemStack>emptyList();
-        }
-        final LootContext crx5 = a.<BlockState>withParameter(LootContextParams.BLOCK_STATE, byj).create(LootContextParamSets.BLOCK);
-        final ServerLevel xd6 = crx5.getLevel();
-        final LootTable csa7 = xd6.getServer().getLootTables().get(sm4);
-        return csa7.getRandomItems(crx5);
-    }
-    
-    public static List<ItemStack> getDrops(final BlockState byj, final ServerLevel xd, final BlockPos fk, @Nullable final BlockEntity bwl) {
-        final LootContext.Builder a5 = new LootContext.Builder(xd).withRandom(xd.random).<BlockPos>withParameter(LootContextParams.BLOCK_POS, fk).<ItemStack>withParameter(LootContextParams.TOOL, ItemStack.EMPTY).<BlockEntity>withOptionalParameter(LootContextParams.BLOCK_ENTITY, bwl);
-        return byj.getDrops(a5);
-    }
-    
-    public static List<ItemStack> getDrops(final BlockState byj, final ServerLevel xd, final BlockPos fk, @Nullable final BlockEntity bwl, @Nullable final Entity akq, final ItemStack ben) {
-        final LootContext.Builder a7 = new LootContext.Builder(xd).withRandom(xd.random).<BlockPos>withParameter(LootContextParams.BLOCK_POS, fk).<ItemStack>withParameter(LootContextParams.TOOL, ben).<Entity>withOptionalParameter(LootContextParams.THIS_ENTITY, akq).<BlockEntity>withOptionalParameter(LootContextParams.BLOCK_ENTITY, bwl);
-        return byj.getDrops(a7);
-    }
-    
-    public static void dropResources(final BlockState byj, final Level bjw, final BlockPos fk) {
-        if (bjw instanceof ServerLevel) {
-            getDrops(byj, (ServerLevel)bjw, fk, null).forEach(ben -> popResource(bjw, fk, ben));
-        }
-        byj.spawnAfterBreak(bjw, fk, ItemStack.EMPTY);
-    }
-    
-    public static void dropResources(final BlockState byj, final Level bjw, final BlockPos fk, @Nullable final BlockEntity bwl) {
-        if (bjw instanceof ServerLevel) {
-            getDrops(byj, (ServerLevel)bjw, fk, bwl).forEach(ben -> popResource(bjw, fk, ben));
-        }
-        byj.spawnAfterBreak(bjw, fk, ItemStack.EMPTY);
-    }
-    
-    public static void dropResources(final BlockState byj, final Level bjw, final BlockPos fk, @Nullable final BlockEntity bwl, final Entity akq, final ItemStack ben) {
-        if (bjw instanceof ServerLevel) {
-            getDrops(byj, (ServerLevel)bjw, fk, bwl, akq, ben).forEach(ben -> popResource(bjw, fk, ben));
-        }
-        byj.spawnAfterBreak(bjw, fk, ben);
-    }
-    
-    public static void popResource(final Level bjw, final BlockPos fk, final ItemStack ben) {
-        if (bjw.isClientSide || ben.isEmpty() || !bjw.getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS)) {
+    public static void popResource(final Level bqb, final BlockPos fu, final ItemStack bki) {
+        if (bqb.isClientSide || bki.isEmpty() || !bqb.getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS)) {
             return;
         }
         final float float4 = 0.5f;
-        final double double5 = bjw.random.nextFloat() * 0.5f + 0.25;
-        final double double6 = bjw.random.nextFloat() * 0.5f + 0.25;
-        final double double7 = bjw.random.nextFloat() * 0.5f + 0.25;
-        final ItemEntity awb11 = new ItemEntity(bjw, fk.getX() + double5, fk.getY() + double6, fk.getZ() + double7, ben);
-        awb11.setDefaultPickUpDelay();
-        bjw.addFreshEntity(awb11);
+        final double double5 = bqb.random.nextFloat() * 0.5f + 0.25;
+        final double double6 = bqb.random.nextFloat() * 0.5f + 0.25;
+        final double double7 = bqb.random.nextFloat() * 0.5f + 0.25;
+        final ItemEntity bbg11 = new ItemEntity(bqb, fu.getX() + double5, fu.getY() + double6, fu.getZ() + double7, bki);
+        bbg11.setDefaultPickUpDelay();
+        bqb.addFreshEntity(bbg11);
     }
     
-    protected void popExperience(final Level bjw, final BlockPos fk, int integer) {
-        if (!bjw.isClientSide && bjw.getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS)) {
+    protected void popExperience(final Level bqb, final BlockPos fu, int integer) {
+        if (!bqb.isClientSide && bqb.getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS)) {
             while (integer > 0) {
                 final int integer2 = ExperienceOrb.getExperienceValue(integer);
                 integer -= integer2;
-                bjw.addFreshEntity(new ExperienceOrb(bjw, fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5, integer2));
+                bqb.addFreshEntity(new ExperienceOrb(bqb, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, integer2));
             }
         }
     }
@@ -551,65 +270,32 @@ public class Block implements ItemLike {
         return this.explosionResistance;
     }
     
-    public void wasExploded(final Level bjw, final BlockPos fk, final Explosion bjp) {
+    public void wasExploded(final Level bqb, final BlockPos fu, final Explosion bpt) {
     }
     
-    @Deprecated
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return true;
-    }
-    
-    @Deprecated
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        return InteractionResult.PASS;
-    }
-    
-    public void stepOn(final Level bjw, final BlockPos fk, final Entity akq) {
+    public void stepOn(final Level bqb, final BlockPos fu, final Entity aom) {
     }
     
     @Nullable
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
         return this.defaultBlockState();
     }
     
-    @Deprecated
-    public void attack(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj) {
+    public void playerDestroy(final Level bqb, final Player bec, final BlockPos fu, final BlockState cfj, @Nullable final BlockEntity cdl, final ItemStack bki) {
+        bec.awardStat(Stats.BLOCK_MINED.get(this));
+        bec.causeFoodExhaustion(0.005f);
+        dropResources(cfj, bqb, fu, cdl, bec, bki);
     }
     
-    @Deprecated
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return 0;
-    }
-    
-    @Deprecated
-    public boolean isSignalSource(final BlockState byj) {
-        return false;
-    }
-    
-    @Deprecated
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-    }
-    
-    @Deprecated
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return 0;
-    }
-    
-    public void playerDestroy(final Level bjw, final Player ayj, final BlockPos fk, final BlockState byj, @Nullable final BlockEntity bwl, final ItemStack ben) {
-        ayj.awardStat(Stats.BLOCK_MINED.get(this));
-        ayj.causeFoodExhaustion(0.005f);
-        dropResources(byj, bjw, fk, bwl, ayj, ben);
-    }
-    
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, @Nullable final LivingEntity akz, final ItemStack ben) {
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
     }
     
     public boolean isPossibleToRespawnInThis() {
         return !this.material.isSolid() && !this.material.isLiquid();
     }
     
-    public Component getName() {
-        return new TranslatableComponent(this.getDescriptionId(), new Object[0]);
+    public MutableComponent getName() {
+        return new TranslatableComponent(this.getDescriptionId());
     }
     
     public String getDescriptionId() {
@@ -619,40 +305,20 @@ public class Block implements ItemLike {
         return this.descriptionId;
     }
     
-    @Deprecated
-    public boolean triggerEvent(final BlockState byj, final Level bjw, final BlockPos fk, final int integer4, final int integer5) {
-        return false;
+    public void fallOn(final Level bqb, final BlockPos fu, final Entity aom, final float float4) {
+        aom.causeFallDamage(float4, 1.0f);
     }
     
-    @Deprecated
-    public PushReaction getPistonPushReaction(final BlockState byj) {
-        return this.material.getPushReaction();
+    public void updateEntityAfterFallOn(final BlockGetter bpg, final Entity aom) {
+        aom.setDeltaMovement(aom.getDeltaMovement().multiply(1.0, 0.0, 1.0));
     }
     
-    @Deprecated
-    public float getShadeBrightness(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.isCollisionShapeFullBlock(bjg, fk) ? 0.2f : 1.0f;
-    }
-    
-    public void fallOn(final Level bjw, final BlockPos fk, final Entity akq, final float float4) {
-        akq.causeFallDamage(float4, 1.0f);
-    }
-    
-    public void updateEntityAfterFallOn(final BlockGetter bjg, final Entity akq) {
-        akq.setDeltaMovement(akq.getDeltaMovement().multiply(1.0, 0.0, 1.0));
-    }
-    
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return new ItemStack(this);
     }
     
-    public void fillItemCategory(final CreativeModeTab bdd, final NonNullList<ItemStack> fy) {
-        fy.add(new ItemStack(this));
-    }
-    
-    @Deprecated
-    public FluidState getFluidState(final BlockState byj) {
-        return Fluids.EMPTY.defaultFluidState();
+    public void fillItemCategory(final CreativeModeTab biy, final NonNullList<ItemStack> gi) {
+        gi.add(new ItemStack(this));
     }
     
     public float getFriction() {
@@ -667,35 +333,20 @@ public class Block implements ItemLike {
         return this.jumpFactor;
     }
     
-    @Deprecated
-    public long getSeed(final BlockState byj, final BlockPos fk) {
-        return Mth.getSeed(fk);
+    public void playerWillDestroy(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        bqb.levelEvent(bec, 2001, fu, getId(cfj));
+        if (this.is(BlockTags.GUARDED_BY_PIGLINS)) {
+            PiglinAi.angerNearbyPiglins(bec, false);
+        }
     }
     
-    public void onProjectileHit(final Level bjw, final BlockState byj, final BlockHitResult cvg, final Entity akq) {
+    public void handleRain(final Level bqb, final BlockPos fu) {
     }
     
-    public void playerWillDestroy(final Level bjw, final BlockPos fk, final BlockState byj, final Player ayj) {
-        bjw.levelEvent(ayj, 2001, fk, getId(byj));
-    }
-    
-    public void handleRain(final Level bjw, final BlockPos fk) {
-    }
-    
-    public boolean dropFromExplosion(final Explosion bjp) {
+    public boolean dropFromExplosion(final Explosion bpt) {
         return true;
     }
     
-    @Deprecated
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
-        return false;
-    }
-    
-    @Deprecated
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return 0;
-    }
-    
     protected void createBlockStateDefinition(final StateDefinition.Builder<Block, BlockState> a) {
     }
     
@@ -703,29 +354,15 @@ public class Block implements ItemLike {
         return this.stateDefinition;
     }
     
-    protected final void registerDefaultState(final BlockState byj) {
-        this.defaultBlockState = byj;
+    protected final void registerDefaultState(final BlockState cfj) {
+        this.defaultBlockState = cfj;
     }
     
     public final BlockState defaultBlockState() {
         return this.defaultBlockState;
     }
     
-    public OffsetType getOffsetType() {
-        return OffsetType.NONE;
-    }
-    
-    @Deprecated
-    public Vec3 getOffset(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        final OffsetType b5 = this.getOffsetType();
-        if (b5 == OffsetType.NONE) {
-            return Vec3.ZERO;
-        }
-        final long long6 = Mth.getSeed(fk.getX(), 0, fk.getZ());
-        return new Vec3(((long6 & 0xFL) / 15.0f - 0.5) * 0.5, (b5 == OffsetType.XYZ) ? (((long6 >> 4 & 0xFL) / 15.0f - 1.0) * 0.2) : 0.0, ((long6 >> 8 & 0xFL) / 15.0f - 0.5) * 0.5);
-    }
-    
-    public SoundType getSoundType(final BlockState byj) {
+    public SoundType getSoundType(final BlockState cfj) {
         return this.soundType;
     }
     
@@ -746,17 +383,21 @@ public class Block implements ItemLike {
         return "Block{" + Registry.BLOCK.getKey(this) + "}";
     }
     
-    public void appendHoverText(final ItemStack ben, @Nullable final BlockGetter bjg, final List<Component> list, final TooltipFlag bfw) {
+    public void appendHoverText(final ItemStack bki, @Nullable final BlockGetter bpg, final List<Component> list, final TooltipFlag bls) {
+    }
+    
+    @Override
+    protected Block asBlock() {
+        return this;
     }
     
     static {
         LOGGER = LogManager.getLogger();
         BLOCK_STATE_REGISTRY = new IdMapper<BlockState>();
-        UPDATE_SHAPE_ORDER = new Direction[] { Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP };
         SHAPE_FULL_BLOCK_CACHE = CacheBuilder.newBuilder().maximumSize(512L).weakKeys().<VoxelShape, Boolean>build(new CacheLoader<VoxelShape, Boolean>() {
             @Override
-            public Boolean load(final VoxelShape cwf) {
-                return !Shapes.joinIsNotEmpty(Shapes.block(), cwf, BooleanOp.NOT_SAME);
+            public Boolean load(final VoxelShape dfg) {
+                return !Shapes.joinIsNotEmpty(Shapes.block(), dfg, BooleanOp.NOT_SAME);
             }
         });
         RIGID_SUPPORT_SHAPE = Shapes.join(Shapes.block(), box(2.0, 0.0, 2.0, 14.0, 16.0, 14.0), BooleanOp.ONLY_FIRST);
@@ -777,10 +418,10 @@ public class Block implements ItemLike {
         private final BlockState second;
         private final Direction direction;
         
-        public BlockStatePairKey(final BlockState byj1, final BlockState byj2, final Direction fp) {
-            this.first = byj1;
-            this.second = byj2;
-            this.direction = fp;
+        public BlockStatePairKey(final BlockState cfj1, final BlockState cfj2, final Direction fz) {
+            this.first = cfj1;
+            this.second = cfj2;
+            this.direction = fz;
         }
         
         @Override
@@ -803,138 +444,4 @@ public class Block implements ItemLike {
             return integer2;
         }
     }
-    
-    public static class Properties {
-        private Material material;
-        private MaterialColor materialColor;
-        private boolean hasCollision;
-        private SoundType soundType;
-        private int lightEmission;
-        private float explosionResistance;
-        private float destroyTime;
-        private boolean isTicking;
-        private float friction;
-        private float speedFactor;
-        private float jumpFactor;
-        private ResourceLocation drops;
-        private boolean canOcclude;
-        private boolean dynamicShape;
-        
-        private Properties(final Material coo, final MaterialColor cop) {
-            this.hasCollision = true;
-            this.soundType = SoundType.STONE;
-            this.friction = 0.6f;
-            this.speedFactor = 1.0f;
-            this.jumpFactor = 1.0f;
-            this.canOcclude = true;
-            this.material = coo;
-            this.materialColor = cop;
-        }
-        
-        public static Properties of(final Material coo) {
-            return of(coo, coo.getColor());
-        }
-        
-        public static Properties of(final Material coo, final DyeColor bdj) {
-            return of(coo, bdj.getMaterialColor());
-        }
-        
-        public static Properties of(final Material coo, final MaterialColor cop) {
-            return new Properties(coo, cop);
-        }
-        
-        public static Properties copy(final Block bph) {
-            final Properties c2 = new Properties(bph.material, bph.materialColor);
-            c2.material = bph.material;
-            c2.destroyTime = bph.destroySpeed;
-            c2.explosionResistance = bph.explosionResistance;
-            c2.hasCollision = bph.hasCollision;
-            c2.isTicking = bph.isTicking;
-            c2.lightEmission = bph.lightEmission;
-            c2.materialColor = bph.materialColor;
-            c2.soundType = bph.soundType;
-            c2.friction = bph.getFriction();
-            c2.speedFactor = bph.getSpeedFactor();
-            c2.dynamicShape = bph.dynamicShape;
-            c2.canOcclude = bph.canOcclude;
-            return c2;
-        }
-        
-        public Properties noCollission() {
-            this.hasCollision = false;
-            this.canOcclude = false;
-            return this;
-        }
-        
-        public Properties noOcclusion() {
-            this.canOcclude = false;
-            return this;
-        }
-        
-        public Properties friction(final float float1) {
-            this.friction = float1;
-            return this;
-        }
-        
-        public Properties speedFactor(final float float1) {
-            this.speedFactor = float1;
-            return this;
-        }
-        
-        public Properties jumpFactor(final float float1) {
-            this.jumpFactor = float1;
-            return this;
-        }
-        
-        protected Properties sound(final SoundType bum) {
-            this.soundType = bum;
-            return this;
-        }
-        
-        protected Properties lightLevel(final int integer) {
-            this.lightEmission = integer;
-            return this;
-        }
-        
-        public Properties strength(final float float1, final float float2) {
-            this.destroyTime = float1;
-            this.explosionResistance = Math.max(0.0f, float2);
-            return this;
-        }
-        
-        protected Properties instabreak() {
-            return this.strength(0.0f);
-        }
-        
-        protected Properties strength(final float float1) {
-            this.strength(float1, float1);
-            return this;
-        }
-        
-        protected Properties randomTicks() {
-            this.isTicking = true;
-            return this;
-        }
-        
-        protected Properties dynamicShape() {
-            this.dynamicShape = true;
-            return this;
-        }
-        
-        protected Properties noDrops() {
-            this.drops = BuiltInLootTables.EMPTY;
-            return this;
-        }
-        
-        public Properties dropsLike(final Block bph) {
-            this.drops = bph.getLootTable();
-            return this;
-        }
-    }
-    
-    public enum OffsetType {
-        NONE, 
-        XZ, 
-        XYZ;
-    }
 }
diff --git a/src/net/minecraft/world/level/block/Blocks.java b/src/net/minecraft/world/level/block/Blocks.java
index 927bbe2..b89464d 100644
--- a/src/net/minecraft/world/level/block/Blocks.java
+++ b/src/net/minecraft/world/level/block/Blocks.java
@@ -2,13 +2,12 @@ package net.minecraft.world.level.block;
 
 import com.google.common.collect.UnmodifiableIterator;
 import java.util.Iterator;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.WoodType;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.level.block.piston.MovingPistonBlock;
 import net.minecraft.world.level.block.piston.PistonHeadBlock;
-import net.minecraft.world.level.block.piston.PistonBaseBlock;
-import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.block.grower.DarkOakTreeGrower;
 import net.minecraft.world.level.block.grower.AcaciaTreeGrower;
@@ -17,10 +16,27 @@ import net.minecraft.world.level.block.grower.BirchTreeGrower;
 import net.minecraft.world.level.block.grower.SpruceTreeGrower;
 import net.minecraft.world.level.block.grower.AbstractTreeGrower;
 import net.minecraft.world.level.block.grower.OakTreeGrower;
-import net.minecraft.world.level.material.MaterialColor;
-import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.core.Registry;
+import net.minecraft.world.level.block.piston.PistonBaseBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.block.state.properties.BedPart;
+import net.minecraft.world.level.material.Material;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.function.ToIntFunction;
 
 public class Blocks {
     public static final Block AIR;
@@ -57,6 +73,7 @@ public class Blocks {
     public static final Block GOLD_ORE;
     public static final Block IRON_ORE;
     public static final Block COAL_ORE;
+    public static final Block NETHER_GOLD_ORE;
     public static final Block OAK_LOG;
     public static final Block SPRUCE_LOG;
     public static final Block BIRCH_LOG;
@@ -166,6 +183,7 @@ public class Blocks {
     public static final Block TORCH;
     public static final Block WALL_TORCH;
     public static final Block FIRE;
+    public static final Block SOUL_FIRE;
     public static final Block SPAWNER;
     public static final Block OAK_STAIRS;
     public static final Block CHEST;
@@ -216,6 +234,11 @@ public class Blocks {
     public static final Block PUMPKIN;
     public static final Block NETHERRACK;
     public static final Block SOUL_SAND;
+    public static final Block SOUL_SOIL;
+    public static final Block BASALT;
+    public static final Block POLISHED_BASALT;
+    public static final Block SOUL_TORCH;
+    public static final Block SOUL_WALL_TORCH;
     public static final Block GLOWSTONE;
     public static final Block NETHER_PORTAL;
     public static final Block CARVED_PUMPKIN;
@@ -258,6 +281,7 @@ public class Blocks {
     public static final Block RED_MUSHROOM_BLOCK;
     public static final Block MUSHROOM_STEM;
     public static final Block IRON_BARS;
+    public static final Block CHAIN;
     public static final Block GLASS_PANE;
     public static final Block MELON;
     public static final Block ATTACHED_PUMPKIN_STEM;
@@ -694,707 +718,933 @@ public class Blocks {
     public static final Block STONECUTTER;
     public static final Block BELL;
     public static final Block LANTERN;
+    public static final Block SOUL_LANTERN;
     public static final Block CAMPFIRE;
+    public static final Block SOUL_CAMPFIRE;
     public static final Block SWEET_BERRY_BUSH;
+    public static final Block WARPED_STEM;
+    public static final Block STRIPPED_WARPED_STEM;
+    public static final Block WARPED_HYPHAE;
+    public static final Block STRIPPED_WARPED_HYPHAE;
+    public static final Block WARPED_NYLIUM;
+    public static final Block WARPED_FUNGUS;
+    public static final Block WARPED_WART_BLOCK;
+    public static final Block WARPED_ROOTS;
+    public static final Block NETHER_SPROUTS;
+    public static final Block CRIMSON_STEM;
+    public static final Block STRIPPED_CRIMSON_STEM;
+    public static final Block CRIMSON_HYPHAE;
+    public static final Block STRIPPED_CRIMSON_HYPHAE;
+    public static final Block CRIMSON_NYLIUM;
+    public static final Block CRIMSON_FUNGUS;
+    public static final Block SHROOMLIGHT;
+    public static final Block WEEPING_VINES;
+    public static final Block WEEPING_VINES_PLANT;
+    public static final Block TWISTING_VINES;
+    public static final Block TWISTING_VINES_PLANT;
+    public static final Block CRIMSON_ROOTS;
+    public static final Block CRIMSON_PLANKS;
+    public static final Block WARPED_PLANKS;
+    public static final Block CRIMSON_SLAB;
+    public static final Block WARPED_SLAB;
+    public static final Block CRIMSON_PRESSURE_PLATE;
+    public static final Block WARPED_PRESSURE_PLATE;
+    public static final Block CRIMSON_FENCE;
+    public static final Block WARPED_FENCE;
+    public static final Block CRIMSON_TRAPDOOR;
+    public static final Block WARPED_TRAPDOOR;
+    public static final Block CRIMSON_FENCE_GATE;
+    public static final Block WARPED_FENCE_GATE;
+    public static final Block CRIMSON_STAIRS;
+    public static final Block WARPED_STAIRS;
+    public static final Block CRIMSON_BUTTON;
+    public static final Block WARPED_BUTTON;
+    public static final Block CRIMSON_DOOR;
+    public static final Block WARPED_DOOR;
+    public static final Block CRIMSON_SIGN;
+    public static final Block WARPED_SIGN;
+    public static final Block CRIMSON_WALL_SIGN;
+    public static final Block WARPED_WALL_SIGN;
     public static final Block STRUCTURE_BLOCK;
     public static final Block JIGSAW;
     public static final Block COMPOSTER;
+    public static final Block TARGET;
     public static final Block BEE_NEST;
     public static final Block BEEHIVE;
     public static final Block HONEY_BLOCK;
     public static final Block HONEYCOMB_BLOCK;
+    public static final Block NETHERITE_BLOCK;
+    public static final Block ANCIENT_DEBRIS;
+    public static final Block CRYING_OBSIDIAN;
+    public static final Block RESPAWN_ANCHOR;
+    public static final Block POTTED_CRIMSON_FUNGUS;
+    public static final Block POTTED_WARPED_FUNGUS;
+    public static final Block POTTED_CRIMSON_ROOTS;
+    public static final Block POTTED_WARPED_ROOTS;
+    public static final Block LODESTONE;
+    public static final Block BLACKSTONE;
+    public static final Block BLACKSTONE_STAIRS;
+    public static final Block BLACKSTONE_WALL;
+    public static final Block BLACKSTONE_SLAB;
+    public static final Block POLISHED_BLACKSTONE;
+    public static final Block POLISHED_BLACKSTONE_BRICKS;
+    public static final Block CRACKED_POLISHED_BLACKSTONE_BRICKS;
+    public static final Block CHISELED_POLISHED_BLACKSTONE;
+    public static final Block POLISHED_BLACKSTONE_BRICK_SLAB;
+    public static final Block POLISHED_BLACKSTONE_BRICK_STAIRS;
+    public static final Block POLISHED_BLACKSTONE_BRICK_WALL;
+    public static final Block GILDED_BLACKSTONE;
+    public static final Block POLISHED_BLACKSTONE_STAIRS;
+    public static final Block POLISHED_BLACKSTONE_SLAB;
+    public static final Block POLISHED_BLACKSTONE_PRESSURE_PLATE;
+    public static final Block POLISHED_BLACKSTONE_BUTTON;
+    public static final Block POLISHED_BLACKSTONE_WALL;
+    public static final Block CHISELED_NETHER_BRICKS;
+    public static final Block CRACKED_NETHER_BRICKS;
+    public static final Block QUARTZ_BRICKS;
     
-    private static Block register(final String string, final Block bph) {
-        return Registry.<Block>register(Registry.BLOCK, string, bph);
+    private static ToIntFunction<BlockState> litBlockEmission(final int integer) {
+        return cfj -> cfj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.LIT) ? integer : 0;
+    }
+    
+    private static Boolean never(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final EntityType<?> aoq) {
+        return false;
+    }
+    
+    private static Boolean always(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final EntityType<?> aoq) {
+        return true;
+    }
+    
+    private static Boolean ocelotOrParrot(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final EntityType<?> aoq) {
+        return aoq == EntityType.OCELOT || aoq == EntityType.PARROT;
+    }
+    
+    private static BedBlock bed(final DyeColor bje) {
+        return new BedBlock(bje, BlockBehaviour.Properties.of(Material.WOOL, cfj -> (cfj.<BedPart>getValue(BedBlock.PART) == BedPart.FOOT) ? bje.getMaterialColor() : MaterialColor.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion());
+    }
+    
+    private static RotatedPillarBlock log(final MaterialColor cxe1, final MaterialColor cxe2) {
+        return new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, cfj -> (cfj.<Direction.Axis>getValue(RotatedPillarBlock.AXIS) == Direction.Axis.Y) ? cxe1 : cxe2).strength(2.0f).sound(SoundType.WOOD));
+    }
+    
+    private static Block netherStem(final MaterialColor cxe) {
+        return new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, cfj -> cxe).strength(2.0f).sound(SoundType.STEM));
+    }
+    
+    private static boolean always(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return true;
+    }
+    
+    private static boolean never(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return false;
+    }
+    
+    private static StainedGlassBlock stainedGlass(final DyeColor bje) {
+        return new StainedGlassBlock(bje, BlockBehaviour.Properties.of(Material.GLASS, bje).strength(0.3f).sound(SoundType.GLASS).noOcclusion().isValidSpawn(Blocks::never).isRedstoneConductor(Blocks::never).isSuffocating(Blocks::never).isViewBlocking(Blocks::never));
+    }
+    
+    private static LeavesBlock leaves() {
+        return new LeavesBlock(BlockBehaviour.Properties.of(Material.LEAVES).strength(0.2f).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(Blocks::ocelotOrParrot).isSuffocating(Blocks::never).isViewBlocking(Blocks::never));
+    }
+    
+    private static ShulkerBoxBlock shulkerBox(final DyeColor bje, final BlockBehaviour.Properties c) {
+        final BlockEntity cdl4;
+        ShulkerBoxBlockEntity ceg5;
+        final BlockBehaviour.StatePredicate e3 = (cfj, bpg, fu) -> {
+            cdl4 = bpg.getBlockEntity(fu);
+            if (!(cdl4 instanceof ShulkerBoxBlockEntity)) {
+                return true;
+            }
+            else {
+                ceg5 = (ShulkerBoxBlockEntity)cdl4;
+                return ceg5.isClosed();
+            }
+        };
+        return new ShulkerBoxBlock(bje, c.strength(2.0f).dynamicShape().noOcclusion().isSuffocating(e3).isViewBlocking(e3));
+    }
+    
+    private static PistonBaseBlock pistonBase(final boolean boolean1) {
+        final BlockBehaviour.StatePredicate e2 = (cfj, bpg, fu) -> !cfj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED);
+        return new PistonBaseBlock(boolean1, BlockBehaviour.Properties.of(Material.PISTON).strength(1.5f).isRedstoneConductor(Blocks::never).isSuffocating(e2).isViewBlocking(e2));
+    }
+    
+    private static Block register(final String string, final Block bvr) {
+        return Registry.<Block>register(Registry.BLOCK, string, bvr);
+    }
+    
+    public static void rebuildCache() {
+        Block.BLOCK_STATE_REGISTRY.forEach(BlockBehaviour.BlockStateBase::initCache);
     }
     
     static {
-        AIR = register("air", new AirBlock(Block.Properties.of(Material.AIR).noCollission().noDrops()));
-        STONE = register("stone", new Block(Block.Properties.of(Material.STONE, MaterialColor.STONE).strength(1.5f, 6.0f)));
-        GRANITE = register("granite", new Block(Block.Properties.of(Material.STONE, MaterialColor.DIRT).strength(1.5f, 6.0f)));
-        POLISHED_GRANITE = register("polished_granite", new Block(Block.Properties.of(Material.STONE, MaterialColor.DIRT).strength(1.5f, 6.0f)));
-        DIORITE = register("diorite", new Block(Block.Properties.of(Material.STONE, MaterialColor.QUARTZ).strength(1.5f, 6.0f)));
-        POLISHED_DIORITE = register("polished_diorite", new Block(Block.Properties.of(Material.STONE, MaterialColor.QUARTZ).strength(1.5f, 6.0f)));
-        ANDESITE = register("andesite", new Block(Block.Properties.of(Material.STONE, MaterialColor.STONE).strength(1.5f, 6.0f)));
-        POLISHED_ANDESITE = register("polished_andesite", new Block(Block.Properties.of(Material.STONE, MaterialColor.STONE).strength(1.5f, 6.0f)));
-        GRASS_BLOCK = register("grass_block", new GrassBlock(Block.Properties.of(Material.GRASS).randomTicks().strength(0.6f).sound(SoundType.GRASS)));
-        DIRT = register("dirt", new Block(Block.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.5f).sound(SoundType.GRAVEL)));
-        COARSE_DIRT = register("coarse_dirt", new Block(Block.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.5f).sound(SoundType.GRAVEL)));
-        PODZOL = register("podzol", new SnowyDirtBlock(Block.Properties.of(Material.DIRT, MaterialColor.PODZOL).strength(0.5f).sound(SoundType.GRAVEL)));
-        COBBLESTONE = register("cobblestone", new Block(Block.Properties.of(Material.STONE).strength(2.0f, 6.0f)));
-        OAK_PLANKS = register("oak_planks", new Block(Block.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        SPRUCE_PLANKS = register("spruce_planks", new Block(Block.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        BIRCH_PLANKS = register("birch_planks", new Block(Block.Properties.of(Material.WOOD, MaterialColor.SAND).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        JUNGLE_PLANKS = register("jungle_planks", new Block(Block.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        ACACIA_PLANKS = register("acacia_planks", new Block(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        DARK_OAK_PLANKS = register("dark_oak_planks", new Block(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        OAK_SAPLING = register("oak_sapling", new SaplingBlock(new OakTreeGrower(), Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
-        SPRUCE_SAPLING = register("spruce_sapling", new SaplingBlock(new SpruceTreeGrower(), Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
-        BIRCH_SAPLING = register("birch_sapling", new SaplingBlock(new BirchTreeGrower(), Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
-        JUNGLE_SAPLING = register("jungle_sapling", new SaplingBlock(new JungleTreeGrower(), Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
-        ACACIA_SAPLING = register("acacia_sapling", new SaplingBlock(new AcaciaTreeGrower(), Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
-        DARK_OAK_SAPLING = register("dark_oak_sapling", new SaplingBlock(new DarkOakTreeGrower(), Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
-        BEDROCK = register("bedrock", new BedrockBlock(Block.Properties.of(Material.STONE).strength(-1.0f, 3600000.0f).noDrops()));
-        WATER = register("water", new LiquidBlock(Fluids.WATER, Block.Properties.of(Material.WATER).noCollission().strength(100.0f).noDrops()));
-        LAVA = register("lava", new LiquidBlock(Fluids.LAVA, Block.Properties.of(Material.LAVA).noCollission().randomTicks().strength(100.0f).lightLevel(15).noDrops()));
-        SAND = register("sand", new SandBlock(14406560, Block.Properties.of(Material.SAND, MaterialColor.SAND).strength(0.5f).sound(SoundType.SAND)));
-        RED_SAND = register("red_sand", new SandBlock(11098145, Block.Properties.of(Material.SAND, MaterialColor.COLOR_ORANGE).strength(0.5f).sound(SoundType.SAND)));
-        GRAVEL = register("gravel", new GravelBlock(Block.Properties.of(Material.SAND, MaterialColor.STONE).strength(0.6f).sound(SoundType.GRAVEL)));
-        GOLD_ORE = register("gold_ore", new OreBlock(Block.Properties.of(Material.STONE).strength(3.0f, 3.0f)));
-        IRON_ORE = register("iron_ore", new OreBlock(Block.Properties.of(Material.STONE).strength(3.0f, 3.0f)));
-        COAL_ORE = register("coal_ore", new OreBlock(Block.Properties.of(Material.STONE).strength(3.0f, 3.0f)));
-        OAK_LOG = register("oak_log", new LogBlock(MaterialColor.WOOD, Block.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f).sound(SoundType.WOOD)));
-        SPRUCE_LOG = register("spruce_log", new LogBlock(MaterialColor.PODZOL, Block.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f).sound(SoundType.WOOD)));
-        BIRCH_LOG = register("birch_log", new LogBlock(MaterialColor.SAND, Block.Properties.of(Material.WOOD, MaterialColor.QUARTZ).strength(2.0f).sound(SoundType.WOOD)));
-        JUNGLE_LOG = register("jungle_log", new LogBlock(MaterialColor.DIRT, Block.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f).sound(SoundType.WOOD)));
-        ACACIA_LOG = register("acacia_log", new LogBlock(MaterialColor.COLOR_ORANGE, Block.Properties.of(Material.WOOD, MaterialColor.STONE).strength(2.0f).sound(SoundType.WOOD)));
-        DARK_OAK_LOG = register("dark_oak_log", new LogBlock(MaterialColor.COLOR_BROWN, Block.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_SPRUCE_LOG = register("stripped_spruce_log", new LogBlock(MaterialColor.PODZOL, Block.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_BIRCH_LOG = register("stripped_birch_log", new LogBlock(MaterialColor.SAND, Block.Properties.of(Material.WOOD, MaterialColor.SAND).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_JUNGLE_LOG = register("stripped_jungle_log", new LogBlock(MaterialColor.DIRT, Block.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_ACACIA_LOG = register("stripped_acacia_log", new LogBlock(MaterialColor.COLOR_ORANGE, Block.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_DARK_OAK_LOG = register("stripped_dark_oak_log", new LogBlock(MaterialColor.COLOR_BROWN, Block.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_OAK_LOG = register("stripped_oak_log", new LogBlock(MaterialColor.WOOD, Block.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0f).sound(SoundType.WOOD)));
-        OAK_WOOD = register("oak_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0f).sound(SoundType.WOOD)));
-        SPRUCE_WOOD = register("spruce_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f).sound(SoundType.WOOD)));
-        BIRCH_WOOD = register("birch_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.SAND).strength(2.0f).sound(SoundType.WOOD)));
-        JUNGLE_WOOD = register("jungle_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f).sound(SoundType.WOOD)));
-        ACACIA_WOOD = register("acacia_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_GRAY).strength(2.0f).sound(SoundType.WOOD)));
-        DARK_OAK_WOOD = register("dark_oak_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_OAK_WOOD = register("stripped_oak_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_SPRUCE_WOOD = register("stripped_spruce_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_BIRCH_WOOD = register("stripped_birch_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.SAND).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_JUNGLE_WOOD = register("stripped_jungle_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_ACACIA_WOOD = register("stripped_acacia_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).strength(2.0f).sound(SoundType.WOOD)));
-        STRIPPED_DARK_OAK_WOOD = register("stripped_dark_oak_wood", new RotatedPillarBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f).sound(SoundType.WOOD)));
-        OAK_LEAVES = register("oak_leaves", new LeavesBlock(Block.Properties.of(Material.LEAVES).strength(0.2f).randomTicks().sound(SoundType.GRASS).noOcclusion()));
-        SPRUCE_LEAVES = register("spruce_leaves", new LeavesBlock(Block.Properties.of(Material.LEAVES).strength(0.2f).randomTicks().sound(SoundType.GRASS).noOcclusion()));
-        BIRCH_LEAVES = register("birch_leaves", new LeavesBlock(Block.Properties.of(Material.LEAVES).strength(0.2f).randomTicks().sound(SoundType.GRASS).noOcclusion()));
-        JUNGLE_LEAVES = register("jungle_leaves", new LeavesBlock(Block.Properties.of(Material.LEAVES).strength(0.2f).randomTicks().sound(SoundType.GRASS).noOcclusion()));
-        ACACIA_LEAVES = register("acacia_leaves", new LeavesBlock(Block.Properties.of(Material.LEAVES).strength(0.2f).randomTicks().sound(SoundType.GRASS).noOcclusion()));
-        DARK_OAK_LEAVES = register("dark_oak_leaves", new LeavesBlock(Block.Properties.of(Material.LEAVES).strength(0.2f).randomTicks().sound(SoundType.GRASS).noOcclusion()));
-        SPONGE = register("sponge", new SpongeBlock(Block.Properties.of(Material.SPONGE).strength(0.6f).sound(SoundType.GRASS)));
-        WET_SPONGE = register("wet_sponge", new WetSpongeBlock(Block.Properties.of(Material.SPONGE).strength(0.6f).sound(SoundType.GRASS)));
-        GLASS = register("glass", new GlassBlock(Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        LAPIS_ORE = register("lapis_ore", new OreBlock(Block.Properties.of(Material.STONE).strength(3.0f, 3.0f)));
-        LAPIS_BLOCK = register("lapis_block", new Block(Block.Properties.of(Material.METAL, MaterialColor.LAPIS).strength(3.0f, 3.0f)));
-        DISPENSER = register("dispenser", new DispenserBlock(Block.Properties.of(Material.STONE).strength(3.5f)));
-        SANDSTONE = register("sandstone", new Block(Block.Properties.of(Material.STONE, MaterialColor.SAND).strength(0.8f)));
-        CHISELED_SANDSTONE = register("chiseled_sandstone", new Block(Block.Properties.of(Material.STONE, MaterialColor.SAND).strength(0.8f)));
-        CUT_SANDSTONE = register("cut_sandstone", new Block(Block.Properties.of(Material.STONE, MaterialColor.SAND).strength(0.8f)));
-        NOTE_BLOCK = register("note_block", new NoteBlock(Block.Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(0.8f)));
-        WHITE_BED = register("white_bed", new BedBlock(DyeColor.WHITE, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        ORANGE_BED = register("orange_bed", new BedBlock(DyeColor.ORANGE, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        MAGENTA_BED = register("magenta_bed", new BedBlock(DyeColor.MAGENTA, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        LIGHT_BLUE_BED = register("light_blue_bed", new BedBlock(DyeColor.LIGHT_BLUE, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        YELLOW_BED = register("yellow_bed", new BedBlock(DyeColor.YELLOW, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        LIME_BED = register("lime_bed", new BedBlock(DyeColor.LIME, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        PINK_BED = register("pink_bed", new BedBlock(DyeColor.PINK, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        GRAY_BED = register("gray_bed", new BedBlock(DyeColor.GRAY, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        LIGHT_GRAY_BED = register("light_gray_bed", new BedBlock(DyeColor.LIGHT_GRAY, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        CYAN_BED = register("cyan_bed", new BedBlock(DyeColor.CYAN, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        PURPLE_BED = register("purple_bed", new BedBlock(DyeColor.PURPLE, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        BLUE_BED = register("blue_bed", new BedBlock(DyeColor.BLUE, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        BROWN_BED = register("brown_bed", new BedBlock(DyeColor.BROWN, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        GREEN_BED = register("green_bed", new BedBlock(DyeColor.GREEN, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        RED_BED = register("red_bed", new BedBlock(DyeColor.RED, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        BLACK_BED = register("black_bed", new BedBlock(DyeColor.BLACK, Block.Properties.of(Material.WOOL).sound(SoundType.WOOD).strength(0.2f).noOcclusion()));
-        POWERED_RAIL = register("powered_rail", new PoweredRailBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.7f).sound(SoundType.METAL)));
-        DETECTOR_RAIL = register("detector_rail", new DetectorRailBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.7f).sound(SoundType.METAL)));
-        STICKY_PISTON = register("sticky_piston", new PistonBaseBlock(true, Block.Properties.of(Material.PISTON).strength(0.5f)));
-        COBWEB = register("cobweb", new WebBlock(Block.Properties.of(Material.WEB).noCollission().strength(4.0f)));
-        GRASS = register("grass", new TallGrassBlock(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        FERN = register("fern", new TallGrassBlock(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        DEAD_BUSH = register("dead_bush", new DeadBushBlock(Block.Properties.of(Material.REPLACEABLE_PLANT, MaterialColor.WOOD).noCollission().instabreak().sound(SoundType.GRASS)));
-        SEAGRASS = register("seagrass", new Seagrass(Block.Properties.of(Material.REPLACEABLE_WATER_PLANT).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        TALL_SEAGRASS = register("tall_seagrass", new TallSeagrass(Block.Properties.of(Material.REPLACEABLE_WATER_PLANT).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        PISTON = register("piston", new PistonBaseBlock(false, Block.Properties.of(Material.PISTON).strength(0.5f)));
-        PISTON_HEAD = register("piston_head", new PistonHeadBlock(Block.Properties.of(Material.PISTON).strength(0.5f).noDrops()));
-        WHITE_WOOL = register("white_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.SNOW).strength(0.8f).sound(SoundType.WOOL)));
-        ORANGE_WOOL = register("orange_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_ORANGE).strength(0.8f).sound(SoundType.WOOL)));
-        MAGENTA_WOOL = register("magenta_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_MAGENTA).strength(0.8f).sound(SoundType.WOOL)));
-        LIGHT_BLUE_WOOL = register("light_blue_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_BLUE).strength(0.8f).sound(SoundType.WOOL)));
-        YELLOW_WOOL = register("yellow_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_YELLOW).strength(0.8f).sound(SoundType.WOOL)));
-        LIME_WOOL = register("lime_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GREEN).strength(0.8f).sound(SoundType.WOOL)));
-        PINK_WOOL = register("pink_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_PINK).strength(0.8f).sound(SoundType.WOOL)));
-        GRAY_WOOL = register("gray_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_GRAY).strength(0.8f).sound(SoundType.WOOL)));
-        LIGHT_GRAY_WOOL = register("light_gray_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GRAY).strength(0.8f).sound(SoundType.WOOL)));
-        CYAN_WOOL = register("cyan_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_CYAN).strength(0.8f).sound(SoundType.WOOL)));
-        PURPLE_WOOL = register("purple_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_PURPLE).strength(0.8f).sound(SoundType.WOOL)));
-        BLUE_WOOL = register("blue_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_BLUE).strength(0.8f).sound(SoundType.WOOL)));
-        BROWN_WOOL = register("brown_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_BROWN).strength(0.8f).sound(SoundType.WOOL)));
-        GREEN_WOOL = register("green_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_GREEN).strength(0.8f).sound(SoundType.WOOL)));
-        RED_WOOL = register("red_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_RED).strength(0.8f).sound(SoundType.WOOL)));
-        BLACK_WOOL = register("black_wool", new Block(Block.Properties.of(Material.WOOL, MaterialColor.COLOR_BLACK).strength(0.8f).sound(SoundType.WOOL)));
-        MOVING_PISTON = register("moving_piston", new MovingPistonBlock(Block.Properties.of(Material.PISTON).strength(-1.0f).dynamicShape().noDrops().noOcclusion()));
-        DANDELION = register("dandelion", new FlowerBlock(MobEffects.SATURATION, 7, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        POPPY = register("poppy", new FlowerBlock(MobEffects.NIGHT_VISION, 5, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        BLUE_ORCHID = register("blue_orchid", new FlowerBlock(MobEffects.SATURATION, 7, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        ALLIUM = register("allium", new FlowerBlock(MobEffects.FIRE_RESISTANCE, 4, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        AZURE_BLUET = register("azure_bluet", new FlowerBlock(MobEffects.BLINDNESS, 8, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        RED_TULIP = register("red_tulip", new FlowerBlock(MobEffects.WEAKNESS, 9, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        ORANGE_TULIP = register("orange_tulip", new FlowerBlock(MobEffects.WEAKNESS, 9, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        WHITE_TULIP = register("white_tulip", new FlowerBlock(MobEffects.WEAKNESS, 9, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        PINK_TULIP = register("pink_tulip", new FlowerBlock(MobEffects.WEAKNESS, 9, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        OXEYE_DAISY = register("oxeye_daisy", new FlowerBlock(MobEffects.REGENERATION, 8, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        CORNFLOWER = register("cornflower", new FlowerBlock(MobEffects.JUMP, 6, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        WITHER_ROSE = register("wither_rose", new WitherRoseBlock(MobEffects.WITHER, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        LILY_OF_THE_VALLEY = register("lily_of_the_valley", new FlowerBlock(MobEffects.POISON, 12, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        BROWN_MUSHROOM = register("brown_mushroom", new MushroomBlock(Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS).lightLevel(1)));
-        RED_MUSHROOM = register("red_mushroom", new MushroomBlock(Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
-        GOLD_BLOCK = register("gold_block", new Block(Block.Properties.of(Material.METAL, MaterialColor.GOLD).strength(3.0f, 6.0f).sound(SoundType.METAL)));
-        IRON_BLOCK = register("iron_block", new Block(Block.Properties.of(Material.METAL, MaterialColor.METAL).strength(5.0f, 6.0f).sound(SoundType.METAL)));
-        BRICKS = register("bricks", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_RED).strength(2.0f, 6.0f)));
-        TNT = register("tnt", new TntBlock(Block.Properties.of(Material.EXPLOSIVE).instabreak().sound(SoundType.GRASS)));
-        BOOKSHELF = register("bookshelf", new Block(Block.Properties.of(Material.WOOD).strength(1.5f).sound(SoundType.WOOD)));
-        MOSSY_COBBLESTONE = register("mossy_cobblestone", new Block(Block.Properties.of(Material.STONE).strength(2.0f, 6.0f)));
-        OBSIDIAN = register("obsidian", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).strength(50.0f, 1200.0f)));
-        TORCH = register("torch", new TorchBlock(Block.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel(14).sound(SoundType.WOOD)));
-        WALL_TORCH = register("wall_torch", new WallTorchBlock(Block.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel(14).sound(SoundType.WOOD).dropsLike(Blocks.TORCH)));
-        FIRE = register("fire", new FireBlock(Block.Properties.of(Material.FIRE, MaterialColor.FIRE).noCollission().randomTicks().instabreak().lightLevel(15).sound(SoundType.WOOL).noDrops()));
-        SPAWNER = register("spawner", new SpawnerBlock(Block.Properties.of(Material.STONE).strength(5.0f).sound(SoundType.METAL).noOcclusion()));
-        OAK_STAIRS = register("oak_stairs", new StairBlock(Blocks.OAK_PLANKS.defaultBlockState(), Block.Properties.copy(Blocks.OAK_PLANKS)));
-        CHEST = register("chest", new ChestBlock(Block.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD), () -> BlockEntityType.CHEST));
-        REDSTONE_WIRE = register("redstone_wire", new RedStoneWireBlock(Block.Properties.of(Material.DECORATION).noCollission().instabreak()));
-        DIAMOND_ORE = register("diamond_ore", new OreBlock(Block.Properties.of(Material.STONE).strength(3.0f, 3.0f)));
-        DIAMOND_BLOCK = register("diamond_block", new Block(Block.Properties.of(Material.METAL, MaterialColor.DIAMOND).strength(5.0f, 6.0f).sound(SoundType.METAL)));
-        CRAFTING_TABLE = register("crafting_table", new CraftingTableBlock(Block.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
-        WHEAT = register("wheat", new CropBlock(Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.CROP)));
-        FARMLAND = register("farmland", new FarmBlock(Block.Properties.of(Material.DIRT).randomTicks().strength(0.6f).sound(SoundType.GRAVEL)));
-        FURNACE = register("furnace", new FurnaceBlock(Block.Properties.of(Material.STONE).strength(3.5f).lightLevel(13)));
-        OAK_SIGN = register("oak_sign", new StandingSignBlock(Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.OAK));
-        SPRUCE_SIGN = register("spruce_sign", new StandingSignBlock(Block.Properties.of(Material.WOOD, Blocks.SPRUCE_LOG.materialColor).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.SPRUCE));
-        BIRCH_SIGN = register("birch_sign", new StandingSignBlock(Block.Properties.of(Material.WOOD, MaterialColor.SAND).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.BIRCH));
-        ACACIA_SIGN = register("acacia_sign", new StandingSignBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.ACACIA));
-        JUNGLE_SIGN = register("jungle_sign", new StandingSignBlock(Block.Properties.of(Material.WOOD, Blocks.JUNGLE_LOG.materialColor).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.JUNGLE));
-        DARK_OAK_SIGN = register("dark_oak_sign", new StandingSignBlock(Block.Properties.of(Material.WOOD, Blocks.DARK_OAK_LOG.materialColor).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.DARK_OAK));
-        OAK_DOOR = register("oak_door", new DoorBlock(Block.Properties.of(Material.WOOD, Blocks.OAK_PLANKS.materialColor).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        LADDER = register("ladder", new LadderBlock(Block.Properties.of(Material.DECORATION).strength(0.4f).sound(SoundType.LADDER).noOcclusion()));
-        RAIL = register("rail", new RailBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.7f).sound(SoundType.METAL)));
-        COBBLESTONE_STAIRS = register("cobblestone_stairs", new StairBlock(Blocks.COBBLESTONE.defaultBlockState(), Block.Properties.copy(Blocks.COBBLESTONE)));
-        OAK_WALL_SIGN = register("oak_wall_sign", new WallSignBlock(Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.OAK_SIGN), WoodType.OAK));
-        SPRUCE_WALL_SIGN = register("spruce_wall_sign", new WallSignBlock(Block.Properties.of(Material.WOOD, Blocks.SPRUCE_LOG.materialColor).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.SPRUCE_SIGN), WoodType.SPRUCE));
-        BIRCH_WALL_SIGN = register("birch_wall_sign", new WallSignBlock(Block.Properties.of(Material.WOOD, MaterialColor.SAND).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.BIRCH_SIGN), WoodType.BIRCH));
-        ACACIA_WALL_SIGN = register("acacia_wall_sign", new WallSignBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.ACACIA_SIGN), WoodType.ACACIA));
-        JUNGLE_WALL_SIGN = register("jungle_wall_sign", new WallSignBlock(Block.Properties.of(Material.WOOD, Blocks.JUNGLE_LOG.materialColor).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.JUNGLE_SIGN), WoodType.JUNGLE));
-        DARK_OAK_WALL_SIGN = register("dark_oak_wall_sign", new WallSignBlock(Block.Properties.of(Material.WOOD, Blocks.DARK_OAK_LOG.materialColor).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.DARK_OAK_SIGN), WoodType.DARK_OAK));
-        LEVER = register("lever", new LeverBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        STONE_PRESSURE_PLATE = register("stone_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.MOBS, Block.Properties.of(Material.STONE).noCollission().strength(0.5f)));
-        IRON_DOOR = register("iron_door", new DoorBlock(Block.Properties.of(Material.METAL, MaterialColor.METAL).strength(5.0f).sound(SoundType.METAL).noOcclusion()));
-        OAK_PRESSURE_PLATE = register("oak_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, Block.Properties.of(Material.WOOD, Blocks.OAK_PLANKS.materialColor).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        SPRUCE_PRESSURE_PLATE = register("spruce_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, Block.Properties.of(Material.WOOD, Blocks.SPRUCE_PLANKS.materialColor).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        BIRCH_PRESSURE_PLATE = register("birch_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, Block.Properties.of(Material.WOOD, Blocks.BIRCH_PLANKS.materialColor).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        JUNGLE_PRESSURE_PLATE = register("jungle_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, Block.Properties.of(Material.WOOD, Blocks.JUNGLE_PLANKS.materialColor).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        ACACIA_PRESSURE_PLATE = register("acacia_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, Block.Properties.of(Material.WOOD, Blocks.ACACIA_PLANKS.materialColor).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        DARK_OAK_PRESSURE_PLATE = register("dark_oak_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, Block.Properties.of(Material.WOOD, Blocks.DARK_OAK_PLANKS.materialColor).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        REDSTONE_ORE = register("redstone_ore", new RedStoneOreBlock(Block.Properties.of(Material.STONE).randomTicks().lightLevel(9).strength(3.0f, 3.0f)));
-        REDSTONE_TORCH = register("redstone_torch", new RedstoneTorchBlock(Block.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel(7).sound(SoundType.WOOD)));
-        REDSTONE_WALL_TORCH = register("redstone_wall_torch", new RedstoneWallTorchBlock(Block.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel(7).sound(SoundType.WOOD).dropsLike(Blocks.REDSTONE_TORCH)));
-        STONE_BUTTON = register("stone_button", new StoneButtonBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.5f)));
-        SNOW = register("snow", new SnowLayerBlock(Block.Properties.of(Material.TOP_SNOW).randomTicks().strength(0.1f).sound(SoundType.SNOW)));
-        ICE = register("ice", new IceBlock(Block.Properties.of(Material.ICE).friction(0.98f).randomTicks().strength(0.5f).sound(SoundType.GLASS).noOcclusion()));
-        SNOW_BLOCK = register("snow_block", new Block(Block.Properties.of(Material.SNOW).strength(0.2f).sound(SoundType.SNOW)));
-        CACTUS = register("cactus", new CactusBlock(Block.Properties.of(Material.CACTUS).randomTicks().strength(0.4f).sound(SoundType.WOOL)));
-        CLAY = register("clay", new Block(Block.Properties.of(Material.CLAY).strength(0.6f).sound(SoundType.GRAVEL)));
-        SUGAR_CANE = register("sugar_cane", new SugarCaneBlock(Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
-        JUKEBOX = register("jukebox", new JukeboxBlock(Block.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f, 6.0f)));
-        OAK_FENCE = register("oak_fence", new FenceBlock(Block.Properties.of(Material.WOOD, Blocks.OAK_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        PUMPKIN = register("pumpkin", new PumpkinBlock(Block.Properties.of(Material.VEGETABLE, MaterialColor.COLOR_ORANGE).strength(1.0f).sound(SoundType.WOOD)));
-        NETHERRACK = register("netherrack", new Block(Block.Properties.of(Material.STONE, MaterialColor.NETHER).strength(0.4f)));
-        SOUL_SAND = register("soul_sand", new SoulsandBlock(Block.Properties.of(Material.SAND, MaterialColor.COLOR_BROWN).randomTicks().strength(0.5f).speedFactor(0.4f).sound(SoundType.SAND)));
-        GLOWSTONE = register("glowstone", new Block(Block.Properties.of(Material.GLASS, MaterialColor.SAND).strength(0.3f).sound(SoundType.GLASS).lightLevel(15)));
-        NETHER_PORTAL = register("nether_portal", new NetherPortalBlock(Block.Properties.of(Material.PORTAL).noCollission().randomTicks().strength(-1.0f).sound(SoundType.GLASS).lightLevel(11).noDrops()));
-        CARVED_PUMPKIN = register("carved_pumpkin", new CarvedPumpkinBlock(Block.Properties.of(Material.VEGETABLE, MaterialColor.COLOR_ORANGE).strength(1.0f).sound(SoundType.WOOD)));
-        JACK_O_LANTERN = register("jack_o_lantern", new CarvedPumpkinBlock(Block.Properties.of(Material.VEGETABLE, MaterialColor.COLOR_ORANGE).strength(1.0f).sound(SoundType.WOOD).lightLevel(15)));
-        CAKE = register("cake", new CakeBlock(Block.Properties.of(Material.CAKE).strength(0.5f).sound(SoundType.WOOL)));
-        REPEATER = register("repeater", new RepeaterBlock(Block.Properties.of(Material.DECORATION).instabreak().sound(SoundType.WOOD)));
-        WHITE_STAINED_GLASS = register("white_stained_glass", new StainedGlassBlock(DyeColor.WHITE, Block.Properties.of(Material.GLASS, DyeColor.WHITE).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        ORANGE_STAINED_GLASS = register("orange_stained_glass", new StainedGlassBlock(DyeColor.ORANGE, Block.Properties.of(Material.GLASS, DyeColor.ORANGE).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        MAGENTA_STAINED_GLASS = register("magenta_stained_glass", new StainedGlassBlock(DyeColor.MAGENTA, Block.Properties.of(Material.GLASS, DyeColor.MAGENTA).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        LIGHT_BLUE_STAINED_GLASS = register("light_blue_stained_glass", new StainedGlassBlock(DyeColor.LIGHT_BLUE, Block.Properties.of(Material.GLASS, DyeColor.LIGHT_BLUE).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        YELLOW_STAINED_GLASS = register("yellow_stained_glass", new StainedGlassBlock(DyeColor.YELLOW, Block.Properties.of(Material.GLASS, DyeColor.YELLOW).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        LIME_STAINED_GLASS = register("lime_stained_glass", new StainedGlassBlock(DyeColor.LIME, Block.Properties.of(Material.GLASS, DyeColor.LIME).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        PINK_STAINED_GLASS = register("pink_stained_glass", new StainedGlassBlock(DyeColor.PINK, Block.Properties.of(Material.GLASS, DyeColor.PINK).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        GRAY_STAINED_GLASS = register("gray_stained_glass", new StainedGlassBlock(DyeColor.GRAY, Block.Properties.of(Material.GLASS, DyeColor.GRAY).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        LIGHT_GRAY_STAINED_GLASS = register("light_gray_stained_glass", new StainedGlassBlock(DyeColor.LIGHT_GRAY, Block.Properties.of(Material.GLASS, DyeColor.LIGHT_GRAY).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        CYAN_STAINED_GLASS = register("cyan_stained_glass", new StainedGlassBlock(DyeColor.CYAN, Block.Properties.of(Material.GLASS, DyeColor.CYAN).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        PURPLE_STAINED_GLASS = register("purple_stained_glass", new StainedGlassBlock(DyeColor.PURPLE, Block.Properties.of(Material.GLASS, DyeColor.PURPLE).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        BLUE_STAINED_GLASS = register("blue_stained_glass", new StainedGlassBlock(DyeColor.BLUE, Block.Properties.of(Material.GLASS, DyeColor.BLUE).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        BROWN_STAINED_GLASS = register("brown_stained_glass", new StainedGlassBlock(DyeColor.BROWN, Block.Properties.of(Material.GLASS, DyeColor.BROWN).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        GREEN_STAINED_GLASS = register("green_stained_glass", new StainedGlassBlock(DyeColor.GREEN, Block.Properties.of(Material.GLASS, DyeColor.GREEN).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        RED_STAINED_GLASS = register("red_stained_glass", new StainedGlassBlock(DyeColor.RED, Block.Properties.of(Material.GLASS, DyeColor.RED).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        BLACK_STAINED_GLASS = register("black_stained_glass", new StainedGlassBlock(DyeColor.BLACK, Block.Properties.of(Material.GLASS, DyeColor.BLACK).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        OAK_TRAPDOOR = register("oak_trapdoor", new TrapDoorBlock(Block.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        SPRUCE_TRAPDOOR = register("spruce_trapdoor", new TrapDoorBlock(Block.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        BIRCH_TRAPDOOR = register("birch_trapdoor", new TrapDoorBlock(Block.Properties.of(Material.WOOD, MaterialColor.SAND).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        JUNGLE_TRAPDOOR = register("jungle_trapdoor", new TrapDoorBlock(Block.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        ACACIA_TRAPDOOR = register("acacia_trapdoor", new TrapDoorBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        DARK_OAK_TRAPDOOR = register("dark_oak_trapdoor", new TrapDoorBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        STONE_BRICKS = register("stone_bricks", new Block(Block.Properties.of(Material.STONE).strength(1.5f, 6.0f)));
-        MOSSY_STONE_BRICKS = register("mossy_stone_bricks", new Block(Block.Properties.of(Material.STONE).strength(1.5f, 6.0f)));
-        CRACKED_STONE_BRICKS = register("cracked_stone_bricks", new Block(Block.Properties.of(Material.STONE).strength(1.5f, 6.0f)));
-        CHISELED_STONE_BRICKS = register("chiseled_stone_bricks", new Block(Block.Properties.of(Material.STONE).strength(1.5f, 6.0f)));
-        INFESTED_STONE = register("infested_stone", new InfestedBlock(Blocks.STONE, Block.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
-        INFESTED_COBBLESTONE = register("infested_cobblestone", new InfestedBlock(Blocks.COBBLESTONE, Block.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
-        INFESTED_STONE_BRICKS = register("infested_stone_bricks", new InfestedBlock(Blocks.STONE_BRICKS, Block.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
-        INFESTED_MOSSY_STONE_BRICKS = register("infested_mossy_stone_bricks", new InfestedBlock(Blocks.MOSSY_STONE_BRICKS, Block.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
-        INFESTED_CRACKED_STONE_BRICKS = register("infested_cracked_stone_bricks", new InfestedBlock(Blocks.CRACKED_STONE_BRICKS, Block.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
-        INFESTED_CHISELED_STONE_BRICKS = register("infested_chiseled_stone_bricks", new InfestedBlock(Blocks.CHISELED_STONE_BRICKS, Block.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
-        BROWN_MUSHROOM_BLOCK = register("brown_mushroom_block", new HugeMushroomBlock(Block.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(0.2f).sound(SoundType.WOOD)));
-        RED_MUSHROOM_BLOCK = register("red_mushroom_block", new HugeMushroomBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_RED).strength(0.2f).sound(SoundType.WOOD)));
-        MUSHROOM_STEM = register("mushroom_stem", new HugeMushroomBlock(Block.Properties.of(Material.WOOD, MaterialColor.WOOL).strength(0.2f).sound(SoundType.WOOD)));
-        IRON_BARS = register("iron_bars", new IronBarsBlock(Block.Properties.of(Material.METAL, MaterialColor.NONE).strength(5.0f, 6.0f).sound(SoundType.METAL).noOcclusion()));
-        GLASS_PANE = register("glass_pane", new IronBarsBlock(Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        MELON = register("melon", new MelonBlock(Block.Properties.of(Material.VEGETABLE, MaterialColor.COLOR_LIGHT_GREEN).strength(1.0f).sound(SoundType.WOOD)));
-        ATTACHED_PUMPKIN_STEM = register("attached_pumpkin_stem", new AttachedStemBlock((StemGrownBlock)Blocks.PUMPKIN, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.WOOD)));
-        ATTACHED_MELON_STEM = register("attached_melon_stem", new AttachedStemBlock((StemGrownBlock)Blocks.MELON, Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.WOOD)));
-        PUMPKIN_STEM = register("pumpkin_stem", new StemBlock((StemGrownBlock)Blocks.PUMPKIN, Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.HARD_CROP)));
-        MELON_STEM = register("melon_stem", new StemBlock((StemGrownBlock)Blocks.MELON, Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.HARD_CROP)));
-        VINE = register("vine", new VineBlock(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().randomTicks().strength(0.2f).sound(SoundType.GRASS)));
-        OAK_FENCE_GATE = register("oak_fence_gate", new FenceGateBlock(Block.Properties.of(Material.WOOD, Blocks.OAK_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        BRICK_STAIRS = register("brick_stairs", new StairBlock(Blocks.BRICKS.defaultBlockState(), Block.Properties.copy(Blocks.BRICKS)));
-        STONE_BRICK_STAIRS = register("stone_brick_stairs", new StairBlock(Blocks.STONE_BRICKS.defaultBlockState(), Block.Properties.copy(Blocks.STONE_BRICKS)));
-        MYCELIUM = register("mycelium", new MyceliumBlock(Block.Properties.of(Material.GRASS, MaterialColor.COLOR_PURPLE).randomTicks().strength(0.6f).sound(SoundType.GRASS)));
-        LILY_PAD = register("lily_pad", new WaterlilyBlock(Block.Properties.of(Material.PLANT).instabreak().sound(SoundType.GRASS).noOcclusion()));
-        NETHER_BRICKS = register("nether_bricks", new Block(Block.Properties.of(Material.STONE, MaterialColor.NETHER).strength(2.0f, 6.0f)));
-        NETHER_BRICK_FENCE = register("nether_brick_fence", new FenceBlock(Block.Properties.of(Material.STONE, MaterialColor.NETHER).strength(2.0f, 6.0f)));
-        NETHER_BRICK_STAIRS = register("nether_brick_stairs", new StairBlock(Blocks.NETHER_BRICKS.defaultBlockState(), Block.Properties.copy(Blocks.NETHER_BRICKS)));
-        NETHER_WART = register("nether_wart", new NetherWartBlock(Block.Properties.of(Material.PLANT, MaterialColor.COLOR_RED).noCollission().randomTicks().sound(SoundType.NETHER_WART)));
-        ENCHANTING_TABLE = register("enchanting_table", new EnchantmentTableBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_RED).strength(5.0f, 1200.0f)));
-        BREWING_STAND = register("brewing_stand", new BrewingStandBlock(Block.Properties.of(Material.METAL).strength(0.5f).lightLevel(1).noOcclusion()));
-        CAULDRON = register("cauldron", new CauldronBlock(Block.Properties.of(Material.METAL, MaterialColor.STONE).strength(2.0f).noOcclusion()));
-        END_PORTAL = register("end_portal", new EndPortalBlock(Block.Properties.of(Material.PORTAL, MaterialColor.COLOR_BLACK).noCollission().lightLevel(15).strength(-1.0f, 3600000.0f).noDrops()));
-        END_PORTAL_FRAME = register("end_portal_frame", new EndPortalFrameBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GREEN).sound(SoundType.GLASS).lightLevel(1).strength(-1.0f, 3600000.0f).noDrops()));
-        END_STONE = register("end_stone", new Block(Block.Properties.of(Material.STONE, MaterialColor.SAND).strength(3.0f, 9.0f)));
-        DRAGON_EGG = register("dragon_egg", new DragonEggBlock(Block.Properties.of(Material.EGG, MaterialColor.COLOR_BLACK).strength(3.0f, 9.0f).lightLevel(1).noOcclusion()));
-        REDSTONE_LAMP = register("redstone_lamp", new RedstoneLampBlock(Block.Properties.of(Material.BUILDABLE_GLASS).lightLevel(15).strength(0.3f).sound(SoundType.GLASS)));
-        COCOA = register("cocoa", new CocoaBlock(Block.Properties.of(Material.PLANT).randomTicks().strength(0.2f, 3.0f).sound(SoundType.WOOD).noOcclusion()));
-        SANDSTONE_STAIRS = register("sandstone_stairs", new StairBlock(Blocks.SANDSTONE.defaultBlockState(), Block.Properties.copy(Blocks.SANDSTONE)));
-        EMERALD_ORE = register("emerald_ore", new OreBlock(Block.Properties.of(Material.STONE).strength(3.0f, 3.0f)));
-        ENDER_CHEST = register("ender_chest", new EnderChestBlock(Block.Properties.of(Material.STONE).strength(22.5f, 600.0f).lightLevel(7)));
-        TRIPWIRE_HOOK = register("tripwire_hook", new TripWireHookBlock(Block.Properties.of(Material.DECORATION).noCollission()));
-        TRIPWIRE = register("tripwire", new TripWireBlock((TripWireHookBlock)Blocks.TRIPWIRE_HOOK, Block.Properties.of(Material.DECORATION).noCollission()));
-        EMERALD_BLOCK = register("emerald_block", new Block(Block.Properties.of(Material.METAL, MaterialColor.EMERALD).strength(5.0f, 6.0f).sound(SoundType.METAL)));
-        SPRUCE_STAIRS = register("spruce_stairs", new StairBlock(Blocks.SPRUCE_PLANKS.defaultBlockState(), Block.Properties.copy(Blocks.SPRUCE_PLANKS)));
-        BIRCH_STAIRS = register("birch_stairs", new StairBlock(Blocks.BIRCH_PLANKS.defaultBlockState(), Block.Properties.copy(Blocks.BIRCH_PLANKS)));
-        JUNGLE_STAIRS = register("jungle_stairs", new StairBlock(Blocks.JUNGLE_PLANKS.defaultBlockState(), Block.Properties.copy(Blocks.JUNGLE_PLANKS)));
-        COMMAND_BLOCK = register("command_block", new CommandBlock(Block.Properties.of(Material.METAL, MaterialColor.COLOR_BROWN).strength(-1.0f, 3600000.0f).noDrops()));
-        BEACON = register("beacon", new BeaconBlock(Block.Properties.of(Material.GLASS, MaterialColor.DIAMOND).strength(3.0f).lightLevel(15).noOcclusion()));
-        COBBLESTONE_WALL = register("cobblestone_wall", new WallBlock(Block.Properties.copy(Blocks.COBBLESTONE)));
-        MOSSY_COBBLESTONE_WALL = register("mossy_cobblestone_wall", new WallBlock(Block.Properties.copy(Blocks.COBBLESTONE)));
-        FLOWER_POT = register("flower_pot", new FlowerPotBlock(Blocks.AIR, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_OAK_SAPLING = register("potted_oak_sapling", new FlowerPotBlock(Blocks.OAK_SAPLING, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_SPRUCE_SAPLING = register("potted_spruce_sapling", new FlowerPotBlock(Blocks.SPRUCE_SAPLING, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_BIRCH_SAPLING = register("potted_birch_sapling", new FlowerPotBlock(Blocks.BIRCH_SAPLING, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_JUNGLE_SAPLING = register("potted_jungle_sapling", new FlowerPotBlock(Blocks.JUNGLE_SAPLING, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_ACACIA_SAPLING = register("potted_acacia_sapling", new FlowerPotBlock(Blocks.ACACIA_SAPLING, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_DARK_OAK_SAPLING = register("potted_dark_oak_sapling", new FlowerPotBlock(Blocks.DARK_OAK_SAPLING, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_FERN = register("potted_fern", new FlowerPotBlock(Blocks.FERN, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_DANDELION = register("potted_dandelion", new FlowerPotBlock(Blocks.DANDELION, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_POPPY = register("potted_poppy", new FlowerPotBlock(Blocks.POPPY, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_BLUE_ORCHID = register("potted_blue_orchid", new FlowerPotBlock(Blocks.BLUE_ORCHID, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_ALLIUM = register("potted_allium", new FlowerPotBlock(Blocks.ALLIUM, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_AZURE_BLUET = register("potted_azure_bluet", new FlowerPotBlock(Blocks.AZURE_BLUET, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_RED_TULIP = register("potted_red_tulip", new FlowerPotBlock(Blocks.RED_TULIP, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_ORANGE_TULIP = register("potted_orange_tulip", new FlowerPotBlock(Blocks.ORANGE_TULIP, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_WHITE_TULIP = register("potted_white_tulip", new FlowerPotBlock(Blocks.WHITE_TULIP, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_PINK_TULIP = register("potted_pink_tulip", new FlowerPotBlock(Blocks.PINK_TULIP, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_OXEYE_DAISY = register("potted_oxeye_daisy", new FlowerPotBlock(Blocks.OXEYE_DAISY, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_CORNFLOWER = register("potted_cornflower", new FlowerPotBlock(Blocks.CORNFLOWER, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_LILY_OF_THE_VALLEY = register("potted_lily_of_the_valley", new FlowerPotBlock(Blocks.LILY_OF_THE_VALLEY, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_WITHER_ROSE = register("potted_wither_rose", new FlowerPotBlock(Blocks.WITHER_ROSE, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_RED_MUSHROOM = register("potted_red_mushroom", new FlowerPotBlock(Blocks.RED_MUSHROOM, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_BROWN_MUSHROOM = register("potted_brown_mushroom", new FlowerPotBlock(Blocks.BROWN_MUSHROOM, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_DEAD_BUSH = register("potted_dead_bush", new FlowerPotBlock(Blocks.DEAD_BUSH, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        POTTED_CACTUS = register("potted_cactus", new FlowerPotBlock(Blocks.CACTUS, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        CARROTS = register("carrots", new CarrotBlock(Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.CROP)));
-        POTATOES = register("potatoes", new PotatoBlock(Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.CROP)));
-        OAK_BUTTON = register("oak_button", new WoodButtonBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        SPRUCE_BUTTON = register("spruce_button", new WoodButtonBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        BIRCH_BUTTON = register("birch_button", new WoodButtonBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        JUNGLE_BUTTON = register("jungle_button", new WoodButtonBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        ACACIA_BUTTON = register("acacia_button", new WoodButtonBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        DARK_OAK_BUTTON = register("dark_oak_button", new WoodButtonBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        SKELETON_SKULL = register("skeleton_skull", new SkullBlock(SkullBlock.Types.SKELETON, Block.Properties.of(Material.DECORATION).strength(1.0f)));
-        SKELETON_WALL_SKULL = register("skeleton_wall_skull", new WallSkullBlock(SkullBlock.Types.SKELETON, Block.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.SKELETON_SKULL)));
-        WITHER_SKELETON_SKULL = register("wither_skeleton_skull", new WitherSkullBlock(Block.Properties.of(Material.DECORATION).strength(1.0f)));
-        WITHER_SKELETON_WALL_SKULL = register("wither_skeleton_wall_skull", new WitherWallSkullBlock(Block.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.WITHER_SKELETON_SKULL)));
-        ZOMBIE_HEAD = register("zombie_head", new SkullBlock(SkullBlock.Types.ZOMBIE, Block.Properties.of(Material.DECORATION).strength(1.0f)));
-        ZOMBIE_WALL_HEAD = register("zombie_wall_head", new WallSkullBlock(SkullBlock.Types.ZOMBIE, Block.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.ZOMBIE_HEAD)));
-        PLAYER_HEAD = register("player_head", new PlayerHeadBlock(Block.Properties.of(Material.DECORATION).strength(1.0f)));
-        PLAYER_WALL_HEAD = register("player_wall_head", new PlayerWallHeadBlock(Block.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.PLAYER_HEAD)));
-        CREEPER_HEAD = register("creeper_head", new SkullBlock(SkullBlock.Types.CREEPER, Block.Properties.of(Material.DECORATION).strength(1.0f)));
-        CREEPER_WALL_HEAD = register("creeper_wall_head", new WallSkullBlock(SkullBlock.Types.CREEPER, Block.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.CREEPER_HEAD)));
-        DRAGON_HEAD = register("dragon_head", new SkullBlock(SkullBlock.Types.DRAGON, Block.Properties.of(Material.DECORATION).strength(1.0f)));
-        DRAGON_WALL_HEAD = register("dragon_wall_head", new WallSkullBlock(SkullBlock.Types.DRAGON, Block.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.DRAGON_HEAD)));
-        ANVIL = register("anvil", new AnvilBlock(Block.Properties.of(Material.HEAVY_METAL, MaterialColor.METAL).strength(5.0f, 1200.0f).sound(SoundType.ANVIL)));
-        CHIPPED_ANVIL = register("chipped_anvil", new AnvilBlock(Block.Properties.of(Material.HEAVY_METAL, MaterialColor.METAL).strength(5.0f, 1200.0f).sound(SoundType.ANVIL)));
-        DAMAGED_ANVIL = register("damaged_anvil", new AnvilBlock(Block.Properties.of(Material.HEAVY_METAL, MaterialColor.METAL).strength(5.0f, 1200.0f).sound(SoundType.ANVIL)));
-        TRAPPED_CHEST = register("trapped_chest", new TrappedChestBlock(Block.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
-        LIGHT_WEIGHTED_PRESSURE_PLATE = register("light_weighted_pressure_plate", new WeightedPressurePlateBlock(15, Block.Properties.of(Material.METAL, MaterialColor.GOLD).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        HEAVY_WEIGHTED_PRESSURE_PLATE = register("heavy_weighted_pressure_plate", new WeightedPressurePlateBlock(150, Block.Properties.of(Material.METAL).noCollission().strength(0.5f).sound(SoundType.WOOD)));
-        COMPARATOR = register("comparator", new ComparatorBlock(Block.Properties.of(Material.DECORATION).instabreak().sound(SoundType.WOOD)));
-        DAYLIGHT_DETECTOR = register("daylight_detector", new DaylightDetectorBlock(Block.Properties.of(Material.WOOD).strength(0.2f).sound(SoundType.WOOD)));
-        REDSTONE_BLOCK = register("redstone_block", new PoweredBlock(Block.Properties.of(Material.METAL, MaterialColor.FIRE).strength(5.0f, 6.0f).sound(SoundType.METAL)));
-        NETHER_QUARTZ_ORE = register("nether_quartz_ore", new OreBlock(Block.Properties.of(Material.STONE, MaterialColor.NETHER).strength(3.0f, 3.0f)));
-        HOPPER = register("hopper", new HopperBlock(Block.Properties.of(Material.METAL, MaterialColor.STONE).strength(3.0f, 4.8f).sound(SoundType.METAL).noOcclusion()));
-        QUARTZ_BLOCK = register("quartz_block", new Block(Block.Properties.of(Material.STONE, MaterialColor.QUARTZ).strength(0.8f)));
-        CHISELED_QUARTZ_BLOCK = register("chiseled_quartz_block", new Block(Block.Properties.of(Material.STONE, MaterialColor.QUARTZ).strength(0.8f)));
-        QUARTZ_PILLAR = register("quartz_pillar", new RotatedPillarBlock(Block.Properties.of(Material.STONE, MaterialColor.QUARTZ).strength(0.8f)));
-        QUARTZ_STAIRS = register("quartz_stairs", new StairBlock(Blocks.QUARTZ_BLOCK.defaultBlockState(), Block.Properties.copy(Blocks.QUARTZ_BLOCK)));
-        ACTIVATOR_RAIL = register("activator_rail", new PoweredRailBlock(Block.Properties.of(Material.DECORATION).noCollission().strength(0.7f).sound(SoundType.METAL)));
-        DROPPER = register("dropper", new DropperBlock(Block.Properties.of(Material.STONE).strength(3.5f)));
-        WHITE_TERRACOTTA = register("white_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_WHITE).strength(1.25f, 4.2f)));
-        ORANGE_TERRACOTTA = register("orange_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_ORANGE).strength(1.25f, 4.2f)));
-        MAGENTA_TERRACOTTA = register("magenta_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_MAGENTA).strength(1.25f, 4.2f)));
-        LIGHT_BLUE_TERRACOTTA = register("light_blue_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_LIGHT_BLUE).strength(1.25f, 4.2f)));
-        YELLOW_TERRACOTTA = register("yellow_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_YELLOW).strength(1.25f, 4.2f)));
-        LIME_TERRACOTTA = register("lime_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_LIGHT_GREEN).strength(1.25f, 4.2f)));
-        PINK_TERRACOTTA = register("pink_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_PINK).strength(1.25f, 4.2f)));
-        GRAY_TERRACOTTA = register("gray_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_GRAY).strength(1.25f, 4.2f)));
-        LIGHT_GRAY_TERRACOTTA = register("light_gray_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_LIGHT_GRAY).strength(1.25f, 4.2f)));
-        CYAN_TERRACOTTA = register("cyan_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_CYAN).strength(1.25f, 4.2f)));
-        PURPLE_TERRACOTTA = register("purple_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_PURPLE).strength(1.25f, 4.2f)));
-        BLUE_TERRACOTTA = register("blue_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_BLUE).strength(1.25f, 4.2f)));
-        BROWN_TERRACOTTA = register("brown_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_BROWN).strength(1.25f, 4.2f)));
-        GREEN_TERRACOTTA = register("green_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_GREEN).strength(1.25f, 4.2f)));
-        RED_TERRACOTTA = register("red_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_RED).strength(1.25f, 4.2f)));
-        BLACK_TERRACOTTA = register("black_terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_BLACK).strength(1.25f, 4.2f)));
-        WHITE_STAINED_GLASS_PANE = register("white_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.WHITE, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        ORANGE_STAINED_GLASS_PANE = register("orange_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.ORANGE, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        MAGENTA_STAINED_GLASS_PANE = register("magenta_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.MAGENTA, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        LIGHT_BLUE_STAINED_GLASS_PANE = register("light_blue_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.LIGHT_BLUE, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        YELLOW_STAINED_GLASS_PANE = register("yellow_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.YELLOW, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        LIME_STAINED_GLASS_PANE = register("lime_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.LIME, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        PINK_STAINED_GLASS_PANE = register("pink_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.PINK, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        GRAY_STAINED_GLASS_PANE = register("gray_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.GRAY, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        LIGHT_GRAY_STAINED_GLASS_PANE = register("light_gray_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.LIGHT_GRAY, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        CYAN_STAINED_GLASS_PANE = register("cyan_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.CYAN, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        PURPLE_STAINED_GLASS_PANE = register("purple_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.PURPLE, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        BLUE_STAINED_GLASS_PANE = register("blue_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.BLUE, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        BROWN_STAINED_GLASS_PANE = register("brown_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.BROWN, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        GREEN_STAINED_GLASS_PANE = register("green_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.GREEN, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        RED_STAINED_GLASS_PANE = register("red_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.RED, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        BLACK_STAINED_GLASS_PANE = register("black_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.BLACK, Block.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
-        ACACIA_STAIRS = register("acacia_stairs", new StairBlock(Blocks.ACACIA_PLANKS.defaultBlockState(), Block.Properties.copy(Blocks.ACACIA_PLANKS)));
-        DARK_OAK_STAIRS = register("dark_oak_stairs", new StairBlock(Blocks.DARK_OAK_PLANKS.defaultBlockState(), Block.Properties.copy(Blocks.DARK_OAK_PLANKS)));
-        SLIME_BLOCK = register("slime_block", new SlimeBlock(Block.Properties.of(Material.CLAY, MaterialColor.GRASS).friction(0.8f).sound(SoundType.SLIME_BLOCK).noOcclusion()));
-        BARRIER = register("barrier", new BarrierBlock(Block.Properties.of(Material.BARRIER).strength(-1.0f, 3600000.8f).noDrops().noOcclusion()));
-        IRON_TRAPDOOR = register("iron_trapdoor", new TrapDoorBlock(Block.Properties.of(Material.METAL).strength(5.0f).sound(SoundType.METAL).noOcclusion()));
-        PRISMARINE = register("prismarine", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_CYAN).strength(1.5f, 6.0f)));
-        PRISMARINE_BRICKS = register("prismarine_bricks", new Block(Block.Properties.of(Material.STONE, MaterialColor.DIAMOND).strength(1.5f, 6.0f)));
-        DARK_PRISMARINE = register("dark_prismarine", new Block(Block.Properties.of(Material.STONE, MaterialColor.DIAMOND).strength(1.5f, 6.0f)));
-        PRISMARINE_STAIRS = register("prismarine_stairs", new StairBlock(Blocks.PRISMARINE.defaultBlockState(), Block.Properties.copy(Blocks.PRISMARINE)));
-        PRISMARINE_BRICK_STAIRS = register("prismarine_brick_stairs", new StairBlock(Blocks.PRISMARINE_BRICKS.defaultBlockState(), Block.Properties.copy(Blocks.PRISMARINE_BRICKS)));
-        DARK_PRISMARINE_STAIRS = register("dark_prismarine_stairs", new StairBlock(Blocks.DARK_PRISMARINE.defaultBlockState(), Block.Properties.copy(Blocks.DARK_PRISMARINE)));
-        PRISMARINE_SLAB = register("prismarine_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_CYAN).strength(1.5f, 6.0f)));
-        PRISMARINE_BRICK_SLAB = register("prismarine_brick_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.DIAMOND).strength(1.5f, 6.0f)));
-        DARK_PRISMARINE_SLAB = register("dark_prismarine_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.DIAMOND).strength(1.5f, 6.0f)));
-        SEA_LANTERN = register("sea_lantern", new Block(Block.Properties.of(Material.GLASS, MaterialColor.QUARTZ).strength(0.3f).sound(SoundType.GLASS).lightLevel(15)));
-        HAY_BLOCK = register("hay_block", new HayBlock(Block.Properties.of(Material.GRASS, MaterialColor.COLOR_YELLOW).strength(0.5f).sound(SoundType.GRASS)));
-        WHITE_CARPET = register("white_carpet", new WoolCarpetBlock(DyeColor.WHITE, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.SNOW).strength(0.1f).sound(SoundType.WOOL)));
-        ORANGE_CARPET = register("orange_carpet", new WoolCarpetBlock(DyeColor.ORANGE, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_ORANGE).strength(0.1f).sound(SoundType.WOOL)));
-        MAGENTA_CARPET = register("magenta_carpet", new WoolCarpetBlock(DyeColor.MAGENTA, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_MAGENTA).strength(0.1f).sound(SoundType.WOOL)));
-        LIGHT_BLUE_CARPET = register("light_blue_carpet", new WoolCarpetBlock(DyeColor.LIGHT_BLUE, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_LIGHT_BLUE).strength(0.1f).sound(SoundType.WOOL)));
-        YELLOW_CARPET = register("yellow_carpet", new WoolCarpetBlock(DyeColor.YELLOW, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_YELLOW).strength(0.1f).sound(SoundType.WOOL)));
-        LIME_CARPET = register("lime_carpet", new WoolCarpetBlock(DyeColor.LIME, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_LIGHT_GREEN).strength(0.1f).sound(SoundType.WOOL)));
-        PINK_CARPET = register("pink_carpet", new WoolCarpetBlock(DyeColor.PINK, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_PINK).strength(0.1f).sound(SoundType.WOOL)));
-        GRAY_CARPET = register("gray_carpet", new WoolCarpetBlock(DyeColor.GRAY, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_GRAY).strength(0.1f).sound(SoundType.WOOL)));
-        LIGHT_GRAY_CARPET = register("light_gray_carpet", new WoolCarpetBlock(DyeColor.LIGHT_GRAY, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_LIGHT_GRAY).strength(0.1f).sound(SoundType.WOOL)));
-        CYAN_CARPET = register("cyan_carpet", new WoolCarpetBlock(DyeColor.CYAN, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_CYAN).strength(0.1f).sound(SoundType.WOOL)));
-        PURPLE_CARPET = register("purple_carpet", new WoolCarpetBlock(DyeColor.PURPLE, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_PURPLE).strength(0.1f).sound(SoundType.WOOL)));
-        BLUE_CARPET = register("blue_carpet", new WoolCarpetBlock(DyeColor.BLUE, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_BLUE).strength(0.1f).sound(SoundType.WOOL)));
-        BROWN_CARPET = register("brown_carpet", new WoolCarpetBlock(DyeColor.BROWN, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_BROWN).strength(0.1f).sound(SoundType.WOOL)));
-        GREEN_CARPET = register("green_carpet", new WoolCarpetBlock(DyeColor.GREEN, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_GREEN).strength(0.1f).sound(SoundType.WOOL)));
-        RED_CARPET = register("red_carpet", new WoolCarpetBlock(DyeColor.RED, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_RED).strength(0.1f).sound(SoundType.WOOL)));
-        BLACK_CARPET = register("black_carpet", new WoolCarpetBlock(DyeColor.BLACK, Block.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_BLACK).strength(0.1f).sound(SoundType.WOOL)));
-        TERRACOTTA = register("terracotta", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(1.25f, 4.2f)));
-        COAL_BLOCK = register("coal_block", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).strength(5.0f, 6.0f)));
-        PACKED_ICE = register("packed_ice", new Block(Block.Properties.of(Material.ICE_SOLID).friction(0.98f).strength(0.5f).sound(SoundType.GLASS)));
-        SUNFLOWER = register("sunflower", new TallFlowerBlock(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        LILAC = register("lilac", new TallFlowerBlock(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        ROSE_BUSH = register("rose_bush", new TallFlowerBlock(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        PEONY = register("peony", new TallFlowerBlock(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        TALL_GRASS = register("tall_grass", new DoublePlantBlock(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        LARGE_FERN = register("large_fern", new DoublePlantBlock(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
-        WHITE_BANNER = register("white_banner", new BannerBlock(DyeColor.WHITE, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        ORANGE_BANNER = register("orange_banner", new BannerBlock(DyeColor.ORANGE, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        MAGENTA_BANNER = register("magenta_banner", new BannerBlock(DyeColor.MAGENTA, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        LIGHT_BLUE_BANNER = register("light_blue_banner", new BannerBlock(DyeColor.LIGHT_BLUE, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        YELLOW_BANNER = register("yellow_banner", new BannerBlock(DyeColor.YELLOW, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        LIME_BANNER = register("lime_banner", new BannerBlock(DyeColor.LIME, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        PINK_BANNER = register("pink_banner", new BannerBlock(DyeColor.PINK, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        GRAY_BANNER = register("gray_banner", new BannerBlock(DyeColor.GRAY, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        LIGHT_GRAY_BANNER = register("light_gray_banner", new BannerBlock(DyeColor.LIGHT_GRAY, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        CYAN_BANNER = register("cyan_banner", new BannerBlock(DyeColor.CYAN, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        PURPLE_BANNER = register("purple_banner", new BannerBlock(DyeColor.PURPLE, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        BLUE_BANNER = register("blue_banner", new BannerBlock(DyeColor.BLUE, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        BROWN_BANNER = register("brown_banner", new BannerBlock(DyeColor.BROWN, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        GREEN_BANNER = register("green_banner", new BannerBlock(DyeColor.GREEN, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        RED_BANNER = register("red_banner", new BannerBlock(DyeColor.RED, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        BLACK_BANNER = register("black_banner", new BannerBlock(DyeColor.BLACK, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
-        WHITE_WALL_BANNER = register("white_wall_banner", new WallBannerBlock(DyeColor.WHITE, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.WHITE_BANNER)));
-        ORANGE_WALL_BANNER = register("orange_wall_banner", new WallBannerBlock(DyeColor.ORANGE, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.ORANGE_BANNER)));
-        MAGENTA_WALL_BANNER = register("magenta_wall_banner", new WallBannerBlock(DyeColor.MAGENTA, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.MAGENTA_BANNER)));
-        LIGHT_BLUE_WALL_BANNER = register("light_blue_wall_banner", new WallBannerBlock(DyeColor.LIGHT_BLUE, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.LIGHT_BLUE_BANNER)));
-        YELLOW_WALL_BANNER = register("yellow_wall_banner", new WallBannerBlock(DyeColor.YELLOW, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.YELLOW_BANNER)));
-        LIME_WALL_BANNER = register("lime_wall_banner", new WallBannerBlock(DyeColor.LIME, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.LIME_BANNER)));
-        PINK_WALL_BANNER = register("pink_wall_banner", new WallBannerBlock(DyeColor.PINK, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.PINK_BANNER)));
-        GRAY_WALL_BANNER = register("gray_wall_banner", new WallBannerBlock(DyeColor.GRAY, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.GRAY_BANNER)));
-        LIGHT_GRAY_WALL_BANNER = register("light_gray_wall_banner", new WallBannerBlock(DyeColor.LIGHT_GRAY, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.LIGHT_GRAY_BANNER)));
-        CYAN_WALL_BANNER = register("cyan_wall_banner", new WallBannerBlock(DyeColor.CYAN, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.CYAN_BANNER)));
-        PURPLE_WALL_BANNER = register("purple_wall_banner", new WallBannerBlock(DyeColor.PURPLE, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.PURPLE_BANNER)));
-        BLUE_WALL_BANNER = register("blue_wall_banner", new WallBannerBlock(DyeColor.BLUE, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.BLUE_BANNER)));
-        BROWN_WALL_BANNER = register("brown_wall_banner", new WallBannerBlock(DyeColor.BROWN, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.BROWN_BANNER)));
-        GREEN_WALL_BANNER = register("green_wall_banner", new WallBannerBlock(DyeColor.GREEN, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.GREEN_BANNER)));
-        RED_WALL_BANNER = register("red_wall_banner", new WallBannerBlock(DyeColor.RED, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.RED_BANNER)));
-        BLACK_WALL_BANNER = register("black_wall_banner", new WallBannerBlock(DyeColor.BLACK, Block.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.BLACK_BANNER)));
-        RED_SANDSTONE = register("red_sandstone", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(0.8f)));
-        CHISELED_RED_SANDSTONE = register("chiseled_red_sandstone", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(0.8f)));
-        CUT_RED_SANDSTONE = register("cut_red_sandstone", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(0.8f)));
-        RED_SANDSTONE_STAIRS = register("red_sandstone_stairs", new StairBlock(Blocks.RED_SANDSTONE.defaultBlockState(), Block.Properties.copy(Blocks.RED_SANDSTONE)));
-        OAK_SLAB = register("oak_slab", new SlabBlock(Block.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        SPRUCE_SLAB = register("spruce_slab", new SlabBlock(Block.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        BIRCH_SLAB = register("birch_slab", new SlabBlock(Block.Properties.of(Material.WOOD, MaterialColor.SAND).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        JUNGLE_SLAB = register("jungle_slab", new SlabBlock(Block.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        ACACIA_SLAB = register("acacia_slab", new SlabBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        DARK_OAK_SLAB = register("dark_oak_slab", new SlabBlock(Block.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        STONE_SLAB = register("stone_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.STONE).strength(2.0f, 6.0f)));
-        SMOOTH_STONE_SLAB = register("smooth_stone_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.STONE).strength(2.0f, 6.0f)));
-        SANDSTONE_SLAB = register("sandstone_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.SAND).strength(2.0f, 6.0f)));
-        CUT_SANDSTONE_SLAB = register("cut_sandstone_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.SAND).strength(2.0f, 6.0f)));
-        PETRIFIED_OAK_SLAB = register("petrified_oak_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.WOOD).strength(2.0f, 6.0f)));
-        COBBLESTONE_SLAB = register("cobblestone_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.STONE).strength(2.0f, 6.0f)));
-        BRICK_SLAB = register("brick_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_RED).strength(2.0f, 6.0f)));
-        STONE_BRICK_SLAB = register("stone_brick_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.STONE).strength(2.0f, 6.0f)));
-        NETHER_BRICK_SLAB = register("nether_brick_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.NETHER).strength(2.0f, 6.0f)));
-        QUARTZ_SLAB = register("quartz_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.QUARTZ).strength(2.0f, 6.0f)));
-        RED_SANDSTONE_SLAB = register("red_sandstone_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(2.0f, 6.0f)));
-        CUT_RED_SANDSTONE_SLAB = register("cut_red_sandstone_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(2.0f, 6.0f)));
-        PURPUR_SLAB = register("purpur_slab", new SlabBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_MAGENTA).strength(2.0f, 6.0f)));
-        SMOOTH_STONE = register("smooth_stone", new Block(Block.Properties.of(Material.STONE, MaterialColor.STONE).strength(2.0f, 6.0f)));
-        SMOOTH_SANDSTONE = register("smooth_sandstone", new Block(Block.Properties.of(Material.STONE, MaterialColor.SAND).strength(2.0f, 6.0f)));
-        SMOOTH_QUARTZ = register("smooth_quartz", new Block(Block.Properties.of(Material.STONE, MaterialColor.QUARTZ).strength(2.0f, 6.0f)));
-        SMOOTH_RED_SANDSTONE = register("smooth_red_sandstone", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(2.0f, 6.0f)));
-        SPRUCE_FENCE_GATE = register("spruce_fence_gate", new FenceGateBlock(Block.Properties.of(Material.WOOD, Blocks.SPRUCE_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        BIRCH_FENCE_GATE = register("birch_fence_gate", new FenceGateBlock(Block.Properties.of(Material.WOOD, Blocks.BIRCH_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        JUNGLE_FENCE_GATE = register("jungle_fence_gate", new FenceGateBlock(Block.Properties.of(Material.WOOD, Blocks.JUNGLE_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        ACACIA_FENCE_GATE = register("acacia_fence_gate", new FenceGateBlock(Block.Properties.of(Material.WOOD, Blocks.ACACIA_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        DARK_OAK_FENCE_GATE = register("dark_oak_fence_gate", new FenceGateBlock(Block.Properties.of(Material.WOOD, Blocks.DARK_OAK_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        SPRUCE_FENCE = register("spruce_fence", new FenceBlock(Block.Properties.of(Material.WOOD, Blocks.SPRUCE_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        BIRCH_FENCE = register("birch_fence", new FenceBlock(Block.Properties.of(Material.WOOD, Blocks.BIRCH_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        JUNGLE_FENCE = register("jungle_fence", new FenceBlock(Block.Properties.of(Material.WOOD, Blocks.JUNGLE_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        ACACIA_FENCE = register("acacia_fence", new FenceBlock(Block.Properties.of(Material.WOOD, Blocks.ACACIA_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        DARK_OAK_FENCE = register("dark_oak_fence", new FenceBlock(Block.Properties.of(Material.WOOD, Blocks.DARK_OAK_PLANKS.materialColor).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
-        SPRUCE_DOOR = register("spruce_door", new DoorBlock(Block.Properties.of(Material.WOOD, Blocks.SPRUCE_PLANKS.materialColor).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        BIRCH_DOOR = register("birch_door", new DoorBlock(Block.Properties.of(Material.WOOD, Blocks.BIRCH_PLANKS.materialColor).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        JUNGLE_DOOR = register("jungle_door", new DoorBlock(Block.Properties.of(Material.WOOD, Blocks.JUNGLE_PLANKS.materialColor).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        ACACIA_DOOR = register("acacia_door", new DoorBlock(Block.Properties.of(Material.WOOD, Blocks.ACACIA_PLANKS.materialColor).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        DARK_OAK_DOOR = register("dark_oak_door", new DoorBlock(Block.Properties.of(Material.WOOD, Blocks.DARK_OAK_PLANKS.materialColor).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
-        END_ROD = register("end_rod", new EndRodBlock(Block.Properties.of(Material.DECORATION).instabreak().lightLevel(14).sound(SoundType.WOOD).noOcclusion()));
-        CHORUS_PLANT = register("chorus_plant", new ChorusPlantBlock(Block.Properties.of(Material.PLANT, MaterialColor.COLOR_PURPLE).strength(0.4f).sound(SoundType.WOOD).noOcclusion()));
-        CHORUS_FLOWER = register("chorus_flower", new ChorusFlowerBlock((ChorusPlantBlock)Blocks.CHORUS_PLANT, Block.Properties.of(Material.PLANT, MaterialColor.COLOR_PURPLE).randomTicks().strength(0.4f).sound(SoundType.WOOD).noOcclusion()));
-        PURPUR_BLOCK = register("purpur_block", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_MAGENTA).strength(1.5f, 6.0f)));
-        PURPUR_PILLAR = register("purpur_pillar", new RotatedPillarBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_MAGENTA).strength(1.5f, 6.0f)));
-        PURPUR_STAIRS = register("purpur_stairs", new StairBlock(Blocks.PURPUR_BLOCK.defaultBlockState(), Block.Properties.copy(Blocks.PURPUR_BLOCK)));
-        END_STONE_BRICKS = register("end_stone_bricks", new Block(Block.Properties.of(Material.STONE, MaterialColor.SAND).strength(3.0f, 9.0f)));
-        BEETROOTS = register("beetroots", new BeetrootBlock(Block.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.CROP)));
-        GRASS_PATH = register("grass_path", new GrassPathBlock(Block.Properties.of(Material.DIRT).strength(0.65f).sound(SoundType.GRASS)));
-        END_GATEWAY = register("end_gateway", new EndGatewayBlock(Block.Properties.of(Material.PORTAL, MaterialColor.COLOR_BLACK).noCollission().lightLevel(15).strength(-1.0f, 3600000.0f).noDrops()));
-        REPEATING_COMMAND_BLOCK = register("repeating_command_block", new CommandBlock(Block.Properties.of(Material.METAL, MaterialColor.COLOR_PURPLE).strength(-1.0f, 3600000.0f).noDrops()));
-        CHAIN_COMMAND_BLOCK = register("chain_command_block", new CommandBlock(Block.Properties.of(Material.METAL, MaterialColor.COLOR_GREEN).strength(-1.0f, 3600000.0f).noDrops()));
-        FROSTED_ICE = register("frosted_ice", new FrostedIceBlock(Block.Properties.of(Material.ICE).friction(0.98f).randomTicks().strength(0.5f).sound(SoundType.GLASS).noOcclusion()));
-        MAGMA_BLOCK = register("magma_block", new MagmaBlock(Block.Properties.of(Material.STONE, MaterialColor.NETHER).lightLevel(3).randomTicks().strength(0.5f)));
-        NETHER_WART_BLOCK = register("nether_wart_block", new Block(Block.Properties.of(Material.GRASS, MaterialColor.COLOR_RED).strength(1.0f).sound(SoundType.WOOD)));
-        RED_NETHER_BRICKS = register("red_nether_bricks", new Block(Block.Properties.of(Material.STONE, MaterialColor.NETHER).strength(2.0f, 6.0f)));
-        BONE_BLOCK = register("bone_block", new RotatedPillarBlock(Block.Properties.of(Material.STONE, MaterialColor.SAND).strength(2.0f)));
-        STRUCTURE_VOID = register("structure_void", new StructureVoidBlock(Block.Properties.of(Material.STRUCTURAL_AIR).noCollission().noDrops()));
-        OBSERVER = register("observer", new ObserverBlock(Block.Properties.of(Material.STONE).strength(3.0f)));
-        SHULKER_BOX = register("shulker_box", new ShulkerBoxBlock(null, Block.Properties.of(Material.SHULKER_SHELL).strength(2.0f).dynamicShape().noOcclusion()));
-        WHITE_SHULKER_BOX = register("white_shulker_box", new ShulkerBoxBlock(DyeColor.WHITE, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.SNOW).strength(2.0f).dynamicShape().noOcclusion()));
-        ORANGE_SHULKER_BOX = register("orange_shulker_box", new ShulkerBoxBlock(DyeColor.ORANGE, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_ORANGE).strength(2.0f).dynamicShape().noOcclusion()));
-        MAGENTA_SHULKER_BOX = register("magenta_shulker_box", new ShulkerBoxBlock(DyeColor.MAGENTA, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_MAGENTA).strength(2.0f).dynamicShape().noOcclusion()));
-        LIGHT_BLUE_SHULKER_BOX = register("light_blue_shulker_box", new ShulkerBoxBlock(DyeColor.LIGHT_BLUE, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_LIGHT_BLUE).strength(2.0f).dynamicShape().noOcclusion()));
-        YELLOW_SHULKER_BOX = register("yellow_shulker_box", new ShulkerBoxBlock(DyeColor.YELLOW, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_YELLOW).strength(2.0f).dynamicShape().noOcclusion()));
-        LIME_SHULKER_BOX = register("lime_shulker_box", new ShulkerBoxBlock(DyeColor.LIME, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_LIGHT_GREEN).strength(2.0f).dynamicShape().noOcclusion()));
-        PINK_SHULKER_BOX = register("pink_shulker_box", new ShulkerBoxBlock(DyeColor.PINK, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_PINK).strength(2.0f).dynamicShape().noOcclusion()));
-        GRAY_SHULKER_BOX = register("gray_shulker_box", new ShulkerBoxBlock(DyeColor.GRAY, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_GRAY).strength(2.0f).dynamicShape().noOcclusion()));
-        LIGHT_GRAY_SHULKER_BOX = register("light_gray_shulker_box", new ShulkerBoxBlock(DyeColor.LIGHT_GRAY, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_LIGHT_GRAY).strength(2.0f).dynamicShape().noOcclusion()));
-        CYAN_SHULKER_BOX = register("cyan_shulker_box", new ShulkerBoxBlock(DyeColor.CYAN, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_CYAN).strength(2.0f).dynamicShape().noOcclusion()));
-        PURPLE_SHULKER_BOX = register("purple_shulker_box", new ShulkerBoxBlock(DyeColor.PURPLE, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.TERRACOTTA_PURPLE).strength(2.0f).dynamicShape().noOcclusion()));
-        BLUE_SHULKER_BOX = register("blue_shulker_box", new ShulkerBoxBlock(DyeColor.BLUE, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_BLUE).strength(2.0f).dynamicShape().noOcclusion()));
-        BROWN_SHULKER_BOX = register("brown_shulker_box", new ShulkerBoxBlock(DyeColor.BROWN, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_BROWN).strength(2.0f).dynamicShape().noOcclusion()));
-        GREEN_SHULKER_BOX = register("green_shulker_box", new ShulkerBoxBlock(DyeColor.GREEN, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_GREEN).strength(2.0f).dynamicShape().noOcclusion()));
-        RED_SHULKER_BOX = register("red_shulker_box", new ShulkerBoxBlock(DyeColor.RED, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_RED).strength(2.0f).dynamicShape().noOcclusion()));
-        BLACK_SHULKER_BOX = register("black_shulker_box", new ShulkerBoxBlock(DyeColor.BLACK, Block.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_BLACK).strength(2.0f).dynamicShape().noOcclusion()));
-        WHITE_GLAZED_TERRACOTTA = register("white_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.WHITE).strength(1.4f)));
-        ORANGE_GLAZED_TERRACOTTA = register("orange_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.ORANGE).strength(1.4f)));
-        MAGENTA_GLAZED_TERRACOTTA = register("magenta_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.MAGENTA).strength(1.4f)));
-        LIGHT_BLUE_GLAZED_TERRACOTTA = register("light_blue_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.LIGHT_BLUE).strength(1.4f)));
-        YELLOW_GLAZED_TERRACOTTA = register("yellow_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.YELLOW).strength(1.4f)));
-        LIME_GLAZED_TERRACOTTA = register("lime_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.LIME).strength(1.4f)));
-        PINK_GLAZED_TERRACOTTA = register("pink_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.PINK).strength(1.4f)));
-        GRAY_GLAZED_TERRACOTTA = register("gray_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.GRAY).strength(1.4f)));
-        LIGHT_GRAY_GLAZED_TERRACOTTA = register("light_gray_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.LIGHT_GRAY).strength(1.4f)));
-        CYAN_GLAZED_TERRACOTTA = register("cyan_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.CYAN).strength(1.4f)));
-        PURPLE_GLAZED_TERRACOTTA = register("purple_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.PURPLE).strength(1.4f)));
-        BLUE_GLAZED_TERRACOTTA = register("blue_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.BLUE).strength(1.4f)));
-        BROWN_GLAZED_TERRACOTTA = register("brown_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.BROWN).strength(1.4f)));
-        GREEN_GLAZED_TERRACOTTA = register("green_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.GREEN).strength(1.4f)));
-        RED_GLAZED_TERRACOTTA = register("red_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.RED).strength(1.4f)));
-        BLACK_GLAZED_TERRACOTTA = register("black_glazed_terracotta", new GlazedTerracottaBlock(Block.Properties.of(Material.STONE, DyeColor.BLACK).strength(1.4f)));
-        WHITE_CONCRETE = register("white_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.WHITE).strength(1.8f)));
-        ORANGE_CONCRETE = register("orange_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.ORANGE).strength(1.8f)));
-        MAGENTA_CONCRETE = register("magenta_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.MAGENTA).strength(1.8f)));
-        LIGHT_BLUE_CONCRETE = register("light_blue_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.LIGHT_BLUE).strength(1.8f)));
-        YELLOW_CONCRETE = register("yellow_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.YELLOW).strength(1.8f)));
-        LIME_CONCRETE = register("lime_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.LIME).strength(1.8f)));
-        PINK_CONCRETE = register("pink_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.PINK).strength(1.8f)));
-        GRAY_CONCRETE = register("gray_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.GRAY).strength(1.8f)));
-        LIGHT_GRAY_CONCRETE = register("light_gray_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.LIGHT_GRAY).strength(1.8f)));
-        CYAN_CONCRETE = register("cyan_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.CYAN).strength(1.8f)));
-        PURPLE_CONCRETE = register("purple_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.PURPLE).strength(1.8f)));
-        BLUE_CONCRETE = register("blue_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.BLUE).strength(1.8f)));
-        BROWN_CONCRETE = register("brown_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.BROWN).strength(1.8f)));
-        GREEN_CONCRETE = register("green_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.GREEN).strength(1.8f)));
-        RED_CONCRETE = register("red_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.RED).strength(1.8f)));
-        BLACK_CONCRETE = register("black_concrete", new Block(Block.Properties.of(Material.STONE, DyeColor.BLACK).strength(1.8f)));
-        WHITE_CONCRETE_POWDER = register("white_concrete_powder", new ConcretePowderBlock(Blocks.WHITE_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.WHITE).strength(0.5f).sound(SoundType.SAND)));
-        ORANGE_CONCRETE_POWDER = register("orange_concrete_powder", new ConcretePowderBlock(Blocks.ORANGE_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.ORANGE).strength(0.5f).sound(SoundType.SAND)));
-        MAGENTA_CONCRETE_POWDER = register("magenta_concrete_powder", new ConcretePowderBlock(Blocks.MAGENTA_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.MAGENTA).strength(0.5f).sound(SoundType.SAND)));
-        LIGHT_BLUE_CONCRETE_POWDER = register("light_blue_concrete_powder", new ConcretePowderBlock(Blocks.LIGHT_BLUE_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.LIGHT_BLUE).strength(0.5f).sound(SoundType.SAND)));
-        YELLOW_CONCRETE_POWDER = register("yellow_concrete_powder", new ConcretePowderBlock(Blocks.YELLOW_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.YELLOW).strength(0.5f).sound(SoundType.SAND)));
-        LIME_CONCRETE_POWDER = register("lime_concrete_powder", new ConcretePowderBlock(Blocks.LIME_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.LIME).strength(0.5f).sound(SoundType.SAND)));
-        PINK_CONCRETE_POWDER = register("pink_concrete_powder", new ConcretePowderBlock(Blocks.PINK_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.PINK).strength(0.5f).sound(SoundType.SAND)));
-        GRAY_CONCRETE_POWDER = register("gray_concrete_powder", new ConcretePowderBlock(Blocks.GRAY_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.GRAY).strength(0.5f).sound(SoundType.SAND)));
-        LIGHT_GRAY_CONCRETE_POWDER = register("light_gray_concrete_powder", new ConcretePowderBlock(Blocks.LIGHT_GRAY_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.LIGHT_GRAY).strength(0.5f).sound(SoundType.SAND)));
-        CYAN_CONCRETE_POWDER = register("cyan_concrete_powder", new ConcretePowderBlock(Blocks.CYAN_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.CYAN).strength(0.5f).sound(SoundType.SAND)));
-        PURPLE_CONCRETE_POWDER = register("purple_concrete_powder", new ConcretePowderBlock(Blocks.PURPLE_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.PURPLE).strength(0.5f).sound(SoundType.SAND)));
-        BLUE_CONCRETE_POWDER = register("blue_concrete_powder", new ConcretePowderBlock(Blocks.BLUE_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.BLUE).strength(0.5f).sound(SoundType.SAND)));
-        BROWN_CONCRETE_POWDER = register("brown_concrete_powder", new ConcretePowderBlock(Blocks.BROWN_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.BROWN).strength(0.5f).sound(SoundType.SAND)));
-        GREEN_CONCRETE_POWDER = register("green_concrete_powder", new ConcretePowderBlock(Blocks.GREEN_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.GREEN).strength(0.5f).sound(SoundType.SAND)));
-        RED_CONCRETE_POWDER = register("red_concrete_powder", new ConcretePowderBlock(Blocks.RED_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.RED).strength(0.5f).sound(SoundType.SAND)));
-        BLACK_CONCRETE_POWDER = register("black_concrete_powder", new ConcretePowderBlock(Blocks.BLACK_CONCRETE, Block.Properties.of(Material.SAND, DyeColor.BLACK).strength(0.5f).sound(SoundType.SAND)));
-        KELP = register("kelp", new KelpBlock(Block.Properties.of(Material.WATER_PLANT).noCollission().randomTicks().instabreak().sound(SoundType.WET_GRASS)));
-        KELP_PLANT = register("kelp_plant", new KelpPlantBlock((KelpBlock)Blocks.KELP, Block.Properties.of(Material.WATER_PLANT).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        DRIED_KELP_BLOCK = register("dried_kelp_block", new Block(Block.Properties.of(Material.GRASS, MaterialColor.COLOR_GREEN).strength(0.5f, 2.5f).sound(SoundType.GRASS)));
-        TURTLE_EGG = register("turtle_egg", new TurtleEggBlock(Block.Properties.of(Material.EGG, MaterialColor.SAND).strength(0.5f).sound(SoundType.METAL).randomTicks().noOcclusion()));
-        DEAD_TUBE_CORAL_BLOCK = register("dead_tube_coral_block", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).strength(1.5f, 6.0f)));
-        DEAD_BRAIN_CORAL_BLOCK = register("dead_brain_coral_block", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).strength(1.5f, 6.0f)));
-        DEAD_BUBBLE_CORAL_BLOCK = register("dead_bubble_coral_block", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).strength(1.5f, 6.0f)));
-        DEAD_FIRE_CORAL_BLOCK = register("dead_fire_coral_block", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).strength(1.5f, 6.0f)));
-        DEAD_HORN_CORAL_BLOCK = register("dead_horn_coral_block", new Block(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).strength(1.5f, 6.0f)));
-        TUBE_CORAL_BLOCK = register("tube_coral_block", new CoralBlock(Blocks.DEAD_TUBE_CORAL_BLOCK, Block.Properties.of(Material.STONE, MaterialColor.COLOR_BLUE).strength(1.5f, 6.0f).sound(SoundType.CORAL_BLOCK)));
-        BRAIN_CORAL_BLOCK = register("brain_coral_block", new CoralBlock(Blocks.DEAD_BRAIN_CORAL_BLOCK, Block.Properties.of(Material.STONE, MaterialColor.COLOR_PINK).strength(1.5f, 6.0f).sound(SoundType.CORAL_BLOCK)));
-        BUBBLE_CORAL_BLOCK = register("bubble_coral_block", new CoralBlock(Blocks.DEAD_BUBBLE_CORAL_BLOCK, Block.Properties.of(Material.STONE, MaterialColor.COLOR_PURPLE).strength(1.5f, 6.0f).sound(SoundType.CORAL_BLOCK)));
-        FIRE_CORAL_BLOCK = register("fire_coral_block", new CoralBlock(Blocks.DEAD_FIRE_CORAL_BLOCK, Block.Properties.of(Material.STONE, MaterialColor.COLOR_RED).strength(1.5f, 6.0f).sound(SoundType.CORAL_BLOCK)));
-        HORN_CORAL_BLOCK = register("horn_coral_block", new CoralBlock(Blocks.DEAD_HORN_CORAL_BLOCK, Block.Properties.of(Material.STONE, MaterialColor.COLOR_YELLOW).strength(1.5f, 6.0f).sound(SoundType.CORAL_BLOCK)));
-        DEAD_TUBE_CORAL = register("dead_tube_coral", new BaseCoralPlantBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak()));
-        DEAD_BRAIN_CORAL = register("dead_brain_coral", new BaseCoralPlantBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak()));
-        DEAD_BUBBLE_CORAL = register("dead_bubble_coral", new BaseCoralPlantBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak()));
-        DEAD_FIRE_CORAL = register("dead_fire_coral", new BaseCoralPlantBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak()));
-        DEAD_HORN_CORAL = register("dead_horn_coral", new BaseCoralPlantBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak()));
-        TUBE_CORAL = register("tube_coral", new CoralPlantBlock(Blocks.DEAD_TUBE_CORAL, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_BLUE).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        BRAIN_CORAL = register("brain_coral", new CoralPlantBlock(Blocks.DEAD_BRAIN_CORAL, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PINK).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        BUBBLE_CORAL = register("bubble_coral", new CoralPlantBlock(Blocks.DEAD_BUBBLE_CORAL, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PURPLE).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        FIRE_CORAL = register("fire_coral", new CoralPlantBlock(Blocks.DEAD_FIRE_CORAL, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_RED).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        HORN_CORAL = register("horn_coral", new CoralPlantBlock(Blocks.DEAD_HORN_CORAL, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_YELLOW).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        DEAD_TUBE_CORAL_FAN = register("dead_tube_coral_fan", new BaseCoralFanBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak()));
-        DEAD_BRAIN_CORAL_FAN = register("dead_brain_coral_fan", new BaseCoralFanBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak()));
-        DEAD_BUBBLE_CORAL_FAN = register("dead_bubble_coral_fan", new BaseCoralFanBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak()));
-        DEAD_FIRE_CORAL_FAN = register("dead_fire_coral_fan", new BaseCoralFanBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak()));
-        DEAD_HORN_CORAL_FAN = register("dead_horn_coral_fan", new BaseCoralFanBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak()));
-        TUBE_CORAL_FAN = register("tube_coral_fan", new CoralFanBlock(Blocks.DEAD_TUBE_CORAL_FAN, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_BLUE).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        BRAIN_CORAL_FAN = register("brain_coral_fan", new CoralFanBlock(Blocks.DEAD_BRAIN_CORAL_FAN, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PINK).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        BUBBLE_CORAL_FAN = register("bubble_coral_fan", new CoralFanBlock(Blocks.DEAD_BUBBLE_CORAL_FAN, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PURPLE).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        FIRE_CORAL_FAN = register("fire_coral_fan", new CoralFanBlock(Blocks.DEAD_FIRE_CORAL_FAN, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_RED).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        HORN_CORAL_FAN = register("horn_coral_fan", new CoralFanBlock(Blocks.DEAD_HORN_CORAL_FAN, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_YELLOW).noCollission().instabreak().sound(SoundType.WET_GRASS)));
-        DEAD_TUBE_CORAL_WALL_FAN = register("dead_tube_coral_wall_fan", new BaseCoralWallFanBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak().dropsLike(Blocks.DEAD_TUBE_CORAL_FAN)));
-        DEAD_BRAIN_CORAL_WALL_FAN = register("dead_brain_coral_wall_fan", new BaseCoralWallFanBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak().dropsLike(Blocks.DEAD_BRAIN_CORAL_FAN)));
-        DEAD_BUBBLE_CORAL_WALL_FAN = register("dead_bubble_coral_wall_fan", new BaseCoralWallFanBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak().dropsLike(Blocks.DEAD_BUBBLE_CORAL_FAN)));
-        DEAD_FIRE_CORAL_WALL_FAN = register("dead_fire_coral_wall_fan", new BaseCoralWallFanBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak().dropsLike(Blocks.DEAD_FIRE_CORAL_FAN)));
-        DEAD_HORN_CORAL_WALL_FAN = register("dead_horn_coral_wall_fan", new BaseCoralWallFanBlock(Block.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).noCollission().instabreak().dropsLike(Blocks.DEAD_HORN_CORAL_FAN)));
-        TUBE_CORAL_WALL_FAN = register("tube_coral_wall_fan", new CoralWallFanBlock(Blocks.DEAD_TUBE_CORAL_WALL_FAN, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_BLUE).noCollission().instabreak().sound(SoundType.WET_GRASS).dropsLike(Blocks.TUBE_CORAL_FAN)));
-        BRAIN_CORAL_WALL_FAN = register("brain_coral_wall_fan", new CoralWallFanBlock(Blocks.DEAD_BRAIN_CORAL_WALL_FAN, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PINK).noCollission().instabreak().sound(SoundType.WET_GRASS).dropsLike(Blocks.BRAIN_CORAL_FAN)));
-        BUBBLE_CORAL_WALL_FAN = register("bubble_coral_wall_fan", new CoralWallFanBlock(Blocks.DEAD_BUBBLE_CORAL_WALL_FAN, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PURPLE).noCollission().instabreak().sound(SoundType.WET_GRASS).dropsLike(Blocks.BUBBLE_CORAL_FAN)));
-        FIRE_CORAL_WALL_FAN = register("fire_coral_wall_fan", new CoralWallFanBlock(Blocks.DEAD_FIRE_CORAL_WALL_FAN, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_RED).noCollission().instabreak().sound(SoundType.WET_GRASS).dropsLike(Blocks.FIRE_CORAL_FAN)));
-        HORN_CORAL_WALL_FAN = register("horn_coral_wall_fan", new CoralWallFanBlock(Blocks.DEAD_HORN_CORAL_WALL_FAN, Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_YELLOW).noCollission().instabreak().sound(SoundType.WET_GRASS).dropsLike(Blocks.HORN_CORAL_FAN)));
-        SEA_PICKLE = register("sea_pickle", new SeaPickleBlock(Block.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_GREEN).lightLevel(3).sound(SoundType.SLIME_BLOCK).noOcclusion()));
-        BLUE_ICE = register("blue_ice", new HalfTransparentBlock(Block.Properties.of(Material.ICE_SOLID).strength(2.8f).friction(0.989f).sound(SoundType.GLASS)));
-        CONDUIT = register("conduit", new ConduitBlock(Block.Properties.of(Material.GLASS, MaterialColor.DIAMOND).strength(3.0f).lightLevel(15).noOcclusion()));
-        BAMBOO_SAPLING = register("bamboo_sapling", new BambooSaplingBlock(Block.Properties.of(Material.BAMBOO_SAPLING).randomTicks().instabreak().noCollission().strength(1.0f).sound(SoundType.BAMBOO_SAPLING)));
-        BAMBOO = register("bamboo", new BambooBlock(Block.Properties.of(Material.BAMBOO, MaterialColor.PLANT).randomTicks().instabreak().strength(1.0f).sound(SoundType.BAMBOO).noOcclusion()));
-        POTTED_BAMBOO = register("potted_bamboo", new FlowerPotBlock(Blocks.BAMBOO, Block.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
-        VOID_AIR = register("void_air", new AirBlock(Block.Properties.of(Material.AIR).noCollission().noDrops()));
-        CAVE_AIR = register("cave_air", new AirBlock(Block.Properties.of(Material.AIR).noCollission().noDrops()));
-        BUBBLE_COLUMN = register("bubble_column", new BubbleColumnBlock(Block.Properties.of(Material.BUBBLE_COLUMN).noCollission().noDrops()));
-        POLISHED_GRANITE_STAIRS = register("polished_granite_stairs", new StairBlock(Blocks.POLISHED_GRANITE.defaultBlockState(), Block.Properties.copy(Blocks.POLISHED_GRANITE)));
-        SMOOTH_RED_SANDSTONE_STAIRS = register("smooth_red_sandstone_stairs", new StairBlock(Blocks.SMOOTH_RED_SANDSTONE.defaultBlockState(), Block.Properties.copy(Blocks.SMOOTH_RED_SANDSTONE)));
-        MOSSY_STONE_BRICK_STAIRS = register("mossy_stone_brick_stairs", new StairBlock(Blocks.MOSSY_STONE_BRICKS.defaultBlockState(), Block.Properties.copy(Blocks.MOSSY_STONE_BRICKS)));
-        POLISHED_DIORITE_STAIRS = register("polished_diorite_stairs", new StairBlock(Blocks.POLISHED_DIORITE.defaultBlockState(), Block.Properties.copy(Blocks.POLISHED_DIORITE)));
-        MOSSY_COBBLESTONE_STAIRS = register("mossy_cobblestone_stairs", new StairBlock(Blocks.MOSSY_COBBLESTONE.defaultBlockState(), Block.Properties.copy(Blocks.MOSSY_COBBLESTONE)));
-        END_STONE_BRICK_STAIRS = register("end_stone_brick_stairs", new StairBlock(Blocks.END_STONE_BRICKS.defaultBlockState(), Block.Properties.copy(Blocks.END_STONE_BRICKS)));
-        STONE_STAIRS = register("stone_stairs", new StairBlock(Blocks.STONE.defaultBlockState(), Block.Properties.copy(Blocks.STONE)));
-        SMOOTH_SANDSTONE_STAIRS = register("smooth_sandstone_stairs", new StairBlock(Blocks.SMOOTH_SANDSTONE.defaultBlockState(), Block.Properties.copy(Blocks.SMOOTH_SANDSTONE)));
-        SMOOTH_QUARTZ_STAIRS = register("smooth_quartz_stairs", new StairBlock(Blocks.SMOOTH_QUARTZ.defaultBlockState(), Block.Properties.copy(Blocks.SMOOTH_QUARTZ)));
-        GRANITE_STAIRS = register("granite_stairs", new StairBlock(Blocks.GRANITE.defaultBlockState(), Block.Properties.copy(Blocks.GRANITE)));
-        ANDESITE_STAIRS = register("andesite_stairs", new StairBlock(Blocks.ANDESITE.defaultBlockState(), Block.Properties.copy(Blocks.ANDESITE)));
-        RED_NETHER_BRICK_STAIRS = register("red_nether_brick_stairs", new StairBlock(Blocks.RED_NETHER_BRICKS.defaultBlockState(), Block.Properties.copy(Blocks.RED_NETHER_BRICKS)));
-        POLISHED_ANDESITE_STAIRS = register("polished_andesite_stairs", new StairBlock(Blocks.POLISHED_ANDESITE.defaultBlockState(), Block.Properties.copy(Blocks.POLISHED_ANDESITE)));
-        DIORITE_STAIRS = register("diorite_stairs", new StairBlock(Blocks.DIORITE.defaultBlockState(), Block.Properties.copy(Blocks.DIORITE)));
-        POLISHED_GRANITE_SLAB = register("polished_granite_slab", new SlabBlock(Block.Properties.copy(Blocks.POLISHED_GRANITE)));
-        SMOOTH_RED_SANDSTONE_SLAB = register("smooth_red_sandstone_slab", new SlabBlock(Block.Properties.copy(Blocks.SMOOTH_RED_SANDSTONE)));
-        MOSSY_STONE_BRICK_SLAB = register("mossy_stone_brick_slab", new SlabBlock(Block.Properties.copy(Blocks.MOSSY_STONE_BRICKS)));
-        POLISHED_DIORITE_SLAB = register("polished_diorite_slab", new SlabBlock(Block.Properties.copy(Blocks.POLISHED_DIORITE)));
-        MOSSY_COBBLESTONE_SLAB = register("mossy_cobblestone_slab", new SlabBlock(Block.Properties.copy(Blocks.MOSSY_COBBLESTONE)));
-        END_STONE_BRICK_SLAB = register("end_stone_brick_slab", new SlabBlock(Block.Properties.copy(Blocks.END_STONE_BRICKS)));
-        SMOOTH_SANDSTONE_SLAB = register("smooth_sandstone_slab", new SlabBlock(Block.Properties.copy(Blocks.SMOOTH_SANDSTONE)));
-        SMOOTH_QUARTZ_SLAB = register("smooth_quartz_slab", new SlabBlock(Block.Properties.copy(Blocks.SMOOTH_QUARTZ)));
-        GRANITE_SLAB = register("granite_slab", new SlabBlock(Block.Properties.copy(Blocks.GRANITE)));
-        ANDESITE_SLAB = register("andesite_slab", new SlabBlock(Block.Properties.copy(Blocks.ANDESITE)));
-        RED_NETHER_BRICK_SLAB = register("red_nether_brick_slab", new SlabBlock(Block.Properties.copy(Blocks.RED_NETHER_BRICKS)));
-        POLISHED_ANDESITE_SLAB = register("polished_andesite_slab", new SlabBlock(Block.Properties.copy(Blocks.POLISHED_ANDESITE)));
-        DIORITE_SLAB = register("diorite_slab", new SlabBlock(Block.Properties.copy(Blocks.DIORITE)));
-        BRICK_WALL = register("brick_wall", new WallBlock(Block.Properties.copy(Blocks.BRICKS)));
-        PRISMARINE_WALL = register("prismarine_wall", new WallBlock(Block.Properties.copy(Blocks.PRISMARINE)));
-        RED_SANDSTONE_WALL = register("red_sandstone_wall", new WallBlock(Block.Properties.copy(Blocks.RED_SANDSTONE)));
-        MOSSY_STONE_BRICK_WALL = register("mossy_stone_brick_wall", new WallBlock(Block.Properties.copy(Blocks.MOSSY_STONE_BRICKS)));
-        GRANITE_WALL = register("granite_wall", new WallBlock(Block.Properties.copy(Blocks.GRANITE)));
-        STONE_BRICK_WALL = register("stone_brick_wall", new WallBlock(Block.Properties.copy(Blocks.STONE_BRICKS)));
-        NETHER_BRICK_WALL = register("nether_brick_wall", new WallBlock(Block.Properties.copy(Blocks.NETHER_BRICKS)));
-        ANDESITE_WALL = register("andesite_wall", new WallBlock(Block.Properties.copy(Blocks.ANDESITE)));
-        RED_NETHER_BRICK_WALL = register("red_nether_brick_wall", new WallBlock(Block.Properties.copy(Blocks.RED_NETHER_BRICKS)));
-        SANDSTONE_WALL = register("sandstone_wall", new WallBlock(Block.Properties.copy(Blocks.SANDSTONE)));
-        END_STONE_BRICK_WALL = register("end_stone_brick_wall", new WallBlock(Block.Properties.copy(Blocks.END_STONE_BRICKS)));
-        DIORITE_WALL = register("diorite_wall", new WallBlock(Block.Properties.copy(Blocks.DIORITE)));
-        SCAFFOLDING = register("scaffolding", new ScaffoldingBlock(Block.Properties.of(Material.DECORATION, MaterialColor.SAND).noCollission().sound(SoundType.SCAFFOLDING).dynamicShape()));
-        LOOM = register("loom", new LoomBlock(Block.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
-        BARREL = register("barrel", new BarrelBlock(Block.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
-        SMOKER = register("smoker", new SmokerBlock(Block.Properties.of(Material.STONE).strength(3.5f).lightLevel(13)));
-        BLAST_FURNACE = register("blast_furnace", new BlastFurnaceBlock(Block.Properties.of(Material.STONE).strength(3.5f).lightLevel(13)));
-        CARTOGRAPHY_TABLE = register("cartography_table", new CartographyTableBlock(Block.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
-        FLETCHING_TABLE = register("fletching_table", new FletchingTableBlock(Block.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
-        GRINDSTONE = register("grindstone", new GrindstoneBlock(Block.Properties.of(Material.HEAVY_METAL, MaterialColor.METAL).strength(2.0f, 6.0f).sound(SoundType.STONE)));
-        LECTERN = register("lectern", new LecternBlock(Block.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
-        SMITHING_TABLE = register("smithing_table", new SmithingTableBlock(Block.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
-        STONECUTTER = register("stonecutter", new StonecutterBlock(Block.Properties.of(Material.STONE).strength(3.5f)));
-        BELL = register("bell", new BellBlock(Block.Properties.of(Material.METAL, MaterialColor.GOLD).strength(5.0f).sound(SoundType.ANVIL)));
-        LANTERN = register("lantern", new Lantern(Block.Properties.of(Material.METAL).strength(3.5f).sound(SoundType.LANTERN).lightLevel(15).noOcclusion()));
-        CAMPFIRE = register("campfire", new CampfireBlock(Block.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f).sound(SoundType.WOOD).lightLevel(15).randomTicks().noOcclusion()));
-        SWEET_BERRY_BUSH = register("sweet_berry_bush", new SweetBerryBushBlock(Block.Properties.of(Material.PLANT).randomTicks().noCollission().sound(SoundType.SWEET_BERRY_BUSH)));
-        STRUCTURE_BLOCK = register("structure_block", new StructureBlock(Block.Properties.of(Material.METAL, MaterialColor.COLOR_LIGHT_GRAY).strength(-1.0f, 3600000.0f).noDrops()));
-        JIGSAW = register("jigsaw", new JigsawBlock(Block.Properties.of(Material.METAL, MaterialColor.COLOR_LIGHT_GRAY).strength(-1.0f, 3600000.0f).noDrops()));
-        COMPOSTER = register("composter", new ComposterBlock(Block.Properties.of(Material.WOOD).strength(0.6f).sound(SoundType.WOOD)));
-        BEE_NEST = register("bee_nest", new BeehiveBlock(Block.Properties.of(Material.WOOD).strength(0.3f).sound(SoundType.WOOD)));
-        BEEHIVE = register("beehive", new BeehiveBlock(Block.Properties.of(Material.WOOD).strength(0.6f).sound(SoundType.WOOD)));
-        HONEY_BLOCK = register("honey_block", new HoneyBlock(Block.Properties.of(Material.CLAY, MaterialColor.COLOR_ORANGE).speedFactor(0.4f).jumpFactor(0.5f).noOcclusion().sound(SoundType.HONEY_BLOCK)));
-        HONEYCOMB_BLOCK = register("honeycomb_block", new Block(Block.Properties.of(Material.CLAY, MaterialColor.COLOR_ORANGE).strength(0.6f).sound(SoundType.CORAL_BLOCK)));
-        for (final Block bph2 : Registry.BLOCK) {
-            for (final BlockState byj4 : bph2.getStateDefinition().getPossibleStates()) {
-                byj4.initCache();
-                Block.BLOCK_STATE_REGISTRY.add(byj4);
+        AIR = register("air", new AirBlock(BlockBehaviour.Properties.of(Material.AIR).noCollission().noDrops().air()));
+        STONE = register("stone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.STONE).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        GRANITE = register("granite", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DIRT).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        POLISHED_GRANITE = register("polished_granite", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DIRT).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        DIORITE = register("diorite", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.QUARTZ).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        POLISHED_DIORITE = register("polished_diorite", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.QUARTZ).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        ANDESITE = register("andesite", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.STONE).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        POLISHED_ANDESITE = register("polished_andesite", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.STONE).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        GRASS_BLOCK = register("grass_block", new GrassBlock(BlockBehaviour.Properties.of(Material.GRASS).randomTicks().strength(0.6f).sound(SoundType.GRASS)));
+        DIRT = register("dirt", new Block(BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.5f).sound(SoundType.GRAVEL)));
+        COARSE_DIRT = register("coarse_dirt", new Block(BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.5f).sound(SoundType.GRAVEL)));
+        PODZOL = register("podzol", new SnowyDirtBlock(BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.PODZOL).strength(0.5f).sound(SoundType.GRAVEL)));
+        COBBLESTONE = register("cobblestone", new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        OAK_PLANKS = register("oak_planks", new Block(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        SPRUCE_PLANKS = register("spruce_planks", new Block(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        BIRCH_PLANKS = register("birch_planks", new Block(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.SAND).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        JUNGLE_PLANKS = register("jungle_planks", new Block(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        ACACIA_PLANKS = register("acacia_planks", new Block(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        DARK_OAK_PLANKS = register("dark_oak_planks", new Block(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        OAK_SAPLING = register("oak_sapling", new SaplingBlock(new OakTreeGrower(), BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
+        SPRUCE_SAPLING = register("spruce_sapling", new SaplingBlock(new SpruceTreeGrower(), BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
+        BIRCH_SAPLING = register("birch_sapling", new SaplingBlock(new BirchTreeGrower(), BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
+        JUNGLE_SAPLING = register("jungle_sapling", new SaplingBlock(new JungleTreeGrower(), BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
+        ACACIA_SAPLING = register("acacia_sapling", new SaplingBlock(new AcaciaTreeGrower(), BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
+        DARK_OAK_SAPLING = register("dark_oak_sapling", new SaplingBlock(new DarkOakTreeGrower(), BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
+        BEDROCK = register("bedrock", new Block(BlockBehaviour.Properties.of(Material.STONE).strength(-1.0f, 3600000.0f).noDrops().isValidSpawn(Blocks::never)));
+        WATER = register("water", new LiquidBlock(Fluids.WATER, BlockBehaviour.Properties.of(Material.WATER).noCollission().strength(100.0f).noDrops()));
+        LAVA = register("lava", new LiquidBlock(Fluids.LAVA, BlockBehaviour.Properties.of(Material.LAVA).noCollission().randomTicks().strength(100.0f).lightLevel(cfj -> 15).noDrops()));
+        SAND = register("sand", new SandBlock(14406560, BlockBehaviour.Properties.of(Material.SAND, MaterialColor.SAND).strength(0.5f).sound(SoundType.SAND)));
+        RED_SAND = register("red_sand", new SandBlock(11098145, BlockBehaviour.Properties.of(Material.SAND, MaterialColor.COLOR_ORANGE).strength(0.5f).sound(SoundType.SAND)));
+        GRAVEL = register("gravel", new GravelBlock(BlockBehaviour.Properties.of(Material.SAND, MaterialColor.STONE).strength(0.6f).sound(SoundType.GRAVEL)));
+        GOLD_ORE = register("gold_ore", new OreBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.0f, 3.0f)));
+        IRON_ORE = register("iron_ore", new OreBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.0f, 3.0f)));
+        COAL_ORE = register("coal_ore", new OreBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.0f, 3.0f)));
+        NETHER_GOLD_ORE = register("nether_gold_ore", new OreBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).requiresCorrectToolForDrops().strength(3.0f, 3.0f).sound(SoundType.NETHER_GOLD_ORE)));
+        OAK_LOG = register("oak_log", log(MaterialColor.WOOD, MaterialColor.PODZOL));
+        SPRUCE_LOG = register("spruce_log", log(MaterialColor.PODZOL, MaterialColor.COLOR_BROWN));
+        BIRCH_LOG = register("birch_log", log(MaterialColor.SAND, MaterialColor.QUARTZ));
+        JUNGLE_LOG = register("jungle_log", log(MaterialColor.DIRT, MaterialColor.PODZOL));
+        ACACIA_LOG = register("acacia_log", log(MaterialColor.COLOR_ORANGE, MaterialColor.STONE));
+        DARK_OAK_LOG = register("dark_oak_log", log(MaterialColor.COLOR_BROWN, MaterialColor.COLOR_BROWN));
+        STRIPPED_SPRUCE_LOG = register("stripped_spruce_log", log(MaterialColor.PODZOL, MaterialColor.PODZOL));
+        STRIPPED_BIRCH_LOG = register("stripped_birch_log", log(MaterialColor.SAND, MaterialColor.SAND));
+        STRIPPED_JUNGLE_LOG = register("stripped_jungle_log", log(MaterialColor.DIRT, MaterialColor.DIRT));
+        STRIPPED_ACACIA_LOG = register("stripped_acacia_log", log(MaterialColor.COLOR_ORANGE, MaterialColor.COLOR_ORANGE));
+        STRIPPED_DARK_OAK_LOG = register("stripped_dark_oak_log", log(MaterialColor.COLOR_BROWN, MaterialColor.COLOR_BROWN));
+        STRIPPED_OAK_LOG = register("stripped_oak_log", log(MaterialColor.WOOD, MaterialColor.WOOD));
+        OAK_WOOD = register("oak_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0f).sound(SoundType.WOOD)));
+        SPRUCE_WOOD = register("spruce_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f).sound(SoundType.WOOD)));
+        BIRCH_WOOD = register("birch_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.SAND).strength(2.0f).sound(SoundType.WOOD)));
+        JUNGLE_WOOD = register("jungle_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f).sound(SoundType.WOOD)));
+        ACACIA_WOOD = register("acacia_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_GRAY).strength(2.0f).sound(SoundType.WOOD)));
+        DARK_OAK_WOOD = register("dark_oak_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f).sound(SoundType.WOOD)));
+        STRIPPED_OAK_WOOD = register("stripped_oak_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0f).sound(SoundType.WOOD)));
+        STRIPPED_SPRUCE_WOOD = register("stripped_spruce_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f).sound(SoundType.WOOD)));
+        STRIPPED_BIRCH_WOOD = register("stripped_birch_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.SAND).strength(2.0f).sound(SoundType.WOOD)));
+        STRIPPED_JUNGLE_WOOD = register("stripped_jungle_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f).sound(SoundType.WOOD)));
+        STRIPPED_ACACIA_WOOD = register("stripped_acacia_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).strength(2.0f).sound(SoundType.WOOD)));
+        STRIPPED_DARK_OAK_WOOD = register("stripped_dark_oak_wood", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f).sound(SoundType.WOOD)));
+        OAK_LEAVES = register("oak_leaves", leaves());
+        SPRUCE_LEAVES = register("spruce_leaves", leaves());
+        BIRCH_LEAVES = register("birch_leaves", leaves());
+        JUNGLE_LEAVES = register("jungle_leaves", leaves());
+        ACACIA_LEAVES = register("acacia_leaves", leaves());
+        DARK_OAK_LEAVES = register("dark_oak_leaves", leaves());
+        SPONGE = register("sponge", new SpongeBlock(BlockBehaviour.Properties.of(Material.SPONGE).strength(0.6f).sound(SoundType.GRASS)));
+        WET_SPONGE = register("wet_sponge", new WetSpongeBlock(BlockBehaviour.Properties.of(Material.SPONGE).strength(0.6f).sound(SoundType.GRASS)));
+        GLASS = register("glass", new GlassBlock(BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion().isValidSpawn(Blocks::never).isRedstoneConductor(Blocks::never).isSuffocating(Blocks::never).isViewBlocking(Blocks::never)));
+        LAPIS_ORE = register("lapis_ore", new OreBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.0f, 3.0f)));
+        LAPIS_BLOCK = register("lapis_block", new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.LAPIS).requiresCorrectToolForDrops().strength(3.0f, 3.0f)));
+        DISPENSER = register("dispenser", new DispenserBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.5f)));
+        SANDSTONE = register("sandstone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.SAND).requiresCorrectToolForDrops().strength(0.8f)));
+        CHISELED_SANDSTONE = register("chiseled_sandstone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.SAND).requiresCorrectToolForDrops().strength(0.8f)));
+        CUT_SANDSTONE = register("cut_sandstone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.SAND).requiresCorrectToolForDrops().strength(0.8f)));
+        NOTE_BLOCK = register("note_block", new NoteBlock(BlockBehaviour.Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(0.8f)));
+        WHITE_BED = register("white_bed", bed(DyeColor.WHITE));
+        ORANGE_BED = register("orange_bed", bed(DyeColor.ORANGE));
+        MAGENTA_BED = register("magenta_bed", bed(DyeColor.MAGENTA));
+        LIGHT_BLUE_BED = register("light_blue_bed", bed(DyeColor.LIGHT_BLUE));
+        YELLOW_BED = register("yellow_bed", bed(DyeColor.YELLOW));
+        LIME_BED = register("lime_bed", bed(DyeColor.LIME));
+        PINK_BED = register("pink_bed", bed(DyeColor.PINK));
+        GRAY_BED = register("gray_bed", bed(DyeColor.GRAY));
+        LIGHT_GRAY_BED = register("light_gray_bed", bed(DyeColor.LIGHT_GRAY));
+        CYAN_BED = register("cyan_bed", bed(DyeColor.CYAN));
+        PURPLE_BED = register("purple_bed", bed(DyeColor.PURPLE));
+        BLUE_BED = register("blue_bed", bed(DyeColor.BLUE));
+        BROWN_BED = register("brown_bed", bed(DyeColor.BROWN));
+        GREEN_BED = register("green_bed", bed(DyeColor.GREEN));
+        RED_BED = register("red_bed", bed(DyeColor.RED));
+        BLACK_BED = register("black_bed", bed(DyeColor.BLACK));
+        POWERED_RAIL = register("powered_rail", new PoweredRailBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.7f).sound(SoundType.METAL)));
+        DETECTOR_RAIL = register("detector_rail", new DetectorRailBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.7f).sound(SoundType.METAL)));
+        STICKY_PISTON = register("sticky_piston", pistonBase(true));
+        COBWEB = register("cobweb", new WebBlock(BlockBehaviour.Properties.of(Material.WEB).noCollission().requiresCorrectToolForDrops().strength(4.0f)));
+        GRASS = register("grass", new TallGrassBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        FERN = register("fern", new TallGrassBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        DEAD_BUSH = register("dead_bush", new DeadBushBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT, MaterialColor.WOOD).noCollission().instabreak().sound(SoundType.GRASS)));
+        SEAGRASS = register("seagrass", new Seagrass(BlockBehaviour.Properties.of(Material.REPLACEABLE_WATER_PLANT).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        TALL_SEAGRASS = register("tall_seagrass", new TallSeagrass(BlockBehaviour.Properties.of(Material.REPLACEABLE_WATER_PLANT).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        PISTON = register("piston", pistonBase(false));
+        PISTON_HEAD = register("piston_head", new PistonHeadBlock(BlockBehaviour.Properties.of(Material.PISTON).strength(1.5f).noDrops()));
+        WHITE_WOOL = register("white_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.SNOW).strength(0.8f).sound(SoundType.WOOL)));
+        ORANGE_WOOL = register("orange_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_ORANGE).strength(0.8f).sound(SoundType.WOOL)));
+        MAGENTA_WOOL = register("magenta_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_MAGENTA).strength(0.8f).sound(SoundType.WOOL)));
+        LIGHT_BLUE_WOOL = register("light_blue_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_BLUE).strength(0.8f).sound(SoundType.WOOL)));
+        YELLOW_WOOL = register("yellow_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_YELLOW).strength(0.8f).sound(SoundType.WOOL)));
+        LIME_WOOL = register("lime_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GREEN).strength(0.8f).sound(SoundType.WOOL)));
+        PINK_WOOL = register("pink_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PINK).strength(0.8f).sound(SoundType.WOOL)));
+        GRAY_WOOL = register("gray_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GRAY).strength(0.8f).sound(SoundType.WOOL)));
+        LIGHT_GRAY_WOOL = register("light_gray_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GRAY).strength(0.8f).sound(SoundType.WOOL)));
+        CYAN_WOOL = register("cyan_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_CYAN).strength(0.8f).sound(SoundType.WOOL)));
+        PURPLE_WOOL = register("purple_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PURPLE).strength(0.8f).sound(SoundType.WOOL)));
+        BLUE_WOOL = register("blue_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLUE).strength(0.8f).sound(SoundType.WOOL)));
+        BROWN_WOOL = register("brown_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BROWN).strength(0.8f).sound(SoundType.WOOL)));
+        GREEN_WOOL = register("green_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GREEN).strength(0.8f).sound(SoundType.WOOL)));
+        RED_WOOL = register("red_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_RED).strength(0.8f).sound(SoundType.WOOL)));
+        BLACK_WOOL = register("black_wool", new Block(BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLACK).strength(0.8f).sound(SoundType.WOOL)));
+        MOVING_PISTON = register("moving_piston", new MovingPistonBlock(BlockBehaviour.Properties.of(Material.PISTON).strength(-1.0f).dynamicShape().noDrops().noOcclusion().isRedstoneConductor(Blocks::never).isSuffocating(Blocks::never).isViewBlocking(Blocks::never)));
+        DANDELION = register("dandelion", new FlowerBlock(MobEffects.SATURATION, 7, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        POPPY = register("poppy", new FlowerBlock(MobEffects.NIGHT_VISION, 5, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        BLUE_ORCHID = register("blue_orchid", new FlowerBlock(MobEffects.SATURATION, 7, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        ALLIUM = register("allium", new FlowerBlock(MobEffects.FIRE_RESISTANCE, 4, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        AZURE_BLUET = register("azure_bluet", new FlowerBlock(MobEffects.BLINDNESS, 8, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        RED_TULIP = register("red_tulip", new FlowerBlock(MobEffects.WEAKNESS, 9, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        ORANGE_TULIP = register("orange_tulip", new FlowerBlock(MobEffects.WEAKNESS, 9, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        WHITE_TULIP = register("white_tulip", new FlowerBlock(MobEffects.WEAKNESS, 9, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        PINK_TULIP = register("pink_tulip", new FlowerBlock(MobEffects.WEAKNESS, 9, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        OXEYE_DAISY = register("oxeye_daisy", new FlowerBlock(MobEffects.REGENERATION, 8, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        CORNFLOWER = register("cornflower", new FlowerBlock(MobEffects.JUMP, 6, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        WITHER_ROSE = register("wither_rose", new WitherRoseBlock(MobEffects.WITHER, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        LILY_OF_THE_VALLEY = register("lily_of_the_valley", new FlowerBlock(MobEffects.POISON, 12, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        BROWN_MUSHROOM = register("brown_mushroom", new MushroomBlock(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.COLOR_BROWN).noCollission().randomTicks().instabreak().sound(SoundType.GRASS).lightLevel(cfj -> 1).hasPostProcess(Blocks::always)));
+        RED_MUSHROOM = register("red_mushroom", new MushroomBlock(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.COLOR_RED).noCollission().randomTicks().instabreak().sound(SoundType.GRASS).hasPostProcess(Blocks::always)));
+        GOLD_BLOCK = register("gold_block", new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.GOLD).requiresCorrectToolForDrops().strength(3.0f, 6.0f).sound(SoundType.METAL)));
+        IRON_BLOCK = register("iron_block", new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.METAL).requiresCorrectToolForDrops().strength(5.0f, 6.0f).sound(SoundType.METAL)));
+        BRICKS = register("bricks", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_RED).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        TNT = register("tnt", new TntBlock(BlockBehaviour.Properties.of(Material.EXPLOSIVE).instabreak().sound(SoundType.GRASS)));
+        BOOKSHELF = register("bookshelf", new Block(BlockBehaviour.Properties.of(Material.WOOD).strength(1.5f).sound(SoundType.WOOD)));
+        MOSSY_COBBLESTONE = register("mossy_cobblestone", new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        OBSIDIAN = register("obsidian", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(50.0f, 1200.0f)));
+        TORCH = register("torch", new TorchBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel(cfj -> 14).sound(SoundType.WOOD), ParticleTypes.FLAME));
+        WALL_TORCH = register("wall_torch", new WallTorchBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel(cfj -> 14).sound(SoundType.WOOD).dropsLike(Blocks.TORCH), ParticleTypes.FLAME));
+        FIRE = register("fire", new FireBlock(BlockBehaviour.Properties.of(Material.FIRE, MaterialColor.FIRE).noCollission().instabreak().lightLevel(cfj -> 15).sound(SoundType.WOOL)));
+        SOUL_FIRE = register("soul_fire", new SoulFireBlock(BlockBehaviour.Properties.of(Material.FIRE, MaterialColor.COLOR_LIGHT_BLUE).noCollission().instabreak().lightLevel(cfj -> 10).sound(SoundType.WOOL)));
+        SPAWNER = register("spawner", new SpawnerBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(5.0f).sound(SoundType.METAL).noOcclusion()));
+        OAK_STAIRS = register("oak_stairs", new StairBlock(Blocks.OAK_PLANKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.OAK_PLANKS)));
+        CHEST = register("chest", new ChestBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD), () -> BlockEntityType.CHEST));
+        REDSTONE_WIRE = register("redstone_wire", new RedStoneWireBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak()));
+        DIAMOND_ORE = register("diamond_ore", new OreBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.0f, 3.0f)));
+        DIAMOND_BLOCK = register("diamond_block", new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.DIAMOND).requiresCorrectToolForDrops().strength(5.0f, 6.0f).sound(SoundType.METAL)));
+        CRAFTING_TABLE = register("crafting_table", new CraftingTableBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
+        WHEAT = register("wheat", new CropBlock(BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.CROP)));
+        FARMLAND = register("farmland", new FarmBlock(BlockBehaviour.Properties.of(Material.DIRT).randomTicks().strength(0.6f).sound(SoundType.GRAVEL).isViewBlocking(Blocks::always)));
+        FURNACE = register("furnace", new FurnaceBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.5f).lightLevel(litBlockEmission(13))));
+        OAK_SIGN = register("oak_sign", new StandingSignBlock(BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.OAK));
+        SPRUCE_SIGN = register("spruce_sign", new StandingSignBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.SPRUCE_LOG.defaultMaterialColor()).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.SPRUCE));
+        BIRCH_SIGN = register("birch_sign", new StandingSignBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.SAND).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.BIRCH));
+        ACACIA_SIGN = register("acacia_sign", new StandingSignBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.ACACIA));
+        JUNGLE_SIGN = register("jungle_sign", new StandingSignBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.JUNGLE_LOG.defaultMaterialColor()).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.JUNGLE));
+        DARK_OAK_SIGN = register("dark_oak_sign", new StandingSignBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.DARK_OAK_LOG.defaultMaterialColor()).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.DARK_OAK));
+        OAK_DOOR = register("oak_door", new DoorBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.OAK_PLANKS.defaultMaterialColor()).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
+        LADDER = register("ladder", new LadderBlock(BlockBehaviour.Properties.of(Material.DECORATION).strength(0.4f).sound(SoundType.LADDER).noOcclusion()));
+        RAIL = register("rail", new RailBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.7f).sound(SoundType.METAL)));
+        COBBLESTONE_STAIRS = register("cobblestone_stairs", new StairBlock(Blocks.COBBLESTONE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+        OAK_WALL_SIGN = register("oak_wall_sign", new WallSignBlock(BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.OAK_SIGN), WoodType.OAK));
+        SPRUCE_WALL_SIGN = register("spruce_wall_sign", new WallSignBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.SPRUCE_LOG.defaultMaterialColor()).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.SPRUCE_SIGN), WoodType.SPRUCE));
+        BIRCH_WALL_SIGN = register("birch_wall_sign", new WallSignBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.SAND).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.BIRCH_SIGN), WoodType.BIRCH));
+        ACACIA_WALL_SIGN = register("acacia_wall_sign", new WallSignBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.ACACIA_SIGN), WoodType.ACACIA));
+        JUNGLE_WALL_SIGN = register("jungle_wall_sign", new WallSignBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.JUNGLE_LOG.defaultMaterialColor()).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.JUNGLE_SIGN), WoodType.JUNGLE));
+        DARK_OAK_WALL_SIGN = register("dark_oak_wall_sign", new WallSignBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.DARK_OAK_LOG.defaultMaterialColor()).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.DARK_OAK_SIGN), WoodType.DARK_OAK));
+        LEVER = register("lever", new LeverBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        STONE_PRESSURE_PLATE = register("stone_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.MOBS, BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().noCollission().strength(0.5f)));
+        IRON_DOOR = register("iron_door", new DoorBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.METAL).requiresCorrectToolForDrops().strength(5.0f).sound(SoundType.METAL).noOcclusion()));
+        OAK_PRESSURE_PLATE = register("oak_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of(Material.WOOD, Blocks.OAK_PLANKS.defaultMaterialColor()).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        SPRUCE_PRESSURE_PLATE = register("spruce_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of(Material.WOOD, Blocks.SPRUCE_PLANKS.defaultMaterialColor()).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        BIRCH_PRESSURE_PLATE = register("birch_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of(Material.WOOD, Blocks.BIRCH_PLANKS.defaultMaterialColor()).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        JUNGLE_PRESSURE_PLATE = register("jungle_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of(Material.WOOD, Blocks.JUNGLE_PLANKS.defaultMaterialColor()).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        ACACIA_PRESSURE_PLATE = register("acacia_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of(Material.WOOD, Blocks.ACACIA_PLANKS.defaultMaterialColor()).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        DARK_OAK_PRESSURE_PLATE = register("dark_oak_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of(Material.WOOD, Blocks.DARK_OAK_PLANKS.defaultMaterialColor()).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        REDSTONE_ORE = register("redstone_ore", new RedStoneOreBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().randomTicks().lightLevel(litBlockEmission(9)).strength(3.0f, 3.0f)));
+        REDSTONE_TORCH = register("redstone_torch", new RedstoneTorchBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel(litBlockEmission(7)).sound(SoundType.WOOD)));
+        REDSTONE_WALL_TORCH = register("redstone_wall_torch", new RedstoneWallTorchBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel(litBlockEmission(7)).sound(SoundType.WOOD).dropsLike(Blocks.REDSTONE_TORCH)));
+        STONE_BUTTON = register("stone_button", new StoneButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f)));
+        SNOW = register("snow", new SnowLayerBlock(BlockBehaviour.Properties.of(Material.TOP_SNOW).randomTicks().strength(0.1f).requiresCorrectToolForDrops().sound(SoundType.SNOW)));
+        ICE = register("ice", new IceBlock(BlockBehaviour.Properties.of(Material.ICE).friction(0.98f).randomTicks().strength(0.5f).sound(SoundType.GLASS).noOcclusion().isValidSpawn((cfj, bpg, fu, aoq) -> aoq == EntityType.POLAR_BEAR)));
+        SNOW_BLOCK = register("snow_block", new Block(BlockBehaviour.Properties.of(Material.SNOW).requiresCorrectToolForDrops().strength(0.2f).sound(SoundType.SNOW)));
+        CACTUS = register("cactus", new CactusBlock(BlockBehaviour.Properties.of(Material.CACTUS).randomTicks().strength(0.4f).sound(SoundType.WOOL)));
+        CLAY = register("clay", new Block(BlockBehaviour.Properties.of(Material.CLAY).strength(0.6f).sound(SoundType.GRAVEL)));
+        SUGAR_CANE = register("sugar_cane", new SugarCaneBlock(BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)));
+        JUKEBOX = register("jukebox", new JukeboxBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f, 6.0f)));
+        OAK_FENCE = register("oak_fence", new FenceBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.OAK_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        PUMPKIN = register("pumpkin", new PumpkinBlock(BlockBehaviour.Properties.of(Material.VEGETABLE, MaterialColor.COLOR_ORANGE).strength(1.0f).sound(SoundType.WOOD)));
+        NETHERRACK = register("netherrack", new NetherrackBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).requiresCorrectToolForDrops().strength(0.4f).sound(SoundType.NETHERRACK)));
+        SOUL_SAND = register("soul_sand", new SoulSandBlock(BlockBehaviour.Properties.of(Material.SAND, MaterialColor.COLOR_BROWN).strength(0.5f).speedFactor(0.4f).sound(SoundType.SOUL_SAND).isValidSpawn(Blocks::always).isRedstoneConductor(Blocks::always).isViewBlocking(Blocks::always)));
+        SOUL_SOIL = register("soul_soil", new Block(BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.COLOR_BROWN).strength(0.5f).sound(SoundType.SOUL_SOIL)));
+        BASALT = register("basalt", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(1.25f, 4.2f).sound(SoundType.BASALT)));
+        POLISHED_BASALT = register("polished_basalt", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(1.25f, 4.2f).sound(SoundType.BASALT)));
+        SOUL_TORCH = register("soul_torch", new TorchBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel(cfj -> 10).sound(SoundType.WOOD), ParticleTypes.SOUL_FIRE_FLAME));
+        SOUL_WALL_TORCH = register("soul_wall_torch", new WallTorchBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel(cfj -> 10).sound(SoundType.WOOD).dropsLike(Blocks.SOUL_TORCH), ParticleTypes.SOUL_FIRE_FLAME));
+        GLOWSTONE = register("glowstone", new Block(BlockBehaviour.Properties.of(Material.GLASS, MaterialColor.SAND).strength(0.3f).sound(SoundType.GLASS).lightLevel(cfj -> 15)));
+        NETHER_PORTAL = register("nether_portal", new NetherPortalBlock(BlockBehaviour.Properties.of(Material.PORTAL).noCollission().randomTicks().strength(-1.0f).sound(SoundType.GLASS).lightLevel(cfj -> 11)));
+        CARVED_PUMPKIN = register("carved_pumpkin", new CarvedPumpkinBlock(BlockBehaviour.Properties.of(Material.VEGETABLE, MaterialColor.COLOR_ORANGE).strength(1.0f).sound(SoundType.WOOD).isValidSpawn(Blocks::always)));
+        JACK_O_LANTERN = register("jack_o_lantern", new CarvedPumpkinBlock(BlockBehaviour.Properties.of(Material.VEGETABLE, MaterialColor.COLOR_ORANGE).strength(1.0f).sound(SoundType.WOOD).lightLevel(cfj -> 15).isValidSpawn(Blocks::always)));
+        CAKE = register("cake", new CakeBlock(BlockBehaviour.Properties.of(Material.CAKE).strength(0.5f).sound(SoundType.WOOL)));
+        REPEATER = register("repeater", new RepeaterBlock(BlockBehaviour.Properties.of(Material.DECORATION).instabreak().sound(SoundType.WOOD)));
+        WHITE_STAINED_GLASS = register("white_stained_glass", stainedGlass(DyeColor.WHITE));
+        ORANGE_STAINED_GLASS = register("orange_stained_glass", stainedGlass(DyeColor.ORANGE));
+        MAGENTA_STAINED_GLASS = register("magenta_stained_glass", stainedGlass(DyeColor.MAGENTA));
+        LIGHT_BLUE_STAINED_GLASS = register("light_blue_stained_glass", stainedGlass(DyeColor.LIGHT_BLUE));
+        YELLOW_STAINED_GLASS = register("yellow_stained_glass", stainedGlass(DyeColor.YELLOW));
+        LIME_STAINED_GLASS = register("lime_stained_glass", stainedGlass(DyeColor.LIME));
+        PINK_STAINED_GLASS = register("pink_stained_glass", stainedGlass(DyeColor.PINK));
+        GRAY_STAINED_GLASS = register("gray_stained_glass", stainedGlass(DyeColor.GRAY));
+        LIGHT_GRAY_STAINED_GLASS = register("light_gray_stained_glass", stainedGlass(DyeColor.LIGHT_GRAY));
+        CYAN_STAINED_GLASS = register("cyan_stained_glass", stainedGlass(DyeColor.CYAN));
+        PURPLE_STAINED_GLASS = register("purple_stained_glass", stainedGlass(DyeColor.PURPLE));
+        BLUE_STAINED_GLASS = register("blue_stained_glass", stainedGlass(DyeColor.BLUE));
+        BROWN_STAINED_GLASS = register("brown_stained_glass", stainedGlass(DyeColor.BROWN));
+        GREEN_STAINED_GLASS = register("green_stained_glass", stainedGlass(DyeColor.GREEN));
+        RED_STAINED_GLASS = register("red_stained_glass", stainedGlass(DyeColor.RED));
+        BLACK_STAINED_GLASS = register("black_stained_glass", stainedGlass(DyeColor.BLACK));
+        OAK_TRAPDOOR = register("oak_trapdoor", new TrapDoorBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(3.0f).sound(SoundType.WOOD).noOcclusion().isValidSpawn(Blocks::never)));
+        SPRUCE_TRAPDOOR = register("spruce_trapdoor", new TrapDoorBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(3.0f).sound(SoundType.WOOD).noOcclusion().isValidSpawn(Blocks::never)));
+        BIRCH_TRAPDOOR = register("birch_trapdoor", new TrapDoorBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.SAND).strength(3.0f).sound(SoundType.WOOD).noOcclusion().isValidSpawn(Blocks::never)));
+        JUNGLE_TRAPDOOR = register("jungle_trapdoor", new TrapDoorBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(3.0f).sound(SoundType.WOOD).noOcclusion().isValidSpawn(Blocks::never)));
+        ACACIA_TRAPDOOR = register("acacia_trapdoor", new TrapDoorBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).strength(3.0f).sound(SoundType.WOOD).noOcclusion().isValidSpawn(Blocks::never)));
+        DARK_OAK_TRAPDOOR = register("dark_oak_trapdoor", new TrapDoorBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(3.0f).sound(SoundType.WOOD).noOcclusion().isValidSpawn(Blocks::never)));
+        STONE_BRICKS = register("stone_bricks", new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        MOSSY_STONE_BRICKS = register("mossy_stone_bricks", new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        CRACKED_STONE_BRICKS = register("cracked_stone_bricks", new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        CHISELED_STONE_BRICKS = register("chiseled_stone_bricks", new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        INFESTED_STONE = register("infested_stone", new InfestedBlock(Blocks.STONE, BlockBehaviour.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
+        INFESTED_COBBLESTONE = register("infested_cobblestone", new InfestedBlock(Blocks.COBBLESTONE, BlockBehaviour.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
+        INFESTED_STONE_BRICKS = register("infested_stone_bricks", new InfestedBlock(Blocks.STONE_BRICKS, BlockBehaviour.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
+        INFESTED_MOSSY_STONE_BRICKS = register("infested_mossy_stone_bricks", new InfestedBlock(Blocks.MOSSY_STONE_BRICKS, BlockBehaviour.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
+        INFESTED_CRACKED_STONE_BRICKS = register("infested_cracked_stone_bricks", new InfestedBlock(Blocks.CRACKED_STONE_BRICKS, BlockBehaviour.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
+        INFESTED_CHISELED_STONE_BRICKS = register("infested_chiseled_stone_bricks", new InfestedBlock(Blocks.CHISELED_STONE_BRICKS, BlockBehaviour.Properties.of(Material.CLAY).strength(0.0f, 0.75f)));
+        BROWN_MUSHROOM_BLOCK = register("brown_mushroom_block", new HugeMushroomBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(0.2f).sound(SoundType.WOOD)));
+        RED_MUSHROOM_BLOCK = register("red_mushroom_block", new HugeMushroomBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_RED).strength(0.2f).sound(SoundType.WOOD)));
+        MUSHROOM_STEM = register("mushroom_stem", new HugeMushroomBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.WOOL).strength(0.2f).sound(SoundType.WOOD)));
+        IRON_BARS = register("iron_bars", new IronBarsBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.NONE).requiresCorrectToolForDrops().strength(5.0f, 6.0f).sound(SoundType.METAL).noOcclusion()));
+        CHAIN = register("chain", new ChainBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.NONE).requiresCorrectToolForDrops().strength(5.0f, 6.0f).sound(SoundType.CHAIN).noOcclusion()));
+        GLASS_PANE = register("glass_pane", new IronBarsBlock(BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        MELON = register("melon", new MelonBlock(BlockBehaviour.Properties.of(Material.VEGETABLE, MaterialColor.COLOR_LIGHT_GREEN).strength(1.0f).sound(SoundType.WOOD)));
+        ATTACHED_PUMPKIN_STEM = register("attached_pumpkin_stem", new AttachedStemBlock((StemGrownBlock)Blocks.PUMPKIN, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.WOOD)));
+        ATTACHED_MELON_STEM = register("attached_melon_stem", new AttachedStemBlock((StemGrownBlock)Blocks.MELON, BlockBehaviour.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.WOOD)));
+        PUMPKIN_STEM = register("pumpkin_stem", new StemBlock((StemGrownBlock)Blocks.PUMPKIN, BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.HARD_CROP)));
+        MELON_STEM = register("melon_stem", new StemBlock((StemGrownBlock)Blocks.MELON, BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.HARD_CROP)));
+        VINE = register("vine", new VineBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT).noCollission().randomTicks().strength(0.2f).sound(SoundType.VINE)));
+        OAK_FENCE_GATE = register("oak_fence_gate", new FenceGateBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.OAK_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        BRICK_STAIRS = register("brick_stairs", new StairBlock(Blocks.BRICKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.BRICKS)));
+        STONE_BRICK_STAIRS = register("stone_brick_stairs", new StairBlock(Blocks.STONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.STONE_BRICKS)));
+        MYCELIUM = register("mycelium", new MyceliumBlock(BlockBehaviour.Properties.of(Material.GRASS, MaterialColor.COLOR_PURPLE).randomTicks().strength(0.6f).sound(SoundType.GRASS)));
+        LILY_PAD = register("lily_pad", new WaterlilyBlock(BlockBehaviour.Properties.of(Material.PLANT).instabreak().sound(SoundType.LILY_PAD).noOcclusion()));
+        NETHER_BRICKS = register("nether_bricks", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).requiresCorrectToolForDrops().strength(2.0f, 6.0f).sound(SoundType.NETHER_BRICKS)));
+        NETHER_BRICK_FENCE = register("nether_brick_fence", new FenceBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).requiresCorrectToolForDrops().strength(2.0f, 6.0f).sound(SoundType.NETHER_BRICKS)));
+        NETHER_BRICK_STAIRS = register("nether_brick_stairs", new StairBlock(Blocks.NETHER_BRICKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.NETHER_BRICKS)));
+        NETHER_WART = register("nether_wart", new NetherWartBlock(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.COLOR_RED).noCollission().randomTicks().sound(SoundType.NETHER_WART)));
+        ENCHANTING_TABLE = register("enchanting_table", new EnchantmentTableBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_RED).requiresCorrectToolForDrops().strength(5.0f, 1200.0f)));
+        BREWING_STAND = register("brewing_stand", new BrewingStandBlock(BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().strength(0.5f).lightLevel(cfj -> 1).noOcclusion()));
+        CAULDRON = register("cauldron", new CauldronBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.STONE).requiresCorrectToolForDrops().strength(2.0f).noOcclusion()));
+        END_PORTAL = register("end_portal", new EndPortalBlock(BlockBehaviour.Properties.of(Material.PORTAL, MaterialColor.COLOR_BLACK).noCollission().lightLevel(cfj -> 15).strength(-1.0f, 3600000.0f).noDrops()));
+        END_PORTAL_FRAME = register("end_portal_frame", new EndPortalFrameBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GREEN).sound(SoundType.GLASS).lightLevel(cfj -> 1).strength(-1.0f, 3600000.0f).noDrops()));
+        END_STONE = register("end_stone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.SAND).requiresCorrectToolForDrops().strength(3.0f, 9.0f)));
+        DRAGON_EGG = register("dragon_egg", new DragonEggBlock(BlockBehaviour.Properties.of(Material.EGG, MaterialColor.COLOR_BLACK).strength(3.0f, 9.0f).lightLevel(cfj -> 1).noOcclusion()));
+        REDSTONE_LAMP = register("redstone_lamp", new RedstoneLampBlock(BlockBehaviour.Properties.of(Material.BUILDABLE_GLASS).lightLevel(litBlockEmission(15)).strength(0.3f).sound(SoundType.GLASS).isValidSpawn(Blocks::always)));
+        COCOA = register("cocoa", new CocoaBlock(BlockBehaviour.Properties.of(Material.PLANT).randomTicks().strength(0.2f, 3.0f).sound(SoundType.WOOD).noOcclusion()));
+        SANDSTONE_STAIRS = register("sandstone_stairs", new StairBlock(Blocks.SANDSTONE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.SANDSTONE)));
+        EMERALD_ORE = register("emerald_ore", new OreBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.0f, 3.0f)));
+        ENDER_CHEST = register("ender_chest", new EnderChestBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(22.5f, 600.0f).lightLevel(cfj -> 7)));
+        TRIPWIRE_HOOK = register("tripwire_hook", new TripWireHookBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission()));
+        TRIPWIRE = register("tripwire", new TripWireBlock((TripWireHookBlock)Blocks.TRIPWIRE_HOOK, BlockBehaviour.Properties.of(Material.DECORATION).noCollission()));
+        EMERALD_BLOCK = register("emerald_block", new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.EMERALD).requiresCorrectToolForDrops().strength(5.0f, 6.0f).sound(SoundType.METAL)));
+        SPRUCE_STAIRS = register("spruce_stairs", new StairBlock(Blocks.SPRUCE_PLANKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.SPRUCE_PLANKS)));
+        BIRCH_STAIRS = register("birch_stairs", new StairBlock(Blocks.BIRCH_PLANKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.BIRCH_PLANKS)));
+        JUNGLE_STAIRS = register("jungle_stairs", new StairBlock(Blocks.JUNGLE_PLANKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.JUNGLE_PLANKS)));
+        COMMAND_BLOCK = register("command_block", new CommandBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_BROWN).requiresCorrectToolForDrops().strength(-1.0f, 3600000.0f).noDrops()));
+        BEACON = register("beacon", new BeaconBlock(BlockBehaviour.Properties.of(Material.GLASS, MaterialColor.DIAMOND).strength(3.0f).lightLevel(cfj -> 15).noOcclusion().isRedstoneConductor(Blocks::never)));
+        COBBLESTONE_WALL = register("cobblestone_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+        MOSSY_COBBLESTONE_WALL = register("mossy_cobblestone_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+        FLOWER_POT = register("flower_pot", new FlowerPotBlock(Blocks.AIR, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_OAK_SAPLING = register("potted_oak_sapling", new FlowerPotBlock(Blocks.OAK_SAPLING, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_SPRUCE_SAPLING = register("potted_spruce_sapling", new FlowerPotBlock(Blocks.SPRUCE_SAPLING, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_BIRCH_SAPLING = register("potted_birch_sapling", new FlowerPotBlock(Blocks.BIRCH_SAPLING, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_JUNGLE_SAPLING = register("potted_jungle_sapling", new FlowerPotBlock(Blocks.JUNGLE_SAPLING, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_ACACIA_SAPLING = register("potted_acacia_sapling", new FlowerPotBlock(Blocks.ACACIA_SAPLING, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_DARK_OAK_SAPLING = register("potted_dark_oak_sapling", new FlowerPotBlock(Blocks.DARK_OAK_SAPLING, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_FERN = register("potted_fern", new FlowerPotBlock(Blocks.FERN, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_DANDELION = register("potted_dandelion", new FlowerPotBlock(Blocks.DANDELION, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_POPPY = register("potted_poppy", new FlowerPotBlock(Blocks.POPPY, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_BLUE_ORCHID = register("potted_blue_orchid", new FlowerPotBlock(Blocks.BLUE_ORCHID, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_ALLIUM = register("potted_allium", new FlowerPotBlock(Blocks.ALLIUM, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_AZURE_BLUET = register("potted_azure_bluet", new FlowerPotBlock(Blocks.AZURE_BLUET, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_RED_TULIP = register("potted_red_tulip", new FlowerPotBlock(Blocks.RED_TULIP, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_ORANGE_TULIP = register("potted_orange_tulip", new FlowerPotBlock(Blocks.ORANGE_TULIP, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_WHITE_TULIP = register("potted_white_tulip", new FlowerPotBlock(Blocks.WHITE_TULIP, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_PINK_TULIP = register("potted_pink_tulip", new FlowerPotBlock(Blocks.PINK_TULIP, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_OXEYE_DAISY = register("potted_oxeye_daisy", new FlowerPotBlock(Blocks.OXEYE_DAISY, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_CORNFLOWER = register("potted_cornflower", new FlowerPotBlock(Blocks.CORNFLOWER, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_LILY_OF_THE_VALLEY = register("potted_lily_of_the_valley", new FlowerPotBlock(Blocks.LILY_OF_THE_VALLEY, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_WITHER_ROSE = register("potted_wither_rose", new FlowerPotBlock(Blocks.WITHER_ROSE, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_RED_MUSHROOM = register("potted_red_mushroom", new FlowerPotBlock(Blocks.RED_MUSHROOM, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_BROWN_MUSHROOM = register("potted_brown_mushroom", new FlowerPotBlock(Blocks.BROWN_MUSHROOM, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_DEAD_BUSH = register("potted_dead_bush", new FlowerPotBlock(Blocks.DEAD_BUSH, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_CACTUS = register("potted_cactus", new FlowerPotBlock(Blocks.CACTUS, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        CARROTS = register("carrots", new CarrotBlock(BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.CROP)));
+        POTATOES = register("potatoes", new PotatoBlock(BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.CROP)));
+        OAK_BUTTON = register("oak_button", new WoodButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        SPRUCE_BUTTON = register("spruce_button", new WoodButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        BIRCH_BUTTON = register("birch_button", new WoodButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        JUNGLE_BUTTON = register("jungle_button", new WoodButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        ACACIA_BUTTON = register("acacia_button", new WoodButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        DARK_OAK_BUTTON = register("dark_oak_button", new WoodButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        SKELETON_SKULL = register("skeleton_skull", new SkullBlock(SkullBlock.Types.SKELETON, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f)));
+        SKELETON_WALL_SKULL = register("skeleton_wall_skull", new WallSkullBlock(SkullBlock.Types.SKELETON, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.SKELETON_SKULL)));
+        WITHER_SKELETON_SKULL = register("wither_skeleton_skull", new WitherSkullBlock(BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f)));
+        WITHER_SKELETON_WALL_SKULL = register("wither_skeleton_wall_skull", new WitherWallSkullBlock(BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.WITHER_SKELETON_SKULL)));
+        ZOMBIE_HEAD = register("zombie_head", new SkullBlock(SkullBlock.Types.ZOMBIE, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f)));
+        ZOMBIE_WALL_HEAD = register("zombie_wall_head", new WallSkullBlock(SkullBlock.Types.ZOMBIE, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.ZOMBIE_HEAD)));
+        PLAYER_HEAD = register("player_head", new PlayerHeadBlock(BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f)));
+        PLAYER_WALL_HEAD = register("player_wall_head", new PlayerWallHeadBlock(BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.PLAYER_HEAD)));
+        CREEPER_HEAD = register("creeper_head", new SkullBlock(SkullBlock.Types.CREEPER, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f)));
+        CREEPER_WALL_HEAD = register("creeper_wall_head", new WallSkullBlock(SkullBlock.Types.CREEPER, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.CREEPER_HEAD)));
+        DRAGON_HEAD = register("dragon_head", new SkullBlock(SkullBlock.Types.DRAGON, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f)));
+        DRAGON_WALL_HEAD = register("dragon_wall_head", new WallSkullBlock(SkullBlock.Types.DRAGON, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f).dropsLike(Blocks.DRAGON_HEAD)));
+        ANVIL = register("anvil", new AnvilBlock(BlockBehaviour.Properties.of(Material.HEAVY_METAL, MaterialColor.METAL).requiresCorrectToolForDrops().strength(5.0f, 1200.0f).sound(SoundType.ANVIL)));
+        CHIPPED_ANVIL = register("chipped_anvil", new AnvilBlock(BlockBehaviour.Properties.of(Material.HEAVY_METAL, MaterialColor.METAL).requiresCorrectToolForDrops().strength(5.0f, 1200.0f).sound(SoundType.ANVIL)));
+        DAMAGED_ANVIL = register("damaged_anvil", new AnvilBlock(BlockBehaviour.Properties.of(Material.HEAVY_METAL, MaterialColor.METAL).requiresCorrectToolForDrops().strength(5.0f, 1200.0f).sound(SoundType.ANVIL)));
+        TRAPPED_CHEST = register("trapped_chest", new TrappedChestBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
+        LIGHT_WEIGHTED_PRESSURE_PLATE = register("light_weighted_pressure_plate", new WeightedPressurePlateBlock(15, BlockBehaviour.Properties.of(Material.METAL, MaterialColor.GOLD).requiresCorrectToolForDrops().noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        HEAVY_WEIGHTED_PRESSURE_PLATE = register("heavy_weighted_pressure_plate", new WeightedPressurePlateBlock(150, BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        COMPARATOR = register("comparator", new ComparatorBlock(BlockBehaviour.Properties.of(Material.DECORATION).instabreak().sound(SoundType.WOOD)));
+        DAYLIGHT_DETECTOR = register("daylight_detector", new DaylightDetectorBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(0.2f).sound(SoundType.WOOD)));
+        REDSTONE_BLOCK = register("redstone_block", new PoweredBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.FIRE).requiresCorrectToolForDrops().strength(5.0f, 6.0f).sound(SoundType.METAL).isRedstoneConductor(Blocks::never)));
+        NETHER_QUARTZ_ORE = register("nether_quartz_ore", new OreBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).requiresCorrectToolForDrops().strength(3.0f, 3.0f).sound(SoundType.NETHER_ORE)));
+        HOPPER = register("hopper", new HopperBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.STONE).requiresCorrectToolForDrops().strength(3.0f, 4.8f).sound(SoundType.METAL).noOcclusion()));
+        QUARTZ_BLOCK = register("quartz_block", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.QUARTZ).requiresCorrectToolForDrops().strength(0.8f)));
+        CHISELED_QUARTZ_BLOCK = register("chiseled_quartz_block", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.QUARTZ).requiresCorrectToolForDrops().strength(0.8f)));
+        QUARTZ_PILLAR = register("quartz_pillar", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.QUARTZ).requiresCorrectToolForDrops().strength(0.8f)));
+        QUARTZ_STAIRS = register("quartz_stairs", new StairBlock(Blocks.QUARTZ_BLOCK.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.QUARTZ_BLOCK)));
+        ACTIVATOR_RAIL = register("activator_rail", new PoweredRailBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.7f).sound(SoundType.METAL)));
+        DROPPER = register("dropper", new DropperBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.5f)));
+        WHITE_TERRACOTTA = register("white_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_WHITE).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        ORANGE_TERRACOTTA = register("orange_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_ORANGE).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        MAGENTA_TERRACOTTA = register("magenta_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_MAGENTA).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        LIGHT_BLUE_TERRACOTTA = register("light_blue_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_LIGHT_BLUE).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        YELLOW_TERRACOTTA = register("yellow_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_YELLOW).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        LIME_TERRACOTTA = register("lime_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_LIGHT_GREEN).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        PINK_TERRACOTTA = register("pink_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_PINK).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        GRAY_TERRACOTTA = register("gray_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_GRAY).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        LIGHT_GRAY_TERRACOTTA = register("light_gray_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_LIGHT_GRAY).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        CYAN_TERRACOTTA = register("cyan_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_CYAN).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        PURPLE_TERRACOTTA = register("purple_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_PURPLE).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        BLUE_TERRACOTTA = register("blue_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_BLUE).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        BROWN_TERRACOTTA = register("brown_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_BROWN).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        GREEN_TERRACOTTA = register("green_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_GREEN).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        RED_TERRACOTTA = register("red_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_RED).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        BLACK_TERRACOTTA = register("black_terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_BLACK).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        WHITE_STAINED_GLASS_PANE = register("white_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.WHITE, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        ORANGE_STAINED_GLASS_PANE = register("orange_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.ORANGE, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        MAGENTA_STAINED_GLASS_PANE = register("magenta_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.MAGENTA, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        LIGHT_BLUE_STAINED_GLASS_PANE = register("light_blue_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.LIGHT_BLUE, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        YELLOW_STAINED_GLASS_PANE = register("yellow_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.YELLOW, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        LIME_STAINED_GLASS_PANE = register("lime_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.LIME, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        PINK_STAINED_GLASS_PANE = register("pink_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.PINK, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        GRAY_STAINED_GLASS_PANE = register("gray_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.GRAY, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        LIGHT_GRAY_STAINED_GLASS_PANE = register("light_gray_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.LIGHT_GRAY, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        CYAN_STAINED_GLASS_PANE = register("cyan_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.CYAN, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        PURPLE_STAINED_GLASS_PANE = register("purple_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.PURPLE, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        BLUE_STAINED_GLASS_PANE = register("blue_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.BLUE, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        BROWN_STAINED_GLASS_PANE = register("brown_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.BROWN, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        GREEN_STAINED_GLASS_PANE = register("green_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.GREEN, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        RED_STAINED_GLASS_PANE = register("red_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.RED, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        BLACK_STAINED_GLASS_PANE = register("black_stained_glass_pane", new StainedGlassPaneBlock(DyeColor.BLACK, BlockBehaviour.Properties.of(Material.GLASS).strength(0.3f).sound(SoundType.GLASS).noOcclusion()));
+        ACACIA_STAIRS = register("acacia_stairs", new StairBlock(Blocks.ACACIA_PLANKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.ACACIA_PLANKS)));
+        DARK_OAK_STAIRS = register("dark_oak_stairs", new StairBlock(Blocks.DARK_OAK_PLANKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.DARK_OAK_PLANKS)));
+        SLIME_BLOCK = register("slime_block", new SlimeBlock(BlockBehaviour.Properties.of(Material.CLAY, MaterialColor.GRASS).friction(0.8f).sound(SoundType.SLIME_BLOCK).noOcclusion()));
+        BARRIER = register("barrier", new BarrierBlock(BlockBehaviour.Properties.of(Material.BARRIER).strength(-1.0f, 3600000.8f).noDrops().noOcclusion().isValidSpawn(Blocks::never)));
+        IRON_TRAPDOOR = register("iron_trapdoor", new TrapDoorBlock(BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().strength(5.0f).sound(SoundType.METAL).noOcclusion()));
+        PRISMARINE = register("prismarine", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_CYAN).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        PRISMARINE_BRICKS = register("prismarine_bricks", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DIAMOND).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        DARK_PRISMARINE = register("dark_prismarine", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DIAMOND).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        PRISMARINE_STAIRS = register("prismarine_stairs", new StairBlock(Blocks.PRISMARINE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.PRISMARINE)));
+        PRISMARINE_BRICK_STAIRS = register("prismarine_brick_stairs", new StairBlock(Blocks.PRISMARINE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.PRISMARINE_BRICKS)));
+        DARK_PRISMARINE_STAIRS = register("dark_prismarine_stairs", new StairBlock(Blocks.DARK_PRISMARINE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.DARK_PRISMARINE)));
+        PRISMARINE_SLAB = register("prismarine_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_CYAN).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        PRISMARINE_BRICK_SLAB = register("prismarine_brick_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DIAMOND).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        DARK_PRISMARINE_SLAB = register("dark_prismarine_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DIAMOND).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        SEA_LANTERN = register("sea_lantern", new Block(BlockBehaviour.Properties.of(Material.GLASS, MaterialColor.QUARTZ).strength(0.3f).sound(SoundType.GLASS).lightLevel(cfj -> 15)));
+        HAY_BLOCK = register("hay_block", new HayBlock(BlockBehaviour.Properties.of(Material.GRASS, MaterialColor.COLOR_YELLOW).strength(0.5f).sound(SoundType.GRASS)));
+        WHITE_CARPET = register("white_carpet", new WoolCarpetBlock(DyeColor.WHITE, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.SNOW).strength(0.1f).sound(SoundType.WOOL)));
+        ORANGE_CARPET = register("orange_carpet", new WoolCarpetBlock(DyeColor.ORANGE, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_ORANGE).strength(0.1f).sound(SoundType.WOOL)));
+        MAGENTA_CARPET = register("magenta_carpet", new WoolCarpetBlock(DyeColor.MAGENTA, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_MAGENTA).strength(0.1f).sound(SoundType.WOOL)));
+        LIGHT_BLUE_CARPET = register("light_blue_carpet", new WoolCarpetBlock(DyeColor.LIGHT_BLUE, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_LIGHT_BLUE).strength(0.1f).sound(SoundType.WOOL)));
+        YELLOW_CARPET = register("yellow_carpet", new WoolCarpetBlock(DyeColor.YELLOW, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_YELLOW).strength(0.1f).sound(SoundType.WOOL)));
+        LIME_CARPET = register("lime_carpet", new WoolCarpetBlock(DyeColor.LIME, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_LIGHT_GREEN).strength(0.1f).sound(SoundType.WOOL)));
+        PINK_CARPET = register("pink_carpet", new WoolCarpetBlock(DyeColor.PINK, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_PINK).strength(0.1f).sound(SoundType.WOOL)));
+        GRAY_CARPET = register("gray_carpet", new WoolCarpetBlock(DyeColor.GRAY, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_GRAY).strength(0.1f).sound(SoundType.WOOL)));
+        LIGHT_GRAY_CARPET = register("light_gray_carpet", new WoolCarpetBlock(DyeColor.LIGHT_GRAY, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_LIGHT_GRAY).strength(0.1f).sound(SoundType.WOOL)));
+        CYAN_CARPET = register("cyan_carpet", new WoolCarpetBlock(DyeColor.CYAN, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_CYAN).strength(0.1f).sound(SoundType.WOOL)));
+        PURPLE_CARPET = register("purple_carpet", new WoolCarpetBlock(DyeColor.PURPLE, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_PURPLE).strength(0.1f).sound(SoundType.WOOL)));
+        BLUE_CARPET = register("blue_carpet", new WoolCarpetBlock(DyeColor.BLUE, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_BLUE).strength(0.1f).sound(SoundType.WOOL)));
+        BROWN_CARPET = register("brown_carpet", new WoolCarpetBlock(DyeColor.BROWN, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_BROWN).strength(0.1f).sound(SoundType.WOOL)));
+        GREEN_CARPET = register("green_carpet", new WoolCarpetBlock(DyeColor.GREEN, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_GREEN).strength(0.1f).sound(SoundType.WOOL)));
+        RED_CARPET = register("red_carpet", new WoolCarpetBlock(DyeColor.RED, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_RED).strength(0.1f).sound(SoundType.WOOL)));
+        BLACK_CARPET = register("black_carpet", new WoolCarpetBlock(DyeColor.BLACK, BlockBehaviour.Properties.of(Material.CLOTH_DECORATION, MaterialColor.COLOR_BLACK).strength(0.1f).sound(SoundType.WOOL)));
+        TERRACOTTA = register("terracotta", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).requiresCorrectToolForDrops().strength(1.25f, 4.2f)));
+        COAL_BLOCK = register("coal_block", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(5.0f, 6.0f)));
+        PACKED_ICE = register("packed_ice", new Block(BlockBehaviour.Properties.of(Material.ICE_SOLID).friction(0.98f).strength(0.5f).sound(SoundType.GLASS)));
+        SUNFLOWER = register("sunflower", new TallFlowerBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        LILAC = register("lilac", new TallFlowerBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        ROSE_BUSH = register("rose_bush", new TallFlowerBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        PEONY = register("peony", new TallFlowerBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        TALL_GRASS = register("tall_grass", new DoublePlantBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        LARGE_FERN = register("large_fern", new DoublePlantBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)));
+        WHITE_BANNER = register("white_banner", new BannerBlock(DyeColor.WHITE, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        ORANGE_BANNER = register("orange_banner", new BannerBlock(DyeColor.ORANGE, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        MAGENTA_BANNER = register("magenta_banner", new BannerBlock(DyeColor.MAGENTA, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        LIGHT_BLUE_BANNER = register("light_blue_banner", new BannerBlock(DyeColor.LIGHT_BLUE, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        YELLOW_BANNER = register("yellow_banner", new BannerBlock(DyeColor.YELLOW, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        LIME_BANNER = register("lime_banner", new BannerBlock(DyeColor.LIME, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        PINK_BANNER = register("pink_banner", new BannerBlock(DyeColor.PINK, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        GRAY_BANNER = register("gray_banner", new BannerBlock(DyeColor.GRAY, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        LIGHT_GRAY_BANNER = register("light_gray_banner", new BannerBlock(DyeColor.LIGHT_GRAY, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        CYAN_BANNER = register("cyan_banner", new BannerBlock(DyeColor.CYAN, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        PURPLE_BANNER = register("purple_banner", new BannerBlock(DyeColor.PURPLE, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        BLUE_BANNER = register("blue_banner", new BannerBlock(DyeColor.BLUE, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        BROWN_BANNER = register("brown_banner", new BannerBlock(DyeColor.BROWN, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        GREEN_BANNER = register("green_banner", new BannerBlock(DyeColor.GREEN, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        RED_BANNER = register("red_banner", new BannerBlock(DyeColor.RED, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        BLACK_BANNER = register("black_banner", new BannerBlock(DyeColor.BLACK, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD)));
+        WHITE_WALL_BANNER = register("white_wall_banner", new WallBannerBlock(DyeColor.WHITE, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.WHITE_BANNER)));
+        ORANGE_WALL_BANNER = register("orange_wall_banner", new WallBannerBlock(DyeColor.ORANGE, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.ORANGE_BANNER)));
+        MAGENTA_WALL_BANNER = register("magenta_wall_banner", new WallBannerBlock(DyeColor.MAGENTA, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.MAGENTA_BANNER)));
+        LIGHT_BLUE_WALL_BANNER = register("light_blue_wall_banner", new WallBannerBlock(DyeColor.LIGHT_BLUE, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.LIGHT_BLUE_BANNER)));
+        YELLOW_WALL_BANNER = register("yellow_wall_banner", new WallBannerBlock(DyeColor.YELLOW, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.YELLOW_BANNER)));
+        LIME_WALL_BANNER = register("lime_wall_banner", new WallBannerBlock(DyeColor.LIME, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.LIME_BANNER)));
+        PINK_WALL_BANNER = register("pink_wall_banner", new WallBannerBlock(DyeColor.PINK, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.PINK_BANNER)));
+        GRAY_WALL_BANNER = register("gray_wall_banner", new WallBannerBlock(DyeColor.GRAY, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.GRAY_BANNER)));
+        LIGHT_GRAY_WALL_BANNER = register("light_gray_wall_banner", new WallBannerBlock(DyeColor.LIGHT_GRAY, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.LIGHT_GRAY_BANNER)));
+        CYAN_WALL_BANNER = register("cyan_wall_banner", new WallBannerBlock(DyeColor.CYAN, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.CYAN_BANNER)));
+        PURPLE_WALL_BANNER = register("purple_wall_banner", new WallBannerBlock(DyeColor.PURPLE, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.PURPLE_BANNER)));
+        BLUE_WALL_BANNER = register("blue_wall_banner", new WallBannerBlock(DyeColor.BLUE, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.BLUE_BANNER)));
+        BROWN_WALL_BANNER = register("brown_wall_banner", new WallBannerBlock(DyeColor.BROWN, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.BROWN_BANNER)));
+        GREEN_WALL_BANNER = register("green_wall_banner", new WallBannerBlock(DyeColor.GREEN, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.GREEN_BANNER)));
+        RED_WALL_BANNER = register("red_wall_banner", new WallBannerBlock(DyeColor.RED, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.RED_BANNER)));
+        BLACK_WALL_BANNER = register("black_wall_banner", new WallBannerBlock(DyeColor.BLACK, BlockBehaviour.Properties.of(Material.WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.BLACK_BANNER)));
+        RED_SANDSTONE = register("red_sandstone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).requiresCorrectToolForDrops().strength(0.8f)));
+        CHISELED_RED_SANDSTONE = register("chiseled_red_sandstone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).requiresCorrectToolForDrops().strength(0.8f)));
+        CUT_RED_SANDSTONE = register("cut_red_sandstone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).requiresCorrectToolForDrops().strength(0.8f)));
+        RED_SANDSTONE_STAIRS = register("red_sandstone_stairs", new StairBlock(Blocks.RED_SANDSTONE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.RED_SANDSTONE)));
+        OAK_SLAB = register("oak_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        SPRUCE_SLAB = register("spruce_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        BIRCH_SLAB = register("birch_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.SAND).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        JUNGLE_SLAB = register("jungle_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.DIRT).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        ACACIA_SLAB = register("acacia_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        DARK_OAK_SLAB = register("dark_oak_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        STONE_SLAB = register("stone_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.STONE).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        SMOOTH_STONE_SLAB = register("smooth_stone_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.STONE).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        SANDSTONE_SLAB = register("sandstone_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.SAND).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        CUT_SANDSTONE_SLAB = register("cut_sandstone_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.SAND).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        PETRIFIED_OAK_SLAB = register("petrified_oak_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.WOOD).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        COBBLESTONE_SLAB = register("cobblestone_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.STONE).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        BRICK_SLAB = register("brick_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_RED).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        STONE_BRICK_SLAB = register("stone_brick_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.STONE).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        NETHER_BRICK_SLAB = register("nether_brick_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).requiresCorrectToolForDrops().strength(2.0f, 6.0f).sound(SoundType.NETHER_BRICKS)));
+        QUARTZ_SLAB = register("quartz_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.QUARTZ).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        RED_SANDSTONE_SLAB = register("red_sandstone_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        CUT_RED_SANDSTONE_SLAB = register("cut_red_sandstone_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        PURPUR_SLAB = register("purpur_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_MAGENTA).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        SMOOTH_STONE = register("smooth_stone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.STONE).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        SMOOTH_SANDSTONE = register("smooth_sandstone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.SAND).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        SMOOTH_QUARTZ = register("smooth_quartz", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.QUARTZ).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        SMOOTH_RED_SANDSTONE = register("smooth_red_sandstone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).requiresCorrectToolForDrops().strength(2.0f, 6.0f)));
+        SPRUCE_FENCE_GATE = register("spruce_fence_gate", new FenceGateBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.SPRUCE_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        BIRCH_FENCE_GATE = register("birch_fence_gate", new FenceGateBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.BIRCH_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        JUNGLE_FENCE_GATE = register("jungle_fence_gate", new FenceGateBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.JUNGLE_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        ACACIA_FENCE_GATE = register("acacia_fence_gate", new FenceGateBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.ACACIA_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        DARK_OAK_FENCE_GATE = register("dark_oak_fence_gate", new FenceGateBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.DARK_OAK_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        SPRUCE_FENCE = register("spruce_fence", new FenceBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.SPRUCE_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        BIRCH_FENCE = register("birch_fence", new FenceBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.BIRCH_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        JUNGLE_FENCE = register("jungle_fence", new FenceBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.JUNGLE_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        ACACIA_FENCE = register("acacia_fence", new FenceBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.ACACIA_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        DARK_OAK_FENCE = register("dark_oak_fence", new FenceBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.DARK_OAK_PLANKS.defaultMaterialColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        SPRUCE_DOOR = register("spruce_door", new DoorBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.SPRUCE_PLANKS.defaultMaterialColor()).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
+        BIRCH_DOOR = register("birch_door", new DoorBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.BIRCH_PLANKS.defaultMaterialColor()).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
+        JUNGLE_DOOR = register("jungle_door", new DoorBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.JUNGLE_PLANKS.defaultMaterialColor()).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
+        ACACIA_DOOR = register("acacia_door", new DoorBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.ACACIA_PLANKS.defaultMaterialColor()).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
+        DARK_OAK_DOOR = register("dark_oak_door", new DoorBlock(BlockBehaviour.Properties.of(Material.WOOD, Blocks.DARK_OAK_PLANKS.defaultMaterialColor()).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
+        END_ROD = register("end_rod", new EndRodBlock(BlockBehaviour.Properties.of(Material.DECORATION).instabreak().lightLevel(cfj -> 14).sound(SoundType.WOOD).noOcclusion()));
+        CHORUS_PLANT = register("chorus_plant", new ChorusPlantBlock(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.COLOR_PURPLE).strength(0.4f).sound(SoundType.WOOD).noOcclusion()));
+        CHORUS_FLOWER = register("chorus_flower", new ChorusFlowerBlock((ChorusPlantBlock)Blocks.CHORUS_PLANT, BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.COLOR_PURPLE).randomTicks().strength(0.4f).sound(SoundType.WOOD).noOcclusion()));
+        PURPUR_BLOCK = register("purpur_block", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_MAGENTA).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        PURPUR_PILLAR = register("purpur_pillar", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_MAGENTA).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        PURPUR_STAIRS = register("purpur_stairs", new StairBlock(Blocks.PURPUR_BLOCK.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.PURPUR_BLOCK)));
+        END_STONE_BRICKS = register("end_stone_bricks", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.SAND).requiresCorrectToolForDrops().strength(3.0f, 9.0f)));
+        BEETROOTS = register("beetroots", new BeetrootBlock(BlockBehaviour.Properties.of(Material.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.CROP)));
+        GRASS_PATH = register("grass_path", new GrassPathBlock(BlockBehaviour.Properties.of(Material.DIRT).strength(0.65f).sound(SoundType.GRASS).isViewBlocking(Blocks::always)));
+        END_GATEWAY = register("end_gateway", new EndGatewayBlock(BlockBehaviour.Properties.of(Material.PORTAL, MaterialColor.COLOR_BLACK).noCollission().lightLevel(cfj -> 15).strength(-1.0f, 3600000.0f).noDrops()));
+        REPEATING_COMMAND_BLOCK = register("repeating_command_block", new CommandBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_PURPLE).requiresCorrectToolForDrops().strength(-1.0f, 3600000.0f).noDrops()));
+        CHAIN_COMMAND_BLOCK = register("chain_command_block", new CommandBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_GREEN).requiresCorrectToolForDrops().strength(-1.0f, 3600000.0f).noDrops()));
+        FROSTED_ICE = register("frosted_ice", new FrostedIceBlock(BlockBehaviour.Properties.of(Material.ICE).friction(0.98f).randomTicks().strength(0.5f).sound(SoundType.GLASS).noOcclusion().isValidSpawn((cfj, bpg, fu, aoq) -> aoq == EntityType.POLAR_BEAR)));
+        MAGMA_BLOCK = register("magma_block", new MagmaBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).requiresCorrectToolForDrops().lightLevel(cfj -> 3).randomTicks().strength(0.5f).isValidSpawn((cfj, bpg, fu, aoq) -> aoq.fireImmune()).hasPostProcess(Blocks::always).emissiveRendering(Blocks::always)));
+        NETHER_WART_BLOCK = register("nether_wart_block", new Block(BlockBehaviour.Properties.of(Material.GRASS, MaterialColor.COLOR_RED).strength(1.0f).sound(SoundType.WART_BLOCK)));
+        RED_NETHER_BRICKS = register("red_nether_bricks", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).requiresCorrectToolForDrops().strength(2.0f, 6.0f).sound(SoundType.NETHER_BRICKS)));
+        BONE_BLOCK = register("bone_block", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.SAND).requiresCorrectToolForDrops().strength(2.0f).sound(SoundType.BONE_BLOCK)));
+        STRUCTURE_VOID = register("structure_void", new StructureVoidBlock(BlockBehaviour.Properties.of(Material.STRUCTURAL_AIR).noCollission().noDrops()));
+        OBSERVER = register("observer", new ObserverBlock(BlockBehaviour.Properties.of(Material.STONE).strength(3.0f).requiresCorrectToolForDrops().isRedstoneConductor(Blocks::never)));
+        SHULKER_BOX = register("shulker_box", shulkerBox(null, BlockBehaviour.Properties.of(Material.SHULKER_SHELL)));
+        WHITE_SHULKER_BOX = register("white_shulker_box", shulkerBox(DyeColor.WHITE, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.SNOW)));
+        ORANGE_SHULKER_BOX = register("orange_shulker_box", shulkerBox(DyeColor.ORANGE, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_ORANGE)));
+        MAGENTA_SHULKER_BOX = register("magenta_shulker_box", shulkerBox(DyeColor.MAGENTA, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_MAGENTA)));
+        LIGHT_BLUE_SHULKER_BOX = register("light_blue_shulker_box", shulkerBox(DyeColor.LIGHT_BLUE, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_LIGHT_BLUE)));
+        YELLOW_SHULKER_BOX = register("yellow_shulker_box", shulkerBox(DyeColor.YELLOW, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_YELLOW)));
+        LIME_SHULKER_BOX = register("lime_shulker_box", shulkerBox(DyeColor.LIME, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_LIGHT_GREEN)));
+        PINK_SHULKER_BOX = register("pink_shulker_box", shulkerBox(DyeColor.PINK, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_PINK)));
+        GRAY_SHULKER_BOX = register("gray_shulker_box", shulkerBox(DyeColor.GRAY, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_GRAY)));
+        LIGHT_GRAY_SHULKER_BOX = register("light_gray_shulker_box", shulkerBox(DyeColor.LIGHT_GRAY, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_LIGHT_GRAY)));
+        CYAN_SHULKER_BOX = register("cyan_shulker_box", shulkerBox(DyeColor.CYAN, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_CYAN)));
+        PURPLE_SHULKER_BOX = register("purple_shulker_box", shulkerBox(DyeColor.PURPLE, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.TERRACOTTA_PURPLE)));
+        BLUE_SHULKER_BOX = register("blue_shulker_box", shulkerBox(DyeColor.BLUE, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_BLUE)));
+        BROWN_SHULKER_BOX = register("brown_shulker_box", shulkerBox(DyeColor.BROWN, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_BROWN)));
+        GREEN_SHULKER_BOX = register("green_shulker_box", shulkerBox(DyeColor.GREEN, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_GREEN)));
+        RED_SHULKER_BOX = register("red_shulker_box", shulkerBox(DyeColor.RED, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_RED)));
+        BLACK_SHULKER_BOX = register("black_shulker_box", shulkerBox(DyeColor.BLACK, BlockBehaviour.Properties.of(Material.SHULKER_SHELL, MaterialColor.COLOR_BLACK)));
+        WHITE_GLAZED_TERRACOTTA = register("white_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.WHITE).requiresCorrectToolForDrops().strength(1.4f)));
+        ORANGE_GLAZED_TERRACOTTA = register("orange_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.ORANGE).requiresCorrectToolForDrops().strength(1.4f)));
+        MAGENTA_GLAZED_TERRACOTTA = register("magenta_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.MAGENTA).requiresCorrectToolForDrops().strength(1.4f)));
+        LIGHT_BLUE_GLAZED_TERRACOTTA = register("light_blue_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.LIGHT_BLUE).requiresCorrectToolForDrops().strength(1.4f)));
+        YELLOW_GLAZED_TERRACOTTA = register("yellow_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.YELLOW).requiresCorrectToolForDrops().strength(1.4f)));
+        LIME_GLAZED_TERRACOTTA = register("lime_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.LIME).requiresCorrectToolForDrops().strength(1.4f)));
+        PINK_GLAZED_TERRACOTTA = register("pink_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.PINK).requiresCorrectToolForDrops().strength(1.4f)));
+        GRAY_GLAZED_TERRACOTTA = register("gray_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.GRAY).requiresCorrectToolForDrops().strength(1.4f)));
+        LIGHT_GRAY_GLAZED_TERRACOTTA = register("light_gray_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.LIGHT_GRAY).requiresCorrectToolForDrops().strength(1.4f)));
+        CYAN_GLAZED_TERRACOTTA = register("cyan_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.CYAN).requiresCorrectToolForDrops().strength(1.4f)));
+        PURPLE_GLAZED_TERRACOTTA = register("purple_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.PURPLE).requiresCorrectToolForDrops().strength(1.4f)));
+        BLUE_GLAZED_TERRACOTTA = register("blue_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.BLUE).requiresCorrectToolForDrops().strength(1.4f)));
+        BROWN_GLAZED_TERRACOTTA = register("brown_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.BROWN).requiresCorrectToolForDrops().strength(1.4f)));
+        GREEN_GLAZED_TERRACOTTA = register("green_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.GREEN).requiresCorrectToolForDrops().strength(1.4f)));
+        RED_GLAZED_TERRACOTTA = register("red_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.RED).requiresCorrectToolForDrops().strength(1.4f)));
+        BLACK_GLAZED_TERRACOTTA = register("black_glazed_terracotta", new GlazedTerracottaBlock(BlockBehaviour.Properties.of(Material.STONE, DyeColor.BLACK).requiresCorrectToolForDrops().strength(1.4f)));
+        WHITE_CONCRETE = register("white_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.WHITE).requiresCorrectToolForDrops().strength(1.8f)));
+        ORANGE_CONCRETE = register("orange_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.ORANGE).requiresCorrectToolForDrops().strength(1.8f)));
+        MAGENTA_CONCRETE = register("magenta_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.MAGENTA).requiresCorrectToolForDrops().strength(1.8f)));
+        LIGHT_BLUE_CONCRETE = register("light_blue_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.LIGHT_BLUE).requiresCorrectToolForDrops().strength(1.8f)));
+        YELLOW_CONCRETE = register("yellow_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.YELLOW).requiresCorrectToolForDrops().strength(1.8f)));
+        LIME_CONCRETE = register("lime_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.LIME).requiresCorrectToolForDrops().strength(1.8f)));
+        PINK_CONCRETE = register("pink_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.PINK).requiresCorrectToolForDrops().strength(1.8f)));
+        GRAY_CONCRETE = register("gray_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.GRAY).requiresCorrectToolForDrops().strength(1.8f)));
+        LIGHT_GRAY_CONCRETE = register("light_gray_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.LIGHT_GRAY).requiresCorrectToolForDrops().strength(1.8f)));
+        CYAN_CONCRETE = register("cyan_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.CYAN).requiresCorrectToolForDrops().strength(1.8f)));
+        PURPLE_CONCRETE = register("purple_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.PURPLE).requiresCorrectToolForDrops().strength(1.8f)));
+        BLUE_CONCRETE = register("blue_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.BLUE).requiresCorrectToolForDrops().strength(1.8f)));
+        BROWN_CONCRETE = register("brown_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.BROWN).requiresCorrectToolForDrops().strength(1.8f)));
+        GREEN_CONCRETE = register("green_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.GREEN).requiresCorrectToolForDrops().strength(1.8f)));
+        RED_CONCRETE = register("red_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.RED).requiresCorrectToolForDrops().strength(1.8f)));
+        BLACK_CONCRETE = register("black_concrete", new Block(BlockBehaviour.Properties.of(Material.STONE, DyeColor.BLACK).requiresCorrectToolForDrops().strength(1.8f)));
+        WHITE_CONCRETE_POWDER = register("white_concrete_powder", new ConcretePowderBlock(Blocks.WHITE_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.WHITE).strength(0.5f).sound(SoundType.SAND)));
+        ORANGE_CONCRETE_POWDER = register("orange_concrete_powder", new ConcretePowderBlock(Blocks.ORANGE_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.ORANGE).strength(0.5f).sound(SoundType.SAND)));
+        MAGENTA_CONCRETE_POWDER = register("magenta_concrete_powder", new ConcretePowderBlock(Blocks.MAGENTA_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.MAGENTA).strength(0.5f).sound(SoundType.SAND)));
+        LIGHT_BLUE_CONCRETE_POWDER = register("light_blue_concrete_powder", new ConcretePowderBlock(Blocks.LIGHT_BLUE_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.LIGHT_BLUE).strength(0.5f).sound(SoundType.SAND)));
+        YELLOW_CONCRETE_POWDER = register("yellow_concrete_powder", new ConcretePowderBlock(Blocks.YELLOW_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.YELLOW).strength(0.5f).sound(SoundType.SAND)));
+        LIME_CONCRETE_POWDER = register("lime_concrete_powder", new ConcretePowderBlock(Blocks.LIME_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.LIME).strength(0.5f).sound(SoundType.SAND)));
+        PINK_CONCRETE_POWDER = register("pink_concrete_powder", new ConcretePowderBlock(Blocks.PINK_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.PINK).strength(0.5f).sound(SoundType.SAND)));
+        GRAY_CONCRETE_POWDER = register("gray_concrete_powder", new ConcretePowderBlock(Blocks.GRAY_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.GRAY).strength(0.5f).sound(SoundType.SAND)));
+        LIGHT_GRAY_CONCRETE_POWDER = register("light_gray_concrete_powder", new ConcretePowderBlock(Blocks.LIGHT_GRAY_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.LIGHT_GRAY).strength(0.5f).sound(SoundType.SAND)));
+        CYAN_CONCRETE_POWDER = register("cyan_concrete_powder", new ConcretePowderBlock(Blocks.CYAN_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.CYAN).strength(0.5f).sound(SoundType.SAND)));
+        PURPLE_CONCRETE_POWDER = register("purple_concrete_powder", new ConcretePowderBlock(Blocks.PURPLE_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.PURPLE).strength(0.5f).sound(SoundType.SAND)));
+        BLUE_CONCRETE_POWDER = register("blue_concrete_powder", new ConcretePowderBlock(Blocks.BLUE_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.BLUE).strength(0.5f).sound(SoundType.SAND)));
+        BROWN_CONCRETE_POWDER = register("brown_concrete_powder", new ConcretePowderBlock(Blocks.BROWN_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.BROWN).strength(0.5f).sound(SoundType.SAND)));
+        GREEN_CONCRETE_POWDER = register("green_concrete_powder", new ConcretePowderBlock(Blocks.GREEN_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.GREEN).strength(0.5f).sound(SoundType.SAND)));
+        RED_CONCRETE_POWDER = register("red_concrete_powder", new ConcretePowderBlock(Blocks.RED_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.RED).strength(0.5f).sound(SoundType.SAND)));
+        BLACK_CONCRETE_POWDER = register("black_concrete_powder", new ConcretePowderBlock(Blocks.BLACK_CONCRETE, BlockBehaviour.Properties.of(Material.SAND, DyeColor.BLACK).strength(0.5f).sound(SoundType.SAND)));
+        KELP = register("kelp", new KelpBlock(BlockBehaviour.Properties.of(Material.WATER_PLANT).noCollission().randomTicks().instabreak().sound(SoundType.WET_GRASS)));
+        KELP_PLANT = register("kelp_plant", new KelpPlantBlock(BlockBehaviour.Properties.of(Material.WATER_PLANT).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        DRIED_KELP_BLOCK = register("dried_kelp_block", new Block(BlockBehaviour.Properties.of(Material.GRASS, MaterialColor.COLOR_GREEN).strength(0.5f, 2.5f).sound(SoundType.GRASS)));
+        TURTLE_EGG = register("turtle_egg", new TurtleEggBlock(BlockBehaviour.Properties.of(Material.EGG, MaterialColor.SAND).strength(0.5f).sound(SoundType.METAL).randomTicks().noOcclusion()));
+        DEAD_TUBE_CORAL_BLOCK = register("dead_tube_coral_block", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        DEAD_BRAIN_CORAL_BLOCK = register("dead_brain_coral_block", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        DEAD_BUBBLE_CORAL_BLOCK = register("dead_bubble_coral_block", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        DEAD_FIRE_CORAL_BLOCK = register("dead_fire_coral_block", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        DEAD_HORN_CORAL_BLOCK = register("dead_horn_coral_block", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        TUBE_CORAL_BLOCK = register("tube_coral_block", new CoralBlock(Blocks.DEAD_TUBE_CORAL_BLOCK, BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BLUE).requiresCorrectToolForDrops().strength(1.5f, 6.0f).sound(SoundType.CORAL_BLOCK)));
+        BRAIN_CORAL_BLOCK = register("brain_coral_block", new CoralBlock(Blocks.DEAD_BRAIN_CORAL_BLOCK, BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_PINK).requiresCorrectToolForDrops().strength(1.5f, 6.0f).sound(SoundType.CORAL_BLOCK)));
+        BUBBLE_CORAL_BLOCK = register("bubble_coral_block", new CoralBlock(Blocks.DEAD_BUBBLE_CORAL_BLOCK, BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_PURPLE).requiresCorrectToolForDrops().strength(1.5f, 6.0f).sound(SoundType.CORAL_BLOCK)));
+        FIRE_CORAL_BLOCK = register("fire_coral_block", new CoralBlock(Blocks.DEAD_FIRE_CORAL_BLOCK, BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_RED).requiresCorrectToolForDrops().strength(1.5f, 6.0f).sound(SoundType.CORAL_BLOCK)));
+        HORN_CORAL_BLOCK = register("horn_coral_block", new CoralBlock(Blocks.DEAD_HORN_CORAL_BLOCK, BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_YELLOW).requiresCorrectToolForDrops().strength(1.5f, 6.0f).sound(SoundType.CORAL_BLOCK)));
+        DEAD_TUBE_CORAL = register("dead_tube_coral", new BaseCoralPlantBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak()));
+        DEAD_BRAIN_CORAL = register("dead_brain_coral", new BaseCoralPlantBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak()));
+        DEAD_BUBBLE_CORAL = register("dead_bubble_coral", new BaseCoralPlantBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak()));
+        DEAD_FIRE_CORAL = register("dead_fire_coral", new BaseCoralPlantBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak()));
+        DEAD_HORN_CORAL = register("dead_horn_coral", new BaseCoralPlantBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak()));
+        TUBE_CORAL = register("tube_coral", new CoralPlantBlock(Blocks.DEAD_TUBE_CORAL, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_BLUE).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        BRAIN_CORAL = register("brain_coral", new CoralPlantBlock(Blocks.DEAD_BRAIN_CORAL, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PINK).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        BUBBLE_CORAL = register("bubble_coral", new CoralPlantBlock(Blocks.DEAD_BUBBLE_CORAL, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PURPLE).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        FIRE_CORAL = register("fire_coral", new CoralPlantBlock(Blocks.DEAD_FIRE_CORAL, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_RED).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        HORN_CORAL = register("horn_coral", new CoralPlantBlock(Blocks.DEAD_HORN_CORAL, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_YELLOW).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        DEAD_TUBE_CORAL_FAN = register("dead_tube_coral_fan", new BaseCoralFanBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak()));
+        DEAD_BRAIN_CORAL_FAN = register("dead_brain_coral_fan", new BaseCoralFanBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak()));
+        DEAD_BUBBLE_CORAL_FAN = register("dead_bubble_coral_fan", new BaseCoralFanBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak()));
+        DEAD_FIRE_CORAL_FAN = register("dead_fire_coral_fan", new BaseCoralFanBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak()));
+        DEAD_HORN_CORAL_FAN = register("dead_horn_coral_fan", new BaseCoralFanBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak()));
+        TUBE_CORAL_FAN = register("tube_coral_fan", new CoralFanBlock(Blocks.DEAD_TUBE_CORAL_FAN, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_BLUE).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        BRAIN_CORAL_FAN = register("brain_coral_fan", new CoralFanBlock(Blocks.DEAD_BRAIN_CORAL_FAN, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PINK).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        BUBBLE_CORAL_FAN = register("bubble_coral_fan", new CoralFanBlock(Blocks.DEAD_BUBBLE_CORAL_FAN, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PURPLE).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        FIRE_CORAL_FAN = register("fire_coral_fan", new CoralFanBlock(Blocks.DEAD_FIRE_CORAL_FAN, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_RED).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        HORN_CORAL_FAN = register("horn_coral_fan", new CoralFanBlock(Blocks.DEAD_HORN_CORAL_FAN, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_YELLOW).noCollission().instabreak().sound(SoundType.WET_GRASS)));
+        DEAD_TUBE_CORAL_WALL_FAN = register("dead_tube_coral_wall_fan", new BaseCoralWallFanBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak().dropsLike(Blocks.DEAD_TUBE_CORAL_FAN)));
+        DEAD_BRAIN_CORAL_WALL_FAN = register("dead_brain_coral_wall_fan", new BaseCoralWallFanBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak().dropsLike(Blocks.DEAD_BRAIN_CORAL_FAN)));
+        DEAD_BUBBLE_CORAL_WALL_FAN = register("dead_bubble_coral_wall_fan", new BaseCoralWallFanBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak().dropsLike(Blocks.DEAD_BUBBLE_CORAL_FAN)));
+        DEAD_FIRE_CORAL_WALL_FAN = register("dead_fire_coral_wall_fan", new BaseCoralWallFanBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak().dropsLike(Blocks.DEAD_FIRE_CORAL_FAN)));
+        DEAD_HORN_CORAL_WALL_FAN = register("dead_horn_coral_wall_fan", new BaseCoralWallFanBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GRAY).requiresCorrectToolForDrops().noCollission().instabreak().dropsLike(Blocks.DEAD_HORN_CORAL_FAN)));
+        TUBE_CORAL_WALL_FAN = register("tube_coral_wall_fan", new CoralWallFanBlock(Blocks.DEAD_TUBE_CORAL_WALL_FAN, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_BLUE).noCollission().instabreak().sound(SoundType.WET_GRASS).dropsLike(Blocks.TUBE_CORAL_FAN)));
+        BRAIN_CORAL_WALL_FAN = register("brain_coral_wall_fan", new CoralWallFanBlock(Blocks.DEAD_BRAIN_CORAL_WALL_FAN, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PINK).noCollission().instabreak().sound(SoundType.WET_GRASS).dropsLike(Blocks.BRAIN_CORAL_FAN)));
+        BUBBLE_CORAL_WALL_FAN = register("bubble_coral_wall_fan", new CoralWallFanBlock(Blocks.DEAD_BUBBLE_CORAL_WALL_FAN, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_PURPLE).noCollission().instabreak().sound(SoundType.WET_GRASS).dropsLike(Blocks.BUBBLE_CORAL_FAN)));
+        FIRE_CORAL_WALL_FAN = register("fire_coral_wall_fan", new CoralWallFanBlock(Blocks.DEAD_FIRE_CORAL_WALL_FAN, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_RED).noCollission().instabreak().sound(SoundType.WET_GRASS).dropsLike(Blocks.FIRE_CORAL_FAN)));
+        HORN_CORAL_WALL_FAN = register("horn_coral_wall_fan", new CoralWallFanBlock(Blocks.DEAD_HORN_CORAL_WALL_FAN, BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_YELLOW).noCollission().instabreak().sound(SoundType.WET_GRASS).dropsLike(Blocks.HORN_CORAL_FAN)));
+        SEA_PICKLE = register("sea_pickle", new SeaPickleBlock(BlockBehaviour.Properties.of(Material.WATER_PLANT, MaterialColor.COLOR_GREEN).lightLevel(cfj -> SeaPickleBlock.isDead(cfj) ? 0 : (3 + 3 * cfj.<Integer>getValue((Property<Integer>)SeaPickleBlock.PICKLES))).sound(SoundType.SLIME_BLOCK).noOcclusion()));
+        BLUE_ICE = register("blue_ice", new HalfTransparentBlock(BlockBehaviour.Properties.of(Material.ICE_SOLID).strength(2.8f).friction(0.989f).sound(SoundType.GLASS)));
+        CONDUIT = register("conduit", new ConduitBlock(BlockBehaviour.Properties.of(Material.GLASS, MaterialColor.DIAMOND).strength(3.0f).lightLevel(cfj -> 15).noOcclusion()));
+        BAMBOO_SAPLING = register("bamboo_sapling", new BambooSaplingBlock(BlockBehaviour.Properties.of(Material.BAMBOO_SAPLING).randomTicks().instabreak().noCollission().strength(1.0f).sound(SoundType.BAMBOO_SAPLING)));
+        BAMBOO = register("bamboo", new BambooBlock(BlockBehaviour.Properties.of(Material.BAMBOO, MaterialColor.PLANT).randomTicks().instabreak().strength(1.0f).sound(SoundType.BAMBOO).noOcclusion()));
+        POTTED_BAMBOO = register("potted_bamboo", new FlowerPotBlock(Blocks.BAMBOO, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        VOID_AIR = register("void_air", new AirBlock(BlockBehaviour.Properties.of(Material.AIR).noCollission().noDrops().air()));
+        CAVE_AIR = register("cave_air", new AirBlock(BlockBehaviour.Properties.of(Material.AIR).noCollission().noDrops().air()));
+        BUBBLE_COLUMN = register("bubble_column", new BubbleColumnBlock(BlockBehaviour.Properties.of(Material.BUBBLE_COLUMN).noCollission().noDrops()));
+        POLISHED_GRANITE_STAIRS = register("polished_granite_stairs", new StairBlock(Blocks.POLISHED_GRANITE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.POLISHED_GRANITE)));
+        SMOOTH_RED_SANDSTONE_STAIRS = register("smooth_red_sandstone_stairs", new StairBlock(Blocks.SMOOTH_RED_SANDSTONE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.SMOOTH_RED_SANDSTONE)));
+        MOSSY_STONE_BRICK_STAIRS = register("mossy_stone_brick_stairs", new StairBlock(Blocks.MOSSY_STONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.MOSSY_STONE_BRICKS)));
+        POLISHED_DIORITE_STAIRS = register("polished_diorite_stairs", new StairBlock(Blocks.POLISHED_DIORITE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.POLISHED_DIORITE)));
+        MOSSY_COBBLESTONE_STAIRS = register("mossy_cobblestone_stairs", new StairBlock(Blocks.MOSSY_COBBLESTONE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.MOSSY_COBBLESTONE)));
+        END_STONE_BRICK_STAIRS = register("end_stone_brick_stairs", new StairBlock(Blocks.END_STONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.END_STONE_BRICKS)));
+        STONE_STAIRS = register("stone_stairs", new StairBlock(Blocks.STONE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.STONE)));
+        SMOOTH_SANDSTONE_STAIRS = register("smooth_sandstone_stairs", new StairBlock(Blocks.SMOOTH_SANDSTONE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.SMOOTH_SANDSTONE)));
+        SMOOTH_QUARTZ_STAIRS = register("smooth_quartz_stairs", new StairBlock(Blocks.SMOOTH_QUARTZ.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.SMOOTH_QUARTZ)));
+        GRANITE_STAIRS = register("granite_stairs", new StairBlock(Blocks.GRANITE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.GRANITE)));
+        ANDESITE_STAIRS = register("andesite_stairs", new StairBlock(Blocks.ANDESITE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.ANDESITE)));
+        RED_NETHER_BRICK_STAIRS = register("red_nether_brick_stairs", new StairBlock(Blocks.RED_NETHER_BRICKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.RED_NETHER_BRICKS)));
+        POLISHED_ANDESITE_STAIRS = register("polished_andesite_stairs", new StairBlock(Blocks.POLISHED_ANDESITE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.POLISHED_ANDESITE)));
+        DIORITE_STAIRS = register("diorite_stairs", new StairBlock(Blocks.DIORITE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.DIORITE)));
+        POLISHED_GRANITE_SLAB = register("polished_granite_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.POLISHED_GRANITE)));
+        SMOOTH_RED_SANDSTONE_SLAB = register("smooth_red_sandstone_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.SMOOTH_RED_SANDSTONE)));
+        MOSSY_STONE_BRICK_SLAB = register("mossy_stone_brick_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.MOSSY_STONE_BRICKS)));
+        POLISHED_DIORITE_SLAB = register("polished_diorite_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.POLISHED_DIORITE)));
+        MOSSY_COBBLESTONE_SLAB = register("mossy_cobblestone_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.MOSSY_COBBLESTONE)));
+        END_STONE_BRICK_SLAB = register("end_stone_brick_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.END_STONE_BRICKS)));
+        SMOOTH_SANDSTONE_SLAB = register("smooth_sandstone_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.SMOOTH_SANDSTONE)));
+        SMOOTH_QUARTZ_SLAB = register("smooth_quartz_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.SMOOTH_QUARTZ)));
+        GRANITE_SLAB = register("granite_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.GRANITE)));
+        ANDESITE_SLAB = register("andesite_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.ANDESITE)));
+        RED_NETHER_BRICK_SLAB = register("red_nether_brick_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.RED_NETHER_BRICKS)));
+        POLISHED_ANDESITE_SLAB = register("polished_andesite_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.POLISHED_ANDESITE)));
+        DIORITE_SLAB = register("diorite_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.DIORITE)));
+        BRICK_WALL = register("brick_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.BRICKS)));
+        PRISMARINE_WALL = register("prismarine_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.PRISMARINE)));
+        RED_SANDSTONE_WALL = register("red_sandstone_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.RED_SANDSTONE)));
+        MOSSY_STONE_BRICK_WALL = register("mossy_stone_brick_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.MOSSY_STONE_BRICKS)));
+        GRANITE_WALL = register("granite_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.GRANITE)));
+        STONE_BRICK_WALL = register("stone_brick_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.STONE_BRICKS)));
+        NETHER_BRICK_WALL = register("nether_brick_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.NETHER_BRICKS)));
+        ANDESITE_WALL = register("andesite_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.ANDESITE)));
+        RED_NETHER_BRICK_WALL = register("red_nether_brick_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.RED_NETHER_BRICKS)));
+        SANDSTONE_WALL = register("sandstone_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.SANDSTONE)));
+        END_STONE_BRICK_WALL = register("end_stone_brick_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.END_STONE_BRICKS)));
+        DIORITE_WALL = register("diorite_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.DIORITE)));
+        SCAFFOLDING = register("scaffolding", new ScaffoldingBlock(BlockBehaviour.Properties.of(Material.DECORATION, MaterialColor.SAND).noCollission().sound(SoundType.SCAFFOLDING).dynamicShape()));
+        LOOM = register("loom", new LoomBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
+        BARREL = register("barrel", new BarrelBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
+        SMOKER = register("smoker", new SmokerBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.5f).lightLevel(litBlockEmission(13))));
+        BLAST_FURNACE = register("blast_furnace", new BlastFurnaceBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.5f).lightLevel(litBlockEmission(13))));
+        CARTOGRAPHY_TABLE = register("cartography_table", new CartographyTableBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
+        FLETCHING_TABLE = register("fletching_table", new FletchingTableBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
+        GRINDSTONE = register("grindstone", new GrindstoneBlock(BlockBehaviour.Properties.of(Material.HEAVY_METAL, MaterialColor.METAL).requiresCorrectToolForDrops().strength(2.0f, 6.0f).sound(SoundType.STONE)));
+        LECTERN = register("lectern", new LecternBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
+        SMITHING_TABLE = register("smithing_table", new SmithingTableBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(2.5f).sound(SoundType.WOOD)));
+        STONECUTTER = register("stonecutter", new StonecutterBlock(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.5f)));
+        BELL = register("bell", new BellBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.GOLD).requiresCorrectToolForDrops().strength(5.0f).sound(SoundType.ANVIL)));
+        LANTERN = register("lantern", new Lantern(BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().strength(3.5f).sound(SoundType.LANTERN).lightLevel(cfj -> 15).noOcclusion()));
+        SOUL_LANTERN = register("soul_lantern", new Lantern(BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().strength(3.5f).sound(SoundType.LANTERN).lightLevel(cfj -> 10).noOcclusion()));
+        CAMPFIRE = register("campfire", new CampfireBlock(true, 1, BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f).sound(SoundType.WOOD).lightLevel(litBlockEmission(15)).noOcclusion()));
+        SOUL_CAMPFIRE = register("soul_campfire", new CampfireBlock(false, 2, BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.PODZOL).strength(2.0f).sound(SoundType.WOOD).lightLevel(litBlockEmission(10)).noOcclusion()));
+        SWEET_BERRY_BUSH = register("sweet_berry_bush", new SweetBerryBushBlock(BlockBehaviour.Properties.of(Material.PLANT).randomTicks().noCollission().sound(SoundType.SWEET_BERRY_BUSH)));
+        WARPED_STEM = register("warped_stem", netherStem(MaterialColor.WARPED_STEM));
+        STRIPPED_WARPED_STEM = register("stripped_warped_stem", netherStem(MaterialColor.WARPED_STEM));
+        WARPED_HYPHAE = register("warped_hyphae", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.WARPED_HYPHAE).strength(2.0f).sound(SoundType.STEM)));
+        STRIPPED_WARPED_HYPHAE = register("stripped_warped_hyphae", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.WARPED_HYPHAE).strength(2.0f).sound(SoundType.STEM)));
+        WARPED_NYLIUM = register("warped_nylium", new NyliumBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.WARPED_NYLIUM).requiresCorrectToolForDrops().strength(0.4f).sound(SoundType.NYLIUM).randomTicks()));
+        WARPED_FUNGUS = register("warped_fungus", new FungusBlock(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.COLOR_CYAN).instabreak().noCollission().sound(SoundType.FUNGUS), () -> Feature.HUGE_FUNGUS.configured(HugeFungusConfiguration.HUGE_WARPED_FUNGI_PLANTED_CONFIG)));
+        WARPED_WART_BLOCK = register("warped_wart_block", new Block(BlockBehaviour.Properties.of(Material.GRASS, MaterialColor.WARPED_WART_BLOCK).strength(1.0f).sound(SoundType.WART_BLOCK)));
+        WARPED_ROOTS = register("warped_roots", new RootsBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT, MaterialColor.COLOR_CYAN).noCollission().instabreak().sound(SoundType.ROOTS)));
+        NETHER_SPROUTS = register("nether_sprouts", new NetherSproutsBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT, MaterialColor.COLOR_CYAN).noCollission().instabreak().sound(SoundType.NETHER_SPROUTS)));
+        CRIMSON_STEM = register("crimson_stem", netherStem(MaterialColor.CRIMSON_STEM));
+        STRIPPED_CRIMSON_STEM = register("stripped_crimson_stem", netherStem(MaterialColor.CRIMSON_STEM));
+        CRIMSON_HYPHAE = register("crimson_hyphae", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.CRIMSON_HYPHAE).strength(2.0f).sound(SoundType.STEM)));
+        STRIPPED_CRIMSON_HYPHAE = register("stripped_crimson_hyphae", new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.CRIMSON_HYPHAE).strength(2.0f).sound(SoundType.STEM)));
+        CRIMSON_NYLIUM = register("crimson_nylium", new NyliumBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.CRIMSON_NYLIUM).requiresCorrectToolForDrops().strength(0.4f).sound(SoundType.NYLIUM).randomTicks()));
+        CRIMSON_FUNGUS = register("crimson_fungus", new FungusBlock(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.NETHER).instabreak().noCollission().sound(SoundType.FUNGUS), () -> Feature.HUGE_FUNGUS.configured(HugeFungusConfiguration.HUGE_CRIMSON_FUNGI_PLANTED_CONFIG)));
+        SHROOMLIGHT = register("shroomlight", new Block(BlockBehaviour.Properties.of(Material.GRASS, MaterialColor.COLOR_RED).strength(1.0f).sound(SoundType.SHROOMLIGHT).lightLevel(cfj -> 15)));
+        WEEPING_VINES = register("weeping_vines", new WeepingVines(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.NETHER).randomTicks().noCollission().instabreak().sound(SoundType.WEEPING_VINES)));
+        WEEPING_VINES_PLANT = register("weeping_vines_plant", new WeepingVinesPlant(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.NETHER).noCollission().instabreak().sound(SoundType.WEEPING_VINES)));
+        TWISTING_VINES = register("twisting_vines", new TwistingVines(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.COLOR_CYAN).randomTicks().noCollission().instabreak().sound(SoundType.WEEPING_VINES)));
+        TWISTING_VINES_PLANT = register("twisting_vines_plant", new TwistingVinesPlant(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.COLOR_CYAN).noCollission().instabreak().sound(SoundType.WEEPING_VINES)));
+        CRIMSON_ROOTS = register("crimson_roots", new RootsBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_PLANT, MaterialColor.NETHER).noCollission().instabreak().sound(SoundType.ROOTS)));
+        CRIMSON_PLANKS = register("crimson_planks", new Block(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.CRIMSON_STEM).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        WARPED_PLANKS = register("warped_planks", new Block(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.WARPED_STEM).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        CRIMSON_SLAB = register("crimson_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.NETHER).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        WARPED_SLAB = register("warped_slab", new SlabBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.COLOR_CYAN).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        CRIMSON_PRESSURE_PLATE = register("crimson_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.NETHER).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        WARPED_PRESSURE_PLATE = register("warped_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.COLOR_CYAN).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        CRIMSON_FENCE = register("crimson_fence", new FenceBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.NETHER).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        WARPED_FENCE = register("warped_fence", new FenceBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.COLOR_CYAN).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        CRIMSON_TRAPDOOR = register("crimson_trapdoor", new TrapDoorBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.NETHER).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
+        WARPED_TRAPDOOR = register("warped_trapdoor", new TrapDoorBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.COLOR_CYAN).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
+        CRIMSON_FENCE_GATE = register("crimson_fence_gate", new FenceGateBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.NETHER).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        WARPED_FENCE_GATE = register("warped_fence_gate", new FenceGateBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.COLOR_CYAN).strength(2.0f, 3.0f).sound(SoundType.WOOD)));
+        CRIMSON_STAIRS = register("crimson_stairs", new StairBlock(Blocks.CRIMSON_PLANKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.CRIMSON_PLANKS)));
+        WARPED_STAIRS = register("warped_stairs", new StairBlock(Blocks.WARPED_PLANKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.WARPED_PLANKS)));
+        CRIMSON_BUTTON = register("crimson_button", new WoodButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        WARPED_BUTTON = register("warped_button", new WoodButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f).sound(SoundType.WOOD)));
+        CRIMSON_DOOR = register("crimson_door", new DoorBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, Blocks.CRIMSON_PLANKS.defaultMaterialColor()).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
+        WARPED_DOOR = register("warped_door", new DoorBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, Blocks.WARPED_PLANKS.defaultMaterialColor()).strength(3.0f).sound(SoundType.WOOD).noOcclusion()));
+        CRIMSON_SIGN = register("crimson_sign", new StandingSignBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.NETHER).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.CRIMSON));
+        WARPED_SIGN = register("warped_sign", new StandingSignBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD, MaterialColor.COLOR_CYAN).noCollission().strength(1.0f).sound(SoundType.WOOD), WoodType.WARPED));
+        CRIMSON_WALL_SIGN = register("crimson_wall_sign", new WallSignBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.CRIMSON_SIGN), WoodType.CRIMSON));
+        WARPED_WALL_SIGN = register("warped_wall_sign", new WallSignBlock(BlockBehaviour.Properties.of(Material.NETHER_WOOD).noCollission().strength(1.0f).sound(SoundType.WOOD).dropsLike(Blocks.WARPED_SIGN), WoodType.WARPED));
+        STRUCTURE_BLOCK = register("structure_block", new StructureBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_LIGHT_GRAY).requiresCorrectToolForDrops().strength(-1.0f, 3600000.0f).noDrops()));
+        JIGSAW = register("jigsaw", new JigsawBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_LIGHT_GRAY).requiresCorrectToolForDrops().strength(-1.0f, 3600000.0f).noDrops()));
+        COMPOSTER = register("composter", new ComposterBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(0.6f).sound(SoundType.WOOD)));
+        TARGET = register("target", new TargetBlock(BlockBehaviour.Properties.of(Material.GRASS, MaterialColor.QUARTZ).strength(0.5f).sound(SoundType.GRASS)));
+        BEE_NEST = register("bee_nest", new BeehiveBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_YELLOW).strength(0.3f).sound(SoundType.WOOD)));
+        BEEHIVE = register("beehive", new BeehiveBlock(BlockBehaviour.Properties.of(Material.WOOD).strength(0.6f).sound(SoundType.WOOD)));
+        HONEY_BLOCK = register("honey_block", new HoneyBlock(BlockBehaviour.Properties.of(Material.CLAY, MaterialColor.COLOR_ORANGE).speedFactor(0.4f).jumpFactor(0.5f).noOcclusion().sound(SoundType.HONEY_BLOCK)));
+        HONEYCOMB_BLOCK = register("honeycomb_block", new Block(BlockBehaviour.Properties.of(Material.CLAY, MaterialColor.COLOR_ORANGE).strength(0.6f).sound(SoundType.CORAL_BLOCK)));
+        NETHERITE_BLOCK = register("netherite_block", new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(50.0f, 1200.0f).sound(SoundType.NETHERITE_BLOCK)));
+        ANCIENT_DEBRIS = register("ancient_debris", new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(30.0f, 1200.0f).sound(SoundType.ANCIENT_DEBRIS)));
+        CRYING_OBSIDIAN = register("crying_obsidian", new CryingObsidianBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(50.0f, 1200.0f).lightLevel(cfj -> 10)));
+        RESPAWN_ANCHOR = register("respawn_anchor", new RespawnAnchorBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(50.0f, 1200.0f).lightLevel(cfj -> RespawnAnchorBlock.getScaledChargeLevel(cfj, 15))));
+        POTTED_CRIMSON_FUNGUS = register("potted_crimson_fungus", new FlowerPotBlock(Blocks.CRIMSON_FUNGUS, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_WARPED_FUNGUS = register("potted_warped_fungus", new FlowerPotBlock(Blocks.WARPED_FUNGUS, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_CRIMSON_ROOTS = register("potted_crimson_roots", new FlowerPotBlock(Blocks.CRIMSON_ROOTS, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        POTTED_WARPED_ROOTS = register("potted_warped_roots", new FlowerPotBlock(Blocks.WARPED_ROOTS, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()));
+        LODESTONE = register("lodestone", new Block(BlockBehaviour.Properties.of(Material.HEAVY_METAL).requiresCorrectToolForDrops().strength(3.5f).sound(SoundType.LODESTONE)));
+        BLACKSTONE = register("blackstone", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(1.5f, 6.0f)));
+        BLACKSTONE_STAIRS = register("blackstone_stairs", new StairBlock(Blocks.BLACKSTONE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.BLACKSTONE)));
+        BLACKSTONE_WALL = register("blackstone_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.BLACKSTONE)));
+        BLACKSTONE_SLAB = register("blackstone_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.BLACKSTONE).strength(2.0f, 6.0f)));
+        POLISHED_BLACKSTONE = register("polished_blackstone", new Block(BlockBehaviour.Properties.copy(Blocks.BLACKSTONE).strength(2.0f, 6.0f)));
+        POLISHED_BLACKSTONE_BRICKS = register("polished_blackstone_bricks", new Block(BlockBehaviour.Properties.copy(Blocks.POLISHED_BLACKSTONE).strength(1.5f, 6.0f)));
+        CRACKED_POLISHED_BLACKSTONE_BRICKS = register("cracked_polished_blackstone_bricks", new Block(BlockBehaviour.Properties.copy(Blocks.POLISHED_BLACKSTONE_BRICKS)));
+        CHISELED_POLISHED_BLACKSTONE = register("chiseled_polished_blackstone", new Block(BlockBehaviour.Properties.copy(Blocks.POLISHED_BLACKSTONE).strength(1.5f, 6.0f)));
+        POLISHED_BLACKSTONE_BRICK_SLAB = register("polished_blackstone_brick_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.POLISHED_BLACKSTONE_BRICKS).strength(2.0f, 6.0f)));
+        POLISHED_BLACKSTONE_BRICK_STAIRS = register("polished_blackstone_brick_stairs", new StairBlock(Blocks.POLISHED_BLACKSTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.POLISHED_BLACKSTONE_BRICKS)));
+        POLISHED_BLACKSTONE_BRICK_WALL = register("polished_blackstone_brick_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.POLISHED_BLACKSTONE_BRICKS)));
+        GILDED_BLACKSTONE = register("gilded_blackstone", new Block(BlockBehaviour.Properties.copy(Blocks.BLACKSTONE).sound(SoundType.GILDED_BLACKSTONE)));
+        POLISHED_BLACKSTONE_STAIRS = register("polished_blackstone_stairs", new StairBlock(Blocks.POLISHED_BLACKSTONE.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.POLISHED_BLACKSTONE)));
+        POLISHED_BLACKSTONE_SLAB = register("polished_blackstone_slab", new SlabBlock(BlockBehaviour.Properties.copy(Blocks.POLISHED_BLACKSTONE)));
+        POLISHED_BLACKSTONE_PRESSURE_PLATE = register("polished_blackstone_pressure_plate", new PressurePlateBlock(PressurePlateBlock.Sensitivity.MOBS, BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().noCollission().strength(0.5f)));
+        POLISHED_BLACKSTONE_BUTTON = register("polished_blackstone_button", new StoneButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5f)));
+        POLISHED_BLACKSTONE_WALL = register("polished_blackstone_wall", new WallBlock(BlockBehaviour.Properties.copy(Blocks.POLISHED_BLACKSTONE)));
+        CHISELED_NETHER_BRICKS = register("chiseled_nether_bricks", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).requiresCorrectToolForDrops().strength(2.0f, 6.0f).sound(SoundType.NETHER_BRICKS)));
+        CRACKED_NETHER_BRICKS = register("cracked_nether_bricks", new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).requiresCorrectToolForDrops().strength(2.0f, 6.0f).sound(SoundType.NETHER_BRICKS)));
+        QUARTZ_BRICKS = register("quartz_bricks", new Block(BlockBehaviour.Properties.copy(Blocks.QUARTZ_BLOCK)));
+        for (final Block bvr2 : Registry.BLOCK) {
+            for (final BlockState cfj2 : bvr2.getStateDefinition().getPossibleStates()) {
+                Block.BLOCK_STATE_REGISTRY.add(cfj2);
             }
-            bph2.getLootTable();
+            bvr2.getLootTable();
         }
     }
 }
diff --git a/src/net/minecraft/world/level/block/BonemealableBlock.java b/src/net/minecraft/world/level/block/BonemealableBlock.java
index 339f247..dfcb3ac 100644
--- a/src/net/minecraft/world/level/block/BonemealableBlock.java
+++ b/src/net/minecraft/world/level/block/BonemealableBlock.java
@@ -8,9 +8,9 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 
 public interface BonemealableBlock {
-    boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4);
+    boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4);
     
-    boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj);
+    boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj);
     
-    void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj);
+    void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj);
 }
diff --git a/src/net/minecraft/world/level/block/BrewingStandBlock.java b/src/net/minecraft/world/level/block/BrewingStandBlock.java
index a85734f..9b4a0ab 100644
--- a/src/net/minecraft/world/level/block/BrewingStandBlock.java
+++ b/src/net/minecraft/world/level/block/BrewingStandBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
@@ -27,6 +27,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
@@ -36,75 +37,75 @@ public class BrewingStandBlock extends BaseEntityBlock {
     
     public BrewingStandBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BrewingStandBlock.HAS_BOTTLE[0], false)).setValue((Property<Comparable>)BrewingStandBlock.HAS_BOTTLE[1], false)).<Comparable, Boolean>setValue((Property<Comparable>)BrewingStandBlock.HAS_BOTTLE[2], false));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)BrewingStandBlock.HAS_BOTTLE[0], false)).setValue((Property<Comparable>)BrewingStandBlock.HAS_BOTTLE[1], false)).<Comparable, Boolean>setValue((Property<Comparable>)BrewingStandBlock.HAS_BOTTLE[2], false));
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new BrewingStandBlockEntity();
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return BrewingStandBlock.SHAPE;
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk);
-        if (bwl8 instanceof BrewingStandBlockEntity) {
-            ayj.openMenu((MenuProvider)bwl8);
-            ayj.awardStat(Stats.INTERACT_WITH_BREWINGSTAND);
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu);
+        if (cdl8 instanceof BrewingStandBlockEntity) {
+            bec.openMenu((MenuProvider)cdl8);
+            bec.awardStat(Stats.INTERACT_WITH_BREWINGSTAND);
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof BrewingStandBlockEntity) {
-                ((BrewingStandBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof BrewingStandBlockEntity) {
+                ((BrewingStandBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        final double double6 = fk.getX() + 0.4 + random.nextFloat() * 0.2;
-        final double double7 = fk.getY() + 0.7 + random.nextFloat() * 0.3;
-        final double double8 = fk.getZ() + 0.4 + random.nextFloat() * 0.2;
-        bjw.addParticle(ParticleTypes.SMOKE, double6, double7, double8, 0.0, 0.0, 0.0);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        final double double6 = fu.getX() + 0.4 + random.nextFloat() * 0.2;
+        final double double7 = fu.getY() + 0.7 + random.nextFloat() * 0.3;
+        final double double8 = fu.getZ() + 0.4 + random.nextFloat() * 0.2;
+        bqb.addParticle(ParticleTypes.SMOKE, double6, double7, double8, 0.0, 0.0, 0.0);
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof BrewingStandBlockEntity) {
-            Containers.dropContents(bjw, fk, (Container)bwl7);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof BrewingStandBlockEntity) {
+            Containers.dropContents(bqb, fu, (Container)cdl7);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(bjw.getBlockEntity(fk));
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(bqb.getBlockEntity(fu));
     }
     
     @Override
@@ -113,7 +114,7 @@ public class BrewingStandBlock extends BaseEntityBlock {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/BubbleColumnBlock.java b/src/net/minecraft/world/level/block/BubbleColumnBlock.java
index 2a0bb7f..67ec9e4 100644
--- a/src/net/minecraft/world/level/block/BubbleColumnBlock.java
+++ b/src/net/minecraft/world/level/block/BubbleColumnBlock.java
@@ -1,17 +1,17 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.Direction;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.FluidState;
 import java.util.Random;
@@ -25,6 +25,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public class BubbleColumnBlock extends Block implements BucketPickup {
@@ -32,115 +33,109 @@ public class BubbleColumnBlock extends Block implements BucketPickup {
     
     public BubbleColumnBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)BubbleColumnBlock.DRAG_DOWN, true));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)BubbleColumnBlock.DRAG_DOWN, true));
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        final BlockState byj2 = bjw.getBlockState(fk.above());
-        if (byj2.isAir()) {
-            akq.onAboveBubbleCol(byj.<Boolean>getValue((Property<Boolean>)BubbleColumnBlock.DRAG_DOWN));
-            if (!bjw.isClientSide) {
-                final ServerLevel xd7 = (ServerLevel)bjw;
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        final BlockState cfj2 = bqb.getBlockState(fu.above());
+        if (cfj2.isAir()) {
+            aom.onAboveBubbleCol(cfj.<Boolean>getValue((Property<Boolean>)BubbleColumnBlock.DRAG_DOWN));
+            if (!bqb.isClientSide) {
+                final ServerLevel zd7 = (ServerLevel)bqb;
                 for (int integer8 = 0; integer8 < 2; ++integer8) {
-                    xd7.<SimpleParticleType>sendParticles(ParticleTypes.SPLASH, fk.getX() + bjw.random.nextFloat(), fk.getY() + 1, fk.getZ() + bjw.random.nextFloat(), 1, 0.0, 0.0, 0.0, 1.0);
-                    xd7.<SimpleParticleType>sendParticles(ParticleTypes.BUBBLE, fk.getX() + bjw.random.nextFloat(), fk.getY() + 1, fk.getZ() + bjw.random.nextFloat(), 1, 0.0, 0.01, 0.0, 0.2);
+                    zd7.<SimpleParticleType>sendParticles(ParticleTypes.SPLASH, fu.getX() + bqb.random.nextDouble(), fu.getY() + 1, fu.getZ() + bqb.random.nextDouble(), 1, 0.0, 0.0, 0.0, 1.0);
+                    zd7.<SimpleParticleType>sendParticles(ParticleTypes.BUBBLE, fu.getX() + bqb.random.nextDouble(), fu.getY() + 1, fu.getZ() + bqb.random.nextDouble(), 1, 0.0, 0.01, 0.0, 0.2);
                 }
             }
         }
         else {
-            akq.onInsideBubbleColumn(byj.<Boolean>getValue((Property<Boolean>)BubbleColumnBlock.DRAG_DOWN));
+            aom.onInsideBubbleColumn(cfj.<Boolean>getValue((Property<Boolean>)BubbleColumnBlock.DRAG_DOWN));
         }
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        growColumn(bjw, fk.above(), getDrag(bjw, fk.below()));
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        growColumn(bqb, fu.above(), getDrag(bqb, fu.below()));
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        growColumn(xd, fk.above(), getDrag(xd, fk));
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        growColumn(zd, fu.above(), getDrag(zd, fu));
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
+    public FluidState getFluidState(final BlockState cfj) {
         return Fluids.WATER.getSource(false);
     }
     
-    public static void growColumn(final LevelAccessor bjx, final BlockPos fk, final boolean boolean3) {
-        if (canExistIn(bjx, fk)) {
-            bjx.setBlock(fk, ((AbstractStateHolder<O, BlockState>)Blocks.BUBBLE_COLUMN.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)BubbleColumnBlock.DRAG_DOWN, boolean3), 2);
+    public static void growColumn(final LevelAccessor bqc, final BlockPos fu, final boolean boolean3) {
+        if (canExistIn(bqc, fu)) {
+            bqc.setBlock(fu, ((StateHolder<O, BlockState>)Blocks.BUBBLE_COLUMN.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)BubbleColumnBlock.DRAG_DOWN, boolean3), 2);
         }
     }
     
-    public static boolean canExistIn(final LevelAccessor bjx, final BlockPos fk) {
-        final FluidState coj3 = bjx.getFluidState(fk);
-        return bjx.getBlockState(fk).getBlock() == Blocks.WATER && coj3.getAmount() >= 8 && coj3.isSource();
+    public static boolean canExistIn(final LevelAccessor bqc, final BlockPos fu) {
+        final FluidState cxa3 = bqc.getFluidState(fu);
+        return bqc.getBlockState(fu).is(Blocks.WATER) && cxa3.getAmount() >= 8 && cxa3.isSource();
     }
     
-    private static boolean getDrag(final BlockGetter bjg, final BlockPos fk) {
-        final BlockState byj3 = bjg.getBlockState(fk);
-        final Block bph4 = byj3.getBlock();
-        if (bph4 == Blocks.BUBBLE_COLUMN) {
-            return byj3.<Boolean>getValue((Property<Boolean>)BubbleColumnBlock.DRAG_DOWN);
+    private static boolean getDrag(final BlockGetter bpg, final BlockPos fu) {
+        final BlockState cfj3 = bpg.getBlockState(fu);
+        if (cfj3.is(Blocks.BUBBLE_COLUMN)) {
+            return cfj3.<Boolean>getValue((Property<Boolean>)BubbleColumnBlock.DRAG_DOWN);
         }
-        return bph4 != Blocks.SOUL_SAND;
+        return !cfj3.is(Blocks.SOUL_SAND);
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return 5;
-    }
-    
-    @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        final double double6 = fk.getX();
-        final double double7 = fk.getY();
-        final double double8 = fk.getZ();
-        if (byj.<Boolean>getValue((Property<Boolean>)BubbleColumnBlock.DRAG_DOWN)) {
-            bjw.addAlwaysVisibleParticle(ParticleTypes.CURRENT_DOWN, double6 + 0.5, double7 + 0.8, double8, 0.0, 0.0, 0.0);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        final double double6 = fu.getX();
+        final double double7 = fu.getY();
+        final double double8 = fu.getZ();
+        if (cfj.<Boolean>getValue((Property<Boolean>)BubbleColumnBlock.DRAG_DOWN)) {
+            bqb.addAlwaysVisibleParticle(ParticleTypes.CURRENT_DOWN, double6 + 0.5, double7 + 0.8, double8, 0.0, 0.0, 0.0);
             if (random.nextInt(200) == 0) {
-                bjw.playLocalSound(double6, double7, double8, SoundEvents.BUBBLE_COLUMN_WHIRLPOOL_AMBIENT, SoundSource.BLOCKS, 0.2f + random.nextFloat() * 0.2f, 0.9f + random.nextFloat() * 0.15f, false);
+                bqb.playLocalSound(double6, double7, double8, SoundEvents.BUBBLE_COLUMN_WHIRLPOOL_AMBIENT, SoundSource.BLOCKS, 0.2f + random.nextFloat() * 0.2f, 0.9f + random.nextFloat() * 0.15f, false);
             }
         }
         else {
-            bjw.addAlwaysVisibleParticle(ParticleTypes.BUBBLE_COLUMN_UP, double6 + 0.5, double7, double8 + 0.5, 0.0, 0.04, 0.0);
-            bjw.addAlwaysVisibleParticle(ParticleTypes.BUBBLE_COLUMN_UP, double6 + random.nextFloat(), double7 + random.nextFloat(), double8 + random.nextFloat(), 0.0, 0.04, 0.0);
+            bqb.addAlwaysVisibleParticle(ParticleTypes.BUBBLE_COLUMN_UP, double6 + 0.5, double7, double8 + 0.5, 0.0, 0.04, 0.0);
+            bqb.addAlwaysVisibleParticle(ParticleTypes.BUBBLE_COLUMN_UP, double6 + random.nextFloat(), double7 + random.nextFloat(), double8 + random.nextFloat(), 0.0, 0.04, 0.0);
             if (random.nextInt(200) == 0) {
-                bjw.playLocalSound(double6, double7, double8, SoundEvents.BUBBLE_COLUMN_UPWARDS_AMBIENT, SoundSource.BLOCKS, 0.2f + random.nextFloat() * 0.2f, 0.9f + random.nextFloat() * 0.15f, false);
+                bqb.playLocalSound(double6, double7, double8, SoundEvents.BUBBLE_COLUMN_UPWARDS_AMBIENT, SoundSource.BLOCKS, 0.2f + random.nextFloat() * 0.2f, 0.9f + random.nextFloat() * 0.15f, false);
             }
         }
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj1.canSurvive(bqc, fu5)) {
             return Blocks.WATER.defaultBlockState();
         }
-        if (fp == Direction.DOWN) {
-            bjx.setBlock(fk5, ((AbstractStateHolder<O, BlockState>)Blocks.BUBBLE_COLUMN.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)BubbleColumnBlock.DRAG_DOWN, getDrag(bjx, fk6)), 2);
+        if (fz == Direction.DOWN) {
+            bqc.setBlock(fu5, ((StateHolder<O, BlockState>)Blocks.BUBBLE_COLUMN.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)BubbleColumnBlock.DRAG_DOWN, getDrag(bqc, fu6)), 2);
         }
-        else if (fp == Direction.UP && byj3.getBlock() != Blocks.BUBBLE_COLUMN && canExistIn(bjx, fk6)) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, this.getTickDelay(bjx));
+        else if (fz == Direction.UP && !cfj3.is(Blocks.BUBBLE_COLUMN) && canExistIn(bqc, fu6)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 5);
         }
-        bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final Block bph5 = bjz.getBlockState(fk.below()).getBlock();
-        return bph5 == Blocks.BUBBLE_COLUMN || bph5 == Blocks.MAGMA_BLOCK || bph5 == Blocks.SOUL_SAND;
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockState cfj2 = bqd.getBlockState(fu.below());
+        return cfj2.is(Blocks.BUBBLE_COLUMN) || cfj2.is(Blocks.MAGMA_BLOCK) || cfj2.is(Blocks.SOUL_SAND);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return Shapes.empty();
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.INVISIBLE;
     }
     
@@ -150,8 +145,8 @@ public class BubbleColumnBlock extends Block implements BucketPickup {
     }
     
     @Override
-    public Fluid takeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj) {
-        bjx.setBlock(fk, Blocks.AIR.defaultBlockState(), 11);
+    public Fluid takeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj) {
+        bqc.setBlock(fu, Blocks.AIR.defaultBlockState(), 11);
         return Fluids.WATER;
     }
     
diff --git a/src/net/minecraft/world/level/block/BucketPickup.java b/src/net/minecraft/world/level/block/BucketPickup.java
index ec8dc69..2c74a70 100644
--- a/src/net/minecraft/world/level/block/BucketPickup.java
+++ b/src/net/minecraft/world/level/block/BucketPickup.java
@@ -6,5 +6,5 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
 
 public interface BucketPickup {
-    Fluid takeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj);
+    Fluid takeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj);
 }
diff --git a/src/net/minecraft/world/level/block/BushBlock.java b/src/net/minecraft/world/level/block/BushBlock.java
index c8f3176..c672358 100644
--- a/src/net/minecraft/world/level/block/BushBlock.java
+++ b/src/net/minecraft/world/level/block/BushBlock.java
@@ -7,38 +7,38 @@ import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class BushBlock extends Block {
     protected BushBlock(final Properties c) {
         super(c);
     }
     
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        final Block bph5 = byj.getBlock();
-        return bph5 == Blocks.GRASS_BLOCK || bph5 == Blocks.DIRT || bph5 == Blocks.COARSE_DIRT || bph5 == Blocks.PODZOL || bph5 == Blocks.FARMLAND;
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.is(Blocks.GRASS_BLOCK) || cfj.is(Blocks.DIRT) || cfj.is(Blocks.COARSE_DIRT) || cfj.is(Blocks.PODZOL) || cfj.is(Blocks.FARMLAND);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        return this.mayPlaceOn(bjz.getBlockState(fk2), bjz, fk2);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        return this.mayPlaceOn(bqd.getBlockState(fu2), bqd, fu2);
     }
     
     @Override
-    public boolean propagatesSkylightDown(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return true;
+    public boolean propagatesSkylightDown(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.getFluidState().isEmpty();
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
-        return (cqr == PathComputationType.AIR && !this.hasCollision) || super.isPathfindable(byj, bjg, fk, cqr);
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        return (czg == PathComputationType.AIR && !this.hasCollision) || super.isPathfindable(cfj, bpg, fu, czg);
     }
 }
diff --git a/src/net/minecraft/world/level/block/ButtonBlock.java b/src/net/minecraft/world/level/block/ButtonBlock.java
index 72b5d4e..30b3244 100644
--- a/src/net/minecraft/world/level/block/ButtonBlock.java
+++ b/src/net/minecraft/world/level/block/ButtonBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import java.util.List;
@@ -21,11 +21,11 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.properties.AttachFace;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
@@ -51,28 +51,27 @@ public abstract class ButtonBlock extends FaceAttachedHorizontalDirectionalBlock
     
     protected ButtonBlock(final boolean boolean1, final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ButtonBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)ButtonBlock.POWERED, false)).<AttachFace, AttachFace>setValue(ButtonBlock.FACE, AttachFace.WALL));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ButtonBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)ButtonBlock.POWERED, false)).<AttachFace, AttachFace>setValue(ButtonBlock.FACE, AttachFace.WALL));
         this.sensitive = boolean1;
     }
     
-    @Override
-    public int getTickDelay(final LevelReader bjz) {
+    private int getPressDuration() {
         return this.sensitive ? 30 : 20;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final Direction fp6 = byj.<Direction>getValue((Property<Direction>)ButtonBlock.FACING);
-        final boolean boolean7 = byj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED);
-        switch (byj.<AttachFace>getValue(ButtonBlock.FACE)) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final Direction fz6 = cfj.<Direction>getValue((Property<Direction>)ButtonBlock.FACING);
+        final boolean boolean7 = cfj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED);
+        switch (cfj.<AttachFace>getValue(ButtonBlock.FACE)) {
             case FLOOR: {
-                if (fp6.getAxis() == Direction.Axis.X) {
+                if (fz6.getAxis() == Direction.Axis.X) {
                     return boolean7 ? ButtonBlock.PRESSED_FLOOR_AABB_X : ButtonBlock.FLOOR_AABB_X;
                 }
                 return boolean7 ? ButtonBlock.PRESSED_FLOOR_AABB_Z : ButtonBlock.FLOOR_AABB_Z;
             }
             case WALL: {
-                switch (fp6) {
+                switch (fz6) {
                     case EAST: {
                         return boolean7 ? ButtonBlock.PRESSED_EAST_AABB : ButtonBlock.EAST_AABB;
                     }
@@ -89,7 +88,7 @@ public abstract class ButtonBlock extends FaceAttachedHorizontalDirectionalBlock
                 break;
             }
             default: {
-                if (fp6.getAxis() == Direction.Axis.X) {
+                if (fz6.getAxis() == Direction.Axis.X) {
                     return boolean7 ? ButtonBlock.PRESSED_CEILING_AABB_X : ButtonBlock.CEILING_AABB_X;
                 }
                 return boolean7 ? ButtonBlock.PRESSED_CEILING_AABB_Z : ButtonBlock.CEILING_AABB_Z;
@@ -98,96 +97,96 @@ public abstract class ButtonBlock extends FaceAttachedHorizontalDirectionalBlock
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (byj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED)) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED)) {
             return InteractionResult.CONSUME;
         }
-        this.press(byj, bjw, fk);
-        this.playSound(ayj, bjw, fk, true);
-        return InteractionResult.SUCCESS;
+        this.press(cfj, bqb, fu);
+        this.playSound(bec, bqb, fu, true);
+        return InteractionResult.sidedSuccess(bqb.isClientSide);
     }
     
-    public void press(final BlockState byj, final Level bjw, final BlockPos fk) {
-        bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)ButtonBlock.POWERED, true), 3);
-        this.updateNeighbours(byj, bjw, fk);
-        bjw.getBlockTicks().scheduleTick(fk, this, this.getTickDelay(bjw));
+    public void press(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)ButtonBlock.POWERED, true), 3);
+        this.updateNeighbours(cfj, bqb, fu);
+        bqb.getBlockTicks().scheduleTick(fu, this, this.getPressDuration());
     }
     
-    protected void playSound(@Nullable final Player ayj, final LevelAccessor bjx, final BlockPos fk, final boolean boolean4) {
-        bjx.playSound(boolean4 ? ayj : null, fk, this.getSound(boolean4), SoundSource.BLOCKS, 0.3f, boolean4 ? 0.6f : 0.5f);
+    protected void playSound(@Nullable final Player bec, final LevelAccessor bqc, final BlockPos fu, final boolean boolean4) {
+        bqc.playSound(boolean4 ? bec : null, fu, this.getSound(boolean4), SoundSource.BLOCKS, 0.3f, boolean4 ? 0.6f : 0.5f);
     }
     
     protected abstract SoundEvent getSound(final boolean boolean1);
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (boolean5 || byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (boolean5 || cfj1.is(cfj4.getBlock())) {
             return;
         }
-        if (byj1.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED)) {
-            this.updateNeighbours(byj1, bjw, fk);
+        if (cfj1.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED)) {
+            this.updateNeighbours(cfj1, bqb, fu);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return byj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED) ? 15 : 0;
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return cfj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED) ? 15 : 0;
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (byj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED) && FaceAttachedHorizontalDirectionalBlock.getConnectedDirection(byj) == fp) {
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED) && FaceAttachedHorizontalDirectionalBlock.getConnectedDirection(cfj) == fz) {
             return 15;
         }
         return 0;
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED)) {
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED)) {
             return;
         }
         if (this.sensitive) {
-            this.checkPressed(byj, xd, fk);
+            this.checkPressed(cfj, zd, fu);
         }
         else {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)ButtonBlock.POWERED, false), 3);
-            this.updateNeighbours(byj, xd, fk);
-            this.playSound(null, xd, fk, false);
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)ButtonBlock.POWERED, false), 3);
+            this.updateNeighbours(cfj, zd, fu);
+            this.playSound(null, zd, fu, false);
         }
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (bjw.isClientSide || !this.sensitive || byj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED)) {
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (bqb.isClientSide || !this.sensitive || cfj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED)) {
             return;
         }
-        this.checkPressed(byj, bjw, fk);
+        this.checkPressed(cfj, bqb, fu);
     }
     
-    private void checkPressed(final BlockState byj, final Level bjw, final BlockPos fk) {
-        final List<? extends Entity> list5 = bjw.getEntitiesOfClass(AbstractArrow.class, byj.getShape(bjw, fk).bounds().move(fk));
+    private void checkPressed(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        final List<? extends Entity> list5 = bqb.getEntitiesOfClass(AbstractArrow.class, cfj.getShape(bqb, fu).bounds().move(fu));
         final boolean boolean6 = !list5.isEmpty();
-        final boolean boolean7 = byj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED);
+        final boolean boolean7 = cfj.<Boolean>getValue((Property<Boolean>)ButtonBlock.POWERED);
         if (boolean6 != boolean7) {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)ButtonBlock.POWERED, boolean6), 3);
-            this.updateNeighbours(byj, bjw, fk);
-            this.playSound(null, bjw, fk, boolean6);
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)ButtonBlock.POWERED, boolean6), 3);
+            this.updateNeighbours(cfj, bqb, fu);
+            this.playSound(null, bqb, fu, boolean6);
         }
         if (boolean6) {
-            bjw.getBlockTicks().scheduleTick(new BlockPos(fk), this, this.getTickDelay(bjw));
+            bqb.getBlockTicks().scheduleTick(new BlockPos(fu), this, this.getPressDuration());
         }
     }
     
-    private void updateNeighbours(final BlockState byj, final Level bjw, final BlockPos fk) {
-        bjw.updateNeighborsAt(fk, this);
-        bjw.updateNeighborsAt(fk.relative(FaceAttachedHorizontalDirectionalBlock.getConnectedDirection(byj).getOpposite()), this);
+    private void updateNeighbours(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        bqb.updateNeighborsAt(fu, this);
+        bqb.updateNeighborsAt(fu.relative(FaceAttachedHorizontalDirectionalBlock.getConnectedDirection(cfj).getOpposite()), this);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/CactusBlock.java b/src/net/minecraft/world/level/block/CactusBlock.java
index e480452..49a953c 100644
--- a/src/net/minecraft/world/level/block/CactusBlock.java
+++ b/src/net/minecraft/world/level/block/CactusBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -8,6 +8,8 @@ import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.material.Material;
 import java.util.Iterator;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
@@ -20,6 +22,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -30,70 +33,73 @@ public class CactusBlock extends Block {
     
     protected CactusBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)CactusBlock.AGE, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)CactusBlock.AGE, 0));
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.canSurvive(xd, fk)) {
-            xd.destroyBlock(fk, true);
-            return;
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.canSurvive(zd, fu)) {
+            zd.destroyBlock(fu, true);
         }
-        final BlockPos fk2 = fk.above();
-        if (!xd.isEmptyBlock(fk2)) {
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final BlockPos fu2 = fu.above();
+        if (!zd.isEmptyBlock(fu2)) {
             return;
         }
         int integer7;
-        for (integer7 = 1; xd.getBlockState(fk.below(integer7)).getBlock() == this; ++integer7) {}
+        for (integer7 = 1; zd.getBlockState(fu.below(integer7)).is(this); ++integer7) {}
         if (integer7 >= 3) {
             return;
         }
-        final int integer8 = byj.<Integer>getValue((Property<Integer>)CactusBlock.AGE);
+        final int integer8 = cfj.<Integer>getValue((Property<Integer>)CactusBlock.AGE);
         if (integer8 == 15) {
-            xd.setBlockAndUpdate(fk2, this.defaultBlockState());
-            final BlockState byj2 = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)CactusBlock.AGE, 0);
-            xd.setBlock(fk, byj2, 4);
-            byj2.neighborChanged(xd, fk2, this, fk, false);
+            zd.setBlockAndUpdate(fu2, this.defaultBlockState());
+            final BlockState cfj2 = ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)CactusBlock.AGE, 0);
+            zd.setBlock(fu, cfj2, 4);
+            cfj2.neighborChanged(zd, fu2, this, fu, false);
         }
         else {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)CactusBlock.AGE, integer8 + 1), 4);
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)CactusBlock.AGE, integer8 + 1), 4);
         }
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return CactusBlock.COLLISION_SHAPE;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return CactusBlock.OUTLINE_SHAPE;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj1.canSurvive(bqc, fu5)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        for (final Direction fp6 : Direction.Plane.HORIZONTAL) {
-            final BlockState byj2 = bjz.getBlockState(fk.relative(fp6));
-            final Material coo8 = byj2.getMaterial();
-            if (coo8.isSolid() || bjz.getFluidState(fk.relative(fp6)).is(FluidTags.LAVA)) {
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        for (final Direction fz6 : Direction.Plane.HORIZONTAL) {
+            final BlockState cfj2 = bqd.getBlockState(fu.relative(fz6));
+            final Material cxd8 = cfj2.getMaterial();
+            if (cxd8.isSolid() || bqd.getFluidState(fu.relative(fz6)).is(FluidTags.LAVA)) {
                 return false;
             }
         }
-        final Block bph5 = bjz.getBlockState(fk.below()).getBlock();
-        return (bph5 == Blocks.CACTUS || bph5 == Blocks.SAND || bph5 == Blocks.RED_SAND) && !bjz.getBlockState(fk.above()).getMaterial().isLiquid();
+        final BlockState cfj3 = bqd.getBlockState(fu.below());
+        return (cfj3.is(Blocks.CACTUS) || cfj3.is(Blocks.SAND) || cfj3.is(Blocks.RED_SAND)) && !bqd.getBlockState(fu.above()).getMaterial().isLiquid();
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        akq.hurt(DamageSource.CACTUS, 1.0f);
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        aom.hurt(DamageSource.CACTUS, 1.0f);
     }
     
     @Override
@@ -102,7 +108,7 @@ public class CactusBlock extends Block {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/CakeBlock.java b/src/net/minecraft/world/level/block/CakeBlock.java
index 8b660fc..e81a13a 100644
--- a/src/net/minecraft/world/level/block/CakeBlock.java
+++ b/src/net/minecraft/world/level/block/CakeBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -19,6 +19,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -28,55 +29,55 @@ public class CakeBlock extends Block {
     
     protected CakeBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)CakeBlock.BITES, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)CakeBlock.BITES, 0));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return CakeBlock.SHAPE_BY_BITE[byj.<Integer>getValue((Property<Integer>)CakeBlock.BITES)];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return CakeBlock.SHAPE_BY_BITE[cfj.<Integer>getValue((Property<Integer>)CakeBlock.BITES)];
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
-            final ItemStack ben8 = ayj.getItemInHand(ajk);
-            if (this.eat(bjw, fk, byj, ayj) == InteractionResult.SUCCESS) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
+            final ItemStack bki8 = bec.getItemInHand(anf);
+            if (this.eat(bqb, fu, cfj, bec).consumesAction()) {
                 return InteractionResult.SUCCESS;
             }
-            if (ben8.isEmpty()) {
+            if (bki8.isEmpty()) {
                 return InteractionResult.CONSUME;
             }
         }
-        return this.eat(bjw, fk, byj, ayj);
+        return this.eat(bqb, fu, cfj, bec);
     }
     
-    private InteractionResult eat(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final Player ayj) {
-        if (!ayj.canEat(false)) {
+    private InteractionResult eat(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final Player bec) {
+        if (!bec.canEat(false)) {
             return InteractionResult.PASS;
         }
-        ayj.awardStat(Stats.EAT_CAKE_SLICE);
-        ayj.getFoodData().eat(2, 0.1f);
-        final int integer6 = byj.<Integer>getValue((Property<Integer>)CakeBlock.BITES);
+        bec.awardStat(Stats.EAT_CAKE_SLICE);
+        bec.getFoodData().eat(2, 0.1f);
+        final int integer6 = cfj.<Integer>getValue((Property<Integer>)CakeBlock.BITES);
         if (integer6 < 6) {
-            bjx.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)CakeBlock.BITES, integer6 + 1), 3);
+            bqc.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)CakeBlock.BITES, integer6 + 1), 3);
         }
         else {
-            bjx.removeBlock(fk, false);
+            bqc.removeBlock(fu, false);
         }
         return InteractionResult.SUCCESS;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return bjz.getBlockState(fk.below()).getMaterial().isSolid();
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return bqd.getBlockState(fu.below()).getMaterial().isSolid();
     }
     
     @Override
@@ -85,17 +86,17 @@ public class CakeBlock extends Block {
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return (7 - byj.<Integer>getValue((Property<Integer>)CakeBlock.BITES)) * 2;
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return (7 - cfj.<Integer>getValue((Property<Integer>)CakeBlock.BITES)) * 2;
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/CampfireBlock.java b/src/net/minecraft/world/level/block/CampfireBlock.java
index 060b51e..1a5c1d6 100644
--- a/src/net/minecraft/world/level/block/CampfireBlock.java
+++ b/src/net/minecraft/world/level/block/CampfireBlock.java
@@ -1,14 +1,15 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.world.level.GameRules;
-import net.minecraft.world.entity.projectile.AbstractArrow;
-import net.minecraft.world.entity.projectile.Fireball;
+import net.minecraft.world.entity.projectile.Projectile;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.core.particles.ParticleOptions;
@@ -43,6 +44,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -54,202 +56,189 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB
     public static final BooleanProperty WATERLOGGED;
     public static final DirectionProperty FACING;
     private static final VoxelShape VIRTUAL_FENCE_POST;
+    private final boolean spawnParticles;
+    private final int fireDamage;
     
-    public CampfireBlock(final Properties c) {
+    public CampfireBlock(final boolean boolean1, final int integer, final Properties c) {
         super(c);
-        this.registerDefaultState((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)CampfireBlock.LIT, true)).setValue((Property<Comparable>)CampfireBlock.SIGNAL_FIRE, false)).setValue((Property<Comparable>)CampfireBlock.WATERLOGGED, false)).<Comparable, Direction>setValue((Property<Comparable>)CampfireBlock.FACING, Direction.NORTH));
+        this.spawnParticles = boolean1;
+        this.fireDamage = integer;
+        this.registerDefaultState((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)CampfireBlock.LIT, true)).setValue((Property<Comparable>)CampfireBlock.SIGNAL_FIRE, false)).setValue((Property<Comparable>)CampfireBlock.WATERLOGGED, false)).<Comparable, Direction>setValue((Property<Comparable>)CampfireBlock.FACING, Direction.NORTH));
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (byj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT)) {
-            final BlockEntity bwl8 = bjw.getBlockEntity(fk);
-            if (bwl8 instanceof CampfireBlockEntity) {
-                final CampfireBlockEntity bwo9 = (CampfireBlockEntity)bwl8;
-                final ItemStack ben10 = ayj.getItemInHand(ajk);
-                final Optional<CampfireCookingRecipe> optional11 = bwo9.getCookableRecipe(ben10);
-                if (optional11.isPresent()) {
-                    if (!bjw.isClientSide && bwo9.placeFood(ayj.abilities.instabuild ? ben10.copy() : ben10, optional11.get().getCookingTime())) {
-                        ayj.awardStat(Stats.INTERACT_WITH_CAMPFIRE);
-                        return InteractionResult.SUCCESS;
-                    }
-                    return InteractionResult.CONSUME;
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu);
+        if (cdl8 instanceof CampfireBlockEntity) {
+            final CampfireBlockEntity cdo9 = (CampfireBlockEntity)cdl8;
+            final ItemStack bki10 = bec.getItemInHand(anf);
+            final Optional<CampfireCookingRecipe> optional11 = cdo9.getCookableRecipe(bki10);
+            if (optional11.isPresent()) {
+                if (!bqb.isClientSide && cdo9.placeFood(bec.abilities.instabuild ? bki10.copy() : bki10, optional11.get().getCookingTime())) {
+                    bec.awardStat(Stats.INTERACT_WITH_CAMPFIRE);
+                    return InteractionResult.SUCCESS;
                 }
+                return InteractionResult.CONSUME;
             }
         }
         return InteractionResult.PASS;
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (!akq.fireImmune() && byj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT) && akq instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity)akq)) {
-            akq.hurt(DamageSource.IN_FIRE, 1.0f);
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (!aom.fireImmune() && cfj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT) && aom instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity)aom)) {
+            aom.hurt(DamageSource.IN_FIRE, (float)this.fireDamage);
         }
-        super.entityInside(byj, bjw, fk, akq);
+        super.entityInside(cfj, bqb, fu, aom);
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof CampfireBlockEntity) {
-            Containers.dropContents(bjw, fk, ((CampfireBlockEntity)bwl7).getItems());
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof CampfireBlockEntity) {
+            Containers.dropContents(bqb, fu, ((CampfireBlockEntity)cdl7).getItems());
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final LevelAccessor bjx3 = bcq.getLevel();
-        final BlockPos fk4 = bcq.getClickedPos();
-        final boolean boolean5 = bjx3.getFluidState(fk4).getType() == Fluids.WATER;
-        return (((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)CampfireBlock.WATERLOGGED, boolean5)).setValue((Property<Comparable>)CampfireBlock.SIGNAL_FIRE, this.isSmokeSource(bjx3.getBlockState(fk4.below())))).setValue((Property<Comparable>)CampfireBlock.LIT, !boolean5)).<Comparable, Direction>setValue((Property<Comparable>)CampfireBlock.FACING, bcq.getHorizontalDirection());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final LevelAccessor bqc3 = bin.getLevel();
+        final BlockPos fu4 = bin.getClickedPos();
+        final boolean boolean5 = bqc3.getFluidState(fu4).getType() == Fluids.WATER;
+        return (((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)CampfireBlock.WATERLOGGED, boolean5)).setValue((Property<Comparable>)CampfireBlock.SIGNAL_FIRE, this.isSmokeSource(bqc3.getBlockState(fu4.below())))).setValue((Property<Comparable>)CampfireBlock.LIT, !boolean5)).<Comparable, Direction>setValue((Property<Comparable>)CampfireBlock.FACING, bin.getHorizontalDirection());
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)CampfireBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)CampfireBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        if (fp == Direction.DOWN) {
-            return ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.SIGNAL_FIRE, this.isSmokeSource(byj3));
+        if (fz == Direction.DOWN) {
+            return ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.SIGNAL_FIRE, this.isSmokeSource(cfj3));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
-    private boolean isSmokeSource(final BlockState byj) {
-        return byj.getBlock() == Blocks.HAY_BLOCK;
+    private boolean isSmokeSource(final BlockState cfj) {
+        return cfj.is(Blocks.HAY_BLOCK);
     }
     
     @Override
-    public int getLightEmission(final BlockState byj) {
-        return byj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT) ? super.getLightEmission(byj) : 0;
-    }
-    
-    @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return CampfireBlock.SHAPE;
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT)) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT)) {
             return;
         }
         if (random.nextInt(10) == 0) {
-            bjw.playLocalSound(fk.getX() + 0.5f, fk.getY() + 0.5f, fk.getZ() + 0.5f, SoundEvents.CAMPFIRE_CRACKLE, SoundSource.BLOCKS, 0.5f + random.nextFloat(), random.nextFloat() * 0.7f + 0.6f, false);
+            bqb.playLocalSound(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, SoundEvents.CAMPFIRE_CRACKLE, SoundSource.BLOCKS, 0.5f + random.nextFloat(), random.nextFloat() * 0.7f + 0.6f, false);
         }
-        if (random.nextInt(5) == 0) {
+        if (this.spawnParticles && random.nextInt(5) == 0) {
             for (int integer6 = 0; integer6 < random.nextInt(1) + 1; ++integer6) {
-                bjw.addParticle(ParticleTypes.LAVA, fk.getX() + 0.5f, fk.getY() + 0.5f, fk.getZ() + 0.5f, random.nextFloat() / 2.0f, 5.0E-5, random.nextFloat() / 2.0f);
+                bqb.addParticle(ParticleTypes.LAVA, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, random.nextFloat() / 2.0f, 5.0E-5, random.nextFloat() / 2.0f);
             }
         }
     }
     
-    @Override
-    public boolean placeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final FluidState coj) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED) && coj.getType() == Fluids.WATER) {
-            final boolean boolean6 = byj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT);
-            if (boolean6) {
-                if (bjx.isClientSide()) {
-                    for (int integer7 = 0; integer7 < 20; ++integer7) {
-                        makeParticles(bjx.getLevel(), fk, byj.<Boolean>getValue((Property<Boolean>)CampfireBlock.SIGNAL_FIRE), true);
-                    }
-                }
-                else {
-                    bjx.playSound(null, fk, SoundEvents.GENERIC_EXTINGUISH_FIRE, SoundSource.BLOCKS, 1.0f, 1.0f);
-                }
-                final BlockEntity bwl7 = bjx.getBlockEntity(fk);
-                if (bwl7 instanceof CampfireBlockEntity) {
-                    ((CampfireBlockEntity)bwl7).dowse();
-                }
+    public static void dowse(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj) {
+        if (bqc.isClientSide()) {
+            for (int integer4 = 0; integer4 < 20; ++integer4) {
+                makeParticles(bqc.getLevel(), fu, cfj.<Boolean>getValue((Property<Boolean>)CampfireBlock.SIGNAL_FIRE), true);
             }
-            bjx.setBlock(fk, (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)CampfireBlock.WATERLOGGED, true)).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.LIT, false), 3);
-            bjx.getLiquidTicks().scheduleTick(fk, coj.getType(), coj.getType().getTickDelay(bjx));
+        }
+        final BlockEntity cdl4 = bqc.getBlockEntity(fu);
+        if (cdl4 instanceof CampfireBlockEntity) {
+            ((CampfireBlockEntity)cdl4).dowse();
+        }
+    }
+    
+    @Override
+    public boolean placeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final FluidState cxa) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED) && cxa.getType() == Fluids.WATER) {
+            final boolean boolean6 = cfj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT);
+            if (boolean6) {
+                if (!bqc.isClientSide()) {
+                    bqc.playSound(null, fu, SoundEvents.GENERIC_EXTINGUISH_FIRE, SoundSource.BLOCKS, 1.0f, 1.0f);
+                }
+                dowse(bqc, fu, cfj);
+            }
+            bqc.setBlock(fu, (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)CampfireBlock.WATERLOGGED, true)).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.LIT, false), 3);
+            bqc.getLiquidTicks().scheduleTick(fu, cxa.getType(), cxa.getType().getTickDelay(bqc));
             return true;
         }
         return false;
     }
     
-    @Nullable
-    private Entity getShooter(final Entity akq) {
-        if (akq instanceof Fireball) {
-            return ((Fireball)akq).owner;
-        }
-        if (akq instanceof AbstractArrow) {
-            return ((AbstractArrow)akq).getOwner();
-        }
-        return null;
-    }
-    
     @Override
-    public void onProjectileHit(final Level bjw, final BlockState byj, final BlockHitResult cvg, final Entity akq) {
-        if (!bjw.isClientSide) {
-            final boolean boolean6 = akq instanceof Fireball || (akq instanceof AbstractArrow && akq.isOnFire());
-            if (boolean6) {
-                final Entity akq2 = this.getShooter(akq);
-                final boolean boolean7 = akq2 == null || akq2 instanceof Player || bjw.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
-                if (boolean7 && !byj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT) && !byj.<Boolean>getValue((Property<Boolean>)CampfireBlock.WATERLOGGED)) {
-                    final BlockPos fk9 = cvg.getBlockPos();
-                    bjw.setBlock(fk9, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.LIT, true), 11);
-                }
+    public void onProjectileHit(final Level bqb, final BlockState cfj, final BlockHitResult deh, final Projectile bes) {
+        if (!bqb.isClientSide && bes.isOnFire()) {
+            final Entity aom6 = bes.getOwner();
+            final boolean boolean7 = aom6 == null || aom6 instanceof Player || bqb.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
+            if (boolean7 && !cfj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT) && !cfj.<Boolean>getValue((Property<Boolean>)CampfireBlock.WATERLOGGED)) {
+                final BlockPos fu8 = deh.getBlockPos();
+                bqb.setBlock(fu8, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.LIT, true), 11);
             }
         }
     }
     
-    public static void makeParticles(final Level bjw, final BlockPos fk, final boolean boolean3, final boolean boolean4) {
-        final Random random5 = bjw.getRandom();
-        final SimpleParticleType gw6 = boolean3 ? ParticleTypes.CAMPFIRE_SIGNAL_SMOKE : ParticleTypes.CAMPFIRE_COSY_SMOKE;
-        bjw.addAlwaysVisibleParticle(gw6, true, fk.getX() + 0.5 + random5.nextDouble() / 3.0 * (random5.nextBoolean() ? 1 : -1), fk.getY() + random5.nextDouble() + random5.nextDouble(), fk.getZ() + 0.5 + random5.nextDouble() / 3.0 * (random5.nextBoolean() ? 1 : -1), 0.0, 0.07, 0.0);
+    public static void makeParticles(final Level bqb, final BlockPos fu, final boolean boolean3, final boolean boolean4) {
+        final Random random5 = bqb.getRandom();
+        final SimpleParticleType hi6 = boolean3 ? ParticleTypes.CAMPFIRE_SIGNAL_SMOKE : ParticleTypes.CAMPFIRE_COSY_SMOKE;
+        bqb.addAlwaysVisibleParticle(hi6, true, fu.getX() + 0.5 + random5.nextDouble() / 3.0 * (random5.nextBoolean() ? 1 : -1), fu.getY() + random5.nextDouble() + random5.nextDouble(), fu.getZ() + 0.5 + random5.nextDouble() / 3.0 * (random5.nextBoolean() ? 1 : -1), 0.0, 0.07, 0.0);
         if (boolean4) {
-            bjw.addParticle(ParticleTypes.SMOKE, fk.getX() + 0.25 + random5.nextDouble() / 2.0 * (random5.nextBoolean() ? 1 : -1), fk.getY() + 0.4, fk.getZ() + 0.25 + random5.nextDouble() / 2.0 * (random5.nextBoolean() ? 1 : -1), 0.0, 0.005, 0.0);
+            bqb.addParticle(ParticleTypes.SMOKE, fu.getX() + 0.25 + random5.nextDouble() / 2.0 * (random5.nextBoolean() ? 1 : -1), fu.getY() + 0.4, fu.getZ() + 0.25 + random5.nextDouble() / 2.0 * (random5.nextBoolean() ? 1 : -1), 0.0, 0.005, 0.0);
         }
     }
     
-    public static boolean isSmokeyPos(final Level bjw, final BlockPos fk, final int integer) {
-        for (int integer2 = 1; integer2 <= integer; ++integer2) {
-            final BlockPos fk2 = fk.below(integer2);
-            final BlockState byj6 = bjw.getBlockState(fk2);
-            if (isLitCampfire(byj6)) {
+    public static boolean isSmokeyPos(final Level bqb, final BlockPos fu) {
+        for (int integer3 = 1; integer3 <= 5; ++integer3) {
+            final BlockPos fu2 = fu.below(integer3);
+            final BlockState cfj5 = bqb.getBlockState(fu2);
+            if (isLitCampfire(cfj5)) {
                 return true;
             }
-            final boolean boolean7 = Shapes.joinIsNotEmpty(CampfireBlock.VIRTUAL_FENCE_POST, byj6.getCollisionShape(bjw, fk, CollisionContext.empty()), BooleanOp.AND);
-            if (boolean7) {
-                final BlockState byj7 = bjw.getBlockState(fk2.below());
-                return isLitCampfire(byj7);
+            final boolean boolean6 = Shapes.joinIsNotEmpty(CampfireBlock.VIRTUAL_FENCE_POST, cfj5.getCollisionShape(bqb, fu, CollisionContext.empty()), BooleanOp.AND);
+            if (boolean6) {
+                final BlockState cfj6 = bqb.getBlockState(fu2.below());
+                return isLitCampfire(cfj6);
             }
         }
         return false;
     }
     
-    private static boolean isLitCampfire(final BlockState byj) {
-        return byj.getBlock() == Blocks.CAMPFIRE && byj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT);
+    public static boolean isLitCampfire(final BlockState cfj) {
+        return cfj.<Comparable>hasProperty((Property<Comparable>)CampfireBlock.LIT) && cfj.is(BlockTags.CAMPFIRES) && cfj.<Boolean>getValue((Property<Boolean>)CampfireBlock.LIT);
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)CampfireBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)CampfireBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)CampfireBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)CampfireBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)CampfireBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)CampfireBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)CampfireBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)CampfireBlock.FACING)));
     }
     
     @Override
@@ -258,15 +247,19 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new CampfireBlockEntity();
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
+    public static boolean canLight(final BlockState cfj) {
+        return cfj.is(BlockTags.CAMPFIRES, a -> a.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.WATERLOGGED) && a.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.LIT)) && !cfj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED) && !cfj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.LIT);
+    }
+    
     static {
         SHAPE = Block.box(0.0, 0.0, 0.0, 16.0, 7.0, 16.0);
         LIT = BlockStateProperties.LIT;
diff --git a/src/net/minecraft/world/level/block/CarrotBlock.java b/src/net/minecraft/world/level/block/CarrotBlock.java
index aa688ae..50ca124 100644
--- a/src/net/minecraft/world/level/block/CarrotBlock.java
+++ b/src/net/minecraft/world/level/block/CarrotBlock.java
@@ -7,6 +7,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class CarrotBlock extends CropBlock {
@@ -22,8 +23,8 @@ public class CarrotBlock extends CropBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return CarrotBlock.SHAPE_BY_AGE[byj.<Integer>getValue((Property<Integer>)this.getAgeProperty())];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return CarrotBlock.SHAPE_BY_AGE[cfj.<Integer>getValue((Property<Integer>)this.getAgeProperty())];
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/CartographyTableBlock.java b/src/net/minecraft/world/level/block/CartographyTableBlock.java
index f861faf..99e08a2 100644
--- a/src/net/minecraft/world/level/block/CartographyTableBlock.java
+++ b/src/net/minecraft/world/level/block/CartographyTableBlock.java
@@ -16,6 +16,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.network.chat.TranslatableComponent;
 
 public class CartographyTableBlock extends Block {
@@ -26,22 +27,22 @@ public class CartographyTableBlock extends Block {
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        ayj.openMenu(byj.getMenuProvider(bjw, fk));
-        ayj.awardStat(Stats.INTERACT_WITH_CARTOGRAPHY_TABLE);
-        return InteractionResult.SUCCESS;
+        bec.openMenu(cfj.getMenuProvider(bqb, fu));
+        bec.awardStat(Stats.INTERACT_WITH_CARTOGRAPHY_TABLE);
+        return InteractionResult.CONSUME;
     }
     
     @Nullable
     @Override
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return new SimpleMenuProvider((integer, ayi, ayj) -> new CartographyTableMenu(integer, ayi, ContainerLevelAccess.create(bjw, fk)), CartographyTableBlock.CONTAINER_TITLE);
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return new SimpleMenuProvider((integer, beb, bec) -> new CartographyTableMenu(integer, beb, ContainerLevelAccess.create(bqb, fu)), CartographyTableBlock.CONTAINER_TITLE);
     }
     
     static {
-        CONTAINER_TITLE = new TranslatableComponent("container.cartography_table", new Object[0]);
+        CONTAINER_TITLE = new TranslatableComponent("container.cartography_table");
     }
 }
diff --git a/src/net/minecraft/world/level/block/CarvedPumpkinBlock.java b/src/net/minecraft/world/level/block/CarvedPumpkinBlock.java
index 802cc26..b45fe8a 100644
--- a/src/net/minecraft/world/level/block/CarvedPumpkinBlock.java
+++ b/src/net/minecraft/world/level/block/CarvedPumpkinBlock.java
@@ -1,7 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.block.state.predicate.BlockStatePredicate;
@@ -21,13 +20,15 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.block.state.pattern.BlockPattern;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
+import net.minecraft.world.item.Wearable;
 
-public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
+public class CarvedPumpkinBlock extends HorizontalDirectionalBlock implements Wearable {
     public static final DirectionProperty FACING;
     @Nullable
     private BlockPattern snowGolemBase;
@@ -41,63 +42,63 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
     
     protected CarvedPumpkinBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)CarvedPumpkinBlock.FACING, Direction.NORTH));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)CarvedPumpkinBlock.FACING, Direction.NORTH));
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj4.getBlock() == byj1.getBlock()) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj4.is(cfj1.getBlock())) {
             return;
         }
-        this.trySpawnGolem(bjw, fk);
+        this.trySpawnGolem(bqb, fu);
     }
     
-    public boolean canSpawnGolem(final LevelReader bjz, final BlockPos fk) {
-        return this.getOrCreateSnowGolemBase().find(bjz, fk) != null || this.getOrCreateIronGolemBase().find(bjz, fk) != null;
+    public boolean canSpawnGolem(final LevelReader bqd, final BlockPos fu) {
+        return this.getOrCreateSnowGolemBase().find(bqd, fu) != null || this.getOrCreateIronGolemBase().find(bqd, fu) != null;
     }
     
-    private void trySpawnGolem(final Level bjw, final BlockPos fk) {
-        BlockPattern.BlockPatternMatch b4 = this.getOrCreateSnowGolemFull().find(bjw, fk);
+    private void trySpawnGolem(final Level bqb, final BlockPos fu) {
+        BlockPattern.BlockPatternMatch b4 = this.getOrCreateSnowGolemFull().find(bqb, fu);
         if (b4 != null) {
             for (int integer5 = 0; integer5 < this.getOrCreateSnowGolemFull().getHeight(); ++integer5) {
-                final BlockInWorld byn6 = b4.getBlock(0, integer5, 0);
-                bjw.setBlock(byn6.getPos(), Blocks.AIR.defaultBlockState(), 2);
-                bjw.levelEvent(2001, byn6.getPos(), Block.getId(byn6.getState()));
+                final BlockInWorld cfn6 = b4.getBlock(0, integer5, 0);
+                bqb.setBlock(cfn6.getPos(), Blocks.AIR.defaultBlockState(), 2);
+                bqb.levelEvent(2001, cfn6.getPos(), Block.getId(cfn6.getState()));
             }
-            final SnowGolem atx5 = EntityType.SNOW_GOLEM.create(bjw);
-            final BlockPos fk2 = b4.getBlock(0, 2, 0).getPos();
-            atx5.moveTo(fk2.getX() + 0.5, fk2.getY() + 0.05, fk2.getZ() + 0.5, 0.0f, 0.0f);
-            bjw.addFreshEntity(atx5);
-            for (final ServerPlayer xe8 : bjw.<ServerPlayer>getEntitiesOfClass(ServerPlayer.class, atx5.getBoundingBox().inflate(5.0))) {
-                CriteriaTriggers.SUMMONED_ENTITY.trigger(xe8, atx5);
+            final SnowGolem azf5 = EntityType.SNOW_GOLEM.create(bqb);
+            final BlockPos fu2 = b4.getBlock(0, 2, 0).getPos();
+            azf5.moveTo(fu2.getX() + 0.5, fu2.getY() + 0.05, fu2.getZ() + 0.5, 0.0f, 0.0f);
+            bqb.addFreshEntity(azf5);
+            for (final ServerPlayer ze8 : bqb.<ServerPlayer>getEntitiesOfClass(ServerPlayer.class, azf5.getBoundingBox().inflate(5.0))) {
+                CriteriaTriggers.SUMMONED_ENTITY.trigger(ze8, azf5);
             }
             for (int integer6 = 0; integer6 < this.getOrCreateSnowGolemFull().getHeight(); ++integer6) {
-                final BlockInWorld byn7 = b4.getBlock(0, integer6, 0);
-                bjw.blockUpdated(byn7.getPos(), Blocks.AIR);
+                final BlockInWorld cfn7 = b4.getBlock(0, integer6, 0);
+                bqb.blockUpdated(cfn7.getPos(), Blocks.AIR);
             }
         }
         else {
-            b4 = this.getOrCreateIronGolemFull().find(bjw, fk);
+            b4 = this.getOrCreateIronGolemFull().find(bqb, fu);
             if (b4 != null) {
                 for (int integer5 = 0; integer5 < this.getOrCreateIronGolemFull().getWidth(); ++integer5) {
                     for (int integer7 = 0; integer7 < this.getOrCreateIronGolemFull().getHeight(); ++integer7) {
-                        final BlockInWorld byn8 = b4.getBlock(integer5, integer7, 0);
-                        bjw.setBlock(byn8.getPos(), Blocks.AIR.defaultBlockState(), 2);
-                        bjw.levelEvent(2001, byn8.getPos(), Block.getId(byn8.getState()));
+                        final BlockInWorld cfn8 = b4.getBlock(integer5, integer7, 0);
+                        bqb.setBlock(cfn8.getPos(), Blocks.AIR.defaultBlockState(), 2);
+                        bqb.levelEvent(2001, cfn8.getPos(), Block.getId(cfn8.getState()));
                     }
                 }
-                final BlockPos fk3 = b4.getBlock(1, 2, 0).getPos();
-                final IronGolem atl6 = EntityType.IRON_GOLEM.create(bjw);
-                atl6.setPlayerCreated(true);
-                atl6.moveTo(fk3.getX() + 0.5, fk3.getY() + 0.05, fk3.getZ() + 0.5, 0.0f, 0.0f);
-                bjw.addFreshEntity(atl6);
-                for (final ServerPlayer xe8 : bjw.<ServerPlayer>getEntitiesOfClass(ServerPlayer.class, atl6.getBoundingBox().inflate(5.0))) {
-                    CriteriaTriggers.SUMMONED_ENTITY.trigger(xe8, atl6);
+                final BlockPos fu3 = b4.getBlock(1, 2, 0).getPos();
+                final IronGolem ayt6 = EntityType.IRON_GOLEM.create(bqb);
+                ayt6.setPlayerCreated(true);
+                ayt6.moveTo(fu3.getX() + 0.5, fu3.getY() + 0.05, fu3.getZ() + 0.5, 0.0f, 0.0f);
+                bqb.addFreshEntity(ayt6);
+                for (final ServerPlayer ze8 : bqb.<ServerPlayer>getEntitiesOfClass(ServerPlayer.class, ayt6.getBoundingBox().inflate(5.0))) {
+                    CriteriaTriggers.SUMMONED_ENTITY.trigger(ze8, ayt6);
                 }
                 for (int integer6 = 0; integer6 < this.getOrCreateIronGolemFull().getWidth(); ++integer6) {
                     for (int integer8 = 0; integer8 < this.getOrCreateIronGolemFull().getHeight(); ++integer8) {
-                        final BlockInWorld byn9 = b4.getBlock(integer6, integer8, 0);
-                        bjw.blockUpdated(byn9.getPos(), Blocks.AIR);
+                        final BlockInWorld cfn9 = b4.getBlock(integer6, integer8, 0);
+                        bqb.blockUpdated(cfn9.getPos(), Blocks.AIR);
                     }
                 }
             }
@@ -105,8 +106,8 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)CarvedPumpkinBlock.FACING, bcq.getHorizontalDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)CarvedPumpkinBlock.FACING, bin.getHorizontalDirection().getOpposite());
     }
     
     @Override
@@ -142,13 +143,8 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
         return this.ironGolemFull;
     }
     
-    @Override
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return true;
-    }
-    
     static {
         FACING = HorizontalDirectionalBlock.FACING;
-        PUMPKINS_PREDICATE = (byj -> byj != null && (byj.getBlock() == Blocks.CARVED_PUMPKIN || byj.getBlock() == Blocks.JACK_O_LANTERN));
+        PUMPKINS_PREDICATE = (cfj -> cfj != null && (cfj.is(Blocks.CARVED_PUMPKIN) || cfj.is(Blocks.JACK_O_LANTERN)));
     }
 }
diff --git a/src/net/minecraft/world/level/block/CauldronBlock.java b/src/net/minecraft/world/level/block/CauldronBlock.java
index 063695a..df0c42d 100644
--- a/src/net/minecraft/world/level/block/CauldronBlock.java
+++ b/src/net/minecraft/world/level/block/CauldronBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -33,6 +33,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -43,177 +44,177 @@ public class CauldronBlock extends Block {
     
     public CauldronBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)CauldronBlock.LEVEL, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)CauldronBlock.LEVEL, 0));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return CauldronBlock.SHAPE;
     }
     
     @Override
-    public VoxelShape getInteractionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public VoxelShape getInteractionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return CauldronBlock.INSIDE;
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        final int integer6 = byj.<Integer>getValue((Property<Integer>)CauldronBlock.LEVEL);
-        final float float7 = fk.getY() + (6.0f + 3 * integer6) / 16.0f;
-        if (!bjw.isClientSide && akq.isOnFire() && integer6 > 0 && akq.getY() <= float7) {
-            akq.clearFire();
-            this.setWaterLevel(bjw, fk, byj, integer6 - 1);
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        final int integer6 = cfj.<Integer>getValue((Property<Integer>)CauldronBlock.LEVEL);
+        final float float7 = fu.getY() + (6.0f + 3 * integer6) / 16.0f;
+        if (!bqb.isClientSide && aom.isOnFire() && integer6 > 0 && aom.getY() <= float7) {
+            aom.clearFire();
+            this.setWaterLevel(bqb, fu, cfj, integer6 - 1);
         }
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final ItemStack ben8 = ayj.getItemInHand(ajk);
-        if (ben8.isEmpty()) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final ItemStack bki8 = bec.getItemInHand(anf);
+        if (bki8.isEmpty()) {
             return InteractionResult.PASS;
         }
-        final int integer9 = byj.<Integer>getValue((Property<Integer>)CauldronBlock.LEVEL);
-        final Item bei10 = ben8.getItem();
-        if (bei10 == Items.WATER_BUCKET) {
-            if (integer9 < 3 && !bjw.isClientSide) {
-                if (!ayj.abilities.instabuild) {
-                    ayj.setItemInHand(ajk, new ItemStack(Items.BUCKET));
+        final int integer9 = cfj.<Integer>getValue((Property<Integer>)CauldronBlock.LEVEL);
+        final Item bke10 = bki8.getItem();
+        if (bke10 == Items.WATER_BUCKET) {
+            if (integer9 < 3 && !bqb.isClientSide) {
+                if (!bec.abilities.instabuild) {
+                    bec.setItemInHand(anf, new ItemStack(Items.BUCKET));
                 }
-                ayj.awardStat(Stats.FILL_CAULDRON);
-                this.setWaterLevel(bjw, fk, byj, 3);
-                bjw.playSound(null, fk, SoundEvents.BUCKET_EMPTY, SoundSource.BLOCKS, 1.0f, 1.0f);
+                bec.awardStat(Stats.FILL_CAULDRON);
+                this.setWaterLevel(bqb, fu, cfj, 3);
+                bqb.playSound(null, fu, SoundEvents.BUCKET_EMPTY, SoundSource.BLOCKS, 1.0f, 1.0f);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
-        if (bei10 == Items.BUCKET) {
-            if (integer9 == 3 && !bjw.isClientSide) {
-                if (!ayj.abilities.instabuild) {
-                    ben8.shrink(1);
-                    if (ben8.isEmpty()) {
-                        ayj.setItemInHand(ajk, new ItemStack(Items.WATER_BUCKET));
+        if (bke10 == Items.BUCKET) {
+            if (integer9 == 3 && !bqb.isClientSide) {
+                if (!bec.abilities.instabuild) {
+                    bki8.shrink(1);
+                    if (bki8.isEmpty()) {
+                        bec.setItemInHand(anf, new ItemStack(Items.WATER_BUCKET));
                     }
-                    else if (!ayj.inventory.add(new ItemStack(Items.WATER_BUCKET))) {
-                        ayj.drop(new ItemStack(Items.WATER_BUCKET), false);
+                    else if (!bec.inventory.add(new ItemStack(Items.WATER_BUCKET))) {
+                        bec.drop(new ItemStack(Items.WATER_BUCKET), false);
                     }
                 }
-                ayj.awardStat(Stats.USE_CAULDRON);
-                this.setWaterLevel(bjw, fk, byj, 0);
-                bjw.playSound(null, fk, SoundEvents.BUCKET_FILL, SoundSource.BLOCKS, 1.0f, 1.0f);
+                bec.awardStat(Stats.USE_CAULDRON);
+                this.setWaterLevel(bqb, fu, cfj, 0);
+                bqb.playSound(null, fu, SoundEvents.BUCKET_FILL, SoundSource.BLOCKS, 1.0f, 1.0f);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
-        if (bei10 == Items.GLASS_BOTTLE) {
-            if (integer9 > 0 && !bjw.isClientSide) {
-                if (!ayj.abilities.instabuild) {
-                    final ItemStack ben9 = PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER);
-                    ayj.awardStat(Stats.USE_CAULDRON);
-                    ben8.shrink(1);
-                    if (ben8.isEmpty()) {
-                        ayj.setItemInHand(ajk, ben9);
+        if (bke10 == Items.GLASS_BOTTLE) {
+            if (integer9 > 0 && !bqb.isClientSide) {
+                if (!bec.abilities.instabuild) {
+                    final ItemStack bki9 = PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER);
+                    bec.awardStat(Stats.USE_CAULDRON);
+                    bki8.shrink(1);
+                    if (bki8.isEmpty()) {
+                        bec.setItemInHand(anf, bki9);
                     }
-                    else if (!ayj.inventory.add(ben9)) {
-                        ayj.drop(ben9, false);
+                    else if (!bec.inventory.add(bki9)) {
+                        bec.drop(bki9, false);
                     }
-                    else if (ayj instanceof ServerPlayer) {
-                        ((ServerPlayer)ayj).refreshContainer(ayj.inventoryMenu);
+                    else if (bec instanceof ServerPlayer) {
+                        ((ServerPlayer)bec).refreshContainer(bec.inventoryMenu);
                     }
                 }
-                bjw.playSound(null, fk, SoundEvents.BOTTLE_FILL, SoundSource.BLOCKS, 1.0f, 1.0f);
-                this.setWaterLevel(bjw, fk, byj, integer9 - 1);
+                bqb.playSound(null, fu, SoundEvents.BOTTLE_FILL, SoundSource.BLOCKS, 1.0f, 1.0f);
+                this.setWaterLevel(bqb, fu, cfj, integer9 - 1);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
-        if (bei10 == Items.POTION && PotionUtils.getPotion(ben8) == Potions.WATER) {
-            if (integer9 < 3 && !bjw.isClientSide) {
-                if (!ayj.abilities.instabuild) {
-                    final ItemStack ben9 = new ItemStack(Items.GLASS_BOTTLE);
-                    ayj.awardStat(Stats.USE_CAULDRON);
-                    ayj.setItemInHand(ajk, ben9);
-                    if (ayj instanceof ServerPlayer) {
-                        ((ServerPlayer)ayj).refreshContainer(ayj.inventoryMenu);
+        if (bke10 == Items.POTION && PotionUtils.getPotion(bki8) == Potions.WATER) {
+            if (integer9 < 3 && !bqb.isClientSide) {
+                if (!bec.abilities.instabuild) {
+                    final ItemStack bki9 = new ItemStack(Items.GLASS_BOTTLE);
+                    bec.awardStat(Stats.USE_CAULDRON);
+                    bec.setItemInHand(anf, bki9);
+                    if (bec instanceof ServerPlayer) {
+                        ((ServerPlayer)bec).refreshContainer(bec.inventoryMenu);
                     }
                 }
-                bjw.playSound(null, fk, SoundEvents.BOTTLE_EMPTY, SoundSource.BLOCKS, 1.0f, 1.0f);
-                this.setWaterLevel(bjw, fk, byj, integer9 + 1);
+                bqb.playSound(null, fu, SoundEvents.BOTTLE_EMPTY, SoundSource.BLOCKS, 1.0f, 1.0f);
+                this.setWaterLevel(bqb, fu, cfj, integer9 + 1);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
-        if (integer9 > 0 && bei10 instanceof DyeableLeatherItem) {
-            final DyeableLeatherItem bdn11 = (DyeableLeatherItem)bei10;
-            if (bdn11.hasCustomColor(ben8) && !bjw.isClientSide) {
-                bdn11.clearColor(ben8);
-                this.setWaterLevel(bjw, fk, byj, integer9 - 1);
-                ayj.awardStat(Stats.CLEAN_ARMOR);
+        if (integer9 > 0 && bke10 instanceof DyeableLeatherItem) {
+            final DyeableLeatherItem bji11 = (DyeableLeatherItem)bke10;
+            if (bji11.hasCustomColor(bki8) && !bqb.isClientSide) {
+                bji11.clearColor(bki8);
+                this.setWaterLevel(bqb, fu, cfj, integer9 - 1);
+                bec.awardStat(Stats.CLEAN_ARMOR);
                 return InteractionResult.SUCCESS;
             }
         }
-        if (integer9 > 0 && bei10 instanceof BannerItem) {
-            if (BannerBlockEntity.getPatternCount(ben8) > 0 && !bjw.isClientSide) {
-                final ItemStack ben9 = ben8.copy();
-                ben9.setCount(1);
-                BannerBlockEntity.removeLastPattern(ben9);
-                ayj.awardStat(Stats.CLEAN_BANNER);
-                if (!ayj.abilities.instabuild) {
-                    ben8.shrink(1);
-                    this.setWaterLevel(bjw, fk, byj, integer9 - 1);
+        if (integer9 > 0 && bke10 instanceof BannerItem) {
+            if (BannerBlockEntity.getPatternCount(bki8) > 0 && !bqb.isClientSide) {
+                final ItemStack bki9 = bki8.copy();
+                bki9.setCount(1);
+                BannerBlockEntity.removeLastPattern(bki9);
+                bec.awardStat(Stats.CLEAN_BANNER);
+                if (!bec.abilities.instabuild) {
+                    bki8.shrink(1);
+                    this.setWaterLevel(bqb, fu, cfj, integer9 - 1);
                 }
-                if (ben8.isEmpty()) {
-                    ayj.setItemInHand(ajk, ben9);
+                if (bki8.isEmpty()) {
+                    bec.setItemInHand(anf, bki9);
                 }
-                else if (!ayj.inventory.add(ben9)) {
-                    ayj.drop(ben9, false);
+                else if (!bec.inventory.add(bki9)) {
+                    bec.drop(bki9, false);
                 }
-                else if (ayj instanceof ServerPlayer) {
-                    ((ServerPlayer)ayj).refreshContainer(ayj.inventoryMenu);
+                else if (bec instanceof ServerPlayer) {
+                    ((ServerPlayer)bec).refreshContainer(bec.inventoryMenu);
                 }
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
-        if (integer9 <= 0 || !(bei10 instanceof BlockItem)) {
+        if (integer9 <= 0 || !(bke10 instanceof BlockItem)) {
             return InteractionResult.PASS;
         }
-        final Block bph11 = ((BlockItem)bei10).getBlock();
-        if (bph11 instanceof ShulkerBoxBlock && !bjw.isClientSide()) {
-            final ItemStack ben10 = new ItemStack(Blocks.SHULKER_BOX, 1);
-            if (ben8.hasTag()) {
-                ben10.setTag(ben8.getTag().copy());
+        final Block bvr11 = ((BlockItem)bke10).getBlock();
+        if (bvr11 instanceof ShulkerBoxBlock && !bqb.isClientSide()) {
+            final ItemStack bki10 = new ItemStack(Blocks.SHULKER_BOX, 1);
+            if (bki8.hasTag()) {
+                bki10.setTag(bki8.getTag().copy());
             }
-            ayj.setItemInHand(ajk, ben10);
-            this.setWaterLevel(bjw, fk, byj, integer9 - 1);
-            ayj.awardStat(Stats.CLEAN_SHULKER_BOX);
+            bec.setItemInHand(anf, bki10);
+            this.setWaterLevel(bqb, fu, cfj, integer9 - 1);
+            bec.awardStat(Stats.CLEAN_SHULKER_BOX);
             return InteractionResult.SUCCESS;
         }
         return InteractionResult.CONSUME;
     }
     
-    public void setWaterLevel(final Level bjw, final BlockPos fk, final BlockState byj, final int integer) {
-        bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)CauldronBlock.LEVEL, Mth.clamp(integer, 0, 3)), 2);
-        bjw.updateNeighbourForOutputSignal(fk, this);
+    public void setWaterLevel(final Level bqb, final BlockPos fu, final BlockState cfj, final int integer) {
+        bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)CauldronBlock.LEVEL, Mth.clamp(integer, 0, 3)), 2);
+        bqb.updateNeighbourForOutputSignal(fu, this);
     }
     
     @Override
-    public void handleRain(final Level bjw, final BlockPos fk) {
-        if (bjw.random.nextInt(20) != 1) {
+    public void handleRain(final Level bqb, final BlockPos fu) {
+        if (bqb.random.nextInt(20) != 1) {
             return;
         }
-        final float float4 = bjw.getBiome(fk).getTemperature(fk);
+        final float float4 = bqb.getBiome(fu).getTemperature(fu);
         if (float4 < 0.15f) {
             return;
         }
-        final BlockState byj5 = bjw.getBlockState(fk);
-        if (byj5.<Integer>getValue((Property<Integer>)CauldronBlock.LEVEL) < 3) {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj5).<Comparable>cycle((Property<Comparable>)CauldronBlock.LEVEL), 2);
+        final BlockState cfj5 = bqb.getBlockState(fu);
+        if (cfj5.<Integer>getValue((Property<Integer>)CauldronBlock.LEVEL) < 3) {
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj5).<Comparable>cycle((Property<Comparable>)CauldronBlock.LEVEL), 2);
         }
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return byj.<Integer>getValue((Property<Integer>)CauldronBlock.LEVEL);
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return cfj.<Integer>getValue((Property<Integer>)CauldronBlock.LEVEL);
     }
     
     @Override
@@ -222,7 +223,7 @@ public class CauldronBlock extends Block {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/ChainBlock.java b/src/net/minecraft/world/level/block/ChainBlock.java
new file mode 100644
index 0000000..662d29e
--- /dev/null
+++ b/src/net/minecraft/world/level/block/ChainBlock.java
@@ -0,0 +1,75 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.Direction;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluids;
+import net.minecraft.world.item.BlockPlaceContext;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public class ChainBlock extends Block implements SimpleWaterloggedBlock {
+    public static final VoxelShape SHAPE;
+    public static final BooleanProperty WATERLOGGED;
+    
+    public ChainBlock(final Properties c) {
+        super(c);
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)ChainBlock.WATERLOGGED, false));
+    }
+    
+    @Override
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return ChainBlock.SHAPE;
+    }
+    
+    @Nullable
+    @Override
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final FluidState cxa3 = bin.getLevel().getFluidState(bin.getClickedPos());
+        final boolean boolean4 = cxa3.getType() == Fluids.WATER;
+        return ((StateHolder<O, BlockState>)super.getStateForPlacement(bin)).<Comparable, Boolean>setValue((Property<Comparable>)ChainBlock.WATERLOGGED, boolean4);
+    }
+    
+    @Override
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)ChainBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
+        }
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
+    }
+    
+    @Override
+    protected void createBlockStateDefinition(final StateDefinition.Builder<Block, BlockState> a) {
+        a.add(ChainBlock.WATERLOGGED);
+    }
+    
+    @Override
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)ChainBlock.WATERLOGGED)) {
+            return Fluids.WATER.getSource(false);
+        }
+        return super.getFluidState(cfj);
+    }
+    
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        return false;
+    }
+    
+    static {
+        SHAPE = Block.box(6.5, 0.0, 6.5, 9.5, 16.0, 9.5);
+        WATERLOGGED = BlockStateProperties.WATERLOGGED;
+    }
+}
diff --git a/src/net/minecraft/world/level/block/ChestBlock.java b/src/net/minecraft/world/level/block/ChestBlock.java
index 5e80c7f..866d27a 100644
--- a/src/net/minecraft/world/level/block/ChestBlock.java
+++ b/src/net/minecraft/world/level/block/ChestBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.inventory.ChestMenu;
@@ -19,6 +19,7 @@ import net.minecraft.world.level.block.entity.LidBlockEntity;
 import java.util.function.BiPredicate;
 import net.minecraft.stats.Stats;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.monster.piglin.PiglinAi;
 import net.minecraft.stats.Stat;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.BlockHitResult;
@@ -43,6 +44,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import java.util.function.Supplier;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.Container;
 import java.util.Optional;
@@ -67,48 +69,48 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
     
     protected ChestBlock(final Properties c, final Supplier<BlockEntityType<? extends ChestBlockEntity>> supplier) {
         super(c, supplier);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ChestBlock.FACING, Direction.NORTH)).setValue(ChestBlock.TYPE, ChestType.SINGLE)).<Comparable, Boolean>setValue((Property<Comparable>)ChestBlock.WATERLOGGED, false));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ChestBlock.FACING, Direction.NORTH)).setValue(ChestBlock.TYPE, ChestType.SINGLE)).<Comparable, Boolean>setValue((Property<Comparable>)ChestBlock.WATERLOGGED, false));
     }
     
-    public static DoubleBlockCombiner.BlockType getBlockType(final BlockState byj) {
-        final ChestType bzc2 = byj.<ChestType>getValue(ChestBlock.TYPE);
-        if (bzc2 == ChestType.SINGLE) {
+    public static DoubleBlockCombiner.BlockType getBlockType(final BlockState cfj) {
+        final ChestType cgb2 = cfj.<ChestType>getValue(ChestBlock.TYPE);
+        if (cgb2 == ChestType.SINGLE) {
             return DoubleBlockCombiner.BlockType.SINGLE;
         }
-        if (bzc2 == ChestType.RIGHT) {
+        if (cgb2 == ChestType.RIGHT) {
             return DoubleBlockCombiner.BlockType.FIRST;
         }
         return DoubleBlockCombiner.BlockType.SECOND;
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.ENTITYBLOCK_ANIMATED;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)ChestBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)ChestBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        if (byj3.getBlock() == this && fp.getAxis().isHorizontal()) {
-            final ChestType bzc8 = byj3.<ChestType>getValue(ChestBlock.TYPE);
-            if (byj1.<ChestType>getValue(ChestBlock.TYPE) == ChestType.SINGLE && bzc8 != ChestType.SINGLE && byj1.<Comparable>getValue((Property<Comparable>)ChestBlock.FACING) == byj3.<Comparable>getValue((Property<Comparable>)ChestBlock.FACING) && getConnectedDirection(byj3) == fp.getOpposite()) {
-                return ((AbstractStateHolder<O, BlockState>)byj1).<ChestType, ChestType>setValue(ChestBlock.TYPE, bzc8.getOpposite());
+        if (cfj3.is(this) && fz.getAxis().isHorizontal()) {
+            final ChestType cgb8 = cfj3.<ChestType>getValue(ChestBlock.TYPE);
+            if (cfj1.<ChestType>getValue(ChestBlock.TYPE) == ChestType.SINGLE && cgb8 != ChestType.SINGLE && cfj1.<Comparable>getValue((Property<Comparable>)ChestBlock.FACING) == cfj3.<Comparable>getValue((Property<Comparable>)ChestBlock.FACING) && getConnectedDirection(cfj3) == fz.getOpposite()) {
+                return ((StateHolder<O, BlockState>)cfj1).<ChestType, ChestType>setValue(ChestBlock.TYPE, cgb8.getOpposite());
             }
         }
-        else if (getConnectedDirection(byj1) == fp) {
-            return ((AbstractStateHolder<O, BlockState>)byj1).<ChestType, ChestType>setValue(ChestBlock.TYPE, ChestType.SINGLE);
+        else if (getConnectedDirection(cfj1) == fz) {
+            return ((StateHolder<O, BlockState>)cfj1).<ChestType, ChestType>setValue(ChestBlock.TYPE, ChestType.SINGLE);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (byj.<ChestType>getValue(ChestBlock.TYPE) == ChestType.SINGLE) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        if (cfj.<ChestType>getValue(ChestBlock.TYPE) == ChestType.SINGLE) {
             return ChestBlock.AABB;
         }
-        switch (getConnectedDirection(byj)) {
+        switch (getConnectedDirection(cfj)) {
             default: {
                 return ChestBlock.NORTH_AABB;
             }
@@ -124,84 +126,85 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
         }
     }
     
-    public static Direction getConnectedDirection(final BlockState byj) {
-        final Direction fp2 = byj.<Direction>getValue((Property<Direction>)ChestBlock.FACING);
-        return (byj.<ChestType>getValue(ChestBlock.TYPE) == ChestType.LEFT) ? fp2.getClockWise() : fp2.getCounterClockWise();
+    public static Direction getConnectedDirection(final BlockState cfj) {
+        final Direction fz2 = cfj.<Direction>getValue((Property<Direction>)ChestBlock.FACING);
+        return (cfj.<ChestType>getValue(ChestBlock.TYPE) == ChestType.LEFT) ? fz2.getClockWise() : fz2.getCounterClockWise();
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        ChestType bzc3 = ChestType.SINGLE;
-        Direction fp4 = bcq.getHorizontalDirection().getOpposite();
-        final FluidState coj5 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        final boolean boolean6 = bcq.isSecondaryUseActive();
-        final Direction fp5 = bcq.getClickedFace();
-        if (fp5.getAxis().isHorizontal() && boolean6) {
-            final Direction fp6 = this.candidatePartnerFacing(bcq, fp5.getOpposite());
-            if (fp6 != null && fp6.getAxis() != fp5.getAxis()) {
-                fp4 = fp6;
-                bzc3 = ((fp4.getCounterClockWise() == fp5.getOpposite()) ? ChestType.RIGHT : ChestType.LEFT);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        ChestType cgb3 = ChestType.SINGLE;
+        Direction fz4 = bin.getHorizontalDirection().getOpposite();
+        final FluidState cxa5 = bin.getLevel().getFluidState(bin.getClickedPos());
+        final boolean boolean6 = bin.isSecondaryUseActive();
+        final Direction fz5 = bin.getClickedFace();
+        if (fz5.getAxis().isHorizontal() && boolean6) {
+            final Direction fz6 = this.candidatePartnerFacing(bin, fz5.getOpposite());
+            if (fz6 != null && fz6.getAxis() != fz5.getAxis()) {
+                fz4 = fz6;
+                cgb3 = ((fz4.getCounterClockWise() == fz5.getOpposite()) ? ChestType.RIGHT : ChestType.LEFT);
             }
         }
-        if (bzc3 == ChestType.SINGLE && !boolean6) {
-            if (fp4 == this.candidatePartnerFacing(bcq, fp4.getClockWise())) {
-                bzc3 = ChestType.LEFT;
+        if (cgb3 == ChestType.SINGLE && !boolean6) {
+            if (fz4 == this.candidatePartnerFacing(bin, fz4.getClockWise())) {
+                cgb3 = ChestType.LEFT;
             }
-            else if (fp4 == this.candidatePartnerFacing(bcq, fp4.getCounterClockWise())) {
-                bzc3 = ChestType.RIGHT;
+            else if (fz4 == this.candidatePartnerFacing(bin, fz4.getCounterClockWise())) {
+                cgb3 = ChestType.RIGHT;
             }
         }
-        return ((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)ChestBlock.FACING, fp4)).setValue(ChestBlock.TYPE, bzc3)).<Comparable, Boolean>setValue((Property<Comparable>)ChestBlock.WATERLOGGED, coj5.getType() == Fluids.WATER);
+        return ((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)ChestBlock.FACING, fz4)).setValue(ChestBlock.TYPE, cgb3)).<Comparable, Boolean>setValue((Property<Comparable>)ChestBlock.WATERLOGGED, cxa5.getType() == Fluids.WATER);
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)ChestBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)ChestBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     @Nullable
-    private Direction candidatePartnerFacing(final BlockPlaceContext bcq, final Direction fp) {
-        final BlockState byj4 = bcq.getLevel().getBlockState(bcq.getClickedPos().relative(fp));
-        return (byj4.getBlock() == this && byj4.<ChestType>getValue(ChestBlock.TYPE) == ChestType.SINGLE) ? byj4.<Direction>getValue((Property<Direction>)ChestBlock.FACING) : null;
+    private Direction candidatePartnerFacing(final BlockPlaceContext bin, final Direction fz) {
+        final BlockState cfj4 = bin.getLevel().getBlockState(bin.getClickedPos().relative(fz));
+        return (cfj4.is(this) && cfj4.<ChestType>getValue(ChestBlock.TYPE) == ChestType.SINGLE) ? cfj4.<Direction>getValue((Property<Direction>)ChestBlock.FACING) : null;
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof ChestBlockEntity) {
-                ((ChestBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof ChestBlockEntity) {
+                ((ChestBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof Container) {
-            Containers.dropContents(bjw, fk, (Container)bwl7);
-            bjw.updateNeighbourForOutputSignal(fk, this);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof Container) {
+            Containers.dropContents(bqb, fu, (Container)cdl7);
+            bqb.updateNeighbourForOutputSignal(fu, this);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        final MenuProvider ajo8 = this.getMenuProvider(byj, bjw, fk);
-        if (ajo8 != null) {
-            ayj.openMenu(ajo8);
-            ayj.awardStat(this.getOpenChestStat());
+        final MenuProvider anj8 = this.getMenuProvider(cfj, bqb, fu);
+        if (anj8 != null) {
+            bec.openMenu(anj8);
+            bec.awardStat(this.getOpenChestStat());
+            PiglinAi.angerNearbyPiglins(bec, true);
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.CONSUME;
     }
     
     protected Stat<ResourceLocation> getOpenChestStat() {
@@ -209,66 +212,66 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
     }
     
     @Nullable
-    public static Container getContainer(final ChestBlock bpw, final BlockState byj, final Level bjw, final BlockPos fk, final boolean boolean5) {
-        return bpw.combine(byj, bjw, fk, boolean5).<Optional<Container>>apply(ChestBlock.CHEST_COMBINER).orElse(null);
+    public static Container getContainer(final ChestBlock bwh, final BlockState cfj, final Level bqb, final BlockPos fu, final boolean boolean5) {
+        return bwh.combine(cfj, bqb, fu, boolean5).<Optional<Container>>apply(ChestBlock.CHEST_COMBINER).orElse(null);
     }
     
     @Override
-    public DoubleBlockCombiner.NeighborCombineResult<? extends ChestBlockEntity> combine(final BlockState byj, final Level bjw, final BlockPos fk, final boolean boolean4) {
+    public DoubleBlockCombiner.NeighborCombineResult<? extends ChestBlockEntity> combine(final BlockState cfj, final Level bqb, final BlockPos fu, final boolean boolean4) {
         BiPredicate<LevelAccessor, BlockPos> biPredicate6;
         if (boolean4) {
-            biPredicate6 = ((bjx, fk) -> false);
+            biPredicate6 = ((bqc, fu) -> false);
         }
         else {
             biPredicate6 = ChestBlock::isChestBlockedAt;
         }
-        return DoubleBlockCombiner.combineWithNeigbour(this.blockEntityType.get(), ChestBlock::getBlockType, ChestBlock::getConnectedDirection, ChestBlock.FACING, byj, bjw, fk, biPredicate6);
+        return DoubleBlockCombiner.combineWithNeigbour(this.blockEntityType.get(), ChestBlock::getBlockType, ChestBlock::getConnectedDirection, ChestBlock.FACING, cfj, bqb, fu, biPredicate6);
     }
     
     @Nullable
     @Override
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return this.combine(byj, bjw, fk, false).<Optional<MenuProvider>>apply(ChestBlock.MENU_PROVIDER_COMBINER).orElse(null);
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return this.combine(cfj, bqb, fu, false).<Optional<MenuProvider>>apply(ChestBlock.MENU_PROVIDER_COMBINER).orElse(null);
     }
     
-    public static DoubleBlockCombiner.Combiner<ChestBlockEntity, Float2FloatFunction> opennessCombiner(final LidBlockEntity bxe) {
+    public static DoubleBlockCombiner.Combiner<ChestBlockEntity, Float2FloatFunction> opennessCombiner(final LidBlockEntity cee) {
         return new DoubleBlockCombiner.Combiner<ChestBlockEntity, Float2FloatFunction>() {
             @Override
-            public Float2FloatFunction acceptDouble(final ChestBlockEntity bwp1, final ChestBlockEntity bwp2) {
-                return float3 -> Math.max(bwp1.getOpenNess(float3), bwp2.getOpenNess(float3));
+            public Float2FloatFunction acceptDouble(final ChestBlockEntity cdp1, final ChestBlockEntity cdp2) {
+                return float3 -> Math.max(cdp1.getOpenNess(float3), cdp2.getOpenNess(float3));
             }
             
             @Override
-            public Float2FloatFunction acceptSingle(final ChestBlockEntity bwp) {
-                return bwp::getOpenNess;
+            public Float2FloatFunction acceptSingle(final ChestBlockEntity cdp) {
+                return cdp::getOpenNess;
             }
             
             @Override
             public Float2FloatFunction acceptNone() {
-                return bxe::getOpenNess;
+                return cee::getOpenNess;
             }
         };
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new ChestBlockEntity();
     }
     
-    public static boolean isChestBlockedAt(final LevelAccessor bjx, final BlockPos fk) {
-        return isBlockedChestByBlock(bjx, fk) || isCatSittingOnChest(bjx, fk);
+    public static boolean isChestBlockedAt(final LevelAccessor bqc, final BlockPos fu) {
+        return isBlockedChestByBlock(bqc, fu) || isCatSittingOnChest(bqc, fu);
     }
     
-    private static boolean isBlockedChestByBlock(final BlockGetter bjg, final BlockPos fk) {
-        final BlockPos fk2 = fk.above();
-        return bjg.getBlockState(fk2).isRedstoneConductor(bjg, fk2);
+    private static boolean isBlockedChestByBlock(final BlockGetter bpg, final BlockPos fu) {
+        final BlockPos fu2 = fu.above();
+        return bpg.getBlockState(fu2).isRedstoneConductor(bpg, fu2);
     }
     
-    private static boolean isCatSittingOnChest(final LevelAccessor bjx, final BlockPos fk) {
-        final List<Cat> list3 = bjx.<Cat>getEntitiesOfClass(Cat.class, new AABB(fk.getX(), fk.getY() + 1, fk.getZ(), fk.getX() + 1, fk.getY() + 2, fk.getZ() + 1));
+    private static boolean isCatSittingOnChest(final LevelAccessor bqc, final BlockPos fu) {
+        final List<Cat> list3 = bqc.<Cat>getEntitiesOfClass(Cat.class, new AABB(fu.getX(), fu.getY() + 1, fu.getZ(), fu.getX() + 1, fu.getY() + 2, fu.getZ() + 1));
         if (!list3.isEmpty()) {
-            for (final Cat ate5 : list3) {
-                if (ate5.isSitting()) {
+            for (final Cat aym5 : list3) {
+                if (aym5.isInSittingPose()) {
                     return true;
                 }
             }
@@ -277,23 +280,23 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return AbstractContainerMenu.getRedstoneSignalFromContainer(getContainer(this, byj, bjw, fk, false));
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return AbstractContainerMenu.getRedstoneSignalFromContainer(getContainer(this, cfj, bqb, fu, false));
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)ChestBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)ChestBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)ChestBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)ChestBlock.FACING)));
     }
     
     @Override
@@ -302,7 +305,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
@@ -317,13 +320,13 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
         AABB = Block.box(1.0, 0.0, 1.0, 15.0, 14.0, 15.0);
         CHEST_COMBINER = new DoubleBlockCombiner.Combiner<ChestBlockEntity, Optional<Container>>() {
             @Override
-            public Optional<Container> acceptDouble(final ChestBlockEntity bwp1, final ChestBlockEntity bwp2) {
-                return Optional.of(new CompoundContainer(bwp1, bwp2));
+            public Optional<Container> acceptDouble(final ChestBlockEntity cdp1, final ChestBlockEntity cdp2) {
+                return Optional.of(new CompoundContainer(cdp1, cdp2));
             }
             
             @Override
-            public Optional<Container> acceptSingle(final ChestBlockEntity bwp) {
-                return Optional.of(bwp);
+            public Optional<Container> acceptSingle(final ChestBlockEntity cdp) {
+                return Optional.of(cdp);
             }
             
             @Override
@@ -333,36 +336,36 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
         };
         MENU_PROVIDER_COMBINER = new DoubleBlockCombiner.Combiner<ChestBlockEntity, Optional<MenuProvider>>() {
             @Override
-            public Optional<MenuProvider> acceptDouble(final ChestBlockEntity bwp1, final ChestBlockEntity bwp2) {
-                final Container aje4 = new CompoundContainer(bwp1, bwp2);
+            public Optional<MenuProvider> acceptDouble(final ChestBlockEntity cdp1, final ChestBlockEntity cdp2) {
+                final Container amz4 = new CompoundContainer(cdp1, cdp2);
                 return Optional.of(new MenuProvider() {
                     @Nullable
                     @Override
-                    public AbstractContainerMenu createMenu(final int integer, final Inventory ayi, final Player ayj) {
-                        if (bwp1.canOpen(ayj) && bwp2.canOpen(ayj)) {
-                            bwp1.unpackLootTable(ayi.player);
-                            bwp2.unpackLootTable(ayi.player);
-                            return ChestMenu.sixRows(integer, ayi, aje4);
+                    public AbstractContainerMenu createMenu(final int integer, final Inventory beb, final Player bec) {
+                        if (cdp1.canOpen(bec) && cdp2.canOpen(bec)) {
+                            cdp1.unpackLootTable(beb.player);
+                            cdp2.unpackLootTable(beb.player);
+                            return ChestMenu.sixRows(integer, beb, amz4);
                         }
                         return null;
                     }
                     
                     @Override
                     public Component getDisplayName() {
-                        if (bwp1.hasCustomName()) {
-                            return bwp1.getDisplayName();
+                        if (cdp1.hasCustomName()) {
+                            return cdp1.getDisplayName();
                         }
-                        if (bwp2.hasCustomName()) {
-                            return bwp2.getDisplayName();
+                        if (cdp2.hasCustomName()) {
+                            return cdp2.getDisplayName();
                         }
-                        return new TranslatableComponent("container.chestDouble", new Object[0]);
+                        return new TranslatableComponent("container.chestDouble");
                     }
                 });
             }
             
             @Override
-            public Optional<MenuProvider> acceptSingle(final ChestBlockEntity bwp) {
-                return Optional.of(bwp);
+            public Optional<MenuProvider> acceptSingle(final ChestBlockEntity cdp) {
+                return Optional.of(cdp);
             }
             
             @Override
diff --git a/src/net/minecraft/world/level/block/ChorusFlowerBlock.java b/src/net/minecraft/world/level/block/ChorusFlowerBlock.java
index bf1d62d..de3b582 100644
--- a/src/net/minecraft/world/level/block/ChorusFlowerBlock.java
+++ b/src/net/minecraft/world/level/block/ChorusFlowerBlock.java
@@ -1,8 +1,12 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.EntityTypeTags;
+import net.minecraft.world.entity.projectile.Projectile;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.LevelAccessor;
@@ -17,50 +21,59 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
 public class ChorusFlowerBlock extends Block {
     public static final IntegerProperty AGE;
     private final ChorusPlantBlock plant;
     
-    protected ChorusFlowerBlock(final ChorusPlantBlock bpy, final Properties c) {
+    protected ChorusFlowerBlock(final ChorusPlantBlock bwj, final Properties c) {
         super(c);
-        this.plant = bpy;
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)ChorusFlowerBlock.AGE, 0));
+        this.plant = bwj;
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)ChorusFlowerBlock.AGE, 0));
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.canSurvive(xd, fk)) {
-            xd.destroyBlock(fk, true);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.canSurvive(zd, fu)) {
+            zd.destroyBlock(fu, true);
+        }
+    }
+    
+    @Override
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)ChorusFlowerBlock.AGE) < 5;
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final BlockPos fu2 = fu.above();
+        if (!zd.isEmptyBlock(fu2) || fu2.getY() >= 256) {
             return;
         }
-        final BlockPos fk2 = fk.above();
-        if (!xd.isEmptyBlock(fk2) || fk2.getY() >= 256) {
-            return;
-        }
-        final int integer7 = byj.<Integer>getValue((Property<Integer>)ChorusFlowerBlock.AGE);
+        final int integer7 = cfj.<Integer>getValue((Property<Integer>)ChorusFlowerBlock.AGE);
         if (integer7 >= 5) {
             return;
         }
         boolean boolean8 = false;
         boolean boolean9 = false;
-        final BlockState byj2 = xd.getBlockState(fk.below());
-        final Block bph11 = byj2.getBlock();
-        if (bph11 == Blocks.END_STONE) {
+        final BlockState cfj2 = zd.getBlockState(fu.below());
+        final Block bvr11 = cfj2.getBlock();
+        if (bvr11 == Blocks.END_STONE) {
             boolean8 = true;
         }
-        else if (bph11 == this.plant) {
+        else if (bvr11 == this.plant) {
             int integer8 = 1;
             int integer9 = 0;
             while (integer9 < 4) {
-                final Block bph12 = xd.getBlockState(fk.below(integer8 + 1)).getBlock();
-                if (bph12 == this.plant) {
+                final Block bvr12 = zd.getBlockState(fu.below(integer8 + 1)).getBlock();
+                if (bvr12 == this.plant) {
                     ++integer8;
                     ++integer9;
                 }
                 else {
-                    if (bph12 == Blocks.END_STONE) {
+                    if (bvr12 == Blocks.END_STONE) {
                         boolean9 = true;
                         break;
                     }
@@ -71,12 +84,12 @@ public class ChorusFlowerBlock extends Block {
                 boolean8 = true;
             }
         }
-        else if (byj2.isAir()) {
+        else if (cfj2.isAir()) {
             boolean8 = true;
         }
-        if (boolean8 && allNeighborsEmpty(xd, fk2, null) && xd.isEmptyBlock(fk.above(2))) {
-            xd.setBlock(fk, this.plant.getStateForPlacement(xd, fk), 2);
-            this.placeGrownFlower(xd, fk2, integer7);
+        if (boolean8 && allNeighborsEmpty(zd, fu2, null) && zd.isEmptyBlock(fu.above(2))) {
+            zd.setBlock(fu, this.plant.getStateForPlacement(zd, fu), 2);
+            this.placeGrownFlower(zd, fu2, integer7);
         }
         else if (integer7 < 4) {
             int integer8 = random.nextInt(4);
@@ -85,38 +98,38 @@ public class ChorusFlowerBlock extends Block {
             }
             boolean boolean10 = false;
             for (int integer10 = 0; integer10 < integer8; ++integer10) {
-                final Direction fp15 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
-                final BlockPos fk3 = fk.relative(fp15);
-                if (xd.isEmptyBlock(fk3) && xd.isEmptyBlock(fk3.below()) && allNeighborsEmpty(xd, fk3, fp15.getOpposite())) {
-                    this.placeGrownFlower(xd, fk3, integer7 + 1);
+                final Direction fz15 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
+                final BlockPos fu3 = fu.relative(fz15);
+                if (zd.isEmptyBlock(fu3) && zd.isEmptyBlock(fu3.below()) && allNeighborsEmpty(zd, fu3, fz15.getOpposite())) {
+                    this.placeGrownFlower(zd, fu3, integer7 + 1);
                     boolean10 = true;
                 }
             }
             if (boolean10) {
-                xd.setBlock(fk, this.plant.getStateForPlacement(xd, fk), 2);
+                zd.setBlock(fu, this.plant.getStateForPlacement(zd, fu), 2);
             }
             else {
-                this.placeDeadFlower(xd, fk);
+                this.placeDeadFlower(zd, fu);
             }
         }
         else {
-            this.placeDeadFlower(xd, fk);
+            this.placeDeadFlower(zd, fu);
         }
     }
     
-    private void placeGrownFlower(final Level bjw, final BlockPos fk, final int integer) {
-        bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)ChorusFlowerBlock.AGE, integer), 2);
-        bjw.levelEvent(1033, fk, 0);
+    private void placeGrownFlower(final Level bqb, final BlockPos fu, final int integer) {
+        bqb.setBlock(fu, ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)ChorusFlowerBlock.AGE, integer), 2);
+        bqb.levelEvent(1033, fu, 0);
     }
     
-    private void placeDeadFlower(final Level bjw, final BlockPos fk) {
-        bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)ChorusFlowerBlock.AGE, 5), 2);
-        bjw.levelEvent(1034, fk, 0);
+    private void placeDeadFlower(final Level bqb, final BlockPos fu) {
+        bqb.setBlock(fu, ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)ChorusFlowerBlock.AGE, 5), 2);
+        bqb.levelEvent(1034, fu, 0);
     }
     
-    private static boolean allNeighborsEmpty(final LevelReader bjz, final BlockPos fk, @Nullable final Direction fp) {
-        for (final Direction fp2 : Direction.Plane.HORIZONTAL) {
-            if (fp2 != fp && !bjz.isEmptyBlock(fk.relative(fp2))) {
+    private static boolean allNeighborsEmpty(final LevelReader bqd, final BlockPos fu, @Nullable final Direction fz) {
+        for (final Direction fz2 : Direction.Plane.HORIZONTAL) {
+            if (fz2 != fz && !bqd.isEmptyBlock(fu.relative(fz2))) {
                 return false;
             }
         }
@@ -124,40 +137,39 @@ public class ChorusFlowerBlock extends Block {
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp != Direction.UP && !byj1.canSurvive(bjx, fk5)) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz != Direction.UP && !cfj1.canSurvive(bqc, fu5)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockState byj2 = bjz.getBlockState(fk.below());
-        final Block bph6 = byj2.getBlock();
-        if (bph6 == this.plant || bph6 == Blocks.END_STONE) {
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockState cfj2 = bqd.getBlockState(fu.below());
+        if (cfj2.getBlock() == this.plant || cfj2.is(Blocks.END_STONE)) {
             return true;
         }
-        if (!byj2.isAir()) {
+        if (!cfj2.isAir()) {
             return false;
         }
-        boolean boolean7 = false;
-        for (final Direction fp9 : Direction.Plane.HORIZONTAL) {
-            final BlockState byj3 = bjz.getBlockState(fk.relative(fp9));
-            if (byj3.getBlock() == this.plant) {
-                if (boolean7) {
+        boolean boolean6 = false;
+        for (final Direction fz8 : Direction.Plane.HORIZONTAL) {
+            final BlockState cfj3 = bqd.getBlockState(fu.relative(fz8));
+            if (cfj3.is(this.plant)) {
+                if (boolean6) {
                     return false;
                 }
-                boolean7 = true;
+                boolean6 = true;
             }
             else {
-                if (!byj3.isAir()) {
+                if (!cfj3.isAir()) {
                     return false;
                 }
                 continue;
             }
         }
-        return boolean7;
+        return boolean6;
     }
     
     @Override
@@ -165,24 +177,24 @@ public class ChorusFlowerBlock extends Block {
         a.add(ChorusFlowerBlock.AGE);
     }
     
-    public static void generatePlant(final LevelAccessor bjx, final BlockPos fk, final Random random, final int integer) {
-        bjx.setBlock(fk, ((ChorusPlantBlock)Blocks.CHORUS_PLANT).getStateForPlacement(bjx, fk), 2);
-        growTreeRecursive(bjx, fk, random, fk, integer, 0);
+    public static void generatePlant(final LevelAccessor bqc, final BlockPos fu, final Random random, final int integer) {
+        bqc.setBlock(fu, ((ChorusPlantBlock)Blocks.CHORUS_PLANT).getStateForPlacement(bqc, fu), 2);
+        growTreeRecursive(bqc, fu, random, fu, integer, 0);
     }
     
-    private static void growTreeRecursive(final LevelAccessor bjx, final BlockPos fk2, final Random random, final BlockPos fk4, final int integer5, final int integer6) {
-        final ChorusPlantBlock bpy7 = (ChorusPlantBlock)Blocks.CHORUS_PLANT;
+    private static void growTreeRecursive(final LevelAccessor bqc, final BlockPos fu2, final Random random, final BlockPos fu4, final int integer5, final int integer6) {
+        final ChorusPlantBlock bwj7 = (ChorusPlantBlock)Blocks.CHORUS_PLANT;
         int integer7 = random.nextInt(4) + 1;
         if (integer6 == 0) {
             ++integer7;
         }
         for (int integer8 = 0; integer8 < integer7; ++integer8) {
-            final BlockPos fk5 = fk2.above(integer8 + 1);
-            if (!allNeighborsEmpty(bjx, fk5, null)) {
+            final BlockPos fu5 = fu2.above(integer8 + 1);
+            if (!allNeighborsEmpty(bqc, fu5, null)) {
                 return;
             }
-            bjx.setBlock(fk5, bpy7.getStateForPlacement(bjx, fk5), 2);
-            bjx.setBlock(fk5.below(), bpy7.getStateForPlacement(bjx, fk5.below()), 2);
+            bqc.setBlock(fu5, bwj7.getStateForPlacement(bqc, fu5), 2);
+            bqc.setBlock(fu5.below(), bwj7.getStateForPlacement(bqc, fu5.below()), 2);
         }
         boolean boolean9 = false;
         if (integer6 < 4) {
@@ -191,29 +203,31 @@ public class ChorusFlowerBlock extends Block {
                 ++integer9;
             }
             for (int integer10 = 0; integer10 < integer9; ++integer10) {
-                final Direction fp12 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
-                final BlockPos fk6 = fk2.above(integer7).relative(fp12);
-                if (Math.abs(fk6.getX() - fk4.getX()) < integer5) {
-                    if (Math.abs(fk6.getZ() - fk4.getZ()) < integer5) {
-                        if (bjx.isEmptyBlock(fk6) && bjx.isEmptyBlock(fk6.below()) && allNeighborsEmpty(bjx, fk6, fp12.getOpposite())) {
+                final Direction fz12 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
+                final BlockPos fu6 = fu2.above(integer7).relative(fz12);
+                if (Math.abs(fu6.getX() - fu4.getX()) < integer5) {
+                    if (Math.abs(fu6.getZ() - fu4.getZ()) < integer5) {
+                        if (bqc.isEmptyBlock(fu6) && bqc.isEmptyBlock(fu6.below()) && allNeighborsEmpty(bqc, fu6, fz12.getOpposite())) {
                             boolean9 = true;
-                            bjx.setBlock(fk6, bpy7.getStateForPlacement(bjx, fk6), 2);
-                            bjx.setBlock(fk6.relative(fp12.getOpposite()), bpy7.getStateForPlacement(bjx, fk6.relative(fp12.getOpposite())), 2);
-                            growTreeRecursive(bjx, fk6, random, fk4, integer5, integer6 + 1);
+                            bqc.setBlock(fu6, bwj7.getStateForPlacement(bqc, fu6), 2);
+                            bqc.setBlock(fu6.relative(fz12.getOpposite()), bwj7.getStateForPlacement(bqc, fu6.relative(fz12.getOpposite())), 2);
+                            growTreeRecursive(bqc, fu6, random, fu4, integer5, integer6 + 1);
                         }
                     }
                 }
             }
         }
         if (!boolean9) {
-            bjx.setBlock(fk2.above(integer7), ((AbstractStateHolder<O, BlockState>)Blocks.CHORUS_FLOWER.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)ChorusFlowerBlock.AGE, 5), 2);
+            bqc.setBlock(fu2.above(integer7), ((StateHolder<O, BlockState>)Blocks.CHORUS_FLOWER.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)ChorusFlowerBlock.AGE, 5), 2);
         }
     }
     
     @Override
-    public void onProjectileHit(final Level bjw, final BlockState byj, final BlockHitResult cvg, final Entity akq) {
-        final BlockPos fk6 = cvg.getBlockPos();
-        bjw.destroyBlock(fk6, true, akq);
+    public void onProjectileHit(final Level bqb, final BlockState cfj, final BlockHitResult deh, final Projectile bes) {
+        if (bes.getType().is(EntityTypeTags.IMPACT_PROJECTILES)) {
+            final BlockPos fu6 = deh.getBlockPos();
+            bqb.destroyBlock(fu6, true, bes);
+        }
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/ChorusPlantBlock.java b/src/net/minecraft/world/level/block/ChorusPlantBlock.java
index 4724ab3..69c68d1 100644
--- a/src/net/minecraft/world/level/block/ChorusPlantBlock.java
+++ b/src/net/minecraft/world/level/block/ChorusPlantBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.block.state.StateDefinition;
 import java.util.Iterator;
@@ -15,66 +15,66 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class ChorusPlantBlock extends PipeBlock {
     protected ChorusPlantBlock(final Properties c) {
         super(0.3125f, c);
-        this.registerDefaultState((((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ChorusPlantBlock.NORTH, false)).setValue((Property<Comparable>)ChorusPlantBlock.EAST, false)).setValue((Property<Comparable>)ChorusPlantBlock.SOUTH, false)).setValue((Property<Comparable>)ChorusPlantBlock.WEST, false)).setValue((Property<Comparable>)ChorusPlantBlock.UP, false)).<Comparable, Boolean>setValue((Property<Comparable>)ChorusPlantBlock.DOWN, false));
+        this.registerDefaultState((((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ChorusPlantBlock.NORTH, false)).setValue((Property<Comparable>)ChorusPlantBlock.EAST, false)).setValue((Property<Comparable>)ChorusPlantBlock.SOUTH, false)).setValue((Property<Comparable>)ChorusPlantBlock.WEST, false)).setValue((Property<Comparable>)ChorusPlantBlock.UP, false)).<Comparable, Boolean>setValue((Property<Comparable>)ChorusPlantBlock.DOWN, false));
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return this.getStateForPlacement(bcq.getLevel(), bcq.getClickedPos());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return this.getStateForPlacement(bin.getLevel(), bin.getClickedPos());
     }
     
-    public BlockState getStateForPlacement(final BlockGetter bjg, final BlockPos fk) {
-        final Block bph4 = bjg.getBlockState(fk.below()).getBlock();
-        final Block bph5 = bjg.getBlockState(fk.above()).getBlock();
-        final Block bph6 = bjg.getBlockState(fk.north()).getBlock();
-        final Block bph7 = bjg.getBlockState(fk.east()).getBlock();
-        final Block bph8 = bjg.getBlockState(fk.south()).getBlock();
-        final Block bph9 = bjg.getBlockState(fk.west()).getBlock();
-        return (((((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)ChorusPlantBlock.DOWN, bph4 == this || bph4 == Blocks.CHORUS_FLOWER || bph4 == Blocks.END_STONE)).setValue((Property<Comparable>)ChorusPlantBlock.UP, bph5 == this || bph5 == Blocks.CHORUS_FLOWER)).setValue((Property<Comparable>)ChorusPlantBlock.NORTH, bph6 == this || bph6 == Blocks.CHORUS_FLOWER)).setValue((Property<Comparable>)ChorusPlantBlock.EAST, bph7 == this || bph7 == Blocks.CHORUS_FLOWER)).setValue((Property<Comparable>)ChorusPlantBlock.SOUTH, bph8 == this || bph8 == Blocks.CHORUS_FLOWER)).<Comparable, Boolean>setValue((Property<Comparable>)ChorusPlantBlock.WEST, bph9 == this || bph9 == Blocks.CHORUS_FLOWER);
+    public BlockState getStateForPlacement(final BlockGetter bpg, final BlockPos fu) {
+        final Block bvr4 = bpg.getBlockState(fu.below()).getBlock();
+        final Block bvr5 = bpg.getBlockState(fu.above()).getBlock();
+        final Block bvr6 = bpg.getBlockState(fu.north()).getBlock();
+        final Block bvr7 = bpg.getBlockState(fu.east()).getBlock();
+        final Block bvr8 = bpg.getBlockState(fu.south()).getBlock();
+        final Block bvr9 = bpg.getBlockState(fu.west()).getBlock();
+        return (((((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)ChorusPlantBlock.DOWN, bvr4 == this || bvr4 == Blocks.CHORUS_FLOWER || bvr4 == Blocks.END_STONE)).setValue((Property<Comparable>)ChorusPlantBlock.UP, bvr5 == this || bvr5 == Blocks.CHORUS_FLOWER)).setValue((Property<Comparable>)ChorusPlantBlock.NORTH, bvr6 == this || bvr6 == Blocks.CHORUS_FLOWER)).setValue((Property<Comparable>)ChorusPlantBlock.EAST, bvr7 == this || bvr7 == Blocks.CHORUS_FLOWER)).setValue((Property<Comparable>)ChorusPlantBlock.SOUTH, bvr8 == this || bvr8 == Blocks.CHORUS_FLOWER)).<Comparable, Boolean>setValue((Property<Comparable>)ChorusPlantBlock.WEST, bvr9 == this || bvr9 == Blocks.CHORUS_FLOWER);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
-            return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj1.canSurvive(bqc, fu5)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
+            return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
         }
-        final Block bph8 = byj3.getBlock();
-        final boolean boolean9 = bph8 == this || bph8 == Blocks.CHORUS_FLOWER || (fp == Direction.DOWN && bph8 == Blocks.END_STONE);
-        return ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)ChorusPlantBlock.PROPERTY_BY_DIRECTION.get(fp), boolean9);
+        final boolean boolean8 = cfj3.getBlock() == this || cfj3.is(Blocks.CHORUS_FLOWER) || (fz == Direction.DOWN && cfj3.is(Blocks.END_STONE));
+        return ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)ChorusPlantBlock.PROPERTY_BY_DIRECTION.get(fz), boolean8);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.canSurvive(xd, fk)) {
-            xd.destroyBlock(fk, true);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.canSurvive(zd, fu)) {
+            zd.destroyBlock(fu, true);
         }
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockState byj2 = bjz.getBlockState(fk.below());
-        final boolean boolean6 = !bjz.getBlockState(fk.above()).isAir() && !byj2.isAir();
-        for (final Direction fp8 : Direction.Plane.HORIZONTAL) {
-            final BlockPos fk2 = fk.relative(fp8);
-            final Block bph10 = bjz.getBlockState(fk2).getBlock();
-            if (bph10 == this) {
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockState cfj2 = bqd.getBlockState(fu.below());
+        final boolean boolean6 = !bqd.getBlockState(fu.above()).isAir() && !cfj2.isAir();
+        for (final Direction fz8 : Direction.Plane.HORIZONTAL) {
+            final BlockPos fu2 = fu.relative(fz8);
+            final Block bvr10 = bqd.getBlockState(fu2).getBlock();
+            if (bvr10 == this) {
                 if (boolean6) {
                     return false;
                 }
-                final Block bph11 = bjz.getBlockState(fk2.below()).getBlock();
-                if (bph11 == this || bph11 == Blocks.END_STONE) {
+                final Block bvr11 = bqd.getBlockState(fu2.below()).getBlock();
+                if (bvr11 == this || bvr11 == Blocks.END_STONE) {
                     return true;
                 }
                 continue;
             }
         }
-        final Block bph12 = byj2.getBlock();
-        return bph12 == this || bph12 == Blocks.END_STONE;
+        final Block bvr12 = cfj2.getBlock();
+        return bvr12 == this || bvr12 == Blocks.END_STONE;
     }
     
     @Override
@@ -83,7 +83,7 @@ public class ChorusPlantBlock extends PipeBlock {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
 }
diff --git a/src/net/minecraft/world/level/block/CocoaBlock.java b/src/net/minecraft/world/level/block/CocoaBlock.java
index 4df6d2c..25e7909 100644
--- a/src/net/minecraft/world/level/block/CocoaBlock.java
+++ b/src/net/minecraft/world/level/block/CocoaBlock.java
@@ -1,7 +1,8 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
@@ -9,6 +10,7 @@ import javax.annotation.Nullable;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.LevelReader;
 import java.util.Random;
@@ -17,6 +19,7 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -29,29 +32,34 @@ public class CocoaBlock extends HorizontalDirectionalBlock implements Bonemealab
     
     public CocoaBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)CocoaBlock.FACING, Direction.NORTH)).<Comparable, Integer>setValue((Property<Comparable>)CocoaBlock.AGE, 0));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)CocoaBlock.FACING, Direction.NORTH)).<Comparable, Integer>setValue((Property<Comparable>)CocoaBlock.AGE, 0));
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (xd.random.nextInt(5) == 0) {
-            final int integer6 = byj.<Integer>getValue((Property<Integer>)CocoaBlock.AGE);
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)CocoaBlock.AGE) < 2;
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (zd.random.nextInt(5) == 0) {
+            final int integer6 = cfj.<Integer>getValue((Property<Integer>)CocoaBlock.AGE);
             if (integer6 < 2) {
-                xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)CocoaBlock.AGE, integer6 + 1), 2);
+                zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)CocoaBlock.AGE, integer6 + 1), 2);
             }
         }
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final Block bph5 = bjz.getBlockState(fk.relative(byj.<Direction>getValue((Property<Direction>)CocoaBlock.FACING))).getBlock();
-        return bph5.is(BlockTags.JUNGLE_LOGS);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final Block bvr5 = bqd.getBlockState(fu.relative(cfj.<Direction>getValue((Property<Direction>)CocoaBlock.FACING))).getBlock();
+        return bvr5.is(BlockTags.JUNGLE_LOGS);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final int integer6 = byj.<Integer>getValue((Property<Integer>)CocoaBlock.AGE);
-        switch (byj.<Direction>getValue((Property<Direction>)CocoaBlock.FACING)) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final int integer6 = cfj.<Integer>getValue((Property<Integer>)CocoaBlock.AGE);
+        switch (cfj.<Direction>getValue((Property<Direction>)CocoaBlock.FACING)) {
             case SOUTH: {
                 return CocoaBlock.SOUTH_AABB[integer6];
             }
@@ -69,15 +77,15 @@ public class CocoaBlock extends HorizontalDirectionalBlock implements Bonemealab
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        BlockState byj3 = this.defaultBlockState();
-        final LevelReader bjz4 = bcq.getLevel();
-        final BlockPos fk5 = bcq.getClickedPos();
-        for (final Direction fp9 : bcq.getNearestLookingDirections()) {
-            if (fp9.getAxis().isHorizontal()) {
-                byj3 = ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Direction>setValue((Property<Comparable>)CocoaBlock.FACING, fp9);
-                if (byj3.canSurvive(bjz4, fk5)) {
-                    return byj3;
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        BlockState cfj3 = this.defaultBlockState();
+        final LevelReader bqd4 = bin.getLevel();
+        final BlockPos fu5 = bin.getClickedPos();
+        for (final Direction fz9 : bin.getNearestLookingDirections()) {
+            if (fz9.getAxis().isHorizontal()) {
+                cfj3 = ((StateHolder<O, BlockState>)cfj3).<Comparable, Direction>setValue((Property<Comparable>)CocoaBlock.FACING, fz9);
+                if (cfj3.canSurvive(bqd4, fu5)) {
+                    return cfj3;
                 }
             }
         }
@@ -85,26 +93,26 @@ public class CocoaBlock extends HorizontalDirectionalBlock implements Bonemealab
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == byj1.<Direction>getValue((Property<Direction>)CocoaBlock.FACING) && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == cfj1.<Direction>getValue((Property<Direction>)CocoaBlock.FACING) && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        return byj.<Integer>getValue((Property<Integer>)CocoaBlock.AGE) < 2;
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        return cfj.<Integer>getValue((Property<Integer>)CocoaBlock.AGE) < 2;
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)CocoaBlock.AGE, byj.<Integer>getValue((Property<Integer>)CocoaBlock.AGE) + 1), 2);
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)CocoaBlock.AGE, cfj.<Integer>getValue((Property<Integer>)CocoaBlock.AGE) + 1), 2);
     }
     
     @Override
@@ -112,6 +120,11 @@ public class CocoaBlock extends HorizontalDirectionalBlock implements Bonemealab
         a.add(CocoaBlock.FACING, CocoaBlock.AGE);
     }
     
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        return false;
+    }
+    
     static {
         AGE = BlockStateProperties.AGE_2;
         EAST_AABB = new VoxelShape[] { Block.box(11.0, 7.0, 6.0, 15.0, 12.0, 10.0), Block.box(9.0, 5.0, 5.0, 15.0, 12.0, 11.0), Block.box(7.0, 3.0, 4.0, 15.0, 12.0, 12.0) };
diff --git a/src/net/minecraft/world/level/block/CommandBlock.java b/src/net/minecraft/world/level/block/CommandBlock.java
index 2189c57..640a8e4 100644
--- a/src/net/minecraft/world/level/block/CommandBlock.java
+++ b/src/net/minecraft/world/level/block/CommandBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.item.BlockPlaceContext;
@@ -16,7 +16,6 @@ import net.minecraft.world.level.BaseCommandBlock;
 import net.minecraft.util.StringUtil;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.CommandBlockEntity;
@@ -25,6 +24,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import org.apache.logging.log4j.Logger;
@@ -36,146 +36,141 @@ public class CommandBlock extends BaseEntityBlock {
     
     public CommandBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)CommandBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)CommandBlock.CONDITIONAL, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)CommandBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)CommandBlock.CONDITIONAL, false));
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
-        final CommandBlockEntity bwq3 = new CommandBlockEntity();
-        bwq3.setAutomatic(this == Blocks.CHAIN_COMMAND_BLOCK);
-        return bwq3;
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
+        final CommandBlockEntity cdq3 = new CommandBlockEntity();
+        cdq3.setAutomatic(this == Blocks.CHAIN_COMMAND_BLOCK);
+        return cdq3;
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (bjw.isClientSide) {
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (bqb.isClientSide) {
             return;
         }
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk3);
-        if (!(bwl8 instanceof CommandBlockEntity)) {
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu3);
+        if (!(cdl8 instanceof CommandBlockEntity)) {
             return;
         }
-        final CommandBlockEntity bwq9 = (CommandBlockEntity)bwl8;
-        final boolean boolean7 = bjw.hasNeighborSignal(fk3);
-        final boolean boolean8 = bwq9.isPowered();
-        bwq9.setPowered(boolean7);
-        if (boolean8 || bwq9.isAutomatic() || bwq9.getMode() == CommandBlockEntity.Mode.SEQUENCE) {
+        final CommandBlockEntity cdq9 = (CommandBlockEntity)cdl8;
+        final boolean boolean7 = bqb.hasNeighborSignal(fu3);
+        final boolean boolean8 = cdq9.isPowered();
+        cdq9.setPowered(boolean7);
+        if (boolean8 || cdq9.isAutomatic() || cdq9.getMode() == CommandBlockEntity.Mode.SEQUENCE) {
             return;
         }
         if (boolean7) {
-            bwq9.markConditionMet();
-            bjw.getBlockTicks().scheduleTick(fk3, this, this.getTickDelay(bjw));
+            cdq9.markConditionMet();
+            bqb.getBlockTicks().scheduleTick(fu3, this, 1);
         }
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        final BlockEntity bwl6 = xd.getBlockEntity(fk);
-        if (bwl6 instanceof CommandBlockEntity) {
-            final CommandBlockEntity bwq7 = (CommandBlockEntity)bwl6;
-            final BaseCommandBlock bjc8 = bwq7.getCommandBlock();
-            final boolean boolean9 = !StringUtil.isNullOrEmpty(bjc8.getCommand());
-            final CommandBlockEntity.Mode a10 = bwq7.getMode();
-            final boolean boolean10 = bwq7.wasConditionMet();
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final BlockEntity cdl6 = zd.getBlockEntity(fu);
+        if (cdl6 instanceof CommandBlockEntity) {
+            final CommandBlockEntity cdq7 = (CommandBlockEntity)cdl6;
+            final BaseCommandBlock bpc8 = cdq7.getCommandBlock();
+            final boolean boolean9 = !StringUtil.isNullOrEmpty(bpc8.getCommand());
+            final CommandBlockEntity.Mode a10 = cdq7.getMode();
+            final boolean boolean10 = cdq7.wasConditionMet();
             if (a10 == CommandBlockEntity.Mode.AUTO) {
-                bwq7.markConditionMet();
+                cdq7.markConditionMet();
                 if (boolean10) {
-                    this.execute(byj, xd, fk, bjc8, boolean9);
+                    this.execute(cfj, zd, fu, bpc8, boolean9);
                 }
-                else if (bwq7.isConditional()) {
-                    bjc8.setSuccessCount(0);
+                else if (cdq7.isConditional()) {
+                    bpc8.setSuccessCount(0);
                 }
-                if (bwq7.isPowered() || bwq7.isAutomatic()) {
-                    xd.getBlockTicks().scheduleTick(fk, this, this.getTickDelay(xd));
+                if (cdq7.isPowered() || cdq7.isAutomatic()) {
+                    zd.getBlockTicks().scheduleTick(fu, this, 1);
                 }
             }
             else if (a10 == CommandBlockEntity.Mode.REDSTONE) {
                 if (boolean10) {
-                    this.execute(byj, xd, fk, bjc8, boolean9);
+                    this.execute(cfj, zd, fu, bpc8, boolean9);
                 }
-                else if (bwq7.isConditional()) {
-                    bjc8.setSuccessCount(0);
+                else if (cdq7.isConditional()) {
+                    bpc8.setSuccessCount(0);
                 }
             }
-            xd.updateNeighbourForOutputSignal(fk, this);
+            zd.updateNeighbourForOutputSignal(fu, this);
         }
     }
     
-    private void execute(final BlockState byj, final Level bjw, final BlockPos fk, final BaseCommandBlock bjc, final boolean boolean5) {
+    private void execute(final BlockState cfj, final Level bqb, final BlockPos fu, final BaseCommandBlock bpc, final boolean boolean5) {
         if (boolean5) {
-            bjc.performCommand(bjw);
+            bpc.performCommand(bqb);
         }
         else {
-            bjc.setSuccessCount(0);
+            bpc.setSuccessCount(0);
         }
-        executeChain(bjw, fk, byj.<Direction>getValue((Property<Direction>)CommandBlock.FACING));
+        executeChain(bqb, fu, cfj.<Direction>getValue((Property<Direction>)CommandBlock.FACING));
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return 1;
-    }
-    
-    @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk);
-        if (bwl8 instanceof CommandBlockEntity && ayj.canUseGameMasterBlocks()) {
-            ayj.openCommandBlock((CommandBlockEntity)bwl8);
-            return InteractionResult.SUCCESS;
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu);
+        if (cdl8 instanceof CommandBlockEntity && bec.canUseGameMasterBlocks()) {
+            bec.openCommandBlock((CommandBlockEntity)cdl8);
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
         return InteractionResult.PASS;
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        if (bwl5 instanceof CommandBlockEntity) {
-            return ((CommandBlockEntity)bwl5).getCommandBlock().getSuccessCount();
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        if (cdl5 instanceof CommandBlockEntity) {
+            return ((CommandBlockEntity)cdl5).getCommandBlock().getSuccessCount();
         }
         return 0;
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (!(bwl7 instanceof CommandBlockEntity)) {
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (!(cdl7 instanceof CommandBlockEntity)) {
             return;
         }
-        final CommandBlockEntity bwq8 = (CommandBlockEntity)bwl7;
-        final BaseCommandBlock bjc9 = bwq8.getCommandBlock();
-        if (ben.hasCustomHoverName()) {
-            bjc9.setName(ben.getHoverName());
+        final CommandBlockEntity cdq8 = (CommandBlockEntity)cdl7;
+        final BaseCommandBlock bpc9 = cdq8.getCommandBlock();
+        if (bki.hasCustomHoverName()) {
+            bpc9.setName(bki.getHoverName());
         }
-        if (!bjw.isClientSide) {
-            if (ben.getTagElement("BlockEntityTag") == null) {
-                bjc9.setTrackOutput(bjw.getGameRules().getBoolean(GameRules.RULE_SENDCOMMANDFEEDBACK));
-                bwq8.setAutomatic(this == Blocks.CHAIN_COMMAND_BLOCK);
+        if (!bqb.isClientSide) {
+            if (bki.getTagElement("BlockEntityTag") == null) {
+                bpc9.setTrackOutput(bqb.getGameRules().getBoolean(GameRules.RULE_SENDCOMMANDFEEDBACK));
+                cdq8.setAutomatic(this == Blocks.CHAIN_COMMAND_BLOCK);
             }
-            if (bwq8.getMode() == CommandBlockEntity.Mode.SEQUENCE) {
-                final boolean boolean10 = bjw.hasNeighborSignal(fk);
-                bwq8.setPowered(boolean10);
+            if (cdq8.getMode() == CommandBlockEntity.Mode.SEQUENCE) {
+                final boolean boolean10 = bqb.hasNeighborSignal(fu);
+                cdq8.setPowered(boolean10);
             }
         }
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)CommandBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)CommandBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)CommandBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)CommandBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)CommandBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)CommandBlock.FACING)));
     }
     
     @Override
@@ -184,45 +179,45 @@ public class CommandBlock extends BaseEntityBlock {
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)CommandBlock.FACING, bcq.getNearestLookingDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)CommandBlock.FACING, bin.getNearestLookingDirection().getOpposite());
     }
     
-    private static void executeChain(final Level bjw, final BlockPos fk, Direction fp) {
-        final BlockPos.MutableBlockPos a4 = new BlockPos.MutableBlockPos(fk);
-        final GameRules bjs5 = bjw.getGameRules();
-        int integer6 = bjs5.getInt(GameRules.RULE_MAX_COMMAND_CHAIN_LENGTH);
+    private static void executeChain(final Level bqb, final BlockPos fu, Direction fz) {
+        final BlockPos.MutableBlockPos a4 = fu.mutable();
+        final GameRules bpx5 = bqb.getGameRules();
+        int integer6 = bpx5.getInt(GameRules.RULE_MAX_COMMAND_CHAIN_LENGTH);
         while (integer6-- > 0) {
-            a4.move(fp);
-            final BlockState byj7 = bjw.getBlockState(a4);
-            final Block bph8 = byj7.getBlock();
-            if (bph8 != Blocks.CHAIN_COMMAND_BLOCK) {
+            a4.move(fz);
+            final BlockState cfj7 = bqb.getBlockState(a4);
+            final Block bvr8 = cfj7.getBlock();
+            if (!cfj7.is(Blocks.CHAIN_COMMAND_BLOCK)) {
                 break;
             }
-            final BlockEntity bwl9 = bjw.getBlockEntity(a4);
-            if (!(bwl9 instanceof CommandBlockEntity)) {
+            final BlockEntity cdl9 = bqb.getBlockEntity(a4);
+            if (!(cdl9 instanceof CommandBlockEntity)) {
                 break;
             }
-            final CommandBlockEntity bwq10 = (CommandBlockEntity)bwl9;
-            if (bwq10.getMode() != CommandBlockEntity.Mode.SEQUENCE) {
+            final CommandBlockEntity cdq10 = (CommandBlockEntity)cdl9;
+            if (cdq10.getMode() != CommandBlockEntity.Mode.SEQUENCE) {
                 break;
             }
-            if (bwq10.isPowered() || bwq10.isAutomatic()) {
-                final BaseCommandBlock bjc11 = bwq10.getCommandBlock();
-                if (bwq10.markConditionMet()) {
-                    if (!bjc11.performCommand(bjw)) {
+            if (cdq10.isPowered() || cdq10.isAutomatic()) {
+                final BaseCommandBlock bpc11 = cdq10.getCommandBlock();
+                if (cdq10.markConditionMet()) {
+                    if (!bpc11.performCommand(bqb)) {
                         break;
                     }
-                    bjw.updateNeighbourForOutputSignal(a4, bph8);
+                    bqb.updateNeighbourForOutputSignal(a4, bvr8);
                 }
-                else if (bwq10.isConditional()) {
-                    bjc11.setSuccessCount(0);
+                else if (cdq10.isConditional()) {
+                    bpc11.setSuccessCount(0);
                 }
             }
-            fp = byj7.<Direction>getValue((Property<Direction>)CommandBlock.FACING);
+            fz = cfj7.<Direction>getValue((Property<Direction>)CommandBlock.FACING);
         }
         if (integer6 <= 0) {
-            final int integer7 = Math.max(bjs5.getInt(GameRules.RULE_MAX_COMMAND_CHAIN_LENGTH), 0);
+            final int integer7 = Math.max(bpx5.getInt(GameRules.RULE_MAX_COMMAND_CHAIN_LENGTH), 0);
             CommandBlock.LOGGER.warn("Command Block chain tried to execute more than {} steps!", integer7);
         }
     }
diff --git a/src/net/minecraft/world/level/block/ComparatorBlock.java b/src/net/minecraft/world/level/block/ComparatorBlock.java
index 85bf294..3d8861c 100644
--- a/src/net/minecraft/world/level/block/ComparatorBlock.java
+++ b/src/net/minecraft/world/level/block/ComparatorBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import java.util.Random;
@@ -25,6 +25,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.ComparatorMode;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 
@@ -33,68 +34,64 @@ public class ComparatorBlock extends DiodeBlock implements EntityBlock {
     
     public ComparatorBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ComparatorBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)ComparatorBlock.POWERED, false)).<ComparatorMode, ComparatorMode>setValue(ComparatorBlock.MODE, ComparatorMode.COMPARE));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ComparatorBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)ComparatorBlock.POWERED, false)).<ComparatorMode, ComparatorMode>setValue(ComparatorBlock.MODE, ComparatorMode.COMPARE));
     }
     
     @Override
-    protected int getDelay(final BlockState byj) {
+    protected int getDelay(final BlockState cfj) {
         return 2;
     }
     
     @Override
-    protected int getOutputSignal(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
-        final BlockEntity bwl5 = bjg.getBlockEntity(fk);
-        if (bwl5 instanceof ComparatorBlockEntity) {
-            return ((ComparatorBlockEntity)bwl5).getOutputSignal();
+    protected int getOutputSignal(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        final BlockEntity cdl5 = bpg.getBlockEntity(fu);
+        if (cdl5 instanceof ComparatorBlockEntity) {
+            return ((ComparatorBlockEntity)cdl5).getOutputSignal();
         }
         return 0;
     }
     
-    private int calculateOutputSignal(final Level bjw, final BlockPos fk, final BlockState byj) {
-        if (byj.<ComparatorMode>getValue(ComparatorBlock.MODE) == ComparatorMode.SUBTRACT) {
-            return Math.max(this.getInputSignal(bjw, fk, byj) - this.getAlternateSignal(bjw, fk, byj), 0);
+    private int calculateOutputSignal(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        if (cfj.<ComparatorMode>getValue(ComparatorBlock.MODE) == ComparatorMode.SUBTRACT) {
+            return Math.max(this.getInputSignal(bqb, fu, cfj) - this.getAlternateSignal(bqb, fu, cfj), 0);
         }
-        return this.getInputSignal(bjw, fk, byj);
+        return this.getInputSignal(bqb, fu, cfj);
     }
     
     @Override
-    protected boolean shouldTurnOn(final Level bjw, final BlockPos fk, final BlockState byj) {
-        final int integer5 = this.getInputSignal(bjw, fk, byj);
+    protected boolean shouldTurnOn(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        final int integer5 = this.getInputSignal(bqb, fu, cfj);
         if (integer5 == 0) {
             return false;
         }
-        final int integer6 = this.getAlternateSignal(bjw, fk, byj);
-        return integer5 > integer6 || (integer5 == integer6 && byj.<ComparatorMode>getValue(ComparatorBlock.MODE) == ComparatorMode.COMPARE);
+        final int integer6 = this.getAlternateSignal(bqb, fu, cfj);
+        return integer5 > integer6 || (integer5 == integer6 && cfj.<ComparatorMode>getValue(ComparatorBlock.MODE) == ComparatorMode.COMPARE);
     }
     
     @Override
-    protected int getInputSignal(final Level bjw, final BlockPos fk, final BlockState byj) {
-        int integer5 = super.getInputSignal(bjw, fk, byj);
-        final Direction fp6 = byj.<Direction>getValue((Property<Direction>)ComparatorBlock.FACING);
-        BlockPos fk2 = fk.relative(fp6);
-        BlockState byj2 = bjw.getBlockState(fk2);
-        if (byj2.hasAnalogOutputSignal()) {
-            integer5 = byj2.getAnalogOutputSignal(bjw, fk2);
+    protected int getInputSignal(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        int integer5 = super.getInputSignal(bqb, fu, cfj);
+        final Direction fz6 = cfj.<Direction>getValue((Property<Direction>)ComparatorBlock.FACING);
+        BlockPos fu2 = fu.relative(fz6);
+        BlockState cfj2 = bqb.getBlockState(fu2);
+        if (cfj2.hasAnalogOutputSignal()) {
+            integer5 = cfj2.getAnalogOutputSignal(bqb, fu2);
         }
-        else if (integer5 < 15 && byj2.isRedstoneConductor(bjw, fk2)) {
-            fk2 = fk2.relative(fp6);
-            byj2 = bjw.getBlockState(fk2);
-            if (byj2.hasAnalogOutputSignal()) {
-                integer5 = byj2.getAnalogOutputSignal(bjw, fk2);
-            }
-            else if (byj2.isAir()) {
-                final ItemFrame avr9 = this.getItemFrame(bjw, fp6, fk2);
-                if (avr9 != null) {
-                    integer5 = avr9.getAnalogOutput();
-                }
+        else if (integer5 < 15 && cfj2.isRedstoneConductor(bqb, fu2)) {
+            fu2 = fu2.relative(fz6);
+            cfj2 = bqb.getBlockState(fu2);
+            final ItemFrame bba9 = this.getItemFrame(bqb, fz6, fu2);
+            final int integer6 = Math.max((bba9 == null) ? Integer.MIN_VALUE : bba9.getAnalogOutput(), cfj2.hasAnalogOutputSignal() ? cfj2.getAnalogOutputSignal(bqb, fu2) : Integer.MIN_VALUE);
+            if (integer6 != Integer.MIN_VALUE) {
+                integer5 = integer6;
             }
         }
         return integer5;
     }
     
     @Nullable
-    private ItemFrame getItemFrame(final Level bjw, final Direction fp, final BlockPos fk) {
-        final List<ItemFrame> list5 = bjw.<ItemFrame>getEntitiesOfClass(ItemFrame.class, new AABB(fk.getX(), fk.getY(), fk.getZ(), fk.getX() + 1, fk.getY() + 1, fk.getZ() + 1), avr -> avr != null && avr.getDirection() == fp);
+    private ItemFrame getItemFrame(final Level bqb, final Direction fz, final BlockPos fu) {
+        final List<ItemFrame> list5 = bqb.<ItemFrame>getEntitiesOfClass(ItemFrame.class, new AABB(fu.getX(), fu.getY(), fu.getZ(), fu.getX() + 1, fu.getY() + 1, fu.getZ() + 1), bba -> bba != null && bba.getDirection() == fz);
         if (list5.size() == 1) {
             return list5.get(0);
         }
@@ -102,68 +99,68 @@ public class ComparatorBlock extends DiodeBlock implements EntityBlock {
     }
     
     @Override
-    public InteractionResult use(BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (!ayj.abilities.mayBuild) {
+    public InteractionResult use(BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (!bec.abilities.mayBuild) {
             return InteractionResult.PASS;
         }
-        byj = ((AbstractStateHolder<O, BlockState>)byj).<ComparatorMode>cycle(ComparatorBlock.MODE);
-        final float float8 = (byj.<ComparatorMode>getValue(ComparatorBlock.MODE) == ComparatorMode.SUBTRACT) ? 0.55f : 0.5f;
-        bjw.playSound(ayj, fk, SoundEvents.COMPARATOR_CLICK, SoundSource.BLOCKS, 0.3f, float8);
-        bjw.setBlock(fk, byj, 2);
-        this.refreshOutputState(bjw, fk, byj);
-        return InteractionResult.SUCCESS;
+        cfj = ((StateHolder<O, BlockState>)cfj).<ComparatorMode>cycle(ComparatorBlock.MODE);
+        final float float8 = (cfj.<ComparatorMode>getValue(ComparatorBlock.MODE) == ComparatorMode.SUBTRACT) ? 0.55f : 0.5f;
+        bqb.playSound(bec, fu, SoundEvents.COMPARATOR_CLICK, SoundSource.BLOCKS, 0.3f, float8);
+        bqb.setBlock(fu, cfj, 2);
+        this.refreshOutputState(bqb, fu, cfj);
+        return InteractionResult.sidedSuccess(bqb.isClientSide);
     }
     
     @Override
-    protected void checkTickOnNeighbor(final Level bjw, final BlockPos fk, final BlockState byj) {
-        if (bjw.getBlockTicks().willTickThisTick(fk, this)) {
+    protected void checkTickOnNeighbor(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        if (bqb.getBlockTicks().willTickThisTick(fu, this)) {
             return;
         }
-        final int integer5 = this.calculateOutputSignal(bjw, fk, byj);
-        final BlockEntity bwl6 = bjw.getBlockEntity(fk);
-        final int integer6 = (bwl6 instanceof ComparatorBlockEntity) ? ((ComparatorBlockEntity)bwl6).getOutputSignal() : 0;
-        if (integer5 != integer6 || byj.<Boolean>getValue((Property<Boolean>)ComparatorBlock.POWERED) != this.shouldTurnOn(bjw, fk, byj)) {
-            final TickPriority bkn8 = this.shouldPrioritize(bjw, fk, byj) ? TickPriority.HIGH : TickPriority.NORMAL;
-            bjw.getBlockTicks().scheduleTick(fk, this, 2, bkn8);
+        final int integer5 = this.calculateOutputSignal(bqb, fu, cfj);
+        final BlockEntity cdl6 = bqb.getBlockEntity(fu);
+        final int integer6 = (cdl6 instanceof ComparatorBlockEntity) ? ((ComparatorBlockEntity)cdl6).getOutputSignal() : 0;
+        if (integer5 != integer6 || cfj.<Boolean>getValue((Property<Boolean>)ComparatorBlock.POWERED) != this.shouldTurnOn(bqb, fu, cfj)) {
+            final TickPriority bqt8 = this.shouldPrioritize(bqb, fu, cfj) ? TickPriority.HIGH : TickPriority.NORMAL;
+            bqb.getBlockTicks().scheduleTick(fu, this, 2, bqt8);
         }
     }
     
-    private void refreshOutputState(final Level bjw, final BlockPos fk, final BlockState byj) {
-        final int integer5 = this.calculateOutputSignal(bjw, fk, byj);
-        final BlockEntity bwl6 = bjw.getBlockEntity(fk);
+    private void refreshOutputState(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        final int integer5 = this.calculateOutputSignal(bqb, fu, cfj);
+        final BlockEntity cdl6 = bqb.getBlockEntity(fu);
         int integer6 = 0;
-        if (bwl6 instanceof ComparatorBlockEntity) {
-            final ComparatorBlockEntity bwr8 = (ComparatorBlockEntity)bwl6;
-            integer6 = bwr8.getOutputSignal();
-            bwr8.setOutputSignal(integer5);
+        if (cdl6 instanceof ComparatorBlockEntity) {
+            final ComparatorBlockEntity cdr8 = (ComparatorBlockEntity)cdl6;
+            integer6 = cdr8.getOutputSignal();
+            cdr8.setOutputSignal(integer5);
         }
-        if (integer6 != integer5 || byj.<ComparatorMode>getValue(ComparatorBlock.MODE) == ComparatorMode.COMPARE) {
-            final boolean boolean8 = this.shouldTurnOn(bjw, fk, byj);
-            final boolean boolean9 = byj.<Boolean>getValue((Property<Boolean>)ComparatorBlock.POWERED);
+        if (integer6 != integer5 || cfj.<ComparatorMode>getValue(ComparatorBlock.MODE) == ComparatorMode.COMPARE) {
+            final boolean boolean8 = this.shouldTurnOn(bqb, fu, cfj);
+            final boolean boolean9 = cfj.<Boolean>getValue((Property<Boolean>)ComparatorBlock.POWERED);
             if (boolean9 && !boolean8) {
-                bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)ComparatorBlock.POWERED, false), 2);
+                bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)ComparatorBlock.POWERED, false), 2);
             }
             else if (!boolean9 && boolean8) {
-                bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)ComparatorBlock.POWERED, true), 2);
+                bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)ComparatorBlock.POWERED, true), 2);
             }
-            this.updateNeighborsInFront(bjw, fk, byj);
+            this.updateNeighborsInFront(bqb, fu, cfj);
         }
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        this.refreshOutputState(xd, fk, byj);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        this.refreshOutputState(zd, fu, cfj);
     }
     
     @Override
-    public boolean triggerEvent(final BlockState byj, final Level bjw, final BlockPos fk, final int integer4, final int integer5) {
-        super.triggerEvent(byj, bjw, fk, integer4, integer5);
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        return bwl7 != null && bwl7.triggerEvent(integer4, integer5);
+    public boolean triggerEvent(final BlockState cfj, final Level bqb, final BlockPos fu, final int integer4, final int integer5) {
+        super.triggerEvent(cfj, bqb, fu, integer4, integer5);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        return cdl7 != null && cdl7.triggerEvent(integer4, integer5);
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new ComparatorBlockEntity();
     }
     
diff --git a/src/net/minecraft/world/level/block/ComposterBlock.java b/src/net/minecraft/world/level/block/ComposterBlock.java
index 9db91ca..80e9fe4 100644
--- a/src/net/minecraft/world/level/block/ComposterBlock.java
+++ b/src/net/minecraft/world/level/block/ComposterBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import javax.annotation.Nullable;
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.Util;
@@ -11,9 +11,9 @@ import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.WorldlyContainer;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.InteractionResult;
@@ -32,6 +32,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.ItemLike;
@@ -42,7 +43,7 @@ import net.minecraft.world.WorldlyContainerHolder;
 public class ComposterBlock extends Block implements WorldlyContainerHolder {
     public static final IntegerProperty LEVEL;
     public static final Object2FloatMap<ItemLike> COMPOSTABLES;
-    public static final VoxelShape OUTER_SHAPE;
+    private static final VoxelShape OUTER_SHAPE;
     private static final VoxelShape[] SHAPES;
     
     public static void bootStrap() {
@@ -78,6 +79,9 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
         add(0.5f, Items.CACTUS);
         add(0.5f, Items.SUGAR_CANE);
         add(0.5f, Items.VINE);
+        add(0.5f, Items.NETHER_SPROUTS);
+        add(0.5f, Items.WEEPING_VINES);
+        add(0.5f, Items.TWISTING_VINES);
         add(0.5f, Items.MELON_SLICE);
         add(0.65f, Items.SEA_PICKLE);
         add(0.65f, Items.LILY_PAD);
@@ -93,6 +97,12 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
         add(0.65f, Items.BROWN_MUSHROOM);
         add(0.65f, Items.RED_MUSHROOM);
         add(0.65f, Items.MUSHROOM_STEM);
+        add(0.65f, Items.CRIMSON_FUNGUS);
+        add(0.65f, Items.WARPED_FUNGUS);
+        add(0.65f, Items.NETHER_WART);
+        add(0.65f, Items.CRIMSON_ROOTS);
+        add(0.65f, Items.WARPED_ROOTS);
+        add(0.65f, Items.SHROOMLIGHT);
         add(0.65f, Items.DANDELION);
         add(0.65f, Items.POPPY);
         add(0.65f, Items.BLUE_ORCHID);
@@ -115,6 +125,8 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
         add(0.85f, Items.HAY_BLOCK);
         add(0.85f, Items.BROWN_MUSHROOM_BLOCK);
         add(0.85f, Items.RED_MUSHROOM_BLOCK);
+        add(0.85f, Items.NETHER_WART_BLOCK);
+        add(0.85f, Items.WARPED_WART_BLOCK);
         add(0.85f, Items.BREAD);
         add(0.85f, Items.BAKED_POTATO);
         add(0.85f, Items.COOKIE);
@@ -122,118 +134,136 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
         add(1.0f, Items.PUMPKIN_PIE);
     }
     
-    private static void add(final float float1, final ItemLike bjv) {
-        ComposterBlock.COMPOSTABLES.put(bjv.asItem(), float1);
+    private static void add(final float float1, final ItemLike bqa) {
+        ComposterBlock.COMPOSTABLES.put(bqa.asItem(), float1);
     }
     
     public ComposterBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)ComposterBlock.LEVEL, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)ComposterBlock.LEVEL, 0));
     }
     
-    public static void handleFill(final Level bjw, final BlockPos fk, final boolean boolean3) {
-        final BlockState byj4 = bjw.getBlockState(fk);
-        bjw.playLocalSound(fk.getX(), fk.getY(), fk.getZ(), boolean3 ? SoundEvents.COMPOSTER_FILL_SUCCESS : SoundEvents.COMPOSTER_FILL, SoundSource.BLOCKS, 1.0f, 1.0f, false);
-        final double double5 = byj4.getShape(bjw, fk).max(Direction.Axis.Y, 0.5, 0.5) + 0.03125;
+    public static void handleFill(final Level bqb, final BlockPos fu, final boolean boolean3) {
+        final BlockState cfj4 = bqb.getBlockState(fu);
+        bqb.playLocalSound(fu.getX(), fu.getY(), fu.getZ(), boolean3 ? SoundEvents.COMPOSTER_FILL_SUCCESS : SoundEvents.COMPOSTER_FILL, SoundSource.BLOCKS, 1.0f, 1.0f, false);
+        final double double5 = cfj4.getShape(bqb, fu).max(Direction.Axis.Y, 0.5, 0.5) + 0.03125;
         final double double6 = 0.13124999403953552;
         final double double7 = 0.737500011920929;
-        final Random random11 = bjw.getRandom();
+        final Random random11 = bqb.getRandom();
         for (int integer12 = 0; integer12 < 10; ++integer12) {
             final double double8 = random11.nextGaussian() * 0.02;
             final double double9 = random11.nextGaussian() * 0.02;
             final double double10 = random11.nextGaussian() * 0.02;
-            bjw.addParticle(ParticleTypes.COMPOSTER, fk.getX() + 0.13124999403953552 + 0.737500011920929 * random11.nextFloat(), fk.getY() + double5 + random11.nextFloat() * (1.0 - double5), fk.getZ() + 0.13124999403953552 + 0.737500011920929 * random11.nextFloat(), double8, double9, double10);
+            bqb.addParticle(ParticleTypes.COMPOSTER, fu.getX() + 0.13124999403953552 + 0.737500011920929 * random11.nextFloat(), fu.getY() + double5 + random11.nextFloat() * (1.0 - double5), fu.getZ() + 0.13124999403953552 + 0.737500011920929 * random11.nextFloat(), double8, double9, double10);
         }
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return ComposterBlock.SHAPES[byj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL)];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return ComposterBlock.SHAPES[cfj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL)];
     }
     
     @Override
-    public VoxelShape getInteractionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public VoxelShape getInteractionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return ComposterBlock.OUTER_SHAPE;
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return ComposterBlock.SHAPES[0];
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL) == 7) {
-            bjw.getBlockTicks().scheduleTick(fk, byj1.getBlock(), 20);
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL) == 7) {
+            bqb.getBlockTicks().scheduleTick(fu, cfj1.getBlock(), 20);
         }
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final int integer8 = byj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL);
-        final ItemStack ben9 = ayj.getItemInHand(ajk);
-        if (integer8 < 8 && ComposterBlock.COMPOSTABLES.containsKey(ben9.getItem())) {
-            if (integer8 < 7 && !bjw.isClientSide) {
-                final boolean boolean10 = addItem(byj, bjw, fk, ben9);
-                bjw.levelEvent(1500, fk, boolean10 ? 1 : 0);
-                if (!ayj.abilities.instabuild) {
-                    ben9.shrink(1);
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final int integer8 = cfj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL);
+        final ItemStack bki9 = bec.getItemInHand(anf);
+        if (integer8 < 8 && ComposterBlock.COMPOSTABLES.containsKey(bki9.getItem())) {
+            if (integer8 < 7 && !bqb.isClientSide) {
+                final BlockState cfj2 = addItem(cfj, bqb, fu, bki9);
+                bqb.levelEvent(1500, fu, (cfj != cfj2) ? 1 : 0);
+                if (!bec.abilities.instabuild) {
+                    bki9.shrink(1);
                 }
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
         if (integer8 == 8) {
-            if (!bjw.isClientSide) {
-                final float float10 = 0.7f;
-                final double double11 = bjw.random.nextFloat() * 0.7f + 0.15000000596046448;
-                final double double12 = bjw.random.nextFloat() * 0.7f + 0.06000000238418579 + 0.6;
-                final double double13 = bjw.random.nextFloat() * 0.7f + 0.15000000596046448;
-                final ItemEntity awb17 = new ItemEntity(bjw, fk.getX() + double11, fk.getY() + double12, fk.getZ() + double13, new ItemStack(Items.BONE_MEAL));
-                awb17.setDefaultPickUpDelay();
-                bjw.addFreshEntity(awb17);
-            }
-            empty(byj, bjw, fk);
-            bjw.playSound(null, fk, SoundEvents.COMPOSTER_EMPTY, SoundSource.BLOCKS, 1.0f, 1.0f);
-            return InteractionResult.SUCCESS;
+            extractProduce(cfj, bqb, fu);
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
         return InteractionResult.PASS;
     }
     
-    private static void empty(final BlockState byj, final LevelAccessor bjx, final BlockPos fk) {
-        bjx.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)ComposterBlock.LEVEL, 0), 3);
+    public static BlockState insertItem(final BlockState cfj, final ServerLevel zd, final ItemStack bki, final BlockPos fu) {
+        final int integer5 = cfj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL);
+        if (integer5 < 7 && ComposterBlock.COMPOSTABLES.containsKey(bki.getItem())) {
+            final BlockState cfj2 = addItem(cfj, zd, fu, bki);
+            bki.shrink(1);
+            zd.levelEvent(1500, fu, (cfj != cfj2) ? 1 : 0);
+            return cfj2;
+        }
+        return cfj;
     }
     
-    private static boolean addItem(final BlockState byj, final LevelAccessor bjx, final BlockPos fk, final ItemStack ben) {
-        final int integer5 = byj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL);
-        final float float6 = ComposterBlock.COMPOSTABLES.getFloat(ben.getItem());
-        if ((integer5 == 0 && float6 > 0.0f) || bjx.getRandom().nextDouble() < float6) {
+    public static BlockState extractProduce(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        if (!bqb.isClientSide) {
+            final float float4 = 0.7f;
+            final double double5 = bqb.random.nextFloat() * 0.7f + 0.15000000596046448;
+            final double double6 = bqb.random.nextFloat() * 0.7f + 0.06000000238418579 + 0.6;
+            final double double7 = bqb.random.nextFloat() * 0.7f + 0.15000000596046448;
+            final ItemEntity bbg11 = new ItemEntity(bqb, fu.getX() + double5, fu.getY() + double6, fu.getZ() + double7, new ItemStack(Items.BONE_MEAL));
+            bbg11.setDefaultPickUpDelay();
+            bqb.addFreshEntity(bbg11);
+        }
+        final BlockState cfj2 = empty(cfj, bqb, fu);
+        bqb.playSound(null, fu, SoundEvents.COMPOSTER_EMPTY, SoundSource.BLOCKS, 1.0f, 1.0f);
+        return cfj2;
+    }
+    
+    private static BlockState empty(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu) {
+        final BlockState cfj2 = ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)ComposterBlock.LEVEL, 0);
+        bqc.setBlock(fu, cfj2, 3);
+        return cfj2;
+    }
+    
+    private static BlockState addItem(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu, final ItemStack bki) {
+        final int integer5 = cfj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL);
+        final float float6 = ComposterBlock.COMPOSTABLES.getFloat(bki.getItem());
+        if ((integer5 == 0 && float6 > 0.0f) || bqc.getRandom().nextDouble() < float6) {
             final int integer6 = integer5 + 1;
-            bjx.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)ComposterBlock.LEVEL, integer6), 3);
+            final BlockState cfj2 = ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)ComposterBlock.LEVEL, integer6);
+            bqc.setBlock(fu, cfj2, 3);
             if (integer6 == 7) {
-                bjx.getBlockTicks().scheduleTick(fk, byj.getBlock(), 20);
+                bqc.getBlockTicks().scheduleTick(fu, cfj.getBlock(), 20);
             }
-            return true;
+            return cfj2;
         }
-        return false;
+        return cfj;
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (byj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL) == 7) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)ComposterBlock.LEVEL), 3);
-            xd.playSound(null, fk, SoundEvents.COMPOSTER_READY, SoundSource.BLOCKS, 1.0f, 1.0f);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (cfj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL) == 7) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)ComposterBlock.LEVEL), 3);
+            zd.playSound(null, fu, SoundEvents.COMPOSTER_READY, SoundSource.BLOCKS, 1.0f, 1.0f);
         }
-        super.tick(byj, xd, fk, random);
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return byj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL);
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return cfj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL);
     }
     
     @Override
@@ -242,18 +272,18 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
     @Override
-    public WorldlyContainer getContainer(final BlockState byj, final LevelAccessor bjx, final BlockPos fk) {
-        final int integer5 = byj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL);
+    public WorldlyContainer getContainer(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu) {
+        final int integer5 = cfj.<Integer>getValue((Property<Integer>)ComposterBlock.LEVEL);
         if (integer5 == 8) {
-            return new OutputContainer(byj, bjx, fk, new ItemStack(Items.BONE_MEAL));
+            return new OutputContainer(cfj, bqc, fu, new ItemStack(Items.BONE_MEAL));
         }
         if (integer5 < 7) {
-            return new InputContainer(byj, bjx, fk);
+            return new InputContainer(cfj, bqc, fu);
         }
         return new EmptyContainer();
     }
@@ -277,17 +307,17 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
         }
         
         @Override
-        public int[] getSlotsForFace(final Direction fp) {
+        public int[] getSlotsForFace(final Direction fz) {
             return new int[0];
         }
         
         @Override
-        public boolean canPlaceItemThroughFace(final int integer, final ItemStack ben, @Nullable final Direction fp) {
+        public boolean canPlaceItemThroughFace(final int integer, final ItemStack bki, @Nullable final Direction fz) {
             return false;
         }
         
         @Override
-        public boolean canTakeItemThroughFace(final int integer, final ItemStack ben, final Direction fp) {
+        public boolean canTakeItemThroughFace(final int integer, final ItemStack bki, final Direction fz) {
             return false;
         }
     }
@@ -298,11 +328,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
         private final BlockPos pos;
         private boolean changed;
         
-        public OutputContainer(final BlockState byj, final LevelAccessor bjx, final BlockPos fk, final ItemStack ben) {
-            super(ben);
-            this.state = byj;
-            this.level = bjx;
-            this.pos = fk;
+        public OutputContainer(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu, final ItemStack bki) {
+            super(bki);
+            this.state = cfj;
+            this.level = bqc;
+            this.pos = fu;
         }
         
         @Override
@@ -311,18 +341,18 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
         }
         
         @Override
-        public int[] getSlotsForFace(final Direction fp) {
-            return (fp == Direction.DOWN) ? new int[] { 0 } : new int[0];
+        public int[] getSlotsForFace(final Direction fz) {
+            return (fz == Direction.DOWN) ? new int[] { 0 } : new int[0];
         }
         
         @Override
-        public boolean canPlaceItemThroughFace(final int integer, final ItemStack ben, @Nullable final Direction fp) {
+        public boolean canPlaceItemThroughFace(final int integer, final ItemStack bki, @Nullable final Direction fz) {
             return false;
         }
         
         @Override
-        public boolean canTakeItemThroughFace(final int integer, final ItemStack ben, final Direction fp) {
-            return !this.changed && fp == Direction.DOWN && ben.getItem() == Items.BONE_MEAL;
+        public boolean canTakeItemThroughFace(final int integer, final ItemStack bki, final Direction fz) {
+            return !this.changed && fz == Direction.DOWN && bki.getItem() == Items.BONE_MEAL;
         }
         
         @Override
@@ -338,11 +368,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
         private final BlockPos pos;
         private boolean changed;
         
-        public InputContainer(final BlockState byj, final LevelAccessor bjx, final BlockPos fk) {
+        public InputContainer(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu) {
             super(1);
-            this.state = byj;
-            this.level = bjx;
-            this.pos = fk;
+            this.state = cfj;
+            this.level = bqc;
+            this.pos = fu;
         }
         
         @Override
@@ -351,26 +381,27 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
         }
         
         @Override
-        public int[] getSlotsForFace(final Direction fp) {
-            return (fp == Direction.UP) ? new int[] { 0 } : new int[0];
+        public int[] getSlotsForFace(final Direction fz) {
+            return (fz == Direction.UP) ? new int[] { 0 } : new int[0];
         }
         
         @Override
-        public boolean canPlaceItemThroughFace(final int integer, final ItemStack ben, @Nullable final Direction fp) {
-            return !this.changed && fp == Direction.UP && ComposterBlock.COMPOSTABLES.containsKey(ben.getItem());
+        public boolean canPlaceItemThroughFace(final int integer, final ItemStack bki, @Nullable final Direction fz) {
+            return !this.changed && fz == Direction.UP && ComposterBlock.COMPOSTABLES.containsKey(bki.getItem());
         }
         
         @Override
-        public boolean canTakeItemThroughFace(final int integer, final ItemStack ben, final Direction fp) {
+        public boolean canTakeItemThroughFace(final int integer, final ItemStack bki, final Direction fz) {
             return false;
         }
         
         @Override
         public void setChanged() {
-            final ItemStack ben2 = this.getItem(0);
-            if (!ben2.isEmpty()) {
+            final ItemStack bki2 = this.getItem(0);
+            if (!bki2.isEmpty()) {
                 this.changed = true;
-                addItem(this.state, this.level, this.pos, ben2);
+                final BlockState cfj3 = addItem(this.state, this.level, this.pos, bki2);
+                this.level.levelEvent(1500, this.pos, (cfj3 != this.state) ? 1 : 0);
                 this.removeItemNoUpdate(0);
             }
         }
diff --git a/src/net/minecraft/world/level/block/ConcretePowderBlock.java b/src/net/minecraft/world/level/block/ConcretePowderBlock.java
index 7b788ed..1048364 100644
--- a/src/net/minecraft/world/level/block/ConcretePowderBlock.java
+++ b/src/net/minecraft/world/level/block/ConcretePowderBlock.java
@@ -1,54 +1,58 @@
 package net.minecraft.world.level.block;
 
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.Vec3i;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.entity.item.FallingBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 
 public class ConcretePowderBlock extends FallingBlock {
     private final BlockState concrete;
     
-    public ConcretePowderBlock(final Block bph, final Properties c) {
+    public ConcretePowderBlock(final Block bvr, final Properties c) {
         super(c);
-        this.concrete = bph.defaultBlockState();
+        this.concrete = bvr.defaultBlockState();
     }
     
     @Override
-    public void onLand(final Level bjw, final BlockPos fk, final BlockState byj3, final BlockState byj4) {
-        if (shouldSolidify(bjw, fk, byj4)) {
-            bjw.setBlock(fk, this.concrete, 3);
+    public void onLand(final Level bqb, final BlockPos fu, final BlockState cfj3, final BlockState cfj4, final FallingBlockEntity bbf) {
+        if (shouldSolidify(bqb, fu, cfj4)) {
+            bqb.setBlock(fu, this.concrete, 3);
         }
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockGetter bjg3 = bcq.getLevel();
-        final BlockPos fk4 = bcq.getClickedPos();
-        final BlockState byj5 = bjg3.getBlockState(fk4);
-        if (shouldSolidify(bjg3, fk4, byj5)) {
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockGetter bpg3 = bin.getLevel();
+        final BlockPos fu4 = bin.getClickedPos();
+        final BlockState cfj5 = bpg3.getBlockState(fu4);
+        if (shouldSolidify(bpg3, fu4, cfj5)) {
             return this.concrete;
         }
-        return super.getStateForPlacement(bcq);
+        return super.getStateForPlacement(bin);
     }
     
-    private static boolean shouldSolidify(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
-        return canSolidify(byj) || touchesLiquid(bjg, fk);
+    private static boolean shouldSolidify(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        return canSolidify(cfj) || touchesLiquid(bpg, fu);
     }
     
-    private static boolean touchesLiquid(final BlockGetter bjg, final BlockPos fk) {
+    private static boolean touchesLiquid(final BlockGetter bpg, final BlockPos fu) {
         boolean boolean3 = false;
-        final BlockPos.MutableBlockPos a4 = new BlockPos.MutableBlockPos(fk);
-        for (final Direction fp8 : Direction.values()) {
-            BlockState byj9 = bjg.getBlockState(a4);
-            if (fp8 != Direction.DOWN || canSolidify(byj9)) {
-                a4.set(fk).move(fp8);
-                byj9 = bjg.getBlockState(a4);
-                if (canSolidify(byj9) && !byj9.isFaceSturdy(bjg, fk, fp8.getOpposite())) {
+        final BlockPos.MutableBlockPos a4 = fu.mutable();
+        for (final Direction fz8 : Direction.values()) {
+            BlockState cfj9 = bpg.getBlockState(a4);
+            if (fz8 != Direction.DOWN || canSolidify(cfj9)) {
+                a4.setWithOffset(fu, fz8);
+                cfj9 = bpg.getBlockState(a4);
+                if (canSolidify(cfj9) && !cfj9.isFaceSturdy(bpg, fu, fz8.getOpposite())) {
                     boolean3 = true;
                     break;
                 }
@@ -57,15 +61,20 @@ public class ConcretePowderBlock extends FallingBlock {
         return boolean3;
     }
     
-    private static boolean canSolidify(final BlockState byj) {
-        return byj.getFluidState().is(FluidTags.WATER);
+    private static boolean canSolidify(final BlockState cfj) {
+        return cfj.getFluidState().is(FluidTags.WATER);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (touchesLiquid(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (touchesLiquid(bqc, fu5)) {
             return this.concrete;
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
+    }
+    
+    @Override
+    public int getDustColor(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.getMapColor(bpg, fu).col;
     }
 }
diff --git a/src/net/minecraft/world/level/block/ConduitBlock.java b/src/net/minecraft/world/level/block/ConduitBlock.java
index a486464..94b6092 100644
--- a/src/net/minecraft/world/level/block/ConduitBlock.java
+++ b/src/net/minecraft/world/level/block/ConduitBlock.java
@@ -1,8 +1,10 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.entity.BeaconBlockEntity;
@@ -23,6 +25,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
@@ -32,7 +35,7 @@ public class ConduitBlock extends BaseEntityBlock implements SimpleWaterloggedBl
     
     public ConduitBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)ConduitBlock.WATERLOGGED, true));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)ConduitBlock.WATERLOGGED, true));
     }
     
     @Override
@@ -41,55 +44,55 @@ public class ConduitBlock extends BaseEntityBlock implements SimpleWaterloggedBl
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new ConduitBlockEntity();
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.ENTITYBLOCK_ANIMATED;
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)ConduitBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)ConduitBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)ConduitBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)ConduitBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return ConduitBlock.SHAPE;
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, @Nullable final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof BeaconBlockEntity) {
-                ((BeaconBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof BeaconBlockEntity) {
+                ((BeaconBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final FluidState coj3 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)ConduitBlock.WATERLOGGED, coj3.is(FluidTags.WATER) && coj3.getAmount() == 8);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final FluidState cxa3 = bin.getLevel().getFluidState(bin.getClickedPos());
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)ConduitBlock.WATERLOGGED, cxa3.is(FluidTags.WATER) && cxa3.getAmount() == 8);
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/CoralBlock.java b/src/net/minecraft/world/level/block/CoralBlock.java
index 7cba78c..16627c7 100644
--- a/src/net/minecraft/world/level/block/CoralBlock.java
+++ b/src/net/minecraft/world/level/block/CoralBlock.java
@@ -3,6 +3,8 @@ package net.minecraft.world.level.block;
 import javax.annotation.Nullable;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
@@ -11,34 +13,35 @@ import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class CoralBlock extends Block {
     private final Block deadBlock;
     
-    public CoralBlock(final Block bph, final Properties c) {
+    public CoralBlock(final Block bvr, final Properties c) {
         super(c);
-        this.deadBlock = bph;
+        this.deadBlock = bvr;
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!this.scanForWater(xd, fk)) {
-            xd.setBlock(fk, this.deadBlock.defaultBlockState(), 2);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!this.scanForWater(zd, fu)) {
+            zd.setBlock(fu, this.deadBlock.defaultBlockState(), 2);
         }
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!this.scanForWater(bjx, fk5)) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 60 + bjx.getRandom().nextInt(40));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!this.scanForWater(bqc, fu5)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 60 + bqc.getRandom().nextInt(40));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
-    protected boolean scanForWater(final BlockGetter bjg, final BlockPos fk) {
-        for (final Direction fp7 : Direction.values()) {
-            final FluidState coj8 = bjg.getFluidState(fk.relative(fp7));
-            if (coj8.is(FluidTags.WATER)) {
+    protected boolean scanForWater(final BlockGetter bpg, final BlockPos fu) {
+        for (final Direction fz7 : Direction.values()) {
+            final FluidState cxa8 = bpg.getFluidState(fu.relative(fz7));
+            if (cxa8.is(FluidTags.WATER)) {
                 return true;
             }
         }
@@ -47,9 +50,9 @@ public class CoralBlock extends Block {
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        if (!this.scanForWater(bcq.getLevel(), bcq.getClickedPos())) {
-            bcq.getLevel().getBlockTicks().scheduleTick(bcq.getClickedPos(), this, 60 + bcq.getLevel().getRandom().nextInt(40));
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        if (!this.scanForWater(bin.getLevel(), bin.getClickedPos())) {
+            bin.getLevel().getBlockTicks().scheduleTick(bin.getClickedPos(), this, 60 + bin.getLevel().getRandom().nextInt(40));
         }
         return this.defaultBlockState();
     }
diff --git a/src/net/minecraft/world/level/block/CoralFanBlock.java b/src/net/minecraft/world/level/block/CoralFanBlock.java
index 33b3444..b0bdad6 100644
--- a/src/net/minecraft/world/level/block/CoralFanBlock.java
+++ b/src/net/minecraft/world/level/block/CoralFanBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.Direction;
@@ -12,36 +12,37 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class CoralFanBlock extends BaseCoralFanBlock {
     private final Block deadBlock;
     
-    protected CoralFanBlock(final Block bph, final Properties c) {
+    protected CoralFanBlock(final Block bvr, final Properties c) {
         super(c);
-        this.deadBlock = bph;
+        this.deadBlock = bvr;
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        this.tryScheduleDieTick(byj1, bjw, fk);
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        this.tryScheduleDieTick(cfj1, bqb, fu);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!BaseCoralPlantTypeBlock.scanForWater(byj, xd, fk)) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)this.deadBlock.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)CoralFanBlock.WATERLOGGED, false), 2);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!BaseCoralPlantTypeBlock.scanForWater(cfj, zd, fu)) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)this.deadBlock.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)CoralFanBlock.WATERLOGGED, false), 2);
         }
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        this.tryScheduleDieTick(byj1, bjx, fk5);
-        if (byj1.<Boolean>getValue((Property<Boolean>)CoralFanBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+        this.tryScheduleDieTick(cfj1, bqc, fu5);
+        if (cfj1.<Boolean>getValue((Property<Boolean>)CoralFanBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
 }
diff --git a/src/net/minecraft/world/level/block/CoralPlantBlock.java b/src/net/minecraft/world/level/block/CoralPlantBlock.java
index 331e4b6..46782f6 100644
--- a/src/net/minecraft/world/level/block/CoralPlantBlock.java
+++ b/src/net/minecraft/world/level/block/CoralPlantBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.LevelReader;
@@ -13,43 +13,44 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class CoralPlantBlock extends BaseCoralPlantTypeBlock {
     private final Block deadBlock;
     protected static final VoxelShape SHAPE;
     
-    protected CoralPlantBlock(final Block bph, final Properties c) {
+    protected CoralPlantBlock(final Block bvr, final Properties c) {
         super(c);
-        this.deadBlock = bph;
+        this.deadBlock = bvr;
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        this.tryScheduleDieTick(byj1, bjw, fk);
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        this.tryScheduleDieTick(cfj1, bqb, fu);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!BaseCoralPlantTypeBlock.scanForWater(byj, xd, fk)) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)this.deadBlock.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)CoralPlantBlock.WATERLOGGED, false), 2);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!BaseCoralPlantTypeBlock.scanForWater(cfj, zd, fu)) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)this.deadBlock.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)CoralPlantBlock.WATERLOGGED, false), 2);
         }
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        this.tryScheduleDieTick(byj1, bjx, fk5);
-        if (byj1.<Boolean>getValue((Property<Boolean>)CoralPlantBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+        this.tryScheduleDieTick(cfj1, bqc, fu5);
+        if (cfj1.<Boolean>getValue((Property<Boolean>)CoralPlantBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return CoralPlantBlock.SHAPE;
     }
     
diff --git a/src/net/minecraft/world/level/block/CoralWallFanBlock.java b/src/net/minecraft/world/level/block/CoralWallFanBlock.java
index 902d05b..edb175b 100644
--- a/src/net/minecraft/world/level/block/CoralWallFanBlock.java
+++ b/src/net/minecraft/world/level/block/CoralWallFanBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.Direction;
@@ -12,36 +12,37 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class CoralWallFanBlock extends BaseCoralWallFanBlock {
     private final Block deadBlock;
     
-    protected CoralWallFanBlock(final Block bph, final Properties c) {
+    protected CoralWallFanBlock(final Block bvr, final Properties c) {
         super(c);
-        this.deadBlock = bph;
+        this.deadBlock = bvr;
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        this.tryScheduleDieTick(byj1, bjw, fk);
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        this.tryScheduleDieTick(cfj1, bqb, fu);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!BaseCoralPlantTypeBlock.scanForWater(byj, xd, fk)) {
-            xd.setBlock(fk, (((AbstractStateHolder<O, BlockState>)this.deadBlock.defaultBlockState()).setValue((Property<Comparable>)CoralWallFanBlock.WATERLOGGED, false)).<Comparable, Comparable>setValue((Property<Comparable>)CoralWallFanBlock.FACING, (Comparable)byj.<V>getValue((Property<V>)CoralWallFanBlock.FACING)), 2);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!BaseCoralPlantTypeBlock.scanForWater(cfj, zd, fu)) {
+            zd.setBlock(fu, (((StateHolder<O, BlockState>)this.deadBlock.defaultBlockState()).setValue((Property<Comparable>)CoralWallFanBlock.WATERLOGGED, false)).<Comparable, Comparable>setValue((Property<Comparable>)CoralWallFanBlock.FACING, (Comparable)cfj.<V>getValue((Property<V>)CoralWallFanBlock.FACING)), 2);
         }
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp.getOpposite() == byj1.<Direction>getValue((Property<Direction>)CoralWallFanBlock.FACING) && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz.getOpposite() == cfj1.<Direction>getValue((Property<Direction>)CoralWallFanBlock.FACING) && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        if (byj1.<Boolean>getValue((Property<Boolean>)CoralWallFanBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+        if (cfj1.<Boolean>getValue((Property<Boolean>)CoralWallFanBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        this.tryScheduleDieTick(byj1, bjx, fk5);
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        this.tryScheduleDieTick(cfj1, bqc, fu5);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
 }
diff --git a/src/net/minecraft/world/level/block/CraftingTableBlock.java b/src/net/minecraft/world/level/block/CraftingTableBlock.java
index b2ee7f4..f0251cd 100644
--- a/src/net/minecraft/world/level/block/CraftingTableBlock.java
+++ b/src/net/minecraft/world/level/block/CraftingTableBlock.java
@@ -15,6 +15,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.network.chat.Component;
 
 public class CraftingTableBlock extends Block {
@@ -25,21 +26,21 @@ public class CraftingTableBlock extends Block {
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        ayj.openMenu(byj.getMenuProvider(bjw, fk));
-        ayj.awardStat(Stats.INTERACT_WITH_CRAFTING_TABLE);
-        return InteractionResult.SUCCESS;
+        bec.openMenu(cfj.getMenuProvider(bqb, fu));
+        bec.awardStat(Stats.INTERACT_WITH_CRAFTING_TABLE);
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return new SimpleMenuProvider((integer, ayi, ayj) -> new CraftingMenu(integer, ayi, ContainerLevelAccess.create(bjw, fk)), CraftingTableBlock.CONTAINER_TITLE);
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return new SimpleMenuProvider((integer, beb, bec) -> new CraftingMenu(integer, beb, ContainerLevelAccess.create(bqb, fu)), CraftingTableBlock.CONTAINER_TITLE);
     }
     
     static {
-        CONTAINER_TITLE = new TranslatableComponent("container.crafting", new Object[0]);
+        CONTAINER_TITLE = new TranslatableComponent("container.crafting");
     }
 }
diff --git a/src/net/minecraft/world/level/block/CropBlock.java b/src/net/minecraft/world/level/block/CropBlock.java
index ee218ff..79d2b36 100644
--- a/src/net/minecraft/world/level/block/CropBlock.java
+++ b/src/net/minecraft/world/level/block/CropBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.item.ItemStack;
@@ -19,6 +19,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -28,17 +29,17 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
     
     protected CropBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)this.getAgeProperty(), 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)this.getAgeProperty(), 0));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return CropBlock.SHAPE_BY_AGE[byj.<Integer>getValue((Property<Integer>)this.getAgeProperty())];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return CropBlock.SHAPE_BY_AGE[cfj.<Integer>getValue((Property<Integer>)this.getAgeProperty())];
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.getBlock() == Blocks.FARMLAND;
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.is(Blocks.FARMLAND);
     }
     
     public IntegerProperty getAgeProperty() {
@@ -49,55 +50,59 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
         return 7;
     }
     
-    protected int getAge(final BlockState byj) {
-        return byj.<Integer>getValue((Property<Integer>)this.getAgeProperty());
+    protected int getAge(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)this.getAgeProperty());
     }
     
     public BlockState getStateForAge(final int integer) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)this.getAgeProperty(), integer);
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)this.getAgeProperty(), integer);
     }
     
-    public boolean isMaxAge(final BlockState byj) {
-        return byj.<Integer>getValue((Property<Integer>)this.getAgeProperty()) >= this.getMaxAge();
+    public boolean isMaxAge(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)this.getAgeProperty()) >= this.getMaxAge();
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        super.tick(byj, xd, fk, random);
-        if (xd.getRawBrightness(fk, 0) >= 9) {
-            final int integer6 = this.getAge(byj);
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return !this.isMaxAge(cfj);
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (zd.getRawBrightness(fu, 0) >= 9) {
+            final int integer6 = this.getAge(cfj);
             if (integer6 < this.getMaxAge()) {
-                final float float7 = getGrowthSpeed(this, xd, fk);
+                final float float7 = getGrowthSpeed(this, zd, fu);
                 if (random.nextInt((int)(25.0f / float7) + 1) == 0) {
-                    xd.setBlock(fk, this.getStateForAge(integer6 + 1), 2);
+                    zd.setBlock(fu, this.getStateForAge(integer6 + 1), 2);
                 }
             }
         }
     }
     
-    public void growCrops(final Level bjw, final BlockPos fk, final BlockState byj) {
-        int integer5 = this.getAge(byj) + this.getBonemealAgeIncrease(bjw);
+    public void growCrops(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        int integer5 = this.getAge(cfj) + this.getBonemealAgeIncrease(bqb);
         final int integer6 = this.getMaxAge();
         if (integer5 > integer6) {
             integer5 = integer6;
         }
-        bjw.setBlock(fk, this.getStateForAge(integer5), 2);
+        bqb.setBlock(fu, this.getStateForAge(integer5), 2);
     }
     
-    protected int getBonemealAgeIncrease(final Level bjw) {
-        return Mth.nextInt(bjw.random, 2, 5);
+    protected int getBonemealAgeIncrease(final Level bqb) {
+        return Mth.nextInt(bqb.random, 2, 5);
     }
     
-    protected static float getGrowthSpeed(final Block bph, final BlockGetter bjg, final BlockPos fk) {
+    protected static float getGrowthSpeed(final Block bvr, final BlockGetter bpg, final BlockPos fu) {
         float float4 = 1.0f;
-        final BlockPos fk2 = fk.below();
+        final BlockPos fu2 = fu.below();
         for (int integer6 = -1; integer6 <= 1; ++integer6) {
             for (int integer7 = -1; integer7 <= 1; ++integer7) {
                 float float5 = 0.0f;
-                final BlockState byj9 = bjg.getBlockState(fk2.offset(integer6, 0, integer7));
-                if (byj9.getBlock() == Blocks.FARMLAND) {
+                final BlockState cfj9 = bpg.getBlockState(fu2.offset(integer6, 0, integer7));
+                if (cfj9.is(Blocks.FARMLAND)) {
                     float5 = 1.0f;
-                    if (byj9.<Integer>getValue((Property<Integer>)FarmBlock.MOISTURE) > 0) {
+                    if (cfj9.<Integer>getValue((Property<Integer>)FarmBlock.MOISTURE) > 0) {
                         float5 = 3.0f;
                     }
                 }
@@ -107,17 +112,17 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
                 float4 += float5;
             }
         }
-        final BlockPos fk3 = fk.north();
-        final BlockPos fk4 = fk.south();
-        final BlockPos fk5 = fk.west();
-        final BlockPos fk6 = fk.east();
-        final boolean boolean10 = bph == bjg.getBlockState(fk5).getBlock() || bph == bjg.getBlockState(fk6).getBlock();
-        final boolean boolean11 = bph == bjg.getBlockState(fk3).getBlock() || bph == bjg.getBlockState(fk4).getBlock();
+        final BlockPos fu3 = fu.north();
+        final BlockPos fu4 = fu.south();
+        final BlockPos fu5 = fu.west();
+        final BlockPos fu6 = fu.east();
+        final boolean boolean10 = bvr == bpg.getBlockState(fu5).getBlock() || bvr == bpg.getBlockState(fu6).getBlock();
+        final boolean boolean11 = bvr == bpg.getBlockState(fu3).getBlock() || bvr == bpg.getBlockState(fu4).getBlock();
         if (boolean10 && boolean11) {
             float4 /= 2.0f;
         }
         else {
-            final boolean boolean12 = bph == bjg.getBlockState(fk5.north()).getBlock() || bph == bjg.getBlockState(fk6.north()).getBlock() || bph == bjg.getBlockState(fk6.south()).getBlock() || bph == bjg.getBlockState(fk5.south()).getBlock();
+            final boolean boolean12 = bvr == bpg.getBlockState(fu5.north()).getBlock() || bvr == bpg.getBlockState(fu6.north()).getBlock() || bvr == bpg.getBlockState(fu6.south()).getBlock() || bvr == bpg.getBlockState(fu5.south()).getBlock();
             if (boolean12) {
                 float4 /= 2.0f;
             }
@@ -126,16 +131,16 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return (bjz.getRawBrightness(fk, 0) >= 8 || bjz.canSeeSky(fk)) && super.canSurvive(byj, bjz, fk);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return (bqd.getRawBrightness(fu, 0) >= 8 || bqd.canSeeSky(fu)) && super.canSurvive(cfj, bqd, fu);
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (akq instanceof Ravager && bjw.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
-            bjw.destroyBlock(fk, true, akq);
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (aom instanceof Ravager && bqb.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
+            bqb.destroyBlock(fu, true, aom);
         }
-        super.entityInside(byj, bjw, fk, akq);
+        super.entityInside(cfj, bqb, fu, aom);
     }
     
     protected ItemLike getBaseSeedId() {
@@ -143,23 +148,23 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return new ItemStack(this.getBaseSeedId());
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        return !this.isMaxAge(byj);
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        return !this.isMaxAge(cfj);
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        this.growCrops(xd, fk, byj);
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        this.growCrops(zd, fu, cfj);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/CrossCollisionBlock.java b/src/net/minecraft/world/level/block/CrossCollisionBlock.java
index 30eaad1..4aa06f9 100644
--- a/src/net/minecraft/world/level/block/CrossCollisionBlock.java
+++ b/src/net/minecraft/world/level/block/CrossCollisionBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import java.util.stream.Collector;
 import net.minecraft.Util;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -12,7 +12,9 @@ import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.phys.shapes.Shapes;
+import com.google.common.collect.UnmodifiableIterator;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -36,6 +38,9 @@ public class CrossCollisionBlock extends Block implements SimpleWaterloggedBlock
         this.stateToIndex = (Object2IntMap<BlockState>)new Object2IntOpenHashMap();
         this.collisionShapeByIndex = this.makeShapes(float1, float2, float5, 0.0f, float5);
         this.shapeByIndex = this.makeShapes(float1, float2, float3, 0.0f, float4);
+        for (final BlockState cfj9 : this.stateDefinition.getPossibleStates()) {
+            this.getAABBIndex(cfj9);
+        }
     }
     
     protected VoxelShape[] makeShapes(final float float1, final float float2, final float float3, final float float4, final float float5) {
@@ -43,53 +48,53 @@ public class CrossCollisionBlock extends Block implements SimpleWaterloggedBlock
         final float float7 = 8.0f + float1;
         final float float8 = 8.0f - float2;
         final float float9 = 8.0f + float2;
-        final VoxelShape cwf11 = Block.box(float6, 0.0, float6, float7, float3, float7);
-        final VoxelShape cwf12 = Block.box(float8, float4, 0.0, float9, float5, float9);
-        final VoxelShape cwf13 = Block.box(float8, float4, float8, float9, float5, 16.0);
-        final VoxelShape cwf14 = Block.box(0.0, float4, float8, float9, float5, float9);
-        final VoxelShape cwf15 = Block.box(float8, float4, float8, 16.0, float5, float9);
-        final VoxelShape cwf16 = Shapes.or(cwf12, cwf15);
-        final VoxelShape cwf17 = Shapes.or(cwf13, cwf14);
-        final VoxelShape[] arr18 = { Shapes.empty(), cwf13, cwf14, cwf17, cwf12, Shapes.or(cwf13, cwf12), Shapes.or(cwf14, cwf12), Shapes.or(cwf17, cwf12), cwf15, Shapes.or(cwf13, cwf15), Shapes.or(cwf14, cwf15), Shapes.or(cwf17, cwf15), cwf16, Shapes.or(cwf13, cwf16), Shapes.or(cwf14, cwf16), Shapes.or(cwf17, cwf16) };
+        final VoxelShape dfg11 = Block.box(float6, 0.0, float6, float7, float3, float7);
+        final VoxelShape dfg12 = Block.box(float8, float4, 0.0, float9, float5, float9);
+        final VoxelShape dfg13 = Block.box(float8, float4, float8, float9, float5, 16.0);
+        final VoxelShape dfg14 = Block.box(0.0, float4, float8, float9, float5, float9);
+        final VoxelShape dfg15 = Block.box(float8, float4, float8, 16.0, float5, float9);
+        final VoxelShape dfg16 = Shapes.or(dfg12, dfg15);
+        final VoxelShape dfg17 = Shapes.or(dfg13, dfg14);
+        final VoxelShape[] arr18 = { Shapes.empty(), dfg13, dfg14, dfg17, dfg12, Shapes.or(dfg13, dfg12), Shapes.or(dfg14, dfg12), Shapes.or(dfg17, dfg12), dfg15, Shapes.or(dfg13, dfg15), Shapes.or(dfg14, dfg15), Shapes.or(dfg17, dfg15), dfg16, Shapes.or(dfg13, dfg16), Shapes.or(dfg14, dfg16), Shapes.or(dfg17, dfg16) };
         for (int integer19 = 0; integer19 < 16; ++integer19) {
-            arr18[integer19] = Shapes.or(cwf11, arr18[integer19]);
+            arr18[integer19] = Shapes.or(dfg11, arr18[integer19]);
         }
         return arr18;
     }
     
     @Override
-    public boolean propagatesSkylightDown(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return !byj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.WATERLOGGED);
+    public boolean propagatesSkylightDown(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return !cfj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.WATERLOGGED);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return this.shapeByIndex[this.getAABBIndex(byj)];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.shapeByIndex[this.getAABBIndex(cfj)];
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return this.collisionShapeByIndex[this.getAABBIndex(byj)];
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.collisionShapeByIndex[this.getAABBIndex(cfj)];
     }
     
-    private static int indexFor(final Direction fp) {
-        return 1 << fp.get2DDataValue();
+    private static int indexFor(final Direction fz) {
+        return 1 << fz.get2DDataValue();
     }
     
-    protected int getAABBIndex(final BlockState byj) {
+    protected int getAABBIndex(final BlockState cfj) {
         int integer2;
-        return this.stateToIndex.computeIntIfAbsent(byj, byj -> {
+        return this.stateToIndex.computeIntIfAbsent(cfj, cfj -> {
             integer2 = 0;
-            if (byj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.NORTH)) {
+            if (cfj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.NORTH)) {
                 integer2 |= indexFor(Direction.NORTH);
             }
-            if (byj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.EAST)) {
+            if (cfj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.EAST)) {
                 integer2 |= indexFor(Direction.EAST);
             }
-            if (byj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.SOUTH)) {
+            if (cfj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.SOUTH)) {
                 integer2 |= indexFor(Direction.SOUTH);
             }
-            if (byj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.WEST)) {
+            if (cfj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.WEST)) {
                 integer2 |= indexFor(Direction.WEST);
             }
             return integer2;
@@ -97,47 +102,47 @@ public class CrossCollisionBlock extends Block implements SimpleWaterloggedBlock
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)CrossCollisionBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        switch (btu) {
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        switch (cap) {
             case CLOCKWISE_180: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)CrossCollisionBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.SOUTH))).setValue((Property<Comparable>)CrossCollisionBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.WEST))).setValue((Property<Comparable>)CrossCollisionBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.NORTH))).<Comparable, Comparable>setValue((Property<Comparable>)CrossCollisionBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.EAST));
+                return (((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)CrossCollisionBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.SOUTH))).setValue((Property<Comparable>)CrossCollisionBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.WEST))).setValue((Property<Comparable>)CrossCollisionBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.NORTH))).<Comparable, Comparable>setValue((Property<Comparable>)CrossCollisionBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.EAST));
             }
             case COUNTERCLOCKWISE_90: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)CrossCollisionBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.EAST))).setValue((Property<Comparable>)CrossCollisionBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.SOUTH))).setValue((Property<Comparable>)CrossCollisionBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)CrossCollisionBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.NORTH));
+                return (((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)CrossCollisionBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.EAST))).setValue((Property<Comparable>)CrossCollisionBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.SOUTH))).setValue((Property<Comparable>)CrossCollisionBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)CrossCollisionBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.NORTH));
             }
             case CLOCKWISE_90: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)CrossCollisionBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.WEST))).setValue((Property<Comparable>)CrossCollisionBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.NORTH))).setValue((Property<Comparable>)CrossCollisionBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.EAST))).<Comparable, Comparable>setValue((Property<Comparable>)CrossCollisionBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.SOUTH));
+                return (((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)CrossCollisionBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.WEST))).setValue((Property<Comparable>)CrossCollisionBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.NORTH))).setValue((Property<Comparable>)CrossCollisionBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.EAST))).<Comparable, Comparable>setValue((Property<Comparable>)CrossCollisionBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.SOUTH));
             }
             default: {
-                return byj;
+                return cfj;
             }
         }
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        switch (bsu) {
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        switch (bzj) {
             case LEFT_RIGHT: {
-                return (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)CrossCollisionBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.SOUTH))).<Comparable, Comparable>setValue((Property<Comparable>)CrossCollisionBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.NORTH));
+                return (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)CrossCollisionBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.SOUTH))).<Comparable, Comparable>setValue((Property<Comparable>)CrossCollisionBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.NORTH));
             }
             case FRONT_BACK: {
-                return (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)CrossCollisionBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)CrossCollisionBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)CrossCollisionBlock.EAST));
+                return (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)CrossCollisionBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)CrossCollisionBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)CrossCollisionBlock.EAST));
             }
             default: {
-                return super.mirror(byj, bsu);
+                return super.mirror(cfj, bzj);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/block/CryingObsidianBlock.java b/src/net/minecraft/world/level/block/CryingObsidianBlock.java
new file mode 100644
index 0000000..560825e
--- /dev/null
+++ b/src/net/minecraft/world/level/block/CryingObsidianBlock.java
@@ -0,0 +1,37 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.core.Direction;
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+
+public class CryingObsidianBlock extends Block {
+    public CryingObsidianBlock(final Properties c) {
+        super(c);
+    }
+    
+    @Override
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (random.nextInt(5) != 0) {
+            return;
+        }
+        final Direction fz6 = Direction.getRandom(random);
+        if (fz6 == Direction.UP) {
+            return;
+        }
+        final BlockPos fu2 = fu.relative(fz6);
+        final BlockState cfj2 = bqb.getBlockState(fu2);
+        if (cfj.canOcclude() && cfj2.isFaceSturdy(bqb, fu2, fz6.getOpposite())) {
+            return;
+        }
+        final double double9 = (fz6.getStepX() == 0) ? random.nextDouble() : (0.5 + fz6.getStepX() * 0.6);
+        final double double10 = (fz6.getStepY() == 0) ? random.nextDouble() : (0.5 + fz6.getStepY() * 0.6);
+        final double double11 = (fz6.getStepZ() == 0) ? random.nextDouble() : (0.5 + fz6.getStepZ() * 0.6);
+        bqb.addParticle(ParticleTypes.DRIPPING_OBSIDIAN_TEAR, fu.getX() + double9, fu.getY() + double10, fu.getZ() + double11, 0.0, 0.0, 0.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/DaylightDetectorBlock.java b/src/net/minecraft/world/level/block/DaylightDetectorBlock.java
index ed95ef7..35133e9 100644
--- a/src/net/minecraft/world/level/block/DaylightDetectorBlock.java
+++ b/src/net/minecraft/world/level/block/DaylightDetectorBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.entity.DaylightDetectorBlockEntity;
@@ -18,6 +18,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
@@ -29,31 +30,31 @@ public class DaylightDetectorBlock extends BaseEntityBlock {
     
     public DaylightDetectorBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)DaylightDetectorBlock.POWER, 0)).<Comparable, Boolean>setValue((Property<Comparable>)DaylightDetectorBlock.INVERTED, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)DaylightDetectorBlock.POWER, 0)).<Comparable, Boolean>setValue((Property<Comparable>)DaylightDetectorBlock.INVERTED, false));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return DaylightDetectorBlock.SHAPE;
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return byj.<Integer>getValue((Property<Integer>)DaylightDetectorBlock.POWER);
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return cfj.<Integer>getValue((Property<Integer>)DaylightDetectorBlock.POWER);
     }
     
-    public static void updateSignalStrength(final BlockState byj, final Level bjw, final BlockPos fk) {
-        if (!bjw.dimension.isHasSkyLight()) {
+    public static void updateSignalStrength(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        if (!bqb.dimensionType().hasSkyLight()) {
             return;
         }
-        int integer4 = bjw.getBrightness(LightLayer.SKY, fk) - bjw.getSkyDarken();
-        float float5 = bjw.getSunAngle(1.0f);
-        final boolean boolean6 = byj.<Boolean>getValue((Property<Boolean>)DaylightDetectorBlock.INVERTED);
+        int integer4 = bqb.getBrightness(LightLayer.SKY, fu) - bqb.getSkyDarken();
+        float float5 = bqb.getSunAngle(1.0f);
+        final boolean boolean6 = cfj.<Boolean>getValue((Property<Boolean>)DaylightDetectorBlock.INVERTED);
         if (boolean6) {
             integer4 = 15 - integer4;
         }
@@ -63,37 +64,37 @@ public class DaylightDetectorBlock extends BaseEntityBlock {
             integer4 = Math.round(integer4 * Mth.cos(float5));
         }
         integer4 = Mth.clamp(integer4, 0, 15);
-        if (byj.<Integer>getValue((Property<Integer>)DaylightDetectorBlock.POWER) != integer4) {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)DaylightDetectorBlock.POWER, integer4), 3);
+        if (cfj.<Integer>getValue((Property<Integer>)DaylightDetectorBlock.POWER) != integer4) {
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)DaylightDetectorBlock.POWER, integer4), 3);
         }
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (!ayj.mayBuild()) {
-            return super.use(byj, bjw, fk, ayj, ajk, cvg);
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (!bec.mayBuild()) {
+            return super.use(cfj, bqb, fu, bec, anf, deh);
         }
-        if (bjw.isClientSide) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        final BlockState byj2 = ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)DaylightDetectorBlock.INVERTED);
-        bjw.setBlock(fk, byj2, 4);
-        updateSignalStrength(byj2, bjw, fk);
-        return InteractionResult.SUCCESS;
+        final BlockState cfj2 = ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)DaylightDetectorBlock.INVERTED);
+        bqb.setBlock(fu, cfj2, 4);
+        updateSignalStrength(cfj2, bqb, fu);
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new DaylightDetectorBlockEntity();
     }
     
diff --git a/src/net/minecraft/world/level/block/DeadBushBlock.java b/src/net/minecraft/world/level/block/DeadBushBlock.java
index 449a465..8aa7498 100644
--- a/src/net/minecraft/world/level/block/DeadBushBlock.java
+++ b/src/net/minecraft/world/level/block/DeadBushBlock.java
@@ -4,6 +4,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class DeadBushBlock extends BushBlock {
@@ -14,14 +15,14 @@ public class DeadBushBlock extends BushBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return DeadBushBlock.SHAPE;
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        final Block bph5 = byj.getBlock();
-        return bph5 == Blocks.SAND || bph5 == Blocks.RED_SAND || bph5 == Blocks.TERRACOTTA || bph5 == Blocks.WHITE_TERRACOTTA || bph5 == Blocks.ORANGE_TERRACOTTA || bph5 == Blocks.MAGENTA_TERRACOTTA || bph5 == Blocks.LIGHT_BLUE_TERRACOTTA || bph5 == Blocks.YELLOW_TERRACOTTA || bph5 == Blocks.LIME_TERRACOTTA || bph5 == Blocks.PINK_TERRACOTTA || bph5 == Blocks.GRAY_TERRACOTTA || bph5 == Blocks.LIGHT_GRAY_TERRACOTTA || bph5 == Blocks.CYAN_TERRACOTTA || bph5 == Blocks.PURPLE_TERRACOTTA || bph5 == Blocks.BLUE_TERRACOTTA || bph5 == Blocks.BROWN_TERRACOTTA || bph5 == Blocks.GREEN_TERRACOTTA || bph5 == Blocks.RED_TERRACOTTA || bph5 == Blocks.BLACK_TERRACOTTA || bph5 == Blocks.DIRT || bph5 == Blocks.COARSE_DIRT || bph5 == Blocks.PODZOL;
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        final Block bvr5 = cfj.getBlock();
+        return bvr5 == Blocks.SAND || bvr5 == Blocks.RED_SAND || bvr5 == Blocks.TERRACOTTA || bvr5 == Blocks.WHITE_TERRACOTTA || bvr5 == Blocks.ORANGE_TERRACOTTA || bvr5 == Blocks.MAGENTA_TERRACOTTA || bvr5 == Blocks.LIGHT_BLUE_TERRACOTTA || bvr5 == Blocks.YELLOW_TERRACOTTA || bvr5 == Blocks.LIME_TERRACOTTA || bvr5 == Blocks.PINK_TERRACOTTA || bvr5 == Blocks.GRAY_TERRACOTTA || bvr5 == Blocks.LIGHT_GRAY_TERRACOTTA || bvr5 == Blocks.CYAN_TERRACOTTA || bvr5 == Blocks.PURPLE_TERRACOTTA || bvr5 == Blocks.BLUE_TERRACOTTA || bvr5 == Blocks.BROWN_TERRACOTTA || bvr5 == Blocks.GREEN_TERRACOTTA || bvr5 == Blocks.RED_TERRACOTTA || bvr5 == Blocks.BLACK_TERRACOTTA || bvr5 == Blocks.DIRT || bvr5 == Blocks.COARSE_DIRT || bvr5 == Blocks.PODZOL;
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/DetectorRailBlock.java b/src/net/minecraft/world/level/block/DetectorRailBlock.java
index 7a0dabf..38d3d7e 100644
--- a/src/net/minecraft/world/level/block/DetectorRailBlock.java
+++ b/src/net/minecraft/world/level/block/DetectorRailBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.phys.AABB;
@@ -20,9 +20,9 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.RailShape;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
@@ -33,96 +33,90 @@ public class DetectorRailBlock extends BaseRailBlock {
     
     public DetectorRailBlock(final Properties c) {
         super(true, c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)DetectorRailBlock.POWERED, false)).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_SOUTH));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)DetectorRailBlock.POWERED, false)).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_SOUTH));
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return 20;
-    }
-    
-    @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (bjw.isClientSide) {
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (bqb.isClientSide) {
             return;
         }
-        if (byj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED)) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED)) {
             return;
         }
-        this.checkPressed(bjw, fk, byj);
+        this.checkPressed(bqb, fu, cfj);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED)) {
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED)) {
             return;
         }
-        this.checkPressed(xd, fk, byj);
+        this.checkPressed(zd, fu, cfj);
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return byj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED) ? 15 : 0;
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return cfj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED) ? 15 : 0;
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED)) {
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED)) {
             return 0;
         }
-        return (fp == Direction.UP) ? 15 : 0;
+        return (fz == Direction.UP) ? 15 : 0;
     }
     
-    private void checkPressed(final Level bjw, final BlockPos fk, final BlockState byj) {
-        final boolean boolean5 = byj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED);
+    private void checkPressed(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        final boolean boolean5 = cfj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED);
         boolean boolean6 = false;
-        final List<AbstractMinecart> list7 = this.<AbstractMinecart>getInteractingMinecartOfType(bjw, fk, AbstractMinecart.class, null);
+        final List<AbstractMinecart> list7 = this.<AbstractMinecart>getInteractingMinecartOfType(bqb, fu, AbstractMinecart.class, null);
         if (!list7.isEmpty()) {
             boolean6 = true;
         }
         if (boolean6 && !boolean5) {
-            final BlockState byj2 = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)DetectorRailBlock.POWERED, true);
-            bjw.setBlock(fk, byj2, 3);
-            this.updatePowerToConnected(bjw, fk, byj2, true);
-            bjw.updateNeighborsAt(fk, this);
-            bjw.updateNeighborsAt(fk.below(), this);
-            bjw.setBlocksDirty(fk, byj, byj2);
+            final BlockState cfj2 = ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)DetectorRailBlock.POWERED, true);
+            bqb.setBlock(fu, cfj2, 3);
+            this.updatePowerToConnected(bqb, fu, cfj2, true);
+            bqb.updateNeighborsAt(fu, this);
+            bqb.updateNeighborsAt(fu.below(), this);
+            bqb.setBlocksDirty(fu, cfj, cfj2);
         }
         if (!boolean6 && boolean5) {
-            final BlockState byj2 = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)DetectorRailBlock.POWERED, false);
-            bjw.setBlock(fk, byj2, 3);
-            this.updatePowerToConnected(bjw, fk, byj2, false);
-            bjw.updateNeighborsAt(fk, this);
-            bjw.updateNeighborsAt(fk.below(), this);
-            bjw.setBlocksDirty(fk, byj, byj2);
+            final BlockState cfj2 = ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)DetectorRailBlock.POWERED, false);
+            bqb.setBlock(fu, cfj2, 3);
+            this.updatePowerToConnected(bqb, fu, cfj2, false);
+            bqb.updateNeighborsAt(fu, this);
+            bqb.updateNeighborsAt(fu.below(), this);
+            bqb.setBlocksDirty(fu, cfj, cfj2);
         }
         if (boolean6) {
-            bjw.getBlockTicks().scheduleTick(fk, this, this.getTickDelay(bjw));
+            bqb.getBlockTicks().scheduleTick(fu, this, 20);
         }
-        bjw.updateNeighbourForOutputSignal(fk, this);
+        bqb.updateNeighbourForOutputSignal(fu, this);
     }
     
-    protected void updatePowerToConnected(final Level bjw, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        final RailState btl6 = new RailState(bjw, fk, byj);
-        final List<BlockPos> list7 = btl6.getConnections();
-        for (final BlockPos fk2 : list7) {
-            final BlockState byj2 = bjw.getBlockState(fk2);
-            byj2.neighborChanged(bjw, fk2, byj2.getBlock(), fk, false);
+    protected void updatePowerToConnected(final Level bqb, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        final RailState cae6 = new RailState(bqb, fu, cfj);
+        final List<BlockPos> list7 = cae6.getConnections();
+        for (final BlockPos fu2 : list7) {
+            final BlockState cfj2 = bqb.getBlockState(fu2);
+            cfj2.neighborChanged(bqb, fu2, cfj2.getBlock(), fu, false);
         }
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj4.getBlock() == byj1.getBlock()) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj4.is(cfj1.getBlock())) {
             return;
         }
-        super.onPlace(byj1, bjw, fk, byj4, boolean5);
-        this.checkPressed(bjw, fk, byj1);
+        this.checkPressed(bqb, fu, this.updateState(cfj1, bqb, fu, boolean5));
     }
     
     @Override
@@ -131,18 +125,18 @@ public class DetectorRailBlock extends BaseRailBlock {
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        if (byj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED)) {
-            final List<MinecartCommandBlock> list5 = this.<MinecartCommandBlock>getInteractingMinecartOfType(bjw, fk, MinecartCommandBlock.class, null);
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)DetectorRailBlock.POWERED)) {
+            final List<MinecartCommandBlock> list5 = this.<MinecartCommandBlock>getInteractingMinecartOfType(bqb, fu, MinecartCommandBlock.class, null);
             if (!list5.isEmpty()) {
                 return list5.get(0).getCommandBlock().getSuccessCount();
             }
-            final List<AbstractMinecart> list6 = this.<AbstractMinecart>getInteractingMinecartOfType(bjw, fk, AbstractMinecart.class, EntitySelector.CONTAINER_ENTITY_SELECTOR);
+            final List<AbstractMinecart> list6 = this.<AbstractMinecart>getInteractingMinecartOfType(bqb, fu, AbstractMinecart.class, EntitySelector.CONTAINER_ENTITY_SELECTOR);
             if (!list6.isEmpty()) {
                 return AbstractContainerMenu.getRedstoneSignalFromContainer((Container)list6.get(0));
             }
@@ -150,44 +144,44 @@ public class DetectorRailBlock extends BaseRailBlock {
         return 0;
     }
     
-    protected <T extends AbstractMinecart> List<T> getInteractingMinecartOfType(final Level bjw, final BlockPos fk, final Class<T> class3, @Nullable final Predicate<Entity> predicate) {
-        return bjw.<T>getEntitiesOfClass(class3, this.getSearchBB(fk), predicate);
+    protected <T extends AbstractMinecart> List<T> getInteractingMinecartOfType(final Level bqb, final BlockPos fu, final Class<T> class3, @Nullable final Predicate<Entity> predicate) {
+        return bqb.<T>getEntitiesOfClass(class3, this.getSearchBB(fu), predicate);
     }
     
-    private AABB getSearchBB(final BlockPos fk) {
-        final float float3 = 0.2f;
-        return new AABB(fk.getX() + 0.2f, fk.getY(), fk.getZ() + 0.2f, fk.getX() + 1 - 0.2f, fk.getY() + 1 - 0.2f, fk.getZ() + 1 - 0.2f);
+    private AABB getSearchBB(final BlockPos fu) {
+        final double double3 = 0.2;
+        return new AABB(fu.getX() + 0.2, fu.getY(), fu.getZ() + 0.2, fu.getX() + 1 - 0.2, fu.getY() + 1 - 0.2, fu.getZ() + 1 - 0.2);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
         Label_0424: {
-            switch (btu) {
+            switch (cap) {
                 case CLOCKWISE_180: {
-                    switch (byj.<RailShape>getValue(DetectorRailBlock.SHAPE)) {
+                    switch (cfj.<RailShape>getValue(DetectorRailBlock.SHAPE)) {
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         default: {
                             break Label_0424;
@@ -196,36 +190,36 @@ public class DetectorRailBlock extends BaseRailBlock {
                     break;
                 }
                 case COUNTERCLOCKWISE_90: {
-                    switch (byj.<RailShape>getValue(DetectorRailBlock.SHAPE)) {
+                    switch (cfj.<RailShape>getValue(DetectorRailBlock.SHAPE)) {
                         case NORTH_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.EAST_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.EAST_WEST);
                         }
                         case EAST_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_SOUTH);
                         }
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         default: {
                             break Label_0424;
@@ -234,36 +228,36 @@ public class DetectorRailBlock extends BaseRailBlock {
                     break;
                 }
                 case CLOCKWISE_90: {
-                    switch (byj.<RailShape>getValue(DetectorRailBlock.SHAPE)) {
+                    switch (cfj.<RailShape>getValue(DetectorRailBlock.SHAPE)) {
                         case NORTH_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.EAST_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.EAST_WEST);
                         }
                         case EAST_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_SOUTH);
                         }
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         default: {
                             break Label_0424;
@@ -273,33 +267,33 @@ public class DetectorRailBlock extends BaseRailBlock {
                 }
             }
         }
-        return byj;
+        return cfj;
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        final RailShape bzn4 = byj.<RailShape>getValue(DetectorRailBlock.SHAPE);
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        final RailShape cgm4 = cfj.<RailShape>getValue(DetectorRailBlock.SHAPE);
         Label_0319: {
-            switch (bsu) {
+            switch (bzj) {
                 case LEFT_RIGHT: {
-                    switch (bzn4) {
+                    switch (cgm4) {
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         default: {
                             break Label_0319;
@@ -308,24 +302,24 @@ public class DetectorRailBlock extends BaseRailBlock {
                     break;
                 }
                 case FRONT_BACK: {
-                    switch (bzn4) {
+                    switch (cgm4) {
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(DetectorRailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         default: {
                             break Label_0319;
@@ -335,7 +329,7 @@ public class DetectorRailBlock extends BaseRailBlock {
                 }
             }
         }
-        return super.mirror(byj, bsu);
+        return super.mirror(cfj, bzj);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/DiodeBlock.java b/src/net/minecraft/world/level/block/DiodeBlock.java
index d3e35c8..fe76e89 100644
--- a/src/net/minecraft/world/level/block/DiodeBlock.java
+++ b/src/net/minecraft/world/level/block/DiodeBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.LivingEntity;
@@ -17,6 +17,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -29,179 +30,178 @@ public abstract class DiodeBlock extends HorizontalDirectionalBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return DiodeBlock.SHAPE;
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return Block.canSupportRigidBlock(bjz, fk.below());
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return Block.canSupportRigidBlock(bqd, fu.below());
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (this.isLocked(xd, fk, byj)) {
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (this.isLocked(zd, fu, cfj)) {
             return;
         }
-        final boolean boolean6 = byj.<Boolean>getValue((Property<Boolean>)DiodeBlock.POWERED);
-        final boolean boolean7 = this.shouldTurnOn(xd, fk, byj);
+        final boolean boolean6 = cfj.<Boolean>getValue((Property<Boolean>)DiodeBlock.POWERED);
+        final boolean boolean7 = this.shouldTurnOn(zd, fu, cfj);
         if (boolean6 && !boolean7) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)DiodeBlock.POWERED, false), 2);
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)DiodeBlock.POWERED, false), 2);
         }
         else if (!boolean6) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)DiodeBlock.POWERED, true), 2);
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)DiodeBlock.POWERED, true), 2);
             if (!boolean7) {
-                xd.getBlockTicks().scheduleTick(fk, this, this.getDelay(byj), TickPriority.VERY_HIGH);
+                zd.getBlockTicks().scheduleTick(fu, this, this.getDelay(cfj), TickPriority.VERY_HIGH);
             }
         }
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return byj.getSignal(bjg, fk, fp);
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return cfj.getSignal(bpg, fu, fz);
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)DiodeBlock.POWERED)) {
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)DiodeBlock.POWERED)) {
             return 0;
         }
-        if (byj.<Comparable>getValue((Property<Comparable>)DiodeBlock.FACING) == fp) {
-            return this.getOutputSignal(bjg, fk, byj);
+        if (cfj.<Comparable>getValue((Property<Comparable>)DiodeBlock.FACING) == fz) {
+            return this.getOutputSignal(bpg, fu, cfj);
         }
         return 0;
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (byj.canSurvive(bjw, fk3)) {
-            this.checkTickOnNeighbor(bjw, fk3, byj);
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (cfj.canSurvive(bqb, fu3)) {
+            this.checkTickOnNeighbor(bqb, fu3, cfj);
             return;
         }
-        final BlockEntity bwl8 = this.isEntityBlock() ? bjw.getBlockEntity(fk3) : null;
-        Block.dropResources(byj, bjw, fk3, bwl8);
-        bjw.removeBlock(fk3, false);
-        for (final Direction fp12 : Direction.values()) {
-            bjw.updateNeighborsAt(fk3.relative(fp12), this);
+        final BlockEntity cdl8 = this.isEntityBlock() ? bqb.getBlockEntity(fu3) : null;
+        Block.dropResources(cfj, bqb, fu3, cdl8);
+        bqb.removeBlock(fu3, false);
+        for (final Direction fz12 : Direction.values()) {
+            bqb.updateNeighborsAt(fu3.relative(fz12), this);
         }
     }
     
-    protected void checkTickOnNeighbor(final Level bjw, final BlockPos fk, final BlockState byj) {
-        if (this.isLocked(bjw, fk, byj)) {
+    protected void checkTickOnNeighbor(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        if (this.isLocked(bqb, fu, cfj)) {
             return;
         }
-        final boolean boolean5 = byj.<Boolean>getValue((Property<Boolean>)DiodeBlock.POWERED);
-        final boolean boolean6 = this.shouldTurnOn(bjw, fk, byj);
-        if (boolean5 != boolean6 && !bjw.getBlockTicks().willTickThisTick(fk, this)) {
-            TickPriority bkn7 = TickPriority.HIGH;
-            if (this.shouldPrioritize(bjw, fk, byj)) {
-                bkn7 = TickPriority.EXTREMELY_HIGH;
+        final boolean boolean5 = cfj.<Boolean>getValue((Property<Boolean>)DiodeBlock.POWERED);
+        final boolean boolean6 = this.shouldTurnOn(bqb, fu, cfj);
+        if (boolean5 != boolean6 && !bqb.getBlockTicks().willTickThisTick(fu, this)) {
+            TickPriority bqt7 = TickPriority.HIGH;
+            if (this.shouldPrioritize(bqb, fu, cfj)) {
+                bqt7 = TickPriority.EXTREMELY_HIGH;
             }
             else if (boolean5) {
-                bkn7 = TickPriority.VERY_HIGH;
+                bqt7 = TickPriority.VERY_HIGH;
             }
-            bjw.getBlockTicks().scheduleTick(fk, this, this.getDelay(byj), bkn7);
+            bqb.getBlockTicks().scheduleTick(fu, this, this.getDelay(cfj), bqt7);
         }
     }
     
-    public boolean isLocked(final LevelReader bjz, final BlockPos fk, final BlockState byj) {
+    public boolean isLocked(final LevelReader bqd, final BlockPos fu, final BlockState cfj) {
         return false;
     }
     
-    protected boolean shouldTurnOn(final Level bjw, final BlockPos fk, final BlockState byj) {
-        return this.getInputSignal(bjw, fk, byj) > 0;
+    protected boolean shouldTurnOn(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        return this.getInputSignal(bqb, fu, cfj) > 0;
     }
     
-    protected int getInputSignal(final Level bjw, final BlockPos fk, final BlockState byj) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)DiodeBlock.FACING);
-        final BlockPos fk2 = fk.relative(fp5);
-        final int integer7 = bjw.getSignal(fk2, fp5);
+    protected int getInputSignal(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)DiodeBlock.FACING);
+        final BlockPos fu2 = fu.relative(fz5);
+        final int integer7 = bqb.getSignal(fu2, fz5);
         if (integer7 >= 15) {
             return integer7;
         }
-        final BlockState byj2 = bjw.getBlockState(fk2);
-        return Math.max(integer7, (byj2.getBlock() == Blocks.REDSTONE_WIRE) ? ((int)byj2.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER)) : 0);
+        final BlockState cfj2 = bqb.getBlockState(fu2);
+        return Math.max(integer7, cfj2.is(Blocks.REDSTONE_WIRE) ? ((int)cfj2.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER)) : 0);
     }
     
-    protected int getAlternateSignal(final LevelReader bjz, final BlockPos fk, final BlockState byj) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)DiodeBlock.FACING);
-        final Direction fp6 = fp5.getClockWise();
-        final Direction fp7 = fp5.getCounterClockWise();
-        return Math.max(this.getAlternateSignalAt(bjz, fk.relative(fp6), fp6), this.getAlternateSignalAt(bjz, fk.relative(fp7), fp7));
+    protected int getAlternateSignal(final LevelReader bqd, final BlockPos fu, final BlockState cfj) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)DiodeBlock.FACING);
+        final Direction fz6 = fz5.getClockWise();
+        final Direction fz7 = fz5.getCounterClockWise();
+        return Math.max(this.getAlternateSignalAt(bqd, fu.relative(fz6), fz6), this.getAlternateSignalAt(bqd, fu.relative(fz7), fz7));
     }
     
-    protected int getAlternateSignalAt(final LevelReader bjz, final BlockPos fk, final Direction fp) {
-        final BlockState byj5 = bjz.getBlockState(fk);
-        final Block bph6 = byj5.getBlock();
-        if (!this.isAlternateInput(byj5)) {
+    protected int getAlternateSignalAt(final LevelReader bqd, final BlockPos fu, final Direction fz) {
+        final BlockState cfj5 = bqd.getBlockState(fu);
+        if (!this.isAlternateInput(cfj5)) {
             return 0;
         }
-        if (bph6 == Blocks.REDSTONE_BLOCK) {
+        if (cfj5.is(Blocks.REDSTONE_BLOCK)) {
             return 15;
         }
-        if (bph6 == Blocks.REDSTONE_WIRE) {
-            return byj5.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER);
+        if (cfj5.is(Blocks.REDSTONE_WIRE)) {
+            return cfj5.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER);
         }
-        return bjz.getDirectSignal(fk, fp);
+        return bqd.getDirectSignal(fu, fz);
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)DiodeBlock.FACING, bcq.getHorizontalDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)DiodeBlock.FACING, bin.getHorizontalDirection().getOpposite());
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        if (this.shouldTurnOn(bjw, fk, byj)) {
-            bjw.getBlockTicks().scheduleTick(fk, this, 1);
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        if (this.shouldTurnOn(bqb, fu, cfj)) {
+            bqb.getBlockTicks().scheduleTick(fu, this, 1);
         }
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        this.updateNeighborsInFront(bjw, fk, byj1);
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        this.updateNeighborsInFront(bqb, fu, cfj1);
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (boolean5 || byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (boolean5 || cfj1.is(cfj4.getBlock())) {
             return;
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
-        this.updateNeighborsInFront(bjw, fk, byj1);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
+        this.updateNeighborsInFront(bqb, fu, cfj1);
     }
     
-    protected void updateNeighborsInFront(final Level bjw, final BlockPos fk, final BlockState byj) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)DiodeBlock.FACING);
-        final BlockPos fk2 = fk.relative(fp5.getOpposite());
-        bjw.neighborChanged(fk2, this, fk);
-        bjw.updateNeighborsAtExceptFromFacing(fk2, this, fp5);
+    protected void updateNeighborsInFront(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)DiodeBlock.FACING);
+        final BlockPos fu2 = fu.relative(fz5.getOpposite());
+        bqb.neighborChanged(fu2, this, fu);
+        bqb.updateNeighborsAtExceptFromFacing(fu2, this, fz5);
     }
     
-    protected boolean isAlternateInput(final BlockState byj) {
-        return byj.isSignalSource();
+    protected boolean isAlternateInput(final BlockState cfj) {
+        return cfj.isSignalSource();
     }
     
-    protected int getOutputSignal(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    protected int getOutputSignal(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return 15;
     }
     
-    public static boolean isDiode(final BlockState byj) {
-        return byj.getBlock() instanceof DiodeBlock;
+    public static boolean isDiode(final BlockState cfj) {
+        return cfj.getBlock() instanceof DiodeBlock;
     }
     
-    public boolean shouldPrioritize(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)DiodeBlock.FACING).getOpposite();
-        final BlockState byj2 = bjg.getBlockState(fk.relative(fp5));
-        return isDiode(byj2) && byj2.<Comparable>getValue((Property<Comparable>)DiodeBlock.FACING) != fp5;
+    public boolean shouldPrioritize(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)DiodeBlock.FACING).getOpposite();
+        final BlockState cfj2 = bpg.getBlockState(fu.relative(fz5));
+        return isDiode(cfj2) && cfj2.<Comparable>getValue((Property<Comparable>)DiodeBlock.FACING) != fz5;
     }
     
-    protected abstract int getDelay(final BlockState byj);
+    protected abstract int getDelay(final BlockState cfj);
     
     static {
         SHAPE = Block.box(0.0, 0.0, 0.0, 16.0, 2.0, 16.0);
diff --git a/src/net/minecraft/world/level/block/DirectionalBlock.java b/src/net/minecraft/world/level/block/DirectionalBlock.java
index cbfc263..f564ed4 100644
--- a/src/net/minecraft/world/level/block/DirectionalBlock.java
+++ b/src/net/minecraft/world/level/block/DirectionalBlock.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.block;
 
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 
 public abstract class DirectionalBlock extends Block {
diff --git a/src/net/minecraft/world/level/block/DispenserBlock.java b/src/net/minecraft/world/level/block/DispenserBlock.java
index 7d4a847..dbf1ac7 100644
--- a/src/net/minecraft/world/level/block/DispenserBlock.java
+++ b/src/net/minecraft/world/level/block/DispenserBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.Util;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
@@ -30,10 +30,10 @@ import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.core.dispenser.DispenseItemBehavior;
 import net.minecraft.world.item.Item;
@@ -46,139 +46,134 @@ public class DispenserBlock extends BaseEntityBlock {
     public static final BooleanProperty TRIGGERED;
     private static final Map<Item, DispenseItemBehavior> DISPENSER_REGISTRY;
     
-    public static void registerBehavior(final ItemLike bjv, final DispenseItemBehavior gl) {
-        DispenserBlock.DISPENSER_REGISTRY.put(bjv.asItem(), gl);
+    public static void registerBehavior(final ItemLike bqa, final DispenseItemBehavior gw) {
+        DispenserBlock.DISPENSER_REGISTRY.put(bqa.asItem(), gw);
     }
     
     protected DispenserBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)DispenserBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)DispenserBlock.TRIGGERED, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)DispenserBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)DispenserBlock.TRIGGERED, false));
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return 4;
-    }
-    
-    @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk);
-        if (bwl8 instanceof DispenserBlockEntity) {
-            ayj.openMenu((MenuProvider)bwl8);
-            if (bwl8 instanceof DropperBlockEntity) {
-                ayj.awardStat(Stats.INSPECT_DROPPER);
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu);
+        if (cdl8 instanceof DispenserBlockEntity) {
+            bec.openMenu((MenuProvider)cdl8);
+            if (cdl8 instanceof DropperBlockEntity) {
+                bec.awardStat(Stats.INSPECT_DROPPER);
             }
             else {
-                ayj.awardStat(Stats.INSPECT_DISPENSER);
+                bec.awardStat(Stats.INSPECT_DISPENSER);
             }
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.CONSUME;
     }
     
-    protected void dispenseFrom(final Level bjw, final BlockPos fk) {
-        final BlockSourceImpl fm4 = new BlockSourceImpl(bjw, fk);
-        final DispenserBlockEntity bwu5 = fm4.<DispenserBlockEntity>getEntity();
-        final int integer6 = bwu5.getRandomSlot();
+    protected void dispenseFrom(final Level bqb, final BlockPos fu) {
+        final BlockSourceImpl fw4 = new BlockSourceImpl(bqb, fu);
+        final DispenserBlockEntity cdu5 = fw4.<DispenserBlockEntity>getEntity();
+        final int integer6 = cdu5.getRandomSlot();
         if (integer6 < 0) {
-            bjw.levelEvent(1001, fk, 0);
+            bqb.levelEvent(1001, fu, 0);
             return;
         }
-        final ItemStack ben7 = bwu5.getItem(integer6);
-        final DispenseItemBehavior gl8 = this.getDispenseMethod(ben7);
-        if (gl8 != DispenseItemBehavior.NOOP) {
-            bwu5.setItem(integer6, gl8.dispense(fm4, ben7));
+        final ItemStack bki7 = cdu5.getItem(integer6);
+        final DispenseItemBehavior gw8 = this.getDispenseMethod(bki7);
+        if (gw8 != DispenseItemBehavior.NOOP) {
+            cdu5.setItem(integer6, gw8.dispense(fw4, bki7));
         }
     }
     
-    protected DispenseItemBehavior getDispenseMethod(final ItemStack ben) {
-        return DispenserBlock.DISPENSER_REGISTRY.get(ben.getItem());
+    protected DispenseItemBehavior getDispenseMethod(final ItemStack bki) {
+        return DispenserBlock.DISPENSER_REGISTRY.get(bki.getItem());
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        final boolean boolean7 = bjw.hasNeighborSignal(fk3) || bjw.hasNeighborSignal(fk3.above());
-        final boolean boolean8 = byj.<Boolean>getValue((Property<Boolean>)DispenserBlock.TRIGGERED);
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        final boolean boolean7 = bqb.hasNeighborSignal(fu3) || bqb.hasNeighborSignal(fu3.above());
+        final boolean boolean8 = cfj.<Boolean>getValue((Property<Boolean>)DispenserBlock.TRIGGERED);
         if (boolean7 && !boolean8) {
-            bjw.getBlockTicks().scheduleTick(fk3, this, this.getTickDelay(bjw));
-            bjw.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)DispenserBlock.TRIGGERED, true), 4);
+            bqb.getBlockTicks().scheduleTick(fu3, this, 4);
+            bqb.setBlock(fu3, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)DispenserBlock.TRIGGERED, true), 4);
         }
         else if (!boolean7 && boolean8) {
-            bjw.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)DispenserBlock.TRIGGERED, false), 4);
+            bqb.setBlock(fu3, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)DispenserBlock.TRIGGERED, false), 4);
         }
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        this.dispenseFrom(xd, fk);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        this.dispenseFrom(zd, fu);
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new DispenserBlockEntity();
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)DispenserBlock.FACING, bcq.getNearestLookingDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)DispenserBlock.FACING, bin.getNearestLookingDirection().getOpposite());
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof DispenserBlockEntity) {
-                ((DispenserBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof DispenserBlockEntity) {
+                ((DispenserBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof DispenserBlockEntity) {
-            Containers.dropContents(bjw, fk, (Container)bwl7);
-            bjw.updateNeighbourForOutputSignal(fk, this);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof DispenserBlockEntity) {
+            Containers.dropContents(bqb, fu, (Container)cdl7);
+            bqb.updateNeighbourForOutputSignal(fu, this);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
-    public static Position getDispensePosition(final BlockSource fl) {
-        final Direction fp2 = fl.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
-        final double double3 = fl.x() + 0.7 * fp2.getStepX();
-        final double double4 = fl.y() + 0.7 * fp2.getStepY();
-        final double double5 = fl.z() + 0.7 * fp2.getStepZ();
+    public static Position getDispensePosition(final BlockSource fv) {
+        final Direction fz2 = fv.getBlockState().<Direction>getValue((Property<Direction>)DispenserBlock.FACING);
+        final double double3 = fv.x() + 0.7 * fz2.getStepX();
+        final double double4 = fv.y() + 0.7 * fz2.getStepY();
+        final double double5 = fv.z() + 0.7 * fz2.getStepZ();
         return new PositionImpl(double3, double4, double5);
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(bjw.getBlockEntity(fk));
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(bqb.getBlockEntity(fu));
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)DispenserBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)DispenserBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)DispenserBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)DispenserBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)DispenserBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)DispenserBlock.FACING)));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/DoorBlock.java b/src/net/minecraft/world/level/block/DoorBlock.java
index 94713ff..f760b3f 100644
--- a/src/net/minecraft/world/level/block/DoorBlock.java
+++ b/src/net/minecraft/world/level/block/DoorBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.util.Mth;
@@ -9,14 +9,12 @@ import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.LivingEntity;
+import javax.annotation.Nullable;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.pathfinder.PathComputationType;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.item.ItemStack;
-import javax.annotation.Nullable;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
@@ -27,6 +25,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
 import net.minecraft.world.level.block.state.properties.DoorHingeSide;
@@ -47,15 +46,15 @@ public class DoorBlock extends Block {
     
     protected DoorBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)DoorBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)DoorBlock.OPEN, false)).setValue(DoorBlock.HINGE, DoorHingeSide.LEFT)).setValue((Property<Comparable>)DoorBlock.POWERED, false)).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.LOWER));
+        this.registerDefaultState(((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)DoorBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)DoorBlock.OPEN, false)).setValue(DoorBlock.HINGE, DoorHingeSide.LEFT)).setValue((Property<Comparable>)DoorBlock.POWERED, false)).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.LOWER));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final Direction fp6 = byj.<Direction>getValue((Property<Direction>)DoorBlock.FACING);
-        final boolean boolean7 = !byj.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN);
-        final boolean boolean8 = byj.<DoorHingeSide>getValue(DoorBlock.HINGE) == DoorHingeSide.RIGHT;
-        switch (fp6) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final Direction fz6 = cfj.<Direction>getValue((Property<Direction>)DoorBlock.FACING);
+        final boolean boolean7 = !cfj.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN);
+        final boolean boolean8 = cfj.<DoorHingeSide>getValue(DoorBlock.HINGE) == DoorHingeSide.RIGHT;
+        switch (fz6) {
             default: {
                 return boolean7 ? DoorBlock.EAST_AABB : (boolean8 ? DoorBlock.NORTH_AABB : DoorBlock.SOUTH_AABB);
             }
@@ -72,55 +71,41 @@ public class DoorBlock extends Block {
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        final DoubleBlockHalf bzg8 = byj1.<DoubleBlockHalf>getValue(DoorBlock.HALF);
-        if (fp.getAxis() == Direction.Axis.Y && bzg8 == DoubleBlockHalf.LOWER == (fp == Direction.UP)) {
-            if (byj3.getBlock() == this && byj3.<DoubleBlockHalf>getValue(DoorBlock.HALF) != bzg8) {
-                return (((((AbstractStateHolder<O, BlockState>)byj1).setValue((Property<Comparable>)DoorBlock.FACING, (Comparable)byj3.<V>getValue((Property<V>)DoorBlock.FACING))).setValue((Property<Comparable>)DoorBlock.OPEN, (Comparable)byj3.<V>getValue((Property<V>)DoorBlock.OPEN))).setValue(DoorBlock.HINGE, (Comparable)byj3.<V>getValue((Property<V>)DoorBlock.HINGE))).<Comparable, Comparable>setValue((Property<Comparable>)DoorBlock.POWERED, (Comparable)byj3.<V>getValue((Property<V>)DoorBlock.POWERED));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        final DoubleBlockHalf cgf8 = cfj1.<DoubleBlockHalf>getValue(DoorBlock.HALF);
+        if (fz.getAxis() == Direction.Axis.Y && cgf8 == DoubleBlockHalf.LOWER == (fz == Direction.UP)) {
+            if (cfj3.is(this) && cfj3.<DoubleBlockHalf>getValue(DoorBlock.HALF) != cgf8) {
+                return (((((StateHolder<O, BlockState>)cfj1).setValue((Property<Comparable>)DoorBlock.FACING, (Comparable)cfj3.<V>getValue((Property<V>)DoorBlock.FACING))).setValue((Property<Comparable>)DoorBlock.OPEN, (Comparable)cfj3.<V>getValue((Property<V>)DoorBlock.OPEN))).setValue(DoorBlock.HINGE, (Comparable)cfj3.<V>getValue((Property<V>)DoorBlock.HINGE))).<Comparable, Comparable>setValue((Property<Comparable>)DoorBlock.POWERED, (Comparable)cfj3.<V>getValue((Property<V>)DoorBlock.POWERED));
             }
             return Blocks.AIR.defaultBlockState();
         }
         else {
-            if (bzg8 == DoubleBlockHalf.LOWER && fp == Direction.DOWN && !byj1.canSurvive(bjx, fk5)) {
+            if (cgf8 == DoubleBlockHalf.LOWER && fz == Direction.DOWN && !cfj1.canSurvive(bqc, fu5)) {
                 return Blocks.AIR.defaultBlockState();
             }
-            return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+            return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
         }
     }
     
     @Override
-    public void playerDestroy(final Level bjw, final Player ayj, final BlockPos fk, final BlockState byj, @Nullable final BlockEntity bwl, final ItemStack ben) {
-        super.playerDestroy(bjw, ayj, fk, Blocks.AIR.defaultBlockState(), bwl, ben);
-    }
-    
-    @Override
-    public void playerWillDestroy(final Level bjw, final BlockPos fk, final BlockState byj, final Player ayj) {
-        final DoubleBlockHalf bzg6 = byj.<DoubleBlockHalf>getValue(DoorBlock.HALF);
-        final BlockPos fk2 = (bzg6 == DoubleBlockHalf.LOWER) ? fk.above() : fk.below();
-        final BlockState byj2 = bjw.getBlockState(fk2);
-        if (byj2.getBlock() == this && byj2.<DoubleBlockHalf>getValue(DoorBlock.HALF) != bzg6) {
-            bjw.setBlock(fk2, Blocks.AIR.defaultBlockState(), 35);
-            bjw.levelEvent(ayj, 2001, fk2, Block.getId(byj2));
-            final ItemStack ben9 = ayj.getMainHandItem();
-            if (!bjw.isClientSide && !ayj.isCreative() && ayj.canDestroy(byj2)) {
-                Block.dropResources(byj, bjw, fk, null, ayj, ben9);
-                Block.dropResources(byj2, bjw, fk2, null, ayj, ben9);
-            }
+    public void playerWillDestroy(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        if (!bqb.isClientSide && bec.isCreative()) {
+            DoublePlantBlock.preventCreativeDropFromBottomPart(bqb, fu, cfj, bec);
         }
-        super.playerWillDestroy(bjw, fk, byj, ayj);
+        super.playerWillDestroy(bqb, fu, cfj, bec);
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
-        switch (cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        switch (czg) {
             case LAND: {
-                return byj.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN);
+                return cfj.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN);
             }
             case WATER: {
                 return false;
             }
             case AIR: {
-                return byj.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN);
+                return cfj.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN);
             }
             default: {
                 return false;
@@ -138,119 +123,119 @@ public class DoorBlock extends Block {
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockPos fk3 = bcq.getClickedPos();
-        if (fk3.getY() < 255 && bcq.getLevel().getBlockState(fk3.above()).canBeReplaced(bcq)) {
-            final Level bjw4 = bcq.getLevel();
-            final boolean boolean5 = bjw4.hasNeighborSignal(fk3) || bjw4.hasNeighborSignal(fk3.above());
-            return ((((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)DoorBlock.FACING, bcq.getHorizontalDirection())).setValue(DoorBlock.HINGE, this.getHinge(bcq))).setValue((Property<Comparable>)DoorBlock.POWERED, boolean5)).setValue((Property<Comparable>)DoorBlock.OPEN, boolean5)).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.LOWER);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockPos fu3 = bin.getClickedPos();
+        if (fu3.getY() < 255 && bin.getLevel().getBlockState(fu3.above()).canBeReplaced(bin)) {
+            final Level bqb4 = bin.getLevel();
+            final boolean boolean5 = bqb4.hasNeighborSignal(fu3) || bqb4.hasNeighborSignal(fu3.above());
+            return ((((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)DoorBlock.FACING, bin.getHorizontalDirection())).setValue(DoorBlock.HINGE, this.getHinge(bin))).setValue((Property<Comparable>)DoorBlock.POWERED, boolean5)).setValue((Property<Comparable>)DoorBlock.OPEN, boolean5)).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.LOWER);
         }
         return null;
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        bjw.setBlock(fk.above(), ((AbstractStateHolder<O, BlockState>)byj).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.UPPER), 3);
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        bqb.setBlock(fu.above(), ((StateHolder<O, BlockState>)cfj).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.UPPER), 3);
     }
     
-    private DoorHingeSide getHinge(final BlockPlaceContext bcq) {
-        final BlockGetter bjg3 = bcq.getLevel();
-        final BlockPos fk4 = bcq.getClickedPos();
-        final Direction fp5 = bcq.getHorizontalDirection();
-        final BlockPos fk5 = fk4.above();
-        final Direction fp6 = fp5.getCounterClockWise();
-        final BlockPos fk6 = fk4.relative(fp6);
-        final BlockState byj9 = bjg3.getBlockState(fk6);
-        final BlockPos fk7 = fk5.relative(fp6);
-        final BlockState byj10 = bjg3.getBlockState(fk7);
-        final Direction fp7 = fp5.getClockWise();
-        final BlockPos fk8 = fk4.relative(fp7);
-        final BlockState byj11 = bjg3.getBlockState(fk8);
-        final BlockPos fk9 = fk5.relative(fp7);
-        final BlockState byj12 = bjg3.getBlockState(fk9);
-        final int integer17 = (byj9.isCollisionShapeFullBlock(bjg3, fk6) ? -1 : 0) + (byj10.isCollisionShapeFullBlock(bjg3, fk7) ? -1 : 0) + (byj11.isCollisionShapeFullBlock(bjg3, fk8) ? 1 : 0) + (byj12.isCollisionShapeFullBlock(bjg3, fk9) ? 1 : 0);
-        final boolean boolean18 = byj9.getBlock() == this && byj9.<DoubleBlockHalf>getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER;
-        final boolean boolean19 = byj11.getBlock() == this && byj11.<DoubleBlockHalf>getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER;
+    private DoorHingeSide getHinge(final BlockPlaceContext bin) {
+        final BlockGetter bpg3 = bin.getLevel();
+        final BlockPos fu4 = bin.getClickedPos();
+        final Direction fz5 = bin.getHorizontalDirection();
+        final BlockPos fu5 = fu4.above();
+        final Direction fz6 = fz5.getCounterClockWise();
+        final BlockPos fu6 = fu4.relative(fz6);
+        final BlockState cfj9 = bpg3.getBlockState(fu6);
+        final BlockPos fu7 = fu5.relative(fz6);
+        final BlockState cfj10 = bpg3.getBlockState(fu7);
+        final Direction fz7 = fz5.getClockWise();
+        final BlockPos fu8 = fu4.relative(fz7);
+        final BlockState cfj11 = bpg3.getBlockState(fu8);
+        final BlockPos fu9 = fu5.relative(fz7);
+        final BlockState cfj12 = bpg3.getBlockState(fu9);
+        final int integer17 = (cfj9.isCollisionShapeFullBlock(bpg3, fu6) ? -1 : 0) + (cfj10.isCollisionShapeFullBlock(bpg3, fu7) ? -1 : 0) + (cfj11.isCollisionShapeFullBlock(bpg3, fu8) ? 1 : 0) + (cfj12.isCollisionShapeFullBlock(bpg3, fu9) ? 1 : 0);
+        final boolean boolean18 = cfj9.is(this) && cfj9.<DoubleBlockHalf>getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER;
+        final boolean boolean19 = cfj11.is(this) && cfj11.<DoubleBlockHalf>getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER;
         if ((boolean18 && !boolean19) || integer17 > 0) {
             return DoorHingeSide.RIGHT;
         }
         if ((boolean19 && !boolean18) || integer17 < 0) {
             return DoorHingeSide.LEFT;
         }
-        final int integer18 = fp5.getStepX();
-        final int integer19 = fp5.getStepZ();
-        final Vec3 cvl22 = bcq.getClickLocation();
-        final double double23 = cvl22.x - fk4.getX();
-        final double double24 = cvl22.z - fk4.getZ();
+        final int integer18 = fz5.getStepX();
+        final int integer19 = fz5.getStepZ();
+        final Vec3 dem22 = bin.getClickLocation();
+        final double double23 = dem22.x - fu4.getX();
+        final double double24 = dem22.z - fu4.getZ();
         return ((integer18 < 0 && double24 < 0.5) || (integer18 > 0 && double24 > 0.5) || (integer19 < 0 && double23 > 0.5) || (integer19 > 0 && double23 < 0.5)) ? DoorHingeSide.RIGHT : DoorHingeSide.LEFT;
     }
     
     @Override
-    public InteractionResult use(BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
+    public InteractionResult use(BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
         if (this.material == Material.METAL) {
             return InteractionResult.PASS;
         }
-        byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)DoorBlock.OPEN);
-        bjw.setBlock(fk, byj, 10);
-        bjw.levelEvent(ayj, ((boolean)byj.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN)) ? this.getOpenSound() : this.getCloseSound(), fk, 0);
-        return InteractionResult.SUCCESS;
+        cfj = ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)DoorBlock.OPEN);
+        bqb.setBlock(fu, cfj, 10);
+        bqb.levelEvent(bec, ((boolean)cfj.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN)) ? this.getOpenSound() : this.getCloseSound(), fu, 0);
+        return InteractionResult.sidedSuccess(bqb.isClientSide);
     }
     
-    public void setOpen(final Level bjw, final BlockPos fk, final boolean boolean3) {
-        final BlockState byj5 = bjw.getBlockState(fk);
-        if (byj5.getBlock() != this || byj5.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN) == boolean3) {
+    public void setOpen(final Level bqb, final BlockPos fu, final boolean boolean3) {
+        final BlockState cfj5 = bqb.getBlockState(fu);
+        if (!cfj5.is(this) || cfj5.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN) == boolean3) {
             return;
         }
-        bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj5).<Comparable, Boolean>setValue((Property<Comparable>)DoorBlock.OPEN, boolean3), 10);
-        this.playSound(bjw, fk, boolean3);
+        bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj5).<Comparable, Boolean>setValue((Property<Comparable>)DoorBlock.OPEN, boolean3), 10);
+        this.playSound(bqb, fu, boolean3);
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        final boolean boolean7 = bjw.hasNeighborSignal(fk3) || bjw.hasNeighborSignal(fk3.relative((byj.<DoubleBlockHalf>getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER) ? Direction.UP : Direction.DOWN));
-        if (bph != this && boolean7 != byj.<Boolean>getValue((Property<Boolean>)DoorBlock.POWERED)) {
-            if (boolean7 != byj.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN)) {
-                this.playSound(bjw, fk3, boolean7);
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        final boolean boolean7 = bqb.hasNeighborSignal(fu3) || bqb.hasNeighborSignal(fu3.relative((cfj.<DoubleBlockHalf>getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER) ? Direction.UP : Direction.DOWN));
+        if (bvr != this && boolean7 != cfj.<Boolean>getValue((Property<Boolean>)DoorBlock.POWERED)) {
+            if (boolean7 != cfj.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN)) {
+                this.playSound(bqb, fu3, boolean7);
             }
-            bjw.setBlock(fk3, (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)DoorBlock.POWERED, boolean7)).<Comparable, Boolean>setValue((Property<Comparable>)DoorBlock.OPEN, boolean7), 2);
+            bqb.setBlock(fu3, (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)DoorBlock.POWERED, boolean7)).<Comparable, Boolean>setValue((Property<Comparable>)DoorBlock.OPEN, boolean7), 2);
         }
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        final BlockState byj2 = bjz.getBlockState(fk2);
-        if (byj.<DoubleBlockHalf>getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER) {
-            return byj2.isFaceSturdy(bjz, fk2, Direction.UP);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj2 = bqd.getBlockState(fu2);
+        if (cfj.<DoubleBlockHalf>getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER) {
+            return cfj2.isFaceSturdy(bqd, fu2, Direction.UP);
         }
-        return byj2.getBlock() == this;
+        return cfj2.is(this);
     }
     
-    private void playSound(final Level bjw, final BlockPos fk, final boolean boolean3) {
-        bjw.levelEvent(null, boolean3 ? this.getOpenSound() : this.getCloseSound(), fk, 0);
+    private void playSound(final Level bqb, final BlockPos fu, final boolean boolean3) {
+        bqb.levelEvent(null, boolean3 ? this.getOpenSound() : this.getCloseSound(), fu, 0);
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.DESTROY;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)DoorBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)DoorBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)DoorBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)DoorBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        if (bsu == Mirror.NONE) {
-            return byj;
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        if (bzj == Mirror.NONE) {
+            return cfj;
         }
-        return ((AbstractStateHolder<O, BlockState>)byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)DoorBlock.FACING)))).<DoorHingeSide>cycle(DoorBlock.HINGE);
+        return ((StateHolder<O, BlockState>)cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)DoorBlock.FACING)))).<DoorHingeSide>cycle(DoorBlock.HINGE);
     }
     
     @Override
-    public long getSeed(final BlockState byj, final BlockPos fk) {
-        return Mth.getSeed(fk.getX(), fk.below((int)((byj.<DoubleBlockHalf>getValue(DoorBlock.HALF) != DoubleBlockHalf.LOWER) ? 1 : 0)).getY(), fk.getZ());
+    public long getSeed(final BlockState cfj, final BlockPos fu) {
+        return Mth.getSeed(fu.getX(), fu.below((int)((cfj.<DoubleBlockHalf>getValue(DoorBlock.HALF) != DoubleBlockHalf.LOWER) ? 1 : 0)).getY(), fu.getZ());
     }
     
     @Override
@@ -258,6 +243,14 @@ public class DoorBlock extends Block {
         a.add(DoorBlock.HALF, DoorBlock.FACING, DoorBlock.OPEN, DoorBlock.HINGE, DoorBlock.POWERED);
     }
     
+    public static boolean isWoodenDoor(final Level bqb, final BlockPos fu) {
+        return isWoodenDoor(bqb.getBlockState(fu));
+    }
+    
+    public static boolean isWoodenDoor(final BlockState cfj) {
+        return cfj.getBlock() instanceof DoorBlock && (cfj.getMaterial() == Material.WOOD || cfj.getMaterial() == Material.NETHER_WOOD);
+    }
+    
     static {
         FACING = HorizontalDirectionalBlock.FACING;
         OPEN = BlockStateProperties.OPEN;
diff --git a/src/net/minecraft/world/level/block/DoubleBlockCombiner.java b/src/net/minecraft/world/level/block/DoubleBlockCombiner.java
index 8834d6b..4c12943 100644
--- a/src/net/minecraft/world/level/block/DoubleBlockCombiner.java
+++ b/src/net/minecraft/world/level/block/DoubleBlockCombiner.java
@@ -13,37 +13,37 @@ import java.util.function.Function;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 
 public class DoubleBlockCombiner {
-    public static <S extends BlockEntity> NeighborCombineResult<S> combineWithNeigbour(final BlockEntityType<S> bwm, final Function<BlockState, BlockType> function2, final Function<BlockState, Direction> function3, final DirectionProperty bze, final BlockState byj, final LevelAccessor bjx, final BlockPos fk, final BiPredicate<LevelAccessor, BlockPos> biPredicate) {
-        final S bwl9 = bwm.getBlockEntity(bjx, fk);
-        if (bwl9 == null) {
+    public static <S extends BlockEntity> NeighborCombineResult<S> combineWithNeigbour(final BlockEntityType<S> cdm, final Function<BlockState, BlockType> function2, final Function<BlockState, Direction> function3, final DirectionProperty cgd, final BlockState cfj, final LevelAccessor bqc, final BlockPos fu, final BiPredicate<LevelAccessor, BlockPos> biPredicate) {
+        final S cdl9 = cdm.getBlockEntity(bqc, fu);
+        if (cdl9 == null) {
             return Combiner::acceptNone;
         }
-        if (biPredicate.test(bjx, fk)) {
+        if (biPredicate.test(bqc, fu)) {
             return Combiner::acceptNone;
         }
-        final BlockType a10 = function2.apply(byj);
+        final BlockType a10 = function2.apply(cfj);
         final boolean boolean11 = a10 == BlockType.SINGLE;
         final boolean boolean12 = a10 == BlockType.FIRST;
         if (boolean11) {
-            return new NeighborCombineResult.Single<S>(bwl9);
+            return new NeighborCombineResult.Single<S>(cdl9);
         }
-        final BlockPos fk2 = fk.relative(function3.apply(byj));
-        final BlockState byj2 = bjx.getBlockState(fk2);
-        if (byj2.getBlock() == byj.getBlock()) {
-            final BlockType a11 = function2.apply(byj2);
-            if (a11 != BlockType.SINGLE && a10 != a11 && byj2.<Comparable>getValue((Property<Comparable>)bze) == byj.<Comparable>getValue((Property<Comparable>)bze)) {
-                if (biPredicate.test(bjx, fk2)) {
+        final BlockPos fu2 = fu.relative(function3.apply(cfj));
+        final BlockState cfj2 = bqc.getBlockState(fu2);
+        if (cfj2.is(cfj.getBlock())) {
+            final BlockType a11 = function2.apply(cfj2);
+            if (a11 != BlockType.SINGLE && a10 != a11 && cfj2.<Comparable>getValue((Property<Comparable>)cgd) == cfj.<Comparable>getValue((Property<Comparable>)cgd)) {
+                if (biPredicate.test(bqc, fu2)) {
                     return Combiner::acceptNone;
                 }
-                final S bwl10 = bwm.getBlockEntity(bjx, fk2);
-                if (bwl10 != null) {
-                    final S bwl11 = boolean12 ? bwl9 : bwl10;
-                    final S bwl12 = boolean12 ? bwl10 : bwl9;
-                    return new NeighborCombineResult.Double<S>(bwl11, bwl12);
+                final S cdl10 = cdm.getBlockEntity(bqc, fu2);
+                if (cdl10 != null) {
+                    final S cdl11 = boolean12 ? cdl9 : cdl10;
+                    final S cdl12 = boolean12 ? cdl10 : cdl9;
+                    return new NeighborCombineResult.Double<S>(cdl11, cdl12);
                 }
             }
         }
-        return new NeighborCombineResult.Single<S>(bwl9);
+        return new NeighborCombineResult.Single<S>(cdl9);
     }
     
     public enum BlockType {
diff --git a/src/net/minecraft/world/level/block/DoublePlantBlock.java b/src/net/minecraft/world/level/block/DoublePlantBlock.java
index 4b8bb59..3e33e62 100644
--- a/src/net/minecraft/world/level/block/DoublePlantBlock.java
+++ b/src/net/minecraft/world/level/block/DoublePlantBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -18,6 +18,7 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 
@@ -26,69 +27,78 @@ public class DoublePlantBlock extends BushBlock {
     
     public DoublePlantBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER));
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        final DoubleBlockHalf bzg8 = byj1.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF);
-        if (fp.getAxis() == Direction.Axis.Y && bzg8 == DoubleBlockHalf.LOWER == (fp == Direction.UP) && (byj3.getBlock() != this || byj3.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) == bzg8)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        final DoubleBlockHalf cgf8 = cfj1.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF);
+        if (fz.getAxis() == Direction.Axis.Y && cgf8 == DoubleBlockHalf.LOWER == (fz == Direction.UP) && (!cfj3.is(this) || cfj3.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) == cgf8)) {
             return Blocks.AIR.defaultBlockState();
         }
-        if (bzg8 == DoubleBlockHalf.LOWER && fp == Direction.DOWN && !byj1.canSurvive(bjx, fk5)) {
+        if (cgf8 == DoubleBlockHalf.LOWER && fz == Direction.DOWN && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockPos fk3 = bcq.getClickedPos();
-        if (fk3.getY() < 255 && bcq.getLevel().getBlockState(fk3.above()).canBeReplaced(bcq)) {
-            return super.getStateForPlacement(bcq);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockPos fu3 = bin.getClickedPos();
+        if (fu3.getY() < 255 && bin.getLevel().getBlockState(fu3.above()).canBeReplaced(bin)) {
+            return super.getStateForPlacement(bin);
         }
         return null;
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        bjw.setBlock(fk.above(), ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoublePlantBlock.HALF, DoubleBlockHalf.UPPER), 3);
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        bqb.setBlock(fu.above(), ((StateHolder<O, BlockState>)this.defaultBlockState()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoublePlantBlock.HALF, DoubleBlockHalf.UPPER), 3);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        if (byj.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.UPPER) {
-            final BlockState byj2 = bjz.getBlockState(fk.below());
-            return byj2.getBlock() == this && byj2.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.LOWER;
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        if (cfj.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.UPPER) {
+            final BlockState cfj2 = bqd.getBlockState(fu.below());
+            return cfj2.is(this) && cfj2.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.LOWER;
         }
-        return super.canSurvive(byj, bjz, fk);
+        return super.canSurvive(cfj, bqd, fu);
     }
     
-    public void placeAt(final LevelAccessor bjx, final BlockPos fk, final int integer) {
-        bjx.setBlock(fk, ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER), integer);
-        bjx.setBlock(fk.above(), ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoublePlantBlock.HALF, DoubleBlockHalf.UPPER), integer);
+    public void placeAt(final LevelAccessor bqc, final BlockPos fu, final int integer) {
+        bqc.setBlock(fu, ((StateHolder<O, BlockState>)this.defaultBlockState()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER), integer);
+        bqc.setBlock(fu.above(), ((StateHolder<O, BlockState>)this.defaultBlockState()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoublePlantBlock.HALF, DoubleBlockHalf.UPPER), integer);
     }
     
     @Override
-    public void playerDestroy(final Level bjw, final Player ayj, final BlockPos fk, final BlockState byj, @Nullable final BlockEntity bwl, final ItemStack ben) {
-        super.playerDestroy(bjw, ayj, fk, Blocks.AIR.defaultBlockState(), bwl, ben);
-    }
-    
-    @Override
-    public void playerWillDestroy(final Level bjw, final BlockPos fk, final BlockState byj, final Player ayj) {
-        final DoubleBlockHalf bzg6 = byj.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF);
-        final BlockPos fk2 = (bzg6 == DoubleBlockHalf.LOWER) ? fk.above() : fk.below();
-        final BlockState byj2 = bjw.getBlockState(fk2);
-        if (byj2.getBlock() == this && byj2.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) != bzg6) {
-            bjw.setBlock(fk2, Blocks.AIR.defaultBlockState(), 35);
-            bjw.levelEvent(ayj, 2001, fk2, Block.getId(byj2));
-            if (!bjw.isClientSide && !ayj.isCreative()) {
-                Block.dropResources(byj, bjw, fk, null, ayj, ayj.getMainHandItem());
-                Block.dropResources(byj2, bjw, fk2, null, ayj, ayj.getMainHandItem());
+    public void playerWillDestroy(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        if (!bqb.isClientSide) {
+            if (bec.isCreative()) {
+                preventCreativeDropFromBottomPart(bqb, fu, cfj, bec);
+            }
+            else {
+                Block.dropResources(cfj, bqb, fu, null, bec, bec.getMainHandItem());
+            }
+        }
+        super.playerWillDestroy(bqb, fu, cfj, bec);
+    }
+    
+    @Override
+    public void playerDestroy(final Level bqb, final Player bec, final BlockPos fu, final BlockState cfj, @Nullable final BlockEntity cdl, final ItemStack bki) {
+        super.playerDestroy(bqb, bec, fu, Blocks.AIR.defaultBlockState(), cdl, bki);
+    }
+    
+    protected static void preventCreativeDropFromBottomPart(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        final DoubleBlockHalf cgf5 = cfj.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF);
+        if (cgf5 == DoubleBlockHalf.UPPER) {
+            final BlockPos fu2 = fu.below();
+            final BlockState cfj2 = bqb.getBlockState(fu2);
+            if (cfj2.getBlock() == cfj.getBlock() && cfj2.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.LOWER) {
+                bqb.setBlock(fu2, Blocks.AIR.defaultBlockState(), 35);
+                bqb.levelEvent(bec, 2001, fu2, Block.getId(cfj2));
             }
         }
-        super.playerWillDestroy(bjw, fk, byj, ayj);
     }
     
     @Override
@@ -102,8 +112,8 @@ public class DoublePlantBlock extends BushBlock {
     }
     
     @Override
-    public long getSeed(final BlockState byj, final BlockPos fk) {
-        return Mth.getSeed(fk.getX(), fk.below((int)((byj.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) != DoubleBlockHalf.LOWER) ? 1 : 0)).getY(), fk.getZ());
+    public long getSeed(final BlockState cfj, final BlockPos fu) {
+        return Mth.getSeed(fu.getX(), fu.below((int)((cfj.<DoubleBlockHalf>getValue(DoublePlantBlock.HALF) != DoubleBlockHalf.LOWER) ? 1 : 0)).getY(), fu.getZ());
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/DragonEggBlock.java b/src/net/minecraft/world/level/block/DragonEggBlock.java
index 72a7d9b..ce56872 100644
--- a/src/net/minecraft/world/level/block/DragonEggBlock.java
+++ b/src/net/minecraft/world/level/block/DragonEggBlock.java
@@ -1,7 +1,6 @@
 package net.minecraft.world.level.block;
 
 import net.minecraft.world.level.pathfinder.PathComputationType;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.util.Mth;
@@ -14,6 +13,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class DragonEggBlock extends FallingBlock {
@@ -24,40 +24,40 @@ public class DragonEggBlock extends FallingBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return DragonEggBlock.SHAPE;
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        this.teleport(byj, bjw, fk);
-        return InteractionResult.SUCCESS;
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        this.teleport(cfj, bqb, fu);
+        return InteractionResult.sidedSuccess(bqb.isClientSide);
     }
     
     @Override
-    public void attack(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj) {
-        this.teleport(byj, bjw, fk);
+    public void attack(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec) {
+        this.teleport(cfj, bqb, fu);
     }
     
-    private void teleport(final BlockState byj, final Level bjw, final BlockPos fk) {
+    private void teleport(final BlockState cfj, final Level bqb, final BlockPos fu) {
         for (int integer5 = 0; integer5 < 1000; ++integer5) {
-            final BlockPos fk2 = fk.offset(bjw.random.nextInt(16) - bjw.random.nextInt(16), bjw.random.nextInt(8) - bjw.random.nextInt(8), bjw.random.nextInt(16) - bjw.random.nextInt(16));
-            if (bjw.getBlockState(fk2).isAir()) {
-                if (bjw.isClientSide) {
+            final BlockPos fu2 = fu.offset(bqb.random.nextInt(16) - bqb.random.nextInt(16), bqb.random.nextInt(8) - bqb.random.nextInt(8), bqb.random.nextInt(16) - bqb.random.nextInt(16));
+            if (bqb.getBlockState(fu2).isAir()) {
+                if (bqb.isClientSide) {
                     for (int integer6 = 0; integer6 < 128; ++integer6) {
-                        final double double8 = bjw.random.nextDouble();
-                        final float float10 = (bjw.random.nextFloat() - 0.5f) * 0.2f;
-                        final float float11 = (bjw.random.nextFloat() - 0.5f) * 0.2f;
-                        final float float12 = (bjw.random.nextFloat() - 0.5f) * 0.2f;
-                        final double double9 = Mth.lerp(double8, fk2.getX(), fk.getX()) + (bjw.random.nextDouble() - 0.5) + 0.5;
-                        final double double10 = Mth.lerp(double8, fk2.getY(), fk.getY()) + bjw.random.nextDouble() - 0.5;
-                        final double double11 = Mth.lerp(double8, fk2.getZ(), fk.getZ()) + (bjw.random.nextDouble() - 0.5) + 0.5;
-                        bjw.addParticle(ParticleTypes.PORTAL, double9, double10, double11, float10, float11, float12);
+                        final double double8 = bqb.random.nextDouble();
+                        final float float10 = (bqb.random.nextFloat() - 0.5f) * 0.2f;
+                        final float float11 = (bqb.random.nextFloat() - 0.5f) * 0.2f;
+                        final float float12 = (bqb.random.nextFloat() - 0.5f) * 0.2f;
+                        final double double9 = Mth.lerp(double8, fu2.getX(), fu.getX()) + (bqb.random.nextDouble() - 0.5) + 0.5;
+                        final double double10 = Mth.lerp(double8, fu2.getY(), fu.getY()) + bqb.random.nextDouble() - 0.5;
+                        final double double11 = Mth.lerp(double8, fu2.getZ(), fu.getZ()) + (bqb.random.nextDouble() - 0.5) + 0.5;
+                        bqb.addParticle(ParticleTypes.PORTAL, double9, double10, double11, float10, float11, float12);
                     }
                 }
                 else {
-                    bjw.setBlock(fk2, byj, 2);
-                    bjw.removeBlock(fk, false);
+                    bqb.setBlock(fu2, cfj, 2);
+                    bqb.removeBlock(fu, false);
                 }
                 return;
             }
@@ -65,12 +65,12 @@ public class DragonEggBlock extends FallingBlock {
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
+    protected int getDelayAfterPlace() {
         return 5;
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/DropperBlock.java b/src/net/minecraft/world/level/block/DropperBlock.java
index 2cb315c..069c3b7 100644
--- a/src/net/minecraft/world/level/block/DropperBlock.java
+++ b/src/net/minecraft/world/level/block/DropperBlock.java
@@ -14,6 +14,7 @@ import net.minecraft.world.level.block.entity.DropperBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.core.dispenser.DispenseItemBehavior;
 
 public class DropperBlock extends DispenserBlock {
@@ -24,45 +25,45 @@ public class DropperBlock extends DispenserBlock {
     }
     
     @Override
-    protected DispenseItemBehavior getDispenseMethod(final ItemStack ben) {
+    protected DispenseItemBehavior getDispenseMethod(final ItemStack bki) {
         return DropperBlock.DISPENSE_BEHAVIOUR;
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new DropperBlockEntity();
     }
     
     @Override
-    protected void dispenseFrom(final Level bjw, final BlockPos fk) {
-        final BlockSourceImpl fm4 = new BlockSourceImpl(bjw, fk);
-        final DispenserBlockEntity bwu5 = fm4.<DispenserBlockEntity>getEntity();
-        final int integer6 = bwu5.getRandomSlot();
+    protected void dispenseFrom(final Level bqb, final BlockPos fu) {
+        final BlockSourceImpl fw4 = new BlockSourceImpl(bqb, fu);
+        final DispenserBlockEntity cdu5 = fw4.<DispenserBlockEntity>getEntity();
+        final int integer6 = cdu5.getRandomSlot();
         if (integer6 < 0) {
-            bjw.levelEvent(1001, fk, 0);
+            bqb.levelEvent(1001, fu, 0);
             return;
         }
-        final ItemStack ben7 = bwu5.getItem(integer6);
-        if (ben7.isEmpty()) {
+        final ItemStack bki7 = cdu5.getItem(integer6);
+        if (bki7.isEmpty()) {
             return;
         }
-        final Direction fp8 = bjw.getBlockState(fk).<Direction>getValue((Property<Direction>)DropperBlock.FACING);
-        final Container aje9 = HopperBlockEntity.getContainerAt(bjw, fk.relative(fp8));
-        ItemStack ben8;
-        if (aje9 == null) {
-            ben8 = DropperBlock.DISPENSE_BEHAVIOUR.dispense(fm4, ben7);
+        final Direction fz8 = bqb.getBlockState(fu).<Direction>getValue((Property<Direction>)DropperBlock.FACING);
+        final Container amz9 = HopperBlockEntity.getContainerAt(bqb, fu.relative(fz8));
+        ItemStack bki8;
+        if (amz9 == null) {
+            bki8 = DropperBlock.DISPENSE_BEHAVIOUR.dispense(fw4, bki7);
         }
         else {
-            ben8 = HopperBlockEntity.addItem(bwu5, aje9, ben7.copy().split(1), fp8.getOpposite());
-            if (ben8.isEmpty()) {
-                ben8 = ben7.copy();
-                ben8.shrink(1);
+            bki8 = HopperBlockEntity.addItem(cdu5, amz9, bki7.copy().split(1), fz8.getOpposite());
+            if (bki8.isEmpty()) {
+                bki8 = bki7.copy();
+                bki8.shrink(1);
             }
             else {
-                ben8 = ben7.copy();
+                bki8 = bki7.copy();
             }
         }
-        bwu5.setItem(integer6, ben8);
+        cdu5.setItem(integer6, bki8);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/EnchantmentTableBlock.java b/src/net/minecraft/world/level/block/EnchantmentTableBlock.java
index a347ccf..57bd1bb 100644
--- a/src/net/minecraft/world/level/block/EnchantmentTableBlock.java
+++ b/src/net/minecraft/world/level/block/EnchantmentTableBlock.java
@@ -26,6 +26,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class EnchantmentTableBlock extends BaseEntityBlock {
@@ -36,18 +37,18 @@ public class EnchantmentTableBlock extends BaseEntityBlock {
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return EnchantmentTableBlock.SHAPE;
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        super.animateTick(byj, bjw, fk, random);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        super.animateTick(cfj, bqb, fu, random);
         for (int integer6 = -2; integer6 <= 2; ++integer6) {
             for (int integer7 = -2; integer7 <= 2; ++integer7) {
                 if (integer6 > -2 && integer6 < 2 && integer7 == -1) {
@@ -55,12 +56,12 @@ public class EnchantmentTableBlock extends BaseEntityBlock {
                 }
                 if (random.nextInt(16) == 0) {
                     for (int integer8 = 0; integer8 <= 1; ++integer8) {
-                        final BlockPos fk2 = fk.offset(integer6, integer8, integer7);
-                        if (bjw.getBlockState(fk2).getBlock() == Blocks.BOOKSHELF) {
-                            if (!bjw.isEmptyBlock(fk.offset(integer6 / 2, 0, integer7 / 2))) {
+                        final BlockPos fu2 = fu.offset(integer6, integer8, integer7);
+                        if (bqb.getBlockState(fu2).is(Blocks.BOOKSHELF)) {
+                            if (!bqb.isEmptyBlock(fu.offset(integer6 / 2, 0, integer7 / 2))) {
                                 break;
                             }
-                            bjw.addParticle(ParticleTypes.ENCHANT, fk.getX() + 0.5, fk.getY() + 2.0, fk.getZ() + 0.5, integer6 + random.nextFloat() - 0.5, integer8 - random.nextFloat() - 1.0f, integer7 + random.nextFloat() - 0.5);
+                            bqb.addParticle(ParticleTypes.ENCHANT, fu.getX() + 0.5, fu.getY() + 2.0, fu.getZ() + 0.5, integer6 + random.nextFloat() - 0.5, integer8 - random.nextFloat() - 1.0f, integer7 + random.nextFloat() - 0.5);
                         }
                     }
                 }
@@ -69,47 +70,47 @@ public class EnchantmentTableBlock extends BaseEntityBlock {
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new EnchantmentTableBlockEntity();
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        ayj.openMenu(byj.getMenuProvider(bjw, fk));
-        return InteractionResult.SUCCESS;
+        bec.openMenu(cfj.getMenuProvider(bqb, fu));
+        return InteractionResult.CONSUME;
     }
     
     @Nullable
     @Override
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        if (bwl5 instanceof EnchantmentTableBlockEntity) {
-            final Component lf6 = ((Nameable)bwl5).getDisplayName();
-            return new SimpleMenuProvider((integer, ayi, ayj) -> new EnchantmentMenu(integer, ayi, ContainerLevelAccess.create(bjw, fk)), lf6);
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        if (cdl5 instanceof EnchantmentTableBlockEntity) {
+            final Component mr6 = ((Nameable)cdl5).getDisplayName();
+            return new SimpleMenuProvider((integer, beb, bec) -> new EnchantmentMenu(integer, beb, ContainerLevelAccess.create(bqb, fu)), mr6);
         }
         return null;
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof EnchantmentTableBlockEntity) {
-                ((EnchantmentTableBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof EnchantmentTableBlockEntity) {
+                ((EnchantmentTableBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/EndGatewayBlock.java b/src/net/minecraft/world/level/block/EndGatewayBlock.java
index 84cfee8..a1948b0 100644
--- a/src/net/minecraft/world/level/block/EndGatewayBlock.java
+++ b/src/net/minecraft/world/level/block/EndGatewayBlock.java
@@ -11,6 +11,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class EndGatewayBlock extends BaseEntityBlock {
     protected EndGatewayBlock(final Properties c) {
@@ -18,43 +19,43 @@ public class EndGatewayBlock extends BaseEntityBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new TheEndGatewayBlockEntity();
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        final BlockEntity bwl6 = bjw.getBlockEntity(fk);
-        if (!(bwl6 instanceof TheEndGatewayBlockEntity)) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        final BlockEntity cdl6 = bqb.getBlockEntity(fu);
+        if (!(cdl6 instanceof TheEndGatewayBlockEntity)) {
             return;
         }
-        for (int integer7 = ((TheEndGatewayBlockEntity)bwl6).getParticleAmount(), integer8 = 0; integer8 < integer7; ++integer8) {
-            double double9 = fk.getX() + (double)random.nextFloat();
-            final double double10 = fk.getY() + (double)random.nextFloat();
-            double double11 = fk.getZ() + (double)random.nextFloat();
-            double double12 = (random.nextFloat() - 0.5) * 0.5;
-            final double double13 = (random.nextFloat() - 0.5) * 0.5;
-            double double14 = (random.nextFloat() - 0.5) * 0.5;
+        for (int integer7 = ((TheEndGatewayBlockEntity)cdl6).getParticleAmount(), integer8 = 0; integer8 < integer7; ++integer8) {
+            double double9 = fu.getX() + random.nextDouble();
+            final double double10 = fu.getY() + random.nextDouble();
+            double double11 = fu.getZ() + random.nextDouble();
+            double double12 = (random.nextDouble() - 0.5) * 0.5;
+            final double double13 = (random.nextDouble() - 0.5) * 0.5;
+            double double14 = (random.nextDouble() - 0.5) * 0.5;
             final int integer9 = random.nextInt(2) * 2 - 1;
             if (random.nextBoolean()) {
-                double11 = fk.getZ() + 0.5 + 0.25 * integer9;
+                double11 = fu.getZ() + 0.5 + 0.25 * integer9;
                 double14 = random.nextFloat() * 2.0f * integer9;
             }
             else {
-                double9 = fk.getX() + 0.5 + 0.25 * integer9;
+                double9 = fu.getX() + 0.5 + 0.25 * integer9;
                 double12 = random.nextFloat() * 2.0f * integer9;
             }
-            bjw.addParticle(ParticleTypes.PORTAL, double9, double10, double11, double12, double13, double14);
+            bqb.addParticle(ParticleTypes.PORTAL, double9, double10, double11, double12, double13, double14);
         }
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return ItemStack.EMPTY;
     }
     
     @Override
-    public boolean canBeReplaced(final BlockState byj, final Fluid coi) {
+    public boolean canBeReplaced(final BlockState cfj, final Fluid cwz) {
         return false;
     }
 }
diff --git a/src/net/minecraft/world/level/block/EndPortalBlock.java b/src/net/minecraft/world/level/block/EndPortalBlock.java
index a3c9c53..9c1aba3 100644
--- a/src/net/minecraft/world/level/block/EndPortalBlock.java
+++ b/src/net/minecraft/world/level/block/EndPortalBlock.java
@@ -5,9 +5,10 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import java.util.Random;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.shapes.CollisionContext;
@@ -16,6 +17,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.entity.TheEndPortalBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class EndPortalBlock extends BaseEntityBlock {
@@ -26,40 +28,42 @@ public class EndPortalBlock extends BaseEntityBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new TheEndPortalBlockEntity();
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return EndPortalBlock.SHAPE;
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (!bjw.isClientSide && !akq.isPassenger() && !akq.isVehicle() && akq.canChangeDimensions() && Shapes.joinIsNotEmpty(Shapes.create(akq.getBoundingBox().move(-fk.getX(), -fk.getY(), -fk.getZ())), byj.getShape(bjw, fk), BooleanOp.AND)) {
-            akq.changeDimension((bjw.dimension.getType() == DimensionType.THE_END) ? DimensionType.OVERWORLD : DimensionType.THE_END);
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (bqb instanceof ServerLevel && !aom.isPassenger() && !aom.isVehicle() && aom.canChangeDimensions() && Shapes.joinIsNotEmpty(Shapes.create(aom.getBoundingBox().move(-fu.getX(), -fu.getY(), -fu.getZ())), cfj.getShape(bqb, fu), BooleanOp.AND)) {
+            final ResourceKey<Level> ug6 = (bqb.dimension() == Level.END) ? Level.OVERWORLD : Level.END;
+            final ServerLevel zd7 = ((ServerLevel)bqb).getServer().getLevel(ug6);
+            if (zd7 == null) {
+                return;
+            }
+            aom.changeDimension(zd7);
         }
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        final double double6 = fk.getX() + (double)random.nextFloat();
-        final double double7 = fk.getY() + 0.8;
-        final double double8 = fk.getZ() + (double)random.nextFloat();
-        final double double9 = 0.0;
-        final double double10 = 0.0;
-        final double double11 = 0.0;
-        bjw.addParticle(ParticleTypes.SMOKE, double6, double7, double8, 0.0, 0.0, 0.0);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        final double double6 = fu.getX() + random.nextDouble();
+        final double double7 = fu.getY() + 0.8;
+        final double double8 = fu.getZ() + random.nextDouble();
+        bqb.addParticle(ParticleTypes.SMOKE, double6, double7, double8, 0.0, 0.0, 0.0);
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return ItemStack.EMPTY;
     }
     
     @Override
-    public boolean canBeReplaced(final BlockState byj, final Fluid coi) {
+    public boolean canBeReplaced(final BlockState cfj, final Fluid cwz) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/EndPortalFrameBlock.java b/src/net/minecraft/world/level/block/EndPortalFrameBlock.java
index cef8386..8503a76 100644
--- a/src/net/minecraft/world/level/block/EndPortalFrameBlock.java
+++ b/src/net/minecraft/world/level/block/EndPortalFrameBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
@@ -18,6 +18,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.pattern.BlockPattern;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
@@ -33,45 +34,45 @@ public class EndPortalFrameBlock extends Block {
     
     public EndPortalFrameBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)EndPortalFrameBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)EndPortalFrameBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, false));
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return byj.<Boolean>getValue((Property<Boolean>)EndPortalFrameBlock.HAS_EYE) ? EndPortalFrameBlock.FULL_SHAPE : EndPortalFrameBlock.BASE_SHAPE;
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return cfj.<Boolean>getValue((Property<Boolean>)EndPortalFrameBlock.HAS_EYE) ? EndPortalFrameBlock.FULL_SHAPE : EndPortalFrameBlock.BASE_SHAPE;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)EndPortalFrameBlock.FACING, bcq.getHorizontalDirection().getOpposite())).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, false);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)EndPortalFrameBlock.FACING, bin.getHorizontalDirection().getOpposite())).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, false);
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        if (byj.<Boolean>getValue((Property<Boolean>)EndPortalFrameBlock.HAS_EYE)) {
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)EndPortalFrameBlock.HAS_EYE)) {
             return 15;
         }
         return 0;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)EndPortalFrameBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)EndPortalFrameBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)EndPortalFrameBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)EndPortalFrameBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)EndPortalFrameBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)EndPortalFrameBlock.FACING)));
     }
     
     @Override
@@ -87,7 +88,7 @@ public class EndPortalFrameBlock extends Block {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/EndRodBlock.java b/src/net/minecraft/world/level/block/EndRodBlock.java
index 308d061..24f854e 100644
--- a/src/net/minecraft/world/level/block/EndRodBlock.java
+++ b/src/net/minecraft/world/level/block/EndRodBlock.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.material.PushReaction;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.core.particles.ParticleOptions;
@@ -14,6 +15,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class EndRodBlock extends DirectionalBlock {
@@ -23,22 +25,22 @@ public class EndRodBlock extends DirectionalBlock {
     
     protected EndRodBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)EndRodBlock.FACING, Direction.UP));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)EndRodBlock.FACING, Direction.UP));
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)EndRodBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)EndRodBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)EndRodBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)EndRodBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)EndRodBlock.FACING, bsu.mirror(byj.<Direction>getValue((Property<Direction>)EndRodBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)EndRodBlock.FACING, bzj.mirror(cfj.<Direction>getValue((Property<Direction>)EndRodBlock.FACING)));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        switch (byj.<Direction>getValue((Property<Direction>)EndRodBlock.FACING).getAxis()) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        switch (cfj.<Direction>getValue((Property<Direction>)EndRodBlock.FACING).getAxis()) {
             default: {
                 return EndRodBlock.X_AXIS_AABB;
             }
@@ -52,24 +54,24 @@ public class EndRodBlock extends DirectionalBlock {
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final Direction fp3 = bcq.getClickedFace();
-        final BlockState byj4 = bcq.getLevel().getBlockState(bcq.getClickedPos().relative(fp3.getOpposite()));
-        if (byj4.getBlock() == this && byj4.<Comparable>getValue((Property<Comparable>)EndRodBlock.FACING) == fp3) {
-            return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndRodBlock.FACING, fp3.getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final Direction fz3 = bin.getClickedFace();
+        final BlockState cfj4 = bin.getLevel().getBlockState(bin.getClickedPos().relative(fz3.getOpposite()));
+        if (cfj4.is(this) && cfj4.<Comparable>getValue((Property<Comparable>)EndRodBlock.FACING) == fz3) {
+            return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndRodBlock.FACING, fz3.getOpposite());
         }
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndRodBlock.FACING, fp3);
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndRodBlock.FACING, fz3);
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        final Direction fp6 = byj.<Direction>getValue((Property<Direction>)EndRodBlock.FACING);
-        final double double7 = fk.getX() + 0.55 - random.nextFloat() * 0.1f;
-        final double double8 = fk.getY() + 0.55 - random.nextFloat() * 0.1f;
-        final double double9 = fk.getZ() + 0.55 - random.nextFloat() * 0.1f;
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        final Direction fz6 = cfj.<Direction>getValue((Property<Direction>)EndRodBlock.FACING);
+        final double double7 = fu.getX() + 0.55 - random.nextFloat() * 0.1f;
+        final double double8 = fu.getY() + 0.55 - random.nextFloat() * 0.1f;
+        final double double9 = fu.getZ() + 0.55 - random.nextFloat() * 0.1f;
         final double double10 = 0.4f - (random.nextFloat() + random.nextFloat()) * 0.4f;
         if (random.nextInt(5) == 0) {
-            bjw.addParticle(ParticleTypes.END_ROD, double7 + fp6.getStepX() * double10, double8 + fp6.getStepY() * double10, double9 + fp6.getStepZ() * double10, random.nextGaussian() * 0.005, random.nextGaussian() * 0.005, random.nextGaussian() * 0.005);
+            bqb.addParticle(ParticleTypes.END_ROD, double7 + fz6.getStepX() * double10, double8 + fz6.getStepY() * double10, double9 + fz6.getStepZ() * double10, random.nextGaussian() * 0.005, random.nextGaussian() * 0.005, random.nextGaussian() * 0.005);
         }
     }
     
@@ -79,10 +81,15 @@ public class EndRodBlock extends DirectionalBlock {
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.NORMAL;
     }
     
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        return false;
+    }
+    
     static {
         Y_AXIS_AABB = Block.box(6.0, 0.0, 6.0, 10.0, 16.0, 10.0);
         Z_AXIS_AABB = Block.box(6.0, 6.0, 0.0, 10.0, 10.0, 16.0);
diff --git a/src/net/minecraft/world/level/block/EnderChestBlock.java b/src/net/minecraft/world/level/block/EnderChestBlock.java
index 70b80be..9150bf9 100644
--- a/src/net/minecraft/world/level/block/EnderChestBlock.java
+++ b/src/net/minecraft/world/level/block/EnderChestBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.entity.player.Inventory;
@@ -13,6 +13,7 @@ import net.minecraft.core.particles.ParticleTypes;
 import java.util.Random;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.inventory.PlayerEnderChestContainer;
+import net.minecraft.world.entity.monster.piglin.PiglinAi;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.network.chat.Component;
@@ -35,6 +36,7 @@ import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
@@ -49,79 +51,80 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
     
     protected EnderChestBlock(final Properties c) {
         super(c, () -> BlockEntityType.ENDER_CHEST);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)EnderChestBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)EnderChestBlock.WATERLOGGED, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)EnderChestBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)EnderChestBlock.WATERLOGGED, false));
     }
     
     @Override
-    public DoubleBlockCombiner.NeighborCombineResult<? extends ChestBlockEntity> combine(final BlockState byj, final Level bjw, final BlockPos fk, final boolean boolean4) {
+    public DoubleBlockCombiner.NeighborCombineResult<? extends ChestBlockEntity> combine(final BlockState cfj, final Level bqb, final BlockPos fu, final boolean boolean4) {
         return DoubleBlockCombiner.Combiner::acceptNone;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return EnderChestBlock.SHAPE;
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.ENTITYBLOCK_ANIMATED;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final FluidState coj3 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        return (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)EnderChestBlock.FACING, bcq.getHorizontalDirection().getOpposite())).<Comparable, Boolean>setValue((Property<Comparable>)EnderChestBlock.WATERLOGGED, coj3.getType() == Fluids.WATER);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final FluidState cxa3 = bin.getLevel().getFluidState(bin.getClickedPos());
+        return (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)EnderChestBlock.FACING, bin.getHorizontalDirection().getOpposite())).<Comparable, Boolean>setValue((Property<Comparable>)EnderChestBlock.WATERLOGGED, cxa3.getType() == Fluids.WATER);
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final PlayerEnderChestContainer bbs8 = ayj.getEnderChestInventory();
-        final BlockEntity bwl9 = bjw.getBlockEntity(fk);
-        if (bbs8 == null || !(bwl9 instanceof EnderChestBlockEntity)) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final PlayerEnderChestContainer bho8 = bec.getEnderChestInventory();
+        final BlockEntity cdl9 = bqb.getBlockEntity(fu);
+        if (bho8 == null || !(cdl9 instanceof EnderChestBlockEntity)) {
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
+        }
+        final BlockPos fu2 = fu.above();
+        if (bqb.getBlockState(fu2).isRedstoneConductor(bqb, fu2)) {
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
+        }
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        final BlockPos fk2 = fk.above();
-        if (bjw.getBlockState(fk2).isRedstoneConductor(bjw, fk2)) {
-            return InteractionResult.SUCCESS;
-        }
-        if (bjw.isClientSide) {
-            return InteractionResult.SUCCESS;
-        }
-        final EnderChestBlockEntity bwx11 = (EnderChestBlockEntity)bwl9;
-        bbs8.setActiveChest(bwx11);
-        ayj.openMenu(new SimpleMenuProvider((integer, ayi, ayj) -> ChestMenu.threeRows(integer, ayi, bbs8), EnderChestBlock.CONTAINER_TITLE));
-        ayj.awardStat(Stats.OPEN_ENDERCHEST);
-        return InteractionResult.SUCCESS;
+        final EnderChestBlockEntity cdx11 = (EnderChestBlockEntity)cdl9;
+        bho8.setActiveChest(cdx11);
+        bec.openMenu(new SimpleMenuProvider((integer, beb, bec) -> ChestMenu.threeRows(integer, beb, bho8), EnderChestBlock.CONTAINER_TITLE));
+        bec.awardStat(Stats.OPEN_ENDERCHEST);
+        PiglinAi.angerNearbyPiglins(bec, true);
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new EnderChestBlockEntity();
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
         for (int integer6 = 0; integer6 < 3; ++integer6) {
             final int integer7 = random.nextInt(2) * 2 - 1;
             final int integer8 = random.nextInt(2) * 2 - 1;
-            final double double9 = fk.getX() + 0.5 + 0.25 * integer7;
-            final double double10 = fk.getY() + random.nextFloat();
-            final double double11 = fk.getZ() + 0.5 + 0.25 * integer8;
+            final double double9 = fu.getX() + 0.5 + 0.25 * integer7;
+            final double double10 = fu.getY() + random.nextFloat();
+            final double double11 = fu.getZ() + 0.5 + 0.25 * integer8;
             final double double12 = random.nextFloat() * integer7;
             final double double13 = (random.nextFloat() - 0.5) * 0.125;
             final double double14 = random.nextFloat() * integer8;
-            bjw.addParticle(ParticleTypes.PORTAL, double9, double10, double11, double12, double13, double14);
+            bqb.addParticle(ParticleTypes.PORTAL, double9, double10, double11, double12, double13, double14);
         }
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)EnderChestBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)EnderChestBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)EnderChestBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)EnderChestBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)EnderChestBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)EnderChestBlock.FACING)));
     }
     
     @Override
@@ -130,23 +133,23 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)EnderChestBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)EnderChestBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)EnderChestBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)EnderChestBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
@@ -154,6 +157,6 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
         FACING = HorizontalDirectionalBlock.FACING;
         WATERLOGGED = BlockStateProperties.WATERLOGGED;
         SHAPE = Block.box(1.0, 0.0, 1.0, 15.0, 14.0, 15.0);
-        CONTAINER_TITLE = new TranslatableComponent("container.enderchest", new Object[0]);
+        CONTAINER_TITLE = new TranslatableComponent("container.enderchest");
     }
 }
diff --git a/src/net/minecraft/world/level/block/EntityBlock.java b/src/net/minecraft/world/level/block/EntityBlock.java
index 173b9d7..3501061 100644
--- a/src/net/minecraft/world/level/block/EntityBlock.java
+++ b/src/net/minecraft/world/level/block/EntityBlock.java
@@ -6,5 +6,5 @@ import net.minecraft.world.level.BlockGetter;
 
 public interface EntityBlock {
     @Nullable
-    BlockEntity newBlockEntity(final BlockGetter bjg);
+    BlockEntity newBlockEntity(final BlockGetter bpg);
 }
diff --git a/src/net/minecraft/world/level/block/FaceAttachedHorizontalDirectionalBlock.java b/src/net/minecraft/world/level/block/FaceAttachedHorizontalDirectionalBlock.java
index d7aac94..a07d572 100644
--- a/src/net/minecraft/world/level/block/FaceAttachedHorizontalDirectionalBlock.java
+++ b/src/net/minecraft/world/level/block/FaceAttachedHorizontalDirectionalBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.LevelAccessor;
 import javax.annotation.Nullable;
@@ -11,6 +11,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.AttachFace;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 
@@ -22,43 +23,43 @@ public class FaceAttachedHorizontalDirectionalBlock extends HorizontalDirectiona
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return canAttach(bjz, fk, getConnectedDirection(byj).getOpposite());
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return canAttach(bqd, fu, getConnectedDirection(cfj).getOpposite());
     }
     
-    public static boolean canAttach(final LevelReader bjz, final BlockPos fk, final Direction fp) {
-        final BlockPos fk2 = fk.relative(fp);
-        return bjz.getBlockState(fk2).isFaceSturdy(bjz, fk2, fp.getOpposite());
+    public static boolean canAttach(final LevelReader bqd, final BlockPos fu, final Direction fz) {
+        final BlockPos fu2 = fu.relative(fz);
+        return bqd.getBlockState(fu2).isFaceSturdy(bqd, fu2, fz.getOpposite());
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        for (final Direction fp6 : bcq.getNearestLookingDirections()) {
-            BlockState byj7;
-            if (fp6.getAxis() == Direction.Axis.Y) {
-                byj7 = (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue(FaceAttachedHorizontalDirectionalBlock.FACE, (fp6 == Direction.UP) ? AttachFace.CEILING : AttachFace.FLOOR)).<Comparable, Direction>setValue((Property<Comparable>)FaceAttachedHorizontalDirectionalBlock.FACING, bcq.getHorizontalDirection());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        for (final Direction fz6 : bin.getNearestLookingDirections()) {
+            BlockState cfj7;
+            if (fz6.getAxis() == Direction.Axis.Y) {
+                cfj7 = (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue(FaceAttachedHorizontalDirectionalBlock.FACE, (fz6 == Direction.UP) ? AttachFace.CEILING : AttachFace.FLOOR)).<Comparable, Direction>setValue((Property<Comparable>)FaceAttachedHorizontalDirectionalBlock.FACING, bin.getHorizontalDirection());
             }
             else {
-                byj7 = (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue(FaceAttachedHorizontalDirectionalBlock.FACE, AttachFace.WALL)).<Comparable, Direction>setValue((Property<Comparable>)FaceAttachedHorizontalDirectionalBlock.FACING, fp6.getOpposite());
+                cfj7 = (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue(FaceAttachedHorizontalDirectionalBlock.FACE, AttachFace.WALL)).<Comparable, Direction>setValue((Property<Comparable>)FaceAttachedHorizontalDirectionalBlock.FACING, fz6.getOpposite());
             }
-            if (byj7.canSurvive(bcq.getLevel(), bcq.getClickedPos())) {
-                return byj7;
+            if (cfj7.canSurvive(bin.getLevel(), bin.getClickedPos())) {
+                return cfj7;
             }
         }
         return null;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (getConnectedDirection(byj1).getOpposite() == fp && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (getConnectedDirection(cfj1).getOpposite() == fz && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
-    protected static Direction getConnectedDirection(final BlockState byj) {
-        switch (byj.<AttachFace>getValue(FaceAttachedHorizontalDirectionalBlock.FACE)) {
+    protected static Direction getConnectedDirection(final BlockState cfj) {
+        switch (cfj.<AttachFace>getValue(FaceAttachedHorizontalDirectionalBlock.FACE)) {
             case CEILING: {
                 return Direction.DOWN;
             }
@@ -66,7 +67,7 @@ public class FaceAttachedHorizontalDirectionalBlock extends HorizontalDirectiona
                 return Direction.UP;
             }
             default: {
-                return byj.<Direction>getValue((Property<Direction>)FaceAttachedHorizontalDirectionalBlock.FACING);
+                return cfj.<Direction>getValue((Property<Direction>)FaceAttachedHorizontalDirectionalBlock.FACING);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/block/FallingBlock.java b/src/net/minecraft/world/level/block/FallingBlock.java
index 004e1f2..081b5f5 100644
--- a/src/net/minecraft/world/level/block/FallingBlock.java
+++ b/src/net/minecraft/world/level/block/FallingBlock.java
@@ -1,19 +1,22 @@
 package net.minecraft.world.level.block;
 
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.BlockParticleOption;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.level.material.Material;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.FallingBlockEntity;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class FallingBlock extends Block {
     public FallingBlock(final Properties c) {
@@ -21,60 +24,58 @@ public class FallingBlock extends Block {
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        bjw.getBlockTicks().scheduleTick(fk, this, this.getTickDelay(bjw));
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        bqb.getBlockTicks().scheduleTick(fu, this, this.getDelayAfterPlace());
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        bjx.getBlockTicks().scheduleTick(fk5, this, this.getTickDelay(bjx));
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        bqc.getBlockTicks().scheduleTick(fu5, this, this.getDelayAfterPlace());
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!isFree(xd.getBlockState(fk.below())) || fk.getY() < 0) {
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!isFree(zd.getBlockState(fu.below())) || fu.getY() < 0) {
             return;
         }
-        final FallingBlockEntity awa6 = new FallingBlockEntity(xd, fk.getX() + 0.5, fk.getY(), fk.getZ() + 0.5, xd.getBlockState(fk));
-        this.falling(awa6);
-        xd.addFreshEntity(awa6);
+        final FallingBlockEntity bbf6 = new FallingBlockEntity(zd, fu.getX() + 0.5, fu.getY(), fu.getZ() + 0.5, zd.getBlockState(fu));
+        this.falling(bbf6);
+        zd.addFreshEntity(bbf6);
     }
     
-    protected void falling(final FallingBlockEntity awa) {
+    protected void falling(final FallingBlockEntity bbf) {
     }
     
-    @Override
-    public int getTickDelay(final LevelReader bjz) {
+    protected int getDelayAfterPlace() {
         return 2;
     }
     
-    public static boolean isFree(final BlockState byj) {
-        final Block bph2 = byj.getBlock();
-        final Material coo3 = byj.getMaterial();
-        return byj.isAir() || bph2 == Blocks.FIRE || coo3.isLiquid() || coo3.isReplaceable();
+    public static boolean isFree(final BlockState cfj) {
+        final Material cxd2 = cfj.getMaterial();
+        return cfj.isAir() || cfj.is(BlockTags.FIRE) || cxd2.isLiquid() || cxd2.isReplaceable();
     }
     
-    public void onLand(final Level bjw, final BlockPos fk, final BlockState byj3, final BlockState byj4) {
+    public void onLand(final Level bqb, final BlockPos fu, final BlockState cfj3, final BlockState cfj4, final FallingBlockEntity bbf) {
     }
     
-    public void onBroken(final Level bjw, final BlockPos fk) {
+    public void onBroken(final Level bqb, final BlockPos fu, final FallingBlockEntity bbf) {
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
         if (random.nextInt(16) == 0) {
-            final BlockPos fk2 = fk.below();
-            if (isFree(bjw.getBlockState(fk2))) {
-                final double double7 = fk.getX() + (double)random.nextFloat();
-                final double double8 = fk.getY() - 0.05;
-                final double double9 = fk.getZ() + (double)random.nextFloat();
-                bjw.addParticle(new BlockParticleOption(ParticleTypes.FALLING_DUST, byj), double7, double8, double9, 0.0, 0.0, 0.0);
+            final BlockPos fu2 = fu.below();
+            if (isFree(bqb.getBlockState(fu2))) {
+                final double double7 = fu.getX() + random.nextDouble();
+                final double double8 = fu.getY() - 0.05;
+                final double double9 = fu.getZ() + random.nextDouble();
+                bqb.addParticle(new BlockParticleOption(ParticleTypes.FALLING_DUST, cfj), double7, double8, double9, 0.0, 0.0, 0.0);
             }
         }
     }
     
-    public int getDustColor(final BlockState byj) {
+    public int getDustColor(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return -16777216;
     }
 }
diff --git a/src/net/minecraft/world/level/block/FarmBlock.java b/src/net/minecraft/world/level/block/FarmBlock.java
index 9aa806b..7fb0952 100644
--- a/src/net/minecraft/world/level/block/FarmBlock.java
+++ b/src/net/minecraft/world/level/block/FarmBlock.java
@@ -1,10 +1,12 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.block.state.StateDefinition;
 import java.util.Iterator;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.entity.player.Player;
@@ -23,6 +25,7 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -32,81 +35,84 @@ public class FarmBlock extends Block {
     
     protected FarmBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)FarmBlock.MOISTURE, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)FarmBlock.MOISTURE, 0));
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.UP && !byj1.canSurvive(bjx, fk5)) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.UP && !cfj1.canSurvive(bqc, fu5)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockState byj2 = bjz.getBlockState(fk.above());
-        return !byj2.getMaterial().isSolid() || byj2.getBlock() instanceof FenceGateBlock || byj2.getBlock() instanceof MovingPistonBlock;
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockState cfj2 = bqd.getBlockState(fu.above());
+        return !cfj2.getMaterial().isSolid() || cfj2.getBlock() instanceof FenceGateBlock || cfj2.getBlock() instanceof MovingPistonBlock;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        if (!this.defaultBlockState().canSurvive(bcq.getLevel(), bcq.getClickedPos())) {
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        if (!this.defaultBlockState().canSurvive(bin.getLevel(), bin.getClickedPos())) {
             return Blocks.DIRT.defaultBlockState();
         }
-        return super.getStateForPlacement(bcq);
+        return super.getStateForPlacement(bin);
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return FarmBlock.SHAPE;
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.canSurvive(xd, fk)) {
-            turnToDirt(byj, xd, fk);
-            return;
-        }
-        final int integer6 = byj.<Integer>getValue((Property<Integer>)FarmBlock.MOISTURE);
-        if (isNearWater(xd, fk) || xd.isRainingAt(fk.above())) {
-            if (integer6 < 7) {
-                xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)FarmBlock.MOISTURE, 7), 2);
-            }
-        }
-        else if (integer6 > 0) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)FarmBlock.MOISTURE, integer6 - 1), 2);
-        }
-        else if (!isUnderCrops(xd, fk)) {
-            turnToDirt(byj, xd, fk);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.canSurvive(zd, fu)) {
+            turnToDirt(cfj, zd, fu);
         }
     }
     
     @Override
-    public void fallOn(final Level bjw, final BlockPos fk, final Entity akq, final float float4) {
-        if (!bjw.isClientSide && bjw.random.nextFloat() < float4 - 0.5f && akq instanceof LivingEntity && (akq instanceof Player || bjw.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) && akq.getBbWidth() * akq.getBbWidth() * akq.getBbHeight() > 0.512f) {
-            turnToDirt(bjw.getBlockState(fk), bjw, fk);
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final int integer6 = cfj.<Integer>getValue((Property<Integer>)FarmBlock.MOISTURE);
+        if (isNearWater(zd, fu) || zd.isRainingAt(fu.above())) {
+            if (integer6 < 7) {
+                zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)FarmBlock.MOISTURE, 7), 2);
+            }
+        }
+        else if (integer6 > 0) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)FarmBlock.MOISTURE, integer6 - 1), 2);
+        }
+        else if (!isUnderCrops(zd, fu)) {
+            turnToDirt(cfj, zd, fu);
         }
-        super.fallOn(bjw, fk, akq, float4);
     }
     
-    public static void turnToDirt(final BlockState byj, final Level bjw, final BlockPos fk) {
-        bjw.setBlockAndUpdate(fk, Block.pushEntitiesUp(byj, Blocks.DIRT.defaultBlockState(), bjw, fk));
+    @Override
+    public void fallOn(final Level bqb, final BlockPos fu, final Entity aom, final float float4) {
+        if (!bqb.isClientSide && bqb.random.nextFloat() < float4 - 0.5f && aom instanceof LivingEntity && (aom instanceof Player || bqb.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) && aom.getBbWidth() * aom.getBbWidth() * aom.getBbHeight() > 0.512f) {
+            turnToDirt(bqb.getBlockState(fu), bqb, fu);
+        }
+        super.fallOn(bqb, fu, aom, float4);
     }
     
-    private static boolean isUnderCrops(final BlockGetter bjg, final BlockPos fk) {
-        final Block bph3 = bjg.getBlockState(fk.above()).getBlock();
-        return bph3 instanceof CropBlock || bph3 instanceof StemBlock || bph3 instanceof AttachedStemBlock;
+    public static void turnToDirt(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        bqb.setBlockAndUpdate(fu, Block.pushEntitiesUp(cfj, Blocks.DIRT.defaultBlockState(), bqb, fu));
     }
     
-    private static boolean isNearWater(final LevelReader bjz, final BlockPos fk) {
-        for (final BlockPos fk2 : BlockPos.betweenClosed(fk.offset(-4, 0, -4), fk.offset(4, 1, 4))) {
-            if (bjz.getFluidState(fk2).is(FluidTags.WATER)) {
+    private static boolean isUnderCrops(final BlockGetter bpg, final BlockPos fu) {
+        final Block bvr3 = bpg.getBlockState(fu.above()).getBlock();
+        return bvr3 instanceof CropBlock || bvr3 instanceof StemBlock || bvr3 instanceof AttachedStemBlock;
+    }
+    
+    private static boolean isNearWater(final LevelReader bqd, final BlockPos fu) {
+        for (final BlockPos fu2 : BlockPos.betweenClosed(fu.offset(-4, 0, -4), fu.offset(4, 1, 4))) {
+            if (bqd.getFluidState(fu2).is(FluidTags.WATER)) {
                 return true;
             }
         }
@@ -119,15 +125,10 @@ public class FarmBlock extends Block {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
-    @Override
-    public boolean isViewBlocking(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return true;
-    }
-    
     static {
         MOISTURE = BlockStateProperties.MOISTURE;
         SHAPE = Block.box(0.0, 0.0, 0.0, 16.0, 15.0, 16.0);
diff --git a/src/net/minecraft/world/level/block/FenceBlock.java b/src/net/minecraft/world/level/block/FenceBlock.java
index 9bdd71b..834d9d0 100644
--- a/src/net/minecraft/world/level/block/FenceBlock.java
+++ b/src/net/minecraft/world/level/block/FenceBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.LevelReader;
@@ -16,13 +16,16 @@ import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class FenceBlock extends CrossCollisionBlock {
@@ -30,64 +33,73 @@ public class FenceBlock extends CrossCollisionBlock {
     
     public FenceBlock(final Properties c) {
         super(2.0f, 2.0f, 16.0f, 16.0f, 24.0f, c);
-        this.registerDefaultState(((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)FenceBlock.NORTH, false)).setValue((Property<Comparable>)FenceBlock.EAST, false)).setValue((Property<Comparable>)FenceBlock.SOUTH, false)).setValue((Property<Comparable>)FenceBlock.WEST, false)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WATERLOGGED, false));
+        this.registerDefaultState(((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)FenceBlock.NORTH, false)).setValue((Property<Comparable>)FenceBlock.EAST, false)).setValue((Property<Comparable>)FenceBlock.SOUTH, false)).setValue((Property<Comparable>)FenceBlock.WEST, false)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WATERLOGGED, false));
         this.occlusionByIndex = this.makeShapes(2.0f, 1.0f, 16.0f, 6.0f, 15.0f);
     }
     
     @Override
-    public VoxelShape getOcclusionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return this.occlusionByIndex[this.getAABBIndex(byj)];
+    public VoxelShape getOcclusionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return this.occlusionByIndex[this.getAABBIndex(cfj)];
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public VoxelShape getVisualShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.getShape(cfj, bpg, fu, der);
+    }
+    
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
-    public boolean connectsTo(final BlockState byj, final boolean boolean2, final Direction fp) {
-        final Block bph5 = byj.getBlock();
-        final boolean boolean3 = bph5.is(BlockTags.FENCES) && byj.getMaterial() == this.material;
-        final boolean boolean4 = bph5 instanceof FenceGateBlock && FenceGateBlock.connectsToDirection(byj, fp);
-        return (!Block.isExceptionForConnection(bph5) && boolean2) || boolean3 || boolean4;
+    public boolean connectsTo(final BlockState cfj, final boolean boolean2, final Direction fz) {
+        final Block bvr5 = cfj.getBlock();
+        final boolean boolean3 = this.isSameFence(bvr5);
+        final boolean boolean4 = bvr5 instanceof FenceGateBlock && FenceGateBlock.connectsToDirection(cfj, fz);
+        return (!Block.isExceptionForConnection(bvr5) && boolean2) || boolean3 || boolean4;
+    }
+    
+    private boolean isSameFence(final Block bvr) {
+        return bvr.is(BlockTags.FENCES) && bvr.is(BlockTags.WOODEN_FENCES) == this.defaultBlockState().is(BlockTags.WOODEN_FENCES);
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (!bjw.isClientSide) {
-            return LeadItem.bindPlayerMobs(ayj, bjw, fk);
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (!bqb.isClientSide) {
+            return LeadItem.bindPlayerMobs(bec, bqb, fu);
         }
-        final ItemStack ben8 = ayj.getItemInHand(ajk);
-        if (ben8.getItem() == Items.LEAD) {
+        final ItemStack bki8 = bec.getItemInHand(anf);
+        if (bki8.getItem() == Items.LEAD) {
             return InteractionResult.SUCCESS;
         }
         return InteractionResult.PASS;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockGetter bjg3 = bcq.getLevel();
-        final BlockPos fk4 = bcq.getClickedPos();
-        final FluidState coj5 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        final BlockPos fk5 = fk4.north();
-        final BlockPos fk6 = fk4.east();
-        final BlockPos fk7 = fk4.south();
-        final BlockPos fk8 = fk4.west();
-        final BlockState byj10 = bjg3.getBlockState(fk5);
-        final BlockState byj11 = bjg3.getBlockState(fk6);
-        final BlockState byj12 = bjg3.getBlockState(fk7);
-        final BlockState byj13 = bjg3.getBlockState(fk8);
-        return ((((((AbstractStateHolder<O, BlockState>)super.getStateForPlacement(bcq)).setValue((Property<Comparable>)FenceBlock.NORTH, this.connectsTo(byj10, byj10.isFaceSturdy(bjg3, fk5, Direction.SOUTH), Direction.SOUTH))).setValue((Property<Comparable>)FenceBlock.EAST, this.connectsTo(byj11, byj11.isFaceSturdy(bjg3, fk6, Direction.WEST), Direction.WEST))).setValue((Property<Comparable>)FenceBlock.SOUTH, this.connectsTo(byj12, byj12.isFaceSturdy(bjg3, fk7, Direction.NORTH), Direction.NORTH))).setValue((Property<Comparable>)FenceBlock.WEST, this.connectsTo(byj13, byj13.isFaceSturdy(bjg3, fk8, Direction.EAST), Direction.EAST))).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WATERLOGGED, coj5.getType() == Fluids.WATER);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockGetter bpg3 = bin.getLevel();
+        final BlockPos fu4 = bin.getClickedPos();
+        final FluidState cxa5 = bin.getLevel().getFluidState(bin.getClickedPos());
+        final BlockPos fu5 = fu4.north();
+        final BlockPos fu6 = fu4.east();
+        final BlockPos fu7 = fu4.south();
+        final BlockPos fu8 = fu4.west();
+        final BlockState cfj10 = bpg3.getBlockState(fu5);
+        final BlockState cfj11 = bpg3.getBlockState(fu6);
+        final BlockState cfj12 = bpg3.getBlockState(fu7);
+        final BlockState cfj13 = bpg3.getBlockState(fu8);
+        return ((((((StateHolder<O, BlockState>)super.getStateForPlacement(bin)).setValue((Property<Comparable>)FenceBlock.NORTH, this.connectsTo(cfj10, cfj10.isFaceSturdy(bpg3, fu5, Direction.SOUTH), Direction.SOUTH))).setValue((Property<Comparable>)FenceBlock.EAST, this.connectsTo(cfj11, cfj11.isFaceSturdy(bpg3, fu6, Direction.WEST), Direction.WEST))).setValue((Property<Comparable>)FenceBlock.SOUTH, this.connectsTo(cfj12, cfj12.isFaceSturdy(bpg3, fu7, Direction.NORTH), Direction.NORTH))).setValue((Property<Comparable>)FenceBlock.WEST, this.connectsTo(cfj13, cfj13.isFaceSturdy(bpg3, fu8, Direction.EAST), Direction.EAST))).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WATERLOGGED, cxa5.getType() == Fluids.WATER);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)FenceBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)FenceBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        if (fp.getAxis().getPlane() == Direction.Plane.HORIZONTAL) {
-            return ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.PROPERTY_BY_DIRECTION.get(fp), this.connectsTo(byj3, byj3.isFaceSturdy(bjx, fk6, fp.getOpposite()), fp.getOpposite()));
+        if (fz.getAxis().getPlane() == Direction.Plane.HORIZONTAL) {
+            return ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.PROPERTY_BY_DIRECTION.get(fz), this.connectsTo(cfj3, cfj3.isFaceSturdy(bqc, fu6, fz.getOpposite()), fz.getOpposite()));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/FenceGateBlock.java b/src/net/minecraft/world/level/block/FenceGateBlock.java
index 64e1012..7fe6b4f 100644
--- a/src/net/minecraft/world/level/block/FenceGateBlock.java
+++ b/src/net/minecraft/world/level/block/FenceGateBlock.java
@@ -1,12 +1,13 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.item.BlockPlaceContext;
@@ -19,6 +20,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
@@ -39,54 +41,54 @@ public class FenceGateBlock extends HorizontalDirectionalBlock {
     
     public FenceGateBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)FenceGateBlock.OPEN, false)).setValue((Property<Comparable>)FenceGateBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.IN_WALL, false));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)FenceGateBlock.OPEN, false)).setValue((Property<Comparable>)FenceGateBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.IN_WALL, false));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (byj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.IN_WALL)) {
-            return (byj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == Direction.Axis.X) ? FenceGateBlock.X_SHAPE_LOW : FenceGateBlock.Z_SHAPE_LOW;
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.IN_WALL)) {
+            return (cfj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == Direction.Axis.X) ? FenceGateBlock.X_SHAPE_LOW : FenceGateBlock.Z_SHAPE_LOW;
         }
-        return (byj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == Direction.Axis.X) ? FenceGateBlock.X_SHAPE : FenceGateBlock.Z_SHAPE;
+        return (cfj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == Direction.Axis.X) ? FenceGateBlock.X_SHAPE : FenceGateBlock.Z_SHAPE;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        final Direction.Axis a8 = fp.getAxis();
-        if (byj1.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getClockWise().getAxis() == a8) {
-            final boolean boolean9 = this.isWall(byj3) || this.isWall(bjx.getBlockState(fk5.relative(fp.getOpposite())));
-            return ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.IN_WALL, boolean9);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        final Direction.Axis a8 = fz.getAxis();
+        if (cfj1.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getClockWise().getAxis() == a8) {
+            final boolean boolean9 = this.isWall(cfj3) || this.isWall(bqc.getBlockState(fu5.relative(fz.getOpposite())));
+            return ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.IN_WALL, boolean9);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (byj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN)) {
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN)) {
             return Shapes.empty();
         }
-        return (byj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == Direction.Axis.Z) ? FenceGateBlock.Z_COLLISION_SHAPE : FenceGateBlock.X_COLLISION_SHAPE;
+        return (cfj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == Direction.Axis.Z) ? FenceGateBlock.Z_COLLISION_SHAPE : FenceGateBlock.X_COLLISION_SHAPE;
     }
     
     @Override
-    public VoxelShape getOcclusionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        if (byj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.IN_WALL)) {
-            return (byj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == Direction.Axis.X) ? FenceGateBlock.X_OCCLUSION_SHAPE_LOW : FenceGateBlock.Z_OCCLUSION_SHAPE_LOW;
+    public VoxelShape getOcclusionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.IN_WALL)) {
+            return (cfj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == Direction.Axis.X) ? FenceGateBlock.X_OCCLUSION_SHAPE_LOW : FenceGateBlock.Z_OCCLUSION_SHAPE_LOW;
         }
-        return (byj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == Direction.Axis.X) ? FenceGateBlock.X_OCCLUSION_SHAPE : FenceGateBlock.Z_OCCLUSION_SHAPE;
+        return (cfj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == Direction.Axis.X) ? FenceGateBlock.X_OCCLUSION_SHAPE : FenceGateBlock.Z_OCCLUSION_SHAPE;
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
-        switch (cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        switch (czg) {
             case LAND: {
-                return byj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN);
+                return cfj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN);
             }
             case WATER: {
                 return false;
             }
             case AIR: {
-                return byj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN);
+                return cfj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN);
             }
             default: {
                 return false;
@@ -95,48 +97,48 @@ public class FenceGateBlock extends HorizontalDirectionalBlock {
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final Level bjw3 = bcq.getLevel();
-        final BlockPos fk4 = bcq.getClickedPos();
-        final boolean boolean5 = bjw3.hasNeighborSignal(fk4);
-        final Direction fp6 = bcq.getHorizontalDirection();
-        final Direction.Axis a7 = fp6.getAxis();
-        final boolean boolean6 = (a7 == Direction.Axis.Z && (this.isWall(bjw3.getBlockState(fk4.west())) || this.isWall(bjw3.getBlockState(fk4.east())))) || (a7 == Direction.Axis.X && (this.isWall(bjw3.getBlockState(fk4.north())) || this.isWall(bjw3.getBlockState(fk4.south()))));
-        return (((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)FenceGateBlock.FACING, fp6)).setValue((Property<Comparable>)FenceGateBlock.OPEN, boolean5)).setValue((Property<Comparable>)FenceGateBlock.POWERED, boolean5)).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.IN_WALL, boolean6);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final Level bqb3 = bin.getLevel();
+        final BlockPos fu4 = bin.getClickedPos();
+        final boolean boolean5 = bqb3.hasNeighborSignal(fu4);
+        final Direction fz6 = bin.getHorizontalDirection();
+        final Direction.Axis a7 = fz6.getAxis();
+        final boolean boolean6 = (a7 == Direction.Axis.Z && (this.isWall(bqb3.getBlockState(fu4.west())) || this.isWall(bqb3.getBlockState(fu4.east())))) || (a7 == Direction.Axis.X && (this.isWall(bqb3.getBlockState(fu4.north())) || this.isWall(bqb3.getBlockState(fu4.south()))));
+        return (((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)FenceGateBlock.FACING, fz6)).setValue((Property<Comparable>)FenceGateBlock.OPEN, boolean5)).setValue((Property<Comparable>)FenceGateBlock.POWERED, boolean5)).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.IN_WALL, boolean6);
     }
     
-    private boolean isWall(final BlockState byj) {
-        return byj.getBlock().is(BlockTags.WALLS);
+    private boolean isWall(final BlockState cfj) {
+        return cfj.getBlock().is(BlockTags.WALLS);
     }
     
     @Override
-    public InteractionResult use(BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (byj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN)) {
-            byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.OPEN, false);
-            bjw.setBlock(fk, byj, 10);
+    public InteractionResult use(BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN)) {
+            cfj = ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.OPEN, false);
+            bqb.setBlock(fu, cfj, 10);
         }
         else {
-            final Direction fp8 = ayj.getDirection();
-            if (byj.<Comparable>getValue((Property<Comparable>)FenceGateBlock.FACING) == fp8.getOpposite()) {
-                byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)FenceGateBlock.FACING, fp8);
+            final Direction fz8 = bec.getDirection();
+            if (cfj.<Comparable>getValue((Property<Comparable>)FenceGateBlock.FACING) == fz8.getOpposite()) {
+                cfj = ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)FenceGateBlock.FACING, fz8);
             }
-            byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.OPEN, true);
-            bjw.setBlock(fk, byj, 10);
+            cfj = ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.OPEN, true);
+            bqb.setBlock(fu, cfj, 10);
         }
-        bjw.levelEvent(ayj, ((boolean)byj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN)) ? 1008 : 1014, fk, 0);
-        return InteractionResult.SUCCESS;
+        bqb.levelEvent(bec, ((boolean)cfj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN)) ? 1008 : 1014, fu, 0);
+        return InteractionResult.sidedSuccess(bqb.isClientSide);
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (bjw.isClientSide) {
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (bqb.isClientSide) {
             return;
         }
-        final boolean boolean7 = bjw.hasNeighborSignal(fk3);
-        if (byj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.POWERED) != boolean7) {
-            bjw.setBlock(fk3, (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)FenceGateBlock.POWERED, boolean7)).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.OPEN, boolean7), 2);
-            if (byj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN) != boolean7) {
-                bjw.levelEvent(null, boolean7 ? 1008 : 1014, fk3, 0);
+        final boolean boolean7 = bqb.hasNeighborSignal(fu3);
+        if (cfj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.POWERED) != boolean7) {
+            bqb.setBlock(fu3, (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)FenceGateBlock.POWERED, boolean7)).<Comparable, Boolean>setValue((Property<Comparable>)FenceGateBlock.OPEN, boolean7), 2);
+            if (cfj.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN) != boolean7) {
+                bqb.levelEvent(null, boolean7 ? 1008 : 1014, fu3, 0);
             }
         }
     }
@@ -146,8 +148,8 @@ public class FenceGateBlock extends HorizontalDirectionalBlock {
         a.add(FenceGateBlock.FACING, FenceGateBlock.OPEN, FenceGateBlock.POWERED, FenceGateBlock.IN_WALL);
     }
     
-    public static boolean connectsToDirection(final BlockState byj, final Direction fp) {
-        return byj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == fp.getClockWise().getAxis();
+    public static boolean connectsToDirection(final BlockState cfj, final Direction fz) {
+        return cfj.<Direction>getValue((Property<Direction>)FenceGateBlock.FACING).getAxis() == fz.getClockWise().getAxis();
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/FireBlock.java b/src/net/minecraft/world/level/block/FireBlock.java
index 465495c..cad930f 100644
--- a/src/net/minecraft/world/level/block/FireBlock.java
+++ b/src/net/minecraft/world/level/block/FireBlock.java
@@ -1,40 +1,34 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import java.util.stream.Collector;
 import net.minecraft.Util;
 import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.dimension.end.TheEndDimension;
 import net.minecraft.world.level.GameRules;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
-import javax.annotation.Nullable;
 import net.minecraft.world.item.BlockPlaceContext;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.core.Direction;
 import java.util.Map;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
-public class FireBlock extends Block {
+public class FireBlock extends BaseFireBlock {
     public static final IntegerProperty AGE;
     public static final BooleanProperty NORTH;
     public static final BooleanProperty EAST;
@@ -45,101 +39,114 @@ public class FireBlock extends Block {
     private final Object2IntMap<Block> flameOdds;
     private final Object2IntMap<Block> burnOdds;
     
-    protected FireBlock(final Properties c) {
-        super(c);
+    public FireBlock(final Properties c) {
+        super(c, 1.0f);
         this.flameOdds = (Object2IntMap<Block>)new Object2IntOpenHashMap();
         this.burnOdds = (Object2IntMap<Block>)new Object2IntOpenHashMap();
-        this.registerDefaultState((((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)FireBlock.AGE, 0)).setValue((Property<Comparable>)FireBlock.NORTH, false)).setValue((Property<Comparable>)FireBlock.EAST, false)).setValue((Property<Comparable>)FireBlock.SOUTH, false)).setValue((Property<Comparable>)FireBlock.WEST, false)).<Comparable, Boolean>setValue((Property<Comparable>)FireBlock.UP, false));
+        this.registerDefaultState((((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)FireBlock.AGE, 0)).setValue((Property<Comparable>)FireBlock.NORTH, false)).setValue((Property<Comparable>)FireBlock.EAST, false)).setValue((Property<Comparable>)FireBlock.SOUTH, false)).setValue((Property<Comparable>)FireBlock.WEST, false)).<Comparable, Boolean>setValue((Property<Comparable>)FireBlock.UP, false));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return Shapes.empty();
-    }
-    
-    @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (this.canSurvive(byj1, bjx, fk5)) {
-            return ((AbstractStateHolder<O, BlockState>)this.getStateForPlacement(bjx, fk5)).<Comparable, Comparable>setValue((Property<Comparable>)FireBlock.AGE, (Comparable)byj1.<V>getValue((Property<V>)FireBlock.AGE));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (this.canSurvive(cfj1, bqc, fu5)) {
+            return this.getStateWithAge(bqc, fu5, cfj1.<Integer>getValue((Property<Integer>)FireBlock.AGE));
         }
         return Blocks.AIR.defaultBlockState();
     }
     
-    @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return this.getStateForPlacement(bcq.getLevel(), bcq.getClickedPos());
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        VoxelShape dfg6 = Shapes.empty();
+        if (cfj.<Boolean>getValue((Property<Boolean>)FireBlock.UP)) {
+            dfg6 = FireBlock.UP_AABB;
+        }
+        if (cfj.<Boolean>getValue((Property<Boolean>)FireBlock.WEST)) {
+            dfg6 = Shapes.or(dfg6, FireBlock.WEST_AABB);
+        }
+        if (cfj.<Boolean>getValue((Property<Boolean>)FireBlock.EAST)) {
+            dfg6 = Shapes.or(dfg6, FireBlock.EAST_AABB);
+        }
+        if (cfj.<Boolean>getValue((Property<Boolean>)FireBlock.NORTH)) {
+            dfg6 = Shapes.or(dfg6, FireBlock.NORTH_AABB);
+        }
+        if (cfj.<Boolean>getValue((Property<Boolean>)FireBlock.SOUTH)) {
+            dfg6 = Shapes.or(dfg6, FireBlock.SOUTH_AABB);
+        }
+        if (dfg6 == Shapes.empty()) {
+            return FireBlock.DOWN_AABB;
+        }
+        return dfg6;
     }
     
-    public BlockState getStateForPlacement(final BlockGetter bjg, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        final BlockState byj5 = bjg.getBlockState(fk2);
-        if (this.canBurn(byj5) || byj5.isFaceSturdy(bjg, fk2, Direction.UP)) {
+    @Override
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return this.getStateForPlacement(bin.getLevel(), bin.getClickedPos());
+    }
+    
+    protected BlockState getStateForPlacement(final BlockGetter bpg, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj5 = bpg.getBlockState(fu2);
+        if (this.canBurn(cfj5) || cfj5.isFaceSturdy(bpg, fu2, Direction.UP)) {
             return this.defaultBlockState();
         }
-        BlockState byj6 = this.defaultBlockState();
-        for (final Direction fp10 : Direction.values()) {
-            final BooleanProperty bzb11 = FireBlock.PROPERTY_BY_DIRECTION.get(fp10);
-            if (bzb11 != null) {
-                byj6 = ((AbstractStateHolder<O, BlockState>)byj6).<Comparable, Boolean>setValue((Property<Comparable>)bzb11, this.canBurn(bjg.getBlockState(fk.relative(fp10))));
+        BlockState cfj6 = this.defaultBlockState();
+        for (final Direction fz10 : Direction.values()) {
+            final BooleanProperty cga11 = FireBlock.PROPERTY_BY_DIRECTION.get(fz10);
+            if (cga11 != null) {
+                cfj6 = ((StateHolder<O, BlockState>)cfj6).<Comparable, Boolean>setValue((Property<Comparable>)cga11, this.canBurn(bpg.getBlockState(fu.relative(fz10))));
             }
         }
-        return byj6;
+        return cfj6;
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        return bjz.getBlockState(fk2).isFaceSturdy(bjz, fk2, Direction.UP) || this.isValidFireLocation(bjz, fk);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        return bqd.getBlockState(fu2).isFaceSturdy(bqd, fu2, Direction.UP) || this.isValidFireLocation(bqd, fu);
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return 30;
-    }
-    
-    @Override
-    public void tick(BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!xd.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
+    public void tick(BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        zd.getBlockTicks().scheduleTick(fu, this, getFireTickDelay(zd.random));
+        if (!zd.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
             return;
         }
-        if (!byj.canSurvive(xd, fk)) {
-            xd.removeBlock(fk, false);
+        if (!cfj.canSurvive(zd, fu)) {
+            zd.removeBlock(fu, false);
         }
-        final Block bph6 = xd.getBlockState(fk.below()).getBlock();
-        final boolean boolean7 = (xd.dimension instanceof TheEndDimension && bph6 == Blocks.BEDROCK) || bph6 == Blocks.NETHERRACK || bph6 == Blocks.MAGMA_BLOCK;
-        final int integer8 = byj.<Integer>getValue((Property<Integer>)FireBlock.AGE);
-        if (!boolean7 && xd.isRaining() && this.isNearRain(xd, fk) && random.nextFloat() < 0.2f + integer8 * 0.03f) {
-            xd.removeBlock(fk, false);
+        final BlockState cfj2 = zd.getBlockState(fu.below());
+        final boolean boolean7 = cfj2.is(zd.dimensionType().infiniburn());
+        final int integer8 = cfj.<Integer>getValue((Property<Integer>)FireBlock.AGE);
+        if (!boolean7 && zd.isRaining() && this.isNearRain(zd, fu) && random.nextFloat() < 0.2f + integer8 * 0.03f) {
+            zd.removeBlock(fu, false);
             return;
         }
         final int integer9 = Math.min(15, integer8 + random.nextInt(3) / 2);
         if (integer8 != integer9) {
-            byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)FireBlock.AGE, integer9);
-            xd.setBlock(fk, byj, 4);
+            cfj = ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)FireBlock.AGE, integer9);
+            zd.setBlock(fu, cfj, 4);
         }
         if (!boolean7) {
-            xd.getBlockTicks().scheduleTick(fk, this, this.getTickDelay(xd) + random.nextInt(10));
-            if (!this.isValidFireLocation(xd, fk)) {
-                final BlockPos fk2 = fk.below();
-                if (!xd.getBlockState(fk2).isFaceSturdy(xd, fk2, Direction.UP) || integer8 > 3) {
-                    xd.removeBlock(fk, false);
+            if (!this.isValidFireLocation(zd, fu)) {
+                final BlockPos fu2 = fu.below();
+                if (!zd.getBlockState(fu2).isFaceSturdy(zd, fu2, Direction.UP) || integer8 > 3) {
+                    zd.removeBlock(fu, false);
                 }
                 return;
             }
-            if (integer8 == 15 && random.nextInt(4) == 0 && !this.canBurn(xd.getBlockState(fk.below()))) {
-                xd.removeBlock(fk, false);
+            if (integer8 == 15 && random.nextInt(4) == 0 && !this.canBurn(zd.getBlockState(fu.below()))) {
+                zd.removeBlock(fu, false);
                 return;
             }
         }
-        final boolean boolean8 = xd.isHumidAt(fk);
+        final boolean boolean8 = zd.isHumidAt(fu);
         final int integer10 = boolean8 ? -50 : 0;
-        this.checkBurnOut(xd, fk.east(), 300 + integer10, random, integer8);
-        this.checkBurnOut(xd, fk.west(), 300 + integer10, random, integer8);
-        this.checkBurnOut(xd, fk.below(), 250 + integer10, random, integer8);
-        this.checkBurnOut(xd, fk.above(), 250 + integer10, random, integer8);
-        this.checkBurnOut(xd, fk.north(), 300 + integer10, random, integer8);
-        this.checkBurnOut(xd, fk.south(), 300 + integer10, random, integer8);
+        this.checkBurnOut(zd, fu.east(), 300 + integer10, random, integer8);
+        this.checkBurnOut(zd, fu.west(), 300 + integer10, random, integer8);
+        this.checkBurnOut(zd, fu.below(), 250 + integer10, random, integer8);
+        this.checkBurnOut(zd, fu.above(), 250 + integer10, random, integer8);
+        this.checkBurnOut(zd, fu.north(), 300 + integer10, random, integer8);
+        this.checkBurnOut(zd, fu.south(), 300 + integer10, random, integer8);
         final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos();
         for (int integer11 = -1; integer11 <= 1; ++integer11) {
             for (int integer12 = -1; integer12 <= 1; ++integer12) {
@@ -149,17 +156,17 @@ public class FireBlock extends Block {
                         if (integer13 > 1) {
                             integer14 += (integer13 - 1) * 100;
                         }
-                        a12.set(fk).move(integer11, integer13, integer12);
-                        final int integer15 = this.getFireOdds(xd, a12);
+                        a12.setWithOffset(fu, integer11, integer13, integer12);
+                        final int integer15 = this.getFireOdds(zd, a12);
                         if (integer15 > 0) {
-                            int integer16 = (integer15 + 40 + xd.getDifficulty().getId() * 7) / (integer8 + 30);
+                            int integer16 = (integer15 + 40 + zd.getDifficulty().getId() * 7) / (integer8 + 30);
                             if (boolean8) {
                                 integer16 /= 2;
                             }
                             if (integer16 > 0 && random.nextInt(integer14) <= integer16) {
-                                if (!xd.isRaining() || !this.isNearRain(xd, a12)) {
+                                if (!zd.isRaining() || !this.isNearRain(zd, a12)) {
                                     final int integer17 = Math.min(15, integer8 + random.nextInt(5) / 4);
-                                    xd.setBlock(a12, ((AbstractStateHolder<O, BlockState>)this.getStateForPlacement(xd, a12)).<Comparable, Integer>setValue((Property<Comparable>)FireBlock.AGE, integer17), 3);
+                                    zd.setBlock(a12, this.getStateWithAge(zd, a12, integer17), 3);
                                 }
                             }
                         }
@@ -169,140 +176,85 @@ public class FireBlock extends Block {
         }
     }
     
-    protected boolean isNearRain(final Level bjw, final BlockPos fk) {
-        return bjw.isRainingAt(fk) || bjw.isRainingAt(fk.west()) || bjw.isRainingAt(fk.east()) || bjw.isRainingAt(fk.north()) || bjw.isRainingAt(fk.south());
+    protected boolean isNearRain(final Level bqb, final BlockPos fu) {
+        return bqb.isRainingAt(fu) || bqb.isRainingAt(fu.west()) || bqb.isRainingAt(fu.east()) || bqb.isRainingAt(fu.north()) || bqb.isRainingAt(fu.south());
     }
     
-    private int getBurnOdd(final BlockState byj) {
-        if (byj.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.WATERLOGGED) && byj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED)) {
+    private int getBurnOdd(final BlockState cfj) {
+        if (cfj.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.WATERLOGGED) && cfj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED)) {
             return 0;
         }
-        return this.burnOdds.getInt(byj.getBlock());
+        return this.burnOdds.getInt(cfj.getBlock());
     }
     
-    private int getFlameOdds(final BlockState byj) {
-        if (byj.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.WATERLOGGED) && byj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED)) {
+    private int getFlameOdds(final BlockState cfj) {
+        if (cfj.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.WATERLOGGED) && cfj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED)) {
             return 0;
         }
-        return this.flameOdds.getInt(byj.getBlock());
+        return this.flameOdds.getInt(cfj.getBlock());
     }
     
-    private void checkBurnOut(final Level bjw, final BlockPos fk, final int integer3, final Random random, final int integer5) {
-        final int integer6 = this.getBurnOdd(bjw.getBlockState(fk));
+    private void checkBurnOut(final Level bqb, final BlockPos fu, final int integer3, final Random random, final int integer5) {
+        final int integer6 = this.getBurnOdd(bqb.getBlockState(fu));
         if (random.nextInt(integer3) < integer6) {
-            final BlockState byj8 = bjw.getBlockState(fk);
-            if (random.nextInt(integer5 + 10) < 5 && !bjw.isRainingAt(fk)) {
+            final BlockState cfj8 = bqb.getBlockState(fu);
+            if (random.nextInt(integer5 + 10) < 5 && !bqb.isRainingAt(fu)) {
                 final int integer7 = Math.min(integer5 + random.nextInt(5) / 4, 15);
-                bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)this.getStateForPlacement(bjw, fk)).<Comparable, Integer>setValue((Property<Comparable>)FireBlock.AGE, integer7), 3);
+                bqb.setBlock(fu, this.getStateWithAge(bqb, fu, integer7), 3);
             }
             else {
-                bjw.removeBlock(fk, false);
+                bqb.removeBlock(fu, false);
             }
-            final Block bph9 = byj8.getBlock();
-            if (bph9 instanceof TntBlock) {
-                final TntBlock tntBlock = (TntBlock)bph9;
-                TntBlock.explode(bjw, fk);
+            final Block bvr9 = cfj8.getBlock();
+            if (bvr9 instanceof TntBlock) {
+                final TntBlock tntBlock = (TntBlock)bvr9;
+                TntBlock.explode(bqb, fu);
             }
         }
     }
     
-    private boolean isValidFireLocation(final BlockGetter bjg, final BlockPos fk) {
-        for (final Direction fp7 : Direction.values()) {
-            if (this.canBurn(bjg.getBlockState(fk.relative(fp7)))) {
+    private BlockState getStateWithAge(final LevelAccessor bqc, final BlockPos fu, final int integer) {
+        final BlockState cfj5 = BaseFireBlock.getState(bqc, fu);
+        if (cfj5.is(Blocks.FIRE)) {
+            return ((StateHolder<O, BlockState>)cfj5).<Comparable, Integer>setValue((Property<Comparable>)FireBlock.AGE, integer);
+        }
+        return cfj5;
+    }
+    
+    private boolean isValidFireLocation(final BlockGetter bpg, final BlockPos fu) {
+        for (final Direction fz7 : Direction.values()) {
+            if (this.canBurn(bpg.getBlockState(fu.relative(fz7)))) {
                 return true;
             }
         }
         return false;
     }
     
-    private int getFireOdds(final LevelReader bjz, final BlockPos fk) {
-        if (!bjz.isEmptyBlock(fk)) {
+    private int getFireOdds(final LevelReader bqd, final BlockPos fu) {
+        if (!bqd.isEmptyBlock(fu)) {
             return 0;
         }
         int integer4 = 0;
-        for (final Direction fp8 : Direction.values()) {
-            final BlockState byj9 = bjz.getBlockState(fk.relative(fp8));
-            integer4 = Math.max(this.getFlameOdds(byj9), integer4);
+        for (final Direction fz8 : Direction.values()) {
+            final BlockState cfj9 = bqd.getBlockState(fu.relative(fz8));
+            integer4 = Math.max(this.getFlameOdds(cfj9), integer4);
         }
         return integer4;
     }
     
-    public boolean canBurn(final BlockState byj) {
-        return this.getFlameOdds(byj) > 0;
+    @Override
+    protected boolean canBurn(final BlockState cfj) {
+        return this.getFlameOdds(cfj) > 0;
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj4.getBlock() == byj1.getBlock()) {
-            return;
-        }
-        if ((bjw.dimension.getType() == DimensionType.OVERWORLD || bjw.dimension.getType() == DimensionType.NETHER) && ((NetherPortalBlock)Blocks.NETHER_PORTAL).trySpawnPortal(bjw, fk)) {
-            return;
-        }
-        if (!byj1.canSurvive(bjw, fk)) {
-            bjw.removeBlock(fk, false);
-            return;
-        }
-        bjw.getBlockTicks().scheduleTick(fk, this, this.getTickDelay(bjw) + bjw.random.nextInt(10));
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        super.onPlace(cfj1, bqb, fu, cfj4, boolean5);
+        bqb.getBlockTicks().scheduleTick(fu, this, getFireTickDelay(bqb.random));
     }
     
-    @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (random.nextInt(24) == 0) {
-            bjw.playLocalSound(fk.getX() + 0.5f, fk.getY() + 0.5f, fk.getZ() + 0.5f, SoundEvents.FIRE_AMBIENT, SoundSource.BLOCKS, 1.0f + random.nextFloat(), random.nextFloat() * 0.7f + 0.3f, false);
-        }
-        final BlockPos fk2 = fk.below();
-        final BlockState byj2 = bjw.getBlockState(fk2);
-        if (this.canBurn(byj2) || byj2.isFaceSturdy(bjw, fk2, Direction.UP)) {
-            for (int integer8 = 0; integer8 < 3; ++integer8) {
-                final double double9 = fk.getX() + random.nextDouble();
-                final double double10 = fk.getY() + random.nextDouble() * 0.5 + 0.5;
-                final double double11 = fk.getZ() + random.nextDouble();
-                bjw.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
-            }
-        }
-        else {
-            if (this.canBurn(bjw.getBlockState(fk.west()))) {
-                for (int integer8 = 0; integer8 < 2; ++integer8) {
-                    final double double9 = fk.getX() + random.nextDouble() * 0.10000000149011612;
-                    final double double10 = fk.getY() + random.nextDouble();
-                    final double double11 = fk.getZ() + random.nextDouble();
-                    bjw.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
-                }
-            }
-            if (this.canBurn(bjw.getBlockState(fk.east()))) {
-                for (int integer8 = 0; integer8 < 2; ++integer8) {
-                    final double double9 = fk.getX() + 1 - random.nextDouble() * 0.10000000149011612;
-                    final double double10 = fk.getY() + random.nextDouble();
-                    final double double11 = fk.getZ() + random.nextDouble();
-                    bjw.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
-                }
-            }
-            if (this.canBurn(bjw.getBlockState(fk.north()))) {
-                for (int integer8 = 0; integer8 < 2; ++integer8) {
-                    final double double9 = fk.getX() + random.nextDouble();
-                    final double double10 = fk.getY() + random.nextDouble();
-                    final double double11 = fk.getZ() + random.nextDouble() * 0.10000000149011612;
-                    bjw.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
-                }
-            }
-            if (this.canBurn(bjw.getBlockState(fk.south()))) {
-                for (int integer8 = 0; integer8 < 2; ++integer8) {
-                    final double double9 = fk.getX() + random.nextDouble();
-                    final double double10 = fk.getY() + random.nextDouble();
-                    final double double11 = fk.getZ() + 1 - random.nextDouble() * 0.10000000149011612;
-                    bjw.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
-                }
-            }
-            if (this.canBurn(bjw.getBlockState(fk.above()))) {
-                for (int integer8 = 0; integer8 < 2; ++integer8) {
-                    final double double9 = fk.getX() + random.nextDouble();
-                    final double double10 = fk.getY() + 1 - random.nextDouble() * 0.10000000149011612;
-                    final double double11 = fk.getZ() + random.nextDouble();
-                    bjw.addParticle(ParticleTypes.LARGE_SMOKE, double9, double10, double11, 0.0, 0.0, 0.0);
-                }
-            }
-        }
+    private static int getFireTickDelay(final Random random) {
+        return 30 + random.nextInt(10);
     }
     
     @Override
@@ -310,140 +262,141 @@ public class FireBlock extends Block {
         a.add(FireBlock.AGE, FireBlock.NORTH, FireBlock.EAST, FireBlock.SOUTH, FireBlock.WEST, FireBlock.UP);
     }
     
-    public void setFlammable(final Block bph, final int integer2, final int integer3) {
-        this.flameOdds.put(bph, integer2);
-        this.burnOdds.put(bph, integer3);
+    private void setFlammable(final Block bvr, final int integer2, final int integer3) {
+        this.flameOdds.put(bvr, integer2);
+        this.burnOdds.put(bvr, integer3);
     }
     
     public static void bootStrap() {
-        final FireBlock brj1 = (FireBlock)Blocks.FIRE;
-        brj1.setFlammable(Blocks.OAK_PLANKS, 5, 20);
-        brj1.setFlammable(Blocks.SPRUCE_PLANKS, 5, 20);
-        brj1.setFlammable(Blocks.BIRCH_PLANKS, 5, 20);
-        brj1.setFlammable(Blocks.JUNGLE_PLANKS, 5, 20);
-        brj1.setFlammable(Blocks.ACACIA_PLANKS, 5, 20);
-        brj1.setFlammable(Blocks.DARK_OAK_PLANKS, 5, 20);
-        brj1.setFlammable(Blocks.OAK_SLAB, 5, 20);
-        brj1.setFlammable(Blocks.SPRUCE_SLAB, 5, 20);
-        brj1.setFlammable(Blocks.BIRCH_SLAB, 5, 20);
-        brj1.setFlammable(Blocks.JUNGLE_SLAB, 5, 20);
-        brj1.setFlammable(Blocks.ACACIA_SLAB, 5, 20);
-        brj1.setFlammable(Blocks.DARK_OAK_SLAB, 5, 20);
-        brj1.setFlammable(Blocks.OAK_FENCE_GATE, 5, 20);
-        brj1.setFlammable(Blocks.SPRUCE_FENCE_GATE, 5, 20);
-        brj1.setFlammable(Blocks.BIRCH_FENCE_GATE, 5, 20);
-        brj1.setFlammable(Blocks.JUNGLE_FENCE_GATE, 5, 20);
-        brj1.setFlammable(Blocks.DARK_OAK_FENCE_GATE, 5, 20);
-        brj1.setFlammable(Blocks.ACACIA_FENCE_GATE, 5, 20);
-        brj1.setFlammable(Blocks.OAK_FENCE, 5, 20);
-        brj1.setFlammable(Blocks.SPRUCE_FENCE, 5, 20);
-        brj1.setFlammable(Blocks.BIRCH_FENCE, 5, 20);
-        brj1.setFlammable(Blocks.JUNGLE_FENCE, 5, 20);
-        brj1.setFlammable(Blocks.DARK_OAK_FENCE, 5, 20);
-        brj1.setFlammable(Blocks.ACACIA_FENCE, 5, 20);
-        brj1.setFlammable(Blocks.OAK_STAIRS, 5, 20);
-        brj1.setFlammable(Blocks.BIRCH_STAIRS, 5, 20);
-        brj1.setFlammable(Blocks.SPRUCE_STAIRS, 5, 20);
-        brj1.setFlammable(Blocks.JUNGLE_STAIRS, 5, 20);
-        brj1.setFlammable(Blocks.ACACIA_STAIRS, 5, 20);
-        brj1.setFlammable(Blocks.DARK_OAK_STAIRS, 5, 20);
-        brj1.setFlammable(Blocks.OAK_LOG, 5, 5);
-        brj1.setFlammable(Blocks.SPRUCE_LOG, 5, 5);
-        brj1.setFlammable(Blocks.BIRCH_LOG, 5, 5);
-        brj1.setFlammable(Blocks.JUNGLE_LOG, 5, 5);
-        brj1.setFlammable(Blocks.ACACIA_LOG, 5, 5);
-        brj1.setFlammable(Blocks.DARK_OAK_LOG, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_OAK_LOG, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_SPRUCE_LOG, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_BIRCH_LOG, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_JUNGLE_LOG, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_ACACIA_LOG, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_DARK_OAK_LOG, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_OAK_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_SPRUCE_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_BIRCH_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_JUNGLE_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_ACACIA_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.STRIPPED_DARK_OAK_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.OAK_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.SPRUCE_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.BIRCH_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.JUNGLE_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.ACACIA_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.DARK_OAK_WOOD, 5, 5);
-        brj1.setFlammable(Blocks.OAK_LEAVES, 30, 60);
-        brj1.setFlammable(Blocks.SPRUCE_LEAVES, 30, 60);
-        brj1.setFlammable(Blocks.BIRCH_LEAVES, 30, 60);
-        brj1.setFlammable(Blocks.JUNGLE_LEAVES, 30, 60);
-        brj1.setFlammable(Blocks.ACACIA_LEAVES, 30, 60);
-        brj1.setFlammable(Blocks.DARK_OAK_LEAVES, 30, 60);
-        brj1.setFlammable(Blocks.BOOKSHELF, 30, 20);
-        brj1.setFlammable(Blocks.TNT, 15, 100);
-        brj1.setFlammable(Blocks.GRASS, 60, 100);
-        brj1.setFlammable(Blocks.FERN, 60, 100);
-        brj1.setFlammable(Blocks.DEAD_BUSH, 60, 100);
-        brj1.setFlammable(Blocks.SUNFLOWER, 60, 100);
-        brj1.setFlammable(Blocks.LILAC, 60, 100);
-        brj1.setFlammable(Blocks.ROSE_BUSH, 60, 100);
-        brj1.setFlammable(Blocks.PEONY, 60, 100);
-        brj1.setFlammable(Blocks.TALL_GRASS, 60, 100);
-        brj1.setFlammable(Blocks.LARGE_FERN, 60, 100);
-        brj1.setFlammable(Blocks.DANDELION, 60, 100);
-        brj1.setFlammable(Blocks.POPPY, 60, 100);
-        brj1.setFlammable(Blocks.BLUE_ORCHID, 60, 100);
-        brj1.setFlammable(Blocks.ALLIUM, 60, 100);
-        brj1.setFlammable(Blocks.AZURE_BLUET, 60, 100);
-        brj1.setFlammable(Blocks.RED_TULIP, 60, 100);
-        brj1.setFlammable(Blocks.ORANGE_TULIP, 60, 100);
-        brj1.setFlammable(Blocks.WHITE_TULIP, 60, 100);
-        brj1.setFlammable(Blocks.PINK_TULIP, 60, 100);
-        brj1.setFlammable(Blocks.OXEYE_DAISY, 60, 100);
-        brj1.setFlammable(Blocks.CORNFLOWER, 60, 100);
-        brj1.setFlammable(Blocks.LILY_OF_THE_VALLEY, 60, 100);
-        brj1.setFlammable(Blocks.WITHER_ROSE, 60, 100);
-        brj1.setFlammable(Blocks.WHITE_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.ORANGE_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.MAGENTA_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.LIGHT_BLUE_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.YELLOW_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.LIME_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.PINK_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.GRAY_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.LIGHT_GRAY_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.CYAN_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.PURPLE_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.BLUE_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.BROWN_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.GREEN_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.RED_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.BLACK_WOOL, 30, 60);
-        brj1.setFlammable(Blocks.VINE, 15, 100);
-        brj1.setFlammable(Blocks.COAL_BLOCK, 5, 5);
-        brj1.setFlammable(Blocks.HAY_BLOCK, 60, 20);
-        brj1.setFlammable(Blocks.WHITE_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.ORANGE_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.MAGENTA_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.LIGHT_BLUE_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.YELLOW_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.LIME_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.PINK_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.GRAY_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.LIGHT_GRAY_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.CYAN_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.PURPLE_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.BLUE_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.BROWN_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.GREEN_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.RED_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.BLACK_CARPET, 60, 20);
-        brj1.setFlammable(Blocks.DRIED_KELP_BLOCK, 30, 60);
-        brj1.setFlammable(Blocks.BAMBOO, 60, 60);
-        brj1.setFlammable(Blocks.SCAFFOLDING, 60, 60);
-        brj1.setFlammable(Blocks.LECTERN, 30, 20);
-        brj1.setFlammable(Blocks.COMPOSTER, 5, 20);
-        brj1.setFlammable(Blocks.SWEET_BERRY_BUSH, 60, 100);
-        brj1.setFlammable(Blocks.BEEHIVE, 5, 20);
-        brj1.setFlammable(Blocks.BEE_NEST, 30, 20);
+        final FireBlock bxv1 = (FireBlock)Blocks.FIRE;
+        bxv1.setFlammable(Blocks.OAK_PLANKS, 5, 20);
+        bxv1.setFlammable(Blocks.SPRUCE_PLANKS, 5, 20);
+        bxv1.setFlammable(Blocks.BIRCH_PLANKS, 5, 20);
+        bxv1.setFlammable(Blocks.JUNGLE_PLANKS, 5, 20);
+        bxv1.setFlammable(Blocks.ACACIA_PLANKS, 5, 20);
+        bxv1.setFlammable(Blocks.DARK_OAK_PLANKS, 5, 20);
+        bxv1.setFlammable(Blocks.OAK_SLAB, 5, 20);
+        bxv1.setFlammable(Blocks.SPRUCE_SLAB, 5, 20);
+        bxv1.setFlammable(Blocks.BIRCH_SLAB, 5, 20);
+        bxv1.setFlammable(Blocks.JUNGLE_SLAB, 5, 20);
+        bxv1.setFlammable(Blocks.ACACIA_SLAB, 5, 20);
+        bxv1.setFlammable(Blocks.DARK_OAK_SLAB, 5, 20);
+        bxv1.setFlammable(Blocks.OAK_FENCE_GATE, 5, 20);
+        bxv1.setFlammable(Blocks.SPRUCE_FENCE_GATE, 5, 20);
+        bxv1.setFlammable(Blocks.BIRCH_FENCE_GATE, 5, 20);
+        bxv1.setFlammable(Blocks.JUNGLE_FENCE_GATE, 5, 20);
+        bxv1.setFlammable(Blocks.DARK_OAK_FENCE_GATE, 5, 20);
+        bxv1.setFlammable(Blocks.ACACIA_FENCE_GATE, 5, 20);
+        bxv1.setFlammable(Blocks.OAK_FENCE, 5, 20);
+        bxv1.setFlammable(Blocks.SPRUCE_FENCE, 5, 20);
+        bxv1.setFlammable(Blocks.BIRCH_FENCE, 5, 20);
+        bxv1.setFlammable(Blocks.JUNGLE_FENCE, 5, 20);
+        bxv1.setFlammable(Blocks.DARK_OAK_FENCE, 5, 20);
+        bxv1.setFlammable(Blocks.ACACIA_FENCE, 5, 20);
+        bxv1.setFlammable(Blocks.OAK_STAIRS, 5, 20);
+        bxv1.setFlammable(Blocks.BIRCH_STAIRS, 5, 20);
+        bxv1.setFlammable(Blocks.SPRUCE_STAIRS, 5, 20);
+        bxv1.setFlammable(Blocks.JUNGLE_STAIRS, 5, 20);
+        bxv1.setFlammable(Blocks.ACACIA_STAIRS, 5, 20);
+        bxv1.setFlammable(Blocks.DARK_OAK_STAIRS, 5, 20);
+        bxv1.setFlammable(Blocks.OAK_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.SPRUCE_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.BIRCH_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.JUNGLE_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.ACACIA_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.DARK_OAK_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_OAK_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_SPRUCE_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_BIRCH_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_JUNGLE_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_ACACIA_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_DARK_OAK_LOG, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_OAK_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_SPRUCE_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_BIRCH_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_JUNGLE_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_ACACIA_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.STRIPPED_DARK_OAK_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.OAK_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.SPRUCE_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.BIRCH_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.JUNGLE_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.ACACIA_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.DARK_OAK_WOOD, 5, 5);
+        bxv1.setFlammable(Blocks.OAK_LEAVES, 30, 60);
+        bxv1.setFlammable(Blocks.SPRUCE_LEAVES, 30, 60);
+        bxv1.setFlammable(Blocks.BIRCH_LEAVES, 30, 60);
+        bxv1.setFlammable(Blocks.JUNGLE_LEAVES, 30, 60);
+        bxv1.setFlammable(Blocks.ACACIA_LEAVES, 30, 60);
+        bxv1.setFlammable(Blocks.DARK_OAK_LEAVES, 30, 60);
+        bxv1.setFlammable(Blocks.BOOKSHELF, 30, 20);
+        bxv1.setFlammable(Blocks.TNT, 15, 100);
+        bxv1.setFlammable(Blocks.GRASS, 60, 100);
+        bxv1.setFlammable(Blocks.FERN, 60, 100);
+        bxv1.setFlammable(Blocks.DEAD_BUSH, 60, 100);
+        bxv1.setFlammable(Blocks.SUNFLOWER, 60, 100);
+        bxv1.setFlammable(Blocks.LILAC, 60, 100);
+        bxv1.setFlammable(Blocks.ROSE_BUSH, 60, 100);
+        bxv1.setFlammable(Blocks.PEONY, 60, 100);
+        bxv1.setFlammable(Blocks.TALL_GRASS, 60, 100);
+        bxv1.setFlammable(Blocks.LARGE_FERN, 60, 100);
+        bxv1.setFlammable(Blocks.DANDELION, 60, 100);
+        bxv1.setFlammable(Blocks.POPPY, 60, 100);
+        bxv1.setFlammable(Blocks.BLUE_ORCHID, 60, 100);
+        bxv1.setFlammable(Blocks.ALLIUM, 60, 100);
+        bxv1.setFlammable(Blocks.AZURE_BLUET, 60, 100);
+        bxv1.setFlammable(Blocks.RED_TULIP, 60, 100);
+        bxv1.setFlammable(Blocks.ORANGE_TULIP, 60, 100);
+        bxv1.setFlammable(Blocks.WHITE_TULIP, 60, 100);
+        bxv1.setFlammable(Blocks.PINK_TULIP, 60, 100);
+        bxv1.setFlammable(Blocks.OXEYE_DAISY, 60, 100);
+        bxv1.setFlammable(Blocks.CORNFLOWER, 60, 100);
+        bxv1.setFlammable(Blocks.LILY_OF_THE_VALLEY, 60, 100);
+        bxv1.setFlammable(Blocks.WITHER_ROSE, 60, 100);
+        bxv1.setFlammable(Blocks.WHITE_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.ORANGE_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.MAGENTA_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.LIGHT_BLUE_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.YELLOW_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.LIME_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.PINK_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.GRAY_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.LIGHT_GRAY_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.CYAN_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.PURPLE_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.BLUE_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.BROWN_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.GREEN_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.RED_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.BLACK_WOOL, 30, 60);
+        bxv1.setFlammable(Blocks.VINE, 15, 100);
+        bxv1.setFlammable(Blocks.COAL_BLOCK, 5, 5);
+        bxv1.setFlammable(Blocks.HAY_BLOCK, 60, 20);
+        bxv1.setFlammable(Blocks.TARGET, 15, 20);
+        bxv1.setFlammable(Blocks.WHITE_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.ORANGE_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.MAGENTA_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.LIGHT_BLUE_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.YELLOW_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.LIME_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.PINK_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.GRAY_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.LIGHT_GRAY_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.CYAN_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.PURPLE_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.BLUE_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.BROWN_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.GREEN_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.RED_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.BLACK_CARPET, 60, 20);
+        bxv1.setFlammable(Blocks.DRIED_KELP_BLOCK, 30, 60);
+        bxv1.setFlammable(Blocks.BAMBOO, 60, 60);
+        bxv1.setFlammable(Blocks.SCAFFOLDING, 60, 60);
+        bxv1.setFlammable(Blocks.LECTERN, 30, 20);
+        bxv1.setFlammable(Blocks.COMPOSTER, 5, 20);
+        bxv1.setFlammable(Blocks.SWEET_BERRY_BUSH, 60, 100);
+        bxv1.setFlammable(Blocks.BEEHIVE, 5, 20);
+        bxv1.setFlammable(Blocks.BEE_NEST, 30, 20);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/FletchingTableBlock.java b/src/net/minecraft/world/level/block/FletchingTableBlock.java
index 0b05946..4469d15 100644
--- a/src/net/minecraft/world/level/block/FletchingTableBlock.java
+++ b/src/net/minecraft/world/level/block/FletchingTableBlock.java
@@ -7,6 +7,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class FletchingTableBlock extends CraftingTableBlock {
     protected FletchingTableBlock(final Properties c) {
@@ -14,7 +15,7 @@ public class FletchingTableBlock extends CraftingTableBlock {
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
         return InteractionResult.PASS;
     }
 }
diff --git a/src/net/minecraft/world/level/block/FlowerBlock.java b/src/net/minecraft/world/level/block/FlowerBlock.java
index b1722a0..552abf3 100644
--- a/src/net/minecraft/world/level/block/FlowerBlock.java
+++ b/src/net/minecraft/world/level/block/FlowerBlock.java
@@ -5,6 +5,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -13,10 +14,10 @@ public class FlowerBlock extends BushBlock {
     private final MobEffect suspiciousStewEffect;
     private final int effectDuration;
     
-    public FlowerBlock(final MobEffect aki, final int integer, final Properties c) {
+    public FlowerBlock(final MobEffect aoe, final int integer, final Properties c) {
         super(c);
-        this.suspiciousStewEffect = aki;
-        if (aki.isInstantenous()) {
+        this.suspiciousStewEffect = aoe;
+        if (aoe.isInstantenous()) {
             this.effectDuration = integer;
         }
         else {
@@ -25,9 +26,9 @@ public class FlowerBlock extends BushBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final Vec3 cvl6 = byj.getOffset(bjg, fk);
-        return FlowerBlock.SHAPE.move(cvl6.x, cvl6.y, cvl6.z);
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final Vec3 dem6 = cfj.getOffset(bpg, fu);
+        return FlowerBlock.SHAPE.move(dem6.x, dem6.y, dem6.z);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/FlowerPotBlock.java b/src/net/minecraft/world/level/block/FlowerPotBlock.java
index 1226b6e..02f47cc 100644
--- a/src/net/minecraft/world/level/block/FlowerPotBlock.java
+++ b/src/net/minecraft/world/level/block/FlowerPotBlock.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.block;
 
 import com.google.common.collect.Maps;
+import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
@@ -18,6 +19,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import java.util.Map;
 
@@ -26,72 +28,77 @@ public class FlowerPotBlock extends Block {
     protected static final VoxelShape SHAPE;
     private final Block content;
     
-    public FlowerPotBlock(final Block bph, final Properties c) {
+    public FlowerPotBlock(final Block bvr, final Properties c) {
         super(c);
-        this.content = bph;
-        FlowerPotBlock.POTTED_BY_CONTENT.put(bph, this);
+        this.content = bvr;
+        FlowerPotBlock.POTTED_BY_CONTENT.put(bvr, this);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return FlowerPotBlock.SHAPE;
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final ItemStack ben8 = ayj.getItemInHand(ajk);
-        final Item bei9 = ben8.getItem();
-        final Block bph10 = (bei9 instanceof BlockItem) ? FlowerPotBlock.POTTED_BY_CONTENT.getOrDefault(((BlockItem)bei9).getBlock(), Blocks.AIR) : Blocks.AIR;
-        final boolean boolean11 = bph10 == Blocks.AIR;
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final ItemStack bki8 = bec.getItemInHand(anf);
+        final Item bke9 = bki8.getItem();
+        final Block bvr10 = (bke9 instanceof BlockItem) ? FlowerPotBlock.POTTED_BY_CONTENT.getOrDefault(((BlockItem)bke9).getBlock(), Blocks.AIR) : Blocks.AIR;
+        final boolean boolean11 = bvr10 == Blocks.AIR;
         final boolean boolean12 = this.content == Blocks.AIR;
         if (boolean11 != boolean12) {
             if (boolean12) {
-                bjw.setBlock(fk, bph10.defaultBlockState(), 3);
-                ayj.awardStat(Stats.POT_FLOWER);
-                if (!ayj.abilities.instabuild) {
-                    ben8.shrink(1);
+                bqb.setBlock(fu, bvr10.defaultBlockState(), 3);
+                bec.awardStat(Stats.POT_FLOWER);
+                if (!bec.abilities.instabuild) {
+                    bki8.shrink(1);
                 }
             }
             else {
-                final ItemStack ben9 = new ItemStack(this.content);
-                if (ben8.isEmpty()) {
-                    ayj.setItemInHand(ajk, ben9);
+                final ItemStack bki9 = new ItemStack(this.content);
+                if (bki8.isEmpty()) {
+                    bec.setItemInHand(anf, bki9);
                 }
-                else if (!ayj.addItem(ben9)) {
-                    ayj.drop(ben9, false);
+                else if (!bec.addItem(bki9)) {
+                    bec.drop(bki9, false);
                 }
-                bjw.setBlock(fk, Blocks.FLOWER_POT.defaultBlockState(), 3);
+                bqb.setBlock(fu, Blocks.FLOWER_POT.defaultBlockState(), 3);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
         return InteractionResult.CONSUME;
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         if (this.content == Blocks.AIR) {
-            return super.getCloneItemStack(bjg, fk, byj);
+            return super.getCloneItemStack(bpg, fu, cfj);
         }
         return new ItemStack(this.content);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     public Block getContent() {
         return this.content;
     }
     
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        return false;
+    }
+    
     static {
         POTTED_BY_CONTENT = Maps.newHashMap();
         SHAPE = Block.box(5.0, 0.0, 5.0, 11.0, 6.0, 11.0);
diff --git a/src/net/minecraft/world/level/block/FrostedIceBlock.java b/src/net/minecraft/world/level/block/FrostedIceBlock.java
index 9cd4108..fc97733 100644
--- a/src/net/minecraft/world/level/block/FrostedIceBlock.java
+++ b/src/net/minecraft/world/level/block/FrostedIceBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -14,6 +14,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
 public class FrostedIceBlock extends IceBlock {
@@ -21,52 +22,55 @@ public class FrostedIceBlock extends IceBlock {
     
     public FrostedIceBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)FrostedIceBlock.AGE, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)FrostedIceBlock.AGE, 0));
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if ((random.nextInt(3) == 0 || this.fewerNeigboursThan(xd, fk, 4)) && xd.getMaxLocalRawBrightness(fk) > 11 - byj.<Integer>getValue((Property<Integer>)FrostedIceBlock.AGE) - byj.getLightBlock(xd, fk) && this.slightlyMelt(byj, xd, fk)) {
-            try (final BlockPos.PooledMutableBlockPos b6 = BlockPos.PooledMutableBlockPos.acquire()) {
-                for (final Direction fp11 : Direction.values()) {
-                    b6.set((Vec3i)fk).move(fp11);
-                    final BlockState byj2 = xd.getBlockState(b6);
-                    if (byj2.getBlock() == this && !this.slightlyMelt(byj2, xd, b6)) {
-                        xd.getBlockTicks().scheduleTick(b6, this, Mth.nextInt(random, 20, 40));
-                    }
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        this.tick(cfj, zd, fu, random);
+    }
+    
+    @Override
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if ((random.nextInt(3) == 0 || this.fewerNeigboursThan(zd, fu, 4)) && zd.getMaxLocalRawBrightness(fu) > 11 - cfj.<Integer>getValue((Property<Integer>)FrostedIceBlock.AGE) - cfj.getLightBlock(zd, fu) && this.slightlyMelt(cfj, zd, fu)) {
+            final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
+            for (final Direction fz10 : Direction.values()) {
+                a6.setWithOffset(fu, fz10);
+                final BlockState cfj2 = zd.getBlockState(a6);
+                if (cfj2.is(this) && !this.slightlyMelt(cfj2, zd, a6)) {
+                    zd.getBlockTicks().scheduleTick(a6, this, Mth.nextInt(random, 20, 40));
                 }
             }
             return;
         }
-        xd.getBlockTicks().scheduleTick(fk, this, Mth.nextInt(random, 20, 40));
+        zd.getBlockTicks().scheduleTick(fu, this, Mth.nextInt(random, 20, 40));
     }
     
-    private boolean slightlyMelt(final BlockState byj, final Level bjw, final BlockPos fk) {
-        final int integer5 = byj.<Integer>getValue((Property<Integer>)FrostedIceBlock.AGE);
+    private boolean slightlyMelt(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        final int integer5 = cfj.<Integer>getValue((Property<Integer>)FrostedIceBlock.AGE);
         if (integer5 < 3) {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)FrostedIceBlock.AGE, integer5 + 1), 2);
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)FrostedIceBlock.AGE, integer5 + 1), 2);
             return false;
         }
-        this.melt(byj, bjw, fk);
+        this.melt(cfj, bqb, fu);
         return true;
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (bph == this && this.fewerNeigboursThan(bjw, fk3, 2)) {
-            this.melt(byj, bjw, fk3);
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (bvr == this && this.fewerNeigboursThan(bqb, fu3, 2)) {
+            this.melt(cfj, bqb, fu3);
         }
-        super.neighborChanged(byj, bjw, fk3, bph, fk5, boolean6);
+        super.neighborChanged(cfj, bqb, fu3, bvr, fu5, boolean6);
     }
     
-    private boolean fewerNeigboursThan(final BlockGetter bjg, final BlockPos fk, final int integer) {
+    private boolean fewerNeigboursThan(final BlockGetter bpg, final BlockPos fu, final int integer) {
         int integer2 = 0;
-        try (final BlockPos.PooledMutableBlockPos b6 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (final Direction fp11 : Direction.values()) {
-                b6.set((Vec3i)fk).move(fp11);
-                if (bjg.getBlockState(b6).getBlock() == this && ++integer2 >= integer) {
-                    return false;
-                }
+        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
+        for (final Direction fz10 : Direction.values()) {
+            a6.setWithOffset(fu, fz10);
+            if (bpg.getBlockState(a6).is(this) && ++integer2 >= integer) {
+                return false;
             }
         }
         return true;
@@ -78,7 +82,7 @@ public class FrostedIceBlock extends IceBlock {
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return ItemStack.EMPTY;
     }
     
diff --git a/src/net/minecraft/world/level/block/FungusBlock.java b/src/net/minecraft/world/level/block/FungusBlock.java
new file mode 100644
index 0000000..bb8f812
--- /dev/null
+++ b/src/net/minecraft/world/level/block/FungusBlock.java
@@ -0,0 +1,58 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.server.level.ServerLevel;
+import java.util.Random;
+import net.minecraft.world.level.Level;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.levelgen.feature.HugeFungusConfiguration;
+import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import java.util.function.Supplier;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public class FungusBlock extends BushBlock implements BonemealableBlock {
+    protected static final VoxelShape SHAPE;
+    private final Supplier<ConfiguredFeature<HugeFungusConfiguration, ?>> feature;
+    
+    protected FungusBlock(final Properties c, final Supplier<ConfiguredFeature<HugeFungusConfiguration, ?>> supplier) {
+        super(c);
+        this.feature = supplier;
+    }
+    
+    @Override
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return FungusBlock.SHAPE;
+    }
+    
+    @Override
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.is(BlockTags.NYLIUM) || cfj.is(Blocks.SOUL_SOIL) || super.mayPlaceOn(cfj, bpg, fu);
+    }
+    
+    @Override
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        final Block bvr6 = this.feature.get().config.validBaseState.getBlock();
+        final Block bvr7 = bpg.getBlockState(fu.below()).getBlock();
+        return bvr7 == bvr6;
+    }
+    
+    @Override
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
+        return random.nextFloat() < 0.4;
+    }
+    
+    @Override
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        this.feature.get().place(zd, zd.structureFeatureManager(), zd.getChunkSource().getGenerator(), random, fu);
+    }
+    
+    static {
+        SHAPE = Block.box(4.0, 0.0, 4.0, 12.0, 9.0, 12.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/FurnaceBlock.java b/src/net/minecraft/world/level/block/FurnaceBlock.java
index 1a2727a..5644411 100644
--- a/src/net/minecraft/world/level/block/FurnaceBlock.java
+++ b/src/net/minecraft/world/level/block/FurnaceBlock.java
@@ -16,6 +16,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.FurnaceBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class FurnaceBlock extends AbstractFurnaceBlock {
     protected FurnaceBlock(final Properties c) {
@@ -23,38 +24,38 @@ public class FurnaceBlock extends AbstractFurnaceBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new FurnaceBlockEntity();
     }
     
     @Override
-    protected void openContainer(final Level bjw, final BlockPos fk, final Player ayj) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        if (bwl5 instanceof FurnaceBlockEntity) {
-            ayj.openMenu((MenuProvider)bwl5);
-            ayj.awardStat(Stats.INTERACT_WITH_FURNACE);
+    protected void openContainer(final Level bqb, final BlockPos fu, final Player bec) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        if (cdl5 instanceof FurnaceBlockEntity) {
+            bec.openMenu((MenuProvider)cdl5);
+            bec.awardStat(Stats.INTERACT_WITH_FURNACE);
         }
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)FurnaceBlock.LIT)) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)FurnaceBlock.LIT)) {
             return;
         }
-        final double double6 = fk.getX() + 0.5;
-        final double double7 = fk.getY();
-        final double double8 = fk.getZ() + 0.5;
+        final double double6 = fu.getX() + 0.5;
+        final double double7 = fu.getY();
+        final double double8 = fu.getZ() + 0.5;
         if (random.nextDouble() < 0.1) {
-            bjw.playLocalSound(double6, double7, double8, SoundEvents.FURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0f, 1.0f, false);
+            bqb.playLocalSound(double6, double7, double8, SoundEvents.FURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0f, 1.0f, false);
         }
-        final Direction fp12 = byj.<Direction>getValue((Property<Direction>)FurnaceBlock.FACING);
-        final Direction.Axis a13 = fp12.getAxis();
+        final Direction fz12 = cfj.<Direction>getValue((Property<Direction>)FurnaceBlock.FACING);
+        final Direction.Axis a13 = fz12.getAxis();
         final double double9 = 0.52;
         final double double10 = random.nextDouble() * 0.6 - 0.3;
-        final double double11 = (a13 == Direction.Axis.X) ? (fp12.getStepX() * 0.52) : double10;
+        final double double11 = (a13 == Direction.Axis.X) ? (fz12.getStepX() * 0.52) : double10;
         final double double12 = random.nextDouble() * 6.0 / 16.0;
-        final double double13 = (a13 == Direction.Axis.Z) ? (fp12.getStepZ() * 0.52) : double10;
-        bjw.addParticle(ParticleTypes.SMOKE, double6 + double11, double7 + double12, double8 + double13, 0.0, 0.0, 0.0);
-        bjw.addParticle(ParticleTypes.FLAME, double6 + double11, double7 + double12, double8 + double13, 0.0, 0.0, 0.0);
+        final double double13 = (a13 == Direction.Axis.Z) ? (fz12.getStepZ() * 0.52) : double10;
+        bqb.addParticle(ParticleTypes.SMOKE, double6 + double11, double7 + double12, double8 + double13, 0.0, 0.0, 0.0);
+        bqb.addParticle(ParticleTypes.FLAME, double6 + double11, double7 + double12, double8 + double13, 0.0, 0.0, 0.0);
     }
 }
diff --git a/src/net/minecraft/world/level/block/GlassBlock.java b/src/net/minecraft/world/level/block/GlassBlock.java
index 8115dc9..464cd4e 100644
--- a/src/net/minecraft/world/level/block/GlassBlock.java
+++ b/src/net/minecraft/world/level/block/GlassBlock.java
@@ -1,5 +1,7 @@
 package net.minecraft.world.level.block;
 
+import net.minecraft.world.level.block.state.BlockBehaviour;
+
 public class GlassBlock extends AbstractGlassBlock {
     public GlassBlock(final Properties c) {
         super(c);
diff --git a/src/net/minecraft/world/level/block/GlazedTerracottaBlock.java b/src/net/minecraft/world/level/block/GlazedTerracottaBlock.java
index 519b8f7..37ef892 100644
--- a/src/net/minecraft/world/level/block/GlazedTerracottaBlock.java
+++ b/src/net/minecraft/world/level/block/GlazedTerracottaBlock.java
@@ -1,12 +1,13 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.material.PushReaction;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class GlazedTerracottaBlock extends HorizontalDirectionalBlock {
     public GlazedTerracottaBlock(final Properties c) {
@@ -19,12 +20,12 @@ public class GlazedTerracottaBlock extends HorizontalDirectionalBlock {
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)GlazedTerracottaBlock.FACING, bcq.getHorizontalDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)GlazedTerracottaBlock.FACING, bin.getHorizontalDirection().getOpposite());
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.PUSH_ONLY;
     }
 }
diff --git a/src/net/minecraft/world/level/block/GrassBlock.java b/src/net/minecraft/world/level/block/GrassBlock.java
index 2768b7e..abf6c92 100644
--- a/src/net/minecraft/world/level/block/GrassBlock.java
+++ b/src/net/minecraft/world/level/block/GrassBlock.java
@@ -12,6 +12,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class GrassBlock extends SpreadingSnowyDirtBlock implements BonemealableBlock {
     public GrassBlock(final Properties c) {
@@ -19,29 +20,29 @@ public class GrassBlock extends SpreadingSnowyDirtBlock implements BonemealableB
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        return bjg.getBlockState(fk.above()).isAir();
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        return bpg.getBlockState(fu.above()).isAir();
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        final BlockPos fk2 = fk.above();
-        final BlockState byj2 = Blocks.GRASS.defaultBlockState();
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        final BlockPos fu2 = fu.above();
+        final BlockState cfj2 = Blocks.GRASS.defaultBlockState();
         int integer8 = 0;
     Label_0282_Outer:
         while (integer8 < 128) {
-            BlockPos fk3 = fk2;
+            BlockPos fu3 = fu2;
             int integer9 = 0;
             while (true) {
                 while (integer9 < integer8 / 16) {
-                    fk3 = fk3.offset(random.nextInt(3) - 1, (random.nextInt(3) - 1) * random.nextInt(3) / 2, random.nextInt(3) - 1);
-                    if (xd.getBlockState(fk3.below()).getBlock() == this) {
-                        if (!xd.getBlockState(fk3).isCollisionShapeFullBlock(xd, fk3)) {
+                    fu3 = fu3.offset(random.nextInt(3) - 1, (random.nextInt(3) - 1) * random.nextInt(3) / 2, random.nextInt(3) - 1);
+                    if (zd.getBlockState(fu3.below()).is(this)) {
+                        if (!zd.getBlockState(fu3).isCollisionShapeFullBlock(zd, fu3)) {
                             ++integer9;
                             continue Label_0282_Outer;
                         }
@@ -49,27 +50,27 @@ public class GrassBlock extends SpreadingSnowyDirtBlock implements BonemealableB
                     ++integer8;
                     continue Label_0282_Outer;
                 }
-                final BlockState byj3 = xd.getBlockState(fk3);
-                if (byj3.getBlock() == byj2.getBlock() && random.nextInt(10) == 0) {
-                    ((BonemealableBlock)byj2.getBlock()).performBonemeal(xd, random, fk3, byj3);
+                final BlockState cfj3 = zd.getBlockState(fu3);
+                if (cfj3.is(cfj2.getBlock()) && random.nextInt(10) == 0) {
+                    ((BonemealableBlock)cfj2.getBlock()).performBonemeal(zd, random, fu3, cfj3);
                 }
-                if (!byj3.isAir()) {
+                if (!cfj3.isAir()) {
                     continue;
                 }
-                BlockState byj4;
+                BlockState cfj4;
                 if (random.nextInt(8) == 0) {
-                    final List<ConfiguredFeature<?, ?>> list12 = xd.getBiome(fk3).getFlowerFeatures();
+                    final List<ConfiguredFeature<?, ?>> list12 = zd.getBiome(fu3).getFlowerFeatures();
                     if (list12.isEmpty()) {
                         continue;
                     }
-                    final ConfiguredFeature<?, ?> cdc13 = ((DecoratedFeatureConfiguration)list12.get(0).config).feature;
-                    byj4 = ((AbstractFlowerFeature)cdc13.feature).getRandomFlower(random, fk3, (FeatureConfiguration)cdc13.config);
+                    final ConfiguredFeature<?, ?> ckb13 = ((DecoratedFeatureConfiguration)list12.get(0).config).feature;
+                    cfj4 = ((AbstractFlowerFeature)ckb13.feature).getRandomFlower(random, fu3, (FeatureConfiguration)ckb13.config);
                 }
                 else {
-                    byj4 = byj2;
+                    cfj4 = cfj2;
                 }
-                if (byj4.canSurvive(xd, fk3)) {
-                    xd.setBlock(fk3, byj4, 3);
+                if (cfj4.canSurvive(zd, fu3)) {
+                    zd.setBlock(fu3, cfj4, 3);
                 }
                 continue;
             }
diff --git a/src/net/minecraft/world/level/block/GrassPathBlock.java b/src/net/minecraft/world/level/block/GrassPathBlock.java
index 25b9ae0..7222727 100644
--- a/src/net/minecraft/world/level/block/GrassPathBlock.java
+++ b/src/net/minecraft/world/level/block/GrassPathBlock.java
@@ -12,6 +12,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class GrassPathBlock extends Block {
@@ -22,52 +23,47 @@ public class GrassPathBlock extends Block {
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        if (!this.defaultBlockState().canSurvive(bcq.getLevel(), bcq.getClickedPos())) {
-            return Block.pushEntitiesUp(this.defaultBlockState(), Blocks.DIRT.defaultBlockState(), bcq.getLevel(), bcq.getClickedPos());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        if (!this.defaultBlockState().canSurvive(bin.getLevel(), bin.getClickedPos())) {
+            return Block.pushEntitiesUp(this.defaultBlockState(), Blocks.DIRT.defaultBlockState(), bin.getLevel(), bin.getClickedPos());
         }
-        return super.getStateForPlacement(bcq);
+        return super.getStateForPlacement(bin);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.UP && !byj1.canSurvive(bjx, fk5)) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.UP && !cfj1.canSurvive(bqc, fu5)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        FarmBlock.turnToDirt(byj, xd, fk);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        FarmBlock.turnToDirt(cfj, zd, fu);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockState byj2 = bjz.getBlockState(fk.above());
-        return !byj2.getMaterial().isSolid() || byj2.getBlock() instanceof FenceGateBlock;
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockState cfj2 = bqd.getBlockState(fu.above());
+        return !cfj2.getMaterial().isSolid() || cfj2.getBlock() instanceof FenceGateBlock;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return GrassPathBlock.SHAPE;
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
-    @Override
-    public boolean isViewBlocking(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return true;
-    }
-    
     static {
         SHAPE = FarmBlock.SHAPE;
     }
diff --git a/src/net/minecraft/world/level/block/GravelBlock.java b/src/net/minecraft/world/level/block/GravelBlock.java
index 20ae846..5a0810e 100644
--- a/src/net/minecraft/world/level/block/GravelBlock.java
+++ b/src/net/minecraft/world/level/block/GravelBlock.java
@@ -1,6 +1,9 @@
 package net.minecraft.world.level.block;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class GravelBlock extends FallingBlock {
     public GravelBlock(final Properties c) {
@@ -8,7 +11,7 @@ public class GravelBlock extends FallingBlock {
     }
     
     @Override
-    public int getDustColor(final BlockState byj) {
+    public int getDustColor(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return -8356741;
     }
 }
diff --git a/src/net/minecraft/world/level/block/GrindstoneBlock.java b/src/net/minecraft/world/level/block/GrindstoneBlock.java
index d0c3396..7c0dcb8 100644
--- a/src/net/minecraft/world/level/block/GrindstoneBlock.java
+++ b/src/net/minecraft/world/level/block/GrindstoneBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.entity.player.Inventory;
@@ -25,6 +25,7 @@ import net.minecraft.world.level.block.state.properties.AttachFace;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -97,37 +98,37 @@ public class GrindstoneBlock extends FaceAttachedHorizontalDirectionalBlock {
     
     protected GrindstoneBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)GrindstoneBlock.FACING, Direction.NORTH)).<AttachFace, AttachFace>setValue(GrindstoneBlock.FACE, AttachFace.WALL));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)GrindstoneBlock.FACING, Direction.NORTH)).<AttachFace, AttachFace>setValue(GrindstoneBlock.FACE, AttachFace.WALL));
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
-    private VoxelShape getVoxelShape(final BlockState byj) {
-        final Direction fp3 = byj.<Direction>getValue((Property<Direction>)GrindstoneBlock.FACING);
-        switch (byj.<AttachFace>getValue(GrindstoneBlock.FACE)) {
+    private VoxelShape getVoxelShape(final BlockState cfj) {
+        final Direction fz3 = cfj.<Direction>getValue((Property<Direction>)GrindstoneBlock.FACING);
+        switch (cfj.<AttachFace>getValue(GrindstoneBlock.FACE)) {
             case FLOOR: {
-                if (fp3 == Direction.NORTH || fp3 == Direction.SOUTH) {
+                if (fz3 == Direction.NORTH || fz3 == Direction.SOUTH) {
                     return GrindstoneBlock.FLOOR_NORTH_SOUTH_GRINDSTONE;
                 }
                 return GrindstoneBlock.FLOOR_EAST_WEST_GRINDSTONE;
             }
             case WALL: {
-                if (fp3 == Direction.NORTH) {
+                if (fz3 == Direction.NORTH) {
                     return GrindstoneBlock.WALL_NORTH_GRINDSTONE;
                 }
-                if (fp3 == Direction.SOUTH) {
+                if (fz3 == Direction.SOUTH) {
                     return GrindstoneBlock.WALL_SOUTH_GRINDSTONE;
                 }
-                if (fp3 == Direction.EAST) {
+                if (fz3 == Direction.EAST) {
                     return GrindstoneBlock.WALL_EAST_GRINDSTONE;
                 }
                 return GrindstoneBlock.WALL_WEST_GRINDSTONE;
             }
             case CEILING: {
-                if (fp3 == Direction.NORTH || fp3 == Direction.SOUTH) {
+                if (fz3 == Direction.NORTH || fz3 == Direction.SOUTH) {
                     return GrindstoneBlock.CEILING_NORTH_SOUTH_GRINDSTONE;
                 }
                 return GrindstoneBlock.CEILING_EAST_WEST_GRINDSTONE;
@@ -139,43 +140,43 @@ public class GrindstoneBlock extends FaceAttachedHorizontalDirectionalBlock {
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return this.getVoxelShape(byj);
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.getVoxelShape(cfj);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return this.getVoxelShape(byj);
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.getVoxelShape(cfj);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
         return true;
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        ayj.openMenu(byj.getMenuProvider(bjw, fk));
-        ayj.awardStat(Stats.INTERACT_WITH_GRINDSTONE);
-        return InteractionResult.SUCCESS;
+        bec.openMenu(cfj.getMenuProvider(bqb, fu));
+        bec.awardStat(Stats.INTERACT_WITH_GRINDSTONE);
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return new SimpleMenuProvider((integer, ayi, ayj) -> new GrindstoneMenu(integer, ayi, ContainerLevelAccess.create(bjw, fk)), GrindstoneBlock.CONTAINER_TITLE);
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return new SimpleMenuProvider((integer, beb, bec) -> new GrindstoneMenu(integer, beb, ContainerLevelAccess.create(bqb, fu)), GrindstoneBlock.CONTAINER_TITLE);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)GrindstoneBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)GrindstoneBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)GrindstoneBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)GrindstoneBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)GrindstoneBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)GrindstoneBlock.FACING)));
     }
     
     @Override
@@ -184,7 +185,7 @@ public class GrindstoneBlock extends FaceAttachedHorizontalDirectionalBlock {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
@@ -253,6 +254,6 @@ public class GrindstoneBlock extends FaceAttachedHorizontalDirectionalBlock {
         CEILING_EAST_WEST_RIGHT_LEG = Shapes.or(GrindstoneBlock.CEILING_EAST_WEST_RIGHT_POST, GrindstoneBlock.CEILING_EAST_WEST_RIGHT_PIVOT);
         CEILING_EAST_WEST_ALL_LEGS = Shapes.or(GrindstoneBlock.CEILING_EAST_WEST_LEFT_LEG, GrindstoneBlock.CEILING_EAST_WEST_RIGHT_LEG);
         CEILING_EAST_WEST_GRINDSTONE = Shapes.or(GrindstoneBlock.CEILING_EAST_WEST_ALL_LEGS, Block.box(2.0, 0.0, 4.0, 14.0, 12.0, 12.0));
-        CONTAINER_TITLE = new TranslatableComponent("container.grindstone_title", new Object[0]);
+        CONTAINER_TITLE = new TranslatableComponent("container.grindstone_title");
     }
 }
diff --git a/src/net/minecraft/world/level/block/GrowingPlantBlock.java b/src/net/minecraft/world/level/block/GrowingPlantBlock.java
new file mode 100644
index 0000000..f289ef6
--- /dev/null
+++ b/src/net/minecraft/world/level/block/GrowingPlantBlock.java
@@ -0,0 +1,44 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.core.Direction;
+
+public abstract class GrowingPlantBlock extends Block {
+    protected final Direction growthDirection;
+    protected final boolean scheduleFluidTicks;
+    protected final VoxelShape shape;
+    
+    protected GrowingPlantBlock(final Properties c, final Direction fz, final VoxelShape dfg, final boolean boolean4) {
+        super(c);
+        this.growthDirection = fz;
+        this.shape = dfg;
+        this.scheduleFluidTicks = boolean4;
+    }
+    
+    @Override
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.relative(this.growthDirection.getOpposite());
+        final BlockState cfj2 = bqd.getBlockState(fu2);
+        final Block bvr7 = cfj2.getBlock();
+        return this.canAttachToBlock(bvr7) && (bvr7 == this.getHeadBlock() || bvr7 == this.getBodyBlock() || cfj2.isFaceSturdy(bqd, fu2, this.growthDirection));
+    }
+    
+    protected boolean canAttachToBlock(final Block bvr) {
+        return true;
+    }
+    
+    @Override
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.shape;
+    }
+    
+    protected abstract GrowingPlantHeadBlock getHeadBlock();
+    
+    protected abstract Block getBodyBlock();
+}
diff --git a/src/net/minecraft/world/level/block/GrowingPlantBodyBlock.java b/src/net/minecraft/world/level/block/GrowingPlantBodyBlock.java
new file mode 100644
index 0000000..f5cfe01
--- /dev/null
+++ b/src/net/minecraft/world/level/block/GrowingPlantBodyBlock.java
@@ -0,0 +1,98 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.item.BlockPlaceContext;
+import net.minecraft.world.level.Level;
+import java.util.Optional;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.material.Fluids;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.LevelReader;
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+
+public abstract class GrowingPlantBodyBlock extends GrowingPlantBlock implements BonemealableBlock {
+    protected GrowingPlantBodyBlock(final Properties c, final Direction fz, final VoxelShape dfg, final boolean boolean4) {
+        super(c, fz, dfg, boolean4);
+    }
+    
+    @Override
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.canSurvive(zd, fu)) {
+            zd.destroyBlock(fu, true);
+        }
+    }
+    
+    @Override
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == this.growthDirection.getOpposite() && !cfj1.canSurvive(bqc, fu5)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
+        }
+        final GrowingPlantHeadBlock byk8 = this.getHeadBlock();
+        if (fz == this.growthDirection) {
+            final Block bvr9 = cfj3.getBlock();
+            if (bvr9 != this && bvr9 != byk8) {
+                return byk8.getStateForPlacement(bqc);
+            }
+        }
+        if (this.scheduleFluidTicks) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
+        }
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
+    }
+    
+    @Override
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        return new ItemStack(this.getHeadBlock());
+    }
+    
+    @Override
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        final Optional<BlockPos> optional6 = this.getHeadPos(bpg, fu, cfj);
+        return optional6.isPresent() && this.getHeadBlock().canGrowInto(bpg.getBlockState(optional6.get().relative(this.growthDirection)));
+    }
+    
+    @Override
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
+        return true;
+    }
+    
+    @Override
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        final Optional<BlockPos> optional6 = this.getHeadPos(zd, fu, cfj);
+        if (optional6.isPresent()) {
+            final BlockState cfj2 = zd.getBlockState(optional6.get());
+            ((GrowingPlantHeadBlock)cfj2.getBlock()).performBonemeal(zd, random, optional6.get(), cfj2);
+        }
+    }
+    
+    private Optional<BlockPos> getHeadPos(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        BlockPos fu2 = fu;
+        Block bvr6;
+        do {
+            fu2 = fu2.relative(this.growthDirection);
+            bvr6 = bpg.getBlockState(fu2).getBlock();
+        } while (bvr6 == cfj.getBlock());
+        if (bvr6 == this.getHeadBlock()) {
+            return Optional.<BlockPos>of(fu2);
+        }
+        return Optional.<BlockPos>empty();
+    }
+    
+    @Override
+    public boolean canBeReplaced(final BlockState cfj, final BlockPlaceContext bin) {
+        final boolean boolean4 = super.canBeReplaced(cfj, bin);
+        return (!boolean4 || bin.getItemInHand().getItem() != this.getHeadBlock().asItem()) && boolean4;
+    }
+    
+    @Override
+    protected Block getBodyBlock() {
+        return this;
+    }
+}
diff --git a/src/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/src/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
new file mode 100644
index 0000000..7dab6a1
--- /dev/null
+++ b/src/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
@@ -0,0 +1,106 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.material.Fluids;
+import net.minecraft.world.level.LevelReader;
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.properties.IntegerProperty;
+
+public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements BonemealableBlock {
+    public static final IntegerProperty AGE;
+    private final double growPerTickProbability;
+    
+    protected GrowingPlantHeadBlock(final Properties c, final Direction fz, final VoxelShape dfg, final boolean boolean4, final double double5) {
+        super(c, fz, dfg, boolean4);
+        this.growPerTickProbability = double5;
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)GrowingPlantHeadBlock.AGE, 0));
+    }
+    
+    public BlockState getStateForPlacement(final LevelAccessor bqc) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)GrowingPlantHeadBlock.AGE, bqc.getRandom().nextInt(25));
+    }
+    
+    @Override
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.canSurvive(zd, fu)) {
+            zd.destroyBlock(fu, true);
+        }
+    }
+    
+    @Override
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)GrowingPlantHeadBlock.AGE) < 25;
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (cfj.<Integer>getValue((Property<Integer>)GrowingPlantHeadBlock.AGE) < 25 && random.nextDouble() < this.growPerTickProbability) {
+            final BlockPos fu2 = fu.relative(this.growthDirection);
+            if (this.canGrowInto(zd.getBlockState(fu2))) {
+                zd.setBlockAndUpdate(fu2, ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)GrowingPlantHeadBlock.AGE));
+            }
+        }
+    }
+    
+    @Override
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == this.growthDirection.getOpposite() && !cfj1.canSurvive(bqc, fu5)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
+        }
+        if (fz == this.growthDirection && cfj3.is(this)) {
+            return this.getBodyBlock().defaultBlockState();
+        }
+        if (this.scheduleFluidTicks) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
+        }
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
+    }
+    
+    @Override
+    protected void createBlockStateDefinition(final StateDefinition.Builder<Block, BlockState> a) {
+        a.add(GrowingPlantHeadBlock.AGE);
+    }
+    
+    @Override
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        return this.canGrowInto(bpg.getBlockState(fu.relative(this.growthDirection)));
+    }
+    
+    @Override
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
+        return true;
+    }
+    
+    @Override
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        BlockPos fu2 = fu.relative(this.growthDirection);
+        for (int integer7 = Math.min(cfj.<Integer>getValue((Property<Integer>)GrowingPlantHeadBlock.AGE) + 1, 25), integer8 = this.getBlocksToGrowWhenBonemealed(random), integer9 = 0; integer9 < integer8 && this.canGrowInto(zd.getBlockState(fu2)); fu2 = fu2.relative(this.growthDirection), integer7 = Math.min(integer7 + 1, 25), ++integer9) {
+            zd.setBlockAndUpdate(fu2, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)GrowingPlantHeadBlock.AGE, integer7));
+        }
+    }
+    
+    protected abstract int getBlocksToGrowWhenBonemealed(final Random random);
+    
+    protected abstract boolean canGrowInto(final BlockState cfj);
+    
+    @Override
+    protected GrowingPlantHeadBlock getHeadBlock() {
+        return this;
+    }
+    
+    static {
+        AGE = BlockStateProperties.AGE_25;
+    }
+}
diff --git a/src/net/minecraft/world/level/block/HalfTransparentBlock.java b/src/net/minecraft/world/level/block/HalfTransparentBlock.java
index 8bf421d..89a3c09 100644
--- a/src/net/minecraft/world/level/block/HalfTransparentBlock.java
+++ b/src/net/minecraft/world/level/block/HalfTransparentBlock.java
@@ -2,6 +2,7 @@ package net.minecraft.world.level.block;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class HalfTransparentBlock extends Block {
     protected HalfTransparentBlock(final Properties c) {
@@ -9,7 +10,7 @@ public class HalfTransparentBlock extends Block {
     }
     
     @Override
-    public boolean skipRendering(final BlockState byj1, final BlockState byj2, final Direction fp) {
-        return byj2.getBlock() == this || super.skipRendering(byj1, byj2, fp);
+    public boolean skipRendering(final BlockState cfj1, final BlockState cfj2, final Direction fz) {
+        return cfj2.is(this) || super.skipRendering(cfj1, cfj2, fz);
     }
 }
diff --git a/src/net/minecraft/world/level/block/HayBlock.java b/src/net/minecraft/world/level/block/HayBlock.java
index 3ef2fe8..23d4972 100644
--- a/src/net/minecraft/world/level/block/HayBlock.java
+++ b/src/net/minecraft/world/level/block/HayBlock.java
@@ -1,21 +1,22 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class HayBlock extends RotatedPillarBlock {
     public HayBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Direction.Axis, Direction.Axis>setValue(HayBlock.AXIS, Direction.Axis.Y));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Direction.Axis, Direction.Axis>setValue(HayBlock.AXIS, Direction.Axis.Y));
     }
     
     @Override
-    public void fallOn(final Level bjw, final BlockPos fk, final Entity akq, final float float4) {
-        akq.causeFallDamage(float4, 0.2f);
+    public void fallOn(final Level bqb, final BlockPos fu, final Entity aom, final float float4) {
+        aom.causeFallDamage(float4, 0.2f);
     }
 }
diff --git a/src/net/minecraft/world/level/block/HoneyBlock.java b/src/net/minecraft/world/level/block/HoneyBlock.java
index 6419bd3..7282800 100644
--- a/src/net/minecraft/world/level/block/HoneyBlock.java
+++ b/src/net/minecraft/world/level/block/HoneyBlock.java
@@ -17,6 +17,7 @@ import net.minecraft.world.entity.item.PrimedTnt;
 import net.minecraft.world.entity.vehicle.AbstractMinecart;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class HoneyBlock extends HalfTransparentBlock {
@@ -26,96 +27,96 @@ public class HoneyBlock extends HalfTransparentBlock {
         super(c);
     }
     
-    private static boolean doesEntityDoHoneyBlockSlideEffects(final Entity akq) {
-        return akq instanceof LivingEntity || akq instanceof AbstractMinecart || akq instanceof PrimedTnt || akq instanceof Boat;
+    private static boolean doesEntityDoHoneyBlockSlideEffects(final Entity aom) {
+        return aom instanceof LivingEntity || aom instanceof AbstractMinecart || aom instanceof PrimedTnt || aom instanceof Boat;
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return HoneyBlock.SHAPE;
     }
     
     @Override
-    public void fallOn(final Level bjw, final BlockPos fk, final Entity akq, final float float4) {
-        akq.playSound(SoundEvents.HONEY_BLOCK_SLIDE, 1.0f, 1.0f);
-        if (!bjw.isClientSide) {
-            bjw.broadcastEntityEvent(akq, (byte)54);
+    public void fallOn(final Level bqb, final BlockPos fu, final Entity aom, final float float4) {
+        aom.playSound(SoundEvents.HONEY_BLOCK_SLIDE, 1.0f, 1.0f);
+        if (!bqb.isClientSide) {
+            bqb.broadcastEntityEvent(aom, (byte)54);
         }
-        if (akq.causeFallDamage(float4, 0.2f)) {
-            akq.playSound(this.soundType.getFallSound(), this.soundType.getVolume() * 0.5f, this.soundType.getPitch() * 0.75f);
+        if (aom.causeFallDamage(float4, 0.2f)) {
+            aom.playSound(this.soundType.getFallSound(), this.soundType.getVolume() * 0.5f, this.soundType.getPitch() * 0.75f);
         }
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (this.isSlidingDown(fk, akq)) {
-            this.maybeDoSlideAchievement(akq, fk);
-            this.doSlideMovement(akq);
-            this.maybeDoSlideEffects(bjw, akq);
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (this.isSlidingDown(fu, aom)) {
+            this.maybeDoSlideAchievement(aom, fu);
+            this.doSlideMovement(aom);
+            this.maybeDoSlideEffects(bqb, aom);
         }
-        super.entityInside(byj, bjw, fk, akq);
+        super.entityInside(cfj, bqb, fu, aom);
     }
     
-    private boolean isSlidingDown(final BlockPos fk, final Entity akq) {
-        if (akq.onGround) {
+    private boolean isSlidingDown(final BlockPos fu, final Entity aom) {
+        if (aom.isOnGround()) {
             return false;
         }
-        if (akq.getY() > fk.getY() + 0.9375 - 1.0E-7) {
+        if (aom.getY() > fu.getY() + 0.9375 - 1.0E-7) {
             return false;
         }
-        if (akq.getDeltaMovement().y >= -0.08) {
+        if (aom.getDeltaMovement().y >= -0.08) {
             return false;
         }
-        final double double4 = Math.abs(fk.getX() + 0.5 - akq.getX());
-        final double double5 = Math.abs(fk.getZ() + 0.5 - akq.getZ());
-        final double double6 = 0.4375 + akq.getBbWidth() / 2.0f;
+        final double double4 = Math.abs(fu.getX() + 0.5 - aom.getX());
+        final double double5 = Math.abs(fu.getZ() + 0.5 - aom.getZ());
+        final double double6 = 0.4375 + aom.getBbWidth() / 2.0f;
         return double4 + 1.0E-7 > double6 || double5 + 1.0E-7 > double6;
     }
     
-    private void maybeDoSlideAchievement(final Entity akq, final BlockPos fk) {
-        if (akq instanceof ServerPlayer && akq.level.getGameTime() % 20L == 0L) {
-            CriteriaTriggers.HONEY_BLOCK_SLIDE.trigger((ServerPlayer)akq, akq.level.getBlockState(fk));
+    private void maybeDoSlideAchievement(final Entity aom, final BlockPos fu) {
+        if (aom instanceof ServerPlayer && aom.level.getGameTime() % 20L == 0L) {
+            CriteriaTriggers.HONEY_BLOCK_SLIDE.trigger((ServerPlayer)aom, aom.level.getBlockState(fu));
         }
     }
     
-    private void doSlideMovement(final Entity akq) {
-        final Vec3 cvl3 = akq.getDeltaMovement();
-        if (cvl3.y < -0.13) {
-            final double double4 = -0.05 / cvl3.y;
-            akq.setDeltaMovement(new Vec3(cvl3.x * double4, -0.05, cvl3.z * double4));
+    private void doSlideMovement(final Entity aom) {
+        final Vec3 dem3 = aom.getDeltaMovement();
+        if (dem3.y < -0.13) {
+            final double double4 = -0.05 / dem3.y;
+            aom.setDeltaMovement(new Vec3(dem3.x * double4, -0.05, dem3.z * double4));
         }
         else {
-            akq.setDeltaMovement(new Vec3(cvl3.x, -0.05, cvl3.z));
+            aom.setDeltaMovement(new Vec3(dem3.x, -0.05, dem3.z));
         }
-        akq.fallDistance = 0.0f;
+        aom.fallDistance = 0.0f;
     }
     
-    private void maybeDoSlideEffects(final Level bjw, final Entity akq) {
-        if (doesEntityDoHoneyBlockSlideEffects(akq)) {
-            if (bjw.random.nextInt(5) == 0) {
-                akq.playSound(SoundEvents.HONEY_BLOCK_SLIDE, 1.0f, 1.0f);
+    private void maybeDoSlideEffects(final Level bqb, final Entity aom) {
+        if (doesEntityDoHoneyBlockSlideEffects(aom)) {
+            if (bqb.random.nextInt(5) == 0) {
+                aom.playSound(SoundEvents.HONEY_BLOCK_SLIDE, 1.0f, 1.0f);
             }
-            if (!bjw.isClientSide && bjw.random.nextInt(5) == 0) {
-                bjw.broadcastEntityEvent(akq, (byte)53);
+            if (!bqb.isClientSide && bqb.random.nextInt(5) == 0) {
+                bqb.broadcastEntityEvent(aom, (byte)53);
             }
         }
     }
     
-    public static void showSlideParticles(final Entity akq) {
-        showParticles(akq, 5);
+    public static void showSlideParticles(final Entity aom) {
+        showParticles(aom, 5);
     }
     
-    public static void showJumpParticles(final Entity akq) {
-        showParticles(akq, 10);
+    public static void showJumpParticles(final Entity aom) {
+        showParticles(aom, 10);
     }
     
-    private static void showParticles(final Entity akq, final int integer) {
-        if (!akq.level.isClientSide) {
+    private static void showParticles(final Entity aom, final int integer) {
+        if (!aom.level.isClientSide) {
             return;
         }
-        final BlockState byj3 = Blocks.HONEY_BLOCK.defaultBlockState();
+        final BlockState cfj3 = Blocks.HONEY_BLOCK.defaultBlockState();
         for (int integer2 = 0; integer2 < integer; ++integer2) {
-            akq.level.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, byj3), akq.getX(), akq.getY(), akq.getZ(), 0.0, 0.0, 0.0);
+            aom.level.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, cfj3), aom.getX(), aom.getY(), aom.getZ(), 0.0, 0.0, 0.0);
         }
     }
     
diff --git a/src/net/minecraft/world/level/block/HopperBlock.java b/src/net/minecraft/world/level/block/HopperBlock.java
index 409474f..e7e3ab5 100644
--- a/src/net/minecraft/world/level/block/HopperBlock.java
+++ b/src/net/minecraft/world/level/block/HopperBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -29,6 +29,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
@@ -53,12 +54,12 @@ public class HopperBlock extends BaseEntityBlock {
     
     public HopperBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)HopperBlock.FACING, Direction.DOWN)).<Comparable, Boolean>setValue((Property<Comparable>)HopperBlock.ENABLED, true));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)HopperBlock.FACING, Direction.DOWN)).<Comparable, Boolean>setValue((Property<Comparable>)HopperBlock.ENABLED, true));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        switch (byj.<Direction>getValue((Property<Direction>)HopperBlock.FACING)) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        switch (cfj.<Direction>getValue((Property<Direction>)HopperBlock.FACING)) {
             case DOWN: {
                 return HopperBlock.DOWN_SHAPE;
             }
@@ -81,8 +82,8 @@ public class HopperBlock extends BaseEntityBlock {
     }
     
     @Override
-    public VoxelShape getInteractionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        switch (byj.<Direction>getValue((Property<Direction>)HopperBlock.FACING)) {
+    public VoxelShape getInteractionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        switch (cfj.<Direction>getValue((Property<Direction>)HopperBlock.FACING)) {
             case DOWN: {
                 return HopperBlock.DOWN_INTERACTION_SHAPE;
             }
@@ -105,95 +106,95 @@ public class HopperBlock extends BaseEntityBlock {
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final Direction fp3 = bcq.getClickedFace().getOpposite();
-        return (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)HopperBlock.FACING, (fp3.getAxis() == Direction.Axis.Y) ? Direction.DOWN : fp3)).<Comparable, Boolean>setValue((Property<Comparable>)HopperBlock.ENABLED, true);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final Direction fz3 = bin.getClickedFace().getOpposite();
+        return (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)HopperBlock.FACING, (fz3.getAxis() == Direction.Axis.Y) ? Direction.DOWN : fz3)).<Comparable, Boolean>setValue((Property<Comparable>)HopperBlock.ENABLED, true);
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new HopperBlockEntity();
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof HopperBlockEntity) {
-                ((HopperBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof HopperBlockEntity) {
+                ((HopperBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj4.getBlock() == byj1.getBlock()) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj4.is(cfj1.getBlock())) {
             return;
         }
-        this.checkPoweredState(bjw, fk, byj1);
+        this.checkPoweredState(bqb, fu, cfj1);
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk);
-        if (bwl8 instanceof HopperBlockEntity) {
-            ayj.openMenu((MenuProvider)bwl8);
-            ayj.awardStat(Stats.INSPECT_HOPPER);
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu);
+        if (cdl8 instanceof HopperBlockEntity) {
+            bec.openMenu((MenuProvider)cdl8);
+            bec.awardStat(Stats.INSPECT_HOPPER);
         }
-        return InteractionResult.SUCCESS;
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        this.checkPoweredState(bjw, fk3, byj);
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        this.checkPoweredState(bqb, fu3, cfj);
     }
     
-    private void checkPoweredState(final Level bjw, final BlockPos fk, final BlockState byj) {
-        final boolean boolean5 = !bjw.hasNeighborSignal(fk);
-        if (boolean5 != byj.<Boolean>getValue((Property<Boolean>)HopperBlock.ENABLED)) {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)HopperBlock.ENABLED, boolean5), 4);
+    private void checkPoweredState(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        final boolean boolean5 = !bqb.hasNeighborSignal(fu);
+        if (boolean5 != cfj.<Boolean>getValue((Property<Boolean>)HopperBlock.ENABLED)) {
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)HopperBlock.ENABLED, boolean5), 4);
         }
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof HopperBlockEntity) {
-            Containers.dropContents(bjw, fk, (Container)bwl7);
-            bjw.updateNeighbourForOutputSignal(fk, this);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof HopperBlockEntity) {
+            Containers.dropContents(bqb, fu, (Container)cdl7);
+            bqb.updateNeighbourForOutputSignal(fu, this);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(bjw.getBlockEntity(fk));
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(bqb.getBlockEntity(fu));
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)HopperBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)HopperBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)HopperBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)HopperBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)HopperBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)HopperBlock.FACING)));
     }
     
     @Override
@@ -202,15 +203,15 @@ public class HopperBlock extends BaseEntityBlock {
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        final BlockEntity bwl6 = bjw.getBlockEntity(fk);
-        if (bwl6 instanceof HopperBlockEntity) {
-            ((HopperBlockEntity)bwl6).entityInside(akq);
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        final BlockEntity cdl6 = bqb.getBlockEntity(fu);
+        if (cdl6 instanceof HopperBlockEntity) {
+            ((HopperBlockEntity)cdl6).entityInside(aom);
         }
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/HorizontalDirectionalBlock.java b/src/net/minecraft/world/level/block/HorizontalDirectionalBlock.java
index 79ab10b..ad17468 100644
--- a/src/net/minecraft/world/level/block/HorizontalDirectionalBlock.java
+++ b/src/net/minecraft/world/level/block/HorizontalDirectionalBlock.java
@@ -1,10 +1,11 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 
 public abstract class HorizontalDirectionalBlock extends Block {
@@ -15,13 +16,13 @@ public abstract class HorizontalDirectionalBlock extends Block {
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)HorizontalDirectionalBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)HorizontalDirectionalBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)HorizontalDirectionalBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)HorizontalDirectionalBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)HorizontalDirectionalBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)HorizontalDirectionalBlock.FACING)));
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/HugeMushroomBlock.java b/src/net/minecraft/world/level/block/HugeMushroomBlock.java
index d2ff84f..985ffc9 100644
--- a/src/net/minecraft/world/level/block/HugeMushroomBlock.java
+++ b/src/net/minecraft/world/level/block/HugeMushroomBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.BlockPos;
@@ -8,6 +8,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.core.Direction;
 import java.util.Map;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
@@ -23,32 +24,32 @@ public class HugeMushroomBlock extends Block {
     
     public HugeMushroomBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)HugeMushroomBlock.NORTH, true)).setValue((Property<Comparable>)HugeMushroomBlock.EAST, true)).setValue((Property<Comparable>)HugeMushroomBlock.SOUTH, true)).setValue((Property<Comparable>)HugeMushroomBlock.WEST, true)).setValue((Property<Comparable>)HugeMushroomBlock.UP, true)).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.DOWN, true));
+        this.registerDefaultState((((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)HugeMushroomBlock.NORTH, true)).setValue((Property<Comparable>)HugeMushroomBlock.EAST, true)).setValue((Property<Comparable>)HugeMushroomBlock.SOUTH, true)).setValue((Property<Comparable>)HugeMushroomBlock.WEST, true)).setValue((Property<Comparable>)HugeMushroomBlock.UP, true)).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.DOWN, true));
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockGetter bjg3 = bcq.getLevel();
-        final BlockPos fk4 = bcq.getClickedPos();
-        return (((((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)HugeMushroomBlock.DOWN, this != bjg3.getBlockState(fk4.below()).getBlock())).setValue((Property<Comparable>)HugeMushroomBlock.UP, this != bjg3.getBlockState(fk4.above()).getBlock())).setValue((Property<Comparable>)HugeMushroomBlock.NORTH, this != bjg3.getBlockState(fk4.north()).getBlock())).setValue((Property<Comparable>)HugeMushroomBlock.EAST, this != bjg3.getBlockState(fk4.east()).getBlock())).setValue((Property<Comparable>)HugeMushroomBlock.SOUTH, this != bjg3.getBlockState(fk4.south()).getBlock())).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.WEST, this != bjg3.getBlockState(fk4.west()).getBlock());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockGetter bpg3 = bin.getLevel();
+        final BlockPos fu4 = bin.getClickedPos();
+        return (((((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)HugeMushroomBlock.DOWN, this != bpg3.getBlockState(fu4.below()).getBlock())).setValue((Property<Comparable>)HugeMushroomBlock.UP, this != bpg3.getBlockState(fu4.above()).getBlock())).setValue((Property<Comparable>)HugeMushroomBlock.NORTH, this != bpg3.getBlockState(fu4.north()).getBlock())).setValue((Property<Comparable>)HugeMushroomBlock.EAST, this != bpg3.getBlockState(fu4.east()).getBlock())).setValue((Property<Comparable>)HugeMushroomBlock.SOUTH, this != bpg3.getBlockState(fu4.south()).getBlock())).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.WEST, this != bpg3.getBlockState(fu4.west()).getBlock());
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj3.getBlock() == this) {
-            return ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(fp), false);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj3.is(this)) {
+            return ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(fz), false);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return (((((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(btu.rotate(Direction.NORTH)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.NORTH))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(btu.rotate(Direction.SOUTH)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.SOUTH))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(btu.rotate(Direction.EAST)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.EAST))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(btu.rotate(Direction.WEST)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.WEST))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(btu.rotate(Direction.UP)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.UP))).<Comparable, Comparable>setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(btu.rotate(Direction.DOWN)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.DOWN));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return (((((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(cap.rotate(Direction.NORTH)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.NORTH))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(cap.rotate(Direction.SOUTH)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.SOUTH))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(cap.rotate(Direction.EAST)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.EAST))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(cap.rotate(Direction.WEST)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.WEST))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(cap.rotate(Direction.UP)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.UP))).<Comparable, Comparable>setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(cap.rotate(Direction.DOWN)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.DOWN));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return (((((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bsu.mirror(Direction.NORTH)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.NORTH))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bsu.mirror(Direction.SOUTH)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.SOUTH))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bsu.mirror(Direction.EAST)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.EAST))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bsu.mirror(Direction.WEST)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.WEST))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bsu.mirror(Direction.UP)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.UP))).<Comparable, Comparable>setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bsu.mirror(Direction.DOWN)), (Comparable)byj.<V>getValue((Property<V>)HugeMushroomBlock.DOWN));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return (((((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bzj.mirror(Direction.NORTH)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.NORTH))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bzj.mirror(Direction.SOUTH)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.SOUTH))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bzj.mirror(Direction.EAST)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.EAST))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bzj.mirror(Direction.WEST)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.WEST))).setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bzj.mirror(Direction.UP)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.UP))).<Comparable, Comparable>setValue((Property<Comparable>)HugeMushroomBlock.PROPERTY_BY_DIRECTION.get(bzj.mirror(Direction.DOWN)), (Comparable)cfj.<V>getValue((Property<V>)HugeMushroomBlock.DOWN));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/IceBlock.java b/src/net/minecraft/world/level/block/IceBlock.java
index 3e95e0e..16d4f98 100644
--- a/src/net/minecraft/world/level/block/IceBlock.java
+++ b/src/net/minecraft/world/level/block/IceBlock.java
@@ -1,6 +1,5 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.material.PushReaction;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.LightLayer;
@@ -16,6 +15,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class IceBlock extends HalfTransparentBlock {
     public IceBlock(final Properties c) {
@@ -23,43 +23,38 @@ public class IceBlock extends HalfTransparentBlock {
     }
     
     @Override
-    public void playerDestroy(final Level bjw, final Player ayj, final BlockPos fk, final BlockState byj, @Nullable final BlockEntity bwl, final ItemStack ben) {
-        super.playerDestroy(bjw, ayj, fk, byj, bwl, ben);
-        if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, ben) == 0) {
-            if (bjw.dimension.isUltraWarm()) {
-                bjw.removeBlock(fk, false);
+    public void playerDestroy(final Level bqb, final Player bec, final BlockPos fu, final BlockState cfj, @Nullable final BlockEntity cdl, final ItemStack bki) {
+        super.playerDestroy(bqb, bec, fu, cfj, cdl, bki);
+        if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, bki) == 0) {
+            if (bqb.dimensionType().ultraWarm()) {
+                bqb.removeBlock(fu, false);
                 return;
             }
-            final Material coo8 = bjw.getBlockState(fk.below()).getMaterial();
-            if (coo8.blocksMotion() || coo8.isLiquid()) {
-                bjw.setBlockAndUpdate(fk, Blocks.WATER.defaultBlockState());
+            final Material cxd8 = bqb.getBlockState(fu.below()).getMaterial();
+            if (cxd8.blocksMotion() || cxd8.isLiquid()) {
+                bqb.setBlockAndUpdate(fu, Blocks.WATER.defaultBlockState());
             }
         }
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (xd.getBrightness(LightLayer.BLOCK, fk) > 11 - byj.getLightBlock(xd, fk)) {
-            this.melt(byj, xd, fk);
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (zd.getBrightness(LightLayer.BLOCK, fu) > 11 - cfj.getLightBlock(zd, fu)) {
+            this.melt(cfj, zd, fu);
         }
     }
     
-    protected void melt(final BlockState byj, final Level bjw, final BlockPos fk) {
-        if (bjw.dimension.isUltraWarm()) {
-            bjw.removeBlock(fk, false);
+    protected void melt(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        if (bqb.dimensionType().ultraWarm()) {
+            bqb.removeBlock(fu, false);
             return;
         }
-        bjw.setBlockAndUpdate(fk, Blocks.WATER.defaultBlockState());
-        bjw.neighborChanged(fk, Blocks.WATER, fk);
+        bqb.setBlockAndUpdate(fu, Blocks.WATER.defaultBlockState());
+        bqb.neighborChanged(fu, Blocks.WATER, fu);
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.NORMAL;
     }
-    
-    @Override
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return aku == EntityType.POLAR_BEAR;
-    }
 }
diff --git a/src/net/minecraft/world/level/block/InfestedBlock.java b/src/net/minecraft/world/level/block/InfestedBlock.java
index 6998018..89f22f2 100644
--- a/src/net/minecraft/world/level/block/InfestedBlock.java
+++ b/src/net/minecraft/world/level/block/InfestedBlock.java
@@ -1,49 +1,62 @@
 package net.minecraft.world.level.block;
 
 import com.google.common.collect.Maps;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.monster.Silverfish;
+import net.minecraft.world.level.Explosion;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.monster.Silverfish;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import java.util.Map;
 
 public class InfestedBlock extends Block {
     private final Block hostBlock;
     private static final Map<Block, Block> BLOCK_BY_HOST_BLOCK;
     
-    public InfestedBlock(final Block bph, final Properties c) {
+    public InfestedBlock(final Block bvr, final Properties c) {
         super(c);
-        this.hostBlock = bph;
-        InfestedBlock.BLOCK_BY_HOST_BLOCK.put(bph, this);
+        this.hostBlock = bvr;
+        InfestedBlock.BLOCK_BY_HOST_BLOCK.put(bvr, this);
     }
     
     public Block getHostBlock() {
         return this.hostBlock;
     }
     
-    public static boolean isCompatibleHostBlock(final BlockState byj) {
-        return InfestedBlock.BLOCK_BY_HOST_BLOCK.containsKey(byj.getBlock());
+    public static boolean isCompatibleHostBlock(final BlockState cfj) {
+        return InfestedBlock.BLOCK_BY_HOST_BLOCK.containsKey(cfj.getBlock());
+    }
+    
+    private void spawnInfestation(final Level bqb, final BlockPos fu) {
+        final Silverfish bci4 = EntityType.SILVERFISH.create(bqb);
+        bci4.moveTo(fu.getX() + 0.5, fu.getY(), fu.getZ() + 0.5, 0.0f, 0.0f);
+        bqb.addFreshEntity(bci4);
+        bci4.spawnAnim();
     }
     
     @Override
-    public void spawnAfterBreak(final BlockState byj, final Level bjw, final BlockPos fk, final ItemStack ben) {
-        super.spawnAfterBreak(byj, bjw, fk, ben);
-        if (!bjw.isClientSide && bjw.getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS) && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, ben) == 0) {
-            final Silverfish axf6 = EntityType.SILVERFISH.create(bjw);
-            axf6.moveTo(fk.getX() + 0.5, fk.getY(), fk.getZ() + 0.5, 0.0f, 0.0f);
-            bjw.addFreshEntity(axf6);
-            axf6.spawnAnim();
+    public void spawnAfterBreak(final BlockState cfj, final Level bqb, final BlockPos fu, final ItemStack bki) {
+        super.spawnAfterBreak(cfj, bqb, fu, bki);
+        if (!bqb.isClientSide && bqb.getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS) && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, bki) == 0) {
+            this.spawnInfestation(bqb, fu);
         }
     }
     
-    public static BlockState stateByHostBlock(final Block bph) {
-        return InfestedBlock.BLOCK_BY_HOST_BLOCK.get(bph).defaultBlockState();
+    @Override
+    public void wasExploded(final Level bqb, final BlockPos fu, final Explosion bpt) {
+        if (!bqb.isClientSide) {
+            this.spawnInfestation(bqb, fu);
+        }
+    }
+    
+    public static BlockState stateByHostBlock(final Block bvr) {
+        return InfestedBlock.BLOCK_BY_HOST_BLOCK.get(bvr).defaultBlockState();
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/IronBarsBlock.java b/src/net/minecraft/world/level/block/IronBarsBlock.java
index 55d197d..8eec074 100644
--- a/src/net/minecraft/world/level/block/IronBarsBlock.java
+++ b/src/net/minecraft/world/level/block/IronBarsBlock.java
@@ -1,7 +1,12 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.LevelAccessor;
@@ -13,56 +18,62 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class IronBarsBlock extends CrossCollisionBlock {
     protected IronBarsBlock(final Properties c) {
         super(1.0f, 1.0f, 16.0f, 16.0f, 16.0f, c);
-        this.registerDefaultState(((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)IronBarsBlock.NORTH, false)).setValue((Property<Comparable>)IronBarsBlock.EAST, false)).setValue((Property<Comparable>)IronBarsBlock.SOUTH, false)).setValue((Property<Comparable>)IronBarsBlock.WEST, false)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WATERLOGGED, false));
+        this.registerDefaultState(((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)IronBarsBlock.NORTH, false)).setValue((Property<Comparable>)IronBarsBlock.EAST, false)).setValue((Property<Comparable>)IronBarsBlock.SOUTH, false)).setValue((Property<Comparable>)IronBarsBlock.WEST, false)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WATERLOGGED, false));
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockGetter bjg3 = bcq.getLevel();
-        final BlockPos fk4 = bcq.getClickedPos();
-        final FluidState coj5 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        final BlockPos fk5 = fk4.north();
-        final BlockPos fk6 = fk4.south();
-        final BlockPos fk7 = fk4.west();
-        final BlockPos fk8 = fk4.east();
-        final BlockState byj10 = bjg3.getBlockState(fk5);
-        final BlockState byj11 = bjg3.getBlockState(fk6);
-        final BlockState byj12 = bjg3.getBlockState(fk7);
-        final BlockState byj13 = bjg3.getBlockState(fk8);
-        return ((((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, this.attachsTo(byj10, byj10.isFaceSturdy(bjg3, fk5, Direction.SOUTH)))).setValue((Property<Comparable>)IronBarsBlock.SOUTH, this.attachsTo(byj11, byj11.isFaceSturdy(bjg3, fk6, Direction.NORTH)))).setValue((Property<Comparable>)IronBarsBlock.WEST, this.attachsTo(byj12, byj12.isFaceSturdy(bjg3, fk7, Direction.EAST)))).setValue((Property<Comparable>)IronBarsBlock.EAST, this.attachsTo(byj13, byj13.isFaceSturdy(bjg3, fk8, Direction.WEST)))).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WATERLOGGED, coj5.getType() == Fluids.WATER);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockGetter bpg3 = bin.getLevel();
+        final BlockPos fu4 = bin.getClickedPos();
+        final FluidState cxa5 = bin.getLevel().getFluidState(bin.getClickedPos());
+        final BlockPos fu5 = fu4.north();
+        final BlockPos fu6 = fu4.south();
+        final BlockPos fu7 = fu4.west();
+        final BlockPos fu8 = fu4.east();
+        final BlockState cfj10 = bpg3.getBlockState(fu5);
+        final BlockState cfj11 = bpg3.getBlockState(fu6);
+        final BlockState cfj12 = bpg3.getBlockState(fu7);
+        final BlockState cfj13 = bpg3.getBlockState(fu8);
+        return ((((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, this.attachsTo(cfj10, cfj10.isFaceSturdy(bpg3, fu5, Direction.SOUTH)))).setValue((Property<Comparable>)IronBarsBlock.SOUTH, this.attachsTo(cfj11, cfj11.isFaceSturdy(bpg3, fu6, Direction.NORTH)))).setValue((Property<Comparable>)IronBarsBlock.WEST, this.attachsTo(cfj12, cfj12.isFaceSturdy(bpg3, fu7, Direction.EAST)))).setValue((Property<Comparable>)IronBarsBlock.EAST, this.attachsTo(cfj13, cfj13.isFaceSturdy(bpg3, fu8, Direction.WEST)))).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WATERLOGGED, cxa5.getType() == Fluids.WATER);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)IronBarsBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)IronBarsBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        if (fp.getAxis().isHorizontal()) {
-            return ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.PROPERTY_BY_DIRECTION.get(fp), this.attachsTo(byj3, byj3.isFaceSturdy(bjx, fk6, fp.getOpposite())));
+        if (fz.getAxis().isHorizontal()) {
+            return ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.PROPERTY_BY_DIRECTION.get(fz), this.attachsTo(cfj3, cfj3.isFaceSturdy(bqc, fu6, fz.getOpposite())));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean skipRendering(final BlockState byj1, final BlockState byj2, final Direction fp) {
-        if (byj2.getBlock() == this) {
-            if (!fp.getAxis().isHorizontal()) {
+    public VoxelShape getVisualShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return Shapes.empty();
+    }
+    
+    @Override
+    public boolean skipRendering(final BlockState cfj1, final BlockState cfj2, final Direction fz) {
+        if (cfj2.is(this)) {
+            if (!fz.getAxis().isHorizontal()) {
                 return true;
             }
-            if (byj1.<Boolean>getValue((Property<Boolean>)IronBarsBlock.PROPERTY_BY_DIRECTION.get(fp)) && byj2.<Boolean>getValue((Property<Boolean>)IronBarsBlock.PROPERTY_BY_DIRECTION.get(fp.getOpposite()))) {
+            if (cfj1.<Boolean>getValue((Property<Boolean>)IronBarsBlock.PROPERTY_BY_DIRECTION.get(fz)) && cfj2.<Boolean>getValue((Property<Boolean>)IronBarsBlock.PROPERTY_BY_DIRECTION.get(fz.getOpposite()))) {
                 return true;
             }
         }
-        return super.skipRendering(byj1, byj2, fp);
+        return super.skipRendering(cfj1, cfj2, fz);
     }
     
-    public final boolean attachsTo(final BlockState byj, final boolean boolean2) {
-        final Block bph4 = byj.getBlock();
-        return (!Block.isExceptionForConnection(bph4) && boolean2) || bph4 instanceof IronBarsBlock;
+    public final boolean attachsTo(final BlockState cfj, final boolean boolean2) {
+        final Block bvr4 = cfj.getBlock();
+        return (!Block.isExceptionForConnection(bvr4) && boolean2) || bvr4 instanceof IronBarsBlock || bvr4.is(BlockTags.WALLS);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/JigsawBlock.java b/src/net/minecraft/world/level/block/JigsawBlock.java
index 7e9d417..4047035 100644
--- a/src/net/minecraft/world/level/block/JigsawBlock.java
+++ b/src/net/minecraft/world/level/block/JigsawBlock.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.BlockHitResult;
@@ -12,50 +13,86 @@ import javax.annotation.Nullable;
 import net.minecraft.world.level.block.entity.JigsawBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.core.Direction;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.core.FrontAndTop;
+import net.minecraft.world.level.block.state.properties.EnumProperty;
 
-public class JigsawBlock extends DirectionalBlock implements EntityBlock {
+public class JigsawBlock extends Block implements EntityBlock {
+    public static final EnumProperty<FrontAndTop> ORIENTATION;
+    
     protected JigsawBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)JigsawBlock.FACING, Direction.UP));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<FrontAndTop, FrontAndTop>setValue(JigsawBlock.ORIENTATION, FrontAndTop.NORTH_UP));
     }
     
     @Override
     protected void createBlockStateDefinition(final StateDefinition.Builder<Block, BlockState> a) {
-        a.add(JigsawBlock.FACING);
+        a.add(JigsawBlock.ORIENTATION);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)JigsawBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)JigsawBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<FrontAndTop, FrontAndTop>setValue(JigsawBlock.ORIENTATION, cap.rotation().rotate(cfj.<FrontAndTop>getValue(JigsawBlock.ORIENTATION)));
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)JigsawBlock.FACING, bcq.getClickedFace());
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return ((StateHolder<O, BlockState>)cfj).<FrontAndTop, FrontAndTop>setValue(JigsawBlock.ORIENTATION, bzj.rotation().rotate(cfj.<FrontAndTop>getValue(JigsawBlock.ORIENTATION)));
+    }
+    
+    @Override
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final Direction fz3 = bin.getClickedFace();
+        Direction fz4;
+        if (fz3.getAxis() == Direction.Axis.Y) {
+            fz4 = bin.getHorizontalDirection().getOpposite();
+        }
+        else {
+            fz4 = Direction.UP;
+        }
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<FrontAndTop, FrontAndTop>setValue(JigsawBlock.ORIENTATION, FrontAndTop.fromFrontAndTop(fz3, fz4));
     }
     
     @Nullable
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new JigsawBlockEntity();
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk);
-        if (bwl8 instanceof JigsawBlockEntity && ayj.canUseGameMasterBlocks()) {
-            ayj.openJigsawBlock((JigsawBlockEntity)bwl8);
-            return InteractionResult.SUCCESS;
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu);
+        if (cdl8 instanceof JigsawBlockEntity && bec.canUseGameMasterBlocks()) {
+            bec.openJigsawBlock((JigsawBlockEntity)cdl8);
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
         return InteractionResult.PASS;
     }
     
-    public static boolean canAttach(final StructureTemplate.StructureBlockInfo b1, final StructureTemplate.StructureBlockInfo b2) {
-        return b1.state.<Comparable>getValue((Property<Comparable>)JigsawBlock.FACING) == b2.state.<Direction>getValue((Property<Direction>)JigsawBlock.FACING).getOpposite() && b1.nbt.getString("attachement_type").equals(b2.nbt.getString("attachement_type"));
+    public static boolean canAttach(final StructureTemplate.StructureBlockInfo c1, final StructureTemplate.StructureBlockInfo c2) {
+        final Direction fz3 = getFrontFacing(c1.state);
+        final Direction fz4 = getFrontFacing(c2.state);
+        final Direction fz5 = getTopFacing(c1.state);
+        final Direction fz6 = getTopFacing(c2.state);
+        final JigsawBlockEntity.JointType a7 = JigsawBlockEntity.JointType.byName(c1.nbt.getString("joint")).orElseGet(() -> fz3.getAxis().isHorizontal() ? JigsawBlockEntity.JointType.ALIGNED : JigsawBlockEntity.JointType.ROLLABLE);
+        final boolean boolean8 = a7 == JigsawBlockEntity.JointType.ROLLABLE;
+        return fz3 == fz4.getOpposite() && (boolean8 || fz5 == fz6) && c1.nbt.getString("target").equals(c2.nbt.getString("name"));
+    }
+    
+    public static Direction getFrontFacing(final BlockState cfj) {
+        return cfj.<FrontAndTop>getValue(JigsawBlock.ORIENTATION).front();
+    }
+    
+    public static Direction getTopFacing(final BlockState cfj) {
+        return cfj.<FrontAndTop>getValue(JigsawBlock.ORIENTATION).top();
+    }
+    
+    static {
+        ORIENTATION = BlockStateProperties.ORIENTATION;
     }
 }
diff --git a/src/net/minecraft/world/level/block/JukeboxBlock.java b/src/net/minecraft/world/level/block/JukeboxBlock.java
index 5a7f953..2e65d22 100644
--- a/src/net/minecraft/world/level/block/JukeboxBlock.java
+++ b/src/net/minecraft/world/level/block/JukeboxBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.item.Item;
@@ -10,16 +10,20 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.JukeboxBlockEntity;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.item.ItemStack;
+import javax.annotation.Nullable;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public class JukeboxBlock extends BaseEntityBlock {
@@ -27,87 +31,99 @@ public class JukeboxBlock extends BaseEntityBlock {
     
     protected JukeboxBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)JukeboxBlock.HAS_RECORD, false));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)JukeboxBlock.HAS_RECORD, false));
     }
     
     @Override
-    public InteractionResult use(BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (byj.<Boolean>getValue((Property<Boolean>)JukeboxBlock.HAS_RECORD)) {
-            this.dropRecording(bjw, fk);
-            byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)JukeboxBlock.HAS_RECORD, false);
-            bjw.setBlock(fk, byj, 2);
-            return InteractionResult.SUCCESS;
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
+        super.setPlacedBy(bqb, fu, cfj, aoy, bki);
+        final CompoundTag le7 = bki.getOrCreateTag();
+        if (le7.contains("BlockEntityTag")) {
+            final CompoundTag le8 = le7.getCompound("BlockEntityTag");
+            if (le8.contains("RecordItem")) {
+                bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)JukeboxBlock.HAS_RECORD, true), 2);
+            }
+        }
+    }
+    
+    @Override
+    public InteractionResult use(BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)JukeboxBlock.HAS_RECORD)) {
+            this.dropRecording(bqb, fu);
+            cfj = ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)JukeboxBlock.HAS_RECORD, false);
+            bqb.setBlock(fu, cfj, 2);
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
         return InteractionResult.PASS;
     }
     
-    public void setRecord(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final ItemStack ben) {
-        final BlockEntity bwl6 = bjx.getBlockEntity(fk);
-        if (!(bwl6 instanceof JukeboxBlockEntity)) {
+    public void setRecord(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final ItemStack bki) {
+        final BlockEntity cdl6 = bqc.getBlockEntity(fu);
+        if (!(cdl6 instanceof JukeboxBlockEntity)) {
             return;
         }
-        ((JukeboxBlockEntity)bwl6).setRecord(ben.copy());
-        bjx.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)JukeboxBlock.HAS_RECORD, true), 2);
+        ((JukeboxBlockEntity)cdl6).setRecord(bki.copy());
+        bqc.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)JukeboxBlock.HAS_RECORD, true), 2);
     }
     
-    private void dropRecording(final Level bjw, final BlockPos fk) {
-        if (bjw.isClientSide) {
+    private void dropRecording(final Level bqb, final BlockPos fu) {
+        if (bqb.isClientSide) {
             return;
         }
-        final BlockEntity bwl4 = bjw.getBlockEntity(fk);
-        if (!(bwl4 instanceof JukeboxBlockEntity)) {
+        final BlockEntity cdl4 = bqb.getBlockEntity(fu);
+        if (!(cdl4 instanceof JukeboxBlockEntity)) {
             return;
         }
-        final JukeboxBlockEntity bxc5 = (JukeboxBlockEntity)bwl4;
-        final ItemStack ben6 = bxc5.getRecord();
-        if (ben6.isEmpty()) {
+        final JukeboxBlockEntity cec5 = (JukeboxBlockEntity)cdl4;
+        final ItemStack bki6 = cec5.getRecord();
+        if (bki6.isEmpty()) {
             return;
         }
-        bjw.levelEvent(1010, fk, 0);
-        bxc5.clearContent();
+        bqb.levelEvent(1010, fu, 0);
+        cec5.clearContent();
         final float float7 = 0.7f;
-        final double double8 = bjw.random.nextFloat() * 0.7f + 0.15000000596046448;
-        final double double9 = bjw.random.nextFloat() * 0.7f + 0.06000000238418579 + 0.6;
-        final double double10 = bjw.random.nextFloat() * 0.7f + 0.15000000596046448;
-        final ItemStack ben7 = ben6.copy();
-        final ItemEntity awb15 = new ItemEntity(bjw, fk.getX() + double8, fk.getY() + double9, fk.getZ() + double10, ben7);
-        awb15.setDefaultPickUpDelay();
-        bjw.addFreshEntity(awb15);
+        final double double8 = bqb.random.nextFloat() * 0.7f + 0.15000000596046448;
+        final double double9 = bqb.random.nextFloat() * 0.7f + 0.06000000238418579 + 0.6;
+        final double double10 = bqb.random.nextFloat() * 0.7f + 0.15000000596046448;
+        final ItemStack bki7 = bki6.copy();
+        final ItemEntity bbg15 = new ItemEntity(bqb, fu.getX() + double8, fu.getY() + double9, fu.getZ() + double10, bki7);
+        bbg15.setDefaultPickUpDelay();
+        bqb.addFreshEntity(bbg15);
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        this.dropRecording(bjw, fk);
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        this.dropRecording(bqb, fu);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new JukeboxBlockEntity();
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        if (bwl5 instanceof JukeboxBlockEntity) {
-            final Item bei6 = ((JukeboxBlockEntity)bwl5).getRecord().getItem();
-            if (bei6 instanceof RecordItem) {
-                return ((RecordItem)bei6).getAnalogOutput();
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        if (cdl5 instanceof JukeboxBlockEntity) {
+            final Item bke6 = ((JukeboxBlockEntity)cdl5).getRecord().getItem();
+            if (bke6 instanceof RecordItem) {
+                return ((RecordItem)bke6).getAnalogOutput();
             }
         }
         return 0;
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
diff --git a/src/net/minecraft/world/level/block/KelpBlock.java b/src/net/minecraft/world/level/block/KelpBlock.java
index 2106ee9..2ecde00 100644
--- a/src/net/minecraft/world/level/block/KelpBlock.java
+++ b/src/net/minecraft/world/level/block/KelpBlock.java
@@ -1,113 +1,74 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
-import java.util.Random;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.material.Fluids;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.item.BlockPlaceContext;
-import net.minecraft.world.phys.shapes.CollisionContext;
+import java.util.Random;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
-public class KelpBlock extends Block implements LiquidBlockContainer {
-    public static final IntegerProperty AGE;
+public class KelpBlock extends GrowingPlantHeadBlock implements LiquidBlockContainer {
     protected static final VoxelShape SHAPE;
     
     protected KelpBlock(final Properties c) {
-        super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)KelpBlock.AGE, 0));
+        super(c, Direction.UP, KelpBlock.SHAPE, true, 0.14);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return KelpBlock.SHAPE;
+    protected boolean canGrowInto(final BlockState cfj) {
+        return cfj.is(Blocks.WATER);
+    }
+    
+    @Override
+    protected Block getBodyBlock() {
+        return Blocks.KELP_PLANT;
+    }
+    
+    @Override
+    protected boolean canAttachToBlock(final Block bvr) {
+        return bvr != Blocks.MAGMA_BLOCK;
+    }
+    
+    @Override
+    public boolean canPlaceLiquid(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final Fluid cwz) {
+        return false;
+    }
+    
+    @Override
+    public boolean placeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final FluidState cxa) {
+        return false;
+    }
+    
+    @Override
+    protected int getBlocksToGrowWhenBonemealed(final Random random) {
+        return 1;
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final FluidState coj3 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        if (coj3.is(FluidTags.WATER) && coj3.getAmount() == 8) {
-            return this.getStateForPlacement(bcq.getLevel());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final FluidState cxa3 = bin.getLevel().getFluidState(bin.getClickedPos());
+        if (cxa3.is(FluidTags.WATER) && cxa3.getAmount() == 8) {
+            return this.getStateForPlacement(bin.getLevel());
         }
         return null;
     }
     
-    public BlockState getStateForPlacement(final LevelAccessor bjx) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)KelpBlock.AGE, bjx.getRandom().nextInt(25));
-    }
-    
     @Override
-    public FluidState getFluidState(final BlockState byj) {
+    public FluidState getFluidState(final BlockState cfj) {
         return Fluids.WATER.getSource(false);
     }
     
-    @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.canSurvive(xd, fk)) {
-            xd.destroyBlock(fk, true);
-            return;
-        }
-        final BlockPos fk2 = fk.above();
-        final BlockState byj2 = xd.getBlockState(fk2);
-        if (byj2.getBlock() == Blocks.WATER && byj.<Integer>getValue((Property<Integer>)KelpBlock.AGE) < 25 && random.nextDouble() < 0.14) {
-            xd.setBlockAndUpdate(fk2, ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)KelpBlock.AGE));
-        }
-    }
-    
-    @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        final BlockState byj2 = bjz.getBlockState(fk2);
-        final Block bph7 = byj2.getBlock();
-        return bph7 != Blocks.MAGMA_BLOCK && (bph7 == this || bph7 == Blocks.KELP_PLANT || byj2.isFaceSturdy(bjz, fk2, Direction.UP));
-    }
-    
-    @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
-            if (fp == Direction.DOWN) {
-                return Blocks.AIR.defaultBlockState();
-            }
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
-        }
-        if (fp == Direction.UP && byj3.getBlock() == this) {
-            return Blocks.KELP_PLANT.defaultBlockState();
-        }
-        bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
-    }
-    
-    @Override
-    protected void createBlockStateDefinition(final StateDefinition.Builder<Block, BlockState> a) {
-        a.add(KelpBlock.AGE);
-    }
-    
-    @Override
-    public boolean canPlaceLiquid(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final Fluid coi) {
-        return false;
-    }
-    
-    @Override
-    public boolean placeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final FluidState coj) {
-        return false;
-    }
-    
     static {
-        AGE = BlockStateProperties.AGE_25;
         SHAPE = Block.box(0.0, 0.0, 0.0, 16.0, 9.0, 16.0);
     }
 }
diff --git a/src/net/minecraft/world/level/block/KelpPlantBlock.java b/src/net/minecraft/world/level/block/KelpPlantBlock.java
index 571a442..fabda0e 100644
--- a/src/net/minecraft/world/level/block/KelpPlantBlock.java
+++ b/src/net/minecraft/world/level/block/KelpPlantBlock.java
@@ -1,75 +1,38 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.material.Fluid;
-import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
-import java.util.Random;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
-public class KelpPlantBlock extends Block implements LiquidBlockContainer {
-    private final KelpBlock top;
-    
-    protected KelpPlantBlock(final KelpBlock bsg, final Properties c) {
-        super(c);
-        this.top = bsg;
+public class KelpPlantBlock extends GrowingPlantBodyBlock implements LiquidBlockContainer {
+    protected KelpPlantBlock(final Properties c) {
+        super(c, Direction.UP, Shapes.block(), true);
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
+    protected GrowingPlantHeadBlock getHeadBlock() {
+        return (GrowingPlantHeadBlock)Blocks.KELP;
+    }
+    
+    @Override
+    public FluidState getFluidState(final BlockState cfj) {
         return Fluids.WATER.getSource(false);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.canSurvive(xd, fk)) {
-            xd.destroyBlock(fk, true);
-        }
-        super.tick(byj, xd, fk, random);
-    }
-    
-    @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN && !byj1.canSurvive(bjx, fk5)) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
-        }
-        if (fp == Direction.UP) {
-            final Block bph8 = byj3.getBlock();
-            if (bph8 != this && bph8 != this.top) {
-                return this.top.getStateForPlacement(bjx);
-            }
-        }
-        bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
-    }
-    
-    @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        final BlockState byj2 = bjz.getBlockState(fk2);
-        final Block bph7 = byj2.getBlock();
-        return bph7 != Blocks.MAGMA_BLOCK && (bph7 == this || byj2.isFaceSturdy(bjz, fk2, Direction.UP));
-    }
-    
-    @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
-        return new ItemStack(Blocks.KELP);
-    }
-    
-    @Override
-    public boolean canPlaceLiquid(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final Fluid coi) {
+    public boolean canPlaceLiquid(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final Fluid cwz) {
         return false;
     }
     
     @Override
-    public boolean placeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final FluidState coj) {
+    public boolean placeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final FluidState cxa) {
         return false;
     }
 }
diff --git a/src/net/minecraft/world/level/block/LadderBlock.java b/src/net/minecraft/world/level/block/LadderBlock.java
index c980539..a4a7dd1 100644
--- a/src/net/minecraft/world/level/block/LadderBlock.java
+++ b/src/net/minecraft/world/level/block/LadderBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import javax.annotation.Nullable;
@@ -15,6 +15,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
@@ -29,12 +30,12 @@ public class LadderBlock extends Block implements SimpleWaterloggedBlock {
     
     protected LadderBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)LadderBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)LadderBlock.WATERLOGGED, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)LadderBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)LadderBlock.WATERLOGGED, false));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        switch (byj.<Direction>getValue((Property<Direction>)LadderBlock.FACING)) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        switch (cfj.<Direction>getValue((Property<Direction>)LadderBlock.FACING)) {
             case NORTH: {
                 return LadderBlock.NORTH_AABB;
             }
@@ -50,46 +51,46 @@ public class LadderBlock extends Block implements SimpleWaterloggedBlock {
         }
     }
     
-    private boolean canAttachTo(final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        final BlockState byj5 = bjg.getBlockState(fk);
-        return !byj5.isSignalSource() && byj5.isFaceSturdy(bjg, fk, fp);
+    private boolean canAttachTo(final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        final BlockState cfj5 = bpg.getBlockState(fu);
+        return cfj5.isFaceSturdy(bpg, fu, fz);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)LadderBlock.FACING);
-        return this.canAttachTo(bjz, fk.relative(fp5.getOpposite()), fp5);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)LadderBlock.FACING);
+        return this.canAttachTo(bqd, fu.relative(fz5.getOpposite()), fz5);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp.getOpposite() == byj1.<Direction>getValue((Property<Direction>)LadderBlock.FACING) && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz.getOpposite() == cfj1.<Direction>getValue((Property<Direction>)LadderBlock.FACING) && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        if (byj1.<Boolean>getValue((Property<Boolean>)LadderBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+        if (cfj1.<Boolean>getValue((Property<Boolean>)LadderBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        if (!bcq.replacingClickedOnBlock()) {
-            final BlockState byj3 = bcq.getLevel().getBlockState(bcq.getClickedPos().relative(bcq.getClickedFace().getOpposite()));
-            if (byj3.getBlock() == this && byj3.<Comparable>getValue((Property<Comparable>)LadderBlock.FACING) == bcq.getClickedFace()) {
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        if (!bin.replacingClickedOnBlock()) {
+            final BlockState cfj3 = bin.getLevel().getBlockState(bin.getClickedPos().relative(bin.getClickedFace().getOpposite()));
+            if (cfj3.is(this) && cfj3.<Comparable>getValue((Property<Comparable>)LadderBlock.FACING) == bin.getClickedFace()) {
                 return null;
             }
         }
-        BlockState byj3 = this.defaultBlockState();
-        final LevelReader bjz4 = bcq.getLevel();
-        final BlockPos fk5 = bcq.getClickedPos();
-        final FluidState coj6 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        for (final Direction fp10 : bcq.getNearestLookingDirections()) {
-            if (fp10.getAxis().isHorizontal()) {
-                byj3 = ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Direction>setValue((Property<Comparable>)LadderBlock.FACING, fp10.getOpposite());
-                if (byj3.canSurvive(bjz4, fk5)) {
-                    return ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Boolean>setValue((Property<Comparable>)LadderBlock.WATERLOGGED, coj6.getType() == Fluids.WATER);
+        BlockState cfj3 = this.defaultBlockState();
+        final LevelReader bqd4 = bin.getLevel();
+        final BlockPos fu5 = bin.getClickedPos();
+        final FluidState cxa6 = bin.getLevel().getFluidState(bin.getClickedPos());
+        for (final Direction fz10 : bin.getNearestLookingDirections()) {
+            if (fz10.getAxis().isHorizontal()) {
+                cfj3 = ((StateHolder<O, BlockState>)cfj3).<Comparable, Direction>setValue((Property<Comparable>)LadderBlock.FACING, fz10.getOpposite());
+                if (cfj3.canSurvive(bqd4, fu5)) {
+                    return ((StateHolder<O, BlockState>)cfj3).<Comparable, Boolean>setValue((Property<Comparable>)LadderBlock.WATERLOGGED, cxa6.getType() == Fluids.WATER);
                 }
             }
         }
@@ -97,13 +98,13 @@ public class LadderBlock extends Block implements SimpleWaterloggedBlock {
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)LadderBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)LadderBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)LadderBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)LadderBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)LadderBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)LadderBlock.FACING)));
     }
     
     @Override
@@ -112,11 +113,11 @@ public class LadderBlock extends Block implements SimpleWaterloggedBlock {
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)LadderBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)LadderBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/Lantern.java b/src/net/minecraft/world/level/block/Lantern.java
index 507021e..86b6894 100644
--- a/src/net/minecraft/world/level/block/Lantern.java
+++ b/src/net/minecraft/world/level/block/Lantern.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
@@ -16,6 +16,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
@@ -26,17 +27,17 @@ public class Lantern extends Block {
     
     public Lantern(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)Lantern.HANGING, false));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)Lantern.HANGING, false));
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        for (final Direction fp6 : bcq.getNearestLookingDirections()) {
-            if (fp6.getAxis() == Direction.Axis.Y) {
-                final BlockState byj7 = ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)Lantern.HANGING, fp6 == Direction.UP);
-                if (byj7.canSurvive(bcq.getLevel(), bcq.getClickedPos())) {
-                    return byj7;
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        for (final Direction fz6 : bin.getNearestLookingDirections()) {
+            if (fz6.getAxis() == Direction.Axis.Y) {
+                final BlockState cfj7 = ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)Lantern.HANGING, fz6 == Direction.UP);
+                if (cfj7.canSurvive(bin.getLevel(), bin.getClickedPos())) {
+                    return cfj7;
                 }
             }
         }
@@ -44,8 +45,8 @@ public class Lantern extends Block {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return byj.<Boolean>getValue((Property<Boolean>)Lantern.HANGING) ? Lantern.HANGING_AABB : Lantern.AABB;
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return cfj.<Boolean>getValue((Property<Boolean>)Lantern.HANGING) ? Lantern.HANGING_AABB : Lantern.AABB;
     }
     
     @Override
@@ -54,30 +55,30 @@ public class Lantern extends Block {
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final Direction fp5 = getConnectedDirection(byj).getOpposite();
-        return Block.canSupportCenter(bjz, fk.relative(fp5), fp5.getOpposite());
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final Direction fz5 = getConnectedDirection(cfj).getOpposite();
+        return Block.canSupportCenter(bqd, fu.relative(fz5), fz5.getOpposite());
     }
     
-    protected static Direction getConnectedDirection(final BlockState byj) {
-        return byj.<Boolean>getValue((Property<Boolean>)Lantern.HANGING) ? Direction.DOWN : Direction.UP;
+    protected static Direction getConnectedDirection(final BlockState cfj) {
+        return cfj.<Boolean>getValue((Property<Boolean>)Lantern.HANGING) ? Direction.DOWN : Direction.UP;
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.DESTROY;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (getConnectedDirection(byj1).getOpposite() == fp && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (getConnectedDirection(cfj1).getOpposite() == fz && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/LeavesBlock.java b/src/net/minecraft/world/level/block/LeavesBlock.java
index 0c543f1..07f1d50 100644
--- a/src/net/minecraft/world/level/block/LeavesBlock.java
+++ b/src/net/minecraft/world/level/block/LeavesBlock.java
@@ -1,23 +1,25 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.core.Vec3i;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.Level;
 import java.util.Random;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -27,92 +29,86 @@ public class LeavesBlock extends Block {
     
     public LeavesBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)LeavesBlock.DISTANCE, 7)).<Comparable, Boolean>setValue((Property<Comparable>)LeavesBlock.PERSISTENT, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)LeavesBlock.DISTANCE, 7)).<Comparable, Boolean>setValue((Property<Comparable>)LeavesBlock.PERSISTENT, false));
     }
     
     @Override
-    public boolean isRandomlyTicking(final BlockState byj) {
-        return byj.<Integer>getValue((Property<Integer>)LeavesBlock.DISTANCE) == 7 && !byj.<Boolean>getValue((Property<Boolean>)LeavesBlock.PERSISTENT);
+    public VoxelShape getBlockSupportShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return Shapes.empty();
     }
     
     @Override
-    public void randomTick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)LeavesBlock.PERSISTENT) && byj.<Integer>getValue((Property<Integer>)LeavesBlock.DISTANCE) == 7) {
-            Block.dropResources(byj, xd, fk);
-            xd.removeBlock(fk, false);
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)LeavesBlock.DISTANCE) == 7 && !cfj.<Boolean>getValue((Property<Boolean>)LeavesBlock.PERSISTENT);
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)LeavesBlock.PERSISTENT) && cfj.<Integer>getValue((Property<Integer>)LeavesBlock.DISTANCE) == 7) {
+            Block.dropResources(cfj, zd, fu);
+            zd.removeBlock(fu, false);
         }
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        xd.setBlock(fk, updateDistance(byj, xd, fk), 3);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        zd.setBlock(fu, updateDistance(cfj, zd, fu), 3);
     }
     
     @Override
-    public int getLightBlock(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public int getLightBlock(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return 1;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        final int integer8 = getDistanceAt(byj3) + 1;
-        if (integer8 != 1 || byj1.<Integer>getValue((Property<Integer>)LeavesBlock.DISTANCE) != integer8) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        final int integer8 = getDistanceAt(cfj3) + 1;
+        if (integer8 != 1 || cfj1.<Integer>getValue((Property<Integer>)LeavesBlock.DISTANCE) != integer8) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
         }
-        return byj1;
+        return cfj1;
     }
     
-    private static BlockState updateDistance(final BlockState byj, final LevelAccessor bjx, final BlockPos fk) {
+    private static BlockState updateDistance(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu) {
         int integer4 = 7;
-        try (final BlockPos.PooledMutableBlockPos b5 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (final Direction fp10 : Direction.values()) {
-                b5.set((Vec3i)fk).move(fp10);
-                integer4 = Math.min(integer4, getDistanceAt(bjx.getBlockState(b5)) + 1);
-                if (integer4 == 1) {
-                    break;
-                }
+        final BlockPos.MutableBlockPos a5 = new BlockPos.MutableBlockPos();
+        for (final Direction fz9 : Direction.values()) {
+            a5.setWithOffset(fu, fz9);
+            integer4 = Math.min(integer4, getDistanceAt(bqc.getBlockState(a5)) + 1);
+            if (integer4 == 1) {
+                break;
             }
         }
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)LeavesBlock.DISTANCE, integer4);
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)LeavesBlock.DISTANCE, integer4);
     }
     
-    private static int getDistanceAt(final BlockState byj) {
-        if (BlockTags.LOGS.contains(byj.getBlock())) {
+    private static int getDistanceAt(final BlockState cfj) {
+        if (BlockTags.LOGS.contains(cfj.getBlock())) {
             return 0;
         }
-        if (byj.getBlock() instanceof LeavesBlock) {
-            return byj.<Integer>getValue((Property<Integer>)LeavesBlock.DISTANCE);
+        if (cfj.getBlock() instanceof LeavesBlock) {
+            return cfj.<Integer>getValue((Property<Integer>)LeavesBlock.DISTANCE);
         }
         return 7;
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (!bjw.isRainingAt(fk.above())) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (!bqb.isRainingAt(fu.above())) {
             return;
         }
         if (random.nextInt(15) != 1) {
             return;
         }
-        final BlockPos fk2 = fk.below();
-        final BlockState byj2 = bjw.getBlockState(fk2);
-        if (byj2.canOcclude() && byj2.isFaceSturdy(bjw, fk2, Direction.UP)) {
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj2 = bqb.getBlockState(fu2);
+        if (cfj2.canOcclude() && cfj2.isFaceSturdy(bqb, fu2, Direction.UP)) {
             return;
         }
-        final double double8 = fk.getX() + random.nextFloat();
-        final double double9 = fk.getY() - 0.05;
-        final double double10 = fk.getZ() + random.nextFloat();
-        bjw.addParticle(ParticleTypes.DRIPPING_WATER, double8, double9, double10, 0.0, 0.0, 0.0);
-    }
-    
-    @Override
-    public boolean isSuffocating(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return false;
-    }
-    
-    @Override
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return aku == EntityType.OCELOT || aku == EntityType.PARROT;
+        final double double8 = fu.getX() + random.nextDouble();
+        final double double9 = fu.getY() - 0.05;
+        final double double10 = fu.getZ() + random.nextDouble();
+        bqb.addParticle(ParticleTypes.DRIPPING_WATER, double8, double9, double10, 0.0, 0.0, 0.0);
     }
     
     @Override
@@ -121,8 +117,8 @@ public class LeavesBlock extends Block {
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return updateDistance(((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)LeavesBlock.PERSISTENT, true), bcq.getLevel(), bcq.getClickedPos());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return updateDistance(((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)LeavesBlock.PERSISTENT, true), bin.getLevel(), bin.getClickedPos());
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/LecternBlock.java b/src/net/minecraft/world/level/block/LecternBlock.java
index 077dd83..8a90c88 100644
--- a/src/net/minecraft/world/level/block/LecternBlock.java
+++ b/src/net/minecraft/world/level/block/LecternBlock.java
@@ -1,11 +1,13 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.MenuProvider;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.BlockHitResult;
@@ -14,22 +16,24 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.ItemEntity;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.block.entity.LecternBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
@@ -50,37 +54,48 @@ public class LecternBlock extends BaseEntityBlock {
     
     protected LecternBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)LecternBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)LecternBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)LecternBlock.HAS_BOOK, false));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)LecternBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)LecternBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)LecternBlock.HAS_BOOK, false));
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public VoxelShape getOcclusionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public VoxelShape getOcclusionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return LecternBlock.SHAPE_COMMON;
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)LecternBlock.FACING, bcq.getHorizontalDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final Level bqb3 = bin.getLevel();
+        final ItemStack bki4 = bin.getItemInHand();
+        final CompoundTag le5 = bki4.getTag();
+        final Player bec6 = bin.getPlayer();
+        boolean boolean7 = false;
+        if (!bqb3.isClientSide && bec6 != null && le5 != null && bec6.canUseGameMasterBlocks() && le5.contains("BlockEntityTag")) {
+            final CompoundTag le6 = le5.getCompound("BlockEntityTag");
+            if (le6.contains("Book")) {
+                boolean7 = true;
+            }
+        }
+        return (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)LecternBlock.FACING, bin.getHorizontalDirection().getOpposite())).<Comparable, Boolean>setValue((Property<Comparable>)LecternBlock.HAS_BOOK, boolean7);
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return LecternBlock.SHAPE_COLLISION;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        switch (byj.<Direction>getValue((Property<Direction>)LecternBlock.FACING)) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        switch (cfj.<Direction>getValue((Property<Direction>)LecternBlock.FACING)) {
             case NORTH: {
                 return LecternBlock.SHAPE_NORTH;
             }
@@ -100,13 +115,13 @@ public class LecternBlock extends BaseEntityBlock {
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)LecternBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)LecternBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)LecternBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)LecternBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)LecternBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)LecternBlock.FACING)));
     }
     
     @Override
@@ -116,125 +131,125 @@ public class LecternBlock extends BaseEntityBlock {
     
     @Nullable
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new LecternBlockEntity();
     }
     
-    public static boolean tryPlaceBook(final Level bjw, final BlockPos fk, final BlockState byj, final ItemStack ben) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
-            if (!bjw.isClientSide) {
-                placeBook(bjw, fk, byj, ben);
+    public static boolean tryPlaceBook(final Level bqb, final BlockPos fu, final BlockState cfj, final ItemStack bki) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
+            if (!bqb.isClientSide) {
+                placeBook(bqb, fu, cfj, bki);
             }
             return true;
         }
         return false;
     }
     
-    private static void placeBook(final Level bjw, final BlockPos fk, final BlockState byj, final ItemStack ben) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        if (bwl5 instanceof LecternBlockEntity) {
-            final LecternBlockEntity bxd6 = (LecternBlockEntity)bwl5;
-            bxd6.setBook(ben.split(1));
-            resetBookState(bjw, fk, byj, true);
-            bjw.playSound(null, fk, SoundEvents.BOOK_PUT, SoundSource.BLOCKS, 1.0f, 1.0f);
+    private static void placeBook(final Level bqb, final BlockPos fu, final BlockState cfj, final ItemStack bki) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        if (cdl5 instanceof LecternBlockEntity) {
+            final LecternBlockEntity ced6 = (LecternBlockEntity)cdl5;
+            ced6.setBook(bki.split(1));
+            resetBookState(bqb, fu, cfj, true);
+            bqb.playSound(null, fu, SoundEvents.BOOK_PUT, SoundSource.BLOCKS, 1.0f, 1.0f);
         }
     }
     
-    public static void resetBookState(final Level bjw, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        bjw.setBlock(fk, (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)LecternBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)LecternBlock.HAS_BOOK, boolean4), 3);
-        updateBelow(bjw, fk, byj);
+    public static void resetBookState(final Level bqb, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        bqb.setBlock(fu, (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)LecternBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)LecternBlock.HAS_BOOK, boolean4), 3);
+        updateBelow(bqb, fu, cfj);
     }
     
-    public static void signalPageChange(final Level bjw, final BlockPos fk, final BlockState byj) {
-        changePowered(bjw, fk, byj, true);
-        bjw.getBlockTicks().scheduleTick(fk, byj.getBlock(), 2);
-        bjw.levelEvent(1043, fk, 0);
+    public static void signalPageChange(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        changePowered(bqb, fu, cfj, true);
+        bqb.getBlockTicks().scheduleTick(fu, cfj.getBlock(), 2);
+        bqb.levelEvent(1043, fu, 0);
     }
     
-    private static void changePowered(final Level bjw, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)LecternBlock.POWERED, boolean4), 3);
-        updateBelow(bjw, fk, byj);
+    private static void changePowered(final Level bqb, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)LecternBlock.POWERED, boolean4), 3);
+        updateBelow(bqb, fu, cfj);
     }
     
-    private static void updateBelow(final Level bjw, final BlockPos fk, final BlockState byj) {
-        bjw.updateNeighborsAt(fk.below(), byj.getBlock());
+    private static void updateBelow(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        bqb.updateNeighborsAt(fu.below(), cfj.getBlock());
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        changePowered(xd, fk, byj, false);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        changePowered(zd, fu, cfj, false);
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        if (byj1.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
-            this.popBook(byj1, bjw, fk);
+        if (cfj1.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
+            this.popBook(cfj1, bqb, fu);
         }
-        if (byj1.<Boolean>getValue((Property<Boolean>)LecternBlock.POWERED)) {
-            bjw.updateNeighborsAt(fk.below(), this);
+        if (cfj1.<Boolean>getValue((Property<Boolean>)LecternBlock.POWERED)) {
+            bqb.updateNeighborsAt(fu.below(), this);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
-    private void popBook(final BlockState byj, final Level bjw, final BlockPos fk) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        if (bwl5 instanceof LecternBlockEntity) {
-            final LecternBlockEntity bxd6 = (LecternBlockEntity)bwl5;
-            final Direction fp7 = byj.<Direction>getValue((Property<Direction>)LecternBlock.FACING);
-            final ItemStack ben8 = bxd6.getBook().copy();
-            final float float9 = 0.25f * fp7.getStepX();
-            final float float10 = 0.25f * fp7.getStepZ();
-            final ItemEntity awb11 = new ItemEntity(bjw, fk.getX() + 0.5 + float9, fk.getY() + 1, fk.getZ() + 0.5 + float10, ben8);
-            awb11.setDefaultPickUpDelay();
-            bjw.addFreshEntity(awb11);
-            bxd6.clearContent();
+    private void popBook(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        if (cdl5 instanceof LecternBlockEntity) {
+            final LecternBlockEntity ced6 = (LecternBlockEntity)cdl5;
+            final Direction fz7 = cfj.<Direction>getValue((Property<Direction>)LecternBlock.FACING);
+            final ItemStack bki8 = ced6.getBook().copy();
+            final float float9 = 0.25f * fz7.getStepX();
+            final float float10 = 0.25f * fz7.getStepZ();
+            final ItemEntity bbg11 = new ItemEntity(bqb, fu.getX() + 0.5 + float9, fu.getY() + 1, fu.getZ() + 0.5 + float10, bki8);
+            bbg11.setDefaultPickUpDelay();
+            bqb.addFreshEntity(bbg11);
+            ced6.clearContent();
         }
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return byj.<Boolean>getValue((Property<Boolean>)LecternBlock.POWERED) ? 15 : 0;
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return cfj.<Boolean>getValue((Property<Boolean>)LecternBlock.POWERED) ? 15 : 0;
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return (fp == Direction.UP && byj.<Boolean>getValue((Property<Boolean>)LecternBlock.POWERED)) ? 15 : 0;
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return (fz == Direction.UP && cfj.<Boolean>getValue((Property<Boolean>)LecternBlock.POWERED)) ? 15 : 0;
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        if (byj.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
-            final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-            if (bwl5 instanceof LecternBlockEntity) {
-                return ((LecternBlockEntity)bwl5).getRedstoneSignal();
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
+            final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+            if (cdl5 instanceof LecternBlockEntity) {
+                return ((LecternBlockEntity)cdl5).getRedstoneSignal();
             }
         }
         return 0;
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (byj.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
-            if (!bjw.isClientSide) {
-                this.openScreen(bjw, fk, ayj);
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
+            if (!bqb.isClientSide) {
+                this.openScreen(bqb, fu, bec);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
-        final ItemStack ben8 = ayj.getItemInHand(ajk);
-        if (ben8.isEmpty() || ben8.getItem().is(ItemTags.LECTERN_BOOKS)) {
+        final ItemStack bki8 = bec.getItemInHand(anf);
+        if (bki8.isEmpty() || bki8.getItem().is(ItemTags.LECTERN_BOOKS)) {
             return InteractionResult.PASS;
         }
         return InteractionResult.CONSUME;
@@ -242,23 +257,23 @@ public class LecternBlock extends BaseEntityBlock {
     
     @Nullable
     @Override
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)LecternBlock.HAS_BOOK)) {
             return null;
         }
-        return super.getMenuProvider(byj, bjw, fk);
+        return super.getMenuProvider(cfj, bqb, fu);
     }
     
-    private void openScreen(final Level bjw, final BlockPos fk, final Player ayj) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        if (bwl5 instanceof LecternBlockEntity) {
-            ayj.openMenu((MenuProvider)bwl5);
-            ayj.awardStat(Stats.INTERACT_WITH_LECTERN);
+    private void openScreen(final Level bqb, final BlockPos fu, final Player bec) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        if (cdl5 instanceof LecternBlockEntity) {
+            bec.openMenu((MenuProvider)cdl5);
+            bec.awardStat(Stats.INTERACT_WITH_LECTERN);
         }
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/LeverBlock.java b/src/net/minecraft/world/level/block/LeverBlock.java
index a7578a5..7956185 100644
--- a/src/net/minecraft/world/level/block/LeverBlock.java
+++ b/src/net/minecraft/world/level/block/LeverBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import java.util.Random;
@@ -21,6 +21,7 @@ import net.minecraft.world.level.block.state.properties.AttachFace;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
@@ -37,14 +38,14 @@ public class LeverBlock extends FaceAttachedHorizontalDirectionalBlock {
     
     protected LeverBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)LeverBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)LeverBlock.POWERED, false)).<AttachFace, AttachFace>setValue(LeverBlock.FACE, AttachFace.WALL));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)LeverBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)LeverBlock.POWERED, false)).<AttachFace, AttachFace>setValue(LeverBlock.FACE, AttachFace.WALL));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        switch (byj.<AttachFace>getValue(LeverBlock.FACE)) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        switch (cfj.<AttachFace>getValue(LeverBlock.FACE)) {
             case FLOOR: {
-                switch (byj.<Direction>getValue((Property<Direction>)LeverBlock.FACING).getAxis()) {
+                switch (cfj.<Direction>getValue((Property<Direction>)LeverBlock.FACING).getAxis()) {
                     case X: {
                         return LeverBlock.UP_AABB_X;
                     }
@@ -55,7 +56,7 @@ public class LeverBlock extends FaceAttachedHorizontalDirectionalBlock {
                 break;
             }
             case WALL: {
-                switch (byj.<Direction>getValue((Property<Direction>)LeverBlock.FACING)) {
+                switch (cfj.<Direction>getValue((Property<Direction>)LeverBlock.FACING)) {
                     case EAST: {
                         return LeverBlock.EAST_AABB;
                     }
@@ -72,7 +73,7 @@ public class LeverBlock extends FaceAttachedHorizontalDirectionalBlock {
                 break;
             }
             default: {
-                switch (byj.<Direction>getValue((Property<Direction>)LeverBlock.FACING).getAxis()) {
+                switch (cfj.<Direction>getValue((Property<Direction>)LeverBlock.FACING).getAxis()) {
                     case X: {
                         return LeverBlock.DOWN_AABB_X;
                     }
@@ -86,75 +87,75 @@ public class LeverBlock extends FaceAttachedHorizontalDirectionalBlock {
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
-            final BlockState byj2 = ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)LeverBlock.POWERED);
-            if (byj2.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED)) {
-                makeParticle(byj2, bjw, fk, 1.0f);
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
+            final BlockState cfj2 = ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)LeverBlock.POWERED);
+            if (cfj2.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED)) {
+                makeParticle(cfj2, bqb, fu, 1.0f);
             }
             return InteractionResult.SUCCESS;
         }
-        final BlockState byj2 = this.pull(byj, bjw, fk);
-        final float float9 = byj2.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED) ? 0.6f : 0.5f;
-        bjw.playSound(null, fk, SoundEvents.LEVER_CLICK, SoundSource.BLOCKS, 0.3f, float9);
-        return InteractionResult.SUCCESS;
+        final BlockState cfj2 = this.pull(cfj, bqb, fu);
+        final float float9 = cfj2.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED) ? 0.6f : 0.5f;
+        bqb.playSound(null, fu, SoundEvents.LEVER_CLICK, SoundSource.BLOCKS, 0.3f, float9);
+        return InteractionResult.CONSUME;
     }
     
-    public BlockState pull(BlockState byj, final Level bjw, final BlockPos fk) {
-        byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)LeverBlock.POWERED);
-        bjw.setBlock(fk, byj, 3);
-        this.updateNeighbours(byj, bjw, fk);
-        return byj;
+    public BlockState pull(BlockState cfj, final Level bqb, final BlockPos fu) {
+        cfj = ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)LeverBlock.POWERED);
+        bqb.setBlock(fu, cfj, 3);
+        this.updateNeighbours(cfj, bqb, fu);
+        return cfj;
     }
     
-    private static void makeParticle(final BlockState byj, final LevelAccessor bjx, final BlockPos fk, final float float4) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)LeverBlock.FACING).getOpposite();
-        final Direction fp6 = FaceAttachedHorizontalDirectionalBlock.getConnectedDirection(byj).getOpposite();
-        final double double7 = fk.getX() + 0.5 + 0.1 * fp5.getStepX() + 0.2 * fp6.getStepX();
-        final double double8 = fk.getY() + 0.5 + 0.1 * fp5.getStepY() + 0.2 * fp6.getStepY();
-        final double double9 = fk.getZ() + 0.5 + 0.1 * fp5.getStepZ() + 0.2 * fp6.getStepZ();
-        bjx.addParticle(new DustParticleOptions(1.0f, 0.0f, 0.0f, float4), double7, double8, double9, 0.0, 0.0, 0.0);
+    private static void makeParticle(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu, final float float4) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)LeverBlock.FACING).getOpposite();
+        final Direction fz6 = FaceAttachedHorizontalDirectionalBlock.getConnectedDirection(cfj).getOpposite();
+        final double double7 = fu.getX() + 0.5 + 0.1 * fz5.getStepX() + 0.2 * fz6.getStepX();
+        final double double8 = fu.getY() + 0.5 + 0.1 * fz5.getStepY() + 0.2 * fz6.getStepY();
+        final double double9 = fu.getZ() + 0.5 + 0.1 * fz5.getStepZ() + 0.2 * fz6.getStepZ();
+        bqc.addParticle(new DustParticleOptions(1.0f, 0.0f, 0.0f, float4), double7, double8, double9, 0.0, 0.0, 0.0);
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (byj.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED) && random.nextFloat() < 0.25f) {
-            makeParticle(byj, bjw, fk, 0.5f);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED) && random.nextFloat() < 0.25f) {
+            makeParticle(cfj, bqb, fu, 0.5f);
         }
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (boolean5 || byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (boolean5 || cfj1.is(cfj4.getBlock())) {
             return;
         }
-        if (byj1.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED)) {
-            this.updateNeighbours(byj1, bjw, fk);
+        if (cfj1.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED)) {
+            this.updateNeighbours(cfj1, bqb, fu);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return byj.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED) ? 15 : 0;
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return cfj.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED) ? 15 : 0;
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (byj.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED) && FaceAttachedHorizontalDirectionalBlock.getConnectedDirection(byj) == fp) {
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)LeverBlock.POWERED) && FaceAttachedHorizontalDirectionalBlock.getConnectedDirection(cfj) == fz) {
             return 15;
         }
         return 0;
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
-    private void updateNeighbours(final BlockState byj, final Level bjw, final BlockPos fk) {
-        bjw.updateNeighborsAt(fk, this);
-        bjw.updateNeighborsAt(fk.relative(FaceAttachedHorizontalDirectionalBlock.getConnectedDirection(byj).getOpposite()), this);
+    private void updateNeighbours(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        bqb.updateNeighborsAt(fu, this);
+        bqb.updateNeighborsAt(fu.relative(FaceAttachedHorizontalDirectionalBlock.getConnectedDirection(cfj).getOpposite()), this);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/LiquidBlock.java b/src/net/minecraft/world/level/block/LiquidBlock.java
index 0fb5e4c..cfbd34c 100644
--- a/src/net/minecraft/world/level/block/LiquidBlock.java
+++ b/src/net/minecraft/world/level/block/LiquidBlock.java
@@ -1,30 +1,33 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.phys.shapes.Shapes;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraft.world.phys.shapes.CollisionContext;
 import java.util.Collections;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.world.level.material.Fluid;
 import net.minecraft.core.Direction;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.pathfinder.PathComputationType;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import java.util.Random;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
 import com.google.common.collect.Lists;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.material.FluidState;
 import java.util.List;
 import net.minecraft.world.level.material.FlowingFluid;
@@ -34,114 +37,120 @@ public class LiquidBlock extends Block implements BucketPickup {
     public static final IntegerProperty LEVEL;
     protected final FlowingFluid fluid;
     private final List<FluidState> stateCache;
+    public static final VoxelShape STABLE_SHAPE;
     
-    protected LiquidBlock(final FlowingFluid coh, final Properties c) {
+    protected LiquidBlock(final FlowingFluid cwy, final Properties c) {
         super(c);
-        this.fluid = coh;
-        (this.stateCache = Lists.newArrayList()).add(coh.getSource(false));
+        this.fluid = cwy;
+        (this.stateCache = Lists.newArrayList()).add(cwy.getSource(false));
         for (int integer4 = 1; integer4 < 8; ++integer4) {
-            this.stateCache.add(coh.getFlowing(8 - integer4, false));
+            this.stateCache.add(cwy.getFlowing(8 - integer4, false));
         }
-        this.stateCache.add(coh.getFlowing(8, true));
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)LiquidBlock.LEVEL, 0));
+        this.stateCache.add(cwy.getFlowing(8, true));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)LiquidBlock.LEVEL, 0));
     }
     
     @Override
-    public void randomTick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        xd.getFluidState(fk).randomTick(xd, fk, random);
-    }
-    
-    @Override
-    public boolean propagatesSkylightDown(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return false;
-    }
-    
-    @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
-        return !this.fluid.is(FluidTags.LAVA);
-    }
-    
-    @Override
-    public FluidState getFluidState(final BlockState byj) {
-        final int integer3 = byj.<Integer>getValue((Property<Integer>)LiquidBlock.LEVEL);
-        return this.stateCache.get(Math.min(integer3, 8));
-    }
-    
-    @Override
-    public boolean skipRendering(final BlockState byj1, final BlockState byj2, final Direction fp) {
-        return byj2.getFluidState().getType().isSame(this.fluid);
-    }
-    
-    @Override
-    public RenderShape getRenderShape(final BlockState byj) {
-        return RenderShape.INVISIBLE;
-    }
-    
-    @Override
-    public List<ItemStack> getDrops(final BlockState byj, final LootContext.Builder a) {
-        return Collections.<ItemStack>emptyList();
-    }
-    
-    @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        if (der.isAbove(LiquidBlock.STABLE_SHAPE, fu, true) && cfj.<Integer>getValue((Property<Integer>)LiquidBlock.LEVEL) == 0 && der.canStandOnFluid(bpg.getFluidState(fu.above()), this.fluid)) {
+            return LiquidBlock.STABLE_SHAPE;
+        }
         return Shapes.empty();
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return this.fluid.getTickDelay(bjz);
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return cfj.getFluidState().isRandomlyTicking();
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (this.shouldSpreadLiquid(bjw, fk, byj1)) {
-            bjw.getLiquidTicks().scheduleTick(fk, byj1.getFluidState().getType(), this.getTickDelay(bjw));
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        cfj.getFluidState().randomTick(zd, fu, random);
+    }
+    
+    @Override
+    public boolean propagatesSkylightDown(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return false;
+    }
+    
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        return !this.fluid.is(FluidTags.LAVA);
+    }
+    
+    @Override
+    public FluidState getFluidState(final BlockState cfj) {
+        final int integer3 = cfj.<Integer>getValue((Property<Integer>)LiquidBlock.LEVEL);
+        return this.stateCache.get(Math.min(integer3, 8));
+    }
+    
+    @Override
+    public boolean skipRendering(final BlockState cfj1, final BlockState cfj2, final Direction fz) {
+        return cfj2.getFluidState().getType().isSame(this.fluid);
+    }
+    
+    @Override
+    public RenderShape getRenderShape(final BlockState cfj) {
+        return RenderShape.INVISIBLE;
+    }
+    
+    @Override
+    public List<ItemStack> getDrops(final BlockState cfj, final LootContext.Builder a) {
+        return Collections.<ItemStack>emptyList();
+    }
+    
+    @Override
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return Shapes.empty();
+    }
+    
+    @Override
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (this.shouldSpreadLiquid(bqb, fu, cfj1)) {
+            bqb.getLiquidTicks().scheduleTick(fu, cfj1.getFluidState().getType(), this.fluid.getTickDelay(bqb));
         }
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.getFluidState().isSource() || byj3.getFluidState().isSource()) {
-            bjx.getLiquidTicks().scheduleTick(fk5, byj1.getFluidState().getType(), this.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.getFluidState().isSource() || cfj3.getFluidState().isSource()) {
+            bqc.getLiquidTicks().scheduleTick(fu5, cfj1.getFluidState().getType(), this.fluid.getTickDelay(bqc));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (this.shouldSpreadLiquid(bjw, fk3, byj)) {
-            bjw.getLiquidTicks().scheduleTick(fk3, byj.getFluidState().getType(), this.getTickDelay(bjw));
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (this.shouldSpreadLiquid(bqb, fu3, cfj)) {
+            bqb.getLiquidTicks().scheduleTick(fu3, cfj.getFluidState().getType(), this.fluid.getTickDelay(bqb));
         }
     }
     
-    public boolean shouldSpreadLiquid(final Level bjw, final BlockPos fk, final BlockState byj) {
+    private boolean shouldSpreadLiquid(final Level bqb, final BlockPos fu, final BlockState cfj) {
         if (this.fluid.is(FluidTags.LAVA)) {
-            boolean boolean5 = false;
-            for (final Direction fp9 : Direction.values()) {
-                if (fp9 != Direction.DOWN && bjw.getFluidState(fk.relative(fp9)).is(FluidTags.WATER)) {
-                    boolean5 = true;
-                    break;
-                }
-            }
-            if (boolean5) {
-                final FluidState coj6 = bjw.getFluidState(fk);
-                if (coj6.isSource()) {
-                    bjw.setBlockAndUpdate(fk, Blocks.OBSIDIAN.defaultBlockState());
-                    this.fizz(bjw, fk);
-                    return false;
-                }
-                if (coj6.getHeight(bjw, fk) >= 0.44444445f) {
-                    bjw.setBlockAndUpdate(fk, Blocks.COBBLESTONE.defaultBlockState());
-                    this.fizz(bjw, fk);
-                    return false;
+            final boolean boolean5 = bqb.getBlockState(fu.below()).is(Blocks.SOUL_SOIL);
+            for (final Direction fz9 : Direction.values()) {
+                if (fz9 != Direction.DOWN) {
+                    final BlockPos fu2 = fu.relative(fz9);
+                    if (bqb.getFluidState(fu2).is(FluidTags.WATER)) {
+                        final Block bvr11 = bqb.getFluidState(fu).isSource() ? Blocks.OBSIDIAN : Blocks.COBBLESTONE;
+                        bqb.setBlockAndUpdate(fu, bvr11.defaultBlockState());
+                        this.fizz(bqb, fu);
+                        return false;
+                    }
+                    if (boolean5 && bqb.getBlockState(fu2).is(Blocks.BLUE_ICE)) {
+                        bqb.setBlockAndUpdate(fu, Blocks.BASALT.defaultBlockState());
+                        this.fizz(bqb, fu);
+                        return false;
+                    }
                 }
             }
         }
         return true;
     }
     
-    private void fizz(final LevelAccessor bjx, final BlockPos fk) {
-        bjx.levelEvent(1501, fk, 0);
+    private void fizz(final LevelAccessor bqc, final BlockPos fu) {
+        bqc.levelEvent(1501, fu, 0);
     }
     
     @Override
@@ -150,22 +159,27 @@ public class LiquidBlock extends Block implements BucketPickup {
     }
     
     @Override
-    public Fluid takeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj) {
-        if (byj.<Integer>getValue((Property<Integer>)LiquidBlock.LEVEL) == 0) {
-            bjx.setBlock(fk, Blocks.AIR.defaultBlockState(), 11);
+    public Fluid takeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj) {
+        if (cfj.<Integer>getValue((Property<Integer>)LiquidBlock.LEVEL) == 0) {
+            bqc.setBlock(fu, Blocks.AIR.defaultBlockState(), 11);
             return this.fluid;
         }
         return Fluids.EMPTY;
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
         if (this.fluid.is(FluidTags.LAVA)) {
-            akq.setInLava();
+            final float float6 = fu.getY() + cfj.getFluidState().getHeight(bqb, fu);
+            final AABB deg7 = aom.getBoundingBox();
+            if (deg7.minY < float6 || float6 > deg7.maxY) {
+                aom.setInLava();
+            }
         }
     }
     
     static {
         LEVEL = BlockStateProperties.LEVEL;
+        STABLE_SHAPE = Block.box(0.0, 0.0, 0.0, 16.0, 8.0, 16.0);
     }
 }
diff --git a/src/net/minecraft/world/level/block/LiquidBlockContainer.java b/src/net/minecraft/world/level/block/LiquidBlockContainer.java
index 093e8f1..c25f8b4 100644
--- a/src/net/minecraft/world/level/block/LiquidBlockContainer.java
+++ b/src/net/minecraft/world/level/block/LiquidBlockContainer.java
@@ -8,7 +8,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 
 public interface LiquidBlockContainer {
-    boolean canPlaceLiquid(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final Fluid coi);
+    boolean canPlaceLiquid(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final Fluid cwz);
     
-    boolean placeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final FluidState coj);
+    boolean placeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final FluidState cxa);
 }
diff --git a/src/net/minecraft/world/level/block/LogBlock.java b/src/net/minecraft/world/level/block/LogBlock.java
deleted file mode 100644
index bca902d..0000000
--- a/src/net/minecraft/world/level/block/LogBlock.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package net.minecraft.world.level.block;
-
-import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.MaterialColor;
-
-public class LogBlock extends RotatedPillarBlock {
-    private final MaterialColor woodMaterialColor;
-    
-    public LogBlock(final MaterialColor cop, final Properties c) {
-        super(c);
-        this.woodMaterialColor = cop;
-    }
-    
-    @Override
-    public MaterialColor getMapColor(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return (byj.<Direction.Axis>getValue(LogBlock.AXIS) == Direction.Axis.Y) ? this.woodMaterialColor : this.materialColor;
-    }
-}
diff --git a/src/net/minecraft/world/level/block/LoomBlock.java b/src/net/minecraft/world/level/block/LoomBlock.java
index 8133a30..ded226c 100644
--- a/src/net/minecraft/world/level/block/LoomBlock.java
+++ b/src/net/minecraft/world/level/block/LoomBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -20,6 +20,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.network.chat.TranslatableComponent;
 
 public class LoomBlock extends HorizontalDirectionalBlock {
@@ -30,23 +31,23 @@ public class LoomBlock extends HorizontalDirectionalBlock {
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        ayj.openMenu(byj.getMenuProvider(bjw, fk));
-        ayj.awardStat(Stats.INTERACT_WITH_LOOM);
-        return InteractionResult.SUCCESS;
+        bec.openMenu(cfj.getMenuProvider(bqb, fu));
+        bec.awardStat(Stats.INTERACT_WITH_LOOM);
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return new SimpleMenuProvider((integer, ayi, ayj) -> new LoomMenu(integer, ayi, ContainerLevelAccess.create(bjw, fk)), LoomBlock.CONTAINER_TITLE);
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return new SimpleMenuProvider((integer, beb, bec) -> new LoomMenu(integer, beb, ContainerLevelAccess.create(bqb, fu)), LoomBlock.CONTAINER_TITLE);
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)LoomBlock.FACING, bcq.getHorizontalDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)LoomBlock.FACING, bin.getHorizontalDirection().getOpposite());
     }
     
     @Override
@@ -55,6 +56,6 @@ public class LoomBlock extends HorizontalDirectionalBlock {
     }
     
     static {
-        CONTAINER_TITLE = new TranslatableComponent("container.loom", new Object[0]);
+        CONTAINER_TITLE = new TranslatableComponent("container.loom");
     }
 }
diff --git a/src/net/minecraft/world/level/block/MagmaBlock.java b/src/net/minecraft/world/level/block/MagmaBlock.java
index 8d41928..1c03071 100644
--- a/src/net/minecraft/world/level/block/MagmaBlock.java
+++ b/src/net/minecraft/world/level/block/MagmaBlock.java
@@ -1,14 +1,13 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.LevelAccessor;
 import java.util.Random;
@@ -20,6 +19,7 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class MagmaBlock extends Block {
     public MagmaBlock(final Properties c) {
@@ -27,57 +27,37 @@ public class MagmaBlock extends Block {
     }
     
     @Override
-    public void stepOn(final Level bjw, final BlockPos fk, final Entity akq) {
-        if (!akq.fireImmune() && akq instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity)akq)) {
-            akq.hurt(DamageSource.HOT_FLOOR, 1.0f);
+    public void stepOn(final Level bqb, final BlockPos fu, final Entity aom) {
+        if (!aom.fireImmune() && aom instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity)aom)) {
+            aom.hurt(DamageSource.HOT_FLOOR, 1.0f);
         }
-        super.stepOn(bjw, fk, akq);
+        super.stepOn(bqb, fu, aom);
     }
     
     @Override
-    public boolean emissiveRendering(final BlockState byj) {
-        return true;
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        BubbleColumnBlock.growColumn(zd, fu.above(), true);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        BubbleColumnBlock.growColumn(xd, fk.above(), true);
-    }
-    
-    @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.UP && byj3.getBlock() == Blocks.WATER) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, this.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.UP && cfj3.is(Blocks.WATER)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 20);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public void randomTick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        final BlockPos fk2 = fk.above();
-        if (xd.getFluidState(fk).is(FluidTags.WATER)) {
-            xd.playSound(null, fk, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5f, 2.6f + (xd.random.nextFloat() - xd.random.nextFloat()) * 0.8f);
-            xd.<SimpleParticleType>sendParticles(ParticleTypes.LARGE_SMOKE, fk2.getX() + 0.5, fk2.getY() + 0.25, fk2.getZ() + 0.5, 8, 0.5, 0.25, 0.5, 0.0);
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final BlockPos fu2 = fu.above();
+        if (zd.getFluidState(fu).is(FluidTags.WATER)) {
+            zd.playSound(null, fu, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5f, 2.6f + (zd.random.nextFloat() - zd.random.nextFloat()) * 0.8f);
+            zd.<SimpleParticleType>sendParticles(ParticleTypes.LARGE_SMOKE, fu2.getX() + 0.5, fu2.getY() + 0.25, fu2.getZ() + 0.5, 8, 0.5, 0.25, 0.5, 0.0);
         }
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return 20;
-    }
-    
-    @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        bjw.getBlockTicks().scheduleTick(fk, this, this.getTickDelay(bjw));
-    }
-    
-    @Override
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return aku.fireImmune();
-    }
-    
-    @Override
-    public boolean hasPostProcess(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return true;
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        bqb.getBlockTicks().scheduleTick(fu, this, 20);
     }
 }
diff --git a/src/net/minecraft/world/level/block/MelonBlock.java b/src/net/minecraft/world/level/block/MelonBlock.java
index 5447a54..bbedfa3 100644
--- a/src/net/minecraft/world/level/block/MelonBlock.java
+++ b/src/net/minecraft/world/level/block/MelonBlock.java
@@ -1,5 +1,7 @@
 package net.minecraft.world.level.block;
 
+import net.minecraft.world.level.block.state.BlockBehaviour;
+
 public class MelonBlock extends StemGrownBlock {
     protected MelonBlock(final Properties c) {
         super(c);
diff --git a/src/net/minecraft/world/level/block/Mirror.java b/src/net/minecraft/world/level/block/Mirror.java
index bcf91e3..23c24f5 100644
--- a/src/net/minecraft/world/level/block/Mirror.java
+++ b/src/net/minecraft/world/level/block/Mirror.java
@@ -1,11 +1,18 @@
 package net.minecraft.world.level.block;
 
 import net.minecraft.core.Direction;
+import com.mojang.math.OctahedralGroup;
 
 public enum Mirror {
-    NONE, 
-    LEFT_RIGHT, 
-    FRONT_BACK;
+    NONE(OctahedralGroup.IDENTITY), 
+    LEFT_RIGHT(OctahedralGroup.INVERT_Z), 
+    FRONT_BACK(OctahedralGroup.INVERT_X);
+    
+    private final OctahedralGroup rotation;
+    
+    private Mirror(final OctahedralGroup c) {
+        this.rotation = c;
+    }
     
     public int mirror(final int integer1, final int integer2) {
         final int integer3 = integer2 / 2;
@@ -23,18 +30,22 @@ public enum Mirror {
         }
     }
     
-    public Rotation getRotation(final Direction fp) {
-        final Direction.Axis a3 = fp.getAxis();
+    public Rotation getRotation(final Direction fz) {
+        final Direction.Axis a3 = fz.getAxis();
         return ((this == Mirror.LEFT_RIGHT && a3 == Direction.Axis.Z) || (this == Mirror.FRONT_BACK && a3 == Direction.Axis.X)) ? Rotation.CLOCKWISE_180 : Rotation.NONE;
     }
     
-    public Direction mirror(final Direction fp) {
-        if (this == Mirror.FRONT_BACK && fp.getAxis() == Direction.Axis.X) {
-            return fp.getOpposite();
+    public Direction mirror(final Direction fz) {
+        if (this == Mirror.FRONT_BACK && fz.getAxis() == Direction.Axis.X) {
+            return fz.getOpposite();
         }
-        if (this == Mirror.LEFT_RIGHT && fp.getAxis() == Direction.Axis.Z) {
-            return fp.getOpposite();
+        if (this == Mirror.LEFT_RIGHT && fz.getAxis() == Direction.Axis.Z) {
+            return fz.getOpposite();
         }
-        return fp;
+        return fz;
+    }
+    
+    public OctahedralGroup rotation() {
+        return this.rotation;
     }
 }
diff --git a/src/net/minecraft/world/level/block/MushroomBlock.java b/src/net/minecraft/world/level/block/MushroomBlock.java
index b4e6f36..61e7a45 100644
--- a/src/net/minecraft/world/level/block/MushroomBlock.java
+++ b/src/net/minecraft/world/level/block/MushroomBlock.java
@@ -3,9 +3,7 @@ package net.minecraft.world.level.block;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import java.util.Iterator;
@@ -16,6 +14,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class MushroomBlock extends BushBlock implements BonemealableBlock {
@@ -26,84 +25,78 @@ public class MushroomBlock extends BushBlock implements BonemealableBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return MushroomBlock.SHAPE;
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, BlockPos fk, final Random random) {
+    public void randomTick(final BlockState cfj, final ServerLevel zd, BlockPos fu, final Random random) {
         if (random.nextInt(25) == 0) {
             int integer6 = 5;
             final int integer7 = 4;
-            for (final BlockPos fk2 : BlockPos.betweenClosed(fk.offset(-4, -1, -4), fk.offset(4, 1, 4))) {
-                if (xd.getBlockState(fk2).getBlock() == this && --integer6 <= 0) {
+            for (final BlockPos fu2 : BlockPos.betweenClosed(fu.offset(-4, -1, -4), fu.offset(4, 1, 4))) {
+                if (zd.getBlockState(fu2).is(this) && --integer6 <= 0) {
                     return;
                 }
             }
-            BlockPos fk3 = fk.offset(random.nextInt(3) - 1, random.nextInt(2) - random.nextInt(2), random.nextInt(3) - 1);
+            BlockPos fu3 = fu.offset(random.nextInt(3) - 1, random.nextInt(2) - random.nextInt(2), random.nextInt(3) - 1);
             for (int integer8 = 0; integer8 < 4; ++integer8) {
-                if (xd.isEmptyBlock(fk3) && byj.canSurvive(xd, fk3)) {
-                    fk = fk3;
+                if (zd.isEmptyBlock(fu3) && cfj.canSurvive(zd, fu3)) {
+                    fu = fu3;
                 }
-                fk3 = fk.offset(random.nextInt(3) - 1, random.nextInt(2) - random.nextInt(2), random.nextInt(3) - 1);
+                fu3 = fu.offset(random.nextInt(3) - 1, random.nextInt(2) - random.nextInt(2), random.nextInt(3) - 1);
             }
-            if (xd.isEmptyBlock(fk3) && byj.canSurvive(xd, fk3)) {
-                xd.setBlock(fk3, byj, 2);
+            if (zd.isEmptyBlock(fu3) && cfj.canSurvive(zd, fu3)) {
+                zd.setBlock(fu3, cfj, 2);
             }
         }
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.isSolidRender(bjg, fk);
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.isSolidRender(bpg, fu);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        final BlockState byj2 = bjz.getBlockState(fk2);
-        final Block bph7 = byj2.getBlock();
-        return bph7 == Blocks.MYCELIUM || bph7 == Blocks.PODZOL || (bjz.getRawBrightness(fk, 0) < 13 && this.mayPlaceOn(byj2, bjz, fk2));
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj2 = bqd.getBlockState(fu2);
+        return cfj2.is(Blocks.MYCELIUM) || cfj2.is(Blocks.PODZOL) || (bqd.getRawBrightness(fu, 0) < 13 && this.mayPlaceOn(cfj2, bqd, fu2));
     }
     
-    public boolean growMushroom(final ServerLevel xd, final BlockPos fk, final BlockState byj, final Random random) {
-        xd.removeBlock(fk, false);
-        ConfiguredFeature<HugeMushroomFeatureConfiguration, ?> cdc6;
+    public boolean growMushroom(final ServerLevel zd, final BlockPos fu, final BlockState cfj, final Random random) {
+        zd.removeBlock(fu, false);
+        ConfiguredFeature<HugeMushroomFeatureConfiguration, ?> ckb6;
         if (this == Blocks.BROWN_MUSHROOM) {
-            cdc6 = Feature.HUGE_BROWN_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_BROWN_MUSHROOM_CONFIG);
+            ckb6 = Feature.HUGE_BROWN_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_BROWN_MUSHROOM_CONFIG);
         }
         else {
             if (this != Blocks.RED_MUSHROOM) {
-                xd.setBlock(fk, byj, 3);
+                zd.setBlock(fu, cfj, 3);
                 return false;
             }
-            cdc6 = Feature.HUGE_RED_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_RED_MUSHROOM_CONFIG);
+            ckb6 = Feature.HUGE_RED_MUSHROOM.configured(BiomeDefaultFeatures.HUGE_RED_MUSHROOM_CONFIG);
         }
-        if (cdc6.place(xd, xd.getChunkSource().getGenerator(), random, fk)) {
+        if (ckb6.place(zd, zd.structureFeatureManager(), zd.getChunkSource().getGenerator(), random, fu)) {
             return true;
         }
-        xd.setBlock(fk, byj, 3);
+        zd.setBlock(fu, cfj, 3);
         return false;
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
         return true;
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return random.nextFloat() < 0.4;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        this.growMushroom(xd, fk, byj, random);
-    }
-    
-    @Override
-    public boolean hasPostProcess(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return true;
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        this.growMushroom(zd, fu, cfj, random);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/MyceliumBlock.java b/src/net/minecraft/world/level/block/MyceliumBlock.java
index 49e177e..101280f 100644
--- a/src/net/minecraft/world/level/block/MyceliumBlock.java
+++ b/src/net/minecraft/world/level/block/MyceliumBlock.java
@@ -6,6 +6,7 @@ import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class MyceliumBlock extends SpreadingSnowyDirtBlock {
     public MyceliumBlock(final Properties c) {
@@ -13,10 +14,10 @@ public class MyceliumBlock extends SpreadingSnowyDirtBlock {
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        super.animateTick(byj, bjw, fk, random);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        super.animateTick(cfj, bqb, fu, random);
         if (random.nextInt(10) == 0) {
-            bjw.addParticle(ParticleTypes.MYCELIUM, fk.getX() + (double)random.nextFloat(), fk.getY() + 1.1, fk.getZ() + (double)random.nextFloat(), 0.0, 0.0, 0.0);
+            bqb.addParticle(ParticleTypes.MYCELIUM, fu.getX() + random.nextDouble(), fu.getY() + 1.1, fu.getZ() + random.nextDouble(), 0.0, 0.0, 0.0);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/block/NetherPortalBlock.java b/src/net/minecraft/world/level/block/NetherPortalBlock.java
index d103578..e85f6a8 100644
--- a/src/net/minecraft/world/level/block/NetherPortalBlock.java
+++ b/src/net/minecraft/world/level/block/NetherPortalBlock.java
@@ -1,6 +1,8 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.pattern.BlockInWorld;
 import com.google.common.cache.LoadingCache;
@@ -29,6 +31,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
@@ -40,12 +43,12 @@ public class NetherPortalBlock extends Block {
     
     public NetherPortalBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Direction.Axis, Direction.Axis>setValue(NetherPortalBlock.AXIS, Direction.Axis.X));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Direction.Axis, Direction.Axis>setValue(NetherPortalBlock.AXIS, Direction.Axis.X));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        switch (byj.<Direction.Axis>getValue(NetherPortalBlock.AXIS)) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        switch (cfj.<Direction.Axis>getValue(NetherPortalBlock.AXIS)) {
             case Z: {
                 return NetherPortalBlock.Z_AXIS_AABB;
             }
@@ -56,110 +59,110 @@ public class NetherPortalBlock extends Block {
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, BlockPos fk, final Random random) {
-        if (xd.dimension.isNaturalDimension() && xd.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && random.nextInt(2000) < xd.getDifficulty().getId()) {
-            while (xd.getBlockState(fk).getBlock() == this) {
-                fk = fk.below();
+    public void randomTick(final BlockState cfj, final ServerLevel zd, BlockPos fu, final Random random) {
+        if (zd.dimensionType().natural() && zd.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && random.nextInt(2000) < zd.getDifficulty().getId()) {
+            while (zd.getBlockState(fu).is(this)) {
+                fu = fu.below();
             }
-            if (xd.getBlockState(fk).isValidSpawn(xd, fk, EntityType.ZOMBIE_PIGMAN)) {
-                final Entity akq6 = EntityType.ZOMBIE_PIGMAN.spawn(xd, null, null, null, fk.above(), MobSpawnType.STRUCTURE, false, false);
-                if (akq6 != null) {
-                    akq6.changingDimensionDelay = akq6.getDimensionChangingDelay();
+            if (zd.getBlockState(fu).isValidSpawn(zd, fu, EntityType.ZOMBIFIED_PIGLIN)) {
+                final Entity aom6 = EntityType.ZOMBIFIED_PIGLIN.spawn(zd, null, null, null, fu.above(), MobSpawnType.STRUCTURE, false, false);
+                if (aom6 != null) {
+                    aom6.changingDimensionDelay = aom6.getDimensionChangingDelay();
                 }
             }
         }
     }
     
-    public boolean trySpawnPortal(final LevelAccessor bjx, final BlockPos fk) {
-        final PortalShape a4 = this.isPortal(bjx, fk);
-        if (a4 != null) {
-            a4.createPortalBlocks();
+    public static boolean trySpawnPortal(final LevelAccessor bqc, final BlockPos fu) {
+        final PortalShape a3 = isPortal(bqc, fu);
+        if (a3 != null) {
+            a3.createPortalBlocks();
             return true;
         }
         return false;
     }
     
     @Nullable
-    public PortalShape isPortal(final LevelAccessor bjx, final BlockPos fk) {
-        final PortalShape a4 = new PortalShape(bjx, fk, Direction.Axis.X);
+    public static PortalShape isPortal(final LevelAccessor bqc, final BlockPos fu) {
+        final PortalShape a3 = new PortalShape(bqc, fu, Direction.Axis.X);
+        if (a3.isValid() && a3.numPortalBlocks == 0) {
+            return a3;
+        }
+        final PortalShape a4 = new PortalShape(bqc, fu, Direction.Axis.Z);
         if (a4.isValid() && a4.numPortalBlocks == 0) {
             return a4;
         }
-        final PortalShape a5 = new PortalShape(bjx, fk, Direction.Axis.Z);
-        if (a5.isValid() && a5.numPortalBlocks == 0) {
-            return a5;
-        }
         return null;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        final Direction.Axis a8 = fp.getAxis();
-        final Direction.Axis a9 = byj1.<Direction.Axis>getValue(NetherPortalBlock.AXIS);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        final Direction.Axis a8 = fz.getAxis();
+        final Direction.Axis a9 = cfj1.<Direction.Axis>getValue(NetherPortalBlock.AXIS);
         final boolean boolean10 = a9 != a8 && a8.isHorizontal();
-        if (boolean10 || byj3.getBlock() == this || new PortalShape(bjx, fk5, a9).isComplete()) {
-            return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        if (boolean10 || cfj3.is(this) || new PortalShape(bqc, fu5, a9).isComplete()) {
+            return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
         }
         return Blocks.AIR.defaultBlockState();
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (!akq.isPassenger() && !akq.isVehicle() && akq.canChangeDimensions()) {
-            akq.handleInsidePortal(fk);
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (!aom.isPassenger() && !aom.isVehicle() && aom.canChangeDimensions()) {
+            aom.handleInsidePortal(fu);
         }
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
         if (random.nextInt(100) == 0) {
-            bjw.playLocalSound(fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5, SoundEvents.PORTAL_AMBIENT, SoundSource.BLOCKS, 0.5f, random.nextFloat() * 0.4f + 0.8f, false);
+            bqb.playLocalSound(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, SoundEvents.PORTAL_AMBIENT, SoundSource.BLOCKS, 0.5f, random.nextFloat() * 0.4f + 0.8f, false);
         }
         for (int integer6 = 0; integer6 < 4; ++integer6) {
-            double double7 = fk.getX() + (double)random.nextFloat();
-            final double double8 = fk.getY() + (double)random.nextFloat();
-            double double9 = fk.getZ() + (double)random.nextFloat();
+            double double7 = fu.getX() + random.nextDouble();
+            final double double8 = fu.getY() + random.nextDouble();
+            double double9 = fu.getZ() + random.nextDouble();
             double double10 = (random.nextFloat() - 0.5) * 0.5;
             final double double11 = (random.nextFloat() - 0.5) * 0.5;
             double double12 = (random.nextFloat() - 0.5) * 0.5;
             final int integer7 = random.nextInt(2) * 2 - 1;
-            if (bjw.getBlockState(fk.west()).getBlock() == this || bjw.getBlockState(fk.east()).getBlock() == this) {
-                double9 = fk.getZ() + 0.5 + 0.25 * integer7;
+            if (bqb.getBlockState(fu.west()).is(this) || bqb.getBlockState(fu.east()).is(this)) {
+                double9 = fu.getZ() + 0.5 + 0.25 * integer7;
                 double12 = random.nextFloat() * 2.0f * integer7;
             }
             else {
-                double7 = fk.getX() + 0.5 + 0.25 * integer7;
+                double7 = fu.getX() + 0.5 + 0.25 * integer7;
                 double10 = random.nextFloat() * 2.0f * integer7;
             }
-            bjw.addParticle(ParticleTypes.PORTAL, double7, double8, double9, double10, double11, double12);
+            bqb.addParticle(ParticleTypes.PORTAL, double7, double8, double9, double10, double11, double12);
         }
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return ItemStack.EMPTY;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        switch (btu) {
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        switch (cap) {
             case COUNTERCLOCKWISE_90:
             case CLOCKWISE_90: {
-                switch (byj.<Direction.Axis>getValue(NetherPortalBlock.AXIS)) {
+                switch (cfj.<Direction.Axis>getValue(NetherPortalBlock.AXIS)) {
                     case X: {
-                        return ((AbstractStateHolder<O, BlockState>)byj).<Direction.Axis, Direction.Axis>setValue(NetherPortalBlock.AXIS, Direction.Axis.Z);
+                        return ((StateHolder<O, BlockState>)cfj).<Direction.Axis, Direction.Axis>setValue(NetherPortalBlock.AXIS, Direction.Axis.Z);
                     }
                     case Z: {
-                        return ((AbstractStateHolder<O, BlockState>)byj).<Direction.Axis, Direction.Axis>setValue(NetherPortalBlock.AXIS, Direction.Axis.X);
+                        return ((StateHolder<O, BlockState>)cfj).<Direction.Axis, Direction.Axis>setValue(NetherPortalBlock.AXIS, Direction.Axis.X);
                     }
                     default: {
-                        return byj;
+                        return cfj;
                     }
                 }
                 break;
             }
             default: {
-                return byj;
+                return cfj;
             }
         }
     }
@@ -169,26 +172,26 @@ public class NetherPortalBlock extends Block {
         a.add(NetherPortalBlock.AXIS);
     }
     
-    public static BlockPattern.BlockPatternMatch getPortalShape(final LevelAccessor bjx, final BlockPos fk) {
+    public static BlockPattern.BlockPatternMatch getPortalShape(final LevelAccessor bqc, final BlockPos fu) {
         Direction.Axis a3 = Direction.Axis.Z;
-        PortalShape a4 = new PortalShape(bjx, fk, Direction.Axis.X);
-        final LoadingCache<BlockPos, BlockInWorld> loadingCache5 = BlockPattern.createLevelCache(bjx, true);
+        PortalShape a4 = new PortalShape(bqc, fu, Direction.Axis.X);
+        final LoadingCache<BlockPos, BlockInWorld> loadingCache5 = BlockPattern.createLevelCache(bqc, true);
         if (!a4.isValid()) {
             a3 = Direction.Axis.X;
-            a4 = new PortalShape(bjx, fk, Direction.Axis.Z);
+            a4 = new PortalShape(bqc, fu, Direction.Axis.Z);
         }
         if (!a4.isValid()) {
-            return new BlockPattern.BlockPatternMatch(fk, Direction.NORTH, Direction.UP, loadingCache5, 1, 1, 1);
+            return new BlockPattern.BlockPatternMatch(fu, Direction.NORTH, Direction.UP, loadingCache5, 1, 1, 1);
         }
         final int[] arr6 = new int[Direction.AxisDirection.values().length];
-        final Direction fp7 = a4.rightDir.getCounterClockWise();
-        final BlockPos fk2 = a4.bottomLeft.above(a4.getHeight() - 1);
+        final Direction fz7 = a4.rightDir.getCounterClockWise();
+        final BlockPos fu2 = a4.bottomLeft.above(a4.getHeight() - 1);
         for (final Direction.AxisDirection b12 : Direction.AxisDirection.values()) {
-            final BlockPattern.BlockPatternMatch b13 = new BlockPattern.BlockPatternMatch((fp7.getAxisDirection() == b12) ? fk2 : fk2.relative(a4.rightDir, a4.getWidth() - 1), Direction.get(b12, a3), Direction.UP, loadingCache5, a4.getWidth(), a4.getHeight(), 1);
+            final BlockPattern.BlockPatternMatch b13 = new BlockPattern.BlockPatternMatch((fz7.getAxisDirection() == b12) ? fu2 : fu2.relative(a4.rightDir, a4.getWidth() - 1), Direction.get(b12, a3), Direction.UP, loadingCache5, a4.getWidth(), a4.getHeight(), 1);
             for (int integer14 = 0; integer14 < a4.getWidth(); ++integer14) {
                 for (int integer15 = 0; integer15 < a4.getHeight(); ++integer15) {
-                    final BlockInWorld byn16 = b13.getBlock(integer14, integer15, 1);
-                    if (!byn16.getState().isAir()) {
+                    final BlockInWorld cfn16 = b13.getBlock(integer14, integer15, 1);
+                    if (!cfn16.getState().isAir()) {
                         final int[] array = arr6;
                         final int ordinal = b12.ordinal();
                         ++array[ordinal];
@@ -202,7 +205,7 @@ public class NetherPortalBlock extends Block {
                 b14 = b15;
             }
         }
-        return new BlockPattern.BlockPatternMatch((fp7.getAxisDirection() == b14) ? fk2 : fk2.relative(a4.rightDir, a4.getWidth() - 1), Direction.get(b14, a3), Direction.UP, loadingCache5, a4.getWidth(), a4.getHeight(), 1);
+        return new BlockPattern.BlockPatternMatch((fz7.getAxisDirection() == b14) ? fu2 : fu2.relative(a4.rightDir, a4.getWidth() - 1), Direction.get(b14, a3), Direction.UP, loadingCache5, a4.getWidth(), a4.getHeight(), 1);
     }
     
     static {
@@ -222,8 +225,8 @@ public class NetherPortalBlock extends Block {
         private int height;
         private int width;
         
-        public PortalShape(final LevelAccessor bjx, BlockPos fk, final Direction.Axis a) {
-            this.level = bjx;
+        public PortalShape(final LevelAccessor bqc, BlockPos fu, final Direction.Axis a) {
+            this.level = bqc;
             this.axis = a;
             if (a == Direction.Axis.X) {
                 this.leftDir = Direction.EAST;
@@ -233,10 +236,10 @@ public class NetherPortalBlock extends Block {
                 this.leftDir = Direction.NORTH;
                 this.rightDir = Direction.SOUTH;
             }
-            for (BlockPos fk2 = fk; fk.getY() > fk2.getY() - 21 && fk.getY() > 0 && this.isEmpty(bjx.getBlockState(fk.below())); fk = fk.below()) {}
-            final int integer6 = this.getDistanceUntilEdge(fk, this.leftDir) - 1;
+            for (BlockPos fu2 = fu; fu.getY() > fu2.getY() - 21 && fu.getY() > 0 && this.isEmpty(bqc.getBlockState(fu.below())); fu = fu.below()) {}
+            final int integer6 = this.getDistanceUntilEdge(fu, this.leftDir) - 1;
             if (integer6 >= 0) {
-                this.bottomLeft = fk.relative(this.leftDir, integer6);
+                this.bottomLeft = fu.relative(this.leftDir, integer6);
                 this.width = this.getDistanceUntilEdge(this.bottomLeft, this.rightDir);
                 if (this.width < 2 || this.width > 21) {
                     this.bottomLeft = null;
@@ -248,19 +251,18 @@ public class NetherPortalBlock extends Block {
             }
         }
         
-        protected int getDistanceUntilEdge(final BlockPos fk, final Direction fp) {
+        protected int getDistanceUntilEdge(final BlockPos fu, final Direction fz) {
             int integer4;
             for (integer4 = 0; integer4 < 22; ++integer4) {
-                final BlockPos fk2 = fk.relative(fp, integer4);
-                if (!this.isEmpty(this.level.getBlockState(fk2))) {
+                final BlockPos fu2 = fu.relative(fz, integer4);
+                if (!this.isEmpty(this.level.getBlockState(fu2))) {
                     break;
                 }
-                if (this.level.getBlockState(fk2.below()).getBlock() != Blocks.OBSIDIAN) {
+                if (!this.level.getBlockState(fu2.below()).is(Blocks.OBSIDIAN)) {
                     break;
                 }
             }
-            final Block bph5 = this.level.getBlockState(fk.relative(fp, integer4)).getBlock();
-            if (bph5 == Blocks.OBSIDIAN) {
+            if (this.level.getBlockState(fu.relative(fz, integer4)).is(Blocks.OBSIDIAN)) {
                 return integer4;
             }
             return 0;
@@ -276,35 +278,30 @@ public class NetherPortalBlock extends Block {
         
         protected int calculatePortalHeight() {
             this.height = 0;
-        Label_0189:
+        Label_0177:
             while (this.height < 21) {
                 for (int integer2 = 0; integer2 < this.width; ++integer2) {
-                    final BlockPos fk3 = this.bottomLeft.relative(this.rightDir, integer2).above(this.height);
-                    final BlockState byj4 = this.level.getBlockState(fk3);
-                    if (!this.isEmpty(byj4)) {
-                        break Label_0189;
+                    final BlockPos fu3 = this.bottomLeft.relative(this.rightDir, integer2).above(this.height);
+                    final BlockState cfj4 = this.level.getBlockState(fu3);
+                    if (!this.isEmpty(cfj4)) {
+                        break Label_0177;
                     }
-                    Block bph5 = byj4.getBlock();
-                    if (bph5 == Blocks.NETHER_PORTAL) {
+                    if (cfj4.is(Blocks.NETHER_PORTAL)) {
                         ++this.numPortalBlocks;
                     }
                     if (integer2 == 0) {
-                        bph5 = this.level.getBlockState(fk3.relative(this.leftDir)).getBlock();
-                        if (bph5 != Blocks.OBSIDIAN) {
-                            break Label_0189;
+                        if (!this.level.getBlockState(fu3.relative(this.leftDir)).is(Blocks.OBSIDIAN)) {
+                            break Label_0177;
                         }
                     }
-                    else if (integer2 == this.width - 1) {
-                        bph5 = this.level.getBlockState(fk3.relative(this.rightDir)).getBlock();
-                        if (bph5 != Blocks.OBSIDIAN) {
-                            break Label_0189;
-                        }
+                    else if (integer2 == this.width - 1 && !this.level.getBlockState(fu3.relative(this.rightDir)).is(Blocks.OBSIDIAN)) {
+                        break Label_0177;
                     }
                 }
                 ++this.height;
             }
             for (int integer2 = 0; integer2 < this.width; ++integer2) {
-                if (this.level.getBlockState(this.bottomLeft.relative(this.rightDir, integer2).above(this.height)).getBlock() != Blocks.OBSIDIAN) {
+                if (!this.level.getBlockState(this.bottomLeft.relative(this.rightDir, integer2).above(this.height)).is(Blocks.OBSIDIAN)) {
                     this.height = 0;
                     break;
                 }
@@ -317,9 +314,8 @@ public class NetherPortalBlock extends Block {
             return this.height;
         }
         
-        protected boolean isEmpty(final BlockState byj) {
-            final Block bph3 = byj.getBlock();
-            return byj.isAir() || bph3 == Blocks.FIRE || bph3 == Blocks.NETHER_PORTAL;
+        protected boolean isEmpty(final BlockState cfj) {
+            return cfj.isAir() || cfj.is(BlockTags.FIRE) || cfj.is(Blocks.NETHER_PORTAL);
         }
         
         public boolean isValid() {
@@ -328,9 +324,9 @@ public class NetherPortalBlock extends Block {
         
         public void createPortalBlocks() {
             for (int integer2 = 0; integer2 < this.width; ++integer2) {
-                final BlockPos fk3 = this.bottomLeft.relative(this.rightDir, integer2);
+                final BlockPos fu3 = this.bottomLeft.relative(this.rightDir, integer2);
                 for (int integer3 = 0; integer3 < this.height; ++integer3) {
-                    this.level.setBlock(fk3.above(integer3), ((AbstractStateHolder<O, BlockState>)Blocks.NETHER_PORTAL.defaultBlockState()).<Direction.Axis, Direction.Axis>setValue(NetherPortalBlock.AXIS, this.axis), 18);
+                    this.level.setBlock(fu3.above(integer3), ((StateHolder<O, BlockState>)Blocks.NETHER_PORTAL.defaultBlockState()).<Direction.Axis, Direction.Axis>setValue(NetherPortalBlock.AXIS, this.axis), 18);
                 }
             }
         }
diff --git a/src/net/minecraft/world/level/block/NetherSproutsBlock.java b/src/net/minecraft/world/level/block/NetherSproutsBlock.java
new file mode 100644
index 0000000..34f4453
--- /dev/null
+++ b/src/net/minecraft/world/level/block/NetherSproutsBlock.java
@@ -0,0 +1,37 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public class NetherSproutsBlock extends BushBlock {
+    protected static final VoxelShape SHAPE;
+    
+    public NetherSproutsBlock(final Properties c) {
+        super(c);
+    }
+    
+    @Override
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return NetherSproutsBlock.SHAPE;
+    }
+    
+    @Override
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.is(BlockTags.NYLIUM) || cfj.is(Blocks.SOUL_SOIL) || super.mayPlaceOn(cfj, bpg, fu);
+    }
+    
+    @Override
+    public OffsetType getOffsetType() {
+        return OffsetType.XZ;
+    }
+    
+    static {
+        SHAPE = Block.box(2.0, 0.0, 2.0, 14.0, 3.0, 14.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/NetherVines.java b/src/net/minecraft/world/level/block/NetherVines.java
new file mode 100644
index 0000000..bff86a1
--- /dev/null
+++ b/src/net/minecraft/world/level/block/NetherVines.java
@@ -0,0 +1,17 @@
+package net.minecraft.world.level.block;
+
+import java.util.Random;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class NetherVines {
+    public static boolean isValidGrowthState(final BlockState cfj) {
+        return cfj.isAir();
+    }
+    
+    public static int getBlocksToGrowWhenBonemealed(final Random random) {
+        double double2;
+        int integer4;
+        for (double2 = 1.0, integer4 = 0; random.nextDouble() < double2; double2 *= 0.826, ++integer4) {}
+        return integer4;
+    }
+}
diff --git a/src/net/minecraft/world/level/block/NetherWartBlock.java b/src/net/minecraft/world/level/block/NetherWartBlock.java
index 89c75f6..8c16e57 100644
--- a/src/net/minecraft/world/level/block/NetherWartBlock.java
+++ b/src/net/minecraft/world/level/block/NetherWartBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.ItemLike;
@@ -13,6 +13,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -22,31 +23,35 @@ public class NetherWartBlock extends BushBlock {
     
     protected NetherWartBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)NetherWartBlock.AGE, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)NetherWartBlock.AGE, 0));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return NetherWartBlock.SHAPE_BY_AGE[byj.<Integer>getValue((Property<Integer>)NetherWartBlock.AGE)];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return NetherWartBlock.SHAPE_BY_AGE[cfj.<Integer>getValue((Property<Integer>)NetherWartBlock.AGE)];
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.getBlock() == Blocks.SOUL_SAND;
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.is(Blocks.SOUL_SAND);
     }
     
     @Override
-    public void tick(BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        final int integer6 = byj.<Integer>getValue((Property<Integer>)NetherWartBlock.AGE);
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)NetherWartBlock.AGE) < 3;
+    }
+    
+    @Override
+    public void randomTick(BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final int integer6 = cfj.<Integer>getValue((Property<Integer>)NetherWartBlock.AGE);
         if (integer6 < 3 && random.nextInt(10) == 0) {
-            byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)NetherWartBlock.AGE, integer6 + 1);
-            xd.setBlock(fk, byj, 2);
+            cfj = ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)NetherWartBlock.AGE, integer6 + 1);
+            zd.setBlock(fu, cfj, 2);
         }
-        super.tick(byj, xd, fk, random);
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return new ItemStack(Items.NETHER_WART);
     }
     
diff --git a/src/net/minecraft/world/level/block/NetherrackBlock.java b/src/net/minecraft/world/level/block/NetherrackBlock.java
new file mode 100644
index 0000000..e18c895
--- /dev/null
+++ b/src/net/minecraft/world/level/block/NetherrackBlock.java
@@ -0,0 +1,63 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.server.level.ServerLevel;
+import java.util.Random;
+import net.minecraft.world.level.Level;
+import java.util.Iterator;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+
+public class NetherrackBlock extends Block implements BonemealableBlock {
+    public NetherrackBlock(final Properties c) {
+        super(c);
+    }
+    
+    @Override
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        if (!bpg.getBlockState(fu.above()).propagatesSkylightDown(bpg, fu)) {
+            return false;
+        }
+        for (final BlockPos fu2 : BlockPos.betweenClosed(fu.offset(-1, -1, -1), fu.offset(1, 1, 1))) {
+            if (bpg.getBlockState(fu2).is(BlockTags.NYLIUM)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    @Override
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
+        return true;
+    }
+    
+    @Override
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        boolean boolean6 = false;
+        boolean boolean7 = false;
+        for (final BlockPos fu2 : BlockPos.betweenClosed(fu.offset(-1, -1, -1), fu.offset(1, 1, 1))) {
+            final BlockState cfj2 = zd.getBlockState(fu2);
+            if (cfj2.is(Blocks.WARPED_NYLIUM)) {
+                boolean7 = true;
+            }
+            if (cfj2.is(Blocks.CRIMSON_NYLIUM)) {
+                boolean6 = true;
+            }
+            if (boolean7 && boolean6) {
+                break;
+            }
+        }
+        if (boolean7 && boolean6) {
+            zd.setBlock(fu, random.nextBoolean() ? Blocks.WARPED_NYLIUM.defaultBlockState() : Blocks.CRIMSON_NYLIUM.defaultBlockState(), 3);
+        }
+        else if (boolean7) {
+            zd.setBlock(fu, Blocks.WARPED_NYLIUM.defaultBlockState(), 3);
+        }
+        else if (boolean6) {
+            zd.setBlock(fu, Blocks.CRIMSON_NYLIUM.defaultBlockState(), 3);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/block/NoteBlock.java b/src/net/minecraft/world/level/block/NoteBlock.java
index 8c77636..4defd8d 100644
--- a/src/net/minecraft/world/level/block/NoteBlock.java
+++ b/src/net/minecraft/world/level/block/NoteBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.core.particles.ParticleOptions;
@@ -18,6 +18,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
@@ -30,66 +31,66 @@ public class NoteBlock extends Block {
     
     public NoteBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.HARP)).setValue((Property<Comparable>)NoteBlock.NOTE, 0)).<Comparable, Boolean>setValue((Property<Comparable>)NoteBlock.POWERED, false));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.HARP)).setValue((Property<Comparable>)NoteBlock.NOTE, 0)).<Comparable, Boolean>setValue((Property<Comparable>)NoteBlock.POWERED, false));
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<NoteBlockInstrument, NoteBlockInstrument>setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.byState(bcq.getLevel().getBlockState(bcq.getClickedPos().below())));
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<NoteBlockInstrument, NoteBlockInstrument>setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.byState(bin.getLevel().getBlockState(bin.getClickedPos().below())));
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN) {
-            return ((AbstractStateHolder<O, BlockState>)byj1).<NoteBlockInstrument, NoteBlockInstrument>setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.byState(byj3));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN) {
+            return ((StateHolder<O, BlockState>)cfj1).<NoteBlockInstrument, NoteBlockInstrument>setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.byState(cfj3));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        final boolean boolean7 = bjw.hasNeighborSignal(fk3);
-        if (boolean7 != byj.<Boolean>getValue((Property<Boolean>)NoteBlock.POWERED)) {
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        final boolean boolean7 = bqb.hasNeighborSignal(fu3);
+        if (boolean7 != cfj.<Boolean>getValue((Property<Boolean>)NoteBlock.POWERED)) {
             if (boolean7) {
-                this.playNote(bjw, fk3);
+                this.playNote(bqb, fu3);
             }
-            bjw.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)NoteBlock.POWERED, boolean7), 3);
+            bqb.setBlock(fu3, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)NoteBlock.POWERED, boolean7), 3);
         }
     }
     
-    private void playNote(final Level bjw, final BlockPos fk) {
-        if (bjw.getBlockState(fk.above()).isAir()) {
-            bjw.blockEvent(fk, this, 0, 0);
+    private void playNote(final Level bqb, final BlockPos fu) {
+        if (bqb.getBlockState(fu.above()).isAir()) {
+            bqb.blockEvent(fu, this, 0, 0);
         }
     }
     
     @Override
-    public InteractionResult use(BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)NoteBlock.NOTE);
-        bjw.setBlock(fk, byj, 3);
-        this.playNote(bjw, fk);
-        ayj.awardStat(Stats.TUNE_NOTEBLOCK);
-        return InteractionResult.SUCCESS;
+        cfj = ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)NoteBlock.NOTE);
+        bqb.setBlock(fu, cfj, 3);
+        this.playNote(bqb, fu);
+        bec.awardStat(Stats.TUNE_NOTEBLOCK);
+        return InteractionResult.CONSUME;
     }
     
     @Override
-    public void attack(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj) {
-        if (bjw.isClientSide) {
+    public void attack(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec) {
+        if (bqb.isClientSide) {
             return;
         }
-        this.playNote(bjw, fk);
-        ayj.awardStat(Stats.PLAY_NOTEBLOCK);
+        this.playNote(bqb, fu);
+        bec.awardStat(Stats.PLAY_NOTEBLOCK);
     }
     
     @Override
-    public boolean triggerEvent(final BlockState byj, final Level bjw, final BlockPos fk, final int integer4, final int integer5) {
-        final int integer6 = byj.<Integer>getValue((Property<Integer>)NoteBlock.NOTE);
+    public boolean triggerEvent(final BlockState cfj, final Level bqb, final BlockPos fu, final int integer4, final int integer5) {
+        final int integer6 = cfj.<Integer>getValue((Property<Integer>)NoteBlock.NOTE);
         final float float8 = (float)Math.pow(2.0, (integer6 - 12) / 12.0);
-        bjw.playSound(null, fk, byj.<NoteBlockInstrument>getValue(NoteBlock.INSTRUMENT).getSoundEvent(), SoundSource.RECORDS, 3.0f, float8);
-        bjw.addParticle(ParticleTypes.NOTE, fk.getX() + 0.5, fk.getY() + 1.2, fk.getZ() + 0.5, integer6 / 24.0, 0.0, 0.0);
+        bqb.playSound(null, fu, cfj.<NoteBlockInstrument>getValue(NoteBlock.INSTRUMENT).getSoundEvent(), SoundSource.RECORDS, 3.0f, float8);
+        bqb.addParticle(ParticleTypes.NOTE, fu.getX() + 0.5, fu.getY() + 1.2, fu.getZ() + 0.5, integer6 / 24.0, 0.0, 0.0);
         return true;
     }
     
diff --git a/src/net/minecraft/world/level/block/NyliumBlock.java b/src/net/minecraft/world/level/block/NyliumBlock.java
new file mode 100644
index 0000000..f300473
--- /dev/null
+++ b/src/net/minecraft/world/level/block/NyliumBlock.java
@@ -0,0 +1,62 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.level.levelgen.feature.TwistingVinesFeature;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.levelgen.feature.NetherForestVegetationFeature;
+import net.minecraft.world.level.biome.BiomeDefaultFeatures;
+import net.minecraft.world.level.Level;
+import java.util.Random;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.lighting.LayerLightEngine;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.core.Direction;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+
+public class NyliumBlock extends Block implements BonemealableBlock {
+    protected NyliumBlock(final Properties c) {
+        super(c);
+    }
+    
+    private static boolean canBeNylium(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.above();
+        final BlockState cfj2 = bqd.getBlockState(fu2);
+        final int integer6 = LayerLightEngine.getLightBlockInto(bqd, cfj, fu, cfj2, fu2, Direction.UP, cfj2.getLightBlock(bqd, fu2));
+        return integer6 < bqd.getMaxLightLevel();
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!canBeNylium(cfj, zd, fu)) {
+            zd.setBlockAndUpdate(fu, Blocks.NETHERRACK.defaultBlockState());
+        }
+    }
+    
+    @Override
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        return bpg.getBlockState(fu.above()).isAir();
+    }
+    
+    @Override
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
+        return true;
+    }
+    
+    @Override
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        final BlockState cfj2 = zd.getBlockState(fu);
+        final BlockPos fu2 = fu.above();
+        if (cfj2.is(Blocks.CRIMSON_NYLIUM)) {
+            NetherForestVegetationFeature.place(zd, random, fu2, BiomeDefaultFeatures.CRIMSON_FOREST_CONFIG, 3, 1);
+        }
+        else if (cfj2.is(Blocks.WARPED_NYLIUM)) {
+            NetherForestVegetationFeature.place(zd, random, fu2, BiomeDefaultFeatures.WARPED_FOREST_CONFIG, 3, 1);
+            NetherForestVegetationFeature.place(zd, random, fu2, BiomeDefaultFeatures.NETHER_SPROUTS_CONFIG, 3, 1);
+            if (random.nextInt(8) == 0) {
+                TwistingVinesFeature.place(zd, random, fu2, 3, 1, 2);
+            }
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/block/ObserverBlock.java b/src/net/minecraft/world/level/block/ObserverBlock.java
index da4568c..27f88e2 100644
--- a/src/net/minecraft/world/level/block/ObserverBlock.java
+++ b/src/net/minecraft/world/level/block/ObserverBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
@@ -13,6 +13,7 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public class ObserverBlock extends DirectionalBlock {
@@ -20,7 +21,7 @@ public class ObserverBlock extends DirectionalBlock {
     
     public ObserverBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ObserverBlock.FACING, Direction.SOUTH)).<Comparable, Boolean>setValue((Property<Comparable>)ObserverBlock.POWERED, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ObserverBlock.FACING, Direction.SOUTH)).<Comparable, Boolean>setValue((Property<Comparable>)ObserverBlock.POWERED, false));
     }
     
     @Override
@@ -29,91 +30,91 @@ public class ObserverBlock extends DirectionalBlock {
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)ObserverBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)ObserverBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)ObserverBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)ObserverBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)ObserverBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)ObserverBlock.FACING)));
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (byj.<Boolean>getValue((Property<Boolean>)ObserverBlock.POWERED)) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)ObserverBlock.POWERED, false), 2);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)ObserverBlock.POWERED)) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)ObserverBlock.POWERED, false), 2);
         }
         else {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)ObserverBlock.POWERED, true), 2);
-            xd.getBlockTicks().scheduleTick(fk, this, 2);
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)ObserverBlock.POWERED, true), 2);
+            zd.getBlockTicks().scheduleTick(fu, this, 2);
         }
-        this.updateNeighborsInFront(xd, fk, byj);
+        this.updateNeighborsInFront(zd, fu, cfj);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Comparable>getValue((Property<Comparable>)ObserverBlock.FACING) == fp && !byj1.<Boolean>getValue((Property<Boolean>)ObserverBlock.POWERED)) {
-            this.startSignal(bjx, fk5);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Comparable>getValue((Property<Comparable>)ObserverBlock.FACING) == fz && !cfj1.<Boolean>getValue((Property<Boolean>)ObserverBlock.POWERED)) {
+            this.startSignal(bqc, fu5);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
-    private void startSignal(final LevelAccessor bjx, final BlockPos fk) {
-        if (!bjx.isClientSide() && !bjx.getBlockTicks().hasScheduledTick(fk, this)) {
-            bjx.getBlockTicks().scheduleTick(fk, this, 2);
+    private void startSignal(final LevelAccessor bqc, final BlockPos fu) {
+        if (!bqc.isClientSide() && !bqc.getBlockTicks().hasScheduledTick(fu, this)) {
+            bqc.getBlockTicks().scheduleTick(fu, this, 2);
         }
     }
     
-    protected void updateNeighborsInFront(final Level bjw, final BlockPos fk, final BlockState byj) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)ObserverBlock.FACING);
-        final BlockPos fk2 = fk.relative(fp5.getOpposite());
-        bjw.neighborChanged(fk2, this, fk);
-        bjw.updateNeighborsAtExceptFromFacing(fk2, this, fp5);
+    protected void updateNeighborsInFront(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)ObserverBlock.FACING);
+        final BlockPos fu2 = fu.relative(fz5.getOpposite());
+        bqb.neighborChanged(fu2, this, fu);
+        bqb.updateNeighborsAtExceptFromFacing(fu2, this, fz5);
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return byj.getSignal(bjg, fk, fp);
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return cfj.getSignal(bpg, fu, fz);
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (byj.<Boolean>getValue((Property<Boolean>)ObserverBlock.POWERED) && byj.<Comparable>getValue((Property<Comparable>)ObserverBlock.FACING) == fp) {
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)ObserverBlock.POWERED) && cfj.<Comparable>getValue((Property<Comparable>)ObserverBlock.FACING) == fz) {
             return 15;
         }
         return 0;
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        if (!bjw.isClientSide() && byj1.<Boolean>getValue((Property<Boolean>)ObserverBlock.POWERED) && !bjw.getBlockTicks().hasScheduledTick(fk, this)) {
-            final BlockState byj5 = ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)ObserverBlock.POWERED, false);
-            bjw.setBlock(fk, byj5, 18);
-            this.updateNeighborsInFront(bjw, fk, byj5);
+        if (!bqb.isClientSide() && cfj1.<Boolean>getValue((Property<Boolean>)ObserverBlock.POWERED) && !bqb.getBlockTicks().hasScheduledTick(fu, this)) {
+            final BlockState cfj5 = ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)ObserverBlock.POWERED, false);
+            bqb.setBlock(fu, cfj5, 18);
+            this.updateNeighborsInFront(bqb, fu, cfj5);
         }
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        if (!bjw.isClientSide && byj1.<Boolean>getValue((Property<Boolean>)ObserverBlock.POWERED) && bjw.getBlockTicks().hasScheduledTick(fk, this)) {
-            this.updateNeighborsInFront(bjw, fk, ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)ObserverBlock.POWERED, false));
+        if (!bqb.isClientSide && cfj1.<Boolean>getValue((Property<Boolean>)ObserverBlock.POWERED) && bqb.getBlockTicks().hasScheduledTick(fu, this)) {
+            this.updateNeighborsInFront(bqb, fu, ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)ObserverBlock.POWERED, false));
         }
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)ObserverBlock.FACING, bcq.getNearestLookingDirection().getOpposite().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)ObserverBlock.FACING, bin.getNearestLookingDirection().getOpposite().getOpposite());
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/OreBlock.java b/src/net/minecraft/world/level/block/OreBlock.java
index 2af2e02..062a642 100644
--- a/src/net/minecraft/world/level/block/OreBlock.java
+++ b/src/net/minecraft/world/level/block/OreBlock.java
@@ -8,6 +8,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.util.Mth;
 import java.util.Random;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class OreBlock extends Block {
     public OreBlock(final Properties c) {
@@ -30,16 +31,19 @@ public class OreBlock extends Block {
         if (this == Blocks.NETHER_QUARTZ_ORE) {
             return Mth.nextInt(random, 2, 5);
         }
+        if (this == Blocks.NETHER_GOLD_ORE) {
+            return Mth.nextInt(random, 0, 1);
+        }
         return 0;
     }
     
     @Override
-    public void spawnAfterBreak(final BlockState byj, final Level bjw, final BlockPos fk, final ItemStack ben) {
-        super.spawnAfterBreak(byj, bjw, fk, ben);
-        if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, ben) == 0) {
-            final int integer6 = this.xpOnDrop(bjw.random);
+    public void spawnAfterBreak(final BlockState cfj, final Level bqb, final BlockPos fu, final ItemStack bki) {
+        super.spawnAfterBreak(cfj, bqb, fu, bki);
+        if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, bki) == 0) {
+            final int integer6 = this.xpOnDrop(bqb.random);
             if (integer6 > 0) {
-                this.popExperience(bjw, fk, integer6);
+                this.popExperience(bqb, fu, integer6);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/block/PipeBlock.java b/src/net/minecraft/world/level/block/PipeBlock.java
index b446d99..d05b4a3 100644
--- a/src/net/minecraft/world/level/block/PipeBlock.java
+++ b/src/net/minecraft/world/level/block/PipeBlock.java
@@ -10,6 +10,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import java.util.Map;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
@@ -34,39 +35,39 @@ public class PipeBlock extends Block {
     private VoxelShape[] makeShapes(final float float1) {
         final float float2 = 0.5f - float1;
         final float float3 = 0.5f + float1;
-        final VoxelShape cwf5 = Block.box(float2 * 16.0f, float2 * 16.0f, float2 * 16.0f, float3 * 16.0f, float3 * 16.0f, float3 * 16.0f);
+        final VoxelShape dfg5 = Block.box(float2 * 16.0f, float2 * 16.0f, float2 * 16.0f, float3 * 16.0f, float3 * 16.0f, float3 * 16.0f);
         final VoxelShape[] arr6 = new VoxelShape[PipeBlock.DIRECTIONS.length];
         for (int integer7 = 0; integer7 < PipeBlock.DIRECTIONS.length; ++integer7) {
-            final Direction fp8 = PipeBlock.DIRECTIONS[integer7];
-            arr6[integer7] = Shapes.box(0.5 + Math.min(-float1, fp8.getStepX() * 0.5), 0.5 + Math.min(-float1, fp8.getStepY() * 0.5), 0.5 + Math.min(-float1, fp8.getStepZ() * 0.5), 0.5 + Math.max(float1, fp8.getStepX() * 0.5), 0.5 + Math.max(float1, fp8.getStepY() * 0.5), 0.5 + Math.max(float1, fp8.getStepZ() * 0.5));
+            final Direction fz8 = PipeBlock.DIRECTIONS[integer7];
+            arr6[integer7] = Shapes.box(0.5 + Math.min(-float1, fz8.getStepX() * 0.5), 0.5 + Math.min(-float1, fz8.getStepY() * 0.5), 0.5 + Math.min(-float1, fz8.getStepZ() * 0.5), 0.5 + Math.max(float1, fz8.getStepX() * 0.5), 0.5 + Math.max(float1, fz8.getStepY() * 0.5), 0.5 + Math.max(float1, fz8.getStepZ() * 0.5));
         }
         final VoxelShape[] arr7 = new VoxelShape[64];
         for (int integer8 = 0; integer8 < 64; ++integer8) {
-            VoxelShape cwf6 = cwf5;
+            VoxelShape dfg6 = dfg5;
             for (int integer9 = 0; integer9 < PipeBlock.DIRECTIONS.length; ++integer9) {
                 if ((integer8 & 1 << integer9) != 0x0) {
-                    cwf6 = Shapes.or(cwf6, arr6[integer9]);
+                    dfg6 = Shapes.or(dfg6, arr6[integer9]);
                 }
             }
-            arr7[integer8] = cwf6;
+            arr7[integer8] = dfg6;
         }
         return arr7;
     }
     
     @Override
-    public boolean propagatesSkylightDown(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public boolean propagatesSkylightDown(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return false;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return this.shapeByIndex[this.getAABBIndex(byj)];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.shapeByIndex[this.getAABBIndex(cfj)];
     }
     
-    protected int getAABBIndex(final BlockState byj) {
+    protected int getAABBIndex(final BlockState cfj) {
         int integer3 = 0;
         for (int integer4 = 0; integer4 < PipeBlock.DIRECTIONS.length; ++integer4) {
-            if (byj.<Boolean>getValue((Property<Boolean>)PipeBlock.PROPERTY_BY_DIRECTION.get(PipeBlock.DIRECTIONS[integer4]))) {
+            if (cfj.<Boolean>getValue((Property<Boolean>)PipeBlock.PROPERTY_BY_DIRECTION.get(PipeBlock.DIRECTIONS[integer4]))) {
                 integer3 |= 1 << integer4;
             }
         }
diff --git a/src/net/minecraft/world/level/block/PlayerHeadBlock.java b/src/net/minecraft/world/level/block/PlayerHeadBlock.java
index 4ffeaf6..c22c64f 100644
--- a/src/net/minecraft/world/level/block/PlayerHeadBlock.java
+++ b/src/net/minecraft/world/level/block/PlayerHeadBlock.java
@@ -13,6 +13,7 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class PlayerHeadBlock extends SkullBlock {
     protected PlayerHeadBlock(final Properties c) {
@@ -20,22 +21,22 @@ public class PlayerHeadBlock extends SkullBlock {
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, @Nullable final LivingEntity akz, final ItemStack ben) {
-        super.setPlacedBy(bjw, fk, byj, akz, ben);
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof SkullBlockEntity) {
-            final SkullBlockEntity bxi8 = (SkullBlockEntity)bwl7;
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
+        super.setPlacedBy(bqb, fu, cfj, aoy, bki);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof SkullBlockEntity) {
+            final SkullBlockEntity cei8 = (SkullBlockEntity)cdl7;
             GameProfile gameProfile9 = null;
-            if (ben.hasTag()) {
-                final CompoundTag jt10 = ben.getTag();
-                if (jt10.contains("SkullOwner", 10)) {
-                    gameProfile9 = NbtUtils.readGameProfile(jt10.getCompound("SkullOwner"));
+            if (bki.hasTag()) {
+                final CompoundTag le10 = bki.getTag();
+                if (le10.contains("SkullOwner", 10)) {
+                    gameProfile9 = NbtUtils.readGameProfile(le10.getCompound("SkullOwner"));
                 }
-                else if (jt10.contains("SkullOwner", 8) && !StringUtils.isBlank((CharSequence)jt10.getString("SkullOwner"))) {
-                    gameProfile9 = new GameProfile((UUID)null, jt10.getString("SkullOwner"));
+                else if (le10.contains("SkullOwner", 8) && !StringUtils.isBlank((CharSequence)le10.getString("SkullOwner"))) {
+                    gameProfile9 = new GameProfile((UUID)null, le10.getString("SkullOwner"));
                 }
             }
-            bxi8.setOwner(gameProfile9);
+            cei8.setOwner(gameProfile9);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/block/PlayerWallHeadBlock.java b/src/net/minecraft/world/level/block/PlayerWallHeadBlock.java
index 9c3181b..95a2950 100644
--- a/src/net/minecraft/world/level/block/PlayerWallHeadBlock.java
+++ b/src/net/minecraft/world/level/block/PlayerWallHeadBlock.java
@@ -8,6 +8,7 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class PlayerWallHeadBlock extends WallSkullBlock {
     protected PlayerWallHeadBlock(final Properties c) {
@@ -15,12 +16,12 @@ public class PlayerWallHeadBlock extends WallSkullBlock {
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, @Nullable final LivingEntity akz, final ItemStack ben) {
-        Blocks.PLAYER_HEAD.setPlacedBy(bjw, fk, byj, akz, ben);
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
+        Blocks.PLAYER_HEAD.setPlacedBy(bqb, fu, cfj, aoy, bki);
     }
     
     @Override
-    public List<ItemStack> getDrops(final BlockState byj, final LootContext.Builder a) {
-        return Blocks.PLAYER_HEAD.getDrops(byj, a);
+    public List<ItemStack> getDrops(final BlockState cfj, final LootContext.Builder a) {
+        return Blocks.PLAYER_HEAD.getDrops(cfj, a);
     }
 }
diff --git a/src/net/minecraft/world/level/block/PotatoBlock.java b/src/net/minecraft/world/level/block/PotatoBlock.java
index 3a84ef6..30921fb 100644
--- a/src/net/minecraft/world/level/block/PotatoBlock.java
+++ b/src/net/minecraft/world/level/block/PotatoBlock.java
@@ -7,6 +7,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class PotatoBlock extends CropBlock {
@@ -22,8 +23,8 @@ public class PotatoBlock extends CropBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return PotatoBlock.SHAPE_BY_AGE[byj.<Integer>getValue((Property<Integer>)this.getAgeProperty())];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return PotatoBlock.SHAPE_BY_AGE[cfj.<Integer>getValue((Property<Integer>)this.getAgeProperty())];
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/PoweredBlock.java b/src/net/minecraft/world/level/block/PoweredBlock.java
index 039a2a7..83f2bd2 100644
--- a/src/net/minecraft/world/level/block/PoweredBlock.java
+++ b/src/net/minecraft/world/level/block/PoweredBlock.java
@@ -4,6 +4,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class PoweredBlock extends Block {
     public PoweredBlock(final Properties c) {
@@ -11,12 +12,12 @@ public class PoweredBlock extends Block {
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
         return 15;
     }
 }
diff --git a/src/net/minecraft/world/level/block/PoweredRailBlock.java b/src/net/minecraft/world/level/block/PoweredRailBlock.java
index 809ae1c..abcbd9e 100644
--- a/src/net/minecraft/world/level/block/PoweredRailBlock.java
+++ b/src/net/minecraft/world/level/block/PoweredRailBlock.java
@@ -1,12 +1,13 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.RailShape;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
@@ -17,19 +18,19 @@ public class PoweredRailBlock extends BaseRailBlock {
     
     protected PoweredRailBlock(final Properties c) {
         super(true, c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_SOUTH)).<Comparable, Boolean>setValue((Property<Comparable>)PoweredRailBlock.POWERED, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_SOUTH)).<Comparable, Boolean>setValue((Property<Comparable>)PoweredRailBlock.POWERED, false));
     }
     
-    protected boolean findPoweredRailSignal(final Level bjw, final BlockPos fk, final BlockState byj, final boolean boolean4, final int integer) {
+    protected boolean findPoweredRailSignal(final Level bqb, final BlockPos fu, final BlockState cfj, final boolean boolean4, final int integer) {
         if (integer >= 8) {
             return false;
         }
-        int integer2 = fk.getX();
-        int integer3 = fk.getY();
-        int integer4 = fk.getZ();
+        int integer2 = fu.getX();
+        int integer3 = fu.getY();
+        int integer4 = fu.getZ();
         boolean boolean5 = true;
-        RailShape bzn11 = byj.<RailShape>getValue(PoweredRailBlock.SHAPE);
-        switch (bzn11) {
+        RailShape cgm11 = cfj.<RailShape>getValue(PoweredRailBlock.SHAPE);
+        switch (cgm11) {
             case NORTH_SOUTH: {
                 if (boolean4) {
                     ++integer4;
@@ -55,7 +56,7 @@ public class PoweredRailBlock extends BaseRailBlock {
                     ++integer3;
                     boolean5 = false;
                 }
-                bzn11 = RailShape.EAST_WEST;
+                cgm11 = RailShape.EAST_WEST;
                 break;
             }
             case ASCENDING_WEST: {
@@ -67,7 +68,7 @@ public class PoweredRailBlock extends BaseRailBlock {
                 else {
                     ++integer2;
                 }
-                bzn11 = RailShape.EAST_WEST;
+                cgm11 = RailShape.EAST_WEST;
                 break;
             }
             case ASCENDING_NORTH: {
@@ -79,7 +80,7 @@ public class PoweredRailBlock extends BaseRailBlock {
                     ++integer3;
                     boolean5 = false;
                 }
-                bzn11 = RailShape.NORTH_SOUTH;
+                cgm11 = RailShape.NORTH_SOUTH;
                 break;
             }
             case ASCENDING_SOUTH: {
@@ -91,31 +92,31 @@ public class PoweredRailBlock extends BaseRailBlock {
                 else {
                     --integer4;
                 }
-                bzn11 = RailShape.NORTH_SOUTH;
+                cgm11 = RailShape.NORTH_SOUTH;
                 break;
             }
         }
-        return this.isSameRailWithPower(bjw, new BlockPos(integer2, integer3, integer4), boolean4, integer, bzn11) || (boolean5 && this.isSameRailWithPower(bjw, new BlockPos(integer2, integer3 - 1, integer4), boolean4, integer, bzn11));
+        return this.isSameRailWithPower(bqb, new BlockPos(integer2, integer3, integer4), boolean4, integer, cgm11) || (boolean5 && this.isSameRailWithPower(bqb, new BlockPos(integer2, integer3 - 1, integer4), boolean4, integer, cgm11));
     }
     
-    protected boolean isSameRailWithPower(final Level bjw, final BlockPos fk, final boolean boolean3, final int integer, final RailShape bzn) {
-        final BlockState byj7 = bjw.getBlockState(fk);
-        if (byj7.getBlock() != this) {
+    protected boolean isSameRailWithPower(final Level bqb, final BlockPos fu, final boolean boolean3, final int integer, final RailShape cgm) {
+        final BlockState cfj7 = bqb.getBlockState(fu);
+        if (!cfj7.is(this)) {
             return false;
         }
-        final RailShape bzn2 = byj7.<RailShape>getValue(PoweredRailBlock.SHAPE);
-        return (bzn != RailShape.EAST_WEST || (bzn2 != RailShape.NORTH_SOUTH && bzn2 != RailShape.ASCENDING_NORTH && bzn2 != RailShape.ASCENDING_SOUTH)) && (bzn != RailShape.NORTH_SOUTH || (bzn2 != RailShape.EAST_WEST && bzn2 != RailShape.ASCENDING_EAST && bzn2 != RailShape.ASCENDING_WEST)) && byj7.<Boolean>getValue((Property<Boolean>)PoweredRailBlock.POWERED) && (bjw.hasNeighborSignal(fk) || this.findPoweredRailSignal(bjw, fk, byj7, boolean3, integer + 1));
+        final RailShape cgm2 = cfj7.<RailShape>getValue(PoweredRailBlock.SHAPE);
+        return (cgm != RailShape.EAST_WEST || (cgm2 != RailShape.NORTH_SOUTH && cgm2 != RailShape.ASCENDING_NORTH && cgm2 != RailShape.ASCENDING_SOUTH)) && (cgm != RailShape.NORTH_SOUTH || (cgm2 != RailShape.EAST_WEST && cgm2 != RailShape.ASCENDING_EAST && cgm2 != RailShape.ASCENDING_WEST)) && cfj7.<Boolean>getValue((Property<Boolean>)PoweredRailBlock.POWERED) && (bqb.hasNeighborSignal(fu) || this.findPoweredRailSignal(bqb, fu, cfj7, boolean3, integer + 1));
     }
     
     @Override
-    protected void updateState(final BlockState byj, final Level bjw, final BlockPos fk, final Block bph) {
-        final boolean boolean6 = byj.<Boolean>getValue((Property<Boolean>)PoweredRailBlock.POWERED);
-        final boolean boolean7 = bjw.hasNeighborSignal(fk) || this.findPoweredRailSignal(bjw, fk, byj, true, 0) || this.findPoweredRailSignal(bjw, fk, byj, false, 0);
+    protected void updateState(final BlockState cfj, final Level bqb, final BlockPos fu, final Block bvr) {
+        final boolean boolean6 = cfj.<Boolean>getValue((Property<Boolean>)PoweredRailBlock.POWERED);
+        final boolean boolean7 = bqb.hasNeighborSignal(fu) || this.findPoweredRailSignal(bqb, fu, cfj, true, 0) || this.findPoweredRailSignal(bqb, fu, cfj, false, 0);
         if (boolean7 != boolean6) {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)PoweredRailBlock.POWERED, boolean7), 3);
-            bjw.updateNeighborsAt(fk.below(), this);
-            if (byj.<RailShape>getValue(PoweredRailBlock.SHAPE).isAscending()) {
-                bjw.updateNeighborsAt(fk.above(), this);
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)PoweredRailBlock.POWERED, boolean7), 3);
+            bqb.updateNeighborsAt(fu.below(), this);
+            if (cfj.<RailShape>getValue(PoweredRailBlock.SHAPE).isAscending()) {
+                bqb.updateNeighborsAt(fu.above(), this);
             }
         }
     }
@@ -126,34 +127,34 @@ public class PoweredRailBlock extends BaseRailBlock {
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
         Label_0424: {
-            switch (btu) {
+            switch (cap) {
                 case CLOCKWISE_180: {
-                    switch (byj.<RailShape>getValue(PoweredRailBlock.SHAPE)) {
+                    switch (cfj.<RailShape>getValue(PoweredRailBlock.SHAPE)) {
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         default: {
                             break Label_0424;
@@ -162,36 +163,36 @@ public class PoweredRailBlock extends BaseRailBlock {
                     break;
                 }
                 case COUNTERCLOCKWISE_90: {
-                    switch (byj.<RailShape>getValue(PoweredRailBlock.SHAPE)) {
+                    switch (cfj.<RailShape>getValue(PoweredRailBlock.SHAPE)) {
                         case NORTH_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.EAST_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.EAST_WEST);
                         }
                         case EAST_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_SOUTH);
                         }
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         default: {
                             break Label_0424;
@@ -200,36 +201,36 @@ public class PoweredRailBlock extends BaseRailBlock {
                     break;
                 }
                 case CLOCKWISE_90: {
-                    switch (byj.<RailShape>getValue(PoweredRailBlock.SHAPE)) {
+                    switch (cfj.<RailShape>getValue(PoweredRailBlock.SHAPE)) {
                         case NORTH_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.EAST_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.EAST_WEST);
                         }
                         case EAST_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_SOUTH);
                         }
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         default: {
                             break Label_0424;
@@ -239,33 +240,33 @@ public class PoweredRailBlock extends BaseRailBlock {
                 }
             }
         }
-        return byj;
+        return cfj;
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        final RailShape bzn4 = byj.<RailShape>getValue(PoweredRailBlock.SHAPE);
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        final RailShape cgm4 = cfj.<RailShape>getValue(PoweredRailBlock.SHAPE);
         Label_0319: {
-            switch (bsu) {
+            switch (bzj) {
                 case LEFT_RIGHT: {
-                    switch (bzn4) {
+                    switch (cgm4) {
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         default: {
                             break Label_0319;
@@ -274,24 +275,24 @@ public class PoweredRailBlock extends BaseRailBlock {
                     break;
                 }
                 case FRONT_BACK: {
-                    switch (bzn4) {
+                    switch (cgm4) {
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(PoweredRailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         default: {
                             break Label_0319;
@@ -301,7 +302,7 @@ public class PoweredRailBlock extends BaseRailBlock {
                 }
             }
         }
-        return super.mirror(byj, bsu);
+        return super.mirror(cfj, bzj);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/PressurePlateBlock.java b/src/net/minecraft/world/level/block/PressurePlateBlock.java
index aee9869..d2007cb 100644
--- a/src/net/minecraft/world/level/block/PressurePlateBlock.java
+++ b/src/net/minecraft/world/level/block/PressurePlateBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import java.util.Iterator;
@@ -17,6 +17,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public class PressurePlateBlock extends BasePressurePlateBlock {
@@ -25,51 +26,51 @@ public class PressurePlateBlock extends BasePressurePlateBlock {
     
     protected PressurePlateBlock(final Sensitivity a, final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)PressurePlateBlock.POWERED, false));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)PressurePlateBlock.POWERED, false));
         this.sensitivity = a;
     }
     
     @Override
-    protected int getSignalForState(final BlockState byj) {
-        return byj.<Boolean>getValue((Property<Boolean>)PressurePlateBlock.POWERED) ? 15 : 0;
+    protected int getSignalForState(final BlockState cfj) {
+        return cfj.<Boolean>getValue((Property<Boolean>)PressurePlateBlock.POWERED) ? 15 : 0;
     }
     
     @Override
-    protected BlockState setSignalForState(final BlockState byj, final int integer) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)PressurePlateBlock.POWERED, integer > 0);
+    protected BlockState setSignalForState(final BlockState cfj, final int integer) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)PressurePlateBlock.POWERED, integer > 0);
     }
     
     @Override
-    protected void playOnSound(final LevelAccessor bjx, final BlockPos fk) {
-        if (this.material == Material.WOOD) {
-            bjx.playSound(null, fk, SoundEvents.WOODEN_PRESSURE_PLATE_CLICK_ON, SoundSource.BLOCKS, 0.3f, 0.8f);
+    protected void playOnSound(final LevelAccessor bqc, final BlockPos fu) {
+        if (this.material == Material.WOOD || this.material == Material.NETHER_WOOD) {
+            bqc.playSound(null, fu, SoundEvents.WOODEN_PRESSURE_PLATE_CLICK_ON, SoundSource.BLOCKS, 0.3f, 0.8f);
         }
         else {
-            bjx.playSound(null, fk, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundSource.BLOCKS, 0.3f, 0.6f);
+            bqc.playSound(null, fu, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundSource.BLOCKS, 0.3f, 0.6f);
         }
     }
     
     @Override
-    protected void playOffSound(final LevelAccessor bjx, final BlockPos fk) {
-        if (this.material == Material.WOOD) {
-            bjx.playSound(null, fk, SoundEvents.WOODEN_PRESSURE_PLATE_CLICK_OFF, SoundSource.BLOCKS, 0.3f, 0.7f);
+    protected void playOffSound(final LevelAccessor bqc, final BlockPos fu) {
+        if (this.material == Material.WOOD || this.material == Material.NETHER_WOOD) {
+            bqc.playSound(null, fu, SoundEvents.WOODEN_PRESSURE_PLATE_CLICK_OFF, SoundSource.BLOCKS, 0.3f, 0.7f);
         }
         else {
-            bjx.playSound(null, fk, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundSource.BLOCKS, 0.3f, 0.5f);
+            bqc.playSound(null, fu, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundSource.BLOCKS, 0.3f, 0.5f);
         }
     }
     
     @Override
-    protected int getSignalStrength(final Level bjw, final BlockPos fk) {
-        final AABB cvf4 = PressurePlateBlock.TOUCH_AABB.move(fk);
+    protected int getSignalStrength(final Level bqb, final BlockPos fu) {
+        final AABB deg4 = PressurePlateBlock.TOUCH_AABB.move(fu);
         List<? extends Entity> list5 = null;
         switch (this.sensitivity) {
             case EVERYTHING: {
-                list5 = bjw.getEntities(null, cvf4);
+                list5 = bqb.getEntities(null, deg4);
                 break;
             }
             case MOBS: {
-                list5 = bjw.getEntitiesOfClass(LivingEntity.class, cvf4);
+                list5 = bqb.getEntitiesOfClass(LivingEntity.class, deg4);
                 break;
             }
             default: {
@@ -77,8 +78,8 @@ public class PressurePlateBlock extends BasePressurePlateBlock {
             }
         }
         if (!list5.isEmpty()) {
-            for (final Entity akq7 : list5) {
-                if (!akq7.isIgnoringBlockTriggers()) {
+            for (final Entity aom7 : list5) {
+                if (!aom7.isIgnoringBlockTriggers()) {
                     return 15;
                 }
             }
diff --git a/src/net/minecraft/world/level/block/PumpkinBlock.java b/src/net/minecraft/world/level/block/PumpkinBlock.java
index d729faf..64dbd39 100644
--- a/src/net/minecraft/world/level/block/PumpkinBlock.java
+++ b/src/net/minecraft/world/level/block/PumpkinBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.level.ItemLike;
@@ -17,6 +17,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class PumpkinBlock extends StemGrownBlock {
     protected PumpkinBlock(final Properties c) {
@@ -24,22 +25,22 @@ public class PumpkinBlock extends StemGrownBlock {
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final ItemStack ben8 = ayj.getItemInHand(ajk);
-        if (ben8.getItem() == Items.SHEARS) {
-            if (!bjw.isClientSide) {
-                final Direction fp9 = cvg.getDirection();
-                final Direction fp10 = (fp9.getAxis() == Direction.Axis.Y) ? ayj.getDirection().getOpposite() : fp9;
-                bjw.playSound(null, fk, SoundEvents.PUMPKIN_CARVE, SoundSource.BLOCKS, 1.0f, 1.0f);
-                bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)Blocks.CARVED_PUMPKIN.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)CarvedPumpkinBlock.FACING, fp10), 11);
-                final ItemEntity awb11 = new ItemEntity(bjw, fk.getX() + 0.5 + fp10.getStepX() * 0.65, fk.getY() + 0.1, fk.getZ() + 0.5 + fp10.getStepZ() * 0.65, new ItemStack(Items.PUMPKIN_SEEDS, 4));
-                awb11.setDeltaMovement(0.05 * fp10.getStepX() + bjw.random.nextDouble() * 0.02, 0.05, 0.05 * fp10.getStepZ() + bjw.random.nextDouble() * 0.02);
-                bjw.addFreshEntity(awb11);
-                ben8.<Player>hurtAndBreak(1, ayj, ayj -> ayj.broadcastBreakEvent(ajk));
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final ItemStack bki8 = bec.getItemInHand(anf);
+        if (bki8.getItem() == Items.SHEARS) {
+            if (!bqb.isClientSide) {
+                final Direction fz9 = deh.getDirection();
+                final Direction fz10 = (fz9.getAxis() == Direction.Axis.Y) ? bec.getDirection().getOpposite() : fz9;
+                bqb.playSound(null, fu, SoundEvents.PUMPKIN_CARVE, SoundSource.BLOCKS, 1.0f, 1.0f);
+                bqb.setBlock(fu, ((StateHolder<O, BlockState>)Blocks.CARVED_PUMPKIN.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)CarvedPumpkinBlock.FACING, fz10), 11);
+                final ItemEntity bbg11 = new ItemEntity(bqb, fu.getX() + 0.5 + fz10.getStepX() * 0.65, fu.getY() + 0.1, fu.getZ() + 0.5 + fz10.getStepZ() * 0.65, new ItemStack(Items.PUMPKIN_SEEDS, 4));
+                bbg11.setDeltaMovement(0.05 * fz10.getStepX() + bqb.random.nextDouble() * 0.02, 0.05, 0.05 * fz10.getStepZ() + bqb.random.nextDouble() * 0.02);
+                bqb.addFreshEntity(bbg11);
+                bki8.<Player>hurtAndBreak(1, bec, bec -> bec.broadcastBreakEvent(anf));
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
-        return super.use(byj, bjw, fk, ayj, ajk, cvg);
+        return super.use(cfj, bqb, fu, bec, anf, deh);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/RailBlock.java b/src/net/minecraft/world/level/block/RailBlock.java
index f0377bf..86af8d0 100644
--- a/src/net/minecraft/world/level/block/RailBlock.java
+++ b/src/net/minecraft/world/level/block/RailBlock.java
@@ -1,12 +1,13 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.RailShape;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 
@@ -15,13 +16,13 @@ public class RailBlock extends BaseRailBlock {
     
     protected RailBlock(final Properties c) {
         super(false, c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_SOUTH));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_SOUTH));
     }
     
     @Override
-    protected void updateState(final BlockState byj, final Level bjw, final BlockPos fk, final Block bph) {
-        if (bph.defaultBlockState().isSignalSource() && new RailState(bjw, fk, byj).countPotentialConnections() == 3) {
-            this.updateDir(bjw, fk, byj, false);
+    protected void updateState(final BlockState cfj, final Level bqb, final BlockPos fu, final Block bvr) {
+        if (bvr.defaultBlockState().isSignalSource() && new RailState(bqb, fu, cfj).countPotentialConnections() == 3) {
+            this.updateDir(bqb, fu, cfj, false);
         }
     }
     
@@ -31,34 +32,34 @@ public class RailBlock extends BaseRailBlock {
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
         Label_0424: {
-            switch (btu) {
+            switch (cap) {
                 case CLOCKWISE_180: {
-                    switch (byj.<RailShape>getValue(RailBlock.SHAPE)) {
+                    switch (cfj.<RailShape>getValue(RailBlock.SHAPE)) {
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         default: {
                             break Label_0424;
@@ -67,36 +68,36 @@ public class RailBlock extends BaseRailBlock {
                     break;
                 }
                 case COUNTERCLOCKWISE_90: {
-                    switch (byj.<RailShape>getValue(RailBlock.SHAPE)) {
+                    switch (cfj.<RailShape>getValue(RailBlock.SHAPE)) {
                         case NORTH_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.EAST_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.EAST_WEST);
                         }
                         case EAST_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_SOUTH);
                         }
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         default: {
                             break Label_0424;
@@ -105,36 +106,36 @@ public class RailBlock extends BaseRailBlock {
                     break;
                 }
                 case CLOCKWISE_90: {
-                    switch (byj.<RailShape>getValue(RailBlock.SHAPE)) {
+                    switch (cfj.<RailShape>getValue(RailBlock.SHAPE)) {
                         case NORTH_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.EAST_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.EAST_WEST);
                         }
                         case EAST_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_SOUTH);
                         }
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         default: {
                             break Label_0424;
@@ -144,33 +145,33 @@ public class RailBlock extends BaseRailBlock {
                 }
             }
         }
-        return byj;
+        return cfj;
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        final RailShape bzn4 = byj.<RailShape>getValue(RailBlock.SHAPE);
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        final RailShape cgm4 = cfj.<RailShape>getValue(RailBlock.SHAPE);
         Label_0319: {
-            switch (bsu) {
+            switch (bzj) {
                 case LEFT_RIGHT: {
-                    switch (bzn4) {
+                    switch (cgm4) {
                         case ASCENDING_NORTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_SOUTH);
                         }
                         case ASCENDING_SOUTH: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_NORTH);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_NORTH);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         default: {
                             break Label_0319;
@@ -179,24 +180,24 @@ public class RailBlock extends BaseRailBlock {
                     break;
                 }
                 case FRONT_BACK: {
-                    switch (bzn4) {
+                    switch (cgm4) {
                         case ASCENDING_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_WEST);
                         }
                         case ASCENDING_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.ASCENDING_EAST);
                         }
                         case SOUTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_WEST);
                         }
                         case SOUTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.SOUTH_EAST);
                         }
                         case NORTH_WEST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_EAST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_EAST);
                         }
                         case NORTH_EAST: {
-                            return ((AbstractStateHolder<O, BlockState>)byj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_WEST);
+                            return ((StateHolder<O, BlockState>)cfj).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_WEST);
                         }
                         default: {
                             break Label_0319;
@@ -206,7 +207,7 @@ public class RailBlock extends BaseRailBlock {
                 }
             }
         }
-        return super.mirror(byj, bsu);
+        return super.mirror(cfj, bzj);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/RailState.java b/src/net/minecraft/world/level/block/RailState.java
index ee7d3fe..6a46410 100644
--- a/src/net/minecraft/world/level/block/RailState.java
+++ b/src/net/minecraft/world/level/block/RailState.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import java.util.Iterator;
 import net.minecraft.core.Direction;
 import javax.annotation.Nullable;
@@ -19,24 +19,24 @@ public class RailState {
     private final boolean isStraight;
     private final List<BlockPos> connections;
     
-    public RailState(final Level bjw, final BlockPos fk, final BlockState byj) {
+    public RailState(final Level bqb, final BlockPos fu, final BlockState cfj) {
         this.connections = Lists.newArrayList();
-        this.level = bjw;
-        this.pos = fk;
-        this.state = byj;
-        this.block = (BaseRailBlock)byj.getBlock();
-        final RailShape bzn5 = byj.<RailShape>getValue(this.block.getShapeProperty());
+        this.level = bqb;
+        this.pos = fu;
+        this.state = cfj;
+        this.block = (BaseRailBlock)cfj.getBlock();
+        final RailShape cgm5 = cfj.<RailShape>getValue(this.block.getShapeProperty());
         this.isStraight = this.block.isStraight();
-        this.updateConnections(bzn5);
+        this.updateConnections(cgm5);
     }
     
     public List<BlockPos> getConnections() {
         return this.connections;
     }
     
-    private void updateConnections(final RailShape bzn) {
+    private void updateConnections(final RailShape cgm) {
         this.connections.clear();
-        switch (bzn) {
+        switch (cgm) {
             case NORTH_SOUTH: {
                 this.connections.add(this.pos.north());
                 this.connections.add(this.pos.south());
@@ -92,48 +92,48 @@ public class RailState {
     
     private void removeSoftConnections() {
         for (int integer2 = 0; integer2 < this.connections.size(); ++integer2) {
-            final RailState btl3 = this.getRail(this.connections.get(integer2));
-            if (btl3 == null || !btl3.connectsTo(this)) {
+            final RailState cae3 = this.getRail(this.connections.get(integer2));
+            if (cae3 == null || !cae3.connectsTo(this)) {
                 this.connections.remove(integer2--);
             }
             else {
-                this.connections.set(integer2, btl3.pos);
+                this.connections.set(integer2, cae3.pos);
             }
         }
     }
     
-    private boolean hasRail(final BlockPos fk) {
-        return BaseRailBlock.isRail(this.level, fk) || BaseRailBlock.isRail(this.level, fk.above()) || BaseRailBlock.isRail(this.level, fk.below());
+    private boolean hasRail(final BlockPos fu) {
+        return BaseRailBlock.isRail(this.level, fu) || BaseRailBlock.isRail(this.level, fu.above()) || BaseRailBlock.isRail(this.level, fu.below());
     }
     
     @Nullable
-    private RailState getRail(final BlockPos fk) {
-        BlockPos fk2 = fk;
-        BlockState byj4 = this.level.getBlockState(fk2);
-        if (BaseRailBlock.isRail(byj4)) {
-            return new RailState(this.level, fk2, byj4);
+    private RailState getRail(final BlockPos fu) {
+        BlockPos fu2 = fu;
+        BlockState cfj4 = this.level.getBlockState(fu2);
+        if (BaseRailBlock.isRail(cfj4)) {
+            return new RailState(this.level, fu2, cfj4);
         }
-        fk2 = fk.above();
-        byj4 = this.level.getBlockState(fk2);
-        if (BaseRailBlock.isRail(byj4)) {
-            return new RailState(this.level, fk2, byj4);
+        fu2 = fu.above();
+        cfj4 = this.level.getBlockState(fu2);
+        if (BaseRailBlock.isRail(cfj4)) {
+            return new RailState(this.level, fu2, cfj4);
         }
-        fk2 = fk.below();
-        byj4 = this.level.getBlockState(fk2);
-        if (BaseRailBlock.isRail(byj4)) {
-            return new RailState(this.level, fk2, byj4);
+        fu2 = fu.below();
+        cfj4 = this.level.getBlockState(fu2);
+        if (BaseRailBlock.isRail(cfj4)) {
+            return new RailState(this.level, fu2, cfj4);
         }
         return null;
     }
     
-    private boolean connectsTo(final RailState btl) {
-        return this.hasConnection(btl.pos);
+    private boolean connectsTo(final RailState cae) {
+        return this.hasConnection(cae.pos);
     }
     
-    private boolean hasConnection(final BlockPos fk) {
+    private boolean hasConnection(final BlockPos fu) {
         for (int integer3 = 0; integer3 < this.connections.size(); ++integer3) {
-            final BlockPos fk2 = this.connections.get(integer3);
-            if (fk2.getX() == fk.getX() && fk2.getZ() == fk.getZ()) {
+            final BlockPos fu2 = this.connections.get(integer3);
+            if (fu2.getX() == fu.getX() && fu2.getZ() == fu.getZ()) {
                 return true;
             }
         }
@@ -142,98 +142,98 @@ public class RailState {
     
     protected int countPotentialConnections() {
         int integer2 = 0;
-        for (final Direction fp4 : Direction.Plane.HORIZONTAL) {
-            if (this.hasRail(this.pos.relative(fp4))) {
+        for (final Direction fz4 : Direction.Plane.HORIZONTAL) {
+            if (this.hasRail(this.pos.relative(fz4))) {
                 ++integer2;
             }
         }
         return integer2;
     }
     
-    private boolean canConnectTo(final RailState btl) {
-        return this.connectsTo(btl) || this.connections.size() != 2;
+    private boolean canConnectTo(final RailState cae) {
+        return this.connectsTo(cae) || this.connections.size() != 2;
     }
     
-    private void connectTo(final RailState btl) {
-        this.connections.add(btl.pos);
-        final BlockPos fk3 = this.pos.north();
-        final BlockPos fk4 = this.pos.south();
-        final BlockPos fk5 = this.pos.west();
-        final BlockPos fk6 = this.pos.east();
-        final boolean boolean7 = this.hasConnection(fk3);
-        final boolean boolean8 = this.hasConnection(fk4);
-        final boolean boolean9 = this.hasConnection(fk5);
-        final boolean boolean10 = this.hasConnection(fk6);
-        RailShape bzn11 = null;
+    private void connectTo(final RailState cae) {
+        this.connections.add(cae.pos);
+        final BlockPos fu3 = this.pos.north();
+        final BlockPos fu4 = this.pos.south();
+        final BlockPos fu5 = this.pos.west();
+        final BlockPos fu6 = this.pos.east();
+        final boolean boolean7 = this.hasConnection(fu3);
+        final boolean boolean8 = this.hasConnection(fu4);
+        final boolean boolean9 = this.hasConnection(fu5);
+        final boolean boolean10 = this.hasConnection(fu6);
+        RailShape cgm11 = null;
         if (boolean7 || boolean8) {
-            bzn11 = RailShape.NORTH_SOUTH;
+            cgm11 = RailShape.NORTH_SOUTH;
         }
         if (boolean9 || boolean10) {
-            bzn11 = RailShape.EAST_WEST;
+            cgm11 = RailShape.EAST_WEST;
         }
         if (!this.isStraight) {
             if (boolean8 && boolean10 && !boolean7 && !boolean9) {
-                bzn11 = RailShape.SOUTH_EAST;
+                cgm11 = RailShape.SOUTH_EAST;
             }
             if (boolean8 && boolean9 && !boolean7 && !boolean10) {
-                bzn11 = RailShape.SOUTH_WEST;
+                cgm11 = RailShape.SOUTH_WEST;
             }
             if (boolean7 && boolean9 && !boolean8 && !boolean10) {
-                bzn11 = RailShape.NORTH_WEST;
+                cgm11 = RailShape.NORTH_WEST;
             }
             if (boolean7 && boolean10 && !boolean8 && !boolean9) {
-                bzn11 = RailShape.NORTH_EAST;
+                cgm11 = RailShape.NORTH_EAST;
             }
         }
-        if (bzn11 == RailShape.NORTH_SOUTH) {
-            if (BaseRailBlock.isRail(this.level, fk3.above())) {
-                bzn11 = RailShape.ASCENDING_NORTH;
+        if (cgm11 == RailShape.NORTH_SOUTH) {
+            if (BaseRailBlock.isRail(this.level, fu3.above())) {
+                cgm11 = RailShape.ASCENDING_NORTH;
             }
-            if (BaseRailBlock.isRail(this.level, fk4.above())) {
-                bzn11 = RailShape.ASCENDING_SOUTH;
+            if (BaseRailBlock.isRail(this.level, fu4.above())) {
+                cgm11 = RailShape.ASCENDING_SOUTH;
             }
         }
-        if (bzn11 == RailShape.EAST_WEST) {
-            if (BaseRailBlock.isRail(this.level, fk6.above())) {
-                bzn11 = RailShape.ASCENDING_EAST;
+        if (cgm11 == RailShape.EAST_WEST) {
+            if (BaseRailBlock.isRail(this.level, fu6.above())) {
+                cgm11 = RailShape.ASCENDING_EAST;
             }
-            if (BaseRailBlock.isRail(this.level, fk5.above())) {
-                bzn11 = RailShape.ASCENDING_WEST;
+            if (BaseRailBlock.isRail(this.level, fu5.above())) {
+                cgm11 = RailShape.ASCENDING_WEST;
             }
         }
-        if (bzn11 == null) {
-            bzn11 = RailShape.NORTH_SOUTH;
+        if (cgm11 == null) {
+            cgm11 = RailShape.NORTH_SOUTH;
         }
-        this.state = ((AbstractStateHolder<O, BlockState>)this.state).<RailShape, RailShape>setValue(this.block.getShapeProperty(), bzn11);
+        this.state = ((StateHolder<O, BlockState>)this.state).<RailShape, RailShape>setValue(this.block.getShapeProperty(), cgm11);
         this.level.setBlock(this.pos, this.state, 3);
     }
     
-    private boolean hasNeighborRail(final BlockPos fk) {
-        final RailState btl3 = this.getRail(fk);
-        if (btl3 == null) {
+    private boolean hasNeighborRail(final BlockPos fu) {
+        final RailState cae3 = this.getRail(fu);
+        if (cae3 == null) {
             return false;
         }
-        btl3.removeSoftConnections();
-        return btl3.canConnectTo(this);
+        cae3.removeSoftConnections();
+        return cae3.canConnectTo(this);
     }
     
-    public RailState place(final boolean boolean1, final boolean boolean2, final RailShape bzn) {
-        final BlockPos fk5 = this.pos.north();
-        final BlockPos fk6 = this.pos.south();
-        final BlockPos fk7 = this.pos.west();
-        final BlockPos fk8 = this.pos.east();
-        final boolean boolean3 = this.hasNeighborRail(fk5);
-        final boolean boolean4 = this.hasNeighborRail(fk6);
-        final boolean boolean5 = this.hasNeighborRail(fk7);
-        final boolean boolean6 = this.hasNeighborRail(fk8);
-        RailShape bzn2 = null;
+    public RailState place(final boolean boolean1, final boolean boolean2, final RailShape cgm) {
+        final BlockPos fu5 = this.pos.north();
+        final BlockPos fu6 = this.pos.south();
+        final BlockPos fu7 = this.pos.west();
+        final BlockPos fu8 = this.pos.east();
+        final boolean boolean3 = this.hasNeighborRail(fu5);
+        final boolean boolean4 = this.hasNeighborRail(fu6);
+        final boolean boolean5 = this.hasNeighborRail(fu7);
+        final boolean boolean6 = this.hasNeighborRail(fu8);
+        RailShape cgm2 = null;
         final boolean boolean7 = boolean3 || boolean4;
         final boolean boolean8 = boolean5 || boolean6;
         if (boolean7 && !boolean8) {
-            bzn2 = RailShape.NORTH_SOUTH;
+            cgm2 = RailShape.NORTH_SOUTH;
         }
         if (boolean8 && !boolean7) {
-            bzn2 = RailShape.EAST_WEST;
+            cgm2 = RailShape.EAST_WEST;
         }
         final boolean boolean9 = boolean4 && boolean6;
         final boolean boolean10 = boolean4 && boolean5;
@@ -241,88 +241,88 @@ public class RailState {
         final boolean boolean12 = boolean3 && boolean5;
         if (!this.isStraight) {
             if (boolean9 && !boolean3 && !boolean5) {
-                bzn2 = RailShape.SOUTH_EAST;
+                cgm2 = RailShape.SOUTH_EAST;
             }
             if (boolean10 && !boolean3 && !boolean6) {
-                bzn2 = RailShape.SOUTH_WEST;
+                cgm2 = RailShape.SOUTH_WEST;
             }
             if (boolean12 && !boolean4 && !boolean6) {
-                bzn2 = RailShape.NORTH_WEST;
+                cgm2 = RailShape.NORTH_WEST;
             }
             if (boolean11 && !boolean4 && !boolean5) {
-                bzn2 = RailShape.NORTH_EAST;
+                cgm2 = RailShape.NORTH_EAST;
             }
         }
-        if (bzn2 == null) {
+        if (cgm2 == null) {
             if (boolean7 && boolean8) {
-                bzn2 = bzn;
+                cgm2 = cgm;
             }
             else if (boolean7) {
-                bzn2 = RailShape.NORTH_SOUTH;
+                cgm2 = RailShape.NORTH_SOUTH;
             }
             else if (boolean8) {
-                bzn2 = RailShape.EAST_WEST;
+                cgm2 = RailShape.EAST_WEST;
             }
             if (!this.isStraight) {
                 if (boolean1) {
                     if (boolean9) {
-                        bzn2 = RailShape.SOUTH_EAST;
+                        cgm2 = RailShape.SOUTH_EAST;
                     }
                     if (boolean10) {
-                        bzn2 = RailShape.SOUTH_WEST;
+                        cgm2 = RailShape.SOUTH_WEST;
                     }
                     if (boolean11) {
-                        bzn2 = RailShape.NORTH_EAST;
+                        cgm2 = RailShape.NORTH_EAST;
                     }
                     if (boolean12) {
-                        bzn2 = RailShape.NORTH_WEST;
+                        cgm2 = RailShape.NORTH_WEST;
                     }
                 }
                 else {
                     if (boolean12) {
-                        bzn2 = RailShape.NORTH_WEST;
+                        cgm2 = RailShape.NORTH_WEST;
                     }
                     if (boolean11) {
-                        bzn2 = RailShape.NORTH_EAST;
+                        cgm2 = RailShape.NORTH_EAST;
                     }
                     if (boolean10) {
-                        bzn2 = RailShape.SOUTH_WEST;
+                        cgm2 = RailShape.SOUTH_WEST;
                     }
                     if (boolean9) {
-                        bzn2 = RailShape.SOUTH_EAST;
+                        cgm2 = RailShape.SOUTH_EAST;
                     }
                 }
             }
         }
-        if (bzn2 == RailShape.NORTH_SOUTH) {
-            if (BaseRailBlock.isRail(this.level, fk5.above())) {
-                bzn2 = RailShape.ASCENDING_NORTH;
+        if (cgm2 == RailShape.NORTH_SOUTH) {
+            if (BaseRailBlock.isRail(this.level, fu5.above())) {
+                cgm2 = RailShape.ASCENDING_NORTH;
             }
-            if (BaseRailBlock.isRail(this.level, fk6.above())) {
-                bzn2 = RailShape.ASCENDING_SOUTH;
+            if (BaseRailBlock.isRail(this.level, fu6.above())) {
+                cgm2 = RailShape.ASCENDING_SOUTH;
             }
         }
-        if (bzn2 == RailShape.EAST_WEST) {
-            if (BaseRailBlock.isRail(this.level, fk8.above())) {
-                bzn2 = RailShape.ASCENDING_EAST;
+        if (cgm2 == RailShape.EAST_WEST) {
+            if (BaseRailBlock.isRail(this.level, fu8.above())) {
+                cgm2 = RailShape.ASCENDING_EAST;
             }
-            if (BaseRailBlock.isRail(this.level, fk7.above())) {
-                bzn2 = RailShape.ASCENDING_WEST;
+            if (BaseRailBlock.isRail(this.level, fu7.above())) {
+                cgm2 = RailShape.ASCENDING_WEST;
             }
         }
-        if (bzn2 == null) {
-            bzn2 = bzn;
+        if (cgm2 == null) {
+            cgm2 = cgm;
         }
-        this.updateConnections(bzn2);
-        this.state = ((AbstractStateHolder<O, BlockState>)this.state).<RailShape, RailShape>setValue(this.block.getShapeProperty(), bzn2);
+        this.updateConnections(cgm2);
+        this.state = ((StateHolder<O, BlockState>)this.state).<RailShape, RailShape>setValue(this.block.getShapeProperty(), cgm2);
         if (boolean2 || this.level.getBlockState(this.pos) != this.state) {
             this.level.setBlock(this.pos, this.state, 3);
             for (int integer20 = 0; integer20 < this.connections.size(); ++integer20) {
-                final RailState btl21 = this.getRail(this.connections.get(integer20));
-                if (btl21 != null) {
-                    btl21.removeSoftConnections();
-                    if (btl21.canConnectTo(this)) {
-                        btl21.connectTo(this);
+                final RailState cae21 = this.getRail(this.connections.get(integer20));
+                if (cae21 != null) {
+                    cae21.removeSoftConnections();
+                    if (cae21.canConnectTo(this)) {
+                        cae21.connectTo(this);
                     }
                 }
             }
diff --git a/src/net/minecraft/world/level/block/RedStoneOreBlock.java b/src/net/minecraft/world/level/block/RedStoneOreBlock.java
index aee8ad4..ed70150 100644
--- a/src/net/minecraft/world/level/block/RedStoneOreBlock.java
+++ b/src/net/minecraft/world/level/block/RedStoneOreBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.DustParticleOptions;
@@ -8,9 +8,11 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.Enchantments;
-import net.minecraft.world.item.ItemStack;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.BlockPlaceContext;
+import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionHand;
@@ -20,6 +22,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public class RedStoneOreBlock extends Block {
@@ -27,77 +30,82 @@ public class RedStoneOreBlock extends Block {
     
     public RedStoneOreBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)RedStoneOreBlock.LIT, false));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)RedStoneOreBlock.LIT, false));
     }
     
     @Override
-    public int getLightEmission(final BlockState byj) {
-        return byj.<Boolean>getValue((Property<Boolean>)RedStoneOreBlock.LIT) ? super.getLightEmission(byj) : 0;
+    public void attack(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec) {
+        interact(cfj, bqb, fu);
+        super.attack(cfj, bqb, fu, bec);
     }
     
     @Override
-    public void attack(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj) {
-        interact(byj, bjw, fk);
-        super.attack(byj, bjw, fk, ayj);
+    public void stepOn(final Level bqb, final BlockPos fu, final Entity aom) {
+        interact(bqb.getBlockState(fu), bqb, fu);
+        super.stepOn(bqb, fu, aom);
     }
     
     @Override
-    public void stepOn(final Level bjw, final BlockPos fk, final Entity akq) {
-        interact(bjw.getBlockState(fk), bjw, fk);
-        super.stepOn(bjw, fk, akq);
-    }
-    
-    @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
-            spawnParticles(bjw, fk);
-            return InteractionResult.SUCCESS;
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
+            spawnParticles(bqb, fu);
         }
-        interact(byj, bjw, fk);
-        return InteractionResult.PASS;
+        else {
+            interact(cfj, bqb, fu);
+        }
+        final ItemStack bki8 = bec.getItemInHand(anf);
+        if (bki8.getItem() instanceof BlockItem && new BlockPlaceContext(bec, anf, bki8, deh).canPlace()) {
+            return InteractionResult.PASS;
+        }
+        return InteractionResult.SUCCESS;
     }
     
-    private static void interact(final BlockState byj, final Level bjw, final BlockPos fk) {
-        spawnParticles(bjw, fk);
-        if (!byj.<Boolean>getValue((Property<Boolean>)RedStoneOreBlock.LIT)) {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)RedStoneOreBlock.LIT, true), 3);
+    private static void interact(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        spawnParticles(bqb, fu);
+        if (!cfj.<Boolean>getValue((Property<Boolean>)RedStoneOreBlock.LIT)) {
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)RedStoneOreBlock.LIT, true), 3);
         }
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (byj.<Boolean>getValue((Property<Boolean>)RedStoneOreBlock.LIT)) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)RedStoneOreBlock.LIT, false), 3);
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return cfj.<Boolean>getValue((Property<Boolean>)RedStoneOreBlock.LIT);
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)RedStoneOreBlock.LIT)) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)RedStoneOreBlock.LIT, false), 3);
         }
     }
     
     @Override
-    public void spawnAfterBreak(final BlockState byj, final Level bjw, final BlockPos fk, final ItemStack ben) {
-        super.spawnAfterBreak(byj, bjw, fk, ben);
-        if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, ben) == 0) {
-            final int integer6 = 1 + bjw.random.nextInt(5);
-            this.popExperience(bjw, fk, integer6);
+    public void spawnAfterBreak(final BlockState cfj, final Level bqb, final BlockPos fu, final ItemStack bki) {
+        super.spawnAfterBreak(cfj, bqb, fu, bki);
+        if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, bki) == 0) {
+            final int integer6 = 1 + bqb.random.nextInt(5);
+            this.popExperience(bqb, fu, integer6);
         }
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (byj.<Boolean>getValue((Property<Boolean>)RedStoneOreBlock.LIT)) {
-            spawnParticles(bjw, fk);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)RedStoneOreBlock.LIT)) {
+            spawnParticles(bqb, fu);
         }
     }
     
-    private static void spawnParticles(final Level bjw, final BlockPos fk) {
+    private static void spawnParticles(final Level bqb, final BlockPos fu) {
         final double double3 = 0.5625;
-        final Random random5 = bjw.random;
-        for (final Direction fp9 : Direction.values()) {
-            final BlockPos fk2 = fk.relative(fp9);
-            if (!bjw.getBlockState(fk2).isSolidRender(bjw, fk2)) {
-                final Direction.Axis a11 = fp9.getAxis();
-                final double double4 = (a11 == Direction.Axis.X) ? (0.5 + 0.5625 * fp9.getStepX()) : random5.nextFloat();
-                final double double5 = (a11 == Direction.Axis.Y) ? (0.5 + 0.5625 * fp9.getStepY()) : random5.nextFloat();
-                final double double6 = (a11 == Direction.Axis.Z) ? (0.5 + 0.5625 * fp9.getStepZ()) : random5.nextFloat();
-                bjw.addParticle(DustParticleOptions.REDSTONE, fk.getX() + double4, fk.getY() + double5, fk.getZ() + double6, 0.0, 0.0, 0.0);
+        final Random random5 = bqb.random;
+        for (final Direction fz9 : Direction.values()) {
+            final BlockPos fu2 = fu.relative(fz9);
+            if (!bqb.getBlockState(fu2).isSolidRender(bqb, fu2)) {
+                final Direction.Axis a11 = fz9.getAxis();
+                final double double4 = (a11 == Direction.Axis.X) ? (0.5 + 0.5625 * fz9.getStepX()) : random5.nextFloat();
+                final double double5 = (a11 == Direction.Axis.Y) ? (0.5 + 0.5625 * fz9.getStepY()) : random5.nextFloat();
+                final double double6 = (a11 == Direction.Axis.Z) ? (0.5 + 0.5625 * fz9.getStepZ()) : random5.nextFloat();
+                bqb.addParticle(DustParticleOptions.REDSTONE, fu.getX() + double4, fu.getY() + double5, fu.getZ() + double6, 0.0, 0.0, 0.0);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/block/RedStoneWireBlock.java b/src/net/minecraft/world/level/block/RedStoneWireBlock.java
index 9662995..4ab01bb 100644
--- a/src/net/minecraft/world/level/block/RedStoneWireBlock.java
+++ b/src/net/minecraft/world/level/block/RedStoneWireBlock.java
@@ -1,31 +1,36 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import com.google.common.collect.Maps;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.DustParticleOptions;
 import java.util.Random;
 import net.minecraft.util.Mth;
 import javax.annotation.Nullable;
-import java.util.EnumSet;
-import java.util.List;
-import com.google.common.collect.Lists;
+import java.util.Set;
+import com.google.common.collect.Sets;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
-import java.util.Iterator;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.level.block.state.BlockState;
-import com.google.common.collect.Sets;
 import net.minecraft.core.BlockPos;
-import java.util.Set;
+import net.minecraft.world.level.BlockGetter;
+import java.util.Iterator;
+import net.minecraft.world.phys.shapes.Shapes;
+import com.google.common.collect.UnmodifiableIterator;
+import net.minecraft.world.level.block.state.properties.Property;
+import com.google.common.collect.Maps;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import com.mojang.math.Vector3f;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
 import java.util.Map;
@@ -40,387 +45,403 @@ public class RedStoneWireBlock extends Block {
     public static final EnumProperty<RedstoneSide> WEST;
     public static final IntegerProperty POWER;
     public static final Map<Direction, EnumProperty<RedstoneSide>> PROPERTY_BY_DIRECTION;
-    protected static final VoxelShape[] SHAPE_BY_INDEX;
+    private static final VoxelShape SHAPE_DOT;
+    private static final Map<Direction, VoxelShape> SHAPES_FLOOR;
+    private static final Map<Direction, VoxelShape> SHAPES_UP;
+    private final Map<BlockState, VoxelShape> SHAPES_CACHE;
+    private static final Vector3f[] COLORS;
+    private final BlockState crossState;
     private boolean shouldSignal;
-    private final Set<BlockPos> toUpdate;
     
     public RedStoneWireBlock(final Properties c) {
         super(c);
+        this.SHAPES_CACHE = Maps.newHashMap();
         this.shouldSignal = true;
-        this.toUpdate = Sets.newHashSet();
-        this.registerDefaultState(((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue(RedStoneWireBlock.NORTH, RedstoneSide.NONE)).setValue(RedStoneWireBlock.EAST, RedstoneSide.NONE)).setValue(RedStoneWireBlock.SOUTH, RedstoneSide.NONE)).setValue(RedStoneWireBlock.WEST, RedstoneSide.NONE)).<Comparable, Integer>setValue((Property<Comparable>)RedStoneWireBlock.POWER, 0));
-    }
-    
-    @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return RedStoneWireBlock.SHAPE_BY_INDEX[getAABBIndex(byj)];
-    }
-    
-    private static int getAABBIndex(final BlockState byj) {
-        int integer2 = 0;
-        final boolean boolean3 = byj.<RedstoneSide>getValue(RedStoneWireBlock.NORTH) != RedstoneSide.NONE;
-        final boolean boolean4 = byj.<RedstoneSide>getValue(RedStoneWireBlock.EAST) != RedstoneSide.NONE;
-        final boolean boolean5 = byj.<RedstoneSide>getValue(RedStoneWireBlock.SOUTH) != RedstoneSide.NONE;
-        final boolean boolean6 = byj.<RedstoneSide>getValue(RedStoneWireBlock.WEST) != RedstoneSide.NONE;
-        if (boolean3 || (boolean5 && !boolean3 && !boolean4 && !boolean6)) {
-            integer2 |= 1 << Direction.NORTH.get2DDataValue();
-        }
-        if (boolean4 || (boolean6 && !boolean3 && !boolean4 && !boolean5)) {
-            integer2 |= 1 << Direction.EAST.get2DDataValue();
-        }
-        if (boolean5 || (boolean3 && !boolean4 && !boolean5 && !boolean6)) {
-            integer2 |= 1 << Direction.SOUTH.get2DDataValue();
-        }
-        if (boolean6 || (boolean4 && !boolean3 && !boolean5 && !boolean6)) {
-            integer2 |= 1 << Direction.WEST.get2DDataValue();
-        }
-        return integer2;
-    }
-    
-    @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockGetter bjg3 = bcq.getLevel();
-        final BlockPos fk4 = bcq.getClickedPos();
-        return (((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue(RedStoneWireBlock.WEST, this.getConnectingSide(bjg3, fk4, Direction.WEST))).setValue(RedStoneWireBlock.EAST, this.getConnectingSide(bjg3, fk4, Direction.EAST))).setValue(RedStoneWireBlock.NORTH, this.getConnectingSide(bjg3, fk4, Direction.NORTH))).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, this.getConnectingSide(bjg3, fk4, Direction.SOUTH));
-    }
-    
-    @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN) {
-            return byj1;
-        }
-        if (fp == Direction.UP) {
-            return (((((AbstractStateHolder<O, BlockState>)byj1).setValue(RedStoneWireBlock.WEST, this.getConnectingSide(bjx, fk5, Direction.WEST))).setValue(RedStoneWireBlock.EAST, this.getConnectingSide(bjx, fk5, Direction.EAST))).setValue(RedStoneWireBlock.NORTH, this.getConnectingSide(bjx, fk5, Direction.NORTH))).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, this.getConnectingSide(bjx, fk5, Direction.SOUTH));
-        }
-        return ((AbstractStateHolder<O, BlockState>)byj1).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fp), this.getConnectingSide(bjx, fk5, fp));
-    }
-    
-    @Override
-    public void updateIndirectNeighbourShapes(final BlockState byj, final LevelAccessor bjx, final BlockPos fk, final int integer) {
-        try (final BlockPos.PooledMutableBlockPos b6 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (final Direction fp9 : Direction.Plane.HORIZONTAL) {
-                final RedstoneSide bzo10 = byj.<RedstoneSide>getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fp9));
-                if (bzo10 != RedstoneSide.NONE && bjx.getBlockState(b6.set((Vec3i)fk).move(fp9)).getBlock() != this) {
-                    b6.move(Direction.DOWN);
-                    final BlockState byj2 = bjx.getBlockState(b6);
-                    if (byj2.getBlock() != Blocks.OBSERVER) {
-                        final BlockPos fk2 = b6.relative(fp9.getOpposite());
-                        final BlockState byj3 = byj2.updateShape(fp9.getOpposite(), bjx.getBlockState(fk2), bjx, b6, fk2);
-                        Block.updateOrDestroy(byj2, byj3, bjx, b6, integer);
-                    }
-                    b6.set((Vec3i)fk).move(fp9).move(Direction.UP);
-                    final BlockState byj4 = bjx.getBlockState(b6);
-                    if (byj4.getBlock() == Blocks.OBSERVER) {
-                        continue;
-                    }
-                    final BlockPos fk3 = b6.relative(fp9.getOpposite());
-                    final BlockState byj5 = byj4.updateShape(fp9.getOpposite(), bjx.getBlockState(fk3), bjx, b6, fk3);
-                    Block.updateOrDestroy(byj4, byj5, bjx, b6, integer);
-                }
+        this.registerDefaultState(((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue(RedStoneWireBlock.NORTH, RedstoneSide.NONE)).setValue(RedStoneWireBlock.EAST, RedstoneSide.NONE)).setValue(RedStoneWireBlock.SOUTH, RedstoneSide.NONE)).setValue(RedStoneWireBlock.WEST, RedstoneSide.NONE)).<Comparable, Integer>setValue((Property<Comparable>)RedStoneWireBlock.POWER, 0));
+        this.crossState = (((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE)).setValue(RedStoneWireBlock.EAST, RedstoneSide.SIDE)).setValue(RedStoneWireBlock.SOUTH, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.WEST, RedstoneSide.SIDE);
+        for (final BlockState cfj4 : this.getStateDefinition().getPossibleStates()) {
+            if (cfj4.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER) == 0) {
+                this.SHAPES_CACHE.put(cfj4, this.calculateShape(cfj4));
             }
         }
     }
     
-    private RedstoneSide getConnectingSide(final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        final BlockPos fk2 = fk.relative(fp);
-        final BlockState byj6 = bjg.getBlockState(fk2);
-        final BlockPos fk3 = fk.above();
-        final BlockState byj7 = bjg.getBlockState(fk3);
-        if (!byj7.isRedstoneConductor(bjg, fk3)) {
-            final boolean boolean9 = byj6.isFaceSturdy(bjg, fk2, Direction.UP) || byj6.getBlock() == Blocks.HOPPER;
-            if (boolean9 && shouldConnectTo(bjg.getBlockState(fk2.above()))) {
-                if (byj6.isCollisionShapeFullBlock(bjg, fk2)) {
+    private VoxelShape calculateShape(final BlockState cfj) {
+        VoxelShape dfg3 = RedStoneWireBlock.SHAPE_DOT;
+        for (final Direction fz5 : Direction.Plane.HORIZONTAL) {
+            final RedstoneSide cgn6 = cfj.<RedstoneSide>getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz5));
+            if (cgn6 == RedstoneSide.SIDE) {
+                dfg3 = Shapes.or(dfg3, RedStoneWireBlock.SHAPES_FLOOR.get(fz5));
+            }
+            else {
+                if (cgn6 != RedstoneSide.UP) {
+                    continue;
+                }
+                dfg3 = Shapes.or(dfg3, RedStoneWireBlock.SHAPES_UP.get(fz5));
+            }
+        }
+        return dfg3;
+    }
+    
+    @Override
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.SHAPES_CACHE.get(((StateHolder<O, Object>)cfj).<Comparable, Integer>setValue((Property<Comparable>)RedStoneWireBlock.POWER, 0));
+    }
+    
+    @Override
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return this.getConnectionState(bin.getLevel(), this.crossState, bin.getClickedPos());
+    }
+    
+    private BlockState getConnectionState(final BlockGetter bpg, BlockState cfj, final BlockPos fu) {
+        final boolean boolean5 = isDot(cfj);
+        cfj = this.getMissingConnections(bpg, ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Comparable>setValue((Property<Comparable>)RedStoneWireBlock.POWER, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.POWER)), fu);
+        if (boolean5 && isDot(cfj)) {
+            return cfj;
+        }
+        final boolean boolean6 = cfj.<RedstoneSide>getValue(RedStoneWireBlock.NORTH).isConnected();
+        final boolean boolean7 = cfj.<RedstoneSide>getValue(RedStoneWireBlock.SOUTH).isConnected();
+        final boolean boolean8 = cfj.<RedstoneSide>getValue(RedStoneWireBlock.EAST).isConnected();
+        final boolean boolean9 = cfj.<RedstoneSide>getValue(RedStoneWireBlock.WEST).isConnected();
+        final boolean boolean10 = !boolean6 && !boolean7;
+        final boolean boolean11 = !boolean8 && !boolean9;
+        if (!boolean9 && boolean10) {
+            cfj = ((StateHolder<O, BlockState>)cfj).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.WEST, RedstoneSide.SIDE);
+        }
+        if (!boolean8 && boolean10) {
+            cfj = ((StateHolder<O, BlockState>)cfj).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.EAST, RedstoneSide.SIDE);
+        }
+        if (!boolean6 && boolean11) {
+            cfj = ((StateHolder<O, BlockState>)cfj).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE);
+        }
+        if (!boolean7 && boolean11) {
+            cfj = ((StateHolder<O, BlockState>)cfj).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, RedstoneSide.SIDE);
+        }
+        return cfj;
+    }
+    
+    private BlockState getMissingConnections(final BlockGetter bpg, BlockState cfj, final BlockPos fu) {
+        final boolean boolean5 = !bpg.getBlockState(fu.above()).isRedstoneConductor(bpg, fu);
+        for (final Direction fz7 : Direction.Plane.HORIZONTAL) {
+            if (!cfj.<RedstoneSide>getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz7)).isConnected()) {
+                final RedstoneSide cgn8 = this.getConnectingSide(bpg, fu, fz7, boolean5);
+                cfj = ((StateHolder<O, BlockState>)cfj).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz7), cgn8);
+            }
+        }
+        return cfj;
+    }
+    
+    @Override
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN) {
+            return cfj1;
+        }
+        if (fz == Direction.UP) {
+            return this.getConnectionState(bqc, cfj1, fu5);
+        }
+        final RedstoneSide cgn8 = this.getConnectingSide(bqc, fu5, fz);
+        if (cgn8.isConnected() == cfj1.<RedstoneSide>getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz)).isConnected() && !isCross(cfj1)) {
+            return ((StateHolder<O, BlockState>)cfj1).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz), cgn8);
+        }
+        return this.getConnectionState(bqc, (((StateHolder<O, BlockState>)this.crossState).setValue((Property<Comparable>)RedStoneWireBlock.POWER, (Comparable)cfj1.<V>getValue((Property<V>)RedStoneWireBlock.POWER))).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz), cgn8), fu5);
+    }
+    
+    private static boolean isCross(final BlockState cfj) {
+        return cfj.<RedstoneSide>getValue(RedStoneWireBlock.NORTH).isConnected() && cfj.<RedstoneSide>getValue(RedStoneWireBlock.SOUTH).isConnected() && cfj.<RedstoneSide>getValue(RedStoneWireBlock.EAST).isConnected() && cfj.<RedstoneSide>getValue(RedStoneWireBlock.WEST).isConnected();
+    }
+    
+    private static boolean isDot(final BlockState cfj) {
+        return !cfj.<RedstoneSide>getValue(RedStoneWireBlock.NORTH).isConnected() && !cfj.<RedstoneSide>getValue(RedStoneWireBlock.SOUTH).isConnected() && !cfj.<RedstoneSide>getValue(RedStoneWireBlock.EAST).isConnected() && !cfj.<RedstoneSide>getValue(RedStoneWireBlock.WEST).isConnected();
+    }
+    
+    @Override
+    public void updateIndirectNeighbourShapes(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu, final int integer4, final int integer5) {
+        final BlockPos.MutableBlockPos a7 = new BlockPos.MutableBlockPos();
+        for (final Direction fz9 : Direction.Plane.HORIZONTAL) {
+            final RedstoneSide cgn10 = cfj.<RedstoneSide>getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz9));
+            if (cgn10 != RedstoneSide.NONE && !bqc.getBlockState(a7.setWithOffset(fu, fz9)).is(this)) {
+                a7.move(Direction.DOWN);
+                final BlockState cfj2 = bqc.getBlockState(a7);
+                if (!cfj2.is(Blocks.OBSERVER)) {
+                    final BlockPos fu2 = a7.relative(fz9.getOpposite());
+                    final BlockState cfj3 = cfj2.updateShape(fz9.getOpposite(), bqc.getBlockState(fu2), bqc, a7, fu2);
+                    Block.updateOrDestroy(cfj2, cfj3, bqc, a7, integer4, integer5);
+                }
+                a7.setWithOffset(fu, fz9).move(Direction.UP);
+                final BlockState cfj4 = bqc.getBlockState(a7);
+                if (cfj4.is(Blocks.OBSERVER)) {
+                    continue;
+                }
+                final BlockPos fu3 = a7.relative(fz9.getOpposite());
+                final BlockState cfj5 = cfj4.updateShape(fz9.getOpposite(), bqc.getBlockState(fu3), bqc, a7, fu3);
+                Block.updateOrDestroy(cfj4, cfj5, bqc, a7, integer4, integer5);
+            }
+        }
+    }
+    
+    private RedstoneSide getConnectingSide(final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return this.getConnectingSide(bpg, fu, fz, !bpg.getBlockState(fu.above()).isRedstoneConductor(bpg, fu));
+    }
+    
+    private RedstoneSide getConnectingSide(final BlockGetter bpg, final BlockPos fu, final Direction fz, final boolean boolean4) {
+        final BlockPos fu2 = fu.relative(fz);
+        final BlockState cfj7 = bpg.getBlockState(fu2);
+        if (boolean4) {
+            final boolean boolean5 = this.canSurviveOn(bpg, fu2, cfj7);
+            if (boolean5 && shouldConnectTo(bpg.getBlockState(fu2.above()))) {
+                if (cfj7.isFaceSturdy(bpg, fu2, fz.getOpposite())) {
                     return RedstoneSide.UP;
                 }
                 return RedstoneSide.SIDE;
             }
         }
-        if (shouldConnectTo(byj6, fp) || (!byj6.isRedstoneConductor(bjg, fk2) && shouldConnectTo(bjg.getBlockState(fk2.below())))) {
+        if (shouldConnectTo(cfj7, fz) || (!cfj7.isRedstoneConductor(bpg, fu2) && shouldConnectTo(bpg.getBlockState(fu2.below())))) {
             return RedstoneSide.SIDE;
         }
         return RedstoneSide.NONE;
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        final BlockState byj2 = bjz.getBlockState(fk2);
-        return byj2.isFaceSturdy(bjz, fk2, Direction.UP) || byj2.getBlock() == Blocks.HOPPER;
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj2 = bqd.getBlockState(fu2);
+        return this.canSurviveOn(bqd, fu2, cfj2);
     }
     
-    private BlockState updatePowerStrength(final Level bjw, final BlockPos fk, BlockState byj) {
-        byj = this.updatePowerStrengthImpl(bjw, fk, byj);
-        final List<BlockPos> list5 = Lists.newArrayList(this.toUpdate);
-        this.toUpdate.clear();
-        for (final BlockPos fk2 : list5) {
-            bjw.updateNeighborsAt(fk2, this);
+    private boolean canSurviveOn(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        return cfj.isFaceSturdy(bpg, fu, Direction.UP) || cfj.is(Blocks.HOPPER);
+    }
+    
+    private void updatePowerStrength(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        final int integer5 = this.calculateTargetStrength(bqb, fu);
+        if (cfj.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER) != integer5) {
+            if (bqb.getBlockState(fu) == cfj) {
+                bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)RedStoneWireBlock.POWER, integer5), 2);
+            }
+            final Set<BlockPos> set6 = Sets.newHashSet();
+            set6.add(fu);
+            for (final Direction fz10 : Direction.values()) {
+                set6.add(fu.relative(fz10));
+            }
+            for (final BlockPos fu2 : set6) {
+                bqb.updateNeighborsAt(fu2, this);
+            }
         }
-        return byj;
     }
     
-    private BlockState updatePowerStrengthImpl(final Level bjw, final BlockPos fk, BlockState byj) {
-        final BlockState byj2 = byj;
-        final int integer6 = byj2.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER);
+    private int calculateTargetStrength(final Level bqb, final BlockPos fu) {
         this.shouldSignal = false;
-        final int integer7 = bjw.getBestNeighborSignal(fk);
+        final int integer4 = bqb.getBestNeighborSignal(fu);
         this.shouldSignal = true;
-        int integer8 = 0;
-        if (integer7 < 15) {
-            for (final Direction fp10 : Direction.Plane.HORIZONTAL) {
-                final BlockPos fk2 = fk.relative(fp10);
-                final BlockState byj3 = bjw.getBlockState(fk2);
-                integer8 = this.checkTarget(integer8, byj3);
-                final BlockPos fk3 = fk.above();
-                if (byj3.isRedstoneConductor(bjw, fk2) && !bjw.getBlockState(fk3).isRedstoneConductor(bjw, fk3)) {
-                    integer8 = this.checkTarget(integer8, bjw.getBlockState(fk2.above()));
+        int integer5 = 0;
+        if (integer4 < 15) {
+            for (final Direction fz7 : Direction.Plane.HORIZONTAL) {
+                final BlockPos fu2 = fu.relative(fz7);
+                final BlockState cfj9 = bqb.getBlockState(fu2);
+                integer5 = Math.max(integer5, this.getWireSignal(cfj9));
+                final BlockPos fu3 = fu.above();
+                if (cfj9.isRedstoneConductor(bqb, fu2) && !bqb.getBlockState(fu3).isRedstoneConductor(bqb, fu3)) {
+                    integer5 = Math.max(integer5, this.getWireSignal(bqb.getBlockState(fu2.above())));
                 }
                 else {
-                    if (byj3.isRedstoneConductor(bjw, fk2)) {
+                    if (cfj9.isRedstoneConductor(bqb, fu2)) {
                         continue;
                     }
-                    integer8 = this.checkTarget(integer8, bjw.getBlockState(fk2.below()));
+                    integer5 = Math.max(integer5, this.getWireSignal(bqb.getBlockState(fu2.below())));
                 }
             }
         }
-        int integer9 = integer8 - 1;
-        if (integer7 > integer9) {
-            integer9 = integer7;
-        }
-        if (integer6 != integer9) {
-            byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)RedStoneWireBlock.POWER, integer9);
-            if (bjw.getBlockState(fk) == byj2) {
-                bjw.setBlock(fk, byj, 2);
-            }
-            this.toUpdate.add(fk);
-            for (final Direction fp11 : Direction.values()) {
-                this.toUpdate.add(fk.relative(fp11));
-            }
-        }
-        return byj;
+        return Math.max(integer4, integer5 - 1);
     }
     
-    private void checkCornerChangeAt(final Level bjw, final BlockPos fk) {
-        if (bjw.getBlockState(fk).getBlock() != this) {
+    private int getWireSignal(final BlockState cfj) {
+        return cfj.is(this) ? cfj.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER) : 0;
+    }
+    
+    private void checkCornerChangeAt(final Level bqb, final BlockPos fu) {
+        if (!bqb.getBlockState(fu).is(this)) {
             return;
         }
-        bjw.updateNeighborsAt(fk, this);
-        for (final Direction fp7 : Direction.values()) {
-            bjw.updateNeighborsAt(fk.relative(fp7), this);
+        bqb.updateNeighborsAt(fu, this);
+        for (final Direction fz7 : Direction.values()) {
+            bqb.updateNeighborsAt(fu.relative(fz7), this);
         }
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj4.getBlock() == byj1.getBlock() || bjw.isClientSide) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj4.is(cfj1.getBlock()) || bqb.isClientSide) {
             return;
         }
-        this.updatePowerStrength(bjw, fk, byj1);
-        for (final Direction fp8 : Direction.Plane.VERTICAL) {
-            bjw.updateNeighborsAt(fk.relative(fp8), this);
+        this.updatePowerStrength(bqb, fu, cfj1);
+        for (final Direction fz8 : Direction.Plane.VERTICAL) {
+            bqb.updateNeighborsAt(fu.relative(fz8), this);
         }
-        for (final Direction fp8 : Direction.Plane.HORIZONTAL) {
-            this.checkCornerChangeAt(bjw, fk.relative(fp8));
+        this.updateNeighborsOfNeighboringWires(bqb, fu);
+    }
+    
+    @Override
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (boolean5 || cfj1.is(cfj4.getBlock())) {
+            return;
         }
-        for (final Direction fp8 : Direction.Plane.HORIZONTAL) {
-            final BlockPos fk2 = fk.relative(fp8);
-            if (bjw.getBlockState(fk2).isRedstoneConductor(bjw, fk2)) {
-                this.checkCornerChangeAt(bjw, fk2.above());
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
+        if (bqb.isClientSide) {
+            return;
+        }
+        for (final Direction fz10 : Direction.values()) {
+            bqb.updateNeighborsAt(fu.relative(fz10), this);
+        }
+        this.updatePowerStrength(bqb, fu, cfj1);
+        this.updateNeighborsOfNeighboringWires(bqb, fu);
+    }
+    
+    private void updateNeighborsOfNeighboringWires(final Level bqb, final BlockPos fu) {
+        for (final Direction fz5 : Direction.Plane.HORIZONTAL) {
+            this.checkCornerChangeAt(bqb, fu.relative(fz5));
+        }
+        for (final Direction fz5 : Direction.Plane.HORIZONTAL) {
+            final BlockPos fu2 = fu.relative(fz5);
+            if (bqb.getBlockState(fu2).isRedstoneConductor(bqb, fu2)) {
+                this.checkCornerChangeAt(bqb, fu2.above());
             }
             else {
-                this.checkCornerChangeAt(bjw, fk2.below());
+                this.checkCornerChangeAt(bqb, fu2.below());
             }
         }
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (boolean5 || byj1.getBlock() == byj4.getBlock()) {
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (bqb.isClientSide) {
             return;
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
-        if (bjw.isClientSide) {
-            return;
-        }
-        for (final Direction fp10 : Direction.values()) {
-            bjw.updateNeighborsAt(fk.relative(fp10), this);
-        }
-        this.updatePowerStrength(bjw, fk, byj1);
-        for (final Direction fp11 : Direction.Plane.HORIZONTAL) {
-            this.checkCornerChangeAt(bjw, fk.relative(fp11));
-        }
-        for (final Direction fp11 : Direction.Plane.HORIZONTAL) {
-            final BlockPos fk2 = fk.relative(fp11);
-            if (bjw.getBlockState(fk2).isRedstoneConductor(bjw, fk2)) {
-                this.checkCornerChangeAt(bjw, fk2.above());
-            }
-            else {
-                this.checkCornerChangeAt(bjw, fk2.below());
-            }
-        }
-    }
-    
-    private int checkTarget(final int integer, final BlockState byj) {
-        if (byj.getBlock() != this) {
-            return integer;
-        }
-        final int integer2 = byj.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER);
-        if (integer2 > integer) {
-            return integer2;
-        }
-        return integer;
-    }
-    
-    @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (bjw.isClientSide) {
-            return;
-        }
-        if (byj.canSurvive(bjw, fk3)) {
-            this.updatePowerStrength(bjw, fk3, byj);
+        if (cfj.canSurvive(bqb, fu3)) {
+            this.updatePowerStrength(bqb, fu3, cfj);
         }
         else {
-            Block.dropResources(byj, bjw, fk3);
-            bjw.removeBlock(fk3, false);
+            Block.dropResources(cfj, bqb, fu3);
+            bqb.removeBlock(fu3, false);
         }
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
         if (!this.shouldSignal) {
             return 0;
         }
-        return byj.getSignal(bjg, fk, fp);
+        return cfj.getSignal(bpg, fu, fz);
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (!this.shouldSignal) {
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (!this.shouldSignal || fz == Direction.DOWN) {
             return 0;
         }
-        final int integer6 = byj.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER);
+        final int integer6 = cfj.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER);
         if (integer6 == 0) {
             return 0;
         }
-        if (fp == Direction.UP) {
-            return integer6;
-        }
-        final EnumSet<Direction> enumSet7 = EnumSet.<Direction>noneOf(Direction.class);
-        for (final Direction fp2 : Direction.Plane.HORIZONTAL) {
-            if (this.isPowerSourceAt(bjg, fk, fp2)) {
-                enumSet7.add(fp2);
-            }
-        }
-        if (fp.getAxis().isHorizontal() && enumSet7.isEmpty()) {
-            return integer6;
-        }
-        if (enumSet7.contains(fp) && !enumSet7.contains(fp.getCounterClockWise()) && !enumSet7.contains(fp.getClockWise())) {
+        if (fz == Direction.UP || this.getConnectionState(bpg, cfj, fu).<RedstoneSide>getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz.getOpposite())).isConnected()) {
             return integer6;
         }
         return 0;
     }
     
-    private boolean isPowerSourceAt(final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        final BlockPos fk2 = fk.relative(fp);
-        final BlockState byj6 = bjg.getBlockState(fk2);
-        final boolean boolean7 = byj6.isRedstoneConductor(bjg, fk2);
-        final BlockPos fk3 = fk.above();
-        final boolean boolean8 = bjg.getBlockState(fk3).isRedstoneConductor(bjg, fk3);
-        return (!boolean8 && boolean7 && shouldConnectTo(bjg, fk2.above())) || shouldConnectTo(byj6, fp) || (byj6.getBlock() == Blocks.REPEATER && byj6.<Boolean>getValue((Property<Boolean>)DiodeBlock.POWERED) && byj6.<Comparable>getValue((Property<Comparable>)DiodeBlock.FACING) == fp) || (!boolean7 && shouldConnectTo(bjg, fk2.below()));
+    protected static boolean shouldConnectTo(final BlockState cfj) {
+        return shouldConnectTo(cfj, null);
     }
     
-    protected static boolean shouldConnectTo(final BlockGetter bjg, final BlockPos fk) {
-        return shouldConnectTo(bjg.getBlockState(fk));
-    }
-    
-    protected static boolean shouldConnectTo(final BlockState byj) {
-        return shouldConnectTo(byj, null);
-    }
-    
-    protected static boolean shouldConnectTo(final BlockState byj, @Nullable final Direction fp) {
-        final Block bph3 = byj.getBlock();
-        if (bph3 == Blocks.REDSTONE_WIRE) {
+    protected static boolean shouldConnectTo(final BlockState cfj, @Nullable final Direction fz) {
+        if (cfj.is(Blocks.REDSTONE_WIRE)) {
             return true;
         }
-        if (byj.getBlock() == Blocks.REPEATER) {
-            final Direction fp2 = byj.<Direction>getValue((Property<Direction>)RepeaterBlock.FACING);
-            return fp2 == fp || fp2.getOpposite() == fp;
+        if (cfj.is(Blocks.REPEATER)) {
+            final Direction fz2 = cfj.<Direction>getValue((Property<Direction>)RepeaterBlock.FACING);
+            return fz2 == fz || fz2.getOpposite() == fz;
         }
-        if (Blocks.OBSERVER == byj.getBlock()) {
-            return fp == byj.<Direction>getValue((Property<Direction>)ObserverBlock.FACING);
+        if (cfj.is(Blocks.OBSERVER)) {
+            return fz == cfj.<Direction>getValue((Property<Direction>)ObserverBlock.FACING);
         }
-        return byj.isSignalSource() && fp != null;
+        return cfj.isSignalSource() && fz != null;
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return this.shouldSignal;
     }
     
-    public static int getColorForData(final int integer) {
-        final float float2 = integer / 15.0f;
-        float float3 = float2 * 0.6f + 0.4f;
-        if (integer == 0) {
-            float3 = 0.3f;
+    public static int getColorForPower(final int integer) {
+        final Vector3f g2 = RedStoneWireBlock.COLORS[integer];
+        return Mth.color(g2.x(), g2.y(), g2.z());
+    }
+    
+    private void spawnParticlesAlongLine(final Level bqb, final Random random, final BlockPos fu, final Vector3f g, final Direction fz5, final Direction fz6, final float float7, final float float8) {
+        final float float9 = float8 - float7;
+        if (random.nextFloat() >= 0.2f * float9) {
+            return;
         }
-        float float4 = float2 * float2 * 0.7f - 0.5f;
-        float float5 = float2 * float2 * 0.6f - 0.7f;
-        if (float4 < 0.0f) {
-            float4 = 0.0f;
-        }
-        if (float5 < 0.0f) {
-            float5 = 0.0f;
-        }
-        final int integer2 = Mth.clamp((int)(float3 * 255.0f), 0, 255);
-        final int integer3 = Mth.clamp((int)(float4 * 255.0f), 0, 255);
-        final int integer4 = Mth.clamp((int)(float5 * 255.0f), 0, 255);
-        return 0xFF000000 | integer2 << 16 | integer3 << 8 | integer4;
+        final float float10 = 0.4375f;
+        final float float11 = float7 + float9 * random.nextFloat();
+        final double double13 = 0.5 + 0.4375f * fz5.getStepX() + float11 * fz6.getStepX();
+        final double double14 = 0.5 + 0.4375f * fz5.getStepY() + float11 * fz6.getStepY();
+        final double double15 = 0.5 + 0.4375f * fz5.getStepZ() + float11 * fz6.getStepZ();
+        bqb.addParticle(new DustParticleOptions(g.x(), g.y(), g.z(), 1.0f), fu.getX() + double13, fu.getY() + double14, fu.getZ() + double15, 0.0, 0.0, 0.0);
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        final int integer6 = byj.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        final int integer6 = cfj.<Integer>getValue((Property<Integer>)RedStoneWireBlock.POWER);
         if (integer6 == 0) {
             return;
         }
-        final double double7 = fk.getX() + 0.5 + (random.nextFloat() - 0.5) * 0.2;
-        final double double8 = fk.getY() + 0.0625f;
-        final double double9 = fk.getZ() + 0.5 + (random.nextFloat() - 0.5) * 0.2;
-        final float float13 = integer6 / 15.0f;
-        final float float14 = float13 * 0.6f + 0.4f;
-        final float float15 = Math.max(0.0f, float13 * float13 * 0.7f - 0.5f);
-        final float float16 = Math.max(0.0f, float13 * float13 * 0.6f - 0.7f);
-        bjw.addParticle(new DustParticleOptions(float14, float15, float16, 1.0f), double7, double8, double9, 0.0, 0.0, 0.0);
-    }
-    
-    @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        switch (btu) {
-            case CLOCKWISE_180: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue(RedStoneWireBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.SOUTH))).setValue(RedStoneWireBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.WEST))).setValue(RedStoneWireBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.NORTH))).<RedstoneSide, Comparable>setValue(RedStoneWireBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.EAST));
-            }
-            case COUNTERCLOCKWISE_90: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue(RedStoneWireBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.EAST))).setValue(RedStoneWireBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.SOUTH))).setValue(RedStoneWireBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.WEST))).<RedstoneSide, Comparable>setValue(RedStoneWireBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.NORTH));
-            }
-            case CLOCKWISE_90: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue(RedStoneWireBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.WEST))).setValue(RedStoneWireBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.NORTH))).setValue(RedStoneWireBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.EAST))).<RedstoneSide, Comparable>setValue(RedStoneWireBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.SOUTH));
-            }
-            default: {
-                return byj;
+        for (final Direction fz8 : Direction.Plane.HORIZONTAL) {
+            final RedstoneSide cgn9 = cfj.<RedstoneSide>getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz8));
+            switch (cgn9) {
+                case UP: {
+                    this.spawnParticlesAlongLine(bqb, random, fu, RedStoneWireBlock.COLORS[integer6], fz8, Direction.UP, -0.5f, 0.5f);
+                }
+                case SIDE: {
+                    this.spawnParticlesAlongLine(bqb, random, fu, RedStoneWireBlock.COLORS[integer6], Direction.DOWN, fz8, 0.0f, 0.5f);
+                    continue;
+                }
+                default: {
+                    this.spawnParticlesAlongLine(bqb, random, fu, RedStoneWireBlock.COLORS[integer6], Direction.DOWN, fz8, 0.0f, 0.3f);
+                    continue;
+                }
             }
         }
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        switch (bsu) {
-            case LEFT_RIGHT: {
-                return (((AbstractStateHolder<O, BlockState>)byj).setValue(RedStoneWireBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.SOUTH))).<RedstoneSide, Comparable>setValue(RedStoneWireBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.NORTH));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        switch (cap) {
+            case CLOCKWISE_180: {
+                return (((((StateHolder<O, BlockState>)cfj).setValue(RedStoneWireBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.SOUTH))).setValue(RedStoneWireBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.WEST))).setValue(RedStoneWireBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.NORTH))).<RedstoneSide, Comparable>setValue(RedStoneWireBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.EAST));
             }
-            case FRONT_BACK: {
-                return (((AbstractStateHolder<O, BlockState>)byj).setValue(RedStoneWireBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.WEST))).<RedstoneSide, Comparable>setValue(RedStoneWireBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)RedStoneWireBlock.EAST));
+            case COUNTERCLOCKWISE_90: {
+                return (((((StateHolder<O, BlockState>)cfj).setValue(RedStoneWireBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.EAST))).setValue(RedStoneWireBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.SOUTH))).setValue(RedStoneWireBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.WEST))).<RedstoneSide, Comparable>setValue(RedStoneWireBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.NORTH));
+            }
+            case CLOCKWISE_90: {
+                return (((((StateHolder<O, BlockState>)cfj).setValue(RedStoneWireBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.WEST))).setValue(RedStoneWireBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.NORTH))).setValue(RedStoneWireBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.EAST))).<RedstoneSide, Comparable>setValue(RedStoneWireBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.SOUTH));
             }
             default: {
-                return super.mirror(byj, bsu);
+                return cfj;
+            }
+        }
+    }
+    
+    @Override
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        switch (bzj) {
+            case LEFT_RIGHT: {
+                return (((StateHolder<O, BlockState>)cfj).setValue(RedStoneWireBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.SOUTH))).<RedstoneSide, Comparable>setValue(RedStoneWireBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.NORTH));
+            }
+            case FRONT_BACK: {
+                return (((StateHolder<O, BlockState>)cfj).setValue(RedStoneWireBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.WEST))).<RedstoneSide, Comparable>setValue(RedStoneWireBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.EAST));
+            }
+            default: {
+                return super.mirror(cfj, bzj);
             }
         }
     }
@@ -430,6 +451,33 @@ public class RedStoneWireBlock extends Block {
         a.add(RedStoneWireBlock.NORTH, RedStoneWireBlock.EAST, RedStoneWireBlock.SOUTH, RedStoneWireBlock.WEST, RedStoneWireBlock.POWER);
     }
     
+    @Override
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (!bec.abilities.mayBuild) {
+            return InteractionResult.PASS;
+        }
+        if (isCross(cfj) || isDot(cfj)) {
+            BlockState cfj2 = isCross(cfj) ? this.defaultBlockState() : this.crossState;
+            cfj2 = ((StateHolder<O, BlockState>)cfj2).<Comparable, Comparable>setValue((Property<Comparable>)RedStoneWireBlock.POWER, (Comparable)cfj.<V>getValue((Property<V>)RedStoneWireBlock.POWER));
+            cfj2 = this.getConnectionState(bqb, cfj2, fu);
+            if (cfj2 != cfj) {
+                bqb.setBlock(fu, cfj2, 3);
+                this.updatesOnShapeChange(bqb, fu, cfj, cfj2);
+                return InteractionResult.SUCCESS;
+            }
+        }
+        return InteractionResult.PASS;
+    }
+    
+    private void updatesOnShapeChange(final Level bqb, final BlockPos fu, final BlockState cfj3, final BlockState cfj4) {
+        for (final Direction fz7 : Direction.Plane.HORIZONTAL) {
+            final BlockPos fu2 = fu.relative(fz7);
+            if (cfj3.<RedstoneSide>getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz7)).isConnected() != cfj4.<RedstoneSide>getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(fz7)).isConnected() && bqb.getBlockState(fu2).isRedstoneConductor(bqb, fu2)) {
+                bqb.updateNeighborsAtExceptFromFacing(fu2, cfj4.getBlock(), fz7.getOpposite());
+            }
+        }
+    }
+    
     static {
         NORTH = BlockStateProperties.NORTH_REDSTONE;
         EAST = BlockStateProperties.EAST_REDSTONE;
@@ -437,6 +485,16 @@ public class RedStoneWireBlock extends Block {
         WEST = BlockStateProperties.WEST_REDSTONE;
         POWER = BlockStateProperties.POWER;
         PROPERTY_BY_DIRECTION = Maps.<Direction, Object>newEnumMap(ImmutableMap.<Direction, EnumProperty<RedstoneSide>>of(Direction.NORTH, RedStoneWireBlock.NORTH, Direction.EAST, RedStoneWireBlock.EAST, Direction.SOUTH, RedStoneWireBlock.SOUTH, Direction.WEST, RedStoneWireBlock.WEST));
-        SHAPE_BY_INDEX = new VoxelShape[] { Block.box(3.0, 0.0, 3.0, 13.0, 1.0, 13.0), Block.box(3.0, 0.0, 3.0, 13.0, 1.0, 16.0), Block.box(0.0, 0.0, 3.0, 13.0, 1.0, 13.0), Block.box(0.0, 0.0, 3.0, 13.0, 1.0, 16.0), Block.box(3.0, 0.0, 0.0, 13.0, 1.0, 13.0), Block.box(3.0, 0.0, 0.0, 13.0, 1.0, 16.0), Block.box(0.0, 0.0, 0.0, 13.0, 1.0, 13.0), Block.box(0.0, 0.0, 0.0, 13.0, 1.0, 16.0), Block.box(3.0, 0.0, 3.0, 16.0, 1.0, 13.0), Block.box(3.0, 0.0, 3.0, 16.0, 1.0, 16.0), Block.box(0.0, 0.0, 3.0, 16.0, 1.0, 13.0), Block.box(0.0, 0.0, 3.0, 16.0, 1.0, 16.0), Block.box(3.0, 0.0, 0.0, 16.0, 1.0, 13.0), Block.box(3.0, 0.0, 0.0, 16.0, 1.0, 16.0), Block.box(0.0, 0.0, 0.0, 16.0, 1.0, 13.0), Block.box(0.0, 0.0, 0.0, 16.0, 1.0, 16.0) };
+        SHAPE_DOT = Block.box(3.0, 0.0, 3.0, 13.0, 1.0, 13.0);
+        SHAPES_FLOOR = Maps.<Direction, Object>newEnumMap(ImmutableMap.<Direction, VoxelShape>of(Direction.NORTH, Block.box(3.0, 0.0, 0.0, 13.0, 1.0, 13.0), Direction.SOUTH, Block.box(3.0, 0.0, 3.0, 13.0, 1.0, 16.0), Direction.EAST, Block.box(3.0, 0.0, 3.0, 16.0, 1.0, 13.0), Direction.WEST, Block.box(0.0, 0.0, 3.0, 13.0, 1.0, 13.0)));
+        SHAPES_UP = Maps.<Direction, Object>newEnumMap(ImmutableMap.<Direction, VoxelShape>of(Direction.NORTH, Shapes.or(RedStoneWireBlock.SHAPES_FLOOR.get(Direction.NORTH), Block.box(3.0, 0.0, 0.0, 13.0, 16.0, 1.0)), Direction.SOUTH, Shapes.or(RedStoneWireBlock.SHAPES_FLOOR.get(Direction.SOUTH), Block.box(3.0, 0.0, 15.0, 13.0, 16.0, 16.0)), Direction.EAST, Shapes.or(RedStoneWireBlock.SHAPES_FLOOR.get(Direction.EAST), Block.box(15.0, 0.0, 3.0, 16.0, 16.0, 13.0)), Direction.WEST, Shapes.or(RedStoneWireBlock.SHAPES_FLOOR.get(Direction.WEST), Block.box(0.0, 0.0, 3.0, 1.0, 16.0, 13.0))));
+        COLORS = new Vector3f[16];
+        for (int integer1 = 0; integer1 <= 15; ++integer1) {
+            final float float2 = integer1 / 15.0f;
+            final float float3 = float2 * 0.6f + ((float2 > 0.0f) ? 0.4f : 0.3f);
+            final float float4 = Mth.clamp(float2 * float2 * 0.7f - 0.5f, 0.0f, 1.0f);
+            final float float5 = Mth.clamp(float2 * float2 * 0.6f - 0.7f, 0.0f, 1.0f);
+            RedStoneWireBlock.COLORS[integer1] = new Vector3f(float3, float4, float5);
+        }
     }
 }
diff --git a/src/net/minecraft/world/level/block/RedstoneLampBlock.java b/src/net/minecraft/world/level/block/RedstoneLampBlock.java
index 279deb3..873cf4f 100644
--- a/src/net/minecraft/world/level/block/RedstoneLampBlock.java
+++ b/src/net/minecraft/world/level/block/RedstoneLampBlock.java
@@ -1,17 +1,16 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.StateDefinition;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
-import javax.annotation.Nullable;
-import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import javax.annotation.Nullable;
+import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public class RedstoneLampBlock extends Block {
@@ -19,45 +18,35 @@ public class RedstoneLampBlock extends Block {
     
     public RedstoneLampBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneLampBlock.LIT, false));
-    }
-    
-    @Override
-    public int getLightEmission(final BlockState byj) {
-        return byj.<Boolean>getValue((Property<Boolean>)RedstoneLampBlock.LIT) ? super.getLightEmission(byj) : 0;
-    }
-    
-    @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        super.onPlace(byj1, bjw, fk, byj4, boolean5);
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneLampBlock.LIT, false));
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneLampBlock.LIT, bcq.getLevel().hasNeighborSignal(bcq.getClickedPos()));
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneLampBlock.LIT, bin.getLevel().hasNeighborSignal(bin.getClickedPos()));
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (bjw.isClientSide) {
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (bqb.isClientSide) {
             return;
         }
-        final boolean boolean7 = byj.<Boolean>getValue((Property<Boolean>)RedstoneLampBlock.LIT);
-        if (boolean7 != bjw.hasNeighborSignal(fk3)) {
+        final boolean boolean7 = cfj.<Boolean>getValue((Property<Boolean>)RedstoneLampBlock.LIT);
+        if (boolean7 != bqb.hasNeighborSignal(fu3)) {
             if (boolean7) {
-                bjw.getBlockTicks().scheduleTick(fk3, this, 4);
+                bqb.getBlockTicks().scheduleTick(fu3, this, 4);
             }
             else {
-                bjw.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)RedstoneLampBlock.LIT), 2);
+                bqb.setBlock(fu3, ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)RedstoneLampBlock.LIT), 2);
             }
         }
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (byj.<Boolean>getValue((Property<Boolean>)RedstoneLampBlock.LIT) && !xd.hasNeighborSignal(fk)) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)RedstoneLampBlock.LIT), 2);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)RedstoneLampBlock.LIT) && !zd.hasNeighborSignal(fu)) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)RedstoneLampBlock.LIT), 2);
         }
     }
     
@@ -66,11 +55,6 @@ public class RedstoneLampBlock extends Block {
         a.add(RedstoneLampBlock.LIT);
     }
     
-    @Override
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return true;
-    }
-    
     static {
         LIT = RedstoneTorchBlock.LIT;
     }
diff --git a/src/net/minecraft/world/level/block/RedstoneTorchBlock.java b/src/net/minecraft/world/level/block/RedstoneTorchBlock.java
index 51adf6d..9b3e8d2 100644
--- a/src/net/minecraft/world/level/block/RedstoneTorchBlock.java
+++ b/src/net/minecraft/world/level/block/RedstoneTorchBlock.java
@@ -1,20 +1,20 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import java.util.WeakHashMap;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import com.google.common.collect.Lists;
 import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.DustParticleOptions;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.DustParticleOptions;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import java.util.List;
 import net.minecraft.world.level.BlockGetter;
 import java.util.Map;
@@ -25,102 +25,89 @@ public class RedstoneTorchBlock extends TorchBlock {
     private static final Map<BlockGetter, List<Toggle>> RECENT_TOGGLES;
     
     protected RedstoneTorchBlock(final Properties c) {
-        super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneTorchBlock.LIT, true));
+        super(c, DustParticleOptions.REDSTONE);
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneTorchBlock.LIT, true));
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return 2;
-    }
-    
-    @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        for (final Direction fp10 : Direction.values()) {
-            bjw.updateNeighborsAt(fk.relative(fp10), this);
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        for (final Direction fz10 : Direction.values()) {
+            bqb.updateNeighborsAt(fu.relative(fz10), this);
         }
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
         if (boolean5) {
             return;
         }
-        for (final Direction fp10 : Direction.values()) {
-            bjw.updateNeighborsAt(fk.relative(fp10), this);
+        for (final Direction fz10 : Direction.values()) {
+            bqb.updateNeighborsAt(fu.relative(fz10), this);
         }
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (byj.<Boolean>getValue((Property<Boolean>)RedstoneTorchBlock.LIT) && Direction.UP != fp) {
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)RedstoneTorchBlock.LIT) && Direction.UP != fz) {
             return 15;
         }
         return 0;
     }
     
-    protected boolean hasNeighborSignal(final Level bjw, final BlockPos fk, final BlockState byj) {
-        return bjw.hasSignal(fk.below(), Direction.DOWN);
+    protected boolean hasNeighborSignal(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        return bqb.hasSignal(fu.below(), Direction.DOWN);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        handleTick(byj, xd, fk, random, this.hasNeighborSignal(xd, fk, byj));
-    }
-    
-    public static void handleTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random, final boolean boolean5) {
-        final List<Toggle> list6 = RedstoneTorchBlock.RECENT_TOGGLES.get(bjw);
-        while (list6 != null && !list6.isEmpty() && bjw.getGameTime() - list6.get(0).when > 60L) {
-            list6.remove(0);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final boolean boolean6 = this.hasNeighborSignal(zd, fu, cfj);
+        final List<Toggle> list7 = RedstoneTorchBlock.RECENT_TOGGLES.get(zd);
+        while (list7 != null && !list7.isEmpty() && zd.getGameTime() - list7.get(0).when > 60L) {
+            list7.remove(0);
         }
-        if (byj.<Boolean>getValue((Property<Boolean>)RedstoneTorchBlock.LIT)) {
-            if (boolean5) {
-                bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneTorchBlock.LIT, false), 3);
-                if (isToggledTooFrequently(bjw, fk, true)) {
-                    bjw.levelEvent(1502, fk, 0);
-                    bjw.getBlockTicks().scheduleTick(fk, bjw.getBlockState(fk).getBlock(), 160);
+        if (cfj.<Boolean>getValue((Property<Boolean>)RedstoneTorchBlock.LIT)) {
+            if (boolean6) {
+                zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneTorchBlock.LIT, false), 3);
+                if (isToggledTooFrequently(zd, fu, true)) {
+                    zd.levelEvent(1502, fu, 0);
+                    zd.getBlockTicks().scheduleTick(fu, zd.getBlockState(fu).getBlock(), 160);
                 }
             }
         }
-        else if (!boolean5 && !isToggledTooFrequently(bjw, fk, false)) {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneTorchBlock.LIT, true), 3);
+        else if (!boolean6 && !isToggledTooFrequently(zd, fu, false)) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneTorchBlock.LIT, true), 3);
         }
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (byj.<Boolean>getValue((Property<Boolean>)RedstoneTorchBlock.LIT) == this.hasNeighborSignal(bjw, fk3, byj) && !bjw.getBlockTicks().willTickThisTick(fk3, this)) {
-            bjw.getBlockTicks().scheduleTick(fk3, this, this.getTickDelay(bjw));
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)RedstoneTorchBlock.LIT) == this.hasNeighborSignal(bqb, fu3, cfj) && !bqb.getBlockTicks().willTickThisTick(fu3, this)) {
+            bqb.getBlockTicks().scheduleTick(fu3, this, 2);
         }
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (fp == Direction.DOWN) {
-            return byj.getSignal(bjg, fk, fp);
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (fz == Direction.DOWN) {
+            return cfj.getSignal(bpg, fu, fz);
         }
         return 0;
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)RedstoneTorchBlock.LIT)) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)RedstoneTorchBlock.LIT)) {
             return;
         }
-        final double double6 = fk.getX() + 0.5 + (random.nextDouble() - 0.5) * 0.2;
-        final double double7 = fk.getY() + 0.7 + (random.nextDouble() - 0.5) * 0.2;
-        final double double8 = fk.getZ() + 0.5 + (random.nextDouble() - 0.5) * 0.2;
-        bjw.addParticle(DustParticleOptions.REDSTONE, double6, double7, double8, 0.0, 0.0, 0.0);
-    }
-    
-    @Override
-    public int getLightEmission(final BlockState byj) {
-        return byj.<Boolean>getValue((Property<Boolean>)RedstoneTorchBlock.LIT) ? super.getLightEmission(byj) : 0;
+        final double double6 = fu.getX() + 0.5 + (random.nextDouble() - 0.5) * 0.2;
+        final double double7 = fu.getY() + 0.7 + (random.nextDouble() - 0.5) * 0.2;
+        final double double8 = fu.getZ() + 0.5 + (random.nextDouble() - 0.5) * 0.2;
+        bqb.addParticle(this.flameParticle, double6, double7, double8, 0.0, 0.0, 0.0);
     }
     
     @Override
@@ -128,15 +115,15 @@ public class RedstoneTorchBlock extends TorchBlock {
         a.add(RedstoneTorchBlock.LIT);
     }
     
-    private static boolean isToggledTooFrequently(final Level bjw, final BlockPos fk, final boolean boolean3) {
-        final List<Toggle> list4 = RedstoneTorchBlock.RECENT_TOGGLES.computeIfAbsent(bjw, bjg -> Lists.newArrayList());
+    private static boolean isToggledTooFrequently(final Level bqb, final BlockPos fu, final boolean boolean3) {
+        final List<Toggle> list4 = RedstoneTorchBlock.RECENT_TOGGLES.computeIfAbsent(bqb, bpg -> Lists.newArrayList());
         if (boolean3) {
-            list4.add(new Toggle(fk.immutable(), bjw.getGameTime()));
+            list4.add(new Toggle(fu.immutable(), bqb.getGameTime()));
         }
         int integer5 = 0;
         for (int integer6 = 0; integer6 < list4.size(); ++integer6) {
             final Toggle a7 = list4.get(integer6);
-            if (a7.pos.equals(fk) && ++integer5 >= 8) {
+            if (a7.pos.equals(fu) && ++integer5 >= 8) {
                 return true;
             }
         }
@@ -152,8 +139,8 @@ public class RedstoneTorchBlock extends TorchBlock {
         private final BlockPos pos;
         private final long when;
         
-        public Toggle(final BlockPos fk, final long long2) {
-            this.pos = fk;
+        public Toggle(final BlockPos fu, final long long2) {
+            this.pos = fu;
             this.when = long2;
         }
     }
diff --git a/src/net/minecraft/world/level/block/RedstoneWallTorchBlock.java b/src/net/minecraft/world/level/block/RedstoneWallTorchBlock.java
index acf7348..74a7021 100644
--- a/src/net/minecraft/world/level/block/RedstoneWallTorchBlock.java
+++ b/src/net/minecraft/world/level/block/RedstoneWallTorchBlock.java
@@ -1,9 +1,7 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.DustParticleOptions;
 import java.util.Random;
 import net.minecraft.world.level.Level;
 import javax.annotation.Nullable;
@@ -17,6 +15,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 
@@ -26,7 +25,7 @@ public class RedstoneWallTorchBlock extends RedstoneTorchBlock {
     
     protected RedstoneWallTorchBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)RedstoneWallTorchBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneWallTorchBlock.LIT, true));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)RedstoneWallTorchBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)RedstoneWallTorchBlock.LIT, true));
     }
     
     @Override
@@ -35,62 +34,62 @@ public class RedstoneWallTorchBlock extends RedstoneTorchBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return WallTorchBlock.getShape(byj);
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return WallTorchBlock.getShape(cfj);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return Blocks.WALL_TORCH.canSurvive(byj, bjz, fk);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return Blocks.WALL_TORCH.canSurvive(cfj, bqd, fu);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        return Blocks.WALL_TORCH.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        return Blocks.WALL_TORCH.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockState byj3 = Blocks.WALL_TORCH.getStateForPlacement(bcq);
-        return (byj3 == null) ? null : ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Comparable>setValue((Property<Comparable>)RedstoneWallTorchBlock.FACING, (Comparable)byj3.<V>getValue((Property<V>)RedstoneWallTorchBlock.FACING));
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockState cfj3 = Blocks.WALL_TORCH.getStateForPlacement(bin);
+        return (cfj3 == null) ? null : ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Comparable>setValue((Property<Comparable>)RedstoneWallTorchBlock.FACING, (Comparable)cfj3.<V>getValue((Property<V>)RedstoneWallTorchBlock.FACING));
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)RedstoneWallTorchBlock.LIT)) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)RedstoneWallTorchBlock.LIT)) {
             return;
         }
-        final Direction fp6 = byj.<Direction>getValue((Property<Direction>)RedstoneWallTorchBlock.FACING).getOpposite();
+        final Direction fz6 = cfj.<Direction>getValue((Property<Direction>)RedstoneWallTorchBlock.FACING).getOpposite();
         final double double7 = 0.27;
-        final double double8 = fk.getX() + 0.5 + (random.nextDouble() - 0.5) * 0.2 + 0.27 * fp6.getStepX();
-        final double double9 = fk.getY() + 0.7 + (random.nextDouble() - 0.5) * 0.2 + 0.22;
-        final double double10 = fk.getZ() + 0.5 + (random.nextDouble() - 0.5) * 0.2 + 0.27 * fp6.getStepZ();
-        bjw.addParticle(DustParticleOptions.REDSTONE, double8, double9, double10, 0.0, 0.0, 0.0);
+        final double double8 = fu.getX() + 0.5 + (random.nextDouble() - 0.5) * 0.2 + 0.27 * fz6.getStepX();
+        final double double9 = fu.getY() + 0.7 + (random.nextDouble() - 0.5) * 0.2 + 0.22;
+        final double double10 = fu.getZ() + 0.5 + (random.nextDouble() - 0.5) * 0.2 + 0.27 * fz6.getStepZ();
+        bqb.addParticle(this.flameParticle, double8, double9, double10, 0.0, 0.0, 0.0);
     }
     
     @Override
-    protected boolean hasNeighborSignal(final Level bjw, final BlockPos fk, final BlockState byj) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)RedstoneWallTorchBlock.FACING).getOpposite();
-        return bjw.hasSignal(fk.relative(fp5), fp5);
+    protected boolean hasNeighborSignal(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)RedstoneWallTorchBlock.FACING).getOpposite();
+        return bqb.hasSignal(fu.relative(fz5), fz5);
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (byj.<Boolean>getValue((Property<Boolean>)RedstoneWallTorchBlock.LIT) && byj.<Comparable>getValue((Property<Comparable>)RedstoneWallTorchBlock.FACING) != fp) {
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)RedstoneWallTorchBlock.LIT) && cfj.<Comparable>getValue((Property<Comparable>)RedstoneWallTorchBlock.FACING) != fz) {
             return 15;
         }
         return 0;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return Blocks.WALL_TORCH.rotate(byj, btu);
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return Blocks.WALL_TORCH.rotate(cfj, cap);
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return Blocks.WALL_TORCH.mirror(byj, bsu);
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return Blocks.WALL_TORCH.mirror(cfj, bzj);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/RepeaterBlock.java b/src/net/minecraft/world/level/block/RepeaterBlock.java
index bf6159d..6904cb6 100644
--- a/src/net/minecraft/world/level/block/RepeaterBlock.java
+++ b/src/net/minecraft/world/level/block/RepeaterBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.core.particles.ParticleOptions;
@@ -18,6 +18,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
@@ -27,64 +28,64 @@ public class RepeaterBlock extends DiodeBlock {
     
     protected RepeaterBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)RepeaterBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)RepeaterBlock.DELAY, 1)).setValue((Property<Comparable>)RepeaterBlock.LOCKED, false)).<Comparable, Boolean>setValue((Property<Comparable>)RepeaterBlock.POWERED, false));
+        this.registerDefaultState((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)RepeaterBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)RepeaterBlock.DELAY, 1)).setValue((Property<Comparable>)RepeaterBlock.LOCKED, false)).<Comparable, Boolean>setValue((Property<Comparable>)RepeaterBlock.POWERED, false));
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (!ayj.abilities.mayBuild) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (!bec.abilities.mayBuild) {
             return InteractionResult.PASS;
         }
-        bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)RepeaterBlock.DELAY), 3);
-        return InteractionResult.SUCCESS;
+        bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)RepeaterBlock.DELAY), 3);
+        return InteractionResult.sidedSuccess(bqb.isClientSide);
     }
     
     @Override
-    protected int getDelay(final BlockState byj) {
-        return byj.<Integer>getValue((Property<Integer>)RepeaterBlock.DELAY) * 2;
+    protected int getDelay(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)RepeaterBlock.DELAY) * 2;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockState byj3 = super.getStateForPlacement(bcq);
-        return ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Boolean>setValue((Property<Comparable>)RepeaterBlock.LOCKED, this.isLocked(bcq.getLevel(), bcq.getClickedPos(), byj3));
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockState cfj3 = super.getStateForPlacement(bin);
+        return ((StateHolder<O, BlockState>)cfj3).<Comparable, Boolean>setValue((Property<Comparable>)RepeaterBlock.LOCKED, this.isLocked(bin.getLevel(), bin.getClickedPos(), cfj3));
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!bjx.isClientSide() && fp.getAxis() != byj1.<Direction>getValue((Property<Direction>)RepeaterBlock.FACING).getAxis()) {
-            return ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)RepeaterBlock.LOCKED, this.isLocked(bjx, fk5, byj1));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!bqc.isClientSide() && fz.getAxis() != cfj1.<Direction>getValue((Property<Direction>)RepeaterBlock.FACING).getAxis()) {
+            return ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)RepeaterBlock.LOCKED, this.isLocked(bqc, fu5, cfj1));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean isLocked(final LevelReader bjz, final BlockPos fk, final BlockState byj) {
-        return this.getAlternateSignal(bjz, fk, byj) > 0;
+    public boolean isLocked(final LevelReader bqd, final BlockPos fu, final BlockState cfj) {
+        return this.getAlternateSignal(bqd, fu, cfj) > 0;
     }
     
     @Override
-    protected boolean isAlternateInput(final BlockState byj) {
-        return DiodeBlock.isDiode(byj);
+    protected boolean isAlternateInput(final BlockState cfj) {
+        return DiodeBlock.isDiode(cfj);
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)RepeaterBlock.POWERED)) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)RepeaterBlock.POWERED)) {
             return;
         }
-        final Direction fp6 = byj.<Direction>getValue((Property<Direction>)RepeaterBlock.FACING);
-        final double double7 = fk.getX() + 0.5f + (random.nextFloat() - 0.5f) * 0.2;
-        final double double8 = fk.getY() + 0.4f + (random.nextFloat() - 0.5f) * 0.2;
-        final double double9 = fk.getZ() + 0.5f + (random.nextFloat() - 0.5f) * 0.2;
+        final Direction fz6 = cfj.<Direction>getValue((Property<Direction>)RepeaterBlock.FACING);
+        final double double7 = fu.getX() + 0.5 + (random.nextDouble() - 0.5) * 0.2;
+        final double double8 = fu.getY() + 0.4 + (random.nextDouble() - 0.5) * 0.2;
+        final double double9 = fu.getZ() + 0.5 + (random.nextDouble() - 0.5) * 0.2;
         float float13 = -5.0f;
         if (random.nextBoolean()) {
-            float13 = (float)(byj.<Integer>getValue((Property<Integer>)RepeaterBlock.DELAY) * 2 - 1);
+            float13 = (float)(cfj.<Integer>getValue((Property<Integer>)RepeaterBlock.DELAY) * 2 - 1);
         }
         float13 /= 16.0f;
-        final double double10 = float13 * fp6.getStepX();
-        final double double11 = float13 * fp6.getStepZ();
-        bjw.addParticle(DustParticleOptions.REDSTONE, double7 + double10, double8, double9 + double11, 0.0, 0.0, 0.0);
+        final double double10 = float13 * fz6.getStepX();
+        final double double11 = float13 * fz6.getStepZ();
+        bqb.addParticle(DustParticleOptions.REDSTONE, double7 + double10, double8, double9 + double11, 0.0, 0.0, 0.0);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/net/minecraft/world/level/block/RespawnAnchorBlock.java
new file mode 100644
index 0000000..2ad5442
--- /dev/null
+++ b/src/net/minecraft/world/level/block/RespawnAnchorBlock.java
@@ -0,0 +1,191 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import java.util.Iterator;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.ParticleTypes;
+import java.util.Random;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.level.DefaultExplosionDamageCalculator;
+import java.util.Optional;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.ExplosionDamageCalculator;
+import java.util.function.Function;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.FluidTags;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.properties.IntegerProperty;
+
+public class RespawnAnchorBlock extends Block {
+    public static final IntegerProperty CHARGE;
+    
+    public RespawnAnchorBlock(final Properties c) {
+        super(c);
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)RespawnAnchorBlock.CHARGE, 0));
+    }
+    
+    @Override
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final ItemStack bki8 = bec.getItemInHand(anf);
+        if (anf == InteractionHand.MAIN_HAND && !isRespawnFuel(bki8) && isRespawnFuel(bec.getItemInHand(InteractionHand.OFF_HAND))) {
+            return InteractionResult.PASS;
+        }
+        if (isRespawnFuel(bki8) && canBeCharged(cfj)) {
+            charge(bqb, fu, cfj);
+            if (!bec.abilities.instabuild) {
+                bki8.shrink(1);
+            }
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
+        }
+        if (cfj.<Integer>getValue((Property<Integer>)RespawnAnchorBlock.CHARGE) == 0) {
+            return InteractionResult.PASS;
+        }
+        if (canSetSpawn(bqb)) {
+            if (!bqb.isClientSide) {
+                final ServerPlayer ze9 = (ServerPlayer)bec;
+                if (ze9.getRespawnDimension() != bqb.dimension() || !ze9.getRespawnPosition().equals(fu)) {
+                    ze9.setRespawnPosition(bqb.dimension(), fu, false, true);
+                    bqb.playSound(null, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, SoundEvents.RESPAWN_ANCHOR_SET_SPAWN, SoundSource.BLOCKS, 1.0f, 1.0f);
+                    return InteractionResult.SUCCESS;
+                }
+            }
+            return InteractionResult.CONSUME;
+        }
+        if (!bqb.isClientSide) {
+            this.explode(cfj, bqb, fu);
+        }
+        return InteractionResult.sidedSuccess(bqb.isClientSide);
+    }
+    
+    private static boolean isRespawnFuel(final ItemStack bki) {
+        return bki.getItem() == Items.GLOWSTONE;
+    }
+    
+    private static boolean canBeCharged(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)RespawnAnchorBlock.CHARGE) < 4;
+    }
+    
+    private static boolean isWaterThatWouldFlow(final BlockPos fu, final Level bqb) {
+        final FluidState cxa3 = bqb.getFluidState(fu);
+        if (!cxa3.is(FluidTags.WATER)) {
+            return false;
+        }
+        if (cxa3.isSource()) {
+            return true;
+        }
+        final float float4 = (float)cxa3.getAmount();
+        if (float4 < 2.0f) {
+            return false;
+        }
+        final FluidState cxa4 = bqb.getFluidState(fu.below());
+        return !cxa4.is(FluidTags.WATER);
+    }
+    
+    private void explode(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        bqb.removeBlock(fu, false);
+        final boolean boolean5 = Direction.Plane.HORIZONTAL.stream().map(fu::relative).anyMatch(fu -> isWaterThatWouldFlow(fu, bqb));
+        final boolean boolean6 = boolean5 || bqb.getFluidState(fu.above()).is(FluidTags.WATER);
+        final ExplosionDamageCalculator bpu7 = new ExplosionDamageCalculator() {
+            @Override
+            public Optional<Float> getBlockExplosionResistance(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final FluidState cxa) {
+                if (fu.equals(fu) && boolean6) {
+                    return Optional.<Float>of(Blocks.WATER.getExplosionResistance());
+                }
+                return DefaultExplosionDamageCalculator.INSTANCE.getBlockExplosionResistance(bpt, bpg, fu, cfj, cxa);
+            }
+            
+            @Override
+            public boolean shouldBlockExplode(final Explosion bpt, final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final float float5) {
+                return DefaultExplosionDamageCalculator.INSTANCE.shouldBlockExplode(bpt, bpg, fu, cfj, float5);
+            }
+        };
+        bqb.explode(null, DamageSource.badRespawnPointExplosion(), bpu7, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, 5.0f, true, Explosion.BlockInteraction.DESTROY);
+    }
+    
+    public static boolean canSetSpawn(final Level bqb) {
+        return bqb.dimensionType().respawnAnchorWorks();
+    }
+    
+    public static void charge(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)RespawnAnchorBlock.CHARGE, cfj.<Integer>getValue((Property<Integer>)RespawnAnchorBlock.CHARGE) + 1), 3);
+        bqb.playSound(null, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, SoundEvents.RESPAWN_ANCHOR_CHARGE, SoundSource.BLOCKS, 1.0f, 1.0f);
+    }
+    
+    @Override
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (cfj.<Integer>getValue((Property<Integer>)RespawnAnchorBlock.CHARGE) == 0) {
+            return;
+        }
+        if (random.nextInt(100) == 0) {
+            bqb.playSound(null, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, SoundEvents.RESPAWN_ANCHOR_AMBIENT, SoundSource.BLOCKS, 1.0f, 1.0f);
+        }
+        final double double6 = fu.getX() + 0.5 + (0.5 - random.nextDouble());
+        final double double7 = fu.getY() + 1.0;
+        final double double8 = fu.getZ() + 0.5 + (0.5 - random.nextDouble());
+        final double double9 = random.nextFloat() * 0.04;
+        bqb.addParticle(ParticleTypes.REVERSE_PORTAL, double6, double7, double8, 0.0, double9, 0.0);
+    }
+    
+    @Override
+    protected void createBlockStateDefinition(final StateDefinition.Builder<Block, BlockState> a) {
+        a.add(RespawnAnchorBlock.CHARGE);
+    }
+    
+    @Override
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
+        return true;
+    }
+    
+    public static int getScaledChargeLevel(final BlockState cfj, final int integer) {
+        return Mth.floor((cfj.<Integer>getValue((Property<Integer>)RespawnAnchorBlock.CHARGE) - 0) / 4.0f * integer);
+    }
+    
+    @Override
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return getScaledChargeLevel(cfj, 15);
+    }
+    
+    public static Optional<Vec3> findStandUpPosition(final EntityType<?> aoq, final LevelReader bqd, final BlockPos fu) {
+        for (final BlockPos fu2 : BlockPos.betweenClosed(fu.offset(-1, -1, -1), fu.offset(1, 1, 1))) {
+            final Optional<Vec3> optional6 = BedBlock.getStandingLocationAtOrBelow(aoq, bqd, fu2);
+            if (optional6.isPresent()) {
+                return optional6;
+            }
+        }
+        return Optional.<Vec3>empty();
+    }
+    
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        return false;
+    }
+    
+    static {
+        CHARGE = BlockStateProperties.RESPAWN_ANCHOR_CHARGES;
+    }
+}
diff --git a/src/net/minecraft/world/level/block/RootsBlock.java b/src/net/minecraft/world/level/block/RootsBlock.java
new file mode 100644
index 0000000..3d2c78b
--- /dev/null
+++ b/src/net/minecraft/world/level/block/RootsBlock.java
@@ -0,0 +1,37 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public class RootsBlock extends BushBlock {
+    protected static final VoxelShape SHAPE;
+    
+    protected RootsBlock(final Properties c) {
+        super(c);
+    }
+    
+    @Override
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return RootsBlock.SHAPE;
+    }
+    
+    @Override
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.is(BlockTags.NYLIUM) || cfj.is(Blocks.SOUL_SOIL) || super.mayPlaceOn(cfj, bpg, fu);
+    }
+    
+    @Override
+    public OffsetType getOffsetType() {
+        return OffsetType.XZ;
+    }
+    
+    static {
+        SHAPE = Block.box(2.0, 0.0, 2.0, 14.0, 13.0, 14.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/RotatedPillarBlock.java b/src/net/minecraft/world/level/block/RotatedPillarBlock.java
index f4ef4ef..81a062c 100644
--- a/src/net/minecraft/world/level/block/RotatedPillarBlock.java
+++ b/src/net/minecraft/world/level/block/RotatedPillarBlock.java
@@ -1,11 +1,12 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 
@@ -14,29 +15,29 @@ public class RotatedPillarBlock extends Block {
     
     public RotatedPillarBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, Direction.Axis.Y));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.defaultBlockState()).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, Direction.Axis.Y));
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        switch (btu) {
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        switch (cap) {
             case COUNTERCLOCKWISE_90:
             case CLOCKWISE_90: {
-                switch (byj.<Direction.Axis>getValue(RotatedPillarBlock.AXIS)) {
+                switch (cfj.<Direction.Axis>getValue(RotatedPillarBlock.AXIS)) {
                     case X: {
-                        return ((AbstractStateHolder<O, BlockState>)byj).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, Direction.Axis.Z);
+                        return ((StateHolder<O, BlockState>)cfj).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, Direction.Axis.Z);
                     }
                     case Z: {
-                        return ((AbstractStateHolder<O, BlockState>)byj).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, Direction.Axis.X);
+                        return ((StateHolder<O, BlockState>)cfj).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, Direction.Axis.X);
                     }
                     default: {
-                        return byj;
+                        return cfj;
                     }
                 }
                 break;
             }
             default: {
-                return byj;
+                return cfj;
             }
         }
     }
@@ -47,8 +48,8 @@ public class RotatedPillarBlock extends Block {
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, bcq.getClickedFace().getAxis());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, bin.getClickedFace().getAxis());
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/Rotation.java b/src/net/minecraft/world/level/block/Rotation.java
index c48f573..2c24ee1 100644
--- a/src/net/minecraft/world/level/block/Rotation.java
+++ b/src/net/minecraft/world/level/block/Rotation.java
@@ -3,18 +3,26 @@ package net.minecraft.world.level.block;
 import java.util.Collections;
 import com.google.common.collect.Lists;
 import java.util.List;
+import net.minecraft.Util;
 import java.util.Random;
 import net.minecraft.core.Direction;
+import com.mojang.math.OctahedralGroup;
 
 public enum Rotation {
-    NONE, 
-    CLOCKWISE_90, 
-    CLOCKWISE_180, 
-    COUNTERCLOCKWISE_90;
+    NONE(OctahedralGroup.IDENTITY), 
+    CLOCKWISE_90(OctahedralGroup.ROT_90_Y_NEG), 
+    CLOCKWISE_180(OctahedralGroup.ROT_180_FACE_XZ), 
+    COUNTERCLOCKWISE_90(OctahedralGroup.ROT_90_Y_POS);
     
-    public Rotation getRotated(final Rotation btu) {
+    private final OctahedralGroup rotation;
+    
+    private Rotation(final OctahedralGroup c) {
+        this.rotation = c;
+    }
+    
+    public Rotation getRotated(final Rotation cap) {
         Label_0148: {
-            switch (btu) {
+            switch (cap) {
                 case CLOCKWISE_180: {
                     switch (this) {
                         case NONE: {
@@ -80,22 +88,26 @@ public enum Rotation {
         return this;
     }
     
-    public Direction rotate(final Direction fp) {
-        if (fp.getAxis() == Direction.Axis.Y) {
-            return fp;
+    public OctahedralGroup rotation() {
+        return this.rotation;
+    }
+    
+    public Direction rotate(final Direction fz) {
+        if (fz.getAxis() == Direction.Axis.Y) {
+            return fz;
         }
         switch (this) {
             case CLOCKWISE_180: {
-                return fp.getOpposite();
+                return fz.getOpposite();
             }
             case COUNTERCLOCKWISE_90: {
-                return fp.getCounterClockWise();
+                return fz.getCounterClockWise();
             }
             case CLOCKWISE_90: {
-                return fp.getClockWise();
+                return fz.getClockWise();
             }
             default: {
-                return fp;
+                return fz;
             }
         }
     }
@@ -118,8 +130,7 @@ public enum Rotation {
     }
     
     public static Rotation getRandom(final Random random) {
-        final Rotation[] arr2 = values();
-        return arr2[random.nextInt(arr2.length)];
+        return Util.<Rotation>getRandom(values(), random);
     }
     
     public static List<Rotation> getShuffled(final Random random) {
diff --git a/src/net/minecraft/world/level/block/SandBlock.java b/src/net/minecraft/world/level/block/SandBlock.java
index 14cfb1b..1fb35e6 100644
--- a/src/net/minecraft/world/level/block/SandBlock.java
+++ b/src/net/minecraft/world/level/block/SandBlock.java
@@ -1,6 +1,9 @@
 package net.minecraft.world.level.block;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class SandBlock extends FallingBlock {
     private final int dustColor;
@@ -11,7 +14,7 @@ public class SandBlock extends FallingBlock {
     }
     
     @Override
-    public int getDustColor(final BlockState byj) {
+    public int getDustColor(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return this.dustColor;
     }
 }
diff --git a/src/net/minecraft/world/level/block/SaplingBlock.java b/src/net/minecraft/world/level/block/SaplingBlock.java
index 6d8a187..a83e2aa 100644
--- a/src/net/minecraft/world/level/block/SaplingBlock.java
+++ b/src/net/minecraft/world/level/block/SaplingBlock.java
@@ -1,10 +1,9 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelAccessor;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.phys.shapes.CollisionContext;
@@ -12,6 +11,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.grower.AbstractTreeGrower;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
@@ -21,47 +21,46 @@ public class SaplingBlock extends BushBlock implements BonemealableBlock {
     protected static final VoxelShape SHAPE;
     private final AbstractTreeGrower treeGrower;
     
-    protected SaplingBlock(final AbstractTreeGrower bxs, final Properties c) {
+    protected SaplingBlock(final AbstractTreeGrower ces, final Properties c) {
         super(c);
-        this.treeGrower = bxs;
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)SaplingBlock.STAGE, 0));
+        this.treeGrower = ces;
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)SaplingBlock.STAGE, 0));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return SaplingBlock.SHAPE;
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        super.tick(byj, xd, fk, random);
-        if (xd.getMaxLocalRawBrightness(fk.above()) >= 9 && random.nextInt(7) == 0) {
-            this.advanceTree(xd, fk, byj, random);
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (zd.getMaxLocalRawBrightness(fu.above()) >= 9 && random.nextInt(7) == 0) {
+            this.advanceTree(zd, fu, cfj, random);
         }
     }
     
-    public void advanceTree(final ServerLevel xd, final BlockPos fk, final BlockState byj, final Random random) {
-        if (byj.<Integer>getValue((Property<Integer>)SaplingBlock.STAGE) == 0) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)SaplingBlock.STAGE), 4);
+    public void advanceTree(final ServerLevel zd, final BlockPos fu, final BlockState cfj, final Random random) {
+        if (cfj.<Integer>getValue((Property<Integer>)SaplingBlock.STAGE) == 0) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)SaplingBlock.STAGE), 4);
         }
         else {
-            this.treeGrower.growTree(xd, xd.getChunkSource().getGenerator(), fk, byj, random);
+            this.treeGrower.growTree(zd, zd.getChunkSource().getGenerator(), fu, cfj, random);
         }
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
         return true;
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
-        return bjw.random.nextFloat() < 0.45;
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
+        return bqb.random.nextFloat() < 0.45;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        this.advanceTree(xd, fk, byj, random);
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        this.advanceTree(zd, fu, cfj, random);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/ScaffoldingBlock.java b/src/net/minecraft/world/level/block/ScaffoldingBlock.java
index dbb81d5..f09eaeb 100644
--- a/src/net/minecraft/world/level/block/ScaffoldingBlock.java
+++ b/src/net/minecraft/world/level/block/ScaffoldingBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import java.util.Iterator;
 import net.minecraft.core.Vec3i;
@@ -22,6 +22,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -37,7 +38,7 @@ public class ScaffoldingBlock extends Block implements SimpleWaterloggedBlock {
     
     protected ScaffoldingBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ScaffoldingBlock.DISTANCE, 7)).setValue((Property<Comparable>)ScaffoldingBlock.WATERLOGGED, false)).<Comparable, Boolean>setValue((Property<Comparable>)ScaffoldingBlock.BOTTOM, false));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)ScaffoldingBlock.DISTANCE, 7)).setValue((Property<Comparable>)ScaffoldingBlock.WATERLOGGED, false)).<Comparable, Boolean>setValue((Property<Comparable>)ScaffoldingBlock.BOTTOM, false));
     }
     
     @Override
@@ -46,110 +47,110 @@ public class ScaffoldingBlock extends Block implements SimpleWaterloggedBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (!cvq.isHoldingItem(byj.getBlock().asItem())) {
-            return byj.<Boolean>getValue((Property<Boolean>)ScaffoldingBlock.BOTTOM) ? ScaffoldingBlock.UNSTABLE_SHAPE : ScaffoldingBlock.STABLE_SHAPE;
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        if (!der.isHoldingItem(cfj.getBlock().asItem())) {
+            return cfj.<Boolean>getValue((Property<Boolean>)ScaffoldingBlock.BOTTOM) ? ScaffoldingBlock.UNSTABLE_SHAPE : ScaffoldingBlock.STABLE_SHAPE;
         }
         return Shapes.block();
     }
     
     @Override
-    public VoxelShape getInteractionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public VoxelShape getInteractionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return Shapes.block();
     }
     
     @Override
-    public boolean canBeReplaced(final BlockState byj, final BlockPlaceContext bcq) {
-        return bcq.getItemInHand().getItem() == this.asItem();
+    public boolean canBeReplaced(final BlockState cfj, final BlockPlaceContext bin) {
+        return bin.getItemInHand().getItem() == this.asItem();
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockPos fk3 = bcq.getClickedPos();
-        final Level bjw4 = bcq.getLevel();
-        final int integer5 = getDistance(bjw4, fk3);
-        return ((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)ScaffoldingBlock.WATERLOGGED, bjw4.getFluidState(fk3).getType() == Fluids.WATER)).setValue((Property<Comparable>)ScaffoldingBlock.DISTANCE, integer5)).<Comparable, Boolean>setValue((Property<Comparable>)ScaffoldingBlock.BOTTOM, this.isBottom(bjw4, fk3, integer5));
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockPos fu3 = bin.getClickedPos();
+        final Level bqb4 = bin.getLevel();
+        final int integer5 = getDistance(bqb4, fu3);
+        return ((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)ScaffoldingBlock.WATERLOGGED, bqb4.getFluidState(fu3).getType() == Fluids.WATER)).setValue((Property<Comparable>)ScaffoldingBlock.DISTANCE, integer5)).<Comparable, Boolean>setValue((Property<Comparable>)ScaffoldingBlock.BOTTOM, this.isBottom(bqb4, fu3, integer5));
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (!bjw.isClientSide) {
-            bjw.getBlockTicks().scheduleTick(fk, this, 1);
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (!bqb.isClientSide) {
+            bqb.getBlockTicks().scheduleTick(fu, this, 1);
         }
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)ScaffoldingBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)ScaffoldingBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        if (!bjx.isClientSide()) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
+        if (!bqc.isClientSide()) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
         }
-        return byj1;
+        return cfj1;
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        final int integer6 = getDistance(xd, fk);
-        final BlockState byj2 = (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)ScaffoldingBlock.DISTANCE, integer6)).<Comparable, Boolean>setValue((Property<Comparable>)ScaffoldingBlock.BOTTOM, this.isBottom(xd, fk, integer6));
-        if (byj2.<Integer>getValue((Property<Integer>)ScaffoldingBlock.DISTANCE) == 7) {
-            if (byj.<Integer>getValue((Property<Integer>)ScaffoldingBlock.DISTANCE) == 7) {
-                xd.addFreshEntity(new FallingBlockEntity(xd, fk.getX() + 0.5, fk.getY(), fk.getZ() + 0.5, ((AbstractStateHolder<O, BlockState>)byj2).<Comparable, Boolean>setValue((Property<Comparable>)ScaffoldingBlock.WATERLOGGED, false)));
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final int integer6 = getDistance(zd, fu);
+        final BlockState cfj2 = (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)ScaffoldingBlock.DISTANCE, integer6)).<Comparable, Boolean>setValue((Property<Comparable>)ScaffoldingBlock.BOTTOM, this.isBottom(zd, fu, integer6));
+        if (cfj2.<Integer>getValue((Property<Integer>)ScaffoldingBlock.DISTANCE) == 7) {
+            if (cfj.<Integer>getValue((Property<Integer>)ScaffoldingBlock.DISTANCE) == 7) {
+                zd.addFreshEntity(new FallingBlockEntity(zd, fu.getX() + 0.5, fu.getY(), fu.getZ() + 0.5, ((StateHolder<O, BlockState>)cfj2).<Comparable, Boolean>setValue((Property<Comparable>)ScaffoldingBlock.WATERLOGGED, false)));
             }
             else {
-                xd.destroyBlock(fk, true);
+                zd.destroyBlock(fu, true);
             }
         }
-        else if (byj != byj2) {
-            xd.setBlock(fk, byj2, 3);
+        else if (cfj != cfj2) {
+            zd.setBlock(fu, cfj2, 3);
         }
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return getDistance(bjz, fk) < 7;
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return getDistance(bqd, fu) < 7;
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (cvq.isAbove(Shapes.block(), fk, true) && !cvq.isDescending()) {
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        if (der.isAbove(Shapes.block(), fu, true) && !der.isDescending()) {
             return ScaffoldingBlock.STABLE_SHAPE;
         }
-        if (byj.<Integer>getValue((Property<Integer>)ScaffoldingBlock.DISTANCE) != 0 && byj.<Boolean>getValue((Property<Boolean>)ScaffoldingBlock.BOTTOM) && cvq.isAbove(ScaffoldingBlock.BELOW_BLOCK, fk, true)) {
+        if (cfj.<Integer>getValue((Property<Integer>)ScaffoldingBlock.DISTANCE) != 0 && cfj.<Boolean>getValue((Property<Boolean>)ScaffoldingBlock.BOTTOM) && der.isAbove(ScaffoldingBlock.BELOW_BLOCK, fu, true)) {
             return ScaffoldingBlock.UNSTABLE_SHAPE_BOTTOM;
         }
         return Shapes.empty();
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)ScaffoldingBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)ScaffoldingBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
-    private boolean isBottom(final BlockGetter bjg, final BlockPos fk, final int integer) {
-        return integer > 0 && bjg.getBlockState(fk.below()).getBlock() != this;
+    private boolean isBottom(final BlockGetter bpg, final BlockPos fu, final int integer) {
+        return integer > 0 && !bpg.getBlockState(fu.below()).is(this);
     }
     
-    public static int getDistance(final BlockGetter bjg, final BlockPos fk) {
-        final BlockPos.MutableBlockPos a3 = new BlockPos.MutableBlockPos(fk).move(Direction.DOWN);
-        final BlockState byj4 = bjg.getBlockState(a3);
+    public static int getDistance(final BlockGetter bpg, final BlockPos fu) {
+        final BlockPos.MutableBlockPos a3 = fu.mutable().move(Direction.DOWN);
+        final BlockState cfj4 = bpg.getBlockState(a3);
         int integer5 = 7;
-        if (byj4.getBlock() == Blocks.SCAFFOLDING) {
-            integer5 = byj4.<Integer>getValue((Property<Integer>)ScaffoldingBlock.DISTANCE);
+        if (cfj4.is(Blocks.SCAFFOLDING)) {
+            integer5 = cfj4.<Integer>getValue((Property<Integer>)ScaffoldingBlock.DISTANCE);
         }
-        else if (byj4.isFaceSturdy(bjg, a3, Direction.UP)) {
+        else if (cfj4.isFaceSturdy(bpg, a3, Direction.UP)) {
             return 0;
         }
-        for (final Direction fp7 : Direction.Plane.HORIZONTAL) {
-            final BlockState byj5 = bjg.getBlockState(a3.set(fk).move(fp7));
-            if (byj5.getBlock() != Blocks.SCAFFOLDING) {
+        for (final Direction fz7 : Direction.Plane.HORIZONTAL) {
+            final BlockState cfj5 = bpg.getBlockState(a3.setWithOffset(fu, fz7));
+            if (!cfj5.is(Blocks.SCAFFOLDING)) {
                 continue;
             }
-            integer5 = Math.min(integer5, byj5.<Integer>getValue((Property<Integer>)ScaffoldingBlock.DISTANCE) + 1);
+            integer5 = Math.min(integer5, cfj5.<Integer>getValue((Property<Integer>)ScaffoldingBlock.DISTANCE) + 1);
             if (integer5 == 1) {
                 break;
             }
@@ -163,16 +164,16 @@ public class ScaffoldingBlock extends Block implements SimpleWaterloggedBlock {
         DISTANCE = BlockStateProperties.STABILITY_DISTANCE;
         WATERLOGGED = BlockStateProperties.WATERLOGGED;
         BOTTOM = BlockStateProperties.BOTTOM;
-        final VoxelShape cwf1 = Block.box(0.0, 14.0, 0.0, 16.0, 16.0, 16.0);
-        final VoxelShape cwf2 = Block.box(0.0, 0.0, 0.0, 2.0, 16.0, 2.0);
-        final VoxelShape cwf3 = Block.box(14.0, 0.0, 0.0, 16.0, 16.0, 2.0);
-        final VoxelShape cwf4 = Block.box(0.0, 0.0, 14.0, 2.0, 16.0, 16.0);
-        final VoxelShape cwf5 = Block.box(14.0, 0.0, 14.0, 16.0, 16.0, 16.0);
-        STABLE_SHAPE = Shapes.or(cwf1, cwf2, cwf3, cwf4, cwf5);
-        final VoxelShape cwf6 = Block.box(0.0, 0.0, 0.0, 2.0, 2.0, 16.0);
-        final VoxelShape cwf7 = Block.box(14.0, 0.0, 0.0, 16.0, 2.0, 16.0);
-        final VoxelShape cwf8 = Block.box(0.0, 0.0, 14.0, 16.0, 2.0, 16.0);
-        final VoxelShape cwf9 = Block.box(0.0, 0.0, 0.0, 16.0, 2.0, 2.0);
-        UNSTABLE_SHAPE = Shapes.or(ScaffoldingBlock.UNSTABLE_SHAPE_BOTTOM, ScaffoldingBlock.STABLE_SHAPE, cwf7, cwf6, cwf9, cwf8);
+        final VoxelShape dfg1 = Block.box(0.0, 14.0, 0.0, 16.0, 16.0, 16.0);
+        final VoxelShape dfg2 = Block.box(0.0, 0.0, 0.0, 2.0, 16.0, 2.0);
+        final VoxelShape dfg3 = Block.box(14.0, 0.0, 0.0, 16.0, 16.0, 2.0);
+        final VoxelShape dfg4 = Block.box(0.0, 0.0, 14.0, 2.0, 16.0, 16.0);
+        final VoxelShape dfg5 = Block.box(14.0, 0.0, 14.0, 16.0, 16.0, 16.0);
+        STABLE_SHAPE = Shapes.or(dfg1, dfg2, dfg3, dfg4, dfg5);
+        final VoxelShape dfg6 = Block.box(0.0, 0.0, 0.0, 2.0, 2.0, 16.0);
+        final VoxelShape dfg7 = Block.box(14.0, 0.0, 0.0, 16.0, 2.0, 16.0);
+        final VoxelShape dfg8 = Block.box(0.0, 0.0, 14.0, 16.0, 2.0, 16.0);
+        final VoxelShape dfg9 = Block.box(0.0, 0.0, 0.0, 16.0, 2.0, 2.0);
+        UNSTABLE_SHAPE = Shapes.or(ScaffoldingBlock.UNSTABLE_SHAPE_BOTTOM, ScaffoldingBlock.STABLE_SHAPE, dfg7, dfg6, dfg9, dfg8);
     }
 }
diff --git a/src/net/minecraft/world/level/block/SeaPickleBlock.java b/src/net/minecraft/world/level/block/SeaPickleBlock.java
index 457df76..7614c9b 100644
--- a/src/net/minecraft/world/level/block/SeaPickleBlock.java
+++ b/src/net/minecraft/world/level/block/SeaPickleBlock.java
@@ -1,14 +1,15 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.server.level.ServerLevel;
 import java.util.Random;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.Direction;
@@ -16,10 +17,11 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.material.FluidState;
-import net.minecraft.tags.FluidTags;
+import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
@@ -34,60 +36,55 @@ public class SeaPickleBlock extends BushBlock implements BonemealableBlock, Simp
     
     protected SeaPickleBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)SeaPickleBlock.PICKLES, 1)).<Comparable, Boolean>setValue((Property<Comparable>)SeaPickleBlock.WATERLOGGED, true));
-    }
-    
-    @Override
-    public int getLightEmission(final BlockState byj) {
-        return this.isDead(byj) ? 0 : (super.getLightEmission(byj) + 3 * byj.<Integer>getValue((Property<Integer>)SeaPickleBlock.PICKLES));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)SeaPickleBlock.PICKLES, 1)).<Comparable, Boolean>setValue((Property<Comparable>)SeaPickleBlock.WATERLOGGED, true));
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockState byj3 = bcq.getLevel().getBlockState(bcq.getClickedPos());
-        if (byj3.getBlock() == this) {
-            return ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Integer>setValue((Property<Comparable>)SeaPickleBlock.PICKLES, Math.min(4, byj3.<Integer>getValue((Property<Integer>)SeaPickleBlock.PICKLES) + 1));
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockState cfj3 = bin.getLevel().getBlockState(bin.getClickedPos());
+        if (cfj3.is(this)) {
+            return ((StateHolder<O, BlockState>)cfj3).<Comparable, Integer>setValue((Property<Comparable>)SeaPickleBlock.PICKLES, Math.min(4, cfj3.<Integer>getValue((Property<Integer>)SeaPickleBlock.PICKLES) + 1));
         }
-        final FluidState coj4 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        final boolean boolean5 = coj4.is(FluidTags.WATER) && coj4.getAmount() == 8;
-        return ((AbstractStateHolder<O, BlockState>)super.getStateForPlacement(bcq)).<Comparable, Boolean>setValue((Property<Comparable>)SeaPickleBlock.WATERLOGGED, boolean5);
+        final FluidState cxa4 = bin.getLevel().getFluidState(bin.getClickedPos());
+        final boolean boolean5 = cxa4.getType() == Fluids.WATER;
+        return ((StateHolder<O, BlockState>)super.getStateForPlacement(bin)).<Comparable, Boolean>setValue((Property<Comparable>)SeaPickleBlock.WATERLOGGED, boolean5);
     }
     
-    private boolean isDead(final BlockState byj) {
-        return !byj.<Boolean>getValue((Property<Boolean>)SeaPickleBlock.WATERLOGGED);
+    public static boolean isDead(final BlockState cfj) {
+        return !cfj.<Boolean>getValue((Property<Boolean>)SeaPickleBlock.WATERLOGGED);
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return !byj.getCollisionShape(bjg, fk).getFaceShape(Direction.UP).isEmpty();
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return !cfj.getCollisionShape(bpg, fu).getFaceShape(Direction.UP).isEmpty();
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        return this.mayPlaceOn(bjz.getBlockState(fk2), bjz, fk2);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        return this.mayPlaceOn(bqd.getBlockState(fu2), bqd, fu2);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        if (byj1.<Boolean>getValue((Property<Boolean>)SeaPickleBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+        if (cfj1.<Boolean>getValue((Property<Boolean>)SeaPickleBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canBeReplaced(final BlockState byj, final BlockPlaceContext bcq) {
-        return (bcq.getItemInHand().getItem() == this.asItem() && byj.<Integer>getValue((Property<Integer>)SeaPickleBlock.PICKLES) < 4) || super.canBeReplaced(byj, bcq);
+    public boolean canBeReplaced(final BlockState cfj, final BlockPlaceContext bin) {
+        return (bin.getItemInHand().getItem() == this.asItem() && cfj.<Integer>getValue((Property<Integer>)SeaPickleBlock.PICKLES) < 4) || super.canBeReplaced(cfj, bin);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        switch (byj.<Integer>getValue((Property<Integer>)SeaPickleBlock.PICKLES)) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        switch (cfj.<Integer>getValue((Property<Integer>)SeaPickleBlock.PICKLES)) {
             default: {
                 return SeaPickleBlock.ONE_AABB;
             }
@@ -104,11 +101,11 @@ public class SeaPickleBlock extends BushBlock implements BonemealableBlock, Simp
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)SeaPickleBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)SeaPickleBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     @Override
@@ -117,33 +114,33 @@ public class SeaPickleBlock extends BushBlock implements BonemealableBlock, Simp
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
         return true;
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        if (!this.isDead(byj) && xd.getBlockState(fk.below()).is(BlockTags.CORAL_BLOCKS)) {
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        if (!isDead(cfj) && zd.getBlockState(fu.below()).is(BlockTags.CORAL_BLOCKS)) {
             final int integer6 = 5;
             int integer7 = 1;
             final int integer8 = 2;
             int integer9 = 0;
-            final int integer10 = fk.getX() - 2;
+            final int integer10 = fu.getX() - 2;
             int integer11 = 0;
             for (int integer12 = 0; integer12 < 5; ++integer12) {
                 for (int integer13 = 0; integer13 < integer7; ++integer13) {
-                    for (int integer14 = 2 + fk.getY() - 1, integer15 = integer14 - 2; integer15 < integer14; ++integer15) {
-                        final BlockPos fk2 = new BlockPos(integer10 + integer12, integer15, fk.getZ() - integer11 + integer13);
-                        if (fk2 != fk) {
-                            if (random.nextInt(6) == 0 && xd.getBlockState(fk2).getBlock() == Blocks.WATER) {
-                                final BlockState byj2 = xd.getBlockState(fk2.below());
-                                if (byj2.is(BlockTags.CORAL_BLOCKS)) {
-                                    xd.setBlock(fk2, ((AbstractStateHolder<O, BlockState>)Blocks.SEA_PICKLE.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SeaPickleBlock.PICKLES, random.nextInt(4) + 1), 3);
+                    for (int integer14 = 2 + fu.getY() - 1, integer15 = integer14 - 2; integer15 < integer14; ++integer15) {
+                        final BlockPos fu2 = new BlockPos(integer10 + integer12, integer15, fu.getZ() - integer11 + integer13);
+                        if (fu2 != fu) {
+                            if (random.nextInt(6) == 0 && zd.getBlockState(fu2).is(Blocks.WATER)) {
+                                final BlockState cfj2 = zd.getBlockState(fu2.below());
+                                if (cfj2.is(BlockTags.CORAL_BLOCKS)) {
+                                    zd.setBlock(fu2, ((StateHolder<O, BlockState>)Blocks.SEA_PICKLE.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SeaPickleBlock.PICKLES, random.nextInt(4) + 1), 3);
                                 }
                             }
                         }
@@ -159,10 +156,15 @@ public class SeaPickleBlock extends BushBlock implements BonemealableBlock, Simp
                 }
                 ++integer9;
             }
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)SeaPickleBlock.PICKLES, 4), 2);
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)SeaPickleBlock.PICKLES, 4), 2);
         }
     }
     
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        return false;
+    }
+    
     static {
         PICKLES = BlockStateProperties.PICKLES;
         WATERLOGGED = BlockStateProperties.WATERLOGGED;
diff --git a/src/net/minecraft/world/level/block/Seagrass.java b/src/net/minecraft/world/level/block/Seagrass.java
index e746330..71548fb 100644
--- a/src/net/minecraft/world/level/block/Seagrass.java
+++ b/src/net/minecraft/world/level/block/Seagrass.java
@@ -1,7 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
 import net.minecraft.server.level.ServerLevel;
@@ -12,6 +11,8 @@ import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.LevelAccessor;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.core.Direction;
@@ -19,6 +20,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class Seagrass extends BushBlock implements BonemealableBlock, LiquidBlockContainer {
@@ -29,67 +31,67 @@ public class Seagrass extends BushBlock implements BonemealableBlock, LiquidBloc
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return Seagrass.SHAPE;
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.isFaceSturdy(bjg, fk, Direction.UP) && byj.getBlock() != Blocks.MAGMA_BLOCK;
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.isFaceSturdy(bpg, fu, Direction.UP) && !cfj.is(Blocks.MAGMA_BLOCK);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final FluidState coj3 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        if (coj3.is(FluidTags.WATER) && coj3.getAmount() == 8) {
-            return super.getStateForPlacement(bcq);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final FluidState cxa3 = bin.getLevel().getFluidState(bin.getClickedPos());
+        if (cxa3.is(FluidTags.WATER) && cxa3.getAmount() == 8) {
+            return super.getStateForPlacement(bin);
         }
         return null;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        final BlockState byj4 = super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
-        if (!byj4.isAir()) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        final BlockState cfj4 = super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
+        if (!cfj4.isAir()) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        return byj4;
+        return cfj4;
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
         return true;
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
+    public FluidState getFluidState(final BlockState cfj) {
         return Fluids.WATER.getSource(false);
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        final BlockState byj2 = Blocks.TALL_SEAGRASS.defaultBlockState();
-        final BlockState byj3 = ((AbstractStateHolder<O, BlockState>)byj2).<DoubleBlockHalf, DoubleBlockHalf>setValue(TallSeagrass.HALF, DoubleBlockHalf.UPPER);
-        final BlockPos fk2 = fk.above();
-        if (xd.getBlockState(fk2).getBlock() == Blocks.WATER) {
-            xd.setBlock(fk, byj2, 2);
-            xd.setBlock(fk2, byj3, 2);
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        final BlockState cfj2 = Blocks.TALL_SEAGRASS.defaultBlockState();
+        final BlockState cfj3 = ((StateHolder<O, BlockState>)cfj2).<DoubleBlockHalf, DoubleBlockHalf>setValue(TallSeagrass.HALF, DoubleBlockHalf.UPPER);
+        final BlockPos fu2 = fu.above();
+        if (zd.getBlockState(fu2).is(Blocks.WATER)) {
+            zd.setBlock(fu, cfj2, 2);
+            zd.setBlock(fu2, cfj3, 2);
         }
     }
     
     @Override
-    public boolean canPlaceLiquid(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final Fluid coi) {
+    public boolean canPlaceLiquid(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final Fluid cwz) {
         return false;
     }
     
     @Override
-    public boolean placeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final FluidState coj) {
+    public boolean placeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final FluidState cxa) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/ShearableDoublePlantBlock.java b/src/net/minecraft/world/level/block/ShearableDoublePlantBlock.java
deleted file mode 100644
index fc327b5..0000000
--- a/src/net/minecraft/world/level/block/ShearableDoublePlantBlock.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package net.minecraft.world.level.block;
-
-import net.minecraft.world.item.BlockPlaceContext;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
-import net.minecraft.world.level.block.state.properties.EnumProperty;
-
-public class ShearableDoublePlantBlock extends DoublePlantBlock {
-    public static final EnumProperty<DoubleBlockHalf> HALF;
-    
-    public ShearableDoublePlantBlock(final Properties c) {
-        super(c);
-    }
-    
-    @Override
-    public boolean canBeReplaced(final BlockState byj, final BlockPlaceContext bcq) {
-        final boolean boolean4 = super.canBeReplaced(byj, bcq);
-        return (!boolean4 || bcq.getItemInHand().getItem() != this.asItem()) && boolean4;
-    }
-    
-    static {
-        HALF = DoublePlantBlock.HALF;
-    }
-}
diff --git a/src/net/minecraft/world/level/block/ShulkerBoxBlock.java b/src/net/minecraft/world/level/block/ShulkerBoxBlock.java
index b74d552..6cb60a8 100644
--- a/src/net/minecraft/world/level/block/ShulkerBoxBlock.java
+++ b/src/net/minecraft/world/level/block/ShulkerBoxBlock.java
@@ -1,14 +1,16 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import java.util.function.Consumer;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.Container;
+import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.level.material.PushReaction;
+import net.minecraft.network.chat.MutableComponent;
 import java.util.Iterator;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TranslatableComponent;
@@ -28,21 +30,22 @@ import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.item.BlockPlaceContext;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.world.entity.monster.piglin.PiglinAi;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.MenuProvider;
-import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.ShulkerSharedHelper;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import javax.annotation.Nullable;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.resources.ResourceLocation;
@@ -55,59 +58,54 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
     @Nullable
     private final DyeColor color;
     
-    public ShulkerBoxBlock(@Nullable final DyeColor bdj, final Properties c) {
+    public ShulkerBoxBlock(@Nullable final DyeColor bje, final Properties c) {
         super(c);
-        this.color = bdj;
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Direction, Direction>setValue(ShulkerBoxBlock.FACING, Direction.UP));
+        this.color = bje;
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Direction, Direction>setValue(ShulkerBoxBlock.FACING, Direction.UP));
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new ShulkerBoxBlockEntity(this.color);
     }
     
     @Override
-    public boolean isSuffocating(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return true;
-    }
-    
-    @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.ENTITYBLOCK_ANIMATED;
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        if (ayj.isSpectator()) {
-            return InteractionResult.SUCCESS;
+        if (bec.isSpectator()) {
+            return InteractionResult.CONSUME;
         }
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk);
-        if (bwl8 instanceof ShulkerBoxBlockEntity) {
-            final Direction fp9 = byj.<Direction>getValue(ShulkerBoxBlock.FACING);
-            final ShulkerBoxBlockEntity bxg11 = (ShulkerBoxBlockEntity)bwl8;
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu);
+        if (cdl8 instanceof ShulkerBoxBlockEntity) {
+            final ShulkerBoxBlockEntity ceg9 = (ShulkerBoxBlockEntity)cdl8;
             boolean boolean10;
-            if (bxg11.getAnimationStatus() == ShulkerBoxBlockEntity.AnimationStatus.CLOSED) {
-                final AABB cvf12 = Shapes.block().bounds().expandTowards(0.5f * fp9.getStepX(), 0.5f * fp9.getStepY(), 0.5f * fp9.getStepZ()).contract(fp9.getStepX(), fp9.getStepY(), fp9.getStepZ());
-                boolean10 = bjw.noCollision(cvf12.move(fk.relative(fp9)));
+            if (ceg9.getAnimationStatus() == ShulkerBoxBlockEntity.AnimationStatus.CLOSED) {
+                final Direction fz11 = cfj.<Direction>getValue(ShulkerBoxBlock.FACING);
+                boolean10 = bqb.noCollision(ShulkerSharedHelper.openBoundingBox(fu, fz11));
             }
             else {
                 boolean10 = true;
             }
             if (boolean10) {
-                ayj.openMenu(bxg11);
-                ayj.awardStat(Stats.OPEN_SHULKER_BOX);
+                bec.openMenu(ceg9);
+                bec.awardStat(Stats.OPEN_SHULKER_BOX);
+                PiglinAi.angerNearbyPiglins(bec, true);
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.CONSUME;
         }
         return InteractionResult.PASS;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Direction, Direction>setValue(ShulkerBoxBlock.FACING, bcq.getClickedFace());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Direction, Direction>setValue(ShulkerBoxBlock.FACING, bin.getClickedFace());
     }
     
     @Override
@@ -116,92 +114,92 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
     }
     
     @Override
-    public void playerWillDestroy(final Level bjw, final BlockPos fk, final BlockState byj, final Player ayj) {
-        final BlockEntity bwl6 = bjw.getBlockEntity(fk);
-        if (bwl6 instanceof ShulkerBoxBlockEntity) {
-            final ShulkerBoxBlockEntity bxg7 = (ShulkerBoxBlockEntity)bwl6;
-            if (!bjw.isClientSide && ayj.isCreative() && !bxg7.isEmpty()) {
-                final ItemStack ben8 = getColoredItemStack(this.getColor());
-                final CompoundTag jt9 = bxg7.saveToTag(new CompoundTag());
-                if (!jt9.isEmpty()) {
-                    ben8.addTagElement("BlockEntityTag", jt9);
+    public void playerWillDestroy(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        final BlockEntity cdl6 = bqb.getBlockEntity(fu);
+        if (cdl6 instanceof ShulkerBoxBlockEntity) {
+            final ShulkerBoxBlockEntity ceg7 = (ShulkerBoxBlockEntity)cdl6;
+            if (!bqb.isClientSide && bec.isCreative() && !ceg7.isEmpty()) {
+                final ItemStack bki8 = getColoredItemStack(this.getColor());
+                final CompoundTag le9 = ceg7.saveToTag(new CompoundTag());
+                if (!le9.isEmpty()) {
+                    bki8.addTagElement("BlockEntityTag", le9);
                 }
-                if (bxg7.hasCustomName()) {
-                    ben8.setHoverName(bxg7.getCustomName());
+                if (ceg7.hasCustomName()) {
+                    bki8.setHoverName(ceg7.getCustomName());
                 }
-                final ItemEntity awb10 = new ItemEntity(bjw, fk.getX(), fk.getY(), fk.getZ(), ben8);
-                awb10.setDefaultPickUpDelay();
-                bjw.addFreshEntity(awb10);
+                final ItemEntity bbg10 = new ItemEntity(bqb, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, bki8);
+                bbg10.setDefaultPickUpDelay();
+                bqb.addFreshEntity(bbg10);
             }
             else {
-                bxg7.unpackLootTable(ayj);
+                ceg7.unpackLootTable(bec);
             }
         }
-        super.playerWillDestroy(bjw, fk, byj, ayj);
+        super.playerWillDestroy(bqb, fu, cfj, bec);
     }
     
     @Override
-    public List<ItemStack> getDrops(final BlockState byj, LootContext.Builder a) {
-        final BlockEntity bwl4 = a.<BlockEntity>getOptionalParameter(LootContextParams.BLOCK_ENTITY);
-        if (bwl4 instanceof ShulkerBoxBlockEntity) {
-            final ShulkerBoxBlockEntity bxg5 = (ShulkerBoxBlockEntity)bwl4;
+    public List<ItemStack> getDrops(final BlockState cfj, LootContext.Builder a) {
+        final BlockEntity cdl4 = a.<BlockEntity>getOptionalParameter(LootContextParams.BLOCK_ENTITY);
+        if (cdl4 instanceof ShulkerBoxBlockEntity) {
+            final ShulkerBoxBlockEntity ceg5 = (ShulkerBoxBlockEntity)cdl4;
             int integer4;
             final ShulkerBoxBlockEntity shulkerBoxBlockEntity;
-            a = a.withDynamicDrop(ShulkerBoxBlock.CONTENTS, (crx, consumer) -> {
+            a = a.withDynamicDrop(ShulkerBoxBlock.CONTENTS, (dat, consumer) -> {
                 for (integer4 = 0; integer4 < shulkerBoxBlockEntity.getContainerSize(); ++integer4) {
                     consumer.accept(shulkerBoxBlockEntity.getItem(integer4));
                 }
                 return;
             });
         }
-        return super.getDrops(byj, a);
+        return super.getDrops(cfj, a);
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        if (ben.hasCustomHoverName()) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof ShulkerBoxBlockEntity) {
-                ((ShulkerBoxBlockEntity)bwl7).setCustomName(ben.getHoverName());
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        if (bki.hasCustomHoverName()) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof ShulkerBoxBlockEntity) {
+                ((ShulkerBoxBlockEntity)cdl7).setCustomName(bki.getHoverName());
             }
         }
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof ShulkerBoxBlockEntity) {
-            bjw.updateNeighbourForOutputSignal(fk, byj1.getBlock());
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof ShulkerBoxBlockEntity) {
+            bqb.updateNeighbourForOutputSignal(fu, cfj1.getBlock());
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public void appendHoverText(final ItemStack ben, @Nullable final BlockGetter bjg, final List<Component> list, final TooltipFlag bfw) {
-        super.appendHoverText(ben, bjg, list, bfw);
-        final CompoundTag jt6 = ben.getTagElement("BlockEntityTag");
-        if (jt6 != null) {
-            if (jt6.contains("LootTable", 8)) {
+    public void appendHoverText(final ItemStack bki, @Nullable final BlockGetter bpg, final List<Component> list, final TooltipFlag bls) {
+        super.appendHoverText(bki, bpg, list, bls);
+        final CompoundTag le6 = bki.getTagElement("BlockEntityTag");
+        if (le6 != null) {
+            if (le6.contains("LootTable", 8)) {
                 list.add(new TextComponent("???????"));
             }
-            if (jt6.contains("Items", 9)) {
-                final NonNullList<ItemStack> fy7 = NonNullList.<ItemStack>withSize(27, ItemStack.EMPTY);
-                ContainerHelper.loadAllItems(jt6, fy7);
+            if (le6.contains("Items", 9)) {
+                final NonNullList<ItemStack> gi7 = NonNullList.<ItemStack>withSize(27, ItemStack.EMPTY);
+                ContainerHelper.loadAllItems(le6, gi7);
                 int integer8 = 0;
                 int integer9 = 0;
-                for (final ItemStack ben2 : fy7) {
-                    if (!ben2.isEmpty()) {
+                for (final ItemStack bki2 : gi7) {
+                    if (!bki2.isEmpty()) {
                         ++integer9;
                         if (integer8 > 4) {
                             continue;
                         }
                         ++integer8;
-                        final Component lf12 = ben2.getHoverName().deepCopy();
-                        lf12.append(" x").append(String.valueOf(ben2.getCount()));
-                        list.add(lf12);
+                        final MutableComponent mx12 = bki2.getHoverName().copy();
+                        mx12.append(" x").append(String.valueOf(bki2.getCount()));
+                        list.add(mx12);
                     }
                 }
                 if (integer9 - integer8 > 0) {
@@ -212,58 +210,58 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.DESTROY;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final BlockEntity bwl6 = bjg.getBlockEntity(fk);
-        if (bwl6 instanceof ShulkerBoxBlockEntity) {
-            return Shapes.create(((ShulkerBoxBlockEntity)bwl6).getBoundingBox(byj));
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final BlockEntity cdl6 = bpg.getBlockEntity(fu);
+        if (cdl6 instanceof ShulkerBoxBlockEntity) {
+            return Shapes.create(((ShulkerBoxBlockEntity)cdl6).getBoundingBox(cfj));
         }
         return Shapes.block();
     }
     
     @Override
-    public boolean hasAnalogOutputSignal(final BlockState byj) {
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getAnalogOutputSignal(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return AbstractContainerMenu.getRedstoneSignalFromContainer((Container)bjw.getBlockEntity(fk));
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return AbstractContainerMenu.getRedstoneSignalFromContainer((Container)bqb.getBlockEntity(fu));
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
-        final ItemStack ben5 = super.getCloneItemStack(bjg, fk, byj);
-        final ShulkerBoxBlockEntity bxg6 = (ShulkerBoxBlockEntity)bjg.getBlockEntity(fk);
-        final CompoundTag jt7 = bxg6.saveToTag(new CompoundTag());
-        if (!jt7.isEmpty()) {
-            ben5.addTagElement("BlockEntityTag", jt7);
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        final ItemStack bki5 = super.getCloneItemStack(bpg, fu, cfj);
+        final ShulkerBoxBlockEntity ceg6 = (ShulkerBoxBlockEntity)bpg.getBlockEntity(fu);
+        final CompoundTag le7 = ceg6.saveToTag(new CompoundTag());
+        if (!le7.isEmpty()) {
+            bki5.addTagElement("BlockEntityTag", le7);
         }
-        return ben5;
+        return bki5;
     }
     
     @Nullable
-    public static DyeColor getColorFromItem(final Item bei) {
-        return getColorFromBlock(Block.byItem(bei));
+    public static DyeColor getColorFromItem(final Item bke) {
+        return getColorFromBlock(Block.byItem(bke));
     }
     
     @Nullable
-    public static DyeColor getColorFromBlock(final Block bph) {
-        if (bph instanceof ShulkerBoxBlock) {
-            return ((ShulkerBoxBlock)bph).getColor();
+    public static DyeColor getColorFromBlock(final Block bvr) {
+        if (bvr instanceof ShulkerBoxBlock) {
+            return ((ShulkerBoxBlock)bvr).getColor();
         }
         return null;
     }
     
-    public static Block getBlockByColor(@Nullable final DyeColor bdj) {
-        if (bdj == null) {
+    public static Block getBlockByColor(@Nullable final DyeColor bje) {
+        if (bje == null) {
             return Blocks.SHULKER_BOX;
         }
-        switch (bdj) {
+        switch (bje) {
             case WHITE: {
                 return Blocks.WHITE_SHULKER_BOX;
             }
@@ -320,18 +318,18 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
         return this.color;
     }
     
-    public static ItemStack getColoredItemStack(@Nullable final DyeColor bdj) {
-        return new ItemStack(getBlockByColor(bdj));
+    public static ItemStack getColoredItemStack(@Nullable final DyeColor bje) {
+        return new ItemStack(getBlockByColor(bje));
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Direction, Direction>setValue(ShulkerBoxBlock.FACING, btu.rotate(byj.<Direction>getValue(ShulkerBoxBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Direction, Direction>setValue(ShulkerBoxBlock.FACING, cap.rotate(cfj.<Direction>getValue(ShulkerBoxBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue(ShulkerBoxBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue(ShulkerBoxBlock.FACING)));
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/SignBlock.java b/src/net/minecraft/world/level/block/SignBlock.java
index 4151a18..d1a7da0 100644
--- a/src/net/minecraft/world/level/block/SignBlock.java
+++ b/src/net/minecraft/world/level/block/SignBlock.java
@@ -20,6 +20,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.WoodType;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
@@ -29,21 +30,21 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
     protected static final VoxelShape SHAPE;
     private final WoodType type;
     
-    protected SignBlock(final Properties c, final WoodType bzs) {
+    protected SignBlock(final Properties c, final WoodType cgs) {
         super(c);
-        this.type = bzs;
+        this.type = cgs;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)SignBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)SignBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return SignBlock.SHAPE;
     }
     
@@ -53,37 +54,37 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new SignBlockEntity();
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final ItemStack ben8 = ayj.getItemInHand(ajk);
-        final boolean boolean9 = ben8.getItem() instanceof DyeItem && ayj.abilities.mayBuild;
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final ItemStack bki8 = bec.getItemInHand(anf);
+        final boolean boolean9 = bki8.getItem() instanceof DyeItem && bec.abilities.mayBuild;
+        if (bqb.isClientSide) {
             return boolean9 ? InteractionResult.SUCCESS : InteractionResult.CONSUME;
         }
-        final BlockEntity bwl10 = bjw.getBlockEntity(fk);
-        if (bwl10 instanceof SignBlockEntity) {
-            final SignBlockEntity bxh11 = (SignBlockEntity)bwl10;
+        final BlockEntity cdl10 = bqb.getBlockEntity(fu);
+        if (cdl10 instanceof SignBlockEntity) {
+            final SignBlockEntity ceh11 = (SignBlockEntity)cdl10;
             if (boolean9) {
-                final boolean boolean10 = bxh11.setColor(((DyeItem)ben8.getItem()).getDyeColor());
-                if (boolean10 && !ayj.isCreative()) {
-                    ben8.shrink(1);
+                final boolean boolean10 = ceh11.setColor(((DyeItem)bki8.getItem()).getDyeColor());
+                if (boolean10 && !bec.isCreative()) {
+                    bki8.shrink(1);
                 }
             }
-            return bxh11.executeClickCommands(ayj) ? InteractionResult.SUCCESS : InteractionResult.PASS;
+            return ceh11.executeClickCommands(bec) ? InteractionResult.SUCCESS : InteractionResult.PASS;
         }
         return InteractionResult.PASS;
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)SignBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)SignBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     public WoodType type() {
diff --git a/src/net/minecraft/world/level/block/SimpleWaterloggedBlock.java b/src/net/minecraft/world/level/block/SimpleWaterloggedBlock.java
index 52b824e..1c84a3a 100644
--- a/src/net/minecraft/world/level/block/SimpleWaterloggedBlock.java
+++ b/src/net/minecraft/world/level/block/SimpleWaterloggedBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.LevelAccessor;
@@ -13,24 +13,24 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 
 public interface SimpleWaterloggedBlock extends BucketPickup, LiquidBlockContainer {
-    default boolean canPlaceLiquid(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final Fluid coi) {
-        return !byj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED) && coi == Fluids.WATER;
+    default boolean canPlaceLiquid(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final Fluid cwz) {
+        return !cfj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED) && cwz == Fluids.WATER;
     }
     
-    default boolean placeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final FluidState coj) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED) && coj.getType() == Fluids.WATER) {
-            if (!bjx.isClientSide()) {
-                bjx.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.WATERLOGGED, true), 3);
-                bjx.getLiquidTicks().scheduleTick(fk, coj.getType(), coj.getType().getTickDelay(bjx));
+    default boolean placeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final FluidState cxa) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED) && cxa.getType() == Fluids.WATER) {
+            if (!bqc.isClientSide()) {
+                bqc.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.WATERLOGGED, true), 3);
+                bqc.getLiquidTicks().scheduleTick(fu, cxa.getType(), cxa.getType().getTickDelay(bqc));
             }
             return true;
         }
         return false;
     }
     
-    default Fluid takeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED)) {
-            bjx.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.WATERLOGGED, false), 3);
+    default Fluid takeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED)) {
+            bqc.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.WATERLOGGED, false), 3);
             return Fluids.WATER;
         }
         return Fluids.EMPTY;
diff --git a/src/net/minecraft/world/level/block/SkullBlock.java b/src/net/minecraft/world/level/block/SkullBlock.java
index 03fd7b2..b9c6de4 100644
--- a/src/net/minecraft/world/level/block/SkullBlock.java
+++ b/src/net/minecraft/world/level/block/SkullBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.util.Mth;
@@ -11,6 +11,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -20,32 +21,32 @@ public class SkullBlock extends AbstractSkullBlock {
     
     protected SkullBlock(final Type a, final Properties c) {
         super(a, c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)SkullBlock.ROTATION, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)SkullBlock.ROTATION, 0));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return SkullBlock.SHAPE;
     }
     
     @Override
-    public VoxelShape getOcclusionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public VoxelShape getOcclusionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return Shapes.empty();
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SkullBlock.ROTATION, Mth.floor(bcq.getRotation() * 16.0f / 360.0f + 0.5) & 0xF);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SkullBlock.ROTATION, Mth.floor(bin.getRotation() * 16.0f / 360.0f + 0.5) & 0xF);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)SkullBlock.ROTATION, btu.rotate(byj.<Integer>getValue((Property<Integer>)SkullBlock.ROTATION), 16));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)SkullBlock.ROTATION, cap.rotate(cfj.<Integer>getValue((Property<Integer>)SkullBlock.ROTATION), 16));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)SkullBlock.ROTATION, bsu.mirror(byj.<Integer>getValue((Property<Integer>)SkullBlock.ROTATION), 16));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)SkullBlock.ROTATION, bzj.mirror(cfj.<Integer>getValue((Property<Integer>)SkullBlock.ROTATION), 16));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/SlabBlock.java b/src/net/minecraft/world/level/block/SlabBlock.java
index 772e7a6..3eb0c91 100644
--- a/src/net/minecraft/world/level/block/SlabBlock.java
+++ b/src/net/minecraft/world/level/block/SlabBlock.java
@@ -1,7 +1,8 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.LevelReader;
@@ -20,6 +21,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.SlabType;
@@ -33,12 +35,12 @@ public class SlabBlock extends Block implements SimpleWaterloggedBlock {
     
     public SlabBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue(SlabBlock.TYPE, SlabType.BOTTOM)).<Comparable, Boolean>setValue((Property<Comparable>)SlabBlock.WATERLOGGED, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue(SlabBlock.TYPE, SlabType.BOTTOM)).<Comparable, Boolean>setValue((Property<Comparable>)SlabBlock.WATERLOGGED, false));
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
-        return byj.<SlabType>getValue(SlabBlock.TYPE) != SlabType.DOUBLE;
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
+        return cfj.<SlabType>getValue(SlabBlock.TYPE) != SlabType.DOUBLE;
     }
     
     @Override
@@ -47,9 +49,9 @@ public class SlabBlock extends Block implements SimpleWaterloggedBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final SlabType bzp6 = byj.<SlabType>getValue(SlabBlock.TYPE);
-        switch (bzp6) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final SlabType cgo6 = cfj.<SlabType>getValue(SlabBlock.TYPE);
+        switch (cgo6) {
             case DOUBLE: {
                 return Shapes.block();
             }
@@ -64,73 +66,73 @@ public class SlabBlock extends Block implements SimpleWaterloggedBlock {
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockPos fk3 = bcq.getClickedPos();
-        final BlockState byj4 = bcq.getLevel().getBlockState(fk3);
-        if (byj4.getBlock() == this) {
-            return (((AbstractStateHolder<O, BlockState>)byj4).setValue(SlabBlock.TYPE, SlabType.DOUBLE)).<Comparable, Boolean>setValue((Property<Comparable>)SlabBlock.WATERLOGGED, false);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockPos fu3 = bin.getClickedPos();
+        final BlockState cfj4 = bin.getLevel().getBlockState(fu3);
+        if (cfj4.is(this)) {
+            return (((StateHolder<O, BlockState>)cfj4).setValue(SlabBlock.TYPE, SlabType.DOUBLE)).<Comparable, Boolean>setValue((Property<Comparable>)SlabBlock.WATERLOGGED, false);
         }
-        final FluidState coj5 = bcq.getLevel().getFluidState(fk3);
-        final BlockState byj5 = (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue(SlabBlock.TYPE, SlabType.BOTTOM)).<Comparable, Boolean>setValue((Property<Comparable>)SlabBlock.WATERLOGGED, coj5.getType() == Fluids.WATER);
-        final Direction fp7 = bcq.getClickedFace();
-        if (fp7 == Direction.DOWN || (fp7 != Direction.UP && bcq.getClickLocation().y - fk3.getY() > 0.5)) {
-            return ((AbstractStateHolder<O, BlockState>)byj5).<SlabType, SlabType>setValue(SlabBlock.TYPE, SlabType.TOP);
+        final FluidState cxa5 = bin.getLevel().getFluidState(fu3);
+        final BlockState cfj5 = (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue(SlabBlock.TYPE, SlabType.BOTTOM)).<Comparable, Boolean>setValue((Property<Comparable>)SlabBlock.WATERLOGGED, cxa5.getType() == Fluids.WATER);
+        final Direction fz7 = bin.getClickedFace();
+        if (fz7 == Direction.DOWN || (fz7 != Direction.UP && bin.getClickLocation().y - fu3.getY() > 0.5)) {
+            return ((StateHolder<O, BlockState>)cfj5).<SlabType, SlabType>setValue(SlabBlock.TYPE, SlabType.TOP);
         }
-        return byj5;
+        return cfj5;
     }
     
     @Override
-    public boolean canBeReplaced(final BlockState byj, final BlockPlaceContext bcq) {
-        final ItemStack ben4 = bcq.getItemInHand();
-        final SlabType bzp5 = byj.<SlabType>getValue(SlabBlock.TYPE);
-        if (bzp5 == SlabType.DOUBLE || ben4.getItem() != this.asItem()) {
+    public boolean canBeReplaced(final BlockState cfj, final BlockPlaceContext bin) {
+        final ItemStack bki4 = bin.getItemInHand();
+        final SlabType cgo5 = cfj.<SlabType>getValue(SlabBlock.TYPE);
+        if (cgo5 == SlabType.DOUBLE || bki4.getItem() != this.asItem()) {
             return false;
         }
-        if (!bcq.replacingClickedOnBlock()) {
+        if (!bin.replacingClickedOnBlock()) {
             return true;
         }
-        final boolean boolean6 = bcq.getClickLocation().y - bcq.getClickedPos().getY() > 0.5;
-        final Direction fp7 = bcq.getClickedFace();
-        if (bzp5 == SlabType.BOTTOM) {
-            return fp7 == Direction.UP || (boolean6 && fp7.getAxis().isHorizontal());
+        final boolean boolean6 = bin.getClickLocation().y - bin.getClickedPos().getY() > 0.5;
+        final Direction fz7 = bin.getClickedFace();
+        if (cgo5 == SlabType.BOTTOM) {
+            return fz7 == Direction.UP || (boolean6 && fz7.getAxis().isHorizontal());
         }
-        return fp7 == Direction.DOWN || (!boolean6 && fp7.getAxis().isHorizontal());
+        return fz7 == Direction.DOWN || (!boolean6 && fz7.getAxis().isHorizontal());
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)SlabBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)SlabBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     @Override
-    public boolean placeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final FluidState coj) {
-        return byj.<SlabType>getValue(SlabBlock.TYPE) != SlabType.DOUBLE && super.placeLiquid(bjx, fk, byj, coj);
+    public boolean placeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final FluidState cxa) {
+        return cfj.<SlabType>getValue(SlabBlock.TYPE) != SlabType.DOUBLE && super.placeLiquid(bqc, fu, cfj, cxa);
     }
     
     @Override
-    public boolean canPlaceLiquid(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final Fluid coi) {
-        return byj.<SlabType>getValue(SlabBlock.TYPE) != SlabType.DOUBLE && super.canPlaceLiquid(bjg, fk, byj, coi);
+    public boolean canPlaceLiquid(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final Fluid cwz) {
+        return cfj.<SlabType>getValue(SlabBlock.TYPE) != SlabType.DOUBLE && super.canPlaceLiquid(bpg, fu, cfj, cwz);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)SlabBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)SlabBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
-        switch (cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        switch (czg) {
             case LAND: {
                 return false;
             }
             case WATER: {
-                return bjg.getFluidState(fk).is(FluidTags.WATER);
+                return bpg.getFluidState(fu).is(FluidTags.WATER);
             }
             case AIR: {
                 return false;
diff --git a/src/net/minecraft/world/level/block/SlimeBlock.java b/src/net/minecraft/world/level/block/SlimeBlock.java
index df2445b..07df053 100644
--- a/src/net/minecraft/world/level/block/SlimeBlock.java
+++ b/src/net/minecraft/world/level/block/SlimeBlock.java
@@ -6,6 +6,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class SlimeBlock extends HalfTransparentBlock {
     public SlimeBlock(final Properties c) {
@@ -13,40 +14,40 @@ public class SlimeBlock extends HalfTransparentBlock {
     }
     
     @Override
-    public void fallOn(final Level bjw, final BlockPos fk, final Entity akq, final float float4) {
-        if (akq.isSuppressingBounce()) {
-            super.fallOn(bjw, fk, akq, float4);
+    public void fallOn(final Level bqb, final BlockPos fu, final Entity aom, final float float4) {
+        if (aom.isSuppressingBounce()) {
+            super.fallOn(bqb, fu, aom, float4);
         }
         else {
-            akq.causeFallDamage(float4, 0.0f);
+            aom.causeFallDamage(float4, 0.0f);
         }
     }
     
     @Override
-    public void updateEntityAfterFallOn(final BlockGetter bjg, final Entity akq) {
-        if (akq.isSuppressingBounce()) {
-            super.updateEntityAfterFallOn(bjg, akq);
+    public void updateEntityAfterFallOn(final BlockGetter bpg, final Entity aom) {
+        if (aom.isSuppressingBounce()) {
+            super.updateEntityAfterFallOn(bpg, aom);
         }
         else {
-            this.bounceUp(akq);
+            this.bounceUp(aom);
         }
     }
     
-    private void bounceUp(final Entity akq) {
-        final Vec3 cvl3 = akq.getDeltaMovement();
-        if (cvl3.y < 0.0) {
-            final double double4 = (akq instanceof LivingEntity) ? 1.0 : 0.8;
-            akq.setDeltaMovement(cvl3.x, -cvl3.y * double4, cvl3.z);
+    private void bounceUp(final Entity aom) {
+        final Vec3 dem3 = aom.getDeltaMovement();
+        if (dem3.y < 0.0) {
+            final double double4 = (aom instanceof LivingEntity) ? 1.0 : 0.8;
+            aom.setDeltaMovement(dem3.x, -dem3.y * double4, dem3.z);
         }
     }
     
     @Override
-    public void stepOn(final Level bjw, final BlockPos fk, final Entity akq) {
-        final double double5 = Math.abs(akq.getDeltaMovement().y);
-        if (double5 < 0.1 && !akq.isSteppingCarefully()) {
+    public void stepOn(final Level bqb, final BlockPos fu, final Entity aom) {
+        final double double5 = Math.abs(aom.getDeltaMovement().y);
+        if (double5 < 0.1 && !aom.isSteppingCarefully()) {
             final double double6 = 0.4 + double5 * 0.2;
-            akq.setDeltaMovement(akq.getDeltaMovement().multiply(double6, 1.0, double6));
+            aom.setDeltaMovement(aom.getDeltaMovement().multiply(double6, 1.0, double6));
         }
-        super.stepOn(bjw, fk, akq);
+        super.stepOn(bqb, fu, aom);
     }
 }
diff --git a/src/net/minecraft/world/level/block/SmithingTableBlock.java b/src/net/minecraft/world/level/block/SmithingTableBlock.java
index 1b44e19..153615a 100644
--- a/src/net/minecraft/world/level/block/SmithingTableBlock.java
+++ b/src/net/minecraft/world/level/block/SmithingTableBlock.java
@@ -1,20 +1,46 @@
 package net.minecraft.world.level.block;
 
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.stats.Stats;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.SimpleMenuProvider;
+import net.minecraft.world.inventory.SmithingMenu;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.MenuProvider;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.network.chat.TranslatableComponent;
 
 public class SmithingTableBlock extends CraftingTableBlock {
+    private static final TranslatableComponent CONTAINER_TITLE;
+    
     protected SmithingTableBlock(final Properties c) {
         super(c);
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        return InteractionResult.PASS;
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return new SimpleMenuProvider((integer, beb, bec) -> new SmithingMenu(integer, beb, ContainerLevelAccess.create(bqb, fu)), SmithingTableBlock.CONTAINER_TITLE);
+    }
+    
+    @Override
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
+            return InteractionResult.SUCCESS;
+        }
+        bec.openMenu(cfj.getMenuProvider(bqb, fu));
+        bec.awardStat(Stats.INTERACT_WITH_SMITHING_TABLE);
+        return InteractionResult.CONSUME;
+    }
+    
+    static {
+        CONTAINER_TITLE = new TranslatableComponent("container.upgrade");
     }
 }
diff --git a/src/net/minecraft/world/level/block/SmokerBlock.java b/src/net/minecraft/world/level/block/SmokerBlock.java
index 157850b..d50b0b1 100644
--- a/src/net/minecraft/world/level/block/SmokerBlock.java
+++ b/src/net/minecraft/world/level/block/SmokerBlock.java
@@ -15,6 +15,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.SmokerBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class SmokerBlock extends AbstractFurnaceBlock {
     protected SmokerBlock(final Properties c) {
@@ -22,30 +23,30 @@ public class SmokerBlock extends AbstractFurnaceBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new SmokerBlockEntity();
     }
     
     @Override
-    protected void openContainer(final Level bjw, final BlockPos fk, final Player ayj) {
-        final BlockEntity bwl5 = bjw.getBlockEntity(fk);
-        if (bwl5 instanceof SmokerBlockEntity) {
-            ayj.openMenu((MenuProvider)bwl5);
-            ayj.awardStat(Stats.INTERACT_WITH_SMOKER);
+    protected void openContainer(final Level bqb, final BlockPos fu, final Player bec) {
+        final BlockEntity cdl5 = bqb.getBlockEntity(fu);
+        if (cdl5 instanceof SmokerBlockEntity) {
+            bec.openMenu((MenuProvider)cdl5);
+            bec.awardStat(Stats.INTERACT_WITH_SMOKER);
         }
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)SmokerBlock.LIT)) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)SmokerBlock.LIT)) {
             return;
         }
-        final double double6 = fk.getX() + 0.5;
-        final double double7 = fk.getY();
-        final double double8 = fk.getZ() + 0.5;
+        final double double6 = fu.getX() + 0.5;
+        final double double7 = fu.getY();
+        final double double8 = fu.getZ() + 0.5;
         if (random.nextDouble() < 0.1) {
-            bjw.playLocalSound(double6, double7, double8, SoundEvents.SMOKER_SMOKE, SoundSource.BLOCKS, 1.0f, 1.0f, false);
+            bqb.playLocalSound(double6, double7, double8, SoundEvents.SMOKER_SMOKE, SoundSource.BLOCKS, 1.0f, 1.0f, false);
         }
-        bjw.addParticle(ParticleTypes.SMOKE, double6, double7 + 1.1, double8, 0.0, 0.0, 0.0);
+        bqb.addParticle(ParticleTypes.SMOKE, double6, double7 + 1.1, double8, 0.0, 0.0, 0.0);
     }
 }
diff --git a/src/net/minecraft/world/level/block/SnowLayerBlock.java b/src/net/minecraft/world/level/block/SnowLayerBlock.java
index beb8d45..13da74a 100644
--- a/src/net/minecraft/world/level/block/SnowLayerBlock.java
+++ b/src/net/minecraft/world/level/block/SnowLayerBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -19,6 +19,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -28,14 +29,14 @@ public class SnowLayerBlock extends Block {
     
     protected SnowLayerBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)SnowLayerBlock.LAYERS, 1));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)SnowLayerBlock.LAYERS, 1));
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
-        switch (cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        switch (czg) {
             case LAND: {
-                return byj.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS) < 5;
+                return cfj.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS) < 5;
             }
             case WATER: {
                 return false;
@@ -50,61 +51,70 @@ public class SnowLayerBlock extends Block {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return SnowLayerBlock.SHAPE_BY_LAYER[byj.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS)];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return SnowLayerBlock.SHAPE_BY_LAYER[cfj.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS)];
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return SnowLayerBlock.SHAPE_BY_LAYER[byj.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS) - 1];
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return SnowLayerBlock.SHAPE_BY_LAYER[cfj.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS) - 1];
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
+    public VoxelShape getBlockSupportShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return SnowLayerBlock.SHAPE_BY_LAYER[cfj.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS)];
+    }
+    
+    @Override
+    public VoxelShape getVisualShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return SnowLayerBlock.SHAPE_BY_LAYER[cfj.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS)];
+    }
+    
+    @Override
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockState byj2 = bjz.getBlockState(fk.below());
-        final Block bph6 = byj2.getBlock();
-        return bph6 != Blocks.ICE && bph6 != Blocks.PACKED_ICE && bph6 != Blocks.BARRIER && (bph6 == Blocks.HONEY_BLOCK || bph6 == Blocks.SOUL_SAND || Block.isFaceFull(byj2.getCollisionShape(bjz, fk.below()), Direction.UP) || (bph6 == this && byj2.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS) == 8));
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockState cfj2 = bqd.getBlockState(fu.below());
+        return !cfj2.is(Blocks.ICE) && !cfj2.is(Blocks.PACKED_ICE) && !cfj2.is(Blocks.BARRIER) && (cfj2.is(Blocks.HONEY_BLOCK) || cfj2.is(Blocks.SOUL_SAND) || Block.isFaceFull(cfj2.getCollisionShape(bqd, fu.below()), Direction.UP) || (cfj2.getBlock() == this && cfj2.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS) == 8));
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (xd.getBrightness(LightLayer.BLOCK, fk) > 11) {
-            Block.dropResources(byj, xd, fk);
-            xd.removeBlock(fk, false);
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (zd.getBrightness(LightLayer.BLOCK, fu) > 11) {
+            Block.dropResources(cfj, zd, fu);
+            zd.removeBlock(fu, false);
         }
     }
     
     @Override
-    public boolean canBeReplaced(final BlockState byj, final BlockPlaceContext bcq) {
-        final int integer4 = byj.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS);
-        if (bcq.getItemInHand().getItem() == this.asItem() && integer4 < 8) {
-            return !bcq.replacingClickedOnBlock() || bcq.getClickedFace() == Direction.UP;
+    public boolean canBeReplaced(final BlockState cfj, final BlockPlaceContext bin) {
+        final int integer4 = cfj.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS);
+        if (bin.getItemInHand().getItem() == this.asItem() && integer4 < 8) {
+            return !bin.replacingClickedOnBlock() || bin.getClickedFace() == Direction.UP;
         }
         return integer4 == 1;
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockState byj3 = bcq.getLevel().getBlockState(bcq.getClickedPos());
-        if (byj3.getBlock() == this) {
-            final int integer4 = byj3.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS);
-            return ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Integer>setValue((Property<Comparable>)SnowLayerBlock.LAYERS, Math.min(8, integer4 + 1));
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockState cfj3 = bin.getLevel().getBlockState(bin.getClickedPos());
+        if (cfj3.is(this)) {
+            final int integer4 = cfj3.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS);
+            return ((StateHolder<O, BlockState>)cfj3).<Comparable, Integer>setValue((Property<Comparable>)SnowLayerBlock.LAYERS, Math.min(8, integer4 + 1));
         }
-        return super.getStateForPlacement(bcq);
+        return super.getStateForPlacement(bin);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/SnowyDirtBlock.java b/src/net/minecraft/world/level/block/SnowyDirtBlock.java
index 77b06dd..67dea17 100644
--- a/src/net/minecraft/world/level/block/SnowyDirtBlock.java
+++ b/src/net/minecraft/world/level/block/SnowyDirtBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.item.BlockPlaceContext;
@@ -9,6 +9,7 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public class SnowyDirtBlock extends Block {
@@ -16,22 +17,21 @@ public class SnowyDirtBlock extends Block {
     
     protected SnowyDirtBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)SnowyDirtBlock.SNOWY, false));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Boolean>setValue((Property<Comparable>)SnowyDirtBlock.SNOWY, false));
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.UP) {
-            final Block bph8 = byj3.getBlock();
-            return ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)SnowyDirtBlock.SNOWY, bph8 == Blocks.SNOW_BLOCK || bph8 == Blocks.SNOW);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.UP) {
+            return ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)SnowyDirtBlock.SNOWY, cfj3.is(Blocks.SNOW_BLOCK) || cfj3.is(Blocks.SNOW));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final Block bph3 = bcq.getLevel().getBlockState(bcq.getClickedPos().above()).getBlock();
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)SnowyDirtBlock.SNOWY, bph3 == Blocks.SNOW_BLOCK || bph3 == Blocks.SNOW);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockState cfj3 = bin.getLevel().getBlockState(bin.getClickedPos().above());
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)SnowyDirtBlock.SNOWY, cfj3.is(Blocks.SNOW_BLOCK) || cfj3.is(Blocks.SNOW));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/SoulFireBlock.java b/src/net/minecraft/world/level/block/SoulFireBlock.java
new file mode 100644
index 0000000..6976c8f
--- /dev/null
+++ b/src/net/minecraft/world/level/block/SoulFireBlock.java
@@ -0,0 +1,38 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+
+public class SoulFireBlock extends BaseFireBlock {
+    public SoulFireBlock(final Properties c) {
+        super(c, 2.0f);
+    }
+    
+    @Override
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (this.canSurvive(cfj1, bqc, fu5)) {
+            return this.defaultBlockState();
+        }
+        return Blocks.AIR.defaultBlockState();
+    }
+    
+    @Override
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return canSurviveOnBlock(bqd.getBlockState(fu.below()).getBlock());
+    }
+    
+    public static boolean canSurviveOnBlock(final Block bvr) {
+        return bvr.is(BlockTags.SOUL_FIRE_BASE_BLOCKS);
+    }
+    
+    @Override
+    protected boolean canBurn(final BlockState cfj) {
+        return true;
+    }
+}
diff --git a/src/net/minecraft/world/level/block/SoulSandBlock.java b/src/net/minecraft/world/level/block/SoulSandBlock.java
new file mode 100644
index 0000000..f2460da
--- /dev/null
+++ b/src/net/minecraft/world/level/block/SoulSandBlock.java
@@ -0,0 +1,65 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.Level;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.LevelAccessor;
+import java.util.Random;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public class SoulSandBlock extends Block {
+    protected static final VoxelShape SHAPE;
+    
+    public SoulSandBlock(final Properties c) {
+        super(c);
+    }
+    
+    @Override
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return SoulSandBlock.SHAPE;
+    }
+    
+    @Override
+    public VoxelShape getBlockSupportShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return Shapes.block();
+    }
+    
+    @Override
+    public VoxelShape getVisualShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return Shapes.block();
+    }
+    
+    @Override
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        BubbleColumnBlock.growColumn(zd, fu.above(), false);
+    }
+    
+    @Override
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.UP && cfj3.is(Blocks.WATER)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 20);
+        }
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
+    }
+    
+    @Override
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        bqb.getBlockTicks().scheduleTick(fu, this, 20);
+    }
+    
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        return false;
+    }
+    
+    static {
+        SHAPE = Block.box(0.0, 0.0, 0.0, 16.0, 14.0, 16.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/SoulsandBlock.java b/src/net/minecraft/world/level/block/SoulsandBlock.java
deleted file mode 100644
index 6fd931b..0000000
--- a/src/net/minecraft/world/level/block/SoulsandBlock.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package net.minecraft.world.level.block;
-
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.pathfinder.PathComputationType;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelAccessor;
-import java.util.Random;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.shapes.VoxelShape;
-
-public class SoulsandBlock extends Block {
-    protected static final VoxelShape SHAPE;
-    
-    public SoulsandBlock(final Properties c) {
-        super(c);
-    }
-    
-    @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return SoulsandBlock.SHAPE;
-    }
-    
-    @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        BubbleColumnBlock.growColumn(xd, fk.above(), false);
-    }
-    
-    @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        bjw.getBlockTicks().scheduleTick(fk3, this, this.getTickDelay(bjw));
-    }
-    
-    @Override
-    public boolean isRedstoneConductor(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return true;
-    }
-    
-    @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return 20;
-    }
-    
-    @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        bjw.getBlockTicks().scheduleTick(fk, this, this.getTickDelay(bjw));
-    }
-    
-    @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
-        return false;
-    }
-    
-    @Override
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return true;
-    }
-    
-    @Override
-    public boolean isViewBlocking(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return true;
-    }
-    
-    static {
-        SHAPE = Block.box(0.0, 0.0, 0.0, 16.0, 14.0, 16.0);
-    }
-}
diff --git a/src/net/minecraft/world/level/block/SoundType.java b/src/net/minecraft/world/level/block/SoundType.java
index 3d10735..20fadc7 100644
--- a/src/net/minecraft/world/level/block/SoundType.java
+++ b/src/net/minecraft/world/level/block/SoundType.java
@@ -7,6 +7,7 @@ public class SoundType {
     public static final SoundType WOOD;
     public static final SoundType GRAVEL;
     public static final SoundType GRASS;
+    public static final SoundType LILY_PAD;
     public static final SoundType STONE;
     public static final SoundType METAL;
     public static final SoundType GLASS;
@@ -25,8 +26,31 @@ public class SoundType {
     public static final SoundType SWEET_BERRY_BUSH;
     public static final SoundType CROP;
     public static final SoundType HARD_CROP;
+    public static final SoundType VINE;
     public static final SoundType NETHER_WART;
     public static final SoundType LANTERN;
+    public static final SoundType STEM;
+    public static final SoundType NYLIUM;
+    public static final SoundType FUNGUS;
+    public static final SoundType ROOTS;
+    public static final SoundType SHROOMLIGHT;
+    public static final SoundType WEEPING_VINES;
+    public static final SoundType TWISTING_VINES;
+    public static final SoundType SOUL_SAND;
+    public static final SoundType SOUL_SOIL;
+    public static final SoundType BASALT;
+    public static final SoundType WART_BLOCK;
+    public static final SoundType NETHERRACK;
+    public static final SoundType NETHER_BRICKS;
+    public static final SoundType NETHER_SPROUTS;
+    public static final SoundType NETHER_ORE;
+    public static final SoundType BONE_BLOCK;
+    public static final SoundType NETHERITE_BLOCK;
+    public static final SoundType ANCIENT_DEBRIS;
+    public static final SoundType LODESTONE;
+    public static final SoundType CHAIN;
+    public static final SoundType NETHER_GOLD_ORE;
+    public static final SoundType GILDED_BLACKSTONE;
     public final float volume;
     public final float pitch;
     private final SoundEvent breakSound;
@@ -35,14 +59,14 @@ public class SoundType {
     private final SoundEvent hitSound;
     private final SoundEvent fallSound;
     
-    public SoundType(final float float1, final float float2, final SoundEvent aah3, final SoundEvent aah4, final SoundEvent aah5, final SoundEvent aah6, final SoundEvent aah7) {
+    public SoundType(final float float1, final float float2, final SoundEvent ack3, final SoundEvent ack4, final SoundEvent ack5, final SoundEvent ack6, final SoundEvent ack7) {
         this.volume = float1;
         this.pitch = float2;
-        this.breakSound = aah3;
-        this.stepSound = aah4;
-        this.placeSound = aah5;
-        this.hitSound = aah6;
-        this.fallSound = aah7;
+        this.breakSound = ack3;
+        this.stepSound = ack4;
+        this.placeSound = ack5;
+        this.hitSound = ack6;
+        this.fallSound = ack7;
     }
     
     public float getVolume() {
@@ -77,6 +101,7 @@ public class SoundType {
         WOOD = new SoundType(1.0f, 1.0f, SoundEvents.WOOD_BREAK, SoundEvents.WOOD_STEP, SoundEvents.WOOD_PLACE, SoundEvents.WOOD_HIT, SoundEvents.WOOD_FALL);
         GRAVEL = new SoundType(1.0f, 1.0f, SoundEvents.GRAVEL_BREAK, SoundEvents.GRAVEL_STEP, SoundEvents.GRAVEL_PLACE, SoundEvents.GRAVEL_HIT, SoundEvents.GRAVEL_FALL);
         GRASS = new SoundType(1.0f, 1.0f, SoundEvents.GRASS_BREAK, SoundEvents.GRASS_STEP, SoundEvents.GRASS_PLACE, SoundEvents.GRASS_HIT, SoundEvents.GRASS_FALL);
+        LILY_PAD = new SoundType(1.0f, 1.0f, SoundEvents.GRASS_BREAK, SoundEvents.GRASS_STEP, SoundEvents.LILY_PAD_PLACE, SoundEvents.GRASS_HIT, SoundEvents.GRASS_FALL);
         STONE = new SoundType(1.0f, 1.0f, SoundEvents.STONE_BREAK, SoundEvents.STONE_STEP, SoundEvents.STONE_PLACE, SoundEvents.STONE_HIT, SoundEvents.STONE_FALL);
         METAL = new SoundType(1.0f, 1.5f, SoundEvents.METAL_BREAK, SoundEvents.METAL_STEP, SoundEvents.METAL_PLACE, SoundEvents.METAL_HIT, SoundEvents.METAL_FALL);
         GLASS = new SoundType(1.0f, 1.0f, SoundEvents.GLASS_BREAK, SoundEvents.GLASS_STEP, SoundEvents.GLASS_PLACE, SoundEvents.GLASS_HIT, SoundEvents.GLASS_FALL);
@@ -95,7 +120,30 @@ public class SoundType {
         SWEET_BERRY_BUSH = new SoundType(1.0f, 1.0f, SoundEvents.SWEET_BERRY_BUSH_BREAK, SoundEvents.GRASS_STEP, SoundEvents.SWEET_BERRY_BUSH_PLACE, SoundEvents.GRASS_HIT, SoundEvents.GRASS_FALL);
         CROP = new SoundType(1.0f, 1.0f, SoundEvents.CROP_BREAK, SoundEvents.GRASS_STEP, SoundEvents.CROP_PLANTED, SoundEvents.GRASS_HIT, SoundEvents.GRASS_FALL);
         HARD_CROP = new SoundType(1.0f, 1.0f, SoundEvents.WOOD_BREAK, SoundEvents.WOOD_STEP, SoundEvents.CROP_PLANTED, SoundEvents.WOOD_HIT, SoundEvents.WOOD_FALL);
+        VINE = new SoundType(1.0f, 1.0f, SoundEvents.GRASS_BREAK, SoundEvents.VINE_STEP, SoundEvents.GRASS_PLACE, SoundEvents.GRASS_HIT, SoundEvents.GRASS_FALL);
         NETHER_WART = new SoundType(1.0f, 1.0f, SoundEvents.NETHER_WART_BREAK, SoundEvents.STONE_STEP, SoundEvents.NETHER_WART_PLANTED, SoundEvents.STONE_HIT, SoundEvents.STONE_FALL);
         LANTERN = new SoundType(1.0f, 1.0f, SoundEvents.LANTERN_BREAK, SoundEvents.LANTERN_STEP, SoundEvents.LANTERN_PLACE, SoundEvents.LANTERN_HIT, SoundEvents.LANTERN_FALL);
+        STEM = new SoundType(1.0f, 1.0f, SoundEvents.STEM_BREAK, SoundEvents.STEM_STEP, SoundEvents.STEM_PLACE, SoundEvents.STEM_HIT, SoundEvents.STEM_FALL);
+        NYLIUM = new SoundType(1.0f, 1.0f, SoundEvents.NYLIUM_BREAK, SoundEvents.NYLIUM_STEP, SoundEvents.NYLIUM_PLACE, SoundEvents.NYLIUM_HIT, SoundEvents.NYLIUM_FALL);
+        FUNGUS = new SoundType(1.0f, 1.0f, SoundEvents.FUNGUS_BREAK, SoundEvents.FUNGUS_STEP, SoundEvents.FUNGUS_PLACE, SoundEvents.FUNGUS_HIT, SoundEvents.FUNGUS_FALL);
+        ROOTS = new SoundType(1.0f, 1.0f, SoundEvents.ROOTS_BREAK, SoundEvents.ROOTS_STEP, SoundEvents.ROOTS_PLACE, SoundEvents.ROOTS_HIT, SoundEvents.ROOTS_FALL);
+        SHROOMLIGHT = new SoundType(1.0f, 1.0f, SoundEvents.SHROOMLIGHT_BREAK, SoundEvents.SHROOMLIGHT_STEP, SoundEvents.SHROOMLIGHT_PLACE, SoundEvents.SHROOMLIGHT_HIT, SoundEvents.SHROOMLIGHT_FALL);
+        WEEPING_VINES = new SoundType(1.0f, 1.0f, SoundEvents.WEEPING_VINES_BREAK, SoundEvents.WEEPING_VINES_STEP, SoundEvents.WEEPING_VINES_PLACE, SoundEvents.WEEPING_VINES_HIT, SoundEvents.WEEPING_VINES_FALL);
+        TWISTING_VINES = new SoundType(1.0f, 0.5f, SoundEvents.WEEPING_VINES_BREAK, SoundEvents.WEEPING_VINES_STEP, SoundEvents.WEEPING_VINES_PLACE, SoundEvents.WEEPING_VINES_HIT, SoundEvents.WEEPING_VINES_FALL);
+        SOUL_SAND = new SoundType(1.0f, 1.0f, SoundEvents.SOUL_SAND_BREAK, SoundEvents.SOUL_SAND_STEP, SoundEvents.SOUL_SAND_PLACE, SoundEvents.SOUL_SAND_HIT, SoundEvents.SOUL_SAND_FALL);
+        SOUL_SOIL = new SoundType(1.0f, 1.0f, SoundEvents.SOUL_SOIL_BREAK, SoundEvents.SOUL_SOIL_STEP, SoundEvents.SOUL_SOIL_PLACE, SoundEvents.SOUL_SOIL_HIT, SoundEvents.SOUL_SOIL_FALL);
+        BASALT = new SoundType(1.0f, 1.0f, SoundEvents.BASALT_BREAK, SoundEvents.BASALT_STEP, SoundEvents.BASALT_PLACE, SoundEvents.BASALT_HIT, SoundEvents.BASALT_FALL);
+        WART_BLOCK = new SoundType(1.0f, 1.0f, SoundEvents.WART_BLOCK_BREAK, SoundEvents.WART_BLOCK_STEP, SoundEvents.WART_BLOCK_PLACE, SoundEvents.WART_BLOCK_HIT, SoundEvents.WART_BLOCK_FALL);
+        NETHERRACK = new SoundType(1.0f, 1.0f, SoundEvents.NETHERRACK_BREAK, SoundEvents.NETHERRACK_STEP, SoundEvents.NETHERRACK_PLACE, SoundEvents.NETHERRACK_HIT, SoundEvents.NETHERRACK_FALL);
+        NETHER_BRICKS = new SoundType(1.0f, 1.0f, SoundEvents.NETHER_BRICKS_BREAK, SoundEvents.NETHER_BRICKS_STEP, SoundEvents.NETHER_BRICKS_PLACE, SoundEvents.NETHER_BRICKS_HIT, SoundEvents.NETHER_BRICKS_FALL);
+        NETHER_SPROUTS = new SoundType(1.0f, 1.0f, SoundEvents.NETHER_SPROUTS_BREAK, SoundEvents.NETHER_SPROUTS_STEP, SoundEvents.NETHER_SPROUTS_PLACE, SoundEvents.NETHER_SPROUTS_HIT, SoundEvents.NETHER_SPROUTS_FALL);
+        NETHER_ORE = new SoundType(1.0f, 1.0f, SoundEvents.NETHER_ORE_BREAK, SoundEvents.NETHER_ORE_STEP, SoundEvents.NETHER_ORE_PLACE, SoundEvents.NETHER_ORE_HIT, SoundEvents.NETHER_ORE_FALL);
+        BONE_BLOCK = new SoundType(1.0f, 1.0f, SoundEvents.BONE_BLOCK_BREAK, SoundEvents.BONE_BLOCK_STEP, SoundEvents.BONE_BLOCK_PLACE, SoundEvents.BONE_BLOCK_HIT, SoundEvents.BONE_BLOCK_FALL);
+        NETHERITE_BLOCK = new SoundType(1.0f, 1.0f, SoundEvents.NETHERITE_BLOCK_BREAK, SoundEvents.NETHERITE_BLOCK_STEP, SoundEvents.NETHERITE_BLOCK_PLACE, SoundEvents.NETHERITE_BLOCK_HIT, SoundEvents.NETHERITE_BLOCK_FALL);
+        ANCIENT_DEBRIS = new SoundType(1.0f, 1.0f, SoundEvents.ANCIENT_DEBRIS_BREAK, SoundEvents.ANCIENT_DEBRIS_STEP, SoundEvents.ANCIENT_DEBRIS_PLACE, SoundEvents.ANCIENT_DEBRIS_HIT, SoundEvents.ANCIENT_DEBRIS_FALL);
+        LODESTONE = new SoundType(1.0f, 1.0f, SoundEvents.LODESTONE_BREAK, SoundEvents.LODESTONE_STEP, SoundEvents.LODESTONE_PLACE, SoundEvents.LODESTONE_HIT, SoundEvents.LODESTONE_FALL);
+        CHAIN = new SoundType(1.0f, 1.0f, SoundEvents.CHAIN_BREAK, SoundEvents.CHAIN_STEP, SoundEvents.CHAIN_PLACE, SoundEvents.CHAIN_HIT, SoundEvents.CHAIN_FALL);
+        NETHER_GOLD_ORE = new SoundType(1.0f, 1.0f, SoundEvents.NETHER_GOLD_ORE_BREAK, SoundEvents.NETHER_GOLD_ORE_STEP, SoundEvents.NETHER_GOLD_ORE_PLACE, SoundEvents.NETHER_GOLD_ORE_HIT, SoundEvents.NETHER_GOLD_ORE_FALL);
+        GILDED_BLACKSTONE = new SoundType(1.0f, 1.0f, SoundEvents.GILDED_BLACKSTONE_BREAK, SoundEvents.GILDED_BLACKSTONE_STEP, SoundEvents.GILDED_BLACKSTONE_PLACE, SoundEvents.GILDED_BLACKSTONE_HIT, SoundEvents.GILDED_BLACKSTONE_FALL);
     }
 }
diff --git a/src/net/minecraft/world/level/block/SpawnerBlock.java b/src/net/minecraft/world/level/block/SpawnerBlock.java
index da83ffb..2d835d9 100644
--- a/src/net/minecraft/world/level/block/SpawnerBlock.java
+++ b/src/net/minecraft/world/level/block/SpawnerBlock.java
@@ -7,6 +7,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class SpawnerBlock extends BaseEntityBlock {
     protected SpawnerBlock(final Properties c) {
@@ -14,24 +15,24 @@ public class SpawnerBlock extends BaseEntityBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new SpawnerBlockEntity();
     }
     
     @Override
-    public void spawnAfterBreak(final BlockState byj, final Level bjw, final BlockPos fk, final ItemStack ben) {
-        super.spawnAfterBreak(byj, bjw, fk, ben);
-        final int integer6 = 15 + bjw.random.nextInt(15) + bjw.random.nextInt(15);
-        this.popExperience(bjw, fk, integer6);
+    public void spawnAfterBreak(final BlockState cfj, final Level bqb, final BlockPos fu, final ItemStack bki) {
+        super.spawnAfterBreak(cfj, bqb, fu, bki);
+        final int integer6 = 15 + bqb.random.nextInt(15) + bqb.random.nextInt(15);
+        this.popExperience(bqb, fu, integer6);
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return ItemStack.EMPTY;
     }
 }
diff --git a/src/net/minecraft/world/level/block/SpongeBlock.java b/src/net/minecraft/world/level/block/SpongeBlock.java
index 70f3626..85926cc 100644
--- a/src/net/minecraft/world/level/block/SpongeBlock.java
+++ b/src/net/minecraft/world/level/block/SpongeBlock.java
@@ -6,6 +6,8 @@ import java.util.Queue;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.Direction;
 import net.minecraft.util.Tuple;
@@ -13,6 +15,7 @@ import com.google.common.collect.Lists;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class SpongeBlock extends Block {
     protected SpongeBlock(final Properties c) {
@@ -20,60 +23,60 @@ public class SpongeBlock extends Block {
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj4.getBlock() == byj1.getBlock()) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj4.is(cfj1.getBlock())) {
             return;
         }
-        this.tryAbsorbWater(bjw, fk);
+        this.tryAbsorbWater(bqb, fu);
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        this.tryAbsorbWater(bjw, fk3);
-        super.neighborChanged(byj, bjw, fk3, bph, fk5, boolean6);
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        this.tryAbsorbWater(bqb, fu3);
+        super.neighborChanged(cfj, bqb, fu3, bvr, fu5, boolean6);
     }
     
-    protected void tryAbsorbWater(final Level bjw, final BlockPos fk) {
-        if (this.removeWaterBreadthFirstSearch(bjw, fk)) {
-            bjw.setBlock(fk, Blocks.WET_SPONGE.defaultBlockState(), 2);
-            bjw.levelEvent(2001, fk, Block.getId(Blocks.WATER.defaultBlockState()));
+    protected void tryAbsorbWater(final Level bqb, final BlockPos fu) {
+        if (this.removeWaterBreadthFirstSearch(bqb, fu)) {
+            bqb.setBlock(fu, Blocks.WET_SPONGE.defaultBlockState(), 2);
+            bqb.levelEvent(2001, fu, Block.getId(Blocks.WATER.defaultBlockState()));
         }
     }
     
-    private boolean removeWaterBreadthFirstSearch(final Level bjw, final BlockPos fk) {
+    private boolean removeWaterBreadthFirstSearch(final Level bqb, final BlockPos fu) {
         final Queue<Tuple<BlockPos, Integer>> queue4 = Lists.newLinkedList();
-        queue4.add(new Tuple<BlockPos, Integer>(fk, 0));
+        queue4.add(new Tuple<BlockPos, Integer>(fu, 0));
         int integer5 = 0;
         while (!queue4.isEmpty()) {
-            final Tuple<BlockPos, Integer> abz6 = queue4.poll();
-            final BlockPos fk2 = abz6.getA();
-            final int integer6 = abz6.getB();
-            for (final Direction fp12 : Direction.values()) {
-                final BlockPos fk3 = fk2.relative(fp12);
-                final BlockState byj14 = bjw.getBlockState(fk3);
-                final FluidState coj15 = bjw.getFluidState(fk3);
-                final Material coo16 = byj14.getMaterial();
-                if (coj15.is(FluidTags.WATER)) {
-                    if (byj14.getBlock() instanceof BucketPickup && ((BucketPickup)byj14.getBlock()).takeLiquid(bjw, fk3, byj14) != Fluids.EMPTY) {
+            final Tuple<BlockPos, Integer> aek6 = queue4.poll();
+            final BlockPos fu2 = aek6.getA();
+            final int integer6 = aek6.getB();
+            for (final Direction fz12 : Direction.values()) {
+                final BlockPos fu3 = fu2.relative(fz12);
+                final BlockState cfj14 = bqb.getBlockState(fu3);
+                final FluidState cxa15 = bqb.getFluidState(fu3);
+                final Material cxd16 = cfj14.getMaterial();
+                if (cxa15.is(FluidTags.WATER)) {
+                    if (cfj14.getBlock() instanceof BucketPickup && ((BucketPickup)cfj14.getBlock()).takeLiquid(bqb, fu3, cfj14) != Fluids.EMPTY) {
                         ++integer5;
                         if (integer6 < 6) {
-                            queue4.add(new Tuple<BlockPos, Integer>(fk3, integer6 + 1));
+                            queue4.add(new Tuple<BlockPos, Integer>(fu3, integer6 + 1));
                         }
                     }
-                    else if (byj14.getBlock() instanceof LiquidBlock) {
-                        bjw.setBlock(fk3, Blocks.AIR.defaultBlockState(), 3);
+                    else if (cfj14.getBlock() instanceof LiquidBlock) {
+                        bqb.setBlock(fu3, Blocks.AIR.defaultBlockState(), 3);
                         ++integer5;
                         if (integer6 < 6) {
-                            queue4.add(new Tuple<BlockPos, Integer>(fk3, integer6 + 1));
+                            queue4.add(new Tuple<BlockPos, Integer>(fu3, integer6 + 1));
                         }
                     }
-                    else if (coo16 == Material.WATER_PLANT || coo16 == Material.REPLACEABLE_WATER_PLANT) {
-                        final BlockEntity bwl17 = byj14.getBlock().isEntityBlock() ? bjw.getBlockEntity(fk3) : null;
-                        Block.dropResources(byj14, bjw, fk3, bwl17);
-                        bjw.setBlock(fk3, Blocks.AIR.defaultBlockState(), 3);
+                    else if (cxd16 == Material.WATER_PLANT || cxd16 == Material.REPLACEABLE_WATER_PLANT) {
+                        final BlockEntity cdl17 = cfj14.getBlock().isEntityBlock() ? bqb.getBlockEntity(fu3) : null;
+                        Block.dropResources(cfj14, bqb, fu3, cdl17);
+                        bqb.setBlock(fu3, Blocks.AIR.defaultBlockState(), 3);
                         ++integer5;
                         if (integer6 < 6) {
-                            queue4.add(new Tuple<BlockPos, Integer>(fk3, integer6 + 1));
+                            queue4.add(new Tuple<BlockPos, Integer>(fu3, integer6 + 1));
                         }
                     }
                 }
diff --git a/src/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java b/src/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
index c05ccfd..6a3620e 100644
--- a/src/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
+++ b/src/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
@@ -1,8 +1,10 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.lighting.LayerLightEngine;
 import net.minecraft.world.level.BlockGetter;
@@ -11,39 +13,43 @@ import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public abstract class SpreadingSnowyDirtBlock extends SnowyDirtBlock {
     protected SpreadingSnowyDirtBlock(final Properties c) {
         super(c);
     }
     
-    private static boolean canBeGrass(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.above();
-        final BlockState byj2 = bjz.getBlockState(fk2);
-        if (byj2.getBlock() == Blocks.SNOW && byj2.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS) == 1) {
+    private static boolean canBeGrass(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.above();
+        final BlockState cfj2 = bqd.getBlockState(fu2);
+        if (cfj2.is(Blocks.SNOW) && cfj2.<Integer>getValue((Property<Integer>)SnowLayerBlock.LAYERS) == 1) {
             return true;
         }
-        final int integer6 = LayerLightEngine.getLightBlockInto(bjz, byj, fk, byj2, fk2, Direction.UP, byj2.getLightBlock(bjz, fk2));
-        return integer6 < bjz.getMaxLightLevel();
+        if (cfj2.getFluidState().getAmount() == 8) {
+            return false;
+        }
+        final int integer6 = LayerLightEngine.getLightBlockInto(bqd, cfj, fu, cfj2, fu2, Direction.UP, cfj2.getLightBlock(bqd, fu2));
+        return integer6 < bqd.getMaxLightLevel();
     }
     
-    private static boolean canPropagate(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final BlockPos fk2 = fk.above();
-        return canBeGrass(byj, bjz, fk) && !bjz.getFluidState(fk2).is(FluidTags.WATER);
+    private static boolean canPropagate(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockPos fu2 = fu.above();
+        return canBeGrass(cfj, bqd, fu) && !bqd.getFluidState(fu2).is(FluidTags.WATER);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!canBeGrass(byj, xd, fk)) {
-            xd.setBlockAndUpdate(fk, Blocks.DIRT.defaultBlockState());
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!canBeGrass(cfj, zd, fu)) {
+            zd.setBlockAndUpdate(fu, Blocks.DIRT.defaultBlockState());
             return;
         }
-        if (xd.getMaxLocalRawBrightness(fk.above()) >= 9) {
-            final BlockState byj2 = this.defaultBlockState();
+        if (zd.getMaxLocalRawBrightness(fu.above()) >= 9) {
+            final BlockState cfj2 = this.defaultBlockState();
             for (int integer7 = 0; integer7 < 4; ++integer7) {
-                final BlockPos fk2 = fk.offset(random.nextInt(3) - 1, random.nextInt(5) - 3, random.nextInt(3) - 1);
-                if (xd.getBlockState(fk2).getBlock() == Blocks.DIRT && canPropagate(byj2, xd, fk2)) {
-                    xd.setBlockAndUpdate(fk2, ((AbstractStateHolder<O, BlockState>)byj2).<Comparable, Boolean>setValue((Property<Comparable>)SpreadingSnowyDirtBlock.SNOWY, xd.getBlockState(fk2.above()).getBlock() == Blocks.SNOW));
+                final BlockPos fu2 = fu.offset(random.nextInt(3) - 1, random.nextInt(5) - 3, random.nextInt(3) - 1);
+                if (zd.getBlockState(fu2).is(Blocks.DIRT) && canPropagate(cfj2, zd, fu2)) {
+                    zd.setBlockAndUpdate(fu2, ((StateHolder<O, BlockState>)cfj2).<Comparable, Boolean>setValue((Property<Comparable>)SpreadingSnowyDirtBlock.SNOWY, zd.getBlockState(fu2.above()).is(Blocks.SNOW)));
                 }
             }
         }
diff --git a/src/net/minecraft/world/level/block/StainedGlassBlock.java b/src/net/minecraft/world/level/block/StainedGlassBlock.java
index 8f2e15e..3f028d6 100644
--- a/src/net/minecraft/world/level/block/StainedGlassBlock.java
+++ b/src/net/minecraft/world/level/block/StainedGlassBlock.java
@@ -1,13 +1,14 @@
 package net.minecraft.world.level.block;
 
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.item.DyeColor;
 
 public class StainedGlassBlock extends AbstractGlassBlock implements BeaconBeamBlock {
     private final DyeColor color;
     
-    public StainedGlassBlock(final DyeColor bdj, final Properties c) {
+    public StainedGlassBlock(final DyeColor bje, final Properties c) {
         super(c);
-        this.color = bdj;
+        this.color = bje;
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/StainedGlassPaneBlock.java b/src/net/minecraft/world/level/block/StainedGlassPaneBlock.java
index aaf2e7c..809ea27 100644
--- a/src/net/minecraft/world/level/block/StainedGlassPaneBlock.java
+++ b/src/net/minecraft/world/level/block/StainedGlassPaneBlock.java
@@ -1,17 +1,18 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.item.DyeColor;
 
 public class StainedGlassPaneBlock extends IronBarsBlock implements BeaconBeamBlock {
     private final DyeColor color;
     
-    public StainedGlassPaneBlock(final DyeColor bdj, final Properties c) {
+    public StainedGlassPaneBlock(final DyeColor bje, final Properties c) {
         super(c);
-        this.color = bdj;
-        this.registerDefaultState(((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)StainedGlassPaneBlock.NORTH, false)).setValue((Property<Comparable>)StainedGlassPaneBlock.EAST, false)).setValue((Property<Comparable>)StainedGlassPaneBlock.SOUTH, false)).setValue((Property<Comparable>)StainedGlassPaneBlock.WEST, false)).<Comparable, Boolean>setValue((Property<Comparable>)StainedGlassPaneBlock.WATERLOGGED, false));
+        this.color = bje;
+        this.registerDefaultState(((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)StainedGlassPaneBlock.NORTH, false)).setValue((Property<Comparable>)StainedGlassPaneBlock.EAST, false)).setValue((Property<Comparable>)StainedGlassPaneBlock.SOUTH, false)).setValue((Property<Comparable>)StainedGlassPaneBlock.WEST, false)).<Comparable, Boolean>setValue((Property<Comparable>)StainedGlassPaneBlock.WATERLOGGED, false));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/StairBlock.java b/src/net/minecraft/world/level/block/StairBlock.java
index 845b133..12e3b97 100644
--- a/src/net/minecraft/world/level/block/StairBlock.java
+++ b/src/net/minecraft/world/level/block/StairBlock.java
@@ -1,9 +1,10 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.item.BlockPlaceContext;
@@ -13,7 +14,6 @@ import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.player.Player;
 import java.util.Random;
@@ -23,6 +23,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.Shapes;
 import java.util.stream.IntStream;
 import net.minecraft.world.level.block.state.BlockState;
@@ -54,61 +55,61 @@ public class StairBlock extends Block implements SimpleWaterloggedBlock {
     private final Block base;
     private final BlockState baseState;
     
-    private static VoxelShape[] makeShapes(final VoxelShape cwf1, final VoxelShape cwf2, final VoxelShape cwf3, final VoxelShape cwf4, final VoxelShape cwf5) {
-        return IntStream.range(0, 16).mapToObj(integer -> makeStairShape(integer, cwf1, cwf2, cwf3, cwf4, cwf5)).<VoxelShape>toArray(VoxelShape[]::new);
+    private static VoxelShape[] makeShapes(final VoxelShape dfg1, final VoxelShape dfg2, final VoxelShape dfg3, final VoxelShape dfg4, final VoxelShape dfg5) {
+        return IntStream.range(0, 16).mapToObj(integer -> makeStairShape(integer, dfg1, dfg2, dfg3, dfg4, dfg5)).<VoxelShape>toArray(VoxelShape[]::new);
     }
     
-    private static VoxelShape makeStairShape(final int integer, final VoxelShape cwf2, final VoxelShape cwf3, final VoxelShape cwf4, final VoxelShape cwf5, final VoxelShape cwf6) {
-        VoxelShape cwf7 = cwf2;
+    private static VoxelShape makeStairShape(final int integer, final VoxelShape dfg2, final VoxelShape dfg3, final VoxelShape dfg4, final VoxelShape dfg5, final VoxelShape dfg6) {
+        VoxelShape dfg7 = dfg2;
         if ((integer & 0x1) != 0x0) {
-            cwf7 = Shapes.or(cwf7, cwf3);
+            dfg7 = Shapes.or(dfg7, dfg3);
         }
         if ((integer & 0x2) != 0x0) {
-            cwf7 = Shapes.or(cwf7, cwf4);
+            dfg7 = Shapes.or(dfg7, dfg4);
         }
         if ((integer & 0x4) != 0x0) {
-            cwf7 = Shapes.or(cwf7, cwf5);
+            dfg7 = Shapes.or(dfg7, dfg5);
         }
         if ((integer & 0x8) != 0x0) {
-            cwf7 = Shapes.or(cwf7, cwf6);
+            dfg7 = Shapes.or(dfg7, dfg6);
         }
-        return cwf7;
+        return dfg7;
     }
     
-    protected StairBlock(final BlockState byj, final Properties c) {
+    protected StairBlock(final BlockState cfj, final Properties c) {
         super(c);
-        this.registerDefaultState((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH)).setValue(StairBlock.HALF, Half.BOTTOM)).setValue(StairBlock.SHAPE, StairsShape.STRAIGHT)).<Comparable, Boolean>setValue((Property<Comparable>)StairBlock.WATERLOGGED, false));
-        this.base = byj.getBlock();
-        this.baseState = byj;
+        this.registerDefaultState((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH)).setValue(StairBlock.HALF, Half.BOTTOM)).setValue(StairBlock.SHAPE, StairsShape.STRAIGHT)).<Comparable, Boolean>setValue((Property<Comparable>)StairBlock.WATERLOGGED, false));
+        this.base = cfj.getBlock();
+        this.baseState = cfj;
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return ((byj.<Half>getValue(StairBlock.HALF) == Half.TOP) ? StairBlock.TOP_SHAPES : StairBlock.BOTTOM_SHAPES)[StairBlock.SHAPE_BY_STATE[this.getShapeIndex(byj)]];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return ((cfj.<Half>getValue(StairBlock.HALF) == Half.TOP) ? StairBlock.TOP_SHAPES : StairBlock.BOTTOM_SHAPES)[StairBlock.SHAPE_BY_STATE[this.getShapeIndex(cfj)]];
     }
     
-    private int getShapeIndex(final BlockState byj) {
-        return byj.<StairsShape>getValue(StairBlock.SHAPE).ordinal() * 4 + byj.<Direction>getValue((Property<Direction>)StairBlock.FACING).get2DDataValue();
+    private int getShapeIndex(final BlockState cfj) {
+        return cfj.<StairsShape>getValue(StairBlock.SHAPE).ordinal() * 4 + cfj.<Direction>getValue((Property<Direction>)StairBlock.FACING).get2DDataValue();
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        this.base.animateTick(byj, bjw, fk, random);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        this.base.animateTick(cfj, bqb, fu, random);
     }
     
     @Override
-    public void attack(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj) {
-        this.baseState.attack(bjw, fk, ayj);
+    public void attack(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec) {
+        this.baseState.attack(bqb, fu, bec);
     }
     
     @Override
-    public void destroy(final LevelAccessor bjx, final BlockPos fk, final BlockState byj) {
-        this.base.destroy(bjx, fk, byj);
+    public void destroy(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj) {
+        this.base.destroy(bqc, fu, cfj);
     }
     
     @Override
@@ -117,84 +118,89 @@ public class StairBlock extends Block implements SimpleWaterloggedBlock {
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return this.base.getTickDelay(bjz);
-    }
-    
-    @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj1.getBlock()) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj1.getBlock())) {
             return;
         }
-        this.baseState.neighborChanged(bjw, fk, Blocks.AIR, fk, false);
-        this.base.onPlace(this.baseState, bjw, fk, byj4, false);
+        this.baseState.neighborChanged(bqb, fu, Blocks.AIR, fu, false);
+        this.base.onPlace(this.baseState, bqb, fu, cfj4, false);
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        this.baseState.onRemove(bjw, fk, byj4, boolean5);
+        this.baseState.onRemove(bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public void stepOn(final Level bjw, final BlockPos fk, final Entity akq) {
-        this.base.stepOn(bjw, fk, akq);
+    public void stepOn(final Level bqb, final BlockPos fu, final Entity aom) {
+        this.base.stepOn(bqb, fu, aom);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        this.base.tick(byj, xd, fk, random);
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return this.base.isRandomlyTicking(cfj);
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        return this.baseState.use(bjw, ayj, ajk, cvg);
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        this.base.randomTick(cfj, zd, fu, random);
     }
     
     @Override
-    public void wasExploded(final Level bjw, final BlockPos fk, final Explosion bjp) {
-        this.base.wasExploded(bjw, fk, bjp);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        this.base.tick(cfj, zd, fu, random);
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final Direction fp3 = bcq.getClickedFace();
-        final BlockPos fk4 = bcq.getClickedPos();
-        final FluidState coj5 = bcq.getLevel().getFluidState(fk4);
-        final BlockState byj6 = ((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)StairBlock.FACING, bcq.getHorizontalDirection())).setValue(StairBlock.HALF, (fp3 == Direction.DOWN || (fp3 != Direction.UP && bcq.getClickLocation().y - fk4.getY() > 0.5)) ? Half.TOP : Half.BOTTOM)).<Comparable, Boolean>setValue((Property<Comparable>)StairBlock.WATERLOGGED, coj5.getType() == Fluids.WATER);
-        return ((AbstractStateHolder<O, BlockState>)byj6).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, getStairsShape(byj6, bcq.getLevel(), fk4));
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        return this.baseState.use(bqb, bec, anf, deh);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)StairBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public void wasExploded(final Level bqb, final BlockPos fu, final Explosion bpt) {
+        this.base.wasExploded(bqb, fu, bpt);
+    }
+    
+    @Override
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final Direction fz3 = bin.getClickedFace();
+        final BlockPos fu4 = bin.getClickedPos();
+        final FluidState cxa5 = bin.getLevel().getFluidState(fu4);
+        final BlockState cfj6 = ((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)StairBlock.FACING, bin.getHorizontalDirection())).setValue(StairBlock.HALF, (fz3 == Direction.DOWN || (fz3 != Direction.UP && bin.getClickLocation().y - fu4.getY() > 0.5)) ? Half.TOP : Half.BOTTOM)).<Comparable, Boolean>setValue((Property<Comparable>)StairBlock.WATERLOGGED, cxa5.getType() == Fluids.WATER);
+        return ((StateHolder<O, BlockState>)cfj6).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, getStairsShape(cfj6, bin.getLevel(), fu4));
+    }
+    
+    @Override
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)StairBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        if (fp.getAxis().isHorizontal()) {
-            return ((AbstractStateHolder<O, BlockState>)byj1).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, getStairsShape(byj1, bjx, fk5));
+        if (fz.getAxis().isHorizontal()) {
+            return ((StateHolder<O, BlockState>)cfj1).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, getStairsShape(cfj1, bqc, fu5));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
-    private static StairsShape getStairsShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        final Direction fp4 = byj.<Direction>getValue((Property<Direction>)StairBlock.FACING);
-        final BlockState byj2 = bjg.getBlockState(fk.relative(fp4));
-        if (isStairs(byj2) && byj.<Half>getValue(StairBlock.HALF) == byj2.<Half>getValue(StairBlock.HALF)) {
-            final Direction fp5 = byj2.<Direction>getValue((Property<Direction>)StairBlock.FACING);
-            if (fp5.getAxis() != byj.<Direction>getValue((Property<Direction>)StairBlock.FACING).getAxis() && canTakeShape(byj, bjg, fk, fp5.getOpposite())) {
-                if (fp5 == fp4.getCounterClockWise()) {
+    private static StairsShape getStairsShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        final Direction fz4 = cfj.<Direction>getValue((Property<Direction>)StairBlock.FACING);
+        final BlockState cfj2 = bpg.getBlockState(fu.relative(fz4));
+        if (isStairs(cfj2) && cfj.<Half>getValue(StairBlock.HALF) == cfj2.<Half>getValue(StairBlock.HALF)) {
+            final Direction fz5 = cfj2.<Direction>getValue((Property<Direction>)StairBlock.FACING);
+            if (fz5.getAxis() != cfj.<Direction>getValue((Property<Direction>)StairBlock.FACING).getAxis() && canTakeShape(cfj, bpg, fu, fz5.getOpposite())) {
+                if (fz5 == fz4.getCounterClockWise()) {
                     return StairsShape.OUTER_LEFT;
                 }
                 return StairsShape.OUTER_RIGHT;
             }
         }
-        final BlockState byj3 = bjg.getBlockState(fk.relative(fp4.getOpposite()));
-        if (isStairs(byj3) && byj.<Half>getValue(StairBlock.HALF) == byj3.<Half>getValue(StairBlock.HALF)) {
-            final Direction fp6 = byj3.<Direction>getValue((Property<Direction>)StairBlock.FACING);
-            if (fp6.getAxis() != byj.<Direction>getValue((Property<Direction>)StairBlock.FACING).getAxis() && canTakeShape(byj, bjg, fk, fp6)) {
-                if (fp6 == fp4.getCounterClockWise()) {
+        final BlockState cfj3 = bpg.getBlockState(fu.relative(fz4.getOpposite()));
+        if (isStairs(cfj3) && cfj.<Half>getValue(StairBlock.HALF) == cfj3.<Half>getValue(StairBlock.HALF)) {
+            final Direction fz6 = cfj3.<Direction>getValue((Property<Direction>)StairBlock.FACING);
+            if (fz6.getAxis() != cfj.<Direction>getValue((Property<Direction>)StairBlock.FACING).getAxis() && canTakeShape(cfj, bpg, fu, fz6)) {
+                if (fz6 == fz4.getCounterClockWise()) {
                     return StairsShape.INNER_LEFT;
                 }
                 return StairsShape.INNER_RIGHT;
@@ -203,68 +209,68 @@ public class StairBlock extends Block implements SimpleWaterloggedBlock {
         return StairsShape.STRAIGHT;
     }
     
-    private static boolean canTakeShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        final BlockState byj2 = bjg.getBlockState(fk.relative(fp));
-        return !isStairs(byj2) || byj2.<Comparable>getValue((Property<Comparable>)StairBlock.FACING) != byj.<Comparable>getValue((Property<Comparable>)StairBlock.FACING) || byj2.<Half>getValue(StairBlock.HALF) != byj.<Half>getValue(StairBlock.HALF);
+    private static boolean canTakeShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        final BlockState cfj2 = bpg.getBlockState(fu.relative(fz));
+        return !isStairs(cfj2) || cfj2.<Comparable>getValue((Property<Comparable>)StairBlock.FACING) != cfj.<Comparable>getValue((Property<Comparable>)StairBlock.FACING) || cfj2.<Half>getValue(StairBlock.HALF) != cfj.<Half>getValue(StairBlock.HALF);
     }
     
-    public static boolean isStairs(final BlockState byj) {
-        return byj.getBlock() instanceof StairBlock;
+    public static boolean isStairs(final BlockState cfj) {
+        return cfj.getBlock() instanceof StairBlock;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)StairBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)StairBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        final Direction fp4 = byj.<Direction>getValue((Property<Direction>)StairBlock.FACING);
-        final StairsShape bzq5 = byj.<StairsShape>getValue(StairBlock.SHAPE);
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        final Direction fz4 = cfj.<Direction>getValue((Property<Direction>)StairBlock.FACING);
+        final StairsShape cgp5 = cfj.<StairsShape>getValue(StairBlock.SHAPE);
         Label_0335: {
-            switch (bsu) {
+            switch (bzj) {
                 case LEFT_RIGHT: {
-                    if (fp4.getAxis() != Direction.Axis.Z) {
+                    if (fz4.getAxis() != Direction.Axis.Z) {
                         break;
                     }
-                    switch (bzq5) {
+                    switch (cgp5) {
                         case INNER_LEFT: {
-                            return ((AbstractStateHolder<O, BlockState>)byj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.INNER_RIGHT);
+                            return ((StateHolder<O, BlockState>)cfj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.INNER_RIGHT);
                         }
                         case INNER_RIGHT: {
-                            return ((AbstractStateHolder<O, BlockState>)byj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.INNER_LEFT);
+                            return ((StateHolder<O, BlockState>)cfj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.INNER_LEFT);
                         }
                         case OUTER_LEFT: {
-                            return ((AbstractStateHolder<O, BlockState>)byj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_RIGHT);
+                            return ((StateHolder<O, BlockState>)cfj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_RIGHT);
                         }
                         case OUTER_RIGHT: {
-                            return ((AbstractStateHolder<O, BlockState>)byj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_LEFT);
+                            return ((StateHolder<O, BlockState>)cfj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_LEFT);
                         }
                         default: {
-                            return byj.rotate(Rotation.CLOCKWISE_180);
+                            return cfj.rotate(Rotation.CLOCKWISE_180);
                         }
                     }
                     break;
                 }
                 case FRONT_BACK: {
-                    if (fp4.getAxis() != Direction.Axis.X) {
+                    if (fz4.getAxis() != Direction.Axis.X) {
                         break;
                     }
-                    switch (bzq5) {
+                    switch (cgp5) {
                         case INNER_LEFT: {
-                            return ((AbstractStateHolder<O, BlockState>)byj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.INNER_LEFT);
+                            return ((StateHolder<O, BlockState>)cfj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.INNER_LEFT);
                         }
                         case INNER_RIGHT: {
-                            return ((AbstractStateHolder<O, BlockState>)byj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.INNER_RIGHT);
+                            return ((StateHolder<O, BlockState>)cfj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.INNER_RIGHT);
                         }
                         case OUTER_LEFT: {
-                            return ((AbstractStateHolder<O, BlockState>)byj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_RIGHT);
+                            return ((StateHolder<O, BlockState>)cfj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_RIGHT);
                         }
                         case OUTER_RIGHT: {
-                            return ((AbstractStateHolder<O, BlockState>)byj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_LEFT);
+                            return ((StateHolder<O, BlockState>)cfj.rotate(Rotation.CLOCKWISE_180)).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_LEFT);
                         }
                         case STRAIGHT: {
-                            return byj.rotate(Rotation.CLOCKWISE_180);
+                            return cfj.rotate(Rotation.CLOCKWISE_180);
                         }
                         default: {
                             break Label_0335;
@@ -274,7 +280,7 @@ public class StairBlock extends Block implements SimpleWaterloggedBlock {
                 }
             }
         }
-        return super.mirror(byj, bsu);
+        return super.mirror(cfj, bzj);
     }
     
     @Override
@@ -283,15 +289,15 @@ public class StairBlock extends Block implements SimpleWaterloggedBlock {
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)StairBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)StairBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/StandingSignBlock.java b/src/net/minecraft/world/level/block/StandingSignBlock.java
index fa5f713..7f6c143 100644
--- a/src/net/minecraft/world/level/block/StandingSignBlock.java
+++ b/src/net/minecraft/world/level/block/StandingSignBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.LevelAccessor;
@@ -14,43 +14,44 @@ import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.WoodType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
 public class StandingSignBlock extends SignBlock {
     public static final IntegerProperty ROTATION;
     
-    public StandingSignBlock(final Properties c, final WoodType bzs) {
-        super(c, bzs);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)StandingSignBlock.ROTATION, 0)).<Comparable, Boolean>setValue((Property<Comparable>)StandingSignBlock.WATERLOGGED, false));
+    public StandingSignBlock(final Properties c, final WoodType cgs) {
+        super(c, cgs);
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)StandingSignBlock.ROTATION, 0)).<Comparable, Boolean>setValue((Property<Comparable>)StandingSignBlock.WATERLOGGED, false));
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return bjz.getBlockState(fk.below()).getMaterial().isSolid();
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return bqd.getBlockState(fu.below()).getMaterial().isSolid();
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final FluidState coj3 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        return (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)StandingSignBlock.ROTATION, Mth.floor((180.0f + bcq.getRotation()) * 16.0f / 360.0f + 0.5) & 0xF)).<Comparable, Boolean>setValue((Property<Comparable>)StandingSignBlock.WATERLOGGED, coj3.getType() == Fluids.WATER);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final FluidState cxa3 = bin.getLevel().getFluidState(bin.getClickedPos());
+        return (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)StandingSignBlock.ROTATION, Mth.floor((180.0f + bin.getRotation()) * 16.0f / 360.0f + 0.5) & 0xF)).<Comparable, Boolean>setValue((Property<Comparable>)StandingSignBlock.WATERLOGGED, cxa3.getType() == Fluids.WATER);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN && !this.canSurvive(byj1, bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN && !this.canSurvive(cfj1, bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)StandingSignBlock.ROTATION, btu.rotate(byj.<Integer>getValue((Property<Integer>)StandingSignBlock.ROTATION), 16));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)StandingSignBlock.ROTATION, cap.rotate(cfj.<Integer>getValue((Property<Integer>)StandingSignBlock.ROTATION), 16));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)StandingSignBlock.ROTATION, bsu.mirror(byj.<Integer>getValue((Property<Integer>)StandingSignBlock.ROTATION), 16));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)StandingSignBlock.ROTATION, bzj.mirror(cfj.<Integer>getValue((Property<Integer>)StandingSignBlock.ROTATION), 16));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/StemBlock.java b/src/net/minecraft/world/level/block/StemBlock.java
index 522fdf8..7c17896 100644
--- a/src/net/minecraft/world/level/block/StemBlock.java
+++ b/src/net/minecraft/world/level/block/StemBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.util.Mth;
@@ -18,6 +18,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -26,42 +27,41 @@ public class StemBlock extends BushBlock implements BonemealableBlock {
     protected static final VoxelShape[] SHAPE_BY_AGE;
     private final StemGrownBlock fruit;
     
-    protected StemBlock(final StemGrownBlock buv, final Properties c) {
+    protected StemBlock(final StemGrownBlock cbq, final Properties c) {
         super(c);
-        this.fruit = buv;
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)StemBlock.AGE, 0));
+        this.fruit = cbq;
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)StemBlock.AGE, 0));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return StemBlock.SHAPE_BY_AGE[byj.<Integer>getValue((Property<Integer>)StemBlock.AGE)];
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return StemBlock.SHAPE_BY_AGE[cfj.<Integer>getValue((Property<Integer>)StemBlock.AGE)];
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.getBlock() == Blocks.FARMLAND;
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.is(Blocks.FARMLAND);
     }
     
     @Override
-    public void tick(BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        super.tick(byj, xd, fk, random);
-        if (xd.getRawBrightness(fk, 0) < 9) {
+    public void randomTick(BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (zd.getRawBrightness(fu, 0) < 9) {
             return;
         }
-        final float float6 = CropBlock.getGrowthSpeed(this, xd, fk);
+        final float float6 = CropBlock.getGrowthSpeed(this, zd, fu);
         if (random.nextInt((int)(25.0f / float6) + 1) == 0) {
-            final int integer7 = byj.<Integer>getValue((Property<Integer>)StemBlock.AGE);
+            final int integer7 = cfj.<Integer>getValue((Property<Integer>)StemBlock.AGE);
             if (integer7 < 7) {
-                byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)StemBlock.AGE, integer7 + 1);
-                xd.setBlock(fk, byj, 2);
+                cfj = ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)StemBlock.AGE, integer7 + 1);
+                zd.setBlock(fu, cfj, 2);
             }
             else {
-                final Direction fp8 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
-                final BlockPos fk2 = fk.relative(fp8);
-                final Block bph10 = xd.getBlockState(fk2.below()).getBlock();
-                if (xd.getBlockState(fk2).isAir() && (bph10 == Blocks.FARMLAND || bph10 == Blocks.DIRT || bph10 == Blocks.COARSE_DIRT || bph10 == Blocks.PODZOL || bph10 == Blocks.GRASS_BLOCK)) {
-                    xd.setBlockAndUpdate(fk2, this.fruit.defaultBlockState());
-                    xd.setBlockAndUpdate(fk, ((AbstractStateHolder<O, BlockState>)this.fruit.getAttachedStem().defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)HorizontalDirectionalBlock.FACING, fp8));
+                final Direction fz8 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
+                final BlockPos fu2 = fu.relative(fz8);
+                final BlockState cfj2 = zd.getBlockState(fu2.below());
+                if (zd.getBlockState(fu2).isAir() && (cfj2.is(Blocks.FARMLAND) || cfj2.is(Blocks.DIRT) || cfj2.is(Blocks.COARSE_DIRT) || cfj2.is(Blocks.PODZOL) || cfj2.is(Blocks.GRASS_BLOCK))) {
+                    zd.setBlockAndUpdate(fu2, this.fruit.defaultBlockState());
+                    zd.setBlockAndUpdate(fu, ((StateHolder<O, BlockState>)this.fruit.getAttachedStem().defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)HorizontalDirectionalBlock.FACING, fz8));
                 }
             }
         }
@@ -79,28 +79,28 @@ public class StemBlock extends BushBlock implements BonemealableBlock {
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
-        final Item bei5 = this.getSeedItem();
-        return (bei5 == null) ? ItemStack.EMPTY : new ItemStack(bei5);
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        final Item bke5 = this.getSeedItem();
+        return (bke5 == null) ? ItemStack.EMPTY : new ItemStack(bke5);
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        return byj.<Integer>getValue((Property<Integer>)StemBlock.AGE) != 7;
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        return cfj.<Integer>getValue((Property<Integer>)StemBlock.AGE) != 7;
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        final int integer6 = Math.min(7, byj.<Integer>getValue((Property<Integer>)StemBlock.AGE) + Mth.nextInt(xd.random, 2, 5));
-        final BlockState byj2 = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)StemBlock.AGE, integer6);
-        xd.setBlock(fk, byj2, 2);
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        final int integer6 = Math.min(7, cfj.<Integer>getValue((Property<Integer>)StemBlock.AGE) + Mth.nextInt(zd.random, 2, 5));
+        final BlockState cfj2 = ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)StemBlock.AGE, integer6);
+        zd.setBlock(fu, cfj2, 2);
         if (integer6 == 7) {
-            byj2.tick(xd, fk, xd.random);
+            cfj2.randomTick(zd, fu, zd.random);
         }
     }
     
diff --git a/src/net/minecraft/world/level/block/StemGrownBlock.java b/src/net/minecraft/world/level/block/StemGrownBlock.java
index bb74af7..f2b5fd3 100644
--- a/src/net/minecraft/world/level/block/StemGrownBlock.java
+++ b/src/net/minecraft/world/level/block/StemGrownBlock.java
@@ -1,5 +1,7 @@
 package net.minecraft.world.level.block;
 
+import net.minecraft.world.level.block.state.BlockBehaviour;
+
 public abstract class StemGrownBlock extends Block {
     public StemGrownBlock(final Properties c) {
         super(c);
diff --git a/src/net/minecraft/world/level/block/StoneButtonBlock.java b/src/net/minecraft/world/level/block/StoneButtonBlock.java
index 666977a..903426c 100644
--- a/src/net/minecraft/world/level/block/StoneButtonBlock.java
+++ b/src/net/minecraft/world/level/block/StoneButtonBlock.java
@@ -2,6 +2,7 @@ package net.minecraft.world.level.block;
 
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class StoneButtonBlock extends ButtonBlock {
     protected StoneButtonBlock(final Properties c) {
diff --git a/src/net/minecraft/world/level/block/StonecutterBlock.java b/src/net/minecraft/world/level/block/StonecutterBlock.java
index 07d6137..c55cef9 100644
--- a/src/net/minecraft/world/level/block/StonecutterBlock.java
+++ b/src/net/minecraft/world/level/block/StonecutterBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.level.pathfinder.PathComputationType;
@@ -24,6 +24,7 @@ import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.network.chat.TranslatableComponent;
@@ -35,53 +36,53 @@ public class StonecutterBlock extends Block {
     
     public StonecutterBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)StonecutterBlock.FACING, Direction.NORTH));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)StonecutterBlock.FACING, Direction.NORTH));
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StonecutterBlock.FACING, bcq.getHorizontalDirection().getOpposite());
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StonecutterBlock.FACING, bin.getHorizontalDirection().getOpposite());
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (bjw.isClientSide) {
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (bqb.isClientSide) {
             return InteractionResult.SUCCESS;
         }
-        ayj.openMenu(byj.getMenuProvider(bjw, fk));
-        ayj.awardStat(Stats.INTERACT_WITH_STONECUTTER);
-        return InteractionResult.SUCCESS;
+        bec.openMenu(cfj.getMenuProvider(bqb, fu));
+        bec.awardStat(Stats.INTERACT_WITH_STONECUTTER);
+        return InteractionResult.CONSUME;
     }
     
     @Nullable
     @Override
-    public MenuProvider getMenuProvider(final BlockState byj, final Level bjw, final BlockPos fk) {
-        return new SimpleMenuProvider((integer, ayi, ayj) -> new StonecutterMenu(integer, ayi, ContainerLevelAccess.create(bjw, fk)), StonecutterBlock.CONTAINER_TITLE);
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return new SimpleMenuProvider((integer, beb, bec) -> new StonecutterMenu(integer, beb, ContainerLevelAccess.create(bqb, fu)), StonecutterBlock.CONTAINER_TITLE);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return StonecutterBlock.SHAPE;
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)StonecutterBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)StonecutterBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)StonecutterBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)StonecutterBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)StonecutterBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)StonecutterBlock.FACING)));
     }
     
     @Override
@@ -90,12 +91,12 @@ public class StonecutterBlock extends Block {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
     static {
-        CONTAINER_TITLE = new TranslatableComponent("container.stonecutter", new Object[0]);
+        CONTAINER_TITLE = new TranslatableComponent("container.stonecutter");
         FACING = HorizontalDirectionalBlock.FACING;
         SHAPE = Block.box(0.0, 0.0, 0.0, 16.0, 9.0, 16.0);
     }
diff --git a/src/net/minecraft/world/level/block/StructureBlock.java b/src/net/minecraft/world/level/block/StructureBlock.java
index fbc25b4..3baf8e9 100644
--- a/src/net/minecraft/world/level/block/StructureBlock.java
+++ b/src/net/minecraft/world/level/block/StructureBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
@@ -18,6 +18,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.entity.StructureBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.StructureMode;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 
@@ -29,40 +30,40 @@ public class StructureBlock extends BaseEntityBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new StructureBlockEntity();
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk);
-        if (bwl8 instanceof StructureBlockEntity) {
-            return ((StructureBlockEntity)bwl8).usedBy(ayj) ? InteractionResult.SUCCESS : InteractionResult.PASS;
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu);
+        if (cdl8 instanceof StructureBlockEntity) {
+            return ((StructureBlockEntity)cdl8).usedBy(bec) ? InteractionResult.sidedSuccess(bqb.isClientSide) : InteractionResult.PASS;
         }
         return InteractionResult.PASS;
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, @Nullable final LivingEntity akz, final ItemStack ben) {
-        if (bjw.isClientSide) {
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
+        if (bqb.isClientSide) {
             return;
         }
-        if (akz != null) {
-            final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-            if (bwl7 instanceof StructureBlockEntity) {
-                ((StructureBlockEntity)bwl7).createdBy(akz);
+        if (aoy != null) {
+            final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+            if (cdl7 instanceof StructureBlockEntity) {
+                ((StructureBlockEntity)cdl7).createdBy(aoy);
             }
         }
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.MODEL;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<StructureMode, StructureMode>setValue(StructureBlock.MODE, StructureMode.DATA);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return ((StateHolder<O, BlockState>)this.defaultBlockState()).<StructureMode, StructureMode>setValue(StructureBlock.MODE, StructureMode.DATA);
     }
     
     @Override
@@ -71,38 +72,38 @@ public class StructureBlock extends BaseEntityBlock {
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (bjw.isClientSide) {
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (bqb.isClientSide) {
             return;
         }
-        final BlockEntity bwl8 = bjw.getBlockEntity(fk3);
-        if (!(bwl8 instanceof StructureBlockEntity)) {
+        final BlockEntity cdl8 = bqb.getBlockEntity(fu3);
+        if (!(cdl8 instanceof StructureBlockEntity)) {
             return;
         }
-        final StructureBlockEntity bxl9 = (StructureBlockEntity)bwl8;
-        final boolean boolean7 = bjw.hasNeighborSignal(fk3);
-        final boolean boolean8 = bxl9.isPowered();
+        final StructureBlockEntity cel9 = (StructureBlockEntity)cdl8;
+        final boolean boolean7 = bqb.hasNeighborSignal(fu3);
+        final boolean boolean8 = cel9.isPowered();
         if (boolean7 && !boolean8) {
-            bxl9.setPowered(true);
-            this.trigger(bxl9);
+            cel9.setPowered(true);
+            this.trigger(cel9);
         }
         else if (!boolean7 && boolean8) {
-            bxl9.setPowered(false);
+            cel9.setPowered(false);
         }
     }
     
-    private void trigger(final StructureBlockEntity bxl) {
-        switch (bxl.getMode()) {
+    private void trigger(final StructureBlockEntity cel) {
+        switch (cel.getMode()) {
             case SAVE: {
-                bxl.saveStructure(false);
+                cel.saveStructure(false);
                 break;
             }
             case LOAD: {
-                bxl.loadStructure(false);
+                cel.loadStructure(false);
                 break;
             }
             case CORNER: {
-                bxl.unloadStructure();
+                cel.unloadStructure();
             }
         }
     }
diff --git a/src/net/minecraft/world/level/block/StructureVoidBlock.java b/src/net/minecraft/world/level/block/StructureVoidBlock.java
index c3c7c95..e73b9b4 100644
--- a/src/net/minecraft/world/level/block/StructureVoidBlock.java
+++ b/src/net/minecraft/world/level/block/StructureVoidBlock.java
@@ -5,6 +5,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class StructureVoidBlock extends Block {
@@ -15,22 +16,22 @@ public class StructureVoidBlock extends Block {
     }
     
     @Override
-    public RenderShape getRenderShape(final BlockState byj) {
+    public RenderShape getRenderShape(final BlockState cfj) {
         return RenderShape.INVISIBLE;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return StructureVoidBlock.SHAPE;
     }
     
     @Override
-    public float getShadeBrightness(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
+    public float getShadeBrightness(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
         return 1.0f;
     }
     
     @Override
-    public PushReaction getPistonPushReaction(final BlockState byj) {
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
         return PushReaction.DESTROY;
     }
     
diff --git a/src/net/minecraft/world/level/block/SugarCaneBlock.java b/src/net/minecraft/world/level/block/SugarCaneBlock.java
index d47cf9d..7decb0a 100644
--- a/src/net/minecraft/world/level/block/SugarCaneBlock.java
+++ b/src/net/minecraft/world/level/block/SugarCaneBlock.java
@@ -1,10 +1,12 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.material.FluidState;
 import java.util.Iterator;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.Direction;
@@ -16,6 +18,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -25,55 +28,59 @@ public class SugarCaneBlock extends Block {
     
     protected SugarCaneBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)SugarCaneBlock.AGE, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)SugarCaneBlock.AGE, 0));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return SugarCaneBlock.SHAPE;
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!byj.canSurvive(xd, fk)) {
-            xd.destroyBlock(fk, true);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!cfj.canSurvive(zd, fu)) {
+            zd.destroyBlock(fu, true);
         }
-        else if (xd.isEmptyBlock(fk.above())) {
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (zd.isEmptyBlock(fu.above())) {
             int integer6;
-            for (integer6 = 1; xd.getBlockState(fk.below(integer6)).getBlock() == this; ++integer6) {}
+            for (integer6 = 1; zd.getBlockState(fu.below(integer6)).is(this); ++integer6) {}
             if (integer6 < 3) {
-                final int integer7 = byj.<Integer>getValue((Property<Integer>)SugarCaneBlock.AGE);
+                final int integer7 = cfj.<Integer>getValue((Property<Integer>)SugarCaneBlock.AGE);
                 if (integer7 == 15) {
-                    xd.setBlockAndUpdate(fk.above(), this.defaultBlockState());
-                    xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)SugarCaneBlock.AGE, 0), 4);
+                    zd.setBlockAndUpdate(fu.above(), this.defaultBlockState());
+                    zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)SugarCaneBlock.AGE, 0), 4);
                 }
                 else {
-                    xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)SugarCaneBlock.AGE, integer7 + 1), 4);
+                    zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)SugarCaneBlock.AGE, integer7 + 1), 4);
                 }
             }
         }
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
-            bjx.getBlockTicks().scheduleTick(fk5, this, 1);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj1.canSurvive(bqc, fu5)) {
+            bqc.getBlockTicks().scheduleTick(fu5, this, 1);
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final Block bph5 = bjz.getBlockState(fk.below()).getBlock();
-        if (bph5 == this) {
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockState cfj2 = bqd.getBlockState(fu.below());
+        if (cfj2.getBlock() == this) {
             return true;
         }
-        if (bph5 == Blocks.GRASS_BLOCK || bph5 == Blocks.DIRT || bph5 == Blocks.COARSE_DIRT || bph5 == Blocks.PODZOL || bph5 == Blocks.SAND || bph5 == Blocks.RED_SAND) {
-            final BlockPos fk2 = fk.below();
-            for (final Direction fp8 : Direction.Plane.HORIZONTAL) {
-                final BlockState byj2 = bjz.getBlockState(fk2.relative(fp8));
-                final FluidState coj10 = bjz.getFluidState(fk2.relative(fp8));
-                if (coj10.is(FluidTags.WATER) || byj2.getBlock() == Blocks.FROSTED_ICE) {
+        if (cfj2.is(Blocks.GRASS_BLOCK) || cfj2.is(Blocks.DIRT) || cfj2.is(Blocks.COARSE_DIRT) || cfj2.is(Blocks.PODZOL) || cfj2.is(Blocks.SAND) || cfj2.is(Blocks.RED_SAND)) {
+            final BlockPos fu2 = fu.below();
+            for (final Direction fz8 : Direction.Plane.HORIZONTAL) {
+                final BlockState cfj3 = bqd.getBlockState(fu2.relative(fz8));
+                final FluidState cxa10 = bqd.getFluidState(fu2.relative(fz8));
+                if (cxa10.is(FluidTags.WATER) || cfj3.is(Blocks.FROSTED_ICE)) {
                     return true;
                 }
             }
diff --git a/src/net/minecraft/world/level/block/SweetBerryBushBlock.java b/src/net/minecraft/world/level/block/SweetBerryBushBlock.java
index 9fce3ee..9d86959 100644
--- a/src/net/minecraft/world/level/block/SweetBerryBushBlock.java
+++ b/src/net/minecraft/world/level/block/SweetBerryBushBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.sounds.SoundSource;
@@ -25,6 +25,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
@@ -35,64 +36,68 @@ public class SweetBerryBushBlock extends BushBlock implements BonemealableBlock
     
     public SweetBerryBushBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, 0));
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return new ItemStack(Items.SWEET_BERRIES);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (byj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) == 0) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        if (cfj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) == 0) {
             return SweetBerryBushBlock.SAPLING_SHAPE;
         }
-        if (byj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) < 3) {
+        if (cfj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) < 3) {
             return SweetBerryBushBlock.MID_GROWTH_SHAPE;
         }
-        return super.getShape(byj, bjg, fk, cvq);
+        return super.getShape(cfj, bpg, fu, der);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        super.tick(byj, xd, fk, random);
-        final int integer6 = byj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE);
-        if (integer6 < 3 && random.nextInt(5) == 0 && xd.getRawBrightness(fk.above(), 0) >= 9) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, integer6 + 1), 2);
+    public boolean isRandomlyTicking(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) < 3;
+    }
+    
+    @Override
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        final int integer6 = cfj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE);
+        if (integer6 < 3 && random.nextInt(5) == 0 && zd.getRawBrightness(fu.above(), 0) >= 9) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, integer6 + 1), 2);
         }
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (!(akq instanceof LivingEntity) || akq.getType() == EntityType.FOX || akq.getType() == EntityType.BEE) {
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (!(aom instanceof LivingEntity) || aom.getType() == EntityType.FOX || aom.getType() == EntityType.BEE) {
             return;
         }
-        akq.makeStuckInBlock(byj, new Vec3(0.800000011920929, 0.75, 0.800000011920929));
-        if (!bjw.isClientSide && byj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) > 0 && (akq.xOld != akq.getX() || akq.zOld != akq.getZ())) {
-            final double double6 = Math.abs(akq.getX() - akq.xOld);
-            final double double7 = Math.abs(akq.getZ() - akq.zOld);
+        aom.makeStuckInBlock(cfj, new Vec3(0.800000011920929, 0.75, 0.800000011920929));
+        if (!bqb.isClientSide && cfj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) > 0 && (aom.xOld != aom.getX() || aom.zOld != aom.getZ())) {
+            final double double6 = Math.abs(aom.getX() - aom.xOld);
+            final double double7 = Math.abs(aom.getZ() - aom.zOld);
             if (double6 >= 0.003000000026077032 || double7 >= 0.003000000026077032) {
-                akq.hurt(DamageSource.SWEET_BERRY_BUSH, 1.0f);
+                aom.hurt(DamageSource.SWEET_BERRY_BUSH, 1.0f);
             }
         }
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final int integer8 = byj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE);
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final int integer8 = cfj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE);
         final boolean boolean9 = integer8 == 3;
-        if (!boolean9 && ayj.getItemInHand(ajk).getItem() == Items.BONE_MEAL) {
+        if (!boolean9 && bec.getItemInHand(anf).getItem() == Items.BONE_MEAL) {
             return InteractionResult.PASS;
         }
         if (integer8 > 1) {
-            final int integer9 = 1 + bjw.random.nextInt(2);
-            Block.popResource(bjw, fk, new ItemStack(Items.SWEET_BERRIES, integer9 + (boolean9 ? 1 : 0)));
-            bjw.playSound(null, fk, SoundEvents.SWEET_BERRY_BUSH_PICK_BERRIES, SoundSource.BLOCKS, 1.0f, 0.8f + bjw.random.nextFloat() * 0.4f);
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, 1), 2);
-            return InteractionResult.SUCCESS;
+            final int integer9 = 1 + bqb.random.nextInt(2);
+            Block.popResource(bqb, fu, new ItemStack(Items.SWEET_BERRIES, integer9 + (boolean9 ? 1 : 0)));
+            bqb.playSound(null, fu, SoundEvents.SWEET_BERRY_BUSH_PICK_BERRIES, SoundSource.BLOCKS, 1.0f, 0.8f + bqb.random.nextFloat() * 0.4f);
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, 1), 2);
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
-        return super.use(byj, bjw, fk, ayj, ajk, cvg);
+        return super.use(cfj, bqb, fu, bec, anf, deh);
     }
     
     @Override
@@ -101,19 +106,19 @@ public class SweetBerryBushBlock extends BushBlock implements BonemealableBlock
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        return byj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) < 3;
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+        return cfj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) < 3;
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        final int integer6 = Math.min(3, byj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) + 1);
-        xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, integer6), 2);
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        final int integer6 = Math.min(3, cfj.<Integer>getValue((Property<Integer>)SweetBerryBushBlock.AGE) + 1);
+        zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)SweetBerryBushBlock.AGE, integer6), 2);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/TallFlowerBlock.java b/src/net/minecraft/world/level/block/TallFlowerBlock.java
index 2661531..59b1c2e 100644
--- a/src/net/minecraft/world/level/block/TallFlowerBlock.java
+++ b/src/net/minecraft/world/level/block/TallFlowerBlock.java
@@ -9,6 +9,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class TallFlowerBlock extends DoublePlantBlock implements BonemealableBlock {
     public TallFlowerBlock(final Properties c) {
@@ -16,22 +17,22 @@ public class TallFlowerBlock extends DoublePlantBlock implements BonemealableBlo
     }
     
     @Override
-    public boolean canBeReplaced(final BlockState byj, final BlockPlaceContext bcq) {
+    public boolean canBeReplaced(final BlockState cfj, final BlockPlaceContext bin) {
         return false;
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
         return true;
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        Block.popResource(xd, fk, new ItemStack(this));
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        Block.popResource(zd, fu, new ItemStack(this));
     }
 }
diff --git a/src/net/minecraft/world/level/block/TallGrassBlock.java b/src/net/minecraft/world/level/block/TallGrassBlock.java
index a875087..9f0baca 100644
--- a/src/net/minecraft/world/level/block/TallGrassBlock.java
+++ b/src/net/minecraft/world/level/block/TallGrassBlock.java
@@ -9,6 +9,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class TallGrassBlock extends BushBlock implements BonemealableBlock {
@@ -19,25 +20,25 @@ public class TallGrassBlock extends BushBlock implements BonemealableBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return TallGrassBlock.SHAPE;
     }
     
     @Override
-    public boolean isValidBonemealTarget(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final boolean boolean4) {
+    public boolean isValidBonemealTarget(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
         return true;
     }
     
     @Override
-    public boolean isBonemealSuccess(final Level bjw, final Random random, final BlockPos fk, final BlockState byj) {
+    public boolean isBonemealSuccess(final Level bqb, final Random random, final BlockPos fu, final BlockState cfj) {
         return true;
     }
     
     @Override
-    public void performBonemeal(final ServerLevel xd, final Random random, final BlockPos fk, final BlockState byj) {
-        final DoublePlantBlock bqu6 = (DoublePlantBlock)((this == Blocks.FERN) ? Blocks.LARGE_FERN : Blocks.TALL_GRASS);
-        if (bqu6.defaultBlockState().canSurvive(xd, fk) && xd.isEmptyBlock(fk.above())) {
-            bqu6.placeAt(xd, fk, 2);
+    public void performBonemeal(final ServerLevel zd, final Random random, final BlockPos fu, final BlockState cfj) {
+        final DoublePlantBlock bxg6 = (DoublePlantBlock)((this == Blocks.FERN) ? Blocks.LARGE_FERN : Blocks.TALL_GRASS);
+        if (bxg6.defaultBlockState().canSurvive(zd, fu) && zd.isEmptyBlock(fu.above())) {
+            bxg6.placeAt(zd, fu, 2);
         }
     }
     
diff --git a/src/net/minecraft/world/level/block/TallSeagrass.java b/src/net/minecraft/world/level/block/TallSeagrass.java
index d5687d1..99dafd1 100644
--- a/src/net/minecraft/world/level/block/TallSeagrass.java
+++ b/src/net/minecraft/world/level/block/TallSeagrass.java
@@ -1,12 +1,13 @@
 package net.minecraft.world.level.block;
 
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.LevelReader;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.level.ItemLike;
@@ -16,11 +17,12 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 
-public class TallSeagrass extends ShearableDoublePlantBlock implements LiquidBlockContainer {
+public class TallSeagrass extends DoublePlantBlock implements LiquidBlockContainer {
     public static final EnumProperty<DoubleBlockHalf> HALF;
     protected static final VoxelShape SHAPE;
     
@@ -29,60 +31,60 @@ public class TallSeagrass extends ShearableDoublePlantBlock implements LiquidBlo
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return TallSeagrass.SHAPE;
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return byj.isFaceSturdy(bjg, fk, Direction.UP) && byj.getBlock() != Blocks.MAGMA_BLOCK;
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.isFaceSturdy(bpg, fu, Direction.UP) && !cfj.is(Blocks.MAGMA_BLOCK);
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return new ItemStack(Blocks.SEAGRASS);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockState byj3 = super.getStateForPlacement(bcq);
-        if (byj3 != null) {
-            final FluidState coj4 = bcq.getLevel().getFluidState(bcq.getClickedPos().above());
-            if (coj4.is(FluidTags.WATER) && coj4.getAmount() == 8) {
-                return byj3;
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockState cfj3 = super.getStateForPlacement(bin);
+        if (cfj3 != null) {
+            final FluidState cxa4 = bin.getLevel().getFluidState(bin.getClickedPos().above());
+            if (cxa4.is(FluidTags.WATER) && cxa4.getAmount() == 8) {
+                return cfj3;
             }
         }
         return null;
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        if (byj.<DoubleBlockHalf>getValue(TallSeagrass.HALF) == DoubleBlockHalf.UPPER) {
-            final BlockState byj2 = bjz.getBlockState(fk.below());
-            return byj2.getBlock() == this && byj2.<DoubleBlockHalf>getValue(TallSeagrass.HALF) == DoubleBlockHalf.LOWER;
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        if (cfj.<DoubleBlockHalf>getValue(TallSeagrass.HALF) == DoubleBlockHalf.UPPER) {
+            final BlockState cfj2 = bqd.getBlockState(fu.below());
+            return cfj2.is(this) && cfj2.<DoubleBlockHalf>getValue(TallSeagrass.HALF) == DoubleBlockHalf.LOWER;
         }
-        final FluidState coj5 = bjz.getFluidState(fk);
-        return super.canSurvive(byj, bjz, fk) && coj5.is(FluidTags.WATER) && coj5.getAmount() == 8;
+        final FluidState cxa5 = bqd.getFluidState(fu);
+        return super.canSurvive(cfj, bqd, fu) && cxa5.is(FluidTags.WATER) && cxa5.getAmount() == 8;
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
+    public FluidState getFluidState(final BlockState cfj) {
         return Fluids.WATER.getSource(false);
     }
     
     @Override
-    public boolean canPlaceLiquid(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final Fluid coi) {
+    public boolean canPlaceLiquid(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final Fluid cwz) {
         return false;
     }
     
     @Override
-    public boolean placeLiquid(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final FluidState coj) {
+    public boolean placeLiquid(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final FluidState cxa) {
         return false;
     }
     
     static {
-        HALF = ShearableDoublePlantBlock.HALF;
+        HALF = DoublePlantBlock.HALF;
         SHAPE = Block.box(2.0, 0.0, 2.0, 14.0, 16.0, 14.0);
     }
 }
diff --git a/src/net/minecraft/world/level/block/TargetBlock.java b/src/net/minecraft/world/level/block/TargetBlock.java
new file mode 100644
index 0000000..19315c5
--- /dev/null
+++ b/src/net/minecraft/world/level/block/TargetBlock.java
@@ -0,0 +1,114 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.BlockGetter;
+import java.util.Random;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.util.Mth;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.projectile.AbstractArrow;
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.stats.Stats;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.entity.projectile.Projectile;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.properties.IntegerProperty;
+
+public class TargetBlock extends Block {
+    private static final IntegerProperty OUTPUT_POWER;
+    
+    public TargetBlock(final Properties c) {
+        super(c);
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)TargetBlock.OUTPUT_POWER, 0));
+    }
+    
+    @Override
+    public void onProjectileHit(final Level bqb, final BlockState cfj, final BlockHitResult deh, final Projectile bes) {
+        final int integer6 = updateRedstoneOutput(bqb, cfj, deh, bes);
+        final Entity aom7 = bes.getOwner();
+        if (aom7 instanceof ServerPlayer) {
+            final ServerPlayer ze8 = (ServerPlayer)aom7;
+            ze8.awardStat(Stats.TARGET_HIT);
+            CriteriaTriggers.TARGET_BLOCK_HIT.trigger(ze8, bes, deh.getLocation(), integer6);
+        }
+    }
+    
+    private static int updateRedstoneOutput(final LevelAccessor bqc, final BlockState cfj, final BlockHitResult deh, final Entity aom) {
+        final int integer5 = getRedstoneStrength(deh, deh.getLocation());
+        final int integer6 = (aom instanceof AbstractArrow) ? 20 : 8;
+        if (!bqc.getBlockTicks().hasScheduledTick(deh.getBlockPos(), cfj.getBlock())) {
+            setOutputPower(bqc, cfj, integer5, deh.getBlockPos(), integer6);
+        }
+        return integer5;
+    }
+    
+    private static int getRedstoneStrength(final BlockHitResult deh, final Vec3 dem) {
+        final Direction fz3 = deh.getDirection();
+        final double double4 = Math.abs(Mth.frac(dem.x) - 0.5);
+        final double double5 = Math.abs(Mth.frac(dem.y) - 0.5);
+        final double double6 = Math.abs(Mth.frac(dem.z) - 0.5);
+        final Direction.Axis a12 = fz3.getAxis();
+        double double7;
+        if (a12 == Direction.Axis.Y) {
+            double7 = Math.max(double4, double6);
+        }
+        else if (a12 == Direction.Axis.Z) {
+            double7 = Math.max(double4, double5);
+        }
+        else {
+            double7 = Math.max(double5, double6);
+        }
+        return Math.max(1, Mth.ceil(15.0 * Mth.clamp((0.5 - double7) / 0.5, 0.0, 1.0)));
+    }
+    
+    private static void setOutputPower(final LevelAccessor bqc, final BlockState cfj, final int integer3, final BlockPos fu, final int integer5) {
+        bqc.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)TargetBlock.OUTPUT_POWER, integer3), 3);
+        bqc.getBlockTicks().scheduleTick(fu, cfj.getBlock(), integer5);
+    }
+    
+    @Override
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (cfj.<Integer>getValue((Property<Integer>)TargetBlock.OUTPUT_POWER) != 0) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)TargetBlock.OUTPUT_POWER, 0), 3);
+        }
+    }
+    
+    @Override
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return cfj.<Integer>getValue((Property<Integer>)TargetBlock.OUTPUT_POWER);
+    }
+    
+    @Override
+    public boolean isSignalSource(final BlockState cfj) {
+        return true;
+    }
+    
+    @Override
+    protected void createBlockStateDefinition(final StateDefinition.Builder<Block, BlockState> a) {
+        a.add(TargetBlock.OUTPUT_POWER);
+    }
+    
+    @Override
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (bqb.isClientSide() || cfj1.is(cfj4.getBlock())) {
+            return;
+        }
+        if (cfj1.<Integer>getValue((Property<Integer>)TargetBlock.OUTPUT_POWER) > 0 && !bqb.getBlockTicks().hasScheduledTick(fu, this)) {
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj1).<Comparable, Integer>setValue((Property<Comparable>)TargetBlock.OUTPUT_POWER, 0), 18);
+        }
+    }
+    
+    static {
+        OUTPUT_POWER = BlockStateProperties.POWER;
+    }
+}
diff --git a/src/net/minecraft/world/level/block/TntBlock.java b/src/net/minecraft/world/level/block/TntBlock.java
index dc22074..eeaa56e 100644
--- a/src/net/minecraft/world/level/block/TntBlock.java
+++ b/src/net/minecraft/world/level/block/TntBlock.java
@@ -1,9 +1,9 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.world.entity.projectile.AbstractArrow;
+import net.minecraft.world.entity.projectile.Projectile;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -22,6 +22,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public class TntBlock extends Block {
@@ -29,94 +30,93 @@ public class TntBlock extends Block {
     
     public TntBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)TntBlock.UNSTABLE, false));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)TntBlock.UNSTABLE, false));
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj4.getBlock() == byj1.getBlock()) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj4.is(cfj1.getBlock())) {
             return;
         }
-        if (bjw.hasNeighborSignal(fk)) {
-            explode(bjw, fk);
-            bjw.removeBlock(fk, false);
+        if (bqb.hasNeighborSignal(fu)) {
+            explode(bqb, fu);
+            bqb.removeBlock(fu, false);
         }
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (bjw.hasNeighborSignal(fk3)) {
-            explode(bjw, fk3);
-            bjw.removeBlock(fk3, false);
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (bqb.hasNeighborSignal(fu3)) {
+            explode(bqb, fu3);
+            bqb.removeBlock(fu3, false);
         }
     }
     
     @Override
-    public void playerWillDestroy(final Level bjw, final BlockPos fk, final BlockState byj, final Player ayj) {
-        if (!bjw.isClientSide() && !ayj.isCreative() && byj.<Boolean>getValue((Property<Boolean>)TntBlock.UNSTABLE)) {
-            explode(bjw, fk);
+    public void playerWillDestroy(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        if (!bqb.isClientSide() && !bec.isCreative() && cfj.<Boolean>getValue((Property<Boolean>)TntBlock.UNSTABLE)) {
+            explode(bqb, fu);
         }
-        super.playerWillDestroy(bjw, fk, byj, ayj);
+        super.playerWillDestroy(bqb, fu, cfj, bec);
     }
     
     @Override
-    public void wasExploded(final Level bjw, final BlockPos fk, final Explosion bjp) {
-        if (bjw.isClientSide) {
+    public void wasExploded(final Level bqb, final BlockPos fu, final Explosion bpt) {
+        if (bqb.isClientSide) {
             return;
         }
-        final PrimedTnt awc5 = new PrimedTnt(bjw, fk.getX() + 0.5f, fk.getY(), fk.getZ() + 0.5f, bjp.getSourceMob());
-        awc5.setFuse((short)(bjw.random.nextInt(awc5.getLife() / 4) + awc5.getLife() / 8));
-        bjw.addFreshEntity(awc5);
+        final PrimedTnt bbh5 = new PrimedTnt(bqb, fu.getX() + 0.5, fu.getY(), fu.getZ() + 0.5, bpt.getSourceMob());
+        bbh5.setFuse((short)(bqb.random.nextInt(bbh5.getLife() / 4) + bbh5.getLife() / 8));
+        bqb.addFreshEntity(bbh5);
     }
     
-    public static void explode(final Level bjw, final BlockPos fk) {
-        explode(bjw, fk, null);
+    public static void explode(final Level bqb, final BlockPos fu) {
+        explode(bqb, fu, null);
     }
     
-    private static void explode(final Level bjw, final BlockPos fk, @Nullable final LivingEntity akz) {
-        if (bjw.isClientSide) {
+    private static void explode(final Level bqb, final BlockPos fu, @Nullable final LivingEntity aoy) {
+        if (bqb.isClientSide) {
             return;
         }
-        final PrimedTnt awc4 = new PrimedTnt(bjw, fk.getX() + 0.5, fk.getY(), fk.getZ() + 0.5, akz);
-        bjw.addFreshEntity(awc4);
-        bjw.playSound(null, awc4.getX(), awc4.getY(), awc4.getZ(), SoundEvents.TNT_PRIMED, SoundSource.BLOCKS, 1.0f, 1.0f);
+        final PrimedTnt bbh4 = new PrimedTnt(bqb, fu.getX() + 0.5, fu.getY(), fu.getZ() + 0.5, aoy);
+        bqb.addFreshEntity(bbh4);
+        bqb.playSound(null, bbh4.getX(), bbh4.getY(), bbh4.getZ(), SoundEvents.TNT_PRIMED, SoundSource.BLOCKS, 1.0f, 1.0f);
     }
     
     @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        final ItemStack ben8 = ayj.getItemInHand(ajk);
-        final Item bei9 = ben8.getItem();
-        if (bei9 == Items.FLINT_AND_STEEL || bei9 == Items.FIRE_CHARGE) {
-            explode(bjw, fk, ayj);
-            bjw.setBlock(fk, Blocks.AIR.defaultBlockState(), 11);
-            if (!ayj.isCreative()) {
-                if (bei9 == Items.FLINT_AND_STEEL) {
-                    ben8.<Player>hurtAndBreak(1, ayj, ayj -> ayj.broadcastBreakEvent(ajk));
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        final ItemStack bki8 = bec.getItemInHand(anf);
+        final Item bke9 = bki8.getItem();
+        if (bke9 == Items.FLINT_AND_STEEL || bke9 == Items.FIRE_CHARGE) {
+            explode(bqb, fu, bec);
+            bqb.setBlock(fu, Blocks.AIR.defaultBlockState(), 11);
+            if (!bec.isCreative()) {
+                if (bke9 == Items.FLINT_AND_STEEL) {
+                    bki8.<Player>hurtAndBreak(1, bec, bec -> bec.broadcastBreakEvent(anf));
                 }
                 else {
-                    ben8.shrink(1);
+                    bki8.shrink(1);
                 }
             }
-            return InteractionResult.SUCCESS;
+            return InteractionResult.sidedSuccess(bqb.isClientSide);
         }
-        return super.use(byj, bjw, fk, ayj, ajk, cvg);
+        return super.use(cfj, bqb, fu, bec, anf, deh);
     }
     
     @Override
-    public void onProjectileHit(final Level bjw, final BlockState byj, final BlockHitResult cvg, final Entity akq) {
-        if (!bjw.isClientSide && akq instanceof AbstractArrow) {
-            final AbstractArrow ayn6 = (AbstractArrow)akq;
-            final Entity akq2 = ayn6.getOwner();
-            if (ayn6.isOnFire()) {
-                final BlockPos fk8 = cvg.getBlockPos();
-                explode(bjw, fk8, (akq2 instanceof LivingEntity) ? ((LivingEntity)akq2) : null);
-                bjw.removeBlock(fk8, false);
+    public void onProjectileHit(final Level bqb, final BlockState cfj, final BlockHitResult deh, final Projectile bes) {
+        if (!bqb.isClientSide) {
+            final Entity aom6 = bes.getOwner();
+            if (bes.isOnFire()) {
+                final BlockPos fu7 = deh.getBlockPos();
+                explode(bqb, fu7, (aom6 instanceof LivingEntity) ? ((LivingEntity)aom6) : null);
+                bqb.removeBlock(fu7, false);
             }
         }
     }
     
     @Override
-    public boolean dropFromExplosion(final Explosion bjp) {
+    public boolean dropFromExplosion(final Explosion bpt) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/TorchBlock.java b/src/net/minecraft/world/level/block/TorchBlock.java
index 1a3c9e9..34442b7 100644
--- a/src/net/minecraft/world/level/block/TorchBlock.java
+++ b/src/net/minecraft/world/level/block/TorchBlock.java
@@ -1,6 +1,5 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import java.util.Random;
 import net.minecraft.world.level.Level;
@@ -11,40 +10,44 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class TorchBlock extends Block {
     protected static final VoxelShape AABB;
+    protected final ParticleOptions flameParticle;
     
-    protected TorchBlock(final Properties c) {
+    protected TorchBlock(final Properties c, final ParticleOptions hf) {
         super(c);
+        this.flameParticle = hf;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return TorchBlock.AABB;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN && !this.canSurvive(byj1, bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN && !this.canSurvive(cfj1, bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return Block.canSupportCenter(bjz, fk.below(), Direction.UP);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return Block.canSupportCenter(bqd, fu.below(), Direction.UP);
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        final double double6 = fk.getX() + 0.5;
-        final double double7 = fk.getY() + 0.7;
-        final double double8 = fk.getZ() + 0.5;
-        bjw.addParticle(ParticleTypes.SMOKE, double6, double7, double8, 0.0, 0.0, 0.0);
-        bjw.addParticle(ParticleTypes.FLAME, double6, double7, double8, 0.0, 0.0, 0.0);
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        final double double6 = fu.getX() + 0.5;
+        final double double7 = fu.getY() + 0.7;
+        final double double8 = fu.getZ() + 0.5;
+        bqb.addParticle(ParticleTypes.SMOKE, double6, double7, double8, 0.0, 0.0, 0.0);
+        bqb.addParticle(this.flameParticle, double6, double7, double8, 0.0, 0.0, 0.0);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/TrapDoorBlock.java b/src/net/minecraft/world/level/block/TrapDoorBlock.java
index 681ae0d..1962c55 100644
--- a/src/net/minecraft/world/level/block/TrapDoorBlock.java
+++ b/src/net/minecraft/world/level/block/TrapDoorBlock.java
@@ -1,8 +1,7 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.material.FluidState;
@@ -23,6 +22,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.Half;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
@@ -42,15 +42,15 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
     
     protected TrapDoorBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)TrapDoorBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)TrapDoorBlock.OPEN, false)).setValue(TrapDoorBlock.HALF, Half.BOTTOM)).setValue((Property<Comparable>)TrapDoorBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)TrapDoorBlock.WATERLOGGED, false));
+        this.registerDefaultState(((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)TrapDoorBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)TrapDoorBlock.OPEN, false)).setValue(TrapDoorBlock.HALF, Half.BOTTOM)).setValue((Property<Comparable>)TrapDoorBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)TrapDoorBlock.WATERLOGGED, false));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN)) {
-            return (byj.<Half>getValue(TrapDoorBlock.HALF) == Half.TOP) ? TrapDoorBlock.TOP_AABB : TrapDoorBlock.BOTTOM_AABB;
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN)) {
+            return (cfj.<Half>getValue(TrapDoorBlock.HALF) == Half.TOP) ? TrapDoorBlock.TOP_AABB : TrapDoorBlock.BOTTOM_AABB;
         }
-        switch (byj.<Direction>getValue((Property<Direction>)TrapDoorBlock.FACING)) {
+        switch (cfj.<Direction>getValue((Property<Direction>)TrapDoorBlock.FACING)) {
             default: {
                 return TrapDoorBlock.NORTH_OPEN_AABB;
             }
@@ -67,16 +67,16 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
-        switch (cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        switch (czg) {
             case LAND: {
-                return byj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN);
+                return cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN);
             }
             case WATER: {
-                return byj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.WATERLOGGED);
+                return cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.WATERLOGGED);
             }
             case AIR: {
-                return byj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN);
+                return cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN);
             }
             default: {
                 return false;
@@ -85,63 +85,63 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
     }
     
     @Override
-    public InteractionResult use(BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
+    public InteractionResult use(BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
         if (this.material == Material.METAL) {
             return InteractionResult.PASS;
         }
-        byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable>cycle((Property<Comparable>)TrapDoorBlock.OPEN);
-        bjw.setBlock(fk, byj, 2);
-        if (byj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.WATERLOGGED)) {
-            bjw.getLiquidTicks().scheduleTick(fk, Fluids.WATER, Fluids.WATER.getTickDelay(bjw));
+        cfj = ((StateHolder<O, BlockState>)cfj).<Comparable>cycle((Property<Comparable>)TrapDoorBlock.OPEN);
+        bqb.setBlock(fu, cfj, 2);
+        if (cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.WATERLOGGED)) {
+            bqb.getLiquidTicks().scheduleTick(fu, Fluids.WATER, Fluids.WATER.getTickDelay(bqb));
         }
-        this.playSound(ayj, bjw, fk, byj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN));
-        return InteractionResult.SUCCESS;
+        this.playSound(bec, bqb, fu, cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN));
+        return InteractionResult.sidedSuccess(bqb.isClientSide);
     }
     
-    protected void playSound(@Nullable final Player ayj, final Level bjw, final BlockPos fk, final boolean boolean4) {
+    protected void playSound(@Nullable final Player bec, final Level bqb, final BlockPos fu, final boolean boolean4) {
         if (boolean4) {
             final int integer6 = (this.material == Material.METAL) ? 1037 : 1007;
-            bjw.levelEvent(ayj, integer6, fk, 0);
+            bqb.levelEvent(bec, integer6, fu, 0);
         }
         else {
             final int integer6 = (this.material == Material.METAL) ? 1036 : 1013;
-            bjw.levelEvent(ayj, integer6, fk, 0);
+            bqb.levelEvent(bec, integer6, fu, 0);
         }
     }
     
     @Override
-    public void neighborChanged(BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (bjw.isClientSide) {
+    public void neighborChanged(BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (bqb.isClientSide) {
             return;
         }
-        final boolean boolean7 = bjw.hasNeighborSignal(fk3);
-        if (boolean7 != byj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.POWERED)) {
-            if (byj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN) != boolean7) {
-                byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)TrapDoorBlock.OPEN, boolean7);
-                this.playSound(null, bjw, fk3, boolean7);
+        final boolean boolean7 = bqb.hasNeighborSignal(fu3);
+        if (boolean7 != cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.POWERED)) {
+            if (cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.OPEN) != boolean7) {
+                cfj = ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)TrapDoorBlock.OPEN, boolean7);
+                this.playSound(null, bqb, fu3, boolean7);
             }
-            bjw.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)TrapDoorBlock.POWERED, boolean7), 2);
-            if (byj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.WATERLOGGED)) {
-                bjw.getLiquidTicks().scheduleTick(fk3, Fluids.WATER, Fluids.WATER.getTickDelay(bjw));
+            bqb.setBlock(fu3, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)TrapDoorBlock.POWERED, boolean7), 2);
+            if (cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.WATERLOGGED)) {
+                bqb.getLiquidTicks().scheduleTick(fu3, Fluids.WATER, Fluids.WATER.getTickDelay(bqb));
             }
         }
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        BlockState byj3 = this.defaultBlockState();
-        final FluidState coj4 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        final Direction fp5 = bcq.getClickedFace();
-        if (bcq.replacingClickedOnBlock() || !fp5.getAxis().isHorizontal()) {
-            byj3 = (((AbstractStateHolder<O, BlockState>)byj3).setValue((Property<Comparable>)TrapDoorBlock.FACING, bcq.getHorizontalDirection().getOpposite())).<Half, Half>setValue(TrapDoorBlock.HALF, (fp5 == Direction.UP) ? Half.BOTTOM : Half.TOP);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        BlockState cfj3 = this.defaultBlockState();
+        final FluidState cxa4 = bin.getLevel().getFluidState(bin.getClickedPos());
+        final Direction fz5 = bin.getClickedFace();
+        if (bin.replacingClickedOnBlock() || !fz5.getAxis().isHorizontal()) {
+            cfj3 = (((StateHolder<O, BlockState>)cfj3).setValue((Property<Comparable>)TrapDoorBlock.FACING, bin.getHorizontalDirection().getOpposite())).<Half, Half>setValue(TrapDoorBlock.HALF, (fz5 == Direction.UP) ? Half.BOTTOM : Half.TOP);
         }
         else {
-            byj3 = (((AbstractStateHolder<O, BlockState>)byj3).setValue((Property<Comparable>)TrapDoorBlock.FACING, fp5)).<Half, Half>setValue(TrapDoorBlock.HALF, (bcq.getClickLocation().y - bcq.getClickedPos().getY() > 0.5) ? Half.TOP : Half.BOTTOM);
+            cfj3 = (((StateHolder<O, BlockState>)cfj3).setValue((Property<Comparable>)TrapDoorBlock.FACING, fz5)).<Half, Half>setValue(TrapDoorBlock.HALF, (bin.getClickLocation().y - bin.getClickedPos().getY() > 0.5) ? Half.TOP : Half.BOTTOM);
         }
-        if (bcq.getLevel().hasNeighborSignal(bcq.getClickedPos())) {
-            byj3 = (((AbstractStateHolder<O, BlockState>)byj3).setValue((Property<Comparable>)TrapDoorBlock.OPEN, true)).<Comparable, Boolean>setValue((Property<Comparable>)TrapDoorBlock.POWERED, true);
+        if (bin.getLevel().hasNeighborSignal(bin.getClickedPos())) {
+            cfj3 = (((StateHolder<O, BlockState>)cfj3).setValue((Property<Comparable>)TrapDoorBlock.OPEN, true)).<Comparable, Boolean>setValue((Property<Comparable>)TrapDoorBlock.POWERED, true);
         }
-        return ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Boolean>setValue((Property<Comparable>)TrapDoorBlock.WATERLOGGED, coj4.getType() == Fluids.WATER);
+        return ((StateHolder<O, BlockState>)cfj3).<Comparable, Boolean>setValue((Property<Comparable>)TrapDoorBlock.WATERLOGGED, cxa4.getType() == Fluids.WATER);
     }
     
     @Override
@@ -150,24 +150,19 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
     }
     
     @Override
-    public FluidState getFluidState(final BlockState byj) {
-        if (byj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.WATERLOGGED)) {
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.WATERLOGGED)) {
             return Fluids.WATER.getSource(false);
         }
-        return super.getFluidState(byj);
+        return super.getFluidState(cfj);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)TrapDoorBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
-    }
-    
-    @Override
-    public boolean isValidSpawn(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return false;
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/TrappedChestBlock.java b/src/net/minecraft/world/level/block/TrappedChestBlock.java
index c5415ff..12a35a6 100644
--- a/src/net/minecraft/world/level/block/TrappedChestBlock.java
+++ b/src/net/minecraft/world/level/block/TrappedChestBlock.java
@@ -12,6 +12,7 @@ import net.minecraft.world.level.block.entity.TrappedChestBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class TrappedChestBlock extends ChestBlock {
     public TrappedChestBlock(final Properties c) {
@@ -19,7 +20,7 @@ public class TrappedChestBlock extends ChestBlock {
     }
     
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return new TrappedChestBlockEntity();
     }
     
@@ -29,19 +30,19 @@ public class TrappedChestBlock extends ChestBlock {
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return Mth.clamp(ChestBlockEntity.getOpenCount(bjg, fk), 0, 15);
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return Mth.clamp(ChestBlockEntity.getOpenCount(bpg, fu), 0, 15);
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (fp == Direction.UP) {
-            return byj.getSignal(bjg, fk, fp);
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (fz == Direction.UP) {
+            return cfj.getSignal(bpg, fu, fz);
         }
         return 0;
     }
diff --git a/src/net/minecraft/world/level/block/TripWireBlock.java b/src/net/minecraft/world/level/block/TripWireBlock.java
index ace8a08..51b38b5 100644
--- a/src/net/minecraft/world/level/block/TripWireBlock.java
+++ b/src/net/minecraft/world/level/block/TripWireBlock.java
@@ -1,11 +1,10 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import java.util.Iterator;
 import java.util.List;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.Vec3i;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
@@ -20,6 +19,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
 import java.util.Map;
@@ -38,71 +38,71 @@ public class TripWireBlock extends Block {
     protected static final VoxelShape NOT_ATTACHED_AABB;
     private final TripWireHookBlock hook;
     
-    public TripWireBlock(final TripWireHookBlock bvk, final Properties c) {
+    public TripWireBlock(final TripWireHookBlock ccg, final Properties c) {
         super(c);
-        this.registerDefaultState(((((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)TripWireBlock.POWERED, false)).setValue((Property<Comparable>)TripWireBlock.ATTACHED, false)).setValue((Property<Comparable>)TripWireBlock.DISARMED, false)).setValue((Property<Comparable>)TripWireBlock.NORTH, false)).setValue((Property<Comparable>)TripWireBlock.EAST, false)).setValue((Property<Comparable>)TripWireBlock.SOUTH, false)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.WEST, false));
-        this.hook = bvk;
+        this.registerDefaultState(((((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)TripWireBlock.POWERED, false)).setValue((Property<Comparable>)TripWireBlock.ATTACHED, false)).setValue((Property<Comparable>)TripWireBlock.DISARMED, false)).setValue((Property<Comparable>)TripWireBlock.NORTH, false)).setValue((Property<Comparable>)TripWireBlock.EAST, false)).setValue((Property<Comparable>)TripWireBlock.SOUTH, false)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.WEST, false));
+        this.hook = ccg;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return byj.<Boolean>getValue((Property<Boolean>)TripWireBlock.ATTACHED) ? TripWireBlock.AABB : TripWireBlock.NOT_ATTACHED_AABB;
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return cfj.<Boolean>getValue((Property<Boolean>)TripWireBlock.ATTACHED) ? TripWireBlock.AABB : TripWireBlock.NOT_ATTACHED_AABB;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockGetter bjg3 = bcq.getLevel();
-        final BlockPos fk4 = bcq.getClickedPos();
-        return (((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.NORTH, this.shouldConnectTo(bjg3.getBlockState(fk4.north()), Direction.NORTH))).setValue((Property<Comparable>)TripWireBlock.EAST, this.shouldConnectTo(bjg3.getBlockState(fk4.east()), Direction.EAST))).setValue((Property<Comparable>)TripWireBlock.SOUTH, this.shouldConnectTo(bjg3.getBlockState(fk4.south()), Direction.SOUTH))).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.WEST, this.shouldConnectTo(bjg3.getBlockState(fk4.west()), Direction.WEST));
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockGetter bpg3 = bin.getLevel();
+        final BlockPos fu4 = bin.getClickedPos();
+        return (((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.NORTH, this.shouldConnectTo(bpg3.getBlockState(fu4.north()), Direction.NORTH))).setValue((Property<Comparable>)TripWireBlock.EAST, this.shouldConnectTo(bpg3.getBlockState(fu4.east()), Direction.EAST))).setValue((Property<Comparable>)TripWireBlock.SOUTH, this.shouldConnectTo(bpg3.getBlockState(fu4.south()), Direction.SOUTH))).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.WEST, this.shouldConnectTo(bpg3.getBlockState(fu4.west()), Direction.WEST));
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp.getAxis().isHorizontal()) {
-            return ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.PROPERTY_BY_DIRECTION.get(fp), this.shouldConnectTo(byj3, fp));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz.getAxis().isHorizontal()) {
+            return ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.PROPERTY_BY_DIRECTION.get(fz), this.shouldConnectTo(cfj3, fz));
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj4.getBlock() == byj1.getBlock()) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj4.is(cfj1.getBlock())) {
             return;
         }
-        this.updateSource(bjw, fk, byj1);
+        this.updateSource(bqb, fu, cfj1);
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (boolean5 || byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (boolean5 || cfj1.is(cfj4.getBlock())) {
             return;
         }
-        this.updateSource(bjw, fk, ((AbstractStateHolder<O, BlockState>)byj1).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.POWERED, true));
+        this.updateSource(bqb, fu, ((StateHolder<O, BlockState>)cfj1).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.POWERED, true));
     }
     
     @Override
-    public void playerWillDestroy(final Level bjw, final BlockPos fk, final BlockState byj, final Player ayj) {
-        if (!bjw.isClientSide && !ayj.getMainHandItem().isEmpty() && ayj.getMainHandItem().getItem() == Items.SHEARS) {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.DISARMED, true), 4);
+    public void playerWillDestroy(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        if (!bqb.isClientSide && !bec.getMainHandItem().isEmpty() && bec.getMainHandItem().getItem() == Items.SHEARS) {
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.DISARMED, true), 4);
         }
-        super.playerWillDestroy(bjw, fk, byj, ayj);
+        super.playerWillDestroy(bqb, fu, cfj, bec);
     }
     
-    private void updateSource(final Level bjw, final BlockPos fk, final BlockState byj) {
-        for (final Direction fp8 : new Direction[] { Direction.SOUTH, Direction.WEST }) {
+    private void updateSource(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        for (final Direction fz8 : new Direction[] { Direction.SOUTH, Direction.WEST }) {
             int integer9 = 1;
             while (integer9 < 42) {
-                final BlockPos fk2 = fk.relative(fp8, integer9);
-                final BlockState byj2 = bjw.getBlockState(fk2);
-                if (byj2.getBlock() == this.hook) {
-                    if (byj2.<Comparable>getValue((Property<Comparable>)TripWireHookBlock.FACING) == fp8.getOpposite()) {
-                        this.hook.calculateState(bjw, fk2, byj2, false, true, integer9, byj);
+                final BlockPos fu2 = fu.relative(fz8, integer9);
+                final BlockState cfj2 = bqb.getBlockState(fu2);
+                if (cfj2.is(this.hook)) {
+                    if (cfj2.<Comparable>getValue((Property<Comparable>)TripWireHookBlock.FACING) == fz8.getOpposite()) {
+                        this.hook.calculateState(bqb, fu2, cfj2, false, true, integer9, cfj);
                         break;
                     }
                     break;
                 }
                 else {
-                    if (byj2.getBlock() != this) {
+                    if (!cfj2.is(this)) {
                         break;
                     }
                     ++integer9;
@@ -112,84 +112,84 @@ public class TripWireBlock extends Block {
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (bjw.isClientSide) {
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (bqb.isClientSide) {
             return;
         }
-        if (byj.<Boolean>getValue((Property<Boolean>)TripWireBlock.POWERED)) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)TripWireBlock.POWERED)) {
             return;
         }
-        this.checkPressed(bjw, fk);
+        this.checkPressed(bqb, fu);
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (!xd.getBlockState(fk).<Boolean>getValue((Property<Boolean>)TripWireBlock.POWERED)) {
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (!zd.getBlockState(fu).<Boolean>getValue((Property<Boolean>)TripWireBlock.POWERED)) {
             return;
         }
-        this.checkPressed(xd, fk);
+        this.checkPressed(zd, fu);
     }
     
-    private void checkPressed(final Level bjw, final BlockPos fk) {
-        BlockState byj4 = bjw.getBlockState(fk);
-        final boolean boolean5 = byj4.<Boolean>getValue((Property<Boolean>)TripWireBlock.POWERED);
+    private void checkPressed(final Level bqb, final BlockPos fu) {
+        BlockState cfj4 = bqb.getBlockState(fu);
+        final boolean boolean5 = cfj4.<Boolean>getValue((Property<Boolean>)TripWireBlock.POWERED);
         boolean boolean6 = false;
-        final List<? extends Entity> list7 = bjw.getEntities(null, byj4.getShape(bjw, fk).bounds().move(fk));
+        final List<? extends Entity> list7 = bqb.getEntities(null, cfj4.getShape(bqb, fu).bounds().move(fu));
         if (!list7.isEmpty()) {
-            for (final Entity akq9 : list7) {
-                if (!akq9.isIgnoringBlockTriggers()) {
+            for (final Entity aom9 : list7) {
+                if (!aom9.isIgnoringBlockTriggers()) {
                     boolean6 = true;
                     break;
                 }
             }
         }
         if (boolean6 != boolean5) {
-            byj4 = ((AbstractStateHolder<O, BlockState>)byj4).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.POWERED, boolean6);
-            bjw.setBlock(fk, byj4, 3);
-            this.updateSource(bjw, fk, byj4);
+            cfj4 = ((StateHolder<O, BlockState>)cfj4).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.POWERED, boolean6);
+            bqb.setBlock(fu, cfj4, 3);
+            this.updateSource(bqb, fu, cfj4);
         }
         if (boolean6) {
-            bjw.getBlockTicks().scheduleTick(new BlockPos(fk), this, this.getTickDelay(bjw));
+            bqb.getBlockTicks().scheduleTick(new BlockPos(fu), this, 10);
         }
     }
     
-    public boolean shouldConnectTo(final BlockState byj, final Direction fp) {
-        final Block bph4 = byj.getBlock();
-        if (bph4 == this.hook) {
-            return byj.<Comparable>getValue((Property<Comparable>)TripWireHookBlock.FACING) == fp.getOpposite();
+    public boolean shouldConnectTo(final BlockState cfj, final Direction fz) {
+        final Block bvr4 = cfj.getBlock();
+        if (bvr4 == this.hook) {
+            return cfj.<Comparable>getValue((Property<Comparable>)TripWireHookBlock.FACING) == fz.getOpposite();
         }
-        return bph4 == this;
+        return bvr4 == this;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        switch (btu) {
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        switch (cap) {
             case CLOCKWISE_180: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)TripWireBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.SOUTH))).setValue((Property<Comparable>)TripWireBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.WEST))).setValue((Property<Comparable>)TripWireBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.NORTH))).<Comparable, Comparable>setValue((Property<Comparable>)TripWireBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.EAST));
+                return (((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)TripWireBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.SOUTH))).setValue((Property<Comparable>)TripWireBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.WEST))).setValue((Property<Comparable>)TripWireBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.NORTH))).<Comparable, Comparable>setValue((Property<Comparable>)TripWireBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.EAST));
             }
             case COUNTERCLOCKWISE_90: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)TripWireBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.EAST))).setValue((Property<Comparable>)TripWireBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.SOUTH))).setValue((Property<Comparable>)TripWireBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)TripWireBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.NORTH));
+                return (((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)TripWireBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.EAST))).setValue((Property<Comparable>)TripWireBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.SOUTH))).setValue((Property<Comparable>)TripWireBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)TripWireBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.NORTH));
             }
             case CLOCKWISE_90: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)TripWireBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.WEST))).setValue((Property<Comparable>)TripWireBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.NORTH))).setValue((Property<Comparable>)TripWireBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.EAST))).<Comparable, Comparable>setValue((Property<Comparable>)TripWireBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.SOUTH));
+                return (((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)TripWireBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.WEST))).setValue((Property<Comparable>)TripWireBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.NORTH))).setValue((Property<Comparable>)TripWireBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.EAST))).<Comparable, Comparable>setValue((Property<Comparable>)TripWireBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.SOUTH));
             }
             default: {
-                return byj;
+                return cfj;
             }
         }
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        switch (bsu) {
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        switch (bzj) {
             case LEFT_RIGHT: {
-                return (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)TripWireBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.SOUTH))).<Comparable, Comparable>setValue((Property<Comparable>)TripWireBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.NORTH));
+                return (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)TripWireBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.SOUTH))).<Comparable, Comparable>setValue((Property<Comparable>)TripWireBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.NORTH));
             }
             case FRONT_BACK: {
-                return (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)TripWireBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)TripWireBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)TripWireBlock.EAST));
+                return (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)TripWireBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)TripWireBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)TripWireBlock.EAST));
             }
             default: {
-                return super.mirror(byj, bsu);
+                return super.mirror(cfj, bzj);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/block/TripWireHookBlock.java b/src/net/minecraft/world/level/block/TripWireHookBlock.java
index c1dba5a..49076c5 100644
--- a/src/net/minecraft/world/level/block/TripWireHookBlock.java
+++ b/src/net/minecraft/world/level/block/TripWireHookBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.entity.player.Player;
@@ -22,6 +22,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
@@ -37,12 +38,12 @@ public class TripWireHookBlock extends Block {
     
     public TripWireHookBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)TripWireHookBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)TripWireHookBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, false));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)TripWireHookBlock.FACING, Direction.NORTH)).setValue((Property<Comparable>)TripWireHookBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, false));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        switch (byj.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING)) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        switch (cfj.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING)) {
             default: {
                 return TripWireHookBlock.EAST_AABB;
             }
@@ -59,35 +60,35 @@ public class TripWireHookBlock extends Block {
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING);
-        final BlockPos fk2 = fk.relative(fp5.getOpposite());
-        final BlockState byj2 = bjz.getBlockState(fk2);
-        return fp5.getAxis().isHorizontal() && byj2.isFaceSturdy(bjz, fk2, fp5) && !byj2.isSignalSource();
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING);
+        final BlockPos fu2 = fu.relative(fz5.getOpposite());
+        final BlockState cfj2 = bqd.getBlockState(fu2);
+        return fz5.getAxis().isHorizontal() && cfj2.isFaceSturdy(bqd, fu2, fz5);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp.getOpposite() == byj1.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING) && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz.getOpposite() == cfj1.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING) && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        BlockState byj3 = (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, false);
-        final LevelReader bjz4 = bcq.getLevel();
-        final BlockPos fk5 = bcq.getClickedPos();
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        BlockState cfj3 = (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.POWERED, false)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, false);
+        final LevelReader bqd4 = bin.getLevel();
+        final BlockPos fu5 = bin.getClickedPos();
         final Direction[] nearestLookingDirections;
-        final Direction[] arr6 = nearestLookingDirections = bcq.getNearestLookingDirections();
-        for (final Direction fp10 : nearestLookingDirections) {
-            if (fp10.getAxis().isHorizontal()) {
-                final Direction fp11 = fp10.getOpposite();
-                byj3 = ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Direction>setValue((Property<Comparable>)TripWireHookBlock.FACING, fp11);
-                if (byj3.canSurvive(bjz4, fk5)) {
-                    return byj3;
+        final Direction[] arr6 = nearestLookingDirections = bin.getNearestLookingDirections();
+        for (final Direction fz10 : nearestLookingDirections) {
+            if (fz10.getAxis().isHorizontal()) {
+                final Direction fz11 = fz10.getOpposite();
+                cfj3 = ((StateHolder<O, BlockState>)cfj3).<Comparable, Direction>setValue((Property<Comparable>)TripWireHookBlock.FACING, fz11);
+                if (cfj3.canSurvive(bqd4, fu5)) {
+                    return cfj3;
                 }
             }
         }
@@ -95,40 +96,40 @@ public class TripWireHookBlock extends Block {
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        this.calculateState(bjw, fk, byj, false, false, -1, null);
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        this.calculateState(bqb, fu, cfj, false, false, -1, null);
     }
     
-    public void calculateState(final Level bjw, final BlockPos fk, final BlockState byj3, final boolean boolean4, final boolean boolean5, final int integer, @Nullable final BlockState byj7) {
-        final Direction fp9 = byj3.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING);
-        final boolean boolean6 = byj3.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.ATTACHED);
-        final boolean boolean7 = byj3.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.POWERED);
+    public void calculateState(final Level bqb, final BlockPos fu, final BlockState cfj3, final boolean boolean4, final boolean boolean5, final int integer, @Nullable final BlockState cfj7) {
+        final Direction fz9 = cfj3.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING);
+        final boolean boolean6 = cfj3.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.ATTACHED);
+        final boolean boolean7 = cfj3.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.POWERED);
         boolean boolean8 = !boolean4;
         boolean boolean9 = false;
         int integer2 = 0;
         final BlockState[] arr15 = new BlockState[42];
         int integer3 = 1;
         while (integer3 < 42) {
-            final BlockPos fk2 = fk.relative(fp9, integer3);
-            BlockState byj8 = bjw.getBlockState(fk2);
-            if (byj8.getBlock() == Blocks.TRIPWIRE_HOOK) {
-                if (byj8.<Comparable>getValue((Property<Comparable>)TripWireHookBlock.FACING) == fp9.getOpposite()) {
+            final BlockPos fu2 = fu.relative(fz9, integer3);
+            BlockState cfj8 = bqb.getBlockState(fu2);
+            if (cfj8.is(Blocks.TRIPWIRE_HOOK)) {
+                if (cfj8.<Comparable>getValue((Property<Comparable>)TripWireHookBlock.FACING) == fz9.getOpposite()) {
                     integer2 = integer3;
                     break;
                 }
                 break;
             }
             else {
-                if (byj8.getBlock() == Blocks.TRIPWIRE || integer3 == integer) {
+                if (cfj8.is(Blocks.TRIPWIRE) || integer3 == integer) {
                     if (integer3 == integer) {
-                        byj8 = MoreObjects.<BlockState>firstNonNull(byj7, byj8);
+                        cfj8 = MoreObjects.<BlockState>firstNonNull(cfj7, cfj8);
                     }
-                    final boolean boolean10 = !byj8.<Boolean>getValue((Property<Boolean>)TripWireBlock.DISARMED);
-                    final boolean boolean11 = byj8.<Boolean>getValue((Property<Boolean>)TripWireBlock.POWERED);
+                    final boolean boolean10 = !cfj8.<Boolean>getValue((Property<Boolean>)TripWireBlock.DISARMED);
+                    final boolean boolean11 = cfj8.<Boolean>getValue((Property<Boolean>)TripWireBlock.POWERED);
                     boolean9 |= (boolean10 && boolean11);
-                    arr15[integer3] = byj8;
+                    arr15[integer3] = cfj8;
                     if (integer3 == integer) {
-                        bjw.getBlockTicks().scheduleTick(fk, this, this.getTickDelay(bjw));
+                        bqb.getBlockTicks().scheduleTick(fu, this, 10);
                         boolean8 &= boolean10;
                     }
                 }
@@ -141,104 +142,104 @@ public class TripWireHookBlock extends Block {
         }
         boolean8 &= (integer2 > 1);
         boolean9 &= boolean8;
-        final BlockState byj9 = (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, boolean8)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.POWERED, boolean9);
+        final BlockState cfj9 = (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, boolean8)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.POWERED, boolean9);
         if (integer2 > 0) {
-            final BlockPos fk2 = fk.relative(fp9, integer2);
-            final Direction fp10 = fp9.getOpposite();
-            bjw.setBlock(fk2, ((AbstractStateHolder<O, BlockState>)byj9).<Comparable, Direction>setValue((Property<Comparable>)TripWireHookBlock.FACING, fp10), 3);
-            this.notifyNeighbors(bjw, fk2, fp10);
-            this.playSound(bjw, fk2, boolean8, boolean9, boolean6, boolean7);
+            final BlockPos fu2 = fu.relative(fz9, integer2);
+            final Direction fz10 = fz9.getOpposite();
+            bqb.setBlock(fu2, ((StateHolder<O, BlockState>)cfj9).<Comparable, Direction>setValue((Property<Comparable>)TripWireHookBlock.FACING, fz10), 3);
+            this.notifyNeighbors(bqb, fu2, fz10);
+            this.playSound(bqb, fu2, boolean8, boolean9, boolean6, boolean7);
         }
-        this.playSound(bjw, fk, boolean8, boolean9, boolean6, boolean7);
+        this.playSound(bqb, fu, boolean8, boolean9, boolean6, boolean7);
         if (!boolean4) {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj9).<Comparable, Direction>setValue((Property<Comparable>)TripWireHookBlock.FACING, fp9), 3);
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj9).<Comparable, Direction>setValue((Property<Comparable>)TripWireHookBlock.FACING, fz9), 3);
             if (boolean5) {
-                this.notifyNeighbors(bjw, fk, fp9);
+                this.notifyNeighbors(bqb, fu, fz9);
             }
         }
         if (boolean6 != boolean8) {
             for (int integer4 = 1; integer4 < integer2; ++integer4) {
-                final BlockPos fk3 = fk.relative(fp9, integer4);
-                final BlockState byj10 = arr15[integer4];
-                if (byj10 != null) {
-                    bjw.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)byj10).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, boolean8), 3);
-                    if (!bjw.getBlockState(fk3).isAir()) {}
+                final BlockPos fu3 = fu.relative(fz9, integer4);
+                final BlockState cfj10 = arr15[integer4];
+                if (cfj10 != null) {
+                    bqb.setBlock(fu3, ((StateHolder<O, BlockState>)cfj10).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, boolean8), 3);
+                    if (!bqb.getBlockState(fu3).isAir()) {}
                 }
             }
         }
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        this.calculateState(xd, fk, byj, false, true, -1, null);
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        this.calculateState(zd, fu, cfj, false, true, -1, null);
     }
     
-    private void playSound(final Level bjw, final BlockPos fk, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6) {
+    private void playSound(final Level bqb, final BlockPos fu, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6) {
         if (boolean4 && !boolean6) {
-            bjw.playSound(null, fk, SoundEvents.TRIPWIRE_CLICK_ON, SoundSource.BLOCKS, 0.4f, 0.6f);
+            bqb.playSound(null, fu, SoundEvents.TRIPWIRE_CLICK_ON, SoundSource.BLOCKS, 0.4f, 0.6f);
         }
         else if (!boolean4 && boolean6) {
-            bjw.playSound(null, fk, SoundEvents.TRIPWIRE_CLICK_OFF, SoundSource.BLOCKS, 0.4f, 0.5f);
+            bqb.playSound(null, fu, SoundEvents.TRIPWIRE_CLICK_OFF, SoundSource.BLOCKS, 0.4f, 0.5f);
         }
         else if (boolean3 && !boolean5) {
-            bjw.playSound(null, fk, SoundEvents.TRIPWIRE_ATTACH, SoundSource.BLOCKS, 0.4f, 0.7f);
+            bqb.playSound(null, fu, SoundEvents.TRIPWIRE_ATTACH, SoundSource.BLOCKS, 0.4f, 0.7f);
         }
         else if (!boolean3 && boolean5) {
-            bjw.playSound(null, fk, SoundEvents.TRIPWIRE_DETACH, SoundSource.BLOCKS, 0.4f, 1.2f / (bjw.random.nextFloat() * 0.2f + 0.9f));
+            bqb.playSound(null, fu, SoundEvents.TRIPWIRE_DETACH, SoundSource.BLOCKS, 0.4f, 1.2f / (bqb.random.nextFloat() * 0.2f + 0.9f));
         }
     }
     
-    private void notifyNeighbors(final Level bjw, final BlockPos fk, final Direction fp) {
-        bjw.updateNeighborsAt(fk, this);
-        bjw.updateNeighborsAt(fk.relative(fp.getOpposite()), this);
+    private void notifyNeighbors(final Level bqb, final BlockPos fu, final Direction fz) {
+        bqb.updateNeighborsAt(fu, this);
+        bqb.updateNeighborsAt(fu.relative(fz.getOpposite()), this);
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (boolean5 || byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (boolean5 || cfj1.is(cfj4.getBlock())) {
             return;
         }
-        final boolean boolean6 = byj1.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.ATTACHED);
-        final boolean boolean7 = byj1.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.POWERED);
+        final boolean boolean6 = cfj1.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.ATTACHED);
+        final boolean boolean7 = cfj1.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.POWERED);
         if (boolean6 || boolean7) {
-            this.calculateState(bjw, fk, byj1, true, false, -1, null);
+            this.calculateState(bqb, fu, cfj1, true, false, -1, null);
         }
         if (boolean7) {
-            bjw.updateNeighborsAt(fk, this);
-            bjw.updateNeighborsAt(fk.relative(byj1.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING).getOpposite()), this);
+            bqb.updateNeighborsAt(fu, this);
+            bqb.updateNeighborsAt(fu.relative(cfj1.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING).getOpposite()), this);
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
     }
     
     @Override
-    public int getSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return byj.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.POWERED) ? 15 : 0;
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return cfj.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.POWERED) ? 15 : 0;
     }
     
     @Override
-    public int getDirectSignal(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.POWERED)) {
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)TripWireHookBlock.POWERED)) {
             return 0;
         }
-        if (byj.<Comparable>getValue((Property<Comparable>)TripWireHookBlock.FACING) == fp) {
+        if (cfj.<Comparable>getValue((Property<Comparable>)TripWireHookBlock.FACING) == fz) {
             return 15;
         }
         return 0;
     }
     
     @Override
-    public boolean isSignalSource(final BlockState byj) {
+    public boolean isSignalSource(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)TripWireHookBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)TripWireHookBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)TripWireHookBlock.FACING)));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/TurtleEggBlock.java b/src/net/minecraft/world/level/block/TurtleEggBlock.java
index dcda1e0..2e7c204 100644
--- a/src/net/minecraft/world/level/block/TurtleEggBlock.java
+++ b/src/net/minecraft/world/level/block/TurtleEggBlock.java
@@ -1,15 +1,18 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ambient.Bat;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.item.BlockPlaceContext;
 import net.minecraft.world.item.ItemStack;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.animal.Turtle;
 import net.minecraft.world.level.BlockGetter;
@@ -24,6 +27,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -35,108 +39,114 @@ public class TurtleEggBlock extends Block {
     
     public TurtleEggBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)TurtleEggBlock.HATCH, 0)).<Comparable, Integer>setValue((Property<Comparable>)TurtleEggBlock.EGGS, 1));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)TurtleEggBlock.HATCH, 0)).<Comparable, Integer>setValue((Property<Comparable>)TurtleEggBlock.EGGS, 1));
     }
     
     @Override
-    public void stepOn(final Level bjw, final BlockPos fk, final Entity akq) {
-        this.destroyEgg(bjw, fk, akq, 100);
-        super.stepOn(bjw, fk, akq);
+    public void stepOn(final Level bqb, final BlockPos fu, final Entity aom) {
+        this.destroyEgg(bqb, fu, aom, 100);
+        super.stepOn(bqb, fu, aom);
     }
     
     @Override
-    public void fallOn(final Level bjw, final BlockPos fk, final Entity akq, final float float4) {
-        if (!(akq instanceof Zombie)) {
-            this.destroyEgg(bjw, fk, akq, 3);
+    public void fallOn(final Level bqb, final BlockPos fu, final Entity aom, final float float4) {
+        if (!(aom instanceof Zombie)) {
+            this.destroyEgg(bqb, fu, aom, 3);
         }
-        super.fallOn(bjw, fk, akq, float4);
+        super.fallOn(bqb, fu, aom, float4);
     }
     
-    private void destroyEgg(final Level bjw, final BlockPos fk, final Entity akq, final int integer) {
-        if (!this.canDestroyEgg(bjw, akq)) {
-            super.stepOn(bjw, fk, akq);
+    private void destroyEgg(final Level bqb, final BlockPos fu, final Entity aom, final int integer) {
+        if (!this.canDestroyEgg(bqb, aom)) {
             return;
         }
-        if (!bjw.isClientSide && bjw.random.nextInt(integer) == 0) {
-            this.decreaseEggs(bjw, fk, bjw.getBlockState(fk));
+        if (!bqb.isClientSide && bqb.random.nextInt(integer) == 0) {
+            final BlockState cfj6 = bqb.getBlockState(fu);
+            if (cfj6.is(Blocks.TURTLE_EGG)) {
+                this.decreaseEggs(bqb, fu, cfj6);
+            }
         }
     }
     
-    private void decreaseEggs(final Level bjw, final BlockPos fk, final BlockState byj) {
-        bjw.playSound(null, fk, SoundEvents.TURTLE_EGG_BREAK, SoundSource.BLOCKS, 0.7f, 0.9f + bjw.random.nextFloat() * 0.2f);
-        final int integer5 = byj.<Integer>getValue((Property<Integer>)TurtleEggBlock.EGGS);
+    private void decreaseEggs(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        bqb.playSound(null, fu, SoundEvents.TURTLE_EGG_BREAK, SoundSource.BLOCKS, 0.7f, 0.9f + bqb.random.nextFloat() * 0.2f);
+        final int integer5 = cfj.<Integer>getValue((Property<Integer>)TurtleEggBlock.EGGS);
         if (integer5 <= 1) {
-            bjw.destroyBlock(fk, false);
+            bqb.destroyBlock(fu, false);
         }
         else {
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)TurtleEggBlock.EGGS, integer5 - 1), 2);
-            bjw.levelEvent(2001, fk, Block.getId(byj));
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)TurtleEggBlock.EGGS, integer5 - 1), 2);
+            bqb.levelEvent(2001, fu, Block.getId(cfj));
         }
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        if (this.shouldUpdateHatchLevel(xd) && this.onSand(xd, fk)) {
-            final int integer6 = byj.<Integer>getValue((Property<Integer>)TurtleEggBlock.HATCH);
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (this.shouldUpdateHatchLevel(zd) && onSand(zd, fu)) {
+            final int integer6 = cfj.<Integer>getValue((Property<Integer>)TurtleEggBlock.HATCH);
             if (integer6 < 2) {
-                xd.playSound(null, fk, SoundEvents.TURTLE_EGG_CRACK, SoundSource.BLOCKS, 0.7f, 0.9f + random.nextFloat() * 0.2f);
-                xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)TurtleEggBlock.HATCH, integer6 + 1), 2);
+                zd.playSound(null, fu, SoundEvents.TURTLE_EGG_CRACK, SoundSource.BLOCKS, 0.7f, 0.9f + random.nextFloat() * 0.2f);
+                zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)TurtleEggBlock.HATCH, integer6 + 1), 2);
             }
             else {
-                xd.playSound(null, fk, SoundEvents.TURTLE_EGG_HATCH, SoundSource.BLOCKS, 0.7f, 0.9f + random.nextFloat() * 0.2f);
-                xd.removeBlock(fk, false);
-                for (int integer7 = 0; integer7 < byj.<Integer>getValue((Property<Integer>)TurtleEggBlock.EGGS); ++integer7) {
-                    xd.levelEvent(2001, fk, Block.getId(byj));
-                    final Turtle aua8 = EntityType.TURTLE.create(xd);
-                    aua8.setAge(-24000);
-                    aua8.setHomePos(fk);
-                    aua8.moveTo(fk.getX() + 0.3 + integer7 * 0.2, fk.getY(), fk.getZ() + 0.3, 0.0f, 0.0f);
-                    xd.addFreshEntity(aua8);
+                zd.playSound(null, fu, SoundEvents.TURTLE_EGG_HATCH, SoundSource.BLOCKS, 0.7f, 0.9f + random.nextFloat() * 0.2f);
+                zd.removeBlock(fu, false);
+                for (int integer7 = 0; integer7 < cfj.<Integer>getValue((Property<Integer>)TurtleEggBlock.EGGS); ++integer7) {
+                    zd.levelEvent(2001, fu, Block.getId(cfj));
+                    final Turtle azi8 = EntityType.TURTLE.create(zd);
+                    azi8.setAge(-24000);
+                    azi8.setHomePos(fu);
+                    azi8.moveTo(fu.getX() + 0.3 + integer7 * 0.2, fu.getY(), fu.getZ() + 0.3, 0.0f, 0.0f);
+                    zd.addFreshEntity(azi8);
                 }
             }
         }
     }
     
-    private boolean onSand(final BlockGetter bjg, final BlockPos fk) {
-        return bjg.getBlockState(fk.below()).getBlock() == Blocks.SAND;
+    public static boolean onSand(final BlockGetter bpg, final BlockPos fu) {
+        return isSand(bpg, fu.below());
+    }
+    
+    public static boolean isSand(final BlockGetter bpg, final BlockPos fu) {
+        return bpg.getBlockState(fu).is(BlockTags.SAND);
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (this.onSand(bjw, fk) && !bjw.isClientSide) {
-            bjw.levelEvent(2005, fk, 0);
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (onSand(bqb, fu) && !bqb.isClientSide) {
+            bqb.levelEvent(2005, fu, 0);
         }
     }
     
-    private boolean shouldUpdateHatchLevel(final Level bjw) {
-        final float float3 = bjw.getTimeOfDay(1.0f);
-        return (float3 < 0.69 && float3 > 0.65) || bjw.random.nextInt(500) == 0;
+    private boolean shouldUpdateHatchLevel(final Level bqb) {
+        final float float3 = bqb.getTimeOfDay(1.0f);
+        return (float3 < 0.69 && float3 > 0.65) || bqb.random.nextInt(500) == 0;
     }
     
     @Override
-    public void playerDestroy(final Level bjw, final Player ayj, final BlockPos fk, final BlockState byj, @Nullable final BlockEntity bwl, final ItemStack ben) {
-        super.playerDestroy(bjw, ayj, fk, byj, bwl, ben);
-        this.decreaseEggs(bjw, fk, byj);
+    public void playerDestroy(final Level bqb, final Player bec, final BlockPos fu, final BlockState cfj, @Nullable final BlockEntity cdl, final ItemStack bki) {
+        super.playerDestroy(bqb, bec, fu, cfj, cdl, bki);
+        this.decreaseEggs(bqb, fu, cfj);
     }
     
     @Override
-    public boolean canBeReplaced(final BlockState byj, final BlockPlaceContext bcq) {
-        return (bcq.getItemInHand().getItem() == this.asItem() && byj.<Integer>getValue((Property<Integer>)TurtleEggBlock.EGGS) < 4) || super.canBeReplaced(byj, bcq);
+    public boolean canBeReplaced(final BlockState cfj, final BlockPlaceContext bin) {
+        return (bin.getItemInHand().getItem() == this.asItem() && cfj.<Integer>getValue((Property<Integer>)TurtleEggBlock.EGGS) < 4) || super.canBeReplaced(cfj, bin);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockState byj3 = bcq.getLevel().getBlockState(bcq.getClickedPos());
-        if (byj3.getBlock() == this) {
-            return ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Integer>setValue((Property<Comparable>)TurtleEggBlock.EGGS, Math.min(4, byj3.<Integer>getValue((Property<Integer>)TurtleEggBlock.EGGS) + 1));
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockState cfj3 = bin.getLevel().getBlockState(bin.getClickedPos());
+        if (cfj3.is(this)) {
+            return ((StateHolder<O, BlockState>)cfj3).<Comparable, Integer>setValue((Property<Comparable>)TurtleEggBlock.EGGS, Math.min(4, cfj3.<Integer>getValue((Property<Integer>)TurtleEggBlock.EGGS) + 1));
         }
-        return super.getStateForPlacement(bcq);
+        return super.getStateForPlacement(bin);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (byj.<Integer>getValue((Property<Integer>)TurtleEggBlock.EGGS) > 1) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        if (cfj.<Integer>getValue((Property<Integer>)TurtleEggBlock.EGGS) > 1) {
             return TurtleEggBlock.MULTIPLE_EGGS_AABB;
         }
         return TurtleEggBlock.ONE_EGG_AABB;
@@ -147,8 +157,8 @@ public class TurtleEggBlock extends Block {
         a.add(TurtleEggBlock.HATCH, TurtleEggBlock.EGGS);
     }
     
-    private boolean canDestroyEgg(final Level bjw, final Entity akq) {
-        return !(akq instanceof Turtle) && (!(akq instanceof LivingEntity) || akq instanceof Player || bjw.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING));
+    private boolean canDestroyEgg(final Level bqb, final Entity aom) {
+        return !(aom instanceof Turtle) && !(aom instanceof Bat) && aom instanceof LivingEntity && (aom instanceof Player || bqb.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING));
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/TwistingVines.java b/src/net/minecraft/world/level/block/TwistingVines.java
new file mode 100644
index 0000000..e8dd473
--- /dev/null
+++ b/src/net/minecraft/world/level/block/TwistingVines.java
@@ -0,0 +1,34 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.Random;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public class TwistingVines extends GrowingPlantHeadBlock {
+    public static final VoxelShape SHAPE;
+    
+    public TwistingVines(final Properties c) {
+        super(c, Direction.UP, TwistingVines.SHAPE, false, 0.1);
+    }
+    
+    @Override
+    protected int getBlocksToGrowWhenBonemealed(final Random random) {
+        return NetherVines.getBlocksToGrowWhenBonemealed(random);
+    }
+    
+    @Override
+    protected Block getBodyBlock() {
+        return Blocks.TWISTING_VINES_PLANT;
+    }
+    
+    @Override
+    protected boolean canGrowInto(final BlockState cfj) {
+        return NetherVines.isValidGrowthState(cfj);
+    }
+    
+    static {
+        SHAPE = Block.box(4.0, 0.0, 4.0, 12.0, 15.0, 12.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/TwistingVinesPlant.java b/src/net/minecraft/world/level/block/TwistingVinesPlant.java
new file mode 100644
index 0000000..2c7a6ea
--- /dev/null
+++ b/src/net/minecraft/world/level/block/TwistingVinesPlant.java
@@ -0,0 +1,22 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public class TwistingVinesPlant extends GrowingPlantBodyBlock {
+    public static final VoxelShape SHAPE;
+    
+    public TwistingVinesPlant(final Properties c) {
+        super(c, Direction.UP, TwistingVinesPlant.SHAPE, false);
+    }
+    
+    @Override
+    protected GrowingPlantHeadBlock getHeadBlock() {
+        return (GrowingPlantHeadBlock)Blocks.TWISTING_VINES;
+    }
+    
+    static {
+        SHAPE = Block.box(4.0, 0.0, 4.0, 12.0, 16.0, 12.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/VineBlock.java b/src/net/minecraft/world/level/block/VineBlock.java
index 1365bc3..a0adc5a 100644
--- a/src/net/minecraft/world/level/block/VineBlock.java
+++ b/src/net/minecraft/world/level/block/VineBlock.java
@@ -1,12 +1,11 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import java.util.stream.Collector;
 import net.minecraft.Util;
 import net.minecraft.world.level.block.state.StateDefinition;
 import javax.annotation.Nullable;
 import net.minecraft.world.item.BlockPlaceContext;
-import net.minecraft.world.level.Level;
 import java.util.Random;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.LevelAccessor;
@@ -18,6 +17,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
 import java.util.Map;
@@ -38,216 +38,205 @@ public class VineBlock extends Block {
     
     public VineBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)VineBlock.UP, false)).setValue((Property<Comparable>)VineBlock.NORTH, false)).setValue((Property<Comparable>)VineBlock.EAST, false)).setValue((Property<Comparable>)VineBlock.SOUTH, false)).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.WEST, false));
+        this.registerDefaultState(((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)VineBlock.UP, false)).setValue((Property<Comparable>)VineBlock.NORTH, false)).setValue((Property<Comparable>)VineBlock.EAST, false)).setValue((Property<Comparable>)VineBlock.SOUTH, false)).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.WEST, false));
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        VoxelShape cwf6 = Shapes.empty();
-        if (byj.<Boolean>getValue((Property<Boolean>)VineBlock.UP)) {
-            cwf6 = Shapes.or(cwf6, VineBlock.UP_AABB);
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        VoxelShape dfg6 = Shapes.empty();
+        if (cfj.<Boolean>getValue((Property<Boolean>)VineBlock.UP)) {
+            dfg6 = Shapes.or(dfg6, VineBlock.UP_AABB);
         }
-        if (byj.<Boolean>getValue((Property<Boolean>)VineBlock.NORTH)) {
-            cwf6 = Shapes.or(cwf6, VineBlock.SOUTH_AABB);
+        if (cfj.<Boolean>getValue((Property<Boolean>)VineBlock.NORTH)) {
+            dfg6 = Shapes.or(dfg6, VineBlock.SOUTH_AABB);
         }
-        if (byj.<Boolean>getValue((Property<Boolean>)VineBlock.EAST)) {
-            cwf6 = Shapes.or(cwf6, VineBlock.WEST_AABB);
+        if (cfj.<Boolean>getValue((Property<Boolean>)VineBlock.EAST)) {
+            dfg6 = Shapes.or(dfg6, VineBlock.WEST_AABB);
         }
-        if (byj.<Boolean>getValue((Property<Boolean>)VineBlock.SOUTH)) {
-            cwf6 = Shapes.or(cwf6, VineBlock.NORTH_AABB);
+        if (cfj.<Boolean>getValue((Property<Boolean>)VineBlock.SOUTH)) {
+            dfg6 = Shapes.or(dfg6, VineBlock.NORTH_AABB);
         }
-        if (byj.<Boolean>getValue((Property<Boolean>)VineBlock.WEST)) {
-            cwf6 = Shapes.or(cwf6, VineBlock.EAST_AABB);
+        if (cfj.<Boolean>getValue((Property<Boolean>)VineBlock.WEST)) {
+            dfg6 = Shapes.or(dfg6, VineBlock.EAST_AABB);
         }
-        return cwf6;
+        return dfg6;
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return this.hasFaces(this.getUpdatedState(byj, bjz, fk));
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return this.hasFaces(this.getUpdatedState(cfj, bqd, fu));
     }
     
-    private boolean hasFaces(final BlockState byj) {
-        return this.countFaces(byj) > 0;
+    private boolean hasFaces(final BlockState cfj) {
+        return this.countFaces(cfj) > 0;
     }
     
-    private int countFaces(final BlockState byj) {
+    private int countFaces(final BlockState cfj) {
         int integer3 = 0;
-        for (final BooleanProperty bzb5 : VineBlock.PROPERTY_BY_DIRECTION.values()) {
-            if (byj.<Boolean>getValue((Property<Boolean>)bzb5)) {
+        for (final BooleanProperty cga5 : VineBlock.PROPERTY_BY_DIRECTION.values()) {
+            if (cfj.<Boolean>getValue((Property<Boolean>)cga5)) {
                 ++integer3;
             }
         }
         return integer3;
     }
     
-    private boolean canSupportAtFace(final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (fp == Direction.DOWN) {
+    private boolean canSupportAtFace(final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        if (fz == Direction.DOWN) {
             return false;
         }
-        final BlockPos fk2 = fk.relative(fp);
-        if (isAcceptableNeighbour(bjg, fk2, fp)) {
+        final BlockPos fu2 = fu.relative(fz);
+        if (isAcceptableNeighbour(bpg, fu2, fz)) {
             return true;
         }
-        if (fp.getAxis() != Direction.Axis.Y) {
-            final BooleanProperty bzb6 = VineBlock.PROPERTY_BY_DIRECTION.get(fp);
-            final BlockState byj7 = bjg.getBlockState(fk.above());
-            return byj7.getBlock() == this && byj7.<Boolean>getValue((Property<Boolean>)bzb6);
+        if (fz.getAxis() != Direction.Axis.Y) {
+            final BooleanProperty cga6 = VineBlock.PROPERTY_BY_DIRECTION.get(fz);
+            final BlockState cfj7 = bpg.getBlockState(fu.above());
+            return cfj7.is(this) && cfj7.<Boolean>getValue((Property<Boolean>)cga6);
         }
         return false;
     }
     
-    public static boolean isAcceptableNeighbour(final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        final BlockState byj4 = bjg.getBlockState(fk);
-        return Block.isFaceFull(byj4.getCollisionShape(bjg, fk), fp.getOpposite());
+    public static boolean isAcceptableNeighbour(final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        final BlockState cfj4 = bpg.getBlockState(fu);
+        return Block.isFaceFull(cfj4.getCollisionShape(bpg, fu), fz.getOpposite());
     }
     
-    private BlockState getUpdatedState(BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        final BlockPos fk2 = fk.above();
-        if (byj.<Boolean>getValue((Property<Boolean>)VineBlock.UP)) {
-            byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.UP, isAcceptableNeighbour(bjg, fk2, Direction.DOWN));
+    private BlockState getUpdatedState(BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        final BlockPos fu2 = fu.above();
+        if (cfj.<Boolean>getValue((Property<Boolean>)VineBlock.UP)) {
+            cfj = ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.UP, isAcceptableNeighbour(bpg, fu2, Direction.DOWN));
         }
-        BlockState byj2 = null;
-        for (final Direction fp8 : Direction.Plane.HORIZONTAL) {
-            final BooleanProperty bzb9 = getPropertyForFace(fp8);
-            if (byj.<Boolean>getValue((Property<Boolean>)bzb9)) {
-                boolean boolean10 = this.canSupportAtFace(bjg, fk, fp8);
+        BlockState cfj2 = null;
+        for (final Direction fz8 : Direction.Plane.HORIZONTAL) {
+            final BooleanProperty cga9 = getPropertyForFace(fz8);
+            if (cfj.<Boolean>getValue((Property<Boolean>)cga9)) {
+                boolean boolean10 = this.canSupportAtFace(bpg, fu, fz8);
                 if (!boolean10) {
-                    if (byj2 == null) {
-                        byj2 = bjg.getBlockState(fk2);
+                    if (cfj2 == null) {
+                        cfj2 = bpg.getBlockState(fu2);
                     }
-                    boolean10 = (byj2.getBlock() == this && byj2.<Boolean>getValue((Property<Boolean>)bzb9));
+                    boolean10 = (cfj2.is(this) && cfj2.<Boolean>getValue((Property<Boolean>)cga9));
                 }
-                byj = ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)bzb9, boolean10);
+                cfj = ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)cga9, boolean10);
             }
         }
-        return byj;
+        return cfj;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == Direction.DOWN) {
-            return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == Direction.DOWN) {
+            return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
         }
-        final BlockState byj4 = this.getUpdatedState(byj1, bjx, fk5);
-        if (!this.hasFaces(byj4)) {
+        final BlockState cfj4 = this.getUpdatedState(cfj1, bqc, fu5);
+        if (!this.hasFaces(cfj4)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return byj4;
+        return cfj4;
     }
     
     @Override
-    public void tick(final BlockState byj, final ServerLevel xd, final BlockPos fk, final Random random) {
-        final BlockState byj2 = this.getUpdatedState(byj, xd, fk);
-        if (byj2 != byj) {
-            if (this.hasFaces(byj2)) {
-                xd.setBlock(fk, byj2, 2);
-            }
-            else {
-                Block.dropResources(byj, xd, fk);
-                xd.removeBlock(fk, false);
-            }
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        if (zd.random.nextInt(4) != 0) {
             return;
         }
-        if (xd.random.nextInt(4) != 0) {
-            return;
-        }
-        final Direction fp7 = Direction.getRandomFace(random);
-        final BlockPos fk2 = fk.above();
-        if (!fp7.getAxis().isHorizontal() || byj.<Boolean>getValue((Property<Boolean>)getPropertyForFace(fp7))) {
-            if (fp7 == Direction.UP && fk.getY() < 255) {
-                if (this.canSupportAtFace(xd, fk, fp7)) {
-                    xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.UP, true), 2);
+        final Direction fz6 = Direction.getRandom(random);
+        final BlockPos fu2 = fu.above();
+        if (!fz6.getAxis().isHorizontal() || cfj.<Boolean>getValue((Property<Boolean>)getPropertyForFace(fz6))) {
+            if (fz6 == Direction.UP && fu.getY() < 255) {
+                if (this.canSupportAtFace(zd, fu, fz6)) {
+                    zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.UP, true), 2);
                     return;
                 }
-                if (xd.isEmptyBlock(fk2)) {
-                    if (!this.canSpread(xd, fk)) {
+                if (zd.isEmptyBlock(fu2)) {
+                    if (!this.canSpread(zd, fu)) {
                         return;
                     }
-                    BlockState byj3 = byj;
-                    for (final Direction fp8 : Direction.Plane.HORIZONTAL) {
-                        if (random.nextBoolean() || !isAcceptableNeighbour(xd, fk2.relative(fp8), Direction.UP)) {
-                            byj3 = ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fp8), false);
+                    BlockState cfj2 = cfj;
+                    for (final Direction fz7 : Direction.Plane.HORIZONTAL) {
+                        if (random.nextBoolean() || !isAcceptableNeighbour(zd, fu2.relative(fz7), Direction.UP)) {
+                            cfj2 = ((StateHolder<O, BlockState>)cfj2).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fz7), false);
                         }
                     }
-                    if (this.hasHorizontalConnection(byj3)) {
-                        xd.setBlock(fk2, byj3, 2);
+                    if (this.hasHorizontalConnection(cfj2)) {
+                        zd.setBlock(fu2, cfj2, 2);
                     }
                     return;
                 }
             }
-            if (fk.getY() > 0) {
-                final BlockPos fk3 = fk.below();
-                final BlockState byj4 = xd.getBlockState(fk3);
-                if (byj4.isAir() || byj4.getBlock() == this) {
-                    final BlockState byj5 = byj4.isAir() ? this.defaultBlockState() : byj4;
-                    final BlockState byj6 = this.copyRandomFaces(byj, byj5, random);
-                    if (byj5 != byj6 && this.hasHorizontalConnection(byj6)) {
-                        xd.setBlock(fk3, byj6, 2);
+            if (fu.getY() > 0) {
+                final BlockPos fu3 = fu.below();
+                final BlockState cfj3 = zd.getBlockState(fu3);
+                if (cfj3.isAir() || cfj3.is(this)) {
+                    final BlockState cfj4 = cfj3.isAir() ? this.defaultBlockState() : cfj3;
+                    final BlockState cfj5 = this.copyRandomFaces(cfj, cfj4, random);
+                    if (cfj4 != cfj5 && this.hasHorizontalConnection(cfj5)) {
+                        zd.setBlock(fu3, cfj5, 2);
                     }
                 }
             }
             return;
         }
-        if (!this.canSpread(xd, fk)) {
+        if (!this.canSpread(zd, fu)) {
             return;
         }
-        final BlockPos fk3 = fk.relative(fp7);
-        final BlockState byj4 = xd.getBlockState(fk3);
-        if (byj4.isAir()) {
-            final Direction fp8 = fp7.getClockWise();
-            final Direction fp9 = fp7.getCounterClockWise();
-            final boolean boolean13 = byj.<Boolean>getValue((Property<Boolean>)getPropertyForFace(fp8));
-            final boolean boolean14 = byj.<Boolean>getValue((Property<Boolean>)getPropertyForFace(fp9));
-            final BlockPos fk4 = fk3.relative(fp8);
-            final BlockPos fk5 = fk3.relative(fp9);
-            if (boolean13 && isAcceptableNeighbour(xd, fk4, fp8)) {
-                xd.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fp8), true), 2);
+        final BlockPos fu3 = fu.relative(fz6);
+        final BlockState cfj3 = zd.getBlockState(fu3);
+        if (cfj3.isAir()) {
+            final Direction fz7 = fz6.getClockWise();
+            final Direction fz8 = fz6.getCounterClockWise();
+            final boolean boolean12 = cfj.<Boolean>getValue((Property<Boolean>)getPropertyForFace(fz7));
+            final boolean boolean13 = cfj.<Boolean>getValue((Property<Boolean>)getPropertyForFace(fz8));
+            final BlockPos fu4 = fu3.relative(fz7);
+            final BlockPos fu5 = fu3.relative(fz8);
+            if (boolean12 && isAcceptableNeighbour(zd, fu4, fz7)) {
+                zd.setBlock(fu3, ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fz7), true), 2);
             }
-            else if (boolean14 && isAcceptableNeighbour(xd, fk5, fp9)) {
-                xd.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fp9), true), 2);
+            else if (boolean13 && isAcceptableNeighbour(zd, fu5, fz8)) {
+                zd.setBlock(fu3, ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fz8), true), 2);
             }
             else {
-                final Direction fp10 = fp7.getOpposite();
-                if (boolean13 && xd.isEmptyBlock(fk4) && isAcceptableNeighbour(xd, fk.relative(fp8), fp10)) {
-                    xd.setBlock(fk4, ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fp10), true), 2);
+                final Direction fz9 = fz6.getOpposite();
+                if (boolean12 && zd.isEmptyBlock(fu4) && isAcceptableNeighbour(zd, fu.relative(fz7), fz9)) {
+                    zd.setBlock(fu4, ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fz9), true), 2);
                 }
-                else if (boolean14 && xd.isEmptyBlock(fk5) && isAcceptableNeighbour(xd, fk.relative(fp9), fp10)) {
-                    xd.setBlock(fk5, ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fp10), true), 2);
+                else if (boolean13 && zd.isEmptyBlock(fu5) && isAcceptableNeighbour(zd, fu.relative(fz8), fz9)) {
+                    zd.setBlock(fu5, ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fz9), true), 2);
                 }
-                else if (xd.random.nextFloat() < 0.05 && isAcceptableNeighbour(xd, fk3.above(), Direction.UP)) {
-                    xd.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.UP, true), 2);
+                else if (zd.random.nextFloat() < 0.05 && isAcceptableNeighbour(zd, fu3.above(), Direction.UP)) {
+                    zd.setBlock(fu3, ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.UP, true), 2);
                 }
             }
         }
-        else if (isAcceptableNeighbour(xd, fk3, fp7)) {
-            xd.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fp7), true), 2);
+        else if (isAcceptableNeighbour(zd, fu3, fz6)) {
+            zd.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)getPropertyForFace(fz6), true), 2);
         }
     }
     
-    private BlockState copyRandomFaces(final BlockState byj1, BlockState byj2, final Random random) {
-        for (final Direction fp6 : Direction.Plane.HORIZONTAL) {
+    private BlockState copyRandomFaces(final BlockState cfj1, BlockState cfj2, final Random random) {
+        for (final Direction fz6 : Direction.Plane.HORIZONTAL) {
             if (random.nextBoolean()) {
-                final BooleanProperty bzb7 = getPropertyForFace(fp6);
-                if (!byj1.<Boolean>getValue((Property<Boolean>)bzb7)) {
+                final BooleanProperty cga7 = getPropertyForFace(fz6);
+                if (!cfj1.<Boolean>getValue((Property<Boolean>)cga7)) {
                     continue;
                 }
-                byj2 = ((AbstractStateHolder<O, BlockState>)byj2).<Comparable, Boolean>setValue((Property<Comparable>)bzb7, true);
+                cfj2 = ((StateHolder<O, BlockState>)cfj2).<Comparable, Boolean>setValue((Property<Comparable>)cga7, true);
             }
         }
-        return byj2;
+        return cfj2;
     }
     
-    private boolean hasHorizontalConnection(final BlockState byj) {
-        return byj.<Boolean>getValue((Property<Boolean>)VineBlock.NORTH) || byj.<Boolean>getValue((Property<Boolean>)VineBlock.EAST) || byj.<Boolean>getValue((Property<Boolean>)VineBlock.SOUTH) || byj.<Boolean>getValue((Property<Boolean>)VineBlock.WEST);
+    private boolean hasHorizontalConnection(final BlockState cfj) {
+        return cfj.<Boolean>getValue((Property<Boolean>)VineBlock.NORTH) || cfj.<Boolean>getValue((Property<Boolean>)VineBlock.EAST) || cfj.<Boolean>getValue((Property<Boolean>)VineBlock.SOUTH) || cfj.<Boolean>getValue((Property<Boolean>)VineBlock.WEST);
     }
     
-    private boolean canSpread(final BlockGetter bjg, final BlockPos fk) {
+    private boolean canSpread(final BlockGetter bpg, final BlockPos fu) {
         final int integer4 = 4;
-        final Iterable<BlockPos> iterable5 = BlockPos.betweenClosed(fk.getX() - 4, fk.getY() - 1, fk.getZ() - 4, fk.getX() + 4, fk.getY() + 1, fk.getZ() + 4);
+        final Iterable<BlockPos> iterable5 = BlockPos.betweenClosed(fu.getX() - 4, fu.getY() - 1, fu.getZ() - 4, fu.getX() + 4, fu.getY() + 1, fu.getZ() + 4);
         int integer5 = 5;
-        for (final BlockPos fk2 : iterable5) {
-            if (bjg.getBlockState(fk2).getBlock() == this && --integer5 <= 0) {
+        for (final BlockPos fu2 : iterable5) {
+            if (bpg.getBlockState(fu2).is(this) && --integer5 <= 0) {
                 return false;
             }
         }
@@ -255,30 +244,30 @@ public class VineBlock extends Block {
     }
     
     @Override
-    public boolean canBeReplaced(final BlockState byj, final BlockPlaceContext bcq) {
-        final BlockState byj2 = bcq.getLevel().getBlockState(bcq.getClickedPos());
-        if (byj2.getBlock() == this) {
-            return this.countFaces(byj2) < VineBlock.PROPERTY_BY_DIRECTION.size();
+    public boolean canBeReplaced(final BlockState cfj, final BlockPlaceContext bin) {
+        final BlockState cfj2 = bin.getLevel().getBlockState(bin.getClickedPos());
+        if (cfj2.is(this)) {
+            return this.countFaces(cfj2) < VineBlock.PROPERTY_BY_DIRECTION.size();
         }
-        return super.canBeReplaced(byj, bcq);
+        return super.canBeReplaced(cfj, bin);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final BlockState byj3 = bcq.getLevel().getBlockState(bcq.getClickedPos());
-        final boolean boolean4 = byj3.getBlock() == this;
-        final BlockState byj4 = boolean4 ? byj3 : this.defaultBlockState();
-        for (final Direction fp9 : bcq.getNearestLookingDirections()) {
-            if (fp9 != Direction.DOWN) {
-                final BooleanProperty bzb10 = getPropertyForFace(fp9);
-                final boolean boolean5 = boolean4 && byj3.<Boolean>getValue((Property<Boolean>)bzb10);
-                if (!boolean5 && this.canSupportAtFace(bcq.getLevel(), bcq.getClickedPos(), fp9)) {
-                    return ((AbstractStateHolder<O, BlockState>)byj4).<Comparable, Boolean>setValue((Property<Comparable>)bzb10, true);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final BlockState cfj3 = bin.getLevel().getBlockState(bin.getClickedPos());
+        final boolean boolean4 = cfj3.is(this);
+        final BlockState cfj4 = boolean4 ? cfj3 : this.defaultBlockState();
+        for (final Direction fz9 : bin.getNearestLookingDirections()) {
+            if (fz9 != Direction.DOWN) {
+                final BooleanProperty cga10 = getPropertyForFace(fz9);
+                final boolean boolean5 = boolean4 && cfj3.<Boolean>getValue((Property<Boolean>)cga10);
+                if (!boolean5 && this.canSupportAtFace(bin.getLevel(), bin.getClickedPos(), fz9)) {
+                    return ((StateHolder<O, BlockState>)cfj4).<Comparable, Boolean>setValue((Property<Comparable>)cga10, true);
                 }
             }
         }
-        return boolean4 ? byj4 : null;
+        return boolean4 ? cfj4 : null;
     }
     
     @Override
@@ -287,40 +276,40 @@ public class VineBlock extends Block {
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        switch (btu) {
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        switch (cap) {
             case CLOCKWISE_180: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)VineBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)VineBlock.SOUTH))).setValue((Property<Comparable>)VineBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)VineBlock.WEST))).setValue((Property<Comparable>)VineBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)VineBlock.NORTH))).<Comparable, Comparable>setValue((Property<Comparable>)VineBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)VineBlock.EAST));
+                return (((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)VineBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.SOUTH))).setValue((Property<Comparable>)VineBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.WEST))).setValue((Property<Comparable>)VineBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.NORTH))).<Comparable, Comparable>setValue((Property<Comparable>)VineBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.EAST));
             }
             case COUNTERCLOCKWISE_90: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)VineBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)VineBlock.EAST))).setValue((Property<Comparable>)VineBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)VineBlock.SOUTH))).setValue((Property<Comparable>)VineBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)VineBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)VineBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)VineBlock.NORTH));
+                return (((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)VineBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.EAST))).setValue((Property<Comparable>)VineBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.SOUTH))).setValue((Property<Comparable>)VineBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)VineBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.NORTH));
             }
             case CLOCKWISE_90: {
-                return (((((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)VineBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)VineBlock.WEST))).setValue((Property<Comparable>)VineBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)VineBlock.NORTH))).setValue((Property<Comparable>)VineBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)VineBlock.EAST))).<Comparable, Comparable>setValue((Property<Comparable>)VineBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)VineBlock.SOUTH));
+                return (((((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)VineBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.WEST))).setValue((Property<Comparable>)VineBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.NORTH))).setValue((Property<Comparable>)VineBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.EAST))).<Comparable, Comparable>setValue((Property<Comparable>)VineBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.SOUTH));
             }
             default: {
-                return byj;
+                return cfj;
             }
         }
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        switch (bsu) {
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        switch (bzj) {
             case LEFT_RIGHT: {
-                return (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)VineBlock.NORTH, (Comparable)byj.<V>getValue((Property<V>)VineBlock.SOUTH))).<Comparable, Comparable>setValue((Property<Comparable>)VineBlock.SOUTH, (Comparable)byj.<V>getValue((Property<V>)VineBlock.NORTH));
+                return (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)VineBlock.NORTH, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.SOUTH))).<Comparable, Comparable>setValue((Property<Comparable>)VineBlock.SOUTH, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.NORTH));
             }
             case FRONT_BACK: {
-                return (((AbstractStateHolder<O, BlockState>)byj).setValue((Property<Comparable>)VineBlock.EAST, (Comparable)byj.<V>getValue((Property<V>)VineBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)VineBlock.WEST, (Comparable)byj.<V>getValue((Property<V>)VineBlock.EAST));
+                return (((StateHolder<O, BlockState>)cfj).setValue((Property<Comparable>)VineBlock.EAST, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.WEST))).<Comparable, Comparable>setValue((Property<Comparable>)VineBlock.WEST, (Comparable)cfj.<V>getValue((Property<V>)VineBlock.EAST));
             }
             default: {
-                return super.mirror(byj, bsu);
+                return super.mirror(cfj, bzj);
             }
         }
     }
     
-    public static BooleanProperty getPropertyForFace(final Direction fp) {
-        return VineBlock.PROPERTY_BY_DIRECTION.get(fp);
+    public static BooleanProperty getPropertyForFace(final Direction fz) {
+        return VineBlock.PROPERTY_BY_DIRECTION.get(fz);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/WallBannerBlock.java b/src/net/minecraft/world/level/block/WallBannerBlock.java
index a340d6f..a32db21 100644
--- a/src/net/minecraft/world/level/block/WallBannerBlock.java
+++ b/src/net/minecraft/world/level/block/WallBannerBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -12,6 +12,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
@@ -22,9 +23,9 @@ public class WallBannerBlock extends AbstractBannerBlock {
     public static final DirectionProperty FACING;
     private static final Map<Direction, VoxelShape> SHAPES;
     
-    public WallBannerBlock(final DyeColor bdj, final Properties c) {
-        super(bdj, c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)WallBannerBlock.FACING, Direction.NORTH));
+    public WallBannerBlock(final DyeColor bje, final Properties c) {
+        super(bje, c);
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)WallBannerBlock.FACING, Direction.NORTH));
     }
     
     @Override
@@ -33,36 +34,36 @@ public class WallBannerBlock extends AbstractBannerBlock {
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return bjz.getBlockState(fk.relative(byj.<Direction>getValue((Property<Direction>)WallBannerBlock.FACING).getOpposite())).getMaterial().isSolid();
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return bqd.getBlockState(fu.relative(cfj.<Direction>getValue((Property<Direction>)WallBannerBlock.FACING).getOpposite())).getMaterial().isSolid();
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp == byj1.<Direction>getValue((Property<Direction>)WallBannerBlock.FACING).getOpposite() && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz == cfj1.<Direction>getValue((Property<Direction>)WallBannerBlock.FACING).getOpposite() && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return WallBannerBlock.SHAPES.get(byj.getValue((Property<Object>)WallBannerBlock.FACING));
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return WallBannerBlock.SHAPES.get(cfj.getValue((Property<Object>)WallBannerBlock.FACING));
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        BlockState byj3 = this.defaultBlockState();
-        final LevelReader bjz4 = bcq.getLevel();
-        final BlockPos fk5 = bcq.getClickedPos();
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        BlockState cfj3 = this.defaultBlockState();
+        final LevelReader bqd4 = bin.getLevel();
+        final BlockPos fu5 = bin.getClickedPos();
         final Direction[] nearestLookingDirections;
-        final Direction[] arr6 = nearestLookingDirections = bcq.getNearestLookingDirections();
-        for (final Direction fp10 : nearestLookingDirections) {
-            if (fp10.getAxis().isHorizontal()) {
-                final Direction fp11 = fp10.getOpposite();
-                byj3 = ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Direction>setValue((Property<Comparable>)WallBannerBlock.FACING, fp11);
-                if (byj3.canSurvive(bjz4, fk5)) {
-                    return byj3;
+        final Direction[] arr6 = nearestLookingDirections = bin.getNearestLookingDirections();
+        for (final Direction fz10 : nearestLookingDirections) {
+            if (fz10.getAxis().isHorizontal()) {
+                final Direction fz11 = fz10.getOpposite();
+                cfj3 = ((StateHolder<O, BlockState>)cfj3).<Comparable, Direction>setValue((Property<Comparable>)WallBannerBlock.FACING, fz11);
+                if (cfj3.canSurvive(bqd4, fu5)) {
+                    return cfj3;
                 }
             }
         }
@@ -70,13 +71,13 @@ public class WallBannerBlock extends AbstractBannerBlock {
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)WallBannerBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)WallBannerBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)WallBannerBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)WallBannerBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)WallBannerBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)WallBannerBlock.FACING)));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/WallBlock.java b/src/net/minecraft/world/level/block/WallBlock.java
index e26824f..dd0fa53 100644
--- a/src/net/minecraft/world/level/block/WallBlock.java
+++ b/src/net/minecraft/world/level/block/WallBlock.java
@@ -1,107 +1,292 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.item.BlockPlaceContext;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
+import java.util.Iterator;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.Map;
+import net.minecraft.world.level.block.state.properties.WallSide;
+import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
-public class WallBlock extends CrossCollisionBlock {
+public class WallBlock extends Block implements SimpleWaterloggedBlock {
     public static final BooleanProperty UP;
-    private final VoxelShape[] shapeWithPostByIndex;
-    private final VoxelShape[] collisionShapeWithPostByIndex;
+    public static final EnumProperty<WallSide> EAST_WALL;
+    public static final EnumProperty<WallSide> NORTH_WALL;
+    public static final EnumProperty<WallSide> SOUTH_WALL;
+    public static final EnumProperty<WallSide> WEST_WALL;
+    public static final BooleanProperty WATERLOGGED;
+    private final Map<BlockState, VoxelShape> shapeByIndex;
+    private final Map<BlockState, VoxelShape> collisionShapeByIndex;
+    private static final VoxelShape POST_TEST;
+    private static final VoxelShape NORTH_TEST;
+    private static final VoxelShape SOUTH_TEST;
+    private static final VoxelShape WEST_TEST;
+    private static final VoxelShape EAST_TEST;
     
     public WallBlock(final Properties c) {
-        super(0.0f, 3.0f, 0.0f, 14.0f, 24.0f, c);
-        this.registerDefaultState((((((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)WallBlock.UP, true)).setValue((Property<Comparable>)WallBlock.NORTH, false)).setValue((Property<Comparable>)WallBlock.EAST, false)).setValue((Property<Comparable>)WallBlock.SOUTH, false)).setValue((Property<Comparable>)WallBlock.WEST, false)).<Comparable, Boolean>setValue((Property<Comparable>)WallBlock.WATERLOGGED, false));
-        this.shapeWithPostByIndex = this.makeShapes(4.0f, 3.0f, 16.0f, 0.0f, 14.0f);
-        this.collisionShapeWithPostByIndex = this.makeShapes(4.0f, 3.0f, 24.0f, 0.0f, 24.0f);
+        super(c);
+        this.registerDefaultState((((((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)WallBlock.UP, true)).setValue(WallBlock.NORTH_WALL, WallSide.NONE)).setValue(WallBlock.EAST_WALL, WallSide.NONE)).setValue(WallBlock.SOUTH_WALL, WallSide.NONE)).setValue(WallBlock.WEST_WALL, WallSide.NONE)).<Comparable, Boolean>setValue((Property<Comparable>)WallBlock.WATERLOGGED, false));
+        this.shapeByIndex = this.makeShapes(4.0f, 3.0f, 16.0f, 0.0f, 14.0f, 16.0f);
+        this.collisionShapeByIndex = this.makeShapes(4.0f, 3.0f, 24.0f, 0.0f, 24.0f, 24.0f);
     }
     
-    @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (byj.<Boolean>getValue((Property<Boolean>)WallBlock.UP)) {
-            return this.shapeWithPostByIndex[this.getAABBIndex(byj)];
+    private static VoxelShape applyWallShape(final VoxelShape dfg1, final WallSide cgr, final VoxelShape dfg3, final VoxelShape dfg4) {
+        if (cgr == WallSide.TALL) {
+            return Shapes.or(dfg1, dfg4);
         }
-        return super.getShape(byj, bjg, fk, cvq);
-    }
-    
-    @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (byj.<Boolean>getValue((Property<Boolean>)WallBlock.UP)) {
-            return this.collisionShapeWithPostByIndex[this.getAABBIndex(byj)];
+        if (cgr == WallSide.LOW) {
+            return Shapes.or(dfg1, dfg3);
         }
-        return super.getCollisionShape(byj, bjg, fk, cvq);
+        return dfg1;
+    }
+    
+    private Map<BlockState, VoxelShape> makeShapes(final float float1, final float float2, final float float3, final float float4, final float float5, final float float6) {
+        final float float7 = 8.0f - float1;
+        final float float8 = 8.0f + float1;
+        final float float9 = 8.0f - float2;
+        final float float10 = 8.0f + float2;
+        final VoxelShape dfg12 = Block.box(float7, 0.0, float7, float8, float3, float8);
+        final VoxelShape dfg13 = Block.box(float9, float4, 0.0, float10, float5, float10);
+        final VoxelShape dfg14 = Block.box(float9, float4, float9, float10, float5, 16.0);
+        final VoxelShape dfg15 = Block.box(0.0, float4, float9, float10, float5, float10);
+        final VoxelShape dfg16 = Block.box(float9, float4, float9, 16.0, float5, float10);
+        final VoxelShape dfg17 = Block.box(float9, float4, 0.0, float10, float6, float10);
+        final VoxelShape dfg18 = Block.box(float9, float4, float9, float10, float6, 16.0);
+        final VoxelShape dfg19 = Block.box(0.0, float4, float9, float10, float6, float10);
+        final VoxelShape dfg20 = Block.box(float9, float4, float9, 16.0, float6, float10);
+        final ImmutableMap.Builder<BlockState, VoxelShape> builder21 = ImmutableMap.<BlockState, VoxelShape>builder();
+        for (final Boolean boolean23 : WallBlock.UP.getPossibleValues()) {
+            for (final WallSide cgr25 : WallBlock.EAST_WALL.getPossibleValues()) {
+                for (final WallSide cgr26 : WallBlock.NORTH_WALL.getPossibleValues()) {
+                    for (final WallSide cgr27 : WallBlock.WEST_WALL.getPossibleValues()) {
+                        for (final WallSide cgr28 : WallBlock.SOUTH_WALL.getPossibleValues()) {
+                            VoxelShape dfg21 = Shapes.empty();
+                            dfg21 = applyWallShape(dfg21, cgr25, dfg16, dfg20);
+                            dfg21 = applyWallShape(dfg21, cgr27, dfg15, dfg19);
+                            dfg21 = applyWallShape(dfg21, cgr26, dfg13, dfg17);
+                            dfg21 = applyWallShape(dfg21, cgr28, dfg14, dfg18);
+                            if (boolean23) {
+                                dfg21 = Shapes.or(dfg21, dfg12);
+                            }
+                            final BlockState cfj33 = ((((((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)WallBlock.UP, boolean23)).setValue(WallBlock.EAST_WALL, cgr25)).setValue(WallBlock.WEST_WALL, cgr27)).setValue(WallBlock.NORTH_WALL, cgr26)).<WallSide, WallSide>setValue(WallBlock.SOUTH_WALL, cgr28);
+                            builder21.put(((StateHolder<O, BlockState>)cfj33).<Comparable, Boolean>setValue((Property<Comparable>)WallBlock.WATERLOGGED, false), dfg21);
+                            builder21.put(((StateHolder<O, BlockState>)cfj33).<Comparable, Boolean>setValue((Property<Comparable>)WallBlock.WATERLOGGED, true), dfg21);
+                        }
+                    }
+                }
+            }
+        }
+        return builder21.build();
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.shapeByIndex.get(cfj);
+    }
+    
+    @Override
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.collisionShapeByIndex.get(cfj);
+    }
+    
+    @Override
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
-    private boolean connectsTo(final BlockState byj, final boolean boolean2, final Direction fp) {
-        final Block bph5 = byj.getBlock();
-        final boolean boolean3 = bph5.is(BlockTags.WALLS) || (bph5 instanceof FenceGateBlock && FenceGateBlock.connectsToDirection(byj, fp));
-        return (!Block.isExceptionForConnection(bph5) && boolean2) || boolean3;
+    private boolean connectsTo(final BlockState cfj, final boolean boolean2, final Direction fz) {
+        final Block bvr5 = cfj.getBlock();
+        final boolean boolean3 = bvr5 instanceof FenceGateBlock && FenceGateBlock.connectsToDirection(cfj, fz);
+        return cfj.is(BlockTags.WALLS) || (!Block.isExceptionForConnection(bvr5) && boolean2) || bvr5 instanceof IronBarsBlock || boolean3;
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        final LevelReader bjz3 = bcq.getLevel();
-        final BlockPos fk4 = bcq.getClickedPos();
-        final FluidState coj5 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        final BlockPos fk5 = fk4.north();
-        final BlockPos fk6 = fk4.east();
-        final BlockPos fk7 = fk4.south();
-        final BlockPos fk8 = fk4.west();
-        final BlockState byj10 = bjz3.getBlockState(fk5);
-        final BlockState byj11 = bjz3.getBlockState(fk6);
-        final BlockState byj12 = bjz3.getBlockState(fk7);
-        final BlockState byj13 = bjz3.getBlockState(fk8);
-        final boolean boolean14 = this.connectsTo(byj10, byj10.isFaceSturdy(bjz3, fk5, Direction.SOUTH), Direction.SOUTH);
-        final boolean boolean15 = this.connectsTo(byj11, byj11.isFaceSturdy(bjz3, fk6, Direction.WEST), Direction.WEST);
-        final boolean boolean16 = this.connectsTo(byj12, byj12.isFaceSturdy(bjz3, fk7, Direction.NORTH), Direction.NORTH);
-        final boolean boolean17 = this.connectsTo(byj13, byj13.isFaceSturdy(bjz3, fk8, Direction.EAST), Direction.EAST);
-        final boolean boolean18 = (!boolean14 || boolean15 || !boolean16 || boolean17) && (boolean14 || !boolean15 || boolean16 || !boolean17);
-        return (((((((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)WallBlock.UP, boolean18 || !bjz3.isEmptyBlock(fk4.above()))).setValue((Property<Comparable>)WallBlock.NORTH, boolean14)).setValue((Property<Comparable>)WallBlock.EAST, boolean15)).setValue((Property<Comparable>)WallBlock.SOUTH, boolean16)).setValue((Property<Comparable>)WallBlock.WEST, boolean17)).<Comparable, Boolean>setValue((Property<Comparable>)WallBlock.WATERLOGGED, coj5.getType() == Fluids.WATER);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        final LevelReader bqd3 = bin.getLevel();
+        final BlockPos fu4 = bin.getClickedPos();
+        final FluidState cxa5 = bin.getLevel().getFluidState(bin.getClickedPos());
+        final BlockPos fu5 = fu4.north();
+        final BlockPos fu6 = fu4.east();
+        final BlockPos fu7 = fu4.south();
+        final BlockPos fu8 = fu4.west();
+        final BlockPos fu9 = fu4.above();
+        final BlockState cfj11 = bqd3.getBlockState(fu5);
+        final BlockState cfj12 = bqd3.getBlockState(fu6);
+        final BlockState cfj13 = bqd3.getBlockState(fu7);
+        final BlockState cfj14 = bqd3.getBlockState(fu8);
+        final BlockState cfj15 = bqd3.getBlockState(fu9);
+        final boolean boolean16 = this.connectsTo(cfj11, cfj11.isFaceSturdy(bqd3, fu5, Direction.SOUTH), Direction.SOUTH);
+        final boolean boolean17 = this.connectsTo(cfj12, cfj12.isFaceSturdy(bqd3, fu6, Direction.WEST), Direction.WEST);
+        final boolean boolean18 = this.connectsTo(cfj13, cfj13.isFaceSturdy(bqd3, fu7, Direction.NORTH), Direction.NORTH);
+        final boolean boolean19 = this.connectsTo(cfj14, cfj14.isFaceSturdy(bqd3, fu8, Direction.EAST), Direction.EAST);
+        final BlockState cfj16 = ((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)WallBlock.WATERLOGGED, cxa5.getType() == Fluids.WATER);
+        return this.updateShape(bqd3, cfj16, fu9, cfj15, boolean16, boolean17, boolean18, boolean19);
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (byj1.<Boolean>getValue((Property<Boolean>)WallBlock.WATERLOGGED)) {
-            bjx.getLiquidTicks().scheduleTick(fk5, Fluids.WATER, Fluids.WATER.getTickDelay(bjx));
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (cfj1.<Boolean>getValue((Property<Boolean>)WallBlock.WATERLOGGED)) {
+            bqc.getLiquidTicks().scheduleTick(fu5, Fluids.WATER, Fluids.WATER.getTickDelay(bqc));
         }
-        if (fp == Direction.DOWN) {
-            return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        if (fz == Direction.DOWN) {
+            return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
         }
-        final Direction fp2 = fp.getOpposite();
-        final boolean boolean9 = (fp == Direction.NORTH) ? this.connectsTo(byj3, byj3.isFaceSturdy(bjx, fk6, fp2), fp2) : byj1.<Boolean>getValue((Property<Boolean>)WallBlock.NORTH);
-        final boolean boolean10 = (fp == Direction.EAST) ? this.connectsTo(byj3, byj3.isFaceSturdy(bjx, fk6, fp2), fp2) : byj1.<Boolean>getValue((Property<Boolean>)WallBlock.EAST);
-        final boolean boolean11 = (fp == Direction.SOUTH) ? this.connectsTo(byj3, byj3.isFaceSturdy(bjx, fk6, fp2), fp2) : byj1.<Boolean>getValue((Property<Boolean>)WallBlock.SOUTH);
-        final boolean boolean12 = (fp == Direction.WEST) ? this.connectsTo(byj3, byj3.isFaceSturdy(bjx, fk6, fp2), fp2) : byj1.<Boolean>getValue((Property<Boolean>)WallBlock.WEST);
-        final boolean boolean13 = (!boolean9 || boolean10 || !boolean11 || boolean12) && (boolean9 || !boolean10 || boolean11 || !boolean12);
-        return ((((((AbstractStateHolder<O, BlockState>)byj1).setValue((Property<Comparable>)WallBlock.UP, boolean13 || !bjx.isEmptyBlock(fk5.above()))).setValue((Property<Comparable>)WallBlock.NORTH, boolean9)).setValue((Property<Comparable>)WallBlock.EAST, boolean10)).setValue((Property<Comparable>)WallBlock.SOUTH, boolean11)).<Comparable, Boolean>setValue((Property<Comparable>)WallBlock.WEST, boolean12);
+        if (fz == Direction.UP) {
+            return this.topUpdate(bqc, cfj1, fu6, cfj3);
+        }
+        return this.sideUpdate(bqc, fu5, cfj1, fu6, cfj3, fz);
+    }
+    
+    private static boolean isConnected(final BlockState cfj, final Property<WallSide> cgl) {
+        return cfj.<WallSide>getValue(cgl) != WallSide.NONE;
+    }
+    
+    private static boolean isCovered(final VoxelShape dfg1, final VoxelShape dfg2) {
+        return !Shapes.joinIsNotEmpty(dfg2, dfg1, BooleanOp.ONLY_FIRST);
+    }
+    
+    private BlockState topUpdate(final LevelReader bqd, final BlockState cfj2, final BlockPos fu, final BlockState cfj4) {
+        final boolean boolean6 = isConnected(cfj2, WallBlock.NORTH_WALL);
+        final boolean boolean7 = isConnected(cfj2, WallBlock.EAST_WALL);
+        final boolean boolean8 = isConnected(cfj2, WallBlock.SOUTH_WALL);
+        final boolean boolean9 = isConnected(cfj2, WallBlock.WEST_WALL);
+        return this.updateShape(bqd, cfj2, fu, cfj4, boolean6, boolean7, boolean8, boolean9);
+    }
+    
+    private BlockState sideUpdate(final LevelReader bqd, final BlockPos fu2, final BlockState cfj3, final BlockPos fu4, final BlockState cfj5, final Direction fz) {
+        final Direction fz2 = fz.getOpposite();
+        final boolean boolean9 = (fz == Direction.NORTH) ? this.connectsTo(cfj5, cfj5.isFaceSturdy(bqd, fu4, fz2), fz2) : isConnected(cfj3, WallBlock.NORTH_WALL);
+        final boolean boolean10 = (fz == Direction.EAST) ? this.connectsTo(cfj5, cfj5.isFaceSturdy(bqd, fu4, fz2), fz2) : isConnected(cfj3, WallBlock.EAST_WALL);
+        final boolean boolean11 = (fz == Direction.SOUTH) ? this.connectsTo(cfj5, cfj5.isFaceSturdy(bqd, fu4, fz2), fz2) : isConnected(cfj3, WallBlock.SOUTH_WALL);
+        final boolean boolean12 = (fz == Direction.WEST) ? this.connectsTo(cfj5, cfj5.isFaceSturdy(bqd, fu4, fz2), fz2) : isConnected(cfj3, WallBlock.WEST_WALL);
+        final BlockPos fu5 = fu2.above();
+        final BlockState cfj6 = bqd.getBlockState(fu5);
+        return this.updateShape(bqd, cfj3, fu5, cfj6, boolean9, boolean10, boolean11, boolean12);
+    }
+    
+    private BlockState updateShape(final LevelReader bqd, final BlockState cfj2, final BlockPos fu, final BlockState cfj4, final boolean boolean5, final boolean boolean6, final boolean boolean7, final boolean boolean8) {
+        final VoxelShape dfg10 = cfj4.getCollisionShape(bqd, fu).getFaceShape(Direction.DOWN);
+        final BlockState cfj5 = this.updateSides(cfj2, boolean5, boolean6, boolean7, boolean8, dfg10);
+        return ((StateHolder<O, BlockState>)cfj5).<Comparable, Boolean>setValue((Property<Comparable>)WallBlock.UP, this.shouldRaisePost(cfj5, cfj4, dfg10));
+    }
+    
+    private boolean shouldRaisePost(final BlockState cfj1, final BlockState cfj2, final VoxelShape dfg) {
+        final boolean boolean5 = cfj2.getBlock() instanceof WallBlock && cfj2.<Boolean>getValue((Property<Boolean>)WallBlock.UP);
+        if (boolean5) {
+            return true;
+        }
+        final WallSide cgr6 = cfj1.<WallSide>getValue(WallBlock.NORTH_WALL);
+        final WallSide cgr7 = cfj1.<WallSide>getValue(WallBlock.SOUTH_WALL);
+        final WallSide cgr8 = cfj1.<WallSide>getValue(WallBlock.EAST_WALL);
+        final WallSide cgr9 = cfj1.<WallSide>getValue(WallBlock.WEST_WALL);
+        final boolean boolean6 = cgr7 == WallSide.NONE;
+        final boolean boolean7 = cgr9 == WallSide.NONE;
+        final boolean boolean8 = cgr8 == WallSide.NONE;
+        final boolean boolean9 = cgr6 == WallSide.NONE;
+        final boolean boolean10 = (boolean9 && boolean6 && boolean7 && boolean8) || boolean9 != boolean6 || boolean7 != boolean8;
+        if (boolean10) {
+            return true;
+        }
+        final boolean boolean11 = (cgr6 == WallSide.TALL && cgr7 == WallSide.TALL) || (cgr8 == WallSide.TALL && cgr9 == WallSide.TALL);
+        return !boolean11 && (cfj2.getBlock().is(BlockTags.WALL_POST_OVERRIDE) || isCovered(dfg, WallBlock.POST_TEST));
+    }
+    
+    private BlockState updateSides(final BlockState cfj, final boolean boolean2, final boolean boolean3, final boolean boolean4, final boolean boolean5, final VoxelShape dfg) {
+        return (((((StateHolder<O, BlockState>)cfj).setValue(WallBlock.NORTH_WALL, this.makeWallState(boolean2, dfg, WallBlock.NORTH_TEST))).setValue(WallBlock.EAST_WALL, this.makeWallState(boolean3, dfg, WallBlock.EAST_TEST))).setValue(WallBlock.SOUTH_WALL, this.makeWallState(boolean4, dfg, WallBlock.SOUTH_TEST))).<WallSide, WallSide>setValue(WallBlock.WEST_WALL, this.makeWallState(boolean5, dfg, WallBlock.WEST_TEST));
+    }
+    
+    private WallSide makeWallState(final boolean boolean1, final VoxelShape dfg2, final VoxelShape dfg3) {
+        if (!boolean1) {
+            return WallSide.NONE;
+        }
+        if (isCovered(dfg2, dfg3)) {
+            return WallSide.TALL;
+        }
+        return WallSide.LOW;
+    }
+    
+    @Override
+    public FluidState getFluidState(final BlockState cfj) {
+        if (cfj.<Boolean>getValue((Property<Boolean>)WallBlock.WATERLOGGED)) {
+            return Fluids.WATER.getSource(false);
+        }
+        return super.getFluidState(cfj);
+    }
+    
+    @Override
+    public boolean propagatesSkylightDown(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return !cfj.<Boolean>getValue((Property<Boolean>)WallBlock.WATERLOGGED);
     }
     
     @Override
     protected void createBlockStateDefinition(final StateDefinition.Builder<Block, BlockState> a) {
-        a.add(WallBlock.UP, WallBlock.NORTH, WallBlock.EAST, WallBlock.WEST, WallBlock.SOUTH, WallBlock.WATERLOGGED);
+        a.add(WallBlock.UP, WallBlock.NORTH_WALL, WallBlock.EAST_WALL, WallBlock.WEST_WALL, WallBlock.SOUTH_WALL, WallBlock.WATERLOGGED);
+    }
+    
+    @Override
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        switch (cap) {
+            case CLOCKWISE_180: {
+                return (((((StateHolder<O, BlockState>)cfj).setValue(WallBlock.NORTH_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.SOUTH_WALL))).setValue(WallBlock.EAST_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.WEST_WALL))).setValue(WallBlock.SOUTH_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.NORTH_WALL))).<WallSide, Comparable>setValue(WallBlock.WEST_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.EAST_WALL));
+            }
+            case COUNTERCLOCKWISE_90: {
+                return (((((StateHolder<O, BlockState>)cfj).setValue(WallBlock.NORTH_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.EAST_WALL))).setValue(WallBlock.EAST_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.SOUTH_WALL))).setValue(WallBlock.SOUTH_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.WEST_WALL))).<WallSide, Comparable>setValue(WallBlock.WEST_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.NORTH_WALL));
+            }
+            case CLOCKWISE_90: {
+                return (((((StateHolder<O, BlockState>)cfj).setValue(WallBlock.NORTH_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.WEST_WALL))).setValue(WallBlock.EAST_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.NORTH_WALL))).setValue(WallBlock.SOUTH_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.EAST_WALL))).<WallSide, Comparable>setValue(WallBlock.WEST_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.SOUTH_WALL));
+            }
+            default: {
+                return cfj;
+            }
+        }
+    }
+    
+    @Override
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        switch (bzj) {
+            case LEFT_RIGHT: {
+                return (((StateHolder<O, BlockState>)cfj).setValue(WallBlock.NORTH_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.SOUTH_WALL))).<WallSide, Comparable>setValue(WallBlock.SOUTH_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.NORTH_WALL));
+            }
+            case FRONT_BACK: {
+                return (((StateHolder<O, BlockState>)cfj).setValue(WallBlock.EAST_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.WEST_WALL))).<WallSide, Comparable>setValue(WallBlock.WEST_WALL, (Comparable)cfj.<V>getValue((Property<V>)WallBlock.EAST_WALL));
+            }
+            default: {
+                return super.mirror(cfj, bzj);
+            }
+        }
     }
     
     static {
         UP = BlockStateProperties.UP;
+        EAST_WALL = BlockStateProperties.EAST_WALL;
+        NORTH_WALL = BlockStateProperties.NORTH_WALL;
+        SOUTH_WALL = BlockStateProperties.SOUTH_WALL;
+        WEST_WALL = BlockStateProperties.WEST_WALL;
+        WATERLOGGED = BlockStateProperties.WATERLOGGED;
+        POST_TEST = Block.box(7.0, 0.0, 7.0, 9.0, 16.0, 9.0);
+        NORTH_TEST = Block.box(7.0, 0.0, 0.0, 9.0, 16.0, 9.0);
+        SOUTH_TEST = Block.box(7.0, 0.0, 7.0, 9.0, 16.0, 16.0);
+        WEST_TEST = Block.box(0.0, 0.0, 7.0, 9.0, 16.0, 9.0);
+        EAST_TEST = Block.box(7.0, 0.0, 7.0, 16.0, 16.0, 9.0);
     }
 }
diff --git a/src/net/minecraft/world/level/block/WallSignBlock.java b/src/net/minecraft/world/level/block/WallSignBlock.java
index efc14f5..58536d3 100644
--- a/src/net/minecraft/world/level/block/WallSignBlock.java
+++ b/src/net/minecraft/world/level/block/WallSignBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -16,6 +16,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.WoodType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
 import java.util.Map;
@@ -25,9 +26,9 @@ public class WallSignBlock extends SignBlock {
     public static final DirectionProperty FACING;
     private static final Map<Direction, VoxelShape> AABBS;
     
-    public WallSignBlock(final Properties c, final WoodType bzs) {
-        super(c, bzs);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)WallSignBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)WallSignBlock.WATERLOGGED, false));
+    public WallSignBlock(final Properties c, final WoodType cgs) {
+        super(c, cgs);
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)WallSignBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)WallSignBlock.WATERLOGGED, false));
     }
     
     @Override
@@ -36,30 +37,30 @@ public class WallSignBlock extends SignBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return WallSignBlock.AABBS.get(byj.getValue((Property<Object>)WallSignBlock.FACING));
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return WallSignBlock.AABBS.get(cfj.getValue((Property<Object>)WallSignBlock.FACING));
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return bjz.getBlockState(fk.relative(byj.<Direction>getValue((Property<Direction>)WallSignBlock.FACING).getOpposite())).getMaterial().isSolid();
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return bqd.getBlockState(fu.relative(cfj.<Direction>getValue((Property<Direction>)WallSignBlock.FACING).getOpposite())).getMaterial().isSolid();
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        BlockState byj3 = this.defaultBlockState();
-        final FluidState coj4 = bcq.getLevel().getFluidState(bcq.getClickedPos());
-        final LevelReader bjz5 = bcq.getLevel();
-        final BlockPos fk6 = bcq.getClickedPos();
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        BlockState cfj3 = this.defaultBlockState();
+        final FluidState cxa4 = bin.getLevel().getFluidState(bin.getClickedPos());
+        final LevelReader bqd5 = bin.getLevel();
+        final BlockPos fu6 = bin.getClickedPos();
         final Direction[] nearestLookingDirections;
-        final Direction[] arr7 = nearestLookingDirections = bcq.getNearestLookingDirections();
-        for (final Direction fp11 : nearestLookingDirections) {
-            if (fp11.getAxis().isHorizontal()) {
-                final Direction fp12 = fp11.getOpposite();
-                byj3 = ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Direction>setValue((Property<Comparable>)WallSignBlock.FACING, fp12);
-                if (byj3.canSurvive(bjz5, fk6)) {
-                    return ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Boolean>setValue((Property<Comparable>)WallSignBlock.WATERLOGGED, coj4.getType() == Fluids.WATER);
+        final Direction[] arr7 = nearestLookingDirections = bin.getNearestLookingDirections();
+        for (final Direction fz11 : nearestLookingDirections) {
+            if (fz11.getAxis().isHorizontal()) {
+                final Direction fz12 = fz11.getOpposite();
+                cfj3 = ((StateHolder<O, BlockState>)cfj3).<Comparable, Direction>setValue((Property<Comparable>)WallSignBlock.FACING, fz12);
+                if (cfj3.canSurvive(bqd5, fu6)) {
+                    return ((StateHolder<O, BlockState>)cfj3).<Comparable, Boolean>setValue((Property<Comparable>)WallSignBlock.WATERLOGGED, cxa4.getType() == Fluids.WATER);
                 }
             }
         }
@@ -67,21 +68,21 @@ public class WallSignBlock extends SignBlock {
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp.getOpposite() == byj1.<Direction>getValue((Property<Direction>)WallSignBlock.FACING) && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz.getOpposite() == cfj1.<Direction>getValue((Property<Direction>)WallSignBlock.FACING) && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)WallSignBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)WallSignBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)WallSignBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)WallSignBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)WallSignBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)WallSignBlock.FACING)));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/WallSkullBlock.java b/src/net/minecraft/world/level/block/WallSkullBlock.java
index 9e3c677..333a764 100644
--- a/src/net/minecraft/world/level/block/WallSkullBlock.java
+++ b/src/net/minecraft/world/level/block/WallSkullBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -10,6 +10,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
 import java.util.Map;
@@ -21,7 +22,7 @@ public class WallSkullBlock extends AbstractSkullBlock {
     
     protected WallSkullBlock(final SkullBlock.Type a, final Properties c) {
         super(a, c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)WallSkullBlock.FACING, Direction.NORTH));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)WallSkullBlock.FACING, Direction.NORTH));
     }
     
     @Override
@@ -30,23 +31,23 @@ public class WallSkullBlock extends AbstractSkullBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return WallSkullBlock.AABBS.get(byj.getValue((Property<Object>)WallSkullBlock.FACING));
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return WallSkullBlock.AABBS.get(cfj.getValue((Property<Object>)WallSkullBlock.FACING));
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        BlockState byj3 = this.defaultBlockState();
-        final BlockGetter bjg4 = bcq.getLevel();
-        final BlockPos fk5 = bcq.getClickedPos();
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        BlockState cfj3 = this.defaultBlockState();
+        final BlockGetter bpg4 = bin.getLevel();
+        final BlockPos fu5 = bin.getClickedPos();
         final Direction[] nearestLookingDirections;
-        final Direction[] arr6 = nearestLookingDirections = bcq.getNearestLookingDirections();
-        for (final Direction fp10 : nearestLookingDirections) {
-            if (fp10.getAxis().isHorizontal()) {
-                final Direction fp11 = fp10.getOpposite();
-                byj3 = ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Direction>setValue((Property<Comparable>)WallSkullBlock.FACING, fp11);
-                if (!bjg4.getBlockState(fk5.relative(fp10)).canBeReplaced(bcq)) {
-                    return byj3;
+        final Direction[] arr6 = nearestLookingDirections = bin.getNearestLookingDirections();
+        for (final Direction fz10 : nearestLookingDirections) {
+            if (fz10.getAxis().isHorizontal()) {
+                final Direction fz11 = fz10.getOpposite();
+                cfj3 = ((StateHolder<O, BlockState>)cfj3).<Comparable, Direction>setValue((Property<Comparable>)WallSkullBlock.FACING, fz11);
+                if (!bpg4.getBlockState(fu5.relative(fz10)).canBeReplaced(bin)) {
+                    return cfj3;
                 }
             }
         }
@@ -54,13 +55,13 @@ public class WallSkullBlock extends AbstractSkullBlock {
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)WallSkullBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)WallSkullBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)WallSkullBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)WallSkullBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)WallSkullBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)WallSkullBlock.FACING)));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/WallTorchBlock.java b/src/net/minecraft/world/level/block/WallTorchBlock.java
index 5078bdf..508c1e3 100644
--- a/src/net/minecraft/world/level/block/WallTorchBlock.java
+++ b/src/net/minecraft/world/level/block/WallTorchBlock.java
@@ -1,10 +1,9 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import java.util.Random;
 import net.minecraft.world.level.Level;
@@ -17,6 +16,8 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
 import java.util.Map;
@@ -26,9 +27,9 @@ public class WallTorchBlock extends TorchBlock {
     public static final DirectionProperty FACING;
     private static final Map<Direction, VoxelShape> AABBS;
     
-    protected WallTorchBlock(final Properties c) {
-        super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.NORTH));
+    protected WallTorchBlock(final Properties c, final ParticleOptions hf) {
+        super(c, hf);
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.NORTH));
     }
     
     @Override
@@ -37,36 +38,36 @@ public class WallTorchBlock extends TorchBlock {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return getShape(byj);
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return getShape(cfj);
     }
     
-    public static VoxelShape getShape(final BlockState byj) {
-        return WallTorchBlock.AABBS.get(byj.getValue((Property<Object>)WallTorchBlock.FACING));
+    public static VoxelShape getShape(final BlockState cfj) {
+        return WallTorchBlock.AABBS.get(cfj.getValue((Property<Object>)WallTorchBlock.FACING));
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)WallTorchBlock.FACING);
-        final BlockPos fk2 = fk.relative(fp5.getOpposite());
-        final BlockState byj2 = bjz.getBlockState(fk2);
-        return byj2.isFaceSturdy(bjz, fk2, fp5);
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)WallTorchBlock.FACING);
+        final BlockPos fu2 = fu.relative(fz5.getOpposite());
+        final BlockState cfj2 = bqd.getBlockState(fu2);
+        return cfj2.isFaceSturdy(bqd, fu2, fz5);
     }
     
     @Nullable
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        BlockState byj3 = this.defaultBlockState();
-        final LevelReader bjz4 = bcq.getLevel();
-        final BlockPos fk5 = bcq.getClickedPos();
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        BlockState cfj3 = this.defaultBlockState();
+        final LevelReader bqd4 = bin.getLevel();
+        final BlockPos fu5 = bin.getClickedPos();
         final Direction[] nearestLookingDirections;
-        final Direction[] arr6 = nearestLookingDirections = bcq.getNearestLookingDirections();
-        for (final Direction fp10 : nearestLookingDirections) {
-            if (fp10.getAxis().isHorizontal()) {
-                final Direction fp11 = fp10.getOpposite();
-                byj3 = ((AbstractStateHolder<O, BlockState>)byj3).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, fp11);
-                if (byj3.canSurvive(bjz4, fk5)) {
-                    return byj3;
+        final Direction[] arr6 = nearestLookingDirections = bin.getNearestLookingDirections();
+        for (final Direction fz10 : nearestLookingDirections) {
+            if (fz10.getAxis().isHorizontal()) {
+                final Direction fz11 = fz10.getOpposite();
+                cfj3 = ((StateHolder<O, BlockState>)cfj3).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, fz11);
+                if (cfj3.canSurvive(bqd4, fu5)) {
+                    return cfj3;
                 }
             }
         }
@@ -74,34 +75,34 @@ public class WallTorchBlock extends TorchBlock {
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp.getOpposite() == byj1.<Direction>getValue((Property<Direction>)WallTorchBlock.FACING) && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz.getOpposite() == cfj1.<Direction>getValue((Property<Direction>)WallTorchBlock.FACING) && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return byj1;
+        return cfj1;
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        final Direction fp6 = byj.<Direction>getValue((Property<Direction>)WallTorchBlock.FACING);
-        final double double7 = fk.getX() + 0.5;
-        final double double8 = fk.getY() + 0.7;
-        final double double9 = fk.getZ() + 0.5;
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        final Direction fz6 = cfj.<Direction>getValue((Property<Direction>)WallTorchBlock.FACING);
+        final double double7 = fu.getX() + 0.5;
+        final double double8 = fu.getY() + 0.7;
+        final double double9 = fu.getZ() + 0.5;
         final double double10 = 0.22;
         final double double11 = 0.27;
-        final Direction fp7 = fp6.getOpposite();
-        bjw.addParticle(ParticleTypes.SMOKE, double7 + 0.27 * fp7.getStepX(), double8 + 0.22, double9 + 0.27 * fp7.getStepZ(), 0.0, 0.0, 0.0);
-        bjw.addParticle(ParticleTypes.FLAME, double7 + 0.27 * fp7.getStepX(), double8 + 0.22, double9 + 0.27 * fp7.getStepZ(), 0.0, 0.0, 0.0);
+        final Direction fz7 = fz6.getOpposite();
+        bqb.addParticle(ParticleTypes.SMOKE, double7 + 0.27 * fz7.getStepX(), double8 + 0.22, double9 + 0.27 * fz7.getStepZ(), 0.0, 0.0, 0.0);
+        bqb.addParticle(this.flameParticle, double7 + 0.27 * fz7.getStepX(), double8 + 0.22, double9 + 0.27 * fz7.getStepZ(), 0.0, 0.0, 0.0);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)WallTorchBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)WallTorchBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)WallTorchBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)WallTorchBlock.FACING)));
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/WaterlilyBlock.java b/src/net/minecraft/world/level/block/WaterlilyBlock.java
index 50cd5e2..1d112b6 100644
--- a/src/net/minecraft/world/level/block/WaterlilyBlock.java
+++ b/src/net/minecraft/world/level/block/WaterlilyBlock.java
@@ -12,6 +12,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class WaterlilyBlock extends BushBlock {
@@ -22,22 +23,23 @@ public class WaterlilyBlock extends BushBlock {
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        super.entityInside(byj, bjw, fk, akq);
-        if (bjw instanceof ServerLevel && akq instanceof Boat) {
-            bjw.destroyBlock(new BlockPos(fk), true, akq);
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        super.entityInside(cfj, bqb, fu, aom);
+        if (bqb instanceof ServerLevel && aom instanceof Boat) {
+            bqb.destroyBlock(new BlockPos(fu), true, aom);
         }
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return WaterlilyBlock.AABB;
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        final FluidState coj5 = bjg.getFluidState(fk);
-        return coj5.getType() == Fluids.WATER || byj.getMaterial() == Material.ICE;
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        final FluidState cxa5 = bpg.getFluidState(fu);
+        final FluidState cxa6 = bpg.getFluidState(fu.above());
+        return (cxa5.getType() == Fluids.WATER || cfj.getMaterial() == Material.ICE) && cxa6.getType() == Fluids.EMPTY;
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/WebBlock.java b/src/net/minecraft/world/level/block/WebBlock.java
index 7439212..74ad543 100644
--- a/src/net/minecraft/world/level/block/WebBlock.java
+++ b/src/net/minecraft/world/level/block/WebBlock.java
@@ -5,6 +5,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class WebBlock extends Block {
     public WebBlock(final Properties c) {
@@ -12,7 +13,7 @@ public class WebBlock extends Block {
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        akq.makeStuckInBlock(byj, new Vec3(0.25, 0.05000000074505806, 0.25));
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        aom.makeStuckInBlock(cfj, new Vec3(0.25, 0.05000000074505806, 0.25));
     }
 }
diff --git a/src/net/minecraft/world/level/block/WeepingVines.java b/src/net/minecraft/world/level/block/WeepingVines.java
new file mode 100644
index 0000000..627cb91
--- /dev/null
+++ b/src/net/minecraft/world/level/block/WeepingVines.java
@@ -0,0 +1,34 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.Random;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public class WeepingVines extends GrowingPlantHeadBlock {
+    protected static final VoxelShape SHAPE;
+    
+    public WeepingVines(final Properties c) {
+        super(c, Direction.DOWN, WeepingVines.SHAPE, false, 0.1);
+    }
+    
+    @Override
+    protected int getBlocksToGrowWhenBonemealed(final Random random) {
+        return NetherVines.getBlocksToGrowWhenBonemealed(random);
+    }
+    
+    @Override
+    protected Block getBodyBlock() {
+        return Blocks.WEEPING_VINES_PLANT;
+    }
+    
+    @Override
+    protected boolean canGrowInto(final BlockState cfj) {
+        return NetherVines.isValidGrowthState(cfj);
+    }
+    
+    static {
+        SHAPE = Block.box(4.0, 9.0, 4.0, 12.0, 16.0, 12.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/WeepingVinesPlant.java b/src/net/minecraft/world/level/block/WeepingVinesPlant.java
new file mode 100644
index 0000000..4e8319a
--- /dev/null
+++ b/src/net/minecraft/world/level/block/WeepingVinesPlant.java
@@ -0,0 +1,22 @@
+package net.minecraft.world.level.block;
+
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public class WeepingVinesPlant extends GrowingPlantBodyBlock {
+    public static final VoxelShape SHAPE;
+    
+    public WeepingVinesPlant(final Properties c) {
+        super(c, Direction.DOWN, WeepingVinesPlant.SHAPE, false);
+    }
+    
+    @Override
+    protected GrowingPlantHeadBlock getHeadBlock() {
+        return (GrowingPlantHeadBlock)Blocks.WEEPING_VINES;
+    }
+    
+    static {
+        SHAPE = Block.box(1.0, 0.0, 1.0, 15.0, 16.0, 15.0);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/WeightedPressurePlateBlock.java b/src/net/minecraft/world/level/block/WeightedPressurePlateBlock.java
index 3785045..47c43ef 100644
--- a/src/net/minecraft/world/level/block/WeightedPressurePlateBlock.java
+++ b/src/net/minecraft/world/level/block/WeightedPressurePlateBlock.java
@@ -1,9 +1,8 @@
 package net.minecraft.world.level.block;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvents;
@@ -14,6 +13,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 
 public class WeightedPressurePlateBlock extends BasePressurePlateBlock {
@@ -22,13 +22,13 @@ public class WeightedPressurePlateBlock extends BasePressurePlateBlock {
     
     protected WeightedPressurePlateBlock(final int integer, final Properties c) {
         super(c);
-        this.registerDefaultState(((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)WeightedPressurePlateBlock.POWER, 0));
+        this.registerDefaultState(((StateHolder<O, BlockState>)this.stateDefinition.any()).<Comparable, Integer>setValue((Property<Comparable>)WeightedPressurePlateBlock.POWER, 0));
         this.maxWeight = integer;
     }
     
     @Override
-    protected int getSignalStrength(final Level bjw, final BlockPos fk) {
-        final int integer4 = Math.min(bjw.<Entity>getEntitiesOfClass(Entity.class, WeightedPressurePlateBlock.TOUCH_AABB.move(fk)).size(), this.maxWeight);
+    protected int getSignalStrength(final Level bqb, final BlockPos fu) {
+        final int integer4 = Math.min(bqb.<Entity>getEntitiesOfClass(Entity.class, WeightedPressurePlateBlock.TOUCH_AABB.move(fu)).size(), this.maxWeight);
         if (integer4 > 0) {
             final float float5 = Math.min(this.maxWeight, integer4) / (float)this.maxWeight;
             return Mth.ceil(float5 * 15.0f);
@@ -37,27 +37,27 @@ public class WeightedPressurePlateBlock extends BasePressurePlateBlock {
     }
     
     @Override
-    protected void playOnSound(final LevelAccessor bjx, final BlockPos fk) {
-        bjx.playSound(null, fk, SoundEvents.METAL_PRESSURE_PLATE_CLICK_ON, SoundSource.BLOCKS, 0.3f, 0.90000004f);
+    protected void playOnSound(final LevelAccessor bqc, final BlockPos fu) {
+        bqc.playSound(null, fu, SoundEvents.METAL_PRESSURE_PLATE_CLICK_ON, SoundSource.BLOCKS, 0.3f, 0.90000004f);
     }
     
     @Override
-    protected void playOffSound(final LevelAccessor bjx, final BlockPos fk) {
-        bjx.playSound(null, fk, SoundEvents.METAL_PRESSURE_PLATE_CLICK_OFF, SoundSource.BLOCKS, 0.3f, 0.75f);
+    protected void playOffSound(final LevelAccessor bqc, final BlockPos fu) {
+        bqc.playSound(null, fu, SoundEvents.METAL_PRESSURE_PLATE_CLICK_OFF, SoundSource.BLOCKS, 0.3f, 0.75f);
     }
     
     @Override
-    protected int getSignalForState(final BlockState byj) {
-        return byj.<Integer>getValue((Property<Integer>)WeightedPressurePlateBlock.POWER);
+    protected int getSignalForState(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)WeightedPressurePlateBlock.POWER);
     }
     
     @Override
-    protected BlockState setSignalForState(final BlockState byj, final int integer) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)WeightedPressurePlateBlock.POWER, integer);
+    protected BlockState setSignalForState(final BlockState cfj, final int integer) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)WeightedPressurePlateBlock.POWER, integer);
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
+    protected int getPressedTime() {
         return 10;
     }
     
diff --git a/src/net/minecraft/world/level/block/WetSpongeBlock.java b/src/net/minecraft/world/level/block/WetSpongeBlock.java
index df833cd..da837b8 100644
--- a/src/net/minecraft/world/level/block/WetSpongeBlock.java
+++ b/src/net/minecraft/world/level/block/WetSpongeBlock.java
@@ -11,6 +11,7 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class WetSpongeBlock extends Block {
     protected WetSpongeBlock(final Properties c) {
@@ -18,38 +19,38 @@ public class WetSpongeBlock extends Block {
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (bjw.getDimension().isUltraWarm()) {
-            bjw.setBlock(fk, Blocks.SPONGE.defaultBlockState(), 3);
-            bjw.levelEvent(2009, fk, 0);
-            bjw.playSound(null, fk, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 1.0f, (1.0f + bjw.getRandom().nextFloat() * 0.2f) * 0.7f);
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (bqb.dimensionType().ultraWarm()) {
+            bqb.setBlock(fu, Blocks.SPONGE.defaultBlockState(), 3);
+            bqb.levelEvent(2009, fu, 0);
+            bqb.playSound(null, fu, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 1.0f, (1.0f + bqb.getRandom().nextFloat() * 0.2f) * 0.7f);
         }
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        final Direction fp6 = Direction.getRandomFace(random);
-        if (fp6 == Direction.UP) {
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        final Direction fz6 = Direction.getRandom(random);
+        if (fz6 == Direction.UP) {
             return;
         }
-        final BlockPos fk2 = fk.relative(fp6);
-        final BlockState byj2 = bjw.getBlockState(fk2);
-        if (byj.canOcclude() && byj2.isFaceSturdy(bjw, fk2, fp6.getOpposite())) {
+        final BlockPos fu2 = fu.relative(fz6);
+        final BlockState cfj2 = bqb.getBlockState(fu2);
+        if (cfj.canOcclude() && cfj2.isFaceSturdy(bqb, fu2, fz6.getOpposite())) {
             return;
         }
-        double double9 = fk.getX();
-        double double10 = fk.getY();
-        double double11 = fk.getZ();
-        if (fp6 == Direction.DOWN) {
+        double double9 = fu.getX();
+        double double10 = fu.getY();
+        double double11 = fu.getZ();
+        if (fz6 == Direction.DOWN) {
             double10 -= 0.05;
             double9 += random.nextDouble();
             double11 += random.nextDouble();
         }
         else {
             double10 += random.nextDouble() * 0.8;
-            if (fp6.getAxis() == Direction.Axis.X) {
+            if (fz6.getAxis() == Direction.Axis.X) {
                 double11 += random.nextDouble();
-                if (fp6 == Direction.EAST) {
+                if (fz6 == Direction.EAST) {
                     double9 += 1.1;
                 }
                 else {
@@ -58,7 +59,7 @@ public class WetSpongeBlock extends Block {
             }
             else {
                 double9 += random.nextDouble();
-                if (fp6 == Direction.SOUTH) {
+                if (fz6 == Direction.SOUTH) {
                     double11 += 1.1;
                 }
                 else {
@@ -66,6 +67,6 @@ public class WetSpongeBlock extends Block {
                 }
             }
         }
-        bjw.addParticle(ParticleTypes.DRIPPING_WATER, double9, double10, double11, 0.0, 0.0, 0.0);
+        bqb.addParticle(ParticleTypes.DRIPPING_WATER, double9, double10, double11, 0.0, 0.0, 0.0);
     }
 }
diff --git a/src/net/minecraft/world/level/block/WitherRoseBlock.java b/src/net/minecraft/world/level/block/WitherRoseBlock.java
index f8c1b5c..ce84b97 100644
--- a/src/net/minecraft/world/level/block/WitherRoseBlock.java
+++ b/src/net/minecraft/world/level/block/WitherRoseBlock.java
@@ -16,41 +16,41 @@ import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.effect.MobEffect;
 
 public class WitherRoseBlock extends FlowerBlock {
-    public WitherRoseBlock(final MobEffect aki, final Properties c) {
-        super(aki, 8, c);
+    public WitherRoseBlock(final MobEffect aoe, final Properties c) {
+        super(aoe, 8, c);
     }
     
     @Override
-    protected boolean mayPlaceOn(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        final Block bph5 = byj.getBlock();
-        return super.mayPlaceOn(byj, bjg, fk) || bph5 == Blocks.NETHERRACK || bph5 == Blocks.SOUL_SAND;
+    protected boolean mayPlaceOn(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return super.mayPlaceOn(cfj, bpg, fu) || cfj.is(Blocks.NETHERRACK) || cfj.is(Blocks.SOUL_SAND) || cfj.is(Blocks.SOUL_SOIL);
     }
     
     @Override
-    public void animateTick(final BlockState byj, final Level bjw, final BlockPos fk, final Random random) {
-        final VoxelShape cwf6 = this.getShape(byj, bjw, fk, CollisionContext.empty());
-        final Vec3 cvl7 = cwf6.bounds().getCenter();
-        final double double8 = fk.getX() + cvl7.x;
-        final double double9 = fk.getZ() + cvl7.z;
+    public void animateTick(final BlockState cfj, final Level bqb, final BlockPos fu, final Random random) {
+        final VoxelShape dfg6 = this.getShape(cfj, bqb, fu, CollisionContext.empty());
+        final Vec3 dem7 = dfg6.bounds().getCenter();
+        final double double8 = fu.getX() + dem7.x;
+        final double double9 = fu.getZ() + dem7.z;
         for (int integer12 = 0; integer12 < 3; ++integer12) {
             if (random.nextBoolean()) {
-                bjw.addParticle(ParticleTypes.SMOKE, double8 + random.nextFloat() / 5.0f, fk.getY() + (0.5 - random.nextFloat()), double9 + random.nextFloat() / 5.0f, 0.0, 0.0, 0.0);
+                bqb.addParticle(ParticleTypes.SMOKE, double8 + random.nextDouble() / 5.0, fu.getY() + (0.5 - random.nextDouble()), double9 + random.nextDouble() / 5.0, 0.0, 0.0, 0.0);
             }
         }
     }
     
     @Override
-    public void entityInside(final BlockState byj, final Level bjw, final BlockPos fk, final Entity akq) {
-        if (bjw.isClientSide || bjw.getDifficulty() == Difficulty.PEACEFUL) {
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+        if (bqb.isClientSide || bqb.getDifficulty() == Difficulty.PEACEFUL) {
             return;
         }
-        if (akq instanceof LivingEntity) {
-            final LivingEntity akz6 = (LivingEntity)akq;
-            if (!akz6.isInvulnerableTo(DamageSource.WITHER)) {
-                akz6.addEffect(new MobEffectInstance(MobEffects.WITHER, 40));
+        if (aom instanceof LivingEntity) {
+            final LivingEntity aoy6 = (LivingEntity)aom;
+            if (!aoy6.isInvulnerableTo(DamageSource.WITHER)) {
+                aoy6.addEffect(new MobEffectInstance(MobEffects.WITHER, 40));
             }
         }
     }
diff --git a/src/net/minecraft/world/level/block/WitherSkullBlock.java b/src/net/minecraft/world/level/block/WitherSkullBlock.java
index 70ae03e..3a6fefd 100644
--- a/src/net/minecraft/world/level/block/WitherSkullBlock.java
+++ b/src/net/minecraft/world/level/block/WitherSkullBlock.java
@@ -4,6 +4,8 @@ import net.minecraft.world.level.block.state.predicate.BlockMaterialPredicate;
 import net.minecraft.world.level.material.Material;
 import java.util.function.Predicate;
 import net.minecraft.world.level.block.state.predicate.BlockStatePredicate;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.state.pattern.BlockPatternBuilder;
 import net.minecraft.world.item.Items;
 import java.util.Iterator;
@@ -23,6 +25,7 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.block.state.pattern.BlockPattern;
 
@@ -37,65 +40,65 @@ public class WitherSkullBlock extends SkullBlock {
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, @Nullable final LivingEntity akz, final ItemStack ben) {
-        super.setPlacedBy(bjw, fk, byj, akz, ben);
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof SkullBlockEntity) {
-            checkSpawn(bjw, fk, (SkullBlockEntity)bwl7);
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
+        super.setPlacedBy(bqb, fu, cfj, aoy, bki);
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof SkullBlockEntity) {
+            checkSpawn(bqb, fu, (SkullBlockEntity)cdl7);
         }
     }
     
-    public static void checkSpawn(final Level bjw, final BlockPos fk, final SkullBlockEntity bxi) {
-        if (bjw.isClientSide) {
+    public static void checkSpawn(final Level bqb, final BlockPos fu, final SkullBlockEntity cei) {
+        if (bqb.isClientSide) {
             return;
         }
-        final Block bph4 = bxi.getBlockState().getBlock();
-        final boolean boolean5 = bph4 == Blocks.WITHER_SKELETON_SKULL || bph4 == Blocks.WITHER_SKELETON_WALL_SKULL;
-        if (!boolean5 || fk.getY() < 2 || bjw.getDifficulty() == Difficulty.PEACEFUL) {
+        final BlockState cfj4 = cei.getBlockState();
+        final boolean boolean5 = cfj4.is(Blocks.WITHER_SKELETON_SKULL) || cfj4.is(Blocks.WITHER_SKELETON_WALL_SKULL);
+        if (!boolean5 || fu.getY() < 0 || bqb.getDifficulty() == Difficulty.PEACEFUL) {
             return;
         }
-        final BlockPattern byo6 = getOrCreateWitherFull();
-        final BlockPattern.BlockPatternMatch b7 = byo6.find(bjw, fk);
+        final BlockPattern cfo6 = getOrCreateWitherFull();
+        final BlockPattern.BlockPatternMatch b7 = cfo6.find(bqb, fu);
         if (b7 == null) {
             return;
         }
-        for (int integer8 = 0; integer8 < byo6.getWidth(); ++integer8) {
-            for (int integer9 = 0; integer9 < byo6.getHeight(); ++integer9) {
-                final BlockInWorld byn10 = b7.getBlock(integer8, integer9, 0);
-                bjw.setBlock(byn10.getPos(), Blocks.AIR.defaultBlockState(), 2);
-                bjw.levelEvent(2001, byn10.getPos(), Block.getId(byn10.getState()));
+        for (int integer8 = 0; integer8 < cfo6.getWidth(); ++integer8) {
+            for (int integer9 = 0; integer9 < cfo6.getHeight(); ++integer9) {
+                final BlockInWorld cfn10 = b7.getBlock(integer8, integer9, 0);
+                bqb.setBlock(cfn10.getPos(), Blocks.AIR.defaultBlockState(), 2);
+                bqb.levelEvent(2001, cfn10.getPos(), Block.getId(cfn10.getState()));
             }
         }
-        final WitherBoss avn8 = EntityType.WITHER.create(bjw);
-        final BlockPos fk2 = b7.getBlock(1, 2, 0).getPos();
-        avn8.moveTo(fk2.getX() + 0.5, fk2.getY() + 0.55, fk2.getZ() + 0.5, (b7.getForwards().getAxis() == Direction.Axis.X) ? 0.0f : 90.0f, 0.0f);
-        avn8.yBodyRot = ((b7.getForwards().getAxis() == Direction.Axis.X) ? 0.0f : 90.0f);
-        avn8.makeInvulnerable();
-        for (final ServerPlayer xe11 : bjw.<ServerPlayer>getEntitiesOfClass(ServerPlayer.class, avn8.getBoundingBox().inflate(50.0))) {
-            CriteriaTriggers.SUMMONED_ENTITY.trigger(xe11, avn8);
+        final WitherBoss baw8 = EntityType.WITHER.create(bqb);
+        final BlockPos fu2 = b7.getBlock(1, 2, 0).getPos();
+        baw8.moveTo(fu2.getX() + 0.5, fu2.getY() + 0.55, fu2.getZ() + 0.5, (b7.getForwards().getAxis() == Direction.Axis.X) ? 0.0f : 90.0f, 0.0f);
+        baw8.yBodyRot = ((b7.getForwards().getAxis() == Direction.Axis.X) ? 0.0f : 90.0f);
+        baw8.makeInvulnerable();
+        for (final ServerPlayer ze11 : bqb.<ServerPlayer>getEntitiesOfClass(ServerPlayer.class, baw8.getBoundingBox().inflate(50.0))) {
+            CriteriaTriggers.SUMMONED_ENTITY.trigger(ze11, baw8);
         }
-        bjw.addFreshEntity(avn8);
-        for (int integer10 = 0; integer10 < byo6.getWidth(); ++integer10) {
-            for (int integer11 = 0; integer11 < byo6.getHeight(); ++integer11) {
-                bjw.blockUpdated(b7.getBlock(integer10, integer11, 0).getPos(), Blocks.AIR);
+        bqb.addFreshEntity(baw8);
+        for (int integer10 = 0; integer10 < cfo6.getWidth(); ++integer10) {
+            for (int integer11 = 0; integer11 < cfo6.getHeight(); ++integer11) {
+                bqb.blockUpdated(b7.getBlock(integer10, integer11, 0).getPos(), Blocks.AIR);
             }
         }
     }
     
-    public static boolean canSpawnMob(final Level bjw, final BlockPos fk, final ItemStack ben) {
-        return ben.getItem() == Items.WITHER_SKELETON_SKULL && fk.getY() >= 2 && bjw.getDifficulty() != Difficulty.PEACEFUL && !bjw.isClientSide && getOrCreateWitherBase().find(bjw, fk) != null;
+    public static boolean canSpawnMob(final Level bqb, final BlockPos fu, final ItemStack bki) {
+        return bki.getItem() == Items.WITHER_SKELETON_SKULL && fu.getY() >= 2 && bqb.getDifficulty() != Difficulty.PEACEFUL && !bqb.isClientSide && getOrCreateWitherBase().find(bqb, fu) != null;
     }
     
     private static BlockPattern getOrCreateWitherFull() {
         if (WitherSkullBlock.witherPatternFull == null) {
-            WitherSkullBlock.witherPatternFull = BlockPatternBuilder.start().aisle("^^^", "###", "~#~").where('#', BlockInWorld.hasState(BlockStatePredicate.forBlock(Blocks.SOUL_SAND))).where('^', BlockInWorld.hasState(BlockStatePredicate.forBlock(Blocks.WITHER_SKELETON_SKULL).or(BlockStatePredicate.forBlock(Blocks.WITHER_SKELETON_WALL_SKULL)))).where('~', BlockInWorld.hasState(BlockMaterialPredicate.forMaterial(Material.AIR))).build();
+            WitherSkullBlock.witherPatternFull = BlockPatternBuilder.start().aisle("^^^", "###", "~#~").where('#', cfn -> cfn.getState().is(BlockTags.WITHER_SUMMON_BASE_BLOCKS)).where('^', BlockInWorld.hasState(BlockStatePredicate.forBlock(Blocks.WITHER_SKELETON_SKULL).or(BlockStatePredicate.forBlock(Blocks.WITHER_SKELETON_WALL_SKULL)))).where('~', BlockInWorld.hasState(BlockMaterialPredicate.forMaterial(Material.AIR))).build();
         }
         return WitherSkullBlock.witherPatternFull;
     }
     
     private static BlockPattern getOrCreateWitherBase() {
         if (WitherSkullBlock.witherPatternBase == null) {
-            WitherSkullBlock.witherPatternBase = BlockPatternBuilder.start().aisle("   ", "###", "~#~").where('#', BlockInWorld.hasState(BlockStatePredicate.forBlock(Blocks.SOUL_SAND))).where('~', BlockInWorld.hasState(BlockMaterialPredicate.forMaterial(Material.AIR))).build();
+            WitherSkullBlock.witherPatternBase = BlockPatternBuilder.start().aisle("   ", "###", "~#~").where('#', cfn -> cfn.getState().is(BlockTags.WITHER_SUMMON_BASE_BLOCKS)).where('~', BlockInWorld.hasState(BlockMaterialPredicate.forMaterial(Material.AIR))).build();
         }
         return WitherSkullBlock.witherPatternBase;
     }
diff --git a/src/net/minecraft/world/level/block/WitherWallSkullBlock.java b/src/net/minecraft/world/level/block/WitherWallSkullBlock.java
index 5b2cfd2..7ae9734 100644
--- a/src/net/minecraft/world/level/block/WitherWallSkullBlock.java
+++ b/src/net/minecraft/world/level/block/WitherWallSkullBlock.java
@@ -6,6 +6,7 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class WitherWallSkullBlock extends WallSkullBlock {
     protected WitherWallSkullBlock(final Properties c) {
@@ -13,7 +14,7 @@ public class WitherWallSkullBlock extends WallSkullBlock {
     }
     
     @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, @Nullable final LivingEntity akz, final ItemStack ben) {
-        Blocks.WITHER_SKELETON_SKULL.setPlacedBy(bjw, fk, byj, akz, ben);
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, @Nullable final LivingEntity aoy, final ItemStack bki) {
+        Blocks.WITHER_SKELETON_SKULL.setPlacedBy(bqb, fu, cfj, aoy, bki);
     }
 }
diff --git a/src/net/minecraft/world/level/block/WoodButtonBlock.java b/src/net/minecraft/world/level/block/WoodButtonBlock.java
index 100e07e..0b904dd 100644
--- a/src/net/minecraft/world/level/block/WoodButtonBlock.java
+++ b/src/net/minecraft/world/level/block/WoodButtonBlock.java
@@ -2,6 +2,7 @@ package net.minecraft.world.level.block;
 
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 
 public class WoodButtonBlock extends ButtonBlock {
     protected WoodButtonBlock(final Properties c) {
diff --git a/src/net/minecraft/world/level/block/WoolCarpetBlock.java b/src/net/minecraft/world/level/block/WoolCarpetBlock.java
index 3c970ea..19aca3f 100644
--- a/src/net/minecraft/world/level/block/WoolCarpetBlock.java
+++ b/src/net/minecraft/world/level/block/WoolCarpetBlock.java
@@ -7,6 +7,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -14,9 +15,9 @@ public class WoolCarpetBlock extends Block {
     protected static final VoxelShape SHAPE;
     private final DyeColor color;
     
-    protected WoolCarpetBlock(final DyeColor bdj, final Properties c) {
+    protected WoolCarpetBlock(final DyeColor bje, final Properties c) {
         super(c);
-        this.color = bdj;
+        this.color = bje;
     }
     
     public DyeColor getColor() {
@@ -24,21 +25,21 @@ public class WoolCarpetBlock extends Block {
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return WoolCarpetBlock.SHAPE;
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (!byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (!cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        return !bjz.isEmptyBlock(fk.below());
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return !bqd.isEmptyBlock(fu.below());
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
index e2682a7..3f0081c 100644
--- a/src/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
@@ -1,11 +1,15 @@
 package net.minecraft.world.level.block.entity;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.entity.player.StackedContents;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ExperienceOrb;
-import java.util.Collection;
+import it.unimi.dsi.fastutil.objects.ObjectIterator;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import com.google.common.collect.Lists;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.level.Level;
+import java.util.Collection;
 import net.minecraft.world.entity.player.Player;
 import java.util.List;
 import net.minecraft.core.Direction;
@@ -13,23 +17,26 @@ import java.util.function.Function;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.AbstractFurnaceBlock;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.util.Mth;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.ContainerHelper;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.Util;
+import net.minecraft.SharedConstants;
 import java.util.Iterator;
 import net.minecraft.tags.Tag;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.Item;
 import com.google.common.collect.Maps;
+import net.minecraft.world.item.Item;
+import java.util.Map;
 import net.minecraft.world.item.crafting.AbstractCookingRecipe;
 import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.resources.ResourceLocation;
-import java.util.Map;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.minecraft.world.inventory.ContainerData;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.NonNullList;
@@ -47,11 +54,11 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
     private int cookingProgress;
     private int cookingTotalTime;
     protected final ContainerData dataAccess;
-    private final Map<ResourceLocation, Integer> recipesUsed;
+    private final Object2IntOpenHashMap<ResourceLocation> recipesUsed;
     protected final RecipeType<? extends AbstractCookingRecipe> recipeType;
     
-    protected AbstractFurnaceBlockEntity(final BlockEntityType<?> bwm, final RecipeType<? extends AbstractCookingRecipe> bgz) {
-        super(bwm);
+    protected AbstractFurnaceBlockEntity(final BlockEntityType<?> cdm, final RecipeType<? extends AbstractCookingRecipe> bmx) {
+        super(cdm);
         this.items = NonNullList.<ItemStack>withSize(3, ItemStack.EMPTY);
         this.dataAccess = new ContainerData() {
             @Override
@@ -102,8 +109,8 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
                 return 4;
             }
         };
-        this.recipesUsed = Maps.newHashMap();
-        this.recipeType = bgz;
+        this.recipesUsed = (Object2IntOpenHashMap<ResourceLocation>)new Object2IntOpenHashMap();
+        this.recipeType = bmx;
     }
     
     public static Map<Item, Integer> getFuel() {
@@ -171,14 +178,27 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
         return map1;
     }
     
-    private static void add(final Map<Item, Integer> map, final Tag<Item> aaz, final int integer) {
-        for (final Item bei5 : aaz.getValues()) {
-            map.put(bei5, integer);
+    private static boolean isNeverAFurnaceFuel(final Item bke) {
+        return ItemTags.NON_FLAMMABLE_WOOD.contains(bke);
+    }
+    
+    private static void add(final Map<Item, Integer> map, final Tag<Item> adf, final int integer) {
+        for (final Item bke5 : adf.getValues()) {
+            if (!isNeverAFurnaceFuel(bke5)) {
+                map.put(bke5, integer);
+            }
         }
     }
     
-    private static void add(final Map<Item, Integer> map, final ItemLike bjv, final int integer) {
-        map.put(bjv.asItem(), integer);
+    private static void add(final Map<Item, Integer> map, final ItemLike bqa, final int integer) {
+        final Item bke4 = bqa.asItem();
+        if (!isNeverAFurnaceFuel(bke4)) {
+            map.put(bke4, integer);
+            return;
+        }
+        if (SharedConstants.IS_RUNNING_IN_IDE) {
+            throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("A developer tried to explicitly make fire resistant item " + bke4.getName(null).getString() + " a furnace fuel. That will not work!"));
+        }
     }
     
     private boolean isLit() {
@@ -186,35 +206,30 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        ContainerHelper.loadAllItems(jt, this.items = NonNullList.<ItemStack>withSize(this.getContainerSize(), ItemStack.EMPTY));
-        this.litTime = jt.getShort("BurnTime");
-        this.cookingProgress = jt.getShort("CookTime");
-        this.cookingTotalTime = jt.getShort("CookTimeTotal");
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        ContainerHelper.loadAllItems(le, this.items = NonNullList.<ItemStack>withSize(this.getContainerSize(), ItemStack.EMPTY));
+        this.litTime = le.getShort("BurnTime");
+        this.cookingProgress = le.getShort("CookTime");
+        this.cookingTotalTime = le.getShort("CookTimeTotal");
         this.litDuration = this.getBurnDuration(this.items.get(1));
-        for (int integer3 = jt.getShort("RecipesUsedSize"), integer4 = 0; integer4 < integer3; ++integer4) {
-            final ResourceLocation sm5 = new ResourceLocation(jt.getString("RecipeLocation" + integer4));
-            final int integer5 = jt.getInt("RecipeAmount" + integer4);
-            this.recipesUsed.put(sm5, integer5);
+        final CompoundTag le2 = le.getCompound("RecipesUsed");
+        for (final String string6 : le2.getAllKeys()) {
+            this.recipesUsed.put(new ResourceLocation(string6), le2.getInt(string6));
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        jt.putShort("BurnTime", (short)this.litTime);
-        jt.putShort("CookTime", (short)this.cookingProgress);
-        jt.putShort("CookTimeTotal", (short)this.cookingTotalTime);
-        ContainerHelper.saveAllItems(jt, this.items);
-        jt.putShort("RecipesUsedSize", (short)this.recipesUsed.size());
-        int integer3 = 0;
-        for (final Map.Entry<ResourceLocation, Integer> entry5 : this.recipesUsed.entrySet()) {
-            jt.putString("RecipeLocation" + integer3, entry5.getKey().toString());
-            jt.putInt("RecipeAmount" + integer3, entry5.getValue());
-            ++integer3;
-        }
-        return jt;
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        le.putShort("BurnTime", (short)this.litTime);
+        le.putShort("CookTime", (short)this.cookingProgress);
+        le.putShort("CookTimeTotal", (short)this.cookingTotalTime);
+        ContainerHelper.saveAllItems(le, this.items);
+        final CompoundTag le2 = new CompoundTag();
+        this.recipesUsed.forEach((uh, integer) -> le2.putInt(uh.toString(), integer));
+        le.put("RecipesUsed", le2);
+        return le;
     }
     
     @Override
@@ -225,30 +240,30 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
             --this.litTime;
         }
         if (!this.level.isClientSide) {
-            final ItemStack ben4 = this.items.get(1);
-            if (this.isLit() || (!ben4.isEmpty() && !this.items.get(0).isEmpty())) {
-                final Recipe<?> bgw5 = this.level.getRecipeManager().getRecipeFor(this.recipeType, this, this.level).orElse((AbstractCookingRecipe)null);
-                if (!this.isLit() && this.canBurn(bgw5)) {
-                    this.litTime = this.getBurnDuration(ben4);
+            final ItemStack bki4 = this.items.get(1);
+            if (this.isLit() || (!bki4.isEmpty() && !this.items.get(0).isEmpty())) {
+                final Recipe<?> bmu5 = this.level.getRecipeManager().getRecipeFor(this.recipeType, this, this.level).orElse((AbstractCookingRecipe)null);
+                if (!this.isLit() && this.canBurn(bmu5)) {
+                    this.litTime = this.getBurnDuration(bki4);
                     this.litDuration = this.litTime;
                     if (this.isLit()) {
                         boolean3 = true;
-                        if (!ben4.isEmpty()) {
-                            final Item bei6 = ben4.getItem();
-                            ben4.shrink(1);
-                            if (ben4.isEmpty()) {
-                                final Item bei7 = bei6.getCraftingRemainingItem();
-                                this.items.set(1, (bei7 == null) ? ItemStack.EMPTY : new ItemStack(bei7));
+                        if (!bki4.isEmpty()) {
+                            final Item bke6 = bki4.getItem();
+                            bki4.shrink(1);
+                            if (bki4.isEmpty()) {
+                                final Item bke7 = bke6.getCraftingRemainingItem();
+                                this.items.set(1, (bke7 == null) ? ItemStack.EMPTY : new ItemStack(bke7));
                             }
                         }
                     }
                 }
-                if (this.isLit() && this.canBurn(bgw5)) {
+                if (this.isLit() && this.canBurn(bmu5)) {
                     ++this.cookingProgress;
                     if (this.cookingProgress == this.cookingTotalTime) {
                         this.cookingProgress = 0;
                         this.cookingTotalTime = this.getTotalCookTime();
-                        this.burn(bgw5);
+                        this.burn(bmu5);
                         boolean3 = true;
                     }
                 }
@@ -261,7 +276,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
             }
             if (boolean2 != this.isLit()) {
                 boolean3 = true;
-                this.level.setBlock(this.worldPosition, ((AbstractStateHolder<O, BlockState>)this.level.getBlockState(this.worldPosition)).<Comparable, Boolean>setValue((Property<Comparable>)AbstractFurnaceBlock.LIT, this.isLit()), 3);
+                this.level.setBlock(this.worldPosition, ((StateHolder<O, BlockState>)this.level.getBlockState(this.worldPosition)).<Comparable, Boolean>setValue((Property<Comparable>)AbstractFurnaceBlock.LIT, this.isLit()), 3);
             }
         }
         if (boolean3) {
@@ -269,77 +284,77 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
         }
     }
     
-    protected boolean canBurn(@Nullable final Recipe<?> bgw) {
-        if (this.items.get(0).isEmpty() || bgw == null) {
+    protected boolean canBurn(@Nullable final Recipe<?> bmu) {
+        if (this.items.get(0).isEmpty() || bmu == null) {
             return false;
         }
-        final ItemStack ben3 = bgw.getResultItem();
-        if (ben3.isEmpty()) {
+        final ItemStack bki3 = bmu.getResultItem();
+        if (bki3.isEmpty()) {
             return false;
         }
-        final ItemStack ben4 = this.items.get(2);
-        return ben4.isEmpty() || (ben4.sameItem(ben3) && ((ben4.getCount() < this.getMaxStackSize() && ben4.getCount() < ben4.getMaxStackSize()) || ben4.getCount() < ben3.getMaxStackSize()));
+        final ItemStack bki4 = this.items.get(2);
+        return bki4.isEmpty() || (bki4.sameItem(bki3) && ((bki4.getCount() < this.getMaxStackSize() && bki4.getCount() < bki4.getMaxStackSize()) || bki4.getCount() < bki3.getMaxStackSize()));
     }
     
-    private void burn(@Nullable final Recipe<?> bgw) {
-        if (bgw == null || !this.canBurn(bgw)) {
+    private void burn(@Nullable final Recipe<?> bmu) {
+        if (bmu == null || !this.canBurn(bmu)) {
             return;
         }
-        final ItemStack ben3 = this.items.get(0);
-        final ItemStack ben4 = bgw.getResultItem();
-        final ItemStack ben5 = this.items.get(2);
-        if (ben5.isEmpty()) {
-            this.items.set(2, ben4.copy());
+        final ItemStack bki3 = this.items.get(0);
+        final ItemStack bki4 = bmu.getResultItem();
+        final ItemStack bki5 = this.items.get(2);
+        if (bki5.isEmpty()) {
+            this.items.set(2, bki4.copy());
         }
-        else if (ben5.getItem() == ben4.getItem()) {
-            ben5.grow(1);
+        else if (bki5.getItem() == bki4.getItem()) {
+            bki5.grow(1);
         }
         if (!this.level.isClientSide) {
-            this.setRecipeUsed(bgw);
+            this.setRecipeUsed(bmu);
         }
-        if (ben3.getItem() == Blocks.WET_SPONGE.asItem() && !this.items.get(1).isEmpty() && this.items.get(1).getItem() == Items.BUCKET) {
+        if (bki3.getItem() == Blocks.WET_SPONGE.asItem() && !this.items.get(1).isEmpty() && this.items.get(1).getItem() == Items.BUCKET) {
             this.items.set(1, new ItemStack(Items.WATER_BUCKET));
         }
-        ben3.shrink(1);
+        bki3.shrink(1);
     }
     
-    protected int getBurnDuration(final ItemStack ben) {
-        if (ben.isEmpty()) {
+    protected int getBurnDuration(final ItemStack bki) {
+        if (bki.isEmpty()) {
             return 0;
         }
-        final Item bei3 = ben.getItem();
-        return getFuel().getOrDefault(bei3, 0);
+        final Item bke3 = bki.getItem();
+        return getFuel().getOrDefault(bke3, 0);
     }
     
     protected int getTotalCookTime() {
         return this.level.getRecipeManager().getRecipeFor(this.recipeType, this, this.level).<Integer>map(AbstractCookingRecipe::getCookingTime).orElse(200);
     }
     
-    public static boolean isFuel(final ItemStack ben) {
-        return getFuel().containsKey(ben.getItem());
+    public static boolean isFuel(final ItemStack bki) {
+        return getFuel().containsKey(bki.getItem());
     }
     
     @Override
-    public int[] getSlotsForFace(final Direction fp) {
-        if (fp == Direction.DOWN) {
+    public int[] getSlotsForFace(final Direction fz) {
+        if (fz == Direction.DOWN) {
             return AbstractFurnaceBlockEntity.SLOTS_FOR_DOWN;
         }
-        if (fp == Direction.UP) {
+        if (fz == Direction.UP) {
             return AbstractFurnaceBlockEntity.SLOTS_FOR_UP;
         }
         return AbstractFurnaceBlockEntity.SLOTS_FOR_SIDES;
     }
     
     @Override
-    public boolean canPlaceItemThroughFace(final int integer, final ItemStack ben, @Nullable final Direction fp) {
-        return this.canPlaceItem(integer, ben);
+    public boolean canPlaceItemThroughFace(final int integer, final ItemStack bki, @Nullable final Direction fz) {
+        return this.canPlaceItem(integer, bki);
     }
     
     @Override
-    public boolean canTakeItemThroughFace(final int integer, final ItemStack ben, final Direction fp) {
-        if (fp == Direction.DOWN && integer == 1) {
-            final Item bei5 = ben.getItem();
-            if (bei5 != Items.WATER_BUCKET && bei5 != Items.BUCKET) {
+    public boolean canTakeItemThroughFace(final int integer, final ItemStack bki, final Direction fz) {
+        if (fz == Direction.DOWN && integer == 1) {
+            final Item bke5 = bki.getItem();
+            if (bke5 != Items.WATER_BUCKET && bke5 != Items.BUCKET) {
                 return false;
             }
         }
@@ -353,8 +368,8 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
     
     @Override
     public boolean isEmpty() {
-        for (final ItemStack ben3 : this.items) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.items) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
@@ -377,12 +392,12 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
     }
     
     @Override
-    public void setItem(final int integer, final ItemStack ben) {
-        final ItemStack ben2 = this.items.get(integer);
-        final boolean boolean5 = !ben.isEmpty() && ben.sameItem(ben2) && ItemStack.tagMatches(ben, ben2);
-        this.items.set(integer, ben);
-        if (ben.getCount() > this.getMaxStackSize()) {
-            ben.setCount(this.getMaxStackSize());
+    public void setItem(final int integer, final ItemStack bki) {
+        final ItemStack bki2 = this.items.get(integer);
+        final boolean boolean5 = !bki.isEmpty() && bki.sameItem(bki2) && ItemStack.tagMatches(bki, bki2);
+        this.items.set(integer, bki);
+        if (bki.getCount() > this.getMaxStackSize()) {
+            bki.setCount(this.getMaxStackSize());
         }
         if (integer == 0 && !boolean5) {
             this.cookingTotalTime = this.getTotalCookTime();
@@ -392,18 +407,18 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.level.getBlockEntity(this.worldPosition) == this && ayj.distanceToSqr(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5) <= 64.0;
+    public boolean stillValid(final Player bec) {
+        return this.level.getBlockEntity(this.worldPosition) == this && bec.distanceToSqr(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5) <= 64.0;
     }
     
     @Override
-    public boolean canPlaceItem(final int integer, final ItemStack ben) {
+    public boolean canPlaceItem(final int integer, final ItemStack bki) {
         if (integer == 2) {
             return false;
         }
         if (integer == 1) {
-            final ItemStack ben2 = this.items.get(1);
-            return isFuel(ben) || (ben.getItem() == Items.BUCKET && ben2.getItem() != Items.BUCKET);
+            final ItemStack bki2 = this.items.get(1);
+            return isFuel(bki) || (bki.getItem() == Items.BUCKET && bki2.getItem() != Items.BUCKET);
         }
         return true;
     }
@@ -414,9 +429,10 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
     }
     
     @Override
-    public void setRecipeUsed(@Nullable final Recipe<?> bgw) {
-        if (bgw != null) {
-            this.recipesUsed.compute(bgw.getId(), (sm, integer) -> 1 + ((integer == null) ? 0 : integer));
+    public void setRecipeUsed(@Nullable final Recipe<?> bmu) {
+        if (bmu != null) {
+            final ResourceLocation uh3 = bmu.getId();
+            this.recipesUsed.addTo(uh3, 1);
         }
     }
     
@@ -427,46 +443,46 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
     }
     
     @Override
-    public void awardAndReset(final Player ayj) {
+    public void awardUsedRecipes(final Player bec) {
     }
     
-    public void awardResetAndExperience(final Player ayj) {
-        final List<Recipe<?>> list3 = Lists.newArrayList();
-        for (final Map.Entry<ResourceLocation, Integer> entry5 : this.recipesUsed.entrySet()) {
-            final List<AbstractCookingRecipe> list4;
-            final Map.Entry<K, Integer> entry6;
-            ayj.level.getRecipeManager().byKey(entry5.getKey()).ifPresent(bgw -> {
-                list4.add(bgw);
-                createExperience(ayj, entry6.getValue(), bgw.getExperience());
-                return;
-            });
-        }
-        ayj.awardRecipes(list3);
+    public void awardUsedRecipesAndPopExperience(final Player bec) {
+        final List<Recipe<?>> list3 = this.getRecipesToAwardAndPopExperience(bec.level, bec.position());
+        bec.awardRecipes(list3);
         this.recipesUsed.clear();
     }
     
-    private static void createExperience(final Player ayj, int integer, final float float3) {
-        if (float3 == 0.0f) {
-            integer = 0;
+    public List<Recipe<?>> getRecipesToAwardAndPopExperience(final Level bqb, final Vec3 dem) {
+        final List<Recipe<?>> list4 = Lists.newArrayList();
+        for (final Object2IntMap.Entry<ResourceLocation> entry6 : this.recipesUsed.object2IntEntrySet()) {
+            final List<AbstractCookingRecipe> list5;
+            final Object2IntMap.Entry entry7;
+            bqb.getRecipeManager().byKey((ResourceLocation)entry6.getKey()).ifPresent(bmu -> {
+                list5.add(bmu);
+                createExperience(bqb, dem, entry7.getIntValue(), bmu.getExperience());
+                return;
+            });
         }
-        else if (float3 < 1.0f) {
-            int integer2 = Mth.floor(integer * float3);
-            if (integer2 < Mth.ceil(integer * float3) && Math.random() < integer * float3 - integer2) {
-                ++integer2;
-            }
-            integer = integer2;
+        return list4;
+    }
+    
+    private static void createExperience(final Level bqb, final Vec3 dem, final int integer, final float float4) {
+        int integer2 = Mth.floor(integer * float4);
+        final float float5 = Mth.frac(integer * float4);
+        if (float5 != 0.0f && Math.random() < float5) {
+            ++integer2;
         }
-        while (integer > 0) {
-            final int integer2 = ExperienceOrb.getExperienceValue(integer);
-            integer -= integer2;
-            ayj.level.addFreshEntity(new ExperienceOrb(ayj.level, ayj.getX(), ayj.getY() + 0.5, ayj.getZ() + 0.5, integer2));
+        while (integer2 > 0) {
+            final int integer3 = ExperienceOrb.getExperienceValue(integer2);
+            integer2 -= integer3;
+            bqb.addFreshEntity(new ExperienceOrb(bqb, dem.x, dem.y, dem.z, integer3));
         }
     }
     
     @Override
-    public void fillStackedContents(final StackedContents ayl) {
-        for (final ItemStack ben4 : this.items) {
-            ayl.accountStack(ben4);
+    public void fillStackedContents(final StackedContents bee) {
+        for (final ItemStack bki4 : this.items) {
+            bee.accountStack(bki4);
         }
     }
     
diff --git a/src/net/minecraft/world/level/block/entity/BannerBlockEntity.java b/src/net/minecraft/world/level/block/entity/BannerBlockEntity.java
index ed31d2b..465b250 100644
--- a/src/net/minecraft/world/level/block/entity/BannerBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/BannerBlockEntity.java
@@ -3,10 +3,10 @@ package net.minecraft.world.level.block.entity;
 import java.util.function.Supplier;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.BannerBlock;
-import net.minecraft.world.level.block.state.BlockState;
 import com.google.common.collect.Lists;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.world.level.block.AbstractBannerBlock;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.nbt.CompoundTag;
@@ -35,27 +35,27 @@ public class BannerBlockEntity extends BlockEntity implements Nameable {
         this.baseColor = DyeColor.WHITE;
     }
     
-    public BannerBlockEntity(final DyeColor bdj) {
+    public BannerBlockEntity(final DyeColor bje) {
         this();
-        this.baseColor = bdj;
+        this.baseColor = bje;
     }
     
     @Nullable
-    public static ListTag getItemPatterns(final ItemStack ben) {
-        ListTag jz2 = null;
-        final CompoundTag jt3 = ben.getTagElement("BlockEntityTag");
-        if (jt3 != null && jt3.contains("Patterns", 9)) {
-            jz2 = jt3.getList("Patterns", 10).copy();
+    public static ListTag getItemPatterns(final ItemStack bki) {
+        ListTag lk2 = null;
+        final CompoundTag le3 = bki.getTagElement("BlockEntityTag");
+        if (le3 != null && le3.contains("Patterns", 9)) {
+            lk2 = le3.getList("Patterns", 10).copy();
         }
-        return jz2;
+        return lk2;
     }
     
-    public void fromItem(final ItemStack ben, final DyeColor bdj) {
-        this.itemPatterns = getItemPatterns(ben);
-        this.baseColor = bdj;
+    public void fromItem(final ItemStack bki, final DyeColor bje) {
+        this.itemPatterns = getItemPatterns(bki);
+        this.baseColor = bje;
         this.patterns = null;
         this.receivedData = true;
-        this.name = (ben.hasCustomHoverName() ? ben.getHoverName() : null);
+        this.name = (bki.hasCustomHoverName() ? bki.getHoverName() : null);
     }
     
     @Override
@@ -63,7 +63,7 @@ public class BannerBlockEntity extends BlockEntity implements Nameable {
         if (this.name != null) {
             return this.name;
         }
-        return new TranslatableComponent("block.minecraft.banner", new Object[0]);
+        return new TranslatableComponent("block.minecraft.banner");
     }
     
     @Nullable
@@ -72,27 +72,27 @@ public class BannerBlockEntity extends BlockEntity implements Nameable {
         return this.name;
     }
     
-    public void setCustomName(final Component lf) {
-        this.name = lf;
+    public void setCustomName(final Component mr) {
+        this.name = mr;
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
         if (this.itemPatterns != null) {
-            jt.put("Patterns", this.itemPatterns);
+            le.put("Patterns", this.itemPatterns);
         }
         if (this.name != null) {
-            jt.putString("CustomName", Component.Serializer.toJson(this.name));
+            le.putString("CustomName", Component.Serializer.toJson(this.name));
         }
-        return jt;
+        return le;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        if (jt.contains("CustomName", 8)) {
-            this.name = Component.Serializer.fromJson(jt.getString("CustomName"));
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        if (le.contains("CustomName", 8)) {
+            this.name = Component.Serializer.fromJson(le.getString("CustomName"));
         }
         if (this.hasLevel()) {
             this.baseColor = ((AbstractBannerBlock)this.getBlockState().getBlock()).getColor();
@@ -100,7 +100,7 @@ public class BannerBlockEntity extends BlockEntity implements Nameable {
         else {
             this.baseColor = null;
         }
-        this.itemPatterns = jt.getList("Patterns", 10);
+        this.itemPatterns = le.getList("Patterns", 10);
         this.patterns = null;
         this.receivedData = true;
     }
@@ -116,10 +116,10 @@ public class BannerBlockEntity extends BlockEntity implements Nameable {
         return this.save(new CompoundTag());
     }
     
-    public static int getPatternCount(final ItemStack ben) {
-        final CompoundTag jt2 = ben.getTagElement("BlockEntityTag");
-        if (jt2 != null && jt2.contains("Patterns")) {
-            return jt2.getList("Patterns", 10).size();
+    public static int getPatternCount(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTagElement("BlockEntityTag");
+        if (le2 != null && le2.contains("Patterns")) {
+            return le2.getList("Patterns", 10).size();
         }
         return 0;
     }
@@ -131,46 +131,46 @@ public class BannerBlockEntity extends BlockEntity implements Nameable {
         return this.patterns;
     }
     
-    public static List<Pair<BannerPattern, DyeColor>> createPatterns(final DyeColor bdj, @Nullable final ListTag jz) {
+    public static List<Pair<BannerPattern, DyeColor>> createPatterns(final DyeColor bje, @Nullable final ListTag lk) {
         final List<Pair<BannerPattern, DyeColor>> list3 = Lists.newArrayList();
-        list3.add((Pair<BannerPattern, DyeColor>)Pair.of(BannerPattern.BASE, bdj));
-        if (jz != null) {
-            for (int integer4 = 0; integer4 < jz.size(); ++integer4) {
-                final CompoundTag jt5 = jz.getCompound(integer4);
-                final BannerPattern bwd6 = BannerPattern.byHash(jt5.getString("Pattern"));
-                if (bwd6 != null) {
-                    final int integer5 = jt5.getInt("Color");
-                    list3.add((Pair<BannerPattern, DyeColor>)Pair.of(bwd6, DyeColor.byId(integer5)));
+        list3.add((Pair<BannerPattern, DyeColor>)Pair.of(BannerPattern.BASE, bje));
+        if (lk != null) {
+            for (int integer4 = 0; integer4 < lk.size(); ++integer4) {
+                final CompoundTag le5 = lk.getCompound(integer4);
+                final BannerPattern cdd6 = BannerPattern.byHash(le5.getString("Pattern"));
+                if (cdd6 != null) {
+                    final int integer5 = le5.getInt("Color");
+                    list3.add((Pair<BannerPattern, DyeColor>)Pair.of(cdd6, DyeColor.byId(integer5)));
                 }
             }
         }
         return list3;
     }
     
-    public static void removeLastPattern(final ItemStack ben) {
-        final CompoundTag jt2 = ben.getTagElement("BlockEntityTag");
-        if (jt2 == null || !jt2.contains("Patterns", 9)) {
+    public static void removeLastPattern(final ItemStack bki) {
+        final CompoundTag le2 = bki.getTagElement("BlockEntityTag");
+        if (le2 == null || !le2.contains("Patterns", 9)) {
             return;
         }
-        final ListTag jz3 = jt2.getList("Patterns", 10);
-        if (jz3.isEmpty()) {
+        final ListTag lk3 = le2.getList("Patterns", 10);
+        if (lk3.isEmpty()) {
             return;
         }
-        jz3.remove(jz3.size() - 1);
-        if (jz3.isEmpty()) {
-            ben.removeTagKey("BlockEntityTag");
+        lk3.remove(lk3.size() - 1);
+        if (lk3.isEmpty()) {
+            bki.removeTagKey("BlockEntityTag");
         }
     }
     
-    public ItemStack getItem(final BlockState byj) {
-        final ItemStack ben3 = new ItemStack(BannerBlock.byColor(this.getBaseColor(() -> byj)));
+    public ItemStack getItem(final BlockState cfj) {
+        final ItemStack bki3 = new ItemStack(BannerBlock.byColor(this.getBaseColor(() -> cfj)));
         if (this.itemPatterns != null && !this.itemPatterns.isEmpty()) {
-            ben3.getOrCreateTagElement("BlockEntityTag").put("Patterns", this.itemPatterns.copy());
+            bki3.getOrCreateTagElement("BlockEntityTag").put("Patterns", this.itemPatterns.copy());
         }
         if (this.name != null) {
-            ben3.setHoverName(this.name);
+            bki3.setHoverName(this.name);
         }
-        return ben3;
+        return bki3;
     }
     
     public DyeColor getBaseColor(final Supplier<BlockState> supplier) {
diff --git a/src/net/minecraft/world/level/block/entity/BannerPattern.java b/src/net/minecraft/world/level/block/entity/BannerPattern.java
index 567c235..6057de0 100644
--- a/src/net/minecraft/world/level/block/entity/BannerPattern.java
+++ b/src/net/minecraft/world/level/block/entity/BannerPattern.java
@@ -8,79 +8,69 @@ import com.google.common.collect.Lists;
 import net.minecraft.world.item.DyeColor;
 import org.apache.commons.lang3.tuple.Pair;
 import java.util.List;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.level.block.Blocks;
+import java.util.Arrays;
 import javax.annotation.Nullable;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 
 public enum BannerPattern {
-    BASE("base", "b"), 
-    SQUARE_BOTTOM_LEFT("square_bottom_left", "bl", "   ", "   ", "#  "), 
-    SQUARE_BOTTOM_RIGHT("square_bottom_right", "br", "   ", "   ", "  #"), 
-    SQUARE_TOP_LEFT("square_top_left", "tl", "#  ", "   ", "   "), 
-    SQUARE_TOP_RIGHT("square_top_right", "tr", "  #", "   ", "   "), 
-    STRIPE_BOTTOM("stripe_bottom", "bs", "   ", "   ", "###"), 
-    STRIPE_TOP("stripe_top", "ts", "###", "   ", "   "), 
-    STRIPE_LEFT("stripe_left", "ls", "#  ", "#  ", "#  "), 
-    STRIPE_RIGHT("stripe_right", "rs", "  #", "  #", "  #"), 
-    STRIPE_CENTER("stripe_center", "cs", " # ", " # ", " # "), 
-    STRIPE_MIDDLE("stripe_middle", "ms", "   ", "###", "   "), 
-    STRIPE_DOWNRIGHT("stripe_downright", "drs", "#  ", " # ", "  #"), 
-    STRIPE_DOWNLEFT("stripe_downleft", "dls", "  #", " # ", "#  "), 
-    STRIPE_SMALL("small_stripes", "ss", "# #", "# #", "   "), 
-    CROSS("cross", "cr", "# #", " # ", "# #"), 
-    STRAIGHT_CROSS("straight_cross", "sc", " # ", "###", " # "), 
-    TRIANGLE_BOTTOM("triangle_bottom", "bt", "   ", " # ", "# #"), 
-    TRIANGLE_TOP("triangle_top", "tt", "# #", " # ", "   "), 
-    TRIANGLES_BOTTOM("triangles_bottom", "bts", "   ", "# #", " # "), 
-    TRIANGLES_TOP("triangles_top", "tts", " # ", "# #", "   "), 
-    DIAGONAL_LEFT("diagonal_left", "ld", "## ", "#  ", "   "), 
-    DIAGONAL_RIGHT("diagonal_up_right", "rd", "   ", "  #", " ##"), 
-    DIAGONAL_LEFT_MIRROR("diagonal_up_left", "lud", "   ", "#  ", "## "), 
-    DIAGONAL_RIGHT_MIRROR("diagonal_right", "rud", " ##", "  #", "   "), 
-    CIRCLE_MIDDLE("circle", "mc", "   ", " # ", "   "), 
-    RHOMBUS_MIDDLE("rhombus", "mr", " # ", "# #", " # "), 
-    HALF_VERTICAL("half_vertical", "vh", "## ", "## ", "## "), 
-    HALF_HORIZONTAL("half_horizontal", "hh", "###", "###", "   "), 
-    HALF_VERTICAL_MIRROR("half_vertical_right", "vhr", " ##", " ##", " ##"), 
-    HALF_HORIZONTAL_MIRROR("half_horizontal_bottom", "hhb", "   ", "###", "###"), 
-    BORDER("border", "bo", "###", "# #", "###"), 
-    CURLY_BORDER("curly_border", "cbo", new ItemStack(Blocks.VINE)), 
-    GRADIENT("gradient", "gra", "# #", " # ", " # "), 
-    GRADIENT_UP("gradient_up", "gru", " # ", " # ", "# #"), 
-    BRICKS("bricks", "bri", new ItemStack(Blocks.BRICKS)), 
-    GLOBE("globe", "glb"), 
-    CREEPER("creeper", "cre", new ItemStack(Items.CREEPER_HEAD)), 
-    SKULL("skull", "sku", new ItemStack(Items.WITHER_SKELETON_SKULL)), 
-    FLOWER("flower", "flo", new ItemStack(Blocks.OXEYE_DAISY)), 
-    MOJANG("mojang", "moj", new ItemStack(Items.ENCHANTED_GOLDEN_APPLE));
+    BASE("base", "b", false), 
+    SQUARE_BOTTOM_LEFT("square_bottom_left", "bl"), 
+    SQUARE_BOTTOM_RIGHT("square_bottom_right", "br"), 
+    SQUARE_TOP_LEFT("square_top_left", "tl"), 
+    SQUARE_TOP_RIGHT("square_top_right", "tr"), 
+    STRIPE_BOTTOM("stripe_bottom", "bs"), 
+    STRIPE_TOP("stripe_top", "ts"), 
+    STRIPE_LEFT("stripe_left", "ls"), 
+    STRIPE_RIGHT("stripe_right", "rs"), 
+    STRIPE_CENTER("stripe_center", "cs"), 
+    STRIPE_MIDDLE("stripe_middle", "ms"), 
+    STRIPE_DOWNRIGHT("stripe_downright", "drs"), 
+    STRIPE_DOWNLEFT("stripe_downleft", "dls"), 
+    STRIPE_SMALL("small_stripes", "ss"), 
+    CROSS("cross", "cr"), 
+    STRAIGHT_CROSS("straight_cross", "sc"), 
+    TRIANGLE_BOTTOM("triangle_bottom", "bt"), 
+    TRIANGLE_TOP("triangle_top", "tt"), 
+    TRIANGLES_BOTTOM("triangles_bottom", "bts"), 
+    TRIANGLES_TOP("triangles_top", "tts"), 
+    DIAGONAL_LEFT("diagonal_left", "ld"), 
+    DIAGONAL_RIGHT("diagonal_up_right", "rd"), 
+    DIAGONAL_LEFT_MIRROR("diagonal_up_left", "lud"), 
+    DIAGONAL_RIGHT_MIRROR("diagonal_right", "rud"), 
+    CIRCLE_MIDDLE("circle", "mc"), 
+    RHOMBUS_MIDDLE("rhombus", "mr"), 
+    HALF_VERTICAL("half_vertical", "vh"), 
+    HALF_HORIZONTAL("half_horizontal", "hh"), 
+    HALF_VERTICAL_MIRROR("half_vertical_right", "vhr"), 
+    HALF_HORIZONTAL_MIRROR("half_horizontal_bottom", "hhb"), 
+    BORDER("border", "bo"), 
+    CURLY_BORDER("curly_border", "cbo"), 
+    GRADIENT("gradient", "gra"), 
+    GRADIENT_UP("gradient_up", "gru"), 
+    BRICKS("bricks", "bri"), 
+    GLOBE("globe", "glb", true), 
+    CREEPER("creeper", "cre", true), 
+    SKULL("skull", "sku", true), 
+    FLOWER("flower", "flo", true), 
+    MOJANG("mojang", "moj", true), 
+    PIGLIN("piglin", "pig", true);
     
+    private static final BannerPattern[] VALUES;
     public static final int COUNT;
+    public static final int PATTERN_ITEM_COUNT;
     public static final int AVAILABLE_PATTERNS;
+    private final boolean hasPatternItem;
     private final String filename;
     private final String hashname;
-    private final String[] patterns;
-    private ItemStack patternItem;
     
     private BannerPattern(final String string3, final String string4) {
-        this.patterns = new String[3];
-        this.patternItem = ItemStack.EMPTY;
+        this(string3, string4, false);
+    }
+    
+    private BannerPattern(final String string3, final String string4, final boolean boolean5) {
         this.filename = string3;
         this.hashname = string4;
-    }
-    
-    private BannerPattern(final String string3, final String string4, final ItemStack ben) {
-        this(string3, string4);
-        this.patternItem = ben;
-    }
-    
-    private BannerPattern(final String string3, final String string4, final String string5, final String string6, final String string7) {
-        this(string3, string4);
-        this.patterns[0] = string5;
-        this.patterns[1] = string6;
-        this.patterns[2] = string7;
+        this.hasPatternItem = boolean5;
     }
     
     public ResourceLocation location(final boolean boolean1) {
@@ -98,17 +88,19 @@ public enum BannerPattern {
     
     @Nullable
     public static BannerPattern byHash(final String string) {
-        for (final BannerPattern bwd5 : values()) {
-            if (bwd5.hashname.equals(string)) {
-                return bwd5;
+        for (final BannerPattern cdd5 : values()) {
+            if (cdd5.hashname.equals(string)) {
+                return cdd5;
             }
         }
         return null;
     }
     
     static {
-        COUNT = values().length;
-        AVAILABLE_PATTERNS = BannerPattern.COUNT - 5 - 1;
+        VALUES = values();
+        COUNT = BannerPattern.VALUES.length;
+        PATTERN_ITEM_COUNT = (int)Arrays.<BannerPattern>stream(BannerPattern.VALUES).filter(cdd -> cdd.hasPatternItem).count();
+        AVAILABLE_PATTERNS = BannerPattern.COUNT - BannerPattern.PATTERN_ITEM_COUNT - 1;
     }
     
     public static class Builder {
@@ -118,20 +110,20 @@ public enum BannerPattern {
             this.patterns = Lists.newArrayList();
         }
         
-        public Builder addPattern(final BannerPattern bwd, final DyeColor bdj) {
-            this.patterns.add((Pair<BannerPattern, DyeColor>)Pair.of(bwd, bdj));
+        public Builder addPattern(final BannerPattern cdd, final DyeColor bje) {
+            this.patterns.add((Pair<BannerPattern, DyeColor>)Pair.of(cdd, bje));
             return this;
         }
         
         public ListTag toListTag() {
-            final ListTag jz2 = new ListTag();
+            final ListTag lk2 = new ListTag();
             for (final Pair<BannerPattern, DyeColor> pair4 : this.patterns) {
-                final CompoundTag jt5 = new CompoundTag();
-                jt5.putString("Pattern", ((BannerPattern)pair4.getLeft()).hashname);
-                jt5.putInt("Color", ((DyeColor)pair4.getRight()).getId());
-                ((AbstractList<CompoundTag>)jz2).add(jt5);
+                final CompoundTag le5 = new CompoundTag();
+                le5.putString("Pattern", ((BannerPattern)pair4.getLeft()).hashname);
+                le5.putInt("Color", ((DyeColor)pair4.getRight()).getId());
+                ((AbstractList<CompoundTag>)lk2).add(le5);
             }
-            return jz2;
+            return lk2;
         }
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
index beed1fb..b1b6773 100644
--- a/src/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
@@ -1,12 +1,11 @@
 package net.minecraft.world.level.block.entity;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.core.Vec3i;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.core.Direction;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.BarrelBlock;
@@ -17,6 +16,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.ContainerHelper;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
@@ -26,8 +26,8 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
     private NonNullList<ItemStack> items;
     private int openCount;
     
-    private BarrelBlockEntity(final BlockEntityType<?> bwm) {
-        super(bwm);
+    private BarrelBlockEntity(final BlockEntityType<?> cdm) {
+        super(cdm);
         this.items = NonNullList.<ItemStack>withSize(27, ItemStack.EMPTY);
     }
     
@@ -36,20 +36,20 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        if (!this.trySaveLootTable(jt)) {
-            ContainerHelper.saveAllItems(jt, this.items);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        if (!this.trySaveLootTable(le)) {
+            ContainerHelper.saveAllItems(le, this.items);
         }
-        return jt;
+        return le;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
         this.items = NonNullList.<ItemStack>withSize(this.getContainerSize(), ItemStack.EMPTY);
-        if (!this.tryLoadLootTable(jt)) {
-            ContainerHelper.loadAllItems(jt, this.items);
+        if (!this.tryLoadLootTable(le)) {
+            ContainerHelper.loadAllItems(le, this.items);
         }
     }
     
@@ -64,32 +64,32 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
     }
     
     @Override
-    protected void setItems(final NonNullList<ItemStack> fy) {
-        this.items = fy;
+    protected void setItems(final NonNullList<ItemStack> gi) {
+        this.items = gi;
     }
     
     @Override
     protected Component getDefaultName() {
-        return new TranslatableComponent("container.barrel", new Object[0]);
+        return new TranslatableComponent("container.barrel");
     }
     
     @Override
-    protected AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return ChestMenu.threeRows(integer, ayi, this);
+    protected AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return ChestMenu.threeRows(integer, beb, this);
     }
     
     @Override
-    public void startOpen(final Player ayj) {
-        if (!ayj.isSpectator()) {
+    public void startOpen(final Player bec) {
+        if (!bec.isSpectator()) {
             if (this.openCount < 0) {
                 this.openCount = 0;
             }
             ++this.openCount;
-            final BlockState byj3 = this.getBlockState();
-            final boolean boolean4 = byj3.<Boolean>getValue((Property<Boolean>)BarrelBlock.OPEN);
+            final BlockState cfj3 = this.getBlockState();
+            final boolean boolean4 = cfj3.<Boolean>getValue((Property<Boolean>)BarrelBlock.OPEN);
             if (!boolean4) {
-                this.playSound(byj3, SoundEvents.BARREL_OPEN);
-                this.updateBlockState(byj3, true);
+                this.playSound(cfj3, SoundEvents.BARREL_OPEN);
+                this.updateBlockState(cfj3, true);
             }
             this.scheduleRecheck();
         }
@@ -108,35 +108,35 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
             this.scheduleRecheck();
         }
         else {
-            final BlockState byj5 = this.getBlockState();
-            if (byj5.getBlock() != Blocks.BARREL) {
+            final BlockState cfj5 = this.getBlockState();
+            if (!cfj5.is(Blocks.BARREL)) {
                 this.setRemoved();
                 return;
             }
-            final boolean boolean6 = byj5.<Boolean>getValue((Property<Boolean>)BarrelBlock.OPEN);
+            final boolean boolean6 = cfj5.<Boolean>getValue((Property<Boolean>)BarrelBlock.OPEN);
             if (boolean6) {
-                this.playSound(byj5, SoundEvents.BARREL_CLOSE);
-                this.updateBlockState(byj5, false);
+                this.playSound(cfj5, SoundEvents.BARREL_CLOSE);
+                this.updateBlockState(cfj5, false);
             }
         }
     }
     
     @Override
-    public void stopOpen(final Player ayj) {
-        if (!ayj.isSpectator()) {
+    public void stopOpen(final Player bec) {
+        if (!bec.isSpectator()) {
             --this.openCount;
         }
     }
     
-    private void updateBlockState(final BlockState byj, final boolean boolean2) {
-        this.level.setBlock(this.getBlockPos(), ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)BarrelBlock.OPEN, boolean2), 3);
+    private void updateBlockState(final BlockState cfj, final boolean boolean2) {
+        this.level.setBlock(this.getBlockPos(), ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)BarrelBlock.OPEN, boolean2), 3);
     }
     
-    private void playSound(final BlockState byj, final SoundEvent aah) {
-        final Vec3i gg4 = byj.<Direction>getValue((Property<Direction>)BarrelBlock.FACING).getNormal();
-        final double double5 = this.worldPosition.getX() + 0.5 + gg4.getX() / 2.0;
-        final double double6 = this.worldPosition.getY() + 0.5 + gg4.getY() / 2.0;
-        final double double7 = this.worldPosition.getZ() + 0.5 + gg4.getZ() / 2.0;
-        this.level.playSound(null, double5, double6, double7, aah, SoundSource.BLOCKS, 0.5f, this.level.random.nextFloat() * 0.1f + 0.9f);
+    private void playSound(final BlockState cfj, final SoundEvent ack) {
+        final Vec3i gr4 = cfj.<Direction>getValue((Property<Direction>)BarrelBlock.FACING).getNormal();
+        final double double5 = this.worldPosition.getX() + 0.5 + gr4.getX() / 2.0;
+        final double double6 = this.worldPosition.getY() + 0.5 + gr4.getY() / 2.0;
+        final double double7 = this.worldPosition.getZ() + 0.5 + gr4.getZ() / 2.0;
+        this.level.playSound(null, double5, double6, double7, ack, SoundSource.BLOCKS, 0.5f, this.level.random.nextFloat() * 0.1f + 0.9f);
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java b/src/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
index 5c4ad55..6df68e6 100644
--- a/src/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
@@ -8,6 +8,7 @@ import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.player.Player;
 import javax.annotation.Nullable;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.LockCode;
 import net.minecraft.world.Nameable;
@@ -18,32 +19,32 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
     private LockCode lockKey;
     private Component name;
     
-    protected BaseContainerBlockEntity(final BlockEntityType<?> bwm) {
-        super(bwm);
+    protected BaseContainerBlockEntity(final BlockEntityType<?> cdm) {
+        super(cdm);
         this.lockKey = LockCode.NO_LOCK;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        this.lockKey = LockCode.fromTag(jt);
-        if (jt.contains("CustomName", 8)) {
-            this.name = Component.Serializer.fromJson(jt.getString("CustomName"));
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        this.lockKey = LockCode.fromTag(le);
+        if (le.contains("CustomName", 8)) {
+            this.name = Component.Serializer.fromJson(le.getString("CustomName"));
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        this.lockKey.addToTag(jt);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        this.lockKey.addToTag(le);
         if (this.name != null) {
-            jt.putString("CustomName", Component.Serializer.toJson(this.name));
+            le.putString("CustomName", Component.Serializer.toJson(this.name));
         }
-        return jt;
+        return le;
     }
     
-    public void setCustomName(final Component lf) {
-        this.name = lf;
+    public void setCustomName(final Component mr) {
+        this.name = mr;
     }
     
     @Override
@@ -67,27 +68,27 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
     
     protected abstract Component getDefaultName();
     
-    public boolean canOpen(final Player ayj) {
-        return canUnlock(ayj, this.lockKey, this.getDisplayName());
+    public boolean canOpen(final Player bec) {
+        return canUnlock(bec, this.lockKey, this.getDisplayName());
     }
     
-    public static boolean canUnlock(final Player ayj, final LockCode ajn, final Component lf) {
-        if (ayj.isSpectator() || ajn.unlocksWith(ayj.getMainHandItem())) {
+    public static boolean canUnlock(final Player bec, final LockCode ani, final Component mr) {
+        if (bec.isSpectator() || ani.unlocksWith(bec.getMainHandItem())) {
             return true;
         }
-        ayj.displayClientMessage(new TranslatableComponent("container.isLocked", new Object[] { lf }), true);
-        ayj.playNotifySound(SoundEvents.CHEST_LOCKED, SoundSource.BLOCKS, 1.0f, 1.0f);
+        bec.displayClientMessage(new TranslatableComponent("container.isLocked", new Object[] { mr }), true);
+        bec.playNotifySound(SoundEvents.CHEST_LOCKED, SoundSource.BLOCKS, 1.0f, 1.0f);
         return false;
     }
     
     @Nullable
     @Override
-    public AbstractContainerMenu createMenu(final int integer, final Inventory ayi, final Player ayj) {
-        if (this.canOpen(ayj)) {
-            return this.createMenu(integer, ayi);
+    public AbstractContainerMenu createMenu(final int integer, final Inventory beb, final Player bec) {
+        if (this.canOpen(bec)) {
+            return this.createMenu(integer, beb);
         }
         return null;
     }
     
-    protected abstract AbstractContainerMenu createMenu(final int integer, final Inventory ayi);
+    protected abstract AbstractContainerMenu createMenu(final int integer, final Inventory beb);
 }
diff --git a/src/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
index 2bc9184..86ae4f9 100644
--- a/src/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
@@ -18,6 +18,8 @@ import net.minecraft.sounds.SoundSource;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import java.util.Iterator;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
@@ -115,25 +117,25 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Tick
         final int integer2 = this.worldPosition.getX();
         final int integer3 = this.worldPosition.getY();
         final int integer4 = this.worldPosition.getZ();
-        BlockPos fk5;
+        BlockPos fu5;
         if (this.lastCheckY < integer3) {
-            fk5 = this.worldPosition;
+            fu5 = this.worldPosition;
             this.checkingBeamSections = Lists.newArrayList();
-            this.lastCheckY = fk5.getY() - 1;
+            this.lastCheckY = fu5.getY() - 1;
         }
         else {
-            fk5 = new BlockPos(integer2, this.lastCheckY + 1, integer4);
+            fu5 = new BlockPos(integer2, this.lastCheckY + 1, integer4);
         }
         BeaconBeamSection a6 = this.checkingBeamSections.isEmpty() ? null : this.checkingBeamSections.get(this.checkingBeamSections.size() - 1);
         final int integer5 = this.level.getHeight(Heightmap.Types.WORLD_SURFACE, integer2, integer4);
         for (int integer6 = 0; integer6 < 10; ++integer6) {
-            if (fk5.getY() > integer5) {
+            if (fu5.getY() > integer5) {
                 break;
             }
-            final BlockState byj9 = this.level.getBlockState(fk5);
-            final Block bph10 = byj9.getBlock();
-            if (bph10 instanceof BeaconBeamBlock) {
-                final float[] arr11 = ((BeaconBeamBlock)bph10).getColor().getTextureDiffuseColors();
+            final BlockState cfj9 = this.level.getBlockState(fu5);
+            final Block bvr10 = cfj9.getBlock();
+            if (bvr10 instanceof BeaconBeamBlock) {
+                final float[] arr11 = ((BeaconBeamBlock)bvr10).getColor().getTextureDiffuseColors();
                 if (this.checkingBeamSections.size() <= 1) {
                     a6 = new BeaconBeamSection(arr11);
                     this.checkingBeamSections.add(a6);
@@ -149,14 +151,14 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Tick
                 }
             }
             else {
-                if (a6 == null || (byj9.getLightBlock(this.level, fk5) >= 15 && bph10 != Blocks.BEDROCK)) {
+                if (a6 == null || (cfj9.getLightBlock(this.level, fu5) >= 15 && bvr10 != Blocks.BEDROCK)) {
                     this.checkingBeamSections.clear();
                     this.lastCheckY = integer5;
                     break;
                 }
                 a6.increaseHeight();
             }
-            fk5 = fk5.above();
+            fu5 = fu5.above();
             ++this.lastCheckY;
         }
         int integer6 = this.levels;
@@ -177,8 +179,8 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Tick
                 final boolean boolean10 = this.levels > 0;
                 if (!boolean9 && boolean10) {
                     this.playSound(SoundEvents.BEACON_ACTIVATE);
-                    for (final ServerPlayer xe12 : this.level.<ServerPlayer>getEntitiesOfClass(ServerPlayer.class, new AABB(integer2, integer3, integer4, integer2, integer3 - 4, integer4).inflate(10.0, 5.0, 10.0))) {
-                        CriteriaTriggers.CONSTRUCT_BEACON.trigger(xe12, this);
+                    for (final ServerPlayer ze12 : this.level.<ServerPlayer>getEntitiesOfClass(ServerPlayer.class, new AABB(integer2, integer3, integer4, integer2, integer3 - 4, integer4).inflate(10.0, 5.0, 10.0))) {
+                        CriteriaTriggers.CONSTRUCT_BEACON.trigger(ze12, this);
                     }
                 }
                 else if (boolean9 && !boolean10) {
@@ -198,8 +200,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Tick
             boolean boolean7 = true;
             for (int integer6 = integer1 - integer4; integer6 <= integer1 + integer4 && boolean7; ++integer6) {
                 for (int integer7 = integer3 - integer4; integer7 <= integer3 + integer4; ++integer7) {
-                    final Block bph10 = this.level.getBlockState(new BlockPos(integer6, integer5, integer7)).getBlock();
-                    if (bph10 != Blocks.EMERALD_BLOCK && bph10 != Blocks.GOLD_BLOCK && bph10 != Blocks.DIAMOND_BLOCK && bph10 != Blocks.IRON_BLOCK) {
+                    if (!this.level.getBlockState(new BlockPos(integer6, integer5, integer7)).is(BlockTags.BEACON_BASE_BLOCKS)) {
                         boolean7 = false;
                         break;
                     }
@@ -228,20 +229,20 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Tick
             integer4 = 1;
         }
         final int integer5 = (9 + this.levels * 2) * 20;
-        final AABB cvf6 = new AABB(this.worldPosition).inflate(double2).expandTowards(0.0, this.level.getMaxBuildHeight(), 0.0);
-        final List<Player> list7 = this.level.<Player>getEntitiesOfClass(Player.class, cvf6);
-        for (final Player ayj9 : list7) {
-            ayj9.addEffect(new MobEffectInstance(this.primaryPower, integer5, integer4, true, true));
+        final AABB deg6 = new AABB(this.worldPosition).inflate(double2).expandTowards(0.0, this.level.getMaxBuildHeight(), 0.0);
+        final List<Player> list7 = this.level.<Player>getEntitiesOfClass(Player.class, deg6);
+        for (final Player bec9 : list7) {
+            bec9.addEffect(new MobEffectInstance(this.primaryPower, integer5, integer4, true, true));
         }
         if (this.levels >= 4 && this.primaryPower != this.secondaryPower && this.secondaryPower != null) {
-            for (final Player ayj9 : list7) {
-                ayj9.addEffect(new MobEffectInstance(this.secondaryPower, integer5, 0, true, true));
+            for (final Player bec9 : list7) {
+                bec9.addEffect(new MobEffectInstance(this.secondaryPower, integer5, 0, true, true));
             }
         }
     }
     
-    public void playSound(final SoundEvent aah) {
-        this.level.playSound(null, this.worldPosition, aah, SoundSource.BLOCKS, 1.0f, 1.0f);
+    public void playSound(final SoundEvent ack) {
+        this.level.playSound(null, this.worldPosition, ack, SoundSource.BLOCKS, 1.0f, 1.0f);
     }
     
     public List<BeaconBeamSection> getBeamSections() {
@@ -265,55 +266,55 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Tick
     
     @Override
     public double getViewDistance() {
-        return 65536.0;
+        return 256.0;
     }
     
     @Nullable
     private static MobEffect getValidEffectById(final int integer) {
-        final MobEffect aki2 = MobEffect.byId(integer);
-        return BeaconBlockEntity.VALID_EFFECTS.contains(aki2) ? aki2 : null;
+        final MobEffect aoe2 = MobEffect.byId(integer);
+        return BeaconBlockEntity.VALID_EFFECTS.contains(aoe2) ? aoe2 : null;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        this.primaryPower = getValidEffectById(jt.getInt("Primary"));
-        this.secondaryPower = getValidEffectById(jt.getInt("Secondary"));
-        if (jt.contains("CustomName", 8)) {
-            this.name = Component.Serializer.fromJson(jt.getString("CustomName"));
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        this.primaryPower = getValidEffectById(le.getInt("Primary"));
+        this.secondaryPower = getValidEffectById(le.getInt("Secondary"));
+        if (le.contains("CustomName", 8)) {
+            this.name = Component.Serializer.fromJson(le.getString("CustomName"));
         }
-        this.lockKey = LockCode.fromTag(jt);
+        this.lockKey = LockCode.fromTag(le);
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        jt.putInt("Primary", MobEffect.getId(this.primaryPower));
-        jt.putInt("Secondary", MobEffect.getId(this.secondaryPower));
-        jt.putInt("Levels", this.levels);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        le.putInt("Primary", MobEffect.getId(this.primaryPower));
+        le.putInt("Secondary", MobEffect.getId(this.secondaryPower));
+        le.putInt("Levels", this.levels);
         if (this.name != null) {
-            jt.putString("CustomName", Component.Serializer.toJson(this.name));
+            le.putString("CustomName", Component.Serializer.toJson(this.name));
         }
-        this.lockKey.addToTag(jt);
-        return jt;
+        this.lockKey.addToTag(le);
+        return le;
     }
     
-    public void setCustomName(@Nullable final Component lf) {
-        this.name = lf;
+    public void setCustomName(@Nullable final Component mr) {
+        this.name = mr;
     }
     
     @Nullable
     @Override
-    public AbstractContainerMenu createMenu(final int integer, final Inventory ayi, final Player ayj) {
-        if (BaseContainerBlockEntity.canUnlock(ayj, this.lockKey, this.getDisplayName())) {
-            return new BeaconMenu(integer, ayi, this.dataAccess, ContainerLevelAccess.create(this.level, this.getBlockPos()));
+    public AbstractContainerMenu createMenu(final int integer, final Inventory beb, final Player bec) {
+        if (BaseContainerBlockEntity.canUnlock(bec, this.lockKey, this.getDisplayName())) {
+            return new BeaconMenu(integer, beb, this.dataAccess, ContainerLevelAccess.create(this.level, this.getBlockPos()));
         }
         return null;
     }
     
     @Override
     public Component getDisplayName() {
-        return (this.name != null) ? this.name : new TranslatableComponent("container.beacon", new Object[0]);
+        return (this.name != null) ? this.name : new TranslatableComponent("container.beacon");
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/entity/BedBlockEntity.java b/src/net/minecraft/world/level/block/entity/BedBlockEntity.java
index 9635339..5dffd9d 100644
--- a/src/net/minecraft/world/level/block/entity/BedBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/BedBlockEntity.java
@@ -11,9 +11,9 @@ public class BedBlockEntity extends BlockEntity {
         super(BlockEntityType.BED);
     }
     
-    public BedBlockEntity(final DyeColor bdj) {
+    public BedBlockEntity(final DyeColor bje) {
         this();
-        this.setColor(bdj);
+        this.setColor(bje);
     }
     
     @Override
@@ -28,7 +28,7 @@ public class BedBlockEntity extends BlockEntity {
         return this.color;
     }
     
-    public void setColor(final DyeColor bdj) {
-        this.color = bdj;
+    public void setColor(final DyeColor bje) {
+        this.color = bje;
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
index 5dde47d..16328b5 100644
--- a/src/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
@@ -1,11 +1,12 @@
 package net.minecraft.world.level.block.entity;
 
 import java.util.AbstractList;
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import net.minecraft.nbt.Tag;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.NbtUtils;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.tags.BlockTags;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.EntityTypeTags;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.BlockGetter;
@@ -17,6 +18,7 @@ import net.minecraft.network.protocol.game.DebugPackets;
 import net.minecraft.world.level.block.CampfireBlock;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.BeehiveBlock;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.animal.Bee;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.state.BlockState;
@@ -51,8 +53,8 @@ public class BeehiveBlockEntity extends BlockEntity implements TickableBlockEnti
         if (this.level == null) {
             return false;
         }
-        for (final BlockPos fk3 : BlockPos.betweenClosed(this.worldPosition.offset(-1, -1, -1), this.worldPosition.offset(1, 1, 1))) {
-            if (this.level.getBlockState(fk3).getBlock() instanceof FireBlock) {
+        for (final BlockPos fu3 : BlockPos.betweenClosed(this.worldPosition.offset(-1, -1, -1), this.worldPosition.offset(1, 1, 1))) {
+            if (this.level.getBlockState(fu3).getBlock() instanceof FireBlock) {
                 return true;
             }
         }
@@ -67,127 +69,139 @@ public class BeehiveBlockEntity extends BlockEntity implements TickableBlockEnti
         return this.stored.size() == 3;
     }
     
-    public void emptyAllLivingFromHive(@Nullable final Player ayj, final BlockState byj, final BeeReleaseStatus b) {
-        final List<Entity> list5 = this.releaseAllOccupants(byj, b);
-        if (ayj != null) {
-            for (final Entity akq7 : list5) {
-                if (akq7 instanceof Bee) {
-                    final Bee atd8 = (Bee)akq7;
-                    if (ayj.position().distanceToSqr(akq7.position()) > 16.0) {
+    public void emptyAllLivingFromHive(@Nullable final Player bec, final BlockState cfj, final BeeReleaseStatus b) {
+        final List<Entity> list5 = this.releaseAllOccupants(cfj, b);
+        if (bec != null) {
+            for (final Entity aom7 : list5) {
+                if (aom7 instanceof Bee) {
+                    final Bee ayl8 = (Bee)aom7;
+                    if (bec.position().distanceToSqr(aom7.position()) > 16.0) {
                         continue;
                     }
                     if (!this.isSedated()) {
-                        atd8.makeAngry(ayj);
+                        ayl8.setTarget(bec);
                     }
                     else {
-                        atd8.setStayOutOfHiveCountdown(400);
+                        ayl8.setStayOutOfHiveCountdown(400);
                     }
                 }
             }
         }
     }
     
-    private List<Entity> releaseAllOccupants(final BlockState byj, final BeeReleaseStatus b) {
+    private List<Entity> releaseAllOccupants(final BlockState cfj, final BeeReleaseStatus b) {
         final List<Entity> list4 = Lists.newArrayList();
-        this.stored.removeIf(a -> this.releaseOccupant(byj, a.entityData, list4, b));
+        this.stored.removeIf(a -> this.releaseOccupant(cfj, a, list4, b));
         return list4;
     }
     
-    public void addOccupant(final Entity akq, final boolean boolean2) {
-        this.addOccupantWithPresetTicks(akq, boolean2, 0);
+    public void addOccupant(final Entity aom, final boolean boolean2) {
+        this.addOccupantWithPresetTicks(aom, boolean2, 0);
     }
     
     public int getOccupantCount() {
         return this.stored.size();
     }
     
-    public static int getHoneyLevel(final BlockState byj) {
-        return byj.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL);
+    public static int getHoneyLevel(final BlockState cfj) {
+        return cfj.<Integer>getValue((Property<Integer>)BeehiveBlock.HONEY_LEVEL);
     }
     
     public boolean isSedated() {
-        return CampfireBlock.isSmokeyPos(this.level, this.getBlockPos(), 5);
+        return CampfireBlock.isSmokeyPos(this.level, this.getBlockPos());
     }
     
     protected void sendDebugPackets() {
         DebugPackets.sendHiveInfo(this);
     }
     
-    public void addOccupantWithPresetTicks(final Entity akq, final boolean boolean2, final int integer) {
+    public void addOccupantWithPresetTicks(final Entity aom, final boolean boolean2, final int integer) {
         if (this.stored.size() >= 3) {
             return;
         }
-        akq.stopRiding();
-        akq.ejectPassengers();
-        final CompoundTag jt5 = new CompoundTag();
-        akq.save(jt5);
-        this.stored.add(new BeeData(jt5, integer, boolean2 ? 2400 : 600));
+        aom.stopRiding();
+        aom.ejectPassengers();
+        final CompoundTag le5 = new CompoundTag();
+        aom.save(le5);
+        this.stored.add(new BeeData(le5, integer, boolean2 ? 2400 : 600));
         if (this.level != null) {
-            if (akq instanceof Bee) {
-                final Bee atd6 = (Bee)akq;
-                if (atd6.hasSavedFlowerPos() && (!this.hasSavedFlowerPos() || this.level.random.nextBoolean())) {
-                    this.savedFlowerPos = atd6.getSavedFlowerPos();
+            if (aom instanceof Bee) {
+                final Bee ayl6 = (Bee)aom;
+                if (ayl6.hasSavedFlowerPos() && (!this.hasSavedFlowerPos() || this.level.random.nextBoolean())) {
+                    this.savedFlowerPos = ayl6.getSavedFlowerPos();
                 }
             }
-            final BlockPos fk6 = this.getBlockPos();
-            this.level.playSound(null, fk6.getX(), fk6.getY(), fk6.getZ(), SoundEvents.BEEHIVE_ENTER, SoundSource.BLOCKS, 1.0f, 1.0f);
+            final BlockPos fu6 = this.getBlockPos();
+            this.level.playSound(null, fu6.getX(), fu6.getY(), fu6.getZ(), SoundEvents.BEEHIVE_ENTER, SoundSource.BLOCKS, 1.0f, 1.0f);
         }
-        akq.remove();
+        aom.remove();
     }
     
-    private boolean releaseOccupant(final BlockState byj, final CompoundTag jt, @Nullable final List<Entity> list, final BeeReleaseStatus b) {
-        final BlockPos fk6 = this.getBlockPos();
+    private boolean releaseOccupant(final BlockState cfj, final BeeData a, @Nullable final List<Entity> list, final BeeReleaseStatus b) {
         if ((this.level.isNight() || this.level.isRaining()) && b != BeeReleaseStatus.EMERGENCY) {
             return false;
         }
-        jt.remove("Passengers");
-        jt.remove("Leash");
-        jt.removeUUID("UUID");
-        final Direction fp7 = byj.<Direction>getValue((Property<Direction>)BeehiveBlock.FACING);
-        final BlockPos fk7 = fk6.relative(fp7);
-        final boolean boolean9 = !this.level.getBlockState(fk7).getCollisionShape(this.level, fk7).isEmpty();
-        if (boolean9 && b != BeeReleaseStatus.EMERGENCY) {
+        final BlockPos fu6 = this.getBlockPos();
+        final CompoundTag le7 = a.entityData;
+        le7.remove("Passengers");
+        le7.remove("Leash");
+        le7.remove("UUID");
+        final Direction fz8 = cfj.<Direction>getValue((Property<Direction>)BeehiveBlock.FACING);
+        final BlockPos fu7 = fu6.relative(fz8);
+        final boolean boolean10 = !this.level.getBlockState(fu7).getCollisionShape(this.level, fu7).isEmpty();
+        if (boolean10 && b != BeeReleaseStatus.EMERGENCY) {
             return false;
         }
-        final Entity akq2 = EntityType.loadEntityRecursive(jt, this.level, akq -> akq);
-        if (akq2 == null) {
+        final Entity aom2 = EntityType.loadEntityRecursive(le7, this.level, aom -> aom);
+        if (aom2 == null) {
             return false;
         }
-        final float float11 = akq2.getBbWidth();
-        final double double12 = boolean9 ? 0.0 : (0.55 + float11 / 2.0f);
-        final double double13 = fk6.getX() + 0.5 + double12 * fp7.getStepX();
-        final double double14 = fk6.getY() + 0.5 - akq2.getBbHeight() / 2.0f;
-        final double double15 = fk6.getZ() + 0.5 + double12 * fp7.getStepZ();
-        akq2.moveTo(double13, double14, double15, akq2.yRot, akq2.xRot);
-        if (!akq2.getType().is(EntityTypeTags.BEEHIVE_INHABITORS)) {
+        if (!aom2.getType().is(EntityTypeTags.BEEHIVE_INHABITORS)) {
             return false;
         }
-        if (akq2 instanceof Bee) {
-            final Bee atd20 = (Bee)akq2;
-            if (this.hasSavedFlowerPos() && !atd20.hasSavedFlowerPos() && this.level.random.nextFloat() < 0.9f) {
-                atd20.setSavedFlowerPos(this.savedFlowerPos);
+        if (aom2 instanceof Bee) {
+            final Bee ayl12 = (Bee)aom2;
+            if (this.hasSavedFlowerPos() && !ayl12.hasSavedFlowerPos() && this.level.random.nextFloat() < 0.9f) {
+                ayl12.setSavedFlowerPos(this.savedFlowerPos);
             }
             if (b == BeeReleaseStatus.HONEY_DELIVERED) {
-                atd20.dropOffNectar();
-                if (byj.getBlock().is(BlockTags.BEEHIVES)) {
-                    final int integer21 = getHoneyLevel(byj);
-                    if (integer21 < 5) {
-                        int integer22 = (this.level.random.nextInt(100) == 0) ? 2 : 1;
-                        if (integer21 + integer22 > 5) {
-                            --integer22;
+                ayl12.dropOffNectar();
+                if (cfj.getBlock().is(BlockTags.BEEHIVES)) {
+                    final int integer13 = getHoneyLevel(cfj);
+                    if (integer13 < 5) {
+                        int integer14 = (this.level.random.nextInt(100) == 0) ? 2 : 1;
+                        if (integer13 + integer14 > 5) {
+                            --integer14;
                         }
-                        this.level.setBlockAndUpdate(this.getBlockPos(), ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Integer>setValue((Property<Comparable>)BeehiveBlock.HONEY_LEVEL, integer21 + integer22));
+                        this.level.setBlockAndUpdate(this.getBlockPos(), ((StateHolder<O, BlockState>)cfj).<Comparable, Integer>setValue((Property<Comparable>)BeehiveBlock.HONEY_LEVEL, integer13 + integer14));
                     }
                 }
             }
-            atd20.resetTicksWithoutNectarSinceExitingHive();
+            this.setBeeReleaseData(a.ticksInHive, ayl12);
             if (list != null) {
-                list.add(atd20);
+                list.add(ayl12);
             }
+            final float float13 = aom2.getBbWidth();
+            final double double14 = boolean10 ? 0.0 : (0.55 + float13 / 2.0f);
+            final double double15 = fu6.getX() + 0.5 + double14 * fz8.getStepX();
+            final double double16 = fu6.getY() + 0.5 - aom2.getBbHeight() / 2.0f;
+            final double double17 = fu6.getZ() + 0.5 + double14 * fz8.getStepZ();
+            aom2.moveTo(double15, double16, double17, aom2.yRot, aom2.xRot);
         }
-        final BlockPos fk8 = this.getBlockPos();
-        this.level.playSound(null, fk8.getX(), fk8.getY(), fk8.getZ(), SoundEvents.BEEHIVE_EXIT, SoundSource.BLOCKS, 1.0f, 1.0f);
-        return this.level.addFreshEntity(akq2);
+        this.level.playSound(null, fu6, SoundEvents.BEEHIVE_EXIT, SoundSource.BLOCKS, 1.0f, 1.0f);
+        return this.level.addFreshEntity(aom2);
+    }
+    
+    private void setBeeReleaseData(final int integer, final Bee ayl) {
+        final int integer2 = ayl.getAge();
+        if (integer2 < 0) {
+            ayl.setAge(Math.min(0, integer2 + integer));
+        }
+        else if (integer2 > 0) {
+            ayl.setAge(Math.max(0, integer2 - integer));
+        }
+        ayl.setInLoveTime(Math.max(0, ayl.getInLoveTime() - integer));
+        ayl.resetTicksWithoutNectarSinceExitingHive();
     }
     
     private boolean hasSavedFlowerPos() {
@@ -196,20 +210,16 @@ public class BeehiveBlockEntity extends BlockEntity implements TickableBlockEnti
     
     private void tickOccupants() {
         final Iterator<BeeData> iterator2 = this.stored.iterator();
-        final BlockState byj3 = this.getBlockState();
+        final BlockState cfj3 = this.getBlockState();
         while (iterator2.hasNext()) {
             final BeeData a4 = iterator2.next();
             if (a4.ticksInHive > a4.minOccupationTicks) {
-                final CompoundTag jt5 = a4.entityData;
-                final BeeReleaseStatus b6 = jt5.getBoolean("HasNectar") ? BeeReleaseStatus.HONEY_DELIVERED : BeeReleaseStatus.BEE_RELEASED;
-                if (!this.releaseOccupant(byj3, jt5, null, b6)) {
-                    continue;
+                final BeeReleaseStatus b5 = a4.entityData.getBoolean("HasNectar") ? BeeReleaseStatus.HONEY_DELIVERED : BeeReleaseStatus.BEE_RELEASED;
+                if (this.releaseOccupant(cfj3, a4, null, b5)) {
+                    iterator2.remove();
                 }
-                iterator2.remove();
-            }
-            else {
-                a4.ticksInHive++;
             }
+            a4.ticksInHive++;
         }
     }
     
@@ -219,53 +229,53 @@ public class BeehiveBlockEntity extends BlockEntity implements TickableBlockEnti
             return;
         }
         this.tickOccupants();
-        final BlockPos fk2 = this.getBlockPos();
+        final BlockPos fu2 = this.getBlockPos();
         if (this.stored.size() > 0 && this.level.getRandom().nextDouble() < 0.005) {
-            final double double3 = fk2.getX() + 0.5;
-            final double double4 = fk2.getY();
-            final double double5 = fk2.getZ() + 0.5;
+            final double double3 = fu2.getX() + 0.5;
+            final double double4 = fu2.getY();
+            final double double5 = fu2.getZ() + 0.5;
             this.level.playSound(null, double3, double4, double5, SoundEvents.BEEHIVE_WORK, SoundSource.BLOCKS, 1.0f, 1.0f);
         }
         this.sendDebugPackets();
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
         this.stored.clear();
-        final ListTag jz3 = jt.getList("Bees", 10);
-        for (int integer4 = 0; integer4 < jz3.size(); ++integer4) {
-            final CompoundTag jt2 = jz3.getCompound(integer4);
-            final BeeData a6 = new BeeData(jt2.getCompound("EntityData"), jt2.getInt("TicksInHive"), jt2.getInt("MinOccupationTicks"));
-            this.stored.add(a6);
+        final ListTag lk4 = le.getList("Bees", 10);
+        for (int integer5 = 0; integer5 < lk4.size(); ++integer5) {
+            final CompoundTag le2 = lk4.getCompound(integer5);
+            final BeeData a7 = new BeeData(le2.getCompound("EntityData"), le2.getInt("TicksInHive"), le2.getInt("MinOccupationTicks"));
+            this.stored.add(a7);
         }
         this.savedFlowerPos = null;
-        if (jt.contains("FlowerPos")) {
-            this.savedFlowerPos = NbtUtils.readBlockPos(jt.getCompound("FlowerPos"));
+        if (le.contains("FlowerPos")) {
+            this.savedFlowerPos = NbtUtils.readBlockPos(le.getCompound("FlowerPos"));
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        jt.put("Bees", this.writeBees());
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        le.put("Bees", this.writeBees());
         if (this.hasSavedFlowerPos()) {
-            jt.put("FlowerPos", NbtUtils.writeBlockPos(this.savedFlowerPos));
+            le.put("FlowerPos", NbtUtils.writeBlockPos(this.savedFlowerPos));
         }
-        return jt;
+        return le;
     }
     
     public ListTag writeBees() {
-        final ListTag jz2 = new ListTag();
+        final ListTag lk2 = new ListTag();
         for (final BeeData a4 : this.stored) {
-            a4.entityData.removeUUID("UUID");
-            final CompoundTag jt5 = new CompoundTag();
-            jt5.put("EntityData", a4.entityData);
-            jt5.putInt("TicksInHive", a4.ticksInHive);
-            jt5.putInt("MinOccupationTicks", a4.minOccupationTicks);
-            ((AbstractList<CompoundTag>)jz2).add(jt5);
+            a4.entityData.remove("UUID");
+            final CompoundTag le5 = new CompoundTag();
+            le5.put("EntityData", a4.entityData);
+            le5.putInt("TicksInHive", a4.ticksInHive);
+            le5.putInt("MinOccupationTicks", a4.minOccupationTicks);
+            ((AbstractList<CompoundTag>)lk2).add(le5);
         }
-        return jz2;
+        return lk2;
     }
     
     public enum BeeReleaseStatus {
@@ -279,9 +289,9 @@ public class BeehiveBlockEntity extends BlockEntity implements TickableBlockEnti
         private int ticksInHive;
         private final int minOccupationTicks;
         
-        private BeeData(final CompoundTag jt, final int integer2, final int integer3) {
-            jt.removeUUID("UUID");
-            this.entityData = jt;
+        private BeeData(final CompoundTag le, final int integer2, final int integer3) {
+            le.remove("UUID");
+            this.entityData = le;
             this.ticksInHive = integer2;
             this.minOccupationTicks = integer3;
         }
diff --git a/src/net/minecraft/world/level/block/entity/BellBlockEntity.java b/src/net/minecraft/world/level/block/entity/BellBlockEntity.java
index 26273c9..3db0d88 100644
--- a/src/net/minecraft/world/level/block/entity/BellBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/BellBlockEntity.java
@@ -5,11 +5,14 @@ import net.minecraft.world.effect.MobEffects;
 import net.minecraft.core.Vec3i;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.util.FastColor;
 import net.minecraft.util.Mth;
-import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.commons.lang3.mutable.MutableInt;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.EntityTypeTags;
 import java.util.Iterator;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
@@ -77,48 +80,48 @@ public class BellBlockEntity extends BlockEntity implements TickableBlockEntity
         this.level.playSound(null, this.getBlockPos(), SoundEvents.BELL_RESONATE, SoundSource.BLOCKS, 1.0f, 1.0f);
     }
     
-    public void onHit(final Direction fp) {
-        final BlockPos fk3 = this.getBlockPos();
-        this.clickDirection = fp;
+    public void onHit(final Direction fz) {
+        final BlockPos fu3 = this.getBlockPos();
+        this.clickDirection = fz;
         if (this.shaking) {
             this.ticks = 0;
         }
         else {
             this.shaking = true;
         }
-        this.level.blockEvent(fk3, this.getBlockState().getBlock(), 1, fp.get3DDataValue());
+        this.level.blockEvent(fu3, this.getBlockState().getBlock(), 1, fz.get3DDataValue());
     }
     
     private void updateEntities() {
-        final BlockPos fk2 = this.getBlockPos();
+        final BlockPos fu2 = this.getBlockPos();
         if (this.level.getGameTime() > this.lastRingTimestamp + 60L || this.nearbyEntities == null) {
             this.lastRingTimestamp = this.level.getGameTime();
-            final AABB cvf3 = new AABB(fk2).inflate(48.0);
-            this.nearbyEntities = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, cvf3);
+            final AABB deg3 = new AABB(fu2).inflate(48.0);
+            this.nearbyEntities = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, deg3);
         }
         if (!this.level.isClientSide) {
-            for (final LivingEntity akz4 : this.nearbyEntities) {
-                if (akz4.isAlive()) {
-                    if (akz4.removed) {
+            for (final LivingEntity aoy4 : this.nearbyEntities) {
+                if (aoy4.isAlive()) {
+                    if (aoy4.removed) {
                         continue;
                     }
-                    if (!fk2.closerThan(akz4.position(), 32.0)) {
+                    if (!fu2.closerThan(aoy4.position(), 32.0)) {
                         continue;
                     }
-                    akz4.getBrain().<Long>setMemory(MemoryModuleType.HEARD_BELL_TIME, this.level.getGameTime());
+                    aoy4.getBrain().<Long>setMemory(MemoryModuleType.HEARD_BELL_TIME, this.level.getGameTime());
                 }
             }
         }
     }
     
     private boolean areRaidersNearby() {
-        final BlockPos fk2 = this.getBlockPos();
-        for (final LivingEntity akz4 : this.nearbyEntities) {
-            if (akz4.isAlive()) {
-                if (akz4.removed) {
+        final BlockPos fu2 = this.getBlockPos();
+        for (final LivingEntity aoy4 : this.nearbyEntities) {
+            if (aoy4.isAlive()) {
+                if (aoy4.removed) {
                     continue;
                 }
-                if (fk2.closerThan(akz4.position(), 32.0) && akz4.getType().is(EntityTypeTags.RAIDERS)) {
+                if (fu2.closerThan(aoy4.position(), 32.0) && aoy4.getType().is(EntityTypeTags.RAIDERS)) {
                     return true;
                 }
                 continue;
@@ -127,20 +130,20 @@ public class BellBlockEntity extends BlockEntity implements TickableBlockEntity
         return false;
     }
     
-    private void makeRaidersGlow(final Level bjw) {
-        if (bjw.isClientSide) {
+    private void makeRaidersGlow(final Level bqb) {
+        if (bqb.isClientSide) {
             return;
         }
         this.nearbyEntities.stream().filter(this::isRaiderWithinRange).forEach(this::glow);
     }
     
-    private void showBellParticles(final Level bjw) {
-        if (!bjw.isClientSide) {
+    private void showBellParticles(final Level bqb) {
+        if (!bqb.isClientSide) {
             return;
         }
-        final BlockPos fk3 = this.getBlockPos();
-        final AtomicInteger atomicInteger4 = new AtomicInteger(16700985);
-        final int integer5 = (int)this.nearbyEntities.stream().filter(akz -> fk3.closerThan(akz.position(), 48.0)).count();
+        final BlockPos fu3 = this.getBlockPos();
+        final MutableInt mutableInt4 = new MutableInt(16700985);
+        final int integer5 = (int)this.nearbyEntities.stream().filter(aoy -> fu3.closerThan(aoy.position(), 48.0)).count();
         final float float6;
         final Vec3i vec3i;
         final float float7;
@@ -149,30 +152,31 @@ public class BellBlockEntity extends BlockEntity implements TickableBlockEntity
         final int n;
         int integer6;
         int integer7;
-        final AtomicInteger atomicInteger5;
+        final MutableInt mutableInt5;
+        int integer8;
         double double10;
         double double11;
         double double12;
-        this.nearbyEntities.stream().filter(this::isRaiderWithinRange).forEach(akz -> {
+        this.nearbyEntities.stream().filter(this::isRaiderWithinRange).forEach(aoy -> {
             float6 = 1.0f;
-            float7 = Mth.sqrt((akz.getX() - vec3i.getX()) * (akz.getX() - vec3i.getX()) + (akz.getZ() - vec3i.getZ()) * (akz.getZ() - vec3i.getZ()));
-            double8 = vec3i.getX() + 0.5f + 1.0f / float7 * (akz.getX() - vec3i.getX());
-            double9 = vec3i.getZ() + 0.5f + 1.0f / float7 * (akz.getZ() - vec3i.getZ());
+            float7 = Mth.sqrt((aoy.getX() - vec3i.getX()) * (aoy.getX() - vec3i.getX()) + (aoy.getZ() - vec3i.getZ()) * (aoy.getZ() - vec3i.getZ()));
+            double8 = vec3i.getX() + 0.5f + 1.0f / float7 * (aoy.getX() - vec3i.getX());
+            double9 = vec3i.getZ() + 0.5f + 1.0f / float7 * (aoy.getZ() - vec3i.getZ());
             for (integer6 = Mth.clamp((n - 21) / -2, 3, 15), integer7 = 0; integer7 < integer6; ++integer7) {
-                atomicInteger5.addAndGet(5);
-                double10 = (atomicInteger5.get() >> 16 & 0xFF) / 255.0;
-                double11 = (atomicInteger5.get() >> 8 & 0xFF) / 255.0;
-                double12 = (atomicInteger5.get() & 0xFF) / 255.0;
-                bjw.addParticle(ParticleTypes.ENTITY_EFFECT, double8, vec3i.getY() + 0.5f, double9, double10, double11, double12);
+                integer8 = mutableInt5.addAndGet(5);
+                double10 = FastColor.ARGB32.red(integer8) / 255.0;
+                double11 = FastColor.ARGB32.green(integer8) / 255.0;
+                double12 = FastColor.ARGB32.blue(integer8) / 255.0;
+                bqb.addParticle(ParticleTypes.ENTITY_EFFECT, double8, vec3i.getY() + 0.5f, double9, double10, double11, double12);
             }
         });
     }
     
-    private boolean isRaiderWithinRange(final LivingEntity akz) {
-        return akz.isAlive() && !akz.removed && this.getBlockPos().closerThan(akz.position(), 48.0) && akz.getType().is(EntityTypeTags.RAIDERS);
+    private boolean isRaiderWithinRange(final LivingEntity aoy) {
+        return aoy.isAlive() && !aoy.removed && this.getBlockPos().closerThan(aoy.position(), 48.0) && aoy.getType().is(EntityTypeTags.RAIDERS);
     }
     
-    private void glow(final LivingEntity akz) {
-        akz.addEffect(new MobEffectInstance(MobEffects.GLOWING, 60));
+    private void glow(final LivingEntity aoy) {
+        aoy.addEffect(new MobEffectInstance(MobEffects.GLOWING, 60));
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/BlastFurnaceBlockEntity.java b/src/net/minecraft/world/level/block/entity/BlastFurnaceBlockEntity.java
index 11bec80..e183d62 100644
--- a/src/net/minecraft/world/level/block/entity/BlastFurnaceBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/BlastFurnaceBlockEntity.java
@@ -17,16 +17,16 @@ public class BlastFurnaceBlockEntity extends AbstractFurnaceBlockEntity {
     
     @Override
     protected Component getDefaultName() {
-        return new TranslatableComponent("container.blast_furnace", new Object[0]);
+        return new TranslatableComponent("container.blast_furnace");
     }
     
     @Override
-    protected int getBurnDuration(final ItemStack ben) {
-        return super.getBurnDuration(ben) / 2;
+    protected int getBurnDuration(final ItemStack bki) {
+        return super.getBurnDuration(bki) / 2;
     }
     
     @Override
-    protected AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return new BlastFurnaceMenu(integer, ayi, this, this.dataAccess);
+    protected AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return new BlastFurnaceMenu(integer, beb, this, this.dataAccess);
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/BlockEntity.java b/src/net/minecraft/world/level/block/entity/BlockEntity.java
index b8b4418..b755ce3 100644
--- a/src/net/minecraft/world/level/block/entity/BlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/BlockEntity.java
@@ -26,9 +26,9 @@ public abstract class BlockEntity {
     private BlockState blockState;
     private boolean hasLoggedInvalidStateBefore;
     
-    public BlockEntity(final BlockEntityType<?> bwm) {
+    public BlockEntity(final BlockEntityType<?> cdm) {
         this.worldPosition = BlockPos.ZERO;
-        this.type = bwm;
+        this.type = cdm;
     }
     
     @Nullable
@@ -36,59 +36,59 @@ public abstract class BlockEntity {
         return this.level;
     }
     
-    public void setLevelAndPosition(final Level bjw, final BlockPos fk) {
-        this.level = bjw;
-        this.worldPosition = fk.immutable();
+    public void setLevelAndPosition(final Level bqb, final BlockPos fu) {
+        this.level = bqb;
+        this.worldPosition = fu.immutable();
     }
     
     public boolean hasLevel() {
         return this.level != null;
     }
     
-    public void load(final CompoundTag jt) {
-        this.worldPosition = new BlockPos(jt.getInt("x"), jt.getInt("y"), jt.getInt("z"));
+    public void load(final BlockState cfj, final CompoundTag le) {
+        this.worldPosition = new BlockPos(le.getInt("x"), le.getInt("y"), le.getInt("z"));
     }
     
-    public CompoundTag save(final CompoundTag jt) {
-        return this.saveMetadata(jt);
+    public CompoundTag save(final CompoundTag le) {
+        return this.saveMetadata(le);
     }
     
-    private CompoundTag saveMetadata(final CompoundTag jt) {
-        final ResourceLocation sm3 = BlockEntityType.getKey(this.getType());
-        if (sm3 == null) {
+    private CompoundTag saveMetadata(final CompoundTag le) {
+        final ResourceLocation uh3 = BlockEntityType.getKey(this.getType());
+        if (uh3 == null) {
             throw new RuntimeException(this.getClass() + " is missing a mapping! This is a bug!");
         }
-        jt.putString("id", sm3.toString());
-        jt.putInt("x", this.worldPosition.getX());
-        jt.putInt("y", this.worldPosition.getY());
-        jt.putInt("z", this.worldPosition.getZ());
-        return jt;
+        le.putString("id", uh3.toString());
+        le.putInt("x", this.worldPosition.getX());
+        le.putInt("y", this.worldPosition.getY());
+        le.putInt("z", this.worldPosition.getZ());
+        return le;
     }
     
     @Nullable
-    public static BlockEntity loadStatic(final CompoundTag jt) {
-        final String string2 = jt.getString("id");
+    public static BlockEntity loadStatic(final BlockState cfj, final CompoundTag le) {
+        final String string3 = le.getString("id");
         final Object o;
         final Object o2;
-        return Registry.BLOCK_ENTITY_TYPE.getOptional(new ResourceLocation(string2)).map(bwm -> {
+        return Registry.BLOCK_ENTITY_TYPE.getOptional(new ResourceLocation(string3)).map(cdm -> {
             try {
-                return bwm.create();
+                return cdm.create();
             }
             catch (Throwable throwable3) {
                 BlockEntity.LOGGER.error("Failed to create block entity {}", o, throwable3);
                 return null;
             }
-        }).<BlockEntity>map(bwl -> {
+        }).<BlockEntity>map(cdl -> {
             try {
-                bwl.load(jt);
-                return bwl;
+                cdl.load(cfj, le);
+                return cdl;
             }
             catch (Throwable throwable4) {
                 BlockEntity.LOGGER.error("Failed to load data for block entity {}", o2, throwable4);
                 return null;
             }
         }).orElseGet(() -> {
-            BlockEntity.LOGGER.warn("Skipping BlockEntity with id {}", string2);
+            BlockEntity.LOGGER.warn("Skipping BlockEntity with id {}", string3);
             return null;
         });
     }
@@ -103,15 +103,8 @@ public abstract class BlockEntity {
         }
     }
     
-    public double distanceToSqr(final double double1, final double double2, final double double3) {
-        final double double4 = this.worldPosition.getX() + 0.5 - double1;
-        final double double5 = this.worldPosition.getY() + 0.5 - double2;
-        final double double6 = this.worldPosition.getZ() + 0.5 - double3;
-        return double4 * double4 + double5 * double5 + double6 * double6;
-    }
-    
     public double getViewDistance() {
-        return 4096.0;
+        return 64.0;
     }
     
     public BlockPos getBlockPos() {
@@ -154,27 +147,27 @@ public abstract class BlockEntity {
         this.blockState = null;
     }
     
-    public void fillCrashReportCategory(final CrashReportCategory i) {
-        i.setDetail("Name", () -> Registry.BLOCK_ENTITY_TYPE.getKey(this.getType()) + " // " + this.getClass().getCanonicalName());
+    public void fillCrashReportCategory(final CrashReportCategory k) {
+        k.setDetail("Name", () -> Registry.BLOCK_ENTITY_TYPE.getKey(this.getType()) + " // " + this.getClass().getCanonicalName());
         if (this.level == null) {
             return;
         }
-        CrashReportCategory.populateBlockDetails(i, this.worldPosition, this.getBlockState());
-        CrashReportCategory.populateBlockDetails(i, this.worldPosition, this.level.getBlockState(this.worldPosition));
+        CrashReportCategory.populateBlockDetails(k, this.worldPosition, this.getBlockState());
+        CrashReportCategory.populateBlockDetails(k, this.worldPosition, this.level.getBlockState(this.worldPosition));
     }
     
-    public void setPosition(final BlockPos fk) {
-        this.worldPosition = fk.immutable();
+    public void setPosition(final BlockPos fu) {
+        this.worldPosition = fu.immutable();
     }
     
     public boolean onlyOpCanSetNbt() {
         return false;
     }
     
-    public void rotate(final Rotation btu) {
+    public void rotate(final Rotation cap) {
     }
     
-    public void mirror(final Mirror bsu) {
+    public void mirror(final Mirror bzj) {
     }
     
     public BlockEntityType<?> getType() {
diff --git a/src/net/minecraft/world/level/block/entity/BlockEntityType.java b/src/net/minecraft/world/level/block/entity/BlockEntityType.java
index da7b4b9..3736b4c 100644
--- a/src/net/minecraft/world/level/block/entity/BlockEntityType.java
+++ b/src/net/minecraft/world/level/block/entity/BlockEntityType.java
@@ -5,10 +5,8 @@ import net.minecraft.world.level.block.Blocks;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.Util;
 import net.minecraft.util.datafix.fixes.References;
-import com.mojang.datafixers.DataFixUtils;
-import net.minecraft.SharedConstants;
-import net.minecraft.util.datafix.DataFixers;
 import javax.annotation.Nullable;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
@@ -59,24 +57,15 @@ public class BlockEntityType<T extends BlockEntity> {
     private final Type<?> dataType;
     
     @Nullable
-    public static ResourceLocation getKey(final BlockEntityType<?> bwm) {
-        return Registry.BLOCK_ENTITY_TYPE.getKey(bwm);
+    public static ResourceLocation getKey(final BlockEntityType<?> cdm) {
+        return Registry.BLOCK_ENTITY_TYPE.getKey(cdm);
     }
     
     private static <T extends BlockEntity> BlockEntityType<T> register(final String string, final Builder<T> a) {
-        Type<?> type3 = null;
-        try {
-            type3 = DataFixers.getDataFixer().getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getWorldVersion())).getChoiceType(References.BLOCK_ENTITY, string);
-        }
-        catch (IllegalArgumentException illegalArgumentException4) {
-            BlockEntityType.LOGGER.error("No data fixer registered for block entity {}", string);
-            if (SharedConstants.IS_RUNNING_IN_IDE) {
-                throw illegalArgumentException4;
-            }
-        }
         if (((Builder<BlockEntity>)a).validBlocks.isEmpty()) {
             BlockEntityType.LOGGER.warn("Block entity type {} requires at least one valid block to be defined!", string);
         }
+        final Type<?> type3 = Util.fetchChoiceType(References.BLOCK_ENTITY, string);
         return Registry.<BlockEntityType<T>>register(Registry.BLOCK_ENTITY_TYPE, string, a.build(type3));
     }
     
@@ -91,17 +80,17 @@ public class BlockEntityType<T extends BlockEntity> {
         return (T)this.factory.get();
     }
     
-    public boolean isValid(final Block bph) {
-        return this.validBlocks.contains(bph);
+    public boolean isValid(final Block bvr) {
+        return this.validBlocks.contains(bvr);
     }
     
     @Nullable
-    public T getBlockEntity(final BlockGetter bjg, final BlockPos fk) {
-        final BlockEntity bwl4 = bjg.getBlockEntity(fk);
-        if (bwl4 == null || bwl4.getType() != this) {
+    public T getBlockEntity(final BlockGetter bpg, final BlockPos fu) {
+        final BlockEntity cdl4 = bpg.getBlockEntity(fu);
+        if (cdl4 == null || cdl4.getType() != this) {
             return null;
         }
-        return (T)bwl4;
+        return (T)cdl4;
     }
     
     static {
@@ -113,7 +102,7 @@ public class BlockEntityType<T extends BlockEntity> {
         JUKEBOX = BlockEntityType.<JukeboxBlockEntity>register("jukebox", Builder.<JukeboxBlockEntity>of(JukeboxBlockEntity::new, new Block[] { Blocks.JUKEBOX }));
         DISPENSER = BlockEntityType.<DispenserBlockEntity>register("dispenser", Builder.<DispenserBlockEntity>of(DispenserBlockEntity::new, new Block[] { Blocks.DISPENSER }));
         DROPPER = BlockEntityType.<DropperBlockEntity>register("dropper", Builder.<DropperBlockEntity>of(DropperBlockEntity::new, new Block[] { Blocks.DROPPER }));
-        SIGN = BlockEntityType.<SignBlockEntity>register("sign", Builder.<SignBlockEntity>of(SignBlockEntity::new, new Block[] { Blocks.OAK_SIGN, Blocks.SPRUCE_SIGN, Blocks.BIRCH_SIGN, Blocks.ACACIA_SIGN, Blocks.JUNGLE_SIGN, Blocks.DARK_OAK_SIGN, Blocks.OAK_WALL_SIGN, Blocks.SPRUCE_WALL_SIGN, Blocks.BIRCH_WALL_SIGN, Blocks.ACACIA_WALL_SIGN, Blocks.JUNGLE_WALL_SIGN, Blocks.DARK_OAK_WALL_SIGN }));
+        SIGN = BlockEntityType.<SignBlockEntity>register("sign", Builder.<SignBlockEntity>of(SignBlockEntity::new, new Block[] { Blocks.OAK_SIGN, Blocks.SPRUCE_SIGN, Blocks.BIRCH_SIGN, Blocks.ACACIA_SIGN, Blocks.JUNGLE_SIGN, Blocks.DARK_OAK_SIGN, Blocks.OAK_WALL_SIGN, Blocks.SPRUCE_WALL_SIGN, Blocks.BIRCH_WALL_SIGN, Blocks.ACACIA_WALL_SIGN, Blocks.JUNGLE_WALL_SIGN, Blocks.DARK_OAK_WALL_SIGN, Blocks.CRIMSON_SIGN, Blocks.CRIMSON_WALL_SIGN, Blocks.WARPED_SIGN, Blocks.WARPED_WALL_SIGN }));
         MOB_SPAWNER = BlockEntityType.<SpawnerBlockEntity>register("mob_spawner", Builder.<SpawnerBlockEntity>of(SpawnerBlockEntity::new, new Block[] { Blocks.SPAWNER }));
         PISTON = BlockEntityType.<PistonMovingBlockEntity>register("piston", Builder.<PistonMovingBlockEntity>of(PistonMovingBlockEntity::new, new Block[] { Blocks.MOVING_PISTON }));
         BREWING_STAND = BlockEntityType.<BrewingStandBlockEntity>register("brewing_stand", Builder.<BrewingStandBlockEntity>of(BrewingStandBlockEntity::new, new Block[] { Blocks.BREWING_STAND }));
@@ -137,7 +126,7 @@ public class BlockEntityType<T extends BlockEntity> {
         LECTERN = BlockEntityType.<LecternBlockEntity>register("lectern", Builder.<LecternBlockEntity>of(LecternBlockEntity::new, new Block[] { Blocks.LECTERN }));
         BELL = BlockEntityType.<BellBlockEntity>register("bell", Builder.<BellBlockEntity>of(BellBlockEntity::new, new Block[] { Blocks.BELL }));
         JIGSAW = BlockEntityType.<JigsawBlockEntity>register("jigsaw", Builder.<JigsawBlockEntity>of(JigsawBlockEntity::new, new Block[] { Blocks.JIGSAW }));
-        CAMPFIRE = BlockEntityType.<CampfireBlockEntity>register("campfire", Builder.<CampfireBlockEntity>of(CampfireBlockEntity::new, new Block[] { Blocks.CAMPFIRE }));
+        CAMPFIRE = BlockEntityType.<CampfireBlockEntity>register("campfire", Builder.<CampfireBlockEntity>of(CampfireBlockEntity::new, new Block[] { Blocks.CAMPFIRE, Blocks.SOUL_CAMPFIRE }));
         BEEHIVE = BlockEntityType.<BeehiveBlockEntity>register("beehive", Builder.<BeehiveBlockEntity>of(BeehiveBlockEntity::new, new Block[] { Blocks.BEE_NEST, Blocks.BEEHIVE }));
     }
     
diff --git a/src/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
index 5b882ea..f7ae282 100644
--- a/src/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block.entity;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.BrewingStandMenu;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -82,7 +82,7 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
     
     @Override
     protected Component getDefaultName() {
-        return new TranslatableComponent("container.brewing", new Object[0]);
+        return new TranslatableComponent("container.brewing");
     }
     
     @Override
@@ -92,8 +92,8 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
     
     @Override
     public boolean isEmpty() {
-        for (final ItemStack ben3 : this.items) {
-            if (!ben3.isEmpty()) {
+        for (final ItemStack bki3 : this.items) {
+            if (!bki3.isEmpty()) {
                 return false;
             }
         }
@@ -102,15 +102,15 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
     
     @Override
     public void tick() {
-        final ItemStack ben2 = this.items.get(4);
-        if (this.fuel <= 0 && ben2.getItem() == Items.BLAZE_POWDER) {
+        final ItemStack bki2 = this.items.get(4);
+        if (this.fuel <= 0 && bki2.getItem() == Items.BLAZE_POWDER) {
             this.fuel = 20;
-            ben2.shrink(1);
+            bki2.shrink(1);
             this.setChanged();
         }
         final boolean boolean3 = this.isBrewable();
         final boolean boolean4 = this.brewTime > 0;
-        final ItemStack ben3 = this.items.get(3);
+        final ItemStack bki3 = this.items.get(3);
         if (boolean4) {
             --this.brewTime;
             final boolean boolean5 = this.brewTime == 0;
@@ -122,7 +122,7 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
                 this.brewTime = 0;
                 this.setChanged();
             }
-            else if (this.ingredient != ben3.getItem()) {
+            else if (this.ingredient != bki3.getItem()) {
                 this.brewTime = 0;
                 this.setChanged();
             }
@@ -130,21 +130,21 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
         else if (boolean3 && this.fuel > 0) {
             --this.fuel;
             this.brewTime = 400;
-            this.ingredient = ben3.getItem();
+            this.ingredient = bki3.getItem();
             this.setChanged();
         }
         if (!this.level.isClientSide) {
             final boolean[] arr6 = this.getPotionBits();
             if (!Arrays.equals(arr6, this.lastPotionCount)) {
                 this.lastPotionCount = arr6;
-                BlockState byj7 = this.level.getBlockState(this.getBlockPos());
-                if (!(byj7.getBlock() instanceof BrewingStandBlock)) {
+                BlockState cfj7 = this.level.getBlockState(this.getBlockPos());
+                if (!(cfj7.getBlock() instanceof BrewingStandBlock)) {
                     return;
                 }
                 for (int integer8 = 0; integer8 < BrewingStandBlock.HAS_BOTTLE.length; ++integer8) {
-                    byj7 = ((AbstractStateHolder<O, BlockState>)byj7).<Comparable, Boolean>setValue((Property<Comparable>)BrewingStandBlock.HAS_BOTTLE[integer8], arr6[integer8]);
+                    cfj7 = ((StateHolder<O, BlockState>)cfj7).<Comparable, Boolean>setValue((Property<Comparable>)BrewingStandBlock.HAS_BOTTLE[integer8], arr6[integer8]);
                 }
-                this.level.setBlock(this.worldPosition, byj7, 2);
+                this.level.setBlock(this.worldPosition, cfj7, 2);
             }
         }
     }
@@ -160,17 +160,17 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
     }
     
     private boolean isBrewable() {
-        final ItemStack ben2 = this.items.get(3);
-        if (ben2.isEmpty()) {
+        final ItemStack bki2 = this.items.get(3);
+        if (bki2.isEmpty()) {
             return false;
         }
-        if (!PotionBrewing.isIngredient(ben2)) {
+        if (!PotionBrewing.isIngredient(bki2)) {
             return false;
         }
         for (int integer3 = 0; integer3 < 3; ++integer3) {
-            final ItemStack ben3 = this.items.get(integer3);
-            if (!ben3.isEmpty()) {
-                if (PotionBrewing.hasMix(ben3, ben2)) {
+            final ItemStack bki3 = this.items.get(integer3);
+            if (!bki3.isEmpty()) {
+                if (PotionBrewing.hasMix(bki3, bki2)) {
                     return true;
                 }
             }
@@ -179,40 +179,40 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
     }
     
     private void doBrew() {
-        ItemStack ben2 = this.items.get(3);
+        ItemStack bki2 = this.items.get(3);
         for (int integer3 = 0; integer3 < 3; ++integer3) {
-            this.items.set(integer3, PotionBrewing.mix(ben2, this.items.get(integer3)));
+            this.items.set(integer3, PotionBrewing.mix(bki2, this.items.get(integer3)));
         }
-        ben2.shrink(1);
-        final BlockPos fk3 = this.getBlockPos();
-        if (ben2.getItem().hasCraftingRemainingItem()) {
-            final ItemStack ben3 = new ItemStack(ben2.getItem().getCraftingRemainingItem());
-            if (ben2.isEmpty()) {
-                ben2 = ben3;
+        bki2.shrink(1);
+        final BlockPos fu3 = this.getBlockPos();
+        if (bki2.getItem().hasCraftingRemainingItem()) {
+            final ItemStack bki3 = new ItemStack(bki2.getItem().getCraftingRemainingItem());
+            if (bki2.isEmpty()) {
+                bki2 = bki3;
             }
             else if (!this.level.isClientSide) {
-                Containers.dropItemStack(this.level, fk3.getX(), fk3.getY(), fk3.getZ(), ben3);
+                Containers.dropItemStack(this.level, fu3.getX(), fu3.getY(), fu3.getZ(), bki3);
             }
         }
-        this.items.set(3, ben2);
-        this.level.levelEvent(1035, fk3, 0);
+        this.items.set(3, bki2);
+        this.level.levelEvent(1035, fu3, 0);
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        ContainerHelper.loadAllItems(jt, this.items = NonNullList.<ItemStack>withSize(this.getContainerSize(), ItemStack.EMPTY));
-        this.brewTime = jt.getShort("BrewTime");
-        this.fuel = jt.getByte("Fuel");
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        ContainerHelper.loadAllItems(le, this.items = NonNullList.<ItemStack>withSize(this.getContainerSize(), ItemStack.EMPTY));
+        this.brewTime = le.getShort("BrewTime");
+        this.fuel = le.getByte("Fuel");
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        jt.putShort("BrewTime", (short)this.brewTime);
-        ContainerHelper.saveAllItems(jt, this.items);
-        jt.putByte("Fuel", (byte)this.fuel);
-        return jt;
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        le.putShort("BrewTime", (short)this.brewTime);
+        ContainerHelper.saveAllItems(le, this.items);
+        le.putByte("Fuel", (byte)this.fuel);
+        return le;
     }
     
     @Override
@@ -234,48 +234,48 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
     }
     
     @Override
-    public void setItem(final int integer, final ItemStack ben) {
+    public void setItem(final int integer, final ItemStack bki) {
         if (integer >= 0 && integer < this.items.size()) {
-            this.items.set(integer, ben);
+            this.items.set(integer, bki);
         }
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.level.getBlockEntity(this.worldPosition) == this && ayj.distanceToSqr(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5) <= 64.0;
+    public boolean stillValid(final Player bec) {
+        return this.level.getBlockEntity(this.worldPosition) == this && bec.distanceToSqr(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5) <= 64.0;
     }
     
     @Override
-    public boolean canPlaceItem(final int integer, final ItemStack ben) {
+    public boolean canPlaceItem(final int integer, final ItemStack bki) {
         if (integer == 3) {
-            return PotionBrewing.isIngredient(ben);
+            return PotionBrewing.isIngredient(bki);
         }
-        final Item bei4 = ben.getItem();
+        final Item bke4 = bki.getItem();
         if (integer == 4) {
-            return bei4 == Items.BLAZE_POWDER;
+            return bke4 == Items.BLAZE_POWDER;
         }
-        return (bei4 == Items.POTION || bei4 == Items.SPLASH_POTION || bei4 == Items.LINGERING_POTION || bei4 == Items.GLASS_BOTTLE) && this.getItem(integer).isEmpty();
+        return (bke4 == Items.POTION || bke4 == Items.SPLASH_POTION || bke4 == Items.LINGERING_POTION || bke4 == Items.GLASS_BOTTLE) && this.getItem(integer).isEmpty();
     }
     
     @Override
-    public int[] getSlotsForFace(final Direction fp) {
-        if (fp == Direction.UP) {
+    public int[] getSlotsForFace(final Direction fz) {
+        if (fz == Direction.UP) {
             return BrewingStandBlockEntity.SLOTS_FOR_UP;
         }
-        if (fp == Direction.DOWN) {
+        if (fz == Direction.DOWN) {
             return BrewingStandBlockEntity.SLOTS_FOR_DOWN;
         }
         return BrewingStandBlockEntity.SLOTS_FOR_SIDES;
     }
     
     @Override
-    public boolean canPlaceItemThroughFace(final int integer, final ItemStack ben, @Nullable final Direction fp) {
-        return this.canPlaceItem(integer, ben);
+    public boolean canPlaceItemThroughFace(final int integer, final ItemStack bki, @Nullable final Direction fz) {
+        return this.canPlaceItem(integer, bki);
     }
     
     @Override
-    public boolean canTakeItemThroughFace(final int integer, final ItemStack ben, final Direction fp) {
-        return integer != 3 || ben.getItem() == Items.GLASS_BOTTLE;
+    public boolean canTakeItemThroughFace(final int integer, final ItemStack bki, final Direction fz) {
+        return integer != 3 || bki.getItem() == Items.GLASS_BOTTLE;
     }
     
     @Override
@@ -284,8 +284,8 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
     }
     
     @Override
-    protected AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return new BrewingStandMenu(integer, ayi, this, this.dataAccess);
+    protected AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return new BrewingStandMenu(integer, beb, this, this.dataAccess);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
index 58285e3..42af59d 100644
--- a/src/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
@@ -5,6 +5,7 @@ import javax.annotation.Nullable;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.world.ContainerHelper;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.state.BlockState;
 import java.util.Random;
 import net.minecraft.world.level.Level;
 import net.minecraft.core.particles.ParticleOptions;
@@ -59,16 +60,16 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable, Ticka
     
     private void cook() {
         for (int integer2 = 0; integer2 < this.items.size(); ++integer2) {
-            final ItemStack ben3 = this.items.get(integer2);
-            if (!ben3.isEmpty()) {
+            final ItemStack bki3 = this.items.get(integer2);
+            if (!bki3.isEmpty()) {
                 final int[] cookingProgress = this.cookingProgress;
                 final int n = integer2;
                 ++cookingProgress[n];
                 if (this.cookingProgress[integer2] >= this.cookingTime[integer2]) {
-                    final Container aje4 = new SimpleContainer(new ItemStack[] { ben3 });
-                    final ItemStack ben4 = this.level.getRecipeManager().<Container, CampfireCookingRecipe>getRecipeFor(RecipeType.CAMPFIRE_COOKING, aje4, this.level).<ItemStack>map(bgn -> bgn.assemble(aje4)).orElse(ben3);
-                    final BlockPos fk6 = this.getBlockPos();
-                    Containers.dropItemStack(this.level, fk6.getX(), fk6.getY(), fk6.getZ(), ben4);
+                    final Container amz4 = new SimpleContainer(new ItemStack[] { bki3 });
+                    final ItemStack bki4 = this.level.getRecipeManager().<Container, CampfireCookingRecipe>getRecipeFor(RecipeType.CAMPFIRE_COOKING, amz4, this.level).<ItemStack>map(bml -> bml.assemble(amz4)).orElse(bki3);
+                    final BlockPos fu6 = this.getBlockPos();
+                    Containers.dropItemStack(this.level, fu6.getX(), fu6.getY(), fu6.getZ(), bki4);
                     this.items.set(integer2, ItemStack.EMPTY);
                     this.markUpdated();
                 }
@@ -77,27 +78,27 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable, Ticka
     }
     
     private void makeParticles() {
-        final Level bjw2 = this.getLevel();
-        if (bjw2 == null) {
+        final Level bqb2 = this.getLevel();
+        if (bqb2 == null) {
             return;
         }
-        final BlockPos fk3 = this.getBlockPos();
-        final Random random4 = bjw2.random;
+        final BlockPos fu3 = this.getBlockPos();
+        final Random random4 = bqb2.random;
         if (random4.nextFloat() < 0.11f) {
             for (int integer5 = 0; integer5 < random4.nextInt(2) + 2; ++integer5) {
-                CampfireBlock.makeParticles(bjw2, fk3, this.getBlockState().<Boolean>getValue((Property<Boolean>)CampfireBlock.SIGNAL_FIRE), false);
+                CampfireBlock.makeParticles(bqb2, fu3, this.getBlockState().<Boolean>getValue((Property<Boolean>)CampfireBlock.SIGNAL_FIRE), false);
             }
         }
         int integer5 = this.getBlockState().<Direction>getValue((Property<Direction>)CampfireBlock.FACING).get2DDataValue();
         for (int integer6 = 0; integer6 < this.items.size(); ++integer6) {
             if (!this.items.get(integer6).isEmpty() && random4.nextFloat() < 0.2f) {
-                final Direction fp7 = Direction.from2DDataValue(Math.floorMod(integer6 + integer5, 4));
+                final Direction fz7 = Direction.from2DDataValue(Math.floorMod(integer6 + integer5, 4));
                 final float float8 = 0.3125f;
-                final double double9 = fk3.getX() + 0.5 - fp7.getStepX() * 0.3125f + fp7.getClockWise().getStepX() * 0.3125f;
-                final double double10 = fk3.getY() + 0.5;
-                final double double11 = fk3.getZ() + 0.5 - fp7.getStepZ() * 0.3125f + fp7.getClockWise().getStepZ() * 0.3125f;
+                final double double9 = fu3.getX() + 0.5 - fz7.getStepX() * 0.3125f + fz7.getClockWise().getStepX() * 0.3125f;
+                final double double10 = fu3.getY() + 0.5;
+                final double double11 = fu3.getZ() + 0.5 - fz7.getStepZ() * 0.3125f + fz7.getClockWise().getStepZ() * 0.3125f;
                 for (int integer7 = 0; integer7 < 4; ++integer7) {
-                    bjw2.addParticle(ParticleTypes.SMOKE, double9, double10, double11, 0.0, 5.0E-4, 0.0);
+                    bqb2.addParticle(ParticleTypes.SMOKE, double9, double10, double11, 0.0, 5.0E-4, 0.0);
                 }
             }
         }
@@ -108,32 +109,32 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable, Ticka
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
         this.items.clear();
-        ContainerHelper.loadAllItems(jt, this.items);
-        if (jt.contains("CookingTimes", 11)) {
-            final int[] arr3 = jt.getIntArray("CookingTimes");
-            System.arraycopy(arr3, 0, this.cookingProgress, 0, Math.min(this.cookingTime.length, arr3.length));
+        ContainerHelper.loadAllItems(le, this.items);
+        if (le.contains("CookingTimes", 11)) {
+            final int[] arr4 = le.getIntArray("CookingTimes");
+            System.arraycopy(arr4, 0, this.cookingProgress, 0, Math.min(this.cookingTime.length, arr4.length));
         }
-        if (jt.contains("CookingTotalTimes", 11)) {
-            final int[] arr3 = jt.getIntArray("CookingTotalTimes");
-            System.arraycopy(arr3, 0, this.cookingTime, 0, Math.min(this.cookingTime.length, arr3.length));
+        if (le.contains("CookingTotalTimes", 11)) {
+            final int[] arr4 = le.getIntArray("CookingTotalTimes");
+            System.arraycopy(arr4, 0, this.cookingTime, 0, Math.min(this.cookingTime.length, arr4.length));
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        this.saveMetadataAndItems(jt);
-        jt.putIntArray("CookingTimes", this.cookingProgress);
-        jt.putIntArray("CookingTotalTimes", this.cookingTime);
-        return jt;
+    public CompoundTag save(final CompoundTag le) {
+        this.saveMetadataAndItems(le);
+        le.putIntArray("CookingTimes", this.cookingProgress);
+        le.putIntArray("CookingTotalTimes", this.cookingTime);
+        return le;
     }
     
-    private CompoundTag saveMetadataAndItems(final CompoundTag jt) {
-        super.save(jt);
-        ContainerHelper.saveAllItems(jt, this.items, true);
-        return jt;
+    private CompoundTag saveMetadataAndItems(final CompoundTag le) {
+        super.save(le);
+        ContainerHelper.saveAllItems(le, this.items, true);
+        return le;
     }
     
     @Nullable
@@ -147,20 +148,20 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable, Ticka
         return this.saveMetadataAndItems(new CompoundTag());
     }
     
-    public Optional<CampfireCookingRecipe> getCookableRecipe(final ItemStack ben) {
+    public Optional<CampfireCookingRecipe> getCookableRecipe(final ItemStack bki) {
         if (this.items.stream().noneMatch(ItemStack::isEmpty)) {
             return Optional.<CampfireCookingRecipe>empty();
         }
-        return this.level.getRecipeManager().<SimpleContainer, CampfireCookingRecipe>getRecipeFor(RecipeType.CAMPFIRE_COOKING, new SimpleContainer(new ItemStack[] { ben }), this.level);
+        return this.level.getRecipeManager().<SimpleContainer, CampfireCookingRecipe>getRecipeFor(RecipeType.CAMPFIRE_COOKING, new SimpleContainer(new ItemStack[] { bki }), this.level);
     }
     
-    public boolean placeFood(final ItemStack ben, final int integer) {
+    public boolean placeFood(final ItemStack bki, final int integer) {
         for (int integer2 = 0; integer2 < this.items.size(); ++integer2) {
-            final ItemStack ben2 = this.items.get(integer2);
-            if (ben2.isEmpty()) {
+            final ItemStack bki2 = this.items.get(integer2);
+            if (bki2.isEmpty()) {
                 this.cookingTime[integer2] = integer;
                 this.cookingProgress[integer2] = 0;
-                this.items.set(integer2, ben.split(1));
+                this.items.set(integer2, bki.split(1));
                 this.markUpdated();
                 return true;
             }
@@ -179,9 +180,11 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable, Ticka
     }
     
     public void dowse() {
-        if (!this.getLevel().isClientSide) {
-            Containers.dropContents(this.getLevel(), this.getBlockPos(), this.getItems());
+        if (this.level != null) {
+            if (!this.level.isClientSide) {
+                Containers.dropContents(this.level, this.getBlockPos(), this.getItems());
+            }
+            this.markUpdated();
         }
-        this.markUpdated();
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/net/minecraft/world/level/block/entity/ChestBlockEntity.java
index dda7f37..ebd1493 100644
--- a/src/net/minecraft/world/level/block/entity/ChestBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/ChestBlockEntity.java
@@ -2,7 +2,6 @@ package net.minecraft.world.level.block.entity;
 
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.util.Mth;
@@ -24,6 +23,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.ContainerHelper;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
@@ -36,8 +36,8 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
     protected int openCount;
     private int tickInterval;
     
-    protected ChestBlockEntity(final BlockEntityType<?> bwm) {
-        super(bwm);
+    protected ChestBlockEntity(final BlockEntityType<?> cdm) {
+        super(cdm);
         this.items = NonNullList.<ItemStack>withSize(27, ItemStack.EMPTY);
     }
     
@@ -52,25 +52,25 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
     
     @Override
     protected Component getDefaultName() {
-        return new TranslatableComponent("container.chest", new Object[0]);
+        return new TranslatableComponent("container.chest");
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
         this.items = NonNullList.<ItemStack>withSize(this.getContainerSize(), ItemStack.EMPTY);
-        if (!this.tryLoadLootTable(jt)) {
-            ContainerHelper.loadAllItems(jt, this.items);
+        if (!this.tryLoadLootTable(le)) {
+            ContainerHelper.loadAllItems(le, this.items);
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        if (!this.trySaveLootTable(jt)) {
-            ContainerHelper.saveAllItems(jt, this.items);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        if (!this.trySaveLootTable(le)) {
+            ContainerHelper.saveAllItems(le, this.items);
         }
-        return jt;
+        return le;
     }
     
     @Override
@@ -106,21 +106,21 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
         }
     }
     
-    public static int getOpenCount(final Level bjw, final BaseContainerBlockEntity bwf, final int integer3, final int integer4, final int integer5, final int integer6, int integer7) {
-        if (!bjw.isClientSide && integer7 != 0 && (integer3 + integer4 + integer5 + integer6) % 200 == 0) {
-            integer7 = getOpenCount(bjw, bwf, integer4, integer5, integer6);
+    public static int getOpenCount(final Level bqb, final BaseContainerBlockEntity cdf, final int integer3, final int integer4, final int integer5, final int integer6, int integer7) {
+        if (!bqb.isClientSide && integer7 != 0 && (integer3 + integer4 + integer5 + integer6) % 200 == 0) {
+            integer7 = getOpenCount(bqb, cdf, integer4, integer5, integer6);
         }
         return integer7;
     }
     
-    public static int getOpenCount(final Level bjw, final BaseContainerBlockEntity bwf, final int integer3, final int integer4, final int integer5) {
+    public static int getOpenCount(final Level bqb, final BaseContainerBlockEntity cdf, final int integer3, final int integer4, final int integer5) {
         int integer6 = 0;
         final float float7 = 5.0f;
-        final List<Player> list8 = bjw.<Player>getEntitiesOfClass(Player.class, new AABB(integer3 - 5.0f, integer4 - 5.0f, integer5 - 5.0f, integer3 + 1 + 5.0f, integer4 + 1 + 5.0f, integer5 + 1 + 5.0f));
-        for (final Player ayj10 : list8) {
-            if (ayj10.containerMenu instanceof ChestMenu) {
-                final Container aje11 = ((ChestMenu)ayj10.containerMenu).getContainer();
-                if (aje11 != bwf && (!(aje11 instanceof CompoundContainer) || !((CompoundContainer)aje11).contains(bwf))) {
+        final List<Player> list8 = bqb.<Player>getEntitiesOfClass(Player.class, new AABB(integer3 - 5.0f, integer4 - 5.0f, integer5 - 5.0f, integer3 + 1 + 5.0f, integer4 + 1 + 5.0f, integer5 + 1 + 5.0f));
+        for (final Player bec10 : list8) {
+            if (bec10.containerMenu instanceof ChestMenu) {
+                final Container amz11 = ((ChestMenu)bec10.containerMenu).getContainer();
+                if (amz11 != cdf && (!(amz11 instanceof CompoundContainer) || !((CompoundContainer)amz11).contains(cdf))) {
                     continue;
                 }
                 ++integer6;
@@ -129,20 +129,20 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
         return integer6;
     }
     
-    private void playSound(final SoundEvent aah) {
-        final ChestType bzc3 = this.getBlockState().<ChestType>getValue(ChestBlock.TYPE);
-        if (bzc3 == ChestType.LEFT) {
+    private void playSound(final SoundEvent ack) {
+        final ChestType cgb3 = this.getBlockState().<ChestType>getValue(ChestBlock.TYPE);
+        if (cgb3 == ChestType.LEFT) {
             return;
         }
         double double4 = this.worldPosition.getX() + 0.5;
         final double double5 = this.worldPosition.getY() + 0.5;
         double double6 = this.worldPosition.getZ() + 0.5;
-        if (bzc3 == ChestType.RIGHT) {
-            final Direction fp10 = ChestBlock.getConnectedDirection(this.getBlockState());
-            double4 += fp10.getStepX() * 0.5;
-            double6 += fp10.getStepZ() * 0.5;
+        if (cgb3 == ChestType.RIGHT) {
+            final Direction fz10 = ChestBlock.getConnectedDirection(this.getBlockState());
+            double4 += fz10.getStepX() * 0.5;
+            double6 += fz10.getStepZ() * 0.5;
         }
-        this.level.playSound(null, double4, double5, double6, aah, SoundSource.BLOCKS, 0.5f, this.level.random.nextFloat() * 0.1f + 0.9f);
+        this.level.playSound(null, double4, double5, double6, ack, SoundSource.BLOCKS, 0.5f, this.level.random.nextFloat() * 0.1f + 0.9f);
     }
     
     @Override
@@ -155,8 +155,8 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
     }
     
     @Override
-    public void startOpen(final Player ayj) {
-        if (!ayj.isSpectator()) {
+    public void startOpen(final Player bec) {
+        if (!bec.isSpectator()) {
             if (this.openCount < 0) {
                 this.openCount = 0;
             }
@@ -166,18 +166,18 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
     }
     
     @Override
-    public void stopOpen(final Player ayj) {
-        if (!ayj.isSpectator()) {
+    public void stopOpen(final Player bec) {
+        if (!bec.isSpectator()) {
             --this.openCount;
             this.signalOpenCount();
         }
     }
     
     protected void signalOpenCount() {
-        final Block bph2 = this.getBlockState().getBlock();
-        if (bph2 instanceof ChestBlock) {
-            this.level.blockEvent(this.worldPosition, bph2, 1, this.openCount);
-            this.level.updateNeighborsAt(this.worldPosition, bph2);
+        final Block bvr2 = this.getBlockState().getBlock();
+        if (bvr2 instanceof ChestBlock) {
+            this.level.blockEvent(this.worldPosition, bvr2, 1, this.openCount);
+            this.level.updateNeighborsAt(this.worldPosition, bvr2);
         }
     }
     
@@ -187,8 +187,8 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
     }
     
     @Override
-    protected void setItems(final NonNullList<ItemStack> fy) {
-        this.items = fy;
+    protected void setItems(final NonNullList<ItemStack> gi) {
+        this.items = gi;
     }
     
     @Override
@@ -196,25 +196,25 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
         return Mth.lerp(float1, this.oOpenness, this.openness);
     }
     
-    public static int getOpenCount(final BlockGetter bjg, final BlockPos fk) {
-        final BlockState byj3 = bjg.getBlockState(fk);
-        if (byj3.getBlock().isEntityBlock()) {
-            final BlockEntity bwl4 = bjg.getBlockEntity(fk);
-            if (bwl4 instanceof ChestBlockEntity) {
-                return ((ChestBlockEntity)bwl4).openCount;
+    public static int getOpenCount(final BlockGetter bpg, final BlockPos fu) {
+        final BlockState cfj3 = bpg.getBlockState(fu);
+        if (cfj3.getBlock().isEntityBlock()) {
+            final BlockEntity cdl4 = bpg.getBlockEntity(fu);
+            if (cdl4 instanceof ChestBlockEntity) {
+                return ((ChestBlockEntity)cdl4).openCount;
             }
         }
         return 0;
     }
     
-    public static void swapContents(final ChestBlockEntity bwp1, final ChestBlockEntity bwp2) {
-        final NonNullList<ItemStack> fy3 = bwp1.getItems();
-        bwp1.setItems(bwp2.getItems());
-        bwp2.setItems(fy3);
+    public static void swapContents(final ChestBlockEntity cdp1, final ChestBlockEntity cdp2) {
+        final NonNullList<ItemStack> gi3 = cdp1.getItems();
+        cdp1.setItems(cdp2.getItems());
+        cdp2.setItems(gi3);
     }
     
     @Override
-    protected AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return ChestMenu.threeRows(integer, ayi, this);
+    protected AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return ChestMenu.threeRows(integer, beb, this);
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/CommandBlockEntity.java b/src/net/minecraft/world/level/block/entity/CommandBlockEntity.java
index 1c69f55..ee07b79 100644
--- a/src/net/minecraft/world/level/block/entity/CommandBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/CommandBlockEntity.java
@@ -5,7 +5,6 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.CommandBlock;
 import javax.annotation.Nullable;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
@@ -14,6 +13,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.commands.CommandSource;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.server.level.ServerLevel;
@@ -42,39 +42,39 @@ public class CommandBlockEntity extends BlockEntity {
             
             @Override
             public void onUpdated() {
-                final BlockState byj2 = CommandBlockEntity.this.level.getBlockState(CommandBlockEntity.this.worldPosition);
-                this.getLevel().sendBlockUpdated(CommandBlockEntity.this.worldPosition, byj2, byj2, 3);
+                final BlockState cfj2 = CommandBlockEntity.this.level.getBlockState(CommandBlockEntity.this.worldPosition);
+                this.getLevel().sendBlockUpdated(CommandBlockEntity.this.worldPosition, cfj2, cfj2, 3);
             }
             
             @Override
             public Vec3 getPosition() {
-                return new Vec3(CommandBlockEntity.this.worldPosition.getX() + 0.5, CommandBlockEntity.this.worldPosition.getY() + 0.5, CommandBlockEntity.this.worldPosition.getZ() + 0.5);
+                return Vec3.atCenterOf(CommandBlockEntity.this.worldPosition);
             }
             
             @Override
             public CommandSourceStack createCommandSourceStack() {
-                return new CommandSourceStack(this, new Vec3(CommandBlockEntity.this.worldPosition.getX() + 0.5, CommandBlockEntity.this.worldPosition.getY() + 0.5, CommandBlockEntity.this.worldPosition.getZ() + 0.5), Vec2.ZERO, this.getLevel(), 2, this.getName().getString(), this.getName(), this.getLevel().getServer(), null);
+                return new CommandSourceStack(this, Vec3.atCenterOf(CommandBlockEntity.this.worldPosition), Vec2.ZERO, this.getLevel(), 2, this.getName().getString(), this.getName(), this.getLevel().getServer(), null);
             }
         };
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        this.commandBlock.save(jt);
-        jt.putBoolean("powered", this.isPowered());
-        jt.putBoolean("conditionMet", this.wasConditionMet());
-        jt.putBoolean("auto", this.isAutomatic());
-        return jt;
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        this.commandBlock.save(le);
+        le.putBoolean("powered", this.isPowered());
+        le.putBoolean("conditionMet", this.wasConditionMet());
+        le.putBoolean("auto", this.isAutomatic());
+        return le;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        this.commandBlock.load(jt);
-        this.powered = jt.getBoolean("powered");
-        this.conditionMet = jt.getBoolean("conditionMet");
-        this.setAutomatic(jt.getBoolean("auto"));
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        this.commandBlock.load(le);
+        this.powered = le.getBoolean("powered");
+        this.conditionMet = le.getBoolean("conditionMet");
+        this.setAutomatic(le.getBoolean("auto"));
     }
     
     @Nullable
@@ -82,8 +82,8 @@ public class CommandBlockEntity extends BlockEntity {
     public ClientboundBlockEntityDataPacket getUpdatePacket() {
         if (this.isSendToClient()) {
             this.setSendToClient(false);
-            final CompoundTag jt2 = this.save(new CompoundTag());
-            return new ClientboundBlockEntityDataPacket(this.worldPosition, 2, jt2);
+            final CompoundTag le2 = this.save(new CompoundTag());
+            return new ClientboundBlockEntityDataPacket(this.worldPosition, 2, le2);
         }
         return null;
     }
@@ -125,10 +125,10 @@ public class CommandBlockEntity extends BlockEntity {
     }
     
     private void scheduleTick() {
-        final Block bph2 = this.getBlockState().getBlock();
-        if (bph2 instanceof CommandBlock) {
+        final Block bvr2 = this.getBlockState().getBlock();
+        if (bvr2 instanceof CommandBlock) {
             this.markConditionMet();
-            this.level.getBlockTicks().scheduleTick(this.worldPosition, bph2, bph2.getTickDelay(this.level));
+            this.level.getBlockTicks().scheduleTick(this.worldPosition, bvr2, 1);
         }
     }
     
@@ -139,10 +139,10 @@ public class CommandBlockEntity extends BlockEntity {
     public boolean markConditionMet() {
         this.conditionMet = true;
         if (this.isConditional()) {
-            final BlockPos fk2 = this.worldPosition.relative(this.level.getBlockState(this.worldPosition).<Direction>getValue((Property<Direction>)CommandBlock.FACING).getOpposite());
-            if (this.level.getBlockState(fk2).getBlock() instanceof CommandBlock) {
-                final BlockEntity bwl3 = this.level.getBlockEntity(fk2);
-                this.conditionMet = (bwl3 instanceof CommandBlockEntity && ((CommandBlockEntity)bwl3).getCommandBlock().getSuccessCount() > 0);
+            final BlockPos fu2 = this.worldPosition.relative(this.level.getBlockState(this.worldPosition).<Direction>getValue((Property<Direction>)CommandBlock.FACING).getOpposite());
+            if (this.level.getBlockState(fu2).getBlock() instanceof CommandBlock) {
+                final BlockEntity cdl3 = this.level.getBlockEntity(fu2);
+                this.conditionMet = (cdl3 instanceof CommandBlockEntity && ((CommandBlockEntity)cdl3).getCommandBlock().getSuccessCount() > 0);
             }
             else {
                 this.conditionMet = false;
@@ -160,22 +160,22 @@ public class CommandBlockEntity extends BlockEntity {
     }
     
     public Mode getMode() {
-        final Block bph2 = this.getBlockState().getBlock();
-        if (bph2 == Blocks.COMMAND_BLOCK) {
+        final BlockState cfj2 = this.getBlockState();
+        if (cfj2.is(Blocks.COMMAND_BLOCK)) {
             return Mode.REDSTONE;
         }
-        if (bph2 == Blocks.REPEATING_COMMAND_BLOCK) {
+        if (cfj2.is(Blocks.REPEATING_COMMAND_BLOCK)) {
             return Mode.AUTO;
         }
-        if (bph2 == Blocks.CHAIN_COMMAND_BLOCK) {
+        if (cfj2.is(Blocks.CHAIN_COMMAND_BLOCK)) {
             return Mode.SEQUENCE;
         }
         return Mode.REDSTONE;
     }
     
     public boolean isConditional() {
-        final BlockState byj2 = this.level.getBlockState(this.getBlockPos());
-        return byj2.getBlock() instanceof CommandBlock && byj2.<Boolean>getValue((Property<Boolean>)CommandBlock.CONDITIONAL);
+        final BlockState cfj2 = this.level.getBlockState(this.getBlockPos());
+        return cfj2.getBlock() instanceof CommandBlock && cfj2.<Boolean>getValue((Property<Boolean>)CommandBlock.CONDITIONAL);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/entity/ComparatorBlockEntity.java b/src/net/minecraft/world/level/block/entity/ComparatorBlockEntity.java
index 6b16e58..00b900b 100644
--- a/src/net/minecraft/world/level/block/entity/ComparatorBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/ComparatorBlockEntity.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.level.block.entity;
 
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.nbt.CompoundTag;
 
 public class ComparatorBlockEntity extends BlockEntity {
@@ -10,16 +11,16 @@ public class ComparatorBlockEntity extends BlockEntity {
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        jt.putInt("OutputSignal", this.output);
-        return jt;
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        le.putInt("OutputSignal", this.output);
+        return le;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        this.output = jt.getInt("OutputSignal");
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        this.output = le.getInt("OutputSignal");
     }
     
     public int getOutputSignal() {
diff --git a/src/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/src/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
index ff32a1f..a713d09 100644
--- a/src/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
@@ -14,15 +14,12 @@ import java.util.Iterator;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.AABB;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
-import net.minecraft.nbt.Tag;
-import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.state.BlockState;
 import com.google.common.collect.Lists;
 import java.util.UUID;
 import javax.annotation.Nullable;
@@ -48,16 +45,16 @@ public class ConduitBlockEntity extends BlockEntity implements TickableBlockEnti
         this(BlockEntityType.CONDUIT);
     }
     
-    public ConduitBlockEntity(final BlockEntityType<?> bwm) {
-        super(bwm);
+    public ConduitBlockEntity(final BlockEntityType<?> cdm) {
+        super(cdm);
         this.effectBlocks = Lists.newArrayList();
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        if (jt.contains("target_uuid")) {
-            this.destroyTargetUUID = NbtUtils.loadUUIDTag(jt.getCompound("target_uuid"));
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        if (le.hasUUID("Target")) {
+            this.destroyTargetUUID = le.getUUID("Target");
         }
         else {
             this.destroyTargetUUID = null;
@@ -65,12 +62,12 @@ public class ConduitBlockEntity extends BlockEntity implements TickableBlockEnti
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
         if (this.destroyTarget != null) {
-            jt.put("target_uuid", NbtUtils.createUUIDTag(this.destroyTarget.getUUID()));
+            le.putUUID("Target", this.destroyTarget.getUUID());
         }
-        return jt;
+        return le;
     }
     
     @Nullable
@@ -116,8 +113,8 @@ public class ConduitBlockEntity extends BlockEntity implements TickableBlockEnti
         for (int integer2 = -1; integer2 <= 1; ++integer2) {
             for (int integer3 = -1; integer3 <= 1; ++integer3) {
                 for (int integer4 = -1; integer4 <= 1; ++integer4) {
-                    final BlockPos fk5 = this.worldPosition.offset(integer2, integer3, integer4);
-                    if (!this.level.isWaterAt(fk5)) {
+                    final BlockPos fu5 = this.worldPosition.offset(integer2, integer3, integer4);
+                    if (!this.level.isWaterAt(fu5)) {
                         return false;
                     }
                 }
@@ -131,11 +128,11 @@ public class ConduitBlockEntity extends BlockEntity implements TickableBlockEnti
                     final int integer7 = Math.abs(integer4);
                     if (integer5 > 1 || integer6 > 1 || integer7 > 1) {
                         if ((integer2 == 0 && (integer6 == 2 || integer7 == 2)) || (integer3 == 0 && (integer5 == 2 || integer7 == 2)) || (integer4 == 0 && (integer5 == 2 || integer6 == 2))) {
-                            final BlockPos fk6 = this.worldPosition.offset(integer2, integer3, integer4);
-                            final BlockState byj9 = this.level.getBlockState(fk6);
-                            for (final Block bph13 : ConduitBlockEntity.VALID_BLOCKS) {
-                                if (byj9.getBlock() == bph13) {
-                                    this.effectBlocks.add(fk6);
+                            final BlockPos fu6 = this.worldPosition.offset(integer2, integer3, integer4);
+                            final BlockState cfj9 = this.level.getBlockState(fu6);
+                            for (final Block bvr13 : ConduitBlockEntity.VALID_BLOCKS) {
+                                if (cfj9.is(bvr13)) {
+                                    this.effectBlocks.add(fu6);
                                 }
                             }
                         }
@@ -153,20 +150,20 @@ public class ConduitBlockEntity extends BlockEntity implements TickableBlockEnti
         final int integer4 = this.worldPosition.getX();
         final int integer5 = this.worldPosition.getY();
         final int integer6 = this.worldPosition.getZ();
-        final AABB cvf7 = new AABB(integer4, integer5, integer6, integer4 + 1, integer5 + 1, integer6 + 1).inflate(integer3).expandTowards(0.0, this.level.getMaxBuildHeight(), 0.0);
-        final List<Player> list8 = this.level.<Player>getEntitiesOfClass(Player.class, cvf7);
+        final AABB deg7 = new AABB(integer4, integer5, integer6, integer4 + 1, integer5 + 1, integer6 + 1).inflate(integer3).expandTowards(0.0, this.level.getMaxBuildHeight(), 0.0);
+        final List<Player> list8 = this.level.<Player>getEntitiesOfClass(Player.class, deg7);
         if (list8.isEmpty()) {
             return;
         }
-        for (final Player ayj10 : list8) {
-            if (this.worldPosition.closerThan(new BlockPos(ayj10), integer3) && ayj10.isInWaterOrRain()) {
-                ayj10.addEffect(new MobEffectInstance(MobEffects.CONDUIT_POWER, 260, 0, true, true));
+        for (final Player bec10 : list8) {
+            if (this.worldPosition.closerThan(bec10.blockPosition(), integer3) && bec10.isInWaterOrRain()) {
+                bec10.addEffect(new MobEffectInstance(MobEffects.CONDUIT_POWER, 260, 0, true, true));
             }
         }
     }
     
     private void updateDestroyTarget() {
-        final LivingEntity akz2 = this.destroyTarget;
+        final LivingEntity aoy2 = this.destroyTarget;
         final int integer3 = this.effectBlocks.size();
         if (integer3 < 42) {
             this.destroyTarget = null;
@@ -176,21 +173,21 @@ public class ConduitBlockEntity extends BlockEntity implements TickableBlockEnti
             this.destroyTargetUUID = null;
         }
         else if (this.destroyTarget == null) {
-            final List<LivingEntity> list4 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, this.getDestroyRangeAABB(), akz -> akz instanceof Enemy && akz.isInWaterOrRain());
+            final List<LivingEntity> list4 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, this.getDestroyRangeAABB(), aoy -> aoy instanceof Enemy && aoy.isInWaterOrRain());
             if (!list4.isEmpty()) {
                 this.destroyTarget = list4.get(this.level.random.nextInt(list4.size()));
             }
         }
-        else if (!this.destroyTarget.isAlive() || !this.worldPosition.closerThan(new BlockPos(this.destroyTarget), 8.0)) {
+        else if (!this.destroyTarget.isAlive() || !this.worldPosition.closerThan(this.destroyTarget.blockPosition(), 8.0)) {
             this.destroyTarget = null;
         }
         if (this.destroyTarget != null) {
             this.level.playSound(null, this.destroyTarget.getX(), this.destroyTarget.getY(), this.destroyTarget.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0f, 1.0f);
             this.destroyTarget.hurt(DamageSource.MAGIC, 4.0f);
         }
-        if (akz2 != this.destroyTarget) {
-            final BlockState byj4 = this.getBlockState();
-            this.level.sendBlockUpdated(this.worldPosition, byj4, byj4, 2);
+        if (aoy2 != this.destroyTarget) {
+            final BlockState cfj4 = this.getBlockState();
+            this.level.sendBlockUpdated(this.worldPosition, cfj4, cfj4, 2);
         }
     }
     
@@ -215,7 +212,7 @@ public class ConduitBlockEntity extends BlockEntity implements TickableBlockEnti
     
     @Nullable
     private LivingEntity findDestroyTarget() {
-        final List<LivingEntity> list2 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, this.getDestroyRangeAABB(), akz -> akz.getUUID().equals(this.destroyTargetUUID));
+        final List<LivingEntity> list2 = this.level.<LivingEntity>getEntitiesOfClass(LivingEntity.class, this.getDestroyRangeAABB(), aoy -> aoy.getUUID().equals(this.destroyTargetUUID));
         if (list2.size() == 1) {
             return list2.get(0);
         }
@@ -226,25 +223,25 @@ public class ConduitBlockEntity extends BlockEntity implements TickableBlockEnti
         final Random random2 = this.level.random;
         double double3 = Mth.sin((this.tickCount + 35) * 0.1f) / 2.0f + 0.5f;
         double3 = (double3 * double3 + double3) * 0.30000001192092896;
-        final Vec3 cvl5 = new Vec3(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 1.5 + double3, this.worldPosition.getZ() + 0.5);
-        for (final BlockPos fk7 : this.effectBlocks) {
+        final Vec3 dem5 = new Vec3(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 1.5 + double3, this.worldPosition.getZ() + 0.5);
+        for (final BlockPos fu7 : this.effectBlocks) {
             if (random2.nextInt(50) != 0) {
                 continue;
             }
             final float float8 = -0.5f + random2.nextFloat();
             final float float9 = -2.0f + random2.nextFloat();
             final float float10 = -0.5f + random2.nextFloat();
-            final BlockPos fk8 = fk7.subtract(this.worldPosition);
-            final Vec3 cvl6 = new Vec3(float8, float9, float10).add(fk8.getX(), fk8.getY(), fk8.getZ());
-            this.level.addParticle(ParticleTypes.NAUTILUS, cvl5.x, cvl5.y, cvl5.z, cvl6.x, cvl6.y, cvl6.z);
+            final BlockPos fu8 = fu7.subtract(this.worldPosition);
+            final Vec3 dem6 = new Vec3(float8, float9, float10).add(fu8.getX(), fu8.getY(), fu8.getZ());
+            this.level.addParticle(ParticleTypes.NAUTILUS, dem5.x, dem5.y, dem5.z, dem6.x, dem6.y, dem6.z);
         }
         if (this.destroyTarget != null) {
-            final Vec3 cvl7 = new Vec3(this.destroyTarget.getX(), this.destroyTarget.getEyeY(), this.destroyTarget.getZ());
+            final Vec3 dem7 = new Vec3(this.destroyTarget.getX(), this.destroyTarget.getEyeY(), this.destroyTarget.getZ());
             final float float11 = (-0.5f + random2.nextFloat()) * (3.0f + this.destroyTarget.getBbWidth());
             final float float8 = -1.0f + random2.nextFloat() * this.destroyTarget.getBbHeight();
             final float float9 = (-0.5f + random2.nextFloat()) * (3.0f + this.destroyTarget.getBbWidth());
-            final Vec3 cvl8 = new Vec3(float11, float8, float9);
-            this.level.addParticle(ParticleTypes.NAUTILUS, cvl7.x, cvl7.y, cvl7.z, cvl8.x, cvl8.y, cvl8.z);
+            final Vec3 dem8 = new Vec3(float11, float8, float9);
+            this.level.addParticle(ParticleTypes.NAUTILUS, dem7.x, dem7.y, dem7.z, dem8.x, dem8.y, dem8.z);
         }
     }
     
@@ -271,8 +268,8 @@ public class ConduitBlockEntity extends BlockEntity implements TickableBlockEnti
         return (this.activeRotation + float1) * -0.0375f;
     }
     
-    public void playSound(final SoundEvent aah) {
-        this.level.playSound(null, this.worldPosition, aah, SoundSource.BLOCKS, 1.0f, 1.0f);
+    public void playSound(final SoundEvent ack) {
+        this.level.playSound(null, this.worldPosition, ack, SoundSource.BLOCKS, 1.0f, 1.0f);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/entity/DaylightDetectorBlockEntity.java b/src/net/minecraft/world/level/block/entity/DaylightDetectorBlockEntity.java
index 9a0bb58..b6351c2 100644
--- a/src/net/minecraft/world/level/block/entity/DaylightDetectorBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/DaylightDetectorBlockEntity.java
@@ -12,10 +12,10 @@ public class DaylightDetectorBlockEntity extends BlockEntity implements Tickable
     @Override
     public void tick() {
         if (this.level != null && !this.level.isClientSide && this.level.getGameTime() % 20L == 0L) {
-            final BlockState byj2 = this.getBlockState();
-            final Block bph3 = byj2.getBlock();
-            if (bph3 instanceof DaylightDetectorBlock) {
-                DaylightDetectorBlock.updateSignalStrength(byj2, this.level, this.worldPosition);
+            final BlockState cfj2 = this.getBlockState();
+            final Block bvr3 = cfj2.getBlock();
+            if (bvr3 instanceof DaylightDetectorBlock) {
+                DaylightDetectorBlock.updateSignalStrength(cfj2, this.level, this.worldPosition);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/block/entity/DispenserBlockEntity.java b/src/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
index f26397b..4ea7843 100644
--- a/src/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
@@ -6,6 +6,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.ContainerHelper;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
@@ -17,8 +18,8 @@ public class DispenserBlockEntity extends RandomizableContainerBlockEntity {
     private static final Random RANDOM;
     private NonNullList<ItemStack> items;
     
-    protected DispenserBlockEntity(final BlockEntityType<?> bwm) {
-        super(bwm);
+    protected DispenserBlockEntity(final BlockEntityType<?> cdm) {
+        super(cdm);
         this.items = NonNullList.<ItemStack>withSize(9, ItemStack.EMPTY);
     }
     
@@ -43,10 +44,10 @@ public class DispenserBlockEntity extends RandomizableContainerBlockEntity {
         return integer2;
     }
     
-    public int addItem(final ItemStack ben) {
+    public int addItem(final ItemStack bki) {
         for (int integer3 = 0; integer3 < this.items.size(); ++integer3) {
             if (this.items.get(integer3).isEmpty()) {
-                this.setItem(integer3, ben);
+                this.setItem(integer3, bki);
                 return integer3;
             }
         }
@@ -55,25 +56,25 @@ public class DispenserBlockEntity extends RandomizableContainerBlockEntity {
     
     @Override
     protected Component getDefaultName() {
-        return new TranslatableComponent("container.dispenser", new Object[0]);
+        return new TranslatableComponent("container.dispenser");
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
         this.items = NonNullList.<ItemStack>withSize(this.getContainerSize(), ItemStack.EMPTY);
-        if (!this.tryLoadLootTable(jt)) {
-            ContainerHelper.loadAllItems(jt, this.items);
+        if (!this.tryLoadLootTable(le)) {
+            ContainerHelper.loadAllItems(le, this.items);
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        if (!this.trySaveLootTable(jt)) {
-            ContainerHelper.saveAllItems(jt, this.items);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        if (!this.trySaveLootTable(le)) {
+            ContainerHelper.saveAllItems(le, this.items);
         }
-        return jt;
+        return le;
     }
     
     @Override
@@ -82,13 +83,13 @@ public class DispenserBlockEntity extends RandomizableContainerBlockEntity {
     }
     
     @Override
-    protected void setItems(final NonNullList<ItemStack> fy) {
-        this.items = fy;
+    protected void setItems(final NonNullList<ItemStack> gi) {
+        this.items = gi;
     }
     
     @Override
-    protected AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return new DispenserMenu(integer, ayi, this);
+    protected AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return new DispenserMenu(integer, beb, this);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/entity/DropperBlockEntity.java b/src/net/minecraft/world/level/block/entity/DropperBlockEntity.java
index b7bb215..3d1dec5 100644
--- a/src/net/minecraft/world/level/block/entity/DropperBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/DropperBlockEntity.java
@@ -10,6 +10,6 @@ public class DropperBlockEntity extends DispenserBlockEntity {
     
     @Override
     protected Component getDefaultName() {
-        return new TranslatableComponent("container.dropper", new Object[0]);
+        return new TranslatableComponent("container.dropper");
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java b/src/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
index c51c476..288eb79 100644
--- a/src/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.util.Mth;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import java.util.Random;
@@ -28,19 +29,19 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
         if (this.hasCustomName()) {
-            jt.putString("CustomName", Component.Serializer.toJson(this.name));
+            le.putString("CustomName", Component.Serializer.toJson(this.name));
         }
-        return jt;
+        return le;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        if (jt.contains("CustomName", 8)) {
-            this.name = Component.Serializer.fromJson(jt.getString("CustomName"));
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        if (le.contains("CustomName", 8)) {
+            this.name = Component.Serializer.fromJson(le.getString("CustomName"));
         }
     }
     
@@ -48,10 +49,10 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
     public void tick() {
         this.oOpen = this.open;
         this.oRot = this.rot;
-        final Player ayj2 = this.level.getNearestPlayer(this.worldPosition.getX() + 0.5f, this.worldPosition.getY() + 0.5f, this.worldPosition.getZ() + 0.5f, 3.0, false);
-        if (ayj2 != null) {
-            final double double3 = ayj2.getX() - (this.worldPosition.getX() + 0.5);
-            final double double4 = ayj2.getZ() - (this.worldPosition.getZ() + 0.5);
+        final Player bec2 = this.level.getNearestPlayer(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5, 3.0, false);
+        if (bec2 != null) {
+            final double double3 = bec2.getX() - (this.worldPosition.getX() + 0.5);
+            final double double4 = bec2.getZ() - (this.worldPosition.getZ() + 0.5);
             this.tRot = (float)Mth.atan2(double4, double3);
             this.open += 0.1f;
             if (this.open < 0.5f || EnchantmentTableBlockEntity.RANDOM.nextInt(40) == 0) {
@@ -98,11 +99,11 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
         if (this.name != null) {
             return this.name;
         }
-        return new TranslatableComponent("container.enchant", new Object[0]);
+        return new TranslatableComponent("container.enchant");
     }
     
-    public void setCustomName(@Nullable final Component lf) {
-        this.name = lf;
+    public void setCustomName(@Nullable final Component mr) {
+        this.name = mr;
     }
     
     @Nullable
diff --git a/src/net/minecraft/world/level/block/entity/EnderChestBlockEntity.java b/src/net/minecraft/world/level/block/entity/EnderChestBlockEntity.java
index 6c3d703..356b19e 100644
--- a/src/net/minecraft/world/level/block/entity/EnderChestBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/EnderChestBlockEntity.java
@@ -79,8 +79,8 @@ public class EnderChestBlockEntity extends BlockEntity implements LidBlockEntity
         this.level.blockEvent(this.worldPosition, Blocks.ENDER_CHEST, 1, this.openCount);
     }
     
-    public boolean stillValid(final Player ayj) {
-        return this.level.getBlockEntity(this.worldPosition) == this && ayj.distanceToSqr(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5) <= 64.0;
+    public boolean stillValid(final Player bec) {
+        return this.level.getBlockEntity(this.worldPosition) == this && bec.distanceToSqr(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5) <= 64.0;
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/entity/FurnaceBlockEntity.java b/src/net/minecraft/world/level/block/entity/FurnaceBlockEntity.java
index 0cae24f..c75129a 100644
--- a/src/net/minecraft/world/level/block/entity/FurnaceBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/FurnaceBlockEntity.java
@@ -16,11 +16,11 @@ public class FurnaceBlockEntity extends AbstractFurnaceBlockEntity {
     
     @Override
     protected Component getDefaultName() {
-        return new TranslatableComponent("container.furnace", new Object[0]);
+        return new TranslatableComponent("container.furnace");
     }
     
     @Override
-    protected AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return new FurnaceMenu(integer, ayi, this, this.dataAccess);
+    protected AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return new FurnaceMenu(integer, beb, this, this.dataAccess);
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index 1f9bb42..1a8a625 100644
--- a/src/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -7,7 +7,6 @@ import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.block.ChestBlock;
 import net.minecraft.world.level.LevelAccessor;
@@ -35,6 +34,7 @@ import java.util.List;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.ContainerHelper;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.core.NonNullList;
 
@@ -50,23 +50,23 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
         this.items = NonNullList.<ItemStack>withSize(this.getContainerSize(), ItemStack.EMPTY);
-        if (!this.tryLoadLootTable(jt)) {
-            ContainerHelper.loadAllItems(jt, this.items);
+        if (!this.tryLoadLootTable(le)) {
+            ContainerHelper.loadAllItems(le, this.items);
         }
-        this.cooldownTime = jt.getInt("TransferCooldown");
+        this.cooldownTime = le.getInt("TransferCooldown");
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        if (!this.trySaveLootTable(jt)) {
-            ContainerHelper.saveAllItems(jt, this.items);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        if (!this.trySaveLootTable(le)) {
+            ContainerHelper.saveAllItems(le, this.items);
         }
-        jt.putInt("TransferCooldown", this.cooldownTime);
-        return jt;
+        le.putInt("TransferCooldown", this.cooldownTime);
+        return le;
     }
     
     @Override
@@ -81,17 +81,17 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
     }
     
     @Override
-    public void setItem(final int integer, final ItemStack ben) {
+    public void setItem(final int integer, final ItemStack bki) {
         this.unpackLootTable(null);
-        this.getItems().set(integer, ben);
-        if (ben.getCount() > this.getMaxStackSize()) {
-            ben.setCount(this.getMaxStackSize());
+        this.getItems().set(integer, bki);
+        if (bki.getCount() > this.getMaxStackSize()) {
+            bki.setCount(this.getMaxStackSize());
         }
     }
     
     @Override
     protected Component getDefaultName() {
-        return new TranslatableComponent("container.hopper", new Object[0]);
+        return new TranslatableComponent("container.hopper");
     }
     
     @Override
@@ -129,8 +129,8 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
     }
     
     private boolean inventoryFull() {
-        for (final ItemStack ben3 : this.items) {
-            if (ben3.isEmpty() || ben3.getCount() != ben3.getMaxStackSize()) {
+        for (final ItemStack bki3 : this.items) {
+            if (bki3.isEmpty() || bki3.getCount() != bki3.getMaxStackSize()) {
                 return false;
             }
         }
@@ -138,195 +138,195 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
     }
     
     private boolean ejectItems() {
-        final Container aje2 = this.getAttachedContainer();
-        if (aje2 == null) {
+        final Container amz2 = this.getAttachedContainer();
+        if (amz2 == null) {
             return false;
         }
-        final Direction fp3 = this.getBlockState().<Direction>getValue((Property<Direction>)HopperBlock.FACING).getOpposite();
-        if (this.isFullContainer(aje2, fp3)) {
+        final Direction fz3 = this.getBlockState().<Direction>getValue((Property<Direction>)HopperBlock.FACING).getOpposite();
+        if (this.isFullContainer(amz2, fz3)) {
             return false;
         }
         for (int integer4 = 0; integer4 < this.getContainerSize(); ++integer4) {
             if (!this.getItem(integer4).isEmpty()) {
-                final ItemStack ben5 = this.getItem(integer4).copy();
-                final ItemStack ben6 = addItem(this, aje2, this.removeItem(integer4, 1), fp3);
-                if (ben6.isEmpty()) {
-                    aje2.setChanged();
+                final ItemStack bki5 = this.getItem(integer4).copy();
+                final ItemStack bki6 = addItem(this, amz2, this.removeItem(integer4, 1), fz3);
+                if (bki6.isEmpty()) {
+                    amz2.setChanged();
                     return true;
                 }
-                this.setItem(integer4, ben5);
+                this.setItem(integer4, bki5);
             }
         }
         return false;
     }
     
-    private static IntStream getSlots(final Container aje, final Direction fp) {
-        if (aje instanceof WorldlyContainer) {
-            return IntStream.of(((WorldlyContainer)aje).getSlotsForFace(fp));
+    private static IntStream getSlots(final Container amz, final Direction fz) {
+        if (amz instanceof WorldlyContainer) {
+            return IntStream.of(((WorldlyContainer)amz).getSlotsForFace(fz));
         }
-        return IntStream.range(0, aje.getContainerSize());
+        return IntStream.range(0, amz.getContainerSize());
     }
     
-    private boolean isFullContainer(final Container aje, final Direction fp) {
-        final ItemStack ben3;
-        return getSlots(aje, fp).allMatch(integer -> {
-            ben3 = aje.getItem(integer);
-            return ben3.getCount() >= ben3.getMaxStackSize();
+    private boolean isFullContainer(final Container amz, final Direction fz) {
+        final ItemStack bki3;
+        return getSlots(amz, fz).allMatch(integer -> {
+            bki3 = amz.getItem(integer);
+            return bki3.getCount() >= bki3.getMaxStackSize();
         });
     }
     
-    private static boolean isEmptyContainer(final Container aje, final Direction fp) {
-        return getSlots(aje, fp).allMatch(integer -> aje.getItem(integer).isEmpty());
+    private static boolean isEmptyContainer(final Container amz, final Direction fz) {
+        return getSlots(amz, fz).allMatch(integer -> amz.getItem(integer).isEmpty());
     }
     
-    public static boolean suckInItems(final Hopper bwz) {
-        final Container aje2 = getSourceContainer(bwz);
-        if (aje2 != null) {
-            final Direction fp3 = Direction.DOWN;
-            return !isEmptyContainer(aje2, fp3) && getSlots(aje2, fp3).anyMatch(integer -> tryTakeInItemFromSlot(bwz, aje2, integer, fp3));
+    public static boolean suckInItems(final Hopper cdz) {
+        final Container amz2 = getSourceContainer(cdz);
+        if (amz2 != null) {
+            final Direction fz3 = Direction.DOWN;
+            return !isEmptyContainer(amz2, fz3) && getSlots(amz2, fz3).anyMatch(integer -> tryTakeInItemFromSlot(cdz, amz2, integer, fz3));
         }
-        for (final ItemEntity awb4 : getItemsAtAndAbove(bwz)) {
-            if (addItem(bwz, awb4)) {
+        for (final ItemEntity bbg4 : getItemsAtAndAbove(cdz)) {
+            if (addItem(cdz, bbg4)) {
                 return true;
             }
         }
         return false;
     }
     
-    private static boolean tryTakeInItemFromSlot(final Hopper bwz, final Container aje, final int integer, final Direction fp) {
-        final ItemStack ben5 = aje.getItem(integer);
-        if (!ben5.isEmpty() && canTakeItemFromContainer(aje, ben5, integer, fp)) {
-            final ItemStack ben6 = ben5.copy();
-            final ItemStack ben7 = addItem(aje, bwz, aje.removeItem(integer, 1), null);
-            if (ben7.isEmpty()) {
-                aje.setChanged();
+    private static boolean tryTakeInItemFromSlot(final Hopper cdz, final Container amz, final int integer, final Direction fz) {
+        final ItemStack bki5 = amz.getItem(integer);
+        if (!bki5.isEmpty() && canTakeItemFromContainer(amz, bki5, integer, fz)) {
+            final ItemStack bki6 = bki5.copy();
+            final ItemStack bki7 = addItem(amz, cdz, amz.removeItem(integer, 1), null);
+            if (bki7.isEmpty()) {
+                amz.setChanged();
                 return true;
             }
-            aje.setItem(integer, ben6);
+            amz.setItem(integer, bki6);
         }
         return false;
     }
     
-    public static boolean addItem(final Container aje, final ItemEntity awb) {
+    public static boolean addItem(final Container amz, final ItemEntity bbg) {
         boolean boolean3 = false;
-        final ItemStack ben4 = awb.getItem().copy();
-        final ItemStack ben5 = addItem(null, aje, ben4, null);
-        if (ben5.isEmpty()) {
+        final ItemStack bki4 = bbg.getItem().copy();
+        final ItemStack bki5 = addItem(null, amz, bki4, null);
+        if (bki5.isEmpty()) {
             boolean3 = true;
-            awb.remove();
+            bbg.remove();
         }
         else {
-            awb.setItem(ben5);
+            bbg.setItem(bki5);
         }
         return boolean3;
     }
     
-    public static ItemStack addItem(@Nullable final Container aje1, final Container aje2, ItemStack ben, @Nullable final Direction fp) {
-        if (aje2 instanceof WorldlyContainer && fp != null) {
-            final WorldlyContainer aju5 = (WorldlyContainer)aje2;
-            final int[] arr6 = aju5.getSlotsForFace(fp);
-            for (int integer7 = 0; integer7 < arr6.length && !ben.isEmpty(); ben = tryMoveInItem(aje1, aje2, ben, arr6[integer7], fp), ++integer7) {}
+    public static ItemStack addItem(@Nullable final Container amz1, final Container amz2, ItemStack bki, @Nullable final Direction fz) {
+        if (amz2 instanceof WorldlyContainer && fz != null) {
+            final WorldlyContainer anq5 = (WorldlyContainer)amz2;
+            final int[] arr6 = anq5.getSlotsForFace(fz);
+            for (int integer7 = 0; integer7 < arr6.length && !bki.isEmpty(); bki = tryMoveInItem(amz1, amz2, bki, arr6[integer7], fz), ++integer7) {}
         }
         else {
-            for (int integer8 = aje2.getContainerSize(), integer9 = 0; integer9 < integer8 && !ben.isEmpty(); ben = tryMoveInItem(aje1, aje2, ben, integer9, fp), ++integer9) {}
+            for (int integer8 = amz2.getContainerSize(), integer9 = 0; integer9 < integer8 && !bki.isEmpty(); bki = tryMoveInItem(amz1, amz2, bki, integer9, fz), ++integer9) {}
         }
-        return ben;
+        return bki;
     }
     
-    private static boolean canPlaceItemInContainer(final Container aje, final ItemStack ben, final int integer, @Nullable final Direction fp) {
-        return aje.canPlaceItem(integer, ben) && (!(aje instanceof WorldlyContainer) || ((WorldlyContainer)aje).canPlaceItemThroughFace(integer, ben, fp));
+    private static boolean canPlaceItemInContainer(final Container amz, final ItemStack bki, final int integer, @Nullable final Direction fz) {
+        return amz.canPlaceItem(integer, bki) && (!(amz instanceof WorldlyContainer) || ((WorldlyContainer)amz).canPlaceItemThroughFace(integer, bki, fz));
     }
     
-    private static boolean canTakeItemFromContainer(final Container aje, final ItemStack ben, final int integer, final Direction fp) {
-        return !(aje instanceof WorldlyContainer) || ((WorldlyContainer)aje).canTakeItemThroughFace(integer, ben, fp);
+    private static boolean canTakeItemFromContainer(final Container amz, final ItemStack bki, final int integer, final Direction fz) {
+        return !(amz instanceof WorldlyContainer) || ((WorldlyContainer)amz).canTakeItemThroughFace(integer, bki, fz);
     }
     
-    private static ItemStack tryMoveInItem(@Nullable final Container aje1, final Container aje2, ItemStack ben, final int integer, @Nullable final Direction fp) {
-        final ItemStack ben2 = aje2.getItem(integer);
-        if (canPlaceItemInContainer(aje2, ben, integer, fp)) {
+    private static ItemStack tryMoveInItem(@Nullable final Container amz1, final Container amz2, ItemStack bki, final int integer, @Nullable final Direction fz) {
+        final ItemStack bki2 = amz2.getItem(integer);
+        if (canPlaceItemInContainer(amz2, bki, integer, fz)) {
             boolean boolean7 = false;
-            final boolean boolean8 = aje2.isEmpty();
-            if (ben2.isEmpty()) {
-                aje2.setItem(integer, ben);
-                ben = ItemStack.EMPTY;
+            final boolean boolean8 = amz2.isEmpty();
+            if (bki2.isEmpty()) {
+                amz2.setItem(integer, bki);
+                bki = ItemStack.EMPTY;
                 boolean7 = true;
             }
-            else if (canMergeItems(ben2, ben)) {
-                final int integer2 = ben.getMaxStackSize() - ben2.getCount();
-                final int integer3 = Math.min(ben.getCount(), integer2);
-                ben.shrink(integer3);
-                ben2.grow(integer3);
+            else if (canMergeItems(bki2, bki)) {
+                final int integer2 = bki.getMaxStackSize() - bki2.getCount();
+                final int integer3 = Math.min(bki.getCount(), integer2);
+                bki.shrink(integer3);
+                bki2.grow(integer3);
                 boolean7 = (integer3 > 0);
             }
             if (boolean7) {
-                if (boolean8 && aje2 instanceof HopperBlockEntity) {
-                    final HopperBlockEntity bxa9 = (HopperBlockEntity)aje2;
-                    if (!bxa9.isOnCustomCooldown()) {
+                if (boolean8 && amz2 instanceof HopperBlockEntity) {
+                    final HopperBlockEntity cea9 = (HopperBlockEntity)amz2;
+                    if (!cea9.isOnCustomCooldown()) {
                         int integer3 = 0;
-                        if (aje1 instanceof HopperBlockEntity) {
-                            final HopperBlockEntity bxa10 = (HopperBlockEntity)aje1;
-                            if (bxa9.tickedGameTime >= bxa10.tickedGameTime) {
+                        if (amz1 instanceof HopperBlockEntity) {
+                            final HopperBlockEntity cea10 = (HopperBlockEntity)amz1;
+                            if (cea9.tickedGameTime >= cea10.tickedGameTime) {
                                 integer3 = 1;
                             }
                         }
-                        bxa9.setCooldown(8 - integer3);
+                        cea9.setCooldown(8 - integer3);
                     }
                 }
-                aje2.setChanged();
+                amz2.setChanged();
             }
         }
-        return ben;
+        return bki;
     }
     
     @Nullable
     private Container getAttachedContainer() {
-        final Direction fp2 = this.getBlockState().<Direction>getValue((Property<Direction>)HopperBlock.FACING);
-        return getContainerAt(this.getLevel(), this.worldPosition.relative(fp2));
+        final Direction fz2 = this.getBlockState().<Direction>getValue((Property<Direction>)HopperBlock.FACING);
+        return getContainerAt(this.getLevel(), this.worldPosition.relative(fz2));
     }
     
     @Nullable
-    public static Container getSourceContainer(final Hopper bwz) {
-        return getContainerAt(bwz.getLevel(), bwz.getLevelX(), bwz.getLevelY() + 1.0, bwz.getLevelZ());
+    public static Container getSourceContainer(final Hopper cdz) {
+        return getContainerAt(cdz.getLevel(), cdz.getLevelX(), cdz.getLevelY() + 1.0, cdz.getLevelZ());
     }
     
-    public static List<ItemEntity> getItemsAtAndAbove(final Hopper bwz) {
-        return bwz.getSuckShape().toAabbs().stream().flatMap(cvf -> bwz.getLevel().<Entity>getEntitiesOfClass(ItemEntity.class, cvf.move(bwz.getLevelX() - 0.5, bwz.getLevelY() - 0.5, bwz.getLevelZ() - 0.5), EntitySelector.ENTITY_STILL_ALIVE).stream()).collect(Collectors.toList());
+    public static List<ItemEntity> getItemsAtAndAbove(final Hopper cdz) {
+        return cdz.getSuckShape().toAabbs().stream().flatMap(deg -> cdz.getLevel().<Entity>getEntitiesOfClass(ItemEntity.class, deg.move(cdz.getLevelX() - 0.5, cdz.getLevelY() - 0.5, cdz.getLevelZ() - 0.5), EntitySelector.ENTITY_STILL_ALIVE).stream()).collect(Collectors.toList());
     }
     
     @Nullable
-    public static Container getContainerAt(final Level bjw, final BlockPos fk) {
-        return getContainerAt(bjw, fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5);
+    public static Container getContainerAt(final Level bqb, final BlockPos fu) {
+        return getContainerAt(bqb, fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5);
     }
     
     @Nullable
-    public static Container getContainerAt(final Level bjw, final double double2, final double double3, final double double4) {
-        Container aje8 = null;
-        final BlockPos fk9 = new BlockPos(double2, double3, double4);
-        final BlockState byj10 = bjw.getBlockState(fk9);
-        final Block bph11 = byj10.getBlock();
-        if (bph11 instanceof WorldlyContainerHolder) {
-            aje8 = ((WorldlyContainerHolder)bph11).getContainer(byj10, bjw, fk9);
+    public static Container getContainerAt(final Level bqb, final double double2, final double double3, final double double4) {
+        Container amz8 = null;
+        final BlockPos fu9 = new BlockPos(double2, double3, double4);
+        final BlockState cfj10 = bqb.getBlockState(fu9);
+        final Block bvr11 = cfj10.getBlock();
+        if (bvr11 instanceof WorldlyContainerHolder) {
+            amz8 = ((WorldlyContainerHolder)bvr11).getContainer(cfj10, bqb, fu9);
         }
-        else if (bph11.isEntityBlock()) {
-            final BlockEntity bwl12 = bjw.getBlockEntity(fk9);
-            if (bwl12 instanceof Container) {
-                aje8 = (Container)bwl12;
-                if (aje8 instanceof ChestBlockEntity && bph11 instanceof ChestBlock) {
-                    aje8 = ChestBlock.getContainer((ChestBlock)bph11, byj10, bjw, fk9, true);
+        else if (bvr11.isEntityBlock()) {
+            final BlockEntity cdl12 = bqb.getBlockEntity(fu9);
+            if (cdl12 instanceof Container) {
+                amz8 = (Container)cdl12;
+                if (amz8 instanceof ChestBlockEntity && bvr11 instanceof ChestBlock) {
+                    amz8 = ChestBlock.getContainer((ChestBlock)bvr11, cfj10, bqb, fu9, true);
                 }
             }
         }
-        if (aje8 == null) {
-            final List<Entity> list12 = bjw.getEntities(null, new AABB(double2 - 0.5, double3 - 0.5, double4 - 0.5, double2 + 0.5, double3 + 0.5, double4 + 0.5), EntitySelector.CONTAINER_ENTITY_SELECTOR);
+        if (amz8 == null) {
+            final List<Entity> list12 = bqb.getEntities(null, new AABB(double2 - 0.5, double3 - 0.5, double4 - 0.5, double2 + 0.5, double3 + 0.5, double4 + 0.5), EntitySelector.CONTAINER_ENTITY_SELECTOR);
             if (!list12.isEmpty()) {
-                aje8 = (Container)list12.get(bjw.random.nextInt(list12.size()));
+                amz8 = (Container)list12.get(bqb.random.nextInt(list12.size()));
             }
         }
-        return aje8;
+        return amz8;
     }
     
-    private static boolean canMergeItems(final ItemStack ben1, final ItemStack ben2) {
-        return ben1.getItem() == ben2.getItem() && ben1.getDamageValue() == ben2.getDamageValue() && ben1.getCount() <= ben1.getMaxStackSize() && ItemStack.tagMatches(ben1, ben2);
+    private static boolean canMergeItems(final ItemStack bki1, final ItemStack bki2) {
+        return bki1.getItem() == bki2.getItem() && bki1.getDamageValue() == bki2.getDamageValue() && bki1.getCount() <= bki1.getMaxStackSize() && ItemStack.tagMatches(bki1, bki2);
     }
     
     @Override
@@ -362,21 +362,21 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
     }
     
     @Override
-    protected void setItems(final NonNullList<ItemStack> fy) {
-        this.items = fy;
+    protected void setItems(final NonNullList<ItemStack> gi) {
+        this.items = gi;
     }
     
-    public void entityInside(final Entity akq) {
-        if (akq instanceof ItemEntity) {
-            final BlockPos fk3 = this.getBlockPos();
-            if (Shapes.joinIsNotEmpty(Shapes.create(akq.getBoundingBox().move(-fk3.getX(), -fk3.getY(), -fk3.getZ())), this.getSuckShape(), BooleanOp.AND)) {
-                this.tryMoveItems(() -> addItem(this, (ItemEntity)akq));
+    public void entityInside(final Entity aom) {
+        if (aom instanceof ItemEntity) {
+            final BlockPos fu3 = this.getBlockPos();
+            if (Shapes.joinIsNotEmpty(Shapes.create(aom.getBoundingBox().move(-fu3.getX(), -fu3.getY(), -fu3.getZ())), this.getSuckShape(), BooleanOp.AND)) {
+                this.tryMoveItems(() -> addItem(this, (ItemEntity)aom));
             }
         }
     }
     
     @Override
-    protected AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return new HopperMenu(integer, ayi, this);
+    protected AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return new HopperMenu(integer, beb, this);
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/JigsawBlockEntity.java b/src/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
index fd03f0b..1ea106f 100644
--- a/src/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
@@ -1,19 +1,52 @@
 package net.minecraft.world.level.block.entity;
 
+import net.minecraft.world.level.levelgen.feature.StructurePieceType;
+import java.util.Arrays;
+import java.util.Optional;
+import net.minecraft.util.StringRepresentable;
+import java.util.Iterator;
+import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement;
+import java.util.Random;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece;
+import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import java.util.List;
+import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.Level;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import com.google.common.collect.Lists;
+import net.minecraft.server.level.ServerLevel;
 import javax.annotation.Nullable;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
+import net.minecraft.world.level.block.JigsawBlock;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 
 public class JigsawBlockEntity extends BlockEntity {
-    private ResourceLocation attachementType;
-    private ResourceLocation targetPool;
+    private ResourceLocation name;
+    private ResourceLocation target;
+    private ResourceLocation pool;
+    private JointType joint;
     private String finalState;
     
-    public JigsawBlockEntity(final BlockEntityType<?> bwm) {
-        super(bwm);
-        this.attachementType = new ResourceLocation("empty");
-        this.targetPool = new ResourceLocation("empty");
+    public JigsawBlockEntity(final BlockEntityType<?> cdm) {
+        super(cdm);
+        this.name = new ResourceLocation("empty");
+        this.target = new ResourceLocation("empty");
+        this.pool = new ResourceLocation("empty");
+        this.joint = JointType.ROLLABLE;
         this.finalState = "minecraft:air";
     }
     
@@ -21,45 +54,65 @@ public class JigsawBlockEntity extends BlockEntity {
         this(BlockEntityType.JIGSAW);
     }
     
-    public ResourceLocation getAttachementType() {
-        return this.attachementType;
+    public ResourceLocation getName() {
+        return this.name;
     }
     
-    public ResourceLocation getTargetPool() {
-        return this.targetPool;
+    public ResourceLocation getTarget() {
+        return this.target;
+    }
+    
+    public ResourceLocation getPool() {
+        return this.pool;
     }
     
     public String getFinalState() {
         return this.finalState;
     }
     
-    public void setAttachementType(final ResourceLocation sm) {
-        this.attachementType = sm;
+    public JointType getJoint() {
+        return this.joint;
     }
     
-    public void setTargetPool(final ResourceLocation sm) {
-        this.targetPool = sm;
+    public void setName(final ResourceLocation uh) {
+        this.name = uh;
+    }
+    
+    public void setTarget(final ResourceLocation uh) {
+        this.target = uh;
+    }
+    
+    public void setPool(final ResourceLocation uh) {
+        this.pool = uh;
     }
     
     public void setFinalState(final String string) {
         this.finalState = string;
     }
     
-    @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        jt.putString("attachement_type", this.attachementType.toString());
-        jt.putString("target_pool", this.targetPool.toString());
-        jt.putString("final_state", this.finalState);
-        return jt;
+    public void setJoint(final JointType a) {
+        this.joint = a;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        this.attachementType = new ResourceLocation(jt.getString("attachement_type"));
-        this.targetPool = new ResourceLocation(jt.getString("target_pool"));
-        this.finalState = jt.getString("final_state");
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        le.putString("name", this.name.toString());
+        le.putString("target", this.target.toString());
+        le.putString("pool", this.pool.toString());
+        le.putString("final_state", this.finalState);
+        le.putString("joint", this.joint.getSerializedName());
+        return le;
+    }
+    
+    @Override
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        this.name = new ResourceLocation(le.getString("name"));
+        this.target = new ResourceLocation(le.getString("target"));
+        this.pool = new ResourceLocation(le.getString("pool"));
+        this.finalState = le.getString("final_state");
+        this.joint = JointType.byName(le.getString("joint")).orElseGet(() -> JigsawBlock.getFrontFacing(cfj).getAxis().isHorizontal() ? JointType.ALIGNED : JointType.ROLLABLE);
     }
     
     @Nullable
@@ -72,4 +125,51 @@ public class JigsawBlockEntity extends BlockEntity {
     public CompoundTag getUpdateTag() {
         return this.save(new CompoundTag());
     }
+    
+    public void generate(final ServerLevel zd, final int integer, final boolean boolean3) {
+        final ChunkGenerator cha5 = zd.getChunkSource().getGenerator();
+        final StructureManager cva6 = zd.getStructureManager();
+        final StructureFeatureManager bqq7 = zd.structureFeatureManager();
+        final Random random8 = zd.getRandom();
+        final BlockPos fu9 = this.getBlockPos();
+        final List<PoolElementStructurePiece> list10 = Lists.newArrayList();
+        final StructureTemplate cve11 = new StructureTemplate();
+        cve11.fillFromWorld(zd, fu9, new BlockPos(1, 1, 1), false, null);
+        final StructurePoolElement cqd12 = new SinglePoolElement(cve11, ImmutableList.of(), StructureTemplatePool.Projection.RIGID);
+        final RuntimePiece b13 = new RuntimePiece(cva6, cqd12, fu9, 1, Rotation.NONE, new BoundingBox(fu9, fu9));
+        JigsawPlacement.addPieces(b13, integer, RuntimePiece::new, cha5, cva6, list10, random8);
+        for (final PoolElementStructurePiece cts15 : list10) {
+            cts15.place(zd, bqq7, cha5, random8, BoundingBox.infinite(), fu9, boolean3);
+        }
+    }
+    
+    public enum JointType implements StringRepresentable {
+        ROLLABLE("rollable"), 
+        ALIGNED("aligned");
+        
+        private final String name;
+        
+        private JointType(final String string3) {
+            this.name = string3;
+        }
+        
+        @Override
+        public String getSerializedName() {
+            return this.name;
+        }
+        
+        public static Optional<JointType> byName(final String string) {
+            return Arrays.<JointType>stream(values()).filter(a -> a.getSerializedName().equals(string)).findFirst();
+        }
+    }
+    
+    public static final class RuntimePiece extends PoolElementStructurePiece {
+        public RuntimePiece(final StructureManager cva, final StructurePoolElement cqd, final BlockPos fu, final int integer, final Rotation cap, final BoundingBox ctd) {
+            super(StructurePieceType.RUNTIME, cva, cqd, fu, integer, cap, ctd);
+        }
+        
+        public RuntimePiece(final StructureManager cva, final CompoundTag le) {
+            super(cva, le, StructurePieceType.RUNTIME);
+        }
+    }
 }
diff --git a/src/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java b/src/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
index 772d3f6..918d0fd 100644
--- a/src/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
@@ -2,6 +2,7 @@ package net.minecraft.world.level.block.entity;
 
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.Clearable;
 
@@ -14,28 +15,28 @@ public class JukeboxBlockEntity extends BlockEntity implements Clearable {
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        if (jt.contains("RecordItem", 10)) {
-            this.setRecord(ItemStack.of(jt.getCompound("RecordItem")));
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        if (le.contains("RecordItem", 10)) {
+            this.setRecord(ItemStack.of(le.getCompound("RecordItem")));
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
         if (!this.getRecord().isEmpty()) {
-            jt.put("RecordItem", this.getRecord().save(new CompoundTag()));
+            le.put("RecordItem", this.getRecord().save(new CompoundTag()));
         }
-        return jt;
+        return le;
     }
     
     public ItemStack getRecord() {
         return this.record;
     }
     
-    public void setRecord(final ItemStack ben) {
-        this.record = ben;
+    public void setRecord(final ItemStack bki) {
+        this.record = bki;
         this.setChanged();
     }
     
diff --git a/src/net/minecraft/world/level/block/entity/LecternBlockEntity.java b/src/net/minecraft/world/level/block/entity/LecternBlockEntity.java
index 7f138b1..7595576 100644
--- a/src/net/minecraft/world/level/block/entity/LecternBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/LecternBlockEntity.java
@@ -6,10 +6,12 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.commands.CommandSource;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.commands.CommandSourceStack;
@@ -55,11 +57,11 @@ public class LecternBlockEntity extends BlockEntity implements Clearable, MenuPr
             @Override
             public ItemStack removeItem(final int integer1, final int integer2) {
                 if (integer1 == 0) {
-                    final ItemStack ben4 = LecternBlockEntity.this.book.split(integer2);
+                    final ItemStack bki4 = LecternBlockEntity.this.book.split(integer2);
                     if (LecternBlockEntity.this.book.isEmpty()) {
                         LecternBlockEntity.this.onBookItemRemove();
                     }
-                    return ben4;
+                    return bki4;
                 }
                 return ItemStack.EMPTY;
             }
@@ -67,16 +69,16 @@ public class LecternBlockEntity extends BlockEntity implements Clearable, MenuPr
             @Override
             public ItemStack removeItemNoUpdate(final int integer) {
                 if (integer == 0) {
-                    final ItemStack ben3 = LecternBlockEntity.this.book;
+                    final ItemStack bki3 = LecternBlockEntity.this.book;
                     LecternBlockEntity.this.book = ItemStack.EMPTY;
                     LecternBlockEntity.this.onBookItemRemove();
-                    return ben3;
+                    return bki3;
                 }
                 return ItemStack.EMPTY;
             }
             
             @Override
-            public void setItem(final int integer, final ItemStack ben) {
+            public void setItem(final int integer, final ItemStack bki) {
             }
             
             @Override
@@ -90,12 +92,12 @@ public class LecternBlockEntity extends BlockEntity implements Clearable, MenuPr
             }
             
             @Override
-            public boolean stillValid(final Player ayj) {
-                return LecternBlockEntity.this.level.getBlockEntity(LecternBlockEntity.this.worldPosition) == LecternBlockEntity.this && ayj.distanceToSqr(LecternBlockEntity.this.worldPosition.getX() + 0.5, LecternBlockEntity.this.worldPosition.getY() + 0.5, LecternBlockEntity.this.worldPosition.getZ() + 0.5) <= 64.0 && LecternBlockEntity.this.hasBook();
+            public boolean stillValid(final Player bec) {
+                return LecternBlockEntity.this.level.getBlockEntity(LecternBlockEntity.this.worldPosition) == LecternBlockEntity.this && bec.distanceToSqr(LecternBlockEntity.this.worldPosition.getX() + 0.5, LecternBlockEntity.this.worldPosition.getY() + 0.5, LecternBlockEntity.this.worldPosition.getZ() + 0.5) <= 64.0 && LecternBlockEntity.this.hasBook();
             }
             
             @Override
-            public boolean canPlaceItem(final int integer, final ItemStack ben) {
+            public boolean canPlaceItem(final int integer, final ItemStack bki) {
                 return false;
             }
             
@@ -129,12 +131,12 @@ public class LecternBlockEntity extends BlockEntity implements Clearable, MenuPr
     }
     
     public boolean hasBook() {
-        final Item bei2 = this.book.getItem();
-        return bei2 == Items.WRITABLE_BOOK || bei2 == Items.WRITTEN_BOOK;
+        final Item bke2 = this.book.getItem();
+        return bke2 == Items.WRITABLE_BOOK || bke2 == Items.WRITTEN_BOOK;
     }
     
-    public void setBook(final ItemStack ben) {
-        this.setBook(ben, null);
+    public void setBook(final ItemStack bki) {
+        this.setBook(bki, null);
     }
     
     private void onBookItemRemove() {
@@ -143,8 +145,8 @@ public class LecternBlockEntity extends BlockEntity implements Clearable, MenuPr
         LecternBlock.resetBookState(this.getLevel(), this.getBlockPos(), this.getBlockState(), false);
     }
     
-    public void setBook(final ItemStack ben, @Nullable final Player ayj) {
-        this.book = this.resolveBook(ben, ayj);
+    public void setBook(final ItemStack bki, @Nullable final Player bec) {
+        this.book = this.resolveBook(bki, bec);
         this.page = 0;
         this.pageCount = WrittenBookItem.getPageCount(this.book);
         this.setChanged();
@@ -168,26 +170,26 @@ public class LecternBlockEntity extends BlockEntity implements Clearable, MenuPr
         return Mth.floor(float2 * 14.0f) + (this.hasBook() ? 1 : 0);
     }
     
-    private ItemStack resolveBook(final ItemStack ben, @Nullable final Player ayj) {
-        if (this.level instanceof ServerLevel && ben.getItem() == Items.WRITTEN_BOOK) {
-            WrittenBookItem.resolveBookComponents(ben, this.createCommandSourceStack(ayj), ayj);
+    private ItemStack resolveBook(final ItemStack bki, @Nullable final Player bec) {
+        if (this.level instanceof ServerLevel && bki.getItem() == Items.WRITTEN_BOOK) {
+            WrittenBookItem.resolveBookComponents(bki, this.createCommandSourceStack(bec), bec);
         }
-        return ben;
+        return bki;
     }
     
-    private CommandSourceStack createCommandSourceStack(@Nullable final Player ayj) {
+    private CommandSourceStack createCommandSourceStack(@Nullable final Player bec) {
         String string3;
-        Component lf4;
-        if (ayj == null) {
+        Component mr4;
+        if (bec == null) {
             string3 = "Lectern";
-            lf4 = new TextComponent("Lectern");
+            mr4 = new TextComponent("Lectern");
         }
         else {
-            string3 = ayj.getName().getString();
-            lf4 = ayj.getDisplayName();
+            string3 = bec.getName().getString();
+            mr4 = bec.getDisplayName();
         }
-        final Vec3 cvl5 = new Vec3(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5);
-        return new CommandSourceStack(CommandSource.NULL, cvl5, Vec2.ZERO, (ServerLevel)this.level, 2, string3, lf4, this.level.getServer(), ayj);
+        final Vec3 dem5 = Vec3.atCenterOf(this.worldPosition);
+        return new CommandSourceStack(CommandSource.NULL, dem5, Vec2.ZERO, (ServerLevel)this.level, 2, string3, mr4, this.level.getServer(), bec);
     }
     
     @Override
@@ -196,26 +198,26 @@ public class LecternBlockEntity extends BlockEntity implements Clearable, MenuPr
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        if (jt.contains("Book", 10)) {
-            this.book = this.resolveBook(ItemStack.of(jt.getCompound("Book")), null);
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        if (le.contains("Book", 10)) {
+            this.book = this.resolveBook(ItemStack.of(le.getCompound("Book")), null);
         }
         else {
             this.book = ItemStack.EMPTY;
         }
         this.pageCount = WrittenBookItem.getPageCount(this.book);
-        this.page = Mth.clamp(jt.getInt("Page"), 0, this.pageCount - 1);
+        this.page = Mth.clamp(le.getInt("Page"), 0, this.pageCount - 1);
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
         if (!this.getBook().isEmpty()) {
-            jt.put("Book", this.getBook().save(new CompoundTag()));
-            jt.putInt("Page", this.page);
+            le.put("Book", this.getBook().save(new CompoundTag()));
+            le.putInt("Page", this.page);
         }
-        return jt;
+        return le;
     }
     
     @Override
@@ -224,12 +226,12 @@ public class LecternBlockEntity extends BlockEntity implements Clearable, MenuPr
     }
     
     @Override
-    public AbstractContainerMenu createMenu(final int integer, final Inventory ayi, final Player ayj) {
+    public AbstractContainerMenu createMenu(final int integer, final Inventory beb, final Player bec) {
         return new LecternMenu(integer, this.bookAccess, this.dataAccess);
     }
     
     @Override
     public Component getDisplayName() {
-        return new TranslatableComponent("container.lectern", new Object[0]);
+        return new TranslatableComponent("container.lectern");
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
index 51f98d0..e745303 100644
--- a/src/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
@@ -14,6 +14,8 @@ import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.core.BlockPos;
@@ -27,51 +29,54 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
     protected ResourceLocation lootTable;
     protected long lootTableSeed;
     
-    protected RandomizableContainerBlockEntity(final BlockEntityType<?> bwm) {
-        super(bwm);
+    protected RandomizableContainerBlockEntity(final BlockEntityType<?> cdm) {
+        super(cdm);
     }
     
-    public static void setLootTable(final BlockGetter bjg, final Random random, final BlockPos fk, final ResourceLocation sm) {
-        final BlockEntity bwl5 = bjg.getBlockEntity(fk);
-        if (bwl5 instanceof RandomizableContainerBlockEntity) {
-            ((RandomizableContainerBlockEntity)bwl5).setLootTable(sm, random.nextLong());
+    public static void setLootTable(final BlockGetter bpg, final Random random, final BlockPos fu, final ResourceLocation uh) {
+        final BlockEntity cdl5 = bpg.getBlockEntity(fu);
+        if (cdl5 instanceof RandomizableContainerBlockEntity) {
+            ((RandomizableContainerBlockEntity)cdl5).setLootTable(uh, random.nextLong());
         }
     }
     
-    protected boolean tryLoadLootTable(final CompoundTag jt) {
-        if (jt.contains("LootTable", 8)) {
-            this.lootTable = new ResourceLocation(jt.getString("LootTable"));
-            this.lootTableSeed = jt.getLong("LootTableSeed");
+    protected boolean tryLoadLootTable(final CompoundTag le) {
+        if (le.contains("LootTable", 8)) {
+            this.lootTable = new ResourceLocation(le.getString("LootTable"));
+            this.lootTableSeed = le.getLong("LootTableSeed");
             return true;
         }
         return false;
     }
     
-    protected boolean trySaveLootTable(final CompoundTag jt) {
+    protected boolean trySaveLootTable(final CompoundTag le) {
         if (this.lootTable == null) {
             return false;
         }
-        jt.putString("LootTable", this.lootTable.toString());
+        le.putString("LootTable", this.lootTable.toString());
         if (this.lootTableSeed != 0L) {
-            jt.putLong("LootTableSeed", this.lootTableSeed);
+            le.putLong("LootTableSeed", this.lootTableSeed);
         }
         return true;
     }
     
-    public void unpackLootTable(@Nullable final Player ayj) {
+    public void unpackLootTable(@Nullable final Player bec) {
         if (this.lootTable != null && this.level.getServer() != null) {
-            final LootTable csa3 = this.level.getServer().getLootTables().get(this.lootTable);
+            final LootTable daw3 = this.level.getServer().getLootTables().get(this.lootTable);
+            if (bec instanceof ServerPlayer) {
+                CriteriaTriggers.GENERATE_LOOT.trigger((ServerPlayer)bec, this.lootTable);
+            }
             this.lootTable = null;
             final LootContext.Builder a4 = new LootContext.Builder((ServerLevel)this.level).<BlockPos>withParameter(LootContextParams.BLOCK_POS, new BlockPos(this.worldPosition)).withOptionalRandomSeed(this.lootTableSeed);
-            if (ayj != null) {
-                a4.withLuck(ayj.getLuck()).<Entity>withParameter(LootContextParams.THIS_ENTITY, ayj);
+            if (bec != null) {
+                a4.withLuck(bec.getLuck()).<Entity>withParameter(LootContextParams.THIS_ENTITY, bec);
             }
-            csa3.fill(this, a4.create(LootContextParamSets.CHEST));
+            daw3.fill(this, a4.create(LootContextParamSets.CHEST));
         }
     }
     
-    public void setLootTable(final ResourceLocation sm, final long long2) {
-        this.lootTable = sm;
+    public void setLootTable(final ResourceLocation uh, final long long2) {
+        this.lootTable = uh;
         this.lootTableSeed = long2;
     }
     
@@ -90,11 +95,11 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
     @Override
     public ItemStack removeItem(final int integer1, final int integer2) {
         this.unpackLootTable(null);
-        final ItemStack ben4 = ContainerHelper.removeItem(this.getItems(), integer1, integer2);
-        if (!ben4.isEmpty()) {
+        final ItemStack bki4 = ContainerHelper.removeItem(this.getItems(), integer1, integer2);
+        if (!bki4.isEmpty()) {
             this.setChanged();
         }
-        return ben4;
+        return bki4;
     }
     
     @Override
@@ -104,18 +109,18 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
     }
     
     @Override
-    public void setItem(final int integer, final ItemStack ben) {
+    public void setItem(final int integer, final ItemStack bki) {
         this.unpackLootTable(null);
-        this.getItems().set(integer, ben);
-        if (ben.getCount() > this.getMaxStackSize()) {
-            ben.setCount(this.getMaxStackSize());
+        this.getItems().set(integer, bki);
+        if (bki.getCount() > this.getMaxStackSize()) {
+            bki.setCount(this.getMaxStackSize());
         }
         this.setChanged();
     }
     
     @Override
-    public boolean stillValid(final Player ayj) {
-        return this.level.getBlockEntity(this.worldPosition) == this && ayj.distanceToSqr(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5) <= 64.0;
+    public boolean stillValid(final Player bec) {
+        return this.level.getBlockEntity(this.worldPosition) == this && bec.distanceToSqr(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5) <= 64.0;
     }
     
     @Override
@@ -125,19 +130,19 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
     
     protected abstract NonNullList<ItemStack> getItems();
     
-    protected abstract void setItems(final NonNullList<ItemStack> fy);
+    protected abstract void setItems(final NonNullList<ItemStack> gi);
     
     @Override
-    public boolean canOpen(final Player ayj) {
-        return super.canOpen(ayj) && (this.lootTable == null || !ayj.isSpectator());
+    public boolean canOpen(final Player bec) {
+        return super.canOpen(bec) && (this.lootTable == null || !bec.isSpectator());
     }
     
     @Nullable
     @Override
-    public AbstractContainerMenu createMenu(final int integer, final Inventory ayi, final Player ayj) {
-        if (this.canOpen(ayj)) {
-            this.unpackLootTable(ayi.player);
-            return this.createMenu(integer, ayi);
+    public AbstractContainerMenu createMenu(final int integer, final Inventory beb, final Player bec) {
+        if (this.canOpen(bec)) {
+            this.unpackLootTable(beb.player);
+            return this.createMenu(integer, beb);
         }
         return null;
     }
diff --git a/src/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java b/src/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
index 0b78716..97dd556 100644
--- a/src/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
@@ -43,11 +43,11 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
     private DyeColor color;
     private boolean loadColorFromBlock;
     
-    public ShulkerBoxBlockEntity(@Nullable final DyeColor bdj) {
+    public ShulkerBoxBlockEntity(@Nullable final DyeColor bje) {
         super(BlockEntityType.SHULKER_BOX);
         this.itemStacks = NonNullList.<ItemStack>withSize(27, ItemStack.EMPTY);
         this.animationStatus = AnimationStatus.CLOSED;
-        this.color = bdj;
+        this.color = bje;
     }
     
     public ShulkerBoxBlockEntity() {
@@ -102,71 +102,71 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
         return this.animationStatus;
     }
     
-    public AABB getBoundingBox(final BlockState byj) {
-        return this.getBoundingBox(byj.<Direction>getValue(ShulkerBoxBlock.FACING));
+    public AABB getBoundingBox(final BlockState cfj) {
+        return this.getBoundingBox(cfj.<Direction>getValue(ShulkerBoxBlock.FACING));
     }
     
-    public AABB getBoundingBox(final Direction fp) {
+    public AABB getBoundingBox(final Direction fz) {
         final float float3 = this.getProgress(1.0f);
-        return Shapes.block().bounds().expandTowards(0.5f * float3 * fp.getStepX(), 0.5f * float3 * fp.getStepY(), 0.5f * float3 * fp.getStepZ());
+        return Shapes.block().bounds().expandTowards(0.5f * float3 * fz.getStepX(), 0.5f * float3 * fz.getStepY(), 0.5f * float3 * fz.getStepZ());
     }
     
-    private AABB getTopBoundingBox(final Direction fp) {
-        final Direction fp2 = fp.getOpposite();
-        return this.getBoundingBox(fp).contract(fp2.getStepX(), fp2.getStepY(), fp2.getStepZ());
+    private AABB getTopBoundingBox(final Direction fz) {
+        final Direction fz2 = fz.getOpposite();
+        return this.getBoundingBox(fz).contract(fz2.getStepX(), fz2.getStepY(), fz2.getStepZ());
     }
     
     private void moveCollidedEntities() {
-        final BlockState byj2 = this.level.getBlockState(this.getBlockPos());
-        if (!(byj2.getBlock() instanceof ShulkerBoxBlock)) {
+        final BlockState cfj2 = this.level.getBlockState(this.getBlockPos());
+        if (!(cfj2.getBlock() instanceof ShulkerBoxBlock)) {
             return;
         }
-        final Direction fp3 = byj2.<Direction>getValue(ShulkerBoxBlock.FACING);
-        final AABB cvf4 = this.getTopBoundingBox(fp3).move(this.worldPosition);
-        final List<Entity> list5 = this.level.getEntities(null, cvf4);
+        final Direction fz3 = cfj2.<Direction>getValue(ShulkerBoxBlock.FACING);
+        final AABB deg4 = this.getTopBoundingBox(fz3).move(this.worldPosition);
+        final List<Entity> list5 = this.level.getEntities(null, deg4);
         if (list5.isEmpty()) {
             return;
         }
         for (int integer6 = 0; integer6 < list5.size(); ++integer6) {
-            final Entity akq7 = list5.get(integer6);
-            if (akq7.getPistonPushReaction() != PushReaction.IGNORE) {
+            final Entity aom7 = list5.get(integer6);
+            if (aom7.getPistonPushReaction() != PushReaction.IGNORE) {
                 double double8 = 0.0;
                 double double9 = 0.0;
                 double double10 = 0.0;
-                final AABB cvf5 = akq7.getBoundingBox();
-                switch (fp3.getAxis()) {
+                final AABB deg5 = aom7.getBoundingBox();
+                switch (fz3.getAxis()) {
                     case X: {
-                        if (fp3.getAxisDirection() == Direction.AxisDirection.POSITIVE) {
-                            double8 = cvf4.maxX - cvf5.minX;
+                        if (fz3.getAxisDirection() == Direction.AxisDirection.POSITIVE) {
+                            double8 = deg4.maxX - deg5.minX;
                         }
                         else {
-                            double8 = cvf5.maxX - cvf4.minX;
+                            double8 = deg5.maxX - deg4.minX;
                         }
                         double8 += 0.01;
                         break;
                     }
                     case Y: {
-                        if (fp3.getAxisDirection() == Direction.AxisDirection.POSITIVE) {
-                            double9 = cvf4.maxY - cvf5.minY;
+                        if (fz3.getAxisDirection() == Direction.AxisDirection.POSITIVE) {
+                            double9 = deg4.maxY - deg5.minY;
                         }
                         else {
-                            double9 = cvf5.maxY - cvf4.minY;
+                            double9 = deg5.maxY - deg4.minY;
                         }
                         double9 += 0.01;
                         break;
                     }
                     case Z: {
-                        if (fp3.getAxisDirection() == Direction.AxisDirection.POSITIVE) {
-                            double10 = cvf4.maxZ - cvf5.minZ;
+                        if (fz3.getAxisDirection() == Direction.AxisDirection.POSITIVE) {
+                            double10 = deg4.maxZ - deg5.minZ;
                         }
                         else {
-                            double10 = cvf5.maxZ - cvf4.minZ;
+                            double10 = deg5.maxZ - deg4.minZ;
                         }
                         double10 += 0.01;
                         break;
                     }
                 }
-                akq7.move(MoverType.SHULKER_BOX, new Vec3(double8 * fp3.getStepX(), double9 * fp3.getStepY(), double10 * fp3.getStepZ()));
+                aom7.move(MoverType.SHULKER_BOX, new Vec3(double8 * fz3.getStepX(), double9 * fz3.getStepY(), double10 * fz3.getStepZ()));
             }
         }
     }
@@ -197,8 +197,8 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
     }
     
     @Override
-    public void startOpen(final Player ayj) {
-        if (!ayj.isSpectator()) {
+    public void startOpen(final Player bec) {
+        if (!bec.isSpectator()) {
             if (this.openCount < 0) {
                 this.openCount = 0;
             }
@@ -211,8 +211,8 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
     }
     
     @Override
-    public void stopOpen(final Player ayj) {
-        if (!ayj.isSpectator()) {
+    public void stopOpen(final Player bec) {
+        if (!bec.isSpectator()) {
             --this.openCount;
             this.level.blockEvent(this.worldPosition, this.getBlockState().getBlock(), 1, this.openCount);
             if (this.openCount <= 0) {
@@ -223,33 +223,33 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
     
     @Override
     protected Component getDefaultName() {
-        return new TranslatableComponent("container.shulkerBox", new Object[0]);
+        return new TranslatableComponent("container.shulkerBox");
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        this.loadFromTag(jt);
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        this.loadFromTag(le);
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        return this.saveToTag(jt);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        return this.saveToTag(le);
     }
     
-    public void loadFromTag(final CompoundTag jt) {
+    public void loadFromTag(final CompoundTag le) {
         this.itemStacks = NonNullList.<ItemStack>withSize(this.getContainerSize(), ItemStack.EMPTY);
-        if (!this.tryLoadLootTable(jt) && jt.contains("Items", 9)) {
-            ContainerHelper.loadAllItems(jt, this.itemStacks);
+        if (!this.tryLoadLootTable(le) && le.contains("Items", 9)) {
+            ContainerHelper.loadAllItems(le, this.itemStacks);
         }
     }
     
-    public CompoundTag saveToTag(final CompoundTag jt) {
-        if (!this.trySaveLootTable(jt)) {
-            ContainerHelper.saveAllItems(jt, this.itemStacks, false);
+    public CompoundTag saveToTag(final CompoundTag le) {
+        if (!this.trySaveLootTable(le)) {
+            ContainerHelper.saveAllItems(le, this.itemStacks, false);
         }
-        return jt;
+        return le;
     }
     
     @Override
@@ -258,22 +258,22 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
     }
     
     @Override
-    protected void setItems(final NonNullList<ItemStack> fy) {
-        this.itemStacks = fy;
+    protected void setItems(final NonNullList<ItemStack> gi) {
+        this.itemStacks = gi;
     }
     
     @Override
-    public int[] getSlotsForFace(final Direction fp) {
+    public int[] getSlotsForFace(final Direction fz) {
         return ShulkerBoxBlockEntity.SLOTS;
     }
     
     @Override
-    public boolean canPlaceItemThroughFace(final int integer, final ItemStack ben, @Nullable final Direction fp) {
-        return !(Block.byItem(ben.getItem()) instanceof ShulkerBoxBlock);
+    public boolean canPlaceItemThroughFace(final int integer, final ItemStack bki, @Nullable final Direction fz) {
+        return !(Block.byItem(bki.getItem()) instanceof ShulkerBoxBlock);
     }
     
     @Override
-    public boolean canTakeItemThroughFace(final int integer, final ItemStack ben, final Direction fp) {
+    public boolean canTakeItemThroughFace(final int integer, final ItemStack bki, final Direction fz) {
         return true;
     }
     
@@ -291,8 +291,12 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
     }
     
     @Override
-    protected AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return new ShulkerBoxMenu(integer, ayi, this);
+    protected AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return new ShulkerBoxMenu(integer, beb, this);
+    }
+    
+    public boolean isClosed() {
+        return this.animationStatus == AnimationStatus.CLOSED;
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/net/minecraft/world/level/block/entity/SignBlockEntity.java
index af6cabf..358ce11 100644
--- a/src/net/minecraft/world/level/block/entity/SignBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/SignBlockEntity.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.block.entity;
 
 import net.minecraft.world.phys.Vec2;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.commands.CommandSource;
 import net.minecraft.commands.CommandSourceStack;
@@ -8,80 +9,78 @@ import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import javax.annotation.Nullable;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.network.chat.ComponentUtils;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.world.item.DyeColor;
+import net.minecraft.network.chat.FormattedText;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.network.chat.Component;
 
 public class SignBlockEntity extends BlockEntity {
-    public final Component[] messages;
+    private final Component[] messages;
     private boolean isEditable;
     private Player playerWhoMayEdit;
-    private final String[] renderMessages;
+    private final FormattedText[] renderMessages;
     private DyeColor color;
     
     public SignBlockEntity() {
         super(BlockEntityType.SIGN);
-        this.messages = new Component[] { new TextComponent(""), new TextComponent(""), new TextComponent(""), new TextComponent("") };
+        this.messages = new Component[] { TextComponent.EMPTY, TextComponent.EMPTY, TextComponent.EMPTY, TextComponent.EMPTY };
         this.isEditable = true;
-        this.renderMessages = new String[4];
+        this.renderMessages = new FormattedText[4];
         this.color = DyeColor.BLACK;
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
         for (int integer3 = 0; integer3 < 4; ++integer3) {
             final String string4 = Component.Serializer.toJson(this.messages[integer3]);
-            jt.putString("Text" + (integer3 + 1), string4);
+            le.putString("Text" + (integer3 + 1), string4);
         }
-        jt.putString("Color", this.color.getName());
-        return jt;
+        le.putString("Color", this.color.getName());
+        return le;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
+    public void load(final BlockState cfj, final CompoundTag le) {
         this.isEditable = false;
-        super.load(jt);
-        this.color = DyeColor.byName(jt.getString("Color"), DyeColor.BLACK);
-        for (int integer3 = 0; integer3 < 4; ++integer3) {
-            final String string4 = jt.getString("Text" + (integer3 + 1));
-            final Component lf5 = Component.Serializer.fromJson(string4.isEmpty() ? "\"\"" : string4);
+        super.load(cfj, le);
+        this.color = DyeColor.byName(le.getString("Color"), DyeColor.BLACK);
+        for (int integer4 = 0; integer4 < 4; ++integer4) {
+            final String string5 = le.getString("Text" + (integer4 + 1));
+            final Component mr6 = Component.Serializer.fromJson(string5.isEmpty() ? "\"\"" : string5);
             if (this.level instanceof ServerLevel) {
                 try {
-                    this.messages[integer3] = ComponentUtils.updateForEntity(this.createCommandSourceStack(null), lf5, null, 0);
+                    this.messages[integer4] = ComponentUtils.updateForEntity(this.createCommandSourceStack(null), mr6, null, 0);
                 }
-                catch (CommandSyntaxException commandSyntaxException6) {
-                    this.messages[integer3] = lf5;
+                catch (CommandSyntaxException commandSyntaxException7) {
+                    this.messages[integer4] = mr6;
                 }
             }
             else {
-                this.messages[integer3] = lf5;
+                this.messages[integer4] = mr6;
             }
-            this.renderMessages[integer3] = null;
+            this.renderMessages[integer4] = null;
         }
     }
     
-    public Component getMessage(final int integer) {
-        return this.messages[integer];
-    }
-    
-    public void setMessage(final int integer, final Component lf) {
-        this.messages[integer] = lf;
+    public void setMessage(final int integer, final Component mr) {
+        this.messages[integer] = mr;
         this.renderMessages[integer] = null;
     }
     
     @Nullable
-    public String getRenderMessage(final int integer, final Function<Component, String> function) {
+    public FormattedText getRenderMessage(final int integer, final UnaryOperator<FormattedText> unaryOperator) {
         if (this.renderMessages[integer] == null && this.messages[integer] != null) {
-            this.renderMessages[integer] = function.apply(this.messages[integer]);
+            this.renderMessages[integer] = unaryOperator.apply(this.messages[integer]);
         }
         return this.renderMessages[integer];
     }
@@ -112,22 +111,22 @@ public class SignBlockEntity extends BlockEntity {
         }
     }
     
-    public void setAllowedPlayerEditor(final Player ayj) {
-        this.playerWhoMayEdit = ayj;
+    public void setAllowedPlayerEditor(final Player bec) {
+        this.playerWhoMayEdit = bec;
     }
     
     public Player getPlayerWhoMayEdit() {
         return this.playerWhoMayEdit;
     }
     
-    public boolean executeClickCommands(final Player ayj) {
-        for (final Component lf6 : this.messages) {
-            final Style ln7 = (lf6 == null) ? null : lf6.getStyle();
-            if (ln7 != null) {
-                if (ln7.getClickEvent() != null) {
-                    final ClickEvent le8 = ln7.getClickEvent();
-                    if (le8.getAction() == ClickEvent.Action.RUN_COMMAND) {
-                        ayj.getServer().getCommands().performCommand(this.createCommandSourceStack((ServerPlayer)ayj), le8.getValue());
+    public boolean executeClickCommands(final Player bec) {
+        for (final Component mr6 : this.messages) {
+            final Style nb7 = (mr6 == null) ? null : mr6.getStyle();
+            if (nb7 != null) {
+                if (nb7.getClickEvent() != null) {
+                    final ClickEvent mp8 = nb7.getClickEvent();
+                    if (mp8.getAction() == ClickEvent.Action.RUN_COMMAND) {
+                        bec.getServer().getCommands().performCommand(this.createCommandSourceStack((ServerPlayer)bec), mp8.getValue());
                     }
                 }
             }
@@ -135,19 +134,19 @@ public class SignBlockEntity extends BlockEntity {
         return true;
     }
     
-    public CommandSourceStack createCommandSourceStack(@Nullable final ServerPlayer xe) {
-        final String string3 = (xe == null) ? "Sign" : xe.getName().getString();
-        final Component lf4 = (xe == null) ? new TextComponent("Sign") : xe.getDisplayName();
-        return new CommandSourceStack(CommandSource.NULL, new Vec3(this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5), Vec2.ZERO, (ServerLevel)this.level, 2, string3, lf4, this.level.getServer(), xe);
+    public CommandSourceStack createCommandSourceStack(@Nullable final ServerPlayer ze) {
+        final String string3 = (ze == null) ? "Sign" : ze.getName().getString();
+        final Component mr4 = (ze == null) ? new TextComponent("Sign") : ze.getDisplayName();
+        return new CommandSourceStack(CommandSource.NULL, Vec3.atCenterOf(this.worldPosition), Vec2.ZERO, (ServerLevel)this.level, 2, string3, mr4, this.level.getServer(), ze);
     }
     
     public DyeColor getColor() {
         return this.color;
     }
     
-    public boolean setColor(final DyeColor bdj) {
-        if (bdj != this.getColor()) {
-            this.color = bdj;
+    public boolean setColor(final DyeColor bje) {
+        if (bje != this.getColor()) {
+            this.color = bje;
             this.setChanged();
             this.level.sendBlockUpdated(this.getBlockPos(), this.getBlockState(), this.getBlockState(), 3);
             return true;
diff --git a/src/net/minecraft/world/level/block/entity/SkullBlockEntity.java b/src/net/minecraft/world/level/block/entity/SkullBlockEntity.java
index 77671b4..07c0945 100644
--- a/src/net/minecraft/world/level/block/entity/SkullBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/SkullBlockEntity.java
@@ -3,31 +3,34 @@ package net.minecraft.world.level.block.entity;
 import com.google.common.collect.Iterables;
 import com.mojang.authlib.properties.Property;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
-import javax.annotation.Nullable;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import java.util.UUID;
 import net.minecraft.util.StringUtil;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
-import com.mojang.authlib.minecraft.MinecraftSessionService;
-import net.minecraft.server.players.GameProfileCache;
 import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import javax.annotation.Nullable;
+import net.minecraft.server.players.GameProfileCache;
 
 public class SkullBlockEntity extends BlockEntity implements TickableBlockEntity {
+    @Nullable
+    private static GameProfileCache profileCache;
+    @Nullable
+    private static MinecraftSessionService sessionService;
+    @Nullable
     private GameProfile owner;
     private int mouthTickCount;
     private boolean isMovingMouth;
-    private static GameProfileCache profileCache;
-    private static MinecraftSessionService sessionService;
     
     public SkullBlockEntity() {
         super(BlockEntityType.SKULL);
     }
     
-    public static void setProfileCache(final GameProfileCache zk) {
-        SkullBlockEntity.profileCache = zk;
+    public static void setProfileCache(final GameProfileCache abl) {
+        SkullBlockEntity.profileCache = abl;
     }
     
     public static void setSessionService(final MinecraftSessionService minecraftSessionService) {
@@ -35,34 +38,34 @@ public class SkullBlockEntity extends BlockEntity implements TickableBlockEntity
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
         if (this.owner != null) {
-            final CompoundTag jt2 = new CompoundTag();
-            NbtUtils.writeGameProfile(jt2, this.owner);
-            jt.put("Owner", jt2);
+            final CompoundTag le2 = new CompoundTag();
+            NbtUtils.writeGameProfile(le2, this.owner);
+            le.put("SkullOwner", le2);
         }
-        return jt;
+        return le;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        if (jt.contains("Owner", 10)) {
-            this.setOwner(NbtUtils.readGameProfile(jt.getCompound("Owner")));
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        if (le.contains("SkullOwner", 10)) {
+            this.setOwner(NbtUtils.readGameProfile(le.getCompound("SkullOwner")));
         }
-        else if (jt.contains("ExtraType", 8)) {
-            final String string3 = jt.getString("ExtraType");
-            if (!StringUtil.isNullOrEmpty(string3)) {
-                this.setOwner(new GameProfile((UUID)null, string3));
+        else if (le.contains("ExtraType", 8)) {
+            final String string4 = le.getString("ExtraType");
+            if (!StringUtil.isNullOrEmpty(string4)) {
+                this.setOwner(new GameProfile((UUID)null, string4));
             }
         }
     }
     
     @Override
     public void tick() {
-        final Block bph2 = this.getBlockState().getBlock();
-        if (bph2 == Blocks.DRAGON_HEAD || bph2 == Blocks.DRAGON_WALL_HEAD) {
+        final BlockState cfj2 = this.getBlockState();
+        if (cfj2.is(Blocks.DRAGON_HEAD) || cfj2.is(Blocks.DRAGON_WALL_HEAD)) {
             if (this.level.hasNeighborSignal(this.worldPosition)) {
                 this.isMovingMouth = true;
                 ++this.mouthTickCount;
@@ -106,7 +109,8 @@ public class SkullBlockEntity extends BlockEntity implements TickableBlockEntity
         this.setChanged();
     }
     
-    public static GameProfile updateGameprofile(final GameProfile gameProfile) {
+    @Nullable
+    public static GameProfile updateGameprofile(@Nullable final GameProfile gameProfile) {
         if (gameProfile == null || StringUtil.isNullOrEmpty(gameProfile.getName())) {
             return gameProfile;
         }
diff --git a/src/net/minecraft/world/level/block/entity/SmokerBlockEntity.java b/src/net/minecraft/world/level/block/entity/SmokerBlockEntity.java
index c565728..af46bb3 100644
--- a/src/net/minecraft/world/level/block/entity/SmokerBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/SmokerBlockEntity.java
@@ -17,16 +17,16 @@ public class SmokerBlockEntity extends AbstractFurnaceBlockEntity {
     
     @Override
     protected Component getDefaultName() {
-        return new TranslatableComponent("container.smoker", new Object[0]);
+        return new TranslatableComponent("container.smoker");
     }
     
     @Override
-    protected int getBurnDuration(final ItemStack ben) {
-        return super.getBurnDuration(ben) / 2;
+    protected int getBurnDuration(final ItemStack bki) {
+        return super.getBurnDuration(bki) / 2;
     }
     
     @Override
-    protected AbstractContainerMenu createMenu(final int integer, final Inventory ayi) {
-        return new SmokerMenu(integer, ayi, this, this.dataAccess);
+    protected AbstractContainerMenu createMenu(final int integer, final Inventory beb) {
+        return new SmokerMenu(integer, beb, this, this.dataAccess);
     }
 }
diff --git a/src/net/minecraft/world/level/block/entity/SpawnerBlockEntity.java b/src/net/minecraft/world/level/block/entity/SpawnerBlockEntity.java
index d7b07af..cc1821c 100644
--- a/src/net/minecraft/world/level/block/entity/SpawnerBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/SpawnerBlockEntity.java
@@ -32,27 +32,27 @@ public class SpawnerBlockEntity extends BlockEntity implements TickableBlockEnti
             }
             
             @Override
-            public void setNextSpawnData(final SpawnData bkk) {
-                super.setNextSpawnData(bkk);
+            public void setNextSpawnData(final SpawnData bqp) {
+                super.setNextSpawnData(bqp);
                 if (this.getLevel() != null) {
-                    final BlockState byj3 = this.getLevel().getBlockState(this.getPos());
-                    this.getLevel().sendBlockUpdated(SpawnerBlockEntity.this.worldPosition, byj3, byj3, 4);
+                    final BlockState cfj3 = this.getLevel().getBlockState(this.getPos());
+                    this.getLevel().sendBlockUpdated(SpawnerBlockEntity.this.worldPosition, cfj3, cfj3, 4);
                 }
             }
         };
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        this.spawner.load(jt);
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        this.spawner.load(le);
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        this.spawner.save(jt);
-        return jt;
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        this.spawner.save(le);
+        return le;
     }
     
     @Override
@@ -68,9 +68,9 @@ public class SpawnerBlockEntity extends BlockEntity implements TickableBlockEnti
     
     @Override
     public CompoundTag getUpdateTag() {
-        final CompoundTag jt2 = this.save(new CompoundTag());
-        jt2.remove("SpawnPotentials");
-        return jt2;
+        final CompoundTag le2 = this.save(new CompoundTag());
+        le2.remove("SpawnPotentials");
+        return le2;
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/block/entity/StructureBlockEntity.java b/src/net/minecraft/world/level/block/entity/StructureBlockEntity.java
index d19eb55..67f57b8 100644
--- a/src/net/minecraft/world/level/block/entity/StructureBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/StructureBlockEntity.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block.entity;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
 import net.minecraft.world.level.levelgen.structure.templatesystem.BlockRotProcessor;
@@ -28,9 +28,9 @@ import javax.annotation.Nullable;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.StructureBlock;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.util.Mth;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.state.properties.StructureMode;
 import net.minecraft.world.level.block.Rotation;
@@ -69,72 +69,77 @@ public class StructureBlockEntity extends BlockEntity {
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        jt.putString("name", this.getStructureName());
-        jt.putString("author", this.author);
-        jt.putString("metadata", this.metaData);
-        jt.putInt("posX", this.structurePos.getX());
-        jt.putInt("posY", this.structurePos.getY());
-        jt.putInt("posZ", this.structurePos.getZ());
-        jt.putInt("sizeX", this.structureSize.getX());
-        jt.putInt("sizeY", this.structureSize.getY());
-        jt.putInt("sizeZ", this.structureSize.getZ());
-        jt.putString("rotation", this.rotation.toString());
-        jt.putString("mirror", this.mirror.toString());
-        jt.putString("mode", this.mode.toString());
-        jt.putBoolean("ignoreEntities", this.ignoreEntities);
-        jt.putBoolean("powered", this.powered);
-        jt.putBoolean("showair", this.showAir);
-        jt.putBoolean("showboundingbox", this.showBoundingBox);
-        jt.putFloat("integrity", this.integrity);
-        jt.putLong("seed", this.seed);
-        return jt;
+    public double getViewDistance() {
+        return 96.0;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        this.setStructureName(jt.getString("name"));
-        this.author = jt.getString("author");
-        this.metaData = jt.getString("metadata");
-        final int integer3 = Mth.clamp(jt.getInt("posX"), -32, 32);
-        final int integer4 = Mth.clamp(jt.getInt("posY"), -32, 32);
-        final int integer5 = Mth.clamp(jt.getInt("posZ"), -32, 32);
-        this.structurePos = new BlockPos(integer3, integer4, integer5);
-        final int integer6 = Mth.clamp(jt.getInt("sizeX"), 0, 32);
-        final int integer7 = Mth.clamp(jt.getInt("sizeY"), 0, 32);
-        final int integer8 = Mth.clamp(jt.getInt("sizeZ"), 0, 32);
-        this.structureSize = new BlockPos(integer6, integer7, integer8);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        le.putString("name", this.getStructureName());
+        le.putString("author", this.author);
+        le.putString("metadata", this.metaData);
+        le.putInt("posX", this.structurePos.getX());
+        le.putInt("posY", this.structurePos.getY());
+        le.putInt("posZ", this.structurePos.getZ());
+        le.putInt("sizeX", this.structureSize.getX());
+        le.putInt("sizeY", this.structureSize.getY());
+        le.putInt("sizeZ", this.structureSize.getZ());
+        le.putString("rotation", this.rotation.toString());
+        le.putString("mirror", this.mirror.toString());
+        le.putString("mode", this.mode.toString());
+        le.putBoolean("ignoreEntities", this.ignoreEntities);
+        le.putBoolean("powered", this.powered);
+        le.putBoolean("showair", this.showAir);
+        le.putBoolean("showboundingbox", this.showBoundingBox);
+        le.putFloat("integrity", this.integrity);
+        le.putLong("seed", this.seed);
+        return le;
+    }
+    
+    @Override
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        this.setStructureName(le.getString("name"));
+        this.author = le.getString("author");
+        this.metaData = le.getString("metadata");
+        final int integer4 = Mth.clamp(le.getInt("posX"), -48, 48);
+        final int integer5 = Mth.clamp(le.getInt("posY"), -48, 48);
+        final int integer6 = Mth.clamp(le.getInt("posZ"), -48, 48);
+        this.structurePos = new BlockPos(integer4, integer5, integer6);
+        final int integer7 = Mth.clamp(le.getInt("sizeX"), 0, 48);
+        final int integer8 = Mth.clamp(le.getInt("sizeY"), 0, 48);
+        final int integer9 = Mth.clamp(le.getInt("sizeZ"), 0, 48);
+        this.structureSize = new BlockPos(integer7, integer8, integer9);
         try {
-            this.rotation = Rotation.valueOf(jt.getString("rotation"));
+            this.rotation = Rotation.valueOf(le.getString("rotation"));
         }
-        catch (IllegalArgumentException illegalArgumentException9) {
+        catch (IllegalArgumentException illegalArgumentException10) {
             this.rotation = Rotation.NONE;
         }
         try {
-            this.mirror = Mirror.valueOf(jt.getString("mirror"));
+            this.mirror = Mirror.valueOf(le.getString("mirror"));
         }
-        catch (IllegalArgumentException illegalArgumentException9) {
+        catch (IllegalArgumentException illegalArgumentException10) {
             this.mirror = Mirror.NONE;
         }
         try {
-            this.mode = StructureMode.valueOf(jt.getString("mode"));
+            this.mode = StructureMode.valueOf(le.getString("mode"));
         }
-        catch (IllegalArgumentException illegalArgumentException9) {
+        catch (IllegalArgumentException illegalArgumentException10) {
             this.mode = StructureMode.DATA;
         }
-        this.ignoreEntities = jt.getBoolean("ignoreEntities");
-        this.powered = jt.getBoolean("powered");
-        this.showAir = jt.getBoolean("showair");
-        this.showBoundingBox = jt.getBoolean("showboundingbox");
-        if (jt.contains("integrity")) {
-            this.integrity = jt.getFloat("integrity");
+        this.ignoreEntities = le.getBoolean("ignoreEntities");
+        this.powered = le.getBoolean("powered");
+        this.showAir = le.getBoolean("showair");
+        this.showBoundingBox = le.getBoolean("showboundingbox");
+        if (le.contains("integrity")) {
+            this.integrity = le.getFloat("integrity");
         }
         else {
             this.integrity = 1.0f;
         }
-        this.seed = jt.getLong("seed");
+        this.seed = le.getLong("seed");
         this.updateBlockState();
     }
     
@@ -142,10 +147,10 @@ public class StructureBlockEntity extends BlockEntity {
         if (this.level == null) {
             return;
         }
-        final BlockPos fk2 = this.getBlockPos();
-        final BlockState byj3 = this.level.getBlockState(fk2);
-        if (byj3.getBlock() == Blocks.STRUCTURE_BLOCK) {
-            this.level.setBlock(fk2, ((AbstractStateHolder<O, BlockState>)byj3).<StructureMode, StructureMode>setValue(StructureBlock.MODE, this.mode), 2);
+        final BlockPos fu2 = this.getBlockPos();
+        final BlockState cfj3 = this.level.getBlockState(fu2);
+        if (cfj3.is(Blocks.STRUCTURE_BLOCK)) {
+            this.level.setBlock(fu2, ((StateHolder<O, BlockState>)cfj3).<StructureMode, StructureMode>setValue(StructureBlock.MODE, this.mode), 2);
         }
     }
     
@@ -160,12 +165,12 @@ public class StructureBlockEntity extends BlockEntity {
         return this.save(new CompoundTag());
     }
     
-    public boolean usedBy(final Player ayj) {
-        if (!ayj.canUseGameMasterBlocks()) {
+    public boolean usedBy(final Player bec) {
+        if (!bec.canUseGameMasterBlocks()) {
             return false;
         }
-        if (ayj.getCommandSenderWorld().isClientSide) {
-            ayj.openStructureBlock(this);
+        if (bec.getCommandSenderWorld().isClientSide) {
+            bec.openStructureBlock(this);
         }
         return true;
     }
@@ -186,44 +191,44 @@ public class StructureBlockEntity extends BlockEntity {
         this.setStructureName(StringUtil.isNullOrEmpty(string) ? null : ResourceLocation.tryParse(string));
     }
     
-    public void setStructureName(@Nullable final ResourceLocation sm) {
-        this.structureName = sm;
+    public void setStructureName(@Nullable final ResourceLocation uh) {
+        this.structureName = uh;
     }
     
-    public void createdBy(final LivingEntity akz) {
-        this.author = akz.getName().getString();
+    public void createdBy(final LivingEntity aoy) {
+        this.author = aoy.getName().getString();
     }
     
     public BlockPos getStructurePos() {
         return this.structurePos;
     }
     
-    public void setStructurePos(final BlockPos fk) {
-        this.structurePos = fk;
+    public void setStructurePos(final BlockPos fu) {
+        this.structurePos = fu;
     }
     
     public BlockPos getStructureSize() {
         return this.structureSize;
     }
     
-    public void setStructureSize(final BlockPos fk) {
-        this.structureSize = fk;
+    public void setStructureSize(final BlockPos fu) {
+        this.structureSize = fu;
     }
     
     public Mirror getMirror() {
         return this.mirror;
     }
     
-    public void setMirror(final Mirror bsu) {
-        this.mirror = bsu;
+    public void setMirror(final Mirror bzj) {
+        this.mirror = bzj;
     }
     
     public Rotation getRotation() {
         return this.rotation;
     }
     
-    public void setRotation(final Rotation btu) {
-        this.rotation = btu;
+    public void setRotation(final Rotation cap) {
+        this.rotation = cap;
     }
     
     public String getMetaData() {
@@ -238,11 +243,11 @@ public class StructureBlockEntity extends BlockEntity {
         return this.mode;
     }
     
-    public void setMode(final StructureMode bzr) {
-        this.mode = bzr;
-        final BlockState byj3 = this.level.getBlockState(this.getBlockPos());
-        if (byj3.getBlock() == Blocks.STRUCTURE_BLOCK) {
-            this.level.setBlock(this.getBlockPos(), ((AbstractStateHolder<O, BlockState>)byj3).<StructureMode, StructureMode>setValue(StructureBlock.MODE, bzr), 2);
+    public void setMode(final StructureMode cgq) {
+        this.mode = cgq;
+        final BlockState cfj3 = this.level.getBlockState(this.getBlockPos());
+        if (cfj3.is(Blocks.STRUCTURE_BLOCK)) {
+            this.level.setBlock(this.getBlockPos(), ((StateHolder<O, BlockState>)cfj3).<StructureMode, StructureMode>setValue(StructureBlock.MODE, cgq), 2);
         }
     }
     
@@ -295,82 +300,82 @@ public class StructureBlockEntity extends BlockEntity {
         if (this.mode != StructureMode.SAVE) {
             return false;
         }
-        final BlockPos fk2 = this.getBlockPos();
+        final BlockPos fu2 = this.getBlockPos();
         final int integer3 = 80;
-        final BlockPos fk3 = new BlockPos(fk2.getX() - 80, 0, fk2.getZ() - 80);
-        final BlockPos fk4 = new BlockPos(fk2.getX() + 80, 255, fk2.getZ() + 80);
-        final List<StructureBlockEntity> list6 = this.getNearbyCornerBlocks(fk3, fk4);
+        final BlockPos fu3 = new BlockPos(fu2.getX() - 80, 0, fu2.getZ() - 80);
+        final BlockPos fu4 = new BlockPos(fu2.getX() + 80, 255, fu2.getZ() + 80);
+        final List<StructureBlockEntity> list6 = this.getNearbyCornerBlocks(fu3, fu4);
         final List<StructureBlockEntity> list7 = this.filterRelatedCornerBlocks(list6);
         if (list7.size() < 1) {
             return false;
         }
-        final BoundingBox clb8 = this.calculateEnclosingBoundingBox(fk2, list7);
-        if (clb8.x1 - clb8.x0 > 1 && clb8.y1 - clb8.y0 > 1 && clb8.z1 - clb8.z0 > 1) {
-            this.structurePos = new BlockPos(clb8.x0 - fk2.getX() + 1, clb8.y0 - fk2.getY() + 1, clb8.z0 - fk2.getZ() + 1);
-            this.structureSize = new BlockPos(clb8.x1 - clb8.x0 - 1, clb8.y1 - clb8.y0 - 1, clb8.z1 - clb8.z0 - 1);
+        final BoundingBox ctd8 = this.calculateEnclosingBoundingBox(fu2, list7);
+        if (ctd8.x1 - ctd8.x0 > 1 && ctd8.y1 - ctd8.y0 > 1 && ctd8.z1 - ctd8.z0 > 1) {
+            this.structurePos = new BlockPos(ctd8.x0 - fu2.getX() + 1, ctd8.y0 - fu2.getY() + 1, ctd8.z0 - fu2.getZ() + 1);
+            this.structureSize = new BlockPos(ctd8.x1 - ctd8.x0 - 1, ctd8.y1 - ctd8.y0 - 1, ctd8.z1 - ctd8.z0 - 1);
             this.setChanged();
-            final BlockState byj9 = this.level.getBlockState(fk2);
-            this.level.sendBlockUpdated(fk2, byj9, byj9, 3);
+            final BlockState cfj9 = this.level.getBlockState(fu2);
+            this.level.sendBlockUpdated(fu2, cfj9, cfj9, 3);
             return true;
         }
         return false;
     }
     
     private List<StructureBlockEntity> filterRelatedCornerBlocks(final List<StructureBlockEntity> list) {
-        final Predicate<StructureBlockEntity> predicate3 = bxl -> bxl.mode == StructureMode.CORNER && Objects.equals(this.structureName, bxl.structureName);
+        final Predicate<StructureBlockEntity> predicate3 = cel -> cel.mode == StructureMode.CORNER && Objects.equals(this.structureName, cel.structureName);
         return list.stream().filter(predicate3).collect(Collectors.toList());
     }
     
-    private List<StructureBlockEntity> getNearbyCornerBlocks(final BlockPos fk1, final BlockPos fk2) {
+    private List<StructureBlockEntity> getNearbyCornerBlocks(final BlockPos fu1, final BlockPos fu2) {
         final List<StructureBlockEntity> list4 = Lists.newArrayList();
-        for (final BlockPos fk3 : BlockPos.betweenClosed(fk1, fk2)) {
-            final BlockState byj7 = this.level.getBlockState(fk3);
-            if (byj7.getBlock() != Blocks.STRUCTURE_BLOCK) {
+        for (final BlockPos fu3 : BlockPos.betweenClosed(fu1, fu2)) {
+            final BlockState cfj7 = this.level.getBlockState(fu3);
+            if (!cfj7.is(Blocks.STRUCTURE_BLOCK)) {
                 continue;
             }
-            final BlockEntity bwl8 = this.level.getBlockEntity(fk3);
-            if (bwl8 == null || !(bwl8 instanceof StructureBlockEntity)) {
+            final BlockEntity cdl8 = this.level.getBlockEntity(fu3);
+            if (cdl8 == null || !(cdl8 instanceof StructureBlockEntity)) {
                 continue;
             }
-            list4.add((StructureBlockEntity)bwl8);
+            list4.add((StructureBlockEntity)cdl8);
         }
         return list4;
     }
     
-    private BoundingBox calculateEnclosingBoundingBox(final BlockPos fk, final List<StructureBlockEntity> list) {
-        BoundingBox clb4;
+    private BoundingBox calculateEnclosingBoundingBox(final BlockPos fu, final List<StructureBlockEntity> list) {
+        BoundingBox ctd4;
         if (list.size() > 1) {
-            final BlockPos fk2 = list.get(0).getBlockPos();
-            clb4 = new BoundingBox(fk2, fk2);
+            final BlockPos fu2 = list.get(0).getBlockPos();
+            ctd4 = new BoundingBox(fu2, fu2);
         }
         else {
-            clb4 = new BoundingBox(fk, fk);
+            ctd4 = new BoundingBox(fu, fu);
         }
-        for (final StructureBlockEntity bxl6 : list) {
-            final BlockPos fk3 = bxl6.getBlockPos();
-            if (fk3.getX() < clb4.x0) {
-                clb4.x0 = fk3.getX();
+        for (final StructureBlockEntity cel6 : list) {
+            final BlockPos fu3 = cel6.getBlockPos();
+            if (fu3.getX() < ctd4.x0) {
+                ctd4.x0 = fu3.getX();
             }
-            else if (fk3.getX() > clb4.x1) {
-                clb4.x1 = fk3.getX();
+            else if (fu3.getX() > ctd4.x1) {
+                ctd4.x1 = fu3.getX();
             }
-            if (fk3.getY() < clb4.y0) {
-                clb4.y0 = fk3.getY();
+            if (fu3.getY() < ctd4.y0) {
+                ctd4.y0 = fu3.getY();
             }
-            else if (fk3.getY() > clb4.y1) {
-                clb4.y1 = fk3.getY();
+            else if (fu3.getY() > ctd4.y1) {
+                ctd4.y1 = fu3.getY();
             }
-            if (fk3.getZ() < clb4.z0) {
-                clb4.z0 = fk3.getZ();
+            if (fu3.getZ() < ctd4.z0) {
+                ctd4.z0 = fu3.getZ();
             }
             else {
-                if (fk3.getZ() <= clb4.z1) {
+                if (fu3.getZ() <= ctd4.z1) {
                     continue;
                 }
-                clb4.z1 = fk3.getZ();
+                ctd4.z1 = fu3.getZ();
             }
         }
-        return clb4;
+        return ctd4;
     }
     
     public boolean saveStructure() {
@@ -381,23 +386,23 @@ public class StructureBlockEntity extends BlockEntity {
         if (this.mode != StructureMode.SAVE || this.level.isClientSide || this.structureName == null) {
             return false;
         }
-        final BlockPos fk3 = this.getBlockPos().offset(this.structurePos);
-        final ServerLevel xd4 = (ServerLevel)this.level;
-        final StructureManager cmo5 = xd4.getStructureManager();
-        StructureTemplate cms6;
+        final BlockPos fu3 = this.getBlockPos().offset(this.structurePos);
+        final ServerLevel zd4 = (ServerLevel)this.level;
+        final StructureManager cva5 = zd4.getStructureManager();
+        StructureTemplate cve6;
         try {
-            cms6 = cmo5.getOrCreate(this.structureName);
+            cve6 = cva5.getOrCreate(this.structureName);
         }
-        catch (ResourceLocationException r7) {
+        catch (ResourceLocationException t7) {
             return false;
         }
-        cms6.fillFromWorld(this.level, fk3, this.structureSize, !this.ignoreEntities, Blocks.STRUCTURE_VOID);
-        cms6.setAuthor(this.author);
+        cve6.fillFromWorld(this.level, fu3, this.structureSize, !this.ignoreEntities, Blocks.STRUCTURE_VOID);
+        cve6.setAuthor(this.author);
         if (boolean1) {
             try {
-                return cmo5.save(this.structureName);
+                return cva5.save(this.structureName);
             }
-            catch (ResourceLocationException r7) {
+            catch (ResourceLocationException t7) {
                 return false;
             }
         }
@@ -419,38 +424,38 @@ public class StructureBlockEntity extends BlockEntity {
         if (this.mode != StructureMode.LOAD || this.level.isClientSide || this.structureName == null) {
             return false;
         }
-        final ServerLevel xd3 = (ServerLevel)this.level;
-        final StructureManager cmo4 = xd3.getStructureManager();
-        StructureTemplate cms5;
+        final ServerLevel zd3 = (ServerLevel)this.level;
+        final StructureManager cva4 = zd3.getStructureManager();
+        StructureTemplate cve5;
         try {
-            cms5 = cmo4.get(this.structureName);
+            cve5 = cva4.get(this.structureName);
         }
-        catch (ResourceLocationException r6) {
+        catch (ResourceLocationException t6) {
             return false;
         }
-        return cms5 != null && this.loadStructure(boolean1, cms5);
+        return cve5 != null && this.loadStructure(boolean1, cve5);
     }
     
-    public boolean loadStructure(final boolean boolean1, final StructureTemplate cms) {
-        final BlockPos fk4 = this.getBlockPos();
-        if (!StringUtil.isNullOrEmpty(cms.getAuthor())) {
-            this.author = cms.getAuthor();
+    public boolean loadStructure(final boolean boolean1, final StructureTemplate cve) {
+        final BlockPos fu4 = this.getBlockPos();
+        if (!StringUtil.isNullOrEmpty(cve.getAuthor())) {
+            this.author = cve.getAuthor();
         }
-        final BlockPos fk5 = cms.getSize();
-        final boolean boolean2 = this.structureSize.equals(fk5);
+        final BlockPos fu5 = cve.getSize();
+        final boolean boolean2 = this.structureSize.equals(fu5);
         if (!boolean2) {
-            this.structureSize = fk5;
+            this.structureSize = fu5;
             this.setChanged();
-            final BlockState byj7 = this.level.getBlockState(fk4);
-            this.level.sendBlockUpdated(fk4, byj7, byj7, 3);
+            final BlockState cfj7 = this.level.getBlockState(fu4);
+            this.level.sendBlockUpdated(fu4, cfj7, cfj7, 3);
         }
         if (!boolean1 || boolean2) {
-            final StructurePlaceSettings cmp7 = new StructurePlaceSettings().setMirror(this.mirror).setRotation(this.rotation).setIgnoreEntities(this.ignoreEntities).setChunkPos(null);
+            final StructurePlaceSettings cvb7 = new StructurePlaceSettings().setMirror(this.mirror).setRotation(this.rotation).setIgnoreEntities(this.ignoreEntities).setChunkPos(null);
             if (this.integrity < 1.0f) {
-                cmp7.clearProcessors().addProcessor(new BlockRotProcessor(Mth.clamp(this.integrity, 0.0f, 1.0f))).setRandom(createRandom(this.seed));
+                cvb7.clearProcessors().addProcessor(new BlockRotProcessor(Mth.clamp(this.integrity, 0.0f, 1.0f))).setRandom(createRandom(this.seed));
             }
-            final BlockPos fk6 = fk4.offset(this.structurePos);
-            cms.placeInWorldChunk(this.level, fk6, cmp7);
+            final BlockPos fu6 = fu4.offset(this.structurePos);
+            cve.placeInWorldChunk(this.level, fu6, cvb7, createRandom(this.seed));
             return true;
         }
         return false;
@@ -460,21 +465,21 @@ public class StructureBlockEntity extends BlockEntity {
         if (this.structureName == null) {
             return;
         }
-        final ServerLevel xd2 = (ServerLevel)this.level;
-        final StructureManager cmo3 = xd2.getStructureManager();
-        cmo3.remove(this.structureName);
+        final ServerLevel zd2 = (ServerLevel)this.level;
+        final StructureManager cva3 = zd2.getStructureManager();
+        cva3.remove(this.structureName);
     }
     
     public boolean isStructureLoadable() {
         if (this.mode != StructureMode.LOAD || this.level.isClientSide || this.structureName == null) {
             return false;
         }
-        final ServerLevel xd2 = (ServerLevel)this.level;
-        final StructureManager cmo3 = xd2.getStructureManager();
+        final ServerLevel zd2 = (ServerLevel)this.level;
+        final StructureManager cva3 = zd2.getStructureManager();
         try {
-            return cmo3.get(this.structureName) != null;
+            return cva3.get(this.structureName) != null;
         }
-        catch (ResourceLocationException r4) {
+        catch (ResourceLocationException t4) {
             return false;
         }
     }
diff --git a/src/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
index 34a89ae..36aa4a5 100644
--- a/src/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
@@ -6,25 +6,25 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration;
 import java.util.Iterator;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.WorldGenLevel;
 import java.util.Random;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.dimension.end.TheEndDimension;
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.projectile.ThrownEnderpearl;
+import net.minecraft.world.level.Level;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.util.Mth;
 import java.util.List;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.CompoundTag;
@@ -45,31 +45,31 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity implements
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        jt.putLong("Age", this.age);
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        le.putLong("Age", this.age);
         if (this.exitPortal != null) {
-            jt.put("ExitPortal", NbtUtils.writeBlockPos(this.exitPortal));
+            le.put("ExitPortal", NbtUtils.writeBlockPos(this.exitPortal));
         }
         if (this.exactTeleport) {
-            jt.putBoolean("ExactTeleport", this.exactTeleport);
+            le.putBoolean("ExactTeleport", this.exactTeleport);
         }
-        return jt;
+        return le;
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        this.age = jt.getLong("Age");
-        if (jt.contains("ExitPortal", 10)) {
-            this.exitPortal = NbtUtils.readBlockPos(jt.getCompound("ExitPortal"));
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        this.age = le.getLong("Age");
+        if (le.contains("ExitPortal", 10)) {
+            this.exitPortal = NbtUtils.readBlockPos(le.getCompound("ExitPortal"));
         }
-        this.exactTeleport = jt.getBoolean("ExactTeleport");
+        this.exactTeleport = le.getBoolean("ExactTeleport");
     }
     
     @Override
     public double getViewDistance() {
-        return 65536.0;
+        return 256.0;
     }
     
     @Override
@@ -83,7 +83,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity implements
         else if (!this.level.isClientSide) {
             final List<Entity> list4 = this.level.<Entity>getEntitiesOfClass(Entity.class, new AABB(this.getBlockPos()));
             if (!list4.isEmpty()) {
-                this.teleportEntity(list4.get(0).getRootVehicle());
+                this.teleportEntity(list4.get(this.level.random.nextInt(list4.size())));
             }
             if (this.age % 2400L == 0L) {
                 this.triggerCooldown();
@@ -138,120 +138,137 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity implements
         return super.triggerEvent(integer1, integer2);
     }
     
-    public void teleportEntity(final Entity akq) {
+    public void teleportEntity(final Entity aom) {
         if (!(this.level instanceof ServerLevel) || this.isCoolingDown()) {
             return;
         }
         this.teleportCooldown = 100;
-        if (this.exitPortal == null && this.level.dimension instanceof TheEndDimension) {
+        if (this.exitPortal == null && this.level.dimension() == Level.END) {
             this.findExitPortal((ServerLevel)this.level);
         }
         if (this.exitPortal != null) {
-            final BlockPos fk3 = this.exactTeleport ? this.exitPortal : this.findExitPosition();
-            akq.teleportToWithTicket(fk3.getX() + 0.5, fk3.getY() + 0.5, fk3.getZ() + 0.5);
+            final BlockPos fu3 = this.exactTeleport ? this.exitPortal : this.findExitPosition();
+            Entity aom3;
+            if (aom instanceof ThrownEnderpearl) {
+                final Entity aom2 = ((ThrownEnderpearl)aom).getOwner();
+                if (aom2 instanceof ServerPlayer) {
+                    CriteriaTriggers.ENTER_BLOCK.trigger((ServerPlayer)aom2, this.level.getBlockState(this.getBlockPos()));
+                }
+                if (aom2 != null) {
+                    aom3 = aom2;
+                    aom.remove();
+                }
+                else {
+                    aom3 = aom;
+                }
+            }
+            else {
+                aom3 = aom.getRootVehicle();
+            }
+            aom3.teleportToWithTicket(fu3.getX() + 0.5, fu3.getY(), fu3.getZ() + 0.5);
         }
         this.triggerCooldown();
     }
     
     private BlockPos findExitPosition() {
-        final BlockPos fk2 = findTallestBlock(this.level, this.exitPortal, 5, false);
-        TheEndGatewayBlockEntity.LOGGER.debug("Best exit position for portal at {} is {}", this.exitPortal, fk2);
-        return fk2.above();
+        final BlockPos fu2 = findTallestBlock(this.level, this.exitPortal, 5, false);
+        TheEndGatewayBlockEntity.LOGGER.debug("Best exit position for portal at {} is {}", this.exitPortal, fu2);
+        return fu2.above();
     }
     
-    private void findExitPortal(final ServerLevel xd) {
-        final Vec3 cvl3 = new Vec3(this.getBlockPos().getX(), 0.0, this.getBlockPos().getZ()).normalize();
-        Vec3 cvl4 = cvl3.scale(1024.0);
-        for (int integer5 = 16; getChunk(xd, cvl4).getHighestSectionPosition() > 0 && integer5-- > 0; cvl4 = cvl4.add(cvl3.scale(-16.0))) {
-            TheEndGatewayBlockEntity.LOGGER.debug("Skipping backwards past nonempty chunk at {}", cvl4);
+    private void findExitPortal(final ServerLevel zd) {
+        final Vec3 dem3 = new Vec3(this.getBlockPos().getX(), 0.0, this.getBlockPos().getZ()).normalize();
+        Vec3 dem4 = dem3.scale(1024.0);
+        for (int integer5 = 16; getChunk(zd, dem4).getHighestSectionPosition() > 0 && integer5-- > 0; dem4 = dem4.add(dem3.scale(-16.0))) {
+            TheEndGatewayBlockEntity.LOGGER.debug("Skipping backwards past nonempty chunk at {}", dem4);
         }
-        for (int integer5 = 16; getChunk(xd, cvl4).getHighestSectionPosition() == 0 && integer5-- > 0; cvl4 = cvl4.add(cvl3.scale(16.0))) {
-            TheEndGatewayBlockEntity.LOGGER.debug("Skipping forward past empty chunk at {}", cvl4);
+        for (int integer5 = 16; getChunk(zd, dem4).getHighestSectionPosition() == 0 && integer5-- > 0; dem4 = dem4.add(dem3.scale(16.0))) {
+            TheEndGatewayBlockEntity.LOGGER.debug("Skipping forward past empty chunk at {}", dem4);
         }
-        TheEndGatewayBlockEntity.LOGGER.debug("Found chunk at {}", cvl4);
-        final LevelChunk cal6 = getChunk(xd, cvl4);
-        this.exitPortal = findValidSpawnInChunk(cal6);
+        TheEndGatewayBlockEntity.LOGGER.debug("Found chunk at {}", dem4);
+        final LevelChunk chj6 = getChunk(zd, dem4);
+        this.exitPortal = findValidSpawnInChunk(chj6);
         if (this.exitPortal == null) {
-            this.exitPortal = new BlockPos(cvl4.x + 0.5, 75.0, cvl4.z + 0.5);
+            this.exitPortal = new BlockPos(dem4.x + 0.5, 75.0, dem4.z + 0.5);
             TheEndGatewayBlockEntity.LOGGER.debug("Failed to find suitable block, settling on {}", this.exitPortal);
-            Feature.END_ISLAND.configured(FeatureConfiguration.NONE).place(xd, xd.getChunkSource().getGenerator(), new Random(this.exitPortal.asLong()), this.exitPortal);
+            Feature.END_ISLAND.configured(FeatureConfiguration.NONE).place(zd, zd.structureFeatureManager(), zd.getChunkSource().getGenerator(), new Random(this.exitPortal.asLong()), this.exitPortal);
         }
         else {
             TheEndGatewayBlockEntity.LOGGER.debug("Found block at {}", this.exitPortal);
         }
-        this.exitPortal = findTallestBlock(xd, this.exitPortal, 16, true);
+        this.exitPortal = findTallestBlock(zd, this.exitPortal, 16, true);
         TheEndGatewayBlockEntity.LOGGER.debug("Creating portal at {}", this.exitPortal);
-        this.createExitPortal(xd, this.exitPortal = this.exitPortal.above(10));
+        this.createExitPortal(zd, this.exitPortal = this.exitPortal.above(10));
         this.setChanged();
     }
     
-    private static BlockPos findTallestBlock(final BlockGetter bjg, final BlockPos fk, final int integer, final boolean boolean4) {
-        BlockPos fk2 = null;
+    private static BlockPos findTallestBlock(final BlockGetter bpg, final BlockPos fu, final int integer, final boolean boolean4) {
+        BlockPos fu2 = null;
         for (int integer2 = -integer; integer2 <= integer; ++integer2) {
             for (int integer3 = -integer; integer3 <= integer; ++integer3) {
                 if (integer2 != 0 || integer3 != 0 || boolean4) {
-                    for (int integer4 = 255; integer4 > ((fk2 == null) ? 0 : fk2.getY()); --integer4) {
-                        final BlockPos fk3 = new BlockPos(fk.getX() + integer2, integer4, fk.getZ() + integer3);
-                        final BlockState byj10 = bjg.getBlockState(fk3);
-                        if (byj10.isCollisionShapeFullBlock(bjg, fk3) && (boolean4 || byj10.getBlock() != Blocks.BEDROCK)) {
-                            fk2 = fk3;
+                    for (int integer4 = 255; integer4 > ((fu2 == null) ? 0 : fu2.getY()); --integer4) {
+                        final BlockPos fu3 = new BlockPos(fu.getX() + integer2, integer4, fu.getZ() + integer3);
+                        final BlockState cfj10 = bpg.getBlockState(fu3);
+                        if (cfj10.isCollisionShapeFullBlock(bpg, fu3) && (boolean4 || !cfj10.is(Blocks.BEDROCK))) {
+                            fu2 = fu3;
                             break;
                         }
                     }
                 }
             }
         }
-        return (fk2 == null) ? fk : fk2;
+        return (fu2 == null) ? fu : fu2;
     }
     
-    private static LevelChunk getChunk(final Level bjw, final Vec3 cvl) {
-        return bjw.getChunk(Mth.floor(cvl.x / 16.0), Mth.floor(cvl.z / 16.0));
+    private static LevelChunk getChunk(final Level bqb, final Vec3 dem) {
+        return bqb.getChunk(Mth.floor(dem.x / 16.0), Mth.floor(dem.z / 16.0));
     }
     
     @Nullable
-    private static BlockPos findValidSpawnInChunk(final LevelChunk cal) {
-        final ChunkPos bjh2 = cal.getPos();
-        final BlockPos fk3 = new BlockPos(bjh2.getMinBlockX(), 30, bjh2.getMinBlockZ());
-        final int integer4 = cal.getHighestSectionPosition() + 16 - 1;
-        final BlockPos fk4 = new BlockPos(bjh2.getMaxBlockX(), integer4, bjh2.getMaxBlockZ());
-        BlockPos fk5 = null;
+    private static BlockPos findValidSpawnInChunk(final LevelChunk chj) {
+        final ChunkPos bph2 = chj.getPos();
+        final BlockPos fu3 = new BlockPos(bph2.getMinBlockX(), 30, bph2.getMinBlockZ());
+        final int integer4 = chj.getHighestSectionPosition() + 16 - 1;
+        final BlockPos fu4 = new BlockPos(bph2.getMaxBlockX(), integer4, bph2.getMaxBlockZ());
+        BlockPos fu5 = null;
         double double7 = 0.0;
-        for (final BlockPos fk6 : BlockPos.betweenClosed(fk3, fk4)) {
-            final BlockState byj11 = cal.getBlockState(fk6);
-            final BlockPos fk7 = fk6.above();
-            final BlockPos fk8 = fk6.above(2);
-            if (byj11.getBlock() == Blocks.END_STONE && !cal.getBlockState(fk7).isCollisionShapeFullBlock(cal, fk7) && !cal.getBlockState(fk8).isCollisionShapeFullBlock(cal, fk8)) {
-                final double double8 = fk6.distSqr(0.0, 0.0, 0.0, true);
-                if (fk5 != null && double8 >= double7) {
+        for (final BlockPos fu6 : BlockPos.betweenClosed(fu3, fu4)) {
+            final BlockState cfj11 = chj.getBlockState(fu6);
+            final BlockPos fu7 = fu6.above();
+            final BlockPos fu8 = fu6.above(2);
+            if (cfj11.is(Blocks.END_STONE) && !chj.getBlockState(fu7).isCollisionShapeFullBlock(chj, fu7) && !chj.getBlockState(fu8).isCollisionShapeFullBlock(chj, fu8)) {
+                final double double8 = fu6.distSqr(0.0, 0.0, 0.0, true);
+                if (fu5 != null && double8 >= double7) {
                     continue;
                 }
-                fk5 = fk6;
+                fu5 = fu6;
                 double7 = double8;
             }
         }
-        return fk5;
+        return fu5;
     }
     
-    private void createExitPortal(final ServerLevel xd, final BlockPos fk) {
-        Feature.END_GATEWAY.configured(EndGatewayConfiguration.knownExit(this.getBlockPos(), false)).place(xd, xd.getChunkSource().getGenerator(), new Random(), fk);
+    private void createExitPortal(final ServerLevel zd, final BlockPos fu) {
+        Feature.END_GATEWAY.configured(EndGatewayConfiguration.knownExit(this.getBlockPos(), false)).place(zd, zd.structureFeatureManager(), zd.getChunkSource().getGenerator(), new Random(), fu);
     }
     
     @Override
-    public boolean shouldRenderFace(final Direction fp) {
-        return Block.shouldRenderFace(this.getBlockState(), this.level, this.getBlockPos(), fp);
+    public boolean shouldRenderFace(final Direction fz) {
+        return Block.shouldRenderFace(this.getBlockState(), this.level, this.getBlockPos(), fz);
     }
     
     public int getParticleAmount() {
         int integer2 = 0;
-        for (final Direction fp6 : Direction.values()) {
-            integer2 += (this.shouldRenderFace(fp6) ? 1 : 0);
+        for (final Direction fz6 : Direction.values()) {
+            integer2 += (this.shouldRenderFace(fz6) ? 1 : 0);
         }
         return integer2;
     }
     
-    public void setExitPosition(final BlockPos fk, final boolean boolean2) {
+    public void setExitPosition(final BlockPos fu, final boolean boolean2) {
         this.exactTeleport = boolean2;
-        this.exitPortal = fk;
+        this.exitPortal = fu;
     }
     
     static {
diff --git a/src/net/minecraft/world/level/block/entity/TheEndPortalBlockEntity.java b/src/net/minecraft/world/level/block/entity/TheEndPortalBlockEntity.java
index a0ce81c..f0a50f9 100644
--- a/src/net/minecraft/world/level/block/entity/TheEndPortalBlockEntity.java
+++ b/src/net/minecraft/world/level/block/entity/TheEndPortalBlockEntity.java
@@ -3,15 +3,15 @@ package net.minecraft.world.level.block.entity;
 import net.minecraft.core.Direction;
 
 public class TheEndPortalBlockEntity extends BlockEntity {
-    public TheEndPortalBlockEntity(final BlockEntityType<?> bwm) {
-        super(bwm);
+    public TheEndPortalBlockEntity(final BlockEntityType<?> cdm) {
+        super(cdm);
     }
     
     public TheEndPortalBlockEntity() {
         this(BlockEntityType.END_PORTAL);
     }
     
-    public boolean shouldRenderFace(final Direction fp) {
-        return fp == Direction.UP;
+    public boolean shouldRenderFace(final Direction fz) {
+        return fz == Direction.UP;
     }
 }
diff --git a/src/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java b/src/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java
index 26ca249..8fa658a 100644
--- a/src/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java
+++ b/src/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java
@@ -1,56 +1,57 @@
 package net.minecraft.world.level.block.grower;
 
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Blocks;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.BlockGetter;
 import java.util.Random;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.server.level.ServerLevel;
 
 public abstract class AbstractMegaTreeGrower extends AbstractTreeGrower {
     @Override
-    public boolean growTree(final LevelAccessor bjx, final ChunkGenerator<?> caa, final BlockPos fk, final BlockState byj, final Random random) {
+    public boolean growTree(final ServerLevel zd, final ChunkGenerator cha, final BlockPos fu, final BlockState cfj, final Random random) {
         for (int integer7 = 0; integer7 >= -1; --integer7) {
             for (int integer8 = 0; integer8 >= -1; --integer8) {
-                if (isTwoByTwoSapling(byj, bjx, fk, integer7, integer8)) {
-                    return this.placeMega(bjx, caa, fk, byj, random, integer7, integer8);
+                if (isTwoByTwoSapling(cfj, zd, fu, integer7, integer8)) {
+                    return this.placeMega(zd, cha, fu, cfj, random, integer7, integer8);
                 }
             }
         }
-        return super.growTree(bjx, caa, fk, byj, random);
+        return super.growTree(zd, cha, fu, cfj, random);
     }
     
     @Nullable
-    protected abstract ConfiguredFeature<MegaTreeConfiguration, ?> getConfiguredMegaFeature(final Random random);
+    protected abstract ConfiguredFeature<TreeConfiguration, ?> getConfiguredMegaFeature(final Random random);
     
-    public boolean placeMega(final LevelAccessor bjx, final ChunkGenerator<?> caa, final BlockPos fk, final BlockState byj, final Random random, final int integer6, final int integer7) {
-        final ConfiguredFeature<MegaTreeConfiguration, ?> cdc9 = this.getConfiguredMegaFeature(random);
-        if (cdc9 == null) {
+    public boolean placeMega(final ServerLevel zd, final ChunkGenerator cha, final BlockPos fu, final BlockState cfj, final Random random, final int integer6, final int integer7) {
+        final ConfiguredFeature<TreeConfiguration, ?> ckb9 = this.getConfiguredMegaFeature(random);
+        if (ckb9 == null) {
             return false;
         }
-        final BlockState byj2 = Blocks.AIR.defaultBlockState();
-        bjx.setBlock(fk.offset(integer6, 0, integer7), byj2, 4);
-        bjx.setBlock(fk.offset(integer6 + 1, 0, integer7), byj2, 4);
-        bjx.setBlock(fk.offset(integer6, 0, integer7 + 1), byj2, 4);
-        bjx.setBlock(fk.offset(integer6 + 1, 0, integer7 + 1), byj2, 4);
-        if (cdc9.place(bjx, caa, random, fk.offset(integer6, 0, integer7))) {
+        ckb9.config.setFromSapling();
+        final BlockState cfj2 = Blocks.AIR.defaultBlockState();
+        zd.setBlock(fu.offset(integer6, 0, integer7), cfj2, 4);
+        zd.setBlock(fu.offset(integer6 + 1, 0, integer7), cfj2, 4);
+        zd.setBlock(fu.offset(integer6, 0, integer7 + 1), cfj2, 4);
+        zd.setBlock(fu.offset(integer6 + 1, 0, integer7 + 1), cfj2, 4);
+        if (ckb9.place(zd, zd.structureFeatureManager(), cha, random, fu.offset(integer6, 0, integer7))) {
             return true;
         }
-        bjx.setBlock(fk.offset(integer6, 0, integer7), byj, 4);
-        bjx.setBlock(fk.offset(integer6 + 1, 0, integer7), byj, 4);
-        bjx.setBlock(fk.offset(integer6, 0, integer7 + 1), byj, 4);
-        bjx.setBlock(fk.offset(integer6 + 1, 0, integer7 + 1), byj, 4);
+        zd.setBlock(fu.offset(integer6, 0, integer7), cfj, 4);
+        zd.setBlock(fu.offset(integer6 + 1, 0, integer7), cfj, 4);
+        zd.setBlock(fu.offset(integer6, 0, integer7 + 1), cfj, 4);
+        zd.setBlock(fu.offset(integer6 + 1, 0, integer7 + 1), cfj, 4);
         return false;
     }
     
-    public static boolean isTwoByTwoSapling(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final int integer4, final int integer5) {
-        final Block bph6 = byj.getBlock();
-        return bph6 == bjg.getBlockState(fk.offset(integer4, 0, integer5)).getBlock() && bph6 == bjg.getBlockState(fk.offset(integer4 + 1, 0, integer5)).getBlock() && bph6 == bjg.getBlockState(fk.offset(integer4, 0, integer5 + 1)).getBlock() && bph6 == bjg.getBlockState(fk.offset(integer4 + 1, 0, integer5 + 1)).getBlock();
+    public static boolean isTwoByTwoSapling(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final int integer4, final int integer5) {
+        final Block bvr6 = cfj.getBlock();
+        return bvr6 == bpg.getBlockState(fu.offset(integer4, 0, integer5)).getBlock() && bvr6 == bpg.getBlockState(fu.offset(integer4 + 1, 0, integer5)).getBlock() && bvr6 == bpg.getBlockState(fu.offset(integer4, 0, integer5 + 1)).getBlock() && bvr6 == bpg.getBlockState(fu.offset(integer4 + 1, 0, integer5 + 1)).getBlock();
     }
 }
diff --git a/src/net/minecraft/world/level/block/grower/AbstractTreeGrower.java b/src/net/minecraft/world/level/block/grower/AbstractTreeGrower.java
index d44d08e..1ca6219 100644
--- a/src/net/minecraft/world/level/block/grower/AbstractTreeGrower.java
+++ b/src/net/minecraft/world/level/block/grower/AbstractTreeGrower.java
@@ -1,39 +1,42 @@
 package net.minecraft.world.level.block.grower;
 
 import java.util.Iterator;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.server.level.ServerLevel;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import java.util.Random;
 
 public abstract class AbstractTreeGrower {
     @Nullable
-    protected abstract ConfiguredFeature<SmallTreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2);
+    protected abstract ConfiguredFeature<TreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2);
     
-    public boolean growTree(final LevelAccessor bjx, final ChunkGenerator<?> caa, final BlockPos fk, final BlockState byj, final Random random) {
-        final ConfiguredFeature<SmallTreeConfiguration, ?> cdc7 = this.getConfiguredFeature(random, this.hasFlowers(bjx, fk));
-        if (cdc7 == null) {
+    public boolean growTree(final ServerLevel zd, final ChunkGenerator cha, final BlockPos fu, final BlockState cfj, final Random random) {
+        final ConfiguredFeature<TreeConfiguration, ?> ckb7 = this.getConfiguredFeature(random, this.hasFlowers(zd, fu));
+        if (ckb7 == null) {
             return false;
         }
-        bjx.setBlock(fk, Blocks.AIR.defaultBlockState(), 4);
-        cdc7.config.setFromSapling();
-        if (cdc7.place(bjx, caa, random, fk)) {
+        zd.setBlock(fu, Blocks.AIR.defaultBlockState(), 4);
+        ckb7.config.setFromSapling();
+        if (ckb7.place(zd, zd.structureFeatureManager(), cha, random, fu)) {
             return true;
         }
-        bjx.setBlock(fk, byj, 4);
+        zd.setBlock(fu, cfj, 4);
         return false;
     }
     
-    private boolean hasFlowers(final LevelAccessor bjx, final BlockPos fk) {
-        for (final BlockPos fk2 : BlockPos.betweenClosed(fk.below().north(2).west(2), fk.above().south(2).east(2))) {
-            if (bjx.getBlockState(fk2).is(BlockTags.FLOWERS)) {
+    private boolean hasFlowers(final LevelAccessor bqc, final BlockPos fu) {
+        for (final BlockPos fu2 : BlockPos.betweenClosed(fu.below().north(2).west(2), fu.above().south(2).east(2))) {
+            if (bqc.getBlockState(fu2).is(BlockTags.FLOWERS)) {
                 return true;
             }
         }
diff --git a/src/net/minecraft/world/level/block/grower/AcaciaTreeGrower.java b/src/net/minecraft/world/level/block/grower/AcaciaTreeGrower.java
index 832d031..588f756 100644
--- a/src/net/minecraft/world/level/block/grower/AcaciaTreeGrower.java
+++ b/src/net/minecraft/world/level/block/grower/AcaciaTreeGrower.java
@@ -3,14 +3,14 @@ package net.minecraft.world.level.block.grower;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import java.util.Random;
 
 public class AcaciaTreeGrower extends AbstractTreeGrower {
     @Nullable
     @Override
-    protected ConfiguredFeature<SmallTreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
-        return Feature.ACACIA_TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG);
+    protected ConfiguredFeature<TreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
+        return Feature.TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG);
     }
 }
diff --git a/src/net/minecraft/world/level/block/grower/BirchTreeGrower.java b/src/net/minecraft/world/level/block/grower/BirchTreeGrower.java
index 67a0937..a0a4f43 100644
--- a/src/net/minecraft/world/level/block/grower/BirchTreeGrower.java
+++ b/src/net/minecraft/world/level/block/grower/BirchTreeGrower.java
@@ -3,14 +3,14 @@ package net.minecraft.world.level.block.grower;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import java.util.Random;
 
 public class BirchTreeGrower extends AbstractTreeGrower {
     @Nullable
     @Override
-    protected ConfiguredFeature<SmallTreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
-        return Feature.NORMAL_TREE.configured(boolean2 ? BiomeDefaultFeatures.BIRCH_TREE_WITH_BEES_005_CONFIG : BiomeDefaultFeatures.BIRCH_TREE_CONFIG);
+    protected ConfiguredFeature<TreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
+        return Feature.TREE.configured(boolean2 ? BiomeDefaultFeatures.BIRCH_TREE_WITH_BEES_005_CONFIG : BiomeDefaultFeatures.BIRCH_TREE_CONFIG);
     }
 }
diff --git a/src/net/minecraft/world/level/block/grower/DarkOakTreeGrower.java b/src/net/minecraft/world/level/block/grower/DarkOakTreeGrower.java
index 37199f5..36dc0dc 100644
--- a/src/net/minecraft/world/level/block/grower/DarkOakTreeGrower.java
+++ b/src/net/minecraft/world/level/block/grower/DarkOakTreeGrower.java
@@ -2,22 +2,21 @@ package net.minecraft.world.level.block.grower;
 
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import java.util.Random;
 
 public class DarkOakTreeGrower extends AbstractMegaTreeGrower {
     @Nullable
     @Override
-    protected ConfiguredFeature<SmallTreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
+    protected ConfiguredFeature<TreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
         return null;
     }
     
     @Nullable
     @Override
-    protected ConfiguredFeature<MegaTreeConfiguration, ?> getConfiguredMegaFeature(final Random random) {
-        return Feature.DARK_OAK_TREE.configured(BiomeDefaultFeatures.DARK_OAK_TREE_CONFIG);
+    protected ConfiguredFeature<TreeConfiguration, ?> getConfiguredMegaFeature(final Random random) {
+        return Feature.TREE.configured(BiomeDefaultFeatures.DARK_OAK_TREE_CONFIG);
     }
 }
diff --git a/src/net/minecraft/world/level/block/grower/JungleTreeGrower.java b/src/net/minecraft/world/level/block/grower/JungleTreeGrower.java
index a0a2555..87c7c20 100644
--- a/src/net/minecraft/world/level/block/grower/JungleTreeGrower.java
+++ b/src/net/minecraft/world/level/block/grower/JungleTreeGrower.java
@@ -1,26 +1,23 @@
 package net.minecraft.world.level.block.grower;
 
 import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
 import net.minecraft.world.level.levelgen.feature.TreeFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import java.util.Random;
 
 public class JungleTreeGrower extends AbstractMegaTreeGrower {
     @Nullable
     @Override
-    protected ConfiguredFeature<SmallTreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
-        return new TreeFeature(SmallTreeConfiguration::deserialize).configured(BiomeDefaultFeatures.JUNGLE_TREE_NOVINE_CONFIG);
+    protected ConfiguredFeature<TreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
+        return new TreeFeature(TreeConfiguration.CODEC).configured(BiomeDefaultFeatures.JUNGLE_TREE_NOVINE_CONFIG);
     }
     
     @Nullable
     @Override
-    protected ConfiguredFeature<MegaTreeConfiguration, ?> getConfiguredMegaFeature(final Random random) {
-        return Feature.MEGA_JUNGLE_TREE.configured(BiomeDefaultFeatures.MEGA_JUNGLE_TREE_CONFIG);
+    protected ConfiguredFeature<TreeConfiguration, ?> getConfiguredMegaFeature(final Random random) {
+        return Feature.TREE.configured(BiomeDefaultFeatures.MEGA_JUNGLE_TREE_CONFIG);
     }
 }
diff --git a/src/net/minecraft/world/level/block/grower/OakTreeGrower.java b/src/net/minecraft/world/level/block/grower/OakTreeGrower.java
index 2a342d8..ea634d6 100644
--- a/src/net/minecraft/world/level/block/grower/OakTreeGrower.java
+++ b/src/net/minecraft/world/level/block/grower/OakTreeGrower.java
@@ -3,14 +3,14 @@ package net.minecraft.world.level.block.grower;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import java.util.Random;
 
 public class OakTreeGrower extends AbstractTreeGrower {
     @Nullable
     @Override
-    protected ConfiguredFeature<SmallTreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
-        return (random.nextInt(10) == 0) ? Feature.FANCY_TREE.configured(boolean2 ? BiomeDefaultFeatures.FANCY_TREE_WITH_BEES_005_CONFIG : BiomeDefaultFeatures.FANCY_TREE_CONFIG) : Feature.NORMAL_TREE.configured(boolean2 ? BiomeDefaultFeatures.NORMAL_TREE_WITH_BEES_005_CONFIG : BiomeDefaultFeatures.NORMAL_TREE_CONFIG);
+    protected ConfiguredFeature<TreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
+        return (random.nextInt(10) == 0) ? Feature.TREE.configured(boolean2 ? BiomeDefaultFeatures.FANCY_TREE_WITH_BEES_005_CONFIG : BiomeDefaultFeatures.FANCY_TREE_CONFIG) : Feature.TREE.configured(boolean2 ? BiomeDefaultFeatures.NORMAL_TREE_WITH_BEES_005_CONFIG : BiomeDefaultFeatures.NORMAL_TREE_CONFIG);
     }
 }
diff --git a/src/net/minecraft/world/level/block/grower/SpruceTreeGrower.java b/src/net/minecraft/world/level/block/grower/SpruceTreeGrower.java
index b63098e..bb52865 100644
--- a/src/net/minecraft/world/level/block/grower/SpruceTreeGrower.java
+++ b/src/net/minecraft/world/level/block/grower/SpruceTreeGrower.java
@@ -1,23 +1,22 @@
 package net.minecraft.world.level.block.grower;
 
-import net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import java.util.Random;
 
 public class SpruceTreeGrower extends AbstractMegaTreeGrower {
     @Nullable
     @Override
-    protected ConfiguredFeature<SmallTreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
-        return Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG);
+    protected ConfiguredFeature<TreeConfiguration, ?> getConfiguredFeature(final Random random, final boolean boolean2) {
+        return Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG);
     }
     
     @Nullable
     @Override
-    protected ConfiguredFeature<MegaTreeConfiguration, ?> getConfiguredMegaFeature(final Random random) {
-        return Feature.MEGA_SPRUCE_TREE.configured(random.nextBoolean() ? BiomeDefaultFeatures.MEGA_SPRUCE_TREE_CONFIG : BiomeDefaultFeatures.MEGA_PINE_TREE_CONFIG);
+    protected ConfiguredFeature<TreeConfiguration, ?> getConfiguredMegaFeature(final Random random) {
+        return Feature.TREE.configured(random.nextBoolean() ? BiomeDefaultFeatures.MEGA_SPRUCE_TREE_CONFIG : BiomeDefaultFeatures.MEGA_PINE_TREE_CONFIG);
     }
 }
diff --git a/src/net/minecraft/world/level/block/piston/MovingPistonBlock.java b/src/net/minecraft/world/level/block/piston/MovingPistonBlock.java
index 449e520..5a6d787 100644
--- a/src/net/minecraft/world/level/block/piston/MovingPistonBlock.java
+++ b/src/net/minecraft/world/level/block/piston/MovingPistonBlock.java
@@ -1,7 +1,8 @@
 package net.minecraft.world.level.block.piston;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.block.Rotation;
@@ -26,7 +27,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.PistonType;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
@@ -38,103 +39,93 @@ public class MovingPistonBlock extends BaseEntityBlock {
     
     public MovingPistonBlock(final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)MovingPistonBlock.FACING, Direction.NORTH)).<PistonType, PistonType>setValue(MovingPistonBlock.TYPE, PistonType.DEFAULT));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)MovingPistonBlock.FACING, Direction.NORTH)).<PistonType, PistonType>setValue(MovingPistonBlock.TYPE, PistonType.DEFAULT));
     }
     
     @Nullable
     @Override
-    public BlockEntity newBlockEntity(final BlockGetter bjg) {
+    public BlockEntity newBlockEntity(final BlockGetter bpg) {
         return null;
     }
     
-    public static BlockEntity newMovingBlockEntity(final BlockState byj, final Direction fp, final boolean boolean3, final boolean boolean4) {
-        return new PistonMovingBlockEntity(byj, fp, boolean3, boolean4);
+    public static BlockEntity newMovingBlockEntity(final BlockState cfj, final Direction fz, final boolean boolean3, final boolean boolean4) {
+        return new PistonMovingBlockEntity(cfj, fz, boolean3, boolean4);
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        final BlockEntity bwl7 = bjw.getBlockEntity(fk);
-        if (bwl7 instanceof PistonMovingBlockEntity) {
-            ((PistonMovingBlockEntity)bwl7).finalTick();
+        final BlockEntity cdl7 = bqb.getBlockEntity(fu);
+        if (cdl7 instanceof PistonMovingBlockEntity) {
+            ((PistonMovingBlockEntity)cdl7).finalTick();
         }
     }
     
     @Override
-    public void destroy(final LevelAccessor bjx, final BlockPos fk, final BlockState byj) {
-        final BlockPos fk2 = fk.relative(byj.<Direction>getValue((Property<Direction>)MovingPistonBlock.FACING).getOpposite());
-        final BlockState byj2 = bjx.getBlockState(fk2);
-        if (byj2.getBlock() instanceof PistonBaseBlock && byj2.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
-            bjx.removeBlock(fk2, false);
+    public void destroy(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj) {
+        final BlockPos fu2 = fu.relative(cfj.<Direction>getValue((Property<Direction>)MovingPistonBlock.FACING).getOpposite());
+        final BlockState cfj2 = bqc.getBlockState(fu2);
+        if (cfj2.getBlock() instanceof PistonBaseBlock && cfj2.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
+            bqc.removeBlock(fu2, false);
         }
     }
     
     @Override
-    public boolean isRedstoneConductor(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return false;
-    }
-    
-    @Override
-    public boolean isSuffocating(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return false;
-    }
-    
-    @Override
-    public InteractionResult use(final BlockState byj, final Level bjw, final BlockPos fk, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        if (!bjw.isClientSide && bjw.getBlockEntity(fk) == null) {
-            bjw.removeBlock(fk, false);
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        if (!bqb.isClientSide && bqb.getBlockEntity(fu) == null) {
+            bqb.removeBlock(fu, false);
             return InteractionResult.CONSUME;
         }
         return InteractionResult.PASS;
     }
     
     @Override
-    public List<ItemStack> getDrops(final BlockState byj, final LootContext.Builder a) {
-        final PistonMovingBlockEntity byf4 = this.getBlockEntity(a.getLevel(), a.<BlockPos>getParameter(LootContextParams.BLOCK_POS));
-        if (byf4 == null) {
+    public List<ItemStack> getDrops(final BlockState cfj, final LootContext.Builder a) {
+        final PistonMovingBlockEntity cff4 = this.getBlockEntity(a.getLevel(), a.<BlockPos>getParameter(LootContextParams.BLOCK_POS));
+        if (cff4 == null) {
             return Collections.<ItemStack>emptyList();
         }
-        return byf4.getMovedState().getDrops(a);
+        return cff4.getMovedState().getDrops(a);
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
         return Shapes.empty();
     }
     
     @Override
-    public VoxelShape getCollisionShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        final PistonMovingBlockEntity byf6 = this.getBlockEntity(bjg, fk);
-        if (byf6 != null) {
-            return byf6.getCollisionShape(bjg, fk);
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        final PistonMovingBlockEntity cff6 = this.getBlockEntity(bpg, fu);
+        if (cff6 != null) {
+            return cff6.getCollisionShape(bpg, fu);
         }
         return Shapes.empty();
     }
     
     @Nullable
-    private PistonMovingBlockEntity getBlockEntity(final BlockGetter bjg, final BlockPos fk) {
-        final BlockEntity bwl4 = bjg.getBlockEntity(fk);
-        if (bwl4 instanceof PistonMovingBlockEntity) {
-            return (PistonMovingBlockEntity)bwl4;
+    private PistonMovingBlockEntity getBlockEntity(final BlockGetter bpg, final BlockPos fu) {
+        final BlockEntity cdl4 = bpg.getBlockEntity(fu);
+        if (cdl4 instanceof PistonMovingBlockEntity) {
+            return (PistonMovingBlockEntity)cdl4;
         }
         return null;
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
         return ItemStack.EMPTY;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)MovingPistonBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)MovingPistonBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)MovingPistonBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)MovingPistonBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)MovingPistonBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)MovingPistonBlock.FACING)));
     }
     
     @Override
@@ -143,7 +134,7 @@ public class MovingPistonBlock extends BaseEntityBlock {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/net/minecraft/world/level/block/piston/PistonBaseBlock.java
index c785c0e..9e9d587 100644
--- a/src/net/minecraft/world/level/block/piston/PistonBaseBlock.java
+++ b/src/net/minecraft/world/level/block/piston/PistonBaseBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block.piston;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -8,11 +8,11 @@ import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.block.Rotation;
 import java.util.Iterator;
 import java.util.List;
-import net.minecraft.world.level.LevelAccessor;
 import java.util.Map;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import net.minecraft.world.level.material.PushReaction;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.state.properties.PistonType;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.sounds.SoundSource;
@@ -21,6 +21,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.item.BlockPlaceContext;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
@@ -31,7 +32,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.DirectionalBlock;
@@ -48,21 +49,16 @@ public class PistonBaseBlock extends DirectionalBlock {
     
     public PistonBaseBlock(final boolean boolean1, final Properties c) {
         super(c);
-        this.registerDefaultState((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)PistonBaseBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, false));
+        this.registerDefaultState((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)PistonBaseBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, false));
         this.isSticky = boolean1;
     }
     
     @Override
-    public boolean isSuffocating(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return !byj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED);
-    }
-    
-    @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        if (!byj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        if (!cfj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
             return Shapes.block();
         }
-        switch (byj.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING)) {
+        switch (cfj.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING)) {
             case DOWN: {
                 return PistonBaseBlock.DOWN_AABB;
             }
@@ -85,76 +81,71 @@ public class PistonBaseBlock extends DirectionalBlock {
     }
     
     @Override
-    public boolean isRedstoneConductor(final BlockState byj, final BlockGetter bjg, final BlockPos fk) {
-        return false;
-    }
-    
-    @Override
-    public void setPlacedBy(final Level bjw, final BlockPos fk, final BlockState byj, final LivingEntity akz, final ItemStack ben) {
-        if (!bjw.isClientSide) {
-            this.checkIfExtend(bjw, fk, byj);
+    public void setPlacedBy(final Level bqb, final BlockPos fu, final BlockState cfj, final LivingEntity aoy, final ItemStack bki) {
+        if (!bqb.isClientSide) {
+            this.checkIfExtend(bqb, fu, cfj);
         }
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (!bjw.isClientSide) {
-            this.checkIfExtend(bjw, fk3, byj);
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (!bqb.isClientSide) {
+            this.checkIfExtend(bqb, fu3, cfj);
         }
     }
     
     @Override
-    public void onPlace(final BlockState byj1, final Level bjw, final BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj4.getBlock() == byj1.getBlock()) {
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj4.is(cfj1.getBlock())) {
             return;
         }
-        if (!bjw.isClientSide && bjw.getBlockEntity(fk) == null) {
-            this.checkIfExtend(bjw, fk, byj1);
+        if (!bqb.isClientSide && bqb.getBlockEntity(fu) == null) {
+            this.checkIfExtend(bqb, fu, cfj1);
         }
     }
     
     @Override
-    public BlockState getStateForPlacement(final BlockPlaceContext bcq) {
-        return (((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)PistonBaseBlock.FACING, bcq.getNearestLookingDirection().getOpposite())).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, false);
+    public BlockState getStateForPlacement(final BlockPlaceContext bin) {
+        return (((StateHolder<O, BlockState>)this.defaultBlockState()).setValue((Property<Comparable>)PistonBaseBlock.FACING, bin.getNearestLookingDirection().getOpposite())).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, false);
     }
     
-    private void checkIfExtend(final Level bjw, final BlockPos fk, final BlockState byj) {
-        final Direction fp5 = byj.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING);
-        final boolean boolean6 = this.getNeighborSignal(bjw, fk, fp5);
-        if (boolean6 && !byj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
-            if (new PistonStructureResolver(bjw, fk, fp5, true).resolve()) {
-                bjw.blockEvent(fk, this, 0, fp5.get3DDataValue());
+    private void checkIfExtend(final Level bqb, final BlockPos fu, final BlockState cfj) {
+        final Direction fz5 = cfj.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING);
+        final boolean boolean6 = this.getNeighborSignal(bqb, fu, fz5);
+        if (boolean6 && !cfj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
+            if (new PistonStructureResolver(bqb, fu, fz5, true).resolve()) {
+                bqb.blockEvent(fu, this, 0, fz5.get3DDataValue());
             }
         }
-        else if (!boolean6 && byj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
-            final BlockPos fk2 = fk.relative(fp5, 2);
-            final BlockState byj2 = bjw.getBlockState(fk2);
+        else if (!boolean6 && cfj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
+            final BlockPos fu2 = fu.relative(fz5, 2);
+            final BlockState cfj2 = bqb.getBlockState(fu2);
             int integer9 = 1;
-            if (byj2.getBlock() == Blocks.MOVING_PISTON && byj2.<Comparable>getValue((Property<Comparable>)PistonBaseBlock.FACING) == fp5) {
-                final BlockEntity bwl10 = bjw.getBlockEntity(fk2);
-                if (bwl10 instanceof PistonMovingBlockEntity) {
-                    final PistonMovingBlockEntity byf11 = (PistonMovingBlockEntity)bwl10;
-                    if (byf11.isExtending() && (byf11.getProgress(0.0f) < 0.5f || bjw.getGameTime() == byf11.getLastTicked() || ((ServerLevel)bjw).isHandlingTick())) {
+            if (cfj2.is(Blocks.MOVING_PISTON) && cfj2.<Comparable>getValue((Property<Comparable>)PistonBaseBlock.FACING) == fz5) {
+                final BlockEntity cdl10 = bqb.getBlockEntity(fu2);
+                if (cdl10 instanceof PistonMovingBlockEntity) {
+                    final PistonMovingBlockEntity cff11 = (PistonMovingBlockEntity)cdl10;
+                    if (cff11.isExtending() && (cff11.getProgress(0.0f) < 0.5f || bqb.getGameTime() == cff11.getLastTicked() || ((ServerLevel)bqb).isHandlingTick())) {
                         integer9 = 2;
                     }
                 }
             }
-            bjw.blockEvent(fk, this, integer9, fp5.get3DDataValue());
+            bqb.blockEvent(fu, this, integer9, fz5.get3DDataValue());
         }
     }
     
-    private boolean getNeighborSignal(final Level bjw, final BlockPos fk, final Direction fp) {
-        for (final Direction fp2 : Direction.values()) {
-            if (fp2 != fp && bjw.hasSignal(fk.relative(fp2), fp2)) {
+    private boolean getNeighborSignal(final Level bqb, final BlockPos fu, final Direction fz) {
+        for (final Direction fz2 : Direction.values()) {
+            if (fz2 != fz && bqb.hasSignal(fu.relative(fz2), fz2)) {
                 return true;
             }
         }
-        if (bjw.hasSignal(fk, Direction.DOWN)) {
+        if (bqb.hasSignal(fu, Direction.DOWN)) {
             return true;
         }
-        final BlockPos fk2 = fk.above();
-        for (final Direction fp3 : Direction.values()) {
-            if (fp3 != Direction.DOWN && bjw.hasSignal(fk2.relative(fp3), fp3)) {
+        final BlockPos fu2 = fu.above();
+        for (final Direction fz3 : Direction.values()) {
+            if (fz3 != Direction.DOWN && bqb.hasSignal(fu2.relative(fz3), fz3)) {
                 return true;
             }
         }
@@ -162,12 +153,12 @@ public class PistonBaseBlock extends DirectionalBlock {
     }
     
     @Override
-    public boolean triggerEvent(final BlockState byj, final Level bjw, final BlockPos fk, final int integer4, final int integer5) {
-        final Direction fp7 = byj.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING);
-        if (!bjw.isClientSide) {
-            final boolean boolean8 = this.getNeighborSignal(bjw, fk, fp7);
+    public boolean triggerEvent(final BlockState cfj, final Level bqb, final BlockPos fu, final int integer4, final int integer5) {
+        final Direction fz7 = cfj.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING);
+        if (!bqb.isClientSide) {
+            final boolean boolean8 = this.getNeighborSignal(bqb, fu, fz7);
             if (boolean8 && (integer4 == 1 || integer4 == 2)) {
-                bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, true), 2);
+                bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, true), 2);
                 return false;
             }
             if (!boolean8 && integer4 == 0) {
@@ -175,75 +166,76 @@ public class PistonBaseBlock extends DirectionalBlock {
             }
         }
         if (integer4 == 0) {
-            if (!this.moveBlocks(bjw, fk, fp7, true)) {
+            if (!this.moveBlocks(bqb, fu, fz7, true)) {
                 return false;
             }
-            bjw.setBlock(fk, ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, true), 67);
-            bjw.playSound(null, fk, SoundEvents.PISTON_EXTEND, SoundSource.BLOCKS, 0.5f, bjw.random.nextFloat() * 0.25f + 0.6f);
+            bqb.setBlock(fu, ((StateHolder<O, BlockState>)cfj).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, true), 67);
+            bqb.playSound(null, fu, SoundEvents.PISTON_EXTEND, SoundSource.BLOCKS, 0.5f, bqb.random.nextFloat() * 0.25f + 0.6f);
         }
         else if (integer4 == 1 || integer4 == 2) {
-            final BlockEntity bwl8 = bjw.getBlockEntity(fk.relative(fp7));
-            if (bwl8 instanceof PistonMovingBlockEntity) {
-                ((PistonMovingBlockEntity)bwl8).finalTick();
+            final BlockEntity cdl8 = bqb.getBlockEntity(fu.relative(fz7));
+            if (cdl8 instanceof PistonMovingBlockEntity) {
+                ((PistonMovingBlockEntity)cdl8).finalTick();
             }
-            bjw.setBlock(fk, (((AbstractStateHolder<O, BlockState>)Blocks.MOVING_PISTON.defaultBlockState()).setValue((Property<Comparable>)MovingPistonBlock.FACING, fp7)).<PistonType, PistonType>setValue(MovingPistonBlock.TYPE, this.isSticky ? PistonType.STICKY : PistonType.DEFAULT), 3);
-            bjw.setBlockEntity(fk, MovingPistonBlock.newMovingBlockEntity(((AbstractStateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, Direction.from3DDataValue(integer5 & 0x7)), fp7, false, true));
+            final BlockState cfj2 = (((StateHolder<O, BlockState>)Blocks.MOVING_PISTON.defaultBlockState()).setValue((Property<Comparable>)MovingPistonBlock.FACING, fz7)).<PistonType, PistonType>setValue(MovingPistonBlock.TYPE, this.isSticky ? PistonType.STICKY : PistonType.DEFAULT);
+            bqb.setBlock(fu, cfj2, 20);
+            bqb.setBlockEntity(fu, MovingPistonBlock.newMovingBlockEntity(((StateHolder<O, BlockState>)this.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, Direction.from3DDataValue(integer5 & 0x7)), fz7, false, true));
+            bqb.blockUpdated(fu, cfj2.getBlock());
+            cfj2.updateNeighbourShapes(bqb, fu, 2);
             if (this.isSticky) {
-                final BlockPos fk2 = fk.offset(fp7.getStepX() * 2, fp7.getStepY() * 2, fp7.getStepZ() * 2);
-                final BlockState byj2 = bjw.getBlockState(fk2);
-                final Block bph11 = byj2.getBlock();
+                final BlockPos fu2 = fu.offset(fz7.getStepX() * 2, fz7.getStepY() * 2, fz7.getStepZ() * 2);
+                final BlockState cfj3 = bqb.getBlockState(fu2);
                 boolean boolean9 = false;
-                if (bph11 == Blocks.MOVING_PISTON) {
-                    final BlockEntity bwl9 = bjw.getBlockEntity(fk2);
-                    if (bwl9 instanceof PistonMovingBlockEntity) {
-                        final PistonMovingBlockEntity byf14 = (PistonMovingBlockEntity)bwl9;
-                        if (byf14.getDirection() == fp7 && byf14.isExtending()) {
-                            byf14.finalTick();
+                if (cfj3.is(Blocks.MOVING_PISTON)) {
+                    final BlockEntity cdl9 = bqb.getBlockEntity(fu2);
+                    if (cdl9 instanceof PistonMovingBlockEntity) {
+                        final PistonMovingBlockEntity cff14 = (PistonMovingBlockEntity)cdl9;
+                        if (cff14.getDirection() == fz7 && cff14.isExtending()) {
+                            cff14.finalTick();
                             boolean9 = true;
                         }
                     }
                 }
                 if (!boolean9) {
-                    if (integer4 == 1 && !byj2.isAir() && isPushable(byj2, bjw, fk2, fp7.getOpposite(), false, fp7) && (byj2.getPistonPushReaction() == PushReaction.NORMAL || bph11 == Blocks.PISTON || bph11 == Blocks.STICKY_PISTON)) {
-                        this.moveBlocks(bjw, fk, fp7, false);
+                    if (integer4 == 1 && !cfj3.isAir() && isPushable(cfj3, bqb, fu2, fz7.getOpposite(), false, fz7) && (cfj3.getPistonPushReaction() == PushReaction.NORMAL || cfj3.is(Blocks.PISTON) || cfj3.is(Blocks.STICKY_PISTON))) {
+                        this.moveBlocks(bqb, fu, fz7, false);
                     }
                     else {
-                        bjw.removeBlock(fk.relative(fp7), false);
+                        bqb.removeBlock(fu.relative(fz7), false);
                     }
                 }
             }
             else {
-                bjw.removeBlock(fk.relative(fp7), false);
+                bqb.removeBlock(fu.relative(fz7), false);
             }
-            bjw.playSound(null, fk, SoundEvents.PISTON_CONTRACT, SoundSource.BLOCKS, 0.5f, bjw.random.nextFloat() * 0.15f + 0.6f);
+            bqb.playSound(null, fu, SoundEvents.PISTON_CONTRACT, SoundSource.BLOCKS, 0.5f, bqb.random.nextFloat() * 0.15f + 0.6f);
         }
         return true;
     }
     
-    public static boolean isPushable(final BlockState byj, final Level bjw, final BlockPos fk, final Direction fp4, final boolean boolean5, final Direction fp6) {
-        final Block bph7 = byj.getBlock();
-        if (bph7 == Blocks.OBSIDIAN) {
+    public static boolean isPushable(final BlockState cfj, final Level bqb, final BlockPos fu, final Direction fz4, final boolean boolean5, final Direction fz6) {
+        if (cfj.is(Blocks.OBSIDIAN) || cfj.is(Blocks.CRYING_OBSIDIAN) || cfj.is(Blocks.RESPAWN_ANCHOR)) {
             return false;
         }
-        if (!bjw.getWorldBorder().isWithinBounds(fk)) {
+        if (!bqb.getWorldBorder().isWithinBounds(fu)) {
             return false;
         }
-        if (fk.getY() < 0 || (fp4 == Direction.DOWN && fk.getY() == 0)) {
+        if (fu.getY() < 0 || (fz4 == Direction.DOWN && fu.getY() == 0)) {
             return false;
         }
-        if (fk.getY() > bjw.getMaxBuildHeight() - 1 || (fp4 == Direction.UP && fk.getY() == bjw.getMaxBuildHeight() - 1)) {
+        if (fu.getY() > bqb.getMaxBuildHeight() - 1 || (fz4 == Direction.UP && fu.getY() == bqb.getMaxBuildHeight() - 1)) {
             return false;
         }
-        if (bph7 == Blocks.PISTON || bph7 == Blocks.STICKY_PISTON) {
-            if (byj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
+        if (cfj.is(Blocks.PISTON) || cfj.is(Blocks.STICKY_PISTON)) {
+            if (cfj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
                 return false;
             }
         }
         else {
-            if (byj.getDestroySpeed(bjw, fk) == -1.0f) {
+            if (cfj.getDestroySpeed(bqb, fu) == -1.0f) {
                 return false;
             }
-            switch (byj.getPistonPushReaction()) {
+            switch (cfj.getPistonPushReaction()) {
                 case BLOCK: {
                     return false;
                 }
@@ -251,94 +243,95 @@ public class PistonBaseBlock extends DirectionalBlock {
                     return boolean5;
                 }
                 case PUSH_ONLY: {
-                    return fp4 == fp6;
+                    return fz4 == fz6;
                 }
             }
         }
-        return !bph7.isEntityBlock();
+        return !cfj.getBlock().isEntityBlock();
     }
     
-    private boolean moveBlocks(final Level bjw, final BlockPos fk, final Direction fp, final boolean boolean4) {
-        final BlockPos fk2 = fk.relative(fp);
-        if (!boolean4 && bjw.getBlockState(fk2).getBlock() == Blocks.PISTON_HEAD) {
-            bjw.setBlock(fk2, Blocks.AIR.defaultBlockState(), 20);
+    private boolean moveBlocks(final Level bqb, final BlockPos fu, final Direction fz, final boolean boolean4) {
+        final BlockPos fu2 = fu.relative(fz);
+        if (!boolean4 && bqb.getBlockState(fu2).is(Blocks.PISTON_HEAD)) {
+            bqb.setBlock(fu2, Blocks.AIR.defaultBlockState(), 20);
         }
-        final PistonStructureResolver byg7 = new PistonStructureResolver(bjw, fk, fp, boolean4);
-        if (!byg7.resolve()) {
+        final PistonStructureResolver cfg7 = new PistonStructureResolver(bqb, fu, fz, boolean4);
+        if (!cfg7.resolve()) {
             return false;
         }
         final Map<BlockPos, BlockState> map8 = Maps.newHashMap();
-        final List<BlockPos> list9 = byg7.getToPush();
+        final List<BlockPos> list9 = cfg7.getToPush();
         final List<BlockState> list10 = Lists.newArrayList();
         for (int integer11 = 0; integer11 < list9.size(); ++integer11) {
-            final BlockPos fk3 = list9.get(integer11);
-            final BlockState byj13 = bjw.getBlockState(fk3);
-            list10.add(byj13);
-            map8.put(fk3, byj13);
+            final BlockPos fu3 = list9.get(integer11);
+            final BlockState cfj13 = bqb.getBlockState(fu3);
+            list10.add(cfj13);
+            map8.put(fu3, cfj13);
         }
-        final List<BlockPos> list11 = byg7.getToDestroy();
-        int integer12 = list9.size() + list11.size();
-        final BlockState[] arr13 = new BlockState[integer12];
-        final Direction fp2 = boolean4 ? fp : fp.getOpposite();
+        final List<BlockPos> list11 = cfg7.getToDestroy();
+        final BlockState[] arr12 = new BlockState[list9.size() + list11.size()];
+        final Direction fz2 = boolean4 ? fz : fz.getOpposite();
+        int integer12 = 0;
         for (int integer13 = list11.size() - 1; integer13 >= 0; --integer13) {
-            final BlockPos fk4 = list11.get(integer13);
-            final BlockState byj14 = bjw.getBlockState(fk4);
-            final BlockEntity bwl18 = byj14.getBlock().isEntityBlock() ? bjw.getBlockEntity(fk4) : null;
-            Block.dropResources(byj14, bjw, fk4, bwl18);
-            bjw.setBlock(fk4, Blocks.AIR.defaultBlockState(), 18);
-            arr13[--integer12] = byj14;
+            final BlockPos fu4 = list11.get(integer13);
+            final BlockState cfj14 = bqb.getBlockState(fu4);
+            final BlockEntity cdl18 = cfj14.getBlock().isEntityBlock() ? bqb.getBlockEntity(fu4) : null;
+            Block.dropResources(cfj14, bqb, fu4, cdl18);
+            bqb.setBlock(fu4, Blocks.AIR.defaultBlockState(), 18);
+            arr12[integer12++] = cfj14;
         }
         for (int integer13 = list9.size() - 1; integer13 >= 0; --integer13) {
-            BlockPos fk4 = list9.get(integer13);
-            final BlockState byj14 = bjw.getBlockState(fk4);
-            fk4 = fk4.relative(fp2);
-            map8.remove(fk4);
-            bjw.setBlock(fk4, ((AbstractStateHolder<O, BlockState>)Blocks.MOVING_PISTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, fp), 68);
-            bjw.setBlockEntity(fk4, MovingPistonBlock.newMovingBlockEntity(list10.get(integer13), fp, boolean4, false));
-            arr13[--integer12] = byj14;
+            BlockPos fu4 = list9.get(integer13);
+            final BlockState cfj14 = bqb.getBlockState(fu4);
+            fu4 = fu4.relative(fz2);
+            map8.remove(fu4);
+            bqb.setBlock(fu4, ((StateHolder<O, BlockState>)Blocks.MOVING_PISTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, fz), 68);
+            bqb.setBlockEntity(fu4, MovingPistonBlock.newMovingBlockEntity(list10.get(integer13), fz, boolean4, false));
+            arr12[integer12++] = cfj14;
         }
         if (boolean4) {
-            final PistonType bzl15 = this.isSticky ? PistonType.STICKY : PistonType.DEFAULT;
-            final BlockState byj15 = (((AbstractStateHolder<O, BlockState>)Blocks.PISTON_HEAD.defaultBlockState()).setValue((Property<Comparable>)PistonHeadBlock.FACING, fp)).<PistonType, PistonType>setValue(PistonHeadBlock.TYPE, bzl15);
-            final BlockState byj14 = (((AbstractStateHolder<O, BlockState>)Blocks.MOVING_PISTON.defaultBlockState()).setValue((Property<Comparable>)MovingPistonBlock.FACING, fp)).<PistonType, PistonType>setValue(MovingPistonBlock.TYPE, this.isSticky ? PistonType.STICKY : PistonType.DEFAULT);
-            map8.remove(fk2);
-            bjw.setBlock(fk2, byj14, 68);
-            bjw.setBlockEntity(fk2, MovingPistonBlock.newMovingBlockEntity(byj15, fp, true, true));
+            final PistonType cgk15 = this.isSticky ? PistonType.STICKY : PistonType.DEFAULT;
+            final BlockState cfj15 = (((StateHolder<O, BlockState>)Blocks.PISTON_HEAD.defaultBlockState()).setValue((Property<Comparable>)PistonHeadBlock.FACING, fz)).<PistonType, PistonType>setValue(PistonHeadBlock.TYPE, cgk15);
+            final BlockState cfj14 = (((StateHolder<O, BlockState>)Blocks.MOVING_PISTON.defaultBlockState()).setValue((Property<Comparable>)MovingPistonBlock.FACING, fz)).<PistonType, PistonType>setValue(MovingPistonBlock.TYPE, this.isSticky ? PistonType.STICKY : PistonType.DEFAULT);
+            map8.remove(fu2);
+            bqb.setBlock(fu2, cfj14, 68);
+            bqb.setBlockEntity(fu2, MovingPistonBlock.newMovingBlockEntity(cfj15, fz, true, true));
         }
-        final BlockState byj16 = Blocks.AIR.defaultBlockState();
-        for (final BlockPos fk5 : map8.keySet()) {
-            bjw.setBlock(fk5, byj16, 82);
+        final BlockState cfj16 = Blocks.AIR.defaultBlockState();
+        for (final BlockPos fu5 : map8.keySet()) {
+            bqb.setBlock(fu5, cfj16, 82);
         }
         for (final Map.Entry<BlockPos, BlockState> entry17 : map8.entrySet()) {
-            final BlockPos fk6 = entry17.getKey();
-            final BlockState byj17 = entry17.getValue();
-            byj17.updateIndirectNeighbourShapes(bjw, fk6, 2);
-            byj16.updateNeighbourShapes(bjw, fk6, 2);
-            byj16.updateIndirectNeighbourShapes(bjw, fk6, 2);
+            final BlockPos fu6 = entry17.getKey();
+            final BlockState cfj17 = entry17.getValue();
+            cfj17.updateIndirectNeighbourShapes(bqb, fu6, 2);
+            cfj16.updateNeighbourShapes(bqb, fu6, 2);
+            cfj16.updateIndirectNeighbourShapes(bqb, fu6, 2);
         }
+        integer12 = 0;
         for (int integer14 = list11.size() - 1; integer14 >= 0; --integer14) {
-            final BlockState byj14 = arr13[integer12++];
-            final BlockPos fk6 = list11.get(integer14);
-            byj14.updateIndirectNeighbourShapes(bjw, fk6, 2);
-            bjw.updateNeighborsAt(fk6, byj14.getBlock());
+            final BlockState cfj14 = arr12[integer12++];
+            final BlockPos fu6 = list11.get(integer14);
+            cfj14.updateIndirectNeighbourShapes(bqb, fu6, 2);
+            bqb.updateNeighborsAt(fu6, cfj14.getBlock());
         }
         for (int integer14 = list9.size() - 1; integer14 >= 0; --integer14) {
-            bjw.updateNeighborsAt(list9.get(integer14), arr13[integer12++].getBlock());
+            bqb.updateNeighborsAt(list9.get(integer14), arr12[integer12++].getBlock());
         }
         if (boolean4) {
-            bjw.updateNeighborsAt(fk2, Blocks.PISTON_HEAD);
+            bqb.updateNeighborsAt(fu2, Blocks.PISTON_HEAD);
         }
         return true;
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)PistonBaseBlock.FACING)));
     }
     
     @Override
@@ -347,12 +340,12 @@ public class PistonBaseBlock extends DirectionalBlock {
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
-        return byj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED);
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
+        return cfj.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED);
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/piston/PistonHeadBlock.java b/src/net/minecraft/world/level/block/piston/PistonHeadBlock.java
index e7e731c..97c6086 100644
--- a/src/net/minecraft/world/level/block/piston/PistonHeadBlock.java
+++ b/src/net/minecraft/world/level/block/piston/PistonHeadBlock.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block.piston;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -10,9 +10,10 @@ import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.core.BlockPos;
@@ -20,7 +21,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.PistonType;
@@ -51,11 +52,11 @@ public class PistonHeadBlock extends DirectionalBlock {
     
     public PistonHeadBlock(final Properties c) {
         super(c);
-        this.registerDefaultState(((((AbstractStateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)PistonHeadBlock.FACING, Direction.NORTH)).setValue(PistonHeadBlock.TYPE, PistonType.DEFAULT)).<Comparable, Boolean>setValue((Property<Comparable>)PistonHeadBlock.SHORT, false));
+        this.registerDefaultState(((((StateHolder<O, BlockState>)this.stateDefinition.any()).setValue((Property<Comparable>)PistonHeadBlock.FACING, Direction.NORTH)).setValue(PistonHeadBlock.TYPE, PistonType.DEFAULT)).<Comparable, Boolean>setValue((Property<Comparable>)PistonHeadBlock.SHORT, false));
     }
     
-    private VoxelShape getBaseShape(final BlockState byj) {
-        switch (byj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING)) {
+    private VoxelShape getBaseShape(final BlockState cfj) {
+        switch (cfj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING)) {
             default: {
                 return PistonHeadBlock.DOWN_AABB;
             }
@@ -78,18 +79,18 @@ public class PistonHeadBlock extends DirectionalBlock {
     }
     
     @Override
-    public boolean useShapeForLightOcclusion(final BlockState byj) {
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
         return true;
     }
     
     @Override
-    public VoxelShape getShape(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return Shapes.or(this.getBaseShape(byj), this.getArmShape(byj));
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return Shapes.or(this.getBaseShape(cfj), this.getArmShape(cfj));
     }
     
-    private VoxelShape getArmShape(final BlockState byj) {
-        final boolean boolean3 = byj.<Boolean>getValue((Property<Boolean>)PistonHeadBlock.SHORT);
-        switch (byj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING)) {
+    private VoxelShape getArmShape(final BlockState cfj) {
+        final boolean boolean3 = cfj.<Boolean>getValue((Property<Boolean>)PistonHeadBlock.SHORT);
+        switch (cfj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING)) {
             default: {
                 return boolean3 ? PistonHeadBlock.SHORT_DOWN_ARM_AABB : PistonHeadBlock.DOWN_ARM_AABB;
             }
@@ -111,68 +112,69 @@ public class PistonHeadBlock extends DirectionalBlock {
         }
     }
     
+    private boolean isFittingBase(final BlockState cfj1, final BlockState cfj2) {
+        final Block bvr4 = (cfj1.<PistonType>getValue(PistonHeadBlock.TYPE) == PistonType.DEFAULT) ? Blocks.PISTON : Blocks.STICKY_PISTON;
+        return cfj2.is(bvr4) && cfj2.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED) && cfj2.<Comparable>getValue((Property<Comparable>)PistonHeadBlock.FACING) == cfj1.<Comparable>getValue((Property<Comparable>)PistonHeadBlock.FACING);
+    }
+    
     @Override
-    public void playerWillDestroy(final Level bjw, final BlockPos fk, final BlockState byj, final Player ayj) {
-        if (!bjw.isClientSide && ayj.abilities.instabuild) {
-            final BlockPos fk2 = fk.relative(byj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING).getOpposite());
-            final Block bph7 = bjw.getBlockState(fk2).getBlock();
-            if (bph7 == Blocks.PISTON || bph7 == Blocks.STICKY_PISTON) {
-                bjw.removeBlock(fk2, false);
+    public void playerWillDestroy(final Level bqb, final BlockPos fu, final BlockState cfj, final Player bec) {
+        if (!bqb.isClientSide && bec.abilities.instabuild) {
+            final BlockPos fu2 = fu.relative(cfj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING).getOpposite());
+            if (this.isFittingBase(cfj, bqb.getBlockState(fu2))) {
+                bqb.destroyBlock(fu2, false);
             }
         }
-        super.playerWillDestroy(bjw, fk, byj, ayj);
+        super.playerWillDestroy(bqb, fu, cfj, bec);
     }
     
     @Override
-    public void onRemove(final BlockState byj1, final Level bjw, BlockPos fk, final BlockState byj4, final boolean boolean5) {
-        if (byj1.getBlock() == byj4.getBlock()) {
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (cfj1.is(cfj4.getBlock())) {
             return;
         }
-        super.onRemove(byj1, bjw, fk, byj4, boolean5);
-        final Direction fp7 = byj1.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING).getOpposite();
-        fk = fk.relative(fp7);
-        final BlockState byj5 = bjw.getBlockState(fk);
-        if ((byj5.getBlock() == Blocks.PISTON || byj5.getBlock() == Blocks.STICKY_PISTON) && byj5.<Boolean>getValue((Property<Boolean>)PistonBaseBlock.EXTENDED)) {
-            Block.dropResources(byj5, bjw, fk);
-            bjw.removeBlock(fk, false);
+        super.onRemove(cfj1, bqb, fu, cfj4, boolean5);
+        final BlockPos fu2 = fu.relative(cfj1.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING).getOpposite());
+        if (this.isFittingBase(cfj1, bqb.getBlockState(fu2))) {
+            bqb.destroyBlock(fu2, true);
         }
     }
     
     @Override
-    public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-        if (fp.getOpposite() == byj1.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING) && !byj1.canSurvive(bjx, fk5)) {
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        if (fz.getOpposite() == cfj1.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING) && !cfj1.canSurvive(bqc, fu5)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return super.updateShape(byj1, fp, byj3, bjx, fk5, fk6);
+        return super.updateShape(cfj1, fz, cfj3, bqc, fu5, fu6);
     }
     
     @Override
-    public boolean canSurvive(final BlockState byj, final LevelReader bjz, final BlockPos fk) {
-        final Block bph5 = bjz.getBlockState(fk.relative(byj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING).getOpposite())).getBlock();
-        return bph5 == Blocks.PISTON || bph5 == Blocks.STICKY_PISTON || bph5 == Blocks.MOVING_PISTON;
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        final BlockState cfj2 = bqd.getBlockState(fu.relative(cfj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING).getOpposite()));
+        return this.isFittingBase(cfj, cfj2) || (cfj2.is(Blocks.MOVING_PISTON) && cfj2.<Comparable>getValue((Property<Comparable>)PistonHeadBlock.FACING) == cfj.<Comparable>getValue((Property<Comparable>)PistonHeadBlock.FACING));
     }
     
     @Override
-    public void neighborChanged(final BlockState byj, final Level bjw, final BlockPos fk3, final Block bph, final BlockPos fk5, final boolean boolean6) {
-        if (byj.canSurvive(bjw, fk3)) {
-            final BlockPos fk6 = fk3.relative(byj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING).getOpposite());
-            bjw.getBlockState(fk6).neighborChanged(bjw, fk6, bph, fk5, false);
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        if (cfj.canSurvive(bqb, fu3)) {
+            final BlockPos fu6 = fu3.relative(cfj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING).getOpposite());
+            bqb.getBlockState(fu6).neighborChanged(bqb, fu6, bvr, fu5, false);
         }
     }
     
     @Override
-    public ItemStack getCloneItemStack(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
-        return new ItemStack((byj.<PistonType>getValue(PistonHeadBlock.TYPE) == PistonType.STICKY) ? Blocks.STICKY_PISTON : Blocks.PISTON);
+    public ItemStack getCloneItemStack(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        return new ItemStack((cfj.<PistonType>getValue(PistonHeadBlock.TYPE) == PistonType.STICKY) ? Blocks.STICKY_PISTON : Blocks.PISTON);
     }
     
     @Override
-    public BlockState rotate(final BlockState byj, final Rotation btu) {
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)PistonHeadBlock.FACING, btu.rotate(byj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING)));
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)PistonHeadBlock.FACING, cap.rotate(cfj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING)));
     }
     
     @Override
-    public BlockState mirror(final BlockState byj, final Mirror bsu) {
-        return byj.rotate(bsu.getRotation(byj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING)));
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj.rotate(bzj.getRotation(cfj.<Direction>getValue((Property<Direction>)PistonHeadBlock.FACING)));
     }
     
     @Override
@@ -181,7 +183,7 @@ public class PistonHeadBlock extends DirectionalBlock {
     }
     
     @Override
-    public boolean isPathfindable(final BlockState byj, final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
         return false;
     }
     
diff --git a/src/net/minecraft/world/level/block/piston/PistonMath.java b/src/net/minecraft/world/level/block/piston/PistonMath.java
index 6bf2e89..3c068b5 100644
--- a/src/net/minecraft/world/level/block/piston/PistonMath.java
+++ b/src/net/minecraft/world/level/block/piston/PistonMath.java
@@ -4,28 +4,28 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.phys.AABB;
 
 public class PistonMath {
-    public static AABB getMovementArea(final AABB cvf, final Direction fp, final double double3) {
-        final double double4 = double3 * fp.getAxisDirection().getStep();
+    public static AABB getMovementArea(final AABB deg, final Direction fz, final double double3) {
+        final double double4 = double3 * fz.getAxisDirection().getStep();
         final double double5 = Math.min(double4, 0.0);
         final double double6 = Math.max(double4, 0.0);
-        switch (fp) {
+        switch (fz) {
             case WEST: {
-                return new AABB(cvf.minX + double5, cvf.minY, cvf.minZ, cvf.minX + double6, cvf.maxY, cvf.maxZ);
+                return new AABB(deg.minX + double5, deg.minY, deg.minZ, deg.minX + double6, deg.maxY, deg.maxZ);
             }
             case EAST: {
-                return new AABB(cvf.maxX + double5, cvf.minY, cvf.minZ, cvf.maxX + double6, cvf.maxY, cvf.maxZ);
+                return new AABB(deg.maxX + double5, deg.minY, deg.minZ, deg.maxX + double6, deg.maxY, deg.maxZ);
             }
             case DOWN: {
-                return new AABB(cvf.minX, cvf.minY + double5, cvf.minZ, cvf.maxX, cvf.minY + double6, cvf.maxZ);
+                return new AABB(deg.minX, deg.minY + double5, deg.minZ, deg.maxX, deg.minY + double6, deg.maxZ);
             }
             default: {
-                return new AABB(cvf.minX, cvf.maxY + double5, cvf.minZ, cvf.maxX, cvf.maxY + double6, cvf.maxZ);
+                return new AABB(deg.minX, deg.maxY + double5, deg.minZ, deg.maxX, deg.maxY + double6, deg.maxZ);
             }
             case NORTH: {
-                return new AABB(cvf.minX, cvf.minY, cvf.minZ + double5, cvf.maxX, cvf.maxY, cvf.minZ + double6);
+                return new AABB(deg.minX, deg.minY, deg.minZ + double5, deg.maxX, deg.maxY, deg.minZ + double6);
             }
             case SOUTH: {
-                return new AABB(cvf.minX, cvf.minY, cvf.maxZ + double5, cvf.maxX, cvf.maxY, cvf.maxZ + double6);
+                return new AABB(deg.minX, deg.minY, deg.maxZ + double5, deg.maxX, deg.maxY, deg.maxZ + double6);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
index 80bd191..7a88d17 100644
--- a/src/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+++ b/src/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.block.piston;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.NbtUtils;
@@ -14,11 +14,14 @@ import java.util.Iterator;
 import java.util.List;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.phys.AABB;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.material.PushReaction;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.properties.PistonType;
+import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.util.Mth;
 import net.minecraft.nbt.CompoundTag;
@@ -42,10 +45,10 @@ public class PistonMovingBlockEntity extends BlockEntity implements TickableBloc
         super(BlockEntityType.PISTON);
     }
     
-    public PistonMovingBlockEntity(final BlockState byj, final Direction fp, final boolean boolean3, final boolean boolean4) {
+    public PistonMovingBlockEntity(final BlockState cfj, final Direction fz, final boolean boolean3, final boolean boolean4) {
         this();
-        this.movedState = byj;
-        this.direction = fp;
+        this.movedState = cfj;
+        this.direction = fz;
         this.extending = boolean3;
         this.isSourcePiston = boolean4;
     }
@@ -92,58 +95,61 @@ public class PistonMovingBlockEntity extends BlockEntity implements TickableBloc
     
     private BlockState getCollisionRelatedBlockState() {
         if (!this.isExtending() && this.isSourcePiston() && this.movedState.getBlock() instanceof PistonBaseBlock) {
-            return (((AbstractStateHolder<O, BlockState>)Blocks.PISTON_HEAD.defaultBlockState()).setValue(PistonHeadBlock.TYPE, (this.movedState.getBlock() == Blocks.STICKY_PISTON) ? PistonType.STICKY : PistonType.DEFAULT)).<Comparable, Comparable>setValue((Property<Comparable>)PistonHeadBlock.FACING, (Comparable)this.movedState.<V>getValue((Property<V>)PistonBaseBlock.FACING));
+            return ((((StateHolder<O, BlockState>)Blocks.PISTON_HEAD.defaultBlockState()).setValue((Property<Comparable>)PistonHeadBlock.SHORT, this.progress > 0.25f)).setValue(PistonHeadBlock.TYPE, this.movedState.is(Blocks.STICKY_PISTON) ? PistonType.STICKY : PistonType.DEFAULT)).<Comparable, Comparable>setValue((Property<Comparable>)PistonHeadBlock.FACING, (Comparable)this.movedState.<V>getValue((Property<V>)PistonBaseBlock.FACING));
         }
         return this.movedState;
     }
     
     private void moveCollidedEntities(final float float1) {
-        final Direction fp3 = this.getMovementDirection();
+        final Direction fz3 = this.getMovementDirection();
         final double double4 = float1 - this.progress;
-        final VoxelShape cwf6 = this.getCollisionRelatedBlockState().getCollisionShape(this.level, this.getBlockPos());
-        if (cwf6.isEmpty()) {
+        final VoxelShape dfg6 = this.getCollisionRelatedBlockState().getCollisionShape(this.level, this.getBlockPos());
+        if (dfg6.isEmpty()) {
             return;
         }
-        final List<AABB> list7 = cwf6.toAabbs();
-        final AABB cvf8 = this.moveByPositionAndProgress(this.getMinMaxPiecesAABB(list7));
-        final List<Entity> list8 = this.level.getEntities(null, PistonMath.getMovementArea(cvf8, fp3, double4).minmax(cvf8));
+        final AABB deg7 = this.moveByPositionAndProgress(dfg6.bounds());
+        final List<Entity> list8 = this.level.getEntities(null, PistonMath.getMovementArea(deg7, fz3, double4).minmax(deg7));
         if (list8.isEmpty()) {
             return;
         }
-        final boolean boolean10 = this.movedState.getBlock() == Blocks.SLIME_BLOCK;
-        for (final Entity akq12 : list8) {
-            if (akq12.getPistonPushReaction() == PushReaction.IGNORE) {
+        final List<AABB> list9 = dfg6.toAabbs();
+        final boolean boolean10 = this.movedState.is(Blocks.SLIME_BLOCK);
+        for (final Entity aom12 : list8) {
+            if (aom12.getPistonPushReaction() == PushReaction.IGNORE) {
                 continue;
             }
             if (boolean10) {
-                final Vec3 cvl13 = akq12.getDeltaMovement();
-                double double5 = cvl13.x;
-                double double6 = cvl13.y;
-                double double7 = cvl13.z;
-                switch (fp3.getAxis()) {
+                final Vec3 dem13 = aom12.getDeltaMovement();
+                double double5 = dem13.x;
+                double double6 = dem13.y;
+                double double7 = dem13.z;
+                switch (fz3.getAxis()) {
                     case X: {
-                        double5 = fp3.getStepX();
+                        double5 = fz3.getStepX();
                         break;
                     }
                     case Y: {
-                        double6 = fp3.getStepY();
+                        double6 = fz3.getStepY();
                         break;
                     }
                     case Z: {
-                        double7 = fp3.getStepZ();
+                        double7 = fz3.getStepZ();
                         break;
                     }
                 }
-                akq12.setDeltaMovement(double5, double6, double7);
+                aom12.setDeltaMovement(double5, double6, double7);
+                if (aom12 instanceof ServerPlayer) {
+                    ((ServerPlayer)aom12).connection.send(new ClientboundSetEntityMotionPacket(aom12));
+                }
             }
             double double8 = 0.0;
-            for (final AABB cvf9 : list7) {
-                final AABB cvf10 = PistonMath.getMovementArea(this.moveByPositionAndProgress(cvf9), fp3, double4);
-                final AABB cvf11 = akq12.getBoundingBox();
-                if (!cvf10.intersects(cvf11)) {
+            for (final AABB deg8 : list9) {
+                final AABB deg9 = PistonMath.getMovementArea(this.moveByPositionAndProgress(deg8), fz3, double4);
+                final AABB deg10 = aom12.getBoundingBox();
+                if (!deg9.intersects(deg10)) {
                     continue;
                 }
-                double8 = Math.max(double8, getMovement(cvf10, fp3, cvf11));
+                double8 = Math.max(double8, getMovement(deg9, fz3, deg10));
                 if (double8 >= double4) {
                     break;
                 }
@@ -152,17 +158,17 @@ public class PistonMovingBlockEntity extends BlockEntity implements TickableBloc
                 continue;
             }
             double8 = Math.min(double8, double4) + 0.01;
-            moveEntityByPiston(fp3, akq12, double8, fp3);
+            moveEntityByPiston(fz3, aom12, double8, fz3);
             if (this.extending || !this.isSourcePiston) {
                 continue;
             }
-            this.fixEntityWithinPistonBase(akq12, fp3, double4);
+            this.fixEntityWithinPistonBase(aom12, fz3, double4);
         }
     }
     
-    private static void moveEntityByPiston(final Direction fp1, final Entity akq, final double double3, final Direction fp4) {
-        PistonMovingBlockEntity.NOCLIP.set(fp1);
-        akq.move(MoverType.PISTON, new Vec3(double3 * fp4.getStepX(), double3 * fp4.getStepY(), double3 * fp4.getStepZ()));
+    private static void moveEntityByPiston(final Direction fz1, final Entity aom, final double double3, final Direction fz4) {
+        PistonMovingBlockEntity.NOCLIP.set(fz1);
+        aom.move(MoverType.PISTON, new Vec3(double3 * fz4.getStepX(), double3 * fz4.getStepY(), double3 * fz4.getStepZ()));
         PistonMovingBlockEntity.NOCLIP.set(null);
     }
     
@@ -170,87 +176,69 @@ public class PistonMovingBlockEntity extends BlockEntity implements TickableBloc
         if (!this.isStickyForEntities()) {
             return;
         }
-        final Direction fp3 = this.getMovementDirection();
-        if (!fp3.getAxis().isHorizontal()) {
+        final Direction fz3 = this.getMovementDirection();
+        if (!fz3.getAxis().isHorizontal()) {
             return;
         }
         final double double4 = this.movedState.getCollisionShape(this.level, this.worldPosition).max(Direction.Axis.Y);
-        final AABB cvf6 = this.moveByPositionAndProgress(new AABB(0.0, double4, 0.0, 1.0, 1.5000000999999998, 1.0));
+        final AABB deg6 = this.moveByPositionAndProgress(new AABB(0.0, double4, 0.0, 1.0, 1.5000000999999998, 1.0));
         final double double5 = float1 - this.progress;
-        final List<Entity> list9 = this.level.getEntities(null, cvf6, akq -> matchesStickyCritera(cvf6, akq));
-        for (final Entity akq2 : list9) {
-            moveEntityByPiston(fp3, akq2, double5, fp3);
+        final List<Entity> list9 = this.level.getEntities(null, deg6, aom -> matchesStickyCritera(deg6, aom));
+        for (final Entity aom2 : list9) {
+            moveEntityByPiston(fz3, aom2, double5, fz3);
         }
     }
     
-    private static boolean matchesStickyCritera(final AABB cvf, final Entity akq) {
-        return akq.getPistonPushReaction() == PushReaction.NORMAL && akq.onGround && akq.getX() >= cvf.minX && akq.getX() <= cvf.maxX && akq.getZ() >= cvf.minZ && akq.getZ() <= cvf.maxZ;
+    private static boolean matchesStickyCritera(final AABB deg, final Entity aom) {
+        return aom.getPistonPushReaction() == PushReaction.NORMAL && aom.isOnGround() && aom.getX() >= deg.minX && aom.getX() <= deg.maxX && aom.getZ() >= deg.minZ && aom.getZ() <= deg.maxZ;
     }
     
     private boolean isStickyForEntities() {
-        return this.movedState.getBlock() == Blocks.HONEY_BLOCK;
+        return this.movedState.is(Blocks.HONEY_BLOCK);
     }
     
     public Direction getMovementDirection() {
         return this.extending ? this.direction : this.direction.getOpposite();
     }
     
-    private AABB getMinMaxPiecesAABB(final List<AABB> list) {
-        double double3 = 0.0;
-        double double4 = 0.0;
-        double double5 = 0.0;
-        double double6 = 1.0;
-        double double7 = 1.0;
-        double double8 = 1.0;
-        for (final AABB cvf16 : list) {
-            double3 = Math.min(cvf16.minX, double3);
-            double4 = Math.min(cvf16.minY, double4);
-            double5 = Math.min(cvf16.minZ, double5);
-            double6 = Math.max(cvf16.maxX, double6);
-            double7 = Math.max(cvf16.maxY, double7);
-            double8 = Math.max(cvf16.maxZ, double8);
-        }
-        return new AABB(double3, double4, double5, double6, double7, double8);
-    }
-    
-    private static double getMovement(final AABB cvf1, final Direction fp, final AABB cvf3) {
-        switch (fp) {
+    private static double getMovement(final AABB deg1, final Direction fz, final AABB deg3) {
+        switch (fz) {
             case EAST: {
-                return cvf1.maxX - cvf3.minX;
+                return deg1.maxX - deg3.minX;
             }
             case WEST: {
-                return cvf3.maxX - cvf1.minX;
+                return deg3.maxX - deg1.minX;
             }
             default: {
-                return cvf1.maxY - cvf3.minY;
+                return deg1.maxY - deg3.minY;
             }
             case DOWN: {
-                return cvf3.maxY - cvf1.minY;
+                return deg3.maxY - deg1.minY;
             }
             case SOUTH: {
-                return cvf1.maxZ - cvf3.minZ;
+                return deg1.maxZ - deg3.minZ;
             }
             case NORTH: {
-                return cvf3.maxZ - cvf1.minZ;
+                return deg3.maxZ - deg1.minZ;
             }
         }
     }
     
-    private AABB moveByPositionAndProgress(final AABB cvf) {
+    private AABB moveByPositionAndProgress(final AABB deg) {
         final double double3 = this.getExtendedProgress(this.progress);
-        return cvf.move(this.worldPosition.getX() + double3 * this.direction.getStepX(), this.worldPosition.getY() + double3 * this.direction.getStepY(), this.worldPosition.getZ() + double3 * this.direction.getStepZ());
+        return deg.move(this.worldPosition.getX() + double3 * this.direction.getStepX(), this.worldPosition.getY() + double3 * this.direction.getStepY(), this.worldPosition.getZ() + double3 * this.direction.getStepZ());
     }
     
-    private void fixEntityWithinPistonBase(final Entity akq, final Direction fp, final double double3) {
-        final AABB cvf6 = akq.getBoundingBox();
-        final AABB cvf7 = Shapes.block().bounds().move(this.worldPosition);
-        if (cvf6.intersects(cvf7)) {
-            final Direction fp2 = fp.getOpposite();
-            double double4 = getMovement(cvf7, fp2, cvf6) + 0.01;
-            final double double5 = getMovement(cvf7, fp2, cvf6.intersect(cvf7)) + 0.01;
+    private void fixEntityWithinPistonBase(final Entity aom, final Direction fz, final double double3) {
+        final AABB deg6 = aom.getBoundingBox();
+        final AABB deg7 = Shapes.block().bounds().move(this.worldPosition);
+        if (deg6.intersects(deg7)) {
+            final Direction fz2 = fz.getOpposite();
+            double double4 = getMovement(deg7, fz2, deg6) + 0.01;
+            final double double5 = getMovement(deg7, fz2, deg6.intersect(deg7)) + 0.01;
             if (Math.abs(double4 - double5) < 0.01) {
                 double4 = Math.min(double4, double3) + 0.01;
-                moveEntityByPiston(fp, akq, double4, fp2);
+                moveEntityByPiston(fz, aom, double4, fz2);
             }
         }
     }
@@ -265,16 +253,16 @@ public class PistonMovingBlockEntity extends BlockEntity implements TickableBloc
             this.progressO = this.progress;
             this.level.removeBlockEntity(this.worldPosition);
             this.setRemoved();
-            if (this.level.getBlockState(this.worldPosition).getBlock() == Blocks.MOVING_PISTON) {
-                BlockState byj2;
+            if (this.level.getBlockState(this.worldPosition).is(Blocks.MOVING_PISTON)) {
+                BlockState cfj2;
                 if (this.isSourcePiston) {
-                    byj2 = Blocks.AIR.defaultBlockState();
+                    cfj2 = Blocks.AIR.defaultBlockState();
                 }
                 else {
-                    byj2 = Block.updateFromNeighbourShapes(this.movedState, this.level, this.worldPosition);
+                    cfj2 = Block.updateFromNeighbourShapes(this.movedState, this.level, this.worldPosition);
                 }
-                this.level.setBlock(this.worldPosition, byj2, 3);
-                this.level.neighborChanged(this.worldPosition, byj2.getBlock(), this.worldPosition);
+                this.level.setBlock(this.worldPosition, cfj2, 3);
+                this.level.neighborChanged(this.worldPosition, cfj2.getBlock(), this.worldPosition);
             }
         }
     }
@@ -286,18 +274,18 @@ public class PistonMovingBlockEntity extends BlockEntity implements TickableBloc
         if (this.progressO >= 1.0f) {
             this.level.removeBlockEntity(this.worldPosition);
             this.setRemoved();
-            if (this.movedState != null && this.level.getBlockState(this.worldPosition).getBlock() == Blocks.MOVING_PISTON) {
-                BlockState byj2 = Block.updateFromNeighbourShapes(this.movedState, this.level, this.worldPosition);
-                if (byj2.isAir()) {
+            if (this.movedState != null && this.level.getBlockState(this.worldPosition).is(Blocks.MOVING_PISTON)) {
+                BlockState cfj2 = Block.updateFromNeighbourShapes(this.movedState, this.level, this.worldPosition);
+                if (cfj2.isAir()) {
                     this.level.setBlock(this.worldPosition, this.movedState, 84);
-                    Block.updateOrDestroy(this.movedState, byj2, this.level, this.worldPosition, 3);
+                    Block.updateOrDestroy(this.movedState, cfj2, this.level, this.worldPosition, 3);
                 }
                 else {
-                    if (byj2.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.WATERLOGGED) && byj2.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED)) {
-                        byj2 = ((AbstractStateHolder<O, BlockState>)byj2).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.WATERLOGGED, false);
+                    if (cfj2.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.WATERLOGGED) && cfj2.<Boolean>getValue((Property<Boolean>)BlockStateProperties.WATERLOGGED)) {
+                        cfj2 = ((StateHolder<O, BlockState>)cfj2).<Comparable, Boolean>setValue((Property<Comparable>)BlockStateProperties.WATERLOGGED, false);
                     }
-                    this.level.setBlock(this.worldPosition, byj2, 67);
-                    this.level.neighborChanged(this.worldPosition, byj2.getBlock(), this.worldPosition);
+                    this.level.setBlock(this.worldPosition, cfj2, 67);
+                    this.level.neighborChanged(this.worldPosition, cfj2.getBlock(), this.worldPosition);
                 }
             }
             return;
@@ -312,51 +300,51 @@ public class PistonMovingBlockEntity extends BlockEntity implements TickableBloc
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        super.load(jt);
-        this.movedState = NbtUtils.readBlockState(jt.getCompound("blockState"));
-        this.direction = Direction.from3DDataValue(jt.getInt("facing"));
-        this.progress = jt.getFloat("progress");
+    public void load(final BlockState cfj, final CompoundTag le) {
+        super.load(cfj, le);
+        this.movedState = NbtUtils.readBlockState(le.getCompound("blockState"));
+        this.direction = Direction.from3DDataValue(le.getInt("facing"));
+        this.progress = le.getFloat("progress");
         this.progressO = this.progress;
-        this.extending = jt.getBoolean("extending");
-        this.isSourcePiston = jt.getBoolean("source");
+        this.extending = le.getBoolean("extending");
+        this.isSourcePiston = le.getBoolean("source");
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        super.save(jt);
-        jt.put("blockState", NbtUtils.writeBlockState(this.movedState));
-        jt.putInt("facing", this.direction.get3DDataValue());
-        jt.putFloat("progress", this.progressO);
-        jt.putBoolean("extending", this.extending);
-        jt.putBoolean("source", this.isSourcePiston);
-        return jt;
+    public CompoundTag save(final CompoundTag le) {
+        super.save(le);
+        le.put("blockState", NbtUtils.writeBlockState(this.movedState));
+        le.putInt("facing", this.direction.get3DDataValue());
+        le.putFloat("progress", this.progressO);
+        le.putBoolean("extending", this.extending);
+        le.putBoolean("source", this.isSourcePiston);
+        return le;
     }
     
-    public VoxelShape getCollisionShape(final BlockGetter bjg, final BlockPos fk) {
-        VoxelShape cwf4;
+    public VoxelShape getCollisionShape(final BlockGetter bpg, final BlockPos fu) {
+        VoxelShape dfg4;
         if (!this.extending && this.isSourcePiston) {
-            cwf4 = ((AbstractStateHolder<O, BlockState>)this.movedState).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, true).getCollisionShape(bjg, fk);
+            dfg4 = ((StateHolder<O, BlockState>)this.movedState).<Comparable, Boolean>setValue((Property<Comparable>)PistonBaseBlock.EXTENDED, true).getCollisionShape(bpg, fu);
         }
         else {
-            cwf4 = Shapes.empty();
+            dfg4 = Shapes.empty();
         }
-        final Direction fp5 = PistonMovingBlockEntity.NOCLIP.get();
-        if (this.progress < 1.0 && fp5 == this.getMovementDirection()) {
-            return cwf4;
+        final Direction fz5 = PistonMovingBlockEntity.NOCLIP.get();
+        if (this.progress < 1.0 && fz5 == this.getMovementDirection()) {
+            return dfg4;
         }
-        BlockState byj6;
+        BlockState cfj6;
         if (this.isSourcePiston()) {
-            byj6 = (((AbstractStateHolder<O, BlockState>)Blocks.PISTON_HEAD.defaultBlockState()).setValue((Property<Comparable>)PistonHeadBlock.FACING, this.direction)).<Comparable, Boolean>setValue((Property<Comparable>)PistonHeadBlock.SHORT, this.extending != 1.0f - this.progress < 4.0f);
+            cfj6 = (((StateHolder<O, BlockState>)Blocks.PISTON_HEAD.defaultBlockState()).setValue((Property<Comparable>)PistonHeadBlock.FACING, this.direction)).<Comparable, Boolean>setValue((Property<Comparable>)PistonHeadBlock.SHORT, this.extending != 1.0f - this.progress < 0.25f);
         }
         else {
-            byj6 = this.movedState;
+            cfj6 = this.movedState;
         }
         final float float7 = this.getExtendedProgress(this.progress);
         final double double8 = this.direction.getStepX() * float7;
         final double double9 = this.direction.getStepY() * float7;
         final double double10 = this.direction.getStepZ() * float7;
-        return Shapes.or(cwf4, byj6.getCollisionShape(bjg, fk).move(double8, double9, double10));
+        return Shapes.or(dfg4, cfj6.getCollisionShape(bpg, fu).move(double8, double9, double10));
     }
     
     public long getLastTicked() {
diff --git a/src/net/minecraft/world/level/block/piston/PistonStructureResolver.java b/src/net/minecraft/world/level/block/piston/PistonStructureResolver.java
index 3cdfa1d..0d56c64 100644
--- a/src/net/minecraft/world/level/block/piston/PistonStructureResolver.java
+++ b/src/net/minecraft/world/level/block/piston/PistonStructureResolver.java
@@ -21,29 +21,29 @@ public class PistonStructureResolver {
     private final List<BlockPos> toDestroy;
     private final Direction pistonDirection;
     
-    public PistonStructureResolver(final Level bjw, final BlockPos fk, final Direction fp, final boolean boolean4) {
+    public PistonStructureResolver(final Level bqb, final BlockPos fu, final Direction fz, final boolean boolean4) {
         this.toPush = Lists.newArrayList();
         this.toDestroy = Lists.newArrayList();
-        this.level = bjw;
-        this.pistonPos = fk;
-        this.pistonDirection = fp;
+        this.level = bqb;
+        this.pistonPos = fu;
+        this.pistonDirection = fz;
         this.extending = boolean4;
         if (boolean4) {
-            this.pushDirection = fp;
-            this.startPos = fk.relative(fp);
+            this.pushDirection = fz;
+            this.startPos = fu.relative(fz);
         }
         else {
-            this.pushDirection = fp.getOpposite();
-            this.startPos = fk.relative(fp, 2);
+            this.pushDirection = fz.getOpposite();
+            this.startPos = fu.relative(fz, 2);
         }
     }
     
     public boolean resolve() {
         this.toPush.clear();
         this.toDestroy.clear();
-        final BlockState byj2 = this.level.getBlockState(this.startPos);
-        if (!PistonBaseBlock.isPushable(byj2, this.level, this.startPos, this.pushDirection, false, this.pistonDirection)) {
-            if (this.extending && byj2.getPistonPushReaction() == PushReaction.DESTROY) {
+        final BlockState cfj2 = this.level.getBlockState(this.startPos);
+        if (!PistonBaseBlock.isPushable(cfj2, this.level, this.startPos, this.pushDirection, false, this.pistonDirection)) {
+            if (this.extending && cfj2.getPistonPushReaction() == PushReaction.DESTROY) {
                 this.toDestroy.add(this.startPos);
                 return true;
             }
@@ -54,8 +54,8 @@ public class PistonStructureResolver {
                 return false;
             }
             for (int integer3 = 0; integer3 < this.toPush.size(); ++integer3) {
-                final BlockPos fk4 = this.toPush.get(integer3);
-                if (isSticky(this.level.getBlockState(fk4).getBlock()) && !this.addBranchingBlocks(fk4)) {
+                final BlockPos fu4 = this.toPush.get(integer3);
+                if (isSticky(this.level.getBlockState(fu4).getBlock()) && !this.addBranchingBlocks(fu4)) {
                     return false;
                 }
             }
@@ -63,42 +63,42 @@ public class PistonStructureResolver {
         }
     }
     
-    private static boolean isSticky(final Block bph) {
-        return bph == Blocks.SLIME_BLOCK || bph == Blocks.HONEY_BLOCK;
+    private static boolean isSticky(final Block bvr) {
+        return bvr == Blocks.SLIME_BLOCK || bvr == Blocks.HONEY_BLOCK;
     }
     
-    private static boolean canStickToEachOther(final Block bph1, final Block bph2) {
-        return (bph1 != Blocks.HONEY_BLOCK || bph2 != Blocks.SLIME_BLOCK) && (bph1 != Blocks.SLIME_BLOCK || bph2 != Blocks.HONEY_BLOCK) && (isSticky(bph1) || isSticky(bph2));
+    private static boolean canStickToEachOther(final Block bvr1, final Block bvr2) {
+        return (bvr1 != Blocks.HONEY_BLOCK || bvr2 != Blocks.SLIME_BLOCK) && (bvr1 != Blocks.SLIME_BLOCK || bvr2 != Blocks.HONEY_BLOCK) && (isSticky(bvr1) || isSticky(bvr2));
     }
     
-    private boolean addBlockLine(final BlockPos fk, final Direction fp) {
-        BlockState byj4 = this.level.getBlockState(fk);
-        Block bph5 = byj4.getBlock();
-        if (byj4.isAir()) {
+    private boolean addBlockLine(final BlockPos fu, final Direction fz) {
+        BlockState cfj4 = this.level.getBlockState(fu);
+        Block bvr5 = cfj4.getBlock();
+        if (cfj4.isAir()) {
             return true;
         }
-        if (!PistonBaseBlock.isPushable(byj4, this.level, fk, this.pushDirection, false, fp)) {
+        if (!PistonBaseBlock.isPushable(cfj4, this.level, fu, this.pushDirection, false, fz)) {
             return true;
         }
-        if (fk.equals(this.pistonPos)) {
+        if (fu.equals(this.pistonPos)) {
             return true;
         }
-        if (this.toPush.contains(fk)) {
+        if (this.toPush.contains(fu)) {
             return true;
         }
         int integer6 = 1;
         if (integer6 + this.toPush.size() > 12) {
             return false;
         }
-        while (isSticky(bph5)) {
-            final BlockPos fk2 = fk.relative(this.pushDirection.getOpposite(), integer6);
-            final Block bph6 = bph5;
-            byj4 = this.level.getBlockState(fk2);
-            bph5 = byj4.getBlock();
-            if (byj4.isAir() || !canStickToEachOther(bph6, bph5) || !PistonBaseBlock.isPushable(byj4, this.level, fk2, this.pushDirection, false, this.pushDirection.getOpposite())) {
+        while (isSticky(bvr5)) {
+            final BlockPos fu2 = fu.relative(this.pushDirection.getOpposite(), integer6);
+            final Block bvr6 = bvr5;
+            cfj4 = this.level.getBlockState(fu2);
+            bvr5 = cfj4.getBlock();
+            if (cfj4.isAir() || !canStickToEachOther(bvr6, bvr5) || !PistonBaseBlock.isPushable(cfj4, this.level, fu2, this.pushDirection, false, this.pushDirection.getOpposite())) {
                 break;
             }
-            if (fk2.equals(this.pistonPos)) {
+            if (fu2.equals(this.pistonPos)) {
                 break;
             }
             if (++integer6 + this.toPush.size() > 12) {
@@ -107,38 +107,38 @@ public class PistonStructureResolver {
         }
         int integer7 = 0;
         for (int integer8 = integer6 - 1; integer8 >= 0; --integer8) {
-            this.toPush.add(fk.relative(this.pushDirection.getOpposite(), integer8));
+            this.toPush.add(fu.relative(this.pushDirection.getOpposite(), integer8));
             ++integer7;
         }
         int integer8 = 1;
         while (true) {
-            final BlockPos fk3 = fk.relative(this.pushDirection, integer8);
-            final int integer9 = this.toPush.indexOf(fk3);
+            final BlockPos fu3 = fu.relative(this.pushDirection, integer8);
+            final int integer9 = this.toPush.indexOf(fu3);
             if (integer9 > -1) {
                 this.reorderListAtCollision(integer7, integer9);
                 for (int integer10 = 0; integer10 <= integer9 + integer7; ++integer10) {
-                    final BlockPos fk4 = this.toPush.get(integer10);
-                    if (isSticky(this.level.getBlockState(fk4).getBlock()) && !this.addBranchingBlocks(fk4)) {
+                    final BlockPos fu4 = this.toPush.get(integer10);
+                    if (isSticky(this.level.getBlockState(fu4).getBlock()) && !this.addBranchingBlocks(fu4)) {
                         return false;
                     }
                 }
                 return true;
             }
-            byj4 = this.level.getBlockState(fk3);
-            if (byj4.isAir()) {
+            cfj4 = this.level.getBlockState(fu3);
+            if (cfj4.isAir()) {
                 return true;
             }
-            if (!PistonBaseBlock.isPushable(byj4, this.level, fk3, this.pushDirection, true, this.pushDirection) || fk3.equals(this.pistonPos)) {
+            if (!PistonBaseBlock.isPushable(cfj4, this.level, fu3, this.pushDirection, true, this.pushDirection) || fu3.equals(this.pistonPos)) {
                 return false;
             }
-            if (byj4.getPistonPushReaction() == PushReaction.DESTROY) {
-                this.toDestroy.add(fk3);
+            if (cfj4.getPistonPushReaction() == PushReaction.DESTROY) {
+                this.toDestroy.add(fu3);
                 return true;
             }
             if (this.toPush.size() >= 12) {
                 return false;
             }
-            this.toPush.add(fk3);
+            this.toPush.add(fu3);
             ++integer7;
             ++integer8;
         }
@@ -157,14 +157,14 @@ public class PistonStructureResolver {
         this.toPush.addAll(list6);
     }
     
-    private boolean addBranchingBlocks(final BlockPos fk) {
-        final BlockState byj3 = this.level.getBlockState(fk);
-        for (final Direction fp7 : Direction.values()) {
-            if (fp7.getAxis() != this.pushDirection.getAxis()) {
-                final BlockPos fk2 = fk.relative(fp7);
-                final BlockState byj4 = this.level.getBlockState(fk2);
-                if (canStickToEachOther(byj4.getBlock(), byj3.getBlock())) {
-                    if (!this.addBlockLine(fk2, fp7)) {
+    private boolean addBranchingBlocks(final BlockPos fu) {
+        final BlockState cfj3 = this.level.getBlockState(fu);
+        for (final Direction fz7 : Direction.values()) {
+            if (fz7.getAxis() != this.pushDirection.getAxis()) {
+                final BlockPos fu2 = fu.relative(fz7);
+                final BlockState cfj4 = this.level.getBlockState(fu2);
+                if (canStickToEachOther(cfj4.getBlock(), cfj3.getBlock())) {
+                    if (!this.addBlockLine(fu2, fz7)) {
                         return false;
                     }
                 }
diff --git a/src/net/minecraft/world/level/block/state/AbstractStateHolder.java b/src/net/minecraft/world/level/block/state/AbstractStateHolder.java
deleted file mode 100644
index 12a6ba7..0000000
--- a/src/net/minecraft/world/level/block/state/AbstractStateHolder.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package net.minecraft.world.level.block.state;
-
-import javax.annotation.Nullable;
-import com.google.common.collect.Maps;
-import com.google.common.collect.UnmodifiableIterator;
-import com.google.common.collect.ArrayTable;
-import com.google.common.collect.HashBasedTable;
-import java.util.Collections;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-import java.util.Iterator;
-import java.util.Collection;
-import com.google.common.collect.Table;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.world.level.block.state.properties.Property;
-import java.util.Map;
-import java.util.function.Function;
-
-public abstract class AbstractStateHolder<O, S> implements StateHolder<S> {
-    private static final Function<Map.Entry<Property<?>, Comparable<?>>, String> PROPERTY_ENTRY_TO_STRING_FUNCTION;
-    protected final O owner;
-    private final ImmutableMap<Property<?>, Comparable<?>> values;
-    private Table<Property<?>, Comparable<?>, S> neighbours;
-    
-    protected AbstractStateHolder(final O object, final ImmutableMap<Property<?>, Comparable<?>> immutableMap) {
-        this.owner = object;
-        this.values = immutableMap;
-    }
-    
-    public <T extends Comparable<T>> S cycle(final Property<T> bzm) {
-        return this.<T, Comparable>setValue(bzm, (Comparable)AbstractStateHolder.<V>findNextInCollection((Collection<V>)bzm.getPossibleValues(), (V)this.<T>getValue((Property<T>)bzm)));
-    }
-    
-    protected static <T> T findNextInCollection(final Collection<T> collection, final T object) {
-        final Iterator<T> iterator3 = collection.iterator();
-        while (iterator3.hasNext()) {
-            if (iterator3.next().equals(object)) {
-                if (iterator3.hasNext()) {
-                    return iterator3.next();
-                }
-                return collection.iterator().next();
-            }
-        }
-        return iterator3.next();
-    }
-    
-    @Override
-    public String toString() {
-        final StringBuilder stringBuilder2 = new StringBuilder();
-        stringBuilder2.append(this.owner);
-        if (!this.getValues().isEmpty()) {
-            stringBuilder2.append('[');
-            stringBuilder2.append(this.getValues().entrySet().stream().map(AbstractStateHolder.PROPERTY_ENTRY_TO_STRING_FUNCTION).collect(Collectors.joining(",")));
-            stringBuilder2.append(']');
-        }
-        return stringBuilder2.toString();
-    }
-    
-    public Collection<Property<?>> getProperties() {
-        return Collections.<Property<?>>unmodifiableCollection(this.values.keySet());
-    }
-    
-    public <T extends Comparable<T>> boolean hasProperty(final Property<T> bzm) {
-        return this.values.containsKey(bzm);
-    }
-    
-    @Override
-    public <T extends Comparable<T>> T getValue(final Property<T> bzm) {
-        final Comparable<?> comparable3 = this.values.get(bzm);
-        if (comparable3 == null) {
-            throw new IllegalArgumentException("Cannot get property " + bzm + " as it does not exist in " + this.owner);
-        }
-        return bzm.getValueClass().cast(comparable3);
-    }
-    
-    @Override
-    public <T extends Comparable<T>, V extends T> S setValue(final Property<T> bzm, final V comparable) {
-        final Comparable<?> comparable2 = this.values.get(bzm);
-        if (comparable2 == null) {
-            throw new IllegalArgumentException("Cannot set property " + bzm + " as it does not exist in " + this.owner);
-        }
-        if (comparable2 == comparable) {
-            return (S)this;
-        }
-        final S object5 = this.neighbours.get(bzm, comparable);
-        if (object5 == null) {
-            throw new IllegalArgumentException("Cannot set property " + bzm + " to " + comparable + " on " + this.owner + ", it is not an allowed value");
-        }
-        return object5;
-    }
-    
-    public void populateNeighbours(final Map<Map<Property<?>, Comparable<?>>, S> map) {
-        if (this.neighbours != null) {
-            throw new IllegalStateException();
-        }
-        final Table<Property<?>, Comparable<?>, S> table3 = HashBasedTable.create();
-        for (final Map.Entry<Property<?>, Comparable<?>> entry5 : this.values.entrySet()) {
-            final Property<?> bzm6 = entry5.getKey();
-            for (final Comparable<?> comparable8 : bzm6.getPossibleValues()) {
-                if (comparable8 != entry5.getValue()) {
-                    table3.put(bzm6, comparable8, map.get(this.makeNeighbourValues(bzm6, comparable8)));
-                }
-            }
-        }
-        this.neighbours = (table3.isEmpty() ? table3 : ArrayTable.<Property<?>, Comparable<?>, S>create(table3));
-    }
-    
-    private Map<Property<?>, Comparable<?>> makeNeighbourValues(final Property<?> bzm, final Comparable<?> comparable) {
-        final Map<Property<?>, Comparable<?>> map4 = Maps.newHashMap(this.values);
-        map4.put(bzm, comparable);
-        return map4;
-    }
-    
-    @Override
-    public ImmutableMap<Property<?>, Comparable<?>> getValues() {
-        return this.values;
-    }
-    
-    static {
-        PROPERTY_ENTRY_TO_STRING_FUNCTION = new Function<Map.Entry<Property<?>, Comparable<?>>, String>() {
-            @Override
-            public String apply(@Nullable final Map.Entry<Property<?>, Comparable<?>> entry) {
-                if (entry == null) {
-                    return "<NULL>";
-                }
-                final Property<?> bzm3 = entry.getKey();
-                return bzm3.getName() + "=" + this.getName(bzm3, entry.getValue());
-            }
-            
-            private <T extends Comparable<T>> String getName(final Property<T> bzm, final Comparable<?> comparable) {
-                return bzm.getName((T)comparable);
-            }
-        };
-    }
-}
diff --git a/src/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/net/minecraft/world/level/block/state/BlockBehaviour.java
new file mode 100644
index 0000000..4a66a94
--- /dev/null
+++ b/src/net/minecraft/world/level/block/state/BlockBehaviour.java
@@ -0,0 +1,972 @@
+package net.minecraft.world.level.block.state;
+
+import java.util.Arrays;
+import net.minecraft.world.level.EmptyBlockGetter;
+import java.util.function.Predicate;
+import net.minecraft.world.phys.Vec3;
+import com.mojang.serialization.MapCodec;
+import net.minecraft.world.level.block.state.properties.Property;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.entity.EntityType;
+import java.util.function.ToIntFunction;
+import java.util.function.Function;
+import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.entity.projectile.Projectile;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.block.EntityBlock;
+import net.minecraft.world.entity.Entity;
+import java.util.Random;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.core.Vec3i;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.storage.loot.LootTable;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import java.util.Collections;
+import net.minecraft.world.level.storage.loot.BuiltInLootTables;
+import net.minecraft.world.item.ItemStack;
+import java.util.List;
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.item.BlockPlaceContext;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.material.Fluids;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.PushReaction;
+import net.minecraft.world.level.block.RenderShape;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.network.protocol.game.DebugPackets;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.FluidTags;
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelAccessor;
+import javax.annotation.Nullable;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.SoundType;
+import net.minecraft.world.level.material.Material;
+import net.minecraft.core.Direction;
+
+public abstract class BlockBehaviour {
+    protected static final Direction[] UPDATE_SHAPE_ORDER;
+    protected final Material material;
+    protected final boolean hasCollision;
+    protected final float explosionResistance;
+    protected final boolean isRandomlyTicking;
+    protected final SoundType soundType;
+    protected final float friction;
+    protected final float speedFactor;
+    protected final float jumpFactor;
+    protected final boolean dynamicShape;
+    protected final Properties properties;
+    @Nullable
+    protected ResourceLocation drops;
+    
+    public BlockBehaviour(final Properties c) {
+        this.material = c.material;
+        this.hasCollision = c.hasCollision;
+        this.drops = c.drops;
+        this.explosionResistance = c.explosionResistance;
+        this.isRandomlyTicking = c.isRandomlyTicking;
+        this.soundType = c.soundType;
+        this.friction = c.friction;
+        this.speedFactor = c.speedFactor;
+        this.jumpFactor = c.jumpFactor;
+        this.dynamicShape = c.dynamicShape;
+        this.properties = c;
+    }
+    
+    @Deprecated
+    public void updateIndirectNeighbourShapes(final BlockState cfj, final LevelAccessor bqc, final BlockPos fu, final int integer4, final int integer5) {
+    }
+    
+    @Deprecated
+    public boolean isPathfindable(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+        switch (czg) {
+            case LAND: {
+                return !cfj.isCollisionShapeFullBlock(bpg, fu);
+            }
+            case WATER: {
+                return bpg.getFluidState(fu).is(FluidTags.WATER);
+            }
+            case AIR: {
+                return !cfj.isCollisionShapeFullBlock(bpg, fu);
+            }
+            default: {
+                return false;
+            }
+        }
+    }
+    
+    @Deprecated
+    public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+        return cfj1;
+    }
+    
+    @Deprecated
+    public boolean skipRendering(final BlockState cfj1, final BlockState cfj2, final Direction fz) {
+        return false;
+    }
+    
+    @Deprecated
+    public void neighborChanged(final BlockState cfj, final Level bqb, final BlockPos fu3, final Block bvr, final BlockPos fu5, final boolean boolean6) {
+        DebugPackets.sendNeighborsUpdatePacket(bqb, fu3);
+    }
+    
+    @Deprecated
+    public void onPlace(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+    }
+    
+    @Deprecated
+    public void onRemove(final BlockState cfj1, final Level bqb, final BlockPos fu, final BlockState cfj4, final boolean boolean5) {
+        if (this.isEntityBlock() && !cfj1.is(cfj4.getBlock())) {
+            bqb.removeBlockEntity(fu);
+        }
+    }
+    
+    @Deprecated
+    public InteractionResult use(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+        return InteractionResult.PASS;
+    }
+    
+    @Deprecated
+    public boolean triggerEvent(final BlockState cfj, final Level bqb, final BlockPos fu, final int integer4, final int integer5) {
+        return false;
+    }
+    
+    @Deprecated
+    public RenderShape getRenderShape(final BlockState cfj) {
+        return RenderShape.MODEL;
+    }
+    
+    @Deprecated
+    public boolean useShapeForLightOcclusion(final BlockState cfj) {
+        return false;
+    }
+    
+    @Deprecated
+    public boolean isSignalSource(final BlockState cfj) {
+        return false;
+    }
+    
+    @Deprecated
+    public PushReaction getPistonPushReaction(final BlockState cfj) {
+        return this.material.getPushReaction();
+    }
+    
+    @Deprecated
+    public FluidState getFluidState(final BlockState cfj) {
+        return Fluids.EMPTY.defaultFluidState();
+    }
+    
+    @Deprecated
+    public boolean hasAnalogOutputSignal(final BlockState cfj) {
+        return false;
+    }
+    
+    public OffsetType getOffsetType() {
+        return OffsetType.NONE;
+    }
+    
+    @Deprecated
+    public BlockState rotate(final BlockState cfj, final Rotation cap) {
+        return cfj;
+    }
+    
+    @Deprecated
+    public BlockState mirror(final BlockState cfj, final Mirror bzj) {
+        return cfj;
+    }
+    
+    @Deprecated
+    public boolean canBeReplaced(final BlockState cfj, final BlockPlaceContext bin) {
+        return this.material.isReplaceable() && (bin.getItemInHand().isEmpty() || bin.getItemInHand().getItem() != this.asItem());
+    }
+    
+    @Deprecated
+    public boolean canBeReplaced(final BlockState cfj, final Fluid cwz) {
+        return this.material.isReplaceable() || !this.material.isSolid();
+    }
+    
+    @Deprecated
+    public List<ItemStack> getDrops(final BlockState cfj, final LootContext.Builder a) {
+        final ResourceLocation uh4 = this.getLootTable();
+        if (uh4 == BuiltInLootTables.EMPTY) {
+            return Collections.<ItemStack>emptyList();
+        }
+        final LootContext dat5 = a.<BlockState>withParameter(LootContextParams.BLOCK_STATE, cfj).create(LootContextParamSets.BLOCK);
+        final ServerLevel zd6 = dat5.getLevel();
+        final LootTable daw7 = zd6.getServer().getLootTables().get(uh4);
+        return daw7.getRandomItems(dat5);
+    }
+    
+    @Deprecated
+    public long getSeed(final BlockState cfj, final BlockPos fu) {
+        return Mth.getSeed(fu);
+    }
+    
+    @Deprecated
+    public VoxelShape getOcclusionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.getShape(bpg, fu);
+    }
+    
+    @Deprecated
+    public VoxelShape getBlockSupportShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return this.getCollisionShape(cfj, bpg, fu, CollisionContext.empty());
+    }
+    
+    @Deprecated
+    public VoxelShape getInteractionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return Shapes.empty();
+    }
+    
+    @Deprecated
+    public int getLightBlock(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        if (cfj.isSolidRender(bpg, fu)) {
+            return bpg.getMaxLightLevel();
+        }
+        return cfj.propagatesSkylightDown(bpg, fu) ? 0 : 1;
+    }
+    
+    @Nullable
+    @Deprecated
+    public MenuProvider getMenuProvider(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return null;
+    }
+    
+    @Deprecated
+    public boolean canSurvive(final BlockState cfj, final LevelReader bqd, final BlockPos fu) {
+        return true;
+    }
+    
+    @Deprecated
+    public float getShadeBrightness(final BlockState cfj, final BlockGetter bpg, final BlockPos fu) {
+        return cfj.isCollisionShapeFullBlock(bpg, fu) ? 0.2f : 1.0f;
+    }
+    
+    @Deprecated
+    public int getAnalogOutputSignal(final BlockState cfj, final Level bqb, final BlockPos fu) {
+        return 0;
+    }
+    
+    @Deprecated
+    public VoxelShape getShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return Shapes.block();
+    }
+    
+    @Deprecated
+    public VoxelShape getCollisionShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.hasCollision ? cfj.getShape(bpg, fu) : Shapes.empty();
+    }
+    
+    @Deprecated
+    public VoxelShape getVisualShape(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+        return this.getCollisionShape(cfj, bpg, fu, der);
+    }
+    
+    @Deprecated
+    public void randomTick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+        this.tick(cfj, zd, fu, random);
+    }
+    
+    @Deprecated
+    public void tick(final BlockState cfj, final ServerLevel zd, final BlockPos fu, final Random random) {
+    }
+    
+    @Deprecated
+    public float getDestroyProgress(final BlockState cfj, final Player bec, final BlockGetter bpg, final BlockPos fu) {
+        final float float6 = cfj.getDestroySpeed(bpg, fu);
+        if (float6 == -1.0f) {
+            return 0.0f;
+        }
+        final int integer7 = bec.hasCorrectToolForDrops(cfj) ? 30 : 100;
+        return bec.getDestroySpeed(cfj) / float6 / integer7;
+    }
+    
+    @Deprecated
+    public void spawnAfterBreak(final BlockState cfj, final Level bqb, final BlockPos fu, final ItemStack bki) {
+    }
+    
+    @Deprecated
+    public void attack(final BlockState cfj, final Level bqb, final BlockPos fu, final Player bec) {
+    }
+    
+    @Deprecated
+    public int getSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return 0;
+    }
+    
+    @Deprecated
+    public void entityInside(final BlockState cfj, final Level bqb, final BlockPos fu, final Entity aom) {
+    }
+    
+    @Deprecated
+    public int getDirectSignal(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        return 0;
+    }
+    
+    public final boolean isEntityBlock() {
+        return this instanceof EntityBlock;
+    }
+    
+    public final ResourceLocation getLootTable() {
+        if (this.drops == null) {
+            final ResourceLocation uh2 = Registry.BLOCK.getKey(this.asBlock());
+            this.drops = new ResourceLocation(uh2.getNamespace(), "blocks/" + uh2.getPath());
+        }
+        return this.drops;
+    }
+    
+    @Deprecated
+    public void onProjectileHit(final Level bqb, final BlockState cfj, final BlockHitResult deh, final Projectile bes) {
+    }
+    
+    public abstract Item asItem();
+    
+    protected abstract Block asBlock();
+    
+    public MaterialColor defaultMaterialColor() {
+        return this.properties.materialColor.apply(this.asBlock().defaultBlockState());
+    }
+    
+    static {
+        UPDATE_SHAPE_ORDER = new Direction[] { Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP };
+    }
+    
+    public enum OffsetType {
+        NONE, 
+        XZ, 
+        XYZ;
+    }
+    
+    public static class Properties {
+        private Material material;
+        private Function<BlockState, MaterialColor> materialColor;
+        private boolean hasCollision;
+        private SoundType soundType;
+        private ToIntFunction<BlockState> lightEmission;
+        private float explosionResistance;
+        private float destroyTime;
+        private boolean requiresCorrectToolForDrops;
+        private boolean isRandomlyTicking;
+        private float friction;
+        private float speedFactor;
+        private float jumpFactor;
+        private ResourceLocation drops;
+        private boolean canOcclude;
+        private boolean isAir;
+        private StateArgumentPredicate<EntityType<?>> isValidSpawn;
+        private StatePredicate isRedstoneConductor;
+        private StatePredicate isSuffocating;
+        private StatePredicate isViewBlocking;
+        private StatePredicate hasPostProcess;
+        private StatePredicate emissiveRendering;
+        private boolean dynamicShape;
+        
+        private Properties(final Material cxd, final MaterialColor cxe) {
+            this(cxd, cfj -> cxe);
+        }
+        
+        private Properties(final Material cxd, final Function<BlockState, MaterialColor> function) {
+            this.hasCollision = true;
+            this.soundType = SoundType.STONE;
+            this.lightEmission = (cfj -> 0);
+            this.friction = 0.6f;
+            this.speedFactor = 1.0f;
+            this.jumpFactor = 1.0f;
+            this.canOcclude = true;
+            this.isValidSpawn = ((cfj, bpg, fu, aoq) -> cfj.isFaceSturdy(bpg, fu, Direction.UP) && cfj.getLightEmission() < 14);
+            this.isRedstoneConductor = ((cfj, bpg, fu) -> cfj.getMaterial().isSolidBlocking() && cfj.isCollisionShapeFullBlock(bpg, fu));
+            this.isSuffocating = ((cfj, bpg, fu) -> this.material.blocksMotion() && cfj.isCollisionShapeFullBlock(bpg, fu));
+            this.isViewBlocking = this.isSuffocating;
+            this.hasPostProcess = ((cfj, bpg, fu) -> false);
+            this.emissiveRendering = ((cfj, bpg, fu) -> false);
+            this.material = cxd;
+            this.materialColor = function;
+        }
+        
+        public static Properties of(final Material cxd) {
+            return of(cxd, cxd.getColor());
+        }
+        
+        public static Properties of(final Material cxd, final DyeColor bje) {
+            return of(cxd, bje.getMaterialColor());
+        }
+        
+        public static Properties of(final Material cxd, final MaterialColor cxe) {
+            return new Properties(cxd, cxe);
+        }
+        
+        public static Properties of(final Material cxd, final Function<BlockState, MaterialColor> function) {
+            return new Properties(cxd, function);
+        }
+        
+        public static Properties copy(final BlockBehaviour cfi) {
+            final Properties c2 = new Properties(cfi.material, cfi.properties.materialColor);
+            c2.material = cfi.properties.material;
+            c2.destroyTime = cfi.properties.destroyTime;
+            c2.explosionResistance = cfi.properties.explosionResistance;
+            c2.hasCollision = cfi.properties.hasCollision;
+            c2.isRandomlyTicking = cfi.properties.isRandomlyTicking;
+            c2.lightEmission = cfi.properties.lightEmission;
+            c2.materialColor = cfi.properties.materialColor;
+            c2.soundType = cfi.properties.soundType;
+            c2.friction = cfi.properties.friction;
+            c2.speedFactor = cfi.properties.speedFactor;
+            c2.dynamicShape = cfi.properties.dynamicShape;
+            c2.canOcclude = cfi.properties.canOcclude;
+            c2.isAir = cfi.properties.isAir;
+            c2.requiresCorrectToolForDrops = cfi.properties.requiresCorrectToolForDrops;
+            return c2;
+        }
+        
+        public Properties noCollission() {
+            this.hasCollision = false;
+            this.canOcclude = false;
+            return this;
+        }
+        
+        public Properties noOcclusion() {
+            this.canOcclude = false;
+            return this;
+        }
+        
+        public Properties friction(final float float1) {
+            this.friction = float1;
+            return this;
+        }
+        
+        public Properties speedFactor(final float float1) {
+            this.speedFactor = float1;
+            return this;
+        }
+        
+        public Properties jumpFactor(final float float1) {
+            this.jumpFactor = float1;
+            return this;
+        }
+        
+        public Properties sound(final SoundType cbh) {
+            this.soundType = cbh;
+            return this;
+        }
+        
+        public Properties lightLevel(final ToIntFunction<BlockState> toIntFunction) {
+            this.lightEmission = toIntFunction;
+            return this;
+        }
+        
+        public Properties strength(final float float1, final float float2) {
+            this.destroyTime = float1;
+            this.explosionResistance = Math.max(0.0f, float2);
+            return this;
+        }
+        
+        public Properties instabreak() {
+            return this.strength(0.0f);
+        }
+        
+        public Properties strength(final float float1) {
+            this.strength(float1, float1);
+            return this;
+        }
+        
+        public Properties randomTicks() {
+            this.isRandomlyTicking = true;
+            return this;
+        }
+        
+        public Properties dynamicShape() {
+            this.dynamicShape = true;
+            return this;
+        }
+        
+        public Properties noDrops() {
+            this.drops = BuiltInLootTables.EMPTY;
+            return this;
+        }
+        
+        public Properties dropsLike(final Block bvr) {
+            this.drops = bvr.getLootTable();
+            return this;
+        }
+        
+        public Properties air() {
+            this.isAir = true;
+            return this;
+        }
+        
+        public Properties isValidSpawn(final StateArgumentPredicate<EntityType<?>> d) {
+            this.isValidSpawn = d;
+            return this;
+        }
+        
+        public Properties isRedstoneConductor(final StatePredicate e) {
+            this.isRedstoneConductor = e;
+            return this;
+        }
+        
+        public Properties isSuffocating(final StatePredicate e) {
+            this.isSuffocating = e;
+            return this;
+        }
+        
+        public Properties isViewBlocking(final StatePredicate e) {
+            this.isViewBlocking = e;
+            return this;
+        }
+        
+        public Properties hasPostProcess(final StatePredicate e) {
+            this.hasPostProcess = e;
+            return this;
+        }
+        
+        public Properties emissiveRendering(final StatePredicate e) {
+            this.emissiveRendering = e;
+            return this;
+        }
+        
+        public Properties requiresCorrectToolForDrops() {
+            this.requiresCorrectToolForDrops = true;
+            return this;
+        }
+    }
+    
+    public abstract static class BlockStateBase extends StateHolder<Block, BlockState> {
+        private final int lightEmission;
+        private final boolean useShapeForLightOcclusion;
+        private final boolean isAir;
+        private final Material material;
+        private final MaterialColor materialColor;
+        private final float destroySpeed;
+        private final boolean requiresCorrectToolForDrops;
+        private final boolean canOcclude;
+        private final StatePredicate isRedstoneConductor;
+        private final StatePredicate isSuffocating;
+        private final StatePredicate isViewBlocking;
+        private final StatePredicate hasPostProcess;
+        private final StatePredicate emissiveRendering;
+        @Nullable
+        protected Cache cache;
+        
+        protected BlockStateBase(final Block bvr, final ImmutableMap<Property<?>, Comparable<?>> immutableMap, final MapCodec<BlockState> mapCodec) {
+            super(bvr, immutableMap, mapCodec);
+            final Properties c5 = bvr.properties;
+            this.lightEmission = c5.lightEmission.applyAsInt(this.asState());
+            this.useShapeForLightOcclusion = bvr.useShapeForLightOcclusion(this.asState());
+            this.isAir = c5.isAir;
+            this.material = c5.material;
+            this.materialColor = c5.materialColor.apply(this.asState());
+            this.destroySpeed = c5.destroyTime;
+            this.requiresCorrectToolForDrops = c5.requiresCorrectToolForDrops;
+            this.canOcclude = c5.canOcclude;
+            this.isRedstoneConductor = c5.isRedstoneConductor;
+            this.isSuffocating = c5.isSuffocating;
+            this.isViewBlocking = c5.isViewBlocking;
+            this.hasPostProcess = c5.hasPostProcess;
+            this.emissiveRendering = c5.emissiveRendering;
+        }
+        
+        public void initCache() {
+            if (!this.getBlock().hasDynamicShape()) {
+                this.cache = new Cache(this.asState());
+            }
+        }
+        
+        public Block getBlock() {
+            return (Block)this.owner;
+        }
+        
+        public Material getMaterial() {
+            return this.material;
+        }
+        
+        public boolean isValidSpawn(final BlockGetter bpg, final BlockPos fu, final EntityType<?> aoq) {
+            return this.getBlock().properties.isValidSpawn.test(this.asState(), bpg, fu, aoq);
+        }
+        
+        public boolean propagatesSkylightDown(final BlockGetter bpg, final BlockPos fu) {
+            if (this.cache != null) {
+                return this.cache.propagatesSkylightDown;
+            }
+            return this.getBlock().propagatesSkylightDown(this.asState(), bpg, fu);
+        }
+        
+        public int getLightBlock(final BlockGetter bpg, final BlockPos fu) {
+            if (this.cache != null) {
+                return this.cache.lightBlock;
+            }
+            return this.getBlock().getLightBlock(this.asState(), bpg, fu);
+        }
+        
+        public VoxelShape getFaceOcclusionShape(final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+            if (this.cache != null && this.cache.occlusionShapes != null) {
+                return this.cache.occlusionShapes[fz.ordinal()];
+            }
+            return Shapes.getFaceShape(this.getOcclusionShape(bpg, fu), fz);
+        }
+        
+        public VoxelShape getOcclusionShape(final BlockGetter bpg, final BlockPos fu) {
+            return this.getBlock().getOcclusionShape(this.asState(), bpg, fu);
+        }
+        
+        public boolean hasLargeCollisionShape() {
+            return this.cache == null || this.cache.largeCollisionShape;
+        }
+        
+        public boolean useShapeForLightOcclusion() {
+            return this.useShapeForLightOcclusion;
+        }
+        
+        public int getLightEmission() {
+            return this.lightEmission;
+        }
+        
+        public boolean isAir() {
+            return this.isAir;
+        }
+        
+        public MaterialColor getMapColor(final BlockGetter bpg, final BlockPos fu) {
+            return this.materialColor;
+        }
+        
+        public BlockState rotate(final Rotation cap) {
+            return this.getBlock().rotate(this.asState(), cap);
+        }
+        
+        public BlockState mirror(final Mirror bzj) {
+            return this.getBlock().mirror(this.asState(), bzj);
+        }
+        
+        public RenderShape getRenderShape() {
+            return this.getBlock().getRenderShape(this.asState());
+        }
+        
+        public boolean emissiveRendering(final BlockGetter bpg, final BlockPos fu) {
+            return this.emissiveRendering.test(this.asState(), bpg, fu);
+        }
+        
+        public float getShadeBrightness(final BlockGetter bpg, final BlockPos fu) {
+            return this.getBlock().getShadeBrightness(this.asState(), bpg, fu);
+        }
+        
+        public boolean isRedstoneConductor(final BlockGetter bpg, final BlockPos fu) {
+            return this.isRedstoneConductor.test(this.asState(), bpg, fu);
+        }
+        
+        public boolean isSignalSource() {
+            return this.getBlock().isSignalSource(this.asState());
+        }
+        
+        public int getSignal(final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+            return this.getBlock().getSignal(this.asState(), bpg, fu, fz);
+        }
+        
+        public boolean hasAnalogOutputSignal() {
+            return this.getBlock().hasAnalogOutputSignal(this.asState());
+        }
+        
+        public int getAnalogOutputSignal(final Level bqb, final BlockPos fu) {
+            return this.getBlock().getAnalogOutputSignal(this.asState(), bqb, fu);
+        }
+        
+        public float getDestroySpeed(final BlockGetter bpg, final BlockPos fu) {
+            return this.destroySpeed;
+        }
+        
+        public float getDestroyProgress(final Player bec, final BlockGetter bpg, final BlockPos fu) {
+            return this.getBlock().getDestroyProgress(this.asState(), bec, bpg, fu);
+        }
+        
+        public int getDirectSignal(final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+            return this.getBlock().getDirectSignal(this.asState(), bpg, fu, fz);
+        }
+        
+        public PushReaction getPistonPushReaction() {
+            return this.getBlock().getPistonPushReaction(this.asState());
+        }
+        
+        public boolean isSolidRender(final BlockGetter bpg, final BlockPos fu) {
+            if (this.cache != null) {
+                return this.cache.solidRender;
+            }
+            final BlockState cfj4 = this.asState();
+            return cfj4.canOcclude() && Block.isShapeFullBlock(cfj4.getOcclusionShape(bpg, fu));
+        }
+        
+        public boolean canOcclude() {
+            return this.canOcclude;
+        }
+        
+        public boolean skipRendering(final BlockState cfj, final Direction fz) {
+            return this.getBlock().skipRendering(this.asState(), cfj, fz);
+        }
+        
+        public VoxelShape getShape(final BlockGetter bpg, final BlockPos fu) {
+            return this.getShape(bpg, fu, CollisionContext.empty());
+        }
+        
+        public VoxelShape getShape(final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+            return this.getBlock().getShape(this.asState(), bpg, fu, der);
+        }
+        
+        public VoxelShape getCollisionShape(final BlockGetter bpg, final BlockPos fu) {
+            if (this.cache != null) {
+                return this.cache.collisionShape;
+            }
+            return this.getCollisionShape(bpg, fu, CollisionContext.empty());
+        }
+        
+        public VoxelShape getCollisionShape(final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+            return this.getBlock().getCollisionShape(this.asState(), bpg, fu, der);
+        }
+        
+        public VoxelShape getBlockSupportShape(final BlockGetter bpg, final BlockPos fu) {
+            return this.getBlock().getBlockSupportShape(this.asState(), bpg, fu);
+        }
+        
+        public VoxelShape getVisualShape(final BlockGetter bpg, final BlockPos fu, final CollisionContext der) {
+            return this.getBlock().getVisualShape(this.asState(), bpg, fu, der);
+        }
+        
+        public VoxelShape getInteractionShape(final BlockGetter bpg, final BlockPos fu) {
+            return this.getBlock().getInteractionShape(this.asState(), bpg, fu);
+        }
+        
+        public final boolean entityCanStandOn(final BlockGetter bpg, final BlockPos fu, final Entity aom) {
+            return this.entityCanStandOnFace(bpg, fu, aom, Direction.UP);
+        }
+        
+        public final boolean entityCanStandOnFace(final BlockGetter bpg, final BlockPos fu, final Entity aom, final Direction fz) {
+            return Block.isFaceFull(this.getCollisionShape(bpg, fu, CollisionContext.of(aom)), fz);
+        }
+        
+        public Vec3 getOffset(final BlockGetter bpg, final BlockPos fu) {
+            final OffsetType b4 = this.getBlock().getOffsetType();
+            if (b4 == OffsetType.NONE) {
+                return Vec3.ZERO;
+            }
+            final long long5 = Mth.getSeed(fu.getX(), 0, fu.getZ());
+            return new Vec3(((long5 & 0xFL) / 15.0f - 0.5) * 0.5, (b4 == OffsetType.XYZ) ? (((long5 >> 4 & 0xFL) / 15.0f - 1.0) * 0.2) : 0.0, ((long5 >> 8 & 0xFL) / 15.0f - 0.5) * 0.5);
+        }
+        
+        public boolean triggerEvent(final Level bqb, final BlockPos fu, final int integer3, final int integer4) {
+            return this.getBlock().triggerEvent(this.asState(), bqb, fu, integer3, integer4);
+        }
+        
+        public void neighborChanged(final Level bqb, final BlockPos fu2, final Block bvr, final BlockPos fu4, final boolean boolean5) {
+            this.getBlock().neighborChanged(this.asState(), bqb, fu2, bvr, fu4, boolean5);
+        }
+        
+        public final void updateNeighbourShapes(final LevelAccessor bqc, final BlockPos fu, final int integer) {
+            this.updateNeighbourShapes(bqc, fu, integer, 512);
+        }
+        
+        public final void updateNeighbourShapes(final LevelAccessor bqc, final BlockPos fu, final int integer3, final int integer4) {
+            this.getBlock();
+            final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
+            for (final Direction fz10 : BlockBehaviour.UPDATE_SHAPE_ORDER) {
+                a6.setWithOffset(fu, fz10);
+                final BlockState cfj11 = bqc.getBlockState(a6);
+                final BlockState cfj12 = cfj11.updateShape(fz10.getOpposite(), this.asState(), bqc, a6, fu);
+                Block.updateOrDestroy(cfj11, cfj12, bqc, a6, integer3, integer4);
+            }
+        }
+        
+        public final void updateIndirectNeighbourShapes(final LevelAccessor bqc, final BlockPos fu, final int integer) {
+            this.updateIndirectNeighbourShapes(bqc, fu, integer, 512);
+        }
+        
+        public void updateIndirectNeighbourShapes(final LevelAccessor bqc, final BlockPos fu, final int integer3, final int integer4) {
+            this.getBlock().updateIndirectNeighbourShapes(this.asState(), bqc, fu, integer3, integer4);
+        }
+        
+        public void onPlace(final Level bqb, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+            this.getBlock().onPlace(this.asState(), bqb, fu, cfj, boolean4);
+        }
+        
+        public void onRemove(final Level bqb, final BlockPos fu, final BlockState cfj, final boolean boolean4) {
+            this.getBlock().onRemove(this.asState(), bqb, fu, cfj, boolean4);
+        }
+        
+        public void tick(final ServerLevel zd, final BlockPos fu, final Random random) {
+            this.getBlock().tick(this.asState(), zd, fu, random);
+        }
+        
+        public void randomTick(final ServerLevel zd, final BlockPos fu, final Random random) {
+            this.getBlock().randomTick(this.asState(), zd, fu, random);
+        }
+        
+        public void entityInside(final Level bqb, final BlockPos fu, final Entity aom) {
+            this.getBlock().entityInside(this.asState(), bqb, fu, aom);
+        }
+        
+        public void spawnAfterBreak(final Level bqb, final BlockPos fu, final ItemStack bki) {
+            this.getBlock().spawnAfterBreak(this.asState(), bqb, fu, bki);
+        }
+        
+        public List<ItemStack> getDrops(final LootContext.Builder a) {
+            return this.getBlock().getDrops(this.asState(), a);
+        }
+        
+        public InteractionResult use(final Level bqb, final Player bec, final InteractionHand anf, final BlockHitResult deh) {
+            return this.getBlock().use(this.asState(), bqb, deh.getBlockPos(), bec, anf, deh);
+        }
+        
+        public void attack(final Level bqb, final BlockPos fu, final Player bec) {
+            this.getBlock().attack(this.asState(), bqb, fu, bec);
+        }
+        
+        public boolean isSuffocating(final BlockGetter bpg, final BlockPos fu) {
+            return this.isSuffocating.test(this.asState(), bpg, fu);
+        }
+        
+        public boolean isViewBlocking(final BlockGetter bpg, final BlockPos fu) {
+            return this.isViewBlocking.test(this.asState(), bpg, fu);
+        }
+        
+        public BlockState updateShape(final Direction fz, final BlockState cfj, final LevelAccessor bqc, final BlockPos fu4, final BlockPos fu5) {
+            return this.getBlock().updateShape(this.asState(), fz, cfj, bqc, fu4, fu5);
+        }
+        
+        public boolean isPathfindable(final BlockGetter bpg, final BlockPos fu, final PathComputationType czg) {
+            return this.getBlock().isPathfindable(this.asState(), bpg, fu, czg);
+        }
+        
+        public boolean canBeReplaced(final BlockPlaceContext bin) {
+            return this.getBlock().canBeReplaced(this.asState(), bin);
+        }
+        
+        public boolean canBeReplaced(final Fluid cwz) {
+            return this.getBlock().canBeReplaced(this.asState(), cwz);
+        }
+        
+        public boolean canSurvive(final LevelReader bqd, final BlockPos fu) {
+            return this.getBlock().canSurvive(this.asState(), bqd, fu);
+        }
+        
+        public boolean hasPostProcess(final BlockGetter bpg, final BlockPos fu) {
+            return this.hasPostProcess.test(this.asState(), bpg, fu);
+        }
+        
+        @Nullable
+        public MenuProvider getMenuProvider(final Level bqb, final BlockPos fu) {
+            return this.getBlock().getMenuProvider(this.asState(), bqb, fu);
+        }
+        
+        public boolean is(final Tag<Block> adf) {
+            return this.getBlock().is(adf);
+        }
+        
+        public boolean is(final Tag<Block> adf, final Predicate<BlockStateBase> predicate) {
+            return this.getBlock().is(adf) && predicate.test(this);
+        }
+        
+        public boolean is(final Block bvr) {
+            return this.getBlock().is(bvr);
+        }
+        
+        public FluidState getFluidState() {
+            return this.getBlock().getFluidState(this.asState());
+        }
+        
+        public boolean isRandomlyTicking() {
+            return this.getBlock().isRandomlyTicking(this.asState());
+        }
+        
+        public long getSeed(final BlockPos fu) {
+            return this.getBlock().getSeed(this.asState(), fu);
+        }
+        
+        public SoundType getSoundType() {
+            return this.getBlock().getSoundType(this.asState());
+        }
+        
+        public void onProjectileHit(final Level bqb, final BlockState cfj, final BlockHitResult deh, final Projectile bes) {
+            this.getBlock().onProjectileHit(bqb, cfj, deh, bes);
+        }
+        
+        public boolean isFaceSturdy(final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+            if (this.cache != null) {
+                return this.cache.isFaceSturdy[fz.ordinal()];
+            }
+            return Block.isFaceSturdy(this.asState(), bpg, fu, fz);
+        }
+        
+        public boolean isCollisionShapeFullBlock(final BlockGetter bpg, final BlockPos fu) {
+            if (this.cache != null) {
+                return this.cache.isCollisionShapeFullBlock;
+            }
+            return Block.isShapeFullBlock(this.getCollisionShape(bpg, fu));
+        }
+        
+        protected abstract BlockState asState();
+        
+        public boolean requiresCorrectToolForDrops() {
+            return this.requiresCorrectToolForDrops;
+        }
+        
+        static final class Cache {
+            private static final Direction[] DIRECTIONS;
+            protected final boolean solidRender;
+            private final boolean propagatesSkylightDown;
+            private final int lightBlock;
+            @Nullable
+            private final VoxelShape[] occlusionShapes;
+            protected final VoxelShape collisionShape;
+            protected final boolean largeCollisionShape;
+            protected final boolean[] isFaceSturdy;
+            protected final boolean isCollisionShapeFullBlock;
+            
+            private Cache(final BlockState cfj) {
+                final Block bvr3 = cfj.getBlock();
+                this.solidRender = cfj.isSolidRender(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
+                this.propagatesSkylightDown = bvr3.propagatesSkylightDown(cfj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
+                this.lightBlock = bvr3.getLightBlock(cfj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
+                if (!cfj.canOcclude()) {
+                    this.occlusionShapes = null;
+                }
+                else {
+                    this.occlusionShapes = new VoxelShape[Cache.DIRECTIONS.length];
+                    final VoxelShape dfg4 = bvr3.getOcclusionShape(cfj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
+                    for (final Direction fz8 : Cache.DIRECTIONS) {
+                        this.occlusionShapes[fz8.ordinal()] = Shapes.getFaceShape(dfg4, fz8);
+                    }
+                }
+                this.collisionShape = bvr3.getCollisionShape(cfj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
+                this.largeCollisionShape = Arrays.<Direction.Axis>stream(Direction.Axis.values()).anyMatch(a -> this.collisionShape.min(a) < 0.0 || this.collisionShape.max(a) > 1.0);
+                this.isFaceSturdy = new boolean[6];
+                for (final Direction fz9 : Cache.DIRECTIONS) {
+                    this.isFaceSturdy[fz9.ordinal()] = Block.isFaceSturdy(cfj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO, fz9);
+                }
+                this.isCollisionShapeFullBlock = Block.isShapeFullBlock(cfj.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
+            }
+            
+            static {
+                DIRECTIONS = Direction.values();
+            }
+        }
+    }
+    
+    public interface StateArgumentPredicate<A> {
+        boolean test(final BlockState cfj, final BlockGetter bpg, final BlockPos fu, final A object);
+    }
+    
+    public interface StatePredicate {
+        boolean test(final BlockState cfj, final BlockGetter bpg, final BlockPos fu);
+    }
+}
diff --git a/src/net/minecraft/world/level/block/state/BlockState.java b/src/net/minecraft/world/level/block/state/BlockState.java
index 011a11c..c42fba9 100644
--- a/src/net/minecraft/world/level/block/state/BlockState.java
+++ b/src/net/minecraft/world/level/block/state/BlockState.java
@@ -1,429 +1,25 @@
 package net.minecraft.world.level.block.state;
 
-import java.util.Arrays;
-import net.minecraft.world.level.EmptyBlockGetter;
-import java.util.Iterator;
-import net.minecraft.resources.ResourceLocation;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import com.mojang.datafixers.util.Pair;
-import java.util.Map;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.tags.Tag;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraft.world.item.BlockPlaceContext;
-import net.minecraft.world.level.pathfinder.PathComputationType;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.InteractionHand;
-import java.util.List;
-import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.world.item.ItemStack;
-import java.util.Random;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.level.material.PushReaction;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.RenderShape;
-import net.minecraft.world.level.block.Mirror;
-import net.minecraft.world.level.block.Rotation;
-import net.minecraft.world.level.material.MaterialColor;
-import net.minecraft.world.phys.shapes.Shapes;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraft.core.Direction;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.material.Material;
+import com.mojang.serialization.MapCodec;
 import net.minecraft.world.level.block.state.properties.Property;
 import com.google.common.collect.ImmutableMap;
-import javax.annotation.Nullable;
 import net.minecraft.world.level.block.Block;
+import com.mojang.serialization.Codec;
 
-public class BlockState extends AbstractStateHolder<Block, BlockState> implements StateHolder<BlockState> {
-    @Nullable
-    private Cache cache;
-    private final int lightEmission;
-    private final boolean useShapeForLightOcclusion;
+public class BlockState extends BlockBehaviour.BlockStateBase {
+    public static final Codec<BlockState> CODEC;
     
-    public BlockState(final Block bph, final ImmutableMap<Property<?>, Comparable<?>> immutableMap) {
-        super(bph, immutableMap);
-        this.lightEmission = bph.getLightEmission(this);
-        this.useShapeForLightOcclusion = bph.useShapeForLightOcclusion(this);
+    public BlockState(final Block bvr, final ImmutableMap<Property<?>, Comparable<?>> immutableMap, final MapCodec<BlockState> mapCodec) {
+        super(bvr, immutableMap, mapCodec);
     }
     
-    public void initCache() {
-        if (!this.getBlock().hasDynamicShape()) {
-            this.cache = new Cache(this);
-        }
+    @Override
+    protected BlockState asState() {
+        return this;
     }
     
-    public Block getBlock() {
-        return (Block)this.owner;
-    }
-    
-    public Material getMaterial() {
-        return this.getBlock().getMaterial(this);
-    }
-    
-    public boolean isValidSpawn(final BlockGetter bjg, final BlockPos fk, final EntityType<?> aku) {
-        return this.getBlock().isValidSpawn(this, bjg, fk, aku);
-    }
-    
-    public boolean propagatesSkylightDown(final BlockGetter bjg, final BlockPos fk) {
-        if (this.cache != null) {
-            return this.cache.propagatesSkylightDown;
-        }
-        return this.getBlock().propagatesSkylightDown(this, bjg, fk);
-    }
-    
-    public int getLightBlock(final BlockGetter bjg, final BlockPos fk) {
-        if (this.cache != null) {
-            return this.cache.lightBlock;
-        }
-        return this.getBlock().getLightBlock(this, bjg, fk);
-    }
-    
-    public VoxelShape getFaceOcclusionShape(final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (this.cache != null && this.cache.occlusionShapes != null) {
-            return this.cache.occlusionShapes[fp.ordinal()];
-        }
-        return Shapes.getFaceShape(this.getOcclusionShape(bjg, fk), fp);
-    }
-    
-    public boolean hasLargeCollisionShape() {
-        return this.cache == null || this.cache.largeCollisionShape;
-    }
-    
-    public boolean useShapeForLightOcclusion() {
-        return this.useShapeForLightOcclusion;
-    }
-    
-    public int getLightEmission() {
-        return this.lightEmission;
-    }
-    
-    public boolean isAir() {
-        return this.getBlock().isAir(this);
-    }
-    
-    public MaterialColor getMapColor(final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().getMapColor(this, bjg, fk);
-    }
-    
-    public BlockState rotate(final Rotation btu) {
-        return this.getBlock().rotate(this, btu);
-    }
-    
-    public BlockState mirror(final Mirror bsu) {
-        return this.getBlock().mirror(this, bsu);
-    }
-    
-    public RenderShape getRenderShape() {
-        return this.getBlock().getRenderShape(this);
-    }
-    
-    public boolean emissiveRendering() {
-        return this.getBlock().emissiveRendering(this);
-    }
-    
-    public float getShadeBrightness(final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().getShadeBrightness(this, bjg, fk);
-    }
-    
-    public boolean isRedstoneConductor(final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().isRedstoneConductor(this, bjg, fk);
-    }
-    
-    public boolean isSignalSource() {
-        return this.getBlock().isSignalSource(this);
-    }
-    
-    public int getSignal(final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return this.getBlock().getSignal(this, bjg, fk, fp);
-    }
-    
-    public boolean hasAnalogOutputSignal() {
-        return this.getBlock().hasAnalogOutputSignal(this);
-    }
-    
-    public int getAnalogOutputSignal(final Level bjw, final BlockPos fk) {
-        return this.getBlock().getAnalogOutputSignal(this, bjw, fk);
-    }
-    
-    public float getDestroySpeed(final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().getDestroySpeed(this, bjg, fk);
-    }
-    
-    public float getDestroyProgress(final Player ayj, final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().getDestroyProgress(this, ayj, bjg, fk);
-    }
-    
-    public int getDirectSignal(final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        return this.getBlock().getDirectSignal(this, bjg, fk, fp);
-    }
-    
-    public PushReaction getPistonPushReaction() {
-        return this.getBlock().getPistonPushReaction(this);
-    }
-    
-    public boolean isSolidRender(final BlockGetter bjg, final BlockPos fk) {
-        if (this.cache != null) {
-            return this.cache.solidRender;
-        }
-        return this.getBlock().isSolidRender(this, bjg, fk);
-    }
-    
-    public boolean canOcclude() {
-        if (this.cache != null) {
-            return this.cache.canOcclude;
-        }
-        return this.getBlock().canOcclude(this);
-    }
-    
-    public boolean skipRendering(final BlockState byj, final Direction fp) {
-        return this.getBlock().skipRendering(this, byj, fp);
-    }
-    
-    public VoxelShape getShape(final BlockGetter bjg, final BlockPos fk) {
-        return this.getShape(bjg, fk, CollisionContext.empty());
-    }
-    
-    public VoxelShape getShape(final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return this.getBlock().getShape(this, bjg, fk, cvq);
-    }
-    
-    public VoxelShape getCollisionShape(final BlockGetter bjg, final BlockPos fk) {
-        if (this.cache != null) {
-            return this.cache.collisionShape;
-        }
-        return this.getCollisionShape(bjg, fk, CollisionContext.empty());
-    }
-    
-    public VoxelShape getCollisionShape(final BlockGetter bjg, final BlockPos fk, final CollisionContext cvq) {
-        return this.getBlock().getCollisionShape(this, bjg, fk, cvq);
-    }
-    
-    public VoxelShape getOcclusionShape(final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().getOcclusionShape(this, bjg, fk);
-    }
-    
-    public VoxelShape getInteractionShape(final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().getInteractionShape(this, bjg, fk);
-    }
-    
-    public final boolean entityCanStandOn(final BlockGetter bjg, final BlockPos fk, final Entity akq) {
-        return Block.isFaceFull(this.getCollisionShape(bjg, fk, CollisionContext.of(akq)), Direction.UP);
-    }
-    
-    public Vec3 getOffset(final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().getOffset(this, bjg, fk);
-    }
-    
-    public boolean triggerEvent(final Level bjw, final BlockPos fk, final int integer3, final int integer4) {
-        return this.getBlock().triggerEvent(this, bjw, fk, integer3, integer4);
-    }
-    
-    public void neighborChanged(final Level bjw, final BlockPos fk2, final Block bph, final BlockPos fk4, final boolean boolean5) {
-        this.getBlock().neighborChanged(this, bjw, fk2, bph, fk4, boolean5);
-    }
-    
-    public void updateNeighbourShapes(final LevelAccessor bjx, final BlockPos fk, final int integer) {
-        this.getBlock().updateNeighbourShapes(this, bjx, fk, integer);
-    }
-    
-    public void updateIndirectNeighbourShapes(final LevelAccessor bjx, final BlockPos fk, final int integer) {
-        this.getBlock().updateIndirectNeighbourShapes(this, bjx, fk, integer);
-    }
-    
-    public void onPlace(final Level bjw, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        this.getBlock().onPlace(this, bjw, fk, byj, boolean4);
-    }
-    
-    public void onRemove(final Level bjw, final BlockPos fk, final BlockState byj, final boolean boolean4) {
-        this.getBlock().onRemove(this, bjw, fk, byj, boolean4);
-    }
-    
-    public void tick(final ServerLevel xd, final BlockPos fk, final Random random) {
-        this.getBlock().tick(this, xd, fk, random);
-    }
-    
-    public void randomTick(final ServerLevel xd, final BlockPos fk, final Random random) {
-        this.getBlock().randomTick(this, xd, fk, random);
-    }
-    
-    public void entityInside(final Level bjw, final BlockPos fk, final Entity akq) {
-        this.getBlock().entityInside(this, bjw, fk, akq);
-    }
-    
-    public void spawnAfterBreak(final Level bjw, final BlockPos fk, final ItemStack ben) {
-        this.getBlock().spawnAfterBreak(this, bjw, fk, ben);
-    }
-    
-    public List<ItemStack> getDrops(final LootContext.Builder a) {
-        return this.getBlock().getDrops(this, a);
-    }
-    
-    public InteractionResult use(final Level bjw, final Player ayj, final InteractionHand ajk, final BlockHitResult cvg) {
-        return this.getBlock().use(this, bjw, cvg.getBlockPos(), ayj, ajk, cvg);
-    }
-    
-    public void attack(final Level bjw, final BlockPos fk, final Player ayj) {
-        this.getBlock().attack(this, bjw, fk, ayj);
-    }
-    
-    public boolean isSuffocating(final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().isSuffocating(this, bjg, fk);
-    }
-    
-    public boolean isViewBlocking(final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().isViewBlocking(this, bjg, fk);
-    }
-    
-    public BlockState updateShape(final Direction fp, final BlockState byj, final LevelAccessor bjx, final BlockPos fk4, final BlockPos fk5) {
-        return this.getBlock().updateShape(this, fp, byj, bjx, fk4, fk5);
-    }
-    
-    public boolean isPathfindable(final BlockGetter bjg, final BlockPos fk, final PathComputationType cqr) {
-        return this.getBlock().isPathfindable(this, bjg, fk, cqr);
-    }
-    
-    public boolean canBeReplaced(final BlockPlaceContext bcq) {
-        return this.getBlock().canBeReplaced(this, bcq);
-    }
-    
-    public boolean canBeReplaced(final Fluid coi) {
-        return this.getBlock().canBeReplaced(this, coi);
-    }
-    
-    public boolean canSurvive(final LevelReader bjz, final BlockPos fk) {
-        return this.getBlock().canSurvive(this, bjz, fk);
-    }
-    
-    public boolean hasPostProcess(final BlockGetter bjg, final BlockPos fk) {
-        return this.getBlock().hasPostProcess(this, bjg, fk);
-    }
-    
-    @Nullable
-    public MenuProvider getMenuProvider(final Level bjw, final BlockPos fk) {
-        return this.getBlock().getMenuProvider(this, bjw, fk);
-    }
-    
-    public boolean is(final Tag<Block> aaz) {
-        return this.getBlock().is(aaz);
-    }
-    
-    public FluidState getFluidState() {
-        return this.getBlock().getFluidState(this);
-    }
-    
-    public boolean isRandomlyTicking() {
-        return this.getBlock().isRandomlyTicking(this);
-    }
-    
-    public long getSeed(final BlockPos fk) {
-        return this.getBlock().getSeed(this, fk);
-    }
-    
-    public SoundType getSoundType() {
-        return this.getBlock().getSoundType(this);
-    }
-    
-    public void onProjectileHit(final Level bjw, final BlockState byj, final BlockHitResult cvg, final Entity akq) {
-        this.getBlock().onProjectileHit(bjw, byj, cvg, akq);
-    }
-    
-    public boolean isFaceSturdy(final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        if (this.cache != null) {
-            return this.cache.isFaceSturdy[fp.ordinal()];
-        }
-        return Block.isFaceSturdy(this, bjg, fk, fp);
-    }
-    
-    public boolean isCollisionShapeFullBlock(final BlockGetter bjg, final BlockPos fk) {
-        if (this.cache != null) {
-            return this.cache.isCollisionShapeFullBlock;
-        }
-        return Block.isShapeFullBlock(this.getCollisionShape(bjg, fk));
-    }
-    
-    public static <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps, final BlockState byj) {
-        final ImmutableMap<Property<?>, Comparable<?>> immutableMap3 = byj.getValues();
-        T object4;
-        if (immutableMap3.isEmpty()) {
-            object4 = (T)dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("Name"), dynamicOps.createString(Registry.BLOCK.getKey(byj.getBlock()).toString())));
-        }
-        else {
-            object4 = (T)dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("Name"), dynamicOps.createString(Registry.BLOCK.getKey(byj.getBlock()).toString()), dynamicOps.createString("Properties"), dynamicOps.createMap((Map)immutableMap3.entrySet().stream().map(entry -> Pair.of(dynamicOps.createString(entry.getKey().getName()), dynamicOps.createString(StateHolder.<Comparable>getName((Property<Comparable>)entry.getKey(), entry.getValue())))).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)))));
-        }
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, object4);
-    }
-    
-    public static <T> BlockState deserialize(final Dynamic<T> dynamic) {
-        final Block bph2 = Registry.BLOCK.get(new ResourceLocation(dynamic.getElement("Name").<String>flatMap(dynamic.getOps()::getStringValue).orElse("minecraft:air")));
-        final Map<String, String> map3 = (Map<String, String>)dynamic.get("Properties").asMap(dynamic -> dynamic.asString(""), dynamic -> dynamic.asString(""));
-        BlockState byj4 = bph2.defaultBlockState();
-        final StateDefinition<Block, BlockState> byk5 = bph2.getStateDefinition();
-        for (final Map.Entry<String, String> entry7 : map3.entrySet()) {
-            final String string8 = entry7.getKey();
-            final Property<?> bzm9 = byk5.getProperty(string8);
-            if (bzm9 != null) {
-                byj4 = StateHolder.setValueHelper(byj4, bzm9, string8, dynamic.toString(), entry7.getValue());
-            }
-        }
-        return byj4;
-    }
-    
-    static final class Cache {
-        private static final Direction[] DIRECTIONS;
-        private final boolean canOcclude;
-        private final boolean solidRender;
-        private final boolean propagatesSkylightDown;
-        private final int lightBlock;
-        private final VoxelShape[] occlusionShapes;
-        private final VoxelShape collisionShape;
-        private final boolean largeCollisionShape;
-        private final boolean[] isFaceSturdy;
-        private final boolean isCollisionShapeFullBlock;
-        
-        private Cache(final BlockState byj) {
-            final Block bph3 = byj.getBlock();
-            this.canOcclude = bph3.canOcclude(byj);
-            this.solidRender = bph3.isSolidRender(byj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-            this.propagatesSkylightDown = bph3.propagatesSkylightDown(byj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-            this.lightBlock = bph3.getLightBlock(byj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-            if (!byj.canOcclude()) {
-                this.occlusionShapes = null;
-            }
-            else {
-                this.occlusionShapes = new VoxelShape[Cache.DIRECTIONS.length];
-                final VoxelShape cwf4 = bph3.getOcclusionShape(byj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-                for (final Direction fp8 : Cache.DIRECTIONS) {
-                    this.occlusionShapes[fp8.ordinal()] = Shapes.getFaceShape(cwf4, fp8);
-                }
-            }
-            this.collisionShape = bph3.getCollisionShape(byj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
-            this.largeCollisionShape = Arrays.<Direction.Axis>stream(Direction.Axis.values()).anyMatch(a -> this.collisionShape.min(a) < 0.0 || this.collisionShape.max(a) > 1.0);
-            this.isFaceSturdy = new boolean[6];
-            for (final Direction fp9 : Cache.DIRECTIONS) {
-                this.isFaceSturdy[fp9.ordinal()] = Block.isFaceSturdy(byj, EmptyBlockGetter.INSTANCE, BlockPos.ZERO, fp9);
-            }
-            this.isCollisionShapeFullBlock = Block.isShapeFullBlock(byj.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
-        }
-        
-        static {
-            DIRECTIONS = Direction.values();
-        }
+    static {
+        CODEC = StateHolder.<Object, BlockState>codec((com.mojang.serialization.Codec<Object>)Registry.BLOCK, Block::defaultBlockState).stable();
     }
 }
diff --git a/src/net/minecraft/world/level/block/state/StateDefinition.java b/src/net/minecraft/world/level/block/state/StateDefinition.java
index e82ae7d..fd0150b 100644
--- a/src/net/minecraft/world/level/block/state/StateDefinition.java
+++ b/src/net/minecraft/world/level/block/state/StateDefinition.java
@@ -4,59 +4,78 @@ import java.util.ArrayList;
 import javax.annotation.Nullable;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
-import java.util.function.Function;
 import com.google.common.base.MoreObjects;
-import java.util.Collection;
+import com.mojang.serialization.Codec;
+import net.minecraft.util.Codecs;
 import java.util.Iterator;
 import com.google.common.collect.UnmodifiableIterator;
+import java.util.Collection;
 import com.google.common.collect.ImmutableMap;
-import net.minecraft.core.MapFiller;
 import java.util.List;
 import java.util.stream.Stream;
+import com.mojang.datafixers.util.Pair;
 import java.util.Collections;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.mojang.serialization.MapCodec;
+import java.util.function.Supplier;
+import com.mojang.serialization.Decoder;
+import com.mojang.serialization.Encoder;
 import java.util.Map;
+import java.util.function.Function;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.world.level.block.state.properties.Property;
 import com.google.common.collect.ImmutableSortedMap;
 import java.util.regex.Pattern;
 
-public class StateDefinition<O, S extends StateHolder<S>> {
+public class StateDefinition<O, S extends StateHolder<O, S>> {
     private static final Pattern NAME_PATTERN;
     private final O owner;
     private final ImmutableSortedMap<String, Property<?>> propertiesByName;
     private final ImmutableList<S> states;
     
-    protected <A extends AbstractStateHolder<O, S>> StateDefinition(final O object, final Factory<O, S, A> b, final Map<String, Property<?>> map) {
+    protected StateDefinition(final Function<O, S> function, final O object, final Factory<O, S> b, final Map<String, Property<?>> map) {
         this.owner = object;
         this.propertiesByName = ImmutableSortedMap.<String, Property<?>>copyOf(map);
-        final Map<Map<Property<?>, Comparable<?>>, A> map2 = Maps.newLinkedHashMap();
-        final List<A> list6 = Lists.newArrayList();
-        Stream<List<Comparable<?>>> stream7 = Stream.<List<Comparable<?>>>of(Collections.<Comparable<?>>emptyList());
-        for (final Property<?> bzm9 : this.propertiesByName.values()) {
-            final List<Comparable<?>> list7;
-            stream7 = stream7.<List<Comparable<?>>>flatMap(list -> bzm9.getPossibleValues().stream().map(comparable -> {
-                list7 = Lists.newArrayList(list);
-                list7.add(comparable);
-                return list7;
+        final Supplier<S> supplier6 = () -> function.apply(object);
+        MapCodec<S> mapCodec7 = (MapCodec<S>)MapCodec.of(Encoder.empty(), Decoder.unit((Supplier)supplier6));
+        for (final Map.Entry<String, Property<?>> entry9 : this.propertiesByName.entrySet()) {
+            mapCodec7 = StateDefinition.appendPropertyCodec(mapCodec7, supplier6, entry9.getKey(), entry9.getValue());
+        }
+        final MapCodec<S> mapCodec8 = mapCodec7;
+        final Map<Map<Property<?>, Comparable<?>>, S> map2 = Maps.newLinkedHashMap();
+        final List<S> list7 = Lists.newArrayList();
+        Stream<List<Pair<Property<?>, Comparable<?>>>> stream11 = Stream.<List<Pair<Property<?>, Comparable<?>>>>of(Collections.<Pair<Property<?>, Comparable<?>>>emptyList());
+        for (final Property<?> cgl13 : this.propertiesByName.values()) {
+            final Property property;
+            final List<Pair<Property<?>, Comparable<?>>> list8;
+            final Object o;
+            stream11 = stream11.<List<Pair<Property<?>, Comparable<?>>>>flatMap(list -> property.getPossibleValues().stream().map(comparable -> {
+                list8 = Lists.newArrayList(list);
+                list8.add((Pair<Property<?>, Comparable<?>>)Pair.of(o, comparable));
+                return list8;
             }));
         }
-        final Map<Property<?>, Comparable<?>> map3;
-        final AbstractStateHolder byi8;
-        final Map<Map<Property<?>, Comparable<?>>, AbstractStateHolder> map4;
-        final List<AbstractStateHolder> list8;
-        stream7.forEach(list5 -> {
-            map3 = MapFiller.<Property<?>, Comparable<?>>linkedHashMapFrom(this.propertiesByName.values(), list5);
-            byi8 = b.create(object, ImmutableMap.<Property<?>, Comparable<?>>copyOf(map3));
-            map4.put(map3, byi8);
-            list8.add(byi8);
+        final ImmutableMap<Property<?>, Comparable<?>> immutableMap7;
+        final com.mojang.serialization.MapCodec<S> mapCodec9;
+        final S cfl8;
+        final Map<ImmutableMap<Property<?>, Comparable<?>>, S> map3;
+        final List<S> list9;
+        stream11.forEach(list6 -> {
+            immutableMap7 = list6.stream().collect(ImmutableMap.toImmutableMap(Pair::getFirst, Pair::getSecond));
+            cfl8 = b.create(object, immutableMap7, mapCodec9);
+            map3.put(immutableMap7, cfl8);
+            list9.add(cfl8);
             return;
         });
-        for (final A byi9 : list6) {
-            ((AbstractStateHolder<O, S>)byi9).populateNeighbours((Map<Map<Property<?>, Comparable<?>>, S>)map2);
+        for (final S cfl9 : list7) {
+            ((StateHolder<O, S>)cfl9).populateNeighbours(map2);
         }
-        this.states = ImmutableList.<S>copyOf(list6);
+        this.states = ImmutableList.<S>copyOf(list7);
+    }
+    
+    private static <S extends StateHolder<?, S>, T extends Comparable<T>> MapCodec<S> appendPropertyCodec(final MapCodec<S> mapCodec, final Supplier<S> supplier, final String string, final Property<T> cgl) {
+        return (MapCodec<S>)Codec.mapPair((MapCodec)mapCodec, (MapCodec)Codecs.<Property.Value<T>>setPartial((com.mojang.serialization.MapCodec<Property.Value<T>>)cgl.valueCodec().fieldOf(string), () -> cgl.value(supplier.get()))).xmap(pair -> ((StateHolder)pair.getFirst()).<T, Comparable>setValue(cgl, ((Property.Value)pair.getSecond()).value()), cfl -> Pair.of(cfl, cgl.value(cfl)));
     }
     
     public ImmutableList<S> getPossibleStates() {
@@ -89,7 +108,7 @@ public class StateDefinition<O, S extends StateHolder<S>> {
         NAME_PATTERN = Pattern.compile("^[a-z0-9_]+$");
     }
     
-    public static class Builder<O, S extends StateHolder<S>> {
+    public static class Builder<O, S extends StateHolder<O, S>> {
         private final O owner;
         private final Map<String, Property<?>> properties;
         
@@ -99,24 +118,24 @@ public class StateDefinition<O, S extends StateHolder<S>> {
         }
         
         public Builder<O, S> add(final Property<?>... arr) {
-            for (final Property<?> bzm6 : arr) {
-                this.validateProperty(bzm6);
-                this.properties.put(bzm6.getName(), bzm6);
+            for (final Property<?> cgl6 : arr) {
+                this.validateProperty(cgl6);
+                this.properties.put(cgl6.getName(), cgl6);
             }
             return this;
         }
         
-        private <T extends Comparable<T>> void validateProperty(final Property<T> bzm) {
-            final String string3 = bzm.getName();
+        private <T extends Comparable<T>> void validateProperty(final Property<T> cgl) {
+            final String string3 = cgl.getName();
             if (!StateDefinition.NAME_PATTERN.matcher(string3).matches()) {
                 throw new IllegalArgumentException(this.owner + " has invalidly named property: " + string3);
             }
-            final Collection<T> collection4 = bzm.getPossibleValues();
+            final Collection<T> collection4 = cgl.getPossibleValues();
             if (collection4.size() <= 1) {
                 throw new IllegalArgumentException(this.owner + " attempted use property " + string3 + " with <= 1 possible values");
             }
             for (final T comparable6 : collection4) {
-                final String string4 = bzm.getName(comparable6);
+                final String string4 = cgl.getName(comparable6);
                 if (!StateDefinition.NAME_PATTERN.matcher(string4).matches()) {
                     throw new IllegalArgumentException(this.owner + " has property: " + string3 + " with invalidly named value: " + string4);
                 }
@@ -126,12 +145,12 @@ public class StateDefinition<O, S extends StateHolder<S>> {
             }
         }
         
-        public <A extends AbstractStateHolder<O, S>> StateDefinition<O, S> create(final Factory<O, S, A> b) {
-            return new StateDefinition<O, S>(this.owner, (Factory<O, S, A>)b, this.properties);
+        public StateDefinition<O, S> create(final Function<O, S> function, final Factory<O, S> b) {
+            return new StateDefinition<O, S>(function, this.owner, b, this.properties);
         }
     }
     
-    public interface Factory<O, S extends StateHolder<S>, A extends AbstractStateHolder<O, S>> {
-        A create(final O object, final ImmutableMap<Property<?>, Comparable<?>> immutableMap);
+    public interface Factory<O, S> {
+        S create(final O object, final ImmutableMap<Property<?>, Comparable<?>> immutableMap, final MapCodec<S> mapCodec);
     }
 }
diff --git a/src/net/minecraft/world/level/block/state/StateHolder.java b/src/net/minecraft/world/level/block/state/StateHolder.java
index a77e5eb..e6813ff 100644
--- a/src/net/minecraft/world/level/block/state/StateHolder.java
+++ b/src/net/minecraft/world/level/block/state/StateHolder.java
@@ -1,30 +1,158 @@
 package net.minecraft.world.level.block.state;
 
-import org.apache.logging.log4j.LogManager;
+import javax.annotation.Nullable;
+import com.mojang.serialization.Codec;
+import com.google.common.collect.Maps;
+import com.google.common.collect.UnmodifiableIterator;
+import com.google.common.collect.ArrayTable;
+import com.google.common.collect.HashBasedTable;
 import java.util.Optional;
+import java.util.Collections;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.Iterator;
+import java.util.Collection;
+import com.mojang.serialization.MapCodec;
+import com.google.common.collect.Table;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.world.level.block.state.properties.Property;
-import org.apache.logging.log4j.Logger;
+import java.util.Map;
+import java.util.function.Function;
 
-public interface StateHolder<C> {
-    public static final Logger LOGGER = LogManager.getLogger();
+public abstract class StateHolder<O, S> {
+    private static final Function<Map.Entry<Property<?>, Comparable<?>>, String> PROPERTY_ENTRY_TO_STRING_FUNCTION;
+    protected final O owner;
+    private final ImmutableMap<Property<?>, Comparable<?>> values;
+    private Table<Property<?>, Comparable<?>, S> neighbours;
+    protected final MapCodec<S> propertiesCodec;
     
-     <T extends Comparable<T>> T getValue(final Property<T> bzm);
-    
-     <T extends Comparable<T>, V extends T> C setValue(final Property<T> bzm, final V comparable);
-    
-    ImmutableMap<Property<?>, Comparable<?>> getValues();
-    
-    default <T extends Comparable<T>> String getName(final Property<T> bzm, final Comparable<?> comparable) {
-        return bzm.getName((T)comparable);
+    protected StateHolder(final O object, final ImmutableMap<Property<?>, Comparable<?>> immutableMap, final MapCodec<S> mapCodec) {
+        this.owner = object;
+        this.values = immutableMap;
+        this.propertiesCodec = mapCodec;
     }
     
-    default <S extends StateHolder<S>, T extends Comparable<T>> S setValueHelper(final S byl, final Property<T> bzm, final String string3, final String string4, final String string5) {
-        final Optional<T> optional6 = bzm.getValue(string5);
-        if (optional6.isPresent()) {
-            return byl.<T, T>setValue(bzm, optional6.get());
+    public <T extends Comparable<T>> S cycle(final Property<T> cgl) {
+        return this.<T, Comparable>setValue(cgl, (Comparable)StateHolder.<V>findNextInCollection((Collection<V>)cgl.getPossibleValues(), (V)this.<T>getValue((Property<T>)cgl)));
+    }
+    
+    protected static <T> T findNextInCollection(final Collection<T> collection, final T object) {
+        final Iterator<T> iterator3 = collection.iterator();
+        while (iterator3.hasNext()) {
+            if (iterator3.next().equals(object)) {
+                if (iterator3.hasNext()) {
+                    return iterator3.next();
+                }
+                return collection.iterator().next();
+            }
         }
-        StateHolder.LOGGER.warn("Unable to read property: {} with value: {} for input: {}", string3, string5, string4);
-        return byl;
+        return iterator3.next();
+    }
+    
+    @Override
+    public String toString() {
+        final StringBuilder stringBuilder2 = new StringBuilder();
+        stringBuilder2.append(this.owner);
+        if (!this.getValues().isEmpty()) {
+            stringBuilder2.append('[');
+            stringBuilder2.append(this.getValues().entrySet().stream().map(StateHolder.PROPERTY_ENTRY_TO_STRING_FUNCTION).collect(Collectors.joining(",")));
+            stringBuilder2.append(']');
+        }
+        return stringBuilder2.toString();
+    }
+    
+    public Collection<Property<?>> getProperties() {
+        return Collections.<Property<?>>unmodifiableCollection(this.values.keySet());
+    }
+    
+    public <T extends Comparable<T>> boolean hasProperty(final Property<T> cgl) {
+        return this.values.containsKey(cgl);
+    }
+    
+    public <T extends Comparable<T>> T getValue(final Property<T> cgl) {
+        final Comparable<?> comparable3 = this.values.get(cgl);
+        if (comparable3 == null) {
+            throw new IllegalArgumentException("Cannot get property " + cgl + " as it does not exist in " + this.owner);
+        }
+        return cgl.getValueClass().cast(comparable3);
+    }
+    
+    public <T extends Comparable<T>> Optional<T> getOptionalValue(final Property<T> cgl) {
+        final Comparable<?> comparable3 = this.values.get(cgl);
+        if (comparable3 == null) {
+            return Optional.<T>empty();
+        }
+        return Optional.<T>of(cgl.getValueClass().cast(comparable3));
+    }
+    
+    public <T extends Comparable<T>, V extends T> S setValue(final Property<T> cgl, final V comparable) {
+        final Comparable<?> comparable2 = this.values.get(cgl);
+        if (comparable2 == null) {
+            throw new IllegalArgumentException("Cannot set property " + cgl + " as it does not exist in " + this.owner);
+        }
+        if (comparable2 == comparable) {
+            return (S)this;
+        }
+        final S object5 = this.neighbours.get(cgl, comparable);
+        if (object5 == null) {
+            throw new IllegalArgumentException("Cannot set property " + cgl + " to " + comparable + " on " + this.owner + ", it is not an allowed value");
+        }
+        return object5;
+    }
+    
+    public void populateNeighbours(final Map<Map<Property<?>, Comparable<?>>, S> map) {
+        if (this.neighbours != null) {
+            throw new IllegalStateException();
+        }
+        final Table<Property<?>, Comparable<?>, S> table3 = HashBasedTable.create();
+        for (final Map.Entry<Property<?>, Comparable<?>> entry5 : this.values.entrySet()) {
+            final Property<?> cgl6 = entry5.getKey();
+            for (final Comparable<?> comparable8 : cgl6.getPossibleValues()) {
+                if (comparable8 != entry5.getValue()) {
+                    table3.put(cgl6, comparable8, map.get(this.makeNeighbourValues(cgl6, comparable8)));
+                }
+            }
+        }
+        this.neighbours = (table3.isEmpty() ? table3 : ArrayTable.<Property<?>, Comparable<?>, S>create(table3));
+    }
+    
+    private Map<Property<?>, Comparable<?>> makeNeighbourValues(final Property<?> cgl, final Comparable<?> comparable) {
+        final Map<Property<?>, Comparable<?>> map4 = Maps.newHashMap(this.values);
+        map4.put(cgl, comparable);
+        return map4;
+    }
+    
+    public ImmutableMap<Property<?>, Comparable<?>> getValues() {
+        return this.values;
+    }
+    
+    protected static <O, S extends StateHolder<O, S>> Codec<S> codec(final Codec<O> codec, final Function<O, S> function) {
+        final S cfl2;
+        return (Codec<S>)codec.dispatch("Name", cfl -> cfl.owner, object -> {
+            cfl2 = (S)function.apply(object);
+            if (((StateHolder)cfl2).getValues().isEmpty()) {
+                return Codec.unit(cfl2);
+            }
+            else {
+                return ((StateHolder)cfl2).propertiesCodec.fieldOf("Properties").codec();
+            }
+        });
+    }
+    
+    static {
+        PROPERTY_ENTRY_TO_STRING_FUNCTION = new Function<Map.Entry<Property<?>, Comparable<?>>, String>() {
+            @Override
+            public String apply(@Nullable final Map.Entry<Property<?>, Comparable<?>> entry) {
+                if (entry == null) {
+                    return "<NULL>";
+                }
+                final Property<?> cgl3 = entry.getKey();
+                return cgl3.getName() + "=" + this.getName(cgl3, entry.getValue());
+            }
+            
+            private <T extends Comparable<T>> String getName(final Property<T> cgl, final Comparable<?> comparable) {
+                return cgl.getName((T)comparable);
+            }
+        };
     }
 }
diff --git a/src/net/minecraft/world/level/block/state/pattern/BlockInWorld.java b/src/net/minecraft/world/level/block/state/pattern/BlockInWorld.java
index 6d17719..ddbb8ee 100644
--- a/src/net/minecraft/world/level/block/state/pattern/BlockInWorld.java
+++ b/src/net/minecraft/world/level/block/state/pattern/BlockInWorld.java
@@ -15,9 +15,9 @@ public class BlockInWorld {
     private BlockEntity entity;
     private boolean cachedEntity;
     
-    public BlockInWorld(final LevelReader bjz, final BlockPos fk, final boolean boolean3) {
-        this.level = bjz;
-        this.pos = fk.immutable();
+    public BlockInWorld(final LevelReader bqd, final BlockPos fu, final boolean boolean3) {
+        this.level = bqd;
+        this.pos = fu.immutable();
         this.loadChunks = boolean3;
     }
     
@@ -46,6 +46,6 @@ public class BlockInWorld {
     }
     
     public static Predicate<BlockInWorld> hasState(final Predicate<BlockState> predicate) {
-        return byn -> byn != null && predicate.test(byn.getState());
+        return cfn -> cfn != null && predicate.test(cfn.getState());
     }
 }
diff --git a/src/net/minecraft/world/level/block/state/pattern/BlockPattern.java b/src/net/minecraft/world/level/block/state/pattern/BlockPattern.java
index f3ec88d..15dc618 100644
--- a/src/net/minecraft/world/level/block/state/pattern/BlockPattern.java
+++ b/src/net/minecraft/world/level/block/state/pattern/BlockPattern.java
@@ -50,29 +50,29 @@ public class BlockPattern {
     }
     
     @Nullable
-    private BlockPatternMatch matches(final BlockPos fk, final Direction fp2, final Direction fp3, final LoadingCache<BlockPos, BlockInWorld> loadingCache) {
+    private BlockPatternMatch matches(final BlockPos fu, final Direction fz2, final Direction fz3, final LoadingCache<BlockPos, BlockInWorld> loadingCache) {
         for (int integer6 = 0; integer6 < this.width; ++integer6) {
             for (int integer7 = 0; integer7 < this.height; ++integer7) {
                 for (int integer8 = 0; integer8 < this.depth; ++integer8) {
-                    if (!this.pattern[integer8][integer7][integer6].test(loadingCache.getUnchecked(translateAndRotate(fk, fp2, fp3, integer6, integer7, integer8)))) {
+                    if (!this.pattern[integer8][integer7][integer6].test(loadingCache.getUnchecked(translateAndRotate(fu, fz2, fz3, integer6, integer7, integer8)))) {
                         return null;
                     }
                 }
             }
         }
-        return new BlockPatternMatch(fk, fp2, fp3, loadingCache, this.width, this.height, this.depth);
+        return new BlockPatternMatch(fu, fz2, fz3, loadingCache, this.width, this.height, this.depth);
     }
     
     @Nullable
-    public BlockPatternMatch find(final LevelReader bjz, final BlockPos fk) {
-        final LoadingCache<BlockPos, BlockInWorld> loadingCache4 = createLevelCache(bjz, false);
+    public BlockPatternMatch find(final LevelReader bqd, final BlockPos fu) {
+        final LoadingCache<BlockPos, BlockInWorld> loadingCache4 = createLevelCache(bqd, false);
         final int integer5 = Math.max(Math.max(this.width, this.height), this.depth);
-        for (final BlockPos fk2 : BlockPos.betweenClosed(fk, fk.offset(integer5 - 1, integer5 - 1, integer5 - 1))) {
-            for (final Direction fp11 : Direction.values()) {
-                for (final Direction fp12 : Direction.values()) {
-                    if (fp12 != fp11) {
-                        if (fp12 != fp11.getOpposite()) {
-                            final BlockPatternMatch b16 = this.matches(fk2, fp11, fp12, loadingCache4);
+        for (final BlockPos fu2 : BlockPos.betweenClosed(fu, fu.offset(integer5 - 1, integer5 - 1, integer5 - 1))) {
+            for (final Direction fz11 : Direction.values()) {
+                for (final Direction fz12 : Direction.values()) {
+                    if (fz12 != fz11) {
+                        if (fz12 != fz11.getOpposite()) {
+                            final BlockPatternMatch b16 = this.matches(fu2, fz11, fz12, loadingCache4);
                             if (b16 != null) {
                                 return b16;
                             }
@@ -84,32 +84,32 @@ public class BlockPattern {
         return null;
     }
     
-    public static LoadingCache<BlockPos, BlockInWorld> createLevelCache(final LevelReader bjz, final boolean boolean2) {
-        return CacheBuilder.newBuilder().<BlockPos, BlockInWorld>build(new BlockCacheLoader(bjz, boolean2));
+    public static LoadingCache<BlockPos, BlockInWorld> createLevelCache(final LevelReader bqd, final boolean boolean2) {
+        return CacheBuilder.newBuilder().<BlockPos, BlockInWorld>build(new BlockCacheLoader(bqd, boolean2));
     }
     
-    protected static BlockPos translateAndRotate(final BlockPos fk, final Direction fp2, final Direction fp3, final int integer4, final int integer5, final int integer6) {
-        if (fp2 == fp3 || fp2 == fp3.getOpposite()) {
+    protected static BlockPos translateAndRotate(final BlockPos fu, final Direction fz2, final Direction fz3, final int integer4, final int integer5, final int integer6) {
+        if (fz2 == fz3 || fz2 == fz3.getOpposite()) {
             throw new IllegalArgumentException("Invalid forwards & up combination");
         }
-        final Vec3i gg7 = new Vec3i(fp2.getStepX(), fp2.getStepY(), fp2.getStepZ());
-        final Vec3i gg8 = new Vec3i(fp3.getStepX(), fp3.getStepY(), fp3.getStepZ());
-        final Vec3i gg9 = gg7.cross(gg8);
-        return fk.offset(gg8.getX() * -integer5 + gg9.getX() * integer4 + gg7.getX() * integer6, gg8.getY() * -integer5 + gg9.getY() * integer4 + gg7.getY() * integer6, gg8.getZ() * -integer5 + gg9.getZ() * integer4 + gg7.getZ() * integer6);
+        final Vec3i gr7 = new Vec3i(fz2.getStepX(), fz2.getStepY(), fz2.getStepZ());
+        final Vec3i gr8 = new Vec3i(fz3.getStepX(), fz3.getStepY(), fz3.getStepZ());
+        final Vec3i gr9 = gr7.cross(gr8);
+        return fu.offset(gr8.getX() * -integer5 + gr9.getX() * integer4 + gr7.getX() * integer6, gr8.getY() * -integer5 + gr9.getY() * integer4 + gr7.getY() * integer6, gr8.getZ() * -integer5 + gr9.getZ() * integer4 + gr7.getZ() * integer6);
     }
     
     static class BlockCacheLoader extends CacheLoader<BlockPos, BlockInWorld> {
         private final LevelReader level;
         private final boolean loadChunks;
         
-        public BlockCacheLoader(final LevelReader bjz, final boolean boolean2) {
-            this.level = bjz;
+        public BlockCacheLoader(final LevelReader bqd, final boolean boolean2) {
+            this.level = bqd;
             this.loadChunks = boolean2;
         }
         
         @Override
-        public BlockInWorld load(final BlockPos fk) throws Exception {
-            return new BlockInWorld(this.level, fk, this.loadChunks);
+        public BlockInWorld load(final BlockPos fu) throws Exception {
+            return new BlockInWorld(this.level, fu, this.loadChunks);
         }
     }
     
@@ -122,10 +122,10 @@ public class BlockPattern {
         private final int height;
         private final int depth;
         
-        public BlockPatternMatch(final BlockPos fk, final Direction fp2, final Direction fp3, final LoadingCache<BlockPos, BlockInWorld> loadingCache, final int integer5, final int integer6, final int integer7) {
-            this.frontTopLeft = fk;
-            this.forwards = fp2;
-            this.up = fp3;
+        public BlockPatternMatch(final BlockPos fu, final Direction fz2, final Direction fz3, final LoadingCache<BlockPos, BlockInWorld> loadingCache, final int integer5, final int integer6, final int integer7) {
+            this.frontTopLeft = fu;
+            this.forwards = fz2;
+            this.up = fz3;
             this.cache = loadingCache;
             this.width = integer5;
             this.height = integer6;
@@ -161,48 +161,48 @@ public class BlockPattern {
             return MoreObjects.toStringHelper(this).add("up", this.up).add("forwards", this.forwards).add("frontTopLeft", this.frontTopLeft).toString();
         }
         
-        public PortalInfo getPortalOutput(final Direction fp, final BlockPos fk, final double double3, final Vec3 cvl, final double double5) {
-            final Direction fp2 = this.getForwards();
-            final Direction fp3 = fp2.getClockWise();
+        public PortalInfo getPortalOutput(final Direction fz, final BlockPos fu, final double double3, final Vec3 dem, final double double5) {
+            final Direction fz2 = this.getForwards();
+            final Direction fz3 = fz2.getClockWise();
             final double double6 = this.getFrontTopLeft().getY() + 1 - double3 * this.getHeight();
             double double7;
             double double8;
-            if (fp3 == Direction.NORTH) {
-                double7 = fk.getX() + 0.5;
+            if (fz3 == Direction.NORTH) {
+                double7 = fu.getX() + 0.5;
                 double8 = this.getFrontTopLeft().getZ() + 1 - (1.0 - double5) * this.getWidth();
             }
-            else if (fp3 == Direction.SOUTH) {
-                double7 = fk.getX() + 0.5;
+            else if (fz3 == Direction.SOUTH) {
+                double7 = fu.getX() + 0.5;
                 double8 = this.getFrontTopLeft().getZ() + (1.0 - double5) * this.getWidth();
             }
-            else if (fp3 == Direction.WEST) {
+            else if (fz3 == Direction.WEST) {
                 double7 = this.getFrontTopLeft().getX() + 1 - (1.0 - double5) * this.getWidth();
-                double8 = fk.getZ() + 0.5;
+                double8 = fu.getZ() + 0.5;
             }
             else {
                 double7 = this.getFrontTopLeft().getX() + (1.0 - double5) * this.getWidth();
-                double8 = fk.getZ() + 0.5;
+                double8 = fu.getZ() + 0.5;
             }
             double double9;
             double double10;
-            if (fp2.getOpposite() == fp) {
-                double9 = cvl.x;
-                double10 = cvl.z;
+            if (fz2.getOpposite() == fz) {
+                double9 = dem.x;
+                double10 = dem.z;
             }
-            else if (fp2.getOpposite() == fp.getOpposite()) {
-                double9 = -cvl.x;
-                double10 = -cvl.z;
+            else if (fz2.getOpposite() == fz.getOpposite()) {
+                double9 = -dem.x;
+                double10 = -dem.z;
             }
-            else if (fp2.getOpposite() == fp.getClockWise()) {
-                double9 = -cvl.z;
-                double10 = cvl.x;
+            else if (fz2.getOpposite() == fz.getClockWise()) {
+                double9 = -dem.z;
+                double10 = dem.x;
             }
             else {
-                double9 = cvl.z;
-                double10 = -cvl.x;
+                double9 = dem.z;
+                double10 = -dem.x;
             }
-            final int integer21 = (fp2.get2DDataValue() - fp.getOpposite().get2DDataValue()) * 90;
-            return new PortalInfo(new Vec3(double7, double6, double8), new Vec3(double9, cvl.y, double10), integer21);
+            final int integer21 = (fz2.get2DDataValue() - fz.getOpposite().get2DDataValue()) * 90;
+            return new PortalInfo(new Vec3(double7, double6, double8), new Vec3(double9, dem.y, double10), integer21);
         }
     }
     
@@ -211,9 +211,9 @@ public class BlockPattern {
         public final Vec3 speed;
         public final int angle;
         
-        public PortalInfo(final Vec3 cvl1, final Vec3 cvl2, final int integer) {
-            this.pos = cvl1;
-            this.speed = cvl2;
+        public PortalInfo(final Vec3 dem1, final Vec3 dem2, final int integer) {
+            this.pos = dem1;
+            this.speed = dem2;
             this.angle = integer;
         }
     }
diff --git a/src/net/minecraft/world/level/block/state/predicate/BlockMaterialPredicate.java b/src/net/minecraft/world/level/block/state/predicate/BlockMaterialPredicate.java
index 0a1d07f..6474501 100644
--- a/src/net/minecraft/world/level/block/state/predicate/BlockMaterialPredicate.java
+++ b/src/net/minecraft/world/level/block/state/predicate/BlockMaterialPredicate.java
@@ -9,24 +9,24 @@ public class BlockMaterialPredicate implements Predicate<BlockState> {
     private static final BlockMaterialPredicate AIR;
     private final Material material;
     
-    private BlockMaterialPredicate(final Material coo) {
-        this.material = coo;
+    private BlockMaterialPredicate(final Material cxd) {
+        this.material = cxd;
     }
     
-    public static BlockMaterialPredicate forMaterial(final Material coo) {
-        return (coo == Material.AIR) ? BlockMaterialPredicate.AIR : new BlockMaterialPredicate(coo);
+    public static BlockMaterialPredicate forMaterial(final Material cxd) {
+        return (cxd == Material.AIR) ? BlockMaterialPredicate.AIR : new BlockMaterialPredicate(cxd);
     }
     
     @Override
-    public boolean test(@Nullable final BlockState byj) {
-        return byj != null && byj.getMaterial() == this.material;
+    public boolean test(@Nullable final BlockState cfj) {
+        return cfj != null && cfj.getMaterial() == this.material;
     }
     
     static {
         AIR = new BlockMaterialPredicate(Material.AIR) {
             @Override
-            public boolean test(@Nullable final BlockState byj) {
-                return byj != null && byj.isAir();
+            public boolean test(@Nullable final BlockState cfj) {
+                return cfj != null && cfj.isAir();
             }
         };
     }
diff --git a/src/net/minecraft/world/level/block/state/predicate/BlockPredicate.java b/src/net/minecraft/world/level/block/state/predicate/BlockPredicate.java
index 6e366ab..f3c0309 100644
--- a/src/net/minecraft/world/level/block/state/predicate/BlockPredicate.java
+++ b/src/net/minecraft/world/level/block/state/predicate/BlockPredicate.java
@@ -8,16 +8,16 @@ import java.util.function.Predicate;
 public class BlockPredicate implements Predicate<BlockState> {
     private final Block block;
     
-    public BlockPredicate(final Block bph) {
-        this.block = bph;
+    public BlockPredicate(final Block bvr) {
+        this.block = bvr;
     }
     
-    public static BlockPredicate forBlock(final Block bph) {
-        return new BlockPredicate(bph);
+    public static BlockPredicate forBlock(final Block bvr) {
+        return new BlockPredicate(bvr);
     }
     
     @Override
-    public boolean test(@Nullable final BlockState byj) {
-        return byj != null && byj.getBlock() == this.block;
+    public boolean test(@Nullable final BlockState cfj) {
+        return cfj != null && cfj.is(this.block);
     }
 }
diff --git a/src/net/minecraft/world/level/block/state/predicate/BlockStatePredicate.java b/src/net/minecraft/world/level/block/state/predicate/BlockStatePredicate.java
index 5e3f03a..64aa044 100644
--- a/src/net/minecraft/world/level/block/state/predicate/BlockStatePredicate.java
+++ b/src/net/minecraft/world/level/block/state/predicate/BlockStatePredicate.java
@@ -15,45 +15,45 @@ public class BlockStatePredicate implements Predicate<BlockState> {
     private final StateDefinition<Block, BlockState> definition;
     private final Map<Property<?>, Predicate<Object>> properties;
     
-    private BlockStatePredicate(final StateDefinition<Block, BlockState> byk) {
+    private BlockStatePredicate(final StateDefinition<Block, BlockState> cfk) {
         this.properties = Maps.newHashMap();
-        this.definition = byk;
+        this.definition = cfk;
     }
     
-    public static BlockStatePredicate forBlock(final Block bph) {
-        return new BlockStatePredicate(bph.getStateDefinition());
+    public static BlockStatePredicate forBlock(final Block bvr) {
+        return new BlockStatePredicate(bvr.getStateDefinition());
     }
     
     @Override
-    public boolean test(@Nullable final BlockState byj) {
-        if (byj == null || !byj.getBlock().equals(this.definition.getOwner())) {
+    public boolean test(@Nullable final BlockState cfj) {
+        if (cfj == null || !cfj.getBlock().equals(this.definition.getOwner())) {
             return false;
         }
         if (this.properties.isEmpty()) {
             return true;
         }
         for (final Map.Entry<Property<?>, Predicate<Object>> entry4 : this.properties.entrySet()) {
-            if (!this.applies(byj, entry4.getKey(), entry4.getValue())) {
+            if (!this.applies(cfj, entry4.getKey(), entry4.getValue())) {
                 return false;
             }
         }
         return true;
     }
     
-    protected <T extends Comparable<T>> boolean applies(final BlockState byj, final Property<T> bzm, final Predicate<Object> predicate) {
-        final T comparable5 = byj.<T>getValue(bzm);
+    protected <T extends Comparable<T>> boolean applies(final BlockState cfj, final Property<T> cgl, final Predicate<Object> predicate) {
+        final T comparable5 = cfj.<T>getValue(cgl);
         return predicate.test(comparable5);
     }
     
-    public <V extends Comparable<V>> BlockStatePredicate where(final Property<V> bzm, final Predicate<Object> predicate) {
-        if (!this.definition.getProperties().contains(bzm)) {
-            throw new IllegalArgumentException(this.definition + " cannot support property " + bzm);
+    public <V extends Comparable<V>> BlockStatePredicate where(final Property<V> cgl, final Predicate<Object> predicate) {
+        if (!this.definition.getProperties().contains(cgl)) {
+            throw new IllegalArgumentException(this.definition + " cannot support property " + cgl);
         }
-        this.properties.put(bzm, predicate);
+        this.properties.put(cgl, predicate);
         return this;
     }
     
     static {
-        ANY = (byj -> true);
+        ANY = (cfj -> true);
     }
 }
diff --git a/src/net/minecraft/world/level/block/state/properties/AbstractProperty.java b/src/net/minecraft/world/level/block/state/properties/AbstractProperty.java
deleted file mode 100644
index 8f1321d..0000000
--- a/src/net/minecraft/world/level/block/state/properties/AbstractProperty.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package net.minecraft.world.level.block.state.properties;
-
-import com.google.common.base.MoreObjects;
-
-public abstract class AbstractProperty<T extends Comparable<T>> implements Property<T> {
-    private final Class<T> clazz;
-    private final String name;
-    private Integer hashCode;
-    
-    protected AbstractProperty(final String string, final Class<T> class2) {
-        this.clazz = class2;
-        this.name = string;
-    }
-    
-    @Override
-    public String getName() {
-        return this.name;
-    }
-    
-    @Override
-    public Class<T> getValueClass() {
-        return this.clazz;
-    }
-    
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this).add("name", this.name).add("clazz", this.clazz).add("values", this.getPossibleValues()).toString();
-    }
-    
-    @Override
-    public boolean equals(final Object object) {
-        if (this == object) {
-            return true;
-        }
-        if (object instanceof AbstractProperty) {
-            final AbstractProperty<?> byv3 = object;
-            return this.clazz.equals(byv3.clazz) && this.name.equals(byv3.name);
-        }
-        return false;
-    }
-    
-    @Override
-    public final int hashCode() {
-        if (this.hashCode == null) {
-            this.hashCode = this.generateHashCode();
-        }
-        return this.hashCode;
-    }
-    
-    public int generateHashCode() {
-        return 31 * this.clazz.hashCode() + this.name.hashCode();
-    }
-}
diff --git a/src/net/minecraft/world/level/block/state/properties/BlockStateProperties.java b/src/net/minecraft/world/level/block/state/properties/BlockStateProperties.java
index d60e43e..063bb86 100644
--- a/src/net/minecraft/world/level/block/state/properties/BlockStateProperties.java
+++ b/src/net/minecraft/world/level/block/state/properties/BlockStateProperties.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.block.state.properties;
 
 import java.util.function.Predicate;
+import net.minecraft.core.FrontAndTop;
 import net.minecraft.core.Direction;
 
 public class BlockStateProperties {
@@ -33,6 +34,7 @@ public class BlockStateProperties {
     public static final BooleanProperty TRIGGERED;
     public static final BooleanProperty UNSTABLE;
     public static final BooleanProperty WATERLOGGED;
+    public static final BooleanProperty VINE_END;
     public static final EnumProperty<Direction.Axis> HORIZONTAL_AXIS;
     public static final EnumProperty<Direction.Axis> AXIS;
     public static final BooleanProperty UP;
@@ -44,8 +46,13 @@ public class BlockStateProperties {
     public static final DirectionProperty FACING;
     public static final DirectionProperty FACING_HOPPER;
     public static final DirectionProperty HORIZONTAL_FACING;
+    public static final EnumProperty<FrontAndTop> ORIENTATION;
     public static final EnumProperty<AttachFace> ATTACH_FACE;
     public static final EnumProperty<BellAttachType> BELL_ATTACHMENT;
+    public static final EnumProperty<WallSide> EAST_WALL;
+    public static final EnumProperty<WallSide> NORTH_WALL;
+    public static final EnumProperty<WallSide> SOUTH_WALL;
+    public static final EnumProperty<WallSide> WEST_WALL;
     public static final EnumProperty<RedstoneSide> EAST_REDSTONE;
     public static final EnumProperty<RedstoneSide> NORTH_REDSTONE;
     public static final EnumProperty<RedstoneSide> SOUTH_REDSTONE;
@@ -78,6 +85,7 @@ public class BlockStateProperties {
     public static final IntegerProperty POWER;
     public static final IntegerProperty STAGE;
     public static final IntegerProperty STABILITY_DISTANCE;
+    public static final IntegerProperty RESPAWN_ANCHOR_CHARGES;
     public static final IntegerProperty ROTATION_16;
     public static final EnumProperty<BedPart> BED_PART;
     public static final EnumProperty<ChestType> CHEST_TYPE;
@@ -120,6 +128,7 @@ public class BlockStateProperties {
         TRIGGERED = BooleanProperty.create("triggered");
         UNSTABLE = BooleanProperty.create("unstable");
         WATERLOGGED = BooleanProperty.create("waterlogged");
+        VINE_END = BooleanProperty.create("vine_end");
         HORIZONTAL_AXIS = EnumProperty.<Direction.Axis>create("axis", Direction.Axis.class, Direction.Axis.X, Direction.Axis.Z);
         AXIS = EnumProperty.<Direction.Axis>create("axis", Direction.Axis.class);
         UP = BooleanProperty.create("up");
@@ -129,10 +138,15 @@ public class BlockStateProperties {
         SOUTH = BooleanProperty.create("south");
         WEST = BooleanProperty.create("west");
         FACING = DirectionProperty.create("facing", Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.UP, Direction.DOWN);
-        FACING_HOPPER = DirectionProperty.create("facing", fp -> fp != Direction.UP);
+        FACING_HOPPER = DirectionProperty.create("facing", fz -> fz != Direction.UP);
         HORIZONTAL_FACING = DirectionProperty.create("facing", Direction.Plane.HORIZONTAL);
+        ORIENTATION = EnumProperty.<FrontAndTop>create("orientation", FrontAndTop.class);
         ATTACH_FACE = EnumProperty.<AttachFace>create("face", AttachFace.class);
         BELL_ATTACHMENT = EnumProperty.<BellAttachType>create("attachment", BellAttachType.class);
+        EAST_WALL = EnumProperty.<WallSide>create("east", WallSide.class);
+        NORTH_WALL = EnumProperty.<WallSide>create("north", WallSide.class);
+        SOUTH_WALL = EnumProperty.<WallSide>create("south", WallSide.class);
+        WEST_WALL = EnumProperty.<WallSide>create("west", WallSide.class);
         EAST_REDSTONE = EnumProperty.<RedstoneSide>create("east", RedstoneSide.class);
         NORTH_REDSTONE = EnumProperty.<RedstoneSide>create("north", RedstoneSide.class);
         SOUTH_REDSTONE = EnumProperty.<RedstoneSide>create("south", RedstoneSide.class);
@@ -140,7 +154,7 @@ public class BlockStateProperties {
         DOUBLE_BLOCK_HALF = EnumProperty.<DoubleBlockHalf>create("half", DoubleBlockHalf.class);
         HALF = EnumProperty.<Half>create("half", Half.class);
         RAIL_SHAPE = EnumProperty.<RailShape>create("shape", RailShape.class);
-        RAIL_SHAPE_STRAIGHT = EnumProperty.<RailShape>create("shape", RailShape.class, bzn -> bzn != RailShape.NORTH_EAST && bzn != RailShape.NORTH_WEST && bzn != RailShape.SOUTH_EAST && bzn != RailShape.SOUTH_WEST);
+        RAIL_SHAPE_STRAIGHT = EnumProperty.<RailShape>create("shape", RailShape.class, cgm -> cgm != RailShape.NORTH_EAST && cgm != RailShape.NORTH_WEST && cgm != RailShape.SOUTH_EAST && cgm != RailShape.SOUTH_WEST);
         AGE_1 = IntegerProperty.create("age", 0, 1);
         AGE_2 = IntegerProperty.create("age", 0, 2);
         AGE_3 = IntegerProperty.create("age", 0, 3);
@@ -165,6 +179,7 @@ public class BlockStateProperties {
         POWER = IntegerProperty.create("power", 0, 15);
         STAGE = IntegerProperty.create("stage", 0, 1);
         STABILITY_DISTANCE = IntegerProperty.create("distance", 0, 7);
+        RESPAWN_ANCHOR_CHARGES = IntegerProperty.create("charges", 0, 4);
         ROTATION_16 = IntegerProperty.create("rotation", 0, 15);
         BED_PART = EnumProperty.<BedPart>create("part", BedPart.class);
         CHEST_TYPE = EnumProperty.<ChestType>create("type", ChestType.class);
diff --git a/src/net/minecraft/world/level/block/state/properties/BooleanProperty.java b/src/net/minecraft/world/level/block/state/properties/BooleanProperty.java
index 87cc6d6..add08c5 100644
--- a/src/net/minecraft/world/level/block/state/properties/BooleanProperty.java
+++ b/src/net/minecraft/world/level/block/state/properties/BooleanProperty.java
@@ -4,7 +4,7 @@ import java.util.Optional;
 import java.util.Collection;
 import com.google.common.collect.ImmutableSet;
 
-public class BooleanProperty extends AbstractProperty<Boolean> {
+public class BooleanProperty extends Property<Boolean> {
     private final ImmutableSet<Boolean> values;
     
     protected BooleanProperty(final String string) {
@@ -40,8 +40,8 @@ public class BooleanProperty extends AbstractProperty<Boolean> {
             return true;
         }
         if (object instanceof BooleanProperty && super.equals(object)) {
-            final BooleanProperty bzb3 = (BooleanProperty)object;
-            return this.values.equals(bzb3.values);
+            final BooleanProperty cga3 = (BooleanProperty)object;
+            return this.values.equals(cga3.values);
         }
         return false;
     }
diff --git a/src/net/minecraft/world/level/block/state/properties/EnumProperty.java b/src/net/minecraft/world/level/block/state/properties/EnumProperty.java
index 640761c..6fa7400 100644
--- a/src/net/minecraft/world/level/block/state/properties/EnumProperty.java
+++ b/src/net/minecraft/world/level/block/state/properties/EnumProperty.java
@@ -14,7 +14,7 @@ import java.util.Collection;
 import java.util.Map;
 import com.google.common.collect.ImmutableSet;
 
-public class EnumProperty<T extends Enum> extends AbstractProperty<T> {
+public class EnumProperty<T extends Enum> extends Property<T> {
     private final ImmutableSet<T> values;
     private final Map<String, T> names;
     
@@ -52,8 +52,8 @@ public class EnumProperty<T extends Enum> extends AbstractProperty<T> {
             return true;
         }
         if (object instanceof EnumProperty && super.equals(object)) {
-            final EnumProperty<?> bzh3 = object;
-            return this.values.equals(bzh3.values) && this.names.equals(bzh3.names);
+            final EnumProperty<?> cgg3 = object;
+            return this.values.equals(cgg3.values) && this.names.equals(cgg3.names);
         }
         return false;
     }
diff --git a/src/net/minecraft/world/level/block/state/properties/IntegerProperty.java b/src/net/minecraft/world/level/block/state/properties/IntegerProperty.java
index 0fbfde7..859ef28 100644
--- a/src/net/minecraft/world/level/block/state/properties/IntegerProperty.java
+++ b/src/net/minecraft/world/level/block/state/properties/IntegerProperty.java
@@ -6,7 +6,7 @@ import java.util.Collection;
 import com.google.common.collect.Sets;
 import com.google.common.collect.ImmutableSet;
 
-public class IntegerProperty extends AbstractProperty<Integer> {
+public class IntegerProperty extends Property<Integer> {
     private final ImmutableSet<Integer> values;
     
     protected IntegerProperty(final String string, final int integer2, final int integer3) {
@@ -35,8 +35,8 @@ public class IntegerProperty extends AbstractProperty<Integer> {
             return true;
         }
         if (object instanceof IntegerProperty && super.equals(object)) {
-            final IntegerProperty bzj3 = (IntegerProperty)object;
-            return this.values.equals(bzj3.values);
+            final IntegerProperty cgi3 = (IntegerProperty)object;
+            return this.values.equals(cgi3.values);
         }
         return false;
     }
diff --git a/src/net/minecraft/world/level/block/state/properties/NoteBlockInstrument.java b/src/net/minecraft/world/level/block/state/properties/NoteBlockInstrument.java
index a354ecf..1246c62 100644
--- a/src/net/minecraft/world/level/block/state/properties/NoteBlockInstrument.java
+++ b/src/net/minecraft/world/level/block/state/properties/NoteBlockInstrument.java
@@ -1,8 +1,9 @@
 package net.minecraft.world.level.block.state.properties;
 
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
@@ -30,9 +31,9 @@ public enum NoteBlockInstrument implements StringRepresentable {
     private final String name;
     private final SoundEvent soundEvent;
     
-    private NoteBlockInstrument(final String string3, final SoundEvent aah) {
+    private NoteBlockInstrument(final String string3, final SoundEvent ack) {
         this.name = string3;
-        this.soundEvent = aah;
+        this.soundEvent = ack;
     }
     
     @Override
@@ -44,52 +45,51 @@ public enum NoteBlockInstrument implements StringRepresentable {
         return this.soundEvent;
     }
     
-    public static NoteBlockInstrument byState(final BlockState byj) {
-        final Block bph2 = byj.getBlock();
-        if (bph2 == Blocks.CLAY) {
+    public static NoteBlockInstrument byState(final BlockState cfj) {
+        if (cfj.is(Blocks.CLAY)) {
             return NoteBlockInstrument.FLUTE;
         }
-        if (bph2 == Blocks.GOLD_BLOCK) {
+        if (cfj.is(Blocks.GOLD_BLOCK)) {
             return NoteBlockInstrument.BELL;
         }
-        if (bph2.is(BlockTags.WOOL)) {
+        if (cfj.is(BlockTags.WOOL)) {
             return NoteBlockInstrument.GUITAR;
         }
-        if (bph2 == Blocks.PACKED_ICE) {
+        if (cfj.is(Blocks.PACKED_ICE)) {
             return NoteBlockInstrument.CHIME;
         }
-        if (bph2 == Blocks.BONE_BLOCK) {
+        if (cfj.is(Blocks.BONE_BLOCK)) {
             return NoteBlockInstrument.XYLOPHONE;
         }
-        if (bph2 == Blocks.IRON_BLOCK) {
+        if (cfj.is(Blocks.IRON_BLOCK)) {
             return NoteBlockInstrument.IRON_XYLOPHONE;
         }
-        if (bph2 == Blocks.SOUL_SAND) {
+        if (cfj.is(Blocks.SOUL_SAND)) {
             return NoteBlockInstrument.COW_BELL;
         }
-        if (bph2 == Blocks.PUMPKIN) {
+        if (cfj.is(Blocks.PUMPKIN)) {
             return NoteBlockInstrument.DIDGERIDOO;
         }
-        if (bph2 == Blocks.EMERALD_BLOCK) {
+        if (cfj.is(Blocks.EMERALD_BLOCK)) {
             return NoteBlockInstrument.BIT;
         }
-        if (bph2 == Blocks.HAY_BLOCK) {
+        if (cfj.is(Blocks.HAY_BLOCK)) {
             return NoteBlockInstrument.BANJO;
         }
-        if (bph2 == Blocks.GLOWSTONE) {
+        if (cfj.is(Blocks.GLOWSTONE)) {
             return NoteBlockInstrument.PLING;
         }
-        final Material coo3 = byj.getMaterial();
-        if (coo3 == Material.STONE) {
+        final Material cxd2 = cfj.getMaterial();
+        if (cxd2 == Material.STONE) {
             return NoteBlockInstrument.BASEDRUM;
         }
-        if (coo3 == Material.SAND) {
+        if (cxd2 == Material.SAND) {
             return NoteBlockInstrument.SNARE;
         }
-        if (coo3 == Material.GLASS) {
+        if (cxd2 == Material.GLASS) {
             return NoteBlockInstrument.HAT;
         }
-        if (coo3 == Material.WOOD) {
+        if (cxd2 == Material.WOOD || cxd2 == Material.NETHER_WOOD) {
             return NoteBlockInstrument.BASS;
         }
         return NoteBlockInstrument.HARP;
diff --git a/src/net/minecraft/world/level/block/state/properties/Property.java b/src/net/minecraft/world/level/block/state/properties/Property.java
index 920c988..cf19423 100644
--- a/src/net/minecraft/world/level/block/state/properties/Property.java
+++ b/src/net/minecraft/world/level/block/state/properties/Property.java
@@ -1,16 +1,129 @@
 package net.minecraft.world.level.block.state.properties;
 
+import com.google.common.base.MoreObjects;
 import java.util.Optional;
 import java.util.Collection;
+import java.util.stream.Stream;
+import net.minecraft.world.level.block.state.StateHolder;
+import java.util.function.Function;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.Codec;
 
-public interface Property<T extends Comparable<T>> {
-    String getName();
+public abstract class Property<T extends Comparable<T>> {
+    private final Class<T> clazz;
+    private final String name;
+    private Integer hashCode;
+    private final Codec<T> codec;
+    private final Codec<Value<T>> valueCodec;
     
-    Collection<T> getPossibleValues();
+    protected Property(final String string, final Class<T> class2) {
+        this.codec = (Codec<T>)Codec.STRING.comapFlatMap(string -> this.getValue(string).map(DataResult::success).orElseGet(() -> DataResult.error("Unable to read property: " + this + " with value: " + string)), (Function)this::getName);
+        this.valueCodec = (Codec<Value<T>>)this.codec.xmap((Function)this::value, (Function)Value::value);
+        this.clazz = class2;
+        this.name = string;
+    }
     
-    Class<T> getValueClass();
+    public Value<T> value(final T comparable) {
+        return new Value<T>(this, (Comparable)comparable);
+    }
     
-    Optional<T> getValue(final String string);
+    public Value<T> value(final StateHolder<?, ?> cfl) {
+        return new Value<T>(this, (Comparable)cfl.<Comparable>getValue((Property<Comparable>)this));
+    }
     
-    String getName(final T comparable);
+    public Stream<Value<T>> getAllValues() {
+        return this.getPossibleValues().stream().<Value<T>>map(this::value);
+    }
+    
+    public Codec<Value<T>> valueCodec() {
+        return this.valueCodec;
+    }
+    
+    public String getName() {
+        return this.name;
+    }
+    
+    public Class<T> getValueClass() {
+        return this.clazz;
+    }
+    
+    public abstract Collection<T> getPossibleValues();
+    
+    public abstract String getName(final T comparable);
+    
+    public abstract Optional<T> getValue(final String string);
+    
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(this).add("name", this.name).add("clazz", this.clazz).add("values", this.getPossibleValues()).toString();
+    }
+    
+    @Override
+    public boolean equals(final Object object) {
+        if (this == object) {
+            return true;
+        }
+        if (object instanceof Property) {
+            final Property<?> cgl3 = object;
+            return this.clazz.equals(cgl3.clazz) && this.name.equals(cgl3.name);
+        }
+        return false;
+    }
+    
+    @Override
+    public final int hashCode() {
+        if (this.hashCode == null) {
+            this.hashCode = this.generateHashCode();
+        }
+        return this.hashCode;
+    }
+    
+    public int generateHashCode() {
+        return 31 * this.clazz.hashCode() + this.name.hashCode();
+    }
+    
+    public static final class Value<T extends Comparable<T>> {
+        private final Property<T> property;
+        private final T value;
+        
+        private Value(final Property<T> cgl, final T comparable) {
+            if (!cgl.getPossibleValues().contains(comparable)) {
+                throw new IllegalArgumentException("Value " + comparable + " does not belong to property " + cgl);
+            }
+            this.property = cgl;
+            this.value = comparable;
+        }
+        
+        public Property<T> getProperty() {
+            return this.property;
+        }
+        
+        public T value() {
+            return this.value;
+        }
+        
+        @Override
+        public String toString() {
+            return this.property.getName() + "=" + this.property.getName(this.value);
+        }
+        
+        @Override
+        public boolean equals(final Object object) {
+            if (this == object) {
+                return true;
+            }
+            if (!(object instanceof Value)) {
+                return false;
+            }
+            final Value<?> a3 = object;
+            return this.property == a3.property && this.value.equals(a3.value);
+        }
+        
+        @Override
+        public int hashCode() {
+            int integer2 = this.property.hashCode();
+            integer2 = 31 * integer2 + this.value.hashCode();
+            return integer2;
+        }
+    }
 }
diff --git a/src/net/minecraft/world/level/block/state/properties/RedstoneSide.java b/src/net/minecraft/world/level/block/state/properties/RedstoneSide.java
index a667000..ab8e075 100644
--- a/src/net/minecraft/world/level/block/state/properties/RedstoneSide.java
+++ b/src/net/minecraft/world/level/block/state/properties/RedstoneSide.java
@@ -22,4 +22,8 @@ public enum RedstoneSide implements StringRepresentable {
     public String getSerializedName() {
         return this.name;
     }
+    
+    public boolean isConnected() {
+        return this != RedstoneSide.NONE;
+    }
 }
diff --git a/src/net/minecraft/world/level/block/state/properties/WallSide.java b/src/net/minecraft/world/level/block/state/properties/WallSide.java
new file mode 100644
index 0000000..df25310
--- /dev/null
+++ b/src/net/minecraft/world/level/block/state/properties/WallSide.java
@@ -0,0 +1,25 @@
+package net.minecraft.world.level.block.state.properties;
+
+import net.minecraft.util.StringRepresentable;
+
+public enum WallSide implements StringRepresentable {
+    NONE("none"), 
+    LOW("low"), 
+    TALL("tall");
+    
+    private final String name;
+    
+    private WallSide(final String string3) {
+        this.name = string3;
+    }
+    
+    @Override
+    public String toString() {
+        return this.getSerializedName();
+    }
+    
+    @Override
+    public String getSerializedName() {
+        return this.name;
+    }
+}
diff --git a/src/net/minecraft/world/level/block/state/properties/WoodType.java b/src/net/minecraft/world/level/block/state/properties/WoodType.java
index 396b4c6..3741351 100644
--- a/src/net/minecraft/world/level/block/state/properties/WoodType.java
+++ b/src/net/minecraft/world/level/block/state/properties/WoodType.java
@@ -12,15 +12,17 @@ public class WoodType {
     public static final WoodType ACACIA;
     public static final WoodType JUNGLE;
     public static final WoodType DARK_OAK;
+    public static final WoodType CRIMSON;
+    public static final WoodType WARPED;
     private final String name;
     
     protected WoodType(final String string) {
         this.name = string;
     }
     
-    private static WoodType register(final WoodType bzs) {
-        WoodType.VALUES.add(bzs);
-        return bzs;
+    private static WoodType register(final WoodType cgs) {
+        WoodType.VALUES.add(cgs);
+        return cgs;
     }
     
     public static Stream<WoodType> values() {
@@ -39,5 +41,7 @@ public class WoodType {
         ACACIA = register(new WoodType("acacia"));
         JUNGLE = register(new WoodType("jungle"));
         DARK_OAK = register(new WoodType("dark_oak"));
+        CRIMSON = register(new WoodType("crimson"));
+        WARPED = register(new WoodType("warped"));
     }
 }
diff --git a/src/net/minecraft/world/level/border/BorderChangeListener.java b/src/net/minecraft/world/level/border/BorderChangeListener.java
index 6424f0d..60db083 100644
--- a/src/net/minecraft/world/level/border/BorderChangeListener.java
+++ b/src/net/minecraft/world/level/border/BorderChangeListener.java
@@ -1,59 +1,59 @@
 package net.minecraft.world.level.border;
 
 public interface BorderChangeListener {
-    void onBorderSizeSet(final WorldBorder bzw, final double double2);
+    void onBorderSizeSet(final WorldBorder cgw, final double double2);
     
-    void onBorderSizeLerping(final WorldBorder bzw, final double double2, final double double3, final long long4);
+    void onBorderSizeLerping(final WorldBorder cgw, final double double2, final double double3, final long long4);
     
-    void onBorderCenterSet(final WorldBorder bzw, final double double2, final double double3);
+    void onBorderCenterSet(final WorldBorder cgw, final double double2, final double double3);
     
-    void onBorderSetWarningTime(final WorldBorder bzw, final int integer);
+    void onBorderSetWarningTime(final WorldBorder cgw, final int integer);
     
-    void onBorderSetWarningBlocks(final WorldBorder bzw, final int integer);
+    void onBorderSetWarningBlocks(final WorldBorder cgw, final int integer);
     
-    void onBorderSetDamagePerBlock(final WorldBorder bzw, final double double2);
+    void onBorderSetDamagePerBlock(final WorldBorder cgw, final double double2);
     
-    void onBorderSetDamageSafeZOne(final WorldBorder bzw, final double double2);
+    void onBorderSetDamageSafeZOne(final WorldBorder cgw, final double double2);
     
     public static class DelegateBorderChangeListener implements BorderChangeListener {
         private final WorldBorder worldBorder;
         
-        public DelegateBorderChangeListener(final WorldBorder bzw) {
-            this.worldBorder = bzw;
+        public DelegateBorderChangeListener(final WorldBorder cgw) {
+            this.worldBorder = cgw;
         }
         
         @Override
-        public void onBorderSizeSet(final WorldBorder bzw, final double double2) {
+        public void onBorderSizeSet(final WorldBorder cgw, final double double2) {
             this.worldBorder.setSize(double2);
         }
         
         @Override
-        public void onBorderSizeLerping(final WorldBorder bzw, final double double2, final double double3, final long long4) {
+        public void onBorderSizeLerping(final WorldBorder cgw, final double double2, final double double3, final long long4) {
             this.worldBorder.lerpSizeBetween(double2, double3, long4);
         }
         
         @Override
-        public void onBorderCenterSet(final WorldBorder bzw, final double double2, final double double3) {
+        public void onBorderCenterSet(final WorldBorder cgw, final double double2, final double double3) {
             this.worldBorder.setCenter(double2, double3);
         }
         
         @Override
-        public void onBorderSetWarningTime(final WorldBorder bzw, final int integer) {
+        public void onBorderSetWarningTime(final WorldBorder cgw, final int integer) {
             this.worldBorder.setWarningTime(integer);
         }
         
         @Override
-        public void onBorderSetWarningBlocks(final WorldBorder bzw, final int integer) {
+        public void onBorderSetWarningBlocks(final WorldBorder cgw, final int integer) {
             this.worldBorder.setWarningBlocks(integer);
         }
         
         @Override
-        public void onBorderSetDamagePerBlock(final WorldBorder bzw, final double double2) {
+        public void onBorderSetDamagePerBlock(final WorldBorder cgw, final double double2) {
             this.worldBorder.setDamagePerBlock(double2);
         }
         
         @Override
-        public void onBorderSetDamageSafeZOne(final WorldBorder bzw, final double double2) {
+        public void onBorderSetDamageSafeZOne(final WorldBorder cgw, final double double2) {
             this.worldBorder.setDamageSafeZone(double2);
         }
     }
diff --git a/src/net/minecraft/world/level/border/WorldBorder.java b/src/net/minecraft/world/level/border/WorldBorder.java
index 7a155db..cf68a01 100644
--- a/src/net/minecraft/world/level/border/WorldBorder.java
+++ b/src/net/minecraft/world/level/border/WorldBorder.java
@@ -1,10 +1,11 @@
 package net.minecraft.world.level.border;
 
+import net.minecraft.nbt.CompoundTag;
+import com.mojang.serialization.DynamicLike;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.util.Mth;
 import net.minecraft.Util;
-import net.minecraft.world.level.storage.LevelData;
 import java.util.Iterator;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.entity.Entity;
@@ -24,6 +25,7 @@ public class WorldBorder {
     private double centerZ;
     private int absoluteMaxSize;
     private BorderExtent extent;
+    public static final Settings DEFAULT_SETTINGS;
     
     public WorldBorder() {
         this.listeners = Lists.newArrayList();
@@ -35,20 +37,20 @@ public class WorldBorder {
         this.extent = new StaticBorderExtent(6.0E7);
     }
     
-    public boolean isWithinBounds(final BlockPos fk) {
-        return fk.getX() + 1 > this.getMinX() && fk.getX() < this.getMaxX() && fk.getZ() + 1 > this.getMinZ() && fk.getZ() < this.getMaxZ();
+    public boolean isWithinBounds(final BlockPos fu) {
+        return fu.getX() + 1 > this.getMinX() && fu.getX() < this.getMaxX() && fu.getZ() + 1 > this.getMinZ() && fu.getZ() < this.getMaxZ();
     }
     
-    public boolean isWithinBounds(final ChunkPos bjh) {
-        return bjh.getMaxBlockX() > this.getMinX() && bjh.getMinBlockX() < this.getMaxX() && bjh.getMaxBlockZ() > this.getMinZ() && bjh.getMinBlockZ() < this.getMaxZ();
+    public boolean isWithinBounds(final ChunkPos bph) {
+        return bph.getMaxBlockX() > this.getMinX() && bph.getMinBlockX() < this.getMaxX() && bph.getMaxBlockZ() > this.getMinZ() && bph.getMinBlockZ() < this.getMaxZ();
     }
     
-    public boolean isWithinBounds(final AABB cvf) {
-        return cvf.maxX > this.getMinX() && cvf.minX < this.getMaxX() && cvf.maxZ > this.getMinZ() && cvf.minZ < this.getMaxZ();
+    public boolean isWithinBounds(final AABB deg) {
+        return deg.maxX > this.getMinX() && deg.minX < this.getMaxX() && deg.maxZ > this.getMinZ() && deg.minZ < this.getMaxZ();
     }
     
-    public double getDistanceToBorder(final Entity akq) {
-        return this.getDistanceToBorder(akq.getX(), akq.getZ());
+    public double getDistanceToBorder(final Entity aom) {
+        return this.getDistanceToBorder(aom.getX(), aom.getZ());
     }
     
     public VoxelShape getCollisionShape() {
@@ -97,8 +99,8 @@ public class WorldBorder {
         this.centerX = double1;
         this.centerZ = double2;
         this.extent.onCenterChange();
-        for (final BorderChangeListener bzu7 : this.getListeners()) {
-            bzu7.onBorderCenterSet(this, double1, double2);
+        for (final BorderChangeListener cgu7 : this.getListeners()) {
+            cgu7.onBorderCenterSet(this, double1, double2);
         }
     }
     
@@ -116,15 +118,15 @@ public class WorldBorder {
     
     public void setSize(final double double1) {
         this.extent = new StaticBorderExtent(double1);
-        for (final BorderChangeListener bzu5 : this.getListeners()) {
-            bzu5.onBorderSizeSet(this, double1);
+        for (final BorderChangeListener cgu5 : this.getListeners()) {
+            cgu5.onBorderSizeSet(this, double1);
         }
     }
     
     public void lerpSizeBetween(final double double1, final double double2, final long long3) {
         this.extent = ((double1 == double2) ? new StaticBorderExtent(double2) : new MovingBorderExtent(double1, double2, long3));
-        for (final BorderChangeListener bzu9 : this.getListeners()) {
-            bzu9.onBorderSizeLerping(this, double1, double2, long3);
+        for (final BorderChangeListener cgu9 : this.getListeners()) {
+            cgu9.onBorderSizeLerping(this, double1, double2, long3);
         }
     }
     
@@ -132,8 +134,8 @@ public class WorldBorder {
         return Lists.newArrayList(this.listeners);
     }
     
-    public void addListener(final BorderChangeListener bzu) {
-        this.listeners.add(bzu);
+    public void addListener(final BorderChangeListener cgu) {
+        this.listeners.add(cgu);
     }
     
     public void setAbsoluteMaxSize(final int integer) {
@@ -151,8 +153,8 @@ public class WorldBorder {
     
     public void setDamageSafeZone(final double double1) {
         this.damageSafeZone = double1;
-        for (final BorderChangeListener bzu5 : this.getListeners()) {
-            bzu5.onBorderSetDamageSafeZOne(this, double1);
+        for (final BorderChangeListener cgu5 : this.getListeners()) {
+            cgu5.onBorderSetDamageSafeZOne(this, double1);
         }
     }
     
@@ -162,8 +164,8 @@ public class WorldBorder {
     
     public void setDamagePerBlock(final double double1) {
         this.damagePerBlock = double1;
-        for (final BorderChangeListener bzu5 : this.getListeners()) {
-            bzu5.onBorderSetDamagePerBlock(this, double1);
+        for (final BorderChangeListener cgu5 : this.getListeners()) {
+            cgu5.onBorderSetDamagePerBlock(this, double1);
         }
     }
     
@@ -177,8 +179,8 @@ public class WorldBorder {
     
     public void setWarningTime(final int integer) {
         this.warningTime = integer;
-        for (final BorderChangeListener bzu4 : this.getListeners()) {
-            bzu4.onBorderSetWarningTime(this, integer);
+        for (final BorderChangeListener cgu4 : this.getListeners()) {
+            cgu4.onBorderSetWarningTime(this, integer);
         }
     }
     
@@ -188,8 +190,8 @@ public class WorldBorder {
     
     public void setWarningBlocks(final int integer) {
         this.warningBlocks = integer;
-        for (final BorderChangeListener bzu4 : this.getListeners()) {
-            bzu4.onBorderSetWarningBlocks(this, integer);
+        for (final BorderChangeListener cgu4 : this.getListeners()) {
+            cgu4.onBorderSetWarningBlocks(this, integer);
         }
     }
     
@@ -197,32 +199,28 @@ public class WorldBorder {
         this.extent = this.extent.update();
     }
     
-    public void saveWorldBorderData(final LevelData crm) {
-        crm.setBorderSize(this.getSize());
-        crm.setBorderX(this.getCenterX());
-        crm.setBorderZ(this.getCenterZ());
-        crm.setBorderSafeZone(this.getDamageSafeZone());
-        crm.setBorderDamagePerBlock(this.getDamagePerBlock());
-        crm.setBorderWarningBlocks(this.getWarningBlocks());
-        crm.setBorderWarningTime(this.getWarningTime());
-        crm.setBorderSizeLerpTarget(this.getLerpTarget());
-        crm.setBorderSizeLerpTime(this.getLerpRemainingTime());
+    public Settings createSettings() {
+        return new Settings(this);
     }
     
-    public void readBorderData(final LevelData crm) {
-        this.setCenter(crm.getBorderX(), crm.getBorderZ());
-        this.setDamagePerBlock(crm.getBorderDamagePerBlock());
-        this.setDamageSafeZone(crm.getBorderSafeZone());
-        this.setWarningBlocks(crm.getBorderWarningBlocks());
-        this.setWarningTime(crm.getBorderWarningTime());
-        if (crm.getBorderSizeLerpTime() > 0L) {
-            this.lerpSizeBetween(crm.getBorderSize(), crm.getBorderSizeLerpTarget(), crm.getBorderSizeLerpTime());
+    public void applySettings(final Settings c) {
+        this.setCenter(c.getCenterX(), c.getCenterZ());
+        this.setDamagePerBlock(c.getDamagePerBlock());
+        this.setDamageSafeZone(c.getSafeZone());
+        this.setWarningBlocks(c.getWarningBlocks());
+        this.setWarningTime(c.getWarningTime());
+        if (c.getSizeLerpTime() > 0L) {
+            this.lerpSizeBetween(c.getSize(), c.getSizeLerpTarget(), c.getSizeLerpTime());
         }
         else {
-            this.setSize(crm.getBorderSize());
+            this.setSize(c.getSize());
         }
     }
     
+    static {
+        DEFAULT_SETTINGS = new Settings(0.0, 0.0, 0.2, 5.0, 5, 15, 6.0E7, 0L, 0.0);
+    }
+    
     class MovingBorderExtent implements BorderExtent {
         private final double from;
         private final double to;
@@ -393,6 +391,103 @@ public class WorldBorder {
         }
     }
     
+    public static class Settings {
+        private final double centerX;
+        private final double centerZ;
+        private final double damagePerBlock;
+        private final double safeZone;
+        private final int warningBlocks;
+        private final int warningTime;
+        private final double size;
+        private final long sizeLerpTime;
+        private final double sizeLerpTarget;
+        
+        private Settings(final double double1, final double double2, final double double3, final double double4, final int integer5, final int integer6, final double double7, final long long8, final double double9) {
+            this.centerX = double1;
+            this.centerZ = double2;
+            this.damagePerBlock = double3;
+            this.safeZone = double4;
+            this.warningBlocks = integer5;
+            this.warningTime = integer6;
+            this.size = double7;
+            this.sizeLerpTime = long8;
+            this.sizeLerpTarget = double9;
+        }
+        
+        private Settings(final WorldBorder cgw) {
+            this.centerX = cgw.getCenterX();
+            this.centerZ = cgw.getCenterZ();
+            this.damagePerBlock = cgw.getDamagePerBlock();
+            this.safeZone = cgw.getDamageSafeZone();
+            this.warningBlocks = cgw.getWarningBlocks();
+            this.warningTime = cgw.getWarningTime();
+            this.size = cgw.getSize();
+            this.sizeLerpTime = cgw.getLerpRemainingTime();
+            this.sizeLerpTarget = cgw.getLerpTarget();
+        }
+        
+        public double getCenterX() {
+            return this.centerX;
+        }
+        
+        public double getCenterZ() {
+            return this.centerZ;
+        }
+        
+        public double getDamagePerBlock() {
+            return this.damagePerBlock;
+        }
+        
+        public double getSafeZone() {
+            return this.safeZone;
+        }
+        
+        public int getWarningBlocks() {
+            return this.warningBlocks;
+        }
+        
+        public int getWarningTime() {
+            return this.warningTime;
+        }
+        
+        public double getSize() {
+            return this.size;
+        }
+        
+        public long getSizeLerpTime() {
+            return this.sizeLerpTime;
+        }
+        
+        public double getSizeLerpTarget() {
+            return this.sizeLerpTarget;
+        }
+        
+        public static Settings read(final DynamicLike<?> dynamicLike, final Settings c) {
+            final double double3 = dynamicLike.get("BorderCenterX").asDouble(c.centerX);
+            final double double4 = dynamicLike.get("BorderCenterZ").asDouble(c.centerZ);
+            final double double5 = dynamicLike.get("BorderSize").asDouble(c.size);
+            final long long9 = dynamicLike.get("BorderSizeLerpTime").asLong(c.sizeLerpTime);
+            final double double6 = dynamicLike.get("BorderSizeLerpTarget").asDouble(c.sizeLerpTarget);
+            final double double7 = dynamicLike.get("BorderSafeZone").asDouble(c.safeZone);
+            final double double8 = dynamicLike.get("BorderDamagePerBlock").asDouble(c.damagePerBlock);
+            final int integer17 = dynamicLike.get("BorderWarningBlocks").asInt(c.warningBlocks);
+            final int integer18 = dynamicLike.get("BorderWarningTime").asInt(c.warningTime);
+            return new Settings(double3, double4, double8, double7, integer17, integer18, double5, long9, double6);
+        }
+        
+        public void write(final CompoundTag le) {
+            le.putDouble("BorderCenterX", this.centerX);
+            le.putDouble("BorderCenterZ", this.centerZ);
+            le.putDouble("BorderSize", this.size);
+            le.putLong("BorderSizeLerpTime", this.sizeLerpTime);
+            le.putDouble("BorderSafeZone", this.safeZone);
+            le.putDouble("BorderDamagePerBlock", this.damagePerBlock);
+            le.putDouble("BorderSizeLerpTarget", this.sizeLerpTarget);
+            le.putDouble("BorderWarningBlocks", this.warningBlocks);
+            le.putDouble("BorderWarningTime", this.warningTime);
+        }
+    }
+    
     interface BorderExtent {
         double getMinX();
         
diff --git a/src/net/minecraft/world/level/chunk/ChunkAccess.java b/src/net/minecraft/world/level/chunk/ChunkAccess.java
index 8420271..b402310 100644
--- a/src/net/minecraft/world/level/chunk/ChunkAccess.java
+++ b/src/net/minecraft/world/level/chunk/ChunkAccess.java
@@ -1,9 +1,6 @@
 package net.minecraft.world.level.chunk;
 
 import it.unimi.dsi.fastutil.shorts.ShortArrayList;
-import net.minecraft.Util;
-import java.util.BitSet;
-import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.TickList;
@@ -12,6 +9,7 @@ import net.minecraft.nbt.CompoundTag;
 import it.unimi.dsi.fastutil.shorts.ShortList;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.levelgen.Heightmap;
 import java.util.Map;
@@ -26,27 +24,27 @@ import net.minecraft.world.level.BlockGetter;
 
 public interface ChunkAccess extends BlockGetter, FeatureAccess {
     @Nullable
-    BlockState setBlockState(final BlockPos fk, final BlockState byj, final boolean boolean3);
+    BlockState setBlockState(final BlockPos fu, final BlockState cfj, final boolean boolean3);
     
-    void setBlockEntity(final BlockPos fk, final BlockEntity bwl);
+    void setBlockEntity(final BlockPos fu, final BlockEntity cdl);
     
-    void addEntity(final Entity akq);
+    void addEntity(final Entity aom);
     
     @Nullable
     default LevelChunkSection getHighestSection() {
         final LevelChunkSection[] arr2 = this.getSections();
         for (int integer3 = arr2.length - 1; integer3 >= 0; --integer3) {
-            final LevelChunkSection cam4 = arr2[integer3];
-            if (!LevelChunkSection.isEmpty(cam4)) {
-                return cam4;
+            final LevelChunkSection chk4 = arr2[integer3];
+            if (!LevelChunkSection.isEmpty(chk4)) {
+                return chk4;
             }
         }
         return null;
     }
     
     default int getHighestSectionPosition() {
-        final LevelChunkSection cam2 = this.getHighestSection();
-        return (cam2 == null) ? 0 : cam2.bottomBlockY();
+        final LevelChunkSection chk2 = this.getHighestSection();
+        return (chk2 == null) ? 0 : chk2.bottomBlockY();
     }
     
     Set<BlockPos> getBlockEntitiesPos();
@@ -65,9 +63,9 @@ public interface ChunkAccess extends BlockGetter, FeatureAccess {
     
     void setLastSaveTime(final long long1);
     
-    Map<String, StructureStart> getAllStarts();
+    Map<StructureFeature<?>, StructureStart<?>> getAllStarts();
     
-    void setAllStarts(final Map<String, StructureStart> map);
+    void setAllStarts(final Map<StructureFeature<?>, StructureStart<?>> map);
     
     default boolean isYSpaceEmpty(int integer1, int integer2) {
         if (integer1 < 0) {
@@ -93,10 +91,10 @@ public interface ChunkAccess extends BlockGetter, FeatureAccess {
     
     ChunkStatus getStatus();
     
-    void removeBlockEntity(final BlockPos fk);
+    void removeBlockEntity(final BlockPos fu);
     
-    default void markPosForPostprocessing(final BlockPos fk) {
-        LogManager.getLogger().warn("Trying to mark a block for PostProcessing @ {}, but this operation is not supported.", fk);
+    default void markPosForPostprocessing(final BlockPos fu) {
+        LogManager.getLogger().warn("Trying to mark a block for PostProcessing @ {}, but this operation is not supported.", fu);
     }
     
     ShortList[] getPostProcessing();
@@ -105,15 +103,15 @@ public interface ChunkAccess extends BlockGetter, FeatureAccess {
         getOrCreateOffsetList(this.getPostProcessing(), integer).add(short1);
     }
     
-    default void setBlockEntityNbt(final CompoundTag jt) {
+    default void setBlockEntityNbt(final CompoundTag le) {
         LogManager.getLogger().warn("Trying to set a BlockEntity, but this operation is not supported.");
     }
     
     @Nullable
-    CompoundTag getBlockEntityNbt(final BlockPos fk);
+    CompoundTag getBlockEntityNbt(final BlockPos fu);
     
     @Nullable
-    CompoundTag getBlockEntityNbtForSaving(final BlockPos fk);
+    CompoundTag getBlockEntityNbtForSaving(final BlockPos fu);
     
     Stream<BlockPos> getLights();
     
@@ -121,10 +119,6 @@ public interface ChunkAccess extends BlockGetter, FeatureAccess {
     
     TickList<Fluid> getLiquidTicks();
     
-    default BitSet getCarvingMask(final GenerationStep.Carving a) {
-        throw Util.<RuntimeException>pauseInIde(new RuntimeException("Meaningless in this context"));
-    }
-    
     UpgradeData getUpgradeData();
     
     void setInhabitedTime(final long long1);
diff --git a/src/net/minecraft/world/level/chunk/ChunkBiomeContainer.java b/src/net/minecraft/world/level/chunk/ChunkBiomeContainer.java
index 1a70dbc..ca6009e 100644
--- a/src/net/minecraft/world/level/chunk/ChunkBiomeContainer.java
+++ b/src/net/minecraft/world/level/chunk/ChunkBiomeContainer.java
@@ -29,37 +29,37 @@ public class ChunkBiomeContainer implements BiomeManager.NoiseBiomeSource {
         this(new Biome[ChunkBiomeContainer.BIOMES_SIZE]);
     }
     
-    public ChunkBiomeContainer(final FriendlyByteBuf kv) {
+    public ChunkBiomeContainer(final FriendlyByteBuf mg) {
         this();
         for (int integer3 = 0; integer3 < this.biomes.length; ++integer3) {
-            final int integer4 = kv.readInt();
-            final Biome bkt5 = Registry.BIOME.byId(integer4);
-            if (bkt5 == null) {
+            final int integer4 = mg.readInt();
+            final Biome bre5 = Registry.BIOME.byId(integer4);
+            if (bre5 == null) {
                 ChunkBiomeContainer.LOGGER.warn("Received invalid biome id: " + integer4);
                 this.biomes[integer3] = Biomes.PLAINS;
             }
             else {
-                this.biomes[integer3] = bkt5;
+                this.biomes[integer3] = bre5;
             }
         }
     }
     
-    public ChunkBiomeContainer(final ChunkPos bjh, final BiomeSource bkw) {
+    public ChunkBiomeContainer(final ChunkPos bph, final BiomeSource brh) {
         this();
-        final int integer4 = bjh.getMinBlockX() >> 2;
-        final int integer5 = bjh.getMinBlockZ() >> 2;
+        final int integer4 = bph.getMinBlockX() >> 2;
+        final int integer5 = bph.getMinBlockZ() >> 2;
         for (int integer6 = 0; integer6 < this.biomes.length; ++integer6) {
             final int integer7 = integer6 & ChunkBiomeContainer.HORIZONTAL_MASK;
             final int integer8 = integer6 >> ChunkBiomeContainer.WIDTH_BITS + ChunkBiomeContainer.WIDTH_BITS & ChunkBiomeContainer.VERTICAL_MASK;
             final int integer9 = integer6 >> ChunkBiomeContainer.WIDTH_BITS & ChunkBiomeContainer.HORIZONTAL_MASK;
-            this.biomes[integer6] = bkw.getNoiseBiome(integer4 + integer7, integer8, integer5 + integer9);
+            this.biomes[integer6] = brh.getNoiseBiome(integer4 + integer7, integer8, integer5 + integer9);
         }
     }
     
-    public ChunkBiomeContainer(final ChunkPos bjh, final BiomeSource bkw, @Nullable final int[] arr) {
+    public ChunkBiomeContainer(final ChunkPos bph, final BiomeSource brh, @Nullable final int[] arr) {
         this();
-        final int integer5 = bjh.getMinBlockX() >> 2;
-        final int integer6 = bjh.getMinBlockZ() >> 2;
+        final int integer5 = bph.getMinBlockX() >> 2;
+        final int integer6 = bph.getMinBlockZ() >> 2;
         if (arr != null) {
             for (int integer7 = 0; integer7 < arr.length; ++integer7) {
                 this.biomes[integer7] = Registry.BIOME.byId(arr[integer7]);
@@ -67,7 +67,7 @@ public class ChunkBiomeContainer implements BiomeManager.NoiseBiomeSource {
                     final int integer8 = integer7 & ChunkBiomeContainer.HORIZONTAL_MASK;
                     final int integer9 = integer7 >> ChunkBiomeContainer.WIDTH_BITS + ChunkBiomeContainer.WIDTH_BITS & ChunkBiomeContainer.VERTICAL_MASK;
                     final int integer10 = integer7 >> ChunkBiomeContainer.WIDTH_BITS & ChunkBiomeContainer.HORIZONTAL_MASK;
-                    this.biomes[integer7] = bkw.getNoiseBiome(integer5 + integer8, integer9, integer6 + integer10);
+                    this.biomes[integer7] = brh.getNoiseBiome(integer5 + integer8, integer9, integer6 + integer10);
                 }
             }
         }
@@ -76,7 +76,7 @@ public class ChunkBiomeContainer implements BiomeManager.NoiseBiomeSource {
                 final int integer8 = integer7 & ChunkBiomeContainer.HORIZONTAL_MASK;
                 final int integer9 = integer7 >> ChunkBiomeContainer.WIDTH_BITS + ChunkBiomeContainer.WIDTH_BITS & ChunkBiomeContainer.VERTICAL_MASK;
                 final int integer10 = integer7 >> ChunkBiomeContainer.WIDTH_BITS & ChunkBiomeContainer.HORIZONTAL_MASK;
-                this.biomes[integer7] = bkw.getNoiseBiome(integer5 + integer8, integer9, integer6 + integer10);
+                this.biomes[integer7] = brh.getNoiseBiome(integer5 + integer8, integer9, integer6 + integer10);
             }
         }
     }
@@ -89,9 +89,9 @@ public class ChunkBiomeContainer implements BiomeManager.NoiseBiomeSource {
         return arr2;
     }
     
-    public void write(final FriendlyByteBuf kv) {
-        for (final Biome bkt6 : this.biomes) {
-            kv.writeInt(Registry.BIOME.getId(bkt6));
+    public void write(final FriendlyByteBuf mg) {
+        for (final Biome bre6 : this.biomes) {
+            mg.writeInt(Registry.BIOME.getId(bre6));
         }
     }
     
diff --git a/src/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/net/minecraft/world/level/chunk/ChunkGenerator.java
index c81ffe6..4bd9cbf 100644
--- a/src/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -1,79 +1,140 @@
 package net.minecraft.world.level.chunk;
 
+import java.util.function.Function;
+import net.minecraft.world.level.levelgen.DebugLevelSource;
+import net.minecraft.world.level.levelgen.FlatLevelSource;
+import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.CrashReportCategory;
 import net.minecraft.network.protocol.game.DebugPackets;
-import java.util.Map;
-import java.util.Iterator;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.core.SectionPos;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.ReportedException;
 import net.minecraft.core.Registry;
 import net.minecraft.CrashReport;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.StructureFeatureManager;
 import net.minecraft.server.level.WorldGenRegion;
 import javax.annotation.Nullable;
-import java.util.Locale;
-import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.core.Vec3i;
+import net.minecraft.server.level.ServerLevel;
 import java.util.ListIterator;
-import java.util.List;
 import java.util.BitSet;
-import java.util.Random;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.biome.BiomeManager;
+import net.minecraft.core.BlockPos;
+import java.util.Iterator;
+import net.minecraft.world.level.levelgen.feature.configurations.StrongholdConfiguration;
+import java.util.Random;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import net.minecraft.world.level.biome.Biome;
+import com.google.common.collect.Lists;
 import net.minecraft.world.level.ChunkPos;
+import java.util.List;
+import net.minecraft.world.level.levelgen.StructureSettings;
 import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
+import com.mojang.serialization.Codec;
 
-public abstract class ChunkGenerator<C extends ChunkGeneratorSettings> {
-    protected final LevelAccessor level;
-    protected final long seed;
+public abstract class ChunkGenerator {
+    public static final Codec<ChunkGenerator> CODEC;
     protected final BiomeSource biomeSource;
-    protected final C settings;
+    protected final BiomeSource runtimeBiomeSource;
+    private final StructureSettings settings;
+    private final long strongholdSeed;
+    private final List<ChunkPos> strongholdPositions;
     
-    public ChunkGenerator(final LevelAccessor bjx, final BiomeSource bkw, final C cbq) {
-        this.level = bjx;
-        this.seed = bjx.getSeed();
-        this.biomeSource = bkw;
-        this.settings = cbq;
+    public ChunkGenerator(final BiomeSource brh, final StructureSettings ciw) {
+        this(brh, brh, ciw, 0L);
     }
     
-    public void createBiomes(final ChunkAccess bzy) {
-        final ChunkPos bjh3 = bzy.getPos();
-        ((ProtoChunk)bzy).setBiomes(new ChunkBiomeContainer(bjh3, this.biomeSource));
+    public ChunkGenerator(final BiomeSource brh1, final BiomeSource brh2, final StructureSettings ciw, final long long4) {
+        this.strongholdPositions = Lists.newArrayList();
+        this.biomeSource = brh1;
+        this.runtimeBiomeSource = brh2;
+        this.settings = ciw;
+        this.strongholdSeed = long4;
     }
     
-    protected Biome getCarvingOrDecorationBiome(final BiomeManager bkv, final BlockPos fk) {
-        return bkv.getBiome(fk);
+    private void generateStrongholds() {
+        if (!this.strongholdPositions.isEmpty()) {
+            return;
+        }
+        final StrongholdConfiguration cos2 = this.settings.stronghold();
+        if (cos2 == null || cos2.count() == 0) {
+            return;
+        }
+        final List<Biome> list3 = Lists.newArrayList();
+        for (final Biome bre5 : this.biomeSource.possibleBiomes()) {
+            if (bre5.isValidStart(StructureFeature.STRONGHOLD)) {
+                list3.add(bre5);
+            }
+        }
+        final int integer4 = cos2.distance();
+        final int integer5 = cos2.count();
+        int integer6 = cos2.spread();
+        final Random random7 = new Random();
+        random7.setSeed(this.strongholdSeed);
+        double double8 = random7.nextDouble() * 3.141592653589793 * 2.0;
+        int integer7 = 0;
+        int integer8 = 0;
+        for (int integer9 = 0; integer9 < integer5; ++integer9) {
+            final double double9 = 4 * integer4 + integer4 * integer8 * 6 + (random7.nextDouble() - 0.5) * (integer4 * 2.5);
+            int integer10 = (int)Math.round(Math.cos(double8) * double9);
+            int integer11 = (int)Math.round(Math.sin(double8) * double9);
+            final BlockPos fu17 = this.biomeSource.findBiomeHorizontal((integer10 << 4) + 8, 0, (integer11 << 4) + 8, 112, list3, random7);
+            if (fu17 != null) {
+                integer10 = fu17.getX() >> 4;
+                integer11 = fu17.getZ() >> 4;
+            }
+            this.strongholdPositions.add(new ChunkPos(integer10, integer11));
+            double8 += 6.283185307179586 / integer6;
+            if (++integer7 == integer6) {
+                ++integer8;
+                integer7 = 0;
+                integer6 += 2 * integer6 / (integer8 + 1);
+                integer6 = Math.min(integer6, integer5 - integer9);
+                double8 += random7.nextDouble() * 3.141592653589793 * 2.0;
+            }
+        }
     }
     
-    public void applyCarvers(final BiomeManager bkv, final ChunkAccess bzy, final GenerationStep.Carving a) {
-        final WorldgenRandom ccf5 = new WorldgenRandom();
-        final int integer6 = 8;
-        final ChunkPos bjh7 = bzy.getPos();
-        final int integer7 = bjh7.x;
-        final int integer8 = bjh7.z;
-        final Biome bkt10 = this.getCarvingOrDecorationBiome(bkv, bjh7.getWorldPosition());
-        final BitSet bitSet11 = bzy.getCarvingMask(a);
-        for (int integer9 = integer7 - 8; integer9 <= integer7 + 8; ++integer9) {
-            for (int integer10 = integer8 - 8; integer10 <= integer8 + 8; ++integer10) {
-                final List<ConfiguredWorldCarver<?>> list14 = bkt10.getCarvers(a);
-                final ListIterator<ConfiguredWorldCarver<?>> listIterator15 = list14.listIterator();
-                while (listIterator15.hasNext()) {
-                    final int integer11 = listIterator15.nextIndex();
-                    final ConfiguredWorldCarver<?> ccj17 = listIterator15.next();
-                    ccf5.setLargeFeatureSeed(this.seed + integer11, integer9, integer10);
-                    if (ccj17.isStartChunk(ccf5, integer9, integer10)) {
-                        ccj17.carve(bzy, fk -> this.getCarvingOrDecorationBiome(bkv, fk), (Random)ccf5, this.getSeaLevel(), integer9, integer10, integer7, integer8, bitSet11);
+    protected abstract Codec<? extends ChunkGenerator> codec();
+    
+    public abstract ChunkGenerator withSeed(final long long1);
+    
+    public void createBiomes(final ChunkAccess cgy) {
+        final ChunkPos bph3 = cgy.getPos();
+        ((ProtoChunk)cgy).setBiomes(new ChunkBiomeContainer(bph3, this.runtimeBiomeSource));
+    }
+    
+    public void applyCarvers(final long long1, final BiomeManager brg, final ChunkAccess cgy, final GenerationStep.Carving a) {
+        final BiomeManager brg2 = brg.withDifferentSource(this.biomeSource);
+        final WorldgenRandom ciy8 = new WorldgenRandom();
+        final int integer9 = 8;
+        final ChunkPos bph10 = cgy.getPos();
+        final int integer10 = bph10.x;
+        final int integer11 = bph10.z;
+        final Biome bre13 = this.biomeSource.getNoiseBiome(bph10.x << 2, 0, bph10.z << 2);
+        final BitSet bitSet14 = ((ProtoChunk)cgy).getOrCreateCarvingMask(a);
+        for (int integer12 = integer10 - 8; integer12 <= integer10 + 8; ++integer12) {
+            for (int integer13 = integer11 - 8; integer13 <= integer11 + 8; ++integer13) {
+                final List<ConfiguredWorldCarver<?>> list17 = bre13.getCarvers(a);
+                final ListIterator<ConfiguredWorldCarver<?>> listIterator18 = list17.listIterator();
+                while (listIterator18.hasNext()) {
+                    final int integer14 = listIterator18.nextIndex();
+                    final ConfiguredWorldCarver<?> cjc20 = listIterator18.next();
+                    ciy8.setLargeFeatureSeed(long1 + integer14, integer12, integer13);
+                    if (cjc20.isStartChunk(ciy8, integer12, integer13)) {
+                        cjc20.carve(cgy, brg2::getBiome, ciy8, this.getSeaLevel(), integer12, integer13, integer10, integer11, bitSet14);
                     }
                 }
             }
@@ -81,115 +142,129 @@ public abstract class ChunkGenerator<C extends ChunkGeneratorSettings> {
     }
     
     @Nullable
-    public BlockPos findNearestMapFeature(final Level bjw, final String string, final BlockPos fk, final int integer, final boolean boolean5) {
-        final StructureFeature<?> cfl7 = Feature.STRUCTURES_REGISTRY.get(string.toLowerCase(Locale.ROOT));
-        if (cfl7 != null) {
-            return cfl7.getNearestGeneratedFeature(bjw, this, fk, integer, boolean5);
+    public BlockPos findNearestMapFeature(final ServerLevel zd, final StructureFeature<?> cml, final BlockPos fu, final int integer, final boolean boolean5) {
+        if (!this.biomeSource.canGenerateStructure(cml)) {
+            return null;
         }
-        return null;
+        if (cml == StructureFeature.STRONGHOLD) {
+            this.generateStrongholds();
+            BlockPos fu2 = null;
+            double double8 = Double.MAX_VALUE;
+            final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
+            for (final ChunkPos bph12 : this.strongholdPositions) {
+                a10.set((bph12.x << 4) + 8, 32, (bph12.z << 4) + 8);
+                final double double9 = a10.distSqr(fu);
+                if (fu2 == null) {
+                    fu2 = new BlockPos(a10);
+                    double8 = double9;
+                }
+                else {
+                    if (double9 >= double8) {
+                        continue;
+                    }
+                    fu2 = new BlockPos(a10);
+                    double8 = double9;
+                }
+            }
+            return fu2;
+        }
+        return cml.getNearestGeneratedFeature(zd, zd.structureFeatureManager(), fu, integer, boolean5, zd.getSeed(), this.settings.getConfig(cml));
     }
     
-    public void applyBiomeDecoration(final WorldGenRegion xj) {
-        final int integer3 = xj.getCenterX();
-        final int integer4 = xj.getCenterZ();
-        final int integer5 = integer3 * 16;
+    public void applyBiomeDecoration(final WorldGenRegion zj, final StructureFeatureManager bqq) {
+        final int integer4 = zj.getCenterX();
+        final int integer5 = zj.getCenterZ();
         final int integer6 = integer4 * 16;
-        final BlockPos fk7 = new BlockPos(integer5, 0, integer6);
-        final Biome bkt8 = this.getCarvingOrDecorationBiome(xj.getBiomeManager(), fk7.offset(8, 8, 8));
-        final WorldgenRandom ccf9 = new WorldgenRandom();
-        final long long10 = ccf9.setDecorationSeed(xj.getSeed(), integer5, integer6);
-        for (final GenerationStep.Decoration b15 : GenerationStep.Decoration.values()) {
+        final int integer7 = integer5 * 16;
+        final BlockPos fu8 = new BlockPos(integer6, 0, integer7);
+        final Biome bre9 = this.biomeSource.getNoiseBiome((integer4 << 2) + 2, 2, (integer5 << 2) + 2);
+        final WorldgenRandom ciy10 = new WorldgenRandom();
+        final long long11 = ciy10.setDecorationSeed(zj.getSeed(), integer6, integer7);
+        for (final GenerationStep.Decoration b16 : GenerationStep.Decoration.values()) {
             try {
-                bkt8.generate(b15, this, xj, long10, ccf9, fk7);
+                bre9.generate(b16, bqq, this, zj, long11, ciy10, fu8);
             }
-            catch (Exception exception16) {
-                final CrashReport h17 = CrashReport.forThrowable(exception16, "Biome decoration");
-                h17.addCategory("Generation").setDetail("CenterX", integer3).setDetail("CenterZ", integer4).setDetail("Step", b15).setDetail("Seed", long10).setDetail("Biome", Registry.BIOME.getKey(bkt8));
-                throw new ReportedException(h17);
+            catch (Exception exception17) {
+                final CrashReport j18 = CrashReport.forThrowable(exception17, "Biome decoration");
+                j18.addCategory("Generation").setDetail("CenterX", integer4).setDetail("CenterZ", integer5).setDetail("Step", b16).setDetail("Seed", long11).setDetail("Biome", Registry.BIOME.getKey(bre9));
+                throw new ReportedException(j18);
             }
         }
     }
     
-    public abstract void buildSurfaceAndBedrock(final WorldGenRegion xj, final ChunkAccess bzy);
+    public abstract void buildSurfaceAndBedrock(final WorldGenRegion zj, final ChunkAccess cgy);
     
-    public void spawnOriginalMobs(final WorldGenRegion xj) {
+    public void spawnOriginalMobs(final WorldGenRegion zj) {
     }
     
-    public C getSettings() {
+    public StructureSettings getSettings() {
         return this.settings;
     }
     
-    public abstract int getSpawnHeight();
-    
-    public void tickCustomSpawners(final ServerLevel xd, final boolean boolean2, final boolean boolean3) {
-    }
-    
-    public boolean isBiomeValidStartForStructure(final Biome bkt, final StructureFeature<? extends FeatureConfiguration> cfl) {
-        return bkt.isValidStart(cfl);
-    }
-    
-    @Nullable
-    public <C extends FeatureConfiguration> C getStructureConfiguration(final Biome bkt, final StructureFeature<C> cfl) {
-        return bkt.<C>getStructureConfiguration(cfl);
+    public int getSpawnHeight() {
+        return 64;
     }
     
     public BiomeSource getBiomeSource() {
-        return this.biomeSource;
-    }
-    
-    public long getSeed() {
-        return this.seed;
+        return this.runtimeBiomeSource;
     }
     
     public int getGenDepth() {
         return 256;
     }
     
-    public List<Biome.SpawnerData> getMobsAt(final MobCategory alb, final BlockPos fk) {
-        return this.level.getBiome(fk).getMobs(alb);
+    public List<Biome.SpawnerData> getMobsAt(final Biome bre, final StructureFeatureManager bqq, final MobCategory apa, final BlockPos fu) {
+        return bre.getMobs(apa);
     }
     
-    public void createStructures(final BiomeManager bkv, final ChunkAccess bzy, final ChunkGenerator<?> caa, final StructureManager cmo) {
-        for (final StructureFeature<?> cfl7 : Feature.STRUCTURES_REGISTRY.values()) {
-            if (!caa.getBiomeSource().canGenerateStructure(cfl7)) {
-                continue;
-            }
-            final StructureStart clv8 = bzy.getStartForFeature(cfl7.getFeatureName());
-            final int integer9 = (clv8 != null) ? clv8.getReferences() : 0;
-            final WorldgenRandom ccf10 = new WorldgenRandom();
-            final ChunkPos bjh11 = bzy.getPos();
-            StructureStart clv9 = StructureStart.INVALID_START;
-            final Biome bkt13 = bkv.getBiome(new BlockPos(bjh11.getMinBlockX() + 9, 0, bjh11.getMinBlockZ() + 9));
-            if (cfl7.isFeatureChunk(bkv, caa, ccf10, bjh11.x, bjh11.z, bkt13)) {
-                final StructureStart clv10 = cfl7.getStartFactory().create(cfl7, bjh11.x, bjh11.z, BoundingBox.getUnknownBox(), integer9, caa.getSeed());
-                clv10.generatePieces(this, cmo, bjh11.x, bjh11.z, bkt13);
-                clv9 = (clv10.isValid() ? clv10 : StructureStart.INVALID_START);
-            }
-            bzy.setStartForFeature(cfl7.getFeatureName(), clv9);
+    public void createStructures(final StructureFeatureManager bqq, final ChunkAccess cgy, final StructureManager cva, final long long4) {
+        final ChunkPos bph7 = cgy.getPos();
+        final Biome bre8 = this.biomeSource.getNoiseBiome((bph7.x << 2) + 2, 0, (bph7.z << 2) + 2);
+        this.createStructure(BiomeDefaultFeatures.STRONGHOLD, bqq, cgy, cva, long4, bph7, bre8);
+        for (final ConfiguredStructureFeature<?, ?> ckc10 : bre8.structures()) {
+            this.createStructure(ckc10, bqq, cgy, cva, long4, bph7, bre8);
         }
     }
     
-    public void createReferences(final LevelAccessor bjx, final ChunkAccess bzy) {
-        final int integer4 = 8;
-        final int integer5 = bzy.getPos().x;
-        final int integer6 = bzy.getPos().z;
-        final int integer7 = integer5 << 4;
+    private void createStructure(final ConfiguredStructureFeature<?, ?> ckc, final StructureFeatureManager bqq, final ChunkAccess cgy, final StructureManager cva, final long long5, final ChunkPos bph, final Biome bre) {
+        final StructureStart<?> ctz10 = bqq.getStartForFeature(SectionPos.of(cgy.getPos(), 0), ckc.feature, cgy);
+        final int integer11 = (ctz10 != null) ? ctz10.getReferences() : 0;
+        final StructureStart<?> ctz11 = ckc.generate(this, this.biomeSource, cva, long5, bph, bre, integer11, this.settings.getConfig(ckc.feature));
+        bqq.setStartForFeature(SectionPos.of(cgy.getPos(), 0), ckc.feature, ctz11, cgy);
+    }
+    
+    public void createReferences(final LevelAccessor bqc, final StructureFeatureManager bqq, final ChunkAccess cgy) {
+        final int integer5 = 8;
+        final int integer6 = cgy.getPos().x;
+        final int integer7 = cgy.getPos().z;
         final int integer8 = integer6 << 4;
-        for (int integer9 = integer5 - 8; integer9 <= integer5 + 8; ++integer9) {
-            for (int integer10 = integer6 - 8; integer10 <= integer6 + 8; ++integer10) {
-                final long long11 = ChunkPos.asLong(integer9, integer10);
-                for (final Map.Entry<String, StructureStart> entry14 : bjx.getChunk(integer9, integer10).getAllStarts().entrySet()) {
-                    final StructureStart clv15 = entry14.getValue();
-                    if (clv15 != StructureStart.INVALID_START && clv15.getBoundingBox().intersects(integer7, integer8, integer7 + 15, integer8 + 15)) {
-                        bzy.addReferenceForFeature(entry14.getKey(), long11);
-                        DebugPackets.sendStructurePacket(bjx, clv15);
+        final int integer9 = integer7 << 4;
+        final SectionPos go10 = SectionPos.of(cgy.getPos(), 0);
+        for (int integer10 = integer6 - 8; integer10 <= integer6 + 8; ++integer10) {
+            for (int integer11 = integer7 - 8; integer11 <= integer7 + 8; ++integer11) {
+                final long long13 = ChunkPos.asLong(integer10, integer11);
+                for (final StructureStart<?> ctz16 : bqc.getChunk(integer10, integer11).getAllStarts().values()) {
+                    try {
+                        if (ctz16 == StructureStart.INVALID_START || !ctz16.getBoundingBox().intersects(integer8, integer9, integer8 + 15, integer9 + 15)) {
+                            continue;
+                        }
+                        bqq.addReferenceForFeature(go10, ctz16.getFeature(), long13, cgy);
+                        DebugPackets.sendStructurePacket(bqc, ctz16);
+                    }
+                    catch (Exception exception17) {
+                        final CrashReport j18 = CrashReport.forThrowable(exception17, "Generating structure reference");
+                        final CrashReportCategory k19 = j18.addCategory("Structure");
+                        k19.setDetail("Id", () -> Registry.STRUCTURE_FEATURE.getKey(ctz16.getFeature()).toString());
+                        k19.setDetail("Name", () -> ctz16.getFeature().getFeatureName());
+                        k19.setDetail("Class", () -> ctz16.getFeature().getClass().getCanonicalName());
+                        throw new ReportedException(j18);
                     }
                 }
             }
         }
     }
     
-    public abstract void fillFromNoise(final LevelAccessor bjx, final ChunkAccess bzy);
+    public abstract void fillFromNoise(final LevelAccessor bqc, final StructureFeatureManager bqq, final ChunkAccess cgy);
     
     public int getSeaLevel() {
         return 63;
@@ -197,6 +272,8 @@ public abstract class ChunkGenerator<C extends ChunkGeneratorSettings> {
     
     public abstract int getBaseHeight(final int integer1, final int integer2, final Heightmap.Types a);
     
+    public abstract BlockGetter getBaseColumn(final int integer1, final int integer2);
+    
     public int getFirstFreeHeight(final int integer1, final int integer2, final Heightmap.Types a) {
         return this.getBaseHeight(integer1, integer2, a);
     }
@@ -204,4 +281,16 @@ public abstract class ChunkGenerator<C extends ChunkGeneratorSettings> {
     public int getFirstOccupiedHeight(final int integer1, final int integer2, final Heightmap.Types a) {
         return this.getBaseHeight(integer1, integer2, a) - 1;
     }
+    
+    public boolean hasStronghold(final ChunkPos bph) {
+        this.generateStrongholds();
+        return this.strongholdPositions.contains(bph);
+    }
+    
+    static {
+        Registry.<Codec<NoiseBasedChunkGenerator>>register(Registry.CHUNK_GENERATOR, "noise", NoiseBasedChunkGenerator.CODEC);
+        Registry.<Codec<FlatLevelSource>>register(Registry.CHUNK_GENERATOR, "flat", FlatLevelSource.CODEC);
+        Registry.<Codec<DebugLevelSource>>register(Registry.CHUNK_GENERATOR, "debug", DebugLevelSource.CODEC);
+        CODEC = Registry.CHUNK_GENERATOR.dispatchStable((Function)ChunkGenerator::codec, (Function)Function.identity());
+    }
 }
diff --git a/src/net/minecraft/world/level/chunk/ChunkGeneratorFactory.java b/src/net/minecraft/world/level/chunk/ChunkGeneratorFactory.java
deleted file mode 100644
index 0071b76..0000000
--- a/src/net/minecraft/world/level/chunk/ChunkGeneratorFactory.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package net.minecraft.world.level.chunk;
-
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-
-interface ChunkGeneratorFactory<C extends ChunkGeneratorSettings, T extends ChunkGenerator<C>> {
-    T create(final Level bjw, final BiomeSource bkw, final C cbq);
-}
diff --git a/src/net/minecraft/world/level/chunk/ChunkGeneratorType.java b/src/net/minecraft/world/level/chunk/ChunkGeneratorType.java
deleted file mode 100644
index 3610d5e..0000000
--- a/src/net/minecraft/world/level/chunk/ChunkGeneratorType.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.minecraft.world.level.chunk;
-
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.Level;
-import net.minecraft.core.Registry;
-import java.util.function.Supplier;
-import net.minecraft.world.level.levelgen.FlatLevelSource;
-import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
-import net.minecraft.world.level.levelgen.DebugLevelSource;
-import net.minecraft.world.level.levelgen.DebugGeneratorSettings;
-import net.minecraft.world.level.levelgen.TheEndLevelSource;
-import net.minecraft.world.level.levelgen.TheEndGeneratorSettings;
-import net.minecraft.world.level.levelgen.NetherLevelSource;
-import net.minecraft.world.level.levelgen.NetherGeneratorSettings;
-import net.minecraft.world.level.levelgen.OverworldLevelSource;
-import net.minecraft.world.level.levelgen.OverworldGeneratorSettings;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-
-public class ChunkGeneratorType<C extends ChunkGeneratorSettings, T extends ChunkGenerator<C>> implements ChunkGeneratorFactory<C, T> {
-    public static final ChunkGeneratorType<OverworldGeneratorSettings, OverworldLevelSource> SURFACE;
-    public static final ChunkGeneratorType<NetherGeneratorSettings, NetherLevelSource> CAVES;
-    public static final ChunkGeneratorType<TheEndGeneratorSettings, TheEndLevelSource> FLOATING_ISLANDS;
-    public static final ChunkGeneratorType<DebugGeneratorSettings, DebugLevelSource> DEBUG;
-    public static final ChunkGeneratorType<FlatLevelGeneratorSettings, FlatLevelSource> FLAT;
-    private final ChunkGeneratorFactory<C, T> factory;
-    private final boolean isPublic;
-    private final Supplier<C> settingsFactory;
-    
-    private static <C extends ChunkGeneratorSettings, T extends ChunkGenerator<C>> ChunkGeneratorType<C, T> register(final String string, final ChunkGeneratorFactory<C, T> cab, final Supplier<C> supplier, final boolean boolean4) {
-        return Registry.<ChunkGeneratorType<C, T>>register(Registry.CHUNK_GENERATOR_TYPE, string, new ChunkGeneratorType<C, T>(cab, boolean4, supplier));
-    }
-    
-    public ChunkGeneratorType(final ChunkGeneratorFactory<C, T> cab, final boolean boolean2, final Supplier<C> supplier) {
-        this.factory = cab;
-        this.isPublic = boolean2;
-        this.settingsFactory = supplier;
-    }
-    
-    @Override
-    public T create(final Level bjw, final BiomeSource bkw, final C cbq) {
-        return this.factory.create(bjw, bkw, cbq);
-    }
-    
-    public C createSettings() {
-        return this.settingsFactory.get();
-    }
-    
-    public boolean isPublic() {
-        return this.isPublic;
-    }
-    
-    static {
-        SURFACE = ChunkGeneratorType.<OverworldGeneratorSettings, OverworldLevelSource>register("surface", OverworldLevelSource::new, OverworldGeneratorSettings::new, true);
-        CAVES = ChunkGeneratorType.<NetherGeneratorSettings, NetherLevelSource>register("caves", NetherLevelSource::new, NetherGeneratorSettings::new, true);
-        FLOATING_ISLANDS = ChunkGeneratorType.<TheEndGeneratorSettings, TheEndLevelSource>register("floating_islands", TheEndLevelSource::new, TheEndGeneratorSettings::new, true);
-        DEBUG = ChunkGeneratorType.<DebugGeneratorSettings, DebugLevelSource>register("debug", DebugLevelSource::new, DebugGeneratorSettings::new, false);
-        FLAT = ChunkGeneratorType.<FlatLevelGeneratorSettings, FlatLevelSource>register("flat", FlatLevelSource::new, FlatLevelGeneratorSettings::new, false);
-    }
-}
diff --git a/src/net/minecraft/world/level/chunk/ChunkSource.java b/src/net/minecraft/world/level/chunk/ChunkSource.java
index d1da696..546b68f 100644
--- a/src/net/minecraft/world/level/chunk/ChunkSource.java
+++ b/src/net/minecraft/world/level/chunk/ChunkSource.java
@@ -5,7 +5,6 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import java.io.IOException;
-import java.util.function.BooleanSupplier;
 import net.minecraft.world.level.BlockGetter;
 import javax.annotation.Nullable;
 
@@ -31,9 +30,7 @@ public abstract class ChunkSource implements LightChunkGetter, AutoCloseable {
     }
     
     @Nullable
-    public abstract ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus cae, final boolean boolean4);
-    
-    public abstract void tick(final BooleanSupplier booleanSupplier);
+    public abstract ChunkAccess getChunk(final int integer1, final int integer2, final ChunkStatus chc, final boolean boolean4);
     
     public abstract String gatherStats();
     
@@ -46,18 +43,18 @@ public abstract class ChunkSource implements LightChunkGetter, AutoCloseable {
     public void setSpawnSettings(final boolean boolean1, final boolean boolean2) {
     }
     
-    public void updateChunkForced(final ChunkPos bjh, final boolean boolean2) {
+    public void updateChunkForced(final ChunkPos bph, final boolean boolean2) {
     }
     
-    public boolean isEntityTickingChunk(final Entity akq) {
+    public boolean isEntityTickingChunk(final Entity aom) {
         return true;
     }
     
-    public boolean isEntityTickingChunk(final ChunkPos bjh) {
+    public boolean isEntityTickingChunk(final ChunkPos bph) {
         return true;
     }
     
-    public boolean isTickingChunk(final BlockPos fk) {
+    public boolean isTickingChunk(final BlockPos fu) {
         return true;
     }
 }
diff --git a/src/net/minecraft/world/level/chunk/ChunkStatus.java b/src/net/minecraft/world/level/chunk/ChunkStatus.java
index cdff560..d2407db 100644
--- a/src/net/minecraft/world/level/chunk/ChunkStatus.java
+++ b/src/net/minecraft/world/level/chunk/ChunkStatus.java
@@ -53,39 +53,39 @@ public class ChunkStatus {
     private final ChunkType chunkType;
     private final EnumSet<Heightmap.Types> heightmapsAfter;
     
-    private static CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> lightChunk(final ChunkStatus cae, final ThreadedLevelLightEngine xg, final ChunkAccess bzy) {
-        final boolean boolean4 = isLighted(cae, bzy);
-        if (!bzy.getStatus().isOrAfter(cae)) {
-            ((ProtoChunk)bzy).setStatus(cae);
+    private static CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> lightChunk(final ChunkStatus chc, final ThreadedLevelLightEngine zg, final ChunkAccess cgy) {
+        final boolean boolean4 = isLighted(chc, cgy);
+        if (!cgy.getStatus().isOrAfter(chc)) {
+            ((ProtoChunk)cgy).setStatus(chc);
         }
-        return xg.lightChunk(bzy, boolean4).<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>thenApply(Either::left);
+        return zg.lightChunk(cgy, boolean4).<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>thenApply(Either::left);
     }
     
-    private static ChunkStatus registerSimple(final String string, @Nullable final ChunkStatus cae, final int integer, final EnumSet<Heightmap.Types> enumSet, final ChunkType a, final SimpleGenerationTask d) {
-        return register(string, cae, integer, enumSet, a, d);
+    private static ChunkStatus registerSimple(final String string, @Nullable final ChunkStatus chc, final int integer, final EnumSet<Heightmap.Types> enumSet, final ChunkType a, final SimpleGenerationTask d) {
+        return register(string, chc, integer, enumSet, a, d);
     }
     
-    private static ChunkStatus register(final String string, @Nullable final ChunkStatus cae, final int integer, final EnumSet<Heightmap.Types> enumSet, final ChunkType a, final GenerationTask b) {
-        return register(string, cae, integer, enumSet, a, b, ChunkStatus.PASSTHROUGH_LOAD_TASK);
+    private static ChunkStatus register(final String string, @Nullable final ChunkStatus chc, final int integer, final EnumSet<Heightmap.Types> enumSet, final ChunkType a, final GenerationTask b) {
+        return register(string, chc, integer, enumSet, a, b, ChunkStatus.PASSTHROUGH_LOAD_TASK);
     }
     
-    private static ChunkStatus register(final String string, @Nullable final ChunkStatus cae, final int integer, final EnumSet<Heightmap.Types> enumSet, final ChunkType a, final GenerationTask b, final LoadingTask c) {
-        return Registry.<ChunkStatus>register(Registry.CHUNK_STATUS, string, new ChunkStatus(string, cae, integer, enumSet, a, b, c));
+    private static ChunkStatus register(final String string, @Nullable final ChunkStatus chc, final int integer, final EnumSet<Heightmap.Types> enumSet, final ChunkType a, final GenerationTask b, final LoadingTask c) {
+        return Registry.<ChunkStatus>register(Registry.CHUNK_STATUS, string, new ChunkStatus(string, chc, integer, enumSet, a, b, c));
     }
     
     public static List<ChunkStatus> getStatusList() {
         final List<ChunkStatus> list1 = Lists.newArrayList();
-        ChunkStatus cae2;
-        for (cae2 = ChunkStatus.FULL; cae2.getParent() != cae2; cae2 = cae2.getParent()) {
-            list1.add(cae2);
+        ChunkStatus chc2;
+        for (chc2 = ChunkStatus.FULL; chc2.getParent() != chc2; chc2 = chc2.getParent()) {
+            list1.add(chc2);
         }
-        list1.add(cae2);
+        list1.add(chc2);
         Collections.reverse(list1);
         return list1;
     }
     
-    private static boolean isLighted(final ChunkStatus cae, final ChunkAccess bzy) {
-        return bzy.getStatus().isOrAfter(cae) && bzy.isLightCorrect();
+    private static boolean isLighted(final ChunkStatus chc, final ChunkAccess cgy) {
+        return cgy.getStatus().isOrAfter(chc) && cgy.isLightCorrect();
     }
     
     public static ChunkStatus getStatus(final int integer) {
@@ -102,19 +102,19 @@ public class ChunkStatus {
         return ChunkStatus.STATUS_BY_RANGE.size();
     }
     
-    public static int getDistance(final ChunkStatus cae) {
-        return ChunkStatus.RANGE_BY_STATUS.getInt(cae.getIndex());
+    public static int getDistance(final ChunkStatus chc) {
+        return ChunkStatus.RANGE_BY_STATUS.getInt(chc.getIndex());
     }
     
-    ChunkStatus(final String string, @Nullable final ChunkStatus cae, final int integer, final EnumSet<Heightmap.Types> enumSet, final ChunkType a, final GenerationTask b, final LoadingTask c) {
+    ChunkStatus(final String string, @Nullable final ChunkStatus chc, final int integer, final EnumSet<Heightmap.Types> enumSet, final ChunkType a, final GenerationTask b, final LoadingTask c) {
         this.name = string;
-        this.parent = ((cae == null) ? this : cae);
+        this.parent = ((chc == null) ? this : chc);
         this.generationTask = b;
         this.loadingTask = c;
         this.range = integer;
         this.chunkType = a;
         this.heightmapsAfter = enumSet;
-        this.index = ((cae == null) ? 0 : (cae.getIndex() + 1));
+        this.index = ((chc == null) ? 0 : (chc.getIndex() + 1));
     }
     
     public int getIndex() {
@@ -129,12 +129,12 @@ public class ChunkStatus {
         return this.parent;
     }
     
-    public CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> generate(final ServerLevel xd, final ChunkGenerator<?> caa, final StructureManager cmo, final ThreadedLevelLightEngine xg, final Function<ChunkAccess, CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> function, final List<ChunkAccess> list) {
-        return this.generationTask.doWork(this, xd, caa, cmo, xg, function, list, list.get(list.size() / 2));
+    public CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> generate(final ServerLevel zd, final ChunkGenerator cha, final StructureManager cva, final ThreadedLevelLightEngine zg, final Function<ChunkAccess, CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> function, final List<ChunkAccess> list) {
+        return this.generationTask.doWork(this, zd, cha, cva, zg, function, list, list.get(list.size() / 2));
     }
     
-    public CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> load(final ServerLevel xd, final StructureManager cmo, final ThreadedLevelLightEngine xg, final Function<ChunkAccess, CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> function, final ChunkAccess bzy) {
-        return this.loadingTask.doWork(this, xd, cmo, xg, function, bzy);
+    public CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> load(final ServerLevel zd, final StructureManager cva, final ThreadedLevelLightEngine zg, final Function<ChunkAccess, CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> function, final ChunkAccess cgy) {
+        return this.loadingTask.doWork(this, zd, cva, zg, function, cgy);
     }
     
     public int getRange() {
@@ -153,8 +153,8 @@ public class ChunkStatus {
         return this.heightmapsAfter;
     }
     
-    public boolean isOrAfter(final ChunkStatus cae) {
-        return this.getIndex() >= cae.getIndex();
+    public boolean isOrAfter(final ChunkStatus chc) {
+        return this.getIndex() >= chc.getIndex();
     }
     
     @Override
@@ -165,45 +165,57 @@ public class ChunkStatus {
     static {
         PRE_FEATURES = EnumSet.<Heightmap.Types>of(Heightmap.Types.OCEAN_FLOOR_WG, Heightmap.Types.WORLD_SURFACE_WG);
         POST_FEATURES = EnumSet.<Heightmap.Types>of(Heightmap.Types.OCEAN_FLOOR, Heightmap.Types.WORLD_SURFACE, Heightmap.Types.MOTION_BLOCKING, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES);
-        PASSTHROUGH_LOAD_TASK = ((cae, xd, cmo, xg, function, bzy) -> {
-            if (bzy instanceof ProtoChunk && !bzy.getStatus().isOrAfter(cae)) {
-                bzy.setStatus(cae);
+        PASSTHROUGH_LOAD_TASK = ((chc, zd, cva, zg, function, cgy) -> {
+            if (cgy instanceof ProtoChunk && !cgy.getStatus().isOrAfter(chc)) {
+                cgy.setStatus(chc);
             }
-            return CompletableFuture.<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>completedFuture(Either.left(bzy));
+            return CompletableFuture.<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>completedFuture(Either.left(cgy));
         });
-        EMPTY = registerSimple("empty", null, -1, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (xd, caa, list, bzy) -> {});
-        STRUCTURE_STARTS = register("structure_starts", ChunkStatus.EMPTY, 0, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (cae, xd, caa, cmo, xg, function, list, bzy) -> {
-            if (!bzy.getStatus().isOrAfter(cae)) {
-                if (xd.getLevelData().isGenerateMapFeatures()) {
-                    caa.createStructures(xd.getBiomeManager().withDifferentSource(caa.getBiomeSource()), bzy, caa, cmo);
+        EMPTY = registerSimple("empty", null, -1, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (zd, cha, list, cgy) -> {});
+        STRUCTURE_STARTS = register("structure_starts", ChunkStatus.EMPTY, 0, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (chc, zd, cha, cva, zg, function, list, cgy) -> {
+            if (!cgy.getStatus().isOrAfter(chc)) {
+                if (zd.getServer().getWorldData().worldGenSettings().generateFeatures()) {
+                    cha.createStructures(zd.structureFeatureManager(), cgy, cva, zd.getSeed());
                 }
-                if (bzy instanceof ProtoChunk) {
-                    bzy.setStatus(cae);
+                if (cgy instanceof ProtoChunk) {
+                    cgy.setStatus(chc);
                 }
             }
-            return CompletableFuture.<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>completedFuture(Either.left(bzy));
+            return CompletableFuture.<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>completedFuture(Either.left(cgy));
         });
-        STRUCTURE_REFERENCES = registerSimple("structure_references", ChunkStatus.STRUCTURE_STARTS, 8, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (xd, caa, list, bzy) -> caa.createReferences(new WorldGenRegion(xd, list), bzy));
-        BIOMES = registerSimple("biomes", ChunkStatus.STRUCTURE_REFERENCES, 0, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (xd, caa, list, bzy) -> caa.createBiomes(bzy));
-        NOISE = registerSimple("noise", ChunkStatus.BIOMES, 8, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (xd, caa, list, bzy) -> caa.fillFromNoise(new WorldGenRegion(xd, list), bzy));
-        SURFACE = registerSimple("surface", ChunkStatus.NOISE, 0, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (xd, caa, list, bzy) -> caa.buildSurfaceAndBedrock(new WorldGenRegion(xd, list), bzy));
-        CARVERS = registerSimple("carvers", ChunkStatus.SURFACE, 0, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (xd, caa, list, bzy) -> caa.applyCarvers(xd.getBiomeManager().withDifferentSource(caa.getBiomeSource()), bzy, GenerationStep.Carving.AIR));
-        LIQUID_CARVERS = registerSimple("liquid_carvers", ChunkStatus.CARVERS, 0, ChunkStatus.POST_FEATURES, ChunkType.PROTOCHUNK, (xd, caa, list, bzy) -> caa.applyCarvers(xd.getBiomeManager().withDifferentSource(caa.getBiomeSource()), bzy, GenerationStep.Carving.LIQUID));
-        final ProtoChunk cat9;
-        FEATURES = register("features", ChunkStatus.LIQUID_CARVERS, 8, ChunkStatus.POST_FEATURES, ChunkType.PROTOCHUNK, (cae, xd, caa, cmo, xg, function, list, bzy) -> {
-            cat9 = bzy;
-            cat9.setLightEngine(xg);
-            if (!bzy.getStatus().isOrAfter(cae)) {
-                Heightmap.primeHeightmaps(bzy, EnumSet.<Heightmap.Types>of(Heightmap.Types.MOTION_BLOCKING, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Heightmap.Types.OCEAN_FLOOR, Heightmap.Types.WORLD_SURFACE));
-                caa.applyBiomeDecoration(new WorldGenRegion(xd, list));
-                cat9.setStatus(cae);
+        final WorldGenRegion zj5;
+        STRUCTURE_REFERENCES = registerSimple("structure_references", ChunkStatus.STRUCTURE_STARTS, 8, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (zd, cha, list, cgy) -> {
+            zj5 = new WorldGenRegion(zd, list);
+            cha.createReferences(zj5, zd.structureFeatureManager().forWorldGenRegion(zj5), cgy);
+            return;
+        });
+        BIOMES = registerSimple("biomes", ChunkStatus.STRUCTURE_REFERENCES, 0, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (zd, cha, list, cgy) -> cha.createBiomes(cgy));
+        final WorldGenRegion zj6;
+        NOISE = registerSimple("noise", ChunkStatus.BIOMES, 8, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (zd, cha, list, cgy) -> {
+            zj6 = new WorldGenRegion(zd, list);
+            cha.fillFromNoise(zj6, zd.structureFeatureManager().forWorldGenRegion(zj6), cgy);
+            return;
+        });
+        SURFACE = registerSimple("surface", ChunkStatus.NOISE, 0, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (zd, cha, list, cgy) -> cha.buildSurfaceAndBedrock(new WorldGenRegion(zd, list), cgy));
+        CARVERS = registerSimple("carvers", ChunkStatus.SURFACE, 0, ChunkStatus.PRE_FEATURES, ChunkType.PROTOCHUNK, (zd, cha, list, cgy) -> cha.applyCarvers(zd.getSeed(), zd.getBiomeManager(), cgy, GenerationStep.Carving.AIR));
+        LIQUID_CARVERS = registerSimple("liquid_carvers", ChunkStatus.CARVERS, 0, ChunkStatus.POST_FEATURES, ChunkType.PROTOCHUNK, (zd, cha, list, cgy) -> cha.applyCarvers(zd.getSeed(), zd.getBiomeManager(), cgy, GenerationStep.Carving.LIQUID));
+        final ProtoChunk chr9;
+        WorldGenRegion zj7;
+        FEATURES = register("features", ChunkStatus.LIQUID_CARVERS, 8, ChunkStatus.POST_FEATURES, ChunkType.PROTOCHUNK, (chc, zd, cha, cva, zg, function, list, cgy) -> {
+            chr9 = cgy;
+            chr9.setLightEngine(zg);
+            if (!cgy.getStatus().isOrAfter(chc)) {
+                Heightmap.primeHeightmaps(cgy, EnumSet.<Heightmap.Types>of(Heightmap.Types.MOTION_BLOCKING, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Heightmap.Types.OCEAN_FLOOR, Heightmap.Types.WORLD_SURFACE));
+                zj7 = new WorldGenRegion(zd, list);
+                cha.applyBiomeDecoration(zj7, zd.structureFeatureManager().forWorldGenRegion(zj7));
+                chr9.setStatus(chc);
             }
-            return CompletableFuture.<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>completedFuture(Either.left(bzy));
+            return CompletableFuture.<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>completedFuture(Either.left(cgy));
         });
-        LIGHT = register("light", ChunkStatus.FEATURES, 1, ChunkStatus.POST_FEATURES, ChunkType.PROTOCHUNK, (cae, xd, caa, cmo, xg, function, list, bzy) -> lightChunk(cae, xg, bzy), (cae, xd, cmo, xg, function, bzy) -> lightChunk(cae, xg, bzy));
-        SPAWN = registerSimple("spawn", ChunkStatus.LIGHT, 0, ChunkStatus.POST_FEATURES, ChunkType.PROTOCHUNK, (xd, caa, list, bzy) -> caa.spawnOriginalMobs(new WorldGenRegion(xd, list)));
-        HEIGHTMAPS = registerSimple("heightmaps", ChunkStatus.SPAWN, 0, ChunkStatus.POST_FEATURES, ChunkType.PROTOCHUNK, (xd, caa, list, bzy) -> {});
-        FULL = register("full", ChunkStatus.HEIGHTMAPS, 0, ChunkStatus.POST_FEATURES, ChunkType.LEVELCHUNK, (cae, xd, caa, cmo, xg, function, list, bzy) -> function.apply(bzy), (cae, xd, cmo, xg, function, bzy) -> function.apply(bzy));
+        LIGHT = register("light", ChunkStatus.FEATURES, 1, ChunkStatus.POST_FEATURES, ChunkType.PROTOCHUNK, (chc, zd, cha, cva, zg, function, list, cgy) -> lightChunk(chc, zg, cgy), (chc, zd, cva, zg, function, cgy) -> lightChunk(chc, zg, cgy));
+        SPAWN = registerSimple("spawn", ChunkStatus.LIGHT, 0, ChunkStatus.POST_FEATURES, ChunkType.PROTOCHUNK, (zd, cha, list, cgy) -> cha.spawnOriginalMobs(new WorldGenRegion(zd, list)));
+        HEIGHTMAPS = registerSimple("heightmaps", ChunkStatus.SPAWN, 0, ChunkStatus.POST_FEATURES, ChunkType.PROTOCHUNK, (zd, cha, list, cgy) -> {});
+        FULL = register("full", ChunkStatus.HEIGHTMAPS, 0, ChunkStatus.POST_FEATURES, ChunkType.LEVELCHUNK, (chc, zd, cha, cva, zg, function, list, cgy) -> function.apply(cgy), (chc, zd, cva, zg, function, cgy) -> function.apply(cgy));
         STATUS_BY_RANGE = ImmutableList.<ChunkStatus>of(ChunkStatus.FULL, ChunkStatus.FEATURES, ChunkStatus.LIQUID_CARVERS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS);
         int integer2;
         int integer3;
@@ -219,17 +231,17 @@ public class ChunkStatus {
     }
     
     interface SimpleGenerationTask extends GenerationTask {
-        default CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> doWork(final ChunkStatus cae, final ServerLevel xd, final ChunkGenerator<?> caa, final StructureManager cmo, final ThreadedLevelLightEngine xg, final Function<ChunkAccess, CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> function, final List<ChunkAccess> list, final ChunkAccess bzy) {
-            if (!bzy.getStatus().isOrAfter(cae)) {
-                this.doWork(xd, caa, list, bzy);
-                if (bzy instanceof ProtoChunk) {
-                    ((ProtoChunk)bzy).setStatus(cae);
+        default CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> doWork(final ChunkStatus chc, final ServerLevel zd, final ChunkGenerator cha, final StructureManager cva, final ThreadedLevelLightEngine zg, final Function<ChunkAccess, CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> function, final List<ChunkAccess> list, final ChunkAccess cgy) {
+            if (!cgy.getStatus().isOrAfter(chc)) {
+                this.doWork(zd, cha, list, cgy);
+                if (cgy instanceof ProtoChunk) {
+                    ((ProtoChunk)cgy).setStatus(chc);
                 }
             }
-            return CompletableFuture.<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>completedFuture(Either.left(bzy));
+            return CompletableFuture.<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>completedFuture(Either.left(cgy));
         }
         
-        void doWork(final ServerLevel xd, final ChunkGenerator<?> caa, final List<ChunkAccess> list, final ChunkAccess bzy);
+        void doWork(final ServerLevel zd, final ChunkGenerator cha, final List<ChunkAccess> list, final ChunkAccess cgy);
     }
     
     public enum ChunkType {
@@ -238,10 +250,10 @@ public class ChunkStatus {
     }
     
     interface GenerationTask {
-        CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> doWork(final ChunkStatus cae, final ServerLevel xd, final ChunkGenerator<?> caa, final StructureManager cmo, final ThreadedLevelLightEngine xg, final Function<ChunkAccess, CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> function, final List<ChunkAccess> list, final ChunkAccess bzy);
+        CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> doWork(final ChunkStatus chc, final ServerLevel zd, final ChunkGenerator cha, final StructureManager cva, final ThreadedLevelLightEngine zg, final Function<ChunkAccess, CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> function, final List<ChunkAccess> list, final ChunkAccess cgy);
     }
     
     interface LoadingTask {
-        CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> doWork(final ChunkStatus cae, final ServerLevel xd, final StructureManager cmo, final ThreadedLevelLightEngine xg, final Function<ChunkAccess, CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> function, final ChunkAccess bzy);
+        CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> doWork(final ChunkStatus chc, final ServerLevel zd, final StructureManager cva, final ThreadedLevelLightEngine zg, final Function<ChunkAccess, CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> function, final ChunkAccess cgy);
     }
 }
diff --git a/src/net/minecraft/world/level/chunk/EmptyLevelChunk.java b/src/net/minecraft/world/level/chunk/EmptyLevelChunk.java
index 72e0964..17bc2e6 100644
--- a/src/net/minecraft/world/level/chunk/EmptyLevelChunk.java
+++ b/src/net/minecraft/world/level/chunk/EmptyLevelChunk.java
@@ -23,23 +23,23 @@ import net.minecraft.world.level.biome.Biome;
 public class EmptyLevelChunk extends LevelChunk {
     private static final Biome[] BIOMES;
     
-    public EmptyLevelChunk(final Level bjw, final ChunkPos bjh) {
-        super(bjw, bjh, new ChunkBiomeContainer(EmptyLevelChunk.BIOMES));
+    public EmptyLevelChunk(final Level bqb, final ChunkPos bph) {
+        super(bqb, bph, new ChunkBiomeContainer(EmptyLevelChunk.BIOMES));
     }
     
     @Override
-    public BlockState getBlockState(final BlockPos fk) {
+    public BlockState getBlockState(final BlockPos fu) {
         return Blocks.VOID_AIR.defaultBlockState();
     }
     
     @Nullable
     @Override
-    public BlockState setBlockState(final BlockPos fk, final BlockState byj, final boolean boolean3) {
+    public BlockState setBlockState(final BlockPos fu, final BlockState cfj, final boolean boolean3) {
         return null;
     }
     
     @Override
-    public FluidState getFluidState(final BlockPos fk) {
+    public FluidState getFluidState(final BlockPos fu) {
         return Fluids.EMPTY.defaultFluidState();
     }
     
@@ -50,38 +50,38 @@ public class EmptyLevelChunk extends LevelChunk {
     }
     
     @Override
-    public int getLightEmission(final BlockPos fk) {
+    public int getLightEmission(final BlockPos fu) {
         return 0;
     }
     
     @Override
-    public void addEntity(final Entity akq) {
+    public void addEntity(final Entity aom) {
     }
     
     @Override
-    public void removeEntity(final Entity akq) {
+    public void removeEntity(final Entity aom) {
     }
     
     @Override
-    public void removeEntity(final Entity akq, final int integer) {
+    public void removeEntity(final Entity aom, final int integer) {
     }
     
     @Nullable
     @Override
-    public BlockEntity getBlockEntity(final BlockPos fk, final EntityCreationType a) {
+    public BlockEntity getBlockEntity(final BlockPos fu, final EntityCreationType a) {
         return null;
     }
     
     @Override
-    public void addBlockEntity(final BlockEntity bwl) {
+    public void addBlockEntity(final BlockEntity cdl) {
     }
     
     @Override
-    public void setBlockEntity(final BlockPos fk, final BlockEntity bwl) {
+    public void setBlockEntity(final BlockPos fu, final BlockEntity cdl) {
     }
     
     @Override
-    public void removeBlockEntity(final BlockPos fk) {
+    public void removeBlockEntity(final BlockPos fu) {
     }
     
     @Override
@@ -89,11 +89,11 @@ public class EmptyLevelChunk extends LevelChunk {
     }
     
     @Override
-    public void getEntities(@Nullable final Entity akq, final AABB cvf, final List<Entity> list, final Predicate<? super Entity> predicate) {
+    public void getEntities(@Nullable final Entity aom, final AABB deg, final List<Entity> list, final Predicate<? super Entity> predicate) {
     }
     
     @Override
-    public <T extends Entity> void getEntitiesOfClass(final Class<? extends T> class1, final AABB cvf, final List<T> list, final Predicate<? super T> predicate) {
+    public <T extends Entity> void getEntitiesOfClass(final Class<? extends T> class1, final AABB deg, final List<T> list, final Predicate<? super T> predicate) {
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/chunk/FeatureAccess.java b/src/net/minecraft/world/level/chunk/FeatureAccess.java
index b9c72c0..7ed0d48 100644
--- a/src/net/minecraft/world/level/chunk/FeatureAccess.java
+++ b/src/net/minecraft/world/level/chunk/FeatureAccess.java
@@ -4,18 +4,19 @@ import java.util.Map;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 
 public interface FeatureAccess {
     @Nullable
-    StructureStart getStartForFeature(final String string);
+    StructureStart<?> getStartForFeature(final StructureFeature<?> cml);
     
-    void setStartForFeature(final String string, final StructureStart clv);
+    void setStartForFeature(final StructureFeature<?> cml, final StructureStart<?> ctz);
     
-    LongSet getReferencesForFeature(final String string);
+    LongSet getReferencesForFeature(final StructureFeature<?> cml);
     
-    void addReferenceForFeature(final String string, final long long2);
+    void addReferenceForFeature(final StructureFeature<?> cml, final long long2);
     
-    Map<String, LongSet> getAllReferences();
+    Map<StructureFeature<?>, LongSet> getAllReferences();
     
-    void setAllReferences(final Map<String, LongSet> map);
+    void setAllReferences(final Map<StructureFeature<?>, LongSet> map);
 }
diff --git a/src/net/minecraft/world/level/chunk/GlobalPalette.java b/src/net/minecraft/world/level/chunk/GlobalPalette.java
index 41385de..86ff2ee 100644
--- a/src/net/minecraft/world/level/chunk/GlobalPalette.java
+++ b/src/net/minecraft/world/level/chunk/GlobalPalette.java
@@ -2,14 +2,15 @@ package net.minecraft.world.level.chunk;
 
 import net.minecraft.nbt.ListTag;
 import net.minecraft.network.FriendlyByteBuf;
+import java.util.function.Predicate;
 import net.minecraft.core.IdMapper;
 
 public class GlobalPalette<T> implements Palette<T> {
     private final IdMapper<T> registry;
     private final T defaultValue;
     
-    public GlobalPalette(final IdMapper<T> ft, final T object) {
-        this.registry = ft;
+    public GlobalPalette(final IdMapper<T> ge, final T object) {
+        this.registry = ge;
         this.defaultValue = object;
     }
     
@@ -20,7 +21,7 @@ public class GlobalPalette<T> implements Palette<T> {
     }
     
     @Override
-    public boolean maybeHas(final T object) {
+    public boolean maybeHas(final Predicate<T> predicate) {
         return true;
     }
     
@@ -31,11 +32,11 @@ public class GlobalPalette<T> implements Palette<T> {
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) {
+    public void read(final FriendlyByteBuf mg) {
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) {
+    public void write(final FriendlyByteBuf mg) {
     }
     
     @Override
@@ -44,6 +45,6 @@ public class GlobalPalette<T> implements Palette<T> {
     }
     
     @Override
-    public void read(final ListTag jz) {
+    public void read(final ListTag lk) {
     }
 }
diff --git a/src/net/minecraft/world/level/chunk/HashMapPalette.java b/src/net/minecraft/world/level/chunk/HashMapPalette.java
index 691ff7e..16ee5ed 100644
--- a/src/net/minecraft/world/level/chunk/HashMapPalette.java
+++ b/src/net/minecraft/world/level/chunk/HashMapPalette.java
@@ -4,6 +4,7 @@ import java.util.AbstractList;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.network.FriendlyByteBuf;
 import javax.annotation.Nullable;
+import java.util.function.Predicate;
 import net.minecraft.nbt.CompoundTag;
 import java.util.function.Function;
 import net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap;
@@ -17,10 +18,10 @@ public class HashMapPalette<T> implements Palette<T> {
     private final Function<T, CompoundTag> writer;
     private final int bits;
     
-    public HashMapPalette(final IdMapper<T> ft, final int integer, final PaletteResize<T> car, final Function<CompoundTag, T> function4, final Function<T, CompoundTag> function5) {
-        this.registry = ft;
+    public HashMapPalette(final IdMapper<T> ge, final int integer, final PaletteResize<T> chp, final Function<CompoundTag, T> function4, final Function<T, CompoundTag> function5) {
+        this.registry = ge;
         this.bits = integer;
-        this.resizeHandler = car;
+        this.resizeHandler = chp;
         this.reader = function4;
         this.writer = function5;
         this.values = new CrudeIncrementalIntIdentityHashBiMap<T>(1 << integer);
@@ -39,8 +40,13 @@ public class HashMapPalette<T> implements Palette<T> {
     }
     
     @Override
-    public boolean maybeHas(final T object) {
-        return this.values.getId(object) != -1;
+    public boolean maybeHas(final Predicate<T> predicate) {
+        for (int integer3 = 0; integer3 < this.getSize(); ++integer3) {
+            if (predicate.test(this.values.byId(integer3))) {
+                return true;
+            }
+        }
+        return false;
     }
     
     @Nullable
@@ -50,19 +56,19 @@ public class HashMapPalette<T> implements Palette<T> {
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) {
+    public void read(final FriendlyByteBuf mg) {
         this.values.clear();
-        for (int integer3 = kv.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
-            this.values.add(this.registry.byId(kv.readVarInt()));
+        for (int integer3 = mg.readVarInt(), integer4 = 0; integer4 < integer3; ++integer4) {
+            this.values.add(this.registry.byId(mg.readVarInt()));
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) {
+    public void write(final FriendlyByteBuf mg) {
         final int integer3 = this.getSize();
-        kv.writeVarInt(integer3);
+        mg.writeVarInt(integer3);
         for (int integer4 = 0; integer4 < integer3; ++integer4) {
-            kv.writeVarInt(this.registry.getId(this.values.byId(integer4)));
+            mg.writeVarInt(this.registry.getId(this.values.byId(integer4)));
         }
     }
     
@@ -80,16 +86,16 @@ public class HashMapPalette<T> implements Palette<T> {
     }
     
     @Override
-    public void read(final ListTag jz) {
+    public void read(final ListTag lk) {
         this.values.clear();
-        for (int integer3 = 0; integer3 < jz.size(); ++integer3) {
-            this.values.add(this.reader.apply(jz.getCompound(integer3)));
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            this.values.add(this.reader.apply(lk.getCompound(integer3)));
         }
     }
     
-    public void write(final ListTag jz) {
+    public void write(final ListTag lk) {
         for (int integer3 = 0; integer3 < this.getSize(); ++integer3) {
-            ((AbstractList<CompoundTag>)jz).add(this.writer.apply(this.values.byId(integer3)));
+            ((AbstractList<CompoundTag>)lk).add(this.writer.apply(this.values.byId(integer3)));
         }
     }
 }
diff --git a/src/net/minecraft/world/level/chunk/ImposterProtoChunk.java b/src/net/minecraft/world/level/chunk/ImposterProtoChunk.java
index 26ae1a9..24f8f56 100644
--- a/src/net/minecraft/world/level/chunk/ImposterProtoChunk.java
+++ b/src/net/minecraft/world/level/chunk/ImposterProtoChunk.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.chunk;
 
 import net.minecraft.world.level.TickList;
+import net.minecraft.Util;
 import java.util.BitSet;
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.material.Fluids;
@@ -11,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import java.util.Map;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.lighting.LevelLightEngine;
@@ -24,26 +26,26 @@ import net.minecraft.core.BlockPos;
 public class ImposterProtoChunk extends ProtoChunk {
     private final LevelChunk wrapped;
     
-    public ImposterProtoChunk(final LevelChunk cal) {
-        super(cal.getPos(), UpgradeData.EMPTY);
-        this.wrapped = cal;
+    public ImposterProtoChunk(final LevelChunk chj) {
+        super(chj.getPos(), UpgradeData.EMPTY);
+        this.wrapped = chj;
     }
     
     @Nullable
     @Override
-    public BlockEntity getBlockEntity(final BlockPos fk) {
-        return this.wrapped.getBlockEntity(fk);
+    public BlockEntity getBlockEntity(final BlockPos fu) {
+        return this.wrapped.getBlockEntity(fu);
     }
     
     @Nullable
     @Override
-    public BlockState getBlockState(final BlockPos fk) {
-        return this.wrapped.getBlockState(fk);
+    public BlockState getBlockState(final BlockPos fu) {
+        return this.wrapped.getBlockState(fu);
     }
     
     @Override
-    public FluidState getFluidState(final BlockPos fk) {
-        return this.wrapped.getFluidState(fk);
+    public FluidState getFluidState(final BlockPos fu) {
+        return this.wrapped.getFluidState(fu);
     }
     
     @Override
@@ -53,20 +55,20 @@ public class ImposterProtoChunk extends ProtoChunk {
     
     @Nullable
     @Override
-    public BlockState setBlockState(final BlockPos fk, final BlockState byj, final boolean boolean3) {
+    public BlockState setBlockState(final BlockPos fu, final BlockState cfj, final boolean boolean3) {
         return null;
     }
     
     @Override
-    public void setBlockEntity(final BlockPos fk, final BlockEntity bwl) {
+    public void setBlockEntity(final BlockPos fu, final BlockEntity cdl) {
     }
     
     @Override
-    public void addEntity(final Entity akq) {
+    public void addEntity(final Entity aom) {
     }
     
     @Override
-    public void setStatus(final ChunkStatus cae) {
+    public void setStatus(final ChunkStatus chc) {
     }
     
     @Override
@@ -110,39 +112,39 @@ public class ImposterProtoChunk extends ProtoChunk {
     
     @Nullable
     @Override
-    public StructureStart getStartForFeature(final String string) {
-        return this.wrapped.getStartForFeature(string);
+    public StructureStart<?> getStartForFeature(final StructureFeature<?> cml) {
+        return this.wrapped.getStartForFeature(cml);
     }
     
     @Override
-    public void setStartForFeature(final String string, final StructureStart clv) {
+    public void setStartForFeature(final StructureFeature<?> cml, final StructureStart<?> ctz) {
     }
     
     @Override
-    public Map<String, StructureStart> getAllStarts() {
+    public Map<StructureFeature<?>, StructureStart<?>> getAllStarts() {
         return this.wrapped.getAllStarts();
     }
     
     @Override
-    public void setAllStarts(final Map<String, StructureStart> map) {
+    public void setAllStarts(final Map<StructureFeature<?>, StructureStart<?>> map) {
     }
     
     @Override
-    public LongSet getReferencesForFeature(final String string) {
-        return this.wrapped.getReferencesForFeature(string);
+    public LongSet getReferencesForFeature(final StructureFeature<?> cml) {
+        return this.wrapped.getReferencesForFeature(cml);
     }
     
     @Override
-    public void addReferenceForFeature(final String string, final long long2) {
+    public void addReferenceForFeature(final StructureFeature<?> cml, final long long2) {
     }
     
     @Override
-    public Map<String, LongSet> getAllReferences() {
+    public Map<StructureFeature<?>, LongSet> getAllReferences() {
         return this.wrapped.getAllReferences();
     }
     
     @Override
-    public void setAllReferences(final Map<String, LongSet> map) {
+    public void setAllReferences(final Map<StructureFeature<?>, LongSet> map) {
     }
     
     @Override
@@ -165,31 +167,31 @@ public class ImposterProtoChunk extends ProtoChunk {
     }
     
     @Override
-    public void removeBlockEntity(final BlockPos fk) {
+    public void removeBlockEntity(final BlockPos fu) {
     }
     
     @Override
-    public void markPosForPostprocessing(final BlockPos fk) {
+    public void markPosForPostprocessing(final BlockPos fu) {
     }
     
     @Override
-    public void setBlockEntityNbt(final CompoundTag jt) {
+    public void setBlockEntityNbt(final CompoundTag le) {
     }
     
     @Nullable
     @Override
-    public CompoundTag getBlockEntityNbt(final BlockPos fk) {
-        return this.wrapped.getBlockEntityNbt(fk);
+    public CompoundTag getBlockEntityNbt(final BlockPos fu) {
+        return this.wrapped.getBlockEntityNbt(fu);
     }
     
     @Nullable
     @Override
-    public CompoundTag getBlockEntityNbtForSaving(final BlockPos fk) {
-        return this.wrapped.getBlockEntityNbtForSaving(fk);
+    public CompoundTag getBlockEntityNbtForSaving(final BlockPos fu) {
+        return this.wrapped.getBlockEntityNbtForSaving(fu);
     }
     
     @Override
-    public void setBiomes(final ChunkBiomeContainer bzz) {
+    public void setBiomes(final ChunkBiomeContainer cgz) {
     }
     
     @Override
@@ -199,17 +201,22 @@ public class ImposterProtoChunk extends ProtoChunk {
     
     @Override
     public ProtoTickList<Block> getBlockTicks() {
-        return new ProtoTickList<Block>(bph -> bph.defaultBlockState().isAir(), this.getPos());
+        return new ProtoTickList<Block>(bvr -> bvr.defaultBlockState().isAir(), this.getPos());
     }
     
     @Override
     public ProtoTickList<Fluid> getLiquidTicks() {
-        return new ProtoTickList<Fluid>(coi -> coi == Fluids.EMPTY, this.getPos());
+        return new ProtoTickList<Fluid>(cwz -> cwz == Fluids.EMPTY, this.getPos());
     }
     
     @Override
     public BitSet getCarvingMask(final GenerationStep.Carving a) {
-        return this.wrapped.getCarvingMask(a);
+        throw Util.<UnsupportedOperationException>pauseInIde(new UnsupportedOperationException("Meaningless in this context"));
+    }
+    
+    @Override
+    public BitSet getOrCreateCarvingMask(final GenerationStep.Carving a) {
+        throw Util.<UnsupportedOperationException>pauseInIde(new UnsupportedOperationException("Meaningless in this context"));
     }
     
     public LevelChunk getWrapped() {
diff --git a/src/net/minecraft/world/level/chunk/LevelChunk.java b/src/net/minecraft/world/level/chunk/LevelChunk.java
index bd3777a..f3ae491 100644
--- a/src/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/net/minecraft/world/level/chunk/LevelChunk.java
@@ -27,7 +27,6 @@ import net.minecraft.CrashReportCategory;
 import net.minecraft.CrashReport;
 import net.minecraft.world.level.levelgen.DebugLevelSource;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.LevelType;
 import net.minecraft.world.level.block.state.BlockState;
 import java.util.Collection;
 import com.google.common.collect.Sets;
@@ -38,7 +37,6 @@ import com.google.common.collect.Maps;
 import net.minecraft.world.level.EmptyTickList;
 import net.minecraft.world.level.ChunkPos;
 import java.util.function.Consumer;
-import javax.annotation.Nullable;
 import net.minecraft.server.level.ChunkHolder;
 import java.util.function.Supplier;
 import net.minecraft.world.level.material.Fluid;
@@ -47,6 +45,7 @@ import net.minecraft.world.level.TickList;
 import it.unimi.dsi.fastutil.shorts.ShortList;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.util.ClassInstanceMultiMap;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -55,10 +54,12 @@ import net.minecraft.world.level.Level;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.core.BlockPos;
 import java.util.Map;
+import javax.annotation.Nullable;
 import org.apache.logging.log4j.Logger;
 
 public class LevelChunk implements ChunkAccess {
     private static final Logger LOGGER;
+    @Nullable
     public static final LevelChunkSection EMPTY_SECTION;
     private final LevelChunkSection[] sections;
     private ChunkBiomeContainer biomes;
@@ -69,8 +70,8 @@ public class LevelChunk implements ChunkAccess {
     private final UpgradeData upgradeData;
     private final Map<BlockPos, BlockEntity> blockEntities;
     private final ClassInstanceMultiMap<Entity>[] entitySections;
-    private final Map<String, StructureStart> structureStarts;
-    private final Map<String, LongSet> structuresRefences;
+    private final Map<StructureFeature<?>, StructureStart<?>> structureStarts;
+    private final Map<StructureFeature<?>, LongSet> structuresRefences;
     private final ShortList[] postProcessing;
     private TickList<Block> blockTicks;
     private TickList<Fluid> liquidTicks;
@@ -85,11 +86,11 @@ public class LevelChunk implements ChunkAccess {
     private final ChunkPos chunkPos;
     private volatile boolean isLightCorrect;
     
-    public LevelChunk(final Level bjw, final ChunkPos bjh, final ChunkBiomeContainer bzz) {
-        this(bjw, bjh, bzz, UpgradeData.EMPTY, EmptyTickList.empty(), EmptyTickList.empty(), 0L, null, null);
+    public LevelChunk(final Level bqb, final ChunkPos bph, final ChunkBiomeContainer cgz) {
+        this(bqb, bph, cgz, UpgradeData.EMPTY, EmptyTickList.empty(), EmptyTickList.empty(), 0L, null, null);
     }
     
-    public LevelChunk(final Level bjw, final ChunkPos bjh, final ChunkBiomeContainer bzz, final UpgradeData cav, final TickList<Block> bkl5, final TickList<Fluid> bkl6, final long long7, @Nullable final LevelChunkSection[] arr, @Nullable final Consumer<LevelChunk> consumer) {
+    public LevelChunk(final Level bqb, final ChunkPos bph, final ChunkBiomeContainer cgz, final UpgradeData cht, final TickList<Block> bqr5, final TickList<Fluid> bqr6, final long long7, @Nullable final LevelChunkSection[] arr, @Nullable final Consumer<LevelChunk> consumer) {
         this.sections = new LevelChunkSection[16];
         this.pendingBlockEntities = Maps.newHashMap();
         this.heightmaps = Maps.newEnumMap(Heightmap.Types.class);
@@ -98,9 +99,9 @@ public class LevelChunk implements ChunkAccess {
         this.structuresRefences = Maps.newHashMap();
         this.postProcessing = new ShortList[16];
         this.entitySections = new ClassInstanceMultiMap[16];
-        this.level = bjw;
-        this.chunkPos = bjh;
-        this.upgradeData = cav;
+        this.level = bqb;
+        this.chunkPos = bph;
+        this.upgradeData = cht;
         for (final Heightmap.Types a15 : Heightmap.Types.values()) {
             if (ChunkStatus.FULL.heightmapsAfter().contains(a15)) {
                 this.heightmaps.put(a15, new Heightmap(this, a15));
@@ -109,9 +110,9 @@ public class LevelChunk implements ChunkAccess {
         for (int integer12 = 0; integer12 < this.entitySections.length; ++integer12) {
             this.entitySections[integer12] = new ClassInstanceMultiMap<Entity>(Entity.class);
         }
-        this.biomes = bzz;
-        this.blockTicks = bkl5;
-        this.liquidTicks = bkl6;
+        this.biomes = cgz;
+        this.blockTicks = bqr5;
+        this.liquidTicks = bqr6;
         this.inhabitedTime = long7;
         this.postLoad = consumer;
         if (arr != null) {
@@ -124,29 +125,29 @@ public class LevelChunk implements ChunkAccess {
         }
     }
     
-    public LevelChunk(final Level bjw, final ProtoChunk cat) {
-        this(bjw, cat.getPos(), cat.getBiomes(), cat.getUpgradeData(), cat.getBlockTicks(), cat.getLiquidTicks(), cat.getInhabitedTime(), cat.getSections(), null);
-        for (final CompoundTag jt5 : cat.getEntities()) {
-            EntityType.loadEntityRecursive(jt5, bjw, akq -> {
-                this.addEntity(akq);
-                return akq;
+    public LevelChunk(final Level bqb, final ProtoChunk chr) {
+        this(bqb, chr.getPos(), chr.getBiomes(), chr.getUpgradeData(), chr.getBlockTicks(), chr.getLiquidTicks(), chr.getInhabitedTime(), chr.getSections(), null);
+        for (final CompoundTag le5 : chr.getEntities()) {
+            EntityType.loadEntityRecursive(le5, bqb, aom -> {
+                this.addEntity(aom);
+                return aom;
             });
         }
-        for (final BlockEntity bwl5 : cat.getBlockEntities().values()) {
-            this.addBlockEntity(bwl5);
+        for (final BlockEntity cdl5 : chr.getBlockEntities().values()) {
+            this.addBlockEntity(cdl5);
         }
-        this.pendingBlockEntities.putAll(cat.getBlockEntityNbts());
-        for (int integer4 = 0; integer4 < cat.getPostProcessing().length; ++integer4) {
-            this.postProcessing[integer4] = cat.getPostProcessing()[integer4];
+        this.pendingBlockEntities.putAll(chr.getBlockEntityNbts());
+        for (int integer4 = 0; integer4 < chr.getPostProcessing().length; ++integer4) {
+            this.postProcessing[integer4] = chr.getPostProcessing()[integer4];
         }
-        this.setAllStarts(cat.getAllStarts());
-        this.setAllReferences(cat.getAllReferences());
-        for (final Map.Entry<Heightmap.Types, Heightmap> entry5 : cat.getHeightmaps()) {
+        this.setAllStarts(chr.getAllStarts());
+        this.setAllReferences(chr.getAllReferences());
+        for (final Map.Entry<Heightmap.Types, Heightmap> entry5 : chr.getHeightmaps()) {
             if (ChunkStatus.FULL.heightmapsAfter().contains(entry5.getKey())) {
                 this.getOrCreateHeightmapUnprimed(entry5.getKey()).setRawData(entry5.getValue().getRawData());
             }
         }
-        this.setLightCorrect(cat.isLightCorrect());
+        this.setLightCorrect(chr.isLightCorrect());
         this.unsaved = true;
     }
     
@@ -168,119 +169,119 @@ public class LevelChunk implements ChunkAccess {
     }
     
     @Override
-    public BlockState getBlockState(final BlockPos fk) {
-        final int integer3 = fk.getX();
-        final int integer4 = fk.getY();
-        final int integer5 = fk.getZ();
-        if (this.level.getGeneratorType() == LevelType.DEBUG_ALL_BLOCK_STATES) {
-            BlockState byj6 = null;
+    public BlockState getBlockState(final BlockPos fu) {
+        final int integer3 = fu.getX();
+        final int integer4 = fu.getY();
+        final int integer5 = fu.getZ();
+        if (this.level.isDebug()) {
+            BlockState cfj6 = null;
             if (integer4 == 60) {
-                byj6 = Blocks.BARRIER.defaultBlockState();
+                cfj6 = Blocks.BARRIER.defaultBlockState();
             }
             if (integer4 == 70) {
-                byj6 = DebugLevelSource.getBlockStateFor(integer3, integer5);
+                cfj6 = DebugLevelSource.getBlockStateFor(integer3, integer5);
             }
-            return (byj6 == null) ? Blocks.AIR.defaultBlockState() : byj6;
+            return (cfj6 == null) ? Blocks.AIR.defaultBlockState() : cfj6;
         }
         try {
             if (integer4 >= 0 && integer4 >> 4 < this.sections.length) {
-                final LevelChunkSection cam6 = this.sections[integer4 >> 4];
-                if (!LevelChunkSection.isEmpty(cam6)) {
-                    return cam6.getBlockState(integer3 & 0xF, integer4 & 0xF, integer5 & 0xF);
+                final LevelChunkSection chk6 = this.sections[integer4 >> 4];
+                if (!LevelChunkSection.isEmpty(chk6)) {
+                    return chk6.getBlockState(integer3 & 0xF, integer4 & 0xF, integer5 & 0xF);
                 }
             }
             return Blocks.AIR.defaultBlockState();
         }
         catch (Throwable throwable6) {
-            final CrashReport h7 = CrashReport.forThrowable(throwable6, "Getting block state");
-            final CrashReportCategory i8 = h7.addCategory("Block being got");
-            i8.setDetail("Location", () -> CrashReportCategory.formatLocation(integer3, integer4, integer5));
-            throw new ReportedException(h7);
+            final CrashReport j7 = CrashReport.forThrowable(throwable6, "Getting block state");
+            final CrashReportCategory k8 = j7.addCategory("Block being got");
+            k8.setDetail("Location", () -> CrashReportCategory.formatLocation(integer3, integer4, integer5));
+            throw new ReportedException(j7);
         }
     }
     
     @Override
-    public FluidState getFluidState(final BlockPos fk) {
-        return this.getFluidState(fk.getX(), fk.getY(), fk.getZ());
+    public FluidState getFluidState(final BlockPos fu) {
+        return this.getFluidState(fu.getX(), fu.getY(), fu.getZ());
     }
     
     public FluidState getFluidState(final int integer1, final int integer2, final int integer3) {
         try {
             if (integer2 >= 0 && integer2 >> 4 < this.sections.length) {
-                final LevelChunkSection cam5 = this.sections[integer2 >> 4];
-                if (!LevelChunkSection.isEmpty(cam5)) {
-                    return cam5.getFluidState(integer1 & 0xF, integer2 & 0xF, integer3 & 0xF);
+                final LevelChunkSection chk5 = this.sections[integer2 >> 4];
+                if (!LevelChunkSection.isEmpty(chk5)) {
+                    return chk5.getFluidState(integer1 & 0xF, integer2 & 0xF, integer3 & 0xF);
                 }
             }
             return Fluids.EMPTY.defaultFluidState();
         }
         catch (Throwable throwable5) {
-            final CrashReport h6 = CrashReport.forThrowable(throwable5, "Getting fluid state");
-            final CrashReportCategory i7 = h6.addCategory("Block being got");
-            i7.setDetail("Location", () -> CrashReportCategory.formatLocation(integer1, integer2, integer3));
-            throw new ReportedException(h6);
+            final CrashReport j6 = CrashReport.forThrowable(throwable5, "Getting fluid state");
+            final CrashReportCategory k7 = j6.addCategory("Block being got");
+            k7.setDetail("Location", () -> CrashReportCategory.formatLocation(integer1, integer2, integer3));
+            throw new ReportedException(j6);
         }
     }
     
     @Nullable
     @Override
-    public BlockState setBlockState(final BlockPos fk, final BlockState byj, final boolean boolean3) {
-        final int integer5 = fk.getX() & 0xF;
-        final int integer6 = fk.getY();
-        final int integer7 = fk.getZ() & 0xF;
-        LevelChunkSection cam8 = this.sections[integer6 >> 4];
-        if (cam8 == LevelChunk.EMPTY_SECTION) {
-            if (byj.isAir()) {
+    public BlockState setBlockState(final BlockPos fu, final BlockState cfj, final boolean boolean3) {
+        final int integer5 = fu.getX() & 0xF;
+        final int integer6 = fu.getY();
+        final int integer7 = fu.getZ() & 0xF;
+        LevelChunkSection chk8 = this.sections[integer6 >> 4];
+        if (chk8 == LevelChunk.EMPTY_SECTION) {
+            if (cfj.isAir()) {
                 return null;
             }
-            cam8 = new LevelChunkSection(integer6 >> 4 << 4);
-            this.sections[integer6 >> 4] = cam8;
+            chk8 = new LevelChunkSection(integer6 >> 4 << 4);
+            this.sections[integer6 >> 4] = chk8;
         }
-        final boolean boolean4 = cam8.isEmpty();
-        final BlockState byj2 = cam8.setBlockState(integer5, integer6 & 0xF, integer7, byj);
-        if (byj2 == byj) {
+        final boolean boolean4 = chk8.isEmpty();
+        final BlockState cfj2 = chk8.setBlockState(integer5, integer6 & 0xF, integer7, cfj);
+        if (cfj2 == cfj) {
             return null;
         }
-        final Block bph11 = byj.getBlock();
-        final Block bph12 = byj2.getBlock();
-        this.heightmaps.get(Heightmap.Types.MOTION_BLOCKING).update(integer5, integer6, integer7, byj);
-        this.heightmaps.get(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES).update(integer5, integer6, integer7, byj);
-        this.heightmaps.get(Heightmap.Types.OCEAN_FLOOR).update(integer5, integer6, integer7, byj);
-        this.heightmaps.get(Heightmap.Types.WORLD_SURFACE).update(integer5, integer6, integer7, byj);
-        final boolean boolean5 = cam8.isEmpty();
+        final Block bvr11 = cfj.getBlock();
+        final Block bvr12 = cfj2.getBlock();
+        this.heightmaps.get(Heightmap.Types.MOTION_BLOCKING).update(integer5, integer6, integer7, cfj);
+        this.heightmaps.get(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES).update(integer5, integer6, integer7, cfj);
+        this.heightmaps.get(Heightmap.Types.OCEAN_FLOOR).update(integer5, integer6, integer7, cfj);
+        this.heightmaps.get(Heightmap.Types.WORLD_SURFACE).update(integer5, integer6, integer7, cfj);
+        final boolean boolean5 = chk8.isEmpty();
         if (boolean4 != boolean5) {
-            this.level.getChunkSource().getLightEngine().updateSectionStatus(fk, boolean5);
+            this.level.getChunkSource().getLightEngine().updateSectionStatus(fu, boolean5);
         }
         if (!this.level.isClientSide) {
-            byj2.onRemove(this.level, fk, byj, boolean3);
+            cfj2.onRemove(this.level, fu, cfj, boolean3);
         }
-        else if (bph12 != bph11 && bph12 instanceof EntityBlock) {
-            this.level.removeBlockEntity(fk);
+        else if (bvr12 != bvr11 && bvr12 instanceof EntityBlock) {
+            this.level.removeBlockEntity(fu);
         }
-        if (cam8.getBlockState(integer5, integer6 & 0xF, integer7).getBlock() != bph11) {
+        if (!chk8.getBlockState(integer5, integer6 & 0xF, integer7).is(bvr11)) {
             return null;
         }
-        if (bph12 instanceof EntityBlock) {
-            final BlockEntity bwl14 = this.getBlockEntity(fk, EntityCreationType.CHECK);
-            if (bwl14 != null) {
-                bwl14.clearCache();
+        if (bvr12 instanceof EntityBlock) {
+            final BlockEntity cdl14 = this.getBlockEntity(fu, EntityCreationType.CHECK);
+            if (cdl14 != null) {
+                cdl14.clearCache();
             }
         }
         if (!this.level.isClientSide) {
-            byj.onPlace(this.level, fk, byj2, boolean3);
+            cfj.onPlace(this.level, fu, cfj2, boolean3);
         }
-        if (bph11 instanceof EntityBlock) {
-            BlockEntity bwl14 = this.getBlockEntity(fk, EntityCreationType.CHECK);
-            if (bwl14 == null) {
-                bwl14 = ((EntityBlock)bph11).newBlockEntity(this.level);
-                this.level.setBlockEntity(fk, bwl14);
+        if (bvr11 instanceof EntityBlock) {
+            BlockEntity cdl14 = this.getBlockEntity(fu, EntityCreationType.CHECK);
+            if (cdl14 == null) {
+                cdl14 = ((EntityBlock)bvr11).newBlockEntity(this.level);
+                this.level.setBlockEntity(fu, cdl14);
             }
             else {
-                bwl14.clearCache();
+                cdl14.clearCache();
             }
         }
         this.unsaved = true;
-        return byj2;
+        return cfj2;
     }
     
     @Nullable
@@ -289,26 +290,26 @@ public class LevelChunk implements ChunkAccess {
     }
     
     @Override
-    public void addEntity(final Entity akq) {
+    public void addEntity(final Entity aom) {
         this.lastSaveHadEntities = true;
-        final int integer3 = Mth.floor(akq.getX() / 16.0);
-        final int integer4 = Mth.floor(akq.getZ() / 16.0);
+        final int integer3 = Mth.floor(aom.getX() / 16.0);
+        final int integer4 = Mth.floor(aom.getZ() / 16.0);
         if (integer3 != this.chunkPos.x || integer4 != this.chunkPos.z) {
-            LevelChunk.LOGGER.warn("Wrong location! ({}, {}) should be ({}, {}), {}", integer3, integer4, this.chunkPos.x, this.chunkPos.z, akq);
-            akq.removed = true;
+            LevelChunk.LOGGER.warn("Wrong location! ({}, {}) should be ({}, {}), {}", integer3, integer4, this.chunkPos.x, this.chunkPos.z, aom);
+            aom.removed = true;
         }
-        int integer5 = Mth.floor(akq.getY() / 16.0);
+        int integer5 = Mth.floor(aom.getY() / 16.0);
         if (integer5 < 0) {
             integer5 = 0;
         }
         if (integer5 >= this.entitySections.length) {
             integer5 = this.entitySections.length - 1;
         }
-        akq.inChunk = true;
-        akq.xChunk = this.chunkPos.x;
-        akq.yChunk = integer5;
-        akq.zChunk = this.chunkPos.z;
-        this.entitySections[integer5].add(akq);
+        aom.inChunk = true;
+        aom.xChunk = this.chunkPos.x;
+        aom.yChunk = integer5;
+        aom.zChunk = this.chunkPos.z;
+        this.entitySections[integer5].add(aom);
     }
     
     @Override
@@ -316,18 +317,18 @@ public class LevelChunk implements ChunkAccess {
         this.heightmaps.get(a).setRawData(arr);
     }
     
-    public void removeEntity(final Entity akq) {
-        this.removeEntity(akq, akq.yChunk);
+    public void removeEntity(final Entity aom) {
+        this.removeEntity(aom, aom.yChunk);
     }
     
-    public void removeEntity(final Entity akq, int integer) {
+    public void removeEntity(final Entity aom, int integer) {
         if (integer < 0) {
             integer = 0;
         }
         if (integer >= this.entitySections.length) {
             integer = this.entitySections.length - 1;
         }
-        this.entitySections[integer].remove(akq);
+        this.entitySections[integer].remove(aom);
     }
     
     @Override
@@ -336,94 +337,94 @@ public class LevelChunk implements ChunkAccess {
     }
     
     @Nullable
-    private BlockEntity createBlockEntity(final BlockPos fk) {
-        final BlockState byj3 = this.getBlockState(fk);
-        final Block bph4 = byj3.getBlock();
-        if (!bph4.isEntityBlock()) {
+    private BlockEntity createBlockEntity(final BlockPos fu) {
+        final BlockState cfj3 = this.getBlockState(fu);
+        final Block bvr4 = cfj3.getBlock();
+        if (!bvr4.isEntityBlock()) {
             return null;
         }
-        return ((EntityBlock)bph4).newBlockEntity(this.level);
+        return ((EntityBlock)bvr4).newBlockEntity(this.level);
     }
     
     @Nullable
     @Override
-    public BlockEntity getBlockEntity(final BlockPos fk) {
-        return this.getBlockEntity(fk, EntityCreationType.CHECK);
+    public BlockEntity getBlockEntity(final BlockPos fu) {
+        return this.getBlockEntity(fu, EntityCreationType.CHECK);
     }
     
     @Nullable
-    public BlockEntity getBlockEntity(final BlockPos fk, final EntityCreationType a) {
-        BlockEntity bwl4 = this.blockEntities.get(fk);
-        if (bwl4 == null) {
-            final CompoundTag jt5 = this.pendingBlockEntities.remove(fk);
-            if (jt5 != null) {
-                final BlockEntity bwl5 = this.promotePendingBlockEntity(fk, jt5);
-                if (bwl5 != null) {
-                    return bwl5;
+    public BlockEntity getBlockEntity(final BlockPos fu, final EntityCreationType a) {
+        BlockEntity cdl4 = this.blockEntities.get(fu);
+        if (cdl4 == null) {
+            final CompoundTag le5 = this.pendingBlockEntities.remove(fu);
+            if (le5 != null) {
+                final BlockEntity cdl5 = this.promotePendingBlockEntity(fu, le5);
+                if (cdl5 != null) {
+                    return cdl5;
                 }
             }
         }
-        if (bwl4 == null) {
+        if (cdl4 == null) {
             if (a == EntityCreationType.IMMEDIATE) {
-                bwl4 = this.createBlockEntity(fk);
-                this.level.setBlockEntity(fk, bwl4);
+                cdl4 = this.createBlockEntity(fu);
+                this.level.setBlockEntity(fu, cdl4);
             }
         }
-        else if (bwl4.isRemoved()) {
-            this.blockEntities.remove(fk);
+        else if (cdl4.isRemoved()) {
+            this.blockEntities.remove(fu);
             return null;
         }
-        return bwl4;
+        return cdl4;
     }
     
-    public void addBlockEntity(final BlockEntity bwl) {
-        this.setBlockEntity(bwl.getBlockPos(), bwl);
+    public void addBlockEntity(final BlockEntity cdl) {
+        this.setBlockEntity(cdl.getBlockPos(), cdl);
         if (this.loaded || this.level.isClientSide()) {
-            this.level.setBlockEntity(bwl.getBlockPos(), bwl);
+            this.level.setBlockEntity(cdl.getBlockPos(), cdl);
         }
     }
     
     @Override
-    public void setBlockEntity(final BlockPos fk, final BlockEntity bwl) {
-        if (!(this.getBlockState(fk).getBlock() instanceof EntityBlock)) {
+    public void setBlockEntity(final BlockPos fu, final BlockEntity cdl) {
+        if (!(this.getBlockState(fu).getBlock() instanceof EntityBlock)) {
             return;
         }
-        bwl.setLevelAndPosition(this.level, fk);
-        bwl.clearRemoved();
-        final BlockEntity bwl2 = this.blockEntities.put(fk.immutable(), bwl);
-        if (bwl2 != null && bwl2 != bwl) {
-            bwl2.setRemoved();
+        cdl.setLevelAndPosition(this.level, fu);
+        cdl.clearRemoved();
+        final BlockEntity cdl2 = this.blockEntities.put(fu.immutable(), cdl);
+        if (cdl2 != null && cdl2 != cdl) {
+            cdl2.setRemoved();
         }
     }
     
     @Override
-    public void setBlockEntityNbt(final CompoundTag jt) {
-        this.pendingBlockEntities.put(new BlockPos(jt.getInt("x"), jt.getInt("y"), jt.getInt("z")), jt);
+    public void setBlockEntityNbt(final CompoundTag le) {
+        this.pendingBlockEntities.put(new BlockPos(le.getInt("x"), le.getInt("y"), le.getInt("z")), le);
     }
     
     @Nullable
     @Override
-    public CompoundTag getBlockEntityNbtForSaving(final BlockPos fk) {
-        final BlockEntity bwl3 = this.getBlockEntity(fk);
-        if (bwl3 != null && !bwl3.isRemoved()) {
-            final CompoundTag jt4 = bwl3.save(new CompoundTag());
-            jt4.putBoolean("keepPacked", false);
-            return jt4;
+    public CompoundTag getBlockEntityNbtForSaving(final BlockPos fu) {
+        final BlockEntity cdl3 = this.getBlockEntity(fu);
+        if (cdl3 != null && !cdl3.isRemoved()) {
+            final CompoundTag le4 = cdl3.save(new CompoundTag());
+            le4.putBoolean("keepPacked", false);
+            return le4;
         }
-        CompoundTag jt4 = this.pendingBlockEntities.get(fk);
-        if (jt4 != null) {
-            jt4 = jt4.copy();
-            jt4.putBoolean("keepPacked", true);
+        CompoundTag le4 = this.pendingBlockEntities.get(fu);
+        if (le4 != null) {
+            le4 = le4.copy();
+            le4.putBoolean("keepPacked", true);
         }
-        return jt4;
+        return le4;
     }
     
     @Override
-    public void removeBlockEntity(final BlockPos fk) {
+    public void removeBlockEntity(final BlockPos fu) {
         if (this.loaded || this.level.isClientSide()) {
-            final BlockEntity bwl3 = this.blockEntities.remove(fk);
-            if (bwl3 != null) {
-                bwl3.setRemoved();
+            final BlockEntity cdl3 = this.blockEntities.remove(fu);
+            if (cdl3 != null) {
+                cdl3.setRemoved();
             }
         }
     }
@@ -439,24 +440,24 @@ public class LevelChunk implements ChunkAccess {
         this.unsaved = true;
     }
     
-    public void getEntities(@Nullable final Entity akq, final AABB cvf, final List<Entity> list, @Nullable final Predicate<? super Entity> predicate) {
-        int integer6 = Mth.floor((cvf.minY - 2.0) / 16.0);
-        int integer7 = Mth.floor((cvf.maxY + 2.0) / 16.0);
+    public void getEntities(@Nullable final Entity aom, final AABB deg, final List<Entity> list, @Nullable final Predicate<? super Entity> predicate) {
+        int integer6 = Mth.floor((deg.minY - 2.0) / 16.0);
+        int integer7 = Mth.floor((deg.maxY + 2.0) / 16.0);
         integer6 = Mth.clamp(integer6, 0, this.entitySections.length - 1);
         integer7 = Mth.clamp(integer7, 0, this.entitySections.length - 1);
         for (int integer8 = integer6; integer8 <= integer7; ++integer8) {
-            if (!this.entitySections[integer8].isEmpty()) {
-                for (final Entity akq2 : this.entitySections[integer8]) {
-                    if (akq2.getBoundingBox().intersects(cvf) && akq2 != akq) {
-                        if (predicate == null || predicate.test(akq2)) {
-                            list.add(akq2);
-                        }
-                        if (!(akq2 instanceof EnderDragon)) {
-                            continue;
-                        }
-                        for (final EnderDragonPart auq14 : ((EnderDragon)akq2).getSubEntities()) {
-                            if (auq14 != akq && auq14.getBoundingBox().intersects(cvf) && (predicate == null || predicate.test(auq14))) {
-                                list.add(auq14);
+            final ClassInstanceMultiMap<Entity> adk9 = this.entitySections[integer8];
+            final List<Entity> list2 = adk9.getAllInstances();
+            for (int integer9 = list2.size(), integer10 = 0; integer10 < integer9; ++integer10) {
+                final Entity aom2 = list2.get(integer10);
+                if (aom2.getBoundingBox().intersects(deg) && aom2 != aom) {
+                    if (predicate == null || predicate.test(aom2)) {
+                        list.add(aom2);
+                    }
+                    if (aom2 instanceof EnderDragon) {
+                        for (final EnderDragonPart baa17 : ((EnderDragon)aom2).getSubEntities()) {
+                            if (baa17 != aom && baa17.getBoundingBox().intersects(deg) && (predicate == null || predicate.test(baa17))) {
+                                list.add(baa17);
                             }
                         }
                     }
@@ -465,34 +466,34 @@ public class LevelChunk implements ChunkAccess {
         }
     }
     
-    public <T extends Entity> void getEntities(@Nullable final EntityType<?> aku, final AABB cvf, final List<? super T> list, final Predicate<? super T> predicate) {
-        int integer6 = Mth.floor((cvf.minY - 2.0) / 16.0);
-        int integer7 = Mth.floor((cvf.maxY + 2.0) / 16.0);
+    public <T extends Entity> void getEntities(@Nullable final EntityType<?> aoq, final AABB deg, final List<? super T> list, final Predicate<? super T> predicate) {
+        int integer6 = Mth.floor((deg.minY - 2.0) / 16.0);
+        int integer7 = Mth.floor((deg.maxY + 2.0) / 16.0);
         integer6 = Mth.clamp(integer6, 0, this.entitySections.length - 1);
         integer7 = Mth.clamp(integer7, 0, this.entitySections.length - 1);
         for (int integer8 = integer6; integer8 <= integer7; ++integer8) {
-            for (final Entity akq10 : this.entitySections[integer8].<Entity>find(Entity.class)) {
-                if (aku != null && akq10.getType() != aku) {
+            for (final Entity aom10 : this.entitySections[integer8].<Entity>find(Entity.class)) {
+                if (aoq != null && aom10.getType() != aoq) {
                     continue;
                 }
-                final T akq11 = (T)akq10;
-                if (!akq10.getBoundingBox().intersects(cvf) || !predicate.test(akq11)) {
+                final T aom11 = (T)aom10;
+                if (!aom10.getBoundingBox().intersects(deg) || !predicate.test(aom11)) {
                     continue;
                 }
-                list.add(akq11);
+                list.add(aom11);
             }
         }
     }
     
-    public <T extends Entity> void getEntitiesOfClass(final Class<? extends T> class1, final AABB cvf, final List<T> list, @Nullable final Predicate<? super T> predicate) {
-        int integer6 = Mth.floor((cvf.minY - 2.0) / 16.0);
-        int integer7 = Mth.floor((cvf.maxY + 2.0) / 16.0);
+    public <T extends Entity> void getEntitiesOfClass(final Class<? extends T> class1, final AABB deg, final List<T> list, @Nullable final Predicate<? super T> predicate) {
+        int integer6 = Mth.floor((deg.minY - 2.0) / 16.0);
+        int integer7 = Mth.floor((deg.maxY + 2.0) / 16.0);
         integer6 = Mth.clamp(integer6, 0, this.entitySections.length - 1);
         integer7 = Mth.clamp(integer7, 0, this.entitySections.length - 1);
         for (int integer8 = integer6; integer8 <= integer7; ++integer8) {
-            for (final T akq10 : this.entitySections[integer8].find(class1)) {
-                if (akq10.getBoundingBox().intersects(cvf) && (predicate == null || predicate.test(akq10))) {
-                    list.add(akq10);
+            for (final T aom10 : this.entitySections[integer8].find(class1)) {
+                if (aom10.getBoundingBox().intersects(deg) && (predicate == null || predicate.test(aom10))) {
+                    list.add(aom10);
                 }
             }
         }
@@ -507,36 +508,36 @@ public class LevelChunk implements ChunkAccess {
         return this.chunkPos;
     }
     
-    public void replaceWithPacketData(@Nullable final ChunkBiomeContainer bzz, final FriendlyByteBuf kv, final CompoundTag jt, final int integer) {
-        final boolean boolean6 = bzz != null;
-        final Predicate<BlockPos> predicate7 = boolean6 ? (fk -> true) : (fk -> (integer & 1 << (fk.getY() >> 4)) != 0x0);
+    public void replaceWithPacketData(@Nullable final ChunkBiomeContainer cgz, final FriendlyByteBuf mg, final CompoundTag le, final int integer) {
+        final boolean boolean6 = cgz != null;
+        final Predicate<BlockPos> predicate7 = boolean6 ? (fu -> true) : (fu -> (integer & 1 << (fu.getY() >> 4)) != 0x0);
         Sets.newHashSet(this.blockEntities.keySet()).stream().filter(predicate7).forEach(this.level::removeBlockEntity);
         for (int integer2 = 0; integer2 < this.sections.length; ++integer2) {
-            LevelChunkSection cam9 = this.sections[integer2];
+            LevelChunkSection chk9 = this.sections[integer2];
             if ((integer & 1 << integer2) == 0x0) {
-                if (boolean6 && cam9 != LevelChunk.EMPTY_SECTION) {
+                if (boolean6 && chk9 != LevelChunk.EMPTY_SECTION) {
                     this.sections[integer2] = LevelChunk.EMPTY_SECTION;
                 }
             }
             else {
-                if (cam9 == LevelChunk.EMPTY_SECTION) {
-                    cam9 = new LevelChunkSection(integer2 << 4);
-                    this.sections[integer2] = cam9;
+                if (chk9 == LevelChunk.EMPTY_SECTION) {
+                    chk9 = new LevelChunkSection(integer2 << 4);
+                    this.sections[integer2] = chk9;
                 }
-                cam9.read(kv);
+                chk9.read(mg);
             }
         }
-        if (bzz != null) {
-            this.biomes = bzz;
+        if (cgz != null) {
+            this.biomes = cgz;
         }
         for (final Heightmap.Types a11 : Heightmap.Types.values()) {
             final String string12 = a11.getSerializationKey();
-            if (jt.contains(string12, 12)) {
-                this.setHeightmap(a11, jt.getLongArray(string12));
+            if (le.contains(string12, 12)) {
+                this.setHeightmap(a11, le.getLongArray(string12));
             }
         }
-        for (final BlockEntity bwl9 : this.blockEntities.values()) {
-            bwl9.clearCache();
+        for (final BlockEntity cdl9 : this.blockEntities.values()) {
+            cdl9.clearCache();
         }
     }
     
@@ -567,13 +568,13 @@ public class LevelChunk implements ChunkAccess {
     }
     
     @Override
-    public CompoundTag getBlockEntityNbt(final BlockPos fk) {
-        return this.pendingBlockEntities.get(fk);
+    public CompoundTag getBlockEntityNbt(final BlockPos fu) {
+        return this.pendingBlockEntities.get(fu);
     }
     
     @Override
     public Stream<BlockPos> getLights() {
-        return StreamSupport.<BlockPos>stream(BlockPos.betweenClosed(this.chunkPos.getMinBlockX(), 0, this.chunkPos.getMinBlockZ(), this.chunkPos.getMaxBlockX(), 255, this.chunkPos.getMaxBlockZ()).spliterator(), false).filter(fk -> this.getBlockState(fk).getLightEmission() != 0);
+        return StreamSupport.<BlockPos>stream(BlockPos.betweenClosed(this.chunkPos.getMinBlockX(), 0, this.chunkPos.getMinBlockZ(), this.chunkPos.getMaxBlockX(), 255, this.chunkPos.getMaxBlockZ()).spliterator(), false).filter(fu -> this.getBlockState(fu).getLightEmission() != 0);
     }
     
     @Override
@@ -607,43 +608,43 @@ public class LevelChunk implements ChunkAccess {
     
     @Nullable
     @Override
-    public StructureStart getStartForFeature(final String string) {
-        return this.structureStarts.get(string);
+    public StructureStart<?> getStartForFeature(final StructureFeature<?> cml) {
+        return this.structureStarts.get(cml);
     }
     
     @Override
-    public void setStartForFeature(final String string, final StructureStart clv) {
-        this.structureStarts.put(string, clv);
+    public void setStartForFeature(final StructureFeature<?> cml, final StructureStart<?> ctz) {
+        this.structureStarts.put(cml, ctz);
     }
     
     @Override
-    public Map<String, StructureStart> getAllStarts() {
+    public Map<StructureFeature<?>, StructureStart<?>> getAllStarts() {
         return this.structureStarts;
     }
     
     @Override
-    public void setAllStarts(final Map<String, StructureStart> map) {
+    public void setAllStarts(final Map<StructureFeature<?>, StructureStart<?>> map) {
         this.structureStarts.clear();
         this.structureStarts.putAll(map);
     }
     
     @Override
-    public LongSet getReferencesForFeature(final String string) {
-        return this.structuresRefences.computeIfAbsent(string, string -> new LongOpenHashSet());
+    public LongSet getReferencesForFeature(final StructureFeature<?> cml) {
+        return this.structuresRefences.computeIfAbsent(cml, cml -> new LongOpenHashSet());
     }
     
     @Override
-    public void addReferenceForFeature(final String string, final long long2) {
-        this.structuresRefences.computeIfAbsent(string, string -> new LongOpenHashSet()).add(long2);
+    public void addReferenceForFeature(final StructureFeature<?> cml, final long long2) {
+        this.structuresRefences.computeIfAbsent(cml, cml -> new LongOpenHashSet()).add(long2);
     }
     
     @Override
-    public Map<String, LongSet> getAllReferences() {
+    public Map<StructureFeature<?>, LongSet> getAllReferences() {
         return this.structuresRefences;
     }
     
     @Override
-    public void setAllReferences(final Map<String, LongSet> map) {
+    public void setAllReferences(final Map<StructureFeature<?>, LongSet> map) {
         this.structuresRefences.clear();
         this.structuresRefences.putAll(map);
     }
@@ -659,50 +660,51 @@ public class LevelChunk implements ChunkAccess {
     }
     
     public void postProcessGeneration() {
-        final ChunkPos bjh2 = this.getPos();
+        final ChunkPos bph2 = this.getPos();
         for (int integer3 = 0; integer3 < this.postProcessing.length; ++integer3) {
             if (this.postProcessing[integer3] != null) {
                 for (final Short short5 : this.postProcessing[integer3]) {
-                    final BlockPos fk6 = ProtoChunk.unpackOffsetCoordinates(short5, integer3, bjh2);
-                    final BlockState byj7 = this.getBlockState(fk6);
-                    final BlockState byj8 = Block.updateFromNeighbourShapes(byj7, this.level, fk6);
-                    this.level.setBlock(fk6, byj8, 20);
+                    final BlockPos fu6 = ProtoChunk.unpackOffsetCoordinates(short5, integer3, bph2);
+                    final BlockState cfj7 = this.getBlockState(fu6);
+                    final BlockState cfj8 = Block.updateFromNeighbourShapes(cfj7, this.level, fu6);
+                    this.level.setBlock(fu6, cfj8, 20);
                 }
                 this.postProcessing[integer3].clear();
             }
         }
         this.unpackTicks();
-        for (final BlockPos fk7 : Sets.<BlockPos>newHashSet(this.pendingBlockEntities.keySet())) {
-            this.getBlockEntity(fk7);
+        for (final BlockPos fu7 : Sets.<BlockPos>newHashSet(this.pendingBlockEntities.keySet())) {
+            this.getBlockEntity(fu7);
         }
         this.pendingBlockEntities.clear();
         this.upgradeData.upgrade(this);
     }
     
     @Nullable
-    private BlockEntity promotePendingBlockEntity(final BlockPos fk, final CompoundTag jt) {
-        BlockEntity bwl4;
-        if ("DUMMY".equals(jt.getString("id"))) {
-            final Block bph5 = this.getBlockState(fk).getBlock();
-            if (bph5 instanceof EntityBlock) {
-                bwl4 = ((EntityBlock)bph5).newBlockEntity(this.level);
+    private BlockEntity promotePendingBlockEntity(final BlockPos fu, final CompoundTag le) {
+        final BlockState cfj5 = this.getBlockState(fu);
+        BlockEntity cdl4;
+        if ("DUMMY".equals(le.getString("id"))) {
+            final Block bvr6 = cfj5.getBlock();
+            if (bvr6 instanceof EntityBlock) {
+                cdl4 = ((EntityBlock)bvr6).newBlockEntity(this.level);
             }
             else {
-                bwl4 = null;
-                LevelChunk.LOGGER.warn("Tried to load a DUMMY block entity @ {} but found not block entity block {} at location", fk, this.getBlockState(fk));
+                cdl4 = null;
+                LevelChunk.LOGGER.warn("Tried to load a DUMMY block entity @ {} but found not block entity block {} at location", fu, cfj5);
             }
         }
         else {
-            bwl4 = BlockEntity.loadStatic(jt);
+            cdl4 = BlockEntity.loadStatic(cfj5, le);
         }
-        if (bwl4 != null) {
-            bwl4.setLevelAndPosition(this.level, fk);
-            this.addBlockEntity(bwl4);
+        if (cdl4 != null) {
+            cdl4.setLevelAndPosition(this.level, fu);
+            this.addBlockEntity(cdl4);
         }
         else {
-            LevelChunk.LOGGER.warn("Tried to load a block entity for block {} but failed at location {}", this.getBlockState(fk), fk);
+            LevelChunk.LOGGER.warn("Tried to load a block entity for block {} but failed at location {}", cfj5, fu);
         }
-        return bwl4;
+        return cdl4;
     }
     
     @Override
@@ -717,30 +719,30 @@ public class LevelChunk implements ChunkAccess {
     
     public void unpackTicks() {
         if (this.blockTicks instanceof ProtoTickList) {
-            ((ProtoTickList)this.blockTicks).copyOut(this.level.getBlockTicks(), fk -> this.getBlockState(fk).getBlock());
+            ((ProtoTickList)this.blockTicks).copyOut(this.level.getBlockTicks(), fu -> this.getBlockState(fu).getBlock());
             this.blockTicks = EmptyTickList.empty();
         }
         else if (this.blockTicks instanceof ChunkTickList) {
-            this.level.getBlockTicks().addAll(((ChunkTickList)this.blockTicks).ticks());
+            ((ChunkTickList)this.blockTicks).copyOut(this.level.getBlockTicks());
             this.blockTicks = EmptyTickList.empty();
         }
         if (this.liquidTicks instanceof ProtoTickList) {
-            ((ProtoTickList)this.liquidTicks).copyOut(this.level.getLiquidTicks(), fk -> this.getFluidState(fk).getType());
+            ((ProtoTickList)this.liquidTicks).copyOut(this.level.getLiquidTicks(), fu -> this.getFluidState(fu).getType());
             this.liquidTicks = EmptyTickList.empty();
         }
         else if (this.liquidTicks instanceof ChunkTickList) {
-            this.level.getLiquidTicks().addAll(((ChunkTickList)this.liquidTicks).ticks());
+            ((ChunkTickList)this.liquidTicks).copyOut(this.level.getLiquidTicks());
             this.liquidTicks = EmptyTickList.empty();
         }
     }
     
-    public void packTicks(final ServerLevel xd) {
+    public void packTicks(final ServerLevel zd) {
         if (this.blockTicks == EmptyTickList.empty()) {
-            this.blockTicks = new ChunkTickList<Block>(Registry.BLOCK::getKey, xd.getBlockTicks().fetchTicksInChunk(this.chunkPos, true, false));
+            this.blockTicks = new ChunkTickList<Block>(Registry.BLOCK::getKey, zd.getBlockTicks().fetchTicksInChunk(this.chunkPos, true, false), zd.getGameTime());
             this.setUnsaved(true);
         }
         if (this.liquidTicks == EmptyTickList.empty()) {
-            this.liquidTicks = new ChunkTickList<Fluid>(Registry.FLUID::getKey, xd.getLiquidTicks().fetchTicksInChunk(this.chunkPos, true, false));
+            this.liquidTicks = new ChunkTickList<Fluid>(Registry.FLUID::getKey, zd.getLiquidTicks().fetchTicksInChunk(this.chunkPos, true, false), zd.getGameTime());
             this.setUnsaved(true);
         }
     }
diff --git a/src/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/net/minecraft/world/level/chunk/LevelChunkSection.java
index 42dac50..12baec9 100644
--- a/src/net/minecraft/world/level/chunk/LevelChunkSection.java
+++ b/src/net/minecraft/world/level/chunk/LevelChunkSection.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.level.chunk;
 
+import java.util.function.Predicate;
 import net.minecraft.network.FriendlyByteBuf;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.material.FluidState;
@@ -44,47 +45,47 @@ public class LevelChunkSection {
         this.states.release();
     }
     
-    public BlockState setBlockState(final int integer1, final int integer2, final int integer3, final BlockState byj) {
-        return this.setBlockState(integer1, integer2, integer3, byj, true);
+    public BlockState setBlockState(final int integer1, final int integer2, final int integer3, final BlockState cfj) {
+        return this.setBlockState(integer1, integer2, integer3, cfj, true);
     }
     
-    public BlockState setBlockState(final int integer1, final int integer2, final int integer3, final BlockState byj, final boolean boolean5) {
-        BlockState byj2;
+    public BlockState setBlockState(final int integer1, final int integer2, final int integer3, final BlockState cfj, final boolean boolean5) {
+        BlockState cfj2;
         if (boolean5) {
-            byj2 = this.states.getAndSet(integer1, integer2, integer3, byj);
+            cfj2 = this.states.getAndSet(integer1, integer2, integer3, cfj);
         }
         else {
-            byj2 = this.states.getAndSetUnchecked(integer1, integer2, integer3, byj);
+            cfj2 = this.states.getAndSetUnchecked(integer1, integer2, integer3, cfj);
         }
-        final FluidState coj8 = byj2.getFluidState();
-        final FluidState coj9 = byj.getFluidState();
-        if (!byj2.isAir()) {
+        final FluidState cxa8 = cfj2.getFluidState();
+        final FluidState cxa9 = cfj.getFluidState();
+        if (!cfj2.isAir()) {
             --this.nonEmptyBlockCount;
-            if (byj2.isRandomlyTicking()) {
+            if (cfj2.isRandomlyTicking()) {
                 --this.tickingBlockCount;
             }
         }
-        if (!coj8.isEmpty()) {
+        if (!cxa8.isEmpty()) {
             --this.tickingFluidCount;
         }
-        if (!byj.isAir()) {
+        if (!cfj.isAir()) {
             ++this.nonEmptyBlockCount;
-            if (byj.isRandomlyTicking()) {
+            if (cfj.isRandomlyTicking()) {
                 ++this.tickingBlockCount;
             }
         }
-        if (!coj9.isEmpty()) {
+        if (!cxa9.isEmpty()) {
             ++this.tickingFluidCount;
         }
-        return byj2;
+        return cfj2;
     }
     
     public boolean isEmpty() {
         return this.nonEmptyBlockCount == 0;
     }
     
-    public static boolean isEmpty(@Nullable final LevelChunkSection cam) {
-        return cam == LevelChunk.EMPTY_SECTION || cam.isEmpty();
+    public static boolean isEmpty(@Nullable final LevelChunkSection chk) {
+        return chk == LevelChunk.EMPTY_SECTION || chk.isEmpty();
     }
     
     public boolean isRandomlyTicking() {
@@ -107,18 +108,18 @@ public class LevelChunkSection {
         this.nonEmptyBlockCount = 0;
         this.tickingBlockCount = 0;
         this.tickingFluidCount = 0;
-        final FluidState coj4;
-        this.states.count((byj, integer) -> {
-            coj4 = byj.getFluidState();
-            if (!byj.isAir()) {
+        final FluidState cxa4;
+        this.states.count((cfj, integer) -> {
+            cxa4 = cfj.getFluidState();
+            if (!cfj.isAir()) {
                 this.nonEmptyBlockCount += integer;
-                if (byj.isRandomlyTicking()) {
+                if (cfj.isRandomlyTicking()) {
                     this.tickingBlockCount += integer;
                 }
             }
-            if (!coj4.isEmpty()) {
+            if (!cxa4.isEmpty()) {
                 this.nonEmptyBlockCount += integer;
-                if (coj4.isRandomlyTicking()) {
+                if (cxa4.isRandomlyTicking()) {
                     this.tickingFluidCount += integer;
                 }
             }
@@ -129,22 +130,22 @@ public class LevelChunkSection {
         return this.states;
     }
     
-    public void read(final FriendlyByteBuf kv) {
-        this.nonEmptyBlockCount = kv.readShort();
-        this.states.read(kv);
+    public void read(final FriendlyByteBuf mg) {
+        this.nonEmptyBlockCount = mg.readShort();
+        this.states.read(mg);
     }
     
-    public void write(final FriendlyByteBuf kv) {
-        kv.writeShort(this.nonEmptyBlockCount);
-        this.states.write(kv);
+    public void write(final FriendlyByteBuf mg) {
+        mg.writeShort(this.nonEmptyBlockCount);
+        this.states.write(mg);
     }
     
     public int getSerializedSize() {
         return 2 + this.states.getSerializedSize();
     }
     
-    public boolean maybeHas(final BlockState byj) {
-        return this.states.maybeHas(byj);
+    public boolean maybeHas(final Predicate<BlockState> predicate) {
+        return this.states.maybeHas(predicate);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/chunk/LightChunkGetter.java b/src/net/minecraft/world/level/chunk/LightChunkGetter.java
index 6fa5aac..6fd43b4 100644
--- a/src/net/minecraft/world/level/chunk/LightChunkGetter.java
+++ b/src/net/minecraft/world/level/chunk/LightChunkGetter.java
@@ -9,7 +9,7 @@ public interface LightChunkGetter {
     @Nullable
     BlockGetter getChunkForLighting(final int integer1, final int integer2);
     
-    default void onLightUpdate(final LightLayer bkf, final SectionPos gd) {
+    default void onLightUpdate(final LightLayer bqi, final SectionPos go) {
     }
     
     BlockGetter getLevel();
diff --git a/src/net/minecraft/world/level/chunk/LinearPalette.java b/src/net/minecraft/world/level/chunk/LinearPalette.java
index 260c57c..62c6099 100644
--- a/src/net/minecraft/world/level/chunk/LinearPalette.java
+++ b/src/net/minecraft/world/level/chunk/LinearPalette.java
@@ -3,7 +3,7 @@ package net.minecraft.world.level.chunk;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.network.FriendlyByteBuf;
 import javax.annotation.Nullable;
-import org.apache.commons.lang3.ArrayUtils;
+import java.util.function.Predicate;
 import net.minecraft.nbt.CompoundTag;
 import java.util.function.Function;
 import net.minecraft.core.IdMapper;
@@ -16,11 +16,11 @@ public class LinearPalette<T> implements Palette<T> {
     private final int bits;
     private int size;
     
-    public LinearPalette(final IdMapper<T> ft, final int integer, final PaletteResize<T> car, final Function<CompoundTag, T> function) {
-        this.registry = ft;
+    public LinearPalette(final IdMapper<T> ge, final int integer, final PaletteResize<T> chp, final Function<CompoundTag, T> function) {
+        this.registry = ge;
         this.values = (T[])new Object[1 << integer];
         this.bits = integer;
-        this.resizeHandler = car;
+        this.resizeHandler = chp;
         this.reader = function;
     }
     
@@ -41,8 +41,13 @@ public class LinearPalette<T> implements Palette<T> {
     }
     
     @Override
-    public boolean maybeHas(final T object) {
-        return ArrayUtils.contains((Object[])this.values, object);
+    public boolean maybeHas(final Predicate<T> predicate) {
+        for (int integer3 = 0; integer3 < this.size; ++integer3) {
+            if (predicate.test(this.values[integer3])) {
+                return true;
+            }
+        }
+        return false;
     }
     
     @Nullable
@@ -55,18 +60,18 @@ public class LinearPalette<T> implements Palette<T> {
     }
     
     @Override
-    public void read(final FriendlyByteBuf kv) {
-        this.size = kv.readVarInt();
+    public void read(final FriendlyByteBuf mg) {
+        this.size = mg.readVarInt();
         for (int integer3 = 0; integer3 < this.size; ++integer3) {
-            this.values[integer3] = this.registry.byId(kv.readVarInt());
+            this.values[integer3] = this.registry.byId(mg.readVarInt());
         }
     }
     
     @Override
-    public void write(final FriendlyByteBuf kv) {
-        kv.writeVarInt(this.size);
+    public void write(final FriendlyByteBuf mg) {
+        mg.writeVarInt(this.size);
         for (int integer3 = 0; integer3 < this.size; ++integer3) {
-            kv.writeVarInt(this.registry.getId(this.values[integer3]));
+            mg.writeVarInt(this.registry.getId(this.values[integer3]));
         }
     }
     
@@ -84,10 +89,10 @@ public class LinearPalette<T> implements Palette<T> {
     }
     
     @Override
-    public void read(final ListTag jz) {
-        for (int integer3 = 0; integer3 < jz.size(); ++integer3) {
-            this.values[integer3] = this.reader.apply(jz.getCompound(integer3));
+    public void read(final ListTag lk) {
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            this.values[integer3] = this.reader.apply(lk.getCompound(integer3));
         }
-        this.size = jz.size();
+        this.size = lk.size();
     }
 }
diff --git a/src/net/minecraft/world/level/chunk/Palette.java b/src/net/minecraft/world/level/chunk/Palette.java
index 75082eb..03e2040 100644
--- a/src/net/minecraft/world/level/chunk/Palette.java
+++ b/src/net/minecraft/world/level/chunk/Palette.java
@@ -3,20 +3,21 @@ package net.minecraft.world.level.chunk;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.network.FriendlyByteBuf;
 import javax.annotation.Nullable;
+import java.util.function.Predicate;
 
 public interface Palette<T> {
     int idFor(final T object);
     
-    boolean maybeHas(final T object);
+    boolean maybeHas(final Predicate<T> predicate);
     
     @Nullable
     T valueFor(final int integer);
     
-    void read(final FriendlyByteBuf kv);
+    void read(final FriendlyByteBuf mg);
     
-    void write(final FriendlyByteBuf kv);
+    void write(final FriendlyByteBuf mg);
     
     int getSerializedSize();
     
-    void read(final ListTag jz);
+    void read(final ListTag lk);
 }
diff --git a/src/net/minecraft/world/level/chunk/PalettedContainer.java b/src/net/minecraft/world/level/chunk/PalettedContainer.java
index d27d321..cca1162 100644
--- a/src/net/minecraft/world/level/chunk/PalettedContainer.java
+++ b/src/net/minecraft/world/level/chunk/PalettedContainer.java
@@ -35,10 +35,10 @@ public class PalettedContainer<T> implements PaletteResize<T> {
     public void acquire() {
         if (this.lock.isLocked() && !this.lock.isHeldByCurrentThread()) {
             final String string2 = Thread.getAllStackTraces().keySet().stream().filter(Objects::nonNull).map(thread -> thread.getName() + ": \n\tat " + Arrays.<StackTraceElement>stream(thread.getStackTrace()).map(Object::toString).collect(Collectors.joining("\n\tat "))).collect(Collectors.joining("\n"));
-            final CrashReport h3 = new CrashReport("Writing into PalettedContainer from multiple threads", new IllegalStateException());
-            final CrashReportCategory i4 = h3.addCategory("Thread dumps");
-            i4.setDetail("Thread dumps", string2);
-            throw new ReportedException(h3);
+            final CrashReport j3 = new CrashReport("Writing into PalettedContainer from multiple threads", new IllegalStateException());
+            final CrashReportCategory k4 = j3.addCategory("Thread dumps");
+            k4.setDetail("Thread dumps", string2);
+            throw new ReportedException(j3);
         }
         this.lock.lock();
     }
@@ -47,11 +47,11 @@ public class PalettedContainer<T> implements PaletteResize<T> {
         this.lock.unlock();
     }
     
-    public PalettedContainer(final Palette<T> caq, final IdMapper<T> ft, final Function<CompoundTag, T> function3, final Function<T, CompoundTag> function4, final T object) {
+    public PalettedContainer(final Palette<T> cho, final IdMapper<T> ge, final Function<CompoundTag, T> function3, final Function<T, CompoundTag> function4, final T object) {
         this.dummyPaletteResize = ((integer, object) -> 0);
         this.lock = new ReentrantLock();
-        this.globalPalette = caq;
-        this.registry = ft;
+        this.globalPalette = cho;
+        this.registry = ge;
         this.reader = function3;
         this.writer = function4;
         this.defaultValue = object;
@@ -85,11 +85,11 @@ public class PalettedContainer<T> implements PaletteResize<T> {
     @Override
     public int onResize(final int integer, final T object) {
         this.acquire();
-        final BitStorage abd4 = this.storage;
-        final Palette<T> caq5 = this.palette;
+        final BitStorage adj4 = this.storage;
+        final Palette<T> cho5 = this.palette;
         this.setBits(integer);
-        for (int integer2 = 0; integer2 < abd4.getSize(); ++integer2) {
-            final T object2 = caq5.valueFor(abd4.get(integer2));
+        for (int integer2 = 0; integer2 < adj4.getSize(); ++integer2) {
+            final T object2 = cho5.valueFor(adj4.get(integer2));
             if (object2 != null) {
                 this.set(integer2, object2);
             }
@@ -131,76 +131,76 @@ public class PalettedContainer<T> implements PaletteResize<T> {
         return (object3 == null) ? this.defaultValue : object3;
     }
     
-    public void read(final FriendlyByteBuf kv) {
+    public void read(final FriendlyByteBuf mg) {
         this.acquire();
-        final int integer3 = kv.readByte();
+        final int integer3 = mg.readByte();
         if (this.bits != integer3) {
             this.setBits(integer3);
         }
-        this.palette.read(kv);
-        kv.readLongArray(this.storage.getRaw());
+        this.palette.read(mg);
+        mg.readLongArray(this.storage.getRaw());
         this.release();
     }
     
-    public void write(final FriendlyByteBuf kv) {
+    public void write(final FriendlyByteBuf mg) {
         this.acquire();
-        kv.writeByte(this.bits);
-        this.palette.write(kv);
-        kv.writeLongArray(this.storage.getRaw());
+        mg.writeByte(this.bits);
+        this.palette.write(mg);
+        mg.writeLongArray(this.storage.getRaw());
         this.release();
     }
     
-    public void read(final ListTag jz, final long[] arr) {
+    public void read(final ListTag lk, final long[] arr) {
         this.acquire();
-        final int integer4 = Math.max(4, Mth.ceillog2(jz.size()));
+        final int integer4 = Math.max(4, Mth.ceillog2(lk.size()));
         if (integer4 != this.bits) {
             this.setBits(integer4);
         }
-        this.palette.read(jz);
+        this.palette.read(lk);
         final int integer5 = arr.length * 64 / 4096;
         if (this.palette == this.globalPalette) {
-            final Palette<T> caq6 = new HashMapPalette<T>(this.registry, integer4, this.dummyPaletteResize, this.reader, this.writer);
-            caq6.read(jz);
-            final BitStorage abd7 = new BitStorage(integer4, 4096, arr);
+            final Palette<T> cho6 = new HashMapPalette<T>(this.registry, integer4, this.dummyPaletteResize, this.reader, this.writer);
+            cho6.read(lk);
+            final BitStorage adj7 = new BitStorage(integer4, 4096, arr);
             for (int integer6 = 0; integer6 < 4096; ++integer6) {
-                this.storage.set(integer6, this.globalPalette.idFor(caq6.valueFor(abd7.get(integer6))));
+                this.storage.set(integer6, this.globalPalette.idFor(cho6.valueFor(adj7.get(integer6))));
             }
         }
         else if (integer5 == this.bits) {
             System.arraycopy(arr, 0, this.storage.getRaw(), 0, arr.length);
         }
         else {
-            final BitStorage abd8 = new BitStorage(integer5, 4096, arr);
+            final BitStorage adj8 = new BitStorage(integer5, 4096, arr);
             for (int integer7 = 0; integer7 < 4096; ++integer7) {
-                this.storage.set(integer7, abd8.get(integer7));
+                this.storage.set(integer7, adj8.get(integer7));
             }
         }
         this.release();
     }
     
-    public void write(final CompoundTag jt, final String string2, final String string3) {
+    public void write(final CompoundTag le, final String string2, final String string3) {
         this.acquire();
-        final HashMapPalette<T> caj5 = new HashMapPalette<T>(this.registry, this.bits, this.dummyPaletteResize, this.reader, this.writer);
+        final HashMapPalette<T> chh5 = new HashMapPalette<T>(this.registry, this.bits, this.dummyPaletteResize, this.reader, this.writer);
         T object6 = this.defaultValue;
-        int integer7 = caj5.idFor(this.defaultValue);
+        int integer7 = chh5.idFor(this.defaultValue);
         final int[] arr8 = new int[4096];
         for (int integer8 = 0; integer8 < 4096; ++integer8) {
             final T object7 = this.get(integer8);
             if (object7 != object6) {
                 object6 = object7;
-                integer7 = caj5.idFor(object7);
+                integer7 = chh5.idFor(object7);
             }
             arr8[integer8] = integer7;
         }
-        final ListTag jz9 = new ListTag();
-        caj5.write(jz9);
-        jt.put(string2, jz9);
-        final int integer9 = Math.max(4, Mth.ceillog2(jz9.size()));
-        final BitStorage abd11 = new BitStorage(integer9, 4096);
+        final ListTag lk9 = new ListTag();
+        chh5.write(lk9);
+        le.put(string2, lk9);
+        final int integer9 = Math.max(4, Mth.ceillog2(lk9.size()));
+        final BitStorage adj11 = new BitStorage(integer9, 4096);
         for (int integer10 = 0; integer10 < arr8.length; ++integer10) {
-            abd11.set(integer10, arr8[integer10]);
+            adj11.set(integer10, arr8[integer10]);
         }
-        jt.putLongArray(string3, abd11.getRaw());
+        le.putLongArray(string3, adj11.getRaw());
         this.release();
     }
     
@@ -208,8 +208,8 @@ public class PalettedContainer<T> implements PaletteResize<T> {
         return 1 + this.palette.getSerializedSize() + FriendlyByteBuf.getVarIntSize(this.storage.getSize()) + this.storage.getRaw().length * 8;
     }
     
-    public boolean maybeHas(final T object) {
-        return this.palette.maybeHas(object);
+    public boolean maybeHas(final Predicate<T> predicate) {
+        return this.palette.maybeHas(predicate);
     }
     
     public void count(final CountConsumer<T> a) {
diff --git a/src/net/minecraft/world/level/chunk/ProtoChunk.java b/src/net/minecraft/world/level/chunk/ProtoChunk.java
index 4e3db89..d766737 100644
--- a/src/net/minecraft/world/level/chunk/ProtoChunk.java
+++ b/src/net/minecraft/world/level/chunk/ProtoChunk.java
@@ -16,6 +16,7 @@ import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import net.minecraft.world.level.material.Fluids;
@@ -25,6 +26,7 @@ import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.block.Block;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import it.unimi.dsi.fastutil.shorts.ShortList;
 import java.util.List;
 import net.minecraft.nbt.CompoundTag;
@@ -53,8 +55,8 @@ public class ProtoChunk implements ChunkAccess {
     private final List<CompoundTag> entities;
     private final List<BlockPos> lights;
     private final ShortList[] postProcessing;
-    private final Map<String, StructureStart> structureStarts;
-    private final Map<String, LongSet> structuresRefences;
+    private final Map<StructureFeature<?>, StructureStart<?>> structureStarts;
+    private final Map<StructureFeature<?>, LongSet> structuresRefences;
     private final UpgradeData upgradeData;
     private final ProtoTickList<Block> blockTicks;
     private final ProtoTickList<Fluid> liquidTicks;
@@ -62,11 +64,11 @@ public class ProtoChunk implements ChunkAccess {
     private final Map<GenerationStep.Carving, BitSet> carvingMasks;
     private volatile boolean isLightCorrect;
     
-    public ProtoChunk(final ChunkPos bjh, final UpgradeData cav) {
-        this(bjh, cav, null, new ProtoTickList<Block>(bph -> bph == null || bph.defaultBlockState().isAir(), bjh), new ProtoTickList<Fluid>(coi -> coi == null || coi == Fluids.EMPTY, bjh));
+    public ProtoChunk(final ChunkPos bph, final UpgradeData cht) {
+        this(bph, cht, null, new ProtoTickList<Block>(bvr -> bvr == null || bvr.defaultBlockState().isAir(), bph), new ProtoTickList<Fluid>(cwz -> cwz == null || cwz == Fluids.EMPTY, bph));
     }
     
-    public ProtoChunk(final ChunkPos bjh, final UpgradeData cav, @Nullable final LevelChunkSection[] arr, final ProtoTickList<Block> cau4, final ProtoTickList<Fluid> cau5) {
+    public ProtoChunk(final ChunkPos bph, final UpgradeData cht, @Nullable final LevelChunkSection[] arr, final ProtoTickList<Block> chs4, final ProtoTickList<Fluid> chs5) {
         this.heightmaps = Maps.newEnumMap(Heightmap.Types.class);
         this.status = ChunkStatus.EMPTY;
         this.blockEntities = Maps.newHashMap();
@@ -77,11 +79,11 @@ public class ProtoChunk implements ChunkAccess {
         this.postProcessing = new ShortList[16];
         this.structureStarts = Maps.newHashMap();
         this.structuresRefences = Maps.newHashMap();
-        this.carvingMasks = Maps.newHashMap();
-        this.chunkPos = bjh;
-        this.upgradeData = cav;
-        this.blockTicks = cau4;
-        this.liquidTicks = cau5;
+        this.carvingMasks = (Map<GenerationStep.Carving, BitSet>)new Object2ObjectArrayMap();
+        this.chunkPos = bph;
+        this.upgradeData = cht;
+        this.blockTicks = chs4;
+        this.liquidTicks = chs5;
         if (arr != null) {
             if (this.sections.length == arr.length) {
                 System.arraycopy(arr, 0, this.sections, 0, this.sections.length);
@@ -93,29 +95,29 @@ public class ProtoChunk implements ChunkAccess {
     }
     
     @Override
-    public BlockState getBlockState(final BlockPos fk) {
-        final int integer3 = fk.getY();
+    public BlockState getBlockState(final BlockPos fu) {
+        final int integer3 = fu.getY();
         if (Level.isOutsideBuildHeight(integer3)) {
             return Blocks.VOID_AIR.defaultBlockState();
         }
-        final LevelChunkSection cam4 = this.getSections()[integer3 >> 4];
-        if (LevelChunkSection.isEmpty(cam4)) {
+        final LevelChunkSection chk4 = this.getSections()[integer3 >> 4];
+        if (LevelChunkSection.isEmpty(chk4)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return cam4.getBlockState(fk.getX() & 0xF, integer3 & 0xF, fk.getZ() & 0xF);
+        return chk4.getBlockState(fu.getX() & 0xF, integer3 & 0xF, fu.getZ() & 0xF);
     }
     
     @Override
-    public FluidState getFluidState(final BlockPos fk) {
-        final int integer3 = fk.getY();
+    public FluidState getFluidState(final BlockPos fu) {
+        final int integer3 = fu.getY();
         if (Level.isOutsideBuildHeight(integer3)) {
             return Fluids.EMPTY.defaultFluidState();
         }
-        final LevelChunkSection cam4 = this.getSections()[integer3 >> 4];
-        if (LevelChunkSection.isEmpty(cam4)) {
+        final LevelChunkSection chk4 = this.getSections()[integer3 >> 4];
+        if (LevelChunkSection.isEmpty(chk4)) {
             return Fluids.EMPTY.defaultFluidState();
         }
-        return cam4.getFluidState(fk.getX() & 0xF, integer3 & 0xF, fk.getZ() & 0xF);
+        return chk4.getFluidState(fu.getX() & 0xF, integer3 & 0xF, fu.getZ() & 0xF);
     }
     
     @Override
@@ -125,8 +127,8 @@ public class ProtoChunk implements ChunkAccess {
     
     public ShortList[] getPackedLights() {
         final ShortList[] arr2 = new ShortList[16];
-        for (final BlockPos fk4 : this.lights) {
-            ChunkAccess.getOrCreateOffsetList(arr2, fk4.getY() >> 4).add(packOffsetCoordinates(fk4));
+        for (final BlockPos fu4 : this.lights) {
+            ChunkAccess.getOrCreateOffsetList(arr2, fu4.getY() >> 4).add(packOffsetCoordinates(fu4));
         }
         return arr2;
     }
@@ -135,36 +137,36 @@ public class ProtoChunk implements ChunkAccess {
         this.addLight(unpackOffsetCoordinates(short1, integer, this.chunkPos));
     }
     
-    public void addLight(final BlockPos fk) {
-        this.lights.add(fk.immutable());
+    public void addLight(final BlockPos fu) {
+        this.lights.add(fu.immutable());
     }
     
     @Nullable
     @Override
-    public BlockState setBlockState(final BlockPos fk, final BlockState byj, final boolean boolean3) {
-        final int integer5 = fk.getX();
-        final int integer6 = fk.getY();
-        final int integer7 = fk.getZ();
+    public BlockState setBlockState(final BlockPos fu, final BlockState cfj, final boolean boolean3) {
+        final int integer5 = fu.getX();
+        final int integer6 = fu.getY();
+        final int integer7 = fu.getZ();
         if (integer6 < 0 || integer6 >= 256) {
             return Blocks.VOID_AIR.defaultBlockState();
         }
-        if (this.sections[integer6 >> 4] == LevelChunk.EMPTY_SECTION && byj.getBlock() == Blocks.AIR) {
-            return byj;
+        if (this.sections[integer6 >> 4] == LevelChunk.EMPTY_SECTION && cfj.is(Blocks.AIR)) {
+            return cfj;
         }
-        if (byj.getLightEmission() > 0) {
+        if (cfj.getLightEmission() > 0) {
             this.lights.add(new BlockPos((integer5 & 0xF) + this.getPos().getMinBlockX(), integer6, (integer7 & 0xF) + this.getPos().getMinBlockZ()));
         }
-        final LevelChunkSection cam8 = this.getOrCreateSection(integer6 >> 4);
-        final BlockState byj2 = cam8.setBlockState(integer5 & 0xF, integer6 & 0xF, integer7 & 0xF, byj);
-        if (this.status.isOrAfter(ChunkStatus.FEATURES) && byj != byj2 && (byj.getLightBlock(this, fk) != byj2.getLightBlock(this, fk) || byj.getLightEmission() != byj2.getLightEmission() || byj.useShapeForLightOcclusion() || byj2.useShapeForLightOcclusion())) {
-            final LevelLightEngine coa10 = this.getLightEngine();
-            coa10.checkBlock(fk);
+        final LevelChunkSection chk8 = this.getOrCreateSection(integer6 >> 4);
+        final BlockState cfj2 = chk8.setBlockState(integer5 & 0xF, integer6 & 0xF, integer7 & 0xF, cfj);
+        if (this.status.isOrAfter(ChunkStatus.FEATURES) && cfj != cfj2 && (cfj.getLightBlock(this, fu) != cfj2.getLightBlock(this, fu) || cfj.getLightEmission() != cfj2.getLightEmission() || cfj.useShapeForLightOcclusion() || cfj2.useShapeForLightOcclusion())) {
+            final LevelLightEngine cwr10 = this.getLightEngine();
+            cwr10.checkBlock(fu);
         }
         final EnumSet<Heightmap.Types> enumSet10 = this.getStatus().heightmapsAfter();
         EnumSet<Heightmap.Types> enumSet11 = null;
         for (final Heightmap.Types a13 : enumSet10) {
-            final Heightmap cbv14 = this.heightmaps.get(a13);
-            if (cbv14 == null) {
+            final Heightmap cio14 = this.heightmaps.get(a13);
+            if (cio14 == null) {
                 if (enumSet11 == null) {
                     enumSet11 = EnumSet.<Heightmap.Types>noneOf(Heightmap.Types.class);
                 }
@@ -175,9 +177,9 @@ public class ProtoChunk implements ChunkAccess {
             Heightmap.primeHeightmaps(this, enumSet11);
         }
         for (final Heightmap.Types a13 : enumSet10) {
-            this.heightmaps.get(a13).update(integer5 & 0xF, integer6, integer7 & 0xF, byj);
+            this.heightmaps.get(a13).update(integer5 & 0xF, integer6, integer7 & 0xF, cfj);
         }
-        return byj2;
+        return cfj2;
     }
     
     public LevelChunkSection getOrCreateSection(final int integer) {
@@ -188,9 +190,9 @@ public class ProtoChunk implements ChunkAccess {
     }
     
     @Override
-    public void setBlockEntity(final BlockPos fk, final BlockEntity bwl) {
-        bwl.setPosition(fk);
-        this.blockEntities.put(fk, bwl);
+    public void setBlockEntity(final BlockPos fu, final BlockEntity cdl) {
+        cdl.setPosition(fu);
+        this.blockEntities.put(fu, cdl);
     }
     
     @Override
@@ -202,31 +204,34 @@ public class ProtoChunk implements ChunkAccess {
     
     @Nullable
     @Override
-    public BlockEntity getBlockEntity(final BlockPos fk) {
-        return this.blockEntities.get(fk);
+    public BlockEntity getBlockEntity(final BlockPos fu) {
+        return this.blockEntities.get(fu);
     }
     
     public Map<BlockPos, BlockEntity> getBlockEntities() {
         return this.blockEntities;
     }
     
-    public void addEntity(final CompoundTag jt) {
-        this.entities.add(jt);
+    public void addEntity(final CompoundTag le) {
+        this.entities.add(le);
     }
     
     @Override
-    public void addEntity(final Entity akq) {
-        final CompoundTag jt3 = new CompoundTag();
-        akq.save(jt3);
-        this.addEntity(jt3);
+    public void addEntity(final Entity aom) {
+        if (aom.isPassenger()) {
+            return;
+        }
+        final CompoundTag le3 = new CompoundTag();
+        aom.save(le3);
+        this.addEntity(le3);
     }
     
     public List<CompoundTag> getEntities() {
         return this.entities;
     }
     
-    public void setBiomes(final ChunkBiomeContainer bzz) {
-        this.biomes = bzz;
+    public void setBiomes(final ChunkBiomeContainer cgz) {
+        this.biomes = cgz;
     }
     
     @Nullable
@@ -250,8 +255,8 @@ public class ProtoChunk implements ChunkAccess {
         return this.status;
     }
     
-    public void setStatus(final ChunkStatus cae) {
-        this.status = cae;
+    public void setStatus(final ChunkStatus chc) {
+        this.status = chc;
         this.setUnsaved(true);
     }
     
@@ -282,12 +287,12 @@ public class ProtoChunk implements ChunkAccess {
     
     @Override
     public int getHeight(final Heightmap.Types a, final int integer2, final int integer3) {
-        Heightmap cbv5 = this.heightmaps.get(a);
-        if (cbv5 == null) {
+        Heightmap cio5 = this.heightmaps.get(a);
+        if (cio5 == null) {
             Heightmap.primeHeightmaps(this, EnumSet.<Heightmap.Types>of(a));
-            cbv5 = this.heightmaps.get(a);
+            cio5 = this.heightmaps.get(a);
         }
-        return cbv5.getFirstAvailable(integer2 & 0xF, integer3 & 0xF) - 1;
+        return cio5.getFirstAvailable(integer2 & 0xF, integer3 & 0xF) - 1;
     }
     
     @Override
@@ -301,72 +306,72 @@ public class ProtoChunk implements ChunkAccess {
     
     @Nullable
     @Override
-    public StructureStart getStartForFeature(final String string) {
-        return this.structureStarts.get(string);
+    public StructureStart<?> getStartForFeature(final StructureFeature<?> cml) {
+        return this.structureStarts.get(cml);
     }
     
     @Override
-    public void setStartForFeature(final String string, final StructureStart clv) {
-        this.structureStarts.put(string, clv);
+    public void setStartForFeature(final StructureFeature<?> cml, final StructureStart<?> ctz) {
+        this.structureStarts.put(cml, ctz);
         this.isDirty = true;
     }
     
     @Override
-    public Map<String, StructureStart> getAllStarts() {
-        return Collections.<String, StructureStart>unmodifiableMap(this.structureStarts);
+    public Map<StructureFeature<?>, StructureStart<?>> getAllStarts() {
+        return Collections.<StructureFeature<?>, StructureStart<?>>unmodifiableMap(this.structureStarts);
     }
     
     @Override
-    public void setAllStarts(final Map<String, StructureStart> map) {
+    public void setAllStarts(final Map<StructureFeature<?>, StructureStart<?>> map) {
         this.structureStarts.clear();
         this.structureStarts.putAll(map);
         this.isDirty = true;
     }
     
     @Override
-    public LongSet getReferencesForFeature(final String string) {
-        return this.structuresRefences.computeIfAbsent(string, string -> new LongOpenHashSet());
+    public LongSet getReferencesForFeature(final StructureFeature<?> cml) {
+        return this.structuresRefences.computeIfAbsent(cml, cml -> new LongOpenHashSet());
     }
     
     @Override
-    public void addReferenceForFeature(final String string, final long long2) {
-        this.structuresRefences.computeIfAbsent(string, string -> new LongOpenHashSet()).add(long2);
+    public void addReferenceForFeature(final StructureFeature<?> cml, final long long2) {
+        this.structuresRefences.computeIfAbsent(cml, cml -> new LongOpenHashSet()).add(long2);
         this.isDirty = true;
     }
     
     @Override
-    public Map<String, LongSet> getAllReferences() {
-        return Collections.<String, LongSet>unmodifiableMap(this.structuresRefences);
+    public Map<StructureFeature<?>, LongSet> getAllReferences() {
+        return Collections.<StructureFeature<?>, LongSet>unmodifiableMap(this.structuresRefences);
     }
     
     @Override
-    public void setAllReferences(final Map<String, LongSet> map) {
+    public void setAllReferences(final Map<StructureFeature<?>, LongSet> map) {
         this.structuresRefences.clear();
         this.structuresRefences.putAll(map);
         this.isDirty = true;
     }
     
-    public static short packOffsetCoordinates(final BlockPos fk) {
-        final int integer2 = fk.getX();
-        final int integer3 = fk.getY();
-        final int integer4 = fk.getZ();
+    public static short packOffsetCoordinates(final BlockPos fu) {
+        final int integer2 = fu.getX();
+        final int integer3 = fu.getY();
+        final int integer4 = fu.getZ();
         final int integer5 = integer2 & 0xF;
         final int integer6 = integer3 & 0xF;
         final int integer7 = integer4 & 0xF;
         return (short)(integer5 | integer6 << 4 | integer7 << 8);
     }
     
-    public static BlockPos unpackOffsetCoordinates(final short short1, final int integer, final ChunkPos bjh) {
-        final int integer2 = (short1 & 0xF) + (bjh.x << 4);
+    public static BlockPos unpackOffsetCoordinates(final short short1, final int integer, final ChunkPos bph) {
+        final int integer2 = (short1 & 0xF) + (bph.x << 4);
         final int integer3 = (short1 >>> 4 & 0xF) + (integer << 4);
-        final int integer4 = (short1 >>> 8 & 0xF) + (bjh.z << 4);
+        final int integer4 = (short1 >>> 8 & 0xF) + (bph.z << 4);
         return new BlockPos(integer2, integer3, integer4);
     }
     
     @Override
-    public void markPosForPostprocessing(final BlockPos fk) {
-        if (!Level.isOutsideBuildHeight(fk)) {
-            ChunkAccess.getOrCreateOffsetList(this.postProcessing, fk.getY() >> 4).add(packOffsetCoordinates(fk));
+    public void markPosForPostprocessing(final BlockPos fu) {
+        if (!Level.isOutsideBuildHeight(fu)) {
+            ChunkAccess.getOrCreateOffsetList(this.postProcessing, fu.getY() >> 4).add(packOffsetCoordinates(fu));
         }
     }
     
@@ -406,8 +411,8 @@ public class ProtoChunk implements ChunkAccess {
     }
     
     @Override
-    public void setBlockEntityNbt(final CompoundTag jt) {
-        this.blockEntityNbts.put(new BlockPos(jt.getInt("x"), jt.getInt("y"), jt.getInt("z")), jt);
+    public void setBlockEntityNbt(final CompoundTag le) {
+        this.blockEntityNbts.put(new BlockPos(le.getInt("x"), le.getInt("y"), le.getInt("z")), le);
     }
     
     public Map<BlockPos, CompoundTag> getBlockEntityNbts() {
@@ -415,28 +420,32 @@ public class ProtoChunk implements ChunkAccess {
     }
     
     @Override
-    public CompoundTag getBlockEntityNbt(final BlockPos fk) {
-        return this.blockEntityNbts.get(fk);
+    public CompoundTag getBlockEntityNbt(final BlockPos fu) {
+        return this.blockEntityNbts.get(fu);
     }
     
     @Nullable
     @Override
-    public CompoundTag getBlockEntityNbtForSaving(final BlockPos fk) {
-        final BlockEntity bwl3 = this.getBlockEntity(fk);
-        if (bwl3 != null) {
-            return bwl3.save(new CompoundTag());
+    public CompoundTag getBlockEntityNbtForSaving(final BlockPos fu) {
+        final BlockEntity cdl3 = this.getBlockEntity(fu);
+        if (cdl3 != null) {
+            return cdl3.save(new CompoundTag());
         }
-        return this.blockEntityNbts.get(fk);
+        return this.blockEntityNbts.get(fu);
     }
     
     @Override
-    public void removeBlockEntity(final BlockPos fk) {
-        this.blockEntities.remove(fk);
-        this.blockEntityNbts.remove(fk);
+    public void removeBlockEntity(final BlockPos fu) {
+        this.blockEntities.remove(fu);
+        this.blockEntityNbts.remove(fu);
     }
     
-    @Override
+    @Nullable
     public BitSet getCarvingMask(final GenerationStep.Carving a) {
+        return this.carvingMasks.get(a);
+    }
+    
+    public BitSet getOrCreateCarvingMask(final GenerationStep.Carving a) {
         return this.carvingMasks.computeIfAbsent(a, a -> new BitSet(65536));
     }
     
@@ -444,8 +453,8 @@ public class ProtoChunk implements ChunkAccess {
         this.carvingMasks.put(a, bitSet);
     }
     
-    public void setLightEngine(final LevelLightEngine coa) {
-        this.lightEngine = coa;
+    public void setLightEngine(final LevelLightEngine cwr) {
+        this.lightEngine = cwr;
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/chunk/ProtoTickList.java b/src/net/minecraft/world/level/chunk/ProtoTickList.java
index c07f6bf..b15a616 100644
--- a/src/net/minecraft/world/level/chunk/ProtoTickList.java
+++ b/src/net/minecraft/world/level/chunk/ProtoTickList.java
@@ -1,7 +1,5 @@
 package net.minecraft.world.level.chunk;
 
-import net.minecraft.world.level.TickNextTickData;
-import java.util.stream.Stream;
 import net.minecraft.world.level.TickPriority;
 import it.unimi.dsi.fastutil.shorts.ShortListIterator;
 import net.minecraft.core.BlockPos;
@@ -18,18 +16,18 @@ public class ProtoTickList<T> implements TickList<T> {
     private final ChunkPos chunkPos;
     private final ShortList[] toBeTicked;
     
-    public ProtoTickList(final Predicate<T> predicate, final ChunkPos bjh) {
-        this(predicate, bjh, new ListTag());
+    public ProtoTickList(final Predicate<T> predicate, final ChunkPos bph) {
+        this(predicate, bph, new ListTag());
     }
     
-    public ProtoTickList(final Predicate<T> predicate, final ChunkPos bjh, final ListTag jz) {
+    public ProtoTickList(final Predicate<T> predicate, final ChunkPos bph, final ListTag lk) {
         this.toBeTicked = new ShortList[16];
         this.ignore = predicate;
-        this.chunkPos = bjh;
-        for (int integer5 = 0; integer5 < jz.size(); ++integer5) {
-            final ListTag jz2 = jz.getList(integer5);
-            for (int integer6 = 0; integer6 < jz2.size(); ++integer6) {
-                ChunkAccess.getOrCreateOffsetList(this.toBeTicked, integer5).add(jz2.getShort(integer6));
+        this.chunkPos = bph;
+        for (int integer5 = 0; integer5 < lk.size(); ++integer5) {
+            final ListTag lk2 = lk.getList(integer5);
+            for (int integer6 = 0; integer6 < lk2.size(); ++integer6) {
+                ChunkAccess.getOrCreateOffsetList(this.toBeTicked, integer5).add(lk2.getShort(integer6));
             }
         }
     }
@@ -38,12 +36,12 @@ public class ProtoTickList<T> implements TickList<T> {
         return ChunkSerializer.packOffsets(this.toBeTicked);
     }
     
-    public void copyOut(final TickList<T> bkl, final Function<BlockPos, T> function) {
+    public void copyOut(final TickList<T> bqr, final Function<BlockPos, T> function) {
         for (int integer4 = 0; integer4 < this.toBeTicked.length; ++integer4) {
             if (this.toBeTicked[integer4] != null) {
                 for (final Short short6 : this.toBeTicked[integer4]) {
-                    final BlockPos fk7 = ProtoChunk.unpackOffsetCoordinates(short6, integer4, this.chunkPos);
-                    bkl.scheduleTick(fk7, function.apply(fk7), 0);
+                    final BlockPos fu7 = ProtoChunk.unpackOffsetCoordinates(short6, integer4, this.chunkPos);
+                    bqr.scheduleTick(fu7, function.apply(fu7), 0);
                 }
                 this.toBeTicked[integer4].clear();
             }
@@ -51,22 +49,17 @@ public class ProtoTickList<T> implements TickList<T> {
     }
     
     @Override
-    public boolean hasScheduledTick(final BlockPos fk, final T object) {
+    public boolean hasScheduledTick(final BlockPos fu, final T object) {
         return false;
     }
     
     @Override
-    public void scheduleTick(final BlockPos fk, final T object, final int integer, final TickPriority bkn) {
-        ChunkAccess.getOrCreateOffsetList(this.toBeTicked, fk.getY() >> 4).add(ProtoChunk.packOffsetCoordinates(fk));
+    public void scheduleTick(final BlockPos fu, final T object, final int integer, final TickPriority bqt) {
+        ChunkAccess.getOrCreateOffsetList(this.toBeTicked, fu.getY() >> 4).add(ProtoChunk.packOffsetCoordinates(fu));
     }
     
     @Override
-    public boolean willTickThisTick(final BlockPos fk, final T object) {
+    public boolean willTickThisTick(final BlockPos fu, final T object) {
         return false;
     }
-    
-    @Override
-    public void addAll(final Stream<TickNextTickData<T>> stream) {
-        stream.forEach(bkm -> this.scheduleTick(bkm.pos, bkm.getType(), 0, bkm.priority));
-    }
 }
diff --git a/src/net/minecraft/world/level/chunk/UpgradeData.java b/src/net/minecraft/world/level/chunk/UpgradeData.java
index 4cfa4db..7d092a0 100644
--- a/src/net/minecraft/world/level/chunk/UpgradeData.java
+++ b/src/net/minecraft/world/level/chunk/UpgradeData.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.chunk;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.StemGrownBlock;
 import net.minecraft.world.level.block.HorizontalDirectionalBlock;
 import net.minecraft.world.level.block.StemBlock;
@@ -50,40 +50,40 @@ public class UpgradeData {
         this.index = new int[16][];
     }
     
-    public UpgradeData(final CompoundTag jt) {
+    public UpgradeData(final CompoundTag le) {
         this();
-        if (jt.contains("Indices", 10)) {
-            final CompoundTag jt2 = jt.getCompound("Indices");
+        if (le.contains("Indices", 10)) {
+            final CompoundTag le2 = le.getCompound("Indices");
             for (int integer4 = 0; integer4 < this.index.length; ++integer4) {
                 final String string5 = String.valueOf(integer4);
-                if (jt2.contains(string5, 11)) {
-                    this.index[integer4] = jt2.getIntArray(string5);
+                if (le2.contains(string5, 11)) {
+                    this.index[integer4] = le2.getIntArray(string5);
                 }
             }
         }
-        final int integer5 = jt.getInt("Sides");
-        for (final Direction8 fq7 : Direction8.values()) {
-            if ((integer5 & 1 << fq7.ordinal()) != 0x0) {
-                this.sides.add(fq7);
+        final int integer5 = le.getInt("Sides");
+        for (final Direction8 ga7 : Direction8.values()) {
+            if ((integer5 & 1 << ga7.ordinal()) != 0x0) {
+                this.sides.add(ga7);
             }
         }
     }
     
-    public void upgrade(final LevelChunk cal) {
-        this.upgradeInside(cal);
-        for (final Direction8 fq6 : UpgradeData.DIRECTIONS) {
-            upgradeSides(cal, fq6);
+    public void upgrade(final LevelChunk chj) {
+        this.upgradeInside(chj);
+        for (final Direction8 ga6 : UpgradeData.DIRECTIONS) {
+            upgradeSides(chj, ga6);
         }
-        final Level bjw3 = cal.getLevel();
-        UpgradeData.CHUNKY_FIXERS.forEach(a -> a.processChunk(bjw3));
+        final Level bqb3 = chj.getLevel();
+        UpgradeData.CHUNKY_FIXERS.forEach(a -> a.processChunk(bqb3));
     }
     
-    private static void upgradeSides(final LevelChunk cal, final Direction8 fq) {
-        final Level bjw3 = cal.getLevel();
-        if (!cal.getUpgradeData().sides.remove(fq)) {
+    private static void upgradeSides(final LevelChunk chj, final Direction8 ga) {
+        final Level bqb3 = chj.getLevel();
+        if (!chj.getUpgradeData().sides.remove(ga)) {
             return;
         }
-        final Set<Direction> set4 = fq.getDirections();
+        final Set<Direction> set4 = ga.getDirections();
         final int integer5 = 0;
         final int integer6 = 15;
         final boolean boolean7 = set4.contains(Direction.EAST);
@@ -91,67 +91,66 @@ public class UpgradeData {
         final boolean boolean9 = set4.contains(Direction.SOUTH);
         final boolean boolean10 = set4.contains(Direction.NORTH);
         final boolean boolean11 = set4.size() == 1;
-        final ChunkPos bjh12 = cal.getPos();
-        final int integer7 = bjh12.getMinBlockX() + ((boolean11 && (boolean10 || boolean9)) ? 1 : (boolean8 ? 0 : 15));
-        final int integer8 = bjh12.getMinBlockX() + ((boolean11 && (boolean10 || boolean9)) ? 14 : (boolean8 ? 0 : 15));
-        final int integer9 = bjh12.getMinBlockZ() + ((boolean11 && (boolean7 || boolean8)) ? 1 : (boolean10 ? 0 : 15));
-        final int integer10 = bjh12.getMinBlockZ() + ((boolean11 && (boolean7 || boolean8)) ? 14 : (boolean10 ? 0 : 15));
+        final ChunkPos bph12 = chj.getPos();
+        final int integer7 = bph12.getMinBlockX() + ((boolean11 && (boolean10 || boolean9)) ? 1 : (boolean8 ? 0 : 15));
+        final int integer8 = bph12.getMinBlockX() + ((boolean11 && (boolean10 || boolean9)) ? 14 : (boolean8 ? 0 : 15));
+        final int integer9 = bph12.getMinBlockZ() + ((boolean11 && (boolean7 || boolean8)) ? 1 : (boolean10 ? 0 : 15));
+        final int integer10 = bph12.getMinBlockZ() + ((boolean11 && (boolean7 || boolean8)) ? 14 : (boolean10 ? 0 : 15));
         final Direction[] arr17 = Direction.values();
         final BlockPos.MutableBlockPos a18 = new BlockPos.MutableBlockPos();
-        for (final BlockPos fk20 : BlockPos.betweenClosed(integer7, 0, integer9, integer8, bjw3.getMaxBuildHeight() - 1, integer10)) {
-            BlockState byj22;
-            final BlockState byj21 = byj22 = bjw3.getBlockState(fk20);
-            for (final Direction fp26 : arr17) {
-                a18.set(fk20).move(fp26);
-                byj22 = updateState(byj22, fp26, bjw3, fk20, a18);
+        for (final BlockPos fu20 : BlockPos.betweenClosed(integer7, 0, integer9, integer8, bqb3.getMaxBuildHeight() - 1, integer10)) {
+            BlockState cfj22;
+            final BlockState cfj21 = cfj22 = bqb3.getBlockState(fu20);
+            for (final Direction fz26 : arr17) {
+                a18.setWithOffset(fu20, fz26);
+                cfj22 = updateState(cfj22, fz26, bqb3, fu20, a18);
             }
-            Block.updateOrDestroy(byj21, byj22, bjw3, fk20, 18);
+            Block.updateOrDestroy(cfj21, cfj22, bqb3, fu20, 18);
         }
     }
     
-    private static BlockState updateState(final BlockState byj, final Direction fp, final LevelAccessor bjx, final BlockPos fk4, final BlockPos fk5) {
-        return UpgradeData.MAP.getOrDefault(byj.getBlock(), BlockFixers.DEFAULT).updateShape(byj, fp, bjx.getBlockState(fk5), bjx, fk4, fk5);
+    private static BlockState updateState(final BlockState cfj, final Direction fz, final LevelAccessor bqc, final BlockPos fu4, final BlockPos fu5) {
+        return UpgradeData.MAP.getOrDefault(cfj.getBlock(), BlockFixers.DEFAULT).updateShape(cfj, fz, bqc.getBlockState(fu5), bqc, fu4, fu5);
     }
     
-    private void upgradeInside(final LevelChunk cal) {
-        try (final BlockPos.PooledMutableBlockPos b3 = BlockPos.PooledMutableBlockPos.acquire();
-             final BlockPos.PooledMutableBlockPos b4 = BlockPos.PooledMutableBlockPos.acquire()) {
-            final ChunkPos bjh7 = cal.getPos();
-            final LevelAccessor bjx8 = cal.getLevel();
-            for (int integer9 = 0; integer9 < 16; ++integer9) {
-                final LevelChunkSection cam10 = cal.getSections()[integer9];
-                final int[] arr11 = this.index[integer9];
-                this.index[integer9] = null;
-                if (cam10 != null && arr11 != null) {
-                    if (arr11.length > 0) {
-                        final Direction[] arr12 = Direction.values();
-                        final PalettedContainer<BlockState> cas13 = cam10.getStates();
-                        for (final int integer10 : arr11) {
-                            final int integer11 = integer10 & 0xF;
-                            final int integer12 = integer10 >> 8 & 0xF;
-                            final int integer13 = integer10 >> 4 & 0xF;
-                            b3.set(bjh7.getMinBlockX() + integer11, (integer9 << 4) + integer12, bjh7.getMinBlockZ() + integer13);
-                            BlockState byj22;
-                            final BlockState byj21 = byj22 = cas13.get(integer10);
-                            for (final Direction fp26 : arr12) {
-                                b4.set((Vec3i)b3).move(fp26);
-                                if (b3.getX() >> 4 == bjh7.x) {
-                                    if (b3.getZ() >> 4 == bjh7.z) {
-                                        byj22 = updateState(byj22, fp26, bjx8, b3, b4);
-                                    }
+    private void upgradeInside(final LevelChunk chj) {
+        final BlockPos.MutableBlockPos a3 = new BlockPos.MutableBlockPos();
+        final BlockPos.MutableBlockPos a4 = new BlockPos.MutableBlockPos();
+        final ChunkPos bph5 = chj.getPos();
+        final LevelAccessor bqc6 = chj.getLevel();
+        for (int integer7 = 0; integer7 < 16; ++integer7) {
+            final LevelChunkSection chk8 = chj.getSections()[integer7];
+            final int[] arr9 = this.index[integer7];
+            this.index[integer7] = null;
+            if (chk8 != null && arr9 != null) {
+                if (arr9.length > 0) {
+                    final Direction[] arr10 = Direction.values();
+                    final PalettedContainer<BlockState> chq11 = chk8.getStates();
+                    for (final int integer8 : arr9) {
+                        final int integer9 = integer8 & 0xF;
+                        final int integer10 = integer8 >> 8 & 0xF;
+                        final int integer11 = integer8 >> 4 & 0xF;
+                        a3.set(bph5.getMinBlockX() + integer9, (integer7 << 4) + integer10, bph5.getMinBlockZ() + integer11);
+                        BlockState cfj20;
+                        final BlockState cfj19 = cfj20 = chq11.get(integer8);
+                        for (final Direction fz24 : arr10) {
+                            a4.setWithOffset(a3, fz24);
+                            if (a3.getX() >> 4 == bph5.x) {
+                                if (a3.getZ() >> 4 == bph5.z) {
+                                    cfj20 = updateState(cfj20, fz24, bqc6, a3, a4);
                                 }
                             }
-                            Block.updateOrDestroy(byj21, byj22, bjx8, b3, 18);
                         }
+                        Block.updateOrDestroy(cfj19, cfj20, bqc6, a3, 18);
                     }
                 }
             }
-            for (int integer9 = 0; integer9 < this.index.length; ++integer9) {
-                if (this.index[integer9] != null) {
-                    UpgradeData.LOGGER.warn("Discarding update data for section {} for chunk ({} {})", integer9, bjh7.x, bjh7.z);
-                }
-                this.index[integer9] = null;
+        }
+        for (int integer7 = 0; integer7 < this.index.length; ++integer7) {
+            if (this.index[integer7] != null) {
+                UpgradeData.LOGGER.warn("Discarding update data for section {} for chunk ({} {})", integer7, bph5.x, bph5.z);
             }
+            this.index[integer7] = null;
         }
     }
     
@@ -165,23 +164,23 @@ public class UpgradeData {
     }
     
     public CompoundTag write() {
-        final CompoundTag jt2 = new CompoundTag();
-        final CompoundTag jt3 = new CompoundTag();
+        final CompoundTag le2 = new CompoundTag();
+        final CompoundTag le3 = new CompoundTag();
         for (int integer4 = 0; integer4 < this.index.length; ++integer4) {
             final String string5 = String.valueOf(integer4);
             if (this.index[integer4] != null && this.index[integer4].length != 0) {
-                jt3.putIntArray(string5, this.index[integer4]);
+                le3.putIntArray(string5, this.index[integer4]);
             }
         }
-        if (!jt3.isEmpty()) {
-            jt2.put("Indices", jt3);
+        if (!le3.isEmpty()) {
+            le2.put("Indices", le3);
         }
         int integer4 = 0;
-        for (final Direction8 fq6 : this.sides) {
-            integer4 |= 1 << fq6.ordinal();
+        for (final Direction8 ga6 : this.sides) {
+            integer4 |= 1 << ga6.ordinal();
         }
-        jt2.putByte("Sides", (byte)integer4);
-        return jt2;
+        le2.putByte("Sides", (byte)integer4);
+        return le2;
     }
     
     static {
@@ -193,44 +192,44 @@ public class UpgradeData {
     }
     
     public interface BlockFixer {
-        BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6);
+        BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6);
         
-        default void processChunk(final LevelAccessor bjx) {
+        default void processChunk(final LevelAccessor bqc) {
         }
     }
     
     enum BlockFixers implements BlockFixer {
         BLACKLIST(new Block[] { Blocks.OBSERVER, Blocks.NETHER_PORTAL, Blocks.WHITE_CONCRETE_POWDER, Blocks.ORANGE_CONCRETE_POWDER, Blocks.MAGENTA_CONCRETE_POWDER, Blocks.LIGHT_BLUE_CONCRETE_POWDER, Blocks.YELLOW_CONCRETE_POWDER, Blocks.LIME_CONCRETE_POWDER, Blocks.PINK_CONCRETE_POWDER, Blocks.GRAY_CONCRETE_POWDER, Blocks.LIGHT_GRAY_CONCRETE_POWDER, Blocks.CYAN_CONCRETE_POWDER, Blocks.PURPLE_CONCRETE_POWDER, Blocks.BLUE_CONCRETE_POWDER, Blocks.BROWN_CONCRETE_POWDER, Blocks.GREEN_CONCRETE_POWDER, Blocks.RED_CONCRETE_POWDER, Blocks.BLACK_CONCRETE_POWDER, Blocks.ANVIL, Blocks.CHIPPED_ANVIL, Blocks.DAMAGED_ANVIL, Blocks.DRAGON_EGG, Blocks.GRAVEL, Blocks.SAND, Blocks.RED_SAND, Blocks.OAK_SIGN, Blocks.SPRUCE_SIGN, Blocks.BIRCH_SIGN, Blocks.ACACIA_SIGN, Blocks.JUNGLE_SIGN, Blocks.DARK_OAK_SIGN, Blocks.OAK_WALL_SIGN, Blocks.SPRUCE_WALL_SIGN, Blocks.BIRCH_WALL_SIGN, Blocks.ACACIA_WALL_SIGN, Blocks.JUNGLE_WALL_SIGN, Blocks.DARK_OAK_WALL_SIGN }) {
             @Override
-            public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-                return byj1;
+            public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+                return cfj1;
             }
         }, 
         DEFAULT(new Block[0]) {
             @Override
-            public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-                return byj1.updateShape(fp, bjx.getBlockState(fk6), bjx, fk5, fk6);
+            public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+                return cfj1.updateShape(fz, bqc.getBlockState(fu6), bqc, fu5, fu6);
             }
         }, 
         CHEST(new Block[] { Blocks.CHEST, Blocks.TRAPPED_CHEST }) {
             @Override
-            public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-                if (byj3.getBlock() == byj1.getBlock() && fp.getAxis().isHorizontal() && byj1.<ChestType>getValue(ChestBlock.TYPE) == ChestType.SINGLE && byj3.<ChestType>getValue(ChestBlock.TYPE) == ChestType.SINGLE) {
-                    final Direction fp2 = byj1.<Direction>getValue((Property<Direction>)ChestBlock.FACING);
-                    if (fp.getAxis() != fp2.getAxis() && fp2 == byj3.<Direction>getValue((Property<Direction>)ChestBlock.FACING)) {
-                        final ChestType bzc9 = (fp == fp2.getClockWise()) ? ChestType.LEFT : ChestType.RIGHT;
-                        bjx.setBlock(fk6, ((AbstractStateHolder<O, BlockState>)byj3).<ChestType, ChestType>setValue(ChestBlock.TYPE, bzc9.getOpposite()), 18);
-                        if (fp2 == Direction.NORTH || fp2 == Direction.EAST) {
-                            final BlockEntity bwl10 = bjx.getBlockEntity(fk5);
-                            final BlockEntity bwl11 = bjx.getBlockEntity(fk6);
-                            if (bwl10 instanceof ChestBlockEntity && bwl11 instanceof ChestBlockEntity) {
-                                ChestBlockEntity.swapContents((ChestBlockEntity)bwl10, (ChestBlockEntity)bwl11);
+            public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+                if (cfj3.is(cfj1.getBlock()) && fz.getAxis().isHorizontal() && cfj1.<ChestType>getValue(ChestBlock.TYPE) == ChestType.SINGLE && cfj3.<ChestType>getValue(ChestBlock.TYPE) == ChestType.SINGLE) {
+                    final Direction fz2 = cfj1.<Direction>getValue((Property<Direction>)ChestBlock.FACING);
+                    if (fz.getAxis() != fz2.getAxis() && fz2 == cfj3.<Direction>getValue((Property<Direction>)ChestBlock.FACING)) {
+                        final ChestType cgb9 = (fz == fz2.getClockWise()) ? ChestType.LEFT : ChestType.RIGHT;
+                        bqc.setBlock(fu6, ((StateHolder<O, BlockState>)cfj3).<ChestType, ChestType>setValue(ChestBlock.TYPE, cgb9.getOpposite()), 18);
+                        if (fz2 == Direction.NORTH || fz2 == Direction.EAST) {
+                            final BlockEntity cdl10 = bqc.getBlockEntity(fu5);
+                            final BlockEntity cdl11 = bqc.getBlockEntity(fu6);
+                            if (cdl10 instanceof ChestBlockEntity && cdl11 instanceof ChestBlockEntity) {
+                                ChestBlockEntity.swapContents((ChestBlockEntity)cdl10, (ChestBlockEntity)cdl11);
                             }
                         }
-                        return ((AbstractStateHolder<O, BlockState>)byj1).<ChestType, ChestType>setValue(ChestBlock.TYPE, bzc9);
+                        return ((StateHolder<O, BlockState>)cfj1).<ChestType, ChestType>setValue(ChestBlock.TYPE, cgb9);
                     }
                 }
-                return byj1;
+                return cfj1;
             }
         }, 
         LEAVES(true, new Block[] { Blocks.ACACIA_LEAVES, Blocks.BIRCH_LEAVES, Blocks.DARK_OAK_LEAVES, Blocks.JUNGLE_LEAVES, Blocks.OAK_LEAVES, Blocks.SPRUCE_LEAVES }) {
@@ -241,42 +240,42 @@ public class UpgradeData {
             }
             
             @Override
-            public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-                final BlockState byj4 = byj1.updateShape(fp, bjx.getBlockState(fk6), bjx, fk5, fk6);
-                if (byj1 != byj4) {
-                    final int integer9 = byj4.<Integer>getValue((Property<Integer>)BlockStateProperties.DISTANCE);
+            public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+                final BlockState cfj4 = cfj1.updateShape(fz, bqc.getBlockState(fu6), bqc, fu5, fu6);
+                if (cfj1 != cfj4) {
+                    final int integer9 = cfj4.<Integer>getValue((Property<Integer>)BlockStateProperties.DISTANCE);
                     final List<ObjectSet<BlockPos>> list10 = this.queue.get();
                     if (list10.isEmpty()) {
                         for (int integer10 = 0; integer10 < 7; ++integer10) {
                             list10.add((ObjectSet<BlockPos>)new ObjectOpenHashSet());
                         }
                     }
-                    list10.get(integer9).add(fk5.immutable());
+                    list10.get(integer9).add(fu5.immutable());
                 }
-                return byj1;
+                return cfj1;
             }
             
             @Override
-            public void processChunk(final LevelAccessor bjx) {
+            public void processChunk(final LevelAccessor bqc) {
                 final BlockPos.MutableBlockPos a3 = new BlockPos.MutableBlockPos();
                 final List<ObjectSet<BlockPos>> list4 = this.queue.get();
                 for (int integer5 = 2; integer5 < list4.size(); ++integer5) {
                     final int integer6 = integer5 - 1;
                     final ObjectSet<BlockPos> objectSet7 = list4.get(integer6);
                     final ObjectSet<BlockPos> objectSet8 = list4.get(integer5);
-                    for (final BlockPos fk10 : objectSet7) {
-                        final BlockState byj11 = bjx.getBlockState(fk10);
-                        if (byj11.<Integer>getValue((Property<Integer>)BlockStateProperties.DISTANCE) < integer6) {
+                    for (final BlockPos fu10 : objectSet7) {
+                        final BlockState cfj11 = bqc.getBlockState(fu10);
+                        if (cfj11.<Integer>getValue((Property<Integer>)BlockStateProperties.DISTANCE) < integer6) {
                             continue;
                         }
-                        bjx.setBlock(fk10, ((AbstractStateHolder<O, BlockState>)byj11).<Comparable, Integer>setValue((Property<Comparable>)BlockStateProperties.DISTANCE, integer6), 18);
+                        bqc.setBlock(fu10, ((StateHolder<O, BlockState>)cfj11).<Comparable, Integer>setValue((Property<Comparable>)BlockStateProperties.DISTANCE, integer6), 18);
                         if (integer5 == 7) {
                             continue;
                         }
-                        for (final Direction fp15 : UpgradeData$BlockFixers$4.DIRECTIONS) {
-                            a3.set(fk10).move(fp15);
-                            final BlockState byj12 = bjx.getBlockState(a3);
-                            if (byj12.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.DISTANCE) && byj11.<Integer>getValue((Property<Integer>)BlockStateProperties.DISTANCE) > integer5) {
+                        for (final Direction fz15 : UpgradeData$BlockFixers$4.DIRECTIONS) {
+                            a3.setWithOffset(fu10, fz15);
+                            final BlockState cfj12 = bqc.getBlockState(a3);
+                            if (cfj12.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.DISTANCE) && cfj11.<Integer>getValue((Property<Integer>)BlockStateProperties.DISTANCE) > integer5) {
                                 objectSet8.add(a3.immutable());
                             }
                         }
@@ -287,14 +286,14 @@ public class UpgradeData {
         }, 
         STEM_BLOCK(new Block[] { Blocks.MELON_STEM, Blocks.PUMPKIN_STEM }) {
             @Override
-            public BlockState updateShape(final BlockState byj1, final Direction fp, final BlockState byj3, final LevelAccessor bjx, final BlockPos fk5, final BlockPos fk6) {
-                if (byj1.<Integer>getValue((Property<Integer>)StemBlock.AGE) == 7) {
-                    final StemGrownBlock buv8 = ((StemBlock)byj1.getBlock()).getFruit();
-                    if (byj3.getBlock() == buv8) {
-                        return ((AbstractStateHolder<O, BlockState>)buv8.getAttachedStem().defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)HorizontalDirectionalBlock.FACING, fp);
+            public BlockState updateShape(final BlockState cfj1, final Direction fz, final BlockState cfj3, final LevelAccessor bqc, final BlockPos fu5, final BlockPos fu6) {
+                if (cfj1.<Integer>getValue((Property<Integer>)StemBlock.AGE) == 7) {
+                    final StemGrownBlock cbq8 = ((StemBlock)cfj1.getBlock()).getFruit();
+                    if (cfj3.is(cbq8)) {
+                        return ((StateHolder<O, BlockState>)cbq8.getAttachedStem().defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)HorizontalDirectionalBlock.FACING, fz);
                     }
                 }
-                return byj1;
+                return cfj1;
             }
         };
         
@@ -305,8 +304,8 @@ public class UpgradeData {
         }
         
         private BlockFixers(final boolean boolean3, final Block[] arr) {
-            for (final Block bph9 : arr) {
-                UpgradeData.MAP.put(bph9, this);
+            for (final Block bvr9 : arr) {
+                UpgradeData.MAP.put(bvr9, this);
             }
             if (boolean3) {
                 UpgradeData.CHUNKY_FIXERS.add(this);
diff --git a/src/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
index 88e2be9..ff7d702 100644
--- a/src/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
+++ b/src/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
@@ -6,10 +6,11 @@ import it.unimi.dsi.fastutil.shorts.ShortListIterator;
 import net.minecraft.nbt.ShortTag;
 import it.unimi.dsi.fastutil.shorts.ShortList;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
-import net.minecraft.world.level.levelgen.structure.StructureFeatureIO;
+import java.util.Locale;
 import com.google.common.collect.Maps;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.entity.EntityType;
@@ -62,324 +63,339 @@ import org.apache.logging.log4j.Logger;
 public class ChunkSerializer {
     private static final Logger LOGGER;
     
-    public static ProtoChunk read(final ServerLevel xd, final StructureManager cmo, final PoiManager asr, final ChunkPos bjh, final CompoundTag jt) {
-        final ChunkGenerator<?> caa6 = xd.getChunkSource().getGenerator();
-        final BiomeSource bkw7 = caa6.getBiomeSource();
-        final CompoundTag jt2 = jt.getCompound("Level");
-        final ChunkPos bjh2 = new ChunkPos(jt2.getInt("xPos"), jt2.getInt("zPos"));
-        if (!Objects.equals(bjh, bjh2)) {
-            ChunkSerializer.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", bjh, bjh, bjh2);
+    public static ProtoChunk read(final ServerLevel zd, final StructureManager cva, final PoiManager axz, final ChunkPos bph, final CompoundTag le) {
+        final ChunkGenerator cha6 = zd.getChunkSource().getGenerator();
+        final BiomeSource brh7 = cha6.getBiomeSource();
+        final CompoundTag le2 = le.getCompound("Level");
+        final ChunkPos bph2 = new ChunkPos(le2.getInt("xPos"), le2.getInt("zPos"));
+        if (!Objects.equals(bph, bph2)) {
+            ChunkSerializer.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", bph, bph, bph2);
         }
-        final ChunkBiomeContainer bzz10 = new ChunkBiomeContainer(bjh, bkw7, (int[])(jt2.contains("Biomes", 11) ? jt2.getIntArray("Biomes") : null));
-        final UpgradeData cav11 = jt2.contains("UpgradeData", 10) ? new UpgradeData(jt2.getCompound("UpgradeData")) : UpgradeData.EMPTY;
-        final ProtoTickList<Block> cau12 = new ProtoTickList<Block>(bph -> bph == null || bph.defaultBlockState().isAir(), bjh, jt2.getList("ToBeTicked", 9));
-        final ProtoTickList<Fluid> cau13 = new ProtoTickList<Fluid>(coi -> coi == null || coi == Fluids.EMPTY, bjh, jt2.getList("LiquidsToBeTicked", 9));
-        final boolean boolean14 = jt2.getBoolean("isLightOn");
-        final ListTag jz15 = jt2.getList("Sections", 10);
+        final ChunkBiomeContainer cgz10 = new ChunkBiomeContainer(bph, brh7, (int[])(le2.contains("Biomes", 11) ? le2.getIntArray("Biomes") : null));
+        final UpgradeData cht11 = le2.contains("UpgradeData", 10) ? new UpgradeData(le2.getCompound("UpgradeData")) : UpgradeData.EMPTY;
+        final ProtoTickList<Block> chs12 = new ProtoTickList<Block>(bvr -> bvr == null || bvr.defaultBlockState().isAir(), bph, le2.getList("ToBeTicked", 9));
+        final ProtoTickList<Fluid> chs13 = new ProtoTickList<Fluid>(cwz -> cwz == null || cwz == Fluids.EMPTY, bph, le2.getList("LiquidsToBeTicked", 9));
+        final boolean boolean14 = le2.getBoolean("isLightOn");
+        final ListTag lk15 = le2.getList("Sections", 10);
         final int integer16 = 16;
         final LevelChunkSection[] arr17 = new LevelChunkSection[16];
-        final boolean boolean15 = xd.getDimension().isHasSkyLight();
-        final ChunkSource cad19 = xd.getChunkSource();
-        final LevelLightEngine coa20 = cad19.getLightEngine();
+        final boolean boolean15 = zd.dimensionType().hasSkyLight();
+        final ChunkSource chb19 = zd.getChunkSource();
+        final LevelLightEngine cwr20 = chb19.getLightEngine();
         if (boolean14) {
-            coa20.retainData(bjh, true);
+            cwr20.retainData(bph, true);
         }
-        for (int integer17 = 0; integer17 < jz15.size(); ++integer17) {
-            final CompoundTag jt3 = jz15.getCompound(integer17);
-            final int integer18 = jt3.getByte("Y");
-            if (jt3.contains("Palette", 9) && jt3.contains("BlockStates", 12)) {
-                final LevelChunkSection cam24 = new LevelChunkSection(integer18 << 4);
-                cam24.getStates().read(jt3.getList("Palette", 10), jt3.getLongArray("BlockStates"));
-                cam24.recalcBlockCounts();
-                if (!cam24.isEmpty()) {
-                    arr17[integer18] = cam24;
+        for (int integer17 = 0; integer17 < lk15.size(); ++integer17) {
+            final CompoundTag le3 = lk15.getCompound(integer17);
+            final int integer18 = le3.getByte("Y");
+            if (le3.contains("Palette", 9) && le3.contains("BlockStates", 12)) {
+                final LevelChunkSection chk24 = new LevelChunkSection(integer18 << 4);
+                chk24.getStates().read(le3.getList("Palette", 10), le3.getLongArray("BlockStates"));
+                chk24.recalcBlockCounts();
+                if (!chk24.isEmpty()) {
+                    arr17[integer18] = chk24;
                 }
-                asr.checkConsistencyWithBlocks(bjh, cam24);
+                axz.checkConsistencyWithBlocks(bph, chk24);
             }
             if (boolean14) {
-                if (jt3.contains("BlockLight", 7)) {
-                    coa20.queueSectionData(LightLayer.BLOCK, SectionPos.of(bjh, integer18), new DataLayer(jt3.getByteArray("BlockLight")));
+                if (le3.contains("BlockLight", 7)) {
+                    cwr20.queueSectionData(LightLayer.BLOCK, SectionPos.of(bph, integer18), new DataLayer(le3.getByteArray("BlockLight")), true);
                 }
-                if (boolean15 && jt3.contains("SkyLight", 7)) {
-                    coa20.queueSectionData(LightLayer.SKY, SectionPos.of(bjh, integer18), new DataLayer(jt3.getByteArray("SkyLight")));
+                if (boolean15 && le3.contains("SkyLight", 7)) {
+                    cwr20.queueSectionData(LightLayer.SKY, SectionPos.of(bph, integer18), new DataLayer(le3.getByteArray("SkyLight")), true);
                 }
             }
         }
-        final long long21 = jt2.getLong("InhabitedTime");
-        final ChunkStatus.ChunkType a23 = getChunkTypeFromTag(jt);
-        ChunkAccess bzy24;
+        final long long21 = le2.getLong("InhabitedTime");
+        final ChunkStatus.ChunkType a23 = getChunkTypeFromTag(le);
+        ChunkAccess cgy24;
         if (a23 == ChunkStatus.ChunkType.LEVELCHUNK) {
-            TickList<Block> bkl25;
-            if (jt2.contains("TileTicks", 9)) {
-                bkl25 = ChunkTickList.create(jt2.getList("TileTicks", 10), Registry.BLOCK::getKey, Registry.BLOCK::get);
+            TickList<Block> bqr25;
+            if (le2.contains("TileTicks", 9)) {
+                bqr25 = ChunkTickList.create(le2.getList("TileTicks", 10), Registry.BLOCK::getKey, Registry.BLOCK::get);
             }
             else {
-                bkl25 = cau12;
+                bqr25 = chs12;
             }
-            TickList<Fluid> bkl26;
-            if (jt2.contains("LiquidTicks", 9)) {
-                bkl26 = ChunkTickList.create(jt2.getList("LiquidTicks", 10), Registry.FLUID::getKey, Registry.FLUID::get);
+            TickList<Fluid> bqr26;
+            if (le2.contains("LiquidTicks", 9)) {
+                bqr26 = ChunkTickList.create(le2.getList("LiquidTicks", 10), Registry.FLUID::getKey, Registry.FLUID::get);
             }
             else {
-                bkl26 = cau13;
+                bqr26 = chs13;
             }
-            bzy24 = new LevelChunk(xd.getLevel(), bjh, bzz10, cav11, bkl25, bkl26, long21, arr17, cal -> postLoadChunk(jt2, cal));
+            cgy24 = new LevelChunk(zd.getLevel(), bph, cgz10, cht11, bqr25, bqr26, long21, arr17, chj -> postLoadChunk(le2, chj));
         }
         else {
-            final ProtoChunk cat25 = new ProtoChunk(bjh, cav11, arr17, cau12, cau13);
-            cat25.setBiomes(bzz10);
-            bzy24 = cat25;
-            bzy24.setInhabitedTime(long21);
-            cat25.setStatus(ChunkStatus.byName(jt2.getString("Status")));
-            if (bzy24.getStatus().isOrAfter(ChunkStatus.FEATURES)) {
-                cat25.setLightEngine(coa20);
+            final ProtoChunk chr25 = new ProtoChunk(bph, cht11, arr17, chs12, chs13);
+            chr25.setBiomes(cgz10);
+            cgy24 = chr25;
+            cgy24.setInhabitedTime(long21);
+            chr25.setStatus(ChunkStatus.byName(le2.getString("Status")));
+            if (cgy24.getStatus().isOrAfter(ChunkStatus.FEATURES)) {
+                chr25.setLightEngine(cwr20);
             }
-            if (!boolean14 && bzy24.getStatus().isOrAfter(ChunkStatus.LIGHT)) {
-                for (final BlockPos fk27 : BlockPos.betweenClosed(bjh.getMinBlockX(), 0, bjh.getMinBlockZ(), bjh.getMaxBlockX(), 255, bjh.getMaxBlockZ())) {
-                    if (bzy24.getBlockState(fk27).getLightEmission() != 0) {
-                        cat25.addLight(fk27);
+            if (!boolean14 && cgy24.getStatus().isOrAfter(ChunkStatus.LIGHT)) {
+                for (final BlockPos fu27 : BlockPos.betweenClosed(bph.getMinBlockX(), 0, bph.getMinBlockZ(), bph.getMaxBlockX(), 255, bph.getMaxBlockZ())) {
+                    if (cgy24.getBlockState(fu27).getLightEmission() != 0) {
+                        chr25.addLight(fu27);
                     }
                 }
             }
         }
-        bzy24.setLightCorrect(boolean14);
-        final CompoundTag jt4 = jt2.getCompound("Heightmaps");
+        cgy24.setLightCorrect(boolean14);
+        final CompoundTag le4 = le2.getCompound("Heightmaps");
         final EnumSet<Heightmap.Types> enumSet26 = EnumSet.<Heightmap.Types>noneOf(Heightmap.Types.class);
-        for (final Heightmap.Types a24 : bzy24.getStatus().heightmapsAfter()) {
+        for (final Heightmap.Types a24 : cgy24.getStatus().heightmapsAfter()) {
             final String string29 = a24.getSerializationKey();
-            if (jt4.contains(string29, 12)) {
-                bzy24.setHeightmap(a24, jt4.getLongArray(string29));
+            if (le4.contains(string29, 12)) {
+                cgy24.setHeightmap(a24, le4.getLongArray(string29));
             }
             else {
                 enumSet26.add(a24);
             }
         }
-        Heightmap.primeHeightmaps(bzy24, enumSet26);
-        final CompoundTag jt5 = jt2.getCompound("Structures");
-        bzy24.setAllStarts(unpackStructureStart(caa6, cmo, jt5));
-        bzy24.setAllReferences(unpackStructureReferences(bjh, jt5));
-        if (jt2.getBoolean("shouldSave")) {
-            bzy24.setUnsaved(true);
+        Heightmap.primeHeightmaps(cgy24, enumSet26);
+        final CompoundTag le5 = le2.getCompound("Structures");
+        cgy24.setAllStarts(unpackStructureStart(cva, le5, zd.getSeed()));
+        cgy24.setAllReferences(unpackStructureReferences(bph, le5));
+        if (le2.getBoolean("shouldSave")) {
+            cgy24.setUnsaved(true);
         }
-        final ListTag jz16 = jt2.getList("PostProcessing", 9);
-        for (int integer19 = 0; integer19 < jz16.size(); ++integer19) {
-            final ListTag jz17 = jz16.getList(integer19);
-            for (int integer20 = 0; integer20 < jz17.size(); ++integer20) {
-                bzy24.addPackedPostProcess(jz17.getShort(integer20), integer19);
+        final ListTag lk16 = le2.getList("PostProcessing", 9);
+        for (int integer19 = 0; integer19 < lk16.size(); ++integer19) {
+            final ListTag lk17 = lk16.getList(integer19);
+            for (int integer20 = 0; integer20 < lk17.size(); ++integer20) {
+                cgy24.addPackedPostProcess(lk17.getShort(integer20), integer19);
             }
         }
         if (a23 == ChunkStatus.ChunkType.LEVELCHUNK) {
-            return new ImposterProtoChunk((LevelChunk)bzy24);
+            return new ImposterProtoChunk((LevelChunk)cgy24);
         }
-        final ProtoChunk cat26 = (ProtoChunk)bzy24;
-        final ListTag jz17 = jt2.getList("Entities", 10);
-        for (int integer20 = 0; integer20 < jz17.size(); ++integer20) {
-            cat26.addEntity(jz17.getCompound(integer20));
+        final ProtoChunk chr26 = (ProtoChunk)cgy24;
+        final ListTag lk17 = le2.getList("Entities", 10);
+        for (int integer20 = 0; integer20 < lk17.size(); ++integer20) {
+            chr26.addEntity(lk17.getCompound(integer20));
         }
-        final ListTag jz18 = jt2.getList("TileEntities", 10);
-        for (int integer21 = 0; integer21 < jz18.size(); ++integer21) {
-            final CompoundTag jt6 = jz18.getCompound(integer21);
-            bzy24.setBlockEntityNbt(jt6);
+        final ListTag lk18 = le2.getList("TileEntities", 10);
+        for (int integer21 = 0; integer21 < lk18.size(); ++integer21) {
+            final CompoundTag le6 = lk18.getCompound(integer21);
+            cgy24.setBlockEntityNbt(le6);
         }
-        final ListTag jz19 = jt2.getList("Lights", 9);
-        for (int integer22 = 0; integer22 < jz19.size(); ++integer22) {
-            final ListTag jz20 = jz19.getList(integer22);
-            for (int integer23 = 0; integer23 < jz20.size(); ++integer23) {
-                cat26.addLight(jz20.getShort(integer23), integer22);
+        final ListTag lk19 = le2.getList("Lights", 9);
+        for (int integer22 = 0; integer22 < lk19.size(); ++integer22) {
+            final ListTag lk20 = lk19.getList(integer22);
+            for (int integer23 = 0; integer23 < lk20.size(); ++integer23) {
+                chr26.addLight(lk20.getShort(integer23), integer22);
             }
         }
-        final CompoundTag jt6 = jt2.getCompound("CarvingMasks");
-        for (final String string30 : jt6.getAllKeys()) {
+        final CompoundTag le6 = le2.getCompound("CarvingMasks");
+        for (final String string30 : le6.getAllKeys()) {
             final GenerationStep.Carving a25 = GenerationStep.Carving.valueOf(string30);
-            cat26.setCarvingMask(a25, BitSet.valueOf(jt6.getByteArray(string30)));
+            chr26.setCarvingMask(a25, BitSet.valueOf(le6.getByteArray(string30)));
         }
-        return cat26;
+        return chr26;
     }
     
-    public static CompoundTag write(final ServerLevel xd, final ChunkAccess bzy) {
-        final ChunkPos bjh3 = bzy.getPos();
-        final CompoundTag jt4 = new CompoundTag();
-        final CompoundTag jt5 = new CompoundTag();
-        jt4.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
-        jt4.put("Level", jt5);
-        jt5.putInt("xPos", bjh3.x);
-        jt5.putInt("zPos", bjh3.z);
-        jt5.putLong("LastUpdate", xd.getGameTime());
-        jt5.putLong("InhabitedTime", bzy.getInhabitedTime());
-        jt5.putString("Status", bzy.getStatus().getName());
-        final UpgradeData cav6 = bzy.getUpgradeData();
-        if (!cav6.isEmpty()) {
-            jt5.put("UpgradeData", cav6.write());
+    public static CompoundTag write(final ServerLevel zd, final ChunkAccess cgy) {
+        final ChunkPos bph3 = cgy.getPos();
+        final CompoundTag le4 = new CompoundTag();
+        final CompoundTag le5 = new CompoundTag();
+        le4.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
+        le4.put("Level", le5);
+        le5.putInt("xPos", bph3.x);
+        le5.putInt("zPos", bph3.z);
+        le5.putLong("LastUpdate", zd.getGameTime());
+        le5.putLong("InhabitedTime", cgy.getInhabitedTime());
+        le5.putString("Status", cgy.getStatus().getName());
+        final UpgradeData cht6 = cgy.getUpgradeData();
+        if (!cht6.isEmpty()) {
+            le5.put("UpgradeData", cht6.write());
         }
-        final LevelChunkSection[] arr7 = bzy.getSections();
-        final ListTag jz8 = new ListTag();
-        final LevelLightEngine coa9 = xd.getChunkSource().getLightEngine();
-        final boolean boolean10 = bzy.isLightCorrect();
+        final LevelChunkSection[] arr7 = cgy.getSections();
+        final ListTag lk8 = new ListTag();
+        final LevelLightEngine cwr9 = zd.getChunkSource().getLightEngine();
+        final boolean boolean10 = cgy.isLightCorrect();
         for (int integer11 = -1; integer11 < 17; ++integer11) {
             final int integer12 = integer11;
             final int n;
-            final LevelChunkSection cam2 = Arrays.<LevelChunkSection>stream(arr7).filter(cam -> cam != null && cam.bottomBlockY() >> 4 == n).findFirst().orElse(LevelChunk.EMPTY_SECTION);
-            final DataLayer caf14 = coa9.getLayerListener(LightLayer.BLOCK).getDataLayerData(SectionPos.of(bjh3, integer12));
-            final DataLayer caf15 = coa9.getLayerListener(LightLayer.SKY).getDataLayerData(SectionPos.of(bjh3, integer12));
-            if (cam2 != LevelChunk.EMPTY_SECTION || caf14 != null || caf15 != null) {
-                final CompoundTag jt6 = new CompoundTag();
-                jt6.putByte("Y", (byte)(integer12 & 0xFF));
-                if (cam2 != LevelChunk.EMPTY_SECTION) {
-                    cam2.getStates().write(jt6, "Palette", "BlockStates");
+            final LevelChunkSection chk2 = Arrays.<LevelChunkSection>stream(arr7).filter(chk -> chk != null && chk.bottomBlockY() >> 4 == n).findFirst().orElse(LevelChunk.EMPTY_SECTION);
+            final DataLayer chd14 = cwr9.getLayerListener(LightLayer.BLOCK).getDataLayerData(SectionPos.of(bph3, integer12));
+            final DataLayer chd15 = cwr9.getLayerListener(LightLayer.SKY).getDataLayerData(SectionPos.of(bph3, integer12));
+            if (chk2 != LevelChunk.EMPTY_SECTION || chd14 != null || chd15 != null) {
+                final CompoundTag le6 = new CompoundTag();
+                le6.putByte("Y", (byte)(integer12 & 0xFF));
+                if (chk2 != LevelChunk.EMPTY_SECTION) {
+                    chk2.getStates().write(le6, "Palette", "BlockStates");
                 }
-                if (caf14 != null && !caf14.isEmpty()) {
-                    jt6.putByteArray("BlockLight", caf14.getData());
+                if (chd14 != null && !chd14.isEmpty()) {
+                    le6.putByteArray("BlockLight", chd14.getData());
                 }
-                if (caf15 != null && !caf15.isEmpty()) {
-                    jt6.putByteArray("SkyLight", caf15.getData());
+                if (chd15 != null && !chd15.isEmpty()) {
+                    le6.putByteArray("SkyLight", chd15.getData());
                 }
-                ((AbstractList<CompoundTag>)jz8).add(jt6);
+                ((AbstractList<CompoundTag>)lk8).add(le6);
             }
         }
-        jt5.put("Sections", jz8);
+        le5.put("Sections", lk8);
         if (boolean10) {
-            jt5.putBoolean("isLightOn", true);
+            le5.putBoolean("isLightOn", true);
         }
-        final ChunkBiomeContainer bzz11 = bzy.getBiomes();
-        if (bzz11 != null) {
-            jt5.putIntArray("Biomes", bzz11.writeBiomes());
+        final ChunkBiomeContainer cgz11 = cgy.getBiomes();
+        if (cgz11 != null) {
+            le5.putIntArray("Biomes", cgz11.writeBiomes());
         }
-        final ListTag jz9 = new ListTag();
-        for (final BlockPos fk14 : bzy.getBlockEntitiesPos()) {
-            final CompoundTag jt7 = bzy.getBlockEntityNbtForSaving(fk14);
-            if (jt7 != null) {
-                ((AbstractList<CompoundTag>)jz9).add(jt7);
+        final ListTag lk9 = new ListTag();
+        for (final BlockPos fu14 : cgy.getBlockEntitiesPos()) {
+            final CompoundTag le7 = cgy.getBlockEntityNbtForSaving(fu14);
+            if (le7 != null) {
+                ((AbstractList<CompoundTag>)lk9).add(le7);
             }
         }
-        jt5.put("TileEntities", jz9);
-        final ListTag jz10 = new ListTag();
-        if (bzy.getStatus().getChunkType() == ChunkStatus.ChunkType.LEVELCHUNK) {
-            final LevelChunk cal14 = (LevelChunk)bzy;
-            cal14.setLastSaveHadEntities(false);
-            for (int integer13 = 0; integer13 < cal14.getEntitySections().length; ++integer13) {
-                for (final Entity akq17 : cal14.getEntitySections()[integer13]) {
-                    final CompoundTag jt8 = new CompoundTag();
-                    if (akq17.save(jt8)) {
-                        cal14.setLastSaveHadEntities(true);
-                        ((AbstractList<CompoundTag>)jz10).add(jt8);
+        le5.put("TileEntities", lk9);
+        final ListTag lk10 = new ListTag();
+        if (cgy.getStatus().getChunkType() == ChunkStatus.ChunkType.LEVELCHUNK) {
+            final LevelChunk chj14 = (LevelChunk)cgy;
+            chj14.setLastSaveHadEntities(false);
+            for (int integer13 = 0; integer13 < chj14.getEntitySections().length; ++integer13) {
+                for (final Entity aom17 : chj14.getEntitySections()[integer13]) {
+                    final CompoundTag le8 = new CompoundTag();
+                    if (aom17.save(le8)) {
+                        chj14.setLastSaveHadEntities(true);
+                        ((AbstractList<CompoundTag>)lk10).add(le8);
                     }
                 }
             }
         }
         else {
-            final ProtoChunk cat14 = (ProtoChunk)bzy;
-            jz10.addAll(cat14.getEntities());
-            jt5.put("Lights", packOffsets(cat14.getPackedLights()));
-            final CompoundTag jt7 = new CompoundTag();
+            final ProtoChunk chr14 = (ProtoChunk)cgy;
+            lk10.addAll(chr14.getEntities());
+            le5.put("Lights", packOffsets(chr14.getPackedLights()));
+            final CompoundTag le7 = new CompoundTag();
             for (final GenerationStep.Carving a19 : GenerationStep.Carving.values()) {
-                jt7.putByteArray(a19.toString(), bzy.getCarvingMask(a19).toByteArray());
+                final BitSet bitSet20 = chr14.getCarvingMask(a19);
+                if (bitSet20 != null) {
+                    le7.putByteArray(a19.toString(), bitSet20.toByteArray());
+                }
             }
-            jt5.put("CarvingMasks", jt7);
+            le5.put("CarvingMasks", le7);
         }
-        jt5.put("Entities", jz10);
-        final TickList<Block> bkl14 = bzy.getBlockTicks();
-        if (bkl14 instanceof ProtoTickList) {
-            jt5.put("ToBeTicked", ((ProtoTickList)bkl14).save());
+        le5.put("Entities", lk10);
+        final TickList<Block> bqr14 = cgy.getBlockTicks();
+        if (bqr14 instanceof ProtoTickList) {
+            le5.put("ToBeTicked", ((ProtoTickList)bqr14).save());
         }
-        else if (bkl14 instanceof ChunkTickList) {
-            jt5.put("TileTicks", ((ChunkTickList)bkl14).save(xd.getGameTime()));
+        else if (bqr14 instanceof ChunkTickList) {
+            le5.put("TileTicks", ((ChunkTickList)bqr14).save());
         }
         else {
-            jt5.put("TileTicks", xd.getBlockTicks().save(bjh3));
+            le5.put("TileTicks", zd.getBlockTicks().save(bph3));
         }
-        final TickList<Fluid> bkl15 = bzy.getLiquidTicks();
-        if (bkl15 instanceof ProtoTickList) {
-            jt5.put("LiquidsToBeTicked", ((ProtoTickList)bkl15).save());
+        final TickList<Fluid> bqr15 = cgy.getLiquidTicks();
+        if (bqr15 instanceof ProtoTickList) {
+            le5.put("LiquidsToBeTicked", ((ProtoTickList)bqr15).save());
         }
-        else if (bkl15 instanceof ChunkTickList) {
-            jt5.put("LiquidTicks", ((ChunkTickList)bkl15).save(xd.getGameTime()));
+        else if (bqr15 instanceof ChunkTickList) {
+            le5.put("LiquidTicks", ((ChunkTickList)bqr15).save());
         }
         else {
-            jt5.put("LiquidTicks", xd.getLiquidTicks().save(bjh3));
+            le5.put("LiquidTicks", zd.getLiquidTicks().save(bph3));
         }
-        jt5.put("PostProcessing", packOffsets(bzy.getPostProcessing()));
-        final CompoundTag jt6 = new CompoundTag();
-        for (final Map.Entry<Heightmap.Types, Heightmap> entry18 : bzy.getHeightmaps()) {
-            if (bzy.getStatus().heightmapsAfter().contains(entry18.getKey())) {
-                jt6.put(entry18.getKey().getSerializationKey(), new LongArrayTag(entry18.getValue().getRawData()));
+        le5.put("PostProcessing", packOffsets(cgy.getPostProcessing()));
+        final CompoundTag le6 = new CompoundTag();
+        for (final Map.Entry<Heightmap.Types, Heightmap> entry18 : cgy.getHeightmaps()) {
+            if (cgy.getStatus().heightmapsAfter().contains(entry18.getKey())) {
+                le6.put(entry18.getKey().getSerializationKey(), new LongArrayTag(entry18.getValue().getRawData()));
             }
         }
-        jt5.put("Heightmaps", jt6);
-        jt5.put("Structures", packStructureData(bjh3, bzy.getAllStarts(), bzy.getAllReferences()));
-        return jt4;
+        le5.put("Heightmaps", le6);
+        le5.put("Structures", packStructureData(bph3, cgy.getAllStarts(), cgy.getAllReferences()));
+        return le4;
     }
     
-    public static ChunkStatus.ChunkType getChunkTypeFromTag(@Nullable final CompoundTag jt) {
-        if (jt != null) {
-            final ChunkStatus cae2 = ChunkStatus.byName(jt.getCompound("Level").getString("Status"));
-            if (cae2 != null) {
-                return cae2.getChunkType();
+    public static ChunkStatus.ChunkType getChunkTypeFromTag(@Nullable final CompoundTag le) {
+        if (le != null) {
+            final ChunkStatus chc2 = ChunkStatus.byName(le.getCompound("Level").getString("Status"));
+            if (chc2 != null) {
+                return chc2.getChunkType();
             }
         }
         return ChunkStatus.ChunkType.PROTOCHUNK;
     }
     
-    private static void postLoadChunk(final CompoundTag jt, final LevelChunk cal) {
-        final ListTag jz3 = jt.getList("Entities", 10);
-        final Level bjw4 = cal.getLevel();
-        for (int integer5 = 0; integer5 < jz3.size(); ++integer5) {
-            final CompoundTag jt2 = jz3.getCompound(integer5);
-            EntityType.loadEntityRecursive(jt2, bjw4, akq -> {
-                cal.addEntity(akq);
-                return akq;
+    private static void postLoadChunk(final CompoundTag le, final LevelChunk chj) {
+        final ListTag lk3 = le.getList("Entities", 10);
+        final Level bqb4 = chj.getLevel();
+        for (int integer5 = 0; integer5 < lk3.size(); ++integer5) {
+            final CompoundTag le2 = lk3.getCompound(integer5);
+            EntityType.loadEntityRecursive(le2, bqb4, aom -> {
+                chj.addEntity(aom);
+                return aom;
             });
-            cal.setLastSaveHadEntities(true);
+            chj.setLastSaveHadEntities(true);
         }
-        final ListTag jz4 = jt.getList("TileEntities", 10);
-        for (int integer6 = 0; integer6 < jz4.size(); ++integer6) {
-            final CompoundTag jt3 = jz4.getCompound(integer6);
-            final boolean boolean8 = jt3.getBoolean("keepPacked");
+        final ListTag lk4 = le.getList("TileEntities", 10);
+        for (int integer6 = 0; integer6 < lk4.size(); ++integer6) {
+            final CompoundTag le3 = lk4.getCompound(integer6);
+            final boolean boolean8 = le3.getBoolean("keepPacked");
             if (boolean8) {
-                cal.setBlockEntityNbt(jt3);
+                chj.setBlockEntityNbt(le3);
             }
             else {
-                final BlockEntity bwl9 = BlockEntity.loadStatic(jt3);
-                if (bwl9 != null) {
-                    cal.addBlockEntity(bwl9);
+                final BlockPos fu9 = new BlockPos(le3.getInt("x"), le3.getInt("y"), le3.getInt("z"));
+                final BlockEntity cdl10 = BlockEntity.loadStatic(chj.getBlockState(fu9), le3);
+                if (cdl10 != null) {
+                    chj.addBlockEntity(cdl10);
                 }
             }
         }
     }
     
-    private static CompoundTag packStructureData(final ChunkPos bjh, final Map<String, StructureStart> map2, final Map<String, LongSet> map3) {
-        final CompoundTag jt4 = new CompoundTag();
-        final CompoundTag jt5 = new CompoundTag();
-        for (final Map.Entry<String, StructureStart> entry7 : map2.entrySet()) {
-            jt5.put(entry7.getKey(), entry7.getValue().createTag(bjh.x, bjh.z));
+    private static CompoundTag packStructureData(final ChunkPos bph, final Map<StructureFeature<?>, StructureStart<?>> map2, final Map<StructureFeature<?>, LongSet> map3) {
+        final CompoundTag le4 = new CompoundTag();
+        final CompoundTag le5 = new CompoundTag();
+        for (final Map.Entry<StructureFeature<?>, StructureStart<?>> entry7 : map2.entrySet()) {
+            le5.put(entry7.getKey().getFeatureName(), entry7.getValue().createTag(bph.x, bph.z));
         }
-        jt4.put("Starts", jt5);
-        final CompoundTag jt6 = new CompoundTag();
-        for (final Map.Entry<String, LongSet> entry8 : map3.entrySet()) {
-            jt6.put(entry8.getKey(), new LongArrayTag(entry8.getValue()));
+        le4.put("Starts", le5);
+        final CompoundTag le6 = new CompoundTag();
+        for (final Map.Entry<StructureFeature<?>, LongSet> entry8 : map3.entrySet()) {
+            le6.put(entry8.getKey().getFeatureName(), new LongArrayTag(entry8.getValue()));
         }
-        jt4.put("References", jt6);
-        return jt4;
+        le4.put("References", le6);
+        return le4;
     }
     
-    private static Map<String, StructureStart> unpackStructureStart(final ChunkGenerator<?> caa, final StructureManager cmo, final CompoundTag jt) {
-        final Map<String, StructureStart> map4 = Maps.newHashMap();
-        final CompoundTag jt2 = jt.getCompound("Starts");
-        for (final String string7 : jt2.getAllKeys()) {
-            map4.put(string7, StructureFeatureIO.loadStaticStart(caa, cmo, jt2.getCompound(string7)));
+    private static Map<StructureFeature<?>, StructureStart<?>> unpackStructureStart(final StructureManager cva, final CompoundTag le, final long long3) {
+        final Map<StructureFeature<?>, StructureStart<?>> map5 = Maps.newHashMap();
+        final CompoundTag le2 = le.getCompound("Starts");
+        for (final String string8 : le2.getAllKeys()) {
+            final String string9 = string8.toLowerCase(Locale.ROOT);
+            final StructureFeature<?> cml10 = StructureFeature.STRUCTURES_REGISTRY.get(string9);
+            if (cml10 == null) {
+                ChunkSerializer.LOGGER.error("Unknown structure start: {}", string9);
+            }
+            else {
+                final StructureStart<?> ctz11 = StructureFeature.loadStaticStart(cva, le2.getCompound(string8), long3);
+                if (ctz11 == null) {
+                    continue;
+                }
+                map5.put(cml10, ctz11);
+            }
         }
-        return map4;
+        return map5;
     }
     
-    private static Map<String, LongSet> unpackStructureReferences(final ChunkPos bjh, final CompoundTag jt) {
-        final Map<String, LongSet> map3 = Maps.newHashMap();
-        final CompoundTag jt2 = jt.getCompound("References");
-        for (final String string6 : jt2.getAllKeys()) {
-            final ChunkPos bjh2;
+    private static Map<StructureFeature<?>, LongSet> unpackStructureReferences(final ChunkPos bph, final CompoundTag le) {
+        final Map<StructureFeature<?>, LongSet> map3 = Maps.newHashMap();
+        final CompoundTag le2 = le.getCompound("References");
+        for (final String string6 : le2.getAllKeys()) {
+            final ChunkPos bph2;
             final Object o;
-            map3.put(string6, (LongSet)new LongOpenHashSet(Arrays.stream(jt2.getLongArray(string6)).filter(long3 -> {
-                bjh2 = new ChunkPos(long3);
-                if (bjh2.getChessboardDistance(bjh) > 8) {
-                    ChunkSerializer.LOGGER.warn("Found invalid structure reference [ {} @ {} ] for chunk {}.", o, bjh2, bjh);
+            map3.put(StructureFeature.STRUCTURES_REGISTRY.get(string6.toLowerCase(Locale.ROOT)), (LongSet)new LongOpenHashSet(Arrays.stream(le2.getLongArray(string6)).filter(long3 -> {
+                bph2 = new ChunkPos(long3);
+                if (bph2.getChessboardDistance(bph) > 8) {
+                    ChunkSerializer.LOGGER.warn("Found invalid structure reference [ {} @ {} ] for chunk {}.", o, bph2, bph);
                     return false;
                 }
                 else {
@@ -391,17 +407,17 @@ public class ChunkSerializer {
     }
     
     public static ListTag packOffsets(final ShortList[] arr) {
-        final ListTag jz2 = new ListTag();
+        final ListTag lk2 = new ListTag();
         for (final ShortList shortList6 : arr) {
-            final ListTag jz3 = new ListTag();
+            final ListTag lk3 = new ListTag();
             if (shortList6 != null) {
                 for (final Short short9 : shortList6) {
-                    ((AbstractList<ShortTag>)jz3).add(ShortTag.valueOf(short9));
+                    ((AbstractList<ShortTag>)lk3).add(ShortTag.valueOf(short9));
                 }
             }
-            ((AbstractList<ListTag>)jz2).add(jz3);
+            ((AbstractList<ListTag>)lk2).add(lk3);
         }
-        return jz2;
+        return lk2;
     }
     
     static {
diff --git a/src/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/net/minecraft/world/level/chunk/storage/ChunkStorage.java
index f246cf2..90e2fe3 100644
--- a/src/net/minecraft/world/level/chunk/storage/ChunkStorage.java
+++ b/src/net/minecraft/world/level/chunk/storage/ChunkStorage.java
@@ -8,7 +8,8 @@ import net.minecraft.util.datafix.DataFixTypes;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.storage.DimensionDataStorage;
 import java.util.function.Supplier;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import java.io.File;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.levelgen.structure.LegacyStructureDataHandler;
@@ -20,43 +21,43 @@ public class ChunkStorage implements AutoCloseable {
     @Nullable
     private LegacyStructureDataHandler legacyStructureHandler;
     
-    public ChunkStorage(final File file, final DataFixer dataFixer) {
+    public ChunkStorage(final File file, final DataFixer dataFixer, final boolean boolean3) {
         this.fixerUpper = dataFixer;
-        this.worker = new IOWorker(new RegionFileStorage(file), "chunk");
+        this.worker = new IOWorker(file, boolean3, "chunk");
     }
     
-    public CompoundTag upgradeChunkTag(final DimensionType cbi, final Supplier<DimensionDataStorage> supplier, CompoundTag jt) {
-        final int integer5 = getVersion(jt);
+    public CompoundTag upgradeChunkTag(final ResourceKey<Level> ug, final Supplier<DimensionDataStorage> supplier, CompoundTag le) {
+        final int integer5 = getVersion(le);
         final int integer6 = 1493;
         if (integer5 < 1493) {
-            jt = NbtUtils.update(this.fixerUpper, DataFixTypes.CHUNK, jt, integer5, 1493);
-            if (jt.getCompound("Level").getBoolean("hasLegacyStructureData")) {
+            le = NbtUtils.update(this.fixerUpper, DataFixTypes.CHUNK, le, integer5, 1493);
+            if (le.getCompound("Level").getBoolean("hasLegacyStructureData")) {
                 if (this.legacyStructureHandler == null) {
-                    this.legacyStructureHandler = LegacyStructureDataHandler.getLegacyStructureHandler(cbi, supplier.get());
+                    this.legacyStructureHandler = LegacyStructureDataHandler.getLegacyStructureHandler(ug, supplier.get());
                 }
-                jt = this.legacyStructureHandler.updateFromLegacy(jt);
+                le = this.legacyStructureHandler.updateFromLegacy(le);
             }
         }
-        jt = NbtUtils.update(this.fixerUpper, DataFixTypes.CHUNK, jt, Math.max(1493, integer5));
+        le = NbtUtils.update(this.fixerUpper, DataFixTypes.CHUNK, le, Math.max(1493, integer5));
         if (integer5 < SharedConstants.getCurrentVersion().getWorldVersion()) {
-            jt.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
+            le.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
         }
-        return jt;
+        return le;
     }
     
-    public static int getVersion(final CompoundTag jt) {
-        return jt.contains("DataVersion", 99) ? jt.getInt("DataVersion") : -1;
+    public static int getVersion(final CompoundTag le) {
+        return le.contains("DataVersion", 99) ? le.getInt("DataVersion") : -1;
     }
     
     @Nullable
-    public CompoundTag read(final ChunkPos bjh) throws IOException {
-        return this.worker.load(bjh);
+    public CompoundTag read(final ChunkPos bph) throws IOException {
+        return this.worker.load(bph);
     }
     
-    public void write(final ChunkPos bjh, final CompoundTag jt) {
-        this.worker.store(bjh, jt);
+    public void write(final ChunkPos bph, final CompoundTag le) {
+        this.worker.store(bph, le);
         if (this.legacyStructureHandler != null) {
-            this.legacyStructureHandler.removeIndex(bjh.toLong());
+            this.legacyStructureHandler.removeIndex(bph.toLong());
         }
     }
     
diff --git a/src/net/minecraft/world/level/chunk/storage/IOWorker.java b/src/net/minecraft/world/level/chunk/storage/IOWorker.java
index 251eae6..4d61140 100644
--- a/src/net/minecraft/world/level/chunk/storage/IOWorker.java
+++ b/src/net/minecraft/world/level/chunk/storage/IOWorker.java
@@ -1,83 +1,74 @@
 package net.minecraft.world.level.chunk.storage;
 
 import org.apache.logging.log4j.LogManager;
+import net.minecraft.util.thread.ProcessorHandle;
 import java.util.function.BiConsumer;
+import net.minecraft.util.Unit;
 import java.util.Iterator;
-import java.util.concurrent.locks.LockSupport;
-import java.util.function.Function;
+import java.util.function.Supplier;
 import javax.annotation.Nullable;
 import java.util.concurrent.CompletionException;
 import java.io.IOException;
-import net.minecraft.nbt.CompoundTag;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Queues;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Function;
+import com.mojang.datafixers.util.Either;
 import java.util.concurrent.CompletableFuture;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.Util;
+import com.google.common.collect.Maps;
+import java.io.File;
 import net.minecraft.world.level.ChunkPos;
 import java.util.Map;
-import java.util.Queue;
+import net.minecraft.util.thread.StrictQueue;
+import net.minecraft.util.thread.ProcessorMailbox;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.logging.log4j.Logger;
 
 public class IOWorker implements AutoCloseable {
     private static final Logger LOGGER;
-    private final Thread thread;
     private final AtomicBoolean shutdownRequested;
-    private final Queue<Runnable> inbox;
+    private final ProcessorMailbox<StrictQueue.IntRunnable> mailbox;
     private final RegionFileStorage storage;
     private final Map<ChunkPos, PendingStore> pendingWrites;
-    private boolean running;
-    private CompletableFuture<Void> shutdownListener;
     
-    IOWorker(final RegionFileStorage cbd, final String string) {
+    protected IOWorker(final File file, final boolean boolean2, final String string) {
         this.shutdownRequested = new AtomicBoolean();
-        this.inbox = Queues.newConcurrentLinkedQueue();
         this.pendingWrites = Maps.newLinkedHashMap();
-        this.running = true;
-        this.shutdownListener = new CompletableFuture<Void>();
-        this.storage = cbd;
-        (this.thread = new Thread(this::loop)).setName(string + " IO worker");
-        this.thread.start();
+        this.storage = new RegionFileStorage(file, boolean2);
+        this.mailbox = new ProcessorMailbox<StrictQueue.IntRunnable>(new StrictQueue.FixedPriorityQueue(Priority.values().length), Util.ioPool(), "IOWorker-" + string);
     }
     
-    public CompletableFuture<Void> store(final ChunkPos bjh, final CompoundTag jt) {
-        final PendingStore a5;
-        return this.<Void>submitTask(completableFuture -> () -> {
-            a5 = this.pendingWrites.computeIfAbsent(bjh, bjh -> new PendingStore());
-            a5.data = jt;
-            a5.result.whenComplete((void2, throwable) -> {
-                if (throwable != null) {
-                    completableFuture.completeExceptionally(throwable);
-                }
-                else {
-                    completableFuture.complete(null);
-                }
-            });
-        });
+    public CompletableFuture<Void> store(final ChunkPos bph, final CompoundTag le) {
+        final PendingStore a4;
+        return this.submitTask(() -> {
+            a4 = this.pendingWrites.computeIfAbsent(bph, bph -> new PendingStore(le));
+            a4.data = le;
+            return (com.mojang.datafixers.util.Either<Object, Exception>)Either.left(a4.result);
+        }).<Void>thenCompose(Function.identity());
     }
     
     @Nullable
-    public CompoundTag load(final ChunkPos bjh) throws IOException {
-        final PendingStore a4;
-        CompoundTag jt5;
-        final CompletableFuture<CompoundTag> completableFuture2 = this.<CompoundTag>submitTask(completableFuture -> () -> {
-            a4 = this.pendingWrites.get(bjh);
-            if (a4 != null) {
-                completableFuture.complete(a4.data);
+    public CompoundTag load(final ChunkPos bph) throws IOException {
+        final PendingStore a3;
+        CompoundTag le4;
+        final CompletableFuture<CompoundTag> completableFuture3 = this.<CompoundTag>submitTask(() -> {
+            a3 = this.pendingWrites.get(bph);
+            if (a3 != null) {
+                return Either.left(a3.data);
             }
             else {
                 try {
-                    jt5 = this.storage.read(bjh);
-                    completableFuture.complete(jt5);
+                    le4 = this.storage.read(bph);
+                    return Either.left(le4);
                 }
-                catch (Exception exception5) {
-                    IOWorker.LOGGER.warn("Failed to read chunk {}", bjh, exception5);
-                    completableFuture.completeExceptionally(exception5);
+                catch (Exception exception4) {
+                    IOWorker.LOGGER.warn("Failed to read chunk {}", bph, exception4);
+                    return Either.right(exception4);
                 }
             }
-            return;
         });
         try {
-            return completableFuture2.join();
+            return completableFuture3.join();
         }
         catch (CompletionException completionException4) {
             if (completionException4.getCause() instanceof IOException) {
@@ -87,110 +78,78 @@ public class IOWorker implements AutoCloseable {
         }
     }
     
-    private CompletableFuture<Void> shutdown() {
-        return this.<Void>submitTask(completableFuture -> () -> {
-            this.running = false;
-            this.shutdownListener = completableFuture;
-        });
-    }
-    
     public CompletableFuture<Void> synchronize() {
-        final CompletableFuture<Void> completableFuture2;
-        return this.<Void>submitTask(completableFuture -> () -> {
-            completableFuture2 = CompletableFuture.allOf(this.pendingWrites.values().stream().map(a -> a.result).<CompletableFuture<?>>toArray(CompletableFuture[]::new));
-            completableFuture2.whenComplete((object, throwable) -> completableFuture.complete(null));
-        });
-    }
-    
-    private <T> CompletableFuture<T> submitTask(final Function<CompletableFuture<T>, Runnable> function) {
-        final CompletableFuture<T> completableFuture3 = new CompletableFuture<T>();
-        this.inbox.add(function.apply(completableFuture3));
-        LockSupport.unpark(this.thread);
-        return completableFuture3;
-    }
-    
-    private void waitForQueueNonEmpty() {
-        LockSupport.park("waiting for tasks");
-    }
-    
-    private void loop() {
-        try {
-            while (this.running) {
-                final boolean boolean2 = this.processInbox();
-                final boolean boolean3 = this.storePendingChunk();
-                if (!boolean2 && !boolean3) {
-                    this.waitForQueueNonEmpty();
-                }
+        final CompletableFuture<Void> completableFuture2 = this.submitTask(() -> Either.left(CompletableFuture.allOf(this.pendingWrites.values().stream().map(a -> a.result).<CompletableFuture<?>>toArray(CompletableFuture[]::new)))).<Void>thenCompose(Function.identity());
+        return completableFuture2.<Void>thenCompose(void1 -> this.submitTask(() -> {
+            try {
+                this.storage.flush();
+                return Either.left(null);
             }
-            this.processInbox();
-            this.storeRemainingPendingChunks();
-        }
-        finally {
-            this.closeStorage();
-        }
+            catch (Exception exception2) {
+                IOWorker.LOGGER.warn("Failed to synchronized chunks", (Throwable)exception2);
+                return Either.right(exception2);
+            }
+        }));
     }
     
-    private boolean storePendingChunk() {
+    private <T> CompletableFuture<T> submitTask(final Supplier<Either<T, Exception>> supplier) {
+        return this.mailbox.<T>askEither(amp -> new StrictQueue.IntRunnable(Priority.HIGH.ordinal(), () -> {
+            if (!this.shutdownRequested.get()) {
+                amp.tell(supplier.get());
+            }
+            this.tellStorePending();
+        }));
+    }
+    
+    private void storePendingChunk() {
         final Iterator<Map.Entry<ChunkPos, PendingStore>> iterator2 = this.pendingWrites.entrySet().iterator();
         if (!iterator2.hasNext()) {
-            return false;
+            return;
         }
         final Map.Entry<ChunkPos, PendingStore> entry3 = iterator2.next();
         iterator2.remove();
         this.runStore(entry3.getKey(), entry3.getValue());
-        return true;
+        this.tellStorePending();
     }
     
-    private void storeRemainingPendingChunks() {
-        this.pendingWrites.forEach(this::runStore);
-        this.pendingWrites.clear();
+    private void tellStorePending() {
+        this.mailbox.tell(new StrictQueue.IntRunnable(Priority.LOW.ordinal(), this::storePendingChunk));
     }
     
-    private void runStore(final ChunkPos bjh, final PendingStore a) {
+    private void runStore(final ChunkPos bph, final PendingStore a) {
         try {
-            this.storage.write(bjh, a.data);
+            this.storage.write(bph, a.data);
             a.result.complete(null);
         }
         catch (Exception exception4) {
-            IOWorker.LOGGER.error("Failed to store chunk {}", bjh, exception4);
+            IOWorker.LOGGER.error("Failed to store chunk {}", bph, exception4);
             a.result.completeExceptionally(exception4);
         }
     }
     
-    private void closeStorage() {
-        try {
-            this.storage.close();
-            this.shutdownListener.complete(null);
-        }
-        catch (Exception exception2) {
-            IOWorker.LOGGER.error("Failed to close storage", (Throwable)exception2);
-            this.shutdownListener.completeExceptionally(exception2);
-        }
-    }
-    
-    private boolean processInbox() {
-        boolean boolean2 = false;
-        Runnable runnable3;
-        while ((runnable3 = this.inbox.poll()) != null) {
-            boolean2 = true;
-            runnable3.run();
-        }
-        return boolean2;
-    }
-    
     @Override
     public void close() throws IOException {
         if (!this.shutdownRequested.compareAndSet(false, true)) {
             return;
         }
+        final CompletableFuture<Unit> completableFuture2 = this.mailbox.<Unit>ask(amp -> new StrictQueue.IntRunnable(Priority.HIGH.ordinal(), () -> amp.tell(Unit.INSTANCE)));
         try {
-            this.shutdown().join();
+            completableFuture2.join();
         }
-        catch (CompletionException completionException2) {
-            if (completionException2.getCause() instanceof IOException) {
-                throw (IOException)completionException2.getCause();
+        catch (CompletionException completionException3) {
+            if (completionException3.getCause() instanceof IOException) {
+                throw (IOException)completionException3.getCause();
             }
-            throw completionException2;
+            throw completionException3;
+        }
+        this.mailbox.close();
+        this.pendingWrites.forEach(this::runStore);
+        this.pendingWrites.clear();
+        try {
+            this.storage.close();
+        }
+        catch (Exception exception3) {
+            IOWorker.LOGGER.error("Failed to close storage", (Throwable)exception3);
         }
     }
     
@@ -198,12 +157,18 @@ public class IOWorker implements AutoCloseable {
         LOGGER = LogManager.getLogger();
     }
     
+    enum Priority {
+        HIGH, 
+        LOW;
+    }
+    
     static class PendingStore {
         private CompoundTag data;
         private final CompletableFuture<Void> result;
         
-        private PendingStore() {
+        public PendingStore(final CompoundTag le) {
             this.result = new CompletableFuture<Void>();
+            this.data = le;
         }
     }
 }
diff --git a/src/net/minecraft/world/level/chunk/storage/OldChunkStorage.java b/src/net/minecraft/world/level/chunk/storage/OldChunkStorage.java
index 39996c4..e6a6e38 100644
--- a/src/net/minecraft/world/level/chunk/storage/OldChunkStorage.java
+++ b/src/net/minecraft/world/level/chunk/storage/OldChunkStorage.java
@@ -11,39 +11,39 @@ import net.minecraft.world.level.chunk.OldDataLayer;
 import net.minecraft.nbt.CompoundTag;
 
 public class OldChunkStorage {
-    public static OldLevelChunk load(final CompoundTag jt) {
-        final int integer2 = jt.getInt("xPos");
-        final int integer3 = jt.getInt("zPos");
+    public static OldLevelChunk load(final CompoundTag le) {
+        final int integer2 = le.getInt("xPos");
+        final int integer3 = le.getInt("zPos");
         final OldLevelChunk a4 = new OldLevelChunk(integer2, integer3);
-        a4.blocks = jt.getByteArray("Blocks");
-        a4.data = new OldDataLayer(jt.getByteArray("Data"), 7);
-        a4.skyLight = new OldDataLayer(jt.getByteArray("SkyLight"), 7);
-        a4.blockLight = new OldDataLayer(jt.getByteArray("BlockLight"), 7);
-        a4.heightmap = jt.getByteArray("HeightMap");
-        a4.terrainPopulated = jt.getBoolean("TerrainPopulated");
-        a4.entities = jt.getList("Entities", 10);
-        a4.blockEntities = jt.getList("TileEntities", 10);
-        a4.blockTicks = jt.getList("TileTicks", 10);
+        a4.blocks = le.getByteArray("Blocks");
+        a4.data = new OldDataLayer(le.getByteArray("Data"), 7);
+        a4.skyLight = new OldDataLayer(le.getByteArray("SkyLight"), 7);
+        a4.blockLight = new OldDataLayer(le.getByteArray("BlockLight"), 7);
+        a4.heightmap = le.getByteArray("HeightMap");
+        a4.terrainPopulated = le.getBoolean("TerrainPopulated");
+        a4.entities = le.getList("Entities", 10);
+        a4.blockEntities = le.getList("TileEntities", 10);
+        a4.blockTicks = le.getList("TileTicks", 10);
         try {
-            a4.lastUpdated = jt.getLong("LastUpdate");
+            a4.lastUpdated = le.getLong("LastUpdate");
         }
         catch (ClassCastException classCastException5) {
-            a4.lastUpdated = jt.getInt("LastUpdate");
+            a4.lastUpdated = le.getInt("LastUpdate");
         }
         return a4;
     }
     
-    public static void convertToAnvilFormat(final OldLevelChunk a, final CompoundTag jt, final BiomeSource bkw) {
-        jt.putInt("xPos", a.x);
-        jt.putInt("zPos", a.z);
-        jt.putLong("LastUpdate", a.lastUpdated);
+    public static void convertToAnvilFormat(final OldLevelChunk a, final CompoundTag le, final BiomeSource brh) {
+        le.putInt("xPos", a.x);
+        le.putInt("zPos", a.z);
+        le.putLong("LastUpdate", a.lastUpdated);
         final int[] arr4 = new int[a.heightmap.length];
         for (int integer5 = 0; integer5 < a.heightmap.length; ++integer5) {
             arr4[integer5] = a.heightmap[integer5];
         }
-        jt.putIntArray("HeightMap", arr4);
-        jt.putBoolean("TerrainPopulated", a.terrainPopulated);
-        final ListTag jz5 = new ListTag();
+        le.putIntArray("HeightMap", arr4);
+        le.putBoolean("TerrainPopulated", a.terrainPopulated);
+        final ListTag lk5 = new ListTag();
         for (int integer6 = 0; integer6 < 8; ++integer6) {
             boolean boolean7 = true;
             for (int integer7 = 0; integer7 < 16 && boolean7; ++integer7) {
@@ -60,38 +60,38 @@ public class OldChunkStorage {
             }
             if (!boolean7) {
                 final byte[] arr5 = new byte[4096];
-                final DataLayer caf9 = new DataLayer();
-                final DataLayer caf10 = new DataLayer();
-                final DataLayer caf11 = new DataLayer();
+                final DataLayer chd9 = new DataLayer();
+                final DataLayer chd10 = new DataLayer();
+                final DataLayer chd11 = new DataLayer();
                 for (int integer11 = 0; integer11 < 16; ++integer11) {
                     for (int integer12 = 0; integer12 < 16; ++integer12) {
                         for (int integer13 = 0; integer13 < 16; ++integer13) {
                             final int integer14 = integer11 << 11 | integer13 << 7 | integer12 + (integer6 << 4);
                             final int integer15 = a.blocks[integer14];
                             arr5[integer12 << 8 | integer13 << 4 | integer11] = (byte)(integer15 & 0xFF);
-                            caf9.set(integer11, integer12, integer13, a.data.get(integer11, integer12 + (integer6 << 4), integer13));
-                            caf10.set(integer11, integer12, integer13, a.skyLight.get(integer11, integer12 + (integer6 << 4), integer13));
-                            caf11.set(integer11, integer12, integer13, a.blockLight.get(integer11, integer12 + (integer6 << 4), integer13));
+                            chd9.set(integer11, integer12, integer13, a.data.get(integer11, integer12 + (integer6 << 4), integer13));
+                            chd10.set(integer11, integer12, integer13, a.skyLight.get(integer11, integer12 + (integer6 << 4), integer13));
+                            chd11.set(integer11, integer12, integer13, a.blockLight.get(integer11, integer12 + (integer6 << 4), integer13));
                         }
                     }
                 }
-                final CompoundTag jt2 = new CompoundTag();
-                jt2.putByte("Y", (byte)(integer6 & 0xFF));
-                jt2.putByteArray("Blocks", arr5);
-                jt2.putByteArray("Data", caf9.getData());
-                jt2.putByteArray("SkyLight", caf10.getData());
-                jt2.putByteArray("BlockLight", caf11.getData());
-                ((AbstractList<CompoundTag>)jz5).add(jt2);
+                final CompoundTag le2 = new CompoundTag();
+                le2.putByte("Y", (byte)(integer6 & 0xFF));
+                le2.putByteArray("Blocks", arr5);
+                le2.putByteArray("Data", chd9.getData());
+                le2.putByteArray("SkyLight", chd10.getData());
+                le2.putByteArray("BlockLight", chd11.getData());
+                ((AbstractList<CompoundTag>)lk5).add(le2);
             }
         }
-        jt.put("Sections", jz5);
-        jt.putIntArray("Biomes", new ChunkBiomeContainer(new ChunkPos(a.x, a.z), bkw).writeBiomes());
-        jt.put("Entities", a.entities);
-        jt.put("TileEntities", a.blockEntities);
+        le.put("Sections", lk5);
+        le.putIntArray("Biomes", new ChunkBiomeContainer(new ChunkPos(a.x, a.z), brh).writeBiomes());
+        le.put("Entities", a.entities);
+        le.put("TileEntities", a.blockEntities);
         if (a.blockTicks != null) {
-            jt.put("TileTicks", a.blockTicks);
+            le.put("TileTicks", a.blockTicks);
         }
-        jt.putBoolean("convertedFromAlphaFormat", true);
+        le.putBoolean("convertedFromAlphaFormat", true);
     }
     
     public static class OldLevelChunk {
diff --git a/src/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/net/minecraft/world/level/chunk/storage/RegionFile.java
index e97610f..99f6ff8 100644
--- a/src/net/minecraft/world/level/chunk/storage/RegionFile.java
+++ b/src/net/minecraft/world/level/chunk/storage/RegionFile.java
@@ -38,14 +38,14 @@ public class RegionFile implements AutoCloseable {
     private final IntBuffer timestamps;
     private final RegionBitmap usedSectors;
     
-    public RegionFile(final File file1, final File file2) throws IOException {
-        this(file1.toPath(), file2.toPath(), RegionFileVersion.VERSION_DEFLATE);
+    public RegionFile(final File file1, final File file2, final boolean boolean3) throws IOException {
+        this(file1.toPath(), file2.toPath(), RegionFileVersion.VERSION_DEFLATE, boolean3);
     }
     
-    public RegionFile(final Path path1, final Path path2, final RegionFileVersion cbe) throws IOException {
+    public RegionFile(final Path path1, final Path path2, final RegionFileVersion cic, final boolean boolean4) throws IOException {
         this.header = ByteBuffer.allocateDirect(8192);
         this.usedSectors = new RegionBitmap();
-        this.version = cbe;
+        this.version = cic;
         if (!Files.isDirectory(path2)) {
             throw new IllegalArgumentException("Expected directory, got " + path2.toAbsolutePath());
         }
@@ -53,33 +53,38 @@ public class RegionFile implements AutoCloseable {
         (this.offsets = this.header.asIntBuffer()).limit(1024);
         this.header.position(4096);
         this.timestamps = this.header.asIntBuffer();
-        this.file = FileChannel.open(path1, StandardOpenOption.CREATE, StandardOpenOption.READ, StandardOpenOption.WRITE);
+        if (boolean4) {
+            this.file = FileChannel.open(path1, StandardOpenOption.CREATE, StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.DSYNC);
+        }
+        else {
+            this.file = FileChannel.open(path1, StandardOpenOption.CREATE, StandardOpenOption.READ, StandardOpenOption.WRITE);
+        }
         this.usedSectors.force(0, 2);
         this.header.position(0);
-        final int integer5 = this.file.read(this.header, 0L);
-        if (integer5 != -1) {
-            if (integer5 != 8192) {
-                RegionFile.LOGGER.warn("Region file {} has truncated header: {}", path1, integer5);
+        final int integer6 = this.file.read(this.header, 0L);
+        if (integer6 != -1) {
+            if (integer6 != 8192) {
+                RegionFile.LOGGER.warn("Region file {} has truncated header: {}", path1, integer6);
             }
-            for (int integer6 = 0; integer6 < 1024; ++integer6) {
-                final int integer7 = this.offsets.get(integer6);
-                if (integer7 != 0) {
-                    final int integer8 = getSectorNumber(integer7);
-                    final int integer9 = getNumSectors(integer7);
-                    this.usedSectors.force(integer8, integer9);
+            for (int integer7 = 0; integer7 < 1024; ++integer7) {
+                final int integer8 = this.offsets.get(integer7);
+                if (integer8 != 0) {
+                    final int integer9 = getSectorNumber(integer8);
+                    final int integer10 = getNumSectors(integer8);
+                    this.usedSectors.force(integer9, integer10);
                 }
             }
         }
     }
     
-    private Path getExternalChunkPath(final ChunkPos bjh) {
-        final String string3 = "c." + bjh.x + "." + bjh.z + ".mcc";
+    private Path getExternalChunkPath(final ChunkPos bph) {
+        final String string3 = "c." + bph.x + "." + bph.z + ".mcc";
         return this.externalFileDir.resolve(string3);
     }
     
     @Nullable
-    public synchronized DataInputStream getChunkDataInputStream(final ChunkPos bjh) throws IOException {
-        final int integer3 = this.getOffset(bjh);
+    public synchronized DataInputStream getChunkDataInputStream(final ChunkPos bph) throws IOException {
+        final int integer3 = this.getOffset(bph);
         if (integer3 == 0) {
             return null;
         }
@@ -90,13 +95,13 @@ public class RegionFile implements AutoCloseable {
         this.file.read(byteBuffer7, integer4 * 4096);
         byteBuffer7.flip();
         if (byteBuffer7.remaining() < 5) {
-            RegionFile.LOGGER.error("Chunk {} header is truncated: expected {} but read {}", bjh, integer6, byteBuffer7.remaining());
+            RegionFile.LOGGER.error("Chunk {} header is truncated: expected {} but read {}", bph, integer6, byteBuffer7.remaining());
             return null;
         }
         final int integer7 = byteBuffer7.getInt();
         final byte byte9 = byteBuffer7.get();
         if (integer7 == 0) {
-            RegionFile.LOGGER.warn("Chunk {} is allocated, but stream is missing", bjh);
+            RegionFile.LOGGER.warn("Chunk {} is allocated, but stream is missing", bph);
             return null;
         }
         final int integer8 = integer7 - 1;
@@ -104,17 +109,17 @@ public class RegionFile implements AutoCloseable {
             if (integer8 != 0) {
                 RegionFile.LOGGER.warn("Chunk has both internal and external streams");
             }
-            return this.createExternalChunkInputStream(bjh, getExternalChunkVersion(byte9));
+            return this.createExternalChunkInputStream(bph, getExternalChunkVersion(byte9));
         }
         if (integer8 > byteBuffer7.remaining()) {
-            RegionFile.LOGGER.error("Chunk {} stream is truncated: expected {} but read {}", bjh, integer8, byteBuffer7.remaining());
+            RegionFile.LOGGER.error("Chunk {} stream is truncated: expected {} but read {}", bph, integer8, byteBuffer7.remaining());
             return null;
         }
         if (integer8 < 0) {
-            RegionFile.LOGGER.error("Declared size {} of chunk {} is negative", integer7, bjh);
+            RegionFile.LOGGER.error("Declared size {} of chunk {} is negative", integer7, bph);
             return null;
         }
-        return this.createChunkInputStream(bjh, byte9, createStream(byteBuffer7, integer8));
+        return this.createChunkInputStream(bph, byte9, createStream(byteBuffer7, integer8));
     }
     
     private static boolean isExternalStreamChunk(final byte byte1) {
@@ -126,23 +131,23 @@ public class RegionFile implements AutoCloseable {
     }
     
     @Nullable
-    private DataInputStream createChunkInputStream(final ChunkPos bjh, final byte byte2, final InputStream inputStream) throws IOException {
-        final RegionFileVersion cbe5 = RegionFileVersion.fromId(byte2);
-        if (cbe5 == null) {
-            RegionFile.LOGGER.error("Chunk {} has invalid chunk stream version {}", bjh, byte2);
+    private DataInputStream createChunkInputStream(final ChunkPos bph, final byte byte2, final InputStream inputStream) throws IOException {
+        final RegionFileVersion cic5 = RegionFileVersion.fromId(byte2);
+        if (cic5 == null) {
+            RegionFile.LOGGER.error("Chunk {} has invalid chunk stream version {}", bph, byte2);
             return null;
         }
-        return new DataInputStream(new BufferedInputStream(cbe5.wrap(inputStream)));
+        return new DataInputStream(new BufferedInputStream(cic5.wrap(inputStream)));
     }
     
     @Nullable
-    private DataInputStream createExternalChunkInputStream(final ChunkPos bjh, final byte byte2) throws IOException {
-        final Path path4 = this.getExternalChunkPath(bjh);
+    private DataInputStream createExternalChunkInputStream(final ChunkPos bph, final byte byte2) throws IOException {
+        final Path path4 = this.getExternalChunkPath(bph);
         if (!Files.isRegularFile(path4)) {
             RegionFile.LOGGER.error("External chunk path {} is not file", path4);
             return null;
         }
-        return this.createChunkInputStream(bjh, byte2, Files.newInputStream(path4));
+        return this.createChunkInputStream(bph, byte2, Files.newInputStream(path4));
     }
     
     private static ByteArrayInputStream createStream(final ByteBuffer byteBuffer, final int integer) {
@@ -165,8 +170,8 @@ public class RegionFile implements AutoCloseable {
         return (integer + 4096 - 1) / 4096;
     }
     
-    public boolean doesChunkExist(final ChunkPos bjh) {
-        final int integer3 = this.getOffset(bjh);
+    public boolean doesChunkExist(final ChunkPos bph) {
+        final int integer3 = this.getOffset(bph);
         if (integer3 == 0) {
             return false;
         }
@@ -185,7 +190,7 @@ public class RegionFile implements AutoCloseable {
                 if (!RegionFileVersion.isValidVersion(getExternalChunkVersion(byte8))) {
                     return false;
                 }
-                if (!Files.isRegularFile(this.getExternalChunkPath(bjh))) {
+                if (!Files.isRegularFile(this.getExternalChunkPath(bph))) {
                     return false;
                 }
             }
@@ -208,12 +213,16 @@ public class RegionFile implements AutoCloseable {
         return true;
     }
     
-    public DataOutputStream getChunkDataOutputStream(final ChunkPos bjh) throws IOException {
-        return new DataOutputStream(new BufferedOutputStream(this.version.wrap(new ChunkBuffer(bjh))));
+    public DataOutputStream getChunkDataOutputStream(final ChunkPos bph) throws IOException {
+        return new DataOutputStream(new BufferedOutputStream(this.version.wrap(new ChunkBuffer(bph))));
     }
     
-    protected synchronized void write(final ChunkPos bjh, final ByteBuffer byteBuffer) throws IOException {
-        final int integer4 = getOffsetIndex(bjh);
+    public void flush() throws IOException {
+        this.file.force(true);
+    }
+    
+    protected synchronized void write(final ChunkPos bph, final ByteBuffer byteBuffer) throws IOException {
+        final int integer4 = getOffsetIndex(bph);
         final int integer5 = this.offsets.get(integer4);
         final int integer6 = getSectorNumber(integer5);
         final int integer7 = getNumSectors(integer5);
@@ -222,8 +231,8 @@ public class RegionFile implements AutoCloseable {
         int integer10;
         CommitOp b11;
         if (integer9 >= 256) {
-            final Path path12 = this.getExternalChunkPath(bjh);
-            RegionFile.LOGGER.warn("Saving oversized chunk {} ({} bytes} to external file {}", bjh, integer8, path12);
+            final Path path12 = this.getExternalChunkPath(bph);
+            RegionFile.LOGGER.warn("Saving oversized chunk {} ({} bytes} to external file {}", bph, integer8, path12);
             integer9 = 1;
             integer10 = this.usedSectors.allocate(integer9);
             b11 = this.writeToExternalFile(path12, byteBuffer);
@@ -232,7 +241,7 @@ public class RegionFile implements AutoCloseable {
         }
         else {
             integer10 = this.usedSectors.allocate(integer9);
-            b11 = (() -> Files.deleteIfExists(this.getExternalChunkPath(bjh)));
+            b11 = (() -> Files.deleteIfExists(this.getExternalChunkPath(bph)));
             this.file.write(byteBuffer, integer10 * 4096);
         }
         final int integer11 = (int)(Util.getEpochMillis() / 1000L);
@@ -267,16 +276,16 @@ public class RegionFile implements AutoCloseable {
         this.file.write(this.header, 0L);
     }
     
-    private int getOffset(final ChunkPos bjh) {
-        return this.offsets.get(getOffsetIndex(bjh));
+    private int getOffset(final ChunkPos bph) {
+        return this.offsets.get(getOffsetIndex(bph));
     }
     
-    public boolean hasChunk(final ChunkPos bjh) {
-        return this.getOffset(bjh) != 0;
+    public boolean hasChunk(final ChunkPos bph) {
+        return this.getOffset(bph) != 0;
     }
     
-    private static int getOffsetIndex(final ChunkPos bjh) {
-        return bjh.getRegionLocalX() + bjh.getRegionLocalZ() * 32;
+    private static int getOffsetIndex(final ChunkPos bph) {
+        return bph.getRegionLocalX() + bph.getRegionLocalZ() * 32;
     }
     
     @Override
@@ -286,15 +295,10 @@ public class RegionFile implements AutoCloseable {
         }
         finally {
             try {
-                this.writeHeader();
+                this.file.force(true);
             }
             finally {
-                try {
-                    this.file.force(true);
-                }
-                finally {
-                    this.file.close();
-                }
+                this.file.close();
             }
         }
     }
@@ -317,14 +321,14 @@ public class RegionFile implements AutoCloseable {
     class ChunkBuffer extends ByteArrayOutputStream {
         private final ChunkPos pos;
         
-        public ChunkBuffer(final ChunkPos bjh) {
+        public ChunkBuffer(final ChunkPos bph) {
             super(8096);
             super.write(0);
             super.write(0);
             super.write(0);
             super.write(0);
             super.write(RegionFile.this.version.getId());
-            this.pos = bjh;
+            this.pos = bph;
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
index 913622e..d129445 100644
--- a/src/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+++ b/src/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.chunk.storage;
 
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
+import net.minecraft.util.ExceptionCollector;
 import java.io.DataOutputStream;
 import java.io.DataOutput;
 import javax.annotation.Nullable;
@@ -15,17 +16,19 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
 public final class RegionFileStorage implements AutoCloseable {
     private final Long2ObjectLinkedOpenHashMap<RegionFile> regionCache;
     private final File folder;
+    private final boolean sync;
     
-    RegionFileStorage(final File file) {
+    RegionFileStorage(final File file, final boolean boolean2) {
         this.regionCache = (Long2ObjectLinkedOpenHashMap<RegionFile>)new Long2ObjectLinkedOpenHashMap();
         this.folder = file;
+        this.sync = boolean2;
     }
     
-    private RegionFile getRegionFile(final ChunkPos bjh) throws IOException {
-        final long long3 = ChunkPos.asLong(bjh.getRegionX(), bjh.getRegionZ());
-        final RegionFile cbc5 = (RegionFile)this.regionCache.getAndMoveToFirst(long3);
-        if (cbc5 != null) {
-            return cbc5;
+    private RegionFile getRegionFile(final ChunkPos bph) throws IOException {
+        final long long3 = ChunkPos.asLong(bph.getRegionX(), bph.getRegionZ());
+        final RegionFile cia5 = (RegionFile)this.regionCache.getAndMoveToFirst(long3);
+        if (cia5 != null) {
+            return cia5;
         }
         if (this.regionCache.size() >= 256) {
             ((RegionFile)this.regionCache.removeLast()).close();
@@ -33,16 +36,16 @@ public final class RegionFileStorage implements AutoCloseable {
         if (!this.folder.exists()) {
             this.folder.mkdirs();
         }
-        final File file6 = new File(this.folder, "r." + bjh.getRegionX() + "." + bjh.getRegionZ() + ".mca");
-        final RegionFile cbc6 = new RegionFile(file6, this.folder);
-        this.regionCache.putAndMoveToFirst(long3, cbc6);
-        return cbc6;
+        final File file6 = new File(this.folder, "r." + bph.getRegionX() + "." + bph.getRegionZ() + ".mca");
+        final RegionFile cia6 = new RegionFile(file6, this.folder, this.sync);
+        this.regionCache.putAndMoveToFirst(long3, cia6);
+        return cia6;
     }
     
     @Nullable
-    public CompoundTag read(final ChunkPos bjh) throws IOException {
-        final RegionFile cbc3 = this.getRegionFile(bjh);
-        try (final DataInputStream dataInputStream4 = cbc3.getChunkDataInputStream(bjh)) {
+    public CompoundTag read(final ChunkPos bph) throws IOException {
+        final RegionFile cia3 = this.getRegionFile(bph);
+        try (final DataInputStream dataInputStream4 = cia3.getChunkDataInputStream(bph)) {
             if (dataInputStream4 == null) {
                 return null;
             }
@@ -50,17 +53,30 @@ public final class RegionFileStorage implements AutoCloseable {
         }
     }
     
-    protected void write(final ChunkPos bjh, final CompoundTag jt) throws IOException {
-        final RegionFile cbc4 = this.getRegionFile(bjh);
-        try (final DataOutputStream dataOutputStream5 = cbc4.getChunkDataOutputStream(bjh)) {
-            NbtIo.write(jt, dataOutputStream5);
+    protected void write(final ChunkPos bph, final CompoundTag le) throws IOException {
+        final RegionFile cia4 = this.getRegionFile(bph);
+        try (final DataOutputStream dataOutputStream5 = cia4.getChunkDataOutputStream(bph)) {
+            NbtIo.write(le, dataOutputStream5);
         }
     }
     
     @Override
     public void close() throws IOException {
-        for (final RegionFile cbc3 : this.regionCache.values()) {
-            cbc3.close();
+        final ExceptionCollector<IOException> adq2 = new ExceptionCollector<IOException>();
+        for (final RegionFile cia4 : this.regionCache.values()) {
+            try {
+                cia4.close();
+            }
+            catch (IOException iOException5) {
+                adq2.add(iOException5);
+            }
+        }
+        adq2.throwIfPresent();
+    }
+    
+    public void flush() throws IOException {
+        for (final RegionFile cia3 : this.regionCache.values()) {
+            cia3.flush();
         }
     }
 }
diff --git a/src/net/minecraft/world/level/chunk/storage/RegionFileVersion.java b/src/net/minecraft/world/level/chunk/storage/RegionFileVersion.java
index 511b998..a475203 100644
--- a/src/net/minecraft/world/level/chunk/storage/RegionFileVersion.java
+++ b/src/net/minecraft/world/level/chunk/storage/RegionFileVersion.java
@@ -26,9 +26,9 @@ public class RegionFileVersion {
         this.outputWrapper = a3;
     }
     
-    private static RegionFileVersion register(final RegionFileVersion cbe) {
-        RegionFileVersion.VERSIONS.put(cbe.id, cbe);
-        return cbe;
+    private static RegionFileVersion register(final RegionFileVersion cic) {
+        RegionFileVersion.VERSIONS.put(cic.id, cic);
+        return cic;
     }
     
     @Nullable
diff --git a/src/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/net/minecraft/world/level/chunk/storage/SectionStorage.java
index 5fa4667..b30409d 100644
--- a/src/net/minecraft/world/level/chunk/storage/SectionStorage.java
+++ b/src/net/minecraft/world/level/chunk/storage/SectionStorage.java
@@ -1,13 +1,16 @@
 package net.minecraft.world.level.chunk.storage;
 
 import org.apache.logging.log4j.LogManager;
+import com.mojang.serialization.DataResult;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.SharedConstants;
 import java.util.Map;
+import java.util.function.Consumer;
 import com.google.common.collect.Maps;
+import com.mojang.serialization.Dynamic;
 import net.minecraft.nbt.Tag;
 import java.io.IOException;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.DynamicOps;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.world.level.Level;
@@ -20,39 +23,37 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import java.io.File;
 import net.minecraft.util.datafix.DataFixTypes;
 import com.mojang.datafixers.DataFixer;
+import com.mojang.serialization.Codec;
 import java.util.function.Function;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.BiFunction;
 import it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet;
 import java.util.Optional;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import org.apache.logging.log4j.Logger;
-import net.minecraft.util.Serializable;
 
-public class SectionStorage<R extends Serializable> implements AutoCloseable {
+public class SectionStorage<R> implements AutoCloseable {
     private static final Logger LOGGER;
     private final IOWorker worker;
     private final Long2ObjectMap<Optional<R>> storage;
     private final LongLinkedOpenHashSet dirty;
-    private final BiFunction<Runnable, Dynamic<?>, R> deserializer;
+    private final Function<Runnable, Codec<R>> codec;
     private final Function<Runnable, R> factory;
     private final DataFixer fixerUpper;
     private final DataFixTypes type;
     
-    public SectionStorage(final File file, final BiFunction<Runnable, Dynamic<?>, R> biFunction, final Function<Runnable, R> function, final DataFixer dataFixer, final DataFixTypes acd) {
+    public SectionStorage(final File file, final Function<Runnable, Codec<R>> function2, final Function<Runnable, R> function3, final DataFixer dataFixer, final DataFixTypes aeo, final boolean boolean6) {
         this.storage = (Long2ObjectMap<Optional<R>>)new Long2ObjectOpenHashMap();
         this.dirty = new LongLinkedOpenHashSet();
-        this.deserializer = biFunction;
-        this.factory = function;
+        this.codec = function2;
+        this.factory = function3;
         this.fixerUpper = dataFixer;
-        this.type = acd;
-        this.worker = new IOWorker(new RegionFileStorage(file), file.getName());
+        this.type = aeo;
+        this.worker = new IOWorker(file, boolean6, file.getName());
     }
     
     protected void tick(final BooleanSupplier booleanSupplier) {
         while (!this.dirty.isEmpty() && booleanSupplier.getAsBoolean()) {
-            final ChunkPos bjh3 = SectionPos.of(this.dirty.firstLong()).chunk();
-            this.writeColumn(bjh3);
+            final ChunkPos bph3 = SectionPos.of(this.dirty.firstLong()).chunk();
+            this.writeColumn(bph3);
         }
     }
     
@@ -62,15 +63,15 @@ public class SectionStorage<R extends Serializable> implements AutoCloseable {
     }
     
     protected Optional<R> getOrLoad(final long long1) {
-        final SectionPos gd4 = SectionPos.of(long1);
-        if (this.outsideStoredRange(gd4)) {
+        final SectionPos go4 = SectionPos.of(long1);
+        if (this.outsideStoredRange(go4)) {
             return Optional.<R>empty();
         }
         Optional<R> optional5 = this.get(long1);
         if (optional5 != null) {
             return optional5;
         }
-        this.readColumn(gd4.chunk());
+        this.readColumn(go4.chunk());
         optional5 = this.get(long1);
         if (optional5 == null) {
             throw Util.<IllegalStateException>pauseInIde(new IllegalStateException());
@@ -78,8 +79,8 @@ public class SectionStorage<R extends Serializable> implements AutoCloseable {
         return optional5;
     }
     
-    protected boolean outsideStoredRange(final SectionPos gd) {
-        return Level.isOutsideBuildHeight(SectionPos.sectionToBlockCoord(gd.y()));
+    protected boolean outsideStoredRange(final SectionPos go) {
+        return Level.isOutsideBuildHeight(SectionPos.sectionToBlockCoord(go.y()));
     }
     
     protected R getOrCreate(final long long1) {
@@ -87,27 +88,27 @@ public class SectionStorage<R extends Serializable> implements AutoCloseable {
         if (optional4.isPresent()) {
             return optional4.get();
         }
-        final R abu5 = this.factory.apply(() -> this.setDirty(long1));
-        this.storage.put(long1, Optional.<R>of(abu5));
-        return abu5;
+        final R object5 = this.factory.apply(() -> this.setDirty(long1));
+        this.storage.put(long1, Optional.<R>of(object5));
+        return object5;
     }
     
-    private void readColumn(final ChunkPos bjh) {
-        this.<CompoundTag>readColumn(bjh, (com.mojang.datafixers.types.DynamicOps<CompoundTag>)NbtOps.INSTANCE, this.tryRead(bjh));
+    private void readColumn(final ChunkPos bph) {
+        this.<CompoundTag>readColumn(bph, (com.mojang.serialization.DynamicOps<CompoundTag>)NbtOps.INSTANCE, this.tryRead(bph));
     }
     
     @Nullable
-    private CompoundTag tryRead(final ChunkPos bjh) {
+    private CompoundTag tryRead(final ChunkPos bph) {
         try {
-            return this.worker.load(bjh);
+            return this.worker.load(bph);
         }
         catch (IOException iOException3) {
-            SectionStorage.LOGGER.error("Error reading chunk {} data from disk", bjh, iOException3);
+            SectionStorage.LOGGER.error("Error reading chunk {} data from disk", bph, iOException3);
             return null;
         }
     }
     
-    private <T> void readColumn(final ChunkPos bjh, final DynamicOps<T> dynamicOps, @Nullable final T object) {
+    private <T> void readColumn(final ChunkPos bph, final DynamicOps<T> dynamicOps, @Nullable final T object) {
         // 
         // This method could not be decompiled.
         // 
@@ -121,7 +122,7 @@ public class SectionStorage<R extends Serializable> implements AutoCloseable {
         //    11: if_icmpge       42
         //    14: aload_0         /* this */
         //    15: getfield        net/minecraft/world/level/chunk/storage/SectionStorage.storage:Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
-        //    18: aload_1         /* bjh */
+        //    18: aload_1         /* bph */
         //    19: iload           integer5
         //    21: invokestatic    net/minecraft/core/SectionPos.of:(Lnet/minecraft/world/level/ChunkPos;I)Lnet/minecraft/core/SectionPos;
         //    24: invokevirtual   net/minecraft/core/SectionPos.asLong:()J
@@ -131,14 +132,14 @@ public class SectionStorage<R extends Serializable> implements AutoCloseable {
         //    36: iinc            integer5, 1
         //    39: goto            7
         //    42: goto            203
-        //    45: new             Lcom/mojang/datafixers/Dynamic;
+        //    45: new             Lcom/mojang/serialization/Dynamic;
         //    48: dup            
         //    49: aload_2         /* dynamicOps */
         //    50: aload_3         /* object */
-        //    51: invokespecial   com/mojang/datafixers/Dynamic.<init>:(Lcom/mojang/datafixers/types/DynamicOps;Ljava/lang/Object;)V
+        //    51: invokespecial   com/mojang/serialization/Dynamic.<init>:(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)V
         //    54: astore          dynamic5
         //    56: aload           dynamic5
-        //    58: invokestatic    net/minecraft/world/level/chunk/storage/SectionStorage.getVersion:(Lcom/mojang/datafixers/Dynamic;)I
+        //    58: invokestatic    net/minecraft/world/level/chunk/storage/SectionStorage.getVersion:(Lcom/mojang/serialization/Dynamic;)I
         //    61: istore          integer6
         //    63: invokestatic    net/minecraft/SharedConstants.getCurrentVersion:()Lcom/mojang/bridge/game/GameVersion;
         //    66: invokeinterface com/mojang/bridge/game/GameVersion.getWorldVersion:()I
@@ -158,18 +159,18 @@ public class SectionStorage<R extends Serializable> implements AutoCloseable {
         //    98: aload           dynamic5
         //   100: iload           integer6
         //   102: iload           integer7
-        //   104: invokeinterface com/mojang/datafixers/DataFixer.update:(Lcom/mojang/datafixers/DSL$TypeReference;Lcom/mojang/datafixers/Dynamic;II)Lcom/mojang/datafixers/Dynamic;
+        //   104: invokeinterface com/mojang/datafixers/DataFixer.update:(Lcom/mojang/datafixers/DSL$TypeReference;Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic;
         //   109: astore          dynamic9
         //   111: aload           dynamic9
         //   113: ldc_w           "Sections"
-        //   116: invokevirtual   com/mojang/datafixers/Dynamic.get:(Ljava/lang/String;)Lcom/mojang/datafixers/OptionalDynamic;
+        //   116: invokevirtual   com/mojang/serialization/Dynamic.get:(Ljava/lang/String;)Lcom/mojang/serialization/OptionalDynamic;
         //   119: astore          optionalDynamic10
         //   121: iconst_0       
         //   122: istore          integer11
         //   124: iload           integer11
         //   126: bipush          16
         //   128: if_icmpge       203
-        //   131: aload_1         /* bjh */
+        //   131: aload_1         /* bph */
         //   132: iload           integer11
         //   134: invokestatic    net/minecraft/core/SectionPos.of:(Lnet/minecraft/world/level/ChunkPos;I)Lnet/minecraft/core/SectionPos;
         //   137: invokevirtual   net/minecraft/core/SectionPos.asLong:()J
@@ -177,12 +178,12 @@ public class SectionStorage<R extends Serializable> implements AutoCloseable {
         //   142: aload           optionalDynamic10
         //   144: iload           integer11
         //   146: invokestatic    java/lang/Integer.toString:(I)Ljava/lang/String;
-        //   149: invokevirtual   com/mojang/datafixers/OptionalDynamic.get:(Ljava/lang/String;)Lcom/mojang/datafixers/OptionalDynamic;
-        //   152: invokevirtual   com/mojang/datafixers/OptionalDynamic.get:()Ljava/util/Optional;
+        //   149: invokevirtual   com/mojang/serialization/OptionalDynamic.get:(Ljava/lang/String;)Lcom/mojang/serialization/OptionalDynamic;
+        //   152: invokevirtual   com/mojang/serialization/OptionalDynamic.result:()Ljava/util/Optional;
         //   155: aload_0         /* this */
         //   156: lload           long12
         //   158: invokedynamic   BootstrapMethod #1, apply:(Lnet/minecraft/world/level/chunk/storage/SectionStorage;J)Ljava/util/function/Function;
-        //   163: invokevirtual   java/util/Optional.map:(Ljava/util/function/Function;)Ljava/util/Optional;
+        //   163: invokevirtual   java/util/Optional.flatMap:(Ljava/util/function/Function;)Ljava/util/Optional;
         //   166: astore          optional14
         //   168: aload_0         /* this */
         //   169: getfield        net/minecraft/world/level/chunk/storage/SectionStorage.storage:Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
@@ -200,14 +201,14 @@ public class SectionStorage<R extends Serializable> implements AutoCloseable {
         //   200: goto            124
         //   203: return         
         //    Signature:
-        //  <T:Ljava/lang/Object;>(Lnet/minecraft/world/level/ChunkPos;Lcom/mojang/datafixers/types/DynamicOps<TT;>;TT;)V
+        //  <T:Ljava/lang/Object;>(Lnet/minecraft/world/level/ChunkPos;Lcom/mojang/serialization/DynamicOps<TT;>;TT;)V
         //    MethodParameters:
         //  Name        Flags  
         //  ----------  -----
-        //  bjh         
+        //  bph         
         //  dynamicOps  
         //  object      
-        //    StackMapTable: 00 07 FF 00 07 00 05 07 00 02 07 00 F5 00 00 01 00 00 FF 00 22 00 00 00 00 FF 00 02 00 04 07 00 02 07 00 F5 07 01 0C 07 00 05 00 00 FF 00 26 00 07 07 00 02 07 00 F5 00 00 07 01 0E 01 01 00 00 40 01 FF 00 26 00 0B 07 00 02 07 00 F5 00 00 00 00 00 01 00 07 01 33 01 00 00 FF 00 4E 00 00 00 00
+        //    StackMapTable: 00 07 FF 00 07 00 05 07 00 02 07 00 EE 00 00 01 00 00 FF 00 22 00 00 00 00 FF 00 02 00 04 07 00 02 07 00 EE 07 01 05 07 00 05 00 00 FF 00 26 00 07 07 00 02 07 00 EE 00 00 07 01 07 01 01 00 00 40 01 FF 00 26 00 0B 07 00 02 07 00 EE 00 00 00 00 00 01 00 07 01 2C 01 00 00 FF 00 4E 00 00 00 00
         // 
         // The error that occurred was:
         // 
@@ -251,26 +252,28 @@ public class SectionStorage<R extends Serializable> implements AutoCloseable {
         throw new IllegalStateException("An error occurred while decompiling this method.");
     }
     
-    private void writeColumn(final ChunkPos bjh) {
-        final Dynamic<Tag> dynamic3 = this.<Tag>writeColumn(bjh, (com.mojang.datafixers.types.DynamicOps<Tag>)NbtOps.INSTANCE);
-        final Tag kj4 = (Tag)dynamic3.getValue();
-        if (kj4 instanceof CompoundTag) {
-            this.worker.store(bjh, (CompoundTag)kj4);
+    private void writeColumn(final ChunkPos bph) {
+        final Dynamic<Tag> dynamic3 = this.<Tag>writeColumn(bph, (com.mojang.serialization.DynamicOps<Tag>)NbtOps.INSTANCE);
+        final Tag lu4 = (Tag)dynamic3.getValue();
+        if (lu4 instanceof CompoundTag) {
+            this.worker.store(bph, (CompoundTag)lu4);
         }
         else {
-            SectionStorage.LOGGER.error("Expected compound tag, got {}", kj4);
+            SectionStorage.LOGGER.error("Expected compound tag, got {}", lu4);
         }
     }
     
-    private <T> Dynamic<T> writeColumn(final ChunkPos bjh, final DynamicOps<T> dynamicOps) {
+    private <T> Dynamic<T> writeColumn(final ChunkPos bph, final DynamicOps<T> dynamicOps) {
         final Map<T, T> map4 = Maps.newHashMap();
         for (int integer5 = 0; integer5 < 16; ++integer5) {
-            final long long6 = SectionPos.of(bjh, integer5).asLong();
+            final long long6 = SectionPos.of(bph, integer5).asLong();
             this.dirty.remove(long6);
             final Optional<R> optional8 = (Optional<R>)this.storage.get(long6);
             if (optional8 != null) {
                 if (optional8.isPresent()) {
-                    map4.put((T)dynamicOps.createString(Integer.toString(integer5)), optional8.get().<T>serialize(dynamicOps));
+                    final DataResult<T> dataResult9 = (DataResult<T>)this.codec.apply(() -> this.setDirty(long6)).encodeStart((DynamicOps)dynamicOps, optional8.get());
+                    final String string10 = Integer.toString(integer5);
+                    dataResult9.resultOrPartial((Consumer)SectionStorage.LOGGER::error).ifPresent(object -> map4.put((T)dynamicOps.createString(string10), object));
                 }
             }
         }
@@ -290,15 +293,15 @@ public class SectionStorage<R extends Serializable> implements AutoCloseable {
     }
     
     private static int getVersion(final Dynamic<?> dynamic) {
-        return dynamic.get("DataVersion").asNumber().orElse(1945).intValue();
+        return dynamic.get("DataVersion").asInt(1945);
     }
     
-    public void flush(final ChunkPos bjh) {
+    public void flush(final ChunkPos bph) {
         if (!this.dirty.isEmpty()) {
             for (int integer3 = 0; integer3 < 16; ++integer3) {
-                final long long4 = SectionPos.of(bjh, integer3).asLong();
+                final long long4 = SectionPos.of(bph, integer3).asLong();
                 if (this.dirty.contains(long4)) {
-                    this.writeColumn(bjh);
+                    this.writeColumn(bph);
                     return;
                 }
             }
diff --git a/src/net/minecraft/world/level/dimension/Dimension.java b/src/net/minecraft/world/level/dimension/Dimension.java
deleted file mode 100644
index 80b4eee..0000000
--- a/src/net/minecraft/world/level/dimension/Dimension.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package net.minecraft.world.level.dimension;
-
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.border.WorldBorder;
-import net.minecraft.world.level.LevelType;
-import net.minecraft.core.BlockPos;
-import javax.annotation.Nullable;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
-
-public abstract class Dimension {
-    public static final float[] MOON_BRIGHTNESS_PER_PHASE;
-    protected final Level level;
-    private final DimensionType type;
-    protected boolean ultraWarm;
-    protected boolean hasCeiling;
-    protected final float[] brightnessRamp;
-    private final float[] sunriseCol;
-    
-    public Dimension(final Level bjw, final DimensionType cbi, final float float3) {
-        this.brightnessRamp = new float[16];
-        this.sunriseCol = new float[4];
-        this.level = bjw;
-        this.type = cbi;
-        for (int integer5 = 0; integer5 <= 15; ++integer5) {
-            final float float4 = integer5 / 15.0f;
-            final float float5 = float4 / (4.0f - 3.0f * float4);
-            this.brightnessRamp[integer5] = Mth.lerp(float3, float5, 1.0f);
-        }
-    }
-    
-    public int getMoonPhase(final long long1) {
-        return (int)(long1 / 24000L % 8L + 8L) % 8;
-    }
-    
-    @Nullable
-    public float[] getSunriseColor(final float float1, final float float2) {
-        final float float3 = 0.4f;
-        final float float4 = Mth.cos(float1 * 6.2831855f) - 0.0f;
-        final float float5 = -0.0f;
-        if (float4 >= -0.4f && float4 <= 0.4f) {
-            final float float6 = (float4 + 0.0f) / 0.4f * 0.5f + 0.5f;
-            float float7 = 1.0f - (1.0f - Mth.sin(float6 * 3.1415927f)) * 0.99f;
-            float7 *= float7;
-            this.sunriseCol[0] = float6 * 0.3f + 0.7f;
-            this.sunriseCol[1] = float6 * float6 * 0.7f + 0.2f;
-            this.sunriseCol[2] = float6 * float6 * 0.0f + 0.2f;
-            this.sunriseCol[3] = float7;
-            return this.sunriseCol;
-        }
-        return null;
-    }
-    
-    public float getCloudHeight() {
-        return 128.0f;
-    }
-    
-    public boolean hasGround() {
-        return true;
-    }
-    
-    @Nullable
-    public BlockPos getDimensionSpecificSpawn() {
-        return null;
-    }
-    
-    public double getClearColorScale() {
-        if (this.level.getLevelData().getGeneratorType() == LevelType.FLAT) {
-            return 1.0;
-        }
-        return 0.03125;
-    }
-    
-    public boolean isUltraWarm() {
-        return this.ultraWarm;
-    }
-    
-    public boolean isHasSkyLight() {
-        return this.type.hasSkyLight();
-    }
-    
-    public boolean isHasCeiling() {
-        return this.hasCeiling;
-    }
-    
-    public float getBrightness(final int integer) {
-        return this.brightnessRamp[integer];
-    }
-    
-    public WorldBorder createWorldBorder() {
-        return new WorldBorder();
-    }
-    
-    public void saveData() {
-    }
-    
-    public void tick() {
-    }
-    
-    public abstract ChunkGenerator<?> createRandomLevelGenerator();
-    
-    @Nullable
-    public abstract BlockPos getSpawnPosInChunk(final ChunkPos bjh, final boolean boolean2);
-    
-    @Nullable
-    public abstract BlockPos getValidSpawnPosition(final int integer1, final int integer2, final boolean boolean3);
-    
-    public abstract float getTimeOfDay(final long long1, final float float2);
-    
-    public abstract boolean isNaturalDimension();
-    
-    public abstract Vec3 getFogColor(final float float1, final float float2);
-    
-    public abstract boolean mayRespawn();
-    
-    public abstract boolean isFoggyAt(final int integer1, final int integer2);
-    
-    public abstract DimensionType getType();
-    
-    static {
-        MOON_BRIGHTNESS_PER_PHASE = new float[] { 1.0f, 0.75f, 0.5f, 0.25f, 0.0f, 0.25f, 0.5f, 0.75f };
-    }
-}
diff --git a/src/net/minecraft/world/level/dimension/DimensionType.java b/src/net/minecraft/world/level/dimension/DimensionType.java
index ca3f6eb..55b7c01 100644
--- a/src/net/minecraft/world/level/dimension/DimensionType.java
+++ b/src/net/minecraft/world/level/dimension/DimensionType.java
@@ -1,106 +1,256 @@
 package net.minecraft.world.level.dimension;
 
-import net.minecraft.world.level.dimension.end.TheEndDimension;
-import net.minecraft.world.level.biome.FuzzyOffsetBiomeZoomer;
+import net.minecraft.resources.RegistryFileCodec;
 import net.minecraft.world.level.biome.FuzzyOffsetConstantColumnBiomeZoomer;
-import com.mojang.datafixers.types.DynamicOps;
-import javax.annotation.Nullable;
+import com.mojang.datafixers.kinds.Applicative;
+import net.minecraft.util.Codecs;
+import java.util.function.Function;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import java.io.File;
-import net.minecraft.resources.ResourceLocation;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Lifecycle;
 import net.minecraft.core.Registry;
-import net.minecraft.world.level.biome.BiomeZoomer;
+import net.minecraft.core.MappedRegistry;
+import net.minecraft.world.level.biome.MultiNoiseBiomeSource;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
+import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
+import net.minecraft.world.level.biome.TheEndBiomeSource;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.core.RegistryAccess;
+import java.util.Optional;
 import net.minecraft.world.level.Level;
-import java.util.function.BiFunction;
-import net.minecraft.util.Serializable;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.biome.FuzzyOffsetBiomeZoomer;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.biome.BiomeZoomer;
+import java.util.OptionalLong;
+import java.util.function.Supplier;
+import com.mojang.serialization.Codec;
+import net.minecraft.resources.ResourceKey;
+import com.mojang.serialization.MapCodec;
 
-public class DimensionType implements Serializable {
-    public static final DimensionType OVERWORLD;
-    public static final DimensionType NETHER;
-    public static final DimensionType THE_END;
-    private final int id;
-    private final String fileSuffix;
-    private final String folder;
-    private final BiFunction<Level, DimensionType, ? extends Dimension> factory;
+public class DimensionType {
+    public static final MapCodec<DimensionType> DIRECT_CODEC;
+    public static final float[] MOON_BRIGHTNESS_PER_PHASE;
+    public static final ResourceKey<DimensionType> OVERWORLD_LOCATION;
+    public static final ResourceKey<DimensionType> NETHER_LOCATION;
+    public static final ResourceKey<DimensionType> END_LOCATION;
+    protected static final DimensionType DEFAULT_OVERWORLD;
+    protected static final DimensionType DEFAULT_NETHER;
+    protected static final DimensionType DEFAULT_END;
+    public static final ResourceKey<DimensionType> OVERWORLD_CAVES_LOCATION;
+    protected static final DimensionType DEFAULT_OVERWORLD_CAVES;
+    public static final Codec<Supplier<DimensionType>> CODEC;
+    private final OptionalLong fixedTime;
     private final boolean hasSkylight;
+    private final boolean hasCeiling;
+    private final boolean ultraWarm;
+    private final boolean natural;
+    private final boolean shrunk;
+    private final boolean createDragonFight;
+    private final boolean piglinSafe;
+    private final boolean bedWorks;
+    private final boolean respawnAnchorWorks;
+    private final boolean hasRaids;
+    private final int logicalHeight;
     private final BiomeZoomer biomeZoomer;
+    private final ResourceLocation infiniburn;
+    private final float ambientLight;
+    private final transient float[] brightnessRamp;
     
-    private static DimensionType register(final String string, final DimensionType cbi) {
-        return Registry.<DimensionType>registerMapping(Registry.DIMENSION_TYPE, cbi.id, string, cbi);
+    public static DimensionType defaultOverworld() {
+        return DimensionType.DEFAULT_OVERWORLD;
     }
     
-    protected DimensionType(final int integer, final String string2, final String string3, final BiFunction<Level, DimensionType, ? extends Dimension> biFunction, final boolean boolean5, final BiomeZoomer bkz) {
-        this.id = integer;
-        this.fileSuffix = string2;
-        this.folder = string3;
-        this.factory = biFunction;
-        this.hasSkylight = boolean5;
-        this.biomeZoomer = bkz;
+    public static DimensionType defaultOverworldCaves() {
+        return DimensionType.DEFAULT_OVERWORLD_CAVES;
     }
     
-    public static DimensionType of(final Dynamic<?> dynamic) {
-        return Registry.DIMENSION_TYPE.get(new ResourceLocation(dynamic.asString("")));
+    protected DimensionType(final OptionalLong optionalLong, final boolean boolean2, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6, final boolean boolean7, final boolean boolean8, final boolean boolean9, final boolean boolean10, final int integer, final ResourceLocation uh, final float float13) {
+        this(optionalLong, boolean2, boolean3, boolean4, boolean5, boolean6, false, boolean7, boolean8, boolean9, boolean10, integer, FuzzyOffsetBiomeZoomer.INSTANCE, uh, float13);
     }
     
-    public static Iterable<DimensionType> getAllTypes() {
-        return Registry.DIMENSION_TYPE;
+    protected DimensionType(final OptionalLong optionalLong, final boolean boolean2, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6, final boolean boolean7, final boolean boolean8, final boolean boolean9, final boolean boolean10, final boolean boolean11, final int integer, final BiomeZoomer brj, final ResourceLocation uh, final float float15) {
+        this.fixedTime = optionalLong;
+        this.hasSkylight = boolean2;
+        this.hasCeiling = boolean3;
+        this.ultraWarm = boolean4;
+        this.natural = boolean5;
+        this.shrunk = boolean6;
+        this.createDragonFight = boolean7;
+        this.piglinSafe = boolean8;
+        this.bedWorks = boolean9;
+        this.respawnAnchorWorks = boolean10;
+        this.hasRaids = boolean11;
+        this.logicalHeight = integer;
+        this.biomeZoomer = brj;
+        this.infiniburn = uh;
+        this.ambientLight = float15;
+        this.brightnessRamp = fillBrightnessRamp(float15);
     }
     
-    public int getId() {
-        return this.id - 1;
+    private static float[] fillBrightnessRamp(final float float1) {
+        final float[] arr2 = new float[16];
+        for (int integer3 = 0; integer3 <= 15; ++integer3) {
+            final float float2 = integer3 / 15.0f;
+            final float float3 = float2 / (4.0f - 3.0f * float2);
+            arr2[integer3] = Mth.lerp(float1, float3, 1.0f);
+        }
+        return arr2;
     }
     
+    @Deprecated
+    public static DataResult<ResourceKey<Level>> parseLegacy(final Dynamic<?> dynamic) {
+        final Optional<Number> optional2 = (Optional<Number>)dynamic.asNumber().result();
+        if (optional2.isPresent()) {
+            final int integer3 = optional2.get().intValue();
+            if (integer3 == -1) {
+                return (DataResult<ResourceKey<Level>>)DataResult.success(Level.NETHER);
+            }
+            if (integer3 == 0) {
+                return (DataResult<ResourceKey<Level>>)DataResult.success(Level.OVERWORLD);
+            }
+            if (integer3 == 1) {
+                return (DataResult<ResourceKey<Level>>)DataResult.success(Level.END);
+            }
+        }
+        return (DataResult<ResourceKey<Level>>)Level.RESOURCE_KEY_CODEC.parse((Dynamic)dynamic);
+    }
+    
+    public static RegistryAccess.RegistryHolder registerBuiltin(final RegistryAccess.RegistryHolder a) {
+        a.registerDimension(DimensionType.OVERWORLD_LOCATION, DimensionType.DEFAULT_OVERWORLD);
+        a.registerDimension(DimensionType.OVERWORLD_CAVES_LOCATION, DimensionType.DEFAULT_OVERWORLD_CAVES);
+        a.registerDimension(DimensionType.NETHER_LOCATION, DimensionType.DEFAULT_NETHER);
+        a.registerDimension(DimensionType.END_LOCATION, DimensionType.DEFAULT_END);
+        return a;
+    }
+    
+    private static ChunkGenerator defaultEndGenerator(final long long1) {
+        return new NoiseBasedChunkGenerator(new TheEndBiomeSource(long1), long1, NoiseGeneratorSettings.Preset.END.settings());
+    }
+    
+    private static ChunkGenerator defaultNetherGenerator(final long long1) {
+        return new NoiseBasedChunkGenerator(MultiNoiseBiomeSource.Preset.NETHER.biomeSource(long1), long1, NoiseGeneratorSettings.Preset.NETHER.settings());
+    }
+    
+    public static MappedRegistry<LevelStem> defaultDimensions(final long long1) {
+        final MappedRegistry<LevelStem> gh3 = new MappedRegistry<LevelStem>(Registry.LEVEL_STEM_REGISTRY, Lifecycle.experimental());
+        gh3.<LevelStem>register(LevelStem.NETHER, new LevelStem(() -> DimensionType.DEFAULT_NETHER, defaultNetherGenerator(long1)));
+        gh3.<LevelStem>register(LevelStem.END, new LevelStem(() -> DimensionType.DEFAULT_END, defaultEndGenerator(long1)));
+        gh3.setPersistent(LevelStem.NETHER);
+        gh3.setPersistent(LevelStem.END);
+        return gh3;
+    }
+    
+    @Deprecated
     public String getFileSuffix() {
-        return this.fileSuffix;
+        if (this == DimensionType.DEFAULT_END) {
+            return "_end";
+        }
+        return "";
     }
     
-    public File getStorageFolder(final File file) {
-        if (this.folder.isEmpty()) {
+    public static File getStorageFolder(final ResourceKey<Level> ug, final File file) {
+        if (ug == Level.OVERWORLD) {
             return file;
         }
-        return new File(file, this.folder);
-    }
-    
-    public Dimension create(final Level bjw) {
-        return (Dimension)this.factory.apply(bjw, this);
-    }
-    
-    @Override
-    public String toString() {
-        return getName(this).toString();
-    }
-    
-    @Nullable
-    public static DimensionType getById(final int integer) {
-        return Registry.DIMENSION_TYPE.byId(integer + 1);
-    }
-    
-    @Nullable
-    public static DimensionType getByName(final ResourceLocation sm) {
-        return Registry.DIMENSION_TYPE.get(sm);
-    }
-    
-    @Nullable
-    public static ResourceLocation getName(final DimensionType cbi) {
-        return Registry.DIMENSION_TYPE.getKey(cbi);
+        if (ug == Level.END) {
+            return new File(file, "DIM1");
+        }
+        if (ug == Level.NETHER) {
+            return new File(file, "DIM-1");
+        }
+        return new File(file, "dimensions/" + ug.location().getNamespace() + "/" + ug.location().getPath());
     }
     
     public boolean hasSkyLight() {
         return this.hasSkylight;
     }
     
+    public boolean hasCeiling() {
+        return this.hasCeiling;
+    }
+    
+    public boolean ultraWarm() {
+        return this.ultraWarm;
+    }
+    
+    public boolean natural() {
+        return this.natural;
+    }
+    
+    public boolean shrunk() {
+        return this.shrunk;
+    }
+    
+    public boolean piglinSafe() {
+        return this.piglinSafe;
+    }
+    
+    public boolean bedWorks() {
+        return this.bedWorks;
+    }
+    
+    public boolean respawnAnchorWorks() {
+        return this.respawnAnchorWorks;
+    }
+    
+    public boolean hasRaids() {
+        return this.hasRaids;
+    }
+    
+    public int logicalHeight() {
+        return this.logicalHeight;
+    }
+    
+    public boolean createDragonFight() {
+        return this.createDragonFight;
+    }
+    
     public BiomeZoomer getBiomeZoomer() {
         return this.biomeZoomer;
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)dynamicOps.createString(Registry.DIMENSION_TYPE.getKey(this).toString());
+    public boolean hasFixedTime() {
+        return this.fixedTime.isPresent();
+    }
+    
+    public float timeOfDay(final long long1) {
+        final double double4 = Mth.frac(this.fixedTime.orElse(long1) / 24000.0 - 0.25);
+        final double double5 = 0.5 - Math.cos(double4 * 3.141592653589793) / 2.0;
+        return (float)(double4 * 2.0 + double5) / 3.0f;
+    }
+    
+    public int moonPhase(final long long1) {
+        return (int)(long1 / 24000L % 8L + 8L) % 8;
+    }
+    
+    public float brightness(final int integer) {
+        return this.brightnessRamp[integer];
+    }
+    
+    public Tag<Block> infiniburn() {
+        final Tag<Block> adf2 = BlockTags.getAllTags().getTag(this.infiniburn);
+        return (adf2 != null) ? adf2 : BlockTags.INFINIBURN_OVERWORLD;
     }
     
     static {
-        OVERWORLD = register("overworld", new DimensionType(1, "", "", NormalDimension::new, true, FuzzyOffsetConstantColumnBiomeZoomer.INSTANCE));
-        NETHER = register("the_nether", new DimensionType(0, "_nether", "DIM-1", NetherDimension::new, false, FuzzyOffsetBiomeZoomer.INSTANCE));
-        THE_END = register("the_end", new DimensionType(2, "_end", "DIM1", TheEndDimension::new, false, FuzzyOffsetBiomeZoomer.INSTANCE));
+        DIRECT_CODEC = RecordCodecBuilder.mapCodec(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.LONG.optionalFieldOf("fixed_time").xmap(optional -> optional.map(OptionalLong::of).orElseGet(OptionalLong::empty), optionalLong -> optionalLong.isPresent() ? Optional.<Long>of(optionalLong.getAsLong()) : Optional.<Long>empty()).forGetter(cif -> cif.fixedTime), (App)Codec.BOOL.fieldOf("has_skylight").forGetter((Function)DimensionType::hasSkyLight), (App)Codec.BOOL.fieldOf("has_ceiling").forGetter((Function)DimensionType::hasCeiling), (App)Codec.BOOL.fieldOf("ultrawarm").forGetter((Function)DimensionType::ultraWarm), (App)Codec.BOOL.fieldOf("natural").forGetter((Function)DimensionType::natural), (App)Codec.BOOL.fieldOf("shrunk").forGetter((Function)DimensionType::shrunk), (App)Codec.BOOL.fieldOf("piglin_safe").forGetter((Function)DimensionType::piglinSafe), (App)Codec.BOOL.fieldOf("bed_works").forGetter((Function)DimensionType::bedWorks), (App)Codec.BOOL.fieldOf("respawn_anchor_works").forGetter((Function)DimensionType::respawnAnchorWorks), (App)Codec.BOOL.fieldOf("has_raids").forGetter((Function)DimensionType::hasRaids), (App)Codecs.intRange(0, 256).fieldOf("logical_height").forGetter((Function)DimensionType::logicalHeight), (App)ResourceLocation.CODEC.fieldOf("infiniburn").forGetter(cif -> cif.infiniburn), (App)Codec.FLOAT.fieldOf("ambient_light").forGetter(cif -> cif.ambientLight)).apply(instance, DimensionType::new));
+        MOON_BRIGHTNESS_PER_PHASE = new float[] { 1.0f, 0.75f, 0.5f, 0.25f, 0.0f, 0.25f, 0.5f, 0.75f };
+        OVERWORLD_LOCATION = ResourceKey.<DimensionType>create(Registry.DIMENSION_TYPE_REGISTRY, new ResourceLocation("overworld"));
+        NETHER_LOCATION = ResourceKey.<DimensionType>create(Registry.DIMENSION_TYPE_REGISTRY, new ResourceLocation("the_nether"));
+        END_LOCATION = ResourceKey.<DimensionType>create(Registry.DIMENSION_TYPE_REGISTRY, new ResourceLocation("the_end"));
+        DEFAULT_OVERWORLD = new DimensionType(OptionalLong.empty(), true, false, false, true, false, false, false, true, false, true, 256, FuzzyOffsetConstantColumnBiomeZoomer.INSTANCE, BlockTags.INFINIBURN_OVERWORLD.getName(), 0.0f);
+        DEFAULT_NETHER = new DimensionType(OptionalLong.of(18000L), false, true, true, false, true, false, true, false, true, false, 128, FuzzyOffsetBiomeZoomer.INSTANCE, BlockTags.INFINIBURN_NETHER.getName(), 0.1f);
+        DEFAULT_END = new DimensionType(OptionalLong.of(6000L), false, false, false, false, false, true, false, false, false, true, 256, FuzzyOffsetBiomeZoomer.INSTANCE, BlockTags.INFINIBURN_END.getName(), 0.0f);
+        OVERWORLD_CAVES_LOCATION = ResourceKey.<DimensionType>create(Registry.DIMENSION_TYPE_REGISTRY, new ResourceLocation("overworld_caves"));
+        DEFAULT_OVERWORLD_CAVES = new DimensionType(OptionalLong.empty(), true, true, false, true, false, false, false, true, false, true, 256, FuzzyOffsetConstantColumnBiomeZoomer.INSTANCE, BlockTags.INFINIBURN_OVERWORLD.getName(), 0.0f);
+        CODEC = (Codec)RegistryFileCodec.<DimensionType>create(Registry.DIMENSION_TYPE_REGISTRY, DimensionType.DIRECT_CODEC);
     }
 }
diff --git a/src/net/minecraft/world/level/dimension/LevelStem.java b/src/net/minecraft/world/level/dimension/LevelStem.java
new file mode 100644
index 0000000..c3d8cee
--- /dev/null
+++ b/src/net/minecraft/world/level/dimension/LevelStem.java
@@ -0,0 +1,131 @@
+package net.minecraft.world.level.dimension;
+
+import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.resources.ResourceLocation;
+import com.mojang.datafixers.kinds.Applicative;
+import java.util.function.Function;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.List;
+import net.minecraft.world.level.biome.TheEndBiomeSource;
+import net.minecraft.world.level.biome.MultiNoiseBiomeSource;
+import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
+import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.Map;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.core.Registry;
+import net.minecraft.core.MappedRegistry;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import java.util.function.Supplier;
+import java.util.LinkedHashSet;
+import net.minecraft.resources.ResourceKey;
+import com.mojang.serialization.MapCodec;
+
+public final class LevelStem {
+    public static final MapCodec<LevelStem> CODEC;
+    public static final ResourceKey<LevelStem> OVERWORLD;
+    public static final ResourceKey<LevelStem> NETHER;
+    public static final ResourceKey<LevelStem> END;
+    private static final LinkedHashSet<ResourceKey<LevelStem>> BUILTIN_ORDER;
+    private final Supplier<DimensionType> type;
+    private final ChunkGenerator generator;
+    
+    public LevelStem(final Supplier<DimensionType> supplier, final ChunkGenerator cha) {
+        this.type = supplier;
+        this.generator = cha;
+    }
+    
+    public Supplier<DimensionType> typeSupplier() {
+        return this.type;
+    }
+    
+    public DimensionType type() {
+        return this.type.get();
+    }
+    
+    public ChunkGenerator generator() {
+        return this.generator;
+    }
+    
+    public static MappedRegistry<LevelStem> sortMap(final MappedRegistry<LevelStem> gh) {
+        final MappedRegistry<LevelStem> gh2 = new MappedRegistry<LevelStem>(Registry.LEVEL_STEM_REGISTRY, Lifecycle.experimental());
+        for (final ResourceKey<LevelStem> ug4 : LevelStem.BUILTIN_ORDER) {
+            final LevelStem cig5 = gh.get(ug4);
+            if (cig5 != null) {
+                gh2.<LevelStem>register(ug4, cig5);
+                if (!gh.persistent(ug4)) {
+                    continue;
+                }
+                gh2.setPersistent(ug4);
+            }
+        }
+        for (final Map.Entry<ResourceKey<LevelStem>, LevelStem> entry4 : gh.entrySet()) {
+            final ResourceKey<LevelStem> ug5 = entry4.getKey();
+            if (LevelStem.BUILTIN_ORDER.contains(ug5)) {
+                continue;
+            }
+            gh2.<LevelStem>register(ug5, entry4.getValue());
+            if (!gh.persistent(ug5)) {
+                continue;
+            }
+            gh2.setPersistent(ug5);
+        }
+        return gh2;
+    }
+    
+    public static boolean stable(final long long1, final MappedRegistry<LevelStem> gh) {
+        final List<Map.Entry<ResourceKey<LevelStem>, LevelStem>> list4 = Lists.newArrayList(gh.entrySet());
+        if (list4.size() != LevelStem.BUILTIN_ORDER.size()) {
+            return false;
+        }
+        final Map.Entry<ResourceKey<LevelStem>, LevelStem> entry5 = list4.get(0);
+        final Map.Entry<ResourceKey<LevelStem>, LevelStem> entry6 = list4.get(1);
+        final Map.Entry<ResourceKey<LevelStem>, LevelStem> entry7 = list4.get(2);
+        if (entry5.getKey() != LevelStem.OVERWORLD || entry6.getKey() != LevelStem.NETHER || entry7.getKey() != LevelStem.END) {
+            return false;
+        }
+        if (entry5.getValue().type() != DimensionType.DEFAULT_OVERWORLD && entry5.getValue().type() != DimensionType.DEFAULT_OVERWORLD_CAVES) {
+            return false;
+        }
+        if (entry6.getValue().type() != DimensionType.DEFAULT_NETHER) {
+            return false;
+        }
+        if (entry7.getValue().type() != DimensionType.DEFAULT_END) {
+            return false;
+        }
+        if (!(entry6.getValue().generator() instanceof NoiseBasedChunkGenerator) || !(entry7.getValue().generator() instanceof NoiseBasedChunkGenerator)) {
+            return false;
+        }
+        final NoiseBasedChunkGenerator cip8 = (NoiseBasedChunkGenerator)entry6.getValue().generator();
+        final NoiseBasedChunkGenerator cip9 = (NoiseBasedChunkGenerator)entry7.getValue().generator();
+        if (!cip8.stable(long1, NoiseGeneratorSettings.Preset.NETHER)) {
+            return false;
+        }
+        if (!cip9.stable(long1, NoiseGeneratorSettings.Preset.END)) {
+            return false;
+        }
+        if (!(cip8.getBiomeSource() instanceof MultiNoiseBiomeSource)) {
+            return false;
+        }
+        final MultiNoiseBiomeSource btc10 = (MultiNoiseBiomeSource)cip8.getBiomeSource();
+        if (!btc10.stable(long1)) {
+            return false;
+        }
+        if (!(cip9.getBiomeSource() instanceof TheEndBiomeSource)) {
+            return false;
+        }
+        final TheEndBiomeSource buh11 = (TheEndBiomeSource)cip9.getBiomeSource();
+        return buh11.stable(long1);
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.mapCodec(instance -> ((RecordCodecBuilder.Instance)instance).group((App)DimensionType.CODEC.fieldOf("type").forGetter((Function)LevelStem::typeSupplier), (App)ChunkGenerator.CODEC.fieldOf("generator").forGetter((Function)LevelStem::generator)).apply(instance, ((RecordCodecBuilder.Instance)instance).stable(LevelStem::new)));
+        OVERWORLD = ResourceKey.<LevelStem>create(Registry.LEVEL_STEM_REGISTRY, new ResourceLocation("overworld"));
+        NETHER = ResourceKey.<LevelStem>create(Registry.LEVEL_STEM_REGISTRY, new ResourceLocation("the_nether"));
+        END = ResourceKey.<LevelStem>create(Registry.LEVEL_STEM_REGISTRY, new ResourceLocation("the_end"));
+        BUILTIN_ORDER = Sets.<ResourceKey<LevelStem>>newLinkedHashSet(ImmutableList.<ResourceKey<LevelStem>>of(LevelStem.OVERWORLD, LevelStem.NETHER, LevelStem.END));
+    }
+}
diff --git a/src/net/minecraft/world/level/dimension/NetherDimension.java b/src/net/minecraft/world/level/dimension/NetherDimension.java
deleted file mode 100644
index f23698e..0000000
--- a/src/net/minecraft/world/level/dimension/NetherDimension.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package net.minecraft.world.level.dimension;
-
-import net.minecraft.world.level.border.WorldBorder;
-import javax.annotation.Nullable;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.biome.Biomes;
-import net.minecraft.world.level.biome.FixedBiomeSourceSettings;
-import net.minecraft.world.level.biome.BiomeSourceType;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.chunk.ChunkGeneratorType;
-import net.minecraft.world.level.levelgen.NetherGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec3;
-
-public class NetherDimension extends Dimension {
-    private static final Vec3 NETHER_FOG_COLOR;
-    
-    public NetherDimension(final Level bjw, final DimensionType cbi) {
-        super(bjw, cbi, 0.1f);
-        this.ultraWarm = true;
-        this.hasCeiling = true;
-    }
-    
-    @Override
-    public Vec3 getFogColor(final float float1, final float float2) {
-        return NetherDimension.NETHER_FOG_COLOR;
-    }
-    
-    @Override
-    public ChunkGenerator<?> createRandomLevelGenerator() {
-        final NetherGeneratorSettings cbw2 = ChunkGeneratorType.CAVES.createSettings();
-        cbw2.setDefaultBlock(Blocks.NETHERRACK.defaultBlockState());
-        cbw2.setDefaultFluid(Blocks.LAVA.defaultBlockState());
-        return ChunkGeneratorType.CAVES.create(this.level, BiomeSourceType.FIXED.create(BiomeSourceType.FIXED.createSettings(this.level.getLevelData()).setBiome(Biomes.NETHER)), cbw2);
-    }
-    
-    @Override
-    public boolean isNaturalDimension() {
-        return false;
-    }
-    
-    @Nullable
-    @Override
-    public BlockPos getSpawnPosInChunk(final ChunkPos bjh, final boolean boolean2) {
-        return null;
-    }
-    
-    @Nullable
-    @Override
-    public BlockPos getValidSpawnPosition(final int integer1, final int integer2, final boolean boolean3) {
-        return null;
-    }
-    
-    @Override
-    public float getTimeOfDay(final long long1, final float float2) {
-        return 0.5f;
-    }
-    
-    @Override
-    public boolean mayRespawn() {
-        return false;
-    }
-    
-    @Override
-    public boolean isFoggyAt(final int integer1, final int integer2) {
-        return true;
-    }
-    
-    @Override
-    public WorldBorder createWorldBorder() {
-        return new WorldBorder() {
-            @Override
-            public double getCenterX() {
-                return super.getCenterX() / 8.0;
-            }
-            
-            @Override
-            public double getCenterZ() {
-                return super.getCenterZ() / 8.0;
-            }
-        };
-    }
-    
-    @Override
-    public DimensionType getType() {
-        return DimensionType.NETHER;
-    }
-    
-    static {
-        NETHER_FOG_COLOR = new Vec3(0.20000000298023224, 0.029999999329447746, 0.029999999329447746);
-    }
-}
diff --git a/src/net/minecraft/world/level/dimension/NormalDimension.java b/src/net/minecraft/world/level/dimension/NormalDimension.java
deleted file mode 100644
index d91d4ad..0000000
--- a/src/net/minecraft/world/level/dimension/NormalDimension.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package net.minecraft.world.level.dimension;
-
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.levelgen.Heightmap;
-import net.minecraft.tags.BlockTags;
-import javax.annotation.Nullable;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.block.state.BlockState;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import net.minecraft.world.level.biome.CheckerboardColumnBiomeSource;
-import net.minecraft.world.level.biome.OverworldBiomeSource;
-import net.minecraft.world.level.biome.FixedBiomeSource;
-import net.minecraft.world.level.levelgen.OverworldLevelSource;
-import net.minecraft.world.level.levelgen.TheEndLevelSource;
-import net.minecraft.world.level.levelgen.NetherLevelSource;
-import net.minecraft.world.level.levelgen.DebugLevelSource;
-import net.minecraft.world.level.levelgen.DebugGeneratorSettings;
-import net.minecraft.world.level.levelgen.FlatLevelSource;
-import net.minecraft.world.level.levelgen.OverworldGeneratorSettings;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.TheEndGeneratorSettings;
-import net.minecraft.world.level.levelgen.NetherGeneratorSettings;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.biome.OverworldBiomeSourceSettings;
-import net.minecraft.world.level.biome.CheckerboardBiomeSourceSettings;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.JsonOps;
-import com.google.gson.JsonElement;
-import net.minecraft.world.level.biome.Biomes;
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.biome.FixedBiomeSourceSettings;
-import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
-import com.mojang.datafixers.types.DynamicOps;
-import com.mojang.datafixers.Dynamic;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.world.level.LevelType;
-import net.minecraft.world.level.biome.BiomeSourceType;
-import net.minecraft.world.level.chunk.ChunkGeneratorType;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.Level;
-
-public class NormalDimension extends Dimension {
-    public NormalDimension(final Level bjw, final DimensionType cbi) {
-        super(bjw, cbi, 0.0f);
-    }
-    
-    @Override
-    public DimensionType getType() {
-        return DimensionType.OVERWORLD;
-    }
-    
-    @Override
-    public ChunkGenerator<? extends ChunkGeneratorSettings> createRandomLevelGenerator() {
-        final LevelType bkd2 = this.level.getLevelData().getGeneratorType();
-        final ChunkGeneratorType<FlatLevelGeneratorSettings, FlatLevelSource> cac3 = ChunkGeneratorType.FLAT;
-        final ChunkGeneratorType<DebugGeneratorSettings, DebugLevelSource> cac4 = ChunkGeneratorType.DEBUG;
-        final ChunkGeneratorType<NetherGeneratorSettings, NetherLevelSource> cac5 = ChunkGeneratorType.CAVES;
-        final ChunkGeneratorType<TheEndGeneratorSettings, TheEndLevelSource> cac6 = ChunkGeneratorType.FLOATING_ISLANDS;
-        final ChunkGeneratorType<OverworldGeneratorSettings, OverworldLevelSource> cac7 = ChunkGeneratorType.SURFACE;
-        final BiomeSourceType<FixedBiomeSourceSettings, FixedBiomeSource> bky8 = BiomeSourceType.FIXED;
-        final BiomeSourceType<OverworldBiomeSourceSettings, OverworldBiomeSource> bky9 = BiomeSourceType.VANILLA_LAYERED;
-        final BiomeSourceType<CheckerboardBiomeSourceSettings, CheckerboardColumnBiomeSource> bky10 = BiomeSourceType.CHECKERBOARD;
-        if (bkd2 == LevelType.FLAT) {
-            final FlatLevelGeneratorSettings ciy11 = FlatLevelGeneratorSettings.fromObject(new Dynamic((DynamicOps)NbtOps.INSTANCE, this.level.getLevelData().getGeneratorOptions()));
-            final FixedBiomeSourceSettings blv12 = bky8.createSettings(this.level.getLevelData()).setBiome(ciy11.getBiome());
-            return cac3.create(this.level, bky8.create(blv12), ciy11);
-        }
-        if (bkd2 == LevelType.DEBUG_ALL_BLOCK_STATES) {
-            final FixedBiomeSourceSettings blv13 = bky8.createSettings(this.level.getLevelData()).setBiome(Biomes.PLAINS);
-            return cac4.create(this.level, bky8.create(blv13), cac4.createSettings());
-        }
-        if (bkd2 == LevelType.BUFFET) {
-            BiomeSource bkw11 = null;
-            final JsonElement jsonElement12 = (JsonElement)Dynamic.convert((DynamicOps)NbtOps.INSTANCE, (DynamicOps)JsonOps.INSTANCE, this.level.getLevelData().getGeneratorOptions());
-            final JsonObject jsonObject13 = jsonElement12.getAsJsonObject();
-            final JsonObject jsonObject14 = jsonObject13.getAsJsonObject("biome_source");
-            if (jsonObject14 != null && jsonObject14.has("type") && jsonObject14.has("options")) {
-                final BiomeSourceType<?, ?> bky11 = Registry.BIOME_SOURCE_TYPE.get(new ResourceLocation(jsonObject14.getAsJsonPrimitive("type").getAsString()));
-                final JsonObject jsonObject15 = jsonObject14.getAsJsonObject("options");
-                Biome[] arr17 = { Biomes.OCEAN };
-                if (jsonObject15.has("biomes")) {
-                    final JsonArray jsonArray18 = jsonObject15.getAsJsonArray("biomes");
-                    arr17 = ((jsonArray18.size() > 0) ? new Biome[jsonArray18.size()] : new Biome[] { Biomes.OCEAN });
-                    for (int integer19 = 0; integer19 < jsonArray18.size(); ++integer19) {
-                        arr17[integer19] = Registry.BIOME.getOptional(new ResourceLocation(jsonArray18.get(integer19).getAsString())).orElse(Biomes.OCEAN);
-                    }
-                }
-                if (BiomeSourceType.FIXED == bky11) {
-                    final FixedBiomeSourceSettings blv14 = bky8.createSettings(this.level.getLevelData()).setBiome(arr17[0]);
-                    bkw11 = bky8.create(blv14);
-                }
-                if (BiomeSourceType.CHECKERBOARD == bky11) {
-                    final int integer20 = jsonObject15.has("size") ? jsonObject15.getAsJsonPrimitive("size").getAsInt() : 2;
-                    final CheckerboardBiomeSourceSettings bld19 = bky10.createSettings(this.level.getLevelData()).setAllowedBiomes(arr17).setSize(integer20);
-                    bkw11 = bky10.create(bld19);
-                }
-                if (BiomeSourceType.VANILLA_LAYERED == bky11) {
-                    final OverworldBiomeSourceSettings bmz18 = bky9.createSettings(this.level.getLevelData());
-                    bkw11 = bky9.create(bmz18);
-                }
-            }
-            if (bkw11 == null) {
-                bkw11 = bky8.create(bky8.createSettings(this.level.getLevelData()).setBiome(Biomes.OCEAN));
-            }
-            BlockState byj15 = Blocks.STONE.defaultBlockState();
-            BlockState byj16 = Blocks.WATER.defaultBlockState();
-            final JsonObject jsonObject16 = jsonObject13.getAsJsonObject("chunk_generator");
-            if (jsonObject16 != null && jsonObject16.has("options")) {
-                final JsonObject jsonObject17 = jsonObject16.getAsJsonObject("options");
-                if (jsonObject17.has("default_block")) {
-                    final String string19 = jsonObject17.getAsJsonPrimitive("default_block").getAsString();
-                    byj15 = Registry.BLOCK.get(new ResourceLocation(string19)).defaultBlockState();
-                }
-                if (jsonObject17.has("default_fluid")) {
-                    final String string19 = jsonObject17.getAsJsonPrimitive("default_fluid").getAsString();
-                    byj16 = Registry.BLOCK.get(new ResourceLocation(string19)).defaultBlockState();
-                }
-            }
-            if (jsonObject16 != null && jsonObject16.has("type")) {
-                final ChunkGeneratorType<?, ?> cac8 = Registry.CHUNK_GENERATOR_TYPE.get(new ResourceLocation(jsonObject16.getAsJsonPrimitive("type").getAsString()));
-                if (ChunkGeneratorType.CAVES == cac8) {
-                    final NetherGeneratorSettings cbw19 = cac5.createSettings();
-                    cbw19.setDefaultBlock(byj15);
-                    cbw19.setDefaultFluid(byj16);
-                    return cac5.create(this.level, bkw11, cbw19);
-                }
-                if (ChunkGeneratorType.FLOATING_ISLANDS == cac8) {
-                    final TheEndGeneratorSettings ccd19 = cac6.createSettings();
-                    ccd19.setSpawnPosition(new BlockPos(0, 64, 0));
-                    ccd19.setDefaultBlock(byj15);
-                    ccd19.setDefaultFluid(byj16);
-                    return cac6.create(this.level, bkw11, ccd19);
-                }
-            }
-            final OverworldGeneratorSettings cbz18 = cac7.createSettings();
-            cbz18.setDefaultBlock(byj15);
-            cbz18.setDefaultFluid(byj16);
-            return cac7.create(this.level, bkw11, cbz18);
-        }
-        final OverworldGeneratorSettings cbz19 = cac7.createSettings();
-        final OverworldBiomeSourceSettings bmz19 = bky9.createSettings(this.level.getLevelData()).setGeneratorSettings(cbz19);
-        return cac7.create(this.level, bky9.create(bmz19), cbz19);
-    }
-    
-    @Nullable
-    @Override
-    public BlockPos getSpawnPosInChunk(final ChunkPos bjh, final boolean boolean2) {
-        for (int integer4 = bjh.getMinBlockX(); integer4 <= bjh.getMaxBlockX(); ++integer4) {
-            for (int integer5 = bjh.getMinBlockZ(); integer5 <= bjh.getMaxBlockZ(); ++integer5) {
-                final BlockPos fk6 = this.getValidSpawnPosition(integer4, integer5, boolean2);
-                if (fk6 != null) {
-                    return fk6;
-                }
-            }
-        }
-        return null;
-    }
-    
-    @Nullable
-    @Override
-    public BlockPos getValidSpawnPosition(final int integer1, final int integer2, final boolean boolean3) {
-        final BlockPos.MutableBlockPos a5 = new BlockPos.MutableBlockPos(integer1, 0, integer2);
-        final Biome bkt6 = this.level.getBiome(a5);
-        final BlockState byj7 = bkt6.getSurfaceBuilderConfig().getTopMaterial();
-        if (boolean3 && !byj7.getBlock().is(BlockTags.VALID_SPAWN)) {
-            return null;
-        }
-        final LevelChunk cal8 = this.level.getChunk(integer1 >> 4, integer2 >> 4);
-        final int integer3 = cal8.getHeight(Heightmap.Types.MOTION_BLOCKING, integer1 & 0xF, integer2 & 0xF);
-        if (integer3 < 0) {
-            return null;
-        }
-        if (cal8.getHeight(Heightmap.Types.WORLD_SURFACE, integer1 & 0xF, integer2 & 0xF) > cal8.getHeight(Heightmap.Types.OCEAN_FLOOR, integer1 & 0xF, integer2 & 0xF)) {
-            return null;
-        }
-        for (int integer4 = integer3 + 1; integer4 >= 0; --integer4) {
-            a5.set(integer1, integer4, integer2);
-            final BlockState byj8 = this.level.getBlockState(a5);
-            if (!byj8.getFluidState().isEmpty()) {
-                break;
-            }
-            if (byj8.equals(byj7)) {
-                return a5.above().immutable();
-            }
-        }
-        return null;
-    }
-    
-    @Override
-    public float getTimeOfDay(final long long1, final float float2) {
-        final double double5 = Mth.frac(long1 / 24000.0 - 0.25);
-        final double double6 = 0.5 - Math.cos(double5 * 3.141592653589793) / 2.0;
-        return (float)(double5 * 2.0 + double6) / 3.0f;
-    }
-    
-    @Override
-    public boolean isNaturalDimension() {
-        return true;
-    }
-    
-    @Override
-    public Vec3 getFogColor(final float float1, final float float2) {
-        float float3 = Mth.cos(float1 * 6.2831855f) * 2.0f + 0.5f;
-        float3 = Mth.clamp(float3, 0.0f, 1.0f);
-        float float4 = 0.7529412f;
-        float float5 = 0.84705883f;
-        float float6 = 1.0f;
-        float4 *= float3 * 0.94f + 0.06f;
-        float5 *= float3 * 0.94f + 0.06f;
-        float6 *= float3 * 0.91f + 0.09f;
-        return new Vec3(float4, float5, float6);
-    }
-    
-    @Override
-    public boolean mayRespawn() {
-        return true;
-    }
-    
-    @Override
-    public boolean isFoggyAt(final int integer1, final int integer2) {
-        return false;
-    }
-}
diff --git a/src/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java b/src/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
index 62e7172..ff9a492 100644
--- a/src/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
+++ b/src/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
@@ -1,14 +1,12 @@
 package net.minecraft.world.level.dimension.end;
 
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
 import java.util.Random;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Explosion;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.levelgen.feature.SpikeFeature;
 import java.util.Iterator;
 import net.minecraft.core.BlockPos;
@@ -19,89 +17,89 @@ import net.minecraft.server.level.ServerLevel;
 public enum DragonRespawnAnimation {
     START {
         @Override
-        public void tick(final ServerLevel xd, final EndDragonFight cbm, final List<EndCrystal> list, final int integer, final BlockPos fk) {
-            final BlockPos fk2 = new BlockPos(0, 128, 0);
-            for (final EndCrystal aur9 : list) {
-                aur9.setBeamTarget(fk2);
+        public void tick(final ServerLevel zd, final EndDragonFight cii, final List<EndCrystal> list, final int integer, final BlockPos fu) {
+            final BlockPos fu2 = new BlockPos(0, 128, 0);
+            for (final EndCrystal bab9 : list) {
+                bab9.setBeamTarget(fu2);
             }
-            cbm.setRespawnStage(DragonRespawnAnimation$1.PREPARING_TO_SUMMON_PILLARS);
+            cii.setRespawnStage(DragonRespawnAnimation$1.PREPARING_TO_SUMMON_PILLARS);
         }
     }, 
     PREPARING_TO_SUMMON_PILLARS {
         @Override
-        public void tick(final ServerLevel xd, final EndDragonFight cbm, final List<EndCrystal> list, final int integer, final BlockPos fk) {
+        public void tick(final ServerLevel zd, final EndDragonFight cii, final List<EndCrystal> list, final int integer, final BlockPos fu) {
             if (integer < 100) {
                 if (integer == 0 || integer == 50 || integer == 51 || integer == 52 || integer >= 95) {
-                    xd.levelEvent(3001, new BlockPos(0, 128, 0), 0);
+                    zd.levelEvent(3001, new BlockPos(0, 128, 0), 0);
                 }
             }
             else {
-                cbm.setRespawnStage(DragonRespawnAnimation$2.SUMMONING_PILLARS);
+                cii.setRespawnStage(DragonRespawnAnimation$2.SUMMONING_PILLARS);
             }
         }
     }, 
     SUMMONING_PILLARS {
         @Override
-        public void tick(final ServerLevel xd, final EndDragonFight cbm, final List<EndCrystal> list, final int integer, final BlockPos fk) {
+        public void tick(final ServerLevel zd, final EndDragonFight cii, final List<EndCrystal> list, final int integer, final BlockPos fu) {
             final int integer2 = 40;
             final boolean boolean8 = integer % 40 == 0;
             final boolean boolean9 = integer % 40 == 39;
             if (boolean8 || boolean9) {
-                final List<SpikeFeature.EndSpike> list2 = SpikeFeature.getSpikesForLevel(xd);
+                final List<SpikeFeature.EndSpike> list2 = SpikeFeature.getSpikesForLevel(zd);
                 final int integer3 = integer / 40;
                 if (integer3 < list2.size()) {
                     final SpikeFeature.EndSpike a12 = list2.get(integer3);
                     if (boolean8) {
-                        for (final EndCrystal aur14 : list) {
-                            aur14.setBeamTarget(new BlockPos(a12.getCenterX(), a12.getHeight() + 1, a12.getCenterZ()));
+                        for (final EndCrystal bab14 : list) {
+                            bab14.setBeamTarget(new BlockPos(a12.getCenterX(), a12.getHeight() + 1, a12.getCenterZ()));
                         }
                     }
                     else {
                         final int integer4 = 10;
-                        for (final BlockPos fk2 : BlockPos.betweenClosed(new BlockPos(a12.getCenterX() - 10, a12.getHeight() - 10, a12.getCenterZ() - 10), new BlockPos(a12.getCenterX() + 10, a12.getHeight() + 10, a12.getCenterZ() + 10))) {
-                            xd.removeBlock(fk2, false);
+                        for (final BlockPos fu2 : BlockPos.betweenClosed(new BlockPos(a12.getCenterX() - 10, a12.getHeight() - 10, a12.getCenterZ() - 10), new BlockPos(a12.getCenterX() + 10, a12.getHeight() + 10, a12.getCenterZ() + 10))) {
+                            zd.removeBlock(fu2, false);
                         }
-                        xd.explode(null, a12.getCenterX() + 0.5f, a12.getHeight(), a12.getCenterZ() + 0.5f, 5.0f, Explosion.BlockInteraction.DESTROY);
-                        final SpikeConfiguration chj14 = new SpikeConfiguration(true, ImmutableList.<SpikeFeature.EndSpike>of(a12), new BlockPos(0, 128, 0));
-                        Feature.END_SPIKE.configured(chj14).place(xd, xd.getChunkSource().getGenerator(), new Random(), new BlockPos(a12.getCenterX(), 45, a12.getCenterZ()));
+                        zd.explode(null, a12.getCenterX() + 0.5f, a12.getHeight(), a12.getCenterZ() + 0.5f, 5.0f, Explosion.BlockInteraction.DESTROY);
+                        final SpikeConfiguration coq14 = new SpikeConfiguration(true, ImmutableList.<SpikeFeature.EndSpike>of(a12), new BlockPos(0, 128, 0));
+                        Feature.END_SPIKE.configured(coq14).place(zd, zd.structureFeatureManager(), zd.getChunkSource().getGenerator(), new Random(), new BlockPos(a12.getCenterX(), 45, a12.getCenterZ()));
                     }
                 }
                 else if (boolean8) {
-                    cbm.setRespawnStage(DragonRespawnAnimation$3.SUMMONING_DRAGON);
+                    cii.setRespawnStage(DragonRespawnAnimation$3.SUMMONING_DRAGON);
                 }
             }
         }
     }, 
     SUMMONING_DRAGON {
         @Override
-        public void tick(final ServerLevel xd, final EndDragonFight cbm, final List<EndCrystal> list, final int integer, final BlockPos fk) {
+        public void tick(final ServerLevel zd, final EndDragonFight cii, final List<EndCrystal> list, final int integer, final BlockPos fu) {
             if (integer >= 100) {
-                cbm.setRespawnStage(DragonRespawnAnimation$4.END);
-                cbm.resetSpikeCrystals();
-                for (final EndCrystal aur8 : list) {
-                    aur8.setBeamTarget(null);
-                    xd.explode(aur8, aur8.getX(), aur8.getY(), aur8.getZ(), 6.0f, Explosion.BlockInteraction.NONE);
-                    aur8.remove();
+                cii.setRespawnStage(DragonRespawnAnimation$4.END);
+                cii.resetSpikeCrystals();
+                for (final EndCrystal bab8 : list) {
+                    bab8.setBeamTarget(null);
+                    zd.explode(bab8, bab8.getX(), bab8.getY(), bab8.getZ(), 6.0f, Explosion.BlockInteraction.NONE);
+                    bab8.remove();
                 }
             }
             else if (integer >= 80) {
-                xd.levelEvent(3001, new BlockPos(0, 128, 0), 0);
+                zd.levelEvent(3001, new BlockPos(0, 128, 0), 0);
             }
             else if (integer == 0) {
-                for (final EndCrystal aur8 : list) {
-                    aur8.setBeamTarget(new BlockPos(0, 128, 0));
+                for (final EndCrystal bab8 : list) {
+                    bab8.setBeamTarget(new BlockPos(0, 128, 0));
                 }
             }
             else if (integer < 5) {
-                xd.levelEvent(3001, new BlockPos(0, 128, 0), 0);
+                zd.levelEvent(3001, new BlockPos(0, 128, 0), 0);
             }
         }
     }, 
     END {
         @Override
-        public void tick(final ServerLevel xd, final EndDragonFight cbm, final List<EndCrystal> list, final int integer, final BlockPos fk) {
+        public void tick(final ServerLevel zd, final EndDragonFight cii, final List<EndCrystal> list, final int integer, final BlockPos fu) {
         }
     };
     
-    public abstract void tick(final ServerLevel xd, final EndDragonFight cbm, final List<EndCrystal> list, final int integer, final BlockPos fk);
+    public abstract void tick(final ServerLevel zd, final EndDragonFight cii, final List<EndCrystal> list, final int integer, final BlockPos fu);
 }
diff --git a/src/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/net/minecraft/world/level/dimension/end/EndDragonFight.java
index 2d3c920..2f6bde8 100644
--- a/src/net/minecraft/world/level/dimension/end/EndDragonFight.java
+++ b/src/net/minecraft/world/level/dimension/end/EndDragonFight.java
@@ -10,12 +10,10 @@ import net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.levelgen.feature.SpikeFeature;
 import java.util.Set;
 import com.google.common.collect.Sets;
@@ -87,57 +85,57 @@ public class EndDragonFight {
     private int respawnTime;
     private List<EndCrystal> respawnCrystals;
     
-    public EndDragonFight(final ServerLevel xd, final CompoundTag jt) {
-        this.dragonEvent = (ServerBossEvent)new ServerBossEvent(new TranslatableComponent("entity.minecraft.ender_dragon", new Object[0]), BossEvent.BossBarColor.PINK, BossEvent.BossBarOverlay.PROGRESS).setPlayBossMusic(true).setCreateWorldFog(true);
+    public EndDragonFight(final ServerLevel zd, final long long2, final CompoundTag le) {
+        this.dragonEvent = (ServerBossEvent)new ServerBossEvent(new TranslatableComponent("entity.minecraft.ender_dragon"), BossEvent.BossBarColor.PINK, BossEvent.BossBarOverlay.PROGRESS).setPlayBossMusic(true).setCreateWorldFog(true);
         this.gateways = Lists.newArrayList();
         this.needsStateScanning = true;
-        this.level = xd;
-        if (jt.contains("DragonKilled", 99)) {
-            if (jt.hasUUID("DragonUUID")) {
-                this.dragonUUID = jt.getUUID("DragonUUID");
+        this.level = zd;
+        if (le.contains("DragonKilled", 99)) {
+            if (le.hasUUID("Dragon")) {
+                this.dragonUUID = le.getUUID("Dragon");
             }
-            this.dragonKilled = jt.getBoolean("DragonKilled");
-            this.previouslyKilled = jt.getBoolean("PreviouslyKilled");
-            if (jt.getBoolean("IsRespawning")) {
+            this.dragonKilled = le.getBoolean("DragonKilled");
+            this.previouslyKilled = le.getBoolean("PreviouslyKilled");
+            if (le.getBoolean("IsRespawning")) {
                 this.respawnStage = DragonRespawnAnimation.START;
             }
-            if (jt.contains("ExitPortalLocation", 10)) {
-                this.portalLocation = NbtUtils.readBlockPos(jt.getCompound("ExitPortalLocation"));
+            if (le.contains("ExitPortalLocation", 10)) {
+                this.portalLocation = NbtUtils.readBlockPos(le.getCompound("ExitPortalLocation"));
             }
         }
         else {
             this.dragonKilled = true;
             this.previouslyKilled = true;
         }
-        if (jt.contains("Gateways", 9)) {
-            final ListTag jz4 = jt.getList("Gateways", 3);
-            for (int integer5 = 0; integer5 < jz4.size(); ++integer5) {
-                this.gateways.add(jz4.getInt(integer5));
+        if (le.contains("Gateways", 9)) {
+            final ListTag lk6 = le.getList("Gateways", 3);
+            for (int integer7 = 0; integer7 < lk6.size(); ++integer7) {
+                this.gateways.add(lk6.getInt(integer7));
             }
         }
         else {
             this.gateways.addAll(ContiguousSet.<Integer>create(Range.closedOpen(0, (C)20), DiscreteDomain.integers()));
-            Collections.shuffle(this.gateways, new Random(xd.getSeed()));
+            Collections.shuffle(this.gateways, new Random(long2));
         }
         this.exitPortalPattern = BlockPatternBuilder.start().aisle("       ", "       ", "       ", "   #   ", "       ", "       ", "       ").aisle("       ", "       ", "       ", "   #   ", "       ", "       ", "       ").aisle("       ", "       ", "       ", "   #   ", "       ", "       ", "       ").aisle("  ###  ", " #   # ", "#     #", "#  #  #", "#     #", " #   # ", "  ###  ").aisle("       ", "  ###  ", " ##### ", " ##### ", " ##### ", "  ###  ", "       ").where('#', BlockInWorld.hasState(BlockPredicate.forBlock(Blocks.BEDROCK))).build();
     }
     
     public CompoundTag saveData() {
-        final CompoundTag jt2 = new CompoundTag();
+        final CompoundTag le2 = new CompoundTag();
         if (this.dragonUUID != null) {
-            jt2.putUUID("DragonUUID", this.dragonUUID);
+            le2.putUUID("Dragon", this.dragonUUID);
         }
-        jt2.putBoolean("DragonKilled", this.dragonKilled);
-        jt2.putBoolean("PreviouslyKilled", this.previouslyKilled);
+        le2.putBoolean("DragonKilled", this.dragonKilled);
+        le2.putBoolean("PreviouslyKilled", this.previouslyKilled);
         if (this.portalLocation != null) {
-            jt2.put("ExitPortalLocation", NbtUtils.writeBlockPos(this.portalLocation));
+            le2.put("ExitPortalLocation", NbtUtils.writeBlockPos(this.portalLocation));
         }
-        final ListTag jz3 = new ListTag();
+        final ListTag lk3 = new ListTag();
         for (final int integer5 : this.gateways) {
-            ((AbstractList<IntTag>)jz3).add(IntTag.valueOf(integer5));
+            ((AbstractList<IntTag>)lk3).add(IntTag.valueOf(integer5));
         }
-        jt2.put("Gateways", jz3);
-        return jt2;
+        le2.put("Gateways", lk3);
+        return le2;
     }
     
     public void tick() {
@@ -195,13 +193,13 @@ public class EndDragonFight {
             this.dragonKilled = true;
         }
         else {
-            final EnderDragon aus4 = list3.get(0);
-            this.dragonUUID = aus4.getUUID();
-            EndDragonFight.LOGGER.info("Found that there's a dragon still alive ({})", aus4);
+            final EnderDragon bac4 = list3.get(0);
+            this.dragonUUID = bac4.getUUID();
+            EndDragonFight.LOGGER.info("Found that there's a dragon still alive ({})", bac4);
             this.dragonKilled = false;
             if (!boolean2) {
                 EndDragonFight.LOGGER.info("But we didn't have a portal, let's remove it.");
-                aus4.remove();
+                bac4.remove();
                 this.dragonUUID = null;
             }
         }
@@ -222,30 +220,30 @@ public class EndDragonFight {
         }
     }
     
-    protected void setRespawnStage(final DragonRespawnAnimation cbl) {
+    protected void setRespawnStage(final DragonRespawnAnimation cih) {
         if (this.respawnStage == null) {
             throw new IllegalStateException("Dragon respawn isn't in progress, can't skip ahead in the animation.");
         }
         this.respawnTime = 0;
-        if (cbl == DragonRespawnAnimation.END) {
+        if (cih == DragonRespawnAnimation.END) {
             this.respawnStage = null;
             this.dragonKilled = false;
-            final EnderDragon aus3 = this.createNewDragon();
-            for (final ServerPlayer xe5 : this.dragonEvent.getPlayers()) {
-                CriteriaTriggers.SUMMONED_ENTITY.trigger(xe5, aus3);
+            final EnderDragon bac3 = this.createNewDragon();
+            for (final ServerPlayer ze5 : this.dragonEvent.getPlayers()) {
+                CriteriaTriggers.SUMMONED_ENTITY.trigger(ze5, bac3);
             }
         }
         else {
-            this.respawnStage = cbl;
+            this.respawnStage = cih;
         }
     }
     
     private boolean hasActiveExitPortal() {
         for (int integer2 = -8; integer2 <= 8; ++integer2) {
             for (int integer3 = -8; integer3 <= 8; ++integer3) {
-                final LevelChunk cal4 = this.level.getChunk(integer2, integer3);
-                for (final BlockEntity bwl6 : cal4.getBlockEntities().values()) {
-                    if (bwl6 instanceof TheEndPortalBlockEntity) {
+                final LevelChunk chj4 = this.level.getChunk(integer2, integer3);
+                for (final BlockEntity cdl6 : chj4.getBlockEntities().values()) {
+                    if (cdl6 instanceof TheEndPortalBlockEntity) {
                         return true;
                     }
                 }
@@ -258,14 +256,14 @@ public class EndDragonFight {
     private BlockPattern.BlockPatternMatch findExitPortal() {
         for (int integer2 = -8; integer2 <= 8; ++integer2) {
             for (int integer3 = -8; integer3 <= 8; ++integer3) {
-                final LevelChunk cal4 = this.level.getChunk(integer2, integer3);
-                for (final BlockEntity bwl6 : cal4.getBlockEntities().values()) {
-                    if (bwl6 instanceof TheEndPortalBlockEntity) {
-                        final BlockPattern.BlockPatternMatch b7 = this.exitPortalPattern.find(this.level, bwl6.getBlockPos());
+                final LevelChunk chj4 = this.level.getChunk(integer2, integer3);
+                for (final BlockEntity cdl6 : chj4.getBlockEntities().values()) {
+                    if (cdl6 instanceof TheEndPortalBlockEntity) {
+                        final BlockPattern.BlockPatternMatch b7 = this.exitPortalPattern.find(this.level, cdl6.getBlockPos());
                         if (b7 != null) {
-                            final BlockPos fk8 = b7.getBlock(3, 3, 3).getPos();
-                            if (this.portalLocation == null && fk8.getX() == 0 && fk8.getZ() == 0) {
-                                this.portalLocation = fk8;
+                            final BlockPos fu8 = b7.getBlock(3, 3, 3).getPos();
+                            if (this.portalLocation == null && fu8.getX() == 0 && fu8.getZ() == 0) {
+                                this.portalLocation = fu8;
                             }
                             return b7;
                         }
@@ -290,11 +288,11 @@ public class EndDragonFight {
     private boolean isArenaLoaded() {
         for (int integer2 = -8; integer2 <= 8; ++integer2) {
             for (int integer3 = 8; integer3 <= 8; ++integer3) {
-                final ChunkAccess bzy4 = this.level.getChunk(integer2, integer3, ChunkStatus.FULL, false);
-                if (!(bzy4 instanceof LevelChunk)) {
+                final ChunkAccess cgy4 = this.level.getChunk(integer2, integer3, ChunkStatus.FULL, false);
+                if (!(cgy4 instanceof LevelChunk)) {
                     return false;
                 }
-                final ChunkHolder.FullChunkStatus b5 = ((LevelChunk)bzy4).getFullStatus();
+                final ChunkHolder.FullChunkStatus b5 = ((LevelChunk)cgy4).getFullStatus();
                 if (!b5.isOrAfter(ChunkHolder.FullChunkStatus.TICKING)) {
                     return false;
                 }
@@ -305,14 +303,14 @@ public class EndDragonFight {
     
     private void updatePlayers() {
         final Set<ServerPlayer> set2 = Sets.newHashSet();
-        for (final ServerPlayer xe4 : this.level.getPlayers(EndDragonFight.VALID_PLAYER)) {
-            this.dragonEvent.addPlayer(xe4);
-            set2.add(xe4);
+        for (final ServerPlayer ze4 : this.level.getPlayers(EndDragonFight.VALID_PLAYER)) {
+            this.dragonEvent.addPlayer(ze4);
+            set2.add(ze4);
         }
         final Set<ServerPlayer> set3 = Sets.newHashSet(this.dragonEvent.getPlayers());
         set3.removeAll(set2);
-        for (final ServerPlayer xe5 : set3) {
-            this.dragonEvent.removePlayer(xe5);
+        for (final ServerPlayer ze5 : set3) {
+            this.dragonEvent.removePlayer(ze5);
         }
     }
     
@@ -325,8 +323,8 @@ public class EndDragonFight {
         EndDragonFight.LOGGER.debug("Found {} end crystals still alive", this.crystalsAlive);
     }
     
-    public void setDragonKilled(final EnderDragon aus) {
-        if (aus.getUUID().equals(this.dragonUUID)) {
+    public void setDragonKilled(final EnderDragon bac) {
+        if (bac.getUUID().equals(this.dragonUUID)) {
             this.dragonEvent.setPercent(0.0f);
             this.dragonEvent.setVisible(false);
             this.spawnExitPortal(true);
@@ -349,38 +347,38 @@ public class EndDragonFight {
         this.spawnNewGateway(new BlockPos(integer3, 75, integer4));
     }
     
-    private void spawnNewGateway(final BlockPos fk) {
-        this.level.levelEvent(3000, fk, 0);
-        Feature.END_GATEWAY.configured(EndGatewayConfiguration.delayedExitSearch()).place(this.level, this.level.getChunkSource().getGenerator(), new Random(), fk);
+    private void spawnNewGateway(final BlockPos fu) {
+        this.level.levelEvent(3000, fu, 0);
+        Feature.END_GATEWAY.configured(EndGatewayConfiguration.delayedExitSearch()).place(this.level, this.level.structureFeatureManager(), this.level.getChunkSource().getGenerator(), new Random(), fu);
     }
     
     private void spawnExitPortal(final boolean boolean1) {
-        final EndPodiumFeature cds3 = new EndPodiumFeature(boolean1);
+        final EndPodiumFeature cks3 = new EndPodiumFeature(boolean1);
         if (this.portalLocation == null) {
             this.portalLocation = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION).below();
-            while (this.level.getBlockState(this.portalLocation).getBlock() == Blocks.BEDROCK && this.portalLocation.getY() > this.level.getSeaLevel()) {
+            while (this.level.getBlockState(this.portalLocation).is(Blocks.BEDROCK) && this.portalLocation.getY() > this.level.getSeaLevel()) {
                 this.portalLocation = this.portalLocation.below();
             }
         }
-        cds3.configured(FeatureConfiguration.NONE).place(this.level, this.level.getChunkSource().getGenerator(), new Random(), this.portalLocation);
+        cks3.configured(FeatureConfiguration.NONE).place(this.level, this.level.structureFeatureManager(), this.level.getChunkSource().getGenerator(), new Random(), this.portalLocation);
     }
     
     private EnderDragon createNewDragon() {
         this.level.getChunkAt(new BlockPos(0, 128, 0));
-        final EnderDragon aus2 = EntityType.ENDER_DRAGON.create(this.level);
-        aus2.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
-        aus2.moveTo(0.0, 128.0, 0.0, this.level.random.nextFloat() * 360.0f, 0.0f);
-        this.level.addFreshEntity(aus2);
-        this.dragonUUID = aus2.getUUID();
-        return aus2;
+        final EnderDragon bac2 = EntityType.ENDER_DRAGON.create(this.level);
+        bac2.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
+        bac2.moveTo(0.0, 128.0, 0.0, this.level.random.nextFloat() * 360.0f, 0.0f);
+        this.level.addFreshEntity(bac2);
+        this.dragonUUID = bac2.getUUID();
+        return bac2;
     }
     
-    public void updateDragon(final EnderDragon aus) {
-        if (aus.getUUID().equals(this.dragonUUID)) {
-            this.dragonEvent.setPercent(aus.getHealth() / aus.getMaxHealth());
+    public void updateDragon(final EnderDragon bac) {
+        if (bac.getUUID().equals(this.dragonUUID)) {
+            this.dragonEvent.setPercent(bac.getHealth() / bac.getMaxHealth());
             this.ticksSinceDragonSeen = 0;
-            if (aus.hasCustomName()) {
-                this.dragonEvent.setName(aus.getDisplayName());
+            if (bac.hasCustomName()) {
+                this.dragonEvent.setName(bac.getDisplayName());
             }
         }
     }
@@ -389,8 +387,8 @@ public class EndDragonFight {
         return this.crystalsAlive;
     }
     
-    public void onCrystalDestroyed(final EndCrystal aur, final DamageSource ajz) {
-        if (this.respawnStage != null && this.respawnCrystals.contains(aur)) {
+    public void onCrystalDestroyed(final EndCrystal bab, final DamageSource anw) {
+        if (this.respawnStage != null && this.respawnCrystals.contains(bab)) {
             EndDragonFight.LOGGER.debug("Aborting respawn sequence");
             this.respawnStage = null;
             this.respawnTime = 0;
@@ -399,9 +397,9 @@ public class EndDragonFight {
         }
         else {
             this.updateCrystalCount();
-            final Entity akq4 = this.level.getEntity(this.dragonUUID);
-            if (akq4 instanceof EnderDragon) {
-                ((EnderDragon)akq4).onCrystalDestroyed(aur, new BlockPos(aur), ajz);
+            final Entity aom4 = this.level.getEntity(this.dragonUUID);
+            if (aom4 instanceof EnderDragon) {
+                ((EnderDragon)aom4).onCrystalDestroyed(bab, bab.blockPosition(), anw);
             }
         }
     }
@@ -412,8 +410,8 @@ public class EndDragonFight {
     
     public void tryRespawn() {
         if (this.dragonKilled && this.respawnStage == null) {
-            BlockPos fk2 = this.portalLocation;
-            if (fk2 == null) {
+            BlockPos fu2 = this.portalLocation;
+            if (fu2 == null) {
                 EndDragonFight.LOGGER.debug("Tried to respawn, but need to find the portal first.");
                 final BlockPattern.BlockPatternMatch b3 = this.findExitPortal();
                 if (b3 == null) {
@@ -423,12 +421,12 @@ public class EndDragonFight {
                 else {
                     EndDragonFight.LOGGER.debug("Found the exit portal & temporarily using it.");
                 }
-                fk2 = this.portalLocation;
+                fu2 = this.portalLocation;
             }
             final List<EndCrystal> list3 = Lists.newArrayList();
-            final BlockPos fk3 = fk2.above(1);
-            for (final Direction fp6 : Direction.Plane.HORIZONTAL) {
-                final List<EndCrystal> list4 = this.level.<EndCrystal>getEntitiesOfClass(EndCrystal.class, new AABB(fk3.relative(fp6, 2)));
+            final BlockPos fu3 = fu2.above(1);
+            for (final Direction fz6 : Direction.Plane.HORIZONTAL) {
+                final List<EndCrystal> list4 = this.level.<EndCrystal>getEntitiesOfClass(EndCrystal.class, new AABB(fu3.relative(fz6, 2)));
                 if (list4.isEmpty()) {
                     return;
                 }
@@ -445,9 +443,9 @@ public class EndDragonFight {
                 for (int integer4 = 0; integer4 < this.exitPortalPattern.getWidth(); ++integer4) {
                     for (int integer5 = 0; integer5 < this.exitPortalPattern.getHeight(); ++integer5) {
                         for (int integer6 = 0; integer6 < this.exitPortalPattern.getDepth(); ++integer6) {
-                            final BlockInWorld byn7 = b3.getBlock(integer4, integer5, integer6);
-                            if (byn7.getState().getBlock() == Blocks.BEDROCK || byn7.getState().getBlock() == Blocks.END_PORTAL) {
-                                this.level.setBlockAndUpdate(byn7.getPos(), Blocks.END_STONE.defaultBlockState());
+                            final BlockInWorld cfn7 = b3.getBlock(integer4, integer5, integer6);
+                            if (cfn7.getState().is(Blocks.BEDROCK) || cfn7.getState().is(Blocks.END_PORTAL)) {
+                                this.level.setBlockAndUpdate(cfn7.getPos(), Blocks.END_STONE.defaultBlockState());
                             }
                         }
                     }
@@ -463,9 +461,9 @@ public class EndDragonFight {
     public void resetSpikeCrystals() {
         for (final SpikeFeature.EndSpike a3 : SpikeFeature.getSpikesForLevel(this.level)) {
             final List<EndCrystal> list4 = this.level.<EndCrystal>getEntitiesOfClass(EndCrystal.class, a3.getTopBoundingBox());
-            for (final EndCrystal aur6 : list4) {
-                aur6.setInvulnerable(false);
-                aur6.setBeamTarget(null);
+            for (final EndCrystal bab6 : list4) {
+                bab6.setInvulnerable(false);
+                bab6.setBeamTarget(null);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/dimension/end/TheEndDimension.java b/src/net/minecraft/world/level/dimension/end/TheEndDimension.java
deleted file mode 100644
index e5584b5..0000000
--- a/src/net/minecraft/world/level/dimension/end/TheEndDimension.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package net.minecraft.world.level.dimension.end;
-
-import net.minecraft.nbt.Tag;
-import java.util.Random;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.util.Mth;
-import net.minecraft.world.phys.Vec3;
-import javax.annotation.Nullable;
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.biome.BiomeSourceType;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.chunk.ChunkGeneratorType;
-import net.minecraft.world.level.levelgen.TheEndGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.Level;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.dimension.Dimension;
-
-public class TheEndDimension extends Dimension {
-    public static final BlockPos END_SPAWN_POINT;
-    private final EndDragonFight dragonFight;
-    
-    public TheEndDimension(final Level bjw, final DimensionType cbi) {
-        super(bjw, cbi, 0.0f);
-        final CompoundTag jt4 = bjw.getLevelData().getDimensionData(DimensionType.THE_END);
-        this.dragonFight = ((bjw instanceof ServerLevel) ? new EndDragonFight((ServerLevel)bjw, jt4.getCompound("DragonFight")) : null);
-    }
-    
-    @Override
-    public ChunkGenerator<?> createRandomLevelGenerator() {
-        final TheEndGeneratorSettings ccd2 = ChunkGeneratorType.FLOATING_ISLANDS.createSettings();
-        ccd2.setDefaultBlock(Blocks.END_STONE.defaultBlockState());
-        ccd2.setDefaultFluid(Blocks.AIR.defaultBlockState());
-        ccd2.setSpawnPosition(this.getDimensionSpecificSpawn());
-        return ChunkGeneratorType.FLOATING_ISLANDS.create(this.level, BiomeSourceType.THE_END.create(BiomeSourceType.THE_END.createSettings(this.level.getLevelData())), ccd2);
-    }
-    
-    @Override
-    public float getTimeOfDay(final long long1, final float float2) {
-        return 0.0f;
-    }
-    
-    @Nullable
-    @Override
-    public float[] getSunriseColor(final float float1, final float float2) {
-        return null;
-    }
-    
-    @Override
-    public Vec3 getFogColor(final float float1, final float float2) {
-        final int integer4 = 10518688;
-        float float3 = Mth.cos(float1 * 6.2831855f) * 2.0f + 0.5f;
-        float3 = Mth.clamp(float3, 0.0f, 1.0f);
-        float float4 = 0.627451f;
-        float float5 = 0.5019608f;
-        float float6 = 0.627451f;
-        float4 *= float3 * 0.0f + 0.15f;
-        float5 *= float3 * 0.0f + 0.15f;
-        float6 *= float3 * 0.0f + 0.15f;
-        return new Vec3(float4, float5, float6);
-    }
-    
-    @Override
-    public boolean hasGround() {
-        return false;
-    }
-    
-    @Override
-    public boolean mayRespawn() {
-        return false;
-    }
-    
-    @Override
-    public boolean isNaturalDimension() {
-        return false;
-    }
-    
-    @Override
-    public float getCloudHeight() {
-        return 8.0f;
-    }
-    
-    @Nullable
-    @Override
-    public BlockPos getSpawnPosInChunk(final ChunkPos bjh, final boolean boolean2) {
-        final Random random4 = new Random(this.level.getSeed());
-        final BlockPos fk5 = new BlockPos(bjh.getMinBlockX() + random4.nextInt(15), 0, bjh.getMaxBlockZ() + random4.nextInt(15));
-        return this.level.getTopBlockState(fk5).getMaterial().blocksMotion() ? fk5 : null;
-    }
-    
-    @Override
-    public BlockPos getDimensionSpecificSpawn() {
-        return TheEndDimension.END_SPAWN_POINT;
-    }
-    
-    @Nullable
-    @Override
-    public BlockPos getValidSpawnPosition(final int integer1, final int integer2, final boolean boolean3) {
-        return this.getSpawnPosInChunk(new ChunkPos(integer1 >> 4, integer2 >> 4), boolean3);
-    }
-    
-    @Override
-    public boolean isFoggyAt(final int integer1, final int integer2) {
-        return false;
-    }
-    
-    @Override
-    public DimensionType getType() {
-        return DimensionType.THE_END;
-    }
-    
-    @Override
-    public void saveData() {
-        final CompoundTag jt2 = new CompoundTag();
-        if (this.dragonFight != null) {
-            jt2.put("DragonFight", this.dragonFight.saveData());
-        }
-        this.level.getLevelData().setDimensionData(DimensionType.THE_END, jt2);
-    }
-    
-    @Override
-    public void tick() {
-        if (this.dragonFight != null) {
-            this.dragonFight.tick();
-        }
-    }
-    
-    @Nullable
-    public EndDragonFight getDragonFight() {
-        return this.dragonFight;
-    }
-    
-    static {
-        END_SPAWN_POINT = new BlockPos(100, 50, 0);
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/ChunkGeneratorSettings.java b/src/net/minecraft/world/level/levelgen/ChunkGeneratorSettings.java
deleted file mode 100644
index cf1c361..0000000
--- a/src/net/minecraft/world/level/levelgen/ChunkGeneratorSettings.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package net.minecraft.world.level.levelgen;
-
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-
-public class ChunkGeneratorSettings {
-    protected int villagesSpacing;
-    protected final int villagesSeparation = 8;
-    protected int monumentsSpacing;
-    protected int monumentsSeparation;
-    protected int strongholdsDistance;
-    protected int strongholdsCount;
-    protected int strongholdsSpread;
-    protected int templesSpacing;
-    protected final int templesSeparation = 8;
-    protected final int oceanRuinSpacing = 16;
-    protected final int oceanRuinSeparation = 8;
-    protected int endCitySpacing;
-    protected final int endCitySeparation = 11;
-    protected final int shipwreckSpacing = 16;
-    protected final int shipwreckSeparation = 8;
-    protected int woodlandMansionSpacing;
-    protected final int woodlandMangionSeparation = 20;
-    protected BlockState defaultBlock;
-    protected BlockState defaultFluid;
-    
-    public ChunkGeneratorSettings() {
-        this.villagesSpacing = 32;
-        this.monumentsSpacing = 32;
-        this.monumentsSeparation = 5;
-        this.strongholdsDistance = 32;
-        this.strongholdsCount = 128;
-        this.strongholdsSpread = 3;
-        this.templesSpacing = 32;
-        this.endCitySpacing = 20;
-        this.woodlandMansionSpacing = 80;
-        this.defaultBlock = Blocks.STONE.defaultBlockState();
-        this.defaultFluid = Blocks.WATER.defaultBlockState();
-    }
-    
-    public int getVillagesSpacing() {
-        return this.villagesSpacing;
-    }
-    
-    public int getVillagesSeparation() {
-        return 8;
-    }
-    
-    public int getMonumentsSpacing() {
-        return this.monumentsSpacing;
-    }
-    
-    public int getMonumentsSeparation() {
-        return this.monumentsSeparation;
-    }
-    
-    public int getStrongholdsDistance() {
-        return this.strongholdsDistance;
-    }
-    
-    public int getStrongholdsCount() {
-        return this.strongholdsCount;
-    }
-    
-    public int getStrongholdsSpread() {
-        return this.strongholdsSpread;
-    }
-    
-    public int getTemplesSpacing() {
-        return this.templesSpacing;
-    }
-    
-    public int getTemplesSeparation() {
-        return 8;
-    }
-    
-    public int getShipwreckSpacing() {
-        return 16;
-    }
-    
-    public int getShipwreckSeparation() {
-        return 8;
-    }
-    
-    public int getOceanRuinSpacing() {
-        return 16;
-    }
-    
-    public int getOceanRuinSeparation() {
-        return 8;
-    }
-    
-    public int getEndCitySpacing() {
-        return this.endCitySpacing;
-    }
-    
-    public int getEndCitySeparation() {
-        return 11;
-    }
-    
-    public int getWoodlandMansionSpacing() {
-        return this.woodlandMansionSpacing;
-    }
-    
-    public int getWoodlandMangionSeparation() {
-        return 20;
-    }
-    
-    public BlockState getDefaultBlock() {
-        return this.defaultBlock;
-    }
-    
-    public BlockState getDefaultFluid() {
-        return this.defaultFluid;
-    }
-    
-    public void setDefaultBlock(final BlockState byj) {
-        this.defaultBlock = byj;
-    }
-    
-    public void setDefaultFluid(final BlockState byj) {
-        this.defaultFluid = byj;
-    }
-    
-    public int getBedrockRoofPosition() {
-        return 0;
-    }
-    
-    public int getBedrockFloorPosition() {
-        return 256;
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/DebugGeneratorSettings.java b/src/net/minecraft/world/level/levelgen/DebugGeneratorSettings.java
deleted file mode 100644
index 3a3fc75..0000000
--- a/src/net/minecraft/world/level/levelgen/DebugGeneratorSettings.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package net.minecraft.world.level.levelgen;
-
-public class DebugGeneratorSettings extends ChunkGeneratorSettings {
-}
diff --git a/src/net/minecraft/world/level/levelgen/DebugLevelSource.java b/src/net/minecraft/world/level/levelgen/DebugLevelSource.java
index 9602bd1..cdc5f93 100644
--- a/src/net/minecraft/world/level/levelgen/DebugLevelSource.java
+++ b/src/net/minecraft/world/level/levelgen/DebugLevelSource.java
@@ -5,63 +5,79 @@ import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import net.minecraft.core.Registry;
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.Decoder;
+import com.mojang.serialization.Encoder;
 import java.util.stream.Stream;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.util.Mth;
+import net.minecraft.world.level.NoiseColumn;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.StructureFeatureManager;
 import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.biome.FixedBiomeSource;
+import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.block.state.BlockState;
 import java.util.List;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 
-public class DebugLevelSource extends ChunkGenerator<DebugGeneratorSettings> {
+public class DebugLevelSource extends ChunkGenerator {
+    public static final DebugLevelSource INSTANCE;
+    public static final Codec<DebugLevelSource> CODEC;
     private static final List<BlockState> ALL_BLOCKS;
     private static final int GRID_WIDTH;
     private static final int GRID_HEIGHT;
     protected static final BlockState AIR;
     protected static final BlockState BARRIER;
     
-    public DebugLevelSource(final LevelAccessor bjx, final BiomeSource bkw, final DebugGeneratorSettings cbr) {
-        super(bjx, bkw, cbr);
+    private DebugLevelSource() {
+        super(new FixedBiomeSource(Biomes.PLAINS), new StructureSettings(false));
     }
     
     @Override
-    public void buildSurfaceAndBedrock(final WorldGenRegion xj, final ChunkAccess bzy) {
+    protected Codec<? extends ChunkGenerator> codec() {
+        return DebugLevelSource.CODEC;
     }
     
     @Override
-    public void applyCarvers(final BiomeManager bkv, final ChunkAccess bzy, final GenerationStep.Carving a) {
+    public ChunkGenerator withSeed(final long long1) {
+        return this;
     }
     
     @Override
-    public int getSpawnHeight() {
-        return this.level.getSeaLevel() + 1;
+    public void buildSurfaceAndBedrock(final WorldGenRegion zj, final ChunkAccess cgy) {
     }
     
     @Override
-    public void applyBiomeDecoration(final WorldGenRegion xj) {
-        final BlockPos.MutableBlockPos a3 = new BlockPos.MutableBlockPos();
-        final int integer4 = xj.getCenterX();
-        final int integer5 = xj.getCenterZ();
-        for (int integer6 = 0; integer6 < 16; ++integer6) {
-            for (int integer7 = 0; integer7 < 16; ++integer7) {
-                final int integer8 = (integer4 << 4) + integer6;
+    public void applyCarvers(final long long1, final BiomeManager brg, final ChunkAccess cgy, final GenerationStep.Carving a) {
+    }
+    
+    @Override
+    public void applyBiomeDecoration(final WorldGenRegion zj, final StructureFeatureManager bqq) {
+        final BlockPos.MutableBlockPos a4 = new BlockPos.MutableBlockPos();
+        final int integer5 = zj.getCenterX();
+        final int integer6 = zj.getCenterZ();
+        for (int integer7 = 0; integer7 < 16; ++integer7) {
+            for (int integer8 = 0; integer8 < 16; ++integer8) {
                 final int integer9 = (integer5 << 4) + integer7;
-                xj.setBlock(a3.set(integer8, 60, integer9), DebugLevelSource.BARRIER, 2);
-                final BlockState byj10 = getBlockStateFor(integer8, integer9);
-                if (byj10 != null) {
-                    xj.setBlock(a3.set(integer8, 70, integer9), byj10, 2);
+                final int integer10 = (integer6 << 4) + integer8;
+                zj.setBlock(a4.set(integer9, 60, integer10), DebugLevelSource.BARRIER, 2);
+                final BlockState cfj11 = getBlockStateFor(integer9, integer10);
+                if (cfj11 != null) {
+                    zj.setBlock(a4.set(integer9, 70, integer10), cfj11, 2);
                 }
             }
         }
     }
     
     @Override
-    public void fillFromNoise(final LevelAccessor bjx, final ChunkAccess bzy) {
+    public void fillFromNoise(final LevelAccessor bqc, final StructureFeatureManager bqq, final ChunkAccess cgy) {
     }
     
     @Override
@@ -69,23 +85,30 @@ public class DebugLevelSource extends ChunkGenerator<DebugGeneratorSettings> {
         return 0;
     }
     
+    @Override
+    public BlockGetter getBaseColumn(final int integer1, final int integer2) {
+        return new NoiseColumn(new BlockState[0]);
+    }
+    
     public static BlockState getBlockStateFor(int integer1, int integer2) {
-        BlockState byj3 = DebugLevelSource.AIR;
+        BlockState cfj3 = DebugLevelSource.AIR;
         if (integer1 > 0 && integer2 > 0 && integer1 % 2 != 0 && integer2 % 2 != 0) {
             integer1 /= 2;
             integer2 /= 2;
             if (integer1 <= DebugLevelSource.GRID_WIDTH && integer2 <= DebugLevelSource.GRID_HEIGHT) {
                 final int integer3 = Mth.abs(integer1 * DebugLevelSource.GRID_WIDTH + integer2);
                 if (integer3 < DebugLevelSource.ALL_BLOCKS.size()) {
-                    byj3 = DebugLevelSource.ALL_BLOCKS.get(integer3);
+                    cfj3 = DebugLevelSource.ALL_BLOCKS.get(integer3);
                 }
             }
         }
-        return byj3;
+        return cfj3;
     }
     
     static {
-        ALL_BLOCKS = StreamSupport.<Block>stream(Registry.BLOCK.spliterator(), false).flatMap(bph -> bph.getStateDefinition().getPossibleStates().stream()).collect(Collectors.toList());
+        INSTANCE = new DebugLevelSource();
+        CODEC = MapCodec.of(Encoder.empty(), Decoder.unit(() -> DebugLevelSource.INSTANCE)).stable().codec();
+        ALL_BLOCKS = StreamSupport.<Block>stream(Registry.BLOCK.spliterator(), false).flatMap(bvr -> bvr.getStateDefinition().getPossibleStates().stream()).collect(Collectors.toList());
         GRID_WIDTH = Mth.ceil(Mth.sqrt((float)DebugLevelSource.ALL_BLOCKS.size()));
         GRID_HEIGHT = Mth.ceil(DebugLevelSource.ALL_BLOCKS.size() / (float)DebugLevelSource.GRID_WIDTH);
         AIR = Blocks.AIR.defaultBlockState();
diff --git a/src/net/minecraft/world/level/levelgen/FlatLevelSource.java b/src/net/minecraft/world/level/levelgen/FlatLevelSource.java
index 32d18e6..0533e84 100644
--- a/src/net/minecraft/world/level/levelgen/FlatLevelSource.java
+++ b/src/net/minecraft/world/level/levelgen/FlatLevelSource.java
@@ -1,121 +1,75 @@
 package net.minecraft.world.level.levelgen;
 
-import net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder;
-import java.util.Locale;
-import net.minecraft.world.level.Level;
-import javax.annotation.Nullable;
-import net.minecraft.server.level.ServerLevel;
+import java.util.function.Function;
+import net.minecraft.world.level.NoiseColumn;
+import java.util.Arrays;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.biome.BiomeManager;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.block.state.BlockState;
-import java.util.List;
-import java.util.Iterator;
-import java.util.Map;
-import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
-import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
-import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
-import net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration;
-import net.minecraft.world.level.levelgen.feature.Feature;
-import com.google.common.collect.Lists;
-import net.minecraft.world.level.biome.Biomes;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.entity.npc.CatSpawner;
-import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.FixedBiomeSource;
 import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 
-public class FlatLevelSource extends ChunkGenerator<FlatLevelGeneratorSettings> {
-    private final Biome biomeWrapper;
-    private final PhantomSpawner phantomSpawner;
-    private final CatSpawner catSpawner;
+public class FlatLevelSource extends ChunkGenerator {
+    public static final Codec<FlatLevelSource> CODEC;
+    private final FlatLevelGeneratorSettings settings;
     
-    public FlatLevelSource(final LevelAccessor bjx, final BiomeSource bkw, final FlatLevelGeneratorSettings ciy) {
-        super(bjx, bkw, ciy);
-        this.phantomSpawner = new PhantomSpawner();
-        this.catSpawner = new CatSpawner();
-        this.biomeWrapper = this.getBiomeFromSettings();
-    }
-    
-    private Biome getBiomeFromSettings() {
-        final Biome bkt2 = ((FlatLevelGeneratorSettings)this.settings).getBiome();
-        final FlatLevelBiomeWrapper a3 = new FlatLevelBiomeWrapper(bkt2.getSurfaceBuilder(), bkt2.getPrecipitation(), bkt2.getBiomeCategory(), bkt2.getDepth(), bkt2.getScale(), bkt2.getTemperature(), bkt2.getDownfall(), bkt2.getWaterColor(), bkt2.getWaterFogColor(), bkt2.getParent());
-        final Map<String, Map<String, String>> map4 = ((FlatLevelGeneratorSettings)this.settings).getStructuresOptions();
-        for (final String string6 : map4.keySet()) {
-            final ConfiguredFeature<?, ?>[] arr7 = FlatLevelGeneratorSettings.STRUCTURE_FEATURES.get(string6);
-            if (arr7 == null) {
-                continue;
-            }
-            for (final ConfiguredFeature<?, ?> cdc11 : arr7) {
-                a3.addFeature(FlatLevelGeneratorSettings.STRUCTURE_FEATURES_STEP.get(cdc11), cdc11);
-                final ConfiguredFeature<?, ?> cdc12 = ((DecoratedFeatureConfiguration)cdc11.config).feature;
-                if (cdc12.feature instanceof StructureFeature) {
-                    final StructureFeature<FeatureConfiguration> cfl13 = (StructureFeature<FeatureConfiguration>)cdc12.feature;
-                    final FeatureConfiguration cgn14 = bkt2.<FeatureConfiguration>getStructureConfiguration(cfl13);
-                    final FeatureConfiguration cgn15 = (cgn14 != null) ? cgn14 : FlatLevelGeneratorSettings.STRUCTURE_FEATURES_DEFAULT.get(cdc11);
-                    a3.<FeatureConfiguration>addStructureStart(cfl13.configured(cgn15));
-                }
-            }
-        }
-        final boolean boolean5 = (!((FlatLevelGeneratorSettings)this.settings).isVoidGen() || bkt2 == Biomes.THE_VOID) && map4.containsKey("decoration");
-        if (boolean5) {
-            final List<GenerationStep.Decoration> list6 = Lists.newArrayList();
-            list6.add(GenerationStep.Decoration.UNDERGROUND_STRUCTURES);
-            list6.add(GenerationStep.Decoration.SURFACE_STRUCTURES);
-            for (final GenerationStep.Decoration b10 : GenerationStep.Decoration.values()) {
-                if (!list6.contains(b10)) {
-                    for (final ConfiguredFeature<?, ?> cdc12 : bkt2.getFeaturesForStep(b10)) {
-                        a3.addFeature(b10, cdc12);
-                    }
-                }
-            }
-        }
-        final BlockState[] arr8 = ((FlatLevelGeneratorSettings)this.settings).getLayers();
-        for (int integer7 = 0; integer7 < arr8.length; ++integer7) {
-            final BlockState byj8 = arr8[integer7];
-            if (byj8 != null && !Heightmap.Types.MOTION_BLOCKING.isOpaque().test(byj8)) {
-                ((FlatLevelGeneratorSettings)this.settings).deleteLayer(integer7);
-                a3.addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, Feature.FILL_LAYER.configured(new LayerConfiguration(integer7, byj8)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE)));
-            }
-        }
-        return a3;
+    public FlatLevelSource(final FlatLevelGeneratorSettings cra) {
+        super(new FixedBiomeSource(cra.getBiomeFromSettings()), new FixedBiomeSource(cra.getBiome()), cra.structureSettings(), 0L);
+        this.settings = cra;
     }
     
     @Override
-    public void buildSurfaceAndBedrock(final WorldGenRegion xj, final ChunkAccess bzy) {
+    protected Codec<? extends ChunkGenerator> codec() {
+        return FlatLevelSource.CODEC;
+    }
+    
+    @Override
+    public ChunkGenerator withSeed(final long long1) {
+        return this;
+    }
+    
+    public FlatLevelGeneratorSettings settings() {
+        return this.settings;
+    }
+    
+    @Override
+    public void buildSurfaceAndBedrock(final WorldGenRegion zj, final ChunkAccess cgy) {
     }
     
     @Override
     public int getSpawnHeight() {
-        final ChunkAccess bzy2 = this.level.getChunk(0, 0);
-        return bzy2.getHeight(Heightmap.Types.MOTION_BLOCKING, 8, 8);
+        final BlockState[] arr2 = this.settings.getLayers();
+        for (int integer3 = 0; integer3 < arr2.length; ++integer3) {
+            final BlockState cfj4 = (arr2[integer3] == null) ? Blocks.AIR.defaultBlockState() : arr2[integer3];
+            if (!Heightmap.Types.MOTION_BLOCKING.isOpaque().test(cfj4)) {
+                return integer3 - 1;
+            }
+        }
+        return arr2.length;
     }
     
     @Override
-    protected Biome getCarvingOrDecorationBiome(final BiomeManager bkv, final BlockPos fk) {
-        return this.biomeWrapper;
-    }
-    
-    @Override
-    public void fillFromNoise(final LevelAccessor bjx, final ChunkAccess bzy) {
-        final BlockState[] arr4 = ((FlatLevelGeneratorSettings)this.settings).getLayers();
-        final BlockPos.MutableBlockPos a5 = new BlockPos.MutableBlockPos();
-        final Heightmap cbv6 = bzy.getOrCreateHeightmapUnprimed(Heightmap.Types.OCEAN_FLOOR_WG);
-        final Heightmap cbv7 = bzy.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE_WG);
-        for (int integer8 = 0; integer8 < arr4.length; ++integer8) {
-            final BlockState byj9 = arr4[integer8];
-            if (byj9 != null) {
-                for (int integer9 = 0; integer9 < 16; ++integer9) {
-                    for (int integer10 = 0; integer10 < 16; ++integer10) {
-                        bzy.setBlockState(a5.set(integer9, integer8, integer10), byj9, false);
-                        cbv6.update(integer9, integer8, integer10, byj9);
-                        cbv7.update(integer9, integer8, integer10, byj9);
+    public void fillFromNoise(final LevelAccessor bqc, final StructureFeatureManager bqq, final ChunkAccess cgy) {
+        final BlockState[] arr5 = this.settings.getLayers();
+        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
+        final Heightmap cio7 = cgy.getOrCreateHeightmapUnprimed(Heightmap.Types.OCEAN_FLOOR_WG);
+        final Heightmap cio8 = cgy.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE_WG);
+        for (int integer9 = 0; integer9 < arr5.length; ++integer9) {
+            final BlockState cfj10 = arr5[integer9];
+            if (cfj10 != null) {
+                for (int integer10 = 0; integer10 < 16; ++integer10) {
+                    for (int integer11 = 0; integer11 < 16; ++integer11) {
+                        cgy.setBlockState(a6.set(integer10, integer9, integer11), cfj10, false);
+                        cio7.update(integer10, integer9, integer11, cfj10);
+                        cio8.update(integer10, integer9, integer11, cfj10);
                     }
                 }
             }
@@ -124,11 +78,11 @@ public class FlatLevelSource extends ChunkGenerator<FlatLevelGeneratorSettings>
     
     @Override
     public int getBaseHeight(final int integer1, final int integer2, final Heightmap.Types a) {
-        final BlockState[] arr5 = ((FlatLevelGeneratorSettings)this.settings).getLayers();
+        final BlockState[] arr5 = this.settings.getLayers();
         for (int integer3 = arr5.length - 1; integer3 >= 0; --integer3) {
-            final BlockState byj7 = arr5[integer3];
-            if (byj7 != null) {
-                if (a.isOpaque().test(byj7)) {
+            final BlockState cfj7 = arr5[integer3];
+            if (cfj7 != null) {
+                if (a.isOpaque().test(cfj7)) {
                     return integer3 + 1;
                 }
             }
@@ -137,34 +91,11 @@ public class FlatLevelSource extends ChunkGenerator<FlatLevelGeneratorSettings>
     }
     
     @Override
-    public void tickCustomSpawners(final ServerLevel xd, final boolean boolean2, final boolean boolean3) {
-        this.phantomSpawner.tick(xd, boolean2, boolean3);
-        this.catSpawner.tick(xd, boolean2, boolean3);
+    public BlockGetter getBaseColumn(final int integer1, final int integer2) {
+        return new NoiseColumn(Arrays.<BlockState>stream(this.settings.getLayers()).map(cfj -> (cfj == null) ? Blocks.AIR.defaultBlockState() : cfj).<BlockState>toArray(BlockState[]::new));
     }
     
-    @Override
-    public boolean isBiomeValidStartForStructure(final Biome bkt, final StructureFeature<? extends FeatureConfiguration> cfl) {
-        return this.biomeWrapper.isValidStart(cfl);
-    }
-    
-    @Nullable
-    @Override
-    public <C extends FeatureConfiguration> C getStructureConfiguration(final Biome bkt, final StructureFeature<C> cfl) {
-        return this.biomeWrapper.<C>getStructureConfiguration(cfl);
-    }
-    
-    @Nullable
-    @Override
-    public BlockPos findNearestMapFeature(final Level bjw, final String string, final BlockPos fk, final int integer, final boolean boolean5) {
-        if (!((FlatLevelGeneratorSettings)this.settings).getStructuresOptions().keySet().contains(string.toLowerCase(Locale.ROOT))) {
-            return null;
-        }
-        return super.findNearestMapFeature(bjw, string, fk, integer, boolean5);
-    }
-    
-    class FlatLevelBiomeWrapper extends Biome {
-        protected FlatLevelBiomeWrapper(final ConfiguredSurfaceBuilder<?> cmw, final Precipitation d, final BiomeCategory b, final float float5, final float float6, final float float7, final float float8, final int integer9, final int integer10, @Nullable final String string) {
-            super(new BiomeBuilder().surfaceBuilder(cmw).precipitation(d).biomeCategory(b).depth(float5).scale(float6).temperature(float7).downfall(float8).waterColor(integer9).waterFogColor(integer10).parent(string));
-        }
+    static {
+        CODEC = FlatLevelGeneratorSettings.CODEC.fieldOf("settings").xmap((Function)FlatLevelSource::new, (Function)FlatLevelSource::settings).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/GenerationStep.java b/src/net/minecraft/world/level/levelgen/GenerationStep.java
index b065fbd..9f133c0 100644
--- a/src/net/minecraft/world/level/levelgen/GenerationStep.java
+++ b/src/net/minecraft/world/level/levelgen/GenerationStep.java
@@ -1,21 +1,27 @@
 package net.minecraft.world.level.levelgen;
 
-import java.util.function.Function;
+import javax.annotation.Nullable;
 import java.util.stream.Collectors;
 import java.util.Arrays;
+import java.util.function.Function;
 import java.util.Map;
+import com.mojang.serialization.Codec;
+import net.minecraft.util.StringRepresentable;
 
 public class GenerationStep {
-    public enum Decoration {
+    public enum Decoration implements StringRepresentable {
         RAW_GENERATION("raw_generation"), 
+        LAKES("lakes"), 
         LOCAL_MODIFICATIONS("local_modifications"), 
         UNDERGROUND_STRUCTURES("underground_structures"), 
         SURFACE_STRUCTURES("surface_structures"), 
+        STRONGHOLDS("strongholds"), 
         UNDERGROUND_ORES("underground_ores"), 
         UNDERGROUND_DECORATION("underground_decoration"), 
         VEGETAL_DECORATION("vegetal_decoration"), 
         TOP_LAYER_MODIFICATION("top_layer_modification");
         
+        public static final Codec<Decoration> CODEC;
         private static final Map<String, Decoration> BY_NAME;
         private final String name;
         
@@ -27,15 +33,26 @@ public class GenerationStep {
             return this.name;
         }
         
+        public static Decoration byName(final String string) {
+            return Decoration.BY_NAME.get(string);
+        }
+        
+        @Override
+        public String getSerializedName() {
+            return this.name;
+        }
+        
         static {
+            CODEC = StringRepresentable.<Decoration>fromEnum(Decoration::values, Decoration::byName);
             BY_NAME = Arrays.<Decoration>stream(values()).collect(Collectors.toMap(Decoration::getName, b -> b));
         }
     }
     
-    public enum Carving {
+    public enum Carving implements StringRepresentable {
         AIR("air"), 
         LIQUID("liquid");
         
+        public static final Codec<Carving> CODEC;
         private static final Map<String, Carving> BY_NAME;
         private final String name;
         
@@ -47,7 +64,18 @@ public class GenerationStep {
             return this.name;
         }
         
+        @Nullable
+        public static Carving byName(final String string) {
+            return Carving.BY_NAME.get(string);
+        }
+        
+        @Override
+        public String getSerializedName() {
+            return this.name;
+        }
+        
         static {
+            CODEC = StringRepresentable.<Carving>fromEnum(Carving::values, Carving::byName);
             BY_NAME = Arrays.<Carving>stream(values()).collect(Collectors.toMap(Carving::getName, a -> a));
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/Heightmap.java b/src/net/minecraft/world/level/levelgen/Heightmap.java
index 513e525..6d552ba 100644
--- a/src/net/minecraft/world/level/levelgen/Heightmap.java
+++ b/src/net/minecraft/world/level/levelgen/Heightmap.java
@@ -2,9 +2,13 @@ package net.minecraft.world.level.levelgen;
 
 import net.minecraft.Util;
 import com.google.common.collect.Maps;
+import java.util.function.Function;
 import net.minecraft.world.level.block.LeavesBlock;
 import java.util.HashMap;
+import javax.annotation.Nullable;
 import java.util.Map;
+import com.mojang.serialization.Codec;
+import net.minecraft.util.StringRepresentable;
 import java.util.Iterator;
 import it.unimi.dsi.fastutil.objects.ObjectListIterator;
 import it.unimi.dsi.fastutil.objects.ObjectList;
@@ -24,51 +28,50 @@ public class Heightmap {
     private final Predicate<BlockState> isOpaque;
     private final ChunkAccess chunk;
     
-    public Heightmap(final ChunkAccess bzy, final Types a) {
+    public Heightmap(final ChunkAccess cgy, final Types a) {
         this.data = new BitStorage(9, 256);
         this.isOpaque = a.isOpaque();
-        this.chunk = bzy;
+        this.chunk = cgy;
     }
     
-    public static void primeHeightmaps(final ChunkAccess bzy, final Set<Types> set) {
+    public static void primeHeightmaps(final ChunkAccess cgy, final Set<Types> set) {
         final int integer3 = set.size();
         final ObjectList<Heightmap> objectList4 = (ObjectList<Heightmap>)new ObjectArrayList(integer3);
         final ObjectListIterator<Heightmap> objectListIterator5 = (ObjectListIterator<Heightmap>)objectList4.iterator();
-        final int integer4 = bzy.getHighestSectionPosition() + 16;
-        try (final BlockPos.PooledMutableBlockPos b7 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (int integer5 = 0; integer5 < 16; ++integer5) {
-                for (int integer6 = 0; integer6 < 16; ++integer6) {
-                    for (final Types a12 : set) {
-                        objectList4.add(bzy.getOrCreateHeightmapUnprimed(a12));
-                    }
-                    for (int integer7 = integer4 - 1; integer7 >= 0; --integer7) {
-                        b7.set(integer5, integer7, integer6);
-                        final BlockState byj12 = bzy.getBlockState(b7);
-                        if (byj12.getBlock() != Blocks.AIR) {
-                            while (objectListIterator5.hasNext()) {
-                                final Heightmap cbv13 = (Heightmap)objectListIterator5.next();
-                                if (cbv13.isOpaque.test(byj12)) {
-                                    cbv13.setHeight(integer5, integer6, integer7 + 1);
-                                    objectListIterator5.remove();
-                                }
+        final int integer4 = cgy.getHighestSectionPosition() + 16;
+        final BlockPos.MutableBlockPos a7 = new BlockPos.MutableBlockPos();
+        for (int integer5 = 0; integer5 < 16; ++integer5) {
+            for (int integer6 = 0; integer6 < 16; ++integer6) {
+                for (final Types a8 : set) {
+                    objectList4.add(cgy.getOrCreateHeightmapUnprimed(a8));
+                }
+                for (int integer7 = integer4 - 1; integer7 >= 0; --integer7) {
+                    a7.set(integer5, integer7, integer6);
+                    final BlockState cfj11 = cgy.getBlockState(a7);
+                    if (!cfj11.is(Blocks.AIR)) {
+                        while (objectListIterator5.hasNext()) {
+                            final Heightmap cio12 = (Heightmap)objectListIterator5.next();
+                            if (cio12.isOpaque.test(cfj11)) {
+                                cio12.setHeight(integer5, integer6, integer7 + 1);
+                                objectListIterator5.remove();
                             }
-                            if (objectList4.isEmpty()) {
-                                break;
-                            }
-                            objectListIterator5.back(integer3);
                         }
+                        if (objectList4.isEmpty()) {
+                            break;
+                        }
+                        objectListIterator5.back(integer3);
                     }
                 }
             }
         }
     }
     
-    public boolean update(final int integer1, final int integer2, final int integer3, final BlockState byj) {
+    public boolean update(final int integer1, final int integer2, final int integer3, final BlockState cfj) {
         final int integer4 = this.getFirstAvailable(integer1, integer3);
         if (integer2 <= integer4 - 2) {
             return false;
         }
-        if (this.isOpaque.test(byj)) {
+        if (this.isOpaque.test(cfj)) {
             if (integer2 >= integer4) {
                 this.setHeight(integer1, integer3, integer2 + 1);
                 return true;
@@ -114,8 +117,8 @@ public class Heightmap {
     }
     
     static {
-        NOT_AIR = (byj -> !byj.isAir());
-        MATERIAL_MOTION_BLOCKING = (byj -> byj.getMaterial().blocksMotion());
+        NOT_AIR = (cfj -> !cfj.isAir());
+        MATERIAL_MOTION_BLOCKING = (cfj -> cfj.getMaterial().blocksMotion());
     }
     
     public enum Usage {
@@ -124,14 +127,15 @@ public class Heightmap {
         CLIENT;
     }
     
-    public enum Types {
+    public enum Types implements StringRepresentable {
         WORLD_SURFACE_WG("WORLD_SURFACE_WG", Usage.WORLDGEN, (Predicate<BlockState>)Heightmap.NOT_AIR), 
         WORLD_SURFACE("WORLD_SURFACE", Usage.CLIENT, (Predicate<BlockState>)Heightmap.NOT_AIR), 
         OCEAN_FLOOR_WG("OCEAN_FLOOR_WG", Usage.WORLDGEN, (Predicate<BlockState>)Heightmap.MATERIAL_MOTION_BLOCKING), 
         OCEAN_FLOOR("OCEAN_FLOOR", Usage.LIVE_WORLD, (Predicate<BlockState>)Heightmap.MATERIAL_MOTION_BLOCKING), 
-        MOTION_BLOCKING("MOTION_BLOCKING", Usage.CLIENT, byj -> byj.getMaterial().blocksMotion() || !byj.getFluidState().isEmpty()), 
-        MOTION_BLOCKING_NO_LEAVES("MOTION_BLOCKING_NO_LEAVES", Usage.LIVE_WORLD, byj -> (byj.getMaterial().blocksMotion() || !byj.getFluidState().isEmpty()) && !(byj.getBlock() instanceof LeavesBlock));
+        MOTION_BLOCKING("MOTION_BLOCKING", Usage.CLIENT, cfj -> cfj.getMaterial().blocksMotion() || !cfj.getFluidState().isEmpty()), 
+        MOTION_BLOCKING_NO_LEAVES("MOTION_BLOCKING_NO_LEAVES", Usage.LIVE_WORLD, cfj -> (cfj.getMaterial().blocksMotion() || !cfj.getFluidState().isEmpty()) && !(cfj.getBlock() instanceof LeavesBlock));
         
+        public static final Codec<Types> CODEC;
         private final String serializationKey;
         private final Usage usage;
         private final Predicate<BlockState> isOpaque;
@@ -155,6 +159,7 @@ public class Heightmap {
             return this.usage != Usage.WORLDGEN;
         }
         
+        @Nullable
         public static Types getFromKey(final String string) {
             return Types.REVERSE_LOOKUP.get(string);
         }
@@ -163,7 +168,13 @@ public class Heightmap {
             return this.isOpaque;
         }
         
+        @Override
+        public String getSerializedName() {
+            return this.serializationKey;
+        }
+        
         static {
+            CODEC = StringRepresentable.<Types>fromEnum(Types::values, Types::getFromKey);
             final Types[] array;
             int length;
             int i = 0;
diff --git a/src/net/minecraft/world/level/levelgen/NetherGeneratorSettings.java b/src/net/minecraft/world/level/levelgen/NetherGeneratorSettings.java
deleted file mode 100644
index f1c1115..0000000
--- a/src/net/minecraft/world/level/levelgen/NetherGeneratorSettings.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.minecraft.world.level.levelgen;
-
-public class NetherGeneratorSettings extends ChunkGeneratorSettings {
-    @Override
-    public int getBedrockFloorPosition() {
-        return 0;
-    }
-    
-    @Override
-    public int getBedrockRoofPosition() {
-        return 127;
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/NetherLevelSource.java b/src/net/minecraft/world/level/levelgen/NetherLevelSource.java
deleted file mode 100644
index 8583bb3..0000000
--- a/src/net/minecraft/world/level/levelgen/NetherLevelSource.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package net.minecraft.world.level.levelgen;
-
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.biome.Biome;
-import java.util.List;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.Level;
-
-public class NetherLevelSource extends NoiseBasedChunkGenerator<NetherGeneratorSettings> {
-    private final double[] yOffsets;
-    
-    public NetherLevelSource(final Level bjw, final BiomeSource bkw, final NetherGeneratorSettings cbw) {
-        super(bjw, bkw, 4, 8, 128, cbw, false);
-        this.yOffsets = this.makeYOffsets();
-    }
-    
-    @Override
-    protected void fillNoiseColumn(final double[] arr, final int integer2, final int integer3) {
-        final double double5 = 684.412;
-        final double double6 = 2053.236;
-        final double double7 = 8.555150000000001;
-        final double double8 = 34.2206;
-        final int integer4 = -10;
-        final int integer5 = 3;
-        this.fillNoiseColumn(arr, integer2, integer3, 684.412, 2053.236, 8.555150000000001, 34.2206, 3, -10);
-    }
-    
-    @Override
-    protected double[] getDepthAndScale(final int integer1, final int integer2) {
-        return new double[] { 0.0, 0.0 };
-    }
-    
-    @Override
-    protected double getYOffset(final double double1, final double double2, final int integer) {
-        return this.yOffsets[integer];
-    }
-    
-    private double[] makeYOffsets() {
-        final double[] arr2 = new double[this.getNoiseSizeY()];
-        for (int integer3 = 0; integer3 < this.getNoiseSizeY(); ++integer3) {
-            arr2[integer3] = Math.cos(integer3 * 3.141592653589793 * 6.0 / this.getNoiseSizeY()) * 2.0;
-            double double4 = integer3;
-            if (integer3 > this.getNoiseSizeY() / 2) {
-                double4 = this.getNoiseSizeY() - 1 - integer3;
-            }
-            if (double4 < 4.0) {
-                double4 = 4.0 - double4;
-                final double[] array = arr2;
-                final int n = integer3;
-                array[n] -= double4 * double4 * double4 * 10.0;
-            }
-        }
-        return arr2;
-    }
-    
-    @Override
-    public List<Biome.SpawnerData> getMobsAt(final MobCategory alb, final BlockPos fk) {
-        if (alb == MobCategory.MONSTER) {
-            if (Feature.NETHER_BRIDGE.isInsideFeature(this.level, fk)) {
-                return Feature.NETHER_BRIDGE.getSpecialEnemies();
-            }
-            if (Feature.NETHER_BRIDGE.isInsideBoundingFeature(this.level, fk) && this.level.getBlockState(fk.below()).getBlock() == Blocks.NETHER_BRICKS) {
-                return Feature.NETHER_BRIDGE.getSpecialEnemies();
-            }
-        }
-        return super.getMobsAt(alb, fk);
-    }
-    
-    @Override
-    public int getSpawnHeight() {
-        return this.level.getSeaLevel() + 1;
-    }
-    
-    @Override
-    public int getGenDepth() {
-        return 128;
-    }
-    
-    @Override
-    public int getSeaLevel() {
-        return 32;
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
index 0c02b06..cb8e8e1 100644
--- a/src/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
+++ b/src/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
@@ -1,39 +1,56 @@
 package net.minecraft.world.level.levelgen;
 
 import net.minecraft.Util;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.NaturalSpawner;
+import java.util.List;
+import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import it.unimi.dsi.fastutil.objects.ObjectListIterator;
-import net.minecraft.world.level.levelgen.structure.StructureStart;
-import it.unimi.dsi.fastutil.longs.LongIterator;
 import it.unimi.dsi.fastutil.objects.ObjectList;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.feature.structures.JigsawJunction;
 import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
 import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece;
 import net.minecraft.world.level.levelgen.structure.StructurePiece;
+import net.minecraft.core.SectionPos;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.LevelAccessor;
 import java.util.Iterator;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.ChunkPos;
-import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.server.level.WorldGenRegion;
+import net.minecraft.world.level.NoiseColumn;
+import java.util.function.Predicate;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.TheEndBiomeSource;
 import net.minecraft.world.level.levelgen.synth.ImprovedNoise;
 import net.minecraft.util.Mth;
+import java.util.Random;
 import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise;
+import java.util.stream.IntStream;
 import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.LevelAccessor;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.levelgen.synth.SimplexNoise;
 import net.minecraft.world.level.levelgen.synth.SurfaceNoise;
 import net.minecraft.world.level.levelgen.synth.PerlinNoise;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 
-public abstract class NoiseBasedChunkGenerator<T extends ChunkGeneratorSettings> extends ChunkGenerator<T> {
+public final class NoiseBasedChunkGenerator extends ChunkGenerator {
+    public static final Codec<NoiseBasedChunkGenerator> CODEC;
     private static final float[] BEARD_KERNEL;
+    private static final float[] BIOME_WEIGHTS;
     private static final BlockState AIR;
     private final int chunkHeight;
     private final int chunkWidth;
@@ -45,47 +62,86 @@ public abstract class NoiseBasedChunkGenerator<T extends ChunkGeneratorSettings>
     private final PerlinNoise maxLimitPerlinNoise;
     private final PerlinNoise mainPerlinNoise;
     private final SurfaceNoise surfaceNoise;
+    private final PerlinNoise depthNoise;
+    @Nullable
+    private final SimplexNoise islandNoise;
     protected final BlockState defaultBlock;
     protected final BlockState defaultFluid;
+    private final long seed;
+    protected final NoiseGeneratorSettings settings;
+    private final int height;
     
-    public NoiseBasedChunkGenerator(final LevelAccessor bjx, final BiomeSource bkw, final int integer3, final int integer4, final int integer5, final T cbq, final boolean boolean7) {
-        super(bjx, bkw, cbq);
-        this.chunkHeight = integer4;
-        this.chunkWidth = integer3;
-        this.defaultBlock = cbq.getDefaultBlock();
-        this.defaultFluid = cbq.getDefaultFluid();
+    public NoiseBasedChunkGenerator(final BiomeSource brh, final long long2, final NoiseGeneratorSettings ciq) {
+        this(brh, brh, long2, ciq);
+    }
+    
+    private NoiseBasedChunkGenerator(final BiomeSource brh1, final BiomeSource brh2, final long long3, final NoiseGeneratorSettings ciq) {
+        super(brh1, brh2, ciq.structureSettings(), long3);
+        this.seed = long3;
+        this.settings = ciq;
+        final NoiseSettings cis7 = ciq.noiseSettings();
+        this.height = cis7.height();
+        this.chunkHeight = cis7.noiseSizeVertical() * 4;
+        this.chunkWidth = cis7.noiseSizeHorizontal() * 4;
+        this.defaultBlock = ciq.getDefaultBlock();
+        this.defaultFluid = ciq.getDefaultFluid();
         this.chunkCountX = 16 / this.chunkWidth;
-        this.chunkCountY = integer5 / this.chunkHeight;
+        this.chunkCountY = cis7.height() / this.chunkHeight;
         this.chunkCountZ = 16 / this.chunkWidth;
-        this.random = new WorldgenRandom(this.seed);
-        this.minLimitPerlinNoise = new PerlinNoise(this.random, 15, 0);
-        this.maxLimitPerlinNoise = new PerlinNoise(this.random, 15, 0);
-        this.mainPerlinNoise = new PerlinNoise(this.random, 7, 0);
-        this.surfaceNoise = (boolean7 ? new PerlinSimplexNoise(this.random, 3, 0) : new PerlinNoise(this.random, 3, 0));
+        this.random = new WorldgenRandom(long3);
+        this.minLimitPerlinNoise = new PerlinNoise(this.random, IntStream.rangeClosed(-15, 0));
+        this.maxLimitPerlinNoise = new PerlinNoise(this.random, IntStream.rangeClosed(-15, 0));
+        this.mainPerlinNoise = new PerlinNoise(this.random, IntStream.rangeClosed(-7, 0));
+        this.surfaceNoise = (cis7.useSimplexSurfaceNoise() ? new PerlinSimplexNoise(this.random, IntStream.rangeClosed(-3, 0)) : new PerlinNoise(this.random, IntStream.rangeClosed(-3, 0)));
+        this.random.consumeCount(2620);
+        this.depthNoise = new PerlinNoise(this.random, IntStream.rangeClosed(-15, 0));
+        if (cis7.islandNoiseOverride()) {
+            final WorldgenRandom ciy8 = new WorldgenRandom(long3);
+            ciy8.consumeCount(17292);
+            this.islandNoise = new SimplexNoise(ciy8);
+        }
+        else {
+            this.islandNoise = null;
+        }
+    }
+    
+    @Override
+    protected Codec<? extends ChunkGenerator> codec() {
+        return NoiseBasedChunkGenerator.CODEC;
+    }
+    
+    @Override
+    public ChunkGenerator withSeed(final long long1) {
+        return new NoiseBasedChunkGenerator(this.biomeSource.withSeed(long1), long1, this.settings);
+    }
+    
+    public boolean stable(final long long1, final NoiseGeneratorSettings.Preset a) {
+        return this.seed == long1 && this.settings.stable(a);
     }
     
     private double sampleAndClampNoise(final int integer1, final int integer2, final int integer3, final double double4, final double double5, final double double6, final double double7) {
         double double8 = 0.0;
         double double9 = 0.0;
         double double10 = 0.0;
+        final boolean boolean19 = true;
         double double11 = 1.0;
         for (int integer4 = 0; integer4 < 16; ++integer4) {
             final double double12 = PerlinNoise.wrap(integer1 * double4 * double11);
             final double double13 = PerlinNoise.wrap(integer2 * double5 * double11);
             final double double14 = PerlinNoise.wrap(integer3 * double4 * double11);
             final double double15 = double5 * double11;
-            final ImprovedNoise cnm30 = this.minLimitPerlinNoise.getOctaveNoise(integer4);
-            if (cnm30 != null) {
-                double8 += cnm30.noise(double12, double13, double14, double15, integer2 * double15) / double11;
+            final ImprovedNoise cwc31 = this.minLimitPerlinNoise.getOctaveNoise(integer4);
+            if (cwc31 != null) {
+                double8 += cwc31.noise(double12, double13, double14, double15, integer2 * double15) / double11;
             }
-            final ImprovedNoise cnm31 = this.maxLimitPerlinNoise.getOctaveNoise(integer4);
-            if (cnm31 != null) {
-                double9 += cnm31.noise(double12, double13, double14, double15, integer2 * double15) / double11;
+            final ImprovedNoise cwc32 = this.maxLimitPerlinNoise.getOctaveNoise(integer4);
+            if (cwc32 != null) {
+                double9 += cwc32.noise(double12, double13, double14, double15, integer2 * double15) / double11;
             }
             if (integer4 < 8) {
-                final ImprovedNoise cnm32 = this.mainPerlinNoise.getOctaveNoise(integer4);
-                if (cnm32 != null) {
-                    double10 += cnm32.noise(PerlinNoise.wrap(integer1 * double6 * double11), PerlinNoise.wrap(integer2 * double7 * double11), PerlinNoise.wrap(integer3 * double6 * double11), double7 * double11, integer2 * double7 * double11) / double11;
+                final ImprovedNoise cwc33 = this.mainPerlinNoise.getOctaveNoise(integer4);
+                if (cwc33 != null) {
+                    double10 += cwc33.noise(PerlinNoise.wrap(integer1 * double6 * double11), PerlinNoise.wrap(integer2 * double7 * double11), PerlinNoise.wrap(integer3 * double6 * double11), double7 * double11, integer2 * double7 * double11) / double11;
                 }
             }
             double11 /= 2.0;
@@ -93,132 +149,220 @@ public abstract class NoiseBasedChunkGenerator<T extends ChunkGeneratorSettings>
         return Mth.clampedLerp(double8 / 512.0, double9 / 512.0, (double10 / 10.0 + 1.0) / 2.0);
     }
     
-    protected double[] makeAndFillNoiseColumn(final int integer1, final int integer2) {
+    private double[] makeAndFillNoiseColumn(final int integer1, final int integer2) {
         final double[] arr4 = new double[this.chunkCountY + 1];
         this.fillNoiseColumn(arr4, integer1, integer2);
         return arr4;
     }
     
-    protected void fillNoiseColumn(final double[] arr, final int integer2, final int integer3, final double double4, final double double5, final double double6, final double double7, final int integer8, final int integer9) {
-        final double[] arr2 = this.getDepthAndScale(integer2, integer3);
-        final double double8 = arr2[0];
-        final double double9 = arr2[1];
-        final double double10 = this.getTopSlideStart();
-        final double double11 = this.getBottomSlideStart();
-        for (int integer10 = 0; integer10 < this.getNoiseSizeY(); ++integer10) {
-            double double12 = this.sampleAndClampNoise(integer2, integer10, integer3, double4, double5, double6, double7);
-            double12 -= this.getYOffset(double8, double9, integer10);
-            if (integer10 > double10) {
-                double12 = Mth.clampedLerp(double12, integer9, (integer10 - double10) / integer8);
+    private void fillNoiseColumn(final double[] arr, final int integer2, final int integer3) {
+        final NoiseSettings cis9 = this.settings.noiseSettings();
+        double double5;
+        double double6;
+        if (this.islandNoise != null) {
+            double5 = TheEndBiomeSource.getHeightValue(this.islandNoise, integer2, integer3) - 8.0f;
+            if (double5 > 0.0) {
+                double6 = 0.25;
             }
-            else if (integer10 < double11) {
-                double12 = Mth.clampedLerp(double12, -30.0, (double11 - integer10) / (double11 - 1.0));
+            else {
+                double6 = 1.0;
             }
-            arr[integer10] = double12;
+        }
+        else {
+            float float10 = 0.0f;
+            float float11 = 0.0f;
+            float float12 = 0.0f;
+            final int integer4 = 2;
+            final int integer5 = this.getSeaLevel();
+            final float float13 = this.biomeSource.getNoiseBiome(integer2, integer5, integer3).getDepth();
+            for (int integer6 = -2; integer6 <= 2; ++integer6) {
+                for (int integer7 = -2; integer7 <= 2; ++integer7) {
+                    final Biome bre18 = this.biomeSource.getNoiseBiome(integer2 + integer6, integer5, integer3 + integer7);
+                    final float float14 = bre18.getDepth();
+                    final float float15 = bre18.getScale();
+                    float float16;
+                    float float17;
+                    if (cis9.isAmplified() && float14 > 0.0f) {
+                        float16 = 1.0f + float14 * 2.0f;
+                        float17 = 1.0f + float15 * 4.0f;
+                    }
+                    else {
+                        float16 = float14;
+                        float17 = float15;
+                    }
+                    final float float18 = (float14 > float13) ? 0.5f : 1.0f;
+                    final float float19 = float18 * NoiseBasedChunkGenerator.BIOME_WEIGHTS[integer6 + 2 + (integer7 + 2) * 5] / (float16 + 2.0f);
+                    float10 += float17 * float19;
+                    float11 += float16 * float19;
+                    float12 += float19;
+                }
+            }
+            final float float20 = float11 / float12;
+            final float float21 = float10 / float12;
+            final double double7 = float20 * 0.5f - 0.125f;
+            final double double8 = float21 * 0.9f + 0.1f;
+            double5 = double7 * 0.265625;
+            double6 = 96.0 / double8;
+        }
+        final double double9 = 684.412 * cis9.noiseSamplingSettings().xzScale();
+        final double double10 = 684.412 * cis9.noiseSamplingSettings().yScale();
+        final double double11 = double9 / cis9.noiseSamplingSettings().xzFactor();
+        final double double12 = double10 / cis9.noiseSamplingSettings().yFactor();
+        final double double7 = cis9.topSlideSettings().target();
+        final double double8 = cis9.topSlideSettings().size();
+        final double double13 = cis9.topSlideSettings().offset();
+        final double double14 = cis9.bottomSlideSettings().target();
+        final double double15 = cis9.bottomSlideSettings().size();
+        final double double16 = cis9.bottomSlideSettings().offset();
+        final double double17 = cis9.randomDensityOffset() ? this.getRandomDensity(integer2, integer3) : 0.0;
+        final double double18 = cis9.densityFactor();
+        final double double19 = cis9.densityOffset();
+        for (int integer8 = 0; integer8 <= this.chunkCountY; ++integer8) {
+            double double20 = this.sampleAndClampNoise(integer2, integer8, integer3, double9, double10, double11, double12);
+            final double double21 = 1.0 - integer8 * 2.0 / this.chunkCountY + double17;
+            final double double22 = double21 * double18 + double19;
+            final double double23 = (double22 + double5) * double6;
+            if (double23 > 0.0) {
+                double20 += double23 * 4.0;
+            }
+            else {
+                double20 += double23;
+            }
+            if (double8 > 0.0) {
+                final double double24 = (this.chunkCountY - integer8 - double13) / double8;
+                double20 = Mth.clampedLerp(double7, double20, double24);
+            }
+            if (double15 > 0.0) {
+                final double double24 = (integer8 - double16) / double15;
+                double20 = Mth.clampedLerp(double14, double20, double24);
+            }
+            arr[integer8] = double20;
         }
     }
     
-    protected abstract double[] getDepthAndScale(final int integer1, final int integer2);
-    
-    protected abstract double getYOffset(final double double1, final double double2, final int integer);
-    
-    protected double getTopSlideStart() {
-        return this.getNoiseSizeY() - 4;
-    }
-    
-    protected double getBottomSlideStart() {
-        return 0.0;
+    private double getRandomDensity(final int integer1, final int integer2) {
+        final double double4 = this.depthNoise.getValue(integer1 * 200, 10.0, integer2 * 200, 1.0, 0.0, true);
+        double double5;
+        if (double4 < 0.0) {
+            double5 = -double4 * 0.3;
+        }
+        else {
+            double5 = double4;
+        }
+        final double double6 = double5 * 24.575625 - 2.0;
+        if (double6 < 0.0) {
+            return double6 * 0.009486607142857142;
+        }
+        return Math.min(double6, 1.0) * 0.006640625;
     }
     
     @Override
     public int getBaseHeight(final int integer1, final int integer2, final Heightmap.Types a) {
+        return this.iterateNoiseColumn(integer1, integer2, null, a.isOpaque());
+    }
+    
+    @Override
+    public BlockGetter getBaseColumn(final int integer1, final int integer2) {
+        final BlockState[] arr4 = new BlockState[this.chunkCountY * this.chunkHeight];
+        this.iterateNoiseColumn(integer1, integer2, arr4, null);
+        return new NoiseColumn(arr4);
+    }
+    
+    private int iterateNoiseColumn(final int integer1, final int integer2, @Nullable final BlockState[] arr, @Nullable final Predicate<BlockState> predicate) {
         final int integer3 = Math.floorDiv(integer1, this.chunkWidth);
         final int integer4 = Math.floorDiv(integer2, this.chunkWidth);
         final int integer5 = Math.floorMod(integer1, this.chunkWidth);
         final int integer6 = Math.floorMod(integer2, this.chunkWidth);
-        final double double9 = integer5 / (double)this.chunkWidth;
-        final double double10 = integer6 / (double)this.chunkWidth;
-        final double[][] arr13 = { this.makeAndFillNoiseColumn(integer3, integer4), this.makeAndFillNoiseColumn(integer3, integer4 + 1), this.makeAndFillNoiseColumn(integer3 + 1, integer4), this.makeAndFillNoiseColumn(integer3 + 1, integer4 + 1) };
-        final int integer7 = this.getSeaLevel();
-        for (int integer8 = this.chunkCountY - 1; integer8 >= 0; --integer8) {
-            final double double11 = arr13[0][integer8];
-            final double double12 = arr13[1][integer8];
-            final double double13 = arr13[2][integer8];
-            final double double14 = arr13[3][integer8];
-            final double double15 = arr13[0][integer8 + 1];
-            final double double16 = arr13[1][integer8 + 1];
-            final double double17 = arr13[2][integer8 + 1];
-            final double double18 = arr13[3][integer8 + 1];
-            for (int integer9 = this.chunkHeight - 1; integer9 >= 0; --integer9) {
-                final double double19 = integer9 / (double)this.chunkHeight;
-                final double double20 = Mth.lerp3(double19, double9, double10, double11, double15, double13, double17, double12, double16, double14, double18);
-                final int integer10 = integer8 * this.chunkHeight + integer9;
-                if (double20 > 0.0 || integer10 < integer7) {
-                    BlockState byj38;
-                    if (double20 > 0.0) {
-                        byj38 = this.defaultBlock;
-                    }
-                    else {
-                        byj38 = this.defaultFluid;
-                    }
-                    if (a.isOpaque().test(byj38)) {
-                        return integer10 + 1;
-                    }
+        final double double10 = integer5 / (double)this.chunkWidth;
+        final double double11 = integer6 / (double)this.chunkWidth;
+        final double[][] arr2 = { this.makeAndFillNoiseColumn(integer3, integer4), this.makeAndFillNoiseColumn(integer3, integer4 + 1), this.makeAndFillNoiseColumn(integer3 + 1, integer4), this.makeAndFillNoiseColumn(integer3 + 1, integer4 + 1) };
+        for (int integer7 = this.chunkCountY - 1; integer7 >= 0; --integer7) {
+            final double double12 = arr2[0][integer7];
+            final double double13 = arr2[1][integer7];
+            final double double14 = arr2[2][integer7];
+            final double double15 = arr2[3][integer7];
+            final double double16 = arr2[0][integer7 + 1];
+            final double double17 = arr2[1][integer7 + 1];
+            final double double18 = arr2[2][integer7 + 1];
+            final double double19 = arr2[3][integer7 + 1];
+            for (int integer8 = this.chunkHeight - 1; integer8 >= 0; --integer8) {
+                final double double20 = integer8 / (double)this.chunkHeight;
+                final double double21 = Mth.lerp3(double20, double10, double11, double12, double16, double14, double18, double13, double17, double15, double19);
+                final int integer9 = integer7 * this.chunkHeight + integer8;
+                final BlockState cfj38 = this.generateBaseState(double21, integer9);
+                if (arr != null) {
+                    arr[integer9] = cfj38;
+                }
+                if (predicate != null && predicate.test(cfj38)) {
+                    return integer9 + 1;
                 }
             }
         }
         return 0;
     }
     
-    protected abstract void fillNoiseColumn(final double[] arr, final int integer2, final int integer3);
-    
-    public int getNoiseSizeY() {
-        return this.chunkCountY + 1;
+    protected BlockState generateBaseState(final double double1, final int integer) {
+        BlockState cfj5;
+        if (double1 > 0.0) {
+            cfj5 = this.defaultBlock;
+        }
+        else if (integer < this.getSeaLevel()) {
+            cfj5 = this.defaultFluid;
+        }
+        else {
+            cfj5 = NoiseBasedChunkGenerator.AIR;
+        }
+        return cfj5;
     }
     
     @Override
-    public void buildSurfaceAndBedrock(final WorldGenRegion xj, final ChunkAccess bzy) {
-        final ChunkPos bjh4 = bzy.getPos();
-        final int integer5 = bjh4.x;
-        final int integer6 = bjh4.z;
-        final WorldgenRandom ccf7 = new WorldgenRandom();
-        ccf7.setBaseChunkSeed(integer5, integer6);
-        final ChunkPos bjh5 = bzy.getPos();
-        final int integer7 = bjh5.getMinBlockX();
-        final int integer8 = bjh5.getMinBlockZ();
+    public void buildSurfaceAndBedrock(final WorldGenRegion zj, final ChunkAccess cgy) {
+        final ChunkPos bph4 = cgy.getPos();
+        final int integer5 = bph4.x;
+        final int integer6 = bph4.z;
+        final WorldgenRandom ciy7 = new WorldgenRandom();
+        ciy7.setBaseChunkSeed(integer5, integer6);
+        final ChunkPos bph5 = cgy.getPos();
+        final int integer7 = bph5.getMinBlockX();
+        final int integer8 = bph5.getMinBlockZ();
         final double double11 = 0.0625;
         final BlockPos.MutableBlockPos a13 = new BlockPos.MutableBlockPos();
         for (int integer9 = 0; integer9 < 16; ++integer9) {
             for (int integer10 = 0; integer10 < 16; ++integer10) {
                 final int integer11 = integer7 + integer9;
                 final int integer12 = integer8 + integer10;
-                final int integer13 = bzy.getHeight(Heightmap.Types.WORLD_SURFACE_WG, integer9, integer10) + 1;
+                final int integer13 = cgy.getHeight(Heightmap.Types.WORLD_SURFACE_WG, integer9, integer10) + 1;
                 final double double12 = this.surfaceNoise.getSurfaceNoiseValue(integer11 * 0.0625, integer12 * 0.0625, 0.0625, integer9 * 0.0625) * 15.0;
-                xj.getBiome(a13.set(integer7 + integer9, integer13, integer8 + integer10)).buildSurfaceAt(ccf7, bzy, integer11, integer12, integer13, double12, this.getSettings().getDefaultBlock(), this.getSettings().getDefaultFluid(), this.getSeaLevel(), this.level.getSeed());
+                zj.getBiome(a13.set(integer7 + integer9, integer13, integer8 + integer10)).buildSurfaceAt(ciy7, cgy, integer11, integer12, integer13, double12, this.defaultBlock, this.defaultFluid, this.getSeaLevel(), zj.getSeed());
             }
         }
-        this.setBedrock(bzy, ccf7);
+        this.setBedrock(cgy, ciy7);
     }
     
-    protected void setBedrock(final ChunkAccess bzy, final Random random) {
+    private void setBedrock(final ChunkAccess cgy, final Random random) {
         final BlockPos.MutableBlockPos a4 = new BlockPos.MutableBlockPos();
-        final int integer5 = bzy.getPos().getMinBlockX();
-        final int integer6 = bzy.getPos().getMinBlockZ();
-        final T cbq7 = this.getSettings();
-        final int integer7 = cbq7.getBedrockFloorPosition();
-        final int integer8 = cbq7.getBedrockRoofPosition();
-        for (final BlockPos fk11 : BlockPos.betweenClosed(integer5, 0, integer6, integer5 + 15, 0, integer6 + 15)) {
-            if (integer8 > 0) {
-                for (int integer9 = integer8; integer9 >= integer8 - 4; --integer9) {
-                    if (integer9 >= integer8 - random.nextInt(5)) {
-                        bzy.setBlockState(a4.set(fk11.getX(), integer9, fk11.getZ()), Blocks.BEDROCK.defaultBlockState(), false);
+        final int integer5 = cgy.getPos().getMinBlockX();
+        final int integer6 = cgy.getPos().getMinBlockZ();
+        final int integer7 = this.settings.getBedrockFloorPosition();
+        final int integer8 = this.height - 1 - this.settings.getBedrockRoofPosition();
+        final int integer9 = 5;
+        final boolean boolean10 = integer8 + 4 >= 0 && integer8 < this.height;
+        final boolean boolean11 = integer7 + 4 >= 0 && integer7 < this.height;
+        if (!boolean10 && !boolean11) {
+            return;
+        }
+        for (final BlockPos fu13 : BlockPos.betweenClosed(integer5, 0, integer6, integer5 + 15, 0, integer6 + 15)) {
+            if (boolean10) {
+                for (int integer10 = 0; integer10 < 5; ++integer10) {
+                    if (integer10 <= random.nextInt(5)) {
+                        cgy.setBlockState(a4.set(fu13.getX(), integer8 - integer10, fu13.getZ()), Blocks.BEDROCK.defaultBlockState(), false);
                     }
                 }
             }
-            if (integer7 < 256) {
-                for (int integer9 = integer7 + 4; integer9 >= integer7; --integer9) {
-                    if (integer9 <= integer7 + random.nextInt(5)) {
-                        bzy.setBlockState(a4.set(fk11.getX(), integer9, fk11.getZ()), Blocks.BEDROCK.defaultBlockState(), false);
+            if (boolean11) {
+                for (int integer10 = 4; integer10 >= 0; --integer10) {
+                    if (integer10 <= random.nextInt(5)) {
+                        cgy.setBlockState(a4.set(fu13.getX(), integer7 + integer10, fu13.getZ()), Blocks.BEDROCK.defaultBlockState(), false);
                     }
                 }
             }
@@ -226,148 +370,149 @@ public abstract class NoiseBasedChunkGenerator<T extends ChunkGeneratorSettings>
     }
     
     @Override
-    public void fillFromNoise(final LevelAccessor bjx, final ChunkAccess bzy) {
-        final int integer4 = this.getSeaLevel();
-        final ObjectList<PoolElementStructurePiece> objectList5 = (ObjectList<PoolElementStructurePiece>)new ObjectArrayList(10);
+    public void fillFromNoise(final LevelAccessor bqc, final StructureFeatureManager bqq, final ChunkAccess cgy) {
+        final ObjectList<StructurePiece> objectList5 = (ObjectList<StructurePiece>)new ObjectArrayList(10);
         final ObjectList<JigsawJunction> objectList6 = (ObjectList<JigsawJunction>)new ObjectArrayList(32);
-        final ChunkPos bjh7 = bzy.getPos();
-        final int integer5 = bjh7.x;
-        final int integer6 = bjh7.z;
-        final int integer7 = integer5 << 4;
-        final int integer8 = integer6 << 4;
-        for (final StructureFeature<?> cfl13 : Feature.NOISE_AFFECTING_FEATURES) {
-            final String string14 = cfl13.getFeatureName();
-            final LongIterator longIterator15 = bzy.getReferencesForFeature(string14).iterator();
-            while (longIterator15.hasNext()) {
-                final long long16 = longIterator15.nextLong();
-                final ChunkPos bjh8 = new ChunkPos(long16);
-                final ChunkAccess bzy2 = bjx.getChunk(bjh8.x, bjh8.z);
-                final StructureStart clv20 = bzy2.getStartForFeature(string14);
-                if (clv20 != null) {
-                    if (!clv20.isValid()) {
+        final ChunkPos bph7 = cgy.getPos();
+        final int integer8 = bph7.x;
+        final int integer9 = bph7.z;
+        final int integer10 = integer8 << 4;
+        final int integer11 = integer9 << 4;
+        for (final StructureFeature<?> cml13 : StructureFeature.NOISE_AFFECTING_FEATURES) {
+            final Iterator<StructurePiece> iterator2;
+            StructurePiece cty8;
+            final ChunkPos bph8;
+            PoolElementStructurePiece cts9;
+            StructureTemplatePool.Projection a10;
+            final ObjectList list;
+            final Iterator<JigsawJunction> iterator3;
+            JigsawJunction cpy12;
+            int integer12;
+            int integer13;
+            final int n;
+            final int n2;
+            final ObjectList list2;
+            bqq.startsForFeature(SectionPos.of(bph7, 0), cml13).forEach(ctz -> {
+                ctz.getPieces().iterator();
+                while (iterator2.hasNext()) {
+                    cty8 = iterator2.next();
+                    if (!cty8.isCloseToChunk(bph8, 12)) {
                         continue;
                     }
-                    for (final StructurePiece clu22 : clv20.getPieces()) {
-                        if (!clu22.isCloseToChunk(bjh7, 12)) {
-                            continue;
+                    else if (cty8 instanceof PoolElementStructurePiece) {
+                        cts9 = (PoolElementStructurePiece)cty8;
+                        a10 = cts9.getElement().getProjection();
+                        if (a10 == StructureTemplatePool.Projection.RIGID) {
+                            list.add(cts9);
                         }
-                        if (!(clu22 instanceof PoolElementStructurePiece)) {
-                            continue;
-                        }
-                        final PoolElementStructurePiece clo23 = (PoolElementStructurePiece)clu22;
-                        final StructureTemplatePool.Projection a24 = clo23.getElement().getProjection();
-                        if (a24 == StructureTemplatePool.Projection.RIGID) {
-                            objectList5.add(clo23);
-                        }
-                        for (final JigsawJunction cig26 : clo23.getJunctions()) {
-                            final int integer9 = cig26.getSourceX();
-                            final int integer10 = cig26.getSourceZ();
-                            if (integer9 > integer7 - 12 && integer10 > integer8 - 12 && integer9 < integer7 + 15 + 12) {
-                                if (integer10 >= integer8 + 15 + 12) {
+                        cts9.getJunctions().iterator();
+                        while (iterator3.hasNext()) {
+                            cpy12 = iterator3.next();
+                            integer12 = cpy12.getSourceX();
+                            integer13 = cpy12.getSourceZ();
+                            if (integer12 > n - 12 && integer13 > n2 - 12 && integer12 < n + 15 + 12) {
+                                if (integer13 >= n2 + 15 + 12) {
                                     continue;
                                 }
-                                objectList6.add(cig26);
+                                else {
+                                    list2.add(cpy12);
+                                }
                             }
                         }
                     }
+                    else {
+                        list.add(cty8);
+                    }
                 }
-            }
+                return;
+            });
         }
         final double[][][] arr12 = new double[2][this.chunkCountZ + 1][this.chunkCountY + 1];
-        for (int integer11 = 0; integer11 < this.chunkCountZ + 1; ++integer11) {
-            this.fillNoiseColumn(arr12[0][integer11] = new double[this.chunkCountY + 1], integer5 * this.chunkCountX, integer6 * this.chunkCountZ + integer11);
-            arr12[1][integer11] = new double[this.chunkCountY + 1];
+        for (int integer14 = 0; integer14 < this.chunkCountZ + 1; ++integer14) {
+            this.fillNoiseColumn(arr12[0][integer14] = new double[this.chunkCountY + 1], integer8 * this.chunkCountX, integer9 * this.chunkCountZ + integer14);
+            arr12[1][integer14] = new double[this.chunkCountY + 1];
         }
-        final ProtoChunk cat13 = (ProtoChunk)bzy;
-        final Heightmap cbv14 = cat13.getOrCreateHeightmapUnprimed(Heightmap.Types.OCEAN_FLOOR_WG);
-        final Heightmap cbv15 = cat13.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE_WG);
-        final BlockPos.MutableBlockPos a25 = new BlockPos.MutableBlockPos();
-        final ObjectListIterator<PoolElementStructurePiece> objectListIterator17 = (ObjectListIterator<PoolElementStructurePiece>)objectList5.iterator();
+        final ProtoChunk chr13 = (ProtoChunk)cgy;
+        final Heightmap cio14 = chr13.getOrCreateHeightmapUnprimed(Heightmap.Types.OCEAN_FLOOR_WG);
+        final Heightmap cio15 = chr13.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE_WG);
+        final BlockPos.MutableBlockPos a11 = new BlockPos.MutableBlockPos();
+        final ObjectListIterator<StructurePiece> objectListIterator17 = (ObjectListIterator<StructurePiece>)objectList5.iterator();
         final ObjectListIterator<JigsawJunction> objectListIterator18 = (ObjectListIterator<JigsawJunction>)objectList6.iterator();
-        for (int integer12 = 0; integer12 < this.chunkCountX; ++integer12) {
-            for (int integer13 = 0; integer13 < this.chunkCountZ + 1; ++integer13) {
-                this.fillNoiseColumn(arr12[1][integer13], integer5 * this.chunkCountX + integer12 + 1, integer6 * this.chunkCountZ + integer13);
+        for (int integer15 = 0; integer15 < this.chunkCountX; ++integer15) {
+            for (int integer16 = 0; integer16 < this.chunkCountZ + 1; ++integer16) {
+                this.fillNoiseColumn(arr12[1][integer16], integer8 * this.chunkCountX + integer15 + 1, integer9 * this.chunkCountZ + integer16);
             }
-            for (int integer13 = 0; integer13 < this.chunkCountZ; ++integer13) {
-                LevelChunkSection cam21 = cat13.getOrCreateSection(15);
-                cam21.acquire();
-                for (int integer14 = this.chunkCountY - 1; integer14 >= 0; --integer14) {
-                    final double double23 = arr12[0][integer13][integer14];
-                    final double double24 = arr12[0][integer13 + 1][integer14];
-                    final double double25 = arr12[1][integer13][integer14];
-                    final double double26 = arr12[1][integer13 + 1][integer14];
-                    final double double27 = arr12[0][integer13][integer14 + 1];
-                    final double double28 = arr12[0][integer13 + 1][integer14 + 1];
-                    final double double29 = arr12[1][integer13][integer14 + 1];
-                    final double double30 = arr12[1][integer13 + 1][integer14 + 1];
-                    for (int integer15 = this.chunkHeight - 1; integer15 >= 0; --integer15) {
-                        final int integer16 = integer14 * this.chunkHeight + integer15;
-                        final int integer17 = integer16 & 0xF;
-                        final int integer18 = integer16 >> 4;
-                        if (cam21.bottomBlockY() >> 4 != integer18) {
-                            cam21.release();
-                            cam21 = cat13.getOrCreateSection(integer18);
-                            cam21.acquire();
+            for (int integer16 = 0; integer16 < this.chunkCountZ; ++integer16) {
+                LevelChunkSection chk21 = chr13.getOrCreateSection(15);
+                chk21.acquire();
+                for (int integer17 = this.chunkCountY - 1; integer17 >= 0; --integer17) {
+                    final double double23 = arr12[0][integer16][integer17];
+                    final double double24 = arr12[0][integer16 + 1][integer17];
+                    final double double25 = arr12[1][integer16][integer17];
+                    final double double26 = arr12[1][integer16 + 1][integer17];
+                    final double double27 = arr12[0][integer16][integer17 + 1];
+                    final double double28 = arr12[0][integer16 + 1][integer17 + 1];
+                    final double double29 = arr12[1][integer16][integer17 + 1];
+                    final double double30 = arr12[1][integer16 + 1][integer17 + 1];
+                    for (int integer18 = this.chunkHeight - 1; integer18 >= 0; --integer18) {
+                        final int integer19 = integer17 * this.chunkHeight + integer18;
+                        final int integer20 = integer19 & 0xF;
+                        final int integer21 = integer19 >> 4;
+                        if (chk21.bottomBlockY() >> 4 != integer21) {
+                            chk21.release();
+                            chk21 = chr13.getOrCreateSection(integer21);
+                            chk21.acquire();
                         }
-                        final double double31 = integer15 / (double)this.chunkHeight;
+                        final double double31 = integer18 / (double)this.chunkHeight;
                         final double double32 = Mth.lerp(double31, double23, double27);
                         final double double33 = Mth.lerp(double31, double25, double29);
                         final double double34 = Mth.lerp(double31, double24, double28);
                         final double double35 = Mth.lerp(double31, double26, double30);
-                        for (int integer19 = 0; integer19 < this.chunkWidth; ++integer19) {
-                            final int integer20 = integer7 + integer12 * this.chunkWidth + integer19;
-                            final int integer21 = integer20 & 0xF;
-                            final double double36 = integer19 / (double)this.chunkWidth;
+                        for (int integer22 = 0; integer22 < this.chunkWidth; ++integer22) {
+                            final int integer23 = integer10 + integer15 * this.chunkWidth + integer22;
+                            final int integer24 = integer23 & 0xF;
+                            final double double36 = integer22 / (double)this.chunkWidth;
                             final double double37 = Mth.lerp(double36, double32, double33);
                             final double double38 = Mth.lerp(double36, double34, double35);
-                            for (int integer22 = 0; integer22 < this.chunkWidth; ++integer22) {
-                                final int integer23 = integer8 + integer13 * this.chunkWidth + integer22;
-                                final int integer24 = integer23 & 0xF;
-                                final double double39 = integer22 / (double)this.chunkWidth;
+                            for (int integer25 = 0; integer25 < this.chunkWidth; ++integer25) {
+                                final int integer26 = integer11 + integer16 * this.chunkWidth + integer25;
+                                final int integer27 = integer26 & 0xF;
+                                final double double39 = integer25 / (double)this.chunkWidth;
                                 final double double40 = Mth.lerp(double39, double37, double38);
                                 double double41 = Mth.clamp(double40 / 200.0, -1.0, 1.0);
                                 double41 = double41 / 2.0 - double41 * double41 * double41 / 24.0;
                                 while (objectListIterator17.hasNext()) {
-                                    final PoolElementStructurePiece clo24 = (PoolElementStructurePiece)objectListIterator17.next();
-                                    final BoundingBox clb72 = clo24.getBoundingBox();
-                                    final int integer25 = Math.max(0, Math.max(clb72.x0 - integer20, integer20 - clb72.x1));
-                                    final int integer26 = integer16 - (clb72.y0 + clo24.getGroundLevelDelta());
-                                    final int integer27 = Math.max(0, Math.max(clb72.z0 - integer23, integer23 - clb72.z1));
-                                    double41 += getContribution(integer25, integer26, integer27) * 0.8;
+                                    final StructurePiece cty9 = (StructurePiece)objectListIterator17.next();
+                                    final BoundingBox ctd72 = cty9.getBoundingBox();
+                                    final int integer28 = Math.max(0, Math.max(ctd72.x0 - integer23, integer23 - ctd72.x1));
+                                    final int integer29 = integer19 - (ctd72.y0 + ((cty9 instanceof PoolElementStructurePiece) ? ((PoolElementStructurePiece)cty9).getGroundLevelDelta() : 0));
+                                    final int integer30 = Math.max(0, Math.max(ctd72.z0 - integer26, integer26 - ctd72.z1));
+                                    double41 += getContribution(integer28, integer29, integer30) * 0.8;
                                 }
                                 objectListIterator17.back(objectList5.size());
                                 while (objectListIterator18.hasNext()) {
-                                    final JigsawJunction cig27 = (JigsawJunction)objectListIterator18.next();
-                                    final int integer28 = integer20 - cig27.getSourceX();
-                                    final int integer25 = integer16 - cig27.getSourceGroundY();
-                                    final int integer26 = integer23 - cig27.getSourceZ();
-                                    double41 += getContribution(integer28, integer25, integer26) * 0.4;
+                                    final JigsawJunction cpy13 = (JigsawJunction)objectListIterator18.next();
+                                    final int integer31 = integer23 - cpy13.getSourceX();
+                                    final int integer28 = integer19 - cpy13.getSourceGroundY();
+                                    final int integer29 = integer26 - cpy13.getSourceZ();
+                                    double41 += getContribution(integer31, integer28, integer29) * 0.4;
                                 }
                                 objectListIterator18.back(objectList6.size());
-                                BlockState byj71;
-                                if (double41 > 0.0) {
-                                    byj71 = this.defaultBlock;
-                                }
-                                else if (integer16 < integer4) {
-                                    byj71 = this.defaultFluid;
-                                }
-                                else {
-                                    byj71 = NoiseBasedChunkGenerator.AIR;
-                                }
-                                if (byj71 != NoiseBasedChunkGenerator.AIR) {
-                                    if (byj71.getLightEmission() != 0) {
-                                        a25.set(integer20, integer16, integer23);
-                                        cat13.addLight(a25);
+                                final BlockState cfj71 = this.generateBaseState(double41, integer19);
+                                if (cfj71 != NoiseBasedChunkGenerator.AIR) {
+                                    if (cfj71.getLightEmission() != 0) {
+                                        a11.set(integer23, integer19, integer26);
+                                        chr13.addLight(a11);
                                     }
-                                    cam21.setBlockState(integer21, integer17, integer24, byj71, false);
-                                    cbv14.update(integer21, integer16, integer24, byj71);
-                                    cbv15.update(integer21, integer16, integer24, byj71);
+                                    chk21.setBlockState(integer24, integer20, integer27, cfj71, false);
+                                    cio14.update(integer24, integer19, integer27, cfj71);
+                                    cio15.update(integer24, integer19, integer27, cfj71);
                                 }
                             }
                         }
                     }
                 }
-                cam21.release();
+                chk21.release();
             }
             final double[][] arr13 = arr12[0];
             arr12[0] = arr12[1];
@@ -400,7 +545,55 @@ public abstract class NoiseBasedChunkGenerator<T extends ChunkGeneratorSettings>
         return double8 * double7;
     }
     
+    @Override
+    public int getGenDepth() {
+        return this.height;
+    }
+    
+    @Override
+    public int getSeaLevel() {
+        return this.settings.seaLevel();
+    }
+    
+    @Override
+    public List<Biome.SpawnerData> getMobsAt(final Biome bre, final StructureFeatureManager bqq, final MobCategory apa, final BlockPos fu) {
+        if (bqq.getStructureAt(fu, true, StructureFeature.SWAMP_HUT).isValid()) {
+            if (apa == MobCategory.MONSTER) {
+                return StructureFeature.SWAMP_HUT.getSpecialEnemies();
+            }
+            if (apa == MobCategory.CREATURE) {
+                return StructureFeature.SWAMP_HUT.getSpecialAnimals();
+            }
+        }
+        if (apa == MobCategory.MONSTER) {
+            if (bqq.getStructureAt(fu, false, StructureFeature.PILLAGER_OUTPOST).isValid()) {
+                return StructureFeature.PILLAGER_OUTPOST.getSpecialEnemies();
+            }
+            if (bqq.getStructureAt(fu, false, StructureFeature.OCEAN_MONUMENT).isValid()) {
+                return StructureFeature.OCEAN_MONUMENT.getSpecialEnemies();
+            }
+            if (bqq.getStructureAt(fu, true, StructureFeature.NETHER_BRIDGE).isValid()) {
+                return StructureFeature.NETHER_BRIDGE.getSpecialEnemies();
+            }
+        }
+        return super.getMobsAt(bre, bqq, apa, fu);
+    }
+    
+    @Override
+    public void spawnOriginalMobs(final WorldGenRegion zj) {
+        if (this.settings.disableMobGeneration()) {
+            return;
+        }
+        final int integer3 = zj.getCenterX();
+        final int integer4 = zj.getCenterZ();
+        final Biome bre5 = zj.getBiome(new ChunkPos(integer3, integer4).getWorldPosition());
+        final WorldgenRandom ciy6 = new WorldgenRandom();
+        ciy6.setDecorationSeed(zj.getSeed(), integer3 << 4, integer4 << 4);
+        NaturalSpawner.spawnMobsForChunkGeneration(zj, bre5, integer3, integer4, ciy6);
+    }
+    
     static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BiomeSource.CODEC.fieldOf("biome_source").forGetter(cip -> cip.biomeSource), (App)Codec.LONG.fieldOf("seed").stable().forGetter(cip -> cip.seed), (App)NoiseGeneratorSettings.CODEC.fieldOf("settings").forGetter(cip -> cip.settings)).apply(instance, ((RecordCodecBuilder.Instance)instance).stable(NoiseBasedChunkGenerator::new)));
         int integer2;
         int integer3;
         int integer4;
@@ -414,6 +607,18 @@ public abstract class NoiseBasedChunkGenerator<T extends ChunkGeneratorSettings>
             }
             return;
         });
+        int integer5;
+        int integer6;
+        float float4;
+        BIOME_WEIGHTS = Util.<float[]>make(new float[25], arr -> {
+            for (integer5 = -2; integer5 <= 2; ++integer5) {
+                for (integer6 = -2; integer6 <= 2; ++integer6) {
+                    float4 = 10.0f / Mth.sqrt(integer5 * integer5 + integer6 * integer6 + 0.2f);
+                    arr[integer5 + 2 + (integer6 + 2) * 5] = float4;
+                }
+            }
+            return;
+        });
         AIR = Blocks.AIR.defaultBlockState();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/NoiseGeneratorSettings.java b/src/net/minecraft/world/level/levelgen/NoiseGeneratorSettings.java
new file mode 100644
index 0000000..e8a2db1
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/NoiseGeneratorSettings.java
@@ -0,0 +1,145 @@
+package net.minecraft.world.level.levelgen;
+
+import com.mojang.serialization.DataResult;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.feature.configurations.StrongholdConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import com.google.common.collect.Maps;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Map;
+import com.mojang.datafixers.kinds.Applicative;
+import net.minecraft.util.Codecs;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.function.Function;
+import com.mojang.datafixers.util.Either;
+import java.util.Objects;
+import java.util.Optional;
+import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
+
+public final class NoiseGeneratorSettings {
+    public static final Codec<NoiseGeneratorSettings> DIRECT_CODEC;
+    public static final Codec<NoiseGeneratorSettings> CODEC;
+    private final StructureSettings structureSettings;
+    private final NoiseSettings noiseSettings;
+    private final BlockState defaultBlock;
+    private final BlockState defaultFluid;
+    private final int bedrockRoofPosition;
+    private final int bedrockFloorPosition;
+    private final int seaLevel;
+    private final boolean disableMobGeneration;
+    private final Optional<Preset> preset;
+    
+    private NoiseGeneratorSettings(final StructureSettings ciw, final NoiseSettings cis, final BlockState cfj3, final BlockState cfj4, final int integer5, final int integer6, final int integer7, final boolean boolean8) {
+        this(ciw, cis, cfj3, cfj4, integer5, integer6, integer7, boolean8, Optional.<Preset>empty());
+    }
+    
+    private NoiseGeneratorSettings(final StructureSettings ciw, final NoiseSettings cis, final BlockState cfj3, final BlockState cfj4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final Optional<Preset> optional) {
+        this.structureSettings = ciw;
+        this.noiseSettings = cis;
+        this.defaultBlock = cfj3;
+        this.defaultFluid = cfj4;
+        this.bedrockRoofPosition = integer5;
+        this.bedrockFloorPosition = integer6;
+        this.seaLevel = integer7;
+        this.disableMobGeneration = boolean8;
+        this.preset = optional;
+    }
+    
+    public StructureSettings structureSettings() {
+        return this.structureSettings;
+    }
+    
+    public NoiseSettings noiseSettings() {
+        return this.noiseSettings;
+    }
+    
+    public BlockState getDefaultBlock() {
+        return this.defaultBlock;
+    }
+    
+    public BlockState getDefaultFluid() {
+        return this.defaultFluid;
+    }
+    
+    public int getBedrockRoofPosition() {
+        return this.bedrockRoofPosition;
+    }
+    
+    public int getBedrockFloorPosition() {
+        return this.bedrockFloorPosition;
+    }
+    
+    public int seaLevel() {
+        return this.seaLevel;
+    }
+    
+    @Deprecated
+    protected boolean disableMobGeneration() {
+        return this.disableMobGeneration;
+    }
+    
+    public boolean stable(final Preset a) {
+        return Objects.equals(this.preset, Optional.<Preset>of(a));
+    }
+    
+    static {
+        DIRECT_CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)StructureSettings.CODEC.fieldOf("structures").forGetter((Function)NoiseGeneratorSettings::structureSettings), (App)NoiseSettings.CODEC.fieldOf("noise").forGetter((Function)NoiseGeneratorSettings::noiseSettings), (App)BlockState.CODEC.fieldOf("default_block").forGetter((Function)NoiseGeneratorSettings::getDefaultBlock), (App)BlockState.CODEC.fieldOf("default_fluid").forGetter((Function)NoiseGeneratorSettings::getDefaultFluid), (App)Codecs.intRange(-20, 276).fieldOf("bedrock_roof_position").forGetter((Function)NoiseGeneratorSettings::getBedrockRoofPosition), (App)Codecs.intRange(-20, 276).fieldOf("bedrock_floor_position").forGetter((Function)NoiseGeneratorSettings::getBedrockFloorPosition), (App)Codecs.intRange(0, 255).fieldOf("sea_level").forGetter((Function)NoiseGeneratorSettings::seaLevel), (App)Codec.BOOL.fieldOf("disable_mob_generation").forGetter((Function)NoiseGeneratorSettings::disableMobGeneration)).apply(instance, NoiseGeneratorSettings::new));
+        CODEC = Codec.either((Codec)Preset.CODEC, (Codec)NoiseGeneratorSettings.DIRECT_CODEC).xmap(either -> (NoiseGeneratorSettings)either.map((Function)Preset::settings, (Function)Function.identity()), ciq -> ciq.preset.map(Either::left).orElseGet(() -> Either.right(ciq)));
+    }
+    
+    public static class Preset {
+        private static final Map<ResourceLocation, Preset> BY_NAME;
+        public static final Codec<Preset> CODEC;
+        public static final Preset OVERWORLD;
+        public static final Preset AMPLIFIED;
+        public static final Preset NETHER;
+        public static final Preset END;
+        public static final Preset CAVES;
+        public static final Preset FLOATING_ISLANDS;
+        private final Component description;
+        private final ResourceLocation name;
+        private final NoiseGeneratorSettings settings;
+        
+        public Preset(final String string, final Function<Preset, NoiseGeneratorSettings> function) {
+            this.name = new ResourceLocation(string);
+            this.description = new TranslatableComponent("generator.noise." + string);
+            this.settings = function.apply(this);
+            Preset.BY_NAME.put(this.name, this);
+        }
+        
+        public NoiseGeneratorSettings settings() {
+            return this.settings;
+        }
+        
+        private static NoiseGeneratorSettings end(final StructureSettings ciw, final BlockState cfj2, final BlockState cfj3, final Preset a, final boolean boolean5, final boolean boolean6) {
+            return new NoiseGeneratorSettings(ciw, new NoiseSettings(128, new NoiseSamplingSettings(2.0, 1.0, 80.0, 160.0), new NoiseSlideSettings(-3000, 64, -46), new NoiseSlideSettings(-30, 7, 1), 2, 1, 0.0, 0.0, true, false, boolean6, false), cfj2, cfj3, -10, -10, 0, boolean5, Optional.<Preset>of(a), null);
+        }
+        
+        private static NoiseGeneratorSettings nether(final StructureSettings ciw, final BlockState cfj2, final BlockState cfj3, final Preset a) {
+            final Map<StructureFeature<?>, StructureFeatureConfiguration> map5 = Maps.newHashMap(StructureSettings.DEFAULTS);
+            map5.put(StructureFeature.RUINED_PORTAL, new StructureFeatureConfiguration(25, 10, 34222645));
+            return new NoiseGeneratorSettings(new StructureSettings(Optional.<StrongholdConfiguration>ofNullable(ciw.stronghold()), map5), new NoiseSettings(128, new NoiseSamplingSettings(1.0, 3.0, 80.0, 60.0), new NoiseSlideSettings(120, 3, 0), new NoiseSlideSettings(320, 4, -1), 1, 2, 0.0, 0.019921875, false, false, false, false), cfj2, cfj3, 0, 0, 32, false, Optional.<Preset>of(a), null);
+        }
+        
+        private static NoiseGeneratorSettings overworld(final StructureSettings ciw, final boolean boolean2, final Preset a) {
+            final double double4 = 0.9999999814507745;
+            return new NoiseGeneratorSettings(ciw, new NoiseSettings(256, new NoiseSamplingSettings(0.9999999814507745, 0.9999999814507745, 80.0, 160.0), new NoiseSlideSettings(-10, 3, 0), new NoiseSlideSettings(-30, 0, 0), 1, 2, 1.0, -0.46875, true, true, false, boolean2), Blocks.STONE.defaultBlockState(), Blocks.WATER.defaultBlockState(), -10, 0, 63, false, Optional.<Preset>of(a), null);
+        }
+        
+        static {
+            BY_NAME = Maps.newHashMap();
+            CODEC = ResourceLocation.CODEC.flatXmap(uh -> Optional.<Preset>ofNullable(Preset.BY_NAME.get(uh)).map(DataResult::success).orElseGet(() -> DataResult.error("Unknown preset: " + uh)), a -> DataResult.success(a.name)).stable();
+            OVERWORLD = new Preset("overworld", a -> overworld(new StructureSettings(true), false, a));
+            AMPLIFIED = new Preset("amplified", a -> overworld(new StructureSettings(true), true, a));
+            NETHER = new Preset("nether", a -> nether(new StructureSettings(false), Blocks.NETHERRACK.defaultBlockState(), Blocks.LAVA.defaultBlockState(), a));
+            END = new Preset("end", a -> end(new StructureSettings(false), Blocks.END_STONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), a, true, true));
+            CAVES = new Preset("caves", a -> nether(new StructureSettings(false), Blocks.STONE.defaultBlockState(), Blocks.WATER.defaultBlockState(), a));
+            FLOATING_ISLANDS = new Preset("floating_islands", a -> end(new StructureSettings(false), Blocks.STONE.defaultBlockState(), Blocks.WATER.defaultBlockState(), a, false, false));
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/NoiseSamplingSettings.java b/src/net/minecraft/world/level/levelgen/NoiseSamplingSettings.java
new file mode 100644
index 0000000..d697230
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/NoiseSamplingSettings.java
@@ -0,0 +1,45 @@
+package net.minecraft.world.level.levelgen;
+
+import net.minecraft.util.Codecs;
+import com.mojang.datafixers.kinds.Applicative;
+import java.util.function.Function;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
+
+public class NoiseSamplingSettings {
+    private static final Codec<Double> SCALE_RANGE;
+    public static final Codec<NoiseSamplingSettings> CODEC;
+    private final double xzScale;
+    private final double yScale;
+    private final double xzFactor;
+    private final double yFactor;
+    
+    public NoiseSamplingSettings(final double double1, final double double2, final double double3, final double double4) {
+        this.xzScale = double1;
+        this.yScale = double2;
+        this.xzFactor = double3;
+        this.yFactor = double4;
+    }
+    
+    public double xzScale() {
+        return this.xzScale;
+    }
+    
+    public double yScale() {
+        return this.yScale;
+    }
+    
+    public double xzFactor() {
+        return this.xzFactor;
+    }
+    
+    public double yFactor() {
+        return this.yFactor;
+    }
+    
+    static {
+        SCALE_RANGE = Codecs.doubleRange(0.001, 1000.0);
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)NoiseSamplingSettings.SCALE_RANGE.fieldOf("xz_scale").forGetter((Function)NoiseSamplingSettings::xzScale), (App)NoiseSamplingSettings.SCALE_RANGE.fieldOf("y_scale").forGetter((Function)NoiseSamplingSettings::yScale), (App)NoiseSamplingSettings.SCALE_RANGE.fieldOf("xz_factor").forGetter((Function)NoiseSamplingSettings::xzFactor), (App)NoiseSamplingSettings.SCALE_RANGE.fieldOf("y_factor").forGetter((Function)NoiseSamplingSettings::yFactor)).apply(instance, NoiseSamplingSettings::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/NoiseSettings.java b/src/net/minecraft/world/level/levelgen/NoiseSettings.java
new file mode 100644
index 0000000..ca241c0
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/NoiseSettings.java
@@ -0,0 +1,96 @@
+package net.minecraft.world.level.levelgen;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.serialization.Lifecycle;
+import java.util.function.Function;
+import net.minecraft.util.Codecs;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
+
+public class NoiseSettings {
+    public static final Codec<NoiseSettings> CODEC;
+    private final int height;
+    private final NoiseSamplingSettings noiseSamplingSettings;
+    private final NoiseSlideSettings topSlideSettings;
+    private final NoiseSlideSettings bottomSlideSettings;
+    private final int noiseSizeHorizontal;
+    private final int noiseSizeVertical;
+    private final double densityFactor;
+    private final double densityOffset;
+    private final boolean useSimplexSurfaceNoise;
+    private final boolean randomDensityOffset;
+    private final boolean islandNoiseOverride;
+    private final boolean isAmplified;
+    
+    public NoiseSettings(final int integer1, final NoiseSamplingSettings cir, final NoiseSlideSettings cit3, final NoiseSlideSettings cit4, final int integer5, final int integer6, final double double7, final double double8, final boolean boolean9, final boolean boolean10, final boolean boolean11, final boolean boolean12) {
+        this.height = integer1;
+        this.noiseSamplingSettings = cir;
+        this.topSlideSettings = cit3;
+        this.bottomSlideSettings = cit4;
+        this.noiseSizeHorizontal = integer5;
+        this.noiseSizeVertical = integer6;
+        this.densityFactor = double7;
+        this.densityOffset = double8;
+        this.useSimplexSurfaceNoise = boolean9;
+        this.randomDensityOffset = boolean10;
+        this.islandNoiseOverride = boolean11;
+        this.isAmplified = boolean12;
+    }
+    
+    public int height() {
+        return this.height;
+    }
+    
+    public NoiseSamplingSettings noiseSamplingSettings() {
+        return this.noiseSamplingSettings;
+    }
+    
+    public NoiseSlideSettings topSlideSettings() {
+        return this.topSlideSettings;
+    }
+    
+    public NoiseSlideSettings bottomSlideSettings() {
+        return this.bottomSlideSettings;
+    }
+    
+    public int noiseSizeHorizontal() {
+        return this.noiseSizeHorizontal;
+    }
+    
+    public int noiseSizeVertical() {
+        return this.noiseSizeVertical;
+    }
+    
+    public double densityFactor() {
+        return this.densityFactor;
+    }
+    
+    public double densityOffset() {
+        return this.densityOffset;
+    }
+    
+    @Deprecated
+    public boolean useSimplexSurfaceNoise() {
+        return this.useSimplexSurfaceNoise;
+    }
+    
+    @Deprecated
+    public boolean randomDensityOffset() {
+        return this.randomDensityOffset;
+    }
+    
+    @Deprecated
+    public boolean islandNoiseOverride() {
+        return this.islandNoiseOverride;
+    }
+    
+    @Deprecated
+    public boolean isAmplified() {
+        return this.isAmplified;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codecs.intRange(0, 256).fieldOf("height").forGetter((Function)NoiseSettings::height), (App)NoiseSamplingSettings.CODEC.fieldOf("sampling").forGetter((Function)NoiseSettings::noiseSamplingSettings), (App)NoiseSlideSettings.CODEC.fieldOf("top_slide").forGetter((Function)NoiseSettings::topSlideSettings), (App)NoiseSlideSettings.CODEC.fieldOf("bottom_slide").forGetter((Function)NoiseSettings::bottomSlideSettings), (App)Codecs.intRange(1, 4).fieldOf("size_horizontal").forGetter((Function)NoiseSettings::noiseSizeHorizontal), (App)Codecs.intRange(1, 4).fieldOf("size_vertical").forGetter((Function)NoiseSettings::noiseSizeVertical), (App)Codec.DOUBLE.fieldOf("density_factor").forGetter((Function)NoiseSettings::densityFactor), (App)Codec.DOUBLE.fieldOf("density_offset").forGetter((Function)NoiseSettings::densityOffset), (App)Codec.BOOL.fieldOf("simplex_surface_noise").forGetter((Function)NoiseSettings::useSimplexSurfaceNoise), (App)Codec.BOOL.optionalFieldOf("random_density_offset", false, Lifecycle.experimental()).forGetter((Function)NoiseSettings::randomDensityOffset), (App)Codec.BOOL.optionalFieldOf("island_noise_override", false, Lifecycle.experimental()).forGetter((Function)NoiseSettings::islandNoiseOverride), (App)Codec.BOOL.optionalFieldOf("amplified", false, Lifecycle.experimental()).forGetter((Function)NoiseSettings::isAmplified)).apply(instance, NoiseSettings::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/NoiseSlideSettings.java b/src/net/minecraft/world/level/levelgen/NoiseSlideSettings.java
new file mode 100644
index 0000000..005de49
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/NoiseSlideSettings.java
@@ -0,0 +1,37 @@
+package net.minecraft.world.level.levelgen;
+
+import com.mojang.datafixers.kinds.Applicative;
+import net.minecraft.util.Codecs;
+import java.util.function.Function;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
+
+public class NoiseSlideSettings {
+    public static final Codec<NoiseSlideSettings> CODEC;
+    private final int target;
+    private final int size;
+    private final int offset;
+    
+    public NoiseSlideSettings(final int integer1, final int integer2, final int integer3) {
+        this.target = integer1;
+        this.size = integer2;
+        this.offset = integer3;
+    }
+    
+    public int target() {
+        return this.target;
+    }
+    
+    public int size() {
+        return this.size;
+    }
+    
+    public int offset() {
+        return this.offset;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("target").forGetter((Function)NoiseSlideSettings::target), (App)Codecs.intRange(0, 256).fieldOf("size").forGetter((Function)NoiseSlideSettings::size), (App)Codec.INT.fieldOf("offset").forGetter((Function)NoiseSlideSettings::offset)).apply(instance, NoiseSlideSettings::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/OverworldGeneratorSettings.java b/src/net/minecraft/world/level/levelgen/OverworldGeneratorSettings.java
deleted file mode 100644
index 60a5eee..0000000
--- a/src/net/minecraft/world/level/levelgen/OverworldGeneratorSettings.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package net.minecraft.world.level.levelgen;
-
-public class OverworldGeneratorSettings extends ChunkGeneratorSettings {
-    private final int biomeSize = 4;
-    private final int riverSize = 4;
-    private final int fixedBiome = -1;
-    private final int seaLevel = 63;
-    
-    public int getBiomeSize() {
-        return 4;
-    }
-    
-    public int getRiverSize() {
-        return 4;
-    }
-    
-    public int getFixedBiome() {
-        return -1;
-    }
-    
-    @Override
-    public int getBedrockFloorPosition() {
-        return 0;
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/OverworldLevelSource.java b/src/net/minecraft/world/level/levelgen/OverworldLevelSource.java
deleted file mode 100644
index 702d721..0000000
--- a/src/net/minecraft/world/level/levelgen/OverworldLevelSource.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package net.minecraft.world.level.levelgen;
-
-import net.minecraft.Util;
-import net.minecraft.util.Mth;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.levelgen.feature.Feature;
-import java.util.List;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.biome.Biome;
-import java.util.Random;
-import net.minecraft.world.level.NaturalSpawner;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.LevelType;
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.entity.ai.village.VillageSiege;
-import net.minecraft.world.entity.npc.CatSpawner;
-import net.minecraft.world.level.levelgen.synth.PerlinNoise;
-
-public class OverworldLevelSource extends NoiseBasedChunkGenerator<OverworldGeneratorSettings> {
-    private static final float[] BIOME_WEIGHTS;
-    private final PerlinNoise depthNoise;
-    private final boolean isAmplified;
-    private final PhantomSpawner phantomSpawner;
-    private final PatrolSpawner patrolSpawner;
-    private final CatSpawner catSpawner;
-    private final VillageSiege villageSiege;
-    
-    public OverworldLevelSource(final LevelAccessor bjx, final BiomeSource bkw, final OverworldGeneratorSettings cbz) {
-        super(bjx, bkw, 4, 8, 256, cbz, true);
-        this.phantomSpawner = new PhantomSpawner();
-        this.patrolSpawner = new PatrolSpawner();
-        this.catSpawner = new CatSpawner();
-        this.villageSiege = new VillageSiege();
-        this.random.consumeCount(2620);
-        this.depthNoise = new PerlinNoise(this.random, 15, 0);
-        this.isAmplified = (bjx.getLevelData().getGeneratorType() == LevelType.AMPLIFIED);
-    }
-    
-    @Override
-    public void spawnOriginalMobs(final WorldGenRegion xj) {
-        final int integer3 = xj.getCenterX();
-        final int integer4 = xj.getCenterZ();
-        final Biome bkt5 = xj.getBiome(new ChunkPos(integer3, integer4).getWorldPosition());
-        final WorldgenRandom ccf6 = new WorldgenRandom();
-        ccf6.setDecorationSeed(xj.getSeed(), integer3 << 4, integer4 << 4);
-        NaturalSpawner.spawnMobsForChunkGeneration(xj, bkt5, integer3, integer4, ccf6);
-    }
-    
-    @Override
-    protected void fillNoiseColumn(final double[] arr, final int integer2, final int integer3) {
-        final double double5 = 684.4119873046875;
-        final double double6 = 684.4119873046875;
-        final double double7 = 8.555149841308594;
-        final double double8 = 4.277574920654297;
-        final int integer4 = -10;
-        final int integer5 = 3;
-        this.fillNoiseColumn(arr, integer2, integer3, 684.4119873046875, 684.4119873046875, 8.555149841308594, 4.277574920654297, 3, -10);
-    }
-    
-    @Override
-    protected double getYOffset(final double double1, final double double2, final int integer) {
-        final double double3 = 8.5;
-        double double4 = (integer - (8.5 + double1 * 8.5 / 8.0 * 4.0)) * 12.0 * 128.0 / 256.0 / double2;
-        if (double4 < 0.0) {
-            double4 *= 4.0;
-        }
-        return double4;
-    }
-    
-    @Override
-    protected double[] getDepthAndScale(final int integer1, final int integer2) {
-        final double[] arr4 = new double[2];
-        float float5 = 0.0f;
-        float float6 = 0.0f;
-        float float7 = 0.0f;
-        final int integer3 = 2;
-        final int integer4 = this.getSeaLevel();
-        final float float8 = this.biomeSource.getNoiseBiome(integer1, integer4, integer2).getDepth();
-        for (int integer5 = -2; integer5 <= 2; ++integer5) {
-            for (int integer6 = -2; integer6 <= 2; ++integer6) {
-                final Biome bkt13 = this.biomeSource.getNoiseBiome(integer1 + integer5, integer4, integer2 + integer6);
-                float float9 = bkt13.getDepth();
-                float float10 = bkt13.getScale();
-                if (this.isAmplified && float9 > 0.0f) {
-                    float9 = 1.0f + float9 * 2.0f;
-                    float10 = 1.0f + float10 * 4.0f;
-                }
-                float float11 = OverworldLevelSource.BIOME_WEIGHTS[integer5 + 2 + (integer6 + 2) * 5] / (float9 + 2.0f);
-                if (bkt13.getDepth() > float8) {
-                    float11 /= 2.0f;
-                }
-                float5 += float10 * float11;
-                float6 += float9 * float11;
-                float7 += float11;
-            }
-        }
-        float5 /= float7;
-        float6 /= float7;
-        float5 = float5 * 0.9f + 0.1f;
-        float6 = (float6 * 4.0f - 1.0f) / 8.0f;
-        arr4[0] = float6 + this.getRdepth(integer1, integer2);
-        arr4[1] = float5;
-        return arr4;
-    }
-    
-    private double getRdepth(final int integer1, final int integer2) {
-        double double4 = this.depthNoise.getValue(integer1 * 200, 10.0, integer2 * 200, 1.0, 0.0, true) * 65535.0 / 8000.0;
-        if (double4 < 0.0) {
-            double4 = -double4 * 0.3;
-        }
-        double4 = double4 * 3.0 - 2.0;
-        if (double4 < 0.0) {
-            double4 /= 28.0;
-        }
-        else {
-            if (double4 > 1.0) {
-                double4 = 1.0;
-            }
-            double4 /= 40.0;
-        }
-        return double4;
-    }
-    
-    @Override
-    public List<Biome.SpawnerData> getMobsAt(final MobCategory alb, final BlockPos fk) {
-        if (Feature.SWAMP_HUT.isSwamphut(this.level, fk)) {
-            if (alb == MobCategory.MONSTER) {
-                return Feature.SWAMP_HUT.getSpecialEnemies();
-            }
-            if (alb == MobCategory.CREATURE) {
-                return Feature.SWAMP_HUT.getSpecialAnimals();
-            }
-        }
-        else if (alb == MobCategory.MONSTER) {
-            if (Feature.PILLAGER_OUTPOST.isInsideBoundingFeature(this.level, fk)) {
-                return Feature.PILLAGER_OUTPOST.getSpecialEnemies();
-            }
-            if (Feature.OCEAN_MONUMENT.isInsideBoundingFeature(this.level, fk)) {
-                return Feature.OCEAN_MONUMENT.getSpecialEnemies();
-            }
-        }
-        return super.getMobsAt(alb, fk);
-    }
-    
-    @Override
-    public void tickCustomSpawners(final ServerLevel xd, final boolean boolean2, final boolean boolean3) {
-        this.phantomSpawner.tick(xd, boolean2, boolean3);
-        this.patrolSpawner.tick(xd, boolean2, boolean3);
-        this.catSpawner.tick(xd, boolean2, boolean3);
-        this.villageSiege.tick(xd, boolean2, boolean3);
-    }
-    
-    @Override
-    public int getSpawnHeight() {
-        return this.level.getSeaLevel() + 1;
-    }
-    
-    @Override
-    public int getSeaLevel() {
-        return 63;
-    }
-    
-    static {
-        int integer2;
-        int integer3;
-        float float4;
-        BIOME_WEIGHTS = Util.<float[]>make(new float[25], arr -> {
-            for (integer2 = -2; integer2 <= 2; ++integer2) {
-                for (integer3 = -2; integer3 <= 2; ++integer3) {
-                    float4 = 10.0f / Mth.sqrt(integer2 * integer2 + integer3 * integer3 + 0.2f);
-                    arr[integer2 + 2 + (integer3 + 2) * 5] = float4;
-                }
-            }
-        });
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/PatrolSpawner.java b/src/net/minecraft/world/level/levelgen/PatrolSpawner.java
index 5e235b3..6a4d107 100644
--- a/src/net/minecraft/world/level/levelgen/PatrolSpawner.java
+++ b/src/net/minecraft/world/level/levelgen/PatrolSpawner.java
@@ -1,81 +1,83 @@
 package net.minecraft.world.level.levelgen;
 
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.monster.Pillager;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.monster.PatrollingMonster;
 import net.minecraft.world.entity.MobSpawnType;
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.NaturalSpawner;
+import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.player.Player;
 import java.util.Random;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.CustomSpawner;
 
-public class PatrolSpawner {
+public class PatrolSpawner implements CustomSpawner {
     private int nextTick;
     
-    public int tick(final ServerLevel xd, final boolean boolean2, final boolean boolean3) {
+    @Override
+    public int tick(final ServerLevel zd, final boolean boolean2, final boolean boolean3) {
         if (!boolean2) {
             return 0;
         }
-        if (!xd.getGameRules().getBoolean(GameRules.RULE_DO_PATROL_SPAWNING)) {
+        if (!zd.getGameRules().getBoolean(GameRules.RULE_DO_PATROL_SPAWNING)) {
             return 0;
         }
-        final Random random5 = xd.random;
+        final Random random5 = zd.random;
         --this.nextTick;
         if (this.nextTick > 0) {
             return 0;
         }
         this.nextTick += 12000 + random5.nextInt(1200);
-        final long long6 = xd.getDayTime() / 24000L;
-        if (long6 < 5L || !xd.isDay()) {
+        final long long6 = zd.getDayTime() / 24000L;
+        if (long6 < 5L || !zd.isDay()) {
             return 0;
         }
         if (random5.nextInt(5) != 0) {
             return 0;
         }
-        final int integer8 = xd.players().size();
+        final int integer8 = zd.players().size();
         if (integer8 < 1) {
             return 0;
         }
-        final Player ayj9 = xd.players().get(random5.nextInt(integer8));
-        if (ayj9.isSpectator()) {
+        final Player bec9 = zd.players().get(random5.nextInt(integer8));
+        if (bec9.isSpectator()) {
             return 0;
         }
-        if (xd.isVillage(ayj9.getCommandSenderBlockPosition())) {
+        if (zd.isCloseToVillage(bec9.blockPosition(), 2)) {
             return 0;
         }
         final int integer9 = (24 + random5.nextInt(24)) * (random5.nextBoolean() ? -1 : 1);
         final int integer10 = (24 + random5.nextInt(24)) * (random5.nextBoolean() ? -1 : 1);
-        final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos(ayj9).move(integer9, 0, integer10);
-        if (!xd.hasChunksAt(a12.getX() - 10, a12.getY() - 10, a12.getZ() - 10, a12.getX() + 10, a12.getY() + 10, a12.getZ() + 10)) {
+        final BlockPos.MutableBlockPos a12 = bec9.blockPosition().mutable().move(integer9, 0, integer10);
+        if (!zd.hasChunksAt(a12.getX() - 10, a12.getY() - 10, a12.getZ() - 10, a12.getX() + 10, a12.getY() + 10, a12.getZ() + 10)) {
             return 0;
         }
-        final Biome bkt13 = xd.getBiome(a12);
-        final Biome.BiomeCategory b14 = bkt13.getBiomeCategory();
+        final Biome bre13 = zd.getBiome(a12);
+        final Biome.BiomeCategory b14 = bre13.getBiomeCategory();
         if (b14 == Biome.BiomeCategory.MUSHROOM) {
             return 0;
         }
         int integer11 = 0;
-        for (int integer12 = (int)Math.ceil(xd.getCurrentDifficultyAt(a12).getEffectiveDifficulty()) + 1, integer13 = 0; integer13 < integer12; ++integer13) {
+        for (int integer12 = (int)Math.ceil(zd.getCurrentDifficultyAt(a12).getEffectiveDifficulty()) + 1, integer13 = 0; integer13 < integer12; ++integer13) {
             ++integer11;
-            a12.setY(xd.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, a12).getY());
+            a12.setY(zd.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, a12).getY());
             if (integer13 == 0) {
-                if (!this.spawnPatrolMember(xd, a12, random5, true)) {
+                if (!this.spawnPatrolMember(zd, a12, random5, true)) {
                     break;
                 }
             }
             else {
-                this.spawnPatrolMember(xd, a12, random5, false);
+                this.spawnPatrolMember(zd, a12, random5, false);
             }
             a12.setX(a12.getX() + random5.nextInt(5) - random5.nextInt(5));
             a12.setZ(a12.getZ() + random5.nextInt(5) - random5.nextInt(5));
@@ -83,23 +85,23 @@ public class PatrolSpawner {
         return integer11;
     }
     
-    private boolean spawnPatrolMember(final Level bjw, final BlockPos fk, final Random random, final boolean boolean4) {
-        final BlockState byj6 = bjw.getBlockState(fk);
-        if (!NaturalSpawner.isValidEmptySpawnBlock(bjw, fk, byj6, byj6.getFluidState())) {
+    private boolean spawnPatrolMember(final Level bqb, final BlockPos fu, final Random random, final boolean boolean4) {
+        final BlockState cfj6 = bqb.getBlockState(fu);
+        if (!NaturalSpawner.isValidEmptySpawnBlock(bqb, fu, cfj6, cfj6.getFluidState(), EntityType.PILLAGER)) {
             return false;
         }
-        if (!PatrollingMonster.checkPatrollingMonsterSpawnRules(EntityType.PILLAGER, bjw, MobSpawnType.PATROL, fk, random)) {
+        if (!PatrollingMonster.checkPatrollingMonsterSpawnRules(EntityType.PILLAGER, bqb, MobSpawnType.PATROL, fu, random)) {
             return false;
         }
-        final PatrollingMonster awx7 = EntityType.PILLAGER.create(bjw);
-        if (awx7 != null) {
+        final PatrollingMonster bcc7 = EntityType.PILLAGER.create(bqb);
+        if (bcc7 != null) {
             if (boolean4) {
-                awx7.setPatrolLeader(true);
-                awx7.findPatrolTarget();
+                bcc7.setPatrolLeader(true);
+                bcc7.findPatrolTarget();
             }
-            awx7.setPos(fk.getX(), fk.getY(), fk.getZ());
-            awx7.finalizeSpawn(bjw, bjw.getCurrentDifficultyAt(fk), MobSpawnType.PATROL, null, null);
-            bjw.addFreshEntity(awx7);
+            bcc7.setPos(fu.getX(), fu.getY(), fu.getZ());
+            bcc7.finalizeSpawn(bqb, bqb.getCurrentDifficultyAt(fu), MobSpawnType.PATROL, null, null);
+            bqb.addFreshEntity(bcc7);
             return true;
         }
         return false;
diff --git a/src/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/net/minecraft/world/level/levelgen/PhantomSpawner.java
index cf9ade1..8875c3b 100644
--- a/src/net/minecraft/world/level/levelgen/PhantomSpawner.java
+++ b/src/net/minecraft/world/level/levelgen/PhantomSpawner.java
@@ -5,82 +5,84 @@ import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.stats.ServerStatsCounter;
 import net.minecraft.world.DifficultyInstance;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Player;
 import java.util.Iterator;
 import java.util.Random;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.monster.Phantom;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.NaturalSpawner;
+import net.minecraft.world.entity.EntityType;
 import net.minecraft.util.Mth;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.CustomSpawner;
 
-public class PhantomSpawner {
+public class PhantomSpawner implements CustomSpawner {
     private int nextTick;
     
-    public int tick(final ServerLevel xd, final boolean boolean2, final boolean boolean3) {
+    @Override
+    public int tick(final ServerLevel zd, final boolean boolean2, final boolean boolean3) {
         if (!boolean2) {
             return 0;
         }
-        if (!xd.getGameRules().getBoolean(GameRules.RULE_DOINSOMNIA)) {
+        if (!zd.getGameRules().getBoolean(GameRules.RULE_DOINSOMNIA)) {
             return 0;
         }
-        final Random random5 = xd.random;
+        final Random random5 = zd.random;
         --this.nextTick;
         if (this.nextTick > 0) {
             return 0;
         }
         this.nextTick += (60 + random5.nextInt(60)) * 20;
-        if (xd.getSkyDarken() < 5 && xd.dimension.isHasSkyLight()) {
+        if (zd.getSkyDarken() < 5 && zd.dimensionType().hasSkyLight()) {
             return 0;
         }
         int integer6 = 0;
-        for (final Player ayj8 : xd.players()) {
-            if (ayj8.isSpectator()) {
+        for (final Player bec8 : zd.players()) {
+            if (bec8.isSpectator()) {
                 continue;
             }
-            final BlockPos fk9 = new BlockPos(ayj8);
-            if (xd.dimension.isHasSkyLight()) {
-                if (fk9.getY() < xd.getSeaLevel()) {
+            final BlockPos fu9 = bec8.blockPosition();
+            if (zd.dimensionType().hasSkyLight()) {
+                if (fu9.getY() < zd.getSeaLevel()) {
                     continue;
                 }
-                if (!xd.canSeeSky(fk9)) {
+                if (!zd.canSeeSky(fu9)) {
                     continue;
                 }
             }
-            final DifficultyInstance ajj10 = xd.getCurrentDifficultyAt(fk9);
-            if (!ajj10.isHarderThan(random5.nextFloat() * 3.0f)) {
+            final DifficultyInstance ane10 = zd.getCurrentDifficultyAt(fu9);
+            if (!ane10.isHarderThan(random5.nextFloat() * 3.0f)) {
                 continue;
             }
-            final ServerStatsCounter aan11 = ((ServerPlayer)ayj8).getStats();
-            final int integer7 = Mth.clamp(aan11.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE);
+            final ServerStatsCounter acq11 = ((ServerPlayer)bec8).getStats();
+            final int integer7 = Mth.clamp(acq11.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE);
             final int integer8 = 24000;
             if (random5.nextInt(integer7) < 72000) {
                 continue;
             }
-            final BlockPos fk10 = fk9.above(20 + random5.nextInt(15)).east(-10 + random5.nextInt(21)).south(-10 + random5.nextInt(21));
-            final BlockState byj15 = xd.getBlockState(fk10);
-            final FluidState coj16 = xd.getFluidState(fk10);
-            if (!NaturalSpawner.isValidEmptySpawnBlock(xd, fk10, byj15, coj16)) {
+            final BlockPos fu10 = fu9.above(20 + random5.nextInt(15)).east(-10 + random5.nextInt(21)).south(-10 + random5.nextInt(21));
+            final BlockState cfj15 = zd.getBlockState(fu10);
+            final FluidState cxa16 = zd.getFluidState(fu10);
+            if (!NaturalSpawner.isValidEmptySpawnBlock(zd, fu10, cfj15, cxa16, EntityType.PHANTOM)) {
                 continue;
             }
-            SpawnGroupData alm17 = null;
-            final int integer9 = 1 + random5.nextInt(ajj10.getDifficulty().getId() + 1);
+            SpawnGroupData apo17 = null;
+            final int integer9 = 1 + random5.nextInt(ane10.getDifficulty().getId() + 1);
             for (int integer10 = 0; integer10 < integer9; ++integer10) {
-                final Phantom awy20 = EntityType.PHANTOM.create(xd);
-                awy20.moveTo(fk10, 0.0f, 0.0f);
-                alm17 = awy20.finalizeSpawn(xd, ajj10, MobSpawnType.NATURAL, alm17, null);
-                xd.addFreshEntity(awy20);
+                final Phantom bcd20 = EntityType.PHANTOM.create(zd);
+                bcd20.moveTo(fu10, 0.0f, 0.0f);
+                apo17 = bcd20.finalizeSpawn(zd, ane10, MobSpawnType.NATURAL, apo17, null);
+                zd.addFreshEntity(bcd20);
             }
             integer6 += integer9;
         }
diff --git a/src/net/minecraft/world/level/levelgen/StructureSettings.java b/src/net/minecraft/world/level/levelgen/StructureSettings.java
new file mode 100644
index 0000000..e2e49ae
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/StructureSettings.java
@@ -0,0 +1,62 @@
+package net.minecraft.world.level.levelgen;
+
+import java.util.Iterator;
+import net.minecraft.world.level.levelgen.feature.SwamplandHutFeature;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.serialization.Keyable;
+import net.minecraft.core.Registry;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.google.common.collect.Maps;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import java.util.Map;
+import net.minecraft.world.level.levelgen.feature.configurations.StrongholdConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import com.google.common.collect.ImmutableMap;
+import com.mojang.serialization.Codec;
+
+public class StructureSettings {
+    public static final Codec<StructureSettings> CODEC;
+    public static final ImmutableMap<StructureFeature<?>, StructureFeatureConfiguration> DEFAULTS;
+    public static final StrongholdConfiguration DEFAULT_STRONGHOLD;
+    private final Map<StructureFeature<?>, StructureFeatureConfiguration> structureConfig;
+    @Nullable
+    private final StrongholdConfiguration stronghold;
+    
+    public StructureSettings(final Optional<StrongholdConfiguration> optional, final Map<StructureFeature<?>, StructureFeatureConfiguration> map) {
+        this.stronghold = optional.orElse(null);
+        this.structureConfig = map;
+    }
+    
+    public StructureSettings(final boolean boolean1) {
+        this.structureConfig = Maps.newHashMap(StructureSettings.DEFAULTS);
+        this.stronghold = (boolean1 ? StructureSettings.DEFAULT_STRONGHOLD : null);
+    }
+    
+    public Map<StructureFeature<?>, StructureFeatureConfiguration> structureConfig() {
+        return this.structureConfig;
+    }
+    
+    public StructureFeatureConfiguration getConfig(final StructureFeature<?> cml) {
+        return this.structureConfig.getOrDefault(cml, new StructureFeatureConfiguration(1, 0, 0));
+    }
+    
+    @Nullable
+    public StrongholdConfiguration stronghold() {
+        return this.stronghold;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)StrongholdConfiguration.CODEC.optionalFieldOf("stronghold").forGetter(ciw -> Optional.<StrongholdConfiguration>ofNullable(ciw.stronghold)), (App)Codec.simpleMap((Codec)Registry.STRUCTURE_FEATURE, (Codec)StructureFeatureConfiguration.CODEC, (Keyable)Registry.STRUCTURE_FEATURE).fieldOf("structures").forGetter(ciw -> ciw.structureConfig)).apply(instance, (BiFunction)StructureSettings::new));
+        DEFAULTS = ImmutableMap.<SwamplandHutFeature, StructureFeatureConfiguration>builder().put((SwamplandHutFeature)StructureFeature.VILLAGE, new StructureFeatureConfiguration(32, 8, 10387312)).put((SwamplandHutFeature)StructureFeature.DESERT_PYRAMID, new StructureFeatureConfiguration(32, 8, 14357617)).put((SwamplandHutFeature)StructureFeature.IGLOO, new StructureFeatureConfiguration(32, 8, 14357618)).put((SwamplandHutFeature)StructureFeature.JUNGLE_TEMPLE, new StructureFeatureConfiguration(32, 8, 14357619)).put(StructureFeature.SWAMP_HUT, new StructureFeatureConfiguration(32, 8, 14357620)).put((SwamplandHutFeature)StructureFeature.PILLAGER_OUTPOST, new StructureFeatureConfiguration(32, 8, 165745296)).put((SwamplandHutFeature)StructureFeature.STRONGHOLD, new StructureFeatureConfiguration(1, 0, 0)).put((SwamplandHutFeature)StructureFeature.OCEAN_MONUMENT, new StructureFeatureConfiguration(32, 5, 10387313)).put((SwamplandHutFeature)StructureFeature.END_CITY, new StructureFeatureConfiguration(20, 11, 10387313)).put((SwamplandHutFeature)StructureFeature.WOODLAND_MANSION, new StructureFeatureConfiguration(80, 20, 10387319)).put((SwamplandHutFeature)StructureFeature.BURIED_TREASURE, new StructureFeatureConfiguration(1, 0, 0)).put((SwamplandHutFeature)StructureFeature.MINESHAFT, new StructureFeatureConfiguration(1, 0, 0)).put((SwamplandHutFeature)StructureFeature.RUINED_PORTAL, new StructureFeatureConfiguration(40, 15, 34222645)).put((SwamplandHutFeature)StructureFeature.SHIPWRECK, new StructureFeatureConfiguration(24, 4, 165745295)).put((SwamplandHutFeature)StructureFeature.OCEAN_RUIN, new StructureFeatureConfiguration(20, 8, 14357621)).put((SwamplandHutFeature)StructureFeature.BASTION_REMNANT, new StructureFeatureConfiguration(27, 4, 30084232)).put((SwamplandHutFeature)StructureFeature.NETHER_BRIDGE, new StructureFeatureConfiguration(27, 4, 30084232)).put((SwamplandHutFeature)StructureFeature.NETHER_FOSSIL, new StructureFeatureConfiguration(2, 1, 14357921)).build();
+        for (final StructureFeature<?> cml2 : Registry.STRUCTURE_FEATURE) {
+            if (!StructureSettings.DEFAULTS.containsKey(cml2)) {
+                throw new IllegalStateException("Structure feature without default settings: " + Registry.STRUCTURE_FEATURE.getKey(cml2));
+            }
+        }
+        DEFAULT_STRONGHOLD = new StrongholdConfiguration(32, 3, 128);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/TheEndGeneratorSettings.java b/src/net/minecraft/world/level/levelgen/TheEndGeneratorSettings.java
deleted file mode 100644
index 5c2e2e1..0000000
--- a/src/net/minecraft/world/level/levelgen/TheEndGeneratorSettings.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.minecraft.world.level.levelgen;
-
-import net.minecraft.core.BlockPos;
-
-public class TheEndGeneratorSettings extends ChunkGeneratorSettings {
-    private BlockPos spawnPosition;
-    
-    public TheEndGeneratorSettings setSpawnPosition(final BlockPos fk) {
-        this.spawnPosition = fk;
-        return this;
-    }
-    
-    public BlockPos getSpawnPosition() {
-        return this.spawnPosition;
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/TheEndLevelSource.java b/src/net/minecraft/world/level/levelgen/TheEndLevelSource.java
deleted file mode 100644
index 0febf18..0000000
--- a/src/net/minecraft/world/level/levelgen/TheEndLevelSource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package net.minecraft.world.level.levelgen;
-
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.core.BlockPos;
-
-public class TheEndLevelSource extends NoiseBasedChunkGenerator<TheEndGeneratorSettings> {
-    private final BlockPos dimensionSpawnPosition;
-    
-    public TheEndLevelSource(final LevelAccessor bjx, final BiomeSource bkw, final TheEndGeneratorSettings ccd) {
-        super(bjx, bkw, 8, 4, 128, ccd, true);
-        this.dimensionSpawnPosition = ccd.getSpawnPosition();
-    }
-    
-    @Override
-    protected void fillNoiseColumn(final double[] arr, final int integer2, final int integer3) {
-        final double double5 = 1368.824;
-        final double double6 = 684.412;
-        final double double7 = 17.110300000000002;
-        final double double8 = 4.277575000000001;
-        final int integer4 = 64;
-        final int integer5 = -3000;
-        this.fillNoiseColumn(arr, integer2, integer3, 1368.824, 684.412, 17.110300000000002, 4.277575000000001, 64, -3000);
-    }
-    
-    @Override
-    protected double[] getDepthAndScale(final int integer1, final int integer2) {
-        return new double[] { this.biomeSource.getHeightValue(integer1, integer2), 0.0 };
-    }
-    
-    @Override
-    protected double getYOffset(final double double1, final double double2, final int integer) {
-        return 8.0 - double1;
-    }
-    
-    @Override
-    protected double getTopSlideStart() {
-        return (int)super.getTopSlideStart() / 2;
-    }
-    
-    @Override
-    protected double getBottomSlideStart() {
-        return 8.0;
-    }
-    
-    @Override
-    public int getSpawnHeight() {
-        return 50;
-    }
-    
-    @Override
-    public int getSeaLevel() {
-        return 0;
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/WorldGenSettings.java b/src/net/minecraft/world/level/levelgen/WorldGenSettings.java
new file mode 100644
index 0000000..555302e
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/WorldGenSettings.java
@@ -0,0 +1,245 @@
+package net.minecraft.world.level.levelgen;
+
+import org.apache.logging.log4j.LogManager;
+import com.mojang.datafixers.kinds.Applicative;
+import java.util.function.Function;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.OptionalLong;
+import com.google.gson.JsonElement;
+import java.util.function.Consumer;
+import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Dynamic;
+import com.mojang.serialization.JsonOps;
+import net.minecraft.util.GsonHelper;
+import com.google.gson.JsonObject;
+import java.util.Locale;
+import java.util.Objects;
+import com.google.common.base.MoreObjects;
+import java.util.Properties;
+import java.util.stream.Collector;
+import net.minecraft.world.level.Level;
+import com.google.common.collect.ImmutableSet;
+import java.util.Iterator;
+import net.minecraft.resources.ResourceKey;
+import java.util.Map;
+import net.minecraft.core.Registry;
+import java.util.function.Supplier;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.biome.OverworldBiomeSource;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.dimension.DimensionType;
+import java.util.Random;
+import com.mojang.serialization.Lifecycle;
+import com.mojang.serialization.DataResult;
+import java.util.Optional;
+import net.minecraft.world.level.dimension.LevelStem;
+import net.minecraft.core.MappedRegistry;
+import org.apache.logging.log4j.Logger;
+import com.mojang.serialization.Codec;
+
+public class WorldGenSettings {
+    public static final Codec<WorldGenSettings> CODEC;
+    private static final Logger LOGGER;
+    private static final int DEMO_SEED;
+    public static final WorldGenSettings DEMO_SETTINGS;
+    private final long seed;
+    private final boolean generateFeatures;
+    private final boolean generateBonusChest;
+    private final MappedRegistry<LevelStem> dimensions;
+    private final Optional<String> legacyCustomOptions;
+    
+    private DataResult<WorldGenSettings> guardExperimental() {
+        if (this.stable()) {
+            return (DataResult<WorldGenSettings>)DataResult.success(this, Lifecycle.stable());
+        }
+        return (DataResult<WorldGenSettings>)DataResult.success(this);
+    }
+    
+    private boolean stable() {
+        return LevelStem.stable(this.seed, this.dimensions);
+    }
+    
+    public WorldGenSettings(final long long1, final boolean boolean2, final boolean boolean3, final MappedRegistry<LevelStem> gh) {
+        this(long1, boolean2, boolean3, gh, Optional.<String>empty());
+    }
+    
+    private WorldGenSettings(final long long1, final boolean boolean2, final boolean boolean3, final MappedRegistry<LevelStem> gh, final Optional<String> optional) {
+        this.seed = long1;
+        this.generateFeatures = boolean2;
+        this.generateBonusChest = boolean3;
+        this.dimensions = gh;
+        this.legacyCustomOptions = optional;
+    }
+    
+    public static WorldGenSettings makeDefault() {
+        final long long1 = new Random().nextLong();
+        return new WorldGenSettings(long1, true, false, withOverworld(DimensionType.defaultDimensions(long1), makeDefaultOverworld(long1)));
+    }
+    
+    public static NoiseBasedChunkGenerator makeDefaultOverworld(final long long1) {
+        return new NoiseBasedChunkGenerator(new OverworldBiomeSource(long1, false, false), long1, NoiseGeneratorSettings.Preset.OVERWORLD.settings());
+    }
+    
+    public long seed() {
+        return this.seed;
+    }
+    
+    public boolean generateFeatures() {
+        return this.generateFeatures;
+    }
+    
+    public boolean generateBonusChest() {
+        return this.generateBonusChest;
+    }
+    
+    public static MappedRegistry<LevelStem> withOverworld(final MappedRegistry<LevelStem> gh, final ChunkGenerator cha) {
+        final LevelStem cig3 = gh.get(LevelStem.OVERWORLD);
+        final LevelStem levelStem;
+        final Supplier<DimensionType> supplier4 = () -> (levelStem == null) ? DimensionType.defaultOverworld() : levelStem.type();
+        return withOverworld(gh, supplier4, cha);
+    }
+    
+    public static MappedRegistry<LevelStem> withOverworld(final MappedRegistry<LevelStem> gh, final Supplier<DimensionType> supplier, final ChunkGenerator cha) {
+        final MappedRegistry<LevelStem> gh2 = new MappedRegistry<LevelStem>(Registry.LEVEL_STEM_REGISTRY, Lifecycle.experimental());
+        gh2.<LevelStem>register(LevelStem.OVERWORLD, new LevelStem(supplier, cha));
+        gh2.setPersistent(LevelStem.OVERWORLD);
+        for (final Map.Entry<ResourceKey<LevelStem>, LevelStem> entry6 : gh.entrySet()) {
+            final ResourceKey<LevelStem> ug7 = entry6.getKey();
+            if (ug7 == LevelStem.OVERWORLD) {
+                continue;
+            }
+            gh2.<LevelStem>register(ug7, entry6.getValue());
+            if (!gh.persistent(ug7)) {
+                continue;
+            }
+            gh2.setPersistent(ug7);
+        }
+        return gh2;
+    }
+    
+    public MappedRegistry<LevelStem> dimensions() {
+        return this.dimensions;
+    }
+    
+    public ChunkGenerator overworld() {
+        final LevelStem cig2 = this.dimensions.get(LevelStem.OVERWORLD);
+        if (cig2 == null) {
+            return makeDefaultOverworld(new Random().nextLong());
+        }
+        return cig2.generator();
+    }
+    
+    public ImmutableSet<ResourceKey<Level>> levels() {
+        return this.dimensions().entrySet().stream().map(entry -> ResourceKey.<Level>create(Registry.DIMENSION_REGISTRY, entry.getKey().location())).collect(ImmutableSet.toImmutableSet());
+    }
+    
+    public boolean isDebug() {
+        return this.overworld() instanceof DebugLevelSource;
+    }
+    
+    public boolean isFlatWorld() {
+        return this.overworld() instanceof FlatLevelSource;
+    }
+    
+    public boolean isOldCustomizedWorld() {
+        return this.legacyCustomOptions.isPresent();
+    }
+    
+    public WorldGenSettings withBonusChest() {
+        return new WorldGenSettings(this.seed, this.generateFeatures, true, this.dimensions, this.legacyCustomOptions);
+    }
+    
+    public WorldGenSettings withFeaturesToggled() {
+        return new WorldGenSettings(this.seed, !this.generateFeatures, this.generateBonusChest, this.dimensions);
+    }
+    
+    public WorldGenSettings withBonusChestToggled() {
+        return new WorldGenSettings(this.seed, this.generateFeatures, !this.generateBonusChest, this.dimensions);
+    }
+    
+    public WorldGenSettings withDimensions(final MappedRegistry<LevelStem> gh) {
+        return new WorldGenSettings(this.seed, this.generateFeatures, this.generateBonusChest, gh);
+    }
+    
+    public static WorldGenSettings create(final Properties properties) {
+        final String string2 = MoreObjects.<String>firstNonNull(properties.get("generator-settings"), "");
+        properties.put("generator-settings", string2);
+        final String string3 = MoreObjects.<String>firstNonNull(properties.get("level-seed"), "");
+        properties.put("level-seed", string3);
+        final String string4 = (String)properties.get("generate-structures");
+        final boolean boolean5 = string4 == null || Boolean.parseBoolean(string4);
+        properties.put("generate-structures", Objects.toString(boolean5));
+        final String string5 = (String)properties.get("level-type");
+        final String string6 = Optional.<String>ofNullable(string5).<String>map(string -> string.toLowerCase(Locale.ROOT)).orElse("default");
+        properties.put("level-type", string6);
+        long long8 = new Random().nextLong();
+        if (!string3.isEmpty()) {
+            try {
+                final long long9 = Long.parseLong(string3);
+                if (long9 != 0L) {
+                    long8 = long9;
+                }
+            }
+            catch (NumberFormatException numberFormatException10) {
+                long8 = string3.hashCode();
+            }
+        }
+        final MappedRegistry<LevelStem> gh10 = DimensionType.defaultDimensions(long8);
+        final String s = string6;
+        switch (s) {
+            case "flat": {
+                final JsonObject jsonObject13 = string2.isEmpty() ? new JsonObject() : GsonHelper.parse(string2);
+                final Dynamic<JsonElement> dynamic14 = (Dynamic<JsonElement>)new Dynamic((DynamicOps)JsonOps.INSTANCE, jsonObject13);
+                return new WorldGenSettings(long8, boolean5, false, withOverworld(gh10, new FlatLevelSource(FlatLevelGeneratorSettings.CODEC.parse((Dynamic)dynamic14).resultOrPartial((Consumer)WorldGenSettings.LOGGER::error).orElseGet(FlatLevelGeneratorSettings::getDefault))));
+            }
+            case "debug_all_block_states": {
+                return new WorldGenSettings(long8, boolean5, false, withOverworld(gh10, DebugLevelSource.INSTANCE));
+            }
+            case "amplified": {
+                return new WorldGenSettings(long8, boolean5, false, withOverworld(gh10, new NoiseBasedChunkGenerator(new OverworldBiomeSource(long8, false, false), long8, NoiseGeneratorSettings.Preset.AMPLIFIED.settings())));
+            }
+            case "largebiomes": {
+                return new WorldGenSettings(long8, boolean5, false, withOverworld(gh10, new NoiseBasedChunkGenerator(new OverworldBiomeSource(long8, false, true), long8, NoiseGeneratorSettings.Preset.OVERWORLD.settings())));
+            }
+            default: {
+                return new WorldGenSettings(long8, boolean5, false, withOverworld(gh10, makeDefaultOverworld(long8)));
+            }
+        }
+    }
+    
+    public WorldGenSettings withSeed(final boolean boolean1, final OptionalLong optionalLong) {
+        final long long5 = optionalLong.orElse(this.seed);
+        MappedRegistry<LevelStem> gh7;
+        if (optionalLong.isPresent()) {
+            gh7 = new MappedRegistry<LevelStem>(Registry.LEVEL_STEM_REGISTRY, Lifecycle.experimental());
+            final long long6 = optionalLong.getAsLong();
+            for (final Map.Entry<ResourceKey<LevelStem>, LevelStem> entry11 : this.dimensions.entrySet()) {
+                final ResourceKey<LevelStem> ug12 = entry11.getKey();
+                gh7.<LevelStem>register(ug12, new LevelStem(entry11.getValue().typeSupplier(), entry11.getValue().generator().withSeed(long6)));
+                if (this.dimensions.persistent(ug12)) {
+                    gh7.setPersistent(ug12);
+                }
+            }
+        }
+        else {
+            gh7 = this.dimensions;
+        }
+        WorldGenSettings cix4;
+        if (this.isDebug()) {
+            cix4 = new WorldGenSettings(long5, false, false, gh7);
+        }
+        else {
+            cix4 = new WorldGenSettings(long5, this.generateFeatures(), this.generateBonusChest() && !boolean1, gh7);
+        }
+        return cix4;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.LONG.fieldOf("seed").stable().forGetter((Function)WorldGenSettings::seed), (App)Codec.BOOL.fieldOf("generate_features").withDefault(true).stable().forGetter((Function)WorldGenSettings::generateFeatures), (App)Codec.BOOL.fieldOf("bonus_chest").withDefault(false).stable().forGetter((Function)WorldGenSettings::generateBonusChest), (App)MappedRegistry.<LevelStem>dataPackCodec(Registry.LEVEL_STEM_REGISTRY, Lifecycle.stable(), LevelStem.CODEC).xmap((Function)LevelStem::sortMap, (Function)Function.identity()).fieldOf("dimensions").forGetter((Function)WorldGenSettings::dimensions), (App)Codec.STRING.optionalFieldOf("legacy_custom_options").stable().forGetter(cix -> cix.legacyCustomOptions)).apply(instance, ((RecordCodecBuilder.Instance)instance).stable(WorldGenSettings::new))).comapFlatMap((Function)WorldGenSettings::guardExperimental, (Function)Function.identity());
+        LOGGER = LogManager.getLogger();
+        DEMO_SEED = "North Carolina".hashCode();
+        DEMO_SETTINGS = new WorldGenSettings(WorldGenSettings.DEMO_SEED, true, true, withOverworld(DimensionType.defaultDimensions(WorldGenSettings.DEMO_SEED), makeDefaultOverworld(WorldGenSettings.DEMO_SEED)));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/carver/CanyonWorldCarver.java b/src/net/minecraft/world/level/levelgen/carver/CanyonWorldCarver.java
index 86b480a..41d53da 100644
--- a/src/net/minecraft/world/level/levelgen/carver/CanyonWorldCarver.java
+++ b/src/net/minecraft/world/level/levelgen/carver/CanyonWorldCarver.java
@@ -4,27 +4,27 @@ import net.minecraft.util.Mth;
 import java.util.BitSet;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
+import java.util.function.Function;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
 
 public class CanyonWorldCarver extends WorldCarver<ProbabilityFeatureConfiguration> {
     private final float[] rs;
     
-    public CanyonWorldCarver(final Function<Dynamic<?>, ? extends ProbabilityFeatureConfiguration> function) {
-        super(function, 256);
+    public CanyonWorldCarver(final Codec<ProbabilityFeatureConfiguration> codec) {
+        super(codec, 256);
         this.rs = new float[1024];
     }
     
     @Override
-    public boolean isStartChunk(final Random random, final int integer2, final int integer3, final ProbabilityFeatureConfiguration cgy) {
-        return random.nextFloat() <= cgy.probability;
+    public boolean isStartChunk(final Random random, final int integer2, final int integer3, final ProbabilityFeatureConfiguration cod) {
+        return random.nextFloat() <= cod.probability;
     }
     
     @Override
-    public boolean carve(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final Random random, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BitSet bitSet, final ProbabilityFeatureConfiguration cgy) {
+    public boolean carve(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final Random random, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BitSet bitSet, final ProbabilityFeatureConfiguration cod) {
         final int integer9 = (this.getRange() * 2 - 1) * 16;
         final double double13 = integer5 * 16 + random.nextInt(16);
         final double double14 = random.nextInt(random.nextInt(40) + 8) + 20;
@@ -35,11 +35,11 @@ public class CanyonWorldCarver extends WorldCarver<ProbabilityFeatureConfigurati
         final float float21 = (random.nextFloat() * 2.0f + random.nextFloat()) * 2.0f;
         final int integer10 = integer9 - random.nextInt(integer9 / 4);
         final int integer11 = 0;
-        this.genCanyon(bzy, function, random.nextLong(), integer4, integer7, integer8, double13, double14, double15, float21, float19, float20, 0, integer10, 3.0, bitSet);
+        this.genCanyon(cgy, function, random.nextLong(), integer4, integer7, integer8, double13, double14, double15, float21, float19, float20, 0, integer10, 3.0, bitSet);
         return true;
     }
     
-    private void genCanyon(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final long long3, final int integer4, final int integer5, final int integer6, double double7, double double8, double double9, final float float10, float float11, float float12, final int integer13, final int integer14, final double double15, final BitSet bitSet) {
+    private void genCanyon(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final long long3, final int integer4, final int integer5, final int integer6, double double7, double double8, double double9, final float float10, float float11, float float12, final int integer13, final int integer14, final double double15, final BitSet bitSet) {
         final Random random23 = new Random(long3);
         float float13 = 1.0f;
         for (int integer15 = 0; integer15 < 256; ++integer15) {
@@ -71,7 +71,7 @@ public class CanyonWorldCarver extends WorldCarver<ProbabilityFeatureConfigurati
                 if (!this.canReach(integer5, integer6, double7, double9, integer16, integer14, float10)) {
                     return;
                 }
-                this.carveSphere(bzy, function, long3, integer4, integer5, integer6, double7, double8, double9, double16, double17, bitSet);
+                this.carveSphere(cgy, function, long3, integer4, integer5, integer6, double7, double8, double9, double16, double17, bitSet);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/carver/CarverConfiguration.java b/src/net/minecraft/world/level/levelgen/carver/CarverConfiguration.java
index 42b7874..7e3ef96 100644
--- a/src/net/minecraft/world/level/levelgen/carver/CarverConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/carver/CarverConfiguration.java
@@ -1,5 +1,5 @@
 package net.minecraft.world.level.levelgen.carver;
 
 public interface CarverConfiguration {
-    public static final NoneCarverConfiguration NONE = new NoneCarverConfiguration();
+    public static final NoneCarverConfiguration NONE = NoneCarverConfiguration.INSTANCE;
 }
diff --git a/src/net/minecraft/world/level/levelgen/carver/CaveWorldCarver.java b/src/net/minecraft/world/level/levelgen/carver/CaveWorldCarver.java
index 86d8be3..87dfa4f 100644
--- a/src/net/minecraft/world/level/levelgen/carver/CaveWorldCarver.java
+++ b/src/net/minecraft/world/level/levelgen/carver/CaveWorldCarver.java
@@ -4,24 +4,24 @@ import net.minecraft.util.Mth;
 import java.util.BitSet;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
+import java.util.function.Function;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
 
 public class CaveWorldCarver extends WorldCarver<ProbabilityFeatureConfiguration> {
-    public CaveWorldCarver(final Function<Dynamic<?>, ? extends ProbabilityFeatureConfiguration> function, final int integer) {
-        super(function, integer);
+    public CaveWorldCarver(final Codec<ProbabilityFeatureConfiguration> codec, final int integer) {
+        super(codec, integer);
     }
     
     @Override
-    public boolean isStartChunk(final Random random, final int integer2, final int integer3, final ProbabilityFeatureConfiguration cgy) {
-        return random.nextFloat() <= cgy.probability;
+    public boolean isStartChunk(final Random random, final int integer2, final int integer3, final ProbabilityFeatureConfiguration cod) {
+        return random.nextFloat() <= cod.probability;
     }
     
     @Override
-    public boolean carve(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final Random random, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BitSet bitSet, final ProbabilityFeatureConfiguration cgy) {
+    public boolean carve(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final Random random, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BitSet bitSet, final ProbabilityFeatureConfiguration cod) {
         final int integer9 = (this.getRange() * 2 - 1) * 16;
         for (int integer10 = random.nextInt(random.nextInt(random.nextInt(this.getCaveBound()) + 1) + 1), integer11 = 0; integer11 < integer10; ++integer11) {
             final double double15 = integer5 * 16 + random.nextInt(16);
@@ -31,7 +31,7 @@ public class CaveWorldCarver extends WorldCarver<ProbabilityFeatureConfiguration
             if (random.nextInt(4) == 0) {
                 final double double18 = 0.5;
                 final float float24 = 1.0f + random.nextFloat() * 6.0f;
-                this.genRoom(bzy, function, random.nextLong(), integer4, integer7, integer8, double15, double16, double17, float24, 0.5, bitSet);
+                this.genRoom(cgy, function, random.nextLong(), integer4, integer7, integer8, double15, double16, double17, float24, 0.5, bitSet);
                 integer12 += random.nextInt(4);
             }
             for (int integer13 = 0; integer13 < integer12; ++integer13) {
@@ -40,7 +40,7 @@ public class CaveWorldCarver extends WorldCarver<ProbabilityFeatureConfiguration
                 final float float26 = this.getThickness(random);
                 final int integer14 = integer9 - random.nextInt(integer9 / 4);
                 final int integer15 = 0;
-                this.genTunnel(bzy, function, random.nextLong(), integer4, integer7, integer8, double15, double16, double17, float26, float25, float24, 0, integer14, this.getYScale(), bitSet);
+                this.genTunnel(cgy, function, random.nextLong(), integer4, integer7, integer8, double15, double16, double17, float26, float25, float24, 0, integer14, this.getYScale(), bitSet);
             }
         }
         return true;
@@ -66,13 +66,13 @@ public class CaveWorldCarver extends WorldCarver<ProbabilityFeatureConfiguration
         return random.nextInt(random.nextInt(120) + 8);
     }
     
-    protected void genRoom(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final long long3, final int integer4, final int integer5, final int integer6, final double double7, final double double8, final double double9, final float float10, final double double11, final BitSet bitSet) {
+    protected void genRoom(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final long long3, final int integer4, final int integer5, final int integer6, final double double7, final double double8, final double double9, final float float10, final double double11, final BitSet bitSet) {
         final double double12 = 1.5 + Mth.sin(1.5707964f) * float10;
         final double double13 = double12 * double11;
-        this.carveSphere(bzy, function, long3, integer4, integer5, integer6, double7 + 1.0, double8, double9, double12, double13, bitSet);
+        this.carveSphere(cgy, function, long3, integer4, integer5, integer6, double7 + 1.0, double8, double9, double12, double13, bitSet);
     }
     
-    protected void genTunnel(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final long long3, final int integer4, final int integer5, final int integer6, double double7, double double8, double double9, final float float10, float float11, float float12, final int integer13, final int integer14, final double double15, final BitSet bitSet) {
+    protected void genTunnel(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final long long3, final int integer4, final int integer5, final int integer6, double double7, double double8, double double9, final float float10, float float11, float float12, final int integer13, final int integer14, final double double15, final BitSet bitSet) {
         final Random random23 = new Random(long3);
         final int integer15 = random23.nextInt(integer14 / 2) + integer14 / 4;
         final boolean boolean25 = random23.nextInt(6) == 0;
@@ -93,15 +93,15 @@ public class CaveWorldCarver extends WorldCarver<ProbabilityFeatureConfiguration
             float14 += (random23.nextFloat() - random23.nextFloat()) * random23.nextFloat() * 2.0f;
             float13 += (random23.nextFloat() - random23.nextFloat()) * random23.nextFloat() * 4.0f;
             if (integer16 == integer15 && float10 > 1.0f) {
-                this.genTunnel(bzy, function, random23.nextLong(), integer4, integer5, integer6, double7, double8, double9, random23.nextFloat() * 0.5f + 0.5f, float11 - 1.5707964f, float12 / 3.0f, integer16, integer14, 1.0, bitSet);
-                this.genTunnel(bzy, function, random23.nextLong(), integer4, integer5, integer6, double7, double8, double9, random23.nextFloat() * 0.5f + 0.5f, float11 + 1.5707964f, float12 / 3.0f, integer16, integer14, 1.0, bitSet);
+                this.genTunnel(cgy, function, random23.nextLong(), integer4, integer5, integer6, double7, double8, double9, random23.nextFloat() * 0.5f + 0.5f, float11 - 1.5707964f, float12 / 3.0f, integer16, integer14, 1.0, bitSet);
+                this.genTunnel(cgy, function, random23.nextLong(), integer4, integer5, integer6, double7, double8, double9, random23.nextFloat() * 0.5f + 0.5f, float11 + 1.5707964f, float12 / 3.0f, integer16, integer14, 1.0, bitSet);
                 return;
             }
             if (random23.nextInt(4) != 0) {
                 if (!this.canReach(integer5, integer6, double7, double9, integer16, integer14, float10)) {
                     return;
                 }
-                this.carveSphere(bzy, function, long3, integer4, integer5, integer6, double7, double8, double9, double16, double17, bitSet);
+                this.carveSphere(cgy, function, long3, integer4, integer5, integer6, double7, double8, double9, double16, double17, bitSet);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/carver/ConfiguredWorldCarver.java b/src/net/minecraft/world/level/levelgen/carver/ConfiguredWorldCarver.java
index 3cefe34..971de72 100644
--- a/src/net/minecraft/world/level/levelgen/carver/ConfiguredWorldCarver.java
+++ b/src/net/minecraft/world/level/levelgen/carver/ConfiguredWorldCarver.java
@@ -1,26 +1,33 @@
 package net.minecraft.world.level.levelgen.carver;
 
+import net.minecraft.core.Registry;
 import java.util.BitSet;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
 import java.util.function.Function;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
+import com.mojang.serialization.Codec;
 
 public class ConfiguredWorldCarver<WC extends CarverConfiguration> {
+    public static final Codec<ConfiguredWorldCarver<?>> CODEC;
     public final WorldCarver<WC> worldCarver;
     public final WC config;
     
-    public ConfiguredWorldCarver(final WorldCarver<WC> cco, final WC cch) {
-        this.worldCarver = cco;
-        this.config = cch;
+    public ConfiguredWorldCarver(final WorldCarver<WC> cjh, final WC cja) {
+        this.worldCarver = cjh;
+        this.config = cja;
     }
     
     public boolean isStartChunk(final Random random, final int integer2, final int integer3) {
         return this.worldCarver.isStartChunk(random, integer2, integer3, this.config);
     }
     
-    public boolean carve(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final Random random, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BitSet bitSet) {
-        return this.worldCarver.carve(bzy, function, random, integer4, integer5, integer6, integer7, integer8, bitSet, this.config);
+    public boolean carve(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final Random random, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BitSet bitSet) {
+        return this.worldCarver.carve(cgy, function, random, integer4, integer5, integer6, integer7, integer8, bitSet, this.config);
+    }
+    
+    static {
+        CODEC = Registry.CARVER.dispatch("name", cjc -> cjc.worldCarver, (Function)WorldCarver::configuredCodec);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/carver/HellCaveWorldCarver.java b/src/net/minecraft/world/level/levelgen/carver/NetherWorldCarver.java
similarity index 70%
rename from src/net/minecraft/world/level/levelgen/carver/HellCaveWorldCarver.java
rename to src/net/minecraft/world/level/levelgen/carver/NetherWorldCarver.java
index 99ad073..c468b73 100644
--- a/src/net/minecraft/world/level/levelgen/carver/HellCaveWorldCarver.java
+++ b/src/net/minecraft/world/level/levelgen/carver/NetherWorldCarver.java
@@ -3,10 +3,11 @@ package net.minecraft.world.level.levelgen.carver;
 import net.minecraft.world.level.material.Fluid;
 import java.util.Set;
 import net.minecraft.world.level.block.state.BlockState;
-import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.commons.lang3.mutable.MutableBoolean;
 import java.util.BitSet;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
+import java.util.function.Function;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
 import net.minecraft.world.level.material.FlowingFluid;
@@ -15,13 +16,12 @@ import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
-public class HellCaveWorldCarver extends CaveWorldCarver {
-    public HellCaveWorldCarver(final Function<Dynamic<?>, ? extends ProbabilityFeatureConfiguration> function) {
-        super(function, 128);
-        this.replaceableBlocks = ImmutableSet.<Block>of(Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE, Blocks.DIRT, Blocks.COARSE_DIRT, new Block[] { Blocks.PODZOL, Blocks.GRASS_BLOCK, Blocks.NETHERRACK });
+public class NetherWorldCarver extends CaveWorldCarver {
+    public NetherWorldCarver(final Codec<ProbabilityFeatureConfiguration> codec) {
+        super(codec, 128);
+        this.replaceableBlocks = ImmutableSet.<Block>of(Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE, Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.GRASS_BLOCK, Blocks.NETHERRACK, Blocks.SOUL_SAND, Blocks.SOUL_SOIL, Blocks.CRIMSON_NYLIUM, Blocks.WARPED_NYLIUM, Blocks.NETHER_WART_BLOCK, Blocks.WARPED_WART_BLOCK, Blocks.BASALT, Blocks.BLACKSTONE);
         this.liquids = ImmutableSet.of(Fluids.LAVA, Fluids.WATER);
     }
     
@@ -46,22 +46,22 @@ public class HellCaveWorldCarver extends CaveWorldCarver {
     }
     
     @Override
-    protected boolean carveBlock(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final BitSet bitSet, final Random random, final BlockPos.MutableBlockPos a5, final BlockPos.MutableBlockPos a6, final BlockPos.MutableBlockPos a7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14, final int integer15, final AtomicBoolean atomicBoolean) {
+    protected boolean carveBlock(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final BitSet bitSet, final Random random, final BlockPos.MutableBlockPos a5, final BlockPos.MutableBlockPos a6, final BlockPos.MutableBlockPos a7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14, final int integer15, final MutableBoolean mutableBoolean) {
         final int integer16 = integer13 | integer15 << 4 | integer14 << 8;
         if (bitSet.get(integer16)) {
             return false;
         }
         bitSet.set(integer16);
         a5.set(integer11, integer14, integer12);
-        if (this.canReplaceBlock(bzy.getBlockState(a5))) {
-            BlockState byj19;
+        if (this.canReplaceBlock(cgy.getBlockState(a5))) {
+            BlockState cfj19;
             if (integer14 <= 31) {
-                byj19 = HellCaveWorldCarver.LAVA.createLegacyBlock();
+                cfj19 = NetherWorldCarver.LAVA.createLegacyBlock();
             }
             else {
-                byj19 = HellCaveWorldCarver.CAVE_AIR;
+                cfj19 = NetherWorldCarver.CAVE_AIR;
             }
-            bzy.setBlockState(a5, byj19, false);
+            cgy.setBlockState(a5, cfj19, false);
             return true;
         }
         return false;
diff --git a/src/net/minecraft/world/level/levelgen/carver/NoneCarverConfiguration.java b/src/net/minecraft/world/level/levelgen/carver/NoneCarverConfiguration.java
index 59ce1cf..e6b8963 100644
--- a/src/net/minecraft/world/level/levelgen/carver/NoneCarverConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/carver/NoneCarverConfiguration.java
@@ -1,4 +1,13 @@
 package net.minecraft.world.level.levelgen.carver;
 
+import com.mojang.serialization.Codec;
+
 public class NoneCarverConfiguration implements CarverConfiguration {
+    public static final Codec<NoneCarverConfiguration> CODEC;
+    public static final NoneCarverConfiguration INSTANCE;
+    
+    static {
+        CODEC = Codec.unit(() -> NoneCarverConfiguration.INSTANCE);
+        INSTANCE = new NoneCarverConfiguration();
+    }
 }
diff --git a/src/net/minecraft/world/level/levelgen/carver/UnderwaterCanyonWorldCarver.java b/src/net/minecraft/world/level/levelgen/carver/UnderwaterCanyonWorldCarver.java
index dc6f111..2865dae 100644
--- a/src/net/minecraft/world/level/levelgen/carver/UnderwaterCanyonWorldCarver.java
+++ b/src/net/minecraft/world/level/levelgen/carver/UnderwaterCanyonWorldCarver.java
@@ -1,31 +1,31 @@
 package net.minecraft.world.level.levelgen.carver;
 
-import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.commons.lang3.mutable.MutableBoolean;
 import java.util.Random;
 import java.util.BitSet;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
+import java.util.function.Function;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class UnderwaterCanyonWorldCarver extends CanyonWorldCarver {
-    public UnderwaterCanyonWorldCarver(final Function<Dynamic<?>, ? extends ProbabilityFeatureConfiguration> function) {
-        super(function);
+    public UnderwaterCanyonWorldCarver(final Codec<ProbabilityFeatureConfiguration> codec) {
+        super(codec);
         this.replaceableBlocks = ImmutableSet.<Block>of(Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE, Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.GRASS_BLOCK, Blocks.TERRACOTTA, Blocks.WHITE_TERRACOTTA, Blocks.ORANGE_TERRACOTTA, Blocks.MAGENTA_TERRACOTTA, Blocks.LIGHT_BLUE_TERRACOTTA, Blocks.YELLOW_TERRACOTTA, Blocks.LIME_TERRACOTTA, Blocks.PINK_TERRACOTTA, Blocks.GRAY_TERRACOTTA, Blocks.LIGHT_GRAY_TERRACOTTA, Blocks.CYAN_TERRACOTTA, Blocks.PURPLE_TERRACOTTA, Blocks.BLUE_TERRACOTTA, Blocks.BROWN_TERRACOTTA, Blocks.GREEN_TERRACOTTA, Blocks.RED_TERRACOTTA, Blocks.BLACK_TERRACOTTA, Blocks.SANDSTONE, Blocks.RED_SANDSTONE, Blocks.MYCELIUM, Blocks.SNOW, Blocks.SAND, Blocks.GRAVEL, Blocks.WATER, Blocks.LAVA, Blocks.OBSIDIAN, Blocks.AIR, Blocks.CAVE_AIR);
     }
     
     @Override
-    protected boolean hasWater(final ChunkAccess bzy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
+    protected boolean hasWater(final ChunkAccess cgy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
         return false;
     }
     
     @Override
-    protected boolean carveBlock(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final BitSet bitSet, final Random random, final BlockPos.MutableBlockPos a5, final BlockPos.MutableBlockPos a6, final BlockPos.MutableBlockPos a7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14, final int integer15, final AtomicBoolean atomicBoolean) {
-        return UnderwaterCaveWorldCarver.carveBlock(this, bzy, bitSet, random, a5, integer8, integer9, integer10, integer11, integer12, integer13, integer14, integer15);
+    protected boolean carveBlock(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final BitSet bitSet, final Random random, final BlockPos.MutableBlockPos a5, final BlockPos.MutableBlockPos a6, final BlockPos.MutableBlockPos a7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14, final int integer15, final MutableBoolean mutableBoolean) {
+        return UnderwaterCaveWorldCarver.carveBlock(this, cgy, bitSet, random, a5, integer8, integer9, integer10, integer11, integer12, integer13, integer14, integer15);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/carver/UnderwaterCaveWorldCarver.java b/src/net/minecraft/world/level/levelgen/carver/UnderwaterCaveWorldCarver.java
index 2a1d95d..83fb1d7 100644
--- a/src/net/minecraft/world/level/levelgen/carver/UnderwaterCaveWorldCarver.java
+++ b/src/net/minecraft/world/level/levelgen/carver/UnderwaterCaveWorldCarver.java
@@ -3,36 +3,36 @@ package net.minecraft.world.level.levelgen.carver;
 import java.util.Iterator;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.Direction;
-import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.commons.lang3.mutable.MutableBoolean;
 import java.util.Random;
 import java.util.BitSet;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
+import java.util.function.Function;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class UnderwaterCaveWorldCarver extends CaveWorldCarver {
-    public UnderwaterCaveWorldCarver(final Function<Dynamic<?>, ? extends ProbabilityFeatureConfiguration> function) {
-        super(function, 256);
+    public UnderwaterCaveWorldCarver(final Codec<ProbabilityFeatureConfiguration> codec) {
+        super(codec, 256);
         this.replaceableBlocks = ImmutableSet.<Block>of(Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE, Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.GRASS_BLOCK, Blocks.TERRACOTTA, Blocks.WHITE_TERRACOTTA, Blocks.ORANGE_TERRACOTTA, Blocks.MAGENTA_TERRACOTTA, Blocks.LIGHT_BLUE_TERRACOTTA, Blocks.YELLOW_TERRACOTTA, Blocks.LIME_TERRACOTTA, Blocks.PINK_TERRACOTTA, Blocks.GRAY_TERRACOTTA, Blocks.LIGHT_GRAY_TERRACOTTA, Blocks.CYAN_TERRACOTTA, Blocks.PURPLE_TERRACOTTA, Blocks.BLUE_TERRACOTTA, Blocks.BROWN_TERRACOTTA, Blocks.GREEN_TERRACOTTA, Blocks.RED_TERRACOTTA, Blocks.BLACK_TERRACOTTA, Blocks.SANDSTONE, Blocks.RED_SANDSTONE, Blocks.MYCELIUM, Blocks.SNOW, Blocks.SAND, Blocks.GRAVEL, Blocks.WATER, Blocks.LAVA, Blocks.OBSIDIAN, Blocks.AIR, Blocks.CAVE_AIR, Blocks.PACKED_ICE);
     }
     
     @Override
-    protected boolean hasWater(final ChunkAccess bzy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
+    protected boolean hasWater(final ChunkAccess cgy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
         return false;
     }
     
     @Override
-    protected boolean carveBlock(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final BitSet bitSet, final Random random, final BlockPos.MutableBlockPos a5, final BlockPos.MutableBlockPos a6, final BlockPos.MutableBlockPos a7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14, final int integer15, final AtomicBoolean atomicBoolean) {
-        return carveBlock(this, bzy, bitSet, random, a5, integer8, integer9, integer10, integer11, integer12, integer13, integer14, integer15);
+    protected boolean carveBlock(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final BitSet bitSet, final Random random, final BlockPos.MutableBlockPos a5, final BlockPos.MutableBlockPos a6, final BlockPos.MutableBlockPos a7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14, final int integer15, final MutableBoolean mutableBoolean) {
+        return carveBlock(this, cgy, bitSet, random, a5, integer8, integer9, integer10, integer11, integer12, integer13, integer14, integer15);
     }
     
-    protected static boolean carveBlock(final WorldCarver<?> cco, final ChunkAccess bzy, final BitSet bitSet, final Random random, final BlockPos.MutableBlockPos a, final int integer6, final int integer7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13) {
+    protected static boolean carveBlock(final WorldCarver<?> cjh, final ChunkAccess cgy, final BitSet bitSet, final Random random, final BlockPos.MutableBlockPos a, final int integer6, final int integer7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13) {
         if (integer12 >= integer6) {
             return false;
         }
@@ -42,39 +42,39 @@ public class UnderwaterCaveWorldCarver extends CaveWorldCarver {
         }
         bitSet.set(integer14);
         a.set(integer9, integer12, integer10);
-        final BlockState byj15 = bzy.getBlockState(a);
-        if (!cco.canReplaceBlock(byj15)) {
+        final BlockState cfj15 = cgy.getBlockState(a);
+        if (!cjh.canReplaceBlock(cfj15)) {
             return false;
         }
         if (integer12 == 10) {
             final float float16 = random.nextFloat();
             if (float16 < 0.25) {
-                bzy.setBlockState(a, Blocks.MAGMA_BLOCK.defaultBlockState(), false);
-                bzy.getBlockTicks().scheduleTick(a, Blocks.MAGMA_BLOCK, 0);
+                cgy.setBlockState(a, Blocks.MAGMA_BLOCK.defaultBlockState(), false);
+                cgy.getBlockTicks().scheduleTick(a, Blocks.MAGMA_BLOCK, 0);
             }
             else {
-                bzy.setBlockState(a, Blocks.OBSIDIAN.defaultBlockState(), false);
+                cgy.setBlockState(a, Blocks.OBSIDIAN.defaultBlockState(), false);
             }
             return true;
         }
         if (integer12 < 10) {
-            bzy.setBlockState(a, Blocks.LAVA.defaultBlockState(), false);
+            cgy.setBlockState(a, Blocks.LAVA.defaultBlockState(), false);
             return false;
         }
         boolean boolean16 = false;
-        for (final Direction fp18 : Direction.Plane.HORIZONTAL) {
-            final int integer15 = integer9 + fp18.getStepX();
-            final int integer16 = integer10 + fp18.getStepZ();
-            if (integer15 >> 4 != integer7 || integer16 >> 4 != integer8 || bzy.getBlockState(a.set(integer15, integer12, integer16)).isAir()) {
-                bzy.setBlockState(a, UnderwaterCaveWorldCarver.WATER.createLegacyBlock(), false);
-                bzy.getLiquidTicks().scheduleTick(a, UnderwaterCaveWorldCarver.WATER.getType(), 0);
+        for (final Direction fz18 : Direction.Plane.HORIZONTAL) {
+            final int integer15 = integer9 + fz18.getStepX();
+            final int integer16 = integer10 + fz18.getStepZ();
+            if (integer15 >> 4 != integer7 || integer16 >> 4 != integer8 || cgy.getBlockState(a.set(integer15, integer12, integer16)).isAir()) {
+                cgy.setBlockState(a, UnderwaterCaveWorldCarver.WATER.createLegacyBlock(), false);
+                cgy.getLiquidTicks().scheduleTick(a, UnderwaterCaveWorldCarver.WATER.getType(), 0);
                 boolean16 = true;
                 break;
             }
         }
         a.set(integer9, integer12, integer10);
         if (!boolean16) {
-            bzy.setBlockState(a, UnderwaterCaveWorldCarver.WATER.createLegacyBlock(), false);
+            cgy.setBlockState(a, UnderwaterCaveWorldCarver.WATER.createLegacyBlock(), false);
             return true;
         }
         return true;
diff --git a/src/net/minecraft/world/level/levelgen/carver/WorldCarver.java b/src/net/minecraft/world/level/levelgen/carver/WorldCarver.java
index bee71ca..ab371ab 100644
--- a/src/net/minecraft/world/level/levelgen/carver/WorldCarver.java
+++ b/src/net/minecraft/world/level/levelgen/carver/WorldCarver.java
@@ -1,22 +1,23 @@
 package net.minecraft.world.level.levelgen.carver;
 
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
-import net.minecraft.core.Direction;
 import net.minecraft.core.Vec3i;
-import java.util.concurrent.atomic.AtomicBoolean;
+import net.minecraft.core.Direction;
+import org.apache.commons.lang3.mutable.MutableBoolean;
 import net.minecraft.util.Mth;
 import java.util.Random;
 import java.util.BitSet;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
+import java.util.function.Function;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.material.FlowingFluid;
 import net.minecraft.world.level.material.Fluids;
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.block.Block;
 import java.util.Set;
@@ -26,7 +27,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeat
 
 public abstract class WorldCarver<C extends CarverConfiguration> {
     public static final WorldCarver<ProbabilityFeatureConfiguration> CAVE;
-    public static final WorldCarver<ProbabilityFeatureConfiguration> HELL_CAVE;
+    public static final WorldCarver<ProbabilityFeatureConfiguration> NETHER_CAVE;
     public static final WorldCarver<ProbabilityFeatureConfiguration> CANYON;
     public static final WorldCarver<ProbabilityFeatureConfiguration> UNDERWATER_CANYON;
     public static final WorldCarver<ProbabilityFeatureConfiguration> UNDERWATER_CAVE;
@@ -36,25 +37,29 @@ public abstract class WorldCarver<C extends CarverConfiguration> {
     protected static final FluidState LAVA;
     protected Set<Block> replaceableBlocks;
     protected Set<Fluid> liquids;
-    private final Function<Dynamic<?>, ? extends C> configurationFactory;
+    private final Codec<ConfiguredWorldCarver<C>> configuredCodec;
     protected final int genHeight;
     
-    private static <C extends CarverConfiguration, F extends WorldCarver<C>> F register(final String string, final F cco) {
-        return Registry.<F>register(Registry.CARVER, string, cco);
+    private static <C extends CarverConfiguration, F extends WorldCarver<C>> F register(final String string, final F cjh) {
+        return Registry.<F>register(Registry.CARVER, string, cjh);
     }
     
-    public WorldCarver(final Function<Dynamic<?>, ? extends C> function, final int integer) {
+    public WorldCarver(final Codec<C> codec, final int integer) {
         this.replaceableBlocks = ImmutableSet.<Block>of(Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE, Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.GRASS_BLOCK, Blocks.TERRACOTTA, Blocks.WHITE_TERRACOTTA, Blocks.ORANGE_TERRACOTTA, Blocks.MAGENTA_TERRACOTTA, Blocks.LIGHT_BLUE_TERRACOTTA, Blocks.YELLOW_TERRACOTTA, Blocks.LIME_TERRACOTTA, Blocks.PINK_TERRACOTTA, Blocks.GRAY_TERRACOTTA, Blocks.LIGHT_GRAY_TERRACOTTA, Blocks.CYAN_TERRACOTTA, Blocks.PURPLE_TERRACOTTA, Blocks.BLUE_TERRACOTTA, Blocks.BROWN_TERRACOTTA, Blocks.GREEN_TERRACOTTA, Blocks.RED_TERRACOTTA, Blocks.BLACK_TERRACOTTA, Blocks.SANDSTONE, Blocks.RED_SANDSTONE, Blocks.MYCELIUM, Blocks.SNOW, Blocks.PACKED_ICE);
         this.liquids = ImmutableSet.of(Fluids.WATER);
-        this.configurationFactory = function;
         this.genHeight = integer;
+        this.configuredCodec = (Codec<ConfiguredWorldCarver<C>>)codec.fieldOf("config").xmap(cja -> new ConfiguredWorldCarver((WorldCarver<CarverConfiguration>)this, cja), cjc -> cjc.config).codec();
+    }
+    
+    public Codec<ConfiguredWorldCarver<C>> configuredCodec() {
+        return this.configuredCodec;
     }
     
     public int getRange() {
         return 4;
     }
     
-    protected boolean carveSphere(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final long long3, final int integer4, final int integer5, final int integer6, final double double7, final double double8, final double double9, final double double10, final double double11, final BitSet bitSet) {
+    protected boolean carveSphere(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final long long3, final int integer4, final int integer5, final int integer6, final double double7, final double double8, final double double9, final double double10, final double double11, final BitSet bitSet) {
         final Random random20 = new Random(long3 + integer5 + integer6);
         final double double12 = integer5 * 16 + 8;
         final double double13 = integer6 * 16 + 8;
@@ -67,7 +72,7 @@ public abstract class WorldCarver<C extends CarverConfiguration> {
         final int integer10 = Math.min(Mth.floor(double8 + double11) + 1, this.genHeight - 8);
         final int integer11 = Math.max(Mth.floor(double9 - double10) - integer6 * 16 - 1, 0);
         final int integer12 = Math.min(Mth.floor(double9 + double10) - integer6 * 16 + 1, 16);
-        if (this.hasWater(bzy, integer5, integer6, integer7, integer8, integer9, integer10, integer11, integer12)) {
+        if (this.hasWater(cgy, integer5, integer6, integer7, integer8, integer9, integer10, integer11, integer12)) {
             return false;
         }
         boolean boolean31 = false;
@@ -81,11 +86,11 @@ public abstract class WorldCarver<C extends CarverConfiguration> {
                 final int integer16 = integer15 + integer6 * 16;
                 final double double15 = (integer16 + 0.5 - double9) / double10;
                 if (double14 * double14 + double15 * double15 < 1.0) {
-                    final AtomicBoolean atomicBoolean43 = new AtomicBoolean(false);
+                    final MutableBoolean mutableBoolean43 = new MutableBoolean(false);
                     for (int integer17 = integer10; integer17 > integer9; --integer17) {
                         final double double16 = (integer17 - 0.5 - double8) / double11;
                         if (!this.skip(double14, double16, double15, integer17)) {
-                            boolean31 |= this.carveBlock(bzy, function, bitSet, random20, a32, a33, a34, integer4, integer5, integer6, integer14, integer16, integer13, integer17, integer15, atomicBoolean43);
+                            boolean31 |= this.carveBlock(cgy, function, bitSet, random20, a32, a33, a34, integer4, integer5, integer6, integer14, integer16, integer13, integer17, integer15, mutableBoolean43);
                         }
                     }
                 }
@@ -94,55 +99,54 @@ public abstract class WorldCarver<C extends CarverConfiguration> {
         return boolean31;
     }
     
-    protected boolean carveBlock(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final BitSet bitSet, final Random random, final BlockPos.MutableBlockPos a5, final BlockPos.MutableBlockPos a6, final BlockPos.MutableBlockPos a7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14, final int integer15, final AtomicBoolean atomicBoolean) {
+    protected boolean carveBlock(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final BitSet bitSet, final Random random, final BlockPos.MutableBlockPos a5, final BlockPos.MutableBlockPos a6, final BlockPos.MutableBlockPos a7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14, final int integer15, final MutableBoolean mutableBoolean) {
         final int integer16 = integer13 | integer15 << 4 | integer14 << 8;
         if (bitSet.get(integer16)) {
             return false;
         }
         bitSet.set(integer16);
         a5.set(integer11, integer14, integer12);
-        final BlockState byj19 = bzy.getBlockState(a5);
-        final BlockState byj20 = bzy.getBlockState(a6.set(a5).move(Direction.UP));
-        if (byj19.getBlock() == Blocks.GRASS_BLOCK || byj19.getBlock() == Blocks.MYCELIUM) {
-            atomicBoolean.set(true);
+        final BlockState cfj19 = cgy.getBlockState(a5);
+        final BlockState cfj20 = cgy.getBlockState(a6.setWithOffset(a5, Direction.UP));
+        if (cfj19.is(Blocks.GRASS_BLOCK) || cfj19.is(Blocks.MYCELIUM)) {
+            mutableBoolean.setTrue();
         }
-        if (!this.canReplaceBlock(byj19, byj20)) {
+        if (!this.canReplaceBlock(cfj19, cfj20)) {
             return false;
         }
         if (integer14 < 11) {
-            bzy.setBlockState(a5, WorldCarver.LAVA.createLegacyBlock(), false);
+            cgy.setBlockState(a5, WorldCarver.LAVA.createLegacyBlock(), false);
         }
         else {
-            bzy.setBlockState(a5, WorldCarver.CAVE_AIR, false);
-            if (atomicBoolean.get()) {
-                a7.set(a5).move(Direction.DOWN);
-                if (bzy.getBlockState(a7).getBlock() == Blocks.DIRT) {
-                    bzy.setBlockState(a7, function.apply(a5).getSurfaceBuilderConfig().getTopMaterial(), false);
+            cgy.setBlockState(a5, WorldCarver.CAVE_AIR, false);
+            if (mutableBoolean.isTrue()) {
+                a7.setWithOffset(a5, Direction.DOWN);
+                if (cgy.getBlockState(a7).is(Blocks.DIRT)) {
+                    cgy.setBlockState(a7, function.apply(a5).getSurfaceBuilderConfig().getTopMaterial(), false);
                 }
             }
         }
         return true;
     }
     
-    public abstract boolean carve(final ChunkAccess bzy, final Function<BlockPos, Biome> function, final Random random, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BitSet bitSet, final C cch);
+    public abstract boolean carve(final ChunkAccess cgy, final Function<BlockPos, Biome> function, final Random random, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BitSet bitSet, final C cja);
     
-    public abstract boolean isStartChunk(final Random random, final int integer2, final int integer3, final C cch);
+    public abstract boolean isStartChunk(final Random random, final int integer2, final int integer3, final C cja);
     
-    protected boolean canReplaceBlock(final BlockState byj) {
-        return this.replaceableBlocks.contains(byj.getBlock());
+    protected boolean canReplaceBlock(final BlockState cfj) {
+        return this.replaceableBlocks.contains(cfj.getBlock());
     }
     
-    protected boolean canReplaceBlock(final BlockState byj1, final BlockState byj2) {
-        final Block bph4 = byj1.getBlock();
-        return this.canReplaceBlock(byj1) || ((bph4 == Blocks.SAND || bph4 == Blocks.GRAVEL) && !byj2.getFluidState().is(FluidTags.WATER));
+    protected boolean canReplaceBlock(final BlockState cfj1, final BlockState cfj2) {
+        return this.canReplaceBlock(cfj1) || ((cfj1.is(Blocks.SAND) || cfj1.is(Blocks.GRAVEL)) && !cfj2.getFluidState().is(FluidTags.WATER));
     }
     
-    protected boolean hasWater(final ChunkAccess bzy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
+    protected boolean hasWater(final ChunkAccess cgy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9) {
         final BlockPos.MutableBlockPos a11 = new BlockPos.MutableBlockPos();
         for (int integer10 = integer4; integer10 < integer5; ++integer10) {
             for (int integer11 = integer8; integer11 < integer9; ++integer11) {
                 for (int integer12 = integer6 - 1; integer12 <= integer7 + 1; ++integer12) {
-                    if (this.liquids.contains(bzy.getFluidState(a11.set(integer10 + integer2 * 16, integer12, integer11 + integer3 * 16)).getType())) {
+                    if (this.liquids.contains(cgy.getFluidState(a11.set(integer10 + integer2 * 16, integer12, integer11 + integer3 * 16)).getType())) {
                         return true;
                     }
                     if (integer12 != integer7 + 1 && !this.isEdge(integer4, integer5, integer8, integer9, integer10, integer11)) {
@@ -171,11 +175,11 @@ public abstract class WorldCarver<C extends CarverConfiguration> {
     protected abstract boolean skip(final double double1, final double double2, final double double3, final int integer);
     
     static {
-        CAVE = WorldCarver.<CarverConfiguration, CaveWorldCarver>register("cave", new CaveWorldCarver(ProbabilityFeatureConfiguration::deserialize, 256));
-        HELL_CAVE = WorldCarver.<CarverConfiguration, HellCaveWorldCarver>register("hell_cave", new HellCaveWorldCarver(ProbabilityFeatureConfiguration::deserialize));
-        CANYON = WorldCarver.<CarverConfiguration, CanyonWorldCarver>register("canyon", new CanyonWorldCarver(ProbabilityFeatureConfiguration::deserialize));
-        UNDERWATER_CANYON = WorldCarver.<CarverConfiguration, UnderwaterCanyonWorldCarver>register("underwater_canyon", new UnderwaterCanyonWorldCarver(ProbabilityFeatureConfiguration::deserialize));
-        UNDERWATER_CAVE = WorldCarver.<CarverConfiguration, UnderwaterCaveWorldCarver>register("underwater_cave", new UnderwaterCaveWorldCarver(ProbabilityFeatureConfiguration::deserialize));
+        CAVE = WorldCarver.<CarverConfiguration, CaveWorldCarver>register("cave", new CaveWorldCarver(ProbabilityFeatureConfiguration.CODEC, 256));
+        NETHER_CAVE = WorldCarver.<CarverConfiguration, NetherWorldCarver>register("nether_cave", new NetherWorldCarver(ProbabilityFeatureConfiguration.CODEC));
+        CANYON = WorldCarver.<CarverConfiguration, CanyonWorldCarver>register("canyon", new CanyonWorldCarver(ProbabilityFeatureConfiguration.CODEC));
+        UNDERWATER_CANYON = WorldCarver.<CarverConfiguration, UnderwaterCanyonWorldCarver>register("underwater_canyon", new UnderwaterCanyonWorldCarver(ProbabilityFeatureConfiguration.CODEC));
+        UNDERWATER_CAVE = WorldCarver.<CarverConfiguration, UnderwaterCaveWorldCarver>register("underwater_cave", new UnderwaterCaveWorldCarver(ProbabilityFeatureConfiguration.CODEC));
         AIR = Blocks.AIR.defaultBlockState();
         CAVE_AIR = Blocks.CAVE_AIR.defaultBlockState();
         WATER = Fluids.WATER.defaultFluidState();
diff --git a/src/net/minecraft/world/level/levelgen/feature/AbstractFlowerFeature.java b/src/net/minecraft/world/level/levelgen/feature/AbstractFlowerFeature.java
index e37d1d6..06443b6 100644
--- a/src/net/minecraft/world/level/levelgen/feature/AbstractFlowerFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/AbstractFlowerFeature.java
@@ -1,40 +1,40 @@
 package net.minecraft.world.level.levelgen.feature;
 
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 
 public abstract class AbstractFlowerFeature<U extends FeatureConfiguration> extends Feature<U> {
-    public AbstractFlowerFeature(final Function<Dynamic<?>, ? extends U> function) {
-        super(function);
+    public AbstractFlowerFeature(final Codec<U> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final U cgn) {
-        final BlockState byj7 = this.getRandomFlower(random, fk, cgn);
-        int integer8 = 0;
-        for (int integer9 = 0; integer9 < this.getCount(cgn); ++integer9) {
-            final BlockPos fk2 = this.getPos(random, fk, cgn);
-            if (bjx.isEmptyBlock(fk2) && fk2.getY() < 255 && byj7.canSurvive(bjx, fk2) && this.isValid(bjx, fk2, cgn)) {
-                bjx.setBlock(fk2, byj7, 2);
-                ++integer8;
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final U cnr) {
+        final BlockState cfj8 = this.getRandomFlower(random, fu, cnr);
+        int integer9 = 0;
+        for (int integer10 = 0; integer10 < this.getCount(cnr); ++integer10) {
+            final BlockPos fu2 = this.getPos(random, fu, cnr);
+            if (bqu.isEmptyBlock(fu2) && fu2.getY() < 255 && cfj8.canSurvive(bqu, fu2) && this.isValid(bqu, fu2, cnr)) {
+                bqu.setBlock(fu2, cfj8, 2);
+                ++integer9;
             }
         }
-        return integer8 > 0;
+        return integer9 > 0;
     }
     
-    public abstract boolean isValid(final LevelAccessor bjx, final BlockPos fk, final U cgn);
+    public abstract boolean isValid(final LevelAccessor bqc, final BlockPos fu, final U cnr);
     
-    public abstract int getCount(final U cgn);
+    public abstract int getCount(final U cnr);
     
-    public abstract BlockPos getPos(final Random random, final BlockPos fk, final U cgn);
+    public abstract BlockPos getPos(final Random random, final BlockPos fu, final U cnr);
     
-    public abstract BlockState getRandomFlower(final Random random, final BlockPos fk, final U cgn);
+    public abstract BlockState getRandomFlower(final Random random, final BlockPos fu, final U cnr);
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.java b/src/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.java
index cd9f830..a38c18f 100644
--- a/src/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.java
@@ -1,10 +1,12 @@
 package net.minecraft.world.level.levelgen.feature;
 
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.LevelWriter;
 import net.minecraft.world.level.BlockGetter;
@@ -13,20 +15,19 @@ import net.minecraft.core.Vec3i;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration;
 
 public abstract class AbstractHugeMushroomFeature extends Feature<HugeMushroomFeatureConfiguration> {
-    public AbstractHugeMushroomFeature(final Function<Dynamic<?>, ? extends HugeMushroomFeatureConfiguration> function) {
-        super(function);
+    public AbstractHugeMushroomFeature(final Codec<HugeMushroomFeatureConfiguration> codec) {
+        super(codec);
     }
     
-    protected void placeTrunk(final LevelAccessor bjx, final Random random, final BlockPos fk, final HugeMushroomFeatureConfiguration cgp, final int integer, final BlockPos.MutableBlockPos a) {
+    protected void placeTrunk(final LevelAccessor bqc, final Random random, final BlockPos fu, final HugeMushroomFeatureConfiguration cnt, final int integer, final BlockPos.MutableBlockPos a) {
         for (int integer2 = 0; integer2 < integer; ++integer2) {
-            a.set(fk).move(Direction.UP, integer2);
-            if (!bjx.getBlockState(a).isSolidRender(bjx, a)) {
-                this.setBlock(bjx, a, cgp.stemProvider.getState(random, fk));
+            a.set(fu).move(Direction.UP, integer2);
+            if (!bqc.getBlockState(a).isSolidRender(bqc, a)) {
+                this.setBlock(bqc, a, cnt.stemProvider.getState(random, fu));
             }
         }
     }
@@ -39,20 +40,20 @@ public abstract class AbstractHugeMushroomFeature extends Feature<HugeMushroomFe
         return integer3;
     }
     
-    protected boolean isValidPosition(final LevelAccessor bjx, final BlockPos fk, final int integer, final BlockPos.MutableBlockPos a, final HugeMushroomFeatureConfiguration cgp) {
-        final int integer2 = fk.getY();
+    protected boolean isValidPosition(final LevelAccessor bqc, final BlockPos fu, final int integer, final BlockPos.MutableBlockPos a, final HugeMushroomFeatureConfiguration cnt) {
+        final int integer2 = fu.getY();
         if (integer2 < 1 || integer2 + integer + 1 >= 256) {
             return false;
         }
-        final Block bph8 = bjx.getBlockState(fk.below()).getBlock();
-        if (!Feature.isDirt(bph8)) {
+        final Block bvr8 = bqc.getBlockState(fu.below()).getBlock();
+        if (!Feature.isDirt(bvr8)) {
             return false;
         }
         for (int integer3 = 0; integer3 <= integer; ++integer3) {
-            for (int integer4 = this.getTreeRadiusForHeight(-1, -1, cgp.foliageRadius, integer3), integer5 = -integer4; integer5 <= integer4; ++integer5) {
+            for (int integer4 = this.getTreeRadiusForHeight(-1, -1, cnt.foliageRadius, integer3), integer5 = -integer4; integer5 <= integer4; ++integer5) {
                 for (int integer6 = -integer4; integer6 <= integer4; ++integer6) {
-                    final BlockState byj13 = bjx.getBlockState(a.set(fk).move(integer5, integer3, integer6));
-                    if (!byj13.isAir() && !byj13.is(BlockTags.LEAVES)) {
+                    final BlockState cfj13 = bqc.getBlockState(a.setWithOffset(fu, integer5, integer3, integer6));
+                    if (!cfj13.isAir() && !cfj13.is(BlockTags.LEAVES)) {
                         return false;
                     }
                 }
@@ -62,18 +63,18 @@ public abstract class AbstractHugeMushroomFeature extends Feature<HugeMushroomFe
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final HugeMushroomFeatureConfiguration cgp) {
-        final int integer7 = this.getTreeHeight(random);
-        final BlockPos.MutableBlockPos a8 = new BlockPos.MutableBlockPos();
-        if (!this.isValidPosition(bjx, fk, integer7, a8, cgp)) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final HugeMushroomFeatureConfiguration cnt) {
+        final int integer8 = this.getTreeHeight(random);
+        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos();
+        if (!this.isValidPosition(bqu, fu, integer8, a9, cnt)) {
             return false;
         }
-        this.makeCap(bjx, random, fk, integer7, a8, cgp);
-        this.placeTrunk(bjx, random, fk, cgp, integer7, a8);
+        this.makeCap(bqu, random, fu, integer8, a9, cnt);
+        this.placeTrunk(bqu, random, fu, cnt, integer8, a9);
         return true;
     }
     
     protected abstract int getTreeRadiusForHeight(final int integer1, final int integer2, final int integer3, final int integer4);
     
-    protected abstract void makeCap(final LevelAccessor bjx, final Random random, final BlockPos fk, final int integer, final BlockPos.MutableBlockPos a, final HugeMushroomFeatureConfiguration cgp);
+    protected abstract void makeCap(final LevelAccessor bqc, final Random random, final BlockPos fu, final int integer, final BlockPos.MutableBlockPos a, final HugeMushroomFeatureConfiguration cnt);
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/AbstractSmallTreeFeature.java b/src/net/minecraft/world/level/levelgen/feature/AbstractSmallTreeFeature.java
deleted file mode 100644
index ee935ca..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/AbstractSmallTreeFeature.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package net.minecraft.world.level.levelgen.feature;
-
-import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.levelgen.Heightmap;
-import java.util.Optional;
-import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.Set;
-import net.minecraft.core.BlockPos;
-import java.util.Random;
-import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
-
-public abstract class AbstractSmallTreeFeature<T extends SmallTreeConfiguration> extends AbstractTreeFeature<T> {
-    public AbstractSmallTreeFeature(final Function<Dynamic<?>, ? extends T> function) {
-        super(function);
-    }
-    
-    protected void placeTrunk(final LevelSimulatedRW bkb, final Random random, final int integer3, final BlockPos fk, final int integer5, final Set<BlockPos> set, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        for (int integer6 = 0; integer6 < integer3 - integer5; ++integer6) {
-            this.placeLog(bkb, random, fk.above(integer6), set, clb, chi);
-        }
-    }
-    
-    public Optional<BlockPos> getProjectedOrigin(final LevelSimulatedRW bkb, final int integer2, final int integer3, final int integer4, final BlockPos fk, final SmallTreeConfiguration chi) {
-        BlockPos fk2;
-        if (!chi.fromSapling) {
-            final int integer5 = bkb.getHeightmapPos(Heightmap.Types.OCEAN_FLOOR, fk).getY();
-            final int integer6 = bkb.getHeightmapPos(Heightmap.Types.WORLD_SURFACE, fk).getY();
-            fk2 = new BlockPos(fk.getX(), integer5, fk.getZ());
-            if (integer6 - integer5 > chi.maxWaterDepth) {
-                return Optional.<BlockPos>empty();
-            }
-        }
-        else {
-            fk2 = fk;
-        }
-        if (fk2.getY() < 1 || fk2.getY() + integer2 + 1 > 256) {
-            return Optional.<BlockPos>empty();
-        }
-        for (int integer5 = 0; integer5 <= integer2 + 1; ++integer5) {
-            final int integer6 = chi.foliagePlacer.getTreeRadiusForHeight(integer3, integer2, integer4, integer5);
-            final BlockPos.MutableBlockPos a11 = new BlockPos.MutableBlockPos();
-            for (int integer7 = -integer6; integer7 <= integer6; ++integer7) {
-                for (int integer8 = -integer6; integer8 <= integer6; ++integer8) {
-                    if (integer5 + fk2.getY() < 0 || integer5 + fk2.getY() >= 256) {
-                        return Optional.<BlockPos>empty();
-                    }
-                    a11.set(integer7 + fk2.getX(), integer5 + fk2.getY(), integer8 + fk2.getZ());
-                    if (!AbstractTreeFeature.isFree(bkb, a11) || (!chi.ignoreVines && AbstractTreeFeature.isVine(bkb, a11))) {
-                        return Optional.<BlockPos>empty();
-                    }
-                }
-            }
-        }
-        if (!AbstractTreeFeature.isGrassOrDirtOrFarmland(bkb, fk2.below()) || fk2.getY() >= 256 - integer2 - 1) {
-            return Optional.<BlockPos>empty();
-        }
-        return Optional.<BlockPos>of(fk2);
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/AbstractTreeFeature.java b/src/net/minecraft/world/level/levelgen/feature/AbstractTreeFeature.java
deleted file mode 100644
index 37b3764..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/AbstractTreeFeature.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package net.minecraft.world.level.levelgen.feature;
-
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import java.util.Iterator;
-import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-import net.minecraft.core.Direction;
-import net.minecraft.world.phys.shapes.BitSetDiscreteVoxelShape;
-import net.minecraft.world.phys.shapes.DiscreteVoxelShape;
-import java.util.List;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
-import java.util.Comparator;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.core.Vec3i;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.Set;
-import java.util.Random;
-import net.minecraft.world.level.LevelWriter;
-import net.minecraft.world.level.LevelSimulatedRW;
-import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.tags.BlockTags;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LevelSimulatedReader;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-
-public abstract class AbstractTreeFeature<T extends TreeConfiguration> extends Feature<T> {
-    public AbstractTreeFeature(final Function<Dynamic<?>, ? extends T> function) {
-        super(function);
-    }
-    
-    protected static boolean isFree(final LevelSimulatedReader bkc, final BlockPos fk) {
-        final Block bph2;
-        return bkc.isStateAtPosition(fk, byj -> {
-            bph2 = byj.getBlock();
-            return byj.isAir() || byj.is(BlockTags.LEAVES) || Feature.isDirt(bph2) || bph2.is(BlockTags.LOGS) || bph2.is(BlockTags.SAPLINGS) || bph2 == Blocks.VINE;
-        });
-    }
-    
-    public static boolean isAir(final LevelSimulatedReader bkc, final BlockPos fk) {
-        return bkc.isStateAtPosition(fk, BlockState::isAir);
-    }
-    
-    protected static boolean isDirt(final LevelSimulatedReader bkc, final BlockPos fk) {
-        final Block bph2;
-        return bkc.isStateAtPosition(fk, byj -> {
-            bph2 = byj.getBlock();
-            return Feature.isDirt(bph2) && bph2 != Blocks.GRASS_BLOCK && bph2 != Blocks.MYCELIUM;
-        });
-    }
-    
-    protected static boolean isVine(final LevelSimulatedReader bkc, final BlockPos fk) {
-        return bkc.isStateAtPosition(fk, byj -> byj.getBlock() == Blocks.VINE);
-    }
-    
-    public static boolean isBlockWater(final LevelSimulatedReader bkc, final BlockPos fk) {
-        return bkc.isStateAtPosition(fk, byj -> byj.getBlock() == Blocks.WATER);
-    }
-    
-    public static boolean isAirOrLeaves(final LevelSimulatedReader bkc, final BlockPos fk) {
-        return bkc.isStateAtPosition(fk, byj -> byj.isAir() || byj.is(BlockTags.LEAVES));
-    }
-    
-    public static boolean isGrassOrDirt(final LevelSimulatedReader bkc, final BlockPos fk) {
-        return bkc.isStateAtPosition(fk, byj -> Feature.isDirt(byj.getBlock()));
-    }
-    
-    protected static boolean isGrassOrDirtOrFarmland(final LevelSimulatedReader bkc, final BlockPos fk) {
-        final Block bph2;
-        return bkc.isStateAtPosition(fk, byj -> {
-            bph2 = byj.getBlock();
-            return Feature.isDirt(bph2) || bph2 == Blocks.FARMLAND;
-        });
-    }
-    
-    public static boolean isReplaceablePlant(final LevelSimulatedReader bkc, final BlockPos fk) {
-        final Material coo2;
-        return bkc.isStateAtPosition(fk, byj -> {
-            coo2 = byj.getMaterial();
-            return coo2 == Material.REPLACEABLE_PLANT;
-        });
-    }
-    
-    protected void setDirtAt(final LevelSimulatedRW bkb, final BlockPos fk) {
-        if (!isDirt(bkb, fk)) {
-            this.setBlock(bkb, fk, Blocks.DIRT.defaultBlockState());
-        }
-    }
-    
-    protected boolean placeLog(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final Set<BlockPos> set, final BoundingBox clb, final TreeConfiguration chl) {
-        if (isAirOrLeaves(bkb, fk) || isReplaceablePlant(bkb, fk) || isBlockWater(bkb, fk)) {
-            this.setBlock(bkb, fk, chl.trunkProvider.getState(random, fk), clb);
-            set.add(fk.immutable());
-            return true;
-        }
-        return false;
-    }
-    
-    protected boolean placeLeaf(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final Set<BlockPos> set, final BoundingBox clb, final TreeConfiguration chl) {
-        if (isAirOrLeaves(bkb, fk) || isReplaceablePlant(bkb, fk) || isBlockWater(bkb, fk)) {
-            this.setBlock(bkb, fk, chl.leavesProvider.getState(random, fk), clb);
-            set.add(fk.immutable());
-            return true;
-        }
-        return false;
-    }
-    
-    @Override
-    protected void setBlock(final LevelWriter bke, final BlockPos fk, final BlockState byj) {
-        this.setBlockKnownShape(bke, fk, byj);
-    }
-    
-    protected final void setBlock(final LevelWriter bke, final BlockPos fk, final BlockState byj, final BoundingBox clb) {
-        this.setBlockKnownShape(bke, fk, byj);
-        clb.expand(new BoundingBox(fk, fk));
-    }
-    
-    private void setBlockKnownShape(final LevelWriter bke, final BlockPos fk, final BlockState byj) {
-        bke.setBlock(fk, byj, 19);
-    }
-    
-    @Override
-    public final boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final T chl) {
-        final Set<BlockPos> set7 = Sets.newHashSet();
-        final Set<BlockPos> set8 = Sets.newHashSet();
-        final Set<BlockPos> set9 = Sets.newHashSet();
-        final BoundingBox clb10 = BoundingBox.getUnknownBox();
-        final boolean boolean11 = this.doPlace(bjx, random, fk, set7, set8, clb10, chl);
-        if (clb10.x0 > clb10.x1 || !boolean11 || set7.isEmpty()) {
-            return false;
-        }
-        if (!chl.decorators.isEmpty()) {
-            final List<BlockPos> list12 = Lists.newArrayList(set7);
-            final List<BlockPos> list13 = Lists.newArrayList(set8);
-            list12.sort(Comparator.comparingInt(Vec3i::getY));
-            list13.sort(Comparator.comparingInt(Vec3i::getY));
-            chl.decorators.forEach(cit -> cit.place(bjx, random, list12, list13, set9, clb10));
-        }
-        final DiscreteVoxelShape cvu12 = this.updateLeaves(bjx, clb10, set7, set9);
-        StructureTemplate.updateShapeAtEdge(bjx, 3, cvu12, clb10.x0, clb10.y0, clb10.z0);
-        return true;
-    }
-    
-    private DiscreteVoxelShape updateLeaves(final LevelAccessor bjx, final BoundingBox clb, final Set<BlockPos> set3, final Set<BlockPos> set4) {
-        final List<Set<BlockPos>> list6 = Lists.newArrayList();
-        final DiscreteVoxelShape cvu7 = new BitSetDiscreteVoxelShape(clb.getXSpan(), clb.getYSpan(), clb.getZSpan());
-        final int integer8 = 6;
-        for (int integer9 = 0; integer9 < 6; ++integer9) {
-            list6.add(Sets.newHashSet());
-        }
-        try (final BlockPos.PooledMutableBlockPos b9 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (final BlockPos fk12 : Lists.<BlockPos>newArrayList(set4)) {
-                if (clb.isInside(fk12)) {
-                    cvu7.setFull(fk12.getX() - clb.x0, fk12.getY() - clb.y0, fk12.getZ() - clb.z0, true, true);
-                }
-            }
-            for (final BlockPos fk12 : Lists.<BlockPos>newArrayList(set3)) {
-                if (clb.isInside(fk12)) {
-                    cvu7.setFull(fk12.getX() - clb.x0, fk12.getY() - clb.y0, fk12.getZ() - clb.z0, true, true);
-                }
-                for (final Direction fp16 : Direction.values()) {
-                    b9.set((Vec3i)fk12).move(fp16);
-                    if (!set3.contains(b9)) {
-                        final BlockState byj17 = bjx.getBlockState(b9);
-                        if (byj17.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.DISTANCE)) {
-                            list6.get(0).add(b9.immutable());
-                            this.setBlockKnownShape(bjx, b9, ((AbstractStateHolder<O, BlockState>)byj17).<Comparable, Integer>setValue((Property<Comparable>)BlockStateProperties.DISTANCE, 1));
-                            if (clb.isInside(b9)) {
-                                cvu7.setFull(b9.getX() - clb.x0, b9.getY() - clb.y0, b9.getZ() - clb.z0, true, true);
-                            }
-                        }
-                    }
-                }
-            }
-            for (int integer10 = 1; integer10 < 6; ++integer10) {
-                final Set<BlockPos> set5 = list6.get(integer10 - 1);
-                final Set<BlockPos> set6 = list6.get(integer10);
-                for (final BlockPos fk13 : set5) {
-                    if (clb.isInside(fk13)) {
-                        cvu7.setFull(fk13.getX() - clb.x0, fk13.getY() - clb.y0, fk13.getZ() - clb.z0, true, true);
-                    }
-                    for (final Direction fp17 : Direction.values()) {
-                        b9.set((Vec3i)fk13).move(fp17);
-                        if (!set5.contains(b9)) {
-                            if (!set6.contains(b9)) {
-                                final BlockState byj18 = bjx.getBlockState(b9);
-                                if (byj18.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.DISTANCE)) {
-                                    final int integer11 = byj18.<Integer>getValue((Property<Integer>)BlockStateProperties.DISTANCE);
-                                    if (integer11 > integer10 + 1) {
-                                        final BlockState byj19 = ((AbstractStateHolder<O, BlockState>)byj18).<Comparable, Integer>setValue((Property<Comparable>)BlockStateProperties.DISTANCE, integer10 + 1);
-                                        this.setBlockKnownShape(bjx, b9, byj19);
-                                        if (clb.isInside(b9)) {
-                                            cvu7.setFull(b9.getX() - clb.x0, b9.getY() - clb.y0, b9.getZ() - clb.z0, true, true);
-                                        }
-                                        set6.add(b9.immutable());
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return cvu7;
-    }
-    
-    protected abstract boolean doPlace(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final Set<BlockPos> set4, final Set<BlockPos> set5, final BoundingBox clb, final T chl);
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/AcaciaFeature.java b/src/net/minecraft/world/level/levelgen/feature/AcaciaFeature.java
deleted file mode 100644
index 9163d33..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/AcaciaFeature.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package net.minecraft.world.level.levelgen.feature;
-
-import java.util.Optional;
-import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.Set;
-import net.minecraft.core.BlockPos;
-import java.util.Random;
-import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
-
-public class AcaciaFeature extends AbstractSmallTreeFeature<SmallTreeConfiguration> {
-    public AcaciaFeature(final Function<Dynamic<?>, ? extends SmallTreeConfiguration> function) {
-        super(function);
-    }
-    
-    public boolean doPlace(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final Set<BlockPos> set4, final Set<BlockPos> set5, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        final int integer9 = chi.baseHeight + random.nextInt(chi.heightRandA + 1) + random.nextInt(chi.heightRandB + 1);
-        final int integer10 = (chi.trunkHeight >= 0) ? (chi.trunkHeight + random.nextInt(chi.trunkHeightRandom + 1)) : (integer9 - (chi.foliageHeight + random.nextInt(chi.foliageHeightRandom + 1)));
-        final int integer11 = chi.foliagePlacer.foliageRadius(random, integer10, integer9, chi);
-        final Optional<BlockPos> optional12 = this.getProjectedOrigin(bkb, integer9, integer10, integer11, fk, chi);
-        if (!optional12.isPresent()) {
-            return false;
-        }
-        final BlockPos fk2 = optional12.get();
-        this.setDirtAt(bkb, fk2.below());
-        final Direction fp14 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
-        final int integer12 = integer9 - random.nextInt(4) - 1;
-        int integer13 = 3 - random.nextInt(3);
-        final BlockPos.MutableBlockPos a17 = new BlockPos.MutableBlockPos();
-        int integer14 = fk2.getX();
-        int integer15 = fk2.getZ();
-        int integer16 = 0;
-        for (int integer17 = 0; integer17 < integer9; ++integer17) {
-            final int integer18 = fk2.getY() + integer17;
-            if (integer17 >= integer12 && integer13 > 0) {
-                integer14 += fp14.getStepX();
-                integer15 += fp14.getStepZ();
-                --integer13;
-            }
-            if (this.placeLog(bkb, random, a17.set(integer14, integer18, integer15), set4, clb, chi)) {
-                integer16 = integer18;
-            }
-        }
-        final BlockPos fk3 = new BlockPos(integer14, integer16, integer15);
-        chi.foliagePlacer.createFoliage(bkb, random, chi, integer9, integer10, integer11 + 1, fk3, set5);
-        integer14 = fk2.getX();
-        integer15 = fk2.getZ();
-        final Direction fp15 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
-        if (fp15 != fp14) {
-            final int integer18 = integer12 - random.nextInt(2) - 1;
-            int integer19 = 1 + random.nextInt(3);
-            integer16 = 0;
-            for (int integer20 = integer18; integer20 < integer9 && integer19 > 0; ++integer20, --integer19) {
-                if (integer20 >= 1) {
-                    final int integer21 = fk2.getY() + integer20;
-                    integer14 += fp15.getStepX();
-                    integer15 += fp15.getStepZ();
-                    if (this.placeLog(bkb, random, a17.set(integer14, integer21, integer15), set4, clb, chi)) {
-                        integer16 = integer21;
-                    }
-                }
-            }
-            if (integer16 > 0) {
-                final BlockPos fk4 = new BlockPos(integer14, integer16, integer15);
-                chi.foliagePlacer.createFoliage(bkb, random, chi, integer9, integer10, integer11, fk4, set5);
-            }
-        }
-        return true;
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/BambooFeature.java b/src/net/minecraft/world/level/levelgen/feature/BambooFeature.java
index b6f2e63..45e0d99 100644
--- a/src/net/minecraft/world/level/levelgen/feature/BambooFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/BambooFeature.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BambooLeaves;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.BambooBlock;
@@ -11,11 +11,10 @@ import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
 
@@ -25,51 +24,51 @@ public class BambooFeature extends Feature<ProbabilityFeatureConfiguration> {
     private static final BlockState BAMBOO_TOP_LARGE;
     private static final BlockState BAMBOO_TOP_SMALL;
     
-    public BambooFeature(final Function<Dynamic<?>, ? extends ProbabilityFeatureConfiguration> function) {
-        super(function);
+    public BambooFeature(final Codec<ProbabilityFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final ProbabilityFeatureConfiguration cgy) {
-        int integer7 = 0;
-        final BlockPos.MutableBlockPos a8 = new BlockPos.MutableBlockPos(fk);
-        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos(fk);
-        if (bjx.isEmptyBlock(a8)) {
-            if (Blocks.BAMBOO.defaultBlockState().canSurvive(bjx, a8)) {
-                final int integer8 = random.nextInt(12) + 5;
-                if (random.nextFloat() < cgy.probability) {
-                    for (int integer9 = random.nextInt(4) + 1, integer10 = fk.getX() - integer9; integer10 <= fk.getX() + integer9; ++integer10) {
-                        for (int integer11 = fk.getZ() - integer9; integer11 <= fk.getZ() + integer9; ++integer11) {
-                            final int integer12 = integer10 - fk.getX();
-                            final int integer13 = integer11 - fk.getZ();
-                            if (integer12 * integer12 + integer13 * integer13 <= integer9 * integer9) {
-                                a9.set(integer10, bjx.getHeight(Heightmap.Types.WORLD_SURFACE, integer10, integer11) - 1, integer11);
-                                if (Feature.isDirt(bjx.getBlockState(a9).getBlock())) {
-                                    bjx.setBlock(a9, Blocks.PODZOL.defaultBlockState(), 2);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final ProbabilityFeatureConfiguration cod) {
+        int integer8 = 0;
+        final BlockPos.MutableBlockPos a9 = fu.mutable();
+        final BlockPos.MutableBlockPos a10 = fu.mutable();
+        if (bqu.isEmptyBlock(a9)) {
+            if (Blocks.BAMBOO.defaultBlockState().canSurvive(bqu, a9)) {
+                final int integer9 = random.nextInt(12) + 5;
+                if (random.nextFloat() < cod.probability) {
+                    for (int integer10 = random.nextInt(4) + 1, integer11 = fu.getX() - integer10; integer11 <= fu.getX() + integer10; ++integer11) {
+                        for (int integer12 = fu.getZ() - integer10; integer12 <= fu.getZ() + integer10; ++integer12) {
+                            final int integer13 = integer11 - fu.getX();
+                            final int integer14 = integer12 - fu.getZ();
+                            if (integer13 * integer13 + integer14 * integer14 <= integer10 * integer10) {
+                                a10.set(integer11, bqu.getHeight(Heightmap.Types.WORLD_SURFACE, integer11, integer12) - 1, integer12);
+                                if (Feature.isDirt(bqu.getBlockState(a10).getBlock())) {
+                                    bqu.setBlock(a10, Blocks.PODZOL.defaultBlockState(), 2);
                                 }
                             }
                         }
                     }
                 }
-                for (int integer9 = 0; integer9 < integer8 && bjx.isEmptyBlock(a8); ++integer9) {
-                    bjx.setBlock(a8, BambooFeature.BAMBOO_TRUNK, 2);
-                    a8.move(Direction.UP, 1);
+                for (int integer10 = 0; integer10 < integer9 && bqu.isEmptyBlock(a9); ++integer10) {
+                    bqu.setBlock(a9, BambooFeature.BAMBOO_TRUNK, 2);
+                    a9.move(Direction.UP, 1);
                 }
-                if (a8.getY() - fk.getY() >= 3) {
-                    bjx.setBlock(a8, BambooFeature.BAMBOO_FINAL_LARGE, 2);
-                    bjx.setBlock(a8.move(Direction.DOWN, 1), BambooFeature.BAMBOO_TOP_LARGE, 2);
-                    bjx.setBlock(a8.move(Direction.DOWN, 1), BambooFeature.BAMBOO_TOP_SMALL, 2);
+                if (a9.getY() - fu.getY() >= 3) {
+                    bqu.setBlock(a9, BambooFeature.BAMBOO_FINAL_LARGE, 2);
+                    bqu.setBlock(a9.move(Direction.DOWN, 1), BambooFeature.BAMBOO_TOP_LARGE, 2);
+                    bqu.setBlock(a9.move(Direction.DOWN, 1), BambooFeature.BAMBOO_TOP_SMALL, 2);
                 }
             }
-            ++integer7;
+            ++integer8;
         }
-        return integer7 > 0;
+        return integer8 > 0;
     }
     
     static {
-        BAMBOO_TRUNK = ((((AbstractStateHolder<O, BlockState>)Blocks.BAMBOO.defaultBlockState()).setValue((Property<Comparable>)BambooBlock.AGE, 1)).setValue(BambooBlock.LEAVES, BambooLeaves.NONE)).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.STAGE, 0);
-        BAMBOO_FINAL_LARGE = (((AbstractStateHolder<O, BlockState>)BambooFeature.BAMBOO_TRUNK).setValue(BambooBlock.LEAVES, BambooLeaves.LARGE)).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.STAGE, 1);
-        BAMBOO_TOP_LARGE = ((AbstractStateHolder<O, BlockState>)BambooFeature.BAMBOO_TRUNK).<BambooLeaves, BambooLeaves>setValue(BambooBlock.LEAVES, BambooLeaves.LARGE);
-        BAMBOO_TOP_SMALL = ((AbstractStateHolder<O, BlockState>)BambooFeature.BAMBOO_TRUNK).<BambooLeaves, BambooLeaves>setValue(BambooBlock.LEAVES, BambooLeaves.SMALL);
+        BAMBOO_TRUNK = ((((StateHolder<O, BlockState>)Blocks.BAMBOO.defaultBlockState()).setValue((Property<Comparable>)BambooBlock.AGE, 1)).setValue(BambooBlock.LEAVES, BambooLeaves.NONE)).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.STAGE, 0);
+        BAMBOO_FINAL_LARGE = (((StateHolder<O, BlockState>)BambooFeature.BAMBOO_TRUNK).setValue(BambooBlock.LEAVES, BambooLeaves.LARGE)).<Comparable, Integer>setValue((Property<Comparable>)BambooBlock.STAGE, 1);
+        BAMBOO_TOP_LARGE = ((StateHolder<O, BlockState>)BambooFeature.BAMBOO_TRUNK).<BambooLeaves, BambooLeaves>setValue(BambooBlock.LEAVES, BambooLeaves.LARGE);
+        BAMBOO_TOP_SMALL = ((StateHolder<O, BlockState>)BambooFeature.BAMBOO_TRUNK).<BambooLeaves, BambooLeaves>setValue(BambooBlock.LEAVES, BambooLeaves.SMALL);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/BasaltColumnsFeature.java b/src/net/minecraft/world/level/levelgen/feature/BasaltColumnsFeature.java
new file mode 100644
index 0000000..db84807
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/BasaltColumnsFeature.java
@@ -0,0 +1,126 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelWriter;
+import net.minecraft.world.level.block.Blocks;
+import java.util.Iterator;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.Direction;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.block.Block;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration;
+
+public class BasaltColumnsFeature extends Feature<ColumnFeatureConfiguration> {
+    private static final ImmutableList<Block> CANNOT_PLACE_ON;
+    
+    public BasaltColumnsFeature(final Codec<ColumnFeatureConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final ColumnFeatureConfiguration cnj) {
+        final int integer8 = cha.getSeaLevel();
+        final BlockPos fu2 = findSurface(bqu, integer8, fu.mutable().clamp(Direction.Axis.Y, 1, bqu.getMaxBuildHeight() - 1), Integer.MAX_VALUE);
+        if (fu2 == null) {
+            return false;
+        }
+        final int integer9 = calculateHeight(random, cnj);
+        final boolean boolean11 = random.nextFloat() < 0.9f;
+        final int integer10 = Math.min(integer9, boolean11 ? 5 : 8);
+        final int integer11 = boolean11 ? 50 : 15;
+        boolean boolean12 = false;
+        for (final BlockPos fu3 : BlockPos.randomBetweenClosed(random, integer11, fu2.getX() - integer10, fu2.getY(), fu2.getZ() - integer10, fu2.getX() + integer10, fu2.getY(), fu2.getZ() + integer10)) {
+            final int integer12 = integer9 - fu3.distManhattan(fu2);
+            if (integer12 >= 0) {
+                boolean12 |= this.placeColumn(bqu, integer8, fu3, integer12, calculateReach(random, cnj));
+            }
+        }
+        return boolean12;
+    }
+    
+    private boolean placeColumn(final LevelAccessor bqc, final int integer2, final BlockPos fu, final int integer4, final int integer5) {
+        boolean boolean7 = false;
+        for (final BlockPos fu2 : BlockPos.betweenClosed(fu.getX() - integer5, fu.getY(), fu.getZ() - integer5, fu.getX() + integer5, fu.getY(), fu.getZ() + integer5)) {
+            final int integer6 = fu2.distManhattan(fu);
+            final BlockPos fu3 = isAirOrLavaOcean(bqc, integer2, fu2) ? findSurface(bqc, integer2, fu2.mutable(), integer6) : findAir(bqc, fu2.mutable(), integer6);
+            if (fu3 == null) {
+                continue;
+            }
+            int integer7 = integer4 - integer6 / 2;
+            final BlockPos.MutableBlockPos a13 = fu3.mutable();
+            while (integer7 >= 0) {
+                if (isAirOrLavaOcean(bqc, integer2, a13)) {
+                    this.setBlock(bqc, a13, Blocks.BASALT.defaultBlockState());
+                    a13.move(Direction.UP);
+                    boolean7 = true;
+                }
+                else {
+                    if (!bqc.getBlockState(a13).is(Blocks.BASALT)) {
+                        break;
+                    }
+                    a13.move(Direction.UP);
+                }
+                --integer7;
+            }
+        }
+        return boolean7;
+    }
+    
+    @Nullable
+    private static BlockPos findSurface(final LevelAccessor bqc, final int integer2, final BlockPos.MutableBlockPos a, int integer4) {
+        while (a.getY() > 1 && integer4 > 0) {
+            --integer4;
+            if (isAirOrLavaOcean(bqc, integer2, a)) {
+                final BlockState cfj5 = bqc.getBlockState(a.move(Direction.DOWN));
+                a.move(Direction.UP);
+                if (!cfj5.isAir() && !BasaltColumnsFeature.CANNOT_PLACE_ON.contains(cfj5.getBlock())) {
+                    return a;
+                }
+            }
+            a.move(Direction.DOWN);
+        }
+        return null;
+    }
+    
+    @Nullable
+    private static BlockPos findAir(final LevelAccessor bqc, final BlockPos.MutableBlockPos a, int integer) {
+        while (a.getY() < bqc.getMaxBuildHeight() && integer > 0) {
+            --integer;
+            final BlockState cfj4 = bqc.getBlockState(a);
+            if (BasaltColumnsFeature.CANNOT_PLACE_ON.contains(cfj4.getBlock())) {
+                return null;
+            }
+            if (cfj4.isAir()) {
+                return a;
+            }
+            a.move(Direction.UP);
+        }
+        return null;
+    }
+    
+    private static int calculateHeight(final Random random, final ColumnFeatureConfiguration cnj) {
+        return cnj.minimumHeight + random.nextInt(cnj.maximumHeight - cnj.minimumHeight + 1);
+    }
+    
+    private static int calculateReach(final Random random, final ColumnFeatureConfiguration cnj) {
+        return cnj.minimumReach + random.nextInt(cnj.maximumReach - cnj.minimumReach + 1);
+    }
+    
+    private static boolean isAirOrLavaOcean(final LevelAccessor bqc, final int integer, final BlockPos fu) {
+        final BlockState cfj4 = bqc.getBlockState(fu);
+        return cfj4.isAir() || (cfj4.is(Blocks.LAVA) && fu.getY() <= integer);
+    }
+    
+    static {
+        CANNOT_PLACE_ON = ImmutableList.<Block>of(Blocks.LAVA, Blocks.BEDROCK, Blocks.MAGMA_BLOCK, Blocks.SOUL_SAND, Blocks.NETHER_BRICKS, Blocks.NETHER_BRICK_FENCE, Blocks.NETHER_BRICK_STAIRS, Blocks.NETHER_WART, Blocks.CHEST, Blocks.SPAWNER);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/BasaltPillarFeature.java b/src/net/minecraft/world/level/levelgen/feature/BasaltPillarFeature.java
new file mode 100644
index 0000000..1a3451e
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/BasaltPillarFeature.java
@@ -0,0 +1,86 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.Vec3i;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.Level;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
+
+public class BasaltPillarFeature extends Feature<NoneFeatureConfiguration> {
+    public BasaltPillarFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        if (!bqu.isEmptyBlock(fu) || bqu.isEmptyBlock(fu.above())) {
+            return false;
+        }
+        final BlockPos.MutableBlockPos a8 = fu.mutable();
+        final BlockPos.MutableBlockPos a9 = fu.mutable();
+        boolean boolean10 = true;
+        boolean boolean11 = true;
+        boolean boolean12 = true;
+        boolean boolean13 = true;
+        while (bqu.isEmptyBlock(a8)) {
+            if (Level.isOutsideBuildHeight(a8)) {
+                return true;
+            }
+            bqu.setBlock(a8, Blocks.BASALT.defaultBlockState(), 2);
+            boolean10 = (boolean10 && this.placeHangOff(bqu, random, a9.setWithOffset(a8, Direction.NORTH)));
+            boolean11 = (boolean11 && this.placeHangOff(bqu, random, a9.setWithOffset(a8, Direction.SOUTH)));
+            boolean12 = (boolean12 && this.placeHangOff(bqu, random, a9.setWithOffset(a8, Direction.WEST)));
+            boolean13 = (boolean13 && this.placeHangOff(bqu, random, a9.setWithOffset(a8, Direction.EAST)));
+            a8.move(Direction.DOWN);
+        }
+        a8.move(Direction.UP);
+        this.placeBaseHangOff(bqu, random, a9.setWithOffset(a8, Direction.NORTH));
+        this.placeBaseHangOff(bqu, random, a9.setWithOffset(a8, Direction.SOUTH));
+        this.placeBaseHangOff(bqu, random, a9.setWithOffset(a8, Direction.WEST));
+        this.placeBaseHangOff(bqu, random, a9.setWithOffset(a8, Direction.EAST));
+        a8.move(Direction.DOWN);
+        final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
+        for (int integer15 = -3; integer15 < 4; ++integer15) {
+            for (int integer16 = -3; integer16 < 4; ++integer16) {
+                final int integer17 = Mth.abs(integer15) * Mth.abs(integer16);
+                if (random.nextInt(10) < 10 - integer17) {
+                    a10.set(a8.offset(integer15, 0, integer16));
+                    int integer18 = 3;
+                    while (bqu.isEmptyBlock(a9.setWithOffset(a10, Direction.DOWN))) {
+                        a10.move(Direction.DOWN);
+                        if (--integer18 <= 0) {
+                            break;
+                        }
+                    }
+                    if (!bqu.isEmptyBlock(a9.setWithOffset(a10, Direction.DOWN))) {
+                        bqu.setBlock(a10, Blocks.BASALT.defaultBlockState(), 2);
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    private void placeBaseHangOff(final LevelAccessor bqc, final Random random, final BlockPos fu) {
+        if (random.nextBoolean()) {
+            bqc.setBlock(fu, Blocks.BASALT.defaultBlockState(), 2);
+        }
+    }
+    
+    private boolean placeHangOff(final LevelAccessor bqc, final Random random, final BlockPos fu) {
+        if (random.nextInt(10) != 0) {
+            bqc.setBlock(fu, Blocks.BASALT.defaultBlockState(), 2);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/BastionBridgePools.java b/src/net/minecraft/world/level/levelgen/feature/BastionBridgePools.java
new file mode 100644
index 0000000..e9e4687
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/BastionBridgePools.java
@@ -0,0 +1,37 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
+import java.util.List;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleProcessor;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule;
+import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest;
+import net.minecraft.world.level.block.Blocks;
+
+public class BastionBridgePools {
+    public static void bootstrap() {
+    }
+    
+    static {
+        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.4f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.BLACKSTONE, 0.01f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 1.0E-4f), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.BLACKSTONE, 1.0E-4f), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GOLD_BLOCK, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), BastionSharedPools.GILDED_BLACKSTONE_REPLACEMENT_RULE)));
+        final ImmutableList<StructureProcessor> immutableList2 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.BLACKSTONE, 1.0E-4f), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GOLD_BLOCK, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), BastionSharedPools.GILDED_BLACKSTONE_REPLACEMENT_RULE)));
+        final ImmutableList<StructureProcessor> immutableList3 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.CHISELED_POLISHED_BLACKSTONE, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GOLD_BLOCK, 0.6f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), BastionSharedPools.GILDED_BLACKSTONE_REPLACEMENT_RULE)));
+        final ImmutableList<StructureProcessor> immutableList4 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.BLACKSTONE, 1.0E-4f), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()))));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/bridge/start"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/bridge/starting_pieces/entrance_base", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/bridge/starting_pieces"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/bridge/starting_pieces/entrance", immutableList3), 1), Pair.of(new SinglePoolElement("bastion/bridge/starting_pieces/entrance_face", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/bridge/bridge_pieces"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/bridge/bridge_pieces/bridge", immutableList4), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/bridge/legs"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/bridge/legs/leg_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/bridge/legs/leg_1", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/bridge/walls"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/bridge/walls/wall_base_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/bridge/walls/wall_base_1", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/bridge/ramparts"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/bridge/ramparts/rampart_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/bridge/ramparts/rampart_1", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/bridge/rampart_plates"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/bridge/rampart_plates/plate_0", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/bridge/connectors"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/bridge/connectors/back_bridge_top", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/bridge/connectors/back_bridge_bottom", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/BastionFeature.java b/src/net/minecraft/world/level/levelgen/feature/BastionFeature.java
new file mode 100644
index 0000000..adfbd01
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/BastionFeature.java
@@ -0,0 +1,43 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.levelgen.structure.BeardedStructureStart;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.MultiJigsawConfiguration;
+
+public class BastionFeature extends StructureFeature<MultiJigsawConfiguration> {
+    public BastionFeature(final Codec<MultiJigsawConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    protected boolean isFeatureChunk(final ChunkGenerator cha, final BiomeSource brh, final long long3, final WorldgenRandom ciy, final int integer5, final int integer6, final Biome bre, final ChunkPos bph, final MultiJigsawConfiguration cnx) {
+        return ciy.nextInt(5) >= 2;
+    }
+    
+    @Override
+    public StructureStartFactory<MultiJigsawConfiguration> getStartFactory() {
+        return FeatureStart::new;
+    }
+    
+    public static class FeatureStart extends BeardedStructureStart<MultiJigsawConfiguration> {
+        public FeatureStart(final StructureFeature<MultiJigsawConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
+        }
+        
+        @Override
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final MultiJigsawConfiguration cnx) {
+            final BlockPos fu8 = new BlockPos(integer3 * 16, 33, integer4 * 16);
+            BastionPieces.addPieces(cha, cva, fu8, this.pieces, this.random, cnx);
+            this.calculateBoundingBox();
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/BastionHoglinStablePools.java b/src/net/minecraft/world/level/levelgen/feature/BastionHoglinStablePools.java
new file mode 100644
index 0000000..3f4c13b
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/BastionHoglinStablePools.java
@@ -0,0 +1,41 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
+import java.util.List;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleProcessor;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule;
+import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest;
+import net.minecraft.world.level.block.Blocks;
+
+public class BastionHoglinStablePools {
+    public static void bootstrap() {
+    }
+    
+    static {
+        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.BLACKSTONE, 1.0E-4f), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), BastionSharedPools.GILDED_BLACKSTONE_REPLACEMENT_RULE)));
+        final ImmutableList<StructureProcessor> immutableList2 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.CHISELED_POLISHED_BLACKSTONE, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GOLD_BLOCK, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), BastionSharedPools.GILDED_BLACKSTONE_REPLACEMENT_RULE)));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/origin"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/air_base", ImmutableList.of()), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/starting_pieces"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/starting_pieces/starting_stairs_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/starting_pieces/starting_stairs_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/starting_pieces/starting_stairs_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/starting_pieces/starting_stairs_3", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/starting_pieces/starting_stairs_4", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/mirrored_starting_pieces"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/starting_pieces/stairs_0_mirrored", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/starting_pieces/stairs_1_mirrored", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/starting_pieces/stairs_2_mirrored", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/starting_pieces/stairs_3_mirrored", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/starting_pieces/stairs_4_mirrored", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/wall_bases"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/walls/wall_base", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/walls"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/walls/side_wall_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/walls/side_wall_1", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/stairs"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_1_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_1_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_1_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_1_3", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_1_4", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_2_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_2_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_2_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_2_3", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_2_4", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_3_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_3_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_3_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_3_3", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/stairs/stairs_3_4", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/small_stables/inner"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/small_stables/inner_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/small_stables/inner_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/small_stables/inner_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/small_stables/inner_3", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/small_stables/outer"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/small_stables/outer_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/small_stables/outer_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/small_stables/outer_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/small_stables/outer_3", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/large_stables/inner"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/large_stables/inner_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/large_stables/inner_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/large_stables/inner_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/large_stables/inner_3", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/large_stables/inner_4", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/large_stables/outer"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/large_stables/outer_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/large_stables/outer_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/large_stables/outer_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/large_stables/outer_3", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/large_stables/outer_4", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/posts"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/posts/stair_post", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/posts/end_post", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/ramparts"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/ramparts/ramparts_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/ramparts/ramparts_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/hoglin_stable/ramparts/ramparts_3", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/rampart_plates"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/rampart_plates/rampart_plate_1", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/hoglin_stable/connectors"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/hoglin_stable/connectors/end_post_connector", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/BastionHousingUnitsPools.java b/src/net/minecraft/world/level/levelgen/feature/BastionHousingUnitsPools.java
new file mode 100644
index 0000000..4580430
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/BastionHousingUnitsPools.java
@@ -0,0 +1,42 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
+import java.util.List;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleProcessor;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule;
+import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest;
+import net.minecraft.world.level.block.Blocks;
+
+public class BastionHousingUnitsPools {
+    public static void bootstrap() {
+    }
+    
+    static {
+        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.BLACKSTONE, 1.0E-4f), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), BastionSharedPools.GILDED_BLACKSTONE_REPLACEMENT_RULE)));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/base"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/air_base", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/center_pieces"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/center_pieces/center_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/center_pieces/center_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/center_pieces/center_2", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/pathways"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/pathways/pathway_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/pathways/pathway_wall_0", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/walls/wall_bases"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/walls/wall_base", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/walls/connected_wall", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/stages/stage_0"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/stages/stage_0_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/stages/stage_0_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/stages/stage_0_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/stages/stage_0_3", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/stages/stage_1"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/stages/stage_1_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/stages/stage_1_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/stages/stage_1_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/stages/stage_1_3", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/stages/rot/stage_1"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/stages/rot/stage_1_0", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/stages/stage_2"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/stages/stage_2_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/stages/stage_2_1", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/stages/stage_3"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/stages/stage_3_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/stages/stage_3_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/stages/stage_3_2", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/stages/stage_3_3", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/fillers/stage_0"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/fillers/stage_0", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/edges"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/edges/edge_0", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/wall_units"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/wall_units/unit_0", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/edge_wall_units"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/wall_units/edge_0_large", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/ramparts"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/ramparts/ramparts_0", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/ramparts/ramparts_1", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/units/ramparts/ramparts_2", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/large_ramparts"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/ramparts/ramparts_0", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/units/rampart_plates"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/units/rampart_plates/plate_0", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/BastionPieces.java b/src/net/minecraft/world/level/levelgen/feature/BastionPieces.java
new file mode 100644
index 0000000..1f4736e
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/BastionPieces.java
@@ -0,0 +1,50 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement;
+import net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration;
+import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece;
+import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
+import java.util.Random;
+import net.minecraft.world.level.levelgen.feature.configurations.MultiJigsawConfiguration;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.levelgen.structure.StructurePiece;
+import java.util.List;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import com.google.common.collect.ImmutableMap;
+
+public class BastionPieces {
+    public static final ImmutableMap<String, Integer> POOLS;
+    
+    public static void bootstrap() {
+        BastionHousingUnitsPools.bootstrap();
+        BastionHoglinStablePools.bootstrap();
+        BastionTreasureRoomPools.bootstrap();
+        BastionBridgePools.bootstrap();
+        BastionSharedPools.bootstrap();
+    }
+    
+    public static void addPieces(final ChunkGenerator cha, final StructureManager cva, final BlockPos fu, final List<StructurePiece> list, final WorldgenRandom ciy, final MultiJigsawConfiguration cnx) {
+        bootstrap();
+        final JigsawConfiguration cnu7 = cnx.getRandomPool(ciy);
+        JigsawPlacement.addPieces(cnu7.startPool, cnu7.size, BastionPiece::new, cha, cva, fu, list, ciy, false, false);
+    }
+    
+    static {
+        POOLS = ImmutableMap.<String, Integer>builder().put("bastion/units/base", 60).put("bastion/hoglin_stable/origin", 60).put("bastion/treasure/starters", 60).put("bastion/bridge/start", 60).build();
+    }
+    
+    public static class BastionPiece extends PoolElementStructurePiece {
+        public BastionPiece(final StructureManager cva, final StructurePoolElement cqd, final BlockPos fu, final int integer, final Rotation cap, final BoundingBox ctd) {
+            super(StructurePieceType.BASTION_REMNANT, cva, cqd, fu, integer, cap, ctd);
+        }
+        
+        public BastionPiece(final StructureManager cva, final CompoundTag le) {
+            super(cva, le, StructurePieceType.BASTION_REMNANT);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/BastionSharedPools.java b/src/net/minecraft/world/level/levelgen/feature/BastionSharedPools.java
new file mode 100644
index 0000000..0e73cc1
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/BastionSharedPools.java
@@ -0,0 +1,30 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement;
+import java.util.List;
+import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
+import com.google.common.collect.ImmutableList;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule;
+
+public class BastionSharedPools {
+    public static final ProcessorRule GILDED_BLACKSTONE_REPLACEMENT_RULE;
+    
+    public static void bootstrap() {
+    }
+    
+    static {
+        GILDED_BLACKSTONE_REPLACEMENT_RULE = new ProcessorRule(new RandomBlockMatchTest(Blocks.BLACKSTONE, 0.01f), AlwaysTrueTest.INSTANCE, Blocks.GILDED_BLACKSTONE.defaultBlockState());
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/mobs/piglin"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/mobs/melee_piglin"), 1), Pair.of(new SinglePoolElement("bastion/mobs/sword_piglin"), 4), Pair.of(new SinglePoolElement("bastion/mobs/crossbow_piglin"), 4), Pair.of(new SinglePoolElement("bastion/mobs/empty"), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/mobs/hoglin"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/mobs/hoglin"), 2), Pair.of(new SinglePoolElement("bastion/mobs/empty"), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/blocks/gold"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/blocks/air"), 3), Pair.of(new SinglePoolElement("bastion/blocks/gold"), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/mobs/piglin_melee"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/mobs/melee_piglin_always"), 1), Pair.of(new SinglePoolElement("bastion/mobs/melee_piglin"), 5), Pair.of(new SinglePoolElement("bastion/mobs/sword_piglin"), 1)), StructureTemplatePool.Projection.RIGID));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/BastionTreasureRoomPools.java b/src/net/minecraft/world/level/levelgen/feature/BastionTreasureRoomPools.java
new file mode 100644
index 0000000..3de1973
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/BastionTreasureRoomPools.java
@@ -0,0 +1,54 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
+import net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.AxisAlignedLinearPosTest;
+import net.minecraft.core.Direction;
+import java.util.List;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleProcessor;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule;
+import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest;
+import net.minecraft.world.level.block.Blocks;
+
+public class BastionTreasureRoomPools {
+    public static void bootstrap() {
+    }
+    
+    static {
+        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.15f), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.BLACKSTONE.defaultBlockState()))));
+        final ImmutableList<StructureProcessor> immutableList2 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.35f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.CHISELED_POLISHED_BLACKSTONE, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), BastionSharedPools.GILDED_BLACKSTONE_REPLACEMENT_RULE)));
+        final ImmutableList<StructureProcessor> immutableList3 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.01f), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.POLISHED_BLACKSTONE_BRICKS, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.BLACKSTONE.defaultBlockState()))));
+        final ImmutableList<StructureProcessor> immutableList4 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.GOLD_BLOCK, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(AlwaysTrueTest.INSTANCE, AlwaysTrueTest.INSTANCE, new AxisAlignedLinearPosTest(0.0f, 0.05f, 0, 100, Direction.Axis.Y), Blocks.AIR.defaultBlockState()))));
+        final ImmutableList<StructureProcessor> immutableList5 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.MAGMA_BLOCK, 0.75f), AlwaysTrueTest.INSTANCE, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS, 0.15f), AlwaysTrueTest.INSTANCE, Blocks.POLISHED_BLACKSTONE_BRICKS.defaultBlockState()), BastionSharedPools.GILDED_BLACKSTONE_REPLACEMENT_RULE)));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/starters"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/big_air_full", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/bases"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/bases/lava_basin", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/stairs"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/stairs/lower_stairs", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/bases/centers"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/bases/centers/center_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/bases/centers/center_1", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/bases/centers/center_2", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/bases/centers/center_3", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/brains"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/brains/center_brain", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/walls"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/walls/lava_wall", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/entrance_wall", immutableList3), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/walls/outer"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/walls/outer/top_corner", immutableList3), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/outer/mid_corner", immutableList3), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/outer/bottom_corner", immutableList3), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/outer/outer_wall", immutableList3), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/outer/medium_outer_wall", immutableList3), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/outer/tall_outer_wall", immutableList3), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/walls/bottom"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/walls/bottom/wall_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/bottom/wall_1", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/bottom/wall_2", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/bottom/wall_3", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/walls/mid"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/walls/mid/wall_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/mid/wall_1", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/mid/wall_2", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/walls/top"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/walls/top/main_entrance", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/top/wall_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/walls/top/wall_1", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/connectors"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/connectors/center_to_wall_middle", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/connectors/center_to_wall_top", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/connectors/center_to_wall_top_entrance", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/entrances"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/entrances/entrance_0", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/ramparts"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/ramparts/mid_wall_main", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/ramparts/mid_wall_side", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/ramparts/bottom_wall_0", immutableList5), 1), Pair.of(new SinglePoolElement("bastion/treasure/ramparts/top_wall", immutableList4), 1), Pair.of(new SinglePoolElement("bastion/treasure/ramparts/lava_basin_side", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/ramparts/lava_basin_main", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/corners/bottom"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/corners/bottom/corner_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/corners/bottom/corner_1", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/corners/edges"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/corners/edges/bottom", immutableList3), 1), Pair.of(new SinglePoolElement("bastion/treasure/corners/edges/middle", immutableList3), 1), Pair.of(new SinglePoolElement("bastion/treasure/corners/edges/top", immutableList3), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/corners/middle"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/corners/middle/corner_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/corners/middle/corner_1", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/corners/top"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/corners/top/corner_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/corners/top/corner_1", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/extensions/large_pool"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/extensions/empty", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/empty", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/fire_room", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/large_bridge_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/large_bridge_1", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/large_bridge_2", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/large_bridge_3", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/roofed_bridge", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/empty", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/extensions/small_pool"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/extensions/empty", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/fire_room", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/empty", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/small_bridge_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/small_bridge_1", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/small_bridge_2", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/small_bridge_3", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/extensions/houses"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/extensions/house_0", immutableList2), 1), Pair.of(new SinglePoolElement("bastion/treasure/extensions/house_1", immutableList2), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("bastion/treasure/roofs"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("bastion/treasure/roofs/wall_roof", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/treasure/roofs/corner_roof", immutableList1), 1), Pair.of(new SinglePoolElement("bastion/treasure/roofs/center_roof", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/BlockBlobFeature.java b/src/net/minecraft/world/level/levelgen/feature/BlockBlobFeature.java
index 7d82997..13cf37f 100644
--- a/src/net/minecraft/world/level/levelgen/feature/BlockBlobFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/BlockBlobFeature.java
@@ -6,46 +6,45 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.core.Vec3i;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.BlockBlobConfiguration;
 
 public class BlockBlobFeature extends Feature<BlockBlobConfiguration> {
-    public BlockBlobFeature(final Function<Dynamic<?>, ? extends BlockBlobConfiguration> function) {
-        super(function);
+    public BlockBlobFeature(final Codec<BlockBlobConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, BlockPos fk, final BlockBlobConfiguration cgc) {
-        while (fk.getY() > 3) {
-            if (!bjx.isEmptyBlock(fk.below())) {
-                final Block bph7 = bjx.getBlockState(fk.below()).getBlock();
-                if (Feature.isDirt(bph7)) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, BlockPos fu, final BlockBlobConfiguration cne) {
+        while (fu.getY() > 3) {
+            if (!bqu.isEmptyBlock(fu.below())) {
+                final Block bvr8 = bqu.getBlockState(fu.below()).getBlock();
+                if (Feature.isDirt(bvr8)) {
                     break;
                 }
-                if (Feature.isStone(bph7)) {
+                if (Feature.isStone(bvr8)) {
                     break;
                 }
             }
-            fk = fk.below();
+            fu = fu.below();
         }
-        if (fk.getY() <= 3) {
+        if (fu.getY() <= 3) {
             return false;
         }
-        for (int integer7 = cgc.startRadius, integer8 = 0; integer7 >= 0 && integer8 < 3; ++integer8) {
-            final int integer9 = integer7 + random.nextInt(2);
-            final int integer10 = integer7 + random.nextInt(2);
-            final int integer11 = integer7 + random.nextInt(2);
-            final float float12 = (integer9 + integer10 + integer11) * 0.333f + 0.5f;
-            for (final BlockPos fk2 : BlockPos.betweenClosed(fk.offset(-integer9, -integer10, -integer11), fk.offset(integer9, integer10, integer11))) {
-                if (fk2.distSqr(fk) <= float12 * float12) {
-                    bjx.setBlock(fk2, cgc.state, 4);
+        for (int integer8 = cne.startRadius, integer9 = 0; integer8 >= 0 && integer9 < 3; ++integer9) {
+            final int integer10 = integer8 + random.nextInt(2);
+            final int integer11 = integer8 + random.nextInt(2);
+            final int integer12 = integer8 + random.nextInt(2);
+            final float float13 = (integer10 + integer11 + integer12) * 0.333f + 0.5f;
+            for (final BlockPos fu2 : BlockPos.betweenClosed(fu.offset(-integer10, -integer11, -integer12), fu.offset(integer10, integer11, integer12))) {
+                if (fu2.distSqr(fu) <= float13 * float13) {
+                    bqu.setBlock(fu2, cne.state, 4);
                 }
             }
-            fk = fk.offset(-(integer7 + 1) + random.nextInt(2 + integer7 * 2), 0 - random.nextInt(2), -(integer7 + 1) + random.nextInt(2 + integer7 * 2));
+            fu = fu.offset(-(integer8 + 1) + random.nextInt(2 + integer8 * 2), 0 - random.nextInt(2), -(integer8 + 1) + random.nextInt(2 + integer8 * 2));
         }
         return true;
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/BlockPileFeature.java b/src/net/minecraft/world/level/levelgen/feature/BlockPileFeature.java
index 9248e72..ff62abe 100644
--- a/src/net/minecraft/world/level/levelgen/feature/BlockPileFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/BlockPileFeature.java
@@ -6,55 +6,55 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Blocks;
 import java.util.Iterator;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration;
 
 public class BlockPileFeature extends Feature<BlockPileConfiguration> {
-    public BlockPileFeature(final Function<Dynamic<?>, ? extends BlockPileConfiguration> function) {
-        super(function);
+    public BlockPileFeature(final Codec<BlockPileConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final BlockPileConfiguration cgd) {
-        if (fk.getY() < 5) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final BlockPileConfiguration cnf) {
+        if (fu.getY() < 5) {
             return false;
         }
-        final int integer7 = 2 + random.nextInt(2);
         final int integer8 = 2 + random.nextInt(2);
-        for (final BlockPos fk2 : BlockPos.betweenClosed(fk.offset(-integer7, 0, -integer8), fk.offset(integer7, 1, integer8))) {
-            final int integer9 = fk.getX() - fk2.getX();
-            final int integer10 = fk.getZ() - fk2.getZ();
-            if (integer9 * integer9 + integer10 * integer10 <= random.nextFloat() * 10.0f - random.nextFloat() * 6.0f) {
-                this.tryPlaceBlock(bjx, fk2, random, cgd);
+        final int integer9 = 2 + random.nextInt(2);
+        for (final BlockPos fu2 : BlockPos.betweenClosed(fu.offset(-integer8, 0, -integer9), fu.offset(integer8, 1, integer9))) {
+            final int integer10 = fu.getX() - fu2.getX();
+            final int integer11 = fu.getZ() - fu2.getZ();
+            if (integer10 * integer10 + integer11 * integer11 <= random.nextFloat() * 10.0f - random.nextFloat() * 6.0f) {
+                this.tryPlaceBlock(bqu, fu2, random, cnf);
             }
             else {
                 if (random.nextFloat() >= 0.031) {
                     continue;
                 }
-                this.tryPlaceBlock(bjx, fk2, random, cgd);
+                this.tryPlaceBlock(bqu, fu2, random, cnf);
             }
         }
         return true;
     }
     
-    private boolean mayPlaceOn(final LevelAccessor bjx, final BlockPos fk, final Random random) {
-        final BlockPos fk2 = fk.below();
-        final BlockState byj6 = bjx.getBlockState(fk2);
-        if (byj6.getBlock() == Blocks.GRASS_PATH) {
+    private boolean mayPlaceOn(final LevelAccessor bqc, final BlockPos fu, final Random random) {
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj6 = bqc.getBlockState(fu2);
+        if (cfj6.is(Blocks.GRASS_PATH)) {
             return random.nextBoolean();
         }
-        return byj6.isFaceSturdy(bjx, fk2, Direction.UP);
+        return cfj6.isFaceSturdy(bqc, fu2, Direction.UP);
     }
     
-    private void tryPlaceBlock(final LevelAccessor bjx, final BlockPos fk, final Random random, final BlockPileConfiguration cgd) {
-        if (bjx.isEmptyBlock(fk) && this.mayPlaceOn(bjx, fk, random)) {
-            bjx.setBlock(fk, cgd.stateProvider.getState(random, fk), 4);
+    private void tryPlaceBlock(final LevelAccessor bqc, final BlockPos fu, final Random random, final BlockPileConfiguration cnf) {
+        if (bqc.isEmptyBlock(fu) && this.mayPlaceOn(bqc, fu, random)) {
+            bqc.setBlock(fu, cnf.stateProvider.getState(random, fu), 4);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/BlueIceFeature.java b/src/net/minecraft/world/level/levelgen/feature/BlueIceFeature.java
index 2275f02..2f98ecc 100644
--- a/src/net/minecraft/world/level/levelgen/feature/BlueIceFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/BlueIceFeature.java
@@ -1,61 +1,58 @@
 package net.minecraft.world.level.levelgen.feature;
 
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class BlueIceFeature extends Feature<NoneFeatureConfiguration> {
-    public BlueIceFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public BlueIceFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        if (fk.getY() > bjx.getSeaLevel() - 1) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        if (fu.getY() > bqu.getSeaLevel() - 1) {
             return false;
         }
-        if (bjx.getBlockState(fk).getBlock() != Blocks.WATER && bjx.getBlockState(fk.below()).getBlock() != Blocks.WATER) {
+        if (!bqu.getBlockState(fu).is(Blocks.WATER) && !bqu.getBlockState(fu.below()).is(Blocks.WATER)) {
             return false;
         }
-        boolean boolean7 = false;
-        for (final Direction fp11 : Direction.values()) {
-            if (fp11 != Direction.DOWN) {
-                if (bjx.getBlockState(fk.relative(fp11)).getBlock() == Blocks.PACKED_ICE) {
-                    boolean7 = true;
+        boolean boolean8 = false;
+        for (final Direction fz12 : Direction.values()) {
+            if (fz12 != Direction.DOWN) {
+                if (bqu.getBlockState(fu.relative(fz12)).is(Blocks.PACKED_ICE)) {
+                    boolean8 = true;
                     break;
                 }
             }
         }
-        if (!boolean7) {
+        if (!boolean8) {
             return false;
         }
-        bjx.setBlock(fk, Blocks.BLUE_ICE.defaultBlockState(), 2);
-        for (int integer8 = 0; integer8 < 200; ++integer8) {
-            final int integer9 = random.nextInt(5) - random.nextInt(6);
-            int integer10 = 3;
-            if (integer9 < 2) {
-                integer10 += integer9 / 2;
+        bqu.setBlock(fu, Blocks.BLUE_ICE.defaultBlockState(), 2);
+        for (int integer9 = 0; integer9 < 200; ++integer9) {
+            final int integer10 = random.nextInt(5) - random.nextInt(6);
+            int integer11 = 3;
+            if (integer10 < 2) {
+                integer11 += integer10 / 2;
             }
-            if (integer10 >= 1) {
-                final BlockPos fk2 = fk.offset(random.nextInt(integer10) - random.nextInt(integer10), integer9, random.nextInt(integer10) - random.nextInt(integer10));
-                final BlockState byj12 = bjx.getBlockState(fk2);
-                final Block bph13 = byj12.getBlock();
-                if (byj12.getMaterial() == Material.AIR || bph13 == Blocks.WATER || bph13 == Blocks.PACKED_ICE || bph13 == Blocks.ICE) {
-                    for (final Direction fp12 : Direction.values()) {
-                        final Block bph14 = bjx.getBlockState(fk2.relative(fp12)).getBlock();
-                        if (bph14 == Blocks.BLUE_ICE) {
-                            bjx.setBlock(fk2, Blocks.BLUE_ICE.defaultBlockState(), 2);
+            if (integer11 >= 1) {
+                final BlockPos fu2 = fu.offset(random.nextInt(integer11) - random.nextInt(integer11), integer10, random.nextInt(integer11) - random.nextInt(integer11));
+                final BlockState cfj13 = bqu.getBlockState(fu2);
+                if (cfj13.getMaterial() == Material.AIR || cfj13.is(Blocks.WATER) || cfj13.is(Blocks.PACKED_ICE) || cfj13.is(Blocks.ICE)) {
+                    for (final Direction fz13 : Direction.values()) {
+                        final BlockState cfj14 = bqu.getBlockState(fu2.relative(fz13));
+                        if (cfj14.is(Blocks.BLUE_ICE)) {
+                            bqu.setBlock(fu2, Blocks.BLUE_ICE.defaultBlockState(), 2);
                             break;
                         }
                     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/BonusChestFeature.java b/src/net/minecraft/world/level/levelgen/feature/BonusChestFeature.java
index 76d604b..bbf6cd2 100644
--- a/src/net/minecraft/world/level/levelgen/feature/BonusChestFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/BonusChestFeature.java
@@ -18,38 +18,37 @@ import java.util.List;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class BonusChestFeature extends Feature<NoneFeatureConfiguration> {
-    public BonusChestFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public BonusChestFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        final ChunkPos bjh7 = new ChunkPos(fk);
-        final List<Integer> list8 = IntStream.rangeClosed(bjh7.getMinBlockX(), bjh7.getMaxBlockX()).boxed().collect(Collectors.toList());
-        Collections.shuffle(list8, random);
-        final List<Integer> list9 = IntStream.rangeClosed(bjh7.getMinBlockZ(), bjh7.getMaxBlockZ()).boxed().collect(Collectors.toList());
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        final ChunkPos bph8 = new ChunkPos(fu);
+        final List<Integer> list9 = IntStream.rangeClosed(bph8.getMinBlockX(), bph8.getMaxBlockX()).boxed().collect(Collectors.toList());
         Collections.shuffle(list9, random);
-        final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
-        for (final Integer integer12 : list8) {
-            for (final Integer integer13 : list9) {
-                a10.set(integer12, 0, integer13);
-                final BlockPos fk2 = bjx.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, a10);
-                if (bjx.isEmptyBlock(fk2) || bjx.getBlockState(fk2).getCollisionShape(bjx, fk2).isEmpty()) {
-                    bjx.setBlock(fk2, Blocks.CHEST.defaultBlockState(), 2);
-                    RandomizableContainerBlockEntity.setLootTable(bjx, random, fk2, BuiltInLootTables.SPAWN_BONUS_CHEST);
-                    final BlockState byj16 = Blocks.TORCH.defaultBlockState();
-                    for (final Direction fp18 : Direction.Plane.HORIZONTAL) {
-                        final BlockPos fk3 = fk2.relative(fp18);
-                        if (byj16.canSurvive(bjx, fk3)) {
-                            bjx.setBlock(fk3, byj16, 2);
+        final List<Integer> list10 = IntStream.rangeClosed(bph8.getMinBlockZ(), bph8.getMaxBlockZ()).boxed().collect(Collectors.toList());
+        Collections.shuffle(list10, random);
+        final BlockPos.MutableBlockPos a11 = new BlockPos.MutableBlockPos();
+        for (final Integer integer13 : list9) {
+            for (final Integer integer14 : list10) {
+                a11.set(integer13, 0, integer14);
+                final BlockPos fu2 = bqu.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, a11);
+                if (bqu.isEmptyBlock(fu2) || bqu.getBlockState(fu2).getCollisionShape(bqu, fu2).isEmpty()) {
+                    bqu.setBlock(fu2, Blocks.CHEST.defaultBlockState(), 2);
+                    RandomizableContainerBlockEntity.setLootTable(bqu, random, fu2, BuiltInLootTables.SPAWN_BONUS_CHEST);
+                    final BlockState cfj17 = Blocks.TORCH.defaultBlockState();
+                    for (final Direction fz19 : Direction.Plane.HORIZONTAL) {
+                        final BlockPos fu3 = fu2.relative(fz19);
+                        if (cfj17.canSurvive(bqu, fu3)) {
+                            bqu.setBlock(fu3, cfj17, 2);
                         }
                     }
                     return true;
diff --git a/src/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java b/src/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java
index 3e63cc6..9569db6 100644
--- a/src/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java
@@ -5,57 +5,42 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
-import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.biome.Biome;
-import java.util.Random;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.biome.BiomeSource;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.biome.BiomeManager;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration;
 
 public class BuriedTreasureFeature extends StructureFeature<BuriedTreasureConfiguration> {
-    public BuriedTreasureFeature(final Function<Dynamic<?>, ? extends BuriedTreasureConfiguration> function) {
-        super(function);
+    public BuriedTreasureFeature(final Codec<BuriedTreasureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt) {
-        if (caa.isBiomeValidStartForStructure(bkt, this)) {
-            ((WorldgenRandom)random).setLargeFeatureWithSalt(caa.getSeed(), integer4, integer5, 10387320);
-            final BuriedTreasureConfiguration cgf8 = caa.<BuriedTreasureConfiguration>getStructureConfiguration(bkt, (StructureFeature<BuriedTreasureConfiguration>)this);
-            return random.nextFloat() < cgf8.probability;
-        }
-        return false;
+    protected boolean isFeatureChunk(final ChunkGenerator cha, final BiomeSource brh, final long long3, final WorldgenRandom ciy, final int integer5, final int integer6, final Biome bre, final ChunkPos bph, final BuriedTreasureConfiguration cnh) {
+        ciy.setLargeFeatureWithSalt(long3, integer5, integer6, 10387320);
+        return ciy.nextFloat() < cnh.probability;
     }
     
     @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<BuriedTreasureConfiguration> getStartFactory() {
         return BuriedTreasureStart::new;
     }
     
-    @Override
-    public String getFeatureName() {
-        return "Buried_Treasure";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 1;
-    }
-    
-    public static class BuriedTreasureStart extends StructureStart {
-        public BuriedTreasureStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class BuriedTreasureStart extends StructureStart<BuriedTreasureConfiguration> {
+        public BuriedTreasureStart(final StructureFeature<BuriedTreasureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final BuriedTreasureConfiguration cnh) {
             final int integer5 = integer3 * 16;
             final int integer6 = integer4 * 16;
-            final BlockPos fk9 = new BlockPos(integer5 + 9, 90, integer6 + 9);
-            this.pieces.add(new BuriedTreasurePieces.BuriedTreasurePiece(fk9));
+            final BlockPos fu10 = new BlockPos(integer5 + 9, 90, integer6 + 9);
+            this.pieces.add(new BuriedTreasurePieces.BuriedTreasurePiece(fu10));
             this.calculateBoundingBox();
         }
         
diff --git a/src/net/minecraft/world/level/levelgen/feature/ChorusPlantFeature.java b/src/net/minecraft/world/level/levelgen/feature/ChorusPlantFeature.java
index c1bc154..ce5387a 100644
--- a/src/net/minecraft/world/level/levelgen/feature/ChorusPlantFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/ChorusPlantFeature.java
@@ -1,26 +1,26 @@
 package net.minecraft.world.level.levelgen.feature;
 
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.ChorusFlowerBlock;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class ChorusPlantFeature extends Feature<NoneFeatureConfiguration> {
-    public ChorusPlantFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public ChorusPlantFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        if (bjx.isEmptyBlock(fk.above()) && bjx.getBlockState(fk).getBlock() == Blocks.END_STONE) {
-            ChorusFlowerBlock.generatePlant(bjx, fk.above(), random, 8);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        if (bqu.isEmptyBlock(fu.above()) && bqu.getBlockState(fu).is(Blocks.END_STONE)) {
+            ChorusFlowerBlock.generatePlant(bqu, fu.above(), random, 8);
             return true;
         }
         return false;
diff --git a/src/net/minecraft/world/level/levelgen/feature/ConfiguredFeature.java b/src/net/minecraft/world/level/levelgen/feature/ConfiguredFeature.java
index f300c53..14a6804 100644
--- a/src/net/minecraft/world/level/levelgen/feature/ConfiguredFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/ConfiguredFeature.java
@@ -1,67 +1,48 @@
 package net.minecraft.world.level.levelgen.feature;
 
 import org.apache.logging.log4j.LogManager;
+import java.util.function.Function;
+import net.minecraft.core.Registry;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration;
 import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
-import com.mojang.datafixers.Dynamic;
 import org.apache.logging.log4j.Logger;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 
 public class ConfiguredFeature<FC extends FeatureConfiguration, F extends Feature<FC>> {
+    public static final ConfiguredFeature<?, ?> NOPE;
+    public static final Codec<ConfiguredFeature<?, ?>> CODEC;
     public static final Logger LOGGER;
     public final F feature;
     public final FC config;
     
-    public ConfiguredFeature(final F cdu, final FC cgn) {
-        this.feature = cdu;
-        this.config = cgn;
+    public ConfiguredFeature(final F ckt, final FC cnr) {
+        this.feature = ckt;
+        this.config = cnr;
     }
     
-    public ConfiguredFeature(final F cdu, final Dynamic<?> dynamic) {
-        this(cdu, ((Feature<FeatureConfiguration>)cdu).createSettings(dynamic));
-    }
-    
-    public ConfiguredFeature<?, ?> decorated(final ConfiguredDecorator<?> cjj) {
-        final Feature<DecoratedFeatureConfiguration> cdu3 = (this.feature instanceof AbstractFlowerFeature) ? Feature.DECORATED_FLOWER : Feature.DECORATED;
-        return cdu3.configured(new DecoratedFeatureConfiguration(this, cjj));
+    public ConfiguredFeature<?, ?> decorated(final ConfiguredDecorator<?> crl) {
+        final Feature<DecoratedFeatureConfiguration> ckt3 = (this.feature instanceof AbstractFlowerFeature) ? Feature.DECORATED_FLOWER : Feature.DECORATED;
+        return ckt3.configured(new DecoratedFeatureConfiguration(this, crl));
     }
     
     public WeightedConfiguredFeature<FC> weighted(final float float1) {
         return new WeightedConfiguredFeature<FC>(this, float1);
     }
     
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("name"), dynamicOps.createString(Registry.FEATURE.getKey(this.feature).toString()), dynamicOps.createString("config"), this.config.<T>serialize(dynamicOps).getValue())));
-    }
-    
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk) {
-        return this.feature.place(bjx, caa, random, fk, this.config);
-    }
-    
-    public static <T> ConfiguredFeature<?, ?> deserialize(final Dynamic<T> dynamic) {
-        final String string2 = dynamic.get("name").asString("");
-        final Feature<? extends FeatureConfiguration> cdu3 = Registry.FEATURE.get(new ResourceLocation(string2));
-        try {
-            return new ConfiguredFeature<Object, Object>(cdu3, dynamic.get("config").orElseEmptyMap());
-        }
-        catch (RuntimeException runtimeException4) {
-            ConfiguredFeature.LOGGER.warn("Error while deserializing {}", string2);
-            return new ConfiguredFeature<Object, Object>(Feature.NO_OP, NoneFeatureConfiguration.NONE);
-        }
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu) {
+        return this.feature.place(bqu, bqq, cha, random, fu, this.config);
     }
     
     static {
+        NOPE = new ConfiguredFeature<Object, Object>(Feature.NO_OP, NoneFeatureConfiguration.NONE);
+        CODEC = Registry.FEATURE.dispatch("name", ckb -> ckb.feature, (Function)Feature::configuredCodec).withDefault(ConfiguredFeature.NOPE);
         LOGGER = LogManager.getLogger();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/ConfiguredStructureFeature.java b/src/net/minecraft/world/level/levelgen/feature/ConfiguredStructureFeature.java
new file mode 100644
index 0000000..2489b7c
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/ConfiguredStructureFeature.java
@@ -0,0 +1,33 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import java.util.function.Function;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+
+public class ConfiguredStructureFeature<FC extends FeatureConfiguration, F extends StructureFeature<FC>> {
+    public static final Codec<ConfiguredStructureFeature<?, ?>> CODEC;
+    public final F feature;
+    public final FC config;
+    
+    public ConfiguredStructureFeature(final F cml, final FC cnr) {
+        this.feature = cml;
+        this.config = cnr;
+    }
+    
+    public StructureStart<?> generate(final ChunkGenerator cha, final BiomeSource brh, final StructureManager cva, final long long4, final ChunkPos bph, final Biome bre, final int integer, final StructureFeatureConfiguration cot) {
+        return this.feature.generate(cha, brh, cva, long4, bph, bre, integer, new WorldgenRandom(), cot, this.config);
+    }
+    
+    static {
+        CODEC = Registry.STRUCTURE_FEATURE.dispatch("name", ckc -> ckc.feature, (Function)StructureFeature::configuredStructureCodec);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/CoralClawFeature.java b/src/net/minecraft/world/level/levelgen/feature/CoralClawFeature.java
index a268216..183bed8 100644
--- a/src/net/minecraft/world/level/levelgen/feature/CoralClawFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/CoralClawFeature.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.levelgen.feature;
 
 import java.util.Iterator;
+import net.minecraft.Util;
 import java.util.List;
 import java.util.Collections;
 import com.google.common.collect.Lists;
@@ -10,48 +11,47 @@ import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CoralClawFeature extends CoralFeature {
-    public CoralClawFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public CoralClawFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    protected boolean placeFeature(final LevelAccessor bjx, final Random random, final BlockPos fk, final BlockState byj) {
-        if (!this.placeCoralBlock(bjx, random, fk, byj)) {
+    protected boolean placeFeature(final LevelAccessor bqc, final Random random, final BlockPos fu, final BlockState cfj) {
+        if (!this.placeCoralBlock(bqc, random, fu, cfj)) {
             return false;
         }
-        final Direction fp6 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
+        final Direction fz6 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
         final int integer7 = random.nextInt(2) + 2;
-        final List<Direction> list8 = Lists.<Direction>newArrayList(fp6, fp6.getClockWise(), fp6.getCounterClockWise());
+        final List<Direction> list8 = Lists.<Direction>newArrayList(fz6, fz6.getClockWise(), fz6.getCounterClockWise());
         Collections.shuffle(list8, random);
         final List<Direction> list9 = list8.subList(0, integer7);
-        for (final Direction fp7 : list9) {
-            final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos(fk);
+        for (final Direction fz7 : list9) {
+            final BlockPos.MutableBlockPos a12 = fu.mutable();
             final int integer8 = random.nextInt(2) + 1;
-            a12.move(fp7);
-            Direction fp8;
+            a12.move(fz7);
+            Direction fz8;
             int integer9;
-            if (fp7 == fp6) {
-                fp8 = fp6;
+            if (fz7 == fz6) {
+                fz8 = fz6;
                 integer9 = random.nextInt(3) + 2;
             }
             else {
                 a12.move(Direction.UP);
-                final Direction[] arr16 = { fp7, Direction.UP };
-                fp8 = arr16[random.nextInt(arr16.length)];
+                final Direction[] arr16 = { fz7, Direction.UP };
+                fz8 = Util.<Direction>getRandom(arr16, random);
                 integer9 = random.nextInt(3) + 3;
             }
-            for (int integer10 = 0; integer10 < integer8 && this.placeCoralBlock(bjx, random, a12, byj); ++integer10) {
-                a12.move(fp8);
+            for (int integer10 = 0; integer10 < integer8 && this.placeCoralBlock(bqc, random, a12, cfj); ++integer10) {
+                a12.move(fz8);
             }
-            a12.move(fp8.getOpposite());
+            a12.move(fz8.getOpposite());
             a12.move(Direction.UP);
             for (int integer10 = 0; integer10 < integer9; ++integer10) {
-                a12.move(fp6);
-                if (!this.placeCoralBlock(bjx, random, a12, byj)) {
+                a12.move(fz6);
+                if (!this.placeCoralBlock(bqc, random, a12, cfj)) {
                     break;
                 }
                 if (random.nextFloat() < 0.25f) {
diff --git a/src/net/minecraft/world/level/levelgen/feature/CoralFeature.java b/src/net/minecraft/world/level/levelgen/feature/CoralFeature.java
index bf24509..89e712d 100644
--- a/src/net/minecraft/world/level/levelgen/feature/CoralFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/CoralFeature.java
@@ -1,59 +1,60 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import java.util.Iterator;
 import net.minecraft.world.level.block.BaseCoralWallFanBlock;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.SeaPickleBlock;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public abstract class CoralFeature extends Feature<NoneFeatureConfiguration> {
-    public CoralFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public CoralFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        final BlockState byj7 = BlockTags.CORAL_BLOCKS.getRandomElement(random).defaultBlockState();
-        return this.placeFeature(bjx, random, fk, byj7);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        final BlockState cfj8 = BlockTags.CORAL_BLOCKS.getRandomElement(random).defaultBlockState();
+        return this.placeFeature(bqu, random, fu, cfj8);
     }
     
-    protected abstract boolean placeFeature(final LevelAccessor bjx, final Random random, final BlockPos fk, final BlockState byj);
+    protected abstract boolean placeFeature(final LevelAccessor bqc, final Random random, final BlockPos fu, final BlockState cfj);
     
-    protected boolean placeCoralBlock(final LevelAccessor bjx, final Random random, final BlockPos fk, final BlockState byj) {
-        final BlockPos fk2 = fk.above();
-        final BlockState byj2 = bjx.getBlockState(fk);
-        if ((byj2.getBlock() != Blocks.WATER && !byj2.is(BlockTags.CORALS)) || bjx.getBlockState(fk2).getBlock() != Blocks.WATER) {
+    protected boolean placeCoralBlock(final LevelAccessor bqc, final Random random, final BlockPos fu, final BlockState cfj) {
+        final BlockPos fu2 = fu.above();
+        final BlockState cfj2 = bqc.getBlockState(fu);
+        if ((!cfj2.is(Blocks.WATER) && !cfj2.is(BlockTags.CORALS)) || !bqc.getBlockState(fu2).is(Blocks.WATER)) {
             return false;
         }
-        bjx.setBlock(fk, byj, 3);
+        bqc.setBlock(fu, cfj, 3);
         if (random.nextFloat() < 0.25f) {
-            bjx.setBlock(fk2, BlockTags.CORALS.getRandomElement(random).defaultBlockState(), 2);
+            bqc.setBlock(fu2, BlockTags.CORALS.getRandomElement(random).defaultBlockState(), 2);
         }
         else if (random.nextFloat() < 0.05f) {
-            bjx.setBlock(fk2, ((AbstractStateHolder<O, BlockState>)Blocks.SEA_PICKLE.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SeaPickleBlock.PICKLES, random.nextInt(4) + 1), 2);
+            bqc.setBlock(fu2, ((StateHolder<O, BlockState>)Blocks.SEA_PICKLE.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SeaPickleBlock.PICKLES, random.nextInt(4) + 1), 2);
         }
-        for (final Direction fp9 : Direction.Plane.HORIZONTAL) {
+        for (final Direction fz9 : Direction.Plane.HORIZONTAL) {
             if (random.nextFloat() < 0.2f) {
-                final BlockPos fk3 = fk.relative(fp9);
-                if (bjx.getBlockState(fk3).getBlock() != Blocks.WATER) {
+                final BlockPos fu3 = fu.relative(fz9);
+                if (!bqc.getBlockState(fu3).is(Blocks.WATER)) {
                     continue;
                 }
-                final BlockState byj3 = ((AbstractStateHolder<O, BlockState>)BlockTags.WALL_CORALS.getRandomElement(random).defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, fp9);
-                bjx.setBlock(fk3, byj3, 2);
+                final BlockState cfj3 = ((StateHolder<O, BlockState>)BlockTags.WALL_CORALS.getRandomElement(random).defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BaseCoralWallFanBlock.FACING, fz9);
+                bqc.setBlock(fu3, cfj3, 2);
             }
         }
         return true;
diff --git a/src/net/minecraft/world/level/levelgen/feature/CoralMushroomFeature.java b/src/net/minecraft/world/level/levelgen/feature/CoralMushroomFeature.java
index dfb3261..4e9c5e5 100644
--- a/src/net/minecraft/world/level/levelgen/feature/CoralMushroomFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/CoralMushroomFeature.java
@@ -6,25 +6,24 @@ import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CoralMushroomFeature extends CoralFeature {
-    public CoralMushroomFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public CoralMushroomFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    protected boolean placeFeature(final LevelAccessor bjx, final Random random, final BlockPos fk, final BlockState byj) {
+    protected boolean placeFeature(final LevelAccessor bqc, final Random random, final BlockPos fu, final BlockState cfj) {
         final int integer6 = random.nextInt(3) + 3;
         final int integer7 = random.nextInt(3) + 3;
         final int integer8 = random.nextInt(3) + 3;
         final int integer9 = random.nextInt(3) + 1;
-        final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos(fk);
+        final BlockPos.MutableBlockPos a10 = fu.mutable();
         for (int integer10 = 0; integer10 <= integer7; ++integer10) {
             for (int integer11 = 0; integer11 <= integer6; ++integer11) {
                 for (int integer12 = 0; integer12 <= integer8; ++integer12) {
-                    a10.set(integer10 + fk.getX(), integer11 + fk.getY(), integer12 + fk.getZ());
+                    a10.set(integer10 + fu.getX(), integer11 + fu.getY(), integer12 + fu.getZ());
                     a10.move(Direction.DOWN, integer9);
                     if (integer10 == 0 || integer10 == integer7) {
                         if (integer11 == 0) {
@@ -52,7 +51,7 @@ public class CoralMushroomFeature extends CoralFeature {
                     }
                     if (integer10 == 0 || integer10 == integer7 || integer11 == 0 || integer11 == integer6 || integer12 == 0 || integer12 == integer8) {
                         if (random.nextFloat() >= 0.1f) {
-                            if (!this.placeCoralBlock(bjx, random, a10, byj)) {}
+                            if (!this.placeCoralBlock(bqc, random, a10, cfj)) {}
                         }
                     }
                 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/CoralTreeFeature.java b/src/net/minecraft/world/level/levelgen/feature/CoralTreeFeature.java
index 3d95244..063ac05 100644
--- a/src/net/minecraft/world/level/levelgen/feature/CoralTreeFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/CoralTreeFeature.java
@@ -11,38 +11,37 @@ import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CoralTreeFeature extends CoralFeature {
-    public CoralTreeFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public CoralTreeFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    protected boolean placeFeature(final LevelAccessor bjx, final Random random, final BlockPos fk, final BlockState byj) {
-        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos(fk);
+    protected boolean placeFeature(final LevelAccessor bqc, final Random random, final BlockPos fu, final BlockState cfj) {
+        final BlockPos.MutableBlockPos a6 = fu.mutable();
         for (int integer7 = random.nextInt(3) + 1, integer8 = 0; integer8 < integer7; ++integer8) {
-            if (!this.placeCoralBlock(bjx, random, a6, byj)) {
+            if (!this.placeCoralBlock(bqc, random, a6, cfj)) {
                 return true;
             }
             a6.move(Direction.UP);
         }
-        final BlockPos fk2 = a6.immutable();
+        final BlockPos fu2 = a6.immutable();
         final int integer9 = random.nextInt(3) + 2;
         final List<Direction> list10 = Lists.newArrayList(Direction.Plane.HORIZONTAL);
         Collections.shuffle(list10, random);
         final List<Direction> list11 = list10.subList(0, integer9);
-        for (final Direction fp13 : list11) {
-            a6.set(fk2);
-            a6.move(fp13);
+        for (final Direction fz13 : list11) {
+            a6.set(fu2);
+            a6.move(fz13);
             final int integer10 = random.nextInt(5) + 2;
             int integer11 = 0;
-            for (int integer12 = 0; integer12 < integer10 && this.placeCoralBlock(bjx, random, a6, byj); ++integer12) {
+            for (int integer12 = 0; integer12 < integer10 && this.placeCoralBlock(bqc, random, a6, cfj); ++integer12) {
                 ++integer11;
                 a6.move(Direction.UP);
                 if (integer12 == 0 || (integer11 >= 2 && random.nextFloat() < 0.25f)) {
-                    a6.move(fp13);
+                    a6.move(fz13);
                     integer11 = 0;
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/feature/DarkOakFeature.java b/src/net/minecraft/world/level/levelgen/feature/DarkOakFeature.java
deleted file mode 100644
index 642518e..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/DarkOakFeature.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package net.minecraft.world.level.levelgen.feature;
-
-import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.Set;
-import net.minecraft.core.BlockPos;
-import java.util.Random;
-import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration;
-
-public class DarkOakFeature extends AbstractTreeFeature<MegaTreeConfiguration> {
-    public DarkOakFeature(final Function<Dynamic<?>, ? extends MegaTreeConfiguration> function) {
-        super(function);
-    }
-    
-    public boolean doPlace(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final Set<BlockPos> set4, final Set<BlockPos> set5, final BoundingBox clb, final MegaTreeConfiguration cgr) {
-        final int integer9 = random.nextInt(3) + random.nextInt(2) + cgr.baseHeight;
-        final int integer10 = fk.getX();
-        final int integer11 = fk.getY();
-        final int integer12 = fk.getZ();
-        if (integer11 < 1 || integer11 + integer9 + 1 >= 256) {
-            return false;
-        }
-        final BlockPos fk2 = fk.below();
-        if (!AbstractTreeFeature.isGrassOrDirt(bkb, fk2)) {
-            return false;
-        }
-        if (!this.canPlaceTreeOfHeight(bkb, fk, integer9)) {
-            return false;
-        }
-        this.setDirtAt(bkb, fk2);
-        this.setDirtAt(bkb, fk2.east());
-        this.setDirtAt(bkb, fk2.south());
-        this.setDirtAt(bkb, fk2.south().east());
-        final Direction fp14 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
-        final int integer13 = integer9 - random.nextInt(4);
-        int integer14 = 2 - random.nextInt(3);
-        int integer15 = integer10;
-        int integer16 = integer12;
-        final int integer17 = integer11 + integer9 - 1;
-        for (int integer18 = 0; integer18 < integer9; ++integer18) {
-            if (integer18 >= integer13 && integer14 > 0) {
-                integer15 += fp14.getStepX();
-                integer16 += fp14.getStepZ();
-                --integer14;
-            }
-            final int integer19 = integer11 + integer18;
-            final BlockPos fk3 = new BlockPos(integer15, integer19, integer16);
-            if (AbstractTreeFeature.isAirOrLeaves(bkb, fk3)) {
-                this.placeLog(bkb, random, fk3, set4, clb, cgr);
-                this.placeLog(bkb, random, fk3.east(), set4, clb, cgr);
-                this.placeLog(bkb, random, fk3.south(), set4, clb, cgr);
-                this.placeLog(bkb, random, fk3.east().south(), set4, clb, cgr);
-            }
-        }
-        for (int integer18 = -2; integer18 <= 0; ++integer18) {
-            for (int integer19 = -2; integer19 <= 0; ++integer19) {
-                int integer20 = -1;
-                this.placeLeaf(bkb, random, new BlockPos(integer15 + integer18, integer17 + integer20, integer16 + integer19), set5, clb, cgr);
-                this.placeLeaf(bkb, random, new BlockPos(1 + integer15 - integer18, integer17 + integer20, integer16 + integer19), set5, clb, cgr);
-                this.placeLeaf(bkb, random, new BlockPos(integer15 + integer18, integer17 + integer20, 1 + integer16 - integer19), set5, clb, cgr);
-                this.placeLeaf(bkb, random, new BlockPos(1 + integer15 - integer18, integer17 + integer20, 1 + integer16 - integer19), set5, clb, cgr);
-                if (integer18 > -2 || integer19 > -1) {
-                    if (integer18 != -1 || integer19 != -2) {
-                        integer20 = 1;
-                        this.placeLeaf(bkb, random, new BlockPos(integer15 + integer18, integer17 + integer20, integer16 + integer19), set5, clb, cgr);
-                        this.placeLeaf(bkb, random, new BlockPos(1 + integer15 - integer18, integer17 + integer20, integer16 + integer19), set5, clb, cgr);
-                        this.placeLeaf(bkb, random, new BlockPos(integer15 + integer18, integer17 + integer20, 1 + integer16 - integer19), set5, clb, cgr);
-                        this.placeLeaf(bkb, random, new BlockPos(1 + integer15 - integer18, integer17 + integer20, 1 + integer16 - integer19), set5, clb, cgr);
-                    }
-                }
-            }
-        }
-        if (random.nextBoolean()) {
-            this.placeLeaf(bkb, random, new BlockPos(integer15, integer17 + 2, integer16), set5, clb, cgr);
-            this.placeLeaf(bkb, random, new BlockPos(integer15 + 1, integer17 + 2, integer16), set5, clb, cgr);
-            this.placeLeaf(bkb, random, new BlockPos(integer15 + 1, integer17 + 2, integer16 + 1), set5, clb, cgr);
-            this.placeLeaf(bkb, random, new BlockPos(integer15, integer17 + 2, integer16 + 1), set5, clb, cgr);
-        }
-        for (int integer18 = -3; integer18 <= 4; ++integer18) {
-            for (int integer19 = -3; integer19 <= 4; ++integer19) {
-                if ((integer18 != -3 || integer19 != -3) && (integer18 != -3 || integer19 != 4) && (integer18 != 4 || integer19 != -3)) {
-                    if (integer18 != 4 || integer19 != 4) {
-                        if (Math.abs(integer18) < 3 || Math.abs(integer19) < 3) {
-                            this.placeLeaf(bkb, random, new BlockPos(integer15 + integer18, integer17, integer16 + integer19), set5, clb, cgr);
-                        }
-                    }
-                }
-            }
-        }
-        for (int integer18 = -1; integer18 <= 2; ++integer18) {
-            for (int integer19 = -1; integer19 <= 2; ++integer19) {
-                if (integer18 < 0 || integer18 > 1 || integer19 < 0 || integer19 > 1) {
-                    if (random.nextInt(3) <= 0) {
-                        for (int integer20 = random.nextInt(3) + 2, integer21 = 0; integer21 < integer20; ++integer21) {
-                            this.placeLog(bkb, random, new BlockPos(integer10 + integer18, integer17 - integer21 - 1, integer12 + integer19), set4, clb, cgr);
-                        }
-                        for (int integer21 = -1; integer21 <= 1; ++integer21) {
-                            for (int integer22 = -1; integer22 <= 1; ++integer22) {
-                                this.placeLeaf(bkb, random, new BlockPos(integer15 + integer18 + integer21, integer17, integer16 + integer19 + integer22), set5, clb, cgr);
-                            }
-                        }
-                        for (int integer21 = -2; integer21 <= 2; ++integer21) {
-                            for (int integer22 = -2; integer22 <= 2; ++integer22) {
-                                if (Math.abs(integer21) != 2 || Math.abs(integer22) != 2) {
-                                    this.placeLeaf(bkb, random, new BlockPos(integer15 + integer18 + integer21, integer17 - 1, integer16 + integer19 + integer22), set5, clb, cgr);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
-    
-    private boolean canPlaceTreeOfHeight(final LevelSimulatedReader bkc, final BlockPos fk, final int integer) {
-        final int integer2 = fk.getX();
-        final int integer3 = fk.getY();
-        final int integer4 = fk.getZ();
-        final BlockPos.MutableBlockPos a8 = new BlockPos.MutableBlockPos();
-        for (int integer5 = 0; integer5 <= integer + 1; ++integer5) {
-            int integer6 = 1;
-            if (integer5 == 0) {
-                integer6 = 0;
-            }
-            if (integer5 >= integer - 1) {
-                integer6 = 2;
-            }
-            for (int integer7 = -integer6; integer7 <= integer6; ++integer7) {
-                for (int integer8 = -integer6; integer8 <= integer6; ++integer8) {
-                    if (!AbstractTreeFeature.isFree(bkc, a8.set(integer2 + integer7, integer3 + integer5, integer4 + integer8))) {
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/DecoratedFeature.java b/src/net/minecraft/world/level/levelgen/feature/DecoratedFeature.java
index a9b75b0..28f211e 100644
--- a/src/net/minecraft/world/level/levelgen/feature/DecoratedFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/DecoratedFeature.java
@@ -4,21 +4,20 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfigur
 import net.minecraft.core.Registry;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration;
 
 public class DecoratedFeature extends Feature<DecoratedFeatureConfiguration> {
-    public DecoratedFeature(final Function<Dynamic<?>, ? extends DecoratedFeatureConfiguration> function) {
-        super(function);
+    public DecoratedFeature(final Codec<DecoratedFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final DecoratedFeatureConfiguration cgj) {
-        return cgj.decorator.place(bjx, caa, random, fk, cgj.feature);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final DecoratedFeatureConfiguration cnm) {
+        return cnm.decorator.place(bqu, bqq, cha, random, fu, cnm.feature);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/levelgen/feature/DecoratedFlowerFeature.java b/src/net/minecraft/world/level/levelgen/feature/DecoratedFlowerFeature.java
index 6a44b94..a809dfa 100644
--- a/src/net/minecraft/world/level/levelgen/feature/DecoratedFlowerFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/DecoratedFlowerFeature.java
@@ -1,11 +1,10 @@
 package net.minecraft.world.level.levelgen.feature;
 
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class DecoratedFlowerFeature extends DecoratedFeature {
-    public DecoratedFlowerFeature(final Function<Dynamic<?>, ? extends DecoratedFeatureConfiguration> function) {
-        super(function);
+    public DecoratedFlowerFeature(final Codec<DecoratedFeatureConfiguration> codec) {
+        super(codec);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/DefaultFlowerFeature.java b/src/net/minecraft/world/level/levelgen/feature/DefaultFlowerFeature.java
index d7a81e7..604b692 100644
--- a/src/net/minecraft/world/level/levelgen/feature/DefaultFlowerFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/DefaultFlowerFeature.java
@@ -5,32 +5,31 @@ import net.minecraft.world.level.block.state.BlockState;
 import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration;
 
 public class DefaultFlowerFeature extends AbstractFlowerFeature<RandomPatchConfiguration> {
-    public DefaultFlowerFeature(final Function<Dynamic<?>, ? extends RandomPatchConfiguration> function) {
-        super(function);
+    public DefaultFlowerFeature(final Codec<RandomPatchConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean isValid(final LevelAccessor bjx, final BlockPos fk, final RandomPatchConfiguration chb) {
-        return !chb.blacklist.contains(bjx.getBlockState(fk));
+    public boolean isValid(final LevelAccessor bqc, final BlockPos fu, final RandomPatchConfiguration cog) {
+        return !cog.blacklist.contains(bqc.getBlockState(fu));
     }
     
     @Override
-    public int getCount(final RandomPatchConfiguration chb) {
-        return chb.tries;
+    public int getCount(final RandomPatchConfiguration cog) {
+        return cog.tries;
     }
     
     @Override
-    public BlockPos getPos(final Random random, final BlockPos fk, final RandomPatchConfiguration chb) {
-        return fk.offset(random.nextInt(chb.xspread) - random.nextInt(chb.xspread), random.nextInt(chb.yspread) - random.nextInt(chb.yspread), random.nextInt(chb.zspread) - random.nextInt(chb.zspread));
+    public BlockPos getPos(final Random random, final BlockPos fu, final RandomPatchConfiguration cog) {
+        return fu.offset(random.nextInt(cog.xspread) - random.nextInt(cog.xspread), random.nextInt(cog.yspread) - random.nextInt(cog.yspread), random.nextInt(cog.zspread) - random.nextInt(cog.zspread));
     }
     
     @Override
-    public BlockState getRandomFlower(final Random random, final BlockPos fk, final RandomPatchConfiguration chb) {
-        return chb.stateProvider.getState(random, fk);
+    public BlockState getRandomFlower(final Random random, final BlockPos fu, final RandomPatchConfiguration cog) {
+        return cog.stateProvider.getState(random, fu);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/DeltaFeature.java b/src/net/minecraft/world/level/levelgen/feature/DeltaFeature.java
new file mode 100644
index 0000000..4b5d2c3
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/DeltaFeature.java
@@ -0,0 +1,109 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.Iterator;
+import net.minecraft.world.level.LevelWriter;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
+import java.util.Random;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.Block;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration;
+
+public class DeltaFeature extends Feature<DeltaFeatureConfiguration> {
+    private static final ImmutableList<Block> CANNOT_REPLACE;
+    private static final Direction[] DIRECTIONS;
+    
+    private static int calculateRadius(final Random random, final DeltaFeatureConfiguration cno) {
+        return cno.minimumRadius + random.nextInt(cno.maximumRadius - cno.minimumRadius + 1);
+    }
+    
+    private static int calculateRimSize(final Random random, final DeltaFeatureConfiguration cno) {
+        return random.nextInt(cno.maximumRimSize + 1);
+    }
+    
+    public DeltaFeature(final Codec<DeltaFeatureConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final DeltaFeatureConfiguration cno) {
+        final BlockPos fu2 = findDeltaLevel(bqu, fu.mutable().clamp(Direction.Axis.Y, 1, bqu.getMaxBuildHeight() - 1));
+        if (fu2 == null) {
+            return false;
+        }
+        boolean boolean9 = false;
+        final boolean boolean10 = random.nextDouble() < 0.9;
+        final int integer11 = boolean10 ? calculateRimSize(random, cno) : 0;
+        final int integer12 = boolean10 ? calculateRimSize(random, cno) : 0;
+        final boolean boolean11 = boolean10 && integer11 != 0 && integer12 != 0;
+        final int integer13 = calculateRadius(random, cno);
+        final int integer14 = calculateRadius(random, cno);
+        final int integer15 = Math.max(integer13, integer14);
+        for (final BlockPos fu3 : BlockPos.withinManhattan(fu2, integer13, 0, integer14)) {
+            if (fu3.distManhattan(fu2) > integer15) {
+                break;
+            }
+            if (!isClear(bqu, fu3, cno)) {
+                continue;
+            }
+            if (boolean11) {
+                boolean9 = true;
+                this.setBlock(bqu, fu3, cno.rim);
+            }
+            final BlockPos fu4 = fu3.offset(integer11, 0, integer12);
+            if (!isClear(bqu, fu4, cno)) {
+                continue;
+            }
+            boolean9 = true;
+            this.setBlock(bqu, fu4, cno.contents);
+        }
+        return boolean9;
+    }
+    
+    private static boolean isClear(final LevelAccessor bqc, final BlockPos fu, final DeltaFeatureConfiguration cno) {
+        final BlockState cfj4 = bqc.getBlockState(fu);
+        if (cfj4.is(cno.contents.getBlock())) {
+            return false;
+        }
+        if (DeltaFeature.CANNOT_REPLACE.contains(cfj4.getBlock())) {
+            return false;
+        }
+        for (final Direction fz8 : DeltaFeature.DIRECTIONS) {
+            final boolean boolean9 = bqc.getBlockState(fu.relative(fz8)).isAir();
+            if ((boolean9 && fz8 != Direction.UP) || (!boolean9 && fz8 == Direction.UP)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    @Nullable
+    private static BlockPos findDeltaLevel(final LevelAccessor bqc, final BlockPos.MutableBlockPos a) {
+        while (a.getY() > 1) {
+            if (bqc.getBlockState(a).isAir()) {
+                final BlockState cfj3 = bqc.getBlockState(a.move(Direction.DOWN));
+                a.move(Direction.UP);
+                if (!cfj3.is(Blocks.LAVA) && !cfj3.is(Blocks.BEDROCK) && !cfj3.isAir()) {
+                    return a;
+                }
+            }
+            a.move(Direction.DOWN);
+        }
+        return null;
+    }
+    
+    static {
+        CANNOT_REPLACE = ImmutableList.<Block>of(Blocks.BEDROCK, Blocks.NETHER_BRICKS, Blocks.NETHER_BRICK_FENCE, Blocks.NETHER_BRICK_STAIRS, Blocks.NETHER_WART, Blocks.CHEST, Blocks.SPAWNER);
+        DIRECTIONS = Direction.values();
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/DesertPyramidFeature.java b/src/net/minecraft/world/level/levelgen/feature/DesertPyramidFeature.java
index c81b8fc..e11fe46 100644
--- a/src/net/minecraft/world/level/levelgen/feature/DesertPyramidFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/DesertPyramidFeature.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import java.util.Random;
 import net.minecraft.world.level.levelgen.structure.DesertPyramidPiece;
 import net.minecraft.world.level.biome.Biome;
@@ -7,44 +8,28 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
-public class DesertPyramidFeature extends RandomScatteredFeature<NoneFeatureConfiguration> {
-    public DesertPyramidFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+public class DesertPyramidFeature extends StructureFeature<NoneFeatureConfiguration> {
+    public DesertPyramidFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public String getFeatureName() {
-        return "Desert_Pyramid";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 3;
-    }
-    
-    @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
         return FeatureStart::new;
     }
     
-    @Override
-    protected int getRandomSalt() {
-        return 14357617;
-    }
-    
-    public static class FeatureStart extends StructureStart {
-        public FeatureStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class FeatureStart extends StructureStart<NoneFeatureConfiguration> {
+        public FeatureStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final DesertPyramidPiece cld7 = new DesertPyramidPiece(this.random, integer3 * 16, integer4 * 16);
-            this.pieces.add(cld7);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
+            final DesertPyramidPiece ctf8 = new DesertPyramidPiece(this.random, integer3 * 16, integer4 * 16);
+            this.pieces.add(ctf8);
             this.calculateBoundingBox();
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/DesertVillagePools.java b/src/net/minecraft/world/level/levelgen/feature/DesertVillagePools.java
index 1f4a748..b5d9dda 100644
--- a/src/net/minecraft/world/level/levelgen/feature/DesertVillagePools.java
+++ b/src/net/minecraft/world/level/levelgen/feature/DesertVillagePools.java
@@ -7,7 +7,7 @@ import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElemen
 import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
 import com.mojang.datafixers.util.Pair;
-import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.LegacySinglePoolElement;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
 import java.util.List;
@@ -19,6 +19,8 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
 import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
 import net.minecraft.tags.BlockTags;
 
@@ -28,17 +30,17 @@ public class DesertVillagePools {
     
     static {
         final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new TagMatchTest(BlockTags.DOORS), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.WALL_TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.SMOOTH_SANDSTONE, 0.08f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.CUT_SANDSTONE, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.TERRACOTTA, 0.08f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.SMOOTH_SANDSTONE_STAIRS, 0.08f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.SMOOTH_SANDSTONE_SLAB, 0.08f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.BEETROOTS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.MELON_STEM.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/town_centers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/town_centers/desert_meeting_point_1"), 98), new Pair(new SinglePoolElement("village/desert/town_centers/desert_meeting_point_2"), 98), new Pair(new SinglePoolElement("village/desert/town_centers/desert_meeting_point_3"), 49), new Pair(new SinglePoolElement("village/desert/zombie/town_centers/desert_meeting_point_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/zombie/town_centers/desert_meeting_point_2", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/zombie/town_centers/desert_meeting_point_3", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/streets"), new ResourceLocation("village/desert/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/streets/corner_01"), 3), new Pair(new SinglePoolElement("village/desert/streets/corner_02"), 3), new Pair(new SinglePoolElement("village/desert/streets/straight_01"), 4), new Pair(new SinglePoolElement("village/desert/streets/straight_02"), 4), new Pair(new SinglePoolElement("village/desert/streets/straight_03"), 3), new Pair(new SinglePoolElement("village/desert/streets/crossroad_01"), 3), new Pair(new SinglePoolElement("village/desert/streets/crossroad_02"), 3), new Pair(new SinglePoolElement("village/desert/streets/crossroad_03"), 3), new Pair(new SinglePoolElement("village/desert/streets/square_01"), 3), new Pair(new SinglePoolElement("village/desert/streets/square_02"), 3), new Pair(new SinglePoolElement("village/desert/streets/turn_01"), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/zombie/streets"), new ResourceLocation("village/desert/zombie/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/zombie/streets/corner_01"), 3), new Pair(new SinglePoolElement("village/desert/zombie/streets/corner_02"), 3), new Pair(new SinglePoolElement("village/desert/zombie/streets/straight_01"), 4), new Pair(new SinglePoolElement("village/desert/zombie/streets/straight_02"), 4), new Pair(new SinglePoolElement("village/desert/zombie/streets/straight_03"), 3), new Pair(new SinglePoolElement("village/desert/zombie/streets/crossroad_01"), 3), new Pair(new SinglePoolElement("village/desert/zombie/streets/crossroad_02"), 3), new Pair(new SinglePoolElement("village/desert/zombie/streets/crossroad_03"), 3), new Pair(new SinglePoolElement("village/desert/zombie/streets/square_01"), 3), new Pair(new SinglePoolElement("village/desert/zombie/streets/square_02"), 3), new Pair(new SinglePoolElement("village/desert/zombie/streets/turn_01"), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/town_centers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/town_centers/desert_meeting_point_1"), 98), new Pair(new LegacySinglePoolElement("village/desert/town_centers/desert_meeting_point_2"), 98), new Pair(new LegacySinglePoolElement("village/desert/town_centers/desert_meeting_point_3"), 49), new Pair(new LegacySinglePoolElement("village/desert/zombie/town_centers/desert_meeting_point_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/zombie/town_centers/desert_meeting_point_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/zombie/town_centers/desert_meeting_point_3", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/streets"), new ResourceLocation("village/desert/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/streets/corner_01"), 3), new Pair(new LegacySinglePoolElement("village/desert/streets/corner_02"), 3), new Pair(new LegacySinglePoolElement("village/desert/streets/straight_01"), 4), new Pair(new LegacySinglePoolElement("village/desert/streets/straight_02"), 4), new Pair(new LegacySinglePoolElement("village/desert/streets/straight_03"), 3), new Pair(new LegacySinglePoolElement("village/desert/streets/crossroad_01"), 3), new Pair(new LegacySinglePoolElement("village/desert/streets/crossroad_02"), 3), new Pair(new LegacySinglePoolElement("village/desert/streets/crossroad_03"), 3), new Pair(new LegacySinglePoolElement("village/desert/streets/square_01"), 3), new Pair(new LegacySinglePoolElement("village/desert/streets/square_02"), 3), new Pair(new LegacySinglePoolElement("village/desert/streets/turn_01"), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/zombie/streets"), new ResourceLocation("village/desert/zombie/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/corner_01"), 3), new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/corner_02"), 3), new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/straight_01"), 4), new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/straight_02"), 4), new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/straight_03"), 3), new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/crossroad_01"), 3), new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/crossroad_02"), 3), new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/crossroad_03"), 3), new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/square_01"), 3), new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/square_02"), 3), new Pair(new LegacySinglePoolElement("village/desert/zombie/streets/turn_01"), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
         final ImmutableList<StructureProcessor> immutableList2 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.BEETROOTS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.MELON_STEM.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/houses"), new ResourceLocation("village/desert/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/houses/desert_small_house_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_small_house_2"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_small_house_3"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_small_house_4"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_small_house_5"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_small_house_6"), 1), new Pair(new SinglePoolElement("village/desert/houses/desert_small_house_7"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_small_house_8"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_medium_house_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_medium_house_2"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_butcher_shop_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_tool_smith_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_fletcher_house_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_shepherd_house_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_armorer_1"), 1), new Pair(new SinglePoolElement("village/desert/houses/desert_fisher_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_tannery_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_cartographer_house_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_library_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_mason_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_weaponsmith_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_temple_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_temple_2"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_large_farm_1", immutableList2), 11), new Pair(new SinglePoolElement("village/desert/houses/desert_farm_1", immutableList2), 4), new Pair(new SinglePoolElement("village/desert/houses/desert_farm_2", immutableList2), 4), new Pair(new SinglePoolElement("village/desert/houses/desert_animal_pen_1"), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_animal_pen_2"), 2), Pair.of(EmptyPoolElement.INSTANCE, 5)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/zombie/houses"), new ResourceLocation("village/desert/zombie/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/zombie/houses/desert_small_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/zombie/houses/desert_small_house_2", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/zombie/houses/desert_small_house_3", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/zombie/houses/desert_small_house_4", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/zombie/houses/desert_small_house_5", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/zombie/houses/desert_small_house_6", immutableList1), 1), new Pair(new SinglePoolElement("village/desert/zombie/houses/desert_small_house_7", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/zombie/houses/desert_small_house_8", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/zombie/houses/desert_medium_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/zombie/houses/desert_medium_house_2", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_butcher_shop_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_tool_smith_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_fletcher_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_shepherd_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_armorer_1", immutableList1), 1), new Pair(new SinglePoolElement("village/desert/houses/desert_fisher_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_tannery_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_cartographer_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_library_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_mason_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_weaponsmith_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_temple_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_temple_2", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_large_farm_1", immutableList1), 7), new Pair(new SinglePoolElement("village/desert/houses/desert_farm_1", immutableList1), 4), new Pair(new SinglePoolElement("village/desert/houses/desert_farm_2", immutableList1), 4), new Pair(new SinglePoolElement("village/desert/houses/desert_animal_pen_1", immutableList1), 2), new Pair(new SinglePoolElement("village/desert/houses/desert_animal_pen_2", immutableList1), 2), Pair.of(EmptyPoolElement.INSTANCE, 5)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/terminators/terminator_01"), 1), new Pair(new SinglePoolElement("village/desert/terminators/terminator_02"), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/zombie/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/terminators/terminator_01"), 1), new Pair(new SinglePoolElement("village/desert/zombie/terminators/terminator_02"), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/desert_lamp_1"), 10), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.CACTUS_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 4), Pair.of(EmptyPoolElement.INSTANCE, 10)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/zombie/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/desert_lamp_1", immutableList1), 10), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.CACTUS_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 4), Pair.of(EmptyPoolElement.INSTANCE, 10)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/villagers/nitwit"), 1), new Pair(new SinglePoolElement("village/desert/villagers/baby"), 1), new Pair(new SinglePoolElement("village/desert/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/zombie/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/desert/zombie/villagers/nitwit"), 1), new Pair(new SinglePoolElement("village/desert/zombie/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/houses"), new ResourceLocation("village/desert/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/houses/desert_small_house_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_small_house_2"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_small_house_3"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_small_house_4"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_small_house_5"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_small_house_6"), 1), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_small_house_7"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_small_house_8"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_medium_house_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_medium_house_2"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_butcher_shop_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_tool_smith_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_fletcher_house_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_shepherd_house_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_armorer_1"), 1), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_fisher_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_tannery_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_cartographer_house_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_library_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_mason_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_weaponsmith_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_temple_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_temple_2"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_large_farm_1", immutableList2), 11), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_farm_1", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_farm_2", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_animal_pen_1"), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_animal_pen_2"), 2), Pair.of(EmptyPoolElement.INSTANCE, 5)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/zombie/houses"), new ResourceLocation("village/desert/zombie/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/zombie/houses/desert_small_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/zombie/houses/desert_small_house_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/zombie/houses/desert_small_house_3", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/zombie/houses/desert_small_house_4", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/zombie/houses/desert_small_house_5", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/zombie/houses/desert_small_house_6", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/desert/zombie/houses/desert_small_house_7", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/zombie/houses/desert_small_house_8", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/zombie/houses/desert_medium_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/zombie/houses/desert_medium_house_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_butcher_shop_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_tool_smith_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_fletcher_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_shepherd_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_armorer_1", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_fisher_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_tannery_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_cartographer_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_library_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_mason_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_weaponsmith_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_temple_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_temple_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_large_farm_1", immutableList1), 7), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_farm_1", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_farm_2", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_animal_pen_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/desert/houses/desert_animal_pen_2", immutableList1), 2), Pair.of(EmptyPoolElement.INSTANCE, 5)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/terminators/terminator_01"), 1), new Pair(new LegacySinglePoolElement("village/desert/terminators/terminator_02"), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/zombie/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/terminators/terminator_01"), 1), new Pair(new LegacySinglePoolElement("village/desert/zombie/terminators/terminator_02"), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/desert_lamp_1"), 10), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.CACTUS_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 4), Pair.of(EmptyPoolElement.INSTANCE, 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/zombie/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/desert_lamp_1", immutableList1), 10), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.CACTUS_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 4), Pair.of(EmptyPoolElement.INSTANCE, 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/villagers/nitwit"), 1), new Pair(new LegacySinglePoolElement("village/desert/villagers/baby"), 1), new Pair(new LegacySinglePoolElement("village/desert/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/desert/zombie/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/desert/zombie/villagers/nitwit"), 1), new Pair(new LegacySinglePoolElement("village/desert/zombie/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/DesertWellFeature.java b/src/net/minecraft/world/level/levelgen/feature/DesertWellFeature.java
index 1e6fe0f..d01ca32 100644
--- a/src/net/minecraft/world/level/levelgen/feature/DesertWellFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/DesertWellFeature.java
@@ -5,12 +5,11 @@ import java.util.Iterator;
 import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Blocks;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.predicate.BlockStatePredicate;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
@@ -21,63 +20,63 @@ public class DesertWellFeature extends Feature<NoneFeatureConfiguration> {
     private final BlockState sandstone;
     private final BlockState water;
     
-    public DesertWellFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public DesertWellFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
         this.sandSlab = Blocks.SANDSTONE_SLAB.defaultBlockState();
         this.sandstone = Blocks.SANDSTONE.defaultBlockState();
         this.water = Blocks.WATER.defaultBlockState();
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, BlockPos fk, final NoneFeatureConfiguration cgv) {
-        for (fk = fk.above(); bjx.isEmptyBlock(fk) && fk.getY() > 2; fk = fk.below()) {}
-        if (!DesertWellFeature.IS_SAND.test(bjx.getBlockState(fk))) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, BlockPos fu, final NoneFeatureConfiguration coa) {
+        for (fu = fu.above(); bqu.isEmptyBlock(fu) && fu.getY() > 2; fu = fu.below()) {}
+        if (!DesertWellFeature.IS_SAND.test(bqu.getBlockState(fu))) {
             return false;
         }
-        for (int integer7 = -2; integer7 <= 2; ++integer7) {
-            for (int integer8 = -2; integer8 <= 2; ++integer8) {
-                if (bjx.isEmptyBlock(fk.offset(integer7, -1, integer8)) && bjx.isEmptyBlock(fk.offset(integer7, -2, integer8))) {
+        for (int integer8 = -2; integer8 <= 2; ++integer8) {
+            for (int integer9 = -2; integer9 <= 2; ++integer9) {
+                if (bqu.isEmptyBlock(fu.offset(integer8, -1, integer9)) && bqu.isEmptyBlock(fu.offset(integer8, -2, integer9))) {
                     return false;
                 }
             }
         }
-        for (int integer7 = -1; integer7 <= 0; ++integer7) {
-            for (int integer8 = -2; integer8 <= 2; ++integer8) {
-                for (int integer9 = -2; integer9 <= 2; ++integer9) {
-                    bjx.setBlock(fk.offset(integer8, integer7, integer9), this.sandstone, 2);
+        for (int integer8 = -1; integer8 <= 0; ++integer8) {
+            for (int integer9 = -2; integer9 <= 2; ++integer9) {
+                for (int integer10 = -2; integer10 <= 2; ++integer10) {
+                    bqu.setBlock(fu.offset(integer9, integer8, integer10), this.sandstone, 2);
                 }
             }
         }
-        bjx.setBlock(fk, this.water, 2);
-        for (final Direction fp8 : Direction.Plane.HORIZONTAL) {
-            bjx.setBlock(fk.relative(fp8), this.water, 2);
+        bqu.setBlock(fu, this.water, 2);
+        for (final Direction fz9 : Direction.Plane.HORIZONTAL) {
+            bqu.setBlock(fu.relative(fz9), this.water, 2);
         }
-        for (int integer7 = -2; integer7 <= 2; ++integer7) {
-            for (int integer8 = -2; integer8 <= 2; ++integer8) {
-                if (integer7 == -2 || integer7 == 2 || integer8 == -2 || integer8 == 2) {
-                    bjx.setBlock(fk.offset(integer7, 1, integer8), this.sandstone, 2);
+        for (int integer8 = -2; integer8 <= 2; ++integer8) {
+            for (int integer9 = -2; integer9 <= 2; ++integer9) {
+                if (integer8 == -2 || integer8 == 2 || integer9 == -2 || integer9 == 2) {
+                    bqu.setBlock(fu.offset(integer8, 1, integer9), this.sandstone, 2);
                 }
             }
         }
-        bjx.setBlock(fk.offset(2, 1, 0), this.sandSlab, 2);
-        bjx.setBlock(fk.offset(-2, 1, 0), this.sandSlab, 2);
-        bjx.setBlock(fk.offset(0, 1, 2), this.sandSlab, 2);
-        bjx.setBlock(fk.offset(0, 1, -2), this.sandSlab, 2);
-        for (int integer7 = -1; integer7 <= 1; ++integer7) {
-            for (int integer8 = -1; integer8 <= 1; ++integer8) {
-                if (integer7 == 0 && integer8 == 0) {
-                    bjx.setBlock(fk.offset(integer7, 4, integer8), this.sandstone, 2);
+        bqu.setBlock(fu.offset(2, 1, 0), this.sandSlab, 2);
+        bqu.setBlock(fu.offset(-2, 1, 0), this.sandSlab, 2);
+        bqu.setBlock(fu.offset(0, 1, 2), this.sandSlab, 2);
+        bqu.setBlock(fu.offset(0, 1, -2), this.sandSlab, 2);
+        for (int integer8 = -1; integer8 <= 1; ++integer8) {
+            for (int integer9 = -1; integer9 <= 1; ++integer9) {
+                if (integer8 == 0 && integer9 == 0) {
+                    bqu.setBlock(fu.offset(integer8, 4, integer9), this.sandstone, 2);
                 }
                 else {
-                    bjx.setBlock(fk.offset(integer7, 4, integer8), this.sandSlab, 2);
+                    bqu.setBlock(fu.offset(integer8, 4, integer9), this.sandSlab, 2);
                 }
             }
         }
-        for (int integer7 = 1; integer7 <= 3; ++integer7) {
-            bjx.setBlock(fk.offset(-1, integer7, -1), this.sandstone, 2);
-            bjx.setBlock(fk.offset(-1, integer7, 1), this.sandstone, 2);
-            bjx.setBlock(fk.offset(1, integer7, -1), this.sandstone, 2);
-            bjx.setBlock(fk.offset(1, integer7, 1), this.sandstone, 2);
+        for (int integer8 = 1; integer8 <= 3; ++integer8) {
+            bqu.setBlock(fu.offset(-1, integer8, -1), this.sandstone, 2);
+            bqu.setBlock(fu.offset(-1, integer8, 1), this.sandstone, 2);
+            bqu.setBlock(fu.offset(1, integer8, -1), this.sandstone, 2);
+            bqu.setBlock(fu.offset(1, integer8, 1), this.sandstone, 2);
         }
         return true;
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/DiskReplaceFeature.java b/src/net/minecraft/world/level/levelgen/feature/DiskReplaceFeature.java
index 3ca0f1b..f3bae99 100644
--- a/src/net/minecraft/world/level/levelgen/feature/DiskReplaceFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/DiskReplaceFeature.java
@@ -3,39 +3,40 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import java.util.Iterator;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DiskConfiguration;
 
 public class DiskReplaceFeature extends Feature<DiskConfiguration> {
-    public DiskReplaceFeature(final Function<Dynamic<?>, ? extends DiskConfiguration> function) {
-        super(function);
+    public DiskReplaceFeature(final Codec<DiskConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final DiskConfiguration cgl) {
-        if (!bjx.getFluidState(fk).is(FluidTags.WATER)) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final DiskConfiguration cnp) {
+        if (!bqu.getFluidState(fu).is(FluidTags.WATER)) {
             return false;
         }
-        int integer7 = 0;
-        for (int integer8 = random.nextInt(cgl.radius - 2) + 2, integer9 = fk.getX() - integer8; integer9 <= fk.getX() + integer8; ++integer9) {
-            for (int integer10 = fk.getZ() - integer8; integer10 <= fk.getZ() + integer8; ++integer10) {
-                final int integer11 = integer9 - fk.getX();
-                final int integer12 = integer10 - fk.getZ();
-                if (integer11 * integer11 + integer12 * integer12 <= integer8 * integer8) {
-                    for (int integer13 = fk.getY() - cgl.ySize; integer13 <= fk.getY() + cgl.ySize; ++integer13) {
-                        final BlockPos fk2 = new BlockPos(integer9, integer13, integer10);
-                        final BlockState byj15 = bjx.getBlockState(fk2);
-                        for (final BlockState byj16 : cgl.targets) {
-                            if (byj16.getBlock() == byj15.getBlock()) {
-                                bjx.setBlock(fk2, cgl.state, 2);
-                                ++integer7;
+        int integer8 = 0;
+        for (int integer9 = random.nextInt(cnp.radius - 2) + 2, integer10 = fu.getX() - integer9; integer10 <= fu.getX() + integer9; ++integer10) {
+            for (int integer11 = fu.getZ() - integer9; integer11 <= fu.getZ() + integer9; ++integer11) {
+                final int integer12 = integer10 - fu.getX();
+                final int integer13 = integer11 - fu.getZ();
+                if (integer12 * integer12 + integer13 * integer13 <= integer9 * integer9) {
+                    for (int integer14 = fu.getY() - cnp.ySize; integer14 <= fu.getY() + cnp.ySize; ++integer14) {
+                        final BlockPos fu2 = new BlockPos(integer10, integer14, integer11);
+                        final BlockState cfj16 = bqu.getBlockState(fu2);
+                        for (final BlockState cfj17 : cnp.targets) {
+                            if (cfj17.is(cfj16.getBlock())) {
+                                bqu.setBlock(fu2, cnp.state, 2);
+                                ++integer8;
                                 break;
                             }
                         }
@@ -43,6 +44,6 @@ public class DiskReplaceFeature extends Feature<DiskConfiguration> {
                 }
             }
         }
-        return integer7 > 0;
+        return integer8 > 0;
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/EndCityFeature.java b/src/net/minecraft/world/level/levelgen/feature/EndCityFeature.java
index 9107da0..7635a95 100644
--- a/src/net/minecraft/world/level/levelgen/feature/EndCityFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/EndCityFeature.java
@@ -1,113 +1,80 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.levelgen.structure.EndCityPieces;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.block.Rotation;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeManager;
-import net.minecraft.world.level.levelgen.WorldgenRandom;
-import net.minecraft.world.level.ChunkPos;
 import java.util.Random;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.biome.BiomeSource;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class EndCityFeature extends StructureFeature<NoneFeatureConfiguration> {
-    public EndCityFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public EndCityFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    protected ChunkPos getPotentialFeatureChunkFromLocationWithOffset(final ChunkGenerator<?> caa, final Random random, final int integer3, final int integer4, final int integer5, final int integer6) {
-        final int integer7 = ((ChunkGeneratorSettings)caa.getSettings()).getEndCitySpacing();
-        final int integer8 = ((ChunkGeneratorSettings)caa.getSettings()).getEndCitySeparation();
-        final int integer9 = integer3 + integer7 * integer5;
-        final int integer10 = integer4 + integer7 * integer6;
-        final int integer11 = (integer9 < 0) ? (integer9 - integer7 + 1) : integer9;
-        final int integer12 = (integer10 < 0) ? (integer10 - integer7 + 1) : integer10;
-        int integer13 = integer11 / integer7;
-        int integer14 = integer12 / integer7;
-        ((WorldgenRandom)random).setLargeFeatureWithSalt(caa.getSeed(), integer13, integer14, 10387313);
-        integer13 *= integer7;
-        integer14 *= integer7;
-        integer13 += (random.nextInt(integer7 - integer8) + random.nextInt(integer7 - integer8)) / 2;
-        integer14 += (random.nextInt(integer7 - integer8) + random.nextInt(integer7 - integer8)) / 2;
-        return new ChunkPos(integer13, integer14);
+    protected boolean linearSeparation() {
+        return false;
     }
     
     @Override
-    public boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt) {
-        final ChunkPos bjh8 = this.getPotentialFeatureChunkFromLocationWithOffset(caa, random, integer4, integer5, 0, 0);
-        if (integer4 != bjh8.x || integer5 != bjh8.z) {
-            return false;
-        }
-        if (!caa.isBiomeValidStartForStructure(bkt, this)) {
-            return false;
-        }
-        final int integer6 = getYPositionForFeature(integer4, integer5, caa);
-        return integer6 >= 60;
+    protected boolean isFeatureChunk(final ChunkGenerator cha, final BiomeSource brh, final long long3, final WorldgenRandom ciy, final int integer5, final int integer6, final Biome bre, final ChunkPos bph, final NoneFeatureConfiguration coa) {
+        return getYPositionForFeature(integer5, integer6, cha) >= 60;
     }
     
     @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
         return EndCityStart::new;
     }
     
-    @Override
-    public String getFeatureName() {
-        return "EndCity";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 8;
-    }
-    
-    private static int getYPositionForFeature(final int integer1, final int integer2, final ChunkGenerator<?> caa) {
+    private static int getYPositionForFeature(final int integer1, final int integer2, final ChunkGenerator cha) {
         final Random random4 = new Random(integer1 + integer2 * 10387313);
-        final Rotation btu5 = Rotation.values()[random4.nextInt(Rotation.values().length)];
+        final Rotation cap5 = Rotation.getRandom(random4);
         int integer3 = 5;
         int integer4 = 5;
-        if (btu5 == Rotation.CLOCKWISE_90) {
+        if (cap5 == Rotation.CLOCKWISE_90) {
             integer3 = -5;
         }
-        else if (btu5 == Rotation.CLOCKWISE_180) {
+        else if (cap5 == Rotation.CLOCKWISE_180) {
             integer3 = -5;
             integer4 = -5;
         }
-        else if (btu5 == Rotation.COUNTERCLOCKWISE_90) {
+        else if (cap5 == Rotation.COUNTERCLOCKWISE_90) {
             integer4 = -5;
         }
         final int integer5 = (integer1 << 4) + 7;
         final int integer6 = (integer2 << 4) + 7;
-        final int integer7 = caa.getFirstOccupiedHeight(integer5, integer6, Heightmap.Types.WORLD_SURFACE_WG);
-        final int integer8 = caa.getFirstOccupiedHeight(integer5, integer6 + integer4, Heightmap.Types.WORLD_SURFACE_WG);
-        final int integer9 = caa.getFirstOccupiedHeight(integer5 + integer3, integer6, Heightmap.Types.WORLD_SURFACE_WG);
-        final int integer10 = caa.getFirstOccupiedHeight(integer5 + integer3, integer6 + integer4, Heightmap.Types.WORLD_SURFACE_WG);
+        final int integer7 = cha.getFirstOccupiedHeight(integer5, integer6, Heightmap.Types.WORLD_SURFACE_WG);
+        final int integer8 = cha.getFirstOccupiedHeight(integer5, integer6 + integer4, Heightmap.Types.WORLD_SURFACE_WG);
+        final int integer9 = cha.getFirstOccupiedHeight(integer5 + integer3, integer6, Heightmap.Types.WORLD_SURFACE_WG);
+        final int integer10 = cha.getFirstOccupiedHeight(integer5 + integer3, integer6 + integer4, Heightmap.Types.WORLD_SURFACE_WG);
         return Math.min(Math.min(integer7, integer8), Math.min(integer9, integer10));
     }
     
-    public static class EndCityStart extends StructureStart {
-        public EndCityStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class EndCityStart extends StructureStart<NoneFeatureConfiguration> {
+        public EndCityStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final Rotation btu7 = Rotation.values()[this.random.nextInt(Rotation.values().length)];
-            final int integer5 = getYPositionForFeature(integer3, integer4, caa);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
+            final Rotation cap8 = Rotation.getRandom(this.random);
+            final int integer5 = getYPositionForFeature(integer3, integer4, cha);
             if (integer5 < 60) {
                 return;
             }
-            final BlockPos fk9 = new BlockPos(integer3 * 16 + 8, integer5, integer4 * 16 + 8);
-            EndCityPieces.startHouseTower(cmo, fk9, btu7, this.pieces, this.random);
+            final BlockPos fu10 = new BlockPos(integer3 * 16 + 8, integer5, integer4 * 16 + 8);
+            EndCityPieces.startHouseTower(cva, fu10, cap8, this.pieces, this.random);
             this.calculateBoundingBox();
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/EndGatewayFeature.java b/src/net/minecraft/world/level/levelgen/feature/EndGatewayFeature.java
index abb0a2b..816c594 100644
--- a/src/net/minecraft/world/level/levelgen/feature/EndGatewayFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/EndGatewayFeature.java
@@ -8,51 +8,50 @@ import net.minecraft.world.level.LevelWriter;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.EndGatewayConfiguration;
 
 public class EndGatewayFeature extends Feature<EndGatewayConfiguration> {
-    public EndGatewayFeature(final Function<Dynamic<?>, ? extends EndGatewayConfiguration> function) {
-        super(function);
+    public EndGatewayFeature(final Codec<EndGatewayConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final EndGatewayConfiguration cgm) {
-        for (final BlockPos fk5 : BlockPos.betweenClosed(fk.offset(-1, -2, -1), fk.offset(1, 2, 1))) {
-            final boolean boolean9 = fk5.getX() == fk.getX();
-            final boolean boolean10 = fk5.getY() == fk.getY();
-            final boolean boolean11 = fk5.getZ() == fk.getZ();
-            final boolean boolean12 = Math.abs(fk5.getY() - fk.getY()) == 2;
-            if (boolean9 && boolean10 && boolean11) {
-                final BlockPos fk6 = fk5.immutable();
-                this.setBlock(bjx, fk6, Blocks.END_GATEWAY.defaultBlockState());
-                final BlockEntity bwl5;
-                TheEndGatewayBlockEntity bxm6;
-                cgm.getExit().ifPresent(fk4 -> {
-                    bwl5 = bjx.getBlockEntity(fk6);
-                    if (bwl5 instanceof TheEndGatewayBlockEntity) {
-                        bxm6 = (TheEndGatewayBlockEntity)bwl5;
-                        bxm6.setExitPosition(fk4, cgm.isExitExact());
-                        bwl5.setChanged();
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final EndGatewayConfiguration cnq) {
+        for (final BlockPos fu5 : BlockPos.betweenClosed(fu.offset(-1, -2, -1), fu.offset(1, 2, 1))) {
+            final boolean boolean10 = fu5.getX() == fu.getX();
+            final boolean boolean11 = fu5.getY() == fu.getY();
+            final boolean boolean12 = fu5.getZ() == fu.getZ();
+            final boolean boolean13 = Math.abs(fu5.getY() - fu.getY()) == 2;
+            if (boolean10 && boolean11 && boolean12) {
+                final BlockPos fu6 = fu5.immutable();
+                this.setBlock(bqu, fu6, Blocks.END_GATEWAY.defaultBlockState());
+                final BlockEntity cdl5;
+                TheEndGatewayBlockEntity cem6;
+                cnq.getExit().ifPresent(fu4 -> {
+                    cdl5 = bqu.getBlockEntity(fu6);
+                    if (cdl5 instanceof TheEndGatewayBlockEntity) {
+                        cem6 = (TheEndGatewayBlockEntity)cdl5;
+                        cem6.setExitPosition(fu4, cnq.isExitExact());
+                        cdl5.setChanged();
                     }
                     return;
                 });
             }
-            else if (boolean10) {
-                this.setBlock(bjx, fk5, Blocks.AIR.defaultBlockState());
+            else if (boolean11) {
+                this.setBlock(bqu, fu5, Blocks.AIR.defaultBlockState());
             }
-            else if (boolean12 && boolean9 && boolean11) {
-                this.setBlock(bjx, fk5, Blocks.BEDROCK.defaultBlockState());
+            else if (boolean13 && boolean10 && boolean12) {
+                this.setBlock(bqu, fu5, Blocks.BEDROCK.defaultBlockState());
             }
-            else if ((!boolean9 && !boolean11) || boolean12) {
-                this.setBlock(bjx, fk5, Blocks.AIR.defaultBlockState());
+            else if ((!boolean10 && !boolean12) || boolean13) {
+                this.setBlock(bqu, fu5, Blocks.AIR.defaultBlockState());
             }
             else {
-                this.setBlock(bjx, fk5, Blocks.BEDROCK.defaultBlockState());
+                this.setBlock(bqu, fu5, Blocks.BEDROCK.defaultBlockState());
             }
         }
         return true;
diff --git a/src/net/minecraft/world/level/levelgen/feature/EndIslandFeature.java b/src/net/minecraft/world/level/levelgen/feature/EndIslandFeature.java
index de59541..051e72e 100644
--- a/src/net/minecraft/world/level/levelgen/feature/EndIslandFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/EndIslandFeature.java
@@ -6,26 +6,25 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.util.Mth;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class EndIslandFeature extends Feature<NoneFeatureConfiguration> {
-    public EndIslandFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public EndIslandFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        float float7 = (float)(random.nextInt(3) + 4);
-        for (int integer8 = 0; float7 > 0.5f; float7 -= (float)(random.nextInt(2) + 0.5), --integer8) {
-            for (int integer9 = Mth.floor(-float7); integer9 <= Mth.ceil(float7); ++integer9) {
-                for (int integer10 = Mth.floor(-float7); integer10 <= Mth.ceil(float7); ++integer10) {
-                    if (integer9 * integer9 + integer10 * integer10 <= (float7 + 1.0f) * (float7 + 1.0f)) {
-                        this.setBlock(bjx, fk.offset(integer9, integer8, integer10), Blocks.END_STONE.defaultBlockState());
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        float float8 = (float)(random.nextInt(3) + 4);
+        for (int integer9 = 0; float8 > 0.5f; float8 -= (float)(random.nextInt(2) + 0.5), --integer9) {
+            for (int integer10 = Mth.floor(-float8); integer10 <= Mth.ceil(float8); ++integer10) {
+                for (int integer11 = Mth.floor(-float8); integer11 <= Mth.ceil(float8); ++integer11) {
+                    if (integer10 * integer10 + integer11 * integer11 <= (float8 + 1.0f) * (float8 + 1.0f)) {
+                        this.setBlock(bqu, fu.offset(integer10, integer9, integer11), Blocks.END_STONE.defaultBlockState());
                     }
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.java b/src/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.java
index 391d63e..61b1fcc 100644
--- a/src/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import java.util.Iterator;
 import net.minecraft.world.level.block.state.properties.Property;
@@ -11,10 +11,9 @@ import net.minecraft.world.level.LevelWriter;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.Vec3i;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
@@ -23,46 +22,46 @@ public class EndPodiumFeature extends Feature<NoneFeatureConfiguration> {
     private final boolean active;
     
     public EndPodiumFeature(final boolean boolean1) {
-        super(NoneFeatureConfiguration::deserialize);
+        super(NoneFeatureConfiguration.CODEC);
         this.active = boolean1;
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        for (final BlockPos fk2 : BlockPos.betweenClosed(new BlockPos(fk.getX() - 4, fk.getY() - 1, fk.getZ() - 4), new BlockPos(fk.getX() + 4, fk.getY() + 32, fk.getZ() + 4))) {
-            final boolean boolean9 = fk2.closerThan(fk, 2.5);
-            if (boolean9 || fk2.closerThan(fk, 3.5)) {
-                if (fk2.getY() < fk.getY()) {
-                    if (boolean9) {
-                        this.setBlock(bjx, fk2, Blocks.BEDROCK.defaultBlockState());
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        for (final BlockPos fu2 : BlockPos.betweenClosed(new BlockPos(fu.getX() - 4, fu.getY() - 1, fu.getZ() - 4), new BlockPos(fu.getX() + 4, fu.getY() + 32, fu.getZ() + 4))) {
+            final boolean boolean10 = fu2.closerThan(fu, 2.5);
+            if (boolean10 || fu2.closerThan(fu, 3.5)) {
+                if (fu2.getY() < fu.getY()) {
+                    if (boolean10) {
+                        this.setBlock(bqu, fu2, Blocks.BEDROCK.defaultBlockState());
                     }
                     else {
-                        if (fk2.getY() >= fk.getY()) {
+                        if (fu2.getY() >= fu.getY()) {
                             continue;
                         }
-                        this.setBlock(bjx, fk2, Blocks.END_STONE.defaultBlockState());
+                        this.setBlock(bqu, fu2, Blocks.END_STONE.defaultBlockState());
                     }
                 }
-                else if (fk2.getY() > fk.getY()) {
-                    this.setBlock(bjx, fk2, Blocks.AIR.defaultBlockState());
+                else if (fu2.getY() > fu.getY()) {
+                    this.setBlock(bqu, fu2, Blocks.AIR.defaultBlockState());
                 }
-                else if (!boolean9) {
-                    this.setBlock(bjx, fk2, Blocks.BEDROCK.defaultBlockState());
+                else if (!boolean10) {
+                    this.setBlock(bqu, fu2, Blocks.BEDROCK.defaultBlockState());
                 }
                 else if (this.active) {
-                    this.setBlock(bjx, new BlockPos(fk2), Blocks.END_PORTAL.defaultBlockState());
+                    this.setBlock(bqu, new BlockPos(fu2), Blocks.END_PORTAL.defaultBlockState());
                 }
                 else {
-                    this.setBlock(bjx, new BlockPos(fk2), Blocks.AIR.defaultBlockState());
+                    this.setBlock(bqu, new BlockPos(fu2), Blocks.AIR.defaultBlockState());
                 }
             }
         }
-        for (int integer7 = 0; integer7 < 4; ++integer7) {
-            this.setBlock(bjx, fk.above(integer7), Blocks.BEDROCK.defaultBlockState());
+        for (int integer8 = 0; integer8 < 4; ++integer8) {
+            this.setBlock(bqu, fu.above(integer8), Blocks.BEDROCK.defaultBlockState());
         }
-        final BlockPos fk3 = fk.above(2);
-        for (final Direction fp9 : Direction.Plane.HORIZONTAL) {
-            this.setBlock(bjx, fk3.relative(fp9), ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, fp9));
+        final BlockPos fu3 = fu.above(2);
+        for (final Direction fz10 : Direction.Plane.HORIZONTAL) {
+            this.setBlock(bqu, fu3.relative(fz10), ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, fz10));
         }
         return true;
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/FancyTreeFeature.java b/src/net/minecraft/world/level/levelgen/feature/FancyTreeFeature.java
deleted file mode 100644
index cbbffc4..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/FancyTreeFeature.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package net.minecraft.world.level.levelgen.feature;
-
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import com.google.common.collect.Lists;
-import java.util.Iterator;
-import java.util.List;
-import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.LevelWriter;
-import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.block.LogBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import java.util.Objects;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.Set;
-import net.minecraft.core.BlockPos;
-import java.util.Random;
-import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
-
-public class FancyTreeFeature extends AbstractTreeFeature<SmallTreeConfiguration> {
-    public FancyTreeFeature(final Function<Dynamic<?>, ? extends SmallTreeConfiguration> function) {
-        super(function);
-    }
-    
-    private void crossSection(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final float float4, final Set<BlockPos> set, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        for (int integer9 = (int)(float4 + 0.618), integer10 = -integer9; integer10 <= integer9; ++integer10) {
-            for (int integer11 = -integer9; integer11 <= integer9; ++integer11) {
-                if (Math.pow(Math.abs(integer10) + 0.5, 2.0) + Math.pow(Math.abs(integer11) + 0.5, 2.0) <= float4 * float4) {
-                    this.placeLeaf(bkb, random, fk.offset(integer10, 0, integer11), set, clb, chi);
-                }
-            }
-        }
-    }
-    
-    private float treeShape(final int integer1, final int integer2) {
-        if (integer2 < integer1 * 0.3f) {
-            return -1.0f;
-        }
-        final float float4 = integer1 / 2.0f;
-        final float float5 = float4 - integer2;
-        float float6 = Mth.sqrt(float4 * float4 - float5 * float5);
-        if (float5 == 0.0f) {
-            float6 = float4;
-        }
-        else if (Math.abs(float5) >= float4) {
-            return 0.0f;
-        }
-        return float6 * 0.5f;
-    }
-    
-    private float foliageShape(final int integer) {
-        if (integer < 0 || integer >= 5) {
-            return -1.0f;
-        }
-        if (integer == 0 || integer == 4) {
-            return 2.0f;
-        }
-        return 3.0f;
-    }
-    
-    private void foliageCluster(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final Set<BlockPos> set, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        for (int integer8 = 0; integer8 < 5; ++integer8) {
-            this.crossSection(bkb, random, fk.above(integer8), this.foliageShape(integer8), set, clb, chi);
-        }
-    }
-    
-    private int makeLimb(final LevelSimulatedRW bkb, final Random random, final BlockPos fk3, final BlockPos fk4, final boolean boolean5, final Set<BlockPos> set, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        if (!boolean5 && Objects.equals(fk3, fk4)) {
-            return -1;
-        }
-        final BlockPos fk5 = fk4.offset(-fk3.getX(), -fk3.getY(), -fk3.getZ());
-        final int integer11 = this.getSteps(fk5);
-        final float float12 = fk5.getX() / (float)integer11;
-        final float float13 = fk5.getY() / (float)integer11;
-        final float float14 = fk5.getZ() / (float)integer11;
-        for (int integer12 = 0; integer12 <= integer11; ++integer12) {
-            final BlockPos fk6 = fk3.offset(0.5f + integer12 * float12, 0.5f + integer12 * float13, 0.5f + integer12 * float14);
-            if (boolean5) {
-                this.setBlock(bkb, fk6, ((AbstractStateHolder<O, BlockState>)chi.trunkProvider.getState(random, fk6)).<Direction.Axis, Direction.Axis>setValue(LogBlock.AXIS, this.getLogAxis(fk3, fk6)), clb);
-                set.add(fk6);
-            }
-            else if (!AbstractTreeFeature.isFree(bkb, fk6)) {
-                return integer12;
-            }
-        }
-        return -1;
-    }
-    
-    private int getSteps(final BlockPos fk) {
-        final int integer3 = Mth.abs(fk.getX());
-        final int integer4 = Mth.abs(fk.getY());
-        final int integer5 = Mth.abs(fk.getZ());
-        if (integer5 > integer3 && integer5 > integer4) {
-            return integer5;
-        }
-        if (integer4 > integer3) {
-            return integer4;
-        }
-        return integer3;
-    }
-    
-    private Direction.Axis getLogAxis(final BlockPos fk1, final BlockPos fk2) {
-        Direction.Axis a4 = Direction.Axis.Y;
-        final int integer5 = Math.abs(fk2.getX() - fk1.getX());
-        final int integer6 = Math.abs(fk2.getZ() - fk1.getZ());
-        final int integer7 = Math.max(integer5, integer6);
-        if (integer7 > 0) {
-            if (integer5 == integer7) {
-                a4 = Direction.Axis.X;
-            }
-            else if (integer6 == integer7) {
-                a4 = Direction.Axis.Z;
-            }
-        }
-        return a4;
-    }
-    
-    private void makeFoliage(final LevelSimulatedRW bkb, final Random random, final int integer, final BlockPos fk, final List<FoliageCoords> list, final Set<BlockPos> set, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        for (final FoliageCoords a11 : list) {
-            if (this.trimBranches(integer, a11.getBranchBase() - fk.getY())) {
-                this.foliageCluster(bkb, random, a11, set, clb, chi);
-            }
-        }
-    }
-    
-    private boolean trimBranches(final int integer1, final int integer2) {
-        return integer2 >= integer1 * 0.2;
-    }
-    
-    private void makeTrunk(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final int integer, final Set<BlockPos> set, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        this.makeLimb(bkb, random, fk, fk.above(integer), true, set, clb, chi);
-    }
-    
-    private void makeBranches(final LevelSimulatedRW bkb, final Random random, final int integer, final BlockPos fk, final List<FoliageCoords> list, final Set<BlockPos> set, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        for (final FoliageCoords a11 : list) {
-            final int integer2 = a11.getBranchBase();
-            final BlockPos fk2 = new BlockPos(fk.getX(), integer2, fk.getZ());
-            if (!fk2.equals(a11) && this.trimBranches(integer, integer2 - fk.getY())) {
-                this.makeLimb(bkb, random, fk2, a11, true, set, clb, chi);
-            }
-        }
-    }
-    
-    public boolean doPlace(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final Set<BlockPos> set4, final Set<BlockPos> set5, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        final Random random2 = new Random(random.nextLong());
-        final int integer10 = this.checkLocation(bkb, random, fk, 5 + random2.nextInt(12), set4, clb, chi);
-        if (integer10 == -1) {
-            return false;
-        }
-        this.setDirtAt(bkb, fk.below());
-        int integer11 = (int)(integer10 * 0.618);
-        if (integer11 >= integer10) {
-            integer11 = integer10 - 1;
-        }
-        final double double12 = 1.0;
-        int integer12 = (int)(1.382 + Math.pow(1.0 * integer10 / 13.0, 2.0));
-        if (integer12 < 1) {
-            integer12 = 1;
-        }
-        final int integer13 = fk.getY() + integer11;
-        int integer14 = integer10 - 5;
-        final List<FoliageCoords> list17 = Lists.newArrayList();
-        list17.add(new FoliageCoords(fk.above(integer14), integer13));
-        while (integer14 >= 0) {
-            final float float18 = this.treeShape(integer10, integer14);
-            if (float18 >= 0.0f) {
-                for (int integer15 = 0; integer15 < integer12; ++integer15) {
-                    final double double13 = 1.0;
-                    final double double14 = 1.0 * float18 * (random2.nextFloat() + 0.328);
-                    final double double15 = random2.nextFloat() * 2.0f * 3.141592653589793;
-                    final double double16 = double14 * Math.sin(double15) + 0.5;
-                    final double double17 = double14 * Math.cos(double15) + 0.5;
-                    final BlockPos fk2 = fk.offset(double16, integer14 - 1, double17);
-                    final BlockPos fk3 = fk2.above(5);
-                    if (this.makeLimb(bkb, random, fk2, fk3, false, set4, clb, chi) == -1) {
-                        final int integer16 = fk.getX() - fk2.getX();
-                        final int integer17 = fk.getZ() - fk2.getZ();
-                        final double double18 = fk2.getY() - Math.sqrt(integer16 * integer16 + integer17 * integer17) * 0.381;
-                        final int integer18 = (double18 > integer13) ? integer13 : ((int)double18);
-                        final BlockPos fk4 = new BlockPos(fk.getX(), integer18, fk.getZ());
-                        if (this.makeLimb(bkb, random, fk4, fk2, false, set4, clb, chi) == -1) {
-                            list17.add(new FoliageCoords(fk2, fk4.getY()));
-                        }
-                    }
-                }
-            }
-            --integer14;
-        }
-        this.makeFoliage(bkb, random, integer10, fk, list17, set5, clb, chi);
-        this.makeTrunk(bkb, random, fk, integer11, set4, clb, chi);
-        this.makeBranches(bkb, random, integer10, fk, list17, set4, clb, chi);
-        return true;
-    }
-    
-    private int checkLocation(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final int integer, final Set<BlockPos> set, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        if (!AbstractTreeFeature.isGrassOrDirtOrFarmland(bkb, fk.below())) {
-            return -1;
-        }
-        final int integer2 = this.makeLimb(bkb, random, fk, fk.above(integer - 1), false, set, clb, chi);
-        if (integer2 == -1) {
-            return integer;
-        }
-        if (integer2 < 6) {
-            return -1;
-        }
-        return integer2;
-    }
-    
-    static class FoliageCoords extends BlockPos {
-        private final int branchBase;
-        
-        public FoliageCoords(final BlockPos fk, final int integer) {
-            super(fk.getX(), fk.getY(), fk.getZ());
-            this.branchBase = integer;
-        }
-        
-        public int getBranchBase() {
-            return this.branchBase;
-        }
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/Feature.java b/src/net/minecraft/world/level/levelgen/feature/Feature.java
index 8ef1d6c..4ecd192 100644
--- a/src/net/minecraft/world/level/levelgen/feature/Feature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/Feature.java
@@ -1,32 +1,27 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import com.google.common.collect.ImmutableList;
-import net.minecraft.Util;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import java.util.Locale;
-import com.google.common.collect.HashBiMap;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.LevelSimulatedReader;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.Block;
-import java.util.Collections;
-import net.minecraft.world.level.biome.Biome;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelWriter;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import java.util.List;
-import com.google.common.collect.BiMap;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomRandomFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.DeltaFeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ColumnFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.CountFeatureConfiguration;
@@ -43,41 +38,13 @@ import net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockCon
 import net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 
 public abstract class Feature<FC extends FeatureConfiguration> {
-    public static final StructureFeature<NoneFeatureConfiguration> PILLAGER_OUTPOST;
-    public static final StructureFeature<MineshaftConfiguration> MINESHAFT;
-    public static final StructureFeature<NoneFeatureConfiguration> WOODLAND_MANSION;
-    public static final StructureFeature<NoneFeatureConfiguration> JUNGLE_TEMPLE;
-    public static final StructureFeature<NoneFeatureConfiguration> DESERT_PYRAMID;
-    public static final StructureFeature<NoneFeatureConfiguration> IGLOO;
-    public static final StructureFeature<ShipwreckConfiguration> SHIPWRECK;
-    public static final SwamplandHutFeature SWAMP_HUT;
-    public static final StructureFeature<NoneFeatureConfiguration> STRONGHOLD;
-    public static final StructureFeature<NoneFeatureConfiguration> OCEAN_MONUMENT;
-    public static final StructureFeature<OceanRuinConfiguration> OCEAN_RUIN;
-    public static final StructureFeature<NoneFeatureConfiguration> NETHER_BRIDGE;
-    public static final StructureFeature<NoneFeatureConfiguration> END_CITY;
-    public static final StructureFeature<BuriedTreasureConfiguration> BURIED_TREASURE;
-    public static final StructureFeature<VillageConfiguration> VILLAGE;
     public static final Feature<NoneFeatureConfiguration> NO_OP;
-    public static final Feature<SmallTreeConfiguration> NORMAL_TREE;
-    public static final Feature<SmallTreeConfiguration> ACACIA_TREE;
-    public static final Feature<SmallTreeConfiguration> FANCY_TREE;
-    public static final Feature<TreeConfiguration> JUNGLE_GROUND_BUSH;
-    public static final Feature<MegaTreeConfiguration> DARK_OAK_TREE;
-    public static final Feature<MegaTreeConfiguration> MEGA_JUNGLE_TREE;
-    public static final Feature<MegaTreeConfiguration> MEGA_SPRUCE_TREE;
+    public static final Feature<TreeConfiguration> TREE;
     public static final AbstractFlowerFeature<RandomPatchConfiguration> FLOWER;
     public static final Feature<RandomPatchConfiguration> RANDOM_PATCH;
     public static final Feature<BlockPileConfiguration> BLOCK_PILE;
@@ -112,140 +79,116 @@ public abstract class Feature<FC extends FeatureConfiguration> {
     public static final Feature<CountFeatureConfiguration> SEA_PICKLE;
     public static final Feature<SimpleBlockConfiguration> SIMPLE_BLOCK;
     public static final Feature<ProbabilityFeatureConfiguration> BAMBOO;
+    public static final Feature<HugeFungusConfiguration> HUGE_FUNGUS;
+    public static final Feature<BlockPileConfiguration> NETHER_FOREST_VEGETATION;
+    public static final Feature<NoneFeatureConfiguration> WEEPING_VINES;
+    public static final Feature<NoneFeatureConfiguration> TWISTING_VINES;
+    public static final Feature<ColumnFeatureConfiguration> BASALT_COLUMNS;
+    public static final Feature<DeltaFeatureConfiguration> DELTA_FEATURE;
+    public static final Feature<ReplaceSpheroidConfiguration> REPLACE_BLOBS;
     public static final Feature<LayerConfiguration> FILL_LAYER;
     public static final BonusChestFeature BONUS_CHEST;
+    public static final Feature<NoneFeatureConfiguration> BASALT_PILLAR;
+    public static final Feature<OreConfiguration> NO_SURFACE_ORE;
     public static final Feature<RandomRandomFeatureConfiguration> RANDOM_RANDOM_SELECTOR;
     public static final Feature<RandomFeatureConfiguration> RANDOM_SELECTOR;
     public static final Feature<SimpleRandomFeatureConfiguration> SIMPLE_RANDOM_SELECTOR;
     public static final Feature<RandomBooleanFeatureConfiguration> RANDOM_BOOLEAN_SELECTOR;
     public static final Feature<DecoratedFeatureConfiguration> DECORATED;
     public static final Feature<DecoratedFeatureConfiguration> DECORATED_FLOWER;
-    public static final BiMap<String, StructureFeature<?>> STRUCTURES_REGISTRY;
-    public static final List<StructureFeature<?>> NOISE_AFFECTING_FEATURES;
-    private final Function<Dynamic<?>, ? extends FC> configurationFactory;
+    private final Codec<ConfiguredFeature<FC, Feature<FC>>> configuredCodec;
     
-    private static <C extends FeatureConfiguration, F extends Feature<C>> F register(final String string, final F cdu) {
-        return Registry.<F>register(Registry.FEATURE, string, cdu);
+    private static <C extends FeatureConfiguration, F extends Feature<C>> F register(final String string, final F ckt) {
+        return Registry.<F>register(Registry.FEATURE, string, ckt);
     }
     
-    public Feature(final Function<Dynamic<?>, ? extends FC> function) {
-        this.configurationFactory = function;
+    public Feature(final Codec<FC> codec) {
+        this.configuredCodec = (Codec<ConfiguredFeature<FC, Feature<FC>>>)codec.fieldOf("config").xmap(cnr -> new ConfiguredFeature(this, cnr), ckb -> ckb.config).codec();
     }
     
-    public ConfiguredFeature<FC, ?> configured(final FC cgn) {
-        return new ConfiguredFeature<FC, Object>(this, cgn);
+    public Codec<ConfiguredFeature<FC, Feature<FC>>> configuredCodec() {
+        return this.configuredCodec;
     }
     
-    public FC createSettings(final Dynamic<?> dynamic) {
-        return (FC)this.configurationFactory.apply(dynamic);
+    public ConfiguredFeature<FC, ?> configured(final FC cnr) {
+        return new ConfiguredFeature<FC, Object>(this, cnr);
     }
     
-    protected void setBlock(final LevelWriter bke, final BlockPos fk, final BlockState byj) {
-        bke.setBlock(fk, byj, 3);
+    protected void setBlock(final LevelWriter bqh, final BlockPos fu, final BlockState cfj) {
+        bqh.setBlock(fu, cfj, 3);
     }
     
-    public abstract boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final FC cgn);
+    public abstract boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final FC cnr);
     
-    public List<Biome.SpawnerData> getSpecialEnemies() {
-        return Collections.<Biome.SpawnerData>emptyList();
+    protected static boolean isStone(final Block bvr) {
+        return bvr == Blocks.STONE || bvr == Blocks.GRANITE || bvr == Blocks.DIORITE || bvr == Blocks.ANDESITE;
     }
     
-    public List<Biome.SpawnerData> getSpecialAnimals() {
-        return Collections.<Biome.SpawnerData>emptyList();
+    public static boolean isDirt(final Block bvr) {
+        return bvr == Blocks.DIRT || bvr == Blocks.GRASS_BLOCK || bvr == Blocks.PODZOL || bvr == Blocks.COARSE_DIRT || bvr == Blocks.MYCELIUM;
     }
     
-    protected static boolean isStone(final Block bph) {
-        return bph == Blocks.STONE || bph == Blocks.GRANITE || bph == Blocks.DIORITE || bph == Blocks.ANDESITE;
+    public static boolean isGrassOrDirt(final LevelSimulatedReader bqg, final BlockPos fu) {
+        return bqg.isStateAtPosition(fu, cfj -> isDirt(cfj.getBlock()));
     }
     
-    protected static boolean isDirt(final Block bph) {
-        return bph == Blocks.DIRT || bph == Blocks.GRASS_BLOCK || bph == Blocks.PODZOL || bph == Blocks.COARSE_DIRT || bph == Blocks.MYCELIUM;
+    public static boolean isAir(final LevelSimulatedReader bqg, final BlockPos fu) {
+        return bqg.isStateAtPosition(fu, BlockBehaviour.BlockStateBase::isAir);
     }
     
     static {
-        PILLAGER_OUTPOST = Feature.<FeatureConfiguration, PillagerOutpostFeature>register("pillager_outpost", new PillagerOutpostFeature(NoneFeatureConfiguration::deserialize));
-        MINESHAFT = Feature.<FeatureConfiguration, MineshaftFeature>register("mineshaft", new MineshaftFeature(MineshaftConfiguration::deserialize));
-        WOODLAND_MANSION = Feature.<FeatureConfiguration, WoodlandMansionFeature>register("woodland_mansion", new WoodlandMansionFeature(NoneFeatureConfiguration::deserialize));
-        JUNGLE_TEMPLE = Feature.<FeatureConfiguration, JunglePyramidFeature>register("jungle_temple", new JunglePyramidFeature(NoneFeatureConfiguration::deserialize));
-        DESERT_PYRAMID = Feature.<FeatureConfiguration, DesertPyramidFeature>register("desert_pyramid", new DesertPyramidFeature(NoneFeatureConfiguration::deserialize));
-        IGLOO = Feature.<FeatureConfiguration, IglooFeature>register("igloo", new IglooFeature(NoneFeatureConfiguration::deserialize));
-        SHIPWRECK = Feature.<FeatureConfiguration, ShipwreckFeature>register("shipwreck", new ShipwreckFeature(ShipwreckConfiguration::deserialize));
-        SWAMP_HUT = Feature.<FeatureConfiguration, SwamplandHutFeature>register("swamp_hut", new SwamplandHutFeature(NoneFeatureConfiguration::deserialize));
-        STRONGHOLD = Feature.<FeatureConfiguration, StrongholdFeature>register("stronghold", new StrongholdFeature(NoneFeatureConfiguration::deserialize));
-        OCEAN_MONUMENT = Feature.<FeatureConfiguration, OceanMonumentFeature>register("ocean_monument", new OceanMonumentFeature(NoneFeatureConfiguration::deserialize));
-        OCEAN_RUIN = Feature.<FeatureConfiguration, OceanRuinFeature>register("ocean_ruin", new OceanRuinFeature(OceanRuinConfiguration::deserialize));
-        NETHER_BRIDGE = Feature.<FeatureConfiguration, NetherFortressFeature>register("nether_bridge", new NetherFortressFeature(NoneFeatureConfiguration::deserialize));
-        END_CITY = Feature.<FeatureConfiguration, EndCityFeature>register("end_city", new EndCityFeature(NoneFeatureConfiguration::deserialize));
-        BURIED_TREASURE = Feature.<FeatureConfiguration, BuriedTreasureFeature>register("buried_treasure", new BuriedTreasureFeature(BuriedTreasureConfiguration::deserialize));
-        VILLAGE = Feature.<FeatureConfiguration, VillageFeature>register("village", new VillageFeature(VillageConfiguration::deserialize));
-        NO_OP = Feature.<FeatureConfiguration, NoOpFeature>register("no_op", new NoOpFeature(NoneFeatureConfiguration::deserialize));
-        NORMAL_TREE = Feature.<FeatureConfiguration, TreeFeature>register("normal_tree", new TreeFeature(SmallTreeConfiguration::deserialize));
-        ACACIA_TREE = Feature.<FeatureConfiguration, AcaciaFeature>register("acacia_tree", new AcaciaFeature(SmallTreeConfiguration::deserialize));
-        FANCY_TREE = Feature.<FeatureConfiguration, FancyTreeFeature>register("fancy_tree", new FancyTreeFeature(SmallTreeConfiguration::deserialize));
-        JUNGLE_GROUND_BUSH = Feature.<FeatureConfiguration, GroundBushFeature>register("jungle_ground_bush", new GroundBushFeature(TreeConfiguration::deserialize));
-        DARK_OAK_TREE = Feature.<FeatureConfiguration, DarkOakFeature>register("dark_oak_tree", new DarkOakFeature(MegaTreeConfiguration::deserialize));
-        MEGA_JUNGLE_TREE = Feature.<FeatureConfiguration, MegaJungleTreeFeature>register("mega_jungle_tree", new MegaJungleTreeFeature(MegaTreeConfiguration::deserialize));
-        MEGA_SPRUCE_TREE = Feature.<FeatureConfiguration, MegaPineTreeFeature>register("mega_spruce_tree", new MegaPineTreeFeature(MegaTreeConfiguration::deserialize));
-        FLOWER = Feature.<FeatureConfiguration, DefaultFlowerFeature>register("flower", new DefaultFlowerFeature(RandomPatchConfiguration::deserialize));
-        RANDOM_PATCH = Feature.<FeatureConfiguration, RandomPatchFeature>register("random_patch", new RandomPatchFeature(RandomPatchConfiguration::deserialize));
-        BLOCK_PILE = Feature.<FeatureConfiguration, BlockPileFeature>register("block_pile", new BlockPileFeature(BlockPileConfiguration::deserialize));
-        SPRING = Feature.<FeatureConfiguration, SpringFeature>register("spring_feature", new SpringFeature(SpringConfiguration::deserialize));
-        CHORUS_PLANT = Feature.<FeatureConfiguration, ChorusPlantFeature>register("chorus_plant", new ChorusPlantFeature(NoneFeatureConfiguration::deserialize));
-        EMERALD_ORE = Feature.<FeatureConfiguration, ReplaceBlockFeature>register("emerald_ore", new ReplaceBlockFeature(ReplaceBlockConfiguration::deserialize));
-        VOID_START_PLATFORM = Feature.<FeatureConfiguration, VoidStartPlatformFeature>register("void_start_platform", new VoidStartPlatformFeature(NoneFeatureConfiguration::deserialize));
-        DESERT_WELL = Feature.<FeatureConfiguration, DesertWellFeature>register("desert_well", new DesertWellFeature(NoneFeatureConfiguration::deserialize));
-        FOSSIL = Feature.<FeatureConfiguration, FossilFeature>register("fossil", new FossilFeature(NoneFeatureConfiguration::deserialize));
-        HUGE_RED_MUSHROOM = Feature.<FeatureConfiguration, HugeRedMushroomFeature>register("huge_red_mushroom", new HugeRedMushroomFeature(HugeMushroomFeatureConfiguration::deserialize));
-        HUGE_BROWN_MUSHROOM = Feature.<FeatureConfiguration, HugeBrownMushroomFeature>register("huge_brown_mushroom", new HugeBrownMushroomFeature(HugeMushroomFeatureConfiguration::deserialize));
-        ICE_SPIKE = Feature.<FeatureConfiguration, IceSpikeFeature>register("ice_spike", new IceSpikeFeature(NoneFeatureConfiguration::deserialize));
-        GLOWSTONE_BLOB = Feature.<FeatureConfiguration, GlowstoneFeature>register("glowstone_blob", new GlowstoneFeature(NoneFeatureConfiguration::deserialize));
-        FREEZE_TOP_LAYER = Feature.<FeatureConfiguration, SnowAndFreezeFeature>register("freeze_top_layer", new SnowAndFreezeFeature(NoneFeatureConfiguration::deserialize));
-        VINES = Feature.<FeatureConfiguration, VinesFeature>register("vines", new VinesFeature(NoneFeatureConfiguration::deserialize));
-        MONSTER_ROOM = Feature.<FeatureConfiguration, MonsterRoomFeature>register("monster_room", new MonsterRoomFeature(NoneFeatureConfiguration::deserialize));
-        BLUE_ICE = Feature.<FeatureConfiguration, BlueIceFeature>register("blue_ice", new BlueIceFeature(NoneFeatureConfiguration::deserialize));
-        ICEBERG = Feature.<FeatureConfiguration, IcebergFeature>register("iceberg", new IcebergFeature(BlockStateConfiguration::deserialize));
-        FOREST_ROCK = Feature.<FeatureConfiguration, BlockBlobFeature>register("forest_rock", new BlockBlobFeature(BlockBlobConfiguration::deserialize));
-        DISK = Feature.<FeatureConfiguration, DiskReplaceFeature>register("disk", new DiskReplaceFeature(DiskConfiguration::deserialize));
-        ICE_PATCH = Feature.<FeatureConfiguration, IcePatchFeature>register("ice_patch", new IcePatchFeature(FeatureRadiusConfiguration::deserialize));
-        LAKE = Feature.<FeatureConfiguration, LakeFeature>register("lake", new LakeFeature(BlockStateConfiguration::deserialize));
-        ORE = Feature.<FeatureConfiguration, OreFeature>register("ore", new OreFeature(OreConfiguration::deserialize));
-        END_SPIKE = Feature.<FeatureConfiguration, SpikeFeature>register("end_spike", new SpikeFeature(SpikeConfiguration::deserialize));
-        END_ISLAND = Feature.<FeatureConfiguration, EndIslandFeature>register("end_island", new EndIslandFeature(NoneFeatureConfiguration::deserialize));
-        END_GATEWAY = Feature.<FeatureConfiguration, EndGatewayFeature>register("end_gateway", new EndGatewayFeature(EndGatewayConfiguration::deserialize));
-        SEAGRASS = Feature.<FeatureConfiguration, SeagrassFeature>register("seagrass", new SeagrassFeature(SeagrassFeatureConfiguration::deserialize));
-        KELP = Feature.<FeatureConfiguration, KelpFeature>register("kelp", new KelpFeature(NoneFeatureConfiguration::deserialize));
-        CORAL_TREE = Feature.<FeatureConfiguration, CoralTreeFeature>register("coral_tree", new CoralTreeFeature(NoneFeatureConfiguration::deserialize));
-        CORAL_MUSHROOM = Feature.<FeatureConfiguration, CoralMushroomFeature>register("coral_mushroom", new CoralMushroomFeature(NoneFeatureConfiguration::deserialize));
-        CORAL_CLAW = Feature.<FeatureConfiguration, CoralClawFeature>register("coral_claw", new CoralClawFeature(NoneFeatureConfiguration::deserialize));
-        SEA_PICKLE = Feature.<FeatureConfiguration, SeaPickleFeature>register("sea_pickle", new SeaPickleFeature(CountFeatureConfiguration::deserialize));
-        SIMPLE_BLOCK = Feature.<FeatureConfiguration, SimpleBlockFeature>register("simple_block", new SimpleBlockFeature(SimpleBlockConfiguration::deserialize));
-        BAMBOO = Feature.<FeatureConfiguration, BambooFeature>register("bamboo", new BambooFeature(ProbabilityFeatureConfiguration::deserialize));
-        FILL_LAYER = Feature.<FeatureConfiguration, FillLayerFeature>register("fill_layer", new FillLayerFeature(LayerConfiguration::deserialize));
-        BONUS_CHEST = Feature.<FeatureConfiguration, BonusChestFeature>register("bonus_chest", new BonusChestFeature(NoneFeatureConfiguration::deserialize));
-        RANDOM_RANDOM_SELECTOR = Feature.<FeatureConfiguration, RandomRandomFeature>register("random_random_selector", new RandomRandomFeature(RandomRandomFeatureConfiguration::deserialize));
-        RANDOM_SELECTOR = Feature.<FeatureConfiguration, RandomSelectorFeature>register("random_selector", new RandomSelectorFeature(RandomFeatureConfiguration::deserialize));
-        SIMPLE_RANDOM_SELECTOR = Feature.<FeatureConfiguration, SimpleRandomSelectorFeature>register("simple_random_selector", new SimpleRandomSelectorFeature(SimpleRandomFeatureConfiguration::deserialize));
-        RANDOM_BOOLEAN_SELECTOR = Feature.<FeatureConfiguration, RandomBooleanSelectorFeature>register("random_boolean_selector", new RandomBooleanSelectorFeature(RandomBooleanFeatureConfiguration::deserialize));
-        DECORATED = Feature.<FeatureConfiguration, DecoratedFeature>register("decorated", new DecoratedFeature(DecoratedFeatureConfiguration::deserialize));
-        DECORATED_FLOWER = Feature.<FeatureConfiguration, DecoratedFlowerFeature>register("decorated_flower", new DecoratedFlowerFeature(DecoratedFeatureConfiguration::deserialize));
-        STRUCTURES_REGISTRY = Util.<BiMap<String, StructureFeature<?>>>make(HashBiMap.create(), hashBiMap -> {
-            hashBiMap.put("Pillager_Outpost".toLowerCase(Locale.ROOT), Feature.PILLAGER_OUTPOST);
-            hashBiMap.put("Mineshaft".toLowerCase(Locale.ROOT), (StructureFeature<NoneFeatureConfiguration>)Feature.MINESHAFT);
-            hashBiMap.put("Mansion".toLowerCase(Locale.ROOT), Feature.WOODLAND_MANSION);
-            hashBiMap.put("Jungle_Pyramid".toLowerCase(Locale.ROOT), Feature.JUNGLE_TEMPLE);
-            hashBiMap.put("Desert_Pyramid".toLowerCase(Locale.ROOT), Feature.DESERT_PYRAMID);
-            hashBiMap.put("Igloo".toLowerCase(Locale.ROOT), Feature.IGLOO);
-            hashBiMap.put("Shipwreck".toLowerCase(Locale.ROOT), (StructureFeature<NoneFeatureConfiguration>)Feature.SHIPWRECK);
-            hashBiMap.put("Swamp_Hut".toLowerCase(Locale.ROOT), Feature.SWAMP_HUT);
-            hashBiMap.put("Stronghold".toLowerCase(Locale.ROOT), Feature.STRONGHOLD);
-            hashBiMap.put("Monument".toLowerCase(Locale.ROOT), Feature.OCEAN_MONUMENT);
-            hashBiMap.put("Ocean_Ruin".toLowerCase(Locale.ROOT), (StructureFeature<NoneFeatureConfiguration>)Feature.OCEAN_RUIN);
-            hashBiMap.put("Fortress".toLowerCase(Locale.ROOT), Feature.NETHER_BRIDGE);
-            hashBiMap.put("EndCity".toLowerCase(Locale.ROOT), Feature.END_CITY);
-            hashBiMap.put("Buried_Treasure".toLowerCase(Locale.ROOT), (StructureFeature<NoneFeatureConfiguration>)Feature.BURIED_TREASURE);
-            hashBiMap.put("Village".toLowerCase(Locale.ROOT), (StructureFeature<NoneFeatureConfiguration>)Feature.VILLAGE);
-            return;
-        });
-        NOISE_AFFECTING_FEATURES = ImmutableList.<StructureFeature<NoneFeatureConfiguration>>of(Feature.PILLAGER_OUTPOST, (StructureFeature<NoneFeatureConfiguration>)Feature.VILLAGE);
+        NO_OP = Feature.<FeatureConfiguration, NoOpFeature>register("no_op", new NoOpFeature(NoneFeatureConfiguration.CODEC));
+        TREE = Feature.<FeatureConfiguration, TreeFeature>register("tree", new TreeFeature(TreeConfiguration.CODEC));
+        FLOWER = Feature.<FeatureConfiguration, DefaultFlowerFeature>register("flower", new DefaultFlowerFeature(RandomPatchConfiguration.CODEC));
+        RANDOM_PATCH = Feature.<FeatureConfiguration, RandomPatchFeature>register("random_patch", new RandomPatchFeature(RandomPatchConfiguration.CODEC));
+        BLOCK_PILE = Feature.<FeatureConfiguration, BlockPileFeature>register("block_pile", new BlockPileFeature(BlockPileConfiguration.CODEC));
+        SPRING = Feature.<FeatureConfiguration, SpringFeature>register("spring_feature", new SpringFeature(SpringConfiguration.CODEC));
+        CHORUS_PLANT = Feature.<FeatureConfiguration, ChorusPlantFeature>register("chorus_plant", new ChorusPlantFeature(NoneFeatureConfiguration.CODEC));
+        EMERALD_ORE = Feature.<FeatureConfiguration, ReplaceBlockFeature>register("emerald_ore", new ReplaceBlockFeature(ReplaceBlockConfiguration.CODEC));
+        VOID_START_PLATFORM = Feature.<FeatureConfiguration, VoidStartPlatformFeature>register("void_start_platform", new VoidStartPlatformFeature(NoneFeatureConfiguration.CODEC));
+        DESERT_WELL = Feature.<FeatureConfiguration, DesertWellFeature>register("desert_well", new DesertWellFeature(NoneFeatureConfiguration.CODEC));
+        FOSSIL = Feature.<FeatureConfiguration, FossilFeature>register("fossil", new FossilFeature(NoneFeatureConfiguration.CODEC));
+        HUGE_RED_MUSHROOM = Feature.<FeatureConfiguration, HugeRedMushroomFeature>register("huge_red_mushroom", new HugeRedMushroomFeature(HugeMushroomFeatureConfiguration.CODEC));
+        HUGE_BROWN_MUSHROOM = Feature.<FeatureConfiguration, HugeBrownMushroomFeature>register("huge_brown_mushroom", new HugeBrownMushroomFeature(HugeMushroomFeatureConfiguration.CODEC));
+        ICE_SPIKE = Feature.<FeatureConfiguration, IceSpikeFeature>register("ice_spike", new IceSpikeFeature(NoneFeatureConfiguration.CODEC));
+        GLOWSTONE_BLOB = Feature.<FeatureConfiguration, GlowstoneFeature>register("glowstone_blob", new GlowstoneFeature(NoneFeatureConfiguration.CODEC));
+        FREEZE_TOP_LAYER = Feature.<FeatureConfiguration, SnowAndFreezeFeature>register("freeze_top_layer", new SnowAndFreezeFeature(NoneFeatureConfiguration.CODEC));
+        VINES = Feature.<FeatureConfiguration, VinesFeature>register("vines", new VinesFeature(NoneFeatureConfiguration.CODEC));
+        MONSTER_ROOM = Feature.<FeatureConfiguration, MonsterRoomFeature>register("monster_room", new MonsterRoomFeature(NoneFeatureConfiguration.CODEC));
+        BLUE_ICE = Feature.<FeatureConfiguration, BlueIceFeature>register("blue_ice", new BlueIceFeature(NoneFeatureConfiguration.CODEC));
+        ICEBERG = Feature.<FeatureConfiguration, IcebergFeature>register("iceberg", new IcebergFeature(BlockStateConfiguration.CODEC));
+        FOREST_ROCK = Feature.<FeatureConfiguration, BlockBlobFeature>register("forest_rock", new BlockBlobFeature(BlockBlobConfiguration.CODEC));
+        DISK = Feature.<FeatureConfiguration, DiskReplaceFeature>register("disk", new DiskReplaceFeature(DiskConfiguration.CODEC));
+        ICE_PATCH = Feature.<FeatureConfiguration, IcePatchFeature>register("ice_patch", new IcePatchFeature(FeatureRadiusConfiguration.CODEC));
+        LAKE = Feature.<FeatureConfiguration, LakeFeature>register("lake", new LakeFeature(BlockStateConfiguration.CODEC));
+        ORE = Feature.<FeatureConfiguration, OreFeature>register("ore", new OreFeature(OreConfiguration.CODEC));
+        END_SPIKE = Feature.<FeatureConfiguration, SpikeFeature>register("end_spike", new SpikeFeature(SpikeConfiguration.CODEC));
+        END_ISLAND = Feature.<FeatureConfiguration, EndIslandFeature>register("end_island", new EndIslandFeature(NoneFeatureConfiguration.CODEC));
+        END_GATEWAY = Feature.<FeatureConfiguration, EndGatewayFeature>register("end_gateway", new EndGatewayFeature(EndGatewayConfiguration.CODEC));
+        SEAGRASS = Feature.<FeatureConfiguration, SeagrassFeature>register("seagrass", new SeagrassFeature(SeagrassFeatureConfiguration.CODEC));
+        KELP = Feature.<FeatureConfiguration, KelpFeature>register("kelp", new KelpFeature(NoneFeatureConfiguration.CODEC));
+        CORAL_TREE = Feature.<FeatureConfiguration, CoralTreeFeature>register("coral_tree", new CoralTreeFeature(NoneFeatureConfiguration.CODEC));
+        CORAL_MUSHROOM = Feature.<FeatureConfiguration, CoralMushroomFeature>register("coral_mushroom", new CoralMushroomFeature(NoneFeatureConfiguration.CODEC));
+        CORAL_CLAW = Feature.<FeatureConfiguration, CoralClawFeature>register("coral_claw", new CoralClawFeature(NoneFeatureConfiguration.CODEC));
+        SEA_PICKLE = Feature.<FeatureConfiguration, SeaPickleFeature>register("sea_pickle", new SeaPickleFeature(CountFeatureConfiguration.CODEC));
+        SIMPLE_BLOCK = Feature.<FeatureConfiguration, SimpleBlockFeature>register("simple_block", new SimpleBlockFeature(SimpleBlockConfiguration.CODEC));
+        BAMBOO = Feature.<FeatureConfiguration, BambooFeature>register("bamboo", new BambooFeature(ProbabilityFeatureConfiguration.CODEC));
+        HUGE_FUNGUS = Feature.<FeatureConfiguration, HugeFungusFeature>register("huge_fungus", new HugeFungusFeature(HugeFungusConfiguration.CODEC));
+        NETHER_FOREST_VEGETATION = Feature.<FeatureConfiguration, NetherForestVegetationFeature>register("nether_forest_vegetation", new NetherForestVegetationFeature(BlockPileConfiguration.CODEC));
+        WEEPING_VINES = Feature.<FeatureConfiguration, WeepingVinesFeature>register("weeping_vines", new WeepingVinesFeature(NoneFeatureConfiguration.CODEC));
+        TWISTING_VINES = Feature.<FeatureConfiguration, TwistingVinesFeature>register("twisting_vines", new TwistingVinesFeature(NoneFeatureConfiguration.CODEC));
+        BASALT_COLUMNS = Feature.<FeatureConfiguration, BasaltColumnsFeature>register("basalt_columns", new BasaltColumnsFeature(ColumnFeatureConfiguration.CODEC));
+        DELTA_FEATURE = Feature.<FeatureConfiguration, DeltaFeature>register("delta_feature", new DeltaFeature(DeltaFeatureConfiguration.CODEC));
+        REPLACE_BLOBS = Feature.<FeatureConfiguration, ReplaceBlobsFeature>register("netherrack_replace_blobs", new ReplaceBlobsFeature(ReplaceSpheroidConfiguration.CODEC));
+        FILL_LAYER = Feature.<FeatureConfiguration, FillLayerFeature>register("fill_layer", new FillLayerFeature(LayerConfiguration.CODEC));
+        BONUS_CHEST = Feature.<FeatureConfiguration, BonusChestFeature>register("bonus_chest", new BonusChestFeature(NoneFeatureConfiguration.CODEC));
+        BASALT_PILLAR = Feature.<FeatureConfiguration, BasaltPillarFeature>register("basalt_pillar", new BasaltPillarFeature(NoneFeatureConfiguration.CODEC));
+        NO_SURFACE_ORE = Feature.<FeatureConfiguration, NoSurfaceOreFeature>register("no_surface_ore", new NoSurfaceOreFeature(OreConfiguration.CODEC));
+        RANDOM_RANDOM_SELECTOR = Feature.<FeatureConfiguration, RandomRandomFeature>register("random_random_selector", new RandomRandomFeature(RandomRandomFeatureConfiguration.CODEC));
+        RANDOM_SELECTOR = Feature.<FeatureConfiguration, RandomSelectorFeature>register("random_selector", new RandomSelectorFeature(RandomFeatureConfiguration.CODEC));
+        SIMPLE_RANDOM_SELECTOR = Feature.<FeatureConfiguration, SimpleRandomSelectorFeature>register("simple_random_selector", new SimpleRandomSelectorFeature(SimpleRandomFeatureConfiguration.CODEC));
+        RANDOM_BOOLEAN_SELECTOR = Feature.<FeatureConfiguration, RandomBooleanSelectorFeature>register("random_boolean_selector", new RandomBooleanSelectorFeature(RandomBooleanFeatureConfiguration.CODEC));
+        DECORATED = Feature.<FeatureConfiguration, DecoratedFeature>register("decorated", new DecoratedFeature(DecoratedFeatureConfiguration.CODEC));
+        DECORATED_FLOWER = Feature.<FeatureConfiguration, DecoratedFlowerFeature>register("decorated_flower", new DecoratedFlowerFeature(DecoratedFeatureConfiguration.CODEC));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/FillLayerFeature.java b/src/net/minecraft/world/level/levelgen/feature/FillLayerFeature.java
index 963b67e..37fc89f 100644
--- a/src/net/minecraft/world/level/levelgen/feature/FillLayerFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/FillLayerFeature.java
@@ -3,29 +3,28 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration;
 
 public class FillLayerFeature extends Feature<LayerConfiguration> {
-    public FillLayerFeature(final Function<Dynamic<?>, ? extends LayerConfiguration> function) {
-        super(function);
+    public FillLayerFeature(final Codec<LayerConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final LayerConfiguration cgq) {
-        final BlockPos.MutableBlockPos a7 = new BlockPos.MutableBlockPos();
-        for (int integer8 = 0; integer8 < 16; ++integer8) {
-            for (int integer9 = 0; integer9 < 16; ++integer9) {
-                final int integer10 = fk.getX() + integer8;
-                final int integer11 = fk.getZ() + integer9;
-                final int integer12 = cgq.height;
-                a7.set(integer10, integer12, integer11);
-                if (bjx.getBlockState(a7).isAir()) {
-                    bjx.setBlock(a7, cgq.state, 2);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final LayerConfiguration cnv) {
+        final BlockPos.MutableBlockPos a8 = new BlockPos.MutableBlockPos();
+        for (int integer9 = 0; integer9 < 16; ++integer9) {
+            for (int integer10 = 0; integer10 < 16; ++integer10) {
+                final int integer11 = fu.getX() + integer9;
+                final int integer12 = fu.getZ() + integer10;
+                final int integer13 = cnv.height;
+                a8.set(integer11, integer13, integer12);
+                if (bqu.getBlockState(a8).isAir()) {
+                    bqu.setBlock(a8, cnv.state, 2);
                 }
             }
         }
diff --git a/src/net/minecraft/world/level/levelgen/feature/FossilFeature.java b/src/net/minecraft/world/level/levelgen/feature/FossilFeature.java
index e4ece14..f1d8604 100644
--- a/src/net/minecraft/world/level/levelgen/feature/FossilFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/FossilFeature.java
@@ -3,6 +3,7 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.levelgen.structure.templatesystem.BlockRotProcessor;
 import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.levelgen.Heightmap;
@@ -15,11 +16,10 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
@@ -43,40 +43,38 @@ public class FossilFeature extends Feature<NoneFeatureConfiguration> {
     private static final ResourceLocation[] fossils;
     private static final ResourceLocation[] fossilsCoal;
     
-    public FossilFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public FossilFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        final Random random2 = bjx.getRandom();
-        final Rotation[] arr8 = Rotation.values();
-        final Rotation btu9 = arr8[random2.nextInt(arr8.length)];
-        final int integer10 = random2.nextInt(FossilFeature.fossils.length);
-        final StructureManager cmo11 = ((ServerLevel)bjx.getLevel()).getLevelStorage().getStructureManager();
-        final StructureTemplate cms12 = cmo11.getOrCreate(FossilFeature.fossils[integer10]);
-        final StructureTemplate cms13 = cmo11.getOrCreate(FossilFeature.fossilsCoal[integer10]);
-        final ChunkPos bjh14 = new ChunkPos(fk);
-        final BoundingBox clb15 = new BoundingBox(bjh14.getMinBlockX(), 0, bjh14.getMinBlockZ(), bjh14.getMaxBlockX(), 256, bjh14.getMaxBlockZ());
-        final StructurePlaceSettings cmp16 = new StructurePlaceSettings().setRotation(btu9).setBoundingBox(clb15).setRandom(random2).addProcessor(BlockIgnoreProcessor.STRUCTURE_AND_AIR);
-        final BlockPos fk2 = cms12.getSize(btu9);
-        final int integer11 = random2.nextInt(16 - fk2.getX());
-        final int integer12 = random2.nextInt(16 - fk2.getZ());
-        int integer13 = 256;
-        for (int integer14 = 0; integer14 < fk2.getX(); ++integer14) {
-            for (int integer15 = 0; integer15 < fk2.getZ(); ++integer15) {
-                integer13 = Math.min(integer13, bjx.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, fk.getX() + integer14 + integer11, fk.getZ() + integer15 + integer12));
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        final Rotation cap8 = Rotation.getRandom(random);
+        final int integer9 = random.nextInt(FossilFeature.fossils.length);
+        final StructureManager cva10 = ((ServerLevel)bqu.getLevel()).getServer().getStructureManager();
+        final StructureTemplate cve11 = cva10.getOrCreate(FossilFeature.fossils[integer9]);
+        final StructureTemplate cve12 = cva10.getOrCreate(FossilFeature.fossilsCoal[integer9]);
+        final ChunkPos bph13 = new ChunkPos(fu);
+        final BoundingBox ctd14 = new BoundingBox(bph13.getMinBlockX(), 0, bph13.getMinBlockZ(), bph13.getMaxBlockX(), 256, bph13.getMaxBlockZ());
+        final StructurePlaceSettings cvb15 = new StructurePlaceSettings().setRotation(cap8).setBoundingBox(ctd14).setRandom(random).addProcessor(BlockIgnoreProcessor.STRUCTURE_AND_AIR);
+        final BlockPos fu2 = cve11.getSize(cap8);
+        final int integer10 = random.nextInt(16 - fu2.getX());
+        final int integer11 = random.nextInt(16 - fu2.getZ());
+        int integer12 = 256;
+        for (int integer13 = 0; integer13 < fu2.getX(); ++integer13) {
+            for (int integer14 = 0; integer14 < fu2.getZ(); ++integer14) {
+                integer12 = Math.min(integer12, bqu.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, fu.getX() + integer13 + integer10, fu.getZ() + integer14 + integer11));
             }
         }
-        int integer14 = Math.max(integer13 - 15 - random2.nextInt(10), 10);
-        final BlockPos fk3 = cms12.getZeroPositionWithTransform(fk.offset(integer11, integer14, integer12), Mirror.NONE, btu9);
-        final BlockRotProcessor cmd23 = new BlockRotProcessor(0.9f);
-        cmp16.clearProcessors().addProcessor(cmd23);
-        cms12.placeInWorld(bjx, fk3, cmp16, 4);
-        cmp16.popProcessor(cmd23);
-        final BlockRotProcessor cmd24 = new BlockRotProcessor(0.1f);
-        cmp16.clearProcessors().addProcessor(cmd24);
-        cms13.placeInWorld(bjx, fk3, cmp16, 4);
+        int integer13 = Math.max(integer12 - 15 - random.nextInt(10), 10);
+        final BlockPos fu3 = cve11.getZeroPositionWithTransform(fu.offset(integer10, integer13, integer11), Mirror.NONE, cap8);
+        final BlockRotProcessor cuk22 = new BlockRotProcessor(0.9f);
+        cvb15.clearProcessors().addProcessor(cuk22);
+        cve11.placeInWorld(bqu, fu3, fu3, cvb15, random, 4);
+        cvb15.popProcessor(cuk22);
+        final BlockRotProcessor cuk23 = new BlockRotProcessor(0.1f);
+        cvb15.clearProcessors().addProcessor(cuk23);
+        cve12.placeInWorld(bqu, fu3, fu3, cvb15, random, 4);
         return true;
     }
     
diff --git a/src/net/minecraft/world/level/levelgen/feature/GlowstoneFeature.java b/src/net/minecraft/world/level/levelgen/feature/GlowstoneFeature.java
index ead3e81..a108a8a 100644
--- a/src/net/minecraft/world/level/levelgen/feature/GlowstoneFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/GlowstoneFeature.java
@@ -1,45 +1,46 @@
 package net.minecraft.world.level.levelgen.feature;
 
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class GlowstoneFeature extends Feature<NoneFeatureConfiguration> {
-    public GlowstoneFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public GlowstoneFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        if (!bjx.isEmptyBlock(fk)) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        if (!bqu.isEmptyBlock(fu)) {
             return false;
         }
-        if (bjx.getBlockState(fk.above()).getBlock() != Blocks.NETHERRACK) {
+        final BlockState cfj8 = bqu.getBlockState(fu.above());
+        if (!cfj8.is(Blocks.NETHERRACK) && !cfj8.is(Blocks.BASALT) && !cfj8.is(Blocks.BLACKSTONE)) {
             return false;
         }
-        bjx.setBlock(fk, Blocks.GLOWSTONE.defaultBlockState(), 2);
-        for (int integer7 = 0; integer7 < 1500; ++integer7) {
-            final BlockPos fk2 = fk.offset(random.nextInt(8) - random.nextInt(8), -random.nextInt(12), random.nextInt(8) - random.nextInt(8));
-            if (bjx.getBlockState(fk2).isAir()) {
-                int integer8 = 0;
-                for (final Direction fp13 : Direction.values()) {
-                    if (bjx.getBlockState(fk2.relative(fp13)).getBlock() == Blocks.GLOWSTONE) {
-                        ++integer8;
+        bqu.setBlock(fu, Blocks.GLOWSTONE.defaultBlockState(), 2);
+        for (int integer9 = 0; integer9 < 1500; ++integer9) {
+            final BlockPos fu2 = fu.offset(random.nextInt(8) - random.nextInt(8), -random.nextInt(12), random.nextInt(8) - random.nextInt(8));
+            if (bqu.getBlockState(fu2).isAir()) {
+                int integer10 = 0;
+                for (final Direction fz15 : Direction.values()) {
+                    if (bqu.getBlockState(fu2.relative(fz15)).is(Blocks.GLOWSTONE)) {
+                        ++integer10;
                     }
-                    if (integer8 > 1) {
+                    if (integer10 > 1) {
                         break;
                     }
                 }
-                if (integer8 == 1) {
-                    bjx.setBlock(fk2, Blocks.GLOWSTONE.defaultBlockState(), 2);
+                if (integer10 == 1) {
+                    bqu.setBlock(fu2, Blocks.GLOWSTONE.defaultBlockState(), 2);
                 }
             }
         }
diff --git a/src/net/minecraft/world/level/levelgen/feature/GroundBushFeature.java b/src/net/minecraft/world/level/levelgen/feature/GroundBushFeature.java
deleted file mode 100644
index 22e34af..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/GroundBushFeature.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package net.minecraft.world.level.levelgen.feature;
-
-import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.levelgen.Heightmap;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.Set;
-import net.minecraft.core.BlockPos;
-import java.util.Random;
-import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-
-public class GroundBushFeature extends AbstractTreeFeature<TreeConfiguration> {
-    public GroundBushFeature(final Function<Dynamic<?>, ? extends TreeConfiguration> function) {
-        super(function);
-    }
-    
-    public boolean doPlace(final LevelSimulatedRW bkb, final Random random, BlockPos fk, final Set<BlockPos> set4, final Set<BlockPos> set5, final BoundingBox clb, final TreeConfiguration chl) {
-        fk = bkb.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, fk).below();
-        if (AbstractTreeFeature.isGrassOrDirt(bkb, fk)) {
-            fk = fk.above();
-            this.placeLog(bkb, random, fk, set4, clb, chl);
-            for (int integer9 = 0; integer9 <= 2; ++integer9) {
-                for (int integer10 = 2 - integer9, integer11 = -integer10; integer11 <= integer10; ++integer11) {
-                    for (int integer12 = -integer10; integer12 <= integer10; ++integer12) {
-                        if (Math.abs(integer11) != integer10 || Math.abs(integer12) != integer10 || random.nextInt(2) != 0) {
-                            this.placeLeaf(bkb, random, new BlockPos(integer11 + fk.getX(), integer9 + fk.getY(), integer12 + fk.getZ()), set5, clb, chl);
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/HugeBrownMushroomFeature.java b/src/net/minecraft/world/level/levelgen/feature/HugeBrownMushroomFeature.java
index 149adf0..009d6d8 100644
--- a/src/net/minecraft/world/level/levelgen/feature/HugeBrownMushroomFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/HugeBrownMushroomFeature.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.LevelWriter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.HugeMushroomBlock;
@@ -11,17 +11,16 @@ import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class HugeBrownMushroomFeature extends AbstractHugeMushroomFeature {
-    public HugeBrownMushroomFeature(final Function<Dynamic<?>, ? extends HugeMushroomFeatureConfiguration> function) {
-        super(function);
+    public HugeBrownMushroomFeature(final Codec<HugeMushroomFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    protected void makeCap(final LevelAccessor bjx, final Random random, final BlockPos fk, final int integer, final BlockPos.MutableBlockPos a, final HugeMushroomFeatureConfiguration cgp) {
-        for (int integer2 = cgp.foliageRadius, integer3 = -integer2; integer3 <= integer2; ++integer3) {
+    protected void makeCap(final LevelAccessor bqc, final Random random, final BlockPos fu, final int integer, final BlockPos.MutableBlockPos a, final HugeMushroomFeatureConfiguration cnt) {
+        for (int integer2 = cnt.foliageRadius, integer3 = -integer2; integer3 <= integer2; ++integer3) {
             for (int integer4 = -integer2; integer4 <= integer2; ++integer4) {
                 final boolean boolean11 = integer3 == -integer2;
                 final boolean boolean12 = integer3 == integer2;
@@ -30,13 +29,13 @@ public class HugeBrownMushroomFeature extends AbstractHugeMushroomFeature {
                 final boolean boolean15 = boolean11 || boolean12;
                 final boolean boolean16 = boolean13 || boolean14;
                 if (!boolean15 || !boolean16) {
-                    a.set(fk).move(integer3, integer, integer4);
-                    if (!bjx.getBlockState(a).isSolidRender(bjx, a)) {
+                    a.setWithOffset(fu, integer3, integer, integer4);
+                    if (!bqc.getBlockState(a).isSolidRender(bqc, a)) {
                         final boolean boolean17 = boolean11 || (boolean16 && integer3 == 1 - integer2);
                         final boolean boolean18 = boolean12 || (boolean16 && integer3 == integer2 - 1);
                         final boolean boolean19 = boolean13 || (boolean15 && integer4 == 1 - integer2);
                         final boolean boolean20 = boolean14 || (boolean15 && integer4 == integer2 - 1);
-                        this.setBlock(bjx, a, (((((AbstractStateHolder<O, BlockState>)cgp.capProvider.getState(random, fk)).setValue((Property<Comparable>)HugeMushroomBlock.WEST, boolean17)).setValue((Property<Comparable>)HugeMushroomBlock.EAST, boolean18)).setValue((Property<Comparable>)HugeMushroomBlock.NORTH, boolean19)).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.SOUTH, boolean20));
+                        this.setBlock(bqc, a, (((((StateHolder<O, BlockState>)cnt.capProvider.getState(random, fu)).setValue((Property<Comparable>)HugeMushroomBlock.WEST, boolean17)).setValue((Property<Comparable>)HugeMushroomBlock.EAST, boolean18)).setValue((Property<Comparable>)HugeMushroomBlock.NORTH, boolean19)).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.SOUTH, boolean20));
                     }
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/feature/HugeFungusConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/HugeFungusConfiguration.java
new file mode 100644
index 0000000..0c1e475
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/HugeFungusConfiguration.java
@@ -0,0 +1,38 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.block.Blocks;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+
+public class HugeFungusConfiguration implements FeatureConfiguration {
+    public static final Codec<HugeFungusConfiguration> CODEC;
+    public static final HugeFungusConfiguration HUGE_CRIMSON_FUNGI_PLANTED_CONFIG;
+    public static final HugeFungusConfiguration HUGE_CRIMSON_FUNGI_NOT_PLANTED_CONFIG;
+    public static final HugeFungusConfiguration HUGE_WARPED_FUNGI_PLANTED_CONFIG;
+    public static final HugeFungusConfiguration HUGE_WARPED_FUNGI_NOT_PLANTED_CONFIG;
+    public final BlockState validBaseState;
+    public final BlockState stemState;
+    public final BlockState hatState;
+    public final BlockState decorState;
+    public final boolean planted;
+    
+    public HugeFungusConfiguration(final BlockState cfj1, final BlockState cfj2, final BlockState cfj3, final BlockState cfj4, final boolean boolean5) {
+        this.validBaseState = cfj1;
+        this.stemState = cfj2;
+        this.hatState = cfj3;
+        this.decorState = cfj4;
+        this.planted = boolean5;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockState.CODEC.fieldOf("valid_base_block").forGetter(cky -> cky.validBaseState), (App)BlockState.CODEC.fieldOf("stem_state").forGetter(cky -> cky.stemState), (App)BlockState.CODEC.fieldOf("hat_state").forGetter(cky -> cky.hatState), (App)BlockState.CODEC.fieldOf("decor_state").forGetter(cky -> cky.decorState), (App)Codec.BOOL.fieldOf("planted").withDefault(false).forGetter(cky -> cky.planted)).apply(instance, HugeFungusConfiguration::new));
+        HUGE_CRIMSON_FUNGI_PLANTED_CONFIG = new HugeFungusConfiguration(Blocks.CRIMSON_NYLIUM.defaultBlockState(), Blocks.CRIMSON_STEM.defaultBlockState(), Blocks.NETHER_WART_BLOCK.defaultBlockState(), Blocks.SHROOMLIGHT.defaultBlockState(), true);
+        HUGE_CRIMSON_FUNGI_NOT_PLANTED_CONFIG = new HugeFungusConfiguration(HugeFungusConfiguration.HUGE_CRIMSON_FUNGI_PLANTED_CONFIG.validBaseState, HugeFungusConfiguration.HUGE_CRIMSON_FUNGI_PLANTED_CONFIG.stemState, HugeFungusConfiguration.HUGE_CRIMSON_FUNGI_PLANTED_CONFIG.hatState, HugeFungusConfiguration.HUGE_CRIMSON_FUNGI_PLANTED_CONFIG.decorState, false);
+        HUGE_WARPED_FUNGI_PLANTED_CONFIG = new HugeFungusConfiguration(Blocks.WARPED_NYLIUM.defaultBlockState(), Blocks.WARPED_STEM.defaultBlockState(), Blocks.WARPED_WART_BLOCK.defaultBlockState(), Blocks.SHROOMLIGHT.defaultBlockState(), true);
+        HUGE_WARPED_FUNGI_NOT_PLANTED_CONFIG = new HugeFungusConfiguration(HugeFungusConfiguration.HUGE_WARPED_FUNGI_PLANTED_CONFIG.validBaseState, HugeFungusConfiguration.HUGE_WARPED_FUNGI_PLANTED_CONFIG.stemState, HugeFungusConfiguration.HUGE_WARPED_FUNGI_PLANTED_CONFIG.hatState, HugeFungusConfiguration.HUGE_WARPED_FUNGI_PLANTED_CONFIG.decorState, false);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/HugeFungusFeature.java b/src/net/minecraft/world/level/levelgen/feature/HugeFungusFeature.java
new file mode 100644
index 0000000..6168af6
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/HugeFungusFeature.java
@@ -0,0 +1,191 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.core.Direction;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelWriter;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
+
+public class HugeFungusFeature extends Feature<HugeFungusConfiguration> {
+    public HugeFungusFeature(final Codec<HugeFungusConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final HugeFungusConfiguration cky) {
+        final Block bvr8 = cky.validBaseState.getBlock();
+        BlockPos fu2 = null;
+        if (cky.planted) {
+            final Block bvr9 = bqu.getBlockState(fu.below()).getBlock();
+            if (bvr9 == bvr8) {
+                fu2 = fu;
+            }
+        }
+        else {
+            fu2 = findOnNyliumPosition(bqu, fu, bvr8);
+        }
+        if (fu2 == null) {
+            return false;
+        }
+        int integer10 = Mth.nextInt(random, 4, 13);
+        if (random.nextInt(12) == 0) {
+            integer10 *= 2;
+        }
+        if (!cky.planted) {
+            final int integer11 = cha.getGenDepth();
+            if (fu2.getY() + integer10 + 1 >= integer11) {
+                return false;
+            }
+        }
+        final boolean boolean11 = !cky.planted && random.nextFloat() < 0.06f;
+        bqu.setBlock(fu, Blocks.AIR.defaultBlockState(), 4);
+        this.placeStem(bqu, random, cky, fu2, integer10, boolean11);
+        this.placeHat(bqu, random, cky, fu2, integer10, boolean11);
+        return true;
+    }
+    
+    private static boolean isReplaceable(final LevelAccessor bqc, final BlockPos fu, final boolean boolean3) {
+        final Material cxd3;
+        return bqc.isStateAtPosition(fu, cfj -> {
+            cxd3 = cfj.getMaterial();
+            return cfj.isAir() || cfj.is(Blocks.WATER) || cfj.is(Blocks.LAVA) || cxd3 == Material.REPLACEABLE_PLANT || (boolean3 && cxd3 == Material.PLANT);
+        });
+    }
+    
+    private void placeStem(final LevelAccessor bqc, final Random random, final HugeFungusConfiguration cky, final BlockPos fu, final int integer, final boolean boolean6) {
+        final BlockPos.MutableBlockPos a8 = new BlockPos.MutableBlockPos();
+        final BlockState cfj9 = cky.stemState;
+        for (int integer2 = boolean6 ? 1 : 0, integer3 = -integer2; integer3 <= integer2; ++integer3) {
+            for (int integer4 = -integer2; integer4 <= integer2; ++integer4) {
+                final boolean boolean7 = boolean6 && Mth.abs(integer3) == integer2 && Mth.abs(integer4) == integer2;
+                for (int integer5 = 0; integer5 < integer; ++integer5) {
+                    a8.setWithOffset(fu, integer3, integer5, integer4);
+                    if (isReplaceable(bqc, a8, true)) {
+                        if (cky.planted) {
+                            if (!bqc.getBlockState(a8.below()).isAir()) {
+                                bqc.destroyBlock(a8, true);
+                            }
+                            bqc.setBlock(a8, cfj9, 3);
+                        }
+                        else if (boolean7) {
+                            if (random.nextFloat() < 0.1f) {
+                                this.setBlock(bqc, a8, cfj9);
+                            }
+                        }
+                        else {
+                            this.setBlock(bqc, a8, cfj9);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    private void placeHat(final LevelAccessor bqc, final Random random, final HugeFungusConfiguration cky, final BlockPos fu, final int integer, final boolean boolean6) {
+        final BlockPos.MutableBlockPos a8 = new BlockPos.MutableBlockPos();
+        final boolean boolean7 = cky.hatState.is(Blocks.NETHER_WART_BLOCK);
+        final int integer2 = Math.min(random.nextInt(1 + integer / 3) + 5, integer);
+        int integer4;
+        for (int integer3 = integer4 = integer - integer2; integer4 <= integer; ++integer4) {
+            int integer5 = (integer4 < integer - random.nextInt(3)) ? 2 : 1;
+            if (integer2 > 8 && integer4 < integer3 + 4) {
+                integer5 = 3;
+            }
+            if (boolean6) {
+                ++integer5;
+            }
+            for (int integer6 = -integer5; integer6 <= integer5; ++integer6) {
+                for (int integer7 = -integer5; integer7 <= integer5; ++integer7) {
+                    final boolean boolean8 = integer6 == -integer5 || integer6 == integer5;
+                    final boolean boolean9 = integer7 == -integer5 || integer7 == integer5;
+                    final boolean boolean10 = !boolean8 && !boolean9 && integer4 != integer;
+                    final boolean boolean11 = boolean8 && boolean9;
+                    final boolean boolean12 = integer4 < integer3 + 3;
+                    a8.setWithOffset(fu, integer6, integer4, integer7);
+                    if (isReplaceable(bqc, a8, false)) {
+                        if (cky.planted && !bqc.getBlockState(a8.below()).isAir()) {
+                            bqc.destroyBlock(a8, true);
+                        }
+                        if (boolean12) {
+                            if (!boolean10) {
+                                this.placeHatDropBlock(bqc, random, a8, cky.hatState, boolean7);
+                            }
+                        }
+                        else if (boolean10) {
+                            this.placeHatBlock(bqc, random, cky, a8, 0.1f, 0.2f, boolean7 ? 0.1f : 0.0f);
+                        }
+                        else if (boolean11) {
+                            this.placeHatBlock(bqc, random, cky, a8, 0.01f, 0.7f, boolean7 ? 0.083f : 0.0f);
+                        }
+                        else {
+                            this.placeHatBlock(bqc, random, cky, a8, 5.0E-4f, 0.98f, boolean7 ? 0.07f : 0.0f);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    private void placeHatBlock(final LevelAccessor bqc, final Random random, final HugeFungusConfiguration cky, final BlockPos.MutableBlockPos a, final float float5, final float float6, final float float7) {
+        if (random.nextFloat() < float5) {
+            this.setBlock(bqc, a, cky.decorState);
+        }
+        else if (random.nextFloat() < float6) {
+            this.setBlock(bqc, a, cky.hatState);
+            if (random.nextFloat() < float7) {
+                tryPlaceWeepingVines(a, bqc, random);
+            }
+        }
+    }
+    
+    private void placeHatDropBlock(final LevelAccessor bqc, final Random random, final BlockPos fu, final BlockState cfj, final boolean boolean5) {
+        if (bqc.getBlockState(fu.below()).is(cfj.getBlock())) {
+            this.setBlock(bqc, fu, cfj);
+        }
+        else if (random.nextFloat() < 0.15) {
+            this.setBlock(bqc, fu, cfj);
+            if (boolean5 && random.nextInt(11) == 0) {
+                tryPlaceWeepingVines(fu, bqc, random);
+            }
+        }
+    }
+    
+    @Nullable
+    private static BlockPos.MutableBlockPos findOnNyliumPosition(final LevelAccessor bqc, final BlockPos fu, final Block bvr) {
+        final BlockPos.MutableBlockPos a4 = fu.mutable();
+        for (int integer5 = fu.getY(); integer5 >= 1; --integer5) {
+            a4.setY(integer5);
+            final Block bvr2 = bqc.getBlockState(a4.below()).getBlock();
+            if (bvr2 == bvr) {
+                return a4;
+            }
+        }
+        return null;
+    }
+    
+    private static void tryPlaceWeepingVines(final BlockPos fu, final LevelAccessor bqc, final Random random) {
+        final BlockPos.MutableBlockPos a4 = fu.mutable().move(Direction.DOWN);
+        if (!bqc.isEmptyBlock(a4)) {
+            return;
+        }
+        int integer5 = Mth.nextInt(random, 1, 5);
+        if (random.nextInt(7) == 0) {
+            integer5 *= 2;
+        }
+        final int integer6 = 23;
+        final int integer7 = 25;
+        WeepingVinesFeature.placeWeepingVinesColumn(bqc, random, a4, integer5, 23, 25);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/HugeRedMushroomFeature.java b/src/net/minecraft/world/level/levelgen/feature/HugeRedMushroomFeature.java
index 7fa84fb..85ee633 100644
--- a/src/net/minecraft/world/level/levelgen/feature/HugeRedMushroomFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/HugeRedMushroomFeature.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.LevelWriter;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.HugeMushroomBlock;
@@ -11,19 +11,18 @@ import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class HugeRedMushroomFeature extends AbstractHugeMushroomFeature {
-    public HugeRedMushroomFeature(final Function<Dynamic<?>, ? extends HugeMushroomFeatureConfiguration> function) {
-        super(function);
+    public HugeRedMushroomFeature(final Codec<HugeMushroomFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    protected void makeCap(final LevelAccessor bjx, final Random random, final BlockPos fk, final int integer, final BlockPos.MutableBlockPos a, final HugeMushroomFeatureConfiguration cgp) {
+    protected void makeCap(final LevelAccessor bqc, final Random random, final BlockPos fu, final int integer, final BlockPos.MutableBlockPos a, final HugeMushroomFeatureConfiguration cnt) {
         for (int integer2 = integer - 3; integer2 <= integer; ++integer2) {
-            final int integer3 = (integer2 < integer) ? cgp.foliageRadius : (cgp.foliageRadius - 1);
-            final int integer4 = cgp.foliageRadius - 2;
+            final int integer3 = (integer2 < integer) ? cnt.foliageRadius : (cnt.foliageRadius - 1);
+            final int integer4 = cnt.foliageRadius - 2;
             for (int integer5 = -integer3; integer5 <= integer3; ++integer5) {
                 for (int integer6 = -integer3; integer6 <= integer3; ++integer6) {
                     final boolean boolean13 = integer5 == -integer3;
@@ -33,9 +32,9 @@ public class HugeRedMushroomFeature extends AbstractHugeMushroomFeature {
                     final boolean boolean17 = boolean13 || boolean14;
                     final boolean boolean18 = boolean15 || boolean16;
                     if (integer2 >= integer || boolean17 != boolean18) {
-                        a.set(fk).move(integer5, integer2, integer6);
-                        if (!bjx.getBlockState(a).isSolidRender(bjx, a)) {
-                            this.setBlock(bjx, a, ((((((AbstractStateHolder<O, BlockState>)cgp.capProvider.getState(random, fk)).setValue((Property<Comparable>)HugeMushroomBlock.UP, integer2 >= integer - 1)).setValue((Property<Comparable>)HugeMushroomBlock.WEST, integer5 < -integer4)).setValue((Property<Comparable>)HugeMushroomBlock.EAST, integer5 > integer4)).setValue((Property<Comparable>)HugeMushroomBlock.NORTH, integer6 < -integer4)).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.SOUTH, integer6 > integer4));
+                        a.setWithOffset(fu, integer5, integer2, integer6);
+                        if (!bqc.getBlockState(a).isSolidRender(bqc, a)) {
+                            this.setBlock(bqc, a, ((((((StateHolder<O, BlockState>)cnt.capProvider.getState(random, fu)).setValue((Property<Comparable>)HugeMushroomBlock.UP, integer2 >= integer - 1)).setValue((Property<Comparable>)HugeMushroomBlock.WEST, integer5 < -integer4)).setValue((Property<Comparable>)HugeMushroomBlock.EAST, integer5 > integer4)).setValue((Property<Comparable>)HugeMushroomBlock.NORTH, integer6 < -integer4)).<Comparable, Boolean>setValue((Property<Comparable>)HugeMushroomBlock.SOUTH, integer6 > integer4));
                         }
                     }
                 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/IcePatchFeature.java b/src/net/minecraft/world/level/levelgen/feature/IcePatchFeature.java
index 537c0e2..d2296d4 100644
--- a/src/net/minecraft/world/level/levelgen/feature/IcePatchFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/IcePatchFeature.java
@@ -3,43 +3,42 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Blocks;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureRadiusConfiguration;
 
 public class IcePatchFeature extends Feature<FeatureRadiusConfiguration> {
     private final Block block;
     
-    public IcePatchFeature(final Function<Dynamic<?>, ? extends FeatureRadiusConfiguration> function) {
-        super(function);
+    public IcePatchFeature(final Codec<FeatureRadiusConfiguration> codec) {
+        super(codec);
         this.block = Blocks.PACKED_ICE;
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, BlockPos fk, final FeatureRadiusConfiguration cgo) {
-        while (bjx.isEmptyBlock(fk) && fk.getY() > 2) {
-            fk = fk.below();
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, BlockPos fu, final FeatureRadiusConfiguration cns) {
+        while (bqu.isEmptyBlock(fu) && fu.getY() > 2) {
+            fu = fu.below();
         }
-        if (bjx.getBlockState(fk).getBlock() != Blocks.SNOW_BLOCK) {
+        if (!bqu.getBlockState(fu).is(Blocks.SNOW_BLOCK)) {
             return false;
         }
-        final int integer7 = random.nextInt(cgo.radius) + 2;
-        final int integer8 = 1;
-        for (int integer9 = fk.getX() - integer7; integer9 <= fk.getX() + integer7; ++integer9) {
-            for (int integer10 = fk.getZ() - integer7; integer10 <= fk.getZ() + integer7; ++integer10) {
-                final int integer11 = integer9 - fk.getX();
-                final int integer12 = integer10 - fk.getZ();
-                if (integer11 * integer11 + integer12 * integer12 <= integer7 * integer7) {
-                    for (int integer13 = fk.getY() - 1; integer13 <= fk.getY() + 1; ++integer13) {
-                        final BlockPos fk2 = new BlockPos(integer9, integer13, integer10);
-                        final Block bph15 = bjx.getBlockState(fk2).getBlock();
-                        if (Feature.isDirt(bph15) || bph15 == Blocks.SNOW_BLOCK || bph15 == Blocks.ICE) {
-                            bjx.setBlock(fk2, this.block.defaultBlockState(), 2);
+        final int integer8 = random.nextInt(cns.radius) + 2;
+        final int integer9 = 1;
+        for (int integer10 = fu.getX() - integer8; integer10 <= fu.getX() + integer8; ++integer10) {
+            for (int integer11 = fu.getZ() - integer8; integer11 <= fu.getZ() + integer8; ++integer11) {
+                final int integer12 = integer10 - fu.getX();
+                final int integer13 = integer11 - fu.getZ();
+                if (integer12 * integer12 + integer13 * integer13 <= integer8 * integer8) {
+                    for (int integer14 = fu.getY() - 1; integer14 <= fu.getY() + 1; ++integer14) {
+                        final BlockPos fu2 = new BlockPos(integer10, integer14, integer11);
+                        final Block bvr16 = bqu.getBlockState(fu2).getBlock();
+                        if (Feature.isDirt(bvr16) || bvr16 == Blocks.SNOW_BLOCK || bvr16 == Blocks.ICE) {
+                            bqu.setBlock(fu2, this.block.defaultBlockState(), 2);
                         }
                     }
                 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/IceSpikeFeature.java b/src/net/minecraft/world/level/levelgen/feature/IceSpikeFeature.java
index cee5310..53b46e1 100644
--- a/src/net/minecraft/world/level/levelgen/feature/IceSpikeFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/IceSpikeFeature.java
@@ -8,50 +8,49 @@ import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class IceSpikeFeature extends Feature<NoneFeatureConfiguration> {
-    public IceSpikeFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public IceSpikeFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, BlockPos fk, final NoneFeatureConfiguration cgv) {
-        while (bjx.isEmptyBlock(fk) && fk.getY() > 2) {
-            fk = fk.below();
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, BlockPos fu, final NoneFeatureConfiguration coa) {
+        while (bqu.isEmptyBlock(fu) && fu.getY() > 2) {
+            fu = fu.below();
         }
-        if (bjx.getBlockState(fk).getBlock() != Blocks.SNOW_BLOCK) {
+        if (!bqu.getBlockState(fu).is(Blocks.SNOW_BLOCK)) {
             return false;
         }
-        fk = fk.above(random.nextInt(4));
-        final int integer7 = random.nextInt(4) + 7;
-        final int integer8 = integer7 / 4 + random.nextInt(2);
-        if (integer8 > 1 && random.nextInt(60) == 0) {
-            fk = fk.above(10 + random.nextInt(30));
+        fu = fu.above(random.nextInt(4));
+        final int integer8 = random.nextInt(4) + 7;
+        final int integer9 = integer8 / 4 + random.nextInt(2);
+        if (integer9 > 1 && random.nextInt(60) == 0) {
+            fu = fu.above(10 + random.nextInt(30));
         }
-        for (int integer9 = 0; integer9 < integer7; ++integer9) {
-            final float float10 = (1.0f - integer9 / (float)integer7) * integer8;
-            for (int integer10 = Mth.ceil(float10), integer11 = -integer10; integer11 <= integer10; ++integer11) {
-                final float float11 = Mth.abs(integer11) - 0.25f;
-                for (int integer12 = -integer10; integer12 <= integer10; ++integer12) {
-                    final float float12 = Mth.abs(integer12) - 0.25f;
-                    if ((integer11 == 0 && integer12 == 0) || float11 * float11 + float12 * float12 <= float10 * float10) {
-                        if ((integer11 != -integer10 && integer11 != integer10 && integer12 != -integer10 && integer12 != integer10) || random.nextFloat() <= 0.75f) {
-                            BlockState byj16 = bjx.getBlockState(fk.offset(integer11, integer9, integer12));
-                            Block bph17 = byj16.getBlock();
-                            if (byj16.isAir() || Feature.isDirt(bph17) || bph17 == Blocks.SNOW_BLOCK || bph17 == Blocks.ICE) {
-                                this.setBlock(bjx, fk.offset(integer11, integer9, integer12), Blocks.PACKED_ICE.defaultBlockState());
+        for (int integer10 = 0; integer10 < integer8; ++integer10) {
+            final float float11 = (1.0f - integer10 / (float)integer8) * integer9;
+            for (int integer11 = Mth.ceil(float11), integer12 = -integer11; integer12 <= integer11; ++integer12) {
+                final float float12 = Mth.abs(integer12) - 0.25f;
+                for (int integer13 = -integer11; integer13 <= integer11; ++integer13) {
+                    final float float13 = Mth.abs(integer13) - 0.25f;
+                    if ((integer12 == 0 && integer13 == 0) || float12 * float12 + float13 * float13 <= float11 * float11) {
+                        if ((integer12 != -integer11 && integer12 != integer11 && integer13 != -integer11 && integer13 != integer11) || random.nextFloat() <= 0.75f) {
+                            BlockState cfj17 = bqu.getBlockState(fu.offset(integer12, integer10, integer13));
+                            Block bvr18 = cfj17.getBlock();
+                            if (cfj17.isAir() || Feature.isDirt(bvr18) || bvr18 == Blocks.SNOW_BLOCK || bvr18 == Blocks.ICE) {
+                                this.setBlock(bqu, fu.offset(integer12, integer10, integer13), Blocks.PACKED_ICE.defaultBlockState());
                             }
-                            if (integer9 != 0 && integer10 > 1) {
-                                byj16 = bjx.getBlockState(fk.offset(integer11, -integer9, integer12));
-                                bph17 = byj16.getBlock();
-                                if (byj16.isAir() || Feature.isDirt(bph17) || bph17 == Blocks.SNOW_BLOCK || bph17 == Blocks.ICE) {
-                                    this.setBlock(bjx, fk.offset(integer11, -integer9, integer12), Blocks.PACKED_ICE.defaultBlockState());
+                            if (integer10 != 0 && integer11 > 1) {
+                                cfj17 = bqu.getBlockState(fu.offset(integer12, -integer10, integer13));
+                                bvr18 = cfj17.getBlock();
+                                if (cfj17.isAir() || Feature.isDirt(bvr18) || bvr18 == Blocks.SNOW_BLOCK || bvr18 == Blocks.ICE) {
+                                    this.setBlock(bqu, fu.offset(integer12, -integer10, integer13), Blocks.PACKED_ICE.defaultBlockState());
                                 }
                             }
                         }
@@ -59,33 +58,33 @@ public class IceSpikeFeature extends Feature<NoneFeatureConfiguration> {
                 }
             }
         }
-        int integer9 = integer8 - 1;
-        if (integer9 < 0) {
-            integer9 = 0;
+        int integer10 = integer9 - 1;
+        if (integer10 < 0) {
+            integer10 = 0;
         }
-        else if (integer9 > 1) {
-            integer9 = 1;
+        else if (integer10 > 1) {
+            integer10 = 1;
         }
-        for (int integer13 = -integer9; integer13 <= integer9; ++integer13) {
-            for (int integer10 = -integer9; integer10 <= integer9; ++integer10) {
-                BlockPos fk2 = fk.offset(integer13, -1, integer10);
-                int integer14 = 50;
-                if (Math.abs(integer13) == 1 && Math.abs(integer10) == 1) {
-                    integer14 = random.nextInt(5);
+        for (int integer14 = -integer10; integer14 <= integer10; ++integer14) {
+            for (int integer11 = -integer10; integer11 <= integer10; ++integer11) {
+                BlockPos fu2 = fu.offset(integer14, -1, integer11);
+                int integer15 = 50;
+                if (Math.abs(integer14) == 1 && Math.abs(integer11) == 1) {
+                    integer15 = random.nextInt(5);
                 }
-                while (fk2.getY() > 50) {
-                    final BlockState byj17 = bjx.getBlockState(fk2);
-                    final Block bph18 = byj17.getBlock();
-                    if (!byj17.isAir() && !Feature.isDirt(bph18) && bph18 != Blocks.SNOW_BLOCK && bph18 != Blocks.ICE && bph18 != Blocks.PACKED_ICE) {
+                while (fu2.getY() > 50) {
+                    final BlockState cfj18 = bqu.getBlockState(fu2);
+                    final Block bvr19 = cfj18.getBlock();
+                    if (!cfj18.isAir() && !Feature.isDirt(bvr19) && bvr19 != Blocks.SNOW_BLOCK && bvr19 != Blocks.ICE && bvr19 != Blocks.PACKED_ICE) {
                         break;
                     }
-                    this.setBlock(bjx, fk2, Blocks.PACKED_ICE.defaultBlockState());
-                    fk2 = fk2.below();
-                    if (--integer14 > 0) {
+                    this.setBlock(bqu, fu2, Blocks.PACKED_ICE.defaultBlockState());
+                    fu2 = fu2.below();
+                    if (--integer15 > 0) {
                         continue;
                     }
-                    fk2 = fk2.below(random.nextInt(5) + 1);
-                    integer14 = random.nextInt(5);
+                    fu2 = fu2.below(random.nextInt(5) + 1);
+                    integer15 = random.nextInt(5);
                 }
             }
         }
diff --git a/src/net/minecraft/world/level/levelgen/feature/IcebergFeature.java b/src/net/minecraft/world/level/levelgen/feature/IcebergFeature.java
index 37eee33..251cc62 100644
--- a/src/net/minecraft/world/level/levelgen/feature/IcebergFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/IcebergFeature.java
@@ -8,67 +8,67 @@ import net.minecraft.world.level.LevelWriter;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.util.Mth;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration;
 
 public class IcebergFeature extends Feature<BlockStateConfiguration> {
-    public IcebergFeature(final Function<Dynamic<?>, ? extends BlockStateConfiguration> function) {
-        super(function);
+    public IcebergFeature(final Codec<BlockStateConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, BlockPos fk, final BlockStateConfiguration cge) {
-        fk = new BlockPos(fk.getX(), bjx.getSeaLevel(), fk.getZ());
-        final boolean boolean7 = random.nextDouble() > 0.7;
-        final BlockState byj8 = cge.state;
-        final double double9 = random.nextDouble() * 2.0 * 3.141592653589793;
-        final int integer11 = 11 - random.nextInt(5);
-        final int integer12 = 3 + random.nextInt(3);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, BlockPos fu, final BlockStateConfiguration cng) {
+        fu = new BlockPos(fu.getX(), cha.getSeaLevel(), fu.getZ());
         final boolean boolean8 = random.nextDouble() > 0.7;
-        final int integer13 = 11;
-        int integer14 = boolean8 ? (random.nextInt(6) + 6) : (random.nextInt(15) + 3);
-        if (!boolean8 && random.nextDouble() > 0.9) {
-            integer14 += random.nextInt(19) + 7;
+        final BlockState cfj9 = cng.state;
+        final double double10 = random.nextDouble() * 2.0 * 3.141592653589793;
+        final int integer12 = 11 - random.nextInt(5);
+        final int integer13 = 3 + random.nextInt(3);
+        final boolean boolean9 = random.nextDouble() > 0.7;
+        final int integer14 = 11;
+        int integer15 = boolean9 ? (random.nextInt(6) + 6) : (random.nextInt(15) + 3);
+        if (!boolean9 && random.nextDouble() > 0.9) {
+            integer15 += random.nextInt(19) + 7;
         }
-        final int integer15 = Math.min(integer14 + random.nextInt(11), 18);
-        final int integer16 = Math.min(integer14 + random.nextInt(7) - random.nextInt(5), 11);
-        final int integer17 = boolean8 ? integer11 : 11;
-        for (int integer18 = -integer17; integer18 < integer17; ++integer18) {
-            for (int integer19 = -integer17; integer19 < integer17; ++integer19) {
-                for (int integer20 = 0; integer20 < integer14; ++integer20) {
-                    final int integer21 = boolean8 ? this.heightDependentRadiusEllipse(integer20, integer14, integer16) : this.heightDependentRadiusRound(random, integer20, integer14, integer16);
-                    if (boolean8 || integer18 < integer21) {
-                        this.generateIcebergBlock(bjx, random, fk, integer14, integer18, integer20, integer19, integer21, integer17, boolean8, integer12, double9, boolean7, byj8);
+        final int integer16 = Math.min(integer15 + random.nextInt(11), 18);
+        final int integer17 = Math.min(integer15 + random.nextInt(7) - random.nextInt(5), 11);
+        final int integer18 = boolean9 ? integer12 : 11;
+        for (int integer19 = -integer18; integer19 < integer18; ++integer19) {
+            for (int integer20 = -integer18; integer20 < integer18; ++integer20) {
+                for (int integer21 = 0; integer21 < integer15; ++integer21) {
+                    final int integer22 = boolean9 ? this.heightDependentRadiusEllipse(integer21, integer15, integer17) : this.heightDependentRadiusRound(random, integer21, integer15, integer17);
+                    if (boolean9 || integer19 < integer22) {
+                        this.generateIcebergBlock(bqu, random, fu, integer15, integer19, integer21, integer20, integer22, integer18, boolean9, integer13, double10, boolean8, cfj9);
                     }
                 }
             }
         }
-        this.smooth(bjx, fk, integer16, integer14, boolean8, integer11);
-        for (int integer18 = -integer17; integer18 < integer17; ++integer18) {
-            for (int integer19 = -integer17; integer19 < integer17; ++integer19) {
-                for (int integer20 = -1; integer20 > -integer15; --integer20) {
-                    final int integer21 = boolean8 ? Mth.ceil(integer17 * (1.0f - (float)Math.pow(integer20, 2.0) / (integer15 * 8.0f))) : integer17;
-                    final int integer22 = this.heightDependentRadiusSteep(random, -integer20, integer15, integer16);
-                    if (integer18 < integer22) {
-                        this.generateIcebergBlock(bjx, random, fk, integer15, integer18, integer20, integer19, integer22, integer21, boolean8, integer12, double9, boolean7, byj8);
+        this.smooth(bqu, fu, integer17, integer15, boolean9, integer12);
+        for (int integer19 = -integer18; integer19 < integer18; ++integer19) {
+            for (int integer20 = -integer18; integer20 < integer18; ++integer20) {
+                for (int integer21 = -1; integer21 > -integer16; --integer21) {
+                    final int integer22 = boolean9 ? Mth.ceil(integer18 * (1.0f - (float)Math.pow(integer21, 2.0) / (integer16 * 8.0f))) : integer18;
+                    final int integer23 = this.heightDependentRadiusSteep(random, -integer21, integer16, integer17);
+                    if (integer19 < integer23) {
+                        this.generateIcebergBlock(bqu, random, fu, integer16, integer19, integer21, integer20, integer23, integer22, boolean9, integer13, double10, boolean8, cfj9);
                     }
                 }
             }
         }
-        final boolean boolean9 = boolean8 ? (random.nextDouble() > 0.1) : (random.nextDouble() > 0.7);
-        if (boolean9) {
-            this.generateCutOut(random, bjx, integer16, integer14, fk, boolean8, integer11, double9, integer12);
+        final boolean boolean10 = boolean9 ? (random.nextDouble() > 0.1) : (random.nextDouble() > 0.7);
+        if (boolean10) {
+            this.generateCutOut(random, bqu, integer17, integer15, fu, boolean9, integer12, double10, integer13);
         }
         return true;
     }
     
-    private void generateCutOut(final Random random, final LevelAccessor bjx, final int integer3, final int integer4, final BlockPos fk, final boolean boolean6, final int integer7, final double double8, final int integer9) {
+    private void generateCutOut(final Random random, final LevelAccessor bqc, final int integer3, final int integer4, final BlockPos fu, final boolean boolean6, final int integer7, final double double8, final int integer9) {
         final int integer10 = random.nextBoolean() ? -1 : 1;
         final int integer11 = random.nextBoolean() ? -1 : 1;
         int integer12 = random.nextInt(Math.max(integer3 / 2 - 2, 1));
@@ -82,34 +82,34 @@ public class IcebergFeature extends Feature<BlockStateConfiguration> {
         if (boolean6) {
             integer13 = (integer12 = random.nextInt(Math.max(integer7 - 5, 1)));
         }
-        final BlockPos fk2 = new BlockPos(integer10 * integer12, 0, integer11 * integer13);
+        final BlockPos fu2 = new BlockPos(integer10 * integer12, 0, integer11 * integer13);
         final double double9 = boolean6 ? (double8 + 1.5707963267948966) : (random.nextDouble() * 2.0 * 3.141592653589793);
         for (int integer14 = 0; integer14 < integer4 - 3; ++integer14) {
             final int integer15 = this.heightDependentRadiusRound(random, integer14, integer4, integer3);
-            this.carve(integer15, integer14, fk, bjx, false, double9, fk2, integer7, integer9);
+            this.carve(integer15, integer14, fu, bqc, false, double9, fu2, integer7, integer9);
         }
         for (int integer14 = -1; integer14 > -integer4 + random.nextInt(5); --integer14) {
             final int integer15 = this.heightDependentRadiusSteep(random, -integer14, integer4, integer3);
-            this.carve(integer15, integer14, fk, bjx, true, double9, fk2, integer7, integer9);
+            this.carve(integer15, integer14, fu, bqc, true, double9, fu2, integer7, integer9);
         }
     }
     
-    private void carve(final int integer1, final int integer2, final BlockPos fk3, final LevelAccessor bjx, final boolean boolean5, final double double6, final BlockPos fk7, final int integer8, final int integer9) {
+    private void carve(final int integer1, final int integer2, final BlockPos fu3, final LevelAccessor bqc, final boolean boolean5, final double double6, final BlockPos fu7, final int integer8, final int integer9) {
         final int integer10 = integer1 + 1 + integer8 / 3;
         final int integer11 = Math.min(integer1 - 3, 3) + integer9 / 2 - 1;
         for (int integer12 = -integer10; integer12 < integer10; ++integer12) {
             for (int integer13 = -integer10; integer13 < integer10; ++integer13) {
-                final double double7 = this.signedDistanceEllipse(integer12, integer13, fk7, integer10, integer11, double6);
+                final double double7 = this.signedDistanceEllipse(integer12, integer13, fu7, integer10, integer11, double6);
                 if (double7 < 0.0) {
-                    final BlockPos fk8 = fk3.offset(integer12, integer2, integer13);
-                    final Block bph19 = bjx.getBlockState(fk8).getBlock();
-                    if (this.isIcebergBlock(bph19) || bph19 == Blocks.SNOW_BLOCK) {
+                    final BlockPos fu8 = fu3.offset(integer12, integer2, integer13);
+                    final Block bvr19 = bqc.getBlockState(fu8).getBlock();
+                    if (this.isIcebergBlock(bvr19) || bvr19 == Blocks.SNOW_BLOCK) {
                         if (boolean5) {
-                            this.setBlock(bjx, fk8, Blocks.WATER.defaultBlockState());
+                            this.setBlock(bqc, fu8, Blocks.WATER.defaultBlockState());
                         }
                         else {
-                            this.setBlock(bjx, fk8, Blocks.AIR.defaultBlockState());
-                            this.removeFloatingSnowLayer(bjx, fk8);
+                            this.setBlock(bqc, fu8, Blocks.AIR.defaultBlockState());
+                            this.removeFloatingSnowLayer(bqc, fu8);
                         }
                     }
                 }
@@ -117,35 +117,34 @@ public class IcebergFeature extends Feature<BlockStateConfiguration> {
         }
     }
     
-    private void removeFloatingSnowLayer(final LevelAccessor bjx, final BlockPos fk) {
-        if (bjx.getBlockState(fk.above()).getBlock() == Blocks.SNOW) {
-            this.setBlock(bjx, fk.above(), Blocks.AIR.defaultBlockState());
+    private void removeFloatingSnowLayer(final LevelAccessor bqc, final BlockPos fu) {
+        if (bqc.getBlockState(fu.above()).is(Blocks.SNOW)) {
+            this.setBlock(bqc, fu.above(), Blocks.AIR.defaultBlockState());
         }
     }
     
-    private void generateIcebergBlock(final LevelAccessor bjx, final Random random, final BlockPos fk, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final boolean boolean10, final int integer11, final double double12, final boolean boolean13, final BlockState byj) {
+    private void generateIcebergBlock(final LevelAccessor bqc, final Random random, final BlockPos fu, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final boolean boolean10, final int integer11, final double double12, final boolean boolean13, final BlockState cfj) {
         final double double13 = boolean10 ? this.signedDistanceEllipse(integer5, integer7, BlockPos.ZERO, integer9, this.getEllipseC(integer6, integer4, integer11), double12) : this.signedDistanceCircle(integer5, integer7, BlockPos.ZERO, integer8, random);
         if (double13 < 0.0) {
-            final BlockPos fk2 = fk.offset(integer5, integer6, integer7);
+            final BlockPos fu2 = fu.offset(integer5, integer6, integer7);
             final double double14 = boolean10 ? -0.5 : (-6 - random.nextInt(3));
             if (double13 > double14 && random.nextDouble() > 0.9) {
                 return;
             }
-            this.setIcebergBlock(fk2, bjx, random, integer4 - integer6, integer4, boolean10, boolean13, byj);
+            this.setIcebergBlock(fu2, bqc, random, integer4 - integer6, integer4, boolean10, boolean13, cfj);
         }
     }
     
-    private void setIcebergBlock(final BlockPos fk, final LevelAccessor bjx, final Random random, final int integer4, final int integer5, final boolean boolean6, final boolean boolean7, final BlockState byj) {
-        final BlockState byj2 = bjx.getBlockState(fk);
-        final Block bph11 = byj2.getBlock();
-        if (byj2.getMaterial() == Material.AIR || bph11 == Blocks.SNOW_BLOCK || bph11 == Blocks.ICE || bph11 == Blocks.WATER) {
+    private void setIcebergBlock(final BlockPos fu, final LevelAccessor bqc, final Random random, final int integer4, final int integer5, final boolean boolean6, final boolean boolean7, final BlockState cfj) {
+        final BlockState cfj2 = bqc.getBlockState(fu);
+        if (cfj2.getMaterial() == Material.AIR || cfj2.is(Blocks.SNOW_BLOCK) || cfj2.is(Blocks.ICE) || cfj2.is(Blocks.WATER)) {
             final boolean boolean8 = !boolean6 || random.nextDouble() > 0.05;
             final int integer6 = boolean6 ? 3 : 2;
-            if (boolean7 && bph11 != Blocks.WATER && integer4 <= random.nextInt(Math.max(1, integer5 / integer6)) + integer5 * 0.6 && boolean8) {
-                this.setBlock(bjx, fk, Blocks.SNOW_BLOCK.defaultBlockState());
+            if (boolean7 && !cfj2.is(Blocks.WATER) && integer4 <= random.nextInt(Math.max(1, integer5 / integer6)) + integer5 * 0.6 && boolean8) {
+                this.setBlock(bqc, fu, Blocks.SNOW_BLOCK.defaultBlockState());
             }
             else {
-                this.setBlock(bjx, fk, byj);
+                this.setBlock(bqc, fu, cfj);
             }
         }
     }
@@ -158,13 +157,13 @@ public class IcebergFeature extends Feature<BlockStateConfiguration> {
         return integer4;
     }
     
-    private double signedDistanceCircle(final int integer1, final int integer2, final BlockPos fk, final int integer4, final Random random) {
+    private double signedDistanceCircle(final int integer1, final int integer2, final BlockPos fu, final int integer4, final Random random) {
         final float float7 = 10.0f * Mth.clamp(random.nextFloat(), 0.2f, 0.8f) / integer4;
-        return float7 + Math.pow(integer1 - fk.getX(), 2.0) + Math.pow(integer2 - fk.getZ(), 2.0) - Math.pow(integer4, 2.0);
+        return float7 + Math.pow(integer1 - fu.getX(), 2.0) + Math.pow(integer2 - fu.getZ(), 2.0) - Math.pow(integer4, 2.0);
     }
     
-    private double signedDistanceEllipse(final int integer1, final int integer2, final BlockPos fk, final int integer4, final int integer5, final double double6) {
-        return Math.pow(((integer1 - fk.getX()) * Math.cos(double6) - (integer2 - fk.getZ()) * Math.sin(double6)) / integer4, 2.0) + Math.pow(((integer1 - fk.getX()) * Math.sin(double6) + (integer2 - fk.getZ()) * Math.cos(double6)) / integer5, 2.0) - 1.0;
+    private double signedDistanceEllipse(final int integer1, final int integer2, final BlockPos fu, final int integer4, final int integer5, final double double6) {
+        return Math.pow(((integer1 - fu.getX()) * Math.cos(double6) - (integer2 - fu.getZ()) * Math.sin(double6)) / integer4, 2.0) + Math.pow(((integer1 - fu.getX()) * Math.sin(double6) + (integer2 - fu.getZ()) * Math.cos(double6)) / integer5, 2.0) - 1.0;
     }
     
     private int heightDependentRadiusRound(final Random random, final int integer2, final int integer3, final int integer4) {
@@ -189,35 +188,35 @@ public class IcebergFeature extends Feature<BlockStateConfiguration> {
         return Mth.ceil(float7 / 2.0f);
     }
     
-    private boolean isIcebergBlock(final Block bph) {
-        return bph == Blocks.PACKED_ICE || bph == Blocks.SNOW_BLOCK || bph == Blocks.BLUE_ICE;
+    private boolean isIcebergBlock(final Block bvr) {
+        return bvr == Blocks.PACKED_ICE || bvr == Blocks.SNOW_BLOCK || bvr == Blocks.BLUE_ICE;
     }
     
-    private boolean belowIsAir(final BlockGetter bjg, final BlockPos fk) {
-        return bjg.getBlockState(fk.below()).getMaterial() == Material.AIR;
+    private boolean belowIsAir(final BlockGetter bpg, final BlockPos fu) {
+        return bpg.getBlockState(fu.below()).getMaterial() == Material.AIR;
     }
     
-    private void smooth(final LevelAccessor bjx, final BlockPos fk, final int integer3, final int integer4, final boolean boolean5, final int integer6) {
+    private void smooth(final LevelAccessor bqc, final BlockPos fu, final int integer3, final int integer4, final boolean boolean5, final int integer6) {
         for (int integer7 = boolean5 ? integer6 : (integer3 / 2), integer8 = -integer7; integer8 <= integer7; ++integer8) {
             for (int integer9 = -integer7; integer9 <= integer7; ++integer9) {
                 for (int integer10 = 0; integer10 <= integer4; ++integer10) {
-                    final BlockPos fk2 = fk.offset(integer8, integer10, integer9);
-                    final Block bph13 = bjx.getBlockState(fk2).getBlock();
-                    if (this.isIcebergBlock(bph13) || bph13 == Blocks.SNOW) {
-                        if (this.belowIsAir(bjx, fk2)) {
-                            this.setBlock(bjx, fk2, Blocks.AIR.defaultBlockState());
-                            this.setBlock(bjx, fk2.above(), Blocks.AIR.defaultBlockState());
+                    final BlockPos fu2 = fu.offset(integer8, integer10, integer9);
+                    final Block bvr13 = bqc.getBlockState(fu2).getBlock();
+                    if (this.isIcebergBlock(bvr13) || bvr13 == Blocks.SNOW) {
+                        if (this.belowIsAir(bqc, fu2)) {
+                            this.setBlock(bqc, fu2, Blocks.AIR.defaultBlockState());
+                            this.setBlock(bqc, fu2.above(), Blocks.AIR.defaultBlockState());
                         }
-                        else if (this.isIcebergBlock(bph13)) {
-                            final Block[] arr14 = { bjx.getBlockState(fk2.west()).getBlock(), bjx.getBlockState(fk2.east()).getBlock(), bjx.getBlockState(fk2.north()).getBlock(), bjx.getBlockState(fk2.south()).getBlock() };
+                        else if (this.isIcebergBlock(bvr13)) {
+                            final Block[] arr14 = { bqc.getBlockState(fu2.west()).getBlock(), bqc.getBlockState(fu2.east()).getBlock(), bqc.getBlockState(fu2.north()).getBlock(), bqc.getBlockState(fu2.south()).getBlock() };
                             int integer11 = 0;
-                            for (final Block bph14 : arr14) {
-                                if (!this.isIcebergBlock(bph14)) {
+                            for (final Block bvr14 : arr14) {
+                                if (!this.isIcebergBlock(bvr14)) {
                                     ++integer11;
                                 }
                             }
                             if (integer11 >= 3) {
-                                this.setBlock(bjx, fk2, Blocks.AIR.defaultBlockState());
+                                this.setBlock(bqc, fu2, Blocks.AIR.defaultBlockState());
                             }
                         }
                     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/IglooFeature.java b/src/net/minecraft/world/level/levelgen/feature/IglooFeature.java
index aab70aa..12cb8b9 100644
--- a/src/net/minecraft/world/level/levelgen/feature/IglooFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/IglooFeature.java
@@ -1,7 +1,8 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import java.util.Random;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.structure.IglooPieces;
+import java.util.Random;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.biome.Biome;
@@ -9,48 +10,31 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
-public class IglooFeature extends RandomScatteredFeature<NoneFeatureConfiguration> {
-    public IglooFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+public class IglooFeature extends StructureFeature<NoneFeatureConfiguration> {
+    public IglooFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public String getFeatureName() {
-        return "Igloo";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 3;
-    }
-    
-    @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
         return FeatureStart::new;
     }
     
-    @Override
-    protected int getRandomSalt() {
-        return 14357618;
-    }
-    
-    public static class FeatureStart extends StructureStart {
-        public FeatureStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class FeatureStart extends StructureStart<NoneFeatureConfiguration> {
+        public FeatureStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final NoneFeatureConfiguration cgv7 = caa.<NoneFeatureConfiguration>getStructureConfiguration(bkt, Feature.IGLOO);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
             final int integer5 = integer3 * 16;
             final int integer6 = integer4 * 16;
-            final BlockPos fk10 = new BlockPos(integer5, 90, integer6);
-            final Rotation btu11 = Rotation.values()[this.random.nextInt(Rotation.values().length)];
-            IglooPieces.addPieces(cmo, fk10, btu11, this.pieces, this.random, cgv7);
+            final BlockPos fu10 = new BlockPos(integer5, 90, integer6);
+            final Rotation cap11 = Rotation.getRandom(this.random);
+            IglooPieces.addPieces(cva, fu10, cap11, this.pieces, this.random);
             this.calculateBoundingBox();
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/JunglePyramidFeature.java b/src/net/minecraft/world/level/levelgen/feature/JunglePyramidFeature.java
index e342534..a2a38c5 100644
--- a/src/net/minecraft/world/level/levelgen/feature/JunglePyramidFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/JunglePyramidFeature.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import java.util.Random;
 import net.minecraft.world.level.levelgen.structure.JunglePyramidPiece;
 import net.minecraft.world.level.biome.Biome;
@@ -7,44 +8,28 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
-public class JunglePyramidFeature extends RandomScatteredFeature<NoneFeatureConfiguration> {
-    public JunglePyramidFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+public class JunglePyramidFeature extends StructureFeature<NoneFeatureConfiguration> {
+    public JunglePyramidFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public String getFeatureName() {
-        return "Jungle_Pyramid";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 3;
-    }
-    
-    @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
         return FeatureStart::new;
     }
     
-    @Override
-    protected int getRandomSalt() {
-        return 14357619;
-    }
-    
-    public static class FeatureStart extends StructureStart {
-        public FeatureStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class FeatureStart extends StructureStart<NoneFeatureConfiguration> {
+        public FeatureStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final JunglePyramidPiece clg7 = new JunglePyramidPiece(this.random, integer3 * 16, integer4 * 16);
-            this.pieces.add(clg7);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
+            final JunglePyramidPiece cti8 = new JunglePyramidPiece(this.random, integer3 * 16, integer4 * 16);
+            this.pieces.add(cti8);
             this.calculateBoundingBox();
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/KelpFeature.java b/src/net/minecraft/world/level/levelgen/feature/KelpFeature.java
index bc585e0..f7737c5 100644
--- a/src/net/minecraft/world/level/levelgen/feature/KelpFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/KelpFeature.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.KelpBlock;
@@ -10,48 +10,47 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class KelpFeature extends Feature<NoneFeatureConfiguration> {
-    public KelpFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public KelpFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        int integer7 = 0;
-        final int integer8 = bjx.getHeight(Heightmap.Types.OCEAN_FLOOR, fk.getX(), fk.getZ());
-        BlockPos fk2 = new BlockPos(fk.getX(), integer8, fk.getZ());
-        if (bjx.getBlockState(fk2).getBlock() == Blocks.WATER) {
-            final BlockState byj10 = Blocks.KELP.defaultBlockState();
-            final BlockState byj11 = Blocks.KELP_PLANT.defaultBlockState();
-            for (int integer9 = 1 + random.nextInt(10), integer10 = 0; integer10 <= integer9; ++integer10) {
-                if (bjx.getBlockState(fk2).getBlock() == Blocks.WATER && bjx.getBlockState(fk2.above()).getBlock() == Blocks.WATER && byj11.canSurvive(bjx, fk2)) {
-                    if (integer10 == integer9) {
-                        bjx.setBlock(fk2, ((AbstractStateHolder<O, BlockState>)byj10).<Comparable, Integer>setValue((Property<Comparable>)KelpBlock.AGE, random.nextInt(4) + 20), 2);
-                        ++integer7;
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        int integer8 = 0;
+        final int integer9 = bqu.getHeight(Heightmap.Types.OCEAN_FLOOR, fu.getX(), fu.getZ());
+        BlockPos fu2 = new BlockPos(fu.getX(), integer9, fu.getZ());
+        if (bqu.getBlockState(fu2).is(Blocks.WATER)) {
+            final BlockState cfj11 = Blocks.KELP.defaultBlockState();
+            final BlockState cfj12 = Blocks.KELP_PLANT.defaultBlockState();
+            for (int integer10 = 1 + random.nextInt(10), integer11 = 0; integer11 <= integer10; ++integer11) {
+                if (bqu.getBlockState(fu2).is(Blocks.WATER) && bqu.getBlockState(fu2.above()).is(Blocks.WATER) && cfj12.canSurvive(bqu, fu2)) {
+                    if (integer11 == integer10) {
+                        bqu.setBlock(fu2, ((StateHolder<O, BlockState>)cfj11).<Comparable, Integer>setValue((Property<Comparable>)KelpBlock.AGE, random.nextInt(4) + 20), 2);
+                        ++integer8;
                     }
                     else {
-                        bjx.setBlock(fk2, byj11, 2);
+                        bqu.setBlock(fu2, cfj12, 2);
                     }
                 }
-                else if (integer10 > 0) {
-                    final BlockPos fk3 = fk2.below();
-                    if (byj10.canSurvive(bjx, fk3) && bjx.getBlockState(fk3.below()).getBlock() != Blocks.KELP) {
-                        bjx.setBlock(fk3, ((AbstractStateHolder<O, BlockState>)byj10).<Comparable, Integer>setValue((Property<Comparable>)KelpBlock.AGE, random.nextInt(4) + 20), 2);
-                        ++integer7;
+                else if (integer11 > 0) {
+                    final BlockPos fu3 = fu2.below();
+                    if (cfj11.canSurvive(bqu, fu3) && !bqu.getBlockState(fu3.below()).is(Blocks.KELP)) {
+                        bqu.setBlock(fu3, ((StateHolder<O, BlockState>)cfj11).<Comparable, Integer>setValue((Property<Comparable>)KelpBlock.AGE, random.nextInt(4) + 20), 2);
+                        ++integer8;
                         break;
                     }
                     break;
                 }
-                fk2 = fk2.above();
+                fu2 = fu2.above();
             }
         }
-        return integer7 > 0;
+        return integer8 > 0;
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/LakeFeature.java b/src/net/minecraft/world/level/levelgen/feature/LakeFeature.java
index 16adb27..da4d451 100644
--- a/src/net/minecraft/world/level/levelgen/feature/LakeFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/LakeFeature.java
@@ -6,36 +6,33 @@ import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.ChunkPos;
+import net.minecraft.core.SectionPos;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration;
 
 public class LakeFeature extends Feature<BlockStateConfiguration> {
     private static final BlockState AIR;
     
-    public LakeFeature(final Function<Dynamic<?>, ? extends BlockStateConfiguration> function) {
-        super(function);
+    public LakeFeature(final Codec<BlockStateConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, BlockPos fk, final BlockStateConfiguration cge) {
-        while (fk.getY() > 5 && bjx.isEmptyBlock(fk)) {
-            fk = fk.below();
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, BlockPos fu, final BlockStateConfiguration cng) {
+        while (fu.getY() > 5 && bqu.isEmptyBlock(fu)) {
+            fu = fu.below();
         }
-        if (fk.getY() <= 4) {
+        if (fu.getY() <= 4) {
             return false;
         }
-        fk = fk.below(4);
-        final ChunkPos bjh7 = new ChunkPos(fk);
-        if (!bjx.getChunk(bjh7.x, bjh7.z, ChunkStatus.STRUCTURE_REFERENCES).getReferencesForFeature(Feature.VILLAGE.getFeatureName()).isEmpty()) {
+        fu = fu.below(4);
+        if (bqq.startsForFeature(SectionPos.of(fu), StructureFeature.VILLAGE).findAny().isPresent()) {
             return false;
         }
         final boolean[] arr8 = new boolean[2048];
@@ -65,11 +62,11 @@ public class LakeFeature extends Feature<BlockStateConfiguration> {
                 for (int integer15 = 0; integer15 < 8; ++integer15) {
                     final boolean boolean13 = !arr8[(integer10 * 16 + integer14) * 8 + integer15] && ((integer10 < 15 && arr8[((integer10 + 1) * 16 + integer14) * 8 + integer15]) || (integer10 > 0 && arr8[((integer10 - 1) * 16 + integer14) * 8 + integer15]) || (integer14 < 15 && arr8[(integer10 * 16 + integer14 + 1) * 8 + integer15]) || (integer14 > 0 && arr8[(integer10 * 16 + (integer14 - 1)) * 8 + integer15]) || (integer15 < 7 && arr8[(integer10 * 16 + integer14) * 8 + integer15 + 1]) || (integer15 > 0 && arr8[(integer10 * 16 + integer14) * 8 + (integer15 - 1)]));
                     if (boolean13) {
-                        final Material coo14 = bjx.getBlockState(fk.offset(integer10, integer15, integer14)).getMaterial();
-                        if (integer15 >= 4 && coo14.isLiquid()) {
+                        final Material cxd14 = bqu.getBlockState(fu.offset(integer10, integer15, integer14)).getMaterial();
+                        if (integer15 >= 4 && cxd14.isLiquid()) {
                             return false;
                         }
-                        if (integer15 < 4 && !coo14.isSolid() && bjx.getBlockState(fk.offset(integer10, integer15, integer14)) != cge.state) {
+                        if (integer15 < 4 && !cxd14.isSolid() && bqu.getBlockState(fu.offset(integer10, integer15, integer14)) != cng.state) {
                             return false;
                         }
                     }
@@ -80,7 +77,7 @@ public class LakeFeature extends Feature<BlockStateConfiguration> {
             for (int integer14 = 0; integer14 < 16; ++integer14) {
                 for (int integer15 = 0; integer15 < 8; ++integer15) {
                     if (arr8[(integer10 * 16 + integer14) * 8 + integer15]) {
-                        bjx.setBlock(fk.offset(integer10, integer15, integer14), (integer15 >= 4) ? LakeFeature.AIR : cge.state, 2);
+                        bqu.setBlock(fu.offset(integer10, integer15, integer14), (integer15 >= 4) ? LakeFeature.AIR : cng.state, 2);
                     }
                 }
             }
@@ -89,39 +86,39 @@ public class LakeFeature extends Feature<BlockStateConfiguration> {
             for (int integer14 = 0; integer14 < 16; ++integer14) {
                 for (int integer15 = 4; integer15 < 8; ++integer15) {
                     if (arr8[(integer10 * 16 + integer14) * 8 + integer15]) {
-                        final BlockPos fk2 = fk.offset(integer10, integer15 - 1, integer14);
-                        if (Feature.isDirt(bjx.getBlockState(fk2).getBlock()) && bjx.getBrightness(LightLayer.SKY, fk.offset(integer10, integer15, integer14)) > 0) {
-                            final Biome bkt14 = bjx.getBiome(fk2);
-                            if (bkt14.getSurfaceBuilderConfig().getTopMaterial().getBlock() == Blocks.MYCELIUM) {
-                                bjx.setBlock(fk2, Blocks.MYCELIUM.defaultBlockState(), 2);
+                        final BlockPos fu2 = fu.offset(integer10, integer15 - 1, integer14);
+                        if (Feature.isDirt(bqu.getBlockState(fu2).getBlock()) && bqu.getBrightness(LightLayer.SKY, fu.offset(integer10, integer15, integer14)) > 0) {
+                            final Biome bre14 = bqu.getBiome(fu2);
+                            if (bre14.getSurfaceBuilderConfig().getTopMaterial().is(Blocks.MYCELIUM)) {
+                                bqu.setBlock(fu2, Blocks.MYCELIUM.defaultBlockState(), 2);
                             }
                             else {
-                                bjx.setBlock(fk2, Blocks.GRASS_BLOCK.defaultBlockState(), 2);
+                                bqu.setBlock(fu2, Blocks.GRASS_BLOCK.defaultBlockState(), 2);
                             }
                         }
                     }
                 }
             }
         }
-        if (cge.state.getMaterial() == Material.LAVA) {
+        if (cng.state.getMaterial() == Material.LAVA) {
             for (int integer10 = 0; integer10 < 16; ++integer10) {
                 for (int integer14 = 0; integer14 < 16; ++integer14) {
                     for (int integer15 = 0; integer15 < 8; ++integer15) {
                         final boolean boolean13 = !arr8[(integer10 * 16 + integer14) * 8 + integer15] && ((integer10 < 15 && arr8[((integer10 + 1) * 16 + integer14) * 8 + integer15]) || (integer10 > 0 && arr8[((integer10 - 1) * 16 + integer14) * 8 + integer15]) || (integer14 < 15 && arr8[(integer10 * 16 + integer14 + 1) * 8 + integer15]) || (integer14 > 0 && arr8[(integer10 * 16 + (integer14 - 1)) * 8 + integer15]) || (integer15 < 7 && arr8[(integer10 * 16 + integer14) * 8 + integer15 + 1]) || (integer15 > 0 && arr8[(integer10 * 16 + integer14) * 8 + (integer15 - 1)]));
-                        if (boolean13 && (integer15 < 4 || random.nextInt(2) != 0) && bjx.getBlockState(fk.offset(integer10, integer15, integer14)).getMaterial().isSolid()) {
-                            bjx.setBlock(fk.offset(integer10, integer15, integer14), Blocks.STONE.defaultBlockState(), 2);
+                        if (boolean13 && (integer15 < 4 || random.nextInt(2) != 0) && bqu.getBlockState(fu.offset(integer10, integer15, integer14)).getMaterial().isSolid()) {
+                            bqu.setBlock(fu.offset(integer10, integer15, integer14), Blocks.STONE.defaultBlockState(), 2);
                         }
                     }
                 }
             }
         }
-        if (cge.state.getMaterial() == Material.WATER) {
+        if (cng.state.getMaterial() == Material.WATER) {
             for (int integer10 = 0; integer10 < 16; ++integer10) {
                 for (int integer14 = 0; integer14 < 16; ++integer14) {
                     final int integer15 = 4;
-                    final BlockPos fk2 = fk.offset(integer10, 4, integer14);
-                    if (bjx.getBiome(fk2).shouldFreeze(bjx, fk2, false)) {
-                        bjx.setBlock(fk2, Blocks.ICE.defaultBlockState(), 2);
+                    final BlockPos fu2 = fu.offset(integer10, 4, integer14);
+                    if (bqu.getBiome(fu2).shouldFreeze(bqu, fu2, false)) {
+                        bqu.setBlock(fu2, Blocks.ICE.defaultBlockState(), 2);
                     }
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/feature/MegaJungleTreeFeature.java b/src/net/minecraft/world/level/levelgen/feature/MegaJungleTreeFeature.java
deleted file mode 100644
index 53843c0..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/MegaJungleTreeFeature.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package net.minecraft.world.level.levelgen.feature;
-
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.Set;
-import net.minecraft.core.BlockPos;
-import java.util.Random;
-import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration;
-
-public class MegaJungleTreeFeature extends MegaTreeFeature<MegaTreeConfiguration> {
-    public MegaJungleTreeFeature(final Function<Dynamic<?>, ? extends MegaTreeConfiguration> function) {
-        super(function);
-    }
-    
-    public boolean doPlace(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final Set<BlockPos> set4, final Set<BlockPos> set5, final BoundingBox clb, final MegaTreeConfiguration cgr) {
-        final int integer9 = this.calcTreeHeigth(random, cgr);
-        if (!this.prepareTree(bkb, fk, integer9)) {
-            return false;
-        }
-        this.createCrown(bkb, random, fk.above(integer9), 2, set5, clb, cgr);
-        for (int integer10 = fk.getY() + integer9 - 2 - random.nextInt(4); integer10 > fk.getY() + integer9 / 2; integer10 -= 2 + random.nextInt(4)) {
-            final float float11 = random.nextFloat() * 6.2831855f;
-            int integer11 = fk.getX() + (int)(0.5f + Mth.cos(float11) * 4.0f);
-            int integer12 = fk.getZ() + (int)(0.5f + Mth.sin(float11) * 4.0f);
-            for (int integer13 = 0; integer13 < 5; ++integer13) {
-                integer11 = fk.getX() + (int)(1.5f + Mth.cos(float11) * integer13);
-                integer12 = fk.getZ() + (int)(1.5f + Mth.sin(float11) * integer13);
-                final BlockPos fk2 = new BlockPos(integer11, integer10 - 3 + integer13 / 2, integer12);
-                this.placeLog(bkb, random, fk2, set4, clb, cgr);
-            }
-            int integer13 = 1 + random.nextInt(2);
-            for (int integer14 = integer10, integer15 = integer14 - integer13; integer15 <= integer14; ++integer15) {
-                final int integer16 = integer15 - integer14;
-                this.placeSingleTrunkLeaves(bkb, random, new BlockPos(integer11, integer15, integer12), 1 - integer16, set5, clb, cgr);
-            }
-        }
-        this.placeTrunk(bkb, random, fk, integer9, set4, clb, cgr);
-        return true;
-    }
-    
-    private void createCrown(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final int integer, final Set<BlockPos> set, final BoundingBox clb, final TreeConfiguration chl) {
-        final int integer2 = 2;
-        for (int integer3 = -2; integer3 <= 0; ++integer3) {
-            this.placeDoubleTrunkLeaves(bkb, random, fk.above(integer3), integer + 1 - integer3, set, clb, chl);
-        }
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/MegaPineTreeFeature.java b/src/net/minecraft/world/level/levelgen/feature/MegaPineTreeFeature.java
deleted file mode 100644
index b18d492..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/MegaPineTreeFeature.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.minecraft.world.level.levelgen.feature;
-
-import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.Set;
-import net.minecraft.core.BlockPos;
-import java.util.Random;
-import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration;
-
-public class MegaPineTreeFeature extends MegaTreeFeature<MegaTreeConfiguration> {
-    public MegaPineTreeFeature(final Function<Dynamic<?>, ? extends MegaTreeConfiguration> function) {
-        super(function);
-    }
-    
-    public boolean doPlace(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final Set<BlockPos> set4, final Set<BlockPos> set5, final BoundingBox clb, final MegaTreeConfiguration cgr) {
-        final int integer9 = this.calcTreeHeigth(random, cgr);
-        if (!this.prepareTree(bkb, fk, integer9)) {
-            return false;
-        }
-        this.createCrown(bkb, random, fk.getX(), fk.getZ(), fk.getY() + integer9, 0, set5, clb, cgr);
-        this.placeTrunk(bkb, random, fk, integer9, set4, clb, cgr);
-        return true;
-    }
-    
-    private void createCrown(final LevelSimulatedRW bkb, final Random random, final int integer3, final int integer4, final int integer5, final int integer6, final Set<BlockPos> set, final BoundingBox clb, final MegaTreeConfiguration cgr) {
-        final int integer7 = random.nextInt(5) + cgr.crownHeight;
-        int integer8 = 0;
-        for (int integer9 = integer5 - integer7; integer9 <= integer5; ++integer9) {
-            final int integer10 = integer5 - integer9;
-            final int integer11 = integer6 + Mth.floor(integer10 / (float)integer7 * 3.5f);
-            this.placeDoubleTrunkLeaves(bkb, random, new BlockPos(integer3, integer9, integer4), integer11 + ((integer10 > 0 && integer11 == integer8 && (integer9 & 0x1) == 0x0) ? 1 : 0), set, clb, cgr);
-            integer8 = integer11;
-        }
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.java b/src/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.java
deleted file mode 100644
index 8734701..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package net.minecraft.world.level.levelgen.feature;
-
-import net.minecraft.core.Vec3i;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.Set;
-import net.minecraft.world.level.LevelSimulatedRW;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.levelgen.feature.configurations.MegaTreeConfiguration;
-import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-
-public abstract class MegaTreeFeature<T extends TreeConfiguration> extends AbstractTreeFeature<T> {
-    public MegaTreeFeature(final Function<Dynamic<?>, ? extends T> function) {
-        super(function);
-    }
-    
-    protected int calcTreeHeigth(final Random random, final MegaTreeConfiguration cgr) {
-        int integer4 = random.nextInt(3) + cgr.baseHeight;
-        if (cgr.heightInterval > 1) {
-            integer4 += random.nextInt(cgr.heightInterval);
-        }
-        return integer4;
-    }
-    
-    private boolean checkIsFree(final LevelSimulatedReader bkc, final BlockPos fk, final int integer) {
-        boolean boolean5 = true;
-        if (fk.getY() < 1 || fk.getY() + integer + 1 > 256) {
-            return false;
-        }
-        for (int integer2 = 0; integer2 <= 1 + integer; ++integer2) {
-            int integer3 = 2;
-            if (integer2 == 0) {
-                integer3 = 1;
-            }
-            else if (integer2 >= 1 + integer - 2) {
-                integer3 = 2;
-            }
-            for (int integer4 = -integer3; integer4 <= integer3 && boolean5; ++integer4) {
-                for (int integer5 = -integer3; integer5 <= integer3 && boolean5; ++integer5) {
-                    if (fk.getY() + integer2 < 0 || fk.getY() + integer2 >= 256 || !AbstractTreeFeature.isFree(bkc, fk.offset(integer4, integer2, integer5))) {
-                        boolean5 = false;
-                    }
-                }
-            }
-        }
-        return boolean5;
-    }
-    
-    private boolean makeDirtFloor(final LevelSimulatedRW bkb, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        if (!AbstractTreeFeature.isGrassOrDirt(bkb, fk2) || fk.getY() < 2) {
-            return false;
-        }
-        this.setDirtAt(bkb, fk2);
-        this.setDirtAt(bkb, fk2.east());
-        this.setDirtAt(bkb, fk2.south());
-        this.setDirtAt(bkb, fk2.south().east());
-        return true;
-    }
-    
-    protected boolean prepareTree(final LevelSimulatedRW bkb, final BlockPos fk, final int integer) {
-        return this.checkIsFree(bkb, fk, integer) && this.makeDirtFloor(bkb, fk);
-    }
-    
-    protected void placeDoubleTrunkLeaves(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final int integer, final Set<BlockPos> set, final BoundingBox clb, final TreeConfiguration chl) {
-        final int integer2 = integer * integer;
-        for (int integer3 = -integer; integer3 <= integer + 1; ++integer3) {
-            for (int integer4 = -integer; integer4 <= integer + 1; ++integer4) {
-                final int integer5 = Math.min(Math.abs(integer3), Math.abs(integer3 - 1));
-                final int integer6 = Math.min(Math.abs(integer4), Math.abs(integer4 - 1));
-                if (integer5 + integer6 < 7) {
-                    if (integer5 * integer5 + integer6 * integer6 <= integer2) {
-                        this.placeLeaf(bkb, random, fk.offset(integer3, 0, integer4), set, clb, chl);
-                    }
-                }
-            }
-        }
-    }
-    
-    protected void placeSingleTrunkLeaves(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final int integer, final Set<BlockPos> set, final BoundingBox clb, final TreeConfiguration chl) {
-        final int integer2 = integer * integer;
-        for (int integer3 = -integer; integer3 <= integer; ++integer3) {
-            for (int integer4 = -integer; integer4 <= integer; ++integer4) {
-                if (integer3 * integer3 + integer4 * integer4 <= integer2) {
-                    this.placeLeaf(bkb, random, fk.offset(integer3, 0, integer4), set, clb, chl);
-                }
-            }
-        }
-    }
-    
-    protected void placeTrunk(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final int integer, final Set<BlockPos> set, final BoundingBox clb, final MegaTreeConfiguration cgr) {
-        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos();
-        for (int integer2 = 0; integer2 < integer; ++integer2) {
-            a9.set(fk).move(0, integer2, 0);
-            if (AbstractTreeFeature.isFree(bkb, a9)) {
-                this.placeLog(bkb, random, a9, set, clb, cgr);
-            }
-            if (integer2 < integer - 1) {
-                a9.set(fk).move(1, integer2, 0);
-                if (AbstractTreeFeature.isFree(bkb, a9)) {
-                    this.placeLog(bkb, random, a9, set, clb, cgr);
-                }
-                a9.set(fk).move(1, integer2, 1);
-                if (AbstractTreeFeature.isFree(bkb, a9)) {
-                    this.placeLog(bkb, random, a9, set, clb, cgr);
-                }
-                a9.set(fk).move(0, integer2, 1);
-                if (AbstractTreeFeature.isFree(bkb, a9)) {
-                    this.placeLog(bkb, random, a9, set, clb, cgr);
-                }
-            }
-        }
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java b/src/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java
index 26352eb..1261349 100644
--- a/src/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java
@@ -2,58 +2,47 @@ package net.minecraft.world.level.levelgen.feature;
 
 import java.util.Iterator;
 import net.minecraft.world.level.levelgen.structure.StructurePiece;
+import java.util.Random;
 import net.minecraft.world.level.levelgen.structure.MineShaftPieces;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
 import java.util.stream.Collectors;
 import java.util.Arrays;
-import java.util.Map;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.WorldgenRandom;
-import net.minecraft.world.level.biome.Biome;
-import java.util.Random;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.biome.BiomeManager;
-import com.mojang.datafixers.Dynamic;
 import java.util.function.Function;
+import java.util.Map;
+import net.minecraft.util.StringRepresentable;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
 
 public class MineshaftFeature extends StructureFeature<MineshaftConfiguration> {
-    public MineshaftFeature(final Function<Dynamic<?>, ? extends MineshaftConfiguration> function) {
-        super(function);
+    public MineshaftFeature(final Codec<MineshaftConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt) {
-        ((WorldgenRandom)random).setLargeFeatureSeed(caa.getSeed(), integer4, integer5);
-        if (caa.isBiomeValidStartForStructure(bkt, this)) {
-            final MineshaftConfiguration cgs8 = caa.<MineshaftConfiguration>getStructureConfiguration(bkt, (StructureFeature<MineshaftConfiguration>)this);
-            final double double9 = cgs8.probability;
-            return random.nextDouble() < double9;
-        }
-        return false;
+    protected boolean isFeatureChunk(final ChunkGenerator cha, final BiomeSource brh, final long long3, final WorldgenRandom ciy, final int integer5, final int integer6, final Biome bre, final ChunkPos bph, final MineshaftConfiguration cnw) {
+        ciy.setLargeFeatureSeed(long3, integer5, integer6);
+        final double double12 = cnw.probability;
+        return ciy.nextDouble() < double12;
     }
     
     @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<MineshaftConfiguration> getStartFactory() {
         return MineShaftStart::new;
     }
     
-    @Override
-    public String getFeatureName() {
-        return "Mineshaft";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 8;
-    }
-    
-    public enum Type {
+    public enum Type implements StringRepresentable {
         NORMAL("normal"), 
         MESA("mesa");
         
+        public static final Codec<Type> CODEC;
         private static final Map<String, Type> BY_NAME;
         private final String name;
         
@@ -65,7 +54,7 @@ public class MineshaftFeature extends StructureFeature<MineshaftConfiguration> {
             return this.name;
         }
         
-        public static Type byName(final String string) {
+        private static Type byName(final String string) {
             return Type.BY_NAME.get(string);
         }
         
@@ -76,33 +65,38 @@ public class MineshaftFeature extends StructureFeature<MineshaftConfiguration> {
             return values()[integer];
         }
         
+        @Override
+        public String getSerializedName() {
+            return this.name;
+        }
+        
         static {
+            CODEC = StringRepresentable.<Type>fromEnum(Type::values, Type::byName);
             BY_NAME = Arrays.<Type>stream(values()).collect(Collectors.toMap(Type::getName, b -> b));
         }
     }
     
-    public static class MineShaftStart extends StructureStart {
-        public MineShaftStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class MineShaftStart extends StructureStart<MineshaftConfiguration> {
+        public MineShaftStart(final StructureFeature<MineshaftConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final MineshaftConfiguration cgs7 = caa.<MineshaftConfiguration>getStructureConfiguration(bkt, Feature.MINESHAFT);
-            final MineShaftPieces.MineShaftRoom d8 = new MineShaftPieces.MineShaftRoom(0, this.random, (integer3 << 4) + 2, (integer4 << 4) + 2, cgs7.type);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final MineshaftConfiguration cnw) {
+            final MineShaftPieces.MineShaftRoom d8 = new MineShaftPieces.MineShaftRoom(0, this.random, (integer3 << 4) + 2, (integer4 << 4) + 2, cnw.type);
             this.pieces.add(d8);
             d8.addChildren(d8, this.pieces, this.random);
             this.calculateBoundingBox();
-            if (cgs7.type == Type.MESA) {
+            if (cnw.type == Type.MESA) {
                 final int integer5 = -5;
-                final int integer6 = caa.getSeaLevel() - this.boundingBox.y1 + this.boundingBox.getYSpan() / 2 + 5;
+                final int integer6 = cha.getSeaLevel() - this.boundingBox.y1 + this.boundingBox.getYSpan() / 2 + 5;
                 this.boundingBox.move(0, integer6, 0);
-                for (final StructurePiece clu12 : this.pieces) {
-                    clu12.move(0, integer6, 0);
+                for (final StructurePiece cty12 : this.pieces) {
+                    cty12.move(0, integer6, 0);
                 }
             }
             else {
-                this.moveBelowSeaLevel(caa.getSeaLevel(), this.random, 10);
+                this.moveBelowSeaLevel(cha.getSeaLevel(), this.random, 10);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java b/src/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
index 40a0186..021c36c 100644
--- a/src/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
@@ -2,6 +2,7 @@ package net.minecraft.world.level.levelgen.feature;
 
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.Util;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import java.util.Iterator;
 import net.minecraft.world.level.material.Material;
@@ -14,11 +15,10 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.entity.EntityType;
 import org.apache.logging.log4j.Logger;
@@ -29,100 +29,101 @@ public class MonsterRoomFeature extends Feature<NoneFeatureConfiguration> {
     private static final EntityType<?>[] MOBS;
     private static final BlockState AIR;
     
-    public MonsterRoomFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public MonsterRoomFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        final int integer7 = 3;
-        final int integer8 = random.nextInt(2) + 2;
-        final int integer9 = -integer8 - 1;
-        final int integer10 = integer8 + 1;
-        final int integer11 = -1;
-        final int integer12 = 4;
-        final int integer13 = random.nextInt(2) + 2;
-        final int integer14 = -integer13 - 1;
-        final int integer15 = integer13 + 1;
-        int integer16 = 0;
-        for (int integer17 = integer9; integer17 <= integer10; ++integer17) {
-            for (int integer18 = -1; integer18 <= 4; ++integer18) {
-                for (int integer19 = integer14; integer19 <= integer15; ++integer19) {
-                    final BlockPos fk2 = fk.offset(integer17, integer18, integer19);
-                    final Material coo21 = bjx.getBlockState(fk2).getMaterial();
-                    final boolean boolean22 = coo21.isSolid();
-                    if (integer18 == -1 && !boolean22) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        final int integer8 = 3;
+        final int integer9 = random.nextInt(2) + 2;
+        final int integer10 = -integer9 - 1;
+        final int integer11 = integer9 + 1;
+        final int integer12 = -1;
+        final int integer13 = 4;
+        final int integer14 = random.nextInt(2) + 2;
+        final int integer15 = -integer14 - 1;
+        final int integer16 = integer14 + 1;
+        int integer17 = 0;
+        for (int integer18 = integer10; integer18 <= integer11; ++integer18) {
+            for (int integer19 = -1; integer19 <= 4; ++integer19) {
+                for (int integer20 = integer15; integer20 <= integer16; ++integer20) {
+                    final BlockPos fu2 = fu.offset(integer18, integer19, integer20);
+                    final Material cxd22 = bqu.getBlockState(fu2).getMaterial();
+                    final boolean boolean23 = cxd22.isSolid();
+                    if (integer19 == -1 && !boolean23) {
                         return false;
                     }
-                    if (integer18 == 4 && !boolean22) {
+                    if (integer19 == 4 && !boolean23) {
                         return false;
                     }
-                    if ((integer17 == integer9 || integer17 == integer10 || integer19 == integer14 || integer19 == integer15) && integer18 == 0 && bjx.isEmptyBlock(fk2) && bjx.isEmptyBlock(fk2.above())) {
-                        ++integer16;
+                    if ((integer18 == integer10 || integer18 == integer11 || integer20 == integer15 || integer20 == integer16) && integer19 == 0 && bqu.isEmptyBlock(fu2) && bqu.isEmptyBlock(fu2.above())) {
+                        ++integer17;
                     }
                 }
             }
         }
-        if (integer16 < 1 || integer16 > 5) {
+        if (integer17 < 1 || integer17 > 5) {
             return false;
         }
-        for (int integer17 = integer9; integer17 <= integer10; ++integer17) {
-            for (int integer18 = 3; integer18 >= -1; --integer18) {
-                for (int integer19 = integer14; integer19 <= integer15; ++integer19) {
-                    final BlockPos fk2 = fk.offset(integer17, integer18, integer19);
-                    if (integer17 == integer9 || integer18 == -1 || integer19 == integer14 || integer17 == integer10 || integer18 == 4 || integer19 == integer15) {
-                        if (fk2.getY() >= 0 && !bjx.getBlockState(fk2.below()).getMaterial().isSolid()) {
-                            bjx.setBlock(fk2, MonsterRoomFeature.AIR, 2);
+        for (int integer18 = integer10; integer18 <= integer11; ++integer18) {
+            for (int integer19 = 3; integer19 >= -1; --integer19) {
+                for (int integer20 = integer15; integer20 <= integer16; ++integer20) {
+                    final BlockPos fu2 = fu.offset(integer18, integer19, integer20);
+                    final BlockState cfj22 = bqu.getBlockState(fu2);
+                    if (integer18 == integer10 || integer19 == -1 || integer20 == integer15 || integer18 == integer11 || integer19 == 4 || integer20 == integer16) {
+                        if (fu2.getY() >= 0 && !bqu.getBlockState(fu2.below()).getMaterial().isSolid()) {
+                            bqu.setBlock(fu2, MonsterRoomFeature.AIR, 2);
                         }
-                        else if (bjx.getBlockState(fk2).getMaterial().isSolid() && bjx.getBlockState(fk2).getBlock() != Blocks.CHEST) {
-                            if (integer18 == -1 && random.nextInt(4) != 0) {
-                                bjx.setBlock(fk2, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 2);
+                        else if (cfj22.getMaterial().isSolid() && !cfj22.is(Blocks.CHEST)) {
+                            if (integer19 == -1 && random.nextInt(4) != 0) {
+                                bqu.setBlock(fu2, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 2);
                             }
                             else {
-                                bjx.setBlock(fk2, Blocks.COBBLESTONE.defaultBlockState(), 2);
+                                bqu.setBlock(fu2, Blocks.COBBLESTONE.defaultBlockState(), 2);
                             }
                         }
                     }
-                    else if (bjx.getBlockState(fk2).getBlock() != Blocks.CHEST) {
-                        bjx.setBlock(fk2, MonsterRoomFeature.AIR, 2);
+                    else if (!cfj22.is(Blocks.CHEST) && !cfj22.is(Blocks.SPAWNER)) {
+                        bqu.setBlock(fu2, MonsterRoomFeature.AIR, 2);
                     }
                 }
             }
         }
-        for (int integer17 = 0; integer17 < 2; ++integer17) {
-            for (int integer18 = 0; integer18 < 3; ++integer18) {
-                final int integer19 = fk.getX() + random.nextInt(integer8 * 2 + 1) - integer8;
-                final int integer20 = fk.getY();
-                final int integer21 = fk.getZ() + random.nextInt(integer13 * 2 + 1) - integer13;
-                final BlockPos fk3 = new BlockPos(integer19, integer20, integer21);
-                if (bjx.isEmptyBlock(fk3)) {
-                    int integer22 = 0;
-                    for (final Direction fp25 : Direction.Plane.HORIZONTAL) {
-                        if (bjx.getBlockState(fk3.relative(fp25)).getMaterial().isSolid()) {
-                            ++integer22;
+        for (int integer18 = 0; integer18 < 2; ++integer18) {
+            for (int integer19 = 0; integer19 < 3; ++integer19) {
+                final int integer20 = fu.getX() + random.nextInt(integer9 * 2 + 1) - integer9;
+                final int integer21 = fu.getY();
+                final int integer22 = fu.getZ() + random.nextInt(integer14 * 2 + 1) - integer14;
+                final BlockPos fu3 = new BlockPos(integer20, integer21, integer22);
+                if (bqu.isEmptyBlock(fu3)) {
+                    int integer23 = 0;
+                    for (final Direction fz26 : Direction.Plane.HORIZONTAL) {
+                        if (bqu.getBlockState(fu3.relative(fz26)).getMaterial().isSolid()) {
+                            ++integer23;
                         }
                     }
-                    if (integer22 == 1) {
-                        bjx.setBlock(fk3, StructurePiece.reorient(bjx, fk3, Blocks.CHEST.defaultBlockState()), 2);
-                        RandomizableContainerBlockEntity.setLootTable(bjx, random, fk3, BuiltInLootTables.SIMPLE_DUNGEON);
+                    if (integer23 == 1) {
+                        bqu.setBlock(fu3, StructurePiece.reorient(bqu, fu3, Blocks.CHEST.defaultBlockState()), 2);
+                        RandomizableContainerBlockEntity.setLootTable(bqu, random, fu3, BuiltInLootTables.SIMPLE_DUNGEON);
                         break;
                     }
                 }
             }
         }
-        bjx.setBlock(fk, Blocks.SPAWNER.defaultBlockState(), 2);
-        final BlockEntity bwl17 = bjx.getBlockEntity(fk);
-        if (bwl17 instanceof SpawnerBlockEntity) {
-            ((SpawnerBlockEntity)bwl17).getSpawner().setEntityId(this.randomEntityId(random));
+        bqu.setBlock(fu, Blocks.SPAWNER.defaultBlockState(), 2);
+        final BlockEntity cdl18 = bqu.getBlockEntity(fu);
+        if (cdl18 instanceof SpawnerBlockEntity) {
+            ((SpawnerBlockEntity)cdl18).getSpawner().setEntityId(this.randomEntityId(random));
         }
         else {
-            MonsterRoomFeature.LOGGER.error("Failed to fetch mob spawner entity at ({}, {}, {})", fk.getX(), fk.getY(), fk.getZ());
+            MonsterRoomFeature.LOGGER.error("Failed to fetch mob spawner entity at ({}, {}, {})", fu.getX(), fu.getY(), fu.getZ());
         }
         return true;
     }
     
     private EntityType<?> randomEntityId(final Random random) {
-        return MonsterRoomFeature.MOBS[random.nextInt(MonsterRoomFeature.MOBS.length)];
+        return Util.<EntityType<?>>getRandom(MonsterRoomFeature.MOBS, random);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/levelgen/feature/NetherForestVegetationFeature.java b/src/net/minecraft/world/level/levelgen/feature/NetherForestVegetationFeature.java
new file mode 100644
index 0000000..5972c47
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/NetherForestVegetationFeature.java
@@ -0,0 +1,45 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration;
+
+public class NetherForestVegetationFeature extends Feature<BlockPileConfiguration> {
+    public NetherForestVegetationFeature(final Codec<BlockPileConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final BlockPileConfiguration cnf) {
+        return place(bqu, random, fu, cnf, 8, 4);
+    }
+    
+    public static boolean place(final LevelAccessor bqc, final Random random, BlockPos fu, final BlockPileConfiguration cnf, final int integer5, final int integer6) {
+        for (Block bvr7 = bqc.getBlockState(fu.below()).getBlock(); !bvr7.is(BlockTags.NYLIUM) && fu.getY() > 0; fu = fu.below(), bvr7 = bqc.getBlockState(fu).getBlock()) {}
+        final int integer7 = fu.getY();
+        if (integer7 < 1 || integer7 + 1 >= 256) {
+            return false;
+        }
+        int integer8 = 0;
+        for (int integer9 = 0; integer9 < integer5 * integer5; ++integer9) {
+            final BlockPos fu2 = fu.offset(random.nextInt(integer5) - random.nextInt(integer5), random.nextInt(integer6) - random.nextInt(integer6), random.nextInt(integer5) - random.nextInt(integer5));
+            final BlockState cfj12 = cnf.stateProvider.getState(random, fu2);
+            if (bqc.isEmptyBlock(fu2) && fu2.getY() > 0 && cfj12.canSurvive(bqc, fu2)) {
+                bqc.setBlock(fu2, cfj12, 2);
+                ++integer8;
+            }
+        }
+        return integer8 > 0;
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/NetherFortressFeature.java b/src/net/minecraft/world/level/levelgen/feature/NetherFortressFeature.java
index f282f95..916666a 100644
--- a/src/net/minecraft/world/level/levelgen/feature/NetherFortressFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/NetherFortressFeature.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.levelgen.feature;
 
 import net.minecraft.world.level.levelgen.structure.StructurePiece;
+import java.util.Random;
 import net.minecraft.world.level.levelgen.structure.NetherBridgePieces;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
@@ -8,11 +9,11 @@ import net.minecraft.world.level.levelgen.structure.StructureStart;
 import com.google.common.collect.Lists;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import java.util.Random;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.biome.BiomeSource;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.biome.BiomeManager;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.biome.Biome;
 import java.util.List;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
@@ -20,58 +21,44 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf
 public class NetherFortressFeature extends StructureFeature<NoneFeatureConfiguration> {
     private static final List<Biome.SpawnerData> FORTRESS_ENEMIES;
     
-    public NetherFortressFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public NetherFortressFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt) {
-        final int integer6 = integer4 >> 4;
-        final int integer7 = integer5 >> 4;
-        random.setSeed((long)(integer6 ^ integer7 << 4) ^ caa.getSeed());
-        random.nextInt();
-        return random.nextInt(3) == 0 && integer4 == (integer6 << 4) + 4 + random.nextInt(8) && integer5 == (integer7 << 4) + 4 + random.nextInt(8) && caa.isBiomeValidStartForStructure(bkt, this);
+    protected boolean isFeatureChunk(final ChunkGenerator cha, final BiomeSource brh, final long long3, final WorldgenRandom ciy, final int integer5, final int integer6, final Biome bre, final ChunkPos bph, final NoneFeatureConfiguration coa) {
+        return ciy.nextInt(5) < 2;
     }
     
     @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
         return NetherBridgeStart::new;
     }
     
-    @Override
-    public String getFeatureName() {
-        return "Fortress";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 8;
-    }
-    
     @Override
     public List<Biome.SpawnerData> getSpecialEnemies() {
         return NetherFortressFeature.FORTRESS_ENEMIES;
     }
     
     static {
-        FORTRESS_ENEMIES = Lists.<Biome.SpawnerData>newArrayList(new Biome.SpawnerData(EntityType.BLAZE, 10, 2, 3), new Biome.SpawnerData(EntityType.ZOMBIE_PIGMAN, 5, 4, 4), new Biome.SpawnerData(EntityType.WITHER_SKELETON, 8, 5, 5), new Biome.SpawnerData(EntityType.SKELETON, 2, 5, 5), new Biome.SpawnerData(EntityType.MAGMA_CUBE, 3, 4, 4));
+        FORTRESS_ENEMIES = Lists.<Biome.SpawnerData>newArrayList(new Biome.SpawnerData(EntityType.BLAZE, 10, 2, 3), new Biome.SpawnerData(EntityType.ZOMBIFIED_PIGLIN, 5, 4, 4), new Biome.SpawnerData(EntityType.WITHER_SKELETON, 8, 5, 5), new Biome.SpawnerData(EntityType.SKELETON, 2, 5, 5), new Biome.SpawnerData(EntityType.MAGMA_CUBE, 3, 4, 4));
     }
     
-    public static class NetherBridgeStart extends StructureStart {
-        public NetherBridgeStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class NetherBridgeStart extends StructureStart<NoneFeatureConfiguration> {
+        public NetherBridgeStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final NetherBridgePieces.StartPiece q7 = new NetherBridgePieces.StartPiece(this.random, (integer3 << 4) + 2, (integer4 << 4) + 2);
-            this.pieces.add(q7);
-            q7.addChildren(q7, this.pieces, this.random);
-            final List<StructurePiece> list8 = q7.pendingChildren;
-            while (!list8.isEmpty()) {
-                final int integer5 = this.random.nextInt(list8.size());
-                final StructurePiece clu10 = list8.remove(integer5);
-                clu10.addChildren(q7, this.pieces, this.random);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
+            final NetherBridgePieces.StartPiece q8 = new NetherBridgePieces.StartPiece(this.random, (integer3 << 4) + 2, (integer4 << 4) + 2);
+            this.pieces.add(q8);
+            q8.addChildren(q8, this.pieces, this.random);
+            final List<StructurePiece> list9 = q8.pendingChildren;
+            while (!list9.isEmpty()) {
+                final int integer5 = this.random.nextInt(list9.size());
+                final StructurePiece cty11 = list9.remove(integer5);
+                cty11.addChildren(q8, this.pieces, this.random);
             }
             this.calculateBoundingBox();
             this.moveInsideHeights(this.random, 48, 70);
diff --git a/src/net/minecraft/world/level/levelgen/feature/NoOpFeature.java b/src/net/minecraft/world/level/levelgen/feature/NoOpFeature.java
index 4b06731..affb394 100644
--- a/src/net/minecraft/world/level/levelgen/feature/NoOpFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/NoOpFeature.java
@@ -3,20 +3,19 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class NoOpFeature extends Feature<NoneFeatureConfiguration> {
-    public NoOpFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public NoOpFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
         return true;
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/NoSurfaceOreFeature.java b/src/net/minecraft/world/level/levelgen/feature/NoSurfaceOreFeature.java
new file mode 100644
index 0000000..7498716
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/NoSurfaceOreFeature.java
@@ -0,0 +1,54 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.core.Direction;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
+
+public class NoSurfaceOreFeature extends Feature<OreConfiguration> {
+    NoSurfaceOreFeature(final Codec<OreConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final OreConfiguration coc) {
+        final int integer8 = random.nextInt(coc.size + 1);
+        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos();
+        for (int integer9 = 0; integer9 < integer8; ++integer9) {
+            this.offsetTargetPos(a9, random, fu, Math.min(integer9, 7));
+            if (coc.target.getPredicate().test(bqu.getBlockState(a9)) && !this.isFacingAir(bqu, a9)) {
+                bqu.setBlock(a9, coc.state, 2);
+            }
+        }
+        return true;
+    }
+    
+    private void offsetTargetPos(final BlockPos.MutableBlockPos a, final Random random, final BlockPos fu, final int integer) {
+        final int integer2 = this.getRandomPlacementInOneAxisRelativeToOrigin(random, integer);
+        final int integer3 = this.getRandomPlacementInOneAxisRelativeToOrigin(random, integer);
+        final int integer4 = this.getRandomPlacementInOneAxisRelativeToOrigin(random, integer);
+        a.setWithOffset(fu, integer2, integer3, integer4);
+    }
+    
+    private int getRandomPlacementInOneAxisRelativeToOrigin(final Random random, final int integer) {
+        return Math.round((random.nextFloat() - random.nextFloat()) * integer);
+    }
+    
+    private boolean isFacingAir(final LevelAccessor bqc, final BlockPos fu) {
+        final BlockPos.MutableBlockPos a4 = new BlockPos.MutableBlockPos();
+        for (final Direction fz8 : Direction.values()) {
+            a4.setWithOffset(fu, fz8);
+            if (bqc.getBlockState(a4).isAir()) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/OceanMonumentFeature.java b/src/net/minecraft/world/level/levelgen/feature/OceanMonumentFeature.java
index 420cac9..bc9a26c 100644
--- a/src/net/minecraft/world/level/levelgen/feature/OceanMonumentFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/OceanMonumentFeature.java
@@ -1,24 +1,23 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.levelgen.structure.OceanMonumentPieces;
+import java.util.Random;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
 import com.google.common.collect.Lists;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import java.util.Iterator;
 import java.util.Set;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.biome.BiomeManager;
-import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.ChunkPos;
-import java.util.Random;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.biome.BiomeSource;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.biome.Biome;
 import java.util.List;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
@@ -26,64 +25,37 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf
 public class OceanMonumentFeature extends StructureFeature<NoneFeatureConfiguration> {
     private static final List<Biome.SpawnerData> MONUMENT_ENEMIES;
     
-    public OceanMonumentFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public OceanMonumentFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    protected ChunkPos getPotentialFeatureChunkFromLocationWithOffset(final ChunkGenerator<?> caa, final Random random, final int integer3, final int integer4, final int integer5, final int integer6) {
-        final int integer7 = ((ChunkGeneratorSettings)caa.getSettings()).getMonumentsSpacing();
-        final int integer8 = ((ChunkGeneratorSettings)caa.getSettings()).getMonumentsSeparation();
-        final int integer9 = integer3 + integer7 * integer5;
-        final int integer10 = integer4 + integer7 * integer6;
-        final int integer11 = (integer9 < 0) ? (integer9 - integer7 + 1) : integer9;
-        final int integer12 = (integer10 < 0) ? (integer10 - integer7 + 1) : integer10;
-        int integer13 = integer11 / integer7;
-        int integer14 = integer12 / integer7;
-        ((WorldgenRandom)random).setLargeFeatureWithSalt(caa.getSeed(), integer13, integer14, 10387313);
-        integer13 *= integer7;
-        integer14 *= integer7;
-        integer13 += (random.nextInt(integer7 - integer8) + random.nextInt(integer7 - integer8)) / 2;
-        integer14 += (random.nextInt(integer7 - integer8) + random.nextInt(integer7 - integer8)) / 2;
-        return new ChunkPos(integer13, integer14);
-    }
-    
-    @Override
-    public boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt) {
-        final ChunkPos bjh8 = this.getPotentialFeatureChunkFromLocationWithOffset(caa, random, integer4, integer5, 0, 0);
-        if (integer4 == bjh8.x && integer5 == bjh8.z) {
-            final Set<Biome> set9 = caa.getBiomeSource().getBiomesWithin(integer4 * 16 + 9, caa.getSeaLevel(), integer5 * 16 + 9, 16);
-            for (final Biome bkt2 : set9) {
-                if (!caa.isBiomeValidStartForStructure(bkt2, this)) {
-                    return false;
-                }
-            }
-            final Set<Biome> set10 = caa.getBiomeSource().getBiomesWithin(integer4 * 16 + 9, caa.getSeaLevel(), integer5 * 16 + 9, 29);
-            for (final Biome bkt3 : set10) {
-                if (bkt3.getBiomeCategory() != Biome.BiomeCategory.OCEAN && bkt3.getBiomeCategory() != Biome.BiomeCategory.RIVER) {
-                    return false;
-                }
-            }
-            return true;
-        }
+    protected boolean linearSeparation() {
         return false;
     }
     
     @Override
-    public StructureStartFactory getStartFactory() {
+    protected boolean isFeatureChunk(final ChunkGenerator cha, final BiomeSource brh, final long long3, final WorldgenRandom ciy, final int integer5, final int integer6, final Biome bre, final ChunkPos bph, final NoneFeatureConfiguration coa) {
+        final Set<Biome> set12 = brh.getBiomesWithin(integer5 * 16 + 9, cha.getSeaLevel(), integer6 * 16 + 9, 16);
+        for (final Biome bre2 : set12) {
+            if (!bre2.isValidStart(this)) {
+                return false;
+            }
+        }
+        final Set<Biome> set13 = brh.getBiomesWithin(integer5 * 16 + 9, cha.getSeaLevel(), integer6 * 16 + 9, 29);
+        for (final Biome bre3 : set13) {
+            if (bre3.getBiomeCategory() != Biome.BiomeCategory.OCEAN && bre3.getBiomeCategory() != Biome.BiomeCategory.RIVER) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    @Override
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
         return OceanMonumentStart::new;
     }
     
-    @Override
-    public String getFeatureName() {
-        return "Monument";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 8;
-    }
-    
     @Override
     public List<Biome.SpawnerData> getSpecialEnemies() {
         return OceanMonumentFeature.MONUMENT_ENEMIES;
@@ -93,34 +65,34 @@ public class OceanMonumentFeature extends StructureFeature<NoneFeatureConfigurat
         MONUMENT_ENEMIES = Lists.<Biome.SpawnerData>newArrayList(new Biome.SpawnerData(EntityType.GUARDIAN, 1, 2, 4));
     }
     
-    public static class OceanMonumentStart extends StructureStart {
+    public static class OceanMonumentStart extends StructureStart<NoneFeatureConfiguration> {
         private boolean isCreated;
         
-        public OceanMonumentStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+        public OceanMonumentStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
             this.generatePieces(integer3, integer4);
         }
         
         private void generatePieces(final int integer1, final int integer2) {
             final int integer3 = integer1 * 16 - 29;
             final int integer4 = integer2 * 16 - 29;
-            final Direction fp6 = Direction.Plane.HORIZONTAL.getRandomDirection(this.random);
-            this.pieces.add(new OceanMonumentPieces.MonumentBuilding(this.random, integer3, integer4, fp6));
+            final Direction fz6 = Direction.Plane.HORIZONTAL.getRandomDirection(this.random);
+            this.pieces.add(new OceanMonumentPieces.MonumentBuilding(this.random, integer3, integer4, fz6));
             this.calculateBoundingBox();
             this.isCreated = true;
         }
         
         @Override
-        public void postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
+        public void placeInChunk(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph) {
             if (!this.isCreated) {
                 this.pieces.clear();
                 this.generatePieces(this.getChunkX(), this.getChunkZ());
             }
-            super.postProcess(bjx, caa, random, clb, bjh);
+            super.placeInChunk(bqu, bqq, cha, random, ctd, bph);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/OreFeature.java b/src/net/minecraft/world/level/levelgen/feature/OreFeature.java
index fea3345..ea57829 100644
--- a/src/net/minecraft/world/level/levelgen/feature/OreFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/OreFeature.java
@@ -2,69 +2,69 @@ package net.minecraft.world.level.levelgen.feature;
 
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import java.util.BitSet;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.util.Mth;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
 
 public class OreFeature extends Feature<OreConfiguration> {
-    public OreFeature(final Function<Dynamic<?>, ? extends OreConfiguration> function) {
-        super(function);
+    public OreFeature(final Codec<OreConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final OreConfiguration cgx) {
-        final float float7 = random.nextFloat() * 3.1415927f;
-        final float float8 = cgx.size / 8.0f;
-        final int integer9 = Mth.ceil((cgx.size / 16.0f * 2.0f + 1.0f) / 2.0f);
-        final double double10 = fk.getX() + Mth.sin(float7) * float8;
-        final double double11 = fk.getX() - Mth.sin(float7) * float8;
-        final double double12 = fk.getZ() + Mth.cos(float7) * float8;
-        final double double13 = fk.getZ() - Mth.cos(float7) * float8;
-        final int integer10 = 2;
-        final double double14 = fk.getY() + random.nextInt(3) - 2;
-        final double double15 = fk.getY() + random.nextInt(3) - 2;
-        final int integer11 = fk.getX() - Mth.ceil(float8) - integer9;
-        final int integer12 = fk.getY() - 2 - integer9;
-        final int integer13 = fk.getZ() - Mth.ceil(float8) - integer9;
-        final int integer14 = 2 * (Mth.ceil(float8) + integer9);
-        final int integer15 = 2 * (2 + integer9);
-        for (int integer16 = integer11; integer16 <= integer11 + integer14; ++integer16) {
-            for (int integer17 = integer13; integer17 <= integer13 + integer14; ++integer17) {
-                if (integer12 <= bjx.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer16, integer17)) {
-                    return this.doPlace(bjx, random, cgx, double10, double11, double12, double13, double14, double15, integer11, integer12, integer13, integer14, integer15);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final OreConfiguration coc) {
+        final float float8 = random.nextFloat() * 3.1415927f;
+        final float float9 = coc.size / 8.0f;
+        final int integer10 = Mth.ceil((coc.size / 16.0f * 2.0f + 1.0f) / 2.0f);
+        final double double11 = fu.getX() + Mth.sin(float8) * float9;
+        final double double12 = fu.getX() - Mth.sin(float8) * float9;
+        final double double13 = fu.getZ() + Mth.cos(float8) * float9;
+        final double double14 = fu.getZ() - Mth.cos(float8) * float9;
+        final int integer11 = 2;
+        final double double15 = fu.getY() + random.nextInt(3) - 2;
+        final double double16 = fu.getY() + random.nextInt(3) - 2;
+        final int integer12 = fu.getX() - Mth.ceil(float9) - integer10;
+        final int integer13 = fu.getY() - 2 - integer10;
+        final int integer14 = fu.getZ() - Mth.ceil(float9) - integer10;
+        final int integer15 = 2 * (Mth.ceil(float9) + integer10);
+        final int integer16 = 2 * (2 + integer10);
+        for (int integer17 = integer12; integer17 <= integer12 + integer15; ++integer17) {
+            for (int integer18 = integer14; integer18 <= integer14 + integer15; ++integer18) {
+                if (integer13 <= bqu.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer17, integer18)) {
+                    return this.doPlace(bqu, random, coc, double11, double12, double13, double14, double15, double16, integer12, integer13, integer14, integer15, integer16);
                 }
             }
         }
         return false;
     }
     
-    protected boolean doPlace(final LevelAccessor bjx, final Random random, final OreConfiguration cgx, final double double4, final double double5, final double double6, final double double7, final double double8, final double double9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14) {
+    protected boolean doPlace(final LevelAccessor bqc, final Random random, final OreConfiguration coc, final double double4, final double double5, final double double6, final double double7, final double double8, final double double9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14) {
         int integer15 = 0;
         final BitSet bitSet23 = new BitSet(integer13 * integer14 * integer13);
         final BlockPos.MutableBlockPos a24 = new BlockPos.MutableBlockPos();
-        final double[] arr25 = new double[cgx.size * 4];
-        for (int integer16 = 0; integer16 < cgx.size; ++integer16) {
-            final float float27 = integer16 / (float)cgx.size;
+        final double[] arr25 = new double[coc.size * 4];
+        for (int integer16 = 0; integer16 < coc.size; ++integer16) {
+            final float float27 = integer16 / (float)coc.size;
             final double double10 = Mth.lerp(float27, double4, double5);
             final double double11 = Mth.lerp(float27, double8, double9);
             final double double12 = Mth.lerp(float27, double6, double7);
-            final double double13 = random.nextDouble() * cgx.size / 16.0;
+            final double double13 = random.nextDouble() * coc.size / 16.0;
             final double double14 = ((Mth.sin(3.1415927f * float27) + 1.0f) * double13 + 1.0) / 2.0;
             arr25[integer16 * 4 + 0] = double10;
             arr25[integer16 * 4 + 1] = double11;
             arr25[integer16 * 4 + 2] = double12;
             arr25[integer16 * 4 + 3] = double14;
         }
-        for (int integer16 = 0; integer16 < cgx.size - 1; ++integer16) {
+        for (int integer16 = 0; integer16 < coc.size - 1; ++integer16) {
             if (arr25[integer16 * 4 + 3] > 0.0) {
-                for (int integer17 = integer16 + 1; integer17 < cgx.size; ++integer17) {
+                for (int integer17 = integer16 + 1; integer17 < coc.size; ++integer17) {
                     if (arr25[integer17 * 4 + 3] > 0.0) {
                         final double double10 = arr25[integer16 * 4 + 0] - arr25[integer17 * 4 + 0];
                         final double double11 = arr25[integer16 * 4 + 1] - arr25[integer17 * 4 + 1];
@@ -82,7 +82,7 @@ public class OreFeature extends Feature<OreConfiguration> {
                 }
             }
         }
-        for (int integer16 = 0; integer16 < cgx.size; ++integer16) {
+        for (int integer16 = 0; integer16 < coc.size; ++integer16) {
             final double double15 = arr25[integer16 * 4 + 3];
             if (double15 >= 0.0) {
                 final double double16 = arr25[integer16 * 4 + 0];
@@ -107,8 +107,8 @@ public class OreFeature extends Feature<OreConfiguration> {
                                         if (!bitSet23.get(integer27)) {
                                             bitSet23.set(integer27);
                                             a24.set(integer24, integer25, integer26);
-                                            if (cgx.target.getPredicate().test(bjx.getBlockState(a24))) {
-                                                bjx.setBlock(a24, cgx.state, 2);
+                                            if (coc.target.getPredicate().test(bqc.getBlockState(a24))) {
+                                                bqc.setBlock(a24, coc.state, 2);
                                                 ++integer15;
                                             }
                                         }
diff --git a/src/net/minecraft/world/level/levelgen/feature/PillagerOutpostFeature.java b/src/net/minecraft/world/level/levelgen/feature/PillagerOutpostFeature.java
index 967d2fd..bf15308 100644
--- a/src/net/minecraft/world/level/levelgen/feature/PillagerOutpostFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/PillagerOutpostFeature.java
@@ -1,38 +1,27 @@
 package net.minecraft.world.level.levelgen.feature;
 
 import net.minecraft.world.level.levelgen.structure.PillagerOutpostPieces;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.BeardedStructureStart;
 import com.google.common.collect.Lists;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import java.util.Random;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.biome.BiomeSource;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.biome.BiomeManager;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.biome.Biome;
 import java.util.List;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
-public class PillagerOutpostFeature extends RandomScatteredFeature<NoneFeatureConfiguration> {
+public class PillagerOutpostFeature extends StructureFeature<NoneFeatureConfiguration> {
     private static final List<Biome.SpawnerData> OUTPOST_ENEMIES;
     
-    public PillagerOutpostFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
-    }
-    
-    @Override
-    public String getFeatureName() {
-        return "Pillager_Outpost";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 3;
+    public PillagerOutpostFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
@@ -41,53 +30,43 @@ public class PillagerOutpostFeature extends RandomScatteredFeature<NoneFeatureCo
     }
     
     @Override
-    public boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt) {
-        final ChunkPos bjh8 = this.getPotentialFeatureChunkFromLocationWithOffset(caa, random, integer4, integer5, 0, 0);
-        if (integer4 == bjh8.x && integer5 == bjh8.z) {
-            final int integer6 = integer4 >> 4;
-            final int integer7 = integer5 >> 4;
-            random.setSeed((long)(integer6 ^ integer7 << 4) ^ caa.getSeed());
-            random.nextInt();
-            if (random.nextInt(5) != 0) {
-                return false;
-            }
-            if (caa.isBiomeValidStartForStructure(bkt, this)) {
-                for (int integer8 = integer4 - 10; integer8 <= integer4 + 10; ++integer8) {
-                    for (int integer9 = integer5 - 10; integer9 <= integer5 + 10; ++integer9) {
-                        if (Feature.VILLAGE.isFeatureChunk(bkv, caa, random, integer8, integer9, bkv.getBiome(new BlockPos((integer8 << 4) + 9, 0, (integer9 << 4) + 9)))) {
-                            return false;
-                        }
-                    }
+    protected boolean isFeatureChunk(final ChunkGenerator cha, final BiomeSource brh, final long long3, final WorldgenRandom ciy, final int integer5, final int integer6, final Biome bre, final ChunkPos bph, final NoneFeatureConfiguration coa) {
+        final int integer7 = integer5 >> 4;
+        final int integer8 = integer6 >> 4;
+        ciy.setSeed((long)(integer7 ^ integer8 << 4) ^ long3);
+        ciy.nextInt();
+        if (ciy.nextInt(5) != 0) {
+            return false;
+        }
+        for (int integer9 = integer5 - 10; integer9 <= integer5 + 10; ++integer9) {
+            for (int integer10 = integer6 - 10; integer10 <= integer6 + 10; ++integer10) {
+                final ChunkPos bph2 = StructureFeature.VILLAGE.getPotentialFeatureChunk(cha.getSettings().getConfig(StructureFeature.VILLAGE), long3, ciy, integer9, integer10);
+                if (integer9 == bph2.x && integer10 == bph2.z) {
+                    return false;
                 }
-                return true;
             }
         }
-        return false;
+        return true;
     }
     
     @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
         return FeatureStart::new;
     }
     
-    @Override
-    protected int getRandomSalt() {
-        return 165745296;
-    }
-    
     static {
         OUTPOST_ENEMIES = Lists.<Biome.SpawnerData>newArrayList(new Biome.SpawnerData(EntityType.PILLAGER, 1, 1, 1));
     }
     
-    public static class FeatureStart extends BeardedStructureStart {
-        public FeatureStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class FeatureStart extends BeardedStructureStart<NoneFeatureConfiguration> {
+        public FeatureStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final BlockPos fk7 = new BlockPos(integer3 * 16, 90, integer4 * 16);
-            PillagerOutpostPieces.addPieces(caa, cmo, fk7, this.pieces, this.random);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
+            final BlockPos fu8 = new BlockPos(integer3 * 16, 0, integer4 * 16);
+            PillagerOutpostPieces.addPieces(cha, cva, fu8, this.pieces, this.random);
             this.calculateBoundingBox();
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/PlainVillagePools.java b/src/net/minecraft/world/level/levelgen/feature/PlainVillagePools.java
index 2268d05..77ae7ba 100644
--- a/src/net/minecraft/world/level/levelgen/feature/PlainVillagePools.java
+++ b/src/net/minecraft/world/level/levelgen/feature/PlainVillagePools.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.structures.FeaturePoolElement;
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.feature.structures.EmptyPoolElement;
@@ -8,7 +8,7 @@ import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElemen
 import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
-import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.LegacySinglePoolElement;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
 import java.util.List;
@@ -19,6 +19,8 @@ import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.IronBarsBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
@@ -32,26 +34,26 @@ public class PlainVillagePools {
     }
     
     static {
-        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.8f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()), new ProcessorRule(new TagMatchTest(BlockTags.DOORS), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.WALL_TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.07f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.MOSSY_COBBLESTONE, 0.07f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHITE_TERRACOTTA, 0.07f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.OAK_LOG, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.OAK_PLANKS, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.OAK_STAIRS, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.STRIPPED_OAK_LOG, 0.02f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GLASS_PANE, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new BlockStateMatchTest((((AbstractStateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), AlwaysTrueTest.INSTANCE, (((AbstractStateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), new ProcessorRule(new BlockStateMatchTest((((AbstractStateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), AlwaysTrueTest.INSTANCE, (((AbstractStateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.CARROTS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.POTATOES.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.BEETROOTS.defaultBlockState()))));
+        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.8f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()), new ProcessorRule(new TagMatchTest(BlockTags.DOORS), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.WALL_TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.07f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.MOSSY_COBBLESTONE, 0.07f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHITE_TERRACOTTA, 0.07f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.OAK_LOG, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.OAK_PLANKS, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.OAK_STAIRS, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.STRIPPED_OAK_LOG, 0.02f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GLASS_PANE, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new BlockStateMatchTest((((StateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), AlwaysTrueTest.INSTANCE, (((StateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), new ProcessorRule(new BlockStateMatchTest((((StateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), AlwaysTrueTest.INSTANCE, (((StateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.CARROTS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.POTATOES.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.BEETROOTS.defaultBlockState()))));
         final ImmutableList<StructureProcessor> immutableList2 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/town_centers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/town_centers/plains_fountain_01", ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()))))), 50), new Pair(new SinglePoolElement("village/plains/town_centers/plains_meeting_point_1", ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()))))), 50), new Pair(new SinglePoolElement("village/plains/town_centers/plains_meeting_point_2"), 50), new Pair(new SinglePoolElement("village/plains/town_centers/plains_meeting_point_3", ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.7f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()))))), 50), new Pair(new SinglePoolElement("village/plains/zombie/town_centers/plains_fountain_01", immutableList1), 1), new Pair(new SinglePoolElement("village/plains/zombie/town_centers/plains_meeting_point_1", immutableList1), 1), new Pair(new SinglePoolElement("village/plains/zombie/town_centers/plains_meeting_point_2", immutableList1), 1), new Pair(new SinglePoolElement("village/plains/zombie/town_centers/plains_meeting_point_3", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/town_centers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/town_centers/plains_fountain_01", ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()))))), 50), new Pair(new LegacySinglePoolElement("village/plains/town_centers/plains_meeting_point_1", ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()))))), 50), new Pair(new LegacySinglePoolElement("village/plains/town_centers/plains_meeting_point_2"), 50), new Pair(new LegacySinglePoolElement("village/plains/town_centers/plains_meeting_point_3", ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.7f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()))))), 50), new Pair(new LegacySinglePoolElement("village/plains/zombie/town_centers/plains_fountain_01", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/plains/zombie/town_centers/plains_meeting_point_1", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/plains/zombie/town_centers/plains_meeting_point_2", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/plains/zombie/town_centers/plains_meeting_point_3", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
         final ImmutableList<StructureProcessor> immutableList3 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new BlockMatchTest(Blocks.GRASS_PATH), new BlockMatchTest(Blocks.WATER), Blocks.OAK_PLANKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GRASS_PATH, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.GRASS_BLOCK.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.GRASS_BLOCK), new BlockMatchTest(Blocks.WATER), Blocks.WATER.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.DIRT), new BlockMatchTest(Blocks.WATER), Blocks.WATER.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/streets"), new ResourceLocation("village/plains/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/streets/corner_01", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/streets/corner_02", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/streets/corner_03", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/streets/straight_01", immutableList3), 4), new Pair(new SinglePoolElement("village/plains/streets/straight_02", immutableList3), 4), new Pair(new SinglePoolElement("village/plains/streets/straight_03", immutableList3), 7), new Pair(new SinglePoolElement("village/plains/streets/straight_04", immutableList3), 7), new Pair(new SinglePoolElement("village/plains/streets/straight_05", immutableList3), 3), new Pair(new SinglePoolElement("village/plains/streets/straight_06", immutableList3), 4), new Pair(new SinglePoolElement("village/plains/streets/crossroad_01", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/streets/crossroad_02", immutableList3), 1), new Pair(new SinglePoolElement("village/plains/streets/crossroad_03", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/streets/crossroad_04", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/streets/crossroad_05", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/streets/crossroad_06", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/streets/turn_01", immutableList3), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/zombie/streets"), new ResourceLocation("village/plains/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/zombie/streets/corner_01", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/zombie/streets/corner_02", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/zombie/streets/corner_03", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/zombie/streets/straight_01", immutableList3), 4), new Pair(new SinglePoolElement("village/plains/zombie/streets/straight_02", immutableList3), 4), new Pair(new SinglePoolElement("village/plains/zombie/streets/straight_03", immutableList3), 7), new Pair(new SinglePoolElement("village/plains/zombie/streets/straight_04", immutableList3), 7), new Pair(new SinglePoolElement("village/plains/zombie/streets/straight_05", immutableList3), 3), new Pair(new SinglePoolElement("village/plains/zombie/streets/straight_06", immutableList3), 4), new Pair(new SinglePoolElement("village/plains/zombie/streets/crossroad_01", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/zombie/streets/crossroad_02", immutableList3), 1), new Pair(new SinglePoolElement("village/plains/zombie/streets/crossroad_03", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/zombie/streets/crossroad_04", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/zombie/streets/crossroad_05", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/zombie/streets/crossroad_06", immutableList3), 2), new Pair(new SinglePoolElement("village/plains/zombie/streets/turn_01", immutableList3), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/streets"), new ResourceLocation("village/plains/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/streets/corner_01", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/streets/corner_02", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/streets/corner_03", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/streets/straight_01", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/plains/streets/straight_02", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/plains/streets/straight_03", immutableList3), 7), new Pair(new LegacySinglePoolElement("village/plains/streets/straight_04", immutableList3), 7), new Pair(new LegacySinglePoolElement("village/plains/streets/straight_05", immutableList3), 3), new Pair(new LegacySinglePoolElement("village/plains/streets/straight_06", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/plains/streets/crossroad_01", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/streets/crossroad_02", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/plains/streets/crossroad_03", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/streets/crossroad_04", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/streets/crossroad_05", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/streets/crossroad_06", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/streets/turn_01", immutableList3), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/zombie/streets"), new ResourceLocation("village/plains/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/corner_01", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/corner_02", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/corner_03", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/straight_01", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/straight_02", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/straight_03", immutableList3), 7), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/straight_04", immutableList3), 7), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/straight_05", immutableList3), 3), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/straight_06", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/crossroad_01", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/crossroad_02", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/crossroad_03", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/crossroad_04", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/crossroad_05", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/crossroad_06", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/streets/turn_01", immutableList3), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
         final ImmutableList<StructureProcessor> immutableList4 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.CARROTS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.POTATOES.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.BEETROOTS.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/houses"), new ResourceLocation("village/plains/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/houses/plains_small_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_small_house_2", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_small_house_3", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_small_house_4", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_small_house_5", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_small_house_6", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/houses/plains_small_house_7", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_small_house_8", immutableList2), 3), new Pair(new SinglePoolElement("village/plains/houses/plains_medium_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_medium_house_2", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_big_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_butcher_shop_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_butcher_shop_2", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_tool_smith_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_fletcher_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_shepherds_house_1"), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_armorer_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_fisher_cottage_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_tannery_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_cartographer_1", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/houses/plains_library_1", immutableList2), 5), new Pair(new SinglePoolElement("village/plains/houses/plains_library_2", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/houses/plains_masons_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_weaponsmith_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_temple_3", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_temple_4", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_stable_1", immutableList2), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_stable_2"), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_large_farm_1", immutableList4), 4), new Pair(new SinglePoolElement("village/plains/houses/plains_small_farm_1", immutableList4), 4), new Pair(new SinglePoolElement("village/plains/houses/plains_animal_pen_1"), 1), new Pair(new SinglePoolElement("village/plains/houses/plains_animal_pen_2"), 1), new Pair(new SinglePoolElement("village/plains/houses/plains_animal_pen_3"), 5), new Pair(new SinglePoolElement("village/plains/houses/plains_accessory_1"), 1), new Pair(new SinglePoolElement("village/plains/houses/plains_meeting_point_4", ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.7f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()))))), 3), new Pair(new SinglePoolElement("village/plains/houses/plains_meeting_point_5"), 1), Pair.of(EmptyPoolElement.INSTANCE, 10)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/zombie/houses"), new ResourceLocation("village/plains/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_small_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_small_house_2", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_small_house_3", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_small_house_4", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_small_house_5", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_small_house_6", immutableList1), 1), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_small_house_7", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_small_house_8", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_medium_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_medium_house_2", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_big_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_butcher_shop_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_butcher_shop_2", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_tool_smith_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_fletcher_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_shepherds_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_armorer_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_fisher_cottage_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_tannery_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_cartographer_1", immutableList1), 1), new Pair(new SinglePoolElement("village/plains/houses/plains_library_1", immutableList1), 3), new Pair(new SinglePoolElement("village/plains/houses/plains_library_2", immutableList1), 1), new Pair(new SinglePoolElement("village/plains/houses/plains_masons_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_weaponsmith_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_temple_3", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_temple_4", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_stable_1", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_stable_2", immutableList1), 2), new Pair(new SinglePoolElement("village/plains/houses/plains_large_farm_1", immutableList1), 4), new Pair(new SinglePoolElement("village/plains/houses/plains_small_farm_1", immutableList1), 4), new Pair(new SinglePoolElement("village/plains/houses/plains_animal_pen_1", immutableList1), 1), new Pair(new SinglePoolElement("village/plains/houses/plains_animal_pen_2", immutableList1), 1), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_animal_pen_3", immutableList1), 5), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_meeting_point_4", immutableList1), 3), new Pair(new SinglePoolElement("village/plains/zombie/houses/plains_meeting_point_5", immutableList1), 1), Pair.of(EmptyPoolElement.INSTANCE, 10)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/terminators/terminator_01", immutableList3), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_02", immutableList3), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_03", immutableList3), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_04", immutableList3), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/trees"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new FeaturePoolElement(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG)), 1)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/plains_lamp_1"), 2), new Pair(new FeaturePoolElement(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG)), 1), new Pair(new FeaturePoolElement(Feature.FLOWER.configured(BiomeDefaultFeatures.PLAIN_FLOWER_CONFIG)), 1), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 2)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/zombie/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/plains_lamp_1", immutableList1), 1), new Pair(new FeaturePoolElement(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG)), 1), new Pair(new FeaturePoolElement(Feature.FLOWER.configured(BiomeDefaultFeatures.PLAIN_FLOWER_CONFIG)), 1), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 2)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/villagers/nitwit"), 1), new Pair(new SinglePoolElement("village/plains/villagers/baby"), 1), new Pair(new SinglePoolElement("village/plains/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/zombie/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/zombie/villagers/nitwit"), 1), new Pair(new SinglePoolElement("village/plains/zombie/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/animals"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/common/animals/cows_1"), 7), new Pair(new SinglePoolElement("village/common/animals/pigs_1"), 7), new Pair(new SinglePoolElement("village/common/animals/horses_1"), 1), new Pair(new SinglePoolElement("village/common/animals/horses_2"), 1), new Pair(new SinglePoolElement("village/common/animals/horses_3"), 1), new Pair(new SinglePoolElement("village/common/animals/horses_4"), 1), new Pair(new SinglePoolElement("village/common/animals/horses_5"), 1), new Pair(new SinglePoolElement("village/common/animals/sheep_1"), 1), new Pair(new SinglePoolElement("village/common/animals/sheep_2"), 1), Pair.of(EmptyPoolElement.INSTANCE, 5)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/sheep"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/common/animals/sheep_1"), 1), new Pair(new SinglePoolElement("village/common/animals/sheep_2"), 1)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/cats"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/common/animals/cat_black"), 1), new Pair(new SinglePoolElement("village/common/animals/cat_british"), 1), new Pair(new SinglePoolElement("village/common/animals/cat_calico"), 1), new Pair(new SinglePoolElement("village/common/animals/cat_persian"), 1), new Pair(new SinglePoolElement("village/common/animals/cat_ragdoll"), 1), new Pair(new SinglePoolElement("village/common/animals/cat_red"), 1), new Pair(new SinglePoolElement("village/common/animals/cat_siamese"), 1), new Pair(new SinglePoolElement("village/common/animals/cat_tabby"), 1), new Pair(new SinglePoolElement("village/common/animals/cat_white"), 1), new Pair(new SinglePoolElement("village/common/animals/cat_jellie"), 1), Pair.of(EmptyPoolElement.INSTANCE, 3)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/butcher_animals"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/common/animals/cows_1"), 3), new Pair(new SinglePoolElement("village/common/animals/pigs_1"), 3), new Pair(new SinglePoolElement("village/common/animals/sheep_1"), 1), new Pair(new SinglePoolElement("village/common/animals/sheep_2"), 1)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/iron_golem"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/common/iron_golem"), 1)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/well_bottoms"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/common/well_bottom"), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/houses"), new ResourceLocation("village/plains/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/houses/plains_small_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_small_house_2", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_small_house_3", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_small_house_4", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_small_house_5", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_small_house_6", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_small_house_7", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_small_house_8", immutableList2), 3), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_medium_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_medium_house_2", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_big_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_butcher_shop_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_butcher_shop_2", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_tool_smith_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_fletcher_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_shepherds_house_1"), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_armorer_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_fisher_cottage_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_tannery_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_cartographer_1", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_library_1", immutableList2), 5), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_library_2", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_masons_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_weaponsmith_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_temple_3", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_temple_4", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_stable_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_stable_2"), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_large_farm_1", immutableList4), 4), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_small_farm_1", immutableList4), 4), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_animal_pen_1"), 1), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_animal_pen_2"), 1), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_animal_pen_3"), 5), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_accessory_1"), 1), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_meeting_point_4", ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.7f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()))))), 3), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_meeting_point_5"), 1), Pair.of(EmptyPoolElement.INSTANCE, 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/zombie/houses"), new ResourceLocation("village/plains/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_small_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_small_house_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_small_house_3", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_small_house_4", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_small_house_5", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_small_house_6", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_small_house_7", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_small_house_8", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_medium_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_medium_house_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_big_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_butcher_shop_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_butcher_shop_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_tool_smith_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_fletcher_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_shepherds_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_armorer_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_fisher_cottage_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_tannery_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_cartographer_1", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_library_1", immutableList1), 3), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_library_2", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_masons_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_weaponsmith_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_temple_3", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_temple_4", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_stable_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_stable_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_large_farm_1", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_small_farm_1", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_animal_pen_1", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/plains/houses/plains_animal_pen_2", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_animal_pen_3", immutableList1), 5), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_meeting_point_4", immutableList1), 3), new Pair(new LegacySinglePoolElement("village/plains/zombie/houses/plains_meeting_point_5", immutableList1), 1), Pair.of(EmptyPoolElement.INSTANCE, 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_01", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_02", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_03", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_04", immutableList3), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/trees"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG)), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/plains_lamp_1"), 2), new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG)), 1), new Pair(new FeaturePoolElement(Feature.FLOWER.configured(BiomeDefaultFeatures.PLAIN_FLOWER_CONFIG)), 1), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 2)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/zombie/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/plains_lamp_1", immutableList1), 1), new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.NORMAL_TREE_CONFIG)), 1), new Pair(new FeaturePoolElement(Feature.FLOWER.configured(BiomeDefaultFeatures.PLAIN_FLOWER_CONFIG)), 1), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 2)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/villagers/nitwit"), 1), new Pair(new LegacySinglePoolElement("village/plains/villagers/baby"), 1), new Pair(new LegacySinglePoolElement("village/plains/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/plains/zombie/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/zombie/villagers/nitwit"), 1), new Pair(new LegacySinglePoolElement("village/plains/zombie/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/animals"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/common/animals/cows_1"), 7), new Pair(new LegacySinglePoolElement("village/common/animals/pigs_1"), 7), new Pair(new LegacySinglePoolElement("village/common/animals/horses_1"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/horses_2"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/horses_3"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/horses_4"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/horses_5"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/sheep_1"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/sheep_2"), 1), Pair.of(EmptyPoolElement.INSTANCE, 5)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/sheep"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/common/animals/sheep_1"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/sheep_2"), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/cats"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/common/animals/cat_black"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/cat_british"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/cat_calico"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/cat_persian"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/cat_ragdoll"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/cat_red"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/cat_siamese"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/cat_tabby"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/cat_white"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/cat_jellie"), 1), Pair.of(EmptyPoolElement.INSTANCE, 3)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/butcher_animals"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/common/animals/cows_1"), 3), new Pair(new LegacySinglePoolElement("village/common/animals/pigs_1"), 3), new Pair(new LegacySinglePoolElement("village/common/animals/sheep_1"), 1), new Pair(new LegacySinglePoolElement("village/common/animals/sheep_2"), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/iron_golem"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/common/iron_golem"), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/common/well_bottoms"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/common/well_bottom"), 1)), StructureTemplatePool.Projection.RIGID));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/RandomBooleanSelectorFeature.java b/src/net/minecraft/world/level/levelgen/feature/RandomBooleanSelectorFeature.java
index 1fc8dbb..82c772b 100644
--- a/src/net/minecraft/world/level/levelgen/feature/RandomBooleanSelectorFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/RandomBooleanSelectorFeature.java
@@ -3,24 +3,23 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration;
 
 public class RandomBooleanSelectorFeature extends Feature<RandomBooleanFeatureConfiguration> {
-    public RandomBooleanSelectorFeature(final Function<Dynamic<?>, ? extends RandomBooleanFeatureConfiguration> function) {
-        super(function);
+    public RandomBooleanSelectorFeature(final Codec<RandomBooleanFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final RandomBooleanFeatureConfiguration cgz) {
-        final boolean boolean7 = random.nextBoolean();
-        if (boolean7) {
-            return cgz.featureTrue.place(bjx, caa, random, fk);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final RandomBooleanFeatureConfiguration coe) {
+        final boolean boolean8 = random.nextBoolean();
+        if (boolean8) {
+            return coe.featureTrue.place(bqu, bqq, cha, random, fu);
         }
-        return cgz.featureFalse.place(bjx, caa, random, fk);
+        return coe.featureFalse.place(bqu, bqq, cha, random, fu);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/RandomPatchFeature.java b/src/net/minecraft/world/level/levelgen/feature/RandomPatchFeature.java
index 9865ebe..09e4233 100644
--- a/src/net/minecraft/world/level/levelgen/feature/RandomPatchFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/RandomPatchFeature.java
@@ -2,45 +2,47 @@ package net.minecraft.world.level.levelgen.feature;
 
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration;
 
 public class RandomPatchFeature extends Feature<RandomPatchConfiguration> {
-    public RandomPatchFeature(final Function<Dynamic<?>, ? extends RandomPatchConfiguration> function) {
-        super(function);
+    public RandomPatchFeature(final Codec<RandomPatchConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final RandomPatchConfiguration chb) {
-        final BlockState byj7 = chb.stateProvider.getState(random, fk);
-        BlockPos fk2;
-        if (chb.project) {
-            fk2 = bjx.getHeightmapPos(Heightmap.Types.WORLD_SURFACE_WG, fk);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final RandomPatchConfiguration cog) {
+        final BlockState cfj8 = cog.stateProvider.getState(random, fu);
+        BlockPos fu2;
+        if (cog.project) {
+            fu2 = bqu.getHeightmapPos(Heightmap.Types.WORLD_SURFACE_WG, fu);
         }
         else {
-            fk2 = fk;
+            fu2 = fu;
         }
-        int integer9 = 0;
-        final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
-        for (int integer10 = 0; integer10 < chb.tries; ++integer10) {
-            a10.set(fk2).move(random.nextInt(chb.xspread + 1) - random.nextInt(chb.xspread + 1), random.nextInt(chb.yspread + 1) - random.nextInt(chb.yspread + 1), random.nextInt(chb.zspread + 1) - random.nextInt(chb.zspread + 1));
-            final BlockPos fk3 = a10.below();
-            final BlockState byj8 = bjx.getBlockState(fk3);
-            if ((bjx.isEmptyBlock(a10) || (chb.canReplace && bjx.getBlockState(a10).getMaterial().isReplaceable())) && byj7.canSurvive(bjx, a10) && (chb.whitelist.isEmpty() || chb.whitelist.contains(byj8.getBlock())) && !chb.blacklist.contains(byj8) && (!chb.needWater || bjx.getFluidState(fk3.west()).is(FluidTags.WATER) || bjx.getFluidState(fk3.east()).is(FluidTags.WATER) || bjx.getFluidState(fk3.north()).is(FluidTags.WATER) || bjx.getFluidState(fk3.south()).is(FluidTags.WATER))) {
-                chb.blockPlacer.place(bjx, a10, byj7, random);
-                ++integer9;
+        int integer10 = 0;
+        final BlockPos.MutableBlockPos a11 = new BlockPos.MutableBlockPos();
+        for (int integer11 = 0; integer11 < cog.tries; ++integer11) {
+            a11.setWithOffset(fu2, random.nextInt(cog.xspread + 1) - random.nextInt(cog.xspread + 1), random.nextInt(cog.yspread + 1) - random.nextInt(cog.yspread + 1), random.nextInt(cog.zspread + 1) - random.nextInt(cog.zspread + 1));
+            final BlockPos fu3 = a11.below();
+            final BlockState cfj9 = bqu.getBlockState(fu3);
+            if ((bqu.isEmptyBlock(a11) || (cog.canReplace && bqu.getBlockState(a11).getMaterial().isReplaceable())) && cfj8.canSurvive(bqu, a11) && (cog.whitelist.isEmpty() || cog.whitelist.contains(cfj9.getBlock())) && !cog.blacklist.contains(cfj9) && (!cog.needWater || bqu.getFluidState(fu3.west()).is(FluidTags.WATER) || bqu.getFluidState(fu3.east()).is(FluidTags.WATER) || bqu.getFluidState(fu3.north()).is(FluidTags.WATER) || bqu.getFluidState(fu3.south()).is(FluidTags.WATER))) {
+                cog.blockPlacer.place(bqu, a11, cfj8, random);
+                ++integer10;
             }
         }
-        return integer9 > 0;
+        return integer10 > 0;
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/RandomRandomFeature.java b/src/net/minecraft/world/level/levelgen/feature/RandomRandomFeature.java
index dec4195..c4398d7 100644
--- a/src/net/minecraft/world/level/levelgen/feature/RandomRandomFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/RandomRandomFeature.java
@@ -3,24 +3,23 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomRandomFeatureConfiguration;
 
 public class RandomRandomFeature extends Feature<RandomRandomFeatureConfiguration> {
-    public RandomRandomFeature(final Function<Dynamic<?>, ? extends RandomRandomFeatureConfiguration> function) {
-        super(function);
+    public RandomRandomFeature(final Codec<RandomRandomFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final RandomRandomFeatureConfiguration chc) {
-        for (int integer7 = random.nextInt(5) - 3 + chc.count, integer8 = 0; integer8 < integer7; ++integer8) {
-            final int integer9 = random.nextInt(chc.features.size());
-            final ConfiguredFeature<?, ?> cdc10 = chc.features.get(integer9);
-            cdc10.place(bjx, caa, random, fk);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final RandomRandomFeatureConfiguration coh) {
+        for (int integer8 = random.nextInt(5) - 3 + coh.count, integer9 = 0; integer9 < integer8; ++integer9) {
+            final int integer10 = random.nextInt(coh.features.size());
+            final ConfiguredFeature<?, ?> ckb11 = coh.features.get(integer10);
+            ckb11.place(bqu, bqq, cha, random, fu);
         }
         return true;
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/RandomScatteredFeature.java b/src/net/minecraft/world/level/levelgen/feature/RandomScatteredFeature.java
deleted file mode 100644
index 74ab33d..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/RandomScatteredFeature.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package net.minecraft.world.level.levelgen.feature;
-
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeManager;
-import net.minecraft.world.level.levelgen.WorldgenRandom;
-import net.minecraft.world.level.ChunkPos;
-import java.util.Random;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-
-public abstract class RandomScatteredFeature<C extends FeatureConfiguration> extends StructureFeature<C> {
-    public RandomScatteredFeature(final Function<Dynamic<?>, ? extends C> function) {
-        super(function);
-    }
-    
-    @Override
-    protected ChunkPos getPotentialFeatureChunkFromLocationWithOffset(final ChunkGenerator<?> caa, final Random random, final int integer3, final int integer4, final int integer5, final int integer6) {
-        final int integer7 = this.getSpacing(caa);
-        final int integer8 = this.getSeparation(caa);
-        final int integer9 = integer3 + integer7 * integer5;
-        final int integer10 = integer4 + integer7 * integer6;
-        final int integer11 = (integer9 < 0) ? (integer9 - integer7 + 1) : integer9;
-        final int integer12 = (integer10 < 0) ? (integer10 - integer7 + 1) : integer10;
-        int integer13 = integer11 / integer7;
-        int integer14 = integer12 / integer7;
-        ((WorldgenRandom)random).setLargeFeatureWithSalt(caa.getSeed(), integer13, integer14, this.getRandomSalt());
-        integer13 *= integer7;
-        integer14 *= integer7;
-        integer13 += random.nextInt(integer7 - integer8);
-        integer14 += random.nextInt(integer7 - integer8);
-        return new ChunkPos(integer13, integer14);
-    }
-    
-    @Override
-    public boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt) {
-        final ChunkPos bjh8 = this.getPotentialFeatureChunkFromLocationWithOffset(caa, random, integer4, integer5, 0, 0);
-        return integer4 == bjh8.x && integer5 == bjh8.z && caa.isBiomeValidStartForStructure(bkt, this);
-    }
-    
-    protected int getSpacing(final ChunkGenerator<?> caa) {
-        return ((ChunkGeneratorSettings)caa.getSettings()).getTemplesSpacing();
-    }
-    
-    protected int getSeparation(final ChunkGenerator<?> caa) {
-        return ((ChunkGeneratorSettings)caa.getSettings()).getTemplesSeparation();
-    }
-    
-    protected abstract int getRandomSalt();
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/RandomSelectorFeature.java b/src/net/minecraft/world/level/levelgen/feature/RandomSelectorFeature.java
index e408eb7..07b18a3 100644
--- a/src/net/minecraft/world/level/levelgen/feature/RandomSelectorFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/RandomSelectorFeature.java
@@ -4,25 +4,24 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfigur
 import java.util.Iterator;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration;
 
 public class RandomSelectorFeature extends Feature<RandomFeatureConfiguration> {
-    public RandomSelectorFeature(final Function<Dynamic<?>, ? extends RandomFeatureConfiguration> function) {
-        super(function);
+    public RandomSelectorFeature(final Codec<RandomFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final RandomFeatureConfiguration cha) {
-        for (final WeightedConfiguredFeature<?> cfu8 : cha.features) {
-            if (random.nextFloat() < cfu8.chance) {
-                return cfu8.place(bjx, caa, random, fk);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final RandomFeatureConfiguration cof) {
+        for (final WeightedConfiguredFeature<?> cmw9 : cof.features) {
+            if (random.nextFloat() < cmw9.chance) {
+                return cmw9.place(bqu, bqq, cha, random, fu);
             }
         }
-        return cha.defaultFeature.place(bjx, caa, random, fk);
+        return cof.defaultFeature.place(bqu, bqq, cha, random, fu);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/ReplaceBlobsFeature.java b/src/net/minecraft/world/level/levelgen/feature/ReplaceBlobsFeature.java
new file mode 100644
index 0000000..ae6914c
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/ReplaceBlobsFeature.java
@@ -0,0 +1,64 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.Iterator;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.LevelWriter;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.Direction;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.ReplaceSpheroidConfiguration;
+
+public class ReplaceBlobsFeature extends Feature<ReplaceSpheroidConfiguration> {
+    public ReplaceBlobsFeature(final Codec<ReplaceSpheroidConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final ReplaceSpheroidConfiguration coj) {
+        final Block bvr8 = coj.targetState.getBlock();
+        final BlockPos fu2 = findTarget(bqu, fu.mutable().clamp(Direction.Axis.Y, 1, bqu.getMaxBuildHeight() - 1), bvr8);
+        if (fu2 == null) {
+            return false;
+        }
+        final Vec3i gr10 = calculateReach(random, coj);
+        final int integer11 = Math.max(gr10.getX(), Math.max(gr10.getY(), gr10.getZ()));
+        boolean boolean12 = false;
+        for (final BlockPos fu3 : BlockPos.withinManhattan(fu2, gr10.getX(), gr10.getY(), gr10.getZ())) {
+            if (fu3.distManhattan(fu2) > integer11) {
+                break;
+            }
+            final BlockState cfj15 = bqu.getBlockState(fu3);
+            if (!cfj15.is(bvr8)) {
+                continue;
+            }
+            this.setBlock(bqu, fu3, coj.replaceState);
+            boolean12 = true;
+        }
+        return boolean12;
+    }
+    
+    @Nullable
+    private static BlockPos findTarget(final LevelAccessor bqc, final BlockPos.MutableBlockPos a, final Block bvr) {
+        while (a.getY() > 1) {
+            final BlockState cfj4 = bqc.getBlockState(a);
+            if (cfj4.is(bvr)) {
+                return a;
+            }
+            a.move(Direction.DOWN);
+        }
+        return null;
+    }
+    
+    private static Vec3i calculateReach(final Random random, final ReplaceSpheroidConfiguration coj) {
+        return new Vec3i(coj.minimumReach.getX() + random.nextInt(coj.maximumReach.getX() - coj.minimumReach.getX() + 1), coj.minimumReach.getY() + random.nextInt(coj.maximumReach.getY() - coj.minimumReach.getY() + 1), coj.minimumReach.getZ() + random.nextInt(coj.maximumReach.getZ() - coj.minimumReach.getZ() + 1));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/ReplaceBlockFeature.java b/src/net/minecraft/world/level/levelgen/feature/ReplaceBlockFeature.java
index 7193e3f..56ee208 100644
--- a/src/net/minecraft/world/level/levelgen/feature/ReplaceBlockFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/ReplaceBlockFeature.java
@@ -3,22 +3,21 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockConfiguration;
 
 public class ReplaceBlockFeature extends Feature<ReplaceBlockConfiguration> {
-    public ReplaceBlockFeature(final Function<Dynamic<?>, ? extends ReplaceBlockConfiguration> function) {
-        super(function);
+    public ReplaceBlockFeature(final Codec<ReplaceBlockConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final ReplaceBlockConfiguration chd) {
-        if (bjx.getBlockState(fk).getBlock() == chd.target.getBlock()) {
-            bjx.setBlock(fk, chd.state, 2);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final ReplaceBlockConfiguration coi) {
+        if (bqu.getBlockState(fu).is(coi.target.getBlock())) {
+            bqu.setBlock(fu, coi.state, 2);
         }
         return true;
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/RuinedPortalFeature.java b/src/net/minecraft/world/level/levelgen/feature/RuinedPortalFeature.java
new file mode 100644
index 0000000..bab50d5
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/RuinedPortalFeature.java
@@ -0,0 +1,223 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import java.util.Arrays;
+import java.util.function.Function;
+import java.util.Map;
+import net.minecraft.util.StringRepresentable;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.Util;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.Iterator;
+import net.minecraft.world.level.levelgen.Heightmap;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import net.minecraft.world.level.BlockGetter;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.levelgen.structure.RuinedPortalPiece;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import java.util.Random;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.core.BlockPos;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.RuinedPortalConfiguration;
+
+public class RuinedPortalFeature extends StructureFeature<RuinedPortalConfiguration> {
+    private static final String[] STRUCTURE_LOCATION_PORTALS;
+    private static final String[] STRUCTURE_LOCATION_GIANT_PORTALS;
+    
+    public RuinedPortalFeature(final Codec<RuinedPortalConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public StructureStartFactory<RuinedPortalConfiguration> getStartFactory() {
+        return FeatureStart::new;
+    }
+    
+    private static boolean isCold(final BlockPos fu, final Biome bre) {
+        return bre.getTemperature(fu) < 0.15f;
+    }
+    
+    private static int findSuitableY(final Random random, final ChunkGenerator cha, final RuinedPortalPiece.VerticalPlacement b, final boolean boolean4, final int integer5, final int integer6, final BoundingBox ctd) {
+        int integer7;
+        if (b == RuinedPortalPiece.VerticalPlacement.IN_NETHER) {
+            if (boolean4) {
+                integer7 = randomIntInclusive(random, 32, 100);
+            }
+            else if (random.nextFloat() < 0.5f) {
+                integer7 = randomIntInclusive(random, 27, 29);
+            }
+            else {
+                integer7 = randomIntInclusive(random, 29, 100);
+            }
+        }
+        else if (b == RuinedPortalPiece.VerticalPlacement.IN_MOUNTAIN) {
+            final int integer8 = integer5 - integer6;
+            integer7 = getRandomWithinInterval(random, 70, integer8);
+        }
+        else if (b == RuinedPortalPiece.VerticalPlacement.UNDERGROUND) {
+            final int integer8 = integer5 - integer6;
+            integer7 = getRandomWithinInterval(random, 15, integer8);
+        }
+        else if (b == RuinedPortalPiece.VerticalPlacement.PARTLY_BURIED) {
+            integer7 = integer5 - integer6 + randomIntInclusive(random, 2, 8);
+        }
+        else {
+            integer7 = integer5;
+        }
+        final List<BlockPos> list9 = ImmutableList.<BlockPos>of(new BlockPos(ctd.x0, 0, ctd.z0), new BlockPos(ctd.x1, 0, ctd.z0), new BlockPos(ctd.x0, 0, ctd.z1), new BlockPos(ctd.x1, 0, ctd.z1));
+        final List<BlockGetter> list10 = list9.stream().map(fu -> cha.getBaseColumn(fu.getX(), fu.getZ())).collect(Collectors.toList());
+        final Heightmap.Types a11 = (b == RuinedPortalPiece.VerticalPlacement.ON_OCEAN_FLOOR) ? Heightmap.Types.OCEAN_FLOOR_WG : Heightmap.Types.WORLD_SURFACE_WG;
+        final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos();
+        int integer9 = 0;
+    Label_0385:
+        for (integer9 = integer7; integer9 > 15; --integer9) {
+            int integer10 = 0;
+            a12.set(0, integer9, 0);
+            for (final BlockGetter bpg16 : list10) {
+                final BlockState cfj17 = bpg16.getBlockState(a12);
+                if (cfj17 != null && a11.isOpaque().test(cfj17) && ++integer10 == 3) {
+                    break Label_0385;
+                }
+            }
+        }
+        return integer9;
+    }
+    
+    private static int randomIntInclusive(final Random random, final int integer2, final int integer3) {
+        return random.nextInt(integer3 - integer2 + 1) + integer2;
+    }
+    
+    private static int getRandomWithinInterval(final Random random, final int integer2, final int integer3) {
+        if (integer2 < integer3) {
+            return randomIntInclusive(random, integer2, integer3);
+        }
+        return integer3;
+    }
+    
+    static {
+        STRUCTURE_LOCATION_PORTALS = new String[] { "ruined_portal/portal_1", "ruined_portal/portal_2", "ruined_portal/portal_3", "ruined_portal/portal_4", "ruined_portal/portal_5", "ruined_portal/portal_6", "ruined_portal/portal_7", "ruined_portal/portal_8", "ruined_portal/portal_9", "ruined_portal/portal_10" };
+        STRUCTURE_LOCATION_GIANT_PORTALS = new String[] { "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3" };
+    }
+    
+    public static class FeatureStart extends StructureStart<RuinedPortalConfiguration> {
+        protected FeatureStart(final StructureFeature<RuinedPortalConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
+        }
+        
+        @Override
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final RuinedPortalConfiguration cok) {
+            final RuinedPortalPiece.Properties a9 = new RuinedPortalPiece.Properties();
+            RuinedPortalPiece.VerticalPlacement b8;
+            if (cok.portalType == Type.DESERT) {
+                b8 = RuinedPortalPiece.VerticalPlacement.PARTLY_BURIED;
+                a9.airPocket = false;
+                a9.mossiness = 0.0f;
+            }
+            else if (cok.portalType == Type.JUNGLE) {
+                b8 = RuinedPortalPiece.VerticalPlacement.ON_LAND_SURFACE;
+                a9.airPocket = (this.random.nextFloat() < 0.5f);
+                a9.mossiness = 0.8f;
+                a9.overgrown = true;
+                a9.vines = true;
+            }
+            else if (cok.portalType == Type.SWAMP) {
+                b8 = RuinedPortalPiece.VerticalPlacement.ON_OCEAN_FLOOR;
+                a9.airPocket = false;
+                a9.mossiness = 0.5f;
+                a9.vines = true;
+            }
+            else if (cok.portalType == Type.MOUNTAIN) {
+                final boolean boolean10 = this.random.nextFloat() < 0.5f;
+                b8 = (boolean10 ? RuinedPortalPiece.VerticalPlacement.IN_MOUNTAIN : RuinedPortalPiece.VerticalPlacement.ON_LAND_SURFACE);
+                a9.airPocket = (boolean10 || this.random.nextFloat() < 0.5f);
+            }
+            else if (cok.portalType == Type.OCEAN) {
+                b8 = RuinedPortalPiece.VerticalPlacement.ON_OCEAN_FLOOR;
+                a9.airPocket = false;
+                a9.mossiness = 0.8f;
+            }
+            else if (cok.portalType == Type.NETHER) {
+                b8 = RuinedPortalPiece.VerticalPlacement.IN_NETHER;
+                a9.airPocket = (this.random.nextFloat() < 0.5f);
+                a9.mossiness = 0.0f;
+                a9.replaceWithBlackstone = true;
+            }
+            else {
+                final boolean boolean10 = this.random.nextFloat() < 0.5f;
+                b8 = (boolean10 ? RuinedPortalPiece.VerticalPlacement.UNDERGROUND : RuinedPortalPiece.VerticalPlacement.ON_LAND_SURFACE);
+                a9.airPocket = (boolean10 || this.random.nextFloat() < 0.5f);
+            }
+            ResourceLocation uh10;
+            if (this.random.nextFloat() < 0.05f) {
+                uh10 = new ResourceLocation(RuinedPortalFeature.STRUCTURE_LOCATION_GIANT_PORTALS[this.random.nextInt(RuinedPortalFeature.STRUCTURE_LOCATION_GIANT_PORTALS.length)]);
+            }
+            else {
+                uh10 = new ResourceLocation(RuinedPortalFeature.STRUCTURE_LOCATION_PORTALS[this.random.nextInt(RuinedPortalFeature.STRUCTURE_LOCATION_PORTALS.length)]);
+            }
+            final StructureTemplate cve11 = cva.getOrCreate(uh10);
+            final Rotation cap12 = Util.<Rotation>getRandom(Rotation.values(), this.random);
+            final Mirror bzj13 = (this.random.nextFloat() < 0.5f) ? Mirror.NONE : Mirror.FRONT_BACK;
+            final BlockPos fu14 = new BlockPos(cve11.getSize().getX() / 2, 0, cve11.getSize().getZ() / 2);
+            final BlockPos fu15 = new ChunkPos(integer3, integer4).getWorldPosition();
+            final BoundingBox ctd16 = cve11.getBoundingBox(fu15, cap12, fu14, bzj13);
+            final Vec3i gr17 = ctd16.getCenter();
+            final int integer5 = gr17.getX();
+            final int integer6 = gr17.getZ();
+            final int integer7 = cha.getBaseHeight(integer5, integer6, RuinedPortalPiece.getHeightMapType(b8)) - 1;
+            final int integer8 = findSuitableY(this.random, cha, b8, a9.airPocket, integer7, ctd16.getYSpan(), ctd16);
+            final BlockPos fu16 = new BlockPos(fu15.getX(), integer8, fu15.getZ());
+            if (cok.portalType == Type.MOUNTAIN || cok.portalType == Type.OCEAN || cok.portalType == Type.STANDARD) {
+                a9.cold = isCold(fu16, bre);
+            }
+            this.pieces.add(new RuinedPortalPiece(fu16, b8, a9, uh10, cve11, cap12, bzj13, fu14));
+            this.calculateBoundingBox();
+        }
+    }
+    
+    public enum Type implements StringRepresentable {
+        STANDARD("standard"), 
+        DESERT("desert"), 
+        JUNGLE("jungle"), 
+        SWAMP("swamp"), 
+        MOUNTAIN("mountain"), 
+        OCEAN("ocean"), 
+        NETHER("nether");
+        
+        public static final Codec<Type> CODEC;
+        private static final Map<String, Type> BY_NAME;
+        private final String name;
+        
+        private Type(final String string3) {
+            this.name = string3;
+        }
+        
+        public String getName() {
+            return this.name;
+        }
+        
+        public static Type byName(final String string) {
+            return Type.BY_NAME.get(string);
+        }
+        
+        @Override
+        public String getSerializedName() {
+            return this.name;
+        }
+        
+        static {
+            CODEC = StringRepresentable.<Type>fromEnum(Type::values, Type::byName);
+            BY_NAME = Arrays.<Type>stream(values()).collect(Collectors.toMap(Type::getName, b -> b));
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/SavannaVillagePools.java b/src/net/minecraft/world/level/levelgen/feature/SavannaVillagePools.java
index 196057b..624be46 100644
--- a/src/net/minecraft/world/level/levelgen/feature/SavannaVillagePools.java
+++ b/src/net/minecraft/world/level/levelgen/feature/SavannaVillagePools.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.structures.FeaturePoolElement;
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.feature.structures.EmptyPoolElement;
@@ -8,7 +8,7 @@ import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElemen
 import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
 import com.mojang.datafixers.util.Pair;
-import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.LegacySinglePoolElement;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
 import java.util.List;
@@ -24,6 +24,8 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
 import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
 import net.minecraft.tags.BlockTags;
 
@@ -32,20 +34,20 @@ public class SavannaVillagePools {
     }
     
     static {
-        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new TagMatchTest(BlockTags.DOORS), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.WALL_TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.ACACIA_PLANKS, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.ACACIA_STAIRS, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.ACACIA_LOG, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.ACACIA_WOOD, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.ORANGE_TERRACOTTA, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.YELLOW_TERRACOTTA, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.RED_TERRACOTTA, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GLASS_PANE, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new BlockStateMatchTest((((AbstractStateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), AlwaysTrueTest.INSTANCE, (((AbstractStateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), new ProcessorRule(new BlockStateMatchTest((((AbstractStateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), AlwaysTrueTest.INSTANCE, (((AbstractStateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.MELON_STEM.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/town_centers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/savanna/town_centers/savanna_meeting_point_1"), 100), new Pair(new SinglePoolElement("village/savanna/town_centers/savanna_meeting_point_2"), 50), new Pair(new SinglePoolElement("village/savanna/town_centers/savanna_meeting_point_3"), 150), new Pair(new SinglePoolElement("village/savanna/town_centers/savanna_meeting_point_4"), 150), new Pair(new SinglePoolElement("village/savanna/zombie/town_centers/savanna_meeting_point_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/town_centers/savanna_meeting_point_2", immutableList1), 1), new Pair(new SinglePoolElement("village/savanna/zombie/town_centers/savanna_meeting_point_3", immutableList1), 3), new Pair(new SinglePoolElement("village/savanna/zombie/town_centers/savanna_meeting_point_4", immutableList1), 3)), StructureTemplatePool.Projection.RIGID));
+        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new TagMatchTest(BlockTags.DOORS), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.WALL_TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.ACACIA_PLANKS, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.ACACIA_STAIRS, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.ACACIA_LOG, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.ACACIA_WOOD, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.ORANGE_TERRACOTTA, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.YELLOW_TERRACOTTA, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.RED_TERRACOTTA, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GLASS_PANE, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new BlockStateMatchTest((((StateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), AlwaysTrueTest.INSTANCE, (((StateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), new ProcessorRule(new BlockStateMatchTest((((StateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), AlwaysTrueTest.INSTANCE, (((StateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.MELON_STEM.defaultBlockState()))));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/town_centers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/savanna/town_centers/savanna_meeting_point_1"), 100), new Pair(new LegacySinglePoolElement("village/savanna/town_centers/savanna_meeting_point_2"), 50), new Pair(new LegacySinglePoolElement("village/savanna/town_centers/savanna_meeting_point_3"), 150), new Pair(new LegacySinglePoolElement("village/savanna/town_centers/savanna_meeting_point_4"), 150), new Pair(new LegacySinglePoolElement("village/savanna/zombie/town_centers/savanna_meeting_point_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/town_centers/savanna_meeting_point_2", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/savanna/zombie/town_centers/savanna_meeting_point_3", immutableList1), 3), new Pair(new LegacySinglePoolElement("village/savanna/zombie/town_centers/savanna_meeting_point_4", immutableList1), 3)), StructureTemplatePool.Projection.RIGID));
         final ImmutableList<StructureProcessor> immutableList2 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new BlockMatchTest(Blocks.GRASS_PATH), new BlockMatchTest(Blocks.WATER), Blocks.ACACIA_PLANKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GRASS_PATH, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.GRASS_BLOCK.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.GRASS_BLOCK), new BlockMatchTest(Blocks.WATER), Blocks.WATER.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.DIRT), new BlockMatchTest(Blocks.WATER), Blocks.WATER.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/streets"), new ResourceLocation("village/savanna/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/savanna/streets/corner_01", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/streets/corner_03", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/streets/straight_02", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/streets/straight_04", immutableList2), 7), new Pair(new SinglePoolElement("village/savanna/streets/straight_05", immutableList2), 3), new Pair(new SinglePoolElement("village/savanna/streets/straight_06", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/streets/straight_08", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/streets/straight_09", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/streets/straight_10", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/streets/straight_11", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/streets/crossroad_02", immutableList2), 1), new Pair(new SinglePoolElement("village/savanna/streets/crossroad_03", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/streets/crossroad_04", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/streets/crossroad_05", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/streets/crossroad_06", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/streets/crossroad_07", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/streets/split_01", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/streets/split_02", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/streets/turn_01", immutableList2), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/zombie/streets"), new ResourceLocation("village/savanna/zombie/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/savanna/zombie/streets/corner_01", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/zombie/streets/corner_03", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/zombie/streets/straight_02", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/zombie/streets/straight_04", immutableList2), 7), new Pair(new SinglePoolElement("village/savanna/zombie/streets/straight_05", immutableList2), 3), new Pair(new SinglePoolElement("village/savanna/zombie/streets/straight_06", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/zombie/streets/straight_08", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/zombie/streets/straight_09", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/zombie/streets/straight_10", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/zombie/streets/straight_11", immutableList2), 4), new Pair(new SinglePoolElement("village/savanna/zombie/streets/crossroad_02", immutableList2), 1), new Pair(new SinglePoolElement("village/savanna/zombie/streets/crossroad_03", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/zombie/streets/crossroad_04", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/zombie/streets/crossroad_05", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/zombie/streets/crossroad_06", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/zombie/streets/crossroad_07", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/zombie/streets/split_01", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/zombie/streets/split_02", immutableList2), 2), new Pair(new SinglePoolElement("village/savanna/zombie/streets/turn_01", immutableList2), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/streets"), new ResourceLocation("village/savanna/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/savanna/streets/corner_01", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/streets/corner_03", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/streets/straight_02", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/streets/straight_04", immutableList2), 7), new Pair(new LegacySinglePoolElement("village/savanna/streets/straight_05", immutableList2), 3), new Pair(new LegacySinglePoolElement("village/savanna/streets/straight_06", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/streets/straight_08", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/streets/straight_09", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/streets/straight_10", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/streets/straight_11", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/streets/crossroad_02", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/savanna/streets/crossroad_03", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/streets/crossroad_04", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/streets/crossroad_05", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/streets/crossroad_06", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/streets/crossroad_07", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/streets/split_01", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/streets/split_02", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/streets/turn_01", immutableList2), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/zombie/streets"), new ResourceLocation("village/savanna/zombie/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/corner_01", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/corner_03", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/straight_02", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/straight_04", immutableList2), 7), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/straight_05", immutableList2), 3), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/straight_06", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/straight_08", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/straight_09", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/straight_10", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/straight_11", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/crossroad_02", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/crossroad_03", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/crossroad_04", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/crossroad_05", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/crossroad_06", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/crossroad_07", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/split_01", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/split_02", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/streets/turn_01", immutableList2), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
         final ImmutableList<StructureProcessor> immutableList3 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.MELON_STEM.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/houses"), new ResourceLocation("village/savanna/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/savanna/houses/savanna_small_house_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_small_house_2"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_small_house_3"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_small_house_4"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_small_house_5"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_small_house_6"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_small_house_7"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_small_house_8"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_medium_house_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_medium_house_2"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_butchers_shop_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_butchers_shop_2"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_tool_smith_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_fletcher_house_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_shepherd_1"), 7), new Pair(new SinglePoolElement("village/savanna/houses/savanna_armorer_1"), 1), new Pair(new SinglePoolElement("village/savanna/houses/savanna_fisher_cottage_1"), 3), new Pair(new SinglePoolElement("village/savanna/houses/savanna_tannery_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_cartographer_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_library_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_mason_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_weaponsmith_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_weaponsmith_2"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_temple_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_temple_2"), 3), new Pair(new SinglePoolElement("village/savanna/houses/savanna_large_farm_1", immutableList3), 4), new Pair(new SinglePoolElement("village/savanna/houses/savanna_large_farm_2", immutableList3), 6), new Pair(new SinglePoolElement("village/savanna/houses/savanna_small_farm", immutableList3), 4), new Pair(new SinglePoolElement("village/savanna/houses/savanna_animal_pen_1"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_animal_pen_2"), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_animal_pen_3"), 2), Pair.of(EmptyPoolElement.INSTANCE, 5)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/zombie/houses"), new ResourceLocation("village/savanna/zombie/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_small_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_small_house_2", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_small_house_3", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_small_house_4", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_small_house_5", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_small_house_6", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_small_house_7", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_small_house_8", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_medium_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_medium_house_2", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_butchers_shop_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_butchers_shop_2", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_tool_smith_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_fletcher_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_shepherd_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_armorer_1", immutableList1), 1), new Pair(new SinglePoolElement("village/savanna/houses/savanna_fisher_cottage_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_tannery_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_cartographer_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_library_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_mason_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_weaponsmith_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_weaponsmith_2", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/houses/savanna_temple_1", immutableList1), 1), new Pair(new SinglePoolElement("village/savanna/houses/savanna_temple_2", immutableList1), 3), new Pair(new SinglePoolElement("village/savanna/houses/savanna_large_farm_1", immutableList1), 4), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_large_farm_2", immutableList1), 4), new Pair(new SinglePoolElement("village/savanna/houses/savanna_small_farm", immutableList1), 4), new Pair(new SinglePoolElement("village/savanna/houses/savanna_animal_pen_1", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_animal_pen_2", immutableList1), 2), new Pair(new SinglePoolElement("village/savanna/zombie/houses/savanna_animal_pen_3", immutableList1), 2), Pair.of(EmptyPoolElement.INSTANCE, 5)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/terminators/terminator_01", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_02", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_03", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_04", immutableList2), 1), new Pair(new SinglePoolElement("village/savanna/terminators/terminator_05", immutableList2), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/zombie/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/terminators/terminator_01", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_02", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_03", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_04", immutableList2), 1), new Pair(new SinglePoolElement("village/savanna/zombie/terminators/terminator_05", immutableList2), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/trees"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new FeaturePoolElement(Feature.ACACIA_TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG)), 1)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/savanna/savanna_lamp_post_01"), 4), new Pair(new FeaturePoolElement(Feature.ACACIA_TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.MELON_PILE_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 4)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/zombie/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/savanna/savanna_lamp_post_01", immutableList1), 4), new Pair(new FeaturePoolElement(Feature.ACACIA_TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.MELON_PILE_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 4)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/savanna/villagers/nitwit"), 1), new Pair(new SinglePoolElement("village/savanna/villagers/baby"), 1), new Pair(new SinglePoolElement("village/savanna/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/zombie/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/savanna/zombie/villagers/nitwit"), 1), new Pair(new SinglePoolElement("village/savanna/zombie/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/houses"), new ResourceLocation("village/savanna/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_small_house_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_small_house_2"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_small_house_3"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_small_house_4"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_small_house_5"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_small_house_6"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_small_house_7"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_small_house_8"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_medium_house_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_medium_house_2"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_butchers_shop_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_butchers_shop_2"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_tool_smith_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_fletcher_house_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_shepherd_1"), 7), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_armorer_1"), 1), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_fisher_cottage_1"), 3), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_tannery_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_cartographer_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_library_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_mason_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_weaponsmith_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_weaponsmith_2"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_temple_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_temple_2"), 3), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_large_farm_1", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_large_farm_2", immutableList3), 6), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_small_farm", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_animal_pen_1"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_animal_pen_2"), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_animal_pen_3"), 2), Pair.of(EmptyPoolElement.INSTANCE, 5)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/zombie/houses"), new ResourceLocation("village/savanna/zombie/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_small_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_small_house_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_small_house_3", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_small_house_4", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_small_house_5", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_small_house_6", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_small_house_7", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_small_house_8", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_medium_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_medium_house_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_butchers_shop_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_butchers_shop_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_tool_smith_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_fletcher_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_shepherd_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_armorer_1", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_fisher_cottage_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_tannery_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_cartographer_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_library_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_mason_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_weaponsmith_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_weaponsmith_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_temple_1", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_temple_2", immutableList1), 3), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_large_farm_1", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_large_farm_2", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_small_farm", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/savanna/houses/savanna_animal_pen_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_animal_pen_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/savanna/zombie/houses/savanna_animal_pen_3", immutableList1), 2), Pair.of(EmptyPoolElement.INSTANCE, 5)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_01", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_02", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_03", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_04", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/savanna/terminators/terminator_05", immutableList2), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/zombie/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_01", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_02", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_03", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_04", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/savanna/zombie/terminators/terminator_05", immutableList2), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/trees"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG)), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/savanna/savanna_lamp_post_01"), 4), new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.MELON_PILE_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 4)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/zombie/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/savanna/savanna_lamp_post_01", immutableList1), 4), new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.ACACIA_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.HAY_PILE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.MELON_PILE_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 4)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/savanna/villagers/nitwit"), 1), new Pair(new LegacySinglePoolElement("village/savanna/villagers/baby"), 1), new Pair(new LegacySinglePoolElement("village/savanna/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/savanna/zombie/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/savanna/zombie/villagers/nitwit"), 1), new Pair(new LegacySinglePoolElement("village/savanna/zombie/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/SeaPickleFeature.java b/src/net/minecraft/world/level/levelgen/feature/SeaPickleFeature.java
index c9742d4..710d6eb 100644
--- a/src/net/minecraft/world/level/levelgen/feature/SeaPickleFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/SeaPickleFeature.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.properties.Property;
@@ -11,30 +11,30 @@ import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.CountFeatureConfiguration;
 
 public class SeaPickleFeature extends Feature<CountFeatureConfiguration> {
-    public SeaPickleFeature(final Function<Dynamic<?>, ? extends CountFeatureConfiguration> function) {
-        super(function);
+    public SeaPickleFeature(final Codec<CountFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BlockPos fk, final CountFeatureConfiguration cgh) {
-        int integer7 = 0;
-        for (int integer8 = 0; integer8 < cgh.count; ++integer8) {
-            final int integer9 = random.nextInt(8) - random.nextInt(8);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final CountFeatureConfiguration cnk) {
+        int integer8 = 0;
+        for (int integer9 = 0; integer9 < cnk.count; ++integer9) {
             final int integer10 = random.nextInt(8) - random.nextInt(8);
-            final int integer11 = bjx.getHeight(Heightmap.Types.OCEAN_FLOOR, fk.getX() + integer9, fk.getZ() + integer10);
-            final BlockPos fk2 = new BlockPos(fk.getX() + integer9, integer11, fk.getZ() + integer10);
-            final BlockState byj13 = ((AbstractStateHolder<O, BlockState>)Blocks.SEA_PICKLE.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SeaPickleBlock.PICKLES, random.nextInt(4) + 1);
-            if (bjx.getBlockState(fk2).getBlock() == Blocks.WATER && byj13.canSurvive(bjx, fk2)) {
-                bjx.setBlock(fk2, byj13, 2);
-                ++integer7;
+            final int integer11 = random.nextInt(8) - random.nextInt(8);
+            final int integer12 = bqu.getHeight(Heightmap.Types.OCEAN_FLOOR, fu.getX() + integer10, fu.getZ() + integer11);
+            final BlockPos fu2 = new BlockPos(fu.getX() + integer10, integer12, fu.getZ() + integer11);
+            final BlockState cfj14 = ((StateHolder<O, BlockState>)Blocks.SEA_PICKLE.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)SeaPickleBlock.PICKLES, random.nextInt(4) + 1);
+            if (bqu.getBlockState(fu2).is(Blocks.WATER) && cfj14.canSurvive(bqu, fu2)) {
+                bqu.setBlock(fu2, cfj14, 2);
+                ++integer8;
             }
         }
-        return integer7 > 0;
+        return integer8 > 0;
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/SeagrassFeature.java b/src/net/minecraft/world/level/levelgen/feature/SeagrassFeature.java
index b29e658..9836c65 100644
--- a/src/net/minecraft/world/level/levelgen/feature/SeagrassFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/SeagrassFeature.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
@@ -11,45 +11,44 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.SeagrassFeatureConfiguration;
 
 public class SeagrassFeature extends Feature<SeagrassFeatureConfiguration> {
-    public SeagrassFeature(final Function<Dynamic<?>, ? extends SeagrassFeatureConfiguration> function) {
-        super(function);
+    public SeagrassFeature(final Codec<SeagrassFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final SeagrassFeatureConfiguration che) {
-        int integer7 = 0;
-        for (int integer8 = 0; integer8 < che.count; ++integer8) {
-            final int integer9 = random.nextInt(8) - random.nextInt(8);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final SeagrassFeatureConfiguration col) {
+        int integer8 = 0;
+        for (int integer9 = 0; integer9 < col.count; ++integer9) {
             final int integer10 = random.nextInt(8) - random.nextInt(8);
-            final int integer11 = bjx.getHeight(Heightmap.Types.OCEAN_FLOOR, fk.getX() + integer9, fk.getZ() + integer10);
-            final BlockPos fk2 = new BlockPos(fk.getX() + integer9, integer11, fk.getZ() + integer10);
-            if (bjx.getBlockState(fk2).getBlock() == Blocks.WATER) {
-                final boolean boolean13 = random.nextDouble() < che.tallSeagrassProbability;
-                final BlockState byj14 = boolean13 ? Blocks.TALL_SEAGRASS.defaultBlockState() : Blocks.SEAGRASS.defaultBlockState();
-                if (byj14.canSurvive(bjx, fk2)) {
-                    if (boolean13) {
-                        final BlockState byj15 = ((AbstractStateHolder<O, BlockState>)byj14).<DoubleBlockHalf, DoubleBlockHalf>setValue(TallSeagrass.HALF, DoubleBlockHalf.UPPER);
-                        final BlockPos fk3 = fk2.above();
-                        if (bjx.getBlockState(fk3).getBlock() == Blocks.WATER) {
-                            bjx.setBlock(fk2, byj14, 2);
-                            bjx.setBlock(fk3, byj15, 2);
+            final int integer11 = random.nextInt(8) - random.nextInt(8);
+            final int integer12 = bqu.getHeight(Heightmap.Types.OCEAN_FLOOR, fu.getX() + integer10, fu.getZ() + integer11);
+            final BlockPos fu2 = new BlockPos(fu.getX() + integer10, integer12, fu.getZ() + integer11);
+            if (bqu.getBlockState(fu2).is(Blocks.WATER)) {
+                final boolean boolean14 = random.nextDouble() < col.tallSeagrassProbability;
+                final BlockState cfj15 = boolean14 ? Blocks.TALL_SEAGRASS.defaultBlockState() : Blocks.SEAGRASS.defaultBlockState();
+                if (cfj15.canSurvive(bqu, fu2)) {
+                    if (boolean14) {
+                        final BlockState cfj16 = ((StateHolder<O, BlockState>)cfj15).<DoubleBlockHalf, DoubleBlockHalf>setValue(TallSeagrass.HALF, DoubleBlockHalf.UPPER);
+                        final BlockPos fu3 = fu2.above();
+                        if (bqu.getBlockState(fu3).is(Blocks.WATER)) {
+                            bqu.setBlock(fu2, cfj15, 2);
+                            bqu.setBlock(fu3, cfj16, 2);
                         }
                     }
                     else {
-                        bjx.setBlock(fk2, byj14, 2);
+                        bqu.setBlock(fu2, cfj15, 2);
                     }
-                    ++integer7;
+                    ++integer8;
                 }
             }
         }
-        return integer7 > 0;
+        return integer8 > 0;
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/ShipwreckFeature.java b/src/net/minecraft/world/level/levelgen/feature/ShipwreckFeature.java
index e888c83..dca6924 100644
--- a/src/net/minecraft/world/level/levelgen/feature/ShipwreckFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/ShipwreckFeature.java
@@ -1,65 +1,38 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import java.util.Random;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.structure.ShipwreckPieces;
 import net.minecraft.core.BlockPos;
+import java.util.Random;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
 
-public class ShipwreckFeature extends RandomScatteredFeature<ShipwreckConfiguration> {
-    public ShipwreckFeature(final Function<Dynamic<?>, ? extends ShipwreckConfiguration> function) {
-        super(function);
+public class ShipwreckFeature extends StructureFeature<ShipwreckConfiguration> {
+    public ShipwreckFeature(final Codec<ShipwreckConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public String getFeatureName() {
-        return "Shipwreck";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 3;
-    }
-    
-    @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<ShipwreckConfiguration> getStartFactory() {
         return FeatureStart::new;
     }
     
-    @Override
-    protected int getRandomSalt() {
-        return 165745295;
-    }
-    
-    @Override
-    protected int getSpacing(final ChunkGenerator<?> caa) {
-        return ((ChunkGeneratorSettings)caa.getSettings()).getShipwreckSpacing();
-    }
-    
-    @Override
-    protected int getSeparation(final ChunkGenerator<?> caa) {
-        return ((ChunkGeneratorSettings)caa.getSettings()).getShipwreckSeparation();
-    }
-    
-    public static class FeatureStart extends StructureStart {
-        public FeatureStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class FeatureStart extends StructureStart<ShipwreckConfiguration> {
+        public FeatureStart(final StructureFeature<ShipwreckConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final ShipwreckConfiguration chf7 = caa.<ShipwreckConfiguration>getStructureConfiguration(bkt, Feature.SHIPWRECK);
-            final Rotation btu8 = Rotation.values()[this.random.nextInt(Rotation.values().length)];
-            final BlockPos fk9 = new BlockPos(integer3 * 16, 90, integer4 * 16);
-            ShipwreckPieces.addPieces(cmo, fk9, btu8, this.pieces, this.random, chf7);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final ShipwreckConfiguration com) {
+            final Rotation cap8 = Rotation.getRandom(this.random);
+            final BlockPos fu9 = new BlockPos(integer3 * 16, 90, integer4 * 16);
+            ShipwreckPieces.addPieces(cva, fu9, cap8, this.pieces, this.random, com);
             this.calculateBoundingBox();
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/SimpleBlockFeature.java b/src/net/minecraft/world/level/levelgen/feature/SimpleBlockFeature.java
index 08b7841..0ef1865 100644
--- a/src/net/minecraft/world/level/levelgen/feature/SimpleBlockFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/SimpleBlockFeature.java
@@ -3,22 +3,21 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration;
 
 public class SimpleBlockFeature extends Feature<SimpleBlockConfiguration> {
-    public SimpleBlockFeature(final Function<Dynamic<?>, ? extends SimpleBlockConfiguration> function) {
-        super(function);
+    public SimpleBlockFeature(final Codec<SimpleBlockConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final SimpleBlockConfiguration chg) {
-        if (chg.placeOn.contains(bjx.getBlockState(fk.below())) && chg.placeIn.contains(bjx.getBlockState(fk)) && chg.placeUnder.contains(bjx.getBlockState(fk.above()))) {
-            bjx.setBlock(fk, chg.toPlace, 2);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final SimpleBlockConfiguration coo) {
+        if (coo.placeOn.contains(bqu.getBlockState(fu.below())) && coo.placeIn.contains(bqu.getBlockState(fu)) && coo.placeUnder.contains(bqu.getBlockState(fu.above()))) {
+            bqu.setBlock(fu, coo.toPlace, 2);
             return true;
         }
         return false;
diff --git a/src/net/minecraft/world/level/levelgen/feature/SimpleRandomSelectorFeature.java b/src/net/minecraft/world/level/levelgen/feature/SimpleRandomSelectorFeature.java
index 77a2b4b..2f55fb5 100644
--- a/src/net/minecraft/world/level/levelgen/feature/SimpleRandomSelectorFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/SimpleRandomSelectorFeature.java
@@ -3,22 +3,21 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFeatureConfiguration;
 
 public class SimpleRandomSelectorFeature extends Feature<SimpleRandomFeatureConfiguration> {
-    public SimpleRandomSelectorFeature(final Function<Dynamic<?>, ? extends SimpleRandomFeatureConfiguration> function) {
-        super(function);
+    public SimpleRandomSelectorFeature(final Codec<SimpleRandomFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final SimpleRandomFeatureConfiguration chh) {
-        final int integer7 = random.nextInt(chh.features.size());
-        final ConfiguredFeature<?, ?> cdc8 = chh.features.get(integer7);
-        return cdc8.place(bjx, caa, random, fk);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final SimpleRandomFeatureConfiguration cop) {
+        final int integer8 = random.nextInt(cop.features.size());
+        final ConfiguredFeature<?, ?> ckb9 = cop.features.get(integer8);
+        return ckb9.place(bqu, bqq, cha, random, fu);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/SnowAndFreezeFeature.java b/src/net/minecraft/world/level/levelgen/feature/SnowAndFreezeFeature.java
index fc9eb69..288c69b 100644
--- a/src/net/minecraft/world/level/levelgen/feature/SnowAndFreezeFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/SnowAndFreezeFeature.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.state.BlockState;
@@ -13,38 +13,37 @@ import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class SnowAndFreezeFeature extends Feature<NoneFeatureConfiguration> {
-    public SnowAndFreezeFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public SnowAndFreezeFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        final BlockPos.MutableBlockPos a7 = new BlockPos.MutableBlockPos();
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
         final BlockPos.MutableBlockPos a8 = new BlockPos.MutableBlockPos();
-        for (int integer9 = 0; integer9 < 16; ++integer9) {
-            for (int integer10 = 0; integer10 < 16; ++integer10) {
-                final int integer11 = fk.getX() + integer9;
-                final int integer12 = fk.getZ() + integer10;
-                final int integer13 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer11, integer12);
-                a7.set(integer11, integer13, integer12);
-                a8.set(a7).move(Direction.DOWN, 1);
-                final Biome bkt14 = bjx.getBiome(a7);
-                if (bkt14.shouldFreeze(bjx, a8, false)) {
-                    bjx.setBlock(a8, Blocks.ICE.defaultBlockState(), 2);
+        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos();
+        for (int integer10 = 0; integer10 < 16; ++integer10) {
+            for (int integer11 = 0; integer11 < 16; ++integer11) {
+                final int integer12 = fu.getX() + integer10;
+                final int integer13 = fu.getZ() + integer11;
+                final int integer14 = bqu.getHeight(Heightmap.Types.MOTION_BLOCKING, integer12, integer13);
+                a8.set(integer12, integer14, integer13);
+                a9.set(a8).move(Direction.DOWN, 1);
+                final Biome bre15 = bqu.getBiome(a8);
+                if (bre15.shouldFreeze(bqu, a9, false)) {
+                    bqu.setBlock(a9, Blocks.ICE.defaultBlockState(), 2);
                 }
-                if (bkt14.shouldSnow(bjx, a7)) {
-                    bjx.setBlock(a7, Blocks.SNOW.defaultBlockState(), 2);
-                    final BlockState byj15 = bjx.getBlockState(a8);
-                    if (byj15.<Comparable>hasProperty((Property<Comparable>)SnowyDirtBlock.SNOWY)) {
-                        bjx.setBlock(a8, ((AbstractStateHolder<O, BlockState>)byj15).<Comparable, Boolean>setValue((Property<Comparable>)SnowyDirtBlock.SNOWY, true), 2);
+                if (bre15.shouldSnow(bqu, a8)) {
+                    bqu.setBlock(a8, Blocks.SNOW.defaultBlockState(), 2);
+                    final BlockState cfj16 = bqu.getBlockState(a9);
+                    if (cfj16.<Comparable>hasProperty((Property<Comparable>)SnowyDirtBlock.SNOWY)) {
+                        bqu.setBlock(a9, ((StateHolder<O, BlockState>)cfj16).<Comparable, Boolean>setValue((Property<Comparable>)SnowyDirtBlock.SNOWY, true), 2);
                     }
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/feature/SnowyVillagePools.java b/src/net/minecraft/world/level/levelgen/feature/SnowyVillagePools.java
index 78ffb4e..cbf93ea 100644
--- a/src/net/minecraft/world/level/levelgen/feature/SnowyVillagePools.java
+++ b/src/net/minecraft/world/level/levelgen/feature/SnowyVillagePools.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.structures.FeaturePoolElement;
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.feature.structures.EmptyPoolElement;
@@ -8,7 +8,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProc
 import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement;
 import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
 import com.mojang.datafixers.util.Pair;
-import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.LegacySinglePoolElement;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
 import java.util.List;
@@ -24,6 +24,8 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
 import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
 import net.minecraft.tags.BlockTags;
 
@@ -32,19 +34,19 @@ public class SnowyVillagePools {
     }
     
     static {
-        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new TagMatchTest(BlockTags.DOORS), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.WALL_TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.LANTERN), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.SPRUCE_PLANKS, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.SPRUCE_SLAB, 0.4f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.STRIPPED_SPRUCE_LOG, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.STRIPPED_SPRUCE_WOOD, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GLASS_PANE, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new BlockStateMatchTest((((AbstractStateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), AlwaysTrueTest.INSTANCE, (((AbstractStateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), new ProcessorRule(new BlockStateMatchTest((((AbstractStateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), AlwaysTrueTest.INSTANCE, (((AbstractStateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.CARROTS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.8f), AlwaysTrueTest.INSTANCE, Blocks.POTATOES.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/town_centers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/snowy/town_centers/snowy_meeting_point_1"), 100), new Pair(new SinglePoolElement("village/snowy/town_centers/snowy_meeting_point_2"), 50), new Pair(new SinglePoolElement("village/snowy/town_centers/snowy_meeting_point_3"), 150), new Pair(new SinglePoolElement("village/snowy/zombie/town_centers/snowy_meeting_point_1"), 2), new Pair(new SinglePoolElement("village/snowy/zombie/town_centers/snowy_meeting_point_2"), 1), new Pair(new SinglePoolElement("village/snowy/zombie/town_centers/snowy_meeting_point_3"), 3)), StructureTemplatePool.Projection.RIGID));
+        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new TagMatchTest(BlockTags.DOORS), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.WALL_TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.LANTERN), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.SPRUCE_PLANKS, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.SPRUCE_SLAB, 0.4f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.STRIPPED_SPRUCE_LOG, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.STRIPPED_SPRUCE_WOOD, 0.05f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GLASS_PANE, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new BlockStateMatchTest((((StateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), AlwaysTrueTest.INSTANCE, (((StateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), new ProcessorRule(new BlockStateMatchTest((((StateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), AlwaysTrueTest.INSTANCE, (((StateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.CARROTS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.8f), AlwaysTrueTest.INSTANCE, Blocks.POTATOES.defaultBlockState()))));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/town_centers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/snowy/town_centers/snowy_meeting_point_1"), 100), new Pair(new LegacySinglePoolElement("village/snowy/town_centers/snowy_meeting_point_2"), 50), new Pair(new LegacySinglePoolElement("village/snowy/town_centers/snowy_meeting_point_3"), 150), new Pair(new LegacySinglePoolElement("village/snowy/zombie/town_centers/snowy_meeting_point_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/town_centers/snowy_meeting_point_2"), 1), new Pair(new LegacySinglePoolElement("village/snowy/zombie/town_centers/snowy_meeting_point_3"), 3)), StructureTemplatePool.Projection.RIGID));
         final ImmutableList<StructureProcessor> immutableList2 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new BlockMatchTest(Blocks.GRASS_PATH), new BlockMatchTest(Blocks.WATER), Blocks.SPRUCE_PLANKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GRASS_PATH, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.GRASS_BLOCK.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.GRASS_BLOCK), new BlockMatchTest(Blocks.WATER), Blocks.WATER.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.DIRT), new BlockMatchTest(Blocks.WATER), Blocks.WATER.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/streets"), new ResourceLocation("village/snowy/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/snowy/streets/corner_01", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/streets/corner_02", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/streets/corner_03", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/streets/square_01", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/streets/straight_01", immutableList2), 4), new Pair(new SinglePoolElement("village/snowy/streets/straight_02", immutableList2), 4), new Pair(new SinglePoolElement("village/snowy/streets/straight_03", immutableList2), 4), new Pair(new SinglePoolElement("village/snowy/streets/straight_04", immutableList2), 7), new Pair(new SinglePoolElement("village/snowy/streets/straight_06", immutableList2), 4), new Pair(new SinglePoolElement("village/snowy/streets/straight_08", immutableList2), 4), new Pair(new SinglePoolElement("village/snowy/streets/crossroad_02", immutableList2), 1), new Pair(new SinglePoolElement("village/snowy/streets/crossroad_03", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/streets/crossroad_04", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/streets/crossroad_05", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/streets/crossroad_06", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/streets/turn_01", immutableList2), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/zombie/streets"), new ResourceLocation("village/snowy/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/snowy/zombie/streets/corner_01", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/zombie/streets/corner_02", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/zombie/streets/corner_03", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/zombie/streets/square_01", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/zombie/streets/straight_01", immutableList2), 4), new Pair(new SinglePoolElement("village/snowy/zombie/streets/straight_02", immutableList2), 4), new Pair(new SinglePoolElement("village/snowy/zombie/streets/straight_03", immutableList2), 4), new Pair(new SinglePoolElement("village/snowy/zombie/streets/straight_04", immutableList2), 7), new Pair(new SinglePoolElement("village/snowy/zombie/streets/straight_06", immutableList2), 4), new Pair(new SinglePoolElement("village/snowy/zombie/streets/straight_08", immutableList2), 4), new Pair(new SinglePoolElement("village/snowy/zombie/streets/crossroad_02", immutableList2), 1), new Pair(new SinglePoolElement("village/snowy/zombie/streets/crossroad_03", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/zombie/streets/crossroad_04", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/zombie/streets/crossroad_05", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/zombie/streets/crossroad_06", immutableList2), 2), new Pair(new SinglePoolElement("village/snowy/zombie/streets/turn_01", immutableList2), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/streets"), new ResourceLocation("village/snowy/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/snowy/streets/corner_01", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/streets/corner_02", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/streets/corner_03", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/streets/square_01", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/streets/straight_01", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/snowy/streets/straight_02", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/snowy/streets/straight_03", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/snowy/streets/straight_04", immutableList2), 7), new Pair(new LegacySinglePoolElement("village/snowy/streets/straight_06", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/snowy/streets/straight_08", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/snowy/streets/crossroad_02", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/snowy/streets/crossroad_03", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/streets/crossroad_04", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/streets/crossroad_05", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/streets/crossroad_06", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/streets/turn_01", immutableList2), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/zombie/streets"), new ResourceLocation("village/snowy/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/corner_01", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/corner_02", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/corner_03", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/square_01", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/straight_01", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/straight_02", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/straight_03", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/straight_04", immutableList2), 7), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/straight_06", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/straight_08", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/crossroad_02", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/crossroad_03", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/crossroad_04", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/crossroad_05", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/crossroad_06", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/streets/turn_01", immutableList2), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
         final ImmutableList<StructureProcessor> immutableList3 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.CARROTS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.8f), AlwaysTrueTest.INSTANCE, Blocks.POTATOES.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/houses"), new ResourceLocation("village/snowy/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/snowy/houses/snowy_small_house_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_small_house_2"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_small_house_3"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_small_house_4"), 3), new Pair(new SinglePoolElement("village/snowy/houses/snowy_small_house_5"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_small_house_6"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_small_house_7"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_small_house_8"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_medium_house_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_medium_house_2"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_medium_house_3"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_butchers_shop_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_butchers_shop_2"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_tool_smith_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_fletcher_house_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_shepherds_house_1"), 3), new Pair(new SinglePoolElement("village/snowy/houses/snowy_armorer_house_1"), 1), new Pair(new SinglePoolElement("village/snowy/houses/snowy_armorer_house_2"), 1), new Pair(new SinglePoolElement("village/snowy/houses/snowy_fisher_cottage"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_tannery_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_cartographer_house_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_library_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_masons_house_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_masons_house_2"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_weapon_smith_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_temple_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_farm_1", immutableList3), 3), new Pair(new SinglePoolElement("village/snowy/houses/snowy_farm_2", immutableList3), 3), new Pair(new SinglePoolElement("village/snowy/houses/snowy_animal_pen_1"), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_animal_pen_2"), 2), Pair.of(EmptyPoolElement.INSTANCE, 6)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/zombie/houses"), new ResourceLocation("village/snowy/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_small_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_small_house_2", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_small_house_3", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_small_house_4", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_small_house_5", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_small_house_6", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_small_house_7", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_small_house_8", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_medium_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_medium_house_2", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/zombie/houses/snowy_medium_house_3", immutableList1), 1), new Pair(new SinglePoolElement("village/snowy/houses/snowy_butchers_shop_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_butchers_shop_2", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_tool_smith_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_fletcher_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_shepherds_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_armorer_house_1", immutableList1), 1), new Pair(new SinglePoolElement("village/snowy/houses/snowy_armorer_house_2", immutableList1), 1), new Pair(new SinglePoolElement("village/snowy/houses/snowy_fisher_cottage", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_tannery_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_cartographer_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_library_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_masons_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_masons_house_2", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_weapon_smith_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_temple_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_farm_1", immutableList1), 3), new Pair(new SinglePoolElement("village/snowy/houses/snowy_farm_2", immutableList1), 3), new Pair(new SinglePoolElement("village/snowy/houses/snowy_animal_pen_1", immutableList1), 2), new Pair(new SinglePoolElement("village/snowy/houses/snowy_animal_pen_2", immutableList1), 2), Pair.of(EmptyPoolElement.INSTANCE, 6)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/terminators/terminator_01", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_02", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_03", immutableList2), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_04", immutableList2), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/trees"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new FeaturePoolElement(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG)), 1)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/snowy/snowy_lamp_post_01"), 4), new Pair(new SinglePoolElement("village/snowy/snowy_lamp_post_02"), 4), new Pair(new SinglePoolElement("village/snowy/snowy_lamp_post_03"), 1), new Pair(new FeaturePoolElement(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.SNOW_PILE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.ICE_PILE_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 9)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/zombie/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/snowy/snowy_lamp_post_01", immutableList1), 1), new Pair(new SinglePoolElement("village/snowy/snowy_lamp_post_02", immutableList1), 1), new Pair(new SinglePoolElement("village/snowy/snowy_lamp_post_03", immutableList1), 1), new Pair(new FeaturePoolElement(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.SNOW_PILE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.ICE_PILE_CONFIG)), 4), Pair.of(EmptyPoolElement.INSTANCE, 7)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/snowy/villagers/nitwit"), 1), new Pair(new SinglePoolElement("village/snowy/villagers/baby"), 1), new Pair(new SinglePoolElement("village/snowy/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/zombie/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/snowy/zombie/villagers/nitwit"), 1), new Pair(new SinglePoolElement("village/snowy/zombie/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/houses"), new ResourceLocation("village/snowy/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_small_house_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_small_house_2"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_small_house_3"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_small_house_4"), 3), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_small_house_5"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_small_house_6"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_small_house_7"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_small_house_8"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_medium_house_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_medium_house_2"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_medium_house_3"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_butchers_shop_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_butchers_shop_2"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_tool_smith_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_fletcher_house_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_shepherds_house_1"), 3), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_armorer_house_1"), 1), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_armorer_house_2"), 1), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_fisher_cottage"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_tannery_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_cartographer_house_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_library_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_masons_house_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_masons_house_2"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_weapon_smith_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_temple_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_farm_1", immutableList3), 3), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_farm_2", immutableList3), 3), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_animal_pen_1"), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_animal_pen_2"), 2), Pair.of(EmptyPoolElement.INSTANCE, 6)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/zombie/houses"), new ResourceLocation("village/snowy/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_small_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_small_house_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_small_house_3", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_small_house_4", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_small_house_5", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_small_house_6", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_small_house_7", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_small_house_8", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_medium_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_medium_house_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/zombie/houses/snowy_medium_house_3", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_butchers_shop_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_butchers_shop_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_tool_smith_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_fletcher_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_shepherds_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_armorer_house_1", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_armorer_house_2", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_fisher_cottage", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_tannery_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_cartographer_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_library_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_masons_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_masons_house_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_weapon_smith_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_temple_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_farm_1", immutableList1), 3), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_farm_2", immutableList1), 3), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_animal_pen_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/snowy/houses/snowy_animal_pen_2", immutableList1), 2), Pair.of(EmptyPoolElement.INSTANCE, 6)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_01", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_02", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_03", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_04", immutableList2), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/trees"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG)), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/snowy/snowy_lamp_post_01"), 4), new Pair(new LegacySinglePoolElement("village/snowy/snowy_lamp_post_02"), 4), new Pair(new LegacySinglePoolElement("village/snowy/snowy_lamp_post_03"), 1), new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.SNOW_PILE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.ICE_PILE_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 9)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/zombie/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/snowy/snowy_lamp_post_01", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/snowy/snowy_lamp_post_02", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/snowy/snowy_lamp_post_03", immutableList1), 1), new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.SNOW_PILE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.ICE_PILE_CONFIG)), 4), Pair.of(EmptyPoolElement.INSTANCE, 7)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/snowy/villagers/nitwit"), 1), new Pair(new LegacySinglePoolElement("village/snowy/villagers/baby"), 1), new Pair(new LegacySinglePoolElement("village/snowy/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/snowy/zombie/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/snowy/zombie/villagers/nitwit"), 1), new Pair(new LegacySinglePoolElement("village/snowy/zombie/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/SpikeFeature.java b/src/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
index f02a79f..bc3ac60 100644
--- a/src/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
@@ -1,14 +1,14 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.phys.AABB;
 import com.google.common.cache.CacheLoader;
 import java.util.concurrent.TimeUnit;
@@ -24,13 +24,13 @@ import net.minecraft.util.Mth;
 import net.minecraft.world.level.LevelWriter;
 import net.minecraft.world.level.block.Blocks;
 import java.util.Iterator;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import java.util.Random;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import java.util.List;
 import com.google.common.cache.LoadingCache;
 import net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration;
@@ -38,41 +38,41 @@ import net.minecraft.world.level.levelgen.feature.configurations.SpikeConfigurat
 public class SpikeFeature extends Feature<SpikeConfiguration> {
     private static final LoadingCache<Long, List<EndSpike>> SPIKE_CACHE;
     
-    public SpikeFeature(final Function<Dynamic<?>, ? extends SpikeConfiguration> function) {
-        super(function);
+    public SpikeFeature(final Codec<SpikeConfiguration> codec) {
+        super(codec);
     }
     
-    public static List<EndSpike> getSpikesForLevel(final LevelAccessor bjx) {
-        final Random random2 = new Random(bjx.getSeed());
+    public static List<EndSpike> getSpikesForLevel(final WorldGenLevel bqu) {
+        final Random random2 = new Random(bqu.getSeed());
         final long long3 = random2.nextLong() & 0xFFFFL;
         return SpikeFeature.SPIKE_CACHE.getUnchecked(long3);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final SpikeConfiguration chj) {
-        List<EndSpike> list7 = chj.getSpikes();
-        if (list7.isEmpty()) {
-            list7 = getSpikesForLevel(bjx);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final SpikeConfiguration coq) {
+        List<EndSpike> list8 = coq.getSpikes();
+        if (list8.isEmpty()) {
+            list8 = getSpikesForLevel(bqu);
         }
-        for (final EndSpike a9 : list7) {
-            if (a9.isCenterWithinChunk(fk)) {
-                this.placeSpike(bjx, random, chj, a9);
+        for (final EndSpike a10 : list8) {
+            if (a10.isCenterWithinChunk(fu)) {
+                this.placeSpike(bqu, random, coq, a10);
             }
         }
         return true;
     }
     
-    private void placeSpike(final LevelAccessor bjx, final Random random, final SpikeConfiguration chj, final EndSpike a) {
+    private void placeSpike(final LevelAccessor bqc, final Random random, final SpikeConfiguration coq, final EndSpike a) {
         final int integer6 = a.getRadius();
-        for (final BlockPos fk8 : BlockPos.betweenClosed(new BlockPos(a.getCenterX() - integer6, 0, a.getCenterZ() - integer6), new BlockPos(a.getCenterX() + integer6, a.getHeight() + 10, a.getCenterZ() + integer6))) {
-            if (fk8.distSqr(a.getCenterX(), fk8.getY(), a.getCenterZ(), false) <= integer6 * integer6 + 1 && fk8.getY() < a.getHeight()) {
-                this.setBlock(bjx, fk8, Blocks.OBSIDIAN.defaultBlockState());
+        for (final BlockPos fu8 : BlockPos.betweenClosed(new BlockPos(a.getCenterX() - integer6, 0, a.getCenterZ() - integer6), new BlockPos(a.getCenterX() + integer6, a.getHeight() + 10, a.getCenterZ() + integer6))) {
+            if (fu8.distSqr(a.getCenterX(), fu8.getY(), a.getCenterZ(), false) <= integer6 * integer6 + 1 && fu8.getY() < a.getHeight()) {
+                this.setBlock(bqc, fu8, Blocks.OBSIDIAN.defaultBlockState());
             }
             else {
-                if (fk8.getY() <= 65) {
+                if (fu8.getY() <= 65) {
                     continue;
                 }
-                this.setBlock(bjx, fk8, Blocks.AIR.defaultBlockState());
+                this.setBlock(bqc, fu8, Blocks.AIR.defaultBlockState());
             }
         }
         if (a.isGuarded()) {
@@ -89,19 +89,19 @@ public class SpikeFeature extends Feature<SpikeConfiguration> {
                         if (boolean14 || boolean15 || boolean16) {
                             final boolean boolean17 = integer10 == -2 || integer10 == 2 || boolean16;
                             final boolean boolean18 = integer11 == -2 || integer11 == 2 || boolean16;
-                            final BlockState byj19 = (((((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, boolean17 && integer11 != -2)).setValue((Property<Comparable>)IronBarsBlock.SOUTH, boolean17 && integer11 != 2)).setValue((Property<Comparable>)IronBarsBlock.WEST, boolean18 && integer10 != -2)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, boolean18 && integer10 != 2);
-                            this.setBlock(bjx, a2.set(a.getCenterX() + integer10, a.getHeight() + integer12, a.getCenterZ() + integer11), byj19);
+                            final BlockState cfj19 = (((((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, boolean17 && integer11 != -2)).setValue((Property<Comparable>)IronBarsBlock.SOUTH, boolean17 && integer11 != 2)).setValue((Property<Comparable>)IronBarsBlock.WEST, boolean18 && integer10 != -2)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, boolean18 && integer10 != 2);
+                            this.setBlock(bqc, a2.set(a.getCenterX() + integer10, a.getHeight() + integer12, a.getCenterZ() + integer11), cfj19);
                         }
                     }
                 }
             }
         }
-        final EndCrystal aur7 = EntityType.END_CRYSTAL.create(bjx.getLevel());
-        aur7.setBeamTarget(chj.getCrystalBeamTarget());
-        aur7.setInvulnerable(chj.isCrystalInvulnerable());
-        aur7.moveTo(a.getCenterX() + 0.5f, a.getHeight() + 1, a.getCenterZ() + 0.5f, random.nextFloat() * 360.0f, 0.0f);
-        bjx.addFreshEntity(aur7);
-        this.setBlock(bjx, new BlockPos(a.getCenterX(), a.getHeight(), a.getCenterZ()), Blocks.BEDROCK.defaultBlockState());
+        final EndCrystal bab7 = EntityType.END_CRYSTAL.create(bqc.getLevel());
+        bab7.setBeamTarget(coq.getCrystalBeamTarget());
+        bab7.setInvulnerable(coq.isCrystalInvulnerable());
+        bab7.moveTo(a.getCenterX() + 0.5, a.getHeight() + 1, a.getCenterZ() + 0.5, random.nextFloat() * 360.0f, 0.0f);
+        bqc.addFreshEntity(bab7);
+        this.setBlock(bqc, new BlockPos(a.getCenterX(), a.getHeight(), a.getCenterZ()), Blocks.BEDROCK.defaultBlockState());
     }
     
     static {
@@ -109,6 +109,7 @@ public class SpikeFeature extends Feature<SpikeConfiguration> {
     }
     
     public static class EndSpike {
+        public static final Codec<EndSpike> CODEC;
         private final int centerX;
         private final int centerZ;
         private final int radius;
@@ -125,8 +126,8 @@ public class SpikeFeature extends Feature<SpikeConfiguration> {
             this.topBoundingBox = new AABB(integer1 - integer3, 0.0, integer2 - integer3, integer1 + integer3, 256.0, integer2 + integer3);
         }
         
-        public boolean isCenterWithinChunk(final BlockPos fk) {
-            return fk.getX() >> 4 == this.centerX >> 4 && fk.getZ() >> 4 == this.centerZ >> 4;
+        public boolean isCenterWithinChunk(final BlockPos fu) {
+            return fu.getX() >> 4 == this.centerX >> 4 && fu.getZ() >> 4 == this.centerZ >> 4;
         }
         
         public int getCenterX() {
@@ -153,18 +154,8 @@ public class SpikeFeature extends Feature<SpikeConfiguration> {
             return this.topBoundingBox;
         }
         
-        public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-            final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-            builder3.put((T)dynamicOps.createString("centerX"), (T)dynamicOps.createInt(this.centerX));
-            builder3.put((T)dynamicOps.createString("centerZ"), (T)dynamicOps.createInt(this.centerZ));
-            builder3.put((T)dynamicOps.createString("radius"), (T)dynamicOps.createInt(this.radius));
-            builder3.put((T)dynamicOps.createString("height"), (T)dynamicOps.createInt(this.height));
-            builder3.put((T)dynamicOps.createString("guarded"), (T)dynamicOps.createBoolean(this.guarded));
-            return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build()));
-        }
-        
-        public static <T> EndSpike deserialize(final Dynamic<T> dynamic) {
-            return new EndSpike(dynamic.get("centerX").asInt(0), dynamic.get("centerZ").asInt(0), dynamic.get("radius").asInt(0), dynamic.get("height").asInt(0), dynamic.get("guarded").asBoolean(false));
+        static {
+            CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("centerX").withDefault(0).forGetter(a -> a.centerX), (App)Codec.INT.fieldOf("centerZ").withDefault(0).forGetter(a -> a.centerZ), (App)Codec.INT.fieldOf("radius").withDefault(0).forGetter(a -> a.radius), (App)Codec.INT.fieldOf("height").withDefault(0).forGetter(a -> a.height), (App)Codec.BOOL.fieldOf("guarded").withDefault(false).forGetter(a -> a.guarded)).apply(instance, EndSpike::new));
         }
     }
     
diff --git a/src/net/minecraft/world/level/levelgen/feature/SpringFeature.java b/src/net/minecraft/world/level/levelgen/feature/SpringFeature.java
index 14fc451..81e4d66 100644
--- a/src/net/minecraft/world/level/levelgen/feature/SpringFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/SpringFeature.java
@@ -4,68 +4,67 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfigur
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration;
 
 public class SpringFeature extends Feature<SpringConfiguration> {
-    public SpringFeature(final Function<Dynamic<?>, ? extends SpringConfiguration> function) {
-        super(function);
+    public SpringFeature(final Codec<SpringConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final SpringConfiguration chk) {
-        if (!chk.validBlocks.contains(bjx.getBlockState(fk.above()).getBlock())) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final SpringConfiguration cor) {
+        if (!cor.validBlocks.contains(bqu.getBlockState(fu.above()).getBlock())) {
             return false;
         }
-        if (chk.requiresBlockBelow && !chk.validBlocks.contains(bjx.getBlockState(fk.below()).getBlock())) {
+        if (cor.requiresBlockBelow && !cor.validBlocks.contains(bqu.getBlockState(fu.below()).getBlock())) {
             return false;
         }
-        final BlockState byj7 = bjx.getBlockState(fk);
-        if (!byj7.isAir() && !chk.validBlocks.contains(byj7.getBlock())) {
+        final BlockState cfj8 = bqu.getBlockState(fu);
+        if (!cfj8.isAir() && !cor.validBlocks.contains(cfj8.getBlock())) {
             return false;
         }
-        int integer8 = 0;
         int integer9 = 0;
-        if (chk.validBlocks.contains(bjx.getBlockState(fk.west()).getBlock())) {
-            ++integer9;
-        }
-        if (chk.validBlocks.contains(bjx.getBlockState(fk.east()).getBlock())) {
-            ++integer9;
-        }
-        if (chk.validBlocks.contains(bjx.getBlockState(fk.north()).getBlock())) {
-            ++integer9;
-        }
-        if (chk.validBlocks.contains(bjx.getBlockState(fk.south()).getBlock())) {
-            ++integer9;
-        }
-        if (chk.validBlocks.contains(bjx.getBlockState(fk.below()).getBlock())) {
-            ++integer9;
-        }
         int integer10 = 0;
-        if (bjx.isEmptyBlock(fk.west())) {
+        if (cor.validBlocks.contains(bqu.getBlockState(fu.west()).getBlock())) {
             ++integer10;
         }
-        if (bjx.isEmptyBlock(fk.east())) {
+        if (cor.validBlocks.contains(bqu.getBlockState(fu.east()).getBlock())) {
             ++integer10;
         }
-        if (bjx.isEmptyBlock(fk.north())) {
+        if (cor.validBlocks.contains(bqu.getBlockState(fu.north()).getBlock())) {
             ++integer10;
         }
-        if (bjx.isEmptyBlock(fk.south())) {
+        if (cor.validBlocks.contains(bqu.getBlockState(fu.south()).getBlock())) {
             ++integer10;
         }
-        if (bjx.isEmptyBlock(fk.below())) {
+        if (cor.validBlocks.contains(bqu.getBlockState(fu.below()).getBlock())) {
             ++integer10;
         }
-        if (integer9 == chk.rockCount && integer10 == chk.holeCount) {
-            bjx.setBlock(fk, chk.state.createLegacyBlock(), 2);
-            bjx.getLiquidTicks().scheduleTick(fk, chk.state.getType(), 0);
-            ++integer8;
+        int integer11 = 0;
+        if (bqu.isEmptyBlock(fu.west())) {
+            ++integer11;
         }
-        return integer8 > 0;
+        if (bqu.isEmptyBlock(fu.east())) {
+            ++integer11;
+        }
+        if (bqu.isEmptyBlock(fu.north())) {
+            ++integer11;
+        }
+        if (bqu.isEmptyBlock(fu.south())) {
+            ++integer11;
+        }
+        if (bqu.isEmptyBlock(fu.below())) {
+            ++integer11;
+        }
+        if (integer10 == cor.rockCount && integer11 == cor.holeCount) {
+            bqu.setBlock(fu, cor.state.createLegacyBlock(), 2);
+            bqu.getLiquidTicks().scheduleTick(fu, cor.state.getType(), 0);
+            ++integer9;
+        }
+        return integer9 > 0;
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/StrongholdFeature.java b/src/net/minecraft/world/level/levelgen/feature/StrongholdFeature.java
index 93e2234..05027be 100644
--- a/src/net/minecraft/world/level/levelgen/feature/StrongholdFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/StrongholdFeature.java
@@ -1,186 +1,65 @@
 package net.minecraft.world.level.levelgen.feature;
 
+import java.util.List;
 import net.minecraft.world.level.levelgen.structure.StructurePiece;
+import java.util.Random;
 import net.minecraft.world.level.levelgen.structure.StrongholdPieces;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import java.util.Iterator;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.core.Registry;
-import javax.annotation.Nullable;
-import net.minecraft.core.Vec3i;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.biome.Biome;
-import java.util.Random;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.biome.BiomeManager;
-import com.google.common.collect.Lists;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
-import java.util.List;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class StrongholdFeature extends StructureFeature<NoneFeatureConfiguration> {
-    private boolean isSpotSelected;
-    private ChunkPos[] strongholdPos;
-    private final List<StructureStart> discoveredStarts;
-    private long currentSeed;
-    
-    public StrongholdFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
-        this.discoveredStarts = Lists.newArrayList();
+    public StrongholdFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt) {
-        if (this.currentSeed != caa.getSeed()) {
-            this.reset();
-        }
-        if (!this.isSpotSelected) {
-            this.generatePositions(caa);
-            this.isSpotSelected = true;
-        }
-        for (final ChunkPos bjh11 : this.strongholdPos) {
-            if (integer4 == bjh11.x && integer5 == bjh11.z) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    private void reset() {
-        this.isSpotSelected = false;
-        this.strongholdPos = null;
-        this.discoveredStarts.clear();
-    }
-    
-    @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
         return StrongholdStart::new;
     }
     
     @Override
-    public String getFeatureName() {
-        return "Stronghold";
+    protected boolean isFeatureChunk(final ChunkGenerator cha, final BiomeSource brh, final long long3, final WorldgenRandom ciy, final int integer5, final int integer6, final Biome bre, final ChunkPos bph, final NoneFeatureConfiguration coa) {
+        return cha.hasStronghold(new ChunkPos(integer5, integer6));
     }
     
-    @Override
-    public int getLookupRange() {
-        return 8;
-    }
-    
-    @Nullable
-    @Override
-    public BlockPos getNearestGeneratedFeature(final Level bjw, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final BlockPos fk, final int integer, final boolean boolean5) {
-        if (!caa.getBiomeSource().canGenerateStructure(this)) {
-            return null;
-        }
-        if (this.currentSeed != bjw.getSeed()) {
-            this.reset();
-        }
-        if (!this.isSpotSelected) {
-            this.generatePositions(caa);
-            this.isSpotSelected = true;
-        }
-        BlockPos fk2 = null;
-        final BlockPos.MutableBlockPos a8 = new BlockPos.MutableBlockPos();
-        double double9 = Double.MAX_VALUE;
-        for (final ChunkPos bjh14 : this.strongholdPos) {
-            a8.set((bjh14.x << 4) + 8, 32, (bjh14.z << 4) + 8);
-            final double double10 = a8.distSqr(fk);
-            if (fk2 == null) {
-                fk2 = new BlockPos(a8);
-                double9 = double10;
-            }
-            else if (double10 < double9) {
-                fk2 = new BlockPos(a8);
-                double9 = double10;
-            }
-        }
-        return fk2;
-    }
-    
-    private void generatePositions(final ChunkGenerator<?> caa) {
-        this.currentSeed = caa.getSeed();
-        final List<Biome> list3 = Lists.newArrayList();
-        for (final Biome bkt5 : Registry.BIOME) {
-            if (bkt5 != null && caa.isBiomeValidStartForStructure(bkt5, this)) {
-                list3.add(bkt5);
-            }
-        }
-        final int integer4 = ((ChunkGeneratorSettings)caa.getSettings()).getStrongholdsDistance();
-        final int integer5 = ((ChunkGeneratorSettings)caa.getSettings()).getStrongholdsCount();
-        int integer6 = ((ChunkGeneratorSettings)caa.getSettings()).getStrongholdsSpread();
-        this.strongholdPos = new ChunkPos[integer5];
-        int integer7 = 0;
-        for (final StructureStart clv9 : this.discoveredStarts) {
-            if (integer7 < this.strongholdPos.length) {
-                this.strongholdPos[integer7++] = new ChunkPos(clv9.getChunkX(), clv9.getChunkZ());
-            }
-        }
-        final Random random8 = new Random();
-        random8.setSeed(caa.getSeed());
-        double double9 = random8.nextDouble() * 3.141592653589793 * 2.0;
-        final int integer8 = integer7;
-        if (integer8 < this.strongholdPos.length) {
-            int integer9 = 0;
-            int integer10 = 0;
-            for (int integer11 = 0; integer11 < this.strongholdPos.length; ++integer11) {
-                final double double10 = 4 * integer4 + integer4 * integer10 * 6 + (random8.nextDouble() - 0.5) * (integer4 * 2.5);
-                int integer12 = (int)Math.round(Math.cos(double9) * double10);
-                int integer13 = (int)Math.round(Math.sin(double9) * double10);
-                final BlockPos fk19 = caa.getBiomeSource().findBiomeHorizontal((integer12 << 4) + 8, caa.getSeaLevel(), (integer13 << 4) + 8, 112, list3, random8);
-                if (fk19 != null) {
-                    integer12 = fk19.getX() >> 4;
-                    integer13 = fk19.getZ() >> 4;
-                }
-                if (integer11 >= integer8) {
-                    this.strongholdPos[integer11] = new ChunkPos(integer12, integer13);
-                }
-                double9 += 6.283185307179586 / integer6;
-                if (++integer9 == integer6) {
-                    ++integer10;
-                    integer9 = 0;
-                    integer6 += 2 * integer6 / (integer10 + 1);
-                    integer6 = Math.min(integer6, this.strongholdPos.length - integer11);
-                    double9 += random8.nextDouble() * 3.141592653589793 * 2.0;
-                }
-            }
-        }
-    }
-    
-    public static class StrongholdStart extends StructureStart {
-        public StrongholdStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class StrongholdStart extends StructureStart<NoneFeatureConfiguration> {
+        private final long seed;
+        
+        public StrongholdStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
+            this.seed = long6;
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
             int integer5 = 0;
-            final long long8 = caa.getSeed();
-            StrongholdPieces.StartPiece m10;
+            StrongholdPieces.StartPiece m9;
             do {
                 this.pieces.clear();
                 this.boundingBox = BoundingBox.getUnknownBox();
-                this.random.setLargeFeatureSeed(long8 + integer5++, integer3, integer4);
+                this.random.setLargeFeatureSeed(this.seed + integer5++, integer3, integer4);
                 StrongholdPieces.resetPieces();
-                m10 = new StrongholdPieces.StartPiece(this.random, (integer3 << 4) + 2, (integer4 << 4) + 2);
-                this.pieces.add(m10);
-                m10.addChildren(m10, this.pieces, this.random);
-                final List<StructurePiece> list11 = m10.pendingChildren;
-                while (!list11.isEmpty()) {
-                    final int integer6 = this.random.nextInt(list11.size());
-                    final StructurePiece clu13 = list11.remove(integer6);
-                    clu13.addChildren(m10, this.pieces, this.random);
+                m9 = new StrongholdPieces.StartPiece(this.random, (integer3 << 4) + 2, (integer4 << 4) + 2);
+                this.pieces.add(m9);
+                m9.addChildren(m9, this.pieces, this.random);
+                final List<StructurePiece> list10 = m9.pendingChildren;
+                while (!list10.isEmpty()) {
+                    final int integer6 = this.random.nextInt(list10.size());
+                    final StructurePiece cty12 = list10.remove(integer6);
+                    cty12.addChildren(m9, this.pieces, this.random);
                 }
                 this.calculateBoundingBox();
-                this.moveBelowSeaLevel(caa.getSeaLevel(), this.random, 10);
-            } while (this.pieces.isEmpty() || m10.portalRoomPiece == null);
-            ((StrongholdFeature)this.getFeature()).discoveredStarts.add(this);
+                this.moveBelowSeaLevel(cha.getSeaLevel(), this.random, 10);
+            } while (this.pieces.isEmpty() || m9.portalRoomPiece == null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/StructureFeature.java b/src/net/minecraft/world/level/levelgen/feature/StructureFeature.java
index 0bae1ff..bdb0d90 100644
--- a/src/net/minecraft/world/level/levelgen/feature/StructureFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/StructureFeature.java
@@ -1,163 +1,268 @@
 package net.minecraft.world.level.levelgen.feature;
 
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.structure.NetherFossilFeature;
+import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
 import org.apache.logging.log4j.LogManager;
+import com.google.common.collect.Maps;
+import com.google.common.collect.HashBiMap;
+import java.util.Collections;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeManager;
-import net.minecraft.world.level.chunk.FeatureAccess;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import com.google.common.collect.Lists;
-import javax.annotation.Nullable;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.chunk.FeatureAccess;
+import net.minecraft.core.SectionPos;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
-import net.minecraft.world.level.Level;
-import java.util.Iterator;
-import java.util.List;
-import net.minecraft.world.level.levelgen.structure.StructurePiece;
-import net.minecraft.core.Vec3i;
-import it.unimi.dsi.fastutil.longs.LongIterator;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-import net.minecraft.world.level.levelgen.structure.StructureStart;
-import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration;
 import net.minecraft.core.BlockPos;
-import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.LevelReader;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.levelgen.structure.StructurePiece;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.core.Registry;
+import java.util.Locale;
+import com.mojang.serialization.Codec;
+import java.util.List;
+import net.minecraft.world.level.levelgen.feature.configurations.MultiJigsawConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.BuriedTreasureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.RuinedPortalConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import org.apache.logging.log4j.Logger;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import java.util.Map;
+import com.google.common.collect.BiMap;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 
-public abstract class StructureFeature<C extends FeatureConfiguration> extends Feature<C> {
+public abstract class StructureFeature<C extends FeatureConfiguration> {
+    public static final BiMap<String, StructureFeature<?>> STRUCTURES_REGISTRY;
+    private static final Map<StructureFeature<?>, GenerationStep.Decoration> STEP;
     private static final Logger LOGGER;
+    public static final StructureFeature<NoneFeatureConfiguration> PILLAGER_OUTPOST;
+    public static final StructureFeature<MineshaftConfiguration> MINESHAFT;
+    public static final StructureFeature<NoneFeatureConfiguration> WOODLAND_MANSION;
+    public static final StructureFeature<NoneFeatureConfiguration> JUNGLE_TEMPLE;
+    public static final StructureFeature<NoneFeatureConfiguration> DESERT_PYRAMID;
+    public static final StructureFeature<NoneFeatureConfiguration> IGLOO;
+    public static final StructureFeature<RuinedPortalConfiguration> RUINED_PORTAL;
+    public static final StructureFeature<ShipwreckConfiguration> SHIPWRECK;
+    public static final SwamplandHutFeature SWAMP_HUT;
+    public static final StructureFeature<NoneFeatureConfiguration> STRONGHOLD;
+    public static final StructureFeature<NoneFeatureConfiguration> OCEAN_MONUMENT;
+    public static final StructureFeature<OceanRuinConfiguration> OCEAN_RUIN;
+    public static final StructureFeature<NoneFeatureConfiguration> NETHER_BRIDGE;
+    public static final StructureFeature<NoneFeatureConfiguration> END_CITY;
+    public static final StructureFeature<BuriedTreasureConfiguration> BURIED_TREASURE;
+    public static final StructureFeature<JigsawConfiguration> VILLAGE;
+    public static final StructureFeature<NoneFeatureConfiguration> NETHER_FOSSIL;
+    public static final StructureFeature<MultiJigsawConfiguration> BASTION_REMNANT;
+    public static final List<StructureFeature<?>> NOISE_AFFECTING_FEATURES;
+    private final Codec<ConfiguredStructureFeature<C, StructureFeature<C>>> configuredStructureCodec;
     
-    public StructureFeature(final Function<Dynamic<?>, ? extends C> function) {
-        super(function);
+    private static <F extends StructureFeature<?>> F register(final String string, final F cml, final GenerationStep.Decoration b) {
+        StructureFeature.STRUCTURES_REGISTRY.put(string.toLowerCase(Locale.ROOT), cml);
+        StructureFeature.STEP.put(cml, b);
+        return Registry.<F>register(Registry.STRUCTURE_FEATURE, string.toLowerCase(Locale.ROOT), cml);
     }
     
-    @Override
-    public ConfiguredFeature<C, ? extends StructureFeature<C>> configured(final C cgn) {
-        return new ConfiguredFeature<C, StructureFeature<C>>((StructureFeature<C>)this, cgn);
+    public StructureFeature(final Codec<C> codec) {
+        this.configuredStructureCodec = (Codec<ConfiguredStructureFeature<C, StructureFeature<C>>>)codec.fieldOf("config").xmap(cnr -> new ConfiguredStructureFeature(this, cnr), ckc -> ckc.config).codec();
     }
     
-    @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final C cgn) {
-        if (!bjx.getLevelData().isGenerateMapFeatures()) {
-            return false;
+    public GenerationStep.Decoration step() {
+        return StructureFeature.STEP.get(this);
+    }
+    
+    public static void bootstrap() {
+    }
+    
+    @Nullable
+    public static StructureStart<?> loadStaticStart(final StructureManager cva, final CompoundTag le, final long long3) {
+        final String string5 = le.getString("id");
+        if ("INVALID".equals(string5)) {
+            return StructureStart.INVALID_START;
         }
-        final int integer7 = fk.getX() >> 4;
-        final int integer8 = fk.getZ() >> 4;
-        final int integer9 = integer7 << 4;
-        final int integer10 = integer8 << 4;
-        boolean boolean11 = false;
-        for (final Long long13 : bjx.getChunk(integer7, integer8).getReferencesForFeature(this.getFeatureName())) {
-            final ChunkPos bjh14 = new ChunkPos(long13);
-            final StructureStart clv15 = bjx.getChunk(bjh14.x, bjh14.z).getStartForFeature(this.getFeatureName());
-            if (clv15 != null && clv15 != StructureStart.INVALID_START) {
-                clv15.postProcess(bjx, caa, random, new BoundingBox(integer9, integer10, integer9 + 15, integer10 + 15), new ChunkPos(integer7, integer8));
-                boolean11 = true;
-            }
+        final StructureFeature<?> cml6 = Registry.STRUCTURE_FEATURE.get(new ResourceLocation(string5.toLowerCase(Locale.ROOT)));
+        if (cml6 == null) {
+            StructureFeature.LOGGER.error("Unknown feature id: {}", string5);
+            return null;
         }
-        return boolean11;
-    }
-    
-    protected StructureStart getStructureAt(final LevelAccessor bjx, final BlockPos fk, final boolean boolean3) {
-        final List<StructureStart> list5 = this.dereferenceStructureStarts(bjx, fk.getX() >> 4, fk.getZ() >> 4);
-        for (final StructureStart clv7 : list5) {
-            if (clv7.isValid() && clv7.getBoundingBox().isInside(fk)) {
-                if (!boolean3) {
-                    return clv7;
+        final int integer7 = le.getInt("ChunkX");
+        final int integer8 = le.getInt("ChunkZ");
+        final int integer9 = le.getInt("references");
+        final BoundingBox ctd10 = le.contains("BB") ? new BoundingBox(le.getIntArray("BB")) : BoundingBox.getUnknownBox();
+        final ListTag lk11 = le.getList("Children", 10);
+        try {
+            final StructureStart<?> ctz12 = cml6.createStart(integer7, integer8, ctd10, integer9, long3);
+            for (int integer10 = 0; integer10 < lk11.size(); ++integer10) {
+                final CompoundTag le2 = lk11.getCompound(integer10);
+                final String string6 = le2.getString("id");
+                final StructurePieceType cmm16 = Registry.STRUCTURE_PIECE.get(new ResourceLocation(string6.toLowerCase(Locale.ROOT)));
+                if (cmm16 == null) {
+                    StructureFeature.LOGGER.error("Unknown structure piece id: {}", string6);
                 }
-                for (final StructurePiece clu9 : clv7.getPieces()) {
-                    if (clu9.getBoundingBox().isInside(fk)) {
-                        return clv7;
+                else {
+                    try {
+                        final StructurePiece cty17 = cmm16.load(cva, le2);
+                        ctz12.getPieces().add(cty17);
+                    }
+                    catch (Exception exception17) {
+                        StructureFeature.LOGGER.error("Exception loading structure piece with id {}", string6, exception17);
                     }
                 }
             }
+            return ctz12;
+        }
+        catch (Exception exception18) {
+            StructureFeature.LOGGER.error("Failed Start with id {}", string5, exception18);
+            return null;
+        }
+    }
+    
+    public Codec<ConfiguredStructureFeature<C, StructureFeature<C>>> configuredStructureCodec() {
+        return this.configuredStructureCodec;
+    }
+    
+    public ConfiguredStructureFeature<C, ? extends StructureFeature<C>> configured(final C cnr) {
+        return new ConfiguredStructureFeature<C, StructureFeature<C>>((StructureFeature<C>)this, cnr);
+    }
+    
+    @Nullable
+    public BlockPos getNearestGeneratedFeature(final LevelReader bqd, final StructureFeatureManager bqq, final BlockPos fu, final int integer, final boolean boolean5, final long long6, final StructureFeatureConfiguration cot) {
+        final int integer2 = cot.spacing();
+        final int integer3 = fu.getX() >> 4;
+        final int integer4 = fu.getZ() >> 4;
+        int integer5 = 0;
+        final WorldgenRandom ciy14 = new WorldgenRandom();
+        while (integer5 <= integer) {
+            for (int integer6 = -integer5; integer6 <= integer5; ++integer6) {
+                final boolean boolean6 = integer6 == -integer5 || integer6 == integer5;
+                for (int integer7 = -integer5; integer7 <= integer5; ++integer7) {
+                    final boolean boolean7 = integer7 == -integer5 || integer7 == integer5;
+                    if (boolean6 || boolean7) {
+                        final int integer8 = integer3 + integer2 * integer6;
+                        final int integer9 = integer4 + integer2 * integer7;
+                        final ChunkPos bph21 = this.getPotentialFeatureChunk(cot, long6, ciy14, integer8, integer9);
+                        final ChunkAccess cgy22 = bqd.getChunk(bph21.x, bph21.z, ChunkStatus.STRUCTURE_STARTS);
+                        final StructureStart<?> ctz23 = bqq.getStartForFeature(SectionPos.of(cgy22.getPos(), 0), this, cgy22);
+                        if (ctz23 != null && ctz23.isValid()) {
+                            if (boolean5 && ctz23.canBeReferenced()) {
+                                ctz23.addReference();
+                                return ctz23.getLocatePos();
+                            }
+                            if (!boolean5) {
+                                return ctz23.getLocatePos();
+                            }
+                        }
+                        if (integer5 == 0) {
+                            break;
+                        }
+                    }
+                }
+                if (integer5 == 0) {
+                    break;
+                }
+            }
+            ++integer5;
+        }
+        return null;
+    }
+    
+    protected boolean linearSeparation() {
+        return true;
+    }
+    
+    public final ChunkPos getPotentialFeatureChunk(final StructureFeatureConfiguration cot, final long long2, final WorldgenRandom ciy, final int integer4, final int integer5) {
+        final int integer6 = cot.spacing();
+        final int integer7 = cot.separation();
+        final int integer8 = Math.floorDiv(integer4, integer6);
+        final int integer9 = Math.floorDiv(integer5, integer6);
+        ciy.setLargeFeatureWithSalt(long2, integer8, integer9, cot.salt());
+        int integer10;
+        int integer11;
+        if (this.linearSeparation()) {
+            integer10 = ciy.nextInt(integer6 - integer7);
+            integer11 = ciy.nextInt(integer6 - integer7);
+        }
+        else {
+            integer10 = (ciy.nextInt(integer6 - integer7) + ciy.nextInt(integer6 - integer7)) / 2;
+            integer11 = (ciy.nextInt(integer6 - integer7) + ciy.nextInt(integer6 - integer7)) / 2;
+        }
+        return new ChunkPos(integer8 * integer6 + integer10, integer9 * integer6 + integer11);
+    }
+    
+    protected boolean isFeatureChunk(final ChunkGenerator cha, final BiomeSource brh, final long long3, final WorldgenRandom ciy, final int integer5, final int integer6, final Biome bre, final ChunkPos bph, final C cnr) {
+        return true;
+    }
+    
+    private StructureStart<C> createStart(final int integer1, final int integer2, final BoundingBox ctd, final int integer4, final long long5) {
+        return this.getStartFactory().create(this, integer1, integer2, ctd, integer4, long5);
+    }
+    
+    public StructureStart<?> generate(final ChunkGenerator cha, final BiomeSource brh, final StructureManager cva, final long long4, final ChunkPos bph, final Biome bre, final int integer, final WorldgenRandom ciy, final StructureFeatureConfiguration cot, final C cnr) {
+        final ChunkPos bph2 = this.getPotentialFeatureChunk(cot, long4, ciy, bph.x, bph.z);
+        if (bph.x == bph2.x && bph.z == bph2.z && this.isFeatureChunk(cha, brh, long4, ciy, bph.x, bph.z, bre, bph2, cnr)) {
+            final StructureStart<C> ctz14 = this.createStart(bph.x, bph.z, BoundingBox.getUnknownBox(), integer, long4);
+            ctz14.generatePieces(cha, cva, bph.x, bph.z, bre, cnr);
+            if (ctz14.isValid()) {
+                return ctz14;
+            }
         }
         return StructureStart.INVALID_START;
     }
     
-    public boolean isInsideBoundingFeature(final LevelAccessor bjx, final BlockPos fk) {
-        return this.getStructureAt(bjx, fk, false).isValid();
+    public abstract StructureStartFactory<C> getStartFactory();
+    
+    public String getFeatureName() {
+        return StructureFeature.STRUCTURES_REGISTRY.inverse().get(this);
     }
     
-    public boolean isInsideFeature(final LevelAccessor bjx, final BlockPos fk) {
-        return this.getStructureAt(bjx, fk, true).isValid();
+    public List<Biome.SpawnerData> getSpecialEnemies() {
+        return Collections.<Biome.SpawnerData>emptyList();
     }
     
-    @Nullable
-    public BlockPos getNearestGeneratedFeature(final Level bjw, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final BlockPos fk, final int integer, final boolean boolean5) {
-        if (!caa.getBiomeSource().canGenerateStructure(this)) {
-            return null;
-        }
-        final int integer2 = fk.getX() >> 4;
-        final int integer3 = fk.getZ() >> 4;
-        int integer4 = 0;
-        final WorldgenRandom ccf10 = new WorldgenRandom();
-        while (integer4 <= integer) {
-            for (int integer5 = -integer4; integer5 <= integer4; ++integer5) {
-                final boolean boolean6 = integer5 == -integer4 || integer5 == integer4;
-                for (int integer6 = -integer4; integer6 <= integer4; ++integer6) {
-                    final boolean boolean7 = integer6 == -integer4 || integer6 == integer4;
-                    if (boolean6 || boolean7) {
-                        final ChunkPos bjh15 = this.getPotentialFeatureChunkFromLocationWithOffset(caa, ccf10, integer2, integer3, integer5, integer6);
-                        final StructureStart clv16 = bjw.getChunk(bjh15.x, bjh15.z, ChunkStatus.STRUCTURE_STARTS).getStartForFeature(this.getFeatureName());
-                        if (clv16 != null && clv16.isValid()) {
-                            if (boolean5 && clv16.canBeReferenced()) {
-                                clv16.addReference();
-                                return clv16.getLocatePos();
-                            }
-                            if (!boolean5) {
-                                return clv16.getLocatePos();
-                            }
-                        }
-                        if (integer4 == 0) {
-                            break;
-                        }
-                    }
-                }
-                if (integer4 == 0) {
-                    break;
-                }
-            }
-            ++integer4;
-        }
-        return null;
+    public List<Biome.SpawnerData> getSpecialAnimals() {
+        return Collections.<Biome.SpawnerData>emptyList();
     }
     
-    private List<StructureStart> dereferenceStructureStarts(final LevelAccessor bjx, final int integer2, final int integer3) {
-        final List<StructureStart> list5 = Lists.newArrayList();
-        final ChunkAccess bzy6 = bjx.getChunk(integer2, integer3, ChunkStatus.STRUCTURE_REFERENCES);
-        final LongIterator longIterator7 = bzy6.getReferencesForFeature(this.getFeatureName()).iterator();
-        while (longIterator7.hasNext()) {
-            final long long8 = longIterator7.nextLong();
-            final FeatureAccess cah10 = bjx.getChunk(ChunkPos.getX(long8), ChunkPos.getZ(long8), ChunkStatus.STRUCTURE_STARTS);
-            final StructureStart clv11 = cah10.getStartForFeature(this.getFeatureName());
-            if (clv11 != null) {
-                list5.add(clv11);
-            }
-        }
-        return list5;
-    }
-    
-    protected ChunkPos getPotentialFeatureChunkFromLocationWithOffset(final ChunkGenerator<?> caa, final Random random, final int integer3, final int integer4, final int integer5, final int integer6) {
-        return new ChunkPos(integer3 + integer5, integer4 + integer6);
-    }
-    
-    public abstract boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt);
-    
-    public abstract StructureStartFactory getStartFactory();
-    
-    public abstract String getFeatureName();
-    
-    public abstract int getLookupRange();
-    
     static {
+        STRUCTURES_REGISTRY = HashBiMap.create();
+        STEP = Maps.newHashMap();
         LOGGER = LogManager.getLogger();
+        PILLAGER_OUTPOST = StructureFeature.<PillagerOutpostFeature>register("Pillager_Outpost", new PillagerOutpostFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        MINESHAFT = StructureFeature.<MineshaftFeature>register("Mineshaft", new MineshaftFeature(MineshaftConfiguration.CODEC), GenerationStep.Decoration.UNDERGROUND_STRUCTURES);
+        WOODLAND_MANSION = StructureFeature.<WoodlandMansionFeature>register("Mansion", new WoodlandMansionFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        JUNGLE_TEMPLE = StructureFeature.<JunglePyramidFeature>register("Jungle_Pyramid", new JunglePyramidFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        DESERT_PYRAMID = StructureFeature.<DesertPyramidFeature>register("Desert_Pyramid", new DesertPyramidFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        IGLOO = StructureFeature.<IglooFeature>register("Igloo", new IglooFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        RUINED_PORTAL = StructureFeature.<RuinedPortalFeature>register("Ruined_Portal", new RuinedPortalFeature(RuinedPortalConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        SHIPWRECK = StructureFeature.<ShipwreckFeature>register("Shipwreck", new ShipwreckFeature(ShipwreckConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        SWAMP_HUT = StructureFeature.<SwamplandHutFeature>register("Swamp_Hut", new SwamplandHutFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        STRONGHOLD = StructureFeature.<StrongholdFeature>register("Stronghold", new StrongholdFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.STRONGHOLDS);
+        OCEAN_MONUMENT = StructureFeature.<OceanMonumentFeature>register("Monument", new OceanMonumentFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        OCEAN_RUIN = StructureFeature.<OceanRuinFeature>register("Ocean_Ruin", new OceanRuinFeature(OceanRuinConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        NETHER_BRIDGE = StructureFeature.<NetherFortressFeature>register("Fortress", new NetherFortressFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.UNDERGROUND_DECORATION);
+        END_CITY = StructureFeature.<EndCityFeature>register("EndCity", new EndCityFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        BURIED_TREASURE = StructureFeature.<BuriedTreasureFeature>register("Buried_Treasure", new BuriedTreasureFeature(BuriedTreasureConfiguration.CODEC), GenerationStep.Decoration.UNDERGROUND_STRUCTURES);
+        VILLAGE = StructureFeature.<VillageFeature>register("Village", new VillageFeature(JigsawConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        NETHER_FOSSIL = StructureFeature.<NetherFossilFeature>register("Nether_Fossil", new NetherFossilFeature(NoneFeatureConfiguration.CODEC), GenerationStep.Decoration.UNDERGROUND_DECORATION);
+        BASTION_REMNANT = StructureFeature.<BastionFeature>register("Bastion_Remnant", new BastionFeature(MultiJigsawConfiguration.CODEC), GenerationStep.Decoration.SURFACE_STRUCTURES);
+        NOISE_AFFECTING_FEATURES = ImmutableList.<StructureFeature<NoneFeatureConfiguration>>of(StructureFeature.PILLAGER_OUTPOST, (StructureFeature<NoneFeatureConfiguration>)StructureFeature.VILLAGE, StructureFeature.NETHER_FOSSIL);
     }
     
-    public interface StructureStartFactory {
-        StructureStart create(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6);
+    public interface StructureStartFactory<C extends FeatureConfiguration> {
+        StructureStart<C> create(final StructureFeature<C> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/StructurePieceType.java b/src/net/minecraft/world/level/levelgen/feature/StructurePieceType.java
index ea11240..da93901 100644
--- a/src/net/minecraft/world/level/levelgen/feature/StructurePieceType.java
+++ b/src/net/minecraft/world/level/levelgen/feature/StructurePieceType.java
@@ -1,5 +1,7 @@
 package net.minecraft.world.level.levelgen.feature;
 
+import net.minecraft.world.level.block.entity.JigsawBlockEntity;
+import net.minecraft.world.level.levelgen.structure.NetherFossilPieces;
 import net.minecraft.world.level.levelgen.structure.ShipwreckPieces;
 import net.minecraft.world.level.levelgen.structure.BuriedTreasurePieces;
 import net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces;
@@ -7,6 +9,7 @@ import net.minecraft.world.level.levelgen.structure.EndCityPieces;
 import net.minecraft.world.level.levelgen.structure.OceanMonumentPieces;
 import net.minecraft.world.level.levelgen.structure.DesertPyramidPiece;
 import net.minecraft.world.level.levelgen.structure.SwamplandHutPiece;
+import net.minecraft.world.level.levelgen.structure.RuinedPortalPiece;
 import net.minecraft.world.level.levelgen.structure.IglooPieces;
 import net.minecraft.world.level.levelgen.structure.OceanRuinPieces;
 import net.minecraft.world.level.levelgen.structure.JunglePyramidPiece;
@@ -58,6 +61,7 @@ public interface StructurePieceType {
     public static final StructurePieceType JUNGLE_PYRAMID_PIECE = setPieceId(JunglePyramidPiece::new, "TeJP");
     public static final StructurePieceType OCEAN_RUIN = setPieceId(OceanRuinPieces.OceanRuinPiece::new, "ORP");
     public static final StructurePieceType IGLOO = setPieceId(IglooPieces.IglooPiece::new, "Iglu");
+    public static final StructurePieceType RUINED_PORTAL = setPieceId(RuinedPortalPiece::new, "RUPO");
     public static final StructurePieceType SWAMPLAND_HUT = setPieceId(SwamplandHutPiece::new, "TeSH");
     public static final StructurePieceType DESERT_PYRAMID_PIECE = setPieceId(DesertPyramidPiece::new, "TeDP");
     public static final StructurePieceType OCEAN_MONUMENT_BUILDING = setPieceId(OceanMonumentPieces.MonumentBuilding::new, "OMB");
@@ -76,10 +80,13 @@ public interface StructurePieceType {
     public static final StructurePieceType WOODLAND_MANSION_PIECE = setPieceId(WoodlandMansionPieces.WoodlandMansionPiece::new, "WMP");
     public static final StructurePieceType BURIED_TREASURE_PIECE = setPieceId(BuriedTreasurePieces.BuriedTreasurePiece::new, "BTP");
     public static final StructurePieceType SHIPWRECK_PIECE = setPieceId(ShipwreckPieces.ShipwreckPiece::new, "Shipwreck");
+    public static final StructurePieceType NETHER_FOSSIL = setPieceId(NetherFossilPieces.NetherFossilPiece::new, "NeFos");
+    public static final StructurePieceType BASTION_REMNANT = setPieceId(BastionPieces.BastionPiece::new, "BastionRemnant");
+    public static final StructurePieceType RUNTIME = setPieceId(JigsawBlockEntity.RuntimePiece::new, "Runtime");
     
-    StructurePiece load(final StructureManager cmo, final CompoundTag jt);
+    StructurePiece load(final StructureManager cva, final CompoundTag le);
     
-    default StructurePieceType setPieceId(final StructurePieceType cfm, final String string) {
-        return Registry.<StructurePieceType>register(Registry.STRUCTURE_PIECE, string.toLowerCase(Locale.ROOT), cfm);
+    default StructurePieceType setPieceId(final StructurePieceType cmm, final String string) {
+        return Registry.<StructurePieceType>register(Registry.STRUCTURE_PIECE, string.toLowerCase(Locale.ROOT), cmm);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/SwamplandHutFeature.java b/src/net/minecraft/world/level/levelgen/feature/SwamplandHutFeature.java
index 55e99d7..890a21f 100644
--- a/src/net/minecraft/world/level/levelgen/feature/SwamplandHutFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/SwamplandHutFeature.java
@@ -1,50 +1,32 @@
 package net.minecraft.world.level.levelgen.feature;
 
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import java.util.Random;
+import net.minecraft.world.level.levelgen.structure.SwamplandHutPiece;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.levelgen.structure.StructureStart;
 import com.google.common.collect.Lists;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.levelgen.structure.SwamplandHutPiece;
-import net.minecraft.world.level.levelgen.structure.StructurePiece;
-import net.minecraft.world.level.levelgen.structure.StructureStart;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.biome.Biome;
 import java.util.List;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
-public class SwamplandHutFeature extends RandomScatteredFeature<NoneFeatureConfiguration> {
+public class SwamplandHutFeature extends StructureFeature<NoneFeatureConfiguration> {
     private static final List<Biome.SpawnerData> SWAMPHUT_ENEMIES;
     private static final List<Biome.SpawnerData> SWAMPHUT_ANIMALS;
     
-    public SwamplandHutFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public SwamplandHutFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public String getFeatureName() {
-        return "Swamp_Hut";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 3;
-    }
-    
-    @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
         return FeatureStart::new;
     }
     
-    @Override
-    protected int getRandomSalt() {
-        return 14357620;
-    }
-    
     @Override
     public List<Biome.SpawnerData> getSpecialEnemies() {
         return SwamplandHutFeature.SWAMPHUT_ENEMIES;
@@ -55,29 +37,20 @@ public class SwamplandHutFeature extends RandomScatteredFeature<NoneFeatureConfi
         return SwamplandHutFeature.SWAMPHUT_ANIMALS;
     }
     
-    public boolean isSwamphut(final LevelAccessor bjx, final BlockPos fk) {
-        final StructureStart clv4 = this.getStructureAt(bjx, fk, true);
-        if (clv4 == StructureStart.INVALID_START || !(clv4 instanceof FeatureStart) || clv4.getPieces().isEmpty()) {
-            return false;
-        }
-        final StructurePiece clu5 = clv4.getPieces().get(0);
-        return clu5 instanceof SwamplandHutPiece;
-    }
-    
     static {
         SWAMPHUT_ENEMIES = Lists.<Biome.SpawnerData>newArrayList(new Biome.SpawnerData(EntityType.WITCH, 1, 1, 1));
         SWAMPHUT_ANIMALS = Lists.<Biome.SpawnerData>newArrayList(new Biome.SpawnerData(EntityType.CAT, 1, 1, 1));
     }
     
-    public static class FeatureStart extends StructureStart {
-        public FeatureStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class FeatureStart extends StructureStart<NoneFeatureConfiguration> {
+        public FeatureStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final SwamplandHutPiece clw7 = new SwamplandHutPiece(this.random, integer3 * 16, integer4 * 16);
-            this.pieces.add(clw7);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
+            final SwamplandHutPiece cua8 = new SwamplandHutPiece(this.random, integer3 * 16, integer4 * 16);
+            this.pieces.add(cua8);
             this.calculateBoundingBox();
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/TaigaVillagePools.java b/src/net/minecraft/world/level/levelgen/feature/TaigaVillagePools.java
index 1a8bc93..cbdc351 100644
--- a/src/net/minecraft/world/level/levelgen/feature/TaigaVillagePools.java
+++ b/src/net/minecraft/world/level/levelgen/feature/TaigaVillagePools.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.structures.FeaturePoolElement;
 import net.minecraft.world.level.biome.BiomeDefaultFeatures;
 import net.minecraft.world.level.levelgen.feature.structures.EmptyPoolElement;
@@ -8,7 +8,7 @@ import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElemen
 import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
-import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.LegacySinglePoolElement;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
 import java.util.List;
@@ -20,6 +20,8 @@ import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.CampfireBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
@@ -33,19 +35,19 @@ public class TaigaVillagePools {
     }
     
     static {
-        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.8f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()), new ProcessorRule(new TagMatchTest(BlockTags.DOORS), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.WALL_TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.CAMPFIRE), AlwaysTrueTest.INSTANCE, ((AbstractStateHolder<O, BlockState>)Blocks.CAMPFIRE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.LIT, false)), new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.08f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.SPRUCE_LOG, 0.08f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GLASS_PANE, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new BlockStateMatchTest((((AbstractStateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), AlwaysTrueTest.INSTANCE, (((AbstractStateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), new ProcessorRule(new BlockStateMatchTest((((AbstractStateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), AlwaysTrueTest.INSTANCE, (((AbstractStateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.PUMPKIN_STEM.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.POTATOES.defaultBlockState()), new ProcessorRule[0])));
+        final ImmutableList<StructureProcessor> immutableList1 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.8f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()), new ProcessorRule(new TagMatchTest(BlockTags.DOORS), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.WALL_TORCH), AlwaysTrueTest.INSTANCE, Blocks.AIR.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.CAMPFIRE), AlwaysTrueTest.INSTANCE, ((StateHolder<O, BlockState>)Blocks.CAMPFIRE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)CampfireBlock.LIT, false)), new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.08f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.SPRUCE_LOG, 0.08f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GLASS_PANE, 0.5f), AlwaysTrueTest.INSTANCE, Blocks.COBWEB.defaultBlockState()), new ProcessorRule(new BlockStateMatchTest((((StateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), AlwaysTrueTest.INSTANCE, (((StateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)), new ProcessorRule(new BlockStateMatchTest((((StateHolder<O, BlockState>)Blocks.GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), AlwaysTrueTest.INSTANCE, (((StateHolder<O, BlockState>)Blocks.BROWN_STAINED_GLASS_PANE.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true)), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.PUMPKIN_STEM.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.POTATOES.defaultBlockState()), new ProcessorRule[0])));
         final ImmutableList<StructureProcessor> immutableList2 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.COBBLESTONE, 0.1f), AlwaysTrueTest.INSTANCE, Blocks.MOSSY_COBBLESTONE.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/town_centers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/taiga/town_centers/taiga_meeting_point_1", immutableList2), 49), new Pair(new SinglePoolElement("village/taiga/town_centers/taiga_meeting_point_2", immutableList2), 49), new Pair(new SinglePoolElement("village/taiga/zombie/town_centers/taiga_meeting_point_1", immutableList1), 1), new Pair(new SinglePoolElement("village/taiga/zombie/town_centers/taiga_meeting_point_2", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/town_centers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/taiga/town_centers/taiga_meeting_point_1", immutableList2), 49), new Pair(new LegacySinglePoolElement("village/taiga/town_centers/taiga_meeting_point_2", immutableList2), 49), new Pair(new LegacySinglePoolElement("village/taiga/zombie/town_centers/taiga_meeting_point_1", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/taiga/zombie/town_centers/taiga_meeting_point_2", immutableList1), 1)), StructureTemplatePool.Projection.RIGID));
         final ImmutableList<StructureProcessor> immutableList3 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new BlockMatchTest(Blocks.GRASS_PATH), new BlockMatchTest(Blocks.WATER), Blocks.SPRUCE_PLANKS.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.GRASS_PATH, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.GRASS_BLOCK.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.GRASS_BLOCK), new BlockMatchTest(Blocks.WATER), Blocks.WATER.defaultBlockState()), new ProcessorRule(new BlockMatchTest(Blocks.DIRT), new BlockMatchTest(Blocks.WATER), Blocks.WATER.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/streets"), new ResourceLocation("village/taiga/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/taiga/streets/corner_01", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/streets/corner_02", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/streets/corner_03", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/streets/straight_01", immutableList3), 4), new Pair(new SinglePoolElement("village/taiga/streets/straight_02", immutableList3), 4), new Pair(new SinglePoolElement("village/taiga/streets/straight_03", immutableList3), 4), new Pair(new SinglePoolElement("village/taiga/streets/straight_04", immutableList3), 7), new Pair(new SinglePoolElement("village/taiga/streets/straight_05", immutableList3), 7), new Pair(new SinglePoolElement("village/taiga/streets/straight_06", immutableList3), 4), new Pair(new SinglePoolElement("village/taiga/streets/crossroad_01", immutableList3), 1), new Pair(new SinglePoolElement("village/taiga/streets/crossroad_02", immutableList3), 1), new Pair(new SinglePoolElement("village/taiga/streets/crossroad_03", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/streets/crossroad_04", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/streets/crossroad_05", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/streets/crossroad_06", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/streets/turn_01", immutableList3), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/zombie/streets"), new ResourceLocation("village/taiga/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/taiga/zombie/streets/corner_01", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/zombie/streets/corner_02", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/zombie/streets/corner_03", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/zombie/streets/straight_01", immutableList3), 4), new Pair(new SinglePoolElement("village/taiga/zombie/streets/straight_02", immutableList3), 4), new Pair(new SinglePoolElement("village/taiga/zombie/streets/straight_03", immutableList3), 4), new Pair(new SinglePoolElement("village/taiga/zombie/streets/straight_04", immutableList3), 7), new Pair(new SinglePoolElement("village/taiga/zombie/streets/straight_05", immutableList3), 7), new Pair(new SinglePoolElement("village/taiga/zombie/streets/straight_06", immutableList3), 4), new Pair(new SinglePoolElement("village/taiga/zombie/streets/crossroad_01", immutableList3), 1), new Pair(new SinglePoolElement("village/taiga/zombie/streets/crossroad_02", immutableList3), 1), new Pair(new SinglePoolElement("village/taiga/zombie/streets/crossroad_03", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/zombie/streets/crossroad_04", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/zombie/streets/crossroad_05", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/zombie/streets/crossroad_06", immutableList3), 2), new Pair(new SinglePoolElement("village/taiga/zombie/streets/turn_01", immutableList3), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/streets"), new ResourceLocation("village/taiga/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/taiga/streets/corner_01", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/streets/corner_02", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/streets/corner_03", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/streets/straight_01", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/taiga/streets/straight_02", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/taiga/streets/straight_03", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/taiga/streets/straight_04", immutableList3), 7), new Pair(new LegacySinglePoolElement("village/taiga/streets/straight_05", immutableList3), 7), new Pair(new LegacySinglePoolElement("village/taiga/streets/straight_06", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/taiga/streets/crossroad_01", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/taiga/streets/crossroad_02", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/taiga/streets/crossroad_03", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/streets/crossroad_04", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/streets/crossroad_05", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/streets/crossroad_06", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/streets/turn_01", immutableList3), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/zombie/streets"), new ResourceLocation("village/taiga/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/corner_01", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/corner_02", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/corner_03", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/straight_01", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/straight_02", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/straight_03", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/straight_04", immutableList3), 7), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/straight_05", immutableList3), 7), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/straight_06", immutableList3), 4), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/crossroad_01", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/crossroad_02", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/crossroad_03", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/crossroad_04", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/crossroad_05", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/crossroad_06", immutableList3), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/streets/turn_01", immutableList3), 3)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
         final ImmutableList<StructureProcessor> immutableList4 = ImmutableList.of(new RuleProcessor(ImmutableList.<ProcessorRule>of(new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.3f), AlwaysTrueTest.INSTANCE, Blocks.PUMPKIN_STEM.defaultBlockState()), new ProcessorRule(new RandomBlockMatchTest(Blocks.WHEAT, 0.2f), AlwaysTrueTest.INSTANCE, Blocks.POTATOES.defaultBlockState()))));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/houses"), new ResourceLocation("village/taiga/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/taiga/houses/taiga_small_house_1", immutableList2), 4), new Pair(new SinglePoolElement("village/taiga/houses/taiga_small_house_2", immutableList2), 4), new Pair(new SinglePoolElement("village/taiga/houses/taiga_small_house_3", immutableList2), 4), new Pair(new SinglePoolElement("village/taiga/houses/taiga_small_house_4", immutableList2), 4), new Pair(new SinglePoolElement("village/taiga/houses/taiga_small_house_5", immutableList2), 4), new Pair(new SinglePoolElement("village/taiga/houses/taiga_medium_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_medium_house_2", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_medium_house_3", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_medium_house_4", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_butcher_shop_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_tool_smith_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_fletcher_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_shepherds_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_armorer_house_1", immutableList2), 1), new Pair(new SinglePoolElement("village/taiga/houses/taiga_armorer_2", immutableList2), 1), new Pair(new SinglePoolElement("village/taiga/houses/taiga_fisher_cottage_1", immutableList2), 3), new Pair(new SinglePoolElement("village/taiga/houses/taiga_tannery_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_cartographer_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_library_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_masons_house_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_weaponsmith_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_weaponsmith_2", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_temple_1", immutableList2), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_large_farm_1", immutableList4), 6), new Pair(new SinglePoolElement("village/taiga/houses/taiga_large_farm_2", immutableList4), 6), new Pair(new SinglePoolElement("village/taiga/houses/taiga_small_farm_1", immutableList2), 1), new Pair(new SinglePoolElement("village/taiga/houses/taiga_animal_pen_1", immutableList2), 2), Pair.of(EmptyPoolElement.INSTANCE, 6)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/zombie/houses"), new ResourceLocation("village/taiga/terminators"), ImmutableList.of(new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_small_house_1", immutableList1), 4), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_small_house_2", immutableList1), 4), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_small_house_3", immutableList1), 4), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_small_house_4", immutableList1), 4), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_small_house_5", immutableList1), 4), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_medium_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_medium_house_2", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_medium_house_3", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_medium_house_4", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_butcher_shop_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_tool_smith_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_fletcher_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_shepherds_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_armorer_house_1", immutableList1), 1), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_fisher_cottage_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_tannery_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_cartographer_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_library_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_masons_house_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_weaponsmith_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_weaponsmith_2", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_temple_1", immutableList1), 2), new Pair(new SinglePoolElement("village/taiga/houses/taiga_large_farm_1", immutableList1), 6), new Pair(new SinglePoolElement("village/taiga/zombie/houses/taiga_large_farm_2", immutableList1), 6), new Pair(new SinglePoolElement("village/taiga/houses/taiga_small_farm_1", immutableList1), 1), new Pair(new SinglePoolElement("village/taiga/houses/taiga_animal_pen_1", immutableList1), 2), Pair.of(EmptyPoolElement.INSTANCE, 6)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/plains/terminators/terminator_01", immutableList3), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_02", immutableList3), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_03", immutableList3), 1), new Pair(new SinglePoolElement("village/plains/terminators/terminator_04", immutableList3), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/taiga/taiga_lamp_post_1"), 10), new Pair(new SinglePoolElement("village/taiga/taiga_decoration_1"), 4), new Pair(new SinglePoolElement("village/taiga/taiga_decoration_2"), 1), new Pair(new SinglePoolElement("village/taiga/taiga_decoration_3"), 1), new Pair(new SinglePoolElement("village/taiga/taiga_decoration_4"), 1), new Pair(new SinglePoolElement("village/taiga/taiga_decoration_5"), 2), new Pair(new SinglePoolElement("village/taiga/taiga_decoration_6"), 1), new Pair(new FeaturePoolElement(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.PINE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.PUMPKIN_PILE_CONFIG)), 2), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TAIGA_GRASS_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SWEET_BERRY_BUSH_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 4)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/zombie/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/taiga/taiga_decoration_1"), 4), new Pair(new SinglePoolElement("village/taiga/taiga_decoration_2"), 1), new Pair(new SinglePoolElement("village/taiga/taiga_decoration_3"), 1), new Pair(new SinglePoolElement("village/taiga/taiga_decoration_4"), 1), new Pair(new FeaturePoolElement(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.NORMAL_TREE.configured(BiomeDefaultFeatures.PINE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.PUMPKIN_PILE_CONFIG)), 2), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TAIGA_GRASS_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SWEET_BERRY_BUSH_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 4)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/taiga/villagers/nitwit"), 1), new Pair(new SinglePoolElement("village/taiga/villagers/baby"), 1), new Pair(new SinglePoolElement("village/taiga/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/zombie/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new SinglePoolElement("village/taiga/zombie/villagers/nitwit"), 1), new Pair(new SinglePoolElement("village/taiga/zombie/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/houses"), new ResourceLocation("village/taiga/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_small_house_1", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_small_house_2", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_small_house_3", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_small_house_4", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_small_house_5", immutableList2), 4), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_medium_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_medium_house_2", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_medium_house_3", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_medium_house_4", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_butcher_shop_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_tool_smith_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_fletcher_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_shepherds_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_armorer_house_1", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_armorer_2", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_fisher_cottage_1", immutableList2), 3), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_tannery_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_cartographer_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_library_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_masons_house_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_weaponsmith_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_weaponsmith_2", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_temple_1", immutableList2), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_large_farm_1", immutableList4), 6), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_large_farm_2", immutableList4), 6), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_small_farm_1", immutableList2), 1), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_animal_pen_1", immutableList2), 2), Pair.of(EmptyPoolElement.INSTANCE, 6)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/zombie/houses"), new ResourceLocation("village/taiga/terminators"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_small_house_1", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_small_house_2", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_small_house_3", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_small_house_4", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_small_house_5", immutableList1), 4), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_medium_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_medium_house_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_medium_house_3", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_medium_house_4", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_butcher_shop_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_tool_smith_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_fletcher_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_shepherds_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_armorer_house_1", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_fisher_cottage_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_tannery_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_cartographer_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_library_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_masons_house_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_weaponsmith_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_weaponsmith_2", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_temple_1", immutableList1), 2), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_large_farm_1", immutableList1), 6), new Pair(new LegacySinglePoolElement("village/taiga/zombie/houses/taiga_large_farm_2", immutableList1), 6), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_small_farm_1", immutableList1), 1), new Pair(new LegacySinglePoolElement("village/taiga/houses/taiga_animal_pen_1", immutableList1), 2), Pair.of(EmptyPoolElement.INSTANCE, 6)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/terminators"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_01", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_02", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_03", immutableList3), 1), new Pair(new LegacySinglePoolElement("village/plains/terminators/terminator_04", immutableList3), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/taiga/taiga_lamp_post_1"), 10), new Pair(new LegacySinglePoolElement("village/taiga/taiga_decoration_1"), 4), new Pair(new LegacySinglePoolElement("village/taiga/taiga_decoration_2"), 1), new Pair(new LegacySinglePoolElement("village/taiga/taiga_decoration_3"), 1), new Pair(new LegacySinglePoolElement("village/taiga/taiga_decoration_4"), 1), new Pair(new LegacySinglePoolElement("village/taiga/taiga_decoration_5"), 2), new Pair(new LegacySinglePoolElement("village/taiga/taiga_decoration_6"), 1), new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.PINE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.PUMPKIN_PILE_CONFIG)), 2), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TAIGA_GRASS_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SWEET_BERRY_BUSH_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 4)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/zombie/decor"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/taiga/taiga_decoration_1"), 4), new Pair(new LegacySinglePoolElement("village/taiga/taiga_decoration_2"), 1), new Pair(new LegacySinglePoolElement("village/taiga/taiga_decoration_3"), 1), new Pair(new LegacySinglePoolElement("village/taiga/taiga_decoration_4"), 1), new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.SPRUCE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.TREE.configured(BiomeDefaultFeatures.PINE_TREE_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.BLOCK_PILE.configured(BiomeDefaultFeatures.PUMPKIN_PILE_CONFIG)), 2), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.TAIGA_GRASS_CONFIG)), 4), new Pair(new FeaturePoolElement(Feature.RANDOM_PATCH.configured(BiomeDefaultFeatures.SWEET_BERRY_BUSH_CONFIG)), 1), Pair.of(EmptyPoolElement.INSTANCE, 4)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/taiga/villagers/nitwit"), 1), new Pair(new LegacySinglePoolElement("village/taiga/villagers/baby"), 1), new Pair(new LegacySinglePoolElement("village/taiga/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("village/taiga/zombie/villagers"), new ResourceLocation("empty"), ImmutableList.of(new Pair(new LegacySinglePoolElement("village/taiga/zombie/villagers/nitwit"), 1), new Pair(new LegacySinglePoolElement("village/taiga/zombie/villagers/unemployed"), 10)), StructureTemplatePool.Projection.RIGID));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/TreeFeature.java b/src/net/minecraft/world/level/levelgen/feature/TreeFeature.java
index 9f0115f..bd048d8 100644
--- a/src/net/minecraft/world/level/levelgen/feature/TreeFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/TreeFeature.java
@@ -1,33 +1,233 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
-import java.util.Optional;
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import java.util.Iterator;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.core.Direction;
+import net.minecraft.world.phys.shapes.BitSetDiscreteVoxelShape;
+import net.minecraft.world.phys.shapes.DiscreteVoxelShape;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import net.minecraft.world.level.LevelAccessor;
+import java.util.Comparator;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
+import java.util.List;
+import java.util.OptionalInt;
+import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import java.util.Set;
-import net.minecraft.core.BlockPos;
 import java.util.Random;
 import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelWriter;
+import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelSimulatedReader;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 
-public class TreeFeature extends AbstractSmallTreeFeature<SmallTreeConfiguration> {
-    public TreeFeature(final Function<Dynamic<?>, ? extends SmallTreeConfiguration> function) {
-        super(function);
+public class TreeFeature extends Feature<TreeConfiguration> {
+    public TreeFeature(final Codec<TreeConfiguration> codec) {
+        super(codec);
     }
     
-    public boolean doPlace(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final Set<BlockPos> set4, final Set<BlockPos> set5, final BoundingBox clb, final SmallTreeConfiguration chi) {
-        final int integer9 = chi.baseHeight + random.nextInt(chi.heightRandA + 1) + random.nextInt(chi.heightRandB + 1);
-        final int integer10 = (chi.trunkHeight >= 0) ? (chi.trunkHeight + random.nextInt(chi.trunkHeightRandom + 1)) : (integer9 - (chi.foliageHeight + random.nextInt(chi.foliageHeightRandom + 1)));
-        final int integer11 = chi.foliagePlacer.foliageRadius(random, integer10, integer9, chi);
-        final Optional<BlockPos> optional12 = this.getProjectedOrigin(bkb, integer9, integer10, integer11, fk, chi);
-        if (!optional12.isPresent()) {
+    public static boolean isFree(final LevelSimulatedReader bqg, final BlockPos fu) {
+        return validTreePos(bqg, fu) || bqg.isStateAtPosition(fu, cfj -> cfj.is(BlockTags.LOGS));
+    }
+    
+    private static boolean isVine(final LevelSimulatedReader bqg, final BlockPos fu) {
+        return bqg.isStateAtPosition(fu, cfj -> cfj.is(Blocks.VINE));
+    }
+    
+    private static boolean isBlockWater(final LevelSimulatedReader bqg, final BlockPos fu) {
+        return bqg.isStateAtPosition(fu, cfj -> cfj.is(Blocks.WATER));
+    }
+    
+    public static boolean isAirOrLeaves(final LevelSimulatedReader bqg, final BlockPos fu) {
+        return bqg.isStateAtPosition(fu, cfj -> cfj.isAir() || cfj.is(BlockTags.LEAVES));
+    }
+    
+    private static boolean isGrassOrDirtOrFarmland(final LevelSimulatedReader bqg, final BlockPos fu) {
+        final Block bvr2;
+        return bqg.isStateAtPosition(fu, cfj -> {
+            bvr2 = cfj.getBlock();
+            return Feature.isDirt(bvr2) || bvr2 == Blocks.FARMLAND;
+        });
+    }
+    
+    private static boolean isReplaceablePlant(final LevelSimulatedReader bqg, final BlockPos fu) {
+        final Material cxd2;
+        return bqg.isStateAtPosition(fu, cfj -> {
+            cxd2 = cfj.getMaterial();
+            return cxd2 == Material.REPLACEABLE_PLANT;
+        });
+    }
+    
+    public static void setBlockKnownShape(final LevelWriter bqh, final BlockPos fu, final BlockState cfj) {
+        bqh.setBlock(fu, cfj, 19);
+    }
+    
+    public static boolean validTreePos(final LevelSimulatedReader bqg, final BlockPos fu) {
+        return isAirOrLeaves(bqg, fu) || isReplaceablePlant(bqg, fu) || isBlockWater(bqg, fu);
+    }
+    
+    private boolean doPlace(final LevelSimulatedRW bqf, final Random random, final BlockPos fu, final Set<BlockPos> set4, final Set<BlockPos> set5, final BoundingBox ctd, final TreeConfiguration cou) {
+        final int integer9 = cou.trunkPlacer.getTreeHeight(random);
+        final int integer10 = cou.foliagePlacer.foliageHeight(random, integer9, cou);
+        final int integer11 = integer9 - integer10;
+        final int integer12 = cou.foliagePlacer.foliageRadius(random, integer11);
+        BlockPos fu2;
+        if (!cou.fromSapling) {
+            final int integer13 = bqf.getHeightmapPos(Heightmap.Types.OCEAN_FLOOR, fu).getY();
+            final int integer14 = bqf.getHeightmapPos(Heightmap.Types.WORLD_SURFACE, fu).getY();
+            if (integer14 - integer13 > cou.maxWaterDepth) {
+                return false;
+            }
+            int integer15;
+            if (cou.heightmap == Heightmap.Types.OCEAN_FLOOR) {
+                integer15 = integer13;
+            }
+            else if (cou.heightmap == Heightmap.Types.WORLD_SURFACE) {
+                integer15 = integer14;
+            }
+            else {
+                integer15 = bqf.getHeightmapPos(cou.heightmap, fu).getY();
+            }
+            fu2 = new BlockPos(fu.getX(), integer15, fu.getZ());
+        }
+        else {
+            fu2 = fu;
+        }
+        if (fu2.getY() < 1 || fu2.getY() + integer9 + 1 > 256) {
             return false;
         }
-        final BlockPos fk2 = optional12.get();
-        this.setDirtAt(bkb, fk2.below());
-        chi.foliagePlacer.createFoliage(bkb, random, chi, integer9, integer10, integer11, fk2, set5);
-        this.placeTrunk(bkb, random, integer9, fk2, chi.trunkTopOffset + random.nextInt(chi.trunkTopOffsetRandom + 1), set4, clb, chi);
+        if (!isGrassOrDirtOrFarmland(bqf, fu2.below())) {
+            return false;
+        }
+        final OptionalInt optionalInt14 = cou.minimumSize.minClippedHeight();
+        final int integer14 = this.getMaxFreeTreeHeight(bqf, integer9, fu2, cou);
+        if (integer14 < integer9 && (!optionalInt14.isPresent() || integer14 < optionalInt14.getAsInt())) {
+            return false;
+        }
+        final List<FoliagePlacer.FoliageAttachment> list16 = cou.trunkPlacer.placeTrunk(bqf, random, integer14, fu2, set4, ctd, cou);
+        final int integer16;
+        list16.forEach(b -> cou.foliagePlacer.createFoliage(bqf, random, cou, integer16, b, integer10, integer12, set5, ctd));
         return true;
     }
+    
+    private int getMaxFreeTreeHeight(final LevelSimulatedReader bqg, final int integer, final BlockPos fu, final TreeConfiguration cou) {
+        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
+        for (int integer2 = 0; integer2 <= integer + 1; ++integer2) {
+            for (int integer3 = cou.minimumSize.getSizeAtHeight(integer, integer2), integer4 = -integer3; integer4 <= integer3; ++integer4) {
+                for (int integer5 = -integer3; integer5 <= integer3; ++integer5) {
+                    a6.setWithOffset(fu, integer4, integer2, integer5);
+                    if (!isFree(bqg, a6) || (!cou.ignoreVines && isVine(bqg, a6))) {
+                        return integer2 - 2;
+                    }
+                }
+            }
+        }
+        return integer;
+    }
+    
+    @Override
+    protected void setBlock(final LevelWriter bqh, final BlockPos fu, final BlockState cfj) {
+        setBlockKnownShape(bqh, fu, cfj);
+    }
+    
+    @Override
+    public final boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final TreeConfiguration cou) {
+        final Set<BlockPos> set8 = Sets.newHashSet();
+        final Set<BlockPos> set9 = Sets.newHashSet();
+        final Set<BlockPos> set10 = Sets.newHashSet();
+        final BoundingBox ctd11 = BoundingBox.getUnknownBox();
+        final boolean boolean12 = this.doPlace(bqu, random, fu, set8, set9, ctd11, cou);
+        if (ctd11.x0 > ctd11.x1 || !boolean12 || set8.isEmpty()) {
+            return false;
+        }
+        if (!cou.decorators.isEmpty()) {
+            final List<BlockPos> list13 = Lists.newArrayList(set8);
+            final List<BlockPos> list14 = Lists.newArrayList(set9);
+            list13.sort(Comparator.comparingInt(Vec3i::getY));
+            list14.sort(Comparator.comparingInt(Vec3i::getY));
+            cou.decorators.forEach(cqm -> cqm.place(bqu, random, list13, list14, set10, ctd11));
+        }
+        final DiscreteVoxelShape dev13 = this.updateLeaves(bqu, ctd11, set8, set10);
+        StructureTemplate.updateShapeAtEdge(bqu, 3, dev13, ctd11.x0, ctd11.y0, ctd11.z0);
+        return true;
+    }
+    
+    private DiscreteVoxelShape updateLeaves(final LevelAccessor bqc, final BoundingBox ctd, final Set<BlockPos> set3, final Set<BlockPos> set4) {
+        final List<Set<BlockPos>> list6 = Lists.newArrayList();
+        final DiscreteVoxelShape dev7 = new BitSetDiscreteVoxelShape(ctd.getXSpan(), ctd.getYSpan(), ctd.getZSpan());
+        final int integer8 = 6;
+        for (int integer9 = 0; integer9 < 6; ++integer9) {
+            list6.add(Sets.newHashSet());
+        }
+        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos();
+        for (final BlockPos fu11 : Lists.<BlockPos>newArrayList(set4)) {
+            if (ctd.isInside(fu11)) {
+                dev7.setFull(fu11.getX() - ctd.x0, fu11.getY() - ctd.y0, fu11.getZ() - ctd.z0, true, true);
+            }
+        }
+        for (final BlockPos fu11 : Lists.<BlockPos>newArrayList(set3)) {
+            if (ctd.isInside(fu11)) {
+                dev7.setFull(fu11.getX() - ctd.x0, fu11.getY() - ctd.y0, fu11.getZ() - ctd.z0, true, true);
+            }
+            for (final Direction fz15 : Direction.values()) {
+                a9.setWithOffset(fu11, fz15);
+                if (!set3.contains(a9)) {
+                    final BlockState cfj16 = bqc.getBlockState(a9);
+                    if (cfj16.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.DISTANCE)) {
+                        list6.get(0).add(a9.immutable());
+                        setBlockKnownShape(bqc, a9, ((StateHolder<O, BlockState>)cfj16).<Comparable, Integer>setValue((Property<Comparable>)BlockStateProperties.DISTANCE, 1));
+                        if (ctd.isInside(a9)) {
+                            dev7.setFull(a9.getX() - ctd.x0, a9.getY() - ctd.y0, a9.getZ() - ctd.z0, true, true);
+                        }
+                    }
+                }
+            }
+        }
+        for (int integer10 = 1; integer10 < 6; ++integer10) {
+            final Set<BlockPos> set5 = list6.get(integer10 - 1);
+            final Set<BlockPos> set6 = list6.get(integer10);
+            for (final BlockPos fu12 : set5) {
+                if (ctd.isInside(fu12)) {
+                    dev7.setFull(fu12.getX() - ctd.x0, fu12.getY() - ctd.y0, fu12.getZ() - ctd.z0, true, true);
+                }
+                for (final Direction fz16 : Direction.values()) {
+                    a9.setWithOffset(fu12, fz16);
+                    if (!set5.contains(a9)) {
+                        if (!set6.contains(a9)) {
+                            final BlockState cfj17 = bqc.getBlockState(a9);
+                            if (cfj17.<Comparable>hasProperty((Property<Comparable>)BlockStateProperties.DISTANCE)) {
+                                final int integer11 = cfj17.<Integer>getValue((Property<Integer>)BlockStateProperties.DISTANCE);
+                                if (integer11 > integer10 + 1) {
+                                    final BlockState cfj18 = ((StateHolder<O, BlockState>)cfj17).<Comparable, Integer>setValue((Property<Comparable>)BlockStateProperties.DISTANCE, integer10 + 1);
+                                    setBlockKnownShape(bqc, a9, cfj18);
+                                    if (ctd.isInside(a9)) {
+                                        dev7.setFull(a9.getX() - ctd.x0, a9.getY() - ctd.y0, a9.getZ() - ctd.z0, true, true);
+                                    }
+                                    set6.add(a9.immutable());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return dev7;
+    }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/TwistingVinesFeature.java b/src/net/minecraft/world/level/levelgen/feature/TwistingVinesFeature.java
new file mode 100644
index 0000000..82333ee
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/TwistingVinesFeature.java
@@ -0,0 +1,92 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.GrowingPlantHeadBlock;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.Level;
+import net.minecraft.util.Mth;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
+
+public class TwistingVinesFeature extends Feature<NoneFeatureConfiguration> {
+    public TwistingVinesFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        return place(bqu, random, fu, 8, 4, 8);
+    }
+    
+    public static boolean place(final LevelAccessor bqc, final Random random, final BlockPos fu, final int integer4, final int integer5, final int integer6) {
+        if (isInvalidPlacementLocation(bqc, fu)) {
+            return false;
+        }
+        placeTwistingVines(bqc, random, fu, integer4, integer5, integer6);
+        return true;
+    }
+    
+    private static void placeTwistingVines(final LevelAccessor bqc, final Random random, final BlockPos fu, final int integer4, final int integer5, final int integer6) {
+        final BlockPos.MutableBlockPos a7 = new BlockPos.MutableBlockPos();
+        for (int integer7 = 0; integer7 < integer4 * integer4; ++integer7) {
+            a7.set(fu).move(Mth.nextInt(random, -integer4, integer4), Mth.nextInt(random, -integer5, integer5), Mth.nextInt(random, -integer4, integer4));
+            if (findFirstAirBlockAboveGround(bqc, a7)) {
+                if (!isInvalidPlacementLocation(bqc, a7)) {
+                    int integer8 = Mth.nextInt(random, 1, integer6);
+                    if (random.nextInt(6) == 0) {
+                        integer8 *= 2;
+                    }
+                    if (random.nextInt(5) == 0) {
+                        integer8 = 1;
+                    }
+                    final int integer9 = 17;
+                    final int integer10 = 25;
+                    placeWeepingVinesColumn(bqc, random, a7, integer8, 17, 25);
+                }
+            }
+        }
+    }
+    
+    private static boolean findFirstAirBlockAboveGround(final LevelAccessor bqc, final BlockPos.MutableBlockPos a) {
+        do {
+            a.move(0, -1, 0);
+            if (Level.isOutsideBuildHeight(a)) {
+                return false;
+            }
+        } while (bqc.getBlockState(a).isAir());
+        a.move(0, 1, 0);
+        return true;
+    }
+    
+    public static void placeWeepingVinesColumn(final LevelAccessor bqc, final Random random, final BlockPos.MutableBlockPos a, final int integer4, final int integer5, final int integer6) {
+        for (int integer7 = 1; integer7 <= integer4; ++integer7) {
+            if (bqc.isEmptyBlock(a)) {
+                if (integer7 == integer4 || !bqc.isEmptyBlock(a.above())) {
+                    bqc.setBlock(a, ((StateHolder<O, BlockState>)Blocks.TWISTING_VINES.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)GrowingPlantHeadBlock.AGE, Mth.nextInt(random, integer5, integer6)), 2);
+                    break;
+                }
+                bqc.setBlock(a, Blocks.TWISTING_VINES_PLANT.defaultBlockState(), 2);
+            }
+            a.move(Direction.UP);
+        }
+    }
+    
+    private static boolean isInvalidPlacementLocation(final LevelAccessor bqc, final BlockPos fu) {
+        if (!bqc.isEmptyBlock(fu)) {
+            return true;
+        }
+        final BlockState cfj3 = bqc.getBlockState(fu.below());
+        return !cfj3.is(Blocks.NETHERRACK) && !cfj3.is(Blocks.WARPED_NYLIUM) && !cfj3.is(Blocks.WARPED_WART_BLOCK);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/VillageFeature.java b/src/net/minecraft/world/level/levelgen/feature/VillageFeature.java
index 759e339..43b680a 100644
--- a/src/net/minecraft/world/level/levelgen/feature/VillageFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/VillageFeature.java
@@ -1,75 +1,34 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.BeardedStructureStart;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeManager;
-import net.minecraft.world.level.levelgen.WorldgenRandom;
-import net.minecraft.world.level.ChunkPos;
-import java.util.Random;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration;
 
-public class VillageFeature extends StructureFeature<VillageConfiguration> {
-    public VillageFeature(final Function<Dynamic<?>, ? extends VillageConfiguration> function) {
-        super(function);
+public class VillageFeature extends StructureFeature<JigsawConfiguration> {
+    public VillageFeature(final Codec<JigsawConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    protected ChunkPos getPotentialFeatureChunkFromLocationWithOffset(final ChunkGenerator<?> caa, final Random random, final int integer3, final int integer4, final int integer5, final int integer6) {
-        final int integer7 = ((ChunkGeneratorSettings)caa.getSettings()).getVillagesSpacing();
-        final int integer8 = ((ChunkGeneratorSettings)caa.getSettings()).getVillagesSeparation();
-        final int integer9 = integer3 + integer7 * integer5;
-        final int integer10 = integer4 + integer7 * integer6;
-        final int integer11 = (integer9 < 0) ? (integer9 - integer7 + 1) : integer9;
-        final int integer12 = (integer10 < 0) ? (integer10 - integer7 + 1) : integer10;
-        int integer13 = integer11 / integer7;
-        int integer14 = integer12 / integer7;
-        ((WorldgenRandom)random).setLargeFeatureWithSalt(caa.getSeed(), integer13, integer14, 10387312);
-        integer13 *= integer7;
-        integer14 *= integer7;
-        integer13 += random.nextInt(integer7 - integer8);
-        integer14 += random.nextInt(integer7 - integer8);
-        return new ChunkPos(integer13, integer14);
-    }
-    
-    @Override
-    public boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt) {
-        final ChunkPos bjh8 = this.getPotentialFeatureChunkFromLocationWithOffset(caa, random, integer4, integer5, 0, 0);
-        return integer4 == bjh8.x && integer5 == bjh8.z && caa.isBiomeValidStartForStructure(bkt, this);
-    }
-    
-    @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<JigsawConfiguration> getStartFactory() {
         return FeatureStart::new;
     }
     
-    @Override
-    public String getFeatureName() {
-        return "Village";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 8;
-    }
-    
-    public static class FeatureStart extends BeardedStructureStart {
-        public FeatureStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class FeatureStart extends BeardedStructureStart<JigsawConfiguration> {
+        public FeatureStart(final StructureFeature<JigsawConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final VillageConfiguration chm7 = caa.<VillageConfiguration>getStructureConfiguration(bkt, Feature.VILLAGE);
-            final BlockPos fk8 = new BlockPos(integer3 * 16, 0, integer4 * 16);
-            VillagePieces.addPieces(caa, cmo, fk8, this.pieces, this.random, chm7);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final JigsawConfiguration cnu) {
+            final BlockPos fu8 = new BlockPos(integer3 * 16, 0, integer4 * 16);
+            VillagePieces.addPieces(cha, cva, fu8, this.pieces, this.random, cnu);
             this.calculateBoundingBox();
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/VillagePieces.java b/src/net/minecraft/world/level/levelgen/feature/VillagePieces.java
index 2528a2d..df339f9 100644
--- a/src/net/minecraft/world/level/levelgen/feature/VillagePieces.java
+++ b/src/net/minecraft/world/level/levelgen/feature/VillagePieces.java
@@ -4,10 +4,10 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement;
-import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece;
 import java.util.Random;
+import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece;
 import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
-import net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.levelgen.structure.StructurePiece;
 import java.util.List;
@@ -16,22 +16,26 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
 import net.minecraft.world.level.chunk.ChunkGenerator;
 
 public class VillagePieces {
-    public static void addPieces(final ChunkGenerator<?> caa, final StructureManager cmo, final BlockPos fk, final List<StructurePiece> list, final WorldgenRandom ccf, final VillageConfiguration chm) {
+    public static void bootstrap() {
         PlainVillagePools.bootstrap();
         SnowyVillagePools.bootstrap();
         SavannaVillagePools.bootstrap();
         DesertVillagePools.bootstrap();
         TaigaVillagePools.bootstrap();
-        JigsawPlacement.addPieces(chm.startPool, chm.size, VillagePiece::new, caa, cmo, fk, list, ccf);
+    }
+    
+    public static void addPieces(final ChunkGenerator cha, final StructureManager cva, final BlockPos fu, final List<StructurePiece> list, final WorldgenRandom ciy, final JigsawConfiguration cnu) {
+        bootstrap();
+        JigsawPlacement.addPieces(cnu.startPool, cnu.size, VillagePiece::new, cha, cva, fu, list, ciy, true, true);
     }
     
     public static class VillagePiece extends PoolElementStructurePiece {
-        public VillagePiece(final StructureManager cmo, final StructurePoolElement cik, final BlockPos fk, final int integer, final Rotation btu, final BoundingBox clb) {
-            super(StructurePieceType.VILLAGE, cmo, cik, fk, integer, btu, clb);
+        public VillagePiece(final StructureManager cva, final StructurePoolElement cqd, final BlockPos fu, final int integer, final Rotation cap, final BoundingBox ctd) {
+            super(StructurePieceType.VILLAGE, cva, cqd, fu, integer, cap, ctd);
         }
         
-        public VillagePiece(final StructureManager cmo, final CompoundTag jt) {
-            super(cmo, jt, StructurePieceType.VILLAGE);
+        public VillagePiece(final StructureManager cva, final CompoundTag le) {
+            super(cva, le, StructurePieceType.VILLAGE);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/VinesFeature.java b/src/net/minecraft/world/level/levelgen/feature/VinesFeature.java
index 9aac35e..29fbda6 100644
--- a/src/net/minecraft/world/level/levelgen/feature/VinesFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/VinesFeature.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.Blocks;
@@ -10,33 +10,32 @@ import net.minecraft.world.level.block.VineBlock;
 import net.minecraft.core.Vec3i;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class VinesFeature extends Feature<NoneFeatureConfiguration> {
     private static final Direction[] DIRECTIONS;
     
-    public VinesFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public VinesFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        final BlockPos.MutableBlockPos a7 = new BlockPos.MutableBlockPos(fk);
-        for (int integer8 = fk.getY(); integer8 < 256; ++integer8) {
-            a7.set(fk);
-            a7.move(random.nextInt(4) - random.nextInt(4), 0, random.nextInt(4) - random.nextInt(4));
-            a7.setY(integer8);
-            if (bjx.isEmptyBlock(a7)) {
-                for (final Direction fp12 : VinesFeature.DIRECTIONS) {
-                    if (fp12 != Direction.DOWN) {
-                        if (VineBlock.isAcceptableNeighbour(bjx, a7, fp12)) {
-                            bjx.setBlock(a7, ((AbstractStateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.getPropertyForFace(fp12), true), 2);
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        final BlockPos.MutableBlockPos a8 = fu.mutable();
+        for (int integer9 = fu.getY(); integer9 < 256; ++integer9) {
+            a8.set(fu);
+            a8.move(random.nextInt(4) - random.nextInt(4), 0, random.nextInt(4) - random.nextInt(4));
+            a8.setY(integer9);
+            if (bqu.isEmptyBlock(a8)) {
+                for (final Direction fz13 : VinesFeature.DIRECTIONS) {
+                    if (fz13 != Direction.DOWN) {
+                        if (VineBlock.isAcceptableNeighbour(bqu, a8, fz13)) {
+                            bqu.setBlock(a8, ((StateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.getPropertyForFace(fz13), true), 2);
                             break;
                         }
                     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/VoidStartPlatformFeature.java b/src/net/minecraft/world/level/levelgen/feature/VoidStartPlatformFeature.java
index d58d212..7576c0b 100644
--- a/src/net/minecraft/world/level/levelgen/feature/VoidStartPlatformFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/VoidStartPlatformFeature.java
@@ -3,11 +3,10 @@ package net.minecraft.world.level.levelgen.feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.block.Blocks;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
@@ -16,8 +15,8 @@ public class VoidStartPlatformFeature extends Feature<NoneFeatureConfiguration>
     private static final BlockPos PLATFORM_ORIGIN;
     private static final ChunkPos PLATFORM_ORIGIN_CHUNK;
     
-    public VoidStartPlatformFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public VoidStartPlatformFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     private static int checkerboardDistance(final int integer1, final int integer2, final int integer3, final int integer4) {
@@ -25,21 +24,21 @@ public class VoidStartPlatformFeature extends Feature<NoneFeatureConfiguration>
     }
     
     @Override
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final NoneFeatureConfiguration cgv) {
-        final ChunkPos bjh7 = new ChunkPos(fk);
-        if (checkerboardDistance(bjh7.x, bjh7.z, VoidStartPlatformFeature.PLATFORM_ORIGIN_CHUNK.x, VoidStartPlatformFeature.PLATFORM_ORIGIN_CHUNK.z) > 1) {
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        final ChunkPos bph8 = new ChunkPos(fu);
+        if (checkerboardDistance(bph8.x, bph8.z, VoidStartPlatformFeature.PLATFORM_ORIGIN_CHUNK.x, VoidStartPlatformFeature.PLATFORM_ORIGIN_CHUNK.z) > 1) {
             return true;
         }
-        final BlockPos.MutableBlockPos a8 = new BlockPos.MutableBlockPos();
-        for (int integer9 = bjh7.getMinBlockZ(); integer9 <= bjh7.getMaxBlockZ(); ++integer9) {
-            for (int integer10 = bjh7.getMinBlockX(); integer10 <= bjh7.getMaxBlockX(); ++integer10) {
-                if (checkerboardDistance(VoidStartPlatformFeature.PLATFORM_ORIGIN.getX(), VoidStartPlatformFeature.PLATFORM_ORIGIN.getZ(), integer10, integer9) <= 16) {
-                    a8.set(integer10, VoidStartPlatformFeature.PLATFORM_ORIGIN.getY(), integer9);
-                    if (a8.equals(VoidStartPlatformFeature.PLATFORM_ORIGIN)) {
-                        bjx.setBlock(a8, Blocks.COBBLESTONE.defaultBlockState(), 2);
+        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos();
+        for (int integer10 = bph8.getMinBlockZ(); integer10 <= bph8.getMaxBlockZ(); ++integer10) {
+            for (int integer11 = bph8.getMinBlockX(); integer11 <= bph8.getMaxBlockX(); ++integer11) {
+                if (checkerboardDistance(VoidStartPlatformFeature.PLATFORM_ORIGIN.getX(), VoidStartPlatformFeature.PLATFORM_ORIGIN.getZ(), integer11, integer10) <= 16) {
+                    a9.set(integer11, VoidStartPlatformFeature.PLATFORM_ORIGIN.getY(), integer10);
+                    if (a9.equals(VoidStartPlatformFeature.PLATFORM_ORIGIN)) {
+                        bqu.setBlock(a9, Blocks.COBBLESTONE.defaultBlockState(), 2);
                     }
                     else {
-                        bjx.setBlock(a8, Blocks.STONE.defaultBlockState(), 2);
+                        bqu.setBlock(a9, Blocks.STONE.defaultBlockState(), 2);
                     }
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/feature/WeepingVinesFeature.java b/src/net/minecraft/world/level/levelgen/feature/WeepingVinesFeature.java
new file mode 100644
index 0000000..7c109f6
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/WeepingVinesFeature.java
@@ -0,0 +1,104 @@
+package net.minecraft.world.level.levelgen.feature;
+
+import net.minecraft.world.level.block.state.StateHolder;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.GrowingPlantHeadBlock;
+import net.minecraft.util.Mth;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
+
+public class WeepingVinesFeature extends Feature<NoneFeatureConfiguration> {
+    private static final Direction[] DIRECTIONS;
+    
+    public WeepingVinesFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final NoneFeatureConfiguration coa) {
+        if (!bqu.isEmptyBlock(fu)) {
+            return false;
+        }
+        final BlockState cfj8 = bqu.getBlockState(fu.above());
+        if (!cfj8.is(Blocks.NETHERRACK) && !cfj8.is(Blocks.NETHER_WART_BLOCK)) {
+            return false;
+        }
+        this.placeRoofNetherWart(bqu, random, fu);
+        this.placeRoofWeepingVines(bqu, random, fu);
+        return true;
+    }
+    
+    private void placeRoofNetherWart(final LevelAccessor bqc, final Random random, final BlockPos fu) {
+        bqc.setBlock(fu, Blocks.NETHER_WART_BLOCK.defaultBlockState(), 2);
+        final BlockPos.MutableBlockPos a5 = new BlockPos.MutableBlockPos();
+        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
+        for (int integer7 = 0; integer7 < 200; ++integer7) {
+            a5.setWithOffset(fu, random.nextInt(6) - random.nextInt(6), random.nextInt(2) - random.nextInt(5), random.nextInt(6) - random.nextInt(6));
+            if (bqc.isEmptyBlock(a5)) {
+                int integer8 = 0;
+                for (final Direction fz12 : WeepingVinesFeature.DIRECTIONS) {
+                    final BlockState cfj13 = bqc.getBlockState(a6.setWithOffset(a5, fz12));
+                    if (cfj13.is(Blocks.NETHERRACK) || cfj13.is(Blocks.NETHER_WART_BLOCK)) {
+                        ++integer8;
+                    }
+                    if (integer8 > 1) {
+                        break;
+                    }
+                }
+                if (integer8 == 1) {
+                    bqc.setBlock(a5, Blocks.NETHER_WART_BLOCK.defaultBlockState(), 2);
+                }
+            }
+        }
+    }
+    
+    private void placeRoofWeepingVines(final LevelAccessor bqc, final Random random, final BlockPos fu) {
+        final BlockPos.MutableBlockPos a5 = new BlockPos.MutableBlockPos();
+        for (int integer6 = 0; integer6 < 100; ++integer6) {
+            a5.setWithOffset(fu, random.nextInt(8) - random.nextInt(8), random.nextInt(2) - random.nextInt(7), random.nextInt(8) - random.nextInt(8));
+            if (bqc.isEmptyBlock(a5)) {
+                final BlockState cfj7 = bqc.getBlockState(a5.above());
+                if (cfj7.is(Blocks.NETHERRACK) || cfj7.is(Blocks.NETHER_WART_BLOCK)) {
+                    int integer7 = Mth.nextInt(random, 1, 8);
+                    if (random.nextInt(6) == 0) {
+                        integer7 *= 2;
+                    }
+                    if (random.nextInt(5) == 0) {
+                        integer7 = 1;
+                    }
+                    final int integer8 = 17;
+                    final int integer9 = 25;
+                    placeWeepingVinesColumn(bqc, random, a5, integer7, 17, 25);
+                }
+            }
+        }
+    }
+    
+    public static void placeWeepingVinesColumn(final LevelAccessor bqc, final Random random, final BlockPos.MutableBlockPos a, final int integer4, final int integer5, final int integer6) {
+        for (int integer7 = 0; integer7 <= integer4; ++integer7) {
+            if (bqc.isEmptyBlock(a)) {
+                if (integer7 == integer4 || !bqc.isEmptyBlock(a.below())) {
+                    bqc.setBlock(a, ((StateHolder<O, BlockState>)Blocks.WEEPING_VINES.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)GrowingPlantHeadBlock.AGE, Mth.nextInt(random, integer5, integer6)), 2);
+                    break;
+                }
+                bqc.setBlock(a, Blocks.WEEPING_VINES_PLANT.defaultBlockState(), 2);
+            }
+            a.move(Direction.DOWN);
+        }
+    }
+    
+    static {
+        DIRECTIONS = Direction.values();
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/WeightedConfiguredFeature.java b/src/net/minecraft/world/level/levelgen/feature/WeightedConfiguredFeature.java
index 2a24031..95f1068 100644
--- a/src/net/minecraft/world/level/levelgen/feature/WeightedConfiguredFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/WeightedConfiguredFeature.java
@@ -1,35 +1,32 @@
 package net.minecraft.world.level.levelgen.feature;
 
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 
 public class WeightedConfiguredFeature<FC extends FeatureConfiguration> {
+    public static final Codec<WeightedConfiguredFeature<?>> CODEC;
     public final ConfiguredFeature<FC, ?> feature;
     public final float chance;
     
-    public WeightedConfiguredFeature(final ConfiguredFeature<FC, ?> cdc, final float float2) {
-        this.feature = cdc;
+    public WeightedConfiguredFeature(final ConfiguredFeature<FC, ?> ckb, final float float2) {
+        this.feature = ckb;
         this.chance = float2;
     }
     
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("name"), dynamicOps.createString(Registry.FEATURE.getKey(this.feature.feature).toString()), dynamicOps.createString("config"), this.feature.config.<T>serialize(dynamicOps).getValue(), dynamicOps.createString("chance"), dynamicOps.createFloat(this.chance))));
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu) {
+        return this.feature.place(bqu, bqq, cha, random, fu);
     }
     
-    public boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk) {
-        return this.feature.place(bjx, caa, random, fk);
-    }
-    
-    public static <T> WeightedConfiguredFeature<?> deserialize(final Dynamic<T> dynamic) {
-        return ConfiguredFeature.<T>deserialize(dynamic).weighted(dynamic.get("chance").asFloat(0.0f));
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)ConfiguredFeature.CODEC.fieldOf("feature").forGetter(cmw -> cmw.feature), (App)Codec.FLOAT.fieldOf("chance").forGetter(cmw -> cmw.chance)).apply(instance, (BiFunction)WeightedConfiguredFeature::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/WoodlandMansionFeature.java b/src/net/minecraft/world/level/levelgen/feature/WoodlandMansionFeature.java
index 9e3f04a..65525d8 100644
--- a/src/net/minecraft/world/level/levelgen/feature/WoodlandMansionFeature.java
+++ b/src/net/minecraft/world/level/levelgen/feature/WoodlandMansionFeature.java
@@ -1,9 +1,9 @@
 package net.minecraft.world.level.levelgen.feature;
 
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import java.util.List;
 import net.minecraft.world.level.levelgen.structure.StructurePiece;
 import java.util.Collection;
@@ -11,135 +11,107 @@ import net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces;
 import com.google.common.collect.Lists;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.Heightmap;
+import java.util.Random;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import java.util.Iterator;
 import java.util.Set;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeManager;
-import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.ChunkPos;
-import java.util.Random;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.world.level.biome.BiomeSource;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 
 public class WoodlandMansionFeature extends StructureFeature<NoneFeatureConfiguration> {
-    public WoodlandMansionFeature(final Function<Dynamic<?>, ? extends NoneFeatureConfiguration> function) {
-        super(function);
+    public WoodlandMansionFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    protected ChunkPos getPotentialFeatureChunkFromLocationWithOffset(final ChunkGenerator<?> caa, final Random random, final int integer3, final int integer4, final int integer5, final int integer6) {
-        final int integer7 = ((ChunkGeneratorSettings)caa.getSettings()).getWoodlandMansionSpacing();
-        final int integer8 = ((ChunkGeneratorSettings)caa.getSettings()).getWoodlandMangionSeparation();
-        final int integer9 = integer3 + integer7 * integer5;
-        final int integer10 = integer4 + integer7 * integer6;
-        final int integer11 = (integer9 < 0) ? (integer9 - integer7 + 1) : integer9;
-        final int integer12 = (integer10 < 0) ? (integer10 - integer7 + 1) : integer10;
-        int integer13 = integer11 / integer7;
-        int integer14 = integer12 / integer7;
-        ((WorldgenRandom)random).setLargeFeatureWithSalt(caa.getSeed(), integer13, integer14, 10387319);
-        integer13 *= integer7;
-        integer14 *= integer7;
-        integer13 += (random.nextInt(integer7 - integer8) + random.nextInt(integer7 - integer8)) / 2;
-        integer14 += (random.nextInt(integer7 - integer8) + random.nextInt(integer7 - integer8)) / 2;
-        return new ChunkPos(integer13, integer14);
-    }
-    
-    @Override
-    public boolean isFeatureChunk(final BiomeManager bkv, final ChunkGenerator<?> caa, final Random random, final int integer4, final int integer5, final Biome bkt) {
-        final ChunkPos bjh8 = this.getPotentialFeatureChunkFromLocationWithOffset(caa, random, integer4, integer5, 0, 0);
-        if (integer4 == bjh8.x && integer5 == bjh8.z) {
-            final Set<Biome> set9 = caa.getBiomeSource().getBiomesWithin(integer4 * 16 + 9, caa.getSeaLevel(), integer5 * 16 + 9, 32);
-            for (final Biome bkt2 : set9) {
-                if (!caa.isBiomeValidStartForStructure(bkt2, this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
+    protected boolean linearSeparation() {
         return false;
     }
     
     @Override
-    public StructureStartFactory getStartFactory() {
+    protected boolean isFeatureChunk(final ChunkGenerator cha, final BiomeSource brh, final long long3, final WorldgenRandom ciy, final int integer5, final int integer6, final Biome bre, final ChunkPos bph, final NoneFeatureConfiguration coa) {
+        final Set<Biome> set12 = brh.getBiomesWithin(integer5 * 16 + 9, cha.getSeaLevel(), integer6 * 16 + 9, 32);
+        for (final Biome bre2 : set12) {
+            if (!bre2.isValidStart(this)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    @Override
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
         return WoodlandMansionStart::new;
     }
     
-    @Override
-    public String getFeatureName() {
-        return "Mansion";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 8;
-    }
-    
-    public static class WoodlandMansionStart extends StructureStart {
-        public WoodlandMansionStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class WoodlandMansionStart extends StructureStart<NoneFeatureConfiguration> {
+        public WoodlandMansionStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final Rotation btu7 = Rotation.values()[this.random.nextInt(Rotation.values().length)];
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
+            final Rotation cap8 = Rotation.getRandom(this.random);
             int integer5 = 5;
             int integer6 = 5;
-            if (btu7 == Rotation.CLOCKWISE_90) {
+            if (cap8 == Rotation.CLOCKWISE_90) {
                 integer5 = -5;
             }
-            else if (btu7 == Rotation.CLOCKWISE_180) {
+            else if (cap8 == Rotation.CLOCKWISE_180) {
                 integer5 = -5;
                 integer6 = -5;
             }
-            else if (btu7 == Rotation.COUNTERCLOCKWISE_90) {
+            else if (cap8 == Rotation.COUNTERCLOCKWISE_90) {
                 integer6 = -5;
             }
             final int integer7 = (integer3 << 4) + 7;
             final int integer8 = (integer4 << 4) + 7;
-            final int integer9 = caa.getFirstOccupiedHeight(integer7, integer8, Heightmap.Types.WORLD_SURFACE_WG);
-            final int integer10 = caa.getFirstOccupiedHeight(integer7, integer8 + integer6, Heightmap.Types.WORLD_SURFACE_WG);
-            final int integer11 = caa.getFirstOccupiedHeight(integer7 + integer5, integer8, Heightmap.Types.WORLD_SURFACE_WG);
-            final int integer12 = caa.getFirstOccupiedHeight(integer7 + integer5, integer8 + integer6, Heightmap.Types.WORLD_SURFACE_WG);
+            final int integer9 = cha.getFirstOccupiedHeight(integer7, integer8, Heightmap.Types.WORLD_SURFACE_WG);
+            final int integer10 = cha.getFirstOccupiedHeight(integer7, integer8 + integer6, Heightmap.Types.WORLD_SURFACE_WG);
+            final int integer11 = cha.getFirstOccupiedHeight(integer7 + integer5, integer8, Heightmap.Types.WORLD_SURFACE_WG);
+            final int integer12 = cha.getFirstOccupiedHeight(integer7 + integer5, integer8 + integer6, Heightmap.Types.WORLD_SURFACE_WG);
             final int integer13 = Math.min(Math.min(integer9, integer10), Math.min(integer11, integer12));
             if (integer13 < 60) {
                 return;
             }
-            final BlockPos fk17 = new BlockPos(integer3 * 16 + 8, integer13 + 1, integer4 * 16 + 8);
-            final List<WoodlandMansionPieces.WoodlandMansionPiece> list18 = Lists.newLinkedList();
-            WoodlandMansionPieces.generateMansion(cmo, fk17, btu7, list18, this.random);
-            this.pieces.addAll(list18);
+            final BlockPos fu18 = new BlockPos(integer3 * 16 + 8, integer13 + 1, integer4 * 16 + 8);
+            final List<WoodlandMansionPieces.WoodlandMansionPiece> list19 = Lists.newLinkedList();
+            WoodlandMansionPieces.generateMansion(cva, fu18, cap8, list19, this.random);
+            this.pieces.addAll(list19);
             this.calculateBoundingBox();
         }
         
         @Override
-        public void postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            super.postProcess(bjx, caa, random, clb, bjh);
-            final int integer7 = this.boundingBox.y0;
-            for (int integer8 = clb.x0; integer8 <= clb.x1; ++integer8) {
-                for (int integer9 = clb.z0; integer9 <= clb.z1; ++integer9) {
-                    final BlockPos fk10 = new BlockPos(integer8, integer7, integer9);
-                    if (!bjx.isEmptyBlock(fk10) && this.boundingBox.isInside(fk10)) {
-                        boolean boolean11 = false;
-                        for (final StructurePiece clu13 : this.pieces) {
-                            if (clu13.getBoundingBox().isInside(fk10)) {
-                                boolean11 = true;
+        public void placeInChunk(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph) {
+            super.placeInChunk(bqu, bqq, cha, random, ctd, bph);
+            final int integer8 = this.boundingBox.y0;
+            for (int integer9 = ctd.x0; integer9 <= ctd.x1; ++integer9) {
+                for (int integer10 = ctd.z0; integer10 <= ctd.z1; ++integer10) {
+                    final BlockPos fu11 = new BlockPos(integer9, integer8, integer10);
+                    if (!bqu.isEmptyBlock(fu11) && this.boundingBox.isInside(fu11)) {
+                        boolean boolean12 = false;
+                        for (final StructurePiece cty14 : this.pieces) {
+                            if (cty14.getBoundingBox().isInside(fu11)) {
+                                boolean12 = true;
                                 break;
                             }
                         }
-                        if (boolean11) {
-                            for (int integer10 = integer7 - 1; integer10 > 1; --integer10) {
-                                final BlockPos fk11 = new BlockPos(integer8, integer10, integer9);
-                                if (!bjx.isEmptyBlock(fk11) && !bjx.getBlockState(fk11).getMaterial().isLiquid()) {
+                        if (boolean12) {
+                            for (int integer11 = integer8 - 1; integer11 > 1; --integer11) {
+                                final BlockPos fu12 = new BlockPos(integer9, integer11, integer10);
+                                if (!bqu.isEmptyBlock(fu12) && !bqu.getBlockState(fu12).getMaterial().isLiquid()) {
                                     break;
                                 }
-                                bjx.setBlock(fk11, Blocks.COBBLESTONE.defaultBlockState(), 2);
+                                bqu.setBlock(fu12, Blocks.COBBLESTONE.defaultBlockState(), 2);
                             }
                         }
                     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/blockplacers/BlockPlacer.java b/src/net/minecraft/world/level/levelgen/feature/blockplacers/BlockPlacer.java
index 785a823..31672e9 100644
--- a/src/net/minecraft/world/level/levelgen/feature/blockplacers/BlockPlacer.java
+++ b/src/net/minecraft/world/level/levelgen/feature/blockplacers/BlockPlacer.java
@@ -1,17 +1,21 @@
 package net.minecraft.world.level.levelgen.feature.blockplacers;
 
+import java.util.function.Function;
+import net.minecraft.core.Registry;
 import java.util.Random;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.util.Serializable;
+import com.mojang.serialization.Codec;
 
-public abstract class BlockPlacer implements Serializable {
-    protected final BlockPlacerType<?> type;
+public abstract class BlockPlacer {
+    public static final Codec<BlockPlacer> CODEC;
     
-    protected BlockPlacer(final BlockPlacerType<?> cfx) {
-        this.type = cfx;
+    public abstract void place(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final Random random);
+    
+    protected abstract BlockPlacerType<?> type();
+    
+    static {
+        CODEC = Registry.BLOCK_PLACER_TYPES.dispatch((Function)BlockPlacer::type, (Function)BlockPlacerType::codec);
     }
-    
-    public abstract void place(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final Random random);
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/blockplacers/BlockPlacerType.java b/src/net/minecraft/world/level/levelgen/feature/blockplacers/BlockPlacerType.java
index 2d6049e..dbd157c 100644
--- a/src/net/minecraft/world/level/levelgen/feature/blockplacers/BlockPlacerType.java
+++ b/src/net/minecraft/world/level/levelgen/feature/blockplacers/BlockPlacerType.java
@@ -1,30 +1,29 @@
 package net.minecraft.world.level.levelgen.feature.blockplacers;
 
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class BlockPlacerType<P extends BlockPlacer> {
     public static final BlockPlacerType<SimpleBlockPlacer> SIMPLE_BLOCK_PLACER;
     public static final BlockPlacerType<DoublePlantPlacer> DOUBLE_PLANT_PLACER;
     public static final BlockPlacerType<ColumnPlacer> COLUMN_PLACER;
-    private final Function<Dynamic<?>, P> deserializer;
+    private final Codec<P> codec;
     
-    private static <P extends BlockPlacer> BlockPlacerType<P> register(final String string, final Function<Dynamic<?>, P> function) {
-        return Registry.<BlockPlacerType<P>>register(Registry.BLOCK_PLACER_TYPES, string, new BlockPlacerType<P>(function));
+    private static <P extends BlockPlacer> BlockPlacerType<P> register(final String string, final Codec<P> codec) {
+        return Registry.<BlockPlacerType<P>>register(Registry.BLOCK_PLACER_TYPES, string, new BlockPlacerType<P>(codec));
     }
     
-    private BlockPlacerType(final Function<Dynamic<?>, P> function) {
-        this.deserializer = function;
+    private BlockPlacerType(final Codec<P> codec) {
+        this.codec = codec;
     }
     
-    public P deserialize(final Dynamic<?> dynamic) {
-        return this.deserializer.apply(dynamic);
+    public Codec<P> codec() {
+        return this.codec;
     }
     
     static {
-        SIMPLE_BLOCK_PLACER = BlockPlacerType.<SimpleBlockPlacer>register("simple_block_placer", SimpleBlockPlacer::new);
-        DOUBLE_PLANT_PLACER = BlockPlacerType.<DoublePlantPlacer>register("double_plant_placer", DoublePlantPlacer::new);
-        COLUMN_PLACER = BlockPlacerType.<ColumnPlacer>register("column_placer", ColumnPlacer::new);
+        SIMPLE_BLOCK_PLACER = BlockPlacerType.<SimpleBlockPlacer>register("simple_block_placer", SimpleBlockPlacer.CODEC);
+        DOUBLE_PLANT_PLACER = BlockPlacerType.<DoublePlantPlacer>register("double_plant_placer", DoublePlantPlacer.CODEC);
+        COLUMN_PLACER = BlockPlacerType.<ColumnPlacer>register("column_placer", ColumnPlacer.CODEC);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/blockplacers/ColumnPlacer.java b/src/net/minecraft/world/level/levelgen/feature/blockplacers/ColumnPlacer.java
index 315d120..f22f6d1 100644
--- a/src/net/minecraft/world/level/levelgen/feature/blockplacers/ColumnPlacer.java
+++ b/src/net/minecraft/world/level/levelgen/feature/blockplacers/ColumnPlacer.java
@@ -1,41 +1,41 @@
 package net.minecraft.world.level.levelgen.feature.blockplacers;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.Direction;
 import java.util.Random;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class ColumnPlacer extends BlockPlacer {
+    public static final Codec<ColumnPlacer> CODEC;
     private final int minSize;
     private final int extraSize;
     
     public ColumnPlacer(final int integer1, final int integer2) {
-        super(BlockPlacerType.COLUMN_PLACER);
         this.minSize = integer1;
         this.extraSize = integer2;
     }
     
-    public <T> ColumnPlacer(final Dynamic<T> dynamic) {
-        this(dynamic.get("min_size").asInt(1), dynamic.get("extra_size").asInt(2));
+    @Override
+    protected BlockPlacerType<?> type() {
+        return BlockPlacerType.COLUMN_PLACER;
     }
     
     @Override
-    public void place(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final Random random) {
-        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos(fk);
+    public void place(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final Random random) {
+        final BlockPos.MutableBlockPos a6 = fu.mutable();
         for (int integer7 = this.minSize + random.nextInt(random.nextInt(this.extraSize + 1) + 1), integer8 = 0; integer8 < integer7; ++integer8) {
-            bjx.setBlock(a6, byj, 2);
+            bqc.setBlock(a6, cfj, 2);
             a6.move(Direction.UP);
         }
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("type"), dynamicOps.createString(Registry.BLOCK_PLACER_TYPES.getKey(this.type).toString()), dynamicOps.createString("min_size"), dynamicOps.createInt(this.minSize), dynamicOps.createString("extra_size"), dynamicOps.createInt(this.extraSize)))).getValue();
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("min_size").forGetter(cna -> cna.minSize), (App)Codec.INT.fieldOf("extra_size").forGetter(cna -> cna.extraSize)).apply(instance, (BiFunction)ColumnPlacer::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/blockplacers/DoublePlantPlacer.java b/src/net/minecraft/world/level/levelgen/feature/blockplacers/DoublePlantPlacer.java
index 1bdcea4..072f840 100644
--- a/src/net/minecraft/world/level/levelgen/feature/blockplacers/DoublePlantPlacer.java
+++ b/src/net/minecraft/world/level/levelgen/feature/blockplacers/DoublePlantPlacer.java
@@ -1,32 +1,28 @@
 package net.minecraft.world.level.levelgen.feature.blockplacers;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.block.DoublePlantBlock;
 import java.util.Random;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class DoublePlantPlacer extends BlockPlacer {
-    public DoublePlantPlacer() {
-        super(BlockPlacerType.DOUBLE_PLANT_PLACER);
-    }
+    public static final Codec<DoublePlantPlacer> CODEC;
+    public static final DoublePlantPlacer INSTANCE;
     
-    public <T> DoublePlantPlacer(final Dynamic<T> dynamic) {
-        this();
+    @Override
+    protected BlockPlacerType<?> type() {
+        return BlockPlacerType.DOUBLE_PLANT_PLACER;
     }
     
     @Override
-    public void place(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final Random random) {
-        ((DoublePlantBlock)byj.getBlock()).placeAt(bjx, fk, 2);
+    public void place(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final Random random) {
+        ((DoublePlantBlock)cfj.getBlock()).placeAt(bqc, fu, 2);
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("type"), dynamicOps.createString(Registry.BLOCK_PLACER_TYPES.getKey(this.type).toString())))).getValue();
+    static {
+        CODEC = Codec.unit(() -> DoublePlantPlacer.INSTANCE);
+        INSTANCE = new DoublePlantPlacer();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/blockplacers/SimpleBlockPlacer.java b/src/net/minecraft/world/level/levelgen/feature/blockplacers/SimpleBlockPlacer.java
index 0cdf4da..2576e20 100644
--- a/src/net/minecraft/world/level/levelgen/feature/blockplacers/SimpleBlockPlacer.java
+++ b/src/net/minecraft/world/level/levelgen/feature/blockplacers/SimpleBlockPlacer.java
@@ -1,31 +1,27 @@
 package net.minecraft.world.level.levelgen.feature.blockplacers;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
 import java.util.Random;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class SimpleBlockPlacer extends BlockPlacer {
-    public SimpleBlockPlacer() {
-        super(BlockPlacerType.SIMPLE_BLOCK_PLACER);
-    }
+    public static final Codec<SimpleBlockPlacer> CODEC;
+    public static final SimpleBlockPlacer INSTANCE;
     
-    public <T> SimpleBlockPlacer(final Dynamic<T> dynamic) {
-        this();
+    @Override
+    protected BlockPlacerType<?> type() {
+        return BlockPlacerType.SIMPLE_BLOCK_PLACER;
     }
     
     @Override
-    public void place(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final Random random) {
-        bjx.setBlock(fk, byj, 2);
+    public void place(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final Random random) {
+        bqc.setBlock(fu, cfj, 2);
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("type"), dynamicOps.createString(Registry.BLOCK_PLACER_TYPES.getKey(this.type).toString())))).getValue();
+    static {
+        CODEC = Codec.unit(() -> SimpleBlockPlacer.INSTANCE);
+        INSTANCE = new SimpleBlockPlacer();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/BlockBlobConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/BlockBlobConfiguration.java
index b08bd1f..7821e3a 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/BlockBlobConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/BlockBlobConfiguration.java
@@ -1,30 +1,23 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import net.minecraft.world.level.block.Blocks;
-import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class BlockBlobConfiguration implements FeatureConfiguration {
+    public static final Codec<BlockBlobConfiguration> CODEC;
     public final BlockState state;
     public final int startRadius;
     
-    public BlockBlobConfiguration(final BlockState byj, final int integer) {
-        this.state = byj;
+    public BlockBlobConfiguration(final BlockState cfj, final int integer) {
+        this.state = cfj;
         this.startRadius = integer;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("state"), BlockState.<T>serialize(dynamicOps, this.state).getValue(), dynamicOps.createString("start_radius"), dynamicOps.createInt(this.startRadius))));
-    }
-    
-    public static <T> BlockBlobConfiguration deserialize(final Dynamic<T> dynamic) {
-        final BlockState byj2 = dynamic.get("state").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        final int integer3 = dynamic.get("start_radius").asInt(0);
-        return new BlockBlobConfiguration(byj2, integer3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockState.CODEC.fieldOf("state").forGetter(cne -> cne.state), (App)Codec.INT.fieldOf("start_radius").withDefault(0).forGetter(cne -> cne.startRadius)).apply(instance, (BiFunction)BlockBlobConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/BlockPileConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/BlockPileConfiguration.java
index 4798970..8e26f6d 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/BlockPileConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/BlockPileConfiguration.java
@@ -1,31 +1,18 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import net.minecraft.resources.ResourceLocation;
-import java.util.function.Supplier;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
 import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;
+import com.mojang.serialization.Codec;
 
 public class BlockPileConfiguration implements FeatureConfiguration {
+    public static final Codec<BlockPileConfiguration> CODEC;
     public final BlockStateProvider stateProvider;
     
-    public BlockPileConfiguration(final BlockStateProvider chw) {
-        this.stateProvider = chw;
+    public BlockPileConfiguration(final BlockStateProvider cpo) {
+        this.stateProvider = cpo;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("state_provider"), this.stateProvider.<T>serialize(dynamicOps));
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build()));
-    }
-    
-    public static <T> BlockPileConfiguration deserialize(final Dynamic<T> dynamic) {
-        final BlockStateProviderType<?> chx2 = Registry.BLOCKSTATE_PROVIDER_TYPES.get(new ResourceLocation(dynamic.get("state_provider").get("type").asString().<Throwable>orElseThrow(RuntimeException::new)));
-        return new BlockPileConfiguration((BlockStateProvider)chx2.deserialize(dynamic.get("state_provider").orElseEmptyMap()));
+    static {
+        CODEC = BlockStateProvider.CODEC.fieldOf("state_provider").xmap((Function)BlockPileConfiguration::new, cnf -> cnf.stateProvider).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/BlockStateConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/BlockStateConfiguration.java
index 0d7e208..0844809 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/BlockStateConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/BlockStateConfiguration.java
@@ -1,27 +1,18 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import net.minecraft.world.level.block.Blocks;
 import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class BlockStateConfiguration implements FeatureConfiguration {
+    public static final Codec<BlockStateConfiguration> CODEC;
     public final BlockState state;
     
-    public BlockStateConfiguration(final BlockState byj) {
-        this.state = byj;
+    public BlockStateConfiguration(final BlockState cfj) {
+        this.state = cfj;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("state"), BlockState.<T>serialize(dynamicOps, this.state).getValue())));
-    }
-    
-    public static <T> BlockStateConfiguration deserialize(final Dynamic<T> dynamic) {
-        final BlockState byj2 = dynamic.get("state").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        return new BlockStateConfiguration(byj2);
+    static {
+        CODEC = BlockState.CODEC.fieldOf("state").xmap((Function)BlockStateConfiguration::new, cng -> cng.state).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/BuriedTreasureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/BuriedTreasureConfiguration.java
index 4bbde4f..2dbdfd6 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/BuriedTreasureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/BuriedTreasureConfiguration.java
@@ -1,24 +1,17 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class BuriedTreasureConfiguration implements FeatureConfiguration {
+    public static final Codec<BuriedTreasureConfiguration> CODEC;
     public final float probability;
     
     public BuriedTreasureConfiguration(final float float1) {
         this.probability = float1;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("probability"), dynamicOps.createFloat(this.probability))));
-    }
-    
-    public static <T> BuriedTreasureConfiguration deserialize(final Dynamic<T> dynamic) {
-        final float float2 = dynamic.get("probability").asFloat(0.0f);
-        return new BuriedTreasureConfiguration(float2);
+    static {
+        CODEC = Codec.FLOAT.xmap((Function)BuriedTreasureConfiguration::new, cnh -> cnh.probability);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/ChanceRangeDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/ChanceRangeDecoratorConfiguration.java
index 0821733..a886406 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/ChanceRangeDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/ChanceRangeDecoratorConfiguration.java
@@ -1,11 +1,12 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 
 public class ChanceRangeDecoratorConfiguration implements DecoratorConfiguration {
+    public static final Codec<ChanceRangeDecoratorConfiguration> CODEC;
     public final float chance;
     public final int bottomOffset;
     public final int topOffset;
@@ -18,16 +19,7 @@ public class ChanceRangeDecoratorConfiguration implements DecoratorConfiguration
         this.top = integer4;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("chance"), dynamicOps.createFloat(this.chance), dynamicOps.createString("bottom_offset"), dynamicOps.createInt(this.bottomOffset), dynamicOps.createString("top_offset"), dynamicOps.createInt(this.topOffset), dynamicOps.createString("top"), dynamicOps.createInt(this.top))));
-    }
-    
-    public static ChanceRangeDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        final float float2 = dynamic.get("chance").asFloat(0.0f);
-        final int integer3 = dynamic.get("bottom_offset").asInt(0);
-        final int integer4 = dynamic.get("top_offset").asInt(0);
-        final int integer5 = dynamic.get("top").asInt(0);
-        return new ChanceRangeDecoratorConfiguration(float2, integer3, integer4, integer5);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.FLOAT.fieldOf("chance").forGetter(cni -> cni.chance), (App)Codec.INT.fieldOf("bottom_offset").withDefault(0).forGetter(cni -> cni.bottomOffset), (App)Codec.INT.fieldOf("top_offset").withDefault(0).forGetter(cni -> cni.topOffset), (App)Codec.INT.fieldOf("top").withDefault(0).forGetter(cni -> cni.top)).apply(instance, ChanceRangeDecoratorConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/ColumnFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/ColumnFeatureConfiguration.java
new file mode 100644
index 0000000..4f4a1e1
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/ColumnFeatureConfiguration.java
@@ -0,0 +1,63 @@
+package net.minecraft.world.level.levelgen.feature.configurations;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
+
+public class ColumnFeatureConfiguration implements FeatureConfiguration {
+    public static final Codec<ColumnFeatureConfiguration> CODEC;
+    public final int minimumReach;
+    public final int maximumReach;
+    public final int minimumHeight;
+    public final int maximumHeight;
+    
+    public ColumnFeatureConfiguration(final int integer1, final int integer2, final int integer3, final int integer4) {
+        this.minimumReach = integer1;
+        this.maximumReach = integer2;
+        this.minimumHeight = integer3;
+        this.maximumHeight = integer4;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("minimum_reach").forGetter(cnj -> cnj.minimumReach), (App)Codec.INT.fieldOf("maximum_reach").forGetter(cnj -> cnj.maximumReach), (App)Codec.INT.fieldOf("minimum_height").forGetter(cnj -> cnj.minimumHeight), (App)Codec.INT.fieldOf("maximum_height").forGetter(cnj -> cnj.maximumHeight)).apply(instance, ColumnFeatureConfiguration::new));
+    }
+    
+    public static class Builder {
+        private int minReach;
+        private int maxReach;
+        private int minHeight;
+        private int maxHeight;
+        
+        public Builder horizontalReach(final int integer) {
+            this.minReach = integer;
+            this.maxReach = integer;
+            return this;
+        }
+        
+        public Builder horizontalReach(final int integer1, final int integer2) {
+            this.minReach = integer1;
+            this.maxReach = integer2;
+            return this;
+        }
+        
+        public Builder heightRange(final int integer1, final int integer2) {
+            this.minHeight = integer1;
+            this.maxHeight = integer2;
+            return this;
+        }
+        
+        public ColumnFeatureConfiguration build() {
+            if (this.minHeight < 1) {
+                throw new IllegalArgumentException("Minimum height cannot be less than 1");
+            }
+            if (this.minReach < 0) {
+                throw new IllegalArgumentException("Minimum reach cannot be negative");
+            }
+            if (this.minReach > this.maxReach || this.minHeight > this.maxHeight) {
+                throw new IllegalArgumentException("Minimum reach/height cannot be greater than maximum width/height");
+            }
+            return new ColumnFeatureConfiguration(this.minReach, this.maxReach, this.minHeight, this.maxHeight);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/CountFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/CountFeatureConfiguration.java
index 9161bc1..841b479 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/CountFeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/CountFeatureConfiguration.java
@@ -1,24 +1,17 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CountFeatureConfiguration implements FeatureConfiguration {
+    public static final Codec<CountFeatureConfiguration> CODEC;
     public final int count;
     
     public CountFeatureConfiguration(final int integer) {
         this.count = integer;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("count"), dynamicOps.createInt(this.count))));
-    }
-    
-    public static <T> CountFeatureConfiguration deserialize(final Dynamic<T> dynamic) {
-        final int integer2 = dynamic.get("count").asInt(0);
-        return new CountFeatureConfiguration(integer2);
+    static {
+        CODEC = Codec.INT.fieldOf("count").xmap((Function)CountFeatureConfiguration::new, cnk -> cnk.count).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/CountRangeDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/CountRangeDecoratorConfiguration.java
index 74059fa..cae8bec 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/CountRangeDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/CountRangeDecoratorConfiguration.java
@@ -1,11 +1,12 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 
 public class CountRangeDecoratorConfiguration implements DecoratorConfiguration {
+    public static final Codec<CountRangeDecoratorConfiguration> CODEC;
     public final int count;
     public final int bottomOffset;
     public final int topOffset;
@@ -18,16 +19,7 @@ public class CountRangeDecoratorConfiguration implements DecoratorConfiguration
         this.maximum = integer4;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("count"), dynamicOps.createInt(this.count), dynamicOps.createString("bottom_offset"), dynamicOps.createInt(this.bottomOffset), dynamicOps.createString("top_offset"), dynamicOps.createInt(this.topOffset), dynamicOps.createString("maximum"), dynamicOps.createInt(this.maximum))));
-    }
-    
-    public static CountRangeDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        final int integer2 = dynamic.get("count").asInt(0);
-        final int integer3 = dynamic.get("bottom_offset").asInt(0);
-        final int integer4 = dynamic.get("top_offset").asInt(0);
-        final int integer5 = dynamic.get("maximum").asInt(0);
-        return new CountRangeDecoratorConfiguration(integer2, integer3, integer4, integer5);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("count").forGetter(cnl -> cnl.count), (App)Codec.INT.fieldOf("bottom_offset").withDefault(0).forGetter(cnl -> cnl.bottomOffset), (App)Codec.INT.fieldOf("top_offset").withDefault(0).forGetter(cnl -> cnl.topOffset), (App)Codec.INT.fieldOf("maximum").withDefault(0).forGetter(cnl -> cnl.maximum)).apply(instance, CountRangeDecoratorConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/DecoratedFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/DecoratedFeatureConfiguration.java
index 3e41730..f6ce591 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/DecoratedFeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/DecoratedFeatureConfiguration.java
@@ -1,26 +1,23 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.core.Registry;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import com.mojang.serialization.Codec;
 
 public class DecoratedFeatureConfiguration implements FeatureConfiguration {
+    public static final Codec<DecoratedFeatureConfiguration> CODEC;
     public final ConfiguredFeature<?, ?> feature;
     public final ConfiguredDecorator<?> decorator;
     
-    public DecoratedFeatureConfiguration(final ConfiguredFeature<?, ?> cdc, final ConfiguredDecorator<?> cjj) {
-        this.feature = cdc;
-        this.decorator = cjj;
-    }
-    
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("feature"), this.feature.<T>serialize(dynamicOps).getValue(), dynamicOps.createString("decorator"), this.decorator.<T>serialize(dynamicOps).getValue())));
+    public DecoratedFeatureConfiguration(final ConfiguredFeature<?, ?> ckb, final ConfiguredDecorator<?> crl) {
+        this.feature = ckb;
+        this.decorator = crl;
     }
     
     @Override
@@ -28,9 +25,7 @@ public class DecoratedFeatureConfiguration implements FeatureConfiguration {
         return String.format("< %s [%s | %s] >", this.getClass().getSimpleName(), Registry.FEATURE.getKey(this.feature.feature), Registry.DECORATOR.getKey(this.decorator.decorator));
     }
     
-    public static <T> DecoratedFeatureConfiguration deserialize(final Dynamic<T> dynamic) {
-        final ConfiguredFeature<?, ?> cdc2 = ConfiguredFeature.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("feature").orElseEmptyMap());
-        final ConfiguredDecorator<?> cjj3 = ConfiguredDecorator.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("decorator").orElseEmptyMap());
-        return new DecoratedFeatureConfiguration(cdc2, cjj3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)ConfiguredFeature.CODEC.fieldOf("feature").forGetter(cnm -> cnm.feature), (App)ConfiguredDecorator.CODEC.fieldOf("decorator").forGetter(cnm -> cnm.decorator)).apply(instance, (BiFunction)DecoratedFeatureConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/DecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/DecoratorConfiguration.java
index 9bc75a6..654b61a 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/DecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/DecoratorConfiguration.java
@@ -1,10 +1,5 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
-
 public interface DecoratorConfiguration {
-    public static final NoneDecoratorConfiguration NONE = new NoneDecoratorConfiguration();
-    
-     <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps);
+    public static final NoneDecoratorConfiguration NONE = NoneDecoratorConfiguration.INSTANCE;
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/DeltaFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/DeltaFeatureConfiguration.java
new file mode 100644
index 0000000..80439c7
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/DeltaFeatureConfiguration.java
@@ -0,0 +1,72 @@
+package net.minecraft.world.level.levelgen.feature.configurations;
+
+import java.util.Optional;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
+
+public class DeltaFeatureConfiguration implements FeatureConfiguration {
+    public static final Codec<DeltaFeatureConfiguration> CODEC;
+    public final BlockState contents;
+    public final BlockState rim;
+    public final int minimumRadius;
+    public final int maximumRadius;
+    public final int maximumRimSize;
+    
+    public DeltaFeatureConfiguration(final BlockState cfj1, final BlockState cfj2, final int integer3, final int integer4, final int integer5) {
+        this.contents = cfj1;
+        this.rim = cfj2;
+        this.minimumRadius = integer3;
+        this.maximumRadius = integer4;
+        this.maximumRimSize = integer5;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockState.CODEC.fieldOf("contents").forGetter(cno -> cno.contents), (App)BlockState.CODEC.fieldOf("rim").forGetter(cno -> cno.rim), (App)Codec.INT.fieldOf("minimum_radius").forGetter(cno -> cno.minimumRadius), (App)Codec.INT.fieldOf("maximum_radius").forGetter(cno -> cno.maximumRadius), (App)Codec.INT.fieldOf("maximum_rim").forGetter(cno -> cno.maximumRimSize)).apply(instance, DeltaFeatureConfiguration::new));
+    }
+    
+    public static class Builder {
+        Optional<BlockState> contents;
+        Optional<BlockState> rim;
+        int minRadius;
+        int maxRadius;
+        int maxRim;
+        
+        public Builder() {
+            this.contents = Optional.<BlockState>empty();
+            this.rim = Optional.<BlockState>empty();
+        }
+        
+        public Builder radius(final int integer1, final int integer2) {
+            this.minRadius = integer1;
+            this.maxRadius = integer2;
+            return this;
+        }
+        
+        public Builder contents(final BlockState cfj) {
+            this.contents = Optional.<BlockState>of(cfj);
+            return this;
+        }
+        
+        public Builder rim(final BlockState cfj, final int integer) {
+            this.rim = Optional.<BlockState>of(cfj);
+            this.maxRim = integer;
+            return this;
+        }
+        
+        public DeltaFeatureConfiguration build() {
+            if (!this.contents.isPresent()) {
+                throw new IllegalArgumentException("Missing contents");
+            }
+            if (!this.rim.isPresent()) {
+                throw new IllegalArgumentException("Missing rim");
+            }
+            if (this.minRadius > this.maxRadius) {
+                throw new IllegalArgumentException("Minimum radius cannot be greater than maximum radius");
+            }
+            return new DeltaFeatureConfiguration(this.contents.get(), this.rim.get(), this.minRadius, this.maxRadius, this.maxRim);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/DiskConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/DiskConfiguration.java
index 62acdef..08744cf 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/DiskConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/DiskConfiguration.java
@@ -1,38 +1,27 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import net.minecraft.world.level.block.Blocks;
-import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Stream;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.List;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class DiskConfiguration implements FeatureConfiguration {
+    public static final Codec<DiskConfiguration> CODEC;
     public final BlockState state;
     public final int radius;
     public final int ySize;
     public final List<BlockState> targets;
     
-    public DiskConfiguration(final BlockState byj, final int integer2, final int integer3, final List<BlockState> list) {
-        this.state = byj;
+    public DiskConfiguration(final BlockState cfj, final int integer2, final int integer3, final List<BlockState> list) {
+        this.state = cfj;
         this.radius = integer2;
         this.ySize = integer3;
         this.targets = list;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("state"), BlockState.<T>serialize(dynamicOps, this.state).getValue(), dynamicOps.createString("radius"), dynamicOps.createInt(this.radius), dynamicOps.createString("y_size"), dynamicOps.createInt(this.ySize), dynamicOps.createString("targets"), dynamicOps.createList((Stream)this.targets.stream().map(byj -> BlockState.<T>serialize(dynamicOps, byj).getValue())))));
-    }
-    
-    public static <T> DiskConfiguration deserialize(final Dynamic<T> dynamic) {
-        final BlockState byj2 = dynamic.get("state").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        final int integer3 = dynamic.get("radius").asInt(0);
-        final int integer4 = dynamic.get("y_size").asInt(0);
-        final List<BlockState> list5 = (List<BlockState>)dynamic.get("targets").asList((Function)BlockState::deserialize);
-        return new DiskConfiguration(byj2, integer3, integer4, list5);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockState.CODEC.fieldOf("state").forGetter(cnp -> cnp.state), (App)Codec.INT.fieldOf("radius").withDefault(0).forGetter(cnp -> cnp.radius), (App)Codec.INT.fieldOf("y_size").withDefault(0).forGetter(cnp -> cnp.ySize), (App)BlockState.CODEC.listOf().fieldOf("targets").forGetter(cnp -> cnp.targets)).apply(instance, DiskConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/EndGatewayConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/EndGatewayConfiguration.java
index 058d5c7..c314ae0 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/EndGatewayConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/EndGatewayConfiguration.java
@@ -1,13 +1,15 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.BlockPos;
 import java.util.Optional;
+import com.mojang.serialization.Codec;
 
 public class EndGatewayConfiguration implements FeatureConfiguration {
+    public static final Codec<EndGatewayConfiguration> CODEC;
     private final Optional<BlockPos> exit;
     private final boolean exact;
     
@@ -16,8 +18,8 @@ public class EndGatewayConfiguration implements FeatureConfiguration {
         this.exact = boolean2;
     }
     
-    public static EndGatewayConfiguration knownExit(final BlockPos fk, final boolean boolean2) {
-        return new EndGatewayConfiguration(Optional.<BlockPos>of(fk), boolean2);
+    public static EndGatewayConfiguration knownExit(final BlockPos fu, final boolean boolean2) {
+        return new EndGatewayConfiguration(Optional.<BlockPos>of(fu), boolean2);
     }
     
     public static EndGatewayConfiguration delayedExitSearch() {
@@ -32,14 +34,7 @@ public class EndGatewayConfiguration implements FeatureConfiguration {
         return this.exact;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, this.exit.map(fk -> dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("exit_x"), dynamicOps.createInt(fk.getX()), dynamicOps.createString("exit_y"), dynamicOps.createInt(fk.getY()), dynamicOps.createString("exit_z"), dynamicOps.createInt(fk.getZ()), dynamicOps.createString("exact"), dynamicOps.createBoolean(this.exact)))).orElse(dynamicOps.emptyMap()));
-    }
-    
-    public static <T> EndGatewayConfiguration deserialize(final Dynamic<T> dynamic) {
-        final Optional<BlockPos> optional2 = dynamic.get("exit_x").asNumber().<BlockPos>flatMap(number -> dynamic.get("exit_y").asNumber().flatMap(number3 -> dynamic.get("exit_z").asNumber().map(number3 -> new BlockPos(number.intValue(), number3.intValue(), number3.intValue()))));
-        final boolean boolean3 = dynamic.get("exact").asBoolean(false);
-        return new EndGatewayConfiguration(optional2, boolean3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockPos.CODEC.optionalFieldOf("exit").forGetter(cnq -> cnq.exit), (App)Codec.BOOL.fieldOf("exact").forGetter(cnq -> cnq.exact)).apply(instance, (BiFunction)EndGatewayConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/FeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/FeatureConfiguration.java
index a341a4d..8f2a9a4 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/FeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/FeatureConfiguration.java
@@ -1,10 +1,5 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
-
 public interface FeatureConfiguration {
-    public static final NoneFeatureConfiguration NONE = new NoneFeatureConfiguration();
-    
-     <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps);
+    public static final NoneFeatureConfiguration NONE = NoneFeatureConfiguration.INSTANCE;
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/FeatureRadiusConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/FeatureRadiusConfiguration.java
index 6ee9b85..883e9be 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/FeatureRadiusConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/FeatureRadiusConfiguration.java
@@ -1,24 +1,17 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class FeatureRadiusConfiguration implements FeatureConfiguration {
+    public static final Codec<FeatureRadiusConfiguration> CODEC;
     public final int radius;
     
     public FeatureRadiusConfiguration(final int integer) {
         this.radius = integer;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("radius"), dynamicOps.createInt(this.radius))));
-    }
-    
-    public static <T> FeatureRadiusConfiguration deserialize(final Dynamic<T> dynamic) {
-        final int integer2 = dynamic.get("radius").asInt(0);
-        return new FeatureRadiusConfiguration(integer2);
+    static {
+        CODEC = Codec.INT.fieldOf("radius").xmap((Function)FeatureRadiusConfiguration::new, cns -> cns.radius).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/HugeMushroomFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/HugeMushroomFeatureConfiguration.java
index cd1ba7c..75e6a49 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/HugeMushroomFeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/HugeMushroomFeatureConfiguration.java
@@ -1,36 +1,24 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import net.minecraft.resources.ResourceLocation;
-import java.util.function.Supplier;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;
+import com.mojang.serialization.Codec;
 
 public class HugeMushroomFeatureConfiguration implements FeatureConfiguration {
+    public static final Codec<HugeMushroomFeatureConfiguration> CODEC;
     public final BlockStateProvider capProvider;
     public final BlockStateProvider stemProvider;
     public final int foliageRadius;
     
-    public HugeMushroomFeatureConfiguration(final BlockStateProvider chw1, final BlockStateProvider chw2, final int integer) {
-        this.capProvider = chw1;
-        this.stemProvider = chw2;
+    public HugeMushroomFeatureConfiguration(final BlockStateProvider cpo1, final BlockStateProvider cpo2, final int integer) {
+        this.capProvider = cpo1;
+        this.stemProvider = cpo2;
         this.foliageRadius = integer;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("cap_provider"), this.capProvider.<T>serialize(dynamicOps)).put((T)dynamicOps.createString("stem_provider"), this.stemProvider.<T>serialize(dynamicOps)).put((T)dynamicOps.createString("foliage_radius"), (T)dynamicOps.createInt(this.foliageRadius));
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build()));
-    }
-    
-    public static <T> HugeMushroomFeatureConfiguration deserialize(final Dynamic<T> dynamic) {
-        final BlockStateProviderType<?> chx2 = Registry.BLOCKSTATE_PROVIDER_TYPES.get(new ResourceLocation(dynamic.get("cap_provider").get("type").asString().<Throwable>orElseThrow(RuntimeException::new)));
-        final BlockStateProviderType<?> chx3 = Registry.BLOCKSTATE_PROVIDER_TYPES.get(new ResourceLocation(dynamic.get("stem_provider").get("type").asString().<Throwable>orElseThrow(RuntimeException::new)));
-        return new HugeMushroomFeatureConfiguration((BlockStateProvider)chx2.deserialize(dynamic.get("cap_provider").orElseEmptyMap()), (BlockStateProvider)chx3.deserialize(dynamic.get("stem_provider").orElseEmptyMap()), dynamic.get("foliage_radius").asInt(2));
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockStateProvider.CODEC.fieldOf("cap_provider").forGetter(cnt -> cnt.capProvider), (App)BlockStateProvider.CODEC.fieldOf("stem_provider").forGetter(cnt -> cnt.stemProvider), (App)Codec.INT.fieldOf("foliage_radius").withDefault(2).forGetter(cnt -> cnt.foliageRadius)).apply(instance, HugeMushroomFeatureConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/JigsawConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/JigsawConfiguration.java
new file mode 100644
index 0000000..f749595
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/JigsawConfiguration.java
@@ -0,0 +1,32 @@
+package net.minecraft.world.level.levelgen.feature.configurations;
+
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import java.util.function.Function;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.resources.ResourceLocation;
+import com.mojang.serialization.Codec;
+
+public class JigsawConfiguration implements FeatureConfiguration {
+    public static final Codec<JigsawConfiguration> CODEC;
+    public final ResourceLocation startPool;
+    public final int size;
+    
+    public JigsawConfiguration(final ResourceLocation uh, final int integer) {
+        this.startPool = uh;
+        this.size = integer;
+    }
+    
+    public int getSize() {
+        return this.size;
+    }
+    
+    public ResourceLocation getStartPool() {
+        return this.startPool;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)ResourceLocation.CODEC.fieldOf("start_pool").forGetter((Function)JigsawConfiguration::getStartPool), (App)Codec.INT.fieldOf("size").forGetter((Function)JigsawConfiguration::getSize)).apply(instance, (BiFunction)JigsawConfiguration::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/LayerConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/LayerConfiguration.java
index 734feca..51fdbc3 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/LayerConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/LayerConfiguration.java
@@ -1,30 +1,23 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import net.minecraft.world.level.block.Blocks;
-import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class LayerConfiguration implements FeatureConfiguration {
+    public static final Codec<LayerConfiguration> CODEC;
     public final int height;
     public final BlockState state;
     
-    public LayerConfiguration(final int integer, final BlockState byj) {
+    public LayerConfiguration(final int integer, final BlockState cfj) {
         this.height = integer;
-        this.state = byj;
+        this.state = cfj;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("height"), dynamicOps.createInt(this.height), dynamicOps.createString("state"), BlockState.<T>serialize(dynamicOps, this.state).getValue())));
-    }
-    
-    public static <T> LayerConfiguration deserialize(final Dynamic<T> dynamic) {
-        final int integer2 = dynamic.get("height").asInt(0);
-        final BlockState byj3 = dynamic.get("state").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        return new LayerConfiguration(integer2, byj3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("height").forGetter(cnv -> cnv.height), (App)BlockState.CODEC.fieldOf("state").forGetter(cnv -> cnv.state)).apply(instance, (BiFunction)LayerConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/MegaTreeConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/MegaTreeConfiguration.java
deleted file mode 100644
index 5a515c8..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/MegaTreeConfiguration.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package net.minecraft.world.level.levelgen.feature.configurations;
-
-import com.google.common.collect.ImmutableList;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator;
-import java.util.List;
-import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;
-
-public class MegaTreeConfiguration extends TreeConfiguration {
-    public final int heightInterval;
-    public final int crownHeight;
-    
-    protected MegaTreeConfiguration(final BlockStateProvider chw1, final BlockStateProvider chw2, final List<TreeDecorator> list, final int integer4, final int integer5, final int integer6) {
-        super(chw1, chw2, list, integer4);
-        this.heightInterval = integer5;
-        this.crownHeight = integer6;
-    }
-    
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        final Dynamic<T> dynamic3 = (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("height_interval"), dynamicOps.createInt(this.heightInterval), dynamicOps.createString("crown_height"), dynamicOps.createInt(this.crownHeight))));
-        return (Dynamic<T>)dynamic3.merge((Dynamic)super.<T>serialize(dynamicOps));
-    }
-    
-    public static <T> MegaTreeConfiguration deserialize(final Dynamic<T> dynamic) {
-        final TreeConfiguration chl2 = TreeConfiguration.<T>deserialize(dynamic);
-        return new MegaTreeConfiguration(chl2.trunkProvider, chl2.leavesProvider, chl2.decorators, chl2.baseHeight, dynamic.get("height_interval").asInt(0), dynamic.get("crown_height").asInt(0));
-    }
-    
-    public static class MegaTreeConfigurationBuilder extends TreeConfigurationBuilder {
-        private List<TreeDecorator> decorators;
-        private int baseHeight;
-        private int heightInterval;
-        private int crownHeight;
-        
-        public MegaTreeConfigurationBuilder(final BlockStateProvider chw1, final BlockStateProvider chw2) {
-            super(chw1, chw2);
-            this.decorators = ImmutableList.of();
-        }
-        
-        public MegaTreeConfigurationBuilder decorators(final List<TreeDecorator> list) {
-            this.decorators = list;
-            return this;
-        }
-        
-        @Override
-        public MegaTreeConfigurationBuilder baseHeight(final int integer) {
-            this.baseHeight = integer;
-            return this;
-        }
-        
-        public MegaTreeConfigurationBuilder heightInterval(final int integer) {
-            this.heightInterval = integer;
-            return this;
-        }
-        
-        public MegaTreeConfigurationBuilder crownHeight(final int integer) {
-            this.crownHeight = integer;
-            return this;
-        }
-        
-        @Override
-        public MegaTreeConfiguration build() {
-            return new MegaTreeConfiguration(this.trunkProvider, this.leavesProvider, this.decorators, this.baseHeight, this.heightInterval, this.crownHeight);
-        }
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/MineshaftConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/MineshaftConfiguration.java
index 4fbc552..48e53e5 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/MineshaftConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/MineshaftConfiguration.java
@@ -1,12 +1,14 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
+import com.mojang.serialization.Codec;
 
 public class MineshaftConfiguration implements FeatureConfiguration {
+    public static final Codec<MineshaftConfiguration> CODEC;
     public final double probability;
     public final MineshaftFeature.Type type;
     
@@ -15,14 +17,7 @@ public class MineshaftConfiguration implements FeatureConfiguration {
         this.type = b;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("probability"), dynamicOps.createDouble(this.probability), dynamicOps.createString("type"), dynamicOps.createString(this.type.getName()))));
-    }
-    
-    public static <T> MineshaftConfiguration deserialize(final Dynamic<T> dynamic) {
-        final float float2 = dynamic.get("probability").asFloat(0.0f);
-        final MineshaftFeature.Type b3 = MineshaftFeature.Type.byName(dynamic.get("type").asString(""));
-        return new MineshaftConfiguration(float2, b3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.DOUBLE.fieldOf("probability").forGetter(cnw -> cnw.probability), (App)MineshaftFeature.Type.CODEC.fieldOf("type").forGetter(cnw -> cnw.type)).apply(instance, (BiFunction)MineshaftConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/MultiJigsawConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/MultiJigsawConfiguration.java
new file mode 100644
index 0000000..47aa9e1
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/MultiJigsawConfiguration.java
@@ -0,0 +1,35 @@
+package net.minecraft.world.level.levelgen.feature.configurations;
+
+import java.util.function.Function;
+import java.util.Random;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Map;
+import java.util.List;
+import com.mojang.serialization.Codec;
+
+public class MultiJigsawConfiguration implements FeatureConfiguration {
+    public static final Codec<MultiJigsawConfiguration> CODEC;
+    private final List<JigsawConfiguration> configurations;
+    
+    public MultiJigsawConfiguration(final Map<String, Integer> map) {
+        final JigsawConfiguration jigsawConfiguration;
+        this(map.entrySet().stream().map(entry -> {
+            new JigsawConfiguration(new ResourceLocation(entry.getKey()), (int)entry.getValue());
+            return jigsawConfiguration;
+        }).collect(Collectors.toList()));
+    }
+    
+    private MultiJigsawConfiguration(final List<JigsawConfiguration> list) {
+        this.configurations = list;
+    }
+    
+    public JigsawConfiguration getRandomPool(final Random random) {
+        return this.configurations.get(random.nextInt(this.configurations.size()));
+    }
+    
+    static {
+        CODEC = JigsawConfiguration.CODEC.listOf().xmap((Function)MultiJigsawConfiguration::new, cnx -> cnx.configurations);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/NoiseDependantDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/NoiseDependantDecoratorConfiguration.java
index 3f3fcbf..b9d7aa0 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/NoiseDependantDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/NoiseDependantDecoratorConfiguration.java
@@ -1,11 +1,12 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 
 public class NoiseDependantDecoratorConfiguration implements DecoratorConfiguration {
+    public static final Codec<NoiseDependantDecoratorConfiguration> CODEC;
     public final double noiseLevel;
     public final int belowNoise;
     public final int aboveNoise;
@@ -16,15 +17,7 @@ public class NoiseDependantDecoratorConfiguration implements DecoratorConfigurat
         this.aboveNoise = integer3;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("noise_level"), dynamicOps.createDouble(this.noiseLevel), dynamicOps.createString("below_noise"), dynamicOps.createInt(this.belowNoise), dynamicOps.createString("above_noise"), dynamicOps.createInt(this.aboveNoise))));
-    }
-    
-    public static NoiseDependantDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        final double double2 = dynamic.get("noise_level").asDouble(0.0);
-        final int integer4 = dynamic.get("below_noise").asInt(0);
-        final int integer5 = dynamic.get("above_noise").asInt(0);
-        return new NoiseDependantDecoratorConfiguration(double2, integer4, integer5);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.DOUBLE.fieldOf("noise_level").forGetter(cny -> cny.noiseLevel), (App)Codec.INT.fieldOf("below_noise").forGetter(cny -> cny.belowNoise), (App)Codec.INT.fieldOf("above_noise").forGetter(cny -> cny.aboveNoise)).apply(instance, NoiseDependantDecoratorConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/NoneDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/NoneDecoratorConfiguration.java
index 75c7a50..e46577c 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/NoneDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/NoneDecoratorConfiguration.java
@@ -1,15 +1,13 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.Codec;
 
 public class NoneDecoratorConfiguration implements DecoratorConfiguration {
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.emptyMap());
-    }
+    public static final Codec<NoneDecoratorConfiguration> CODEC;
+    public static final NoneDecoratorConfiguration INSTANCE;
     
-    public static NoneDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        return new NoneDecoratorConfiguration();
+    static {
+        CODEC = Codec.unit(() -> NoneDecoratorConfiguration.INSTANCE);
+        INSTANCE = new NoneDecoratorConfiguration();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/NoneFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/NoneFeatureConfiguration.java
index 234cc98..cd23f3d 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/NoneFeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/NoneFeatureConfiguration.java
@@ -1,15 +1,13 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.Codec;
 
 public class NoneFeatureConfiguration implements FeatureConfiguration {
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.emptyMap());
-    }
+    public static final Codec<NoneFeatureConfiguration> CODEC;
+    public static final NoneFeatureConfiguration INSTANCE;
     
-    public static <T> NoneFeatureConfiguration deserialize(final Dynamic<T> dynamic) {
-        return NoneFeatureConfiguration.NONE;
+    static {
+        CODEC = Codec.unit(() -> NoneFeatureConfiguration.INSTANCE);
+        INSTANCE = new NoneFeatureConfiguration();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/OceanRuinConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/OceanRuinConfiguration.java
index 524dc17..e865168 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/OceanRuinConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/OceanRuinConfiguration.java
@@ -1,12 +1,13 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
+import com.mojang.serialization.Codec;
 
 public class OceanRuinConfiguration implements FeatureConfiguration {
+    public static final Codec<OceanRuinConfiguration> CODEC;
     public final OceanRuinFeature.Type biomeTemp;
     public final float largeProbability;
     public final float clusterProbability;
@@ -17,15 +18,7 @@ public class OceanRuinConfiguration implements FeatureConfiguration {
         this.clusterProbability = float3;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("biome_temp"), dynamicOps.createString(this.biomeTemp.getName()), dynamicOps.createString("large_probability"), dynamicOps.createFloat(this.largeProbability), dynamicOps.createString("cluster_probability"), dynamicOps.createFloat(this.clusterProbability))));
-    }
-    
-    public static <T> OceanRuinConfiguration deserialize(final Dynamic<T> dynamic) {
-        final OceanRuinFeature.Type b2 = OceanRuinFeature.Type.byName(dynamic.get("biome_temp").asString(""));
-        final float float3 = dynamic.get("large_probability").asFloat(0.0f);
-        final float float4 = dynamic.get("cluster_probability").asFloat(0.0f);
-        return new OceanRuinConfiguration(b2, float3, float4);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)OceanRuinFeature.Type.CODEC.fieldOf("biome_temp").forGetter(cob -> cob.biomeTemp), (App)Codec.FLOAT.fieldOf("large_probability").forGetter(cob -> cob.largeProbability), (App)Codec.FLOAT.fieldOf("cluster_probability").forGetter(cob -> cob.clusterProbability)).apply(instance, OceanRuinConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/OreConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/OreConfiguration.java
index e7adba3..9121e02 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/OreConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/OreConfiguration.java
@@ -2,52 +2,54 @@ package net.minecraft.world.level.levelgen.feature.configurations;
 
 import java.util.stream.Collectors;
 import java.util.Arrays;
-import net.minecraft.world.level.block.state.predicate.BlockPredicate;
-import net.minecraft.world.level.block.Block;
-import java.util.function.Predicate;
-import net.minecraft.world.level.block.Blocks;
 import java.util.function.Function;
+import net.minecraft.world.level.block.state.predicate.BlockPredicate;
+import net.minecraft.world.level.block.Blocks;
+import java.util.function.Predicate;
 import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import net.minecraft.util.StringRepresentable;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class OreConfiguration implements FeatureConfiguration {
+    public static final Codec<OreConfiguration> CODEC;
     public final Predicates target;
     public final int size;
     public final BlockState state;
     
-    public OreConfiguration(final Predicates a, final BlockState byj, final int integer) {
+    public OreConfiguration(final Predicates a, final BlockState cfj, final int integer) {
         this.size = integer;
-        this.state = byj;
+        this.state = cfj;
         this.target = a;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("size"), dynamicOps.createInt(this.size), dynamicOps.createString("target"), dynamicOps.createString(this.target.getName()), dynamicOps.createString("state"), BlockState.<T>serialize(dynamicOps, this.state).getValue())));
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Predicates.CODEC.fieldOf("target").forGetter(coc -> coc.target), (App)BlockState.CODEC.fieldOf("state").forGetter(coc -> coc.state), (App)Codec.INT.fieldOf("size").withDefault(0).forGetter(coc -> coc.size)).apply(instance, OreConfiguration::new));
     }
     
-    public static OreConfiguration deserialize(final Dynamic<?> dynamic) {
-        final int integer2 = dynamic.get("size").asInt(0);
-        final Predicates a3 = Predicates.byName(dynamic.get("target").asString(""));
-        final BlockState byj4 = dynamic.get("state").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        return new OreConfiguration(a3, byj4, integer2);
-    }
-    
-    public enum Predicates {
-        NATURAL_STONE("natural_stone", byj -> {
-            if (byj != null) {
-                bph2 = byj.getBlock();
-                return bph2 == Blocks.STONE || bph2 == Blocks.GRANITE || bph2 == Blocks.DIORITE || bph2 == Blocks.ANDESITE;
+    public enum Predicates implements StringRepresentable {
+        NATURAL_STONE("natural_stone", cfj -> {
+            if (cfj != null) {
+                return cfj.is(Blocks.STONE) || cfj.is(Blocks.GRANITE) || cfj.is(Blocks.DIORITE) || cfj.is(Blocks.ANDESITE);
             }
             else {
                 return false;
             }
         }), 
-        NETHERRACK("netherrack", (Predicate<BlockState>)new BlockPredicate(Blocks.NETHERRACK));
+        NETHERRACK("netherrack", (Predicate<BlockState>)new BlockPredicate(Blocks.NETHERRACK)), 
+        NETHER_ORE_REPLACEABLES("nether_ore_replaceables", cfj -> {
+            if (cfj != null) {
+                return cfj.is(Blocks.NETHERRACK) || cfj.is(Blocks.BASALT) || cfj.is(Blocks.BLACKSTONE);
+            }
+            else {
+                return false;
+            }
+        });
         
+        public static final Codec<Predicates> CODEC;
         private static final Map<String, Predicates> BY_NAME;
         private final String name;
         private final Predicate<BlockState> predicate;
@@ -69,7 +71,13 @@ public class OreConfiguration implements FeatureConfiguration {
             return this.predicate;
         }
         
+        @Override
+        public String getSerializedName() {
+            return this.name;
+        }
+        
         static {
+            CODEC = StringRepresentable.<Predicates>fromEnum(Predicates::values, Predicates::byName);
             BY_NAME = Arrays.<Predicates>stream(values()).collect(Collectors.toMap(Predicates::getName, a -> a));
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/ProbabilityFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/ProbabilityFeatureConfiguration.java
index b945d61..415ecb5 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/ProbabilityFeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/ProbabilityFeatureConfiguration.java
@@ -1,25 +1,21 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
 
 public class ProbabilityFeatureConfiguration implements CarverConfiguration, FeatureConfiguration {
+    public static final Codec<ProbabilityFeatureConfiguration> CODEC;
     public final float probability;
     
     public ProbabilityFeatureConfiguration(final float float1) {
         this.probability = float1;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("probability"), dynamicOps.createFloat(this.probability))));
-    }
-    
-    public static <T> ProbabilityFeatureConfiguration deserialize(final Dynamic<T> dynamic) {
-        final float float2 = dynamic.get("probability").asFloat(0.0f);
-        return new ProbabilityFeatureConfiguration(float2);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.FLOAT.fieldOf("probability").withDefault(0.0f).forGetter(cod -> cod.probability)).apply(instance, (Function)ProbabilityFeatureConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/RandomBooleanFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/RandomBooleanFeatureConfiguration.java
index 94dd5f4..3f74ad4 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/RandomBooleanFeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/RandomBooleanFeatureConfiguration.java
@@ -1,28 +1,23 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import com.mojang.serialization.Codec;
 
 public class RandomBooleanFeatureConfiguration implements FeatureConfiguration {
+    public static final Codec<RandomBooleanFeatureConfiguration> CODEC;
     public final ConfiguredFeature<?, ?> featureTrue;
     public final ConfiguredFeature<?, ?> featureFalse;
     
-    public RandomBooleanFeatureConfiguration(final ConfiguredFeature<?, ?> cdc1, final ConfiguredFeature<?, ?> cdc2) {
-        this.featureTrue = cdc1;
-        this.featureFalse = cdc2;
+    public RandomBooleanFeatureConfiguration(final ConfiguredFeature<?, ?> ckb1, final ConfiguredFeature<?, ?> ckb2) {
+        this.featureTrue = ckb1;
+        this.featureFalse = ckb2;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("feature_true"), this.featureTrue.<T>serialize(dynamicOps).getValue(), dynamicOps.createString("feature_false"), this.featureFalse.<T>serialize(dynamicOps).getValue())));
-    }
-    
-    public static <T> RandomBooleanFeatureConfiguration deserialize(final Dynamic<T> dynamic) {
-        final ConfiguredFeature<?, ?> cdc2 = ConfiguredFeature.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("feature_true").orElseEmptyMap());
-        final ConfiguredFeature<?, ?> cdc3 = ConfiguredFeature.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("feature_false").orElseEmptyMap());
-        return new RandomBooleanFeatureConfiguration(cdc2, cdc3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)ConfiguredFeature.CODEC.fieldOf("feature_true").forGetter(coe -> coe.featureTrue), (App)ConfiguredFeature.CODEC.fieldOf("feature_false").forGetter(coe -> coe.featureFalse)).apply(instance, (BiFunction)RandomBooleanFeatureConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/RandomFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/RandomFeatureConfiguration.java
index 293d4c7..da04c10 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/RandomFeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/RandomFeatureConfiguration.java
@@ -1,34 +1,24 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Stream;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.WeightedConfiguredFeature;
 import java.util.List;
+import com.mojang.serialization.Codec;
 
 public class RandomFeatureConfiguration implements FeatureConfiguration {
+    public static final Codec<RandomFeatureConfiguration> CODEC;
     public final List<WeightedConfiguredFeature<?>> features;
     public final ConfiguredFeature<?, ?> defaultFeature;
     
-    public RandomFeatureConfiguration(final List<WeightedConfiguredFeature<?>> list, final ConfiguredFeature<?, ?> cdc) {
+    public RandomFeatureConfiguration(final List<WeightedConfiguredFeature<?>> list, final ConfiguredFeature<?, ?> ckb) {
         this.features = list;
-        this.defaultFeature = cdc;
+        this.defaultFeature = ckb;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        final T object3 = (T)dynamicOps.createList((Stream)this.features.stream().map(cfu -> cfu.<T>serialize(dynamicOps).getValue()));
-        final T object4 = (T)this.defaultFeature.<T>serialize(dynamicOps).getValue();
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.<Object, T>of(dynamicOps.createString("features"), object3, dynamicOps.createString("default"), object4)));
-    }
-    
-    public static <T> RandomFeatureConfiguration deserialize(final Dynamic<T> dynamic) {
-        final List<WeightedConfiguredFeature<?>> list2 = (List<WeightedConfiguredFeature<?>>)dynamic.get("features").asList((Function)WeightedConfiguredFeature::deserialize);
-        final ConfiguredFeature<?, ?> cdc3 = ConfiguredFeature.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("default").orElseEmptyMap());
-        return new RandomFeatureConfiguration(list2, cdc3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> instance.apply2((BiFunction)RandomFeatureConfiguration::new, (App)WeightedConfiguredFeature.CODEC.listOf().fieldOf("features").forGetter(cof -> cof.features), (App)ConfiguredFeature.CODEC.fieldOf("default").forGetter(cof -> cof.defaultFeature)));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/RandomPatchConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/RandomPatchConfiguration.java
index 93555ef..2e35592 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/RandomPatchConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/RandomPatchConfiguration.java
@@ -1,27 +1,25 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
+import com.mojang.datafixers.kinds.Applicative;
+import com.google.common.collect.ImmutableList;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.Collection;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.function.Function;
-import net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacerType;
-import net.minecraft.resources.ResourceLocation;
-import java.util.function.Supplier;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType;
-import java.util.Map;
-import java.util.stream.Stream;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import java.util.List;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Block;
 import java.util.Set;
 import net.minecraft.world.level.levelgen.feature.blockplacers.BlockPlacer;
 import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;
+import com.mojang.serialization.Codec;
 
 public class RandomPatchConfiguration implements FeatureConfiguration {
+    public static final Codec<RandomPatchConfiguration> CODEC;
     public final BlockStateProvider stateProvider;
     public final BlockPlacer blockPlacer;
     public final Set<Block> whitelist;
@@ -34,9 +32,13 @@ public class RandomPatchConfiguration implements FeatureConfiguration {
     public final boolean project;
     public final boolean needWater;
     
-    private RandomPatchConfiguration(final BlockStateProvider chw, final BlockPlacer cfw, final Set<Block> set3, final Set<BlockState> set4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10, final boolean boolean11) {
-        this.stateProvider = chw;
-        this.blockPlacer = cfw;
+    private RandomPatchConfiguration(final BlockStateProvider cpo, final BlockPlacer cmy, final List<BlockState> list3, final List<BlockState> list4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10, final boolean boolean11) {
+        this(cpo, cmy, list3.stream().map(BlockBehaviour.BlockStateBase::getBlock).collect(Collectors.toSet()), ImmutableSet.copyOf(list4), integer5, integer6, integer7, integer8, boolean9, boolean10, boolean11);
+    }
+    
+    private RandomPatchConfiguration(final BlockStateProvider cpo, final BlockPlacer cmy, final Set<Block> set3, final Set<BlockState> set4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10, final boolean boolean11) {
+        this.stateProvider = cpo;
+        this.blockPlacer = cmy;
         this.whitelist = set3;
         this.blacklist = set4;
         this.tries = integer5;
@@ -48,17 +50,8 @@ public class RandomPatchConfiguration implements FeatureConfiguration {
         this.needWater = boolean11;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("state_provider"), this.stateProvider.<T>serialize(dynamicOps)).put((T)dynamicOps.createString("block_placer"), this.blockPlacer.<T>serialize(dynamicOps)).put((T)dynamicOps.createString("whitelist"), (T)dynamicOps.createList((Stream)this.whitelist.stream().map(bph -> BlockState.<T>serialize(dynamicOps, bph.defaultBlockState()).getValue()))).put((T)dynamicOps.createString("blacklist"), (T)dynamicOps.createList((Stream)this.blacklist.stream().map(byj -> BlockState.<T>serialize(dynamicOps, byj).getValue()))).put((T)dynamicOps.createString("tries"), (T)dynamicOps.createInt(this.tries)).put((T)dynamicOps.createString("xspread"), (T)dynamicOps.createInt(this.xspread)).put((T)dynamicOps.createString("yspread"), (T)dynamicOps.createInt(this.yspread)).put((T)dynamicOps.createString("zspread"), (T)dynamicOps.createInt(this.zspread)).put((T)dynamicOps.createString("can_replace"), (T)dynamicOps.createBoolean(this.canReplace)).put((T)dynamicOps.createString("project"), (T)dynamicOps.createBoolean(this.project)).put((T)dynamicOps.createString("need_water"), (T)dynamicOps.createBoolean(this.needWater));
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build()));
-    }
-    
-    public static <T> RandomPatchConfiguration deserialize(final Dynamic<T> dynamic) {
-        final BlockStateProviderType<?> chx2 = Registry.BLOCKSTATE_PROVIDER_TYPES.get(new ResourceLocation(dynamic.get("state_provider").get("type").asString().<Throwable>orElseThrow(RuntimeException::new)));
-        final BlockPlacerType<?> cfx3 = Registry.BLOCK_PLACER_TYPES.get(new ResourceLocation(dynamic.get("block_placer").get("type").asString().<Throwable>orElseThrow(RuntimeException::new)));
-        return new RandomPatchConfiguration((BlockStateProvider)chx2.deserialize(dynamic.get("state_provider").orElseEmptyMap()), (BlockPlacer)cfx3.deserialize(dynamic.get("block_placer").orElseEmptyMap()), (Set<Block>)dynamic.get("whitelist").asList((Function)BlockState::deserialize).stream().map(BlockState::getBlock).collect(Collectors.toSet()), Sets.newHashSet(dynamic.get("blacklist").asList((Function)BlockState::deserialize)), dynamic.get("tries").asInt(128), dynamic.get("xspread").asInt(7), dynamic.get("yspread").asInt(3), dynamic.get("zspread").asInt(7), dynamic.get("can_replace").asBoolean(false), dynamic.get("project").asBoolean(true), dynamic.get("need_water").asBoolean(false));
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockStateProvider.CODEC.fieldOf("state_provider").forGetter(cog -> cog.stateProvider), (App)BlockPlacer.CODEC.fieldOf("block_placer").forGetter(cog -> cog.blockPlacer), (App)BlockState.CODEC.listOf().fieldOf("whitelist").forGetter(cog -> cog.whitelist.stream().map(Block::defaultBlockState).collect(Collectors.toList())), (App)BlockState.CODEC.listOf().fieldOf("blacklist").forGetter(cog -> ImmutableList.copyOf(cog.blacklist)), (App)Codec.INT.fieldOf("tries").withDefault(128).forGetter(cog -> cog.tries), (App)Codec.INT.fieldOf("xspread").withDefault(7).forGetter(cog -> cog.xspread), (App)Codec.INT.fieldOf("yspread").withDefault(3).forGetter(cog -> cog.yspread), (App)Codec.INT.fieldOf("zspread").withDefault(7).forGetter(cog -> cog.zspread), (App)Codec.BOOL.fieldOf("can_replace").withDefault(false).forGetter(cog -> cog.canReplace), (App)Codec.BOOL.fieldOf("project").withDefault(true).forGetter(cog -> cog.project), (App)Codec.BOOL.fieldOf("need_water").withDefault(false).forGetter(cog -> cog.needWater)).apply(instance, RandomPatchConfiguration::new));
     }
     
     public static class GrassConfigurationBuilder {
@@ -74,7 +67,7 @@ public class RandomPatchConfiguration implements FeatureConfiguration {
         private boolean project;
         private boolean needWater;
         
-        public GrassConfigurationBuilder(final BlockStateProvider chw, final BlockPlacer cfw) {
+        public GrassConfigurationBuilder(final BlockStateProvider cpo, final BlockPlacer cmy) {
             this.whitelist = ImmutableSet.of();
             this.blacklist = ImmutableSet.of();
             this.tries = 64;
@@ -83,8 +76,8 @@ public class RandomPatchConfiguration implements FeatureConfiguration {
             this.zspread = 7;
             this.project = true;
             this.needWater = false;
-            this.stateProvider = chw;
-            this.blockPlacer = cfw;
+            this.stateProvider = cpo;
+            this.blockPlacer = cmy;
         }
         
         public GrassConfigurationBuilder whitelist(final Set<Block> set) {
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/RandomRandomFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/RandomRandomFeatureConfiguration.java
index 8fce853..d9f9312 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/RandomRandomFeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/RandomRandomFeatureConfiguration.java
@@ -1,15 +1,15 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Stream;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import java.util.List;
+import com.mojang.serialization.Codec;
 
 public class RandomRandomFeatureConfiguration implements FeatureConfiguration {
+    public static final Codec<RandomRandomFeatureConfiguration> CODEC;
     public final List<ConfiguredFeature<?, ?>> features;
     public final int count;
     
@@ -18,14 +18,7 @@ public class RandomRandomFeatureConfiguration implements FeatureConfiguration {
         this.count = integer;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("features"), dynamicOps.createList((Stream)this.features.stream().map(cdc -> cdc.<T>serialize(dynamicOps).getValue())), dynamicOps.createString("count"), dynamicOps.createInt(this.count))));
-    }
-    
-    public static <T> RandomRandomFeatureConfiguration deserialize(final Dynamic<T> dynamic) {
-        final List<ConfiguredFeature<?, ?>> list2 = (List<ConfiguredFeature<?, ?>>)dynamic.get("features").asList((Function)ConfiguredFeature::deserialize);
-        final int integer3 = dynamic.get("count").asInt(0);
-        return new RandomRandomFeatureConfiguration(list2, integer3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)ConfiguredFeature.CODEC.listOf().fieldOf("features").forGetter(coh -> coh.features), (App)Codec.INT.fieldOf("count").withDefault(0).forGetter(coh -> coh.count)).apply(instance, (BiFunction)RandomRandomFeatureConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/ReplaceBlockConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/ReplaceBlockConfiguration.java
index e04cf9f..3f7fc4c 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/ReplaceBlockConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/ReplaceBlockConfiguration.java
@@ -1,30 +1,23 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import net.minecraft.world.level.block.Blocks;
-import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class ReplaceBlockConfiguration implements FeatureConfiguration {
+    public static final Codec<ReplaceBlockConfiguration> CODEC;
     public final BlockState target;
     public final BlockState state;
     
-    public ReplaceBlockConfiguration(final BlockState byj1, final BlockState byj2) {
-        this.target = byj1;
-        this.state = byj2;
+    public ReplaceBlockConfiguration(final BlockState cfj1, final BlockState cfj2) {
+        this.target = cfj1;
+        this.state = cfj2;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("target"), BlockState.<T>serialize(dynamicOps, this.target).getValue(), dynamicOps.createString("state"), BlockState.<T>serialize(dynamicOps, this.state).getValue())));
-    }
-    
-    public static <T> ReplaceBlockConfiguration deserialize(final Dynamic<T> dynamic) {
-        final BlockState byj2 = dynamic.get("target").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        final BlockState byj3 = dynamic.get("state").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        return new ReplaceBlockConfiguration(byj2, byj3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockState.CODEC.fieldOf("target").forGetter(coi -> coi.target), (App)BlockState.CODEC.fieldOf("state").forGetter(coi -> coi.state)).apply(instance, (BiFunction)ReplaceBlockConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/ReplaceSpheroidConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/ReplaceSpheroidConfiguration.java
new file mode 100644
index 0000000..a74bb3e
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/ReplaceSpheroidConfiguration.java
@@ -0,0 +1,72 @@
+package net.minecraft.world.level.levelgen.feature.configurations;
+
+import net.minecraft.world.level.block.Blocks;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
+
+public class ReplaceSpheroidConfiguration implements FeatureConfiguration {
+    public static final Codec<ReplaceSpheroidConfiguration> CODEC;
+    public final BlockState targetState;
+    public final BlockState replaceState;
+    public final Vec3i minimumReach;
+    public final Vec3i maximumReach;
+    
+    public ReplaceSpheroidConfiguration(final BlockState cfj1, final BlockState cfj2, final Vec3i gr3, final Vec3i gr4) {
+        this.targetState = cfj1;
+        this.replaceState = cfj2;
+        this.minimumReach = gr3;
+        this.maximumReach = gr4;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockState.CODEC.fieldOf("target").forGetter(coj -> coj.targetState), (App)BlockState.CODEC.fieldOf("state").forGetter(coj -> coj.replaceState), (App)Vec3i.CODEC.fieldOf("minimum_reach").forGetter(coj -> coj.minimumReach), (App)Vec3i.CODEC.fieldOf("maximum_reach").forGetter(coj -> coj.maximumReach)).apply(instance, ReplaceSpheroidConfiguration::new));
+    }
+    
+    public static class Builder {
+        private BlockState target;
+        private BlockState state;
+        private Vec3i minimumReach;
+        private Vec3i maximumReach;
+        
+        public Builder() {
+            this.target = Blocks.AIR.defaultBlockState();
+            this.state = Blocks.AIR.defaultBlockState();
+            this.minimumReach = Vec3i.ZERO;
+            this.maximumReach = Vec3i.ZERO;
+        }
+        
+        public Builder targetBlockState(final BlockState cfj) {
+            this.target = cfj;
+            return this;
+        }
+        
+        public Builder replaceWithBlockState(final BlockState cfj) {
+            this.state = cfj;
+            return this;
+        }
+        
+        public Builder minimumReach(final Vec3i gr) {
+            this.minimumReach = gr;
+            return this;
+        }
+        
+        public Builder maximumReach(final Vec3i gr) {
+            this.maximumReach = gr;
+            return this;
+        }
+        
+        public ReplaceSpheroidConfiguration build() {
+            if (this.minimumReach.getX() < 0 || this.minimumReach.getY() < 0 || this.minimumReach.getZ() < 0) {
+                throw new IllegalArgumentException("Minimum reach cannot be less than zero");
+            }
+            if (this.minimumReach.getX() > this.maximumReach.getX() || this.minimumReach.getY() > this.maximumReach.getY() || this.minimumReach.getZ() > this.maximumReach.getZ()) {
+                throw new IllegalArgumentException("Maximum reach must be greater than minimum reach for each axis");
+            }
+            return new ReplaceSpheroidConfiguration(this.target, this.state, this.minimumReach, this.maximumReach);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/RuinedPortalConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/RuinedPortalConfiguration.java
new file mode 100644
index 0000000..a095d21
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/RuinedPortalConfiguration.java
@@ -0,0 +1,18 @@
+package net.minecraft.world.level.levelgen.feature.configurations;
+
+import java.util.function.Function;
+import net.minecraft.world.level.levelgen.feature.RuinedPortalFeature;
+import com.mojang.serialization.Codec;
+
+public class RuinedPortalConfiguration implements FeatureConfiguration {
+    public static final Codec<RuinedPortalConfiguration> CODEC;
+    public final RuinedPortalFeature.Type portalType;
+    
+    public RuinedPortalConfiguration(final RuinedPortalFeature.Type b) {
+        this.portalType = b;
+    }
+    
+    static {
+        CODEC = RuinedPortalFeature.Type.CODEC.fieldOf("portal_type").xmap((Function)RuinedPortalConfiguration::new, cok -> cok.portalType).codec();
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/SeagrassFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/SeagrassFeatureConfiguration.java
index c90ce6e..759eacb 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/SeagrassFeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/SeagrassFeatureConfiguration.java
@@ -1,11 +1,13 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 
 public class SeagrassFeatureConfiguration implements FeatureConfiguration {
+    public static final Codec<SeagrassFeatureConfiguration> CODEC;
     public final int count;
     public final double tallSeagrassProbability;
     
@@ -14,14 +16,7 @@ public class SeagrassFeatureConfiguration implements FeatureConfiguration {
         this.tallSeagrassProbability = double2;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("count"), dynamicOps.createInt(this.count), dynamicOps.createString("tall_seagrass_probability"), dynamicOps.createDouble(this.tallSeagrassProbability))));
-    }
-    
-    public static <T> SeagrassFeatureConfiguration deserialize(final Dynamic<T> dynamic) {
-        final int integer2 = dynamic.get("count").asInt(0);
-        final double double3 = dynamic.get("tall_seagrass_probability").asDouble(0.0);
-        return new SeagrassFeatureConfiguration(integer2, double3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("count").forGetter(col -> col.count), (App)Codec.DOUBLE.fieldOf("probability").forGetter(col -> col.tallSeagrassProbability)).apply(instance, (BiFunction)SeagrassFeatureConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/ShipwreckConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/ShipwreckConfiguration.java
index 80004db..44a2c78 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/ShipwreckConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/ShipwreckConfiguration.java
@@ -1,24 +1,17 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class ShipwreckConfiguration implements FeatureConfiguration {
+    public static final Codec<ShipwreckConfiguration> CODEC;
     public final boolean isBeached;
     
     public ShipwreckConfiguration(final boolean boolean1) {
         this.isBeached = boolean1;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("is_beached"), dynamicOps.createBoolean(this.isBeached))));
-    }
-    
-    public static <T> ShipwreckConfiguration deserialize(final Dynamic<T> dynamic) {
-        final boolean boolean2 = dynamic.get("is_beached").asBoolean(false);
-        return new ShipwreckConfiguration(boolean2);
+    static {
+        CODEC = Codec.BOOL.fieldOf("is_beached").withDefault(false).xmap((Function)ShipwreckConfiguration::new, com -> com.isBeached).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/SimpleBlockConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/SimpleBlockConfiguration.java
index 98a6d93..44ea66a 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/SimpleBlockConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/SimpleBlockConfiguration.java
@@ -1,47 +1,27 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import net.minecraft.world.level.block.Blocks;
-import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Stream;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
-import com.google.common.collect.Lists;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.List;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class SimpleBlockConfiguration implements FeatureConfiguration {
+    public static final Codec<SimpleBlockConfiguration> CODEC;
     public final BlockState toPlace;
     public final List<BlockState> placeOn;
     public final List<BlockState> placeIn;
     public final List<BlockState> placeUnder;
     
-    public SimpleBlockConfiguration(final BlockState byj, final List<BlockState> list2, final List<BlockState> list3, final List<BlockState> list4) {
-        this.toPlace = byj;
+    public SimpleBlockConfiguration(final BlockState cfj, final List<BlockState> list2, final List<BlockState> list3, final List<BlockState> list4) {
+        this.toPlace = cfj;
         this.placeOn = list2;
         this.placeIn = list3;
         this.placeUnder = list4;
     }
     
-    public SimpleBlockConfiguration(final BlockState byj, final BlockState[] arr2, final BlockState[] arr3, final BlockState[] arr4) {
-        this(byj, Lists.<BlockState>newArrayList(arr2), Lists.<BlockState>newArrayList(arr3), Lists.<BlockState>newArrayList(arr4));
-    }
-    
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        final T object3 = (T)BlockState.<T>serialize(dynamicOps, this.toPlace).getValue();
-        final T object4 = (T)dynamicOps.createList((Stream)this.placeOn.stream().map(byj -> BlockState.<T>serialize(dynamicOps, byj).getValue()));
-        final T object5 = (T)dynamicOps.createList((Stream)this.placeIn.stream().map(byj -> BlockState.<T>serialize(dynamicOps, byj).getValue()));
-        final T object6 = (T)dynamicOps.createList((Stream)this.placeUnder.stream().map(byj -> BlockState.<T>serialize(dynamicOps, byj).getValue()));
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.<Object, T>of(dynamicOps.createString("to_place"), object3, dynamicOps.createString("place_on"), object4, dynamicOps.createString("place_in"), object5, dynamicOps.createString("place_under"), object6)));
-    }
-    
-    public static <T> SimpleBlockConfiguration deserialize(final Dynamic<T> dynamic) {
-        final BlockState byj2 = dynamic.get("to_place").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        final List<BlockState> list3 = (List<BlockState>)dynamic.get("place_on").asList((Function)BlockState::deserialize);
-        final List<BlockState> list4 = (List<BlockState>)dynamic.get("place_in").asList((Function)BlockState::deserialize);
-        final List<BlockState> list5 = (List<BlockState>)dynamic.get("place_under").asList((Function)BlockState::deserialize);
-        return new SimpleBlockConfiguration(byj2, list3, list4, list5);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockState.CODEC.fieldOf("to_place").forGetter(coo -> coo.toPlace), (App)BlockState.CODEC.listOf().fieldOf("place_on").forGetter(coo -> coo.placeOn), (App)BlockState.CODEC.listOf().fieldOf("place_in").forGetter(coo -> coo.placeIn), (App)BlockState.CODEC.listOf().fieldOf("place_under").forGetter(coo -> coo.placeUnder)).apply(instance, SimpleBlockConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/SimpleRandomFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/SimpleRandomFeatureConfiguration.java
index b4d4c70..3f40f90 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/SimpleRandomFeatureConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/SimpleRandomFeatureConfiguration.java
@@ -1,28 +1,19 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
 import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Stream;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import java.util.List;
+import com.mojang.serialization.Codec;
 
 public class SimpleRandomFeatureConfiguration implements FeatureConfiguration {
+    public static final Codec<SimpleRandomFeatureConfiguration> CODEC;
     public final List<ConfiguredFeature<?, ?>> features;
     
     public SimpleRandomFeatureConfiguration(final List<ConfiguredFeature<?, ?>> list) {
         this.features = list;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("features"), dynamicOps.createList((Stream)this.features.stream().map(cdc -> cdc.<T>serialize(dynamicOps).getValue())))));
-    }
-    
-    public static <T> SimpleRandomFeatureConfiguration deserialize(final Dynamic<T> dynamic) {
-        final List<ConfiguredFeature<?, ?>> list2 = (List<ConfiguredFeature<?, ?>>)dynamic.get("features").asList((Function)ConfiguredFeature::deserialize);
-        return new SimpleRandomFeatureConfiguration(list2);
+    static {
+        CODEC = ConfiguredFeature.CODEC.listOf().fieldOf("features").xmap((Function)SimpleRandomFeatureConfiguration::new, cop -> cop.features).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/SmallTreeConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/SmallTreeConfiguration.java
deleted file mode 100644
index 1c9ec4f..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/SmallTreeConfiguration.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package net.minecraft.world.level.levelgen.feature.configurations;
-
-import com.google.common.collect.ImmutableList;
-import net.minecraft.resources.ResourceLocation;
-import java.util.function.Supplier;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator;
-import java.util.List;
-import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;
-import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
-
-public class SmallTreeConfiguration extends TreeConfiguration {
-    public final FoliagePlacer foliagePlacer;
-    public final int heightRandA;
-    public final int heightRandB;
-    public final int trunkHeight;
-    public final int trunkHeightRandom;
-    public final int trunkTopOffset;
-    public final int trunkTopOffsetRandom;
-    public final int foliageHeight;
-    public final int foliageHeightRandom;
-    public final int maxWaterDepth;
-    public final boolean ignoreVines;
-    
-    protected SmallTreeConfiguration(final BlockStateProvider chw1, final BlockStateProvider chw2, final FoliagePlacer chq, final List<TreeDecorator> list, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final int integer10, final int integer11, final int integer12, final int integer13, final int integer14, final boolean boolean15) {
-        super(chw1, chw2, list, integer5);
-        this.foliagePlacer = chq;
-        this.heightRandA = integer6;
-        this.heightRandB = integer7;
-        this.trunkHeight = integer8;
-        this.trunkHeightRandom = integer9;
-        this.trunkTopOffset = integer10;
-        this.trunkTopOffsetRandom = integer11;
-        this.foliageHeight = integer12;
-        this.foliageHeightRandom = integer13;
-        this.maxWaterDepth = integer14;
-        this.ignoreVines = boolean15;
-    }
-    
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("foliage_placer"), this.foliagePlacer.<T>serialize(dynamicOps)).put((T)dynamicOps.createString("height_rand_a"), (T)dynamicOps.createInt(this.heightRandA)).put((T)dynamicOps.createString("height_rand_b"), (T)dynamicOps.createInt(this.heightRandB)).put((T)dynamicOps.createString("trunk_height"), (T)dynamicOps.createInt(this.trunkHeight)).put((T)dynamicOps.createString("trunk_height_random"), (T)dynamicOps.createInt(this.trunkHeightRandom)).put((T)dynamicOps.createString("trunk_top_offset"), (T)dynamicOps.createInt(this.trunkTopOffset)).put((T)dynamicOps.createString("trunk_top_offset_random"), (T)dynamicOps.createInt(this.trunkTopOffsetRandom)).put((T)dynamicOps.createString("foliage_height"), (T)dynamicOps.createInt(this.foliageHeight)).put((T)dynamicOps.createString("foliage_height_random"), (T)dynamicOps.createInt(this.foliageHeightRandom)).put((T)dynamicOps.createString("max_water_depth"), (T)dynamicOps.createInt(this.maxWaterDepth)).put((T)dynamicOps.createString("ignore_vines"), (T)dynamicOps.createBoolean(this.ignoreVines));
-        final Dynamic<T> dynamic4 = (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build()));
-        return (Dynamic<T>)dynamic4.merge((Dynamic)super.<T>serialize(dynamicOps));
-    }
-    
-    public static <T> SmallTreeConfiguration deserialize(final Dynamic<T> dynamic) {
-        final TreeConfiguration chl2 = TreeConfiguration.<T>deserialize(dynamic);
-        final FoliagePlacerType<?> chr3 = Registry.FOLIAGE_PLACER_TYPES.get(new ResourceLocation(dynamic.get("foliage_placer").get("type").asString().<Throwable>orElseThrow(RuntimeException::new)));
-        return new SmallTreeConfiguration(chl2.trunkProvider, chl2.leavesProvider, (FoliagePlacer)chr3.deserialize(dynamic.get("foliage_placer").orElseEmptyMap()), chl2.decorators, chl2.baseHeight, dynamic.get("height_rand_a").asInt(0), dynamic.get("height_rand_b").asInt(0), dynamic.get("trunk_height").asInt(-1), dynamic.get("trunk_height_random").asInt(0), dynamic.get("trunk_top_offset").asInt(0), dynamic.get("trunk_top_offset_random").asInt(0), dynamic.get("foliage_height").asInt(-1), dynamic.get("foliage_height_random").asInt(0), dynamic.get("max_water_depth").asInt(0), dynamic.get("ignore_vines").asBoolean(false));
-    }
-    
-    public static class SmallTreeConfigurationBuilder extends TreeConfigurationBuilder {
-        private final FoliagePlacer foliagePlacer;
-        private List<TreeDecorator> decorators;
-        private int baseHeight;
-        private int heightRandA;
-        private int heightRandB;
-        private int trunkHeight;
-        private int trunkHeightRandom;
-        private int trunkTopOffset;
-        private int trunkTopOffsetRandom;
-        private int foliageHeight;
-        private int foliageHeightRandom;
-        private int maxWaterDepth;
-        private boolean ignoreVines;
-        
-        public SmallTreeConfigurationBuilder(final BlockStateProvider chw1, final BlockStateProvider chw2, final FoliagePlacer chq) {
-            super(chw1, chw2);
-            this.decorators = ImmutableList.of();
-            this.trunkHeight = -1;
-            this.foliageHeight = -1;
-            this.foliagePlacer = chq;
-        }
-        
-        public SmallTreeConfigurationBuilder decorators(final List<TreeDecorator> list) {
-            this.decorators = list;
-            return this;
-        }
-        
-        @Override
-        public SmallTreeConfigurationBuilder baseHeight(final int integer) {
-            this.baseHeight = integer;
-            return this;
-        }
-        
-        public SmallTreeConfigurationBuilder heightRandA(final int integer) {
-            this.heightRandA = integer;
-            return this;
-        }
-        
-        public SmallTreeConfigurationBuilder heightRandB(final int integer) {
-            this.heightRandB = integer;
-            return this;
-        }
-        
-        public SmallTreeConfigurationBuilder trunkHeight(final int integer) {
-            this.trunkHeight = integer;
-            return this;
-        }
-        
-        public SmallTreeConfigurationBuilder trunkHeightRandom(final int integer) {
-            this.trunkHeightRandom = integer;
-            return this;
-        }
-        
-        public SmallTreeConfigurationBuilder trunkTopOffset(final int integer) {
-            this.trunkTopOffset = integer;
-            return this;
-        }
-        
-        public SmallTreeConfigurationBuilder trunkTopOffsetRandom(final int integer) {
-            this.trunkTopOffsetRandom = integer;
-            return this;
-        }
-        
-        public SmallTreeConfigurationBuilder foliageHeight(final int integer) {
-            this.foliageHeight = integer;
-            return this;
-        }
-        
-        public SmallTreeConfigurationBuilder foliageHeightRandom(final int integer) {
-            this.foliageHeightRandom = integer;
-            return this;
-        }
-        
-        public SmallTreeConfigurationBuilder maxWaterDepth(final int integer) {
-            this.maxWaterDepth = integer;
-            return this;
-        }
-        
-        public SmallTreeConfigurationBuilder ignoreVines() {
-            this.ignoreVines = true;
-            return this;
-        }
-        
-        @Override
-        public SmallTreeConfiguration build() {
-            return new SmallTreeConfiguration(this.trunkProvider, this.leavesProvider, this.foliagePlacer, this.decorators, this.baseHeight, this.heightRandA, this.heightRandB, this.trunkHeight, this.trunkHeightRandom, this.trunkTopOffset, this.trunkTopOffsetRandom, this.foliageHeight, this.foliageHeightRandom, this.maxWaterDepth, this.ignoreVines);
-        }
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/SpikeConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/SpikeConfiguration.java
index d6caba6..dd7e28e 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/SpikeConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/SpikeConfiguration.java
@@ -1,46 +1,30 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.function.IntFunction;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.Optional;
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.feature.SpikeFeature;
 import java.util.List;
+import com.mojang.serialization.Codec;
 
 public class SpikeConfiguration implements FeatureConfiguration {
+    public static final Codec<SpikeConfiguration> CODEC;
     private final boolean crystalInvulnerable;
     private final List<SpikeFeature.EndSpike> spikes;
     @Nullable
     private final BlockPos crystalBeamTarget;
     
-    public SpikeConfiguration(final boolean boolean1, final List<SpikeFeature.EndSpike> list, @Nullable final BlockPos fk) {
+    public SpikeConfiguration(final boolean boolean1, final List<SpikeFeature.EndSpike> list, @Nullable final BlockPos fu) {
+        this(boolean1, list, Optional.<BlockPos>ofNullable(fu));
+    }
+    
+    private SpikeConfiguration(final boolean boolean1, final List<SpikeFeature.EndSpike> list, final Optional<BlockPos> optional) {
         this.crystalInvulnerable = boolean1;
         this.spikes = list;
-        this.crystalBeamTarget = fk;
-    }
-    
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("crystalInvulnerable"), dynamicOps.createBoolean(this.crystalInvulnerable), dynamicOps.createString("spikes"), dynamicOps.createList((Stream)this.spikes.stream().map(a -> a.<T>serialize(dynamicOps).getValue())), dynamicOps.createString("crystalBeamTarget"), (this.crystalBeamTarget == null) ? dynamicOps.createList((Stream)Stream.empty()) : dynamicOps.createList((Stream)IntStream.of(this.crystalBeamTarget.getX(), this.crystalBeamTarget.getY(), this.crystalBeamTarget.getZ()).mapToObj(dynamicOps::createInt)))));
-    }
-    
-    public static <T> SpikeConfiguration deserialize(final Dynamic<T> dynamic) {
-        final List<SpikeFeature.EndSpike> list2 = (List<SpikeFeature.EndSpike>)dynamic.get("spikes").asList((Function)SpikeFeature.EndSpike::deserialize);
-        final List<Integer> list3 = (List<Integer>)dynamic.get("crystalBeamTarget").asList(dynamic -> dynamic.asInt(0));
-        BlockPos fk4;
-        if (list3.size() == 3) {
-            fk4 = new BlockPos(list3.get(0), list3.get(1), list3.get(2));
-        }
-        else {
-            fk4 = null;
-        }
-        return new SpikeConfiguration(dynamic.get("crystalInvulnerable").asBoolean(false), list2, fk4);
+        this.crystalBeamTarget = optional.orElse(null);
     }
     
     public boolean isCrystalInvulnerable() {
@@ -55,4 +39,8 @@ public class SpikeConfiguration implements FeatureConfiguration {
     public BlockPos getCrystalBeamTarget() {
         return this.crystalBeamTarget;
     }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.BOOL.fieldOf("crystal_invulnerable").withDefault(false).forGetter(coq -> coq.crystalInvulnerable), (App)SpikeFeature.EndSpike.CODEC.listOf().fieldOf("spikes").forGetter(coq -> coq.spikes), (App)BlockPos.CODEC.optionalFieldOf("crystal_beam_target").forGetter(coq -> Optional.<BlockPos>ofNullable(coq.crystalBeamTarget))).apply(instance, SpikeConfiguration::new));
+    }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/SpringConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/SpringConfiguration.java
index 9989b92..65d29b1 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/SpringConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/SpringConfiguration.java
@@ -1,41 +1,34 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import java.util.Collection;
-import com.google.common.collect.ImmutableSet;
-import net.minecraft.world.level.material.Fluids;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Stream;
-import net.minecraft.resources.ResourceLocation;
+import com.mojang.datafixers.kinds.Applicative;
 import java.util.function.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.block.Block;
 import java.util.Set;
 import net.minecraft.world.level.material.FluidState;
+import com.mojang.serialization.Codec;
 
 public class SpringConfiguration implements FeatureConfiguration {
+    public static final Codec<SpringConfiguration> CODEC;
     public final FluidState state;
     public final boolean requiresBlockBelow;
     public final int rockCount;
     public final int holeCount;
     public final Set<Block> validBlocks;
     
-    public SpringConfiguration(final FluidState coj, final boolean boolean2, final int integer3, final int integer4, final Set<Block> set) {
-        this.state = coj;
+    public SpringConfiguration(final FluidState cxa, final boolean boolean2, final int integer3, final int integer4, final Set<Block> set) {
+        this.state = cxa;
         this.requiresBlockBelow = boolean2;
         this.rockCount = integer3;
         this.holeCount = integer4;
         this.validBlocks = set;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("state"), FluidState.<T>serialize(dynamicOps, this.state).getValue(), dynamicOps.createString("requires_block_below"), dynamicOps.createBoolean(this.requiresBlockBelow), dynamicOps.createString("rock_count"), dynamicOps.createInt(this.rockCount), dynamicOps.createString("hole_count"), dynamicOps.createInt(this.holeCount), dynamicOps.createString("valid_blocks"), dynamicOps.createList((Stream)this.validBlocks.stream().map(Registry.BLOCK::getKey).map(ResourceLocation::toString).map(dynamicOps::createString)))));
-    }
-    
-    public static <T> SpringConfiguration deserialize(final Dynamic<T> dynamic) {
-        return new SpringConfiguration(dynamic.get("state").map((Function)FluidState::deserialize).orElse(Fluids.EMPTY.defaultFluidState()), dynamic.get("requires_block_below").asBoolean(true), dynamic.get("rock_count").asInt(4), dynamic.get("hole_count").asInt(1), ImmutableSet.copyOf(dynamic.get("valid_blocks").asList(dynamic -> Registry.BLOCK.get(new ResourceLocation(dynamic.asString("minecraft:air"))))));
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)FluidState.CODEC.fieldOf("state").forGetter(cor -> cor.state), (App)Codec.BOOL.fieldOf("requires_block_below").withDefault(true).forGetter(cor -> cor.requiresBlockBelow), (App)Codec.INT.fieldOf("rock_count").withDefault(4).forGetter(cor -> cor.rockCount), (App)Codec.INT.fieldOf("hole_count").withDefault(1).forGetter(cor -> cor.holeCount), (App)Registry.BLOCK.listOf().fieldOf("valid_blocks").xmap((Function)ImmutableSet::copyOf, (Function)ImmutableList::copyOf).forGetter(cor -> cor.validBlocks)).apply(instance, SpringConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/StrongholdConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/StrongholdConfiguration.java
new file mode 100644
index 0000000..bee9ed3
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/StrongholdConfiguration.java
@@ -0,0 +1,37 @@
+package net.minecraft.world.level.levelgen.feature.configurations;
+
+import com.mojang.datafixers.kinds.Applicative;
+import java.util.function.Function;
+import net.minecraft.util.Codecs;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
+
+public class StrongholdConfiguration {
+    public static final Codec<StrongholdConfiguration> CODEC;
+    private final int distance;
+    private final int spread;
+    private final int count;
+    
+    public StrongholdConfiguration(final int integer1, final int integer2, final int integer3) {
+        this.distance = integer1;
+        this.spread = integer2;
+        this.count = integer3;
+    }
+    
+    public int distance() {
+        return this.distance;
+    }
+    
+    public int spread() {
+        return this.spread;
+    }
+    
+    public int count() {
+        return this.count;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codecs.intRange(0, 1023).fieldOf("distance").forGetter((Function)StrongholdConfiguration::distance), (App)Codecs.intRange(0, 1023).fieldOf("spread").forGetter((Function)StrongholdConfiguration::spread), (App)Codecs.intRange(1, 4095).fieldOf("count").forGetter((Function)StrongholdConfiguration::count)).apply(instance, StrongholdConfiguration::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/StructureFeatureConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/StructureFeatureConfiguration.java
new file mode 100644
index 0000000..2f61a68
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/StructureFeatureConfiguration.java
@@ -0,0 +1,45 @@
+package net.minecraft.world.level.levelgen.feature.configurations;
+
+import java.util.function.Function;
+import com.mojang.datafixers.kinds.Applicative;
+import net.minecraft.util.Codecs;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.Codec;
+
+public class StructureFeatureConfiguration {
+    public static final Codec<StructureFeatureConfiguration> CODEC;
+    private final int spacing;
+    private final int separation;
+    private final int salt;
+    
+    public StructureFeatureConfiguration(final int integer1, final int integer2, final int integer3) {
+        this.spacing = integer1;
+        this.separation = integer2;
+        this.salt = integer3;
+    }
+    
+    public int spacing() {
+        return this.spacing;
+    }
+    
+    public int separation() {
+        return this.separation;
+    }
+    
+    public int salt() {
+        return this.salt;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codecs.intRange(0, 4096).fieldOf("spacing").forGetter(cot -> cot.spacing), (App)Codecs.intRange(0, 4096).fieldOf("separation").forGetter(cot -> cot.separation), (App)Codecs.intRange(0, Integer.MAX_VALUE).fieldOf("salt").forGetter(cot -> cot.salt)).apply(instance, StructureFeatureConfiguration::new)).comapFlatMap(cot -> {
+            if (cot.spacing <= cot.separation) {
+                return DataResult.error("Spacing has to be smaller than separation");
+            }
+            else {
+                return DataResult.success(cot);
+            }
+        }, (Function)Function.identity());
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/TreeConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/TreeConfiguration.java
index c0a6d1d..681c3fa 100644
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/TreeConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/feature/configurations/TreeConfiguration.java
@@ -1,71 +1,98 @@
 package net.minecraft.world.level.levelgen.feature.configurations;
 
-import com.google.common.collect.Lists;
-import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType;
-import net.minecraft.resources.ResourceLocation;
-import java.util.function.Supplier;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType;
-import java.util.Map;
-import java.util.stream.Stream;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.google.common.collect.ImmutableList;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.levelgen.feature.featuresize.FeatureSize;
+import net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
 import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator;
 import java.util.List;
 import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;
+import com.mojang.serialization.Codec;
 
 public class TreeConfiguration implements FeatureConfiguration {
+    public static final Codec<TreeConfiguration> CODEC;
     public final BlockStateProvider trunkProvider;
     public final BlockStateProvider leavesProvider;
     public final List<TreeDecorator> decorators;
-    public final int baseHeight;
     public transient boolean fromSapling;
+    public final FoliagePlacer foliagePlacer;
+    public final TrunkPlacer trunkPlacer;
+    public final FeatureSize minimumSize;
+    public final int maxWaterDepth;
+    public final boolean ignoreVines;
+    public final Heightmap.Types heightmap;
     
-    protected TreeConfiguration(final BlockStateProvider chw1, final BlockStateProvider chw2, final List<TreeDecorator> list, final int integer) {
-        this.trunkProvider = chw1;
-        this.leavesProvider = chw2;
+    protected TreeConfiguration(final BlockStateProvider cpo1, final BlockStateProvider cpo2, final FoliagePlacer cpg, final TrunkPlacer cqw, final FeatureSize cow, final List<TreeDecorator> list, final int integer, final boolean boolean8, final Heightmap.Types a) {
+        this.trunkProvider = cpo1;
+        this.leavesProvider = cpo2;
         this.decorators = list;
-        this.baseHeight = integer;
+        this.foliagePlacer = cpg;
+        this.minimumSize = cow;
+        this.trunkPlacer = cqw;
+        this.maxWaterDepth = integer;
+        this.ignoreVines = boolean8;
+        this.heightmap = a;
     }
     
     public void setFromSapling() {
         this.fromSapling = true;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("trunk_provider"), this.trunkProvider.<T>serialize(dynamicOps)).put((T)dynamicOps.createString("leaves_provider"), this.leavesProvider.<T>serialize(dynamicOps)).put((T)dynamicOps.createString("decorators"), (T)dynamicOps.createList((Stream)this.decorators.stream().map(cit -> cit.<T>serialize(dynamicOps)))).put((T)dynamicOps.createString("base_height"), (T)dynamicOps.createInt(this.baseHeight));
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build()));
+    public TreeConfiguration withDecorators(final List<TreeDecorator> list) {
+        return new TreeConfiguration(this.trunkProvider, this.leavesProvider, this.foliagePlacer, this.trunkPlacer, this.minimumSize, list, this.maxWaterDepth, this.ignoreVines, this.heightmap);
     }
     
-    public static <T> TreeConfiguration deserialize(final Dynamic<T> dynamic) {
-        final BlockStateProviderType<?> chx2 = Registry.BLOCKSTATE_PROVIDER_TYPES.get(new ResourceLocation(dynamic.get("trunk_provider").get("type").asString().<Throwable>orElseThrow(RuntimeException::new)));
-        final BlockStateProviderType<?> chx3 = Registry.BLOCKSTATE_PROVIDER_TYPES.get(new ResourceLocation(dynamic.get("leaves_provider").get("type").asString().<Throwable>orElseThrow(RuntimeException::new)));
-        return new TreeConfiguration((BlockStateProvider)chx2.deserialize(dynamic.get("trunk_provider").orElseEmptyMap()), (BlockStateProvider)chx3.deserialize(dynamic.get("leaves_provider").orElseEmptyMap()), dynamic.get("decorators").asList(dynamic -> ((TreeDecoratorType<TreeDecorator>)Registry.TREE_DECORATOR_TYPES.get(new ResourceLocation((String)dynamic.get("type").asString().orElseThrow(RuntimeException::new)))).deserialize(dynamic)), dynamic.get("base_height").asInt(0));
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockStateProvider.CODEC.fieldOf("trunk_provider").forGetter(cou -> cou.trunkProvider), (App)BlockStateProvider.CODEC.fieldOf("leaves_provider").forGetter(cou -> cou.leavesProvider), (App)FoliagePlacer.CODEC.fieldOf("foliage_placer").forGetter(cou -> cou.foliagePlacer), (App)TrunkPlacer.CODEC.fieldOf("trunk_placer").forGetter(cou -> cou.trunkPlacer), (App)FeatureSize.CODEC.fieldOf("minimum_size").forGetter(cou -> cou.minimumSize), (App)TreeDecorator.CODEC.listOf().fieldOf("decorators").forGetter(cou -> cou.decorators), (App)Codec.INT.fieldOf("max_water_depth").withDefault(0).forGetter(cou -> cou.maxWaterDepth), (App)Codec.BOOL.fieldOf("ignore_vines").withDefault(false).forGetter(cou -> cou.ignoreVines), (App)Heightmap.Types.CODEC.fieldOf("heightmap").forGetter(cou -> cou.heightmap)).apply(instance, TreeConfiguration::new));
     }
     
     public static class TreeConfigurationBuilder {
         public final BlockStateProvider trunkProvider;
         public final BlockStateProvider leavesProvider;
+        private final FoliagePlacer foliagePlacer;
+        private final TrunkPlacer trunkPlacer;
+        private final FeatureSize minimumSize;
         private List<TreeDecorator> decorators;
-        private int baseHeight;
+        private int maxWaterDepth;
+        private boolean ignoreVines;
+        private Heightmap.Types heightmap;
         
-        public TreeConfigurationBuilder(final BlockStateProvider chw1, final BlockStateProvider chw2) {
-            this.decorators = Lists.newArrayList();
-            this.baseHeight = 0;
-            this.trunkProvider = chw1;
-            this.leavesProvider = chw2;
+        public TreeConfigurationBuilder(final BlockStateProvider cpo1, final BlockStateProvider cpo2, final FoliagePlacer cpg, final TrunkPlacer cqw, final FeatureSize cow) {
+            this.decorators = ImmutableList.of();
+            this.heightmap = Heightmap.Types.OCEAN_FLOOR;
+            this.trunkProvider = cpo1;
+            this.leavesProvider = cpo2;
+            this.foliagePlacer = cpg;
+            this.trunkPlacer = cqw;
+            this.minimumSize = cow;
         }
         
-        public TreeConfigurationBuilder baseHeight(final int integer) {
-            this.baseHeight = integer;
+        public TreeConfigurationBuilder decorators(final List<TreeDecorator> list) {
+            this.decorators = list;
+            return this;
+        }
+        
+        public TreeConfigurationBuilder maxWaterDepth(final int integer) {
+            this.maxWaterDepth = integer;
+            return this;
+        }
+        
+        public TreeConfigurationBuilder ignoreVines() {
+            this.ignoreVines = true;
+            return this;
+        }
+        
+        public TreeConfigurationBuilder heightmap(final Heightmap.Types a) {
+            this.heightmap = a;
             return this;
         }
         
         public TreeConfiguration build() {
-            return new TreeConfiguration(this.trunkProvider, this.leavesProvider, this.decorators, this.baseHeight);
+            return new TreeConfiguration(this.trunkProvider, this.leavesProvider, this.foliagePlacer, this.trunkPlacer, this.minimumSize, this.decorators, this.maxWaterDepth, this.ignoreVines, this.heightmap);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/configurations/VillageConfiguration.java b/src/net/minecraft/world/level/levelgen/feature/configurations/VillageConfiguration.java
deleted file mode 100644
index a0b87f1..0000000
--- a/src/net/minecraft/world/level/levelgen/feature/configurations/VillageConfiguration.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package net.minecraft.world.level.levelgen.feature.configurations;
-
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.resources.ResourceLocation;
-
-public class VillageConfiguration implements FeatureConfiguration {
-    public final ResourceLocation startPool;
-    public final int size;
-    
-    public VillageConfiguration(final String string, final int integer) {
-        this.startPool = new ResourceLocation(string);
-        this.size = integer;
-    }
-    
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("start_pool"), dynamicOps.createString(this.startPool.toString()), dynamicOps.createString("size"), dynamicOps.createInt(this.size))));
-    }
-    
-    public static <T> VillageConfiguration deserialize(final Dynamic<T> dynamic) {
-        final String string2 = dynamic.get("start_pool").asString("");
-        final int integer3 = dynamic.get("size").asInt(6);
-        return new VillageConfiguration(string2, integer3);
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/feature/featuresize/FeatureSize.java b/src/net/minecraft/world/level/levelgen/feature/featuresize/FeatureSize.java
new file mode 100644
index 0000000..6aad183
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/featuresize/FeatureSize.java
@@ -0,0 +1,33 @@
+package net.minecraft.world.level.levelgen.feature.featuresize;
+
+import net.minecraft.core.Registry;
+import java.util.Optional;
+import java.util.function.Function;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.OptionalInt;
+import com.mojang.serialization.Codec;
+
+public abstract class FeatureSize {
+    public static final Codec<FeatureSize> CODEC;
+    protected final OptionalInt minClippedHeight;
+    
+    protected static <S extends FeatureSize> RecordCodecBuilder<S, OptionalInt> minClippedHeightCodec() {
+        return (RecordCodecBuilder<S, OptionalInt>)Codec.INT.optionalFieldOf("min_clipped_height").xmap(optional -> optional.map(OptionalInt::of).orElse(OptionalInt.empty()), optionalInt -> optionalInt.isPresent() ? Optional.<Integer>of(optionalInt.getAsInt()) : Optional.<Integer>empty()).forGetter(cow -> cow.minClippedHeight);
+    }
+    
+    public FeatureSize(final OptionalInt optionalInt) {
+        this.minClippedHeight = optionalInt;
+    }
+    
+    protected abstract FeatureSizeType<?> type();
+    
+    public abstract int getSizeAtHeight(final int integer1, final int integer2);
+    
+    public OptionalInt minClippedHeight() {
+        return this.minClippedHeight;
+    }
+    
+    static {
+        CODEC = Registry.FEATURE_SIZE_TYPES.dispatch((Function)FeatureSize::type, (Function)FeatureSizeType::codec);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/featuresize/FeatureSizeType.java b/src/net/minecraft/world/level/levelgen/feature/featuresize/FeatureSizeType.java
new file mode 100644
index 0000000..2a2fad0
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/featuresize/FeatureSizeType.java
@@ -0,0 +1,27 @@
+package net.minecraft.world.level.levelgen.feature.featuresize;
+
+import net.minecraft.core.Registry;
+import com.mojang.serialization.Codec;
+
+public class FeatureSizeType<P extends FeatureSize> {
+    public static final FeatureSizeType<TwoLayersFeatureSize> TWO_LAYERS_FEATURE_SIZE;
+    public static final FeatureSizeType<ThreeLayersFeatureSize> THREE_LAYERS_FEATURE_SIZE;
+    private final Codec<P> codec;
+    
+    private static <P extends FeatureSize> FeatureSizeType<P> register(final String string, final Codec<P> codec) {
+        return Registry.<FeatureSizeType<P>>register(Registry.FEATURE_SIZE_TYPES, string, new FeatureSizeType<P>(codec));
+    }
+    
+    private FeatureSizeType(final Codec<P> codec) {
+        this.codec = codec;
+    }
+    
+    public Codec<P> codec() {
+        return this.codec;
+    }
+    
+    static {
+        TWO_LAYERS_FEATURE_SIZE = FeatureSizeType.<TwoLayersFeatureSize>register("two_layers_feature_size", TwoLayersFeatureSize.CODEC);
+        THREE_LAYERS_FEATURE_SIZE = FeatureSizeType.<ThreeLayersFeatureSize>register("three_layers_feature_size", ThreeLayersFeatureSize.CODEC);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/featuresize/ThreeLayersFeatureSize.java b/src/net/minecraft/world/level/levelgen/feature/featuresize/ThreeLayersFeatureSize.java
new file mode 100644
index 0000000..1b97ac2
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/featuresize/ThreeLayersFeatureSize.java
@@ -0,0 +1,45 @@
+package net.minecraft.world.level.levelgen.feature.featuresize;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.OptionalInt;
+import com.mojang.serialization.Codec;
+
+public class ThreeLayersFeatureSize extends FeatureSize {
+    public static final Codec<ThreeLayersFeatureSize> CODEC;
+    private final int limit;
+    private final int upperLimit;
+    private final int lowerSize;
+    private final int middleSize;
+    private final int upperSize;
+    
+    public ThreeLayersFeatureSize(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final OptionalInt optionalInt) {
+        super(optionalInt);
+        this.limit = integer1;
+        this.upperLimit = integer2;
+        this.lowerSize = integer3;
+        this.middleSize = integer4;
+        this.upperSize = integer5;
+    }
+    
+    @Override
+    protected FeatureSizeType<?> type() {
+        return FeatureSizeType.THREE_LAYERS_FEATURE_SIZE;
+    }
+    
+    @Override
+    public int getSizeAtHeight(final int integer1, final int integer2) {
+        if (integer2 < this.limit) {
+            return this.lowerSize;
+        }
+        if (integer2 >= integer1 - this.upperLimit) {
+            return this.upperSize;
+        }
+        return this.middleSize;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("limit").withDefault(1).forGetter(coy -> coy.limit), (App)Codec.INT.fieldOf("upper_limit").withDefault(1).forGetter(coy -> coy.upperLimit), (App)Codec.INT.fieldOf("lower_size").withDefault(0).forGetter(coy -> coy.lowerSize), (App)Codec.INT.fieldOf("middle_size").withDefault(1).forGetter(coy -> coy.middleSize), (App)Codec.INT.fieldOf("upper_size").withDefault(1).forGetter(coy -> coy.upperSize), (App)FeatureSize.<FeatureSize>minClippedHeightCodec()).apply(instance, ThreeLayersFeatureSize::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/featuresize/TwoLayersFeatureSize.java b/src/net/minecraft/world/level/levelgen/feature/featuresize/TwoLayersFeatureSize.java
new file mode 100644
index 0000000..0ef57d1
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/featuresize/TwoLayersFeatureSize.java
@@ -0,0 +1,39 @@
+package net.minecraft.world.level.levelgen.feature.featuresize;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.OptionalInt;
+import com.mojang.serialization.Codec;
+
+public class TwoLayersFeatureSize extends FeatureSize {
+    public static final Codec<TwoLayersFeatureSize> CODEC;
+    private final int limit;
+    private final int lowerSize;
+    private final int upperSize;
+    
+    public TwoLayersFeatureSize(final int integer1, final int integer2, final int integer3) {
+        this(integer1, integer2, integer3, OptionalInt.empty());
+    }
+    
+    public TwoLayersFeatureSize(final int integer1, final int integer2, final int integer3, final OptionalInt optionalInt) {
+        super(optionalInt);
+        this.limit = integer1;
+        this.lowerSize = integer2;
+        this.upperSize = integer3;
+    }
+    
+    @Override
+    protected FeatureSizeType<?> type() {
+        return FeatureSizeType.TWO_LAYERS_FEATURE_SIZE;
+    }
+    
+    @Override
+    public int getSizeAtHeight(final int integer1, final int integer2) {
+        return (integer2 < this.limit) ? this.lowerSize : this.upperSize;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("limit").withDefault(1).forGetter(coz -> coz.limit), (App)Codec.INT.fieldOf("lower_size").withDefault(0).forGetter(coz -> coz.lowerSize), (App)Codec.INT.fieldOf("upper_size").withDefault(1).forGetter(coz -> coz.upperSize), (App)FeatureSize.<FeatureSize>minClippedHeightCodec()).apply(instance, TwoLayersFeatureSize::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/AcaciaFoliagePlacer.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/AcaciaFoliagePlacer.java
index 430e792..65fe881 100644
--- a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/AcaciaFoliagePlacer.java
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/AcaciaFoliagePlacer.java
@@ -1,51 +1,51 @@
 package net.minecraft.world.level.levelgen.feature.foliageplacers;
 
-import java.util.Set;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import java.util.Random;
 import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class AcaciaFoliagePlacer extends FoliagePlacer {
-    public AcaciaFoliagePlacer(final int integer1, final int integer2) {
-        super(integer1, integer2, FoliagePlacerType.ACACIA_FOLIAGE_PLACER);
-    }
+    public static final Codec<AcaciaFoliagePlacer> CODEC;
     
-    public <T> AcaciaFoliagePlacer(final Dynamic<T> dynamic) {
-        this(dynamic.get("radius").asInt(0), dynamic.get("radius_random").asInt(0));
+    public AcaciaFoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4) {
+        super(integer1, integer2, integer3, integer4);
     }
     
     @Override
-    public void createFoliage(final LevelSimulatedRW bkb, final Random random, final SmallTreeConfiguration chi, final int integer4, final int integer5, final int integer6, final BlockPos fk, final Set<BlockPos> set) {
-        chi.foliagePlacer.placeLeavesRow(bkb, random, chi, integer4, fk, 0, integer6, set);
-        chi.foliagePlacer.placeLeavesRow(bkb, random, chi, integer4, fk, 1, 1, set);
-        final BlockPos fk2 = fk.above();
-        for (int integer7 = -1; integer7 <= 1; ++integer7) {
-            for (int integer8 = -1; integer8 <= 1; ++integer8) {
-                this.placeLeaf(bkb, random, fk2.offset(integer7, 0, integer8), chi, set);
-            }
-        }
-        for (int integer7 = 2; integer7 <= integer6 - 1; ++integer7) {
-            this.placeLeaf(bkb, random, fk2.east(integer7), chi, set);
-            this.placeLeaf(bkb, random, fk2.west(integer7), chi, set);
-            this.placeLeaf(bkb, random, fk2.south(integer7), chi, set);
-            this.placeLeaf(bkb, random, fk2.north(integer7), chi, set);
+    protected FoliagePlacerType<?> type() {
+        return FoliagePlacerType.ACACIA_FOLIAGE_PLACER;
+    }
+    
+    @Override
+    protected void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final int integer9, final BoundingBox ctd) {
+        final boolean boolean12 = b.doubleTrunk();
+        final BlockPos fu13 = b.foliagePos().above(integer9);
+        this.placeLeavesRow(bqf, random, cou, fu13, integer7 + b.radiusOffset(), set, -1 - integer6, boolean12, ctd);
+        this.placeLeavesRow(bqf, random, cou, fu13, integer7 - 1, set, -integer6, boolean12, ctd);
+        this.placeLeavesRow(bqf, random, cou, fu13, integer7 + b.radiusOffset() - 1, set, 0, boolean12, ctd);
+    }
+    
+    @Override
+    public int foliageHeight(final Random random, final int integer, final TreeConfiguration cou) {
+        return 0;
+    }
+    
+    @Override
+    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        if (integer3 == 0) {
+            return (integer2 > 1 || integer4 > 1) && integer2 != 0 && integer4 != 0;
         }
+        return integer2 == integer5 && integer4 == integer5 && integer5 > 0;
     }
     
-    @Override
-    public int foliageRadius(final Random random, final int integer2, final int integer3, final SmallTreeConfiguration chi) {
-        return this.radius + random.nextInt(this.radiusRandom + 1);
-    }
-    
-    @Override
-    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        return Math.abs(integer3) == integer6 && Math.abs(integer5) == integer6 && integer6 > 0;
-    }
-    
-    @Override
-    public int getTreeRadiusForHeight(final int integer1, final int integer2, final int integer3, final int integer4) {
-        return (integer4 == 0) ? 0 : 2;
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> FoliagePlacer.<FoliagePlacer>foliagePlacerParts((RecordCodecBuilder.Instance<FoliagePlacer>)instance).apply(instance, AcaciaFoliagePlacer::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/BlobFoliagePlacer.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/BlobFoliagePlacer.java
index b21a6db..98af642 100644
--- a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/BlobFoliagePlacer.java
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/BlobFoliagePlacer.java
@@ -1,41 +1,58 @@
 package net.minecraft.world.level.levelgen.feature.foliageplacers;
 
-import java.util.Set;
+import com.mojang.datafixers.kinds.Applicative;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import java.util.Random;
 import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.datafixers.Products;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 
 public class BlobFoliagePlacer extends FoliagePlacer {
-    public BlobFoliagePlacer(final int integer1, final int integer2) {
-        super(integer1, integer2, FoliagePlacerType.BLOB_FOLIAGE_PLACER);
+    public static final Codec<BlobFoliagePlacer> CODEC;
+    protected final int height;
+    
+    protected static <P extends BlobFoliagePlacer> Products.P5<RecordCodecBuilder.Mu<P>, Integer, Integer, Integer, Integer, Integer> blobParts(final RecordCodecBuilder.Instance<P> instance) {
+        return (Products.P5<RecordCodecBuilder.Mu<P>, Integer, Integer, Integer, Integer, Integer>)FoliagePlacer.<P>foliagePlacerParts(instance).and((App)Codec.INT.fieldOf("height").forGetter(cpc -> cpc.height));
     }
     
-    public <T> BlobFoliagePlacer(final Dynamic<T> dynamic) {
-        this(dynamic.get("radius").asInt(0), dynamic.get("radius_random").asInt(0));
+    protected BlobFoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final FoliagePlacerType<?> cph) {
+        super(integer1, integer2, integer3, integer4);
+        this.height = integer5;
+    }
+    
+    public BlobFoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
+        this(integer1, integer2, integer3, integer4, integer5, FoliagePlacerType.BLOB_FOLIAGE_PLACER);
     }
     
     @Override
-    public void createFoliage(final LevelSimulatedRW bkb, final Random random, final SmallTreeConfiguration chi, final int integer4, final int integer5, final int integer6, final BlockPos fk, final Set<BlockPos> set) {
-        for (int integer7 = integer4; integer7 >= integer5; --integer7) {
-            final int integer8 = Math.max(integer6 - 1 - (integer7 - integer4) / 2, 0);
-            this.placeLeavesRow(bkb, random, chi, integer4, fk, integer7, integer8, set);
+    protected FoliagePlacerType<?> type() {
+        return FoliagePlacerType.BLOB_FOLIAGE_PLACER;
+    }
+    
+    @Override
+    protected void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final int integer9, final BoundingBox ctd) {
+        for (int integer10 = integer9; integer10 >= integer9 - integer6; --integer10) {
+            final int integer11 = Math.max(integer7 + b.radiusOffset() - 1 - integer10 / 2, 0);
+            this.placeLeavesRow(bqf, random, cou, b.foliagePos(), integer11, set, integer10, b.doubleTrunk(), ctd);
         }
     }
     
     @Override
-    public int foliageRadius(final Random random, final int integer2, final int integer3, final SmallTreeConfiguration chi) {
-        return this.radius + random.nextInt(this.radiusRandom + 1);
+    public int foliageHeight(final Random random, final int integer, final TreeConfiguration cou) {
+        return this.height;
     }
     
     @Override
-    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        return Math.abs(integer3) == integer6 && Math.abs(integer5) == integer6 && (random.nextInt(2) == 0 || integer4 == integer2);
+    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        return integer2 == integer5 && integer4 == integer5 && (random.nextInt(2) == 0 || integer3 == 0);
     }
     
-    @Override
-    public int getTreeRadiusForHeight(final int integer1, final int integer2, final int integer3, final int integer4) {
-        return (integer4 != 0) ? 1 : 0;
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> BlobFoliagePlacer.<BlobFoliagePlacer>blobParts((RecordCodecBuilder.Instance<BlobFoliagePlacer>)instance).apply(instance, BlobFoliagePlacer::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/BushFoliagePlacer.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/BushFoliagePlacer.java
new file mode 100644
index 0000000..76220d1
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/BushFoliagePlacer.java
@@ -0,0 +1,42 @@
+package net.minecraft.world.level.levelgen.feature.foliageplacers;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.core.BlockPos;
+import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class BushFoliagePlacer extends BlobFoliagePlacer {
+    public static final Codec<BushFoliagePlacer> CODEC;
+    
+    public BushFoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
+        super(integer1, integer2, integer3, integer4, integer5, FoliagePlacerType.BUSH_FOLIAGE_PLACER);
+    }
+    
+    @Override
+    protected FoliagePlacerType<?> type() {
+        return FoliagePlacerType.BUSH_FOLIAGE_PLACER;
+    }
+    
+    @Override
+    protected void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final int integer9, final BoundingBox ctd) {
+        for (int integer10 = integer9; integer10 >= integer9 - integer6; --integer10) {
+            final int integer11 = integer7 + b.radiusOffset() - 1 - integer10;
+            this.placeLeavesRow(bqf, random, cou, b.foliagePos(), integer11, set, integer10, b.doubleTrunk(), ctd);
+        }
+    }
+    
+    @Override
+    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        return integer2 == integer5 && integer4 == integer5 && random.nextInt(2) == 0;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> BlobFoliagePlacer.<BlobFoliagePlacer>blobParts((RecordCodecBuilder.Instance<BlobFoliagePlacer>)instance).apply(instance, BushFoliagePlacer::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/DarkOakFoliagePlacer.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/DarkOakFoliagePlacer.java
new file mode 100644
index 0000000..f58791b
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/DarkOakFoliagePlacer.java
@@ -0,0 +1,65 @@
+package net.minecraft.world.level.levelgen.feature.foliageplacers;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.core.BlockPos;
+import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class DarkOakFoliagePlacer extends FoliagePlacer {
+    public static final Codec<DarkOakFoliagePlacer> CODEC;
+    
+    public DarkOakFoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4) {
+        super(integer1, integer2, integer3, integer4);
+    }
+    
+    @Override
+    protected FoliagePlacerType<?> type() {
+        return FoliagePlacerType.DARK_OAK_FOLIAGE_PLACER;
+    }
+    
+    @Override
+    protected void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final int integer9, final BoundingBox ctd) {
+        final BlockPos fu12 = b.foliagePos().above(integer9);
+        final boolean boolean13 = b.doubleTrunk();
+        if (boolean13) {
+            this.placeLeavesRow(bqf, random, cou, fu12, integer7 + 2, set, -1, boolean13, ctd);
+            this.placeLeavesRow(bqf, random, cou, fu12, integer7 + 3, set, 0, boolean13, ctd);
+            this.placeLeavesRow(bqf, random, cou, fu12, integer7 + 2, set, 1, boolean13, ctd);
+            if (random.nextBoolean()) {
+                this.placeLeavesRow(bqf, random, cou, fu12, integer7, set, 2, boolean13, ctd);
+            }
+        }
+        else {
+            this.placeLeavesRow(bqf, random, cou, fu12, integer7 + 2, set, -1, boolean13, ctd);
+            this.placeLeavesRow(bqf, random, cou, fu12, integer7 + 1, set, 0, boolean13, ctd);
+        }
+    }
+    
+    @Override
+    public int foliageHeight(final Random random, final int integer, final TreeConfiguration cou) {
+        return 4;
+    }
+    
+    @Override
+    protected boolean shouldSkipLocationSigned(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        return (integer3 == 0 && boolean6 && (integer2 == -integer5 || integer2 >= integer5) && (integer4 == -integer5 || integer4 >= integer5)) || super.shouldSkipLocationSigned(random, integer2, integer3, integer4, integer5, boolean6);
+    }
+    
+    @Override
+    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        if (integer3 == -1 && !boolean6) {
+            return integer2 == integer5 && integer4 == integer5;
+        }
+        return integer3 == 1 && integer2 + integer4 > integer5 * 2 - 2;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> FoliagePlacer.<FoliagePlacer>foliagePlacerParts((RecordCodecBuilder.Instance<FoliagePlacer>)instance).apply(instance, DarkOakFoliagePlacer::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FancyFoliagePlacer.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FancyFoliagePlacer.java
new file mode 100644
index 0000000..c469a81
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FancyFoliagePlacer.java
@@ -0,0 +1,38 @@
+package net.minecraft.world.level.levelgen.feature.foliageplacers;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.core.BlockPos;
+import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class FancyFoliagePlacer extends BlobFoliagePlacer {
+    public static final Codec<FancyFoliagePlacer> CODEC;
+    
+    public FancyFoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
+        super(integer1, integer2, integer3, integer4, integer5, FoliagePlacerType.FANCY_FOLIAGE_PLACER);
+    }
+    
+    @Override
+    protected void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final int integer9, final BoundingBox ctd) {
+        for (int integer10 = integer9; integer10 >= integer9 - integer6; --integer10) {
+            final int integer11 = integer7 + ((integer10 != integer9 && integer10 != integer9 - integer6) ? 1 : 0);
+            this.placeLeavesRow(bqf, random, cou, b.foliagePos(), integer11, set, integer10, b.doubleTrunk(), ctd);
+        }
+    }
+    
+    @Override
+    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        return Mth.square(integer2 + 0.5f) + Mth.square(integer4 + 0.5f) > integer5 * integer5;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> BlobFoliagePlacer.<BlobFoliagePlacer>blobParts((RecordCodecBuilder.Instance<BlobFoliagePlacer>)instance).apply(instance, FancyFoliagePlacer::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FoliagePlacer.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FoliagePlacer.java
index 42144ad..466116f 100644
--- a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FoliagePlacer.java
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FoliagePlacer.java
@@ -1,61 +1,115 @@
 package net.minecraft.world.level.levelgen.feature.foliageplacers;
 
-import com.mojang.datafixers.Dynamic;
-import java.util.Map;
+import java.util.function.Function;
 import net.minecraft.core.Registry;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.levelgen.feature.AbstractTreeFeature;
-import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.TreeFeature;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import java.util.Random;
 import net.minecraft.world.level.LevelSimulatedRW;
-import net.minecraft.util.Serializable;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.datafixers.Products;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 
-public abstract class FoliagePlacer implements Serializable {
+public abstract class FoliagePlacer {
+    public static final Codec<FoliagePlacer> CODEC;
     protected final int radius;
     protected final int radiusRandom;
-    protected final FoliagePlacerType<?> type;
+    protected final int offset;
+    protected final int offsetRandom;
     
-    public FoliagePlacer(final int integer1, final int integer2, final FoliagePlacerType<?> chr) {
-        this.radius = integer1;
-        this.radiusRandom = integer2;
-        this.type = chr;
+    protected static <P extends FoliagePlacer> Products.P4<RecordCodecBuilder.Mu<P>, Integer, Integer, Integer, Integer> foliagePlacerParts(final RecordCodecBuilder.Instance<P> instance) {
+        return (Products.P4<RecordCodecBuilder.Mu<P>, Integer, Integer, Integer, Integer>)instance.group((App)Codec.INT.fieldOf("radius").forGetter(cpg -> cpg.radius), (App)Codec.INT.fieldOf("radius_random").forGetter(cpg -> cpg.radiusRandom), (App)Codec.INT.fieldOf("offset").forGetter(cpg -> cpg.offset), (App)Codec.INT.fieldOf("offset_random").forGetter(cpg -> cpg.offsetRandom));
     }
     
-    public abstract void createFoliage(final LevelSimulatedRW bkb, final Random random, final SmallTreeConfiguration chi, final int integer4, final int integer5, final int integer6, final BlockPos fk, final Set<BlockPos> set);
+    public FoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4) {
+        this.radius = integer1;
+        this.radiusRandom = integer2;
+        this.offset = integer3;
+        this.offsetRandom = integer4;
+    }
     
-    public abstract int foliageRadius(final Random random, final int integer2, final int integer3, final SmallTreeConfiguration chi);
+    protected abstract FoliagePlacerType<?> type();
     
-    protected abstract boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6);
+    public void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final BoundingBox ctd) {
+        this.createFoliage(bqf, random, cou, integer4, b, integer6, integer7, set, this.offset(random), ctd);
+    }
     
-    public abstract int getTreeRadiusForHeight(final int integer1, final int integer2, final int integer3, final int integer4);
+    protected abstract void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final int integer9, final BoundingBox ctd);
     
-    protected void placeLeavesRow(final LevelSimulatedRW bkb, final Random random, final SmallTreeConfiguration chi, final int integer4, final BlockPos fk, final int integer6, final int integer7, final Set<BlockPos> set) {
-        final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
-        for (int integer8 = -integer7; integer8 <= integer7; ++integer8) {
-            for (int integer9 = -integer7; integer9 <= integer7; ++integer9) {
-                if (!this.shouldSkipLocation(random, integer4, integer8, integer6, integer9, integer7)) {
-                    a10.set(integer8 + fk.getX(), integer6 + fk.getY(), integer9 + fk.getZ());
-                    this.placeLeaf(bkb, random, a10, chi, set);
+    public abstract int foliageHeight(final Random random, final int integer, final TreeConfiguration cou);
+    
+    public int foliageRadius(final Random random, final int integer) {
+        return this.radius + random.nextInt(this.radiusRandom + 1);
+    }
+    
+    private int offset(final Random random) {
+        return this.offset + random.nextInt(this.offsetRandom + 1);
+    }
+    
+    protected abstract boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6);
+    
+    protected boolean shouldSkipLocationSigned(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        int integer6;
+        int integer7;
+        if (boolean6) {
+            integer6 = Math.min(Math.abs(integer2), Math.abs(integer2 - 1));
+            integer7 = Math.min(Math.abs(integer4), Math.abs(integer4 - 1));
+        }
+        else {
+            integer6 = Math.abs(integer2);
+            integer7 = Math.abs(integer4);
+        }
+        return this.shouldSkipLocation(random, integer6, integer3, integer7, integer5, boolean6);
+    }
+    
+    protected void placeLeavesRow(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final BlockPos fu, final int integer5, final Set<BlockPos> set, final int integer7, final boolean boolean8, final BoundingBox ctd) {
+        final int integer8 = boolean8 ? 1 : 0;
+        final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos();
+        for (int integer9 = -integer5; integer9 <= integer5 + integer8; ++integer9) {
+            for (int integer10 = -integer5; integer10 <= integer5 + integer8; ++integer10) {
+                if (!this.shouldSkipLocationSigned(random, integer9, integer7, integer10, integer5, boolean8)) {
+                    a12.setWithOffset(fu, integer9, integer7, integer10);
+                    if (TreeFeature.validTreePos(bqf, a12)) {
+                        bqf.setBlock(a12, cou.leavesProvider.getState(random, a12), 19);
+                        ctd.expand(new BoundingBox(a12, a12));
+                        set.add(a12.immutable());
+                    }
                 }
             }
         }
     }
     
-    protected void placeLeaf(final LevelSimulatedRW bkb, final Random random, final BlockPos fk, final SmallTreeConfiguration chi, final Set<BlockPos> set) {
-        if (AbstractTreeFeature.isAirOrLeaves(bkb, fk) || AbstractTreeFeature.isReplaceablePlant(bkb, fk) || AbstractTreeFeature.isBlockWater(bkb, fk)) {
-            bkb.setBlock(fk, chi.leavesProvider.getState(random, fk), 19);
-            set.add(fk.immutable());
-        }
+    static {
+        CODEC = Registry.FOLIAGE_PLACER_TYPES.dispatch((Function)FoliagePlacer::type, (Function)FoliagePlacerType::codec);
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("type"), (T)dynamicOps.createString(Registry.FOLIAGE_PLACER_TYPES.getKey(this.type).toString())).put((T)dynamicOps.createString("radius"), (T)dynamicOps.createInt(this.radius)).put((T)dynamicOps.createString("radius_random"), (T)dynamicOps.createInt(this.radiusRandom));
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build())).getValue();
+    public static final class FoliageAttachment {
+        private final BlockPos foliagePos;
+        private final int radiusOffset;
+        private final boolean doubleTrunk;
+        
+        public FoliageAttachment(final BlockPos fu, final int integer, final boolean boolean3) {
+            this.foliagePos = fu;
+            this.radiusOffset = integer;
+            this.doubleTrunk = boolean3;
+        }
+        
+        public BlockPos foliagePos() {
+            return this.foliagePos;
+        }
+        
+        public int radiusOffset() {
+            return this.radiusOffset;
+        }
+        
+        public boolean doubleTrunk() {
+            return this.doubleTrunk;
+        }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FoliagePlacerType.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FoliagePlacerType.java
index 662c0cc..c9aba48 100644
--- a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FoliagePlacerType.java
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/FoliagePlacerType.java
@@ -1,32 +1,41 @@
 package net.minecraft.world.level.levelgen.feature.foliageplacers;
 
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class FoliagePlacerType<P extends FoliagePlacer> {
     public static final FoliagePlacerType<BlobFoliagePlacer> BLOB_FOLIAGE_PLACER;
     public static final FoliagePlacerType<SpruceFoliagePlacer> SPRUCE_FOLIAGE_PLACER;
     public static final FoliagePlacerType<PineFoliagePlacer> PINE_FOLIAGE_PLACER;
     public static final FoliagePlacerType<AcaciaFoliagePlacer> ACACIA_FOLIAGE_PLACER;
-    private final Function<Dynamic<?>, P> deserializer;
+    public static final FoliagePlacerType<BushFoliagePlacer> BUSH_FOLIAGE_PLACER;
+    public static final FoliagePlacerType<FancyFoliagePlacer> FANCY_FOLIAGE_PLACER;
+    public static final FoliagePlacerType<MegaJungleFoliagePlacer> MEGA_JUNGLE_FOLIAGE_PLACER;
+    public static final FoliagePlacerType<MegaPineFoliagePlacer> MEGA_PINE_FOLIAGE_PLACER;
+    public static final FoliagePlacerType<DarkOakFoliagePlacer> DARK_OAK_FOLIAGE_PLACER;
+    private final Codec<P> codec;
     
-    private static <P extends FoliagePlacer> FoliagePlacerType<P> register(final String string, final Function<Dynamic<?>, P> function) {
-        return Registry.<FoliagePlacerType<P>>register(Registry.FOLIAGE_PLACER_TYPES, string, new FoliagePlacerType<P>(function));
+    private static <P extends FoliagePlacer> FoliagePlacerType<P> register(final String string, final Codec<P> codec) {
+        return Registry.<FoliagePlacerType<P>>register(Registry.FOLIAGE_PLACER_TYPES, string, new FoliagePlacerType<P>(codec));
     }
     
-    private FoliagePlacerType(final Function<Dynamic<?>, P> function) {
-        this.deserializer = function;
+    private FoliagePlacerType(final Codec<P> codec) {
+        this.codec = codec;
     }
     
-    public P deserialize(final Dynamic<?> dynamic) {
-        return this.deserializer.apply(dynamic);
+    public Codec<P> codec() {
+        return this.codec;
     }
     
     static {
-        BLOB_FOLIAGE_PLACER = FoliagePlacerType.<BlobFoliagePlacer>register("blob_foliage_placer", BlobFoliagePlacer::new);
-        SPRUCE_FOLIAGE_PLACER = FoliagePlacerType.<SpruceFoliagePlacer>register("spruce_foliage_placer", SpruceFoliagePlacer::new);
-        PINE_FOLIAGE_PLACER = FoliagePlacerType.<PineFoliagePlacer>register("pine_foliage_placer", PineFoliagePlacer::new);
-        ACACIA_FOLIAGE_PLACER = FoliagePlacerType.<AcaciaFoliagePlacer>register("acacia_foliage_placer", AcaciaFoliagePlacer::new);
+        BLOB_FOLIAGE_PLACER = FoliagePlacerType.<BlobFoliagePlacer>register("blob_foliage_placer", BlobFoliagePlacer.CODEC);
+        SPRUCE_FOLIAGE_PLACER = FoliagePlacerType.<SpruceFoliagePlacer>register("spruce_foliage_placer", SpruceFoliagePlacer.CODEC);
+        PINE_FOLIAGE_PLACER = FoliagePlacerType.<PineFoliagePlacer>register("pine_foliage_placer", PineFoliagePlacer.CODEC);
+        ACACIA_FOLIAGE_PLACER = FoliagePlacerType.<AcaciaFoliagePlacer>register("acacia_foliage_placer", AcaciaFoliagePlacer.CODEC);
+        BUSH_FOLIAGE_PLACER = FoliagePlacerType.<BushFoliagePlacer>register("bush_foliage_placer", BushFoliagePlacer.CODEC);
+        FANCY_FOLIAGE_PLACER = FoliagePlacerType.<FancyFoliagePlacer>register("fancy_foliage_placer", FancyFoliagePlacer.CODEC);
+        MEGA_JUNGLE_FOLIAGE_PLACER = FoliagePlacerType.<MegaJungleFoliagePlacer>register("jungle_foliage_placer", MegaJungleFoliagePlacer.CODEC);
+        MEGA_PINE_FOLIAGE_PLACER = FoliagePlacerType.<MegaPineFoliagePlacer>register("mega_pine_foliage_placer", MegaPineFoliagePlacer.CODEC);
+        DARK_OAK_FOLIAGE_PLACER = FoliagePlacerType.<DarkOakFoliagePlacer>register("dark_oak_foliage_placer", DarkOakFoliagePlacer.CODEC);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/MegaJungleFoliagePlacer.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/MegaJungleFoliagePlacer.java
new file mode 100644
index 0000000..1c03c0e
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/MegaJungleFoliagePlacer.java
@@ -0,0 +1,49 @@
+package net.minecraft.world.level.levelgen.feature.foliageplacers;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.core.BlockPos;
+import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class MegaJungleFoliagePlacer extends FoliagePlacer {
+    public static final Codec<MegaJungleFoliagePlacer> CODEC;
+    protected final int height;
+    
+    public MegaJungleFoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5) {
+        super(integer1, integer2, integer3, integer4);
+        this.height = integer5;
+    }
+    
+    @Override
+    protected FoliagePlacerType<?> type() {
+        return FoliagePlacerType.MEGA_JUNGLE_FOLIAGE_PLACER;
+    }
+    
+    @Override
+    protected void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final int integer9, final BoundingBox ctd) {
+        for (int integer10 = b.doubleTrunk() ? integer6 : (1 + random.nextInt(2)), integer11 = integer9; integer11 >= integer9 - integer10; --integer11) {
+            final int integer12 = integer7 + b.radiusOffset() + 1 - integer11;
+            this.placeLeavesRow(bqf, random, cou, b.foliagePos(), integer12, set, integer11, b.doubleTrunk(), ctd);
+        }
+    }
+    
+    @Override
+    public int foliageHeight(final Random random, final int integer, final TreeConfiguration cou) {
+        return this.height;
+    }
+    
+    @Override
+    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        return integer2 + integer4 >= 7 || integer2 * integer2 + integer4 * integer4 > integer5 * integer5;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> FoliagePlacer.<FoliagePlacer>foliagePlacerParts((RecordCodecBuilder.Instance<FoliagePlacer>)instance).and((App)Codec.INT.fieldOf("height").forGetter(cpi -> cpi.height)).apply(instance, MegaJungleFoliagePlacer::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/MegaPineFoliagePlacer.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/MegaPineFoliagePlacer.java
new file mode 100644
index 0000000..03fc4af
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/MegaPineFoliagePlacer.java
@@ -0,0 +1,63 @@
+package net.minecraft.world.level.levelgen.feature.foliageplacers;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.core.BlockPos;
+import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class MegaPineFoliagePlacer extends FoliagePlacer {
+    public static final Codec<MegaPineFoliagePlacer> CODEC;
+    private final int heightRand;
+    private final int crownHeight;
+    
+    public MegaPineFoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        super(integer1, integer2, integer3, integer4);
+        this.heightRand = integer5;
+        this.crownHeight = integer6;
+    }
+    
+    @Override
+    protected FoliagePlacerType<?> type() {
+        return FoliagePlacerType.MEGA_PINE_FOLIAGE_PLACER;
+    }
+    
+    @Override
+    protected void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final int integer9, final BoundingBox ctd) {
+        final BlockPos fu12 = b.foliagePos();
+        int integer10 = 0;
+        for (int integer11 = fu12.getY() - integer6 + integer9; integer11 <= fu12.getY() + integer9; ++integer11) {
+            final int integer12 = fu12.getY() - integer11;
+            final int integer13 = integer7 + b.radiusOffset() + Mth.floor(integer12 / (float)integer6 * 3.5f);
+            int integer14;
+            if (integer12 > 0 && integer13 == integer10 && (integer11 & 0x1) == 0x0) {
+                integer14 = integer13 + 1;
+            }
+            else {
+                integer14 = integer13;
+            }
+            this.placeLeavesRow(bqf, random, cou, new BlockPos(fu12.getX(), integer11, fu12.getZ()), integer14, set, 0, b.doubleTrunk(), ctd);
+            integer10 = integer13;
+        }
+    }
+    
+    @Override
+    public int foliageHeight(final Random random, final int integer, final TreeConfiguration cou) {
+        return random.nextInt(this.heightRand + 1) + this.crownHeight;
+    }
+    
+    @Override
+    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        return integer2 + integer4 >= 7 || integer2 * integer2 + integer4 * integer4 > integer5 * integer5;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> FoliagePlacer.<FoliagePlacer>foliagePlacerParts((RecordCodecBuilder.Instance<FoliagePlacer>)instance).and(((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("height_random").forGetter(cpj -> cpj.heightRand), (App)Codec.INT.fieldOf("crown_height").forGetter(cpj -> cpj.crownHeight))).apply(instance, MegaPineFoliagePlacer::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/PineFoliagePlacer.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/PineFoliagePlacer.java
index 20471d6..27c4532 100644
--- a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/PineFoliagePlacer.java
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/PineFoliagePlacer.java
@@ -1,47 +1,62 @@
 package net.minecraft.world.level.levelgen.feature.foliageplacers;
 
-import java.util.Set;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import java.util.Random;
 import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class PineFoliagePlacer extends FoliagePlacer {
-    public PineFoliagePlacer(final int integer1, final int integer2) {
-        super(integer1, integer2, FoliagePlacerType.PINE_FOLIAGE_PLACER);
-    }
+    public static final Codec<PineFoliagePlacer> CODEC;
+    private final int height;
+    private final int heightRandom;
     
-    public <T> PineFoliagePlacer(final Dynamic<T> dynamic) {
-        this(dynamic.get("radius").asInt(0), dynamic.get("radius_random").asInt(0));
+    public PineFoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        super(integer1, integer2, integer3, integer4);
+        this.height = integer5;
+        this.heightRandom = integer6;
     }
     
     @Override
-    public void createFoliage(final LevelSimulatedRW bkb, final Random random, final SmallTreeConfiguration chi, final int integer4, final int integer5, final int integer6, final BlockPos fk, final Set<BlockPos> set) {
-        int integer7 = 0;
-        for (int integer8 = integer4; integer8 >= integer5; --integer8) {
-            this.placeLeavesRow(bkb, random, chi, integer4, fk, integer8, integer7, set);
-            if (integer7 >= 1 && integer8 == integer5 + 1) {
-                --integer7;
+    protected FoliagePlacerType<?> type() {
+        return FoliagePlacerType.PINE_FOLIAGE_PLACER;
+    }
+    
+    @Override
+    protected void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final int integer9, final BoundingBox ctd) {
+        int integer10 = 0;
+        for (int integer11 = integer9; integer11 >= integer9 - integer6; --integer11) {
+            this.placeLeavesRow(bqf, random, cou, b.foliagePos(), integer10, set, integer11, b.doubleTrunk(), ctd);
+            if (integer10 >= 1 && integer11 == integer9 - integer6 + 1) {
+                --integer10;
             }
-            else if (integer7 < integer6) {
-                ++integer7;
+            else if (integer10 < integer7 + b.radiusOffset()) {
+                ++integer10;
             }
         }
     }
     
     @Override
-    public int foliageRadius(final Random random, final int integer2, final int integer3, final SmallTreeConfiguration chi) {
-        return this.radius + random.nextInt(this.radiusRandom + 1) + random.nextInt(integer3 - integer2 + 1);
+    public int foliageRadius(final Random random, final int integer) {
+        return super.foliageRadius(random, integer) + random.nextInt(integer + 1);
     }
     
     @Override
-    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        return Math.abs(integer3) == integer6 && Math.abs(integer5) == integer6 && integer6 > 0;
+    public int foliageHeight(final Random random, final int integer, final TreeConfiguration cou) {
+        return this.height + random.nextInt(this.heightRandom + 1);
     }
     
     @Override
-    public int getTreeRadiusForHeight(final int integer1, final int integer2, final int integer3, final int integer4) {
-        return (integer4 <= 1) ? 0 : 2;
+    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        return integer2 == integer5 && integer4 == integer5 && integer5 > 0;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> FoliagePlacer.<FoliagePlacer>foliagePlacerParts((RecordCodecBuilder.Instance<FoliagePlacer>)instance).and(((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("height").forGetter(cpk -> cpk.height), (App)Codec.INT.fieldOf("height_random").forGetter(cpk -> cpk.heightRandom))).apply(instance, PineFoliagePlacer::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/SpruceFoliagePlacer.java b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/SpruceFoliagePlacer.java
index c21f4ea..bf198a8 100644
--- a/src/net/minecraft/world/level/levelgen/feature/foliageplacers/SpruceFoliagePlacer.java
+++ b/src/net/minecraft/world/level/levelgen/feature/foliageplacers/SpruceFoliagePlacer.java
@@ -1,51 +1,62 @@
 package net.minecraft.world.level.levelgen.feature.foliageplacers;
 
-import java.util.Set;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.feature.configurations.SmallTreeConfiguration;
+import java.util.Set;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import java.util.Random;
 import net.minecraft.world.level.LevelSimulatedRW;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class SpruceFoliagePlacer extends FoliagePlacer {
-    public SpruceFoliagePlacer(final int integer1, final int integer2) {
-        super(integer1, integer2, FoliagePlacerType.SPRUCE_FOLIAGE_PLACER);
-    }
+    public static final Codec<SpruceFoliagePlacer> CODEC;
+    private final int trunkHeight;
+    private final int trunkHeightRandom;
     
-    public <T> SpruceFoliagePlacer(final Dynamic<T> dynamic) {
-        this(dynamic.get("radius").asInt(0), dynamic.get("radius_random").asInt(0));
+    public SpruceFoliagePlacer(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        super(integer1, integer2, integer3, integer4);
+        this.trunkHeight = integer5;
+        this.trunkHeightRandom = integer6;
     }
     
     @Override
-    public void createFoliage(final LevelSimulatedRW bkb, final Random random, final SmallTreeConfiguration chi, final int integer4, final int integer5, final int integer6, final BlockPos fk, final Set<BlockPos> set) {
-        int integer7 = random.nextInt(2);
-        int integer8 = 1;
-        int integer9 = 0;
-        for (int integer10 = integer4; integer10 >= integer5; --integer10) {
-            this.placeLeavesRow(bkb, random, chi, integer4, fk, integer10, integer7, set);
-            if (integer7 >= integer8) {
-                integer7 = integer9;
-                integer9 = 1;
-                integer8 = Math.min(integer8 + 1, integer6);
+    protected FoliagePlacerType<?> type() {
+        return FoliagePlacerType.SPRUCE_FOLIAGE_PLACER;
+    }
+    
+    @Override
+    protected void createFoliage(final LevelSimulatedRW bqf, final Random random, final TreeConfiguration cou, final int integer4, final FoliageAttachment b, final int integer6, final int integer7, final Set<BlockPos> set, final int integer9, final BoundingBox ctd) {
+        final BlockPos fu12 = b.foliagePos();
+        int integer10 = random.nextInt(2);
+        int integer11 = 1;
+        int integer12 = 0;
+        for (int integer13 = integer9; integer13 >= -integer6; --integer13) {
+            this.placeLeavesRow(bqf, random, cou, fu12, integer10, set, integer13, b.doubleTrunk(), ctd);
+            if (integer10 >= integer11) {
+                integer10 = integer12;
+                integer12 = 1;
+                integer11 = Math.min(integer11 + 1, integer7 + b.radiusOffset());
             }
             else {
-                ++integer7;
+                ++integer10;
             }
         }
     }
     
     @Override
-    public int foliageRadius(final Random random, final int integer2, final int integer3, final SmallTreeConfiguration chi) {
-        return this.radius + random.nextInt(this.radiusRandom + 1);
+    public int foliageHeight(final Random random, final int integer, final TreeConfiguration cou) {
+        return Math.max(4, integer - this.trunkHeight - random.nextInt(this.trunkHeightRandom + 1));
     }
     
     @Override
-    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        return Math.abs(integer3) == integer6 && Math.abs(integer5) == integer6 && integer6 > 0;
+    protected boolean shouldSkipLocation(final Random random, final int integer2, final int integer3, final int integer4, final int integer5, final boolean boolean6) {
+        return integer2 == integer5 && integer4 == integer5 && integer5 > 0;
     }
     
-    @Override
-    public int getTreeRadiusForHeight(final int integer1, final int integer2, final int integer3, final int integer4) {
-        return (integer4 <= 1) ? 0 : 2;
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> FoliagePlacer.<FoliagePlacer>foliagePlacerParts((RecordCodecBuilder.Instance<FoliagePlacer>)instance).and(((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("trunk_height").forGetter(cpl -> cpl.trunkHeight), (App)Codec.INT.fieldOf("trunk_height_random").forGetter(cpl -> cpl.trunkHeightRandom))).apply(instance, SpruceFoliagePlacer::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/stateproviders/BlockStateProvider.java b/src/net/minecraft/world/level/levelgen/feature/stateproviders/BlockStateProvider.java
index 81b32f6..e4d38da 100644
--- a/src/net/minecraft/world/level/levelgen/feature/stateproviders/BlockStateProvider.java
+++ b/src/net/minecraft/world/level/levelgen/feature/stateproviders/BlockStateProvider.java
@@ -1,16 +1,20 @@
 package net.minecraft.world.level.levelgen.feature.stateproviders;
 
+import java.util.function.Function;
+import net.minecraft.core.Registry;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.util.Serializable;
+import com.mojang.serialization.Codec;
 
-public abstract class BlockStateProvider implements Serializable {
-    protected final BlockStateProviderType<?> type;
+public abstract class BlockStateProvider {
+    public static final Codec<BlockStateProvider> CODEC;
     
-    protected BlockStateProvider(final BlockStateProviderType<?> chx) {
-        this.type = chx;
+    protected abstract BlockStateProviderType<?> type();
+    
+    public abstract BlockState getState(final Random random, final BlockPos fu);
+    
+    static {
+        CODEC = Registry.BLOCKSTATE_PROVIDER_TYPES.dispatch((Function)BlockStateProvider::type, (Function)BlockStateProviderType::codec);
     }
-    
-    public abstract BlockState getState(final Random random, final BlockPos fk);
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/stateproviders/BlockStateProviderType.java b/src/net/minecraft/world/level/levelgen/feature/stateproviders/BlockStateProviderType.java
index a005f64..d48ff79 100644
--- a/src/net/minecraft/world/level/levelgen/feature/stateproviders/BlockStateProviderType.java
+++ b/src/net/minecraft/world/level/levelgen/feature/stateproviders/BlockStateProviderType.java
@@ -1,32 +1,33 @@
 package net.minecraft.world.level.levelgen.feature.stateproviders;
 
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class BlockStateProviderType<P extends BlockStateProvider> {
     public static final BlockStateProviderType<SimpleStateProvider> SIMPLE_STATE_PROVIDER;
     public static final BlockStateProviderType<WeightedStateProvider> WEIGHTED_STATE_PROVIDER;
     public static final BlockStateProviderType<PlainFlowerProvider> PLAIN_FLOWER_PROVIDER;
     public static final BlockStateProviderType<ForestFlowerProvider> FOREST_FLOWER_PROVIDER;
-    private final Function<Dynamic<?>, P> deserializer;
+    public static final BlockStateProviderType<RotatedBlockProvider> ROTATED_BLOCK_PROVIDER;
+    private final Codec<P> codec;
     
-    private static <P extends BlockStateProvider> BlockStateProviderType<P> register(final String string, final Function<Dynamic<?>, P> function) {
-        return Registry.<BlockStateProviderType<P>>register(Registry.BLOCKSTATE_PROVIDER_TYPES, string, new BlockStateProviderType<P>(function));
+    private static <P extends BlockStateProvider> BlockStateProviderType<P> register(final String string, final Codec<P> codec) {
+        return Registry.<BlockStateProviderType<P>>register(Registry.BLOCKSTATE_PROVIDER_TYPES, string, new BlockStateProviderType<P>(codec));
     }
     
-    private BlockStateProviderType(final Function<Dynamic<?>, P> function) {
-        this.deserializer = function;
+    private BlockStateProviderType(final Codec<P> codec) {
+        this.codec = codec;
     }
     
-    public P deserialize(final Dynamic<?> dynamic) {
-        return this.deserializer.apply(dynamic);
+    public Codec<P> codec() {
+        return this.codec;
     }
     
     static {
-        SIMPLE_STATE_PROVIDER = BlockStateProviderType.<SimpleStateProvider>register("simple_state_provider", SimpleStateProvider::new);
-        WEIGHTED_STATE_PROVIDER = BlockStateProviderType.<WeightedStateProvider>register("weighted_state_provider", WeightedStateProvider::new);
-        PLAIN_FLOWER_PROVIDER = BlockStateProviderType.<PlainFlowerProvider>register("plain_flower_provider", PlainFlowerProvider::new);
-        FOREST_FLOWER_PROVIDER = BlockStateProviderType.<ForestFlowerProvider>register("forest_flower_provider", ForestFlowerProvider::new);
+        SIMPLE_STATE_PROVIDER = BlockStateProviderType.<SimpleStateProvider>register("simple_state_provider", SimpleStateProvider.CODEC);
+        WEIGHTED_STATE_PROVIDER = BlockStateProviderType.<WeightedStateProvider>register("weighted_state_provider", WeightedStateProvider.CODEC);
+        PLAIN_FLOWER_PROVIDER = BlockStateProviderType.<PlainFlowerProvider>register("plain_flower_provider", PlainFlowerProvider.CODEC);
+        FOREST_FLOWER_PROVIDER = BlockStateProviderType.<ForestFlowerProvider>register("forest_flower_provider", ForestFlowerProvider.CODEC);
+        ROTATED_BLOCK_PROVIDER = BlockStateProviderType.<RotatedBlockProvider>register("rotated_block_provider", RotatedBlockProvider.CODEC);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/stateproviders/ForestFlowerProvider.java b/src/net/minecraft/world/level/levelgen/feature/stateproviders/ForestFlowerProvider.java
index 29dd126..d099ddf 100644
--- a/src/net/minecraft/world/level/levelgen/feature/stateproviders/ForestFlowerProvider.java
+++ b/src/net/minecraft/world/level/levelgen/feature/stateproviders/ForestFlowerProvider.java
@@ -1,42 +1,32 @@
 package net.minecraft.world.level.levelgen.feature.stateproviders;
 
 import net.minecraft.world.level.block.Blocks;
-import java.util.Map;
-import net.minecraft.core.Registry;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class ForestFlowerProvider extends BlockStateProvider {
+    public static final Codec<ForestFlowerProvider> CODEC;
     private static final BlockState[] FLOWERS;
+    public static final ForestFlowerProvider INSTANCE;
     
-    public ForestFlowerProvider() {
-        super(BlockStateProviderType.FOREST_FLOWER_PROVIDER);
-    }
-    
-    public <T> ForestFlowerProvider(final Dynamic<T> dynamic) {
-        this();
+    @Override
+    protected BlockStateProviderType<?> type() {
+        return BlockStateProviderType.FOREST_FLOWER_PROVIDER;
     }
     
     @Override
-    public BlockState getState(final Random random, final BlockPos fk) {
-        final double double4 = Mth.clamp((1.0 + Biome.BIOME_INFO_NOISE.getValue(fk.getX() / 48.0, fk.getZ() / 48.0, false)) / 2.0, 0.0, 0.9999);
+    public BlockState getState(final Random random, final BlockPos fu) {
+        final double double4 = Mth.clamp((1.0 + Biome.BIOME_INFO_NOISE.getValue(fu.getX() / 48.0, fu.getZ() / 48.0, false)) / 2.0, 0.0, 0.9999);
         return ForestFlowerProvider.FLOWERS[(int)(double4 * ForestFlowerProvider.FLOWERS.length)];
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("type"), (T)dynamicOps.createString(Registry.BLOCKSTATE_PROVIDER_TYPES.getKey(this.type).toString()));
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build())).getValue();
-    }
-    
     static {
+        CODEC = Codec.unit(() -> ForestFlowerProvider.INSTANCE);
         FLOWERS = new BlockState[] { Blocks.DANDELION.defaultBlockState(), Blocks.POPPY.defaultBlockState(), Blocks.ALLIUM.defaultBlockState(), Blocks.AZURE_BLUET.defaultBlockState(), Blocks.RED_TULIP.defaultBlockState(), Blocks.ORANGE_TULIP.defaultBlockState(), Blocks.WHITE_TULIP.defaultBlockState(), Blocks.PINK_TULIP.defaultBlockState(), Blocks.OXEYE_DAISY.defaultBlockState(), Blocks.CORNFLOWER.defaultBlockState(), Blocks.LILY_OF_THE_VALLEY.defaultBlockState() };
+        INSTANCE = new ForestFlowerProvider();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/stateproviders/PlainFlowerProvider.java b/src/net/minecraft/world/level/levelgen/feature/stateproviders/PlainFlowerProvider.java
index 1e25181..ddf4f8d 100644
--- a/src/net/minecraft/world/level/levelgen/feature/stateproviders/PlainFlowerProvider.java
+++ b/src/net/minecraft/world/level/levelgen/feature/stateproviders/PlainFlowerProvider.java
@@ -1,48 +1,39 @@
 package net.minecraft.world.level.levelgen.feature.stateproviders;
 
-import java.util.Map;
-import net.minecraft.core.Registry;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.Util;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class PlainFlowerProvider extends BlockStateProvider {
+    public static final Codec<PlainFlowerProvider> CODEC;
+    public static final PlainFlowerProvider INSTANCE;
     private static final BlockState[] LOW_NOISE_FLOWERS;
     private static final BlockState[] HIGH_NOISE_FLOWERS;
     
-    public PlainFlowerProvider() {
-        super(BlockStateProviderType.PLAIN_FLOWER_PROVIDER);
-    }
-    
-    public <T> PlainFlowerProvider(final Dynamic<T> dynamic) {
-        this();
+    @Override
+    protected BlockStateProviderType<?> type() {
+        return BlockStateProviderType.PLAIN_FLOWER_PROVIDER;
     }
     
     @Override
-    public BlockState getState(final Random random, final BlockPos fk) {
-        final double double4 = Biome.BIOME_INFO_NOISE.getValue(fk.getX() / 200.0, fk.getZ() / 200.0, false);
+    public BlockState getState(final Random random, final BlockPos fu) {
+        final double double4 = Biome.BIOME_INFO_NOISE.getValue(fu.getX() / 200.0, fu.getZ() / 200.0, false);
         if (double4 < -0.8) {
-            return PlainFlowerProvider.LOW_NOISE_FLOWERS[random.nextInt(PlainFlowerProvider.LOW_NOISE_FLOWERS.length)];
+            return Util.<BlockState>getRandom(PlainFlowerProvider.LOW_NOISE_FLOWERS, random);
         }
         if (random.nextInt(3) > 0) {
-            return PlainFlowerProvider.HIGH_NOISE_FLOWERS[random.nextInt(PlainFlowerProvider.HIGH_NOISE_FLOWERS.length)];
+            return Util.<BlockState>getRandom(PlainFlowerProvider.HIGH_NOISE_FLOWERS, random);
         }
         return Blocks.DANDELION.defaultBlockState();
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("type"), (T)dynamicOps.createString(Registry.BLOCKSTATE_PROVIDER_TYPES.getKey(this.type).toString()));
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build())).getValue();
-    }
-    
     static {
+        CODEC = Codec.unit(() -> PlainFlowerProvider.INSTANCE);
+        INSTANCE = new PlainFlowerProvider();
         LOW_NOISE_FLOWERS = new BlockState[] { Blocks.ORANGE_TULIP.defaultBlockState(), Blocks.RED_TULIP.defaultBlockState(), Blocks.PINK_TULIP.defaultBlockState(), Blocks.WHITE_TULIP.defaultBlockState() };
         HIGH_NOISE_FLOWERS = new BlockState[] { Blocks.POPPY.defaultBlockState(), Blocks.AZURE_BLUET.defaultBlockState(), Blocks.OXEYE_DAISY.defaultBlockState(), Blocks.CORNFLOWER.defaultBlockState() };
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/stateproviders/RotatedBlockProvider.java b/src/net/minecraft/world/level/levelgen/feature/stateproviders/RotatedBlockProvider.java
index fba6e69..864a259 100644
--- a/src/net/minecraft/world/level/levelgen/feature/stateproviders/RotatedBlockProvider.java
+++ b/src/net/minecraft/world/level/levelgen/feature/stateproviders/RotatedBlockProvider.java
@@ -1,41 +1,37 @@
 package net.minecraft.world.level.levelgen.feature.stateproviders;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import java.util.Map;
-import net.minecraft.core.Registry;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import net.minecraft.world.level.block.state.StateHolder;
+import java.util.function.Function;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.RotatedPillarBlock;
 import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.block.state.BlockState;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.block.Block;
+import com.mojang.serialization.Codec;
 
 public class RotatedBlockProvider extends BlockStateProvider {
+    public static final Codec<RotatedBlockProvider> CODEC;
     private final Block block;
     
-    public RotatedBlockProvider(final Block bph) {
-        super(BlockStateProviderType.SIMPLE_STATE_PROVIDER);
-        this.block = bph;
-    }
-    
-    public <T> RotatedBlockProvider(final Dynamic<T> dynamic) {
-        this(BlockState.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("state").orElseEmptyMap()).getBlock());
+    public RotatedBlockProvider(final Block bvr) {
+        this.block = bvr;
     }
     
     @Override
-    public BlockState getState(final Random random, final BlockPos fk) {
-        final Direction.Axis a4 = Direction.Axis.getRandomAxis(random);
-        return ((AbstractStateHolder<O, BlockState>)this.block.defaultBlockState()).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, a4);
+    protected BlockStateProviderType<?> type() {
+        return BlockStateProviderType.ROTATED_BLOCK_PROVIDER;
     }
     
     @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("type"), (T)dynamicOps.createString(Registry.BLOCKSTATE_PROVIDER_TYPES.getKey(this.type).toString())).put((T)dynamicOps.createString("state"), (T)BlockState.<T>serialize(dynamicOps, this.block.defaultBlockState()).getValue());
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build())).getValue();
+    public BlockState getState(final Random random, final BlockPos fu) {
+        final Direction.Axis a4 = Direction.Axis.getRandom(random);
+        return ((StateHolder<O, BlockState>)this.block.defaultBlockState()).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, a4);
+    }
+    
+    static {
+        CODEC = BlockState.CODEC.fieldOf("state").xmap((Function)BlockBehaviour.BlockStateBase::getBlock, (Function)Block::defaultBlockState).xmap((Function)RotatedBlockProvider::new, cps -> cps.block).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/stateproviders/SimpleStateProvider.java b/src/net/minecraft/world/level/levelgen/feature/stateproviders/SimpleStateProvider.java
index c7a3088..8dd4484 100644
--- a/src/net/minecraft/world/level/levelgen/feature/stateproviders/SimpleStateProvider.java
+++ b/src/net/minecraft/world/level/levelgen/feature/stateproviders/SimpleStateProvider.java
@@ -1,35 +1,30 @@
 package net.minecraft.world.level.levelgen.feature.stateproviders;
 
-import java.util.Map;
-import net.minecraft.core.Registry;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class SimpleStateProvider extends BlockStateProvider {
+    public static final Codec<SimpleStateProvider> CODEC;
     private final BlockState state;
     
-    public SimpleStateProvider(final BlockState byj) {
-        super(BlockStateProviderType.SIMPLE_STATE_PROVIDER);
-        this.state = byj;
-    }
-    
-    public <T> SimpleStateProvider(final Dynamic<T> dynamic) {
-        this(BlockState.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("state").orElseEmptyMap()));
+    public SimpleStateProvider(final BlockState cfj) {
+        this.state = cfj;
     }
     
     @Override
-    public BlockState getState(final Random random, final BlockPos fk) {
+    protected BlockStateProviderType<?> type() {
+        return BlockStateProviderType.SIMPLE_STATE_PROVIDER;
+    }
+    
+    @Override
+    public BlockState getState(final Random random, final BlockPos fu) {
         return this.state;
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("type"), (T)dynamicOps.createString(Registry.BLOCKSTATE_PROVIDER_TYPES.getKey(this.type).toString())).put((T)dynamicOps.createString("state"), (T)BlockState.<T>serialize(dynamicOps, this.state).getValue());
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build())).getValue();
+    static {
+        CODEC = BlockState.CODEC.fieldOf("state").xmap((Function)SimpleStateProvider::new, cpt -> cpt.state).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/stateproviders/WeightedStateProvider.java b/src/net/minecraft/world/level/levelgen/feature/stateproviders/WeightedStateProvider.java
index f8bb967..f13aef3 100644
--- a/src/net/minecraft/world/level/levelgen/feature/stateproviders/WeightedStateProvider.java
+++ b/src/net/minecraft/world/level/levelgen/feature/stateproviders/WeightedStateProvider.java
@@ -1,45 +1,48 @@
 package net.minecraft.world.level.levelgen.feature.stateproviders;
 
-import java.util.Map;
-import net.minecraft.core.Registry;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.DataResult;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.entity.ai.behavior.WeightedList;
+import com.mojang.serialization.Codec;
 
 public class WeightedStateProvider extends BlockStateProvider {
+    public static final Codec<WeightedStateProvider> CODEC;
     private final WeightedList<BlockState> weightedList;
     
-    private WeightedStateProvider(final WeightedList<BlockState> aod) {
-        super(BlockStateProviderType.WEIGHTED_STATE_PROVIDER);
-        this.weightedList = aod;
+    private static DataResult<WeightedStateProvider> create(final WeightedList<BlockState> atb) {
+        if (atb.isEmpty()) {
+            return (DataResult<WeightedStateProvider>)DataResult.error("WeightedStateProvider with no states");
+        }
+        return (DataResult<WeightedStateProvider>)DataResult.success(new WeightedStateProvider(atb));
+    }
+    
+    private WeightedStateProvider(final WeightedList<BlockState> atb) {
+        this.weightedList = atb;
+    }
+    
+    @Override
+    protected BlockStateProviderType<?> type() {
+        return BlockStateProviderType.WEIGHTED_STATE_PROVIDER;
     }
     
     public WeightedStateProvider() {
         this(new WeightedList<BlockState>());
     }
     
-    public <T> WeightedStateProvider(final Dynamic<T> dynamic) {
-        this(new WeightedList<BlockState>((Dynamic<T>)dynamic.get("entries").orElseEmptyList(), BlockState::deserialize));
-    }
-    
-    public WeightedStateProvider add(final BlockState byj, final int integer) {
-        this.weightedList.add(byj, integer);
+    public WeightedStateProvider add(final BlockState cfj, final int integer) {
+        this.weightedList.add(cfj, integer);
         return this;
     }
     
     @Override
-    public BlockState getState(final Random random, final BlockPos fk) {
+    public BlockState getState(final Random random, final BlockPos fu) {
         return this.weightedList.getOne(random);
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        final ImmutableMap.Builder<T, T> builder3 = ImmutableMap.<T, T>builder();
-        builder3.put((T)dynamicOps.createString("type"), (T)dynamicOps.createString(Registry.BLOCKSTATE_PROVIDER_TYPES.getKey(this.type).toString())).put((T)dynamicOps.createString("entries"), this.weightedList.<T>serialize(dynamicOps, byj -> BlockState.<T>serialize(dynamicOps, byj)));
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)builder3.build())).getValue();
+    static {
+        CODEC = WeightedList.<BlockState>codec(BlockState.CODEC).comapFlatMap((Function)WeightedStateProvider::create, cpu -> cpu.weightedList).fieldOf("entries").codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/EmptyPoolElement.java b/src/net/minecraft/world/level/levelgen/feature/structures/EmptyPoolElement.java
index f195b7b..785684e 100644
--- a/src/net/minecraft/world/level/levelgen/feature/structures/EmptyPoolElement.java
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/EmptyPoolElement.java
@@ -1,9 +1,8 @@
 package net.minecraft.world.level.levelgen.feature.structures;
 
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import java.util.Collections;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
@@ -12,8 +11,10 @@ import java.util.Random;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import com.mojang.serialization.Codec;
 
 public class EmptyPoolElement extends StructurePoolElement {
+    public static final Codec<EmptyPoolElement> CODEC;
     public static final EmptyPoolElement INSTANCE;
     
     private EmptyPoolElement() {
@@ -21,35 +22,32 @@ public class EmptyPoolElement extends StructurePoolElement {
     }
     
     @Override
-    public List<StructureTemplate.StructureBlockInfo> getShuffledJigsawBlocks(final StructureManager cmo, final BlockPos fk, final Rotation btu, final Random random) {
+    public List<StructureTemplate.StructureBlockInfo> getShuffledJigsawBlocks(final StructureManager cva, final BlockPos fu, final Rotation cap, final Random random) {
         return Collections.<StructureTemplate.StructureBlockInfo>emptyList();
     }
     
     @Override
-    public BoundingBox getBoundingBox(final StructureManager cmo, final BlockPos fk, final Rotation btu) {
+    public BoundingBox getBoundingBox(final StructureManager cva, final BlockPos fu, final Rotation cap) {
         return BoundingBox.getUnknownBox();
     }
     
     @Override
-    public boolean place(final StructureManager cmo, final LevelAccessor bjx, final ChunkGenerator<?> caa, final BlockPos fk, final Rotation btu, final BoundingBox clb, final Random random) {
+    public boolean place(final StructureManager cva, final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final BlockPos fu5, final BlockPos fu6, final Rotation cap, final BoundingBox ctd, final Random random, final boolean boolean10) {
         return true;
     }
     
     @Override
-    public StructurePoolElementType getType() {
+    public StructurePoolElementType<?> getType() {
         return StructurePoolElementType.EMPTY;
     }
     
-    public <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.emptyMap());
-    }
-    
     @Override
     public String toString() {
         return "Empty";
     }
     
     static {
+        CODEC = Codec.unit(() -> EmptyPoolElement.INSTANCE);
         INSTANCE = new EmptyPoolElement();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/FeaturePoolElement.java b/src/net/minecraft/world/level/levelgen/feature/structures/FeaturePoolElement.java
index 1faec80..51bbb80 100644
--- a/src/net/minecraft/world/level/levelgen/feature/structures/FeaturePoolElement.java
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/FeaturePoolElement.java
@@ -1,16 +1,18 @@
 package net.minecraft.world.level.levelgen.feature.structures;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.core.Registry;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.core.FrontAndTop;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.JigsawBlock;
 import net.minecraft.world.level.block.Blocks;
@@ -22,67 +24,61 @@ import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
-import com.mojang.datafixers.Dynamic;
+import net.minecraft.world.level.block.entity.JigsawBlockEntity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import com.mojang.serialization.Codec;
 
 public class FeaturePoolElement extends StructurePoolElement {
+    public static final Codec<FeaturePoolElement> CODEC;
     private final ConfiguredFeature<?, ?> feature;
     private final CompoundTag defaultJigsawNBT;
     
     @Deprecated
-    public FeaturePoolElement(final ConfiguredFeature<?, ?> cdc) {
-        this(cdc, StructureTemplatePool.Projection.RIGID);
+    public FeaturePoolElement(final ConfiguredFeature<?, ?> ckb) {
+        this(ckb, StructureTemplatePool.Projection.RIGID);
     }
     
-    public FeaturePoolElement(final ConfiguredFeature<?, ?> cdc, final StructureTemplatePool.Projection a) {
+    private FeaturePoolElement(final ConfiguredFeature<?, ?> ckb, final StructureTemplatePool.Projection a) {
         super(a);
-        this.feature = cdc;
+        this.feature = ckb;
         this.defaultJigsawNBT = this.fillDefaultJigsawNBT();
     }
     
-    public <T> FeaturePoolElement(final Dynamic<T> dynamic) {
-        super(dynamic);
-        this.feature = ConfiguredFeature.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("feature").orElseEmptyMap());
-        this.defaultJigsawNBT = this.fillDefaultJigsawNBT();
+    private CompoundTag fillDefaultJigsawNBT() {
+        final CompoundTag le2 = new CompoundTag();
+        le2.putString("name", "minecraft:bottom");
+        le2.putString("final_state", "minecraft:air");
+        le2.putString("pool", "minecraft:empty");
+        le2.putString("target", "minecraft:empty");
+        le2.putString("joint", JigsawBlockEntity.JointType.ROLLABLE.getSerializedName());
+        return le2;
     }
     
-    public CompoundTag fillDefaultJigsawNBT() {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.putString("target_pool", "minecraft:empty");
-        jt2.putString("attachement_type", "minecraft:bottom");
-        jt2.putString("final_state", "minecraft:air");
-        return jt2;
-    }
-    
-    public BlockPos getSize(final StructureManager cmo, final Rotation btu) {
+    public BlockPos getSize(final StructureManager cva, final Rotation cap) {
         return BlockPos.ZERO;
     }
     
     @Override
-    public List<StructureTemplate.StructureBlockInfo> getShuffledJigsawBlocks(final StructureManager cmo, final BlockPos fk, final Rotation btu, final Random random) {
+    public List<StructureTemplate.StructureBlockInfo> getShuffledJigsawBlocks(final StructureManager cva, final BlockPos fu, final Rotation cap, final Random random) {
         final List<StructureTemplate.StructureBlockInfo> list6 = Lists.newArrayList();
-        list6.add(new StructureTemplate.StructureBlockInfo(fk, ((AbstractStateHolder<O, BlockState>)Blocks.JIGSAW.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)JigsawBlock.FACING, Direction.DOWN), this.defaultJigsawNBT));
+        list6.add(new StructureTemplate.StructureBlockInfo(fu, ((StateHolder<O, BlockState>)Blocks.JIGSAW.defaultBlockState()).<FrontAndTop, FrontAndTop>setValue(JigsawBlock.ORIENTATION, FrontAndTop.fromFrontAndTop(Direction.DOWN, Direction.SOUTH)), this.defaultJigsawNBT));
         return list6;
     }
     
     @Override
-    public BoundingBox getBoundingBox(final StructureManager cmo, final BlockPos fk, final Rotation btu) {
-        final BlockPos fk2 = this.getSize(cmo, btu);
-        return new BoundingBox(fk.getX(), fk.getY(), fk.getZ(), fk.getX() + fk2.getX(), fk.getY() + fk2.getY(), fk.getZ() + fk2.getZ());
+    public BoundingBox getBoundingBox(final StructureManager cva, final BlockPos fu, final Rotation cap) {
+        final BlockPos fu2 = this.getSize(cva, cap);
+        return new BoundingBox(fu.getX(), fu.getY(), fu.getZ(), fu.getX() + fu2.getX(), fu.getY() + fu2.getY(), fu.getZ() + fu2.getZ());
     }
     
     @Override
-    public boolean place(final StructureManager cmo, final LevelAccessor bjx, final ChunkGenerator<?> caa, final BlockPos fk, final Rotation btu, final BoundingBox clb, final Random random) {
-        return this.feature.place(bjx, caa, random, fk);
-    }
-    
-    public <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("feature"), this.feature.<T>serialize(dynamicOps).getValue())));
+    public boolean place(final StructureManager cva, final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final BlockPos fu5, final BlockPos fu6, final Rotation cap, final BoundingBox ctd, final Random random, final boolean boolean10) {
+        return this.feature.place(bqu, bqq, cha, random, fu5);
     }
     
     @Override
-    public StructurePoolElementType getType() {
+    public StructurePoolElementType<?> getType() {
         return StructurePoolElementType.FEATURE;
     }
     
@@ -90,4 +86,8 @@ public class FeaturePoolElement extends StructurePoolElement {
     public String toString() {
         return "Feature[" + Registry.FEATURE.getKey(this.feature.feature) + "]";
     }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)ConfiguredFeature.CODEC.fieldOf("feature").forGetter(cpx -> cpx.feature), (App)StructurePoolElement.<StructurePoolElement>projectionCodec()).apply(instance, (BiFunction)FeaturePoolElement::new));
+    }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/JigsawJunction.java b/src/net/minecraft/world/level/levelgen/feature/structures/JigsawJunction.java
index 23bf9ee..8650d82 100644
--- a/src/net/minecraft/world/level/levelgen/feature/structures/JigsawJunction.java
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/JigsawJunction.java
@@ -2,8 +2,8 @@ package net.minecraft.world.level.levelgen.feature.structures;
 
 import java.util.Map;
 import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.serialization.Dynamic;
+import com.mojang.serialization.DynamicOps;
 
 public class JigsawJunction {
     private final int sourceX;
@@ -50,8 +50,8 @@ public class JigsawJunction {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final JigsawJunction cig3 = (JigsawJunction)object;
-        return this.sourceX == cig3.sourceX && this.sourceZ == cig3.sourceZ && this.deltaY == cig3.deltaY && this.destProjection == cig3.destProjection;
+        final JigsawJunction cpy3 = (JigsawJunction)object;
+        return this.sourceX == cpy3.sourceX && this.sourceZ == cpy3.sourceZ && this.deltaY == cpy3.deltaY && this.destProjection == cpy3.destProjection;
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/JigsawPlacement.java b/src/net/minecraft/world/level/levelgen/feature/structures/JigsawPlacement.java
index 6975dfc..3265113 100644
--- a/src/net/minecraft/world/level/levelgen/feature/structures/JigsawPlacement.java
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/JigsawPlacement.java
@@ -1,42 +1,86 @@
 package net.minecraft.world.level.levelgen.feature.structures;
 
+import net.minecraft.core.Direction;
 import java.util.Iterator;
 import java.util.Collection;
 import com.google.common.collect.Lists;
 import net.minecraft.core.Vec3i;
-import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.JigsawBlock;
-import net.minecraft.core.Direction;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import com.google.common.collect.Queues;
+import java.util.Deque;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import org.apache.commons.lang3.mutable.MutableObject;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.block.Rotation;
-import com.google.common.collect.Queues;
-import java.util.Deque;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import java.util.concurrent.atomic.AtomicReference;
-import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece;
-import org.apache.logging.log4j.LogManager;
-import net.minecraft.world.level.levelgen.structure.StructureFeatureIO;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.structure.StructurePiece;
+import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece;
 import java.util.List;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.structure.PillagerOutpostPieces;
+import net.minecraft.world.level.levelgen.feature.VillagePieces;
+import net.minecraft.world.level.levelgen.feature.BastionPieces;
 import org.apache.logging.log4j.Logger;
 
 public class JigsawPlacement {
     private static final Logger LOGGER;
     public static final StructureTemplatePools POOLS;
     
-    public static void addPieces(final ResourceLocation sm, final int integer, final PieceFactory a, final ChunkGenerator<?> caa, final StructureManager cmo, final BlockPos fk, final List<StructurePiece> list, final Random random) {
-        StructureFeatureIO.bootstrap();
-        new Placer(sm, integer, a, caa, cmo, fk, list, random);
+    public static void bootstrap() {
+        BastionPieces.bootstrap();
+        VillagePieces.bootstrap();
+        PillagerOutpostPieces.bootstrap();
+    }
+    
+    public static void addPieces(final ResourceLocation uh, final int integer, final PieceFactory a, final ChunkGenerator cha, final StructureManager cva, final BlockPos fu, final List<? super PoolElementStructurePiece> list, final Random random, final boolean boolean9, final boolean boolean10) {
+        StructureFeature.bootstrap();
+        final Rotation cap11 = Rotation.getRandom(random);
+        final StructureTemplatePool cqf12 = JigsawPlacement.POOLS.getPool(uh);
+        final StructurePoolElement cqd13 = cqf12.getRandomTemplate(random);
+        final PoolElementStructurePiece cts14 = a.create(cva, cqd13, fu, cqd13.getGroundLevelDelta(), cap11, cqd13.getBoundingBox(cva, fu, cap11));
+        final BoundingBox ctd15 = cts14.getBoundingBox();
+        final int integer2 = (ctd15.x1 + ctd15.x0) / 2;
+        final int integer3 = (ctd15.z1 + ctd15.z0) / 2;
+        int integer4;
+        if (boolean10) {
+            integer4 = fu.getY() + cha.getFirstFreeHeight(integer2, integer3, Heightmap.Types.WORLD_SURFACE_WG);
+        }
+        else {
+            integer4 = fu.getY();
+        }
+        final int integer5 = ctd15.y0 + cts14.getGroundLevelDelta();
+        cts14.move(0, integer4 - integer5, 0);
+        list.add(cts14);
+        if (integer <= 0) {
+            return;
+        }
+        final int integer6 = 80;
+        final AABB deg21 = new AABB(integer2 - 80, integer4 - 80, integer3 - 80, integer2 + 80 + 1, integer4 + 80 + 1, integer3 + 80 + 1);
+        final Placer c22 = new Placer(integer, a, cha, cva, (List)list, random);
+        c22.placing.addLast(new PieceState(cts14, new MutableObject(Shapes.join(Shapes.create(deg21), Shapes.create(AABB.of(ctd15)), BooleanOp.ONLY_FIRST)), integer4 + 80, 0));
+        while (!c22.placing.isEmpty()) {
+            final PieceState b23 = c22.placing.removeFirst();
+            c22.tryPlacingChildren(b23.piece, b23.free, b23.boundsTop, b23.depth, boolean9);
+        }
+    }
+    
+    public static void addPieces(final PoolElementStructurePiece cts, final int integer, final PieceFactory a, final ChunkGenerator cha, final StructureManager cva, final List<? super PoolElementStructurePiece> list, final Random random) {
+        bootstrap();
+        final Placer c8 = new Placer(integer, a, cha, cva, (List)list, random);
+        c8.placing.addLast(new PieceState(cts, new MutableObject(Shapes.INFINITY), 0, 0));
+        while (!c8.placing.isEmpty()) {
+            final PieceState b9 = c8.placing.removeFirst();
+            c8.tryPlacingChildren(b9.piece, b9.free, b9.boundsTop, b9.depth, false);
+        }
     }
     
     static {
@@ -46,13 +90,13 @@ public class JigsawPlacement {
     
     static final class PieceState {
         private final PoolElementStructurePiece piece;
-        private final AtomicReference<VoxelShape> free;
+        private final MutableObject<VoxelShape> free;
         private final int boundsTop;
         private final int depth;
         
-        private PieceState(final PoolElementStructurePiece clo, final AtomicReference<VoxelShape> atomicReference, final int integer3, final int integer4) {
-            this.piece = clo;
-            this.free = atomicReference;
+        private PieceState(final PoolElementStructurePiece cts, final MutableObject<VoxelShape> mutableObject, final int integer3, final int integer4) {
+            this.piece = cts;
+            this.free = mutableObject;
             this.boundsTop = integer3;
             this.depth = integer4;
         }
@@ -61,173 +105,153 @@ public class JigsawPlacement {
     static final class Placer {
         private final int maxDepth;
         private final PieceFactory factory;
-        private final ChunkGenerator<?> chunkGenerator;
+        private final ChunkGenerator chunkGenerator;
         private final StructureManager structureManager;
-        private final List<StructurePiece> pieces;
+        private final List<? super PoolElementStructurePiece> pieces;
         private final Random random;
         private final Deque<PieceState> placing;
         
-        public Placer(final ResourceLocation sm, final int integer, final PieceFactory a, final ChunkGenerator<?> caa, final StructureManager cmo, final BlockPos fk, final List<StructurePiece> list, final Random random) {
+        private Placer(final int integer, final PieceFactory a, final ChunkGenerator cha, final StructureManager cva, final List<? super PoolElementStructurePiece> list, final Random random) {
             this.placing = Queues.newArrayDeque();
             this.maxDepth = integer;
             this.factory = a;
-            this.chunkGenerator = caa;
-            this.structureManager = cmo;
+            this.chunkGenerator = cha;
+            this.structureManager = cva;
             this.pieces = list;
             this.random = random;
-            final Rotation btu10 = Rotation.getRandom(random);
-            final StructureTemplatePool cim11 = JigsawPlacement.POOLS.getPool(sm);
-            final StructurePoolElement cik12 = cim11.getRandomTemplate(random);
-            final PoolElementStructurePiece clo13 = a.create(cmo, cik12, fk, cik12.getGroundLevelDelta(), btu10, cik12.getBoundingBox(cmo, fk, btu10));
-            final BoundingBox clb14 = clo13.getBoundingBox();
-            final int integer2 = (clb14.x1 + clb14.x0) / 2;
-            final int integer3 = (clb14.z1 + clb14.z0) / 2;
-            final int integer4 = caa.getFirstFreeHeight(integer2, integer3, Heightmap.Types.WORLD_SURFACE_WG);
-            clo13.move(0, integer4 - (clb14.y0 + clo13.getGroundLevelDelta()), 0);
-            list.add(clo13);
-            if (integer <= 0) {
-                return;
-            }
-            final int integer5 = 80;
-            final AABB cvf19 = new AABB(integer2 - 80, integer4 - 80, integer3 - 80, integer2 + 80 + 1, integer4 + 80 + 1, integer3 + 80 + 1);
-            this.placing.addLast(new PieceState(clo13, new AtomicReference((V)Shapes.join(Shapes.create(cvf19), Shapes.create(AABB.of(clb14)), BooleanOp.ONLY_FIRST)), integer4 + 80, 0));
-            while (!this.placing.isEmpty()) {
-                final PieceState b20 = this.placing.removeFirst();
-                this.tryPlacingChildren(b20.piece, b20.free, b20.boundsTop, b20.depth);
-            }
         }
         
-        private void tryPlacingChildren(final PoolElementStructurePiece clo, final AtomicReference<VoxelShape> atomicReference, final int integer3, final int integer4) {
-            final StructurePoolElement cik6 = clo.getElement();
-            final BlockPos fk7 = clo.getPosition();
-            final Rotation btu8 = clo.getRotation();
-            final StructureTemplatePool.Projection a9 = cik6.getProjection();
-            final boolean boolean10 = a9 == StructureTemplatePool.Projection.RIGID;
-            final AtomicReference<VoxelShape> atomicReference2 = new AtomicReference<VoxelShape>();
-            final BoundingBox clb12 = clo.getBoundingBox();
-            final int integer5 = clb12.y0;
-            for (final StructureTemplate.StructureBlockInfo b2 : cik6.getShuffledJigsawBlocks(this.structureManager, fk7, btu8, this.random)) {
-                final Direction fp16 = b2.state.<Direction>getValue((Property<Direction>)JigsawBlock.FACING);
-                final BlockPos fk8 = b2.pos;
-                final BlockPos fk9 = fk8.relative(fp16);
-                final int integer6 = fk8.getY() - integer5;
+        private void tryPlacingChildren(final PoolElementStructurePiece cts, final MutableObject<VoxelShape> mutableObject, final int integer3, final int integer4, final boolean boolean5) {
+            final StructurePoolElement cqd7 = cts.getElement();
+            final BlockPos fu8 = cts.getPosition();
+            final Rotation cap9 = cts.getRotation();
+            final StructureTemplatePool.Projection a10 = cqd7.getProjection();
+            final boolean boolean6 = a10 == StructureTemplatePool.Projection.RIGID;
+            final MutableObject<VoxelShape> mutableObject2 = (MutableObject<VoxelShape>)new MutableObject();
+            final BoundingBox ctd13 = cts.getBoundingBox();
+            final int integer5 = ctd13.y0;
+            for (final StructureTemplate.StructureBlockInfo c2 : cqd7.getShuffledJigsawBlocks(this.structureManager, fu8, cap9, this.random)) {
+                final Direction fz17 = JigsawBlock.getFrontFacing(c2.state);
+                final BlockPos fu9 = c2.pos;
+                final BlockPos fu10 = fu9.relative(fz17);
+                final int integer6 = fu9.getY() - integer5;
                 int integer7 = -1;
-                final StructureTemplatePool cim21 = JigsawPlacement.POOLS.getPool(new ResourceLocation(b2.nbt.getString("target_pool")));
-                final StructureTemplatePool cim22 = JigsawPlacement.POOLS.getPool(cim21.getFallback());
-                if (cim21 == StructureTemplatePool.INVALID || (cim21.size() == 0 && cim21 != StructureTemplatePool.EMPTY)) {
-                    JigsawPlacement.LOGGER.warn("Empty or none existent pool: {}", b2.nbt.getString("target_pool"));
+                final StructureTemplatePool cqf22 = JigsawPlacement.POOLS.getPool(new ResourceLocation(c2.nbt.getString("pool")));
+                final StructureTemplatePool cqf23 = JigsawPlacement.POOLS.getPool(cqf22.getFallback());
+                if (cqf22 == StructureTemplatePool.INVALID || (cqf22.size() == 0 && cqf22 != StructureTemplatePool.EMPTY)) {
+                    JigsawPlacement.LOGGER.warn("Empty or none existent pool: {}", c2.nbt.getString("pool"));
                 }
                 else {
-                    final boolean boolean11 = clb12.isInside(fk9);
-                    AtomicReference<VoxelShape> atomicReference3;
+                    final boolean boolean7 = ctd13.isInside(fu10);
+                    MutableObject<VoxelShape> mutableObject3;
                     int integer8;
-                    if (boolean11) {
-                        atomicReference3 = atomicReference2;
+                    if (boolean7) {
+                        mutableObject3 = mutableObject2;
                         integer8 = integer5;
-                        if (atomicReference2.get() == null) {
-                            atomicReference2.set(Shapes.create(AABB.of(clb12)));
+                        if (mutableObject2.getValue() == null) {
+                            mutableObject2.setValue(Shapes.create(AABB.of(ctd13)));
                         }
                     }
                     else {
-                        atomicReference3 = atomicReference;
+                        mutableObject3 = mutableObject;
                         integer8 = integer3;
                     }
-                    final List<StructurePoolElement> list26 = Lists.newArrayList();
+                    final List<StructurePoolElement> list27 = Lists.newArrayList();
                     if (integer4 != this.maxDepth) {
-                        list26.addAll(cim21.getShuffledTemplates(this.random));
+                        list27.addAll(cqf22.getShuffledTemplates(this.random));
                     }
-                    list26.addAll(cim22.getShuffledTemplates(this.random));
-                Label_1101:
-                    for (final StructurePoolElement cik7 : list26) {
-                        if (cik7 == EmptyPoolElement.INSTANCE) {
+                    list27.addAll(cqf23.getShuffledTemplates(this.random));
+                Label_1091:
+                    for (final StructurePoolElement cqd8 : list27) {
+                        if (cqd8 == EmptyPoolElement.INSTANCE) {
                             break;
                         }
-                        for (final Rotation btu9 : Rotation.getShuffled(this.random)) {
-                            final List<StructureTemplate.StructureBlockInfo> list27 = cik7.getShuffledJigsawBlocks(this.structureManager, BlockPos.ZERO, btu9, this.random);
-                            final BoundingBox clb13 = cik7.getBoundingBox(this.structureManager, BlockPos.ZERO, btu9);
+                        for (final Rotation cap10 : Rotation.getShuffled(this.random)) {
+                            final List<StructureTemplate.StructureBlockInfo> list28 = cqd8.getShuffledJigsawBlocks(this.structureManager, BlockPos.ZERO, cap10, this.random);
+                            final BoundingBox ctd14 = cqd8.getBoundingBox(this.structureManager, BlockPos.ZERO, cap10);
                             int integer9;
-                            if (clb13.getYSpan() > 16) {
+                            if (!boolean5 || ctd14.getYSpan() > 16) {
                                 integer9 = 0;
                             }
                             else {
-                                ResourceLocation sm4;
-                                StructureTemplatePool cim23;
-                                StructureTemplatePool cim24;
-                                integer9 = list27.stream().mapToInt(b -> {
-                                    if (!clb13.isInside(b.pos.relative(b.state.<Direction>getValue((Property<Direction>)JigsawBlock.FACING)))) {
+                                ResourceLocation uh4;
+                                StructureTemplatePool cqf24;
+                                StructureTemplatePool cqf25;
+                                integer9 = list28.stream().mapToInt(c -> {
+                                    if (!ctd14.isInside(c.pos.relative(JigsawBlock.getFrontFacing(c.state)))) {
                                         return 0;
                                     }
                                     else {
-                                        sm4 = new ResourceLocation(b.nbt.getString("target_pool"));
-                                        cim23 = JigsawPlacement.POOLS.getPool(sm4);
-                                        cim24 = JigsawPlacement.POOLS.getPool(cim23.getFallback());
-                                        return Math.max(cim23.getMaxSize(this.structureManager), cim24.getMaxSize(this.structureManager));
+                                        uh4 = new ResourceLocation(c.nbt.getString("pool"));
+                                        cqf24 = JigsawPlacement.POOLS.getPool(uh4);
+                                        cqf25 = JigsawPlacement.POOLS.getPool(cqf24.getFallback());
+                                        return Math.max(cqf24.getMaxSize(this.structureManager), cqf25.getMaxSize(this.structureManager));
                                     }
                                 }).max().orElse(0);
                             }
-                            for (final StructureTemplate.StructureBlockInfo b3 : list27) {
-                                if (!JigsawBlock.canAttach(b2, b3)) {
+                            for (final StructureTemplate.StructureBlockInfo c3 : list28) {
+                                if (!JigsawBlock.canAttach(c2, c3)) {
                                     continue;
                                 }
-                                final BlockPos fk10 = b3.pos;
-                                final BlockPos fk11 = new BlockPos(fk9.getX() - fk10.getX(), fk9.getY() - fk10.getY(), fk9.getZ() - fk10.getZ());
-                                final BoundingBox clb14 = cik7.getBoundingBox(this.structureManager, fk11, btu9);
-                                final int integer10 = clb14.y0;
-                                final StructureTemplatePool.Projection a10 = cik7.getProjection();
-                                final boolean boolean12 = a10 == StructureTemplatePool.Projection.RIGID;
-                                final int integer11 = fk10.getY();
-                                final int integer12 = integer6 - integer11 + b2.state.<Direction>getValue((Property<Direction>)JigsawBlock.FACING).getStepY();
+                                final BlockPos fu11 = c3.pos;
+                                final BlockPos fu12 = new BlockPos(fu10.getX() - fu11.getX(), fu10.getY() - fu11.getY(), fu10.getZ() - fu11.getZ());
+                                final BoundingBox ctd15 = cqd8.getBoundingBox(this.structureManager, fu12, cap10);
+                                final int integer10 = ctd15.y0;
+                                final StructureTemplatePool.Projection a11 = cqd8.getProjection();
+                                final boolean boolean8 = a11 == StructureTemplatePool.Projection.RIGID;
+                                final int integer11 = fu11.getY();
+                                final int integer12 = integer6 - integer11 + JigsawBlock.getFrontFacing(c2.state).getStepY();
                                 int integer13;
-                                if (boolean10 && boolean12) {
+                                if (boolean6 && boolean8) {
                                     integer13 = integer5 + integer12;
                                 }
                                 else {
                                     if (integer7 == -1) {
-                                        integer7 = this.chunkGenerator.getFirstFreeHeight(fk8.getX(), fk8.getZ(), Heightmap.Types.WORLD_SURFACE_WG);
+                                        integer7 = this.chunkGenerator.getFirstFreeHeight(fu9.getX(), fu9.getZ(), Heightmap.Types.WORLD_SURFACE_WG);
                                     }
                                     integer13 = integer7 - integer11;
                                 }
                                 final int integer14 = integer13 - integer10;
-                                final BoundingBox clb15 = clb14.moved(0, integer14, 0);
-                                final BlockPos fk12 = fk11.offset(0, integer14, 0);
+                                final BoundingBox ctd16 = ctd15.moved(0, integer14, 0);
+                                final BlockPos fu13 = fu12.offset(0, integer14, 0);
                                 if (integer9 > 0) {
-                                    final int integer15 = Math.max(integer9 + 1, clb15.y1 - clb15.y0);
-                                    clb15.y1 = clb15.y0 + integer15;
+                                    final int integer15 = Math.max(integer9 + 1, ctd16.y1 - ctd16.y0);
+                                    ctd16.y1 = ctd16.y0 + integer15;
                                 }
-                                if (Shapes.joinIsNotEmpty(atomicReference3.get(), Shapes.create(AABB.of(clb15).deflate(0.25)), BooleanOp.ONLY_SECOND)) {
+                                if (Shapes.joinIsNotEmpty((VoxelShape)mutableObject3.getValue(), Shapes.create(AABB.of(ctd16).deflate(0.25)), BooleanOp.ONLY_SECOND)) {
                                     continue;
                                 }
-                                atomicReference3.set(Shapes.joinUnoptimized(atomicReference3.get(), Shapes.create(AABB.of(clb15)), BooleanOp.ONLY_FIRST));
-                                final int integer15 = clo.getGroundLevelDelta();
+                                mutableObject3.setValue(Shapes.joinUnoptimized((VoxelShape)mutableObject3.getValue(), Shapes.create(AABB.of(ctd16)), BooleanOp.ONLY_FIRST));
+                                final int integer15 = cts.getGroundLevelDelta();
                                 int integer16;
-                                if (boolean12) {
+                                if (boolean8) {
                                     integer16 = integer15 - integer12;
                                 }
                                 else {
-                                    integer16 = cik7.getGroundLevelDelta();
+                                    integer16 = cqd8.getGroundLevelDelta();
                                 }
-                                final PoolElementStructurePiece clo2 = this.factory.create(this.structureManager, cik7, fk12, integer16, btu9, clb15);
+                                final PoolElementStructurePiece cts2 = this.factory.create(this.structureManager, cqd8, fu13, integer16, cap10, ctd16);
                                 int integer17;
-                                if (boolean10) {
+                                if (boolean6) {
                                     integer17 = integer5 + integer6;
                                 }
-                                else if (boolean12) {
+                                else if (boolean8) {
                                     integer17 = integer13 + integer11;
                                 }
                                 else {
                                     if (integer7 == -1) {
-                                        integer7 = this.chunkGenerator.getFirstFreeHeight(fk8.getX(), fk8.getZ(), Heightmap.Types.WORLD_SURFACE_WG);
+                                        integer7 = this.chunkGenerator.getFirstFreeHeight(fu9.getX(), fu9.getZ(), Heightmap.Types.WORLD_SURFACE_WG);
                                     }
                                     integer17 = integer7 + integer12 / 2;
                                 }
-                                clo.addJunction(new JigsawJunction(fk9.getX(), integer17 - integer6 + integer15, fk9.getZ(), integer12, a10));
-                                clo2.addJunction(new JigsawJunction(fk8.getX(), integer17 - integer11 + integer16, fk8.getZ(), -integer12, a9));
-                                this.pieces.add(clo2);
+                                cts.addJunction(new JigsawJunction(fu10.getX(), integer17 - integer6 + integer15, fu10.getZ(), integer12, a11));
+                                cts2.addJunction(new JigsawJunction(fu9.getX(), integer17 - integer11 + integer16, fu9.getZ(), -integer12, a10));
+                                this.pieces.add(cts2);
                                 if (integer4 + 1 <= this.maxDepth) {
-                                    this.placing.addLast(new PieceState(clo2, (AtomicReference)atomicReference3, integer8, integer4 + 1));
-                                    break Label_1101;
+                                    this.placing.addLast(new PieceState(cts2, (MutableObject)mutableObject3, integer8, integer4 + 1));
+                                    break Label_1091;
                                 }
-                                break Label_1101;
+                                break Label_1091;
                             }
                         }
                     }
@@ -237,6 +261,6 @@ public class JigsawPlacement {
     }
     
     public interface PieceFactory {
-        PoolElementStructurePiece create(final StructureManager cmo, final StructurePoolElement cik, final BlockPos fk, final int integer, final Rotation btu, final BoundingBox clb);
+        PoolElementStructurePiece create(final StructureManager cva, final StructurePoolElement cqd, final BlockPos fu, final int integer, final Rotation cap, final BoundingBox ctd);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/LegacySinglePoolElement.java b/src/net/minecraft/world/level/levelgen/feature/structures/LegacySinglePoolElement.java
new file mode 100644
index 0000000..0e1b181
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/LegacySinglePoolElement.java
@@ -0,0 +1,56 @@
+package net.minecraft.world.level.levelgen.feature.structures;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.block.Rotation;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import net.minecraft.resources.ResourceLocation;
+import com.mojang.datafixers.util.Either;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import java.util.List;
+import com.mojang.serialization.Codec;
+
+public class LegacySinglePoolElement extends SinglePoolElement {
+    public static final Codec<LegacySinglePoolElement> CODEC;
+    
+    @Deprecated
+    public LegacySinglePoolElement(final String string, final List<StructureProcessor> list) {
+        super(string, list);
+    }
+    
+    private LegacySinglePoolElement(final Either<ResourceLocation, StructureTemplate> either, final List<StructureProcessor> list, final StructureTemplatePool.Projection a) {
+        super(either, list, a);
+    }
+    
+    @Deprecated
+    public LegacySinglePoolElement(final String string) {
+        super(string, ImmutableList.of());
+    }
+    
+    @Override
+    protected StructurePlaceSettings getSettings(final Rotation cap, final BoundingBox ctd, final boolean boolean3) {
+        final StructurePlaceSettings cvb5 = super.getSettings(cap, ctd, boolean3);
+        cvb5.popProcessor(BlockIgnoreProcessor.STRUCTURE_BLOCK);
+        cvb5.addProcessor(BlockIgnoreProcessor.STRUCTURE_AND_AIR);
+        return cvb5;
+    }
+    
+    @Override
+    public StructurePoolElementType<?> getType() {
+        return StructurePoolElementType.LEGACY;
+    }
+    
+    @Override
+    public String toString() {
+        return "LegacySingle[" + this.template + "]";
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)SinglePoolElement.<SinglePoolElement>templateCodec(), (App)SinglePoolElement.<SinglePoolElement>processorsCodec(), (App)StructurePoolElement.<StructurePoolElement>projectionCodec()).apply(instance, LegacySinglePoolElement::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/ListPoolElement.java b/src/net/minecraft/world/level/levelgen/feature/structures/ListPoolElement.java
index cb49e7d..1af1b36 100644
--- a/src/net/minecraft/world/level/levelgen/feature/structures/ListPoolElement.java
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/ListPoolElement.java
@@ -1,14 +1,15 @@
 package net.minecraft.world.level.levelgen.feature.structures;
 
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.function.Function;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Stream;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import java.util.Iterator;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
@@ -16,12 +17,11 @@ import java.util.Random;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
-import net.minecraft.util.Deserializer;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
 import java.util.List;
+import com.mojang.serialization.Codec;
 
 public class ListPoolElement extends StructurePoolElement {
+    public static final Codec<ListPoolElement> CODEC;
     private final List<StructurePoolElement> elements;
     
     @Deprecated
@@ -38,34 +38,25 @@ public class ListPoolElement extends StructurePoolElement {
         this.setProjectionOnEachElement(a);
     }
     
-    public ListPoolElement(final Dynamic<?> dynamic) {
-        super(dynamic);
-        final List<StructurePoolElement> list3 = (List<StructurePoolElement>)dynamic.get("elements").asList(dynamic -> Deserializer.<Object, EmptyPoolElement, StructurePoolElementType>deserialize(dynamic, Registry.STRUCTURE_POOL_ELEMENT, "element_type", EmptyPoolElement.INSTANCE));
-        if (list3.isEmpty()) {
-            throw new IllegalArgumentException("Elements are empty");
+    @Override
+    public List<StructureTemplate.StructureBlockInfo> getShuffledJigsawBlocks(final StructureManager cva, final BlockPos fu, final Rotation cap, final Random random) {
+        return this.elements.get(0).getShuffledJigsawBlocks(cva, fu, cap, random);
+    }
+    
+    @Override
+    public BoundingBox getBoundingBox(final StructureManager cva, final BlockPos fu, final Rotation cap) {
+        final BoundingBox ctd5 = BoundingBox.getUnknownBox();
+        for (final StructurePoolElement cqd7 : this.elements) {
+            final BoundingBox ctd6 = cqd7.getBoundingBox(cva, fu, cap);
+            ctd5.expand(ctd6);
         }
-        this.elements = list3;
+        return ctd5;
     }
     
     @Override
-    public List<StructureTemplate.StructureBlockInfo> getShuffledJigsawBlocks(final StructureManager cmo, final BlockPos fk, final Rotation btu, final Random random) {
-        return this.elements.get(0).getShuffledJigsawBlocks(cmo, fk, btu, random);
-    }
-    
-    @Override
-    public BoundingBox getBoundingBox(final StructureManager cmo, final BlockPos fk, final Rotation btu) {
-        final BoundingBox clb5 = BoundingBox.getUnknownBox();
-        for (final StructurePoolElement cik7 : this.elements) {
-            final BoundingBox clb6 = cik7.getBoundingBox(cmo, fk, btu);
-            clb5.expand(clb6);
-        }
-        return clb5;
-    }
-    
-    @Override
-    public boolean place(final StructureManager cmo, final LevelAccessor bjx, final ChunkGenerator<?> caa, final BlockPos fk, final Rotation btu, final BoundingBox clb, final Random random) {
-        for (final StructurePoolElement cik10 : this.elements) {
-            if (!cik10.place(cmo, bjx, caa, fk, btu, clb, random)) {
+    public boolean place(final StructureManager cva, final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final BlockPos fu5, final BlockPos fu6, final Rotation cap, final BoundingBox ctd, final Random random, final boolean boolean10) {
+        for (final StructurePoolElement cqd13 : this.elements) {
+            if (!cqd13.place(cva, bqu, bqq, cha, fu5, fu6, cap, ctd, random, boolean10)) {
                 return false;
             }
         }
@@ -73,7 +64,7 @@ public class ListPoolElement extends StructurePoolElement {
     }
     
     @Override
-    public StructurePoolElementType getType() {
+    public StructurePoolElementType<?> getType() {
         return StructurePoolElementType.LIST;
     }
     
@@ -84,17 +75,16 @@ public class ListPoolElement extends StructurePoolElement {
         return this;
     }
     
-    public <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        final T object3 = (T)dynamicOps.createList((Stream)this.elements.stream().map(cik -> cik.<T>serialize(dynamicOps).getValue()));
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.<Object, T>of(dynamicOps.createString("elements"), object3)));
-    }
-    
     @Override
     public String toString() {
         return "List[" + this.elements.stream().map(Object::toString).collect(Collectors.joining(", ")) + "]";
     }
     
     private void setProjectionOnEachElement(final StructureTemplatePool.Projection a) {
-        this.elements.forEach(cik -> cik.setProjection(a));
+        this.elements.forEach(cqd -> cqd.setProjection(a));
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)StructurePoolElement.CODEC.listOf().fieldOf("elements").forGetter(cqb -> cqb.elements), (App)StructurePoolElement.<StructurePoolElement>projectionCodec()).apply(instance, (BiFunction)ListPoolElement::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/SinglePoolElement.java b/src/net/minecraft/world/level/levelgen/feature/structures/SinglePoolElement.java
index e1dda0d..a64e3d6 100644
--- a/src/net/minecraft/world/level/levelgen/feature/structures/SinglePoolElement.java
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/SinglePoolElement.java
@@ -1,14 +1,14 @@
 package net.minecraft.world.level.levelgen.feature.structures;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Stream;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
 import java.util.function.Consumer;
 import net.minecraft.world.level.levelgen.structure.templatesystem.JigsawReplacementProcessor;
 import net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor;
-import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import java.util.Collections;
 import java.util.Random;
@@ -17,116 +17,143 @@ import net.minecraft.world.level.block.state.properties.StructureMode;
 import com.google.common.collect.Lists;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.core.BlockPos;
+import java.util.function.Function;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType;
-import net.minecraft.util.Deserializer;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.levelgen.structure.templatesystem.NopProcessor;
-import com.mojang.datafixers.Dynamic;
 import java.util.Collection;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType;
 import java.util.List;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.Optional;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
 import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.resources.ResourceLocation;
+import com.mojang.datafixers.util.Either;
+import com.mojang.serialization.Codec;
 
 public class SinglePoolElement extends StructurePoolElement {
-    protected final ResourceLocation location;
+    private static final Codec<Either<ResourceLocation, StructureTemplate>> TEMPLATE_CODEC;
+    public static final Codec<SinglePoolElement> CODEC;
+    protected final Either<ResourceLocation, StructureTemplate> template;
     protected final ImmutableList<StructureProcessor> processors;
     
+    private static <T> DataResult<T> encodeTemplate(final Either<ResourceLocation, StructureTemplate> either, final DynamicOps<T> dynamicOps, final T object) {
+        final Optional<ResourceLocation> optional4 = (Optional<ResourceLocation>)either.left();
+        if (!optional4.isPresent()) {
+            return (DataResult<T>)DataResult.error("Can not serialize a runtime pool element");
+        }
+        return (DataResult<T>)ResourceLocation.CODEC.encode(optional4.get(), (DynamicOps)dynamicOps, object);
+    }
+    
+    protected static <E extends SinglePoolElement> RecordCodecBuilder<E, List<StructureProcessor>> processorsCodec() {
+        return (RecordCodecBuilder<E, List<StructureProcessor>>)StructureProcessorType.CODEC.listOf().fieldOf("processors").forGetter(cqc -> cqc.processors);
+    }
+    
+    protected static <E extends SinglePoolElement> RecordCodecBuilder<E, Either<ResourceLocation, StructureTemplate>> templateCodec() {
+        return (RecordCodecBuilder<E, Either<ResourceLocation, StructureTemplate>>)SinglePoolElement.TEMPLATE_CODEC.fieldOf("location").forGetter(cqc -> cqc.template);
+    }
+    
     @Deprecated
     public SinglePoolElement(final String string, final List<StructureProcessor> list) {
-        this(string, list, StructureTemplatePool.Projection.RIGID);
+        this((Either<ResourceLocation, StructureTemplate>)Either.left(new ResourceLocation(string)), list, StructureTemplatePool.Projection.RIGID);
     }
     
-    public SinglePoolElement(final String string, final List<StructureProcessor> list, final StructureTemplatePool.Projection a) {
+    protected SinglePoolElement(final Either<ResourceLocation, StructureTemplate> either, final List<StructureProcessor> list, final StructureTemplatePool.Projection a) {
         super(a);
-        this.location = new ResourceLocation(string);
+        this.template = either;
         this.processors = ImmutableList.<StructureProcessor>copyOf(list);
     }
     
+    public SinglePoolElement(final StructureTemplate cve, final List<StructureProcessor> list, final StructureTemplatePool.Projection a) {
+        this((Either<ResourceLocation, StructureTemplate>)Either.right(cve), list, a);
+    }
+    
     @Deprecated
     public SinglePoolElement(final String string) {
         this(string, ImmutableList.of());
     }
     
-    public SinglePoolElement(final Dynamic<?> dynamic) {
-        super(dynamic);
-        this.location = new ResourceLocation(dynamic.get("location").asString(""));
-        this.processors = ImmutableList.<StructureProcessor>copyOf(dynamic.get("processors").asList(dynamic -> Deserializer.<Object, NopProcessor, StructureProcessorType>deserialize(dynamic, Registry.STRUCTURE_PROCESSOR, "processor_type", NopProcessor.INSTANCE)));
+    private StructureTemplate getTemplate(final StructureManager cva) {
+        return (StructureTemplate)this.template.map((Function)cva::getOrCreate, (Function)Function.identity());
     }
     
-    public List<StructureTemplate.StructureBlockInfo> getDataMarkers(final StructureManager cmo, final BlockPos fk, final Rotation btu, final boolean boolean4) {
-        final StructureTemplate cms6 = cmo.getOrCreate(this.location);
-        final List<StructureTemplate.StructureBlockInfo> list7 = cms6.filterBlocks(fk, new StructurePlaceSettings().setRotation(btu), Blocks.STRUCTURE_BLOCK, boolean4);
+    public List<StructureTemplate.StructureBlockInfo> getDataMarkers(final StructureManager cva, final BlockPos fu, final Rotation cap, final boolean boolean4) {
+        final StructureTemplate cve6 = this.getTemplate(cva);
+        final List<StructureTemplate.StructureBlockInfo> list7 = cve6.filterBlocks(fu, new StructurePlaceSettings().setRotation(cap), Blocks.STRUCTURE_BLOCK, boolean4);
         final List<StructureTemplate.StructureBlockInfo> list8 = Lists.newArrayList();
-        for (final StructureTemplate.StructureBlockInfo b10 : list7) {
-            if (b10.nbt == null) {
+        for (final StructureTemplate.StructureBlockInfo c10 : list7) {
+            if (c10.nbt == null) {
                 continue;
             }
-            final StructureMode bzr11 = StructureMode.valueOf(b10.nbt.getString("mode"));
-            if (bzr11 != StructureMode.DATA) {
+            final StructureMode cgq11 = StructureMode.valueOf(c10.nbt.getString("mode"));
+            if (cgq11 != StructureMode.DATA) {
                 continue;
             }
-            list8.add(b10);
+            list8.add(c10);
         }
         return list8;
     }
     
     @Override
-    public List<StructureTemplate.StructureBlockInfo> getShuffledJigsawBlocks(final StructureManager cmo, final BlockPos fk, final Rotation btu, final Random random) {
-        final StructureTemplate cms6 = cmo.getOrCreate(this.location);
-        final List<StructureTemplate.StructureBlockInfo> list7 = cms6.filterBlocks(fk, new StructurePlaceSettings().setRotation(btu), Blocks.JIGSAW, true);
+    public List<StructureTemplate.StructureBlockInfo> getShuffledJigsawBlocks(final StructureManager cva, final BlockPos fu, final Rotation cap, final Random random) {
+        final StructureTemplate cve6 = this.getTemplate(cva);
+        final List<StructureTemplate.StructureBlockInfo> list7 = cve6.filterBlocks(fu, new StructurePlaceSettings().setRotation(cap), Blocks.JIGSAW, true);
         Collections.shuffle(list7, random);
         return list7;
     }
     
     @Override
-    public BoundingBox getBoundingBox(final StructureManager cmo, final BlockPos fk, final Rotation btu) {
-        final StructureTemplate cms5 = cmo.getOrCreate(this.location);
-        return cms5.getBoundingBox(new StructurePlaceSettings().setRotation(btu), fk);
+    public BoundingBox getBoundingBox(final StructureManager cva, final BlockPos fu, final Rotation cap) {
+        final StructureTemplate cve5 = this.getTemplate(cva);
+        return cve5.getBoundingBox(new StructurePlaceSettings().setRotation(cap), fu);
     }
     
     @Override
-    public boolean place(final StructureManager cmo, final LevelAccessor bjx, final ChunkGenerator<?> caa, final BlockPos fk, final Rotation btu, final BoundingBox clb, final Random random) {
-        final StructureTemplate cms9 = cmo.getOrCreate(this.location);
-        final StructurePlaceSettings cmp10 = this.getSettings(btu, clb);
-        if (cms9.placeInWorld(bjx, fk, cmp10, 18)) {
-            final List<StructureTemplate.StructureBlockInfo> list11 = StructureTemplate.processBlockInfos(bjx, fk, cmp10, this.getDataMarkers(cmo, fk, btu, false));
-            for (final StructureTemplate.StructureBlockInfo b13 : list11) {
-                this.handleDataMarker(bjx, b13, fk, btu, random, clb);
+    public boolean place(final StructureManager cva, final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final BlockPos fu5, final BlockPos fu6, final Rotation cap, final BoundingBox ctd, final Random random, final boolean boolean10) {
+        final StructureTemplate cve12 = this.getTemplate(cva);
+        final StructurePlaceSettings cvb13 = this.getSettings(cap, ctd, boolean10);
+        if (cve12.placeInWorld(bqu, fu5, fu6, cvb13, random, 18)) {
+            final List<StructureTemplate.StructureBlockInfo> list14 = StructureTemplate.processBlockInfos(bqu, fu5, fu6, cvb13, this.getDataMarkers(cva, fu5, cap, false));
+            for (final StructureTemplate.StructureBlockInfo c16 : list14) {
+                this.handleDataMarker(bqu, c16, fu5, cap, random, ctd);
             }
             return true;
         }
         return false;
     }
     
-    protected StructurePlaceSettings getSettings(final Rotation btu, final BoundingBox clb) {
-        final StructurePlaceSettings cmp4 = new StructurePlaceSettings();
-        cmp4.setBoundingBox(clb);
-        cmp4.setRotation(btu);
-        cmp4.setKnownShape(true);
-        cmp4.setIgnoreEntities(false);
-        cmp4.addProcessor(BlockIgnoreProcessor.STRUCTURE_AND_AIR);
-        cmp4.addProcessor(JigsawReplacementProcessor.INSTANCE);
-        this.processors.forEach(cmp4::addProcessor);
-        this.getProjection().getProcessors().forEach(cmp4::addProcessor);
-        return cmp4;
+    protected StructurePlaceSettings getSettings(final Rotation cap, final BoundingBox ctd, final boolean boolean3) {
+        final StructurePlaceSettings cvb5 = new StructurePlaceSettings();
+        cvb5.setBoundingBox(ctd);
+        cvb5.setRotation(cap);
+        cvb5.setKnownShape(true);
+        cvb5.setIgnoreEntities(false);
+        cvb5.addProcessor(BlockIgnoreProcessor.STRUCTURE_BLOCK);
+        cvb5.setFinalizeEntities(true);
+        if (!boolean3) {
+            cvb5.addProcessor(JigsawReplacementProcessor.INSTANCE);
+        }
+        this.processors.forEach(cvb5::addProcessor);
+        this.getProjection().getProcessors().forEach(cvb5::addProcessor);
+        return cvb5;
     }
     
     @Override
-    public StructurePoolElementType getType() {
+    public StructurePoolElementType<?> getType() {
         return StructurePoolElementType.SINGLE;
     }
     
-    public <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("location"), dynamicOps.createString(this.location.toString()), dynamicOps.createString("processors"), dynamicOps.createList((Stream)this.processors.stream().map(cmq -> cmq.<T>serialize(dynamicOps).getValue())))));
-    }
-    
     @Override
     public String toString() {
-        return "Single[" + this.location + "]";
+        return "Single[" + this.template + "]";
+    }
+    
+    static {
+        TEMPLATE_CODEC = Codec.of(SinglePoolElement::encodeTemplate, ResourceLocation.CODEC.map((Function)Either::left));
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)SinglePoolElement.<SinglePoolElement>templateCodec(), (App)SinglePoolElement.<SinglePoolElement>processorsCodec(), (App)StructurePoolElement.<StructurePoolElement>projectionCodec()).apply(instance, SinglePoolElement::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/StructurePoolElement.java b/src/net/minecraft/world/level/levelgen/feature/structures/StructurePoolElement.java
index f34a8e8..05cfca0 100644
--- a/src/net/minecraft/world/level/levelgen/feature/structures/StructurePoolElement.java
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/StructurePoolElement.java
@@ -1,9 +1,10 @@
 package net.minecraft.world.level.levelgen.feature.structures;
 
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
-import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import java.util.List;
@@ -11,30 +12,33 @@ import java.util.Random;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
-import com.mojang.datafixers.Dynamic;
+import java.util.function.Function;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import javax.annotation.Nullable;
+import com.mojang.serialization.Codec;
 
 public abstract class StructurePoolElement {
+    public static final Codec<StructurePoolElement> CODEC;
     @Nullable
     private volatile StructureTemplatePool.Projection projection;
     
+    protected static <E extends StructurePoolElement> RecordCodecBuilder<E, StructureTemplatePool.Projection> projectionCodec() {
+        return (RecordCodecBuilder<E, StructureTemplatePool.Projection>)StructureTemplatePool.Projection.CODEC.fieldOf("projection").forGetter((Function)StructurePoolElement::getProjection);
+    }
+    
     protected StructurePoolElement(final StructureTemplatePool.Projection a) {
         this.projection = a;
     }
     
-    protected StructurePoolElement(final Dynamic<?> dynamic) {
-        this.projection = StructureTemplatePool.Projection.byName(dynamic.get("projection").asString(StructureTemplatePool.Projection.RIGID.getName()));
-    }
+    public abstract List<StructureTemplate.StructureBlockInfo> getShuffledJigsawBlocks(final StructureManager cva, final BlockPos fu, final Rotation cap, final Random random);
     
-    public abstract List<StructureTemplate.StructureBlockInfo> getShuffledJigsawBlocks(final StructureManager cmo, final BlockPos fk, final Rotation btu, final Random random);
+    public abstract BoundingBox getBoundingBox(final StructureManager cva, final BlockPos fu, final Rotation cap);
     
-    public abstract BoundingBox getBoundingBox(final StructureManager cmo, final BlockPos fk, final Rotation btu);
+    public abstract boolean place(final StructureManager cva, final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final BlockPos fu5, final BlockPos fu6, final Rotation cap, final BoundingBox ctd, final Random random, final boolean boolean10);
     
-    public abstract boolean place(final StructureManager cmo, final LevelAccessor bjx, final ChunkGenerator<?> caa, final BlockPos fk, final Rotation btu, final BoundingBox clb, final Random random);
+    public abstract StructurePoolElementType<?> getType();
     
-    public abstract StructurePoolElementType getType();
-    
-    public void handleDataMarker(final LevelAccessor bjx, final StructureTemplate.StructureBlockInfo b, final BlockPos fk, final Rotation btu, final Random random, final BoundingBox clb) {
+    public void handleDataMarker(final LevelAccessor bqc, final StructureTemplate.StructureBlockInfo c, final BlockPos fu, final Rotation cap, final Random random, final BoundingBox ctd) {
     }
     
     public StructurePoolElement setProjection(final StructureTemplatePool.Projection a) {
@@ -50,15 +54,11 @@ public abstract class StructurePoolElement {
         return a2;
     }
     
-    protected abstract <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps);
-    
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        final T object3 = (T)this.getDynamic((com.mojang.datafixers.types.DynamicOps<Object>)dynamicOps).getValue();
-        final T object4 = (T)dynamicOps.mergeInto(object3, dynamicOps.createString("element_type"), dynamicOps.createString(Registry.STRUCTURE_POOL_ELEMENT.getKey(this.getType()).toString()));
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.mergeInto(object4, dynamicOps.createString("projection"), dynamicOps.createString(this.projection.getName())));
-    }
-    
     public int getGroundLevelDelta() {
         return 1;
     }
+    
+    static {
+        CODEC = Registry.STRUCTURE_POOL_ELEMENT.dispatch("element_type", (Function)StructurePoolElement::getType, (Function)StructurePoolElementType::codec);
+    }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/StructurePoolElementType.java b/src/net/minecraft/world/level/levelgen/feature/structures/StructurePoolElementType.java
index d915f31..170eb21 100644
--- a/src/net/minecraft/world/level/levelgen/feature/structures/StructurePoolElementType.java
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/StructurePoolElementType.java
@@ -1,16 +1,18 @@
 package net.minecraft.world.level.levelgen.feature.structures;
 
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.core.Registry;
-import net.minecraft.util.Deserializer;
+import com.mojang.serialization.Codec;
 
-public interface StructurePoolElementType extends Deserializer<StructurePoolElement> {
-    public static final StructurePoolElementType SINGLE = register("single_pool_element", SinglePoolElement::new);
-    public static final StructurePoolElementType LIST = register("list_pool_element", ListPoolElement::new);
-    public static final StructurePoolElementType FEATURE = register("feature_pool_element", FeaturePoolElement::new);
-    public static final StructurePoolElementType EMPTY = register("empty_pool_element", dynamic -> EmptyPoolElement.INSTANCE);
+public interface StructurePoolElementType<P extends StructurePoolElement> {
+    public static final StructurePoolElementType<SinglePoolElement> SINGLE = StructurePoolElementType.<SinglePoolElement>register("single_pool_element", SinglePoolElement.CODEC);
+    public static final StructurePoolElementType<ListPoolElement> LIST = StructurePoolElementType.<ListPoolElement>register("list_pool_element", ListPoolElement.CODEC);
+    public static final StructurePoolElementType<FeaturePoolElement> FEATURE = StructurePoolElementType.<FeaturePoolElement>register("feature_pool_element", FeaturePoolElement.CODEC);
+    public static final StructurePoolElementType<EmptyPoolElement> EMPTY = StructurePoolElementType.<EmptyPoolElement>register("empty_pool_element", EmptyPoolElement.CODEC);
+    public static final StructurePoolElementType<LegacySinglePoolElement> LEGACY = StructurePoolElementType.<LegacySinglePoolElement>register("legacy_single_pool_element", LegacySinglePoolElement.CODEC);
     
-    default StructurePoolElementType register(final String string, final StructurePoolElementType cil) {
-        return Registry.<StructurePoolElementType>register(Registry.STRUCTURE_POOL_ELEMENT, string, cil);
+    Codec<P> codec();
+    
+    default <P extends StructurePoolElement> StructurePoolElementType<P> register(final String string, final Codec<P> codec) {
+        return Registry.<StructurePoolElementType<P>>register(Registry.STRUCTURE_POOL_ELEMENT, string, () -> codec);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/StructureTemplatePool.java b/src/net/minecraft/world/level/levelgen/feature/structures/StructureTemplatePool.java
index ec0f0d4..1f49513 100644
--- a/src/net/minecraft/world/level/levelgen/feature/structures/StructureTemplatePool.java
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/StructureTemplatePool.java
@@ -1,12 +1,19 @@
 package net.minecraft.world.level.levelgen.feature.structures;
 
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.Arrays;
 import net.minecraft.world.level.levelgen.structure.templatesystem.GravityProcessor;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
 import java.util.Map;
+import net.minecraft.util.StringRepresentable;
+import org.apache.logging.log4j.LogManager;
+import com.mojang.datafixers.kinds.Applicative;
+import java.util.function.Consumer;
+import net.minecraft.Util;
+import java.util.function.Function;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import it.unimi.dsi.fastutil.objects.ObjectArrays;
 import java.util.Random;
 import net.minecraft.world.level.block.Rotation;
@@ -19,8 +26,12 @@ import java.util.List;
 import com.mojang.datafixers.util.Pair;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.resources.ResourceLocation;
+import com.mojang.serialization.Codec;
+import org.apache.logging.log4j.Logger;
 
 public class StructureTemplatePool {
+    private static final Logger LOGGER;
+    public static final Codec<StructureTemplatePool> CODEC;
     public static final StructureTemplatePool EMPTY;
     public static final StructureTemplatePool INVALID;
     private final ResourceLocation name;
@@ -30,23 +41,23 @@ public class StructureTemplatePool {
     private final Projection projection;
     private int maxSize;
     
-    public StructureTemplatePool(final ResourceLocation sm1, final ResourceLocation sm2, final List<Pair<StructurePoolElement, Integer>> list, final Projection a) {
+    public StructureTemplatePool(final ResourceLocation uh1, final ResourceLocation uh2, final List<Pair<StructurePoolElement, Integer>> list, final Projection a) {
         this.maxSize = Integer.MIN_VALUE;
-        this.name = sm1;
+        this.name = uh1;
         this.rawTemplates = ImmutableList.<Pair<StructurePoolElement, Integer>>copyOf(list);
         this.templates = Lists.newArrayList();
         for (final Pair<StructurePoolElement, Integer> pair7 : list) {
-            for (Integer integer8 = 0; integer8 < (int)pair7.getSecond(); ++integer8) {
+            for (int integer8 = 0; integer8 < (int)pair7.getSecond(); ++integer8) {
                 this.templates.add(((StructurePoolElement)pair7.getFirst()).setProjection(a));
             }
         }
-        this.fallback = sm2;
+        this.fallback = uh2;
         this.projection = a;
     }
     
-    public int getMaxSize(final StructureManager cmo) {
+    public int getMaxSize(final StructureManager cva) {
         if (this.maxSize == Integer.MIN_VALUE) {
-            this.maxSize = this.templates.stream().mapToInt(cik -> cik.getBoundingBox(cmo, BlockPos.ZERO, Rotation.NONE).getYSpan()).max().orElse(0);
+            this.maxSize = this.templates.stream().mapToInt(cqd -> cqd.getBoundingBox(cva, BlockPos.ZERO, Rotation.NONE).getYSpan()).max().orElse(0);
         }
         return this.maxSize;
     }
@@ -72,14 +83,17 @@ public class StructureTemplatePool {
     }
     
     static {
+        LOGGER = LogManager.getLogger();
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)ResourceLocation.CODEC.fieldOf("name").forGetter((Function)StructureTemplatePool::getName), (App)ResourceLocation.CODEC.fieldOf("fallback").forGetter((Function)StructureTemplatePool::getFallback), (App)Codec.mapPair(StructurePoolElement.CODEC.fieldOf("element"), Codec.INT.fieldOf("weight")).codec().listOf().promotePartial((Consumer)Util.prefix("Pool element: ", StructureTemplatePool.LOGGER::error)).fieldOf("elements").forGetter(cqf -> cqf.rawTemplates), (App)Projection.CODEC.fieldOf("projection").forGetter(cqf -> cqf.projection)).apply(instance, StructureTemplatePool::new));
         EMPTY = new StructureTemplatePool(new ResourceLocation("empty"), new ResourceLocation("empty"), ImmutableList.of(), Projection.RIGID);
         INVALID = new StructureTemplatePool(new ResourceLocation("invalid"), new ResourceLocation("invalid"), ImmutableList.of(), Projection.RIGID);
     }
     
-    public enum Projection {
+    public enum Projection implements StringRepresentable {
         TERRAIN_MATCHING("terrain_matching", ImmutableList.of(new GravityProcessor(Heightmap.Types.WORLD_SURFACE_WG, -1))), 
         RIGID("rigid", ImmutableList.<StructureProcessor>of());
         
+        public static final Codec<Projection> CODEC;
         private static final Map<String, Projection> BY_NAME;
         private final String name;
         private final ImmutableList<StructureProcessor> processors;
@@ -101,7 +115,13 @@ public class StructureTemplatePool {
             return this.processors;
         }
         
+        @Override
+        public String getSerializedName() {
+            return this.name;
+        }
+        
         static {
+            CODEC = StringRepresentable.<Projection>fromEnum(Projection::values, Projection::byName);
             BY_NAME = Arrays.<Projection>stream(values()).collect(Collectors.toMap(Projection::getName, a -> a));
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/feature/structures/StructureTemplatePools.java b/src/net/minecraft/world/level/levelgen/feature/structures/StructureTemplatePools.java
index 829a55d..608e8db 100644
--- a/src/net/minecraft/world/level/levelgen/feature/structures/StructureTemplatePools.java
+++ b/src/net/minecraft/world/level/levelgen/feature/structures/StructureTemplatePools.java
@@ -12,12 +12,12 @@ public class StructureTemplatePools {
         this.register(StructureTemplatePool.EMPTY);
     }
     
-    public void register(final StructureTemplatePool cim) {
-        this.pools.put(cim.getName(), cim);
+    public void register(final StructureTemplatePool cqf) {
+        this.pools.put(cqf.getName(), cqf);
     }
     
-    public StructureTemplatePool getPool(final ResourceLocation sm) {
-        final StructureTemplatePool cim3 = this.pools.get(sm);
-        return (cim3 != null) ? cim3 : StructureTemplatePool.INVALID;
+    public StructureTemplatePool getPool(final ResourceLocation uh) {
+        final StructureTemplatePool cqf3 = this.pools.get(uh);
+        return (cqf3 != null) ? cqf3 : StructureTemplatePool.INVALID;
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/treedecorators/AlterGroundDecorator.java b/src/net/minecraft/world/level/levelgen/feature/treedecorators/AlterGroundDecorator.java
index b3df1da..301421e 100644
--- a/src/net/minecraft/world/level/levelgen/feature/treedecorators/AlterGroundDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/feature/treedecorators/AlterGroundDecorator.java
@@ -1,10 +1,8 @@
 package net.minecraft.world.level.levelgen.feature.treedecorators;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
 import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.levelgen.feature.AbstractTreeFeature;
+import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.LevelSimulatedRW;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import java.util.Set;
@@ -12,73 +10,69 @@ import net.minecraft.core.BlockPos;
 import java.util.List;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.resources.ResourceLocation;
-import java.util.function.Supplier;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProviderType;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;
+import com.mojang.serialization.Codec;
 
 public class AlterGroundDecorator extends TreeDecorator {
+    public static final Codec<AlterGroundDecorator> CODEC;
     private final BlockStateProvider provider;
     
-    public AlterGroundDecorator(final BlockStateProvider chw) {
-        super(TreeDecoratorType.ALTER_GROUND);
-        this.provider = chw;
-    }
-    
-    public <T> AlterGroundDecorator(final Dynamic<T> dynamic) {
-        this(Registry.BLOCKSTATE_PROVIDER_TYPES.get(new ResourceLocation(dynamic.get("provider").get("type").asString().<Throwable>orElseThrow(RuntimeException::new))).deserialize(dynamic.get("provider").orElseEmptyMap()));
+    public AlterGroundDecorator(final BlockStateProvider cpo) {
+        this.provider = cpo;
     }
     
     @Override
-    public void place(final LevelAccessor bjx, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox clb) {
+    protected TreeDecoratorType<?> type() {
+        return TreeDecoratorType.ALTER_GROUND;
+    }
+    
+    @Override
+    public void place(final LevelAccessor bqc, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox ctd) {
         final int integer8 = list3.get(0).getY();
         int integer9;
         int integer10;
         int integer11;
         int integer12;
-        list3.stream().filter(fk -> fk.getY() == integer8).forEach(fk -> {
-            this.placeCircle(bjx, random, fk.west().north());
-            this.placeCircle(bjx, random, fk.east(2).north());
-            this.placeCircle(bjx, random, fk.west().south(2));
-            this.placeCircle(bjx, random, fk.east(2).south(2));
+        list3.stream().filter(fu -> fu.getY() == integer8).forEach(fu -> {
+            this.placeCircle(bqc, random, fu.west().north());
+            this.placeCircle(bqc, random, fu.east(2).north());
+            this.placeCircle(bqc, random, fu.west().south(2));
+            this.placeCircle(bqc, random, fu.east(2).south(2));
             for (integer9 = 0; integer9 < 5; ++integer9) {
                 integer10 = random.nextInt(64);
                 integer11 = integer10 % 8;
                 integer12 = integer10 / 8;
                 if (integer11 == 0 || integer11 == 7 || integer12 == 0 || integer12 == 7) {
-                    this.placeCircle(bjx, random, fk.offset(-3 + integer11, 0, -3 + integer12));
+                    this.placeCircle(bqc, random, fu.offset(-3 + integer11, 0, -3 + integer12));
                 }
             }
         });
     }
     
-    private void placeCircle(final LevelSimulatedRW bkb, final Random random, final BlockPos fk) {
+    private void placeCircle(final LevelSimulatedRW bqf, final Random random, final BlockPos fu) {
         for (int integer5 = -2; integer5 <= 2; ++integer5) {
             for (int integer6 = -2; integer6 <= 2; ++integer6) {
                 if (Math.abs(integer5) != 2 || Math.abs(integer6) != 2) {
-                    this.placeBlockAt(bkb, random, fk.offset(integer5, 0, integer6));
+                    this.placeBlockAt(bqf, random, fu.offset(integer5, 0, integer6));
                 }
             }
         }
     }
     
-    private void placeBlockAt(final LevelSimulatedRW bkb, final Random random, final BlockPos fk) {
+    private void placeBlockAt(final LevelSimulatedRW bqf, final Random random, final BlockPos fu) {
         for (int integer5 = 2; integer5 >= -3; --integer5) {
-            final BlockPos fk2 = fk.above(integer5);
-            if (AbstractTreeFeature.isGrassOrDirt(bkb, fk2)) {
-                bkb.setBlock(fk2, this.provider.getState(random, fk), 19);
+            final BlockPos fu2 = fu.above(integer5);
+            if (Feature.isGrassOrDirt(bqf, fu2)) {
+                bqf.setBlock(fu2, this.provider.getState(random, fu), 19);
                 break;
             }
-            if (!AbstractTreeFeature.isAir(bkb, fk2) && integer5 < 0) {
+            if (!Feature.isAir(bqf, fu2) && integer5 < 0) {
                 break;
             }
         }
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("type"), dynamicOps.createString(Registry.TREE_DECORATOR_TYPES.getKey(this.type).toString()), dynamicOps.createString("provider"), this.provider.<V>serialize((com.mojang.datafixers.types.DynamicOps<V>)dynamicOps)))).getValue();
+    static {
+        CODEC = BlockStateProvider.CODEC.fieldOf("provider").xmap((Function)AlterGroundDecorator::new, cqi -> cqi.provider).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/treedecorators/BeehiveDecorator.java b/src/net/minecraft/world/level/levelgen/feature/treedecorators/BeehiveDecorator.java
index 7ba1abf..abcb20b 100644
--- a/src/net/minecraft/world/level/levelgen/feature/treedecorators/BeehiveDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/feature/treedecorators/BeehiveDecorator.java
@@ -1,10 +1,7 @@
 package net.minecraft.world.level.levelgen.feature.treedecorators;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
+import net.minecraft.world.level.block.state.StateHolder;
+import java.util.function.Function;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.animal.Bee;
@@ -16,7 +13,7 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.levelgen.feature.AbstractTreeFeature;
+import net.minecraft.world.level.levelgen.feature.Feature;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import net.minecraft.world.level.block.BeehiveBlock;
@@ -26,50 +23,50 @@ import net.minecraft.core.BlockPos;
 import java.util.List;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class BeehiveDecorator extends TreeDecorator {
+    public static final Codec<BeehiveDecorator> CODEC;
     private final float probability;
     
     public BeehiveDecorator(final float float1) {
-        super(TreeDecoratorType.BEEHIVE);
         this.probability = float1;
     }
     
-    public <T> BeehiveDecorator(final Dynamic<T> dynamic) {
-        this(dynamic.get("probability").asFloat(0.0f));
+    @Override
+    protected TreeDecoratorType<?> type() {
+        return TreeDecoratorType.BEEHIVE;
     }
     
     @Override
-    public void place(final LevelAccessor bjx, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox clb) {
+    public void place(final LevelAccessor bqc, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox ctd) {
         if (random.nextFloat() >= this.probability) {
             return;
         }
-        final Direction fp8 = BeehiveBlock.SPAWN_DIRECTIONS[random.nextInt(BeehiveBlock.SPAWN_DIRECTIONS.length)];
+        final Direction fz8 = BeehiveBlock.getRandomOffset(random);
         final int integer9 = list4.isEmpty() ? Math.min(list3.get(0).getY() + 1 + random.nextInt(3), list3.get(list3.size() - 1).getY()) : Math.max(list4.get(0).getY() - 1, list3.get(0).getY());
-        final List<BlockPos> list5 = list3.stream().filter(fk -> fk.getY() == integer9).collect(Collectors.toList());
+        final List<BlockPos> list5 = list3.stream().filter(fu -> fu.getY() == integer9).collect(Collectors.toList());
         if (list5.isEmpty()) {
             return;
         }
-        final BlockPos fk2 = list5.get(random.nextInt(list5.size()));
-        final BlockPos fk3 = fk2.relative(fp8);
-        if (!AbstractTreeFeature.isAir(bjx, fk3) || !AbstractTreeFeature.isAir(bjx, fk3.relative(Direction.SOUTH))) {
+        final BlockPos fu2 = list5.get(random.nextInt(list5.size()));
+        final BlockPos fu3 = fu2.relative(fz8);
+        if (!Feature.isAir(bqc, fu3) || !Feature.isAir(bqc, fu3.relative(Direction.SOUTH))) {
             return;
         }
-        final BlockState byj13 = ((AbstractStateHolder<O, BlockState>)Blocks.BEE_NEST.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BeehiveBlock.FACING, Direction.SOUTH);
-        this.setBlock(bjx, fk3, byj13, set, clb);
-        final BlockEntity bwl14 = bjx.getBlockEntity(fk3);
-        if (bwl14 instanceof BeehiveBlockEntity) {
-            final BeehiveBlockEntity bwi15 = (BeehiveBlockEntity)bwl14;
+        final BlockState cfj13 = ((StateHolder<O, BlockState>)Blocks.BEE_NEST.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)BeehiveBlock.FACING, Direction.SOUTH);
+        this.setBlock(bqc, fu3, cfj13, set, ctd);
+        final BlockEntity cdl14 = bqc.getBlockEntity(fu3);
+        if (cdl14 instanceof BeehiveBlockEntity) {
+            final BeehiveBlockEntity cdi15 = (BeehiveBlockEntity)cdl14;
             for (int integer10 = 2 + random.nextInt(2), integer11 = 0; integer11 < integer10; ++integer11) {
-                final Bee atd18 = new Bee(EntityType.BEE, bjx.getLevel());
-                bwi15.addOccupantWithPresetTicks(atd18, false, random.nextInt(599));
+                final Bee ayl18 = new Bee(EntityType.BEE, bqc.getLevel());
+                cdi15.addOccupantWithPresetTicks(ayl18, false, random.nextInt(599));
             }
         }
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("type"), dynamicOps.createString(Registry.TREE_DECORATOR_TYPES.getKey(this.type).toString()), dynamicOps.createString("probability"), dynamicOps.createFloat(this.probability)))).getValue();
+    static {
+        CODEC = Codec.FLOAT.fieldOf("probability").xmap((Function)BeehiveDecorator::new, cqj -> cqj.probability).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java b/src/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java
index a5defba..60e5057 100644
--- a/src/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java
@@ -1,10 +1,7 @@
 package net.minecraft.world.level.levelgen.feature.treedecorators;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
+import net.minecraft.world.level.block.state.StateHolder;
+import java.util.function.Function;
 import java.util.Iterator;
 import net.minecraft.world.level.LevelWriter;
 import net.minecraft.world.level.block.state.properties.Property;
@@ -12,7 +9,7 @@ import net.minecraft.world.level.block.CocoaBlock;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.levelgen.feature.AbstractTreeFeature;
+import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import java.util.Set;
@@ -20,41 +17,42 @@ import net.minecraft.core.BlockPos;
 import java.util.List;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class CocoaDecorator extends TreeDecorator {
+    public static final Codec<CocoaDecorator> CODEC;
     private final float probability;
     
     public CocoaDecorator(final float float1) {
-        super(TreeDecoratorType.COCOA);
         this.probability = float1;
     }
     
-    public <T> CocoaDecorator(final Dynamic<T> dynamic) {
-        this(dynamic.get("probability").asFloat(0.0f));
+    @Override
+    protected TreeDecoratorType<?> type() {
+        return TreeDecoratorType.COCOA;
     }
     
     @Override
-    public void place(final LevelAccessor bjx, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox clb) {
+    public void place(final LevelAccessor bqc, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox ctd) {
         if (random.nextFloat() >= this.probability) {
             return;
         }
         final int integer8 = list3.get(0).getY();
         final Iterator<Direction> iterator;
-        Direction fp8;
-        Direction fp9;
-        BlockPos fk2;
-        BlockState byj11;
-        list3.stream().filter(fk -> fk.getY() - integer8 <= 2).forEach(fk -> {
+        Direction fz8;
+        Direction fz9;
+        BlockPos fu2;
+        BlockState cfj11;
+        list3.stream().filter(fu -> fu.getY() - integer8 <= 2).forEach(fu -> {
             Direction.Plane.HORIZONTAL.iterator();
             while (iterator.hasNext()) {
-                fp8 = iterator.next();
+                fz8 = iterator.next();
                 if (random.nextFloat() <= 0.25f) {
-                    fp9 = fp8.getOpposite();
-                    fk2 = fk.offset(fp9.getStepX(), 0, fp9.getStepZ());
-                    if (AbstractTreeFeature.isAir(bjx, fk2)) {
-                        byj11 = (((AbstractStateHolder<O, BlockState>)Blocks.COCOA.defaultBlockState()).setValue((Property<Comparable>)CocoaBlock.AGE, random.nextInt(3))).<Comparable, Direction>setValue((Property<Comparable>)CocoaBlock.FACING, fp8);
-                        this.setBlock(bjx, fk2, byj11, set, clb);
+                    fz9 = fz8.getOpposite();
+                    fu2 = fu.offset(fz9.getStepX(), 0, fz9.getStepZ());
+                    if (Feature.isAir(bqc, fu2)) {
+                        cfj11 = (((StateHolder<O, BlockState>)Blocks.COCOA.defaultBlockState()).setValue((Property<Comparable>)CocoaBlock.AGE, random.nextInt(3))).<Comparable, Direction>setValue((Property<Comparable>)CocoaBlock.FACING, fz8);
+                        this.setBlock(bqc, fu2, cfj11, set, ctd);
                     }
                     else {
                         continue;
@@ -64,8 +62,7 @@ public class CocoaDecorator extends TreeDecorator {
         });
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("type"), dynamicOps.createString(Registry.TREE_DECORATOR_TYPES.getKey(this.type).toString()), dynamicOps.createString("probability"), dynamicOps.createFloat(this.probability)))).getValue();
+    static {
+        CODEC = Codec.FLOAT.fieldOf("probability").xmap((Function)CocoaDecorator::new, cqk -> cqk.probability).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/treedecorators/LeaveVineDecorator.java b/src/net/minecraft/world/level/levelgen/feature/treedecorators/LeaveVineDecorator.java
index 18fec0d..ef854df 100644
--- a/src/net/minecraft/world/level/levelgen/feature/treedecorators/LeaveVineDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/feature/treedecorators/LeaveVineDecorator.java
@@ -1,76 +1,72 @@
 package net.minecraft.world.level.levelgen.feature.treedecorators;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.LevelWriter;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.LevelSimulatedRW;
 import net.minecraft.world.level.block.VineBlock;
 import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.levelgen.feature.AbstractTreeFeature;
+import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import java.util.Set;
 import net.minecraft.core.BlockPos;
 import java.util.List;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class LeaveVineDecorator extends TreeDecorator {
-    public LeaveVineDecorator() {
-        super(TreeDecoratorType.LEAVE_VINE);
-    }
+    public static final Codec<LeaveVineDecorator> CODEC;
+    public static final LeaveVineDecorator INSTANCE;
     
-    public <T> LeaveVineDecorator(final Dynamic<T> dynamic) {
-        this();
+    @Override
+    protected TreeDecoratorType<?> type() {
+        return TreeDecoratorType.LEAVE_VINE;
     }
     
     @Override
-    public void place(final LevelAccessor bjx, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox clb) {
-        BlockPos fk2;
-        BlockPos fk3;
-        BlockPos fk4;
-        BlockPos fk5;
-        list4.forEach(fk -> {
+    public void place(final LevelAccessor bqc, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox ctd) {
+        BlockPos fu2;
+        BlockPos fu3;
+        BlockPos fu4;
+        BlockPos fu5;
+        list4.forEach(fu -> {
             if (random.nextInt(4) == 0) {
-                fk2 = fk.west();
-                if (AbstractTreeFeature.isAir(bjx, fk2)) {
-                    this.addHangingVine(bjx, fk2, VineBlock.EAST, set, clb);
+                fu2 = fu.west();
+                if (Feature.isAir(bqc, fu2)) {
+                    this.addHangingVine(bqc, fu2, VineBlock.EAST, set, ctd);
                 }
             }
             if (random.nextInt(4) == 0) {
-                fk3 = fk.east();
-                if (AbstractTreeFeature.isAir(bjx, fk3)) {
-                    this.addHangingVine(bjx, fk3, VineBlock.WEST, set, clb);
+                fu3 = fu.east();
+                if (Feature.isAir(bqc, fu3)) {
+                    this.addHangingVine(bqc, fu3, VineBlock.WEST, set, ctd);
                 }
             }
             if (random.nextInt(4) == 0) {
-                fk4 = fk.north();
-                if (AbstractTreeFeature.isAir(bjx, fk4)) {
-                    this.addHangingVine(bjx, fk4, VineBlock.SOUTH, set, clb);
+                fu4 = fu.north();
+                if (Feature.isAir(bqc, fu4)) {
+                    this.addHangingVine(bqc, fu4, VineBlock.SOUTH, set, ctd);
                 }
             }
             if (random.nextInt(4) == 0) {
-                fk5 = fk.south();
-                if (AbstractTreeFeature.isAir(bjx, fk5)) {
-                    this.addHangingVine(bjx, fk5, VineBlock.NORTH, set, clb);
+                fu5 = fu.south();
+                if (Feature.isAir(bqc, fu5)) {
+                    this.addHangingVine(bqc, fu5, VineBlock.NORTH, set, ctd);
                 }
             }
         });
     }
     
-    private void addHangingVine(final LevelSimulatedRW bkb, BlockPos fk, final BooleanProperty bzb, final Set<BlockPos> set, final BoundingBox clb) {
-        this.placeVine(bkb, fk, bzb, set, clb);
+    private void addHangingVine(final LevelSimulatedRW bqf, BlockPos fu, final BooleanProperty cga, final Set<BlockPos> set, final BoundingBox ctd) {
+        this.placeVine(bqf, fu, cga, set, ctd);
         int integer7;
-        for (integer7 = 4, fk = fk.below(); AbstractTreeFeature.isAir(bkb, fk) && integer7 > 0; fk = fk.below(), --integer7) {
-            this.placeVine(bkb, fk, bzb, set, clb);
+        for (integer7 = 4, fu = fu.below(); Feature.isAir(bqf, fu) && integer7 > 0; fu = fu.below(), --integer7) {
+            this.placeVine(bqf, fu, cga, set, ctd);
         }
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("type"), dynamicOps.createString(Registry.TREE_DECORATOR_TYPES.getKey(this.type).toString())))).getValue();
+    static {
+        CODEC = Codec.unit(() -> LeaveVineDecorator.INSTANCE);
+        INSTANCE = new LeaveVineDecorator();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator.java b/src/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator.java
index 208d566..6cb8fa0 100644
--- a/src/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator.java
@@ -1,6 +1,8 @@
 package net.minecraft.world.level.levelgen.feature.treedecorators;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
+import java.util.function.Function;
+import net.minecraft.core.Registry;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.Blocks;
@@ -13,24 +15,26 @@ import net.minecraft.core.BlockPos;
 import java.util.List;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.util.Serializable;
+import com.mojang.serialization.Codec;
 
-public abstract class TreeDecorator implements Serializable {
-    protected final TreeDecoratorType<?> type;
+public abstract class TreeDecorator {
+    public static final Codec<TreeDecorator> CODEC;
     
-    protected TreeDecorator(final TreeDecoratorType<?> ciu) {
-        this.type = ciu;
+    protected abstract TreeDecoratorType<?> type();
+    
+    public abstract void place(final LevelAccessor bqc, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox ctd);
+    
+    protected void placeVine(final LevelWriter bqh, final BlockPos fu, final BooleanProperty cga, final Set<BlockPos> set, final BoundingBox ctd) {
+        this.setBlock(bqh, fu, ((StateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)cga, true), set, ctd);
     }
     
-    public abstract void place(final LevelAccessor bjx, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox clb);
-    
-    protected void placeVine(final LevelWriter bke, final BlockPos fk, final BooleanProperty bzb, final Set<BlockPos> set, final BoundingBox clb) {
-        this.setBlock(bke, fk, ((AbstractStateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)bzb, true), set, clb);
+    protected void setBlock(final LevelWriter bqh, final BlockPos fu, final BlockState cfj, final Set<BlockPos> set, final BoundingBox ctd) {
+        bqh.setBlock(fu, cfj, 19);
+        set.add(fu);
+        ctd.expand(new BoundingBox(fu, fu));
     }
     
-    protected void setBlock(final LevelWriter bke, final BlockPos fk, final BlockState byj, final Set<BlockPos> set, final BoundingBox clb) {
-        bke.setBlock(fk, byj, 19);
-        set.add(fk);
-        clb.expand(new BoundingBox(fk, fk));
+    static {
+        CODEC = Registry.TREE_DECORATOR_TYPES.dispatch((Function)TreeDecorator::type, (Function)TreeDecoratorType::codec);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecoratorType.java b/src/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecoratorType.java
index 2560502..b638d43 100644
--- a/src/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecoratorType.java
+++ b/src/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecoratorType.java
@@ -1,8 +1,7 @@
 package net.minecraft.world.level.levelgen.feature.treedecorators;
 
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class TreeDecoratorType<P extends TreeDecorator> {
     public static final TreeDecoratorType<TrunkVineDecorator> TRUNK_VINE;
@@ -10,25 +9,25 @@ public class TreeDecoratorType<P extends TreeDecorator> {
     public static final TreeDecoratorType<CocoaDecorator> COCOA;
     public static final TreeDecoratorType<BeehiveDecorator> BEEHIVE;
     public static final TreeDecoratorType<AlterGroundDecorator> ALTER_GROUND;
-    private final Function<Dynamic<?>, P> deserializer;
+    private final Codec<P> codec;
     
-    private static <P extends TreeDecorator> TreeDecoratorType<P> register(final String string, final Function<Dynamic<?>, P> function) {
-        return Registry.<TreeDecoratorType<P>>register(Registry.TREE_DECORATOR_TYPES, string, new TreeDecoratorType<P>(function));
+    private static <P extends TreeDecorator> TreeDecoratorType<P> register(final String string, final Codec<P> codec) {
+        return Registry.<TreeDecoratorType<P>>register(Registry.TREE_DECORATOR_TYPES, string, new TreeDecoratorType<P>(codec));
     }
     
-    private TreeDecoratorType(final Function<Dynamic<?>, P> function) {
-        this.deserializer = function;
+    private TreeDecoratorType(final Codec<P> codec) {
+        this.codec = codec;
     }
     
-    public P deserialize(final Dynamic<?> dynamic) {
-        return this.deserializer.apply(dynamic);
+    public Codec<P> codec() {
+        return this.codec;
     }
     
     static {
-        TRUNK_VINE = TreeDecoratorType.<TrunkVineDecorator>register("trunk_vine", TrunkVineDecorator::new);
-        LEAVE_VINE = TreeDecoratorType.<LeaveVineDecorator>register("leave_vine", LeaveVineDecorator::new);
-        COCOA = TreeDecoratorType.<CocoaDecorator>register("cocoa", CocoaDecorator::new);
-        BEEHIVE = TreeDecoratorType.<BeehiveDecorator>register("beehive", BeehiveDecorator::new);
-        ALTER_GROUND = TreeDecoratorType.<AlterGroundDecorator>register("alter_ground", AlterGroundDecorator::new);
+        TRUNK_VINE = TreeDecoratorType.<TrunkVineDecorator>register("trunk_vine", TrunkVineDecorator.CODEC);
+        LEAVE_VINE = TreeDecoratorType.<LeaveVineDecorator>register("leave_vine", LeaveVineDecorator.CODEC);
+        COCOA = TreeDecoratorType.<CocoaDecorator>register("cocoa", CocoaDecorator.CODEC);
+        BEEHIVE = TreeDecoratorType.<BeehiveDecorator>register("beehive", BeehiveDecorator.CODEC);
+        ALTER_GROUND = TreeDecoratorType.<AlterGroundDecorator>register("alter_ground", AlterGroundDecorator.CODEC);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/treedecorators/TrunkVineDecorator.java b/src/net/minecraft/world/level/levelgen/feature/treedecorators/TrunkVineDecorator.java
index 477718d..8f8d9ad 100644
--- a/src/net/minecraft/world/level/levelgen/feature/treedecorators/TrunkVineDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/feature/treedecorators/TrunkVineDecorator.java
@@ -1,66 +1,62 @@
 package net.minecraft.world.level.levelgen.feature.treedecorators;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.LevelWriter;
 import net.minecraft.world.level.block.VineBlock;
 import net.minecraft.world.level.LevelSimulatedReader;
-import net.minecraft.world.level.levelgen.feature.AbstractTreeFeature;
+import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import java.util.Set;
 import net.minecraft.core.BlockPos;
 import java.util.List;
 import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class TrunkVineDecorator extends TreeDecorator {
-    public TrunkVineDecorator() {
-        super(TreeDecoratorType.TRUNK_VINE);
-    }
+    public static final Codec<TrunkVineDecorator> CODEC;
+    public static final TrunkVineDecorator INSTANCE;
     
-    public <T> TrunkVineDecorator(final Dynamic<T> dynamic) {
-        this();
+    @Override
+    protected TreeDecoratorType<?> type() {
+        return TreeDecoratorType.TRUNK_VINE;
     }
     
     @Override
-    public void place(final LevelAccessor bjx, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox clb) {
-        BlockPos fk2;
-        BlockPos fk3;
-        BlockPos fk4;
-        BlockPos fk5;
-        list3.forEach(fk -> {
+    public void place(final LevelAccessor bqc, final Random random, final List<BlockPos> list3, final List<BlockPos> list4, final Set<BlockPos> set, final BoundingBox ctd) {
+        BlockPos fu2;
+        BlockPos fu3;
+        BlockPos fu4;
+        BlockPos fu5;
+        list3.forEach(fu -> {
             if (random.nextInt(3) > 0) {
-                fk2 = fk.west();
-                if (AbstractTreeFeature.isAir(bjx, fk2)) {
-                    this.placeVine(bjx, fk2, VineBlock.EAST, set, clb);
+                fu2 = fu.west();
+                if (Feature.isAir(bqc, fu2)) {
+                    this.placeVine(bqc, fu2, VineBlock.EAST, set, ctd);
                 }
             }
             if (random.nextInt(3) > 0) {
-                fk3 = fk.east();
-                if (AbstractTreeFeature.isAir(bjx, fk3)) {
-                    this.placeVine(bjx, fk3, VineBlock.WEST, set, clb);
+                fu3 = fu.east();
+                if (Feature.isAir(bqc, fu3)) {
+                    this.placeVine(bqc, fu3, VineBlock.WEST, set, ctd);
                 }
             }
             if (random.nextInt(3) > 0) {
-                fk4 = fk.north();
-                if (AbstractTreeFeature.isAir(bjx, fk4)) {
-                    this.placeVine(bjx, fk4, VineBlock.SOUTH, set, clb);
+                fu4 = fu.north();
+                if (Feature.isAir(bqc, fu4)) {
+                    this.placeVine(bqc, fu4, VineBlock.SOUTH, set, ctd);
                 }
             }
             if (random.nextInt(3) > 0) {
-                fk5 = fk.south();
-                if (AbstractTreeFeature.isAir(bjx, fk5)) {
-                    this.placeVine(bjx, fk5, VineBlock.NORTH, set, clb);
+                fu5 = fu.south();
+                if (Feature.isAir(bqc, fu5)) {
+                    this.placeVine(bqc, fu5, VineBlock.NORTH, set, ctd);
                 }
             }
         });
     }
     
-    @Override
-    public <T> T serialize(final DynamicOps<T> dynamicOps) {
-        return (T)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("type"), dynamicOps.createString(Registry.TREE_DECORATOR_TYPES.getKey(this.type).toString())))).getValue();
+    static {
+        CODEC = Codec.unit(() -> TrunkVineDecorator.INSTANCE);
+        INSTANCE = new TrunkVineDecorator();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/feature/trunkplacers/DarkOakTrunkPlacer.java b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/DarkOakTrunkPlacer.java
new file mode 100644
index 0000000..4645bf4
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/DarkOakTrunkPlacer.java
@@ -0,0 +1,83 @@
+package net.minecraft.world.level.levelgen.feature.trunkplacers;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.LevelSimulatedReader;
+import net.minecraft.world.level.levelgen.feature.TreeFeature;
+import net.minecraft.core.Direction;
+import com.google.common.collect.Lists;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
+import java.util.List;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import java.util.Set;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class DarkOakTrunkPlacer extends TrunkPlacer {
+    public static final Codec<DarkOakTrunkPlacer> CODEC;
+    
+    public DarkOakTrunkPlacer(final int integer1, final int integer2, final int integer3) {
+        super(integer1, integer2, integer3);
+    }
+    
+    @Override
+    protected TrunkPlacerType<?> type() {
+        return TrunkPlacerType.DARK_OAK_TRUNK_PLACER;
+    }
+    
+    @Override
+    public List<FoliagePlacer.FoliageAttachment> placeTrunk(final LevelSimulatedRW bqf, final Random random, final int integer, final BlockPos fu, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou) {
+        final List<FoliagePlacer.FoliageAttachment> list9 = Lists.newArrayList();
+        final BlockPos fu2 = fu.below();
+        TrunkPlacer.setDirtAt(bqf, fu2);
+        TrunkPlacer.setDirtAt(bqf, fu2.east());
+        TrunkPlacer.setDirtAt(bqf, fu2.south());
+        TrunkPlacer.setDirtAt(bqf, fu2.south().east());
+        final Direction fz11 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
+        final int integer2 = integer - random.nextInt(4);
+        int integer3 = 2 - random.nextInt(3);
+        final int integer4 = fu.getX();
+        final int integer5 = fu.getY();
+        final int integer6 = fu.getZ();
+        int integer7 = integer4;
+        int integer8 = integer6;
+        final int integer9 = integer5 + integer - 1;
+        for (int integer10 = 0; integer10 < integer; ++integer10) {
+            if (integer10 >= integer2 && integer3 > 0) {
+                integer7 += fz11.getStepX();
+                integer8 += fz11.getStepZ();
+                --integer3;
+            }
+            final int integer11 = integer5 + integer10;
+            final BlockPos fu3 = new BlockPos(integer7, integer11, integer8);
+            if (TreeFeature.isAirOrLeaves(bqf, fu3)) {
+                TrunkPlacer.placeLog(bqf, random, fu3, set, ctd, cou);
+                TrunkPlacer.placeLog(bqf, random, fu3.east(), set, ctd, cou);
+                TrunkPlacer.placeLog(bqf, random, fu3.south(), set, ctd, cou);
+                TrunkPlacer.placeLog(bqf, random, fu3.east().south(), set, ctd, cou);
+            }
+        }
+        list9.add(new FoliagePlacer.FoliageAttachment(new BlockPos(integer7, integer9, integer8), 0, true));
+        for (int integer10 = -1; integer10 <= 2; ++integer10) {
+            for (int integer11 = -1; integer11 <= 2; ++integer11) {
+                if (integer10 < 0 || integer10 > 1 || integer11 < 0 || integer11 > 1) {
+                    if (random.nextInt(3) <= 0) {
+                        for (int integer12 = random.nextInt(3) + 2, integer13 = 0; integer13 < integer12; ++integer13) {
+                            TrunkPlacer.placeLog(bqf, random, new BlockPos(integer4 + integer10, integer9 - integer13 - 1, integer6 + integer11), set, ctd, cou);
+                        }
+                        list9.add(new FoliagePlacer.FoliageAttachment(new BlockPos(integer7 + integer10, integer9, integer8 + integer11), 0, false));
+                    }
+                }
+            }
+        }
+        return list9;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> TrunkPlacer.<TrunkPlacer>trunkPlacerParts((RecordCodecBuilder.Instance<TrunkPlacer>)instance).apply(instance, DarkOakTrunkPlacer::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/trunkplacers/FancyTrunkPlacer.java b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/FancyTrunkPlacer.java
new file mode 100644
index 0000000..fee0319
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/FancyTrunkPlacer.java
@@ -0,0 +1,182 @@
+package net.minecraft.world.level.levelgen.feature.trunkplacers;
+
+import net.minecraft.world.level.block.state.StateHolder;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.LevelSimulatedReader;
+import net.minecraft.world.level.levelgen.feature.TreeFeature;
+import net.minecraft.world.level.LevelWriter;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.RotatedPillarBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.Objects;
+import java.util.Iterator;
+import com.google.common.collect.Lists;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
+import java.util.List;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import java.util.Set;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class FancyTrunkPlacer extends TrunkPlacer {
+    public static final Codec<FancyTrunkPlacer> CODEC;
+    
+    public FancyTrunkPlacer(final int integer1, final int integer2, final int integer3) {
+        super(integer1, integer2, integer3);
+    }
+    
+    @Override
+    protected TrunkPlacerType<?> type() {
+        return TrunkPlacerType.FANCY_TRUNK_PLACER;
+    }
+    
+    @Override
+    public List<FoliagePlacer.FoliageAttachment> placeTrunk(final LevelSimulatedRW bqf, final Random random, final int integer, final BlockPos fu, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou) {
+        final int integer2 = 5;
+        final int integer3 = integer + 2;
+        final int integer4 = Mth.floor(integer3 * 0.618);
+        if (!cou.fromSapling) {
+            TrunkPlacer.setDirtAt(bqf, fu.below());
+        }
+        final double double12 = 1.0;
+        final int integer5 = Math.min(1, Mth.floor(1.382 + Math.pow(1.0 * integer3 / 13.0, 2.0)));
+        final int integer6 = fu.getY() + integer4;
+        int integer7 = integer3 - 5;
+        final List<FoliageCoords> list17 = Lists.newArrayList();
+        list17.add(new FoliageCoords(fu.above(integer7), integer6));
+        while (integer7 >= 0) {
+            final float float18 = this.treeShape(integer3, integer7);
+            if (float18 >= 0.0f) {
+                for (int integer8 = 0; integer8 < integer5; ++integer8) {
+                    final double double13 = 1.0;
+                    final double double14 = 1.0 * float18 * (random.nextFloat() + 0.328);
+                    final double double15 = random.nextFloat() * 2.0f * 3.141592653589793;
+                    final double double16 = double14 * Math.sin(double15) + 0.5;
+                    final double double17 = double14 * Math.cos(double15) + 0.5;
+                    final BlockPos fu2 = fu.offset(double16, integer7 - 1, double17);
+                    final BlockPos fu3 = fu2.above(5);
+                    if (this.makeLimb(bqf, random, fu2, fu3, false, set, ctd, cou)) {
+                        final int integer9 = fu.getX() - fu2.getX();
+                        final int integer10 = fu.getZ() - fu2.getZ();
+                        final double double18 = fu2.getY() - Math.sqrt(integer9 * integer9 + integer10 * integer10) * 0.381;
+                        final int integer11 = (double18 > integer6) ? integer6 : ((int)double18);
+                        final BlockPos fu4 = new BlockPos(fu.getX(), integer11, fu.getZ());
+                        if (this.makeLimb(bqf, random, fu4, fu2, false, set, ctd, cou)) {
+                            list17.add(new FoliageCoords(fu2, fu4.getY()));
+                        }
+                    }
+                }
+            }
+            --integer7;
+        }
+        this.makeLimb(bqf, random, fu, fu.above(integer4), true, set, ctd, cou);
+        this.makeBranches(bqf, random, integer3, fu, list17, set, ctd, cou);
+        final List<FoliagePlacer.FoliageAttachment> list18 = Lists.newArrayList();
+        for (final FoliageCoords a20 : list17) {
+            if (this.trimBranches(integer3, a20.getBranchBase() - fu.getY())) {
+                list18.add(a20.attachment);
+            }
+        }
+        return list18;
+    }
+    
+    private boolean makeLimb(final LevelSimulatedRW bqf, final Random random, final BlockPos fu3, final BlockPos fu4, final boolean boolean5, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou) {
+        if (!boolean5 && Objects.equals(fu3, fu4)) {
+            return true;
+        }
+        final BlockPos fu5 = fu4.offset(-fu3.getX(), -fu3.getY(), -fu3.getZ());
+        final int integer11 = this.getSteps(fu5);
+        final float float12 = fu5.getX() / (float)integer11;
+        final float float13 = fu5.getY() / (float)integer11;
+        final float float14 = fu5.getZ() / (float)integer11;
+        for (int integer12 = 0; integer12 <= integer11; ++integer12) {
+            final BlockPos fu6 = fu3.offset(0.5f + integer12 * float12, 0.5f + integer12 * float13, 0.5f + integer12 * float14);
+            if (boolean5) {
+                TrunkPlacer.setBlock(bqf, fu6, ((StateHolder<O, BlockState>)cou.trunkProvider.getState(random, fu6)).<Direction.Axis, Direction.Axis>setValue(RotatedPillarBlock.AXIS, this.getLogAxis(fu3, fu6)), ctd);
+                set.add(fu6.immutable());
+            }
+            else if (!TreeFeature.isFree(bqf, fu6)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    private int getSteps(final BlockPos fu) {
+        final int integer3 = Mth.abs(fu.getX());
+        final int integer4 = Mth.abs(fu.getY());
+        final int integer5 = Mth.abs(fu.getZ());
+        return Math.max(integer3, Math.max(integer4, integer5));
+    }
+    
+    private Direction.Axis getLogAxis(final BlockPos fu1, final BlockPos fu2) {
+        Direction.Axis a4 = Direction.Axis.Y;
+        final int integer5 = Math.abs(fu2.getX() - fu1.getX());
+        final int integer6 = Math.abs(fu2.getZ() - fu1.getZ());
+        final int integer7 = Math.max(integer5, integer6);
+        if (integer7 > 0) {
+            if (integer5 == integer7) {
+                a4 = Direction.Axis.X;
+            }
+            else {
+                a4 = Direction.Axis.Z;
+            }
+        }
+        return a4;
+    }
+    
+    private boolean trimBranches(final int integer1, final int integer2) {
+        return integer2 >= integer1 * 0.2;
+    }
+    
+    private void makeBranches(final LevelSimulatedRW bqf, final Random random, final int integer, final BlockPos fu, final List<FoliageCoords> list, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou) {
+        for (final FoliageCoords a11 : list) {
+            final int integer2 = a11.getBranchBase();
+            final BlockPos fu2 = new BlockPos(fu.getX(), integer2, fu.getZ());
+            if (!fu2.equals(a11.attachment.foliagePos()) && this.trimBranches(integer, integer2 - fu.getY())) {
+                this.makeLimb(bqf, random, fu2, a11.attachment.foliagePos(), true, set, ctd, cou);
+            }
+        }
+    }
+    
+    private float treeShape(final int integer1, final int integer2) {
+        if (integer2 < integer1 * 0.3f) {
+            return -1.0f;
+        }
+        final float float4 = integer1 / 2.0f;
+        final float float5 = float4 - integer2;
+        float float6 = Mth.sqrt(float4 * float4 - float5 * float5);
+        if (float5 == 0.0f) {
+            float6 = float4;
+        }
+        else if (Math.abs(float5) >= float4) {
+            return 0.0f;
+        }
+        return float6 * 0.5f;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> TrunkPlacer.<TrunkPlacer>trunkPlacerParts((RecordCodecBuilder.Instance<TrunkPlacer>)instance).apply(instance, FancyTrunkPlacer::new));
+    }
+    
+    static class FoliageCoords {
+        private final FoliagePlacer.FoliageAttachment attachment;
+        private final int branchBase;
+        
+        public FoliageCoords(final BlockPos fu, final int integer) {
+            this.attachment = new FoliagePlacer.FoliageAttachment(fu, 0, false);
+            this.branchBase = integer;
+        }
+        
+        public int getBranchBase() {
+            return this.branchBase;
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/trunkplacers/ForkingTrunkPlacer.java b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/ForkingTrunkPlacer.java
new file mode 100644
index 0000000..1bb2e40
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/ForkingTrunkPlacer.java
@@ -0,0 +1,80 @@
+package net.minecraft.world.level.levelgen.feature.trunkplacers;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.core.Direction;
+import com.google.common.collect.Lists;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
+import java.util.List;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import java.util.Set;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class ForkingTrunkPlacer extends TrunkPlacer {
+    public static final Codec<ForkingTrunkPlacer> CODEC;
+    
+    public ForkingTrunkPlacer(final int integer1, final int integer2, final int integer3) {
+        super(integer1, integer2, integer3);
+    }
+    
+    @Override
+    protected TrunkPlacerType<?> type() {
+        return TrunkPlacerType.FORKING_TRUNK_PLACER;
+    }
+    
+    @Override
+    public List<FoliagePlacer.FoliageAttachment> placeTrunk(final LevelSimulatedRW bqf, final Random random, final int integer, final BlockPos fu, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou) {
+        TrunkPlacer.setDirtAt(bqf, fu.below());
+        final List<FoliagePlacer.FoliageAttachment> list9 = Lists.newArrayList();
+        final Direction fz10 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
+        final int integer2 = integer - random.nextInt(4) - 1;
+        int integer3 = 3 - random.nextInt(3);
+        final BlockPos.MutableBlockPos a13 = new BlockPos.MutableBlockPos();
+        int integer4 = fu.getX();
+        int integer5 = fu.getZ();
+        int integer6 = 0;
+        for (int integer7 = 0; integer7 < integer; ++integer7) {
+            final int integer8 = fu.getY() + integer7;
+            if (integer7 >= integer2 && integer3 > 0) {
+                integer4 += fz10.getStepX();
+                integer5 += fz10.getStepZ();
+                --integer3;
+            }
+            if (TrunkPlacer.placeLog(bqf, random, a13.set(integer4, integer8, integer5), set, ctd, cou)) {
+                integer6 = integer8 + 1;
+            }
+        }
+        list9.add(new FoliagePlacer.FoliageAttachment(new BlockPos(integer4, integer6, integer5), 1, false));
+        integer4 = fu.getX();
+        integer5 = fu.getZ();
+        final Direction fz11 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
+        if (fz11 != fz10) {
+            final int integer8 = integer2 - random.nextInt(2) - 1;
+            int integer9 = 1 + random.nextInt(3);
+            integer6 = 0;
+            for (int integer10 = integer8; integer10 < integer && integer9 > 0; ++integer10, --integer9) {
+                if (integer10 >= 1) {
+                    final int integer11 = fu.getY() + integer10;
+                    integer4 += fz11.getStepX();
+                    integer5 += fz11.getStepZ();
+                    if (TrunkPlacer.placeLog(bqf, random, a13.set(integer4, integer11, integer5), set, ctd, cou)) {
+                        integer6 = integer11 + 1;
+                    }
+                }
+            }
+            if (integer6 > 1) {
+                list9.add(new FoliagePlacer.FoliageAttachment(new BlockPos(integer4, integer6, integer5), 0, false));
+            }
+        }
+        return list9;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> TrunkPlacer.<TrunkPlacer>trunkPlacerParts((RecordCodecBuilder.Instance<TrunkPlacer>)instance).apply(instance, ForkingTrunkPlacer::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/trunkplacers/GiantTrunkPlacer.java b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/GiantTrunkPlacer.java
new file mode 100644
index 0000000..dc241bc
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/GiantTrunkPlacer.java
@@ -0,0 +1,57 @@
+package net.minecraft.world.level.levelgen.feature.trunkplacers;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.core.Vec3i;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
+import java.util.List;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import java.util.Set;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class GiantTrunkPlacer extends TrunkPlacer {
+    public static final Codec<GiantTrunkPlacer> CODEC;
+    
+    public GiantTrunkPlacer(final int integer1, final int integer2, final int integer3) {
+        super(integer1, integer2, integer3);
+    }
+    
+    @Override
+    protected TrunkPlacerType<?> type() {
+        return TrunkPlacerType.GIANT_TRUNK_PLACER;
+    }
+    
+    @Override
+    public List<FoliagePlacer.FoliageAttachment> placeTrunk(final LevelSimulatedRW bqf, final Random random, final int integer, final BlockPos fu, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou) {
+        final BlockPos fu2 = fu.below();
+        TrunkPlacer.setDirtAt(bqf, fu2);
+        TrunkPlacer.setDirtAt(bqf, fu2.east());
+        TrunkPlacer.setDirtAt(bqf, fu2.south());
+        TrunkPlacer.setDirtAt(bqf, fu2.south().east());
+        final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
+        for (int integer2 = 0; integer2 < integer; ++integer2) {
+            placeLogIfFreeWithOffset(bqf, random, a10, set, ctd, cou, fu, 0, integer2, 0);
+            if (integer2 < integer - 1) {
+                placeLogIfFreeWithOffset(bqf, random, a10, set, ctd, cou, fu, 1, integer2, 0);
+                placeLogIfFreeWithOffset(bqf, random, a10, set, ctd, cou, fu, 1, integer2, 1);
+                placeLogIfFreeWithOffset(bqf, random, a10, set, ctd, cou, fu, 0, integer2, 1);
+            }
+        }
+        return ImmutableList.<FoliagePlacer.FoliageAttachment>of(new FoliagePlacer.FoliageAttachment(fu.above(integer), 0, true));
+    }
+    
+    private static void placeLogIfFreeWithOffset(final LevelSimulatedRW bqf, final Random random, final BlockPos.MutableBlockPos a, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou, final BlockPos fu, final int integer8, final int integer9, final int integer10) {
+        a.setWithOffset(fu, integer8, integer9, integer10);
+        TrunkPlacer.placeLogIfFree(bqf, random, a, set, ctd, cou);
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> TrunkPlacer.<TrunkPlacer>trunkPlacerParts((RecordCodecBuilder.Instance<TrunkPlacer>)instance).apply(instance, GiantTrunkPlacer::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/trunkplacers/MegaJungleTrunkPlacer.java b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/MegaJungleTrunkPlacer.java
new file mode 100644
index 0000000..9794531
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/MegaJungleTrunkPlacer.java
@@ -0,0 +1,53 @@
+package net.minecraft.world.level.levelgen.feature.trunkplacers;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.util.Mth;
+import java.util.Collection;
+import com.google.common.collect.Lists;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
+import java.util.List;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import java.util.Set;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class MegaJungleTrunkPlacer extends GiantTrunkPlacer {
+    public static final Codec<MegaJungleTrunkPlacer> CODEC;
+    
+    public MegaJungleTrunkPlacer(final int integer1, final int integer2, final int integer3) {
+        super(integer1, integer2, integer3);
+    }
+    
+    @Override
+    protected TrunkPlacerType<?> type() {
+        return TrunkPlacerType.MEGA_JUNGLE_TRUNK_PLACER;
+    }
+    
+    @Override
+    public List<FoliagePlacer.FoliageAttachment> placeTrunk(final LevelSimulatedRW bqf, final Random random, final int integer, final BlockPos fu, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou) {
+        final List<FoliagePlacer.FoliageAttachment> list9 = Lists.newArrayList();
+        list9.addAll(super.placeTrunk(bqf, random, integer, fu, set, ctd, cou));
+        for (int integer2 = integer - 2 - random.nextInt(4); integer2 > integer / 2; integer2 -= 2 + random.nextInt(4)) {
+            final float float11 = random.nextFloat() * 6.2831855f;
+            int integer3 = 0;
+            int integer4 = 0;
+            for (int integer5 = 0; integer5 < 5; ++integer5) {
+                integer3 = (int)(1.5f + Mth.cos(float11) * integer5);
+                integer4 = (int)(1.5f + Mth.sin(float11) * integer5);
+                final BlockPos fu2 = fu.offset(integer3, integer2 - 3 + integer5 / 2, integer4);
+                TrunkPlacer.placeLog(bqf, random, fu2, set, ctd, cou);
+            }
+            list9.add(new FoliagePlacer.FoliageAttachment(fu.offset(integer3, integer2, integer4), -2, false));
+        }
+        return list9;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> TrunkPlacer.<TrunkPlacer>trunkPlacerParts((RecordCodecBuilder.Instance<TrunkPlacer>)instance).apply(instance, MegaJungleTrunkPlacer::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/trunkplacers/StraightTrunkPlacer.java b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/StraightTrunkPlacer.java
new file mode 100644
index 0000000..f27eb57
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/StraightTrunkPlacer.java
@@ -0,0 +1,41 @@
+package net.minecraft.world.level.levelgen.feature.trunkplacers;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
+import java.util.List;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import java.util.Set;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.serialization.Codec;
+
+public class StraightTrunkPlacer extends TrunkPlacer {
+    public static final Codec<StraightTrunkPlacer> CODEC;
+    
+    public StraightTrunkPlacer(final int integer1, final int integer2, final int integer3) {
+        super(integer1, integer2, integer3);
+    }
+    
+    @Override
+    protected TrunkPlacerType<?> type() {
+        return TrunkPlacerType.STRAIGHT_TRUNK_PLACER;
+    }
+    
+    @Override
+    public List<FoliagePlacer.FoliageAttachment> placeTrunk(final LevelSimulatedRW bqf, final Random random, final int integer, final BlockPos fu, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou) {
+        TrunkPlacer.setDirtAt(bqf, fu.below());
+        for (int integer2 = 0; integer2 < integer; ++integer2) {
+            TrunkPlacer.placeLog(bqf, random, fu.above(integer2), set, ctd, cou);
+        }
+        return ImmutableList.<FoliagePlacer.FoliageAttachment>of(new FoliagePlacer.FoliageAttachment(fu.above(integer), 0, false));
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> TrunkPlacer.<TrunkPlacer>trunkPlacerParts((RecordCodecBuilder.Instance<TrunkPlacer>)instance).apply(instance, StraightTrunkPlacer::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/trunkplacers/TrunkPlacer.java b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/TrunkPlacer.java
new file mode 100644
index 0000000..f950414
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/TrunkPlacer.java
@@ -0,0 +1,87 @@
+package net.minecraft.world.level.levelgen.feature.trunkplacers;
+
+import java.util.function.Function;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.LevelSimulatedReader;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.levelgen.feature.TreeFeature;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelWriter;
+import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer;
+import java.util.List;
+import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import java.util.Set;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import net.minecraft.world.level.LevelSimulatedRW;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.datafixers.Products;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
+
+public abstract class TrunkPlacer {
+    public static final Codec<TrunkPlacer> CODEC;
+    protected final int baseHeight;
+    protected final int heightRandA;
+    protected final int heightRandB;
+    
+    protected static <P extends TrunkPlacer> Products.P3<RecordCodecBuilder.Mu<P>, Integer, Integer, Integer> trunkPlacerParts(final RecordCodecBuilder.Instance<P> instance) {
+        return (Products.P3<RecordCodecBuilder.Mu<P>, Integer, Integer, Integer>)instance.group((App)Codec.INT.fieldOf("base_height").forGetter(cqw -> cqw.baseHeight), (App)Codec.INT.fieldOf("height_rand_a").forGetter(cqw -> cqw.heightRandA), (App)Codec.INT.fieldOf("height_rand_b").forGetter(cqw -> cqw.heightRandB));
+    }
+    
+    public TrunkPlacer(final int integer1, final int integer2, final int integer3) {
+        this.baseHeight = integer1;
+        this.heightRandA = integer2;
+        this.heightRandB = integer3;
+    }
+    
+    protected abstract TrunkPlacerType<?> type();
+    
+    public abstract List<FoliagePlacer.FoliageAttachment> placeTrunk(final LevelSimulatedRW bqf, final Random random, final int integer, final BlockPos fu, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou);
+    
+    public int getTreeHeight(final Random random) {
+        return this.baseHeight + random.nextInt(this.heightRandA + 1) + random.nextInt(this.heightRandB + 1);
+    }
+    
+    protected static void setBlock(final LevelWriter bqh, final BlockPos fu, final BlockState cfj, final BoundingBox ctd) {
+        TreeFeature.setBlockKnownShape(bqh, fu, cfj);
+        ctd.expand(new BoundingBox(fu, fu));
+    }
+    
+    private static boolean isDirt(final LevelSimulatedReader bqg, final BlockPos fu) {
+        final Block bvr2;
+        return bqg.isStateAtPosition(fu, cfj -> {
+            bvr2 = cfj.getBlock();
+            return Feature.isDirt(bvr2) && !cfj.is(Blocks.GRASS_BLOCK) && !cfj.is(Blocks.MYCELIUM);
+        });
+    }
+    
+    protected static void setDirtAt(final LevelSimulatedRW bqf, final BlockPos fu) {
+        if (!isDirt(bqf, fu)) {
+            TreeFeature.setBlockKnownShape(bqf, fu, Blocks.DIRT.defaultBlockState());
+        }
+    }
+    
+    protected static boolean placeLog(final LevelSimulatedRW bqf, final Random random, final BlockPos fu, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou) {
+        if (TreeFeature.validTreePos(bqf, fu)) {
+            setBlock(bqf, fu, cou.trunkProvider.getState(random, fu), ctd);
+            set.add(fu.immutable());
+            return true;
+        }
+        return false;
+    }
+    
+    protected static void placeLogIfFree(final LevelSimulatedRW bqf, final Random random, final BlockPos.MutableBlockPos a, final Set<BlockPos> set, final BoundingBox ctd, final TreeConfiguration cou) {
+        if (TreeFeature.isFree(bqf, a)) {
+            placeLog(bqf, random, a, set, ctd, cou);
+        }
+    }
+    
+    static {
+        CODEC = Registry.TRUNK_PLACER_TYPES.dispatch((Function)TrunkPlacer::type, (Function)TrunkPlacerType::codec);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/feature/trunkplacers/TrunkPlacerType.java b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/TrunkPlacerType.java
new file mode 100644
index 0000000..db49151
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/feature/trunkplacers/TrunkPlacerType.java
@@ -0,0 +1,35 @@
+package net.minecraft.world.level.levelgen.feature.trunkplacers;
+
+import net.minecraft.core.Registry;
+import com.mojang.serialization.Codec;
+
+public class TrunkPlacerType<P extends TrunkPlacer> {
+    public static final TrunkPlacerType<StraightTrunkPlacer> STRAIGHT_TRUNK_PLACER;
+    public static final TrunkPlacerType<ForkingTrunkPlacer> FORKING_TRUNK_PLACER;
+    public static final TrunkPlacerType<GiantTrunkPlacer> GIANT_TRUNK_PLACER;
+    public static final TrunkPlacerType<MegaJungleTrunkPlacer> MEGA_JUNGLE_TRUNK_PLACER;
+    public static final TrunkPlacerType<DarkOakTrunkPlacer> DARK_OAK_TRUNK_PLACER;
+    public static final TrunkPlacerType<FancyTrunkPlacer> FANCY_TRUNK_PLACER;
+    private final Codec<P> codec;
+    
+    private static <P extends TrunkPlacer> TrunkPlacerType<P> register(final String string, final Codec<P> codec) {
+        return Registry.<TrunkPlacerType<P>>register(Registry.TRUNK_PLACER_TYPES, string, new TrunkPlacerType<P>(codec));
+    }
+    
+    private TrunkPlacerType(final Codec<P> codec) {
+        this.codec = codec;
+    }
+    
+    public Codec<P> codec() {
+        return this.codec;
+    }
+    
+    static {
+        STRAIGHT_TRUNK_PLACER = TrunkPlacerType.<StraightTrunkPlacer>register("straight_trunk_placer", StraightTrunkPlacer.CODEC);
+        FORKING_TRUNK_PLACER = TrunkPlacerType.<ForkingTrunkPlacer>register("forking_trunk_placer", ForkingTrunkPlacer.CODEC);
+        GIANT_TRUNK_PLACER = TrunkPlacerType.<GiantTrunkPlacer>register("giant_trunk_placer", GiantTrunkPlacer.CODEC);
+        MEGA_JUNGLE_TRUNK_PLACER = TrunkPlacerType.<MegaJungleTrunkPlacer>register("mega_jungle_trunk_placer", MegaJungleTrunkPlacer.CODEC);
+        DARK_OAK_TRUNK_PLACER = TrunkPlacerType.<DarkOakTrunkPlacer>register("dark_oak_trunk_placer", DarkOakTrunkPlacer.CODEC);
+        FANCY_TRUNK_PLACER = TrunkPlacerType.<FancyTrunkPlacer>register("fancy_trunk_placer", FancyTrunkPlacer.CODEC);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.java b/src/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.java
index 627a88a..84969ce 100644
--- a/src/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.java
+++ b/src/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.java
@@ -1,17 +1,26 @@
 package net.minecraft.world.level.levelgen.flat;
 
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import net.minecraft.world.level.block.Blocks;
+import java.util.function.Function;
+import net.minecraft.util.Codecs;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class FlatLayerInfo {
+    public static final Codec<FlatLayerInfo> CODEC;
     private final BlockState blockState;
     private final int height;
     private int start;
     
-    public FlatLayerInfo(final int integer, final Block bph) {
+    public FlatLayerInfo(final int integer, final Block bvr) {
         this.height = integer;
-        this.blockState = bph.defaultBlockState();
+        this.blockState = bvr.defaultBlockState();
     }
     
     public int getHeight() {
@@ -34,4 +43,8 @@ public class FlatLayerInfo {
     public String toString() {
         return ((this.height != 1) ? (this.height + "*") : "") + Registry.BLOCK.getKey(this.blockState.getBlock());
     }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codecs.intRange(0, 256).fieldOf("height").forGetter((Function)FlatLayerInfo::getHeight), (App)Registry.BLOCK.fieldOf("block").withDefault(Blocks.AIR).forGetter(cqz -> cqz.getBlockState().getBlock())).apply(instance, (BiFunction)FlatLayerInfo::new));
+    }
 }
diff --git a/src/net/minecraft/world/level/levelgen/flat/FlatLevelGeneratorSettings.java b/src/net/minecraft/world/level/levelgen/flat/FlatLevelGeneratorSettings.java
index 6f799e1..b3e35cd 100644
--- a/src/net/minecraft/world/level/levelgen/flat/FlatLevelGeneratorSettings.java
+++ b/src/net/minecraft/world/level/levelgen/flat/FlatLevelGeneratorSettings.java
@@ -1,437 +1,216 @@
 package net.minecraft.world.level.levelgen.flat;
 
-import net.minecraft.Util;
 import net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration;
-import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
-import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
-import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration;
 import org.apache.logging.log4j.LogManager;
-import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.structure.OceanRuinFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.VillageConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
-import net.minecraft.world.level.levelgen.feature.MineshaftFeature;
-import java.util.HashMap;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.biome.Biomes;
-import com.google.common.base.Splitter;
-import java.util.Collection;
-import net.minecraft.world.level.chunk.ChunkGeneratorType;
-import java.util.stream.Collector;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import com.mojang.datafixers.util.Pair;
-import java.util.stream.Stream;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
-import java.util.Collections;
-import java.util.Locale;
-import java.util.Iterator;
-import net.minecraft.world.level.block.Blocks;
-import javax.annotation.Nullable;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.serialization.MapCodec;
+import net.minecraft.util.Codecs;
+import net.minecraft.Util;
 import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
+import java.util.function.Function;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
+import net.minecraft.world.level.biome.BiomeDefaultFeatures;
+import java.util.HashMap;
 import com.google.common.collect.Maps;
+import net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.world.level.levelgen.feature.configurations.StrongholdConfiguration;
+import java.util.Optional;
+import net.minecraft.world.level.block.Blocks;
+import java.util.Arrays;
+import net.minecraft.world.level.levelgen.feature.configurations.LayerConfiguration;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import java.util.Iterator;
 import com.google.common.collect.Lists;
+import java.util.Collection;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.biome.Biome;
 import java.util.List;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.StructureSettings;
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import java.util.Map;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import com.mojang.serialization.Codec;
 import org.apache.logging.log4j.Logger;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 
-public class FlatLevelGeneratorSettings extends ChunkGeneratorSettings {
+public class FlatLevelGeneratorSettings {
     private static final Logger LOGGER;
-    private static final ConfiguredFeature<?, ?> MINESHAFT_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> VILLAGE_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> STRONGHOLD_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> SWAMPHUT_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> DESERT_PYRAMID_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> JUNGLE_PYRAMID_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> IGLOO_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> SHIPWRECK_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> OCEAN_MONUMENT_COMPOSITE_FEATURE;
+    public static final Codec<FlatLevelGeneratorSettings> CODEC;
     private static final ConfiguredFeature<?, ?> WATER_LAKE_COMPOSITE_FEATURE;
     private static final ConfiguredFeature<?, ?> LAVA_LAKE_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> ENDCITY_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> WOOLAND_MANSION_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> FORTRESS_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> OCEAN_RUIN_COMPOSITE_FEATURE;
-    private static final ConfiguredFeature<?, ?> PILLAGER_OUTPOST_COMPOSITE_FEATURE;
-    public static final Map<ConfiguredFeature<?, ?>, GenerationStep.Decoration> STRUCTURE_FEATURES_STEP;
-    public static final Map<String, ConfiguredFeature<?, ?>[]> STRUCTURE_FEATURES;
-    public static final Map<ConfiguredFeature<?, ?>, FeatureConfiguration> STRUCTURE_FEATURES_DEFAULT;
+    private static final Map<StructureFeature<?>, ConfiguredStructureFeature<?, ?>> STRUCTURE_FEATURES;
+    private final StructureSettings structureSettings;
     private final List<FlatLayerInfo> layersInfo;
-    private final Map<String, Map<String, String>> structuresOptions;
     private Biome biome;
     private final BlockState[] layers;
     private boolean voidGen;
-    private int seaLevel;
+    private boolean decoration;
+    private boolean addLakes;
     
-    public FlatLevelGeneratorSettings() {
-        this.layersInfo = Lists.newArrayList();
-        this.structuresOptions = Maps.newHashMap();
-        this.layers = new BlockState[256];
+    public FlatLevelGeneratorSettings(final StructureSettings ciw, final List<FlatLayerInfo> list, final boolean boolean3, final boolean boolean4, final Biome bre) {
+        this(ciw);
+        if (boolean3) {
+            this.setAddLakes();
+        }
+        if (boolean4) {
+            this.setDecoration();
+        }
+        this.layersInfo.addAll(list);
+        this.updateLayers();
+        this.biome = bre;
     }
     
-    @Nullable
-    public static Block byString(final String string) {
-        try {
-            final ResourceLocation sm2 = new ResourceLocation(string);
-            return Registry.BLOCK.getOptional(sm2).orElse(null);
+    public FlatLevelGeneratorSettings(final StructureSettings ciw) {
+        this.layersInfo = Lists.newArrayList();
+        this.layers = new BlockState[256];
+        this.decoration = false;
+        this.addLakes = false;
+        this.structureSettings = ciw;
+    }
+    
+    public FlatLevelGeneratorSettings withStructureSettings(final StructureSettings ciw) {
+        return this.withLayers(this.layersInfo, ciw);
+    }
+    
+    public FlatLevelGeneratorSettings withLayers(final List<FlatLayerInfo> list, final StructureSettings ciw) {
+        final FlatLevelGeneratorSettings cra4 = new FlatLevelGeneratorSettings(ciw);
+        for (final FlatLayerInfo cqz6 : list) {
+            cra4.layersInfo.add(new FlatLayerInfo(cqz6.getHeight(), cqz6.getBlockState().getBlock()));
+            cra4.updateLayers();
         }
-        catch (IllegalArgumentException illegalArgumentException2) {
-            FlatLevelGeneratorSettings.LOGGER.warn("Invalid blockstate: {}", string, illegalArgumentException2);
-            return null;
+        cra4.setBiome(this.biome);
+        if (this.decoration) {
+            cra4.setDecoration();
         }
+        if (this.addLakes) {
+            cra4.setAddLakes();
+        }
+        return cra4;
+    }
+    
+    public void setDecoration() {
+        this.decoration = true;
+    }
+    
+    public void setAddLakes() {
+        this.addLakes = true;
+    }
+    
+    public Biome getBiomeFromSettings() {
+        final Biome bre2 = this.getBiome();
+        final Biome bre3 = new Biome(new Biome.BiomeBuilder().surfaceBuilder(bre2.getSurfaceBuilder()).precipitation(bre2.getPrecipitation()).biomeCategory(bre2.getBiomeCategory()).depth(bre2.getDepth()).scale(bre2.getScale()).temperature(bre2.getTemperature()).downfall(bre2.getDownfall()).specialEffects(bre2.getSpecialEffects()).parent(bre2.getParent())) {};
+        if (this.addLakes) {
+            bre3.addFeature(GenerationStep.Decoration.LAKES, FlatLevelGeneratorSettings.WATER_LAKE_COMPOSITE_FEATURE);
+            bre3.addFeature(GenerationStep.Decoration.LAKES, FlatLevelGeneratorSettings.LAVA_LAKE_COMPOSITE_FEATURE);
+        }
+        for (final Map.Entry<StructureFeature<?>, StructureFeatureConfiguration> entry5 : this.structureSettings.structureConfig().entrySet()) {
+            bre3.addStructureStart(bre2.withBiomeConfig(FlatLevelGeneratorSettings.STRUCTURE_FEATURES.get(entry5.getKey())));
+        }
+        final boolean boolean4 = (!this.voidGen || bre2 == Biomes.THE_VOID) && this.decoration;
+        if (boolean4) {
+            final List<GenerationStep.Decoration> list5 = Lists.newArrayList();
+            list5.add(GenerationStep.Decoration.UNDERGROUND_STRUCTURES);
+            list5.add(GenerationStep.Decoration.SURFACE_STRUCTURES);
+            for (final GenerationStep.Decoration b9 : GenerationStep.Decoration.values()) {
+                if (!list5.contains(b9)) {
+                    for (final ConfiguredFeature<?, ?> ckb11 : bre2.getFeaturesForStep(b9)) {
+                        bre3.addFeature(b9, ckb11);
+                    }
+                }
+            }
+        }
+        final BlockState[] arr5 = this.getLayers();
+        for (int integer6 = 0; integer6 < arr5.length; ++integer6) {
+            final BlockState cfj7 = arr5[integer6];
+            if (cfj7 != null && !Heightmap.Types.MOTION_BLOCKING.isOpaque().test(cfj7)) {
+                this.layers[integer6] = null;
+                bre3.addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, Feature.FILL_LAYER.configured(new LayerConfiguration(integer6, cfj7)));
+            }
+        }
+        return bre3;
+    }
+    
+    public StructureSettings structureSettings() {
+        return this.structureSettings;
     }
     
     public Biome getBiome() {
         return this.biome;
     }
     
-    public void setBiome(final Biome bkt) {
-        this.biome = bkt;
-    }
-    
-    public Map<String, Map<String, String>> getStructuresOptions() {
-        return this.structuresOptions;
+    public void setBiome(final Biome bre) {
+        this.biome = bre;
     }
     
     public List<FlatLayerInfo> getLayersInfo() {
         return this.layersInfo;
     }
     
-    public void updateLayers() {
-        int integer2 = 0;
-        for (final FlatLayerInfo cix4 : this.layersInfo) {
-            cix4.setStart(integer2);
-            integer2 += cix4.getHeight();
-        }
-        this.seaLevel = 0;
-        this.voidGen = true;
-        integer2 = 0;
-        for (final FlatLayerInfo cix4 : this.layersInfo) {
-            for (int integer3 = cix4.getStart(); integer3 < cix4.getStart() + cix4.getHeight(); ++integer3) {
-                final BlockState byj6 = cix4.getBlockState();
-                if (byj6.getBlock() != Blocks.AIR) {
-                    this.voidGen = false;
-                    this.layers[integer3] = byj6;
-                }
-            }
-            if (cix4.getBlockState().getBlock() == Blocks.AIR) {
-                integer2 += cix4.getHeight();
-            }
-            else {
-                this.seaLevel += cix4.getHeight() + integer2;
-                integer2 = 0;
-            }
-        }
-    }
-    
-    @Override
-    public String toString() {
-        final StringBuilder stringBuilder2 = new StringBuilder();
-        for (int integer3 = 0; integer3 < this.layersInfo.size(); ++integer3) {
-            if (integer3 > 0) {
-                stringBuilder2.append(",");
-            }
-            stringBuilder2.append(this.layersInfo.get(integer3));
-        }
-        stringBuilder2.append(";");
-        stringBuilder2.append(Registry.BIOME.getKey(this.biome));
-        stringBuilder2.append(";");
-        if (!this.structuresOptions.isEmpty()) {
-            int integer3 = 0;
-            for (final Map.Entry<String, Map<String, String>> entry5 : this.structuresOptions.entrySet()) {
-                if (integer3++ > 0) {
-                    stringBuilder2.append(",");
-                }
-                stringBuilder2.append(entry5.getKey().toLowerCase(Locale.ROOT));
-                final Map<String, String> map6 = entry5.getValue();
-                if (!map6.isEmpty()) {
-                    stringBuilder2.append("(");
-                    int integer4 = 0;
-                    for (final Map.Entry<String, String> entry6 : map6.entrySet()) {
-                        if (integer4++ > 0) {
-                            stringBuilder2.append(" ");
-                        }
-                        stringBuilder2.append(entry6.getKey());
-                        stringBuilder2.append("=");
-                        stringBuilder2.append(entry6.getValue());
-                    }
-                    stringBuilder2.append(")");
-                }
-            }
-        }
-        return stringBuilder2.toString();
-    }
-    
-    @Nullable
-    private static FlatLayerInfo getLayerInfoFromString(final String string, final int integer) {
-        final String[] arr3 = string.split("\\*", 2);
-        int integer2 = 0;
-        Label_0051: {
-            if (arr3.length == 2) {
-                try {
-                    integer2 = Math.max(Integer.parseInt(arr3[0]), 0);
-                    break Label_0051;
-                }
-                catch (NumberFormatException numberFormatException5) {
-                    FlatLevelGeneratorSettings.LOGGER.error("Error while parsing flat world string => {}", numberFormatException5.getMessage());
-                    return null;
-                }
-            }
-            integer2 = 1;
-        }
-        final int integer3 = Math.min(integer + integer2, 256);
-        final int integer4 = integer3 - integer;
-        Block bph7;
-        try {
-            bph7 = byString(arr3[arr3.length - 1]);
-        }
-        catch (Exception exception8) {
-            FlatLevelGeneratorSettings.LOGGER.error("Error while parsing flat world string => {}", exception8.getMessage());
-            return null;
-        }
-        if (bph7 == null) {
-            FlatLevelGeneratorSettings.LOGGER.error("Error while parsing flat world string => Unknown block, {}", arr3[arr3.length - 1]);
-            return null;
-        }
-        final FlatLayerInfo cix8 = new FlatLayerInfo(integer4, bph7);
-        cix8.setStart(integer);
-        return cix8;
-    }
-    
-    private static List<FlatLayerInfo> getLayersInfoFromString(final String string) {
-        final List<FlatLayerInfo> list2 = Lists.newArrayList();
-        final String[] arr3 = string.split(",");
-        int integer4 = 0;
-        for (final String string2 : arr3) {
-            final FlatLayerInfo cix9 = getLayerInfoFromString(string2, integer4);
-            if (cix9 == null) {
-                return Collections.<FlatLayerInfo>emptyList();
-            }
-            list2.add(cix9);
-            integer4 += cix9.getHeight();
-        }
-        return list2;
-    }
-    
-    public <T> Dynamic<T> toObject(final DynamicOps<T> dynamicOps) {
-        final T object3 = (T)dynamicOps.createList((Stream)this.layersInfo.stream().map(cix -> dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("height"), dynamicOps.createInt(cix.getHeight()), dynamicOps.createString("block"), dynamicOps.createString(Registry.BLOCK.getKey(cix.getBlockState().getBlock()).toString())))));
-        final T object4 = (T)dynamicOps.createMap((Map)this.structuresOptions.entrySet().stream().map(entry -> Pair.of(dynamicOps.createString(entry.getKey().toLowerCase(Locale.ROOT)), dynamicOps.createMap((Map)((Map)entry.getValue()).entrySet().stream().map(entry -> Pair.of(dynamicOps.createString((String)entry.getKey()), dynamicOps.createString((String)entry.getValue()))).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond))))).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)));
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("layers"), object3, dynamicOps.createString("biome"), dynamicOps.createString(Registry.BIOME.getKey(this.biome).toString()), dynamicOps.createString("structures"), object4)));
-    }
-    
-    public static FlatLevelGeneratorSettings fromObject(final Dynamic<?> dynamic) {
-        final FlatLevelGeneratorSettings ciy2 = ChunkGeneratorType.FLAT.createSettings();
-        final List<Pair<Integer, Block>> list3 = (List<Pair<Integer, Block>>)dynamic.get("layers").asList(dynamic -> Pair.of(dynamic.get("height").asInt(1), byString(dynamic.get("block").asString(""))));
-        if (list3.stream().anyMatch(pair -> pair.getSecond() == null)) {
-            return getDefault();
-        }
-        final List<FlatLayerInfo> list4 = list3.stream().map(pair -> new FlatLayerInfo((int)pair.getFirst(), (Block)pair.getSecond())).collect(Collectors.toList());
-        if (list4.isEmpty()) {
-            return getDefault();
-        }
-        ciy2.getLayersInfo().addAll(list4);
-        ciy2.updateLayers();
-        ciy2.setBiome(Registry.BIOME.get(new ResourceLocation(dynamic.get("biome").asString(""))));
-        dynamic.get("structures").flatMap((Function)Dynamic::getMapValues).ifPresent(map -> map.keySet().forEach(dynamic -> dynamic.asString().map(string -> ciy2.getStructuresOptions().put(string, Maps.newHashMap()))));
-        return ciy2;
-    }
-    
-    public static FlatLevelGeneratorSettings fromString(final String string) {
-        final Iterator<String> iterator2 = Splitter.on(';').split(string).iterator();
-        if (!iterator2.hasNext()) {
-            return getDefault();
-        }
-        final FlatLevelGeneratorSettings ciy3 = ChunkGeneratorType.FLAT.createSettings();
-        final List<FlatLayerInfo> list4 = getLayersInfoFromString(iterator2.next());
-        if (list4.isEmpty()) {
-            return getDefault();
-        }
-        ciy3.getLayersInfo().addAll(list4);
-        ciy3.updateLayers();
-        Biome bkt5 = Biomes.PLAINS;
-        if (iterator2.hasNext()) {
-            try {
-                final ResourceLocation sm6 = new ResourceLocation(iterator2.next());
-                final Object o;
-                final Object obj;
-                bkt5 = Registry.BIOME.getOptional(sm6).<Throwable>orElseThrow(() -> {
-                    new IllegalArgumentException("Invalid Biome: " + obj);
-                    return o;
-                });
-            }
-            catch (Exception exception6) {
-                FlatLevelGeneratorSettings.LOGGER.error("Error while parsing flat world string => {}", exception6.getMessage());
-            }
-        }
-        ciy3.setBiome(bkt5);
-        if (iterator2.hasNext()) {
-            final String[] split;
-            final String[] arr6 = split = iterator2.next().toLowerCase(Locale.ROOT).split(",");
-            for (final String string2 : split) {
-                final String[] arr7 = string2.split("\\(", 2);
-                if (!arr7[0].isEmpty()) {
-                    ciy3.addStructure(arr7[0]);
-                    if (arr7.length > 1 && arr7[1].endsWith(")") && arr7[1].length() > 1) {
-                        final String[] split2;
-                        final String[] arr8 = split2 = arr7[1].substring(0, arr7[1].length() - 1).split(" ");
-                        for (final String string3 : split2) {
-                            final String[] arr9 = string3.split("=", 2);
-                            if (arr9.length == 2) {
-                                ciy3.addStructureOption(arr7[0], arr9[0], arr9[1]);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        else {
-            ciy3.getStructuresOptions().put("village", Maps.newHashMap());
-        }
-        return ciy3;
-    }
-    
-    private void addStructure(final String string) {
-        final Map<String, String> map3 = Maps.newHashMap();
-        this.structuresOptions.put(string, map3);
-    }
-    
-    private void addStructureOption(final String string1, final String string2, final String string3) {
-        this.structuresOptions.get(string1).put(string2, string3);
-        if ("village".equals(string1) && "distance".equals(string2)) {
-            this.villagesSpacing = Mth.getInt(string3, this.villagesSpacing, 9);
-        }
-        if ("biome_1".equals(string1) && "distance".equals(string2)) {
-            this.templesSpacing = Mth.getInt(string3, this.templesSpacing, 9);
-        }
-        if ("stronghold".equals(string1)) {
-            if ("distance".equals(string2)) {
-                this.strongholdsDistance = Mth.getInt(string3, this.strongholdsDistance, 1);
-            }
-            else if ("count".equals(string2)) {
-                this.strongholdsCount = Mth.getInt(string3, this.strongholdsCount, 1);
-            }
-            else if ("spread".equals(string2)) {
-                this.strongholdsSpread = Mth.getInt(string3, this.strongholdsSpread, 1);
-            }
-        }
-        if ("oceanmonument".equals(string1)) {
-            if ("separation".equals(string2)) {
-                this.monumentsSeparation = Mth.getInt(string3, this.monumentsSeparation, 1);
-            }
-            else if ("spacing".equals(string2)) {
-                this.monumentsSpacing = Mth.getInt(string3, this.monumentsSpacing, 1);
-            }
-        }
-        if ("endcity".equals(string1) && "distance".equals(string2)) {
-            this.endCitySpacing = Mth.getInt(string3, this.endCitySpacing, 1);
-        }
-        if ("mansion".equals(string1) && "distance".equals(string2)) {
-            this.woodlandMansionSpacing = Mth.getInt(string3, this.woodlandMansionSpacing, 1);
-        }
-    }
-    
-    public static FlatLevelGeneratorSettings getDefault() {
-        final FlatLevelGeneratorSettings ciy1 = ChunkGeneratorType.FLAT.createSettings();
-        ciy1.setBiome(Biomes.PLAINS);
-        ciy1.getLayersInfo().add(new FlatLayerInfo(1, Blocks.BEDROCK));
-        ciy1.getLayersInfo().add(new FlatLayerInfo(2, Blocks.DIRT));
-        ciy1.getLayersInfo().add(new FlatLayerInfo(1, Blocks.GRASS_BLOCK));
-        ciy1.updateLayers();
-        ciy1.getStructuresOptions().put("village", Maps.newHashMap());
-        return ciy1;
-    }
-    
-    public boolean isVoidGen() {
-        return this.voidGen;
-    }
-    
     public BlockState[] getLayers() {
         return this.layers;
     }
     
-    public void deleteLayer(final int integer) {
-        this.layers[integer] = null;
+    public void updateLayers() {
+        Arrays.fill(this.layers, 0, this.layers.length, null);
+        int integer2 = 0;
+        for (final FlatLayerInfo cqz4 : this.layersInfo) {
+            cqz4.setStart(integer2);
+            integer2 += cqz4.getHeight();
+        }
+        this.voidGen = true;
+        for (final FlatLayerInfo cqz5 : this.layersInfo) {
+            for (int integer3 = cqz5.getStart(); integer3 < cqz5.getStart() + cqz5.getHeight(); ++integer3) {
+                final BlockState cfj5 = cqz5.getBlockState();
+                if (!cfj5.is(Blocks.AIR)) {
+                    this.voidGen = false;
+                    this.layers[integer3] = cfj5;
+                }
+            }
+        }
+    }
+    
+    public static FlatLevelGeneratorSettings getDefault() {
+        final StructureSettings ciw1 = new StructureSettings(Optional.<StrongholdConfiguration>of(StructureSettings.DEFAULT_STRONGHOLD), Maps.newHashMap(ImmutableMap.<StructureFeature<JigsawConfiguration>, StructureFeatureConfiguration>of(StructureFeature.VILLAGE, StructureSettings.DEFAULTS.get(StructureFeature.VILLAGE))));
+        final FlatLevelGeneratorSettings cra2 = new FlatLevelGeneratorSettings(ciw1);
+        cra2.setBiome(Biomes.PLAINS);
+        cra2.getLayersInfo().add(new FlatLayerInfo(1, Blocks.BEDROCK));
+        cra2.getLayersInfo().add(new FlatLayerInfo(2, Blocks.DIRT));
+        cra2.getLayersInfo().add(new FlatLayerInfo(1, Blocks.GRASS_BLOCK));
+        cra2.updateLayers();
+        return cra2;
     }
     
     static {
         LOGGER = LogManager.getLogger();
-        MINESHAFT_COMPOSITE_FEATURE = Feature.MINESHAFT.configured(new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        VILLAGE_COMPOSITE_FEATURE = Feature.VILLAGE.configured(new VillageConfiguration("village/plains/town_centers", 6)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        STRONGHOLD_COMPOSITE_FEATURE = Feature.STRONGHOLD.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        SWAMPHUT_COMPOSITE_FEATURE = Feature.SWAMP_HUT.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        DESERT_PYRAMID_COMPOSITE_FEATURE = Feature.DESERT_PYRAMID.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        JUNGLE_PYRAMID_COMPOSITE_FEATURE = Feature.JUNGLE_TEMPLE.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        IGLOO_COMPOSITE_FEATURE = Feature.IGLOO.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        SHIPWRECK_COMPOSITE_FEATURE = Feature.SHIPWRECK.configured(new ShipwreckConfiguration(false)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        OCEAN_MONUMENT_COMPOSITE_FEATURE = Feature.OCEAN_MONUMENT.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)StructureSettings.CODEC.fieldOf("structures").forGetter((Function)FlatLevelGeneratorSettings::structureSettings), (App)FlatLayerInfo.CODEC.listOf().fieldOf("layers").forGetter((Function)FlatLevelGeneratorSettings::getLayersInfo), (App)Codec.BOOL.fieldOf("lakes").withDefault(false).forGetter(cra -> cra.addLakes), (App)Codec.BOOL.fieldOf("features").withDefault(false).forGetter(cra -> cra.decoration), (App)Codecs.withDefault((com.mojang.serialization.MapCodec<Object>)Registry.BIOME.fieldOf("biome"), Util.prefix("Unknown biome, defaulting to plains", FlatLevelGeneratorSettings.LOGGER::error), () -> Biomes.PLAINS).forGetter(cra -> cra.biome)).apply(instance, FlatLevelGeneratorSettings::new)).stable();
         WATER_LAKE_COMPOSITE_FEATURE = Feature.LAKE.configured(new BlockStateConfiguration(Blocks.WATER.defaultBlockState())).decorated(FeatureDecorator.WATER_LAKE.configured(new ChanceDecoratorConfiguration(4)));
         LAVA_LAKE_COMPOSITE_FEATURE = Feature.LAKE.configured(new BlockStateConfiguration(Blocks.LAVA.defaultBlockState())).decorated(FeatureDecorator.LAVA_LAKE.configured(new ChanceDecoratorConfiguration(80)));
-        ENDCITY_COMPOSITE_FEATURE = Feature.END_CITY.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        WOOLAND_MANSION_COMPOSITE_FEATURE = Feature.WOODLAND_MANSION.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        FORTRESS_COMPOSITE_FEATURE = Feature.NETHER_BRIDGE.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        OCEAN_RUIN_COMPOSITE_FEATURE = Feature.OCEAN_RUIN.configured(new OceanRuinConfiguration(OceanRuinFeature.Type.COLD, 0.3f, 0.1f)).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        PILLAGER_OUTPOST_COMPOSITE_FEATURE = Feature.PILLAGER_OUTPOST.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.NOPE.configured(DecoratorConfiguration.NONE));
-        STRUCTURE_FEATURES_STEP = Util.<Map<ConfiguredFeature<?, ?>, GenerationStep.Decoration>>make(Maps.newHashMap(), hashMap -> {
-            hashMap.put(FlatLevelGeneratorSettings.MINESHAFT_COMPOSITE_FEATURE, GenerationStep.Decoration.UNDERGROUND_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.VILLAGE_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.STRONGHOLD_COMPOSITE_FEATURE, GenerationStep.Decoration.UNDERGROUND_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.SWAMPHUT_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.DESERT_PYRAMID_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.JUNGLE_PYRAMID_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.IGLOO_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.SHIPWRECK_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.OCEAN_RUIN_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.WATER_LAKE_COMPOSITE_FEATURE, GenerationStep.Decoration.LOCAL_MODIFICATIONS);
-            hashMap.put(FlatLevelGeneratorSettings.LAVA_LAKE_COMPOSITE_FEATURE, GenerationStep.Decoration.LOCAL_MODIFICATIONS);
-            hashMap.put(FlatLevelGeneratorSettings.ENDCITY_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.WOOLAND_MANSION_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.FORTRESS_COMPOSITE_FEATURE, GenerationStep.Decoration.UNDERGROUND_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.OCEAN_MONUMENT_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            hashMap.put(FlatLevelGeneratorSettings.PILLAGER_OUTPOST_COMPOSITE_FEATURE, GenerationStep.Decoration.SURFACE_STRUCTURES);
-            return;
-        });
-        STRUCTURE_FEATURES = Util.<Map<String, ConfiguredFeature<?, ?>[]>>make(Maps.newHashMap(), hashMap -> {
-            hashMap.put("mineshaft", new ConfiguredFeature[] { FlatLevelGeneratorSettings.MINESHAFT_COMPOSITE_FEATURE });
-            hashMap.put("village", new ConfiguredFeature[] { FlatLevelGeneratorSettings.VILLAGE_COMPOSITE_FEATURE });
-            hashMap.put("stronghold", new ConfiguredFeature[] { FlatLevelGeneratorSettings.STRONGHOLD_COMPOSITE_FEATURE });
-            hashMap.put("biome_1", new ConfiguredFeature[] { FlatLevelGeneratorSettings.SWAMPHUT_COMPOSITE_FEATURE, FlatLevelGeneratorSettings.DESERT_PYRAMID_COMPOSITE_FEATURE, FlatLevelGeneratorSettings.JUNGLE_PYRAMID_COMPOSITE_FEATURE, FlatLevelGeneratorSettings.IGLOO_COMPOSITE_FEATURE, FlatLevelGeneratorSettings.OCEAN_RUIN_COMPOSITE_FEATURE, FlatLevelGeneratorSettings.SHIPWRECK_COMPOSITE_FEATURE });
-            hashMap.put("oceanmonument", new ConfiguredFeature[] { FlatLevelGeneratorSettings.OCEAN_MONUMENT_COMPOSITE_FEATURE });
-            hashMap.put("lake", new ConfiguredFeature[] { FlatLevelGeneratorSettings.WATER_LAKE_COMPOSITE_FEATURE });
-            hashMap.put("lava_lake", new ConfiguredFeature[] { FlatLevelGeneratorSettings.LAVA_LAKE_COMPOSITE_FEATURE });
-            hashMap.put("endcity", new ConfiguredFeature[] { FlatLevelGeneratorSettings.ENDCITY_COMPOSITE_FEATURE });
-            hashMap.put("mansion", new ConfiguredFeature[] { FlatLevelGeneratorSettings.WOOLAND_MANSION_COMPOSITE_FEATURE });
-            hashMap.put("fortress", new ConfiguredFeature[] { FlatLevelGeneratorSettings.FORTRESS_COMPOSITE_FEATURE });
-            hashMap.put("pillager_outpost", new ConfiguredFeature[] { FlatLevelGeneratorSettings.PILLAGER_OUTPOST_COMPOSITE_FEATURE });
-            return;
-        });
-        STRUCTURE_FEATURES_DEFAULT = Util.<Map<ConfiguredFeature<?, ?>, FeatureConfiguration>>make(Maps.newHashMap(), hashMap -> {
-            hashMap.put(FlatLevelGeneratorSettings.MINESHAFT_COMPOSITE_FEATURE, new MineshaftConfiguration(0.004, MineshaftFeature.Type.NORMAL));
-            hashMap.put(FlatLevelGeneratorSettings.VILLAGE_COMPOSITE_FEATURE, (MineshaftConfiguration)new VillageConfiguration("village/plains/town_centers", 6));
-            hashMap.put(FlatLevelGeneratorSettings.STRONGHOLD_COMPOSITE_FEATURE, (MineshaftConfiguration)FeatureConfiguration.NONE);
-            hashMap.put(FlatLevelGeneratorSettings.SWAMPHUT_COMPOSITE_FEATURE, (MineshaftConfiguration)FeatureConfiguration.NONE);
-            hashMap.put(FlatLevelGeneratorSettings.DESERT_PYRAMID_COMPOSITE_FEATURE, (MineshaftConfiguration)FeatureConfiguration.NONE);
-            hashMap.put(FlatLevelGeneratorSettings.JUNGLE_PYRAMID_COMPOSITE_FEATURE, (MineshaftConfiguration)FeatureConfiguration.NONE);
-            hashMap.put(FlatLevelGeneratorSettings.IGLOO_COMPOSITE_FEATURE, (MineshaftConfiguration)FeatureConfiguration.NONE);
-            hashMap.put(FlatLevelGeneratorSettings.OCEAN_RUIN_COMPOSITE_FEATURE, (MineshaftConfiguration)new OceanRuinConfiguration(OceanRuinFeature.Type.COLD, 0.3f, 0.9f));
-            hashMap.put(FlatLevelGeneratorSettings.SHIPWRECK_COMPOSITE_FEATURE, (MineshaftConfiguration)new ShipwreckConfiguration(false));
-            hashMap.put(FlatLevelGeneratorSettings.OCEAN_MONUMENT_COMPOSITE_FEATURE, (MineshaftConfiguration)FeatureConfiguration.NONE);
-            hashMap.put(FlatLevelGeneratorSettings.ENDCITY_COMPOSITE_FEATURE, (MineshaftConfiguration)FeatureConfiguration.NONE);
-            hashMap.put(FlatLevelGeneratorSettings.WOOLAND_MANSION_COMPOSITE_FEATURE, (MineshaftConfiguration)FeatureConfiguration.NONE);
-            hashMap.put(FlatLevelGeneratorSettings.FORTRESS_COMPOSITE_FEATURE, (MineshaftConfiguration)FeatureConfiguration.NONE);
-            hashMap.put(FlatLevelGeneratorSettings.PILLAGER_OUTPOST_COMPOSITE_FEATURE, (MineshaftConfiguration)FeatureConfiguration.NONE);
+        STRUCTURE_FEATURES = Util.<Map<StructureFeature<?>, ConfiguredStructureFeature<?, ?>>>make(Maps.newHashMap(), hashMap -> {
+            hashMap.put(StructureFeature.MINESHAFT, BiomeDefaultFeatures.MINESHAFT);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.VILLAGE, BiomeDefaultFeatures.VILLAGE_PLAINS);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.STRONGHOLD, BiomeDefaultFeatures.STRONGHOLD);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.SWAMP_HUT, BiomeDefaultFeatures.SWAMP_HUT);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.DESERT_PYRAMID, BiomeDefaultFeatures.DESERT_PYRAMID);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.JUNGLE_TEMPLE, BiomeDefaultFeatures.JUNGLE_TEMPLE);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.IGLOO, BiomeDefaultFeatures.IGLOO);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.OCEAN_RUIN, BiomeDefaultFeatures.OCEAN_RUIN_COLD);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.SHIPWRECK, BiomeDefaultFeatures.SHIPWRECK);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.OCEAN_MONUMENT, BiomeDefaultFeatures.OCEAN_MONUMENT);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.END_CITY, BiomeDefaultFeatures.END_CITY);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.WOODLAND_MANSION, BiomeDefaultFeatures.WOODLAND_MANSION);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.NETHER_BRIDGE, BiomeDefaultFeatures.NETHER_BRIDGE);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.PILLAGER_OUTPOST, BiomeDefaultFeatures.PILLAGER_OUTPOST);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.RUINED_PORTAL, BiomeDefaultFeatures.RUINED_PORTAL_STANDARD);
+            hashMap.put((StructureFeature<MineshaftConfiguration>)StructureFeature.BASTION_REMNANT, BiomeDefaultFeatures.BASTION_REMNANT);
         });
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/CarvingMaskDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CarvingMaskDecorator.java
index 41e102a..b19b9d4 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CarvingMaskDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CarvingMaskDecorator.java
@@ -5,30 +5,32 @@ import java.util.BitSet;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.stream.IntStream;
+import net.minecraft.world.level.chunk.ProtoChunk;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CarvingMaskDecorator extends FeatureDecorator<CarvingMaskDecoratorConfiguration> {
-    public CarvingMaskDecorator(final Function<Dynamic<?>, ? extends CarvingMaskDecoratorConfiguration> function) {
-        super(function);
+    public CarvingMaskDecorator(final Codec<CarvingMaskDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final CarvingMaskDecoratorConfiguration cjc, final BlockPos fk) {
-        final ChunkAccess bzy7 = bjx.getChunk(fk);
-        final ChunkPos bjh8 = bzy7.getPos();
-        final BitSet bitSet9 = bzy7.getCarvingMask(cjc.step);
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final CarvingMaskDecoratorConfiguration cre, final BlockPos fu) {
+        final ChunkAccess cgy7 = bqc.getChunk(fu);
+        final ChunkPos bph8 = cgy7.getPos();
+        final BitSet bitSet9 = ((ProtoChunk)cgy7).getCarvingMask(cre.step);
+        if (bitSet9 == null) {
+            return Stream.<BlockPos>empty();
+        }
         final int integer2;
         final int integer3;
         final int integer4;
         final ChunkPos chunkPos;
-        return IntStream.range(0, bitSet9.length()).filter(integer -> bitSet9.get(integer) && random.nextFloat() < cjc.probability).<BlockPos>mapToObj(integer -> {
+        return IntStream.range(0, bitSet9.length()).filter(integer -> bitSet9.get(integer) && random.nextFloat() < cre.probability).<BlockPos>mapToObj(integer -> {
             integer2 = (integer & 0xF);
             integer3 = (integer >> 4 & 0xF);
             integer4 = integer >> 8;
diff --git a/src/net/minecraft/world/level/levelgen/placement/CarvingMaskDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/placement/CarvingMaskDecoratorConfiguration.java
index da263af..659e7e8 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CarvingMaskDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CarvingMaskDecoratorConfiguration.java
@@ -1,13 +1,15 @@
 package net.minecraft.world.level.levelgen.placement;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.levelgen.GenerationStep;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 
 public class CarvingMaskDecoratorConfiguration implements DecoratorConfiguration {
+    public static final Codec<CarvingMaskDecoratorConfiguration> CODEC;
     protected final GenerationStep.Carving step;
     protected final float probability;
     
@@ -16,14 +18,7 @@ public class CarvingMaskDecoratorConfiguration implements DecoratorConfiguration
         this.probability = float2;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("step"), dynamicOps.createString(this.step.toString()), dynamicOps.createString("probability"), dynamicOps.createFloat(this.probability))));
-    }
-    
-    public static CarvingMaskDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        final GenerationStep.Carving a2 = GenerationStep.Carving.valueOf(dynamic.get("step").asString(""));
-        final float float3 = dynamic.get("probability").asFloat(0.0f);
-        return new CarvingMaskDecoratorConfiguration(a2, float3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)GenerationStep.Carving.CODEC.fieldOf("step").forGetter(cre -> cre.step), (App)Codec.FLOAT.fieldOf("probability").forGetter(cre -> cre.probability)).apply(instance, (BiFunction)CarvingMaskDecoratorConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/ChanceDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/placement/ChanceDecoratorConfiguration.java
index 6684906..932fbf1 100644
--- a/src/net/minecraft/world/level/levelgen/placement/ChanceDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/placement/ChanceDecoratorConfiguration.java
@@ -1,25 +1,18 @@
 package net.minecraft.world.level.levelgen.placement;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 
 public class ChanceDecoratorConfiguration implements DecoratorConfiguration {
+    public static final Codec<ChanceDecoratorConfiguration> CODEC;
     public final int chance;
     
     public ChanceDecoratorConfiguration(final int integer) {
         this.chance = integer;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("chance"), dynamicOps.createInt(this.chance))));
-    }
-    
-    public static ChanceDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        final int integer2 = dynamic.get("chance").asInt(0);
-        return new ChanceDecoratorConfiguration(integer2);
+    static {
+        CODEC = Codec.INT.fieldOf("chance").xmap((Function)ChanceDecoratorConfiguration::new, crf -> crf.chance).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/ChanceHeightmapDecorator.java b/src/net/minecraft/world/level/levelgen/placement/ChanceHeightmapDecorator.java
index 315d5e7..4758680 100644
--- a/src/net/minecraft/world/level/levelgen/placement/ChanceHeightmapDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/ChanceHeightmapDecorator.java
@@ -5,23 +5,21 @@ import net.minecraft.world.level.levelgen.Heightmap;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class ChanceHeightmapDecorator extends FeatureDecorator<ChanceDecoratorConfiguration> {
-    public ChanceHeightmapDecorator(final Function<Dynamic<?>, ? extends ChanceDecoratorConfiguration> function) {
-        super(function);
+    public ChanceHeightmapDecorator(final Codec<ChanceDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final ChanceDecoratorConfiguration cjd, final BlockPos fk) {
-        if (random.nextFloat() < 1.0f / cjd.chance) {
-            final int integer7 = random.nextInt(16) + fk.getX();
-            final int integer8 = random.nextInt(16) + fk.getZ();
-            final int integer9 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer7, integer8);
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final ChanceDecoratorConfiguration crf, final BlockPos fu) {
+        if (random.nextFloat() < 1.0f / crf.chance) {
+            final int integer7 = random.nextInt(16) + fu.getX();
+            final int integer8 = random.nextInt(16) + fu.getZ();
+            final int integer9 = bqc.getHeight(Heightmap.Types.MOTION_BLOCKING, integer7, integer8);
             return Stream.<BlockPos>of(new BlockPos(integer7, integer9, integer8));
         }
         return Stream.<BlockPos>empty();
diff --git a/src/net/minecraft/world/level/levelgen/placement/ChanceHeightmapDoubleDecorator.java b/src/net/minecraft/world/level/levelgen/placement/ChanceHeightmapDoubleDecorator.java
index a6e78aa..756a444 100644
--- a/src/net/minecraft/world/level/levelgen/placement/ChanceHeightmapDoubleDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/ChanceHeightmapDoubleDecorator.java
@@ -5,25 +5,23 @@ import net.minecraft.world.level.levelgen.Heightmap;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class ChanceHeightmapDoubleDecorator extends FeatureDecorator<ChanceDecoratorConfiguration> {
-    public ChanceHeightmapDoubleDecorator(final Function<Dynamic<?>, ? extends ChanceDecoratorConfiguration> function) {
-        super(function);
+    public ChanceHeightmapDoubleDecorator(final Codec<ChanceDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final ChanceDecoratorConfiguration cjd, final BlockPos fk) {
-        if (random.nextFloat() >= 1.0f / cjd.chance) {
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final ChanceDecoratorConfiguration crf, final BlockPos fu) {
+        if (random.nextFloat() >= 1.0f / crf.chance) {
             return Stream.<BlockPos>empty();
         }
-        final int integer7 = random.nextInt(16) + fk.getX();
-        final int integer8 = random.nextInt(16) + fk.getZ();
-        final int integer9 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer7, integer8) * 2;
+        final int integer7 = random.nextInt(16) + fu.getX();
+        final int integer8 = random.nextInt(16) + fu.getZ();
+        final int integer9 = bqc.getHeight(Heightmap.Types.MOTION_BLOCKING, integer7, integer8) * 2;
         if (integer9 <= 0) {
             return Stream.<BlockPos>empty();
         }
diff --git a/src/net/minecraft/world/level/levelgen/placement/ChancePassthroughDecorator.java b/src/net/minecraft/world/level/levelgen/placement/ChancePassthroughDecorator.java
index b02a79a..979ba48 100644
--- a/src/net/minecraft/world/level/levelgen/placement/ChancePassthroughDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/ChancePassthroughDecorator.java
@@ -4,17 +4,16 @@ import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfig
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class ChancePassthroughDecorator extends SimpleFeatureDecorator<ChanceDecoratorConfiguration> {
-    public ChancePassthroughDecorator(final Function<Dynamic<?>, ? extends ChanceDecoratorConfiguration> function) {
-        super(function);
+    public ChancePassthroughDecorator(final Codec<ChanceDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final ChanceDecoratorConfiguration cjd, final BlockPos fk) {
-        if (random.nextFloat() < 1.0f / cjd.chance) {
-            return Stream.<BlockPos>of(fk);
+    public Stream<BlockPos> place(final Random random, final ChanceDecoratorConfiguration crf, final BlockPos fu) {
+        if (random.nextFloat() < 1.0f / crf.chance) {
+            return Stream.<BlockPos>of(fu);
         }
         return Stream.<BlockPos>empty();
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/ChanceTopSolidHeightmapDecorator.java b/src/net/minecraft/world/level/levelgen/placement/ChanceTopSolidHeightmapDecorator.java
index 753ec8a..06b8a5b 100644
--- a/src/net/minecraft/world/level/levelgen/placement/ChanceTopSolidHeightmapDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/ChanceTopSolidHeightmapDecorator.java
@@ -5,23 +5,21 @@ import net.minecraft.world.level.levelgen.Heightmap;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class ChanceTopSolidHeightmapDecorator extends FeatureDecorator<ChanceDecoratorConfiguration> {
-    public ChanceTopSolidHeightmapDecorator(final Function<Dynamic<?>, ? extends ChanceDecoratorConfiguration> function) {
-        super(function);
+    public ChanceTopSolidHeightmapDecorator(final Codec<ChanceDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final ChanceDecoratorConfiguration cjd, final BlockPos fk) {
-        if (random.nextFloat() < 1.0f / cjd.chance) {
-            final int integer7 = random.nextInt(16) + fk.getX();
-            final int integer8 = random.nextInt(16) + fk.getZ();
-            final int integer9 = bjx.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer7, integer8);
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final ChanceDecoratorConfiguration crf, final BlockPos fu) {
+        if (random.nextFloat() < 1.0f / crf.chance) {
+            final int integer7 = random.nextInt(16) + fu.getX();
+            final int integer8 = random.nextInt(16) + fu.getZ();
+            final int integer9 = bqc.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer7, integer8);
             return Stream.<BlockPos>of(new BlockPos(integer7, integer9, integer8));
         }
         return Stream.<BlockPos>empty();
diff --git a/src/net/minecraft/world/level/levelgen/placement/ChorusPlantPlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/ChorusPlantPlacementDecorator.java
index 233a0f8..a40fae9 100644
--- a/src/net/minecraft/world/level/levelgen/placement/ChorusPlantPlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/ChorusPlantPlacementDecorator.java
@@ -8,29 +8,27 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration;
 
 public class ChorusPlantPlacementDecorator extends FeatureDecorator<NoneDecoratorConfiguration> {
-    public ChorusPlantPlacementDecorator(final Function<Dynamic<?>, ? extends NoneDecoratorConfiguration> function) {
-        super(function);
+    public ChorusPlantPlacementDecorator(final Codec<NoneDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final NoneDecoratorConfiguration cgu, final BlockPos fk) {
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final NoneDecoratorConfiguration cnz, final BlockPos fu) {
         final int integer7 = random.nextInt(5);
         final int integer8;
         final int integer9;
         final int integer10;
         int integer11;
         return IntStream.range(0, integer7).<BlockPos>mapToObj(integer -> {
-            integer8 = random.nextInt(16) + fk.getX();
-            integer9 = random.nextInt(16) + fk.getZ();
-            integer10 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer8, integer9);
+            integer8 = random.nextInt(16) + fu.getX();
+            integer9 = random.nextInt(16) + fu.getZ();
+            integer10 = bqc.getHeight(Heightmap.Types.MOTION_BLOCKING, integer8, integer9);
             if (integer10 > 0) {
                 integer11 = integer10 - 1;
                 return new BlockPos(integer8, integer11, integer9);
diff --git a/src/net/minecraft/world/level/levelgen/placement/ConfiguredDecorator.java b/src/net/minecraft/world/level/levelgen/placement/ConfiguredDecorator.java
index 6a26317..be17ace 100644
--- a/src/net/minecraft/world/level/levelgen/placement/ConfiguredDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/ConfiguredDecorator.java
@@ -1,44 +1,33 @@
 package net.minecraft.world.level.levelgen.placement;
 
-import net.minecraft.resources.ResourceLocation;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
+import java.util.function.Function;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 
 public class ConfiguredDecorator<DC extends DecoratorConfiguration> {
+    public static final Codec<ConfiguredDecorator<?>> CODEC;
     public final FeatureDecorator<DC> decorator;
     public final DC config;
     
-    public ConfiguredDecorator(final FeatureDecorator<DC> cka, final Dynamic<?> dynamic) {
-        this((FeatureDecorator<DecoratorConfiguration>)cka, cka.createSettings(dynamic));
+    public ConfiguredDecorator(final FeatureDecorator<DC> csc, final DC cnn) {
+        this.decorator = csc;
+        this.config = cnn;
     }
     
-    public ConfiguredDecorator(final FeatureDecorator<DC> cka, final DC cgk) {
-        this.decorator = cka;
-        this.config = cgk;
+    public <FC extends FeatureConfiguration, F extends Feature<FC>> boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final ConfiguredFeature<FC, F> ckb) {
+        return this.decorator.<FC, F>placeFeature(bqu, bqq, cha, random, fu, this.config, ckb);
     }
     
-    public <FC extends FeatureConfiguration, F extends Feature<FC>> boolean place(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final ConfiguredFeature<FC, F> cdc) {
-        return this.decorator.<FC, F>placeFeature(bjx, caa, random, fk, this.config, cdc);
-    }
-    
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("name"), dynamicOps.createString(Registry.DECORATOR.getKey(this.decorator).toString()), dynamicOps.createString("config"), this.config.<T>serialize(dynamicOps).getValue())));
-    }
-    
-    public static <T> ConfiguredDecorator<?> deserialize(final Dynamic<T> dynamic) {
-        final FeatureDecorator<? extends DecoratorConfiguration> cka2 = Registry.DECORATOR.get(new ResourceLocation(dynamic.get("name").asString("")));
-        return new ConfiguredDecorator<>(cka2, dynamic.get("config").orElseEmptyMap());
+    static {
+        CODEC = Registry.DECORATOR.dispatch("name", crl -> crl.decorator, (Function)FeatureDecorator::configuredCodec);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountBiasedRangeDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CountBiasedRangeDecorator.java
index 8323b68..0ce454c 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountBiasedRangeDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountBiasedRangeDecorator.java
@@ -5,23 +5,22 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
 
 public class CountBiasedRangeDecorator extends SimpleFeatureDecorator<CountRangeDecoratorConfiguration> {
-    public CountBiasedRangeDecorator(final Function<Dynamic<?>, ? extends CountRangeDecoratorConfiguration> function) {
-        super(function);
+    public CountBiasedRangeDecorator(final Codec<CountRangeDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final CountRangeDecoratorConfiguration cgi, final BlockPos fk) {
+    public Stream<BlockPos> place(final Random random, final CountRangeDecoratorConfiguration cnl, final BlockPos fu) {
         final int integer5;
         final int integer6;
         final int integer7;
-        return IntStream.range(0, cgi.count).<BlockPos>mapToObj(integer -> {
-            integer5 = random.nextInt(16) + fk.getX();
-            integer6 = random.nextInt(16) + fk.getZ();
-            integer7 = random.nextInt(random.nextInt(cgi.maximum - cgi.topOffset) + cgi.bottomOffset);
+        return IntStream.range(0, cnl.count).<BlockPos>mapToObj(integer -> {
+            integer5 = random.nextInt(16) + fu.getX();
+            integer6 = random.nextInt(16) + fu.getZ();
+            integer7 = random.nextInt(random.nextInt(cnl.maximum - cnl.topOffset) + cnl.bottomOffset);
             return new BlockPos(integer5, integer7, integer6);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountChanceHeightmapDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CountChanceHeightmapDecorator.java
index 8a9f8cb..e7ef3b9 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountChanceHeightmapDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountChanceHeightmapDecorator.java
@@ -6,26 +6,24 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CountChanceHeightmapDecorator extends FeatureDecorator<FrequencyChanceDecoratorConfiguration> {
-    public CountChanceHeightmapDecorator(final Function<Dynamic<?>, ? extends FrequencyChanceDecoratorConfiguration> function) {
-        super(function);
+    public CountChanceHeightmapDecorator(final Codec<FrequencyChanceDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final FrequencyChanceDecoratorConfiguration ckc, final BlockPos fk) {
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final FrequencyChanceDecoratorConfiguration cse, final BlockPos fu) {
         final int integer5;
         final int integer6;
         final int integer7;
-        return IntStream.range(0, ckc.count).filter(integer -> random.nextFloat() < ckc.chance).<BlockPos>mapToObj(integer -> {
-            integer5 = random.nextInt(16) + fk.getX();
-            integer6 = random.nextInt(16) + fk.getZ();
-            integer7 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer5, integer6);
+        return IntStream.range(0, cse.count).filter(integer -> random.nextFloat() < cse.chance).<BlockPos>mapToObj(integer -> {
+            integer5 = random.nextInt(16) + fu.getX();
+            integer6 = random.nextInt(16) + fu.getZ();
+            integer7 = bqc.getHeight(Heightmap.Types.MOTION_BLOCKING, integer5, integer6);
             return new BlockPos(integer5, integer7, integer6);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountChanceHeightmapDoubleDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CountChanceHeightmapDoubleDecorator.java
index bd4dc42..f975ee7 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountChanceHeightmapDoubleDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountChanceHeightmapDoubleDecorator.java
@@ -1,5 +1,4 @@
 java.lang.StackOverflowError
-	at java.base/java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:936)
 	at com.strobel.assembler.metadata.MetadataSystem.resolveType(MetadataSystem.java:117)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:25)
 	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
@@ -1023,3 +1022,4 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountDepthAverageDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CountDepthAverageDecorator.java
index 012e8df..5fd5dab 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountDepthAverageDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountDepthAverageDecorator.java
@@ -5,26 +5,25 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CountDepthAverageDecorator extends SimpleFeatureDecorator<DepthAverageConfigation> {
-    public CountDepthAverageDecorator(final Function<Dynamic<?>, ? extends DepthAverageConfigation> function) {
-        super(function);
+    public CountDepthAverageDecorator(final Codec<DepthAverageConfigation> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final DepthAverageConfigation cjw, final BlockPos fk) {
-        final int integer5 = cjw.count;
-        final int integer6 = cjw.baseline;
-        final int integer7 = cjw.spread;
+    public Stream<BlockPos> place(final Random random, final DepthAverageConfigation cry, final BlockPos fu) {
+        final int integer5 = cry.count;
+        final int integer6 = cry.baseline;
+        final int integer7 = cry.spread;
         final int integer8;
         final int integer9;
         final int n;
         final int n2;
         final int integer10;
         return IntStream.range(0, integer5).<BlockPos>mapToObj(integer5 -> {
-            integer8 = random.nextInt(16) + fk.getX();
-            integer9 = random.nextInt(16) + fk.getZ();
+            integer8 = random.nextInt(16) + fu.getX();
+            integer9 = random.nextInt(16) + fu.getZ();
             integer10 = random.nextInt(n) + random.nextInt(n) - n + n2;
             return new BlockPos(integer8, integer10, integer9);
         });
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountHeighmapDoubleDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CountHeighmapDoubleDecorator.java
index bd4dc42..80c20fd 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountHeighmapDoubleDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountHeighmapDoubleDecorator.java
@@ -1,18 +1,17 @@
 java.lang.StackOverflowError
-	at java.base/java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:936)
-	at com.strobel.assembler.metadata.MetadataSystem.resolveType(MetadataSystem.java:117)
-	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:25)
+	at java.base/java.util.Collections$SetFromMap.contains(Collections.java:5564)
+	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:21)
 	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
 	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.resolve(CoreMetadataFactory.java:616)
-	at com.strobel.assembler.metadata.MetadataHelper$9.visitClassType(MetadataHelper.java:2114)
-	at com.strobel.assembler.metadata.MetadataHelper$9.visitClassType(MetadataHelper.java:2075)
+	at com.strobel.assembler.metadata.MetadataHelper$10.visitClassType(MetadataHelper.java:2611)
+	at com.strobel.assembler.metadata.MetadataHelper$10.visitClassType(MetadataHelper.java:2608)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:21)
-	at com.strobel.assembler.metadata.MetadataHelper.getSuperType(MetadataHelper.java:1264)
-	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2011)
+	at com.strobel.assembler.metadata.MetadataHelper.getInterfaces(MetadataHelper.java:702)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2027)
 	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
@@ -1023,3 +1022,4 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountHeight64Decorator.java b/src/net/minecraft/world/level/levelgen/placement/CountHeight64Decorator.java
index c0fec48..56c6fff 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountHeight64Decorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountHeight64Decorator.java
@@ -5,25 +5,23 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CountHeight64Decorator extends FeatureDecorator<FrequencyDecoratorConfiguration> {
-    public CountHeight64Decorator(final Function<Dynamic<?>, ? extends FrequencyDecoratorConfiguration> function) {
-        super(function);
+    public CountHeight64Decorator(final Codec<FrequencyDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final FrequencyDecoratorConfiguration ckd, final BlockPos fk) {
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final FrequencyDecoratorConfiguration csf, final BlockPos fu) {
         final int integer4;
         final int integer5;
         final int integer6;
-        return IntStream.range(0, ckd.count).<BlockPos>mapToObj(integer -> {
-            integer4 = random.nextInt(16) + fk.getX();
-            integer5 = random.nextInt(16) + fk.getZ();
+        return IntStream.range(0, csf.count).<BlockPos>mapToObj(integer -> {
+            integer4 = random.nextInt(16) + fu.getX();
+            integer5 = random.nextInt(16) + fu.getZ();
             integer6 = 64;
             return new BlockPos(integer4, 64, integer5);
         });
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountHeightmap32Decorator.java b/src/net/minecraft/world/level/levelgen/placement/CountHeightmap32Decorator.java
index 80c20fd..346d870 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountHeightmap32Decorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountHeightmap32Decorator.java
@@ -1,28 +1,22 @@
 java.lang.StackOverflowError
-	at java.base/java.util.Collections$SetFromMap.contains(Collections.java:5564)
-	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:21)
+	at com.strobel.assembler.metadata.MetadataSystem.resolveType(MetadataSystem.java:117)
+	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:25)
 	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
 	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.resolve(CoreMetadataFactory.java:616)
-	at com.strobel.assembler.metadata.MetadataHelper$10.visitClassType(MetadataHelper.java:2611)
-	at com.strobel.assembler.metadata.MetadataHelper$10.visitClassType(MetadataHelper.java:2608)
+	at com.strobel.assembler.metadata.MetadataHelper$9.visitClassType(MetadataHelper.java:2114)
+	at com.strobel.assembler.metadata.MetadataHelper$9.visitClassType(MetadataHelper.java:2075)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:21)
-	at com.strobel.assembler.metadata.MetadataHelper.getInterfaces(MetadataHelper.java:702)
-	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2027)
+	at com.strobel.assembler.metadata.MetadataHelper.getSuperType(MetadataHelper.java:1264)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2011)
 	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
 	at com.strobel.assembler.metadata.MetadataHelper.asSuper(MetadataHelper.java:727)
 	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2017)
-	at com.strobel.assembler.metadata.MetadataHelper$8.visitParameterizedType(MetadataHelper.java:2056)
-	at com.strobel.assembler.metadata.MetadataHelper$8.visitParameterizedType(MetadataHelper.java:1994)
-	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedGenericType.accept(CoreMetadataFactory.java:653)
-	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
-	at com.strobel.assembler.metadata.MetadataHelper.asSuper(MetadataHelper.java:727)
-	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2028)
 	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
@@ -1023,3 +1017,9 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
 	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountHeightmapDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CountHeightmapDecorator.java
index 9fa99b2..c9cc0f2 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountHeightmapDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountHeightmapDecorator.java
@@ -6,26 +6,24 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CountHeightmapDecorator extends FeatureDecorator<FrequencyDecoratorConfiguration> {
-    public CountHeightmapDecorator(final Function<Dynamic<?>, ? extends FrequencyDecoratorConfiguration> function) {
-        super(function);
+    public CountHeightmapDecorator(final Codec<FrequencyDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final FrequencyDecoratorConfiguration ckd, final BlockPos fk) {
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final FrequencyDecoratorConfiguration csf, final BlockPos fu) {
         final int integer5;
         final int integer6;
         final int integer7;
-        return IntStream.range(0, ckd.count).<BlockPos>mapToObj(integer -> {
-            integer5 = random.nextInt(16) + fk.getX();
-            integer6 = random.nextInt(16) + fk.getZ();
-            integer7 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer5, integer6);
+        return IntStream.range(0, csf.count).<BlockPos>mapToObj(integer -> {
+            integer5 = random.nextInt(16) + fu.getX();
+            integer6 = random.nextInt(16) + fu.getZ();
+            integer7 = bqc.getHeight(Heightmap.Types.MOTION_BLOCKING, integer5, integer6);
             return new BlockPos(integer5, integer7, integer6);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountTopSolidDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CountTopSolidDecorator.java
index fccac96..ff7cfe8 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountTopSolidDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountTopSolidDecorator.java
@@ -6,26 +6,24 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CountTopSolidDecorator extends FeatureDecorator<FrequencyDecoratorConfiguration> {
-    public CountTopSolidDecorator(final Function<Dynamic<?>, ? extends FrequencyDecoratorConfiguration> function) {
-        super(function);
+    public CountTopSolidDecorator(final Codec<FrequencyDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final FrequencyDecoratorConfiguration ckd, final BlockPos fk) {
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final FrequencyDecoratorConfiguration csf, final BlockPos fu) {
         final int integer5;
         final int integer6;
         final int integer7;
-        return IntStream.range(0, ckd.count).<BlockPos>mapToObj(integer -> {
-            integer5 = random.nextInt(16) + fk.getX();
-            integer6 = random.nextInt(16) + fk.getZ();
-            integer7 = bjx.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer5, integer6);
+        return IntStream.range(0, csf.count).<BlockPos>mapToObj(integer -> {
+            integer5 = random.nextInt(16) + fu.getX();
+            integer6 = random.nextInt(16) + fu.getZ();
+            integer7 = bqc.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer5, integer6);
             return new BlockPos(integer5, integer7, integer6);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountVeryBiasedRangeDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CountVeryBiasedRangeDecorator.java
index 1078b95..f1c17d2 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountVeryBiasedRangeDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountVeryBiasedRangeDecorator.java
@@ -5,23 +5,22 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
 
 public class CountVeryBiasedRangeDecorator extends SimpleFeatureDecorator<CountRangeDecoratorConfiguration> {
-    public CountVeryBiasedRangeDecorator(final Function<Dynamic<?>, ? extends CountRangeDecoratorConfiguration> function) {
-        super(function);
+    public CountVeryBiasedRangeDecorator(final Codec<CountRangeDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final CountRangeDecoratorConfiguration cgi, final BlockPos fk) {
+    public Stream<BlockPos> place(final Random random, final CountRangeDecoratorConfiguration cnl, final BlockPos fu) {
         final int integer5;
         final int integer6;
         final int integer7;
-        return IntStream.range(0, cgi.count).<BlockPos>mapToObj(integer -> {
-            integer5 = random.nextInt(16) + fk.getX();
-            integer6 = random.nextInt(16) + fk.getZ();
-            integer7 = random.nextInt(random.nextInt(random.nextInt(cgi.maximum - cgi.topOffset) + cgi.bottomOffset) + cgi.bottomOffset);
+        return IntStream.range(0, cnl.count).<BlockPos>mapToObj(integer -> {
+            integer5 = random.nextInt(16) + fu.getX();
+            integer6 = random.nextInt(16) + fu.getZ();
+            integer7 = random.nextInt(random.nextInt(random.nextInt(cnl.maximum - cnl.topOffset) + cnl.bottomOffset) + cnl.bottomOffset);
             return new BlockPos(integer5, integer7, integer6);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountWithExtraChanceHeightmapDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CountWithExtraChanceHeightmapDecorator.java
index bd76e37..5c51c30 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountWithExtraChanceHeightmapDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountWithExtraChanceHeightmapDecorator.java
@@ -6,30 +6,28 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class CountWithExtraChanceHeightmapDecorator extends FeatureDecorator<FrequencyWithExtraChanceDecoratorConfiguration> {
-    public CountWithExtraChanceHeightmapDecorator(final Function<Dynamic<?>, ? extends FrequencyWithExtraChanceDecoratorConfiguration> function) {
-        super(function);
+    public CountWithExtraChanceHeightmapDecorator(final Codec<FrequencyWithExtraChanceDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final FrequencyWithExtraChanceDecoratorConfiguration cke, final BlockPos fk) {
-        int integer7 = cke.count;
-        if (random.nextFloat() < cke.extraChance) {
-            integer7 += cke.extraCount;
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final FrequencyWithExtraChanceDecoratorConfiguration csg, final BlockPos fu) {
+        int integer7 = csg.count;
+        if (random.nextFloat() < csg.extraChance) {
+            integer7 += csg.extraCount;
         }
         final int integer8;
         final int integer9;
         final int integer10;
         return IntStream.range(0, integer7).<BlockPos>mapToObj(integer -> {
-            integer8 = random.nextInt(16) + fk.getX();
-            integer9 = random.nextInt(16) + fk.getZ();
-            integer10 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer8, integer9);
+            integer8 = random.nextInt(16) + fu.getX();
+            integer9 = random.nextInt(16) + fu.getZ();
+            integer10 = bqc.getHeight(Heightmap.Types.MOTION_BLOCKING, integer8, integer9);
             return new BlockPos(integer8, integer10, integer9);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/DarkOakTreePlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/DarkOakTreePlacementDecorator.java
index 583967d..8f5092e 100644
--- a/src/net/minecraft/world/level/levelgen/placement/DarkOakTreePlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/DarkOakTreePlacementDecorator.java
@@ -6,20 +6,18 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration;
 
 public class DarkOakTreePlacementDecorator extends FeatureDecorator<NoneDecoratorConfiguration> {
-    public DarkOakTreePlacementDecorator(final Function<Dynamic<?>, ? extends NoneDecoratorConfiguration> function) {
-        super(function);
+    public DarkOakTreePlacementDecorator(final Codec<NoneDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final NoneDecoratorConfiguration cgu, final BlockPos fk) {
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final NoneDecoratorConfiguration cnz, final BlockPos fu) {
         final int integer2;
         final int integer3;
         final int integer4;
@@ -28,9 +26,9 @@ public class DarkOakTreePlacementDecorator extends FeatureDecorator<NoneDecorato
         return IntStream.range(0, 16).<BlockPos>mapToObj(integer -> {
             integer2 = integer / 4;
             integer3 = integer % 4;
-            integer4 = integer2 * 4 + 1 + random.nextInt(3) + fk.getX();
-            integer5 = integer3 * 4 + 1 + random.nextInt(3) + fk.getZ();
-            integer6 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer4, integer5);
+            integer4 = integer2 * 4 + 1 + random.nextInt(3) + fu.getX();
+            integer5 = integer3 * 4 + 1 + random.nextInt(3) + fu.getZ();
+            integer6 = bqc.getHeight(Heightmap.Types.MOTION_BLOCKING, integer4, integer5);
             return new BlockPos(integer4, integer6, integer5);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/DepthAverageConfigation.java b/src/net/minecraft/world/level/levelgen/placement/DepthAverageConfigation.java
index 0ebba59..2143484 100644
--- a/src/net/minecraft/world/level/levelgen/placement/DepthAverageConfigation.java
+++ b/src/net/minecraft/world/level/levelgen/placement/DepthAverageConfigation.java
@@ -1,12 +1,13 @@
 package net.minecraft.world.level.levelgen.placement;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 
 public class DepthAverageConfigation implements DecoratorConfiguration {
+    public static final Codec<DepthAverageConfigation> CODEC;
     public final int count;
     public final int baseline;
     public final int spread;
@@ -17,15 +18,7 @@ public class DepthAverageConfigation implements DecoratorConfiguration {
         this.spread = integer3;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("count"), dynamicOps.createInt(this.count), dynamicOps.createString("baseline"), dynamicOps.createInt(this.baseline), dynamicOps.createString("spread"), dynamicOps.createInt(this.spread))));
-    }
-    
-    public static DepthAverageConfigation deserialize(final Dynamic<?> dynamic) {
-        final int integer2 = dynamic.get("count").asInt(0);
-        final int integer3 = dynamic.get("baseline").asInt(0);
-        final int integer4 = dynamic.get("spread").asInt(0);
-        return new DepthAverageConfigation(integer2, integer3, integer4);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("count").forGetter(cry -> cry.count), (App)Codec.INT.fieldOf("baseline").forGetter(cry -> cry.baseline), (App)Codec.INT.fieldOf("spread").forGetter(cry -> cry.spread)).apply(instance, DepthAverageConfigation::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/EmeraldPlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/EmeraldPlacementDecorator.java
index baa88fb..8710cc9 100644
--- a/src/net/minecraft/world/level/levelgen/placement/EmeraldPlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/EmeraldPlacementDecorator.java
@@ -5,23 +5,22 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration;
 
 public class EmeraldPlacementDecorator extends SimpleFeatureDecorator<NoneDecoratorConfiguration> {
-    public EmeraldPlacementDecorator(final Function<Dynamic<?>, ? extends NoneDecoratorConfiguration> function) {
-        super(function);
+    public EmeraldPlacementDecorator(final Codec<NoneDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final NoneDecoratorConfiguration cgu, final BlockPos fk) {
+    public Stream<BlockPos> place(final Random random, final NoneDecoratorConfiguration cnz, final BlockPos fu) {
         final int integer5 = 3 + random.nextInt(6);
         final int integer6;
         final int integer7;
         final int integer8;
         return IntStream.range(0, integer5).<BlockPos>mapToObj(integer -> {
-            integer6 = random.nextInt(16) + fk.getX();
-            integer7 = random.nextInt(16) + fk.getZ();
+            integer6 = random.nextInt(16) + fu.getX();
+            integer7 = random.nextInt(16) + fu.getZ();
             integer8 = random.nextInt(28) + 4;
             return new BlockPos(integer6, integer8, integer7);
         });
diff --git a/src/net/minecraft/world/level/levelgen/placement/EndGatewayPlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/EndGatewayPlacementDecorator.java
index d55fa3f..c669ac7 100644
--- a/src/net/minecraft/world/level/levelgen/placement/EndGatewayPlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/EndGatewayPlacementDecorator.java
@@ -5,24 +5,22 @@ import net.minecraft.world.level.levelgen.Heightmap;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration;
 
 public class EndGatewayPlacementDecorator extends FeatureDecorator<NoneDecoratorConfiguration> {
-    public EndGatewayPlacementDecorator(final Function<Dynamic<?>, ? extends NoneDecoratorConfiguration> function) {
-        super(function);
+    public EndGatewayPlacementDecorator(final Codec<NoneDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final NoneDecoratorConfiguration cgu, final BlockPos fk) {
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final NoneDecoratorConfiguration cnz, final BlockPos fu) {
         if (random.nextInt(700) == 0) {
-            final int integer7 = random.nextInt(16) + fk.getX();
-            final int integer8 = random.nextInt(16) + fk.getZ();
-            final int integer9 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer7, integer8);
+            final int integer7 = random.nextInt(16) + fu.getX();
+            final int integer8 = random.nextInt(16) + fu.getZ();
+            final int integer9 = bqc.getHeight(Heightmap.Types.MOTION_BLOCKING, integer7, integer8);
             if (integer9 > 0) {
                 final int integer10 = integer9 + 3 + random.nextInt(7);
                 return Stream.<BlockPos>of(new BlockPos(integer7, integer10, integer8));
diff --git a/src/net/minecraft/world/level/levelgen/placement/EndIslandPlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/EndIslandPlacementDecorator.java
index ec24cd4..c46527a 100644
--- a/src/net/minecraft/world/level/levelgen/placement/EndIslandPlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/EndIslandPlacementDecorator.java
@@ -4,21 +4,20 @@ import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfig
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration;
 
 public class EndIslandPlacementDecorator extends SimpleFeatureDecorator<NoneDecoratorConfiguration> {
-    public EndIslandPlacementDecorator(final Function<Dynamic<?>, ? extends NoneDecoratorConfiguration> function) {
-        super(function);
+    public EndIslandPlacementDecorator(final Codec<NoneDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final NoneDecoratorConfiguration cgu, final BlockPos fk) {
+    public Stream<BlockPos> place(final Random random, final NoneDecoratorConfiguration cnz, final BlockPos fu) {
         Stream<BlockPos> stream5 = Stream.<BlockPos>empty();
         if (random.nextInt(14) == 0) {
-            stream5 = Stream.<BlockPos>concat(stream5, Stream.of((T)fk.offset(random.nextInt(16), 55 + random.nextInt(16), random.nextInt(16))));
+            stream5 = Stream.<BlockPos>concat(stream5, Stream.of((T)fu.offset(random.nextInt(16), 55 + random.nextInt(16), random.nextInt(16))));
             if (random.nextInt(4) == 0) {
-                stream5 = Stream.<BlockPos>concat(stream5, Stream.of((T)fk.offset(random.nextInt(16), 55 + random.nextInt(16), random.nextInt(16))));
+                stream5 = Stream.<BlockPos>concat(stream5, Stream.of((T)fu.offset(random.nextInt(16), 55 + random.nextInt(16), random.nextInt(16))));
             }
             return stream5;
         }
diff --git a/src/net/minecraft/world/level/levelgen/placement/FeatureDecorator.java b/src/net/minecraft/world/level/levelgen/placement/FeatureDecorator.java
index 59343f2..7cdd855 100644
--- a/src/net/minecraft/world/level/levelgen/placement/FeatureDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/FeatureDecorator.java
@@ -2,23 +2,23 @@ package net.minecraft.world.level.levelgen.placement;
 
 import net.minecraft.world.level.levelgen.placement.nether.LightGemChanceDecorator;
 import net.minecraft.world.level.levelgen.placement.nether.MagmaDecorator;
-import net.minecraft.world.level.levelgen.placement.nether.HellFireDecorator;
+import net.minecraft.world.level.levelgen.placement.nether.FireDecorator;
 import net.minecraft.world.level.levelgen.placement.nether.ChanceRangeDecorator;
 import net.minecraft.world.level.levelgen.placement.nether.RandomCountRangeDecorator;
 import net.minecraft.world.level.levelgen.placement.nether.CountRangeDecorator;
 import java.util.stream.Stream;
-import java.util.concurrent.atomic.AtomicBoolean;
+import net.minecraft.world.level.LevelAccessor;
+import org.apache.commons.lang3.mutable.MutableBoolean;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.NoiseDependantDecoratorConfiguration;
@@ -52,7 +52,7 @@ public abstract class FeatureDecorator<DC extends DecoratorConfiguration> {
     public static final FeatureDecorator<NoiseCountFactorDecoratorConfiguration> TOP_SOLID_HEIGHTMAP_NOISE_BIASED;
     public static final FeatureDecorator<CarvingMaskDecoratorConfiguration> CARVING_MASK;
     public static final FeatureDecorator<FrequencyDecoratorConfiguration> FOREST_ROCK;
-    public static final FeatureDecorator<FrequencyDecoratorConfiguration> HELL_FIRE;
+    public static final FeatureDecorator<FrequencyDecoratorConfiguration> FIRE;
     public static final FeatureDecorator<FrequencyDecoratorConfiguration> MAGMA;
     public static final FeatureDecorator<NoneDecoratorConfiguration> EMERALD_ORE;
     public static final FeatureDecorator<ChanceDecoratorConfiguration> LAVA_LAKE;
@@ -64,37 +64,37 @@ public abstract class FeatureDecorator<DC extends DecoratorConfiguration> {
     public static final FeatureDecorator<NoneDecoratorConfiguration> END_ISLAND;
     public static final FeatureDecorator<NoneDecoratorConfiguration> CHORUS_PLANT;
     public static final FeatureDecorator<NoneDecoratorConfiguration> END_GATEWAY;
-    private final Function<Dynamic<?>, ? extends DC> configurationFactory;
+    private final Codec<ConfiguredDecorator<DC>> configuredCodec;
     
-    private static <T extends DecoratorConfiguration, G extends FeatureDecorator<T>> G register(final String string, final G cka) {
-        return Registry.<G>register(Registry.DECORATOR, string, cka);
+    private static <T extends DecoratorConfiguration, G extends FeatureDecorator<T>> G register(final String string, final G csc) {
+        return Registry.<G>register(Registry.DECORATOR, string, csc);
     }
     
-    public FeatureDecorator(final Function<Dynamic<?>, ? extends DC> function) {
-        this.configurationFactory = function;
+    public FeatureDecorator(final Codec<DC> codec) {
+        this.configuredCodec = (Codec<ConfiguredDecorator<DC>>)codec.fieldOf("config").xmap(cnn -> new ConfiguredDecorator((FeatureDecorator<DecoratorConfiguration>)this, cnn), crl -> crl.config).codec();
     }
     
-    public DC createSettings(final Dynamic<?> dynamic) {
-        return (DC)this.configurationFactory.apply(dynamic);
+    public ConfiguredDecorator<DC> configured(final DC cnn) {
+        return new ConfiguredDecorator<DC>(this, cnn);
     }
     
-    public ConfiguredDecorator<DC> configured(final DC cgk) {
-        return new ConfiguredDecorator<DC>(this, cgk);
+    public Codec<ConfiguredDecorator<DC>> configuredCodec() {
+        return this.configuredCodec;
     }
     
-    protected <FC extends FeatureConfiguration, F extends Feature<FC>> boolean placeFeature(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final BlockPos fk, final DC cgk, final ConfiguredFeature<FC, F> cdc) {
-        final AtomicBoolean atomicBoolean8 = new AtomicBoolean(false);
-        final boolean boolean7;
-        final AtomicBoolean atomicBoolean9;
-        this.getPositions(bjx, caa, random, cgk, fk).forEach(fk -> {
-            boolean7 = cdc.place(bjx, caa, random, fk);
-            atomicBoolean9.set(atomicBoolean9.get() || boolean7);
+    protected <FC extends FeatureConfiguration, F extends Feature<FC>> boolean placeFeature(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BlockPos fu, final DC cnn, final ConfiguredFeature<FC, F> ckb) {
+        final MutableBoolean mutableBoolean9 = new MutableBoolean();
+        final MutableBoolean mutableBoolean10;
+        this.getPositions(bqu, cha, random, cnn, fu).forEach(fu -> {
+            if (ckb.place(bqu, bqq, cha, random, fu)) {
+                mutableBoolean10.setTrue();
+            }
             return;
         });
-        return atomicBoolean8.get();
+        return mutableBoolean9.isTrue();
     }
     
-    public abstract Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final DC cgk, final BlockPos fk);
+    public abstract Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final DC cnn, final BlockPos fu);
     
     @Override
     public String toString() {
@@ -102,43 +102,43 @@ public abstract class FeatureDecorator<DC extends DecoratorConfiguration> {
     }
     
     static {
-        NOPE = FeatureDecorator.<DecoratorConfiguration, NopePlacementDecorator>register("nope", new NopePlacementDecorator(NoneDecoratorConfiguration::deserialize));
-        COUNT_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, CountHeightmapDecorator>register("count_heightmap", new CountHeightmapDecorator(FrequencyDecoratorConfiguration::deserialize));
-        COUNT_TOP_SOLID = FeatureDecorator.<DecoratorConfiguration, CountTopSolidDecorator>register("count_top_solid", new CountTopSolidDecorator(FrequencyDecoratorConfiguration::deserialize));
-        COUNT_HEIGHTMAP_32 = FeatureDecorator.<DecoratorConfiguration, CountHeightmap32Decorator>register("count_heightmap_32", new CountHeightmap32Decorator(FrequencyDecoratorConfiguration::deserialize));
-        COUNT_HEIGHTMAP_DOUBLE = FeatureDecorator.<DecoratorConfiguration, CountHeighmapDoubleDecorator>register("count_heightmap_double", new CountHeighmapDoubleDecorator(FrequencyDecoratorConfiguration::deserialize));
-        COUNT_HEIGHT_64 = FeatureDecorator.<DecoratorConfiguration, CountHeight64Decorator>register("count_height_64", new CountHeight64Decorator(FrequencyDecoratorConfiguration::deserialize));
-        NOISE_HEIGHTMAP_32 = FeatureDecorator.<DecoratorConfiguration, NoiseHeightmap32Decorator>register("noise_heightmap_32", new NoiseHeightmap32Decorator(NoiseDependantDecoratorConfiguration::deserialize));
-        NOISE_HEIGHTMAP_DOUBLE = FeatureDecorator.<DecoratorConfiguration, NoiseHeightmapDoubleDecorator>register("noise_heightmap_double", new NoiseHeightmapDoubleDecorator(NoiseDependantDecoratorConfiguration::deserialize));
-        CHANCE_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, ChanceHeightmapDecorator>register("chance_heightmap", new ChanceHeightmapDecorator(ChanceDecoratorConfiguration::deserialize));
-        CHANCE_HEIGHTMAP_DOUBLE = FeatureDecorator.<DecoratorConfiguration, ChanceHeightmapDoubleDecorator>register("chance_heightmap_double", new ChanceHeightmapDoubleDecorator(ChanceDecoratorConfiguration::deserialize));
-        CHANCE_PASSTHROUGH = FeatureDecorator.<DecoratorConfiguration, ChancePassthroughDecorator>register("chance_passthrough", new ChancePassthroughDecorator(ChanceDecoratorConfiguration::deserialize));
-        CHANCE_TOP_SOLID_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, ChanceTopSolidHeightmapDecorator>register("chance_top_solid_heightmap", new ChanceTopSolidHeightmapDecorator(ChanceDecoratorConfiguration::deserialize));
-        COUNT_EXTRA_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, CountWithExtraChanceHeightmapDecorator>register("count_extra_heightmap", new CountWithExtraChanceHeightmapDecorator(FrequencyWithExtraChanceDecoratorConfiguration::deserialize));
-        COUNT_RANGE = FeatureDecorator.<DecoratorConfiguration, CountRangeDecorator>register("count_range", new CountRangeDecorator(CountRangeDecoratorConfiguration::deserialize));
-        COUNT_BIASED_RANGE = FeatureDecorator.<DecoratorConfiguration, CountBiasedRangeDecorator>register("count_biased_range", new CountBiasedRangeDecorator(CountRangeDecoratorConfiguration::deserialize));
-        COUNT_VERY_BIASED_RANGE = FeatureDecorator.<DecoratorConfiguration, CountVeryBiasedRangeDecorator>register("count_very_biased_range", new CountVeryBiasedRangeDecorator(CountRangeDecoratorConfiguration::deserialize));
-        RANDOM_COUNT_RANGE = FeatureDecorator.<DecoratorConfiguration, RandomCountRangeDecorator>register("random_count_range", new RandomCountRangeDecorator(CountRangeDecoratorConfiguration::deserialize));
-        CHANCE_RANGE = FeatureDecorator.<DecoratorConfiguration, ChanceRangeDecorator>register("chance_range", new ChanceRangeDecorator(ChanceRangeDecoratorConfiguration::deserialize));
-        COUNT_CHANCE_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, CountChanceHeightmapDecorator>register("count_chance_heightmap", new CountChanceHeightmapDecorator(FrequencyChanceDecoratorConfiguration::deserialize));
-        COUNT_CHANCE_HEIGHTMAP_DOUBLE = FeatureDecorator.<DecoratorConfiguration, CountChanceHeightmapDoubleDecorator>register("count_chance_heightmap_double", new CountChanceHeightmapDoubleDecorator(FrequencyChanceDecoratorConfiguration::deserialize));
-        COUNT_DEPTH_AVERAGE = FeatureDecorator.<DecoratorConfiguration, CountDepthAverageDecorator>register("count_depth_average", new CountDepthAverageDecorator(DepthAverageConfigation::deserialize));
-        TOP_SOLID_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, TopSolidHeightMapDecorator>register("top_solid_heightmap", new TopSolidHeightMapDecorator(NoneDecoratorConfiguration::deserialize));
-        TOP_SOLID_HEIGHTMAP_RANGE = FeatureDecorator.<DecoratorConfiguration, TopSolidHeightMapRangeDecorator>register("top_solid_heightmap_range", new TopSolidHeightMapRangeDecorator(RangeDecoratorConfiguration::deserialize));
-        TOP_SOLID_HEIGHTMAP_NOISE_BIASED = FeatureDecorator.<DecoratorConfiguration, TopSolidHeightMapNoiseBasedDecorator>register("top_solid_heightmap_noise_biased", new TopSolidHeightMapNoiseBasedDecorator(NoiseCountFactorDecoratorConfiguration::deserialize));
-        CARVING_MASK = FeatureDecorator.<DecoratorConfiguration, CarvingMaskDecorator>register("carving_mask", new CarvingMaskDecorator(CarvingMaskDecoratorConfiguration::deserialize));
-        FOREST_ROCK = FeatureDecorator.<DecoratorConfiguration, ForestRockPlacementDecorator>register("forest_rock", new ForestRockPlacementDecorator(FrequencyDecoratorConfiguration::deserialize));
-        HELL_FIRE = FeatureDecorator.<DecoratorConfiguration, HellFireDecorator>register("hell_fire", new HellFireDecorator(FrequencyDecoratorConfiguration::deserialize));
-        MAGMA = FeatureDecorator.<DecoratorConfiguration, MagmaDecorator>register("magma", new MagmaDecorator(FrequencyDecoratorConfiguration::deserialize));
-        EMERALD_ORE = FeatureDecorator.<DecoratorConfiguration, EmeraldPlacementDecorator>register("emerald_ore", new EmeraldPlacementDecorator(NoneDecoratorConfiguration::deserialize));
-        LAVA_LAKE = FeatureDecorator.<DecoratorConfiguration, LakeLavaPlacementDecorator>register("lava_lake", new LakeLavaPlacementDecorator(ChanceDecoratorConfiguration::deserialize));
-        WATER_LAKE = FeatureDecorator.<DecoratorConfiguration, LakeWaterPlacementDecorator>register("water_lake", new LakeWaterPlacementDecorator(ChanceDecoratorConfiguration::deserialize));
-        DUNGEONS = FeatureDecorator.<DecoratorConfiguration, MonsterRoomPlacementDecorator>register("dungeons", new MonsterRoomPlacementDecorator(ChanceDecoratorConfiguration::deserialize));
-        DARK_OAK_TREE = FeatureDecorator.<DecoratorConfiguration, DarkOakTreePlacementDecorator>register("dark_oak_tree", new DarkOakTreePlacementDecorator(NoneDecoratorConfiguration::deserialize));
-        ICEBERG = FeatureDecorator.<DecoratorConfiguration, IcebergPlacementDecorator>register("iceberg", new IcebergPlacementDecorator(ChanceDecoratorConfiguration::deserialize));
-        LIGHT_GEM_CHANCE = FeatureDecorator.<DecoratorConfiguration, LightGemChanceDecorator>register("light_gem_chance", new LightGemChanceDecorator(FrequencyDecoratorConfiguration::deserialize));
-        END_ISLAND = FeatureDecorator.<DecoratorConfiguration, EndIslandPlacementDecorator>register("end_island", new EndIslandPlacementDecorator(NoneDecoratorConfiguration::deserialize));
-        CHORUS_PLANT = FeatureDecorator.<DecoratorConfiguration, ChorusPlantPlacementDecorator>register("chorus_plant", new ChorusPlantPlacementDecorator(NoneDecoratorConfiguration::deserialize));
-        END_GATEWAY = FeatureDecorator.<DecoratorConfiguration, EndGatewayPlacementDecorator>register("end_gateway", new EndGatewayPlacementDecorator(NoneDecoratorConfiguration::deserialize));
+        NOPE = FeatureDecorator.<DecoratorConfiguration, NopePlacementDecorator>register("nope", new NopePlacementDecorator(NoneDecoratorConfiguration.CODEC));
+        COUNT_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, CountHeightmapDecorator>register("count_heightmap", new CountHeightmapDecorator(FrequencyDecoratorConfiguration.CODEC));
+        COUNT_TOP_SOLID = FeatureDecorator.<DecoratorConfiguration, CountTopSolidDecorator>register("count_top_solid", new CountTopSolidDecorator(FrequencyDecoratorConfiguration.CODEC));
+        COUNT_HEIGHTMAP_32 = FeatureDecorator.<DecoratorConfiguration, CountHeightmap32Decorator>register("count_heightmap_32", new CountHeightmap32Decorator(FrequencyDecoratorConfiguration.CODEC));
+        COUNT_HEIGHTMAP_DOUBLE = FeatureDecorator.<DecoratorConfiguration, CountHeighmapDoubleDecorator>register("count_heightmap_double", new CountHeighmapDoubleDecorator(FrequencyDecoratorConfiguration.CODEC));
+        COUNT_HEIGHT_64 = FeatureDecorator.<DecoratorConfiguration, CountHeight64Decorator>register("count_height_64", new CountHeight64Decorator(FrequencyDecoratorConfiguration.CODEC));
+        NOISE_HEIGHTMAP_32 = FeatureDecorator.<DecoratorConfiguration, NoiseHeightmap32Decorator>register("noise_heightmap_32", new NoiseHeightmap32Decorator(NoiseDependantDecoratorConfiguration.CODEC));
+        NOISE_HEIGHTMAP_DOUBLE = FeatureDecorator.<DecoratorConfiguration, NoiseHeightmapDoubleDecorator>register("noise_heightmap_double", new NoiseHeightmapDoubleDecorator(NoiseDependantDecoratorConfiguration.CODEC));
+        CHANCE_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, ChanceHeightmapDecorator>register("chance_heightmap", new ChanceHeightmapDecorator(ChanceDecoratorConfiguration.CODEC));
+        CHANCE_HEIGHTMAP_DOUBLE = FeatureDecorator.<DecoratorConfiguration, ChanceHeightmapDoubleDecorator>register("chance_heightmap_double", new ChanceHeightmapDoubleDecorator(ChanceDecoratorConfiguration.CODEC));
+        CHANCE_PASSTHROUGH = FeatureDecorator.<DecoratorConfiguration, ChancePassthroughDecorator>register("chance_passthrough", new ChancePassthroughDecorator(ChanceDecoratorConfiguration.CODEC));
+        CHANCE_TOP_SOLID_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, ChanceTopSolidHeightmapDecorator>register("chance_top_solid_heightmap", new ChanceTopSolidHeightmapDecorator(ChanceDecoratorConfiguration.CODEC));
+        COUNT_EXTRA_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, CountWithExtraChanceHeightmapDecorator>register("count_extra_heightmap", new CountWithExtraChanceHeightmapDecorator(FrequencyWithExtraChanceDecoratorConfiguration.CODEC));
+        COUNT_RANGE = FeatureDecorator.<DecoratorConfiguration, CountRangeDecorator>register("count_range", new CountRangeDecorator(CountRangeDecoratorConfiguration.CODEC));
+        COUNT_BIASED_RANGE = FeatureDecorator.<DecoratorConfiguration, CountBiasedRangeDecorator>register("count_biased_range", new CountBiasedRangeDecorator(CountRangeDecoratorConfiguration.CODEC));
+        COUNT_VERY_BIASED_RANGE = FeatureDecorator.<DecoratorConfiguration, CountVeryBiasedRangeDecorator>register("count_very_biased_range", new CountVeryBiasedRangeDecorator(CountRangeDecoratorConfiguration.CODEC));
+        RANDOM_COUNT_RANGE = FeatureDecorator.<DecoratorConfiguration, RandomCountRangeDecorator>register("random_count_range", new RandomCountRangeDecorator(CountRangeDecoratorConfiguration.CODEC));
+        CHANCE_RANGE = FeatureDecorator.<DecoratorConfiguration, ChanceRangeDecorator>register("chance_range", new ChanceRangeDecorator(ChanceRangeDecoratorConfiguration.CODEC));
+        COUNT_CHANCE_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, CountChanceHeightmapDecorator>register("count_chance_heightmap", new CountChanceHeightmapDecorator(FrequencyChanceDecoratorConfiguration.CODEC));
+        COUNT_CHANCE_HEIGHTMAP_DOUBLE = FeatureDecorator.<DecoratorConfiguration, CountChanceHeightmapDoubleDecorator>register("count_chance_heightmap_double", new CountChanceHeightmapDoubleDecorator(FrequencyChanceDecoratorConfiguration.CODEC));
+        COUNT_DEPTH_AVERAGE = FeatureDecorator.<DecoratorConfiguration, CountDepthAverageDecorator>register("count_depth_average", new CountDepthAverageDecorator(DepthAverageConfigation.CODEC));
+        TOP_SOLID_HEIGHTMAP = FeatureDecorator.<DecoratorConfiguration, TopSolidHeightMapDecorator>register("top_solid_heightmap", new TopSolidHeightMapDecorator(NoneDecoratorConfiguration.CODEC));
+        TOP_SOLID_HEIGHTMAP_RANGE = FeatureDecorator.<DecoratorConfiguration, TopSolidHeightMapRangeDecorator>register("top_solid_heightmap_range", new TopSolidHeightMapRangeDecorator(RangeDecoratorConfiguration.CODEC));
+        TOP_SOLID_HEIGHTMAP_NOISE_BIASED = FeatureDecorator.<DecoratorConfiguration, TopSolidHeightMapNoiseBasedDecorator>register("top_solid_heightmap_noise_biased", new TopSolidHeightMapNoiseBasedDecorator(NoiseCountFactorDecoratorConfiguration.CODEC));
+        CARVING_MASK = FeatureDecorator.<DecoratorConfiguration, CarvingMaskDecorator>register("carving_mask", new CarvingMaskDecorator(CarvingMaskDecoratorConfiguration.CODEC));
+        FOREST_ROCK = FeatureDecorator.<DecoratorConfiguration, ForestRockPlacementDecorator>register("forest_rock", new ForestRockPlacementDecorator(FrequencyDecoratorConfiguration.CODEC));
+        FIRE = FeatureDecorator.<DecoratorConfiguration, FireDecorator>register("fire", new FireDecorator(FrequencyDecoratorConfiguration.CODEC));
+        MAGMA = FeatureDecorator.<DecoratorConfiguration, MagmaDecorator>register("magma", new MagmaDecorator(FrequencyDecoratorConfiguration.CODEC));
+        EMERALD_ORE = FeatureDecorator.<DecoratorConfiguration, EmeraldPlacementDecorator>register("emerald_ore", new EmeraldPlacementDecorator(NoneDecoratorConfiguration.CODEC));
+        LAVA_LAKE = FeatureDecorator.<DecoratorConfiguration, LakeLavaPlacementDecorator>register("lava_lake", new LakeLavaPlacementDecorator(ChanceDecoratorConfiguration.CODEC));
+        WATER_LAKE = FeatureDecorator.<DecoratorConfiguration, LakeWaterPlacementDecorator>register("water_lake", new LakeWaterPlacementDecorator(ChanceDecoratorConfiguration.CODEC));
+        DUNGEONS = FeatureDecorator.<DecoratorConfiguration, MonsterRoomPlacementDecorator>register("dungeons", new MonsterRoomPlacementDecorator(ChanceDecoratorConfiguration.CODEC));
+        DARK_OAK_TREE = FeatureDecorator.<DecoratorConfiguration, DarkOakTreePlacementDecorator>register("dark_oak_tree", new DarkOakTreePlacementDecorator(NoneDecoratorConfiguration.CODEC));
+        ICEBERG = FeatureDecorator.<DecoratorConfiguration, IcebergPlacementDecorator>register("iceberg", new IcebergPlacementDecorator(ChanceDecoratorConfiguration.CODEC));
+        LIGHT_GEM_CHANCE = FeatureDecorator.<DecoratorConfiguration, LightGemChanceDecorator>register("light_gem_chance", new LightGemChanceDecorator(FrequencyDecoratorConfiguration.CODEC));
+        END_ISLAND = FeatureDecorator.<DecoratorConfiguration, EndIslandPlacementDecorator>register("end_island", new EndIslandPlacementDecorator(NoneDecoratorConfiguration.CODEC));
+        CHORUS_PLANT = FeatureDecorator.<DecoratorConfiguration, ChorusPlantPlacementDecorator>register("chorus_plant", new ChorusPlantPlacementDecorator(NoneDecoratorConfiguration.CODEC));
+        END_GATEWAY = FeatureDecorator.<DecoratorConfiguration, EndGatewayPlacementDecorator>register("end_gateway", new EndGatewayPlacementDecorator(NoneDecoratorConfiguration.CODEC));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/ForestRockPlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/ForestRockPlacementDecorator.java
index 1e5c583..67e51f4 100644
--- a/src/net/minecraft/world/level/levelgen/placement/ForestRockPlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/ForestRockPlacementDecorator.java
@@ -6,27 +6,25 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class ForestRockPlacementDecorator extends FeatureDecorator<FrequencyDecoratorConfiguration> {
-    public ForestRockPlacementDecorator(final Function<Dynamic<?>, ? extends FrequencyDecoratorConfiguration> function) {
-        super(function);
+    public ForestRockPlacementDecorator(final Codec<FrequencyDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final FrequencyDecoratorConfiguration ckd, final BlockPos fk) {
-        final int integer7 = random.nextInt(ckd.count);
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final FrequencyDecoratorConfiguration csf, final BlockPos fu) {
+        final int integer7 = random.nextInt(csf.count);
         final int integer8;
         final int integer9;
         final int integer10;
         return IntStream.range(0, integer7).<BlockPos>mapToObj(integer -> {
-            integer8 = random.nextInt(16) + fk.getX();
-            integer9 = random.nextInt(16) + fk.getZ();
-            integer10 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer8, integer9);
+            integer8 = random.nextInt(16) + fu.getX();
+            integer9 = random.nextInt(16) + fu.getZ();
+            integer10 = bqc.getHeight(Heightmap.Types.MOTION_BLOCKING, integer8, integer9);
             return new BlockPos(integer8, integer10, integer9);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/FrequencyChanceDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/placement/FrequencyChanceDecoratorConfiguration.java
index 87a6aa6..3a98d07 100644
--- a/src/net/minecraft/world/level/levelgen/placement/FrequencyChanceDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/placement/FrequencyChanceDecoratorConfiguration.java
@@ -1,12 +1,14 @@
 package net.minecraft.world.level.levelgen.placement;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 
 public class FrequencyChanceDecoratorConfiguration implements DecoratorConfiguration {
+    public static final Codec<FrequencyChanceDecoratorConfiguration> CODEC;
     public final int count;
     public final float chance;
     
@@ -15,14 +17,7 @@ public class FrequencyChanceDecoratorConfiguration implements DecoratorConfigura
         this.chance = float2;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("count"), dynamicOps.createInt(this.count), dynamicOps.createString("chance"), dynamicOps.createFloat(this.chance))));
-    }
-    
-    public static FrequencyChanceDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        final int integer2 = dynamic.get("count").asInt(0);
-        final float float3 = dynamic.get("chance").asFloat(0.0f);
-        return new FrequencyChanceDecoratorConfiguration(integer2, float3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("count").forGetter(cse -> cse.count), (App)Codec.FLOAT.fieldOf("chance").forGetter(cse -> cse.chance)).apply(instance, (BiFunction)FrequencyChanceDecoratorConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/FrequencyDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/placement/FrequencyDecoratorConfiguration.java
index 66ab0bf..eed6d56 100644
--- a/src/net/minecraft/world/level/levelgen/placement/FrequencyDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/placement/FrequencyDecoratorConfiguration.java
@@ -1,25 +1,18 @@
 package net.minecraft.world.level.levelgen.placement;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 
 public class FrequencyDecoratorConfiguration implements DecoratorConfiguration {
+    public static final Codec<FrequencyDecoratorConfiguration> CODEC;
     public final int count;
     
     public FrequencyDecoratorConfiguration(final int integer) {
         this.count = integer;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("count"), dynamicOps.createInt(this.count))));
-    }
-    
-    public static FrequencyDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        final int integer2 = dynamic.get("count").asInt(0);
-        return new FrequencyDecoratorConfiguration(integer2);
+    static {
+        CODEC = Codec.INT.fieldOf("count").xmap((Function)FrequencyDecoratorConfiguration::new, csf -> csf.count).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/FrequencyWithExtraChanceDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/placement/FrequencyWithExtraChanceDecoratorConfiguration.java
index e13224a..9f07c62 100644
--- a/src/net/minecraft/world/level/levelgen/placement/FrequencyWithExtraChanceDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/placement/FrequencyWithExtraChanceDecoratorConfiguration.java
@@ -1,12 +1,13 @@
 package net.minecraft.world.level.levelgen.placement;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 
 public class FrequencyWithExtraChanceDecoratorConfiguration implements DecoratorConfiguration {
+    public static final Codec<FrequencyWithExtraChanceDecoratorConfiguration> CODEC;
     public final int count;
     public final float extraChance;
     public final int extraCount;
@@ -17,15 +18,7 @@ public class FrequencyWithExtraChanceDecoratorConfiguration implements Decorator
         this.extraCount = integer3;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("count"), dynamicOps.createInt(this.count), dynamicOps.createString("extra_chance"), dynamicOps.createFloat(this.extraChance), dynamicOps.createString("extra_count"), dynamicOps.createInt(this.extraCount))));
-    }
-    
-    public static FrequencyWithExtraChanceDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        final int integer2 = dynamic.get("count").asInt(0);
-        final float float3 = dynamic.get("extra_chance").asFloat(0.0f);
-        final int integer3 = dynamic.get("extra_count").asInt(0);
-        return new FrequencyWithExtraChanceDecoratorConfiguration(integer2, float3, integer3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("count").forGetter(csg -> csg.count), (App)Codec.FLOAT.fieldOf("extra_chance").forGetter(csg -> csg.extraChance), (App)Codec.INT.fieldOf("extra_count").forGetter(csg -> csg.extraCount)).apply(instance, FrequencyWithExtraChanceDecoratorConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/IcebergPlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/IcebergPlacementDecorator.java
index 72b5d79..79c5f35 100644
--- a/src/net/minecraft/world/level/levelgen/placement/IcebergPlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/IcebergPlacementDecorator.java
@@ -5,23 +5,21 @@ import net.minecraft.world.level.levelgen.Heightmap;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class IcebergPlacementDecorator extends FeatureDecorator<ChanceDecoratorConfiguration> {
-    public IcebergPlacementDecorator(final Function<Dynamic<?>, ? extends ChanceDecoratorConfiguration> function) {
-        super(function);
+    public IcebergPlacementDecorator(final Codec<ChanceDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final ChanceDecoratorConfiguration cjd, final BlockPos fk) {
-        if (random.nextFloat() < 1.0f / cjd.chance) {
-            final int integer7 = random.nextInt(8) + 4 + fk.getX();
-            final int integer8 = random.nextInt(8) + 4 + fk.getZ();
-            final int integer9 = bjx.getHeight(Heightmap.Types.MOTION_BLOCKING, integer7, integer8);
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final ChanceDecoratorConfiguration crf, final BlockPos fu) {
+        if (random.nextFloat() < 1.0f / crf.chance) {
+            final int integer7 = random.nextInt(8) + 4 + fu.getX();
+            final int integer8 = random.nextInt(8) + 4 + fu.getZ();
+            final int integer9 = bqc.getHeight(Heightmap.Types.MOTION_BLOCKING, integer7, integer8);
             return Stream.<BlockPos>of(new BlockPos(integer7, integer9, integer8));
         }
         return Stream.<BlockPos>empty();
diff --git a/src/net/minecraft/world/level/levelgen/placement/LakeLavaPlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/LakeLavaPlacementDecorator.java
index 8ee1354..ad19a40 100644
--- a/src/net/minecraft/world/level/levelgen/placement/LakeLavaPlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/LakeLavaPlacementDecorator.java
@@ -4,24 +4,22 @@ import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfig
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class LakeLavaPlacementDecorator extends FeatureDecorator<ChanceDecoratorConfiguration> {
-    public LakeLavaPlacementDecorator(final Function<Dynamic<?>, ? extends ChanceDecoratorConfiguration> function) {
-        super(function);
+    public LakeLavaPlacementDecorator(final Codec<ChanceDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final ChanceDecoratorConfiguration cjd, final BlockPos fk) {
-        if (random.nextInt(cjd.chance / 10) == 0) {
-            final int integer7 = random.nextInt(16) + fk.getX();
-            final int integer8 = random.nextInt(16) + fk.getZ();
-            final int integer9 = random.nextInt(random.nextInt(caa.getGenDepth() - 8) + 8);
-            if (integer9 < bjx.getSeaLevel() || random.nextInt(cjd.chance / 8) == 0) {
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final ChanceDecoratorConfiguration crf, final BlockPos fu) {
+        if (random.nextInt(crf.chance / 10) == 0) {
+            final int integer7 = random.nextInt(16) + fu.getX();
+            final int integer8 = random.nextInt(16) + fu.getZ();
+            final int integer9 = random.nextInt(random.nextInt(cha.getGenDepth() - 8) + 8);
+            if (integer9 < bqc.getSeaLevel() || random.nextInt(crf.chance / 8) == 0) {
                 return Stream.<BlockPos>of(new BlockPos(integer7, integer9, integer8));
             }
         }
diff --git a/src/net/minecraft/world/level/levelgen/placement/LakeWaterPlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/LakeWaterPlacementDecorator.java
index 73b7ed5..a6e4a5d 100644
--- a/src/net/minecraft/world/level/levelgen/placement/LakeWaterPlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/LakeWaterPlacementDecorator.java
@@ -4,23 +4,21 @@ import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfig
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class LakeWaterPlacementDecorator extends FeatureDecorator<ChanceDecoratorConfiguration> {
-    public LakeWaterPlacementDecorator(final Function<Dynamic<?>, ? extends ChanceDecoratorConfiguration> function) {
-        super(function);
+    public LakeWaterPlacementDecorator(final Codec<ChanceDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final ChanceDecoratorConfiguration cjd, final BlockPos fk) {
-        if (random.nextInt(cjd.chance) == 0) {
-            final int integer7 = random.nextInt(16) + fk.getX();
-            final int integer8 = random.nextInt(16) + fk.getZ();
-            final int integer9 = random.nextInt(caa.getGenDepth());
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final ChanceDecoratorConfiguration crf, final BlockPos fu) {
+        if (random.nextInt(crf.chance) == 0) {
+            final int integer7 = random.nextInt(16) + fu.getX();
+            final int integer8 = random.nextInt(16) + fu.getZ();
+            final int integer9 = random.nextInt(cha.getGenDepth());
             return Stream.<BlockPos>of(new BlockPos(integer7, integer9, integer8));
         }
         return Stream.<BlockPos>empty();
diff --git a/src/net/minecraft/world/level/levelgen/placement/MonsterRoomPlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/MonsterRoomPlacementDecorator.java
index 19b949d..4c5b635 100644
--- a/src/net/minecraft/world/level/levelgen/placement/MonsterRoomPlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/MonsterRoomPlacementDecorator.java
@@ -5,27 +5,25 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class MonsterRoomPlacementDecorator extends FeatureDecorator<ChanceDecoratorConfiguration> {
-    public MonsterRoomPlacementDecorator(final Function<Dynamic<?>, ? extends ChanceDecoratorConfiguration> function) {
-        super(function);
+    public MonsterRoomPlacementDecorator(final Codec<ChanceDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final ChanceDecoratorConfiguration cjd, final BlockPos fk) {
-        final int integer7 = cjd.chance;
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final ChanceDecoratorConfiguration crf, final BlockPos fu) {
+        final int integer7 = crf.chance;
         final int integer8;
         final int integer9;
         final int integer10;
         return IntStream.range(0, integer7).<BlockPos>mapToObj(integer -> {
-            integer8 = random.nextInt(16) + fk.getX();
-            integer9 = random.nextInt(16) + fk.getZ();
-            integer10 = random.nextInt(caa.getGenDepth());
+            integer8 = random.nextInt(16) + fu.getX();
+            integer9 = random.nextInt(16) + fu.getZ();
+            integer10 = random.nextInt(cha.getGenDepth());
             return new BlockPos(integer8, integer10, integer9);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/NoiseCountFactorDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/placement/NoiseCountFactorDecoratorConfiguration.java
index ceb2c9b..0bdef9f 100644
--- a/src/net/minecraft/world/level/levelgen/placement/NoiseCountFactorDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/placement/NoiseCountFactorDecoratorConfiguration.java
@@ -1,13 +1,17 @@
 package net.minecraft.world.level.levelgen.placement;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import org.apache.logging.log4j.LogManager;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.levelgen.Heightmap;
+import org.apache.logging.log4j.Logger;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 
 public class NoiseCountFactorDecoratorConfiguration implements DecoratorConfiguration {
+    public static final Codec<NoiseCountFactorDecoratorConfiguration> CODEC;
+    private static final Logger LOGGER;
     public final int noiseToCountRatio;
     public final double noiseFactor;
     public final double noiseOffset;
@@ -20,16 +24,8 @@ public class NoiseCountFactorDecoratorConfiguration implements DecoratorConfigur
         this.heightmap = a;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("noise_to_count_ratio"), dynamicOps.createInt(this.noiseToCountRatio), dynamicOps.createString("noise_factor"), dynamicOps.createDouble(this.noiseFactor), dynamicOps.createString("noise_offset"), dynamicOps.createDouble(this.noiseOffset), dynamicOps.createString("heightmap"), dynamicOps.createString(this.heightmap.getSerializationKey()))));
-    }
-    
-    public static NoiseCountFactorDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        final int integer2 = dynamic.get("noise_to_count_ratio").asInt(10);
-        final double double3 = dynamic.get("noise_factor").asDouble(80.0);
-        final double double4 = dynamic.get("noise_offset").asDouble(0.0);
-        final Heightmap.Types a7 = Heightmap.Types.getFromKey(dynamic.get("heightmap").asString("OCEAN_FLOOR_WG"));
-        return new NoiseCountFactorDecoratorConfiguration(integer2, double3, double4, a7);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("noise_to_count_ratio").forGetter(csl -> csl.noiseToCountRatio), (App)Codec.DOUBLE.fieldOf("noise_factor").forGetter(csl -> csl.noiseFactor), (App)Codec.DOUBLE.fieldOf("noise_offset").withDefault(0.0).forGetter(csl -> csl.noiseOffset), (App)Heightmap.Types.CODEC.fieldOf("heightmap").forGetter(csl -> csl.heightmap)).apply(instance, NoiseCountFactorDecoratorConfiguration::new));
+        LOGGER = LogManager.getLogger();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmap32Decorator.java b/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmap32Decorator.java
index 588fa72..04ab3b1 100644
--- a/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmap32Decorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmap32Decorator.java
@@ -1,22 +1,30 @@
 java.lang.StackOverflowError
+	at java.base/java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:936)
+	at java.base/java.util.concurrent.ConcurrentHashMap.containsKey(ConcurrentHashMap.java:964)
 	at java.base/java.util.Collections$SetFromMap.contains(Collections.java:5564)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:21)
 	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
 	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.resolve(CoreMetadataFactory.java:616)
-	at com.strobel.assembler.metadata.MetadataHelper$9.visitClassType(MetadataHelper.java:2114)
-	at com.strobel.assembler.metadata.MetadataHelper$9.visitClassType(MetadataHelper.java:2075)
+	at com.strobel.assembler.metadata.MetadataHelper$10.visitClassType(MetadataHelper.java:2611)
+	at com.strobel.assembler.metadata.MetadataHelper$10.visitClassType(MetadataHelper.java:2608)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:21)
-	at com.strobel.assembler.metadata.MetadataHelper.getSuperType(MetadataHelper.java:1264)
-	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2011)
+	at com.strobel.assembler.metadata.MetadataHelper.getInterfaces(MetadataHelper.java:702)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2027)
 	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
 	at com.strobel.assembler.metadata.MetadataHelper.asSuper(MetadataHelper.java:727)
 	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2017)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitParameterizedType(MetadataHelper.java:2056)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitParameterizedType(MetadataHelper.java:1994)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedGenericType.accept(CoreMetadataFactory.java:653)
+	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
+	at com.strobel.assembler.metadata.MetadataHelper.asSuper(MetadataHelper.java:727)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2028)
 	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
 	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
@@ -1015,11 +1023,3 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
-	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
-	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
diff --git a/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmapDoubleDecorator.java b/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmapDoubleDecorator.java
index 4e06894..52d4fbf 100644
--- a/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmapDoubleDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmapDoubleDecorator.java
@@ -1,34 +1,45 @@
 java.lang.StackOverflowError
+	at java.base/java.util.Collections$SetFromMap.contains(Collections.java:5564)
+	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:21)
+	at com.strobel.assembler.metadata.MetadataSystem.resolveCore(MetadataSystem.java:81)
+	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
+	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.resolve(CoreMetadataFactory.java:616)
+	at com.strobel.assembler.metadata.MetadataHelper$10.visitClassType(MetadataHelper.java:2611)
+	at com.strobel.assembler.metadata.MetadataHelper$10.visitClassType(MetadataHelper.java:2608)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
+	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
+	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:21)
+	at com.strobel.assembler.metadata.MetadataHelper.getInterfaces(MetadataHelper.java:702)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2027)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
+	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
+	at com.strobel.assembler.metadata.MetadataHelper.asSuper(MetadataHelper.java:727)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2017)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
+	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
+	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
+	at com.strobel.assembler.metadata.MetadataHelper.asSuper(MetadataHelper.java:727)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:2017)
+	at com.strobel.assembler.metadata.MetadataHelper$8.visitClassType(MetadataHelper.java:1994)
+	at com.strobel.assembler.metadata.TypeDefinition.accept(TypeDefinition.java:183)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
 	at com.strobel.assembler.metadata.MetadataHelper.asSuper(MetadataHelper.java:727)
 	at com.strobel.assembler.metadata.MetadataHelper$6.visitClassType(MetadataHelper.java:1853)
 	at com.strobel.assembler.metadata.MetadataHelper$6.visitClassType(MetadataHelper.java:1815)
-	at com.strobel.assembler.metadata.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
+	at com.strobel.assembler.metadata.TypeDefinition.accept(TypeDefinition.java:183)
 	at com.strobel.assembler.metadata.DefaultTypeVisitor.visit(DefaultTypeVisitor.java:25)
 	at com.strobel.assembler.metadata.MetadataHelper.isSubType(MetadataHelper.java:1302)
 	at com.strobel.assembler.metadata.MetadataHelper.isSubType(MetadataHelper.java:568)
-	at com.strobel.assembler.metadata.MetadataHelper.isSubtypeUncheckedInternal(MetadataHelper.java:540)
-	at com.strobel.assembler.metadata.MetadataHelper.isSubTypeUnchecked(MetadataHelper.java:520)
-	at com.strobel.assembler.metadata.MetadataHelper.isConvertible(MetadataHelper.java:507)
-	at com.strobel.assembler.metadata.MetadataHelper.isConvertible(MetadataHelper.java:488)
-	at com.strobel.assembler.metadata.MetadataHelper.isAssignableFrom(MetadataHelper.java:557)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitMemberReferenceExpression(InsertNecessaryConversionsTransform.java:131)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitMemberReferenceExpression(InsertNecessaryConversionsTransform.java:37)
-	at com.strobel.decompiler.languages.java.ast.MemberReferenceExpression.acceptVisitor(MemberReferenceExpression.java:120)
-	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitChildren(DepthFirstAstVisitor.java:41)
-	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitInvocationExpression(DepthFirstAstVisitor.java:59)
-	at com.strobel.decompiler.languages.java.ast.InvocationExpression.acceptVisitor(InvocationExpression.java:78)
-	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitChildren(DepthFirstAstVisitor.java:41)
-	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitObjectCreationExpression(DepthFirstAstVisitor.java:319)
-	at com.strobel.decompiler.languages.java.ast.ObjectCreationExpression.acceptVisitor(ObjectCreationExpression.java:98)
-	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitChildren(DepthFirstAstVisitor.java:41)
-	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitCastExpression(DepthFirstAstVisitor.java:279)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitCastExpression(InsertNecessaryConversionsTransform.java:59)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitCastExpression(InsertNecessaryConversionsTransform.java:37)
-	at com.strobel.decompiler.languages.java.ast.CastExpression.acceptVisitor(CastExpression.java:55)
-	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitChildren(DepthFirstAstVisitor.java:41)
-	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitCastExpression(DepthFirstAstVisitor.java:279)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitCastExpression(InsertNecessaryConversionsTransform.java:59)
+	at com.strobel.assembler.metadata.MetadataHelper.isConvertible(MetadataHelper.java:508)
+	at com.strobel.assembler.metadata.MetadataHelper.isAssignableFrom(MetadataHelper.java:561)
+	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.processPossibleTypeCast(RedundantCastUtility.java:531)
+	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.visitReturnStatement(RedundantCastUtility.java:233)
+	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.visitReturnStatement(RedundantCastUtility.java:167)
+	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
+	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility.isCastRedundant(RedundantCastUtility.java:67)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitCastExpression(InsertNecessaryConversionsTransform.java:80)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitCastExpression(InsertNecessaryConversionsTransform.java:37)
 	at com.strobel.decompiler.languages.java.ast.CastExpression.acceptVisitor(CastExpression.java:55)
 	at com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor.visitChildren(DepthFirstAstVisitor.java:41)
@@ -1012,14 +1023,3 @@ java.lang.StackOverflowError
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
 	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
 	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
-	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:37)
-	at com.strobel.decompiler.languages.java.ast.ReturnStatement.acceptVisitor(ReturnStatement.java:57)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.recurse(InsertNecessaryConversionsTransform.java:576)
-	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.addCastForAssignment(InsertNecessaryConversionsTransform.java:336)
diff --git a/src/net/minecraft/world/level/levelgen/placement/NopePlacementDecorator.java b/src/net/minecraft/world/level/levelgen/placement/NopePlacementDecorator.java
index 9cc8ecf..200180a 100644
--- a/src/net/minecraft/world/level/levelgen/placement/NopePlacementDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/NopePlacementDecorator.java
@@ -4,16 +4,15 @@ import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfig
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration;
 
 public class NopePlacementDecorator extends SimpleFeatureDecorator<NoneDecoratorConfiguration> {
-    public NopePlacementDecorator(final Function<Dynamic<?>, ? extends NoneDecoratorConfiguration> function) {
-        super(function);
+    public NopePlacementDecorator(final Codec<NoneDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final NoneDecoratorConfiguration cgu, final BlockPos fk) {
-        return Stream.<BlockPos>of(fk);
+    public Stream<BlockPos> place(final Random random, final NoneDecoratorConfiguration cnz, final BlockPos fu) {
+        return Stream.<BlockPos>of(fu);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/RangeDecoratorConfiguration.java b/src/net/minecraft/world/level/levelgen/placement/RangeDecoratorConfiguration.java
index 5db8662..341665f 100644
--- a/src/net/minecraft/world/level/levelgen/placement/RangeDecoratorConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/placement/RangeDecoratorConfiguration.java
@@ -1,12 +1,14 @@
 package net.minecraft.world.level.levelgen.placement;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 
 public class RangeDecoratorConfiguration implements DecoratorConfiguration {
+    public static final Codec<RangeDecoratorConfiguration> CODEC;
     public final int min;
     public final int max;
     
@@ -15,14 +17,7 @@ public class RangeDecoratorConfiguration implements DecoratorConfiguration {
         this.max = integer2;
     }
     
-    @Override
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("min"), dynamicOps.createInt(this.min), dynamicOps.createString("max"), dynamicOps.createInt(this.max))));
-    }
-    
-    public static RangeDecoratorConfiguration deserialize(final Dynamic<?> dynamic) {
-        final int integer2 = dynamic.get("min").asInt(0);
-        final int integer3 = dynamic.get("max").asInt(0);
-        return new RangeDecoratorConfiguration(integer2, integer3);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.INT.fieldOf("min").forGetter(csp -> csp.min), (App)Codec.INT.fieldOf("max").forGetter(csp -> csp.max)).apply(instance, (BiFunction)RangeDecoratorConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/SimpleFeatureDecorator.java b/src/net/minecraft/world/level/levelgen/placement/SimpleFeatureDecorator.java
index 7d83e56..885314d 100644
--- a/src/net/minecraft/world/level/levelgen/placement/SimpleFeatureDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/SimpleFeatureDecorator.java
@@ -3,22 +3,20 @@ package net.minecraft.world.level.levelgen.placement;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfiguration;
 
 public abstract class SimpleFeatureDecorator<DC extends DecoratorConfiguration> extends FeatureDecorator<DC> {
-    public SimpleFeatureDecorator(final Function<Dynamic<?>, ? extends DC> function) {
-        super(function);
+    public SimpleFeatureDecorator(final Codec<DC> codec) {
+        super(codec);
     }
     
     @Override
-    public final Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final DC cgk, final BlockPos fk) {
-        return this.place(random, cgk, fk);
+    public final Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final DC cnn, final BlockPos fu) {
+        return this.place(random, cnn, fu);
     }
     
-    protected abstract Stream<BlockPos> place(final Random random, final DC cgk, final BlockPos fk);
+    protected abstract Stream<BlockPos> place(final Random random, final DC cnn, final BlockPos fu);
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapDecorator.java b/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapDecorator.java
index 4e3b2f5..3ec5d5e 100644
--- a/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapDecorator.java
@@ -5,23 +5,21 @@ import net.minecraft.world.level.levelgen.Heightmap;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration;
 
 public class TopSolidHeightMapDecorator extends FeatureDecorator<NoneDecoratorConfiguration> {
-    public TopSolidHeightMapDecorator(final Function<Dynamic<?>, ? extends NoneDecoratorConfiguration> function) {
-        super(function);
+    public TopSolidHeightMapDecorator(final Codec<NoneDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final NoneDecoratorConfiguration cgu, final BlockPos fk) {
-        final int integer7 = random.nextInt(16) + fk.getX();
-        final int integer8 = random.nextInt(16) + fk.getZ();
-        final int integer9 = bjx.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer7, integer8);
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final NoneDecoratorConfiguration cnz, final BlockPos fu) {
+        final int integer7 = random.nextInt(16) + fu.getX();
+        final int integer8 = random.nextInt(16) + fu.getZ();
+        final int integer9 = bqc.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer7, integer8);
         return Stream.<BlockPos>of(new BlockPos(integer7, integer9, integer8));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapNoiseBasedDecorator.java b/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapNoiseBasedDecorator.java
index e35db67..3fb26cc 100644
--- a/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapNoiseBasedDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapNoiseBasedDecorator.java
@@ -6,28 +6,26 @@ import net.minecraft.world.level.biome.Biome;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class TopSolidHeightMapNoiseBasedDecorator extends FeatureDecorator<NoiseCountFactorDecoratorConfiguration> {
-    public TopSolidHeightMapNoiseBasedDecorator(final Function<Dynamic<?>, ? extends NoiseCountFactorDecoratorConfiguration> function) {
-        super(function);
+    public TopSolidHeightMapNoiseBasedDecorator(final Codec<NoiseCountFactorDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final NoiseCountFactorDecoratorConfiguration ckj, final BlockPos fk) {
-        final double double7 = Biome.BIOME_INFO_NOISE.getValue(fk.getX() / ckj.noiseFactor, fk.getZ() / ckj.noiseFactor, false);
-        final int integer9 = (int)Math.ceil((double7 + ckj.noiseOffset) * ckj.noiseToCountRatio);
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final NoiseCountFactorDecoratorConfiguration csl, final BlockPos fu) {
+        final double double7 = Biome.BIOME_INFO_NOISE.getValue(fu.getX() / csl.noiseFactor, fu.getZ() / csl.noiseFactor, false);
+        final int integer9 = (int)Math.ceil((double7 + csl.noiseOffset) * csl.noiseToCountRatio);
         final int integer10;
         final int integer11;
         final int integer12;
         return IntStream.range(0, integer9).<BlockPos>mapToObj(integer -> {
-            integer10 = random.nextInt(16) + fk.getX();
-            integer11 = random.nextInt(16) + fk.getZ();
-            integer12 = bjx.getHeight(ckj.heightmap, integer10, integer11);
+            integer10 = random.nextInt(16) + fu.getX();
+            integer11 = random.nextInt(16) + fu.getZ();
+            integer12 = bqc.getHeight(csl.heightmap, integer10, integer11);
             return new BlockPos(integer10, integer12, integer11);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapRangeDecorator.java b/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapRangeDecorator.java
index cc609ad..6b91118 100644
--- a/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapRangeDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/TopSolidHeightMapRangeDecorator.java
@@ -6,27 +6,25 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class TopSolidHeightMapRangeDecorator extends FeatureDecorator<RangeDecoratorConfiguration> {
-    public TopSolidHeightMapRangeDecorator(final Function<Dynamic<?>, ? extends RangeDecoratorConfiguration> function) {
-        super(function);
+    public TopSolidHeightMapRangeDecorator(final Codec<RangeDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final RangeDecoratorConfiguration ckn, final BlockPos fk) {
-        final int integer7 = random.nextInt(ckn.max - ckn.min) + ckn.min;
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final RangeDecoratorConfiguration csp, final BlockPos fu) {
+        final int integer7 = random.nextInt(csp.max - csp.min) + csp.min;
         final int integer8;
         final int integer9;
         final int integer10;
         return IntStream.range(0, integer7).<BlockPos>mapToObj(integer -> {
-            integer8 = random.nextInt(16) + fk.getX();
-            integer9 = random.nextInt(16) + fk.getZ();
-            integer10 = bjx.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer8, integer9);
+            integer8 = random.nextInt(16) + fu.getX();
+            integer9 = random.nextInt(16) + fu.getZ();
+            integer10 = bqc.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer8, integer9);
             return new BlockPos(integer8, integer10, integer9);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/nether/ChanceRangeDecorator.java b/src/net/minecraft/world/level/levelgen/placement/nether/ChanceRangeDecorator.java
index 524bc53..a1e5dff 100644
--- a/src/net/minecraft/world/level/levelgen/placement/nether/ChanceRangeDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/nether/ChanceRangeDecorator.java
@@ -4,21 +4,20 @@ import net.minecraft.world.level.levelgen.feature.configurations.DecoratorConfig
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.ChanceRangeDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.SimpleFeatureDecorator;
 
 public class ChanceRangeDecorator extends SimpleFeatureDecorator<ChanceRangeDecoratorConfiguration> {
-    public ChanceRangeDecorator(final Function<Dynamic<?>, ? extends ChanceRangeDecoratorConfiguration> function) {
-        super(function);
+    public ChanceRangeDecorator(final Codec<ChanceRangeDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final ChanceRangeDecoratorConfiguration cgg, final BlockPos fk) {
-        if (random.nextFloat() < cgg.chance) {
-            final int integer5 = random.nextInt(16) + fk.getX();
-            final int integer6 = random.nextInt(16) + fk.getZ();
-            final int integer7 = random.nextInt(cgg.top - cgg.topOffset) + cgg.bottomOffset;
+    public Stream<BlockPos> place(final Random random, final ChanceRangeDecoratorConfiguration cni, final BlockPos fu) {
+        if (random.nextFloat() < cni.chance) {
+            final int integer5 = random.nextInt(16) + fu.getX();
+            final int integer6 = random.nextInt(16) + fu.getZ();
+            final int integer7 = random.nextInt(cni.top - cni.topOffset) + cni.bottomOffset;
             return Stream.<BlockPos>of(new BlockPos(integer5, integer7, integer6));
         }
         return Stream.<BlockPos>empty();
diff --git a/src/net/minecraft/world/level/levelgen/placement/nether/CountRangeDecorator.java b/src/net/minecraft/world/level/levelgen/placement/nether/CountRangeDecorator.java
index 31046c1..e87adf0 100644
--- a/src/net/minecraft/world/level/levelgen/placement/nether/CountRangeDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/nether/CountRangeDecorator.java
@@ -5,24 +5,23 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.SimpleFeatureDecorator;
 
 public class CountRangeDecorator extends SimpleFeatureDecorator<CountRangeDecoratorConfiguration> {
-    public CountRangeDecorator(final Function<Dynamic<?>, ? extends CountRangeDecoratorConfiguration> function) {
-        super(function);
+    public CountRangeDecorator(final Codec<CountRangeDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final CountRangeDecoratorConfiguration cgi, final BlockPos fk) {
+    public Stream<BlockPos> place(final Random random, final CountRangeDecoratorConfiguration cnl, final BlockPos fu) {
         final int integer5;
         final int integer6;
         final int integer7;
-        return IntStream.range(0, cgi.count).<BlockPos>mapToObj(integer -> {
-            integer5 = random.nextInt(16) + fk.getX();
-            integer6 = random.nextInt(16) + fk.getZ();
-            integer7 = random.nextInt(cgi.maximum - cgi.topOffset) + cgi.bottomOffset;
+        return IntStream.range(0, cnl.count).<BlockPos>mapToObj(integer -> {
+            integer5 = random.nextInt(16) + fu.getX();
+            integer6 = random.nextInt(16) + fu.getZ();
+            integer7 = random.nextInt(cnl.maximum - cnl.topOffset) + cnl.bottomOffset;
             return new BlockPos(integer5, integer7, integer6);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/placement/nether/HellFireDecorator.java b/src/net/minecraft/world/level/levelgen/placement/nether/FireDecorator.java
similarity index 61%
rename from src/net/minecraft/world/level/levelgen/placement/nether/HellFireDecorator.java
rename to src/net/minecraft/world/level/levelgen/placement/nether/FireDecorator.java
index 5e7b38b..1111662 100644
--- a/src/net/minecraft/world/level/levelgen/placement/nether/HellFireDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/nether/FireDecorator.java
@@ -6,21 +6,20 @@ import com.google.common.collect.Lists;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.SimpleFeatureDecorator;
 
-public class HellFireDecorator extends SimpleFeatureDecorator<FrequencyDecoratorConfiguration> {
-    public HellFireDecorator(final Function<Dynamic<?>, ? extends FrequencyDecoratorConfiguration> function) {
-        super(function);
+public class FireDecorator extends SimpleFeatureDecorator<FrequencyDecoratorConfiguration> {
+    public FireDecorator(final Codec<FrequencyDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final FrequencyDecoratorConfiguration ckd, final BlockPos fk) {
+    public Stream<BlockPos> place(final Random random, final FrequencyDecoratorConfiguration csf, final BlockPos fu) {
         final List<BlockPos> list5 = Lists.newArrayList();
-        for (int integer6 = 0; integer6 < random.nextInt(random.nextInt(ckd.count) + 1) + 1; ++integer6) {
-            final int integer7 = random.nextInt(16) + fk.getX();
-            final int integer8 = random.nextInt(16) + fk.getZ();
+        for (int integer6 = 0; integer6 < random.nextInt(random.nextInt(csf.count) + 1) + 1; ++integer6) {
+            final int integer7 = random.nextInt(16) + fu.getX();
+            final int integer8 = random.nextInt(16) + fu.getZ();
             final int integer9 = random.nextInt(120) + 4;
             list5.add(new BlockPos(integer7, integer9, integer8));
         }
diff --git a/src/net/minecraft/world/level/levelgen/placement/nether/LightGemChanceDecorator.java b/src/net/minecraft/world/level/levelgen/placement/nether/LightGemChanceDecorator.java
index 263b000..cac25b5 100644
--- a/src/net/minecraft/world/level/levelgen/placement/nether/LightGemChanceDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/nether/LightGemChanceDecorator.java
@@ -5,23 +5,22 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.SimpleFeatureDecorator;
 
 public class LightGemChanceDecorator extends SimpleFeatureDecorator<FrequencyDecoratorConfiguration> {
-    public LightGemChanceDecorator(final Function<Dynamic<?>, ? extends FrequencyDecoratorConfiguration> function) {
-        super(function);
+    public LightGemChanceDecorator(final Codec<FrequencyDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final FrequencyDecoratorConfiguration ckd, final BlockPos fk) {
+    public Stream<BlockPos> place(final Random random, final FrequencyDecoratorConfiguration csf, final BlockPos fu) {
         final int integer4;
         final int integer5;
         final int integer6;
-        return IntStream.range(0, random.nextInt(random.nextInt(ckd.count) + 1)).<BlockPos>mapToObj(integer -> {
-            integer4 = random.nextInt(16) + fk.getX();
-            integer5 = random.nextInt(16) + fk.getZ();
+        return IntStream.range(0, random.nextInt(random.nextInt(csf.count) + 1)).<BlockPos>mapToObj(integer -> {
+            integer4 = random.nextInt(16) + fu.getX();
+            integer5 = random.nextInt(16) + fu.getZ();
             integer6 = random.nextInt(120) + 4;
             return new BlockPos(integer4, integer6, integer5);
         });
diff --git a/src/net/minecraft/world/level/levelgen/placement/nether/MagmaDecorator.java b/src/net/minecraft/world/level/levelgen/placement/nether/MagmaDecorator.java
index 76b1006..3379df4 100644
--- a/src/net/minecraft/world/level/levelgen/placement/nether/MagmaDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/nether/MagmaDecorator.java
@@ -5,29 +5,27 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.LevelAccessor;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.placement.FrequencyDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
 
 public class MagmaDecorator extends FeatureDecorator<FrequencyDecoratorConfiguration> {
-    public MagmaDecorator(final Function<Dynamic<?>, ? extends FrequencyDecoratorConfiguration> function) {
-        super(function);
+    public MagmaDecorator(final Codec<FrequencyDecoratorConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public Stream<BlockPos> getPositions(final LevelAccessor bjx, final ChunkGenerator<? extends ChunkGeneratorSettings> caa, final Random random, final FrequencyDecoratorConfiguration ckd, final BlockPos fk) {
-        final int integer7 = bjx.getSeaLevel() / 2 + 1;
+    public Stream<BlockPos> getPositions(final LevelAccessor bqc, final ChunkGenerator cha, final Random random, final FrequencyDecoratorConfiguration csf, final BlockPos fu) {
+        final int integer7 = bqc.getSeaLevel() / 2 + 1;
         final int integer8;
         final int integer9;
         final int n;
         final int integer10;
-        return IntStream.range(0, ckd.count).<BlockPos>mapToObj(integer4 -> {
-            integer8 = random.nextInt(16) + fk.getX();
-            integer9 = random.nextInt(16) + fk.getZ();
+        return IntStream.range(0, csf.count).<BlockPos>mapToObj(integer4 -> {
+            integer8 = random.nextInt(16) + fu.getX();
+            integer9 = random.nextInt(16) + fu.getZ();
             integer10 = n - 5 + random.nextInt(10);
             return new BlockPos(integer8, integer10, integer9);
         });
diff --git a/src/net/minecraft/world/level/levelgen/placement/nether/RandomCountRangeDecorator.java b/src/net/minecraft/world/level/levelgen/placement/nether/RandomCountRangeDecorator.java
index 039e7a8..258d610 100644
--- a/src/net/minecraft/world/level/levelgen/placement/nether/RandomCountRangeDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/nether/RandomCountRangeDecorator.java
@@ -5,25 +5,24 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.CountRangeDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.SimpleFeatureDecorator;
 
 public class RandomCountRangeDecorator extends SimpleFeatureDecorator<CountRangeDecoratorConfiguration> {
-    public RandomCountRangeDecorator(final Function<Dynamic<?>, ? extends CountRangeDecoratorConfiguration> function) {
-        super(function);
+    public RandomCountRangeDecorator(final Codec<CountRangeDecoratorConfiguration> codec) {
+        super(codec);
     }
     
-    public Stream<BlockPos> place(final Random random, final CountRangeDecoratorConfiguration cgi, final BlockPos fk) {
-        final int integer5 = random.nextInt(Math.max(cgi.count, 1));
+    public Stream<BlockPos> place(final Random random, final CountRangeDecoratorConfiguration cnl, final BlockPos fu) {
+        final int integer5 = random.nextInt(Math.max(cnl.count, 1));
         final int integer6;
         final int integer7;
         final int integer8;
         return IntStream.range(0, integer5).<BlockPos>mapToObj(integer -> {
-            integer6 = random.nextInt(16) + fk.getX();
-            integer7 = random.nextInt(16) + fk.getZ();
-            integer8 = random.nextInt(cgi.maximum - cgi.topOffset) + cgi.bottomOffset;
+            integer6 = random.nextInt(16) + fu.getX();
+            integer7 = random.nextInt(16) + fu.getZ();
+            integer8 = random.nextInt(cnl.maximum - cnl.topOffset) + cnl.bottomOffset;
             return new BlockPos(integer6, integer8, integer7);
         });
     }
diff --git a/src/net/minecraft/world/level/levelgen/structure/BeardedStructureStart.java b/src/net/minecraft/world/level/levelgen/structure/BeardedStructureStart.java
index 0885a8b..f151453 100644
--- a/src/net/minecraft/world/level/levelgen/structure/BeardedStructureStart.java
+++ b/src/net/minecraft/world/level/levelgen/structure/BeardedStructureStart.java
@@ -1,10 +1,11 @@
 package net.minecraft.world.level.levelgen.structure;
 
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 
-public abstract class BeardedStructureStart extends StructureStart {
-    public BeardedStructureStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-        super(cfl, integer2, integer3, clb, integer5, long6);
+public abstract class BeardedStructureStart<C extends FeatureConfiguration> extends StructureStart<C> {
+    public BeardedStructureStart(final StructureFeature<C> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+        super(cml, integer2, integer3, ctd, integer5, long6);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/levelgen/structure/BoundingBox.java b/src/net/minecraft/world/level/levelgen/structure/BoundingBox.java
index e336820..65aef4a 100644
--- a/src/net/minecraft/world/level/levelgen/structure/BoundingBox.java
+++ b/src/net/minecraft/world/level/levelgen/structure/BoundingBox.java
@@ -32,8 +32,12 @@ public class BoundingBox {
         return new BoundingBox(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
     }
     
-    public static BoundingBox orientBox(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final Direction fp) {
-        switch (fp) {
+    public static BoundingBox infinite() {
+        return new BoundingBox(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
+    }
+    
+    public static BoundingBox orientBox(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final Direction fz) {
+        switch (fz) {
             default: {
                 return new BoundingBox(integer1 + integer4, integer2 + integer5, integer3 + integer6, integer1 + integer7 - 1 + integer4, integer2 + integer8 - 1 + integer5, integer3 + integer9 - 1 + integer6);
             }
@@ -56,13 +60,13 @@ public class BoundingBox {
         return new BoundingBox(Math.min(integer1, integer4), Math.min(integer2, integer5), Math.min(integer3, integer6), Math.max(integer1, integer4), Math.max(integer2, integer5), Math.max(integer3, integer6));
     }
     
-    public BoundingBox(final BoundingBox clb) {
-        this.x0 = clb.x0;
-        this.y0 = clb.y0;
-        this.z0 = clb.z0;
-        this.x1 = clb.x1;
-        this.y1 = clb.y1;
-        this.z1 = clb.z1;
+    public BoundingBox(final BoundingBox ctd) {
+        this.x0 = ctd.x0;
+        this.y0 = ctd.y0;
+        this.z0 = ctd.z0;
+        this.x1 = ctd.x1;
+        this.y1 = ctd.y1;
+        this.z1 = ctd.z1;
     }
     
     public BoundingBox(final int integer1, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
@@ -74,13 +78,13 @@ public class BoundingBox {
         this.z1 = integer6;
     }
     
-    public BoundingBox(final Vec3i gg1, final Vec3i gg2) {
-        this.x0 = Math.min(gg1.getX(), gg2.getX());
-        this.y0 = Math.min(gg1.getY(), gg2.getY());
-        this.z0 = Math.min(gg1.getZ(), gg2.getZ());
-        this.x1 = Math.max(gg1.getX(), gg2.getX());
-        this.y1 = Math.max(gg1.getY(), gg2.getY());
-        this.z1 = Math.max(gg1.getZ(), gg2.getZ());
+    public BoundingBox(final Vec3i gr1, final Vec3i gr2) {
+        this.x0 = Math.min(gr1.getX(), gr2.getX());
+        this.y0 = Math.min(gr1.getY(), gr2.getY());
+        this.z0 = Math.min(gr1.getZ(), gr2.getZ());
+        this.x1 = Math.max(gr1.getX(), gr2.getX());
+        this.y1 = Math.max(gr1.getY(), gr2.getY());
+        this.z1 = Math.max(gr1.getZ(), gr2.getZ());
     }
     
     public BoundingBox(final int integer1, final int integer2, final int integer3, final int integer4) {
@@ -92,21 +96,21 @@ public class BoundingBox {
         this.y1 = 512;
     }
     
-    public boolean intersects(final BoundingBox clb) {
-        return this.x1 >= clb.x0 && this.x0 <= clb.x1 && this.z1 >= clb.z0 && this.z0 <= clb.z1 && this.y1 >= clb.y0 && this.y0 <= clb.y1;
+    public boolean intersects(final BoundingBox ctd) {
+        return this.x1 >= ctd.x0 && this.x0 <= ctd.x1 && this.z1 >= ctd.z0 && this.z0 <= ctd.z1 && this.y1 >= ctd.y0 && this.y0 <= ctd.y1;
     }
     
     public boolean intersects(final int integer1, final int integer2, final int integer3, final int integer4) {
         return this.x1 >= integer1 && this.x0 <= integer3 && this.z1 >= integer2 && this.z0 <= integer4;
     }
     
-    public void expand(final BoundingBox clb) {
-        this.x0 = Math.min(this.x0, clb.x0);
-        this.y0 = Math.min(this.y0, clb.y0);
-        this.z0 = Math.min(this.z0, clb.z0);
-        this.x1 = Math.max(this.x1, clb.x1);
-        this.y1 = Math.max(this.y1, clb.y1);
-        this.z1 = Math.max(this.z1, clb.z1);
+    public void expand(final BoundingBox ctd) {
+        this.x0 = Math.min(this.x0, ctd.x0);
+        this.y0 = Math.min(this.y0, ctd.y0);
+        this.z0 = Math.min(this.z0, ctd.z0);
+        this.x1 = Math.max(this.x1, ctd.x1);
+        this.y1 = Math.max(this.y1, ctd.y1);
+        this.z1 = Math.max(this.z1, ctd.z1);
     }
     
     public void move(final int integer1, final int integer2, final int integer3) {
@@ -122,8 +126,12 @@ public class BoundingBox {
         return new BoundingBox(this.x0 + integer1, this.y0 + integer2, this.z0 + integer3, this.x1 + integer1, this.y1 + integer2, this.z1 + integer3);
     }
     
-    public boolean isInside(final Vec3i gg) {
-        return gg.getX() >= this.x0 && gg.getX() <= this.x1 && gg.getZ() >= this.z0 && gg.getZ() <= this.z1 && gg.getY() >= this.y0 && gg.getY() <= this.y1;
+    public void move(final Vec3i gr) {
+        this.move(gr.getX(), gr.getY(), gr.getZ());
+    }
+    
+    public boolean isInside(final Vec3i gr) {
+        return gr.getX() >= this.x0 && gr.getX() <= this.x1 && gr.getZ() >= this.z0 && gr.getZ() <= this.z1 && gr.getY() >= this.y0 && gr.getY() <= this.y1;
     }
     
     public Vec3i getLength() {
diff --git a/src/net/minecraft/world/level/levelgen/structure/BuriedTreasurePieces.java b/src/net/minecraft/world/level/levelgen/structure/BuriedTreasurePieces.java
index 44b3a24..a735061 100644
--- a/src/net/minecraft/world/level/levelgen/structure/BuriedTreasurePieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/BuriedTreasurePieces.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.levelgen.structure;
 
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Blocks;
@@ -8,7 +9,8 @@ import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.ChunkPos;
 import java.util.Random;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.feature.StructurePieceType;
@@ -16,52 +18,52 @@ import net.minecraft.core.BlockPos;
 
 public class BuriedTreasurePieces {
     public static class BuriedTreasurePiece extends StructurePiece {
-        public BuriedTreasurePiece(final BlockPos fk) {
+        public BuriedTreasurePiece(final BlockPos fu) {
             super(StructurePieceType.BURIED_TREASURE_PIECE, 0);
-            this.boundingBox = new BoundingBox(fk.getX(), fk.getY(), fk.getZ(), fk.getX(), fk.getY(), fk.getZ());
+            this.boundingBox = new BoundingBox(fu.getX(), fu.getY(), fu.getZ(), fu.getX(), fu.getY(), fu.getZ());
         }
         
-        public BuriedTreasurePiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.BURIED_TREASURE_PIECE, jt);
+        public BuriedTreasurePiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.BURIED_TREASURE_PIECE, le);
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
+        protected void addAdditionalSaveData(final CompoundTag le) {
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            final int integer7 = bjx.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, this.boundingBox.x0, this.boundingBox.z0);
-            final BlockPos.MutableBlockPos a8 = new BlockPos.MutableBlockPos(this.boundingBox.x0, integer7, this.boundingBox.z0);
-            while (a8.getY() > 0) {
-                final BlockState byj9 = bjx.getBlockState(a8);
-                final BlockState byj10 = bjx.getBlockState(a8.below());
-                if (byj10 == Blocks.SANDSTONE.defaultBlockState() || byj10 == Blocks.STONE.defaultBlockState() || byj10 == Blocks.ANDESITE.defaultBlockState() || byj10 == Blocks.GRANITE.defaultBlockState() || byj10 == Blocks.DIORITE.defaultBlockState()) {
-                    final BlockState byj11 = (byj9.isAir() || this.isLiquid(byj9)) ? Blocks.SAND.defaultBlockState() : byj9;
-                    for (final Direction fp15 : Direction.values()) {
-                        final BlockPos fk16 = a8.relative(fp15);
-                        final BlockState byj12 = bjx.getBlockState(fk16);
-                        if (byj12.isAir() || this.isLiquid(byj12)) {
-                            final BlockPos fk17 = fk16.below();
-                            final BlockState byj13 = bjx.getBlockState(fk17);
-                            if ((byj13.isAir() || this.isLiquid(byj13)) && fp15 != Direction.UP) {
-                                bjx.setBlock(fk16, byj10, 3);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            final int integer9 = bqu.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, this.boundingBox.x0, this.boundingBox.z0);
+            final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos(this.boundingBox.x0, integer9, this.boundingBox.z0);
+            while (a10.getY() > 0) {
+                final BlockState cfj11 = bqu.getBlockState(a10);
+                final BlockState cfj12 = bqu.getBlockState(a10.below());
+                if (cfj12 == Blocks.SANDSTONE.defaultBlockState() || cfj12 == Blocks.STONE.defaultBlockState() || cfj12 == Blocks.ANDESITE.defaultBlockState() || cfj12 == Blocks.GRANITE.defaultBlockState() || cfj12 == Blocks.DIORITE.defaultBlockState()) {
+                    final BlockState cfj13 = (cfj11.isAir() || this.isLiquid(cfj11)) ? Blocks.SAND.defaultBlockState() : cfj11;
+                    for (final Direction fz17 : Direction.values()) {
+                        final BlockPos fu2 = a10.relative(fz17);
+                        final BlockState cfj14 = bqu.getBlockState(fu2);
+                        if (cfj14.isAir() || this.isLiquid(cfj14)) {
+                            final BlockPos fu3 = fu2.below();
+                            final BlockState cfj15 = bqu.getBlockState(fu3);
+                            if ((cfj15.isAir() || this.isLiquid(cfj15)) && fz17 != Direction.UP) {
+                                bqu.setBlock(fu2, cfj12, 3);
                             }
                             else {
-                                bjx.setBlock(fk16, byj11, 3);
+                                bqu.setBlock(fu2, cfj13, 3);
                             }
                         }
                     }
-                    this.boundingBox = new BoundingBox(a8.getX(), a8.getY(), a8.getZ(), a8.getX(), a8.getY(), a8.getZ());
-                    return this.createChest(bjx, clb, random, a8, BuiltInLootTables.BURIED_TREASURE, null);
+                    this.boundingBox = new BoundingBox(a10.getX(), a10.getY(), a10.getZ(), a10.getX(), a10.getY(), a10.getZ());
+                    return this.createChest(bqu, ctd, random, a10, BuiltInLootTables.BURIED_TREASURE, null);
                 }
-                a8.move(0, -1, 0);
+                a10.move(0, -1, 0);
             }
             return false;
         }
         
-        private boolean isLiquid(final BlockState byj) {
-            return byj == Blocks.WATER.defaultBlockState() || byj == Blocks.LAVA.defaultBlockState();
+        private boolean isLiquid(final BlockState cfj) {
+            return cfj == Blocks.WATER.defaultBlockState() || cfj == Blocks.LAVA.defaultBlockState();
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/DesertPyramidPiece.java b/src/net/minecraft/world/level/levelgen/structure/DesertPyramidPiece.java
index 701d83d..6b01ac2 100644
--- a/src/net/minecraft/world/level/levelgen/structure/DesertPyramidPiece.java
+++ b/src/net/minecraft/world/level/levelgen/structure/DesertPyramidPiece.java
@@ -1,16 +1,19 @@
 package net.minecraft.world.level.levelgen.structure;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import java.util.Iterator;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.StairBlock;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.feature.StructurePieceType;
@@ -24,200 +27,200 @@ public class DesertPyramidPiece extends ScatteredFeaturePiece {
         this.hasPlacedChest = new boolean[4];
     }
     
-    public DesertPyramidPiece(final StructureManager cmo, final CompoundTag jt) {
-        super(StructurePieceType.DESERT_PYRAMID_PIECE, jt);
-        (this.hasPlacedChest = new boolean[4])[0] = jt.getBoolean("hasPlacedChest0");
-        this.hasPlacedChest[1] = jt.getBoolean("hasPlacedChest1");
-        this.hasPlacedChest[2] = jt.getBoolean("hasPlacedChest2");
-        this.hasPlacedChest[3] = jt.getBoolean("hasPlacedChest3");
+    public DesertPyramidPiece(final StructureManager cva, final CompoundTag le) {
+        super(StructurePieceType.DESERT_PYRAMID_PIECE, le);
+        (this.hasPlacedChest = new boolean[4])[0] = le.getBoolean("hasPlacedChest0");
+        this.hasPlacedChest[1] = le.getBoolean("hasPlacedChest1");
+        this.hasPlacedChest[2] = le.getBoolean("hasPlacedChest2");
+        this.hasPlacedChest[3] = le.getBoolean("hasPlacedChest3");
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("hasPlacedChest0", this.hasPlacedChest[0]);
-        jt.putBoolean("hasPlacedChest1", this.hasPlacedChest[1]);
-        jt.putBoolean("hasPlacedChest2", this.hasPlacedChest[2]);
-        jt.putBoolean("hasPlacedChest3", this.hasPlacedChest[3]);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("hasPlacedChest0", this.hasPlacedChest[0]);
+        le.putBoolean("hasPlacedChest1", this.hasPlacedChest[1]);
+        le.putBoolean("hasPlacedChest2", this.hasPlacedChest[2]);
+        le.putBoolean("hasPlacedChest3", this.hasPlacedChest[3]);
     }
     
     @Override
-    public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-        this.generateBox(bjx, clb, 0, -4, 0, this.width - 1, 0, this.depth - 1, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        for (int integer7 = 1; integer7 <= 9; ++integer7) {
-            this.generateBox(bjx, clb, integer7, integer7, integer7, this.width - 1 - integer7, integer7, this.depth - 1 - integer7, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-            this.generateBox(bjx, clb, integer7 + 1, integer7, integer7 + 1, this.width - 2 - integer7, integer7, this.depth - 2 - integer7, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+    public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+        this.generateBox(bqu, ctd, 0, -4, 0, this.width - 1, 0, this.depth - 1, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        for (int integer9 = 1; integer9 <= 9; ++integer9) {
+            this.generateBox(bqu, ctd, integer9, integer9, integer9, this.width - 1 - integer9, integer9, this.depth - 1 - integer9, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, integer9 + 1, integer9, integer9 + 1, this.width - 2 - integer9, integer9, this.depth - 2 - integer9, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
         }
-        for (int integer7 = 0; integer7 < this.width; ++integer7) {
-            for (int integer8 = 0; integer8 < this.depth; ++integer8) {
-                final int integer9 = -5;
-                this.fillColumnDown(bjx, Blocks.SANDSTONE.defaultBlockState(), integer7, -5, integer8, clb);
+        for (int integer9 = 0; integer9 < this.width; ++integer9) {
+            for (int integer10 = 0; integer10 < this.depth; ++integer10) {
+                final int integer11 = -5;
+                this.fillColumnDown(bqu, Blocks.SANDSTONE.defaultBlockState(), integer9, -5, integer10, ctd);
             }
         }
-        final BlockState byj7 = ((AbstractStateHolder<O, BlockState>)Blocks.SANDSTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH);
-        final BlockState byj8 = ((AbstractStateHolder<O, BlockState>)Blocks.SANDSTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.SOUTH);
-        final BlockState byj9 = ((AbstractStateHolder<O, BlockState>)Blocks.SANDSTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.EAST);
-        final BlockState byj10 = ((AbstractStateHolder<O, BlockState>)Blocks.SANDSTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.WEST);
-        this.generateBox(bjx, clb, 0, 0, 0, 4, 9, 4, Blocks.SANDSTONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 1, 10, 1, 3, 10, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.placeBlock(bjx, byj7, 2, 10, 0, clb);
-        this.placeBlock(bjx, byj8, 2, 10, 4, clb);
-        this.placeBlock(bjx, byj9, 0, 10, 2, clb);
-        this.placeBlock(bjx, byj10, 4, 10, 2, clb);
-        this.generateBox(bjx, clb, this.width - 5, 0, 0, this.width - 1, 9, 4, Blocks.SANDSTONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.generateBox(bjx, clb, this.width - 4, 10, 1, this.width - 2, 10, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.placeBlock(bjx, byj7, this.width - 3, 10, 0, clb);
-        this.placeBlock(bjx, byj8, this.width - 3, 10, 4, clb);
-        this.placeBlock(bjx, byj9, this.width - 5, 10, 2, clb);
-        this.placeBlock(bjx, byj10, this.width - 1, 10, 2, clb);
-        this.generateBox(bjx, clb, 8, 0, 0, 12, 4, 4, Blocks.SANDSTONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 9, 1, 0, 11, 3, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 9, 1, 1, clb);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 9, 2, 1, clb);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 9, 3, 1, clb);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 10, 3, 1, clb);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 11, 3, 1, clb);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 11, 2, 1, clb);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 11, 1, 1, clb);
-        this.generateBox(bjx, clb, 4, 1, 1, 8, 3, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 4, 1, 2, 8, 2, 2, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 12, 1, 1, 16, 3, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 12, 1, 2, 16, 2, 2, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 5, 4, 5, this.width - 6, 4, this.depth - 6, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 9, 4, 9, 11, 4, 11, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 8, 1, 8, 8, 3, 8, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 12, 1, 8, 12, 3, 8, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 8, 1, 12, 8, 3, 12, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 12, 1, 12, 12, 3, 12, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 1, 1, 5, 4, 4, 11, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, this.width - 5, 1, 5, this.width - 2, 4, 11, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 6, 7, 9, 6, 7, 11, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, this.width - 7, 7, 9, this.width - 7, 7, 11, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 5, 5, 9, 5, 7, 11, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, this.width - 6, 5, 9, this.width - 6, 7, 11, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 5, 5, 10, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 5, 6, 10, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 6, 6, 10, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), this.width - 6, 5, 10, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), this.width - 6, 6, 10, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), this.width - 7, 6, 10, clb);
-        this.generateBox(bjx, clb, 2, 4, 4, 2, 6, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.generateBox(bjx, clb, this.width - 3, 4, 4, this.width - 3, 6, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.placeBlock(bjx, byj7, 2, 4, 5, clb);
-        this.placeBlock(bjx, byj7, 2, 3, 4, clb);
-        this.placeBlock(bjx, byj7, this.width - 3, 4, 5, clb);
-        this.placeBlock(bjx, byj7, this.width - 3, 3, 4, clb);
-        this.generateBox(bjx, clb, 1, 1, 3, 2, 2, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, this.width - 3, 1, 3, this.width - 2, 2, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.placeBlock(bjx, Blocks.SANDSTONE.defaultBlockState(), 1, 1, 2, clb);
-        this.placeBlock(bjx, Blocks.SANDSTONE.defaultBlockState(), this.width - 2, 1, 2, clb);
-        this.placeBlock(bjx, Blocks.SANDSTONE_SLAB.defaultBlockState(), 1, 2, 2, clb);
-        this.placeBlock(bjx, Blocks.SANDSTONE_SLAB.defaultBlockState(), this.width - 2, 2, 2, clb);
-        this.placeBlock(bjx, byj10, 2, 1, 2, clb);
-        this.placeBlock(bjx, byj9, this.width - 3, 1, 2, clb);
-        this.generateBox(bjx, clb, 4, 3, 5, 4, 3, 17, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, this.width - 5, 3, 5, this.width - 5, 3, 17, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 3, 1, 5, 4, 2, 16, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.generateBox(bjx, clb, this.width - 6, 1, 5, this.width - 5, 2, 16, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        for (int integer10 = 5; integer10 <= 17; integer10 += 2) {
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 4, 1, integer10, clb);
-            this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 4, 2, integer10, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), this.width - 5, 1, integer10, clb);
-            this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), this.width - 5, 2, integer10, clb);
+        final BlockState cfj9 = ((StateHolder<O, BlockState>)Blocks.SANDSTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH);
+        final BlockState cfj10 = ((StateHolder<O, BlockState>)Blocks.SANDSTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.SOUTH);
+        final BlockState cfj11 = ((StateHolder<O, BlockState>)Blocks.SANDSTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.EAST);
+        final BlockState cfj12 = ((StateHolder<O, BlockState>)Blocks.SANDSTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.WEST);
+        this.generateBox(bqu, ctd, 0, 0, 0, 4, 9, 4, Blocks.SANDSTONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 1, 10, 1, 3, 10, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.placeBlock(bqu, cfj9, 2, 10, 0, ctd);
+        this.placeBlock(bqu, cfj10, 2, 10, 4, ctd);
+        this.placeBlock(bqu, cfj11, 0, 10, 2, ctd);
+        this.placeBlock(bqu, cfj12, 4, 10, 2, ctd);
+        this.generateBox(bqu, ctd, this.width - 5, 0, 0, this.width - 1, 9, 4, Blocks.SANDSTONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, this.width - 4, 10, 1, this.width - 2, 10, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.placeBlock(bqu, cfj9, this.width - 3, 10, 0, ctd);
+        this.placeBlock(bqu, cfj10, this.width - 3, 10, 4, ctd);
+        this.placeBlock(bqu, cfj11, this.width - 5, 10, 2, ctd);
+        this.placeBlock(bqu, cfj12, this.width - 1, 10, 2, ctd);
+        this.generateBox(bqu, ctd, 8, 0, 0, 12, 4, 4, Blocks.SANDSTONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 9, 1, 0, 11, 3, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 9, 1, 1, ctd);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 9, 2, 1, ctd);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 9, 3, 1, ctd);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 10, 3, 1, ctd);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 11, 3, 1, ctd);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 11, 2, 1, ctd);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 11, 1, 1, ctd);
+        this.generateBox(bqu, ctd, 4, 1, 1, 8, 3, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 4, 1, 2, 8, 2, 2, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 12, 1, 1, 16, 3, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 12, 1, 2, 16, 2, 2, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 5, 4, 5, this.width - 6, 4, this.depth - 6, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 9, 4, 9, 11, 4, 11, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 8, 1, 8, 8, 3, 8, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 12, 1, 8, 12, 3, 8, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 8, 1, 12, 8, 3, 12, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 12, 1, 12, 12, 3, 12, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 1, 1, 5, 4, 4, 11, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, this.width - 5, 1, 5, this.width - 2, 4, 11, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 6, 7, 9, 6, 7, 11, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, this.width - 7, 7, 9, this.width - 7, 7, 11, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 5, 5, 9, 5, 7, 11, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, this.width - 6, 5, 9, this.width - 6, 7, 11, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 5, 5, 10, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 5, 6, 10, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 6, 6, 10, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), this.width - 6, 5, 10, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), this.width - 6, 6, 10, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), this.width - 7, 6, 10, ctd);
+        this.generateBox(bqu, ctd, 2, 4, 4, 2, 6, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, this.width - 3, 4, 4, this.width - 3, 6, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.placeBlock(bqu, cfj9, 2, 4, 5, ctd);
+        this.placeBlock(bqu, cfj9, 2, 3, 4, ctd);
+        this.placeBlock(bqu, cfj9, this.width - 3, 4, 5, ctd);
+        this.placeBlock(bqu, cfj9, this.width - 3, 3, 4, ctd);
+        this.generateBox(bqu, ctd, 1, 1, 3, 2, 2, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, this.width - 3, 1, 3, this.width - 2, 2, 3, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.placeBlock(bqu, Blocks.SANDSTONE.defaultBlockState(), 1, 1, 2, ctd);
+        this.placeBlock(bqu, Blocks.SANDSTONE.defaultBlockState(), this.width - 2, 1, 2, ctd);
+        this.placeBlock(bqu, Blocks.SANDSTONE_SLAB.defaultBlockState(), 1, 2, 2, ctd);
+        this.placeBlock(bqu, Blocks.SANDSTONE_SLAB.defaultBlockState(), this.width - 2, 2, 2, ctd);
+        this.placeBlock(bqu, cfj12, 2, 1, 2, ctd);
+        this.placeBlock(bqu, cfj11, this.width - 3, 1, 2, ctd);
+        this.generateBox(bqu, ctd, 4, 3, 5, 4, 3, 17, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, this.width - 5, 3, 5, this.width - 5, 3, 17, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 3, 1, 5, 4, 2, 16, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, this.width - 6, 1, 5, this.width - 5, 2, 16, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        for (int integer12 = 5; integer12 <= 17; integer12 += 2) {
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 4, 1, integer12, ctd);
+            this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 4, 2, integer12, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), this.width - 5, 1, integer12, ctd);
+            this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), this.width - 5, 2, integer12, ctd);
         }
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 10, 0, 7, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 10, 0, 8, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 9, 0, 9, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 11, 0, 9, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 8, 0, 10, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 12, 0, 10, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 7, 0, 10, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 13, 0, 10, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 9, 0, 11, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 11, 0, 11, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 10, 0, 12, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 10, 0, 13, clb);
-        this.placeBlock(bjx, Blocks.BLUE_TERRACOTTA.defaultBlockState(), 10, 0, 10, clb);
-        for (int integer10 = 0; integer10 <= this.width - 1; integer10 += this.width - 1) {
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10, 2, 1, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 2, 2, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10, 2, 3, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10, 3, 1, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 3, 2, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10, 3, 3, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 4, 1, clb);
-            this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), integer10, 4, 2, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 4, 3, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10, 5, 1, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 5, 2, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10, 5, 3, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 6, 1, clb);
-            this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), integer10, 6, 2, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 6, 3, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 7, 1, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 7, 2, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 7, 3, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10, 8, 1, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10, 8, 2, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10, 8, 3, clb);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 10, 0, 7, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 10, 0, 8, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 9, 0, 9, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 11, 0, 9, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 8, 0, 10, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 12, 0, 10, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 7, 0, 10, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 13, 0, 10, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 9, 0, 11, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 11, 0, 11, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 10, 0, 12, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 10, 0, 13, ctd);
+        this.placeBlock(bqu, Blocks.BLUE_TERRACOTTA.defaultBlockState(), 10, 0, 10, ctd);
+        for (int integer12 = 0; integer12 <= this.width - 1; integer12 += this.width - 1) {
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12, 2, 1, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 2, 2, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12, 2, 3, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12, 3, 1, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 3, 2, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12, 3, 3, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 4, 1, ctd);
+            this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), integer12, 4, 2, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 4, 3, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12, 5, 1, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 5, 2, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12, 5, 3, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 6, 1, ctd);
+            this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), integer12, 6, 2, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 6, 3, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 7, 1, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 7, 2, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 7, 3, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12, 8, 1, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12, 8, 2, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12, 8, 3, ctd);
         }
-        for (int integer10 = 2; integer10 <= this.width - 3; integer10 += this.width - 3 - 2) {
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10 - 1, 2, 0, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 2, 0, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10 + 1, 2, 0, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10 - 1, 3, 0, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 3, 0, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10 + 1, 3, 0, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10 - 1, 4, 0, clb);
-            this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), integer10, 4, 0, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10 + 1, 4, 0, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10 - 1, 5, 0, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 5, 0, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10 + 1, 5, 0, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10 - 1, 6, 0, clb);
-            this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), integer10, 6, 0, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10 + 1, 6, 0, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10 - 1, 7, 0, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10, 7, 0, clb);
-            this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer10 + 1, 7, 0, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10 - 1, 8, 0, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10, 8, 0, clb);
-            this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), integer10 + 1, 8, 0, clb);
+        for (int integer12 = 2; integer12 <= this.width - 3; integer12 += this.width - 3 - 2) {
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12 - 1, 2, 0, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 2, 0, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12 + 1, 2, 0, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12 - 1, 3, 0, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 3, 0, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12 + 1, 3, 0, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12 - 1, 4, 0, ctd);
+            this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), integer12, 4, 0, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12 + 1, 4, 0, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12 - 1, 5, 0, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 5, 0, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12 + 1, 5, 0, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12 - 1, 6, 0, ctd);
+            this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), integer12, 6, 0, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12 + 1, 6, 0, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12 - 1, 7, 0, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12, 7, 0, ctd);
+            this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), integer12 + 1, 7, 0, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12 - 1, 8, 0, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12, 8, 0, ctd);
+            this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), integer12 + 1, 8, 0, ctd);
         }
-        this.generateBox(bjx, clb, 8, 4, 0, 12, 6, 0, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 8, 6, 0, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 12, 6, 0, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 9, 5, 0, clb);
-        this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 10, 5, 0, clb);
-        this.placeBlock(bjx, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 11, 5, 0, clb);
-        this.generateBox(bjx, clb, 8, -14, 8, 12, -11, 12, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 8, -10, 8, 12, -10, 12, Blocks.CHISELED_SANDSTONE.defaultBlockState(), Blocks.CHISELED_SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 8, -9, 8, 12, -9, 12, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 8, -8, 8, 12, -1, 12, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 9, -11, 9, 11, -1, 11, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.placeBlock(bjx, Blocks.STONE_PRESSURE_PLATE.defaultBlockState(), 10, -11, 10, clb);
-        this.generateBox(bjx, clb, 9, -13, 9, 11, -13, 11, Blocks.TNT.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 8, -11, 10, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 8, -10, 10, clb);
-        this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 7, -10, 10, clb);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 7, -11, 10, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 12, -11, 10, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 12, -10, 10, clb);
-        this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 13, -10, 10, clb);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 13, -11, 10, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 10, -11, 8, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 10, -10, 8, clb);
-        this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 10, -10, 7, clb);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 10, -11, 7, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 10, -11, 12, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 10, -10, 12, clb);
-        this.placeBlock(bjx, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 10, -10, 13, clb);
-        this.placeBlock(bjx, Blocks.CUT_SANDSTONE.defaultBlockState(), 10, -11, 13, clb);
-        for (final Direction fp12 : Direction.Plane.HORIZONTAL) {
-            if (!this.hasPlacedChest[fp12.get2DDataValue()]) {
-                final int integer11 = fp12.getStepX() * 2;
-                final int integer12 = fp12.getStepZ() * 2;
-                this.hasPlacedChest[fp12.get2DDataValue()] = this.createChest(bjx, clb, random, 10 + integer11, -11, 10 + integer12, BuiltInLootTables.DESERT_PYRAMID);
+        this.generateBox(bqu, ctd, 8, 4, 0, 12, 6, 0, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 8, 6, 0, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 12, 6, 0, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 9, 5, 0, ctd);
+        this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 10, 5, 0, ctd);
+        this.placeBlock(bqu, Blocks.ORANGE_TERRACOTTA.defaultBlockState(), 11, 5, 0, ctd);
+        this.generateBox(bqu, ctd, 8, -14, 8, 12, -11, 12, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 8, -10, 8, 12, -10, 12, Blocks.CHISELED_SANDSTONE.defaultBlockState(), Blocks.CHISELED_SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 8, -9, 8, 12, -9, 12, Blocks.CUT_SANDSTONE.defaultBlockState(), Blocks.CUT_SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 8, -8, 8, 12, -1, 12, Blocks.SANDSTONE.defaultBlockState(), Blocks.SANDSTONE.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 9, -11, 9, 11, -1, 11, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.placeBlock(bqu, Blocks.STONE_PRESSURE_PLATE.defaultBlockState(), 10, -11, 10, ctd);
+        this.generateBox(bqu, ctd, 9, -13, 9, 11, -13, 11, Blocks.TNT.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 8, -11, 10, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 8, -10, 10, ctd);
+        this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 7, -10, 10, ctd);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 7, -11, 10, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 12, -11, 10, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 12, -10, 10, ctd);
+        this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 13, -10, 10, ctd);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 13, -11, 10, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 10, -11, 8, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 10, -10, 8, ctd);
+        this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 10, -10, 7, ctd);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 10, -11, 7, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 10, -11, 12, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 10, -10, 12, ctd);
+        this.placeBlock(bqu, Blocks.CHISELED_SANDSTONE.defaultBlockState(), 10, -10, 13, ctd);
+        this.placeBlock(bqu, Blocks.CUT_SANDSTONE.defaultBlockState(), 10, -11, 13, ctd);
+        for (final Direction fz14 : Direction.Plane.HORIZONTAL) {
+            if (!this.hasPlacedChest[fz14.get2DDataValue()]) {
+                final int integer13 = fz14.getStepX() * 2;
+                final int integer14 = fz14.getStepZ() * 2;
+                this.hasPlacedChest[fz14.get2DDataValue()] = this.createChest(bqu, ctd, random, 10 + integer13, -11, 10 + integer14, BuiltInLootTables.DESERT_PYRAMID);
             }
         }
         return true;
diff --git a/src/net/minecraft/world/level/levelgen/structure/EndCityPieces.java b/src/net/minecraft/world/level/levelgen/structure/EndCityPieces.java
index fe4e709..cf0ec40 100644
--- a/src/net/minecraft/world/level/levelgen/structure/EndCityPieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/EndCityPieces.java
@@ -40,23 +40,23 @@ public class EndCityPieces {
     private static final List<Tuple<Rotation, BlockPos>> FAT_TOWER_BRIDGES;
     private static final SectionGenerator FAT_TOWER_GENERATOR;
     
-    private static EndCityPiece addPiece(final StructureManager cmo, final EndCityPiece a, final BlockPos fk, final String string, final Rotation btu, final boolean boolean6) {
-        final EndCityPiece a2 = new EndCityPiece(cmo, string, a.templatePosition, btu, boolean6);
-        final BlockPos fk2 = a.template.calculateConnectedPosition(a.placeSettings, fk, a2.placeSettings, BlockPos.ZERO);
-        a2.move(fk2.getX(), fk2.getY(), fk2.getZ());
+    private static EndCityPiece addPiece(final StructureManager cva, final EndCityPiece a, final BlockPos fu, final String string, final Rotation cap, final boolean boolean6) {
+        final EndCityPiece a2 = new EndCityPiece(cva, string, a.templatePosition, cap, boolean6);
+        final BlockPos fu2 = a.template.calculateConnectedPosition(a.placeSettings, fu, a2.placeSettings, BlockPos.ZERO);
+        a2.move(fu2.getX(), fu2.getY(), fu2.getZ());
         return a2;
     }
     
-    public static void startHouseTower(final StructureManager cmo, final BlockPos fk, final Rotation btu, final List<StructurePiece> list, final Random random) {
+    public static void startHouseTower(final StructureManager cva, final BlockPos fu, final Rotation cap, final List<StructurePiece> list, final Random random) {
         EndCityPieces.FAT_TOWER_GENERATOR.init();
         EndCityPieces.HOUSE_TOWER_GENERATOR.init();
         EndCityPieces.TOWER_BRIDGE_GENERATOR.init();
         EndCityPieces.TOWER_GENERATOR.init();
-        EndCityPiece a6 = addHelper(list, new EndCityPiece(cmo, "base_floor", fk, btu, true));
-        a6 = addHelper(list, addPiece(cmo, a6, new BlockPos(-1, 0, -1), "second_floor_1", btu, false));
-        a6 = addHelper(list, addPiece(cmo, a6, new BlockPos(-1, 4, -1), "third_floor_1", btu, false));
-        a6 = addHelper(list, addPiece(cmo, a6, new BlockPos(-1, 8, -1), "third_roof", btu, true));
-        recursiveChildren(cmo, EndCityPieces.TOWER_GENERATOR, 1, a6, null, list, random);
+        EndCityPiece a6 = addHelper(list, new EndCityPiece(cva, "base_floor", fu, cap, true));
+        a6 = addHelper(list, addPiece(cva, a6, new BlockPos(-1, 0, -1), "second_floor_1", cap, false));
+        a6 = addHelper(list, addPiece(cva, a6, new BlockPos(-1, 4, -1), "third_floor_1", cap, false));
+        a6 = addHelper(list, addPiece(cva, a6, new BlockPos(-1, 8, -1), "third_roof", cap, true));
+        recursiveChildren(cva, EndCityPieces.TOWER_GENERATOR, 1, a6, null, list, random);
     }
     
     private static EndCityPiece addHelper(final List<StructurePiece> list, final EndCityPiece a) {
@@ -64,18 +64,18 @@ public class EndCityPieces {
         return a;
     }
     
-    private static boolean recursiveChildren(final StructureManager cmo, final SectionGenerator b, final int integer, final EndCityPiece a, final BlockPos fk, final List<StructurePiece> list, final Random random) {
+    private static boolean recursiveChildren(final StructureManager cva, final SectionGenerator b, final int integer, final EndCityPiece a, final BlockPos fu, final List<StructurePiece> list, final Random random) {
         if (integer > 8) {
             return false;
         }
         final List<StructurePiece> list2 = Lists.newArrayList();
-        if (b.generate(cmo, integer, a, fk, list2, random)) {
+        if (b.generate(cva, integer, a, fu, list2, random)) {
             boolean boolean9 = false;
             final int integer2 = random.nextInt();
-            for (final StructurePiece clu12 : list2) {
-                clu12.genDepth = integer2;
-                final StructurePiece clu13 = StructurePiece.findCollisionPiece(list, clu12.getBoundingBox());
-                if (clu13 != null && clu13.genDepth != a.genDepth) {
+            for (final StructurePiece cty12 : list2) {
+                cty12.genDepth = integer2;
+                final StructurePiece cty13 = StructurePiece.findCollisionPiece(list, cty12.getBoundingBox());
+                if (cty13 != null && cty13.genDepth != a.genDepth) {
                     boolean9 = true;
                     break;
                 }
@@ -97,26 +97,26 @@ public class EndCityPieces {
             }
             
             @Override
-            public boolean generate(final StructureManager cmo, final int integer, final EndCityPiece a, final BlockPos fk, final List<StructurePiece> list, final Random random) {
+            public boolean generate(final StructureManager cva, final int integer, final EndCityPiece a, final BlockPos fu, final List<StructurePiece> list, final Random random) {
                 if (integer > 8) {
                     return false;
                 }
-                final Rotation btu8 = a.placeSettings.getRotation();
-                EndCityPiece a2 = addHelper(list, addPiece(cmo, a, fk, "base_floor", btu8, true));
+                final Rotation cap8 = a.placeSettings.getRotation();
+                EndCityPiece a2 = addHelper(list, addPiece(cva, a, fu, "base_floor", cap8, true));
                 final int integer2 = random.nextInt(3);
                 if (integer2 == 0) {
-                    a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(-1, 4, -1), "base_roof", btu8, true));
+                    a2 = addHelper(list, addPiece(cva, a2, new BlockPos(-1, 4, -1), "base_roof", cap8, true));
                 }
                 else if (integer2 == 1) {
-                    a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(-1, 0, -1), "second_floor_2", btu8, false));
-                    a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(-1, 8, -1), "second_roof", btu8, false));
-                    recursiveChildren(cmo, EndCityPieces.TOWER_GENERATOR, integer + 1, a2, null, list, random);
+                    a2 = addHelper(list, addPiece(cva, a2, new BlockPos(-1, 0, -1), "second_floor_2", cap8, false));
+                    a2 = addHelper(list, addPiece(cva, a2, new BlockPos(-1, 8, -1), "second_roof", cap8, false));
+                    recursiveChildren(cva, EndCityPieces.TOWER_GENERATOR, integer + 1, a2, null, list, random);
                 }
                 else if (integer2 == 2) {
-                    a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(-1, 0, -1), "second_floor_2", btu8, false));
-                    a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(-1, 4, -1), "third_floor_2", btu8, false));
-                    a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(-1, 8, -1), "third_roof", btu8, true));
-                    recursiveChildren(cmo, EndCityPieces.TOWER_GENERATOR, integer + 1, a2, null, list, random);
+                    a2 = addHelper(list, addPiece(cva, a2, new BlockPos(-1, 0, -1), "second_floor_2", cap8, false));
+                    a2 = addHelper(list, addPiece(cva, a2, new BlockPos(-1, 4, -1), "third_floor_2", cap8, false));
+                    a2 = addHelper(list, addPiece(cva, a2, new BlockPos(-1, 8, -1), "third_roof", cap8, true));
+                    recursiveChildren(cva, EndCityPieces.TOWER_GENERATOR, integer + 1, a2, null, list, random);
                 }
                 return true;
             }
@@ -128,32 +128,32 @@ public class EndCityPieces {
             }
             
             @Override
-            public boolean generate(final StructureManager cmo, final int integer, final EndCityPiece a, final BlockPos fk, final List<StructurePiece> list, final Random random) {
-                final Rotation btu8 = a.placeSettings.getRotation();
+            public boolean generate(final StructureManager cva, final int integer, final EndCityPiece a, final BlockPos fu, final List<StructurePiece> list, final Random random) {
+                final Rotation cap8 = a.placeSettings.getRotation();
                 EndCityPiece a2 = a;
-                a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(3 + random.nextInt(2), -3, 3 + random.nextInt(2)), "tower_base", btu8, true));
-                a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(0, 7, 0), "tower_piece", btu8, true));
+                a2 = addHelper(list, addPiece(cva, a2, new BlockPos(3 + random.nextInt(2), -3, 3 + random.nextInt(2)), "tower_base", cap8, true));
+                a2 = addHelper(list, addPiece(cva, a2, new BlockPos(0, 7, 0), "tower_piece", cap8, true));
                 EndCityPiece a3 = (random.nextInt(3) == 0) ? a2 : null;
                 for (int integer2 = 1 + random.nextInt(3), integer3 = 0; integer3 < integer2; ++integer3) {
-                    a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(0, 4, 0), "tower_piece", btu8, true));
+                    a2 = addHelper(list, addPiece(cva, a2, new BlockPos(0, 4, 0), "tower_piece", cap8, true));
                     if (integer3 < integer2 - 1 && random.nextBoolean()) {
                         a3 = a2;
                     }
                 }
                 if (a3 != null) {
-                    for (final Tuple<Rotation, BlockPos> abz13 : EndCityPieces.TOWER_BRIDGES) {
+                    for (final Tuple<Rotation, BlockPos> aek13 : EndCityPieces.TOWER_BRIDGES) {
                         if (random.nextBoolean()) {
-                            final EndCityPiece a4 = addHelper(list, addPiece(cmo, a3, abz13.getB(), "bridge_end", btu8.getRotated(abz13.getA()), true));
-                            recursiveChildren(cmo, EndCityPieces.TOWER_BRIDGE_GENERATOR, integer + 1, a4, null, list, random);
+                            final EndCityPiece a4 = addHelper(list, addPiece(cva, a3, aek13.getB(), "bridge_end", cap8.getRotated(aek13.getA()), true));
+                            recursiveChildren(cva, EndCityPieces.TOWER_BRIDGE_GENERATOR, integer + 1, a4, null, list, random);
                         }
                     }
-                    a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(-1, 4, -1), "tower_top", btu8, true));
+                    a2 = addHelper(list, addPiece(cva, a2, new BlockPos(-1, 4, -1), "tower_top", cap8, true));
                 }
                 else {
                     if (integer != 7) {
-                        return recursiveChildren(cmo, EndCityPieces.FAT_TOWER_GENERATOR, integer + 1, a2, null, list, random);
+                        return recursiveChildren(cva, EndCityPieces.FAT_TOWER_GENERATOR, integer + 1, a2, null, list, random);
                     }
-                    a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(-1, 4, -1), "tower_top", btu8, true));
+                    a2 = addHelper(list, addPiece(cva, a2, new BlockPos(-1, 4, -1), "tower_top", cap8, true));
                 }
                 return true;
             }
@@ -167,37 +167,37 @@ public class EndCityPieces {
             }
             
             @Override
-            public boolean generate(final StructureManager cmo, final int integer, final EndCityPiece a, final BlockPos fk, final List<StructurePiece> list, final Random random) {
-                final Rotation btu8 = a.placeSettings.getRotation();
+            public boolean generate(final StructureManager cva, final int integer, final EndCityPiece a, final BlockPos fu, final List<StructurePiece> list, final Random random) {
+                final Rotation cap8 = a.placeSettings.getRotation();
                 final int integer2 = random.nextInt(4) + 1;
-                EndCityPiece a2 = addHelper(list, addPiece(cmo, a, new BlockPos(0, 0, -4), "bridge_piece", btu8, true));
+                EndCityPiece a2 = addHelper(list, addPiece(cva, a, new BlockPos(0, 0, -4), "bridge_piece", cap8, true));
                 a2.genDepth = -1;
                 int integer3 = 0;
                 for (int integer4 = 0; integer4 < integer2; ++integer4) {
                     if (random.nextBoolean()) {
-                        a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(0, integer3, -4), "bridge_piece", btu8, true));
+                        a2 = addHelper(list, addPiece(cva, a2, new BlockPos(0, integer3, -4), "bridge_piece", cap8, true));
                         integer3 = 0;
                     }
                     else {
                         if (random.nextBoolean()) {
-                            a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(0, integer3, -4), "bridge_steep_stairs", btu8, true));
+                            a2 = addHelper(list, addPiece(cva, a2, new BlockPos(0, integer3, -4), "bridge_steep_stairs", cap8, true));
                         }
                         else {
-                            a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(0, integer3, -8), "bridge_gentle_stairs", btu8, true));
+                            a2 = addHelper(list, addPiece(cva, a2, new BlockPos(0, integer3, -8), "bridge_gentle_stairs", cap8, true));
                         }
                         integer3 = 4;
                     }
                 }
                 if (this.shipCreated || random.nextInt(10 - integer) != 0) {
-                    if (!recursiveChildren(cmo, EndCityPieces.HOUSE_TOWER_GENERATOR, integer + 1, a2, new BlockPos(-3, integer3 + 1, -11), list, random)) {
+                    if (!recursiveChildren(cva, EndCityPieces.HOUSE_TOWER_GENERATOR, integer + 1, a2, new BlockPos(-3, integer3 + 1, -11), list, random)) {
                         return false;
                     }
                 }
                 else {
-                    addHelper(list, addPiece(cmo, a2, new BlockPos(-8 + random.nextInt(8), integer3, -70 + random.nextInt(10)), "ship", btu8, true));
+                    addHelper(list, addPiece(cva, a2, new BlockPos(-8 + random.nextInt(8), integer3, -70 + random.nextInt(10)), "ship", cap8, true));
                     this.shipCreated = true;
                 }
-                a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(4, integer3, 0), "bridge_end", btu8.getRotated(Rotation.CLOCKWISE_180), true));
+                a2 = addHelper(list, addPiece(cva, a2, new BlockPos(4, integer3, 0), "bridge_end", cap8.getRotated(Rotation.CLOCKWISE_180), true));
                 a2.genDepth = -1;
                 return true;
             }
@@ -209,20 +209,20 @@ public class EndCityPieces {
             }
             
             @Override
-            public boolean generate(final StructureManager cmo, final int integer, final EndCityPiece a, final BlockPos fk, final List<StructurePiece> list, final Random random) {
-                final Rotation btu9 = a.placeSettings.getRotation();
-                EndCityPiece a2 = addHelper(list, addPiece(cmo, a, new BlockPos(-3, 4, -3), "fat_tower_base", btu9, true));
-                a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(0, 4, 0), "fat_tower_middle", btu9, true));
+            public boolean generate(final StructureManager cva, final int integer, final EndCityPiece a, final BlockPos fu, final List<StructurePiece> list, final Random random) {
+                final Rotation cap9 = a.placeSettings.getRotation();
+                EndCityPiece a2 = addHelper(list, addPiece(cva, a, new BlockPos(-3, 4, -3), "fat_tower_base", cap9, true));
+                a2 = addHelper(list, addPiece(cva, a2, new BlockPos(0, 4, 0), "fat_tower_middle", cap9, true));
                 for (int integer2 = 0; integer2 < 2 && random.nextInt(3) != 0; ++integer2) {
-                    a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(0, 8, 0), "fat_tower_middle", btu9, true));
-                    for (final Tuple<Rotation, BlockPos> abz12 : EndCityPieces.FAT_TOWER_BRIDGES) {
+                    a2 = addHelper(list, addPiece(cva, a2, new BlockPos(0, 8, 0), "fat_tower_middle", cap9, true));
+                    for (final Tuple<Rotation, BlockPos> aek12 : EndCityPieces.FAT_TOWER_BRIDGES) {
                         if (random.nextBoolean()) {
-                            final EndCityPiece a3 = addHelper(list, addPiece(cmo, a2, abz12.getB(), "bridge_end", btu9.getRotated(abz12.getA()), true));
-                            recursiveChildren(cmo, EndCityPieces.TOWER_BRIDGE_GENERATOR, integer + 1, a3, null, list, random);
+                            final EndCityPiece a3 = addHelper(list, addPiece(cva, a2, aek12.getB(), "bridge_end", cap9.getRotated(aek12.getA()), true));
+                            recursiveChildren(cva, EndCityPieces.TOWER_BRIDGE_GENERATOR, integer + 1, a3, null, list, random);
                         }
                     }
                 }
-                a2 = addHelper(list, addPiece(cmo, a2, new BlockPos(-2, 8, -2), "fat_tower_top", btu9, true));
+                a2 = addHelper(list, addPiece(cva, a2, new BlockPos(-2, 8, -2), "fat_tower_top", cap9, true));
                 return true;
             }
         };
@@ -233,55 +233,55 @@ public class EndCityPieces {
         private final Rotation rotation;
         private final boolean overwrite;
         
-        public EndCityPiece(final StructureManager cmo, final String string, final BlockPos fk, final Rotation btu, final boolean boolean5) {
+        public EndCityPiece(final StructureManager cva, final String string, final BlockPos fu, final Rotation cap, final boolean boolean5) {
             super(StructurePieceType.END_CITY_PIECE, 0);
             this.templateName = string;
-            this.templatePosition = fk;
-            this.rotation = btu;
+            this.templatePosition = fu;
+            this.rotation = cap;
             this.overwrite = boolean5;
-            this.loadTemplate(cmo);
+            this.loadTemplate(cva);
         }
         
-        public EndCityPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.END_CITY_PIECE, jt);
-            this.templateName = jt.getString("Template");
-            this.rotation = Rotation.valueOf(jt.getString("Rot"));
-            this.overwrite = jt.getBoolean("OW");
-            this.loadTemplate(cmo);
+        public EndCityPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.END_CITY_PIECE, le);
+            this.templateName = le.getString("Template");
+            this.rotation = Rotation.valueOf(le.getString("Rot"));
+            this.overwrite = le.getBoolean("OW");
+            this.loadTemplate(cva);
         }
         
-        private void loadTemplate(final StructureManager cmo) {
-            final StructureTemplate cms3 = cmo.getOrCreate(new ResourceLocation("end_city/" + this.templateName));
-            final StructurePlaceSettings cmp4 = (this.overwrite ? EndCityPieces.OVERWRITE : EndCityPieces.INSERT).copy().setRotation(this.rotation);
-            this.setup(cms3, this.templatePosition, cmp4);
+        private void loadTemplate(final StructureManager cva) {
+            final StructureTemplate cve3 = cva.getOrCreate(new ResourceLocation("end_city/" + this.templateName));
+            final StructurePlaceSettings cvb4 = (this.overwrite ? EndCityPieces.OVERWRITE : EndCityPieces.INSERT).copy().setRotation(this.rotation);
+            this.setup(cve3, this.templatePosition, cvb4);
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putString("Template", this.templateName);
-            jt.putString("Rot", this.rotation.name());
-            jt.putBoolean("OW", this.overwrite);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putString("Template", this.templateName);
+            le.putString("Rot", this.rotation.name());
+            le.putBoolean("OW", this.overwrite);
         }
         
         @Override
-        protected void handleDataMarker(final String string, final BlockPos fk, final LevelAccessor bjx, final Random random, final BoundingBox clb) {
+        protected void handleDataMarker(final String string, final BlockPos fu, final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
             if (string.startsWith("Chest")) {
-                final BlockPos fk2 = fk.below();
-                if (clb.isInside(fk2)) {
-                    RandomizableContainerBlockEntity.setLootTable(bjx, random, fk2, BuiltInLootTables.END_CITY_TREASURE);
+                final BlockPos fu2 = fu.below();
+                if (ctd.isInside(fu2)) {
+                    RandomizableContainerBlockEntity.setLootTable(bqc, random, fu2, BuiltInLootTables.END_CITY_TREASURE);
                 }
             }
             else if (string.startsWith("Sentry")) {
-                final Shulker axe7 = EntityType.SHULKER.create(bjx.getLevel());
-                axe7.setPos(fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5);
-                axe7.setAttachPosition(fk);
-                bjx.addFreshEntity(axe7);
+                final Shulker bch7 = EntityType.SHULKER.create(bqc.getLevel());
+                bch7.setPos(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5);
+                bch7.setAttachPosition(fu);
+                bqc.addFreshEntity(bch7);
             }
             else if (string.startsWith("Elytra")) {
-                final ItemFrame avr7 = new ItemFrame(bjx.getLevel(), fk, this.rotation.rotate(Direction.SOUTH));
-                avr7.setItem(new ItemStack(Items.ELYTRA), false);
-                bjx.addFreshEntity(avr7);
+                final ItemFrame bba7 = new ItemFrame(bqc.getLevel(), fu, this.rotation.rotate(Direction.SOUTH));
+                bba7.setItem(new ItemStack(Items.ELYTRA), false);
+                bqc.addFreshEntity(bba7);
             }
         }
     }
@@ -289,6 +289,6 @@ public class EndCityPieces {
     interface SectionGenerator {
         void init();
         
-        boolean generate(final StructureManager cmo, final int integer, final EndCityPiece a, final BlockPos fk, final List<StructurePiece> list, final Random random);
+        boolean generate(final StructureManager cva, final int integer, final EndCityPiece a, final BlockPos fu, final List<StructurePiece> list, final Random random);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/IglooPieces.java b/src/net/minecraft/world/level/levelgen/structure/IglooPieces.java
index bfbbe3b..a989837 100644
--- a/src/net/minecraft/world/level/levelgen/structure/IglooPieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/IglooPieces.java
@@ -5,6 +5,8 @@ import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.block.entity.ChestBlockEntity;
@@ -18,7 +20,6 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlac
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.levelgen.feature.StructurePieceType;
 import com.google.common.collect.ImmutableMap;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import java.util.Random;
 import java.util.List;
 import net.minecraft.world.level.block.Rotation;
@@ -34,15 +35,15 @@ public class IglooPieces {
     private static final Map<ResourceLocation, BlockPos> PIVOTS;
     private static final Map<ResourceLocation, BlockPos> OFFSETS;
     
-    public static void addPieces(final StructureManager cmo, final BlockPos fk, final Rotation btu, final List<StructurePiece> list, final Random random, final NoneFeatureConfiguration cgv) {
+    public static void addPieces(final StructureManager cva, final BlockPos fu, final Rotation cap, final List<StructurePiece> list, final Random random) {
         if (random.nextDouble() < 0.5) {
-            final int integer7 = random.nextInt(8) + 4;
-            list.add(new IglooPiece(cmo, IglooPieces.STRUCTURE_LOCATION_LABORATORY, fk, btu, integer7 * 3));
-            for (int integer8 = 0; integer8 < integer7 - 1; ++integer8) {
-                list.add(new IglooPiece(cmo, IglooPieces.STRUCTURE_LOCATION_LADDER, fk, btu, integer8 * 3));
+            final int integer6 = random.nextInt(8) + 4;
+            list.add(new IglooPiece(cva, IglooPieces.STRUCTURE_LOCATION_LABORATORY, fu, cap, integer6 * 3));
+            for (int integer7 = 0; integer7 < integer6 - 1; ++integer7) {
+                list.add(new IglooPiece(cva, IglooPieces.STRUCTURE_LOCATION_LADDER, fu, cap, integer7 * 3));
             }
         }
-        list.add(new IglooPiece(cmo, IglooPieces.STRUCTURE_LOCATION_IGLOO, fk, btu, 0));
+        list.add(new IglooPiece(cva, IglooPieces.STRUCTURE_LOCATION_IGLOO, fu, cap, 0));
     }
     
     static {
@@ -57,65 +58,65 @@ public class IglooPieces {
         private final ResourceLocation templateLocation;
         private final Rotation rotation;
         
-        public IglooPiece(final StructureManager cmo, final ResourceLocation sm, final BlockPos fk, final Rotation btu, final int integer) {
+        public IglooPiece(final StructureManager cva, final ResourceLocation uh, final BlockPos fu, final Rotation cap, final int integer) {
             super(StructurePieceType.IGLOO, 0);
-            this.templateLocation = sm;
-            final BlockPos fk2 = IglooPieces.OFFSETS.get(sm);
-            this.templatePosition = fk.offset(fk2.getX(), fk2.getY() - integer, fk2.getZ());
-            this.rotation = btu;
-            this.loadTemplate(cmo);
+            this.templateLocation = uh;
+            final BlockPos fu2 = IglooPieces.OFFSETS.get(uh);
+            this.templatePosition = fu.offset(fu2.getX(), fu2.getY() - integer, fu2.getZ());
+            this.rotation = cap;
+            this.loadTemplate(cva);
         }
         
-        public IglooPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.IGLOO, jt);
-            this.templateLocation = new ResourceLocation(jt.getString("Template"));
-            this.rotation = Rotation.valueOf(jt.getString("Rot"));
-            this.loadTemplate(cmo);
+        public IglooPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.IGLOO, le);
+            this.templateLocation = new ResourceLocation(le.getString("Template"));
+            this.rotation = Rotation.valueOf(le.getString("Rot"));
+            this.loadTemplate(cva);
         }
         
-        private void loadTemplate(final StructureManager cmo) {
-            final StructureTemplate cms3 = cmo.getOrCreate(this.templateLocation);
-            final StructurePlaceSettings cmp4 = new StructurePlaceSettings().setRotation(this.rotation).setMirror(Mirror.NONE).setRotationPivot(IglooPieces.PIVOTS.get(this.templateLocation)).addProcessor(BlockIgnoreProcessor.STRUCTURE_BLOCK);
-            this.setup(cms3, this.templatePosition, cmp4);
+        private void loadTemplate(final StructureManager cva) {
+            final StructureTemplate cve3 = cva.getOrCreate(this.templateLocation);
+            final StructurePlaceSettings cvb4 = new StructurePlaceSettings().setRotation(this.rotation).setMirror(Mirror.NONE).setRotationPivot(IglooPieces.PIVOTS.get(this.templateLocation)).addProcessor(BlockIgnoreProcessor.STRUCTURE_BLOCK);
+            this.setup(cve3, this.templatePosition, cvb4);
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putString("Template", this.templateLocation.toString());
-            jt.putString("Rot", this.rotation.name());
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putString("Template", this.templateLocation.toString());
+            le.putString("Rot", this.rotation.name());
         }
         
         @Override
-        protected void handleDataMarker(final String string, final BlockPos fk, final LevelAccessor bjx, final Random random, final BoundingBox clb) {
+        protected void handleDataMarker(final String string, final BlockPos fu, final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
             if (!"chest".equals(string)) {
                 return;
             }
-            bjx.setBlock(fk, Blocks.AIR.defaultBlockState(), 3);
-            final BlockEntity bwl7 = bjx.getBlockEntity(fk.below());
-            if (bwl7 instanceof ChestBlockEntity) {
-                ((ChestBlockEntity)bwl7).setLootTable(BuiltInLootTables.IGLOO_CHEST, random.nextLong());
+            bqc.setBlock(fu, Blocks.AIR.defaultBlockState(), 3);
+            final BlockEntity cdl7 = bqc.getBlockEntity(fu.below());
+            if (cdl7 instanceof ChestBlockEntity) {
+                ((ChestBlockEntity)cdl7).setLootTable(BuiltInLootTables.IGLOO_CHEST, random.nextLong());
             }
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            final StructurePlaceSettings cmp7 = new StructurePlaceSettings().setRotation(this.rotation).setMirror(Mirror.NONE).setRotationPivot(IglooPieces.PIVOTS.get(this.templateLocation)).addProcessor(BlockIgnoreProcessor.STRUCTURE_BLOCK);
-            final BlockPos fk8 = IglooPieces.OFFSETS.get(this.templateLocation);
-            final BlockPos fk9 = this.templatePosition.offset(StructureTemplate.calculateRelativePosition(cmp7, new BlockPos(3 - fk8.getX(), 0, 0 - fk8.getZ())));
-            final int integer10 = bjx.getHeight(Heightmap.Types.WORLD_SURFACE_WG, fk9.getX(), fk9.getZ());
-            final BlockPos fk10 = this.templatePosition;
-            this.templatePosition = this.templatePosition.offset(0, integer10 - 90 - 1, 0);
-            final boolean boolean12 = super.postProcess(bjx, caa, random, clb, bjh);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            final StructurePlaceSettings cvb9 = new StructurePlaceSettings().setRotation(this.rotation).setMirror(Mirror.NONE).setRotationPivot(IglooPieces.PIVOTS.get(this.templateLocation)).addProcessor(BlockIgnoreProcessor.STRUCTURE_BLOCK);
+            final BlockPos fu2 = IglooPieces.OFFSETS.get(this.templateLocation);
+            final BlockPos fu3 = this.templatePosition.offset(StructureTemplate.calculateRelativePosition(cvb9, new BlockPos(3 - fu2.getX(), 0, 0 - fu2.getZ())));
+            final int integer12 = bqu.getHeight(Heightmap.Types.WORLD_SURFACE_WG, fu3.getX(), fu3.getZ());
+            final BlockPos fu4 = this.templatePosition;
+            this.templatePosition = this.templatePosition.offset(0, integer12 - 90 - 1, 0);
+            final boolean boolean14 = super.postProcess(bqu, bqq, cha, random, ctd, bph, fu);
             if (this.templateLocation.equals(IglooPieces.STRUCTURE_LOCATION_IGLOO)) {
-                final BlockPos fk11 = this.templatePosition.offset(StructureTemplate.calculateRelativePosition(cmp7, new BlockPos(3, 0, 5)));
-                final BlockState byj14 = bjx.getBlockState(fk11.below());
-                if (!byj14.isAir() && byj14.getBlock() != Blocks.LADDER) {
-                    bjx.setBlock(fk11, Blocks.SNOW_BLOCK.defaultBlockState(), 3);
+                final BlockPos fu5 = this.templatePosition.offset(StructureTemplate.calculateRelativePosition(cvb9, new BlockPos(3, 0, 5)));
+                final BlockState cfj16 = bqu.getBlockState(fu5.below());
+                if (!cfj16.isAir() && !cfj16.is(Blocks.LADDER)) {
+                    bqu.setBlock(fu5, Blocks.SNOW_BLOCK.defaultBlockState(), 3);
                 }
             }
-            this.templatePosition = fk10;
-            return boolean12;
+            this.templatePosition = fu4;
+            return boolean14;
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/JunglePyramidPiece.java b/src/net/minecraft/world/level/levelgen/structure/JunglePyramidPiece.java
index 80257ec..d2b8ee9 100644
--- a/src/net/minecraft/world/level/levelgen/structure/JunglePyramidPiece.java
+++ b/src/net/minecraft/world/level/levelgen/structure/JunglePyramidPiece.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.structure;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.RepeaterBlock;
 import net.minecraft.world.level.block.piston.PistonBaseBlock;
 import net.minecraft.world.level.block.state.properties.AttachFace;
@@ -16,9 +16,12 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.StairBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.feature.StructurePieceType;
@@ -35,185 +38,185 @@ public class JunglePyramidPiece extends ScatteredFeaturePiece {
         super(StructurePieceType.JUNGLE_PYRAMID_PIECE, random, integer2, 64, integer3, 12, 10, 15);
     }
     
-    public JunglePyramidPiece(final StructureManager cmo, final CompoundTag jt) {
-        super(StructurePieceType.JUNGLE_PYRAMID_PIECE, jt);
-        this.placedMainChest = jt.getBoolean("placedMainChest");
-        this.placedHiddenChest = jt.getBoolean("placedHiddenChest");
-        this.placedTrap1 = jt.getBoolean("placedTrap1");
-        this.placedTrap2 = jt.getBoolean("placedTrap2");
+    public JunglePyramidPiece(final StructureManager cva, final CompoundTag le) {
+        super(StructurePieceType.JUNGLE_PYRAMID_PIECE, le);
+        this.placedMainChest = le.getBoolean("placedMainChest");
+        this.placedHiddenChest = le.getBoolean("placedHiddenChest");
+        this.placedTrap1 = le.getBoolean("placedTrap1");
+        this.placedTrap2 = le.getBoolean("placedTrap2");
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("placedMainChest", this.placedMainChest);
-        jt.putBoolean("placedHiddenChest", this.placedHiddenChest);
-        jt.putBoolean("placedTrap1", this.placedTrap1);
-        jt.putBoolean("placedTrap2", this.placedTrap2);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("placedMainChest", this.placedMainChest);
+        le.putBoolean("placedHiddenChest", this.placedHiddenChest);
+        le.putBoolean("placedTrap1", this.placedTrap1);
+        le.putBoolean("placedTrap2", this.placedTrap2);
     }
     
     @Override
-    public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-        if (!this.updateAverageGroundHeight(bjx, clb, 0)) {
+    public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+        if (!this.updateAverageGroundHeight(bqu, ctd, 0)) {
             return false;
         }
-        this.generateBox(bjx, clb, 0, -4, 0, this.width - 1, 0, this.depth - 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 2, 1, 2, 9, 2, 2, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 2, 1, 12, 9, 2, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 2, 1, 3, 2, 2, 11, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 9, 1, 3, 9, 2, 11, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 1, 3, 1, 10, 6, 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 1, 3, 13, 10, 6, 13, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 1, 3, 2, 1, 6, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 10, 3, 2, 10, 6, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 2, 3, 2, 9, 3, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 2, 6, 2, 9, 6, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 3, 7, 3, 8, 7, 11, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 4, 8, 4, 7, 8, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateAirBox(bjx, clb, 3, 1, 3, 8, 2, 11);
-        this.generateAirBox(bjx, clb, 4, 3, 6, 7, 3, 9);
-        this.generateAirBox(bjx, clb, 2, 4, 2, 9, 5, 12);
-        this.generateAirBox(bjx, clb, 4, 6, 5, 7, 6, 9);
-        this.generateAirBox(bjx, clb, 5, 7, 6, 6, 7, 8);
-        this.generateAirBox(bjx, clb, 5, 1, 2, 6, 2, 2);
-        this.generateAirBox(bjx, clb, 5, 2, 12, 6, 2, 12);
-        this.generateAirBox(bjx, clb, 5, 5, 1, 6, 5, 1);
-        this.generateAirBox(bjx, clb, 5, 5, 13, 6, 5, 13);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 1, 5, 5, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 10, 5, 5, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 1, 5, 9, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 10, 5, 9, clb);
-        for (int integer7 = 0; integer7 <= 14; integer7 += 14) {
-            this.generateBox(bjx, clb, 2, 4, integer7, 2, 5, integer7, false, random, JunglePyramidPiece.STONE_SELECTOR);
-            this.generateBox(bjx, clb, 4, 4, integer7, 4, 5, integer7, false, random, JunglePyramidPiece.STONE_SELECTOR);
-            this.generateBox(bjx, clb, 7, 4, integer7, 7, 5, integer7, false, random, JunglePyramidPiece.STONE_SELECTOR);
-            this.generateBox(bjx, clb, 9, 4, integer7, 9, 5, integer7, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 0, -4, 0, this.width - 1, 0, this.depth - 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 2, 1, 2, 9, 2, 2, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 2, 1, 12, 9, 2, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 2, 1, 3, 2, 2, 11, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 9, 1, 3, 9, 2, 11, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 1, 3, 1, 10, 6, 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 1, 3, 13, 10, 6, 13, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 1, 3, 2, 1, 6, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 10, 3, 2, 10, 6, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 2, 3, 2, 9, 3, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 2, 6, 2, 9, 6, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 3, 7, 3, 8, 7, 11, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 4, 8, 4, 7, 8, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateAirBox(bqu, ctd, 3, 1, 3, 8, 2, 11);
+        this.generateAirBox(bqu, ctd, 4, 3, 6, 7, 3, 9);
+        this.generateAirBox(bqu, ctd, 2, 4, 2, 9, 5, 12);
+        this.generateAirBox(bqu, ctd, 4, 6, 5, 7, 6, 9);
+        this.generateAirBox(bqu, ctd, 5, 7, 6, 6, 7, 8);
+        this.generateAirBox(bqu, ctd, 5, 1, 2, 6, 2, 2);
+        this.generateAirBox(bqu, ctd, 5, 2, 12, 6, 2, 12);
+        this.generateAirBox(bqu, ctd, 5, 5, 1, 6, 5, 1);
+        this.generateAirBox(bqu, ctd, 5, 5, 13, 6, 5, 13);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 1, 5, 5, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 10, 5, 5, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 1, 5, 9, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 10, 5, 9, ctd);
+        for (int integer9 = 0; integer9 <= 14; integer9 += 14) {
+            this.generateBox(bqu, ctd, 2, 4, integer9, 2, 5, integer9, false, random, JunglePyramidPiece.STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 4, 4, integer9, 4, 5, integer9, false, random, JunglePyramidPiece.STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 7, 4, integer9, 7, 5, integer9, false, random, JunglePyramidPiece.STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 9, 4, integer9, 9, 5, integer9, false, random, JunglePyramidPiece.STONE_SELECTOR);
         }
-        this.generateBox(bjx, clb, 5, 6, 0, 6, 6, 0, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        for (int integer7 = 0; integer7 <= 11; integer7 += 11) {
-            for (int integer8 = 2; integer8 <= 12; integer8 += 2) {
-                this.generateBox(bjx, clb, integer7, 4, integer8, integer7, 5, integer8, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 5, 6, 0, 6, 6, 0, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        for (int integer9 = 0; integer9 <= 11; integer9 += 11) {
+            for (int integer10 = 2; integer10 <= 12; integer10 += 2) {
+                this.generateBox(bqu, ctd, integer9, 4, integer10, integer9, 5, integer10, false, random, JunglePyramidPiece.STONE_SELECTOR);
             }
-            this.generateBox(bjx, clb, integer7, 6, 5, integer7, 6, 5, false, random, JunglePyramidPiece.STONE_SELECTOR);
-            this.generateBox(bjx, clb, integer7, 6, 9, integer7, 6, 9, false, random, JunglePyramidPiece.STONE_SELECTOR);
+            this.generateBox(bqu, ctd, integer9, 6, 5, integer9, 6, 5, false, random, JunglePyramidPiece.STONE_SELECTOR);
+            this.generateBox(bqu, ctd, integer9, 6, 9, integer9, 6, 9, false, random, JunglePyramidPiece.STONE_SELECTOR);
         }
-        this.generateBox(bjx, clb, 2, 7, 2, 2, 9, 2, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 9, 7, 2, 9, 9, 2, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 2, 7, 12, 2, 9, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 9, 7, 12, 9, 9, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 4, 9, 4, 4, 9, 4, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 7, 9, 4, 7, 9, 4, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 4, 9, 10, 4, 9, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 7, 9, 10, 7, 9, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 5, 9, 7, 6, 9, 7, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        final BlockState byj7 = ((AbstractStateHolder<O, BlockState>)Blocks.COBBLESTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.EAST);
-        final BlockState byj8 = ((AbstractStateHolder<O, BlockState>)Blocks.COBBLESTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.WEST);
-        final BlockState byj9 = ((AbstractStateHolder<O, BlockState>)Blocks.COBBLESTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.SOUTH);
-        final BlockState byj10 = ((AbstractStateHolder<O, BlockState>)Blocks.COBBLESTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH);
-        this.placeBlock(bjx, byj10, 5, 9, 6, clb);
-        this.placeBlock(bjx, byj10, 6, 9, 6, clb);
-        this.placeBlock(bjx, byj9, 5, 9, 8, clb);
-        this.placeBlock(bjx, byj9, 6, 9, 8, clb);
-        this.placeBlock(bjx, byj10, 4, 0, 0, clb);
-        this.placeBlock(bjx, byj10, 5, 0, 0, clb);
-        this.placeBlock(bjx, byj10, 6, 0, 0, clb);
-        this.placeBlock(bjx, byj10, 7, 0, 0, clb);
-        this.placeBlock(bjx, byj10, 4, 1, 8, clb);
-        this.placeBlock(bjx, byj10, 4, 2, 9, clb);
-        this.placeBlock(bjx, byj10, 4, 3, 10, clb);
-        this.placeBlock(bjx, byj10, 7, 1, 8, clb);
-        this.placeBlock(bjx, byj10, 7, 2, 9, clb);
-        this.placeBlock(bjx, byj10, 7, 3, 10, clb);
-        this.generateBox(bjx, clb, 4, 1, 9, 4, 1, 9, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 7, 1, 9, 7, 1, 9, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 4, 1, 10, 7, 2, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 5, 4, 5, 6, 4, 5, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.placeBlock(bjx, byj7, 4, 4, 5, clb);
-        this.placeBlock(bjx, byj8, 7, 4, 5, clb);
-        for (int integer9 = 0; integer9 < 4; ++integer9) {
-            this.placeBlock(bjx, byj9, 5, 0 - integer9, 6 + integer9, clb);
-            this.placeBlock(bjx, byj9, 6, 0 - integer9, 6 + integer9, clb);
-            this.generateAirBox(bjx, clb, 5, 0 - integer9, 7 + integer9, 6, 0 - integer9, 9 + integer9);
+        this.generateBox(bqu, ctd, 2, 7, 2, 2, 9, 2, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 9, 7, 2, 9, 9, 2, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 2, 7, 12, 2, 9, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 9, 7, 12, 9, 9, 12, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 4, 9, 4, 4, 9, 4, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 7, 9, 4, 7, 9, 4, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 4, 9, 10, 4, 9, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 7, 9, 10, 7, 9, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 5, 9, 7, 6, 9, 7, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        final BlockState cfj9 = ((StateHolder<O, BlockState>)Blocks.COBBLESTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.EAST);
+        final BlockState cfj10 = ((StateHolder<O, BlockState>)Blocks.COBBLESTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.WEST);
+        final BlockState cfj11 = ((StateHolder<O, BlockState>)Blocks.COBBLESTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.SOUTH);
+        final BlockState cfj12 = ((StateHolder<O, BlockState>)Blocks.COBBLESTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH);
+        this.placeBlock(bqu, cfj12, 5, 9, 6, ctd);
+        this.placeBlock(bqu, cfj12, 6, 9, 6, ctd);
+        this.placeBlock(bqu, cfj11, 5, 9, 8, ctd);
+        this.placeBlock(bqu, cfj11, 6, 9, 8, ctd);
+        this.placeBlock(bqu, cfj12, 4, 0, 0, ctd);
+        this.placeBlock(bqu, cfj12, 5, 0, 0, ctd);
+        this.placeBlock(bqu, cfj12, 6, 0, 0, ctd);
+        this.placeBlock(bqu, cfj12, 7, 0, 0, ctd);
+        this.placeBlock(bqu, cfj12, 4, 1, 8, ctd);
+        this.placeBlock(bqu, cfj12, 4, 2, 9, ctd);
+        this.placeBlock(bqu, cfj12, 4, 3, 10, ctd);
+        this.placeBlock(bqu, cfj12, 7, 1, 8, ctd);
+        this.placeBlock(bqu, cfj12, 7, 2, 9, ctd);
+        this.placeBlock(bqu, cfj12, 7, 3, 10, ctd);
+        this.generateBox(bqu, ctd, 4, 1, 9, 4, 1, 9, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 7, 1, 9, 7, 1, 9, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 4, 1, 10, 7, 2, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 5, 4, 5, 6, 4, 5, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.placeBlock(bqu, cfj9, 4, 4, 5, ctd);
+        this.placeBlock(bqu, cfj10, 7, 4, 5, ctd);
+        for (int integer11 = 0; integer11 < 4; ++integer11) {
+            this.placeBlock(bqu, cfj11, 5, 0 - integer11, 6 + integer11, ctd);
+            this.placeBlock(bqu, cfj11, 6, 0 - integer11, 6 + integer11, ctd);
+            this.generateAirBox(bqu, ctd, 5, 0 - integer11, 7 + integer11, 6, 0 - integer11, 9 + integer11);
         }
-        this.generateAirBox(bjx, clb, 1, -3, 12, 10, -1, 13);
-        this.generateAirBox(bjx, clb, 1, -3, 1, 3, -1, 13);
-        this.generateAirBox(bjx, clb, 1, -3, 1, 9, -1, 5);
-        for (int integer9 = 1; integer9 <= 13; integer9 += 2) {
-            this.generateBox(bjx, clb, 1, -3, integer9, 1, -2, integer9, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateAirBox(bqu, ctd, 1, -3, 12, 10, -1, 13);
+        this.generateAirBox(bqu, ctd, 1, -3, 1, 3, -1, 13);
+        this.generateAirBox(bqu, ctd, 1, -3, 1, 9, -1, 5);
+        for (int integer11 = 1; integer11 <= 13; integer11 += 2) {
+            this.generateBox(bqu, ctd, 1, -3, integer11, 1, -2, integer11, false, random, JunglePyramidPiece.STONE_SELECTOR);
         }
-        for (int integer9 = 2; integer9 <= 12; integer9 += 2) {
-            this.generateBox(bjx, clb, 1, -1, integer9, 3, -1, integer9, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        for (int integer11 = 2; integer11 <= 12; integer11 += 2) {
+            this.generateBox(bqu, ctd, 1, -1, integer11, 3, -1, integer11, false, random, JunglePyramidPiece.STONE_SELECTOR);
         }
-        this.generateBox(bjx, clb, 2, -2, 1, 5, -2, 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 7, -2, 1, 9, -2, 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 6, -3, 1, 6, -3, 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 6, -1, 1, 6, -1, 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.TRIPWIRE_HOOK.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.FACING, Direction.EAST)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, true), 1, -3, 8, clb);
-        this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.TRIPWIRE_HOOK.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.FACING, Direction.WEST)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, true), 4, -3, 8, clb);
-        this.placeBlock(bjx, ((((AbstractStateHolder<O, BlockState>)Blocks.TRIPWIRE.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.EAST, true)).setValue((Property<Comparable>)TripWireBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.ATTACHED, true), 2, -3, 8, clb);
-        this.placeBlock(bjx, ((((AbstractStateHolder<O, BlockState>)Blocks.TRIPWIRE.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.EAST, true)).setValue((Property<Comparable>)TripWireBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.ATTACHED, true), 3, -3, 8, clb);
-        final BlockState byj11 = (((AbstractStateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, RedstoneSide.SIDE);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, RedstoneSide.SIDE), 5, -3, 7, clb);
-        this.placeBlock(bjx, byj11, 5, -3, 6, clb);
-        this.placeBlock(bjx, byj11, 5, -3, 5, clb);
-        this.placeBlock(bjx, byj11, 5, -3, 4, clb);
-        this.placeBlock(bjx, byj11, 5, -3, 3, clb);
-        this.placeBlock(bjx, byj11, 5, -3, 2, clb);
-        this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.WEST, RedstoneSide.SIDE), 5, -3, 1, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.EAST, RedstoneSide.SIDE), 4, -3, 1, clb);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 3, -3, 1, clb);
+        this.generateBox(bqu, ctd, 2, -2, 1, 5, -2, 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 7, -2, 1, 9, -2, 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 6, -3, 1, 6, -3, 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 6, -1, 1, 6, -1, 1, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.TRIPWIRE_HOOK.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.FACING, Direction.EAST)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, true), 1, -3, 8, ctd);
+        this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.TRIPWIRE_HOOK.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.FACING, Direction.WEST)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, true), 4, -3, 8, ctd);
+        this.placeBlock(bqu, ((((StateHolder<O, BlockState>)Blocks.TRIPWIRE.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.EAST, true)).setValue((Property<Comparable>)TripWireBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.ATTACHED, true), 2, -3, 8, ctd);
+        this.placeBlock(bqu, ((((StateHolder<O, BlockState>)Blocks.TRIPWIRE.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.EAST, true)).setValue((Property<Comparable>)TripWireBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.ATTACHED, true), 3, -3, 8, ctd);
+        final BlockState cfj13 = (((StateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, RedstoneSide.SIDE);
+        this.placeBlock(bqu, cfj13, 5, -3, 7, ctd);
+        this.placeBlock(bqu, cfj13, 5, -3, 6, ctd);
+        this.placeBlock(bqu, cfj13, 5, -3, 5, ctd);
+        this.placeBlock(bqu, cfj13, 5, -3, 4, ctd);
+        this.placeBlock(bqu, cfj13, 5, -3, 3, ctd);
+        this.placeBlock(bqu, cfj13, 5, -3, 2, ctd);
+        this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.WEST, RedstoneSide.SIDE), 5, -3, 1, ctd);
+        this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.EAST, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.WEST, RedstoneSide.SIDE), 4, -3, 1, ctd);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 3, -3, 1, ctd);
         if (!this.placedTrap1) {
-            this.placedTrap1 = this.createDispenser(bjx, clb, random, 3, -2, 1, Direction.NORTH, BuiltInLootTables.JUNGLE_TEMPLE_DISPENSER);
+            this.placedTrap1 = this.createDispenser(bqu, ctd, random, 3, -2, 1, Direction.NORTH, BuiltInLootTables.JUNGLE_TEMPLE_DISPENSER);
         }
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.SOUTH, true), 3, -2, 2, clb);
-        this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.TRIPWIRE_HOOK.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, true), 7, -3, 1, clb);
-        this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.TRIPWIRE_HOOK.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.FACING, Direction.SOUTH)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, true), 7, -3, 5, clb);
-        this.placeBlock(bjx, ((((AbstractStateHolder<O, BlockState>)Blocks.TRIPWIRE.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.NORTH, true)).setValue((Property<Comparable>)TripWireBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.ATTACHED, true), 7, -3, 2, clb);
-        this.placeBlock(bjx, ((((AbstractStateHolder<O, BlockState>)Blocks.TRIPWIRE.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.NORTH, true)).setValue((Property<Comparable>)TripWireBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.ATTACHED, true), 7, -3, 3, clb);
-        this.placeBlock(bjx, ((((AbstractStateHolder<O, BlockState>)Blocks.TRIPWIRE.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.NORTH, true)).setValue((Property<Comparable>)TripWireBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.ATTACHED, true), 7, -3, 4, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.EAST, RedstoneSide.SIDE), 8, -3, 6, clb);
-        this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.WEST, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, RedstoneSide.SIDE), 9, -3, 6, clb);
-        this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, RedstoneSide.UP), 9, -3, 5, clb);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 9, -3, 4, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE), 9, -2, 4, clb);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.SOUTH, true), 3, -2, 2, ctd);
+        this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.TRIPWIRE_HOOK.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.FACING, Direction.NORTH)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, true), 7, -3, 1, ctd);
+        this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.TRIPWIRE_HOOK.defaultBlockState()).setValue((Property<Comparable>)TripWireHookBlock.FACING, Direction.SOUTH)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireHookBlock.ATTACHED, true), 7, -3, 5, ctd);
+        this.placeBlock(bqu, ((((StateHolder<O, BlockState>)Blocks.TRIPWIRE.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.NORTH, true)).setValue((Property<Comparable>)TripWireBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.ATTACHED, true), 7, -3, 2, ctd);
+        this.placeBlock(bqu, ((((StateHolder<O, BlockState>)Blocks.TRIPWIRE.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.NORTH, true)).setValue((Property<Comparable>)TripWireBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.ATTACHED, true), 7, -3, 3, ctd);
+        this.placeBlock(bqu, ((((StateHolder<O, BlockState>)Blocks.TRIPWIRE.defaultBlockState()).setValue((Property<Comparable>)TripWireBlock.NORTH, true)).setValue((Property<Comparable>)TripWireBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)TripWireBlock.ATTACHED, true), 7, -3, 4, ctd);
+        this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.EAST, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.WEST, RedstoneSide.SIDE), 8, -3, 6, ctd);
+        this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.WEST, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, RedstoneSide.SIDE), 9, -3, 6, ctd);
+        this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, RedstoneSide.UP), 9, -3, 5, ctd);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 9, -3, 4, ctd);
+        this.placeBlock(bqu, cfj13, 9, -2, 4, ctd);
         if (!this.placedTrap2) {
-            this.placedTrap2 = this.createDispenser(bjx, clb, random, 9, -2, 3, Direction.WEST, BuiltInLootTables.JUNGLE_TEMPLE_DISPENSER);
+            this.placedTrap2 = this.createDispenser(bqu, ctd, random, 9, -2, 3, Direction.WEST, BuiltInLootTables.JUNGLE_TEMPLE_DISPENSER);
         }
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.EAST, true), 8, -1, 3, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.EAST, true), 8, -2, 3, clb);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.EAST, true), 8, -1, 3, ctd);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)VineBlock.EAST, true), 8, -2, 3, ctd);
         if (!this.placedMainChest) {
-            this.placedMainChest = this.createChest(bjx, clb, random, 8, -3, 3, BuiltInLootTables.JUNGLE_TEMPLE);
+            this.placedMainChest = this.createChest(bqu, ctd, random, 8, -3, 3, BuiltInLootTables.JUNGLE_TEMPLE);
         }
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 9, -3, 2, clb);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 8, -3, 1, clb);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 4, -3, 5, clb);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 5, -2, 5, clb);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 5, -1, 5, clb);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 6, -3, 5, clb);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 7, -2, 5, clb);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 7, -1, 5, clb);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 8, -3, 5, clb);
-        this.generateBox(bjx, clb, 9, -1, 1, 9, -1, 5, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateAirBox(bjx, clb, 8, -3, 8, 10, -1, 10);
-        this.placeBlock(bjx, Blocks.CHISELED_STONE_BRICKS.defaultBlockState(), 8, -2, 11, clb);
-        this.placeBlock(bjx, Blocks.CHISELED_STONE_BRICKS.defaultBlockState(), 9, -2, 11, clb);
-        this.placeBlock(bjx, Blocks.CHISELED_STONE_BRICKS.defaultBlockState(), 10, -2, 11, clb);
-        final BlockState byj12 = (((AbstractStateHolder<O, BlockState>)Blocks.LEVER.defaultBlockState()).setValue((Property<Comparable>)LeverBlock.FACING, Direction.NORTH)).<AttachFace, AttachFace>setValue(LeverBlock.FACE, AttachFace.WALL);
-        this.placeBlock(bjx, byj12, 8, -2, 12, clb);
-        this.placeBlock(bjx, byj12, 9, -2, 12, clb);
-        this.placeBlock(bjx, byj12, 10, -2, 12, clb);
-        this.generateBox(bjx, clb, 8, -3, 8, 8, -3, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.generateBox(bjx, clb, 10, -3, 8, 10, -3, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
-        this.placeBlock(bjx, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 10, -2, 9, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE), 8, -2, 9, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.SOUTH, RedstoneSide.SIDE), 8, -2, 10, clb);
-        this.placeBlock(bjx, Blocks.REDSTONE_WIRE.defaultBlockState(), 10, -1, 9, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.STICKY_PISTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, Direction.UP), 9, -2, 8, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.STICKY_PISTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, Direction.WEST), 10, -2, 8, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.STICKY_PISTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, Direction.WEST), 10, -1, 8, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.REPEATER.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)RepeaterBlock.FACING, Direction.NORTH), 10, -2, 10, clb);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 9, -3, 2, ctd);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 8, -3, 1, ctd);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 4, -3, 5, ctd);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 5, -2, 5, ctd);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 5, -1, 5, ctd);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 6, -3, 5, ctd);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 7, -2, 5, ctd);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 7, -1, 5, ctd);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 8, -3, 5, ctd);
+        this.generateBox(bqu, ctd, 9, -1, 1, 9, -1, 5, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateAirBox(bqu, ctd, 8, -3, 8, 10, -1, 10);
+        this.placeBlock(bqu, Blocks.CHISELED_STONE_BRICKS.defaultBlockState(), 8, -2, 11, ctd);
+        this.placeBlock(bqu, Blocks.CHISELED_STONE_BRICKS.defaultBlockState(), 9, -2, 11, ctd);
+        this.placeBlock(bqu, Blocks.CHISELED_STONE_BRICKS.defaultBlockState(), 10, -2, 11, ctd);
+        final BlockState cfj14 = (((StateHolder<O, BlockState>)Blocks.LEVER.defaultBlockState()).setValue((Property<Comparable>)LeverBlock.FACING, Direction.NORTH)).<AttachFace, AttachFace>setValue(LeverBlock.FACE, AttachFace.WALL);
+        this.placeBlock(bqu, cfj14, 8, -2, 12, ctd);
+        this.placeBlock(bqu, cfj14, 9, -2, 12, ctd);
+        this.placeBlock(bqu, cfj14, 10, -2, 12, ctd);
+        this.generateBox(bqu, ctd, 8, -3, 8, 8, -3, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.generateBox(bqu, ctd, 10, -3, 8, 10, -3, 10, false, random, JunglePyramidPiece.STONE_SELECTOR);
+        this.placeBlock(bqu, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 10, -2, 9, ctd);
+        this.placeBlock(bqu, cfj13, 8, -2, 9, ctd);
+        this.placeBlock(bqu, cfj13, 8, -2, 10, ctd);
+        this.placeBlock(bqu, (((((StateHolder<O, BlockState>)Blocks.REDSTONE_WIRE.defaultBlockState()).setValue(RedStoneWireBlock.NORTH, RedstoneSide.SIDE)).setValue(RedStoneWireBlock.SOUTH, RedstoneSide.SIDE)).setValue(RedStoneWireBlock.EAST, RedstoneSide.SIDE)).<RedstoneSide, RedstoneSide>setValue(RedStoneWireBlock.WEST, RedstoneSide.SIDE), 10, -1, 9, ctd);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.STICKY_PISTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, Direction.UP), 9, -2, 8, ctd);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.STICKY_PISTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, Direction.WEST), 10, -2, 8, ctd);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.STICKY_PISTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)PistonBaseBlock.FACING, Direction.WEST), 10, -1, 8, ctd);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.REPEATER.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)RepeaterBlock.FACING, Direction.NORTH), 10, -2, 10, ctd);
         if (!this.placedHiddenChest) {
-            this.placedHiddenChest = this.createChest(bjx, clb, random, 9, -3, 10, BuiltInLootTables.JUNGLE_TEMPLE);
+            this.placedHiddenChest = this.createChest(bqu, ctd, random, 9, -3, 10, BuiltInLootTables.JUNGLE_TEMPLE);
         }
         return true;
     }
diff --git a/src/net/minecraft/world/level/levelgen/structure/LegacyStructureDataHandler.java b/src/net/minecraft/world/level/levelgen/structure/LegacyStructureDataHandler.java
index fe9e36d..9715603 100644
--- a/src/net/minecraft/world/level/levelgen/structure/LegacyStructureDataHandler.java
+++ b/src/net/minecraft/world/level/levelgen/structure/LegacyStructureDataHandler.java
@@ -3,7 +3,8 @@ package net.minecraft.world.level.levelgen.structure;
 import net.minecraft.Util;
 import java.util.HashMap;
 import com.google.common.collect.ImmutableList;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.nbt.ListTag;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import java.io.IOException;
@@ -11,7 +12,6 @@ import it.unimi.dsi.fastutil.longs.LongList;
 import net.minecraft.nbt.Tag;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import java.util.Locale;
-import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.ChunkPos;
 import java.util.Iterator;
@@ -32,12 +32,12 @@ public class LegacyStructureDataHandler {
     private final List<String> legacyKeys;
     private final List<String> currentKeys;
     
-    public LegacyStructureDataHandler(@Nullable final DimensionDataStorage crl, final List<String> list2, final List<String> list3) {
+    public LegacyStructureDataHandler(@Nullable final DimensionDataStorage daa, final List<String> list2, final List<String> list3) {
         this.dataMap = Maps.newHashMap();
         this.indexMap = Maps.newHashMap();
         this.legacyKeys = list2;
         this.currentKeys = list3;
-        this.populateCaches(crl);
+        this.populateCaches(daa);
         boolean boolean5 = false;
         for (final String string7 : this.currentKeys) {
             boolean5 |= (this.dataMap.get(string7) != null);
@@ -47,44 +47,44 @@ public class LegacyStructureDataHandler {
     
     public void removeIndex(final long long1) {
         for (final String string5 : this.legacyKeys) {
-            final StructureFeatureIndexSavedData clt6 = this.indexMap.get(string5);
-            if (clt6 != null && clt6.hasUnhandledIndex(long1)) {
-                clt6.removeIndex(long1);
-                clt6.setDirty();
+            final StructureFeatureIndexSavedData ctx6 = this.indexMap.get(string5);
+            if (ctx6 != null && ctx6.hasUnhandledIndex(long1)) {
+                ctx6.removeIndex(long1);
+                ctx6.setDirty();
             }
         }
     }
     
-    public CompoundTag updateFromLegacy(CompoundTag jt) {
-        final CompoundTag jt2 = jt.getCompound("Level");
-        final ChunkPos bjh4 = new ChunkPos(jt2.getInt("xPos"), jt2.getInt("zPos"));
-        if (this.isUnhandledStructureStart(bjh4.x, bjh4.z)) {
-            jt = this.updateStructureStart(jt, bjh4);
+    public CompoundTag updateFromLegacy(CompoundTag le) {
+        final CompoundTag le2 = le.getCompound("Level");
+        final ChunkPos bph4 = new ChunkPos(le2.getInt("xPos"), le2.getInt("zPos"));
+        if (this.isUnhandledStructureStart(bph4.x, bph4.z)) {
+            le = this.updateStructureStart(le, bph4);
         }
-        final CompoundTag jt3 = jt2.getCompound("Structures");
-        final CompoundTag jt4 = jt3.getCompound("References");
+        final CompoundTag le3 = le2.getCompound("Structures");
+        final CompoundTag le4 = le3.getCompound("References");
         for (final String string8 : this.currentKeys) {
-            final StructureFeature<?> cfl9 = Feature.STRUCTURES_REGISTRY.get(string8.toLowerCase(Locale.ROOT));
-            if (!jt4.contains(string8, 12)) {
-                if (cfl9 == null) {
+            final StructureFeature<?> cml9 = StructureFeature.STRUCTURES_REGISTRY.get(string8.toLowerCase(Locale.ROOT));
+            if (!le4.contains(string8, 12)) {
+                if (cml9 == null) {
                     continue;
                 }
-                final int integer10 = cfl9.getLookupRange();
+                final int integer10 = 8;
                 final LongList longList11 = (LongList)new LongArrayList();
-                for (int integer11 = bjh4.x - integer10; integer11 <= bjh4.x + integer10; ++integer11) {
-                    for (int integer12 = bjh4.z - integer10; integer12 <= bjh4.z + integer10; ++integer12) {
+                for (int integer11 = bph4.x - 8; integer11 <= bph4.x + 8; ++integer11) {
+                    for (int integer12 = bph4.z - 8; integer12 <= bph4.z + 8; ++integer12) {
                         if (this.hasLegacyStart(integer11, integer12, string8)) {
                             longList11.add(ChunkPos.asLong(integer11, integer12));
                         }
                     }
                 }
-                jt4.putLongArray(string8, (List<Long>)longList11);
+                le4.putLongArray(string8, (List<Long>)longList11);
             }
         }
-        jt3.put("References", jt4);
-        jt2.put("Structures", jt3);
-        jt.put("Level", jt2);
-        return jt;
+        le3.put("References", le4);
+        le2.put("Structures", le3);
+        le.put("Level", le2);
+        return le;
     }
     
     private boolean hasLegacyStart(final int integer1, final int integer2, final String string) {
@@ -103,88 +103,88 @@ public class LegacyStructureDataHandler {
         return false;
     }
     
-    private CompoundTag updateStructureStart(final CompoundTag jt, final ChunkPos bjh) {
-        final CompoundTag jt2 = jt.getCompound("Level");
-        final CompoundTag jt3 = jt2.getCompound("Structures");
-        final CompoundTag jt4 = jt3.getCompound("Starts");
+    private CompoundTag updateStructureStart(final CompoundTag le, final ChunkPos bph) {
+        final CompoundTag le2 = le.getCompound("Level");
+        final CompoundTag le3 = le2.getCompound("Structures");
+        final CompoundTag le4 = le3.getCompound("Starts");
         for (final String string8 : this.currentKeys) {
             final Long2ObjectMap<CompoundTag> long2ObjectMap9 = this.dataMap.get(string8);
             if (long2ObjectMap9 == null) {
                 continue;
             }
-            final long long10 = bjh.toLong();
+            final long long10 = bph.toLong();
             if (!this.indexMap.get(LegacyStructureDataHandler.CURRENT_TO_LEGACY_MAP.get(string8)).hasUnhandledIndex(long10)) {
                 continue;
             }
-            final CompoundTag jt5 = (CompoundTag)long2ObjectMap9.get(long10);
-            if (jt5 == null) {
+            final CompoundTag le5 = (CompoundTag)long2ObjectMap9.get(long10);
+            if (le5 == null) {
                 continue;
             }
-            jt4.put(string8, jt5);
+            le4.put(string8, le5);
         }
-        jt3.put("Starts", jt4);
-        jt2.put("Structures", jt3);
-        jt.put("Level", jt2);
-        return jt;
+        le3.put("Starts", le4);
+        le2.put("Structures", le3);
+        le.put("Level", le2);
+        return le;
     }
     
-    private void populateCaches(@Nullable final DimensionDataStorage crl) {
-        if (crl == null) {
+    private void populateCaches(@Nullable final DimensionDataStorage daa) {
+        if (daa == null) {
             return;
         }
         for (final String string4 : this.legacyKeys) {
-            CompoundTag jt5 = new CompoundTag();
+            CompoundTag le5 = new CompoundTag();
             try {
-                jt5 = crl.readTagFromDisk(string4, 1493).getCompound("data").getCompound("Features");
-                if (jt5.isEmpty()) {
+                le5 = daa.readTagFromDisk(string4, 1493).getCompound("data").getCompound("Features");
+                if (le5.isEmpty()) {
                     continue;
                 }
             }
             catch (IOException ex) {}
-            for (final String string5 : jt5.getAllKeys()) {
-                final CompoundTag jt6 = jt5.getCompound(string5);
-                final long long9 = ChunkPos.asLong(jt6.getInt("ChunkX"), jt6.getInt("ChunkZ"));
-                final ListTag jz11 = jt6.getList("Children", 10);
-                if (!jz11.isEmpty()) {
-                    final String string6 = jz11.getCompound(0).getString("id");
+            for (final String string5 : le5.getAllKeys()) {
+                final CompoundTag le6 = le5.getCompound(string5);
+                final long long9 = ChunkPos.asLong(le6.getInt("ChunkX"), le6.getInt("ChunkZ"));
+                final ListTag lk11 = le6.getList("Children", 10);
+                if (!lk11.isEmpty()) {
+                    final String string6 = lk11.getCompound(0).getString("id");
                     final String string7 = LegacyStructureDataHandler.LEGACY_TO_CURRENT_MAP.get(string6);
                     if (string7 != null) {
-                        jt6.putString("id", string7);
+                        le6.putString("id", string7);
                     }
                 }
-                final String string6 = jt6.getString("id");
-                this.dataMap.computeIfAbsent(string6, string -> new Long2ObjectOpenHashMap()).put(long9, jt6);
+                final String string6 = le6.getString("id");
+                this.dataMap.computeIfAbsent(string6, string -> new Long2ObjectOpenHashMap()).put(long9, le6);
             }
             final String string8 = string4 + "_index";
-            final StructureFeatureIndexSavedData clt7 = crl.<StructureFeatureIndexSavedData>computeIfAbsent(() -> new StructureFeatureIndexSavedData(string8), string8);
-            if (clt7.getAll().isEmpty()) {
-                final StructureFeatureIndexSavedData clt8 = new StructureFeatureIndexSavedData(string8);
-                this.indexMap.put(string4, clt8);
-                for (final String string9 : jt5.getAllKeys()) {
-                    final CompoundTag jt7 = jt5.getCompound(string9);
-                    clt8.addIndex(ChunkPos.asLong(jt7.getInt("ChunkX"), jt7.getInt("ChunkZ")));
+            final StructureFeatureIndexSavedData ctx7 = daa.<StructureFeatureIndexSavedData>computeIfAbsent(() -> new StructureFeatureIndexSavedData(string8), string8);
+            if (ctx7.getAll().isEmpty()) {
+                final StructureFeatureIndexSavedData ctx8 = new StructureFeatureIndexSavedData(string8);
+                this.indexMap.put(string4, ctx8);
+                for (final String string9 : le5.getAllKeys()) {
+                    final CompoundTag le7 = le5.getCompound(string9);
+                    ctx8.addIndex(ChunkPos.asLong(le7.getInt("ChunkX"), le7.getInt("ChunkZ")));
                 }
-                clt8.setDirty();
+                ctx8.setDirty();
             }
             else {
-                this.indexMap.put(string4, clt7);
+                this.indexMap.put(string4, ctx7);
             }
         }
     }
     
-    public static LegacyStructureDataHandler getLegacyStructureHandler(final DimensionType cbi, @Nullable final DimensionDataStorage crl) {
-        if (cbi == DimensionType.OVERWORLD) {
-            return new LegacyStructureDataHandler(crl, ImmutableList.<String>of("Monument", "Stronghold", "Village", "Mineshaft", "Temple", "Mansion"), ImmutableList.<String>of("Village", "Mineshaft", "Mansion", "Igloo", "Desert_Pyramid", "Jungle_Pyramid", "Swamp_Hut", "Stronghold", "Monument"));
+    public static LegacyStructureDataHandler getLegacyStructureHandler(final ResourceKey<Level> ug, @Nullable final DimensionDataStorage daa) {
+        if (ug == Level.OVERWORLD) {
+            return new LegacyStructureDataHandler(daa, ImmutableList.<String>of("Monument", "Stronghold", "Village", "Mineshaft", "Temple", "Mansion"), ImmutableList.<String>of("Village", "Mineshaft", "Mansion", "Igloo", "Desert_Pyramid", "Jungle_Pyramid", "Swamp_Hut", "Stronghold", "Monument"));
         }
-        if (cbi == DimensionType.NETHER) {
+        if (ug == Level.NETHER) {
             final List<String> list3 = ImmutableList.<String>of("Fortress");
-            return new LegacyStructureDataHandler(crl, list3, list3);
+            return new LegacyStructureDataHandler(daa, list3, list3);
         }
-        if (cbi == DimensionType.THE_END) {
+        if (ug == Level.END) {
             final List<String> list3 = ImmutableList.<String>of("EndCity");
-            return new LegacyStructureDataHandler(crl, list3, list3);
+            return new LegacyStructureDataHandler(daa, list3, list3);
         }
-        throw new RuntimeException(String.format("Unknown dimension type : %s", cbi));
+        throw new RuntimeException(String.format("Unknown dimension type : %s", ug));
     }
     
     static {
diff --git a/src/net/minecraft/world/level/levelgen/structure/MineShaftPieces.java b/src/net/minecraft/world/level/levelgen/structure/MineShaftPieces.java
index ca1431c..1efd939 100644
--- a/src/net/minecraft/world/level/levelgen/structure/MineShaftPieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/MineShaftPieces.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.structure;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.nbt.IntArrayTag;
 import java.util.AbstractList;
 import net.minecraft.world.level.block.WallTorchBlock;
@@ -16,13 +16,15 @@ import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.state.properties.RailShape;
 import net.minecraft.world.level.block.RailBlock;
 import net.minecraft.core.Vec3i;
-import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.nbt.Tag;
 import java.util.Iterator;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import com.google.common.collect.Lists;
@@ -38,41 +40,41 @@ import java.util.Random;
 import java.util.List;
 
 public class MineShaftPieces {
-    private static MineShaftPiece createRandomShaftPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, @Nullable final Direction fp, final int integer7, final MineshaftFeature.Type b) {
+    private static MineShaftPiece createRandomShaftPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, @Nullable final Direction fz, final int integer7, final MineshaftFeature.Type b) {
         final int integer8 = random.nextInt(100);
         if (integer8 >= 80) {
-            final BoundingBox clb10 = MineShaftCrossing.findCrossing(list, random, integer3, integer4, integer5, fp);
-            if (clb10 != null) {
-                return new MineShaftCrossing(integer7, clb10, fp, b);
+            final BoundingBox ctd10 = MineShaftCrossing.findCrossing(list, random, integer3, integer4, integer5, fz);
+            if (ctd10 != null) {
+                return new MineShaftCrossing(integer7, ctd10, fz, b);
             }
         }
         else if (integer8 >= 70) {
-            final BoundingBox clb10 = MineShaftStairs.findStairs(list, random, integer3, integer4, integer5, fp);
-            if (clb10 != null) {
-                return new MineShaftStairs(integer7, clb10, fp, b);
+            final BoundingBox ctd10 = MineShaftStairs.findStairs(list, random, integer3, integer4, integer5, fz);
+            if (ctd10 != null) {
+                return new MineShaftStairs(integer7, ctd10, fz, b);
             }
         }
         else {
-            final BoundingBox clb10 = MineShaftCorridor.findCorridorSize(list, random, integer3, integer4, integer5, fp);
-            if (clb10 != null) {
-                return new MineShaftCorridor(integer7, random, clb10, fp, b);
+            final BoundingBox ctd10 = MineShaftCorridor.findCorridorSize(list, random, integer3, integer4, integer5, fz);
+            if (ctd10 != null) {
+                return new MineShaftCorridor(integer7, random, ctd10, fz, b);
             }
         }
         return null;
     }
     
-    private static MineShaftPiece generateAndAddPiece(final StructurePiece clu, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, final Direction fp, final int integer8) {
+    private static MineShaftPiece generateAndAddPiece(final StructurePiece cty, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, final Direction fz, final int integer8) {
         if (integer8 > 8) {
             return null;
         }
-        if (Math.abs(integer4 - clu.getBoundingBox().x0) > 80 || Math.abs(integer6 - clu.getBoundingBox().z0) > 80) {
+        if (Math.abs(integer4 - cty.getBoundingBox().x0) > 80 || Math.abs(integer6 - cty.getBoundingBox().z0) > 80) {
             return null;
         }
-        final MineshaftFeature.Type b9 = ((MineShaftPiece)clu).type;
-        final MineShaftPiece c10 = createRandomShaftPiece(list, random, integer4, integer5, integer6, fp, integer8 + 1, b9);
+        final MineshaftFeature.Type b9 = ((MineShaftPiece)cty).type;
+        final MineShaftPiece c10 = createRandomShaftPiece(list, random, integer4, integer5, integer6, fz, integer8 + 1, b9);
         if (c10 != null) {
             list.add(c10);
-            c10.addChildren(clu, list, random);
+            c10.addChildren(cty, list, random);
         }
         return c10;
     }
@@ -80,19 +82,19 @@ public class MineShaftPieces {
     abstract static class MineShaftPiece extends StructurePiece {
         protected MineshaftFeature.Type type;
         
-        public MineShaftPiece(final StructurePieceType cfm, final int integer, final MineshaftFeature.Type b) {
-            super(cfm, integer);
+        public MineShaftPiece(final StructurePieceType cmm, final int integer, final MineshaftFeature.Type b) {
+            super(cmm, integer);
             this.type = b;
         }
         
-        public MineShaftPiece(final StructurePieceType cfm, final CompoundTag jt) {
-            super(cfm, jt);
-            this.type = MineshaftFeature.Type.byId(jt.getInt("MST"));
+        public MineShaftPiece(final StructurePieceType cmm, final CompoundTag le) {
+            super(cmm, le);
+            this.type = MineshaftFeature.Type.byId(le.getInt("MST"));
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            jt.putInt("MST", this.type.ordinal());
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            le.putInt("MST", this.type.ordinal());
         }
         
         protected BlockState getPlanksBlock() {
@@ -117,9 +119,9 @@ public class MineShaftPieces {
             }
         }
         
-        protected boolean isSupportingBox(final BlockGetter bjg, final BoundingBox clb, final int integer3, final int integer4, final int integer5, final int integer6) {
+        protected boolean isSupportingBox(final BlockGetter bpg, final BoundingBox ctd, final int integer3, final int integer4, final int integer5, final int integer6) {
             for (int integer7 = integer3; integer7 <= integer4; ++integer7) {
-                if (this.getBlock(bjg, integer7, integer5 + 1, integer6, clb).isAir()) {
+                if (this.getBlock(bpg, integer7, integer5 + 1, integer6, ctd).isAir()) {
                     return false;
                 }
             }
@@ -137,17 +139,17 @@ public class MineShaftPieces {
             this.boundingBox = new BoundingBox(integer3, 50, integer4, integer3 + 7 + random.nextInt(6), 54 + random.nextInt(6), integer4 + 7 + random.nextInt(6));
         }
         
-        public MineShaftRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.MINE_SHAFT_ROOM, jt);
+        public MineShaftRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.MINE_SHAFT_ROOM, le);
             this.childEntranceBoxes = Lists.newLinkedList();
-            final ListTag jz4 = jt.getList("Entrances", 11);
-            for (int integer5 = 0; integer5 < jz4.size(); ++integer5) {
-                this.childEntranceBoxes.add(new BoundingBox(jz4.getIntArray(integer5)));
+            final ListTag lk4 = le.getList("Entrances", 11);
+            for (int integer5 = 0; integer5 < lk4.size(); ++integer5) {
+                this.childEntranceBoxes.add(new BoundingBox(lk4.getIntArray(integer5)));
             }
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
             final int integer5 = this.getGenDepth();
             int integer6 = this.boundingBox.getYSpan() - 3 - 1;
             if (integer6 <= 0) {
@@ -158,10 +160,10 @@ public class MineShaftPieces {
                 if (integer7 + 3 > this.boundingBox.getXSpan()) {
                     break;
                 }
-                final MineShaftPiece c8 = generateAndAddPiece(clu, list, random, this.boundingBox.x0 + integer7, this.boundingBox.y0 + random.nextInt(integer6) + 1, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
+                final MineShaftPiece c8 = generateAndAddPiece(cty, list, random, this.boundingBox.x0 + integer7, this.boundingBox.y0 + random.nextInt(integer6) + 1, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
                 if (c8 != null) {
-                    final BoundingBox clb9 = c8.getBoundingBox();
-                    this.childEntranceBoxes.add(new BoundingBox(clb9.x0, clb9.y0, this.boundingBox.z0, clb9.x1, clb9.y1, this.boundingBox.z0 + 1));
+                    final BoundingBox ctd9 = c8.getBoundingBox();
+                    this.childEntranceBoxes.add(new BoundingBox(ctd9.x0, ctd9.y0, this.boundingBox.z0, ctd9.x1, ctd9.y1, this.boundingBox.z0 + 1));
                 }
             }
             for (int integer7 = 0; integer7 < this.boundingBox.getXSpan(); integer7 += 4) {
@@ -169,10 +171,10 @@ public class MineShaftPieces {
                 if (integer7 + 3 > this.boundingBox.getXSpan()) {
                     break;
                 }
-                final MineShaftPiece c8 = generateAndAddPiece(clu, list, random, this.boundingBox.x0 + integer7, this.boundingBox.y0 + random.nextInt(integer6) + 1, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
+                final MineShaftPiece c8 = generateAndAddPiece(cty, list, random, this.boundingBox.x0 + integer7, this.boundingBox.y0 + random.nextInt(integer6) + 1, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
                 if (c8 != null) {
-                    final BoundingBox clb9 = c8.getBoundingBox();
-                    this.childEntranceBoxes.add(new BoundingBox(clb9.x0, clb9.y0, this.boundingBox.z1 - 1, clb9.x1, clb9.y1, this.boundingBox.z1));
+                    final BoundingBox ctd9 = c8.getBoundingBox();
+                    this.childEntranceBoxes.add(new BoundingBox(ctd9.x0, ctd9.y0, this.boundingBox.z1 - 1, ctd9.x1, ctd9.y1, this.boundingBox.z1));
                 }
             }
             for (int integer7 = 0; integer7 < this.boundingBox.getZSpan(); integer7 += 4) {
@@ -180,10 +182,10 @@ public class MineShaftPieces {
                 if (integer7 + 3 > this.boundingBox.getZSpan()) {
                     break;
                 }
-                final MineShaftPiece c8 = generateAndAddPiece(clu, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 + random.nextInt(integer6) + 1, this.boundingBox.z0 + integer7, Direction.WEST, integer5);
+                final MineShaftPiece c8 = generateAndAddPiece(cty, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 + random.nextInt(integer6) + 1, this.boundingBox.z0 + integer7, Direction.WEST, integer5);
                 if (c8 != null) {
-                    final BoundingBox clb9 = c8.getBoundingBox();
-                    this.childEntranceBoxes.add(new BoundingBox(this.boundingBox.x0, clb9.y0, clb9.z0, this.boundingBox.x0 + 1, clb9.y1, clb9.z1));
+                    final BoundingBox ctd9 = c8.getBoundingBox();
+                    this.childEntranceBoxes.add(new BoundingBox(this.boundingBox.x0, ctd9.y0, ctd9.z0, this.boundingBox.x0 + 1, ctd9.y1, ctd9.z1));
                 }
             }
             for (int integer7 = 0; integer7 < this.boundingBox.getZSpan(); integer7 += 4) {
@@ -191,44 +193,44 @@ public class MineShaftPieces {
                 if (integer7 + 3 > this.boundingBox.getZSpan()) {
                     break;
                 }
-                final StructurePiece clu2 = generateAndAddPiece(clu, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 + random.nextInt(integer6) + 1, this.boundingBox.z0 + integer7, Direction.EAST, integer5);
-                if (clu2 != null) {
-                    final BoundingBox clb9 = clu2.getBoundingBox();
-                    this.childEntranceBoxes.add(new BoundingBox(this.boundingBox.x1 - 1, clb9.y0, clb9.z0, this.boundingBox.x1, clb9.y1, clb9.z1));
+                final StructurePiece cty2 = generateAndAddPiece(cty, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 + random.nextInt(integer6) + 1, this.boundingBox.z0 + integer7, Direction.EAST, integer5);
+                if (cty2 != null) {
+                    final BoundingBox ctd9 = cty2.getBoundingBox();
+                    this.childEntranceBoxes.add(new BoundingBox(this.boundingBox.x1 - 1, ctd9.y0, ctd9.z0, this.boundingBox.x1, ctd9.y1, ctd9.z1));
                 }
             }
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            if (this.edgesLiquid(bjx, clb)) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            if (this.edgesLiquid(bqu, ctd)) {
                 return false;
             }
-            this.generateBox(bjx, clb, this.boundingBox.x0, this.boundingBox.y0, this.boundingBox.z0, this.boundingBox.x1, this.boundingBox.y0, this.boundingBox.z1, Blocks.DIRT.defaultBlockState(), MineShaftRoom.CAVE_AIR, true);
-            this.generateBox(bjx, clb, this.boundingBox.x0, this.boundingBox.y0 + 1, this.boundingBox.z0, this.boundingBox.x1, Math.min(this.boundingBox.y0 + 3, this.boundingBox.y1), this.boundingBox.z1, MineShaftRoom.CAVE_AIR, MineShaftRoom.CAVE_AIR, false);
-            for (final BoundingBox clb2 : this.childEntranceBoxes) {
-                this.generateBox(bjx, clb, clb2.x0, clb2.y1 - 2, clb2.z0, clb2.x1, clb2.y1, clb2.z1, MineShaftRoom.CAVE_AIR, MineShaftRoom.CAVE_AIR, false);
+            this.generateBox(bqu, ctd, this.boundingBox.x0, this.boundingBox.y0, this.boundingBox.z0, this.boundingBox.x1, this.boundingBox.y0, this.boundingBox.z1, Blocks.DIRT.defaultBlockState(), MineShaftRoom.CAVE_AIR, true);
+            this.generateBox(bqu, ctd, this.boundingBox.x0, this.boundingBox.y0 + 1, this.boundingBox.z0, this.boundingBox.x1, Math.min(this.boundingBox.y0 + 3, this.boundingBox.y1), this.boundingBox.z1, MineShaftRoom.CAVE_AIR, MineShaftRoom.CAVE_AIR, false);
+            for (final BoundingBox ctd2 : this.childEntranceBoxes) {
+                this.generateBox(bqu, ctd, ctd2.x0, ctd2.y1 - 2, ctd2.z0, ctd2.x1, ctd2.y1, ctd2.z1, MineShaftRoom.CAVE_AIR, MineShaftRoom.CAVE_AIR, false);
             }
-            this.generateUpperHalfSphere(bjx, clb, this.boundingBox.x0, this.boundingBox.y0 + 4, this.boundingBox.z0, this.boundingBox.x1, this.boundingBox.y1, this.boundingBox.z1, MineShaftRoom.CAVE_AIR, false);
+            this.generateUpperHalfSphere(bqu, ctd, this.boundingBox.x0, this.boundingBox.y0 + 4, this.boundingBox.z0, this.boundingBox.x1, this.boundingBox.y1, this.boundingBox.z1, MineShaftRoom.CAVE_AIR, false);
             return true;
         }
         
         @Override
         public void move(final int integer1, final int integer2, final int integer3) {
             super.move(integer1, integer2, integer3);
-            for (final BoundingBox clb6 : this.childEntranceBoxes) {
-                clb6.move(integer1, integer2, integer3);
+            for (final BoundingBox ctd6 : this.childEntranceBoxes) {
+                ctd6.move(integer1, integer2, integer3);
             }
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            final ListTag jz3 = new ListTag();
-            for (final BoundingBox clb5 : this.childEntranceBoxes) {
-                ((AbstractList<IntArrayTag>)jz3).add(clb5.createTag());
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            final ListTag lk3 = new ListTag();
+            for (final BoundingBox ctd5 : this.childEntranceBoxes) {
+                ((AbstractList<IntArrayTag>)lk3).add(ctd5.createTag());
             }
-            jt.put("Entrances", jz3);
+            le.put("Entrances", lk3);
         }
     }
     
@@ -238,140 +240,140 @@ public class MineShaftPieces {
         private boolean hasPlacedSpider;
         private final int numSections;
         
-        public MineShaftCorridor(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.MINE_SHAFT_CORRIDOR, jt);
-            this.hasRails = jt.getBoolean("hr");
-            this.spiderCorridor = jt.getBoolean("sc");
-            this.hasPlacedSpider = jt.getBoolean("hps");
-            this.numSections = jt.getInt("Num");
+        public MineShaftCorridor(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.MINE_SHAFT_CORRIDOR, le);
+            this.hasRails = le.getBoolean("hr");
+            this.spiderCorridor = le.getBoolean("sc");
+            this.hasPlacedSpider = le.getBoolean("hps");
+            this.numSections = le.getInt("Num");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("hr", this.hasRails);
-            jt.putBoolean("sc", this.spiderCorridor);
-            jt.putBoolean("hps", this.hasPlacedSpider);
-            jt.putInt("Num", this.numSections);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("hr", this.hasRails);
+            le.putBoolean("sc", this.spiderCorridor);
+            le.putBoolean("hps", this.hasPlacedSpider);
+            le.putInt("Num", this.numSections);
         }
         
-        public MineShaftCorridor(final int integer, final Random random, final BoundingBox clb, final Direction fp, final MineshaftFeature.Type b) {
+        public MineShaftCorridor(final int integer, final Random random, final BoundingBox ctd, final Direction fz, final MineshaftFeature.Type b) {
             super(StructurePieceType.MINE_SHAFT_CORRIDOR, integer, b);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
             this.hasRails = (random.nextInt(3) == 0);
             this.spiderCorridor = (!this.hasRails && random.nextInt(23) == 0);
             if (this.getOrientation().getAxis() == Direction.Axis.Z) {
-                this.numSections = clb.getZSpan() / 5;
+                this.numSections = ctd.getZSpan() / 5;
             }
             else {
-                this.numSections = clb.getXSpan() / 5;
+                this.numSections = ctd.getXSpan() / 5;
             }
         }
         
-        public static BoundingBox findCorridorSize(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp) {
-            final BoundingBox clb7 = new BoundingBox(integer3, integer4, integer5, integer3, integer4 + 3 - 1, integer5);
+        public static BoundingBox findCorridorSize(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz) {
+            final BoundingBox ctd7 = new BoundingBox(integer3, integer4, integer5, integer3, integer4 + 3 - 1, integer5);
             int integer6;
             for (integer6 = random.nextInt(3) + 2; integer6 > 0; --integer6) {
                 final int integer7 = integer6 * 5;
-                switch (fp) {
+                switch (fz) {
                     default: {
-                        clb7.x1 = integer3 + 3 - 1;
-                        clb7.z0 = integer5 - (integer7 - 1);
+                        ctd7.x1 = integer3 + 3 - 1;
+                        ctd7.z0 = integer5 - (integer7 - 1);
                         break;
                     }
                     case SOUTH: {
-                        clb7.x1 = integer3 + 3 - 1;
-                        clb7.z1 = integer5 + integer7 - 1;
+                        ctd7.x1 = integer3 + 3 - 1;
+                        ctd7.z1 = integer5 + integer7 - 1;
                         break;
                     }
                     case WEST: {
-                        clb7.x0 = integer3 - (integer7 - 1);
-                        clb7.z1 = integer5 + 3 - 1;
+                        ctd7.x0 = integer3 - (integer7 - 1);
+                        ctd7.z1 = integer5 + 3 - 1;
                         break;
                     }
                     case EAST: {
-                        clb7.x1 = integer3 + integer7 - 1;
-                        clb7.z1 = integer5 + 3 - 1;
+                        ctd7.x1 = integer3 + integer7 - 1;
+                        ctd7.z1 = integer5 + 3 - 1;
                         break;
                     }
                 }
-                if (StructurePiece.findCollisionPiece(list, clb7) == null) {
+                if (StructurePiece.findCollisionPiece(list, ctd7) == null) {
                     break;
                 }
             }
             if (integer6 > 0) {
-                return clb7;
+                return ctd7;
             }
             return null;
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
             final int integer5 = this.getGenDepth();
             final int integer6 = random.nextInt(4);
-            final Direction fp7 = this.getOrientation();
-            if (fp7 != null) {
-                switch (fp7) {
+            final Direction fz7 = this.getOrientation();
+            if (fz7 != null) {
+                switch (fz7) {
                     default: {
                         if (integer6 <= 1) {
-                            generateAndAddPiece(clu, list, random, this.boundingBox.x0, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0 - 1, fp7, integer5);
+                            generateAndAddPiece(cty, list, random, this.boundingBox.x0, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0 - 1, fz7, integer5);
                             break;
                         }
                         if (integer6 == 2) {
-                            generateAndAddPiece(clu, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0, Direction.WEST, integer5);
+                            generateAndAddPiece(cty, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0, Direction.WEST, integer5);
                             break;
                         }
-                        generateAndAddPiece(clu, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0, Direction.EAST, integer5);
+                        generateAndAddPiece(cty, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0, Direction.EAST, integer5);
                         break;
                     }
                     case SOUTH: {
                         if (integer6 <= 1) {
-                            generateAndAddPiece(clu, list, random, this.boundingBox.x0, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z1 + 1, fp7, integer5);
+                            generateAndAddPiece(cty, list, random, this.boundingBox.x0, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z1 + 1, fz7, integer5);
                             break;
                         }
                         if (integer6 == 2) {
-                            generateAndAddPiece(clu, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z1 - 3, Direction.WEST, integer5);
+                            generateAndAddPiece(cty, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z1 - 3, Direction.WEST, integer5);
                             break;
                         }
-                        generateAndAddPiece(clu, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z1 - 3, Direction.EAST, integer5);
+                        generateAndAddPiece(cty, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z1 - 3, Direction.EAST, integer5);
                         break;
                     }
                     case WEST: {
                         if (integer6 <= 1) {
-                            generateAndAddPiece(clu, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0, fp7, integer5);
+                            generateAndAddPiece(cty, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0, fz7, integer5);
                             break;
                         }
                         if (integer6 == 2) {
-                            generateAndAddPiece(clu, list, random, this.boundingBox.x0, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0 - 1, Direction.NORTH, integer5);
+                            generateAndAddPiece(cty, list, random, this.boundingBox.x0, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0 - 1, Direction.NORTH, integer5);
                             break;
                         }
-                        generateAndAddPiece(clu, list, random, this.boundingBox.x0, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
+                        generateAndAddPiece(cty, list, random, this.boundingBox.x0, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
                         break;
                     }
                     case EAST: {
                         if (integer6 <= 1) {
-                            generateAndAddPiece(clu, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0, fp7, integer5);
+                            generateAndAddPiece(cty, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0, fz7, integer5);
                             break;
                         }
                         if (integer6 == 2) {
-                            generateAndAddPiece(clu, list, random, this.boundingBox.x1 - 3, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0 - 1, Direction.NORTH, integer5);
+                            generateAndAddPiece(cty, list, random, this.boundingBox.x1 - 3, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z0 - 1, Direction.NORTH, integer5);
                             break;
                         }
-                        generateAndAddPiece(clu, list, random, this.boundingBox.x1 - 3, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
+                        generateAndAddPiece(cty, list, random, this.boundingBox.x1 - 3, this.boundingBox.y0 - 1 + random.nextInt(3), this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
                         break;
                     }
                 }
             }
             if (integer5 < 8) {
-                if (fp7 == Direction.NORTH || fp7 == Direction.SOUTH) {
+                if (fz7 == Direction.NORTH || fz7 == Direction.SOUTH) {
                     for (int integer7 = this.boundingBox.z0 + 3; integer7 + 3 <= this.boundingBox.z1; integer7 += 5) {
                         final int integer8 = random.nextInt(5);
                         if (integer8 == 0) {
-                            generateAndAddPiece(clu, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0, integer7, Direction.WEST, integer5 + 1);
+                            generateAndAddPiece(cty, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0, integer7, Direction.WEST, integer5 + 1);
                         }
                         else if (integer8 == 1) {
-                            generateAndAddPiece(clu, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0, integer7, Direction.EAST, integer5 + 1);
+                            generateAndAddPiece(cty, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0, integer7, Direction.EAST, integer5 + 1);
                         }
                     }
                 }
@@ -379,10 +381,10 @@ public class MineShaftPieces {
                     for (int integer7 = this.boundingBox.x0 + 3; integer7 + 3 <= this.boundingBox.x1; integer7 += 5) {
                         final int integer8 = random.nextInt(5);
                         if (integer8 == 0) {
-                            generateAndAddPiece(clu, list, random, integer7, this.boundingBox.y0, this.boundingBox.z0 - 1, Direction.NORTH, integer5 + 1);
+                            generateAndAddPiece(cty, list, random, integer7, this.boundingBox.y0, this.boundingBox.z0 - 1, Direction.NORTH, integer5 + 1);
                         }
                         else if (integer8 == 1) {
-                            generateAndAddPiece(clu, list, random, integer7, this.boundingBox.y0, this.boundingBox.z1 + 1, Direction.SOUTH, integer5 + 1);
+                            generateAndAddPiece(cty, list, random, integer7, this.boundingBox.y0, this.boundingBox.z1 + 1, Direction.SOUTH, integer5 + 1);
                         }
                     }
                 }
@@ -390,113 +392,113 @@ public class MineShaftPieces {
         }
         
         @Override
-        protected boolean createChest(final LevelAccessor bjx, final BoundingBox clb, final Random random, final int integer4, final int integer5, final int integer6, final ResourceLocation sm) {
-            final BlockPos fk9 = new BlockPos(this.getWorldX(integer4, integer6), this.getWorldY(integer5), this.getWorldZ(integer4, integer6));
-            if (clb.isInside(fk9) && bjx.getBlockState(fk9).isAir() && !bjx.getBlockState(fk9.below()).isAir()) {
-                final BlockState byj10 = ((AbstractStateHolder<O, BlockState>)Blocks.RAIL.defaultBlockState()).<RailShape, RailShape>setValue(RailBlock.SHAPE, random.nextBoolean() ? RailShape.NORTH_SOUTH : RailShape.EAST_WEST);
-                this.placeBlock(bjx, byj10, integer4, integer5, integer6, clb);
-                final MinecartChest bab11 = new MinecartChest(bjx.getLevel(), fk9.getX() + 0.5f, fk9.getY() + 0.5f, fk9.getZ() + 0.5f);
-                bab11.setLootTable(sm, random.nextLong());
-                bjx.addFreshEntity(bab11);
+        protected boolean createChest(final LevelAccessor bqc, final BoundingBox ctd, final Random random, final int integer4, final int integer5, final int integer6, final ResourceLocation uh) {
+            final BlockPos fu9 = new BlockPos(this.getWorldX(integer4, integer6), this.getWorldY(integer5), this.getWorldZ(integer4, integer6));
+            if (ctd.isInside(fu9) && bqc.getBlockState(fu9).isAir() && !bqc.getBlockState(fu9.below()).isAir()) {
+                final BlockState cfj10 = ((StateHolder<O, BlockState>)Blocks.RAIL.defaultBlockState()).<RailShape, RailShape>setValue(RailBlock.SHAPE, random.nextBoolean() ? RailShape.NORTH_SOUTH : RailShape.EAST_WEST);
+                this.placeBlock(bqc, cfj10, integer4, integer5, integer6, ctd);
+                final MinecartChest bfw11 = new MinecartChest(bqc.getLevel(), fu9.getX() + 0.5, fu9.getY() + 0.5, fu9.getZ() + 0.5);
+                bfw11.setLootTable(uh, random.nextLong());
+                bqc.addFreshEntity(bfw11);
                 return true;
             }
             return false;
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            if (this.edgesLiquid(bjx, clb)) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            if (this.edgesLiquid(bqu, ctd)) {
                 return false;
             }
-            final int integer7 = 0;
-            final int integer8 = 2;
             final int integer9 = 0;
             final int integer10 = 2;
-            final int integer11 = this.numSections * 5 - 1;
-            final BlockState byj12 = this.getPlanksBlock();
-            this.generateBox(bjx, clb, 0, 0, 0, 2, 1, integer11, MineShaftCorridor.CAVE_AIR, MineShaftCorridor.CAVE_AIR, false);
-            this.generateMaybeBox(bjx, clb, random, 0.8f, 0, 2, 0, 2, 2, integer11, MineShaftCorridor.CAVE_AIR, MineShaftCorridor.CAVE_AIR, false, false);
+            final int integer11 = 0;
+            final int integer12 = 2;
+            final int integer13 = this.numSections * 5 - 1;
+            final BlockState cfj14 = this.getPlanksBlock();
+            this.generateBox(bqu, ctd, 0, 0, 0, 2, 1, integer13, MineShaftCorridor.CAVE_AIR, MineShaftCorridor.CAVE_AIR, false);
+            this.generateMaybeBox(bqu, ctd, random, 0.8f, 0, 2, 0, 2, 2, integer13, MineShaftCorridor.CAVE_AIR, MineShaftCorridor.CAVE_AIR, false, false);
             if (this.spiderCorridor) {
-                this.generateMaybeBox(bjx, clb, random, 0.6f, 0, 0, 0, 2, 1, integer11, Blocks.COBWEB.defaultBlockState(), MineShaftCorridor.CAVE_AIR, false, true);
+                this.generateMaybeBox(bqu, ctd, random, 0.6f, 0, 0, 0, 2, 1, integer13, Blocks.COBWEB.defaultBlockState(), MineShaftCorridor.CAVE_AIR, false, true);
             }
-            for (int integer12 = 0; integer12 < this.numSections; ++integer12) {
-                final int integer13 = 2 + integer12 * 5;
-                this.placeSupport(bjx, clb, 0, 0, integer13, 2, 2, random);
-                this.placeCobWeb(bjx, clb, random, 0.1f, 0, 2, integer13 - 1);
-                this.placeCobWeb(bjx, clb, random, 0.1f, 2, 2, integer13 - 1);
-                this.placeCobWeb(bjx, clb, random, 0.1f, 0, 2, integer13 + 1);
-                this.placeCobWeb(bjx, clb, random, 0.1f, 2, 2, integer13 + 1);
-                this.placeCobWeb(bjx, clb, random, 0.05f, 0, 2, integer13 - 2);
-                this.placeCobWeb(bjx, clb, random, 0.05f, 2, 2, integer13 - 2);
-                this.placeCobWeb(bjx, clb, random, 0.05f, 0, 2, integer13 + 2);
-                this.placeCobWeb(bjx, clb, random, 0.05f, 2, 2, integer13 + 2);
+            for (int integer14 = 0; integer14 < this.numSections; ++integer14) {
+                final int integer15 = 2 + integer14 * 5;
+                this.placeSupport(bqu, ctd, 0, 0, integer15, 2, 2, random);
+                this.placeCobWeb(bqu, ctd, random, 0.1f, 0, 2, integer15 - 1);
+                this.placeCobWeb(bqu, ctd, random, 0.1f, 2, 2, integer15 - 1);
+                this.placeCobWeb(bqu, ctd, random, 0.1f, 0, 2, integer15 + 1);
+                this.placeCobWeb(bqu, ctd, random, 0.1f, 2, 2, integer15 + 1);
+                this.placeCobWeb(bqu, ctd, random, 0.05f, 0, 2, integer15 - 2);
+                this.placeCobWeb(bqu, ctd, random, 0.05f, 2, 2, integer15 - 2);
+                this.placeCobWeb(bqu, ctd, random, 0.05f, 0, 2, integer15 + 2);
+                this.placeCobWeb(bqu, ctd, random, 0.05f, 2, 2, integer15 + 2);
                 if (random.nextInt(100) == 0) {
-                    this.createChest(bjx, clb, random, 2, 0, integer13 - 1, BuiltInLootTables.ABANDONED_MINESHAFT);
+                    this.createChest(bqu, ctd, random, 2, 0, integer15 - 1, BuiltInLootTables.ABANDONED_MINESHAFT);
                 }
                 if (random.nextInt(100) == 0) {
-                    this.createChest(bjx, clb, random, 0, 0, integer13 + 1, BuiltInLootTables.ABANDONED_MINESHAFT);
+                    this.createChest(bqu, ctd, random, 0, 0, integer15 + 1, BuiltInLootTables.ABANDONED_MINESHAFT);
                 }
                 if (this.spiderCorridor && !this.hasPlacedSpider) {
-                    final int integer14 = this.getWorldY(0);
-                    final int integer15 = integer13 - 1 + random.nextInt(3);
-                    final int integer16 = this.getWorldX(1, integer15);
-                    final int integer17 = this.getWorldZ(1, integer15);
-                    final BlockPos fk19 = new BlockPos(integer16, integer14, integer17);
-                    if (clb.isInside(fk19) && this.isInterior(bjx, 1, 0, integer15, clb)) {
+                    final int integer16 = this.getWorldY(0);
+                    final int integer17 = integer15 - 1 + random.nextInt(3);
+                    final int integer18 = this.getWorldX(1, integer17);
+                    final int integer19 = this.getWorldZ(1, integer17);
+                    final BlockPos fu2 = new BlockPos(integer18, integer16, integer19);
+                    if (ctd.isInside(fu2) && this.isInterior(bqu, 1, 0, integer17, ctd)) {
                         this.hasPlacedSpider = true;
-                        bjx.setBlock(fk19, Blocks.SPAWNER.defaultBlockState(), 2);
-                        final BlockEntity bwl20 = bjx.getBlockEntity(fk19);
-                        if (bwl20 instanceof SpawnerBlockEntity) {
-                            ((SpawnerBlockEntity)bwl20).getSpawner().setEntityId(EntityType.CAVE_SPIDER);
+                        bqu.setBlock(fu2, Blocks.SPAWNER.defaultBlockState(), 2);
+                        final BlockEntity cdl22 = bqu.getBlockEntity(fu2);
+                        if (cdl22 instanceof SpawnerBlockEntity) {
+                            ((SpawnerBlockEntity)cdl22).getSpawner().setEntityId(EntityType.CAVE_SPIDER);
                         }
                     }
                 }
             }
-            for (int integer12 = 0; integer12 <= 2; ++integer12) {
-                for (int integer13 = 0; integer13 <= integer11; ++integer13) {
-                    final int integer14 = -1;
-                    final BlockState byj13 = this.getBlock(bjx, integer12, -1, integer13, clb);
-                    if (byj13.isAir() && this.isInterior(bjx, integer12, -1, integer13, clb)) {
-                        final int integer16 = -1;
-                        this.placeBlock(bjx, byj12, integer12, -1, integer13, clb);
+            for (int integer14 = 0; integer14 <= 2; ++integer14) {
+                for (int integer15 = 0; integer15 <= integer13; ++integer15) {
+                    final int integer16 = -1;
+                    final BlockState cfj15 = this.getBlock(bqu, integer14, -1, integer15, ctd);
+                    if (cfj15.isAir() && this.isInterior(bqu, integer14, -1, integer15, ctd)) {
+                        final int integer18 = -1;
+                        this.placeBlock(bqu, cfj14, integer14, -1, integer15, ctd);
                     }
                 }
             }
             if (this.hasRails) {
-                final BlockState byj14 = ((AbstractStateHolder<O, BlockState>)Blocks.RAIL.defaultBlockState()).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_SOUTH);
-                for (int integer13 = 0; integer13 <= integer11; ++integer13) {
-                    final BlockState byj15 = this.getBlock(bjx, 1, -1, integer13, clb);
-                    if (!byj15.isAir() && byj15.isSolidRender(bjx, new BlockPos(this.getWorldX(1, integer13), this.getWorldY(-1), this.getWorldZ(1, integer13)))) {
-                        final float float16 = this.isInterior(bjx, 1, 0, integer13, clb) ? 0.7f : 0.9f;
-                        this.maybeGenerateBlock(bjx, clb, random, float16, 1, 0, integer13, byj14);
+                final BlockState cfj16 = ((StateHolder<O, BlockState>)Blocks.RAIL.defaultBlockState()).<RailShape, RailShape>setValue(RailBlock.SHAPE, RailShape.NORTH_SOUTH);
+                for (int integer15 = 0; integer15 <= integer13; ++integer15) {
+                    final BlockState cfj17 = this.getBlock(bqu, 1, -1, integer15, ctd);
+                    if (!cfj17.isAir() && cfj17.isSolidRender(bqu, new BlockPos(this.getWorldX(1, integer15), this.getWorldY(-1), this.getWorldZ(1, integer15)))) {
+                        final float float18 = this.isInterior(bqu, 1, 0, integer15, ctd) ? 0.7f : 0.9f;
+                        this.maybeGenerateBlock(bqu, ctd, random, float18, 1, 0, integer15, cfj16);
                     }
                 }
             }
             return true;
         }
         
-        private void placeSupport(final LevelAccessor bjx, final BoundingBox clb, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final Random random) {
-            if (!this.isSupportingBox(bjx, clb, integer3, integer7, integer6, integer5)) {
+        private void placeSupport(final LevelAccessor bqc, final BoundingBox ctd, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final Random random) {
+            if (!this.isSupportingBox(bqc, ctd, integer3, integer7, integer6, integer5)) {
                 return;
             }
-            final BlockState byj10 = this.getPlanksBlock();
-            final BlockState byj11 = this.getFenceBlock();
-            this.generateBox(bjx, clb, integer3, integer4, integer5, integer3, integer6 - 1, integer5, ((AbstractStateHolder<O, BlockState>)byj11).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), MineShaftCorridor.CAVE_AIR, false);
-            this.generateBox(bjx, clb, integer7, integer4, integer5, integer7, integer6 - 1, integer5, ((AbstractStateHolder<O, BlockState>)byj11).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), MineShaftCorridor.CAVE_AIR, false);
+            final BlockState cfj10 = this.getPlanksBlock();
+            final BlockState cfj11 = this.getFenceBlock();
+            this.generateBox(bqc, ctd, integer3, integer4, integer5, integer3, integer6 - 1, integer5, ((StateHolder<O, BlockState>)cfj11).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), MineShaftCorridor.CAVE_AIR, false);
+            this.generateBox(bqc, ctd, integer7, integer4, integer5, integer7, integer6 - 1, integer5, ((StateHolder<O, BlockState>)cfj11).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), MineShaftCorridor.CAVE_AIR, false);
             if (random.nextInt(4) == 0) {
-                this.generateBox(bjx, clb, integer3, integer6, integer5, integer3, integer6, integer5, byj10, MineShaftCorridor.CAVE_AIR, false);
-                this.generateBox(bjx, clb, integer7, integer6, integer5, integer7, integer6, integer5, byj10, MineShaftCorridor.CAVE_AIR, false);
+                this.generateBox(bqc, ctd, integer3, integer6, integer5, integer3, integer6, integer5, cfj10, MineShaftCorridor.CAVE_AIR, false);
+                this.generateBox(bqc, ctd, integer7, integer6, integer5, integer7, integer6, integer5, cfj10, MineShaftCorridor.CAVE_AIR, false);
             }
             else {
-                this.generateBox(bjx, clb, integer3, integer6, integer5, integer7, integer6, integer5, byj10, MineShaftCorridor.CAVE_AIR, false);
-                this.maybeGenerateBlock(bjx, clb, random, 0.05f, integer3 + 1, integer6, integer5 - 1, ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.NORTH));
-                this.maybeGenerateBlock(bjx, clb, random, 0.05f, integer3 + 1, integer6, integer5 + 1, ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.SOUTH));
+                this.generateBox(bqc, ctd, integer3, integer6, integer5, integer7, integer6, integer5, cfj10, MineShaftCorridor.CAVE_AIR, false);
+                this.maybeGenerateBlock(bqc, ctd, random, 0.05f, integer3 + 1, integer6, integer5 - 1, ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.NORTH));
+                this.maybeGenerateBlock(bqc, ctd, random, 0.05f, integer3 + 1, integer6, integer5 + 1, ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.SOUTH));
             }
         }
         
-        private void placeCobWeb(final LevelAccessor bjx, final BoundingBox clb, final Random random, final float float4, final int integer5, final int integer6, final int integer7) {
-            if (this.isInterior(bjx, integer5, integer6, integer7, clb)) {
-                this.maybeGenerateBlock(bjx, clb, random, float4, integer5, integer6, integer7, Blocks.COBWEB.defaultBlockState());
+        private void placeCobWeb(final LevelAccessor bqc, final BoundingBox ctd, final Random random, final float float4, final int integer5, final int integer6, final int integer7) {
+            if (this.isInterior(bqc, integer5, integer6, integer7, ctd)) {
+                this.maybeGenerateBlock(bqc, ctd, random, float4, integer5, integer6, integer7, Blocks.COBWEB.defaultBlockState());
             }
         }
     }
@@ -505,208 +507,208 @@ public class MineShaftPieces {
         private final Direction direction;
         private final boolean isTwoFloored;
         
-        public MineShaftCrossing(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.MINE_SHAFT_CROSSING, jt);
-            this.isTwoFloored = jt.getBoolean("tf");
-            this.direction = Direction.from2DDataValue(jt.getInt("D"));
+        public MineShaftCrossing(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.MINE_SHAFT_CROSSING, le);
+            this.isTwoFloored = le.getBoolean("tf");
+            this.direction = Direction.from2DDataValue(le.getInt("D"));
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("tf", this.isTwoFloored);
-            jt.putInt("D", this.direction.get2DDataValue());
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("tf", this.isTwoFloored);
+            le.putInt("D", this.direction.get2DDataValue());
         }
         
-        public MineShaftCrossing(final int integer, final BoundingBox clb, @Nullable final Direction fp, final MineshaftFeature.Type b) {
+        public MineShaftCrossing(final int integer, final BoundingBox ctd, @Nullable final Direction fz, final MineshaftFeature.Type b) {
             super(StructurePieceType.MINE_SHAFT_CROSSING, integer, b);
-            this.direction = fp;
-            this.boundingBox = clb;
-            this.isTwoFloored = (clb.getYSpan() > 3);
+            this.direction = fz;
+            this.boundingBox = ctd;
+            this.isTwoFloored = (ctd.getYSpan() > 3);
         }
         
-        public static BoundingBox findCrossing(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp) {
-            final BoundingBox clb7 = new BoundingBox(integer3, integer4, integer5, integer3, integer4 + 3 - 1, integer5);
+        public static BoundingBox findCrossing(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz) {
+            final BoundingBox ctd7 = new BoundingBox(integer3, integer4, integer5, integer3, integer4 + 3 - 1, integer5);
             if (random.nextInt(4) == 0) {
-                final BoundingBox boundingBox = clb7;
+                final BoundingBox boundingBox = ctd7;
                 boundingBox.y1 += 4;
             }
-            switch (fp) {
+            switch (fz) {
                 default: {
-                    clb7.x0 = integer3 - 1;
-                    clb7.x1 = integer3 + 3;
-                    clb7.z0 = integer5 - 4;
+                    ctd7.x0 = integer3 - 1;
+                    ctd7.x1 = integer3 + 3;
+                    ctd7.z0 = integer5 - 4;
                     break;
                 }
                 case SOUTH: {
-                    clb7.x0 = integer3 - 1;
-                    clb7.x1 = integer3 + 3;
-                    clb7.z1 = integer5 + 3 + 1;
+                    ctd7.x0 = integer3 - 1;
+                    ctd7.x1 = integer3 + 3;
+                    ctd7.z1 = integer5 + 3 + 1;
                     break;
                 }
                 case WEST: {
-                    clb7.x0 = integer3 - 4;
-                    clb7.z0 = integer5 - 1;
-                    clb7.z1 = integer5 + 3;
+                    ctd7.x0 = integer3 - 4;
+                    ctd7.z0 = integer5 - 1;
+                    ctd7.z1 = integer5 + 3;
                     break;
                 }
                 case EAST: {
-                    clb7.x1 = integer3 + 3 + 1;
-                    clb7.z0 = integer5 - 1;
-                    clb7.z1 = integer5 + 3;
+                    ctd7.x1 = integer3 + 3 + 1;
+                    ctd7.z0 = integer5 - 1;
+                    ctd7.z1 = integer5 + 3;
                     break;
                 }
             }
-            if (StructurePiece.findCollisionPiece(list, clb7) != null) {
+            if (StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return clb7;
+            return ctd7;
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
             final int integer5 = this.getGenDepth();
             switch (this.direction) {
                 default: {
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.WEST, integer5);
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.EAST, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.WEST, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.EAST, integer5);
                     break;
                 }
                 case SOUTH: {
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.WEST, integer5);
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.EAST, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.WEST, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.EAST, integer5);
                     break;
                 }
                 case WEST: {
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.WEST, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.WEST, integer5);
                     break;
                 }
                 case EAST: {
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.EAST, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0, this.boundingBox.z0 + 1, Direction.EAST, integer5);
                     break;
                 }
             }
             if (this.isTwoFloored) {
                 if (random.nextBoolean()) {
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0 + 3 + 1, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0 + 3 + 1, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
                 }
                 if (random.nextBoolean()) {
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 + 3 + 1, this.boundingBox.z0 + 1, Direction.WEST, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 + 3 + 1, this.boundingBox.z0 + 1, Direction.WEST, integer5);
                 }
                 if (random.nextBoolean()) {
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 + 3 + 1, this.boundingBox.z0 + 1, Direction.EAST, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 + 3 + 1, this.boundingBox.z0 + 1, Direction.EAST, integer5);
                 }
                 if (random.nextBoolean()) {
-                    generateAndAddPiece(clu, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0 + 3 + 1, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
+                    generateAndAddPiece(cty, list, random, this.boundingBox.x0 + 1, this.boundingBox.y0 + 3 + 1, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
                 }
             }
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            if (this.edgesLiquid(bjx, clb)) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            if (this.edgesLiquid(bqu, ctd)) {
                 return false;
             }
-            final BlockState byj7 = this.getPlanksBlock();
+            final BlockState cfj9 = this.getPlanksBlock();
             if (this.isTwoFloored) {
-                this.generateBox(bjx, clb, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0, this.boundingBox.x1 - 1, this.boundingBox.y0 + 3 - 1, this.boundingBox.z1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
-                this.generateBox(bjx, clb, this.boundingBox.x0, this.boundingBox.y0, this.boundingBox.z0 + 1, this.boundingBox.x1, this.boundingBox.y0 + 3 - 1, this.boundingBox.z1 - 1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
-                this.generateBox(bjx, clb, this.boundingBox.x0 + 1, this.boundingBox.y1 - 2, this.boundingBox.z0, this.boundingBox.x1 - 1, this.boundingBox.y1, this.boundingBox.z1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
-                this.generateBox(bjx, clb, this.boundingBox.x0, this.boundingBox.y1 - 2, this.boundingBox.z0 + 1, this.boundingBox.x1, this.boundingBox.y1, this.boundingBox.z1 - 1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
-                this.generateBox(bjx, clb, this.boundingBox.x0 + 1, this.boundingBox.y0 + 3, this.boundingBox.z0 + 1, this.boundingBox.x1 - 1, this.boundingBox.y0 + 3, this.boundingBox.z1 - 1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0, this.boundingBox.x1 - 1, this.boundingBox.y0 + 3 - 1, this.boundingBox.z1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, this.boundingBox.x0, this.boundingBox.y0, this.boundingBox.z0 + 1, this.boundingBox.x1, this.boundingBox.y0 + 3 - 1, this.boundingBox.z1 - 1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, this.boundingBox.x0 + 1, this.boundingBox.y1 - 2, this.boundingBox.z0, this.boundingBox.x1 - 1, this.boundingBox.y1, this.boundingBox.z1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, this.boundingBox.x0, this.boundingBox.y1 - 2, this.boundingBox.z0 + 1, this.boundingBox.x1, this.boundingBox.y1, this.boundingBox.z1 - 1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, this.boundingBox.x0 + 1, this.boundingBox.y0 + 3, this.boundingBox.z0 + 1, this.boundingBox.x1 - 1, this.boundingBox.y0 + 3, this.boundingBox.z1 - 1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
             }
             else {
-                this.generateBox(bjx, clb, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0, this.boundingBox.x1 - 1, this.boundingBox.y1, this.boundingBox.z1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
-                this.generateBox(bjx, clb, this.boundingBox.x0, this.boundingBox.y0, this.boundingBox.z0 + 1, this.boundingBox.x1, this.boundingBox.y1, this.boundingBox.z1 - 1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0, this.boundingBox.x1 - 1, this.boundingBox.y1, this.boundingBox.z1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, this.boundingBox.x0, this.boundingBox.y0, this.boundingBox.z0 + 1, this.boundingBox.x1, this.boundingBox.y1, this.boundingBox.z1 - 1, MineShaftCrossing.CAVE_AIR, MineShaftCrossing.CAVE_AIR, false);
             }
-            this.placeSupportPillar(bjx, clb, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0 + 1, this.boundingBox.y1);
-            this.placeSupportPillar(bjx, clb, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z1 - 1, this.boundingBox.y1);
-            this.placeSupportPillar(bjx, clb, this.boundingBox.x1 - 1, this.boundingBox.y0, this.boundingBox.z0 + 1, this.boundingBox.y1);
-            this.placeSupportPillar(bjx, clb, this.boundingBox.x1 - 1, this.boundingBox.y0, this.boundingBox.z1 - 1, this.boundingBox.y1);
-            for (int integer8 = this.boundingBox.x0; integer8 <= this.boundingBox.x1; ++integer8) {
-                for (int integer9 = this.boundingBox.z0; integer9 <= this.boundingBox.z1; ++integer9) {
-                    if (this.getBlock(bjx, integer8, this.boundingBox.y0 - 1, integer9, clb).isAir() && this.isInterior(bjx, integer8, this.boundingBox.y0 - 1, integer9, clb)) {
-                        this.placeBlock(bjx, byj7, integer8, this.boundingBox.y0 - 1, integer9, clb);
+            this.placeSupportPillar(bqu, ctd, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z0 + 1, this.boundingBox.y1);
+            this.placeSupportPillar(bqu, ctd, this.boundingBox.x0 + 1, this.boundingBox.y0, this.boundingBox.z1 - 1, this.boundingBox.y1);
+            this.placeSupportPillar(bqu, ctd, this.boundingBox.x1 - 1, this.boundingBox.y0, this.boundingBox.z0 + 1, this.boundingBox.y1);
+            this.placeSupportPillar(bqu, ctd, this.boundingBox.x1 - 1, this.boundingBox.y0, this.boundingBox.z1 - 1, this.boundingBox.y1);
+            for (int integer10 = this.boundingBox.x0; integer10 <= this.boundingBox.x1; ++integer10) {
+                for (int integer11 = this.boundingBox.z0; integer11 <= this.boundingBox.z1; ++integer11) {
+                    if (this.getBlock(bqu, integer10, this.boundingBox.y0 - 1, integer11, ctd).isAir() && this.isInterior(bqu, integer10, this.boundingBox.y0 - 1, integer11, ctd)) {
+                        this.placeBlock(bqu, cfj9, integer10, this.boundingBox.y0 - 1, integer11, ctd);
                     }
                 }
             }
             return true;
         }
         
-        private void placeSupportPillar(final LevelAccessor bjx, final BoundingBox clb, final int integer3, final int integer4, final int integer5, final int integer6) {
-            if (!this.getBlock(bjx, integer3, integer6 + 1, integer5, clb).isAir()) {
-                this.generateBox(bjx, clb, integer3, integer4, integer5, integer3, integer6, integer5, this.getPlanksBlock(), MineShaftCrossing.CAVE_AIR, false);
+        private void placeSupportPillar(final LevelAccessor bqc, final BoundingBox ctd, final int integer3, final int integer4, final int integer5, final int integer6) {
+            if (!this.getBlock(bqc, integer3, integer6 + 1, integer5, ctd).isAir()) {
+                this.generateBox(bqc, ctd, integer3, integer4, integer5, integer3, integer6, integer5, this.getPlanksBlock(), MineShaftCrossing.CAVE_AIR, false);
             }
         }
     }
     
     public static class MineShaftStairs extends MineShaftPiece {
-        public MineShaftStairs(final int integer, final BoundingBox clb, final Direction fp, final MineshaftFeature.Type b) {
+        public MineShaftStairs(final int integer, final BoundingBox ctd, final Direction fz, final MineshaftFeature.Type b) {
             super(StructurePieceType.MINE_SHAFT_STAIRS, integer, b);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public MineShaftStairs(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.MINE_SHAFT_STAIRS, jt);
+        public MineShaftStairs(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.MINE_SHAFT_STAIRS, le);
         }
         
-        public static BoundingBox findStairs(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp) {
-            final BoundingBox clb7 = new BoundingBox(integer3, integer4 - 5, integer5, integer3, integer4 + 3 - 1, integer5);
-            switch (fp) {
+        public static BoundingBox findStairs(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz) {
+            final BoundingBox ctd7 = new BoundingBox(integer3, integer4 - 5, integer5, integer3, integer4 + 3 - 1, integer5);
+            switch (fz) {
                 default: {
-                    clb7.x1 = integer3 + 3 - 1;
-                    clb7.z0 = integer5 - 8;
+                    ctd7.x1 = integer3 + 3 - 1;
+                    ctd7.z0 = integer5 - 8;
                     break;
                 }
                 case SOUTH: {
-                    clb7.x1 = integer3 + 3 - 1;
-                    clb7.z1 = integer5 + 8;
+                    ctd7.x1 = integer3 + 3 - 1;
+                    ctd7.z1 = integer5 + 8;
                     break;
                 }
                 case WEST: {
-                    clb7.x0 = integer3 - 8;
-                    clb7.z1 = integer5 + 3 - 1;
+                    ctd7.x0 = integer3 - 8;
+                    ctd7.z1 = integer5 + 3 - 1;
                     break;
                 }
                 case EAST: {
-                    clb7.x1 = integer3 + 8;
-                    clb7.z1 = integer5 + 3 - 1;
+                    ctd7.x1 = integer3 + 8;
+                    ctd7.z1 = integer5 + 3 - 1;
                     break;
                 }
             }
-            if (StructurePiece.findCollisionPiece(list, clb7) != null) {
+            if (StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return clb7;
+            return ctd7;
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
             final int integer5 = this.getGenDepth();
-            final Direction fp6 = this.getOrientation();
-            if (fp6 != null) {
-                switch (fp6) {
+            final Direction fz6 = this.getOrientation();
+            if (fz6 != null) {
+                switch (fz6) {
                     default: {
-                        generateAndAddPiece(clu, list, random, this.boundingBox.x0, this.boundingBox.y0, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
+                        generateAndAddPiece(cty, list, random, this.boundingBox.x0, this.boundingBox.y0, this.boundingBox.z0 - 1, Direction.NORTH, integer5);
                         break;
                     }
                     case SOUTH: {
-                        generateAndAddPiece(clu, list, random, this.boundingBox.x0, this.boundingBox.y0, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
+                        generateAndAddPiece(cty, list, random, this.boundingBox.x0, this.boundingBox.y0, this.boundingBox.z1 + 1, Direction.SOUTH, integer5);
                         break;
                     }
                     case WEST: {
-                        generateAndAddPiece(clu, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0, this.boundingBox.z0, Direction.WEST, integer5);
+                        generateAndAddPiece(cty, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0, this.boundingBox.z0, Direction.WEST, integer5);
                         break;
                     }
                     case EAST: {
-                        generateAndAddPiece(clu, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0, this.boundingBox.z0, Direction.EAST, integer5);
+                        generateAndAddPiece(cty, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0, this.boundingBox.z0, Direction.EAST, integer5);
                         break;
                     }
                 }
@@ -714,14 +716,14 @@ public class MineShaftPieces {
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            if (this.edgesLiquid(bjx, clb)) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            if (this.edgesLiquid(bqu, ctd)) {
                 return false;
             }
-            this.generateBox(bjx, clb, 0, 5, 0, 2, 7, 1, MineShaftStairs.CAVE_AIR, MineShaftStairs.CAVE_AIR, false);
-            this.generateBox(bjx, clb, 0, 0, 7, 2, 2, 8, MineShaftStairs.CAVE_AIR, MineShaftStairs.CAVE_AIR, false);
-            for (int integer7 = 0; integer7 < 5; ++integer7) {
-                this.generateBox(bjx, clb, 0, 5 - integer7 - ((integer7 < 4) ? 1 : 0), 2 + integer7, 2, 7 - integer7, 2 + integer7, MineShaftStairs.CAVE_AIR, MineShaftStairs.CAVE_AIR, false);
+            this.generateBox(bqu, ctd, 0, 5, 0, 2, 7, 1, MineShaftStairs.CAVE_AIR, MineShaftStairs.CAVE_AIR, false);
+            this.generateBox(bqu, ctd, 0, 0, 7, 2, 2, 8, MineShaftStairs.CAVE_AIR, MineShaftStairs.CAVE_AIR, false);
+            for (int integer9 = 0; integer9 < 5; ++integer9) {
+                this.generateBox(bqu, ctd, 0, 5 - integer9 - ((integer9 < 4) ? 1 : 0), 2 + integer9, 2, 7 - integer9, 2 + integer9, MineShaftStairs.CAVE_AIR, MineShaftStairs.CAVE_AIR, false);
             }
             return true;
         }
diff --git a/src/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.java b/src/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.java
index 8a3f173..44ef598 100644
--- a/src/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.structure;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.block.StairBlock;
 import net.minecraft.world.level.material.Fluids;
@@ -8,14 +8,16 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
 import net.minecraft.core.Vec3i;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.FenceBlock;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import com.google.common.collect.Lists;
 import javax.annotation.Nullable;
@@ -30,47 +32,47 @@ public class NetherBridgePieces {
     private static final PieceWeight[] BRIDGE_PIECE_WEIGHTS;
     private static final PieceWeight[] CASTLE_PIECE_WEIGHTS;
     
-    private static NetherBridgePiece findAndCreateBridgePieceFactory(final PieceWeight n, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, final Direction fp, final int integer8) {
+    private static NetherBridgePiece findAndCreateBridgePieceFactory(final PieceWeight n, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, final Direction fz, final int integer8) {
         final Class<? extends NetherBridgePiece> class9 = n.pieceClass;
         NetherBridgePiece m10 = null;
         if (class9 == BridgeStraight.class) {
-            m10 = BridgeStraight.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            m10 = BridgeStraight.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class9 == BridgeCrossing.class) {
-            m10 = BridgeCrossing.createPiece(list, integer4, integer5, integer6, fp, integer8);
+            m10 = BridgeCrossing.createPiece(list, integer4, integer5, integer6, fz, integer8);
         }
         else if (class9 == RoomCrossing.class) {
-            m10 = RoomCrossing.createPiece(list, integer4, integer5, integer6, fp, integer8);
+            m10 = RoomCrossing.createPiece(list, integer4, integer5, integer6, fz, integer8);
         }
         else if (class9 == StairsRoom.class) {
-            m10 = StairsRoom.createPiece(list, integer4, integer5, integer6, integer8, fp);
+            m10 = StairsRoom.createPiece(list, integer4, integer5, integer6, integer8, fz);
         }
         else if (class9 == MonsterThrone.class) {
-            m10 = MonsterThrone.createPiece(list, integer4, integer5, integer6, integer8, fp);
+            m10 = MonsterThrone.createPiece(list, integer4, integer5, integer6, integer8, fz);
         }
         else if (class9 == CastleEntrance.class) {
-            m10 = CastleEntrance.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            m10 = CastleEntrance.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class9 == CastleSmallCorridorPiece.class) {
-            m10 = CastleSmallCorridorPiece.createPiece(list, integer4, integer5, integer6, fp, integer8);
+            m10 = CastleSmallCorridorPiece.createPiece(list, integer4, integer5, integer6, fz, integer8);
         }
         else if (class9 == CastleSmallCorridorRightTurnPiece.class) {
-            m10 = CastleSmallCorridorRightTurnPiece.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            m10 = CastleSmallCorridorRightTurnPiece.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class9 == CastleSmallCorridorLeftTurnPiece.class) {
-            m10 = CastleSmallCorridorLeftTurnPiece.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            m10 = CastleSmallCorridorLeftTurnPiece.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class9 == CastleCorridorStairsPiece.class) {
-            m10 = CastleCorridorStairsPiece.createPiece(list, integer4, integer5, integer6, fp, integer8);
+            m10 = CastleCorridorStairsPiece.createPiece(list, integer4, integer5, integer6, fz, integer8);
         }
         else if (class9 == CastleCorridorTBalconyPiece.class) {
-            m10 = CastleCorridorTBalconyPiece.createPiece(list, integer4, integer5, integer6, fp, integer8);
+            m10 = CastleCorridorTBalconyPiece.createPiece(list, integer4, integer5, integer6, fz, integer8);
         }
         else if (class9 == CastleSmallCorridorCrossingPiece.class) {
-            m10 = CastleSmallCorridorCrossingPiece.createPiece(list, integer4, integer5, integer6, fp, integer8);
+            m10 = CastleSmallCorridorCrossingPiece.createPiece(list, integer4, integer5, integer6, fz, integer8);
         }
         else if (class9 == CastleStalkRoom.class) {
-            m10 = CastleStalkRoom.createPiece(list, integer4, integer5, integer6, fp, integer8);
+            m10 = CastleStalkRoom.createPiece(list, integer4, integer5, integer6, fz, integer8);
         }
         return m10;
     }
@@ -108,16 +110,16 @@ public class NetherBridgePieces {
     }
     
     abstract static class NetherBridgePiece extends StructurePiece {
-        protected NetherBridgePiece(final StructurePieceType cfm, final int integer) {
-            super(cfm, integer);
+        protected NetherBridgePiece(final StructurePieceType cmm, final int integer) {
+            super(cmm, integer);
         }
         
-        public NetherBridgePiece(final StructurePieceType cfm, final CompoundTag jt) {
-            super(cfm, jt);
+        public NetherBridgePiece(final StructurePieceType cmm, final CompoundTag le) {
+            super(cmm, le);
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
+        protected void addAdditionalSaveData(final CompoundTag le) {
         }
         
         private int updatePieceWeight(final List<PieceWeight> list) {
@@ -132,7 +134,7 @@ public class NetherBridgePieces {
             return boolean3 ? integer4 : -1;
         }
         
-        private NetherBridgePiece generatePiece(final StartPiece q, final List<PieceWeight> list2, final List<StructurePiece> list3, final Random random, final int integer5, final int integer6, final int integer7, final Direction fp, final int integer9) {
+        private NetherBridgePiece generatePiece(final StartPiece q, final List<PieceWeight> list2, final List<StructurePiece> list3, final Random random, final int integer5, final int integer6, final int integer7, final Direction fz, final int integer9) {
             final int integer10 = this.updatePieceWeight(list2);
             final boolean boolean12 = integer10 > 0 && integer9 <= 30;
             int integer11 = 0;
@@ -148,7 +150,7 @@ public class NetherBridgePieces {
                         if (n16 == q.previousPiece && !n16.allowInRow) {
                             break;
                         }
-                        final NetherBridgePiece m17 = findAndCreateBridgePieceFactory(n16, list3, random, integer5, integer6, integer7, fp, integer9);
+                        final NetherBridgePiece m17 = findAndCreateBridgePieceFactory(n16, list3, random, integer5, integer6, integer7, fz, integer9);
                         if (m17 != null) {
                             final PieceWeight pieceWeight = n16;
                             ++pieceWeight.placeCount;
@@ -162,41 +164,41 @@ public class NetherBridgePieces {
                     }
                 }
             }
-            return BridgeEndFiller.createPiece(list3, random, integer5, integer6, integer7, fp, integer9);
+            return BridgeEndFiller.createPiece(list3, random, integer5, integer6, integer7, fz, integer9);
         }
         
-        private StructurePiece generateAndAddPiece(final StartPiece q, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, @Nullable final Direction fp, final int integer8, final boolean boolean9) {
+        private StructurePiece generateAndAddPiece(final StartPiece q, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, @Nullable final Direction fz, final int integer8, final boolean boolean9) {
             if (Math.abs(integer4 - q.getBoundingBox().x0) > 112 || Math.abs(integer6 - q.getBoundingBox().z0) > 112) {
-                return BridgeEndFiller.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+                return BridgeEndFiller.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
             }
             List<PieceWeight> list2 = q.availableBridgePieces;
             if (boolean9) {
                 list2 = q.availableCastlePieces;
             }
-            final StructurePiece clu12 = this.generatePiece(q, list2, list, random, integer4, integer5, integer6, fp, integer8 + 1);
-            if (clu12 != null) {
-                list.add(clu12);
-                q.pendingChildren.add(clu12);
+            final StructurePiece cty12 = this.generatePiece(q, list2, list, random, integer4, integer5, integer6, fz, integer8 + 1);
+            if (cty12 != null) {
+                list.add(cty12);
+                q.pendingChildren.add(cty12);
             }
-            return clu12;
+            return cty12;
         }
         
         @Nullable
         protected StructurePiece generateChildForward(final StartPiece q, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final boolean boolean6) {
-            final Direction fp8 = this.getOrientation();
-            if (fp8 != null) {
-                switch (fp8) {
+            final Direction fz8 = this.getOrientation();
+            if (fz8 != null) {
+                switch (fz8) {
                     case NORTH: {
-                        return this.generateAndAddPiece(q, list, random, this.boundingBox.x0 + integer4, this.boundingBox.y0 + integer5, this.boundingBox.z0 - 1, fp8, this.getGenDepth(), boolean6);
+                        return this.generateAndAddPiece(q, list, random, this.boundingBox.x0 + integer4, this.boundingBox.y0 + integer5, this.boundingBox.z0 - 1, fz8, this.getGenDepth(), boolean6);
                     }
                     case SOUTH: {
-                        return this.generateAndAddPiece(q, list, random, this.boundingBox.x0 + integer4, this.boundingBox.y0 + integer5, this.boundingBox.z1 + 1, fp8, this.getGenDepth(), boolean6);
+                        return this.generateAndAddPiece(q, list, random, this.boundingBox.x0 + integer4, this.boundingBox.y0 + integer5, this.boundingBox.z1 + 1, fz8, this.getGenDepth(), boolean6);
                     }
                     case WEST: {
-                        return this.generateAndAddPiece(q, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 + integer5, this.boundingBox.z0 + integer4, fp8, this.getGenDepth(), boolean6);
+                        return this.generateAndAddPiece(q, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 + integer5, this.boundingBox.z0 + integer4, fz8, this.getGenDepth(), boolean6);
                     }
                     case EAST: {
-                        return this.generateAndAddPiece(q, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 + integer5, this.boundingBox.z0 + integer4, fp8, this.getGenDepth(), boolean6);
+                        return this.generateAndAddPiece(q, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 + integer5, this.boundingBox.z0 + integer4, fz8, this.getGenDepth(), boolean6);
                     }
                 }
             }
@@ -205,9 +207,9 @@ public class NetherBridgePieces {
         
         @Nullable
         protected StructurePiece generateChildLeft(final StartPiece q, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final boolean boolean6) {
-            final Direction fp8 = this.getOrientation();
-            if (fp8 != null) {
-                switch (fp8) {
+            final Direction fz8 = this.getOrientation();
+            if (fz8 != null) {
+                switch (fz8) {
                     case NORTH: {
                         return this.generateAndAddPiece(q, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 + integer4, this.boundingBox.z0 + integer5, Direction.WEST, this.getGenDepth(), boolean6);
                     }
@@ -227,9 +229,9 @@ public class NetherBridgePieces {
         
         @Nullable
         protected StructurePiece generateChildRight(final StartPiece q, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final boolean boolean6) {
-            final Direction fp8 = this.getOrientation();
-            if (fp8 != null) {
-                switch (fp8) {
+            final Direction fz8 = this.getOrientation();
+            if (fz8 != null) {
+                switch (fz8) {
                     case NORTH: {
                         return this.generateAndAddPiece(q, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 + integer4, this.boundingBox.z0 + integer5, Direction.EAST, this.getGenDepth(), boolean6);
                     }
@@ -247,8 +249,8 @@ public class NetherBridgePieces {
             return null;
         }
         
-        protected static boolean isOkBox(final BoundingBox clb) {
-            return clb != null && clb.y0 > 10;
+        protected static boolean isOkBox(final BoundingBox ctd) {
+            return ctd != null && ctd.y0 > 10;
         }
     }
     
@@ -273,63 +275,63 @@ public class NetherBridgePieces {
             }
         }
         
-        public StartPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_START, jt);
+        public StartPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_START, le);
             this.pendingChildren = Lists.newArrayList();
         }
     }
     
     public static class BridgeStraight extends NetherBridgePiece {
-        public BridgeStraight(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public BridgeStraight(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_BRIDGE_STRAIGHT, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public BridgeStraight(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_BRIDGE_STRAIGHT, jt);
+        public BridgeStraight(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_BRIDGE_STRAIGHT, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildForward((StartPiece)clu, list, random, 1, 3, false);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildForward((StartPiece)cty, list, random, 1, 3, false);
         }
         
-        public static BridgeStraight createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -3, 0, 5, 10, 19, fp);
-            if (!NetherBridgePiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static BridgeStraight createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -3, 0, 5, 10, 19, fz);
+            if (!NetherBridgePiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new BridgeStraight(integer7, random, clb8, fp);
+            return new BridgeStraight(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 3, 0, 4, 4, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 5, 0, 3, 7, 18, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 5, 0, 0, 5, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 5, 0, 4, 5, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 4, 2, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 13, 4, 2, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 1, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 0, 15, 4, 1, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            for (int integer7 = 0; integer7 <= 4; ++integer7) {
-                for (int integer8 = 0; integer8 <= 2; ++integer8) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer7, -1, integer8, clb);
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer7, -1, 18 - integer8, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 3, 0, 4, 4, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 5, 0, 3, 7, 18, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 5, 0, 0, 5, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 5, 0, 4, 5, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 4, 2, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 13, 4, 2, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 1, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 0, 15, 4, 1, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (int integer9 = 0; integer9 <= 4; ++integer9) {
+                for (int integer10 = 0; integer10 <= 2; ++integer10) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, ctd);
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, 18 - integer10, ctd);
                 }
             }
-            final BlockState byj7 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            final BlockState byj8 = ((AbstractStateHolder<O, BlockState>)byj7).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-            final BlockState byj9 = ((AbstractStateHolder<O, BlockState>)byj7).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true);
-            this.generateBox(bjx, clb, 0, 1, 1, 0, 4, 1, byj8, byj8, false);
-            this.generateBox(bjx, clb, 0, 3, 4, 0, 4, 4, byj8, byj8, false);
-            this.generateBox(bjx, clb, 0, 3, 14, 0, 4, 14, byj8, byj8, false);
-            this.generateBox(bjx, clb, 0, 1, 17, 0, 4, 17, byj8, byj8, false);
-            this.generateBox(bjx, clb, 4, 1, 1, 4, 4, 1, byj9, byj9, false);
-            this.generateBox(bjx, clb, 4, 3, 4, 4, 4, 4, byj9, byj9, false);
-            this.generateBox(bjx, clb, 4, 3, 14, 4, 4, 14, byj9, byj9, false);
-            this.generateBox(bjx, clb, 4, 1, 17, 4, 4, 17, byj9, byj9, false);
+            final BlockState cfj9 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            final BlockState cfj10 = ((StateHolder<O, BlockState>)cfj9).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+            final BlockState cfj11 = ((StateHolder<O, BlockState>)cfj9).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true);
+            this.generateBox(bqu, ctd, 0, 1, 1, 0, 4, 1, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 0, 3, 4, 0, 4, 4, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 0, 3, 14, 0, 4, 14, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 0, 1, 17, 0, 4, 17, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 4, 1, 1, 4, 4, 1, cfj11, cfj11, false);
+            this.generateBox(bqu, ctd, 4, 3, 4, 4, 4, 4, cfj11, cfj11, false);
+            this.generateBox(bqu, ctd, 4, 3, 14, 4, 4, 14, cfj11, cfj11, false);
+            this.generateBox(bqu, ctd, 4, 1, 17, 4, 4, 17, cfj11, cfj11, false);
             return true;
         }
     }
@@ -337,53 +339,53 @@ public class NetherBridgePieces {
     public static class BridgeEndFiller extends NetherBridgePiece {
         private final int selfSeed;
         
-        public BridgeEndFiller(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public BridgeEndFiller(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_BRIDGE_END_FILLER, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
             this.selfSeed = random.nextInt();
         }
         
-        public BridgeEndFiller(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_BRIDGE_END_FILLER, jt);
-            this.selfSeed = jt.getInt("Seed");
+        public BridgeEndFiller(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_BRIDGE_END_FILLER, le);
+            this.selfSeed = le.getInt("Seed");
         }
         
-        public static BridgeEndFiller createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -3, 0, 5, 10, 8, fp);
-            if (!NetherBridgePiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static BridgeEndFiller createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -3, 0, 5, 10, 8, fz);
+            if (!NetherBridgePiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new BridgeEndFiller(integer7, random, clb8, fp);
+            return new BridgeEndFiller(integer7, random, ctd8, fz);
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putInt("Seed", this.selfSeed);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putInt("Seed", this.selfSeed);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
             final Random random2 = new Random(this.selfSeed);
-            for (int integer8 = 0; integer8 <= 4; ++integer8) {
-                for (int integer9 = 3; integer9 <= 4; ++integer9) {
-                    final int integer10 = random2.nextInt(8);
-                    this.generateBox(bjx, clb, integer8, integer9, 0, integer8, integer9, integer10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (int integer10 = 0; integer10 <= 4; ++integer10) {
+                for (int integer11 = 3; integer11 <= 4; ++integer11) {
+                    final int integer12 = random2.nextInt(8);
+                    this.generateBox(bqu, ctd, integer10, integer11, 0, integer10, integer11, integer12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
                 }
             }
-            int integer8 = random2.nextInt(8);
-            this.generateBox(bjx, clb, 0, 5, 0, 0, 5, integer8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            integer8 = random2.nextInt(8);
-            this.generateBox(bjx, clb, 4, 5, 0, 4, 5, integer8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            for (integer8 = 0; integer8 <= 4; ++integer8) {
-                final int integer9 = random2.nextInt(5);
-                this.generateBox(bjx, clb, integer8, 2, 0, integer8, 2, integer9, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            int integer10 = random2.nextInt(8);
+            this.generateBox(bqu, ctd, 0, 5, 0, 0, 5, integer10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            integer10 = random2.nextInt(8);
+            this.generateBox(bqu, ctd, 4, 5, 0, 4, 5, integer10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (integer10 = 0; integer10 <= 4; ++integer10) {
+                final int integer11 = random2.nextInt(5);
+                this.generateBox(bqu, ctd, integer10, 2, 0, integer10, 2, integer11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
             }
-            for (integer8 = 0; integer8 <= 4; ++integer8) {
-                for (int integer9 = 0; integer9 <= 1; ++integer9) {
-                    final int integer10 = random2.nextInt(3);
-                    this.generateBox(bjx, clb, integer8, integer9, 0, integer8, integer9, integer10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (integer10 = 0; integer10 <= 4; ++integer10) {
+                for (int integer11 = 0; integer11 <= 1; ++integer11) {
+                    final int integer12 = random2.nextInt(3);
+                    this.generateBox(bqu, ctd, integer10, integer11, 0, integer10, integer11, integer12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
                 }
             }
             return true;
@@ -391,10 +393,10 @@ public class NetherBridgePieces {
     }
     
     public static class BridgeCrossing extends NetherBridgePiece {
-        public BridgeCrossing(final int integer, final BoundingBox clb, final Direction fp) {
+        public BridgeCrossing(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_BRIDGE_CROSSING, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
         protected BridgeCrossing(final Random random, final int integer2, final int integer3) {
@@ -408,61 +410,61 @@ public class NetherBridgePieces {
             }
         }
         
-        protected BridgeCrossing(final StructurePieceType cfm, final CompoundTag jt) {
-            super(cfm, jt);
+        protected BridgeCrossing(final StructurePieceType cmm, final CompoundTag le) {
+            super(cmm, le);
         }
         
-        public BridgeCrossing(final StructureManager cmo, final CompoundTag jt) {
-            this(StructurePieceType.NETHER_FORTRESS_BRIDGE_CROSSING, jt);
+        public BridgeCrossing(final StructureManager cva, final CompoundTag le) {
+            this(StructurePieceType.NETHER_FORTRESS_BRIDGE_CROSSING, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildForward((StartPiece)clu, list, random, 8, 3, false);
-            this.generateChildLeft((StartPiece)clu, list, random, 3, 8, false);
-            this.generateChildRight((StartPiece)clu, list, random, 3, 8, false);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildForward((StartPiece)cty, list, random, 8, 3, false);
+            this.generateChildLeft((StartPiece)cty, list, random, 3, 8, false);
+            this.generateChildRight((StartPiece)cty, list, random, 3, 8, false);
         }
         
-        public static BridgeCrossing createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fp, final int integer6) {
-            final BoundingBox clb7 = BoundingBox.orientBox(integer2, integer3, integer4, -8, -3, 0, 19, 10, 19, fp);
-            if (!NetherBridgePiece.isOkBox(clb7) || StructurePiece.findCollisionPiece(list, clb7) != null) {
+        public static BridgeCrossing createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fz, final int integer6) {
+            final BoundingBox ctd7 = BoundingBox.orientBox(integer2, integer3, integer4, -8, -3, 0, 19, 10, 19, fz);
+            if (!NetherBridgePiece.isOkBox(ctd7) || StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return new BridgeCrossing(integer6, clb7, fp);
+            return new BridgeCrossing(integer6, ctd7, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 7, 3, 0, 11, 4, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 3, 7, 18, 4, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 8, 5, 0, 10, 7, 18, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 5, 8, 18, 7, 10, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 7, 5, 0, 7, 5, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 7, 5, 11, 7, 5, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 11, 5, 0, 11, 5, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 11, 5, 11, 11, 5, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 5, 7, 7, 5, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 11, 5, 7, 18, 5, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 5, 11, 7, 5, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 11, 5, 11, 18, 5, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 7, 2, 0, 11, 2, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 7, 2, 13, 11, 2, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 7, 0, 0, 11, 1, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 7, 0, 15, 11, 1, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            for (int integer7 = 7; integer7 <= 11; ++integer7) {
-                for (int integer8 = 0; integer8 <= 2; ++integer8) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer7, -1, integer8, clb);
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer7, -1, 18 - integer8, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 7, 3, 0, 11, 4, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 3, 7, 18, 4, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 8, 5, 0, 10, 7, 18, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 5, 8, 18, 7, 10, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 7, 5, 0, 7, 5, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 7, 5, 11, 7, 5, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 11, 5, 0, 11, 5, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 11, 5, 11, 11, 5, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 5, 7, 7, 5, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 11, 5, 7, 18, 5, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 5, 11, 7, 5, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 11, 5, 11, 18, 5, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 7, 2, 0, 11, 2, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 7, 2, 13, 11, 2, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 7, 0, 0, 11, 1, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 7, 0, 15, 11, 1, 18, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (int integer9 = 7; integer9 <= 11; ++integer9) {
+                for (int integer10 = 0; integer10 <= 2; ++integer10) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, ctd);
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, 18 - integer10, ctd);
                 }
             }
-            this.generateBox(bjx, clb, 0, 2, 7, 5, 2, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 13, 2, 7, 18, 2, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 0, 7, 3, 1, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 15, 0, 7, 18, 1, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            for (int integer7 = 0; integer7 <= 2; ++integer7) {
-                for (int integer8 = 7; integer8 <= 11; ++integer8) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer7, -1, integer8, clb);
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), 18 - integer7, -1, integer8, clb);
+            this.generateBox(bqu, ctd, 0, 2, 7, 5, 2, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 13, 2, 7, 18, 2, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 0, 7, 3, 1, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 15, 0, 7, 18, 1, 11, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (int integer9 = 0; integer9 <= 2; ++integer9) {
+                for (int integer10 = 7; integer10 <= 11; ++integer10) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, ctd);
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), 18 - integer9, -1, integer10, ctd);
                 }
             }
             return true;
@@ -470,56 +472,56 @@ public class NetherBridgePieces {
     }
     
     public static class RoomCrossing extends NetherBridgePiece {
-        public RoomCrossing(final int integer, final BoundingBox clb, final Direction fp) {
+        public RoomCrossing(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_ROOM_CROSSING, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public RoomCrossing(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_ROOM_CROSSING, jt);
+        public RoomCrossing(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_ROOM_CROSSING, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildForward((StartPiece)clu, list, random, 2, 0, false);
-            this.generateChildLeft((StartPiece)clu, list, random, 0, 2, false);
-            this.generateChildRight((StartPiece)clu, list, random, 0, 2, false);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildForward((StartPiece)cty, list, random, 2, 0, false);
+            this.generateChildLeft((StartPiece)cty, list, random, 0, 2, false);
+            this.generateChildRight((StartPiece)cty, list, random, 0, 2, false);
         }
         
-        public static RoomCrossing createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fp, final int integer6) {
-            final BoundingBox clb7 = BoundingBox.orientBox(integer2, integer3, integer4, -2, 0, 0, 7, 9, 7, fp);
-            if (!NetherBridgePiece.isOkBox(clb7) || StructurePiece.findCollisionPiece(list, clb7) != null) {
+        public static RoomCrossing createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fz, final int integer6) {
+            final BoundingBox ctd7 = BoundingBox.orientBox(integer2, integer3, integer4, -2, 0, 0, 7, 9, 7, fz);
+            if (!NetherBridgePiece.isOkBox(ctd7) || StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return new RoomCrossing(integer6, clb7, fp);
+            return new RoomCrossing(integer6, ctd7, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 6, 1, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 6, 7, 6, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 1, 6, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 6, 1, 6, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 2, 0, 6, 6, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 2, 6, 6, 6, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 0, 6, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 5, 0, 6, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 6, 2, 0, 6, 6, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 6, 2, 5, 6, 6, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            final BlockState byj7 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            this.generateBox(bjx, clb, 2, 6, 0, 4, 6, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 5, 0, 4, 5, 0, byj7, byj7, false);
-            this.generateBox(bjx, clb, 2, 6, 6, 4, 6, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 5, 6, 4, 5, 6, byj7, byj7, false);
-            this.generateBox(bjx, clb, 0, 6, 2, 0, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 5, 2, 0, 5, 4, byj8, byj8, false);
-            this.generateBox(bjx, clb, 6, 6, 2, 6, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 6, 5, 2, 6, 5, 4, byj8, byj8, false);
-            for (int integer9 = 0; integer9 <= 6; ++integer9) {
-                for (int integer10 = 0; integer10 <= 6; ++integer10) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 6, 1, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 6, 7, 6, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 1, 6, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 6, 1, 6, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 2, 0, 6, 6, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 2, 6, 6, 6, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 0, 6, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 5, 0, 6, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 6, 2, 0, 6, 6, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 6, 2, 5, 6, 6, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            final BlockState cfj9 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            this.generateBox(bqu, ctd, 2, 6, 0, 4, 6, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 5, 0, 4, 5, 0, cfj9, cfj9, false);
+            this.generateBox(bqu, ctd, 2, 6, 6, 4, 6, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 5, 6, 4, 5, 6, cfj9, cfj9, false);
+            this.generateBox(bqu, ctd, 0, 6, 2, 0, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 5, 2, 0, 5, 4, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 6, 6, 2, 6, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 6, 5, 2, 6, 5, 4, cfj10, cfj10, false);
+            for (int integer11 = 0; integer11 <= 6; ++integer11) {
+                for (int integer12 = 0; integer12 <= 6; ++integer12) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, -1, integer12, ctd);
                 }
             }
             return true;
@@ -527,55 +529,55 @@ public class NetherBridgePieces {
     }
     
     public static class StairsRoom extends NetherBridgePiece {
-        public StairsRoom(final int integer, final BoundingBox clb, final Direction fp) {
+        public StairsRoom(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_STAIRS_ROOM, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public StairsRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_STAIRS_ROOM, jt);
+        public StairsRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_STAIRS_ROOM, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildRight((StartPiece)clu, list, random, 6, 2, false);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildRight((StartPiece)cty, list, random, 6, 2, false);
         }
         
-        public static StairsRoom createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final int integer5, final Direction fp) {
-            final BoundingBox clb7 = BoundingBox.orientBox(integer2, integer3, integer4, -2, 0, 0, 7, 11, 7, fp);
-            if (!NetherBridgePiece.isOkBox(clb7) || StructurePiece.findCollisionPiece(list, clb7) != null) {
+        public static StairsRoom createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final int integer5, final Direction fz) {
+            final BoundingBox ctd7 = BoundingBox.orientBox(integer2, integer3, integer4, -2, 0, 0, 7, 11, 7, fz);
+            if (!NetherBridgePiece.isOkBox(ctd7) || StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return new StairsRoom(integer5, clb7, fp);
+            return new StairsRoom(integer5, ctd7, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 6, 1, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 6, 10, 6, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 1, 8, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 2, 0, 6, 8, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 1, 0, 8, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 6, 2, 1, 6, 8, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 2, 6, 5, 8, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            final BlockState byj7 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            this.generateBox(bjx, clb, 0, 3, 2, 0, 5, 4, byj8, byj8, false);
-            this.generateBox(bjx, clb, 6, 3, 2, 6, 5, 2, byj8, byj8, false);
-            this.generateBox(bjx, clb, 6, 3, 4, 6, 5, 4, byj8, byj8, false);
-            this.placeBlock(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), 5, 2, 5, clb);
-            this.generateBox(bjx, clb, 4, 2, 5, 4, 3, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 3, 2, 5, 3, 4, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 2, 5, 2, 5, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 2, 5, 1, 6, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 7, 1, 5, 7, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 6, 8, 2, 6, 8, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 6, 0, 4, 8, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 5, 0, 4, 5, 0, byj7, byj7, false);
-            for (int integer9 = 0; integer9 <= 6; ++integer9) {
-                for (int integer10 = 0; integer10 <= 6; ++integer10) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 6, 1, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 6, 10, 6, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 1, 8, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 2, 0, 6, 8, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 1, 0, 8, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 6, 2, 1, 6, 8, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 2, 6, 5, 8, 6, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            final BlockState cfj9 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            this.generateBox(bqu, ctd, 0, 3, 2, 0, 5, 4, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 6, 3, 2, 6, 5, 2, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 6, 3, 4, 6, 5, 4, cfj10, cfj10, false);
+            this.placeBlock(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), 5, 2, 5, ctd);
+            this.generateBox(bqu, ctd, 4, 2, 5, 4, 3, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 3, 2, 5, 3, 4, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 2, 5, 2, 5, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 2, 5, 1, 6, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 7, 1, 5, 7, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 6, 8, 2, 6, 8, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 6, 0, 4, 8, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 5, 0, 4, 5, 0, cfj9, cfj9, false);
+            for (int integer11 = 0; integer11 <= 6; ++integer11) {
+                for (int integer12 = 0; integer12 <= 6; ++integer12) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, -1, integer12, ctd);
                 }
             }
             return true;
@@ -585,76 +587,76 @@ public class NetherBridgePieces {
     public static class MonsterThrone extends NetherBridgePiece {
         private boolean hasPlacedSpawner;
         
-        public MonsterThrone(final int integer, final BoundingBox clb, final Direction fp) {
+        public MonsterThrone(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_MONSTER_THRONE, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public MonsterThrone(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_MONSTER_THRONE, jt);
-            this.hasPlacedSpawner = jt.getBoolean("Mob");
+        public MonsterThrone(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_MONSTER_THRONE, le);
+            this.hasPlacedSpawner = le.getBoolean("Mob");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("Mob", this.hasPlacedSpawner);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("Mob", this.hasPlacedSpawner);
         }
         
-        public static MonsterThrone createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final int integer5, final Direction fp) {
-            final BoundingBox clb7 = BoundingBox.orientBox(integer2, integer3, integer4, -2, 0, 0, 7, 8, 9, fp);
-            if (!NetherBridgePiece.isOkBox(clb7) || StructurePiece.findCollisionPiece(list, clb7) != null) {
+        public static MonsterThrone createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final int integer5, final Direction fz) {
+            final BoundingBox ctd7 = BoundingBox.orientBox(integer2, integer3, integer4, -2, 0, 0, 7, 8, 9, fz);
+            if (!NetherBridgePiece.isOkBox(ctd7) || StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return new MonsterThrone(integer5, clb7, fp);
+            return new MonsterThrone(integer5, ctd7, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 2, 0, 6, 7, 7, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 0, 0, 5, 1, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 2, 1, 5, 2, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 3, 2, 5, 3, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 4, 3, 5, 4, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 2, 0, 1, 4, 2, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 2, 0, 5, 4, 2, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 5, 2, 1, 5, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 5, 2, 5, 5, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 5, 3, 0, 5, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 6, 5, 3, 6, 5, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 5, 8, 5, 5, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            final BlockState byj7 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 1, 6, 3, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 5, 6, 3, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.NORTH, true), 0, 6, 3, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.NORTH, true), 6, 6, 3, clb);
-            this.generateBox(bjx, clb, 0, 6, 4, 0, 6, 7, byj8, byj8, false);
-            this.generateBox(bjx, clb, 6, 6, 4, 6, 6, 7, byj8, byj8, false);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 0, 6, 8, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 6, 6, 8, clb);
-            this.generateBox(bjx, clb, 1, 6, 8, 5, 6, 8, byj7, byj7, false);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 1, 7, 8, clb);
-            this.generateBox(bjx, clb, 2, 7, 8, 4, 7, 8, byj7, byj7, false);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 5, 7, 8, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 2, 8, 8, clb);
-            this.placeBlock(bjx, byj7, 3, 8, 8, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 4, 8, 8, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 2, 0, 6, 7, 7, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 0, 0, 5, 1, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 2, 1, 5, 2, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 3, 2, 5, 3, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 4, 3, 5, 4, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 2, 0, 1, 4, 2, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 2, 0, 5, 4, 2, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 5, 2, 1, 5, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 5, 2, 5, 5, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 5, 3, 0, 5, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 6, 5, 3, 6, 5, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 5, 8, 5, 5, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            final BlockState cfj9 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 1, 6, 3, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 5, 6, 3, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.NORTH, true), 0, 6, 3, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.NORTH, true), 6, 6, 3, ctd);
+            this.generateBox(bqu, ctd, 0, 6, 4, 0, 6, 7, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 6, 6, 4, 6, 6, 7, cfj10, cfj10, false);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 0, 6, 8, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 6, 6, 8, ctd);
+            this.generateBox(bqu, ctd, 1, 6, 8, 5, 6, 8, cfj9, cfj9, false);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 1, 7, 8, ctd);
+            this.generateBox(bqu, ctd, 2, 7, 8, 4, 7, 8, cfj9, cfj9, false);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 5, 7, 8, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 2, 8, 8, ctd);
+            this.placeBlock(bqu, cfj9, 3, 8, 8, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 4, 8, 8, ctd);
             if (!this.hasPlacedSpawner) {
-                final BlockPos fk9 = new BlockPos(this.getWorldX(3, 5), this.getWorldY(5), this.getWorldZ(3, 5));
-                if (clb.isInside(fk9)) {
+                final BlockPos fu2 = new BlockPos(this.getWorldX(3, 5), this.getWorldY(5), this.getWorldZ(3, 5));
+                if (ctd.isInside(fu2)) {
                     this.hasPlacedSpawner = true;
-                    bjx.setBlock(fk9, Blocks.SPAWNER.defaultBlockState(), 2);
-                    final BlockEntity bwl10 = bjx.getBlockEntity(fk9);
-                    if (bwl10 instanceof SpawnerBlockEntity) {
-                        ((SpawnerBlockEntity)bwl10).getSpawner().setEntityId(EntityType.BLAZE);
+                    bqu.setBlock(fu2, Blocks.SPAWNER.defaultBlockState(), 2);
+                    final BlockEntity cdl12 = bqu.getBlockEntity(fu2);
+                    if (cdl12 instanceof SpawnerBlockEntity) {
+                        ((SpawnerBlockEntity)cdl12).getSpawner().setEntityId(EntityType.BLAZE);
                     }
                 }
             }
-            for (int integer9 = 0; integer9 <= 6; ++integer9) {
-                for (int integer10 = 0; integer10 <= 6; ++integer10) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, clb);
+            for (int integer11 = 0; integer11 <= 6; ++integer11) {
+                for (int integer12 = 0; integer12 <= 6; ++integer12) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, -1, integer12, ctd);
                 }
             }
             return true;
@@ -662,223 +664,223 @@ public class NetherBridgePieces {
     }
     
     public static class CastleEntrance extends NetherBridgePiece {
-        public CastleEntrance(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public CastleEntrance(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_CASTLE_ENTRANCE, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public CastleEntrance(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_CASTLE_ENTRANCE, jt);
+        public CastleEntrance(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_CASTLE_ENTRANCE, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildForward((StartPiece)clu, list, random, 5, 3, true);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildForward((StartPiece)cty, list, random, 5, 3, true);
         }
         
-        public static CastleEntrance createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -5, -3, 0, 13, 14, 13, fp);
-            if (!NetherBridgePiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static CastleEntrance createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -5, -3, 0, 13, 14, 13, fz);
+            if (!NetherBridgePiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new CastleEntrance(integer7, random, clb8, fp);
+            return new CastleEntrance(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 3, 0, 12, 4, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 5, 0, 12, 13, 12, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 5, 0, 1, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 11, 5, 0, 12, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 5, 11, 4, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 8, 5, 11, 10, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 9, 11, 7, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 5, 0, 4, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 8, 5, 0, 10, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 9, 0, 7, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 11, 2, 10, 12, 10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 8, 0, 7, 8, 0, Blocks.NETHER_BRICK_FENCE.defaultBlockState(), Blocks.NETHER_BRICK_FENCE.defaultBlockState(), false);
-            final BlockState byj7 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            for (int integer9 = 1; integer9 <= 11; integer9 += 2) {
-                this.generateBox(bjx, clb, integer9, 10, 0, integer9, 11, 0, byj7, byj7, false);
-                this.generateBox(bjx, clb, integer9, 10, 12, integer9, 11, 12, byj7, byj7, false);
-                this.generateBox(bjx, clb, 0, 10, integer9, 0, 11, integer9, byj8, byj8, false);
-                this.generateBox(bjx, clb, 12, 10, integer9, 12, 11, integer9, byj8, byj8, false);
-                this.placeBlock(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, 13, 0, clb);
-                this.placeBlock(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, 13, 12, clb);
-                this.placeBlock(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), 0, 13, integer9, clb);
-                this.placeBlock(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), 12, 13, integer9, clb);
-                if (integer9 != 11) {
-                    this.placeBlock(bjx, byj7, integer9 + 1, 13, 0, clb);
-                    this.placeBlock(bjx, byj7, integer9 + 1, 13, 12, clb);
-                    this.placeBlock(bjx, byj8, 0, 13, integer9 + 1, clb);
-                    this.placeBlock(bjx, byj8, 12, 13, integer9 + 1, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 3, 0, 12, 4, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 5, 0, 12, 13, 12, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 5, 0, 1, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 11, 5, 0, 12, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 5, 11, 4, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 8, 5, 11, 10, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 9, 11, 7, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 5, 0, 4, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 8, 5, 0, 10, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 9, 0, 7, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 11, 2, 10, 12, 10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 8, 0, 7, 8, 0, Blocks.NETHER_BRICK_FENCE.defaultBlockState(), Blocks.NETHER_BRICK_FENCE.defaultBlockState(), false);
+            final BlockState cfj9 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            for (int integer11 = 1; integer11 <= 11; integer11 += 2) {
+                this.generateBox(bqu, ctd, integer11, 10, 0, integer11, 11, 0, cfj9, cfj9, false);
+                this.generateBox(bqu, ctd, integer11, 10, 12, integer11, 11, 12, cfj9, cfj9, false);
+                this.generateBox(bqu, ctd, 0, 10, integer11, 0, 11, integer11, cfj10, cfj10, false);
+                this.generateBox(bqu, ctd, 12, 10, integer11, 12, 11, integer11, cfj10, cfj10, false);
+                this.placeBlock(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, 13, 0, ctd);
+                this.placeBlock(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, 13, 12, ctd);
+                this.placeBlock(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), 0, 13, integer11, ctd);
+                this.placeBlock(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), 12, 13, integer11, ctd);
+                if (integer11 != 11) {
+                    this.placeBlock(bqu, cfj9, integer11 + 1, 13, 0, ctd);
+                    this.placeBlock(bqu, cfj9, integer11 + 1, 13, 12, ctd);
+                    this.placeBlock(bqu, cfj10, 0, 13, integer11 + 1, ctd);
+                    this.placeBlock(bqu, cfj10, 12, 13, integer11 + 1, ctd);
                 }
             }
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 0, 13, 0, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 0, 13, 12, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 12, 13, 12, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 12, 13, 0, clb);
-            for (int integer9 = 3; integer9 <= 9; integer9 += 2) {
-                this.generateBox(bjx, clb, 1, 7, integer9, 1, 8, integer9, ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), false);
-                this.generateBox(bjx, clb, 11, 7, integer9, 11, 8, integer9, ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), false);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 0, 13, 0, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 0, 13, 12, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 12, 13, 12, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 12, 13, 0, ctd);
+            for (int integer11 = 3; integer11 <= 9; integer11 += 2) {
+                this.generateBox(bqu, ctd, 1, 7, integer11, 1, 8, integer11, ((StateHolder<O, BlockState>)cfj10).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), ((StateHolder<O, BlockState>)cfj10).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), false);
+                this.generateBox(bqu, ctd, 11, 7, integer11, 11, 8, integer11, ((StateHolder<O, BlockState>)cfj10).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), ((StateHolder<O, BlockState>)cfj10).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), false);
             }
-            this.generateBox(bjx, clb, 4, 2, 0, 8, 2, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 4, 12, 2, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 0, 0, 8, 1, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 0, 9, 8, 1, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 0, 4, 3, 1, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 9, 0, 4, 12, 1, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            for (int integer9 = 4; integer9 <= 8; ++integer9) {
-                for (int integer10 = 0; integer10 <= 2; ++integer10) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, clb);
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, 12 - integer10, clb);
+            this.generateBox(bqu, ctd, 4, 2, 0, 8, 2, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 4, 12, 2, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 0, 0, 8, 1, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 0, 9, 8, 1, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 0, 4, 3, 1, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 9, 0, 4, 12, 1, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (int integer11 = 4; integer11 <= 8; ++integer11) {
+                for (int integer12 = 0; integer12 <= 2; ++integer12) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, -1, integer12, ctd);
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, -1, 12 - integer12, ctd);
                 }
             }
-            for (int integer9 = 0; integer9 <= 2; ++integer9) {
-                for (int integer10 = 4; integer10 <= 8; ++integer10) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, clb);
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), 12 - integer9, -1, integer10, clb);
+            for (int integer11 = 0; integer11 <= 2; ++integer11) {
+                for (int integer12 = 4; integer12 <= 8; ++integer12) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, -1, integer12, ctd);
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), 12 - integer11, -1, integer12, ctd);
                 }
             }
-            this.generateBox(bjx, clb, 5, 5, 5, 7, 5, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 6, 1, 6, 6, 4, 6, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.placeBlock(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), 6, 0, 6, clb);
-            this.placeBlock(bjx, Blocks.LAVA.defaultBlockState(), 6, 5, 6, clb);
-            final BlockPos fk9 = new BlockPos(this.getWorldX(6, 6), this.getWorldY(5), this.getWorldZ(6, 6));
-            if (clb.isInside(fk9)) {
-                bjx.getLiquidTicks().scheduleTick(fk9, Fluids.LAVA, 0);
+            this.generateBox(bqu, ctd, 5, 5, 5, 7, 5, 7, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 6, 1, 6, 6, 4, 6, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.placeBlock(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), 6, 0, 6, ctd);
+            this.placeBlock(bqu, Blocks.LAVA.defaultBlockState(), 6, 5, 6, ctd);
+            final BlockPos fu2 = new BlockPos(this.getWorldX(6, 6), this.getWorldY(5), this.getWorldZ(6, 6));
+            if (ctd.isInside(fu2)) {
+                bqu.getLiquidTicks().scheduleTick(fu2, Fluids.LAVA, 0);
             }
             return true;
         }
     }
     
     public static class CastleStalkRoom extends NetherBridgePiece {
-        public CastleStalkRoom(final int integer, final BoundingBox clb, final Direction fp) {
+        public CastleStalkRoom(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_CASTLE_STALK_ROOM, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public CastleStalkRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_CASTLE_STALK_ROOM, jt);
+        public CastleStalkRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_CASTLE_STALK_ROOM, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildForward((StartPiece)clu, list, random, 5, 3, true);
-            this.generateChildForward((StartPiece)clu, list, random, 5, 11, true);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildForward((StartPiece)cty, list, random, 5, 3, true);
+            this.generateChildForward((StartPiece)cty, list, random, 5, 11, true);
         }
         
-        public static CastleStalkRoom createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fp, final int integer6) {
-            final BoundingBox clb7 = BoundingBox.orientBox(integer2, integer3, integer4, -5, -3, 0, 13, 14, 13, fp);
-            if (!NetherBridgePiece.isOkBox(clb7) || StructurePiece.findCollisionPiece(list, clb7) != null) {
+        public static CastleStalkRoom createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fz, final int integer6) {
+            final BoundingBox ctd7 = BoundingBox.orientBox(integer2, integer3, integer4, -5, -3, 0, 13, 14, 13, fz);
+            if (!NetherBridgePiece.isOkBox(ctd7) || StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return new CastleStalkRoom(integer6, clb7, fp);
+            return new CastleStalkRoom(integer6, ctd7, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 3, 0, 12, 4, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 5, 0, 12, 13, 12, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 5, 0, 1, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 11, 5, 0, 12, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 5, 11, 4, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 8, 5, 11, 10, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 9, 11, 7, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 5, 0, 4, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 8, 5, 0, 10, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 9, 0, 7, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 11, 2, 10, 12, 10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            final BlockState byj7 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            final BlockState byj9 = ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true);
-            final BlockState byj10 = ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-            for (int integer11 = 1; integer11 <= 11; integer11 += 2) {
-                this.generateBox(bjx, clb, integer11, 10, 0, integer11, 11, 0, byj7, byj7, false);
-                this.generateBox(bjx, clb, integer11, 10, 12, integer11, 11, 12, byj7, byj7, false);
-                this.generateBox(bjx, clb, 0, 10, integer11, 0, 11, integer11, byj8, byj8, false);
-                this.generateBox(bjx, clb, 12, 10, integer11, 12, 11, integer11, byj8, byj8, false);
-                this.placeBlock(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, 13, 0, clb);
-                this.placeBlock(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, 13, 12, clb);
-                this.placeBlock(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), 0, 13, integer11, clb);
-                this.placeBlock(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), 12, 13, integer11, clb);
-                if (integer11 != 11) {
-                    this.placeBlock(bjx, byj7, integer11 + 1, 13, 0, clb);
-                    this.placeBlock(bjx, byj7, integer11 + 1, 13, 12, clb);
-                    this.placeBlock(bjx, byj8, 0, 13, integer11 + 1, clb);
-                    this.placeBlock(bjx, byj8, 12, 13, integer11 + 1, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 3, 0, 12, 4, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 5, 0, 12, 13, 12, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 5, 0, 1, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 11, 5, 0, 12, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 5, 11, 4, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 8, 5, 11, 10, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 9, 11, 7, 12, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 5, 0, 4, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 8, 5, 0, 10, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 9, 0, 7, 12, 1, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 11, 2, 10, 12, 10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            final BlockState cfj9 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            final BlockState cfj11 = ((StateHolder<O, BlockState>)cfj10).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true);
+            final BlockState cfj12 = ((StateHolder<O, BlockState>)cfj10).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+            for (int integer13 = 1; integer13 <= 11; integer13 += 2) {
+                this.generateBox(bqu, ctd, integer13, 10, 0, integer13, 11, 0, cfj9, cfj9, false);
+                this.generateBox(bqu, ctd, integer13, 10, 12, integer13, 11, 12, cfj9, cfj9, false);
+                this.generateBox(bqu, ctd, 0, 10, integer13, 0, 11, integer13, cfj10, cfj10, false);
+                this.generateBox(bqu, ctd, 12, 10, integer13, 12, 11, integer13, cfj10, cfj10, false);
+                this.placeBlock(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer13, 13, 0, ctd);
+                this.placeBlock(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer13, 13, 12, ctd);
+                this.placeBlock(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), 0, 13, integer13, ctd);
+                this.placeBlock(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), 12, 13, integer13, ctd);
+                if (integer13 != 11) {
+                    this.placeBlock(bqu, cfj9, integer13 + 1, 13, 0, ctd);
+                    this.placeBlock(bqu, cfj9, integer13 + 1, 13, 12, ctd);
+                    this.placeBlock(bqu, cfj10, 0, 13, integer13 + 1, ctd);
+                    this.placeBlock(bqu, cfj10, 12, 13, integer13 + 1, ctd);
                 }
             }
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 0, 13, 0, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 0, 13, 12, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 12, 13, 12, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 12, 13, 0, clb);
-            for (int integer11 = 3; integer11 <= 9; integer11 += 2) {
-                this.generateBox(bjx, clb, 1, 7, integer11, 1, 8, integer11, byj9, byj9, false);
-                this.generateBox(bjx, clb, 11, 7, integer11, 11, 8, integer11, byj10, byj10, false);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 0, 13, 0, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 0, 13, 12, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 12, 13, 12, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 12, 13, 0, ctd);
+            for (int integer13 = 3; integer13 <= 9; integer13 += 2) {
+                this.generateBox(bqu, ctd, 1, 7, integer13, 1, 8, integer13, cfj11, cfj11, false);
+                this.generateBox(bqu, ctd, 11, 7, integer13, 11, 8, integer13, cfj12, cfj12, false);
             }
-            final BlockState byj11 = ((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH);
-            for (int integer12 = 0; integer12 <= 6; ++integer12) {
-                final int integer13 = integer12 + 4;
-                for (int integer14 = 5; integer14 <= 7; ++integer14) {
-                    this.placeBlock(bjx, byj11, integer14, 5 + integer12, integer13, clb);
+            final BlockState cfj13 = ((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH);
+            for (int integer14 = 0; integer14 <= 6; ++integer14) {
+                final int integer15 = integer14 + 4;
+                for (int integer16 = 5; integer16 <= 7; ++integer16) {
+                    this.placeBlock(bqu, cfj13, integer16, 5 + integer14, integer15, ctd);
                 }
-                if (integer13 >= 5 && integer13 <= 8) {
-                    this.generateBox(bjx, clb, 5, 5, integer13, 7, integer12 + 4, integer13, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+                if (integer15 >= 5 && integer15 <= 8) {
+                    this.generateBox(bqu, ctd, 5, 5, integer15, 7, integer14 + 4, integer15, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
                 }
-                else if (integer13 >= 9 && integer13 <= 10) {
-                    this.generateBox(bjx, clb, 5, 8, integer13, 7, integer12 + 4, integer13, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+                else if (integer15 >= 9 && integer15 <= 10) {
+                    this.generateBox(bqu, ctd, 5, 8, integer15, 7, integer14 + 4, integer15, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
                 }
-                if (integer12 >= 1) {
-                    this.generateBox(bjx, clb, 5, 6 + integer12, integer13, 7, 9 + integer12, integer13, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+                if (integer14 >= 1) {
+                    this.generateBox(bqu, ctd, 5, 6 + integer14, integer15, 7, 9 + integer14, integer15, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
                 }
             }
-            for (int integer12 = 5; integer12 <= 7; ++integer12) {
-                this.placeBlock(bjx, byj11, integer12, 12, 11, clb);
+            for (int integer14 = 5; integer14 <= 7; ++integer14) {
+                this.placeBlock(bqu, cfj13, integer14, 12, 11, ctd);
             }
-            this.generateBox(bjx, clb, 5, 6, 7, 5, 7, 7, byj10, byj10, false);
-            this.generateBox(bjx, clb, 7, 6, 7, 7, 7, 7, byj9, byj9, false);
-            this.generateBox(bjx, clb, 5, 13, 12, 7, 13, 12, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 5, 2, 3, 5, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 5, 9, 3, 5, 10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 2, 5, 4, 2, 5, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 9, 5, 2, 10, 5, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 9, 5, 9, 10, 5, 10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 10, 5, 4, 10, 5, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            final BlockState byj12 = ((AbstractStateHolder<O, BlockState>)byj11).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.EAST);
-            final BlockState byj13 = ((AbstractStateHolder<O, BlockState>)byj11).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.WEST);
-            this.placeBlock(bjx, byj13, 4, 5, 2, clb);
-            this.placeBlock(bjx, byj13, 4, 5, 3, clb);
-            this.placeBlock(bjx, byj13, 4, 5, 9, clb);
-            this.placeBlock(bjx, byj13, 4, 5, 10, clb);
-            this.placeBlock(bjx, byj12, 8, 5, 2, clb);
-            this.placeBlock(bjx, byj12, 8, 5, 3, clb);
-            this.placeBlock(bjx, byj12, 8, 5, 9, clb);
-            this.placeBlock(bjx, byj12, 8, 5, 10, clb);
-            this.generateBox(bjx, clb, 3, 4, 4, 4, 4, 8, Blocks.SOUL_SAND.defaultBlockState(), Blocks.SOUL_SAND.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 8, 4, 4, 9, 4, 8, Blocks.SOUL_SAND.defaultBlockState(), Blocks.SOUL_SAND.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 3, 5, 4, 4, 5, 8, Blocks.NETHER_WART.defaultBlockState(), Blocks.NETHER_WART.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 8, 5, 4, 9, 5, 8, Blocks.NETHER_WART.defaultBlockState(), Blocks.NETHER_WART.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 2, 0, 8, 2, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 4, 12, 2, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 0, 0, 8, 1, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 0, 9, 8, 1, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 0, 4, 3, 1, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 9, 0, 4, 12, 1, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            for (int integer14 = 4; integer14 <= 8; ++integer14) {
-                for (int integer15 = 0; integer15 <= 2; ++integer15) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer14, -1, integer15, clb);
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer14, -1, 12 - integer15, clb);
+            this.generateBox(bqu, ctd, 5, 6, 7, 5, 7, 7, cfj12, cfj12, false);
+            this.generateBox(bqu, ctd, 7, 6, 7, 7, 7, 7, cfj11, cfj11, false);
+            this.generateBox(bqu, ctd, 5, 13, 12, 7, 13, 12, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 5, 2, 3, 5, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 5, 9, 3, 5, 10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 2, 5, 4, 2, 5, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 9, 5, 2, 10, 5, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 9, 5, 9, 10, 5, 10, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 10, 5, 4, 10, 5, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            final BlockState cfj14 = ((StateHolder<O, BlockState>)cfj13).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.EAST);
+            final BlockState cfj15 = ((StateHolder<O, BlockState>)cfj13).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.WEST);
+            this.placeBlock(bqu, cfj15, 4, 5, 2, ctd);
+            this.placeBlock(bqu, cfj15, 4, 5, 3, ctd);
+            this.placeBlock(bqu, cfj15, 4, 5, 9, ctd);
+            this.placeBlock(bqu, cfj15, 4, 5, 10, ctd);
+            this.placeBlock(bqu, cfj14, 8, 5, 2, ctd);
+            this.placeBlock(bqu, cfj14, 8, 5, 3, ctd);
+            this.placeBlock(bqu, cfj14, 8, 5, 9, ctd);
+            this.placeBlock(bqu, cfj14, 8, 5, 10, ctd);
+            this.generateBox(bqu, ctd, 3, 4, 4, 4, 4, 8, Blocks.SOUL_SAND.defaultBlockState(), Blocks.SOUL_SAND.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 8, 4, 4, 9, 4, 8, Blocks.SOUL_SAND.defaultBlockState(), Blocks.SOUL_SAND.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 3, 5, 4, 4, 5, 8, Blocks.NETHER_WART.defaultBlockState(), Blocks.NETHER_WART.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 8, 5, 4, 9, 5, 8, Blocks.NETHER_WART.defaultBlockState(), Blocks.NETHER_WART.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 2, 0, 8, 2, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 4, 12, 2, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 0, 0, 8, 1, 3, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 0, 9, 8, 1, 12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 0, 4, 3, 1, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 9, 0, 4, 12, 1, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (int integer16 = 4; integer16 <= 8; ++integer16) {
+                for (int integer17 = 0; integer17 <= 2; ++integer17) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer16, -1, integer17, ctd);
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer16, -1, 12 - integer17, ctd);
                 }
             }
-            for (int integer14 = 0; integer14 <= 2; ++integer14) {
-                for (int integer15 = 4; integer15 <= 8; ++integer15) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer14, -1, integer15, clb);
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), 12 - integer14, -1, integer15, clb);
+            for (int integer16 = 0; integer16 <= 2; ++integer16) {
+                for (int integer17 = 4; integer17 <= 8; ++integer17) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer16, -1, integer17, ctd);
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), 12 - integer16, -1, integer17, ctd);
                 }
             }
             return true;
@@ -886,44 +888,44 @@ public class NetherBridgePieces {
     }
     
     public static class CastleSmallCorridorPiece extends NetherBridgePiece {
-        public CastleSmallCorridorPiece(final int integer, final BoundingBox clb, final Direction fp) {
+        public CastleSmallCorridorPiece(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public CastleSmallCorridorPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR, jt);
+        public CastleSmallCorridorPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildForward((StartPiece)clu, list, random, 1, 0, true);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildForward((StartPiece)cty, list, random, 1, 0, true);
         }
         
-        public static CastleSmallCorridorPiece createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fp, final int integer6) {
-            final BoundingBox clb7 = BoundingBox.orientBox(integer2, integer3, integer4, -1, 0, 0, 5, 7, 5, fp);
-            if (!NetherBridgePiece.isOkBox(clb7) || StructurePiece.findCollisionPiece(list, clb7) != null) {
+        public static CastleSmallCorridorPiece createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fz, final int integer6) {
+            final BoundingBox ctd7 = BoundingBox.orientBox(integer2, integer3, integer4, -1, 0, 0, 5, 7, 5, fz);
+            if (!NetherBridgePiece.isOkBox(ctd7) || StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return new CastleSmallCorridorPiece(integer6, clb7, fp);
+            return new CastleSmallCorridorPiece(integer6, ctd7, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 1, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 4, 5, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            final BlockState byj7 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            this.generateBox(bjx, clb, 0, 2, 0, 0, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 2, 0, 4, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 3, 1, 0, 4, 1, byj7, byj7, false);
-            this.generateBox(bjx, clb, 0, 3, 3, 0, 4, 3, byj7, byj7, false);
-            this.generateBox(bjx, clb, 4, 3, 1, 4, 4, 1, byj7, byj7, false);
-            this.generateBox(bjx, clb, 4, 3, 3, 4, 4, 3, byj7, byj7, false);
-            this.generateBox(bjx, clb, 0, 6, 0, 4, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            for (int integer8 = 0; integer8 <= 4; ++integer8) {
-                for (int integer9 = 0; integer9 <= 4; ++integer9) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer8, -1, integer9, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 1, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 4, 5, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            final BlockState cfj9 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            this.generateBox(bqu, ctd, 0, 2, 0, 0, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 2, 0, 4, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 3, 1, 0, 4, 1, cfj9, cfj9, false);
+            this.generateBox(bqu, ctd, 0, 3, 3, 0, 4, 3, cfj9, cfj9, false);
+            this.generateBox(bqu, ctd, 4, 3, 1, 4, 4, 1, cfj9, cfj9, false);
+            this.generateBox(bqu, ctd, 4, 3, 3, 4, 4, 3, cfj9, cfj9, false);
+            this.generateBox(bqu, ctd, 0, 6, 0, 4, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (int integer10 = 0; integer10 <= 4; ++integer10) {
+                for (int integer11 = 0; integer11 <= 4; ++integer11) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer10, -1, integer11, ctd);
                 }
             }
             return true;
@@ -931,43 +933,43 @@ public class NetherBridgePieces {
     }
     
     public static class CastleSmallCorridorCrossingPiece extends NetherBridgePiece {
-        public CastleSmallCorridorCrossingPiece(final int integer, final BoundingBox clb, final Direction fp) {
+        public CastleSmallCorridorCrossingPiece(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR_CROSSING, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public CastleSmallCorridorCrossingPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR_CROSSING, jt);
+        public CastleSmallCorridorCrossingPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR_CROSSING, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildForward((StartPiece)clu, list, random, 1, 0, true);
-            this.generateChildLeft((StartPiece)clu, list, random, 0, 1, true);
-            this.generateChildRight((StartPiece)clu, list, random, 0, 1, true);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildForward((StartPiece)cty, list, random, 1, 0, true);
+            this.generateChildLeft((StartPiece)cty, list, random, 0, 1, true);
+            this.generateChildRight((StartPiece)cty, list, random, 0, 1, true);
         }
         
-        public static CastleSmallCorridorCrossingPiece createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fp, final int integer6) {
-            final BoundingBox clb7 = BoundingBox.orientBox(integer2, integer3, integer4, -1, 0, 0, 5, 7, 5, fp);
-            if (!NetherBridgePiece.isOkBox(clb7) || StructurePiece.findCollisionPiece(list, clb7) != null) {
+        public static CastleSmallCorridorCrossingPiece createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fz, final int integer6) {
+            final BoundingBox ctd7 = BoundingBox.orientBox(integer2, integer3, integer4, -1, 0, 0, 5, 7, 5, fz);
+            if (!NetherBridgePiece.isOkBox(ctd7) || StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return new CastleSmallCorridorCrossingPiece(integer6, clb7, fp);
+            return new CastleSmallCorridorCrossingPiece(integer6, ctd7, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 1, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 4, 5, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 0, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 2, 0, 4, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 4, 0, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 2, 4, 4, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 6, 0, 4, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            for (int integer7 = 0; integer7 <= 4; ++integer7) {
-                for (int integer8 = 0; integer8 <= 4; ++integer8) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer7, -1, integer8, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 1, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 4, 5, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 0, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 2, 0, 4, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 4, 0, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 2, 4, 4, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 6, 0, 4, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (int integer9 = 0; integer9 <= 4; ++integer9) {
+                for (int integer10 = 0; integer10 <= 4; ++integer10) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, ctd);
                 }
             }
             return true;
@@ -977,58 +979,58 @@ public class NetherBridgePieces {
     public static class CastleSmallCorridorRightTurnPiece extends NetherBridgePiece {
         private boolean isNeedingChest;
         
-        public CastleSmallCorridorRightTurnPiece(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public CastleSmallCorridorRightTurnPiece(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR_RIGHT_TURN, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
             this.isNeedingChest = (random.nextInt(3) == 0);
         }
         
-        public CastleSmallCorridorRightTurnPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR_RIGHT_TURN, jt);
-            this.isNeedingChest = jt.getBoolean("Chest");
+        public CastleSmallCorridorRightTurnPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR_RIGHT_TURN, le);
+            this.isNeedingChest = le.getBoolean("Chest");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("Chest", this.isNeedingChest);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("Chest", this.isNeedingChest);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildRight((StartPiece)clu, list, random, 0, 1, true);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildRight((StartPiece)cty, list, random, 0, 1, true);
         }
         
-        public static CastleSmallCorridorRightTurnPiece createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, 0, 0, 5, 7, 5, fp);
-            if (!NetherBridgePiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static CastleSmallCorridorRightTurnPiece createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, 0, 0, 5, 7, 5, fz);
+            if (!NetherBridgePiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new CastleSmallCorridorRightTurnPiece(integer7, random, clb8, fp);
+            return new CastleSmallCorridorRightTurnPiece(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 1, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 4, 5, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            final BlockState byj7 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            this.generateBox(bjx, clb, 0, 2, 0, 0, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 3, 1, 0, 4, 1, byj8, byj8, false);
-            this.generateBox(bjx, clb, 0, 3, 3, 0, 4, 3, byj8, byj8, false);
-            this.generateBox(bjx, clb, 4, 2, 0, 4, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 2, 4, 4, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 3, 4, 1, 4, 4, byj7, byj7, false);
-            this.generateBox(bjx, clb, 3, 3, 4, 3, 4, 4, byj7, byj7, false);
-            if (this.isNeedingChest && clb.isInside(new BlockPos(this.getWorldX(1, 3), this.getWorldY(2), this.getWorldZ(1, 3)))) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 1, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 4, 5, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            final BlockState cfj9 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            this.generateBox(bqu, ctd, 0, 2, 0, 0, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 3, 1, 0, 4, 1, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 0, 3, 3, 0, 4, 3, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 4, 2, 0, 4, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 2, 4, 4, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 3, 4, 1, 4, 4, cfj9, cfj9, false);
+            this.generateBox(bqu, ctd, 3, 3, 4, 3, 4, 4, cfj9, cfj9, false);
+            if (this.isNeedingChest && ctd.isInside(new BlockPos(this.getWorldX(1, 3), this.getWorldY(2), this.getWorldZ(1, 3)))) {
                 this.isNeedingChest = false;
-                this.createChest(bjx, clb, random, 1, 2, 3, BuiltInLootTables.NETHER_BRIDGE);
+                this.createChest(bqu, ctd, random, 1, 2, 3, BuiltInLootTables.NETHER_BRIDGE);
             }
-            this.generateBox(bjx, clb, 0, 6, 0, 4, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            for (int integer9 = 0; integer9 <= 4; ++integer9) {
-                for (int integer10 = 0; integer10 <= 4; ++integer10) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, clb);
+            this.generateBox(bqu, ctd, 0, 6, 0, 4, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (int integer11 = 0; integer11 <= 4; ++integer11) {
+                for (int integer12 = 0; integer12 <= 4; ++integer12) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, -1, integer12, ctd);
                 }
             }
             return true;
@@ -1038,58 +1040,58 @@ public class NetherBridgePieces {
     public static class CastleSmallCorridorLeftTurnPiece extends NetherBridgePiece {
         private boolean isNeedingChest;
         
-        public CastleSmallCorridorLeftTurnPiece(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public CastleSmallCorridorLeftTurnPiece(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR_LEFT_TURN, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
             this.isNeedingChest = (random.nextInt(3) == 0);
         }
         
-        public CastleSmallCorridorLeftTurnPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR_LEFT_TURN, jt);
-            this.isNeedingChest = jt.getBoolean("Chest");
+        public CastleSmallCorridorLeftTurnPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_CASTLE_SMALL_CORRIDOR_LEFT_TURN, le);
+            this.isNeedingChest = le.getBoolean("Chest");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("Chest", this.isNeedingChest);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("Chest", this.isNeedingChest);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildLeft((StartPiece)clu, list, random, 0, 1, true);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildLeft((StartPiece)cty, list, random, 0, 1, true);
         }
         
-        public static CastleSmallCorridorLeftTurnPiece createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, 0, 0, 5, 7, 5, fp);
-            if (!NetherBridgePiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static CastleSmallCorridorLeftTurnPiece createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, 0, 0, 5, 7, 5, fz);
+            if (!NetherBridgePiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new CastleSmallCorridorLeftTurnPiece(integer7, random, clb8, fp);
+            return new CastleSmallCorridorLeftTurnPiece(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 1, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 4, 5, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            final BlockState byj7 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            this.generateBox(bjx, clb, 4, 2, 0, 4, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 3, 1, 4, 4, 1, byj8, byj8, false);
-            this.generateBox(bjx, clb, 4, 3, 3, 4, 4, 3, byj8, byj8, false);
-            this.generateBox(bjx, clb, 0, 2, 0, 0, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 4, 3, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 3, 4, 1, 4, 4, byj7, byj7, false);
-            this.generateBox(bjx, clb, 3, 3, 4, 3, 4, 4, byj7, byj7, false);
-            if (this.isNeedingChest && clb.isInside(new BlockPos(this.getWorldX(3, 3), this.getWorldY(2), this.getWorldZ(3, 3)))) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 1, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 4, 5, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            final BlockState cfj9 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            this.generateBox(bqu, ctd, 4, 2, 0, 4, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 3, 1, 4, 4, 1, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 4, 3, 3, 4, 4, 3, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 0, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 4, 3, 5, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 3, 4, 1, 4, 4, cfj9, cfj9, false);
+            this.generateBox(bqu, ctd, 3, 3, 4, 3, 4, 4, cfj9, cfj9, false);
+            if (this.isNeedingChest && ctd.isInside(new BlockPos(this.getWorldX(3, 3), this.getWorldY(2), this.getWorldZ(3, 3)))) {
                 this.isNeedingChest = false;
-                this.createChest(bjx, clb, random, 3, 2, 3, BuiltInLootTables.NETHER_BRIDGE);
+                this.createChest(bqu, ctd, random, 3, 2, 3, BuiltInLootTables.NETHER_BRIDGE);
             }
-            this.generateBox(bjx, clb, 0, 6, 0, 4, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            for (int integer9 = 0; integer9 <= 4; ++integer9) {
-                for (int integer10 = 0; integer10 <= 4; ++integer10) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer9, -1, integer10, clb);
+            this.generateBox(bqu, ctd, 0, 6, 0, 4, 6, 4, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            for (int integer11 = 0; integer11 <= 4; ++integer11) {
+                for (int integer12 = 0; integer12 <= 4; ++integer12) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer11, -1, integer12, ctd);
                 }
             }
             return true;
@@ -1097,53 +1099,53 @@ public class NetherBridgePieces {
     }
     
     public static class CastleCorridorStairsPiece extends NetherBridgePiece {
-        public CastleCorridorStairsPiece(final int integer, final BoundingBox clb, final Direction fp) {
+        public CastleCorridorStairsPiece(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_CASTLE_CORRIDOR_STAIRS, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public CastleCorridorStairsPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_CASTLE_CORRIDOR_STAIRS, jt);
+        public CastleCorridorStairsPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_CASTLE_CORRIDOR_STAIRS, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateChildForward((StartPiece)clu, list, random, 1, 0, true);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateChildForward((StartPiece)cty, list, random, 1, 0, true);
         }
         
-        public static CastleCorridorStairsPiece createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fp, final int integer6) {
-            final BoundingBox clb7 = BoundingBox.orientBox(integer2, integer3, integer4, -1, -7, 0, 5, 14, 10, fp);
-            if (!NetherBridgePiece.isOkBox(clb7) || StructurePiece.findCollisionPiece(list, clb7) != null) {
+        public static CastleCorridorStairsPiece createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fz, final int integer6) {
+            final BoundingBox ctd7 = BoundingBox.orientBox(integer2, integer3, integer4, -1, -7, 0, 5, 14, 10, fz);
+            if (!NetherBridgePiece.isOkBox(ctd7) || StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return new CastleCorridorStairsPiece(integer6, clb7, fp);
+            return new CastleCorridorStairsPiece(integer6, ctd7, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            final BlockState byj7 = ((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.SOUTH);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            for (int integer9 = 0; integer9 <= 9; ++integer9) {
-                final int integer10 = Math.max(1, 7 - integer9);
-                final int integer11 = Math.min(Math.max(integer10 + 5, 14 - integer9), 13);
-                final int integer12 = integer9;
-                this.generateBox(bjx, clb, 0, 0, integer12, 4, integer10, integer12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-                this.generateBox(bjx, clb, 1, integer10 + 1, integer12, 3, integer11 - 1, integer12, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-                if (integer9 <= 6) {
-                    this.placeBlock(bjx, byj7, 1, integer10 + 1, integer12, clb);
-                    this.placeBlock(bjx, byj7, 2, integer10 + 1, integer12, clb);
-                    this.placeBlock(bjx, byj7, 3, integer10 + 1, integer12, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            final BlockState cfj9 = ((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.SOUTH);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            for (int integer11 = 0; integer11 <= 9; ++integer11) {
+                final int integer12 = Math.max(1, 7 - integer11);
+                final int integer13 = Math.min(Math.max(integer12 + 5, 14 - integer11), 13);
+                final int integer14 = integer11;
+                this.generateBox(bqu, ctd, 0, 0, integer14, 4, integer12, integer14, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+                this.generateBox(bqu, ctd, 1, integer12 + 1, integer14, 3, integer13 - 1, integer14, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+                if (integer11 <= 6) {
+                    this.placeBlock(bqu, cfj9, 1, integer12 + 1, integer14, ctd);
+                    this.placeBlock(bqu, cfj9, 2, integer12 + 1, integer14, ctd);
+                    this.placeBlock(bqu, cfj9, 3, integer12 + 1, integer14, ctd);
                 }
-                this.generateBox(bjx, clb, 0, integer11, integer12, 4, integer11, integer12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-                this.generateBox(bjx, clb, 0, integer10 + 1, integer12, 0, integer11 - 1, integer12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-                this.generateBox(bjx, clb, 4, integer10 + 1, integer12, 4, integer11 - 1, integer12, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-                if ((integer9 & 0x1) == 0x0) {
-                    this.generateBox(bjx, clb, 0, integer10 + 2, integer12, 0, integer10 + 3, integer12, byj8, byj8, false);
-                    this.generateBox(bjx, clb, 4, integer10 + 2, integer12, 4, integer10 + 3, integer12, byj8, byj8, false);
+                this.generateBox(bqu, ctd, 0, integer13, integer14, 4, integer13, integer14, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+                this.generateBox(bqu, ctd, 0, integer12 + 1, integer14, 0, integer13 - 1, integer14, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+                this.generateBox(bqu, ctd, 4, integer12 + 1, integer14, 4, integer13 - 1, integer14, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+                if ((integer11 & 0x1) == 0x0) {
+                    this.generateBox(bqu, ctd, 0, integer12 + 2, integer14, 0, integer12 + 3, integer14, cfj10, cfj10, false);
+                    this.generateBox(bqu, ctd, 4, integer12 + 2, integer14, 4, integer12 + 3, integer14, cfj10, cfj10, false);
                 }
-                for (int integer13 = 0; integer13 <= 4; ++integer13) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer13, -1, integer12, clb);
+                for (int integer15 = 0; integer15 <= 4; ++integer15) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer15, -1, integer14, ctd);
                 }
             }
             return true;
@@ -1151,63 +1153,63 @@ public class NetherBridgePieces {
     }
     
     public static class CastleCorridorTBalconyPiece extends NetherBridgePiece {
-        public CastleCorridorTBalconyPiece(final int integer, final BoundingBox clb, final Direction fp) {
+        public CastleCorridorTBalconyPiece(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.NETHER_FORTRESS_CASTLE_CORRIDOR_T_BALCONY, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public CastleCorridorTBalconyPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.NETHER_FORTRESS_CASTLE_CORRIDOR_T_BALCONY, jt);
+        public CastleCorridorTBalconyPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FORTRESS_CASTLE_CORRIDOR_T_BALCONY, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
             int integer5 = 1;
-            final Direction fp6 = this.getOrientation();
-            if (fp6 == Direction.WEST || fp6 == Direction.NORTH) {
+            final Direction fz6 = this.getOrientation();
+            if (fz6 == Direction.WEST || fz6 == Direction.NORTH) {
                 integer5 = 5;
             }
-            this.generateChildLeft((StartPiece)clu, list, random, 0, integer5, random.nextInt(8) > 0);
-            this.generateChildRight((StartPiece)clu, list, random, 0, integer5, random.nextInt(8) > 0);
+            this.generateChildLeft((StartPiece)cty, list, random, 0, integer5, random.nextInt(8) > 0);
+            this.generateChildRight((StartPiece)cty, list, random, 0, integer5, random.nextInt(8) > 0);
         }
         
-        public static CastleCorridorTBalconyPiece createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fp, final int integer6) {
-            final BoundingBox clb7 = BoundingBox.orientBox(integer2, integer3, integer4, -3, 0, 0, 9, 7, 9, fp);
-            if (!NetherBridgePiece.isOkBox(clb7) || StructurePiece.findCollisionPiece(list, clb7) != null) {
+        public static CastleCorridorTBalconyPiece createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fz, final int integer6) {
+            final BoundingBox ctd7 = BoundingBox.orientBox(integer2, integer3, integer4, -3, 0, 0, 9, 7, 9, fz);
+            if (!NetherBridgePiece.isOkBox(ctd7) || StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return new CastleCorridorTBalconyPiece(integer6, clb7, fp);
+            return new CastleCorridorTBalconyPiece(integer6, ctd7, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            final BlockState byj7 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-            this.generateBox(bjx, clb, 0, 0, 0, 8, 1, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 8, 5, 8, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 6, 0, 8, 6, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 0, 2, 0, 2, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 6, 2, 0, 8, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 3, 0, 1, 4, 0, byj8, byj8, false);
-            this.generateBox(bjx, clb, 7, 3, 0, 7, 4, 0, byj8, byj8, false);
-            this.generateBox(bjx, clb, 0, 2, 4, 8, 2, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 1, 4, 2, 2, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 6, 1, 4, 7, 2, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 3, 8, 7, 3, 8, byj8, byj8, false);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 0, 3, 8, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 8, 3, 8, clb);
-            this.generateBox(bjx, clb, 0, 3, 6, 0, 3, 7, byj7, byj7, false);
-            this.generateBox(bjx, clb, 8, 3, 6, 8, 3, 7, byj7, byj7, false);
-            this.generateBox(bjx, clb, 0, 3, 4, 0, 5, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 8, 3, 4, 8, 5, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 3, 5, 2, 5, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 6, 3, 5, 7, 5, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 4, 5, 1, 5, 5, byj8, byj8, false);
-            this.generateBox(bjx, clb, 7, 4, 5, 7, 5, 5, byj8, byj8, false);
-            for (int integer9 = 0; integer9 <= 5; ++integer9) {
-                for (int integer10 = 0; integer10 <= 8; ++integer10) {
-                    this.fillColumnDown(bjx, Blocks.NETHER_BRICKS.defaultBlockState(), integer10, -1, integer9, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            final BlockState cfj9 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+            this.generateBox(bqu, ctd, 0, 0, 0, 8, 1, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 8, 5, 8, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 6, 0, 8, 6, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 2, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 6, 2, 0, 8, 5, 0, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 3, 0, 1, 4, 0, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 7, 3, 0, 7, 4, 0, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 0, 2, 4, 8, 2, 8, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 1, 4, 2, 2, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 6, 1, 4, 7, 2, 4, Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 3, 8, 7, 3, 8, cfj10, cfj10, false);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 0, 3, 8, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.NETHER_BRICK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 8, 3, 8, ctd);
+            this.generateBox(bqu, ctd, 0, 3, 6, 0, 3, 7, cfj9, cfj9, false);
+            this.generateBox(bqu, ctd, 8, 3, 6, 8, 3, 7, cfj9, cfj9, false);
+            this.generateBox(bqu, ctd, 0, 3, 4, 0, 5, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 8, 3, 4, 8, 5, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 3, 5, 2, 5, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 6, 3, 5, 7, 5, 5, Blocks.NETHER_BRICKS.defaultBlockState(), Blocks.NETHER_BRICKS.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 4, 5, 1, 5, 5, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 7, 4, 5, 7, 5, 5, cfj10, cfj10, false);
+            for (int integer11 = 0; integer11 <= 5; ++integer11) {
+                for (int integer12 = 0; integer12 <= 8; ++integer12) {
+                    this.fillColumnDown(bqu, Blocks.NETHER_BRICKS.defaultBlockState(), integer12, -1, integer11, ctd);
                 }
             }
             return true;
diff --git a/src/net/minecraft/world/level/levelgen/structure/NetherFossilFeature.java b/src/net/minecraft/world/level/levelgen/structure/NetherFossilFeature.java
new file mode 100644
index 0000000..32fe4b7
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/NetherFossilFeature.java
@@ -0,0 +1,63 @@
+package net.minecraft.world.level.levelgen.structure;
+
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.BlockGetter;
+import java.util.Random;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.core.Direction;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+
+public class NetherFossilFeature extends StructureFeature<NoneFeatureConfiguration> {
+    public NetherFossilFeature(final Codec<NoneFeatureConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public StructureStartFactory<NoneFeatureConfiguration> getStartFactory() {
+        return FeatureStart::new;
+    }
+    
+    public static class FeatureStart extends BeardedStructureStart<NoneFeatureConfiguration> {
+        public FeatureStart(final StructureFeature<NoneFeatureConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
+        }
+        
+        @Override
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final NoneFeatureConfiguration coa) {
+            final ChunkPos bph8 = new ChunkPos(integer3, integer4);
+            final int integer5 = bph8.getMinBlockX() + this.random.nextInt(16);
+            final int integer6 = bph8.getMinBlockZ() + this.random.nextInt(16);
+            final int integer7 = cha.getSeaLevel();
+            int integer8 = integer7 + this.random.nextInt(cha.getGenDepth() - 2 - integer7);
+            final BlockGetter bpg13 = cha.getBaseColumn(integer5, integer6);
+            final BlockPos.MutableBlockPos a14 = new BlockPos.MutableBlockPos(integer5, integer8, integer6);
+            while (integer8 > integer7) {
+                final BlockState cfj15 = bpg13.getBlockState(a14);
+                a14.move(Direction.DOWN);
+                final BlockState cfj16 = bpg13.getBlockState(a14);
+                if (cfj15.isAir()) {
+                    if (cfj16.is(Blocks.SOUL_SAND)) {
+                        break;
+                    }
+                    if (cfj16.isFaceSturdy(bpg13, a14, Direction.UP)) {
+                        break;
+                    }
+                }
+                --integer8;
+            }
+            if (integer8 <= integer7) {
+                return;
+            }
+            NetherFossilPieces.addPieces(cva, this.pieces, this.random, new BlockPos(integer5, integer8, integer6));
+            this.calculateBoundingBox();
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/NetherFossilPieces.java b/src/net/minecraft/world/level/levelgen/structure/NetherFossilPieces.java
new file mode 100644
index 0000000..e7a0774
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/NetherFossilPieces.java
@@ -0,0 +1,77 @@
+package net.minecraft.world.level.levelgen.structure;
+
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.levelgen.feature.StructurePieceType;
+import net.minecraft.Util;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.core.BlockPos;
+import java.util.Random;
+import java.util.List;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.resources.ResourceLocation;
+
+public class NetherFossilPieces {
+    private static final ResourceLocation[] FOSSILS;
+    
+    public static void addPieces(final StructureManager cva, final List<StructurePiece> list, final Random random, final BlockPos fu) {
+        final Rotation cap5 = Rotation.getRandom(random);
+        list.add(new NetherFossilPiece(cva, Util.<ResourceLocation>getRandom(NetherFossilPieces.FOSSILS, random), fu, cap5));
+    }
+    
+    static {
+        FOSSILS = new ResourceLocation[] { new ResourceLocation("nether_fossils/fossil_1"), new ResourceLocation("nether_fossils/fossil_2"), new ResourceLocation("nether_fossils/fossil_3"), new ResourceLocation("nether_fossils/fossil_4"), new ResourceLocation("nether_fossils/fossil_5"), new ResourceLocation("nether_fossils/fossil_6"), new ResourceLocation("nether_fossils/fossil_7"), new ResourceLocation("nether_fossils/fossil_8"), new ResourceLocation("nether_fossils/fossil_9"), new ResourceLocation("nether_fossils/fossil_10"), new ResourceLocation("nether_fossils/fossil_11"), new ResourceLocation("nether_fossils/fossil_12"), new ResourceLocation("nether_fossils/fossil_13"), new ResourceLocation("nether_fossils/fossil_14") };
+    }
+    
+    public static class NetherFossilPiece extends TemplateStructurePiece {
+        private final ResourceLocation templateLocation;
+        private final Rotation rotation;
+        
+        public NetherFossilPiece(final StructureManager cva, final ResourceLocation uh, final BlockPos fu, final Rotation cap) {
+            super(StructurePieceType.NETHER_FOSSIL, 0);
+            this.templateLocation = uh;
+            this.templatePosition = fu;
+            this.rotation = cap;
+            this.loadTemplate(cva);
+        }
+        
+        public NetherFossilPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.NETHER_FOSSIL, le);
+            this.templateLocation = new ResourceLocation(le.getString("Template"));
+            this.rotation = Rotation.valueOf(le.getString("Rot"));
+            this.loadTemplate(cva);
+        }
+        
+        private void loadTemplate(final StructureManager cva) {
+            final StructureTemplate cve3 = cva.getOrCreate(this.templateLocation);
+            final StructurePlaceSettings cvb4 = new StructurePlaceSettings().setRotation(this.rotation).setMirror(Mirror.NONE).addProcessor(BlockIgnoreProcessor.STRUCTURE_AND_AIR);
+            this.setup(cve3, this.templatePosition, cvb4);
+        }
+        
+        @Override
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putString("Template", this.templateLocation.toString());
+            le.putString("Rot", this.rotation.name());
+        }
+        
+        @Override
+        protected void handleDataMarker(final String string, final BlockPos fu, final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
+        }
+        
+        @Override
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            ctd.expand(this.template.getBoundingBox(this.placeSettings, this.templatePosition));
+            return super.postProcess(bqu, bqq, cha, random, ctd, bph, fu);
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/OceanMonumentPieces.java b/src/net/minecraft/world/level/levelgen/structure/OceanMonumentPieces.java
index 296401f..e09da34 100644
--- a/src/net/minecraft/world/level/levelgen/structure/OceanMonumentPieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/OceanMonumentPieces.java
@@ -2,6 +2,8 @@ package net.minecraft.world.level.levelgen.structure;
 
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import java.util.Collections;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import java.util.Iterator;
@@ -9,9 +11,9 @@ import com.google.common.collect.Lists;
 import java.util.Random;
 import java.util.List;
 import com.google.common.collect.ImmutableSet;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.monster.ElderGuardian;
 import net.minecraft.core.Vec3i;
@@ -45,31 +47,31 @@ public class OceanMonumentPieces {
             return integer2 * 25 + integer3 * 5 + integer1;
         }
         
-        public OceanMonumentPiece(final StructurePieceType cfm, final int integer) {
-            super(cfm, integer);
+        public OceanMonumentPiece(final StructurePieceType cmm, final int integer) {
+            super(cmm, integer);
         }
         
-        public OceanMonumentPiece(final StructurePieceType cfm, final Direction fp, final BoundingBox clb) {
-            super(cfm, 1);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+        public OceanMonumentPiece(final StructurePieceType cmm, final Direction fz, final BoundingBox ctd) {
+            super(cmm, 1);
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        protected OceanMonumentPiece(final StructurePieceType cfm, final int integer2, final Direction fp, final RoomDefinition v, final int integer5, final int integer6, final int integer7) {
-            super(cfm, integer2);
-            this.setOrientation(fp);
+        protected OceanMonumentPiece(final StructurePieceType cmm, final int integer2, final Direction fz, final RoomDefinition v, final int integer5, final int integer6, final int integer7) {
+            super(cmm, integer2);
+            this.setOrientation(fz);
             this.roomDefinition = v;
             final int integer8 = v.index;
             final int integer9 = integer8 % 5;
             final int integer10 = integer8 / 5 % 5;
             final int integer11 = integer8 / 25;
-            if (fp == Direction.NORTH || fp == Direction.SOUTH) {
+            if (fz == Direction.NORTH || fz == Direction.SOUTH) {
                 this.boundingBox = new BoundingBox(0, 0, 0, integer5 * 8 - 1, integer6 * 4 - 1, integer7 * 8 - 1);
             }
             else {
                 this.boundingBox = new BoundingBox(0, 0, 0, integer7 * 8 - 1, integer6 * 4 - 1, integer5 * 8 - 1);
             }
-            switch (fp) {
+            switch (fz) {
                 case NORTH: {
                     this.boundingBox.move(integer9 * 8, integer11 * 4, -(integer10 + integer7) * 8 + 1);
                     break;
@@ -89,25 +91,25 @@ public class OceanMonumentPieces {
             }
         }
         
-        public OceanMonumentPiece(final StructurePieceType cfm, final CompoundTag jt) {
-            super(cfm, jt);
+        public OceanMonumentPiece(final StructurePieceType cmm, final CompoundTag le) {
+            super(cmm, le);
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
+        protected void addAdditionalSaveData(final CompoundTag le) {
         }
         
-        protected void generateWaterBox(final LevelAccessor bjx, final BoundingBox clb, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
+        protected void generateWaterBox(final LevelAccessor bqc, final BoundingBox ctd, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
             for (int integer9 = integer4; integer9 <= integer7; ++integer9) {
                 for (int integer10 = integer3; integer10 <= integer6; ++integer10) {
                     for (int integer11 = integer5; integer11 <= integer8; ++integer11) {
-                        final BlockState byj13 = this.getBlock(bjx, integer10, integer9, integer11, clb);
-                        if (!OceanMonumentPiece.FILL_KEEP.contains(byj13.getBlock())) {
-                            if (this.getWorldY(integer9) >= bjx.getSeaLevel() && byj13 != OceanMonumentPiece.FILL_BLOCK) {
-                                this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), integer10, integer9, integer11, clb);
+                        final BlockState cfj13 = this.getBlock(bqc, integer10, integer9, integer11, ctd);
+                        if (!OceanMonumentPiece.FILL_KEEP.contains(cfj13.getBlock())) {
+                            if (this.getWorldY(integer9) >= bqc.getSeaLevel() && cfj13 != OceanMonumentPiece.FILL_BLOCK) {
+                                this.placeBlock(bqc, Blocks.AIR.defaultBlockState(), integer10, integer9, integer11, ctd);
                             }
                             else {
-                                this.placeBlock(bjx, OceanMonumentPiece.FILL_BLOCK, integer10, integer9, integer11, clb);
+                                this.placeBlock(bqc, OceanMonumentPiece.FILL_BLOCK, integer10, integer9, integer11, ctd);
                             }
                         }
                     }
@@ -115,52 +117,52 @@ public class OceanMonumentPieces {
             }
         }
         
-        protected void generateDefaultFloor(final LevelAccessor bjx, final BoundingBox clb, final int integer3, final int integer4, final boolean boolean5) {
+        protected void generateDefaultFloor(final LevelAccessor bqc, final BoundingBox ctd, final int integer3, final int integer4, final boolean boolean5) {
             if (boolean5) {
-                this.generateBox(bjx, clb, integer3 + 0, 0, integer4 + 0, integer3 + 2, 0, integer4 + 8 - 1, OceanMonumentPiece.BASE_GRAY, OceanMonumentPiece.BASE_GRAY, false);
-                this.generateBox(bjx, clb, integer3 + 5, 0, integer4 + 0, integer3 + 8 - 1, 0, integer4 + 8 - 1, OceanMonumentPiece.BASE_GRAY, OceanMonumentPiece.BASE_GRAY, false);
-                this.generateBox(bjx, clb, integer3 + 3, 0, integer4 + 0, integer3 + 4, 0, integer4 + 2, OceanMonumentPiece.BASE_GRAY, OceanMonumentPiece.BASE_GRAY, false);
-                this.generateBox(bjx, clb, integer3 + 3, 0, integer4 + 5, integer3 + 4, 0, integer4 + 8 - 1, OceanMonumentPiece.BASE_GRAY, OceanMonumentPiece.BASE_GRAY, false);
-                this.generateBox(bjx, clb, integer3 + 3, 0, integer4 + 2, integer3 + 4, 0, integer4 + 2, OceanMonumentPiece.BASE_LIGHT, OceanMonumentPiece.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, integer3 + 3, 0, integer4 + 5, integer3 + 4, 0, integer4 + 5, OceanMonumentPiece.BASE_LIGHT, OceanMonumentPiece.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, integer3 + 2, 0, integer4 + 3, integer3 + 2, 0, integer4 + 4, OceanMonumentPiece.BASE_LIGHT, OceanMonumentPiece.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, integer3 + 5, 0, integer4 + 3, integer3 + 5, 0, integer4 + 4, OceanMonumentPiece.BASE_LIGHT, OceanMonumentPiece.BASE_LIGHT, false);
+                this.generateBox(bqc, ctd, integer3 + 0, 0, integer4 + 0, integer3 + 2, 0, integer4 + 8 - 1, OceanMonumentPiece.BASE_GRAY, OceanMonumentPiece.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, integer3 + 5, 0, integer4 + 0, integer3 + 8 - 1, 0, integer4 + 8 - 1, OceanMonumentPiece.BASE_GRAY, OceanMonumentPiece.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, integer3 + 3, 0, integer4 + 0, integer3 + 4, 0, integer4 + 2, OceanMonumentPiece.BASE_GRAY, OceanMonumentPiece.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, integer3 + 3, 0, integer4 + 5, integer3 + 4, 0, integer4 + 8 - 1, OceanMonumentPiece.BASE_GRAY, OceanMonumentPiece.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, integer3 + 3, 0, integer4 + 2, integer3 + 4, 0, integer4 + 2, OceanMonumentPiece.BASE_LIGHT, OceanMonumentPiece.BASE_LIGHT, false);
+                this.generateBox(bqc, ctd, integer3 + 3, 0, integer4 + 5, integer3 + 4, 0, integer4 + 5, OceanMonumentPiece.BASE_LIGHT, OceanMonumentPiece.BASE_LIGHT, false);
+                this.generateBox(bqc, ctd, integer3 + 2, 0, integer4 + 3, integer3 + 2, 0, integer4 + 4, OceanMonumentPiece.BASE_LIGHT, OceanMonumentPiece.BASE_LIGHT, false);
+                this.generateBox(bqc, ctd, integer3 + 5, 0, integer4 + 3, integer3 + 5, 0, integer4 + 4, OceanMonumentPiece.BASE_LIGHT, OceanMonumentPiece.BASE_LIGHT, false);
             }
             else {
-                this.generateBox(bjx, clb, integer3 + 0, 0, integer4 + 0, integer3 + 8 - 1, 0, integer4 + 8 - 1, OceanMonumentPiece.BASE_GRAY, OceanMonumentPiece.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, integer3 + 0, 0, integer4 + 0, integer3 + 8 - 1, 0, integer4 + 8 - 1, OceanMonumentPiece.BASE_GRAY, OceanMonumentPiece.BASE_GRAY, false);
             }
         }
         
-        protected void generateBoxOnFillOnly(final LevelAccessor bjx, final BoundingBox clb, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BlockState byj) {
+        protected void generateBoxOnFillOnly(final LevelAccessor bqc, final BoundingBox ctd, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BlockState cfj) {
             for (int integer9 = integer4; integer9 <= integer7; ++integer9) {
                 for (int integer10 = integer3; integer10 <= integer6; ++integer10) {
                     for (int integer11 = integer5; integer11 <= integer8; ++integer11) {
-                        if (this.getBlock(bjx, integer10, integer9, integer11, clb) == OceanMonumentPiece.FILL_BLOCK) {
-                            this.placeBlock(bjx, byj, integer10, integer9, integer11, clb);
+                        if (this.getBlock(bqc, integer10, integer9, integer11, ctd) == OceanMonumentPiece.FILL_BLOCK) {
+                            this.placeBlock(bqc, cfj, integer10, integer9, integer11, ctd);
                         }
                     }
                 }
             }
         }
         
-        protected boolean chunkIntersects(final BoundingBox clb, final int integer2, final int integer3, final int integer4, final int integer5) {
+        protected boolean chunkIntersects(final BoundingBox ctd, final int integer2, final int integer3, final int integer4, final int integer5) {
             final int integer6 = this.getWorldX(integer2, integer3);
             final int integer7 = this.getWorldZ(integer2, integer3);
             final int integer8 = this.getWorldX(integer4, integer5);
             final int integer9 = this.getWorldZ(integer4, integer5);
-            return clb.intersects(Math.min(integer6, integer8), Math.min(integer7, integer9), Math.max(integer6, integer8), Math.max(integer7, integer9));
+            return ctd.intersects(Math.min(integer6, integer8), Math.min(integer7, integer9), Math.max(integer6, integer8), Math.max(integer7, integer9));
         }
         
-        protected boolean spawnElder(final LevelAccessor bjx, final BoundingBox clb, final int integer3, final int integer4, final int integer5) {
+        protected boolean spawnElder(final LevelAccessor bqc, final BoundingBox ctd, final int integer3, final int integer4, final int integer5) {
             final int integer6 = this.getWorldX(integer3, integer5);
             final int integer7 = this.getWorldY(integer4);
             final int integer8 = this.getWorldZ(integer3, integer5);
-            if (clb.isInside(new BlockPos(integer6, integer7, integer8))) {
-                final ElderGuardian awl10 = EntityType.ELDER_GUARDIAN.create(bjx.getLevel());
-                awl10.heal(awl10.getMaxHealth());
-                awl10.moveTo(integer6 + 0.5, integer7, integer8 + 0.5, 0.0f, 0.0f);
-                awl10.finalizeSpawn(bjx, bjx.getCurrentDifficultyAt(new BlockPos(awl10)), MobSpawnType.STRUCTURE, null, null);
-                bjx.addFreshEntity(awl10);
+            if (ctd.isInside(new BlockPos(integer6, integer7, integer8))) {
+                final ElderGuardian bbq10 = EntityType.ELDER_GUARDIAN.create(bqc.getLevel());
+                bbq10.heal(bbq10.getMaxHealth());
+                bbq10.moveTo(integer6 + 0.5, integer7, integer8 + 0.5, 0.0f, 0.0f);
+                bbq10.finalizeSpawn(bqc, bqc.getCurrentDifficultyAt(bbq10.blockPosition()), MobSpawnType.STRUCTURE, null, null);
+                bqc.addFreshEntity(bbq10);
                 return true;
             }
             return false;
@@ -186,12 +188,12 @@ public class OceanMonumentPieces {
         private RoomDefinition coreRoom;
         private final List<OceanMonumentPiece> childPieces;
         
-        public MonumentBuilding(final Random random, final int integer2, final int integer3, final Direction fp) {
+        public MonumentBuilding(final Random random, final int integer2, final int integer3, final Direction fz) {
             super(StructurePieceType.OCEAN_MONUMENT_BUILDING, 0);
             this.childPieces = Lists.newArrayList();
-            this.setOrientation(fp);
-            final Direction fp2 = this.getOrientation();
-            if (fp2.getAxis() == Direction.Axis.Z) {
+            this.setOrientation(fz);
+            final Direction fz2 = this.getOrientation();
+            if (fz2.getAxis() == Direction.Axis.Z) {
                 this.boundingBox = new BoundingBox(integer2, 39, integer3, integer2 + 58 - 1, 61, integer3 + 58 - 1);
             }
             else {
@@ -199,8 +201,8 @@ public class OceanMonumentPieces {
             }
             final List<RoomDefinition> list7 = this.generateRoomGraph(random);
             this.sourceRoom.claimed = true;
-            this.childPieces.add(new OceanMonumentEntryRoom(fp2, this.sourceRoom));
-            this.childPieces.add(new OceanMonumentCoreRoom(fp2, this.coreRoom));
+            this.childPieces.add(new OceanMonumentEntryRoom(fz2, this.sourceRoom));
+            this.childPieces.add(new OceanMonumentCoreRoom(fz2, this.coreRoom));
             final List<MonumentRoomFitter> list8 = Lists.newArrayList();
             list8.add(new FitDoubleXYRoom());
             list8.add(new FitDoubleYZRoom());
@@ -213,7 +215,7 @@ public class OceanMonumentPieces {
                 if (!v10.claimed && !v10.isSpecial()) {
                     for (final MonumentRoomFitter i12 : list8) {
                         if (i12.fits(v10)) {
-                            this.childPieces.add(i12.create(fp2, v10, random));
+                            this.childPieces.add(i12.create(fz2, v10, random));
                             break;
                         }
                     }
@@ -225,17 +227,17 @@ public class OceanMonumentPieces {
             for (final OceanMonumentPiece r13 : this.childPieces) {
                 r13.getBoundingBox().move(integer5, integer4, integer6);
             }
-            final BoundingBox clb12 = BoundingBox.createProper(this.getWorldX(1, 1), this.getWorldY(1), this.getWorldZ(1, 1), this.getWorldX(23, 21), this.getWorldY(8), this.getWorldZ(23, 21));
-            final BoundingBox clb13 = BoundingBox.createProper(this.getWorldX(34, 1), this.getWorldY(1), this.getWorldZ(34, 1), this.getWorldX(56, 21), this.getWorldY(8), this.getWorldZ(56, 21));
-            final BoundingBox clb14 = BoundingBox.createProper(this.getWorldX(22, 22), this.getWorldY(13), this.getWorldZ(22, 22), this.getWorldX(35, 35), this.getWorldY(17), this.getWorldZ(35, 35));
+            final BoundingBox ctd12 = BoundingBox.createProper(this.getWorldX(1, 1), this.getWorldY(1), this.getWorldZ(1, 1), this.getWorldX(23, 21), this.getWorldY(8), this.getWorldZ(23, 21));
+            final BoundingBox ctd13 = BoundingBox.createProper(this.getWorldX(34, 1), this.getWorldY(1), this.getWorldZ(34, 1), this.getWorldX(56, 21), this.getWorldY(8), this.getWorldZ(56, 21));
+            final BoundingBox ctd14 = BoundingBox.createProper(this.getWorldX(22, 22), this.getWorldY(13), this.getWorldZ(22, 22), this.getWorldX(35, 35), this.getWorldY(17), this.getWorldZ(35, 35));
             int integer7 = random.nextInt();
-            this.childPieces.add(new OceanMonumentWingRoom(fp2, clb12, integer7++));
-            this.childPieces.add(new OceanMonumentWingRoom(fp2, clb13, integer7++));
-            this.childPieces.add(new OceanMonumentPenthouse(fp2, clb14));
+            this.childPieces.add(new OceanMonumentWingRoom(fz2, ctd12, integer7++));
+            this.childPieces.add(new OceanMonumentWingRoom(fz2, ctd13, integer7++));
+            this.childPieces.add(new OceanMonumentPenthouse(fz2, ctd14));
         }
         
-        public MonumentBuilding(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_BUILDING, jt);
+        public MonumentBuilding(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_BUILDING, le);
             this.childPieces = Lists.newArrayList();
         }
         
@@ -268,18 +270,18 @@ public class OceanMonumentPieces {
                     for (int integer6 = 0; integer6 < 3; ++integer6) {
                         final int integer7 = OceanMonumentPiece.getRoomIndex(integer4, integer6, integer5);
                         if (arr3[integer7] != null) {
-                            for (final Direction fp11 : Direction.values()) {
-                                final int integer8 = integer4 + fp11.getStepX();
-                                final int integer9 = integer6 + fp11.getStepY();
-                                final int integer10 = integer5 + fp11.getStepZ();
+                            for (final Direction fz11 : Direction.values()) {
+                                final int integer8 = integer4 + fz11.getStepX();
+                                final int integer9 = integer6 + fz11.getStepY();
+                                final int integer10 = integer5 + fz11.getStepZ();
                                 if (integer8 >= 0 && integer8 < 5 && integer10 >= 0 && integer10 < 5 && integer9 >= 0 && integer9 < 3) {
                                     final int integer11 = OceanMonumentPiece.getRoomIndex(integer8, integer9, integer10);
                                     if (arr3[integer11] != null) {
                                         if (integer10 == integer5) {
-                                            arr3[integer7].setConnection(fp11, arr3[integer11]);
+                                            arr3[integer7].setConnection(fz11, arr3[integer11]);
                                         }
                                         else {
-                                            arr3[integer7].setConnection(fp11.getOpposite(), arr3[integer11]);
+                                            arr3[integer7].setConnection(fz11.getOpposite(), arr3[integer11]);
                                         }
                                     }
                                 }
@@ -343,356 +345,356 @@ public class OceanMonumentPieces {
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            final int integer7 = Math.max(bjx.getSeaLevel(), 64) - this.boundingBox.y0;
-            this.generateWaterBox(bjx, clb, 0, 0, 0, 58, integer7, 58);
-            this.generateWing(false, 0, bjx, random, clb);
-            this.generateWing(true, 33, bjx, random, clb);
-            this.generateEntranceArchs(bjx, random, clb);
-            this.generateEntranceWall(bjx, random, clb);
-            this.generateRoofPiece(bjx, random, clb);
-            this.generateLowerWall(bjx, random, clb);
-            this.generateMiddleWall(bjx, random, clb);
-            this.generateUpperWall(bjx, random, clb);
-            for (int integer8 = 0; integer8 < 7; ++integer8) {
-                int integer9 = 0;
-                while (integer9 < 7) {
-                    if (integer9 == 0 && integer8 == 3) {
-                        integer9 = 6;
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            final int integer9 = Math.max(bqu.getSeaLevel(), 64) - this.boundingBox.y0;
+            this.generateWaterBox(bqu, ctd, 0, 0, 0, 58, integer9, 58);
+            this.generateWing(false, 0, bqu, random, ctd);
+            this.generateWing(true, 33, bqu, random, ctd);
+            this.generateEntranceArchs(bqu, random, ctd);
+            this.generateEntranceWall(bqu, random, ctd);
+            this.generateRoofPiece(bqu, random, ctd);
+            this.generateLowerWall(bqu, random, ctd);
+            this.generateMiddleWall(bqu, random, ctd);
+            this.generateUpperWall(bqu, random, ctd);
+            for (int integer10 = 0; integer10 < 7; ++integer10) {
+                int integer11 = 0;
+                while (integer11 < 7) {
+                    if (integer11 == 0 && integer10 == 3) {
+                        integer11 = 6;
                     }
-                    final int integer10 = integer8 * 9;
-                    final int integer11 = integer9 * 9;
-                    for (int integer12 = 0; integer12 < 4; ++integer12) {
-                        for (int integer13 = 0; integer13 < 4; ++integer13) {
-                            this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, integer10 + integer12, 0, integer11 + integer13, clb);
-                            this.fillColumnDown(bjx, MonumentBuilding.BASE_LIGHT, integer10 + integer12, -1, integer11 + integer13, clb);
+                    final int integer12 = integer10 * 9;
+                    final int integer13 = integer11 * 9;
+                    for (int integer14 = 0; integer14 < 4; ++integer14) {
+                        for (int integer15 = 0; integer15 < 4; ++integer15) {
+                            this.placeBlock(bqu, MonumentBuilding.BASE_LIGHT, integer12 + integer14, 0, integer13 + integer15, ctd);
+                            this.fillColumnDown(bqu, MonumentBuilding.BASE_LIGHT, integer12 + integer14, -1, integer13 + integer15, ctd);
                         }
                     }
-                    if (integer8 == 0 || integer8 == 6) {
-                        ++integer9;
+                    if (integer10 == 0 || integer10 == 6) {
+                        ++integer11;
                     }
                     else {
-                        integer9 += 6;
+                        integer11 += 6;
                     }
                 }
             }
-            for (int integer8 = 0; integer8 < 5; ++integer8) {
-                this.generateWaterBox(bjx, clb, -1 - integer8, 0 + integer8 * 2, -1 - integer8, -1 - integer8, 23, 58 + integer8);
-                this.generateWaterBox(bjx, clb, 58 + integer8, 0 + integer8 * 2, -1 - integer8, 58 + integer8, 23, 58 + integer8);
-                this.generateWaterBox(bjx, clb, 0 - integer8, 0 + integer8 * 2, -1 - integer8, 57 + integer8, 23, -1 - integer8);
-                this.generateWaterBox(bjx, clb, 0 - integer8, 0 + integer8 * 2, 58 + integer8, 57 + integer8, 23, 58 + integer8);
+            for (int integer10 = 0; integer10 < 5; ++integer10) {
+                this.generateWaterBox(bqu, ctd, -1 - integer10, 0 + integer10 * 2, -1 - integer10, -1 - integer10, 23, 58 + integer10);
+                this.generateWaterBox(bqu, ctd, 58 + integer10, 0 + integer10 * 2, -1 - integer10, 58 + integer10, 23, 58 + integer10);
+                this.generateWaterBox(bqu, ctd, 0 - integer10, 0 + integer10 * 2, -1 - integer10, 57 + integer10, 23, -1 - integer10);
+                this.generateWaterBox(bqu, ctd, 0 - integer10, 0 + integer10 * 2, 58 + integer10, 57 + integer10, 23, 58 + integer10);
             }
-            for (final OceanMonumentPiece r9 : this.childPieces) {
-                if (r9.getBoundingBox().intersects(clb)) {
-                    r9.postProcess(bjx, caa, random, clb, bjh);
+            for (final OceanMonumentPiece r11 : this.childPieces) {
+                if (r11.getBoundingBox().intersects(ctd)) {
+                    r11.postProcess(bqu, bqq, cha, random, ctd, bph, fu);
                 }
             }
             return true;
         }
         
-        private void generateWing(final boolean boolean1, final int integer, final LevelAccessor bjx, final Random random, final BoundingBox clb) {
+        private void generateWing(final boolean boolean1, final int integer, final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
             final int integer2 = 24;
-            if (this.chunkIntersects(clb, integer, 0, integer + 23, 20)) {
-                this.generateBox(bjx, clb, integer + 0, 0, 0, integer + 24, 0, 20, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, integer + 0, 1, 0, integer + 24, 10, 20);
+            if (this.chunkIntersects(ctd, integer, 0, integer + 23, 20)) {
+                this.generateBox(bqc, ctd, integer + 0, 0, 0, integer + 24, 0, 20, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, integer + 0, 1, 0, integer + 24, 10, 20);
                 for (int integer3 = 0; integer3 < 4; ++integer3) {
-                    this.generateBox(bjx, clb, integer + integer3, integer3 + 1, integer3, integer + integer3, integer3 + 1, 20, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer + integer3 + 7, integer3 + 5, integer3 + 7, integer + integer3 + 7, integer3 + 5, 20, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer + 17 - integer3, integer3 + 5, integer3 + 7, integer + 17 - integer3, integer3 + 5, 20, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer + 24 - integer3, integer3 + 1, integer3, integer + 24 - integer3, integer3 + 1, 20, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer + integer3 + 1, integer3 + 1, integer3, integer + 23 - integer3, integer3 + 1, integer3, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer + integer3 + 8, integer3 + 5, integer3 + 7, integer + 16 - integer3, integer3 + 5, integer3 + 7, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer + integer3, integer3 + 1, integer3, integer + integer3, integer3 + 1, 20, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer + integer3 + 7, integer3 + 5, integer3 + 7, integer + integer3 + 7, integer3 + 5, 20, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer + 17 - integer3, integer3 + 5, integer3 + 7, integer + 17 - integer3, integer3 + 5, 20, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer + 24 - integer3, integer3 + 1, integer3, integer + 24 - integer3, integer3 + 1, 20, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer + integer3 + 1, integer3 + 1, integer3, integer + 23 - integer3, integer3 + 1, integer3, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer + integer3 + 8, integer3 + 5, integer3 + 7, integer + 16 - integer3, integer3 + 5, integer3 + 7, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
-                this.generateBox(bjx, clb, integer + 4, 4, 4, integer + 6, 4, 20, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, integer + 7, 4, 4, integer + 17, 4, 6, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, integer + 18, 4, 4, integer + 20, 4, 20, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, integer + 11, 8, 11, integer + 13, 8, 20, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer + 12, 9, 12, clb);
-                this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer + 12, 9, 15, clb);
-                this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer + 12, 9, 18, clb);
+                this.generateBox(bqc, ctd, integer + 4, 4, 4, integer + 6, 4, 20, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, integer + 7, 4, 4, integer + 17, 4, 6, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, integer + 18, 4, 4, integer + 20, 4, 20, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, integer + 11, 8, 11, integer + 13, 8, 20, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer + 12, 9, 12, ctd);
+                this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer + 12, 9, 15, ctd);
+                this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer + 12, 9, 18, ctd);
                 int integer3 = integer + (boolean1 ? 19 : 5);
                 final int integer4 = integer + (boolean1 ? 5 : 19);
                 for (int integer5 = 20; integer5 >= 5; integer5 -= 3) {
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer3, 5, integer5, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer3, 5, integer5, ctd);
                 }
                 for (int integer5 = 19; integer5 >= 7; integer5 -= 3) {
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer4, 5, integer5, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer4, 5, integer5, ctd);
                 }
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
                     final int integer6 = boolean1 ? (integer + 24 - (17 - integer5 * 3)) : (integer + 17 - integer5 * 3);
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer6, 5, 5, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer6, 5, 5, ctd);
                 }
-                this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer4, 5, 5, clb);
-                this.generateBox(bjx, clb, integer + 11, 1, 12, integer + 13, 7, 12, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, integer + 12, 1, 11, integer + 12, 7, 13, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer4, 5, 5, ctd);
+                this.generateBox(bqc, ctd, integer + 11, 1, 12, integer + 13, 7, 12, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, integer + 12, 1, 11, integer + 12, 7, 13, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
             }
         }
         
-        private void generateEntranceArchs(final LevelAccessor bjx, final Random random, final BoundingBox clb) {
-            if (this.chunkIntersects(clb, 22, 5, 35, 17)) {
-                this.generateWaterBox(bjx, clb, 25, 0, 0, 32, 8, 20);
+        private void generateEntranceArchs(final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
+            if (this.chunkIntersects(ctd, 22, 5, 35, 17)) {
+                this.generateWaterBox(bqc, ctd, 25, 0, 0, 32, 8, 20);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, 24, 2, 5 + integer5 * 4, 24, 4, 5 + integer5 * 4, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 22, 4, 5 + integer5 * 4, 23, 4, 5 + integer5 * 4, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 25, 5, 5 + integer5 * 4, clb);
-                    this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 26, 6, 5 + integer5 * 4, clb);
-                    this.placeBlock(bjx, MonumentBuilding.LAMP_BLOCK, 26, 5, 5 + integer5 * 4, clb);
-                    this.generateBox(bjx, clb, 33, 2, 5 + integer5 * 4, 33, 4, 5 + integer5 * 4, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 34, 4, 5 + integer5 * 4, 35, 4, 5 + integer5 * 4, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 32, 5, 5 + integer5 * 4, clb);
-                    this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 31, 6, 5 + integer5 * 4, clb);
-                    this.placeBlock(bjx, MonumentBuilding.LAMP_BLOCK, 31, 5, 5 + integer5 * 4, clb);
-                    this.generateBox(bjx, clb, 27, 6, 5 + integer5 * 4, 30, 6, 5 + integer5 * 4, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                    this.generateBox(bqc, ctd, 24, 2, 5 + integer5 * 4, 24, 4, 5 + integer5 * 4, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, 22, 4, 5 + integer5 * 4, 23, 4, 5 + integer5 * 4, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 25, 5, 5 + integer5 * 4, ctd);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 26, 6, 5 + integer5 * 4, ctd);
+                    this.placeBlock(bqc, MonumentBuilding.LAMP_BLOCK, 26, 5, 5 + integer5 * 4, ctd);
+                    this.generateBox(bqc, ctd, 33, 2, 5 + integer5 * 4, 33, 4, 5 + integer5 * 4, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, 34, 4, 5 + integer5 * 4, 35, 4, 5 + integer5 * 4, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 32, 5, 5 + integer5 * 4, ctd);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 31, 6, 5 + integer5 * 4, ctd);
+                    this.placeBlock(bqc, MonumentBuilding.LAMP_BLOCK, 31, 5, 5 + integer5 * 4, ctd);
+                    this.generateBox(bqc, ctd, 27, 6, 5 + integer5 * 4, 30, 6, 5 + integer5 * 4, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
                 }
             }
         }
         
-        private void generateEntranceWall(final LevelAccessor bjx, final Random random, final BoundingBox clb) {
-            if (this.chunkIntersects(clb, 15, 20, 42, 21)) {
-                this.generateBox(bjx, clb, 15, 0, 21, 42, 0, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 26, 1, 21, 31, 3, 21);
-                this.generateBox(bjx, clb, 21, 12, 21, 36, 12, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 17, 11, 21, 40, 11, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 16, 10, 21, 41, 10, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 15, 7, 21, 42, 9, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 16, 6, 21, 41, 6, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 17, 5, 21, 40, 5, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 21, 4, 21, 36, 4, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 22, 3, 21, 26, 3, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 31, 3, 21, 35, 3, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 23, 2, 21, 25, 2, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 32, 2, 21, 34, 2, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 28, 4, 20, 29, 4, 21, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 27, 3, 21, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 30, 3, 21, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 26, 2, 21, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 31, 2, 21, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 25, 1, 21, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 32, 1, 21, clb);
+        private void generateEntranceWall(final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
+            if (this.chunkIntersects(ctd, 15, 20, 42, 21)) {
+                this.generateBox(bqc, ctd, 15, 0, 21, 42, 0, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 26, 1, 21, 31, 3, 21);
+                this.generateBox(bqc, ctd, 21, 12, 21, 36, 12, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 17, 11, 21, 40, 11, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 16, 10, 21, 41, 10, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 15, 7, 21, 42, 9, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 16, 6, 21, 41, 6, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 17, 5, 21, 40, 5, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 21, 4, 21, 36, 4, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 22, 3, 21, 26, 3, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 31, 3, 21, 35, 3, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 23, 2, 21, 25, 2, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 32, 2, 21, 34, 2, 21, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 28, 4, 20, 29, 4, 21, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 27, 3, 21, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 30, 3, 21, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 26, 2, 21, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 31, 2, 21, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 25, 1, 21, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 32, 1, 21, ctd);
                 for (int integer5 = 0; integer5 < 7; ++integer5) {
-                    this.placeBlock(bjx, MonumentBuilding.BASE_BLACK, 28 - integer5, 6 + integer5, 21, clb);
-                    this.placeBlock(bjx, MonumentBuilding.BASE_BLACK, 29 + integer5, 6 + integer5, 21, clb);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_BLACK, 28 - integer5, 6 + integer5, 21, ctd);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_BLACK, 29 + integer5, 6 + integer5, 21, ctd);
                 }
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.placeBlock(bjx, MonumentBuilding.BASE_BLACK, 28 - integer5, 9 + integer5, 21, clb);
-                    this.placeBlock(bjx, MonumentBuilding.BASE_BLACK, 29 + integer5, 9 + integer5, 21, clb);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_BLACK, 28 - integer5, 9 + integer5, 21, ctd);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_BLACK, 29 + integer5, 9 + integer5, 21, ctd);
                 }
-                this.placeBlock(bjx, MonumentBuilding.BASE_BLACK, 28, 12, 21, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_BLACK, 29, 12, 21, clb);
+                this.placeBlock(bqc, MonumentBuilding.BASE_BLACK, 28, 12, 21, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_BLACK, 29, 12, 21, ctd);
                 for (int integer5 = 0; integer5 < 3; ++integer5) {
-                    this.placeBlock(bjx, MonumentBuilding.BASE_BLACK, 22 - integer5 * 2, 8, 21, clb);
-                    this.placeBlock(bjx, MonumentBuilding.BASE_BLACK, 22 - integer5 * 2, 9, 21, clb);
-                    this.placeBlock(bjx, MonumentBuilding.BASE_BLACK, 35 + integer5 * 2, 8, 21, clb);
-                    this.placeBlock(bjx, MonumentBuilding.BASE_BLACK, 35 + integer5 * 2, 9, 21, clb);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_BLACK, 22 - integer5 * 2, 8, 21, ctd);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_BLACK, 22 - integer5 * 2, 9, 21, ctd);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_BLACK, 35 + integer5 * 2, 8, 21, ctd);
+                    this.placeBlock(bqc, MonumentBuilding.BASE_BLACK, 35 + integer5 * 2, 9, 21, ctd);
                 }
-                this.generateWaterBox(bjx, clb, 15, 13, 21, 42, 15, 21);
-                this.generateWaterBox(bjx, clb, 15, 1, 21, 15, 6, 21);
-                this.generateWaterBox(bjx, clb, 16, 1, 21, 16, 5, 21);
-                this.generateWaterBox(bjx, clb, 17, 1, 21, 20, 4, 21);
-                this.generateWaterBox(bjx, clb, 21, 1, 21, 21, 3, 21);
-                this.generateWaterBox(bjx, clb, 22, 1, 21, 22, 2, 21);
-                this.generateWaterBox(bjx, clb, 23, 1, 21, 24, 1, 21);
-                this.generateWaterBox(bjx, clb, 42, 1, 21, 42, 6, 21);
-                this.generateWaterBox(bjx, clb, 41, 1, 21, 41, 5, 21);
-                this.generateWaterBox(bjx, clb, 37, 1, 21, 40, 4, 21);
-                this.generateWaterBox(bjx, clb, 36, 1, 21, 36, 3, 21);
-                this.generateWaterBox(bjx, clb, 33, 1, 21, 34, 1, 21);
-                this.generateWaterBox(bjx, clb, 35, 1, 21, 35, 2, 21);
+                this.generateWaterBox(bqc, ctd, 15, 13, 21, 42, 15, 21);
+                this.generateWaterBox(bqc, ctd, 15, 1, 21, 15, 6, 21);
+                this.generateWaterBox(bqc, ctd, 16, 1, 21, 16, 5, 21);
+                this.generateWaterBox(bqc, ctd, 17, 1, 21, 20, 4, 21);
+                this.generateWaterBox(bqc, ctd, 21, 1, 21, 21, 3, 21);
+                this.generateWaterBox(bqc, ctd, 22, 1, 21, 22, 2, 21);
+                this.generateWaterBox(bqc, ctd, 23, 1, 21, 24, 1, 21);
+                this.generateWaterBox(bqc, ctd, 42, 1, 21, 42, 6, 21);
+                this.generateWaterBox(bqc, ctd, 41, 1, 21, 41, 5, 21);
+                this.generateWaterBox(bqc, ctd, 37, 1, 21, 40, 4, 21);
+                this.generateWaterBox(bqc, ctd, 36, 1, 21, 36, 3, 21);
+                this.generateWaterBox(bqc, ctd, 33, 1, 21, 34, 1, 21);
+                this.generateWaterBox(bqc, ctd, 35, 1, 21, 35, 2, 21);
             }
         }
         
-        private void generateRoofPiece(final LevelAccessor bjx, final Random random, final BoundingBox clb) {
-            if (this.chunkIntersects(clb, 21, 21, 36, 36)) {
-                this.generateBox(bjx, clb, 21, 0, 22, 36, 0, 36, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 21, 1, 22, 36, 23, 36);
+        private void generateRoofPiece(final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
+            if (this.chunkIntersects(ctd, 21, 21, 36, 36)) {
+                this.generateBox(bqc, ctd, 21, 0, 22, 36, 0, 36, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 21, 1, 22, 36, 23, 36);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, 21 + integer5, 13 + integer5, 21 + integer5, 36 - integer5, 13 + integer5, 21 + integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 21 + integer5, 13 + integer5, 36 - integer5, 36 - integer5, 13 + integer5, 36 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 21 + integer5, 13 + integer5, 22 + integer5, 21 + integer5, 13 + integer5, 35 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 36 - integer5, 13 + integer5, 22 + integer5, 36 - integer5, 13 + integer5, 35 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, 21 + integer5, 13 + integer5, 21 + integer5, 36 - integer5, 13 + integer5, 21 + integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, 21 + integer5, 13 + integer5, 36 - integer5, 36 - integer5, 13 + integer5, 36 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, 21 + integer5, 13 + integer5, 22 + integer5, 21 + integer5, 13 + integer5, 35 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, 36 - integer5, 13 + integer5, 22 + integer5, 36 - integer5, 13 + integer5, 35 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
-                this.generateBox(bjx, clb, 25, 16, 25, 32, 16, 32, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 25, 17, 25, 25, 19, 25, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 32, 17, 25, 32, 19, 25, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 25, 17, 32, 25, 19, 32, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 32, 17, 32, 32, 19, 32, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 26, 20, 26, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 27, 21, 27, clb);
-                this.placeBlock(bjx, MonumentBuilding.LAMP_BLOCK, 27, 20, 27, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 26, 20, 31, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 27, 21, 30, clb);
-                this.placeBlock(bjx, MonumentBuilding.LAMP_BLOCK, 27, 20, 30, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 31, 20, 31, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 30, 21, 30, clb);
-                this.placeBlock(bjx, MonumentBuilding.LAMP_BLOCK, 30, 20, 30, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 31, 20, 26, clb);
-                this.placeBlock(bjx, MonumentBuilding.BASE_LIGHT, 30, 21, 27, clb);
-                this.placeBlock(bjx, MonumentBuilding.LAMP_BLOCK, 30, 20, 27, clb);
-                this.generateBox(bjx, clb, 28, 21, 27, 29, 21, 27, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 27, 21, 28, 27, 21, 29, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 28, 21, 30, 29, 21, 30, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 30, 21, 28, 30, 21, 29, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 25, 16, 25, 32, 16, 32, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 25, 17, 25, 25, 19, 25, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                this.generateBox(bqc, ctd, 32, 17, 25, 32, 19, 25, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                this.generateBox(bqc, ctd, 25, 17, 32, 25, 19, 32, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                this.generateBox(bqc, ctd, 32, 17, 32, 32, 19, 32, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 26, 20, 26, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 27, 21, 27, ctd);
+                this.placeBlock(bqc, MonumentBuilding.LAMP_BLOCK, 27, 20, 27, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 26, 20, 31, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 27, 21, 30, ctd);
+                this.placeBlock(bqc, MonumentBuilding.LAMP_BLOCK, 27, 20, 30, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 31, 20, 31, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 30, 21, 30, ctd);
+                this.placeBlock(bqc, MonumentBuilding.LAMP_BLOCK, 30, 20, 30, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 31, 20, 26, ctd);
+                this.placeBlock(bqc, MonumentBuilding.BASE_LIGHT, 30, 21, 27, ctd);
+                this.placeBlock(bqc, MonumentBuilding.LAMP_BLOCK, 30, 20, 27, ctd);
+                this.generateBox(bqc, ctd, 28, 21, 27, 29, 21, 27, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 27, 21, 28, 27, 21, 29, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 28, 21, 30, 29, 21, 30, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 30, 21, 28, 30, 21, 29, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
             }
         }
         
-        private void generateLowerWall(final LevelAccessor bjx, final Random random, final BoundingBox clb) {
-            if (this.chunkIntersects(clb, 0, 21, 6, 58)) {
-                this.generateBox(bjx, clb, 0, 0, 21, 6, 0, 57, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 0, 1, 21, 6, 7, 57);
-                this.generateBox(bjx, clb, 4, 4, 21, 6, 4, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+        private void generateLowerWall(final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
+            if (this.chunkIntersects(ctd, 0, 21, 6, 58)) {
+                this.generateBox(bqc, ctd, 0, 0, 21, 6, 0, 57, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 0, 1, 21, 6, 7, 57);
+                this.generateBox(bqc, ctd, 4, 4, 21, 6, 4, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, integer5, integer5 + 1, 21, integer5, integer5 + 1, 57 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer5, integer5 + 1, 21, integer5, integer5 + 1, 57 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
                 for (int integer5 = 23; integer5 < 53; integer5 += 3) {
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, 5, 5, integer5, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, 5, 5, integer5, ctd);
                 }
-                this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, 5, 5, 52, clb);
+                this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, 5, 5, 52, ctd);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, integer5, integer5 + 1, 21, integer5, integer5 + 1, 57 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer5, integer5 + 1, 21, integer5, integer5 + 1, 57 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
-                this.generateBox(bjx, clb, 4, 1, 52, 6, 3, 52, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 5, 1, 51, 5, 3, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 4, 1, 52, 6, 3, 52, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 5, 1, 51, 5, 3, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
             }
-            if (this.chunkIntersects(clb, 51, 21, 58, 58)) {
-                this.generateBox(bjx, clb, 51, 0, 21, 57, 0, 57, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 51, 1, 21, 57, 7, 57);
-                this.generateBox(bjx, clb, 51, 4, 21, 53, 4, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+            if (this.chunkIntersects(ctd, 51, 21, 58, 58)) {
+                this.generateBox(bqc, ctd, 51, 0, 21, 57, 0, 57, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 51, 1, 21, 57, 7, 57);
+                this.generateBox(bqc, ctd, 51, 4, 21, 53, 4, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, 57 - integer5, integer5 + 1, 21, 57 - integer5, integer5 + 1, 57 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, 57 - integer5, integer5 + 1, 21, 57 - integer5, integer5 + 1, 57 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
                 for (int integer5 = 23; integer5 < 53; integer5 += 3) {
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, 52, 5, integer5, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, 52, 5, integer5, ctd);
                 }
-                this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, 52, 5, 52, clb);
-                this.generateBox(bjx, clb, 51, 1, 52, 53, 3, 52, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 52, 1, 51, 52, 3, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, 52, 5, 52, ctd);
+                this.generateBox(bqc, ctd, 51, 1, 52, 53, 3, 52, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 52, 1, 51, 52, 3, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
             }
-            if (this.chunkIntersects(clb, 0, 51, 57, 57)) {
-                this.generateBox(bjx, clb, 7, 0, 51, 50, 0, 57, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 7, 1, 51, 50, 10, 57);
+            if (this.chunkIntersects(ctd, 0, 51, 57, 57)) {
+                this.generateBox(bqc, ctd, 7, 0, 51, 50, 0, 57, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 7, 1, 51, 50, 10, 57);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, integer5 + 1, integer5 + 1, 57 - integer5, 56 - integer5, integer5 + 1, 57 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer5 + 1, integer5 + 1, 57 - integer5, 56 - integer5, integer5 + 1, 57 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
             }
         }
         
-        private void generateMiddleWall(final LevelAccessor bjx, final Random random, final BoundingBox clb) {
-            if (this.chunkIntersects(clb, 7, 21, 13, 50)) {
-                this.generateBox(bjx, clb, 7, 0, 21, 13, 0, 50, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 7, 1, 21, 13, 10, 50);
-                this.generateBox(bjx, clb, 11, 8, 21, 13, 8, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+        private void generateMiddleWall(final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
+            if (this.chunkIntersects(ctd, 7, 21, 13, 50)) {
+                this.generateBox(bqc, ctd, 7, 0, 21, 13, 0, 50, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 7, 1, 21, 13, 10, 50);
+                this.generateBox(bqc, ctd, 11, 8, 21, 13, 8, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, integer5 + 7, integer5 + 5, 21, integer5 + 7, integer5 + 5, 54, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer5 + 7, integer5 + 5, 21, integer5 + 7, integer5 + 5, 54, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
                 for (int integer5 = 21; integer5 <= 45; integer5 += 3) {
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, 12, 9, integer5, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, 12, 9, integer5, ctd);
                 }
             }
-            if (this.chunkIntersects(clb, 44, 21, 50, 54)) {
-                this.generateBox(bjx, clb, 44, 0, 21, 50, 0, 50, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 44, 1, 21, 50, 10, 50);
-                this.generateBox(bjx, clb, 44, 8, 21, 46, 8, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+            if (this.chunkIntersects(ctd, 44, 21, 50, 54)) {
+                this.generateBox(bqc, ctd, 44, 0, 21, 50, 0, 50, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 44, 1, 21, 50, 10, 50);
+                this.generateBox(bqc, ctd, 44, 8, 21, 46, 8, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, 50 - integer5, integer5 + 5, 21, 50 - integer5, integer5 + 5, 54, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, 50 - integer5, integer5 + 5, 21, 50 - integer5, integer5 + 5, 54, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
                 for (int integer5 = 21; integer5 <= 45; integer5 += 3) {
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, 45, 9, integer5, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, 45, 9, integer5, ctd);
                 }
             }
-            if (this.chunkIntersects(clb, 8, 44, 49, 54)) {
-                this.generateBox(bjx, clb, 14, 0, 44, 43, 0, 50, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 14, 1, 44, 43, 10, 50);
+            if (this.chunkIntersects(ctd, 8, 44, 49, 54)) {
+                this.generateBox(bqc, ctd, 14, 0, 44, 43, 0, 50, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 14, 1, 44, 43, 10, 50);
                 for (int integer5 = 12; integer5 <= 45; integer5 += 3) {
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 9, 45, clb);
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 9, 52, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 9, 45, ctd);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 9, 52, ctd);
                     if (integer5 == 12 || integer5 == 18 || integer5 == 24 || integer5 == 33 || integer5 == 39 || integer5 == 45) {
-                        this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 9, 47, clb);
-                        this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 9, 50, clb);
-                        this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 10, 45, clb);
-                        this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 10, 46, clb);
-                        this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 10, 51, clb);
-                        this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 10, 52, clb);
-                        this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 11, 47, clb);
-                        this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 11, 50, clb);
-                        this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 12, 48, clb);
-                        this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 12, 49, clb);
+                        this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 9, 47, ctd);
+                        this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 9, 50, ctd);
+                        this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 10, 45, ctd);
+                        this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 10, 46, ctd);
+                        this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 10, 51, ctd);
+                        this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 10, 52, ctd);
+                        this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 11, 47, ctd);
+                        this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 11, 50, ctd);
+                        this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 12, 48, ctd);
+                        this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 12, 49, ctd);
                     }
                 }
                 for (int integer5 = 0; integer5 < 3; ++integer5) {
-                    this.generateBox(bjx, clb, 8 + integer5, 5 + integer5, 54, 49 - integer5, 5 + integer5, 54, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                    this.generateBox(bqc, ctd, 8 + integer5, 5 + integer5, 54, 49 - integer5, 5 + integer5, 54, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
                 }
-                this.generateBox(bjx, clb, 11, 8, 54, 46, 8, 54, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 14, 8, 44, 43, 8, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 11, 8, 54, 46, 8, 54, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                this.generateBox(bqc, ctd, 14, 8, 44, 43, 8, 53, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
             }
         }
         
-        private void generateUpperWall(final LevelAccessor bjx, final Random random, final BoundingBox clb) {
-            if (this.chunkIntersects(clb, 14, 21, 20, 43)) {
-                this.generateBox(bjx, clb, 14, 0, 21, 20, 0, 43, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 14, 1, 22, 20, 14, 43);
-                this.generateBox(bjx, clb, 18, 12, 22, 20, 12, 39, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 18, 12, 21, 20, 12, 21, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+        private void generateUpperWall(final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
+            if (this.chunkIntersects(ctd, 14, 21, 20, 43)) {
+                this.generateBox(bqc, ctd, 14, 0, 21, 20, 0, 43, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 14, 1, 22, 20, 14, 43);
+                this.generateBox(bqc, ctd, 18, 12, 22, 20, 12, 39, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 18, 12, 21, 20, 12, 21, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, integer5 + 14, integer5 + 9, 21, integer5 + 14, integer5 + 9, 43 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, integer5 + 14, integer5 + 9, 21, integer5 + 14, integer5 + 9, 43 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
                 for (int integer5 = 23; integer5 <= 39; integer5 += 3) {
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, 19, 13, integer5, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, 19, 13, integer5, ctd);
                 }
             }
-            if (this.chunkIntersects(clb, 37, 21, 43, 43)) {
-                this.generateBox(bjx, clb, 37, 0, 21, 43, 0, 43, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 37, 1, 22, 43, 14, 43);
-                this.generateBox(bjx, clb, 37, 12, 22, 39, 12, 39, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 37, 12, 21, 39, 12, 21, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+            if (this.chunkIntersects(ctd, 37, 21, 43, 43)) {
+                this.generateBox(bqc, ctd, 37, 0, 21, 43, 0, 43, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 37, 1, 22, 43, 14, 43);
+                this.generateBox(bqc, ctd, 37, 12, 22, 39, 12, 39, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateBox(bqc, ctd, 37, 12, 21, 39, 12, 21, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, 43 - integer5, integer5 + 9, 21, 43 - integer5, integer5 + 9, 43 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, 43 - integer5, integer5 + 9, 21, 43 - integer5, integer5 + 9, 43 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
                 for (int integer5 = 23; integer5 <= 39; integer5 += 3) {
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, 38, 13, integer5, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, 38, 13, integer5, ctd);
                 }
             }
-            if (this.chunkIntersects(clb, 15, 37, 42, 43)) {
-                this.generateBox(bjx, clb, 21, 0, 37, 36, 0, 43, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
-                this.generateWaterBox(bjx, clb, 21, 1, 37, 36, 14, 43);
-                this.generateBox(bjx, clb, 21, 12, 37, 36, 12, 39, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+            if (this.chunkIntersects(ctd, 15, 37, 42, 43)) {
+                this.generateBox(bqc, ctd, 21, 0, 37, 36, 0, 43, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
+                this.generateWaterBox(bqc, ctd, 21, 1, 37, 36, 14, 43);
+                this.generateBox(bqc, ctd, 21, 12, 37, 36, 12, 39, MonumentBuilding.BASE_GRAY, MonumentBuilding.BASE_GRAY, false);
                 for (int integer5 = 0; integer5 < 4; ++integer5) {
-                    this.generateBox(bjx, clb, 15 + integer5, integer5 + 9, 43 - integer5, 42 - integer5, integer5 + 9, 43 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
+                    this.generateBox(bqc, ctd, 15 + integer5, integer5 + 9, 43 - integer5, 42 - integer5, integer5 + 9, 43 - integer5, MonumentBuilding.BASE_LIGHT, MonumentBuilding.BASE_LIGHT, false);
                 }
                 for (int integer5 = 21; integer5 <= 36; integer5 += 3) {
-                    this.placeBlock(bjx, MonumentBuilding.DOT_DECO_DATA, integer5, 13, 38, clb);
+                    this.placeBlock(bqc, MonumentBuilding.DOT_DECO_DATA, integer5, 13, 38, ctd);
                 }
             }
         }
     }
     
     public static class OceanMonumentEntryRoom extends OceanMonumentPiece {
-        public OceanMonumentEntryRoom(final Direction fp, final RoomDefinition v) {
-            super(StructurePieceType.OCEAN_MONUMENT_ENTRY_ROOM, 1, fp, v, 1, 1, 1);
+        public OceanMonumentEntryRoom(final Direction fz, final RoomDefinition v) {
+            super(StructurePieceType.OCEAN_MONUMENT_ENTRY_ROOM, 1, fz, v, 1, 1, 1);
         }
         
-        public OceanMonumentEntryRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_ENTRY_ROOM, jt);
+        public OceanMonumentEntryRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_ENTRY_ROOM, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 3, 0, 2, 3, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 3, 0, 7, 3, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 0, 2, 0, 1, 2, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, 2, 0, 7, 2, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 0, 1, 0, 0, 1, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 7, 1, 0, 7, 1, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 0, 1, 7, 7, 3, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 1, 0, 2, 3, 0, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 1, 0, 6, 3, 0, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 3, 0, 2, 3, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 3, 0, 7, 3, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 1, 2, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, 2, 0, 7, 2, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 0, 1, 0, 0, 1, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 7, 1, 0, 7, 1, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 0, 1, 7, 7, 3, 7, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 1, 0, 2, 3, 0, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 1, 0, 6, 3, 0, OceanMonumentEntryRoom.BASE_LIGHT, OceanMonumentEntryRoom.BASE_LIGHT, false);
             if (this.roomDefinition.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 1, 7, 4, 2, 7);
+                this.generateWaterBox(bqu, ctd, 3, 1, 7, 4, 2, 7);
             }
             if (this.roomDefinition.hasOpening[Direction.WEST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 0, 1, 3, 1, 2, 4);
+                this.generateWaterBox(bqu, ctd, 0, 1, 3, 1, 2, 4);
             }
             if (this.roomDefinition.hasOpening[Direction.EAST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 6, 1, 3, 7, 2, 4);
+                this.generateWaterBox(bqu, ctd, 6, 1, 3, 7, 2, 4);
             }
             return true;
         }
@@ -701,694 +703,694 @@ public class OceanMonumentPieces {
     public static class OceanMonumentSimpleRoom extends OceanMonumentPiece {
         private int mainDesign;
         
-        public OceanMonumentSimpleRoom(final Direction fp, final RoomDefinition v, final Random random) {
-            super(StructurePieceType.OCEAN_MONUMENT_SIMPLE_ROOM, 1, fp, v, 1, 1, 1);
+        public OceanMonumentSimpleRoom(final Direction fz, final RoomDefinition v, final Random random) {
+            super(StructurePieceType.OCEAN_MONUMENT_SIMPLE_ROOM, 1, fz, v, 1, 1, 1);
             this.mainDesign = random.nextInt(3);
         }
         
-        public OceanMonumentSimpleRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_SIMPLE_ROOM, jt);
+        public OceanMonumentSimpleRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_SIMPLE_ROOM, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
             if (this.roomDefinition.index / 25 > 0) {
-                this.generateDefaultFloor(bjx, clb, 0, 0, this.roomDefinition.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 0, 0, this.roomDefinition.hasOpening[Direction.DOWN.get3DDataValue()]);
             }
             if (this.roomDefinition.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 1, 4, 1, 6, 4, 6, OceanMonumentSimpleRoom.BASE_GRAY);
+                this.generateBoxOnFillOnly(bqu, ctd, 1, 4, 1, 6, 4, 6, OceanMonumentSimpleRoom.BASE_GRAY);
             }
-            final boolean boolean7 = this.mainDesign != 0 && random.nextBoolean() && !this.roomDefinition.hasOpening[Direction.DOWN.get3DDataValue()] && !this.roomDefinition.hasOpening[Direction.UP.get3DDataValue()] && this.roomDefinition.countOpenings() > 1;
+            final boolean boolean9 = this.mainDesign != 0 && random.nextBoolean() && !this.roomDefinition.hasOpening[Direction.DOWN.get3DDataValue()] && !this.roomDefinition.hasOpening[Direction.UP.get3DDataValue()] && this.roomDefinition.countOpenings() > 1;
             if (this.mainDesign == 0) {
-                this.generateBox(bjx, clb, 0, 1, 0, 2, 1, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 0, 3, 0, 2, 3, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 0, 2, 0, 0, 2, 2, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 1, 2, 0, 2, 2, 0, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.LAMP_BLOCK, 1, 2, 1, clb);
-                this.generateBox(bjx, clb, 5, 1, 0, 7, 1, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 5, 3, 0, 7, 3, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 7, 2, 0, 7, 2, 2, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 5, 2, 0, 6, 2, 0, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.LAMP_BLOCK, 6, 2, 1, clb);
-                this.generateBox(bjx, clb, 0, 1, 5, 2, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 0, 3, 5, 2, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 0, 2, 5, 0, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 1, 2, 7, 2, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.LAMP_BLOCK, 1, 2, 6, clb);
-                this.generateBox(bjx, clb, 5, 1, 5, 7, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 5, 3, 5, 7, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 7, 2, 5, 7, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 5, 2, 7, 6, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.LAMP_BLOCK, 6, 2, 6, clb);
+                this.generateBox(bqu, ctd, 0, 1, 0, 2, 1, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 0, 3, 0, 2, 3, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 0, 2, 0, 0, 2, 2, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                this.generateBox(bqu, ctd, 1, 2, 0, 2, 2, 0, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.LAMP_BLOCK, 1, 2, 1, ctd);
+                this.generateBox(bqu, ctd, 5, 1, 0, 7, 1, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 5, 3, 0, 7, 3, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 7, 2, 0, 7, 2, 2, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                this.generateBox(bqu, ctd, 5, 2, 0, 6, 2, 0, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.LAMP_BLOCK, 6, 2, 1, ctd);
+                this.generateBox(bqu, ctd, 0, 1, 5, 2, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 0, 3, 5, 2, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 0, 2, 5, 0, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                this.generateBox(bqu, ctd, 1, 2, 7, 2, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.LAMP_BLOCK, 1, 2, 6, ctd);
+                this.generateBox(bqu, ctd, 5, 1, 5, 7, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 5, 3, 5, 7, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 7, 2, 5, 7, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                this.generateBox(bqu, ctd, 5, 2, 7, 6, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.LAMP_BLOCK, 6, 2, 6, ctd);
                 if (this.roomDefinition.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, 3, 3, 0, 4, 3, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 3, 3, 0, 4, 3, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
                 else {
-                    this.generateBox(bjx, clb, 3, 3, 0, 4, 3, 1, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 3, 2, 0, 4, 2, 0, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                    this.generateBox(bjx, clb, 3, 1, 0, 4, 1, 1, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 3, 3, 0, 4, 3, 1, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 3, 2, 0, 4, 2, 0, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, 3, 1, 0, 4, 1, 1, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
                 if (this.roomDefinition.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, 3, 3, 7, 4, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 3, 3, 7, 4, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
                 else {
-                    this.generateBox(bjx, clb, 3, 3, 6, 4, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 3, 2, 7, 4, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                    this.generateBox(bjx, clb, 3, 1, 6, 4, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 3, 3, 6, 4, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 3, 2, 7, 4, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, 3, 1, 6, 4, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
                 if (this.roomDefinition.hasOpening[Direction.WEST.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, 0, 3, 3, 0, 3, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 0, 3, 3, 0, 3, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
                 else {
-                    this.generateBox(bjx, clb, 0, 3, 3, 1, 3, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 0, 2, 3, 0, 2, 4, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                    this.generateBox(bjx, clb, 0, 1, 3, 1, 1, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 0, 3, 3, 1, 3, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 0, 2, 3, 0, 2, 4, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, 0, 1, 3, 1, 1, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
                 if (this.roomDefinition.hasOpening[Direction.EAST.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, 7, 3, 3, 7, 3, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 7, 3, 3, 7, 3, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
                 else {
-                    this.generateBox(bjx, clb, 6, 3, 3, 7, 3, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 7, 2, 3, 7, 2, 4, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                    this.generateBox(bjx, clb, 6, 1, 3, 7, 1, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 6, 3, 3, 7, 3, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 7, 2, 3, 7, 2, 4, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, 6, 1, 3, 7, 1, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
             }
             else if (this.mainDesign == 1) {
-                this.generateBox(bjx, clb, 2, 1, 2, 2, 3, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 2, 1, 5, 2, 3, 5, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 5, 1, 5, 5, 3, 5, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 5, 1, 2, 5, 3, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.LAMP_BLOCK, 2, 2, 2, clb);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.LAMP_BLOCK, 2, 2, 5, clb);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.LAMP_BLOCK, 5, 2, 5, clb);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.LAMP_BLOCK, 5, 2, 2, clb);
-                this.generateBox(bjx, clb, 0, 1, 0, 1, 3, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 0, 1, 1, 0, 3, 1, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 0, 1, 7, 1, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 0, 1, 6, 0, 3, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 6, 1, 7, 7, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 7, 1, 6, 7, 3, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 6, 1, 0, 7, 3, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 7, 1, 1, 7, 3, 1, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.BASE_GRAY, 1, 2, 0, clb);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.BASE_GRAY, 0, 2, 1, clb);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.BASE_GRAY, 1, 2, 7, clb);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.BASE_GRAY, 0, 2, 6, clb);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.BASE_GRAY, 6, 2, 7, clb);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.BASE_GRAY, 7, 2, 6, clb);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.BASE_GRAY, 6, 2, 0, clb);
-                this.placeBlock(bjx, OceanMonumentSimpleRoom.BASE_GRAY, 7, 2, 1, clb);
+                this.generateBox(bqu, ctd, 2, 1, 2, 2, 3, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 2, 1, 5, 2, 3, 5, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 5, 1, 5, 5, 3, 5, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 5, 1, 2, 5, 3, 2, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.LAMP_BLOCK, 2, 2, 2, ctd);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.LAMP_BLOCK, 2, 2, 5, ctd);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.LAMP_BLOCK, 5, 2, 5, ctd);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.LAMP_BLOCK, 5, 2, 2, ctd);
+                this.generateBox(bqu, ctd, 0, 1, 0, 1, 3, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 0, 1, 1, 0, 3, 1, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 0, 1, 7, 1, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 0, 1, 6, 0, 3, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 6, 1, 7, 7, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 7, 1, 6, 7, 3, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 6, 1, 0, 7, 3, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 7, 1, 1, 7, 3, 1, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.BASE_GRAY, 1, 2, 0, ctd);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.BASE_GRAY, 0, 2, 1, ctd);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.BASE_GRAY, 1, 2, 7, ctd);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.BASE_GRAY, 0, 2, 6, ctd);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.BASE_GRAY, 6, 2, 7, ctd);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.BASE_GRAY, 7, 2, 6, ctd);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.BASE_GRAY, 6, 2, 0, ctd);
+                this.placeBlock(bqu, OceanMonumentSimpleRoom.BASE_GRAY, 7, 2, 1, ctd);
                 if (!this.roomDefinition.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, 1, 3, 0, 6, 3, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 1, 2, 0, 6, 2, 0, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                    this.generateBox(bjx, clb, 1, 1, 0, 6, 1, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 1, 3, 0, 6, 3, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 1, 2, 0, 6, 2, 0, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, 1, 1, 0, 6, 1, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
                 if (!this.roomDefinition.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, 1, 3, 7, 6, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 1, 2, 7, 6, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                    this.generateBox(bjx, clb, 1, 1, 7, 6, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 1, 3, 7, 6, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 1, 2, 7, 6, 2, 7, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, 1, 1, 7, 6, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
                 if (!this.roomDefinition.hasOpening[Direction.WEST.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, 0, 3, 1, 0, 3, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 0, 2, 1, 0, 2, 6, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                    this.generateBox(bjx, clb, 0, 1, 1, 0, 1, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 0, 3, 1, 0, 3, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 0, 2, 1, 0, 2, 6, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, 0, 1, 1, 0, 1, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
                 if (!this.roomDefinition.hasOpening[Direction.EAST.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, 7, 3, 1, 7, 3, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 7, 2, 1, 7, 2, 6, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                    this.generateBox(bjx, clb, 7, 1, 1, 7, 1, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 7, 3, 1, 7, 3, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 7, 2, 1, 7, 2, 6, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, 7, 1, 1, 7, 1, 6, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
                 }
             }
             else if (this.mainDesign == 2) {
-                this.generateBox(bjx, clb, 0, 1, 0, 0, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 7, 1, 0, 7, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 1, 1, 0, 6, 1, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 1, 1, 7, 6, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 0, 2, 0, 0, 2, 7, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
-                this.generateBox(bjx, clb, 7, 2, 0, 7, 2, 7, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
-                this.generateBox(bjx, clb, 1, 2, 0, 6, 2, 0, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
-                this.generateBox(bjx, clb, 1, 2, 7, 6, 2, 7, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
-                this.generateBox(bjx, clb, 0, 3, 0, 0, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 7, 3, 0, 7, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 1, 3, 0, 6, 3, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 1, 3, 7, 6, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 0, 1, 3, 0, 2, 4, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
-                this.generateBox(bjx, clb, 7, 1, 3, 7, 2, 4, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
-                this.generateBox(bjx, clb, 3, 1, 0, 4, 2, 0, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
-                this.generateBox(bjx, clb, 3, 1, 7, 4, 2, 7, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 0, 1, 0, 0, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 7, 1, 0, 7, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 1, 1, 0, 6, 1, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 1, 1, 7, 6, 1, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 0, 2, 0, 0, 2, 7, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 7, 2, 0, 7, 2, 7, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 1, 2, 0, 6, 2, 0, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 1, 2, 7, 6, 2, 7, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 0, 3, 0, 0, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 7, 3, 0, 7, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 1, 3, 0, 6, 3, 0, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 1, 3, 7, 6, 3, 7, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 0, 1, 3, 0, 2, 4, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 7, 1, 3, 7, 2, 4, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 3, 1, 0, 4, 2, 0, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 3, 1, 7, 4, 2, 7, OceanMonumentSimpleRoom.BASE_BLACK, OceanMonumentSimpleRoom.BASE_BLACK, false);
                 if (this.roomDefinition.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                    this.generateWaterBox(bjx, clb, 3, 1, 0, 4, 2, 0);
+                    this.generateWaterBox(bqu, ctd, 3, 1, 0, 4, 2, 0);
                 }
                 if (this.roomDefinition.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                    this.generateWaterBox(bjx, clb, 3, 1, 7, 4, 2, 7);
+                    this.generateWaterBox(bqu, ctd, 3, 1, 7, 4, 2, 7);
                 }
                 if (this.roomDefinition.hasOpening[Direction.WEST.get3DDataValue()]) {
-                    this.generateWaterBox(bjx, clb, 0, 1, 3, 0, 2, 4);
+                    this.generateWaterBox(bqu, ctd, 0, 1, 3, 0, 2, 4);
                 }
                 if (this.roomDefinition.hasOpening[Direction.EAST.get3DDataValue()]) {
-                    this.generateWaterBox(bjx, clb, 7, 1, 3, 7, 2, 4);
+                    this.generateWaterBox(bqu, ctd, 7, 1, 3, 7, 2, 4);
                 }
             }
-            if (boolean7) {
-                this.generateBox(bjx, clb, 3, 1, 3, 4, 1, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 3, 2, 3, 4, 2, 4, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
-                this.generateBox(bjx, clb, 3, 3, 3, 4, 3, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+            if (boolean9) {
+                this.generateBox(bqu, ctd, 3, 1, 3, 4, 1, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 3, 2, 3, 4, 2, 4, OceanMonumentSimpleRoom.BASE_GRAY, OceanMonumentSimpleRoom.BASE_GRAY, false);
+                this.generateBox(bqu, ctd, 3, 3, 3, 4, 3, 4, OceanMonumentSimpleRoom.BASE_LIGHT, OceanMonumentSimpleRoom.BASE_LIGHT, false);
             }
             return true;
         }
     }
     
     public static class OceanMonumentSimpleTopRoom extends OceanMonumentPiece {
-        public OceanMonumentSimpleTopRoom(final Direction fp, final RoomDefinition v) {
-            super(StructurePieceType.OCEAN_MONUMENT_SIMPLE_TOP_ROOM, 1, fp, v, 1, 1, 1);
+        public OceanMonumentSimpleTopRoom(final Direction fz, final RoomDefinition v) {
+            super(StructurePieceType.OCEAN_MONUMENT_SIMPLE_TOP_ROOM, 1, fz, v, 1, 1, 1);
         }
         
-        public OceanMonumentSimpleTopRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_SIMPLE_TOP_ROOM, jt);
+        public OceanMonumentSimpleTopRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_SIMPLE_TOP_ROOM, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
             if (this.roomDefinition.index / 25 > 0) {
-                this.generateDefaultFloor(bjx, clb, 0, 0, this.roomDefinition.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 0, 0, this.roomDefinition.hasOpening[Direction.DOWN.get3DDataValue()]);
             }
             if (this.roomDefinition.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 1, 4, 1, 6, 4, 6, OceanMonumentSimpleTopRoom.BASE_GRAY);
+                this.generateBoxOnFillOnly(bqu, ctd, 1, 4, 1, 6, 4, 6, OceanMonumentSimpleTopRoom.BASE_GRAY);
             }
-            for (int integer7 = 1; integer7 <= 6; ++integer7) {
-                for (int integer8 = 1; integer8 <= 6; ++integer8) {
+            for (int integer9 = 1; integer9 <= 6; ++integer9) {
+                for (int integer10 = 1; integer10 <= 6; ++integer10) {
                     if (random.nextInt(3) != 0) {
-                        final int integer9 = 2 + ((random.nextInt(4) != 0) ? 1 : 0);
-                        final BlockState byj10 = Blocks.WET_SPONGE.defaultBlockState();
-                        this.generateBox(bjx, clb, integer7, integer9, integer8, integer7, 3, integer8, byj10, byj10, false);
+                        final int integer11 = 2 + ((random.nextInt(4) != 0) ? 1 : 0);
+                        final BlockState cfj12 = Blocks.WET_SPONGE.defaultBlockState();
+                        this.generateBox(bqu, ctd, integer9, integer11, integer10, integer9, 3, integer10, cfj12, cfj12, false);
                     }
                 }
             }
-            this.generateBox(bjx, clb, 0, 1, 0, 0, 1, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 7, 1, 0, 7, 1, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 1, 0, 6, 1, 0, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 1, 7, 6, 1, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 0, 2, 0, 0, 2, 7, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
-            this.generateBox(bjx, clb, 7, 2, 0, 7, 2, 7, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
-            this.generateBox(bjx, clb, 1, 2, 0, 6, 2, 0, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
-            this.generateBox(bjx, clb, 1, 2, 7, 6, 2, 7, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
-            this.generateBox(bjx, clb, 0, 3, 0, 0, 3, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 7, 3, 0, 7, 3, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 3, 0, 6, 3, 0, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 3, 7, 6, 3, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 0, 1, 3, 0, 2, 4, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
-            this.generateBox(bjx, clb, 7, 1, 3, 7, 2, 4, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
-            this.generateBox(bjx, clb, 3, 1, 0, 4, 2, 0, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
-            this.generateBox(bjx, clb, 3, 1, 7, 4, 2, 7, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 0, 1, 0, 0, 1, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 7, 1, 0, 7, 1, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 1, 0, 6, 1, 0, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 1, 7, 6, 1, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 0, 2, 7, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 7, 2, 0, 7, 2, 7, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 1, 2, 0, 6, 2, 0, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 1, 2, 7, 6, 2, 7, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 0, 3, 0, 0, 3, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 7, 3, 0, 7, 3, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 3, 0, 6, 3, 0, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 3, 7, 6, 3, 7, OceanMonumentSimpleTopRoom.BASE_LIGHT, OceanMonumentSimpleTopRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 0, 1, 3, 0, 2, 4, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 7, 1, 3, 7, 2, 4, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 3, 1, 0, 4, 2, 0, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 3, 1, 7, 4, 2, 7, OceanMonumentSimpleTopRoom.BASE_BLACK, OceanMonumentSimpleTopRoom.BASE_BLACK, false);
             if (this.roomDefinition.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 1, 0, 4, 2, 0);
+                this.generateWaterBox(bqu, ctd, 3, 1, 0, 4, 2, 0);
             }
             return true;
         }
     }
     
     public static class OceanMonumentDoubleYRoom extends OceanMonumentPiece {
-        public OceanMonumentDoubleYRoom(final Direction fp, final RoomDefinition v) {
-            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_Y_ROOM, 1, fp, v, 1, 2, 1);
+        public OceanMonumentDoubleYRoom(final Direction fz, final RoomDefinition v) {
+            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_Y_ROOM, 1, fz, v, 1, 2, 1);
         }
         
-        public OceanMonumentDoubleYRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_Y_ROOM, jt);
+        public OceanMonumentDoubleYRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_Y_ROOM, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
             if (this.roomDefinition.index / 25 > 0) {
-                this.generateDefaultFloor(bjx, clb, 0, 0, this.roomDefinition.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 0, 0, this.roomDefinition.hasOpening[Direction.DOWN.get3DDataValue()]);
             }
-            final RoomDefinition v7 = this.roomDefinition.connections[Direction.UP.get3DDataValue()];
-            if (v7.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 1, 8, 1, 6, 8, 6, OceanMonumentDoubleYRoom.BASE_GRAY);
+            final RoomDefinition v9 = this.roomDefinition.connections[Direction.UP.get3DDataValue()];
+            if (v9.connections[Direction.UP.get3DDataValue()] == null) {
+                this.generateBoxOnFillOnly(bqu, ctd, 1, 8, 1, 6, 8, 6, OceanMonumentDoubleYRoom.BASE_GRAY);
             }
-            this.generateBox(bjx, clb, 0, 4, 0, 0, 4, 7, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 7, 4, 0, 7, 4, 7, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 4, 0, 6, 4, 0, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 4, 7, 6, 4, 7, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 2, 4, 1, 2, 4, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 4, 2, 1, 4, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 4, 1, 5, 4, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, 4, 2, 6, 4, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 2, 4, 5, 2, 4, 6, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 4, 5, 1, 4, 5, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 4, 5, 5, 4, 6, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, 4, 5, 6, 4, 5, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-            RoomDefinition v8 = this.roomDefinition;
-            for (int integer9 = 1; integer9 <= 5; integer9 += 4) {
-                int integer10 = 0;
-                if (v8.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, 2, integer9, integer10, 2, integer9 + 2, integer10, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 5, integer9, integer10, 5, integer9 + 2, integer10, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 3, integer9 + 2, integer10, 4, integer9 + 2, integer10, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 0, 4, 0, 0, 4, 7, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 7, 4, 0, 7, 4, 7, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 4, 0, 6, 4, 0, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 4, 7, 6, 4, 7, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 2, 4, 1, 2, 4, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 4, 2, 1, 4, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 4, 1, 5, 4, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, 4, 2, 6, 4, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 2, 4, 5, 2, 4, 6, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 4, 5, 1, 4, 5, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 4, 5, 5, 4, 6, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, 4, 5, 6, 4, 5, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+            RoomDefinition v10 = this.roomDefinition;
+            for (int integer11 = 1; integer11 <= 5; integer11 += 4) {
+                int integer12 = 0;
+                if (v10.hasOpening[Direction.SOUTH.get3DDataValue()]) {
+                    this.generateBox(bqu, ctd, 2, integer11, integer12, 2, integer11 + 2, integer12, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 5, integer11, integer12, 5, integer11 + 2, integer12, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 3, integer11 + 2, integer12, 4, integer11 + 2, integer12, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
                 }
                 else {
-                    this.generateBox(bjx, clb, 0, integer9, integer10, 7, integer9 + 2, integer10, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 0, integer9 + 1, integer10, 7, integer9 + 1, integer10, OceanMonumentDoubleYRoom.BASE_GRAY, OceanMonumentDoubleYRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, 0, integer11, integer12, 7, integer11 + 2, integer12, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 0, integer11 + 1, integer12, 7, integer11 + 1, integer12, OceanMonumentDoubleYRoom.BASE_GRAY, OceanMonumentDoubleYRoom.BASE_GRAY, false);
                 }
-                integer10 = 7;
-                if (v8.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, 2, integer9, integer10, 2, integer9 + 2, integer10, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 5, integer9, integer10, 5, integer9 + 2, integer10, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 3, integer9 + 2, integer10, 4, integer9 + 2, integer10, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                integer12 = 7;
+                if (v10.hasOpening[Direction.NORTH.get3DDataValue()]) {
+                    this.generateBox(bqu, ctd, 2, integer11, integer12, 2, integer11 + 2, integer12, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 5, integer11, integer12, 5, integer11 + 2, integer12, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 3, integer11 + 2, integer12, 4, integer11 + 2, integer12, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
                 }
                 else {
-                    this.generateBox(bjx, clb, 0, integer9, integer10, 7, integer9 + 2, integer10, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, 0, integer9 + 1, integer10, 7, integer9 + 1, integer10, OceanMonumentDoubleYRoom.BASE_GRAY, OceanMonumentDoubleYRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, 0, integer11, integer12, 7, integer11 + 2, integer12, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, 0, integer11 + 1, integer12, 7, integer11 + 1, integer12, OceanMonumentDoubleYRoom.BASE_GRAY, OceanMonumentDoubleYRoom.BASE_GRAY, false);
                 }
-                int integer11 = 0;
-                if (v8.hasOpening[Direction.WEST.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, integer11, integer9, 2, integer11, integer9 + 2, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer11, integer9, 5, integer11, integer9 + 2, 5, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer11, integer9 + 2, 3, integer11, integer9 + 2, 4, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                int integer13 = 0;
+                if (v10.hasOpening[Direction.WEST.get3DDataValue()]) {
+                    this.generateBox(bqu, ctd, integer13, integer11, 2, integer13, integer11 + 2, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, integer13, integer11, 5, integer13, integer11 + 2, 5, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, integer13, integer11 + 2, 3, integer13, integer11 + 2, 4, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
                 }
                 else {
-                    this.generateBox(bjx, clb, integer11, integer9, 0, integer11, integer9 + 2, 7, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer11, integer9 + 1, 0, integer11, integer9 + 1, 7, OceanMonumentDoubleYRoom.BASE_GRAY, OceanMonumentDoubleYRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, integer13, integer11, 0, integer13, integer11 + 2, 7, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, integer13, integer11 + 1, 0, integer13, integer11 + 1, 7, OceanMonumentDoubleYRoom.BASE_GRAY, OceanMonumentDoubleYRoom.BASE_GRAY, false);
                 }
-                integer11 = 7;
-                if (v8.hasOpening[Direction.EAST.get3DDataValue()]) {
-                    this.generateBox(bjx, clb, integer11, integer9, 2, integer11, integer9 + 2, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer11, integer9, 5, integer11, integer9 + 2, 5, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer11, integer9 + 2, 3, integer11, integer9 + 2, 4, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                integer13 = 7;
+                if (v10.hasOpening[Direction.EAST.get3DDataValue()]) {
+                    this.generateBox(bqu, ctd, integer13, integer11, 2, integer13, integer11 + 2, 2, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, integer13, integer11, 5, integer13, integer11 + 2, 5, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, integer13, integer11 + 2, 3, integer13, integer11 + 2, 4, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
                 }
                 else {
-                    this.generateBox(bjx, clb, integer11, integer9, 0, integer11, integer9 + 2, 7, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer11, integer9 + 1, 0, integer11, integer9 + 1, 7, OceanMonumentDoubleYRoom.BASE_GRAY, OceanMonumentDoubleYRoom.BASE_GRAY, false);
+                    this.generateBox(bqu, ctd, integer13, integer11, 0, integer13, integer11 + 2, 7, OceanMonumentDoubleYRoom.BASE_LIGHT, OceanMonumentDoubleYRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, integer13, integer11 + 1, 0, integer13, integer11 + 1, 7, OceanMonumentDoubleYRoom.BASE_GRAY, OceanMonumentDoubleYRoom.BASE_GRAY, false);
                 }
-                v8 = v7;
+                v10 = v9;
             }
             return true;
         }
     }
     
     public static class OceanMonumentDoubleXRoom extends OceanMonumentPiece {
-        public OceanMonumentDoubleXRoom(final Direction fp, final RoomDefinition v) {
-            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_X_ROOM, 1, fp, v, 2, 1, 1);
+        public OceanMonumentDoubleXRoom(final Direction fz, final RoomDefinition v) {
+            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_X_ROOM, 1, fz, v, 2, 1, 1);
         }
         
-        public OceanMonumentDoubleXRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_X_ROOM, jt);
+        public OceanMonumentDoubleXRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_X_ROOM, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            final RoomDefinition v7 = this.roomDefinition.connections[Direction.EAST.get3DDataValue()];
-            final RoomDefinition v8 = this.roomDefinition;
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            final RoomDefinition v9 = this.roomDefinition.connections[Direction.EAST.get3DDataValue()];
+            final RoomDefinition v10 = this.roomDefinition;
             if (this.roomDefinition.index / 25 > 0) {
-                this.generateDefaultFloor(bjx, clb, 8, 0, v7.hasOpening[Direction.DOWN.get3DDataValue()]);
-                this.generateDefaultFloor(bjx, clb, 0, 0, v8.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 8, 0, v9.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 0, 0, v10.hasOpening[Direction.DOWN.get3DDataValue()]);
             }
-            if (v8.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 1, 4, 1, 7, 4, 6, OceanMonumentDoubleXRoom.BASE_GRAY);
+            if (v10.connections[Direction.UP.get3DDataValue()] == null) {
+                this.generateBoxOnFillOnly(bqu, ctd, 1, 4, 1, 7, 4, 6, OceanMonumentDoubleXRoom.BASE_GRAY);
             }
-            if (v7.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 8, 4, 1, 14, 4, 6, OceanMonumentDoubleXRoom.BASE_GRAY);
+            if (v9.connections[Direction.UP.get3DDataValue()] == null) {
+                this.generateBoxOnFillOnly(bqu, ctd, 8, 4, 1, 14, 4, 6, OceanMonumentDoubleXRoom.BASE_GRAY);
             }
-            this.generateBox(bjx, clb, 0, 3, 0, 0, 3, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 15, 3, 0, 15, 3, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 3, 0, 15, 3, 0, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 3, 7, 14, 3, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 0, 2, 0, 0, 2, 7, OceanMonumentDoubleXRoom.BASE_GRAY, OceanMonumentDoubleXRoom.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 15, 2, 0, 15, 2, 7, OceanMonumentDoubleXRoom.BASE_GRAY, OceanMonumentDoubleXRoom.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 1, 2, 0, 15, 2, 0, OceanMonumentDoubleXRoom.BASE_GRAY, OceanMonumentDoubleXRoom.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 1, 2, 7, 14, 2, 7, OceanMonumentDoubleXRoom.BASE_GRAY, OceanMonumentDoubleXRoom.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 0, 1, 0, 0, 1, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 15, 1, 0, 15, 1, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 1, 0, 15, 1, 0, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 1, 7, 14, 1, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 1, 0, 10, 1, 4, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, 2, 0, 9, 2, 3, OceanMonumentDoubleXRoom.BASE_GRAY, OceanMonumentDoubleXRoom.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 5, 3, 0, 10, 3, 4, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
-            this.placeBlock(bjx, OceanMonumentDoubleXRoom.LAMP_BLOCK, 6, 2, 3, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleXRoom.LAMP_BLOCK, 9, 2, 3, clb);
-            if (v8.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 1, 0, 4, 2, 0);
+            this.generateBox(bqu, ctd, 0, 3, 0, 0, 3, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 15, 3, 0, 15, 3, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 3, 0, 15, 3, 0, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 3, 7, 14, 3, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 0, 2, 7, OceanMonumentDoubleXRoom.BASE_GRAY, OceanMonumentDoubleXRoom.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 15, 2, 0, 15, 2, 7, OceanMonumentDoubleXRoom.BASE_GRAY, OceanMonumentDoubleXRoom.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 1, 2, 0, 15, 2, 0, OceanMonumentDoubleXRoom.BASE_GRAY, OceanMonumentDoubleXRoom.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 1, 2, 7, 14, 2, 7, OceanMonumentDoubleXRoom.BASE_GRAY, OceanMonumentDoubleXRoom.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 0, 1, 0, 0, 1, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 15, 1, 0, 15, 1, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 1, 0, 15, 1, 0, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 1, 7, 14, 1, 7, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 1, 0, 10, 1, 4, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, 2, 0, 9, 2, 3, OceanMonumentDoubleXRoom.BASE_GRAY, OceanMonumentDoubleXRoom.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 5, 3, 0, 10, 3, 4, OceanMonumentDoubleXRoom.BASE_LIGHT, OceanMonumentDoubleXRoom.BASE_LIGHT, false);
+            this.placeBlock(bqu, OceanMonumentDoubleXRoom.LAMP_BLOCK, 6, 2, 3, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleXRoom.LAMP_BLOCK, 9, 2, 3, ctd);
+            if (v10.hasOpening[Direction.SOUTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 3, 1, 0, 4, 2, 0);
             }
-            if (v8.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 1, 7, 4, 2, 7);
+            if (v10.hasOpening[Direction.NORTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 3, 1, 7, 4, 2, 7);
             }
-            if (v8.hasOpening[Direction.WEST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 0, 1, 3, 0, 2, 4);
+            if (v10.hasOpening[Direction.WEST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 0, 1, 3, 0, 2, 4);
             }
-            if (v7.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 11, 1, 0, 12, 2, 0);
+            if (v9.hasOpening[Direction.SOUTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 11, 1, 0, 12, 2, 0);
             }
-            if (v7.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 11, 1, 7, 12, 2, 7);
+            if (v9.hasOpening[Direction.NORTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 11, 1, 7, 12, 2, 7);
             }
-            if (v7.hasOpening[Direction.EAST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 15, 1, 3, 15, 2, 4);
+            if (v9.hasOpening[Direction.EAST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 15, 1, 3, 15, 2, 4);
             }
             return true;
         }
     }
     
     public static class OceanMonumentDoubleZRoom extends OceanMonumentPiece {
-        public OceanMonumentDoubleZRoom(final Direction fp, final RoomDefinition v) {
-            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_Z_ROOM, 1, fp, v, 1, 1, 2);
+        public OceanMonumentDoubleZRoom(final Direction fz, final RoomDefinition v) {
+            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_Z_ROOM, 1, fz, v, 1, 1, 2);
         }
         
-        public OceanMonumentDoubleZRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_Z_ROOM, jt);
+        public OceanMonumentDoubleZRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_Z_ROOM, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            final RoomDefinition v7 = this.roomDefinition.connections[Direction.NORTH.get3DDataValue()];
-            final RoomDefinition v8 = this.roomDefinition;
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            final RoomDefinition v9 = this.roomDefinition.connections[Direction.NORTH.get3DDataValue()];
+            final RoomDefinition v10 = this.roomDefinition;
             if (this.roomDefinition.index / 25 > 0) {
-                this.generateDefaultFloor(bjx, clb, 0, 8, v7.hasOpening[Direction.DOWN.get3DDataValue()]);
-                this.generateDefaultFloor(bjx, clb, 0, 0, v8.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 0, 8, v9.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 0, 0, v10.hasOpening[Direction.DOWN.get3DDataValue()]);
             }
-            if (v8.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 1, 4, 1, 6, 4, 7, OceanMonumentDoubleZRoom.BASE_GRAY);
+            if (v10.connections[Direction.UP.get3DDataValue()] == null) {
+                this.generateBoxOnFillOnly(bqu, ctd, 1, 4, 1, 6, 4, 7, OceanMonumentDoubleZRoom.BASE_GRAY);
             }
-            if (v7.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 1, 4, 8, 6, 4, 14, OceanMonumentDoubleZRoom.BASE_GRAY);
+            if (v9.connections[Direction.UP.get3DDataValue()] == null) {
+                this.generateBoxOnFillOnly(bqu, ctd, 1, 4, 8, 6, 4, 14, OceanMonumentDoubleZRoom.BASE_GRAY);
             }
-            this.generateBox(bjx, clb, 0, 3, 0, 0, 3, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 7, 3, 0, 7, 3, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 3, 0, 7, 3, 0, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 3, 15, 6, 3, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 0, 2, 0, 0, 2, 15, OceanMonumentDoubleZRoom.BASE_GRAY, OceanMonumentDoubleZRoom.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 7, 2, 0, 7, 2, 15, OceanMonumentDoubleZRoom.BASE_GRAY, OceanMonumentDoubleZRoom.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 1, 2, 0, 7, 2, 0, OceanMonumentDoubleZRoom.BASE_GRAY, OceanMonumentDoubleZRoom.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 1, 2, 15, 6, 2, 15, OceanMonumentDoubleZRoom.BASE_GRAY, OceanMonumentDoubleZRoom.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 0, 1, 0, 0, 1, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 7, 1, 0, 7, 1, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 1, 0, 7, 1, 0, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 1, 15, 6, 1, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 1, 1, 1, 1, 2, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, 1, 1, 6, 1, 2, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 3, 1, 1, 3, 2, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, 3, 1, 6, 3, 2, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 1, 13, 1, 1, 14, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, 1, 13, 6, 1, 14, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 3, 13, 1, 3, 14, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, 3, 13, 6, 3, 14, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 2, 1, 6, 2, 3, 6, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 1, 6, 5, 3, 6, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 2, 1, 9, 2, 3, 9, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 1, 9, 5, 3, 9, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 3, 2, 6, 4, 2, 6, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 3, 2, 9, 4, 2, 9, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 2, 2, 7, 2, 2, 8, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 2, 7, 5, 2, 8, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
-            this.placeBlock(bjx, OceanMonumentDoubleZRoom.LAMP_BLOCK, 2, 2, 5, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleZRoom.LAMP_BLOCK, 5, 2, 5, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleZRoom.LAMP_BLOCK, 2, 2, 10, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleZRoom.LAMP_BLOCK, 5, 2, 10, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleZRoom.BASE_LIGHT, 2, 3, 5, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleZRoom.BASE_LIGHT, 5, 3, 5, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleZRoom.BASE_LIGHT, 2, 3, 10, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleZRoom.BASE_LIGHT, 5, 3, 10, clb);
-            if (v8.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 1, 0, 4, 2, 0);
+            this.generateBox(bqu, ctd, 0, 3, 0, 0, 3, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 7, 3, 0, 7, 3, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 3, 0, 7, 3, 0, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 3, 15, 6, 3, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 0, 2, 0, 0, 2, 15, OceanMonumentDoubleZRoom.BASE_GRAY, OceanMonumentDoubleZRoom.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 7, 2, 0, 7, 2, 15, OceanMonumentDoubleZRoom.BASE_GRAY, OceanMonumentDoubleZRoom.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 1, 2, 0, 7, 2, 0, OceanMonumentDoubleZRoom.BASE_GRAY, OceanMonumentDoubleZRoom.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 1, 2, 15, 6, 2, 15, OceanMonumentDoubleZRoom.BASE_GRAY, OceanMonumentDoubleZRoom.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 0, 1, 0, 0, 1, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 7, 1, 0, 7, 1, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 1, 0, 7, 1, 0, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 1, 15, 6, 1, 15, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 1, 1, 1, 1, 2, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, 1, 1, 6, 1, 2, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 3, 1, 1, 3, 2, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, 3, 1, 6, 3, 2, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 1, 13, 1, 1, 14, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, 1, 13, 6, 1, 14, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 3, 13, 1, 3, 14, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, 3, 13, 6, 3, 14, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 2, 1, 6, 2, 3, 6, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 1, 6, 5, 3, 6, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 2, 1, 9, 2, 3, 9, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 1, 9, 5, 3, 9, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 3, 2, 6, 4, 2, 6, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 3, 2, 9, 4, 2, 9, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 2, 2, 7, 2, 2, 8, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 2, 7, 5, 2, 8, OceanMonumentDoubleZRoom.BASE_LIGHT, OceanMonumentDoubleZRoom.BASE_LIGHT, false);
+            this.placeBlock(bqu, OceanMonumentDoubleZRoom.LAMP_BLOCK, 2, 2, 5, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleZRoom.LAMP_BLOCK, 5, 2, 5, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleZRoom.LAMP_BLOCK, 2, 2, 10, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleZRoom.LAMP_BLOCK, 5, 2, 10, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleZRoom.BASE_LIGHT, 2, 3, 5, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleZRoom.BASE_LIGHT, 5, 3, 5, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleZRoom.BASE_LIGHT, 2, 3, 10, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleZRoom.BASE_LIGHT, 5, 3, 10, ctd);
+            if (v10.hasOpening[Direction.SOUTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 3, 1, 0, 4, 2, 0);
             }
-            if (v8.hasOpening[Direction.EAST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 7, 1, 3, 7, 2, 4);
+            if (v10.hasOpening[Direction.EAST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 7, 1, 3, 7, 2, 4);
             }
-            if (v8.hasOpening[Direction.WEST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 0, 1, 3, 0, 2, 4);
+            if (v10.hasOpening[Direction.WEST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 0, 1, 3, 0, 2, 4);
             }
-            if (v7.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 1, 15, 4, 2, 15);
+            if (v9.hasOpening[Direction.NORTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 3, 1, 15, 4, 2, 15);
             }
-            if (v7.hasOpening[Direction.WEST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 0, 1, 11, 0, 2, 12);
+            if (v9.hasOpening[Direction.WEST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 0, 1, 11, 0, 2, 12);
             }
-            if (v7.hasOpening[Direction.EAST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 7, 1, 11, 7, 2, 12);
+            if (v9.hasOpening[Direction.EAST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 7, 1, 11, 7, 2, 12);
             }
             return true;
         }
     }
     
     public static class OceanMonumentDoubleXYRoom extends OceanMonumentPiece {
-        public OceanMonumentDoubleXYRoom(final Direction fp, final RoomDefinition v) {
-            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_XY_ROOM, 1, fp, v, 2, 2, 1);
+        public OceanMonumentDoubleXYRoom(final Direction fz, final RoomDefinition v) {
+            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_XY_ROOM, 1, fz, v, 2, 2, 1);
         }
         
-        public OceanMonumentDoubleXYRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_XY_ROOM, jt);
+        public OceanMonumentDoubleXYRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_XY_ROOM, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            final RoomDefinition v7 = this.roomDefinition.connections[Direction.EAST.get3DDataValue()];
-            final RoomDefinition v8 = this.roomDefinition;
-            final RoomDefinition v9 = v8.connections[Direction.UP.get3DDataValue()];
-            final RoomDefinition v10 = v7.connections[Direction.UP.get3DDataValue()];
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            final RoomDefinition v9 = this.roomDefinition.connections[Direction.EAST.get3DDataValue()];
+            final RoomDefinition v10 = this.roomDefinition;
+            final RoomDefinition v11 = v10.connections[Direction.UP.get3DDataValue()];
+            final RoomDefinition v12 = v9.connections[Direction.UP.get3DDataValue()];
             if (this.roomDefinition.index / 25 > 0) {
-                this.generateDefaultFloor(bjx, clb, 8, 0, v7.hasOpening[Direction.DOWN.get3DDataValue()]);
-                this.generateDefaultFloor(bjx, clb, 0, 0, v8.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 8, 0, v9.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 0, 0, v10.hasOpening[Direction.DOWN.get3DDataValue()]);
             }
-            if (v9.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 1, 8, 1, 7, 8, 6, OceanMonumentDoubleXYRoom.BASE_GRAY);
+            if (v11.connections[Direction.UP.get3DDataValue()] == null) {
+                this.generateBoxOnFillOnly(bqu, ctd, 1, 8, 1, 7, 8, 6, OceanMonumentDoubleXYRoom.BASE_GRAY);
             }
-            if (v10.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 8, 8, 1, 14, 8, 6, OceanMonumentDoubleXYRoom.BASE_GRAY);
+            if (v12.connections[Direction.UP.get3DDataValue()] == null) {
+                this.generateBoxOnFillOnly(bqu, ctd, 8, 8, 1, 14, 8, 6, OceanMonumentDoubleXYRoom.BASE_GRAY);
             }
-            for (int integer11 = 1; integer11 <= 7; ++integer11) {
-                BlockState byj12 = OceanMonumentDoubleXYRoom.BASE_LIGHT;
-                if (integer11 == 2 || integer11 == 6) {
-                    byj12 = OceanMonumentDoubleXYRoom.BASE_GRAY;
+            for (int integer13 = 1; integer13 <= 7; ++integer13) {
+                BlockState cfj14 = OceanMonumentDoubleXYRoom.BASE_LIGHT;
+                if (integer13 == 2 || integer13 == 6) {
+                    cfj14 = OceanMonumentDoubleXYRoom.BASE_GRAY;
                 }
-                this.generateBox(bjx, clb, 0, integer11, 0, 0, integer11, 7, byj12, byj12, false);
-                this.generateBox(bjx, clb, 15, integer11, 0, 15, integer11, 7, byj12, byj12, false);
-                this.generateBox(bjx, clb, 1, integer11, 0, 15, integer11, 0, byj12, byj12, false);
-                this.generateBox(bjx, clb, 1, integer11, 7, 14, integer11, 7, byj12, byj12, false);
-            }
-            this.generateBox(bjx, clb, 2, 1, 3, 2, 7, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 3, 1, 2, 4, 7, 2, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 3, 1, 5, 4, 7, 5, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 13, 1, 3, 13, 7, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 11, 1, 2, 12, 7, 2, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 11, 1, 5, 12, 7, 5, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 1, 3, 5, 3, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 10, 1, 3, 10, 3, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 7, 2, 10, 7, 5, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 5, 2, 5, 7, 2, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 10, 5, 2, 10, 7, 2, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 5, 5, 5, 7, 5, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 10, 5, 5, 10, 7, 5, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.placeBlock(bjx, OceanMonumentDoubleXYRoom.BASE_LIGHT, 6, 6, 2, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleXYRoom.BASE_LIGHT, 9, 6, 2, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleXYRoom.BASE_LIGHT, 6, 6, 5, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleXYRoom.BASE_LIGHT, 9, 6, 5, clb);
-            this.generateBox(bjx, clb, 5, 4, 3, 6, 4, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 9, 4, 3, 10, 4, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
-            this.placeBlock(bjx, OceanMonumentDoubleXYRoom.LAMP_BLOCK, 5, 4, 2, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleXYRoom.LAMP_BLOCK, 5, 4, 5, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleXYRoom.LAMP_BLOCK, 10, 4, 2, clb);
-            this.placeBlock(bjx, OceanMonumentDoubleXYRoom.LAMP_BLOCK, 10, 4, 5, clb);
-            if (v8.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 1, 0, 4, 2, 0);
-            }
-            if (v8.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 1, 7, 4, 2, 7);
-            }
-            if (v8.hasOpening[Direction.WEST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 0, 1, 3, 0, 2, 4);
-            }
-            if (v7.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 11, 1, 0, 12, 2, 0);
-            }
-            if (v7.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 11, 1, 7, 12, 2, 7);
-            }
-            if (v7.hasOpening[Direction.EAST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 15, 1, 3, 15, 2, 4);
-            }
-            if (v9.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 5, 0, 4, 6, 0);
-            }
-            if (v9.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 5, 7, 4, 6, 7);
-            }
-            if (v9.hasOpening[Direction.WEST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 0, 5, 3, 0, 6, 4);
+                this.generateBox(bqu, ctd, 0, integer13, 0, 0, integer13, 7, cfj14, cfj14, false);
+                this.generateBox(bqu, ctd, 15, integer13, 0, 15, integer13, 7, cfj14, cfj14, false);
+                this.generateBox(bqu, ctd, 1, integer13, 0, 15, integer13, 0, cfj14, cfj14, false);
+                this.generateBox(bqu, ctd, 1, integer13, 7, 14, integer13, 7, cfj14, cfj14, false);
             }
+            this.generateBox(bqu, ctd, 2, 1, 3, 2, 7, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 3, 1, 2, 4, 7, 2, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 3, 1, 5, 4, 7, 5, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 13, 1, 3, 13, 7, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 11, 1, 2, 12, 7, 2, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 11, 1, 5, 12, 7, 5, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 1, 3, 5, 3, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 10, 1, 3, 10, 3, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 7, 2, 10, 7, 5, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 5, 2, 5, 7, 2, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 10, 5, 2, 10, 7, 2, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 5, 5, 5, 7, 5, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 10, 5, 5, 10, 7, 5, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.placeBlock(bqu, OceanMonumentDoubleXYRoom.BASE_LIGHT, 6, 6, 2, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleXYRoom.BASE_LIGHT, 9, 6, 2, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleXYRoom.BASE_LIGHT, 6, 6, 5, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleXYRoom.BASE_LIGHT, 9, 6, 5, ctd);
+            this.generateBox(bqu, ctd, 5, 4, 3, 6, 4, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 9, 4, 3, 10, 4, 4, OceanMonumentDoubleXYRoom.BASE_LIGHT, OceanMonumentDoubleXYRoom.BASE_LIGHT, false);
+            this.placeBlock(bqu, OceanMonumentDoubleXYRoom.LAMP_BLOCK, 5, 4, 2, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleXYRoom.LAMP_BLOCK, 5, 4, 5, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleXYRoom.LAMP_BLOCK, 10, 4, 2, ctd);
+            this.placeBlock(bqu, OceanMonumentDoubleXYRoom.LAMP_BLOCK, 10, 4, 5, ctd);
             if (v10.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 11, 5, 0, 12, 6, 0);
+                this.generateWaterBox(bqu, ctd, 3, 1, 0, 4, 2, 0);
             }
             if (v10.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 11, 5, 7, 12, 6, 7);
+                this.generateWaterBox(bqu, ctd, 3, 1, 7, 4, 2, 7);
             }
-            if (v10.hasOpening[Direction.EAST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 15, 5, 3, 15, 6, 4);
+            if (v10.hasOpening[Direction.WEST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 0, 1, 3, 0, 2, 4);
+            }
+            if (v9.hasOpening[Direction.SOUTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 11, 1, 0, 12, 2, 0);
+            }
+            if (v9.hasOpening[Direction.NORTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 11, 1, 7, 12, 2, 7);
+            }
+            if (v9.hasOpening[Direction.EAST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 15, 1, 3, 15, 2, 4);
+            }
+            if (v11.hasOpening[Direction.SOUTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 3, 5, 0, 4, 6, 0);
+            }
+            if (v11.hasOpening[Direction.NORTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 3, 5, 7, 4, 6, 7);
+            }
+            if (v11.hasOpening[Direction.WEST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 0, 5, 3, 0, 6, 4);
+            }
+            if (v12.hasOpening[Direction.SOUTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 11, 5, 0, 12, 6, 0);
+            }
+            if (v12.hasOpening[Direction.NORTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 11, 5, 7, 12, 6, 7);
+            }
+            if (v12.hasOpening[Direction.EAST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 15, 5, 3, 15, 6, 4);
             }
             return true;
         }
     }
     
     public static class OceanMonumentDoubleYZRoom extends OceanMonumentPiece {
-        public OceanMonumentDoubleYZRoom(final Direction fp, final RoomDefinition v) {
-            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_YZ_ROOM, 1, fp, v, 1, 2, 2);
+        public OceanMonumentDoubleYZRoom(final Direction fz, final RoomDefinition v) {
+            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_YZ_ROOM, 1, fz, v, 1, 2, 2);
         }
         
-        public OceanMonumentDoubleYZRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_YZ_ROOM, jt);
+        public OceanMonumentDoubleYZRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_DOUBLE_YZ_ROOM, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            final RoomDefinition v7 = this.roomDefinition.connections[Direction.NORTH.get3DDataValue()];
-            final RoomDefinition v8 = this.roomDefinition;
-            final RoomDefinition v9 = v7.connections[Direction.UP.get3DDataValue()];
-            final RoomDefinition v10 = v8.connections[Direction.UP.get3DDataValue()];
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            final RoomDefinition v9 = this.roomDefinition.connections[Direction.NORTH.get3DDataValue()];
+            final RoomDefinition v10 = this.roomDefinition;
+            final RoomDefinition v11 = v9.connections[Direction.UP.get3DDataValue()];
+            final RoomDefinition v12 = v10.connections[Direction.UP.get3DDataValue()];
             if (this.roomDefinition.index / 25 > 0) {
-                this.generateDefaultFloor(bjx, clb, 0, 8, v7.hasOpening[Direction.DOWN.get3DDataValue()]);
-                this.generateDefaultFloor(bjx, clb, 0, 0, v8.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 0, 8, v9.hasOpening[Direction.DOWN.get3DDataValue()]);
+                this.generateDefaultFloor(bqu, ctd, 0, 0, v10.hasOpening[Direction.DOWN.get3DDataValue()]);
             }
-            if (v10.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 1, 8, 1, 6, 8, 7, OceanMonumentDoubleYZRoom.BASE_GRAY);
+            if (v12.connections[Direction.UP.get3DDataValue()] == null) {
+                this.generateBoxOnFillOnly(bqu, ctd, 1, 8, 1, 6, 8, 7, OceanMonumentDoubleYZRoom.BASE_GRAY);
             }
-            if (v9.connections[Direction.UP.get3DDataValue()] == null) {
-                this.generateBoxOnFillOnly(bjx, clb, 1, 8, 8, 6, 8, 14, OceanMonumentDoubleYZRoom.BASE_GRAY);
+            if (v11.connections[Direction.UP.get3DDataValue()] == null) {
+                this.generateBoxOnFillOnly(bqu, ctd, 1, 8, 8, 6, 8, 14, OceanMonumentDoubleYZRoom.BASE_GRAY);
             }
-            for (int integer11 = 1; integer11 <= 7; ++integer11) {
-                BlockState byj12 = OceanMonumentDoubleYZRoom.BASE_LIGHT;
-                if (integer11 == 2 || integer11 == 6) {
-                    byj12 = OceanMonumentDoubleYZRoom.BASE_GRAY;
+            for (int integer13 = 1; integer13 <= 7; ++integer13) {
+                BlockState cfj14 = OceanMonumentDoubleYZRoom.BASE_LIGHT;
+                if (integer13 == 2 || integer13 == 6) {
+                    cfj14 = OceanMonumentDoubleYZRoom.BASE_GRAY;
                 }
-                this.generateBox(bjx, clb, 0, integer11, 0, 0, integer11, 15, byj12, byj12, false);
-                this.generateBox(bjx, clb, 7, integer11, 0, 7, integer11, 15, byj12, byj12, false);
-                this.generateBox(bjx, clb, 1, integer11, 0, 6, integer11, 0, byj12, byj12, false);
-                this.generateBox(bjx, clb, 1, integer11, 15, 6, integer11, 15, byj12, byj12, false);
+                this.generateBox(bqu, ctd, 0, integer13, 0, 0, integer13, 15, cfj14, cfj14, false);
+                this.generateBox(bqu, ctd, 7, integer13, 0, 7, integer13, 15, cfj14, cfj14, false);
+                this.generateBox(bqu, ctd, 1, integer13, 0, 6, integer13, 0, cfj14, cfj14, false);
+                this.generateBox(bqu, ctd, 1, integer13, 15, 6, integer13, 15, cfj14, cfj14, false);
             }
-            for (int integer11 = 1; integer11 <= 7; ++integer11) {
-                BlockState byj12 = OceanMonumentDoubleYZRoom.BASE_BLACK;
-                if (integer11 == 2 || integer11 == 6) {
-                    byj12 = OceanMonumentDoubleYZRoom.LAMP_BLOCK;
+            for (int integer13 = 1; integer13 <= 7; ++integer13) {
+                BlockState cfj14 = OceanMonumentDoubleYZRoom.BASE_BLACK;
+                if (integer13 == 2 || integer13 == 6) {
+                    cfj14 = OceanMonumentDoubleYZRoom.LAMP_BLOCK;
                 }
-                this.generateBox(bjx, clb, 3, integer11, 7, 4, integer11, 8, byj12, byj12, false);
-            }
-            if (v8.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 1, 0, 4, 2, 0);
-            }
-            if (v8.hasOpening[Direction.EAST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 7, 1, 3, 7, 2, 4);
-            }
-            if (v8.hasOpening[Direction.WEST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 0, 1, 3, 0, 2, 4);
-            }
-            if (v7.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 1, 15, 4, 2, 15);
-            }
-            if (v7.hasOpening[Direction.WEST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 0, 1, 11, 0, 2, 12);
-            }
-            if (v7.hasOpening[Direction.EAST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 7, 1, 11, 7, 2, 12);
+                this.generateBox(bqu, ctd, 3, integer13, 7, 4, integer13, 8, cfj14, cfj14, false);
             }
             if (v10.hasOpening[Direction.SOUTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 5, 0, 4, 6, 0);
+                this.generateWaterBox(bqu, ctd, 3, 1, 0, 4, 2, 0);
             }
             if (v10.hasOpening[Direction.EAST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 7, 5, 3, 7, 6, 4);
-                this.generateBox(bjx, clb, 5, 4, 2, 6, 4, 5, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 6, 1, 2, 6, 3, 2, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 6, 1, 5, 6, 3, 5, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateWaterBox(bqu, ctd, 7, 1, 3, 7, 2, 4);
             }
             if (v10.hasOpening[Direction.WEST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 0, 5, 3, 0, 6, 4);
-                this.generateBox(bjx, clb, 1, 4, 2, 2, 4, 5, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 1, 1, 2, 1, 3, 2, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 1, 1, 5, 1, 3, 5, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateWaterBox(bqu, ctd, 0, 1, 3, 0, 2, 4);
             }
             if (v9.hasOpening[Direction.NORTH.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 3, 5, 15, 4, 6, 15);
+                this.generateWaterBox(bqu, ctd, 3, 1, 15, 4, 2, 15);
             }
             if (v9.hasOpening[Direction.WEST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 0, 5, 11, 0, 6, 12);
-                this.generateBox(bjx, clb, 1, 4, 10, 2, 4, 13, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 1, 1, 10, 1, 3, 10, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 1, 1, 13, 1, 3, 13, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateWaterBox(bqu, ctd, 0, 1, 11, 0, 2, 12);
             }
             if (v9.hasOpening[Direction.EAST.get3DDataValue()]) {
-                this.generateWaterBox(bjx, clb, 7, 5, 11, 7, 6, 12);
-                this.generateBox(bjx, clb, 5, 4, 10, 6, 4, 13, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 6, 1, 10, 6, 3, 10, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 6, 1, 13, 6, 3, 13, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateWaterBox(bqu, ctd, 7, 1, 11, 7, 2, 12);
+            }
+            if (v12.hasOpening[Direction.SOUTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 3, 5, 0, 4, 6, 0);
+            }
+            if (v12.hasOpening[Direction.EAST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 7, 5, 3, 7, 6, 4);
+                this.generateBox(bqu, ctd, 5, 4, 2, 6, 4, 5, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 6, 1, 2, 6, 3, 2, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 6, 1, 5, 6, 3, 5, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+            }
+            if (v12.hasOpening[Direction.WEST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 0, 5, 3, 0, 6, 4);
+                this.generateBox(bqu, ctd, 1, 4, 2, 2, 4, 5, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 1, 1, 2, 1, 3, 2, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 1, 1, 5, 1, 3, 5, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+            }
+            if (v11.hasOpening[Direction.NORTH.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 3, 5, 15, 4, 6, 15);
+            }
+            if (v11.hasOpening[Direction.WEST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 0, 5, 11, 0, 6, 12);
+                this.generateBox(bqu, ctd, 1, 4, 10, 2, 4, 13, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 1, 1, 10, 1, 3, 10, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 1, 1, 13, 1, 3, 13, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+            }
+            if (v11.hasOpening[Direction.EAST.get3DDataValue()]) {
+                this.generateWaterBox(bqu, ctd, 7, 5, 11, 7, 6, 12);
+                this.generateBox(bqu, ctd, 5, 4, 10, 6, 4, 13, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 6, 1, 10, 6, 3, 10, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 6, 1, 13, 6, 3, 13, OceanMonumentDoubleYZRoom.BASE_LIGHT, OceanMonumentDoubleYZRoom.BASE_LIGHT, false);
             }
             return true;
         }
     }
     
     public static class OceanMonumentCoreRoom extends OceanMonumentPiece {
-        public OceanMonumentCoreRoom(final Direction fp, final RoomDefinition v) {
-            super(StructurePieceType.OCEAN_MONUMENT_CORE_ROOM, 1, fp, v, 2, 2, 2);
+        public OceanMonumentCoreRoom(final Direction fz, final RoomDefinition v) {
+            super(StructurePieceType.OCEAN_MONUMENT_CORE_ROOM, 1, fz, v, 2, 2, 2);
         }
         
-        public OceanMonumentCoreRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_CORE_ROOM, jt);
+        public OceanMonumentCoreRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_CORE_ROOM, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBoxOnFillOnly(bjx, clb, 1, 8, 0, 14, 8, 14, OceanMonumentCoreRoom.BASE_GRAY);
-            int integer7 = 7;
-            BlockState byj8 = OceanMonumentCoreRoom.BASE_LIGHT;
-            this.generateBox(bjx, clb, 0, 7, 0, 0, 7, 15, byj8, byj8, false);
-            this.generateBox(bjx, clb, 15, 7, 0, 15, 7, 15, byj8, byj8, false);
-            this.generateBox(bjx, clb, 1, 7, 0, 15, 7, 0, byj8, byj8, false);
-            this.generateBox(bjx, clb, 1, 7, 15, 14, 7, 15, byj8, byj8, false);
-            for (integer7 = 1; integer7 <= 6; ++integer7) {
-                byj8 = OceanMonumentCoreRoom.BASE_LIGHT;
-                if (integer7 == 2 || integer7 == 6) {
-                    byj8 = OceanMonumentCoreRoom.BASE_GRAY;
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBoxOnFillOnly(bqu, ctd, 1, 8, 0, 14, 8, 14, OceanMonumentCoreRoom.BASE_GRAY);
+            int integer9 = 7;
+            BlockState cfj10 = OceanMonumentCoreRoom.BASE_LIGHT;
+            this.generateBox(bqu, ctd, 0, 7, 0, 0, 7, 15, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 15, 7, 0, 15, 7, 15, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 1, 7, 0, 15, 7, 0, cfj10, cfj10, false);
+            this.generateBox(bqu, ctd, 1, 7, 15, 14, 7, 15, cfj10, cfj10, false);
+            for (integer9 = 1; integer9 <= 6; ++integer9) {
+                cfj10 = OceanMonumentCoreRoom.BASE_LIGHT;
+                if (integer9 == 2 || integer9 == 6) {
+                    cfj10 = OceanMonumentCoreRoom.BASE_GRAY;
                 }
-                for (int integer8 = 0; integer8 <= 15; integer8 += 15) {
-                    this.generateBox(bjx, clb, integer8, integer7, 0, integer8, integer7, 1, byj8, byj8, false);
-                    this.generateBox(bjx, clb, integer8, integer7, 6, integer8, integer7, 9, byj8, byj8, false);
-                    this.generateBox(bjx, clb, integer8, integer7, 14, integer8, integer7, 15, byj8, byj8, false);
+                for (int integer10 = 0; integer10 <= 15; integer10 += 15) {
+                    this.generateBox(bqu, ctd, integer10, integer9, 0, integer10, integer9, 1, cfj10, cfj10, false);
+                    this.generateBox(bqu, ctd, integer10, integer9, 6, integer10, integer9, 9, cfj10, cfj10, false);
+                    this.generateBox(bqu, ctd, integer10, integer9, 14, integer10, integer9, 15, cfj10, cfj10, false);
                 }
-                this.generateBox(bjx, clb, 1, integer7, 0, 1, integer7, 0, byj8, byj8, false);
-                this.generateBox(bjx, clb, 6, integer7, 0, 9, integer7, 0, byj8, byj8, false);
-                this.generateBox(bjx, clb, 14, integer7, 0, 14, integer7, 0, byj8, byj8, false);
-                this.generateBox(bjx, clb, 1, integer7, 15, 14, integer7, 15, byj8, byj8, false);
+                this.generateBox(bqu, ctd, 1, integer9, 0, 1, integer9, 0, cfj10, cfj10, false);
+                this.generateBox(bqu, ctd, 6, integer9, 0, 9, integer9, 0, cfj10, cfj10, false);
+                this.generateBox(bqu, ctd, 14, integer9, 0, 14, integer9, 0, cfj10, cfj10, false);
+                this.generateBox(bqu, ctd, 1, integer9, 15, 14, integer9, 15, cfj10, cfj10, false);
             }
-            this.generateBox(bjx, clb, 6, 3, 6, 9, 6, 9, OceanMonumentCoreRoom.BASE_BLACK, OceanMonumentCoreRoom.BASE_BLACK, false);
-            this.generateBox(bjx, clb, 7, 4, 7, 8, 5, 8, Blocks.GOLD_BLOCK.defaultBlockState(), Blocks.GOLD_BLOCK.defaultBlockState(), false);
-            for (integer7 = 3; integer7 <= 6; integer7 += 3) {
-                for (int integer9 = 6; integer9 <= 9; integer9 += 3) {
-                    this.placeBlock(bjx, OceanMonumentCoreRoom.LAMP_BLOCK, integer9, integer7, 6, clb);
-                    this.placeBlock(bjx, OceanMonumentCoreRoom.LAMP_BLOCK, integer9, integer7, 9, clb);
+            this.generateBox(bqu, ctd, 6, 3, 6, 9, 6, 9, OceanMonumentCoreRoom.BASE_BLACK, OceanMonumentCoreRoom.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 7, 4, 7, 8, 5, 8, Blocks.GOLD_BLOCK.defaultBlockState(), Blocks.GOLD_BLOCK.defaultBlockState(), false);
+            for (integer9 = 3; integer9 <= 6; integer9 += 3) {
+                for (int integer11 = 6; integer11 <= 9; integer11 += 3) {
+                    this.placeBlock(bqu, OceanMonumentCoreRoom.LAMP_BLOCK, integer11, integer9, 6, ctd);
+                    this.placeBlock(bqu, OceanMonumentCoreRoom.LAMP_BLOCK, integer11, integer9, 9, ctd);
                 }
             }
-            this.generateBox(bjx, clb, 5, 1, 6, 5, 2, 6, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 1, 9, 5, 2, 9, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 10, 1, 6, 10, 2, 6, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 10, 1, 9, 10, 2, 9, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, 1, 5, 6, 2, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 9, 1, 5, 9, 2, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, 1, 10, 6, 2, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 9, 1, 10, 9, 2, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 2, 5, 5, 6, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 2, 10, 5, 6, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 10, 2, 5, 10, 6, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 10, 2, 10, 10, 6, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 7, 1, 5, 7, 6, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 10, 7, 1, 10, 7, 6, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 5, 7, 9, 5, 7, 14, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 10, 7, 9, 10, 7, 14, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 7, 5, 6, 7, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 7, 10, 6, 7, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 9, 7, 5, 14, 7, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 9, 7, 10, 14, 7, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 2, 1, 2, 2, 1, 3, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 3, 1, 2, 3, 1, 2, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 13, 1, 2, 13, 1, 3, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 12, 1, 2, 12, 1, 2, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 2, 1, 12, 2, 1, 13, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 3, 1, 13, 3, 1, 13, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 13, 1, 12, 13, 1, 13, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 12, 1, 13, 12, 1, 13, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 1, 6, 5, 2, 6, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 1, 9, 5, 2, 9, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 10, 1, 6, 10, 2, 6, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 10, 1, 9, 10, 2, 9, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, 1, 5, 6, 2, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 9, 1, 5, 9, 2, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, 1, 10, 6, 2, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 9, 1, 10, 9, 2, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 2, 5, 5, 6, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 2, 10, 5, 6, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 10, 2, 5, 10, 6, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 10, 2, 10, 10, 6, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 7, 1, 5, 7, 6, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 10, 7, 1, 10, 7, 6, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 5, 7, 9, 5, 7, 14, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 10, 7, 9, 10, 7, 14, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 7, 5, 6, 7, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 7, 10, 6, 7, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 9, 7, 5, 14, 7, 5, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 9, 7, 10, 14, 7, 10, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 2, 1, 2, 2, 1, 3, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 3, 1, 2, 3, 1, 2, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 13, 1, 2, 13, 1, 3, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 12, 1, 2, 12, 1, 2, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 2, 1, 12, 2, 1, 13, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 3, 1, 13, 3, 1, 13, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 13, 1, 12, 13, 1, 13, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 12, 1, 13, 12, 1, 13, OceanMonumentCoreRoom.BASE_LIGHT, OceanMonumentCoreRoom.BASE_LIGHT, false);
             return true;
         }
     }
@@ -1396,147 +1398,147 @@ public class OceanMonumentPieces {
     public static class OceanMonumentWingRoom extends OceanMonumentPiece {
         private int mainDesign;
         
-        public OceanMonumentWingRoom(final Direction fp, final BoundingBox clb, final int integer) {
-            super(StructurePieceType.OCEAN_MONUMENT_WING_ROOM, fp, clb);
+        public OceanMonumentWingRoom(final Direction fz, final BoundingBox ctd, final int integer) {
+            super(StructurePieceType.OCEAN_MONUMENT_WING_ROOM, fz, ctd);
             this.mainDesign = (integer & 0x1);
         }
         
-        public OceanMonumentWingRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_WING_ROOM, jt);
+        public OceanMonumentWingRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_WING_ROOM, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
             if (this.mainDesign == 0) {
-                for (int integer7 = 0; integer7 < 4; ++integer7) {
-                    this.generateBox(bjx, clb, 10 - integer7, 3 - integer7, 20 - integer7, 12 + integer7, 3 - integer7, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                for (int integer9 = 0; integer9 < 4; ++integer9) {
+                    this.generateBox(bqu, ctd, 10 - integer9, 3 - integer9, 20 - integer9, 12 + integer9, 3 - integer9, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
                 }
-                this.generateBox(bjx, clb, 7, 0, 6, 15, 0, 16, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 6, 0, 6, 6, 3, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 16, 0, 6, 16, 3, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 7, 1, 7, 7, 1, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 15, 1, 7, 15, 1, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 7, 1, 6, 9, 3, 6, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 13, 1, 6, 15, 3, 6, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 8, 1, 7, 9, 1, 7, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 13, 1, 7, 14, 1, 7, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 9, 0, 5, 13, 0, 5, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 10, 0, 7, 12, 0, 7, OceanMonumentWingRoom.BASE_BLACK, OceanMonumentWingRoom.BASE_BLACK, false);
-                this.generateBox(bjx, clb, 8, 0, 10, 8, 0, 12, OceanMonumentWingRoom.BASE_BLACK, OceanMonumentWingRoom.BASE_BLACK, false);
-                this.generateBox(bjx, clb, 14, 0, 10, 14, 0, 12, OceanMonumentWingRoom.BASE_BLACK, OceanMonumentWingRoom.BASE_BLACK, false);
-                for (int integer7 = 18; integer7 >= 7; integer7 -= 3) {
-                    this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 6, 3, integer7, clb);
-                    this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 16, 3, integer7, clb);
+                this.generateBox(bqu, ctd, 7, 0, 6, 15, 0, 16, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 6, 0, 6, 6, 3, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 16, 0, 6, 16, 3, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 7, 1, 7, 7, 1, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 15, 1, 7, 15, 1, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 7, 1, 6, 9, 3, 6, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 13, 1, 6, 15, 3, 6, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 8, 1, 7, 9, 1, 7, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 13, 1, 7, 14, 1, 7, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 9, 0, 5, 13, 0, 5, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 10, 0, 7, 12, 0, 7, OceanMonumentWingRoom.BASE_BLACK, OceanMonumentWingRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 8, 0, 10, 8, 0, 12, OceanMonumentWingRoom.BASE_BLACK, OceanMonumentWingRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 14, 0, 10, 14, 0, 12, OceanMonumentWingRoom.BASE_BLACK, OceanMonumentWingRoom.BASE_BLACK, false);
+                for (int integer9 = 18; integer9 >= 7; integer9 -= 3) {
+                    this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 6, 3, integer9, ctd);
+                    this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 16, 3, integer9, ctd);
                 }
-                this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 10, 0, 10, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 12, 0, 10, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 10, 0, 12, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 12, 0, 12, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 8, 3, 6, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 14, 3, 6, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, 4, 2, 4, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 4, 1, 4, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, 4, 0, 4, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, 18, 2, 4, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 18, 1, 4, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, 18, 0, 4, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, 4, 2, 18, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 4, 1, 18, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, 4, 0, 18, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, 18, 2, 18, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, 18, 1, 18, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, 18, 0, 18, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, 9, 7, 20, clb);
-                this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, 13, 7, 20, clb);
-                this.generateBox(bjx, clb, 6, 0, 21, 7, 4, 21, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 15, 0, 21, 16, 4, 21, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.spawnElder(bjx, clb, 11, 2, 16);
+                this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 10, 0, 10, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 12, 0, 10, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 10, 0, 12, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 12, 0, 12, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 8, 3, 6, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 14, 3, 6, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, 4, 2, 4, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 4, 1, 4, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, 4, 0, 4, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, 18, 2, 4, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 18, 1, 4, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, 18, 0, 4, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, 4, 2, 18, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 4, 1, 18, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, 4, 0, 18, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, 18, 2, 18, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, 18, 1, 18, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, 18, 0, 18, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, 9, 7, 20, ctd);
+                this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, 13, 7, 20, ctd);
+                this.generateBox(bqu, ctd, 6, 0, 21, 7, 4, 21, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 15, 0, 21, 16, 4, 21, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.spawnElder(bqu, ctd, 11, 2, 16);
             }
             else if (this.mainDesign == 1) {
-                this.generateBox(bjx, clb, 9, 3, 18, 13, 3, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 9, 0, 18, 9, 2, 18, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                this.generateBox(bjx, clb, 13, 0, 18, 13, 2, 18, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                int integer7 = 9;
-                final int integer8 = 20;
-                final int integer9 = 5;
-                for (int integer10 = 0; integer10 < 2; ++integer10) {
-                    this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, integer7, 6, 20, clb);
-                    this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, integer7, 5, 20, clb);
-                    this.placeBlock(bjx, OceanMonumentWingRoom.BASE_LIGHT, integer7, 4, 20, clb);
-                    integer7 = 13;
+                this.generateBox(bqu, ctd, 9, 3, 18, 13, 3, 20, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 9, 0, 18, 9, 2, 18, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                this.generateBox(bqu, ctd, 13, 0, 18, 13, 2, 18, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                int integer9 = 9;
+                final int integer10 = 20;
+                final int integer11 = 5;
+                for (int integer12 = 0; integer12 < 2; ++integer12) {
+                    this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, integer9, 6, 20, ctd);
+                    this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, integer9, 5, 20, ctd);
+                    this.placeBlock(bqu, OceanMonumentWingRoom.BASE_LIGHT, integer9, 4, 20, ctd);
+                    integer9 = 13;
                 }
-                this.generateBox(bjx, clb, 7, 3, 7, 15, 3, 14, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                integer7 = 10;
-                for (int integer10 = 0; integer10 < 2; ++integer10) {
-                    this.generateBox(bjx, clb, integer7, 0, 10, integer7, 6, 10, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer7, 0, 12, integer7, 6, 12, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                    this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, integer7, 0, 10, clb);
-                    this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, integer7, 0, 12, clb);
-                    this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, integer7, 4, 10, clb);
-                    this.placeBlock(bjx, OceanMonumentWingRoom.LAMP_BLOCK, integer7, 4, 12, clb);
-                    integer7 = 12;
+                this.generateBox(bqu, ctd, 7, 3, 7, 15, 3, 14, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                integer9 = 10;
+                for (int integer12 = 0; integer12 < 2; ++integer12) {
+                    this.generateBox(bqu, ctd, integer9, 0, 10, integer9, 6, 10, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, integer9, 0, 12, integer9, 6, 12, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                    this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, integer9, 0, 10, ctd);
+                    this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, integer9, 0, 12, ctd);
+                    this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, integer9, 4, 10, ctd);
+                    this.placeBlock(bqu, OceanMonumentWingRoom.LAMP_BLOCK, integer9, 4, 12, ctd);
+                    integer9 = 12;
                 }
-                integer7 = 8;
-                for (int integer10 = 0; integer10 < 2; ++integer10) {
-                    this.generateBox(bjx, clb, integer7, 0, 7, integer7, 2, 7, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                    this.generateBox(bjx, clb, integer7, 0, 14, integer7, 2, 14, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
-                    integer7 = 14;
+                integer9 = 8;
+                for (int integer12 = 0; integer12 < 2; ++integer12) {
+                    this.generateBox(bqu, ctd, integer9, 0, 7, integer9, 2, 7, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                    this.generateBox(bqu, ctd, integer9, 0, 14, integer9, 2, 14, OceanMonumentWingRoom.BASE_LIGHT, OceanMonumentWingRoom.BASE_LIGHT, false);
+                    integer9 = 14;
                 }
-                this.generateBox(bjx, clb, 8, 3, 8, 8, 3, 13, OceanMonumentWingRoom.BASE_BLACK, OceanMonumentWingRoom.BASE_BLACK, false);
-                this.generateBox(bjx, clb, 14, 3, 8, 14, 3, 13, OceanMonumentWingRoom.BASE_BLACK, OceanMonumentWingRoom.BASE_BLACK, false);
-                this.spawnElder(bjx, clb, 11, 5, 13);
+                this.generateBox(bqu, ctd, 8, 3, 8, 8, 3, 13, OceanMonumentWingRoom.BASE_BLACK, OceanMonumentWingRoom.BASE_BLACK, false);
+                this.generateBox(bqu, ctd, 14, 3, 8, 14, 3, 13, OceanMonumentWingRoom.BASE_BLACK, OceanMonumentWingRoom.BASE_BLACK, false);
+                this.spawnElder(bqu, ctd, 11, 5, 13);
             }
             return true;
         }
     }
     
     public static class OceanMonumentPenthouse extends OceanMonumentPiece {
-        public OceanMonumentPenthouse(final Direction fp, final BoundingBox clb) {
-            super(StructurePieceType.OCEAN_MONUMENT_PENTHOUSE, fp, clb);
+        public OceanMonumentPenthouse(final Direction fz, final BoundingBox ctd) {
+            super(StructurePieceType.OCEAN_MONUMENT_PENTHOUSE, fz, ctd);
         }
         
-        public OceanMonumentPenthouse(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_MONUMENT_PENTHOUSE, jt);
+        public OceanMonumentPenthouse(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_MONUMENT_PENTHOUSE, le);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 2, -1, 2, 11, -1, 11, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 0, -1, 0, 1, -1, 11, OceanMonumentPenthouse.BASE_GRAY, OceanMonumentPenthouse.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 12, -1, 0, 13, -1, 11, OceanMonumentPenthouse.BASE_GRAY, OceanMonumentPenthouse.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 2, -1, 0, 11, -1, 1, OceanMonumentPenthouse.BASE_GRAY, OceanMonumentPenthouse.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 2, -1, 12, 11, -1, 13, OceanMonumentPenthouse.BASE_GRAY, OceanMonumentPenthouse.BASE_GRAY, false);
-            this.generateBox(bjx, clb, 0, 0, 0, 0, 0, 13, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 13, 0, 0, 13, 0, 13, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 0, 0, 12, 0, 0, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 1, 0, 13, 12, 0, 13, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
-            for (int integer7 = 2; integer7 <= 11; integer7 += 3) {
-                this.placeBlock(bjx, OceanMonumentPenthouse.LAMP_BLOCK, 0, 0, integer7, clb);
-                this.placeBlock(bjx, OceanMonumentPenthouse.LAMP_BLOCK, 13, 0, integer7, clb);
-                this.placeBlock(bjx, OceanMonumentPenthouse.LAMP_BLOCK, integer7, 0, 0, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 2, -1, 2, 11, -1, 11, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 0, -1, 0, 1, -1, 11, OceanMonumentPenthouse.BASE_GRAY, OceanMonumentPenthouse.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 12, -1, 0, 13, -1, 11, OceanMonumentPenthouse.BASE_GRAY, OceanMonumentPenthouse.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 2, -1, 0, 11, -1, 1, OceanMonumentPenthouse.BASE_GRAY, OceanMonumentPenthouse.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 2, -1, 12, 11, -1, 13, OceanMonumentPenthouse.BASE_GRAY, OceanMonumentPenthouse.BASE_GRAY, false);
+            this.generateBox(bqu, ctd, 0, 0, 0, 0, 0, 13, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 13, 0, 0, 13, 0, 13, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 0, 0, 12, 0, 0, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 1, 0, 13, 12, 0, 13, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            for (int integer9 = 2; integer9 <= 11; integer9 += 3) {
+                this.placeBlock(bqu, OceanMonumentPenthouse.LAMP_BLOCK, 0, 0, integer9, ctd);
+                this.placeBlock(bqu, OceanMonumentPenthouse.LAMP_BLOCK, 13, 0, integer9, ctd);
+                this.placeBlock(bqu, OceanMonumentPenthouse.LAMP_BLOCK, integer9, 0, 0, ctd);
             }
-            this.generateBox(bjx, clb, 2, 0, 3, 4, 0, 9, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 9, 0, 3, 11, 0, 9, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 4, 0, 9, 9, 0, 11, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
-            this.placeBlock(bjx, OceanMonumentPenthouse.BASE_LIGHT, 5, 0, 8, clb);
-            this.placeBlock(bjx, OceanMonumentPenthouse.BASE_LIGHT, 8, 0, 8, clb);
-            this.placeBlock(bjx, OceanMonumentPenthouse.BASE_LIGHT, 10, 0, 10, clb);
-            this.placeBlock(bjx, OceanMonumentPenthouse.BASE_LIGHT, 3, 0, 10, clb);
-            this.generateBox(bjx, clb, 3, 0, 3, 3, 0, 7, OceanMonumentPenthouse.BASE_BLACK, OceanMonumentPenthouse.BASE_BLACK, false);
-            this.generateBox(bjx, clb, 10, 0, 3, 10, 0, 7, OceanMonumentPenthouse.BASE_BLACK, OceanMonumentPenthouse.BASE_BLACK, false);
-            this.generateBox(bjx, clb, 6, 0, 10, 7, 0, 10, OceanMonumentPenthouse.BASE_BLACK, OceanMonumentPenthouse.BASE_BLACK, false);
-            int integer7 = 3;
-            for (int integer8 = 0; integer8 < 2; ++integer8) {
-                for (int integer9 = 2; integer9 <= 8; integer9 += 3) {
-                    this.generateBox(bjx, clb, integer7, 0, integer9, integer7, 2, integer9, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 2, 0, 3, 4, 0, 9, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 9, 0, 3, 11, 0, 9, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 4, 0, 9, 9, 0, 11, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            this.placeBlock(bqu, OceanMonumentPenthouse.BASE_LIGHT, 5, 0, 8, ctd);
+            this.placeBlock(bqu, OceanMonumentPenthouse.BASE_LIGHT, 8, 0, 8, ctd);
+            this.placeBlock(bqu, OceanMonumentPenthouse.BASE_LIGHT, 10, 0, 10, ctd);
+            this.placeBlock(bqu, OceanMonumentPenthouse.BASE_LIGHT, 3, 0, 10, ctd);
+            this.generateBox(bqu, ctd, 3, 0, 3, 3, 0, 7, OceanMonumentPenthouse.BASE_BLACK, OceanMonumentPenthouse.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 10, 0, 3, 10, 0, 7, OceanMonumentPenthouse.BASE_BLACK, OceanMonumentPenthouse.BASE_BLACK, false);
+            this.generateBox(bqu, ctd, 6, 0, 10, 7, 0, 10, OceanMonumentPenthouse.BASE_BLACK, OceanMonumentPenthouse.BASE_BLACK, false);
+            int integer9 = 3;
+            for (int integer10 = 0; integer10 < 2; ++integer10) {
+                for (int integer11 = 2; integer11 <= 8; integer11 += 3) {
+                    this.generateBox(bqu, ctd, integer9, 0, integer11, integer9, 2, integer11, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
                 }
-                integer7 = 10;
+                integer9 = 10;
             }
-            this.generateBox(bjx, clb, 5, 0, 10, 5, 2, 10, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 8, 0, 10, 8, 2, 10, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
-            this.generateBox(bjx, clb, 6, -1, 7, 7, -1, 8, OceanMonumentPenthouse.BASE_BLACK, OceanMonumentPenthouse.BASE_BLACK, false);
-            this.generateWaterBox(bjx, clb, 6, -1, 3, 7, -1, 4);
-            this.spawnElder(bjx, clb, 6, 1, 6);
+            this.generateBox(bqu, ctd, 5, 0, 10, 5, 2, 10, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 8, 0, 10, 8, 2, 10, OceanMonumentPenthouse.BASE_LIGHT, OceanMonumentPenthouse.BASE_LIGHT, false);
+            this.generateBox(bqu, ctd, 6, -1, 7, 7, -1, 8, OceanMonumentPenthouse.BASE_BLACK, OceanMonumentPenthouse.BASE_BLACK, false);
+            this.generateWaterBox(bqu, ctd, 6, -1, 3, 7, -1, 4);
+            this.spawnElder(bqu, ctd, 6, 1, 6);
             return true;
         }
     }
@@ -1555,9 +1557,9 @@ public class OceanMonumentPieces {
             this.index = integer;
         }
         
-        public void setConnection(final Direction fp, final RoomDefinition v) {
-            this.connections[fp.get3DDataValue()] = v;
-            v.connections[fp.getOpposite().get3DDataValue()] = this;
+        public void setConnection(final Direction fz, final RoomDefinition v) {
+            this.connections[fz.get3DDataValue()] = v;
+            v.connections[fz.getOpposite().get3DDataValue()] = this;
         }
         
         public void updateOpenings() {
@@ -1604,9 +1606,9 @@ public class OceanMonumentPieces {
         }
         
         @Override
-        public OceanMonumentPiece create(final Direction fp, final RoomDefinition v, final Random random) {
+        public OceanMonumentPiece create(final Direction fz, final RoomDefinition v, final Random random) {
             v.claimed = true;
-            return new OceanMonumentSimpleRoom(fp, v, random);
+            return new OceanMonumentSimpleRoom(fz, v, random);
         }
     }
     
@@ -1620,9 +1622,9 @@ public class OceanMonumentPieces {
         }
         
         @Override
-        public OceanMonumentPiece create(final Direction fp, final RoomDefinition v, final Random random) {
+        public OceanMonumentPiece create(final Direction fz, final RoomDefinition v, final Random random) {
             v.claimed = true;
-            return new OceanMonumentSimpleTopRoom(fp, v);
+            return new OceanMonumentSimpleTopRoom(fz, v);
         }
     }
     
@@ -1636,10 +1638,10 @@ public class OceanMonumentPieces {
         }
         
         @Override
-        public OceanMonumentPiece create(final Direction fp, final RoomDefinition v, final Random random) {
+        public OceanMonumentPiece create(final Direction fz, final RoomDefinition v, final Random random) {
             v.claimed = true;
             v.connections[Direction.UP.get3DDataValue()].claimed = true;
-            return new OceanMonumentDoubleYRoom(fp, v);
+            return new OceanMonumentDoubleYRoom(fz, v);
         }
     }
     
@@ -1653,10 +1655,10 @@ public class OceanMonumentPieces {
         }
         
         @Override
-        public OceanMonumentPiece create(final Direction fp, final RoomDefinition v, final Random random) {
+        public OceanMonumentPiece create(final Direction fz, final RoomDefinition v, final Random random) {
             v.claimed = true;
             v.connections[Direction.EAST.get3DDataValue()].claimed = true;
-            return new OceanMonumentDoubleXRoom(fp, v);
+            return new OceanMonumentDoubleXRoom(fz, v);
         }
     }
     
@@ -1670,14 +1672,14 @@ public class OceanMonumentPieces {
         }
         
         @Override
-        public OceanMonumentPiece create(final Direction fp, final RoomDefinition v, final Random random) {
+        public OceanMonumentPiece create(final Direction fz, final RoomDefinition v, final Random random) {
             RoomDefinition v2 = v;
             if (!v.hasOpening[Direction.NORTH.get3DDataValue()] || v.connections[Direction.NORTH.get3DDataValue()].claimed) {
                 v2 = v.connections[Direction.SOUTH.get3DDataValue()];
             }
             v2.claimed = true;
             v2.connections[Direction.NORTH.get3DDataValue()].claimed = true;
-            return new OceanMonumentDoubleZRoom(fp, v2);
+            return new OceanMonumentDoubleZRoom(fz, v2);
         }
     }
     
@@ -1695,12 +1697,12 @@ public class OceanMonumentPieces {
         }
         
         @Override
-        public OceanMonumentPiece create(final Direction fp, final RoomDefinition v, final Random random) {
+        public OceanMonumentPiece create(final Direction fz, final RoomDefinition v, final Random random) {
             v.claimed = true;
             v.connections[Direction.EAST.get3DDataValue()].claimed = true;
             v.connections[Direction.UP.get3DDataValue()].claimed = true;
             v.connections[Direction.EAST.get3DDataValue()].connections[Direction.UP.get3DDataValue()].claimed = true;
-            return new OceanMonumentDoubleXYRoom(fp, v);
+            return new OceanMonumentDoubleXYRoom(fz, v);
         }
     }
     
@@ -1718,18 +1720,18 @@ public class OceanMonumentPieces {
         }
         
         @Override
-        public OceanMonumentPiece create(final Direction fp, final RoomDefinition v, final Random random) {
+        public OceanMonumentPiece create(final Direction fz, final RoomDefinition v, final Random random) {
             v.claimed = true;
             v.connections[Direction.NORTH.get3DDataValue()].claimed = true;
             v.connections[Direction.UP.get3DDataValue()].claimed = true;
             v.connections[Direction.NORTH.get3DDataValue()].connections[Direction.UP.get3DDataValue()].claimed = true;
-            return new OceanMonumentDoubleYZRoom(fp, v);
+            return new OceanMonumentDoubleYZRoom(fz, v);
         }
     }
     
     interface MonumentRoomFitter {
         boolean fits(final RoomDefinition v);
         
-        OceanMonumentPiece create(final Direction fp, final RoomDefinition v, final Random random);
+        OceanMonumentPiece create(final Direction fz, final RoomDefinition v, final Random random);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/OceanRuinFeature.java b/src/net/minecraft/world/level/levelgen/structure/OceanRuinFeature.java
index 2e07158..8326239 100644
--- a/src/net/minecraft/world/level/levelgen/structure/OceanRuinFeature.java
+++ b/src/net/minecraft/world/level/levelgen/structure/OceanRuinFeature.java
@@ -1,78 +1,53 @@
 package net.minecraft.world.level.levelgen.structure;
 
-import net.minecraft.world.level.levelgen.ChunkGeneratorSettings;
 import java.util.stream.Collectors;
 import java.util.Arrays;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import java.util.Map;
+import net.minecraft.util.StringRepresentable;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import java.util.Random;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.feature.configurations.OceanRuinConfiguration;
-import net.minecraft.world.level.levelgen.feature.RandomScatteredFeature;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 
-public class OceanRuinFeature extends RandomScatteredFeature<OceanRuinConfiguration> {
-    public OceanRuinFeature(final Function<Dynamic<?>, ? extends OceanRuinConfiguration> function) {
-        super(function);
+public class OceanRuinFeature extends StructureFeature<OceanRuinConfiguration> {
+    public OceanRuinFeature(final Codec<OceanRuinConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public String getFeatureName() {
-        return "Ocean_Ruin";
-    }
-    
-    @Override
-    public int getLookupRange() {
-        return 3;
-    }
-    
-    @Override
-    protected int getSpacing(final ChunkGenerator<?> caa) {
-        return ((ChunkGeneratorSettings)caa.getSettings()).getOceanRuinSpacing();
-    }
-    
-    @Override
-    protected int getSeparation(final ChunkGenerator<?> caa) {
-        return ((ChunkGeneratorSettings)caa.getSettings()).getOceanRuinSeparation();
-    }
-    
-    @Override
-    public StructureStartFactory getStartFactory() {
+    public StructureStartFactory<OceanRuinConfiguration> getStartFactory() {
         return OceanRuinStart::new;
     }
     
-    @Override
-    protected int getRandomSalt() {
-        return 14357621;
-    }
-    
-    public static class OceanRuinStart extends StructureStart {
-        public OceanRuinStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
-            super(cfl, integer2, integer3, clb, integer5, long6);
+    public static class OceanRuinStart extends StructureStart<OceanRuinConfiguration> {
+        public OceanRuinStart(final StructureFeature<OceanRuinConfiguration> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
+            super(cml, integer2, integer3, ctd, integer5, long6);
         }
         
         @Override
-        public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
-            final OceanRuinConfiguration cgw7 = caa.<OceanRuinConfiguration>getStructureConfiguration(bkt, Feature.OCEAN_RUIN);
+        public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final OceanRuinConfiguration cob) {
             final int integer5 = integer3 * 16;
             final int integer6 = integer4 * 16;
-            final BlockPos fk10 = new BlockPos(integer5, 90, integer6);
-            final Rotation btu11 = Rotation.values()[this.random.nextInt(Rotation.values().length)];
-            OceanRuinPieces.addPieces(cmo, fk10, btu11, this.pieces, this.random, cgw7);
+            final BlockPos fu10 = new BlockPos(integer5, 90, integer6);
+            final Rotation cap11 = Rotation.getRandom(this.random);
+            OceanRuinPieces.addPieces(cva, fu10, cap11, this.pieces, this.random, cob);
             this.calculateBoundingBox();
         }
     }
     
-    public enum Type {
+    public enum Type implements StringRepresentable {
         WARM("warm"), 
         COLD("cold");
         
+        public static final Codec<Type> CODEC;
         private static final Map<String, Type> BY_NAME;
         private final String name;
         
@@ -84,11 +59,18 @@ public class OceanRuinFeature extends RandomScatteredFeature<OceanRuinConfigurat
             return this.name;
         }
         
+        @Nullable
         public static Type byName(final String string) {
             return Type.BY_NAME.get(string);
         }
         
+        @Override
+        public String getSerializedName() {
+            return this.name;
+        }
+        
         static {
+            CODEC = StringRepresentable.<Type>fromEnum(Type::values, Type::byName);
             BY_NAME = Arrays.<Type>stream(values()).collect(Collectors.toMap(Type::getName, b -> b));
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/structure/OceanRuinPieces.java b/src/net/minecraft/world/level/levelgen/structure/OceanRuinPieces.java
index 75fd1f6..0b419bb 100644
--- a/src/net/minecraft/world/level/levelgen/structure/OceanRuinPieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/OceanRuinPieces.java
@@ -1,8 +1,9 @@
 package net.minecraft.world.level.levelgen.structure;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.material.FluidState;
 import java.util.Iterator;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.core.Vec3i;
@@ -10,6 +11,8 @@ import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.structure.templatesystem.BlockRotProcessor;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.SpawnGroupData;
@@ -19,6 +22,8 @@ import net.minecraft.world.entity.monster.Drowned;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.block.ChestBlock;
 import net.minecraft.world.level.block.Blocks;
@@ -38,6 +43,7 @@ import java.util.List;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.Util;
 import java.util.Random;
 import net.minecraft.resources.ResourceLocation;
 
@@ -52,40 +58,40 @@ public class OceanRuinPieces {
     private static final ResourceLocation[] BIG_WARM_RUINS;
     
     private static ResourceLocation getSmallWarmRuin(final Random random) {
-        return OceanRuinPieces.WARM_RUINS[random.nextInt(OceanRuinPieces.WARM_RUINS.length)];
+        return Util.<ResourceLocation>getRandom(OceanRuinPieces.WARM_RUINS, random);
     }
     
     private static ResourceLocation getBigWarmRuin(final Random random) {
-        return OceanRuinPieces.BIG_WARM_RUINS[random.nextInt(OceanRuinPieces.BIG_WARM_RUINS.length)];
+        return Util.<ResourceLocation>getRandom(OceanRuinPieces.BIG_WARM_RUINS, random);
     }
     
-    public static void addPieces(final StructureManager cmo, final BlockPos fk, final Rotation btu, final List<StructurePiece> list, final Random random, final OceanRuinConfiguration cgw) {
-        final boolean boolean7 = random.nextFloat() <= cgw.largeProbability;
+    public static void addPieces(final StructureManager cva, final BlockPos fu, final Rotation cap, final List<StructurePiece> list, final Random random, final OceanRuinConfiguration cob) {
+        final boolean boolean7 = random.nextFloat() <= cob.largeProbability;
         final float float8 = boolean7 ? 0.9f : 0.8f;
-        addPiece(cmo, fk, btu, list, random, cgw, boolean7, float8);
-        if (boolean7 && random.nextFloat() <= cgw.clusterProbability) {
-            addClusterRuins(cmo, random, btu, fk, cgw, list);
+        addPiece(cva, fu, cap, list, random, cob, boolean7, float8);
+        if (boolean7 && random.nextFloat() <= cob.clusterProbability) {
+            addClusterRuins(cva, random, cap, fu, cob, list);
         }
     }
     
-    private static void addClusterRuins(final StructureManager cmo, final Random random, final Rotation btu, final BlockPos fk, final OceanRuinConfiguration cgw, final List<StructurePiece> list) {
-        final int integer7 = fk.getX();
-        final int integer8 = fk.getZ();
-        final BlockPos fk2 = StructureTemplate.transform(new BlockPos(15, 0, 15), Mirror.NONE, btu, BlockPos.ZERO).offset(integer7, 0, integer8);
-        final BoundingBox clb10 = BoundingBox.createProper(integer7, 0, integer8, fk2.getX(), 0, fk2.getZ());
-        final BlockPos fk3 = new BlockPos(Math.min(integer7, fk2.getX()), 0, Math.min(integer8, fk2.getZ()));
-        final List<BlockPos> list2 = allPositions(random, fk3.getX(), fk3.getZ());
+    private static void addClusterRuins(final StructureManager cva, final Random random, final Rotation cap, final BlockPos fu, final OceanRuinConfiguration cob, final List<StructurePiece> list) {
+        final int integer7 = fu.getX();
+        final int integer8 = fu.getZ();
+        final BlockPos fu2 = StructureTemplate.transform(new BlockPos(15, 0, 15), Mirror.NONE, cap, BlockPos.ZERO).offset(integer7, 0, integer8);
+        final BoundingBox ctd10 = BoundingBox.createProper(integer7, 0, integer8, fu2.getX(), 0, fu2.getZ());
+        final BlockPos fu3 = new BlockPos(Math.min(integer7, fu2.getX()), 0, Math.min(integer8, fu2.getZ()));
+        final List<BlockPos> list2 = allPositions(random, fu3.getX(), fu3.getZ());
         for (int integer9 = Mth.nextInt(random, 4, 8), integer10 = 0; integer10 < integer9; ++integer10) {
             if (!list2.isEmpty()) {
                 final int integer11 = random.nextInt(list2.size());
-                final BlockPos fk4 = list2.remove(integer11);
-                final int integer12 = fk4.getX();
-                final int integer13 = fk4.getZ();
-                final Rotation btu2 = Rotation.values()[random.nextInt(Rotation.values().length)];
-                final BlockPos fk5 = StructureTemplate.transform(new BlockPos(5, 0, 6), Mirror.NONE, btu2, BlockPos.ZERO).offset(integer12, 0, integer13);
-                final BoundingBox clb11 = BoundingBox.createProper(integer12, 0, integer13, fk5.getX(), 0, fk5.getZ());
-                if (!clb11.intersects(clb10)) {
-                    addPiece(cmo, fk4, btu2, list, random, cgw, false, 0.8f);
+                final BlockPos fu4 = list2.remove(integer11);
+                final int integer12 = fu4.getX();
+                final int integer13 = fu4.getZ();
+                final Rotation cap2 = Rotation.getRandom(random);
+                final BlockPos fu5 = StructureTemplate.transform(new BlockPos(5, 0, 6), Mirror.NONE, cap2, BlockPos.ZERO).offset(integer12, 0, integer13);
+                final BoundingBox ctd11 = BoundingBox.createProper(integer12, 0, integer13, fu5.getX(), 0, fu5.getZ());
+                if (!ctd11.intersects(ctd10)) {
+                    addPiece(cva, fu4, cap2, list, random, cob, false, 0.8f);
                 }
             }
         }
@@ -104,19 +110,19 @@ public class OceanRuinPieces {
         return list4;
     }
     
-    private static void addPiece(final StructureManager cmo, final BlockPos fk, final Rotation btu, final List<StructurePiece> list, final Random random, final OceanRuinConfiguration cgw, final boolean boolean7, final float float8) {
-        if (cgw.biomeTemp == OceanRuinFeature.Type.WARM) {
-            final ResourceLocation sm9 = boolean7 ? getBigWarmRuin(random) : getSmallWarmRuin(random);
-            list.add(new OceanRuinPiece(cmo, sm9, fk, btu, float8, cgw.biomeTemp, boolean7));
+    private static void addPiece(final StructureManager cva, final BlockPos fu, final Rotation cap, final List<StructurePiece> list, final Random random, final OceanRuinConfiguration cob, final boolean boolean7, final float float8) {
+        if (cob.biomeTemp == OceanRuinFeature.Type.WARM) {
+            final ResourceLocation uh9 = boolean7 ? getBigWarmRuin(random) : getSmallWarmRuin(random);
+            list.add(new OceanRuinPiece(cva, uh9, fu, cap, float8, cob.biomeTemp, boolean7));
         }
-        else if (cgw.biomeTemp == OceanRuinFeature.Type.COLD) {
+        else if (cob.biomeTemp == OceanRuinFeature.Type.COLD) {
             final ResourceLocation[] arr9 = boolean7 ? OceanRuinPieces.BIG_RUINS_BRICK : OceanRuinPieces.RUINS_BRICK;
             final ResourceLocation[] arr10 = boolean7 ? OceanRuinPieces.BIG_RUINS_CRACKED : OceanRuinPieces.RUINS_CRACKED;
             final ResourceLocation[] arr11 = boolean7 ? OceanRuinPieces.BIG_RUINS_MOSSY : OceanRuinPieces.RUINS_MOSSY;
             final int integer12 = random.nextInt(arr9.length);
-            list.add(new OceanRuinPiece(cmo, arr9[integer12], fk, btu, float8, cgw.biomeTemp, boolean7));
-            list.add(new OceanRuinPiece(cmo, arr10[integer12], fk, btu, 0.7f, cgw.biomeTemp, boolean7));
-            list.add(new OceanRuinPiece(cmo, arr11[integer12], fk, btu, 0.5f, cgw.biomeTemp, boolean7));
+            list.add(new OceanRuinPiece(cva, arr9[integer12], fu, cap, float8, cob.biomeTemp, boolean7));
+            list.add(new OceanRuinPiece(cva, arr10[integer12], fu, cap, 0.7f, cob.biomeTemp, boolean7));
+            list.add(new OceanRuinPiece(cva, arr11[integer12], fu, cap, 0.5f, cob.biomeTemp, boolean7));
         }
     }
     
@@ -138,89 +144,89 @@ public class OceanRuinPieces {
         private final Rotation rotation;
         private final boolean isLarge;
         
-        public OceanRuinPiece(final StructureManager cmo, final ResourceLocation sm, final BlockPos fk, final Rotation btu, final float float5, final OceanRuinFeature.Type b, final boolean boolean7) {
+        public OceanRuinPiece(final StructureManager cva, final ResourceLocation uh, final BlockPos fu, final Rotation cap, final float float5, final OceanRuinFeature.Type b, final boolean boolean7) {
             super(StructurePieceType.OCEAN_RUIN, 0);
-            this.templateLocation = sm;
-            this.templatePosition = fk;
-            this.rotation = btu;
+            this.templateLocation = uh;
+            this.templatePosition = fu;
+            this.rotation = cap;
             this.integrity = float5;
             this.biomeType = b;
             this.isLarge = boolean7;
-            this.loadTemplate(cmo);
+            this.loadTemplate(cva);
         }
         
-        public OceanRuinPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.OCEAN_RUIN, jt);
-            this.templateLocation = new ResourceLocation(jt.getString("Template"));
-            this.rotation = Rotation.valueOf(jt.getString("Rot"));
-            this.integrity = jt.getFloat("Integrity");
-            this.biomeType = OceanRuinFeature.Type.valueOf(jt.getString("BiomeType"));
-            this.isLarge = jt.getBoolean("IsLarge");
-            this.loadTemplate(cmo);
+        public OceanRuinPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.OCEAN_RUIN, le);
+            this.templateLocation = new ResourceLocation(le.getString("Template"));
+            this.rotation = Rotation.valueOf(le.getString("Rot"));
+            this.integrity = le.getFloat("Integrity");
+            this.biomeType = OceanRuinFeature.Type.valueOf(le.getString("BiomeType"));
+            this.isLarge = le.getBoolean("IsLarge");
+            this.loadTemplate(cva);
         }
         
-        private void loadTemplate(final StructureManager cmo) {
-            final StructureTemplate cms3 = cmo.getOrCreate(this.templateLocation);
-            final StructurePlaceSettings cmp4 = new StructurePlaceSettings().setRotation(this.rotation).setMirror(Mirror.NONE).addProcessor(BlockIgnoreProcessor.STRUCTURE_AND_AIR);
-            this.setup(cms3, this.templatePosition, cmp4);
+        private void loadTemplate(final StructureManager cva) {
+            final StructureTemplate cve3 = cva.getOrCreate(this.templateLocation);
+            final StructurePlaceSettings cvb4 = new StructurePlaceSettings().setRotation(this.rotation).setMirror(Mirror.NONE).addProcessor(BlockIgnoreProcessor.STRUCTURE_AND_AIR);
+            this.setup(cve3, this.templatePosition, cvb4);
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putString("Template", this.templateLocation.toString());
-            jt.putString("Rot", this.rotation.name());
-            jt.putFloat("Integrity", this.integrity);
-            jt.putString("BiomeType", this.biomeType.toString());
-            jt.putBoolean("IsLarge", this.isLarge);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putString("Template", this.templateLocation.toString());
+            le.putString("Rot", this.rotation.name());
+            le.putFloat("Integrity", this.integrity);
+            le.putString("BiomeType", this.biomeType.toString());
+            le.putBoolean("IsLarge", this.isLarge);
         }
         
         @Override
-        protected void handleDataMarker(final String string, final BlockPos fk, final LevelAccessor bjx, final Random random, final BoundingBox clb) {
+        protected void handleDataMarker(final String string, final BlockPos fu, final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
             if ("chest".equals(string)) {
-                bjx.setBlock(fk, ((AbstractStateHolder<O, BlockState>)Blocks.CHEST.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)ChestBlock.WATERLOGGED, bjx.getFluidState(fk).is(FluidTags.WATER)), 2);
-                final BlockEntity bwl7 = bjx.getBlockEntity(fk);
-                if (bwl7 instanceof ChestBlockEntity) {
-                    ((ChestBlockEntity)bwl7).setLootTable(this.isLarge ? BuiltInLootTables.UNDERWATER_RUIN_BIG : BuiltInLootTables.UNDERWATER_RUIN_SMALL, random.nextLong());
+                bqc.setBlock(fu, ((StateHolder<O, BlockState>)Blocks.CHEST.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)ChestBlock.WATERLOGGED, bqc.getFluidState(fu).is(FluidTags.WATER)), 2);
+                final BlockEntity cdl7 = bqc.getBlockEntity(fu);
+                if (cdl7 instanceof ChestBlockEntity) {
+                    ((ChestBlockEntity)cdl7).setLootTable(this.isLarge ? BuiltInLootTables.UNDERWATER_RUIN_BIG : BuiltInLootTables.UNDERWATER_RUIN_SMALL, random.nextLong());
                 }
             }
             else if ("drowned".equals(string)) {
-                final Drowned awk7 = EntityType.DROWNED.create(bjx.getLevel());
-                awk7.setPersistenceRequired();
-                awk7.moveTo(fk, 0.0f, 0.0f);
-                awk7.finalizeSpawn(bjx, bjx.getCurrentDifficultyAt(fk), MobSpawnType.STRUCTURE, null, null);
-                bjx.addFreshEntity(awk7);
-                if (fk.getY() > bjx.getSeaLevel()) {
-                    bjx.setBlock(fk, Blocks.AIR.defaultBlockState(), 2);
+                final Drowned bbp7 = EntityType.DROWNED.create(bqc.getLevel());
+                bbp7.setPersistenceRequired();
+                bbp7.moveTo(fu, 0.0f, 0.0f);
+                bbp7.finalizeSpawn(bqc, bqc.getCurrentDifficultyAt(fu), MobSpawnType.STRUCTURE, null, null);
+                bqc.addFreshEntity(bbp7);
+                if (fu.getY() > bqc.getSeaLevel()) {
+                    bqc.setBlock(fu, Blocks.AIR.defaultBlockState(), 2);
                 }
                 else {
-                    bjx.setBlock(fk, Blocks.WATER.defaultBlockState(), 2);
+                    bqc.setBlock(fu, Blocks.WATER.defaultBlockState(), 2);
                 }
             }
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
             this.placeSettings.clearProcessors().addProcessor(new BlockRotProcessor(this.integrity)).addProcessor(BlockIgnoreProcessor.STRUCTURE_AND_AIR);
-            final int integer7 = bjx.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, this.templatePosition.getX(), this.templatePosition.getZ());
-            this.templatePosition = new BlockPos(this.templatePosition.getX(), integer7, this.templatePosition.getZ());
-            final BlockPos fk8 = StructureTemplate.transform(new BlockPos(this.template.getSize().getX() - 1, 0, this.template.getSize().getZ() - 1), Mirror.NONE, this.rotation, BlockPos.ZERO).offset(this.templatePosition);
-            this.templatePosition = new BlockPos(this.templatePosition.getX(), this.getHeight(this.templatePosition, bjx, fk8), this.templatePosition.getZ());
-            return super.postProcess(bjx, caa, random, clb, bjh);
+            final int integer9 = bqu.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, this.templatePosition.getX(), this.templatePosition.getZ());
+            this.templatePosition = new BlockPos(this.templatePosition.getX(), integer9, this.templatePosition.getZ());
+            final BlockPos fu2 = StructureTemplate.transform(new BlockPos(this.template.getSize().getX() - 1, 0, this.template.getSize().getZ() - 1), Mirror.NONE, this.rotation, BlockPos.ZERO).offset(this.templatePosition);
+            this.templatePosition = new BlockPos(this.templatePosition.getX(), this.getHeight(this.templatePosition, bqu, fu2), this.templatePosition.getZ());
+            return super.postProcess(bqu, bqq, cha, random, ctd, bph, fu);
         }
         
-        private int getHeight(final BlockPos fk1, final BlockGetter bjg, final BlockPos fk3) {
-            int integer5 = fk1.getY();
+        private int getHeight(final BlockPos fu1, final BlockGetter bpg, final BlockPos fu3) {
+            int integer5 = fu1.getY();
             int integer6 = 512;
             final int integer7 = integer5 - 1;
             int integer8 = 0;
-            for (final BlockPos fk4 : BlockPos.betweenClosed(fk1, fk3)) {
-                final int integer9 = fk4.getX();
-                final int integer10 = fk4.getZ();
-                int integer11 = fk1.getY() - 1;
+            for (final BlockPos fu4 : BlockPos.betweenClosed(fu1, fu3)) {
+                final int integer9 = fu4.getX();
+                final int integer10 = fu4.getZ();
+                int integer11 = fu1.getY() - 1;
                 final BlockPos.MutableBlockPos a14 = new BlockPos.MutableBlockPos(integer9, integer11, integer10);
-                BlockState byj15 = bjg.getBlockState(a14);
-                for (FluidState coj16 = bjg.getFluidState(a14); (byj15.isAir() || coj16.is(FluidTags.WATER) || byj15.getBlock().is(BlockTags.ICE)) && integer11 > 1; byj15 = bjg.getBlockState(a14), coj16 = bjg.getFluidState(a14)) {
+                BlockState cfj15 = bpg.getBlockState(a14);
+                for (FluidState cxa16 = bpg.getFluidState(a14); (cfj15.isAir() || cxa16.is(FluidTags.WATER) || cfj15.getBlock().is(BlockTags.ICE)) && integer11 > 1; cfj15 = bpg.getBlockState(a14), cxa16 = bpg.getFluidState(a14)) {
                     --integer11;
                     a14.set(integer9, integer11, integer10);
                 }
@@ -229,7 +235,7 @@ public class OceanRuinPieces {
                     ++integer8;
                 }
             }
-            final int integer12 = Math.abs(fk1.getX() - fk3.getX());
+            final int integer12 = Math.abs(fu1.getX() - fu3.getX());
             if (integer7 - integer6 > 2 && integer8 > integer12 - 2) {
                 integer5 = integer6 + 1;
             }
diff --git a/src/net/minecraft/world/level/levelgen/structure/PillagerOutpostPieces.java b/src/net/minecraft/world/level/levelgen/structure/PillagerOutpostPieces.java
index a82dab9..40dc430 100644
--- a/src/net/minecraft/world/level/levelgen/structure/PillagerOutpostPieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/PillagerOutpostPieces.java
@@ -11,7 +11,7 @@ import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElemen
 import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePool;
 import com.google.common.collect.ImmutableList;
 import com.mojang.datafixers.util.Pair;
-import net.minecraft.world.level.levelgen.feature.structures.SinglePoolElement;
+import net.minecraft.world.level.levelgen.feature.structures.LegacySinglePoolElement;
 import java.util.Random;
 import net.minecraft.world.level.levelgen.feature.structures.JigsawPlacement;
 import net.minecraft.resources.ResourceLocation;
@@ -22,24 +22,27 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
 import net.minecraft.world.level.chunk.ChunkGenerator;
 
 public class PillagerOutpostPieces {
-    public static void addPieces(final ChunkGenerator<?> caa, final StructureManager cmo, final BlockPos fk, final List<StructurePiece> list, final WorldgenRandom ccf) {
-        JigsawPlacement.addPieces(new ResourceLocation("pillager_outpost/base_plates"), 7, PillagerOutpostPiece::new, caa, cmo, fk, list, ccf);
+    public static void addPieces(final ChunkGenerator cha, final StructureManager cva, final BlockPos fu, final List<StructurePiece> list, final WorldgenRandom ciy) {
+        JigsawPlacement.addPieces(new ResourceLocation("pillager_outpost/base_plates"), 7, PillagerOutpostPiece::new, cha, cva, fu, list, ciy, true, true);
+    }
+    
+    public static void bootstrap() {
     }
     
     static {
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("pillager_outpost/base_plates"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("pillager_outpost/base_plate"), 1)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("pillager_outpost/towers"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new ListPoolElement(ImmutableList.of(new SinglePoolElement("pillager_outpost/watchtower"), new SinglePoolElement("pillager_outpost/watchtower_overgrown", ImmutableList.of(new BlockRotProcessor(0.05f))))), 1)), StructureTemplatePool.Projection.RIGID));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("pillager_outpost/feature_plates"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("pillager_outpost/feature_plate"), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
-        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("pillager_outpost/features"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new SinglePoolElement("pillager_outpost/feature_cage1"), 1), Pair.of(new SinglePoolElement("pillager_outpost/feature_cage2"), 1), Pair.of(new SinglePoolElement("pillager_outpost/feature_logs"), 1), Pair.of(new SinglePoolElement("pillager_outpost/feature_tent1"), 1), Pair.of(new SinglePoolElement("pillager_outpost/feature_tent2"), 1), Pair.of(new SinglePoolElement("pillager_outpost/feature_targets"), 1), Pair.of(EmptyPoolElement.INSTANCE, 6)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("pillager_outpost/base_plates"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new LegacySinglePoolElement("pillager_outpost/base_plate"), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("pillager_outpost/towers"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new ListPoolElement(ImmutableList.of(new LegacySinglePoolElement("pillager_outpost/watchtower"), new LegacySinglePoolElement("pillager_outpost/watchtower_overgrown", ImmutableList.of(new BlockRotProcessor(0.05f))))), 1)), StructureTemplatePool.Projection.RIGID));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("pillager_outpost/feature_plates"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new LegacySinglePoolElement("pillager_outpost/feature_plate"), 1)), StructureTemplatePool.Projection.TERRAIN_MATCHING));
+        JigsawPlacement.POOLS.register(new StructureTemplatePool(new ResourceLocation("pillager_outpost/features"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(new LegacySinglePoolElement("pillager_outpost/feature_cage1"), 1), Pair.of(new LegacySinglePoolElement("pillager_outpost/feature_cage2"), 1), Pair.of(new LegacySinglePoolElement("pillager_outpost/feature_logs"), 1), Pair.of(new LegacySinglePoolElement("pillager_outpost/feature_tent1"), 1), Pair.of(new LegacySinglePoolElement("pillager_outpost/feature_tent2"), 1), Pair.of(new LegacySinglePoolElement("pillager_outpost/feature_targets"), 1), Pair.of(EmptyPoolElement.INSTANCE, 6)), StructureTemplatePool.Projection.RIGID));
     }
     
     public static class PillagerOutpostPiece extends PoolElementStructurePiece {
-        public PillagerOutpostPiece(final StructureManager cmo, final StructurePoolElement cik, final BlockPos fk, final int integer, final Rotation btu, final BoundingBox clb) {
-            super(StructurePieceType.PILLAGER_OUTPOST, cmo, cik, fk, integer, btu, clb);
+        public PillagerOutpostPiece(final StructureManager cva, final StructurePoolElement cqd, final BlockPos fu, final int integer, final Rotation cap, final BoundingBox ctd) {
+            super(StructurePieceType.PILLAGER_OUTPOST, cva, cqd, fu, integer, cap, ctd);
         }
         
-        public PillagerOutpostPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(cmo, jt, StructurePieceType.PILLAGER_OUTPOST);
+        public PillagerOutpostPiece(final StructureManager cva, final CompoundTag le) {
+            super(cva, le, StructurePieceType.PILLAGER_OUTPOST);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/PoolElementStructurePiece.java b/src/net/minecraft/world/level/levelgen/structure/PoolElementStructurePiece.java
index 7295dc6..cf379ff 100644
--- a/src/net/minecraft/world/level/levelgen/structure/PoolElementStructurePiece.java
+++ b/src/net/minecraft/world/level/levelgen/structure/PoolElementStructurePiece.java
@@ -1,17 +1,17 @@
 package net.minecraft.world.level.levelgen.structure;
 
+import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.level.ChunkPos;
 import java.util.Random;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import java.util.Iterator;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.ListTag;
-import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElementType;
-import net.minecraft.util.Deserializer;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.types.DynamicOps;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Dynamic;
+import java.util.function.Consumer;
+import com.mojang.serialization.DynamicOps;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.world.level.levelgen.feature.structures.EmptyPoolElement;
 import net.minecraft.nbt.CompoundTag;
@@ -23,8 +23,10 @@ import java.util.List;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.feature.structures.StructurePoolElement;
+import org.apache.logging.log4j.Logger;
 
 public abstract class PoolElementStructurePiece extends StructurePiece {
+    private static final Logger LOGGER;
     protected final StructurePoolElement element;
     protected BlockPos position;
     private final int groundLevelDelta;
@@ -32,49 +34,53 @@ public abstract class PoolElementStructurePiece extends StructurePiece {
     private final List<JigsawJunction> junctions;
     private final StructureManager structureManager;
     
-    public PoolElementStructurePiece(final StructurePieceType cfm, final StructureManager cmo, final StructurePoolElement cik, final BlockPos fk, final int integer, final Rotation btu, final BoundingBox clb) {
-        super(cfm, 0);
+    public PoolElementStructurePiece(final StructurePieceType cmm, final StructureManager cva, final StructurePoolElement cqd, final BlockPos fu, final int integer, final Rotation cap, final BoundingBox ctd) {
+        super(cmm, 0);
         this.junctions = Lists.newArrayList();
-        this.structureManager = cmo;
-        this.element = cik;
-        this.position = fk;
+        this.structureManager = cva;
+        this.element = cqd;
+        this.position = fu;
         this.groundLevelDelta = integer;
-        this.rotation = btu;
-        this.boundingBox = clb;
+        this.rotation = cap;
+        this.boundingBox = ctd;
     }
     
-    public PoolElementStructurePiece(final StructureManager cmo, final CompoundTag jt, final StructurePieceType cfm) {
-        super(cfm, jt);
+    public PoolElementStructurePiece(final StructureManager cva, final CompoundTag le, final StructurePieceType cmm) {
+        super(cmm, le);
         this.junctions = Lists.newArrayList();
-        this.structureManager = cmo;
-        this.position = new BlockPos(jt.getInt("PosX"), jt.getInt("PosY"), jt.getInt("PosZ"));
-        this.groundLevelDelta = jt.getInt("ground_level_delta");
-        this.element = Deserializer.<Object, EmptyPoolElement, StructurePoolElementType>deserialize((com.mojang.datafixers.Dynamic<Object>)new Dynamic((DynamicOps)NbtOps.INSTANCE, jt.getCompound("pool_element")), Registry.STRUCTURE_POOL_ELEMENT, "element_type", EmptyPoolElement.INSTANCE);
-        this.rotation = Rotation.valueOf(jt.getString("rotation"));
-        this.boundingBox = this.element.getBoundingBox(cmo, this.position, this.rotation);
-        final ListTag jz5 = jt.getList("junctions", 10);
+        this.structureManager = cva;
+        this.position = new BlockPos(le.getInt("PosX"), le.getInt("PosY"), le.getInt("PosZ"));
+        this.groundLevelDelta = le.getInt("ground_level_delta");
+        this.element = StructurePoolElement.CODEC.parse((DynamicOps)NbtOps.INSTANCE, le.getCompound("pool_element")).resultOrPartial((Consumer)PoolElementStructurePiece.LOGGER::error).orElse(EmptyPoolElement.INSTANCE);
+        this.rotation = Rotation.valueOf(le.getString("rotation"));
+        this.boundingBox = this.element.getBoundingBox(cva, this.position, this.rotation);
+        final ListTag lk5 = le.getList("junctions", 10);
         this.junctions.clear();
-        jz5.forEach(kj -> this.junctions.add(JigsawJunction.deserialize((com.mojang.datafixers.Dynamic<Object>)new Dynamic((DynamicOps)NbtOps.INSTANCE, kj))));
+        lk5.forEach(lu -> this.junctions.add(JigsawJunction.deserialize((com.mojang.serialization.Dynamic<Object>)new Dynamic((DynamicOps)NbtOps.INSTANCE, lu))));
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putInt("PosX", this.position.getX());
-        jt.putInt("PosY", this.position.getY());
-        jt.putInt("PosZ", this.position.getZ());
-        jt.putInt("ground_level_delta", this.groundLevelDelta);
-        jt.put("pool_element", (Tag)this.element.serialize((com.mojang.datafixers.types.DynamicOps<Object>)NbtOps.INSTANCE).getValue());
-        jt.putString("rotation", this.rotation.name());
-        final ListTag jz3 = new ListTag();
-        for (final JigsawJunction cig5 : this.junctions) {
-            jz3.add((Tag)cig5.serialize((com.mojang.datafixers.types.DynamicOps<Object>)NbtOps.INSTANCE).getValue());
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        le.putInt("PosX", this.position.getX());
+        le.putInt("PosY", this.position.getY());
+        le.putInt("PosZ", this.position.getZ());
+        le.putInt("ground_level_delta", this.groundLevelDelta);
+        StructurePoolElement.CODEC.encodeStart((DynamicOps)NbtOps.INSTANCE, this.element).resultOrPartial((Consumer)PoolElementStructurePiece.LOGGER::error).ifPresent(lu -> le.put("pool_element", lu));
+        le.putString("rotation", this.rotation.name());
+        final ListTag lk3 = new ListTag();
+        for (final JigsawJunction cpy5 : this.junctions) {
+            lk3.add((Tag)cpy5.serialize((com.mojang.serialization.DynamicOps<Object>)NbtOps.INSTANCE).getValue());
         }
-        jt.put("junctions", jz3);
+        le.put("junctions", lk3);
     }
     
     @Override
-    public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-        return this.element.place(this.structureManager, bjx, caa, this.position, this.rotation, clb, random);
+    public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+        return this.place(bqu, bqq, cha, random, ctd, fu, false);
+    }
+    
+    public boolean place(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final BlockPos fu, final boolean boolean7) {
+        return this.element.place(this.structureManager, bqu, bqq, cha, this.position, fu, this.rotation, ctd, random, boolean7);
     }
     
     @Override
@@ -105,11 +111,15 @@ public abstract class PoolElementStructurePiece extends StructurePiece {
         return this.groundLevelDelta;
     }
     
-    public void addJunction(final JigsawJunction cig) {
-        this.junctions.add(cig);
+    public void addJunction(final JigsawJunction cpy) {
+        this.junctions.add(cpy);
     }
     
     public List<JigsawJunction> getJunctions() {
         return this.junctions;
     }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/RuinedPortalPiece.java b/src/net/minecraft/world/level/levelgen/structure/RuinedPortalPiece.java
new file mode 100644
index 0000000..4f809dd
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/RuinedPortalPiece.java
@@ -0,0 +1,320 @@
+package net.minecraft.world.level.levelgen.structure;
+
+import net.minecraft.world.level.block.state.StateHolder;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.Arrays;
+import java.util.Map;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.Codec;
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.nbt.Tag;
+import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.AlwaysTrueTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest;
+import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.VineBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.ChunkPos;
+import java.util.Random;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.levelgen.structure.templatesystem.BlackstoneReplaceProcessor;
+import net.minecraft.world.level.levelgen.structure.templatesystem.LavaSubmergedBlockProcessor;
+import net.minecraft.world.level.levelgen.structure.templatesystem.BlockAgeProcessor;
+import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule;
+import java.util.List;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleProcessor;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
+import net.minecraft.world.level.block.Blocks;
+import com.google.common.collect.Lists;
+import net.minecraft.world.level.levelgen.structure.templatesystem.BlockIgnoreProcessor;
+import java.util.function.Consumer;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
+import net.minecraft.world.level.levelgen.feature.StructurePieceType;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.resources.ResourceLocation;
+import org.apache.logging.log4j.Logger;
+
+public class RuinedPortalPiece extends TemplateStructurePiece {
+    private static final Logger LOGGER;
+    private final ResourceLocation templateLocation;
+    private final Rotation rotation;
+    private final Mirror mirror;
+    private final VerticalPlacement verticalPlacement;
+    private final Properties properties;
+    
+    public RuinedPortalPiece(final BlockPos fu1, final VerticalPlacement b, final Properties a, final ResourceLocation uh, final StructureTemplate cve, final Rotation cap, final Mirror bzj, final BlockPos fu8) {
+        super(StructurePieceType.RUINED_PORTAL, 0);
+        this.templatePosition = fu1;
+        this.templateLocation = uh;
+        this.rotation = cap;
+        this.mirror = bzj;
+        this.verticalPlacement = b;
+        this.properties = a;
+        this.loadTemplate(cve, fu8);
+    }
+    
+    public RuinedPortalPiece(final StructureManager cva, final CompoundTag le) {
+        super(StructurePieceType.RUINED_PORTAL, le);
+        this.templateLocation = new ResourceLocation(le.getString("Template"));
+        this.rotation = Rotation.valueOf(le.getString("Rotation"));
+        this.mirror = Mirror.valueOf(le.getString("Mirror"));
+        this.verticalPlacement = VerticalPlacement.byName(le.getString("VerticalPlacement"));
+        this.properties = (Properties)Properties.CODEC.parse(new Dynamic((DynamicOps)NbtOps.INSTANCE, le.get("Properties"))).getOrThrow(true, (Consumer)RuinedPortalPiece.LOGGER::error);
+        final StructureTemplate cve4 = cva.getOrCreate(this.templateLocation);
+        this.loadTemplate(cve4, new BlockPos(cve4.getSize().getX() / 2, 0, cve4.getSize().getZ() / 2));
+    }
+    
+    @Override
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putString("Template", this.templateLocation.toString());
+        le.putString("Rotation", this.rotation.name());
+        le.putString("Mirror", this.mirror.name());
+        le.putString("VerticalPlacement", this.verticalPlacement.getName());
+        Properties.CODEC.encodeStart((DynamicOps)NbtOps.INSTANCE, this.properties).resultOrPartial((Consumer)RuinedPortalPiece.LOGGER::error).ifPresent(lu -> le.put("Properties", lu));
+    }
+    
+    private void loadTemplate(final StructureTemplate cve, final BlockPos fu) {
+        final BlockIgnoreProcessor cui4 = this.properties.airPocket ? BlockIgnoreProcessor.STRUCTURE_BLOCK : BlockIgnoreProcessor.STRUCTURE_AND_AIR;
+        final List<ProcessorRule> list5 = Lists.newArrayList();
+        list5.add(getBlockReplaceRule(Blocks.GOLD_BLOCK, 0.3f, Blocks.AIR));
+        list5.add(this.getLavaProcessorRule());
+        if (!this.properties.cold) {
+            list5.add(getBlockReplaceRule(Blocks.NETHERRACK, 0.07f, Blocks.MAGMA_BLOCK));
+        }
+        final StructurePlaceSettings cvb6 = new StructurePlaceSettings().setRotation(this.rotation).setMirror(this.mirror).setRotationPivot(fu).addProcessor(cui4).addProcessor(new RuleProcessor(list5)).addProcessor(new BlockAgeProcessor(this.properties.mossiness)).addProcessor(new LavaSubmergedBlockProcessor());
+        if (this.properties.replaceWithBlackstone) {
+            cvb6.addProcessor(BlackstoneReplaceProcessor.INSTANCE);
+        }
+        this.setup(cve, this.templatePosition, cvb6);
+    }
+    
+    private ProcessorRule getLavaProcessorRule() {
+        if (this.verticalPlacement == VerticalPlacement.ON_OCEAN_FLOOR) {
+            return getBlockReplaceRule(Blocks.LAVA, Blocks.MAGMA_BLOCK);
+        }
+        if (this.properties.cold) {
+            return getBlockReplaceRule(Blocks.LAVA, Blocks.NETHERRACK);
+        }
+        return getBlockReplaceRule(Blocks.LAVA, 0.2f, Blocks.MAGMA_BLOCK);
+    }
+    
+    @Override
+    public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+        if (!ctd.isInside(this.templatePosition)) {
+            return true;
+        }
+        ctd.expand(this.template.getBoundingBox(this.placeSettings, this.templatePosition));
+        final boolean boolean9 = super.postProcess(bqu, bqq, cha, random, ctd, bph, fu);
+        this.spreadNetherrack(random, bqu);
+        this.addNetherrackDripColumnsBelowPortal(random, bqu);
+        if (this.properties.vines || this.properties.overgrown) {
+            BlockPos.betweenClosedStream(this.getBoundingBox()).forEach(fu -> {
+                if (this.properties.vines) {
+                    this.maybeAddVines(random, bqu, fu);
+                }
+                if (this.properties.overgrown) {
+                    this.maybeAddLeavesAbove(random, bqu, fu);
+                }
+                return;
+            });
+        }
+        return boolean9;
+    }
+    
+    @Override
+    protected void handleDataMarker(final String string, final BlockPos fu, final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
+    }
+    
+    private void maybeAddVines(final Random random, final LevelAccessor bqc, final BlockPos fu) {
+        final BlockState cfj5 = bqc.getBlockState(fu);
+        if (cfj5.isAir() || cfj5.is(Blocks.VINE)) {
+            return;
+        }
+        final Direction fz6 = Direction.Plane.HORIZONTAL.getRandomDirection(random);
+        final BlockPos fu2 = fu.relative(fz6);
+        final BlockState cfj6 = bqc.getBlockState(fu2);
+        if (!cfj6.isAir()) {
+            return;
+        }
+        if (!Block.isFaceFull(cfj5.getCollisionShape(bqc, fu), fz6)) {
+            return;
+        }
+        final BooleanProperty cga9 = VineBlock.getPropertyForFace(fz6.getOpposite());
+        bqc.setBlock(fu2, ((StateHolder<O, BlockState>)Blocks.VINE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)cga9, true), 3);
+    }
+    
+    private void maybeAddLeavesAbove(final Random random, final LevelAccessor bqc, final BlockPos fu) {
+        if (random.nextFloat() < 0.5f && bqc.getBlockState(fu).is(Blocks.NETHERRACK) && bqc.getBlockState(fu.above()).isAir()) {
+            bqc.setBlock(fu.above(), ((StateHolder<O, BlockState>)Blocks.JUNGLE_LEAVES.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)LeavesBlock.PERSISTENT, true), 3);
+        }
+    }
+    
+    private void addNetherrackDripColumnsBelowPortal(final Random random, final LevelAccessor bqc) {
+        for (int integer4 = this.boundingBox.x0 + 1; integer4 < this.boundingBox.x1; ++integer4) {
+            for (int integer5 = this.boundingBox.z0 + 1; integer5 < this.boundingBox.z1; ++integer5) {
+                final BlockPos fu6 = new BlockPos(integer4, this.boundingBox.y0, integer5);
+                if (bqc.getBlockState(fu6).is(Blocks.NETHERRACK)) {
+                    this.addNetherrackDripColumn(random, bqc, fu6.below());
+                }
+            }
+        }
+    }
+    
+    private void addNetherrackDripColumn(final Random random, final LevelAccessor bqc, final BlockPos fu) {
+        final BlockPos.MutableBlockPos a5 = fu.mutable();
+        this.placeNetherrackOrMagma(random, bqc, a5);
+        int integer6 = 8;
+        while (integer6 > 0 && random.nextFloat() < 0.5f) {
+            a5.move(Direction.DOWN);
+            --integer6;
+            this.placeNetherrackOrMagma(random, bqc, a5);
+        }
+    }
+    
+    private void spreadNetherrack(final Random random, final LevelAccessor bqc) {
+        final boolean boolean4 = this.verticalPlacement == VerticalPlacement.ON_LAND_SURFACE || this.verticalPlacement == VerticalPlacement.ON_OCEAN_FLOOR;
+        final Vec3i gr5 = this.boundingBox.getCenter();
+        final int integer6 = gr5.getX();
+        final int integer7 = gr5.getZ();
+        final float[] arr8 = { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.9f, 0.9f, 0.8f, 0.7f, 0.6f, 0.4f, 0.2f };
+        final int integer8 = arr8.length;
+        final int integer9 = (this.boundingBox.getXSpan() + this.boundingBox.getZSpan()) / 2;
+        final int integer10 = random.nextInt(Math.max(1, 8 - integer9 / 2));
+        final int integer11 = 3;
+        final BlockPos.MutableBlockPos a13 = BlockPos.ZERO.mutable();
+        for (int integer12 = integer6 - integer8; integer12 <= integer6 + integer8; ++integer12) {
+            for (int integer13 = integer7 - integer8; integer13 <= integer7 + integer8; ++integer13) {
+                final int integer14 = Math.abs(integer12 - integer6) + Math.abs(integer13 - integer7);
+                final int integer15 = Math.max(0, integer14 + integer10);
+                if (integer15 < integer8) {
+                    final float float18 = arr8[integer15];
+                    if (random.nextDouble() < float18) {
+                        final int integer16 = getSurfaceY(bqc, integer12, integer13, this.verticalPlacement);
+                        final int integer17 = boolean4 ? integer16 : Math.min(this.boundingBox.y0, integer16);
+                        a13.set(integer12, integer17, integer13);
+                        if (Math.abs(integer17 - this.boundingBox.y0) <= 3 && this.canBlockBeReplacedByNetherrackOrMagma(bqc, a13)) {
+                            this.placeNetherrackOrMagma(random, bqc, a13);
+                            if (this.properties.overgrown) {
+                                this.maybeAddLeavesAbove(random, bqc, a13);
+                            }
+                            this.addNetherrackDripColumn(random, bqc, a13.below());
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    private boolean canBlockBeReplacedByNetherrackOrMagma(final LevelAccessor bqc, final BlockPos fu) {
+        final BlockState cfj4 = bqc.getBlockState(fu);
+        return !cfj4.is(Blocks.AIR) && !cfj4.is(Blocks.OBSIDIAN) && (this.verticalPlacement == VerticalPlacement.IN_NETHER || !cfj4.is(Blocks.LAVA));
+    }
+    
+    private void placeNetherrackOrMagma(final Random random, final LevelAccessor bqc, final BlockPos fu) {
+        if (!this.properties.cold && random.nextFloat() < 0.07f) {
+            bqc.setBlock(fu, Blocks.MAGMA_BLOCK.defaultBlockState(), 3);
+        }
+        else {
+            bqc.setBlock(fu, Blocks.NETHERRACK.defaultBlockState(), 3);
+        }
+    }
+    
+    private static int getSurfaceY(final LevelAccessor bqc, final int integer2, final int integer3, final VerticalPlacement b) {
+        return bqc.getHeight(getHeightMapType(b), integer2, integer3) - 1;
+    }
+    
+    public static Heightmap.Types getHeightMapType(final VerticalPlacement b) {
+        return (b == VerticalPlacement.ON_OCEAN_FLOOR) ? Heightmap.Types.OCEAN_FLOOR_WG : Heightmap.Types.WORLD_SURFACE_WG;
+    }
+    
+    private static ProcessorRule getBlockReplaceRule(final Block bvr1, final float float2, final Block bvr3) {
+        return new ProcessorRule(new RandomBlockMatchTest(bvr1, float2), AlwaysTrueTest.INSTANCE, bvr3.defaultBlockState());
+    }
+    
+    private static ProcessorRule getBlockReplaceRule(final Block bvr1, final Block bvr2) {
+        return new ProcessorRule(new BlockMatchTest(bvr1), AlwaysTrueTest.INSTANCE, bvr2.defaultBlockState());
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+    
+    public static class Properties {
+        public static final Codec<Properties> CODEC;
+        public boolean cold;
+        public float mossiness;
+        public boolean airPocket;
+        public boolean overgrown;
+        public boolean vines;
+        public boolean replaceWithBlackstone;
+        
+        public Properties() {
+            this.mossiness = 0.2f;
+        }
+        
+        public <T> Properties(final boolean boolean1, final float float2, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6) {
+            this.mossiness = 0.2f;
+            this.cold = boolean1;
+            this.mossiness = float2;
+            this.airPocket = boolean3;
+            this.overgrown = boolean4;
+            this.vines = boolean5;
+            this.replaceWithBlackstone = boolean6;
+        }
+        
+        static {
+            CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.BOOL.fieldOf("cold").forGetter(a -> a.cold), (App)Codec.FLOAT.fieldOf("mossiness").forGetter(a -> a.mossiness), (App)Codec.BOOL.fieldOf("air_pocket").forGetter(a -> a.airPocket), (App)Codec.BOOL.fieldOf("overgrown").forGetter(a -> a.overgrown), (App)Codec.BOOL.fieldOf("vines").forGetter(a -> a.vines), (App)Codec.BOOL.fieldOf("replace_with_blackstone").forGetter(a -> a.replaceWithBlackstone)).apply(instance, Properties::new));
+        }
+    }
+    
+    public enum VerticalPlacement {
+        ON_LAND_SURFACE("on_land_surface"), 
+        PARTLY_BURIED("partly_buried"), 
+        ON_OCEAN_FLOOR("on_ocean_floor"), 
+        IN_MOUNTAIN("in_mountain"), 
+        UNDERGROUND("underground"), 
+        IN_NETHER("in_nether");
+        
+        private static final Map<String, VerticalPlacement> BY_NAME;
+        private final String name;
+        
+        private VerticalPlacement(final String string3) {
+            this.name = string3;
+        }
+        
+        public String getName() {
+            return this.name;
+        }
+        
+        public static VerticalPlacement byName(final String string) {
+            return VerticalPlacement.BY_NAME.get(string);
+        }
+        
+        static {
+            BY_NAME = Arrays.<VerticalPlacement>stream(values()).collect(Collectors.toMap(VerticalPlacement::getName, b -> b));
+        }
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePiece.java b/src/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePiece.java
index 051d53d..6b69358 100644
--- a/src/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePiece.java
+++ b/src/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePiece.java
@@ -15,8 +15,8 @@ public abstract class ScatteredFeaturePiece extends StructurePiece {
     protected final int depth;
     protected int heightPosition;
     
-    protected ScatteredFeaturePiece(final StructurePieceType cfm, final Random random, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
-        super(cfm, 0);
+    protected ScatteredFeaturePiece(final StructurePieceType cmm, final Random random, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
+        super(cmm, 0);
         this.heightPosition = -1;
         this.width = integer6;
         this.height = integer7;
@@ -30,24 +30,24 @@ public abstract class ScatteredFeaturePiece extends StructurePiece {
         }
     }
     
-    protected ScatteredFeaturePiece(final StructurePieceType cfm, final CompoundTag jt) {
-        super(cfm, jt);
+    protected ScatteredFeaturePiece(final StructurePieceType cmm, final CompoundTag le) {
+        super(cmm, le);
         this.heightPosition = -1;
-        this.width = jt.getInt("Width");
-        this.height = jt.getInt("Height");
-        this.depth = jt.getInt("Depth");
-        this.heightPosition = jt.getInt("HPos");
+        this.width = le.getInt("Width");
+        this.height = le.getInt("Height");
+        this.depth = le.getInt("Depth");
+        this.heightPosition = le.getInt("HPos");
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putInt("Width", this.width);
-        jt.putInt("Height", this.height);
-        jt.putInt("Depth", this.depth);
-        jt.putInt("HPos", this.heightPosition);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        le.putInt("Width", this.width);
+        le.putInt("Height", this.height);
+        le.putInt("Depth", this.depth);
+        le.putInt("HPos", this.heightPosition);
     }
     
-    protected boolean updateAverageGroundHeight(final LevelAccessor bjx, final BoundingBox clb, final int integer) {
+    protected boolean updateAverageGroundHeight(final LevelAccessor bqc, final BoundingBox ctd, final int integer) {
         if (this.heightPosition >= 0) {
             return true;
         }
@@ -57,8 +57,8 @@ public abstract class ScatteredFeaturePiece extends StructurePiece {
         for (int integer4 = this.boundingBox.z0; integer4 <= this.boundingBox.z1; ++integer4) {
             for (int integer5 = this.boundingBox.x0; integer5 <= this.boundingBox.x1; ++integer5) {
                 a7.set(integer5, 64, integer4);
-                if (clb.isInside(a7)) {
-                    integer2 += bjx.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, a7).getY();
+                if (ctd.isInside(a7)) {
+                    integer2 += bqc.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, a7).getY();
                     ++integer3;
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/structure/ShipwreckPieces.java b/src/net/minecraft/world/level/levelgen/structure/ShipwreckPieces.java
index d12ce3f..e593f2d 100644
--- a/src/net/minecraft/world/level/levelgen/structure/ShipwreckPieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/ShipwreckPieces.java
@@ -4,6 +4,8 @@ import java.util.Iterator;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
@@ -15,6 +17,7 @@ import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.levelgen.feature.StructurePieceType;
+import net.minecraft.Util;
 import net.minecraft.world.level.levelgen.feature.configurations.ShipwreckConfiguration;
 import java.util.Random;
 import java.util.List;
@@ -28,9 +31,9 @@ public class ShipwreckPieces {
     private static final ResourceLocation[] STRUCTURE_LOCATION_BEACHED;
     private static final ResourceLocation[] STRUCTURE_LOCATION_OCEAN;
     
-    public static void addPieces(final StructureManager cmo, final BlockPos fk, final Rotation btu, final List<StructurePiece> list, final Random random, final ShipwreckConfiguration chf) {
-        final ResourceLocation sm7 = chf.isBeached ? ShipwreckPieces.STRUCTURE_LOCATION_BEACHED[random.nextInt(ShipwreckPieces.STRUCTURE_LOCATION_BEACHED.length)] : ShipwreckPieces.STRUCTURE_LOCATION_OCEAN[random.nextInt(ShipwreckPieces.STRUCTURE_LOCATION_OCEAN.length)];
-        list.add(new ShipwreckPiece(cmo, sm7, fk, btu, chf.isBeached));
+    public static void addPieces(final StructureManager cva, final BlockPos fu, final Rotation cap, final List<StructurePiece> list, final Random random, final ShipwreckConfiguration com) {
+        final ResourceLocation uh7 = Util.<ResourceLocation>getRandom(com.isBeached ? ShipwreckPieces.STRUCTURE_LOCATION_BEACHED : ShipwreckPieces.STRUCTURE_LOCATION_OCEAN, random);
+        list.add(new ShipwreckPiece(cva, uh7, fu, cap, com.isBeached));
     }
     
     static {
@@ -44,72 +47,72 @@ public class ShipwreckPieces {
         private final ResourceLocation templateLocation;
         private final boolean isBeached;
         
-        public ShipwreckPiece(final StructureManager cmo, final ResourceLocation sm, final BlockPos fk, final Rotation btu, final boolean boolean5) {
+        public ShipwreckPiece(final StructureManager cva, final ResourceLocation uh, final BlockPos fu, final Rotation cap, final boolean boolean5) {
             super(StructurePieceType.SHIPWRECK_PIECE, 0);
-            this.templatePosition = fk;
-            this.rotation = btu;
-            this.templateLocation = sm;
+            this.templatePosition = fu;
+            this.rotation = cap;
+            this.templateLocation = uh;
             this.isBeached = boolean5;
-            this.loadTemplate(cmo);
+            this.loadTemplate(cva);
         }
         
-        public ShipwreckPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.SHIPWRECK_PIECE, jt);
-            this.templateLocation = new ResourceLocation(jt.getString("Template"));
-            this.isBeached = jt.getBoolean("isBeached");
-            this.rotation = Rotation.valueOf(jt.getString("Rot"));
-            this.loadTemplate(cmo);
+        public ShipwreckPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.SHIPWRECK_PIECE, le);
+            this.templateLocation = new ResourceLocation(le.getString("Template"));
+            this.isBeached = le.getBoolean("isBeached");
+            this.rotation = Rotation.valueOf(le.getString("Rot"));
+            this.loadTemplate(cva);
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putString("Template", this.templateLocation.toString());
-            jt.putBoolean("isBeached", this.isBeached);
-            jt.putString("Rot", this.rotation.name());
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putString("Template", this.templateLocation.toString());
+            le.putBoolean("isBeached", this.isBeached);
+            le.putString("Rot", this.rotation.name());
         }
         
-        private void loadTemplate(final StructureManager cmo) {
-            final StructureTemplate cms3 = cmo.getOrCreate(this.templateLocation);
-            final StructurePlaceSettings cmp4 = new StructurePlaceSettings().setRotation(this.rotation).setMirror(Mirror.NONE).setRotationPivot(ShipwreckPieces.PIVOT).addProcessor(BlockIgnoreProcessor.STRUCTURE_AND_AIR);
-            this.setup(cms3, this.templatePosition, cmp4);
+        private void loadTemplate(final StructureManager cva) {
+            final StructureTemplate cve3 = cva.getOrCreate(this.templateLocation);
+            final StructurePlaceSettings cvb4 = new StructurePlaceSettings().setRotation(this.rotation).setMirror(Mirror.NONE).setRotationPivot(ShipwreckPieces.PIVOT).addProcessor(BlockIgnoreProcessor.STRUCTURE_AND_AIR);
+            this.setup(cve3, this.templatePosition, cvb4);
         }
         
         @Override
-        protected void handleDataMarker(final String string, final BlockPos fk, final LevelAccessor bjx, final Random random, final BoundingBox clb) {
+        protected void handleDataMarker(final String string, final BlockPos fu, final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
             if ("map_chest".equals(string)) {
-                RandomizableContainerBlockEntity.setLootTable(bjx, random, fk.below(), BuiltInLootTables.SHIPWRECK_MAP);
+                RandomizableContainerBlockEntity.setLootTable(bqc, random, fu.below(), BuiltInLootTables.SHIPWRECK_MAP);
             }
             else if ("treasure_chest".equals(string)) {
-                RandomizableContainerBlockEntity.setLootTable(bjx, random, fk.below(), BuiltInLootTables.SHIPWRECK_TREASURE);
+                RandomizableContainerBlockEntity.setLootTable(bqc, random, fu.below(), BuiltInLootTables.SHIPWRECK_TREASURE);
             }
             else if ("supply_chest".equals(string)) {
-                RandomizableContainerBlockEntity.setLootTable(bjx, random, fk.below(), BuiltInLootTables.SHIPWRECK_SUPPLY);
+                RandomizableContainerBlockEntity.setLootTable(bqc, random, fu.below(), BuiltInLootTables.SHIPWRECK_SUPPLY);
             }
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            int integer7 = 256;
-            int integer8 = 0;
-            final BlockPos fk9 = this.template.getSize();
-            final Heightmap.Types a10 = this.isBeached ? Heightmap.Types.WORLD_SURFACE_WG : Heightmap.Types.OCEAN_FLOOR_WG;
-            final int integer9 = fk9.getX() * fk9.getZ();
-            if (integer9 == 0) {
-                integer8 = bjx.getHeight(a10, this.templatePosition.getX(), this.templatePosition.getZ());
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            int integer9 = 256;
+            int integer10 = 0;
+            final BlockPos fu2 = this.template.getSize();
+            final Heightmap.Types a12 = this.isBeached ? Heightmap.Types.WORLD_SURFACE_WG : Heightmap.Types.OCEAN_FLOOR_WG;
+            final int integer11 = fu2.getX() * fu2.getZ();
+            if (integer11 == 0) {
+                integer10 = bqu.getHeight(a12, this.templatePosition.getX(), this.templatePosition.getZ());
             }
             else {
-                final BlockPos fk10 = this.templatePosition.offset(fk9.getX() - 1, 0, fk9.getZ() - 1);
-                for (final BlockPos fk11 : BlockPos.betweenClosed(this.templatePosition, fk10)) {
-                    final int integer10 = bjx.getHeight(a10, fk11.getX(), fk11.getZ());
-                    integer8 += integer10;
-                    integer7 = Math.min(integer7, integer10);
+                final BlockPos fu3 = this.templatePosition.offset(fu2.getX() - 1, 0, fu2.getZ() - 1);
+                for (final BlockPos fu4 : BlockPos.betweenClosed(this.templatePosition, fu3)) {
+                    final int integer12 = bqu.getHeight(a12, fu4.getX(), fu4.getZ());
+                    integer10 += integer12;
+                    integer9 = Math.min(integer9, integer12);
                 }
-                integer8 /= integer9;
+                integer10 /= integer11;
             }
-            final int integer11 = this.isBeached ? (integer7 - fk9.getY() / 2 - random.nextInt(3)) : integer8;
-            this.templatePosition = new BlockPos(this.templatePosition.getX(), integer11, this.templatePosition.getZ());
-            return super.postProcess(bjx, caa, random, clb, bjh);
+            final int integer13 = this.isBeached ? (integer9 - fu2.getY() / 2 - random.nextInt(3)) : integer10;
+            this.templatePosition = new BlockPos(this.templatePosition.getX(), integer13, this.templatePosition.getZ());
+            return super.postProcess(bqu, bqq, cha, random, ctd, bph, fu);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/StrongholdPieces.java b/src/net/minecraft/world/level/levelgen/structure/StrongholdPieces.java
index 5bfade3..c500881 100644
--- a/src/net/minecraft/world/level/levelgen/structure/StrongholdPieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/StrongholdPieces.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.structure;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
@@ -12,10 +12,12 @@ import net.minecraft.world.level.block.LadderBlock;
 import net.minecraft.world.level.block.StairBlock;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.core.Vec3i;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.WallTorchBlock;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.block.ButtonBlock;
 import net.minecraft.world.level.block.IronBarsBlock;
@@ -62,50 +64,50 @@ public class StrongholdPieces {
         return boolean1;
     }
     
-    private static StrongholdPiece findAndCreatePieceFactory(final Class<? extends StrongholdPiece> class1, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, @Nullable final Direction fp, final int integer8) {
+    private static StrongholdPiece findAndCreatePieceFactory(final Class<? extends StrongholdPiece> class1, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, @Nullable final Direction fz, final int integer8) {
         StrongholdPiece p9 = null;
         if (class1 == Straight.class) {
-            p9 = Straight.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            p9 = Straight.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class1 == PrisonHall.class) {
-            p9 = PrisonHall.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            p9 = PrisonHall.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class1 == LeftTurn.class) {
-            p9 = LeftTurn.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            p9 = LeftTurn.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class1 == RightTurn.class) {
-            p9 = RightTurn.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            p9 = RightTurn.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class1 == RoomCrossing.class) {
-            p9 = RoomCrossing.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            p9 = RoomCrossing.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class1 == StraightStairsDown.class) {
-            p9 = StraightStairsDown.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            p9 = StraightStairsDown.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class1 == StairsDown.class) {
-            p9 = StairsDown.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            p9 = StairsDown.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class1 == FiveCrossing.class) {
-            p9 = FiveCrossing.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            p9 = FiveCrossing.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class1 == ChestCorridor.class) {
-            p9 = ChestCorridor.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            p9 = ChestCorridor.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class1 == Library.class) {
-            p9 = Library.createPiece(list, random, integer4, integer5, integer6, fp, integer8);
+            p9 = Library.createPiece(list, random, integer4, integer5, integer6, fz, integer8);
         }
         else if (class1 == PortalRoom.class) {
-            p9 = PortalRoom.createPiece(list, integer4, integer5, integer6, fp, integer8);
+            p9 = PortalRoom.createPiece(list, integer4, integer5, integer6, fz, integer8);
         }
         return p9;
     }
     
-    private static StrongholdPiece generatePieceFromSmallDoor(final StartPiece m, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, final Direction fp, final int integer8) {
+    private static StrongholdPiece generatePieceFromSmallDoor(final StartPiece m, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, final Direction fz, final int integer8) {
         if (!updatePieceWeight()) {
             return null;
         }
         if (StrongholdPieces.imposedPiece != null) {
-            final StrongholdPiece p9 = findAndCreatePieceFactory(StrongholdPieces.imposedPiece, list, random, integer4, integer5, integer6, fp, integer8);
+            final StrongholdPiece p9 = findAndCreatePieceFactory(StrongholdPieces.imposedPiece, list, random, integer4, integer5, integer6, fz, integer8);
             StrongholdPieces.imposedPiece = null;
             if (p9 != null) {
                 return p9;
@@ -124,7 +126,7 @@ public class StrongholdPieces {
                     if (f12 == m.previousPiece) {
                         break;
                     }
-                    final StrongholdPiece p10 = findAndCreatePieceFactory(f12.pieceClass, list, random, integer4, integer5, integer6, fp, integer8);
+                    final StrongholdPiece p10 = findAndCreatePieceFactory(f12.pieceClass, list, random, integer4, integer5, integer6, fz, integer8);
                     if (p10 != null) {
                         final PieceWeight pieceWeight = f12;
                         ++pieceWeight.placeCount;
@@ -138,26 +140,26 @@ public class StrongholdPieces {
                 }
             }
         }
-        final BoundingBox clb10 = FillerCorridor.findPieceBox(list, random, integer4, integer5, integer6, fp);
-        if (clb10 != null && clb10.y0 > 1) {
-            return new FillerCorridor(integer8, clb10, fp);
+        final BoundingBox ctd10 = FillerCorridor.findPieceBox(list, random, integer4, integer5, integer6, fz);
+        if (ctd10 != null && ctd10.y0 > 1) {
+            return new FillerCorridor(integer8, ctd10, fz);
         }
         return null;
     }
     
-    private static StructurePiece generateAndAddPiece(final StartPiece m, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, @Nullable final Direction fp, final int integer8) {
+    private static StructurePiece generateAndAddPiece(final StartPiece m, final List<StructurePiece> list, final Random random, final int integer4, final int integer5, final int integer6, @Nullable final Direction fz, final int integer8) {
         if (integer8 > 50) {
             return null;
         }
         if (Math.abs(integer4 - m.getBoundingBox().x0) > 112 || Math.abs(integer6 - m.getBoundingBox().z0) > 112) {
             return null;
         }
-        final StructurePiece clu9 = generatePieceFromSmallDoor(m, list, random, integer4, integer5, integer6, fp, integer8 + 1);
-        if (clu9 != null) {
-            list.add(clu9);
-            m.pendingChildren.add(clu9);
+        final StructurePiece cty9 = generatePieceFromSmallDoor(m, list, random, integer4, integer5, integer6, fz, integer8 + 1);
+        if (cty9 != null) {
+            list.add(cty9);
+            m.pendingChildren.add(cty9);
         }
-        return clu9;
+        return cty9;
     }
     
     static {
@@ -199,64 +201,64 @@ public class StrongholdPieces {
     abstract static class StrongholdPiece extends StructurePiece {
         protected SmallDoorType entryDoor;
         
-        protected StrongholdPiece(final StructurePieceType cfm, final int integer) {
-            super(cfm, integer);
+        protected StrongholdPiece(final StructurePieceType cmm, final int integer) {
+            super(cmm, integer);
             this.entryDoor = SmallDoorType.OPENING;
         }
         
-        public StrongholdPiece(final StructurePieceType cfm, final CompoundTag jt) {
-            super(cfm, jt);
+        public StrongholdPiece(final StructurePieceType cmm, final CompoundTag le) {
+            super(cmm, le);
             this.entryDoor = SmallDoorType.OPENING;
-            this.entryDoor = SmallDoorType.valueOf(jt.getString("EntryDoor"));
+            this.entryDoor = SmallDoorType.valueOf(le.getString("EntryDoor"));
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            jt.putString("EntryDoor", this.entryDoor.name());
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            le.putString("EntryDoor", this.entryDoor.name());
         }
         
-        protected void generateSmallDoor(final LevelAccessor bjx, final Random random, final BoundingBox clb, final SmallDoorType a, final int integer5, final int integer6, final int integer7) {
+        protected void generateSmallDoor(final LevelAccessor bqc, final Random random, final BoundingBox ctd, final SmallDoorType a, final int integer5, final int integer6, final int integer7) {
             switch (a) {
                 case OPENING: {
-                    this.generateBox(bjx, clb, integer5, integer6, integer7, integer5 + 3 - 1, integer6 + 3 - 1, integer7, StrongholdPiece.CAVE_AIR, StrongholdPiece.CAVE_AIR, false);
+                    this.generateBox(bqc, ctd, integer5, integer6, integer7, integer5 + 3 - 1, integer6 + 3 - 1, integer7, StrongholdPiece.CAVE_AIR, StrongholdPiece.CAVE_AIR, false);
                     break;
                 }
                 case WOOD_DOOR: {
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6 + 1, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6 + 2, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 1, integer6 + 2, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6 + 2, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6 + 1, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6, integer7, clb);
-                    this.placeBlock(bjx, Blocks.OAK_DOOR.defaultBlockState(), integer5 + 1, integer6, integer7, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.OAK_DOOR.defaultBlockState()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.UPPER), integer5 + 1, integer6 + 1, integer7, clb);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6 + 1, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6 + 2, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 1, integer6 + 2, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6 + 2, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6 + 1, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.OAK_DOOR.defaultBlockState(), integer5 + 1, integer6, integer7, ctd);
+                    this.placeBlock(bqc, ((StateHolder<O, BlockState>)Blocks.OAK_DOOR.defaultBlockState()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.UPPER), integer5 + 1, integer6 + 1, integer7, ctd);
                     break;
                 }
                 case GRATES: {
-                    this.placeBlock(bjx, Blocks.CAVE_AIR.defaultBlockState(), integer5 + 1, integer6, integer7, clb);
-                    this.placeBlock(bjx, Blocks.CAVE_AIR.defaultBlockState(), integer5 + 1, integer6 + 1, integer7, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true), integer5, integer6, integer7, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true), integer5, integer6 + 1, integer7, clb);
-                    this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true), integer5, integer6 + 2, integer7, clb);
-                    this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true), integer5 + 1, integer6 + 2, integer7, clb);
-                    this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true), integer5 + 2, integer6 + 2, integer7, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), integer5 + 2, integer6 + 1, integer7, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), integer5 + 2, integer6, integer7, clb);
+                    this.placeBlock(bqc, Blocks.CAVE_AIR.defaultBlockState(), integer5 + 1, integer6, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.CAVE_AIR.defaultBlockState(), integer5 + 1, integer6 + 1, integer7, ctd);
+                    this.placeBlock(bqc, ((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true), integer5, integer6, integer7, ctd);
+                    this.placeBlock(bqc, ((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true), integer5, integer6 + 1, integer7, ctd);
+                    this.placeBlock(bqc, (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true), integer5, integer6 + 2, integer7, ctd);
+                    this.placeBlock(bqc, (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true), integer5 + 1, integer6 + 2, integer7, ctd);
+                    this.placeBlock(bqc, (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.EAST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.WEST, true), integer5 + 2, integer6 + 2, integer7, ctd);
+                    this.placeBlock(bqc, ((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), integer5 + 2, integer6 + 1, integer7, ctd);
+                    this.placeBlock(bqc, ((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), integer5 + 2, integer6, integer7, ctd);
                     break;
                 }
                 case IRON_DOOR: {
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6 + 1, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6 + 2, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 1, integer6 + 2, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6 + 2, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6 + 1, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6, integer7, clb);
-                    this.placeBlock(bjx, Blocks.IRON_DOOR.defaultBlockState(), integer5 + 1, integer6, integer7, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.IRON_DOOR.defaultBlockState()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.UPPER), integer5 + 1, integer6 + 1, integer7, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.STONE_BUTTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)ButtonBlock.FACING, Direction.NORTH), integer5 + 2, integer6 + 1, integer7 + 1, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.STONE_BUTTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)ButtonBlock.FACING, Direction.SOUTH), integer5 + 2, integer6 + 1, integer7 - 1, clb);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6 + 1, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5, integer6 + 2, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 1, integer6 + 2, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6 + 2, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6 + 1, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.STONE_BRICKS.defaultBlockState(), integer5 + 2, integer6, integer7, ctd);
+                    this.placeBlock(bqc, Blocks.IRON_DOOR.defaultBlockState(), integer5 + 1, integer6, integer7, ctd);
+                    this.placeBlock(bqc, ((StateHolder<O, BlockState>)Blocks.IRON_DOOR.defaultBlockState()).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.UPPER), integer5 + 1, integer6 + 1, integer7, ctd);
+                    this.placeBlock(bqc, ((StateHolder<O, BlockState>)Blocks.STONE_BUTTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)ButtonBlock.FACING, Direction.NORTH), integer5 + 2, integer6 + 1, integer7 + 1, ctd);
+                    this.placeBlock(bqc, ((StateHolder<O, BlockState>)Blocks.STONE_BUTTON.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)ButtonBlock.FACING, Direction.SOUTH), integer5 + 2, integer6 + 1, integer7 - 1, ctd);
                     break;
                 }
             }
@@ -282,20 +284,20 @@ public class StrongholdPieces {
         
         @Nullable
         protected StructurePiece generateSmallDoorChildForward(final StartPiece m, final List<StructurePiece> list, final Random random, final int integer4, final int integer5) {
-            final Direction fp7 = this.getOrientation();
-            if (fp7 != null) {
-                switch (fp7) {
+            final Direction fz7 = this.getOrientation();
+            if (fz7 != null) {
+                switch (fz7) {
                     case NORTH: {
-                        return generateAndAddPiece(m, list, random, this.boundingBox.x0 + integer4, this.boundingBox.y0 + integer5, this.boundingBox.z0 - 1, fp7, this.getGenDepth());
+                        return generateAndAddPiece(m, list, random, this.boundingBox.x0 + integer4, this.boundingBox.y0 + integer5, this.boundingBox.z0 - 1, fz7, this.getGenDepth());
                     }
                     case SOUTH: {
-                        return generateAndAddPiece(m, list, random, this.boundingBox.x0 + integer4, this.boundingBox.y0 + integer5, this.boundingBox.z1 + 1, fp7, this.getGenDepth());
+                        return generateAndAddPiece(m, list, random, this.boundingBox.x0 + integer4, this.boundingBox.y0 + integer5, this.boundingBox.z1 + 1, fz7, this.getGenDepth());
                     }
                     case WEST: {
-                        return generateAndAddPiece(m, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 + integer5, this.boundingBox.z0 + integer4, fp7, this.getGenDepth());
+                        return generateAndAddPiece(m, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 + integer5, this.boundingBox.z0 + integer4, fz7, this.getGenDepth());
                     }
                     case EAST: {
-                        return generateAndAddPiece(m, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 + integer5, this.boundingBox.z0 + integer4, fp7, this.getGenDepth());
+                        return generateAndAddPiece(m, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 + integer5, this.boundingBox.z0 + integer4, fz7, this.getGenDepth());
                     }
                 }
             }
@@ -304,9 +306,9 @@ public class StrongholdPieces {
         
         @Nullable
         protected StructurePiece generateSmallDoorChildLeft(final StartPiece m, final List<StructurePiece> list, final Random random, final int integer4, final int integer5) {
-            final Direction fp7 = this.getOrientation();
-            if (fp7 != null) {
-                switch (fp7) {
+            final Direction fz7 = this.getOrientation();
+            if (fz7 != null) {
+                switch (fz7) {
                     case NORTH: {
                         return generateAndAddPiece(m, list, random, this.boundingBox.x0 - 1, this.boundingBox.y0 + integer4, this.boundingBox.z0 + integer5, Direction.WEST, this.getGenDepth());
                     }
@@ -326,9 +328,9 @@ public class StrongholdPieces {
         
         @Nullable
         protected StructurePiece generateSmallDoorChildRight(final StartPiece m, final List<StructurePiece> list, final Random random, final int integer4, final int integer5) {
-            final Direction fp7 = this.getOrientation();
-            if (fp7 != null) {
-                switch (fp7) {
+            final Direction fz7 = this.getOrientation();
+            if (fz7 != null) {
+                switch (fz7) {
                     case NORTH: {
                         return generateAndAddPiece(m, list, random, this.boundingBox.x1 + 1, this.boundingBox.y0 + integer4, this.boundingBox.z0 + integer5, Direction.EAST, this.getGenDepth());
                     }
@@ -346,8 +348,8 @@ public class StrongholdPieces {
             return null;
         }
         
-        protected static boolean isOkBox(final BoundingBox clb) {
-            return clb != null && clb.y0 > 10;
+        protected static boolean isOkBox(final BoundingBox ctd) {
+            return ctd != null && ctd.y0 > 10;
         }
         
         public enum SmallDoorType {
@@ -361,36 +363,36 @@ public class StrongholdPieces {
     public static class FillerCorridor extends StrongholdPiece {
         private final int steps;
         
-        public FillerCorridor(final int integer, final BoundingBox clb, final Direction fp) {
+        public FillerCorridor(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_FILLER_CORRIDOR, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
-            this.steps = ((fp == Direction.NORTH || fp == Direction.SOUTH) ? clb.getZSpan() : clb.getXSpan());
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
+            this.steps = ((fz == Direction.NORTH || fz == Direction.SOUTH) ? ctd.getZSpan() : ctd.getXSpan());
         }
         
-        public FillerCorridor(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_FILLER_CORRIDOR, jt);
-            this.steps = jt.getInt("Steps");
+        public FillerCorridor(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_FILLER_CORRIDOR, le);
+            this.steps = le.getInt("Steps");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putInt("Steps", this.steps);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putInt("Steps", this.steps);
         }
         
-        public static BoundingBox findPieceBox(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp) {
+        public static BoundingBox findPieceBox(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz) {
             final int integer6 = 3;
-            BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, 4, fp);
-            final StructurePiece clu9 = StructurePiece.findCollisionPiece(list, clb8);
-            if (clu9 == null) {
+            BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, 4, fz);
+            final StructurePiece cty9 = StructurePiece.findCollisionPiece(list, ctd8);
+            if (cty9 == null) {
                 return null;
             }
-            if (clu9.getBoundingBox().y0 == clb8.y0) {
+            if (cty9.getBoundingBox().y0 == ctd8.y0) {
                 for (int integer7 = 3; integer7 >= 1; --integer7) {
-                    clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, integer7 - 1, fp);
-                    if (!clu9.getBoundingBox().intersects(clb8)) {
-                        return BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, integer7, fp);
+                    ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, integer7 - 1, fz);
+                    if (!cty9.getBoundingBox().intersects(ctd8)) {
+                        return BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, integer7, fz);
                     }
                 }
             }
@@ -398,25 +400,25 @@ public class StrongholdPieces {
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            for (int integer7 = 0; integer7 < this.steps; ++integer7) {
-                this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 0, 0, integer7, clb);
-                this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 1, 0, integer7, clb);
-                this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 2, 0, integer7, clb);
-                this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 3, 0, integer7, clb);
-                this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 4, 0, integer7, clb);
-                for (int integer8 = 1; integer8 <= 3; ++integer8) {
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 0, integer8, integer7, clb);
-                    this.placeBlock(bjx, Blocks.CAVE_AIR.defaultBlockState(), 1, integer8, integer7, clb);
-                    this.placeBlock(bjx, Blocks.CAVE_AIR.defaultBlockState(), 2, integer8, integer7, clb);
-                    this.placeBlock(bjx, Blocks.CAVE_AIR.defaultBlockState(), 3, integer8, integer7, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 4, integer8, integer7, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            for (int integer9 = 0; integer9 < this.steps; ++integer9) {
+                this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 0, 0, integer9, ctd);
+                this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 1, 0, integer9, ctd);
+                this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 2, 0, integer9, ctd);
+                this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 3, 0, integer9, ctd);
+                this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 4, 0, integer9, ctd);
+                for (int integer10 = 1; integer10 <= 3; ++integer10) {
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 0, integer10, integer9, ctd);
+                    this.placeBlock(bqu, Blocks.CAVE_AIR.defaultBlockState(), 1, integer10, integer9, ctd);
+                    this.placeBlock(bqu, Blocks.CAVE_AIR.defaultBlockState(), 2, integer10, integer9, ctd);
+                    this.placeBlock(bqu, Blocks.CAVE_AIR.defaultBlockState(), 3, integer10, integer9, ctd);
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 4, integer10, integer9, ctd);
                 }
-                this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 0, 4, integer7, clb);
-                this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 1, 4, integer7, clb);
-                this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 2, 4, integer7, clb);
-                this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 3, 4, integer7, clb);
-                this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 4, 4, integer7, clb);
+                this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 0, 4, integer9, ctd);
+                this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 1, 4, integer9, ctd);
+                this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 2, 4, integer9, ctd);
+                this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 3, 4, integer9, ctd);
+                this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 4, 4, integer9, ctd);
             }
             return true;
         }
@@ -425,8 +427,8 @@ public class StrongholdPieces {
     public static class StairsDown extends StrongholdPiece {
         private final boolean isSource;
         
-        public StairsDown(final StructurePieceType cfm, final int integer2, final Random random, final int integer4, final int integer5) {
-            super(cfm, integer2);
+        public StairsDown(final StructurePieceType cmm, final int integer2, final Random random, final int integer4, final int integer5) {
+            super(cmm, integer2);
             this.isSource = true;
             this.setOrientation(Direction.Plane.HORIZONTAL.getRandomDirection(random));
             this.entryDoor = SmallDoorType.OPENING;
@@ -438,67 +440,67 @@ public class StrongholdPieces {
             }
         }
         
-        public StairsDown(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public StairsDown(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_STAIRS_DOWN, integer);
             this.isSource = false;
-            this.setOrientation(fp);
+            this.setOrientation(fz);
             this.entryDoor = this.randomSmallDoor(random);
-            this.boundingBox = clb;
+            this.boundingBox = ctd;
         }
         
-        public StairsDown(final StructurePieceType cfm, final CompoundTag jt) {
-            super(cfm, jt);
-            this.isSource = jt.getBoolean("Source");
+        public StairsDown(final StructurePieceType cmm, final CompoundTag le) {
+            super(cmm, le);
+            this.isSource = le.getBoolean("Source");
         }
         
-        public StairsDown(final StructureManager cmo, final CompoundTag jt) {
-            this(StructurePieceType.STRONGHOLD_STAIRS_DOWN, jt);
+        public StairsDown(final StructureManager cva, final CompoundTag le) {
+            this(StructurePieceType.STRONGHOLD_STAIRS_DOWN, le);
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("Source", this.isSource);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("Source", this.isSource);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
             if (this.isSource) {
                 StrongholdPieces.imposedPiece = FiveCrossing.class;
             }
-            this.generateSmallDoorChildForward((StartPiece)clu, list, random, 1, 1);
+            this.generateSmallDoorChildForward((StartPiece)cty, list, random, 1, 1);
         }
         
-        public static StairsDown createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -7, 0, 5, 11, 5, fp);
-            if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static StairsDown createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -7, 0, 5, 11, 5, fz);
+            if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new StairsDown(integer7, random, clb8, fp);
+            return new StairsDown(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 10, 4, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, this.entryDoor, 1, 7, 0);
-            this.generateSmallDoor(bjx, random, clb, SmallDoorType.OPENING, 1, 1, 4);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 2, 6, 1, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 1, 5, 1, clb);
-            this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 1, 6, 1, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 1, 5, 2, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 1, 4, 3, clb);
-            this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 1, 5, 3, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 2, 4, 3, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 3, 3, 3, clb);
-            this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 3, 4, 3, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 3, 3, 2, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 3, 2, 1, clb);
-            this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 3, 3, 1, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 2, 2, 1, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 1, 1, 1, clb);
-            this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 1, 2, 1, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 1, 1, 2, clb);
-            this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 1, 1, 3, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 10, 4, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, this.entryDoor, 1, 7, 0);
+            this.generateSmallDoor(bqu, random, ctd, SmallDoorType.OPENING, 1, 1, 4);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 2, 6, 1, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 1, 5, 1, ctd);
+            this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 1, 6, 1, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 1, 5, 2, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 1, 4, 3, ctd);
+            this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 1, 5, 3, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 2, 4, 3, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 3, 3, 3, ctd);
+            this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 3, 4, 3, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 3, 3, 2, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 3, 2, 1, ctd);
+            this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 3, 3, 1, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 2, 2, 1, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 1, 1, 1, ctd);
+            this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 1, 2, 1, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 1, 1, 2, ctd);
+            this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 1, 1, 3, ctd);
             return true;
         }
     }
@@ -514,8 +516,8 @@ public class StrongholdPieces {
             this.pendingChildren = Lists.newArrayList();
         }
         
-        public StartPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_START, jt);
+        public StartPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_START, le);
             this.pendingChildren = Lists.newArrayList();
         }
     }
@@ -524,63 +526,63 @@ public class StrongholdPieces {
         private final boolean leftChild;
         private final boolean rightChild;
         
-        public Straight(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public Straight(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_STRAIGHT, integer);
-            this.setOrientation(fp);
+            this.setOrientation(fz);
             this.entryDoor = this.randomSmallDoor(random);
-            this.boundingBox = clb;
+            this.boundingBox = ctd;
             this.leftChild = (random.nextInt(2) == 0);
             this.rightChild = (random.nextInt(2) == 0);
         }
         
-        public Straight(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_STRAIGHT, jt);
-            this.leftChild = jt.getBoolean("Left");
-            this.rightChild = jt.getBoolean("Right");
+        public Straight(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_STRAIGHT, le);
+            this.leftChild = le.getBoolean("Left");
+            this.rightChild = le.getBoolean("Right");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("Left", this.leftChild);
-            jt.putBoolean("Right", this.rightChild);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("Left", this.leftChild);
+            le.putBoolean("Right", this.rightChild);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateSmallDoorChildForward((StartPiece)clu, list, random, 1, 1);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateSmallDoorChildForward((StartPiece)cty, list, random, 1, 1);
             if (this.leftChild) {
-                this.generateSmallDoorChildLeft((StartPiece)clu, list, random, 1, 2);
+                this.generateSmallDoorChildLeft((StartPiece)cty, list, random, 1, 2);
             }
             if (this.rightChild) {
-                this.generateSmallDoorChildRight((StartPiece)clu, list, random, 1, 2);
+                this.generateSmallDoorChildRight((StartPiece)cty, list, random, 1, 2);
             }
         }
         
-        public static Straight createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, 7, fp);
-            if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static Straight createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, 7, fz);
+            if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new Straight(integer7, random, clb8, fp);
+            return new Straight(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 4, 6, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, this.entryDoor, 1, 1, 0);
-            this.generateSmallDoor(bjx, random, clb, SmallDoorType.OPENING, 1, 1, 6);
-            final BlockState byj7 = ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.EAST);
-            final BlockState byj8 = ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.WEST);
-            this.maybeGenerateBlock(bjx, clb, random, 0.1f, 1, 2, 1, byj7);
-            this.maybeGenerateBlock(bjx, clb, random, 0.1f, 3, 2, 1, byj8);
-            this.maybeGenerateBlock(bjx, clb, random, 0.1f, 1, 2, 5, byj7);
-            this.maybeGenerateBlock(bjx, clb, random, 0.1f, 3, 2, 5, byj8);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 4, 6, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, this.entryDoor, 1, 1, 0);
+            this.generateSmallDoor(bqu, random, ctd, SmallDoorType.OPENING, 1, 1, 6);
+            final BlockState cfj9 = ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.EAST);
+            final BlockState cfj10 = ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.WEST);
+            this.maybeGenerateBlock(bqu, ctd, random, 0.1f, 1, 2, 1, cfj9);
+            this.maybeGenerateBlock(bqu, ctd, random, 0.1f, 3, 2, 1, cfj10);
+            this.maybeGenerateBlock(bqu, ctd, random, 0.1f, 1, 2, 5, cfj9);
+            this.maybeGenerateBlock(bqu, ctd, random, 0.1f, 3, 2, 5, cfj10);
             if (this.leftChild) {
-                this.generateBox(bjx, clb, 0, 1, 2, 0, 3, 4, Straight.CAVE_AIR, Straight.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, 0, 1, 2, 0, 3, 4, Straight.CAVE_AIR, Straight.CAVE_AIR, false);
             }
             if (this.rightChild) {
-                this.generateBox(bjx, clb, 4, 1, 2, 4, 3, 4, Straight.CAVE_AIR, Straight.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, 4, 1, 2, 4, 3, 4, Straight.CAVE_AIR, Straight.CAVE_AIR, false);
             }
             return true;
         }
@@ -589,97 +591,97 @@ public class StrongholdPieces {
     public static class ChestCorridor extends StrongholdPiece {
         private boolean hasPlacedChest;
         
-        public ChestCorridor(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public ChestCorridor(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_CHEST_CORRIDOR, integer);
-            this.setOrientation(fp);
+            this.setOrientation(fz);
             this.entryDoor = this.randomSmallDoor(random);
-            this.boundingBox = clb;
+            this.boundingBox = ctd;
         }
         
-        public ChestCorridor(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_CHEST_CORRIDOR, jt);
-            this.hasPlacedChest = jt.getBoolean("Chest");
+        public ChestCorridor(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_CHEST_CORRIDOR, le);
+            this.hasPlacedChest = le.getBoolean("Chest");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("Chest", this.hasPlacedChest);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("Chest", this.hasPlacedChest);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateSmallDoorChildForward((StartPiece)clu, list, random, 1, 1);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateSmallDoorChildForward((StartPiece)cty, list, random, 1, 1);
         }
         
-        public static ChestCorridor createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, 7, fp);
-            if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static ChestCorridor createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, 7, fz);
+            if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new ChestCorridor(integer7, random, clb8, fp);
+            return new ChestCorridor(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 4, 6, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, this.entryDoor, 1, 1, 0);
-            this.generateSmallDoor(bjx, random, clb, SmallDoorType.OPENING, 1, 1, 6);
-            this.generateBox(bjx, clb, 3, 1, 2, 3, 1, 4, Blocks.STONE_BRICKS.defaultBlockState(), Blocks.STONE_BRICKS.defaultBlockState(), false);
-            this.placeBlock(bjx, Blocks.STONE_BRICK_SLAB.defaultBlockState(), 3, 1, 1, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICK_SLAB.defaultBlockState(), 3, 1, 5, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICK_SLAB.defaultBlockState(), 3, 2, 2, clb);
-            this.placeBlock(bjx, Blocks.STONE_BRICK_SLAB.defaultBlockState(), 3, 2, 4, clb);
-            for (int integer7 = 2; integer7 <= 4; ++integer7) {
-                this.placeBlock(bjx, Blocks.STONE_BRICK_SLAB.defaultBlockState(), 2, 1, integer7, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 4, 6, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, this.entryDoor, 1, 1, 0);
+            this.generateSmallDoor(bqu, random, ctd, SmallDoorType.OPENING, 1, 1, 6);
+            this.generateBox(bqu, ctd, 3, 1, 2, 3, 1, 4, Blocks.STONE_BRICKS.defaultBlockState(), Blocks.STONE_BRICKS.defaultBlockState(), false);
+            this.placeBlock(bqu, Blocks.STONE_BRICK_SLAB.defaultBlockState(), 3, 1, 1, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICK_SLAB.defaultBlockState(), 3, 1, 5, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICK_SLAB.defaultBlockState(), 3, 2, 2, ctd);
+            this.placeBlock(bqu, Blocks.STONE_BRICK_SLAB.defaultBlockState(), 3, 2, 4, ctd);
+            for (int integer9 = 2; integer9 <= 4; ++integer9) {
+                this.placeBlock(bqu, Blocks.STONE_BRICK_SLAB.defaultBlockState(), 2, 1, integer9, ctd);
             }
-            if (!this.hasPlacedChest && clb.isInside(new BlockPos(this.getWorldX(3, 3), this.getWorldY(2), this.getWorldZ(3, 3)))) {
+            if (!this.hasPlacedChest && ctd.isInside(new BlockPos(this.getWorldX(3, 3), this.getWorldY(2), this.getWorldZ(3, 3)))) {
                 this.hasPlacedChest = true;
-                this.createChest(bjx, clb, random, 3, 2, 3, BuiltInLootTables.STRONGHOLD_CORRIDOR);
+                this.createChest(bqu, ctd, random, 3, 2, 3, BuiltInLootTables.STRONGHOLD_CORRIDOR);
             }
             return true;
         }
     }
     
     public static class StraightStairsDown extends StrongholdPiece {
-        public StraightStairsDown(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public StraightStairsDown(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_STRAIGHT_STAIRS_DOWN, integer);
-            this.setOrientation(fp);
+            this.setOrientation(fz);
             this.entryDoor = this.randomSmallDoor(random);
-            this.boundingBox = clb;
+            this.boundingBox = ctd;
         }
         
-        public StraightStairsDown(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_STRAIGHT_STAIRS_DOWN, jt);
+        public StraightStairsDown(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_STRAIGHT_STAIRS_DOWN, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateSmallDoorChildForward((StartPiece)clu, list, random, 1, 1);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateSmallDoorChildForward((StartPiece)cty, list, random, 1, 1);
         }
         
-        public static StraightStairsDown createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -7, 0, 5, 11, 8, fp);
-            if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static StraightStairsDown createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -7, 0, 5, 11, 8, fz);
+            if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new StraightStairsDown(integer7, random, clb8, fp);
+            return new StraightStairsDown(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 10, 7, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, this.entryDoor, 1, 7, 0);
-            this.generateSmallDoor(bjx, random, clb, SmallDoorType.OPENING, 1, 1, 7);
-            final BlockState byj7 = ((AbstractStateHolder<O, BlockState>)Blocks.COBBLESTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.SOUTH);
-            for (int integer8 = 0; integer8 < 6; ++integer8) {
-                this.placeBlock(bjx, byj7, 1, 6 - integer8, 1 + integer8, clb);
-                this.placeBlock(bjx, byj7, 2, 6 - integer8, 1 + integer8, clb);
-                this.placeBlock(bjx, byj7, 3, 6 - integer8, 1 + integer8, clb);
-                if (integer8 < 5) {
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 1, 5 - integer8, 1 + integer8, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 2, 5 - integer8, 1 + integer8, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 3, 5 - integer8, 1 + integer8, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 10, 7, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, this.entryDoor, 1, 7, 0);
+            this.generateSmallDoor(bqu, random, ctd, SmallDoorType.OPENING, 1, 1, 7);
+            final BlockState cfj9 = ((StateHolder<O, BlockState>)Blocks.COBBLESTONE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.SOUTH);
+            for (int integer10 = 0; integer10 < 6; ++integer10) {
+                this.placeBlock(bqu, cfj9, 1, 6 - integer10, 1 + integer10, ctd);
+                this.placeBlock(bqu, cfj9, 2, 6 - integer10, 1 + integer10, ctd);
+                this.placeBlock(bqu, cfj9, 3, 6 - integer10, 1 + integer10, ctd);
+                if (integer10 < 5) {
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 1, 5 - integer10, 1 + integer10, ctd);
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 2, 5 - integer10, 1 + integer10, ctd);
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 3, 5 - integer10, 1 + integer10, ctd);
                 }
             }
             return true;
@@ -687,102 +689,102 @@ public class StrongholdPieces {
     }
     
     public abstract static class Turn extends StrongholdPiece {
-        protected Turn(final StructurePieceType cfm, final int integer) {
-            super(cfm, integer);
+        protected Turn(final StructurePieceType cmm, final int integer) {
+            super(cmm, integer);
         }
         
-        public Turn(final StructurePieceType cfm, final CompoundTag jt) {
-            super(cfm, jt);
+        public Turn(final StructurePieceType cmm, final CompoundTag le) {
+            super(cmm, le);
         }
     }
     
     public static class LeftTurn extends Turn {
-        public LeftTurn(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public LeftTurn(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_LEFT_TURN, integer);
-            this.setOrientation(fp);
+            this.setOrientation(fz);
             this.entryDoor = this.randomSmallDoor(random);
-            this.boundingBox = clb;
+            this.boundingBox = ctd;
         }
         
-        public LeftTurn(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_LEFT_TURN, jt);
+        public LeftTurn(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_LEFT_TURN, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            final Direction fp5 = this.getOrientation();
-            if (fp5 == Direction.NORTH || fp5 == Direction.EAST) {
-                this.generateSmallDoorChildLeft((StartPiece)clu, list, random, 1, 1);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            final Direction fz5 = this.getOrientation();
+            if (fz5 == Direction.NORTH || fz5 == Direction.EAST) {
+                this.generateSmallDoorChildLeft((StartPiece)cty, list, random, 1, 1);
             }
             else {
-                this.generateSmallDoorChildRight((StartPiece)clu, list, random, 1, 1);
+                this.generateSmallDoorChildRight((StartPiece)cty, list, random, 1, 1);
             }
         }
         
-        public static LeftTurn createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, 5, fp);
-            if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static LeftTurn createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, 5, fz);
+            if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new LeftTurn(integer7, random, clb8, fp);
+            return new LeftTurn(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 4, 4, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, this.entryDoor, 1, 1, 0);
-            final Direction fp7 = this.getOrientation();
-            if (fp7 == Direction.NORTH || fp7 == Direction.EAST) {
-                this.generateBox(bjx, clb, 0, 1, 1, 0, 3, 3, LeftTurn.CAVE_AIR, LeftTurn.CAVE_AIR, false);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 4, 4, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, this.entryDoor, 1, 1, 0);
+            final Direction fz9 = this.getOrientation();
+            if (fz9 == Direction.NORTH || fz9 == Direction.EAST) {
+                this.generateBox(bqu, ctd, 0, 1, 1, 0, 3, 3, LeftTurn.CAVE_AIR, LeftTurn.CAVE_AIR, false);
             }
             else {
-                this.generateBox(bjx, clb, 4, 1, 1, 4, 3, 3, LeftTurn.CAVE_AIR, LeftTurn.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, 4, 1, 1, 4, 3, 3, LeftTurn.CAVE_AIR, LeftTurn.CAVE_AIR, false);
             }
             return true;
         }
     }
     
     public static class RightTurn extends Turn {
-        public RightTurn(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public RightTurn(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_RIGHT_TURN, integer);
-            this.setOrientation(fp);
+            this.setOrientation(fz);
             this.entryDoor = this.randomSmallDoor(random);
-            this.boundingBox = clb;
+            this.boundingBox = ctd;
         }
         
-        public RightTurn(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_RIGHT_TURN, jt);
+        public RightTurn(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_RIGHT_TURN, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            final Direction fp5 = this.getOrientation();
-            if (fp5 == Direction.NORTH || fp5 == Direction.EAST) {
-                this.generateSmallDoorChildRight((StartPiece)clu, list, random, 1, 1);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            final Direction fz5 = this.getOrientation();
+            if (fz5 == Direction.NORTH || fz5 == Direction.EAST) {
+                this.generateSmallDoorChildRight((StartPiece)cty, list, random, 1, 1);
             }
             else {
-                this.generateSmallDoorChildLeft((StartPiece)clu, list, random, 1, 1);
+                this.generateSmallDoorChildLeft((StartPiece)cty, list, random, 1, 1);
             }
         }
         
-        public static RightTurn createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, 5, fp);
-            if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static RightTurn createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 5, 5, 5, fz);
+            if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new RightTurn(integer7, random, clb8, fp);
+            return new RightTurn(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 4, 4, 4, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, this.entryDoor, 1, 1, 0);
-            final Direction fp7 = this.getOrientation();
-            if (fp7 == Direction.NORTH || fp7 == Direction.EAST) {
-                this.generateBox(bjx, clb, 4, 1, 1, 4, 3, 3, RightTurn.CAVE_AIR, RightTurn.CAVE_AIR, false);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 4, 4, 4, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, this.entryDoor, 1, 1, 0);
+            final Direction fz9 = this.getOrientation();
+            if (fz9 == Direction.NORTH || fz9 == Direction.EAST) {
+                this.generateBox(bqu, ctd, 4, 1, 1, 4, 3, 3, RightTurn.CAVE_AIR, RightTurn.CAVE_AIR, false);
             }
             else {
-                this.generateBox(bjx, clb, 0, 1, 1, 0, 3, 3, RightTurn.CAVE_AIR, RightTurn.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, 0, 1, 1, 0, 3, 3, RightTurn.CAVE_AIR, RightTurn.CAVE_AIR, false);
             }
             return true;
         }
@@ -791,119 +793,119 @@ public class StrongholdPieces {
     public static class RoomCrossing extends StrongholdPiece {
         protected final int type;
         
-        public RoomCrossing(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public RoomCrossing(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_ROOM_CROSSING, integer);
-            this.setOrientation(fp);
+            this.setOrientation(fz);
             this.entryDoor = this.randomSmallDoor(random);
-            this.boundingBox = clb;
+            this.boundingBox = ctd;
             this.type = random.nextInt(5);
         }
         
-        public RoomCrossing(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_ROOM_CROSSING, jt);
-            this.type = jt.getInt("Type");
+        public RoomCrossing(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_ROOM_CROSSING, le);
+            this.type = le.getInt("Type");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putInt("Type", this.type);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putInt("Type", this.type);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateSmallDoorChildForward((StartPiece)clu, list, random, 4, 1);
-            this.generateSmallDoorChildLeft((StartPiece)clu, list, random, 1, 4);
-            this.generateSmallDoorChildRight((StartPiece)clu, list, random, 1, 4);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateSmallDoorChildForward((StartPiece)cty, list, random, 4, 1);
+            this.generateSmallDoorChildLeft((StartPiece)cty, list, random, 1, 4);
+            this.generateSmallDoorChildRight((StartPiece)cty, list, random, 1, 4);
         }
         
-        public static RoomCrossing createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -4, -1, 0, 11, 7, 11, fp);
-            if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static RoomCrossing createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -4, -1, 0, 11, 7, 11, fz);
+            if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new RoomCrossing(integer7, random, clb8, fp);
+            return new RoomCrossing(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 10, 6, 10, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, this.entryDoor, 4, 1, 0);
-            this.generateBox(bjx, clb, 4, 1, 10, 6, 3, 10, RoomCrossing.CAVE_AIR, RoomCrossing.CAVE_AIR, false);
-            this.generateBox(bjx, clb, 0, 1, 4, 0, 3, 6, RoomCrossing.CAVE_AIR, RoomCrossing.CAVE_AIR, false);
-            this.generateBox(bjx, clb, 10, 1, 4, 10, 3, 6, RoomCrossing.CAVE_AIR, RoomCrossing.CAVE_AIR, false);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 10, 6, 10, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, this.entryDoor, 4, 1, 0);
+            this.generateBox(bqu, ctd, 4, 1, 10, 6, 3, 10, RoomCrossing.CAVE_AIR, RoomCrossing.CAVE_AIR, false);
+            this.generateBox(bqu, ctd, 0, 1, 4, 0, 3, 6, RoomCrossing.CAVE_AIR, RoomCrossing.CAVE_AIR, false);
+            this.generateBox(bqu, ctd, 10, 1, 4, 10, 3, 6, RoomCrossing.CAVE_AIR, RoomCrossing.CAVE_AIR, false);
             switch (this.type) {
                 case 0: {
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 5, 1, 5, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 5, 2, 5, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 5, 3, 5, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.WEST), 4, 3, 5, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.EAST), 6, 3, 5, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.SOUTH), 5, 3, 4, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.NORTH), 5, 3, 6, clb);
-                    this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 4, 1, 4, clb);
-                    this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 4, 1, 5, clb);
-                    this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 4, 1, 6, clb);
-                    this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 6, 1, 4, clb);
-                    this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 6, 1, 5, clb);
-                    this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 6, 1, 6, clb);
-                    this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 5, 1, 4, clb);
-                    this.placeBlock(bjx, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 5, 1, 6, clb);
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 5, 1, 5, ctd);
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 5, 2, 5, ctd);
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 5, 3, 5, ctd);
+                    this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.WEST), 4, 3, 5, ctd);
+                    this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.EAST), 6, 3, 5, ctd);
+                    this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.SOUTH), 5, 3, 4, ctd);
+                    this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.NORTH), 5, 3, 6, ctd);
+                    this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 4, 1, 4, ctd);
+                    this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 4, 1, 5, ctd);
+                    this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 4, 1, 6, ctd);
+                    this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 6, 1, 4, ctd);
+                    this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 6, 1, 5, ctd);
+                    this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 6, 1, 6, ctd);
+                    this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 5, 1, 4, ctd);
+                    this.placeBlock(bqu, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), 5, 1, 6, ctd);
                     break;
                 }
                 case 1: {
-                    for (int integer7 = 0; integer7 < 5; ++integer7) {
-                        this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 3, 1, 3 + integer7, clb);
-                        this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 7, 1, 3 + integer7, clb);
-                        this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 3 + integer7, 1, 3, clb);
-                        this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 3 + integer7, 1, 7, clb);
+                    for (int integer9 = 0; integer9 < 5; ++integer9) {
+                        this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 3, 1, 3 + integer9, ctd);
+                        this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 7, 1, 3 + integer9, ctd);
+                        this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 3 + integer9, 1, 3, ctd);
+                        this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 3 + integer9, 1, 7, ctd);
                     }
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 5, 1, 5, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 5, 2, 5, clb);
-                    this.placeBlock(bjx, Blocks.STONE_BRICKS.defaultBlockState(), 5, 3, 5, clb);
-                    this.placeBlock(bjx, Blocks.WATER.defaultBlockState(), 5, 4, 5, clb);
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 5, 1, 5, ctd);
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 5, 2, 5, ctd);
+                    this.placeBlock(bqu, Blocks.STONE_BRICKS.defaultBlockState(), 5, 3, 5, ctd);
+                    this.placeBlock(bqu, Blocks.WATER.defaultBlockState(), 5, 4, 5, ctd);
                     break;
                 }
                 case 2: {
-                    for (int integer7 = 1; integer7 <= 9; ++integer7) {
-                        this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 1, 3, integer7, clb);
-                        this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 9, 3, integer7, clb);
+                    for (int integer9 = 1; integer9 <= 9; ++integer9) {
+                        this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 1, 3, integer9, ctd);
+                        this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 9, 3, integer9, ctd);
                     }
-                    for (int integer7 = 1; integer7 <= 9; ++integer7) {
-                        this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), integer7, 3, 1, clb);
-                        this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), integer7, 3, 9, clb);
+                    for (int integer9 = 1; integer9 <= 9; ++integer9) {
+                        this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), integer9, 3, 1, ctd);
+                        this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), integer9, 3, 9, ctd);
                     }
-                    this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 5, 1, 4, clb);
-                    this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 5, 1, 6, clb);
-                    this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 5, 3, 4, clb);
-                    this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 5, 3, 6, clb);
-                    this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 4, 1, 5, clb);
-                    this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 6, 1, 5, clb);
-                    this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 4, 3, 5, clb);
-                    this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 6, 3, 5, clb);
-                    for (int integer7 = 1; integer7 <= 3; ++integer7) {
-                        this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 4, integer7, 4, clb);
-                        this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 6, integer7, 4, clb);
-                        this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 4, integer7, 6, clb);
-                        this.placeBlock(bjx, Blocks.COBBLESTONE.defaultBlockState(), 6, integer7, 6, clb);
+                    this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 5, 1, 4, ctd);
+                    this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 5, 1, 6, ctd);
+                    this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 5, 3, 4, ctd);
+                    this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 5, 3, 6, ctd);
+                    this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 4, 1, 5, ctd);
+                    this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 6, 1, 5, ctd);
+                    this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 4, 3, 5, ctd);
+                    this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 6, 3, 5, ctd);
+                    for (int integer9 = 1; integer9 <= 3; ++integer9) {
+                        this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 4, integer9, 4, ctd);
+                        this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 6, integer9, 4, ctd);
+                        this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 4, integer9, 6, ctd);
+                        this.placeBlock(bqu, Blocks.COBBLESTONE.defaultBlockState(), 6, integer9, 6, ctd);
                     }
-                    this.placeBlock(bjx, Blocks.TORCH.defaultBlockState(), 5, 3, 5, clb);
-                    for (int integer7 = 2; integer7 <= 8; ++integer7) {
-                        this.placeBlock(bjx, Blocks.OAK_PLANKS.defaultBlockState(), 2, 3, integer7, clb);
-                        this.placeBlock(bjx, Blocks.OAK_PLANKS.defaultBlockState(), 3, 3, integer7, clb);
-                        if (integer7 <= 3 || integer7 >= 7) {
-                            this.placeBlock(bjx, Blocks.OAK_PLANKS.defaultBlockState(), 4, 3, integer7, clb);
-                            this.placeBlock(bjx, Blocks.OAK_PLANKS.defaultBlockState(), 5, 3, integer7, clb);
-                            this.placeBlock(bjx, Blocks.OAK_PLANKS.defaultBlockState(), 6, 3, integer7, clb);
+                    this.placeBlock(bqu, Blocks.TORCH.defaultBlockState(), 5, 3, 5, ctd);
+                    for (int integer9 = 2; integer9 <= 8; ++integer9) {
+                        this.placeBlock(bqu, Blocks.OAK_PLANKS.defaultBlockState(), 2, 3, integer9, ctd);
+                        this.placeBlock(bqu, Blocks.OAK_PLANKS.defaultBlockState(), 3, 3, integer9, ctd);
+                        if (integer9 <= 3 || integer9 >= 7) {
+                            this.placeBlock(bqu, Blocks.OAK_PLANKS.defaultBlockState(), 4, 3, integer9, ctd);
+                            this.placeBlock(bqu, Blocks.OAK_PLANKS.defaultBlockState(), 5, 3, integer9, ctd);
+                            this.placeBlock(bqu, Blocks.OAK_PLANKS.defaultBlockState(), 6, 3, integer9, ctd);
                         }
-                        this.placeBlock(bjx, Blocks.OAK_PLANKS.defaultBlockState(), 7, 3, integer7, clb);
-                        this.placeBlock(bjx, Blocks.OAK_PLANKS.defaultBlockState(), 8, 3, integer7, clb);
+                        this.placeBlock(bqu, Blocks.OAK_PLANKS.defaultBlockState(), 7, 3, integer9, ctd);
+                        this.placeBlock(bqu, Blocks.OAK_PLANKS.defaultBlockState(), 8, 3, integer9, ctd);
                     }
-                    final BlockState byj7 = ((AbstractStateHolder<O, BlockState>)Blocks.LADDER.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)LadderBlock.FACING, Direction.WEST);
-                    this.placeBlock(bjx, byj7, 9, 1, 3, clb);
-                    this.placeBlock(bjx, byj7, 9, 2, 3, clb);
-                    this.placeBlock(bjx, byj7, 9, 3, 3, clb);
-                    this.createChest(bjx, clb, random, 3, 4, 8, BuiltInLootTables.STRONGHOLD_CROSSING);
+                    final BlockState cfj9 = ((StateHolder<O, BlockState>)Blocks.LADDER.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)LadderBlock.FACING, Direction.WEST);
+                    this.placeBlock(bqu, cfj9, 9, 1, 3, ctd);
+                    this.placeBlock(bqu, cfj9, 9, 2, 3, ctd);
+                    this.placeBlock(bqu, cfj9, 9, 3, 3, ctd);
+                    this.createChest(bqu, ctd, random, 3, 4, 8, BuiltInLootTables.STRONGHOLD_CROSSING);
                     break;
                 }
             }
@@ -912,55 +914,55 @@ public class StrongholdPieces {
     }
     
     public static class PrisonHall extends StrongholdPiece {
-        public PrisonHall(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public PrisonHall(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_PRISON_HALL, integer);
-            this.setOrientation(fp);
+            this.setOrientation(fz);
             this.entryDoor = this.randomSmallDoor(random);
-            this.boundingBox = clb;
+            this.boundingBox = ctd;
         }
         
-        public PrisonHall(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_PRISON_HALL, jt);
+        public PrisonHall(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_PRISON_HALL, le);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            this.generateSmallDoorChildForward((StartPiece)clu, list, random, 1, 1);
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            this.generateSmallDoorChildForward((StartPiece)cty, list, random, 1, 1);
         }
         
-        public static PrisonHall createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 9, 5, 11, fp);
-            if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static PrisonHall createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -1, -1, 0, 9, 5, 11, fz);
+            if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new PrisonHall(integer7, random, clb8, fp);
+            return new PrisonHall(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 8, 4, 10, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, this.entryDoor, 1, 1, 0);
-            this.generateBox(bjx, clb, 1, 1, 10, 3, 3, 10, PrisonHall.CAVE_AIR, PrisonHall.CAVE_AIR, false);
-            this.generateBox(bjx, clb, 4, 1, 1, 4, 3, 1, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 4, 1, 3, 4, 3, 3, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 4, 1, 7, 4, 3, 7, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 4, 1, 9, 4, 3, 9, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            for (int integer7 = 1; integer7 <= 3; ++integer7) {
-                this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true), 4, integer7, 4, clb);
-                this.placeBlock(bjx, ((((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), 4, integer7, 5, clb);
-                this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true), 4, integer7, 6, clb);
-                this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), 5, integer7, 5, clb);
-                this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), 6, integer7, 5, clb);
-                this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), 7, integer7, 5, clb);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 8, 4, 10, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, this.entryDoor, 1, 1, 0);
+            this.generateBox(bqu, ctd, 1, 1, 10, 3, 3, 10, PrisonHall.CAVE_AIR, PrisonHall.CAVE_AIR, false);
+            this.generateBox(bqu, ctd, 4, 1, 1, 4, 3, 1, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 4, 1, 3, 4, 3, 3, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 4, 1, 7, 4, 3, 7, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 4, 1, 9, 4, 3, 9, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            for (int integer9 = 1; integer9 <= 3; ++integer9) {
+                this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true), 4, integer9, 4, ctd);
+                this.placeBlock(bqu, ((((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).setValue((Property<Comparable>)IronBarsBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), 4, integer9, 5, ctd);
+                this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true), 4, integer9, 6, ctd);
+                this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), 5, integer9, 5, ctd);
+                this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), 6, integer9, 5, ctd);
+                this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true), 7, integer9, 5, ctd);
             }
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true), 4, 3, 2, clb);
-            this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true), 4, 3, 8, clb);
-            final BlockState byj7 = ((AbstractStateHolder<O, BlockState>)Blocks.IRON_DOOR.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)DoorBlock.FACING, Direction.WEST);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.IRON_DOOR.defaultBlockState()).setValue((Property<Comparable>)DoorBlock.FACING, Direction.WEST)).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.UPPER);
-            this.placeBlock(bjx, byj7, 4, 1, 2, clb);
-            this.placeBlock(bjx, byj8, 4, 2, 2, clb);
-            this.placeBlock(bjx, byj7, 4, 1, 8, clb);
-            this.placeBlock(bjx, byj8, 4, 2, 8, clb);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true), 4, 3, 2, ctd);
+            this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true), 4, 3, 8, ctd);
+            final BlockState cfj9 = ((StateHolder<O, BlockState>)Blocks.IRON_DOOR.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)DoorBlock.FACING, Direction.WEST);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.IRON_DOOR.defaultBlockState()).setValue((Property<Comparable>)DoorBlock.FACING, Direction.WEST)).<DoubleBlockHalf, DoubleBlockHalf>setValue(DoorBlock.HALF, DoubleBlockHalf.UPPER);
+            this.placeBlock(bqu, cfj9, 4, 1, 2, ctd);
+            this.placeBlock(bqu, cfj10, 4, 2, 2, ctd);
+            this.placeBlock(bqu, cfj9, 4, 1, 8, ctd);
+            this.placeBlock(bqu, cfj10, 4, 2, 8, ctd);
             return true;
         }
     }
@@ -968,132 +970,132 @@ public class StrongholdPieces {
     public static class Library extends StrongholdPiece {
         private final boolean isTall;
         
-        public Library(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public Library(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_LIBRARY, integer);
-            this.setOrientation(fp);
+            this.setOrientation(fz);
             this.entryDoor = this.randomSmallDoor(random);
-            this.boundingBox = clb;
-            this.isTall = (clb.getYSpan() > 6);
+            this.boundingBox = ctd;
+            this.isTall = (ctd.getYSpan() > 6);
         }
         
-        public Library(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_LIBRARY, jt);
-            this.isTall = jt.getBoolean("Tall");
+        public Library(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_LIBRARY, le);
+            this.isTall = le.getBoolean("Tall");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("Tall", this.isTall);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("Tall", this.isTall);
         }
         
-        public static Library createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -4, -1, 0, 14, 11, 15, fp);
-            if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
-                clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -4, -1, 0, 14, 6, 15, fp);
-                if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static Library createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -4, -1, 0, 14, 11, 15, fz);
+            if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
+                ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -4, -1, 0, 14, 6, 15, fz);
+                if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                     return null;
                 }
             }
-            return new Library(integer7, random, clb8, fp);
+            return new Library(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            int integer7 = 11;
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            int integer9 = 11;
             if (!this.isTall) {
-                integer7 = 6;
+                integer9 = 6;
             }
-            this.generateBox(bjx, clb, 0, 0, 0, 13, integer7 - 1, 14, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, this.entryDoor, 4, 1, 0);
-            this.generateMaybeBox(bjx, clb, random, 0.07f, 2, 1, 1, 11, 4, 13, Blocks.COBWEB.defaultBlockState(), Blocks.COBWEB.defaultBlockState(), false, false);
-            final int integer8 = 1;
-            final int integer9 = 12;
-            for (int integer10 = 1; integer10 <= 13; ++integer10) {
-                if ((integer10 - 1) % 4 == 0) {
-                    this.generateBox(bjx, clb, 1, 1, integer10, 1, 4, integer10, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
-                    this.generateBox(bjx, clb, 12, 1, integer10, 12, 4, integer10, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.EAST), 2, 3, integer10, clb);
-                    this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.WEST), 11, 3, integer10, clb);
+            this.generateBox(bqu, ctd, 0, 0, 0, 13, integer9 - 1, 14, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, this.entryDoor, 4, 1, 0);
+            this.generateMaybeBox(bqu, ctd, random, 0.07f, 2, 1, 1, 11, 4, 13, Blocks.COBWEB.defaultBlockState(), Blocks.COBWEB.defaultBlockState(), false, false);
+            final int integer10 = 1;
+            final int integer11 = 12;
+            for (int integer12 = 1; integer12 <= 13; ++integer12) {
+                if ((integer12 - 1) % 4 == 0) {
+                    this.generateBox(bqu, ctd, 1, 1, integer12, 1, 4, integer12, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
+                    this.generateBox(bqu, ctd, 12, 1, integer12, 12, 4, integer12, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
+                    this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.EAST), 2, 3, integer12, ctd);
+                    this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.WEST), 11, 3, integer12, ctd);
                     if (this.isTall) {
-                        this.generateBox(bjx, clb, 1, 6, integer10, 1, 9, integer10, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
-                        this.generateBox(bjx, clb, 12, 6, integer10, 12, 9, integer10, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
+                        this.generateBox(bqu, ctd, 1, 6, integer12, 1, 9, integer12, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
+                        this.generateBox(bqu, ctd, 12, 6, integer12, 12, 9, integer12, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
                     }
                 }
                 else {
-                    this.generateBox(bjx, clb, 1, 1, integer10, 1, 4, integer10, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
-                    this.generateBox(bjx, clb, 12, 1, integer10, 12, 4, integer10, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
+                    this.generateBox(bqu, ctd, 1, 1, integer12, 1, 4, integer12, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
+                    this.generateBox(bqu, ctd, 12, 1, integer12, 12, 4, integer12, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
                     if (this.isTall) {
-                        this.generateBox(bjx, clb, 1, 6, integer10, 1, 9, integer10, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
-                        this.generateBox(bjx, clb, 12, 6, integer10, 12, 9, integer10, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
+                        this.generateBox(bqu, ctd, 1, 6, integer12, 1, 9, integer12, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
+                        this.generateBox(bqu, ctd, 12, 6, integer12, 12, 9, integer12, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
                     }
                 }
             }
-            for (int integer10 = 3; integer10 < 12; integer10 += 2) {
-                this.generateBox(bjx, clb, 3, 1, integer10, 4, 3, integer10, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
-                this.generateBox(bjx, clb, 6, 1, integer10, 7, 3, integer10, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
-                this.generateBox(bjx, clb, 9, 1, integer10, 10, 3, integer10, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
+            for (int integer12 = 3; integer12 < 12; integer12 += 2) {
+                this.generateBox(bqu, ctd, 3, 1, integer12, 4, 3, integer12, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
+                this.generateBox(bqu, ctd, 6, 1, integer12, 7, 3, integer12, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
+                this.generateBox(bqu, ctd, 9, 1, integer12, 10, 3, integer12, Blocks.BOOKSHELF.defaultBlockState(), Blocks.BOOKSHELF.defaultBlockState(), false);
             }
             if (this.isTall) {
-                this.generateBox(bjx, clb, 1, 5, 1, 3, 5, 13, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
-                this.generateBox(bjx, clb, 10, 5, 1, 12, 5, 13, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
-                this.generateBox(bjx, clb, 4, 5, 1, 9, 5, 2, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
-                this.generateBox(bjx, clb, 4, 5, 12, 9, 5, 13, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
-                this.placeBlock(bjx, Blocks.OAK_PLANKS.defaultBlockState(), 9, 5, 11, clb);
-                this.placeBlock(bjx, Blocks.OAK_PLANKS.defaultBlockState(), 8, 5, 11, clb);
-                this.placeBlock(bjx, Blocks.OAK_PLANKS.defaultBlockState(), 9, 5, 10, clb);
-                final BlockState byj10 = (((AbstractStateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-                final BlockState byj11 = (((AbstractStateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
-                this.generateBox(bjx, clb, 3, 6, 3, 3, 6, 11, byj11, byj11, false);
-                this.generateBox(bjx, clb, 10, 6, 3, 10, 6, 9, byj11, byj11, false);
-                this.generateBox(bjx, clb, 4, 6, 2, 9, 6, 2, byj10, byj10, false);
-                this.generateBox(bjx, clb, 4, 6, 12, 7, 6, 12, byj10, byj10, false);
-                this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 3, 6, 2, clb);
-                this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 3, 6, 12, clb);
-                this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 10, 6, 2, clb);
-                for (int integer11 = 0; integer11 <= 2; ++integer11) {
-                    this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 8 + integer11, 6, 12 - integer11, clb);
-                    if (integer11 != 2) {
-                        this.placeBlock(bjx, (((AbstractStateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 8 + integer11, 6, 11 - integer11, clb);
+                this.generateBox(bqu, ctd, 1, 5, 1, 3, 5, 13, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
+                this.generateBox(bqu, ctd, 10, 5, 1, 12, 5, 13, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
+                this.generateBox(bqu, ctd, 4, 5, 1, 9, 5, 2, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
+                this.generateBox(bqu, ctd, 4, 5, 12, 9, 5, 13, Blocks.OAK_PLANKS.defaultBlockState(), Blocks.OAK_PLANKS.defaultBlockState(), false);
+                this.placeBlock(bqu, Blocks.OAK_PLANKS.defaultBlockState(), 9, 5, 11, ctd);
+                this.placeBlock(bqu, Blocks.OAK_PLANKS.defaultBlockState(), 8, 5, 11, ctd);
+                this.placeBlock(bqu, Blocks.OAK_PLANKS.defaultBlockState(), 9, 5, 10, ctd);
+                final BlockState cfj12 = (((StateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+                final BlockState cfj13 = (((StateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true);
+                this.generateBox(bqu, ctd, 3, 6, 3, 3, 6, 11, cfj13, cfj13, false);
+                this.generateBox(bqu, ctd, 10, 6, 3, 10, 6, 9, cfj13, cfj13, false);
+                this.generateBox(bqu, ctd, 4, 6, 2, 9, 6, 2, cfj12, cfj12, false);
+                this.generateBox(bqu, ctd, 4, 6, 12, 7, 6, 12, cfj12, cfj12, false);
+                this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 3, 6, 2, ctd);
+                this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 3, 6, 12, ctd);
+                this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 10, 6, 2, ctd);
+                for (int integer13 = 0; integer13 <= 2; ++integer13) {
+                    this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.SOUTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true), 8 + integer13, 6, 12 - integer13, ctd);
+                    if (integer13 != 2) {
+                        this.placeBlock(bqu, (((StateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).setValue((Property<Comparable>)FenceBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true), 8 + integer13, 6, 11 - integer13, ctd);
                     }
                 }
-                final BlockState byj12 = ((AbstractStateHolder<O, BlockState>)Blocks.LADDER.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)LadderBlock.FACING, Direction.SOUTH);
-                this.placeBlock(bjx, byj12, 10, 1, 13, clb);
-                this.placeBlock(bjx, byj12, 10, 2, 13, clb);
-                this.placeBlock(bjx, byj12, 10, 3, 13, clb);
-                this.placeBlock(bjx, byj12, 10, 4, 13, clb);
-                this.placeBlock(bjx, byj12, 10, 5, 13, clb);
-                this.placeBlock(bjx, byj12, 10, 6, 13, clb);
-                this.placeBlock(bjx, byj12, 10, 7, 13, clb);
-                final int integer12 = 7;
-                final int integer13 = 7;
-                final BlockState byj13 = ((AbstractStateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-                this.placeBlock(bjx, byj13, 6, 9, 7, clb);
-                final BlockState byj14 = ((AbstractStateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true);
-                this.placeBlock(bjx, byj14, 7, 9, 7, clb);
-                this.placeBlock(bjx, byj13, 6, 8, 7, clb);
-                this.placeBlock(bjx, byj14, 7, 8, 7, clb);
-                final BlockState byj15 = (((AbstractStateHolder<O, BlockState>)byj11).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
-                this.placeBlock(bjx, byj15, 6, 7, 7, clb);
-                this.placeBlock(bjx, byj15, 7, 7, 7, clb);
-                this.placeBlock(bjx, byj13, 5, 7, 7, clb);
-                this.placeBlock(bjx, byj14, 8, 7, 7, clb);
-                this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj13).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.NORTH, true), 6, 7, 6, clb);
-                this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj13).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 6, 7, 8, clb);
-                this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj14).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.NORTH, true), 7, 7, 6, clb);
-                this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj14).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 7, 7, 8, clb);
-                final BlockState byj16 = Blocks.TORCH.defaultBlockState();
-                this.placeBlock(bjx, byj16, 5, 8, 7, clb);
-                this.placeBlock(bjx, byj16, 8, 8, 7, clb);
-                this.placeBlock(bjx, byj16, 6, 8, 6, clb);
-                this.placeBlock(bjx, byj16, 6, 8, 8, clb);
-                this.placeBlock(bjx, byj16, 7, 8, 6, clb);
-                this.placeBlock(bjx, byj16, 7, 8, 8, clb);
+                final BlockState cfj14 = ((StateHolder<O, BlockState>)Blocks.LADDER.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)LadderBlock.FACING, Direction.SOUTH);
+                this.placeBlock(bqu, cfj14, 10, 1, 13, ctd);
+                this.placeBlock(bqu, cfj14, 10, 2, 13, ctd);
+                this.placeBlock(bqu, cfj14, 10, 3, 13, ctd);
+                this.placeBlock(bqu, cfj14, 10, 4, 13, ctd);
+                this.placeBlock(bqu, cfj14, 10, 5, 13, ctd);
+                this.placeBlock(bqu, cfj14, 10, 6, 13, ctd);
+                this.placeBlock(bqu, cfj14, 10, 7, 13, ctd);
+                final int integer14 = 7;
+                final int integer15 = 7;
+                final BlockState cfj15 = ((StateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+                this.placeBlock(bqu, cfj15, 6, 9, 7, ctd);
+                final BlockState cfj16 = ((StateHolder<O, BlockState>)Blocks.OAK_FENCE.defaultBlockState()).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.WEST, true);
+                this.placeBlock(bqu, cfj16, 7, 9, 7, ctd);
+                this.placeBlock(bqu, cfj15, 6, 8, 7, ctd);
+                this.placeBlock(bqu, cfj16, 7, 8, 7, ctd);
+                final BlockState cfj17 = (((StateHolder<O, BlockState>)cfj13).setValue((Property<Comparable>)FenceBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.EAST, true);
+                this.placeBlock(bqu, cfj17, 6, 7, 7, ctd);
+                this.placeBlock(bqu, cfj17, 7, 7, 7, ctd);
+                this.placeBlock(bqu, cfj15, 5, 7, 7, ctd);
+                this.placeBlock(bqu, cfj16, 8, 7, 7, ctd);
+                this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj15).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.NORTH, true), 6, 7, 6, ctd);
+                this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj15).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 6, 7, 8, ctd);
+                this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj16).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.NORTH, true), 7, 7, 6, ctd);
+                this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj16).<Comparable, Boolean>setValue((Property<Comparable>)FenceBlock.SOUTH, true), 7, 7, 8, ctd);
+                final BlockState cfj18 = Blocks.TORCH.defaultBlockState();
+                this.placeBlock(bqu, cfj18, 5, 8, 7, ctd);
+                this.placeBlock(bqu, cfj18, 8, 8, 7, ctd);
+                this.placeBlock(bqu, cfj18, 6, 8, 6, ctd);
+                this.placeBlock(bqu, cfj18, 6, 8, 8, ctd);
+                this.placeBlock(bqu, cfj18, 7, 8, 6, ctd);
+                this.placeBlock(bqu, cfj18, 7, 8, 8, ctd);
             }
-            this.createChest(bjx, clb, random, 3, 3, 5, BuiltInLootTables.STRONGHOLD_LIBRARY);
+            this.createChest(bqu, ctd, random, 3, 3, 5, BuiltInLootTables.STRONGHOLD_LIBRARY);
             if (this.isTall) {
-                this.placeBlock(bjx, Library.CAVE_AIR, 12, 9, 1, clb);
-                this.createChest(bjx, clb, random, 12, 8, 1, BuiltInLootTables.STRONGHOLD_LIBRARY);
+                this.placeBlock(bqu, Library.CAVE_AIR, 12, 9, 1, ctd);
+                this.createChest(bqu, ctd, random, 12, 8, 1, BuiltInLootTables.STRONGHOLD_LIBRARY);
             }
             return true;
         }
@@ -1105,97 +1107,97 @@ public class StrongholdPieces {
         private final boolean rightLow;
         private final boolean rightHigh;
         
-        public FiveCrossing(final int integer, final Random random, final BoundingBox clb, final Direction fp) {
+        public FiveCrossing(final int integer, final Random random, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_FIVE_CROSSING, integer);
-            this.setOrientation(fp);
+            this.setOrientation(fz);
             this.entryDoor = this.randomSmallDoor(random);
-            this.boundingBox = clb;
+            this.boundingBox = ctd;
             this.leftLow = random.nextBoolean();
             this.leftHigh = random.nextBoolean();
             this.rightLow = random.nextBoolean();
             this.rightHigh = (random.nextInt(3) > 0);
         }
         
-        public FiveCrossing(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_FIVE_CROSSING, jt);
-            this.leftLow = jt.getBoolean("leftLow");
-            this.leftHigh = jt.getBoolean("leftHigh");
-            this.rightLow = jt.getBoolean("rightLow");
-            this.rightHigh = jt.getBoolean("rightHigh");
+        public FiveCrossing(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_FIVE_CROSSING, le);
+            this.leftLow = le.getBoolean("leftLow");
+            this.leftHigh = le.getBoolean("leftHigh");
+            this.rightLow = le.getBoolean("rightLow");
+            this.rightHigh = le.getBoolean("rightHigh");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("leftLow", this.leftLow);
-            jt.putBoolean("leftHigh", this.leftHigh);
-            jt.putBoolean("rightLow", this.rightLow);
-            jt.putBoolean("rightHigh", this.rightHigh);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("leftLow", this.leftLow);
+            le.putBoolean("leftHigh", this.leftHigh);
+            le.putBoolean("rightLow", this.rightLow);
+            le.putBoolean("rightHigh", this.rightHigh);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
             int integer5 = 3;
             int integer6 = 5;
-            final Direction fp7 = this.getOrientation();
-            if (fp7 == Direction.WEST || fp7 == Direction.NORTH) {
+            final Direction fz7 = this.getOrientation();
+            if (fz7 == Direction.WEST || fz7 == Direction.NORTH) {
                 integer5 = 8 - integer5;
                 integer6 = 8 - integer6;
             }
-            this.generateSmallDoorChildForward((StartPiece)clu, list, random, 5, 1);
+            this.generateSmallDoorChildForward((StartPiece)cty, list, random, 5, 1);
             if (this.leftLow) {
-                this.generateSmallDoorChildLeft((StartPiece)clu, list, random, integer5, 1);
+                this.generateSmallDoorChildLeft((StartPiece)cty, list, random, integer5, 1);
             }
             if (this.leftHigh) {
-                this.generateSmallDoorChildLeft((StartPiece)clu, list, random, integer6, 7);
+                this.generateSmallDoorChildLeft((StartPiece)cty, list, random, integer6, 7);
             }
             if (this.rightLow) {
-                this.generateSmallDoorChildRight((StartPiece)clu, list, random, integer5, 1);
+                this.generateSmallDoorChildRight((StartPiece)cty, list, random, integer5, 1);
             }
             if (this.rightHigh) {
-                this.generateSmallDoorChildRight((StartPiece)clu, list, random, integer6, 7);
+                this.generateSmallDoorChildRight((StartPiece)cty, list, random, integer6, 7);
             }
         }
         
-        public static FiveCrossing createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fp, final int integer7) {
-            final BoundingBox clb8 = BoundingBox.orientBox(integer3, integer4, integer5, -4, -3, 0, 10, 9, 11, fp);
-            if (!StrongholdPiece.isOkBox(clb8) || StructurePiece.findCollisionPiece(list, clb8) != null) {
+        public static FiveCrossing createPiece(final List<StructurePiece> list, final Random random, final int integer3, final int integer4, final int integer5, final Direction fz, final int integer7) {
+            final BoundingBox ctd8 = BoundingBox.orientBox(integer3, integer4, integer5, -4, -3, 0, 10, 9, 11, fz);
+            if (!StrongholdPiece.isOkBox(ctd8) || StructurePiece.findCollisionPiece(list, ctd8) != null) {
                 return null;
             }
-            return new FiveCrossing(integer7, random, clb8, fp);
+            return new FiveCrossing(integer7, random, ctd8, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 9, 8, 10, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, this.entryDoor, 4, 3, 0);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 9, 8, 10, true, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, this.entryDoor, 4, 3, 0);
             if (this.leftLow) {
-                this.generateBox(bjx, clb, 0, 3, 1, 0, 5, 3, FiveCrossing.CAVE_AIR, FiveCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, 0, 3, 1, 0, 5, 3, FiveCrossing.CAVE_AIR, FiveCrossing.CAVE_AIR, false);
             }
             if (this.rightLow) {
-                this.generateBox(bjx, clb, 9, 3, 1, 9, 5, 3, FiveCrossing.CAVE_AIR, FiveCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, 9, 3, 1, 9, 5, 3, FiveCrossing.CAVE_AIR, FiveCrossing.CAVE_AIR, false);
             }
             if (this.leftHigh) {
-                this.generateBox(bjx, clb, 0, 5, 7, 0, 7, 9, FiveCrossing.CAVE_AIR, FiveCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, 0, 5, 7, 0, 7, 9, FiveCrossing.CAVE_AIR, FiveCrossing.CAVE_AIR, false);
             }
             if (this.rightHigh) {
-                this.generateBox(bjx, clb, 9, 5, 7, 9, 7, 9, FiveCrossing.CAVE_AIR, FiveCrossing.CAVE_AIR, false);
+                this.generateBox(bqu, ctd, 9, 5, 7, 9, 7, 9, FiveCrossing.CAVE_AIR, FiveCrossing.CAVE_AIR, false);
             }
-            this.generateBox(bjx, clb, 5, 1, 10, 7, 3, 10, FiveCrossing.CAVE_AIR, FiveCrossing.CAVE_AIR, false);
-            this.generateBox(bjx, clb, 1, 2, 1, 8, 2, 6, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 4, 1, 5, 4, 4, 9, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 8, 1, 5, 8, 4, 9, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 1, 4, 7, 3, 4, 9, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 1, 3, 5, 3, 3, 6, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 1, 3, 4, 3, 3, 4, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 1, 4, 6, 3, 4, 6, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 1, 7, 7, 1, 8, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 5, 1, 9, 7, 1, 9, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 2, 7, 7, 2, 7, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 4, 5, 7, 4, 5, 9, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 8, 5, 7, 8, 5, 9, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 5, 5, 7, 7, 5, 9, ((AbstractStateHolder<O, BlockState>)Blocks.SMOOTH_STONE_SLAB.defaultBlockState()).<SlabType, SlabType>setValue(SlabBlock.TYPE, SlabType.DOUBLE), ((AbstractStateHolder<O, BlockState>)Blocks.SMOOTH_STONE_SLAB.defaultBlockState()).<SlabType, SlabType>setValue(SlabBlock.TYPE, SlabType.DOUBLE), false);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.SOUTH), 6, 5, 6, clb);
+            this.generateBox(bqu, ctd, 5, 1, 10, 7, 3, 10, FiveCrossing.CAVE_AIR, FiveCrossing.CAVE_AIR, false);
+            this.generateBox(bqu, ctd, 1, 2, 1, 8, 2, 6, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 4, 1, 5, 4, 4, 9, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 8, 1, 5, 8, 4, 9, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 1, 4, 7, 3, 4, 9, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 1, 3, 5, 3, 3, 6, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 1, 3, 4, 3, 3, 4, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 1, 4, 6, 3, 4, 6, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 1, 7, 7, 1, 8, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 5, 1, 9, 7, 1, 9, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 2, 7, 7, 2, 7, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 4, 5, 7, 4, 5, 9, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 8, 5, 7, 8, 5, 9, Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), Blocks.SMOOTH_STONE_SLAB.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 5, 5, 7, 7, 5, 9, ((StateHolder<O, BlockState>)Blocks.SMOOTH_STONE_SLAB.defaultBlockState()).<SlabType, SlabType>setValue(SlabBlock.TYPE, SlabType.DOUBLE), ((StateHolder<O, BlockState>)Blocks.SMOOTH_STONE_SLAB.defaultBlockState()).<SlabType, SlabType>setValue(SlabBlock.TYPE, SlabType.DOUBLE), false);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)Blocks.WALL_TORCH.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)WallTorchBlock.FACING, Direction.SOUTH), 6, 5, 6, ctd);
             return true;
         }
     }
@@ -1203,114 +1205,114 @@ public class StrongholdPieces {
     public static class PortalRoom extends StrongholdPiece {
         private boolean hasPlacedSpawner;
         
-        public PortalRoom(final int integer, final BoundingBox clb, final Direction fp) {
+        public PortalRoom(final int integer, final BoundingBox ctd, final Direction fz) {
             super(StructurePieceType.STRONGHOLD_PORTAL_ROOM, integer);
-            this.setOrientation(fp);
-            this.boundingBox = clb;
+            this.setOrientation(fz);
+            this.boundingBox = ctd;
         }
         
-        public PortalRoom(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.STRONGHOLD_PORTAL_ROOM, jt);
-            this.hasPlacedSpawner = jt.getBoolean("Mob");
+        public PortalRoom(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.STRONGHOLD_PORTAL_ROOM, le);
+            this.hasPlacedSpawner = le.getBoolean("Mob");
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putBoolean("Mob", this.hasPlacedSpawner);
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putBoolean("Mob", this.hasPlacedSpawner);
         }
         
         @Override
-        public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
-            if (clu != null) {
-                ((StartPiece)clu).portalRoomPiece = this;
+        public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
+            if (cty != null) {
+                ((StartPiece)cty).portalRoomPiece = this;
             }
         }
         
-        public static PortalRoom createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fp, final int integer6) {
-            final BoundingBox clb7 = BoundingBox.orientBox(integer2, integer3, integer4, -4, -1, 0, 11, 8, 16, fp);
-            if (!StrongholdPiece.isOkBox(clb7) || StructurePiece.findCollisionPiece(list, clb7) != null) {
+        public static PortalRoom createPiece(final List<StructurePiece> list, final int integer2, final int integer3, final int integer4, final Direction fz, final int integer6) {
+            final BoundingBox ctd7 = BoundingBox.orientBox(integer2, integer3, integer4, -4, -1, 0, 11, 8, 16, fz);
+            if (!StrongholdPiece.isOkBox(ctd7) || StructurePiece.findCollisionPiece(list, ctd7) != null) {
                 return null;
             }
-            return new PortalRoom(integer6, clb7, fp);
+            return new PortalRoom(integer6, ctd7, fz);
         }
         
         @Override
-        public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-            this.generateBox(bjx, clb, 0, 0, 0, 10, 7, 15, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateSmallDoor(bjx, random, clb, SmallDoorType.GRATES, 4, 1, 0);
-            int integer7 = 6;
-            this.generateBox(bjx, clb, 1, integer7, 1, 1, integer7, 14, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 9, integer7, 1, 9, integer7, 14, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 2, integer7, 1, 8, integer7, 2, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 2, integer7, 14, 8, integer7, 14, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 1, 1, 1, 2, 1, 4, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 8, 1, 1, 9, 1, 4, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 1, 1, 1, 1, 1, 3, Blocks.LAVA.defaultBlockState(), Blocks.LAVA.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 9, 1, 1, 9, 1, 3, Blocks.LAVA.defaultBlockState(), Blocks.LAVA.defaultBlockState(), false);
-            this.generateBox(bjx, clb, 3, 1, 8, 7, 1, 12, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 4, 1, 9, 6, 1, 11, Blocks.LAVA.defaultBlockState(), Blocks.LAVA.defaultBlockState(), false);
-            final BlockState byj8 = (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true);
-            final BlockState byj9 = (((AbstractStateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true);
-            for (int integer8 = 3; integer8 < 14; integer8 += 2) {
-                this.generateBox(bjx, clb, 0, 3, integer8, 0, 4, integer8, byj8, byj8, false);
-                this.generateBox(bjx, clb, 10, 3, integer8, 10, 4, integer8, byj8, byj8, false);
+        public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+            this.generateBox(bqu, ctd, 0, 0, 0, 10, 7, 15, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateSmallDoor(bqu, random, ctd, SmallDoorType.GRATES, 4, 1, 0);
+            int integer9 = 6;
+            this.generateBox(bqu, ctd, 1, integer9, 1, 1, integer9, 14, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 9, integer9, 1, 9, integer9, 14, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 2, integer9, 1, 8, integer9, 2, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 2, integer9, 14, 8, integer9, 14, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 1, 1, 1, 2, 1, 4, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 8, 1, 1, 9, 1, 4, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 1, 1, 1, 1, 1, 3, Blocks.LAVA.defaultBlockState(), Blocks.LAVA.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 9, 1, 1, 9, 1, 3, Blocks.LAVA.defaultBlockState(), Blocks.LAVA.defaultBlockState(), false);
+            this.generateBox(bqu, ctd, 3, 1, 8, 7, 1, 12, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 4, 1, 9, 6, 1, 11, Blocks.LAVA.defaultBlockState(), Blocks.LAVA.defaultBlockState(), false);
+            final BlockState cfj10 = (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.NORTH, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.SOUTH, true);
+            final BlockState cfj11 = (((StateHolder<O, BlockState>)Blocks.IRON_BARS.defaultBlockState()).setValue((Property<Comparable>)IronBarsBlock.WEST, true)).<Comparable, Boolean>setValue((Property<Comparable>)IronBarsBlock.EAST, true);
+            for (int integer10 = 3; integer10 < 14; integer10 += 2) {
+                this.generateBox(bqu, ctd, 0, 3, integer10, 0, 4, integer10, cfj10, cfj10, false);
+                this.generateBox(bqu, ctd, 10, 3, integer10, 10, 4, integer10, cfj10, cfj10, false);
             }
-            for (int integer8 = 2; integer8 < 9; integer8 += 2) {
-                this.generateBox(bjx, clb, integer8, 3, 15, integer8, 4, 15, byj9, byj9, false);
+            for (int integer10 = 2; integer10 < 9; integer10 += 2) {
+                this.generateBox(bqu, ctd, integer10, 3, 15, integer10, 4, 15, cfj11, cfj11, false);
             }
-            final BlockState byj10 = ((AbstractStateHolder<O, BlockState>)Blocks.STONE_BRICK_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH);
-            this.generateBox(bjx, clb, 4, 1, 5, 6, 1, 7, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 4, 2, 6, 6, 2, 7, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            this.generateBox(bjx, clb, 4, 3, 7, 6, 3, 7, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
-            for (int integer9 = 4; integer9 <= 6; ++integer9) {
-                this.placeBlock(bjx, byj10, integer9, 1, 4, clb);
-                this.placeBlock(bjx, byj10, integer9, 2, 5, clb);
-                this.placeBlock(bjx, byj10, integer9, 3, 6, clb);
+            final BlockState cfj12 = ((StateHolder<O, BlockState>)Blocks.STONE_BRICK_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH);
+            this.generateBox(bqu, ctd, 4, 1, 5, 6, 1, 7, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 4, 2, 6, 6, 2, 7, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            this.generateBox(bqu, ctd, 4, 3, 7, 6, 3, 7, false, random, StrongholdPieces.SMOOTH_STONE_SELECTOR);
+            for (int integer11 = 4; integer11 <= 6; ++integer11) {
+                this.placeBlock(bqu, cfj12, integer11, 1, 4, ctd);
+                this.placeBlock(bqu, cfj12, integer11, 2, 5, ctd);
+                this.placeBlock(bqu, cfj12, integer11, 3, 6, ctd);
             }
-            final BlockState byj11 = ((AbstractStateHolder<O, BlockState>)Blocks.END_PORTAL_FRAME.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndPortalFrameBlock.FACING, Direction.NORTH);
-            final BlockState byj12 = ((AbstractStateHolder<O, BlockState>)Blocks.END_PORTAL_FRAME.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndPortalFrameBlock.FACING, Direction.SOUTH);
-            final BlockState byj13 = ((AbstractStateHolder<O, BlockState>)Blocks.END_PORTAL_FRAME.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndPortalFrameBlock.FACING, Direction.EAST);
-            final BlockState byj14 = ((AbstractStateHolder<O, BlockState>)Blocks.END_PORTAL_FRAME.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndPortalFrameBlock.FACING, Direction.WEST);
-            boolean boolean15 = true;
-            final boolean[] arr16 = new boolean[12];
-            for (int integer10 = 0; integer10 < arr16.length; ++integer10) {
-                arr16[integer10] = (random.nextFloat() > 0.9f);
-                boolean15 &= arr16[integer10];
+            final BlockState cfj13 = ((StateHolder<O, BlockState>)Blocks.END_PORTAL_FRAME.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndPortalFrameBlock.FACING, Direction.NORTH);
+            final BlockState cfj14 = ((StateHolder<O, BlockState>)Blocks.END_PORTAL_FRAME.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndPortalFrameBlock.FACING, Direction.SOUTH);
+            final BlockState cfj15 = ((StateHolder<O, BlockState>)Blocks.END_PORTAL_FRAME.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndPortalFrameBlock.FACING, Direction.EAST);
+            final BlockState cfj16 = ((StateHolder<O, BlockState>)Blocks.END_PORTAL_FRAME.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)EndPortalFrameBlock.FACING, Direction.WEST);
+            boolean boolean17 = true;
+            final boolean[] arr18 = new boolean[12];
+            for (int integer12 = 0; integer12 < arr18.length; ++integer12) {
+                arr18[integer12] = (random.nextFloat() > 0.9f);
+                boolean17 &= arr18[integer12];
             }
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj11).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[0]), 4, 3, 8, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj11).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[1]), 5, 3, 8, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj11).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[2]), 6, 3, 8, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj12).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[3]), 4, 3, 12, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj12).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[4]), 5, 3, 12, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj12).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[5]), 6, 3, 12, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj13).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[6]), 3, 3, 9, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj13).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[7]), 3, 3, 10, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj13).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[8]), 3, 3, 11, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj14).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[9]), 7, 3, 9, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj14).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[10]), 7, 3, 10, clb);
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj14).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr16[11]), 7, 3, 11, clb);
-            if (boolean15) {
-                final BlockState byj15 = Blocks.END_PORTAL.defaultBlockState();
-                this.placeBlock(bjx, byj15, 4, 3, 9, clb);
-                this.placeBlock(bjx, byj15, 5, 3, 9, clb);
-                this.placeBlock(bjx, byj15, 6, 3, 9, clb);
-                this.placeBlock(bjx, byj15, 4, 3, 10, clb);
-                this.placeBlock(bjx, byj15, 5, 3, 10, clb);
-                this.placeBlock(bjx, byj15, 6, 3, 10, clb);
-                this.placeBlock(bjx, byj15, 4, 3, 11, clb);
-                this.placeBlock(bjx, byj15, 5, 3, 11, clb);
-                this.placeBlock(bjx, byj15, 6, 3, 11, clb);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj13).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[0]), 4, 3, 8, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj13).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[1]), 5, 3, 8, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj13).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[2]), 6, 3, 8, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj14).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[3]), 4, 3, 12, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj14).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[4]), 5, 3, 12, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj14).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[5]), 6, 3, 12, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj15).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[6]), 3, 3, 9, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj15).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[7]), 3, 3, 10, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj15).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[8]), 3, 3, 11, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj16).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[9]), 7, 3, 9, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj16).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[10]), 7, 3, 10, ctd);
+            this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj16).<Comparable, Boolean>setValue((Property<Comparable>)EndPortalFrameBlock.HAS_EYE, arr18[11]), 7, 3, 11, ctd);
+            if (boolean17) {
+                final BlockState cfj17 = Blocks.END_PORTAL.defaultBlockState();
+                this.placeBlock(bqu, cfj17, 4, 3, 9, ctd);
+                this.placeBlock(bqu, cfj17, 5, 3, 9, ctd);
+                this.placeBlock(bqu, cfj17, 6, 3, 9, ctd);
+                this.placeBlock(bqu, cfj17, 4, 3, 10, ctd);
+                this.placeBlock(bqu, cfj17, 5, 3, 10, ctd);
+                this.placeBlock(bqu, cfj17, 6, 3, 10, ctd);
+                this.placeBlock(bqu, cfj17, 4, 3, 11, ctd);
+                this.placeBlock(bqu, cfj17, 5, 3, 11, ctd);
+                this.placeBlock(bqu, cfj17, 6, 3, 11, ctd);
             }
             if (!this.hasPlacedSpawner) {
-                integer7 = this.getWorldY(3);
-                final BlockPos fk17 = new BlockPos(this.getWorldX(5, 6), integer7, this.getWorldZ(5, 6));
-                if (clb.isInside(fk17)) {
+                integer9 = this.getWorldY(3);
+                final BlockPos fu2 = new BlockPos(this.getWorldX(5, 6), integer9, this.getWorldZ(5, 6));
+                if (ctd.isInside(fu2)) {
                     this.hasPlacedSpawner = true;
-                    bjx.setBlock(fk17, Blocks.SPAWNER.defaultBlockState(), 2);
-                    final BlockEntity bwl18 = bjx.getBlockEntity(fk17);
-                    if (bwl18 instanceof SpawnerBlockEntity) {
-                        ((SpawnerBlockEntity)bwl18).getSpawner().setEntityId(EntityType.SILVERFISH);
+                    bqu.setBlock(fu2, Blocks.SPAWNER.defaultBlockState(), 2);
+                    final BlockEntity cdl20 = bqu.getBlockEntity(fu2);
+                    if (cdl20 instanceof SpawnerBlockEntity) {
+                        ((SpawnerBlockEntity)cdl20).getSpawner().setEntityId(EntityType.SILVERFISH);
                     }
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.java b/src/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.java
deleted file mode 100644
index 6f4ca59..0000000
--- a/src/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package net.minecraft.world.level.levelgen.structure;
-
-import net.minecraft.world.level.levelgen.feature.Feature;
-import org.apache.logging.log4j.LogManager;
-import javax.annotation.Nullable;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.world.level.levelgen.feature.StructurePieceType;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import java.util.Locale;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
-import org.apache.logging.log4j.Logger;
-
-public class StructureFeatureIO {
-    private static final Logger LOGGER;
-    public static final StructureFeature<?> MINESHAFT;
-    public static final StructureFeature<?> PILLAGER_OUTPOST;
-    public static final StructureFeature<?> NETHER_FORTRESS;
-    public static final StructureFeature<?> STRONGHOLD;
-    public static final StructureFeature<?> JUNGLE_PYRAMID;
-    public static final StructureFeature<?> OCEAN_RUIN;
-    public static final StructureFeature<?> DESERT_PYRAMID;
-    public static final StructureFeature<?> IGLOO;
-    public static final StructureFeature<?> SWAMP_HUT;
-    public static final StructureFeature<?> OCEAN_MONUMENT;
-    public static final StructureFeature<?> END_CITY;
-    public static final StructureFeature<?> WOODLAND_MANSION;
-    public static final StructureFeature<?> BURIED_TREASURE;
-    public static final StructureFeature<?> SHIPWRECK;
-    public static final StructureFeature<?> VILLAGE;
-    
-    private static StructureFeature<?> register(final String string, final StructureFeature<?> cfl) {
-        return Registry.<StructureFeature<?>>register(Registry.STRUCTURE_FEATURE, string.toLowerCase(Locale.ROOT), cfl);
-    }
-    
-    public static void bootstrap() {
-    }
-    
-    @Nullable
-    public static StructureStart loadStaticStart(final ChunkGenerator<?> caa, final StructureManager cmo, final CompoundTag jt) {
-        final String string4 = jt.getString("id");
-        if ("INVALID".equals(string4)) {
-            return StructureStart.INVALID_START;
-        }
-        final StructureFeature<?> cfl5 = Registry.STRUCTURE_FEATURE.get(new ResourceLocation(string4.toLowerCase(Locale.ROOT)));
-        if (cfl5 == null) {
-            StructureFeatureIO.LOGGER.error("Unknown feature id: {}", string4);
-            return null;
-        }
-        final int integer6 = jt.getInt("ChunkX");
-        final int integer7 = jt.getInt("ChunkZ");
-        final int integer8 = jt.getInt("references");
-        final BoundingBox clb9 = jt.contains("BB") ? new BoundingBox(jt.getIntArray("BB")) : BoundingBox.getUnknownBox();
-        final ListTag jz10 = jt.getList("Children", 10);
-        try {
-            final StructureStart clv11 = cfl5.getStartFactory().create(cfl5, integer6, integer7, clb9, integer8, caa.getSeed());
-            for (int integer9 = 0; integer9 < jz10.size(); ++integer9) {
-                final CompoundTag jt2 = jz10.getCompound(integer9);
-                final String string5 = jt2.getString("id");
-                final StructurePieceType cfm15 = Registry.STRUCTURE_PIECE.get(new ResourceLocation(string5.toLowerCase(Locale.ROOT)));
-                if (cfm15 == null) {
-                    StructureFeatureIO.LOGGER.error("Unknown structure piece id: {}", string5);
-                }
-                else {
-                    try {
-                        final StructurePiece clu16 = cfm15.load(cmo, jt2);
-                        clv11.pieces.add(clu16);
-                    }
-                    catch (Exception exception16) {
-                        StructureFeatureIO.LOGGER.error("Exception loading structure piece with id {}", string5, exception16);
-                    }
-                }
-            }
-            return clv11;
-        }
-        catch (Exception exception17) {
-            StructureFeatureIO.LOGGER.error("Failed Start with id {}", string4, exception17);
-            return null;
-        }
-    }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-        MINESHAFT = register("Mineshaft", Feature.MINESHAFT);
-        PILLAGER_OUTPOST = register("Pillager_Outpost", Feature.PILLAGER_OUTPOST);
-        NETHER_FORTRESS = register("Fortress", Feature.NETHER_BRIDGE);
-        STRONGHOLD = register("Stronghold", Feature.STRONGHOLD);
-        JUNGLE_PYRAMID = register("Jungle_Pyramid", Feature.JUNGLE_TEMPLE);
-        OCEAN_RUIN = register("Ocean_Ruin", Feature.OCEAN_RUIN);
-        DESERT_PYRAMID = register("Desert_Pyramid", Feature.DESERT_PYRAMID);
-        IGLOO = register("Igloo", Feature.IGLOO);
-        SWAMP_HUT = register("Swamp_Hut", Feature.SWAMP_HUT);
-        OCEAN_MONUMENT = register("Monument", Feature.OCEAN_MONUMENT);
-        END_CITY = register("EndCity", Feature.END_CITY);
-        WOODLAND_MANSION = register("Mansion", Feature.WOODLAND_MANSION);
-        BURIED_TREASURE = register("Buried_Treasure", Feature.BURIED_TREASURE);
-        SHIPWRECK = register("Shipwreck", Feature.SHIPWRECK);
-        VILLAGE = register("Village", Feature.VILLAGE);
-    }
-}
diff --git a/src/net/minecraft/world/level/levelgen/structure/StructureFeatureIndexSavedData.java b/src/net/minecraft/world/level/levelgen/structure/StructureFeatureIndexSavedData.java
index 1a6ad5c..284ddf3 100644
--- a/src/net/minecraft/world/level/levelgen/structure/StructureFeatureIndexSavedData.java
+++ b/src/net/minecraft/world/level/levelgen/structure/StructureFeatureIndexSavedData.java
@@ -16,16 +16,16 @@ public class StructureFeatureIndexSavedData extends SavedData {
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        this.all = (LongSet)new LongOpenHashSet(jt.getLongArray("All"));
-        this.remaining = (LongSet)new LongOpenHashSet(jt.getLongArray("Remaining"));
+    public void load(final CompoundTag le) {
+        this.all = (LongSet)new LongOpenHashSet(le.getLongArray("All"));
+        this.remaining = (LongSet)new LongOpenHashSet(le.getLongArray("Remaining"));
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        jt.putLongArray("All", this.all.toLongArray());
-        jt.putLongArray("Remaining", this.remaining.toLongArray());
-        return jt;
+    public CompoundTag save(final CompoundTag le) {
+        le.putLongArray("All", this.all.toLongArray());
+        le.putLongArray("Remaining", this.remaining.toLongArray());
+        return le;
     }
     
     public void addIndex(final long long1) {
diff --git a/src/net/minecraft/world/level/levelgen/structure/StructurePiece.java b/src/net/minecraft/world/level/levelgen/structure/StructurePiece.java
index 9940d18..777d4b3 100644
--- a/src/net/minecraft/world/level/levelgen/structure/StructurePiece.java
+++ b/src/net/minecraft/world/level/levelgen/structure/StructurePiece.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.structure;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.level.block.entity.DispenserBlockEntity;
 import net.minecraft.world.level.block.DispenserBlock;
@@ -14,12 +14,14 @@ import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.core.Vec3i;
-import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.BlockGetter;
 import java.util.Iterator;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import java.util.Random;
 import java.util.List;
 import net.minecraft.nbt.Tag;
@@ -45,37 +47,37 @@ public abstract class StructurePiece {
     private final StructurePieceType type;
     private static final Set<Block> SHAPE_CHECK_BLOCKS;
     
-    protected StructurePiece(final StructurePieceType cfm, final int integer) {
-        this.type = cfm;
+    protected StructurePiece(final StructurePieceType cmm, final int integer) {
+        this.type = cmm;
         this.genDepth = integer;
     }
     
-    public StructurePiece(final StructurePieceType cfm, final CompoundTag jt) {
-        this(cfm, jt.getInt("GD"));
-        if (jt.contains("BB")) {
-            this.boundingBox = new BoundingBox(jt.getIntArray("BB"));
+    public StructurePiece(final StructurePieceType cmm, final CompoundTag le) {
+        this(cmm, le.getInt("GD"));
+        if (le.contains("BB")) {
+            this.boundingBox = new BoundingBox(le.getIntArray("BB"));
         }
-        final int integer4 = jt.getInt("O");
+        final int integer4 = le.getInt("O");
         this.setOrientation((integer4 == -1) ? null : Direction.from2DDataValue(integer4));
     }
     
     public final CompoundTag createTag() {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.putString("id", Registry.STRUCTURE_PIECE.getKey(this.getType()).toString());
-        jt2.put("BB", this.boundingBox.createTag());
-        final Direction fp3 = this.getOrientation();
-        jt2.putInt("O", (fp3 == null) ? -1 : fp3.get2DDataValue());
-        jt2.putInt("GD", this.genDepth);
-        this.addAdditionalSaveData(jt2);
-        return jt2;
+        final CompoundTag le2 = new CompoundTag();
+        le2.putString("id", Registry.STRUCTURE_PIECE.getKey(this.getType()).toString());
+        le2.put("BB", this.boundingBox.createTag());
+        final Direction fz3 = this.getOrientation();
+        le2.putInt("O", (fz3 == null) ? -1 : fz3.get2DDataValue());
+        le2.putInt("GD", this.genDepth);
+        this.addAdditionalSaveData(le2);
+        return le2;
     }
     
-    protected abstract void addAdditionalSaveData(final CompoundTag jt);
+    protected abstract void addAdditionalSaveData(final CompoundTag le);
     
-    public void addChildren(final StructurePiece clu, final List<StructurePiece> list, final Random random) {
+    public void addChildren(final StructurePiece cty, final List<StructurePiece> list, final Random random) {
     }
     
-    public abstract boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh);
+    public abstract boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu);
     
     public BoundingBox getBoundingBox() {
         return this.boundingBox;
@@ -85,55 +87,55 @@ public abstract class StructurePiece {
         return this.genDepth;
     }
     
-    public boolean isCloseToChunk(final ChunkPos bjh, final int integer) {
-        final int integer2 = bjh.x << 4;
-        final int integer3 = bjh.z << 4;
+    public boolean isCloseToChunk(final ChunkPos bph, final int integer) {
+        final int integer2 = bph.x << 4;
+        final int integer3 = bph.z << 4;
         return this.boundingBox.intersects(integer2 - integer, integer3 - integer, integer2 + 15 + integer, integer3 + 15 + integer);
     }
     
-    public static StructurePiece findCollisionPiece(final List<StructurePiece> list, final BoundingBox clb) {
-        for (final StructurePiece clu4 : list) {
-            if (clu4.getBoundingBox() != null && clu4.getBoundingBox().intersects(clb)) {
-                return clu4;
+    public static StructurePiece findCollisionPiece(final List<StructurePiece> list, final BoundingBox ctd) {
+        for (final StructurePiece cty4 : list) {
+            if (cty4.getBoundingBox() != null && cty4.getBoundingBox().intersects(ctd)) {
+                return cty4;
             }
         }
         return null;
     }
     
-    protected boolean edgesLiquid(final BlockGetter bjg, final BoundingBox clb) {
-        final int integer4 = Math.max(this.boundingBox.x0 - 1, clb.x0);
-        final int integer5 = Math.max(this.boundingBox.y0 - 1, clb.y0);
-        final int integer6 = Math.max(this.boundingBox.z0 - 1, clb.z0);
-        final int integer7 = Math.min(this.boundingBox.x1 + 1, clb.x1);
-        final int integer8 = Math.min(this.boundingBox.y1 + 1, clb.y1);
-        final int integer9 = Math.min(this.boundingBox.z1 + 1, clb.z1);
+    protected boolean edgesLiquid(final BlockGetter bpg, final BoundingBox ctd) {
+        final int integer4 = Math.max(this.boundingBox.x0 - 1, ctd.x0);
+        final int integer5 = Math.max(this.boundingBox.y0 - 1, ctd.y0);
+        final int integer6 = Math.max(this.boundingBox.z0 - 1, ctd.z0);
+        final int integer7 = Math.min(this.boundingBox.x1 + 1, ctd.x1);
+        final int integer8 = Math.min(this.boundingBox.y1 + 1, ctd.y1);
+        final int integer9 = Math.min(this.boundingBox.z1 + 1, ctd.z1);
         final BlockPos.MutableBlockPos a10 = new BlockPos.MutableBlockPos();
         for (int integer10 = integer4; integer10 <= integer7; ++integer10) {
             for (int integer11 = integer6; integer11 <= integer9; ++integer11) {
-                if (bjg.getBlockState(a10.set(integer10, integer5, integer11)).getMaterial().isLiquid()) {
+                if (bpg.getBlockState(a10.set(integer10, integer5, integer11)).getMaterial().isLiquid()) {
                     return true;
                 }
-                if (bjg.getBlockState(a10.set(integer10, integer8, integer11)).getMaterial().isLiquid()) {
+                if (bpg.getBlockState(a10.set(integer10, integer8, integer11)).getMaterial().isLiquid()) {
                     return true;
                 }
             }
         }
         for (int integer10 = integer4; integer10 <= integer7; ++integer10) {
             for (int integer11 = integer5; integer11 <= integer8; ++integer11) {
-                if (bjg.getBlockState(a10.set(integer10, integer11, integer6)).getMaterial().isLiquid()) {
+                if (bpg.getBlockState(a10.set(integer10, integer11, integer6)).getMaterial().isLiquid()) {
                     return true;
                 }
-                if (bjg.getBlockState(a10.set(integer10, integer11, integer9)).getMaterial().isLiquid()) {
+                if (bpg.getBlockState(a10.set(integer10, integer11, integer9)).getMaterial().isLiquid()) {
                     return true;
                 }
             }
         }
         for (int integer10 = integer6; integer10 <= integer9; ++integer10) {
             for (int integer11 = integer5; integer11 <= integer8; ++integer11) {
-                if (bjg.getBlockState(a10.set(integer4, integer11, integer10)).getMaterial().isLiquid()) {
+                if (bpg.getBlockState(a10.set(integer4, integer11, integer10)).getMaterial().isLiquid()) {
                     return true;
                 }
-                if (bjg.getBlockState(a10.set(integer7, integer11, integer10)).getMaterial().isLiquid()) {
+                if (bpg.getBlockState(a10.set(integer7, integer11, integer10)).getMaterial().isLiquid()) {
                     return true;
                 }
             }
@@ -142,11 +144,11 @@ public abstract class StructurePiece {
     }
     
     protected int getWorldX(final int integer1, final int integer2) {
-        final Direction fp4 = this.getOrientation();
-        if (fp4 == null) {
+        final Direction fz4 = this.getOrientation();
+        if (fz4 == null) {
             return integer1;
         }
-        switch (fp4) {
+        switch (fz4) {
             case NORTH:
             case SOUTH: {
                 return this.boundingBox.x0 + integer1;
@@ -171,11 +173,11 @@ public abstract class StructurePiece {
     }
     
     protected int getWorldZ(final int integer1, final int integer2) {
-        final Direction fp4 = this.getOrientation();
-        if (fp4 == null) {
+        final Direction fz4 = this.getOrientation();
+        if (fz4 == null) {
             return integer2;
         }
-        switch (fp4) {
+        switch (fz4) {
             case NORTH: {
                 return this.boundingBox.z1 - integer2;
             }
@@ -192,66 +194,66 @@ public abstract class StructurePiece {
         }
     }
     
-    protected void placeBlock(final LevelAccessor bjx, BlockState byj, final int integer3, final int integer4, final int integer5, final BoundingBox clb) {
-        final BlockPos fk8 = new BlockPos(this.getWorldX(integer3, integer5), this.getWorldY(integer4), this.getWorldZ(integer3, integer5));
-        if (!clb.isInside(fk8)) {
+    protected void placeBlock(final LevelAccessor bqc, BlockState cfj, final int integer3, final int integer4, final int integer5, final BoundingBox ctd) {
+        final BlockPos fu8 = new BlockPos(this.getWorldX(integer3, integer5), this.getWorldY(integer4), this.getWorldZ(integer3, integer5));
+        if (!ctd.isInside(fu8)) {
             return;
         }
         if (this.mirror != Mirror.NONE) {
-            byj = byj.mirror(this.mirror);
+            cfj = cfj.mirror(this.mirror);
         }
         if (this.rotation != Rotation.NONE) {
-            byj = byj.rotate(this.rotation);
+            cfj = cfj.rotate(this.rotation);
         }
-        bjx.setBlock(fk8, byj, 2);
-        final FluidState coj9 = bjx.getFluidState(fk8);
-        if (!coj9.isEmpty()) {
-            bjx.getLiquidTicks().scheduleTick(fk8, coj9.getType(), 0);
+        bqc.setBlock(fu8, cfj, 2);
+        final FluidState cxa9 = bqc.getFluidState(fu8);
+        if (!cxa9.isEmpty()) {
+            bqc.getLiquidTicks().scheduleTick(fu8, cxa9.getType(), 0);
         }
-        if (StructurePiece.SHAPE_CHECK_BLOCKS.contains(byj.getBlock())) {
-            bjx.getChunk(fk8).markPosForPostprocessing(fk8);
+        if (StructurePiece.SHAPE_CHECK_BLOCKS.contains(cfj.getBlock())) {
+            bqc.getChunk(fu8).markPosForPostprocessing(fu8);
         }
     }
     
-    protected BlockState getBlock(final BlockGetter bjg, final int integer2, final int integer3, final int integer4, final BoundingBox clb) {
+    protected BlockState getBlock(final BlockGetter bpg, final int integer2, final int integer3, final int integer4, final BoundingBox ctd) {
         final int integer5 = this.getWorldX(integer2, integer4);
         final int integer6 = this.getWorldY(integer3);
         final int integer7 = this.getWorldZ(integer2, integer4);
-        final BlockPos fk10 = new BlockPos(integer5, integer6, integer7);
-        if (!clb.isInside(fk10)) {
+        final BlockPos fu10 = new BlockPos(integer5, integer6, integer7);
+        if (!ctd.isInside(fu10)) {
             return Blocks.AIR.defaultBlockState();
         }
-        return bjg.getBlockState(fk10);
+        return bpg.getBlockState(fu10);
     }
     
-    protected boolean isInterior(final LevelReader bjz, final int integer2, final int integer3, final int integer4, final BoundingBox clb) {
+    protected boolean isInterior(final LevelReader bqd, final int integer2, final int integer3, final int integer4, final BoundingBox ctd) {
         final int integer5 = this.getWorldX(integer2, integer4);
         final int integer6 = this.getWorldY(integer3 + 1);
         final int integer7 = this.getWorldZ(integer2, integer4);
-        final BlockPos fk10 = new BlockPos(integer5, integer6, integer7);
-        return clb.isInside(fk10) && integer6 < bjz.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer5, integer7);
+        final BlockPos fu10 = new BlockPos(integer5, integer6, integer7);
+        return ctd.isInside(fu10) && integer6 < bqd.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, integer5, integer7);
     }
     
-    protected void generateAirBox(final LevelAccessor bjx, final BoundingBox clb, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
+    protected void generateAirBox(final LevelAccessor bqc, final BoundingBox ctd, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8) {
         for (int integer9 = integer4; integer9 <= integer7; ++integer9) {
             for (int integer10 = integer3; integer10 <= integer6; ++integer10) {
                 for (int integer11 = integer5; integer11 <= integer8; ++integer11) {
-                    this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), integer10, integer9, integer11, clb);
+                    this.placeBlock(bqc, Blocks.AIR.defaultBlockState(), integer10, integer9, integer11, ctd);
                 }
             }
         }
     }
     
-    protected void generateBox(final LevelAccessor bjx, final BoundingBox clb, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BlockState byj9, final BlockState byj10, final boolean boolean11) {
+    protected void generateBox(final LevelAccessor bqc, final BoundingBox ctd, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BlockState cfj9, final BlockState cfj10, final boolean boolean11) {
         for (int integer9 = integer4; integer9 <= integer7; ++integer9) {
             for (int integer10 = integer3; integer10 <= integer6; ++integer10) {
                 for (int integer11 = integer5; integer11 <= integer8; ++integer11) {
-                    if (!boolean11 || !this.getBlock(bjx, integer10, integer9, integer11, clb).isAir()) {
+                    if (!boolean11 || !this.getBlock(bqc, integer10, integer9, integer11, ctd).isAir()) {
                         if (integer9 == integer4 || integer9 == integer7 || integer10 == integer3 || integer10 == integer6 || integer11 == integer5 || integer11 == integer8) {
-                            this.placeBlock(bjx, byj9, integer10, integer9, integer11, clb);
+                            this.placeBlock(bqc, cfj9, integer10, integer9, integer11, ctd);
                         }
                         else {
-                            this.placeBlock(bjx, byj10, integer10, integer9, integer11, clb);
+                            this.placeBlock(bqc, cfj10, integer10, integer9, integer11, ctd);
                         }
                     }
                 }
@@ -259,31 +261,31 @@ public abstract class StructurePiece {
         }
     }
     
-    protected void generateBox(final LevelAccessor bjx, final BoundingBox clb, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final Random random, final BlockSelector a) {
+    protected void generateBox(final LevelAccessor bqc, final BoundingBox ctd, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final boolean boolean9, final Random random, final BlockSelector a) {
         for (int integer9 = integer4; integer9 <= integer7; ++integer9) {
             for (int integer10 = integer3; integer10 <= integer6; ++integer10) {
                 for (int integer11 = integer5; integer11 <= integer8; ++integer11) {
-                    if (!boolean9 || !this.getBlock(bjx, integer10, integer9, integer11, clb).isAir()) {
+                    if (!boolean9 || !this.getBlock(bqc, integer10, integer9, integer11, ctd).isAir()) {
                         a.next(random, integer10, integer9, integer11, integer9 == integer4 || integer9 == integer7 || integer10 == integer3 || integer10 == integer6 || integer11 == integer5 || integer11 == integer8);
-                        this.placeBlock(bjx, a.getNext(), integer10, integer9, integer11, clb);
+                        this.placeBlock(bqc, a.getNext(), integer10, integer9, integer11, ctd);
                     }
                 }
             }
         }
     }
     
-    protected void generateMaybeBox(final LevelAccessor bjx, final BoundingBox clb, final Random random, final float float4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final int integer10, final BlockState byj11, final BlockState byj12, final boolean boolean13, final boolean boolean14) {
+    protected void generateMaybeBox(final LevelAccessor bqc, final BoundingBox ctd, final Random random, final float float4, final int integer5, final int integer6, final int integer7, final int integer8, final int integer9, final int integer10, final BlockState cfj11, final BlockState cfj12, final boolean boolean13, final boolean boolean14) {
         for (int integer11 = integer6; integer11 <= integer9; ++integer11) {
             for (int integer12 = integer5; integer12 <= integer8; ++integer12) {
                 for (int integer13 = integer7; integer13 <= integer10; ++integer13) {
                     if (random.nextFloat() <= float4) {
-                        if (!boolean13 || !this.getBlock(bjx, integer12, integer11, integer13, clb).isAir()) {
-                            if (!boolean14 || this.isInterior(bjx, integer12, integer11, integer13, clb)) {
+                        if (!boolean13 || !this.getBlock(bqc, integer12, integer11, integer13, ctd).isAir()) {
+                            if (!boolean14 || this.isInterior(bqc, integer12, integer11, integer13, ctd)) {
                                 if (integer11 == integer6 || integer11 == integer9 || integer12 == integer5 || integer12 == integer8 || integer13 == integer7 || integer13 == integer10) {
-                                    this.placeBlock(bjx, byj11, integer12, integer11, integer13, clb);
+                                    this.placeBlock(bqc, cfj11, integer12, integer11, integer13, ctd);
                                 }
                                 else {
-                                    this.placeBlock(bjx, byj12, integer12, integer11, integer13, clb);
+                                    this.placeBlock(bqc, cfj12, integer12, integer11, integer13, ctd);
                                 }
                             }
                         }
@@ -293,13 +295,13 @@ public abstract class StructurePiece {
         }
     }
     
-    protected void maybeGenerateBlock(final LevelAccessor bjx, final BoundingBox clb, final Random random, final float float4, final int integer5, final int integer6, final int integer7, final BlockState byj) {
+    protected void maybeGenerateBlock(final LevelAccessor bqc, final BoundingBox ctd, final Random random, final float float4, final int integer5, final int integer6, final int integer7, final BlockState cfj) {
         if (random.nextFloat() < float4) {
-            this.placeBlock(bjx, byj, integer5, integer6, integer7, clb);
+            this.placeBlock(bqc, cfj, integer5, integer6, integer7, ctd);
         }
     }
     
-    protected void generateUpperHalfSphere(final LevelAccessor bjx, final BoundingBox clb, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BlockState byj, final boolean boolean10) {
+    protected void generateUpperHalfSphere(final LevelAccessor bqc, final BoundingBox ctd, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final int integer8, final BlockState cfj, final boolean boolean10) {
         final float float12 = (float)(integer6 - integer3 + 1);
         final float float13 = (float)(integer7 - integer4 + 1);
         final float float14 = (float)(integer8 - integer5 + 1);
@@ -311,10 +313,10 @@ public abstract class StructurePiece {
                 final float float18 = (integer10 - float15) / (float12 * 0.5f);
                 for (int integer11 = integer5; integer11 <= integer8; ++integer11) {
                     final float float19 = (integer11 - float16) / (float14 * 0.5f);
-                    if (!boolean10 || !this.getBlock(bjx, integer10, integer9, integer11, clb).isAir()) {
+                    if (!boolean10 || !this.getBlock(bqc, integer10, integer9, integer11, ctd).isAir()) {
                         final float float20 = float18 * float18 + float17 * float17 + float19 * float19;
                         if (float20 <= 1.05f) {
-                            this.placeBlock(bjx, byj, integer10, integer9, integer11, clb);
+                            this.placeBlock(bqc, cfj, integer10, integer9, integer11, ctd);
                         }
                     }
                 }
@@ -322,83 +324,83 @@ public abstract class StructurePiece {
         }
     }
     
-    protected void fillColumnDown(final LevelAccessor bjx, final BlockState byj, final int integer3, final int integer4, final int integer5, final BoundingBox clb) {
+    protected void fillColumnDown(final LevelAccessor bqc, final BlockState cfj, final int integer3, final int integer4, final int integer5, final BoundingBox ctd) {
         final int integer6 = this.getWorldX(integer3, integer5);
         int integer7 = this.getWorldY(integer4);
         final int integer8 = this.getWorldZ(integer3, integer5);
-        if (!clb.isInside(new BlockPos(integer6, integer7, integer8))) {
+        if (!ctd.isInside(new BlockPos(integer6, integer7, integer8))) {
             return;
         }
-        while ((bjx.isEmptyBlock(new BlockPos(integer6, integer7, integer8)) || bjx.getBlockState(new BlockPos(integer6, integer7, integer8)).getMaterial().isLiquid()) && integer7 > 1) {
-            bjx.setBlock(new BlockPos(integer6, integer7, integer8), byj, 2);
+        while ((bqc.isEmptyBlock(new BlockPos(integer6, integer7, integer8)) || bqc.getBlockState(new BlockPos(integer6, integer7, integer8)).getMaterial().isLiquid()) && integer7 > 1) {
+            bqc.setBlock(new BlockPos(integer6, integer7, integer8), cfj, 2);
             --integer7;
         }
     }
     
-    protected boolean createChest(final LevelAccessor bjx, final BoundingBox clb, final Random random, final int integer4, final int integer5, final int integer6, final ResourceLocation sm) {
-        final BlockPos fk9 = new BlockPos(this.getWorldX(integer4, integer6), this.getWorldY(integer5), this.getWorldZ(integer4, integer6));
-        return this.createChest(bjx, clb, random, fk9, sm, null);
+    protected boolean createChest(final LevelAccessor bqc, final BoundingBox ctd, final Random random, final int integer4, final int integer5, final int integer6, final ResourceLocation uh) {
+        final BlockPos fu9 = new BlockPos(this.getWorldX(integer4, integer6), this.getWorldY(integer5), this.getWorldZ(integer4, integer6));
+        return this.createChest(bqc, ctd, random, fu9, uh, null);
     }
     
-    public static BlockState reorient(final BlockGetter bjg, final BlockPos fk, final BlockState byj) {
-        Direction fp4 = null;
-        for (final Direction fp5 : Direction.Plane.HORIZONTAL) {
-            final BlockPos fk2 = fk.relative(fp5);
-            final BlockState byj2 = bjg.getBlockState(fk2);
-            if (byj2.getBlock() == Blocks.CHEST) {
-                return byj;
+    public static BlockState reorient(final BlockGetter bpg, final BlockPos fu, final BlockState cfj) {
+        Direction fz4 = null;
+        for (final Direction fz5 : Direction.Plane.HORIZONTAL) {
+            final BlockPos fu2 = fu.relative(fz5);
+            final BlockState cfj2 = bpg.getBlockState(fu2);
+            if (cfj2.is(Blocks.CHEST)) {
+                return cfj;
             }
-            if (!byj2.isSolidRender(bjg, fk2)) {
+            if (!cfj2.isSolidRender(bpg, fu2)) {
                 continue;
             }
-            if (fp4 != null) {
-                fp4 = null;
+            if (fz4 != null) {
+                fz4 = null;
                 break;
             }
-            fp4 = fp5;
+            fz4 = fz5;
         }
-        if (fp4 != null) {
-            return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)HorizontalDirectionalBlock.FACING, fp4.getOpposite());
+        if (fz4 != null) {
+            return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)HorizontalDirectionalBlock.FACING, fz4.getOpposite());
         }
-        Direction fp6 = byj.<Direction>getValue((Property<Direction>)HorizontalDirectionalBlock.FACING);
-        BlockPos fk3 = fk.relative(fp6);
-        if (bjg.getBlockState(fk3).isSolidRender(bjg, fk3)) {
-            fp6 = fp6.getOpposite();
-            fk3 = fk.relative(fp6);
+        Direction fz6 = cfj.<Direction>getValue((Property<Direction>)HorizontalDirectionalBlock.FACING);
+        BlockPos fu3 = fu.relative(fz6);
+        if (bpg.getBlockState(fu3).isSolidRender(bpg, fu3)) {
+            fz6 = fz6.getOpposite();
+            fu3 = fu.relative(fz6);
         }
-        if (bjg.getBlockState(fk3).isSolidRender(bjg, fk3)) {
-            fp6 = fp6.getClockWise();
-            fk3 = fk.relative(fp6);
+        if (bpg.getBlockState(fu3).isSolidRender(bpg, fu3)) {
+            fz6 = fz6.getClockWise();
+            fu3 = fu.relative(fz6);
         }
-        if (bjg.getBlockState(fk3).isSolidRender(bjg, fk3)) {
-            fp6 = fp6.getOpposite();
-            fk3 = fk.relative(fp6);
+        if (bpg.getBlockState(fu3).isSolidRender(bpg, fu3)) {
+            fz6 = fz6.getOpposite();
+            fu3 = fu.relative(fz6);
         }
-        return ((AbstractStateHolder<O, BlockState>)byj).<Comparable, Direction>setValue((Property<Comparable>)HorizontalDirectionalBlock.FACING, fp6);
+        return ((StateHolder<O, BlockState>)cfj).<Comparable, Direction>setValue((Property<Comparable>)HorizontalDirectionalBlock.FACING, fz6);
     }
     
-    protected boolean createChest(final LevelAccessor bjx, final BoundingBox clb, final Random random, final BlockPos fk, final ResourceLocation sm, @Nullable BlockState byj) {
-        if (!clb.isInside(fk) || bjx.getBlockState(fk).getBlock() == Blocks.CHEST) {
+    protected boolean createChest(final LevelAccessor bqc, final BoundingBox ctd, final Random random, final BlockPos fu, final ResourceLocation uh, @Nullable BlockState cfj) {
+        if (!ctd.isInside(fu) || bqc.getBlockState(fu).is(Blocks.CHEST)) {
             return false;
         }
-        if (byj == null) {
-            byj = reorient(bjx, fk, Blocks.CHEST.defaultBlockState());
+        if (cfj == null) {
+            cfj = reorient(bqc, fu, Blocks.CHEST.defaultBlockState());
         }
-        bjx.setBlock(fk, byj, 2);
-        final BlockEntity bwl8 = bjx.getBlockEntity(fk);
-        if (bwl8 instanceof ChestBlockEntity) {
-            ((ChestBlockEntity)bwl8).setLootTable(sm, random.nextLong());
+        bqc.setBlock(fu, cfj, 2);
+        final BlockEntity cdl8 = bqc.getBlockEntity(fu);
+        if (cdl8 instanceof ChestBlockEntity) {
+            ((ChestBlockEntity)cdl8).setLootTable(uh, random.nextLong());
         }
         return true;
     }
     
-    protected boolean createDispenser(final LevelAccessor bjx, final BoundingBox clb, final Random random, final int integer4, final int integer5, final int integer6, final Direction fp, final ResourceLocation sm) {
-        final BlockPos fk10 = new BlockPos(this.getWorldX(integer4, integer6), this.getWorldY(integer5), this.getWorldZ(integer4, integer6));
-        if (clb.isInside(fk10) && bjx.getBlockState(fk10).getBlock() != Blocks.DISPENSER) {
-            this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)Blocks.DISPENSER.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)DispenserBlock.FACING, fp), integer4, integer5, integer6, clb);
-            final BlockEntity bwl11 = bjx.getBlockEntity(fk10);
-            if (bwl11 instanceof DispenserBlockEntity) {
-                ((DispenserBlockEntity)bwl11).setLootTable(sm, random.nextLong());
+    protected boolean createDispenser(final LevelAccessor bqc, final BoundingBox ctd, final Random random, final int integer4, final int integer5, final int integer6, final Direction fz, final ResourceLocation uh) {
+        final BlockPos fu10 = new BlockPos(this.getWorldX(integer4, integer6), this.getWorldY(integer5), this.getWorldZ(integer4, integer6));
+        if (ctd.isInside(fu10) && !bqc.getBlockState(fu10).is(Blocks.DISPENSER)) {
+            this.placeBlock(bqc, ((StateHolder<O, BlockState>)Blocks.DISPENSER.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)DispenserBlock.FACING, fz), integer4, integer5, integer6, ctd);
+            final BlockEntity cdl11 = bqc.getBlockEntity(fu10);
+            if (cdl11 instanceof DispenserBlockEntity) {
+                ((DispenserBlockEntity)cdl11).setLootTable(uh, random.nextLong());
             }
             return true;
         }
@@ -414,14 +416,14 @@ public abstract class StructurePiece {
         return this.orientation;
     }
     
-    public void setOrientation(@Nullable final Direction fp) {
-        this.orientation = fp;
-        if (fp == null) {
+    public void setOrientation(@Nullable final Direction fz) {
+        this.orientation = fz;
+        if (fz == null) {
             this.rotation = Rotation.NONE;
             this.mirror = Mirror.NONE;
         }
         else {
-            switch (fp) {
+            switch (fz) {
                 case SOUTH: {
                     this.mirror = Mirror.LEFT_RIGHT;
                     this.rotation = Rotation.NONE;
diff --git a/src/net/minecraft/world/level/levelgen/structure/StructureStart.java b/src/net/minecraft/world/level/levelgen/structure/StructureStart.java
index 5d614b3..7600502 100644
--- a/src/net/minecraft/world/level/levelgen/structure/StructureStart.java
+++ b/src/net/minecraft/world/level/levelgen/structure/StructureStart.java
@@ -1,16 +1,18 @@
 package net.minecraft.world.level.levelgen.structure;
 
 import java.util.AbstractList;
-import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
 import java.util.Iterator;
+import net.minecraft.core.Vec3i;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
 import java.util.Random;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -18,10 +20,11 @@ import com.google.common.collect.Lists;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import java.util.List;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 
-public abstract class StructureStart {
-    public static final StructureStart INVALID_START;
-    private final StructureFeature<?> feature;
+public abstract class StructureStart<C extends FeatureConfiguration> {
+    public static final StructureStart<?> INVALID_START;
+    private final StructureFeature<C> feature;
     protected final List<StructurePiece> pieces;
     protected BoundingBox boundingBox;
     private final int chunkX;
@@ -29,17 +32,17 @@ public abstract class StructureStart {
     private int references;
     protected final WorldgenRandom random;
     
-    public StructureStart(final StructureFeature<?> cfl, final int integer2, final int integer3, final BoundingBox clb, final int integer5, final long long6) {
+    public StructureStart(final StructureFeature<C> cml, final int integer2, final int integer3, final BoundingBox ctd, final int integer5, final long long6) {
         this.pieces = Lists.newArrayList();
-        this.feature = cfl;
+        this.feature = cml;
         this.chunkX = integer2;
         this.chunkZ = integer3;
         this.references = integer5;
         (this.random = new WorldgenRandom()).setLargeFeatureSeed(long6, integer2, integer3);
-        this.boundingBox = clb;
+        this.boundingBox = ctd;
     }
     
-    public abstract void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt);
+    public abstract void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final C cnr);
     
     public BoundingBox getBoundingBox() {
         return this.boundingBox;
@@ -49,13 +52,19 @@ public abstract class StructureStart {
         return this.pieces;
     }
     
-    public void postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
+    public void placeInChunk(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph) {
         synchronized (this.pieces) {
-            final Iterator<StructurePiece> iterator8 = this.pieces.iterator();
-            while (iterator8.hasNext()) {
-                final StructurePiece clu9 = iterator8.next();
-                if (clu9.getBoundingBox().intersects(clb) && !clu9.postProcess(bjx, caa, random, clb, bjh)) {
-                    iterator8.remove();
+            if (this.pieces.isEmpty()) {
+                return;
+            }
+            final BoundingBox ctd2 = this.pieces.get(0).boundingBox;
+            final Vec3i gr10 = ctd2.getCenter();
+            final BlockPos fu11 = new BlockPos(gr10.getX(), ctd2.y0, gr10.getZ());
+            final Iterator<StructurePiece> iterator12 = this.pieces.iterator();
+            while (iterator12.hasNext()) {
+                final StructurePiece cty13 = iterator12.next();
+                if (cty13.getBoundingBox().intersects(ctd) && !cty13.postProcess(bqu, bqq, cha, random, ctd, bph, fu11)) {
+                    iterator12.remove();
                 }
             }
             this.calculateBoundingBox();
@@ -64,30 +73,30 @@ public abstract class StructureStart {
     
     protected void calculateBoundingBox() {
         this.boundingBox = BoundingBox.getUnknownBox();
-        for (final StructurePiece clu3 : this.pieces) {
-            this.boundingBox.expand(clu3.getBoundingBox());
+        for (final StructurePiece cty3 : this.pieces) {
+            this.boundingBox.expand(cty3.getBoundingBox());
         }
     }
     
     public CompoundTag createTag(final int integer1, final int integer2) {
-        final CompoundTag jt4 = new CompoundTag();
+        final CompoundTag le4 = new CompoundTag();
         if (this.isValid()) {
-            jt4.putString("id", Registry.STRUCTURE_FEATURE.getKey(this.getFeature()).toString());
-            jt4.putInt("ChunkX", integer1);
-            jt4.putInt("ChunkZ", integer2);
-            jt4.putInt("references", this.references);
-            jt4.put("BB", this.boundingBox.createTag());
-            final ListTag jz5 = new ListTag();
+            le4.putString("id", Registry.STRUCTURE_FEATURE.getKey(this.getFeature()).toString());
+            le4.putInt("ChunkX", integer1);
+            le4.putInt("ChunkZ", integer2);
+            le4.putInt("references", this.references);
+            le4.put("BB", this.boundingBox.createTag());
+            final ListTag lk5 = new ListTag();
             synchronized (this.pieces) {
-                for (final StructurePiece clu8 : this.pieces) {
-                    ((AbstractList<CompoundTag>)jz5).add(clu8.createTag());
+                for (final StructurePiece cty8 : this.pieces) {
+                    ((AbstractList<CompoundTag>)lk5).add(cty8.createTag());
                 }
             }
-            jt4.put("Children", jz5);
-            return jt4;
+            le4.put("Children", lk5);
+            return le4;
         }
-        jt4.putString("id", "INVALID");
-        return jt4;
+        le4.putString("id", "INVALID");
+        return le4;
     }
     
     protected void moveBelowSeaLevel(final int integer1, final Random random, final int integer3) {
@@ -98,8 +107,8 @@ public abstract class StructureStart {
         }
         final int integer6 = integer5 - this.boundingBox.y1;
         this.boundingBox.move(0, integer6, 0);
-        for (final StructurePiece clu9 : this.pieces) {
-            clu9.move(0, integer6, 0);
+        for (final StructurePiece cty9 : this.pieces) {
+            cty9.move(0, integer6, 0);
         }
     }
     
@@ -114,8 +123,8 @@ public abstract class StructureStart {
         }
         final int integer6 = integer5 - this.boundingBox.y0;
         this.boundingBox.move(0, integer6, 0);
-        for (final StructurePiece clu9 : this.pieces) {
-            clu9.move(0, integer6, 0);
+        for (final StructurePiece cty9 : this.pieces) {
+            cty9.move(0, integer6, 0);
         }
     }
     
@@ -156,9 +165,9 @@ public abstract class StructureStart {
     }
     
     static {
-        INVALID_START = new StructureStart(Feature.MINESHAFT, 0, 0, BoundingBox.getUnknownBox(), 0, 0L) {
+        INVALID_START = new StructureStart<MineshaftConfiguration>(StructureFeature.MINESHAFT, 0, 0, BoundingBox.getUnknownBox(), 0, 0L) {
             @Override
-            public void generatePieces(final ChunkGenerator<?> caa, final StructureManager cmo, final int integer3, final int integer4, final Biome bkt) {
+            public void generatePieces(final ChunkGenerator cha, final StructureManager cva, final int integer3, final int integer4, final Biome bre, final MineshaftConfiguration cnw) {
             }
         };
     }
diff --git a/src/net/minecraft/world/level/levelgen/structure/SwamplandHutPiece.java b/src/net/minecraft/world/level/levelgen/structure/SwamplandHutPiece.java
index 9c3883f..eb320e4 100644
--- a/src/net/minecraft/world/level/levelgen/structure/SwamplandHutPiece.java
+++ b/src/net/minecraft/world/level/levelgen/structure/SwamplandHutPiece.java
@@ -1,6 +1,6 @@
 package net.minecraft.world.level.levelgen.structure;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.entity.animal.Cat;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.SpawnGroupData;
@@ -8,16 +8,18 @@ import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.monster.Witch;
 import net.minecraft.core.Vec3i;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.properties.StairsShape;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.StairBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.levelgen.feature.StructurePieceType;
@@ -31,91 +33,91 @@ public class SwamplandHutPiece extends ScatteredFeaturePiece {
         super(StructurePieceType.SWAMPLAND_HUT, random, integer2, 64, integer3, 7, 7, 9);
     }
     
-    public SwamplandHutPiece(final StructureManager cmo, final CompoundTag jt) {
-        super(StructurePieceType.SWAMPLAND_HUT, jt);
-        this.spawnedWitch = jt.getBoolean("Witch");
-        this.spawnedCat = jt.getBoolean("Cat");
+    public SwamplandHutPiece(final StructureManager cva, final CompoundTag le) {
+        super(StructurePieceType.SWAMPLAND_HUT, le);
+        this.spawnedWitch = le.getBoolean("Witch");
+        this.spawnedCat = le.getBoolean("Cat");
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        super.addAdditionalSaveData(jt);
-        jt.putBoolean("Witch", this.spawnedWitch);
-        jt.putBoolean("Cat", this.spawnedCat);
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        super.addAdditionalSaveData(le);
+        le.putBoolean("Witch", this.spawnedWitch);
+        le.putBoolean("Cat", this.spawnedCat);
     }
     
     @Override
-    public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-        if (!this.updateAverageGroundHeight(bjx, clb, 0)) {
+    public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+        if (!this.updateAverageGroundHeight(bqu, ctd, 0)) {
             return false;
         }
-        this.generateBox(bjx, clb, 1, 1, 1, 5, 1, 7, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 1, 4, 2, 5, 4, 7, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 2, 1, 0, 4, 1, 0, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 2, 2, 2, 3, 3, 2, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 1, 2, 3, 1, 3, 6, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 5, 2, 3, 5, 3, 6, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 2, 2, 7, 4, 3, 7, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 1, 0, 2, 1, 3, 2, Blocks.OAK_LOG.defaultBlockState(), Blocks.OAK_LOG.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 5, 0, 2, 5, 3, 2, Blocks.OAK_LOG.defaultBlockState(), Blocks.OAK_LOG.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 1, 0, 7, 1, 3, 7, Blocks.OAK_LOG.defaultBlockState(), Blocks.OAK_LOG.defaultBlockState(), false);
-        this.generateBox(bjx, clb, 5, 0, 7, 5, 3, 7, Blocks.OAK_LOG.defaultBlockState(), Blocks.OAK_LOG.defaultBlockState(), false);
-        this.placeBlock(bjx, Blocks.OAK_FENCE.defaultBlockState(), 2, 3, 2, clb);
-        this.placeBlock(bjx, Blocks.OAK_FENCE.defaultBlockState(), 3, 3, 7, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 1, 3, 4, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 5, 3, 4, clb);
-        this.placeBlock(bjx, Blocks.AIR.defaultBlockState(), 5, 3, 5, clb);
-        this.placeBlock(bjx, Blocks.POTTED_RED_MUSHROOM.defaultBlockState(), 1, 3, 5, clb);
-        this.placeBlock(bjx, Blocks.CRAFTING_TABLE.defaultBlockState(), 3, 2, 6, clb);
-        this.placeBlock(bjx, Blocks.CAULDRON.defaultBlockState(), 4, 2, 6, clb);
-        this.placeBlock(bjx, Blocks.OAK_FENCE.defaultBlockState(), 1, 2, 1, clb);
-        this.placeBlock(bjx, Blocks.OAK_FENCE.defaultBlockState(), 5, 2, 1, clb);
-        final BlockState byj7 = ((AbstractStateHolder<O, BlockState>)Blocks.SPRUCE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH);
-        final BlockState byj8 = ((AbstractStateHolder<O, BlockState>)Blocks.SPRUCE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.EAST);
-        final BlockState byj9 = ((AbstractStateHolder<O, BlockState>)Blocks.SPRUCE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.WEST);
-        final BlockState byj10 = ((AbstractStateHolder<O, BlockState>)Blocks.SPRUCE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.SOUTH);
-        this.generateBox(bjx, clb, 0, 4, 1, 6, 4, 1, byj7, byj7, false);
-        this.generateBox(bjx, clb, 0, 4, 2, 0, 4, 7, byj8, byj8, false);
-        this.generateBox(bjx, clb, 6, 4, 2, 6, 4, 7, byj9, byj9, false);
-        this.generateBox(bjx, clb, 0, 4, 8, 6, 4, 8, byj10, byj10, false);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj7).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_RIGHT), 0, 4, 1, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj7).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_LEFT), 6, 4, 1, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj10).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_LEFT), 0, 4, 8, clb);
-        this.placeBlock(bjx, ((AbstractStateHolder<O, BlockState>)byj10).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_RIGHT), 6, 4, 8, clb);
-        for (int integer11 = 2; integer11 <= 7; integer11 += 5) {
-            for (int integer12 = 1; integer12 <= 5; integer12 += 4) {
-                this.fillColumnDown(bjx, Blocks.OAK_LOG.defaultBlockState(), integer12, -1, integer11, clb);
+        this.generateBox(bqu, ctd, 1, 1, 1, 5, 1, 7, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 1, 4, 2, 5, 4, 7, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 2, 1, 0, 4, 1, 0, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 2, 2, 2, 3, 3, 2, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 1, 2, 3, 1, 3, 6, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 5, 2, 3, 5, 3, 6, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 2, 2, 7, 4, 3, 7, Blocks.SPRUCE_PLANKS.defaultBlockState(), Blocks.SPRUCE_PLANKS.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 1, 0, 2, 1, 3, 2, Blocks.OAK_LOG.defaultBlockState(), Blocks.OAK_LOG.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 5, 0, 2, 5, 3, 2, Blocks.OAK_LOG.defaultBlockState(), Blocks.OAK_LOG.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 1, 0, 7, 1, 3, 7, Blocks.OAK_LOG.defaultBlockState(), Blocks.OAK_LOG.defaultBlockState(), false);
+        this.generateBox(bqu, ctd, 5, 0, 7, 5, 3, 7, Blocks.OAK_LOG.defaultBlockState(), Blocks.OAK_LOG.defaultBlockState(), false);
+        this.placeBlock(bqu, Blocks.OAK_FENCE.defaultBlockState(), 2, 3, 2, ctd);
+        this.placeBlock(bqu, Blocks.OAK_FENCE.defaultBlockState(), 3, 3, 7, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 1, 3, 4, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 5, 3, 4, ctd);
+        this.placeBlock(bqu, Blocks.AIR.defaultBlockState(), 5, 3, 5, ctd);
+        this.placeBlock(bqu, Blocks.POTTED_RED_MUSHROOM.defaultBlockState(), 1, 3, 5, ctd);
+        this.placeBlock(bqu, Blocks.CRAFTING_TABLE.defaultBlockState(), 3, 2, 6, ctd);
+        this.placeBlock(bqu, Blocks.CAULDRON.defaultBlockState(), 4, 2, 6, ctd);
+        this.placeBlock(bqu, Blocks.OAK_FENCE.defaultBlockState(), 1, 2, 1, ctd);
+        this.placeBlock(bqu, Blocks.OAK_FENCE.defaultBlockState(), 5, 2, 1, ctd);
+        final BlockState cfj9 = ((StateHolder<O, BlockState>)Blocks.SPRUCE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.NORTH);
+        final BlockState cfj10 = ((StateHolder<O, BlockState>)Blocks.SPRUCE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.EAST);
+        final BlockState cfj11 = ((StateHolder<O, BlockState>)Blocks.SPRUCE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.WEST);
+        final BlockState cfj12 = ((StateHolder<O, BlockState>)Blocks.SPRUCE_STAIRS.defaultBlockState()).<Comparable, Direction>setValue((Property<Comparable>)StairBlock.FACING, Direction.SOUTH);
+        this.generateBox(bqu, ctd, 0, 4, 1, 6, 4, 1, cfj9, cfj9, false);
+        this.generateBox(bqu, ctd, 0, 4, 2, 0, 4, 7, cfj10, cfj10, false);
+        this.generateBox(bqu, ctd, 6, 4, 2, 6, 4, 7, cfj11, cfj11, false);
+        this.generateBox(bqu, ctd, 0, 4, 8, 6, 4, 8, cfj12, cfj12, false);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj9).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_RIGHT), 0, 4, 1, ctd);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj9).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_LEFT), 6, 4, 1, ctd);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj12).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_LEFT), 0, 4, 8, ctd);
+        this.placeBlock(bqu, ((StateHolder<O, BlockState>)cfj12).<StairsShape, StairsShape>setValue(StairBlock.SHAPE, StairsShape.OUTER_RIGHT), 6, 4, 8, ctd);
+        for (int integer13 = 2; integer13 <= 7; integer13 += 5) {
+            for (int integer14 = 1; integer14 <= 5; integer14 += 4) {
+                this.fillColumnDown(bqu, Blocks.OAK_LOG.defaultBlockState(), integer14, -1, integer13, ctd);
             }
         }
         if (!this.spawnedWitch) {
-            final int integer11 = this.getWorldX(2, 5);
-            final int integer12 = this.getWorldY(2);
-            final int integer13 = this.getWorldZ(2, 5);
-            if (clb.isInside(new BlockPos(integer11, integer12, integer13))) {
+            final int integer13 = this.getWorldX(2, 5);
+            final int integer14 = this.getWorldY(2);
+            final int integer15 = this.getWorldZ(2, 5);
+            if (ctd.isInside(new BlockPos(integer13, integer14, integer15))) {
                 this.spawnedWitch = true;
-                final Witch axn14 = EntityType.WITCH.create(bjx.getLevel());
-                axn14.setPersistenceRequired();
-                axn14.moveTo(integer11 + 0.5, integer12, integer13 + 0.5, 0.0f, 0.0f);
-                axn14.finalizeSpawn(bjx, bjx.getCurrentDifficultyAt(new BlockPos(integer11, integer12, integer13)), MobSpawnType.STRUCTURE, null, null);
-                bjx.addFreshEntity(axn14);
+                final Witch bcr16 = EntityType.WITCH.create(bqu.getLevel());
+                bcr16.setPersistenceRequired();
+                bcr16.moveTo(integer13 + 0.5, integer14, integer15 + 0.5, 0.0f, 0.0f);
+                bcr16.finalizeSpawn(bqu, bqu.getCurrentDifficultyAt(new BlockPos(integer13, integer14, integer15)), MobSpawnType.STRUCTURE, null, null);
+                bqu.addFreshEntity(bcr16);
             }
         }
-        this.spawnCat(bjx, clb);
+        this.spawnCat(bqu, ctd);
         return true;
     }
     
-    private void spawnCat(final LevelAccessor bjx, final BoundingBox clb) {
+    private void spawnCat(final LevelAccessor bqc, final BoundingBox ctd) {
         if (!this.spawnedCat) {
             final int integer4 = this.getWorldX(2, 5);
             final int integer5 = this.getWorldY(2);
             final int integer6 = this.getWorldZ(2, 5);
-            if (clb.isInside(new BlockPos(integer4, integer5, integer6))) {
+            if (ctd.isInside(new BlockPos(integer4, integer5, integer6))) {
                 this.spawnedCat = true;
-                final Cat ate7 = EntityType.CAT.create(bjx.getLevel());
-                ate7.setPersistenceRequired();
-                ate7.moveTo(integer4 + 0.5, integer5, integer6 + 0.5, 0.0f, 0.0f);
-                ate7.finalizeSpawn(bjx, bjx.getCurrentDifficultyAt(new BlockPos(integer4, integer5, integer6)), MobSpawnType.STRUCTURE, null, null);
-                bjx.addFreshEntity(ate7);
+                final Cat aym7 = EntityType.CAT.create(bqc.getLevel());
+                aym7.setPersistenceRequired();
+                aym7.moveTo(integer4 + 0.5, integer5, integer6 + 0.5, 0.0f, 0.0f);
+                aym7.finalizeSpawn(bqc, bqc.getCurrentDifficultyAt(new BlockPos(integer4, integer5, integer6)), MobSpawnType.STRUCTURE, null, null);
+                bqc.addFreshEntity(aym7);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/levelgen/structure/TemplateStructurePiece.java b/src/net/minecraft/world/level/levelgen/structure/TemplateStructurePiece.java
index 4f2a052..4fdeaa2 100644
--- a/src/net/minecraft/world/level/levelgen/structure/TemplateStructurePiece.java
+++ b/src/net/minecraft/world/level/levelgen/structure/TemplateStructurePiece.java
@@ -10,10 +10,12 @@ import net.minecraft.commands.arguments.blocks.BlockStateParser;
 import com.mojang.brigadier.StringReader;
 import net.minecraft.world.level.block.state.properties.StructureMode;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.ChunkPos;
 import java.util.Random;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.levelgen.feature.StructurePieceType;
@@ -28,74 +30,74 @@ public abstract class TemplateStructurePiece extends StructurePiece {
     protected StructurePlaceSettings placeSettings;
     protected BlockPos templatePosition;
     
-    public TemplateStructurePiece(final StructurePieceType cfm, final int integer) {
-        super(cfm, integer);
+    public TemplateStructurePiece(final StructurePieceType cmm, final int integer) {
+        super(cmm, integer);
     }
     
-    public TemplateStructurePiece(final StructurePieceType cfm, final CompoundTag jt) {
-        super(cfm, jt);
-        this.templatePosition = new BlockPos(jt.getInt("TPX"), jt.getInt("TPY"), jt.getInt("TPZ"));
+    public TemplateStructurePiece(final StructurePieceType cmm, final CompoundTag le) {
+        super(cmm, le);
+        this.templatePosition = new BlockPos(le.getInt("TPX"), le.getInt("TPY"), le.getInt("TPZ"));
     }
     
-    protected void setup(final StructureTemplate cms, final BlockPos fk, final StructurePlaceSettings cmp) {
-        this.template = cms;
+    protected void setup(final StructureTemplate cve, final BlockPos fu, final StructurePlaceSettings cvb) {
+        this.template = cve;
         this.setOrientation(Direction.NORTH);
-        this.templatePosition = fk;
-        this.placeSettings = cmp;
-        this.boundingBox = cms.getBoundingBox(cmp, fk);
+        this.templatePosition = fu;
+        this.placeSettings = cvb;
+        this.boundingBox = cve.getBoundingBox(cvb, fu);
     }
     
     @Override
-    protected void addAdditionalSaveData(final CompoundTag jt) {
-        jt.putInt("TPX", this.templatePosition.getX());
-        jt.putInt("TPY", this.templatePosition.getY());
-        jt.putInt("TPZ", this.templatePosition.getZ());
+    protected void addAdditionalSaveData(final CompoundTag le) {
+        le.putInt("TPX", this.templatePosition.getX());
+        le.putInt("TPY", this.templatePosition.getY());
+        le.putInt("TPZ", this.templatePosition.getZ());
     }
     
     @Override
-    public boolean postProcess(final LevelAccessor bjx, final ChunkGenerator<?> caa, final Random random, final BoundingBox clb, final ChunkPos bjh) {
-        this.placeSettings.setBoundingBox(clb);
+    public boolean postProcess(final WorldGenLevel bqu, final StructureFeatureManager bqq, final ChunkGenerator cha, final Random random, final BoundingBox ctd, final ChunkPos bph, final BlockPos fu) {
+        this.placeSettings.setBoundingBox(ctd);
         this.boundingBox = this.template.getBoundingBox(this.placeSettings, this.templatePosition);
-        if (this.template.placeInWorld(bjx, this.templatePosition, this.placeSettings, 2)) {
-            final List<StructureTemplate.StructureBlockInfo> list7 = this.template.filterBlocks(this.templatePosition, this.placeSettings, Blocks.STRUCTURE_BLOCK);
-            for (final StructureTemplate.StructureBlockInfo b9 : list7) {
-                if (b9.nbt == null) {
+        if (this.template.placeInWorld(bqu, this.templatePosition, fu, this.placeSettings, random, 2)) {
+            final List<StructureTemplate.StructureBlockInfo> list9 = this.template.filterBlocks(this.templatePosition, this.placeSettings, Blocks.STRUCTURE_BLOCK);
+            for (final StructureTemplate.StructureBlockInfo c11 : list9) {
+                if (c11.nbt == null) {
                     continue;
                 }
-                final StructureMode bzr10 = StructureMode.valueOf(b9.nbt.getString("mode"));
-                if (bzr10 != StructureMode.DATA) {
+                final StructureMode cgq12 = StructureMode.valueOf(c11.nbt.getString("mode"));
+                if (cgq12 != StructureMode.DATA) {
                     continue;
                 }
-                this.handleDataMarker(b9.nbt.getString("metadata"), b9.pos, bjx, random, clb);
+                this.handleDataMarker(c11.nbt.getString("metadata"), c11.pos, bqu, random, ctd);
             }
-            final List<StructureTemplate.StructureBlockInfo> list8 = this.template.filterBlocks(this.templatePosition, this.placeSettings, Blocks.JIGSAW);
-            for (final StructureTemplate.StructureBlockInfo b10 : list8) {
-                if (b10.nbt == null) {
+            final List<StructureTemplate.StructureBlockInfo> list10 = this.template.filterBlocks(this.templatePosition, this.placeSettings, Blocks.JIGSAW);
+            for (final StructureTemplate.StructureBlockInfo c12 : list10) {
+                if (c12.nbt == null) {
                     continue;
                 }
-                final String string11 = b10.nbt.getString("final_state");
-                final BlockStateParser dv12 = new BlockStateParser(new StringReader(string11), false);
-                BlockState byj13 = Blocks.AIR.defaultBlockState();
+                final String string13 = c12.nbt.getString("final_state");
+                final BlockStateParser ef14 = new BlockStateParser(new StringReader(string13), false);
+                BlockState cfj15 = Blocks.AIR.defaultBlockState();
                 try {
-                    dv12.parse(true);
-                    final BlockState byj14 = dv12.getState();
-                    if (byj14 != null) {
-                        byj13 = byj14;
+                    ef14.parse(true);
+                    final BlockState cfj16 = ef14.getState();
+                    if (cfj16 != null) {
+                        cfj15 = cfj16;
                     }
                     else {
-                        TemplateStructurePiece.LOGGER.error("Error while parsing blockstate {} in jigsaw block @ {}", string11, b10.pos);
+                        TemplateStructurePiece.LOGGER.error("Error while parsing blockstate {} in jigsaw block @ {}", string13, c12.pos);
                     }
                 }
-                catch (CommandSyntaxException commandSyntaxException14) {
-                    TemplateStructurePiece.LOGGER.error("Error while parsing blockstate {} in jigsaw block @ {}", string11, b10.pos);
+                catch (CommandSyntaxException commandSyntaxException16) {
+                    TemplateStructurePiece.LOGGER.error("Error while parsing blockstate {} in jigsaw block @ {}", string13, c12.pos);
                 }
-                bjx.setBlock(b10.pos, byj13, 3);
+                bqu.setBlock(c12.pos, cfj15, 3);
             }
         }
         return true;
     }
     
-    protected abstract void handleDataMarker(final String string, final BlockPos fk, final LevelAccessor bjx, final Random random, final BoundingBox clb);
+    protected abstract void handleDataMarker(final String string, final BlockPos fu, final LevelAccessor bqc, final Random random, final BoundingBox ctd);
     
     @Override
     public void move(final int integer1, final int integer2, final int integer3) {
diff --git a/src/net/minecraft/world/level/levelgen/structure/WoodlandMansionPieces.java b/src/net/minecraft/world/level/levelgen/structure/WoodlandMansionPieces.java
index 3e6dcb3..3a8595c 100644
--- a/src/net/minecraft/world/level/levelgen/structure/WoodlandMansionPieces.java
+++ b/src/net/minecraft/world/level/levelgen/structure/WoodlandMansionPieces.java
@@ -1,15 +1,15 @@
 package net.minecraft.world.level.levelgen.structure;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import java.util.Collections;
 import net.minecraft.util.Tuple;
 import javax.annotation.Nullable;
 import java.util.Iterator;
 import com.google.common.collect.Lists;
 import net.minecraft.world.entity.monster.AbstractIllager;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.MobSpawnType;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.monster.Vindicator;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.monster.Evoker;
@@ -35,10 +35,10 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 
 public class WoodlandMansionPieces {
-    public static void generateMansion(final StructureManager cmo, final BlockPos fk, final Rotation btu, final List<WoodlandMansionPiece> list, final Random random) {
+    public static void generateMansion(final StructureManager cva, final BlockPos fu, final Rotation cap, final List<WoodlandMansionPiece> list, final Random random) {
         final MansionGrid c6 = new MansionGrid(random);
-        final MansionPiecePlacer d7 = new MansionPiecePlacer(cmo, random);
-        d7.createMansion(fk, btu, list, c6);
+        final MansionPiecePlacer d7 = new MansionPiecePlacer(cva, random);
+        d7.createMansion(fu, cap, list, c6);
     }
     
     public static class WoodlandMansionPiece extends TemplateStructurePiece {
@@ -46,80 +46,80 @@ public class WoodlandMansionPieces {
         private final Rotation rotation;
         private final Mirror mirror;
         
-        public WoodlandMansionPiece(final StructureManager cmo, final String string, final BlockPos fk, final Rotation btu) {
-            this(cmo, string, fk, btu, Mirror.NONE);
+        public WoodlandMansionPiece(final StructureManager cva, final String string, final BlockPos fu, final Rotation cap) {
+            this(cva, string, fu, cap, Mirror.NONE);
         }
         
-        public WoodlandMansionPiece(final StructureManager cmo, final String string, final BlockPos fk, final Rotation btu, final Mirror bsu) {
+        public WoodlandMansionPiece(final StructureManager cva, final String string, final BlockPos fu, final Rotation cap, final Mirror bzj) {
             super(StructurePieceType.WOODLAND_MANSION_PIECE, 0);
             this.templateName = string;
-            this.templatePosition = fk;
-            this.rotation = btu;
-            this.mirror = bsu;
-            this.loadTemplate(cmo);
+            this.templatePosition = fu;
+            this.rotation = cap;
+            this.mirror = bzj;
+            this.loadTemplate(cva);
         }
         
-        public WoodlandMansionPiece(final StructureManager cmo, final CompoundTag jt) {
-            super(StructurePieceType.WOODLAND_MANSION_PIECE, jt);
-            this.templateName = jt.getString("Template");
-            this.rotation = Rotation.valueOf(jt.getString("Rot"));
-            this.mirror = Mirror.valueOf(jt.getString("Mi"));
-            this.loadTemplate(cmo);
+        public WoodlandMansionPiece(final StructureManager cva, final CompoundTag le) {
+            super(StructurePieceType.WOODLAND_MANSION_PIECE, le);
+            this.templateName = le.getString("Template");
+            this.rotation = Rotation.valueOf(le.getString("Rot"));
+            this.mirror = Mirror.valueOf(le.getString("Mi"));
+            this.loadTemplate(cva);
         }
         
-        private void loadTemplate(final StructureManager cmo) {
-            final StructureTemplate cms3 = cmo.getOrCreate(new ResourceLocation("woodland_mansion/" + this.templateName));
-            final StructurePlaceSettings cmp4 = new StructurePlaceSettings().setIgnoreEntities(true).setRotation(this.rotation).setMirror(this.mirror).addProcessor(BlockIgnoreProcessor.STRUCTURE_BLOCK);
-            this.setup(cms3, this.templatePosition, cmp4);
+        private void loadTemplate(final StructureManager cva) {
+            final StructureTemplate cve3 = cva.getOrCreate(new ResourceLocation("woodland_mansion/" + this.templateName));
+            final StructurePlaceSettings cvb4 = new StructurePlaceSettings().setIgnoreEntities(true).setRotation(this.rotation).setMirror(this.mirror).addProcessor(BlockIgnoreProcessor.STRUCTURE_BLOCK);
+            this.setup(cve3, this.templatePosition, cvb4);
         }
         
         @Override
-        protected void addAdditionalSaveData(final CompoundTag jt) {
-            super.addAdditionalSaveData(jt);
-            jt.putString("Template", this.templateName);
-            jt.putString("Rot", this.placeSettings.getRotation().name());
-            jt.putString("Mi", this.placeSettings.getMirror().name());
+        protected void addAdditionalSaveData(final CompoundTag le) {
+            super.addAdditionalSaveData(le);
+            le.putString("Template", this.templateName);
+            le.putString("Rot", this.placeSettings.getRotation().name());
+            le.putString("Mi", this.placeSettings.getMirror().name());
         }
         
         @Override
-        protected void handleDataMarker(final String string, final BlockPos fk, final LevelAccessor bjx, final Random random, final BoundingBox clb) {
+        protected void handleDataMarker(final String string, final BlockPos fu, final LevelAccessor bqc, final Random random, final BoundingBox ctd) {
             if (string.startsWith("Chest")) {
-                final Rotation btu7 = this.placeSettings.getRotation();
-                BlockState byj8 = Blocks.CHEST.defaultBlockState();
+                final Rotation cap7 = this.placeSettings.getRotation();
+                BlockState cfj8 = Blocks.CHEST.defaultBlockState();
                 if ("ChestWest".equals(string)) {
-                    byj8 = ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, btu7.rotate(Direction.WEST));
+                    cfj8 = ((StateHolder<O, BlockState>)cfj8).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, cap7.rotate(Direction.WEST));
                 }
                 else if ("ChestEast".equals(string)) {
-                    byj8 = ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, btu7.rotate(Direction.EAST));
+                    cfj8 = ((StateHolder<O, BlockState>)cfj8).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, cap7.rotate(Direction.EAST));
                 }
                 else if ("ChestSouth".equals(string)) {
-                    byj8 = ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, btu7.rotate(Direction.SOUTH));
+                    cfj8 = ((StateHolder<O, BlockState>)cfj8).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, cap7.rotate(Direction.SOUTH));
                 }
                 else if ("ChestNorth".equals(string)) {
-                    byj8 = ((AbstractStateHolder<O, BlockState>)byj8).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, btu7.rotate(Direction.NORTH));
+                    cfj8 = ((StateHolder<O, BlockState>)cfj8).<Comparable, Direction>setValue((Property<Comparable>)ChestBlock.FACING, cap7.rotate(Direction.NORTH));
                 }
-                this.createChest(bjx, clb, random, fk, BuiltInLootTables.WOODLAND_MANSION, byj8);
+                this.createChest(bqc, ctd, random, fu, BuiltInLootTables.WOODLAND_MANSION, cfj8);
             }
             else {
-                AbstractIllager awe7 = null;
+                AbstractIllager bbj7 = null;
                 switch (string) {
                     case "Mage": {
-                        awe7 = EntityType.EVOKER.create(bjx.getLevel());
+                        bbj7 = EntityType.EVOKER.create(bqc.getLevel());
                         break;
                     }
                     case "Warrior": {
-                        awe7 = EntityType.VINDICATOR.create(bjx.getLevel());
+                        bbj7 = EntityType.VINDICATOR.create(bqc.getLevel());
                         break;
                     }
                     default: {
                         return;
                     }
                 }
-                awe7.setPersistenceRequired();
-                awe7.moveTo(fk, 0.0f, 0.0f);
-                awe7.finalizeSpawn(bjx, bjx.getCurrentDifficultyAt(new BlockPos(awe7)), MobSpawnType.STRUCTURE, null, null);
-                bjx.addFreshEntity(awe7);
-                bjx.setBlock(fk, Blocks.AIR.defaultBlockState(), 2);
+                bbj7.setPersistenceRequired();
+                bbj7.moveTo(fu, 0.0f, 0.0f);
+                bbj7.finalizeSpawn(bqc, bqc.getCurrentDifficultyAt(bbj7.blockPosition()), MobSpawnType.STRUCTURE, null, null);
+                bqc.addFreshEntity(bbj7);
+                bqc.setBlock(fu, Blocks.AIR.defaultBlockState(), 2);
             }
         }
     }
@@ -139,15 +139,15 @@ public class WoodlandMansionPieces {
         private int startX;
         private int startY;
         
-        public MansionPiecePlacer(final StructureManager cmo, final Random random) {
-            this.structureManager = cmo;
+        public MansionPiecePlacer(final StructureManager cva, final Random random) {
+            this.structureManager = cva;
             this.random = random;
         }
         
-        public void createMansion(final BlockPos fk, final Rotation btu, final List<WoodlandMansionPiece> list, final MansionGrid c) {
+        public void createMansion(final BlockPos fu, final Rotation cap, final List<WoodlandMansionPiece> list, final MansionGrid c) {
             final PlacementData e6 = new PlacementData();
-            e6.position = fk;
-            e6.rotation = btu;
+            e6.position = fu;
+            e6.rotation = cap;
             e6.wallType = "wall_flat";
             final PlacementData e7 = new PlacementData();
             this.entrance(list, e6);
@@ -171,20 +171,20 @@ public class WoodlandMansionPieces {
             for (int integer12 = 0; integer12 < g9.height && !boolean13; ++integer12) {
                 for (int integer13 = g9.width - 1; integer13 >= 0 && !boolean13; --integer13) {
                     if (MansionGrid.isHouse(g9, integer13, integer12)) {
-                        e8.position = e8.position.relative(btu.rotate(Direction.SOUTH), 8 + (integer12 - this.startY) * 8);
-                        e8.position = e8.position.relative(btu.rotate(Direction.EAST), (integer13 - this.startX) * 8);
+                        e8.position = e8.position.relative(cap.rotate(Direction.SOUTH), 8 + (integer12 - this.startY) * 8);
+                        e8.position = e8.position.relative(cap.rotate(Direction.EAST), (integer13 - this.startX) * 8);
                         this.traverseWallPiece(list, e8);
                         this.traverseOuterWalls(list, e8, g9, Direction.SOUTH, integer13, integer12, integer13, integer12);
                         boolean13 = true;
                     }
                 }
             }
-            this.createRoof(list, fk.above(16), btu, g8, g9);
-            this.createRoof(list, fk.above(27), btu, g9, null);
+            this.createRoof(list, fu.above(16), cap, g8, g9);
+            this.createRoof(list, fu.above(27), cap, g9, null);
             if (!list.isEmpty()) {}
             final FloorRoomCollection[] arr14 = { new FirstFloorRoomCollection(), new SecondFloorRoomCollection(), new ThirdFloorRoomCollection() };
             for (int integer13 = 0; integer13 < 3; ++integer13) {
-                final BlockPos fk2 = fk.above(8 * integer13 + ((integer13 == 2) ? 3 : 0));
+                final BlockPos fu2 = fu.above(8 * integer13 + ((integer13 == 2) ? 3 : 0));
                 final SimpleGrid g10 = c.floorRooms[integer13];
                 final SimpleGrid g11 = (integer13 == 2) ? g9 : g8;
                 final String string19 = (integer13 == 0) ? "carpet_south_1" : "carpet_south_2";
@@ -192,20 +192,20 @@ public class WoodlandMansionPieces {
                 for (int integer14 = 0; integer14 < g11.height; ++integer14) {
                     for (int integer15 = 0; integer15 < g11.width; ++integer15) {
                         if (g11.get(integer15, integer14) == 1) {
-                            BlockPos fk3 = fk2.relative(btu.rotate(Direction.SOUTH), 8 + (integer14 - this.startY) * 8);
-                            fk3 = fk3.relative(btu.rotate(Direction.EAST), (integer15 - this.startX) * 8);
-                            list.add(new WoodlandMansionPiece(this.structureManager, "corridor_floor", fk3, btu));
+                            BlockPos fu3 = fu2.relative(cap.rotate(Direction.SOUTH), 8 + (integer14 - this.startY) * 8);
+                            fu3 = fu3.relative(cap.rotate(Direction.EAST), (integer15 - this.startX) * 8);
+                            list.add(new WoodlandMansionPiece(this.structureManager, "corridor_floor", fu3, cap));
                             if (g11.get(integer15, integer14 - 1) == 1 || (g10.get(integer15, integer14 - 1) & 0x800000) == 0x800000) {
-                                list.add(new WoodlandMansionPiece(this.structureManager, "carpet_north", fk3.relative(btu.rotate(Direction.EAST), 1).above(), btu));
+                                list.add(new WoodlandMansionPiece(this.structureManager, "carpet_north", fu3.relative(cap.rotate(Direction.EAST), 1).above(), cap));
                             }
                             if (g11.get(integer15 + 1, integer14) == 1 || (g10.get(integer15 + 1, integer14) & 0x800000) == 0x800000) {
-                                list.add(new WoodlandMansionPiece(this.structureManager, "carpet_east", fk3.relative(btu.rotate(Direction.SOUTH), 1).relative(btu.rotate(Direction.EAST), 5).above(), btu));
+                                list.add(new WoodlandMansionPiece(this.structureManager, "carpet_east", fu3.relative(cap.rotate(Direction.SOUTH), 1).relative(cap.rotate(Direction.EAST), 5).above(), cap));
                             }
                             if (g11.get(integer15, integer14 + 1) == 1 || (g10.get(integer15, integer14 + 1) & 0x800000) == 0x800000) {
-                                list.add(new WoodlandMansionPiece(this.structureManager, string19, fk3.relative(btu.rotate(Direction.SOUTH), 5).relative(btu.rotate(Direction.WEST), 1), btu));
+                                list.add(new WoodlandMansionPiece(this.structureManager, string19, fu3.relative(cap.rotate(Direction.SOUTH), 5).relative(cap.rotate(Direction.WEST), 1), cap));
                             }
                             if (g11.get(integer15 - 1, integer14) == 1 || (g10.get(integer15 - 1, integer14) & 0x800000) == 0x800000) {
-                                list.add(new WoodlandMansionPiece(this.structureManager, string20, fk3.relative(btu.rotate(Direction.WEST), 1).relative(btu.rotate(Direction.NORTH), 1), btu));
+                                list.add(new WoodlandMansionPiece(this.structureManager, string20, fu3.relative(cap.rotate(Direction.WEST), 1).relative(cap.rotate(Direction.NORTH), 1), cap));
                             }
                         }
                     }
@@ -223,55 +223,55 @@ public class WoodlandMansionPieces {
                             boolean14 = (boolean14 && (integer18 & 0x800000) == 0x800000);
                             list2.clear();
                             if ((integer18 & 0x200000) == 0x200000) {
-                                for (final Direction fp31 : Direction.Plane.HORIZONTAL) {
-                                    if (g11.get(integer17 + fp31.getStepX(), integer16 + fp31.getStepZ()) == 1) {
-                                        list2.add(fp31);
+                                for (final Direction fz31 : Direction.Plane.HORIZONTAL) {
+                                    if (g11.get(integer17 + fz31.getStepX(), integer16 + fz31.getStepZ()) == 1) {
+                                        list2.add(fz31);
                                     }
                                 }
                             }
-                            Direction fp32 = null;
+                            Direction fz32 = null;
                             if (!list2.isEmpty()) {
-                                fp32 = list2.get(this.random.nextInt(list2.size()));
+                                fz32 = list2.get(this.random.nextInt(list2.size()));
                             }
                             else if ((integer18 & 0x100000) == 0x100000) {
-                                fp32 = Direction.UP;
+                                fz32 = Direction.UP;
                             }
-                            BlockPos fk4 = fk2.relative(btu.rotate(Direction.SOUTH), 8 + (integer16 - this.startY) * 8);
-                            fk4 = fk4.relative(btu.rotate(Direction.EAST), -1 + (integer17 - this.startX) * 8);
+                            BlockPos fu4 = fu2.relative(cap.rotate(Direction.SOUTH), 8 + (integer16 - this.startY) * 8);
+                            fu4 = fu4.relative(cap.rotate(Direction.EAST), -1 + (integer17 - this.startX) * 8);
                             if (MansionGrid.isHouse(g11, integer17 - 1, integer16) && !c.isRoomId(g11, integer17 - 1, integer16, integer13, integer20)) {
-                                list.add(new WoodlandMansionPiece(this.structureManager, (fp32 == Direction.WEST) ? string22 : string21, fk4, btu));
+                                list.add(new WoodlandMansionPiece(this.structureManager, (fz32 == Direction.WEST) ? string22 : string21, fu4, cap));
                             }
                             if (g11.get(integer17 + 1, integer16) == 1 && !boolean14) {
-                                final BlockPos fk5 = fk4.relative(btu.rotate(Direction.EAST), 8);
-                                list.add(new WoodlandMansionPiece(this.structureManager, (fp32 == Direction.EAST) ? string22 : string21, fk5, btu));
+                                final BlockPos fu5 = fu4.relative(cap.rotate(Direction.EAST), 8);
+                                list.add(new WoodlandMansionPiece(this.structureManager, (fz32 == Direction.EAST) ? string22 : string21, fu5, cap));
                             }
                             if (MansionGrid.isHouse(g11, integer17, integer16 + 1) && !c.isRoomId(g11, integer17, integer16 + 1, integer13, integer20)) {
-                                BlockPos fk5 = fk4.relative(btu.rotate(Direction.SOUTH), 7);
-                                fk5 = fk5.relative(btu.rotate(Direction.EAST), 7);
-                                list.add(new WoodlandMansionPiece(this.structureManager, (fp32 == Direction.SOUTH) ? string22 : string21, fk5, btu.getRotated(Rotation.CLOCKWISE_90)));
+                                BlockPos fu5 = fu4.relative(cap.rotate(Direction.SOUTH), 7);
+                                fu5 = fu5.relative(cap.rotate(Direction.EAST), 7);
+                                list.add(new WoodlandMansionPiece(this.structureManager, (fz32 == Direction.SOUTH) ? string22 : string21, fu5, cap.getRotated(Rotation.CLOCKWISE_90)));
                             }
                             if (g11.get(integer17, integer16 - 1) == 1 && !boolean14) {
-                                BlockPos fk5 = fk4.relative(btu.rotate(Direction.NORTH), 1);
-                                fk5 = fk5.relative(btu.rotate(Direction.EAST), 7);
-                                list.add(new WoodlandMansionPiece(this.structureManager, (fp32 == Direction.NORTH) ? string22 : string21, fk5, btu.getRotated(Rotation.CLOCKWISE_90)));
+                                BlockPos fu5 = fu4.relative(cap.rotate(Direction.NORTH), 1);
+                                fu5 = fu5.relative(cap.rotate(Direction.EAST), 7);
+                                list.add(new WoodlandMansionPiece(this.structureManager, (fz32 == Direction.NORTH) ? string22 : string21, fu5, cap.getRotated(Rotation.CLOCKWISE_90)));
                             }
                             if (integer19 == 65536) {
-                                this.addRoom1x1(list, fk4, btu, fp32, arr14[integer13]);
+                                this.addRoom1x1(list, fu4, cap, fz32, arr14[integer13]);
                             }
-                            else if (integer19 == 131072 && fp32 != null) {
-                                final Direction fp33 = c.get1x2RoomDirection(g11, integer17, integer16, integer13, integer20);
+                            else if (integer19 == 131072 && fz32 != null) {
+                                final Direction fz33 = c.get1x2RoomDirection(g11, integer17, integer16, integer13, integer20);
                                 final boolean boolean15 = (integer18 & 0x400000) == 0x400000;
-                                this.addRoom1x2(list, fk4, btu, fp33, fp32, arr14[integer13], boolean15);
+                                this.addRoom1x2(list, fu4, cap, fz33, fz32, arr14[integer13], boolean15);
                             }
-                            else if (integer19 == 262144 && fp32 != null && fp32 != Direction.UP) {
-                                Direction fp33 = fp32.getClockWise();
-                                if (!c.isRoomId(g11, integer17 + fp33.getStepX(), integer16 + fp33.getStepZ(), integer13, integer20)) {
-                                    fp33 = fp33.getOpposite();
+                            else if (integer19 == 262144 && fz32 != null && fz32 != Direction.UP) {
+                                Direction fz33 = fz32.getClockWise();
+                                if (!c.isRoomId(g11, integer17 + fz33.getStepX(), integer16 + fz33.getStepZ(), integer13, integer20)) {
+                                    fz33 = fz33.getOpposite();
                                 }
-                                this.addRoom2x2(list, fk4, btu, fp33, fp32, arr14[integer13]);
+                                this.addRoom2x2(list, fu4, cap, fz33, fz32, arr14[integer13]);
                             }
-                            else if (integer19 == 262144 && fp32 == Direction.UP) {
-                                this.addRoom2x2Secret(list, fk4, btu, arr14[integer13]);
+                            else if (integer19 == 262144 && fz32 == Direction.UP) {
+                                this.addRoom2x2Secret(list, fu4, cap, arr14[integer13]);
                             }
                         }
                     }
@@ -279,62 +279,62 @@ public class WoodlandMansionPieces {
             }
         }
         
-        private void traverseOuterWalls(final List<WoodlandMansionPiece> list, final PlacementData e, final SimpleGrid g, Direction fp, final int integer5, final int integer6, final int integer7, final int integer8) {
+        private void traverseOuterWalls(final List<WoodlandMansionPiece> list, final PlacementData e, final SimpleGrid g, Direction fz, final int integer5, final int integer6, final int integer7, final int integer8) {
             int integer9 = integer5;
             int integer10 = integer6;
-            final Direction fp2 = fp;
+            final Direction fz2 = fz;
             do {
-                if (!MansionGrid.isHouse(g, integer9 + fp.getStepX(), integer10 + fp.getStepZ())) {
+                if (!MansionGrid.isHouse(g, integer9 + fz.getStepX(), integer10 + fz.getStepZ())) {
                     this.traverseTurn(list, e);
-                    fp = fp.getClockWise();
-                    if (integer9 == integer7 && integer10 == integer8 && fp2 == fp) {
+                    fz = fz.getClockWise();
+                    if (integer9 == integer7 && integer10 == integer8 && fz2 == fz) {
                         continue;
                     }
                     this.traverseWallPiece(list, e);
                 }
-                else if (MansionGrid.isHouse(g, integer9 + fp.getStepX(), integer10 + fp.getStepZ()) && MansionGrid.isHouse(g, integer9 + fp.getStepX() + fp.getCounterClockWise().getStepX(), integer10 + fp.getStepZ() + fp.getCounterClockWise().getStepZ())) {
+                else if (MansionGrid.isHouse(g, integer9 + fz.getStepX(), integer10 + fz.getStepZ()) && MansionGrid.isHouse(g, integer9 + fz.getStepX() + fz.getCounterClockWise().getStepX(), integer10 + fz.getStepZ() + fz.getCounterClockWise().getStepZ())) {
                     this.traverseInnerTurn(list, e);
-                    integer9 += fp.getStepX();
-                    integer10 += fp.getStepZ();
-                    fp = fp.getCounterClockWise();
+                    integer9 += fz.getStepX();
+                    integer10 += fz.getStepZ();
+                    fz = fz.getCounterClockWise();
                 }
                 else {
-                    integer9 += fp.getStepX();
-                    integer10 += fp.getStepZ();
-                    if (integer9 == integer7 && integer10 == integer8 && fp2 == fp) {
+                    integer9 += fz.getStepX();
+                    integer10 += fz.getStepZ();
+                    if (integer9 == integer7 && integer10 == integer8 && fz2 == fz) {
                         continue;
                     }
                     this.traverseWallPiece(list, e);
                 }
-            } while (integer9 != integer7 || integer10 != integer8 || fp2 != fp);
+            } while (integer9 != integer7 || integer10 != integer8 || fz2 != fz);
         }
         
-        private void createRoof(final List<WoodlandMansionPiece> list, final BlockPos fk, final Rotation btu, final SimpleGrid g4, @Nullable final SimpleGrid g5) {
+        private void createRoof(final List<WoodlandMansionPiece> list, final BlockPos fu, final Rotation cap, final SimpleGrid g4, @Nullable final SimpleGrid g5) {
             for (int integer7 = 0; integer7 < g4.height; ++integer7) {
                 for (int integer8 = 0; integer8 < g4.width; ++integer8) {
-                    BlockPos fk2 = fk;
-                    fk2 = fk2.relative(btu.rotate(Direction.SOUTH), 8 + (integer7 - this.startY) * 8);
-                    fk2 = fk2.relative(btu.rotate(Direction.EAST), (integer8 - this.startX) * 8);
+                    BlockPos fu2 = fu;
+                    fu2 = fu2.relative(cap.rotate(Direction.SOUTH), 8 + (integer7 - this.startY) * 8);
+                    fu2 = fu2.relative(cap.rotate(Direction.EAST), (integer8 - this.startX) * 8);
                     final boolean boolean10 = g5 != null && MansionGrid.isHouse(g5, integer8, integer7);
                     if (MansionGrid.isHouse(g4, integer8, integer7) && !boolean10) {
-                        list.add(new WoodlandMansionPiece(this.structureManager, "roof", fk2.above(3), btu));
+                        list.add(new WoodlandMansionPiece(this.structureManager, "roof", fu2.above(3), cap));
                         if (!MansionGrid.isHouse(g4, integer8 + 1, integer7)) {
-                            final BlockPos fk3 = fk2.relative(btu.rotate(Direction.EAST), 6);
-                            list.add(new WoodlandMansionPiece(this.structureManager, "roof_front", fk3, btu));
+                            final BlockPos fu3 = fu2.relative(cap.rotate(Direction.EAST), 6);
+                            list.add(new WoodlandMansionPiece(this.structureManager, "roof_front", fu3, cap));
                         }
                         if (!MansionGrid.isHouse(g4, integer8 - 1, integer7)) {
-                            BlockPos fk3 = fk2.relative(btu.rotate(Direction.EAST), 0);
-                            fk3 = fk3.relative(btu.rotate(Direction.SOUTH), 7);
-                            list.add(new WoodlandMansionPiece(this.structureManager, "roof_front", fk3, btu.getRotated(Rotation.CLOCKWISE_180)));
+                            BlockPos fu3 = fu2.relative(cap.rotate(Direction.EAST), 0);
+                            fu3 = fu3.relative(cap.rotate(Direction.SOUTH), 7);
+                            list.add(new WoodlandMansionPiece(this.structureManager, "roof_front", fu3, cap.getRotated(Rotation.CLOCKWISE_180)));
                         }
                         if (!MansionGrid.isHouse(g4, integer8, integer7 - 1)) {
-                            final BlockPos fk3 = fk2.relative(btu.rotate(Direction.WEST), 1);
-                            list.add(new WoodlandMansionPiece(this.structureManager, "roof_front", fk3, btu.getRotated(Rotation.COUNTERCLOCKWISE_90)));
+                            final BlockPos fu3 = fu2.relative(cap.rotate(Direction.WEST), 1);
+                            list.add(new WoodlandMansionPiece(this.structureManager, "roof_front", fu3, cap.getRotated(Rotation.COUNTERCLOCKWISE_90)));
                         }
                         if (!MansionGrid.isHouse(g4, integer8, integer7 + 1)) {
-                            BlockPos fk3 = fk2.relative(btu.rotate(Direction.EAST), 6);
-                            fk3 = fk3.relative(btu.rotate(Direction.SOUTH), 6);
-                            list.add(new WoodlandMansionPiece(this.structureManager, "roof_front", fk3, btu.getRotated(Rotation.CLOCKWISE_90)));
+                            BlockPos fu3 = fu2.relative(cap.rotate(Direction.EAST), 6);
+                            fu3 = fu3.relative(cap.rotate(Direction.SOUTH), 6);
+                            list.add(new WoodlandMansionPiece(this.structureManager, "roof_front", fu3, cap.getRotated(Rotation.CLOCKWISE_90)));
                         }
                     }
                 }
@@ -342,52 +342,52 @@ public class WoodlandMansionPieces {
             if (g5 != null) {
                 for (int integer7 = 0; integer7 < g4.height; ++integer7) {
                     for (int integer8 = 0; integer8 < g4.width; ++integer8) {
-                        BlockPos fk2 = fk;
-                        fk2 = fk2.relative(btu.rotate(Direction.SOUTH), 8 + (integer7 - this.startY) * 8);
-                        fk2 = fk2.relative(btu.rotate(Direction.EAST), (integer8 - this.startX) * 8);
+                        BlockPos fu2 = fu;
+                        fu2 = fu2.relative(cap.rotate(Direction.SOUTH), 8 + (integer7 - this.startY) * 8);
+                        fu2 = fu2.relative(cap.rotate(Direction.EAST), (integer8 - this.startX) * 8);
                         final boolean boolean10 = MansionGrid.isHouse(g5, integer8, integer7);
                         if (MansionGrid.isHouse(g4, integer8, integer7) && boolean10) {
                             if (!MansionGrid.isHouse(g4, integer8 + 1, integer7)) {
-                                final BlockPos fk3 = fk2.relative(btu.rotate(Direction.EAST), 7);
-                                list.add(new WoodlandMansionPiece(this.structureManager, "small_wall", fk3, btu));
+                                final BlockPos fu3 = fu2.relative(cap.rotate(Direction.EAST), 7);
+                                list.add(new WoodlandMansionPiece(this.structureManager, "small_wall", fu3, cap));
                             }
                             if (!MansionGrid.isHouse(g4, integer8 - 1, integer7)) {
-                                BlockPos fk3 = fk2.relative(btu.rotate(Direction.WEST), 1);
-                                fk3 = fk3.relative(btu.rotate(Direction.SOUTH), 6);
-                                list.add(new WoodlandMansionPiece(this.structureManager, "small_wall", fk3, btu.getRotated(Rotation.CLOCKWISE_180)));
+                                BlockPos fu3 = fu2.relative(cap.rotate(Direction.WEST), 1);
+                                fu3 = fu3.relative(cap.rotate(Direction.SOUTH), 6);
+                                list.add(new WoodlandMansionPiece(this.structureManager, "small_wall", fu3, cap.getRotated(Rotation.CLOCKWISE_180)));
                             }
                             if (!MansionGrid.isHouse(g4, integer8, integer7 - 1)) {
-                                BlockPos fk3 = fk2.relative(btu.rotate(Direction.WEST), 0);
-                                fk3 = fk3.relative(btu.rotate(Direction.NORTH), 1);
-                                list.add(new WoodlandMansionPiece(this.structureManager, "small_wall", fk3, btu.getRotated(Rotation.COUNTERCLOCKWISE_90)));
+                                BlockPos fu3 = fu2.relative(cap.rotate(Direction.WEST), 0);
+                                fu3 = fu3.relative(cap.rotate(Direction.NORTH), 1);
+                                list.add(new WoodlandMansionPiece(this.structureManager, "small_wall", fu3, cap.getRotated(Rotation.COUNTERCLOCKWISE_90)));
                             }
                             if (!MansionGrid.isHouse(g4, integer8, integer7 + 1)) {
-                                BlockPos fk3 = fk2.relative(btu.rotate(Direction.EAST), 6);
-                                fk3 = fk3.relative(btu.rotate(Direction.SOUTH), 7);
-                                list.add(new WoodlandMansionPiece(this.structureManager, "small_wall", fk3, btu.getRotated(Rotation.CLOCKWISE_90)));
+                                BlockPos fu3 = fu2.relative(cap.rotate(Direction.EAST), 6);
+                                fu3 = fu3.relative(cap.rotate(Direction.SOUTH), 7);
+                                list.add(new WoodlandMansionPiece(this.structureManager, "small_wall", fu3, cap.getRotated(Rotation.CLOCKWISE_90)));
                             }
                             if (!MansionGrid.isHouse(g4, integer8 + 1, integer7)) {
                                 if (!MansionGrid.isHouse(g4, integer8, integer7 - 1)) {
-                                    BlockPos fk3 = fk2.relative(btu.rotate(Direction.EAST), 7);
-                                    fk3 = fk3.relative(btu.rotate(Direction.NORTH), 2);
-                                    list.add(new WoodlandMansionPiece(this.structureManager, "small_wall_corner", fk3, btu));
+                                    BlockPos fu3 = fu2.relative(cap.rotate(Direction.EAST), 7);
+                                    fu3 = fu3.relative(cap.rotate(Direction.NORTH), 2);
+                                    list.add(new WoodlandMansionPiece(this.structureManager, "small_wall_corner", fu3, cap));
                                 }
                                 if (!MansionGrid.isHouse(g4, integer8, integer7 + 1)) {
-                                    BlockPos fk3 = fk2.relative(btu.rotate(Direction.EAST), 8);
-                                    fk3 = fk3.relative(btu.rotate(Direction.SOUTH), 7);
-                                    list.add(new WoodlandMansionPiece(this.structureManager, "small_wall_corner", fk3, btu.getRotated(Rotation.CLOCKWISE_90)));
+                                    BlockPos fu3 = fu2.relative(cap.rotate(Direction.EAST), 8);
+                                    fu3 = fu3.relative(cap.rotate(Direction.SOUTH), 7);
+                                    list.add(new WoodlandMansionPiece(this.structureManager, "small_wall_corner", fu3, cap.getRotated(Rotation.CLOCKWISE_90)));
                                 }
                             }
                             if (!MansionGrid.isHouse(g4, integer8 - 1, integer7)) {
                                 if (!MansionGrid.isHouse(g4, integer8, integer7 - 1)) {
-                                    BlockPos fk3 = fk2.relative(btu.rotate(Direction.WEST), 2);
-                                    fk3 = fk3.relative(btu.rotate(Direction.NORTH), 1);
-                                    list.add(new WoodlandMansionPiece(this.structureManager, "small_wall_corner", fk3, btu.getRotated(Rotation.COUNTERCLOCKWISE_90)));
+                                    BlockPos fu3 = fu2.relative(cap.rotate(Direction.WEST), 2);
+                                    fu3 = fu3.relative(cap.rotate(Direction.NORTH), 1);
+                                    list.add(new WoodlandMansionPiece(this.structureManager, "small_wall_corner", fu3, cap.getRotated(Rotation.COUNTERCLOCKWISE_90)));
                                 }
                                 if (!MansionGrid.isHouse(g4, integer8, integer7 + 1)) {
-                                    BlockPos fk3 = fk2.relative(btu.rotate(Direction.WEST), 1);
-                                    fk3 = fk3.relative(btu.rotate(Direction.SOUTH), 8);
-                                    list.add(new WoodlandMansionPiece(this.structureManager, "small_wall_corner", fk3, btu.getRotated(Rotation.CLOCKWISE_180)));
+                                    BlockPos fu3 = fu2.relative(cap.rotate(Direction.WEST), 1);
+                                    fu3 = fu3.relative(cap.rotate(Direction.SOUTH), 8);
+                                    list.add(new WoodlandMansionPiece(this.structureManager, "small_wall_corner", fu3, cap.getRotated(Rotation.CLOCKWISE_180)));
                                 }
                             }
                         }
@@ -396,48 +396,48 @@ public class WoodlandMansionPieces {
             }
             for (int integer7 = 0; integer7 < g4.height; ++integer7) {
                 for (int integer8 = 0; integer8 < g4.width; ++integer8) {
-                    BlockPos fk2 = fk;
-                    fk2 = fk2.relative(btu.rotate(Direction.SOUTH), 8 + (integer7 - this.startY) * 8);
-                    fk2 = fk2.relative(btu.rotate(Direction.EAST), (integer8 - this.startX) * 8);
+                    BlockPos fu2 = fu;
+                    fu2 = fu2.relative(cap.rotate(Direction.SOUTH), 8 + (integer7 - this.startY) * 8);
+                    fu2 = fu2.relative(cap.rotate(Direction.EAST), (integer8 - this.startX) * 8);
                     final boolean boolean10 = g5 != null && MansionGrid.isHouse(g5, integer8, integer7);
                     if (MansionGrid.isHouse(g4, integer8, integer7) && !boolean10) {
                         if (!MansionGrid.isHouse(g4, integer8 + 1, integer7)) {
-                            final BlockPos fk3 = fk2.relative(btu.rotate(Direction.EAST), 6);
+                            final BlockPos fu3 = fu2.relative(cap.rotate(Direction.EAST), 6);
                             if (!MansionGrid.isHouse(g4, integer8, integer7 + 1)) {
-                                final BlockPos fk4 = fk3.relative(btu.rotate(Direction.SOUTH), 6);
-                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_corner", fk4, btu));
+                                final BlockPos fu4 = fu3.relative(cap.rotate(Direction.SOUTH), 6);
+                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_corner", fu4, cap));
                             }
                             else if (MansionGrid.isHouse(g4, integer8 + 1, integer7 + 1)) {
-                                final BlockPos fk4 = fk3.relative(btu.rotate(Direction.SOUTH), 5);
-                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_inner_corner", fk4, btu));
+                                final BlockPos fu4 = fu3.relative(cap.rotate(Direction.SOUTH), 5);
+                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_inner_corner", fu4, cap));
                             }
                             if (!MansionGrid.isHouse(g4, integer8, integer7 - 1)) {
-                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_corner", fk3, btu.getRotated(Rotation.COUNTERCLOCKWISE_90)));
+                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_corner", fu3, cap.getRotated(Rotation.COUNTERCLOCKWISE_90)));
                             }
                             else if (MansionGrid.isHouse(g4, integer8 + 1, integer7 - 1)) {
-                                BlockPos fk4 = fk2.relative(btu.rotate(Direction.EAST), 9);
-                                fk4 = fk4.relative(btu.rotate(Direction.NORTH), 2);
-                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_inner_corner", fk4, btu.getRotated(Rotation.CLOCKWISE_90)));
+                                BlockPos fu4 = fu2.relative(cap.rotate(Direction.EAST), 9);
+                                fu4 = fu4.relative(cap.rotate(Direction.NORTH), 2);
+                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_inner_corner", fu4, cap.getRotated(Rotation.CLOCKWISE_90)));
                             }
                         }
                         if (!MansionGrid.isHouse(g4, integer8 - 1, integer7)) {
-                            BlockPos fk3 = fk2.relative(btu.rotate(Direction.EAST), 0);
-                            fk3 = fk3.relative(btu.rotate(Direction.SOUTH), 0);
+                            BlockPos fu3 = fu2.relative(cap.rotate(Direction.EAST), 0);
+                            fu3 = fu3.relative(cap.rotate(Direction.SOUTH), 0);
                             if (!MansionGrid.isHouse(g4, integer8, integer7 + 1)) {
-                                final BlockPos fk4 = fk3.relative(btu.rotate(Direction.SOUTH), 6);
-                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_corner", fk4, btu.getRotated(Rotation.CLOCKWISE_90)));
+                                final BlockPos fu4 = fu3.relative(cap.rotate(Direction.SOUTH), 6);
+                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_corner", fu4, cap.getRotated(Rotation.CLOCKWISE_90)));
                             }
                             else if (MansionGrid.isHouse(g4, integer8 - 1, integer7 + 1)) {
-                                BlockPos fk4 = fk3.relative(btu.rotate(Direction.SOUTH), 8);
-                                fk4 = fk4.relative(btu.rotate(Direction.WEST), 3);
-                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_inner_corner", fk4, btu.getRotated(Rotation.COUNTERCLOCKWISE_90)));
+                                BlockPos fu4 = fu3.relative(cap.rotate(Direction.SOUTH), 8);
+                                fu4 = fu4.relative(cap.rotate(Direction.WEST), 3);
+                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_inner_corner", fu4, cap.getRotated(Rotation.COUNTERCLOCKWISE_90)));
                             }
                             if (!MansionGrid.isHouse(g4, integer8, integer7 - 1)) {
-                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_corner", fk3, btu.getRotated(Rotation.CLOCKWISE_180)));
+                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_corner", fu3, cap.getRotated(Rotation.CLOCKWISE_180)));
                             }
                             else if (MansionGrid.isHouse(g4, integer8 - 1, integer7 - 1)) {
-                                final BlockPos fk4 = fk3.relative(btu.rotate(Direction.SOUTH), 1);
-                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_inner_corner", fk4, btu.getRotated(Rotation.CLOCKWISE_180)));
+                                final BlockPos fu4 = fu3.relative(cap.rotate(Direction.SOUTH), 1);
+                                list.add(new WoodlandMansionPiece(this.structureManager, "roof_inner_corner", fu4, cap.getRotated(Rotation.CLOCKWISE_180)));
                             }
                         }
                     }
@@ -446,8 +446,8 @@ public class WoodlandMansionPieces {
         }
         
         private void entrance(final List<WoodlandMansionPiece> list, final PlacementData e) {
-            final Direction fp4 = e.rotation.rotate(Direction.WEST);
-            list.add(new WoodlandMansionPiece(this.structureManager, "entrance", e.position.relative(fp4, 9), e.rotation));
+            final Direction fz4 = e.rotation.rotate(Direction.WEST);
+            list.add(new WoodlandMansionPiece(this.structureManager, "entrance", e.position.relative(fz4, 9), e.rotation));
             e.position = e.position.relative(e.rotation.rotate(Direction.SOUTH), 16);
         }
         
@@ -470,149 +470,149 @@ public class WoodlandMansionPieces {
             e.rotation = e.rotation.getRotated(Rotation.COUNTERCLOCKWISE_90);
         }
         
-        private void addRoom1x1(final List<WoodlandMansionPiece> list, final BlockPos fk, final Rotation btu, final Direction fp, final FloorRoomCollection b) {
-            Rotation btu2 = Rotation.NONE;
+        private void addRoom1x1(final List<WoodlandMansionPiece> list, final BlockPos fu, final Rotation cap, final Direction fz, final FloorRoomCollection b) {
+            Rotation cap2 = Rotation.NONE;
             String string8 = b.get1x1(this.random);
-            if (fp != Direction.EAST) {
-                if (fp == Direction.NORTH) {
-                    btu2 = btu2.getRotated(Rotation.COUNTERCLOCKWISE_90);
+            if (fz != Direction.EAST) {
+                if (fz == Direction.NORTH) {
+                    cap2 = cap2.getRotated(Rotation.COUNTERCLOCKWISE_90);
                 }
-                else if (fp == Direction.WEST) {
-                    btu2 = btu2.getRotated(Rotation.CLOCKWISE_180);
+                else if (fz == Direction.WEST) {
+                    cap2 = cap2.getRotated(Rotation.CLOCKWISE_180);
                 }
-                else if (fp == Direction.SOUTH) {
-                    btu2 = btu2.getRotated(Rotation.CLOCKWISE_90);
+                else if (fz == Direction.SOUTH) {
+                    cap2 = cap2.getRotated(Rotation.CLOCKWISE_90);
                 }
                 else {
                     string8 = b.get1x1Secret(this.random);
                 }
             }
-            BlockPos fk2 = StructureTemplate.getZeroPositionWithTransform(new BlockPos(1, 0, 0), Mirror.NONE, btu2, 7, 7);
-            btu2 = btu2.getRotated(btu);
-            fk2 = fk2.rotate(btu);
-            final BlockPos fk3 = fk.offset(fk2.getX(), 0, fk2.getZ());
-            list.add(new WoodlandMansionPiece(this.structureManager, string8, fk3, btu2));
+            BlockPos fu2 = StructureTemplate.getZeroPositionWithTransform(new BlockPos(1, 0, 0), Mirror.NONE, cap2, 7, 7);
+            cap2 = cap2.getRotated(cap);
+            fu2 = fu2.rotate(cap);
+            final BlockPos fu3 = fu.offset(fu2.getX(), 0, fu2.getZ());
+            list.add(new WoodlandMansionPiece(this.structureManager, string8, fu3, cap2));
         }
         
-        private void addRoom1x2(final List<WoodlandMansionPiece> list, final BlockPos fk, final Rotation btu, final Direction fp4, final Direction fp5, final FloorRoomCollection b, final boolean boolean7) {
-            if (fp5 == Direction.EAST && fp4 == Direction.SOUTH) {
-                final BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 1);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fk2, btu));
+        private void addRoom1x2(final List<WoodlandMansionPiece> list, final BlockPos fu, final Rotation cap, final Direction fz4, final Direction fz5, final FloorRoomCollection b, final boolean boolean7) {
+            if (fz5 == Direction.EAST && fz4 == Direction.SOUTH) {
+                final BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 1);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fu2, cap));
             }
-            else if (fp5 == Direction.EAST && fp4 == Direction.NORTH) {
-                BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 1);
-                fk2 = fk2.relative(btu.rotate(Direction.SOUTH), 6);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fk2, btu, Mirror.LEFT_RIGHT));
+            else if (fz5 == Direction.EAST && fz4 == Direction.NORTH) {
+                BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 1);
+                fu2 = fu2.relative(cap.rotate(Direction.SOUTH), 6);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fu2, cap, Mirror.LEFT_RIGHT));
             }
-            else if (fp5 == Direction.WEST && fp4 == Direction.NORTH) {
-                BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 7);
-                fk2 = fk2.relative(btu.rotate(Direction.SOUTH), 6);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fk2, btu.getRotated(Rotation.CLOCKWISE_180)));
+            else if (fz5 == Direction.WEST && fz4 == Direction.NORTH) {
+                BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 7);
+                fu2 = fu2.relative(cap.rotate(Direction.SOUTH), 6);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fu2, cap.getRotated(Rotation.CLOCKWISE_180)));
             }
-            else if (fp5 == Direction.WEST && fp4 == Direction.SOUTH) {
-                final BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 7);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fk2, btu, Mirror.FRONT_BACK));
+            else if (fz5 == Direction.WEST && fz4 == Direction.SOUTH) {
+                final BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 7);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fu2, cap, Mirror.FRONT_BACK));
             }
-            else if (fp5 == Direction.SOUTH && fp4 == Direction.EAST) {
-                final BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 1);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fk2, btu.getRotated(Rotation.CLOCKWISE_90), Mirror.LEFT_RIGHT));
+            else if (fz5 == Direction.SOUTH && fz4 == Direction.EAST) {
+                final BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 1);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fu2, cap.getRotated(Rotation.CLOCKWISE_90), Mirror.LEFT_RIGHT));
             }
-            else if (fp5 == Direction.SOUTH && fp4 == Direction.WEST) {
-                final BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 7);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fk2, btu.getRotated(Rotation.CLOCKWISE_90)));
+            else if (fz5 == Direction.SOUTH && fz4 == Direction.WEST) {
+                final BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 7);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fu2, cap.getRotated(Rotation.CLOCKWISE_90)));
             }
-            else if (fp5 == Direction.NORTH && fp4 == Direction.WEST) {
-                BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 7);
-                fk2 = fk2.relative(btu.rotate(Direction.SOUTH), 6);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fk2, btu.getRotated(Rotation.CLOCKWISE_90), Mirror.FRONT_BACK));
+            else if (fz5 == Direction.NORTH && fz4 == Direction.WEST) {
+                BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 7);
+                fu2 = fu2.relative(cap.rotate(Direction.SOUTH), 6);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fu2, cap.getRotated(Rotation.CLOCKWISE_90), Mirror.FRONT_BACK));
             }
-            else if (fp5 == Direction.NORTH && fp4 == Direction.EAST) {
-                BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 1);
-                fk2 = fk2.relative(btu.rotate(Direction.SOUTH), 6);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fk2, btu.getRotated(Rotation.COUNTERCLOCKWISE_90)));
+            else if (fz5 == Direction.NORTH && fz4 == Direction.EAST) {
+                BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 1);
+                fu2 = fu2.relative(cap.rotate(Direction.SOUTH), 6);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2SideEntrance(this.random, boolean7), fu2, cap.getRotated(Rotation.COUNTERCLOCKWISE_90)));
             }
-            else if (fp5 == Direction.SOUTH && fp4 == Direction.NORTH) {
-                BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 1);
-                fk2 = fk2.relative(btu.rotate(Direction.NORTH), 8);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2FrontEntrance(this.random, boolean7), fk2, btu));
+            else if (fz5 == Direction.SOUTH && fz4 == Direction.NORTH) {
+                BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 1);
+                fu2 = fu2.relative(cap.rotate(Direction.NORTH), 8);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2FrontEntrance(this.random, boolean7), fu2, cap));
             }
-            else if (fp5 == Direction.NORTH && fp4 == Direction.SOUTH) {
-                BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 7);
-                fk2 = fk2.relative(btu.rotate(Direction.SOUTH), 14);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2FrontEntrance(this.random, boolean7), fk2, btu.getRotated(Rotation.CLOCKWISE_180)));
+            else if (fz5 == Direction.NORTH && fz4 == Direction.SOUTH) {
+                BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 7);
+                fu2 = fu2.relative(cap.rotate(Direction.SOUTH), 14);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2FrontEntrance(this.random, boolean7), fu2, cap.getRotated(Rotation.CLOCKWISE_180)));
             }
-            else if (fp5 == Direction.WEST && fp4 == Direction.EAST) {
-                final BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 15);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2FrontEntrance(this.random, boolean7), fk2, btu.getRotated(Rotation.CLOCKWISE_90)));
+            else if (fz5 == Direction.WEST && fz4 == Direction.EAST) {
+                final BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 15);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2FrontEntrance(this.random, boolean7), fu2, cap.getRotated(Rotation.CLOCKWISE_90)));
             }
-            else if (fp5 == Direction.EAST && fp4 == Direction.WEST) {
-                BlockPos fk2 = fk.relative(btu.rotate(Direction.WEST), 7);
-                fk2 = fk2.relative(btu.rotate(Direction.SOUTH), 6);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2FrontEntrance(this.random, boolean7), fk2, btu.getRotated(Rotation.COUNTERCLOCKWISE_90)));
+            else if (fz5 == Direction.EAST && fz4 == Direction.WEST) {
+                BlockPos fu2 = fu.relative(cap.rotate(Direction.WEST), 7);
+                fu2 = fu2.relative(cap.rotate(Direction.SOUTH), 6);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2FrontEntrance(this.random, boolean7), fu2, cap.getRotated(Rotation.COUNTERCLOCKWISE_90)));
             }
-            else if (fp5 == Direction.UP && fp4 == Direction.EAST) {
-                final BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 15);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2Secret(this.random), fk2, btu.getRotated(Rotation.CLOCKWISE_90)));
+            else if (fz5 == Direction.UP && fz4 == Direction.EAST) {
+                final BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 15);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2Secret(this.random), fu2, cap.getRotated(Rotation.CLOCKWISE_90)));
             }
-            else if (fp5 == Direction.UP && fp4 == Direction.SOUTH) {
-                BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 1);
-                fk2 = fk2.relative(btu.rotate(Direction.NORTH), 0);
-                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2Secret(this.random), fk2, btu));
+            else if (fz5 == Direction.UP && fz4 == Direction.SOUTH) {
+                BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 1);
+                fu2 = fu2.relative(cap.rotate(Direction.NORTH), 0);
+                list.add(new WoodlandMansionPiece(this.structureManager, b.get1x2Secret(this.random), fu2, cap));
             }
         }
         
-        private void addRoom2x2(final List<WoodlandMansionPiece> list, final BlockPos fk, final Rotation btu, final Direction fp4, final Direction fp5, final FloorRoomCollection b) {
+        private void addRoom2x2(final List<WoodlandMansionPiece> list, final BlockPos fu, final Rotation cap, final Direction fz4, final Direction fz5, final FloorRoomCollection b) {
             int integer8 = 0;
             int integer9 = 0;
-            Rotation btu2 = btu;
-            Mirror bsu11 = Mirror.NONE;
-            if (fp5 == Direction.EAST && fp4 == Direction.SOUTH) {
+            Rotation cap2 = cap;
+            Mirror bzj11 = Mirror.NONE;
+            if (fz5 == Direction.EAST && fz4 == Direction.SOUTH) {
                 integer8 = -7;
             }
-            else if (fp5 == Direction.EAST && fp4 == Direction.NORTH) {
+            else if (fz5 == Direction.EAST && fz4 == Direction.NORTH) {
                 integer8 = -7;
                 integer9 = 6;
-                bsu11 = Mirror.LEFT_RIGHT;
+                bzj11 = Mirror.LEFT_RIGHT;
             }
-            else if (fp5 == Direction.NORTH && fp4 == Direction.EAST) {
+            else if (fz5 == Direction.NORTH && fz4 == Direction.EAST) {
                 integer8 = 1;
                 integer9 = 14;
-                btu2 = btu.getRotated(Rotation.COUNTERCLOCKWISE_90);
+                cap2 = cap.getRotated(Rotation.COUNTERCLOCKWISE_90);
             }
-            else if (fp5 == Direction.NORTH && fp4 == Direction.WEST) {
+            else if (fz5 == Direction.NORTH && fz4 == Direction.WEST) {
                 integer8 = 7;
                 integer9 = 14;
-                btu2 = btu.getRotated(Rotation.COUNTERCLOCKWISE_90);
-                bsu11 = Mirror.LEFT_RIGHT;
+                cap2 = cap.getRotated(Rotation.COUNTERCLOCKWISE_90);
+                bzj11 = Mirror.LEFT_RIGHT;
             }
-            else if (fp5 == Direction.SOUTH && fp4 == Direction.WEST) {
+            else if (fz5 == Direction.SOUTH && fz4 == Direction.WEST) {
                 integer8 = 7;
                 integer9 = -8;
-                btu2 = btu.getRotated(Rotation.CLOCKWISE_90);
+                cap2 = cap.getRotated(Rotation.CLOCKWISE_90);
             }
-            else if (fp5 == Direction.SOUTH && fp4 == Direction.EAST) {
+            else if (fz5 == Direction.SOUTH && fz4 == Direction.EAST) {
                 integer8 = 1;
                 integer9 = -8;
-                btu2 = btu.getRotated(Rotation.CLOCKWISE_90);
-                bsu11 = Mirror.LEFT_RIGHT;
+                cap2 = cap.getRotated(Rotation.CLOCKWISE_90);
+                bzj11 = Mirror.LEFT_RIGHT;
             }
-            else if (fp5 == Direction.WEST && fp4 == Direction.NORTH) {
+            else if (fz5 == Direction.WEST && fz4 == Direction.NORTH) {
                 integer8 = 15;
                 integer9 = 6;
-                btu2 = btu.getRotated(Rotation.CLOCKWISE_180);
+                cap2 = cap.getRotated(Rotation.CLOCKWISE_180);
             }
-            else if (fp5 == Direction.WEST && fp4 == Direction.SOUTH) {
+            else if (fz5 == Direction.WEST && fz4 == Direction.SOUTH) {
                 integer8 = 15;
-                bsu11 = Mirror.FRONT_BACK;
+                bzj11 = Mirror.FRONT_BACK;
             }
-            BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), integer8);
-            fk2 = fk2.relative(btu.rotate(Direction.SOUTH), integer9);
-            list.add(new WoodlandMansionPiece(this.structureManager, b.get2x2(this.random), fk2, btu2, bsu11));
+            BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), integer8);
+            fu2 = fu2.relative(cap.rotate(Direction.SOUTH), integer9);
+            list.add(new WoodlandMansionPiece(this.structureManager, b.get2x2(this.random), fu2, cap2, bzj11));
         }
         
-        private void addRoom2x2Secret(final List<WoodlandMansionPiece> list, final BlockPos fk, final Rotation btu, final FloorRoomCollection b) {
-            final BlockPos fk2 = fk.relative(btu.rotate(Direction.EAST), 1);
-            list.add(new WoodlandMansionPiece(this.structureManager, b.get2x2Secret(this.random), fk2, btu, Mirror.NONE));
+        private void addRoom2x2Secret(final List<WoodlandMansionPiece> list, final BlockPos fu, final Rotation cap, final FloorRoomCollection b) {
+            final BlockPos fu2 = fu.relative(cap.rotate(Direction.EAST), 1);
+            list.add(new WoodlandMansionPiece(this.structureManager, b.get2x2Secret(this.random), fu2, cap, Mirror.NONE));
         }
     }
     
@@ -666,42 +666,42 @@ public class WoodlandMansionPieces {
         
         @Nullable
         public Direction get1x2RoomDirection(final SimpleGrid g, final int integer2, final int integer3, final int integer4, final int integer5) {
-            for (final Direction fp8 : Direction.Plane.HORIZONTAL) {
-                if (this.isRoomId(g, integer2 + fp8.getStepX(), integer3 + fp8.getStepZ(), integer4, integer5)) {
-                    return fp8;
+            for (final Direction fz8 : Direction.Plane.HORIZONTAL) {
+                if (this.isRoomId(g, integer2 + fz8.getStepX(), integer3 + fz8.getStepZ(), integer4, integer5)) {
+                    return fz8;
                 }
             }
             return null;
         }
         
-        private void recursiveCorridor(final SimpleGrid g, final int integer2, final int integer3, final Direction fp, final int integer5) {
+        private void recursiveCorridor(final SimpleGrid g, final int integer2, final int integer3, final Direction fz, final int integer5) {
             if (integer5 <= 0) {
                 return;
             }
             g.set(integer2, integer3, 1);
-            g.setif(integer2 + fp.getStepX(), integer3 + fp.getStepZ(), 0, 1);
+            g.setif(integer2 + fz.getStepX(), integer3 + fz.getStepZ(), 0, 1);
             for (int integer6 = 0; integer6 < 8; ++integer6) {
-                final Direction fp2 = Direction.from2DDataValue(this.random.nextInt(4));
-                if (fp2 != fp.getOpposite()) {
-                    if (fp2 != Direction.EAST || !this.random.nextBoolean()) {
-                        final int integer7 = integer2 + fp.getStepX();
-                        final int integer8 = integer3 + fp.getStepZ();
-                        if (g.get(integer7 + fp2.getStepX(), integer8 + fp2.getStepZ()) == 0 && g.get(integer7 + fp2.getStepX() * 2, integer8 + fp2.getStepZ() * 2) == 0) {
-                            this.recursiveCorridor(g, integer2 + fp.getStepX() + fp2.getStepX(), integer3 + fp.getStepZ() + fp2.getStepZ(), fp2, integer5 - 1);
+                final Direction fz2 = Direction.from2DDataValue(this.random.nextInt(4));
+                if (fz2 != fz.getOpposite()) {
+                    if (fz2 != Direction.EAST || !this.random.nextBoolean()) {
+                        final int integer7 = integer2 + fz.getStepX();
+                        final int integer8 = integer3 + fz.getStepZ();
+                        if (g.get(integer7 + fz2.getStepX(), integer8 + fz2.getStepZ()) == 0 && g.get(integer7 + fz2.getStepX() * 2, integer8 + fz2.getStepZ() * 2) == 0) {
+                            this.recursiveCorridor(g, integer2 + fz.getStepX() + fz2.getStepX(), integer3 + fz.getStepZ() + fz2.getStepZ(), fz2, integer5 - 1);
                             break;
                         }
                     }
                 }
             }
-            final Direction fp3 = fp.getClockWise();
-            final Direction fp2 = fp.getCounterClockWise();
-            g.setif(integer2 + fp3.getStepX(), integer3 + fp3.getStepZ(), 0, 2);
-            g.setif(integer2 + fp2.getStepX(), integer3 + fp2.getStepZ(), 0, 2);
-            g.setif(integer2 + fp.getStepX() + fp3.getStepX(), integer3 + fp.getStepZ() + fp3.getStepZ(), 0, 2);
-            g.setif(integer2 + fp.getStepX() + fp2.getStepX(), integer3 + fp.getStepZ() + fp2.getStepZ(), 0, 2);
-            g.setif(integer2 + fp.getStepX() * 2, integer3 + fp.getStepZ() * 2, 0, 2);
-            g.setif(integer2 + fp3.getStepX() * 2, integer3 + fp3.getStepZ() * 2, 0, 2);
-            g.setif(integer2 + fp2.getStepX() * 2, integer3 + fp2.getStepZ() * 2, 0, 2);
+            final Direction fz3 = fz.getClockWise();
+            final Direction fz2 = fz.getCounterClockWise();
+            g.setif(integer2 + fz3.getStepX(), integer3 + fz3.getStepZ(), 0, 2);
+            g.setif(integer2 + fz2.getStepX(), integer3 + fz2.getStepZ(), 0, 2);
+            g.setif(integer2 + fz.getStepX() + fz3.getStepX(), integer3 + fz.getStepZ() + fz3.getStepZ(), 0, 2);
+            g.setif(integer2 + fz.getStepX() + fz2.getStepX(), integer3 + fz.getStepZ() + fz2.getStepZ(), 0, 2);
+            g.setif(integer2 + fz.getStepX() * 2, integer3 + fz.getStepZ() * 2, 0, 2);
+            g.setif(integer2 + fz3.getStepX() * 2, integer3 + fz3.getStepZ() * 2, 0, 2);
+            g.setif(integer2 + fz2.getStepX() * 2, integer3 + fz2.getStepZ() * 2, 0, 2);
         }
         
         private boolean cleanEdges(final SimpleGrid g) {
@@ -751,18 +751,18 @@ public class WoodlandMansionPieces {
                 this.thirdFloorGrid.set(0, 0, this.thirdFloorGrid.width, this.thirdFloorGrid.height, 5);
                 return;
             }
-            final Tuple<Integer, Integer> abz4 = list2.get(this.random.nextInt(list2.size()));
-            int integer5 = g3.get(abz4.getA(), abz4.getB());
-            g3.set(abz4.getA(), abz4.getB(), integer5 | 0x400000);
-            final Direction fp6 = this.get1x2RoomDirection(this.baseGrid, abz4.getA(), abz4.getB(), 1, integer5 & 0xFFFF);
-            final int integer7 = abz4.getA() + fp6.getStepX();
-            final int integer8 = abz4.getB() + fp6.getStepZ();
+            final Tuple<Integer, Integer> aek4 = list2.get(this.random.nextInt(list2.size()));
+            int integer5 = g3.get(aek4.getA(), aek4.getB());
+            g3.set(aek4.getA(), aek4.getB(), integer5 | 0x400000);
+            final Direction fz6 = this.get1x2RoomDirection(this.baseGrid, aek4.getA(), aek4.getB(), 1, integer5 & 0xFFFF);
+            final int integer7 = aek4.getA() + fz6.getStepX();
+            final int integer8 = aek4.getB() + fz6.getStepZ();
             for (int integer9 = 0; integer9 < this.thirdFloorGrid.height; ++integer9) {
                 for (int integer10 = 0; integer10 < this.thirdFloorGrid.width; ++integer10) {
                     if (!isHouse(this.baseGrid, integer10, integer9)) {
                         this.thirdFloorGrid.set(integer10, integer9, 5);
                     }
-                    else if (integer10 == abz4.getA() && integer9 == abz4.getB()) {
+                    else if (integer10 == aek4.getA() && integer9 == aek4.getB()) {
                         this.thirdFloorGrid.set(integer10, integer9, 3);
                     }
                     else if (integer10 == integer7 && integer9 == integer8) {
@@ -772,18 +772,18 @@ public class WoodlandMansionPieces {
                 }
             }
             final List<Direction> list3 = Lists.newArrayList();
-            for (final Direction fp7 : Direction.Plane.HORIZONTAL) {
-                if (this.thirdFloorGrid.get(integer7 + fp7.getStepX(), integer8 + fp7.getStepZ()) == 0) {
-                    list3.add(fp7);
+            for (final Direction fz7 : Direction.Plane.HORIZONTAL) {
+                if (this.thirdFloorGrid.get(integer7 + fz7.getStepX(), integer8 + fz7.getStepZ()) == 0) {
+                    list3.add(fz7);
                 }
             }
             if (list3.isEmpty()) {
                 this.thirdFloorGrid.set(0, 0, this.thirdFloorGrid.width, this.thirdFloorGrid.height, 5);
-                g3.set(abz4.getA(), abz4.getB(), integer5);
+                g3.set(aek4.getA(), aek4.getB(), integer5);
                 return;
             }
-            final Direction fp8 = list3.get(this.random.nextInt(list3.size()));
-            this.recursiveCorridor(this.thirdFloorGrid, integer7 + fp8.getStepX(), integer8 + fp8.getStepZ(), fp8, 4);
+            final Direction fz8 = list3.get(this.random.nextInt(list3.size()));
+            this.recursiveCorridor(this.thirdFloorGrid, integer7 + fz8.getStepX(), integer8 + fz8.getStepZ(), fz8, 4);
             while (this.cleanEdges(this.thirdFloorGrid)) {}
         }
         
@@ -798,9 +798,9 @@ public class WoodlandMansionPieces {
             }
             Collections.shuffle(list4, this.random);
             int integer5 = 10;
-            for (final Tuple<Integer, Integer> abz7 : list4) {
-                final int integer7 = abz7.getA();
-                final int integer8 = abz7.getB();
+            for (final Tuple<Integer, Integer> aek7 : list4) {
+                final int integer7 = aek7.getA();
+                final int integer8 = aek7.getB();
                 if (g2.get(integer7, integer8) == 0) {
                     int integer9 = integer7;
                     int integer10 = integer7;
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/AlwaysTrueTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/AlwaysTrueTest.java
index 31dabad..3f61289 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/AlwaysTrueTest.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/AlwaysTrueTest.java
@@ -1,32 +1,28 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
 import java.util.Random;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class AlwaysTrueTest extends RuleTest {
+    public static final Codec<AlwaysTrueTest> CODEC;
     public static final AlwaysTrueTest INSTANCE;
     
     private AlwaysTrueTest() {
     }
     
     @Override
-    public boolean test(final BlockState byj, final Random random) {
+    public boolean test(final BlockState cfj, final Random random) {
         return true;
     }
     
     @Override
-    protected RuleTestType getType() {
+    protected RuleTestType<?> getType() {
         return RuleTestType.ALWAYS_TRUE_TEST;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.emptyMap());
-    }
-    
     static {
+        CODEC = Codec.unit(() -> AlwaysTrueTest.INSTANCE);
         INSTANCE = new AlwaysTrueTest();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/AxisAlignedLinearPosTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/AxisAlignedLinearPosTest.java
new file mode 100644
index 0000000..bbded1d
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/AxisAlignedLinearPosTest.java
@@ -0,0 +1,50 @@
+package net.minecraft.world.level.levelgen.structure.templatesystem;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.util.Mth;
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import com.mojang.serialization.Codec;
+
+public class AxisAlignedLinearPosTest extends PosRuleTest {
+    public static final Codec<AxisAlignedLinearPosTest> CODEC;
+    private final float minChance;
+    private final float maxChance;
+    private final int minDist;
+    private final int maxDist;
+    private final Direction.Axis axis;
+    
+    public AxisAlignedLinearPosTest(final float float1, final float float2, final int integer3, final int integer4, final Direction.Axis a) {
+        if (integer3 >= integer4) {
+            throw new IllegalArgumentException("Invalid range: [" + integer3 + "," + integer4 + "]");
+        }
+        this.minChance = float1;
+        this.maxChance = float2;
+        this.minDist = integer3;
+        this.maxDist = integer4;
+        this.axis = a;
+    }
+    
+    @Override
+    public boolean test(final BlockPos fu1, final BlockPos fu2, final BlockPos fu3, final Random random) {
+        final Direction fz6 = Direction.get(Direction.AxisDirection.POSITIVE, this.axis);
+        final float float7 = (float)Math.abs((fu2.getX() - fu3.getX()) * fz6.getStepX());
+        final float float8 = (float)Math.abs((fu2.getY() - fu3.getY()) * fz6.getStepY());
+        final float float9 = (float)Math.abs((fu2.getZ() - fu3.getZ()) * fz6.getStepZ());
+        final int integer10 = (int)(float7 + float8 + float9);
+        final float float10 = random.nextFloat();
+        return float10 <= Mth.clampedLerp(this.minChance, this.maxChance, Mth.inverseLerp(integer10, this.minDist, this.maxDist));
+    }
+    
+    @Override
+    protected PosRuleTestType<?> getType() {
+        return PosRuleTestType.AXIS_ALIGNED_LINEAR_POS_TEST;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.FLOAT.fieldOf("min_chance").withDefault(0.0f).forGetter(cuf -> cuf.minChance), (App)Codec.FLOAT.fieldOf("max_chance").withDefault(0.0f).forGetter(cuf -> cuf.maxChance), (App)Codec.INT.fieldOf("min_dist").withDefault(0).forGetter(cuf -> cuf.minDist), (App)Codec.INT.fieldOf("max_dist").withDefault(0).forGetter(cuf -> cuf.maxDist), (App)Direction.Axis.CODEC.fieldOf("axis").withDefault(Direction.Axis.Y).forGetter(cuf -> cuf.axis)).apply(instance, AxisAlignedLinearPosTest::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlackstoneReplaceProcessor.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlackstoneReplaceProcessor.java
new file mode 100644
index 0000000..c1324bd
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlackstoneReplaceProcessor.java
@@ -0,0 +1,82 @@
+package net.minecraft.world.level.levelgen.structure.templatesystem;
+
+import net.minecraft.world.level.block.state.StateHolder;
+import java.util.HashMap;
+import net.minecraft.world.level.block.state.properties.SlabType;
+import net.minecraft.world.level.block.SlabBlock;
+import net.minecraft.world.level.block.state.properties.Half;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.StairBlock;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.Util;
+import net.minecraft.world.level.block.Blocks;
+import com.google.common.collect.Maps;
+import net.minecraft.world.level.block.Block;
+import java.util.Map;
+import com.mojang.serialization.Codec;
+
+public class BlackstoneReplaceProcessor extends StructureProcessor {
+    public static final Codec<BlackstoneReplaceProcessor> CODEC;
+    public static final BlackstoneReplaceProcessor INSTANCE;
+    private final Map<Block, Block> replacements;
+    
+    private BlackstoneReplaceProcessor() {
+        this.replacements = Util.<Map<Block, Block>>make(Maps.newHashMap(), hashMap -> {
+            hashMap.put(Blocks.COBBLESTONE, Blocks.BLACKSTONE);
+            hashMap.put(Blocks.MOSSY_COBBLESTONE, Blocks.BLACKSTONE);
+            hashMap.put(Blocks.STONE, Blocks.POLISHED_BLACKSTONE);
+            hashMap.put(Blocks.STONE_BRICKS, Blocks.POLISHED_BLACKSTONE_BRICKS);
+            hashMap.put(Blocks.MOSSY_STONE_BRICKS, Blocks.POLISHED_BLACKSTONE_BRICKS);
+            hashMap.put(Blocks.COBBLESTONE_STAIRS, Blocks.BLACKSTONE_STAIRS);
+            hashMap.put(Blocks.MOSSY_COBBLESTONE_STAIRS, Blocks.BLACKSTONE_STAIRS);
+            hashMap.put(Blocks.STONE_STAIRS, Blocks.POLISHED_BLACKSTONE_STAIRS);
+            hashMap.put(Blocks.STONE_BRICK_STAIRS, Blocks.POLISHED_BLACKSTONE_BRICK_STAIRS);
+            hashMap.put(Blocks.MOSSY_STONE_BRICK_STAIRS, Blocks.POLISHED_BLACKSTONE_BRICK_STAIRS);
+            hashMap.put(Blocks.COBBLESTONE_SLAB, Blocks.BLACKSTONE_SLAB);
+            hashMap.put(Blocks.MOSSY_COBBLESTONE_SLAB, Blocks.BLACKSTONE_SLAB);
+            hashMap.put(Blocks.SMOOTH_STONE_SLAB, Blocks.POLISHED_BLACKSTONE_SLAB);
+            hashMap.put(Blocks.STONE_SLAB, Blocks.POLISHED_BLACKSTONE_SLAB);
+            hashMap.put(Blocks.STONE_BRICK_SLAB, Blocks.POLISHED_BLACKSTONE_BRICK_SLAB);
+            hashMap.put(Blocks.MOSSY_STONE_BRICK_SLAB, Blocks.POLISHED_BLACKSTONE_BRICK_SLAB);
+            hashMap.put(Blocks.STONE_BRICK_WALL, Blocks.POLISHED_BLACKSTONE_BRICK_WALL);
+            hashMap.put(Blocks.MOSSY_STONE_BRICK_WALL, Blocks.POLISHED_BLACKSTONE_BRICK_WALL);
+            hashMap.put(Blocks.COBBLESTONE_WALL, Blocks.BLACKSTONE_WALL);
+            hashMap.put(Blocks.MOSSY_COBBLESTONE_WALL, Blocks.BLACKSTONE_WALL);
+            hashMap.put(Blocks.CHISELED_STONE_BRICKS, Blocks.CHISELED_POLISHED_BLACKSTONE);
+            hashMap.put(Blocks.CRACKED_STONE_BRICKS, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS);
+            hashMap.put(Blocks.IRON_BARS, Blocks.CHAIN);
+        });
+    }
+    
+    @Override
+    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bqd, final BlockPos fu2, final BlockPos fu3, final StructureTemplate.StructureBlockInfo c4, final StructureTemplate.StructureBlockInfo c5, final StructurePlaceSettings cvb) {
+        final Block bvr8 = this.replacements.get(c5.state.getBlock());
+        if (bvr8 == null) {
+            return c5;
+        }
+        final BlockState cfj9 = c5.state;
+        BlockState cfj10 = bvr8.defaultBlockState();
+        if (cfj9.<Comparable>hasProperty((Property<Comparable>)StairBlock.FACING)) {
+            cfj10 = ((StateHolder<O, BlockState>)cfj10).<Comparable, Comparable>setValue((Property<Comparable>)StairBlock.FACING, (Comparable)cfj9.<V>getValue((Property<V>)StairBlock.FACING));
+        }
+        if (cfj9.<Half>hasProperty(StairBlock.HALF)) {
+            cfj10 = ((StateHolder<O, BlockState>)cfj10).<Half, Comparable>setValue(StairBlock.HALF, (Comparable)cfj9.<V>getValue((Property<V>)StairBlock.HALF));
+        }
+        if (cfj9.<SlabType>hasProperty(SlabBlock.TYPE)) {
+            cfj10 = ((StateHolder<O, BlockState>)cfj10).<SlabType, Comparable>setValue(SlabBlock.TYPE, (Comparable)cfj9.<V>getValue((Property<V>)SlabBlock.TYPE));
+        }
+        return new StructureTemplate.StructureBlockInfo(c5.pos, cfj10, c5.nbt);
+    }
+    
+    @Override
+    protected StructureProcessorType<?> getType() {
+        return StructureProcessorType.BLACKSTONE_REPLACE;
+    }
+    
+    static {
+        CODEC = Codec.unit(() -> BlackstoneReplaceProcessor.INSTANCE);
+        INSTANCE = new BlackstoneReplaceProcessor();
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockAgeProcessor.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockAgeProcessor.java
new file mode 100644
index 0000000..7106542
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockAgeProcessor.java
@@ -0,0 +1,125 @@
+package net.minecraft.world.level.levelgen.structure.templatesystem;
+
+import net.minecraft.world.level.block.state.StateHolder;
+import java.util.function.Function;
+import net.minecraft.world.level.block.state.properties.Half;
+import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.level.block.StairBlock;
+import net.minecraft.core.Direction;
+import javax.annotation.Nullable;
+import net.minecraft.world.level.block.state.BlockState;
+import java.util.Random;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelReader;
+import com.mojang.serialization.Codec;
+
+public class BlockAgeProcessor extends StructureProcessor {
+    public static final Codec<BlockAgeProcessor> CODEC;
+    private final float mossiness;
+    
+    public BlockAgeProcessor(final float float1) {
+        this.mossiness = float1;
+    }
+    
+    @Nullable
+    @Override
+    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bqd, final BlockPos fu2, final BlockPos fu3, final StructureTemplate.StructureBlockInfo c4, final StructureTemplate.StructureBlockInfo c5, final StructurePlaceSettings cvb) {
+        final Random random8 = cvb.getRandom(c5.pos);
+        final BlockState cfj9 = c5.state;
+        final BlockPos fu4 = c5.pos;
+        BlockState cfj10 = null;
+        if (cfj9.is(Blocks.STONE_BRICKS) || cfj9.is(Blocks.STONE) || cfj9.is(Blocks.CHISELED_STONE_BRICKS)) {
+            cfj10 = this.maybeReplaceFullStoneBlock(random8);
+        }
+        else if (cfj9.is(BlockTags.STAIRS)) {
+            cfj10 = this.maybeReplaceStairs(random8, c5.state);
+        }
+        else if (cfj9.is(BlockTags.SLABS)) {
+            cfj10 = this.maybeReplaceSlab(random8);
+        }
+        else if (cfj9.is(BlockTags.WALLS)) {
+            cfj10 = this.maybeReplaceWall(random8);
+        }
+        else if (cfj9.is(Blocks.OBSIDIAN)) {
+            cfj10 = this.maybeReplaceObsidian(random8);
+        }
+        if (cfj10 != null) {
+            return new StructureTemplate.StructureBlockInfo(fu4, cfj10, c5.nbt);
+        }
+        return c5;
+    }
+    
+    @Nullable
+    private BlockState maybeReplaceFullStoneBlock(final Random random) {
+        if (random.nextFloat() >= 0.5f) {
+            return null;
+        }
+        final BlockState[] arr3 = { Blocks.CRACKED_STONE_BRICKS.defaultBlockState(), getRandomFacingStairs(random, Blocks.STONE_BRICK_STAIRS) };
+        final BlockState[] arr4 = { Blocks.MOSSY_STONE_BRICKS.defaultBlockState(), getRandomFacingStairs(random, Blocks.MOSSY_STONE_BRICK_STAIRS) };
+        return this.getRandomBlock(random, arr3, arr4);
+    }
+    
+    @Nullable
+    private BlockState maybeReplaceStairs(final Random random, final BlockState cfj) {
+        final Direction fz4 = cfj.<Direction>getValue((Property<Direction>)StairBlock.FACING);
+        final Half cgh5 = cfj.<Half>getValue(StairBlock.HALF);
+        if (random.nextFloat() >= 0.5f) {
+            return null;
+        }
+        final BlockState[] arr6 = { Blocks.STONE_SLAB.defaultBlockState(), Blocks.STONE_BRICK_SLAB.defaultBlockState() };
+        final BlockState[] arr7 = { (((StateHolder<O, BlockState>)Blocks.MOSSY_STONE_BRICK_STAIRS.defaultBlockState()).setValue((Property<Comparable>)StairBlock.FACING, fz4)).<Half, Half>setValue(StairBlock.HALF, cgh5), Blocks.MOSSY_STONE_BRICK_SLAB.defaultBlockState() };
+        return this.getRandomBlock(random, arr6, arr7);
+    }
+    
+    @Nullable
+    private BlockState maybeReplaceSlab(final Random random) {
+        if (random.nextFloat() < this.mossiness) {
+            return Blocks.MOSSY_STONE_BRICK_SLAB.defaultBlockState();
+        }
+        return null;
+    }
+    
+    @Nullable
+    private BlockState maybeReplaceWall(final Random random) {
+        if (random.nextFloat() < this.mossiness) {
+            return Blocks.MOSSY_STONE_BRICK_WALL.defaultBlockState();
+        }
+        return null;
+    }
+    
+    @Nullable
+    private BlockState maybeReplaceObsidian(final Random random) {
+        if (random.nextFloat() < 0.15f) {
+            return Blocks.CRYING_OBSIDIAN.defaultBlockState();
+        }
+        return null;
+    }
+    
+    private static BlockState getRandomFacingStairs(final Random random, final Block bvr) {
+        return (((StateHolder<O, BlockState>)bvr.defaultBlockState()).setValue((Property<Comparable>)StairBlock.FACING, Direction.Plane.HORIZONTAL.getRandomDirection(random))).<Half, Half>setValue(StairBlock.HALF, Half.values()[random.nextInt(Half.values().length)]);
+    }
+    
+    private BlockState getRandomBlock(final Random random, final BlockState[] arr2, final BlockState[] arr3) {
+        if (random.nextFloat() < this.mossiness) {
+            return getRandomBlock(random, arr3);
+        }
+        return getRandomBlock(random, arr2);
+    }
+    
+    private static BlockState getRandomBlock(final Random random, final BlockState[] arr) {
+        return arr[random.nextInt(arr.length)];
+    }
+    
+    @Override
+    protected StructureProcessorType<?> getType() {
+        return StructureProcessorType.BLOCK_AGE;
+    }
+    
+    static {
+        CODEC = Codec.FLOAT.fieldOf("mossiness").xmap((Function)BlockAgeProcessor::new, cuh -> cuh.mossiness).codec();
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockIgnoreProcessor.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockIgnoreProcessor.java
index b5a6022..a524458 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockIgnoreProcessor.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockIgnoreProcessor.java
@@ -1,21 +1,20 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
 import net.minecraft.world.level.block.Blocks;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Stream;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.state.BlockState;
-import com.mojang.datafixers.Dynamic;
 import java.util.Collection;
 import java.util.List;
 import net.minecraft.world.level.block.Block;
 import com.google.common.collect.ImmutableList;
+import com.mojang.serialization.Codec;
 
 public class BlockIgnoreProcessor extends StructureProcessor {
+    public static final Codec<BlockIgnoreProcessor> CODEC;
     public static final BlockIgnoreProcessor STRUCTURE_BLOCK;
     public static final BlockIgnoreProcessor AIR;
     public static final BlockIgnoreProcessor STRUCTURE_AND_AIR;
@@ -25,30 +24,22 @@ public class BlockIgnoreProcessor extends StructureProcessor {
         this.toIgnore = ImmutableList.<Block>copyOf(list);
     }
     
-    public BlockIgnoreProcessor(final Dynamic<?> dynamic) {
-        this(dynamic.get("blocks").asList(dynamic -> BlockState.deserialize(dynamic).getBlock()));
-    }
-    
     @Nullable
     @Override
-    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bjz, final BlockPos fk, final StructureTemplate.StructureBlockInfo b3, final StructureTemplate.StructureBlockInfo b4, final StructurePlaceSettings cmp) {
-        if (this.toIgnore.contains(b4.state.getBlock())) {
+    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bqd, final BlockPos fu2, final BlockPos fu3, final StructureTemplate.StructureBlockInfo c4, final StructureTemplate.StructureBlockInfo c5, final StructurePlaceSettings cvb) {
+        if (this.toIgnore.contains(c5.state.getBlock())) {
             return null;
         }
-        return b4;
+        return c5;
     }
     
     @Override
-    protected StructureProcessorType getType() {
+    protected StructureProcessorType<?> getType() {
         return StructureProcessorType.BLOCK_IGNORE;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("blocks"), dynamicOps.createList((Stream)this.toIgnore.stream().map(bph -> BlockState.<T>serialize(dynamicOps, bph.defaultBlockState()).getValue())))));
-    }
-    
     static {
+        CODEC = BlockState.CODEC.xmap((Function)BlockBehaviour.BlockStateBase::getBlock, (Function)Block::defaultBlockState).listOf().fieldOf("blocks").xmap((Function)BlockIgnoreProcessor::new, cui -> cui.toIgnore).codec();
         STRUCTURE_BLOCK = new BlockIgnoreProcessor(ImmutableList.<Block>of(Blocks.STRUCTURE_BLOCK));
         AIR = new BlockIgnoreProcessor(ImmutableList.<Block>of(Blocks.AIR));
         STRUCTURE_AND_AIR = new BlockIgnoreProcessor(ImmutableList.<Block>of(Blocks.AIR, Blocks.STRUCTURE_BLOCK));
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockMatchTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockMatchTest.java
index 4ff4fc9..efad6f9 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockMatchTest.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockMatchTest.java
@@ -1,38 +1,31 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
+import net.minecraft.core.Registry;
 import java.util.Random;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.block.Block;
+import com.mojang.serialization.Codec;
 
 public class BlockMatchTest extends RuleTest {
+    public static final Codec<BlockMatchTest> CODEC;
     private final Block block;
     
-    public BlockMatchTest(final Block bph) {
-        this.block = bph;
-    }
-    
-    public <T> BlockMatchTest(final Dynamic<T> dynamic) {
-        this(Registry.BLOCK.get(new ResourceLocation(dynamic.get("block").asString(""))));
+    public BlockMatchTest(final Block bvr) {
+        this.block = bvr;
     }
     
     @Override
-    public boolean test(final BlockState byj, final Random random) {
-        return byj.getBlock() == this.block;
+    public boolean test(final BlockState cfj, final Random random) {
+        return cfj.is(this.block);
     }
     
     @Override
-    protected RuleTestType getType() {
+    protected RuleTestType<?> getType() {
         return RuleTestType.BLOCK_TEST;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("block"), dynamicOps.createString(Registry.BLOCK.getKey(this.block).toString()))));
+    static {
+        CODEC = Registry.BLOCK.fieldOf("block").xmap((Function)BlockMatchTest::new, cuj -> cuj.block).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockRotProcessor.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockRotProcessor.java
index 4212503..1e70549 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockRotProcessor.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockRotProcessor.java
@@ -1,42 +1,36 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
 import javax.annotation.Nullable;
 import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.serialization.Codec;
 
 public class BlockRotProcessor extends StructureProcessor {
+    public static final Codec<BlockRotProcessor> CODEC;
     private final float integrity;
     
     public BlockRotProcessor(final float float1) {
         this.integrity = float1;
     }
     
-    public BlockRotProcessor(final Dynamic<?> dynamic) {
-        this(dynamic.get("integrity").asFloat(1.0f));
-    }
-    
     @Nullable
     @Override
-    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bjz, final BlockPos fk, final StructureTemplate.StructureBlockInfo b3, final StructureTemplate.StructureBlockInfo b4, final StructurePlaceSettings cmp) {
-        final Random random7 = cmp.getRandom(b4.pos);
-        if (this.integrity >= 1.0f || random7.nextFloat() <= this.integrity) {
-            return b4;
+    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bqd, final BlockPos fu2, final BlockPos fu3, final StructureTemplate.StructureBlockInfo c4, final StructureTemplate.StructureBlockInfo c5, final StructurePlaceSettings cvb) {
+        final Random random8 = cvb.getRandom(c5.pos);
+        if (this.integrity >= 1.0f || random8.nextFloat() <= this.integrity) {
+            return c5;
         }
         return null;
     }
     
     @Override
-    protected StructureProcessorType getType() {
+    protected StructureProcessorType<?> getType() {
         return StructureProcessorType.BLOCK_ROT;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("integrity"), dynamicOps.createFloat(this.integrity))));
+    static {
+        CODEC = Codec.FLOAT.fieldOf("integrity").withDefault(1.0f).xmap((Function)BlockRotProcessor::new, cuk -> cuk.integrity).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockStateMatchTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockStateMatchTest.java
index 83b43c0..c6a9ef2 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockStateMatchTest.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/BlockStateMatchTest.java
@@ -1,35 +1,29 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class BlockStateMatchTest extends RuleTest {
+    public static final Codec<BlockStateMatchTest> CODEC;
     private final BlockState blockState;
     
-    public BlockStateMatchTest(final BlockState byj) {
-        this.blockState = byj;
-    }
-    
-    public <T> BlockStateMatchTest(final Dynamic<T> dynamic) {
-        this(BlockState.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("blockstate").orElseEmptyMap()));
+    public BlockStateMatchTest(final BlockState cfj) {
+        this.blockState = cfj;
     }
     
     @Override
-    public boolean test(final BlockState byj, final Random random) {
-        return byj == this.blockState;
+    public boolean test(final BlockState cfj, final Random random) {
+        return cfj == this.blockState;
     }
     
     @Override
-    protected RuleTestType getType() {
+    protected RuleTestType<?> getType() {
         return RuleTestType.BLOCKSTATE_TEST;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("blockstate"), BlockState.<T>serialize(dynamicOps, this.blockState).getValue())));
+    static {
+        CODEC = BlockState.CODEC.fieldOf("block_state").xmap((Function)BlockStateMatchTest::new, cul -> cul.blockState).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/GravityProcessor.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/GravityProcessor.java
index fac9e76..1d937f3 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/GravityProcessor.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/GravityProcessor.java
@@ -1,15 +1,18 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import javax.annotation.Nullable;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.levelgen.Heightmap;
+import com.mojang.serialization.Codec;
 
 public class GravityProcessor extends StructureProcessor {
+    public static final Codec<GravityProcessor> CODEC;
     private final Heightmap.Types heightmap;
     private final int offset;
     
@@ -18,25 +21,35 @@ public class GravityProcessor extends StructureProcessor {
         this.offset = integer;
     }
     
-    public GravityProcessor(final Dynamic<?> dynamic) {
-        this(Heightmap.Types.getFromKey(dynamic.get("heightmap").asString(Heightmap.Types.WORLD_SURFACE_WG.getSerializationKey())), dynamic.get("offset").asInt(0));
-    }
-    
     @Nullable
     @Override
-    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bjz, final BlockPos fk, final StructureTemplate.StructureBlockInfo b3, final StructureTemplate.StructureBlockInfo b4, final StructurePlaceSettings cmp) {
-        final int integer7 = bjz.getHeight(this.heightmap, b4.pos.getX(), b4.pos.getZ()) + this.offset;
-        final int integer8 = b3.pos.getY();
-        return new StructureTemplate.StructureBlockInfo(new BlockPos(b4.pos.getX(), integer7 + integer8, b4.pos.getZ()), b4.state, b4.nbt);
+    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bqd, final BlockPos fu2, final BlockPos fu3, final StructureTemplate.StructureBlockInfo c4, final StructureTemplate.StructureBlockInfo c5, final StructurePlaceSettings cvb) {
+        Heightmap.Types a8;
+        if (bqd instanceof ServerLevel) {
+            if (this.heightmap == Heightmap.Types.WORLD_SURFACE_WG) {
+                a8 = Heightmap.Types.WORLD_SURFACE;
+            }
+            else if (this.heightmap == Heightmap.Types.OCEAN_FLOOR_WG) {
+                a8 = Heightmap.Types.OCEAN_FLOOR;
+            }
+            else {
+                a8 = this.heightmap;
+            }
+        }
+        else {
+            a8 = this.heightmap;
+        }
+        final int integer9 = bqd.getHeight(a8, c5.pos.getX(), c5.pos.getZ()) + this.offset;
+        final int integer10 = c4.pos.getY();
+        return new StructureTemplate.StructureBlockInfo(new BlockPos(c5.pos.getX(), integer9 + integer10, c5.pos.getZ()), c5.state, c5.nbt);
     }
     
     @Override
-    protected StructureProcessorType getType() {
+    protected StructureProcessorType<?> getType() {
         return StructureProcessorType.GRAVITY;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("heightmap"), dynamicOps.createString(this.heightmap.getSerializationKey()), dynamicOps.createString("offset"), dynamicOps.createInt(this.offset))));
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Heightmap.Types.CODEC.fieldOf("heightmap").withDefault(Heightmap.Types.WORLD_SURFACE_WG).forGetter(cum -> cum.heightmap), (App)Codec.INT.fieldOf("offset").withDefault(0).forGetter(cum -> cum.offset)).apply(instance, (BiFunction)GravityProcessor::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/JigsawReplacementProcessor.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/JigsawReplacementProcessor.java
index 57372d2..c2bd39b 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/JigsawReplacementProcessor.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/JigsawReplacementProcessor.java
@@ -1,9 +1,7 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
 import javax.annotation.Nullable;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.nbt.CompoundTag;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.commands.arguments.blocks.BlockStateParser;
@@ -11,8 +9,10 @@ import com.mojang.brigadier.StringReader;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
+import com.mojang.serialization.Codec;
 
 public class JigsawReplacementProcessor extends StructureProcessor {
+    public static final Codec<JigsawReplacementProcessor> CODEC;
     public static final JigsawReplacementProcessor INSTANCE;
     
     private JigsawReplacementProcessor() {
@@ -20,36 +20,32 @@ public class JigsawReplacementProcessor extends StructureProcessor {
     
     @Nullable
     @Override
-    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bjz, final BlockPos fk, final StructureTemplate.StructureBlockInfo b3, final StructureTemplate.StructureBlockInfo b4, final StructurePlaceSettings cmp) {
-        final Block bph7 = b4.state.getBlock();
-        if (bph7 != Blocks.JIGSAW) {
-            return b4;
+    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bqd, final BlockPos fu2, final BlockPos fu3, final StructureTemplate.StructureBlockInfo c4, final StructureTemplate.StructureBlockInfo c5, final StructurePlaceSettings cvb) {
+        final BlockState cfj8 = c5.state;
+        if (!cfj8.is(Blocks.JIGSAW)) {
+            return c5;
         }
-        final String string8 = b4.nbt.getString("final_state");
-        final BlockStateParser dv9 = new BlockStateParser(new StringReader(string8), false);
+        final String string9 = c5.nbt.getString("final_state");
+        final BlockStateParser ef10 = new BlockStateParser(new StringReader(string9), false);
         try {
-            dv9.parse(true);
+            ef10.parse(true);
         }
-        catch (CommandSyntaxException commandSyntaxException10) {
-            throw new RuntimeException((Throwable)commandSyntaxException10);
+        catch (CommandSyntaxException commandSyntaxException11) {
+            throw new RuntimeException((Throwable)commandSyntaxException11);
         }
-        if (dv9.getState().getBlock() == Blocks.STRUCTURE_VOID) {
+        if (ef10.getState().is(Blocks.STRUCTURE_VOID)) {
             return null;
         }
-        return new StructureTemplate.StructureBlockInfo(b4.pos, dv9.getState(), null);
+        return new StructureTemplate.StructureBlockInfo(c5.pos, ef10.getState(), null);
     }
     
     @Override
-    protected StructureProcessorType getType() {
+    protected StructureProcessorType<?> getType() {
         return StructureProcessorType.JIGSAW_REPLACEMENT;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.emptyMap());
-    }
-    
     static {
+        CODEC = Codec.unit(() -> JigsawReplacementProcessor.INSTANCE);
         INSTANCE = new JigsawReplacementProcessor();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/LavaSubmergedBlockProcessor.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/LavaSubmergedBlockProcessor.java
new file mode 100644
index 0000000..e0ad966
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/LavaSubmergedBlockProcessor.java
@@ -0,0 +1,35 @@
+package net.minecraft.world.level.levelgen.structure.templatesystem;
+
+import javax.annotation.Nullable;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelReader;
+import com.mojang.serialization.Codec;
+
+public class LavaSubmergedBlockProcessor extends StructureProcessor {
+    public static final Codec<LavaSubmergedBlockProcessor> CODEC;
+    public static final LavaSubmergedBlockProcessor INSTANCE;
+    
+    @Nullable
+    @Override
+    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bqd, final BlockPos fu2, final BlockPos fu3, final StructureTemplate.StructureBlockInfo c4, final StructureTemplate.StructureBlockInfo c5, final StructurePlaceSettings cvb) {
+        final BlockPos fu4 = c5.pos;
+        final boolean boolean9 = bqd.getBlockState(fu4).is(Blocks.LAVA);
+        if (boolean9 && !Block.isShapeFullBlock(c5.state.getShape(bqd, fu4))) {
+            return new StructureTemplate.StructureBlockInfo(fu4, Blocks.LAVA.defaultBlockState(), c5.nbt);
+        }
+        return c5;
+    }
+    
+    @Override
+    protected StructureProcessorType<?> getType() {
+        return StructureProcessorType.LAVA_SUBMERGED_BLOCK;
+    }
+    
+    static {
+        CODEC = Codec.unit(() -> LavaSubmergedBlockProcessor.INSTANCE);
+        INSTANCE = new LavaSubmergedBlockProcessor();
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/LinearPosTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/LinearPosTest.java
new file mode 100644
index 0000000..64b6996
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/LinearPosTest.java
@@ -0,0 +1,44 @@
+package net.minecraft.world.level.levelgen.structure.templatesystem;
+
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.util.Mth;
+import net.minecraft.core.Vec3i;
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import com.mojang.serialization.Codec;
+
+public class LinearPosTest extends PosRuleTest {
+    public static final Codec<LinearPosTest> CODEC;
+    private final float minChance;
+    private final float maxChance;
+    private final int minDist;
+    private final int maxDist;
+    
+    public LinearPosTest(final float float1, final float float2, final int integer3, final int integer4) {
+        if (integer3 >= integer4) {
+            throw new IllegalArgumentException("Invalid range: [" + integer3 + "," + integer4 + "]");
+        }
+        this.minChance = float1;
+        this.maxChance = float2;
+        this.minDist = integer3;
+        this.maxDist = integer4;
+    }
+    
+    @Override
+    public boolean test(final BlockPos fu1, final BlockPos fu2, final BlockPos fu3, final Random random) {
+        final int integer6 = fu2.distManhattan(fu3);
+        final float float7 = random.nextFloat();
+        return float7 <= Mth.clampedLerp(this.minChance, this.maxChance, Mth.inverseLerp(integer6, this.minDist, this.maxDist));
+    }
+    
+    @Override
+    protected PosRuleTestType<?> getType() {
+        return PosRuleTestType.LINEAR_POS_TEST;
+    }
+    
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Codec.FLOAT.fieldOf("min_chance").withDefault(0.0f).forGetter(cup -> cup.minChance), (App)Codec.FLOAT.fieldOf("max_chance").withDefault(0.0f).forGetter(cup -> cup.maxChance), (App)Codec.INT.fieldOf("min_dist").withDefault(0).forGetter(cup -> cup.minDist), (App)Codec.INT.fieldOf("max_dist").withDefault(0).forGetter(cup -> cup.maxDist)).apply(instance, LinearPosTest::new));
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/NopProcessor.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/NopProcessor.java
index d532ea4..edb5da6 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/NopProcessor.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/NopProcessor.java
@@ -1,12 +1,12 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
+import com.mojang.serialization.Codec;
 
 public class NopProcessor extends StructureProcessor {
+    public static final Codec<NopProcessor> CODEC;
     public static final NopProcessor INSTANCE;
     
     private NopProcessor() {
@@ -14,21 +14,17 @@ public class NopProcessor extends StructureProcessor {
     
     @Nullable
     @Override
-    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bjz, final BlockPos fk, final StructureTemplate.StructureBlockInfo b3, final StructureTemplate.StructureBlockInfo b4, final StructurePlaceSettings cmp) {
-        return b4;
+    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bqd, final BlockPos fu2, final BlockPos fu3, final StructureTemplate.StructureBlockInfo c4, final StructureTemplate.StructureBlockInfo c5, final StructurePlaceSettings cvb) {
+        return c5;
     }
     
     @Override
-    protected StructureProcessorType getType() {
+    protected StructureProcessorType<?> getType() {
         return StructureProcessorType.NOP;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.emptyMap());
-    }
-    
     static {
+        CODEC = Codec.unit(() -> NopProcessor.INSTANCE);
         INSTANCE = new NopProcessor();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/PosAlwaysTrueTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/PosAlwaysTrueTest.java
new file mode 100644
index 0000000..18b6223
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/PosAlwaysTrueTest.java
@@ -0,0 +1,28 @@
+package net.minecraft.world.level.levelgen.structure.templatesystem;
+
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import com.mojang.serialization.Codec;
+
+public class PosAlwaysTrueTest extends PosRuleTest {
+    public static final Codec<PosAlwaysTrueTest> CODEC;
+    public static final PosAlwaysTrueTest INSTANCE;
+    
+    private PosAlwaysTrueTest() {
+    }
+    
+    @Override
+    public boolean test(final BlockPos fu1, final BlockPos fu2, final BlockPos fu3, final Random random) {
+        return true;
+    }
+    
+    @Override
+    protected PosRuleTestType<?> getType() {
+        return PosRuleTestType.ALWAYS_TRUE_TEST;
+    }
+    
+    static {
+        CODEC = Codec.unit(() -> PosAlwaysTrueTest.INSTANCE);
+        INSTANCE = new PosAlwaysTrueTest();
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/PosRuleTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/PosRuleTest.java
new file mode 100644
index 0000000..df44789
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/PosRuleTest.java
@@ -0,0 +1,19 @@
+package net.minecraft.world.level.levelgen.structure.templatesystem;
+
+import java.util.function.Function;
+import net.minecraft.core.Registry;
+import java.util.Random;
+import net.minecraft.core.BlockPos;
+import com.mojang.serialization.Codec;
+
+public abstract class PosRuleTest {
+    public static final Codec<PosRuleTest> CODEC;
+    
+    public abstract boolean test(final BlockPos fu1, final BlockPos fu2, final BlockPos fu3, final Random random);
+    
+    protected abstract PosRuleTestType<?> getType();
+    
+    static {
+        CODEC = Registry.POS_RULE_TEST.dispatch("predicate_type", (Function)PosRuleTest::getType, (Function)PosRuleTestType::codec);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/PosRuleTestType.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/PosRuleTestType.java
new file mode 100644
index 0000000..2581563
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/PosRuleTestType.java
@@ -0,0 +1,16 @@
+package net.minecraft.world.level.levelgen.structure.templatesystem;
+
+import net.minecraft.core.Registry;
+import com.mojang.serialization.Codec;
+
+public interface PosRuleTestType<P extends PosRuleTest> {
+    public static final PosRuleTestType<PosAlwaysTrueTest> ALWAYS_TRUE_TEST = PosRuleTestType.<PosAlwaysTrueTest>register("always_true", PosAlwaysTrueTest.CODEC);
+    public static final PosRuleTestType<LinearPosTest> LINEAR_POS_TEST = PosRuleTestType.<LinearPosTest>register("linear_pos", LinearPosTest.CODEC);
+    public static final PosRuleTestType<AxisAlignedLinearPosTest> AXIS_ALIGNED_LINEAR_POS_TEST = PosRuleTestType.<AxisAlignedLinearPosTest>register("axis_aligned_linear_pos", AxisAlignedLinearPosTest.CODEC);
+    
+    Codec<P> codec();
+    
+    default <P extends PosRuleTest> PosRuleTestType<P> register(final String string, final Codec<P> codec) {
+        return Registry.<PosRuleTestType<P>>register(Registry.POS_RULE_TEST, string, () -> codec);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/ProcessorRule.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/ProcessorRule.java
index 8388222..8ac8982 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/ProcessorRule.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/ProcessorRule.java
@@ -1,38 +1,43 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import net.minecraft.nbt.Tag;
-import net.minecraft.util.Deserializer;
-import net.minecraft.core.Registry;
-import net.minecraft.nbt.NbtOps;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.Random;
+import net.minecraft.core.BlockPos;
+import java.util.Optional;
 import javax.annotation.Nullable;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class ProcessorRule {
+    public static final Codec<ProcessorRule> CODEC;
     private final RuleTest inputPredicate;
     private final RuleTest locPredicate;
+    private final PosRuleTest posPredicate;
     private final BlockState outputState;
     @Nullable
     private final CompoundTag outputTag;
     
-    public ProcessorRule(final RuleTest cmm1, final RuleTest cmm2, final BlockState byj) {
-        this(cmm1, cmm2, byj, null);
+    public ProcessorRule(final RuleTest cuy1, final RuleTest cuy2, final BlockState cfj) {
+        this(cuy1, cuy2, PosAlwaysTrueTest.INSTANCE, cfj, Optional.<CompoundTag>empty());
     }
     
-    public ProcessorRule(final RuleTest cmm1, final RuleTest cmm2, final BlockState byj, @Nullable final CompoundTag jt) {
-        this.inputPredicate = cmm1;
-        this.locPredicate = cmm2;
-        this.outputState = byj;
-        this.outputTag = jt;
+    public ProcessorRule(final RuleTest cuy1, final RuleTest cuy2, final PosRuleTest cus, final BlockState cfj) {
+        this(cuy1, cuy2, cus, cfj, Optional.<CompoundTag>empty());
     }
     
-    public boolean test(final BlockState byj1, final BlockState byj2, final Random random) {
-        return this.inputPredicate.test(byj1, random) && this.locPredicate.test(byj2, random);
+    public ProcessorRule(final RuleTest cuy1, final RuleTest cuy2, final PosRuleTest cus, final BlockState cfj, final Optional<CompoundTag> optional) {
+        this.inputPredicate = cuy1;
+        this.locPredicate = cuy2;
+        this.posPredicate = cus;
+        this.outputState = cfj;
+        this.outputTag = optional.orElse(null);
+    }
+    
+    public boolean test(final BlockState cfj1, final BlockState cfj2, final BlockPos fu3, final BlockPos fu4, final BlockPos fu5, final Random random) {
+        return this.inputPredicate.test(cfj1, random) && this.locPredicate.test(cfj2, random) && this.posPredicate.test(fu3, fu4, fu5, random);
     }
     
     public BlockState getOutputState() {
@@ -44,21 +49,7 @@ public class ProcessorRule {
         return this.outputTag;
     }
     
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        final T object3 = (T)dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("input_predicate"), this.inputPredicate.<T>serialize(dynamicOps).getValue(), dynamicOps.createString("location_predicate"), this.locPredicate.<T>serialize(dynamicOps).getValue(), dynamicOps.createString("output_state"), BlockState.<T>serialize(dynamicOps, this.outputState).getValue()));
-        if (this.outputTag == null) {
-            return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, object3);
-        }
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.mergeInto(object3, dynamicOps.createString("output_nbt"), new Dynamic((DynamicOps)NbtOps.INSTANCE, this.outputTag).convert((DynamicOps)dynamicOps).getValue()));
-    }
-    
-    public static <T> ProcessorRule deserialize(final Dynamic<T> dynamic) {
-        final Dynamic<T> dynamic2 = (Dynamic<T>)dynamic.get("input_predicate").orElseEmptyMap();
-        final Dynamic<T> dynamic3 = (Dynamic<T>)dynamic.get("location_predicate").orElseEmptyMap();
-        final RuleTest cmm4 = Deserializer.<T, AlwaysTrueTest, RuleTestType>deserialize(dynamic2, Registry.RULE_TEST, "predicate_type", AlwaysTrueTest.INSTANCE);
-        final RuleTest cmm5 = Deserializer.<T, AlwaysTrueTest, RuleTestType>deserialize(dynamic3, Registry.RULE_TEST, "predicate_type", AlwaysTrueTest.INSTANCE);
-        final BlockState byj6 = BlockState.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("output_state").orElseEmptyMap());
-        final CompoundTag jt7 = dynamic.get("output_nbt").map(dynamic -> (Tag)dynamic.convert((DynamicOps)NbtOps.INSTANCE).getValue()).orElse(null);
-        return new ProcessorRule(cmm4, cmm5, byj6, jt7);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)RuleTest.CODEC.fieldOf("input_predicate").forGetter(cuu -> cuu.inputPredicate), (App)RuleTest.CODEC.fieldOf("location_predicate").forGetter(cuu -> cuu.locPredicate), (App)PosRuleTest.CODEC.fieldOf("position_predicate").forGetter(cuu -> cuu.posPredicate), (App)BlockState.CODEC.fieldOf("output_state").forGetter(cuu -> cuu.outputState), (App)CompoundTag.CODEC.optionalFieldOf("output_nbt").forGetter(cuu -> Optional.<CompoundTag>ofNullable(cuu.outputTag))).apply(instance, ProcessorRule::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/RandomBlockMatchTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/RandomBlockMatchTest.java
index 0af2e76..e4dabb3 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/RandomBlockMatchTest.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/RandomBlockMatchTest.java
@@ -1,40 +1,36 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import net.minecraft.core.Registry;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.Random;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.block.Block;
+import com.mojang.serialization.Codec;
 
 public class RandomBlockMatchTest extends RuleTest {
+    public static final Codec<RandomBlockMatchTest> CODEC;
     private final Block block;
     private final float probability;
     
-    public RandomBlockMatchTest(final Block bph, final float float2) {
-        this.block = bph;
+    public RandomBlockMatchTest(final Block bvr, final float float2) {
+        this.block = bvr;
         this.probability = float2;
     }
     
-    public <T> RandomBlockMatchTest(final Dynamic<T> dynamic) {
-        this(Registry.BLOCK.get(new ResourceLocation(dynamic.get("block").asString(""))), dynamic.get("probability").asFloat(1.0f));
+    @Override
+    public boolean test(final BlockState cfj, final Random random) {
+        return cfj.is(this.block) && random.nextFloat() < this.probability;
     }
     
     @Override
-    public boolean test(final BlockState byj, final Random random) {
-        return byj.getBlock() == this.block && random.nextFloat() < this.probability;
-    }
-    
-    @Override
-    protected RuleTestType getType() {
+    protected RuleTestType<?> getType() {
         return RuleTestType.RANDOM_BLOCK_TEST;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("block"), dynamicOps.createString(Registry.BLOCK.getKey(this.block).toString()), dynamicOps.createString("probability"), dynamicOps.createFloat(this.probability))));
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)Registry.BLOCK.fieldOf("block").forGetter(cuv -> cuv.block), (App)Codec.FLOAT.fieldOf("probability").forGetter(cuv -> cuv.probability)).apply(instance, (BiFunction)RandomBlockMatchTest::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/RandomBlockStateMatchTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/RandomBlockStateMatchTest.java
index 0979a95..e7769a3 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/RandomBlockStateMatchTest.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/RandomBlockStateMatchTest.java
@@ -1,37 +1,34 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.BiFunction;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class RandomBlockStateMatchTest extends RuleTest {
+    public static final Codec<RandomBlockStateMatchTest> CODEC;
     private final BlockState blockState;
     private final float probability;
     
-    public RandomBlockStateMatchTest(final BlockState byj, final float float2) {
-        this.blockState = byj;
+    public RandomBlockStateMatchTest(final BlockState cfj, final float float2) {
+        this.blockState = cfj;
         this.probability = float2;
     }
     
-    public <T> RandomBlockStateMatchTest(final Dynamic<T> dynamic) {
-        this(BlockState.deserialize((com.mojang.datafixers.Dynamic<Object>)dynamic.get("blockstate").orElseEmptyMap()), dynamic.get("probability").asFloat(1.0f));
+    @Override
+    public boolean test(final BlockState cfj, final Random random) {
+        return cfj == this.blockState && random.nextFloat() < this.probability;
     }
     
     @Override
-    public boolean test(final BlockState byj, final Random random) {
-        return byj == this.blockState && random.nextFloat() < this.probability;
-    }
-    
-    @Override
-    protected RuleTestType getType() {
+    protected RuleTestType<?> getType() {
         return RuleTestType.RANDOM_BLOCKSTATE_TEST;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("blockstate"), BlockState.<T>serialize(dynamicOps, this.blockState).getValue(), dynamicOps.createString("probability"), dynamicOps.createFloat(this.probability))));
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockState.CODEC.fieldOf("block_state").forGetter(cuw -> cuw.blockState), (App)Codec.FLOAT.fieldOf("probability").forGetter(cuw -> cuw.probability)).apply(instance, (BiFunction)RandomBlockStateMatchTest::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleProcessor.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleProcessor.java
index 8eb2e8e..e272e87 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleProcessor.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleProcessor.java
@@ -1,9 +1,6 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import java.util.stream.Stream;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
 import javax.annotation.Nullable;
 import com.google.common.collect.UnmodifiableIterator;
 import net.minecraft.world.level.block.state.BlockState;
@@ -12,43 +9,38 @@ import net.minecraft.core.Vec3i;
 import net.minecraft.util.Mth;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
-import java.util.function.Function;
-import com.mojang.datafixers.Dynamic;
 import java.util.Collection;
 import java.util.List;
 import com.google.common.collect.ImmutableList;
+import com.mojang.serialization.Codec;
 
 public class RuleProcessor extends StructureProcessor {
+    public static final Codec<RuleProcessor> CODEC;
     private final ImmutableList<ProcessorRule> rules;
     
-    public RuleProcessor(final List<ProcessorRule> list) {
+    public RuleProcessor(final List<? extends ProcessorRule> list) {
         this.rules = ImmutableList.<ProcessorRule>copyOf(list);
     }
     
-    public RuleProcessor(final Dynamic<?> dynamic) {
-        this(dynamic.get("rules").asList((Function)ProcessorRule::deserialize));
-    }
-    
     @Nullable
     @Override
-    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bjz, final BlockPos fk, final StructureTemplate.StructureBlockInfo b3, final StructureTemplate.StructureBlockInfo b4, final StructurePlaceSettings cmp) {
-        final Random random7 = new Random(Mth.getSeed(b4.pos));
-        final BlockState byj8 = bjz.getBlockState(b4.pos);
-        for (final ProcessorRule cmi10 : this.rules) {
-            if (cmi10.test(b4.state, byj8, random7)) {
-                return new StructureTemplate.StructureBlockInfo(b4.pos, cmi10.getOutputState(), cmi10.getOutputTag());
+    public StructureTemplate.StructureBlockInfo processBlock(final LevelReader bqd, final BlockPos fu2, final BlockPos fu3, final StructureTemplate.StructureBlockInfo c4, final StructureTemplate.StructureBlockInfo c5, final StructurePlaceSettings cvb) {
+        final Random random8 = new Random(Mth.getSeed(c5.pos));
+        final BlockState cfj9 = bqd.getBlockState(c5.pos);
+        for (final ProcessorRule cuu11 : this.rules) {
+            if (cuu11.test(c5.state, cfj9, c4.pos, c5.pos, fu3, random8)) {
+                return new StructureTemplate.StructureBlockInfo(c5.pos, cuu11.getOutputState(), cuu11.getOutputTag());
             }
         }
-        return b4;
+        return c5;
     }
     
     @Override
-    protected StructureProcessorType getType() {
+    protected StructureProcessorType<?> getType() {
         return StructureProcessorType.RULE;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("rules"), dynamicOps.createList((Stream)this.rules.stream().map(cmi -> cmi.<T>serialize(dynamicOps).getValue())))));
+    static {
+        CODEC = ProcessorRule.CODEC.listOf().fieldOf("rules").xmap((Function)RuleProcessor::new, cux -> cux.rules).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleTest.java
index 7507ea2..c853011 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleTest.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleTest.java
@@ -1,19 +1,19 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
+import java.util.function.Function;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
 import java.util.Random;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public abstract class RuleTest {
-    public abstract boolean test(final BlockState byj, final Random random);
+    public static final Codec<RuleTest> CODEC;
     
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.mergeInto(this.getDynamic((com.mojang.datafixers.types.DynamicOps<Object>)dynamicOps).getValue(), dynamicOps.createString("predicate_type"), dynamicOps.createString(Registry.RULE_TEST.getKey(this.getType()).toString())));
+    public abstract boolean test(final BlockState cfj, final Random random);
+    
+    protected abstract RuleTestType<?> getType();
+    
+    static {
+        CODEC = Registry.RULE_TEST.dispatch("predicate_type", (Function)RuleTest::getType, (Function)RuleTestType::codec);
     }
-    
-    protected abstract RuleTestType getType();
-    
-    protected abstract <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps);
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleTestType.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleTestType.java
index 17cabe5..d0865df 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleTestType.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/RuleTestType.java
@@ -1,18 +1,19 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.core.Registry;
-import net.minecraft.util.Deserializer;
+import com.mojang.serialization.Codec;
 
-public interface RuleTestType extends Deserializer<RuleTest> {
-    public static final RuleTestType ALWAYS_TRUE_TEST = register("always_true", dynamic -> AlwaysTrueTest.INSTANCE);
-    public static final RuleTestType BLOCK_TEST = register("block_match", BlockMatchTest::new);
-    public static final RuleTestType BLOCKSTATE_TEST = register("blockstate_match", BlockStateMatchTest::new);
-    public static final RuleTestType TAG_TEST = register("tag_match", TagMatchTest::new);
-    public static final RuleTestType RANDOM_BLOCK_TEST = register("random_block_match", RandomBlockMatchTest::new);
-    public static final RuleTestType RANDOM_BLOCKSTATE_TEST = register("random_blockstate_match", RandomBlockStateMatchTest::new);
+public interface RuleTestType<P extends RuleTest> {
+    public static final RuleTestType<AlwaysTrueTest> ALWAYS_TRUE_TEST = RuleTestType.<AlwaysTrueTest>register("always_true", AlwaysTrueTest.CODEC);
+    public static final RuleTestType<BlockMatchTest> BLOCK_TEST = RuleTestType.<BlockMatchTest>register("block_match", BlockMatchTest.CODEC);
+    public static final RuleTestType<BlockStateMatchTest> BLOCKSTATE_TEST = RuleTestType.<BlockStateMatchTest>register("blockstate_match", BlockStateMatchTest.CODEC);
+    public static final RuleTestType<TagMatchTest> TAG_TEST = RuleTestType.<TagMatchTest>register("tag_match", TagMatchTest.CODEC);
+    public static final RuleTestType<RandomBlockMatchTest> RANDOM_BLOCK_TEST = RuleTestType.<RandomBlockMatchTest>register("random_block_match", RandomBlockMatchTest.CODEC);
+    public static final RuleTestType<RandomBlockStateMatchTest> RANDOM_BLOCKSTATE_TEST = RuleTestType.<RandomBlockStateMatchTest>register("random_blockstate_match", RandomBlockStateMatchTest.CODEC);
     
-    default RuleTestType register(final String string, final RuleTestType cmn) {
-        return Registry.<RuleTestType>register(Registry.RULE_TEST, string, cmn);
+    Codec<P> codec();
+    
+    default <P extends RuleTest> RuleTestType<P> register(final String string, final Codec<P> codec) {
+        return Registry.<RuleTestType<P>>register(Registry.RULE_TEST, string, () -> codec);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureManager.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureManager.java
index 2b2b7b0..cf45483 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureManager.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureManager.java
@@ -18,78 +18,75 @@ import java.io.IOException;
 import java.io.FileInputStream;
 import net.minecraft.server.packs.resources.Resource;
 import java.io.FileNotFoundException;
-import net.minecraft.server.packs.resources.ResourceManager;
 import javax.annotation.Nullable;
-import net.minecraft.server.packs.resources.PreparableReloadListener;
+import net.minecraft.world.level.storage.LevelResource;
 import com.google.common.collect.Maps;
-import java.io.File;
+import net.minecraft.world.level.storage.LevelStorageSource;
 import java.nio.file.Path;
-import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.packs.resources.ResourceManager;
 import com.mojang.datafixers.DataFixer;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
 import org.apache.logging.log4j.Logger;
-import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
 
-public class StructureManager implements ResourceManagerReloadListener {
+public class StructureManager {
     private static final Logger LOGGER;
     private final Map<ResourceLocation, StructureTemplate> structureRepository;
     private final DataFixer fixerUpper;
-    private final MinecraftServer server;
+    private ResourceManager resourceManager;
     private final Path generatedDir;
     
-    public StructureManager(final MinecraftServer minecraftServer, final File file, final DataFixer dataFixer) {
+    public StructureManager(final ResourceManager abc, final LevelStorageSource.LevelStorageAccess a, final DataFixer dataFixer) {
         this.structureRepository = Maps.newHashMap();
-        this.server = minecraftServer;
+        this.resourceManager = abc;
         this.fixerUpper = dataFixer;
-        this.generatedDir = file.toPath().resolve("generated").normalize();
-        minecraftServer.getResources().registerReloadListener(this);
+        this.generatedDir = a.getLevelPath(LevelResource.GENERATED_DIR).normalize();
     }
     
-    public StructureTemplate getOrCreate(final ResourceLocation sm) {
-        StructureTemplate cms3 = this.get(sm);
-        if (cms3 == null) {
-            cms3 = new StructureTemplate();
-            this.structureRepository.put(sm, cms3);
+    public StructureTemplate getOrCreate(final ResourceLocation uh) {
+        StructureTemplate cve3 = this.get(uh);
+        if (cve3 == null) {
+            cve3 = new StructureTemplate();
+            this.structureRepository.put(uh, cve3);
         }
-        return cms3;
+        return cve3;
     }
     
     @Nullable
-    public StructureTemplate get(final ResourceLocation sm) {
-        final StructureTemplate cms3;
-        return this.structureRepository.computeIfAbsent(sm, sm -> {
-            cms3 = this.loadFromGenerated(sm);
-            return (cms3 != null) ? cms3 : this.loadFromResource(sm);
+    public StructureTemplate get(final ResourceLocation uh) {
+        final StructureTemplate cve3;
+        return this.structureRepository.computeIfAbsent(uh, uh -> {
+            cve3 = this.loadFromGenerated(uh);
+            return (cve3 != null) ? cve3 : this.loadFromResource(uh);
         });
     }
     
-    @Override
-    public void onResourceManagerReload(final ResourceManager zb) {
+    public void onResourceManagerReload(final ResourceManager abc) {
+        this.resourceManager = abc;
         this.structureRepository.clear();
     }
     
     @Nullable
-    private StructureTemplate loadFromResource(final ResourceLocation sm) {
-        final ResourceLocation sm2 = new ResourceLocation(sm.getNamespace(), "structures/" + sm.getPath() + ".nbt");
-        try (final Resource za4 = this.server.getResources().getResource(sm2)) {
-            return this.readStructure(za4.getInputStream());
+    private StructureTemplate loadFromResource(final ResourceLocation uh) {
+        final ResourceLocation uh2 = new ResourceLocation(uh.getNamespace(), "structures/" + uh.getPath() + ".nbt");
+        try (final Resource abb4 = this.resourceManager.getResource(uh2)) {
+            return this.readStructure(abb4.getInputStream());
         }
         catch (FileNotFoundException fileNotFoundException4) {
             return null;
         }
         catch (Throwable throwable4) {
-            StructureManager.LOGGER.error("Couldn't load structure {}: {}", sm, throwable4.toString());
+            StructureManager.LOGGER.error("Couldn't load structure {}: {}", uh, throwable4.toString());
             return null;
         }
     }
     
     @Nullable
-    private StructureTemplate loadFromGenerated(final ResourceLocation sm) {
+    private StructureTemplate loadFromGenerated(final ResourceLocation uh) {
         if (!this.generatedDir.toFile().isDirectory()) {
             return null;
         }
-        final Path path3 = this.createAndValidatePathToStructure(sm, ".nbt");
+        final Path path3 = this.createAndValidatePathToStructure(uh, ".nbt");
         try (final InputStream inputStream4 = new FileInputStream(path3.toFile())) {
             return this.readStructure(inputStream4);
         }
@@ -103,25 +100,25 @@ public class StructureManager implements ResourceManagerReloadListener {
     }
     
     private StructureTemplate readStructure(final InputStream inputStream) throws IOException {
-        final CompoundTag jt3 = NbtIo.readCompressed(inputStream);
-        return this.readStructure(jt3);
+        final CompoundTag le3 = NbtIo.readCompressed(inputStream);
+        return this.readStructure(le3);
     }
     
-    public StructureTemplate readStructure(final CompoundTag jt) {
-        if (!jt.contains("DataVersion", 99)) {
-            jt.putInt("DataVersion", 500);
+    public StructureTemplate readStructure(final CompoundTag le) {
+        if (!le.contains("DataVersion", 99)) {
+            le.putInt("DataVersion", 500);
         }
-        final StructureTemplate cms3 = new StructureTemplate();
-        cms3.load(NbtUtils.update(this.fixerUpper, DataFixTypes.STRUCTURE, jt, jt.getInt("DataVersion")));
-        return cms3;
+        final StructureTemplate cve3 = new StructureTemplate();
+        cve3.load(NbtUtils.update(this.fixerUpper, DataFixTypes.STRUCTURE, le, le.getInt("DataVersion")));
+        return cve3;
     }
     
-    public boolean save(final ResourceLocation sm) {
-        final StructureTemplate cms3 = this.structureRepository.get(sm);
-        if (cms3 == null) {
+    public boolean save(final ResourceLocation uh) {
+        final StructureTemplate cve3 = this.structureRepository.get(uh);
+        if (cve3 == null) {
             return false;
         }
-        final Path path4 = this.createAndValidatePathToStructure(sm, ".nbt");
+        final Path path4 = this.createAndValidatePathToStructure(uh, ".nbt");
         final Path path5 = path4.getParent();
         if (path5 == null) {
             return false;
@@ -133,9 +130,9 @@ public class StructureManager implements ResourceManagerReloadListener {
             StructureManager.LOGGER.error("Failed to create parent directory: {}", path5);
             return false;
         }
-        final CompoundTag jt6 = cms3.save(new CompoundTag());
+        final CompoundTag le6 = cve3.save(new CompoundTag());
         try (final OutputStream outputStream7 = new FileOutputStream(path4.toFile())) {
-            NbtIo.writeCompressed(jt6, outputStream7);
+            NbtIo.writeCompressed(le6, outputStream7);
         }
         catch (Throwable throwable7) {
             return false;
@@ -143,30 +140,30 @@ public class StructureManager implements ResourceManagerReloadListener {
         return true;
     }
     
-    public Path createPathToStructure(final ResourceLocation sm, final String string) {
+    public Path createPathToStructure(final ResourceLocation uh, final String string) {
         try {
-            final Path path4 = this.generatedDir.resolve(sm.getNamespace());
+            final Path path4 = this.generatedDir.resolve(uh.getNamespace());
             final Path path5 = path4.resolve("structures");
-            return FileUtil.createPathToResource(path5, sm.getPath(), string);
+            return FileUtil.createPathToResource(path5, uh.getPath(), string);
         }
         catch (InvalidPathException invalidPathException4) {
-            throw new ResourceLocationException("Invalid resource path: " + sm, invalidPathException4);
+            throw new ResourceLocationException("Invalid resource path: " + uh, invalidPathException4);
         }
     }
     
-    private Path createAndValidatePathToStructure(final ResourceLocation sm, final String string) {
-        if (sm.getPath().contains("//")) {
-            throw new ResourceLocationException("Invalid resource path: " + sm);
+    private Path createAndValidatePathToStructure(final ResourceLocation uh, final String string) {
+        if (uh.getPath().contains("//")) {
+            throw new ResourceLocationException("Invalid resource path: " + uh);
         }
-        final Path path4 = this.createPathToStructure(sm, string);
+        final Path path4 = this.createPathToStructure(uh, string);
         if (!path4.startsWith(this.generatedDir) || !FileUtil.isPathNormalized(path4) || !FileUtil.isPathPortable(path4)) {
             throw new ResourceLocationException("Invalid resource path: " + path4);
         }
         return path4;
     }
     
-    public void remove(final ResourceLocation sm) {
-        this.structureRepository.remove(sm);
+    public void remove(final ResourceLocation uh) {
+        this.structureRepository.remove(uh);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructurePlaceSettings.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructurePlaceSettings.java
index ad44bf3..a23e3b8 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructurePlaceSettings.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructurePlaceSettings.java
@@ -1,6 +1,5 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import java.util.Collections;
 import net.minecraft.core.Vec3i;
 import net.minecraft.util.Mth;
 import net.minecraft.Util;
@@ -31,6 +30,7 @@ public class StructurePlaceSettings {
     private int palette;
     private final List<StructureProcessor> processors;
     private boolean knownShape;
+    private boolean finalizeEntities;
     
     public StructurePlaceSettings() {
         this.mirror = Mirror.NONE;
@@ -41,33 +41,34 @@ public class StructurePlaceSettings {
     }
     
     public StructurePlaceSettings copy() {
-        final StructurePlaceSettings cmp2 = new StructurePlaceSettings();
-        cmp2.mirror = this.mirror;
-        cmp2.rotation = this.rotation;
-        cmp2.rotationPivot = this.rotationPivot;
-        cmp2.ignoreEntities = this.ignoreEntities;
-        cmp2.chunkPos = this.chunkPos;
-        cmp2.boundingBox = this.boundingBox;
-        cmp2.keepLiquids = this.keepLiquids;
-        cmp2.random = this.random;
-        cmp2.palette = this.palette;
-        cmp2.processors.addAll(this.processors);
-        cmp2.knownShape = this.knownShape;
-        return cmp2;
+        final StructurePlaceSettings cvb2 = new StructurePlaceSettings();
+        cvb2.mirror = this.mirror;
+        cvb2.rotation = this.rotation;
+        cvb2.rotationPivot = this.rotationPivot;
+        cvb2.ignoreEntities = this.ignoreEntities;
+        cvb2.chunkPos = this.chunkPos;
+        cvb2.boundingBox = this.boundingBox;
+        cvb2.keepLiquids = this.keepLiquids;
+        cvb2.random = this.random;
+        cvb2.palette = this.palette;
+        cvb2.processors.addAll(this.processors);
+        cvb2.knownShape = this.knownShape;
+        cvb2.finalizeEntities = this.finalizeEntities;
+        return cvb2;
     }
     
-    public StructurePlaceSettings setMirror(final Mirror bsu) {
-        this.mirror = bsu;
+    public StructurePlaceSettings setMirror(final Mirror bzj) {
+        this.mirror = bzj;
         return this;
     }
     
-    public StructurePlaceSettings setRotation(final Rotation btu) {
-        this.rotation = btu;
+    public StructurePlaceSettings setRotation(final Rotation cap) {
+        this.rotation = cap;
         return this;
     }
     
-    public StructurePlaceSettings setRotationPivot(final BlockPos fk) {
-        this.rotationPivot = fk;
+    public StructurePlaceSettings setRotationPivot(final BlockPos fu) {
+        this.rotationPivot = fu;
         return this;
     }
     
@@ -76,13 +77,13 @@ public class StructurePlaceSettings {
         return this;
     }
     
-    public StructurePlaceSettings setChunkPos(final ChunkPos bjh) {
-        this.chunkPos = bjh;
+    public StructurePlaceSettings setChunkPos(final ChunkPos bph) {
+        this.chunkPos = bph;
         return this;
     }
     
-    public StructurePlaceSettings setBoundingBox(final BoundingBox clb) {
-        this.boundingBox = clb;
+    public StructurePlaceSettings setBoundingBox(final BoundingBox ctd) {
+        this.boundingBox = ctd;
         return this;
     }
     
@@ -101,13 +102,13 @@ public class StructurePlaceSettings {
         return this;
     }
     
-    public StructurePlaceSettings addProcessor(final StructureProcessor cmq) {
-        this.processors.add(cmq);
+    public StructurePlaceSettings addProcessor(final StructureProcessor cvc) {
+        this.processors.add(cvc);
         return this;
     }
     
-    public StructurePlaceSettings popProcessor(final StructureProcessor cmq) {
-        this.processors.remove(cmq);
+    public StructurePlaceSettings popProcessor(final StructureProcessor cvc) {
+        this.processors.remove(cvc);
         return this;
     }
     
@@ -123,14 +124,14 @@ public class StructurePlaceSettings {
         return this.rotationPivot;
     }
     
-    public Random getRandom(@Nullable final BlockPos fk) {
+    public Random getRandom(@Nullable final BlockPos fu) {
         if (this.random != null) {
             return this.random;
         }
-        if (fk == null) {
+        if (fu == null) {
             return new Random(Util.getMillis());
         }
-        return new Random(Mth.getSeed(fk));
+        return new Random(Mth.getSeed(fu));
     }
     
     public boolean isIgnoreEntities() {
@@ -163,18 +164,30 @@ public class StructurePlaceSettings {
         return this.keepLiquids;
     }
     
-    public List<StructureTemplate.StructureBlockInfo> getRandomPalette(final List<List<StructureTemplate.StructureBlockInfo>> list, @Nullable final BlockPos fk) {
+    public StructureTemplate.Palette getRandomPalette(final List<StructureTemplate.Palette> list, @Nullable final BlockPos fu) {
         final int integer4 = list.size();
-        return (integer4 > 0) ? list.get(this.getRandom(fk).nextInt(integer4)) : Collections.<StructureTemplate.StructureBlockInfo>emptyList();
+        if (integer4 == 0) {
+            throw new IllegalStateException("No palettes");
+        }
+        return list.get(this.getRandom(fu).nextInt(integer4));
     }
     
     @Nullable
-    private BoundingBox calculateBoundingBox(@Nullable final ChunkPos bjh) {
-        if (bjh == null) {
+    private BoundingBox calculateBoundingBox(@Nullable final ChunkPos bph) {
+        if (bph == null) {
             return this.boundingBox;
         }
-        final int integer3 = bjh.x * 16;
-        final int integer4 = bjh.z * 16;
+        final int integer3 = bph.x * 16;
+        final int integer4 = bph.z * 16;
         return new BoundingBox(integer3, 0, integer4, integer3 + 16 - 1, 255, integer4 + 16 - 1);
     }
+    
+    public StructurePlaceSettings setFinalizeEntities(final boolean boolean1) {
+        this.finalizeEntities = boolean1;
+        return this;
+    }
+    
+    public boolean shouldFinalizeEntities() {
+        return this.finalizeEntities;
+    }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessor.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessor.java
index 18ba888..e09d283 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessor.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessor.java
@@ -1,21 +1,12 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 
 public abstract class StructureProcessor {
     @Nullable
-    public abstract StructureTemplate.StructureBlockInfo processBlock(final LevelReader bjz, final BlockPos fk, final StructureTemplate.StructureBlockInfo b3, final StructureTemplate.StructureBlockInfo b4, final StructurePlaceSettings cmp);
+    public abstract StructureTemplate.StructureBlockInfo processBlock(final LevelReader bqd, final BlockPos fu2, final BlockPos fu3, final StructureTemplate.StructureBlockInfo c4, final StructureTemplate.StructureBlockInfo c5, final StructurePlaceSettings cvb);
     
-    protected abstract StructureProcessorType getType();
-    
-    protected abstract <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps);
-    
-    public <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.mergeInto(this.getDynamic((com.mojang.datafixers.types.DynamicOps<Object>)dynamicOps).getValue(), dynamicOps.createString("processor_type"), dynamicOps.createString(Registry.STRUCTURE_PROCESSOR.getKey(this.getType()).toString())));
-    }
+    protected abstract StructureProcessorType<?> getType();
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorType.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorType.java
index 864a11b..2115c63 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorType.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorType.java
@@ -1,18 +1,24 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import com.mojang.datafixers.Dynamic;
+import java.util.function.Function;
 import net.minecraft.core.Registry;
-import net.minecraft.util.Deserializer;
+import com.mojang.serialization.Codec;
 
-public interface StructureProcessorType extends Deserializer<StructureProcessor> {
-    public static final StructureProcessorType BLOCK_IGNORE = register("block_ignore", BlockIgnoreProcessor::new);
-    public static final StructureProcessorType BLOCK_ROT = register("block_rot", BlockRotProcessor::new);
-    public static final StructureProcessorType GRAVITY = register("gravity", GravityProcessor::new);
-    public static final StructureProcessorType JIGSAW_REPLACEMENT = register("jigsaw_replacement", dynamic -> JigsawReplacementProcessor.INSTANCE);
-    public static final StructureProcessorType RULE = register("rule", RuleProcessor::new);
-    public static final StructureProcessorType NOP = register("nop", dynamic -> NopProcessor.INSTANCE);
+public interface StructureProcessorType<P extends StructureProcessor> {
+    public static final StructureProcessorType<BlockIgnoreProcessor> BLOCK_IGNORE = StructureProcessorType.<BlockIgnoreProcessor>register("block_ignore", BlockIgnoreProcessor.CODEC);
+    public static final StructureProcessorType<BlockRotProcessor> BLOCK_ROT = StructureProcessorType.<BlockRotProcessor>register("block_rot", BlockRotProcessor.CODEC);
+    public static final StructureProcessorType<GravityProcessor> GRAVITY = StructureProcessorType.<GravityProcessor>register("gravity", GravityProcessor.CODEC);
+    public static final StructureProcessorType<JigsawReplacementProcessor> JIGSAW_REPLACEMENT = StructureProcessorType.<JigsawReplacementProcessor>register("jigsaw_replacement", JigsawReplacementProcessor.CODEC);
+    public static final StructureProcessorType<RuleProcessor> RULE = StructureProcessorType.<RuleProcessor>register("rule", RuleProcessor.CODEC);
+    public static final StructureProcessorType<NopProcessor> NOP = StructureProcessorType.<NopProcessor>register("nop", NopProcessor.CODEC);
+    public static final StructureProcessorType<BlockAgeProcessor> BLOCK_AGE = StructureProcessorType.<BlockAgeProcessor>register("block_age", BlockAgeProcessor.CODEC);
+    public static final StructureProcessorType<BlackstoneReplaceProcessor> BLACKSTONE_REPLACE = StructureProcessorType.<BlackstoneReplaceProcessor>register("blackstone_replace", BlackstoneReplaceProcessor.CODEC);
+    public static final StructureProcessorType<LavaSubmergedBlockProcessor> LAVA_SUBMERGED_BLOCK = StructureProcessorType.<LavaSubmergedBlockProcessor>register("lava_submerged_block", LavaSubmergedBlockProcessor.CODEC);
+    public static final Codec<StructureProcessor> CODEC = Registry.STRUCTURE_PROCESSOR.dispatch("processor_type", (Function)StructureProcessor::getType, (Function)StructureProcessorType::codec);
     
-    default StructureProcessorType register(final String string, final StructureProcessorType cmr) {
-        return Registry.<StructureProcessorType>register(Registry.STRUCTURE_PROCESSOR, string, cmr);
+    Codec<P> codec();
+    
+    default <P extends StructureProcessor> StructureProcessorType<P> register(final String string, final Codec<P> codec) {
+        return Registry.<StructureProcessorType<P>>register(Registry.STRUCTURE_PROCESSOR, string, () -> codec);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
index ec58d1d..c584c04 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
@@ -1,13 +1,19 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
 import java.util.AbstractList;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import com.google.common.collect.Maps;
+import java.util.Map;
 import net.minecraft.core.IdMapper;
 import net.minecraft.nbt.IntTag;
-import java.util.Comparator;
 import net.minecraft.SharedConstants;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.world.entity.EntityType;
 import java.util.Optional;
+import net.minecraft.world.entity.SpawnGroupData;
+import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.DoubleTag;
 import net.minecraft.nbt.ListTag;
@@ -19,21 +25,26 @@ import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.shapes.BitSetDiscreteVoxelShape;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.LiquidBlockContainer;
+import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.Clearable;
+import java.util.Random;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import java.util.Collections;
 import net.minecraft.world.entity.decoration.Painting;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.entity.Entity;
+import java.util.Collection;
+import java.util.Comparator;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.EmptyBlockGetter;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import java.util.Iterator;
-import java.util.Collection;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.core.Vec3i;
 import javax.annotation.Nullable;
@@ -44,7 +55,7 @@ import net.minecraft.core.BlockPos;
 import java.util.List;
 
 public class StructureTemplate {
-    private final List<List<StructureBlockInfo>> palettes;
+    private final List<Palette> palettes;
     private final List<StructureEntityInfo> entityInfoList;
     private BlockPos size;
     private String author;
@@ -68,311 +79,336 @@ public class StructureTemplate {
         return this.author;
     }
     
-    public void fillFromWorld(final Level bjw, final BlockPos fk2, final BlockPos fk3, final boolean boolean4, @Nullable final Block bph) {
-        if (fk3.getX() < 1 || fk3.getY() < 1 || fk3.getZ() < 1) {
+    public void fillFromWorld(final Level bqb, final BlockPos fu2, final BlockPos fu3, final boolean boolean4, @Nullable final Block bvr) {
+        if (fu3.getX() < 1 || fu3.getY() < 1 || fu3.getZ() < 1) {
             return;
         }
-        final BlockPos fk4 = fk2.offset(fk3).offset(-1, -1, -1);
+        final BlockPos fu4 = fu2.offset(fu3).offset(-1, -1, -1);
         final List<StructureBlockInfo> list8 = Lists.newArrayList();
         final List<StructureBlockInfo> list9 = Lists.newArrayList();
         final List<StructureBlockInfo> list10 = Lists.newArrayList();
-        final BlockPos fk5 = new BlockPos(Math.min(fk2.getX(), fk4.getX()), Math.min(fk2.getY(), fk4.getY()), Math.min(fk2.getZ(), fk4.getZ()));
-        final BlockPos fk6 = new BlockPos(Math.max(fk2.getX(), fk4.getX()), Math.max(fk2.getY(), fk4.getY()), Math.max(fk2.getZ(), fk4.getZ()));
-        this.size = fk3;
-        for (final BlockPos fk7 : BlockPos.betweenClosed(fk5, fk6)) {
-            final BlockPos fk8 = fk7.subtract(fk5);
-            final BlockState byj16 = bjw.getBlockState(fk7);
-            if (bph != null && bph == byj16.getBlock()) {
+        final BlockPos fu5 = new BlockPos(Math.min(fu2.getX(), fu4.getX()), Math.min(fu2.getY(), fu4.getY()), Math.min(fu2.getZ(), fu4.getZ()));
+        final BlockPos fu6 = new BlockPos(Math.max(fu2.getX(), fu4.getX()), Math.max(fu2.getY(), fu4.getY()), Math.max(fu2.getZ(), fu4.getZ()));
+        this.size = fu3;
+        for (final BlockPos fu7 : BlockPos.betweenClosed(fu5, fu6)) {
+            final BlockPos fu8 = fu7.subtract(fu5);
+            final BlockState cfj16 = bqb.getBlockState(fu7);
+            if (bvr != null && bvr == cfj16.getBlock()) {
                 continue;
             }
-            final BlockEntity bwl17 = bjw.getBlockEntity(fk7);
-            if (bwl17 != null) {
-                final CompoundTag jt18 = bwl17.save(new CompoundTag());
-                jt18.remove("x");
-                jt18.remove("y");
-                jt18.remove("z");
-                list9.add(new StructureBlockInfo(fk8, byj16, jt18));
-            }
-            else if (byj16.isSolidRender(bjw, fk7) || byj16.isCollisionShapeFullBlock(bjw, fk7)) {
-                list8.add(new StructureBlockInfo(fk8, byj16, null));
+            final BlockEntity cdl17 = bqb.getBlockEntity(fu7);
+            StructureBlockInfo c18;
+            if (cdl17 != null) {
+                final CompoundTag le19 = cdl17.save(new CompoundTag());
+                le19.remove("x");
+                le19.remove("y");
+                le19.remove("z");
+                c18 = new StructureBlockInfo(fu8, cfj16, le19.copy());
             }
             else {
-                list10.add(new StructureBlockInfo(fk8, byj16, null));
+                c18 = new StructureBlockInfo(fu8, cfj16, null);
             }
+            addToLists(c18, list8, list9, list10);
         }
-        final List<StructureBlockInfo> list11 = Lists.newArrayList();
-        list11.addAll(list8);
-        list11.addAll(list9);
-        list11.addAll(list10);
+        final List<StructureBlockInfo> list11 = buildInfoList(list8, list9, list10);
         this.palettes.clear();
-        this.palettes.add(list11);
+        this.palettes.add(new Palette((List)list11));
         if (boolean4) {
-            this.fillEntityList(bjw, fk5, fk6.offset(1, 1, 1));
+            this.fillEntityList(bqb, fu5, fu6.offset(1, 1, 1));
         }
         else {
             this.entityInfoList.clear();
         }
     }
     
-    private void fillEntityList(final Level bjw, final BlockPos fk2, final BlockPos fk3) {
-        final List<Entity> list5 = bjw.<Entity>getEntitiesOfClass(Entity.class, new AABB(fk2, fk3), akq -> !(akq instanceof Player));
-        this.entityInfoList.clear();
-        for (final Entity akq2 : list5) {
-            final Vec3 cvl8 = new Vec3(akq2.getX() - fk2.getX(), akq2.getY() - fk2.getY(), akq2.getZ() - fk2.getZ());
-            final CompoundTag jt9 = new CompoundTag();
-            akq2.save(jt9);
-            BlockPos fk4;
-            if (akq2 instanceof Painting) {
-                fk4 = ((Painting)akq2).getPos().subtract(fk2);
-            }
-            else {
-                fk4 = new BlockPos(cvl8);
-            }
-            this.entityInfoList.add(new StructureEntityInfo(cvl8, fk4, jt9));
+    private static void addToLists(final StructureBlockInfo c, final List<StructureBlockInfo> list2, final List<StructureBlockInfo> list3, final List<StructureBlockInfo> list4) {
+        if (c.nbt != null) {
+            list3.add(c);
+        }
+        else if (!c.state.getBlock().hasDynamicShape() && c.state.isCollisionShapeFullBlock(EmptyBlockGetter.INSTANCE, BlockPos.ZERO)) {
+            list2.add(c);
+        }
+        else {
+            list4.add(c);
         }
     }
     
-    public List<StructureBlockInfo> filterBlocks(final BlockPos fk, final StructurePlaceSettings cmp, final Block bph) {
-        return this.filterBlocks(fk, cmp, bph, true);
+    private static List<StructureBlockInfo> buildInfoList(final List<StructureBlockInfo> list1, final List<StructureBlockInfo> list2, final List<StructureBlockInfo> list3) {
+        final Comparator<StructureBlockInfo> comparator4 = Comparator.<StructureBlockInfo>comparingInt(c -> c.pos.getY()).thenComparingInt(c -> c.pos.getX()).thenComparingInt(c -> c.pos.getZ());
+        list1.sort(comparator4);
+        list3.sort(comparator4);
+        list2.sort(comparator4);
+        final List<StructureBlockInfo> list4 = Lists.newArrayList();
+        list4.addAll(list1);
+        list4.addAll(list3);
+        list4.addAll(list2);
+        return list4;
     }
     
-    public List<StructureBlockInfo> filterBlocks(final BlockPos fk, final StructurePlaceSettings cmp, final Block bph, final boolean boolean4) {
+    private void fillEntityList(final Level bqb, final BlockPos fu2, final BlockPos fu3) {
+        final List<Entity> list5 = bqb.<Entity>getEntitiesOfClass(Entity.class, new AABB(fu2, fu3), aom -> !(aom instanceof Player));
+        this.entityInfoList.clear();
+        for (final Entity aom2 : list5) {
+            final Vec3 dem8 = new Vec3(aom2.getX() - fu2.getX(), aom2.getY() - fu2.getY(), aom2.getZ() - fu2.getZ());
+            final CompoundTag le9 = new CompoundTag();
+            aom2.save(le9);
+            BlockPos fu4;
+            if (aom2 instanceof Painting) {
+                fu4 = ((Painting)aom2).getPos().subtract(fu2);
+            }
+            else {
+                fu4 = new BlockPos(dem8);
+            }
+            this.entityInfoList.add(new StructureEntityInfo(dem8, fu4, le9.copy()));
+        }
+    }
+    
+    public List<StructureBlockInfo> filterBlocks(final BlockPos fu, final StructurePlaceSettings cvb, final Block bvr) {
+        return this.filterBlocks(fu, cvb, bvr, true);
+    }
+    
+    public List<StructureBlockInfo> filterBlocks(final BlockPos fu, final StructurePlaceSettings cvb, final Block bvr, final boolean boolean4) {
         final List<StructureBlockInfo> list6 = Lists.newArrayList();
-        final BoundingBox clb7 = cmp.getBoundingBox();
-        for (final StructureBlockInfo b9 : cmp.getRandomPalette(this.palettes, fk)) {
-            final BlockPos fk2 = boolean4 ? calculateRelativePosition(cmp, b9.pos).offset(fk) : b9.pos;
-            if (clb7 != null && !clb7.isInside(fk2)) {
+        final BoundingBox ctd7 = cvb.getBoundingBox();
+        if (this.palettes.isEmpty()) {
+            return Collections.<StructureBlockInfo>emptyList();
+        }
+        for (final StructureBlockInfo c9 : cvb.getRandomPalette(this.palettes, fu).blocks(bvr)) {
+            final BlockPos fu2 = boolean4 ? calculateRelativePosition(cvb, c9.pos).offset(fu) : c9.pos;
+            if (ctd7 != null && !ctd7.isInside(fu2)) {
                 continue;
             }
-            final BlockState byj11 = b9.state;
-            if (byj11.getBlock() != bph) {
-                continue;
-            }
-            list6.add(new StructureBlockInfo(fk2, byj11.rotate(cmp.getRotation()), b9.nbt));
+            list6.add(new StructureBlockInfo(fu2, c9.state.rotate(cvb.getRotation()), c9.nbt));
         }
         return list6;
     }
     
-    public BlockPos calculateConnectedPosition(final StructurePlaceSettings cmp1, final BlockPos fk2, final StructurePlaceSettings cmp3, final BlockPos fk4) {
-        final BlockPos fk5 = calculateRelativePosition(cmp1, fk2);
-        final BlockPos fk6 = calculateRelativePosition(cmp3, fk4);
-        return fk5.subtract(fk6);
+    public BlockPos calculateConnectedPosition(final StructurePlaceSettings cvb1, final BlockPos fu2, final StructurePlaceSettings cvb3, final BlockPos fu4) {
+        final BlockPos fu5 = calculateRelativePosition(cvb1, fu2);
+        final BlockPos fu6 = calculateRelativePosition(cvb3, fu4);
+        return fu5.subtract(fu6);
     }
     
-    public static BlockPos calculateRelativePosition(final StructurePlaceSettings cmp, final BlockPos fk) {
-        return transform(fk, cmp.getMirror(), cmp.getRotation(), cmp.getRotationPivot());
+    public static BlockPos calculateRelativePosition(final StructurePlaceSettings cvb, final BlockPos fu) {
+        return transform(fu, cvb.getMirror(), cvb.getRotation(), cvb.getRotationPivot());
     }
     
-    public void placeInWorldChunk(final LevelAccessor bjx, final BlockPos fk, final StructurePlaceSettings cmp) {
-        cmp.updateBoundingBoxFromChunkPos();
-        this.placeInWorld(bjx, fk, cmp);
+    public void placeInWorldChunk(final LevelAccessor bqc, final BlockPos fu, final StructurePlaceSettings cvb, final Random random) {
+        cvb.updateBoundingBoxFromChunkPos();
+        this.placeInWorld(bqc, fu, cvb, random);
     }
     
-    public void placeInWorld(final LevelAccessor bjx, final BlockPos fk, final StructurePlaceSettings cmp) {
-        this.placeInWorld(bjx, fk, cmp, 2);
+    public void placeInWorld(final LevelAccessor bqc, final BlockPos fu, final StructurePlaceSettings cvb, final Random random) {
+        this.placeInWorld(bqc, fu, fu, cvb, random, 2);
     }
     
-    public boolean placeInWorld(final LevelAccessor bjx, final BlockPos fk, final StructurePlaceSettings cmp, final int integer) {
+    public boolean placeInWorld(final LevelAccessor bqc, final BlockPos fu2, final BlockPos fu3, final StructurePlaceSettings cvb, final Random random, final int integer) {
         if (this.palettes.isEmpty()) {
             return false;
         }
-        final List<StructureBlockInfo> list6 = cmp.getRandomPalette(this.palettes, fk);
-        if ((list6.isEmpty() && (cmp.isIgnoreEntities() || this.entityInfoList.isEmpty())) || this.size.getX() < 1 || this.size.getY() < 1 || this.size.getZ() < 1) {
+        final List<StructureBlockInfo> list8 = cvb.getRandomPalette(this.palettes, fu2).blocks();
+        if ((list8.isEmpty() && (cvb.isIgnoreEntities() || this.entityInfoList.isEmpty())) || this.size.getX() < 1 || this.size.getY() < 1 || this.size.getZ() < 1) {
             return false;
         }
-        final BoundingBox clb7 = cmp.getBoundingBox();
-        final List<BlockPos> list7 = Lists.newArrayListWithCapacity(cmp.shouldKeepLiquids() ? list6.size() : 0);
-        final List<Pair<BlockPos, CompoundTag>> list8 = Lists.newArrayListWithCapacity(list6.size());
+        final BoundingBox ctd9 = cvb.getBoundingBox();
+        final List<BlockPos> list9 = Lists.newArrayListWithCapacity(cvb.shouldKeepLiquids() ? list8.size() : 0);
+        final List<Pair<BlockPos, CompoundTag>> list10 = Lists.newArrayListWithCapacity(list8.size());
         int integer2 = Integer.MAX_VALUE;
         int integer3 = Integer.MAX_VALUE;
         int integer4 = Integer.MAX_VALUE;
         int integer5 = Integer.MIN_VALUE;
         int integer6 = Integer.MIN_VALUE;
         int integer7 = Integer.MIN_VALUE;
-        final List<StructureBlockInfo> list9 = processBlockInfos(bjx, fk, cmp, list6);
-        for (final StructureBlockInfo b18 : list9) {
-            final BlockPos fk2 = b18.pos;
-            if (clb7 != null && !clb7.isInside(fk2)) {
+        final List<StructureBlockInfo> list11 = processBlockInfos(bqc, fu2, fu3, cvb, list8);
+        for (final StructureBlockInfo c20 : list11) {
+            final BlockPos fu4 = c20.pos;
+            if (ctd9 != null && !ctd9.isInside(fu4)) {
                 continue;
             }
-            final FluidState coj20 = cmp.shouldKeepLiquids() ? bjx.getFluidState(fk2) : null;
-            final BlockState byj21 = b18.state.mirror(cmp.getMirror()).rotate(cmp.getRotation());
-            if (b18.nbt != null) {
-                final BlockEntity bwl22 = bjx.getBlockEntity(fk2);
-                Clearable.tryClear(bwl22);
-                bjx.setBlock(fk2, Blocks.BARRIER.defaultBlockState(), 20);
+            final FluidState cxa22 = cvb.shouldKeepLiquids() ? bqc.getFluidState(fu4) : null;
+            final BlockState cfj23 = c20.state.mirror(cvb.getMirror()).rotate(cvb.getRotation());
+            if (c20.nbt != null) {
+                final BlockEntity cdl24 = bqc.getBlockEntity(fu4);
+                Clearable.tryClear(cdl24);
+                bqc.setBlock(fu4, Blocks.BARRIER.defaultBlockState(), 20);
             }
-            if (!bjx.setBlock(fk2, byj21, integer)) {
+            if (!bqc.setBlock(fu4, cfj23, integer)) {
                 continue;
             }
-            integer2 = Math.min(integer2, fk2.getX());
-            integer3 = Math.min(integer3, fk2.getY());
-            integer4 = Math.min(integer4, fk2.getZ());
-            integer5 = Math.max(integer5, fk2.getX());
-            integer6 = Math.max(integer6, fk2.getY());
-            integer7 = Math.max(integer7, fk2.getZ());
-            list8.add((Pair<BlockPos, CompoundTag>)Pair.of(fk2, b18.nbt));
-            if (b18.nbt != null) {
-                final BlockEntity bwl22 = bjx.getBlockEntity(fk2);
-                if (bwl22 != null) {
-                    b18.nbt.putInt("x", fk2.getX());
-                    b18.nbt.putInt("y", fk2.getY());
-                    b18.nbt.putInt("z", fk2.getZ());
-                    bwl22.load(b18.nbt);
-                    bwl22.mirror(cmp.getMirror());
-                    bwl22.rotate(cmp.getRotation());
+            integer2 = Math.min(integer2, fu4.getX());
+            integer3 = Math.min(integer3, fu4.getY());
+            integer4 = Math.min(integer4, fu4.getZ());
+            integer5 = Math.max(integer5, fu4.getX());
+            integer6 = Math.max(integer6, fu4.getY());
+            integer7 = Math.max(integer7, fu4.getZ());
+            list10.add((Pair<BlockPos, CompoundTag>)Pair.of(fu4, c20.nbt));
+            if (c20.nbt != null) {
+                final BlockEntity cdl24 = bqc.getBlockEntity(fu4);
+                if (cdl24 != null) {
+                    c20.nbt.putInt("x", fu4.getX());
+                    c20.nbt.putInt("y", fu4.getY());
+                    c20.nbt.putInt("z", fu4.getZ());
+                    if (cdl24 instanceof RandomizableContainerBlockEntity) {
+                        c20.nbt.putLong("LootTableSeed", random.nextLong());
+                    }
+                    cdl24.load(c20.state, c20.nbt);
+                    cdl24.mirror(cvb.getMirror());
+                    cdl24.rotate(cvb.getRotation());
                 }
             }
-            if (coj20 == null || !(byj21.getBlock() instanceof LiquidBlockContainer)) {
+            if (cxa22 == null || !(cfj23.getBlock() instanceof LiquidBlockContainer)) {
                 continue;
             }
-            ((LiquidBlockContainer)byj21.getBlock()).placeLiquid(bjx, fk2, byj21, coj20);
-            if (coj20.isSource()) {
+            ((LiquidBlockContainer)cfj23.getBlock()).placeLiquid(bqc, fu4, cfj23, cxa22);
+            if (cxa22.isSource()) {
                 continue;
             }
-            list7.add(fk2);
+            list9.add(fu4);
         }
-        boolean boolean17 = true;
-        final Direction[] arr18 = { Direction.UP, Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST };
-        while (boolean17 && !list7.isEmpty()) {
-            boolean17 = false;
-            final Iterator<BlockPos> iterator19 = list7.iterator();
-            while (iterator19.hasNext()) {
-                BlockPos fk4;
-                final BlockPos fk3 = fk4 = iterator19.next();
-                FluidState coj21 = bjx.getFluidState(fk4);
-                for (int integer8 = 0; integer8 < arr18.length && !coj21.isSource(); ++integer8) {
-                    final BlockPos fk5 = fk4.relative(arr18[integer8]);
-                    final FluidState coj22 = bjx.getFluidState(fk5);
-                    if (coj22.getHeight(bjx, fk5) > coj21.getHeight(bjx, fk4) || (coj22.isSource() && !coj21.isSource())) {
-                        coj21 = coj22;
-                        fk4 = fk5;
+        boolean boolean19 = true;
+        final Direction[] arr20 = { Direction.UP, Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST };
+        while (boolean19 && !list9.isEmpty()) {
+            boolean19 = false;
+            final Iterator<BlockPos> iterator21 = list9.iterator();
+            while (iterator21.hasNext()) {
+                BlockPos fu6;
+                final BlockPos fu5 = fu6 = iterator21.next();
+                FluidState cxa23 = bqc.getFluidState(fu6);
+                for (int integer8 = 0; integer8 < arr20.length && !cxa23.isSource(); ++integer8) {
+                    final BlockPos fu7 = fu6.relative(arr20[integer8]);
+                    final FluidState cxa24 = bqc.getFluidState(fu7);
+                    if (cxa24.getHeight(bqc, fu7) > cxa23.getHeight(bqc, fu6) || (cxa24.isSource() && !cxa23.isSource())) {
+                        cxa23 = cxa24;
+                        fu6 = fu7;
                     }
                 }
-                if (coj21.isSource()) {
-                    final BlockState byj22 = bjx.getBlockState(fk3);
-                    final Block bph24 = byj22.getBlock();
-                    if (!(bph24 instanceof LiquidBlockContainer)) {
+                if (cxa23.isSource()) {
+                    final BlockState cfj24 = bqc.getBlockState(fu5);
+                    final Block bvr26 = cfj24.getBlock();
+                    if (!(bvr26 instanceof LiquidBlockContainer)) {
                         continue;
                     }
-                    ((LiquidBlockContainer)bph24).placeLiquid(bjx, fk3, byj22, coj21);
-                    boolean17 = true;
-                    iterator19.remove();
+                    ((LiquidBlockContainer)bvr26).placeLiquid(bqc, fu5, cfj24, cxa23);
+                    boolean19 = true;
+                    iterator21.remove();
                 }
             }
         }
         if (integer2 <= integer5) {
-            if (!cmp.getKnownShape()) {
-                final DiscreteVoxelShape cvu19 = new BitSetDiscreteVoxelShape(integer5 - integer2 + 1, integer6 - integer3 + 1, integer7 - integer4 + 1);
+            if (!cvb.getKnownShape()) {
+                final DiscreteVoxelShape dev21 = new BitSetDiscreteVoxelShape(integer5 - integer2 + 1, integer6 - integer3 + 1, integer7 - integer4 + 1);
                 final int integer9 = integer2;
                 final int integer10 = integer3;
                 final int integer11 = integer4;
-                for (final Pair<BlockPos, CompoundTag> pair24 : list8) {
-                    final BlockPos fk6 = (BlockPos)pair24.getFirst();
-                    cvu19.setFull(fk6.getX() - integer9, fk6.getY() - integer10, fk6.getZ() - integer11, true, true);
+                for (final Pair<BlockPos, CompoundTag> pair26 : list10) {
+                    final BlockPos fu8 = (BlockPos)pair26.getFirst();
+                    dev21.setFull(fu8.getX() - integer9, fu8.getY() - integer10, fu8.getZ() - integer11, true, true);
                 }
-                updateShapeAtEdge(bjx, integer, cvu19, integer9, integer10, integer11);
+                updateShapeAtEdge(bqc, integer, dev21, integer9, integer10, integer11);
             }
-            for (final Pair<BlockPos, CompoundTag> pair25 : list8) {
-                final BlockPos fk4 = (BlockPos)pair25.getFirst();
-                if (!cmp.getKnownShape()) {
-                    final BlockState byj23 = bjx.getBlockState(fk4);
-                    final BlockState byj22 = Block.updateFromNeighbourShapes(byj23, bjx, fk4);
-                    if (byj23 != byj22) {
-                        bjx.setBlock(fk4, byj22, (integer & 0xFFFFFFFE) | 0x10);
+            for (final Pair<BlockPos, CompoundTag> pair27 : list10) {
+                final BlockPos fu6 = (BlockPos)pair27.getFirst();
+                if (!cvb.getKnownShape()) {
+                    final BlockState cfj25 = bqc.getBlockState(fu6);
+                    final BlockState cfj24 = Block.updateFromNeighbourShapes(cfj25, bqc, fu6);
+                    if (cfj25 != cfj24) {
+                        bqc.setBlock(fu6, cfj24, (integer & 0xFFFFFFFE) | 0x10);
                     }
-                    bjx.blockUpdated(fk4, byj22.getBlock());
+                    bqc.blockUpdated(fu6, cfj24.getBlock());
                 }
-                if (pair25.getSecond() != null) {
-                    final BlockEntity bwl22 = bjx.getBlockEntity(fk4);
-                    if (bwl22 == null) {
+                if (pair27.getSecond() != null) {
+                    final BlockEntity cdl24 = bqc.getBlockEntity(fu6);
+                    if (cdl24 == null) {
                         continue;
                     }
-                    bwl22.setChanged();
+                    cdl24.setChanged();
                 }
             }
         }
-        if (!cmp.isIgnoreEntities()) {
-            this.placeEntities(bjx, fk, cmp.getMirror(), cmp.getRotation(), cmp.getRotationPivot(), clb7);
+        if (!cvb.isIgnoreEntities()) {
+            this.placeEntities(bqc, fu2, cvb.getMirror(), cvb.getRotation(), cvb.getRotationPivot(), ctd9, cvb.shouldFinalizeEntities());
         }
         return true;
     }
     
-    public static void updateShapeAtEdge(final LevelAccessor bjx, final int integer2, final DiscreteVoxelShape cvu, final int integer4, final int integer5, final int integer6) {
-        final BlockPos fk10;
-        final BlockPos fk11;
-        final BlockState byj12;
-        final BlockState byj13;
-        final BlockState byj14;
-        final BlockState byj15;
-        cvu.forAllFaces((fp, integer7, integer8, integer9) -> {
-            fk10 = new BlockPos(integer4 + integer7, integer5 + integer8, integer6 + integer9);
-            fk11 = fk10.relative(fp);
-            byj12 = bjx.getBlockState(fk10);
-            byj13 = bjx.getBlockState(fk11);
-            byj14 = byj12.updateShape(fp, byj13, bjx, fk10, fk11);
-            if (byj12 != byj14) {
-                bjx.setBlock(fk10, byj14, (integer2 & 0xFFFFFFFE) | 0x10);
+    public static void updateShapeAtEdge(final LevelAccessor bqc, final int integer2, final DiscreteVoxelShape dev, final int integer4, final int integer5, final int integer6) {
+        final BlockPos fu10;
+        final BlockPos fu11;
+        final BlockState cfj12;
+        final BlockState cfj13;
+        final BlockState cfj14;
+        final BlockState cfj15;
+        dev.forAllFaces((fz, integer7, integer8, integer9) -> {
+            fu10 = new BlockPos(integer4 + integer7, integer5 + integer8, integer6 + integer9);
+            fu11 = fu10.relative(fz);
+            cfj12 = bqc.getBlockState(fu10);
+            cfj13 = bqc.getBlockState(fu11);
+            cfj14 = cfj12.updateShape(fz, cfj13, bqc, fu10, fu11);
+            if (cfj12 != cfj14) {
+                bqc.setBlock(fu10, cfj14, integer2 & 0xFFFFFFFE);
             }
-            byj15 = byj13.updateShape(fp.getOpposite(), byj14, bjx, fk11, fk10);
-            if (byj13 != byj15) {
-                bjx.setBlock(fk11, byj15, (integer2 & 0xFFFFFFFE) | 0x10);
+            cfj15 = cfj13.updateShape(fz.getOpposite(), cfj14, bqc, fu11, fu10);
+            if (cfj13 != cfj15) {
+                bqc.setBlock(fu11, cfj15, integer2 & 0xFFFFFFFE);
             }
         });
     }
     
-    public static List<StructureBlockInfo> processBlockInfos(final LevelAccessor bjx, final BlockPos fk, final StructurePlaceSettings cmp, final List<StructureBlockInfo> list) {
+    public static List<StructureBlockInfo> processBlockInfos(final LevelAccessor bqc, final BlockPos fu2, final BlockPos fu3, final StructurePlaceSettings cvb, final List<StructureBlockInfo> list) {
         final List<StructureBlockInfo> list2 = Lists.newArrayList();
-        for (final StructureBlockInfo b7 : list) {
-            final BlockPos fk2 = calculateRelativePosition(cmp, b7.pos).offset(fk);
-            StructureBlockInfo b8 = new StructureBlockInfo(fk2, b7.state, b7.nbt);
-            for (Iterator<StructureProcessor> iterator10 = cmp.getProcessors().iterator(); b8 != null && iterator10.hasNext(); b8 = iterator10.next().processBlock(bjx, fk, b7, b8, cmp)) {}
-            if (b8 != null) {
-                list2.add(b8);
+        for (final StructureBlockInfo c8 : list) {
+            final BlockPos fu4 = calculateRelativePosition(cvb, c8.pos).offset(fu2);
+            StructureBlockInfo c9 = new StructureBlockInfo(fu4, c8.state, (c8.nbt != null) ? c8.nbt.copy() : null);
+            for (Iterator<StructureProcessor> iterator11 = cvb.getProcessors().iterator(); c9 != null && iterator11.hasNext(); c9 = iterator11.next().processBlock(bqc, fu2, fu3, c8, c9, cvb)) {}
+            if (c9 != null) {
+                list2.add(c9);
             }
         }
         return list2;
     }
     
-    private void placeEntities(final LevelAccessor bjx, final BlockPos fk2, final Mirror bsu, final Rotation btu, final BlockPos fk5, @Nullable final BoundingBox clb) {
-        for (final StructureEntityInfo c9 : this.entityInfoList) {
-            final BlockPos fk6 = transform(c9.blockPos, bsu, btu, fk5).offset(fk2);
-            if (clb != null && !clb.isInside(fk6)) {
+    private void placeEntities(final LevelAccessor bqc, final BlockPos fu2, final Mirror bzj, final Rotation cap, final BlockPos fu5, @Nullable final BoundingBox ctd, final boolean boolean7) {
+        for (final StructureEntityInfo d10 : this.entityInfoList) {
+            final BlockPos fu6 = transform(d10.blockPos, bzj, cap, fu5).offset(fu2);
+            if (ctd != null && !ctd.isInside(fu6)) {
                 continue;
             }
-            final CompoundTag jt11 = c9.nbt;
-            final Vec3 cvl12 = transform(c9.pos, bsu, btu, fk5);
-            final Vec3 cvl13 = cvl12.add(fk2.getX(), fk2.getY(), fk2.getZ());
-            final ListTag jz14 = new ListTag();
-            ((AbstractList<DoubleTag>)jz14).add(DoubleTag.valueOf(cvl13.x));
-            ((AbstractList<DoubleTag>)jz14).add(DoubleTag.valueOf(cvl13.y));
-            ((AbstractList<DoubleTag>)jz14).add(DoubleTag.valueOf(cvl13.z));
-            jt11.put("Pos", jz14);
-            jt11.remove("UUIDMost");
-            jt11.remove("UUIDLeast");
-            final float float6;
-            final float float7;
-            final Vec3 vec3;
-            createEntityIgnoreException(bjx, jt11).ifPresent(akq -> {
-                float6 = akq.mirror(bsu);
-                float7 = float6 + (akq.yRot - akq.rotate(btu));
-                akq.moveTo(vec3.x, vec3.y, vec3.z, float7, akq.xRot);
-                bjx.addFreshEntity(akq);
+            final CompoundTag le12 = d10.nbt.copy();
+            final Vec3 dem13 = transform(d10.pos, bzj, cap, fu5);
+            final Vec3 dem14 = dem13.add(fu2.getX(), fu2.getY(), fu2.getZ());
+            final ListTag lk15 = new ListTag();
+            ((AbstractList<DoubleTag>)lk15).add(DoubleTag.valueOf(dem14.x));
+            ((AbstractList<DoubleTag>)lk15).add(DoubleTag.valueOf(dem14.y));
+            ((AbstractList<DoubleTag>)lk15).add(DoubleTag.valueOf(dem14.z));
+            le12.put("Pos", lk15);
+            le12.remove("UUID");
+            final float float8;
+            final float float9;
+            final Vec3 dem15;
+            final CompoundTag le13;
+            createEntityIgnoreException(bqc, le12).ifPresent(aom -> {
+                float8 = aom.mirror(bzj);
+                float9 = float8 + (aom.yRot - aom.rotate(cap));
+                aom.moveTo(dem15.x, dem15.y, dem15.z, float9, aom.xRot);
+                if (boolean7 && aom instanceof Mob) {
+                    aom.finalizeSpawn(bqc, bqc.getCurrentDifficultyAt(new BlockPos(dem15)), MobSpawnType.STRUCTURE, null, le13);
+                }
+                bqc.addFreshEntity(aom);
             });
         }
     }
     
-    private static Optional<Entity> createEntityIgnoreException(final LevelAccessor bjx, final CompoundTag jt) {
+    private static Optional<Entity> createEntityIgnoreException(final LevelAccessor bqc, final CompoundTag le) {
         try {
-            return EntityType.create(jt, bjx.getLevel());
+            return EntityType.create(le, bqc.getLevel());
         }
         catch (Exception exception3) {
             return Optional.<Entity>empty();
         }
     }
     
-    public BlockPos getSize(final Rotation btu) {
-        switch (btu) {
+    public BlockPos getSize(final Rotation cap) {
+        switch (cap) {
             case COUNTERCLOCKWISE_90:
             case CLOCKWISE_90: {
                 return new BlockPos(this.size.getZ(), this.size.getY(), this.size.getX());
@@ -383,12 +419,12 @@ public class StructureTemplate {
         }
     }
     
-    public static BlockPos transform(final BlockPos fk1, final Mirror bsu, final Rotation btu, final BlockPos fk4) {
-        int integer5 = fk1.getX();
-        final int integer6 = fk1.getY();
-        int integer7 = fk1.getZ();
+    public static BlockPos transform(final BlockPos fu1, final Mirror bzj, final Rotation cap, final BlockPos fu4) {
+        int integer5 = fu1.getX();
+        final int integer6 = fu1.getY();
+        int integer7 = fu1.getZ();
         boolean boolean8 = true;
-        switch (bsu) {
+        switch (bzj) {
             case LEFT_RIGHT: {
                 integer7 = -integer7;
                 break;
@@ -402,9 +438,9 @@ public class StructureTemplate {
                 break;
             }
         }
-        final int integer8 = fk4.getX();
-        final int integer9 = fk4.getZ();
-        switch (btu) {
+        final int integer8 = fu4.getX();
+        final int integer9 = fu4.getZ();
+        switch (cap) {
             case CLOCKWISE_180: {
                 return new BlockPos(integer8 + integer8 - integer5, integer6, integer9 + integer9 - integer7);
             }
@@ -415,17 +451,17 @@ public class StructureTemplate {
                 return new BlockPos(integer8 + integer9 - integer7, integer6, integer9 - integer8 + integer5);
             }
             default: {
-                return boolean8 ? new BlockPos(integer5, integer6, integer7) : fk1;
+                return boolean8 ? new BlockPos(integer5, integer6, integer7) : fu1;
             }
         }
     }
     
-    private static Vec3 transform(final Vec3 cvl, final Mirror bsu, final Rotation btu, final BlockPos fk) {
-        double double5 = cvl.x;
-        final double double6 = cvl.y;
-        double double7 = cvl.z;
+    public static Vec3 transform(final Vec3 dem, final Mirror bzj, final Rotation cap, final BlockPos fu) {
+        double double5 = dem.x;
+        final double double6 = dem.y;
+        double double7 = dem.z;
         boolean boolean11 = true;
-        switch (bsu) {
+        switch (bzj) {
             case LEFT_RIGHT: {
                 double7 = 1.0 - double7;
                 break;
@@ -439,9 +475,9 @@ public class StructureTemplate {
                 break;
             }
         }
-        final int integer12 = fk.getX();
-        final int integer13 = fk.getZ();
-        switch (btu) {
+        final int integer12 = fu.getX();
+        final int integer13 = fu.getZ();
+        switch (cap) {
             case CLOCKWISE_180: {
                 return new Vec3(integer12 + integer12 + 1 - double5, double6, integer13 + integer13 + 1 - double7);
             }
@@ -452,231 +488,235 @@ public class StructureTemplate {
                 return new Vec3(integer12 + integer13 + 1 - double7, double6, integer13 - integer12 + double5);
             }
             default: {
-                return boolean11 ? new Vec3(double5, double6, double7) : cvl;
+                return boolean11 ? new Vec3(double5, double6, double7) : dem;
             }
         }
     }
     
-    public BlockPos getZeroPositionWithTransform(final BlockPos fk, final Mirror bsu, final Rotation btu) {
-        return getZeroPositionWithTransform(fk, bsu, btu, this.getSize().getX(), this.getSize().getZ());
+    public BlockPos getZeroPositionWithTransform(final BlockPos fu, final Mirror bzj, final Rotation cap) {
+        return getZeroPositionWithTransform(fu, bzj, cap, this.getSize().getX(), this.getSize().getZ());
     }
     
-    public static BlockPos getZeroPositionWithTransform(final BlockPos fk, final Mirror bsu, final Rotation btu, int integer4, int integer5) {
+    public static BlockPos getZeroPositionWithTransform(final BlockPos fu, final Mirror bzj, final Rotation cap, int integer4, int integer5) {
         --integer4;
         --integer5;
-        final int integer6 = (bsu == Mirror.FRONT_BACK) ? integer4 : 0;
-        final int integer7 = (bsu == Mirror.LEFT_RIGHT) ? integer5 : 0;
-        BlockPos fk2 = fk;
-        switch (btu) {
+        final int integer6 = (bzj == Mirror.FRONT_BACK) ? integer4 : 0;
+        final int integer7 = (bzj == Mirror.LEFT_RIGHT) ? integer5 : 0;
+        BlockPos fu2 = fu;
+        switch (cap) {
             case NONE: {
-                fk2 = fk.offset(integer6, 0, integer7);
+                fu2 = fu.offset(integer6, 0, integer7);
                 break;
             }
             case CLOCKWISE_90: {
-                fk2 = fk.offset(integer5 - integer7, 0, integer6);
+                fu2 = fu.offset(integer5 - integer7, 0, integer6);
                 break;
             }
             case CLOCKWISE_180: {
-                fk2 = fk.offset(integer4 - integer6, 0, integer5 - integer7);
+                fu2 = fu.offset(integer4 - integer6, 0, integer5 - integer7);
                 break;
             }
             case COUNTERCLOCKWISE_90: {
-                fk2 = fk.offset(integer7, 0, integer4 - integer6);
+                fu2 = fu.offset(integer7, 0, integer4 - integer6);
                 break;
             }
         }
-        return fk2;
+        return fu2;
     }
     
-    public BoundingBox getBoundingBox(final StructurePlaceSettings cmp, final BlockPos fk) {
-        final Rotation btu4 = cmp.getRotation();
-        final BlockPos fk2 = cmp.getRotationPivot();
-        final BlockPos fk3 = this.getSize(btu4);
-        final Mirror bsu7 = cmp.getMirror();
-        final int integer8 = fk2.getX();
-        final int integer9 = fk2.getZ();
-        final int integer10 = fk3.getX() - 1;
-        final int integer11 = fk3.getY() - 1;
-        final int integer12 = fk3.getZ() - 1;
-        BoundingBox clb13 = new BoundingBox(0, 0, 0, 0, 0, 0);
-        switch (btu4) {
+    public BoundingBox getBoundingBox(final StructurePlaceSettings cvb, final BlockPos fu) {
+        return this.getBoundingBox(fu, cvb.getRotation(), cvb.getRotationPivot(), cvb.getMirror());
+    }
+    
+    public BoundingBox getBoundingBox(final BlockPos fu1, final Rotation cap, final BlockPos fu3, final Mirror bzj) {
+        final BlockPos fu4 = this.getSize(cap);
+        final int integer7 = fu3.getX();
+        final int integer8 = fu3.getZ();
+        final int integer9 = fu4.getX() - 1;
+        final int integer10 = fu4.getY() - 1;
+        final int integer11 = fu4.getZ() - 1;
+        BoundingBox ctd12 = new BoundingBox(0, 0, 0, 0, 0, 0);
+        switch (cap) {
             case NONE: {
-                clb13 = new BoundingBox(0, 0, 0, integer10, integer11, integer12);
+                ctd12 = new BoundingBox(0, 0, 0, integer9, integer10, integer11);
                 break;
             }
             case CLOCKWISE_180: {
-                clb13 = new BoundingBox(integer8 + integer8 - integer10, 0, integer9 + integer9 - integer12, integer8 + integer8, integer11, integer9 + integer9);
+                ctd12 = new BoundingBox(integer7 + integer7 - integer9, 0, integer8 + integer8 - integer11, integer7 + integer7, integer10, integer8 + integer8);
                 break;
             }
             case COUNTERCLOCKWISE_90: {
-                clb13 = new BoundingBox(integer8 - integer9, 0, integer8 + integer9 - integer12, integer8 - integer9 + integer10, integer11, integer8 + integer9);
+                ctd12 = new BoundingBox(integer7 - integer8, 0, integer7 + integer8 - integer11, integer7 - integer8 + integer9, integer10, integer7 + integer8);
                 break;
             }
             case CLOCKWISE_90: {
-                clb13 = new BoundingBox(integer8 + integer9 - integer10, 0, integer9 - integer8, integer8 + integer9, integer11, integer9 - integer8 + integer12);
+                ctd12 = new BoundingBox(integer7 + integer8 - integer9, 0, integer8 - integer7, integer7 + integer8, integer10, integer8 - integer7 + integer11);
                 break;
             }
         }
-        switch (bsu7) {
+        switch (bzj) {
             case FRONT_BACK: {
-                this.mirrorAABB(btu4, integer10, integer12, clb13, Direction.WEST, Direction.EAST);
+                this.mirrorAABB(cap, integer9, integer11, ctd12, Direction.WEST, Direction.EAST);
                 break;
             }
             case LEFT_RIGHT: {
-                this.mirrorAABB(btu4, integer12, integer10, clb13, Direction.NORTH, Direction.SOUTH);
+                this.mirrorAABB(cap, integer11, integer9, ctd12, Direction.NORTH, Direction.SOUTH);
                 break;
             }
         }
-        clb13.move(fk.getX(), fk.getY(), fk.getZ());
-        return clb13;
+        ctd12.move(fu1.getX(), fu1.getY(), fu1.getZ());
+        return ctd12;
     }
     
-    private void mirrorAABB(final Rotation btu, final int integer2, final int integer3, final BoundingBox clb, final Direction fp5, final Direction fp6) {
-        BlockPos fk8 = BlockPos.ZERO;
-        if (btu == Rotation.CLOCKWISE_90 || btu == Rotation.COUNTERCLOCKWISE_90) {
-            fk8 = fk8.relative(btu.rotate(fp5), integer3);
+    private void mirrorAABB(final Rotation cap, final int integer2, final int integer3, final BoundingBox ctd, final Direction fz5, final Direction fz6) {
+        BlockPos fu8 = BlockPos.ZERO;
+        if (cap == Rotation.CLOCKWISE_90 || cap == Rotation.COUNTERCLOCKWISE_90) {
+            fu8 = fu8.relative(cap.rotate(fz5), integer3);
         }
-        else if (btu == Rotation.CLOCKWISE_180) {
-            fk8 = fk8.relative(fp6, integer2);
+        else if (cap == Rotation.CLOCKWISE_180) {
+            fu8 = fu8.relative(fz6, integer2);
         }
         else {
-            fk8 = fk8.relative(fp5, integer2);
+            fu8 = fu8.relative(fz5, integer2);
         }
-        clb.move(fk8.getX(), 0, fk8.getZ());
+        ctd.move(fu8.getX(), 0, fu8.getZ());
     }
     
-    public CompoundTag save(final CompoundTag jt) {
+    public CompoundTag save(final CompoundTag le) {
         if (this.palettes.isEmpty()) {
-            jt.put("blocks", new ListTag());
-            jt.put("palette", new ListTag());
+            le.put("blocks", new ListTag());
+            le.put("palette", new ListTag());
         }
         else {
             final List<SimplePalette> list3 = Lists.newArrayList();
-            final SimplePalette a4 = new SimplePalette();
-            list3.add(a4);
+            final SimplePalette b4 = new SimplePalette();
+            list3.add(b4);
             for (int integer5 = 1; integer5 < this.palettes.size(); ++integer5) {
                 list3.add(new SimplePalette());
             }
-            final ListTag jz5 = new ListTag();
-            final List<StructureBlockInfo> list4 = this.palettes.get(0);
+            final ListTag lk5 = new ListTag();
+            final List<StructureBlockInfo> list4 = this.palettes.get(0).blocks();
             for (int integer6 = 0; integer6 < list4.size(); ++integer6) {
-                final StructureBlockInfo b8 = list4.get(integer6);
-                final CompoundTag jt2 = new CompoundTag();
-                jt2.put("pos", this.newIntegerList(b8.pos.getX(), b8.pos.getY(), b8.pos.getZ()));
-                final int integer7 = a4.idFor(b8.state);
-                jt2.putInt("state", integer7);
-                if (b8.nbt != null) {
-                    jt2.put("nbt", b8.nbt);
+                final StructureBlockInfo c8 = list4.get(integer6);
+                final CompoundTag le2 = new CompoundTag();
+                le2.put("pos", this.newIntegerList(c8.pos.getX(), c8.pos.getY(), c8.pos.getZ()));
+                final int integer7 = b4.idFor(c8.state);
+                le2.putInt("state", integer7);
+                if (c8.nbt != null) {
+                    le2.put("nbt", c8.nbt);
                 }
-                ((AbstractList<CompoundTag>)jz5).add(jt2);
+                ((AbstractList<CompoundTag>)lk5).add(le2);
                 for (int integer8 = 1; integer8 < this.palettes.size(); ++integer8) {
-                    final SimplePalette a5 = list3.get(integer8);
-                    a5.addMapping(this.palettes.get(integer8).get(integer6).state, integer7);
+                    final SimplePalette b5 = list3.get(integer8);
+                    b5.addMapping(this.palettes.get(integer8).blocks().get(integer6).state, integer7);
                 }
             }
-            jt.put("blocks", jz5);
+            le.put("blocks", lk5);
             if (list3.size() == 1) {
-                final ListTag jz6 = new ListTag();
-                for (final BlockState byj9 : a4) {
-                    ((AbstractList<CompoundTag>)jz6).add(NbtUtils.writeBlockState(byj9));
+                final ListTag lk6 = new ListTag();
+                for (final BlockState cfj9 : b4) {
+                    ((AbstractList<CompoundTag>)lk6).add(NbtUtils.writeBlockState(cfj9));
                 }
-                jt.put("palette", jz6);
+                le.put("palette", lk6);
             }
             else {
-                final ListTag jz6 = new ListTag();
-                for (final SimplePalette a6 : list3) {
-                    final ListTag jz7 = new ListTag();
-                    for (final BlockState byj10 : a6) {
-                        ((AbstractList<CompoundTag>)jz7).add(NbtUtils.writeBlockState(byj10));
+                final ListTag lk6 = new ListTag();
+                for (final SimplePalette b6 : list3) {
+                    final ListTag lk7 = new ListTag();
+                    for (final BlockState cfj10 : b6) {
+                        ((AbstractList<CompoundTag>)lk7).add(NbtUtils.writeBlockState(cfj10));
                     }
-                    ((AbstractList<ListTag>)jz6).add(jz7);
+                    ((AbstractList<ListTag>)lk6).add(lk7);
                 }
-                jt.put("palettes", jz6);
+                le.put("palettes", lk6);
             }
         }
-        final ListTag jz8 = new ListTag();
-        for (final StructureEntityInfo c5 : this.entityInfoList) {
-            final CompoundTag jt3 = new CompoundTag();
-            jt3.put("pos", this.newDoubleList(c5.pos.x, c5.pos.y, c5.pos.z));
-            jt3.put("blockPos", this.newIntegerList(c5.blockPos.getX(), c5.blockPos.getY(), c5.blockPos.getZ()));
-            if (c5.nbt != null) {
-                jt3.put("nbt", c5.nbt);
+        final ListTag lk8 = new ListTag();
+        for (final StructureEntityInfo d5 : this.entityInfoList) {
+            final CompoundTag le3 = new CompoundTag();
+            le3.put("pos", this.newDoubleList(d5.pos.x, d5.pos.y, d5.pos.z));
+            le3.put("blockPos", this.newIntegerList(d5.blockPos.getX(), d5.blockPos.getY(), d5.blockPos.getZ()));
+            if (d5.nbt != null) {
+                le3.put("nbt", d5.nbt);
             }
-            ((AbstractList<CompoundTag>)jz8).add(jt3);
+            ((AbstractList<CompoundTag>)lk8).add(le3);
         }
-        jt.put("entities", jz8);
-        jt.put("size", this.newIntegerList(this.size.getX(), this.size.getY(), this.size.getZ()));
-        jt.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
-        return jt;
+        le.put("entities", lk8);
+        le.put("size", this.newIntegerList(this.size.getX(), this.size.getY(), this.size.getZ()));
+        le.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
+        return le;
     }
     
-    public void load(final CompoundTag jt) {
+    public void load(final CompoundTag le) {
         this.palettes.clear();
         this.entityInfoList.clear();
-        final ListTag jz3 = jt.getList("size", 3);
-        this.size = new BlockPos(jz3.getInt(0), jz3.getInt(1), jz3.getInt(2));
-        final ListTag jz4 = jt.getList("blocks", 10);
-        if (jt.contains("palettes", 9)) {
-            final ListTag jz5 = jt.getList("palettes", 9);
-            for (int integer6 = 0; integer6 < jz5.size(); ++integer6) {
-                this.loadPalette(jz5.getList(integer6), jz4);
+        final ListTag lk3 = le.getList("size", 3);
+        this.size = new BlockPos(lk3.getInt(0), lk3.getInt(1), lk3.getInt(2));
+        final ListTag lk4 = le.getList("blocks", 10);
+        if (le.contains("palettes", 9)) {
+            final ListTag lk5 = le.getList("palettes", 9);
+            for (int integer6 = 0; integer6 < lk5.size(); ++integer6) {
+                this.loadPalette(lk5.getList(integer6), lk4);
             }
         }
         else {
-            this.loadPalette(jt.getList("palette", 10), jz4);
+            this.loadPalette(le.getList("palette", 10), lk4);
         }
-        final ListTag jz5 = jt.getList("entities", 10);
-        for (int integer6 = 0; integer6 < jz5.size(); ++integer6) {
-            final CompoundTag jt2 = jz5.getCompound(integer6);
-            final ListTag jz6 = jt2.getList("pos", 6);
-            final Vec3 cvl9 = new Vec3(jz6.getDouble(0), jz6.getDouble(1), jz6.getDouble(2));
-            final ListTag jz7 = jt2.getList("blockPos", 3);
-            final BlockPos fk11 = new BlockPos(jz7.getInt(0), jz7.getInt(1), jz7.getInt(2));
-            if (jt2.contains("nbt")) {
-                final CompoundTag jt3 = jt2.getCompound("nbt");
-                this.entityInfoList.add(new StructureEntityInfo(cvl9, fk11, jt3));
+        final ListTag lk5 = le.getList("entities", 10);
+        for (int integer6 = 0; integer6 < lk5.size(); ++integer6) {
+            final CompoundTag le2 = lk5.getCompound(integer6);
+            final ListTag lk6 = le2.getList("pos", 6);
+            final Vec3 dem9 = new Vec3(lk6.getDouble(0), lk6.getDouble(1), lk6.getDouble(2));
+            final ListTag lk7 = le2.getList("blockPos", 3);
+            final BlockPos fu11 = new BlockPos(lk7.getInt(0), lk7.getInt(1), lk7.getInt(2));
+            if (le2.contains("nbt")) {
+                final CompoundTag le3 = le2.getCompound("nbt");
+                this.entityInfoList.add(new StructureEntityInfo(dem9, fu11, le3));
             }
         }
     }
     
-    private void loadPalette(final ListTag jz1, final ListTag jz2) {
-        final SimplePalette a4 = new SimplePalette();
-        final List<StructureBlockInfo> list5 = Lists.newArrayList();
-        for (int integer6 = 0; integer6 < jz1.size(); ++integer6) {
-            a4.addMapping(NbtUtils.readBlockState(jz1.getCompound(integer6)), integer6);
+    private void loadPalette(final ListTag lk1, final ListTag lk2) {
+        final SimplePalette b4 = new SimplePalette();
+        for (int integer5 = 0; integer5 < lk1.size(); ++integer5) {
+            b4.addMapping(NbtUtils.readBlockState(lk1.getCompound(integer5)), integer5);
         }
-        for (int integer6 = 0; integer6 < jz2.size(); ++integer6) {
-            final CompoundTag jt7 = jz2.getCompound(integer6);
-            final ListTag jz3 = jt7.getList("pos", 3);
-            final BlockPos fk9 = new BlockPos(jz3.getInt(0), jz3.getInt(1), jz3.getInt(2));
-            final BlockState byj10 = a4.stateFor(jt7.getInt("state"));
-            CompoundTag jt8;
-            if (jt7.contains("nbt")) {
-                jt8 = jt7.getCompound("nbt");
+        final List<StructureBlockInfo> list5 = Lists.newArrayList();
+        final List<StructureBlockInfo> list6 = Lists.newArrayList();
+        final List<StructureBlockInfo> list7 = Lists.newArrayList();
+        for (int integer6 = 0; integer6 < lk2.size(); ++integer6) {
+            final CompoundTag le9 = lk2.getCompound(integer6);
+            final ListTag lk3 = le9.getList("pos", 3);
+            final BlockPos fu11 = new BlockPos(lk3.getInt(0), lk3.getInt(1), lk3.getInt(2));
+            final BlockState cfj12 = b4.stateFor(le9.getInt("state"));
+            CompoundTag le10;
+            if (le9.contains("nbt")) {
+                le10 = le9.getCompound("nbt");
             }
             else {
-                jt8 = null;
+                le10 = null;
             }
-            list5.add(new StructureBlockInfo(fk9, byj10, jt8));
+            final StructureBlockInfo c14 = new StructureBlockInfo(fu11, cfj12, le10);
+            addToLists(c14, list5, list6, list7);
         }
-        list5.sort(Comparator.comparingInt(b -> b.pos.getY()));
-        this.palettes.add(list5);
+        final List<StructureBlockInfo> list8 = buildInfoList(list5, list6, list7);
+        this.palettes.add(new Palette((List)list8));
     }
     
     private ListTag newIntegerList(final int... arr) {
-        final ListTag jz3 = new ListTag();
+        final ListTag lk3 = new ListTag();
         for (final int integer7 : arr) {
-            ((AbstractList<IntTag>)jz3).add(IntTag.valueOf(integer7));
+            ((AbstractList<IntTag>)lk3).add(IntTag.valueOf(integer7));
         }
-        return jz3;
+        return lk3;
     }
     
     private ListTag newDoubleList(final double... arr) {
-        final ListTag jz3 = new ListTag();
+        final ListTag lk3 = new ListTag();
         for (final double double7 : arr) {
-            ((AbstractList<DoubleTag>)jz3).add(DoubleTag.valueOf(double7));
+            ((AbstractList<DoubleTag>)lk3).add(DoubleTag.valueOf(double7));
         }
-        return jz3;
+        return lk3;
     }
     
     static class SimplePalette implements Iterable<BlockState> {
@@ -688,19 +728,19 @@ public class StructureTemplate {
             this.ids = new IdMapper<BlockState>(16);
         }
         
-        public int idFor(final BlockState byj) {
-            int integer3 = this.ids.getId(byj);
+        public int idFor(final BlockState cfj) {
+            int integer3 = this.ids.getId(cfj);
             if (integer3 == -1) {
                 integer3 = this.lastId++;
-                this.ids.addMapping(byj, integer3);
+                this.ids.addMapping(cfj, integer3);
             }
             return integer3;
         }
         
         @Nullable
         public BlockState stateFor(final int integer) {
-            final BlockState byj3 = this.ids.byId(integer);
-            return (byj3 == null) ? SimplePalette.DEFAULT_BLOCK_STATE : byj3;
+            final BlockState cfj3 = this.ids.byId(integer);
+            return (cfj3 == null) ? SimplePalette.DEFAULT_BLOCK_STATE : cfj3;
         }
         
         @Override
@@ -708,8 +748,8 @@ public class StructureTemplate {
             return this.ids.iterator();
         }
         
-        public void addMapping(final BlockState byj, final int integer) {
-            this.ids.addMapping(byj, integer);
+        public void addMapping(final BlockState cfj, final int integer) {
+            this.ids.addMapping(cfj, integer);
         }
         
         static {
@@ -722,10 +762,10 @@ public class StructureTemplate {
         public final BlockState state;
         public final CompoundTag nbt;
         
-        public StructureBlockInfo(final BlockPos fk, final BlockState byj, @Nullable final CompoundTag jt) {
-            this.pos = fk;
-            this.state = byj;
-            this.nbt = jt;
+        public StructureBlockInfo(final BlockPos fu, final BlockState cfj, @Nullable final CompoundTag le) {
+            this.pos = fu;
+            this.state = cfj;
+            this.nbt = le;
         }
         
         @Override
@@ -739,10 +779,28 @@ public class StructureTemplate {
         public final BlockPos blockPos;
         public final CompoundTag nbt;
         
-        public StructureEntityInfo(final Vec3 cvl, final BlockPos fk, final CompoundTag jt) {
-            this.pos = cvl;
-            this.blockPos = fk;
-            this.nbt = jt;
+        public StructureEntityInfo(final Vec3 dem, final BlockPos fu, final CompoundTag le) {
+            this.pos = dem;
+            this.blockPos = fu;
+            this.nbt = le;
+        }
+    }
+    
+    public static final class Palette {
+        private final List<StructureBlockInfo> blocks;
+        private final Map<Block, List<StructureBlockInfo>> cache;
+        
+        private Palette(final List<StructureBlockInfo> list) {
+            this.cache = Maps.newHashMap();
+            this.blocks = list;
+        }
+        
+        public List<StructureBlockInfo> blocks() {
+            return this.blocks;
+        }
+        
+        public List<StructureBlockInfo> blocks(final Block bvr) {
+            return this.cache.computeIfAbsent(bvr, bvr -> this.blocks.stream().filter(c -> c.state.is(bvr)).collect(Collectors.toList()));
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/structure/templatesystem/TagMatchTest.java b/src/net/minecraft/world/level/levelgen/structure/templatesystem/TagMatchTest.java
index 25c6915..8abd237 100644
--- a/src/net/minecraft/world/level/levelgen/structure/templatesystem/TagMatchTest.java
+++ b/src/net/minecraft/world/level/levelgen/structure/templatesystem/TagMatchTest.java
@@ -1,39 +1,32 @@
 package net.minecraft.world.level.levelgen.structure.templatesystem;
 
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.types.DynamicOps;
+import java.util.function.Function;
+import net.minecraft.tags.SerializationTags;
 import java.util.Random;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.BlockTags;
-import com.mojang.datafixers.Dynamic;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.tags.Tag;
+import com.mojang.serialization.Codec;
 
 public class TagMatchTest extends RuleTest {
+    public static final Codec<TagMatchTest> CODEC;
     private final Tag<Block> tag;
     
-    public TagMatchTest(final Tag<Block> aaz) {
-        this.tag = aaz;
-    }
-    
-    public <T> TagMatchTest(final Dynamic<T> dynamic) {
-        this(BlockTags.getAllTags().getTag(new ResourceLocation(dynamic.get("tag").asString(""))));
+    public TagMatchTest(final Tag<Block> adf) {
+        this.tag = adf;
     }
     
     @Override
-    public boolean test(final BlockState byj, final Random random) {
-        return byj.is(this.tag);
+    public boolean test(final BlockState cfj, final Random random) {
+        return cfj.is(this.tag);
     }
     
     @Override
-    protected RuleTestType getType() {
+    protected RuleTestType<?> getType() {
         return RuleTestType.TAG_TEST;
     }
     
-    @Override
-    protected <T> Dynamic<T> getDynamic(final DynamicOps<T> dynamicOps) {
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("tag"), dynamicOps.createString(this.tag.getId().toString()))));
+    static {
+        CODEC = Tag.codec(SerializationTags.getInstance()::getBlocks).fieldOf("tag").xmap((Function)TagMatchTest::new, cvf -> cvf.tag).codec();
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/BadlandsSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/BadlandsSurfaceBuilder.java
index 3120fa4..6ab8b64 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/BadlandsSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/BadlandsSurfaceBuilder.java
@@ -1,6 +1,9 @@
 package net.minecraft.world.level.levelgen.surfacebuilders;
 
 import java.util.Arrays;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import java.util.stream.IntStream;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
@@ -8,8 +11,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise;
 import net.minecraft.world.level.block.state.BlockState;
 
@@ -27,16 +29,16 @@ public class BadlandsSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseCon
     protected PerlinSimplexNoise pillarRoofNoise;
     protected PerlinSimplexNoise clayBandsOffsetNoise;
     
-    public BadlandsSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public BadlandsSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
         final int integer11 = integer4 & 0xF;
         final int integer12 = integer5 & 0xF;
-        BlockState byj10 = BadlandsSurfaceBuilder.WHITE_TERRACOTTA;
-        BlockState byj11 = bkt.getSurfaceBuilderConfig().getUnderMaterial();
+        BlockState cfj10 = BadlandsSurfaceBuilder.WHITE_TERRACOTTA;
+        BlockState cfj11 = bre.getSurfaceBuilderConfig().getUnderMaterial();
         final int integer13 = (int)(double7 / 3.0 + 3.0 + random.nextDouble() * 0.25);
         final boolean boolean21 = Math.cos(double7 / 3.0 * 3.141592653589793) > 0.0;
         int integer14 = -1;
@@ -46,59 +48,59 @@ public class BadlandsSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseCon
         for (int integer16 = integer6; integer16 >= 0; --integer16) {
             if (integer15 < 15) {
                 a25.set(integer11, integer16, integer12);
-                final BlockState byj12 = bzy.getBlockState(a25);
-                if (byj12.isAir()) {
+                final BlockState cfj12 = cgy.getBlockState(a25);
+                if (cfj12.isAir()) {
                     integer14 = -1;
                 }
-                else if (byj12.getBlock() == byj8.getBlock()) {
+                else if (cfj12.is(cfj8.getBlock())) {
                     if (integer14 == -1) {
                         boolean22 = false;
                         if (integer13 <= 0) {
-                            byj10 = Blocks.AIR.defaultBlockState();
-                            byj11 = byj8;
+                            cfj10 = Blocks.AIR.defaultBlockState();
+                            cfj11 = cfj8;
                         }
                         else if (integer16 >= integer10 - 4 && integer16 <= integer10 + 1) {
-                            byj10 = BadlandsSurfaceBuilder.WHITE_TERRACOTTA;
-                            byj11 = bkt.getSurfaceBuilderConfig().getUnderMaterial();
+                            cfj10 = BadlandsSurfaceBuilder.WHITE_TERRACOTTA;
+                            cfj11 = bre.getSurfaceBuilderConfig().getUnderMaterial();
                         }
-                        if (integer16 < integer10 && (byj10 == null || byj10.isAir())) {
-                            byj10 = byj9;
+                        if (integer16 < integer10 && (cfj10 == null || cfj10.isAir())) {
+                            cfj10 = cfj9;
                         }
                         integer14 = integer13 + Math.max(0, integer16 - integer10);
                         if (integer16 >= integer10 - 1) {
                             if (integer16 > integer10 + 3 + integer13) {
-                                BlockState byj13;
+                                BlockState cfj13;
                                 if (integer16 < 64 || integer16 > 127) {
-                                    byj13 = BadlandsSurfaceBuilder.ORANGE_TERRACOTTA;
+                                    cfj13 = BadlandsSurfaceBuilder.ORANGE_TERRACOTTA;
                                 }
                                 else if (boolean21) {
-                                    byj13 = BadlandsSurfaceBuilder.TERRACOTTA;
+                                    cfj13 = BadlandsSurfaceBuilder.TERRACOTTA;
                                 }
                                 else {
-                                    byj13 = this.getBand(integer4, integer16, integer5);
+                                    cfj13 = this.getBand(integer4, integer16, integer5);
                                 }
-                                bzy.setBlockState(a25, byj13, false);
+                                cgy.setBlockState(a25, cfj13, false);
                             }
                             else {
-                                bzy.setBlockState(a25, bkt.getSurfaceBuilderConfig().getTopMaterial(), false);
+                                cgy.setBlockState(a25, bre.getSurfaceBuilderConfig().getTopMaterial(), false);
                                 boolean22 = true;
                             }
                         }
                         else {
-                            bzy.setBlockState(a25, byj11, false);
-                            final Block bph28 = byj11.getBlock();
-                            if (bph28 == Blocks.WHITE_TERRACOTTA || bph28 == Blocks.ORANGE_TERRACOTTA || bph28 == Blocks.MAGENTA_TERRACOTTA || bph28 == Blocks.LIGHT_BLUE_TERRACOTTA || bph28 == Blocks.YELLOW_TERRACOTTA || bph28 == Blocks.LIME_TERRACOTTA || bph28 == Blocks.PINK_TERRACOTTA || bph28 == Blocks.GRAY_TERRACOTTA || bph28 == Blocks.LIGHT_GRAY_TERRACOTTA || bph28 == Blocks.CYAN_TERRACOTTA || bph28 == Blocks.PURPLE_TERRACOTTA || bph28 == Blocks.BLUE_TERRACOTTA || bph28 == Blocks.BROWN_TERRACOTTA || bph28 == Blocks.GREEN_TERRACOTTA || bph28 == Blocks.RED_TERRACOTTA || bph28 == Blocks.BLACK_TERRACOTTA) {
-                                bzy.setBlockState(a25, BadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
+                            cgy.setBlockState(a25, cfj11, false);
+                            final Block bvr28 = cfj11.getBlock();
+                            if (bvr28 == Blocks.WHITE_TERRACOTTA || bvr28 == Blocks.ORANGE_TERRACOTTA || bvr28 == Blocks.MAGENTA_TERRACOTTA || bvr28 == Blocks.LIGHT_BLUE_TERRACOTTA || bvr28 == Blocks.YELLOW_TERRACOTTA || bvr28 == Blocks.LIME_TERRACOTTA || bvr28 == Blocks.PINK_TERRACOTTA || bvr28 == Blocks.GRAY_TERRACOTTA || bvr28 == Blocks.LIGHT_GRAY_TERRACOTTA || bvr28 == Blocks.CYAN_TERRACOTTA || bvr28 == Blocks.PURPLE_TERRACOTTA || bvr28 == Blocks.BLUE_TERRACOTTA || bvr28 == Blocks.BROWN_TERRACOTTA || bvr28 == Blocks.GREEN_TERRACOTTA || bvr28 == Blocks.RED_TERRACOTTA || bvr28 == Blocks.BLACK_TERRACOTTA) {
+                                cgy.setBlockState(a25, BadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
                             }
                         }
                     }
                     else if (integer14 > 0) {
                         --integer14;
                         if (boolean22) {
-                            bzy.setBlockState(a25, BadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
+                            cgy.setBlockState(a25, BadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
                         }
                         else {
-                            bzy.setBlockState(a25, this.getBand(integer4, integer16, integer5), false);
+                            cgy.setBlockState(a25, this.getBand(integer4, integer16, integer5), false);
                         }
                     }
                     ++integer15;
@@ -113,49 +115,49 @@ public class BadlandsSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseCon
             this.generateBands(long1);
         }
         if (this.seed != long1 || this.pillarNoise == null || this.pillarRoofNoise == null) {
-            final WorldgenRandom ccf4 = new WorldgenRandom(long1);
-            this.pillarNoise = new PerlinSimplexNoise(ccf4, 3, 0);
-            this.pillarRoofNoise = new PerlinSimplexNoise(ccf4, 0, 0);
+            final WorldgenRandom ciy4 = new WorldgenRandom(long1);
+            this.pillarNoise = new PerlinSimplexNoise(ciy4, IntStream.rangeClosed(-3, 0));
+            this.pillarRoofNoise = new PerlinSimplexNoise(ciy4, ImmutableList.<Integer>of(0));
         }
         this.seed = long1;
     }
     
     protected void generateBands(final long long1) {
         Arrays.fill(this.clayBands = new BlockState[64], BadlandsSurfaceBuilder.TERRACOTTA);
-        final WorldgenRandom ccf4 = new WorldgenRandom(long1);
-        this.clayBandsOffsetNoise = new PerlinSimplexNoise(ccf4, 0, 0);
+        final WorldgenRandom ciy4 = new WorldgenRandom(long1);
+        this.clayBandsOffsetNoise = new PerlinSimplexNoise(ciy4, ImmutableList.<Integer>of(0));
         for (int integer5 = 0; integer5 < 64; ++integer5) {
-            integer5 += ccf4.nextInt(5) + 1;
+            integer5 += ciy4.nextInt(5) + 1;
             if (integer5 < 64) {
                 this.clayBands[integer5] = BadlandsSurfaceBuilder.ORANGE_TERRACOTTA;
             }
         }
-        for (int integer5 = ccf4.nextInt(4) + 2, integer6 = 0; integer6 < integer5; ++integer6) {
-            for (int integer7 = ccf4.nextInt(3) + 1, integer8 = ccf4.nextInt(64), integer9 = 0; integer8 + integer9 < 64 && integer9 < integer7; ++integer9) {
+        for (int integer5 = ciy4.nextInt(4) + 2, integer6 = 0; integer6 < integer5; ++integer6) {
+            for (int integer7 = ciy4.nextInt(3) + 1, integer8 = ciy4.nextInt(64), integer9 = 0; integer8 + integer9 < 64 && integer9 < integer7; ++integer9) {
                 this.clayBands[integer8 + integer9] = BadlandsSurfaceBuilder.YELLOW_TERRACOTTA;
             }
         }
-        for (int integer6 = ccf4.nextInt(4) + 2, integer7 = 0; integer7 < integer6; ++integer7) {
-            for (int integer8 = ccf4.nextInt(3) + 2, integer9 = ccf4.nextInt(64), integer10 = 0; integer9 + integer10 < 64 && integer10 < integer8; ++integer10) {
+        for (int integer6 = ciy4.nextInt(4) + 2, integer7 = 0; integer7 < integer6; ++integer7) {
+            for (int integer8 = ciy4.nextInt(3) + 2, integer9 = ciy4.nextInt(64), integer10 = 0; integer9 + integer10 < 64 && integer10 < integer8; ++integer10) {
                 this.clayBands[integer9 + integer10] = BadlandsSurfaceBuilder.BROWN_TERRACOTTA;
             }
         }
-        for (int integer7 = ccf4.nextInt(4) + 2, integer8 = 0; integer8 < integer7; ++integer8) {
-            for (int integer9 = ccf4.nextInt(3) + 1, integer10 = ccf4.nextInt(64), integer11 = 0; integer10 + integer11 < 64 && integer11 < integer9; ++integer11) {
+        for (int integer7 = ciy4.nextInt(4) + 2, integer8 = 0; integer8 < integer7; ++integer8) {
+            for (int integer9 = ciy4.nextInt(3) + 1, integer10 = ciy4.nextInt(64), integer11 = 0; integer10 + integer11 < 64 && integer11 < integer9; ++integer11) {
                 this.clayBands[integer10 + integer11] = BadlandsSurfaceBuilder.RED_TERRACOTTA;
             }
         }
-        int integer8 = ccf4.nextInt(3) + 3;
+        int integer8 = ciy4.nextInt(3) + 3;
         int integer9 = 0;
         for (int integer10 = 0; integer10 < integer8; ++integer10) {
             final int integer11 = 1;
-            integer9 += ccf4.nextInt(16) + 4;
+            integer9 += ciy4.nextInt(16) + 4;
             for (int integer12 = 0; integer9 + integer12 < 64 && integer12 < 1; ++integer12) {
                 this.clayBands[integer9 + integer12] = BadlandsSurfaceBuilder.WHITE_TERRACOTTA;
-                if (integer9 + integer12 > 1 && ccf4.nextBoolean()) {
+                if (integer9 + integer12 > 1 && ciy4.nextBoolean()) {
                     this.clayBands[integer9 + integer12 - 1] = BadlandsSurfaceBuilder.LIGHT_GRAY_TERRACOTTA;
                 }
-                if (integer9 + integer12 < 63 && ccf4.nextBoolean()) {
+                if (integer9 + integer12 < 63 && ciy4.nextBoolean()) {
                     this.clayBands[integer9 + integer12 + 1] = BadlandsSurfaceBuilder.LIGHT_GRAY_TERRACOTTA;
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/BasaltDeltasSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/BasaltDeltasSurfaceBuilder.java
new file mode 100644
index 0000000..8e82d80
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/BasaltDeltasSurfaceBuilder.java
@@ -0,0 +1,41 @@
+package net.minecraft.world.level.levelgen.surfacebuilders;
+
+import net.minecraft.world.level.block.Blocks;
+import com.mojang.serialization.Codec;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class BasaltDeltasSurfaceBuilder extends NetherCappedSurfaceBuilder {
+    private static final BlockState BASALT;
+    private static final BlockState BLACKSTONE;
+    private static final BlockState GRAVEL;
+    private static final ImmutableList<BlockState> FLOOR_BLOCK_STATES;
+    private static final ImmutableList<BlockState> CEILING_BLOCK_STATES;
+    
+    public BasaltDeltasSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    protected ImmutableList<BlockState> getFloorBlockStates() {
+        return BasaltDeltasSurfaceBuilder.FLOOR_BLOCK_STATES;
+    }
+    
+    @Override
+    protected ImmutableList<BlockState> getCeilingBlockStates() {
+        return BasaltDeltasSurfaceBuilder.CEILING_BLOCK_STATES;
+    }
+    
+    @Override
+    protected BlockState getPatchBlockState() {
+        return BasaltDeltasSurfaceBuilder.GRAVEL;
+    }
+    
+    static {
+        BASALT = Blocks.BASALT.defaultBlockState();
+        BLACKSTONE = Blocks.BLACKSTONE.defaultBlockState();
+        GRAVEL = Blocks.GRAVEL.defaultBlockState();
+        FLOOR_BLOCK_STATES = ImmutableList.<BlockState>of(BasaltDeltasSurfaceBuilder.BASALT, BasaltDeltasSurfaceBuilder.BLACKSTONE);
+        CEILING_BLOCK_STATES = ImmutableList.<BlockState>of(BasaltDeltasSurfaceBuilder.BASALT);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/ConfiguredSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/ConfiguredSurfaceBuilder.java
index 6392722..5d9a092 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/ConfiguredSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/ConfiguredSurfaceBuilder.java
@@ -1,21 +1,25 @@
 package net.minecraft.world.level.levelgen.surfacebuilders;
 
+import java.util.function.Function;
+import net.minecraft.core.Registry;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
+import com.mojang.serialization.Codec;
 
 public class ConfiguredSurfaceBuilder<SC extends SurfaceBuilderConfiguration> {
+    public static final Codec<ConfiguredSurfaceBuilder<?>> CODEC;
     public final SurfaceBuilder<SC> surfaceBuilder;
     public final SC config;
     
-    public ConfiguredSurfaceBuilder(final SurfaceBuilder<SC> cng, final SC cni) {
-        this.surfaceBuilder = cng;
-        this.config = cni;
+    public ConfiguredSurfaceBuilder(final SurfaceBuilder<SC> cvw, final SC cvy) {
+        this.surfaceBuilder = cvw;
+        this.config = cvy;
     }
     
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11) {
-        this.surfaceBuilder.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, this.config);
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11) {
+        this.surfaceBuilder.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, this.config);
     }
     
     public void initNoise(final long long1) {
@@ -25,4 +29,8 @@ public class ConfiguredSurfaceBuilder<SC extends SurfaceBuilderConfiguration> {
     public SC getSurfaceBuilderConfiguration() {
         return this.config;
     }
+    
+    static {
+        CODEC = Registry.SURFACE_BUILDER.dispatch("name", cvj -> cvj.surfaceBuilder, (Function)SurfaceBuilder::configuredCodec);
+    }
 }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/DefaultSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/DefaultSurfaceBuilder.java
index e4e0e2b..6fb82fb 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/DefaultSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/DefaultSurfaceBuilder.java
@@ -6,22 +6,21 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class DefaultSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfiguration> {
-    public DefaultSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public DefaultSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
-        this.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, cnh.getTopMaterial(), cnh.getUnderMaterial(), cnh.getUnderwaterMaterial(), integer10);
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
+        this.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, cvx.getTopMaterial(), cvx.getUnderMaterial(), cvx.getUnderwaterMaterial(), integer10);
     }
     
-    protected void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final BlockState byj10, final BlockState byj11, final BlockState byj12, final int integer13) {
-        BlockState byj13 = byj10;
-        BlockState byj14 = byj11;
+    protected void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final BlockState cfj10, final BlockState cfj11, final BlockState cfj12, final int integer13) {
+        BlockState cfj13 = cfj10;
+        BlockState cfj14 = cfj11;
         final BlockPos.MutableBlockPos a18 = new BlockPos.MutableBlockPos();
         int integer14 = -1;
         final int integer15 = (int)(double7 / 3.0 + 3.0 + random.nextDouble() * 0.25);
@@ -29,48 +28,48 @@ public class DefaultSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConf
         final int integer17 = integer5 & 0xF;
         for (int integer18 = integer6; integer18 >= 0; --integer18) {
             a18.set(integer16, integer18, integer17);
-            final BlockState byj15 = bzy.getBlockState(a18);
-            if (byj15.isAir()) {
+            final BlockState cfj15 = cgy.getBlockState(a18);
+            if (cfj15.isAir()) {
                 integer14 = -1;
             }
-            else if (byj15.getBlock() == byj8.getBlock()) {
+            else if (cfj15.is(cfj8.getBlock())) {
                 if (integer14 == -1) {
                     if (integer15 <= 0) {
-                        byj13 = Blocks.AIR.defaultBlockState();
-                        byj14 = byj8;
+                        cfj13 = Blocks.AIR.defaultBlockState();
+                        cfj14 = cfj8;
                     }
                     else if (integer18 >= integer13 - 4 && integer18 <= integer13 + 1) {
-                        byj13 = byj10;
-                        byj14 = byj11;
+                        cfj13 = cfj10;
+                        cfj14 = cfj11;
                     }
-                    if (integer18 < integer13 && (byj13 == null || byj13.isAir())) {
-                        if (bkt.getTemperature(a18.set(integer4, integer18, integer5)) < 0.15f) {
-                            byj13 = Blocks.ICE.defaultBlockState();
+                    if (integer18 < integer13 && (cfj13 == null || cfj13.isAir())) {
+                        if (bre.getTemperature(a18.set(integer4, integer18, integer5)) < 0.15f) {
+                            cfj13 = Blocks.ICE.defaultBlockState();
                         }
                         else {
-                            byj13 = byj9;
+                            cfj13 = cfj9;
                         }
                         a18.set(integer16, integer18, integer17);
                     }
                     integer14 = integer15;
                     if (integer18 >= integer13 - 1) {
-                        bzy.setBlockState(a18, byj13, false);
+                        cgy.setBlockState(a18, cfj13, false);
                     }
                     else if (integer18 < integer13 - 7 - integer15) {
-                        byj13 = Blocks.AIR.defaultBlockState();
-                        byj14 = byj8;
-                        bzy.setBlockState(a18, byj12, false);
+                        cfj13 = Blocks.AIR.defaultBlockState();
+                        cfj14 = cfj8;
+                        cgy.setBlockState(a18, cfj12, false);
                     }
                     else {
-                        bzy.setBlockState(a18, byj14, false);
+                        cgy.setBlockState(a18, cfj14, false);
                     }
                 }
                 else if (integer14 > 0) {
                     --integer14;
-                    bzy.setBlockState(a18, byj14, false);
-                    if (integer14 == 0 && byj14.getBlock() == Blocks.SAND && integer15 > 1) {
+                    cgy.setBlockState(a18, cfj14, false);
+                    if (integer14 == 0 && cfj14.is(Blocks.SAND) && integer15 > 1) {
                         integer14 = random.nextInt(4) + Math.max(0, integer18 - 63);
-                        byj14 = ((byj14.getBlock() == Blocks.RED_SAND) ? Blocks.RED_SANDSTONE.defaultBlockState() : Blocks.SANDSTONE.defaultBlockState());
+                        cfj14 = (cfj14.is(Blocks.RED_SAND) ? Blocks.RED_SANDSTONE.defaultBlockState() : Blocks.SANDSTONE.defaultBlockState());
                     }
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/ErodedBadlandsSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/ErodedBadlandsSurfaceBuilder.java
index 808eb84..1b2d599 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/ErodedBadlandsSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/ErodedBadlandsSurfaceBuilder.java
@@ -6,8 +6,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.block.state.BlockState;
 
 public class ErodedBadlandsSurfaceBuilder extends BadlandsSurfaceBuilder {
@@ -15,12 +14,12 @@ public class ErodedBadlandsSurfaceBuilder extends BadlandsSurfaceBuilder {
     private static final BlockState ORANGE_TERRACOTTA;
     private static final BlockState TERRACOTTA;
     
-    public ErodedBadlandsSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public ErodedBadlandsSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
         double double8 = 0.0;
         final double double9 = Math.min(Math.abs(double7), this.pillarNoise.getValue(integer4 * 0.25, integer5 * 0.25, false) * 15.0);
         if (double9 > 0.0) {
@@ -35,8 +34,8 @@ public class ErodedBadlandsSurfaceBuilder extends BadlandsSurfaceBuilder {
         }
         final int integer11 = integer4 & 0xF;
         final int integer12 = integer5 & 0xF;
-        BlockState byj10 = ErodedBadlandsSurfaceBuilder.WHITE_TERRACOTTA;
-        BlockState byj11 = bkt.getSurfaceBuilderConfig().getUnderMaterial();
+        BlockState cfj10 = ErodedBadlandsSurfaceBuilder.WHITE_TERRACOTTA;
+        BlockState cfj11 = bre.getSurfaceBuilderConfig().getUnderMaterial();
         final int integer13 = (int)(double7 / 3.0 + 3.0 + random.nextDouble() * 0.25);
         final boolean boolean25 = Math.cos(double7 / 3.0 * 3.141592653589793) > 0.0;
         int integer14 = -1;
@@ -44,62 +43,62 @@ public class ErodedBadlandsSurfaceBuilder extends BadlandsSurfaceBuilder {
         final BlockPos.MutableBlockPos a28 = new BlockPos.MutableBlockPos();
         for (int integer15 = Math.max(integer6, (int)double8 + 1); integer15 >= 0; --integer15) {
             a28.set(integer11, integer15, integer12);
-            if (bzy.getBlockState(a28).isAir() && integer15 < (int)double8) {
-                bzy.setBlockState(a28, byj8, false);
+            if (cgy.getBlockState(a28).isAir() && integer15 < (int)double8) {
+                cgy.setBlockState(a28, cfj8, false);
             }
-            final BlockState byj12 = bzy.getBlockState(a28);
-            if (byj12.isAir()) {
+            final BlockState cfj12 = cgy.getBlockState(a28);
+            if (cfj12.isAir()) {
                 integer14 = -1;
             }
-            else if (byj12.getBlock() == byj8.getBlock()) {
+            else if (cfj12.is(cfj8.getBlock())) {
                 if (integer14 == -1) {
                     boolean26 = false;
                     if (integer13 <= 0) {
-                        byj10 = Blocks.AIR.defaultBlockState();
-                        byj11 = byj8;
+                        cfj10 = Blocks.AIR.defaultBlockState();
+                        cfj11 = cfj8;
                     }
                     else if (integer15 >= integer10 - 4 && integer15 <= integer10 + 1) {
-                        byj10 = ErodedBadlandsSurfaceBuilder.WHITE_TERRACOTTA;
-                        byj11 = bkt.getSurfaceBuilderConfig().getUnderMaterial();
+                        cfj10 = ErodedBadlandsSurfaceBuilder.WHITE_TERRACOTTA;
+                        cfj11 = bre.getSurfaceBuilderConfig().getUnderMaterial();
                     }
-                    if (integer15 < integer10 && (byj10 == null || byj10.isAir())) {
-                        byj10 = byj9;
+                    if (integer15 < integer10 && (cfj10 == null || cfj10.isAir())) {
+                        cfj10 = cfj9;
                     }
                     integer14 = integer13 + Math.max(0, integer15 - integer10);
                     if (integer15 >= integer10 - 1) {
                         if (integer15 > integer10 + 3 + integer13) {
-                            BlockState byj13;
+                            BlockState cfj13;
                             if (integer15 < 64 || integer15 > 127) {
-                                byj13 = ErodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA;
+                                cfj13 = ErodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA;
                             }
                             else if (boolean25) {
-                                byj13 = ErodedBadlandsSurfaceBuilder.TERRACOTTA;
+                                cfj13 = ErodedBadlandsSurfaceBuilder.TERRACOTTA;
                             }
                             else {
-                                byj13 = this.getBand(integer4, integer15, integer5);
+                                cfj13 = this.getBand(integer4, integer15, integer5);
                             }
-                            bzy.setBlockState(a28, byj13, false);
+                            cgy.setBlockState(a28, cfj13, false);
                         }
                         else {
-                            bzy.setBlockState(a28, bkt.getSurfaceBuilderConfig().getTopMaterial(), false);
+                            cgy.setBlockState(a28, bre.getSurfaceBuilderConfig().getTopMaterial(), false);
                             boolean26 = true;
                         }
                     }
                     else {
-                        bzy.setBlockState(a28, byj11, false);
-                        final Block bph31 = byj11.getBlock();
-                        if (bph31 == Blocks.WHITE_TERRACOTTA || bph31 == Blocks.ORANGE_TERRACOTTA || bph31 == Blocks.MAGENTA_TERRACOTTA || bph31 == Blocks.LIGHT_BLUE_TERRACOTTA || bph31 == Blocks.YELLOW_TERRACOTTA || bph31 == Blocks.LIME_TERRACOTTA || bph31 == Blocks.PINK_TERRACOTTA || bph31 == Blocks.GRAY_TERRACOTTA || bph31 == Blocks.LIGHT_GRAY_TERRACOTTA || bph31 == Blocks.CYAN_TERRACOTTA || bph31 == Blocks.PURPLE_TERRACOTTA || bph31 == Blocks.BLUE_TERRACOTTA || bph31 == Blocks.BROWN_TERRACOTTA || bph31 == Blocks.GREEN_TERRACOTTA || bph31 == Blocks.RED_TERRACOTTA || bph31 == Blocks.BLACK_TERRACOTTA) {
-                            bzy.setBlockState(a28, ErodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
+                        cgy.setBlockState(a28, cfj11, false);
+                        final Block bvr31 = cfj11.getBlock();
+                        if (bvr31 == Blocks.WHITE_TERRACOTTA || bvr31 == Blocks.ORANGE_TERRACOTTA || bvr31 == Blocks.MAGENTA_TERRACOTTA || bvr31 == Blocks.LIGHT_BLUE_TERRACOTTA || bvr31 == Blocks.YELLOW_TERRACOTTA || bvr31 == Blocks.LIME_TERRACOTTA || bvr31 == Blocks.PINK_TERRACOTTA || bvr31 == Blocks.GRAY_TERRACOTTA || bvr31 == Blocks.LIGHT_GRAY_TERRACOTTA || bvr31 == Blocks.CYAN_TERRACOTTA || bvr31 == Blocks.PURPLE_TERRACOTTA || bvr31 == Blocks.BLUE_TERRACOTTA || bvr31 == Blocks.BROWN_TERRACOTTA || bvr31 == Blocks.GREEN_TERRACOTTA || bvr31 == Blocks.RED_TERRACOTTA || bvr31 == Blocks.BLACK_TERRACOTTA) {
+                            cgy.setBlockState(a28, ErodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
                         }
                     }
                 }
                 else if (integer14 > 0) {
                     --integer14;
                     if (boolean26) {
-                        bzy.setBlockState(a28, ErodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
+                        cgy.setBlockState(a28, ErodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
                     }
                     else {
-                        bzy.setBlockState(a28, this.getBand(integer4, integer15, integer5), false);
+                        cgy.setBlockState(a28, this.getBand(integer4, integer15, integer5), false);
                     }
                 }
             }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/FrozenOceanSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/FrozenOceanSurfaceBuilder.java
index 87c8cbe..7fa16b3 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/FrozenOceanSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/FrozenOceanSurfaceBuilder.java
@@ -1,5 +1,8 @@
 package net.minecraft.world.level.levelgen.surfacebuilders;
 
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import java.util.stream.IntStream;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.material.Material;
@@ -7,8 +10,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise;
 import net.minecraft.world.level.block.state.BlockState;
 
@@ -22,16 +24,16 @@ public class FrozenOceanSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBase
     private PerlinSimplexNoise icebergRoofNoise;
     private long seed;
     
-    public FrozenOceanSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public FrozenOceanSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
         double double8 = 0.0;
         double double9 = 0.0;
         final BlockPos.MutableBlockPos a20 = new BlockPos.MutableBlockPos();
-        final float float21 = bkt.getTemperature(a20.set(integer4, 63, integer5));
+        final float float21 = bre.getTemperature(a20.set(integer4, 63, integer5));
         final double double10 = Math.min(Math.abs(double7), this.icebergNoise.getValue(integer4 * 0.1, integer5 * 0.1, false) * 15.0);
         if (double10 > 1.8) {
             final double double11 = 0.09765625;
@@ -54,8 +56,8 @@ public class FrozenOceanSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBase
         }
         final int integer11 = integer4 & 0xF;
         final int integer12 = integer5 & 0xF;
-        BlockState byj10 = bkt.getSurfaceBuilderConfig().getUnderMaterial();
-        BlockState byj11 = bkt.getSurfaceBuilderConfig().getTopMaterial();
+        BlockState cfj10 = bre.getSurfaceBuilderConfig().getUnderMaterial();
+        BlockState cfj11 = bre.getSurfaceBuilderConfig().getTopMaterial();
         final int integer13 = (int)(double7 / 3.0 + 3.0 + random.nextDouble() * 0.25);
         int integer14 = -1;
         int integer15 = 0;
@@ -63,58 +65,58 @@ public class FrozenOceanSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBase
         final int integer17 = integer10 + 18 + random.nextInt(10);
         for (int integer18 = Math.max(integer6, (int)double8 + 1); integer18 >= 0; --integer18) {
             a20.set(integer11, integer18, integer12);
-            if (bzy.getBlockState(a20).isAir() && integer18 < (int)double8 && random.nextDouble() > 0.01) {
-                bzy.setBlockState(a20, FrozenOceanSurfaceBuilder.PACKED_ICE, false);
+            if (cgy.getBlockState(a20).isAir() && integer18 < (int)double8 && random.nextDouble() > 0.01) {
+                cgy.setBlockState(a20, FrozenOceanSurfaceBuilder.PACKED_ICE, false);
             }
-            else if (bzy.getBlockState(a20).getMaterial() == Material.WATER && integer18 > (int)double9 && integer18 < integer10 && double9 != 0.0 && random.nextDouble() > 0.15) {
-                bzy.setBlockState(a20, FrozenOceanSurfaceBuilder.PACKED_ICE, false);
+            else if (cgy.getBlockState(a20).getMaterial() == Material.WATER && integer18 > (int)double9 && integer18 < integer10 && double9 != 0.0 && random.nextDouble() > 0.15) {
+                cgy.setBlockState(a20, FrozenOceanSurfaceBuilder.PACKED_ICE, false);
             }
-            final BlockState byj12 = bzy.getBlockState(a20);
-            if (byj12.isAir()) {
+            final BlockState cfj12 = cgy.getBlockState(a20);
+            if (cfj12.isAir()) {
                 integer14 = -1;
             }
-            else if (byj12.getBlock() == byj8.getBlock()) {
+            else if (cfj12.is(cfj8.getBlock())) {
                 if (integer14 == -1) {
                     if (integer13 <= 0) {
-                        byj11 = FrozenOceanSurfaceBuilder.AIR;
-                        byj10 = byj8;
+                        cfj11 = FrozenOceanSurfaceBuilder.AIR;
+                        cfj10 = cfj8;
                     }
                     else if (integer18 >= integer10 - 4 && integer18 <= integer10 + 1) {
-                        byj11 = bkt.getSurfaceBuilderConfig().getTopMaterial();
-                        byj10 = bkt.getSurfaceBuilderConfig().getUnderMaterial();
+                        cfj11 = bre.getSurfaceBuilderConfig().getTopMaterial();
+                        cfj10 = bre.getSurfaceBuilderConfig().getUnderMaterial();
                     }
-                    if (integer18 < integer10 && (byj11 == null || byj11.isAir())) {
-                        if (bkt.getTemperature(a20.set(integer4, integer18, integer5)) < 0.15f) {
-                            byj11 = FrozenOceanSurfaceBuilder.ICE;
+                    if (integer18 < integer10 && (cfj11 == null || cfj11.isAir())) {
+                        if (bre.getTemperature(a20.set(integer4, integer18, integer5)) < 0.15f) {
+                            cfj11 = FrozenOceanSurfaceBuilder.ICE;
                         }
                         else {
-                            byj11 = byj9;
+                            cfj11 = cfj9;
                         }
                     }
                     integer14 = integer13;
                     if (integer18 >= integer10 - 1) {
-                        bzy.setBlockState(a20, byj11, false);
+                        cgy.setBlockState(a20, cfj11, false);
                     }
                     else if (integer18 < integer10 - 7 - integer13) {
-                        byj11 = FrozenOceanSurfaceBuilder.AIR;
-                        byj10 = byj8;
-                        bzy.setBlockState(a20, FrozenOceanSurfaceBuilder.GRAVEL, false);
+                        cfj11 = FrozenOceanSurfaceBuilder.AIR;
+                        cfj10 = cfj8;
+                        cgy.setBlockState(a20, FrozenOceanSurfaceBuilder.GRAVEL, false);
                     }
                     else {
-                        bzy.setBlockState(a20, byj10, false);
+                        cgy.setBlockState(a20, cfj10, false);
                     }
                 }
                 else if (integer14 > 0) {
                     --integer14;
-                    bzy.setBlockState(a20, byj10, false);
-                    if (integer14 == 0 && byj10.getBlock() == Blocks.SAND && integer13 > 1) {
+                    cgy.setBlockState(a20, cfj10, false);
+                    if (integer14 == 0 && cfj10.is(Blocks.SAND) && integer13 > 1) {
                         integer14 = random.nextInt(4) + Math.max(0, integer18 - 63);
-                        byj10 = ((byj10.getBlock() == Blocks.RED_SAND) ? Blocks.RED_SANDSTONE.defaultBlockState() : Blocks.SANDSTONE.defaultBlockState());
+                        cfj10 = (cfj10.is(Blocks.RED_SAND) ? Blocks.RED_SANDSTONE.defaultBlockState() : Blocks.SANDSTONE.defaultBlockState());
                     }
                 }
             }
-            else if (byj12.getBlock() == Blocks.PACKED_ICE && integer15 <= integer16 && integer18 > integer17) {
-                bzy.setBlockState(a20, FrozenOceanSurfaceBuilder.SNOW_BLOCK, false);
+            else if (cfj12.is(Blocks.PACKED_ICE) && integer15 <= integer16 && integer18 > integer17) {
+                cgy.setBlockState(a20, FrozenOceanSurfaceBuilder.SNOW_BLOCK, false);
                 ++integer15;
             }
         }
@@ -123,9 +125,9 @@ public class FrozenOceanSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBase
     @Override
     public void initNoise(final long long1) {
         if (this.seed != long1 || this.icebergNoise == null || this.icebergRoofNoise == null) {
-            final WorldgenRandom ccf4 = new WorldgenRandom(long1);
-            this.icebergNoise = new PerlinSimplexNoise(ccf4, 3, 0);
-            this.icebergRoofNoise = new PerlinSimplexNoise(ccf4, 0, 0);
+            final WorldgenRandom ciy4 = new WorldgenRandom(long1);
+            this.icebergNoise = new PerlinSimplexNoise(ciy4, IntStream.rangeClosed(-3, 0));
+            this.icebergRoofNoise = new PerlinSimplexNoise(ciy4, ImmutableList.<Integer>of(0));
         }
         this.seed = long1;
     }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/GiantTreeTaigaSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/GiantTreeTaigaSurfaceBuilder.java
index 387d353..8a6397a 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/GiantTreeTaigaSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/GiantTreeTaigaSurfaceBuilder.java
@@ -4,24 +4,23 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class GiantTreeTaigaSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfiguration> {
-    public GiantTreeTaigaSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public GiantTreeTaigaSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
         if (double7 > 1.75) {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_COARSE_DIRT);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_COARSE_DIRT);
         }
         else if (double7 > -0.95) {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_PODZOL);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_PODZOL);
         }
         else {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_GRASS);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_GRASS);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/GravellyMountainSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/GravellyMountainSurfaceBuilder.java
index 2fafd1a..3e2675b 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/GravellyMountainSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/GravellyMountainSurfaceBuilder.java
@@ -4,24 +4,23 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class GravellyMountainSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfiguration> {
-    public GravellyMountainSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public GravellyMountainSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
         if (double7 < -1.0 || double7 > 2.0) {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_GRAVEL);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_GRAVEL);
         }
         else if (double7 > 1.0) {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_STONE);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_STONE);
         }
         else {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_GRASS);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_GRASS);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/MountainSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/MountainSurfaceBuilder.java
index 9e6f7f5..18df104 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/MountainSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/MountainSurfaceBuilder.java
@@ -4,21 +4,20 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class MountainSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfiguration> {
-    public MountainSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public MountainSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
         if (double7 > 1.0) {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_STONE);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_STONE);
         }
         else {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_GRASS);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_GRASS);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
new file mode 100644
index 0000000..ee5cb01
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
@@ -0,0 +1,96 @@
+package net.minecraft.world.level.levelgen.surfacebuilders;
+
+import com.google.common.collect.UnmodifiableIterator;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.core.Direction;
+import net.minecraft.core.BlockPos;
+import java.util.Comparator;
+import java.util.Map;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import java.util.Random;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.synth.PerlinNoise;
+import net.minecraft.world.level.block.state.BlockState;
+import com.google.common.collect.ImmutableMap;
+
+public abstract class NetherCappedSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfiguration> {
+    private long seed;
+    private ImmutableMap<BlockState, PerlinNoise> floorNoises;
+    private ImmutableMap<BlockState, PerlinNoise> ceilingNoises;
+    private PerlinNoise patchNoise;
+    
+    public NetherCappedSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
+        this.floorNoises = ImmutableMap.<BlockState, PerlinNoise>of();
+        this.ceilingNoises = ImmutableMap.<BlockState, PerlinNoise>of();
+    }
+    
+    @Override
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
+        final int integer11 = integer10 + 1;
+        final int integer12 = integer4 & 0xF;
+        final int integer13 = integer5 & 0xF;
+        final int integer14 = (int)(double7 / 3.0 + 3.0 + random.nextDouble() * 0.25);
+        final int integer15 = (int)(double7 / 3.0 + 3.0 + random.nextDouble() * 0.25);
+        final double double8 = 0.03125;
+        final boolean boolean23 = this.patchNoise.getValue(integer4 * 0.03125, 109.0, integer5 * 0.03125) * 75.0 + random.nextDouble() > 0.0;
+        final BlockState cfj10 = this.ceilingNoises.entrySet().stream().max(Comparator.comparing(entry -> entry.getValue().getValue(integer4, integer10, integer5))).get().getKey();
+        final BlockState cfj11 = this.floorNoises.entrySet().stream().max(Comparator.comparing(entry -> entry.getValue().getValue(integer4, integer10, integer5))).get().getKey();
+        final BlockPos.MutableBlockPos a26 = new BlockPos.MutableBlockPos();
+        BlockState cfj12 = cgy.getBlockState(a26.set(integer12, 128, integer13));
+        for (int integer16 = 127; integer16 >= 0; --integer16) {
+            a26.set(integer12, integer16, integer13);
+            final BlockState cfj13 = cgy.getBlockState(a26);
+            if (cfj12.is(cfj8.getBlock()) && (cfj13.isAir() || cfj13 == cfj9)) {
+                for (int integer17 = 0; integer17 < integer14; ++integer17) {
+                    a26.move(Direction.UP);
+                    if (!cgy.getBlockState(a26).is(cfj8.getBlock())) {
+                        break;
+                    }
+                    cgy.setBlockState(a26, cfj10, false);
+                }
+                a26.set(integer12, integer16, integer13);
+            }
+            if ((cfj12.isAir() || cfj12 == cfj9) && cfj13.is(cfj8.getBlock())) {
+                for (int integer17 = 0; integer17 < integer15 && cgy.getBlockState(a26).is(cfj8.getBlock()); ++integer17) {
+                    if (boolean23 && integer16 >= integer11 - 4 && integer16 <= integer11 + 1) {
+                        cgy.setBlockState(a26, this.getPatchBlockState(), false);
+                    }
+                    else {
+                        cgy.setBlockState(a26, cfj11, false);
+                    }
+                    a26.move(Direction.DOWN);
+                }
+            }
+            cfj12 = cfj13;
+        }
+    }
+    
+    @Override
+    public void initNoise(final long long1) {
+        if (this.seed != long1 || this.patchNoise == null || this.floorNoises.isEmpty() || this.ceilingNoises.isEmpty()) {
+            this.floorNoises = initPerlinNoises(this.getFloorBlockStates(), long1);
+            this.ceilingNoises = initPerlinNoises(this.getCeilingBlockStates(), long1 + this.floorNoises.size());
+            this.patchNoise = new PerlinNoise(new WorldgenRandom(long1 + this.floorNoises.size() + this.ceilingNoises.size()), ImmutableList.<Integer>of(0));
+        }
+        this.seed = long1;
+    }
+    
+    private static ImmutableMap<BlockState, PerlinNoise> initPerlinNoises(final ImmutableList<BlockState> immutableList, long long2) {
+        final ImmutableMap.Builder<BlockState, PerlinNoise> builder4 = new ImmutableMap.Builder<BlockState, PerlinNoise>();
+        for (final BlockState cfj6 : immutableList) {
+            builder4.put(cfj6, new PerlinNoise(new WorldgenRandom(long2), ImmutableList.<Integer>of(-4)));
+            ++long2;
+        }
+        return builder4.build();
+    }
+    
+    protected abstract ImmutableList<BlockState> getFloorBlockStates();
+    
+    protected abstract ImmutableList<BlockState> getCeilingBlockStates();
+    
+    protected abstract BlockState getPatchBlockState();
+}
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java
new file mode 100644
index 0000000..fb57518
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java
@@ -0,0 +1,87 @@
+package net.minecraft.world.level.levelgen.surfacebuilders;
+
+import net.minecraft.world.level.block.Blocks;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import java.util.Random;
+import com.mojang.serialization.Codec;
+import net.minecraft.world.level.levelgen.synth.PerlinNoise;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class NetherForestSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfiguration> {
+    private static final BlockState AIR;
+    protected long seed;
+    private PerlinNoise decorationNoise;
+    
+    public NetherForestSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
+        final int integer11 = integer10;
+        final int integer12 = integer4 & 0xF;
+        final int integer13 = integer5 & 0xF;
+        final double double8 = this.decorationNoise.getValue(integer4 * 0.1, integer10, integer5 * 0.1);
+        final boolean boolean21 = double8 > 0.15 + random.nextDouble() * 0.35;
+        final double double9 = this.decorationNoise.getValue(integer4 * 0.1, 109.0, integer5 * 0.1);
+        final boolean boolean22 = double9 > 0.25 + random.nextDouble() * 0.9;
+        final int integer14 = (int)(double7 / 3.0 + 3.0 + random.nextDouble() * 0.25);
+        final BlockPos.MutableBlockPos a26 = new BlockPos.MutableBlockPos();
+        int integer15 = -1;
+        BlockState cfj10 = cvx.getUnderMaterial();
+        for (int integer16 = 127; integer16 >= 0; --integer16) {
+            a26.set(integer12, integer16, integer13);
+            BlockState cfj11 = cvx.getTopMaterial();
+            final BlockState cfj12 = cgy.getBlockState(a26);
+            if (cfj12.isAir()) {
+                integer15 = -1;
+            }
+            else if (cfj12.is(cfj8.getBlock())) {
+                if (integer15 == -1) {
+                    boolean boolean23 = false;
+                    if (integer14 <= 0) {
+                        boolean23 = true;
+                        cfj10 = cvx.getUnderMaterial();
+                    }
+                    if (boolean21) {
+                        cfj11 = cvx.getUnderMaterial();
+                    }
+                    else if (boolean22) {
+                        cfj11 = cvx.getUnderwaterMaterial();
+                    }
+                    if (integer16 < integer11 && boolean23) {
+                        cfj11 = cfj9;
+                    }
+                    integer15 = integer14;
+                    if (integer16 >= integer11 - 1) {
+                        cgy.setBlockState(a26, cfj11, false);
+                    }
+                    else {
+                        cgy.setBlockState(a26, cfj10, false);
+                    }
+                }
+                else if (integer15 > 0) {
+                    --integer15;
+                    cgy.setBlockState(a26, cfj10, false);
+                }
+            }
+        }
+    }
+    
+    @Override
+    public void initNoise(final long long1) {
+        if (this.seed != long1 || this.decorationNoise == null) {
+            this.decorationNoise = new PerlinNoise(new WorldgenRandom(long1), ImmutableList.<Integer>of(0));
+        }
+        this.seed = long1;
+    }
+    
+    static {
+        AIR = Blocks.CAVE_AIR.defaultBlockState();
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java
index c303efa..f3e1a03 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java
@@ -1,31 +1,30 @@
 package net.minecraft.world.level.levelgen.surfacebuilders;
 
 import net.minecraft.world.level.block.Blocks;
+import java.util.stream.IntStream;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.levelgen.synth.PerlinNoise;
 import net.minecraft.world.level.block.state.BlockState;
 
 public class NetherSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfiguration> {
     private static final BlockState AIR;
-    private static final BlockState NETHERRACK;
     private static final BlockState GRAVEL;
     private static final BlockState SOUL_SAND;
     protected long seed;
     protected PerlinNoise decorationNoise;
     
-    public NetherSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public NetherSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
-        final int integer11 = integer10 + 1;
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
+        final int integer11 = integer10;
         final int integer12 = integer4 & 0xF;
         final int integer13 = integer5 & 0xF;
         final double double8 = 0.03125;
@@ -34,46 +33,47 @@ public class NetherSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfi
         final int integer14 = (int)(double7 / 3.0 + 3.0 + random.nextDouble() * 0.25);
         final BlockPos.MutableBlockPos a24 = new BlockPos.MutableBlockPos();
         int integer15 = -1;
-        BlockState byj10 = NetherSurfaceBuilder.NETHERRACK;
-        BlockState byj11 = NetherSurfaceBuilder.NETHERRACK;
+        BlockState cfj10 = cvx.getTopMaterial();
+        BlockState cfj11 = cvx.getUnderMaterial();
         for (int integer16 = 127; integer16 >= 0; --integer16) {
             a24.set(integer12, integer16, integer13);
-            final BlockState byj12 = bzy.getBlockState(a24);
-            if (byj12.getBlock() == null || byj12.isAir()) {
+            final BlockState cfj12 = cgy.getBlockState(a24);
+            if (cfj12.isAir()) {
                 integer15 = -1;
             }
-            else if (byj12.getBlock() == byj8.getBlock()) {
+            else if (cfj12.is(cfj8.getBlock())) {
                 if (integer15 == -1) {
+                    boolean boolean23 = false;
                     if (integer14 <= 0) {
-                        byj10 = NetherSurfaceBuilder.AIR;
-                        byj11 = NetherSurfaceBuilder.NETHERRACK;
+                        boolean23 = true;
+                        cfj11 = cvx.getUnderMaterial();
                     }
                     else if (integer16 >= integer11 - 4 && integer16 <= integer11 + 1) {
-                        byj10 = NetherSurfaceBuilder.NETHERRACK;
-                        byj11 = NetherSurfaceBuilder.NETHERRACK;
+                        cfj10 = cvx.getTopMaterial();
+                        cfj11 = cvx.getUnderMaterial();
                         if (boolean22) {
-                            byj10 = NetherSurfaceBuilder.GRAVEL;
-                            byj11 = NetherSurfaceBuilder.NETHERRACK;
+                            cfj10 = NetherSurfaceBuilder.GRAVEL;
+                            cfj11 = cvx.getUnderMaterial();
                         }
                         if (boolean21) {
-                            byj10 = NetherSurfaceBuilder.SOUL_SAND;
-                            byj11 = NetherSurfaceBuilder.SOUL_SAND;
+                            cfj10 = NetherSurfaceBuilder.SOUL_SAND;
+                            cfj11 = NetherSurfaceBuilder.SOUL_SAND;
                         }
                     }
-                    if (integer16 < integer11 && (byj10 == null || byj10.isAir())) {
-                        byj10 = byj9;
+                    if (integer16 < integer11 && boolean23) {
+                        cfj10 = cfj9;
                     }
                     integer15 = integer14;
                     if (integer16 >= integer11 - 1) {
-                        bzy.setBlockState(a24, byj10, false);
+                        cgy.setBlockState(a24, cfj10, false);
                     }
                     else {
-                        bzy.setBlockState(a24, byj11, false);
+                        cgy.setBlockState(a24, cfj11, false);
                     }
                 }
                 else if (integer15 > 0) {
                     --integer15;
-                    bzy.setBlockState(a24, byj11, false);
+                    cgy.setBlockState(a24, cfj11, false);
                 }
             }
         }
@@ -82,14 +82,13 @@ public class NetherSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfi
     @Override
     public void initNoise(final long long1) {
         if (this.seed != long1 || this.decorationNoise == null) {
-            this.decorationNoise = new PerlinNoise(new WorldgenRandom(long1), 3, 0);
+            this.decorationNoise = new PerlinNoise(new WorldgenRandom(long1), IntStream.rangeClosed(-3, 0));
         }
         this.seed = long1;
     }
     
     static {
         AIR = Blocks.CAVE_AIR.defaultBlockState();
-        NETHERRACK = Blocks.NETHERRACK.defaultBlockState();
         GRAVEL = Blocks.GRAVEL.defaultBlockState();
         SOUL_SAND = Blocks.SOUL_SAND.defaultBlockState();
     }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/NopeSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/NopeSurfaceBuilder.java
index 8a201f0..cffe9e4 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/NopeSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/NopeSurfaceBuilder.java
@@ -4,15 +4,14 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class NopeSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfiguration> {
-    public NopeSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public NopeSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/ShatteredSavanaSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/ShatteredSavanaSurfaceBuilder.java
index 77caeb3..4e9a1fa 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/ShatteredSavanaSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/ShatteredSavanaSurfaceBuilder.java
@@ -4,24 +4,23 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class ShatteredSavanaSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfiguration> {
-    public ShatteredSavanaSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public ShatteredSavanaSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
         if (double7 > 1.75) {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_STONE);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_STONE);
         }
         else if (double7 > -0.5) {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_COARSE_DIRT);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_COARSE_DIRT);
         }
         else {
-            SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, SurfaceBuilder.CONFIG_GRASS);
+            SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, SurfaceBuilder.CONFIG_GRASS);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/SoulSandValleySurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/SoulSandValleySurfaceBuilder.java
new file mode 100644
index 0000000..7b274dc
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/SoulSandValleySurfaceBuilder.java
@@ -0,0 +1,39 @@
+package net.minecraft.world.level.levelgen.surfacebuilders;
+
+import net.minecraft.world.level.block.Blocks;
+import com.mojang.serialization.Codec;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class SoulSandValleySurfaceBuilder extends NetherCappedSurfaceBuilder {
+    private static final BlockState SOUL_SAND;
+    private static final BlockState SOUL_SOIL;
+    private static final BlockState GRAVEL;
+    private static final ImmutableList<BlockState> BLOCK_STATES;
+    
+    public SoulSandValleySurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
+    }
+    
+    @Override
+    protected ImmutableList<BlockState> getFloorBlockStates() {
+        return SoulSandValleySurfaceBuilder.BLOCK_STATES;
+    }
+    
+    @Override
+    protected ImmutableList<BlockState> getCeilingBlockStates() {
+        return SoulSandValleySurfaceBuilder.BLOCK_STATES;
+    }
+    
+    @Override
+    protected BlockState getPatchBlockState() {
+        return SoulSandValleySurfaceBuilder.GRAVEL;
+    }
+    
+    static {
+        SOUL_SAND = Blocks.SOUL_SAND.defaultBlockState();
+        SOUL_SOIL = Blocks.SOUL_SOIL.defaultBlockState();
+        GRAVEL = Blocks.GRAVEL.defaultBlockState();
+        BLOCK_STATES = ImmutableList.<BlockState>of(SoulSandValleySurfaceBuilder.SOUL_SAND, SoulSandValleySurfaceBuilder.SOUL_SOIL);
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/SurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/SurfaceBuilder.java
index c924ab9..374129d 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/SurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/SurfaceBuilder.java
@@ -5,8 +5,7 @@ import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.block.state.BlockState;
 
 public abstract class SurfaceBuilder<C extends SurfaceBuilderConfiguration> {
@@ -21,8 +20,16 @@ public abstract class SurfaceBuilder<C extends SurfaceBuilderConfiguration> {
     public static final BlockState RED_SAND;
     public static final BlockState WHITE_TERRACOTTA;
     public static final BlockState MYCELIUM;
+    public static final BlockState SOUL_SAND;
     public static final BlockState NETHERRACK;
     public static final BlockState ENDSTONE;
+    public static final BlockState CRIMSON_NYLIUM;
+    public static final BlockState WARPED_NYLIUM;
+    public static final BlockState NETHER_WART_BLOCK;
+    public static final BlockState WARPED_WART_BLOCK;
+    public static final BlockState BLACKSTONE;
+    public static final BlockState BASALT;
+    public static final BlockState MAGMA;
     public static final SurfaceBuilderBaseConfiguration CONFIG_EMPTY;
     public static final SurfaceBuilderBaseConfiguration CONFIG_PODZOL;
     public static final SurfaceBuilderBaseConfiguration CONFIG_GRAVEL;
@@ -36,7 +43,11 @@ public abstract class SurfaceBuilder<C extends SurfaceBuilderConfiguration> {
     public static final SurfaceBuilderBaseConfiguration CONFIG_BADLANDS;
     public static final SurfaceBuilderBaseConfiguration CONFIG_MYCELIUM;
     public static final SurfaceBuilderBaseConfiguration CONFIG_HELL;
+    public static final SurfaceBuilderBaseConfiguration CONFIG_SOUL_SAND_VALLEY;
     public static final SurfaceBuilderBaseConfiguration CONFIG_THEEND;
+    public static final SurfaceBuilderBaseConfiguration CONFIG_CRIMSON_FOREST;
+    public static final SurfaceBuilderBaseConfiguration CONFIG_WARPED_FOREST;
+    public static final SurfaceBuilderBaseConfiguration CONFIG_BASALT_DELTAS;
     public static final SurfaceBuilder<SurfaceBuilderBaseConfiguration> DEFAULT;
     public static final SurfaceBuilder<SurfaceBuilderBaseConfiguration> MOUNTAIN;
     public static final SurfaceBuilder<SurfaceBuilderBaseConfiguration> SHATTERED_SAVANNA;
@@ -48,18 +59,25 @@ public abstract class SurfaceBuilder<C extends SurfaceBuilderConfiguration> {
     public static final SurfaceBuilder<SurfaceBuilderBaseConfiguration> ERODED_BADLANDS;
     public static final SurfaceBuilder<SurfaceBuilderBaseConfiguration> FROZEN_OCEAN;
     public static final SurfaceBuilder<SurfaceBuilderBaseConfiguration> NETHER;
+    public static final SurfaceBuilder<SurfaceBuilderBaseConfiguration> NETHER_FOREST;
+    public static final SurfaceBuilder<SurfaceBuilderBaseConfiguration> SOUL_SAND_VALLEY;
+    public static final SurfaceBuilder<SurfaceBuilderBaseConfiguration> BASALT_DELTAS;
     public static final SurfaceBuilder<SurfaceBuilderBaseConfiguration> NOPE;
-    private final Function<Dynamic<?>, ? extends C> configurationFactory;
+    private final Codec<ConfiguredSurfaceBuilder<C>> configuredCodec;
     
-    private static <C extends SurfaceBuilderConfiguration, F extends SurfaceBuilder<C>> F register(final String string, final F cng) {
-        return Registry.<F>register(Registry.SURFACE_BUILDER, string, cng);
+    private static <C extends SurfaceBuilderConfiguration, F extends SurfaceBuilder<C>> F register(final String string, final F cvw) {
+        return Registry.<F>register(Registry.SURFACE_BUILDER, string, cvw);
     }
     
-    public SurfaceBuilder(final Function<Dynamic<?>, ? extends C> function) {
-        this.configurationFactory = function;
+    public SurfaceBuilder(final Codec<C> codec) {
+        this.configuredCodec = (Codec<ConfiguredSurfaceBuilder<C>>)codec.fieldOf("config").xmap(cvy -> new ConfiguredSurfaceBuilder((SurfaceBuilder<SurfaceBuilderConfiguration>)this, cvy), cvj -> cvj.config).codec();
     }
     
-    public abstract void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final C cni);
+    public Codec<ConfiguredSurfaceBuilder<C>> configuredCodec() {
+        return this.configuredCodec;
+    }
+    
+    public abstract void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final C cvy);
     
     public void initNoise(final long long1) {
     }
@@ -76,8 +94,16 @@ public abstract class SurfaceBuilder<C extends SurfaceBuilderConfiguration> {
         RED_SAND = Blocks.RED_SAND.defaultBlockState();
         WHITE_TERRACOTTA = Blocks.WHITE_TERRACOTTA.defaultBlockState();
         MYCELIUM = Blocks.MYCELIUM.defaultBlockState();
+        SOUL_SAND = Blocks.SOUL_SAND.defaultBlockState();
         NETHERRACK = Blocks.NETHERRACK.defaultBlockState();
         ENDSTONE = Blocks.END_STONE.defaultBlockState();
+        CRIMSON_NYLIUM = Blocks.CRIMSON_NYLIUM.defaultBlockState();
+        WARPED_NYLIUM = Blocks.WARPED_NYLIUM.defaultBlockState();
+        NETHER_WART_BLOCK = Blocks.NETHER_WART_BLOCK.defaultBlockState();
+        WARPED_WART_BLOCK = Blocks.WARPED_WART_BLOCK.defaultBlockState();
+        BLACKSTONE = Blocks.BLACKSTONE.defaultBlockState();
+        BASALT = Blocks.BASALT.defaultBlockState();
+        MAGMA = Blocks.MAGMA_BLOCK.defaultBlockState();
         CONFIG_EMPTY = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.AIR, SurfaceBuilder.AIR, SurfaceBuilder.AIR);
         CONFIG_PODZOL = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.PODZOL, SurfaceBuilder.DIRT, SurfaceBuilder.GRAVEL);
         CONFIG_GRAVEL = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.GRAVEL, SurfaceBuilder.GRAVEL, SurfaceBuilder.GRAVEL);
@@ -91,18 +117,25 @@ public abstract class SurfaceBuilder<C extends SurfaceBuilderConfiguration> {
         CONFIG_BADLANDS = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.RED_SAND, SurfaceBuilder.WHITE_TERRACOTTA, SurfaceBuilder.GRAVEL);
         CONFIG_MYCELIUM = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.MYCELIUM, SurfaceBuilder.DIRT, SurfaceBuilder.GRAVEL);
         CONFIG_HELL = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.NETHERRACK, SurfaceBuilder.NETHERRACK, SurfaceBuilder.NETHERRACK);
+        CONFIG_SOUL_SAND_VALLEY = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.SOUL_SAND, SurfaceBuilder.SOUL_SAND, SurfaceBuilder.SOUL_SAND);
         CONFIG_THEEND = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.ENDSTONE, SurfaceBuilder.ENDSTONE, SurfaceBuilder.ENDSTONE);
-        DEFAULT = SurfaceBuilder.<SurfaceBuilderConfiguration, DefaultSurfaceBuilder>register("default", new DefaultSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        MOUNTAIN = SurfaceBuilder.<SurfaceBuilderConfiguration, MountainSurfaceBuilder>register("mountain", new MountainSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        SHATTERED_SAVANNA = SurfaceBuilder.<SurfaceBuilderConfiguration, ShatteredSavanaSurfaceBuilder>register("shattered_savanna", new ShatteredSavanaSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        GRAVELLY_MOUNTAIN = SurfaceBuilder.<SurfaceBuilderConfiguration, GravellyMountainSurfaceBuilder>register("gravelly_mountain", new GravellyMountainSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        GIANT_TREE_TAIGA = SurfaceBuilder.<SurfaceBuilderConfiguration, GiantTreeTaigaSurfaceBuilder>register("giant_tree_taiga", new GiantTreeTaigaSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        SWAMP = SurfaceBuilder.<SurfaceBuilderConfiguration, SwampSurfaceBuilder>register("swamp", new SwampSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        BADLANDS = SurfaceBuilder.<SurfaceBuilderConfiguration, BadlandsSurfaceBuilder>register("badlands", new BadlandsSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        WOODED_BADLANDS = SurfaceBuilder.<SurfaceBuilderConfiguration, WoodedBadlandsSurfaceBuilder>register("wooded_badlands", new WoodedBadlandsSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        ERODED_BADLANDS = SurfaceBuilder.<SurfaceBuilderConfiguration, ErodedBadlandsSurfaceBuilder>register("eroded_badlands", new ErodedBadlandsSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        FROZEN_OCEAN = SurfaceBuilder.<SurfaceBuilderConfiguration, FrozenOceanSurfaceBuilder>register("frozen_ocean", new FrozenOceanSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        NETHER = SurfaceBuilder.<SurfaceBuilderConfiguration, NetherSurfaceBuilder>register("nether", new NetherSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
-        NOPE = SurfaceBuilder.<SurfaceBuilderConfiguration, NopeSurfaceBuilder>register("nope", new NopeSurfaceBuilder(SurfaceBuilderBaseConfiguration::deserialize));
+        CONFIG_CRIMSON_FOREST = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.CRIMSON_NYLIUM, SurfaceBuilder.NETHERRACK, SurfaceBuilder.NETHER_WART_BLOCK);
+        CONFIG_WARPED_FOREST = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.WARPED_NYLIUM, SurfaceBuilder.NETHERRACK, SurfaceBuilder.WARPED_WART_BLOCK);
+        CONFIG_BASALT_DELTAS = new SurfaceBuilderBaseConfiguration(SurfaceBuilder.BLACKSTONE, SurfaceBuilder.BASALT, SurfaceBuilder.MAGMA);
+        DEFAULT = SurfaceBuilder.<SurfaceBuilderConfiguration, DefaultSurfaceBuilder>register("default", new DefaultSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        MOUNTAIN = SurfaceBuilder.<SurfaceBuilderConfiguration, MountainSurfaceBuilder>register("mountain", new MountainSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        SHATTERED_SAVANNA = SurfaceBuilder.<SurfaceBuilderConfiguration, ShatteredSavanaSurfaceBuilder>register("shattered_savanna", new ShatteredSavanaSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        GRAVELLY_MOUNTAIN = SurfaceBuilder.<SurfaceBuilderConfiguration, GravellyMountainSurfaceBuilder>register("gravelly_mountain", new GravellyMountainSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        GIANT_TREE_TAIGA = SurfaceBuilder.<SurfaceBuilderConfiguration, GiantTreeTaigaSurfaceBuilder>register("giant_tree_taiga", new GiantTreeTaigaSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        SWAMP = SurfaceBuilder.<SurfaceBuilderConfiguration, SwampSurfaceBuilder>register("swamp", new SwampSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        BADLANDS = SurfaceBuilder.<SurfaceBuilderConfiguration, BadlandsSurfaceBuilder>register("badlands", new BadlandsSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        WOODED_BADLANDS = SurfaceBuilder.<SurfaceBuilderConfiguration, WoodedBadlandsSurfaceBuilder>register("wooded_badlands", new WoodedBadlandsSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        ERODED_BADLANDS = SurfaceBuilder.<SurfaceBuilderConfiguration, ErodedBadlandsSurfaceBuilder>register("eroded_badlands", new ErodedBadlandsSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        FROZEN_OCEAN = SurfaceBuilder.<SurfaceBuilderConfiguration, FrozenOceanSurfaceBuilder>register("frozen_ocean", new FrozenOceanSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        NETHER = SurfaceBuilder.<SurfaceBuilderConfiguration, NetherSurfaceBuilder>register("nether", new NetherSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        NETHER_FOREST = SurfaceBuilder.<SurfaceBuilderConfiguration, NetherForestSurfaceBuilder>register("nether_forest", new NetherForestSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        SOUL_SAND_VALLEY = SurfaceBuilder.<SurfaceBuilderConfiguration, SoulSandValleySurfaceBuilder>register("soul_sand_valley", new SoulSandValleySurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        BASALT_DELTAS = SurfaceBuilder.<SurfaceBuilderConfiguration, BasaltDeltasSurfaceBuilder>register("basalt_deltas", new BasaltDeltasSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
+        NOPE = SurfaceBuilder.<SurfaceBuilderConfiguration, NopeSurfaceBuilder>register("nope", new NopeSurfaceBuilder(SurfaceBuilderBaseConfiguration.CODEC));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/SurfaceBuilderBaseConfiguration.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/SurfaceBuilderBaseConfiguration.java
index 686ed46..2df2f1e 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/SurfaceBuilderBaseConfiguration.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/SurfaceBuilderBaseConfiguration.java
@@ -1,19 +1,21 @@
 package net.minecraft.world.level.levelgen.surfacebuilders;
 
-import net.minecraft.world.level.block.Blocks;
-import java.util.function.Function;
-import com.mojang.datafixers.Dynamic;
+import com.mojang.datafixers.kinds.Applicative;
+import com.mojang.datafixers.kinds.App;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.level.block.state.BlockState;
+import com.mojang.serialization.Codec;
 
 public class SurfaceBuilderBaseConfiguration implements SurfaceBuilderConfiguration {
+    public static final Codec<SurfaceBuilderBaseConfiguration> CODEC;
     private final BlockState topMaterial;
     private final BlockState underMaterial;
     private final BlockState underwaterMaterial;
     
-    public SurfaceBuilderBaseConfiguration(final BlockState byj1, final BlockState byj2, final BlockState byj3) {
-        this.topMaterial = byj1;
-        this.underMaterial = byj2;
-        this.underwaterMaterial = byj3;
+    public SurfaceBuilderBaseConfiguration(final BlockState cfj1, final BlockState cfj2, final BlockState cfj3) {
+        this.topMaterial = cfj1;
+        this.underMaterial = cfj2;
+        this.underwaterMaterial = cfj3;
     }
     
     @Override
@@ -30,10 +32,7 @@ public class SurfaceBuilderBaseConfiguration implements SurfaceBuilderConfigurat
         return this.underwaterMaterial;
     }
     
-    public static SurfaceBuilderBaseConfiguration deserialize(final Dynamic<?> dynamic) {
-        final BlockState byj2 = dynamic.get("top_material").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        final BlockState byj3 = dynamic.get("under_material").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        final BlockState byj4 = dynamic.get("underwater_material").map((Function)BlockState::deserialize).orElse(Blocks.AIR.defaultBlockState());
-        return new SurfaceBuilderBaseConfiguration(byj2, byj3, byj4);
+    static {
+        CODEC = RecordCodecBuilder.create(instance -> ((RecordCodecBuilder.Instance)instance).group((App)BlockState.CODEC.fieldOf("top_material").forGetter(cvx -> cvx.topMaterial), (App)BlockState.CODEC.fieldOf("under_material").forGetter(cvx -> cvx.underMaterial), (App)BlockState.CODEC.fieldOf("underwater_material").forGetter(cvx -> cvx.underwaterMaterial)).apply(instance, SurfaceBuilderBaseConfiguration::new));
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/SwampSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/SwampSurfaceBuilder.java
index b8b4b48..88672cd 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/SwampSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/SwampSurfaceBuilder.java
@@ -5,16 +5,15 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 
 public class SwampSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfiguration> {
-    public SwampSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public SwampSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
         final double double8 = Biome.BIOME_INFO_NOISE.getValue(integer4 * 0.25, integer5 * 0.25, false);
         if (double8 > 0.0) {
             final int integer11 = integer4 & 0xF;
@@ -23,9 +22,9 @@ public class SwampSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfig
             int integer13 = integer6;
             while (integer13 >= 0) {
                 a20.set(integer11, integer13, integer12);
-                if (!bzy.getBlockState(a20).isAir()) {
-                    if (integer13 == 62 && bzy.getBlockState(a20).getBlock() != byj9.getBlock()) {
-                        bzy.setBlockState(a20, byj9, false);
+                if (!cgy.getBlockState(a20).isAir()) {
+                    if (integer13 == 62 && !cgy.getBlockState(a20).is(cfj9.getBlock())) {
+                        cgy.setBlockState(a20, cfj9, false);
                         break;
                     }
                     break;
@@ -35,6 +34,6 @@ public class SwampSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfig
                 }
             }
         }
-        SurfaceBuilder.DEFAULT.apply(random, bzy, bkt, integer4, integer5, integer6, double7, byj8, byj9, integer10, long11, cnh);
+        SurfaceBuilder.DEFAULT.apply(random, cgy, bre, integer4, integer5, integer6, double7, cfj8, cfj9, integer10, long11, cvx);
     }
 }
diff --git a/src/net/minecraft/world/level/levelgen/surfacebuilders/WoodedBadlandsSurfaceBuilder.java b/src/net/minecraft/world/level/levelgen/surfacebuilders/WoodedBadlandsSurfaceBuilder.java
index 3c26bef..ac5edee 100644
--- a/src/net/minecraft/world/level/levelgen/surfacebuilders/WoodedBadlandsSurfaceBuilder.java
+++ b/src/net/minecraft/world/level/levelgen/surfacebuilders/WoodedBadlandsSurfaceBuilder.java
@@ -5,8 +5,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import java.util.Random;
-import com.mojang.datafixers.Dynamic;
-import java.util.function.Function;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.block.state.BlockState;
 
 public class WoodedBadlandsSurfaceBuilder extends BadlandsSurfaceBuilder {
@@ -14,16 +13,16 @@ public class WoodedBadlandsSurfaceBuilder extends BadlandsSurfaceBuilder {
     private static final BlockState ORANGE_TERRACOTTA;
     private static final BlockState TERRACOTTA;
     
-    public WoodedBadlandsSurfaceBuilder(final Function<Dynamic<?>, ? extends SurfaceBuilderBaseConfiguration> function) {
-        super(function);
+    public WoodedBadlandsSurfaceBuilder(final Codec<SurfaceBuilderBaseConfiguration> codec) {
+        super(codec);
     }
     
     @Override
-    public void apply(final Random random, final ChunkAccess bzy, final Biome bkt, final int integer4, final int integer5, final int integer6, final double double7, final BlockState byj8, final BlockState byj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cnh) {
+    public void apply(final Random random, final ChunkAccess cgy, final Biome bre, final int integer4, final int integer5, final int integer6, final double double7, final BlockState cfj8, final BlockState cfj9, final int integer10, final long long11, final SurfaceBuilderBaseConfiguration cvx) {
         final int integer11 = integer4 & 0xF;
         final int integer12 = integer5 & 0xF;
-        BlockState byj10 = WoodedBadlandsSurfaceBuilder.WHITE_TERRACOTTA;
-        BlockState byj11 = bkt.getSurfaceBuilderConfig().getUnderMaterial();
+        BlockState cfj10 = WoodedBadlandsSurfaceBuilder.WHITE_TERRACOTTA;
+        BlockState cfj11 = bre.getSurfaceBuilderConfig().getUnderMaterial();
         final int integer13 = (int)(double7 / 3.0 + 3.0 + random.nextDouble() * 0.25);
         final boolean boolean21 = Math.cos(double7 / 3.0 * 3.141592653589793) > 0.0;
         int integer14 = -1;
@@ -33,66 +32,66 @@ public class WoodedBadlandsSurfaceBuilder extends BadlandsSurfaceBuilder {
         for (int integer16 = integer6; integer16 >= 0; --integer16) {
             if (integer15 < 15) {
                 a25.set(integer11, integer16, integer12);
-                final BlockState byj12 = bzy.getBlockState(a25);
-                if (byj12.isAir()) {
+                final BlockState cfj12 = cgy.getBlockState(a25);
+                if (cfj12.isAir()) {
                     integer14 = -1;
                 }
-                else if (byj12.getBlock() == byj8.getBlock()) {
+                else if (cfj12.is(cfj8.getBlock())) {
                     if (integer14 == -1) {
                         boolean22 = false;
                         if (integer13 <= 0) {
-                            byj10 = Blocks.AIR.defaultBlockState();
-                            byj11 = byj8;
+                            cfj10 = Blocks.AIR.defaultBlockState();
+                            cfj11 = cfj8;
                         }
                         else if (integer16 >= integer10 - 4 && integer16 <= integer10 + 1) {
-                            byj10 = WoodedBadlandsSurfaceBuilder.WHITE_TERRACOTTA;
-                            byj11 = bkt.getSurfaceBuilderConfig().getUnderMaterial();
+                            cfj10 = WoodedBadlandsSurfaceBuilder.WHITE_TERRACOTTA;
+                            cfj11 = bre.getSurfaceBuilderConfig().getUnderMaterial();
                         }
-                        if (integer16 < integer10 && (byj10 == null || byj10.isAir())) {
-                            byj10 = byj9;
+                        if (integer16 < integer10 && (cfj10 == null || cfj10.isAir())) {
+                            cfj10 = cfj9;
                         }
                         integer14 = integer13 + Math.max(0, integer16 - integer10);
                         if (integer16 >= integer10 - 1) {
                             if (integer16 > 86 + integer13 * 2) {
                                 if (boolean21) {
-                                    bzy.setBlockState(a25, Blocks.COARSE_DIRT.defaultBlockState(), false);
+                                    cgy.setBlockState(a25, Blocks.COARSE_DIRT.defaultBlockState(), false);
                                 }
                                 else {
-                                    bzy.setBlockState(a25, Blocks.GRASS_BLOCK.defaultBlockState(), false);
+                                    cgy.setBlockState(a25, Blocks.GRASS_BLOCK.defaultBlockState(), false);
                                 }
                             }
                             else if (integer16 > integer10 + 3 + integer13) {
-                                BlockState byj13;
+                                BlockState cfj13;
                                 if (integer16 < 64 || integer16 > 127) {
-                                    byj13 = WoodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA;
+                                    cfj13 = WoodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA;
                                 }
                                 else if (boolean21) {
-                                    byj13 = WoodedBadlandsSurfaceBuilder.TERRACOTTA;
+                                    cfj13 = WoodedBadlandsSurfaceBuilder.TERRACOTTA;
                                 }
                                 else {
-                                    byj13 = this.getBand(integer4, integer16, integer5);
+                                    cfj13 = this.getBand(integer4, integer16, integer5);
                                 }
-                                bzy.setBlockState(a25, byj13, false);
+                                cgy.setBlockState(a25, cfj13, false);
                             }
                             else {
-                                bzy.setBlockState(a25, bkt.getSurfaceBuilderConfig().getTopMaterial(), false);
+                                cgy.setBlockState(a25, bre.getSurfaceBuilderConfig().getTopMaterial(), false);
                                 boolean22 = true;
                             }
                         }
                         else {
-                            bzy.setBlockState(a25, byj11, false);
-                            if (byj11 == WoodedBadlandsSurfaceBuilder.WHITE_TERRACOTTA) {
-                                bzy.setBlockState(a25, WoodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
+                            cgy.setBlockState(a25, cfj11, false);
+                            if (cfj11 == WoodedBadlandsSurfaceBuilder.WHITE_TERRACOTTA) {
+                                cgy.setBlockState(a25, WoodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
                             }
                         }
                     }
                     else if (integer14 > 0) {
                         --integer14;
                         if (boolean22) {
-                            bzy.setBlockState(a25, WoodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
+                            cgy.setBlockState(a25, WoodedBadlandsSurfaceBuilder.ORANGE_TERRACOTTA, false);
                         }
                         else {
-                            bzy.setBlockState(a25, this.getBand(integer4, integer16, integer5), false);
+                            cgy.setBlockState(a25, this.getBand(integer4, integer16, integer5), false);
                         }
                     }
                     ++integer15;
diff --git a/src/net/minecraft/world/level/levelgen/synth/NormalNoise.java b/src/net/minecraft/world/level/levelgen/synth/NormalNoise.java
new file mode 100644
index 0000000..8f24ed7
--- /dev/null
+++ b/src/net/minecraft/world/level/levelgen/synth/NormalNoise.java
@@ -0,0 +1,36 @@
+package net.minecraft.world.level.levelgen.synth;
+
+import java.util.List;
+import java.util.stream.Collector;
+import com.google.common.collect.ImmutableList;
+import java.util.stream.IntStream;
+import net.minecraft.world.level.levelgen.WorldgenRandom;
+
+public class NormalNoise {
+    private final double valueFactor;
+    private final PerlinNoise first;
+    private final PerlinNoise second;
+    
+    public NormalNoise(final WorldgenRandom ciy, final IntStream intStream) {
+        this(ciy, intStream.boxed().collect(ImmutableList.<Integer>toImmutableList()));
+    }
+    
+    public NormalNoise(final WorldgenRandom ciy, final List<Integer> list) {
+        this.first = new PerlinNoise(ciy, list);
+        this.second = new PerlinNoise(ciy, list);
+        final int integer4 = list.stream().min(Integer::compareTo).orElse(0);
+        final int integer5 = list.stream().max(Integer::compareTo).orElse(0);
+        this.valueFactor = 0.16666666666666666 / expectedDeviation(integer5 - integer4);
+    }
+    
+    private static double expectedDeviation(final int integer) {
+        return 0.1 * (1.0 + 1.0 / (integer + 1));
+    }
+    
+    public double getValue(final double double1, final double double2, final double double3) {
+        final double double4 = double1 * 1.0181268882175227;
+        final double double5 = double2 * 1.0181268882175227;
+        final double double6 = double3 * 1.0181268882175227;
+        return (this.first.getValue(double1, double2, double3) + this.second.getValue(double4, double5, double6)) * this.valueFactor;
+    }
+}
diff --git a/src/net/minecraft/world/level/levelgen/synth/PerlinNoise.java b/src/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
index 5a428cb..9a21fd9 100644
--- a/src/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
+++ b/src/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
@@ -4,7 +4,11 @@ import net.minecraft.util.Mth;
 import javax.annotation.Nullable;
 import java.util.Random;
 import it.unimi.dsi.fastutil.ints.IntSortedSet;
+import java.util.Collection;
 import it.unimi.dsi.fastutil.ints.IntRBTreeSet;
+import java.util.List;
+import java.util.stream.Collector;
+import com.google.common.collect.ImmutableList;
 import java.util.stream.IntStream;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 
@@ -13,11 +17,15 @@ public class PerlinNoise implements SurfaceNoise {
     private final double highestFreqValueFactor;
     private final double highestFreqInputFactor;
     
-    public PerlinNoise(final WorldgenRandom ccf, final int integer2, final int integer3) {
-        this(ccf, (IntSortedSet)new IntRBTreeSet(IntStream.rangeClosed(-integer2, integer3).toArray()));
+    public PerlinNoise(final WorldgenRandom ciy, final IntStream intStream) {
+        this(ciy, intStream.boxed().collect(ImmutableList.<Integer>toImmutableList()));
     }
     
-    public PerlinNoise(final WorldgenRandom ccf, final IntSortedSet intSortedSet) {
+    public PerlinNoise(final WorldgenRandom ciy, final List<Integer> list) {
+        this(ciy, (IntSortedSet)new IntRBTreeSet((Collection)list));
+    }
+    
+    private PerlinNoise(final WorldgenRandom ciy, final IntSortedSet intSortedSet) {
         if (intSortedSet.isEmpty()) {
             throw new IllegalArgumentException("Need some octaves!");
         }
@@ -27,29 +35,29 @@ public class PerlinNoise implements SurfaceNoise {
         if (integer6 < 1) {
             throw new IllegalArgumentException("Total number of octaves needs to be >= 1");
         }
-        final ImprovedNoise cnm7 = new ImprovedNoise(ccf);
+        final ImprovedNoise cwc7 = new ImprovedNoise(ciy);
         final int integer7 = integer5;
         this.noiseLevels = new ImprovedNoise[integer6];
         if (integer7 >= 0 && integer7 < integer6 && intSortedSet.contains(0)) {
-            this.noiseLevels[integer7] = cnm7;
+            this.noiseLevels[integer7] = cwc7;
         }
         for (int integer8 = integer7 + 1; integer8 < integer6; ++integer8) {
             if (integer8 >= 0 && intSortedSet.contains(integer7 - integer8)) {
-                this.noiseLevels[integer8] = new ImprovedNoise(ccf);
+                this.noiseLevels[integer8] = new ImprovedNoise(ciy);
             }
             else {
-                ccf.consumeCount(262);
+                ciy.consumeCount(262);
             }
         }
         if (integer5 > 0) {
-            final long long9 = (long)(cnm7.noise(0.0, 0.0, 0.0, 0.0, 0.0) * 9.223372036854776E18);
-            final WorldgenRandom ccf2 = new WorldgenRandom(long9);
+            final long long9 = (long)(cwc7.noise(0.0, 0.0, 0.0, 0.0, 0.0) * 9.223372036854776E18);
+            final WorldgenRandom ciy2 = new WorldgenRandom(long9);
             for (int integer9 = integer7 - 1; integer9 >= 0; --integer9) {
                 if (integer9 < integer6 && intSortedSet.contains(integer7 - integer9)) {
-                    this.noiseLevels[integer9] = new ImprovedNoise(ccf2);
+                    this.noiseLevels[integer9] = new ImprovedNoise(ciy2);
                 }
                 else {
-                    ccf2.consumeCount(262);
+                    ciy2.consumeCount(262);
                 }
             }
         }
@@ -65,9 +73,9 @@ public class PerlinNoise implements SurfaceNoise {
         double double6 = 0.0;
         double double7 = this.highestFreqInputFactor;
         double double8 = this.highestFreqValueFactor;
-        for (final ImprovedNoise cnm22 : this.noiseLevels) {
-            if (cnm22 != null) {
-                double6 += cnm22.noise(wrap(double1 * double7), boolean6 ? (-cnm22.yo) : wrap(double2 * double7), wrap(double3 * double7), double4 * double7, double5 * double7) * double8;
+        for (final ImprovedNoise cwc22 : this.noiseLevels) {
+            if (cwc22 != null) {
+                double6 += cwc22.noise(wrap(double1 * double7), boolean6 ? (-cwc22.yo) : wrap(double2 * double7), wrap(double3 * double7), double4 * double7, double5 * double7) * double8;
             }
             double7 /= 2.0;
             double8 *= 2.0;
diff --git a/src/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.java b/src/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.java
index 7c08954..9b6b5dd 100644
--- a/src/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.java
+++ b/src/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.java
@@ -2,7 +2,11 @@ package net.minecraft.world.level.levelgen.synth;
 
 import java.util.Random;
 import it.unimi.dsi.fastutil.ints.IntSortedSet;
+import java.util.Collection;
 import it.unimi.dsi.fastutil.ints.IntRBTreeSet;
+import java.util.List;
+import java.util.stream.Collector;
+import com.google.common.collect.ImmutableList;
 import java.util.stream.IntStream;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 
@@ -11,11 +15,15 @@ public class PerlinSimplexNoise implements SurfaceNoise {
     private final double highestFreqValueFactor;
     private final double highestFreqInputFactor;
     
-    public PerlinSimplexNoise(final WorldgenRandom ccf, final int integer2, final int integer3) {
-        this(ccf, (IntSortedSet)new IntRBTreeSet(IntStream.rangeClosed(-integer2, integer3).toArray()));
+    public PerlinSimplexNoise(final WorldgenRandom ciy, final IntStream intStream) {
+        this(ciy, intStream.boxed().collect(ImmutableList.<Integer>toImmutableList()));
     }
     
-    public PerlinSimplexNoise(final WorldgenRandom ccf, final IntSortedSet intSortedSet) {
+    public PerlinSimplexNoise(final WorldgenRandom ciy, final List<Integer> list) {
+        this(ciy, (IntSortedSet)new IntRBTreeSet((Collection)list));
+    }
+    
+    private PerlinSimplexNoise(final WorldgenRandom ciy, final IntSortedSet intSortedSet) {
         if (intSortedSet.isEmpty()) {
             throw new IllegalArgumentException("Need some octaves!");
         }
@@ -25,29 +33,29 @@ public class PerlinSimplexNoise implements SurfaceNoise {
         if (integer6 < 1) {
             throw new IllegalArgumentException("Total number of octaves needs to be >= 1");
         }
-        final SimplexNoise cnp7 = new SimplexNoise(ccf);
+        final SimplexNoise cwg7 = new SimplexNoise(ciy);
         final int integer7 = integer5;
         this.noiseLevels = new SimplexNoise[integer6];
         if (integer7 >= 0 && integer7 < integer6 && intSortedSet.contains(0)) {
-            this.noiseLevels[integer7] = cnp7;
+            this.noiseLevels[integer7] = cwg7;
         }
         for (int integer8 = integer7 + 1; integer8 < integer6; ++integer8) {
             if (integer8 >= 0 && intSortedSet.contains(integer7 - integer8)) {
-                this.noiseLevels[integer8] = new SimplexNoise(ccf);
+                this.noiseLevels[integer8] = new SimplexNoise(ciy);
             }
             else {
-                ccf.consumeCount(262);
+                ciy.consumeCount(262);
             }
         }
         if (integer5 > 0) {
-            final long long9 = (long)(cnp7.getValue(cnp7.xo, cnp7.yo, cnp7.zo) * 9.223372036854776E18);
-            final WorldgenRandom ccf2 = new WorldgenRandom(long9);
+            final long long9 = (long)(cwg7.getValue(cwg7.xo, cwg7.yo, cwg7.zo) * 9.223372036854776E18);
+            final WorldgenRandom ciy2 = new WorldgenRandom(long9);
             for (int integer9 = integer7 - 1; integer9 >= 0; --integer9) {
                 if (integer9 < integer6 && intSortedSet.contains(integer7 - integer9)) {
-                    this.noiseLevels[integer9] = new SimplexNoise(ccf2);
+                    this.noiseLevels[integer9] = new SimplexNoise(ciy2);
                 }
                 else {
-                    ccf2.consumeCount(262);
+                    ciy2.consumeCount(262);
                 }
             }
         }
@@ -59,9 +67,9 @@ public class PerlinSimplexNoise implements SurfaceNoise {
         double double3 = 0.0;
         double double4 = this.highestFreqInputFactor;
         double double5 = this.highestFreqValueFactor;
-        for (final SimplexNoise cnp16 : this.noiseLevels) {
-            if (cnp16 != null) {
-                double3 += cnp16.getValue(double1 * double4 + (boolean3 ? cnp16.xo : 0.0), double2 * double4 + (boolean3 ? cnp16.yo : 0.0)) * double5;
+        for (final SimplexNoise cwg16 : this.noiseLevels) {
+            if (cwg16 != null) {
+                double3 += cwg16.getValue(double1 * double4 + (boolean3 ? cwg16.xo : 0.0), double2 * double4 + (boolean3 ? cwg16.yo : 0.0)) * double5;
             }
             double4 /= 2.0;
             double5 *= 2.0;
diff --git a/src/net/minecraft/world/level/lighting/BlockLightEngine.java b/src/net/minecraft/world/level/lighting/BlockLightEngine.java
index bda8584..09abf54 100644
--- a/src/net/minecraft/world/level/lighting/BlockLightEngine.java
+++ b/src/net/minecraft/world/level/lighting/BlockLightEngine.java
@@ -16,8 +16,8 @@ public final class BlockLightEngine extends LayerLightEngine<BlockLightSectionSt
     private static final Direction[] DIRECTIONS;
     private final BlockPos.MutableBlockPos pos;
     
-    public BlockLightEngine(final LightChunkGetter can) {
-        super(can, LightLayer.BLOCK, new BlockLightSectionStorage(can));
+    public BlockLightEngine(final LightChunkGetter chl) {
+        super(chl, LightLayer.BLOCK, new BlockLightSectionStorage(chl));
         this.pos = new BlockPos.MutableBlockPos();
     }
     
@@ -25,9 +25,9 @@ public final class BlockLightEngine extends LayerLightEngine<BlockLightSectionSt
         final int integer4 = BlockPos.getX(long1);
         final int integer5 = BlockPos.getY(long1);
         final int integer6 = BlockPos.getZ(long1);
-        final BlockGetter bjg7 = this.chunkSource.getChunkForLighting(integer4 >> 4, integer6 >> 4);
-        if (bjg7 != null) {
-            return bjg7.getLightEmission(this.pos.set(integer4, integer5, integer6));
+        final BlockGetter bpg7 = this.chunkSource.getChunkForLighting(integer4 >> 4, integer6 >> 4);
+        if (bpg7 != null) {
+            return bpg7.getLightEmission(this.pos.set(integer4, integer5, integer6));
         }
         return 0;
     }
@@ -46,19 +46,19 @@ public final class BlockLightEngine extends LayerLightEngine<BlockLightSectionSt
         final int integer2 = Integer.signum(BlockPos.getX(long2) - BlockPos.getX(long1));
         final int integer3 = Integer.signum(BlockPos.getY(long2) - BlockPos.getY(long1));
         final int integer4 = Integer.signum(BlockPos.getZ(long2) - BlockPos.getZ(long1));
-        final Direction fp10 = Direction.fromNormal(integer2, integer3, integer4);
-        if (fp10 == null) {
+        final Direction fz10 = Direction.fromNormal(integer2, integer3, integer4);
+        if (fz10 == null) {
             return 15;
         }
         final MutableInt mutableInt11 = new MutableInt();
-        final BlockState byj12 = this.getStateAndOpacity(long2, mutableInt11);
+        final BlockState cfj12 = this.getStateAndOpacity(long2, mutableInt11);
         if (mutableInt11.getValue() >= 15) {
             return 15;
         }
-        final BlockState byj13 = this.getStateAndOpacity(long1, null);
-        final VoxelShape cwf14 = this.getShape(byj13, long1, fp10);
-        final VoxelShape cwf15 = this.getShape(byj12, long2, fp10.getOpposite());
-        if (Shapes.faceShapeOccludes(cwf14, cwf15)) {
+        final BlockState cfj13 = this.getStateAndOpacity(long1, null);
+        final VoxelShape dfg14 = this.getShape(cfj13, long1, fz10);
+        final VoxelShape dfg15 = this.getShape(cfj12, long2, fz10.getOpposite());
+        if (Shapes.faceShapeOccludes(dfg14, dfg15)) {
             return 15;
         }
         return integer + Math.max(1, mutableInt11.getValue());
@@ -67,8 +67,8 @@ public final class BlockLightEngine extends LayerLightEngine<BlockLightSectionSt
     @Override
     protected void checkNeighborsAfterUpdate(final long long1, final int integer, final boolean boolean3) {
         final long long2 = SectionPos.blockToSection(long1);
-        for (final Direction fp11 : BlockLightEngine.DIRECTIONS) {
-            final long long3 = BlockPos.offset(long1, fp11);
+        for (final Direction fz11 : BlockLightEngine.DIRECTIONS) {
+            final long long3 = BlockPos.offset(long1, fz11);
             final long long4 = SectionPos.blockToSection(long3);
             if (long2 == long4 || ((BlockLightSectionStorage)this.storage).storingLightForSection(long4)) {
                 this.checkNeighbor(long1, long3, integer, boolean3);
@@ -89,20 +89,20 @@ public final class BlockLightEngine extends LayerLightEngine<BlockLightSectionSt
             }
         }
         final long long3 = SectionPos.blockToSection(long1);
-        final DataLayer caf10 = ((BlockLightSectionStorage)this.storage).getDataLayer(long3, true);
-        for (final Direction fp14 : BlockLightEngine.DIRECTIONS) {
-            final long long4 = BlockPos.offset(long1, fp14);
+        final DataLayer chd10 = ((BlockLightSectionStorage)this.storage).getDataLayer(long3, true);
+        for (final Direction fz14 : BlockLightEngine.DIRECTIONS) {
+            final long long4 = BlockPos.offset(long1, fz14);
             if (long4 != long2) {
                 final long long5 = SectionPos.blockToSection(long4);
-                DataLayer caf11;
+                DataLayer chd11;
                 if (long3 == long5) {
-                    caf11 = caf10;
+                    chd11 = chd10;
                 }
                 else {
-                    caf11 = ((BlockLightSectionStorage)this.storage).getDataLayer(long5, true);
+                    chd11 = ((BlockLightSectionStorage)this.storage).getDataLayer(long5, true);
                 }
-                if (caf11 != null) {
-                    final int integer4 = this.computeLevelFromNeighbor(long4, long1, this.getLevel(caf11, long4));
+                if (chd11 != null) {
+                    final int integer4 = this.computeLevelFromNeighbor(long4, long1, this.getLevel(chd11, long4));
                     if (integer2 > integer4) {
                         integer2 = integer4;
                     }
@@ -116,9 +116,9 @@ public final class BlockLightEngine extends LayerLightEngine<BlockLightSectionSt
     }
     
     @Override
-    public void onBlockEmissionIncrease(final BlockPos fk, final int integer) {
+    public void onBlockEmissionIncrease(final BlockPos fu, final int integer) {
         ((BlockLightSectionStorage)this.storage).runAllUpdates();
-        this.checkEdge(Long.MAX_VALUE, fk.asLong(), 15 - integer, true);
+        this.checkEdge(Long.MAX_VALUE, fu.asLong(), 15 - integer, true);
     }
     
     static {
diff --git a/src/net/minecraft/world/level/lighting/BlockLightSectionStorage.java b/src/net/minecraft/world/level/lighting/BlockLightSectionStorage.java
index 50ca177..e731c1f 100644
--- a/src/net/minecraft/world/level/lighting/BlockLightSectionStorage.java
+++ b/src/net/minecraft/world/level/lighting/BlockLightSectionStorage.java
@@ -8,18 +8,18 @@ import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.chunk.LightChunkGetter;
 
 public class BlockLightSectionStorage extends LayerLightSectionStorage<BlockDataLayerStorageMap> {
-    protected BlockLightSectionStorage(final LightChunkGetter can) {
-        super(LightLayer.BLOCK, can, new BlockDataLayerStorageMap((Long2ObjectOpenHashMap<DataLayer>)new Long2ObjectOpenHashMap()));
+    protected BlockLightSectionStorage(final LightChunkGetter chl) {
+        super(LightLayer.BLOCK, chl, new BlockDataLayerStorageMap((Long2ObjectOpenHashMap<DataLayer>)new Long2ObjectOpenHashMap()));
     }
     
     @Override
     protected int getLightValue(final long long1) {
         final long long2 = SectionPos.blockToSection(long1);
-        final DataLayer caf6 = this.getDataLayer(long2, false);
-        if (caf6 == null) {
+        final DataLayer chd6 = this.getDataLayer(long2, false);
+        if (chd6 == null) {
             return 0;
         }
-        return caf6.get(SectionPos.sectionRelative(BlockPos.getX(long1)), SectionPos.sectionRelative(BlockPos.getY(long1)), SectionPos.sectionRelative(BlockPos.getZ(long1)));
+        return chd6.get(SectionPos.sectionRelative(BlockPos.getX(long1)), SectionPos.sectionRelative(BlockPos.getY(long1)), SectionPos.sectionRelative(BlockPos.getZ(long1)));
     }
     
     public static final class BlockDataLayerStorageMap extends DataLayerStorageMap<BlockDataLayerStorageMap> {
diff --git a/src/net/minecraft/world/level/lighting/DataLayerStorageMap.java b/src/net/minecraft/world/level/lighting/DataLayerStorageMap.java
index 1bb1808..9af9eb8 100644
--- a/src/net/minecraft/world/level/lighting/DataLayerStorageMap.java
+++ b/src/net/minecraft/world/level/lighting/DataLayerStorageMap.java
@@ -38,17 +38,17 @@ public abstract class DataLayerStorageMap<M extends DataLayerStorageMap<M>> {
                 }
             }
         }
-        final DataLayer caf4 = (DataLayer)this.map.get(long1);
-        if (caf4 != null) {
+        final DataLayer chd4 = (DataLayer)this.map.get(long1);
+        if (chd4 != null) {
             if (this.cacheEnabled) {
                 for (int integer5 = 1; integer5 > 0; --integer5) {
                     this.lastSectionKeys[integer5] = this.lastSectionKeys[integer5 - 1];
                     this.lastSections[integer5] = this.lastSections[integer5 - 1];
                 }
                 this.lastSectionKeys[0] = long1;
-                this.lastSections[0] = caf4;
+                this.lastSections[0] = chd4;
             }
-            return caf4;
+            return chd4;
         }
         return null;
     }
@@ -58,8 +58,8 @@ public abstract class DataLayerStorageMap<M extends DataLayerStorageMap<M>> {
         return (DataLayer)this.map.remove(long1);
     }
     
-    public void setLayer(final long long1, final DataLayer caf) {
-        this.map.put(long1, caf);
+    public void setLayer(final long long1, final DataLayer chd) {
+        this.map.put(long1, chd);
     }
     
     public void clearCache() {
diff --git a/src/net/minecraft/world/level/lighting/FlatDataLayer.java b/src/net/minecraft/world/level/lighting/FlatDataLayer.java
index 3de0c7a..44c4f74 100644
--- a/src/net/minecraft/world/level/lighting/FlatDataLayer.java
+++ b/src/net/minecraft/world/level/lighting/FlatDataLayer.java
@@ -7,9 +7,9 @@ public class FlatDataLayer extends DataLayer {
         super(128);
     }
     
-    public FlatDataLayer(final DataLayer caf, final int integer) {
+    public FlatDataLayer(final DataLayer chd, final int integer) {
         super(128);
-        System.arraycopy(caf.getData(), integer * 128, this.data, 0, 128);
+        System.arraycopy(chd.getData(), integer * 128, this.data, 0, 128);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/lighting/LayerLightEngine.java b/src/net/minecraft/world/level/lighting/LayerLightEngine.java
index 52f2744..adae9b2 100644
--- a/src/net/minecraft/world/level/lighting/LayerLightEngine.java
+++ b/src/net/minecraft/world/level/lighting/LayerLightEngine.java
@@ -26,14 +26,14 @@ public abstract class LayerLightEngine<M extends DataLayerStorageMap<M>, S exten
     private final long[] lastChunkPos;
     private final BlockGetter[] lastChunk;
     
-    public LayerLightEngine(final LightChunkGetter can, final LightLayer bkf, final S cnz) {
+    public LayerLightEngine(final LightChunkGetter chl, final LightLayer bqi, final S cwq) {
         super(16, 256, 8192);
         this.pos = new BlockPos.MutableBlockPos();
         this.lastChunkPos = new long[2];
         this.lastChunk = new BlockGetter[2];
-        this.chunkSource = can;
-        this.layer = bkf;
-        this.storage = cnz;
+        this.chunkSource = chl;
+        this.layer = bqi;
+        this.storage = cwq;
         this.clearCache();
     }
     
@@ -53,13 +53,13 @@ public abstract class LayerLightEngine<M extends DataLayerStorageMap<M>, S exten
                 return this.lastChunk[integer3];
             }
         }
-        final BlockGetter bjg6 = this.chunkSource.getChunkForLighting(integer1, integer2);
+        final BlockGetter bpg6 = this.chunkSource.getChunkForLighting(integer1, integer2);
         for (int integer4 = 1; integer4 > 0; --integer4) {
             this.lastChunkPos[integer4] = this.lastChunkPos[integer4 - 1];
             this.lastChunk[integer4] = this.lastChunk[integer4 - 1];
         }
         this.lastChunkPos[0] = long4;
-        return this.lastChunk[0] = bjg6;
+        return this.lastChunk[0] = bpg6;
     }
     
     private void clearCache() {
@@ -76,35 +76,35 @@ public abstract class LayerLightEngine<M extends DataLayerStorageMap<M>, S exten
         }
         final int integer5 = SectionPos.blockToSectionCoord(BlockPos.getX(long1));
         final int integer6 = SectionPos.blockToSectionCoord(BlockPos.getZ(long1));
-        final BlockGetter bjg7 = this.getChunk(integer5, integer6);
-        if (bjg7 == null) {
+        final BlockGetter bpg7 = this.getChunk(integer5, integer6);
+        if (bpg7 == null) {
             if (mutableInt != null) {
                 mutableInt.setValue(16);
             }
             return Blocks.BEDROCK.defaultBlockState();
         }
         this.pos.set(long1);
-        final BlockState byj8 = bjg7.getBlockState(this.pos);
-        final boolean boolean9 = byj8.canOcclude() && byj8.useShapeForLightOcclusion();
+        final BlockState cfj8 = bpg7.getBlockState(this.pos);
+        final boolean boolean9 = cfj8.canOcclude() && cfj8.useShapeForLightOcclusion();
         if (mutableInt != null) {
-            mutableInt.setValue(byj8.getLightBlock(this.chunkSource.getLevel(), this.pos));
+            mutableInt.setValue(cfj8.getLightBlock(this.chunkSource.getLevel(), this.pos));
         }
-        return boolean9 ? byj8 : Blocks.AIR.defaultBlockState();
+        return boolean9 ? cfj8 : Blocks.AIR.defaultBlockState();
     }
     
-    protected VoxelShape getShape(final BlockState byj, final long long2, final Direction fp) {
-        return byj.canOcclude() ? byj.getFaceOcclusionShape(this.chunkSource.getLevel(), this.pos.set(long2), fp) : Shapes.empty();
+    protected VoxelShape getShape(final BlockState cfj, final long long2, final Direction fz) {
+        return cfj.canOcclude() ? cfj.getFaceOcclusionShape(this.chunkSource.getLevel(), this.pos.set(long2), fz) : Shapes.empty();
     }
     
-    public static int getLightBlockInto(final BlockGetter bjg, final BlockState byj2, final BlockPos fk3, final BlockState byj4, final BlockPos fk5, final Direction fp, final int integer) {
-        final boolean boolean8 = byj2.canOcclude() && byj2.useShapeForLightOcclusion();
-        final boolean boolean9 = byj4.canOcclude() && byj4.useShapeForLightOcclusion();
+    public static int getLightBlockInto(final BlockGetter bpg, final BlockState cfj2, final BlockPos fu3, final BlockState cfj4, final BlockPos fu5, final Direction fz, final int integer) {
+        final boolean boolean8 = cfj2.canOcclude() && cfj2.useShapeForLightOcclusion();
+        final boolean boolean9 = cfj4.canOcclude() && cfj4.useShapeForLightOcclusion();
         if (!boolean8 && !boolean9) {
             return integer;
         }
-        final VoxelShape cwf10 = boolean8 ? byj2.getOcclusionShape(bjg, fk3) : Shapes.empty();
-        final VoxelShape cwf11 = boolean9 ? byj4.getOcclusionShape(bjg, fk5) : Shapes.empty();
-        if (Shapes.mergedFaceOccludes(cwf10, cwf11, fp)) {
+        final VoxelShape dfg10 = boolean8 ? cfj2.getOcclusionShape(bpg, fu3) : Shapes.empty();
+        final VoxelShape dfg11 = boolean9 ? cfj4.getOcclusionShape(bpg, fu5) : Shapes.empty();
+        if (Shapes.mergedFaceOccludes(dfg10, dfg11, fz)) {
             return 16;
         }
         return integer;
@@ -128,8 +128,8 @@ public abstract class LayerLightEngine<M extends DataLayerStorageMap<M>, S exten
         return 15 - this.storage.getStoredLevel(long1);
     }
     
-    protected int getLevel(final DataLayer caf, final long long2) {
-        return 15 - caf.get(SectionPos.sectionRelative(BlockPos.getX(long2)), SectionPos.sectionRelative(BlockPos.getY(long2)), SectionPos.sectionRelative(BlockPos.getZ(long2)));
+    protected int getLevel(final DataLayer chd, final long long2) {
+        return 15 - chd.get(SectionPos.sectionRelative(BlockPos.getX(long2)), SectionPos.sectionRelative(BlockPos.getY(long2)), SectionPos.sectionRelative(BlockPos.getZ(long2)));
     }
     
     @Override
@@ -169,48 +169,48 @@ public abstract class LayerLightEngine<M extends DataLayerStorageMap<M>, S exten
         return integer;
     }
     
-    protected void queueSectionData(final long long1, @Nullable final DataLayer caf) {
-        this.storage.queueSectionData(long1, caf);
+    protected void queueSectionData(final long long1, @Nullable final DataLayer chd, final boolean boolean3) {
+        this.storage.queueSectionData(long1, chd, boolean3);
     }
     
     @Nullable
     @Override
-    public DataLayer getDataLayerData(final SectionPos gd) {
-        return this.storage.getDataLayerData(gd.asLong());
+    public DataLayer getDataLayerData(final SectionPos go) {
+        return this.storage.getDataLayerData(go.asLong());
     }
     
     @Override
-    public int getLightValue(final BlockPos fk) {
-        return this.storage.getLightValue(fk.asLong());
+    public int getLightValue(final BlockPos fu) {
+        return this.storage.getLightValue(fu.asLong());
     }
     
     public String getDebugData(final long long1) {
         return "" + this.storage.getLevel(long1);
     }
     
-    public void checkBlock(final BlockPos fk) {
-        final long long3 = fk.asLong();
+    public void checkBlock(final BlockPos fu) {
+        final long long3 = fu.asLong();
         this.checkNode(long3);
-        for (final Direction fp8 : LayerLightEngine.DIRECTIONS) {
-            this.checkNode(BlockPos.offset(long3, fp8));
+        for (final Direction fz8 : LayerLightEngine.DIRECTIONS) {
+            this.checkNode(BlockPos.offset(long3, fz8));
         }
     }
     
-    public void onBlockEmissionIncrease(final BlockPos fk, final int integer) {
+    public void onBlockEmissionIncrease(final BlockPos fu, final int integer) {
     }
     
     @Override
-    public void updateSectionStatus(final SectionPos gd, final boolean boolean2) {
-        this.storage.updateSectionStatus(gd.asLong(), boolean2);
+    public void updateSectionStatus(final SectionPos go, final boolean boolean2) {
+        this.storage.updateSectionStatus(go.asLong(), boolean2);
     }
     
-    public void enableLightSources(final ChunkPos bjh, final boolean boolean2) {
-        final long long4 = SectionPos.getZeroNode(SectionPos.asLong(bjh.x, 0, bjh.z));
+    public void enableLightSources(final ChunkPos bph, final boolean boolean2) {
+        final long long4 = SectionPos.getZeroNode(SectionPos.asLong(bph.x, 0, bph.z));
         this.storage.enableLightSources(long4, boolean2);
     }
     
-    public void retainData(final ChunkPos bjh, final boolean boolean2) {
-        final long long4 = SectionPos.getZeroNode(SectionPos.asLong(bjh.x, 0, bjh.z));
+    public void retainData(final ChunkPos bph, final boolean boolean2) {
+        final long long4 = SectionPos.getZeroNode(SectionPos.asLong(bph.x, 0, bph.z));
         this.storage.retainData(long4, boolean2);
     }
     
diff --git a/src/net/minecraft/world/level/lighting/LayerLightEventListener.java b/src/net/minecraft/world/level/lighting/LayerLightEventListener.java
index c30c924..a9e1029 100644
--- a/src/net/minecraft/world/level/lighting/LayerLightEventListener.java
+++ b/src/net/minecraft/world/level/lighting/LayerLightEventListener.java
@@ -7,26 +7,26 @@ import net.minecraft.core.SectionPos;
 
 public interface LayerLightEventListener extends LightEventListener {
     @Nullable
-    DataLayer getDataLayerData(final SectionPos gd);
+    DataLayer getDataLayerData(final SectionPos go);
     
-    int getLightValue(final BlockPos fk);
+    int getLightValue(final BlockPos fu);
     
     public enum DummyLightLayerEventListener implements LayerLightEventListener {
         INSTANCE;
         
         @Nullable
         @Override
-        public DataLayer getDataLayerData(final SectionPos gd) {
+        public DataLayer getDataLayerData(final SectionPos go) {
             return null;
         }
         
         @Override
-        public int getLightValue(final BlockPos fk) {
+        public int getLightValue(final BlockPos fu) {
             return 0;
         }
         
         @Override
-        public void updateSectionStatus(final SectionPos gd, final boolean boolean2) {
+        public void updateSectionStatus(final SectionPos go, final boolean boolean2) {
         }
     }
 }
diff --git a/src/net/minecraft/world/level/lighting/LayerLightSectionStorage.java b/src/net/minecraft/world/level/lighting/LayerLightSectionStorage.java
index 62ecb00..1f65672 100644
--- a/src/net/minecraft/world/level/lighting/LayerLightSectionStorage.java
+++ b/src/net/minecraft/world/level/lighting/LayerLightSectionStorage.java
@@ -29,11 +29,12 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
     protected final LongSet changedSections;
     protected final LongSet sectionsAffectedByLightUpdates;
     protected final Long2ObjectMap<DataLayer> queuedSections;
+    private final LongSet untrustedSections;
     private final LongSet columnsToRetainQueuedDataFor;
     private final LongSet toRemove;
     protected volatile boolean hasToRemove;
     
-    protected LayerLightSectionStorage(final LightLayer bkf, final LightChunkGetter can, final M cnu) {
+    protected LayerLightSectionStorage(final LightLayer bqi, final LightChunkGetter chl, final M cwl) {
         super(3, 16, 256);
         this.dataSectionSet = (LongSet)new LongOpenHashSet();
         this.toMarkNoData = (LongSet)new LongOpenHashSet();
@@ -41,12 +42,13 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
         this.changedSections = (LongSet)new LongOpenHashSet();
         this.sectionsAffectedByLightUpdates = (LongSet)new LongOpenHashSet();
         this.queuedSections = (Long2ObjectMap<DataLayer>)Long2ObjectMaps.synchronize((Long2ObjectMap)new Long2ObjectOpenHashMap());
+        this.untrustedSections = (LongSet)new LongOpenHashSet();
         this.columnsToRetainQueuedDataFor = (LongSet)new LongOpenHashSet();
         this.toRemove = (LongSet)new LongOpenHashSet();
-        this.layer = bkf;
-        this.chunkSource = can;
-        this.updatingSectionData = cnu;
-        (this.visibleSectionData = cnu.copy()).disableCache();
+        this.layer = bqi;
+        this.chunkSource = chl;
+        this.updatingSectionData = cwl;
+        (this.visibleSectionData = cwl.copy()).disableCache();
     }
     
     protected boolean storingLightForSection(final long long1) {
@@ -59,15 +61,15 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
     }
     
     @Nullable
-    protected DataLayer getDataLayer(final M cnu, final long long2) {
-        return cnu.getLayer(long2);
+    protected DataLayer getDataLayer(final M cwl, final long long2) {
+        return cwl.getLayer(long2);
     }
     
     @Nullable
     public DataLayer getDataLayerData(final long long1) {
-        final DataLayer caf4 = (DataLayer)this.queuedSections.get(long1);
-        if (caf4 != null) {
-            return caf4;
+        final DataLayer chd4 = (DataLayer)this.queuedSections.get(long1);
+        if (chd4 != null) {
+            return chd4;
         }
         return this.getDataLayer(long1, false);
     }
@@ -76,8 +78,8 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
     
     protected int getStoredLevel(final long long1) {
         final long long2 = SectionPos.blockToSection(long1);
-        final DataLayer caf6 = this.getDataLayer(long2, true);
-        return caf6.get(SectionPos.sectionRelative(BlockPos.getX(long1)), SectionPos.sectionRelative(BlockPos.getY(long1)), SectionPos.sectionRelative(BlockPos.getZ(long1)));
+        final DataLayer chd6 = this.getDataLayer(long2, true);
+        return chd6.get(SectionPos.sectionRelative(BlockPos.getX(long1)), SectionPos.sectionRelative(BlockPos.getY(long1)), SectionPos.sectionRelative(BlockPos.getZ(long1)));
     }
     
     protected void setStoredLevel(final long long1, final int integer) {
@@ -85,8 +87,8 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
         if (this.changedSections.add(long2)) {
             this.updatingSectionData.copyDataLayer(long2);
         }
-        final DataLayer caf7 = this.getDataLayer(long2, true);
-        caf7.set(SectionPos.sectionRelative(BlockPos.getX(long1)), SectionPos.sectionRelative(BlockPos.getY(long1)), SectionPos.sectionRelative(BlockPos.getZ(long1)), integer);
+        final DataLayer chd7 = this.getDataLayer(long2, true);
+        chd7.set(SectionPos.sectionRelative(BlockPos.getX(long1)), SectionPos.sectionRelative(BlockPos.getY(long1)), SectionPos.sectionRelative(BlockPos.getZ(long1)), integer);
         for (int integer2 = -1; integer2 <= 1; ++integer2) {
             for (int integer3 = -1; integer3 <= 1; ++integer3) {
                 for (int integer4 = -1; integer4 <= 1; ++integer4) {
@@ -156,16 +158,16 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
     }
     
     protected DataLayer createDataLayer(final long long1) {
-        final DataLayer caf4 = (DataLayer)this.queuedSections.get(long1);
-        if (caf4 != null) {
-            return caf4;
+        final DataLayer chd4 = (DataLayer)this.queuedSections.get(long1);
+        if (chd4 != null) {
+            return chd4;
         }
         return new DataLayer();
     }
     
-    protected void clearQueuedSectionBlocks(final LayerLightEngine<?, ?> cnx, final long long2) {
-        if (cnx.getQueueSize() < 8192) {
-            cnx.removeIf(long2 -> SectionPos.blockToSection(long2) == long2);
+    protected void clearQueuedSectionBlocks(final LayerLightEngine<?, ?> cwo, final long long2) {
+        if (cwo.getQueueSize() < 8192) {
+            cwo.removeIf(long2 -> SectionPos.blockToSection(long2) == long2);
             return;
         }
         final int integer5 = SectionPos.sectionToBlockCoord(SectionPos.x(long2));
@@ -175,7 +177,7 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
             for (int integer9 = 0; integer9 < 16; ++integer9) {
                 for (int integer10 = 0; integer10 < 16; ++integer10) {
                     final long long3 = BlockPos.asLong(integer5 + integer8, integer6 + integer9, integer7 + integer10);
-                    cnx.removeFromQueue(long3);
+                    cwo.removeFromQueue(long3);
                 }
             }
         }
@@ -185,23 +187,23 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
         return this.hasToRemove;
     }
     
-    protected void markNewInconsistencies(final LayerLightEngine<M, ?> cnx, final boolean boolean2, final boolean boolean3) {
+    protected void markNewInconsistencies(final LayerLightEngine<M, ?> cwo, final boolean boolean2, final boolean boolean3) {
         if (!this.hasInconsistencies() && this.queuedSections.isEmpty()) {
             return;
         }
         for (final long long6 : this.toRemove) {
-            this.clearQueuedSectionBlocks(cnx, long6);
-            final DataLayer caf8 = (DataLayer)this.queuedSections.remove(long6);
-            final DataLayer caf9 = this.updatingSectionData.removeLayer(long6);
+            this.clearQueuedSectionBlocks(cwo, long6);
+            final DataLayer chd8 = (DataLayer)this.queuedSections.remove(long6);
+            final DataLayer chd9 = this.updatingSectionData.removeLayer(long6);
             if (this.columnsToRetainQueuedDataFor.contains(SectionPos.getZeroNode(long6))) {
-                if (caf8 != null) {
-                    this.queuedSections.put(long6, caf8);
+                if (chd8 != null) {
+                    this.queuedSections.put(long6, chd8);
                 }
                 else {
-                    if (caf9 == null) {
+                    if (chd9 == null) {
                         continue;
                     }
-                    this.queuedSections.put(long6, caf9);
+                    this.queuedSections.put(long6, chd9);
                 }
             }
         }
@@ -216,72 +218,26 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
             if (!this.storingLightForSection(long7)) {
                 continue;
             }
-            final DataLayer caf9 = (DataLayer)entry6.getValue();
-            if (this.updatingSectionData.getLayer(long7) == caf9) {
+            final DataLayer chd9 = (DataLayer)entry6.getValue();
+            if (this.updatingSectionData.getLayer(long7) == chd9) {
                 continue;
             }
-            this.clearQueuedSectionBlocks(cnx, long7);
-            this.updatingSectionData.setLayer(long7, caf9);
+            this.clearQueuedSectionBlocks(cwo, long7);
+            this.updatingSectionData.setLayer(long7, chd9);
             this.changedSections.add(long7);
         }
         this.updatingSectionData.clearCache();
         if (!boolean3) {
             for (final long long6 : this.queuedSections.keySet()) {
-                if (!this.storingLightForSection(long6)) {
-                    continue;
-                }
-                final int integer8 = SectionPos.sectionToBlockCoord(SectionPos.x(long6));
-                final int integer9 = SectionPos.sectionToBlockCoord(SectionPos.y(long6));
-                final int integer10 = SectionPos.sectionToBlockCoord(SectionPos.z(long6));
-                for (final Direction fp14 : LayerLightSectionStorage.DIRECTIONS) {
-                    final long long8 = SectionPos.offset(long6, fp14);
-                    if (!this.queuedSections.containsKey(long8)) {
-                        if (this.storingLightForSection(long8)) {
-                            for (int integer11 = 0; integer11 < 16; ++integer11) {
-                                for (int integer12 = 0; integer12 < 16; ++integer12) {
-                                    long long9 = 0L;
-                                    long long10 = 0L;
-                                    switch (fp14) {
-                                        case DOWN: {
-                                            long9 = BlockPos.asLong(integer8 + integer12, integer9, integer10 + integer11);
-                                            long10 = BlockPos.asLong(integer8 + integer12, integer9 - 1, integer10 + integer11);
-                                            break;
-                                        }
-                                        case UP: {
-                                            long9 = BlockPos.asLong(integer8 + integer12, integer9 + 16 - 1, integer10 + integer11);
-                                            long10 = BlockPos.asLong(integer8 + integer12, integer9 + 16, integer10 + integer11);
-                                            break;
-                                        }
-                                        case NORTH: {
-                                            long9 = BlockPos.asLong(integer8 + integer11, integer9 + integer12, integer10);
-                                            long10 = BlockPos.asLong(integer8 + integer11, integer9 + integer12, integer10 - 1);
-                                            break;
-                                        }
-                                        case SOUTH: {
-                                            long9 = BlockPos.asLong(integer8 + integer11, integer9 + integer12, integer10 + 16 - 1);
-                                            long10 = BlockPos.asLong(integer8 + integer11, integer9 + integer12, integer10 + 16);
-                                            break;
-                                        }
-                                        case WEST: {
-                                            long9 = BlockPos.asLong(integer8, integer9 + integer11, integer10 + integer12);
-                                            long10 = BlockPos.asLong(integer8 - 1, integer9 + integer11, integer10 + integer12);
-                                            break;
-                                        }
-                                        default: {
-                                            long9 = BlockPos.asLong(integer8 + 16 - 1, integer9 + integer11, integer10 + integer12);
-                                            long10 = BlockPos.asLong(integer8 + 16, integer9 + integer11, integer10 + integer12);
-                                            break;
-                                        }
-                                    }
-                                    cnx.checkEdge(long9, long10, cnx.computeLevelFromNeighbor(long9, long10, cnx.getLevel(long9)), false);
-                                    cnx.checkEdge(long10, long9, cnx.computeLevelFromNeighbor(long10, long9, cnx.getLevel(long10)), false);
-                                }
-                            }
-                        }
-                    }
-                }
+                this.checkEdgesForSection(cwo, long6);
             }
         }
+        else {
+            for (final long long6 : this.untrustedSections) {
+                this.checkEdgesForSection(cwo, long6);
+            }
+        }
+        this.untrustedSections.clear();
         final ObjectIterator<Long2ObjectMap.Entry<DataLayer>> objectIterator5 = (ObjectIterator<Long2ObjectMap.Entry<DataLayer>>)this.queuedSections.long2ObjectEntrySet().iterator();
         while (objectIterator5.hasNext()) {
             final Long2ObjectMap.Entry<DataLayer> entry6 = (Long2ObjectMap.Entry<DataLayer>)objectIterator5.next();
@@ -292,6 +248,62 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
         }
     }
     
+    private void checkEdgesForSection(final LayerLightEngine<M, ?> cwo, final long long2) {
+        if (!this.storingLightForSection(long2)) {
+            return;
+        }
+        final int integer5 = SectionPos.sectionToBlockCoord(SectionPos.x(long2));
+        final int integer6 = SectionPos.sectionToBlockCoord(SectionPos.y(long2));
+        final int integer7 = SectionPos.sectionToBlockCoord(SectionPos.z(long2));
+        for (final Direction fz11 : LayerLightSectionStorage.DIRECTIONS) {
+            final long long3 = SectionPos.offset(long2, fz11);
+            if (!this.queuedSections.containsKey(long3)) {
+                if (this.storingLightForSection(long3)) {
+                    for (int integer8 = 0; integer8 < 16; ++integer8) {
+                        for (int integer9 = 0; integer9 < 16; ++integer9) {
+                            long long4 = 0L;
+                            long long5 = 0L;
+                            switch (fz11) {
+                                case DOWN: {
+                                    long4 = BlockPos.asLong(integer5 + integer9, integer6, integer7 + integer8);
+                                    long5 = BlockPos.asLong(integer5 + integer9, integer6 - 1, integer7 + integer8);
+                                    break;
+                                }
+                                case UP: {
+                                    long4 = BlockPos.asLong(integer5 + integer9, integer6 + 16 - 1, integer7 + integer8);
+                                    long5 = BlockPos.asLong(integer5 + integer9, integer6 + 16, integer7 + integer8);
+                                    break;
+                                }
+                                case NORTH: {
+                                    long4 = BlockPos.asLong(integer5 + integer8, integer6 + integer9, integer7);
+                                    long5 = BlockPos.asLong(integer5 + integer8, integer6 + integer9, integer7 - 1);
+                                    break;
+                                }
+                                case SOUTH: {
+                                    long4 = BlockPos.asLong(integer5 + integer8, integer6 + integer9, integer7 + 16 - 1);
+                                    long5 = BlockPos.asLong(integer5 + integer8, integer6 + integer9, integer7 + 16);
+                                    break;
+                                }
+                                case WEST: {
+                                    long4 = BlockPos.asLong(integer5, integer6 + integer8, integer7 + integer9);
+                                    long5 = BlockPos.asLong(integer5 - 1, integer6 + integer8, integer7 + integer9);
+                                    break;
+                                }
+                                default: {
+                                    long4 = BlockPos.asLong(integer5 + 16 - 1, integer6 + integer8, integer7 + integer9);
+                                    long5 = BlockPos.asLong(integer5 + 16, integer6 + integer8, integer7 + integer9);
+                                    break;
+                                }
+                            }
+                            cwo.checkEdge(long4, long5, cwo.computeLevelFromNeighbor(long4, long5, cwo.getLevel(long4)), false);
+                            cwo.checkEdge(long5, long4, cwo.computeLevelFromNeighbor(long5, long4, cwo.getLevel(long5)), false);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
     protected void onNodeAdded(final long long1) {
     }
     
@@ -310,9 +322,12 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
         }
     }
     
-    protected void queueSectionData(final long long1, @Nullable final DataLayer caf) {
-        if (caf != null) {
-            this.queuedSections.put(long1, caf);
+    protected void queueSectionData(final long long1, @Nullable final DataLayer chd, final boolean boolean3) {
+        if (chd != null) {
+            this.queuedSections.put(long1, chd);
+            if (!boolean3) {
+                this.untrustedSections.add(long1);
+            }
         }
         else {
             this.queuedSections.remove(long1);
@@ -339,9 +354,9 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
     
     protected void swapSectionMap() {
         if (!this.changedSections.isEmpty()) {
-            final M cnu2 = this.updatingSectionData.copy();
-            cnu2.disableCache();
-            this.visibleSectionData = cnu2;
+            final M cwl2 = this.updatingSectionData.copy();
+            cwl2.disableCache();
+            this.visibleSectionData = cwl2;
             this.changedSections.clear();
         }
         if (!this.sectionsAffectedByLightUpdates.isEmpty()) {
diff --git a/src/net/minecraft/world/level/lighting/LevelLightEngine.java b/src/net/minecraft/world/level/lighting/LevelLightEngine.java
index f8417dc..3d15810 100644
--- a/src/net/minecraft/world/level/lighting/LevelLightEngine.java
+++ b/src/net/minecraft/world/level/lighting/LevelLightEngine.java
@@ -14,23 +14,23 @@ public class LevelLightEngine implements LightEventListener {
     @Nullable
     private final LayerLightEngine<?, ?> skyEngine;
     
-    public LevelLightEngine(final LightChunkGetter can, final boolean boolean2, final boolean boolean3) {
-        this.blockEngine = (boolean2 ? new BlockLightEngine(can) : null);
-        this.skyEngine = (boolean3 ? new SkyLightEngine(can) : null);
+    public LevelLightEngine(final LightChunkGetter chl, final boolean boolean2, final boolean boolean3) {
+        this.blockEngine = (boolean2 ? new BlockLightEngine(chl) : null);
+        this.skyEngine = (boolean3 ? new SkyLightEngine(chl) : null);
     }
     
-    public void checkBlock(final BlockPos fk) {
+    public void checkBlock(final BlockPos fu) {
         if (this.blockEngine != null) {
-            this.blockEngine.checkBlock(fk);
+            this.blockEngine.checkBlock(fu);
         }
         if (this.skyEngine != null) {
-            this.skyEngine.checkBlock(fk);
+            this.skyEngine.checkBlock(fu);
         }
     }
     
-    public void onBlockEmissionIncrease(final BlockPos fk, final int integer) {
+    public void onBlockEmissionIncrease(final BlockPos fu, final int integer) {
         if (this.blockEngine != null) {
-            this.blockEngine.onBlockEmissionIncrease(fk, integer);
+            this.blockEngine.onBlockEmissionIncrease(fu, integer);
         }
     }
     
@@ -61,26 +61,26 @@ public class LevelLightEngine implements LightEventListener {
     }
     
     @Override
-    public void updateSectionStatus(final SectionPos gd, final boolean boolean2) {
+    public void updateSectionStatus(final SectionPos go, final boolean boolean2) {
         if (this.blockEngine != null) {
-            this.blockEngine.updateSectionStatus(gd, boolean2);
+            this.blockEngine.updateSectionStatus(go, boolean2);
         }
         if (this.skyEngine != null) {
-            this.skyEngine.updateSectionStatus(gd, boolean2);
+            this.skyEngine.updateSectionStatus(go, boolean2);
         }
     }
     
-    public void enableLightSources(final ChunkPos bjh, final boolean boolean2) {
+    public void enableLightSources(final ChunkPos bph, final boolean boolean2) {
         if (this.blockEngine != null) {
-            this.blockEngine.enableLightSources(bjh, boolean2);
+            this.blockEngine.enableLightSources(bph, boolean2);
         }
         if (this.skyEngine != null) {
-            this.skyEngine.enableLightSources(bjh, boolean2);
+            this.skyEngine.enableLightSources(bph, boolean2);
         }
     }
     
-    public LayerLightEventListener getLayerListener(final LightLayer bkf) {
-        if (bkf == LightLayer.BLOCK) {
+    public LayerLightEventListener getLayerListener(final LightLayer bqi) {
+        if (bqi == LightLayer.BLOCK) {
             if (this.blockEngine == null) {
                 return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
             }
@@ -94,41 +94,41 @@ public class LevelLightEngine implements LightEventListener {
         }
     }
     
-    public String getDebugData(final LightLayer bkf, final SectionPos gd) {
-        if (bkf == LightLayer.BLOCK) {
+    public String getDebugData(final LightLayer bqi, final SectionPos go) {
+        if (bqi == LightLayer.BLOCK) {
             if (this.blockEngine != null) {
-                return this.blockEngine.getDebugData(gd.asLong());
+                return this.blockEngine.getDebugData(go.asLong());
             }
         }
         else if (this.skyEngine != null) {
-            return this.skyEngine.getDebugData(gd.asLong());
+            return this.skyEngine.getDebugData(go.asLong());
         }
         return "n/a";
     }
     
-    public void queueSectionData(final LightLayer bkf, final SectionPos gd, @Nullable final DataLayer caf) {
-        if (bkf == LightLayer.BLOCK) {
+    public void queueSectionData(final LightLayer bqi, final SectionPos go, @Nullable final DataLayer chd, final boolean boolean4) {
+        if (bqi == LightLayer.BLOCK) {
             if (this.blockEngine != null) {
-                this.blockEngine.queueSectionData(gd.asLong(), caf);
+                this.blockEngine.queueSectionData(go.asLong(), chd, boolean4);
             }
         }
         else if (this.skyEngine != null) {
-            this.skyEngine.queueSectionData(gd.asLong(), caf);
+            this.skyEngine.queueSectionData(go.asLong(), chd, boolean4);
         }
     }
     
-    public void retainData(final ChunkPos bjh, final boolean boolean2) {
+    public void retainData(final ChunkPos bph, final boolean boolean2) {
         if (this.blockEngine != null) {
-            this.blockEngine.retainData(bjh, boolean2);
+            this.blockEngine.retainData(bph, boolean2);
         }
         if (this.skyEngine != null) {
-            this.skyEngine.retainData(bjh, boolean2);
+            this.skyEngine.retainData(bph, boolean2);
         }
     }
     
-    public int getRawBrightness(final BlockPos fk, final int integer) {
-        final int integer2 = (this.skyEngine == null) ? 0 : (this.skyEngine.getLightValue(fk) - integer);
-        final int integer3 = (this.blockEngine == null) ? 0 : this.blockEngine.getLightValue(fk);
+    public int getRawBrightness(final BlockPos fu, final int integer) {
+        final int integer2 = (this.skyEngine == null) ? 0 : (this.skyEngine.getLightValue(fu) - integer);
+        final int integer3 = (this.blockEngine == null) ? 0 : this.blockEngine.getLightValue(fu);
         return Math.max(integer3, integer2);
     }
 }
diff --git a/src/net/minecraft/world/level/lighting/LightEventListener.java b/src/net/minecraft/world/level/lighting/LightEventListener.java
index 5a8a8b4..e70c2fc 100644
--- a/src/net/minecraft/world/level/lighting/LightEventListener.java
+++ b/src/net/minecraft/world/level/lighting/LightEventListener.java
@@ -4,9 +4,9 @@ import net.minecraft.core.SectionPos;
 import net.minecraft.core.BlockPos;
 
 public interface LightEventListener {
-    default void updateSectionStatus(final BlockPos fk, final boolean boolean2) {
-        this.updateSectionStatus(SectionPos.of(fk), boolean2);
+    default void updateSectionStatus(final BlockPos fu, final boolean boolean2) {
+        this.updateSectionStatus(SectionPos.of(fu), boolean2);
     }
     
-    void updateSectionStatus(final SectionPos gd, final boolean boolean2);
+    void updateSectionStatus(final SectionPos go, final boolean boolean2);
 }
diff --git a/src/net/minecraft/world/level/lighting/SkyLightEngine.java b/src/net/minecraft/world/level/lighting/SkyLightEngine.java
index 3cee6ff..b8de4e1 100644
--- a/src/net/minecraft/world/level/lighting/SkyLightEngine.java
+++ b/src/net/minecraft/world/level/lighting/SkyLightEngine.java
@@ -15,8 +15,8 @@ public final class SkyLightEngine extends LayerLightEngine<SkyLightSectionStorag
     private static final Direction[] DIRECTIONS;
     private static final Direction[] HORIZONTALS;
     
-    public SkyLightEngine(final LightChunkGetter can) {
-        super(can, LightLayer.SKY, new SkyLightSectionStorage(can));
+    public SkyLightEngine(final LightChunkGetter chl) {
+        super(chl, LightLayer.SKY, new SkyLightSectionStorage(chl));
     }
     
     @Override
@@ -34,7 +34,7 @@ public final class SkyLightEngine extends LayerLightEngine<SkyLightSectionStorag
             return integer;
         }
         final MutableInt mutableInt7 = new MutableInt();
-        final BlockState byj8 = this.getStateAndOpacity(long2, mutableInt7);
+        final BlockState cfj8 = this.getStateAndOpacity(long2, mutableInt7);
         if (mutableInt7.getValue() >= 15) {
             return 15;
         }
@@ -48,33 +48,33 @@ public final class SkyLightEngine extends LayerLightEngine<SkyLightSectionStorag
         final int integer8 = Integer.signum(integer5 - integer2);
         final int integer9 = Integer.signum(integer6 - integer3);
         final int integer10 = Integer.signum(integer7 - integer4);
-        Direction fp19;
+        Direction fz19;
         if (long1 == Long.MAX_VALUE) {
-            fp19 = Direction.DOWN;
+            fz19 = Direction.DOWN;
         }
         else {
-            fp19 = Direction.fromNormal(integer8, integer9, integer10);
+            fz19 = Direction.fromNormal(integer8, integer9, integer10);
         }
-        final BlockState byj9 = this.getStateAndOpacity(long1, null);
-        if (fp19 != null) {
-            final VoxelShape cwf21 = this.getShape(byj9, long1, fp19);
-            final VoxelShape cwf22 = this.getShape(byj8, long2, fp19.getOpposite());
-            if (Shapes.faceShapeOccludes(cwf21, cwf22)) {
+        final BlockState cfj9 = this.getStateAndOpacity(long1, null);
+        if (fz19 != null) {
+            final VoxelShape dfg21 = this.getShape(cfj9, long1, fz19);
+            final VoxelShape dfg22 = this.getShape(cfj8, long2, fz19.getOpposite());
+            if (Shapes.faceShapeOccludes(dfg21, dfg22)) {
                 return 15;
             }
         }
         else {
-            final VoxelShape cwf21 = this.getShape(byj9, long1, Direction.DOWN);
-            if (Shapes.faceShapeOccludes(cwf21, Shapes.empty())) {
+            final VoxelShape dfg21 = this.getShape(cfj9, long1, Direction.DOWN);
+            if (Shapes.faceShapeOccludes(dfg21, Shapes.empty())) {
                 return 15;
             }
             final int integer11 = boolean15 ? -1 : 0;
-            final Direction fp20 = Direction.fromNormal(integer8, integer11, integer10);
-            if (fp20 == null) {
+            final Direction fz20 = Direction.fromNormal(integer8, integer11, integer10);
+            if (fz20 == null) {
                 return 15;
             }
-            final VoxelShape cwf23 = this.getShape(byj8, long2, fp20.getOpposite());
-            if (Shapes.faceShapeOccludes(Shapes.empty(), cwf23)) {
+            final VoxelShape dfg23 = this.getShape(cfj8, long2, fz20.getOpposite());
+            if (Shapes.faceShapeOccludes(Shapes.empty(), dfg23)) {
                 return 15;
             }
         }
@@ -110,10 +110,10 @@ public final class SkyLightEngine extends LayerLightEngine<SkyLightSectionStorag
         if (long2 == long6 || ((SkyLightSectionStorage)this.storage).storingLightForSection(long6)) {
             this.checkNeighbor(long1, long5, integer, boolean3);
         }
-        for (final Direction fp23 : SkyLightEngine.HORIZONTALS) {
+        for (final Direction fz23 : SkyLightEngine.HORIZONTALS) {
             int integer7 = 0;
             do {
-                final long long7 = BlockPos.offset(long1, fp23.getStepX(), -integer7, fp23.getStepZ());
+                final long long7 = BlockPos.offset(long1, fz23.getStepX(), -integer7, fz23.getStepZ());
                 final long long8 = SectionPos.blockToSection(long7);
                 if (long2 == long8) {
                     this.checkNeighbor(long1, long7, integer, boolean3);
@@ -140,20 +140,20 @@ public final class SkyLightEngine extends LayerLightEngine<SkyLightSectionStorag
             }
         }
         final long long3 = SectionPos.blockToSection(long1);
-        final DataLayer caf10 = ((SkyLightSectionStorage)this.storage).getDataLayer(long3, true);
-        for (final Direction fp14 : SkyLightEngine.DIRECTIONS) {
-            long long4 = BlockPos.offset(long1, fp14);
+        final DataLayer chd10 = ((SkyLightSectionStorage)this.storage).getDataLayer(long3, true);
+        for (final Direction fz14 : SkyLightEngine.DIRECTIONS) {
+            long long4 = BlockPos.offset(long1, fz14);
             long long5 = SectionPos.blockToSection(long4);
-            DataLayer caf11;
+            DataLayer chd11;
             if (long3 == long5) {
-                caf11 = caf10;
+                chd11 = chd10;
             }
             else {
-                caf11 = ((SkyLightSectionStorage)this.storage).getDataLayer(long5, true);
+                chd11 = ((SkyLightSectionStorage)this.storage).getDataLayer(long5, true);
             }
-            if (caf11 != null) {
+            if (chd11 != null) {
                 if (long4 != long2) {
-                    final int integer4 = this.computeLevelFromNeighbor(long4, long1, this.getLevel(caf11, long4));
+                    final int integer4 = this.computeLevelFromNeighbor(long4, long1, this.getLevel(chd11, long4));
                     if (integer2 > integer4) {
                         integer2 = integer4;
                     }
@@ -162,13 +162,13 @@ public final class SkyLightEngine extends LayerLightEngine<SkyLightSectionStorag
                     }
                 }
             }
-            else if (fp14 != Direction.DOWN) {
+            else if (fz14 != Direction.DOWN) {
                 for (long4 = BlockPos.getFlatIndex(long4); !((SkyLightSectionStorage)this.storage).storingLightForSection(long5) && !((SkyLightSectionStorage)this.storage).isAboveData(long5); long5 = SectionPos.offset(long5, Direction.UP), long4 = BlockPos.offset(long4, 0, 16, 0)) {}
-                final DataLayer caf12 = ((SkyLightSectionStorage)this.storage).getDataLayer(long5, true);
+                final DataLayer chd12 = ((SkyLightSectionStorage)this.storage).getDataLayer(long5, true);
                 if (long4 != long2) {
                     int integer5;
-                    if (caf12 != null) {
-                        integer5 = this.computeLevelFromNeighbor(long4, long1, this.getLevel(caf12, long4));
+                    if (chd12 != null) {
+                        integer5 = this.computeLevelFromNeighbor(long4, long1, this.getLevel(chd12, long4));
                     }
                     else {
                         integer5 = (((SkyLightSectionStorage)this.storage).lightOnInSection(long5) ? 0 : 15);
diff --git a/src/net/minecraft/world/level/lighting/SkyLightSectionStorage.java b/src/net/minecraft/world/level/lighting/SkyLightSectionStorage.java
index f92cdbf..8a37b13 100644
--- a/src/net/minecraft/world/level/lighting/SkyLightSectionStorage.java
+++ b/src/net/minecraft/world/level/lighting/SkyLightSectionStorage.java
@@ -21,8 +21,8 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyDataLaye
     private final LongSet columnsWithSkySources;
     private volatile boolean hasSourceInconsistencies;
     
-    protected SkyLightSectionStorage(final LightChunkGetter can) {
-        super(LightLayer.SKY, can, new SkyDataLayerStorageMap((Long2ObjectOpenHashMap<DataLayer>)new Long2ObjectOpenHashMap(), new Long2IntOpenHashMap(), Integer.MAX_VALUE));
+    protected SkyLightSectionStorage(final LightChunkGetter chl) {
+        super(LightLayer.SKY, chl, new SkyDataLayerStorageMap((Long2ObjectOpenHashMap<DataLayer>)new Long2ObjectOpenHashMap(), new Long2IntOpenHashMap(), Integer.MAX_VALUE));
         this.sectionsWithSources = (LongSet)new LongOpenHashSet();
         this.sectionsToAddSourcesTo = (LongSet)new LongOpenHashSet();
         this.sectionsToRemoveSourcesFrom = (LongSet)new LongOpenHashSet();
@@ -38,19 +38,19 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyDataLaye
         if (integer7 == a7.currentLowestY || integer6 >= integer7) {
             return 15;
         }
-        DataLayer caf9 = this.getDataLayer(a7, long2);
-        if (caf9 == null) {
+        DataLayer chd9 = this.getDataLayer(a7, long2);
+        if (chd9 == null) {
             long1 = BlockPos.getFlatIndex(long1);
-            while (caf9 == null) {
+            while (chd9 == null) {
                 long2 = SectionPos.offset(long2, Direction.UP);
                 if (++integer6 >= integer7) {
                     return 15;
                 }
                 long1 = BlockPos.offset(long1, 0, 16, 0);
-                caf9 = this.getDataLayer(a7, long2);
+                chd9 = this.getDataLayer(a7, long2);
             }
         }
-        return caf9.get(SectionPos.sectionRelative(BlockPos.getX(long1)), SectionPos.sectionRelative(BlockPos.getY(long1)), SectionPos.sectionRelative(BlockPos.getZ(long1)));
+        return chd9.get(SectionPos.sectionRelative(BlockPos.getX(long1)), SectionPos.sectionRelative(BlockPos.getY(long1)), SectionPos.sectionRelative(BlockPos.getZ(long1)));
     }
     
     @Override
@@ -138,25 +138,25 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyDataLaye
     
     @Override
     protected DataLayer createDataLayer(final long long1) {
-        final DataLayer caf4 = (DataLayer)this.queuedSections.get(long1);
-        if (caf4 != null) {
-            return caf4;
+        final DataLayer chd4 = (DataLayer)this.queuedSections.get(long1);
+        if (chd4 != null) {
+            return chd4;
         }
         long long2 = SectionPos.offset(long1, Direction.UP);
         final int integer7 = ((SkyDataLayerStorageMap)this.updatingSectionData).topSections.get(SectionPos.getZeroNode(long1));
         if (integer7 == ((SkyDataLayerStorageMap)this.updatingSectionData).currentLowestY || SectionPos.y(long2) >= integer7) {
             return new DataLayer();
         }
-        DataLayer caf5;
-        while ((caf5 = this.getDataLayer(long2, true)) == null) {
+        DataLayer chd5;
+        while ((chd5 = this.getDataLayer(long2, true)) == null) {
             long2 = SectionPos.offset(long2, Direction.UP);
         }
-        return new DataLayer(new FlatDataLayer(caf5, 0).getData());
+        return new DataLayer(new FlatDataLayer(chd5, 0).getData());
     }
     
     @Override
-    protected void markNewInconsistencies(final LayerLightEngine<SkyDataLayerStorageMap, ?> cnx, final boolean boolean2, final boolean boolean3) {
-        super.markNewInconsistencies(cnx, boolean2, boolean3);
+    protected void markNewInconsistencies(final LayerLightEngine<SkyDataLayerStorageMap, ?> cwo, final boolean boolean2, final boolean boolean3) {
+        super.markNewInconsistencies(cwo, boolean2, boolean3);
         if (!boolean2) {
             return;
         }
@@ -170,7 +170,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyDataLaye
                     continue;
                 }
                 if (integer8 == 1) {
-                    this.clearQueuedSectionBlocks(cnx, long6);
+                    this.clearQueuedSectionBlocks(cwo, long6);
                     if (this.changedSections.add(long6)) {
                         ((SkyDataLayerStorageMap)this.updatingSectionData).copyDataLayer(long6);
                     }
@@ -178,15 +178,15 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyDataLaye
                     final int integer9 = SectionPos.sectionToBlockCoord(SectionPos.x(long6));
                     final int integer10 = SectionPos.sectionToBlockCoord(SectionPos.y(long6));
                     final int integer11 = SectionPos.sectionToBlockCoord(SectionPos.z(long6));
-                    for (final Direction fp15 : SkyLightSectionStorage.HORIZONTALS) {
-                        final long long7 = SectionPos.offset(long6, fp15);
+                    for (final Direction fz15 : SkyLightSectionStorage.HORIZONTALS) {
+                        final long long7 = SectionPos.offset(long6, fz15);
                         if (this.sectionsToRemoveSourcesFrom.contains(long7) || (!this.sectionsWithSources.contains(long7) && !this.sectionsToAddSourcesTo.contains(long7))) {
                             if (this.storingLightForSection(long7)) {
                                 for (int integer12 = 0; integer12 < 16; ++integer12) {
                                     for (int integer13 = 0; integer13 < 16; ++integer13) {
                                         long long8 = 0L;
                                         long long9 = 0L;
-                                        switch (fp15) {
+                                        switch (fz15) {
                                             case NORTH: {
                                                 long8 = BlockPos.asLong(integer9 + integer12, integer10 + integer13, integer11);
                                                 long9 = BlockPos.asLong(integer9 + integer12, integer10 + integer13, integer11 - 1);
@@ -208,7 +208,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyDataLaye
                                                 break;
                                             }
                                         }
-                                        cnx.checkEdge(long8, long9, cnx.computeLevelFromNeighbor(long8, long9, 0), true);
+                                        cwo.checkEdge(long8, long9, cwo.computeLevelFromNeighbor(long8, long9, 0), true);
                                     }
                                 }
                             }
@@ -218,7 +218,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyDataLaye
                         for (int integer15 = 0; integer15 < 16; ++integer15) {
                             final long long10 = BlockPos.asLong(SectionPos.sectionToBlockCoord(SectionPos.x(long6)) + integer14, SectionPos.sectionToBlockCoord(SectionPos.y(long6)), SectionPos.sectionToBlockCoord(SectionPos.z(long6)) + integer15);
                             final long long7 = BlockPos.asLong(SectionPos.sectionToBlockCoord(SectionPos.x(long6)) + integer14, SectionPos.sectionToBlockCoord(SectionPos.y(long6)) - 1, SectionPos.sectionToBlockCoord(SectionPos.z(long6)) + integer15);
-                            cnx.checkEdge(long10, long7, cnx.computeLevelFromNeighbor(long10, long7, 0), true);
+                            cwo.checkEdge(long10, long7, cwo.computeLevelFromNeighbor(long10, long7, 0), true);
                         }
                     }
                 }
@@ -226,7 +226,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyDataLaye
                     for (int integer9 = 0; integer9 < 16; ++integer9) {
                         for (int integer10 = 0; integer10 < 16; ++integer10) {
                             final long long11 = BlockPos.asLong(SectionPos.sectionToBlockCoord(SectionPos.x(long6)) + integer9, SectionPos.sectionToBlockCoord(SectionPos.y(long6)) + 16 - 1, SectionPos.sectionToBlockCoord(SectionPos.z(long6)) + integer10);
-                            cnx.checkEdge(Long.MAX_VALUE, long11, 0, true);
+                            cwo.checkEdge(Long.MAX_VALUE, long11, 0, true);
                         }
                     }
                 }
@@ -242,7 +242,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyDataLaye
                     for (int integer8 = 0; integer8 < 16; ++integer8) {
                         for (int integer9 = 0; integer9 < 16; ++integer9) {
                             final long long12 = BlockPos.asLong(SectionPos.sectionToBlockCoord(SectionPos.x(long6)) + integer8, SectionPos.sectionToBlockCoord(SectionPos.y(long6)) + 16 - 1, SectionPos.sectionToBlockCoord(SectionPos.z(long6)) + integer9);
-                            cnx.checkEdge(Long.MAX_VALUE, long12, 15, false);
+                            cwo.checkEdge(Long.MAX_VALUE, long12, 15, false);
                         }
                     }
                 }
diff --git a/src/net/minecraft/world/level/material/EmptyFluid.java b/src/net/minecraft/world/level/material/EmptyFluid.java
index 57cd224..026b620 100644
--- a/src/net/minecraft/world/level/material/EmptyFluid.java
+++ b/src/net/minecraft/world/level/material/EmptyFluid.java
@@ -18,16 +18,16 @@ public class EmptyFluid extends Fluid {
         return Items.AIR;
     }
     
-    public boolean canBeReplacedWith(final FluidState coj, final BlockGetter bjg, final BlockPos fk, final Fluid coi, final Direction fp) {
+    public boolean canBeReplacedWith(final FluidState cxa, final BlockGetter bpg, final BlockPos fu, final Fluid cwz, final Direction fz) {
         return true;
     }
     
-    public Vec3 getFlow(final BlockGetter bjg, final BlockPos fk, final FluidState coj) {
+    public Vec3 getFlow(final BlockGetter bpg, final BlockPos fu, final FluidState cxa) {
         return Vec3.ZERO;
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
+    public int getTickDelay(final LevelReader bqd) {
         return 0;
     }
     
@@ -42,32 +42,32 @@ public class EmptyFluid extends Fluid {
     }
     
     @Override
-    public float getHeight(final FluidState coj, final BlockGetter bjg, final BlockPos fk) {
+    public float getHeight(final FluidState cxa, final BlockGetter bpg, final BlockPos fu) {
         return 0.0f;
     }
     
     @Override
-    public float getOwnHeight(final FluidState coj) {
+    public float getOwnHeight(final FluidState cxa) {
         return 0.0f;
     }
     
     @Override
-    protected BlockState createLegacyBlock(final FluidState coj) {
+    protected BlockState createLegacyBlock(final FluidState cxa) {
         return Blocks.AIR.defaultBlockState();
     }
     
     @Override
-    public boolean isSource(final FluidState coj) {
+    public boolean isSource(final FluidState cxa) {
         return false;
     }
     
     @Override
-    public int getAmount(final FluidState coj) {
+    public int getAmount(final FluidState cxa) {
         return 0;
     }
     
     @Override
-    public VoxelShape getShape(final FluidState coj, final BlockGetter bjg, final BlockPos fk) {
+    public VoxelShape getShape(final FluidState cxa, final BlockGetter bpg, final BlockPos fu) {
         return Shapes.empty();
     }
 }
diff --git a/src/net/minecraft/world/level/material/FlowingFluid.java b/src/net/minecraft/world/level/material/FlowingFluid.java
index 8552313..ed96257 100644
--- a/src/net/minecraft/world/level/material/FlowingFluid.java
+++ b/src/net/minecraft/world/level/material/FlowingFluid.java
@@ -1,8 +1,10 @@
 package net.minecraft.world.level.material;
 
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.DoorBlock;
 import it.unimi.dsi.fastutil.shorts.Short2BooleanOpenHashMap;
@@ -46,139 +48,138 @@ public abstract class FlowingFluid extends Fluid {
         a.add(FlowingFluid.FALLING);
     }
     
-    public Vec3 getFlow(final BlockGetter bjg, final BlockPos fk, final FluidState coj) {
+    public Vec3 getFlow(final BlockGetter bpg, final BlockPos fu, final FluidState cxa) {
         double double5 = 0.0;
         double double6 = 0.0;
-        try (final BlockPos.PooledMutableBlockPos b9 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (final Direction fp12 : Direction.Plane.HORIZONTAL) {
-                b9.set((Vec3i)fk).move(fp12);
-                final FluidState coj2 = bjg.getFluidState(b9);
-                if (!this.affectsFlow(coj2)) {
-                    continue;
-                }
-                float float14 = coj2.getOwnHeight();
-                float float15 = 0.0f;
-                if (float14 == 0.0f) {
-                    if (!bjg.getBlockState(b9).getMaterial().blocksMotion()) {
-                        final BlockPos fk2 = b9.below();
-                        final FluidState coj3 = bjg.getFluidState(fk2);
-                        if (this.affectsFlow(coj3)) {
-                            float14 = coj3.getOwnHeight();
-                            if (float14 > 0.0f) {
-                                float15 = coj.getOwnHeight() - (float14 - 0.8888889f);
-                            }
+        final BlockPos.MutableBlockPos a9 = new BlockPos.MutableBlockPos();
+        for (final Direction fz11 : Direction.Plane.HORIZONTAL) {
+            a9.setWithOffset(fu, fz11);
+            final FluidState cxa2 = bpg.getFluidState(a9);
+            if (!this.affectsFlow(cxa2)) {
+                continue;
+            }
+            float float13 = cxa2.getOwnHeight();
+            float float14 = 0.0f;
+            if (float13 == 0.0f) {
+                if (!bpg.getBlockState(a9).getMaterial().blocksMotion()) {
+                    final BlockPos fu2 = a9.below();
+                    final FluidState cxa3 = bpg.getFluidState(fu2);
+                    if (this.affectsFlow(cxa3)) {
+                        float13 = cxa3.getOwnHeight();
+                        if (float13 > 0.0f) {
+                            float14 = cxa.getOwnHeight() - (float13 - 0.8888889f);
                         }
                     }
                 }
-                else if (float14 > 0.0f) {
-                    float15 = coj.getOwnHeight() - float14;
-                }
-                if (float15 == 0.0f) {
-                    continue;
-                }
-                double5 += fp12.getStepX() * float15;
-                double6 += fp12.getStepZ() * float15;
             }
-            Vec3 cvl11 = new Vec3(double5, 0.0, double6);
-            if (coj.<Boolean>getValue((Property<Boolean>)FlowingFluid.FALLING)) {
-                for (final Direction fp13 : Direction.Plane.HORIZONTAL) {
-                    b9.set((Vec3i)fk).move(fp13);
-                    if (this.isSolidFace(bjg, b9, fp13) || this.isSolidFace(bjg, b9.above(), fp13)) {
-                        cvl11 = cvl11.normalize().add(0.0, -6.0, 0.0);
-                        break;
-                    }
-                }
+            else if (float13 > 0.0f) {
+                float14 = cxa.getOwnHeight() - float13;
             }
-            return cvl11.normalize();
+            if (float14 == 0.0f) {
+                continue;
+            }
+            double5 += fz11.getStepX() * float14;
+            double6 += fz11.getStepZ() * float14;
         }
+        Vec3 dem10 = new Vec3(double5, 0.0, double6);
+        if (cxa.<Boolean>getValue((Property<Boolean>)FlowingFluid.FALLING)) {
+            for (final Direction fz12 : Direction.Plane.HORIZONTAL) {
+                a9.setWithOffset(fu, fz12);
+                if (this.isSolidFace(bpg, a9, fz12) || this.isSolidFace(bpg, a9.above(), fz12)) {
+                    dem10 = dem10.normalize().add(0.0, -6.0, 0.0);
+                    break;
+                }
+            }
+        }
+        return dem10.normalize();
     }
     
-    private boolean affectsFlow(final FluidState coj) {
-        return coj.isEmpty() || coj.getType().isSame(this);
+    private boolean affectsFlow(final FluidState cxa) {
+        return cxa.isEmpty() || cxa.getType().isSame(this);
     }
     
-    protected boolean isSolidFace(final BlockGetter bjg, final BlockPos fk, final Direction fp) {
-        final BlockState byj5 = bjg.getBlockState(fk);
-        final FluidState coj6 = bjg.getFluidState(fk);
-        return !coj6.getType().isSame(this) && (fp == Direction.UP || (byj5.getMaterial() != Material.ICE && byj5.isFaceSturdy(bjg, fk, fp)));
+    protected boolean isSolidFace(final BlockGetter bpg, final BlockPos fu, final Direction fz) {
+        final BlockState cfj5 = bpg.getBlockState(fu);
+        final FluidState cxa6 = bpg.getFluidState(fu);
+        return !cxa6.getType().isSame(this) && (fz == Direction.UP || (cfj5.getMaterial() != Material.ICE && cfj5.isFaceSturdy(bpg, fu, fz)));
     }
     
-    protected void spread(final LevelAccessor bjx, final BlockPos fk, final FluidState coj) {
-        if (coj.isEmpty()) {
+    protected void spread(final LevelAccessor bqc, final BlockPos fu, final FluidState cxa) {
+        if (cxa.isEmpty()) {
             return;
         }
-        final BlockState byj5 = bjx.getBlockState(fk);
-        final BlockPos fk2 = fk.below();
-        final BlockState byj6 = bjx.getBlockState(fk2);
-        final FluidState coj2 = this.getNewLiquid(bjx, fk2, byj6);
-        if (this.canSpreadTo(bjx, fk, byj5, Direction.DOWN, fk2, byj6, bjx.getFluidState(fk2), coj2.getType())) {
-            this.spreadTo(bjx, fk2, byj6, Direction.DOWN, coj2);
-            if (this.sourceNeighborCount(bjx, fk) >= 3) {
-                this.spreadToSides(bjx, fk, coj, byj5);
+        final BlockState cfj5 = bqc.getBlockState(fu);
+        final BlockPos fu2 = fu.below();
+        final BlockState cfj6 = bqc.getBlockState(fu2);
+        final FluidState cxa2 = this.getNewLiquid(bqc, fu2, cfj6);
+        if (this.canSpreadTo(bqc, fu, cfj5, Direction.DOWN, fu2, cfj6, bqc.getFluidState(fu2), cxa2.getType())) {
+            this.spreadTo(bqc, fu2, cfj6, Direction.DOWN, cxa2);
+            if (this.sourceNeighborCount(bqc, fu) >= 3) {
+                this.spreadToSides(bqc, fu, cxa, cfj5);
             }
         }
-        else if (coj.isSource() || !this.isWaterHole(bjx, coj2.getType(), fk, byj5, fk2, byj6)) {
-            this.spreadToSides(bjx, fk, coj, byj5);
+        else if (cxa.isSource() || !this.isWaterHole(bqc, cxa2.getType(), fu, cfj5, fu2, cfj6)) {
+            this.spreadToSides(bqc, fu, cxa, cfj5);
         }
     }
     
-    private void spreadToSides(final LevelAccessor bjx, final BlockPos fk, final FluidState coj, final BlockState byj) {
-        int integer6 = coj.getAmount() - this.getDropOff(bjx);
-        if (coj.<Boolean>getValue((Property<Boolean>)FlowingFluid.FALLING)) {
+    private void spreadToSides(final LevelAccessor bqc, final BlockPos fu, final FluidState cxa, final BlockState cfj) {
+        int integer6 = cxa.getAmount() - this.getDropOff(bqc);
+        if (cxa.<Boolean>getValue((Property<Boolean>)FlowingFluid.FALLING)) {
             integer6 = 7;
         }
         if (integer6 <= 0) {
             return;
         }
-        final Map<Direction, FluidState> map7 = this.getSpread(bjx, fk, byj);
+        final Map<Direction, FluidState> map7 = this.getSpread(bqc, fu, cfj);
         for (final Map.Entry<Direction, FluidState> entry9 : map7.entrySet()) {
-            final Direction fp10 = entry9.getKey();
-            final FluidState coj2 = entry9.getValue();
-            final BlockPos fk2 = fk.relative(fp10);
-            final BlockState byj2 = bjx.getBlockState(fk2);
-            if (this.canSpreadTo(bjx, fk, byj, fp10, fk2, byj2, bjx.getFluidState(fk2), coj2.getType())) {
-                this.spreadTo(bjx, fk2, byj2, fp10, coj2);
+            final Direction fz10 = entry9.getKey();
+            final FluidState cxa2 = entry9.getValue();
+            final BlockPos fu2 = fu.relative(fz10);
+            final BlockState cfj2 = bqc.getBlockState(fu2);
+            if (this.canSpreadTo(bqc, fu, cfj, fz10, fu2, cfj2, bqc.getFluidState(fu2), cxa2.getType())) {
+                this.spreadTo(bqc, fu2, cfj2, fz10, cxa2);
             }
         }
     }
     
-    protected FluidState getNewLiquid(final LevelReader bjz, final BlockPos fk, final BlockState byj) {
+    protected FluidState getNewLiquid(final LevelReader bqd, final BlockPos fu, final BlockState cfj) {
         int integer5 = 0;
         int integer6 = 0;
-        for (final Direction fp8 : Direction.Plane.HORIZONTAL) {
-            final BlockPos fk2 = fk.relative(fp8);
-            final BlockState byj2 = bjz.getBlockState(fk2);
-            final FluidState coj11 = byj2.getFluidState();
-            if (coj11.getType().isSame(this) && this.canPassThroughWall(fp8, bjz, fk, byj, fk2, byj2)) {
-                if (coj11.isSource()) {
+        for (final Direction fz8 : Direction.Plane.HORIZONTAL) {
+            final BlockPos fu2 = fu.relative(fz8);
+            final BlockState cfj2 = bqd.getBlockState(fu2);
+            final FluidState cxa11 = cfj2.getFluidState();
+            if (cxa11.getType().isSame(this) && this.canPassThroughWall(fz8, bqd, fu, cfj, fu2, cfj2)) {
+                if (cxa11.isSource()) {
                     ++integer6;
                 }
-                integer5 = Math.max(integer5, coj11.getAmount());
+                integer5 = Math.max(integer5, cxa11.getAmount());
             }
         }
         if (this.canConvertToSource() && integer6 >= 2) {
-            final BlockState byj3 = bjz.getBlockState(fk.below());
-            final FluidState coj12 = byj3.getFluidState();
-            if (byj3.getMaterial().isSolid() || this.isSourceBlockOfThisType(coj12)) {
+            final BlockState cfj3 = bqd.getBlockState(fu.below());
+            final FluidState cxa12 = cfj3.getFluidState();
+            if (cfj3.getMaterial().isSolid() || this.isSourceBlockOfThisType(cxa12)) {
                 return this.getSource(false);
             }
         }
-        final BlockPos fk3 = fk.above();
-        final BlockState byj4 = bjz.getBlockState(fk3);
-        final FluidState coj13 = byj4.getFluidState();
-        if (!coj13.isEmpty() && coj13.getType().isSame(this) && this.canPassThroughWall(Direction.UP, bjz, fk, byj, fk3, byj4)) {
+        final BlockPos fu3 = fu.above();
+        final BlockState cfj4 = bqd.getBlockState(fu3);
+        final FluidState cxa13 = cfj4.getFluidState();
+        if (!cxa13.isEmpty() && cxa13.getType().isSame(this) && this.canPassThroughWall(Direction.UP, bqd, fu, cfj, fu3, cfj4)) {
             return this.getFlowing(8, true);
         }
-        final int integer7 = integer5 - this.getDropOff(bjz);
+        final int integer7 = integer5 - this.getDropOff(bqd);
         if (integer7 <= 0) {
             return Fluids.EMPTY.defaultFluidState();
         }
         return this.getFlowing(integer7, false);
     }
     
-    private boolean canPassThroughWall(final Direction fp, final BlockGetter bjg, final BlockPos fk3, final BlockState byj4, final BlockPos fk5, final BlockState byj6) {
+    private boolean canPassThroughWall(final Direction fz, final BlockGetter bpg, final BlockPos fu3, final BlockState cfj4, final BlockPos fu5, final BlockState cfj6) {
         Object2ByteLinkedOpenHashMap<Block.BlockStatePairKey> object2ByteLinkedOpenHashMap8;
-        if (byj4.getBlock().hasDynamicShape() || byj6.getBlock().hasDynamicShape()) {
+        if (cfj4.getBlock().hasDynamicShape() || cfj6.getBlock().hasDynamicShape()) {
             object2ByteLinkedOpenHashMap8 = null;
         }
         else {
@@ -186,7 +187,7 @@ public abstract class FlowingFluid extends Fluid {
         }
         Block.BlockStatePairKey a9;
         if (object2ByteLinkedOpenHashMap8 != null) {
-            a9 = new Block.BlockStatePairKey(byj4, byj6, fp);
+            a9 = new Block.BlockStatePairKey(cfj4, cfj6, fz);
             final byte byte10 = object2ByteLinkedOpenHashMap8.getAndMoveToFirst(a9);
             if (byte10 != 127) {
                 return byte10 != 0;
@@ -195,9 +196,9 @@ public abstract class FlowingFluid extends Fluid {
         else {
             a9 = null;
         }
-        final VoxelShape cwf10 = byj4.getCollisionShape(bjg, fk3);
-        final VoxelShape cwf11 = byj6.getCollisionShape(bjg, fk5);
-        final boolean boolean12 = !Shapes.mergedFaceOccludes(cwf10, cwf11, fp);
+        final VoxelShape dfg10 = cfj4.getCollisionShape(bpg, fu3);
+        final VoxelShape dfg11 = cfj6.getCollisionShape(bpg, fu5);
+        final boolean boolean12 = !Shapes.mergedFaceOccludes(dfg10, dfg11, fz);
         if (object2ByteLinkedOpenHashMap8 != null) {
             if (object2ByteLinkedOpenHashMap8.size() == 200) {
                 object2ByteLinkedOpenHashMap8.removeLastByte();
@@ -210,71 +211,71 @@ public abstract class FlowingFluid extends Fluid {
     public abstract Fluid getFlowing();
     
     public FluidState getFlowing(final int integer, final boolean boolean2) {
-        return this.getFlowing().defaultFluidState().<Comparable, Integer>setValue((Property<Comparable>)FlowingFluid.LEVEL, integer).<Comparable, Boolean>setValue((Property<Comparable>)FlowingFluid.FALLING, boolean2);
+        return (((StateHolder<O, FluidState>)this.getFlowing().defaultFluidState()).setValue((Property<Comparable>)FlowingFluid.LEVEL, integer)).<Comparable, Boolean>setValue((Property<Comparable>)FlowingFluid.FALLING, boolean2);
     }
     
     public abstract Fluid getSource();
     
     public FluidState getSource(final boolean boolean1) {
-        return this.getSource().defaultFluidState().<Comparable, Boolean>setValue((Property<Comparable>)FlowingFluid.FALLING, boolean1);
+        return ((StateHolder<O, FluidState>)this.getSource().defaultFluidState()).<Comparable, Boolean>setValue((Property<Comparable>)FlowingFluid.FALLING, boolean1);
     }
     
     protected abstract boolean canConvertToSource();
     
-    protected void spreadTo(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final Direction fp, final FluidState coj) {
-        if (byj.getBlock() instanceof LiquidBlockContainer) {
-            ((LiquidBlockContainer)byj.getBlock()).placeLiquid(bjx, fk, byj, coj);
+    protected void spreadTo(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final Direction fz, final FluidState cxa) {
+        if (cfj.getBlock() instanceof LiquidBlockContainer) {
+            ((LiquidBlockContainer)cfj.getBlock()).placeLiquid(bqc, fu, cfj, cxa);
         }
         else {
-            if (!byj.isAir()) {
-                this.beforeDestroyingBlock(bjx, fk, byj);
+            if (!cfj.isAir()) {
+                this.beforeDestroyingBlock(bqc, fu, cfj);
             }
-            bjx.setBlock(fk, coj.createLegacyBlock(), 3);
+            bqc.setBlock(fu, cxa.createLegacyBlock(), 3);
         }
     }
     
-    protected abstract void beforeDestroyingBlock(final LevelAccessor bjx, final BlockPos fk, final BlockState byj);
+    protected abstract void beforeDestroyingBlock(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj);
     
-    private static short getCacheKey(final BlockPos fk1, final BlockPos fk2) {
-        final int integer3 = fk2.getX() - fk1.getX();
-        final int integer4 = fk2.getZ() - fk1.getZ();
+    private static short getCacheKey(final BlockPos fu1, final BlockPos fu2) {
+        final int integer3 = fu2.getX() - fu1.getX();
+        final int integer4 = fu2.getZ() - fu1.getZ();
         return (short)((integer3 + 128 & 0xFF) << 8 | (integer4 + 128 & 0xFF));
     }
     
-    protected int getSlopeDistance(final LevelReader bjz, final BlockPos fk2, final int integer, final Direction fp, final BlockState byj, final BlockPos fk6, final Short2ObjectMap<Pair<BlockState, FluidState>> short2ObjectMap, final Short2BooleanMap short2BooleanMap) {
+    protected int getSlopeDistance(final LevelReader bqd, final BlockPos fu2, final int integer, final Direction fz, final BlockState cfj, final BlockPos fu6, final Short2ObjectMap<Pair<BlockState, FluidState>> short2ObjectMap, final Short2BooleanMap short2BooleanMap) {
         int integer2 = 1000;
-        for (final Direction fp2 : Direction.Plane.HORIZONTAL) {
-            if (fp2 == fp) {
+        for (final Direction fz2 : Direction.Plane.HORIZONTAL) {
+            if (fz2 == fz) {
                 continue;
             }
-            final BlockPos fk7 = fk2.relative(fp2);
-            final short short14 = getCacheKey(fk6, fk7);
-            final BlockState byj2;
+            final BlockPos fu7 = fu2.relative(fz2);
+            final short short14 = getCacheKey(fu6, fu7);
+            final BlockState cfj2;
             final Pair<BlockState, FluidState> pair15 = (Pair<BlockState, FluidState>)short2ObjectMap.computeIfAbsent(short14, integer -> {
-                byj2 = bjz.getBlockState(fk7);
-                return Pair.of(byj2, byj2.getFluidState());
+                cfj2 = bqd.getBlockState(fu7);
+                return Pair.of(cfj2, cfj2.getFluidState());
             });
-            final BlockState byj3 = (BlockState)pair15.getFirst();
-            final FluidState coj17 = (FluidState)pair15.getSecond();
-            if (!this.canPassThrough(bjz, this.getFlowing(), fk2, byj, fp2, fk7, byj3, coj17)) {
+            final BlockState cfj3 = (BlockState)pair15.getFirst();
+            final FluidState cxa17 = (FluidState)pair15.getSecond();
+            if (!this.canPassThrough(bqd, this.getFlowing(), fu2, cfj, fz2, fu7, cfj3, cxa17)) {
                 continue;
             }
-            final BlockPos fk9;
-            final BlockPos fk8;
-            final BlockState byj4;
-            final BlockState byj5;
+            final BlockPos fu9;
+            final BlockPos fu8;
+            final BlockState cfj4;
+            final BlockState cfj5;
             final boolean boolean18 = short2BooleanMap.computeIfAbsent(short14, integer -> {
-                fk8 = fk9.below();
-                byj4 = bjz.getBlockState(fk8);
-                return this.isWaterHole(bjz, this.getFlowing(), fk9, byj5, fk8, byj4);
+                fu8 = fu9.below();
+                cfj4 = bqd.getBlockState(fu8);
+                return this.isWaterHole(bqd, this.getFlowing(), fu9, cfj5, fu8, cfj4);
             });
             if (boolean18) {
                 return integer;
             }
-            if (integer >= this.getSlopeFindDistance(bjz)) {
+            if (integer >= this.getSlopeFindDistance(bqd)) {
                 continue;
             }
-            final int integer3 = this.getSlopeDistance(bjz, fk7, integer + 1, fp2.getOpposite(), byj3, fk6, short2ObjectMap, short2BooleanMap);
+            final int integer3 = this.getSlopeDistance(bqd, fu7, integer + 1, fz2.getOpposite(), cfj3, fu6, short2ObjectMap, short2BooleanMap);
             if (integer3 >= integer2) {
                 continue;
             }
@@ -283,64 +284,64 @@ public abstract class FlowingFluid extends Fluid {
         return integer2;
     }
     
-    private boolean isWaterHole(final BlockGetter bjg, final Fluid coi, final BlockPos fk3, final BlockState byj4, final BlockPos fk5, final BlockState byj6) {
-        return this.canPassThroughWall(Direction.DOWN, bjg, fk3, byj4, fk5, byj6) && (byj6.getFluidState().getType().isSame(this) || this.canHoldFluid(bjg, fk5, byj6, coi));
+    private boolean isWaterHole(final BlockGetter bpg, final Fluid cwz, final BlockPos fu3, final BlockState cfj4, final BlockPos fu5, final BlockState cfj6) {
+        return this.canPassThroughWall(Direction.DOWN, bpg, fu3, cfj4, fu5, cfj6) && (cfj6.getFluidState().getType().isSame(this) || this.canHoldFluid(bpg, fu5, cfj6, cwz));
     }
     
-    private boolean canPassThrough(final BlockGetter bjg, final Fluid coi, final BlockPos fk3, final BlockState byj4, final Direction fp, final BlockPos fk6, final BlockState byj7, final FluidState coj) {
-        return !this.isSourceBlockOfThisType(coj) && this.canPassThroughWall(fp, bjg, fk3, byj4, fk6, byj7) && this.canHoldFluid(bjg, fk6, byj7, coi);
+    private boolean canPassThrough(final BlockGetter bpg, final Fluid cwz, final BlockPos fu3, final BlockState cfj4, final Direction fz, final BlockPos fu6, final BlockState cfj7, final FluidState cxa) {
+        return !this.isSourceBlockOfThisType(cxa) && this.canPassThroughWall(fz, bpg, fu3, cfj4, fu6, cfj7) && this.canHoldFluid(bpg, fu6, cfj7, cwz);
     }
     
-    private boolean isSourceBlockOfThisType(final FluidState coj) {
-        return coj.getType().isSame(this) && coj.isSource();
+    private boolean isSourceBlockOfThisType(final FluidState cxa) {
+        return cxa.getType().isSame(this) && cxa.isSource();
     }
     
-    protected abstract int getSlopeFindDistance(final LevelReader bjz);
+    protected abstract int getSlopeFindDistance(final LevelReader bqd);
     
-    private int sourceNeighborCount(final LevelReader bjz, final BlockPos fk) {
+    private int sourceNeighborCount(final LevelReader bqd, final BlockPos fu) {
         int integer4 = 0;
-        for (final Direction fp6 : Direction.Plane.HORIZONTAL) {
-            final BlockPos fk2 = fk.relative(fp6);
-            final FluidState coj8 = bjz.getFluidState(fk2);
-            if (this.isSourceBlockOfThisType(coj8)) {
+        for (final Direction fz6 : Direction.Plane.HORIZONTAL) {
+            final BlockPos fu2 = fu.relative(fz6);
+            final FluidState cxa8 = bqd.getFluidState(fu2);
+            if (this.isSourceBlockOfThisType(cxa8)) {
                 ++integer4;
             }
         }
         return integer4;
     }
     
-    protected Map<Direction, FluidState> getSpread(final LevelReader bjz, final BlockPos fk, final BlockState byj) {
+    protected Map<Direction, FluidState> getSpread(final LevelReader bqd, final BlockPos fu, final BlockState cfj) {
         int integer5 = 1000;
         final Map<Direction, FluidState> map6 = Maps.newEnumMap(Direction.class);
         final Short2ObjectMap<Pair<BlockState, FluidState>> short2ObjectMap7 = (Short2ObjectMap<Pair<BlockState, FluidState>>)new Short2ObjectOpenHashMap();
         final Short2BooleanMap short2BooleanMap8 = (Short2BooleanMap)new Short2BooleanOpenHashMap();
-        for (final Direction fp10 : Direction.Plane.HORIZONTAL) {
-            final BlockPos fk2 = fk.relative(fp10);
-            final short short12 = getCacheKey(fk, fk2);
-            final BlockState byj2;
+        for (final Direction fz10 : Direction.Plane.HORIZONTAL) {
+            final BlockPos fu2 = fu.relative(fz10);
+            final short short12 = getCacheKey(fu, fu2);
+            final BlockState cfj2;
             final Pair<BlockState, FluidState> pair13 = (Pair<BlockState, FluidState>)short2ObjectMap7.computeIfAbsent(short12, integer -> {
-                byj2 = bjz.getBlockState(fk2);
-                return Pair.of(byj2, byj2.getFluidState());
+                cfj2 = bqd.getBlockState(fu2);
+                return Pair.of(cfj2, cfj2.getFluidState());
             });
-            final BlockState byj3 = (BlockState)pair13.getFirst();
-            final FluidState coj15 = (FluidState)pair13.getSecond();
-            final FluidState coj16 = this.getNewLiquid(bjz, fk2, byj3);
-            if (this.canPassThrough(bjz, coj16.getType(), fk, byj, fp10, fk2, byj3, coj15)) {
-                final BlockPos fk3 = fk2.below();
+            final BlockState cfj3 = (BlockState)pair13.getFirst();
+            final FluidState cxa15 = (FluidState)pair13.getSecond();
+            final FluidState cxa16 = this.getNewLiquid(bqd, fu2, cfj3);
+            if (this.canPassThrough(bqd, cxa16.getType(), fu, cfj, fz10, fu2, cfj3, cxa15)) {
+                final BlockPos fu3 = fu2.below();
                 final BlockPos blockPos;
-                final BlockState byj4;
-                final BlockPos fk4;
-                final BlockState byj5;
+                final BlockState cfj4;
+                final BlockPos fu4;
+                final BlockState cfj5;
                 final boolean boolean19 = short2BooleanMap8.computeIfAbsent(short12, integer -> {
-                    byj4 = bjz.getBlockState(blockPos);
-                    return this.isWaterHole(bjz, this.getFlowing(), fk4, byj5, blockPos, byj4);
+                    cfj4 = bqd.getBlockState(blockPos);
+                    return this.isWaterHole(bqd, this.getFlowing(), fu4, cfj5, blockPos, cfj4);
                 });
                 int integer6;
                 if (boolean19) {
                     integer6 = 0;
                 }
                 else {
-                    integer6 = this.getSlopeDistance(bjz, fk2, 1, fp10.getOpposite(), byj3, fk, short2ObjectMap7, short2BooleanMap8);
+                    integer6 = this.getSlopeDistance(bqd, fu2, 1, fz10.getOpposite(), cfj3, fu, short2ObjectMap7, short2BooleanMap8);
                 }
                 if (integer6 < integer5) {
                     map6.clear();
@@ -348,84 +349,84 @@ public abstract class FlowingFluid extends Fluid {
                 if (integer6 > integer5) {
                     continue;
                 }
-                map6.put(fp10, coj16);
+                map6.put(fz10, cxa16);
                 integer5 = integer6;
             }
         }
         return map6;
     }
     
-    private boolean canHoldFluid(final BlockGetter bjg, final BlockPos fk, final BlockState byj, final Fluid coi) {
-        final Block bph6 = byj.getBlock();
-        if (bph6 instanceof LiquidBlockContainer) {
-            return ((LiquidBlockContainer)bph6).canPlaceLiquid(bjg, fk, byj, coi);
+    private boolean canHoldFluid(final BlockGetter bpg, final BlockPos fu, final BlockState cfj, final Fluid cwz) {
+        final Block bvr6 = cfj.getBlock();
+        if (bvr6 instanceof LiquidBlockContainer) {
+            return ((LiquidBlockContainer)bvr6).canPlaceLiquid(bpg, fu, cfj, cwz);
         }
-        if (bph6 instanceof DoorBlock || bph6.is(BlockTags.SIGNS) || bph6 == Blocks.LADDER || bph6 == Blocks.SUGAR_CANE || bph6 == Blocks.BUBBLE_COLUMN) {
+        if (bvr6 instanceof DoorBlock || bvr6.is(BlockTags.SIGNS) || bvr6 == Blocks.LADDER || bvr6 == Blocks.SUGAR_CANE || bvr6 == Blocks.BUBBLE_COLUMN) {
             return false;
         }
-        final Material coo7 = byj.getMaterial();
-        return coo7 != Material.PORTAL && coo7 != Material.STRUCTURAL_AIR && coo7 != Material.WATER_PLANT && coo7 != Material.REPLACEABLE_WATER_PLANT && !coo7.blocksMotion();
+        final Material cxd7 = cfj.getMaterial();
+        return cxd7 != Material.PORTAL && cxd7 != Material.STRUCTURAL_AIR && cxd7 != Material.WATER_PLANT && cxd7 != Material.REPLACEABLE_WATER_PLANT && !cxd7.blocksMotion();
     }
     
-    protected boolean canSpreadTo(final BlockGetter bjg, final BlockPos fk2, final BlockState byj3, final Direction fp, final BlockPos fk5, final BlockState byj6, final FluidState coj, final Fluid coi) {
-        return coj.canBeReplacedWith(bjg, fk5, coi, fp) && this.canPassThroughWall(fp, bjg, fk2, byj3, fk5, byj6) && this.canHoldFluid(bjg, fk5, byj6, coi);
+    protected boolean canSpreadTo(final BlockGetter bpg, final BlockPos fu2, final BlockState cfj3, final Direction fz, final BlockPos fu5, final BlockState cfj6, final FluidState cxa, final Fluid cwz) {
+        return cxa.canBeReplacedWith(bpg, fu5, cwz, fz) && this.canPassThroughWall(fz, bpg, fu2, cfj3, fu5, cfj6) && this.canHoldFluid(bpg, fu5, cfj6, cwz);
     }
     
-    protected abstract int getDropOff(final LevelReader bjz);
+    protected abstract int getDropOff(final LevelReader bqd);
     
-    protected int getSpreadDelay(final Level bjw, final BlockPos fk, final FluidState coj3, final FluidState coj4) {
-        return this.getTickDelay(bjw);
+    protected int getSpreadDelay(final Level bqb, final BlockPos fu, final FluidState cxa3, final FluidState cxa4) {
+        return this.getTickDelay(bqb);
     }
     
-    public void tick(final Level bjw, final BlockPos fk, FluidState coj) {
-        if (!coj.isSource()) {
-            final FluidState coj2 = this.getNewLiquid(bjw, fk, bjw.getBlockState(fk));
-            final int integer6 = this.getSpreadDelay(bjw, fk, coj, coj2);
-            if (coj2.isEmpty()) {
-                coj = coj2;
-                bjw.setBlock(fk, Blocks.AIR.defaultBlockState(), 3);
+    public void tick(final Level bqb, final BlockPos fu, FluidState cxa) {
+        if (!cxa.isSource()) {
+            final FluidState cxa2 = this.getNewLiquid(bqb, fu, bqb.getBlockState(fu));
+            final int integer6 = this.getSpreadDelay(bqb, fu, cxa, cxa2);
+            if (cxa2.isEmpty()) {
+                cxa = cxa2;
+                bqb.setBlock(fu, Blocks.AIR.defaultBlockState(), 3);
             }
-            else if (!coj2.equals(coj)) {
-                coj = coj2;
-                final BlockState byj7 = coj.createLegacyBlock();
-                bjw.setBlock(fk, byj7, 2);
-                bjw.getLiquidTicks().scheduleTick(fk, coj.getType(), integer6);
-                bjw.updateNeighborsAt(fk, byj7.getBlock());
+            else if (!cxa2.equals(cxa)) {
+                cxa = cxa2;
+                final BlockState cfj7 = cxa.createLegacyBlock();
+                bqb.setBlock(fu, cfj7, 2);
+                bqb.getLiquidTicks().scheduleTick(fu, cxa.getType(), integer6);
+                bqb.updateNeighborsAt(fu, cfj7.getBlock());
             }
         }
-        this.spread(bjw, fk, coj);
+        this.spread(bqb, fu, cxa);
     }
     
-    protected static int getLegacyLevel(final FluidState coj) {
-        if (coj.isSource()) {
+    protected static int getLegacyLevel(final FluidState cxa) {
+        if (cxa.isSource()) {
             return 0;
         }
-        return 8 - Math.min(coj.getAmount(), 8) + (coj.<Boolean>getValue((Property<Boolean>)FlowingFluid.FALLING) ? 8 : 0);
+        return 8 - Math.min(cxa.getAmount(), 8) + (cxa.<Boolean>getValue((Property<Boolean>)FlowingFluid.FALLING) ? 8 : 0);
     }
     
-    private static boolean hasSameAbove(final FluidState coj, final BlockGetter bjg, final BlockPos fk) {
-        return coj.getType().isSame(bjg.getFluidState(fk.above()).getType());
+    private static boolean hasSameAbove(final FluidState cxa, final BlockGetter bpg, final BlockPos fu) {
+        return cxa.getType().isSame(bpg.getFluidState(fu.above()).getType());
     }
     
     @Override
-    public float getHeight(final FluidState coj, final BlockGetter bjg, final BlockPos fk) {
-        if (hasSameAbove(coj, bjg, fk)) {
+    public float getHeight(final FluidState cxa, final BlockGetter bpg, final BlockPos fu) {
+        if (hasSameAbove(cxa, bpg, fu)) {
             return 1.0f;
         }
-        return coj.getOwnHeight();
+        return cxa.getOwnHeight();
     }
     
     @Override
-    public float getOwnHeight(final FluidState coj) {
-        return coj.getAmount() / 9.0f;
+    public float getOwnHeight(final FluidState cxa) {
+        return cxa.getAmount() / 9.0f;
     }
     
     @Override
-    public VoxelShape getShape(final FluidState coj, final BlockGetter bjg, final BlockPos fk) {
-        if (coj.getAmount() == 9 && hasSameAbove(coj, bjg, fk)) {
+    public VoxelShape getShape(final FluidState cxa, final BlockGetter bpg, final BlockPos fu) {
+        if (cxa.getAmount() == 9 && hasSameAbove(cxa, bpg, fu)) {
             return Shapes.block();
         }
-        return this.shapes.computeIfAbsent(coj, coj -> Shapes.box(0.0, 0.0, 0.0, 1.0, coj.getHeight(bjg, fk), 1.0));
+        return this.shapes.computeIfAbsent(cxa, cxa -> Shapes.box(0.0, 0.0, 0.0, 1.0, cxa.getHeight(bpg, fu), 1.0));
     }
     
     static {
diff --git a/src/net/minecraft/world/level/material/Fluid.java b/src/net/minecraft/world/level/material/Fluid.java
index 45362c5..2b18d7b 100644
--- a/src/net/minecraft/world/level/material/Fluid.java
+++ b/src/net/minecraft/world/level/material/Fluid.java
@@ -24,7 +24,7 @@ public abstract class Fluid {
     protected Fluid() {
         final StateDefinition.Builder<Fluid, FluidState> a2 = new StateDefinition.Builder<Fluid, FluidState>(this);
         this.createFluidStateDefinition(a2);
-        this.stateDefinition = a2.<FluidStateImpl>create(FluidStateImpl::new);
+        this.stateDefinition = a2.create(Fluid::defaultFluidState, FluidState::new);
         this.registerDefaultState(this.stateDefinition.any());
     }
     
@@ -35,8 +35,8 @@ public abstract class Fluid {
         return this.stateDefinition;
     }
     
-    protected final void registerDefaultState(final FluidState coj) {
-        this.defaultFluidState = coj;
+    protected final void registerDefaultState(final FluidState cxa) {
+        this.defaultFluidState = cxa;
     }
     
     public final FluidState defaultFluidState() {
@@ -45,13 +45,13 @@ public abstract class Fluid {
     
     public abstract Item getBucket();
     
-    protected void animateTick(final Level bjw, final BlockPos fk, final FluidState coj, final Random random) {
+    protected void animateTick(final Level bqb, final BlockPos fu, final FluidState cxa, final Random random) {
     }
     
-    protected void tick(final Level bjw, final BlockPos fk, final FluidState coj) {
+    protected void tick(final Level bqb, final BlockPos fu, final FluidState cxa) {
     }
     
-    protected void randomTick(final Level bjw, final BlockPos fk, final FluidState coj, final Random random) {
+    protected void randomTick(final Level bqb, final BlockPos fu, final FluidState cxa, final Random random) {
     }
     
     @Nullable
@@ -59,11 +59,11 @@ public abstract class Fluid {
         return null;
     }
     
-    protected abstract boolean canBeReplacedWith(final FluidState coj, final BlockGetter bjg, final BlockPos fk, final Fluid coi, final Direction fp);
+    protected abstract boolean canBeReplacedWith(final FluidState cxa, final BlockGetter bpg, final BlockPos fu, final Fluid cwz, final Direction fz);
     
-    protected abstract Vec3 getFlow(final BlockGetter bjg, final BlockPos fk, final FluidState coj);
+    protected abstract Vec3 getFlow(final BlockGetter bpg, final BlockPos fu, final FluidState cxa);
     
-    public abstract int getTickDelay(final LevelReader bjz);
+    public abstract int getTickDelay(final LevelReader bqd);
     
     protected boolean isRandomlyTicking() {
         return false;
@@ -75,25 +75,25 @@ public abstract class Fluid {
     
     protected abstract float getExplosionResistance();
     
-    public abstract float getHeight(final FluidState coj, final BlockGetter bjg, final BlockPos fk);
+    public abstract float getHeight(final FluidState cxa, final BlockGetter bpg, final BlockPos fu);
     
-    public abstract float getOwnHeight(final FluidState coj);
+    public abstract float getOwnHeight(final FluidState cxa);
     
-    protected abstract BlockState createLegacyBlock(final FluidState coj);
+    protected abstract BlockState createLegacyBlock(final FluidState cxa);
     
-    public abstract boolean isSource(final FluidState coj);
+    public abstract boolean isSource(final FluidState cxa);
     
-    public abstract int getAmount(final FluidState coj);
+    public abstract int getAmount(final FluidState cxa);
     
-    public boolean isSame(final Fluid coi) {
-        return coi == this;
+    public boolean isSame(final Fluid cwz) {
+        return cwz == this;
     }
     
-    public boolean is(final Tag<Fluid> aaz) {
-        return aaz.contains(this);
+    public boolean is(final Tag<Fluid> adf) {
+        return adf.contains(this);
     }
     
-    public abstract VoxelShape getShape(final FluidState coj, final BlockGetter bjg, final BlockPos fk);
+    public abstract VoxelShape getShape(final FluidState cxa, final BlockGetter bpg, final BlockPos fu);
     
     static {
         FLUID_STATE_REGISTRY = new IdMapper<FluidState>();
diff --git a/src/net/minecraft/world/level/material/FluidState.java b/src/net/minecraft/world/level/material/FluidState.java
index 15a6f6e..2bad95f 100644
--- a/src/net/minecraft/world/level/material/FluidState.java
+++ b/src/net/minecraft/world/level/material/FluidState.java
@@ -1,19 +1,7 @@
 package net.minecraft.world.level.material;
 
-import net.minecraft.world.phys.shapes.VoxelShape;
-import java.util.Iterator;
-import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.resources.ResourceLocation;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import com.mojang.datafixers.util.Pair;
-import net.minecraft.world.level.block.state.properties.Property;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
 import net.minecraft.core.Registry;
-import com.mojang.datafixers.Dynamic;
-import com.mojang.datafixers.types.DynamicOps;
+import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.core.Direction;
 import net.minecraft.tags.Tag;
 import javax.annotation.Nullable;
@@ -24,37 +12,49 @@ import java.util.Random;
 import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
+import com.mojang.serialization.MapCodec;
+import net.minecraft.world.level.block.state.properties.Property;
+import com.google.common.collect.ImmutableMap;
+import com.mojang.serialization.Codec;
 import net.minecraft.world.level.block.state.StateHolder;
 
-public interface FluidState extends StateHolder<FluidState> {
-    Fluid getType();
+public final class FluidState extends StateHolder<Fluid, FluidState> {
+    public static final Codec<FluidState> CODEC;
     
-    default boolean isSource() {
+    public FluidState(final Fluid cwz, final ImmutableMap<Property<?>, Comparable<?>> immutableMap, final MapCodec<FluidState> mapCodec) {
+        super(cwz, immutableMap, mapCodec);
+    }
+    
+    public Fluid getType() {
+        return (Fluid)this.owner;
+    }
+    
+    public boolean isSource() {
         return this.getType().isSource(this);
     }
     
-    default boolean isEmpty() {
+    public boolean isEmpty() {
         return this.getType().isEmpty();
     }
     
-    default float getHeight(final BlockGetter bjg, final BlockPos fk) {
-        return this.getType().getHeight(this, bjg, fk);
+    public float getHeight(final BlockGetter bpg, final BlockPos fu) {
+        return this.getType().getHeight(this, bpg, fu);
     }
     
-    default float getOwnHeight() {
+    public float getOwnHeight() {
         return this.getType().getOwnHeight(this);
     }
     
-    default int getAmount() {
+    public int getAmount() {
         return this.getType().getAmount(this);
     }
     
-    default boolean shouldRenderBackwardUpFace(final BlockGetter bjg, final BlockPos fk) {
+    public boolean shouldRenderBackwardUpFace(final BlockGetter bpg, final BlockPos fu) {
         for (int integer4 = -1; integer4 <= 1; ++integer4) {
             for (int integer5 = -1; integer5 <= 1; ++integer5) {
-                final BlockPos fk2 = fk.offset(integer4, 0, integer5);
-                final FluidState coj7 = bjg.getFluidState(fk2);
-                if (!coj7.getType().isSame(this.getType()) && !bjg.getBlockState(fk2).isSolidRender(bjg, fk2)) {
+                final BlockPos fu2 = fu.offset(integer4, 0, integer5);
+                final FluidState cxa7 = bpg.getFluidState(fu2);
+                if (!cxa7.getType().isSame(this.getType()) && !bpg.getBlockState(fu2).isSolidRender(bpg, fu2)) {
                     return true;
                 }
             }
@@ -62,75 +62,52 @@ public interface FluidState extends StateHolder<FluidState> {
         return false;
     }
     
-    default void tick(final Level bjw, final BlockPos fk) {
-        this.getType().tick(bjw, fk, this);
+    public void tick(final Level bqb, final BlockPos fu) {
+        this.getType().tick(bqb, fu, this);
     }
     
-    default void animateTick(final Level bjw, final BlockPos fk, final Random random) {
-        this.getType().animateTick(bjw, fk, this, random);
+    public void animateTick(final Level bqb, final BlockPos fu, final Random random) {
+        this.getType().animateTick(bqb, fu, this, random);
     }
     
-    default boolean isRandomlyTicking() {
+    public boolean isRandomlyTicking() {
         return this.getType().isRandomlyTicking();
     }
     
-    default void randomTick(final Level bjw, final BlockPos fk, final Random random) {
-        this.getType().randomTick(bjw, fk, this, random);
+    public void randomTick(final Level bqb, final BlockPos fu, final Random random) {
+        this.getType().randomTick(bqb, fu, this, random);
     }
     
-    default Vec3 getFlow(final BlockGetter bjg, final BlockPos fk) {
-        return this.getType().getFlow(bjg, fk, this);
+    public Vec3 getFlow(final BlockGetter bpg, final BlockPos fu) {
+        return this.getType().getFlow(bpg, fu, this);
     }
     
-    default BlockState createLegacyBlock() {
+    public BlockState createLegacyBlock() {
         return this.getType().createLegacyBlock(this);
     }
     
     @Nullable
-    default ParticleOptions getDripParticle() {
+    public ParticleOptions getDripParticle() {
         return this.getType().getDripParticle();
     }
     
-    default boolean is(final Tag<Fluid> aaz) {
-        return this.getType().is(aaz);
+    public boolean is(final Tag<Fluid> adf) {
+        return this.getType().is(adf);
     }
     
-    default float getExplosionResistance() {
+    public float getExplosionResistance() {
         return this.getType().getExplosionResistance();
     }
     
-    default boolean canBeReplacedWith(final BlockGetter bjg, final BlockPos fk, final Fluid coi, final Direction fp) {
-        return this.getType().canBeReplacedWith(this, bjg, fk, coi, fp);
+    public boolean canBeReplacedWith(final BlockGetter bpg, final BlockPos fu, final Fluid cwz, final Direction fz) {
+        return this.getType().canBeReplacedWith(this, bpg, fu, cwz, fz);
     }
     
-    default <T> Dynamic<T> serialize(final DynamicOps<T> dynamicOps, final FluidState coj) {
-        final ImmutableMap<Property<?>, Comparable<?>> immutableMap3 = coj.getValues();
-        T object4;
-        if (immutableMap3.isEmpty()) {
-            object4 = (T)dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("Name"), dynamicOps.createString(Registry.FLUID.getKey(coj.getType()).toString())));
-        }
-        else {
-            object4 = (T)dynamicOps.createMap((Map)ImmutableMap.of(dynamicOps.createString("Name"), dynamicOps.createString(Registry.FLUID.getKey(coj.getType()).toString()), dynamicOps.createString("Properties"), dynamicOps.createMap((Map)immutableMap3.entrySet().stream().map(entry -> Pair.of(dynamicOps.createString(entry.getKey().getName()), dynamicOps.createString(StateHolder.<Comparable>getName((Property<Comparable>)entry.getKey(), entry.getValue())))).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)))));
-        }
-        return (Dynamic<T>)new Dynamic((DynamicOps)dynamicOps, object4);
+    public VoxelShape getShape(final BlockGetter bpg, final BlockPos fu) {
+        return this.getType().getShape(this, bpg, fu);
     }
     
-    default <T> FluidState deserialize(final Dynamic<T> dynamic) {
-        final Fluid coi2 = Registry.FLUID.get(new ResourceLocation(dynamic.getElement("Name").<String>flatMap(dynamic.getOps()::getStringValue).orElse("minecraft:empty")));
-        final Map<String, String> map3 = (Map<String, String>)dynamic.get("Properties").asMap(dynamic -> dynamic.asString(""), dynamic -> dynamic.asString(""));
-        FluidState coj4 = coi2.defaultFluidState();
-        final StateDefinition<Fluid, FluidState> byk5 = coi2.getStateDefinition();
-        for (final Map.Entry<String, String> entry7 : map3.entrySet()) {
-            final String string8 = entry7.getKey();
-            final Property<?> bzm9 = byk5.getProperty(string8);
-            if (bzm9 != null) {
-                coj4 = StateHolder.setValueHelper(coj4, bzm9, string8, dynamic.toString(), entry7.getValue());
-            }
-        }
-        return coj4;
-    }
-    
-    default VoxelShape getShape(final BlockGetter bjg, final BlockPos fk) {
-        return this.getType().getShape(this, bjg, fk);
+    static {
+        CODEC = StateHolder.<Object, FluidState>codec((com.mojang.serialization.Codec<Object>)Registry.FLUID, Fluid::defaultFluidState).stable();
     }
 }
diff --git a/src/net/minecraft/world/level/material/FluidStateImpl.java b/src/net/minecraft/world/level/material/FluidStateImpl.java
deleted file mode 100644
index f66a5c1..0000000
--- a/src/net/minecraft/world/level/material/FluidStateImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.minecraft.world.level.material;
-
-import net.minecraft.world.level.block.state.properties.Property;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.world.level.block.state.AbstractStateHolder;
-
-public class FluidStateImpl extends AbstractStateHolder<Fluid, FluidState> implements FluidState {
-    public FluidStateImpl(final Fluid coi, final ImmutableMap<Property<?>, Comparable<?>> immutableMap) {
-        super(coi, immutableMap);
-    }
-    
-    @Override
-    public Fluid getType() {
-        return (Fluid)this.owner;
-    }
-}
diff --git a/src/net/minecraft/world/level/material/Fluids.java b/src/net/minecraft/world/level/material/Fluids.java
index 8744464..a48a17f 100644
--- a/src/net/minecraft/world/level/material/Fluids.java
+++ b/src/net/minecraft/world/level/material/Fluids.java
@@ -11,8 +11,8 @@ public class Fluids {
     public static final FlowingFluid FLOWING_LAVA;
     public static final FlowingFluid LAVA;
     
-    private static <T extends Fluid> T register(final String string, final T coi) {
-        return Registry.<T>register(Registry.FLUID, string, coi);
+    private static <T extends Fluid> T register(final String string, final T cwz) {
+        return Registry.<T>register(Registry.FLUID, string, cwz);
     }
     
     static {
@@ -21,9 +21,9 @@ public class Fluids {
         WATER = Fluids.<WaterFluid.Source>register("water", new WaterFluid.Source());
         FLOWING_LAVA = Fluids.<LavaFluid.Flowing>register("flowing_lava", new LavaFluid.Flowing());
         LAVA = Fluids.<LavaFluid.Source>register("lava", new LavaFluid.Source());
-        for (final Fluid coi2 : Registry.FLUID) {
-            for (final FluidState coj4 : coi2.getStateDefinition().getPossibleStates()) {
-                Fluid.FLUID_STATE_REGISTRY.add(coj4);
+        for (final Fluid cwz2 : Registry.FLUID) {
+            for (final FluidState cxa4 : cwz2.getStateDefinition().getPossibleStates()) {
+                Fluid.FLUID_STATE_REGISTRY.add(cxa4);
             }
         }
     }
diff --git a/src/net/minecraft/world/level/material/LavaFluid.java b/src/net/minecraft/world/level/material/LavaFluid.java
index a6069c6..0752763 100644
--- a/src/net/minecraft/world/level/material/LavaFluid.java
+++ b/src/net/minecraft/world/level/material/LavaFluid.java
@@ -1,15 +1,17 @@
 package net.minecraft.world.level.material;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.LiquidBlock;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.LevelAccessor;
 import javax.annotation.Nullable;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.BaseFireBlock;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.sounds.SoundSource;
@@ -39,70 +41,70 @@ public abstract class LavaFluid extends FlowingFluid {
         return Items.LAVA_BUCKET;
     }
     
-    public void animateTick(final Level bjw, final BlockPos fk, final FluidState coj, final Random random) {
-        final BlockPos fk2 = fk.above();
-        if (bjw.getBlockState(fk2).isAir() && !bjw.getBlockState(fk2).isSolidRender(bjw, fk2)) {
+    public void animateTick(final Level bqb, final BlockPos fu, final FluidState cxa, final Random random) {
+        final BlockPos fu2 = fu.above();
+        if (bqb.getBlockState(fu2).isAir() && !bqb.getBlockState(fu2).isSolidRender(bqb, fu2)) {
             if (random.nextInt(100) == 0) {
-                final double double7 = fk.getX() + random.nextFloat();
-                final double double8 = fk.getY() + 1;
-                final double double9 = fk.getZ() + random.nextFloat();
-                bjw.addParticle(ParticleTypes.LAVA, double7, double8, double9, 0.0, 0.0, 0.0);
-                bjw.playLocalSound(double7, double8, double9, SoundEvents.LAVA_POP, SoundSource.BLOCKS, 0.2f + random.nextFloat() * 0.2f, 0.9f + random.nextFloat() * 0.15f, false);
+                final double double7 = fu.getX() + random.nextDouble();
+                final double double8 = fu.getY() + 1.0;
+                final double double9 = fu.getZ() + random.nextDouble();
+                bqb.addParticle(ParticleTypes.LAVA, double7, double8, double9, 0.0, 0.0, 0.0);
+                bqb.playLocalSound(double7, double8, double9, SoundEvents.LAVA_POP, SoundSource.BLOCKS, 0.2f + random.nextFloat() * 0.2f, 0.9f + random.nextFloat() * 0.15f, false);
             }
             if (random.nextInt(200) == 0) {
-                bjw.playLocalSound(fk.getX(), fk.getY(), fk.getZ(), SoundEvents.LAVA_AMBIENT, SoundSource.BLOCKS, 0.2f + random.nextFloat() * 0.2f, 0.9f + random.nextFloat() * 0.15f, false);
+                bqb.playLocalSound(fu.getX(), fu.getY(), fu.getZ(), SoundEvents.LAVA_AMBIENT, SoundSource.BLOCKS, 0.2f + random.nextFloat() * 0.2f, 0.9f + random.nextFloat() * 0.15f, false);
             }
         }
     }
     
-    public void randomTick(final Level bjw, final BlockPos fk, final FluidState coj, final Random random) {
-        if (!bjw.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
+    public void randomTick(final Level bqb, final BlockPos fu, final FluidState cxa, final Random random) {
+        if (!bqb.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
             return;
         }
         final int integer6 = random.nextInt(3);
         if (integer6 > 0) {
-            BlockPos fk2 = fk;
+            BlockPos fu2 = fu;
             for (int integer7 = 0; integer7 < integer6; ++integer7) {
-                fk2 = fk2.offset(random.nextInt(3) - 1, 1, random.nextInt(3) - 1);
-                if (!bjw.isLoaded(fk2)) {
+                fu2 = fu2.offset(random.nextInt(3) - 1, 1, random.nextInt(3) - 1);
+                if (!bqb.isLoaded(fu2)) {
                     return;
                 }
-                final BlockState byj9 = bjw.getBlockState(fk2);
-                if (byj9.isAir()) {
-                    if (this.hasFlammableNeighbours(bjw, fk2)) {
-                        bjw.setBlockAndUpdate(fk2, Blocks.FIRE.defaultBlockState());
+                final BlockState cfj9 = bqb.getBlockState(fu2);
+                if (cfj9.isAir()) {
+                    if (this.hasFlammableNeighbours(bqb, fu2)) {
+                        bqb.setBlockAndUpdate(fu2, BaseFireBlock.getState(bqb, fu2));
                         return;
                     }
                 }
-                else if (byj9.getMaterial().blocksMotion()) {
+                else if (cfj9.getMaterial().blocksMotion()) {
                     return;
                 }
             }
         }
         else {
             for (int integer8 = 0; integer8 < 3; ++integer8) {
-                final BlockPos fk3 = fk.offset(random.nextInt(3) - 1, 0, random.nextInt(3) - 1);
-                if (!bjw.isLoaded(fk3)) {
+                final BlockPos fu3 = fu.offset(random.nextInt(3) - 1, 0, random.nextInt(3) - 1);
+                if (!bqb.isLoaded(fu3)) {
                     return;
                 }
-                if (bjw.isEmptyBlock(fk3.above()) && this.isFlammable(bjw, fk3)) {
-                    bjw.setBlockAndUpdate(fk3.above(), Blocks.FIRE.defaultBlockState());
+                if (bqb.isEmptyBlock(fu3.above()) && this.isFlammable(bqb, fu3)) {
+                    bqb.setBlockAndUpdate(fu3.above(), BaseFireBlock.getState(bqb, fu3));
                 }
             }
         }
     }
     
-    private boolean hasFlammableNeighbours(final LevelReader bjz, final BlockPos fk) {
-        for (final Direction fp7 : Direction.values()) {
-            if (this.isFlammable(bjz, fk.relative(fp7))) {
+    private boolean hasFlammableNeighbours(final LevelReader bqd, final BlockPos fu) {
+        for (final Direction fz7 : Direction.values()) {
+            if (this.isFlammable(bqd, fu.relative(fz7))) {
                 return true;
             }
         }
         return false;
     }
     
-    private boolean isFlammable(final LevelReader bjz, final BlockPos fk) {
-        return (fk.getY() < 0 || fk.getY() >= 256 || bjz.hasChunkAt(fk)) && bjz.getBlockState(fk).getMaterial().isFlammable();
+    private boolean isFlammable(final LevelReader bqd, final BlockPos fu) {
+        return (fu.getY() < 0 || fu.getY() >= 256 || bqd.hasChunkAt(fu)) && bqd.getBlockState(fu).getMaterial().isFlammable();
     }
     
     @Nullable
@@ -111,46 +113,46 @@ public abstract class LavaFluid extends FlowingFluid {
     }
     
     @Override
-    protected void beforeDestroyingBlock(final LevelAccessor bjx, final BlockPos fk, final BlockState byj) {
-        this.fizz(bjx, fk);
+    protected void beforeDestroyingBlock(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj) {
+        this.fizz(bqc, fu);
     }
     
-    public int getSlopeFindDistance(final LevelReader bjz) {
-        return bjz.getDimension().isUltraWarm() ? 4 : 2;
+    public int getSlopeFindDistance(final LevelReader bqd) {
+        return bqd.dimensionType().ultraWarm() ? 4 : 2;
     }
     
-    public BlockState createLegacyBlock(final FluidState coj) {
-        return ((AbstractStateHolder<O, BlockState>)Blocks.LAVA.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)LiquidBlock.LEVEL, FlowingFluid.getLegacyLevel(coj));
+    public BlockState createLegacyBlock(final FluidState cxa) {
+        return ((StateHolder<O, BlockState>)Blocks.LAVA.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)LiquidBlock.LEVEL, FlowingFluid.getLegacyLevel(cxa));
     }
     
     @Override
-    public boolean isSame(final Fluid coi) {
-        return coi == Fluids.LAVA || coi == Fluids.FLOWING_LAVA;
+    public boolean isSame(final Fluid cwz) {
+        return cwz == Fluids.LAVA || cwz == Fluids.FLOWING_LAVA;
     }
     
-    public int getDropOff(final LevelReader bjz) {
-        return bjz.getDimension().isUltraWarm() ? 1 : 2;
+    public int getDropOff(final LevelReader bqd) {
+        return bqd.dimensionType().ultraWarm() ? 1 : 2;
     }
     
-    public boolean canBeReplacedWith(final FluidState coj, final BlockGetter bjg, final BlockPos fk, final Fluid coi, final Direction fp) {
-        return coj.getHeight(bjg, fk) >= 0.44444445f && coi.is(FluidTags.WATER);
+    public boolean canBeReplacedWith(final FluidState cxa, final BlockGetter bpg, final BlockPos fu, final Fluid cwz, final Direction fz) {
+        return cxa.getHeight(bpg, fu) >= 0.44444445f && cwz.is(FluidTags.WATER);
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
-        return bjz.getDimension().isHasCeiling() ? 10 : 30;
+    public int getTickDelay(final LevelReader bqd) {
+        return bqd.dimensionType().ultraWarm() ? 10 : 30;
     }
     
-    public int getSpreadDelay(final Level bjw, final BlockPos fk, final FluidState coj3, final FluidState coj4) {
-        int integer6 = this.getTickDelay(bjw);
-        if (!coj3.isEmpty() && !coj4.isEmpty() && !coj3.<Boolean>getValue((Property<Boolean>)LavaFluid.FALLING) && !coj4.<Boolean>getValue((Property<Boolean>)LavaFluid.FALLING) && coj4.getHeight(bjw, fk) > coj3.getHeight(bjw, fk) && bjw.getRandom().nextInt(4) != 0) {
+    public int getSpreadDelay(final Level bqb, final BlockPos fu, final FluidState cxa3, final FluidState cxa4) {
+        int integer6 = this.getTickDelay(bqb);
+        if (!cxa3.isEmpty() && !cxa4.isEmpty() && !cxa3.<Boolean>getValue((Property<Boolean>)LavaFluid.FALLING) && !cxa4.<Boolean>getValue((Property<Boolean>)LavaFluid.FALLING) && cxa4.getHeight(bqb, fu) > cxa3.getHeight(bqb, fu) && bqb.getRandom().nextInt(4) != 0) {
             integer6 *= 4;
         }
         return integer6;
     }
     
-    private void fizz(final LevelAccessor bjx, final BlockPos fk) {
-        bjx.levelEvent(1501, fk, 0);
+    private void fizz(final LevelAccessor bqc, final BlockPos fu) {
+        bqc.levelEvent(1501, fu, 0);
     }
     
     @Override
@@ -159,18 +161,18 @@ public abstract class LavaFluid extends FlowingFluid {
     }
     
     @Override
-    protected void spreadTo(final LevelAccessor bjx, final BlockPos fk, final BlockState byj, final Direction fp, final FluidState coj) {
-        if (fp == Direction.DOWN) {
-            final FluidState coj2 = bjx.getFluidState(fk);
-            if (this.is(FluidTags.LAVA) && coj2.is(FluidTags.WATER)) {
-                if (byj.getBlock() instanceof LiquidBlock) {
-                    bjx.setBlock(fk, Blocks.STONE.defaultBlockState(), 3);
+    protected void spreadTo(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj, final Direction fz, final FluidState cxa) {
+        if (fz == Direction.DOWN) {
+            final FluidState cxa2 = bqc.getFluidState(fu);
+            if (this.is(FluidTags.LAVA) && cxa2.is(FluidTags.WATER)) {
+                if (cfj.getBlock() instanceof LiquidBlock) {
+                    bqc.setBlock(fu, Blocks.STONE.defaultBlockState(), 3);
                 }
-                this.fizz(bjx, fk);
+                this.fizz(bqc, fu);
                 return;
             }
         }
-        super.spreadTo(bjx, fk, byj, fp, coj);
+        super.spreadTo(bqc, fu, cfj, fz, cxa);
     }
     
     @Override
@@ -185,12 +187,12 @@ public abstract class LavaFluid extends FlowingFluid {
     
     public static class Source extends LavaFluid {
         @Override
-        public int getAmount(final FluidState coj) {
+        public int getAmount(final FluidState cxa) {
             return 8;
         }
         
         @Override
-        public boolean isSource(final FluidState coj) {
+        public boolean isSource(final FluidState cxa) {
             return true;
         }
     }
@@ -203,12 +205,12 @@ public abstract class LavaFluid extends FlowingFluid {
         }
         
         @Override
-        public int getAmount(final FluidState coj) {
-            return coj.<Integer>getValue((Property<Integer>)Flowing.LEVEL);
+        public int getAmount(final FluidState cxa) {
+            return cxa.<Integer>getValue((Property<Integer>)Flowing.LEVEL);
         }
         
         @Override
-        public boolean isSource(final FluidState coj) {
+        public boolean isSource(final FluidState cxa) {
             return false;
         }
     }
diff --git a/src/net/minecraft/world/level/material/Material.java b/src/net/minecraft/world/level/material/Material.java
index 5dbbd49..b69805a 100644
--- a/src/net/minecraft/world/level/material/Material.java
+++ b/src/net/minecraft/world/level/material/Material.java
@@ -25,6 +25,7 @@ public final class Material {
     public static final Material SPONGE;
     public static final Material SHULKER_SHELL;
     public static final Material WOOD;
+    public static final Material NETHER_WOOD;
     public static final Material BAMBOO_SAPLING;
     public static final Material BAMBOO;
     public static final Material WOOL;
@@ -47,22 +48,20 @@ public final class Material {
     private final PushReaction pushReaction;
     private final boolean blocksMotion;
     private final boolean flammable;
-    private final boolean alwaysDestroyable;
     private final boolean liquid;
     private final boolean solidBlocking;
     private final boolean replaceable;
     private final boolean solid;
     
-    public Material(final MaterialColor cop, final boolean boolean2, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6, final boolean boolean7, final boolean boolean8, final PushReaction coq) {
-        this.color = cop;
+    public Material(final MaterialColor cxe, final boolean boolean2, final boolean boolean3, final boolean boolean4, final boolean boolean5, final boolean boolean6, final boolean boolean7, final PushReaction cxf) {
+        this.color = cxe;
         this.liquid = boolean2;
         this.solid = boolean3;
         this.blocksMotion = boolean4;
         this.solidBlocking = boolean5;
-        this.alwaysDestroyable = boolean6;
-        this.flammable = boolean7;
-        this.replaceable = boolean8;
-        this.pushReaction = coq;
+        this.flammable = boolean6;
+        this.replaceable = boolean7;
+        this.pushReaction = cxf;
     }
     
     public boolean isLiquid() {
@@ -89,10 +88,6 @@ public final class Material {
         return this.solidBlocking;
     }
     
-    public boolean isAlwaysDestroyable() {
-        return this.alwaysDestroyable;
-    }
-    
     public PushReaction getPushReaction() {
         return this.pushReaction;
     }
@@ -113,10 +108,10 @@ public final class Material {
         WATER = new Builder(MaterialColor.WATER).noCollider().notSolidBlocking().nonSolid().destroyOnPush().replaceable().liquid().build();
         BUBBLE_COLUMN = new Builder(MaterialColor.WATER).noCollider().notSolidBlocking().nonSolid().destroyOnPush().replaceable().liquid().build();
         LAVA = new Builder(MaterialColor.FIRE).noCollider().notSolidBlocking().nonSolid().destroyOnPush().replaceable().liquid().build();
-        TOP_SNOW = new Builder(MaterialColor.SNOW).noCollider().notSolidBlocking().nonSolid().destroyOnPush().replaceable().notAlwaysDestroyable().build();
+        TOP_SNOW = new Builder(MaterialColor.SNOW).noCollider().notSolidBlocking().nonSolid().destroyOnPush().replaceable().build();
         FIRE = new Builder(MaterialColor.NONE).noCollider().notSolidBlocking().nonSolid().destroyOnPush().replaceable().build();
         DECORATION = new Builder(MaterialColor.NONE).noCollider().notSolidBlocking().nonSolid().destroyOnPush().build();
-        WEB = new Builder(MaterialColor.WOOL).noCollider().notSolidBlocking().destroyOnPush().notAlwaysDestroyable().build();
+        WEB = new Builder(MaterialColor.WOOL).noCollider().notSolidBlocking().destroyOnPush().build();
         BUILDABLE_GLASS = new Builder(MaterialColor.NONE).build();
         CLAY = new Builder(MaterialColor.CLAY).build();
         DIRT = new Builder(MaterialColor.DIRT).build();
@@ -126,6 +121,7 @@ public final class Material {
         SPONGE = new Builder(MaterialColor.COLOR_YELLOW).build();
         SHULKER_SHELL = new Builder(MaterialColor.COLOR_PURPLE).build();
         WOOD = new Builder(MaterialColor.WOOD).flammable().build();
+        NETHER_WOOD = new Builder(MaterialColor.WOOD).build();
         BAMBOO_SAPLING = new Builder(MaterialColor.WOOD).flammable().destroyOnPush().noCollider().build();
         BAMBOO = new Builder(MaterialColor.WOOD).flammable().destroyOnPush().build();
         WOOL = new Builder(MaterialColor.WOOL).flammable().build();
@@ -134,11 +130,11 @@ public final class Material {
         GLASS = new Builder(MaterialColor.NONE).notSolidBlocking().build();
         ICE = new Builder(MaterialColor.ICE).notSolidBlocking().build();
         CACTUS = new Builder(MaterialColor.PLANT).notSolidBlocking().destroyOnPush().build();
-        STONE = new Builder(MaterialColor.STONE).notAlwaysDestroyable().build();
-        METAL = new Builder(MaterialColor.METAL).notAlwaysDestroyable().build();
-        SNOW = new Builder(MaterialColor.SNOW).notAlwaysDestroyable().build();
-        HEAVY_METAL = new Builder(MaterialColor.METAL).notAlwaysDestroyable().notPushable().build();
-        BARRIER = new Builder(MaterialColor.NONE).notAlwaysDestroyable().notPushable().build();
+        STONE = new Builder(MaterialColor.STONE).build();
+        METAL = new Builder(MaterialColor.METAL).build();
+        SNOW = new Builder(MaterialColor.SNOW).build();
+        HEAVY_METAL = new Builder(MaterialColor.METAL).notPushable().build();
+        BARRIER = new Builder(MaterialColor.NONE).notPushable().build();
         PISTON = new Builder(MaterialColor.STONE).notPushable().build();
         CORAL = new Builder(MaterialColor.PLANT).destroyOnPush().build();
         VEGETABLE = new Builder(MaterialColor.PLANT).destroyOnPush().build();
@@ -150,20 +146,18 @@ public final class Material {
         private PushReaction pushReaction;
         private boolean blocksMotion;
         private boolean flammable;
-        private boolean isAlwaysDestroyable;
         private boolean liquid;
         private boolean replaceable;
         private boolean solid;
         private final MaterialColor color;
         private boolean solidBlocking;
         
-        public Builder(final MaterialColor cop) {
+        public Builder(final MaterialColor cxe) {
             this.pushReaction = PushReaction.NORMAL;
             this.blocksMotion = true;
-            this.isAlwaysDestroyable = true;
             this.solid = true;
             this.solidBlocking = true;
-            this.color = cop;
+            this.color = cxe;
         }
         
         public Builder liquid() {
@@ -186,11 +180,6 @@ public final class Material {
             return this;
         }
         
-        protected Builder notAlwaysDestroyable() {
-            this.isAlwaysDestroyable = false;
-            return this;
-        }
-        
         protected Builder flammable() {
             this.flammable = true;
             return this;
@@ -212,7 +201,7 @@ public final class Material {
         }
         
         public Material build() {
-            return new Material(this.color, this.liquid, this.solid, this.blocksMotion, this.solidBlocking, this.isAlwaysDestroyable, this.flammable, this.replaceable, this.pushReaction);
+            return new Material(this.color, this.liquid, this.solid, this.blocksMotion, this.solidBlocking, this.flammable, this.replaceable, this.pushReaction);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/material/MaterialColor.java b/src/net/minecraft/world/level/material/MaterialColor.java
index 12cb437..64146b5 100644
--- a/src/net/minecraft/world/level/material/MaterialColor.java
+++ b/src/net/minecraft/world/level/material/MaterialColor.java
@@ -54,6 +54,13 @@ public class MaterialColor {
     public static final MaterialColor TERRACOTTA_GREEN;
     public static final MaterialColor TERRACOTTA_RED;
     public static final MaterialColor TERRACOTTA_BLACK;
+    public static final MaterialColor CRIMSON_NYLIUM;
+    public static final MaterialColor CRIMSON_STEM;
+    public static final MaterialColor CRIMSON_HYPHAE;
+    public static final MaterialColor WARPED_NYLIUM;
+    public static final MaterialColor WARPED_STEM;
+    public static final MaterialColor WARPED_HYPHAE;
+    public static final MaterialColor WARPED_WART_BLOCK;
     public final int col;
     public final int id;
     
@@ -140,5 +147,12 @@ public class MaterialColor {
         TERRACOTTA_GREEN = new MaterialColor(49, 5001770);
         TERRACOTTA_RED = new MaterialColor(50, 9321518);
         TERRACOTTA_BLACK = new MaterialColor(51, 2430480);
+        CRIMSON_NYLIUM = new MaterialColor(52, 12398641);
+        CRIMSON_STEM = new MaterialColor(53, 9715553);
+        CRIMSON_HYPHAE = new MaterialColor(54, 6035741);
+        WARPED_NYLIUM = new MaterialColor(55, 1474182);
+        WARPED_STEM = new MaterialColor(56, 3837580);
+        WARPED_HYPHAE = new MaterialColor(57, 5647422);
+        WARPED_WART_BLOCK = new MaterialColor(58, 1356933);
     }
 }
diff --git a/src/net/minecraft/world/level/material/WaterFluid.java b/src/net/minecraft/world/level/material/WaterFluid.java
index 89d6cee..1f9e4dc 100644
--- a/src/net/minecraft/world/level/material/WaterFluid.java
+++ b/src/net/minecraft/world/level/material/WaterFluid.java
@@ -1,7 +1,8 @@
 package net.minecraft.world.level.material;
 
-import net.minecraft.world.level.block.state.AbstractStateHolder;
+import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.BlockGetter;
@@ -40,14 +41,14 @@ public abstract class WaterFluid extends FlowingFluid {
         return Items.WATER_BUCKET;
     }
     
-    public void animateTick(final Level bjw, final BlockPos fk, final FluidState coj, final Random random) {
-        if (!coj.isSource() && !coj.<Boolean>getValue((Property<Boolean>)WaterFluid.FALLING)) {
+    public void animateTick(final Level bqb, final BlockPos fu, final FluidState cxa, final Random random) {
+        if (!cxa.isSource() && !cxa.<Boolean>getValue((Property<Boolean>)WaterFluid.FALLING)) {
             if (random.nextInt(64) == 0) {
-                bjw.playLocalSound(fk.getX() + 0.5, fk.getY() + 0.5, fk.getZ() + 0.5, SoundEvents.WATER_AMBIENT, SoundSource.BLOCKS, random.nextFloat() * 0.25f + 0.75f, random.nextFloat() + 0.5f, false);
+                bqb.playLocalSound(fu.getX() + 0.5, fu.getY() + 0.5, fu.getZ() + 0.5, SoundEvents.WATER_AMBIENT, SoundSource.BLOCKS, random.nextFloat() * 0.25f + 0.75f, random.nextFloat() + 0.5f, false);
             }
         }
         else if (random.nextInt(10) == 0) {
-            bjw.addParticle(ParticleTypes.UNDERWATER, fk.getX() + (double)random.nextFloat(), fk.getY() + (double)random.nextFloat(), fk.getZ() + (double)random.nextFloat(), 0.0, 0.0, 0.0);
+            bqb.addParticle(ParticleTypes.UNDERWATER, fu.getX() + random.nextDouble(), fu.getY() + random.nextDouble(), fu.getZ() + random.nextDouble(), 0.0, 0.0, 0.0);
         }
     }
     
@@ -62,35 +63,35 @@ public abstract class WaterFluid extends FlowingFluid {
     }
     
     @Override
-    protected void beforeDestroyingBlock(final LevelAccessor bjx, final BlockPos fk, final BlockState byj) {
-        final BlockEntity bwl5 = byj.getBlock().isEntityBlock() ? bjx.getBlockEntity(fk) : null;
-        Block.dropResources(byj, bjx.getLevel(), fk, bwl5);
+    protected void beforeDestroyingBlock(final LevelAccessor bqc, final BlockPos fu, final BlockState cfj) {
+        final BlockEntity cdl5 = cfj.getBlock().isEntityBlock() ? bqc.getBlockEntity(fu) : null;
+        Block.dropResources(cfj, bqc.getLevel(), fu, cdl5);
     }
     
-    public int getSlopeFindDistance(final LevelReader bjz) {
+    public int getSlopeFindDistance(final LevelReader bqd) {
         return 4;
     }
     
-    public BlockState createLegacyBlock(final FluidState coj) {
-        return ((AbstractStateHolder<O, BlockState>)Blocks.WATER.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)LiquidBlock.LEVEL, FlowingFluid.getLegacyLevel(coj));
+    public BlockState createLegacyBlock(final FluidState cxa) {
+        return ((StateHolder<O, BlockState>)Blocks.WATER.defaultBlockState()).<Comparable, Integer>setValue((Property<Comparable>)LiquidBlock.LEVEL, FlowingFluid.getLegacyLevel(cxa));
     }
     
     @Override
-    public boolean isSame(final Fluid coi) {
-        return coi == Fluids.WATER || coi == Fluids.FLOWING_WATER;
+    public boolean isSame(final Fluid cwz) {
+        return cwz == Fluids.WATER || cwz == Fluids.FLOWING_WATER;
     }
     
-    public int getDropOff(final LevelReader bjz) {
+    public int getDropOff(final LevelReader bqd) {
         return 1;
     }
     
     @Override
-    public int getTickDelay(final LevelReader bjz) {
+    public int getTickDelay(final LevelReader bqd) {
         return 5;
     }
     
-    public boolean canBeReplacedWith(final FluidState coj, final BlockGetter bjg, final BlockPos fk, final Fluid coi, final Direction fp) {
-        return fp == Direction.DOWN && !coi.is(FluidTags.WATER);
+    public boolean canBeReplacedWith(final FluidState cxa, final BlockGetter bpg, final BlockPos fu, final Fluid cwz, final Direction fz) {
+        return fz == Direction.DOWN && !cwz.is(FluidTags.WATER);
     }
     
     @Override
@@ -100,12 +101,12 @@ public abstract class WaterFluid extends FlowingFluid {
     
     public static class Source extends WaterFluid {
         @Override
-        public int getAmount(final FluidState coj) {
+        public int getAmount(final FluidState cxa) {
             return 8;
         }
         
         @Override
-        public boolean isSource(final FluidState coj) {
+        public boolean isSource(final FluidState cxa) {
             return true;
         }
     }
@@ -118,12 +119,12 @@ public abstract class WaterFluid extends FlowingFluid {
         }
         
         @Override
-        public int getAmount(final FluidState coj) {
-            return coj.<Integer>getValue((Property<Integer>)Flowing.LEVEL);
+        public int getAmount(final FluidState cxa) {
+            return cxa.<Integer>getValue((Property<Integer>)Flowing.LEVEL);
         }
         
         @Override
-        public boolean isSource(final FluidState coj) {
+        public boolean isSource(final FluidState cxa) {
             return false;
         }
     }
diff --git a/src/net/minecraft/world/level/newbiome/area/LazyArea.java b/src/net/minecraft/world/level/newbiome/area/LazyArea.java
index cbf2e2c..9feda28 100644
--- a/src/net/minecraft/world/level/newbiome/area/LazyArea.java
+++ b/src/net/minecraft/world/level/newbiome/area/LazyArea.java
@@ -9,10 +9,10 @@ public final class LazyArea implements Area {
     private final Long2IntLinkedOpenHashMap cache;
     private final int maxCache;
     
-    public LazyArea(final Long2IntLinkedOpenHashMap long2IntLinkedOpenHashMap, final int integer, final PixelTransformer cqi) {
+    public LazyArea(final Long2IntLinkedOpenHashMap long2IntLinkedOpenHashMap, final int integer, final PixelTransformer cyx) {
         this.cache = long2IntLinkedOpenHashMap;
         this.maxCache = integer;
-        this.transformer = cqi;
+        this.transformer = cyx;
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/newbiome/context/BigContext.java b/src/net/minecraft/world/level/newbiome/context/BigContext.java
index 76b4cb7..4dafbf9 100644
--- a/src/net/minecraft/world/level/newbiome/context/BigContext.java
+++ b/src/net/minecraft/world/level/newbiome/context/BigContext.java
@@ -6,14 +6,14 @@ import net.minecraft.world.level.newbiome.area.Area;
 public interface BigContext<R extends Area> extends Context {
     void initRandom(final long long1, final long long2);
     
-    R createResult(final PixelTransformer cqi);
+    R createResult(final PixelTransformer cyx);
     
-    default R createResult(final PixelTransformer cqi, final R cot) {
-        return this.createResult(cqi);
+    default R createResult(final PixelTransformer cyx, final R cxi) {
+        return this.createResult(cyx);
     }
     
-    default R createResult(final PixelTransformer cqi, final R cot2, final R cot3) {
-        return this.createResult(cqi);
+    default R createResult(final PixelTransformer cyx, final R cxi2, final R cxi3) {
+        return this.createResult(cyx);
     }
     
     default int random(final int integer1, final int integer2) {
diff --git a/src/net/minecraft/world/level/newbiome/context/LazyAreaContext.java b/src/net/minecraft/world/level/newbiome/context/LazyAreaContext.java
index 36b3e9d..a8841a4 100644
--- a/src/net/minecraft/world/level/newbiome/context/LazyAreaContext.java
+++ b/src/net/minecraft/world/level/newbiome/context/LazyAreaContext.java
@@ -23,18 +23,18 @@ public class LazyAreaContext implements BigContext<LazyArea> {
     }
     
     @Override
-    public LazyArea createResult(final PixelTransformer cqi) {
-        return new LazyArea(this.cache, this.maxCache, cqi);
+    public LazyArea createResult(final PixelTransformer cyx) {
+        return new LazyArea(this.cache, this.maxCache, cyx);
     }
     
     @Override
-    public LazyArea createResult(final PixelTransformer cqi, final LazyArea cov) {
-        return new LazyArea(this.cache, Math.min(1024, cov.getMaxCache() * 4), cqi);
+    public LazyArea createResult(final PixelTransformer cyx, final LazyArea cxk) {
+        return new LazyArea(this.cache, Math.min(1024, cxk.getMaxCache() * 4), cyx);
     }
     
     @Override
-    public LazyArea createResult(final PixelTransformer cqi, final LazyArea cov2, final LazyArea cov3) {
-        return new LazyArea(this.cache, Math.min(1024, Math.max(cov2.getMaxCache(), cov3.getMaxCache()) * 4), cqi);
+    public LazyArea createResult(final PixelTransformer cyx, final LazyArea cxk2, final LazyArea cxk3) {
+        return new LazyArea(this.cache, Math.min(1024, Math.max(cxk2.getMaxCache(), cxk3.getMaxCache()) * 4), cyx);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/newbiome/layer/AddDeepOceanLayer.java b/src/net/minecraft/world/level/newbiome/layer/AddDeepOceanLayer.java
index 36fa4c6..02482aa 100644
--- a/src/net/minecraft/world/level/newbiome/layer/AddDeepOceanLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/AddDeepOceanLayer.java
@@ -7,7 +7,7 @@ public enum AddDeepOceanLayer implements CastleTransformer {
     INSTANCE;
     
     @Override
-    public int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+    public int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
         if (Layers.isShallowOcean(integer6)) {
             int integer7 = 0;
             if (Layers.isShallowOcean(integer2)) {
diff --git a/src/net/minecraft/world/level/newbiome/layer/AddEdgeLayer.java b/src/net/minecraft/world/level/newbiome/layer/AddEdgeLayer.java
index c885fff..47c86b0 100644
--- a/src/net/minecraft/world/level/newbiome/layer/AddEdgeLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/AddEdgeLayer.java
@@ -9,7 +9,7 @@ public class AddEdgeLayer {
         INSTANCE;
         
         @Override
-        public int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        public int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
             if (integer6 == 1 && (integer2 == 3 || integer3 == 3 || integer5 == 3 || integer4 == 3 || integer2 == 4 || integer3 == 4 || integer5 == 4 || integer4 == 4)) {
                 return 2;
             }
@@ -21,7 +21,7 @@ public class AddEdgeLayer {
         INSTANCE;
         
         @Override
-        public int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        public int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
             if (integer6 == 4 && (integer2 == 1 || integer3 == 1 || integer5 == 1 || integer4 == 1 || integer2 == 2 || integer3 == 2 || integer5 == 2 || integer4 == 2)) {
                 return 3;
             }
@@ -33,9 +33,9 @@ public class AddEdgeLayer {
         INSTANCE;
         
         @Override
-        public int apply(final Context coy, int integer) {
-            if (!Layers.isShallowOcean(integer) && coy.nextRandom(13) == 0) {
-                integer |= (1 + coy.nextRandom(15) << 8 & 0xF00);
+        public int apply(final Context cxn, int integer) {
+            if (!Layers.isShallowOcean(integer) && cxn.nextRandom(13) == 0) {
+                integer |= (1 + cxn.nextRandom(15) << 8 & 0xF00);
             }
             return integer;
         }
diff --git a/src/net/minecraft/world/level/newbiome/layer/AddIslandLayer.java b/src/net/minecraft/world/level/newbiome/layer/AddIslandLayer.java
index 1e6a6c0..905d1c1 100644
--- a/src/net/minecraft/world/level/newbiome/layer/AddIslandLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/AddIslandLayer.java
@@ -7,9 +7,9 @@ public enum AddIslandLayer implements BishopTransformer {
     INSTANCE;
     
     @Override
-    public int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+    public int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
         if (!Layers.isShallowOcean(integer6) || (Layers.isShallowOcean(integer5) && Layers.isShallowOcean(integer4) && Layers.isShallowOcean(integer2) && Layers.isShallowOcean(integer3))) {
-            if (!Layers.isShallowOcean(integer6) && (Layers.isShallowOcean(integer5) || Layers.isShallowOcean(integer2) || Layers.isShallowOcean(integer4) || Layers.isShallowOcean(integer3)) && coy.nextRandom(5) == 0) {
+            if (!Layers.isShallowOcean(integer6) && (Layers.isShallowOcean(integer5) || Layers.isShallowOcean(integer2) || Layers.isShallowOcean(integer4) || Layers.isShallowOcean(integer3)) && cxn.nextRandom(5) == 0) {
                 if (Layers.isShallowOcean(integer5)) {
                     return (integer6 == 4) ? 4 : integer5;
                 }
@@ -27,19 +27,19 @@ public enum AddIslandLayer implements BishopTransformer {
         }
         int integer7 = 1;
         int integer8 = 1;
-        if (!Layers.isShallowOcean(integer5) && coy.nextRandom(integer7++) == 0) {
+        if (!Layers.isShallowOcean(integer5) && cxn.nextRandom(integer7++) == 0) {
             integer8 = integer5;
         }
-        if (!Layers.isShallowOcean(integer4) && coy.nextRandom(integer7++) == 0) {
+        if (!Layers.isShallowOcean(integer4) && cxn.nextRandom(integer7++) == 0) {
             integer8 = integer4;
         }
-        if (!Layers.isShallowOcean(integer2) && coy.nextRandom(integer7++) == 0) {
+        if (!Layers.isShallowOcean(integer2) && cxn.nextRandom(integer7++) == 0) {
             integer8 = integer2;
         }
-        if (!Layers.isShallowOcean(integer3) && coy.nextRandom(integer7++) == 0) {
+        if (!Layers.isShallowOcean(integer3) && cxn.nextRandom(integer7++) == 0) {
             integer8 = integer3;
         }
-        if (coy.nextRandom(3) == 0) {
+        if (cxn.nextRandom(3) == 0) {
             return integer8;
         }
         return (integer8 == 4) ? 4 : integer6;
diff --git a/src/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.java b/src/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.java
index bfafefd..25da92d 100644
--- a/src/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.java
@@ -11,8 +11,8 @@ public enum AddMushroomIslandLayer implements BishopTransformer {
     private static final int MUSHROOM_FIELDS;
     
     @Override
-    public int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        if (Layers.isShallowOcean(integer6) && Layers.isShallowOcean(integer5) && Layers.isShallowOcean(integer2) && Layers.isShallowOcean(integer4) && Layers.isShallowOcean(integer3) && coy.nextRandom(100) == 0) {
+    public int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        if (Layers.isShallowOcean(integer6) && Layers.isShallowOcean(integer5) && Layers.isShallowOcean(integer2) && Layers.isShallowOcean(integer4) && Layers.isShallowOcean(integer3) && cxn.nextRandom(100) == 0) {
             return AddMushroomIslandLayer.MUSHROOM_FIELDS;
         }
         return integer6;
diff --git a/src/net/minecraft/world/level/newbiome/layer/AddSnowLayer.java b/src/net/minecraft/world/level/newbiome/layer/AddSnowLayer.java
index 4c0268b..412d6dd 100644
--- a/src/net/minecraft/world/level/newbiome/layer/AddSnowLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/AddSnowLayer.java
@@ -7,11 +7,11 @@ public enum AddSnowLayer implements C1Transformer {
     INSTANCE;
     
     @Override
-    public int apply(final Context coy, final int integer) {
+    public int apply(final Context cxn, final int integer) {
         if (Layers.isShallowOcean(integer)) {
             return integer;
         }
-        final int integer2 = coy.nextRandom(6);
+        final int integer2 = cxn.nextRandom(6);
         if (integer2 == 0) {
             return 4;
         }
diff --git a/src/net/minecraft/world/level/newbiome/layer/BiomeEdgeLayer.java b/src/net/minecraft/world/level/newbiome/layer/BiomeEdgeLayer.java
index db03b5f..204f3dd 100644
--- a/src/net/minecraft/world/level/newbiome/layer/BiomeEdgeLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/BiomeEdgeLayer.java
@@ -27,7 +27,7 @@ public enum BiomeEdgeLayer implements CastleTransformer {
     private static final int SNOWY_TAIGA;
     
     @Override
-    public int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+    public int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
         final int[] arr8 = { 0 };
         if (this.checkEdge(arr8, integer2, integer3, integer4, integer5, integer6, BiomeEdgeLayer.MOUNTAINS, BiomeEdgeLayer.MOUNTAIN_EDGE) || this.checkEdgeStrict(arr8, integer2, integer3, integer4, integer5, integer6, BiomeEdgeLayer.WOODED_BADLANDS_PLATEAU, BiomeEdgeLayer.BADLANDS) || this.checkEdgeStrict(arr8, integer2, integer3, integer4, integer5, integer6, BiomeEdgeLayer.BADLANDS_PLATEAU, BiomeEdgeLayer.BADLANDS) || this.checkEdgeStrict(arr8, integer2, integer3, integer4, integer5, integer6, BiomeEdgeLayer.GIANT_TREE_TAIGA, BiomeEdgeLayer.TAIGA)) {
             return arr8[0];
@@ -76,11 +76,11 @@ public enum BiomeEdgeLayer implements CastleTransformer {
         if (Layers.isSame(integer1, integer2)) {
             return true;
         }
-        final Biome bkt4 = Registry.BIOME.byId(integer1);
-        final Biome bkt5 = Registry.BIOME.byId(integer2);
-        if (bkt4 != null && bkt5 != null) {
-            final Biome.BiomeTempCategory c6 = bkt4.getTemperatureCategory();
-            final Biome.BiomeTempCategory c7 = bkt5.getTemperatureCategory();
+        final Biome bre4 = Registry.BIOME.byId(integer1);
+        final Biome bre5 = Registry.BIOME.byId(integer2);
+        if (bre4 != null && bre5 != null) {
+            final Biome.BiomeTempCategory c6 = bre4.getTemperatureCategory();
+            final Biome.BiomeTempCategory c7 = bre5.getTemperatureCategory();
             return c6 == c7 || c6 == Biome.BiomeTempCategory.MEDIUM || c7 == Biome.BiomeTempCategory.MEDIUM;
         }
         return false;
diff --git a/src/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.java b/src/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.java
index 2b6bde7..9d53ff6 100644
--- a/src/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.java
@@ -3,7 +3,6 @@ package net.minecraft.world.level.newbiome.layer;
 import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.newbiome.context.Context;
-import net.minecraft.world.level.LevelType;
 import net.minecraft.world.level.newbiome.layer.traits.C0Transformer;
 
 public class BiomeInitLayer implements C0Transformer {
@@ -28,25 +27,17 @@ public class BiomeInitLayer implements C0Transformer {
     private static final int[] MEDIUM_BIOMES;
     private static final int[] COLD_BIOMES;
     private static final int[] ICE_BIOMES;
-    private final int fixedBiome;
     private int[] warmBiomes;
     
-    public BiomeInitLayer(final LevelType bkd, final int integer) {
+    public BiomeInitLayer(final boolean boolean1) {
         this.warmBiomes = BiomeInitLayer.WARM_BIOMES;
-        if (bkd == LevelType.NORMAL_1_1) {
+        if (boolean1) {
             this.warmBiomes = BiomeInitLayer.LEGACY_WARM_BIOMES;
-            this.fixedBiome = -1;
-        }
-        else {
-            this.fixedBiome = integer;
         }
     }
     
     @Override
-    public int apply(final Context coy, int integer) {
-        if (this.fixedBiome >= 0) {
-            return this.fixedBiome;
-        }
+    public int apply(final Context cxn, int integer) {
         final int integer2 = (integer & 0xF00) >> 8;
         integer &= 0xFFFFF0FF;
         if (Layers.isOcean(integer) || integer == BiomeInitLayer.MUSHROOM_FIELDS) {
@@ -55,24 +46,24 @@ public class BiomeInitLayer implements C0Transformer {
         switch (integer) {
             case 1: {
                 if (integer2 > 0) {
-                    return (coy.nextRandom(3) == 0) ? BiomeInitLayer.BADLANDS_PLATEAU : BiomeInitLayer.WOODED_BADLANDS_PLATEAU;
+                    return (cxn.nextRandom(3) == 0) ? BiomeInitLayer.BADLANDS_PLATEAU : BiomeInitLayer.WOODED_BADLANDS_PLATEAU;
                 }
-                return this.warmBiomes[coy.nextRandom(this.warmBiomes.length)];
+                return this.warmBiomes[cxn.nextRandom(this.warmBiomes.length)];
             }
             case 2: {
                 if (integer2 > 0) {
                     return BiomeInitLayer.JUNGLE;
                 }
-                return BiomeInitLayer.MEDIUM_BIOMES[coy.nextRandom(BiomeInitLayer.MEDIUM_BIOMES.length)];
+                return BiomeInitLayer.MEDIUM_BIOMES[cxn.nextRandom(BiomeInitLayer.MEDIUM_BIOMES.length)];
             }
             case 3: {
                 if (integer2 > 0) {
                     return BiomeInitLayer.GIANT_TREE_TAIGA;
                 }
-                return BiomeInitLayer.COLD_BIOMES[coy.nextRandom(BiomeInitLayer.COLD_BIOMES.length)];
+                return BiomeInitLayer.COLD_BIOMES[cxn.nextRandom(BiomeInitLayer.COLD_BIOMES.length)];
             }
             case 4: {
-                return BiomeInitLayer.ICE_BIOMES[coy.nextRandom(BiomeInitLayer.ICE_BIOMES.length)];
+                return BiomeInitLayer.ICE_BIOMES[cxn.nextRandom(BiomeInitLayer.ICE_BIOMES.length)];
             }
             default: {
                 return BiomeInitLayer.MUSHROOM_FIELDS;
diff --git a/src/net/minecraft/world/level/newbiome/layer/IslandLayer.java b/src/net/minecraft/world/level/newbiome/layer/IslandLayer.java
index ddcd056..917f0b2 100644
--- a/src/net/minecraft/world/level/newbiome/layer/IslandLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/IslandLayer.java
@@ -7,10 +7,10 @@ public enum IslandLayer implements AreaTransformer0 {
     INSTANCE;
     
     @Override
-    public int applyPixel(final Context coy, final int integer2, final int integer3) {
+    public int applyPixel(final Context cxn, final int integer2, final int integer3) {
         if (integer2 == 0 && integer3 == 0) {
             return 1;
         }
-        return (coy.nextRandom(10) == 0) ? 1 : Layers.OCEAN;
+        return (cxn.nextRandom(10) == 0) ? 1 : Layers.OCEAN;
     }
 }
diff --git a/src/net/minecraft/world/level/newbiome/layer/Layer.java b/src/net/minecraft/world/level/newbiome/layer/Layer.java
index 8b90bfd..9dd99f5 100644
--- a/src/net/minecraft/world/level/newbiome/layer/Layer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/Layer.java
@@ -14,14 +14,14 @@ public class Layer {
     private static final Logger LOGGER;
     private final LazyArea area;
     
-    public Layer(final AreaFactory<LazyArea> cou) {
-        this.area = cou.make();
+    public Layer(final AreaFactory<LazyArea> cxj) {
+        this.area = cxj.make();
     }
     
     private Biome getBiome(final int integer) {
-        final Biome bkt3 = Registry.BIOME.byId(integer);
-        if (bkt3 != null) {
-            return bkt3;
+        final Biome bre3 = Registry.BIOME.byId(integer);
+        if (bre3 != null) {
+            return bre3;
         }
         if (SharedConstants.IS_RUNNING_IN_IDE) {
             throw Util.<IllegalStateException>pauseInIde(new IllegalStateException("Unknown biome id: " + integer));
diff --git a/src/net/minecraft/world/level/newbiome/layer/Layers.java b/src/net/minecraft/world/level/newbiome/layer/Layers.java
index 9b486c9..bd2ce3b 100644
--- a/src/net/minecraft/world/level/newbiome/layer/Layers.java
+++ b/src/net/minecraft/world/level/newbiome/layer/Layers.java
@@ -5,8 +5,6 @@ import net.minecraft.core.Registry;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.newbiome.area.LazyArea;
 import net.minecraft.world.level.newbiome.context.LazyAreaContext;
-import net.minecraft.world.level.levelgen.OverworldGeneratorSettings;
-import net.minecraft.world.level.LevelType;
 import net.minecraft.world.level.newbiome.context.BigContext;
 import net.minecraft.world.level.newbiome.area.Area;
 import java.util.function.LongFunction;
@@ -25,88 +23,86 @@ public class Layers {
     protected static final int DEEP_COLD_OCEAN;
     protected static final int DEEP_FROZEN_OCEAN;
     
-    private static <T extends Area, C extends BigContext<T>> AreaFactory<T> zoom(final long long1, final AreaTransformer1 cpz, final AreaFactory<T> cou, final int integer, final LongFunction<C> longFunction) {
-        AreaFactory<T> cou2 = cou;
+    private static <T extends Area, C extends BigContext<T>> AreaFactory<T> zoom(final long long1, final AreaTransformer1 cyo, final AreaFactory<T> cxj, final int integer, final LongFunction<C> longFunction) {
+        AreaFactory<T> cxj2 = cxj;
         for (int integer2 = 0; integer2 < integer; ++integer2) {
-            cou2 = cpz.<T>run(longFunction.apply(long1 + integer2), cou2);
+            cxj2 = cyo.<T>run(longFunction.apply(long1 + integer2), cxj2);
         }
-        return cou2;
+        return cxj2;
     }
     
-    public static <T extends Area, C extends BigContext<T>> AreaFactory<T> getDefaultLayer(final LevelType bkd, final OverworldGeneratorSettings cbz, final LongFunction<C> longFunction) {
-        AreaFactory<T> cou4 = IslandLayer.INSTANCE.<T>run((BigContext<T>)longFunction.apply(1L));
-        cou4 = ZoomLayer.FUZZY.<T>run(longFunction.apply(2000L), cou4);
-        cou4 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(1L), cou4);
-        cou4 = ZoomLayer.NORMAL.<T>run(longFunction.apply(2001L), cou4);
-        cou4 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(2L), cou4);
-        cou4 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(50L), cou4);
-        cou4 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(70L), cou4);
-        cou4 = RemoveTooMuchOceanLayer.INSTANCE.<T>run(longFunction.apply(2L), cou4);
-        AreaFactory<T> cou5 = OceanLayer.INSTANCE.<T>run((BigContext<T>)longFunction.apply(2L));
-        cou5 = Layers.<T, C>zoom(2001L, ZoomLayer.NORMAL, cou5, 6, longFunction);
-        cou4 = AddSnowLayer.INSTANCE.<T>run(longFunction.apply(2L), cou4);
-        cou4 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(3L), cou4);
-        cou4 = AddEdgeLayer.CoolWarm.INSTANCE.<T>run(longFunction.apply(2L), cou4);
-        cou4 = AddEdgeLayer.HeatIce.INSTANCE.<T>run(longFunction.apply(2L), cou4);
-        cou4 = AddEdgeLayer.IntroduceSpecial.INSTANCE.<T>run(longFunction.apply(3L), cou4);
-        cou4 = ZoomLayer.NORMAL.<T>run(longFunction.apply(2002L), cou4);
-        cou4 = ZoomLayer.NORMAL.<T>run(longFunction.apply(2003L), cou4);
-        cou4 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(4L), cou4);
-        cou4 = AddMushroomIslandLayer.INSTANCE.<T>run(longFunction.apply(5L), cou4);
-        cou4 = AddDeepOceanLayer.INSTANCE.<T>run(longFunction.apply(4L), cou4);
-        cou4 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cou4, 0, longFunction);
-        final int integer6 = (bkd == LevelType.LARGE_BIOMES) ? 6 : cbz.getBiomeSize();
-        final int integer7 = cbz.getRiverSize();
-        AreaFactory<T> cou6 = cou4;
-        cou6 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cou6, 0, longFunction);
-        cou6 = RiverInitLayer.INSTANCE.<T>run(longFunction.apply(100L), cou6);
-        AreaFactory<T> cou7 = cou4;
-        cou7 = new BiomeInitLayer(bkd, cbz.getFixedBiome()).<T>run(longFunction.apply(200L), cou7);
-        cou7 = RareBiomeLargeLayer.INSTANCE.<T>run(longFunction.apply(1001L), cou7);
-        cou7 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cou7, 2, longFunction);
-        cou7 = BiomeEdgeLayer.INSTANCE.<T>run(longFunction.apply(1000L), cou7);
-        AreaFactory<T> cou8 = cou6;
-        cou8 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cou8, 2, longFunction);
-        cou7 = RegionHillsLayer.INSTANCE.<T>run(longFunction.apply(1000L), cou7, cou8);
-        cou6 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cou6, 2, longFunction);
-        cou6 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cou6, integer7, longFunction);
-        cou6 = RiverLayer.INSTANCE.<T>run(longFunction.apply(1L), cou6);
-        cou6 = SmoothLayer.INSTANCE.<T>run(longFunction.apply(1000L), cou6);
-        cou7 = RareBiomeSpotLayer.INSTANCE.<T>run(longFunction.apply(1001L), cou7);
-        for (int integer8 = 0; integer8 < integer6; ++integer8) {
-            cou7 = ZoomLayer.NORMAL.<T>run(longFunction.apply(1000 + integer8), cou7);
-            if (integer8 == 0) {
-                cou7 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(3L), cou7);
+    private static <T extends Area, C extends BigContext<T>> AreaFactory<T> getDefaultLayer(final boolean boolean1, final int integer2, final int integer3, final LongFunction<C> longFunction) {
+        AreaFactory<T> cxj5 = IslandLayer.INSTANCE.<T>run((BigContext<T>)longFunction.apply(1L));
+        cxj5 = ZoomLayer.FUZZY.<T>run(longFunction.apply(2000L), cxj5);
+        cxj5 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(1L), cxj5);
+        cxj5 = ZoomLayer.NORMAL.<T>run(longFunction.apply(2001L), cxj5);
+        cxj5 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(2L), cxj5);
+        cxj5 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(50L), cxj5);
+        cxj5 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(70L), cxj5);
+        cxj5 = RemoveTooMuchOceanLayer.INSTANCE.<T>run(longFunction.apply(2L), cxj5);
+        AreaFactory<T> cxj6 = OceanLayer.INSTANCE.<T>run((BigContext<T>)longFunction.apply(2L));
+        cxj6 = Layers.<T, C>zoom(2001L, ZoomLayer.NORMAL, cxj6, 6, longFunction);
+        cxj5 = AddSnowLayer.INSTANCE.<T>run(longFunction.apply(2L), cxj5);
+        cxj5 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(3L), cxj5);
+        cxj5 = AddEdgeLayer.CoolWarm.INSTANCE.<T>run(longFunction.apply(2L), cxj5);
+        cxj5 = AddEdgeLayer.HeatIce.INSTANCE.<T>run(longFunction.apply(2L), cxj5);
+        cxj5 = AddEdgeLayer.IntroduceSpecial.INSTANCE.<T>run(longFunction.apply(3L), cxj5);
+        cxj5 = ZoomLayer.NORMAL.<T>run(longFunction.apply(2002L), cxj5);
+        cxj5 = ZoomLayer.NORMAL.<T>run(longFunction.apply(2003L), cxj5);
+        cxj5 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(4L), cxj5);
+        cxj5 = AddMushroomIslandLayer.INSTANCE.<T>run(longFunction.apply(5L), cxj5);
+        cxj5 = AddDeepOceanLayer.INSTANCE.<T>run(longFunction.apply(4L), cxj5);
+        AreaFactory<T> cxj7;
+        cxj5 = (cxj7 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cxj5, 0, longFunction));
+        cxj7 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cxj7, 0, longFunction);
+        cxj7 = RiverInitLayer.INSTANCE.<T>run(longFunction.apply(100L), cxj7);
+        AreaFactory<T> cxj8 = cxj5;
+        cxj8 = new BiomeInitLayer(boolean1).<T>run(longFunction.apply(200L), cxj8);
+        cxj8 = RareBiomeLargeLayer.INSTANCE.<T>run(longFunction.apply(1001L), cxj8);
+        cxj8 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cxj8, 2, longFunction);
+        cxj8 = BiomeEdgeLayer.INSTANCE.<T>run(longFunction.apply(1000L), cxj8);
+        AreaFactory<T> cxj9 = cxj7;
+        cxj9 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cxj9, 2, longFunction);
+        cxj8 = RegionHillsLayer.INSTANCE.<T>run(longFunction.apply(1000L), cxj8, cxj9);
+        cxj7 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cxj7, 2, longFunction);
+        cxj7 = Layers.<T, C>zoom(1000L, ZoomLayer.NORMAL, cxj7, integer3, longFunction);
+        cxj7 = RiverLayer.INSTANCE.<T>run(longFunction.apply(1L), cxj7);
+        cxj7 = SmoothLayer.INSTANCE.<T>run(longFunction.apply(1000L), cxj7);
+        cxj8 = RareBiomeSpotLayer.INSTANCE.<T>run(longFunction.apply(1001L), cxj8);
+        for (int integer4 = 0; integer4 < integer2; ++integer4) {
+            cxj8 = ZoomLayer.NORMAL.<T>run(longFunction.apply(1000 + integer4), cxj8);
+            if (integer4 == 0) {
+                cxj8 = AddIslandLayer.INSTANCE.<T>run(longFunction.apply(3L), cxj8);
             }
-            if (integer8 == 1 || integer6 == 1) {
-                cou7 = ShoreLayer.INSTANCE.<T>run(longFunction.apply(1000L), cou7);
+            if (integer4 == 1 || integer2 == 1) {
+                cxj8 = ShoreLayer.INSTANCE.<T>run(longFunction.apply(1000L), cxj8);
             }
         }
-        cou7 = SmoothLayer.INSTANCE.<T>run(longFunction.apply(1000L), cou7);
-        cou7 = RiverMixerLayer.INSTANCE.<T>run(longFunction.apply(100L), cou7, cou6);
-        cou7 = OceanMixerLayer.INSTANCE.<T>run(longFunction.apply(100L), cou7, cou5);
-        return cou7;
+        cxj8 = SmoothLayer.INSTANCE.<T>run(longFunction.apply(1000L), cxj8);
+        cxj8 = RiverMixerLayer.INSTANCE.<T>run(longFunction.apply(100L), cxj8, cxj7);
+        cxj8 = OceanMixerLayer.INSTANCE.<T>run(longFunction.apply(100L), cxj8, cxj6);
+        return cxj8;
     }
     
-    public static Layer getDefaultLayer(final long long1, final LevelType bkd, final OverworldGeneratorSettings cbz) {
+    public static Layer getDefaultLayer(final long long1, final boolean boolean2, final int integer3, final int integer4) {
         final int integer5 = 25;
-        final AreaFactory<LazyArea> cou6 = Layers.<LazyArea, LazyAreaContext>getDefaultLayer(bkd, cbz, long2 -> new LazyAreaContext(25, long1, long2));
-        return new Layer(cou6);
+        final AreaFactory<LazyArea> cxj7 = Layers.<LazyArea, LazyAreaContext>getDefaultLayer(boolean2, integer3, integer4, long2 -> new LazyAreaContext(25, long1, long2));
+        return new Layer(cxj7);
     }
     
     public static boolean isSame(final int integer1, final int integer2) {
         if (integer1 == integer2) {
             return true;
         }
-        final Biome bkt3 = Registry.BIOME.byId(integer1);
-        final Biome bkt4 = Registry.BIOME.byId(integer2);
-        if (bkt3 == null || bkt4 == null) {
+        final Biome bre3 = Registry.BIOME.byId(integer1);
+        final Biome bre4 = Registry.BIOME.byId(integer2);
+        if (bre3 == null || bre4 == null) {
             return false;
         }
-        if (bkt3 == Biomes.WOODED_BADLANDS_PLATEAU || bkt3 == Biomes.BADLANDS_PLATEAU) {
-            return bkt4 == Biomes.WOODED_BADLANDS_PLATEAU || bkt4 == Biomes.BADLANDS_PLATEAU;
+        if (bre3 == Biomes.WOODED_BADLANDS_PLATEAU || bre3 == Biomes.BADLANDS_PLATEAU) {
+            return bre4 == Biomes.WOODED_BADLANDS_PLATEAU || bre4 == Biomes.BADLANDS_PLATEAU;
         }
-        return (bkt3.getBiomeCategory() != Biome.BiomeCategory.NONE && bkt4.getBiomeCategory() != Biome.BiomeCategory.NONE && bkt3.getBiomeCategory() == bkt4.getBiomeCategory()) || bkt3 == bkt4;
+        return (bre3.getBiomeCategory() != Biome.BiomeCategory.NONE && bre4.getBiomeCategory() != Biome.BiomeCategory.NONE && bre3.getBiomeCategory() == bre4.getBiomeCategory()) || bre3 == bre4;
     }
     
     protected static boolean isOcean(final int integer) {
diff --git a/src/net/minecraft/world/level/newbiome/layer/OceanLayer.java b/src/net/minecraft/world/level/newbiome/layer/OceanLayer.java
index 74252d6..301938f 100644
--- a/src/net/minecraft/world/level/newbiome/layer/OceanLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/OceanLayer.java
@@ -8,9 +8,9 @@ public enum OceanLayer implements AreaTransformer0 {
     INSTANCE;
     
     @Override
-    public int applyPixel(final Context coy, final int integer2, final int integer3) {
-        final ImprovedNoise cnm5 = coy.getBiomeNoise();
-        final double double6 = cnm5.noise(integer2 / 8.0, integer3 / 8.0, 0.0, 0.0, 0.0);
+    public int applyPixel(final Context cxn, final int integer2, final int integer3) {
+        final ImprovedNoise cwc5 = cxn.getBiomeNoise();
+        final double double6 = cwc5.noise(integer2 / 8.0, integer3 / 8.0, 0.0, 0.0, 0.0);
         if (double6 > 0.4) {
             return Layers.WARM_OCEAN;
         }
diff --git a/src/net/minecraft/world/level/newbiome/layer/OceanMixerLayer.java b/src/net/minecraft/world/level/newbiome/layer/OceanMixerLayer.java
index 9416396..706bedc 100644
--- a/src/net/minecraft/world/level/newbiome/layer/OceanMixerLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/OceanMixerLayer.java
@@ -9,9 +9,9 @@ public enum OceanMixerLayer implements AreaTransformer2, DimensionOffset0Transfo
     INSTANCE;
     
     @Override
-    public int applyPixel(final Context coy, final Area cot2, final Area cot3, final int integer4, final int integer5) {
-        final int integer6 = cot2.get(this.getParentX(integer4), this.getParentY(integer5));
-        final int integer7 = cot3.get(this.getParentX(integer4), this.getParentY(integer5));
+    public int applyPixel(final Context cxn, final Area cxi2, final Area cxi3, final int integer4, final int integer5) {
+        final int integer6 = cxi2.get(this.getParentX(integer4), this.getParentY(integer5));
+        final int integer7 = cxi3.get(this.getParentX(integer4), this.getParentY(integer5));
         if (!Layers.isOcean(integer6)) {
             return integer6;
         }
@@ -19,7 +19,7 @@ public enum OceanMixerLayer implements AreaTransformer2, DimensionOffset0Transfo
         final int integer9 = 4;
         for (int integer10 = -8; integer10 <= 8; integer10 += 4) {
             for (int integer11 = -8; integer11 <= 8; integer11 += 4) {
-                final int integer12 = cot2.get(this.getParentX(integer4 + integer10), this.getParentY(integer5 + integer11));
+                final int integer12 = cxi2.get(this.getParentX(integer4 + integer10), this.getParentY(integer5 + integer11));
                 if (!Layers.isOcean(integer12)) {
                     if (integer7 == Layers.WARM_OCEAN) {
                         return Layers.LUKEWARM_OCEAN;
diff --git a/src/net/minecraft/world/level/newbiome/layer/RareBiomeLargeLayer.java b/src/net/minecraft/world/level/newbiome/layer/RareBiomeLargeLayer.java
index 24643c7..a8b2db2 100644
--- a/src/net/minecraft/world/level/newbiome/layer/RareBiomeLargeLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/RareBiomeLargeLayer.java
@@ -12,8 +12,8 @@ public enum RareBiomeLargeLayer implements C1Transformer {
     private static final int BAMBOO_JUNGLE;
     
     @Override
-    public int apply(final Context coy, final int integer) {
-        if (coy.nextRandom(10) == 0 && integer == RareBiomeLargeLayer.JUNGLE) {
+    public int apply(final Context cxn, final int integer) {
+        if (cxn.nextRandom(10) == 0 && integer == RareBiomeLargeLayer.JUNGLE) {
             return RareBiomeLargeLayer.BAMBOO_JUNGLE;
         }
         return integer;
diff --git a/src/net/minecraft/world/level/newbiome/layer/RareBiomeSpotLayer.java b/src/net/minecraft/world/level/newbiome/layer/RareBiomeSpotLayer.java
index 1bac81f..c9ccf97 100644
--- a/src/net/minecraft/world/level/newbiome/layer/RareBiomeSpotLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/RareBiomeSpotLayer.java
@@ -12,8 +12,8 @@ public enum RareBiomeSpotLayer implements C1Transformer {
     private static final int SUNFLOWER_PLAINS;
     
     @Override
-    public int apply(final Context coy, final int integer) {
-        if (coy.nextRandom(57) == 0 && integer == RareBiomeSpotLayer.PLAINS) {
+    public int apply(final Context cxn, final int integer) {
+        if (cxn.nextRandom(57) == 0 && integer == RareBiomeSpotLayer.PLAINS) {
             return RareBiomeSpotLayer.SUNFLOWER_PLAINS;
         }
         return integer;
diff --git a/src/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.java b/src/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.java
index 4b330c7..eba7537 100644
--- a/src/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.java
@@ -42,21 +42,21 @@ public enum RegionHillsLayer implements AreaTransformer2, DimensionOffset1Transf
     private static final int TAIGA_HILLS;
     
     @Override
-    public int applyPixel(final Context coy, final Area cot2, final Area cot3, final int integer4, final int integer5) {
-        final int integer6 = cot2.get(this.getParentX(integer4 + 1), this.getParentY(integer5 + 1));
-        final int integer7 = cot3.get(this.getParentX(integer4 + 1), this.getParentY(integer5 + 1));
+    public int applyPixel(final Context cxn, final Area cxi2, final Area cxi3, final int integer4, final int integer5) {
+        final int integer6 = cxi2.get(this.getParentX(integer4 + 1), this.getParentY(integer5 + 1));
+        final int integer7 = cxi3.get(this.getParentX(integer4 + 1), this.getParentY(integer5 + 1));
         if (integer6 > 255) {
             RegionHillsLayer.LOGGER.debug("old! {}", integer6);
         }
         final int integer8 = (integer7 - 2) % 29;
         if (!Layers.isShallowOcean(integer6) && integer7 >= 2 && integer8 == 1) {
-            final Biome bkt10 = Registry.BIOME.byId(integer6);
-            if (bkt10 == null || !bkt10.isMutated()) {
-                final Biome bkt11 = Biome.getMutatedVariant(bkt10);
-                return (bkt11 == null) ? integer6 : Registry.BIOME.getId(bkt11);
+            final Biome bre10 = Registry.BIOME.byId(integer6);
+            if (bre10 == null || !bre10.isMutated()) {
+                final Biome bre11 = Biome.getMutatedVariant(bre10);
+                return (bre11 == null) ? integer6 : Registry.BIOME.getId(bre11);
             }
         }
-        if (coy.nextRandom(3) == 0 || integer8 == 0) {
+        if (cxn.nextRandom(3) == 0 || integer8 == 0) {
             int integer9;
             if ((integer9 = integer6) == RegionHillsLayer.DESERT) {
                 integer9 = RegionHillsLayer.DESERT_HILLS;
@@ -80,7 +80,7 @@ public enum RegionHillsLayer implements AreaTransformer2, DimensionOffset1Transf
                 integer9 = RegionHillsLayer.SNOWY_TAIGA_HILLS;
             }
             else if (integer6 == RegionHillsLayer.PLAINS) {
-                integer9 = ((coy.nextRandom(3) == 0) ? RegionHillsLayer.WOODED_HILLS : RegionHillsLayer.FOREST);
+                integer9 = ((cxn.nextRandom(3) == 0) ? RegionHillsLayer.WOODED_HILLS : RegionHillsLayer.FOREST);
             }
             else if (integer6 == RegionHillsLayer.SNOWY_TUNDRA) {
                 integer9 = RegionHillsLayer.SNOWY_MOUNTAIN;
@@ -112,25 +112,25 @@ public enum RegionHillsLayer implements AreaTransformer2, DimensionOffset1Transf
             else if (Layers.isSame(integer6, RegionHillsLayer.WOODED_BADLANDS_PLATEAU)) {
                 integer9 = RegionHillsLayer.BADLANDS;
             }
-            else if ((integer6 == Layers.DEEP_OCEAN || integer6 == Layers.DEEP_LUKEWARM_OCEAN || integer6 == Layers.DEEP_COLD_OCEAN || integer6 == Layers.DEEP_FROZEN_OCEAN) && coy.nextRandom(3) == 0) {
-                integer9 = ((coy.nextRandom(2) == 0) ? RegionHillsLayer.PLAINS : RegionHillsLayer.FOREST);
+            else if ((integer6 == Layers.DEEP_OCEAN || integer6 == Layers.DEEP_LUKEWARM_OCEAN || integer6 == Layers.DEEP_COLD_OCEAN || integer6 == Layers.DEEP_FROZEN_OCEAN) && cxn.nextRandom(3) == 0) {
+                integer9 = ((cxn.nextRandom(2) == 0) ? RegionHillsLayer.PLAINS : RegionHillsLayer.FOREST);
             }
             if (integer8 == 0 && integer9 != integer6) {
-                final Biome bkt11 = Biome.getMutatedVariant(Registry.BIOME.byId(integer9));
-                integer9 = ((bkt11 == null) ? integer6 : Registry.BIOME.getId(bkt11));
+                final Biome bre11 = Biome.getMutatedVariant(Registry.BIOME.byId(integer9));
+                integer9 = ((bre11 == null) ? integer6 : Registry.BIOME.getId(bre11));
             }
             if (integer9 != integer6) {
                 int integer10 = 0;
-                if (Layers.isSame(cot2.get(this.getParentX(integer4 + 1), this.getParentY(integer5 + 0)), integer6)) {
+                if (Layers.isSame(cxi2.get(this.getParentX(integer4 + 1), this.getParentY(integer5 + 0)), integer6)) {
                     ++integer10;
                 }
-                if (Layers.isSame(cot2.get(this.getParentX(integer4 + 2), this.getParentY(integer5 + 1)), integer6)) {
+                if (Layers.isSame(cxi2.get(this.getParentX(integer4 + 2), this.getParentY(integer5 + 1)), integer6)) {
                     ++integer10;
                 }
-                if (Layers.isSame(cot2.get(this.getParentX(integer4 + 0), this.getParentY(integer5 + 1)), integer6)) {
+                if (Layers.isSame(cxi2.get(this.getParentX(integer4 + 0), this.getParentY(integer5 + 1)), integer6)) {
                     ++integer10;
                 }
-                if (Layers.isSame(cot2.get(this.getParentX(integer4 + 1), this.getParentY(integer5 + 2)), integer6)) {
+                if (Layers.isSame(cxi2.get(this.getParentX(integer4 + 1), this.getParentY(integer5 + 2)), integer6)) {
                     ++integer10;
                 }
                 if (integer10 >= 3) {
diff --git a/src/net/minecraft/world/level/newbiome/layer/RemoveTooMuchOceanLayer.java b/src/net/minecraft/world/level/newbiome/layer/RemoveTooMuchOceanLayer.java
index c76de3f..d183409 100644
--- a/src/net/minecraft/world/level/newbiome/layer/RemoveTooMuchOceanLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/RemoveTooMuchOceanLayer.java
@@ -7,8 +7,8 @@ public enum RemoveTooMuchOceanLayer implements CastleTransformer {
     INSTANCE;
     
     @Override
-    public int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        if (Layers.isShallowOcean(integer6) && Layers.isShallowOcean(integer2) && Layers.isShallowOcean(integer3) && Layers.isShallowOcean(integer5) && Layers.isShallowOcean(integer4) && coy.nextRandom(2) == 0) {
+    public int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        if (Layers.isShallowOcean(integer6) && Layers.isShallowOcean(integer2) && Layers.isShallowOcean(integer3) && Layers.isShallowOcean(integer5) && Layers.isShallowOcean(integer4) && cxn.nextRandom(2) == 0) {
             return 1;
         }
         return integer6;
diff --git a/src/net/minecraft/world/level/newbiome/layer/RiverInitLayer.java b/src/net/minecraft/world/level/newbiome/layer/RiverInitLayer.java
index 50737f9..24667bb 100644
--- a/src/net/minecraft/world/level/newbiome/layer/RiverInitLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/RiverInitLayer.java
@@ -7,7 +7,7 @@ public enum RiverInitLayer implements C0Transformer {
     INSTANCE;
     
     @Override
-    public int apply(final Context coy, final int integer) {
-        return Layers.isShallowOcean(integer) ? integer : (coy.nextRandom(299999) + 2);
+    public int apply(final Context cxn, final int integer) {
+        return Layers.isShallowOcean(integer) ? integer : (cxn.nextRandom(299999) + 2);
     }
 }
diff --git a/src/net/minecraft/world/level/newbiome/layer/RiverLayer.java b/src/net/minecraft/world/level/newbiome/layer/RiverLayer.java
index 0b5502b..bc6224c 100644
--- a/src/net/minecraft/world/level/newbiome/layer/RiverLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/RiverLayer.java
@@ -11,7 +11,7 @@ public enum RiverLayer implements CastleTransformer {
     public static final int RIVER;
     
     @Override
-    public int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+    public int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
         final int integer7 = riverFilter(integer6);
         if (integer7 == riverFilter(integer5) && integer7 == riverFilter(integer2) && integer7 == riverFilter(integer3) && integer7 == riverFilter(integer4)) {
             return -1;
diff --git a/src/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.java b/src/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.java
index 76b95ce..fe60095 100644
--- a/src/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.java
@@ -17,9 +17,9 @@ public enum RiverMixerLayer implements AreaTransformer2, DimensionOffset0Transfo
     private static final int RIVER;
     
     @Override
-    public int applyPixel(final Context coy, final Area cot2, final Area cot3, final int integer4, final int integer5) {
-        final int integer6 = cot2.get(this.getParentX(integer4), this.getParentY(integer5));
-        final int integer7 = cot3.get(this.getParentX(integer4), this.getParentY(integer5));
+    public int applyPixel(final Context cxn, final Area cxi2, final Area cxi3, final int integer4, final int integer5) {
+        final int integer6 = cxi2.get(this.getParentX(integer4), this.getParentY(integer5));
+        final int integer7 = cxi3.get(this.getParentX(integer4), this.getParentY(integer5));
         if (Layers.isOcean(integer6)) {
             return integer6;
         }
diff --git a/src/net/minecraft/world/level/newbiome/layer/ShoreLayer.java b/src/net/minecraft/world/level/newbiome/layer/ShoreLayer.java
index dbe8f35..5a16c76 100644
--- a/src/net/minecraft/world/level/newbiome/layer/ShoreLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/ShoreLayer.java
@@ -33,14 +33,14 @@ public enum ShoreLayer implements CastleTransformer {
     private static final int TAIGA;
     
     @Override
-    public int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
-        final Biome bkt8 = Registry.BIOME.byId(integer6);
+    public int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+        final Biome bre8 = Registry.BIOME.byId(integer6);
         if (integer6 == ShoreLayer.MUSHROOM_FIELDS) {
             if (Layers.isShallowOcean(integer2) || Layers.isShallowOcean(integer3) || Layers.isShallowOcean(integer4) || Layers.isShallowOcean(integer5)) {
                 return ShoreLayer.MUSHROOM_FIELD_SHORE;
             }
         }
-        else if (bkt8 != null && bkt8.getBiomeCategory() == Biome.BiomeCategory.JUNGLE) {
+        else if (bre8 != null && bre8.getBiomeCategory() == Biome.BiomeCategory.JUNGLE) {
             if (!isJungleCompatible(integer2) || !isJungleCompatible(integer3) || !isJungleCompatible(integer4) || !isJungleCompatible(integer5)) {
                 return ShoreLayer.JUNGLE_EDGE;
             }
@@ -53,7 +53,7 @@ public enum ShoreLayer implements CastleTransformer {
                 return ShoreLayer.STONE_SHORE;
             }
         }
-        else if (bkt8 != null && bkt8.getPrecipitation() == Biome.Precipitation.SNOW) {
+        else if (bre8 != null && bre8.getPrecipitation() == Biome.Precipitation.SNOW) {
             if (!Layers.isOcean(integer6) && (Layers.isOcean(integer2) || Layers.isOcean(integer3) || Layers.isOcean(integer4) || Layers.isOcean(integer5))) {
                 return ShoreLayer.SNOWY_BEACH;
             }
diff --git a/src/net/minecraft/world/level/newbiome/layer/SmoothLayer.java b/src/net/minecraft/world/level/newbiome/layer/SmoothLayer.java
index 29f32e7..89af573 100644
--- a/src/net/minecraft/world/level/newbiome/layer/SmoothLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/SmoothLayer.java
@@ -7,14 +7,14 @@ public enum SmoothLayer implements CastleTransformer {
     INSTANCE;
     
     @Override
-    public int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
+    public int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6) {
         final boolean boolean8 = integer3 == integer5;
         final boolean boolean9 = integer2 == integer4;
         if (boolean8 != boolean9) {
             return boolean8 ? integer5 : integer2;
         }
         if (boolean8) {
-            return (coy.nextRandom(2) == 0) ? integer5 : integer2;
+            return (cxn.nextRandom(2) == 0) ? integer5 : integer2;
         }
         return integer6;
     }
diff --git a/src/net/minecraft/world/level/newbiome/layer/ZoomLayer.java b/src/net/minecraft/world/level/newbiome/layer/ZoomLayer.java
index b7b9abb..eb4d98f 100644
--- a/src/net/minecraft/world/level/newbiome/layer/ZoomLayer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/ZoomLayer.java
@@ -8,8 +8,8 @@ public enum ZoomLayer implements AreaTransformer1 {
     NORMAL, 
     FUZZY {
         @Override
-        protected int modeOrRandom(final BigContext<?> cox, final int integer2, final int integer3, final int integer4, final int integer5) {
-            return cox.random(integer2, integer3, integer4, integer5);
+        protected int modeOrRandom(final BigContext<?> cxm, final int integer2, final int integer3, final int integer4, final int integer5) {
+            return cxm.random(integer2, integer3, integer4, integer5);
         }
     };
     
@@ -24,29 +24,29 @@ public enum ZoomLayer implements AreaTransformer1 {
     }
     
     @Override
-    public int applyPixel(final BigContext<?> cox, final Area cot, final int integer3, final int integer4) {
-        final int integer5 = cot.get(this.getParentX(integer3), this.getParentY(integer4));
-        cox.initRandom(integer3 >> 1 << 1, integer4 >> 1 << 1);
+    public int applyPixel(final BigContext<?> cxm, final Area cxi, final int integer3, final int integer4) {
+        final int integer5 = cxi.get(this.getParentX(integer3), this.getParentY(integer4));
+        cxm.initRandom(integer3 >> 1 << 1, integer4 >> 1 << 1);
         final int integer6 = integer3 & 0x1;
         final int integer7 = integer4 & 0x1;
         if (integer6 == 0 && integer7 == 0) {
             return integer5;
         }
-        final int integer8 = cot.get(this.getParentX(integer3), this.getParentY(integer4 + 1));
-        final int integer9 = cox.random(integer5, integer8);
+        final int integer8 = cxi.get(this.getParentX(integer3), this.getParentY(integer4 + 1));
+        final int integer9 = cxm.random(integer5, integer8);
         if (integer6 == 0 && integer7 == 1) {
             return integer9;
         }
-        final int integer10 = cot.get(this.getParentX(integer3 + 1), this.getParentY(integer4));
-        final int integer11 = cox.random(integer5, integer10);
+        final int integer10 = cxi.get(this.getParentX(integer3 + 1), this.getParentY(integer4));
+        final int integer11 = cxm.random(integer5, integer10);
         if (integer6 == 1 && integer7 == 0) {
             return integer11;
         }
-        final int integer12 = cot.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 1));
-        return this.modeOrRandom(cox, integer5, integer10, integer8, integer12);
+        final int integer12 = cxi.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 1));
+        return this.modeOrRandom(cxm, integer5, integer10, integer8, integer12);
     }
     
-    protected int modeOrRandom(final BigContext<?> cox, final int integer2, final int integer3, final int integer4, final int integer5) {
+    protected int modeOrRandom(final BigContext<?> cxm, final int integer2, final int integer3, final int integer4, final int integer5) {
         if (integer3 == integer4 && integer4 == integer5) {
             return integer3;
         }
@@ -77,6 +77,6 @@ public enum ZoomLayer implements AreaTransformer1 {
         if (integer4 == integer5 && integer2 != integer3) {
             return integer4;
         }
-        return cox.random(integer2, integer3, integer4, integer5);
+        return cxm.random(integer2, integer3, integer4, integer5);
     }
 }
diff --git a/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer0.java b/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer0.java
index 52cd705..e1f00dc 100644
--- a/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer0.java
+++ b/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer0.java
@@ -6,12 +6,12 @@ import net.minecraft.world.level.newbiome.area.Area;
 import net.minecraft.world.level.newbiome.context.BigContext;
 
 public interface AreaTransformer0 {
-    default <R extends Area> AreaFactory<R> run(final BigContext<R> cox) {
-        return () -> cox.createResult((integer2, integer3) -> {
-            cox.initRandom(integer2, integer3);
-            return this.applyPixel(cox, integer2, integer3);
+    default <R extends Area> AreaFactory<R> run(final BigContext<R> cxm) {
+        return () -> cxm.createResult((integer2, integer3) -> {
+            cxm.initRandom(integer2, integer3);
+            return this.applyPixel(cxm, integer2, integer3);
         });
     }
     
-    int applyPixel(final Context coy, final int integer2, final int integer3);
+    int applyPixel(final Context cxn, final int integer2, final int integer3);
 }
diff --git a/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer1.java b/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer1.java
index c294d5d..6eeec43 100644
--- a/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer1.java
+++ b/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer1.java
@@ -5,17 +5,17 @@ import net.minecraft.world.level.newbiome.area.AreaFactory;
 import net.minecraft.world.level.newbiome.context.BigContext;
 
 public interface AreaTransformer1 extends DimensionTransformer {
-    default <R extends Area> AreaFactory<R> run(final BigContext<R> cox, final AreaFactory<R> cou) {
-        final Area cot4;
-        final Area cot5;
+    default <R extends Area> AreaFactory<R> run(final BigContext<R> cxm, final AreaFactory<R> cxj) {
+        final Area cxi4;
+        final Area cxi5;
         return () -> {
-            cot4 = cou.make();
-            return cox.createResult((integer3, integer4) -> {
-                cox.initRandom(integer3, integer4);
-                return this.applyPixel(cox, cot5, integer3, integer4);
-            }, (R)cot4);
+            cxi4 = cxj.make();
+            return cxm.createResult((integer3, integer4) -> {
+                cxm.initRandom(integer3, integer4);
+                return this.applyPixel(cxm, cxi5, integer3, integer4);
+            }, (R)cxi4);
         };
     }
     
-    int applyPixel(final BigContext<?> cox, final Area cot, final int integer3, final int integer4);
+    int applyPixel(final BigContext<?> cxm, final Area cxi, final int integer3, final int integer4);
 }
diff --git a/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer2.java b/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer2.java
index 9edbbb8..1693d57 100644
--- a/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer2.java
+++ b/src/net/minecraft/world/level/newbiome/layer/traits/AreaTransformer2.java
@@ -6,20 +6,20 @@ import net.minecraft.world.level.newbiome.area.AreaFactory;
 import net.minecraft.world.level.newbiome.context.BigContext;
 
 public interface AreaTransformer2 extends DimensionTransformer {
-    default <R extends Area> AreaFactory<R> run(final BigContext<R> cox, final AreaFactory<R> cou2, final AreaFactory<R> cou3) {
-        final Area cot5;
-        final Area cot6;
-        final Area cot7;
-        final Area cot8;
+    default <R extends Area> AreaFactory<R> run(final BigContext<R> cxm, final AreaFactory<R> cxj2, final AreaFactory<R> cxj3) {
+        final Area cxi5;
+        final Area cxi6;
+        final Area cxi7;
+        final Area cxi8;
         return () -> {
-            cot5 = cou2.make();
-            cot6 = cou3.make();
-            return cox.createResult((integer4, integer5) -> {
-                cox.initRandom(integer4, integer5);
-                return this.applyPixel(cox, cot7, cot8, integer4, integer5);
-            }, (R)cot5, (R)cot6);
+            cxi5 = cxj2.make();
+            cxi6 = cxj3.make();
+            return cxm.createResult((integer4, integer5) -> {
+                cxm.initRandom(integer4, integer5);
+                return this.applyPixel(cxm, cxi7, cxi8, integer4, integer5);
+            }, (R)cxi5, (R)cxi6);
         };
     }
     
-    int applyPixel(final Context coy, final Area cot2, final Area cot3, final int integer4, final int integer5);
+    int applyPixel(final Context cxn, final Area cxi2, final Area cxi3, final int integer4, final int integer5);
 }
diff --git a/src/net/minecraft/world/level/newbiome/layer/traits/BishopTransformer.java b/src/net/minecraft/world/level/newbiome/layer/traits/BishopTransformer.java
index e7df641..c66f4fc 100644
--- a/src/net/minecraft/world/level/newbiome/layer/traits/BishopTransformer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/traits/BishopTransformer.java
@@ -5,9 +5,9 @@ import net.minecraft.world.level.newbiome.context.BigContext;
 import net.minecraft.world.level.newbiome.context.Context;
 
 public interface BishopTransformer extends AreaTransformer1, DimensionOffset1Transformer {
-    int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6);
+    int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6);
     
-    default int applyPixel(final BigContext<?> cox, final Area cot, final int integer3, final int integer4) {
-        return this.apply(cox, cot.get(this.getParentX(integer3 + 0), this.getParentY(integer4 + 2)), cot.get(this.getParentX(integer3 + 2), this.getParentY(integer4 + 2)), cot.get(this.getParentX(integer3 + 2), this.getParentY(integer4 + 0)), cot.get(this.getParentX(integer3 + 0), this.getParentY(integer4 + 0)), cot.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 1)));
+    default int applyPixel(final BigContext<?> cxm, final Area cxi, final int integer3, final int integer4) {
+        return this.apply(cxm, cxi.get(this.getParentX(integer3 + 0), this.getParentY(integer4 + 2)), cxi.get(this.getParentX(integer3 + 2), this.getParentY(integer4 + 2)), cxi.get(this.getParentX(integer3 + 2), this.getParentY(integer4 + 0)), cxi.get(this.getParentX(integer3 + 0), this.getParentY(integer4 + 0)), cxi.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 1)));
     }
 }
diff --git a/src/net/minecraft/world/level/newbiome/layer/traits/C0Transformer.java b/src/net/minecraft/world/level/newbiome/layer/traits/C0Transformer.java
index 4d3a6b5..32e9631 100644
--- a/src/net/minecraft/world/level/newbiome/layer/traits/C0Transformer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/traits/C0Transformer.java
@@ -5,9 +5,9 @@ import net.minecraft.world.level.newbiome.context.BigContext;
 import net.minecraft.world.level.newbiome.context.Context;
 
 public interface C0Transformer extends AreaTransformer1, DimensionOffset0Transformer {
-    int apply(final Context coy, final int integer);
+    int apply(final Context cxn, final int integer);
     
-    default int applyPixel(final BigContext<?> cox, final Area cot, final int integer3, final int integer4) {
-        return this.apply(cox, cot.get(this.getParentX(integer3), this.getParentY(integer4)));
+    default int applyPixel(final BigContext<?> cxm, final Area cxi, final int integer3, final int integer4) {
+        return this.apply(cxm, cxi.get(this.getParentX(integer3), this.getParentY(integer4)));
     }
 }
diff --git a/src/net/minecraft/world/level/newbiome/layer/traits/C1Transformer.java b/src/net/minecraft/world/level/newbiome/layer/traits/C1Transformer.java
index 074047e..056580b 100644
--- a/src/net/minecraft/world/level/newbiome/layer/traits/C1Transformer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/traits/C1Transformer.java
@@ -5,10 +5,10 @@ import net.minecraft.world.level.newbiome.context.BigContext;
 import net.minecraft.world.level.newbiome.context.Context;
 
 public interface C1Transformer extends AreaTransformer1, DimensionOffset1Transformer {
-    int apply(final Context coy, final int integer);
+    int apply(final Context cxn, final int integer);
     
-    default int applyPixel(final BigContext<?> cox, final Area cot, final int integer3, final int integer4) {
-        final int integer5 = cot.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 1));
-        return this.apply(cox, integer5);
+    default int applyPixel(final BigContext<?> cxm, final Area cxi, final int integer3, final int integer4) {
+        final int integer5 = cxi.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 1));
+        return this.apply(cxm, integer5);
     }
 }
diff --git a/src/net/minecraft/world/level/newbiome/layer/traits/CastleTransformer.java b/src/net/minecraft/world/level/newbiome/layer/traits/CastleTransformer.java
index 3d33bba..31cc8c3 100644
--- a/src/net/minecraft/world/level/newbiome/layer/traits/CastleTransformer.java
+++ b/src/net/minecraft/world/level/newbiome/layer/traits/CastleTransformer.java
@@ -5,9 +5,9 @@ import net.minecraft.world.level.newbiome.context.BigContext;
 import net.minecraft.world.level.newbiome.context.Context;
 
 public interface CastleTransformer extends AreaTransformer1, DimensionOffset1Transformer {
-    int apply(final Context coy, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6);
+    int apply(final Context cxn, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6);
     
-    default int applyPixel(final BigContext<?> cox, final Area cot, final int integer3, final int integer4) {
-        return this.apply(cox, cot.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 0)), cot.get(this.getParentX(integer3 + 2), this.getParentY(integer4 + 1)), cot.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 2)), cot.get(this.getParentX(integer3 + 0), this.getParentY(integer4 + 1)), cot.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 1)));
+    default int applyPixel(final BigContext<?> cxm, final Area cxi, final int integer3, final int integer4) {
+        return this.apply(cxm, cxi.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 0)), cxi.get(this.getParentX(integer3 + 2), this.getParentY(integer4 + 1)), cxi.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 2)), cxi.get(this.getParentX(integer3 + 0), this.getParentY(integer4 + 1)), cxi.get(this.getParentX(integer3 + 1), this.getParentY(integer4 + 1)));
     }
 }
diff --git a/src/net/minecraft/world/level/pathfinder/BinaryHeap.java b/src/net/minecraft/world/level/pathfinder/BinaryHeap.java
index 85b0d3b..8ed894c 100644
--- a/src/net/minecraft/world/level/pathfinder/BinaryHeap.java
+++ b/src/net/minecraft/world/level/pathfinder/BinaryHeap.java
@@ -8,8 +8,8 @@ public class BinaryHeap {
         this.heap = new Node[128];
     }
     
-    public Node insert(final Node cqo) {
-        if (cqo.heapIdx >= 0) {
+    public Node insert(final Node czd) {
+        if (czd.heapIdx >= 0) {
             throw new IllegalStateException("OW KNOWS!");
         }
         if (this.size == this.heap.length) {
@@ -17,10 +17,10 @@ public class BinaryHeap {
             System.arraycopy(this.heap, 0, arr3, 0, this.size);
             this.heap = arr3;
         }
-        this.heap[this.size] = cqo;
-        cqo.heapIdx = this.size;
+        this.heap[this.size] = czd;
+        czd.heapIdx = this.size;
         this.upHeap(this.size++);
-        return cqo;
+        return czd;
     }
     
     public void clear() {
@@ -28,7 +28,7 @@ public class BinaryHeap {
     }
     
     public Node pop() {
-        final Node cqo2 = this.heap[0];
+        final Node czd2 = this.heap[0];
         final Node[] heap = this.heap;
         final int n = 0;
         final Node[] heap2 = this.heap;
@@ -39,78 +39,78 @@ public class BinaryHeap {
         if (this.size > 0) {
             this.downHeap(0);
         }
-        cqo2.heapIdx = -1;
-        return cqo2;
+        czd2.heapIdx = -1;
+        return czd2;
     }
     
-    public void changeCost(final Node cqo, final float float2) {
-        final float float3 = cqo.f;
-        cqo.f = float2;
+    public void changeCost(final Node czd, final float float2) {
+        final float float3 = czd.f;
+        czd.f = float2;
         if (float2 < float3) {
-            this.upHeap(cqo.heapIdx);
+            this.upHeap(czd.heapIdx);
         }
         else {
-            this.downHeap(cqo.heapIdx);
+            this.downHeap(czd.heapIdx);
         }
     }
     
     private void upHeap(int integer) {
-        final Node cqo3 = this.heap[integer];
-        final float float4 = cqo3.f;
+        final Node czd3 = this.heap[integer];
+        final float float4 = czd3.f;
         while (integer > 0) {
             final int integer2 = integer - 1 >> 1;
-            final Node cqo4 = this.heap[integer2];
-            if (float4 >= cqo4.f) {
+            final Node czd4 = this.heap[integer2];
+            if (float4 >= czd4.f) {
                 break;
             }
-            this.heap[integer] = cqo4;
-            cqo4.heapIdx = integer;
+            this.heap[integer] = czd4;
+            czd4.heapIdx = integer;
             integer = integer2;
         }
-        this.heap[integer] = cqo3;
-        cqo3.heapIdx = integer;
+        this.heap[integer] = czd3;
+        czd3.heapIdx = integer;
     }
     
     private void downHeap(int integer) {
-        final Node cqo3 = this.heap[integer];
-        final float float4 = cqo3.f;
+        final Node czd3 = this.heap[integer];
+        final float float4 = czd3.f;
         while (true) {
             final int integer2 = 1 + (integer << 1);
             final int integer3 = integer2 + 1;
             if (integer2 >= this.size) {
                 break;
             }
-            final Node cqo4 = this.heap[integer2];
-            final float float5 = cqo4.f;
-            Node cqo5;
+            final Node czd4 = this.heap[integer2];
+            final float float5 = czd4.f;
+            Node czd5;
             float float6;
             if (integer3 >= this.size) {
-                cqo5 = null;
+                czd5 = null;
                 float6 = Float.POSITIVE_INFINITY;
             }
             else {
-                cqo5 = this.heap[integer3];
-                float6 = cqo5.f;
+                czd5 = this.heap[integer3];
+                float6 = czd5.f;
             }
             if (float5 < float6) {
                 if (float5 >= float4) {
                     break;
                 }
-                this.heap[integer] = cqo4;
-                cqo4.heapIdx = integer;
+                this.heap[integer] = czd4;
+                czd4.heapIdx = integer;
                 integer = integer2;
             }
             else {
                 if (float6 >= float4) {
                     break;
                 }
-                this.heap[integer] = cqo5;
-                cqo5.heapIdx = integer;
+                this.heap[integer] = czd5;
+                czd5.heapIdx = integer;
                 integer = integer3;
             }
         }
-        this.heap[integer] = cqo3;
-        cqo3.heapIdx = integer;
+        this.heap[integer] = czd3;
+        czd3.heapIdx = integer;
     }
     
     public boolean isEmpty() {
diff --git a/src/net/minecraft/world/level/pathfinder/BlockPathTypes.java b/src/net/minecraft/world/level/pathfinder/BlockPathTypes.java
index 297eb84..bace8b0 100644
--- a/src/net/minecraft/world/level/pathfinder/BlockPathTypes.java
+++ b/src/net/minecraft/world/level/pathfinder/BlockPathTypes.java
@@ -10,6 +10,7 @@ public enum BlockPathTypes {
     WATER(8.0f), 
     WATER_BORDER(8.0f), 
     RAIL(0.0f), 
+    UNPASSABLE_RAIL(-1.0f), 
     DANGER_FIRE(8.0f), 
     DAMAGE_FIRE(16.0f), 
     DANGER_CACTUS(8.0f), 
diff --git a/src/net/minecraft/world/level/pathfinder/FlyNodeEvaluator.java b/src/net/minecraft/world/level/pathfinder/FlyNodeEvaluator.java
index ddeaf86..ed94578 100644
--- a/src/net/minecraft/world/level/pathfinder/FlyNodeEvaluator.java
+++ b/src/net/minecraft/world/level/pathfinder/FlyNodeEvaluator.java
@@ -1,5 +1,8 @@
 package net.minecraft.world.level.pathfinder;
 
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import java.util.EnumSet;
 import net.minecraft.world.level.BlockGetter;
 import javax.annotation.Nullable;
@@ -7,7 +10,6 @@ import java.util.Iterator;
 import java.util.Set;
 import net.minecraft.world.level.block.Block;
 import com.google.common.collect.Sets;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
@@ -16,9 +18,9 @@ import net.minecraft.world.level.PathNavigationRegion;
 
 public class FlyNodeEvaluator extends WalkNodeEvaluator {
     @Override
-    public void prepare(final PathNavigationRegion bkh, final Mob ala) {
-        super.prepare(bkh, ala);
-        this.oldWaterCost = ala.getPathfindingMalus(BlockPathTypes.WATER);
+    public void prepare(final PathNavigationRegion bql, final Mob aoz) {
+        super.prepare(bql, aoz);
+        this.oldWaterCost = aoz.getPathfindingMalus(BlockPathTypes.WATER);
     }
     
     @Override
@@ -33,7 +35,7 @@ public class FlyNodeEvaluator extends WalkNodeEvaluator {
         if (this.canFloat() && this.mob.isInWater()) {
             integer2 = Mth.floor(this.mob.getY());
             final BlockPos.MutableBlockPos a3 = new BlockPos.MutableBlockPos(this.mob.getX(), integer2, this.mob.getZ());
-            for (Block bph4 = this.level.getBlockState(a3).getBlock(); bph4 == Blocks.WATER; bph4 = this.level.getBlockState(a3).getBlock()) {
+            for (Block bvr4 = this.level.getBlockState(a3).getBlock(); bvr4 == Blocks.WATER; bvr4 = this.level.getBlockState(a3).getBlock()) {
                 ++integer2;
                 a3.set(this.mob.getX(), integer2, this.mob.getZ());
             }
@@ -41,22 +43,22 @@ public class FlyNodeEvaluator extends WalkNodeEvaluator {
         else {
             integer2 = Mth.floor(this.mob.getY() + 0.5);
         }
-        final BlockPos fk3 = new BlockPos(this.mob);
-        final BlockPathTypes cqm4 = this.getBlockPathType(this.mob, fk3.getX(), integer2, fk3.getZ());
-        if (this.mob.getPathfindingMalus(cqm4) < 0.0f) {
+        final BlockPos fu3 = this.mob.blockPosition();
+        final BlockPathTypes czb4 = this.getBlockPathType(this.mob, fu3.getX(), integer2, fu3.getZ());
+        if (this.mob.getPathfindingMalus(czb4) < 0.0f) {
             final Set<BlockPos> set5 = Sets.newHashSet();
             set5.add(new BlockPos(this.mob.getBoundingBox().minX, integer2, this.mob.getBoundingBox().minZ));
             set5.add(new BlockPos(this.mob.getBoundingBox().minX, integer2, this.mob.getBoundingBox().maxZ));
             set5.add(new BlockPos(this.mob.getBoundingBox().maxX, integer2, this.mob.getBoundingBox().minZ));
             set5.add(new BlockPos(this.mob.getBoundingBox().maxX, integer2, this.mob.getBoundingBox().maxZ));
-            for (final BlockPos fk4 : set5) {
-                final BlockPathTypes cqm5 = this.getBlockPathType(this.mob, fk4);
-                if (this.mob.getPathfindingMalus(cqm5) >= 0.0f) {
-                    return super.getNode(fk4.getX(), fk4.getY(), fk4.getZ());
+            for (final BlockPos fu4 : set5) {
+                final BlockPathTypes czb5 = this.getBlockPathType(this.mob, fu4);
+                if (this.mob.getPathfindingMalus(czb5) >= 0.0f) {
+                    return super.getNode(fu4.getX(), fu4.getY(), fu4.getZ());
                 }
             }
         }
-        return super.getNode(fk3.getX(), integer2, fk3.getZ());
+        return super.getNode(fu3.getX(), integer2, fu3.getZ());
     }
     
     @Override
@@ -65,205 +67,206 @@ public class FlyNodeEvaluator extends WalkNodeEvaluator {
     }
     
     @Override
-    public int getNeighbors(final Node[] arr, final Node cqo) {
+    public int getNeighbors(final Node[] arr, final Node czd) {
         int integer4 = 0;
-        final Node cqo2 = this.getNode(cqo.x, cqo.y, cqo.z + 1);
-        if (this.isOpen(cqo2)) {
-            arr[integer4++] = cqo2;
+        final Node czd2 = this.getNode(czd.x, czd.y, czd.z + 1);
+        if (this.isOpen(czd2)) {
+            arr[integer4++] = czd2;
         }
-        final Node cqo3 = this.getNode(cqo.x - 1, cqo.y, cqo.z);
-        if (this.isOpen(cqo3)) {
-            arr[integer4++] = cqo3;
+        final Node czd3 = this.getNode(czd.x - 1, czd.y, czd.z);
+        if (this.isOpen(czd3)) {
+            arr[integer4++] = czd3;
         }
-        final Node cqo4 = this.getNode(cqo.x + 1, cqo.y, cqo.z);
-        if (this.isOpen(cqo4)) {
-            arr[integer4++] = cqo4;
+        final Node czd4 = this.getNode(czd.x + 1, czd.y, czd.z);
+        if (this.isOpen(czd4)) {
+            arr[integer4++] = czd4;
         }
-        final Node cqo5 = this.getNode(cqo.x, cqo.y, cqo.z - 1);
-        if (this.isOpen(cqo5)) {
-            arr[integer4++] = cqo5;
+        final Node czd5 = this.getNode(czd.x, czd.y, czd.z - 1);
+        if (this.isOpen(czd5)) {
+            arr[integer4++] = czd5;
         }
-        final Node cqo6 = this.getNode(cqo.x, cqo.y + 1, cqo.z);
-        if (this.isOpen(cqo6)) {
-            arr[integer4++] = cqo6;
+        final Node czd6 = this.getNode(czd.x, czd.y + 1, czd.z);
+        if (this.isOpen(czd6)) {
+            arr[integer4++] = czd6;
         }
-        final Node cqo7 = this.getNode(cqo.x, cqo.y - 1, cqo.z);
-        if (this.isOpen(cqo7)) {
-            arr[integer4++] = cqo7;
+        final Node czd7 = this.getNode(czd.x, czd.y - 1, czd.z);
+        if (this.isOpen(czd7)) {
+            arr[integer4++] = czd7;
         }
-        final Node cqo8 = this.getNode(cqo.x, cqo.y + 1, cqo.z + 1);
-        if (this.isOpen(cqo8) && this.hasMalus(cqo2) && this.hasMalus(cqo6)) {
-            arr[integer4++] = cqo8;
+        final Node czd8 = this.getNode(czd.x, czd.y + 1, czd.z + 1);
+        if (this.isOpen(czd8) && this.hasMalus(czd2) && this.hasMalus(czd6)) {
+            arr[integer4++] = czd8;
         }
-        final Node cqo9 = this.getNode(cqo.x - 1, cqo.y + 1, cqo.z);
-        if (this.isOpen(cqo9) && this.hasMalus(cqo3) && this.hasMalus(cqo6)) {
-            arr[integer4++] = cqo9;
+        final Node czd9 = this.getNode(czd.x - 1, czd.y + 1, czd.z);
+        if (this.isOpen(czd9) && this.hasMalus(czd3) && this.hasMalus(czd6)) {
+            arr[integer4++] = czd9;
         }
-        final Node cqo10 = this.getNode(cqo.x + 1, cqo.y + 1, cqo.z);
-        if (this.isOpen(cqo10) && this.hasMalus(cqo4) && this.hasMalus(cqo6)) {
-            arr[integer4++] = cqo10;
+        final Node czd10 = this.getNode(czd.x + 1, czd.y + 1, czd.z);
+        if (this.isOpen(czd10) && this.hasMalus(czd4) && this.hasMalus(czd6)) {
+            arr[integer4++] = czd10;
         }
-        final Node cqo11 = this.getNode(cqo.x, cqo.y + 1, cqo.z - 1);
-        if (this.isOpen(cqo11) && this.hasMalus(cqo5) && this.hasMalus(cqo6)) {
-            arr[integer4++] = cqo11;
+        final Node czd11 = this.getNode(czd.x, czd.y + 1, czd.z - 1);
+        if (this.isOpen(czd11) && this.hasMalus(czd5) && this.hasMalus(czd6)) {
+            arr[integer4++] = czd11;
         }
-        final Node cqo12 = this.getNode(cqo.x, cqo.y - 1, cqo.z + 1);
-        if (this.isOpen(cqo12) && this.hasMalus(cqo2) && this.hasMalus(cqo7)) {
-            arr[integer4++] = cqo12;
+        final Node czd12 = this.getNode(czd.x, czd.y - 1, czd.z + 1);
+        if (this.isOpen(czd12) && this.hasMalus(czd2) && this.hasMalus(czd7)) {
+            arr[integer4++] = czd12;
         }
-        final Node cqo13 = this.getNode(cqo.x - 1, cqo.y - 1, cqo.z);
-        if (this.isOpen(cqo13) && this.hasMalus(cqo3) && this.hasMalus(cqo7)) {
-            arr[integer4++] = cqo13;
+        final Node czd13 = this.getNode(czd.x - 1, czd.y - 1, czd.z);
+        if (this.isOpen(czd13) && this.hasMalus(czd3) && this.hasMalus(czd7)) {
+            arr[integer4++] = czd13;
         }
-        final Node cqo14 = this.getNode(cqo.x + 1, cqo.y - 1, cqo.z);
-        if (this.isOpen(cqo14) && this.hasMalus(cqo4) && this.hasMalus(cqo7)) {
-            arr[integer4++] = cqo14;
+        final Node czd14 = this.getNode(czd.x + 1, czd.y - 1, czd.z);
+        if (this.isOpen(czd14) && this.hasMalus(czd4) && this.hasMalus(czd7)) {
+            arr[integer4++] = czd14;
         }
-        final Node cqo15 = this.getNode(cqo.x, cqo.y - 1, cqo.z - 1);
-        if (this.isOpen(cqo15) && this.hasMalus(cqo5) && this.hasMalus(cqo7)) {
-            arr[integer4++] = cqo15;
+        final Node czd15 = this.getNode(czd.x, czd.y - 1, czd.z - 1);
+        if (this.isOpen(czd15) && this.hasMalus(czd5) && this.hasMalus(czd7)) {
+            arr[integer4++] = czd15;
         }
-        final Node cqo16 = this.getNode(cqo.x + 1, cqo.y, cqo.z - 1);
-        if (this.isOpen(cqo16) && this.hasMalus(cqo5) && this.hasMalus(cqo4)) {
-            arr[integer4++] = cqo16;
+        final Node czd16 = this.getNode(czd.x + 1, czd.y, czd.z - 1);
+        if (this.isOpen(czd16) && this.hasMalus(czd5) && this.hasMalus(czd4)) {
+            arr[integer4++] = czd16;
         }
-        final Node cqo17 = this.getNode(cqo.x + 1, cqo.y, cqo.z + 1);
-        if (this.isOpen(cqo17) && this.hasMalus(cqo2) && this.hasMalus(cqo4)) {
-            arr[integer4++] = cqo17;
+        final Node czd17 = this.getNode(czd.x + 1, czd.y, czd.z + 1);
+        if (this.isOpen(czd17) && this.hasMalus(czd2) && this.hasMalus(czd4)) {
+            arr[integer4++] = czd17;
         }
-        final Node cqo18 = this.getNode(cqo.x - 1, cqo.y, cqo.z - 1);
-        if (this.isOpen(cqo18) && this.hasMalus(cqo5) && this.hasMalus(cqo3)) {
-            arr[integer4++] = cqo18;
+        final Node czd18 = this.getNode(czd.x - 1, czd.y, czd.z - 1);
+        if (this.isOpen(czd18) && this.hasMalus(czd5) && this.hasMalus(czd3)) {
+            arr[integer4++] = czd18;
         }
-        final Node cqo19 = this.getNode(cqo.x - 1, cqo.y, cqo.z + 1);
-        if (this.isOpen(cqo19) && this.hasMalus(cqo2) && this.hasMalus(cqo3)) {
-            arr[integer4++] = cqo19;
+        final Node czd19 = this.getNode(czd.x - 1, czd.y, czd.z + 1);
+        if (this.isOpen(czd19) && this.hasMalus(czd2) && this.hasMalus(czd3)) {
+            arr[integer4++] = czd19;
         }
-        final Node cqo20 = this.getNode(cqo.x + 1, cqo.y + 1, cqo.z - 1);
-        if (this.isOpen(cqo20) && this.hasMalus(cqo16) && this.hasMalus(cqo11) && this.hasMalus(cqo10)) {
-            arr[integer4++] = cqo20;
+        final Node czd20 = this.getNode(czd.x + 1, czd.y + 1, czd.z - 1);
+        if (this.isOpen(czd20) && this.hasMalus(czd16) && this.hasMalus(czd5) && this.hasMalus(czd4) && this.hasMalus(czd6) && this.hasMalus(czd11) && this.hasMalus(czd10)) {
+            arr[integer4++] = czd20;
         }
-        final Node cqo21 = this.getNode(cqo.x + 1, cqo.y + 1, cqo.z + 1);
-        if (this.isOpen(cqo21) && this.hasMalus(cqo17) && this.hasMalus(cqo8) && this.hasMalus(cqo10)) {
-            arr[integer4++] = cqo21;
+        final Node czd21 = this.getNode(czd.x + 1, czd.y + 1, czd.z + 1);
+        if (this.isOpen(czd21) && this.hasMalus(czd17) && this.hasMalus(czd2) && this.hasMalus(czd4) && this.hasMalus(czd6) && this.hasMalus(czd8) && this.hasMalus(czd10)) {
+            arr[integer4++] = czd21;
         }
-        final Node cqo22 = this.getNode(cqo.x - 1, cqo.y + 1, cqo.z - 1);
-        if (this.isOpen(cqo22) && this.hasMalus(cqo18) && this.hasMalus(cqo11) && this.hasMalus(cqo9)) {
-            arr[integer4++] = cqo22;
+        final Node czd22 = this.getNode(czd.x - 1, czd.y + 1, czd.z - 1);
+        if (this.isOpen(czd22) && this.hasMalus(czd18) && this.hasMalus(czd5) && (this.hasMalus(czd3) & this.hasMalus(czd6)) && this.hasMalus(czd11) && this.hasMalus(czd9)) {
+            arr[integer4++] = czd22;
         }
-        final Node cqo23 = this.getNode(cqo.x - 1, cqo.y + 1, cqo.z + 1);
-        if (this.isOpen(cqo23) && this.hasMalus(cqo19) && this.hasMalus(cqo8) && this.hasMalus(cqo9)) {
-            arr[integer4++] = cqo23;
+        final Node czd23 = this.getNode(czd.x - 1, czd.y + 1, czd.z + 1);
+        if (this.isOpen(czd23) && this.hasMalus(czd19) && this.hasMalus(czd2) && (this.hasMalus(czd3) & this.hasMalus(czd6)) && this.hasMalus(czd8) && this.hasMalus(czd9)) {
+            arr[integer4++] = czd23;
         }
-        final Node cqo24 = this.getNode(cqo.x + 1, cqo.y - 1, cqo.z - 1);
-        if (this.isOpen(cqo24) && this.hasMalus(cqo16) && this.hasMalus(cqo15) && this.hasMalus(cqo14)) {
-            arr[integer4++] = cqo24;
+        final Node czd24 = this.getNode(czd.x + 1, czd.y - 1, czd.z - 1);
+        if (this.isOpen(czd24) && this.hasMalus(czd16) && this.hasMalus(czd5) && this.hasMalus(czd4) && this.hasMalus(czd7) && this.hasMalus(czd15) && this.hasMalus(czd14)) {
+            arr[integer4++] = czd24;
         }
-        final Node cqo25 = this.getNode(cqo.x + 1, cqo.y - 1, cqo.z + 1);
-        if (this.isOpen(cqo25) && this.hasMalus(cqo17) && this.hasMalus(cqo12) && this.hasMalus(cqo14)) {
-            arr[integer4++] = cqo25;
+        final Node czd25 = this.getNode(czd.x + 1, czd.y - 1, czd.z + 1);
+        if (this.isOpen(czd25) && this.hasMalus(czd17) && this.hasMalus(czd2) && this.hasMalus(czd4) && this.hasMalus(czd7) && this.hasMalus(czd12) && this.hasMalus(czd14)) {
+            arr[integer4++] = czd25;
         }
-        final Node cqo26 = this.getNode(cqo.x - 1, cqo.y - 1, cqo.z - 1);
-        if (this.isOpen(cqo26) && this.hasMalus(cqo18) && this.hasMalus(cqo15) && this.hasMalus(cqo13)) {
-            arr[integer4++] = cqo26;
+        final Node czd26 = this.getNode(czd.x - 1, czd.y - 1, czd.z - 1);
+        if (this.isOpen(czd26) && this.hasMalus(czd18) && this.hasMalus(czd5) && this.hasMalus(czd3) && this.hasMalus(czd7) && this.hasMalus(czd15) && this.hasMalus(czd13)) {
+            arr[integer4++] = czd26;
         }
-        final Node cqo27 = this.getNode(cqo.x - 1, cqo.y - 1, cqo.z + 1);
-        if (this.isOpen(cqo27) && this.hasMalus(cqo19) && this.hasMalus(cqo12) && this.hasMalus(cqo13)) {
-            arr[integer4++] = cqo27;
+        final Node czd27 = this.getNode(czd.x - 1, czd.y - 1, czd.z + 1);
+        if (this.isOpen(czd27) && this.hasMalus(czd19) && this.hasMalus(czd2) && this.hasMalus(czd3) && this.hasMalus(czd7) && this.hasMalus(czd12) && this.hasMalus(czd13)) {
+            arr[integer4++] = czd27;
         }
         return integer4;
     }
     
-    private boolean hasMalus(@Nullable final Node cqo) {
-        return cqo != null && cqo.costMalus >= 0.0f;
+    private boolean hasMalus(@Nullable final Node czd) {
+        return czd != null && czd.costMalus >= 0.0f;
     }
     
-    private boolean isOpen(@Nullable final Node cqo) {
-        return cqo != null && !cqo.closed;
+    private boolean isOpen(@Nullable final Node czd) {
+        return czd != null && !czd.closed;
     }
     
     @Nullable
     @Override
     protected Node getNode(final int integer1, final int integer2, final int integer3) {
-        Node cqo5 = null;
-        final BlockPathTypes cqm6 = this.getBlockPathType(this.mob, integer1, integer2, integer3);
-        final float float7 = this.mob.getPathfindingMalus(cqm6);
+        Node czd5 = null;
+        final BlockPathTypes czb6 = this.getBlockPathType(this.mob, integer1, integer2, integer3);
+        final float float7 = this.mob.getPathfindingMalus(czb6);
         if (float7 >= 0.0f) {
-            cqo5 = super.getNode(integer1, integer2, integer3);
-            cqo5.type = cqm6;
-            cqo5.costMalus = Math.max(cqo5.costMalus, float7);
-            if (cqm6 == BlockPathTypes.WALKABLE) {
-                final Node node = cqo5;
+            czd5 = super.getNode(integer1, integer2, integer3);
+            czd5.type = czb6;
+            czd5.costMalus = Math.max(czd5.costMalus, float7);
+            if (czb6 == BlockPathTypes.WALKABLE) {
+                final Node node = czd5;
                 ++node.costMalus;
             }
         }
-        if (cqm6 == BlockPathTypes.OPEN || cqm6 == BlockPathTypes.WALKABLE) {
-            return cqo5;
+        if (czb6 == BlockPathTypes.OPEN || czb6 == BlockPathTypes.WALKABLE) {
+            return czd5;
         }
-        return cqo5;
+        return czd5;
     }
     
     @Override
-    public BlockPathTypes getBlockPathType(final BlockGetter bjg, final int integer2, final int integer3, final int integer4, final Mob ala, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10) {
+    public BlockPathTypes getBlockPathType(final BlockGetter bpg, final int integer2, final int integer3, final int integer4, final Mob aoz, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10) {
         final EnumSet<BlockPathTypes> enumSet12 = EnumSet.<BlockPathTypes>noneOf(BlockPathTypes.class);
-        BlockPathTypes cqm13 = BlockPathTypes.BLOCKED;
-        final BlockPos fk14 = new BlockPos(ala);
-        cqm13 = this.getBlockPathTypes(bjg, integer2, integer3, integer4, integer6, integer7, integer8, boolean9, boolean10, enumSet12, cqm13, fk14);
+        BlockPathTypes czb13 = BlockPathTypes.BLOCKED;
+        final BlockPos fu14 = aoz.blockPosition();
+        czb13 = this.getBlockPathTypes(bpg, integer2, integer3, integer4, integer6, integer7, integer8, boolean9, boolean10, enumSet12, czb13, fu14);
         if (enumSet12.contains(BlockPathTypes.FENCE)) {
             return BlockPathTypes.FENCE;
         }
-        BlockPathTypes cqm14 = BlockPathTypes.BLOCKED;
-        for (final BlockPathTypes cqm15 : enumSet12) {
-            if (ala.getPathfindingMalus(cqm15) < 0.0f) {
-                return cqm15;
+        BlockPathTypes czb14 = BlockPathTypes.BLOCKED;
+        for (final BlockPathTypes czb15 : enumSet12) {
+            if (aoz.getPathfindingMalus(czb15) < 0.0f) {
+                return czb15;
             }
-            if (ala.getPathfindingMalus(cqm15) < ala.getPathfindingMalus(cqm14)) {
+            if (aoz.getPathfindingMalus(czb15) < aoz.getPathfindingMalus(czb14)) {
                 continue;
             }
-            cqm14 = cqm15;
+            czb14 = czb15;
         }
-        if (cqm13 == BlockPathTypes.OPEN && ala.getPathfindingMalus(cqm14) == 0.0f) {
+        if (czb13 == BlockPathTypes.OPEN && aoz.getPathfindingMalus(czb14) == 0.0f) {
             return BlockPathTypes.OPEN;
         }
-        return cqm14;
+        return czb14;
     }
     
     @Override
-    public BlockPathTypes getBlockPathType(final BlockGetter bjg, final int integer2, final int integer3, final int integer4) {
-        BlockPathTypes cqm6 = WalkNodeEvaluator.getBlockPathTypeRaw(bjg, integer2, integer3, integer4);
-        if (cqm6 == BlockPathTypes.OPEN && integer3 >= 1) {
-            final Block bph7 = bjg.getBlockState(new BlockPos(integer2, integer3 - 1, integer4)).getBlock();
-            final BlockPathTypes cqm7 = WalkNodeEvaluator.getBlockPathTypeRaw(bjg, integer2, integer3 - 1, integer4);
-            if (cqm7 == BlockPathTypes.DAMAGE_FIRE || bph7 == Blocks.MAGMA_BLOCK || cqm7 == BlockPathTypes.LAVA || bph7 == Blocks.CAMPFIRE) {
-                cqm6 = BlockPathTypes.DAMAGE_FIRE;
+    public BlockPathTypes getBlockPathType(final BlockGetter bpg, final int integer2, final int integer3, final int integer4) {
+        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
+        BlockPathTypes czb7 = WalkNodeEvaluator.getBlockPathTypeRaw(bpg, a6.set(integer2, integer3, integer4));
+        if (czb7 == BlockPathTypes.OPEN && integer3 >= 1) {
+            final BlockState cfj8 = bpg.getBlockState(a6.set(integer2, integer3 - 1, integer4));
+            final BlockPathTypes czb8 = WalkNodeEvaluator.getBlockPathTypeRaw(bpg, a6.set(integer2, integer3 - 1, integer4));
+            if (czb8 == BlockPathTypes.DAMAGE_FIRE || cfj8.is(Blocks.MAGMA_BLOCK) || czb8 == BlockPathTypes.LAVA || cfj8.is(BlockTags.CAMPFIRES)) {
+                czb7 = BlockPathTypes.DAMAGE_FIRE;
             }
-            else if (cqm7 == BlockPathTypes.DAMAGE_CACTUS) {
-                cqm6 = BlockPathTypes.DAMAGE_CACTUS;
+            else if (czb8 == BlockPathTypes.DAMAGE_CACTUS) {
+                czb7 = BlockPathTypes.DAMAGE_CACTUS;
             }
-            else if (cqm7 == BlockPathTypes.DAMAGE_OTHER) {
-                cqm6 = BlockPathTypes.DAMAGE_OTHER;
+            else if (czb8 == BlockPathTypes.DAMAGE_OTHER) {
+                czb7 = BlockPathTypes.DAMAGE_OTHER;
             }
-            else if (cqm7 == BlockPathTypes.COCOA) {
-                cqm6 = BlockPathTypes.COCOA;
+            else if (czb8 == BlockPathTypes.COCOA) {
+                czb7 = BlockPathTypes.COCOA;
             }
-            else if (cqm7 == BlockPathTypes.FENCE) {
-                cqm6 = BlockPathTypes.FENCE;
+            else if (czb8 == BlockPathTypes.FENCE) {
+                czb7 = BlockPathTypes.FENCE;
             }
             else {
-                cqm6 = ((cqm7 == BlockPathTypes.WALKABLE || cqm7 == BlockPathTypes.OPEN || cqm7 == BlockPathTypes.WATER) ? BlockPathTypes.OPEN : BlockPathTypes.WALKABLE);
+                czb7 = ((czb8 == BlockPathTypes.WALKABLE || czb8 == BlockPathTypes.OPEN || czb8 == BlockPathTypes.WATER) ? BlockPathTypes.OPEN : BlockPathTypes.WALKABLE);
             }
         }
-        if (cqm6 == BlockPathTypes.WALKABLE || cqm6 == BlockPathTypes.OPEN) {
-            cqm6 = WalkNodeEvaluator.checkNeighbourBlocks(bjg, integer2, integer3, integer4, cqm6);
+        if (czb7 == BlockPathTypes.WALKABLE || czb7 == BlockPathTypes.OPEN) {
+            czb7 = WalkNodeEvaluator.checkNeighbourBlocks(bpg, a6.set(integer2, integer3, integer4), czb7);
         }
-        return cqm6;
+        return czb7;
     }
     
-    private BlockPathTypes getBlockPathType(final Mob ala, final BlockPos fk) {
-        return this.getBlockPathType(ala, fk.getX(), fk.getY(), fk.getZ());
+    private BlockPathTypes getBlockPathType(final Mob aoz, final BlockPos fu) {
+        return this.getBlockPathType(aoz, fu.getX(), fu.getY(), fu.getZ());
     }
     
-    private BlockPathTypes getBlockPathType(final Mob ala, final int integer2, final int integer3, final int integer4) {
-        return this.getBlockPathType(this.level, integer2, integer3, integer4, ala, this.entityWidth, this.entityHeight, this.entityDepth, this.canOpenDoors(), this.canPassDoors());
+    private BlockPathTypes getBlockPathType(final Mob aoz, final int integer2, final int integer3, final int integer4) {
+        return this.getBlockPathType(this.level, integer2, integer3, integer4, aoz, this.entityWidth, this.entityHeight, this.entityDepth, this.canOpenDoors(), this.canPassDoors());
     }
 }
diff --git a/src/net/minecraft/world/level/pathfinder/Node.java b/src/net/minecraft/world/level/pathfinder/Node.java
index 890189f..e9951c6 100644
--- a/src/net/minecraft/world/level/pathfinder/Node.java
+++ b/src/net/minecraft/world/level/pathfinder/Node.java
@@ -29,48 +29,48 @@ public class Node {
     }
     
     public Node cloneMove(final int integer1, final int integer2, final int integer3) {
-        final Node cqo5 = new Node(integer1, integer2, integer3);
-        cqo5.heapIdx = this.heapIdx;
-        cqo5.g = this.g;
-        cqo5.h = this.h;
-        cqo5.f = this.f;
-        cqo5.cameFrom = this.cameFrom;
-        cqo5.closed = this.closed;
-        cqo5.walkedDistance = this.walkedDistance;
-        cqo5.costMalus = this.costMalus;
-        cqo5.type = this.type;
-        return cqo5;
+        final Node czd5 = new Node(integer1, integer2, integer3);
+        czd5.heapIdx = this.heapIdx;
+        czd5.g = this.g;
+        czd5.h = this.h;
+        czd5.f = this.f;
+        czd5.cameFrom = this.cameFrom;
+        czd5.closed = this.closed;
+        czd5.walkedDistance = this.walkedDistance;
+        czd5.costMalus = this.costMalus;
+        czd5.type = this.type;
+        return czd5;
     }
     
     public static int createHash(final int integer1, final int integer2, final int integer3) {
         return (integer2 & 0xFF) | (integer1 & 0x7FFF) << 8 | (integer3 & 0x7FFF) << 24 | ((integer1 < 0) ? Integer.MIN_VALUE : 0) | ((integer3 < 0) ? 32768 : 0);
     }
     
-    public float distanceTo(final Node cqo) {
-        final float float3 = (float)(cqo.x - this.x);
-        final float float4 = (float)(cqo.y - this.y);
-        final float float5 = (float)(cqo.z - this.z);
+    public float distanceTo(final Node czd) {
+        final float float3 = (float)(czd.x - this.x);
+        final float float4 = (float)(czd.y - this.y);
+        final float float5 = (float)(czd.z - this.z);
         return Mth.sqrt(float3 * float3 + float4 * float4 + float5 * float5);
     }
     
-    public float distanceToSqr(final Node cqo) {
-        final float float3 = (float)(cqo.x - this.x);
-        final float float4 = (float)(cqo.y - this.y);
-        final float float5 = (float)(cqo.z - this.z);
+    public float distanceToSqr(final Node czd) {
+        final float float3 = (float)(czd.x - this.x);
+        final float float4 = (float)(czd.y - this.y);
+        final float float5 = (float)(czd.z - this.z);
         return float3 * float3 + float4 * float4 + float5 * float5;
     }
     
-    public float distanceManhattan(final Node cqo) {
-        final float float3 = (float)Math.abs(cqo.x - this.x);
-        final float float4 = (float)Math.abs(cqo.y - this.y);
-        final float float5 = (float)Math.abs(cqo.z - this.z);
+    public float distanceManhattan(final Node czd) {
+        final float float3 = (float)Math.abs(czd.x - this.x);
+        final float float4 = (float)Math.abs(czd.y - this.y);
+        final float float5 = (float)Math.abs(czd.z - this.z);
         return float3 + float4 + float5;
     }
     
-    public float distanceManhattan(final BlockPos fk) {
-        final float float3 = (float)Math.abs(fk.getX() - this.x);
-        final float float4 = (float)Math.abs(fk.getY() - this.y);
-        final float float5 = (float)Math.abs(fk.getZ() - this.z);
+    public float distanceManhattan(final BlockPos fu) {
+        final float float3 = (float)Math.abs(fu.getX() - this.x);
+        final float float4 = (float)Math.abs(fu.getY() - this.y);
+        final float float5 = (float)Math.abs(fu.getZ() - this.z);
         return float3 + float4 + float5;
     }
     
@@ -81,8 +81,8 @@ public class Node {
     @Override
     public boolean equals(final Object object) {
         if (object instanceof Node) {
-            final Node cqo3 = (Node)object;
-            return this.hash == cqo3.hash && this.x == cqo3.x && this.y == cqo3.y && this.z == cqo3.z;
+            final Node czd3 = (Node)object;
+            return this.hash == czd3.hash && this.x == czd3.x && this.y == czd3.y && this.z == czd3.z;
         }
         return false;
     }
@@ -101,13 +101,13 @@ public class Node {
         return "Node{x=" + this.x + ", y=" + this.y + ", z=" + this.z + '}';
     }
     
-    public static Node createFromStream(final FriendlyByteBuf kv) {
-        final Node cqo2 = new Node(kv.readInt(), kv.readInt(), kv.readInt());
-        cqo2.walkedDistance = kv.readFloat();
-        cqo2.costMalus = kv.readFloat();
-        cqo2.closed = kv.readBoolean();
-        cqo2.type = BlockPathTypes.values()[kv.readInt()];
-        cqo2.f = kv.readFloat();
-        return cqo2;
+    public static Node createFromStream(final FriendlyByteBuf mg) {
+        final Node czd2 = new Node(mg.readInt(), mg.readInt(), mg.readInt());
+        czd2.walkedDistance = mg.readFloat();
+        czd2.costMalus = mg.readFloat();
+        czd2.closed = mg.readBoolean();
+        czd2.type = BlockPathTypes.values()[mg.readInt()];
+        czd2.f = mg.readFloat();
+        return czd2;
     }
 }
diff --git a/src/net/minecraft/world/level/pathfinder/NodeEvaluator.java b/src/net/minecraft/world/level/pathfinder/NodeEvaluator.java
index 4d4997d..ad024d5 100644
--- a/src/net/minecraft/world/level/pathfinder/NodeEvaluator.java
+++ b/src/net/minecraft/world/level/pathfinder/NodeEvaluator.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.pathfinder;
 
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -22,13 +23,13 @@ public abstract class NodeEvaluator {
         this.nodes = (Int2ObjectMap<Node>)new Int2ObjectOpenHashMap();
     }
     
-    public void prepare(final PathNavigationRegion bkh, final Mob ala) {
-        this.level = bkh;
-        this.mob = ala;
+    public void prepare(final PathNavigationRegion bql, final Mob aoz) {
+        this.level = bql;
+        this.mob = aoz;
         this.nodes.clear();
-        this.entityWidth = Mth.floor(ala.getBbWidth() + 1.0f);
-        this.entityHeight = Mth.floor(ala.getBbHeight() + 1.0f);
-        this.entityDepth = Mth.floor(ala.getBbWidth() + 1.0f);
+        this.entityWidth = Mth.floor(aoz.getBbWidth() + 1.0f);
+        this.entityHeight = Mth.floor(aoz.getBbHeight() + 1.0f);
+        this.entityDepth = Mth.floor(aoz.getBbWidth() + 1.0f);
     }
     
     public void done() {
@@ -36,6 +37,10 @@ public abstract class NodeEvaluator {
         this.mob = null;
     }
     
+    protected Node getNode(final BlockPos fu) {
+        return this.getNode(fu.getX(), fu.getY(), fu.getZ());
+    }
+    
     protected Node getNode(final int integer1, final int integer2, final int integer3) {
         return (Node)this.nodes.computeIfAbsent(Node.createHash(integer1, integer2, integer3), integer4 -> new Node(integer1, integer2, integer3));
     }
@@ -44,11 +49,11 @@ public abstract class NodeEvaluator {
     
     public abstract Target getGoal(final double double1, final double double2, final double double3);
     
-    public abstract int getNeighbors(final Node[] arr, final Node cqo);
+    public abstract int getNeighbors(final Node[] arr, final Node czd);
     
-    public abstract BlockPathTypes getBlockPathType(final BlockGetter bjg, final int integer2, final int integer3, final int integer4, final Mob ala, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10);
+    public abstract BlockPathTypes getBlockPathType(final BlockGetter bpg, final int integer2, final int integer3, final int integer4, final Mob aoz, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10);
     
-    public abstract BlockPathTypes getBlockPathType(final BlockGetter bjg, final int integer2, final int integer3, final int integer4);
+    public abstract BlockPathTypes getBlockPathType(final BlockGetter bpg, final int integer2, final int integer3, final int integer4);
     
     public void setCanPassDoors(final boolean boolean1) {
         this.canPassDoors = boolean1;
diff --git a/src/net/minecraft/world/level/pathfinder/Path.java b/src/net/minecraft/world/level/pathfinder/Path.java
index d2f1300..611e732 100644
--- a/src/net/minecraft/world/level/pathfinder/Path.java
+++ b/src/net/minecraft/world/level/pathfinder/Path.java
@@ -3,6 +3,7 @@ package net.minecraft.world.level.pathfinder;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.Entity;
 import javax.annotation.Nullable;
@@ -20,11 +21,11 @@ public class Path {
     private final float distToTarget;
     private final boolean reached;
     
-    public Path(final List<Node> list, final BlockPos fk, final boolean boolean3) {
+    public Path(final List<Node> list, final BlockPos fu, final boolean boolean3) {
         this.openSet = new Node[0];
         this.closedSet = new Node[0];
         this.nodes = list;
-        this.target = fk;
+        this.target = fu;
         this.distToTarget = (list.isEmpty() ? Float.MAX_VALUE : this.nodes.get(this.nodes.size() - 1).distanceManhattan(this.target));
         this.reached = boolean3;
     }
@@ -59,8 +60,8 @@ public class Path {
         }
     }
     
-    public void set(final int integer, final Node cqo) {
-        this.nodes.set(integer, cqo);
+    public void set(final int integer, final Node czd) {
+        this.nodes.set(integer, czd);
     }
     
     public int getSize() {
@@ -75,34 +76,38 @@ public class Path {
         this.index = integer;
     }
     
-    public Vec3 getPos(final Entity akq, final int integer) {
-        final Node cqo4 = this.nodes.get(integer);
-        final double double5 = cqo4.x + (int)(akq.getBbWidth() + 1.0f) * 0.5;
-        final double double6 = cqo4.y;
-        final double double7 = cqo4.z + (int)(akq.getBbWidth() + 1.0f) * 0.5;
+    public Vec3 getPos(final Entity aom, final int integer) {
+        final Node czd4 = this.nodes.get(integer);
+        final double double5 = czd4.x + (int)(aom.getBbWidth() + 1.0f) * 0.5;
+        final double double6 = czd4.y;
+        final double double7 = czd4.z + (int)(aom.getBbWidth() + 1.0f) * 0.5;
         return new Vec3(double5, double6, double7);
     }
     
-    public Vec3 currentPos(final Entity akq) {
-        return this.getPos(akq, this.index);
+    public Vec3 currentPos(final Entity aom) {
+        return this.getPos(aom, this.index);
     }
     
-    public Vec3 currentPos() {
-        final Node cqo2 = this.nodes.get(this.index);
-        return new Vec3(cqo2.x, cqo2.y, cqo2.z);
+    public Vec3i currentPos() {
+        final Node czd2 = this.currentNode();
+        return new Vec3i(czd2.x, czd2.y, czd2.z);
     }
     
-    public boolean sameAs(@Nullable final Path cqq) {
-        if (cqq == null) {
+    public Node currentNode() {
+        return this.nodes.get(this.index);
+    }
+    
+    public boolean sameAs(@Nullable final Path czf) {
+        if (czf == null) {
             return false;
         }
-        if (cqq.nodes.size() != this.nodes.size()) {
+        if (czf.nodes.size() != this.nodes.size()) {
             return false;
         }
         for (int integer3 = 0; integer3 < this.nodes.size(); ++integer3) {
-            final Node cqo4 = this.nodes.get(integer3);
-            final Node cqo5 = cqq.nodes.get(integer3);
-            if (cqo4.x != cqo5.x || cqo4.y != cqo5.y || cqo4.z != cqo5.z) {
+            final Node czd4 = this.nodes.get(integer3);
+            final Node czd5 = czf.nodes.get(integer3);
+            if (czd4.x != czd5.x || czd4.y != czd5.y || czd4.z != czd5.z) {
                 return false;
             }
         }
@@ -121,33 +126,33 @@ public class Path {
         return this.closedSet;
     }
     
-    public static Path createFromStream(final FriendlyByteBuf kv) {
-        final boolean boolean2 = kv.readBoolean();
-        final int integer3 = kv.readInt();
-        final int integer4 = kv.readInt();
+    public static Path createFromStream(final FriendlyByteBuf mg) {
+        final boolean boolean2 = mg.readBoolean();
+        final int integer3 = mg.readInt();
+        final int integer4 = mg.readInt();
         final Set<Target> set5 = Sets.newHashSet();
         for (int integer5 = 0; integer5 < integer4; ++integer5) {
-            set5.add(Target.createFromStream(kv));
+            set5.add(Target.createFromStream(mg));
         }
-        final BlockPos fk6 = new BlockPos(kv.readInt(), kv.readInt(), kv.readInt());
+        final BlockPos fu6 = new BlockPos(mg.readInt(), mg.readInt(), mg.readInt());
         final List<Node> list7 = Lists.newArrayList();
-        for (int integer6 = kv.readInt(), integer7 = 0; integer7 < integer6; ++integer7) {
-            list7.add(Node.createFromStream(kv));
+        for (int integer6 = mg.readInt(), integer7 = 0; integer7 < integer6; ++integer7) {
+            list7.add(Node.createFromStream(mg));
         }
-        final Node[] arr9 = new Node[kv.readInt()];
+        final Node[] arr9 = new Node[mg.readInt()];
         for (int integer8 = 0; integer8 < arr9.length; ++integer8) {
-            arr9[integer8] = Node.createFromStream(kv);
+            arr9[integer8] = Node.createFromStream(mg);
         }
-        final Node[] arr10 = new Node[kv.readInt()];
+        final Node[] arr10 = new Node[mg.readInt()];
         for (int integer9 = 0; integer9 < arr10.length; ++integer9) {
-            arr10[integer9] = Node.createFromStream(kv);
+            arr10[integer9] = Node.createFromStream(mg);
         }
-        final Path cqq11 = new Path(list7, fk6, boolean2);
-        cqq11.openSet = arr9;
-        cqq11.closedSet = arr10;
-        cqq11.targetNodes = set5;
-        cqq11.index = integer3;
-        return cqq11;
+        final Path czf11 = new Path(list7, fu6, boolean2);
+        czf11.openSet = arr9;
+        czf11.closedSet = arr10;
+        czf11.targetNodes = set5;
+        czf11.index = integer3;
+        return czf11;
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/pathfinder/PathFinder.java b/src/net/minecraft/world/level/pathfinder/PathFinder.java
index ef3ee47..40facfc 100644
--- a/src/net/minecraft/world/level/pathfinder/PathFinder.java
+++ b/src/net/minecraft/world/level/pathfinder/PathFinder.java
@@ -2,119 +2,116 @@ package net.minecraft.world.level.pathfinder;
 
 import java.util.List;
 import com.google.common.collect.Lists;
-import java.util.Iterator;
 import java.util.Optional;
-import java.util.stream.Stream;
+import java.util.Iterator;
 import java.util.Comparator;
+import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 import javax.annotation.Nullable;
 import java.util.stream.Collectors;
 import java.util.function.Function;
 import java.util.Map;
 import net.minecraft.core.BlockPos;
+import java.util.Set;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.level.PathNavigationRegion;
-import com.google.common.collect.Sets;
-import java.util.Set;
 
 public class PathFinder {
-    private final BinaryHeap openSet;
-    private final Set<Node> closedSet;
     private final Node[] neighbors;
     private final int maxVisitedNodes;
     private final NodeEvaluator nodeEvaluator;
+    private final BinaryHeap openSet;
     
-    public PathFinder(final NodeEvaluator cqp, final int integer) {
-        this.openSet = new BinaryHeap();
-        this.closedSet = Sets.newHashSet();
+    public PathFinder(final NodeEvaluator cze, final int integer) {
         this.neighbors = new Node[32];
-        this.nodeEvaluator = cqp;
+        this.openSet = new BinaryHeap();
+        this.nodeEvaluator = cze;
         this.maxVisitedNodes = integer;
     }
     
     @Nullable
-    public Path findPath(final PathNavigationRegion bkh, final Mob ala, final Set<BlockPos> set, final float float4, final int integer, final float float6) {
+    public Path findPath(final PathNavigationRegion bql, final Mob aoz, final Set<BlockPos> set, final float float4, final int integer, final float float6) {
         this.openSet.clear();
-        this.nodeEvaluator.prepare(bkh, ala);
-        final Node cqo8 = this.nodeEvaluator.getStart();
-        final Map<Target, BlockPos> map9 = set.stream().collect(Collectors.toMap(fk -> this.nodeEvaluator.getGoal(fk.getX(), fk.getY(), fk.getZ()), Function.identity()));
-        final Path cqq10 = this.findPath(cqo8, map9, float4, integer, float6);
+        this.nodeEvaluator.prepare(bql, aoz);
+        final Node czd8 = this.nodeEvaluator.getStart();
+        final Map<Target, BlockPos> map9 = set.stream().collect(Collectors.toMap(fu -> this.nodeEvaluator.getGoal(fu.getX(), fu.getY(), fu.getZ()), Function.identity()));
+        final Path czf10 = this.findPath(czd8, map9, float4, integer, float6);
         this.nodeEvaluator.done();
-        return cqq10;
+        return czf10;
     }
     
     @Nullable
-    private Path findPath(final Node cqo, final Map<Target, BlockPos> map, final float float3, final int integer, final float float5) {
+    private Path findPath(final Node czd, final Map<Target, BlockPos> map, final float float3, final int integer, final float float5) {
         final Set<Target> set7 = map.keySet();
-        cqo.g = 0.0f;
-        cqo.h = this.getBestH(cqo, set7);
-        cqo.f = cqo.h;
+        czd.g = 0.0f;
+        czd.h = this.getBestH(czd, set7);
+        czd.f = czd.h;
         this.openSet.clear();
-        this.closedSet.clear();
-        this.openSet.insert(cqo);
+        this.openSet.insert(czd);
+        final Set<Node> set8 = ImmutableSet.of();
         int integer2 = 0;
+        final Set<Target> set9 = Sets.newHashSetWithExpectedSize(set7.size());
         final int integer3 = (int)(this.maxVisitedNodes * float5);
         while (!this.openSet.isEmpty() && ++integer2 < integer3) {
-            final Node cqo2 = this.openSet.pop();
-            cqo2.closed = true;
-            set7.stream().filter(cqu -> cqo2.distanceManhattan(cqu) <= integer).forEach(Target::setReached);
-            if (set7.stream().anyMatch(Target::isReached)) {
+            final Node czd2 = this.openSet.pop();
+            czd2.closed = true;
+            for (final Target czj2 : set7) {
+                if (czd2.distanceManhattan(czj2) <= integer) {
+                    czj2.setReached();
+                    set9.add(czj2);
+                }
+            }
+            if (!set9.isEmpty()) {
                 break;
             }
-            if (cqo2.distanceTo(cqo) >= float3) {
+            if (czd2.distanceTo(czd) >= float3) {
                 continue;
             }
-            for (int integer4 = this.nodeEvaluator.getNeighbors(this.neighbors, cqo2), integer5 = 0; integer5 < integer4; ++integer5) {
-                final Node cqo3 = this.neighbors[integer5];
-                final float float6 = cqo2.distanceTo(cqo3);
-                cqo3.walkedDistance = cqo2.walkedDistance + float6;
-                final float float7 = cqo2.g + float6 + cqo3.costMalus;
-                if (cqo3.walkedDistance < float3 && (!cqo3.inOpenSet() || float7 < cqo3.g)) {
-                    cqo3.cameFrom = cqo2;
-                    cqo3.g = float7;
-                    cqo3.h = this.getBestH(cqo3, set7) * 1.5f;
-                    if (cqo3.inOpenSet()) {
-                        this.openSet.changeCost(cqo3, cqo3.g + cqo3.h);
+            for (int integer4 = this.nodeEvaluator.getNeighbors(this.neighbors, czd2), integer5 = 0; integer5 < integer4; ++integer5) {
+                final Node czd3 = this.neighbors[integer5];
+                final float float6 = czd2.distanceTo(czd3);
+                czd3.walkedDistance = czd2.walkedDistance + float6;
+                final float float7 = czd2.g + float6 + czd3.costMalus;
+                if (czd3.walkedDistance < float3 && (!czd3.inOpenSet() || float7 < czd3.g)) {
+                    czd3.cameFrom = czd2;
+                    czd3.g = float7;
+                    czd3.h = this.getBestH(czd3, set7) * 1.5f;
+                    if (czd3.inOpenSet()) {
+                        this.openSet.changeCost(czd3, czd3.g + czd3.h);
                     }
                     else {
-                        cqo3.f = cqo3.g + cqo3.h;
-                        this.openSet.insert(cqo3);
+                        czd3.f = czd3.g + czd3.h;
+                        this.openSet.insert(czd3);
                     }
                 }
             }
         }
-        Stream<Path> stream10;
-        if (set7.stream().anyMatch(Target::isReached)) {
-            stream10 = set7.stream().filter(Target::isReached).<Path>map(cqu -> this.reconstructPath(cqu.getBestNode(), map.get(cqu), true)).sorted(Comparator.comparingInt(Path::getSize));
-        }
-        else {
-            stream10 = set7.stream().<Path>map(cqu -> this.reconstructPath(cqu.getBestNode(), map.get(cqu), false)).sorted(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getSize));
-        }
-        final Optional<Path> optional11 = stream10.findFirst();
-        if (!optional11.isPresent()) {
+        final Optional<Path> optional12 = set9.isEmpty() ? set7.stream().<Path>map(czj -> this.reconstructPath(czj.getBestNode(), map.get(czj), false)).min(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getSize)) : set9.stream().<Path>map(czj -> this.reconstructPath(czj.getBestNode(), map.get(czj), true)).min(Comparator.comparingInt(Path::getSize));
+        if (!optional12.isPresent()) {
             return null;
         }
-        final Path cqq12 = optional11.get();
-        return cqq12;
+        final Path czf13 = optional12.get();
+        return czf13;
     }
     
-    private float getBestH(final Node cqo, final Set<Target> set) {
+    private float getBestH(final Node czd, final Set<Target> set) {
         float float4 = Float.MAX_VALUE;
-        for (final Target cqu6 : set) {
-            final float float5 = cqo.distanceTo(cqu6);
-            cqu6.updateBest(float5, cqo);
+        for (final Target czj6 : set) {
+            final float float5 = czd.distanceTo(czj6);
+            czj6.updateBest(float5, czd);
             float4 = Math.min(float5, float4);
         }
         return float4;
     }
     
-    private Path reconstructPath(final Node cqo, final BlockPos fk, final boolean boolean3) {
+    private Path reconstructPath(final Node czd, final BlockPos fu, final boolean boolean3) {
         final List<Node> list5 = Lists.newArrayList();
-        Node cqo2 = cqo;
-        list5.add(0, cqo2);
-        while (cqo2.cameFrom != null) {
-            cqo2 = cqo2.cameFrom;
-            list5.add(0, cqo2);
+        Node czd2 = czd;
+        list5.add(0, czd2);
+        while (czd2.cameFrom != null) {
+            czd2 = czd2.cameFrom;
+            list5.add(0, czd2);
         }
-        return new Path(list5, fk, boolean3);
+        return new Path(list5, fu, boolean3);
     }
 }
diff --git a/src/net/minecraft/world/level/pathfinder/SwimNodeEvaluator.java b/src/net/minecraft/world/level/pathfinder/SwimNodeEvaluator.java
index eb8a039..a6d322f 100644
--- a/src/net/minecraft/world/level/pathfinder/SwimNodeEvaluator.java
+++ b/src/net/minecraft/world/level/pathfinder/SwimNodeEvaluator.java
@@ -3,6 +3,8 @@ package net.minecraft.world.level.pathfinder;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Mob;
@@ -28,31 +30,31 @@ public class SwimNodeEvaluator extends NodeEvaluator {
     }
     
     @Override
-    public int getNeighbors(final Node[] arr, final Node cqo) {
+    public int getNeighbors(final Node[] arr, final Node czd) {
         int integer4 = 0;
-        for (final Direction fp8 : Direction.values()) {
-            final Node cqo2 = this.getWaterNode(cqo.x + fp8.getStepX(), cqo.y + fp8.getStepY(), cqo.z + fp8.getStepZ());
-            if (cqo2 != null && !cqo2.closed) {
-                arr[integer4++] = cqo2;
+        for (final Direction fz8 : Direction.values()) {
+            final Node czd2 = this.getWaterNode(czd.x + fz8.getStepX(), czd.y + fz8.getStepY(), czd.z + fz8.getStepZ());
+            if (czd2 != null && !czd2.closed) {
+                arr[integer4++] = czd2;
             }
         }
         return integer4;
     }
     
     @Override
-    public BlockPathTypes getBlockPathType(final BlockGetter bjg, final int integer2, final int integer3, final int integer4, final Mob ala, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10) {
-        return this.getBlockPathType(bjg, integer2, integer3, integer4);
+    public BlockPathTypes getBlockPathType(final BlockGetter bpg, final int integer2, final int integer3, final int integer4, final Mob aoz, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10) {
+        return this.getBlockPathType(bpg, integer2, integer3, integer4);
     }
     
     @Override
-    public BlockPathTypes getBlockPathType(final BlockGetter bjg, final int integer2, final int integer3, final int integer4) {
-        final BlockPos fk6 = new BlockPos(integer2, integer3, integer4);
-        final FluidState coj7 = bjg.getFluidState(fk6);
-        final BlockState byj8 = bjg.getBlockState(fk6);
-        if (coj7.isEmpty() && byj8.isPathfindable(bjg, fk6.below(), PathComputationType.WATER) && byj8.isAir()) {
+    public BlockPathTypes getBlockPathType(final BlockGetter bpg, final int integer2, final int integer3, final int integer4) {
+        final BlockPos fu6 = new BlockPos(integer2, integer3, integer4);
+        final FluidState cxa7 = bpg.getFluidState(fu6);
+        final BlockState cfj8 = bpg.getBlockState(fu6);
+        if (cxa7.isEmpty() && cfj8.isPathfindable(bpg, fu6.below(), PathComputationType.WATER) && cfj8.isAir()) {
             return BlockPathTypes.BREACH;
         }
-        if (!coj7.is(FluidTags.WATER) || !byj8.isPathfindable(bjg, fk6, PathComputationType.WATER)) {
+        if (!cxa7.is(FluidTags.WATER) || !cfj8.isPathfindable(bpg, fu6, PathComputationType.WATER)) {
             return BlockPathTypes.BLOCKED;
         }
         return BlockPathTypes.WATER;
@@ -60,8 +62,8 @@ public class SwimNodeEvaluator extends NodeEvaluator {
     
     @Nullable
     private Node getWaterNode(final int integer1, final int integer2, final int integer3) {
-        final BlockPathTypes cqm5 = this.isFree(integer1, integer2, integer3);
-        if ((this.allowBreaching && cqm5 == BlockPathTypes.BREACH) || cqm5 == BlockPathTypes.WATER) {
+        final BlockPathTypes czb5 = this.isFree(integer1, integer2, integer3);
+        if ((this.allowBreaching && czb5 == BlockPathTypes.BREACH) || czb5 == BlockPathTypes.WATER) {
             return this.getNode(integer1, integer2, integer3);
         }
         return null;
@@ -70,22 +72,22 @@ public class SwimNodeEvaluator extends NodeEvaluator {
     @Nullable
     @Override
     protected Node getNode(final int integer1, final int integer2, final int integer3) {
-        Node cqo5 = null;
-        final BlockPathTypes cqm6 = this.getBlockPathType(this.mob.level, integer1, integer2, integer3);
-        final float float7 = this.mob.getPathfindingMalus(cqm6);
+        Node czd5 = null;
+        final BlockPathTypes czb6 = this.getBlockPathType(this.mob.level, integer1, integer2, integer3);
+        final float float7 = this.mob.getPathfindingMalus(czb6);
         if (float7 >= 0.0f) {
-            cqo5 = super.getNode(integer1, integer2, integer3);
-            cqo5.type = cqm6;
-            cqo5.costMalus = Math.max(cqo5.costMalus, float7);
+            czd5 = super.getNode(integer1, integer2, integer3);
+            czd5.type = czb6;
+            czd5.costMalus = Math.max(czd5.costMalus, float7);
             if (this.level.getFluidState(new BlockPos(integer1, integer2, integer3)).isEmpty()) {
-                final Node node = cqo5;
+                final Node node = czd5;
                 node.costMalus += 8.0f;
             }
         }
-        if (cqm6 == BlockPathTypes.OPEN) {
-            return cqo5;
+        if (czb6 == BlockPathTypes.OPEN) {
+            return czd5;
         }
-        return cqo5;
+        return czd5;
     }
     
     private BlockPathTypes isFree(final int integer1, final int integer2, final int integer3) {
@@ -93,19 +95,19 @@ public class SwimNodeEvaluator extends NodeEvaluator {
         for (int integer4 = integer1; integer4 < integer1 + this.entityWidth; ++integer4) {
             for (int integer5 = integer2; integer5 < integer2 + this.entityHeight; ++integer5) {
                 for (int integer6 = integer3; integer6 < integer3 + this.entityDepth; ++integer6) {
-                    final FluidState coj9 = this.level.getFluidState(a5.set(integer4, integer5, integer6));
-                    final BlockState byj10 = this.level.getBlockState(a5.set(integer4, integer5, integer6));
-                    if (coj9.isEmpty() && byj10.isPathfindable(this.level, a5.below(), PathComputationType.WATER) && byj10.isAir()) {
+                    final FluidState cxa9 = this.level.getFluidState(a5.set(integer4, integer5, integer6));
+                    final BlockState cfj10 = this.level.getBlockState(a5.set(integer4, integer5, integer6));
+                    if (cxa9.isEmpty() && cfj10.isPathfindable(this.level, a5.below(), PathComputationType.WATER) && cfj10.isAir()) {
                         return BlockPathTypes.BREACH;
                     }
-                    if (!coj9.is(FluidTags.WATER)) {
+                    if (!cxa9.is(FluidTags.WATER)) {
                         return BlockPathTypes.BLOCKED;
                     }
                 }
             }
         }
-        final BlockState byj11 = this.level.getBlockState(a5);
-        if (byj11.isPathfindable(this.level, a5, PathComputationType.WATER)) {
+        final BlockState cfj11 = this.level.getBlockState(a5);
+        if (cfj11.isPathfindable(this.level, a5, PathComputationType.WATER)) {
             return BlockPathTypes.WATER;
         }
         return BlockPathTypes.BLOCKED;
diff --git a/src/net/minecraft/world/level/pathfinder/Target.java b/src/net/minecraft/world/level/pathfinder/Target.java
index 0b5eacd..763fb90 100644
--- a/src/net/minecraft/world/level/pathfinder/Target.java
+++ b/src/net/minecraft/world/level/pathfinder/Target.java
@@ -7,8 +7,8 @@ public class Target extends Node {
     private Node bestNode;
     private boolean reached;
     
-    public Target(final Node cqo) {
-        super(cqo.x, cqo.y, cqo.z);
+    public Target(final Node czd) {
+        super(czd.x, czd.y, czd.z);
         this.bestHeuristic = Float.MAX_VALUE;
     }
     
@@ -17,10 +17,10 @@ public class Target extends Node {
         this.bestHeuristic = Float.MAX_VALUE;
     }
     
-    public void updateBest(final float float1, final Node cqo) {
+    public void updateBest(final float float1, final Node czd) {
         if (float1 < this.bestHeuristic) {
             this.bestHeuristic = float1;
-            this.bestNode = cqo;
+            this.bestNode = czd;
         }
     }
     
@@ -32,17 +32,13 @@ public class Target extends Node {
         this.reached = true;
     }
     
-    public boolean isReached() {
-        return this.reached;
-    }
-    
-    public static Target createFromStream(final FriendlyByteBuf kv) {
-        final Target cqu2 = new Target(kv.readInt(), kv.readInt(), kv.readInt());
-        cqu2.walkedDistance = kv.readFloat();
-        cqu2.costMalus = kv.readFloat();
-        cqu2.closed = kv.readBoolean();
-        cqu2.type = BlockPathTypes.values()[kv.readInt()];
-        cqu2.f = kv.readFloat();
-        return cqu2;
+    public static Target createFromStream(final FriendlyByteBuf mg) {
+        final Target czj2 = new Target(mg.readInt(), mg.readInt(), mg.readInt());
+        czj2.walkedDistance = mg.readFloat();
+        czj2.costMalus = mg.readFloat();
+        czj2.closed = mg.readBoolean();
+        czj2.type = BlockPathTypes.values()[mg.readInt()];
+        czj2.f = mg.readFloat();
+        return czj2;
     }
 }
diff --git a/src/net/minecraft/world/level/pathfinder/TurtleNodeEvaluator.java b/src/net/minecraft/world/level/pathfinder/TurtleNodeEvaluator.java
index eed022e..13c9f7d 100644
--- a/src/net/minecraft/world/level/pathfinder/TurtleNodeEvaluator.java
+++ b/src/net/minecraft/world/level/pathfinder/TurtleNodeEvaluator.java
@@ -1,6 +1,9 @@
 package net.minecraft.world.level.pathfinder;
 
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.BaseRailBlock;
 import javax.annotation.Nullable;
@@ -19,13 +22,13 @@ public class TurtleNodeEvaluator extends WalkNodeEvaluator {
     private float oldWaterBorderCost;
     
     @Override
-    public void prepare(final PathNavigationRegion bkh, final Mob ala) {
-        super.prepare(bkh, ala);
-        ala.setPathfindingMalus(BlockPathTypes.WATER, 0.0f);
-        this.oldWalkableCost = ala.getPathfindingMalus(BlockPathTypes.WALKABLE);
-        ala.setPathfindingMalus(BlockPathTypes.WALKABLE, 6.0f);
-        this.oldWaterBorderCost = ala.getPathfindingMalus(BlockPathTypes.WATER_BORDER);
-        ala.setPathfindingMalus(BlockPathTypes.WATER_BORDER, 4.0f);
+    public void prepare(final PathNavigationRegion bql, final Mob aoz) {
+        super.prepare(bql, aoz);
+        aoz.setPathfindingMalus(BlockPathTypes.WATER, 0.0f);
+        this.oldWalkableCost = aoz.getPathfindingMalus(BlockPathTypes.WALKABLE);
+        aoz.setPathfindingMalus(BlockPathTypes.WALKABLE, 6.0f);
+        this.oldWaterBorderCost = aoz.getPathfindingMalus(BlockPathTypes.WATER_BORDER);
+        aoz.setPathfindingMalus(BlockPathTypes.WATER_BORDER, 4.0f);
     }
     
     @Override
@@ -46,131 +49,131 @@ public class TurtleNodeEvaluator extends WalkNodeEvaluator {
     }
     
     @Override
-    public int getNeighbors(final Node[] arr, final Node cqo) {
+    public int getNeighbors(final Node[] arr, final Node czd) {
         int integer4 = 0;
         final int integer5 = 1;
-        final BlockPos fk6 = new BlockPos(cqo.x, cqo.y, cqo.z);
-        final double double7 = this.inWaterDependentPosHeight(fk6);
-        final Node cqo2 = this.getAcceptedNode(cqo.x, cqo.y, cqo.z + 1, 1, double7);
-        final Node cqo3 = this.getAcceptedNode(cqo.x - 1, cqo.y, cqo.z, 1, double7);
-        final Node cqo4 = this.getAcceptedNode(cqo.x + 1, cqo.y, cqo.z, 1, double7);
-        final Node cqo5 = this.getAcceptedNode(cqo.x, cqo.y, cqo.z - 1, 1, double7);
-        final Node cqo6 = this.getAcceptedNode(cqo.x, cqo.y + 1, cqo.z, 0, double7);
-        final Node cqo7 = this.getAcceptedNode(cqo.x, cqo.y - 1, cqo.z, 1, double7);
-        if (cqo2 != null && !cqo2.closed) {
-            arr[integer4++] = cqo2;
+        final BlockPos fu6 = new BlockPos(czd.x, czd.y, czd.z);
+        final double double7 = this.inWaterDependentPosHeight(fu6);
+        final Node czd2 = this.getAcceptedNode(czd.x, czd.y, czd.z + 1, 1, double7);
+        final Node czd3 = this.getAcceptedNode(czd.x - 1, czd.y, czd.z, 1, double7);
+        final Node czd4 = this.getAcceptedNode(czd.x + 1, czd.y, czd.z, 1, double7);
+        final Node czd5 = this.getAcceptedNode(czd.x, czd.y, czd.z - 1, 1, double7);
+        final Node czd6 = this.getAcceptedNode(czd.x, czd.y + 1, czd.z, 0, double7);
+        final Node czd7 = this.getAcceptedNode(czd.x, czd.y - 1, czd.z, 1, double7);
+        if (czd2 != null && !czd2.closed) {
+            arr[integer4++] = czd2;
         }
-        if (cqo3 != null && !cqo3.closed) {
-            arr[integer4++] = cqo3;
+        if (czd3 != null && !czd3.closed) {
+            arr[integer4++] = czd3;
         }
-        if (cqo4 != null && !cqo4.closed) {
-            arr[integer4++] = cqo4;
+        if (czd4 != null && !czd4.closed) {
+            arr[integer4++] = czd4;
         }
-        if (cqo5 != null && !cqo5.closed) {
-            arr[integer4++] = cqo5;
+        if (czd5 != null && !czd5.closed) {
+            arr[integer4++] = czd5;
         }
-        if (cqo6 != null && !cqo6.closed) {
-            arr[integer4++] = cqo6;
+        if (czd6 != null && !czd6.closed) {
+            arr[integer4++] = czd6;
         }
-        if (cqo7 != null && !cqo7.closed) {
-            arr[integer4++] = cqo7;
+        if (czd7 != null && !czd7.closed) {
+            arr[integer4++] = czd7;
         }
-        final boolean boolean15 = cqo5 == null || cqo5.type == BlockPathTypes.OPEN || cqo5.costMalus != 0.0f;
-        final boolean boolean16 = cqo2 == null || cqo2.type == BlockPathTypes.OPEN || cqo2.costMalus != 0.0f;
-        final boolean boolean17 = cqo4 == null || cqo4.type == BlockPathTypes.OPEN || cqo4.costMalus != 0.0f;
-        final boolean boolean18 = cqo3 == null || cqo3.type == BlockPathTypes.OPEN || cqo3.costMalus != 0.0f;
+        final boolean boolean15 = czd5 == null || czd5.type == BlockPathTypes.OPEN || czd5.costMalus != 0.0f;
+        final boolean boolean16 = czd2 == null || czd2.type == BlockPathTypes.OPEN || czd2.costMalus != 0.0f;
+        final boolean boolean17 = czd4 == null || czd4.type == BlockPathTypes.OPEN || czd4.costMalus != 0.0f;
+        final boolean boolean18 = czd3 == null || czd3.type == BlockPathTypes.OPEN || czd3.costMalus != 0.0f;
         if (boolean15 && boolean18) {
-            final Node cqo8 = this.getAcceptedNode(cqo.x - 1, cqo.y, cqo.z - 1, 1, double7);
-            if (cqo8 != null && !cqo8.closed) {
-                arr[integer4++] = cqo8;
+            final Node czd8 = this.getAcceptedNode(czd.x - 1, czd.y, czd.z - 1, 1, double7);
+            if (czd8 != null && !czd8.closed) {
+                arr[integer4++] = czd8;
             }
         }
         if (boolean15 && boolean17) {
-            final Node cqo8 = this.getAcceptedNode(cqo.x + 1, cqo.y, cqo.z - 1, 1, double7);
-            if (cqo8 != null && !cqo8.closed) {
-                arr[integer4++] = cqo8;
+            final Node czd8 = this.getAcceptedNode(czd.x + 1, czd.y, czd.z - 1, 1, double7);
+            if (czd8 != null && !czd8.closed) {
+                arr[integer4++] = czd8;
             }
         }
         if (boolean16 && boolean18) {
-            final Node cqo8 = this.getAcceptedNode(cqo.x - 1, cqo.y, cqo.z + 1, 1, double7);
-            if (cqo8 != null && !cqo8.closed) {
-                arr[integer4++] = cqo8;
+            final Node czd8 = this.getAcceptedNode(czd.x - 1, czd.y, czd.z + 1, 1, double7);
+            if (czd8 != null && !czd8.closed) {
+                arr[integer4++] = czd8;
             }
         }
         if (boolean16 && boolean17) {
-            final Node cqo8 = this.getAcceptedNode(cqo.x + 1, cqo.y, cqo.z + 1, 1, double7);
-            if (cqo8 != null && !cqo8.closed) {
-                arr[integer4++] = cqo8;
+            final Node czd8 = this.getAcceptedNode(czd.x + 1, czd.y, czd.z + 1, 1, double7);
+            if (czd8 != null && !czd8.closed) {
+                arr[integer4++] = czd8;
             }
         }
         return integer4;
     }
     
-    private double inWaterDependentPosHeight(final BlockPos fk) {
+    private double inWaterDependentPosHeight(final BlockPos fu) {
         if (!this.mob.isInWater()) {
-            final BlockPos fk2 = fk.below();
-            final VoxelShape cwf4 = this.level.getBlockState(fk2).getCollisionShape(this.level, fk2);
-            return fk2.getY() + (cwf4.isEmpty() ? 0.0 : cwf4.max(Direction.Axis.Y));
+            final BlockPos fu2 = fu.below();
+            final VoxelShape dfg4 = this.level.getBlockState(fu2).getCollisionShape(this.level, fu2);
+            return fu2.getY() + (dfg4.isEmpty() ? 0.0 : dfg4.max(Direction.Axis.Y));
         }
-        return fk.getY() + 0.5;
+        return fu.getY() + 0.5;
     }
     
     @Nullable
     private Node getAcceptedNode(final int integer1, int integer2, final int integer3, final int integer4, final double double5) {
-        Node cqo8 = null;
-        final BlockPos fk9 = new BlockPos(integer1, integer2, integer3);
-        final double double6 = this.inWaterDependentPosHeight(fk9);
+        Node czd8 = null;
+        final BlockPos fu9 = new BlockPos(integer1, integer2, integer3);
+        final double double6 = this.inWaterDependentPosHeight(fu9);
         if (double6 - double5 > 1.125) {
             return null;
         }
-        BlockPathTypes cqm12 = this.getBlockPathType(this.level, integer1, integer2, integer3, this.mob, this.entityWidth, this.entityHeight, this.entityDepth, false, false);
-        float float13 = this.mob.getPathfindingMalus(cqm12);
+        BlockPathTypes czb12 = this.getBlockPathType(this.level, integer1, integer2, integer3, this.mob, this.entityWidth, this.entityHeight, this.entityDepth, false, false);
+        float float13 = this.mob.getPathfindingMalus(czb12);
         final double double7 = this.mob.getBbWidth() / 2.0;
         if (float13 >= 0.0f) {
-            cqo8 = this.getNode(integer1, integer2, integer3);
-            cqo8.type = cqm12;
-            cqo8.costMalus = Math.max(cqo8.costMalus, float13);
+            czd8 = this.getNode(integer1, integer2, integer3);
+            czd8.type = czb12;
+            czd8.costMalus = Math.max(czd8.costMalus, float13);
         }
-        if (cqm12 == BlockPathTypes.WATER || cqm12 == BlockPathTypes.WALKABLE) {
-            if (integer2 < this.mob.level.getSeaLevel() - 10 && cqo8 != null) {
-                final Node node = cqo8;
+        if (czb12 == BlockPathTypes.WATER || czb12 == BlockPathTypes.WALKABLE) {
+            if (integer2 < this.mob.level.getSeaLevel() - 10 && czd8 != null) {
+                final Node node = czd8;
                 ++node.costMalus;
             }
-            return cqo8;
+            return czd8;
         }
-        if (cqo8 == null && integer4 > 0 && cqm12 != BlockPathTypes.FENCE && cqm12 != BlockPathTypes.TRAPDOOR) {
-            cqo8 = this.getAcceptedNode(integer1, integer2 + 1, integer3, integer4 - 1, double5);
+        if (czd8 == null && integer4 > 0 && czb12 != BlockPathTypes.FENCE && czb12 != BlockPathTypes.UNPASSABLE_RAIL && czb12 != BlockPathTypes.TRAPDOOR) {
+            czd8 = this.getAcceptedNode(integer1, integer2 + 1, integer3, integer4 - 1, double5);
         }
-        if (cqm12 == BlockPathTypes.OPEN) {
-            final AABB cvf16 = new AABB(integer1 - double7 + 0.5, integer2 + 0.001, integer3 - double7 + 0.5, integer1 + double7 + 0.5, integer2 + this.mob.getBbHeight(), integer3 + double7 + 0.5);
-            if (!this.mob.level.noCollision(this.mob, cvf16)) {
+        if (czb12 == BlockPathTypes.OPEN) {
+            final AABB deg16 = new AABB(integer1 - double7 + 0.5, integer2 + 0.001, integer3 - double7 + 0.5, integer1 + double7 + 0.5, integer2 + this.mob.getBbHeight(), integer3 + double7 + 0.5);
+            if (!this.mob.level.noCollision(this.mob, deg16)) {
                 return null;
             }
-            final BlockPathTypes cqm13 = this.getBlockPathType(this.level, integer1, integer2 - 1, integer3, this.mob, this.entityWidth, this.entityHeight, this.entityDepth, false, false);
-            if (cqm13 == BlockPathTypes.BLOCKED) {
-                cqo8 = this.getNode(integer1, integer2, integer3);
-                cqo8.type = BlockPathTypes.WALKABLE;
-                cqo8.costMalus = Math.max(cqo8.costMalus, float13);
-                return cqo8;
+            final BlockPathTypes czb13 = this.getBlockPathType(this.level, integer1, integer2 - 1, integer3, this.mob, this.entityWidth, this.entityHeight, this.entityDepth, false, false);
+            if (czb13 == BlockPathTypes.BLOCKED) {
+                czd8 = this.getNode(integer1, integer2, integer3);
+                czd8.type = BlockPathTypes.WALKABLE;
+                czd8.costMalus = Math.max(czd8.costMalus, float13);
+                return czd8;
             }
-            if (cqm13 == BlockPathTypes.WATER) {
-                cqo8 = this.getNode(integer1, integer2, integer3);
-                cqo8.type = BlockPathTypes.WATER;
-                cqo8.costMalus = Math.max(cqo8.costMalus, float13);
-                return cqo8;
+            if (czb13 == BlockPathTypes.WATER) {
+                czd8 = this.getNode(integer1, integer2, integer3);
+                czd8.type = BlockPathTypes.WATER;
+                czd8.costMalus = Math.max(czd8.costMalus, float13);
+                return czd8;
             }
             int integer5 = 0;
-            while (integer2 > 0 && cqm12 == BlockPathTypes.OPEN) {
+            while (integer2 > 0 && czb12 == BlockPathTypes.OPEN) {
                 --integer2;
                 if (integer5++ >= this.mob.getMaxFallDistance()) {
                     return null;
                 }
-                cqm12 = this.getBlockPathType(this.level, integer1, integer2, integer3, this.mob, this.entityWidth, this.entityHeight, this.entityDepth, false, false);
-                float13 = this.mob.getPathfindingMalus(cqm12);
-                if (cqm12 != BlockPathTypes.OPEN && float13 >= 0.0f) {
-                    cqo8 = this.getNode(integer1, integer2, integer3);
-                    cqo8.type = cqm12;
-                    cqo8.costMalus = Math.max(cqo8.costMalus, float13);
+                czb12 = this.getBlockPathType(this.level, integer1, integer2, integer3, this.mob, this.entityWidth, this.entityHeight, this.entityDepth, false, false);
+                float13 = this.mob.getPathfindingMalus(czb12);
+                if (czb12 != BlockPathTypes.OPEN && float13 >= 0.0f) {
+                    czd8 = this.getNode(integer1, integer2, integer3);
+                    czd8.type = czb12;
+                    czd8.costMalus = Math.max(czd8.costMalus, float13);
                     break;
                 }
                 if (float13 < 0.0f) {
@@ -178,57 +181,58 @@ public class TurtleNodeEvaluator extends WalkNodeEvaluator {
                 }
             }
         }
-        return cqo8;
+        return czd8;
     }
     
     @Override
-    protected BlockPathTypes evaluateBlockPathType(final BlockGetter bjg, final boolean boolean2, final boolean boolean3, final BlockPos fk, BlockPathTypes cqm) {
-        if (cqm == BlockPathTypes.RAIL && !(bjg.getBlockState(fk).getBlock() instanceof BaseRailBlock) && !(bjg.getBlockState(fk.below()).getBlock() instanceof BaseRailBlock)) {
-            cqm = BlockPathTypes.FENCE;
+    protected BlockPathTypes evaluateBlockPathType(final BlockGetter bpg, final boolean boolean2, final boolean boolean3, final BlockPos fu, BlockPathTypes czb) {
+        if (czb == BlockPathTypes.RAIL && !(bpg.getBlockState(fu).getBlock() instanceof BaseRailBlock) && !(bpg.getBlockState(fu.below()).getBlock() instanceof BaseRailBlock)) {
+            czb = BlockPathTypes.UNPASSABLE_RAIL;
         }
-        if (cqm == BlockPathTypes.DOOR_OPEN || cqm == BlockPathTypes.DOOR_WOOD_CLOSED || cqm == BlockPathTypes.DOOR_IRON_CLOSED) {
-            cqm = BlockPathTypes.BLOCKED;
+        if (czb == BlockPathTypes.DOOR_OPEN || czb == BlockPathTypes.DOOR_WOOD_CLOSED || czb == BlockPathTypes.DOOR_IRON_CLOSED) {
+            czb = BlockPathTypes.BLOCKED;
         }
-        if (cqm == BlockPathTypes.LEAVES) {
-            cqm = BlockPathTypes.BLOCKED;
+        if (czb == BlockPathTypes.LEAVES) {
+            czb = BlockPathTypes.BLOCKED;
         }
-        return cqm;
+        return czb;
     }
     
     @Override
-    public BlockPathTypes getBlockPathType(final BlockGetter bjg, final int integer2, final int integer3, final int integer4) {
-        BlockPathTypes cqm6 = WalkNodeEvaluator.getBlockPathTypeRaw(bjg, integer2, integer3, integer4);
-        if (cqm6 == BlockPathTypes.WATER) {
-            for (final Direction fp10 : Direction.values()) {
-                final BlockPathTypes cqm7 = WalkNodeEvaluator.getBlockPathTypeRaw(bjg, integer2 + fp10.getStepX(), integer3 + fp10.getStepY(), integer4 + fp10.getStepZ());
-                if (cqm7 == BlockPathTypes.BLOCKED) {
+    public BlockPathTypes getBlockPathType(final BlockGetter bpg, final int integer2, final int integer3, final int integer4) {
+        final BlockPos.MutableBlockPos a6 = new BlockPos.MutableBlockPos();
+        BlockPathTypes czb7 = WalkNodeEvaluator.getBlockPathTypeRaw(bpg, a6.set(integer2, integer3, integer4));
+        if (czb7 == BlockPathTypes.WATER) {
+            for (final Direction fz11 : Direction.values()) {
+                final BlockPathTypes czb8 = WalkNodeEvaluator.getBlockPathTypeRaw(bpg, a6.set(integer2, integer3, integer4).move(fz11));
+                if (czb8 == BlockPathTypes.BLOCKED) {
                     return BlockPathTypes.WATER_BORDER;
                 }
             }
             return BlockPathTypes.WATER;
         }
-        if (cqm6 == BlockPathTypes.OPEN && integer3 >= 1) {
-            final Block bph7 = bjg.getBlockState(new BlockPos(integer2, integer3 - 1, integer4)).getBlock();
-            final BlockPathTypes cqm8 = WalkNodeEvaluator.getBlockPathTypeRaw(bjg, integer2, integer3 - 1, integer4);
-            if (cqm8 == BlockPathTypes.WALKABLE || cqm8 == BlockPathTypes.OPEN || cqm8 == BlockPathTypes.LAVA) {
-                cqm6 = BlockPathTypes.OPEN;
+        if (czb7 == BlockPathTypes.OPEN && integer3 >= 1) {
+            final BlockState cfj8 = bpg.getBlockState(new BlockPos(integer2, integer3 - 1, integer4));
+            final BlockPathTypes czb9 = WalkNodeEvaluator.getBlockPathTypeRaw(bpg, a6.set(integer2, integer3 - 1, integer4));
+            if (czb9 == BlockPathTypes.WALKABLE || czb9 == BlockPathTypes.OPEN || czb9 == BlockPathTypes.LAVA) {
+                czb7 = BlockPathTypes.OPEN;
             }
             else {
-                cqm6 = BlockPathTypes.WALKABLE;
+                czb7 = BlockPathTypes.WALKABLE;
             }
-            if (cqm8 == BlockPathTypes.DAMAGE_FIRE || bph7 == Blocks.MAGMA_BLOCK || bph7 == Blocks.CAMPFIRE) {
-                cqm6 = BlockPathTypes.DAMAGE_FIRE;
+            if (czb9 == BlockPathTypes.DAMAGE_FIRE || cfj8.is(Blocks.MAGMA_BLOCK) || cfj8.is(BlockTags.CAMPFIRES)) {
+                czb7 = BlockPathTypes.DAMAGE_FIRE;
             }
-            if (cqm8 == BlockPathTypes.DAMAGE_CACTUS) {
-                cqm6 = BlockPathTypes.DAMAGE_CACTUS;
+            if (czb9 == BlockPathTypes.DAMAGE_CACTUS) {
+                czb7 = BlockPathTypes.DAMAGE_CACTUS;
             }
-            if (cqm8 == BlockPathTypes.DAMAGE_OTHER) {
-                cqm6 = BlockPathTypes.DAMAGE_OTHER;
+            if (czb9 == BlockPathTypes.DAMAGE_OTHER) {
+                czb7 = BlockPathTypes.DAMAGE_OTHER;
             }
         }
-        if (cqm6 == BlockPathTypes.WALKABLE) {
-            cqm6 = WalkNodeEvaluator.checkNeighbourBlocks(bjg, integer2, integer3, integer4, cqm6);
+        if (czb7 == BlockPathTypes.WALKABLE) {
+            czb7 = WalkNodeEvaluator.checkNeighbourBlocks(bpg, a6.set(integer2, integer3, integer4), czb7);
         }
-        return cqm6;
+        return czb7;
     }
 }
diff --git a/src/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
index 74ad06b..67710a5 100644
--- a/src/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
+++ b/src/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
@@ -1,84 +1,110 @@
 package net.minecraft.world.level.pathfinder;
 
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.tags.FluidTags;
+import net.minecraft.world.level.block.CampfireBlock;
 import net.minecraft.world.level.block.FenceGateBlock;
 import net.minecraft.world.level.block.LeavesBlock;
-import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.block.DoorBlock;
-import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.tags.Tag;
+import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.block.BaseRailBlock;
+import java.util.Iterator;
 import java.util.EnumSet;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.world.phys.Vec3;
 import javax.annotation.Nullable;
 import net.minecraft.core.Direction;
-import java.util.Iterator;
-import java.util.Set;
 import net.minecraft.world.level.block.state.BlockState;
-import com.google.common.collect.Sets;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.level.PathNavigationRegion;
+import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import net.minecraft.world.phys.AABB;
+import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 
 public class WalkNodeEvaluator extends NodeEvaluator {
     protected float oldWaterCost;
+    private final Long2ObjectMap<BlockPathTypes> pathTypesByPosCache;
+    private final Object2BooleanMap<AABB> collisionCache;
+    
+    public WalkNodeEvaluator() {
+        this.pathTypesByPosCache = (Long2ObjectMap<BlockPathTypes>)new Long2ObjectOpenHashMap();
+        this.collisionCache = (Object2BooleanMap<AABB>)new Object2BooleanOpenHashMap();
+    }
     
     @Override
-    public void prepare(final PathNavigationRegion bkh, final Mob ala) {
-        super.prepare(bkh, ala);
-        this.oldWaterCost = ala.getPathfindingMalus(BlockPathTypes.WATER);
+    public void prepare(final PathNavigationRegion bql, final Mob aoz) {
+        super.prepare(bql, aoz);
+        this.oldWaterCost = aoz.getPathfindingMalus(BlockPathTypes.WATER);
     }
     
     @Override
     public void done() {
         this.mob.setPathfindingMalus(BlockPathTypes.WATER, this.oldWaterCost);
+        this.pathTypesByPosCache.clear();
+        this.collisionCache.clear();
         super.done();
     }
     
     @Override
     public Node getStart() {
-        int integer2;
-        if (this.canFloat() && this.mob.isInWater()) {
-            integer2 = Mth.floor(this.mob.getY());
-            final BlockPos.MutableBlockPos a3 = new BlockPos.MutableBlockPos(this.mob.getX(), integer2, this.mob.getZ());
-            for (BlockState byj4 = this.level.getBlockState(a3); byj4.getBlock() == Blocks.WATER || byj4.getFluidState() == Fluids.WATER.getSource(false); byj4 = this.level.getBlockState(a3)) {
+        final BlockPos.MutableBlockPos a3 = new BlockPos.MutableBlockPos();
+        int integer2 = Mth.floor(this.mob.getY());
+        BlockState cfj4 = this.level.getBlockState(a3.set(this.mob.getX(), integer2, this.mob.getZ()));
+        if (this.mob.canStandOnFluid(cfj4.getFluidState().getType())) {
+            while (this.mob.canStandOnFluid(cfj4.getFluidState().getType())) {
                 ++integer2;
-                a3.set(this.mob.getX(), integer2, this.mob.getZ());
+                cfj4 = this.level.getBlockState(a3.set(this.mob.getX(), integer2, this.mob.getZ()));
             }
             --integer2;
         }
-        else if (this.mob.onGround) {
+        else if (this.canFloat() && this.mob.isInWater()) {
+            while (cfj4.getBlock() == Blocks.WATER || cfj4.getFluidState() == Fluids.WATER.getSource(false)) {
+                ++integer2;
+                cfj4 = this.level.getBlockState(a3.set(this.mob.getX(), integer2, this.mob.getZ()));
+            }
+            --integer2;
+        }
+        else if (this.mob.isOnGround()) {
             integer2 = Mth.floor(this.mob.getY() + 0.5);
         }
         else {
-            BlockPos fk3;
-            for (fk3 = new BlockPos(this.mob); (this.level.getBlockState(fk3).isAir() || this.level.getBlockState(fk3).isPathfindable(this.level, fk3, PathComputationType.LAND)) && fk3.getY() > 0; fk3 = fk3.below()) {}
-            integer2 = fk3.above().getY();
+            BlockPos fu5;
+            for (fu5 = this.mob.blockPosition(); (this.level.getBlockState(fu5).isAir() || this.level.getBlockState(fu5).isPathfindable(this.level, fu5, PathComputationType.LAND)) && fu5.getY() > 0; fu5 = fu5.below()) {}
+            integer2 = fu5.above().getY();
         }
-        BlockPos fk3 = new BlockPos(this.mob);
-        final BlockPathTypes cqm4 = this.getBlockPathType(this.mob, fk3.getX(), integer2, fk3.getZ());
-        if (this.mob.getPathfindingMalus(cqm4) < 0.0f) {
-            final Set<BlockPos> set5 = Sets.newHashSet();
-            set5.add(new BlockPos(this.mob.getBoundingBox().minX, integer2, this.mob.getBoundingBox().minZ));
-            set5.add(new BlockPos(this.mob.getBoundingBox().minX, integer2, this.mob.getBoundingBox().maxZ));
-            set5.add(new BlockPos(this.mob.getBoundingBox().maxX, integer2, this.mob.getBoundingBox().minZ));
-            set5.add(new BlockPos(this.mob.getBoundingBox().maxX, integer2, this.mob.getBoundingBox().maxZ));
-            for (final BlockPos fk4 : set5) {
-                final BlockPathTypes cqm5 = this.getBlockPathType(this.mob, fk4);
-                if (this.mob.getPathfindingMalus(cqm5) >= 0.0f) {
-                    return this.getNode(fk4.getX(), fk4.getY(), fk4.getZ());
-                }
+        BlockPos fu5 = this.mob.blockPosition();
+        final BlockPathTypes czb6 = this.getCachedBlockType(this.mob, fu5.getX(), integer2, fu5.getZ());
+        if (this.mob.getPathfindingMalus(czb6) < 0.0f) {
+            final AABB deg7 = this.mob.getBoundingBox();
+            if (this.hasPositiveMalus(a3.set(deg7.minX, integer2, deg7.minZ)) || this.hasPositiveMalus(a3.set(deg7.minX, integer2, deg7.maxZ)) || this.hasPositiveMalus(a3.set(deg7.maxX, integer2, deg7.minZ)) || this.hasPositiveMalus(a3.set(deg7.maxX, integer2, deg7.maxZ))) {
+                final Node czd8 = this.getNode(a3);
+                czd8.type = this.getBlockPathType(this.mob, czd8.asBlockPos());
+                czd8.costMalus = this.mob.getPathfindingMalus(czd8.type);
+                return czd8;
             }
         }
-        return this.getNode(fk3.getX(), integer2, fk3.getZ());
+        final Node czd9 = this.getNode(fu5.getX(), integer2, fu5.getZ());
+        czd9.type = this.getBlockPathType(this.mob, czd9.asBlockPos());
+        czd9.costMalus = this.mob.getPathfindingMalus(czd9.type);
+        return czd9;
+    }
+    
+    private boolean hasPositiveMalus(final BlockPos fu) {
+        final BlockPathTypes czb3 = this.getBlockPathType(this.mob, fu);
+        return this.mob.getPathfindingMalus(czb3) >= 0.0f;
     }
     
     @Override
@@ -87,334 +113,386 @@ public class WalkNodeEvaluator extends NodeEvaluator {
     }
     
     @Override
-    public int getNeighbors(final Node[] arr, final Node cqo) {
+    public int getNeighbors(final Node[] arr, final Node czd) {
         int integer4 = 0;
         int integer5 = 0;
-        final BlockPathTypes cqm6 = this.getBlockPathType(this.mob, cqo.x, cqo.y + 1, cqo.z);
-        if (this.mob.getPathfindingMalus(cqm6) >= 0.0f) {
-            final BlockPathTypes cqm7 = this.getBlockPathType(this.mob, cqo.x, cqo.y, cqo.z);
-            if (cqm7 == BlockPathTypes.STICKY_HONEY) {
-                integer5 = 0;
-            }
-            else {
-                integer5 = Mth.floor(Math.max(1.0f, this.mob.maxUpStep));
-            }
+        final BlockPathTypes czb6 = this.getCachedBlockType(this.mob, czd.x, czd.y + 1, czd.z);
+        final BlockPathTypes czb7 = this.getCachedBlockType(this.mob, czd.x, czd.y, czd.z);
+        if (this.mob.getPathfindingMalus(czb6) >= 0.0f && czb7 != BlockPathTypes.STICKY_HONEY) {
+            integer5 = Mth.floor(Math.max(1.0f, this.mob.maxUpStep));
         }
-        final double double7 = getFloorLevel(this.level, new BlockPos(cqo.x, cqo.y, cqo.z));
-        final Node cqo2 = this.getLandNode(cqo.x, cqo.y, cqo.z + 1, integer5, double7, Direction.SOUTH);
-        if (cqo2 != null && !cqo2.closed && cqo2.costMalus >= 0.0f) {
-            arr[integer4++] = cqo2;
+        final double double8 = getFloorLevel(this.level, new BlockPos(czd.x, czd.y, czd.z));
+        final Node czd2 = this.getLandNode(czd.x, czd.y, czd.z + 1, integer5, double8, Direction.SOUTH, czb7);
+        if (this.isNeighborValid(czd2, czd)) {
+            arr[integer4++] = czd2;
         }
-        final Node cqo3 = this.getLandNode(cqo.x - 1, cqo.y, cqo.z, integer5, double7, Direction.WEST);
-        if (cqo3 != null && !cqo3.closed && cqo3.costMalus >= 0.0f) {
-            arr[integer4++] = cqo3;
+        final Node czd3 = this.getLandNode(czd.x - 1, czd.y, czd.z, integer5, double8, Direction.WEST, czb7);
+        if (this.isNeighborValid(czd3, czd)) {
+            arr[integer4++] = czd3;
         }
-        final Node cqo4 = this.getLandNode(cqo.x + 1, cqo.y, cqo.z, integer5, double7, Direction.EAST);
-        if (cqo4 != null && !cqo4.closed && cqo4.costMalus >= 0.0f) {
-            arr[integer4++] = cqo4;
+        final Node czd4 = this.getLandNode(czd.x + 1, czd.y, czd.z, integer5, double8, Direction.EAST, czb7);
+        if (this.isNeighborValid(czd4, czd)) {
+            arr[integer4++] = czd4;
         }
-        final Node cqo5 = this.getLandNode(cqo.x, cqo.y, cqo.z - 1, integer5, double7, Direction.NORTH);
-        if (cqo5 != null && !cqo5.closed && cqo5.costMalus >= 0.0f) {
-            arr[integer4++] = cqo5;
+        final Node czd5 = this.getLandNode(czd.x, czd.y, czd.z - 1, integer5, double8, Direction.NORTH, czb7);
+        if (this.isNeighborValid(czd5, czd)) {
+            arr[integer4++] = czd5;
         }
-        final Node cqo6 = this.getLandNode(cqo.x - 1, cqo.y, cqo.z - 1, integer5, double7, Direction.NORTH);
-        if (this.isDiagonalValid(cqo, cqo3, cqo5, cqo6)) {
-            arr[integer4++] = cqo6;
+        final Node czd6 = this.getLandNode(czd.x - 1, czd.y, czd.z - 1, integer5, double8, Direction.NORTH, czb7);
+        if (this.isDiagonalValid(czd, czd3, czd5, czd6)) {
+            arr[integer4++] = czd6;
         }
-        final Node cqo7 = this.getLandNode(cqo.x + 1, cqo.y, cqo.z - 1, integer5, double7, Direction.NORTH);
-        if (this.isDiagonalValid(cqo, cqo4, cqo5, cqo7)) {
-            arr[integer4++] = cqo7;
+        final Node czd7 = this.getLandNode(czd.x + 1, czd.y, czd.z - 1, integer5, double8, Direction.NORTH, czb7);
+        if (this.isDiagonalValid(czd, czd4, czd5, czd7)) {
+            arr[integer4++] = czd7;
         }
-        final Node cqo8 = this.getLandNode(cqo.x - 1, cqo.y, cqo.z + 1, integer5, double7, Direction.SOUTH);
-        if (this.isDiagonalValid(cqo, cqo3, cqo2, cqo8)) {
-            arr[integer4++] = cqo8;
+        final Node czd8 = this.getLandNode(czd.x - 1, czd.y, czd.z + 1, integer5, double8, Direction.SOUTH, czb7);
+        if (this.isDiagonalValid(czd, czd3, czd2, czd8)) {
+            arr[integer4++] = czd8;
         }
-        final Node cqo9 = this.getLandNode(cqo.x + 1, cqo.y, cqo.z + 1, integer5, double7, Direction.SOUTH);
-        if (this.isDiagonalValid(cqo, cqo4, cqo2, cqo9)) {
-            arr[integer4++] = cqo9;
+        final Node czd9 = this.getLandNode(czd.x + 1, czd.y, czd.z + 1, integer5, double8, Direction.SOUTH, czb7);
+        if (this.isDiagonalValid(czd, czd4, czd2, czd9)) {
+            arr[integer4++] = czd9;
         }
         return integer4;
     }
     
-    private boolean isDiagonalValid(final Node cqo1, @Nullable final Node cqo2, @Nullable final Node cqo3, @Nullable final Node cqo4) {
-        return cqo4 != null && cqo3 != null && cqo2 != null && !cqo4.closed && cqo3.y <= cqo1.y && cqo2.y <= cqo1.y && cqo4.costMalus >= 0.0f && (cqo3.y < cqo1.y || cqo3.costMalus >= 0.0f) && (cqo2.y < cqo1.y || cqo2.costMalus >= 0.0f);
+    private boolean isNeighborValid(final Node czd1, final Node czd2) {
+        return czd1 != null && !czd1.closed && (czd1.costMalus >= 0.0f || czd2.costMalus < 0.0f);
     }
     
-    public static double getFloorLevel(final BlockGetter bjg, final BlockPos fk) {
-        final BlockPos fk2 = fk.below();
-        final VoxelShape cwf4 = bjg.getBlockState(fk2).getCollisionShape(bjg, fk2);
-        return fk2.getY() + (cwf4.isEmpty() ? 0.0 : cwf4.max(Direction.Axis.Y));
+    private boolean isDiagonalValid(final Node czd1, @Nullable final Node czd2, @Nullable final Node czd3, @Nullable final Node czd4) {
+        if (czd4 == null || czd3 == null || czd2 == null) {
+            return false;
+        }
+        if (czd4.closed) {
+            return false;
+        }
+        if (czd3.y > czd1.y || czd2.y > czd1.y) {
+            return false;
+        }
+        final boolean boolean6 = czd3.type == BlockPathTypes.FENCE && czd2.type == BlockPathTypes.FENCE && this.mob.getBbWidth() < 0.5;
+        return czd4.costMalus >= 0.0f && (czd3.y < czd1.y || czd3.costMalus >= 0.0f || boolean6) && (czd2.y < czd1.y || czd2.costMalus >= 0.0f || boolean6);
+    }
+    
+    private boolean canReachWithoutCollision(final Node czd) {
+        Vec3 dem3 = new Vec3(czd.x - this.mob.getX(), czd.y - this.mob.getY(), czd.z - this.mob.getZ());
+        AABB deg4 = this.mob.getBoundingBox();
+        final int integer5 = Mth.ceil(dem3.length() / deg4.getSize());
+        dem3 = dem3.scale(1.0f / integer5);
+        for (int integer6 = 1; integer6 <= integer5; ++integer6) {
+            deg4 = deg4.move(dem3);
+            if (this.hasCollisions(deg4)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    public static double getFloorLevel(final BlockGetter bpg, final BlockPos fu) {
+        final BlockPos fu2 = fu.below();
+        final VoxelShape dfg4 = bpg.getBlockState(fu2).getCollisionShape(bpg, fu2);
+        return fu2.getY() + (dfg4.isEmpty() ? 0.0 : dfg4.max(Direction.Axis.Y));
     }
     
     @Nullable
-    private Node getLandNode(final int integer1, int integer2, final int integer3, final int integer4, final double double5, final Direction fp) {
-        Node cqo9 = null;
-        final BlockPos fk10 = new BlockPos(integer1, integer2, integer3);
-        final double double6 = getFloorLevel(this.level, fk10);
+    private Node getLandNode(final int integer1, int integer2, final int integer3, final int integer4, final double double5, final Direction fz, final BlockPathTypes czb) {
+        Node czd10 = null;
+        final BlockPos.MutableBlockPos a11 = new BlockPos.MutableBlockPos();
+        final double double6 = getFloorLevel(this.level, a11.set(integer1, integer2, integer3));
         if (double6 - double5 > 1.125) {
             return null;
         }
-        BlockPathTypes cqm13 = this.getBlockPathType(this.mob, integer1, integer2, integer3);
-        float float14 = this.mob.getPathfindingMalus(cqm13);
+        BlockPathTypes czb2 = this.getCachedBlockType(this.mob, integer1, integer2, integer3);
+        float float15 = this.mob.getPathfindingMalus(czb2);
         final double double7 = this.mob.getBbWidth() / 2.0;
-        if (float14 >= 0.0f) {
-            cqo9 = this.getNode(integer1, integer2, integer3);
-            cqo9.type = cqm13;
-            cqo9.costMalus = Math.max(cqo9.costMalus, float14);
+        if (float15 >= 0.0f) {
+            czd10 = this.getNode(integer1, integer2, integer3);
+            czd10.type = czb2;
+            czd10.costMalus = Math.max(czd10.costMalus, float15);
         }
-        if (cqm13 == BlockPathTypes.WALKABLE) {
-            return cqo9;
+        if (czb == BlockPathTypes.FENCE && czd10 != null && czd10.costMalus >= 0.0f && !this.canReachWithoutCollision(czd10)) {
+            czd10 = null;
         }
-        if ((cqo9 == null || cqo9.costMalus < 0.0f) && integer4 > 0 && cqm13 != BlockPathTypes.FENCE && cqm13 != BlockPathTypes.TRAPDOOR) {
-            cqo9 = this.getLandNode(integer1, integer2 + 1, integer3, integer4 - 1, double5, fp);
-            if (cqo9 != null && (cqo9.type == BlockPathTypes.OPEN || cqo9.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0f) {
-                final double double8 = integer1 - fp.getStepX() + 0.5;
-                final double double9 = integer3 - fp.getStepZ() + 0.5;
-                final AABB cvf21 = new AABB(double8 - double7, getFloorLevel(this.level, new BlockPos(double8, integer2 + 1, double9)) + 0.001, double9 - double7, double8 + double7, this.mob.getBbHeight() + getFloorLevel(this.level, new BlockPos(cqo9.x, cqo9.y, cqo9.z)) - 0.002, double9 + double7);
-                if (!this.level.noCollision(this.mob, cvf21)) {
-                    cqo9 = null;
+        if (czb2 == BlockPathTypes.WALKABLE) {
+            return czd10;
+        }
+        if ((czd10 == null || czd10.costMalus < 0.0f) && integer4 > 0 && czb2 != BlockPathTypes.FENCE && czb2 != BlockPathTypes.UNPASSABLE_RAIL && czb2 != BlockPathTypes.TRAPDOOR) {
+            czd10 = this.getLandNode(integer1, integer2 + 1, integer3, integer4 - 1, double5, fz, czb);
+            if (czd10 != null && (czd10.type == BlockPathTypes.OPEN || czd10.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0f) {
+                final double double8 = integer1 - fz.getStepX() + 0.5;
+                final double double9 = integer3 - fz.getStepZ() + 0.5;
+                final AABB deg22 = new AABB(double8 - double7, getFloorLevel(this.level, a11.set(double8, integer2 + 1, double9)) + 0.001, double9 - double7, double8 + double7, this.mob.getBbHeight() + getFloorLevel(this.level, a11.set(czd10.x, czd10.y, (double)czd10.z)) - 0.002, double9 + double7);
+                if (this.hasCollisions(deg22)) {
+                    czd10 = null;
                 }
             }
         }
-        if (cqm13 == BlockPathTypes.WATER && !this.canFloat()) {
-            if (this.getBlockPathType(this.mob, integer1, integer2 - 1, integer3) != BlockPathTypes.WATER) {
-                return cqo9;
+        if (czb2 == BlockPathTypes.WATER && !this.canFloat()) {
+            if (this.getCachedBlockType(this.mob, integer1, integer2 - 1, integer3) != BlockPathTypes.WATER) {
+                return czd10;
             }
             while (integer2 > 0) {
                 --integer2;
-                cqm13 = this.getBlockPathType(this.mob, integer1, integer2, integer3);
-                if (cqm13 != BlockPathTypes.WATER) {
-                    return cqo9;
+                czb2 = this.getCachedBlockType(this.mob, integer1, integer2, integer3);
+                if (czb2 != BlockPathTypes.WATER) {
+                    return czd10;
                 }
-                cqo9 = this.getNode(integer1, integer2, integer3);
-                cqo9.type = cqm13;
-                cqo9.costMalus = Math.max(cqo9.costMalus, this.mob.getPathfindingMalus(cqm13));
+                czd10 = this.getNode(integer1, integer2, integer3);
+                czd10.type = czb2;
+                czd10.costMalus = Math.max(czd10.costMalus, this.mob.getPathfindingMalus(czb2));
             }
         }
-        if (cqm13 == BlockPathTypes.OPEN) {
-            final AABB cvf22 = new AABB(integer1 - double7 + 0.5, integer2 + 0.001, integer3 - double7 + 0.5, integer1 + double7 + 0.5, integer2 + this.mob.getBbHeight(), integer3 + double7 + 0.5);
-            if (!this.level.noCollision(this.mob, cvf22)) {
+        if (czb2 == BlockPathTypes.OPEN) {
+            final AABB deg23 = new AABB(integer1 - double7 + 0.5, integer2 + 0.001, integer3 - double7 + 0.5, integer1 + double7 + 0.5, integer2 + this.mob.getBbHeight(), integer3 + double7 + 0.5);
+            if (this.hasCollisions(deg23)) {
                 return null;
             }
             if (this.mob.getBbWidth() >= 1.0f) {
-                final BlockPathTypes cqm14 = this.getBlockPathType(this.mob, integer1, integer2 - 1, integer3);
-                if (cqm14 == BlockPathTypes.BLOCKED) {
-                    cqo9 = this.getNode(integer1, integer2, integer3);
-                    cqo9.type = BlockPathTypes.WALKABLE;
-                    cqo9.costMalus = Math.max(cqo9.costMalus, float14);
-                    return cqo9;
+                final BlockPathTypes czb3 = this.getCachedBlockType(this.mob, integer1, integer2 - 1, integer3);
+                if (czb3 == BlockPathTypes.BLOCKED) {
+                    czd10 = this.getNode(integer1, integer2, integer3);
+                    czd10.type = BlockPathTypes.WALKABLE;
+                    czd10.costMalus = Math.max(czd10.costMalus, float15);
+                    return czd10;
                 }
             }
             int integer5 = 0;
             final int integer6 = integer2;
-            while (cqm13 == BlockPathTypes.OPEN) {
+            while (czb2 == BlockPathTypes.OPEN) {
                 if (--integer2 < 0) {
-                    final Node cqo10 = this.getNode(integer1, integer6, integer3);
-                    cqo10.type = BlockPathTypes.BLOCKED;
-                    cqo10.costMalus = -1.0f;
-                    return cqo10;
+                    final Node czd11 = this.getNode(integer1, integer6, integer3);
+                    czd11.type = BlockPathTypes.BLOCKED;
+                    czd11.costMalus = -1.0f;
+                    return czd11;
                 }
-                final Node cqo10 = this.getNode(integer1, integer2, integer3);
+                final Node czd11 = this.getNode(integer1, integer2, integer3);
                 if (integer5++ >= this.mob.getMaxFallDistance()) {
-                    cqo10.type = BlockPathTypes.BLOCKED;
-                    cqo10.costMalus = -1.0f;
-                    return cqo10;
+                    czd11.type = BlockPathTypes.BLOCKED;
+                    czd11.costMalus = -1.0f;
+                    return czd11;
                 }
-                cqm13 = this.getBlockPathType(this.mob, integer1, integer2, integer3);
-                float14 = this.mob.getPathfindingMalus(cqm13);
-                if (cqm13 != BlockPathTypes.OPEN && float14 >= 0.0f) {
-                    cqo9 = cqo10;
-                    cqo9.type = cqm13;
-                    cqo9.costMalus = Math.max(cqo9.costMalus, float14);
+                czb2 = this.getCachedBlockType(this.mob, integer1, integer2, integer3);
+                float15 = this.mob.getPathfindingMalus(czb2);
+                if (czb2 != BlockPathTypes.OPEN && float15 >= 0.0f) {
+                    czd10 = czd11;
+                    czd10.type = czb2;
+                    czd10.costMalus = Math.max(czd10.costMalus, float15);
                     break;
                 }
-                if (float14 < 0.0f) {
-                    cqo10.type = BlockPathTypes.BLOCKED;
-                    cqo10.costMalus = -1.0f;
-                    return cqo10;
+                if (float15 < 0.0f) {
+                    czd11.type = BlockPathTypes.BLOCKED;
+                    czd11.costMalus = -1.0f;
+                    return czd11;
                 }
             }
         }
-        return cqo9;
+        if (czb2 == BlockPathTypes.FENCE) {
+            czd10 = this.getNode(integer1, integer2, integer3);
+            czd10.closed = true;
+            czd10.type = czb2;
+            czd10.costMalus = czb2.getMalus();
+        }
+        return czd10;
+    }
+    
+    private boolean hasCollisions(final AABB deg) {
+        return (boolean)this.collisionCache.computeIfAbsent(deg, deg2 -> !this.level.noCollision(this.mob, deg));
     }
     
     @Override
-    public BlockPathTypes getBlockPathType(final BlockGetter bjg, final int integer2, final int integer3, final int integer4, final Mob ala, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10) {
+    public BlockPathTypes getBlockPathType(final BlockGetter bpg, final int integer2, final int integer3, final int integer4, final Mob aoz, final int integer6, final int integer7, final int integer8, final boolean boolean9, final boolean boolean10) {
         final EnumSet<BlockPathTypes> enumSet12 = EnumSet.<BlockPathTypes>noneOf(BlockPathTypes.class);
-        BlockPathTypes cqm13 = BlockPathTypes.BLOCKED;
-        final double double14 = ala.getBbWidth() / 2.0;
-        final BlockPos fk16 = new BlockPos(ala);
-        cqm13 = this.getBlockPathTypes(bjg, integer2, integer3, integer4, integer6, integer7, integer8, boolean9, boolean10, enumSet12, cqm13, fk16);
+        BlockPathTypes czb13 = BlockPathTypes.BLOCKED;
+        final BlockPos fu14 = aoz.blockPosition();
+        czb13 = this.getBlockPathTypes(bpg, integer2, integer3, integer4, integer6, integer7, integer8, boolean9, boolean10, enumSet12, czb13, fu14);
         if (enumSet12.contains(BlockPathTypes.FENCE)) {
             return BlockPathTypes.FENCE;
         }
-        BlockPathTypes cqm14 = BlockPathTypes.BLOCKED;
-        for (final BlockPathTypes cqm15 : enumSet12) {
-            if (ala.getPathfindingMalus(cqm15) < 0.0f) {
-                return cqm15;
+        if (enumSet12.contains(BlockPathTypes.UNPASSABLE_RAIL)) {
+            return BlockPathTypes.UNPASSABLE_RAIL;
+        }
+        BlockPathTypes czb14 = BlockPathTypes.BLOCKED;
+        for (final BlockPathTypes czb15 : enumSet12) {
+            if (aoz.getPathfindingMalus(czb15) < 0.0f) {
+                return czb15;
             }
-            if (ala.getPathfindingMalus(cqm15) < ala.getPathfindingMalus(cqm14)) {
+            if (aoz.getPathfindingMalus(czb15) < aoz.getPathfindingMalus(czb14)) {
                 continue;
             }
-            cqm14 = cqm15;
+            czb14 = czb15;
         }
-        if (cqm13 == BlockPathTypes.OPEN && ala.getPathfindingMalus(cqm14) == 0.0f) {
+        if (czb13 == BlockPathTypes.OPEN && aoz.getPathfindingMalus(czb14) == 0.0f) {
             return BlockPathTypes.OPEN;
         }
-        return cqm14;
+        return czb14;
     }
     
-    public BlockPathTypes getBlockPathTypes(final BlockGetter bjg, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final boolean boolean9, final EnumSet<BlockPathTypes> enumSet, BlockPathTypes cqm, final BlockPos fk) {
+    public BlockPathTypes getBlockPathTypes(final BlockGetter bpg, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7, final boolean boolean8, final boolean boolean9, final EnumSet<BlockPathTypes> enumSet, BlockPathTypes czb, final BlockPos fu) {
         for (int integer8 = 0; integer8 < integer5; ++integer8) {
             for (int integer9 = 0; integer9 < integer6; ++integer9) {
                 for (int integer10 = 0; integer10 < integer7; ++integer10) {
                     final int integer11 = integer8 + integer2;
                     final int integer12 = integer9 + integer3;
                     final int integer13 = integer10 + integer4;
-                    BlockPathTypes cqm2 = this.getBlockPathType(bjg, integer11, integer12, integer13);
-                    cqm2 = this.evaluateBlockPathType(bjg, boolean8, boolean9, fk, cqm2);
+                    BlockPathTypes czb2 = this.getBlockPathType(bpg, integer11, integer12, integer13);
+                    czb2 = this.evaluateBlockPathType(bpg, boolean8, boolean9, fu, czb2);
                     if (integer8 == 0 && integer9 == 0 && integer10 == 0) {
-                        cqm = cqm2;
+                        czb = czb2;
                     }
-                    enumSet.add(cqm2);
+                    enumSet.add(czb2);
                 }
             }
         }
-        return cqm;
+        return czb;
     }
     
-    protected BlockPathTypes evaluateBlockPathType(final BlockGetter bjg, final boolean boolean2, final boolean boolean3, final BlockPos fk, BlockPathTypes cqm) {
-        if (cqm == BlockPathTypes.DOOR_WOOD_CLOSED && boolean2 && boolean3) {
-            cqm = BlockPathTypes.WALKABLE;
+    protected BlockPathTypes evaluateBlockPathType(final BlockGetter bpg, final boolean boolean2, final boolean boolean3, final BlockPos fu, BlockPathTypes czb) {
+        if (czb == BlockPathTypes.DOOR_WOOD_CLOSED && boolean2 && boolean3) {
+            czb = BlockPathTypes.WALKABLE;
         }
-        if (cqm == BlockPathTypes.DOOR_OPEN && !boolean3) {
-            cqm = BlockPathTypes.BLOCKED;
+        if (czb == BlockPathTypes.DOOR_OPEN && !boolean3) {
+            czb = BlockPathTypes.BLOCKED;
         }
-        if (cqm == BlockPathTypes.RAIL && !(bjg.getBlockState(fk).getBlock() instanceof BaseRailBlock) && !(bjg.getBlockState(fk.below()).getBlock() instanceof BaseRailBlock)) {
-            cqm = BlockPathTypes.FENCE;
+        if (czb == BlockPathTypes.RAIL && !(bpg.getBlockState(fu).getBlock() instanceof BaseRailBlock) && !(bpg.getBlockState(fu.below()).getBlock() instanceof BaseRailBlock)) {
+            czb = BlockPathTypes.UNPASSABLE_RAIL;
         }
-        if (cqm == BlockPathTypes.LEAVES) {
-            cqm = BlockPathTypes.BLOCKED;
+        if (czb == BlockPathTypes.LEAVES) {
+            czb = BlockPathTypes.BLOCKED;
         }
-        return cqm;
+        return czb;
     }
     
-    private BlockPathTypes getBlockPathType(final Mob ala, final BlockPos fk) {
-        return this.getBlockPathType(ala, fk.getX(), fk.getY(), fk.getZ());
+    private BlockPathTypes getBlockPathType(final Mob aoz, final BlockPos fu) {
+        return this.getCachedBlockType(aoz, fu.getX(), fu.getY(), fu.getZ());
     }
     
-    private BlockPathTypes getBlockPathType(final Mob ala, final int integer2, final int integer3, final int integer4) {
-        return this.getBlockPathType(this.level, integer2, integer3, integer4, ala, this.entityWidth, this.entityHeight, this.entityDepth, this.canOpenDoors(), this.canPassDoors());
+    private BlockPathTypes getCachedBlockType(final Mob aoz, final int integer2, final int integer3, final int integer4) {
+        return (BlockPathTypes)this.pathTypesByPosCache.computeIfAbsent(BlockPos.asLong(integer2, integer3, integer4), long5 -> this.getBlockPathType(this.level, integer2, integer3, integer4, aoz, this.entityWidth, this.entityHeight, this.entityDepth, this.canOpenDoors(), this.canPassDoors()));
     }
     
     @Override
-    public BlockPathTypes getBlockPathType(final BlockGetter bjg, final int integer2, final int integer3, final int integer4) {
-        return getBlockPathTypeStatic(bjg, integer2, integer3, integer4);
+    public BlockPathTypes getBlockPathType(final BlockGetter bpg, final int integer2, final int integer3, final int integer4) {
+        return getBlockPathTypeStatic(bpg, new BlockPos.MutableBlockPos(integer2, integer3, integer4));
     }
     
-    public static BlockPathTypes getBlockPathTypeStatic(final BlockGetter bjg, final int integer2, final int integer3, final int integer4) {
-        BlockPathTypes cqm5 = getBlockPathTypeRaw(bjg, integer2, integer3, integer4);
-        if (cqm5 == BlockPathTypes.OPEN && integer3 >= 1) {
-            final Block bph6 = bjg.getBlockState(new BlockPos(integer2, integer3 - 1, integer4)).getBlock();
-            final BlockPathTypes cqm6 = getBlockPathTypeRaw(bjg, integer2, integer3 - 1, integer4);
-            cqm5 = ((cqm6 == BlockPathTypes.WALKABLE || cqm6 == BlockPathTypes.OPEN || cqm6 == BlockPathTypes.WATER || cqm6 == BlockPathTypes.LAVA) ? BlockPathTypes.OPEN : BlockPathTypes.WALKABLE);
-            if (cqm6 == BlockPathTypes.DAMAGE_FIRE || bph6 == Blocks.MAGMA_BLOCK || bph6 == Blocks.CAMPFIRE) {
-                cqm5 = BlockPathTypes.DAMAGE_FIRE;
+    public static BlockPathTypes getBlockPathTypeStatic(final BlockGetter bpg, final BlockPos.MutableBlockPos a) {
+        final int integer3 = a.getX();
+        final int integer4 = a.getY();
+        final int integer5 = a.getZ();
+        BlockPathTypes czb6 = getBlockPathTypeRaw(bpg, a);
+        if (czb6 == BlockPathTypes.OPEN && integer4 >= 1) {
+            final BlockPathTypes czb7 = getBlockPathTypeRaw(bpg, a.set(integer3, integer4 - 1, integer5));
+            czb6 = ((czb7 == BlockPathTypes.WALKABLE || czb7 == BlockPathTypes.OPEN || czb7 == BlockPathTypes.WATER || czb7 == BlockPathTypes.LAVA) ? BlockPathTypes.OPEN : BlockPathTypes.WALKABLE);
+            if (czb7 == BlockPathTypes.DAMAGE_FIRE) {
+                czb6 = BlockPathTypes.DAMAGE_FIRE;
             }
-            if (cqm6 == BlockPathTypes.DAMAGE_CACTUS) {
-                cqm5 = BlockPathTypes.DAMAGE_CACTUS;
+            if (czb7 == BlockPathTypes.DAMAGE_CACTUS) {
+                czb6 = BlockPathTypes.DAMAGE_CACTUS;
             }
-            if (cqm6 == BlockPathTypes.DAMAGE_OTHER) {
-                cqm5 = BlockPathTypes.DAMAGE_OTHER;
+            if (czb7 == BlockPathTypes.DAMAGE_OTHER) {
+                czb6 = BlockPathTypes.DAMAGE_OTHER;
             }
-            if (cqm6 == BlockPathTypes.STICKY_HONEY) {
-                cqm5 = BlockPathTypes.STICKY_HONEY;
+            if (czb7 == BlockPathTypes.STICKY_HONEY) {
+                czb6 = BlockPathTypes.STICKY_HONEY;
             }
         }
-        if (cqm5 == BlockPathTypes.WALKABLE) {
-            cqm5 = checkNeighbourBlocks(bjg, integer2, integer3, integer4, cqm5);
+        if (czb6 == BlockPathTypes.WALKABLE) {
+            czb6 = checkNeighbourBlocks(bpg, a.set(integer3, integer4, integer5), czb6);
         }
-        return cqm5;
+        return czb6;
     }
     
-    public static BlockPathTypes checkNeighbourBlocks(final BlockGetter bjg, final int integer2, final int integer3, final int integer4, BlockPathTypes cqm) {
-        try (final BlockPos.PooledMutableBlockPos b6 = BlockPos.PooledMutableBlockPos.acquire()) {
-            for (int integer5 = -1; integer5 <= 1; ++integer5) {
-                for (int integer6 = -1; integer6 <= 1; ++integer6) {
-                    for (int integer7 = -1; integer7 <= 1; ++integer7) {
-                        if (integer5 != 0 || integer7 != 0) {
-                            final Block bph11 = bjg.getBlockState(b6.set(integer5 + integer2, integer6 + integer3, integer7 + integer4)).getBlock();
-                            if (bph11 == Blocks.CACTUS) {
-                                cqm = BlockPathTypes.DANGER_CACTUS;
-                            }
-                            else if (bph11 == Blocks.FIRE || bph11 == Blocks.LAVA) {
-                                cqm = BlockPathTypes.DANGER_FIRE;
-                            }
-                            else if (bph11 == Blocks.SWEET_BERRY_BUSH) {
-                                cqm = BlockPathTypes.DANGER_OTHER;
-                            }
+    public static BlockPathTypes checkNeighbourBlocks(final BlockGetter bpg, final BlockPos.MutableBlockPos a, final BlockPathTypes czb) {
+        final int integer4 = a.getX();
+        final int integer5 = a.getY();
+        final int integer6 = a.getZ();
+        for (int integer7 = -1; integer7 <= 1; ++integer7) {
+            for (int integer8 = -1; integer8 <= 1; ++integer8) {
+                for (int integer9 = -1; integer9 <= 1; ++integer9) {
+                    if (integer7 != 0 || integer9 != 0) {
+                        a.set(integer4 + integer7, integer5 + integer8, integer6 + integer9);
+                        final BlockState cfj10 = bpg.getBlockState(a);
+                        if (cfj10.is(Blocks.CACTUS)) {
+                            return BlockPathTypes.DANGER_CACTUS;
+                        }
+                        if (cfj10.is(Blocks.SWEET_BERRY_BUSH)) {
+                            return BlockPathTypes.DANGER_OTHER;
+                        }
+                        if (isBurningBlock(cfj10)) {
+                            return BlockPathTypes.DANGER_FIRE;
+                        }
+                        final FluidState cxa11 = bpg.getFluidState(a);
+                        if (cxa11.is(FluidTags.WATER)) {
+                            return BlockPathTypes.WATER_BORDER;
+                        }
+                        if (cxa11.is(FluidTags.LAVA)) {
+                            return BlockPathTypes.LAVA;
                         }
                     }
                 }
             }
         }
-        return cqm;
+        return czb;
     }
     
-    protected static BlockPathTypes getBlockPathTypeRaw(final BlockGetter bjg, final int integer2, final int integer3, final int integer4) {
-        final BlockPos fk5 = new BlockPos(integer2, integer3, integer4);
-        final BlockState byj6 = bjg.getBlockState(fk5);
-        final Block bph7 = byj6.getBlock();
-        final Material coo8 = byj6.getMaterial();
-        if (byj6.isAir()) {
+    protected static BlockPathTypes getBlockPathTypeRaw(final BlockGetter bpg, final BlockPos fu) {
+        final BlockState cfj3 = bpg.getBlockState(fu);
+        final Block bvr4 = cfj3.getBlock();
+        final Material cxd5 = cfj3.getMaterial();
+        if (cfj3.isAir()) {
             return BlockPathTypes.OPEN;
         }
-        if (bph7.is(BlockTags.TRAPDOORS) || bph7 == Blocks.LILY_PAD) {
+        if (cfj3.is(BlockTags.TRAPDOORS) || cfj3.is(Blocks.LILY_PAD)) {
             return BlockPathTypes.TRAPDOOR;
         }
-        if (bph7 == Blocks.FIRE) {
-            return BlockPathTypes.DAMAGE_FIRE;
-        }
-        if (bph7 == Blocks.CACTUS) {
+        if (cfj3.is(Blocks.CACTUS)) {
             return BlockPathTypes.DAMAGE_CACTUS;
         }
-        if (bph7 == Blocks.SWEET_BERRY_BUSH) {
+        if (cfj3.is(Blocks.SWEET_BERRY_BUSH)) {
             return BlockPathTypes.DAMAGE_OTHER;
         }
-        if (bph7 == Blocks.HONEY_BLOCK) {
+        if (cfj3.is(Blocks.HONEY_BLOCK)) {
             return BlockPathTypes.STICKY_HONEY;
         }
-        if (bph7 == Blocks.COCOA) {
+        if (cfj3.is(Blocks.COCOA)) {
             return BlockPathTypes.COCOA;
         }
-        if (bph7 instanceof DoorBlock && coo8 == Material.WOOD && !byj6.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN)) {
+        if (isBurningBlock(cfj3)) {
+            return BlockPathTypes.DAMAGE_FIRE;
+        }
+        if (DoorBlock.isWoodenDoor(cfj3) && !cfj3.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN)) {
             return BlockPathTypes.DOOR_WOOD_CLOSED;
         }
-        if (bph7 instanceof DoorBlock && coo8 == Material.METAL && !byj6.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN)) {
+        if (bvr4 instanceof DoorBlock && cxd5 == Material.METAL && !cfj3.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN)) {
             return BlockPathTypes.DOOR_IRON_CLOSED;
         }
-        if (bph7 instanceof DoorBlock && byj6.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN)) {
+        if (bvr4 instanceof DoorBlock && cfj3.<Boolean>getValue((Property<Boolean>)DoorBlock.OPEN)) {
             return BlockPathTypes.DOOR_OPEN;
         }
-        if (bph7 instanceof BaseRailBlock) {
+        if (bvr4 instanceof BaseRailBlock) {
             return BlockPathTypes.RAIL;
         }
-        if (bph7 instanceof LeavesBlock) {
+        if (bvr4 instanceof LeavesBlock) {
             return BlockPathTypes.LEAVES;
         }
-        if (bph7.is(BlockTags.FENCES) || bph7.is(BlockTags.WALLS) || (bph7 instanceof FenceGateBlock && !byj6.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN))) {
+        if (bvr4.is(BlockTags.FENCES) || bvr4.is(BlockTags.WALLS) || (bvr4 instanceof FenceGateBlock && !cfj3.<Boolean>getValue((Property<Boolean>)FenceGateBlock.OPEN))) {
             return BlockPathTypes.FENCE;
         }
-        final FluidState coj9 = bjg.getFluidState(fk5);
-        if (coj9.is(FluidTags.WATER)) {
+        if (!cfj3.isPathfindable(bpg, fu, PathComputationType.LAND)) {
+            return BlockPathTypes.BLOCKED;
+        }
+        final FluidState cxa6 = bpg.getFluidState(fu);
+        if (cxa6.is(FluidTags.WATER)) {
             return BlockPathTypes.WATER;
         }
-        if (coj9.is(FluidTags.LAVA)) {
+        if (cxa6.is(FluidTags.LAVA)) {
             return BlockPathTypes.LAVA;
         }
-        if (byj6.isPathfindable(bjg, fk5, PathComputationType.LAND)) {
-            return BlockPathTypes.OPEN;
-        }
-        return BlockPathTypes.BLOCKED;
+        return BlockPathTypes.OPEN;
+    }
+    
+    private static boolean isBurningBlock(final BlockState cfj) {
+        return cfj.is(BlockTags.FIRE) || cfj.is(Blocks.MAGMA_BLOCK) || CampfireBlock.isLitCampfire(cfj);
     }
 }
diff --git a/src/net/minecraft/world/level/saveddata/SaveDataDirtyRunnable.java b/src/net/minecraft/world/level/saveddata/SaveDataDirtyRunnable.java
index 14eb57e..f58df72 100644
--- a/src/net/minecraft/world/level/saveddata/SaveDataDirtyRunnable.java
+++ b/src/net/minecraft/world/level/saveddata/SaveDataDirtyRunnable.java
@@ -3,8 +3,8 @@ package net.minecraft.world.level.saveddata;
 public class SaveDataDirtyRunnable implements Runnable {
     private final SavedData savedData;
     
-    public SaveDataDirtyRunnable(final SavedData crb) {
-        this.savedData = crb;
+    public SaveDataDirtyRunnable(final SavedData czq) {
+        this.savedData = czq;
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/saveddata/SavedData.java b/src/net/minecraft/world/level/saveddata/SavedData.java
index 7915a73..62896db 100644
--- a/src/net/minecraft/world/level/saveddata/SavedData.java
+++ b/src/net/minecraft/world/level/saveddata/SavedData.java
@@ -20,9 +20,9 @@ public abstract class SavedData {
         this.id = string;
     }
     
-    public abstract void load(final CompoundTag jt);
+    public abstract void load(final CompoundTag le);
     
-    public abstract CompoundTag save(final CompoundTag jt);
+    public abstract CompoundTag save(final CompoundTag le);
     
     public void setDirty() {
         this.setDirty(true);
@@ -44,11 +44,11 @@ public abstract class SavedData {
         if (!this.isDirty()) {
             return;
         }
-        final CompoundTag jt3 = new CompoundTag();
-        jt3.put("data", this.save(new CompoundTag()));
-        jt3.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
+        final CompoundTag le3 = new CompoundTag();
+        le3.put("data", this.save(new CompoundTag()));
+        le3.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
         try (final FileOutputStream fileOutputStream4 = new FileOutputStream(file)) {
-            NbtIo.writeCompressed(jt3, fileOutputStream4);
+            NbtIo.writeCompressed(le3, fileOutputStream4);
         }
         catch (IOException iOException4) {
             SavedData.LOGGER.error("Could not save data {}", this, iOException4);
diff --git a/src/net/minecraft/world/level/saveddata/maps/MapBanner.java b/src/net/minecraft/world/level/saveddata/maps/MapBanner.java
index 0698bf6..e9e56f6 100644
--- a/src/net/minecraft/world/level/saveddata/maps/MapBanner.java
+++ b/src/net/minecraft/world/level/saveddata/maps/MapBanner.java
@@ -19,27 +19,27 @@ public class MapBanner {
     @Nullable
     private final Component name;
     
-    public MapBanner(final BlockPos fk, final DyeColor bdj, @Nullable final Component lf) {
-        this.pos = fk;
-        this.color = bdj;
-        this.name = lf;
+    public MapBanner(final BlockPos fu, final DyeColor bje, @Nullable final Component mr) {
+        this.pos = fu;
+        this.color = bje;
+        this.name = mr;
     }
     
-    public static MapBanner load(final CompoundTag jt) {
-        final BlockPos fk2 = NbtUtils.readBlockPos(jt.getCompound("Pos"));
-        final DyeColor bdj3 = DyeColor.byName(jt.getString("Color"), DyeColor.WHITE);
-        final Component lf4 = jt.contains("Name") ? Component.Serializer.fromJson(jt.getString("Name")) : null;
-        return new MapBanner(fk2, bdj3, lf4);
+    public static MapBanner load(final CompoundTag le) {
+        final BlockPos fu2 = NbtUtils.readBlockPos(le.getCompound("Pos"));
+        final DyeColor bje3 = DyeColor.byName(le.getString("Color"), DyeColor.WHITE);
+        final Component mr4 = le.contains("Name") ? Component.Serializer.fromJson(le.getString("Name")) : null;
+        return new MapBanner(fu2, bje3, mr4);
     }
     
     @Nullable
-    public static MapBanner fromWorld(final BlockGetter bjg, final BlockPos fk) {
-        final BlockEntity bwl3 = bjg.getBlockEntity(fk);
-        if (bwl3 instanceof BannerBlockEntity) {
-            final BannerBlockEntity bwc4 = (BannerBlockEntity)bwl3;
-            final DyeColor bdj5 = bwc4.getBaseColor(() -> bjg.getBlockState(fk));
-            final Component lf6 = bwc4.hasCustomName() ? bwc4.getCustomName() : null;
-            return new MapBanner(fk, bdj5, lf6);
+    public static MapBanner fromWorld(final BlockGetter bpg, final BlockPos fu) {
+        final BlockEntity cdl3 = bpg.getBlockEntity(fu);
+        if (cdl3 instanceof BannerBlockEntity) {
+            final BannerBlockEntity cdc4 = (BannerBlockEntity)cdl3;
+            final DyeColor bje5 = cdc4.getBaseColor(() -> bpg.getBlockState(fu));
+            final Component mr6 = cdc4.hasCustomName() ? cdc4.getCustomName() : null;
+            return new MapBanner(fu, bje5, mr6);
         }
         return null;
     }
@@ -114,8 +114,8 @@ public class MapBanner {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final MapBanner crc3 = (MapBanner)object;
-        return Objects.equals(this.pos, crc3.pos) && this.color == crc3.color && Objects.equals(this.name, crc3.name);
+        final MapBanner czr3 = (MapBanner)object;
+        return Objects.equals(this.pos, czr3.pos) && this.color == czr3.color && Objects.equals(this.name, czr3.name);
     }
     
     @Override
@@ -124,13 +124,13 @@ public class MapBanner {
     }
     
     public CompoundTag save() {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.put("Pos", NbtUtils.writeBlockPos(this.pos));
-        jt2.putString("Color", this.color.getName());
+        final CompoundTag le2 = new CompoundTag();
+        le2.put("Pos", NbtUtils.writeBlockPos(this.pos));
+        le2.putString("Color", this.color.getName());
         if (this.name != null) {
-            jt2.putString("Name", Component.Serializer.toJson(this.name));
+            le2.putString("Name", Component.Serializer.toJson(this.name));
         }
-        return jt2;
+        return le2;
     }
     
     public String getId() {
diff --git a/src/net/minecraft/world/level/saveddata/maps/MapDecoration.java b/src/net/minecraft/world/level/saveddata/maps/MapDecoration.java
index 658011a..25bceb2 100644
--- a/src/net/minecraft/world/level/saveddata/maps/MapDecoration.java
+++ b/src/net/minecraft/world/level/saveddata/maps/MapDecoration.java
@@ -12,12 +12,12 @@ public class MapDecoration {
     private byte rot;
     private final Component name;
     
-    public MapDecoration(final Type a, final byte byte2, final byte byte3, final byte byte4, @Nullable final Component lf) {
+    public MapDecoration(final Type a, final byte byte2, final byte byte3, final byte byte4, @Nullable final Component mr) {
         this.type = a;
         this.x = byte2;
         this.y = byte3;
         this.rot = byte4;
-        this.name = lf;
+        this.name = mr;
     }
     
     public byte getImage() {
@@ -57,8 +57,8 @@ public class MapDecoration {
         if (!(object instanceof MapDecoration)) {
             return false;
         }
-        final MapDecoration crd3 = (MapDecoration)object;
-        return this.type == crd3.type && this.rot == crd3.rot && this.x == crd3.x && this.y == crd3.y && Objects.equals(this.name, crd3.name);
+        final MapDecoration czs3 = (MapDecoration)object;
+        return this.type == czs3.type && this.rot == czs3.rot && this.x == czs3.x && this.y == czs3.y && Objects.equals(this.name, czs3.name);
     }
     
     @Override
diff --git a/src/net/minecraft/world/level/saveddata/maps/MapFrame.java b/src/net/minecraft/world/level/saveddata/maps/MapFrame.java
index 2b53c2c..c72fdea 100644
--- a/src/net/minecraft/world/level/saveddata/maps/MapFrame.java
+++ b/src/net/minecraft/world/level/saveddata/maps/MapFrame.java
@@ -10,25 +10,25 @@ public class MapFrame {
     private final int rotation;
     private final int entityId;
     
-    public MapFrame(final BlockPos fk, final int integer2, final int integer3) {
-        this.pos = fk;
+    public MapFrame(final BlockPos fu, final int integer2, final int integer3) {
+        this.pos = fu;
         this.rotation = integer2;
         this.entityId = integer3;
     }
     
-    public static MapFrame load(final CompoundTag jt) {
-        final BlockPos fk2 = NbtUtils.readBlockPos(jt.getCompound("Pos"));
-        final int integer3 = jt.getInt("Rotation");
-        final int integer4 = jt.getInt("EntityId");
-        return new MapFrame(fk2, integer3, integer4);
+    public static MapFrame load(final CompoundTag le) {
+        final BlockPos fu2 = NbtUtils.readBlockPos(le.getCompound("Pos"));
+        final int integer3 = le.getInt("Rotation");
+        final int integer4 = le.getInt("EntityId");
+        return new MapFrame(fu2, integer3, integer4);
     }
     
     public CompoundTag save() {
-        final CompoundTag jt2 = new CompoundTag();
-        jt2.put("Pos", NbtUtils.writeBlockPos(this.pos));
-        jt2.putInt("Rotation", this.rotation);
-        jt2.putInt("EntityId", this.entityId);
-        return jt2;
+        final CompoundTag le2 = new CompoundTag();
+        le2.put("Pos", NbtUtils.writeBlockPos(this.pos));
+        le2.putInt("Rotation", this.rotation);
+        le2.putInt("EntityId", this.entityId);
+        return le2;
     }
     
     public BlockPos getPos() {
@@ -47,7 +47,7 @@ public class MapFrame {
         return frameId(this.pos);
     }
     
-    public static String frameId(final BlockPos fk) {
-        return "frame-" + fk.getX() + "," + fk.getY() + "," + fk.getZ();
+    public static String frameId(final BlockPos fu) {
+        return "frame-" + fu.getX() + "," + fu.getY() + "," + fu.getZ();
     }
 }
diff --git a/src/net/minecraft/world/level/saveddata/maps/MapIndex.java b/src/net/minecraft/world/level/saveddata/maps/MapIndex.java
index ba2f85d..9999d6b 100644
--- a/src/net/minecraft/world/level/saveddata/maps/MapIndex.java
+++ b/src/net/minecraft/world/level/saveddata/maps/MapIndex.java
@@ -16,21 +16,21 @@ public class MapIndex extends SavedData {
     }
     
     @Override
-    public void load(final CompoundTag jt) {
+    public void load(final CompoundTag le) {
         this.usedAuxIds.clear();
-        for (final String string4 : jt.getAllKeys()) {
-            if (jt.contains(string4, 99)) {
-                this.usedAuxIds.put(string4, jt.getInt(string4));
+        for (final String string4 : le.getAllKeys()) {
+            if (le.contains(string4, 99)) {
+                this.usedAuxIds.put(string4, le.getInt(string4));
             }
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
+    public CompoundTag save(final CompoundTag le) {
         for (final Object2IntMap.Entry<String> entry4 : this.usedAuxIds.object2IntEntrySet()) {
-            jt.putInt((String)entry4.getKey(), entry4.getIntValue());
+            le.putInt((String)entry4.getKey(), entry4.getIntValue());
         }
-        return jt;
+        return le;
     }
     
     public int getFreeAuxValueForMap() {
diff --git a/src/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
index 6966e64..c05ca2d 100644
--- a/src/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
+++ b/src/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
@@ -3,6 +3,7 @@ package net.minecraft.world.level.saveddata.maps;
 import java.util.AbstractList;
 import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket;
 import net.minecraft.world.item.MapItem;
+import org.apache.logging.log4j.LogManager;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.world.level.BlockGetter;
 import javax.annotation.Nullable;
@@ -11,9 +12,15 @@ import net.minecraft.world.entity.decoration.ItemFrame;
 import net.minecraft.world.item.ItemStack;
 import java.util.Iterator;
 import net.minecraft.nbt.Tag;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.LevelAccessor;
+import java.util.function.Consumer;
+import net.minecraft.world.level.dimension.DimensionType;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Mth;
 import com.google.common.collect.Maps;
@@ -21,13 +28,16 @@ import com.google.common.collect.Lists;
 import net.minecraft.world.entity.player.Player;
 import java.util.Map;
 import java.util.List;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import org.apache.logging.log4j.Logger;
 import net.minecraft.world.level.saveddata.SavedData;
 
 public class MapItemSavedData extends SavedData {
+    private static final Logger LOGGER;
     public int x;
     public int z;
-    public DimensionType dimension;
+    public ResourceKey<Level> dimension;
     public boolean trackingPosition;
     public boolean unlimitedTracking;
     public byte scale;
@@ -49,10 +59,10 @@ public class MapItemSavedData extends SavedData {
         this.frameMarkers = Maps.newHashMap();
     }
     
-    public void setProperties(final int integer1, final int integer2, final int integer3, final boolean boolean4, final boolean boolean5, final DimensionType cbi) {
+    public void setProperties(final int integer1, final int integer2, final int integer3, final boolean boolean4, final boolean boolean5, final ResourceKey<Level> ug) {
         this.scale = (byte)integer3;
         this.setOrigin(integer1, integer2, this.scale);
-        this.dimension = cbi;
+        this.dimension = ug;
         this.trackingPosition = boolean4;
         this.unlimitedTracking = boolean5;
         this.setDirty();
@@ -67,137 +77,136 @@ public class MapItemSavedData extends SavedData {
     }
     
     @Override
-    public void load(final CompoundTag jt) {
-        final int integer3 = jt.getInt("dimension");
-        final DimensionType cbi4 = DimensionType.getById(integer3);
-        if (cbi4 == null) {
-            throw new IllegalArgumentException("Invalid map dimension: " + integer3);
-        }
-        this.dimension = cbi4;
-        this.x = jt.getInt("xCenter");
-        this.z = jt.getInt("zCenter");
-        this.scale = (byte)Mth.clamp(jt.getByte("scale"), 0, 4);
-        this.trackingPosition = (!jt.contains("trackingPosition", 1) || jt.getBoolean("trackingPosition"));
-        this.unlimitedTracking = jt.getBoolean("unlimitedTracking");
-        this.locked = jt.getBoolean("locked");
-        this.colors = jt.getByteArray("colors");
+    public void load(final CompoundTag le) {
+        final IllegalArgumentException ex;
+        this.dimension = DimensionType.parseLegacy(new Dynamic((DynamicOps)NbtOps.INSTANCE, le.get("dimension"))).resultOrPartial((Consumer)MapItemSavedData.LOGGER::error).<Throwable>orElseThrow(() -> {
+            new IllegalArgumentException("Invalid map dimension: " + le.get("dimension"));
+            return ex;
+        });
+        this.x = le.getInt("xCenter");
+        this.z = le.getInt("zCenter");
+        this.scale = (byte)Mth.clamp(le.getByte("scale"), 0, 4);
+        this.trackingPosition = (!le.contains("trackingPosition", 1) || le.getBoolean("trackingPosition"));
+        this.unlimitedTracking = le.getBoolean("unlimitedTracking");
+        this.locked = le.getBoolean("locked");
+        this.colors = le.getByteArray("colors");
         if (this.colors.length != 16384) {
             this.colors = new byte[16384];
         }
-        final ListTag jz5 = jt.getList("banners", 10);
-        for (int integer4 = 0; integer4 < jz5.size(); ++integer4) {
-            final MapBanner crc7 = MapBanner.load(jz5.getCompound(integer4));
-            this.bannerMarkers.put(crc7.getId(), crc7);
-            this.addDecoration(crc7.getDecoration(), null, crc7.getId(), crc7.getPos().getX(), crc7.getPos().getZ(), 180.0, crc7.getName());
+        final ListTag lk3 = le.getList("banners", 10);
+        for (int integer4 = 0; integer4 < lk3.size(); ++integer4) {
+            final MapBanner czr5 = MapBanner.load(lk3.getCompound(integer4));
+            this.bannerMarkers.put(czr5.getId(), czr5);
+            this.addDecoration(czr5.getDecoration(), null, czr5.getId(), czr5.getPos().getX(), czr5.getPos().getZ(), 180.0, czr5.getName());
         }
-        final ListTag jz6 = jt.getList("frames", 10);
-        for (int integer5 = 0; integer5 < jz6.size(); ++integer5) {
-            final MapFrame cre8 = MapFrame.load(jz6.getCompound(integer5));
-            this.frameMarkers.put(cre8.getId(), cre8);
-            this.addDecoration(MapDecoration.Type.FRAME, null, "frame-" + cre8.getEntityId(), cre8.getPos().getX(), cre8.getPos().getZ(), cre8.getRotation(), null);
+        final ListTag lk4 = le.getList("frames", 10);
+        for (int integer5 = 0; integer5 < lk4.size(); ++integer5) {
+            final MapFrame czt6 = MapFrame.load(lk4.getCompound(integer5));
+            this.frameMarkers.put(czt6.getId(), czt6);
+            this.addDecoration(MapDecoration.Type.FRAME, null, "frame-" + czt6.getEntityId(), czt6.getPos().getX(), czt6.getPos().getZ(), czt6.getRotation(), null);
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
-        jt.putInt("dimension", this.dimension.getId());
-        jt.putInt("xCenter", this.x);
-        jt.putInt("zCenter", this.z);
-        jt.putByte("scale", this.scale);
-        jt.putByteArray("colors", this.colors);
-        jt.putBoolean("trackingPosition", this.trackingPosition);
-        jt.putBoolean("unlimitedTracking", this.unlimitedTracking);
-        jt.putBoolean("locked", this.locked);
-        final ListTag jz3 = new ListTag();
-        for (final MapBanner crc5 : this.bannerMarkers.values()) {
-            ((AbstractList<CompoundTag>)jz3).add(crc5.save());
+    public CompoundTag save(final CompoundTag le) {
+        ResourceLocation.CODEC.encodeStart((DynamicOps)NbtOps.INSTANCE, this.dimension.location()).resultOrPartial((Consumer)MapItemSavedData.LOGGER::error).ifPresent(lu -> le.put("dimension", lu));
+        le.putInt("xCenter", this.x);
+        le.putInt("zCenter", this.z);
+        le.putByte("scale", this.scale);
+        le.putByteArray("colors", this.colors);
+        le.putBoolean("trackingPosition", this.trackingPosition);
+        le.putBoolean("unlimitedTracking", this.unlimitedTracking);
+        le.putBoolean("locked", this.locked);
+        final ListTag lk3 = new ListTag();
+        for (final MapBanner czr5 : this.bannerMarkers.values()) {
+            ((AbstractList<CompoundTag>)lk3).add(czr5.save());
         }
-        jt.put("banners", jz3);
-        final ListTag jz4 = new ListTag();
-        for (final MapFrame cre6 : this.frameMarkers.values()) {
-            ((AbstractList<CompoundTag>)jz4).add(cre6.save());
+        le.put("banners", lk3);
+        final ListTag lk4 = new ListTag();
+        for (final MapFrame czt6 : this.frameMarkers.values()) {
+            ((AbstractList<CompoundTag>)lk4).add(czt6.save());
         }
-        jt.put("frames", jz4);
-        return jt;
+        le.put("frames", lk4);
+        return le;
     }
     
-    public void lockData(final MapItemSavedData crg) {
+    public void lockData(final MapItemSavedData czv) {
         this.locked = true;
-        this.x = crg.x;
-        this.z = crg.z;
-        this.bannerMarkers.putAll(crg.bannerMarkers);
-        this.decorations.putAll(crg.decorations);
-        System.arraycopy(crg.colors, 0, this.colors, 0, crg.colors.length);
+        this.x = czv.x;
+        this.z = czv.z;
+        this.bannerMarkers.putAll(czv.bannerMarkers);
+        this.decorations.putAll(czv.decorations);
+        System.arraycopy(czv.colors, 0, this.colors, 0, czv.colors.length);
         this.setDirty();
     }
     
-    public void tickCarriedBy(final Player ayj, final ItemStack ben) {
-        if (!this.carriedByPlayers.containsKey(ayj)) {
-            final HoldingPlayer a4 = new HoldingPlayer(ayj);
-            this.carriedByPlayers.put(ayj, a4);
+    public void tickCarriedBy(final Player bec, final ItemStack bki) {
+        if (!this.carriedByPlayers.containsKey(bec)) {
+            final HoldingPlayer a4 = new HoldingPlayer(bec);
+            this.carriedByPlayers.put(bec, a4);
             this.carriedBy.add(a4);
         }
-        if (!ayj.inventory.contains(ben)) {
-            this.decorations.remove(ayj.getName().getString());
+        if (!bec.inventory.contains(bki)) {
+            this.decorations.remove(bec.getName().getString());
         }
         for (int integer4 = 0; integer4 < this.carriedBy.size(); ++integer4) {
             final HoldingPlayer a5 = this.carriedBy.get(integer4);
             final String string6 = a5.player.getName().getString();
-            if (a5.player.removed || (!a5.player.inventory.contains(ben) && !ben.isFramed())) {
+            if (a5.player.removed || (!a5.player.inventory.contains(bki) && !bki.isFramed())) {
                 this.carriedByPlayers.remove(a5.player);
                 this.carriedBy.remove(a5);
                 this.decorations.remove(string6);
             }
-            else if (!ben.isFramed() && a5.player.dimension == this.dimension && this.trackingPosition) {
+            else if (!bki.isFramed() && a5.player.level.dimension() == this.dimension && this.trackingPosition) {
                 this.addDecoration(MapDecoration.Type.PLAYER, a5.player.level, string6, a5.player.getX(), a5.player.getZ(), a5.player.yRot, null);
             }
         }
-        if (ben.isFramed() && this.trackingPosition) {
-            final ItemFrame avr4 = ben.getFrame();
-            final BlockPos fk5 = avr4.getPos();
-            final MapFrame cre6 = this.frameMarkers.get(MapFrame.frameId(fk5));
-            if (cre6 != null && avr4.getId() != cre6.getEntityId() && this.frameMarkers.containsKey(cre6.getId())) {
-                this.decorations.remove("frame-" + cre6.getEntityId());
+        if (bki.isFramed() && this.trackingPosition) {
+            final ItemFrame bba4 = bki.getFrame();
+            final BlockPos fu5 = bba4.getPos();
+            final MapFrame czt6 = this.frameMarkers.get(MapFrame.frameId(fu5));
+            if (czt6 != null && bba4.getId() != czt6.getEntityId() && this.frameMarkers.containsKey(czt6.getId())) {
+                this.decorations.remove("frame-" + czt6.getEntityId());
             }
-            final MapFrame cre7 = new MapFrame(fk5, avr4.getDirection().get2DDataValue() * 90, avr4.getId());
-            this.addDecoration(MapDecoration.Type.FRAME, ayj.level, "frame-" + avr4.getId(), fk5.getX(), fk5.getZ(), avr4.getDirection().get2DDataValue() * 90, null);
-            this.frameMarkers.put(cre7.getId(), cre7);
+            final MapFrame czt7 = new MapFrame(fu5, bba4.getDirection().get2DDataValue() * 90, bba4.getId());
+            this.addDecoration(MapDecoration.Type.FRAME, bec.level, "frame-" + bba4.getId(), fu5.getX(), fu5.getZ(), bba4.getDirection().get2DDataValue() * 90, null);
+            this.frameMarkers.put(czt7.getId(), czt7);
         }
-        final CompoundTag jt4 = ben.getTag();
-        if (jt4 != null && jt4.contains("Decorations", 9)) {
-            final ListTag jz5 = jt4.getList("Decorations", 10);
-            for (int integer5 = 0; integer5 < jz5.size(); ++integer5) {
-                final CompoundTag jt5 = jz5.getCompound(integer5);
-                if (!this.decorations.containsKey(jt5.getString("id"))) {
-                    this.addDecoration(MapDecoration.Type.byIcon(jt5.getByte("type")), ayj.level, jt5.getString("id"), jt5.getDouble("x"), jt5.getDouble("z"), jt5.getDouble("rot"), null);
+        final CompoundTag le4 = bki.getTag();
+        if (le4 != null && le4.contains("Decorations", 9)) {
+            final ListTag lk5 = le4.getList("Decorations", 10);
+            for (int integer5 = 0; integer5 < lk5.size(); ++integer5) {
+                final CompoundTag le5 = lk5.getCompound(integer5);
+                if (!this.decorations.containsKey(le5.getString("id"))) {
+                    this.addDecoration(MapDecoration.Type.byIcon(le5.getByte("type")), bec.level, le5.getString("id"), le5.getDouble("x"), le5.getDouble("z"), le5.getDouble("rot"), null);
                 }
             }
         }
     }
     
-    public static void addTargetDecoration(final ItemStack ben, final BlockPos fk, final String string, final MapDecoration.Type a) {
-        ListTag jz5;
-        if (ben.hasTag() && ben.getTag().contains("Decorations", 9)) {
-            jz5 = ben.getTag().getList("Decorations", 10);
+    public static void addTargetDecoration(final ItemStack bki, final BlockPos fu, final String string, final MapDecoration.Type a) {
+        ListTag lk5;
+        if (bki.hasTag() && bki.getTag().contains("Decorations", 9)) {
+            lk5 = bki.getTag().getList("Decorations", 10);
         }
         else {
-            jz5 = new ListTag();
-            ben.addTagElement("Decorations", jz5);
+            lk5 = new ListTag();
+            bki.addTagElement("Decorations", lk5);
         }
-        final CompoundTag jt6 = new CompoundTag();
-        jt6.putByte("type", a.getIcon());
-        jt6.putString("id", string);
-        jt6.putDouble("x", fk.getX());
-        jt6.putDouble("z", fk.getZ());
-        jt6.putDouble("rot", 180.0);
-        ((AbstractList<CompoundTag>)jz5).add(jt6);
+        final CompoundTag le6 = new CompoundTag();
+        le6.putByte("type", a.getIcon());
+        le6.putString("id", string);
+        le6.putDouble("x", fu.getX());
+        le6.putDouble("z", fu.getZ());
+        le6.putDouble("rot", 180.0);
+        ((AbstractList<CompoundTag>)lk5).add(le6);
         if (a.hasMapColor()) {
-            final CompoundTag jt7 = ben.getOrCreateTagElement("display");
-            jt7.putInt("MapColor", a.getMapColor());
+            final CompoundTag le7 = bki.getOrCreateTagElement("display");
+            le7.putInt("MapColor", a.getMapColor());
         }
     }
     
-    private void addDecoration(MapDecoration.Type a, @Nullable final LevelAccessor bjx, final String string, final double double4, final double double5, double double6, @Nullable final Component lf) {
+    private void addDecoration(MapDecoration.Type a, @Nullable final LevelAccessor bqc, final String string, final double double4, final double double5, double double6, @Nullable final Component mr) {
         final int integer12 = 1 << this.scale;
         final float float13 = (float)(double4 - this.x) / integer12;
         final float float14 = (float)(double5 - this.z) / integer12;
@@ -208,8 +217,8 @@ public class MapItemSavedData extends SavedData {
         if (float13 >= -63.0f && float14 >= -63.0f && float13 <= 63.0f && float14 <= 63.0f) {
             double6 += ((double6 < 0.0) ? -8.0 : 8.0);
             byte17 = (byte)(double6 * 16.0 / 360.0);
-            if (this.dimension == DimensionType.NETHER && bjx != null) {
-                final int integer14 = (int)(bjx.getLevelData().getDayTime() / 10L);
+            if (this.dimension == Level.NETHER && bqc != null) {
+                final int integer14 = (int)(bqc.getLevelData().getDayTime() / 10L);
                 byte17 = (byte)(integer14 * integer14 * 34187121 + integer14 * 121 >> 15 & 0xF);
             }
         }
@@ -243,16 +252,16 @@ public class MapItemSavedData extends SavedData {
                 byte16 = 127;
             }
         }
-        this.decorations.put(string, new MapDecoration(a, byte15, byte16, byte17, lf));
+        this.decorations.put(string, new MapDecoration(a, byte15, byte16, byte17, mr));
     }
     
     @Nullable
-    public Packet<?> getUpdatePacket(final ItemStack ben, final BlockGetter bjg, final Player ayj) {
-        final HoldingPlayer a5 = this.carriedByPlayers.get(ayj);
+    public Packet<?> getUpdatePacket(final ItemStack bki, final BlockGetter bpg, final Player bec) {
+        final HoldingPlayer a5 = this.carriedByPlayers.get(bec);
         if (a5 == null) {
             return null;
         }
-        return a5.nextUpdatePacket(ben);
+        return a5.nextUpdatePacket(bki);
     }
     
     public void setDirty(final int integer1, final int integer2) {
@@ -262,65 +271,69 @@ public class MapItemSavedData extends SavedData {
         }
     }
     
-    public HoldingPlayer getHoldingPlayer(final Player ayj) {
-        HoldingPlayer a3 = this.carriedByPlayers.get(ayj);
+    public HoldingPlayer getHoldingPlayer(final Player bec) {
+        HoldingPlayer a3 = this.carriedByPlayers.get(bec);
         if (a3 == null) {
-            a3 = new HoldingPlayer(ayj);
-            this.carriedByPlayers.put(ayj, a3);
+            a3 = new HoldingPlayer(bec);
+            this.carriedByPlayers.put(bec, a3);
             this.carriedBy.add(a3);
         }
         return a3;
     }
     
-    public void toggleBanner(final LevelAccessor bjx, final BlockPos fk) {
-        final float float4 = fk.getX() + 0.5f;
-        final float float5 = fk.getZ() + 0.5f;
-        final int integer6 = 1 << this.scale;
-        final float float6 = (float4 - this.x) / integer6;
-        final float float7 = (float5 - this.z) / integer6;
-        final int integer7 = 63;
-        boolean boolean10 = false;
-        if (float6 >= -63.0f && float7 >= -63.0f && float6 <= 63.0f && float7 <= 63.0f) {
-            final MapBanner crc11 = MapBanner.fromWorld(bjx, fk);
-            if (crc11 == null) {
+    public void toggleBanner(final LevelAccessor bqc, final BlockPos fu) {
+        final double double4 = fu.getX() + 0.5;
+        final double double5 = fu.getZ() + 0.5;
+        final int integer8 = 1 << this.scale;
+        final double double6 = (double4 - this.x) / integer8;
+        final double double7 = (double5 - this.z) / integer8;
+        final int integer9 = 63;
+        boolean boolean14 = false;
+        if (double6 >= -63.0 && double7 >= -63.0 && double6 <= 63.0 && double7 <= 63.0) {
+            final MapBanner czr15 = MapBanner.fromWorld(bqc, fu);
+            if (czr15 == null) {
                 return;
             }
-            boolean boolean11 = true;
-            if (this.bannerMarkers.containsKey(crc11.getId()) && this.bannerMarkers.get(crc11.getId()).equals(crc11)) {
-                this.bannerMarkers.remove(crc11.getId());
-                this.decorations.remove(crc11.getId());
-                boolean11 = false;
-                boolean10 = true;
+            boolean boolean15 = true;
+            if (this.bannerMarkers.containsKey(czr15.getId()) && this.bannerMarkers.get(czr15.getId()).equals(czr15)) {
+                this.bannerMarkers.remove(czr15.getId());
+                this.decorations.remove(czr15.getId());
+                boolean15 = false;
+                boolean14 = true;
             }
-            if (boolean11) {
-                this.bannerMarkers.put(crc11.getId(), crc11);
-                this.addDecoration(crc11.getDecoration(), bjx, crc11.getId(), float4, float5, 180.0, crc11.getName());
-                boolean10 = true;
+            if (boolean15) {
+                this.bannerMarkers.put(czr15.getId(), czr15);
+                this.addDecoration(czr15.getDecoration(), bqc, czr15.getId(), double4, double5, 180.0, czr15.getName());
+                boolean14 = true;
             }
-            if (boolean10) {
+            if (boolean14) {
                 this.setDirty();
             }
         }
     }
     
-    public void checkBanners(final BlockGetter bjg, final int integer2, final int integer3) {
+    public void checkBanners(final BlockGetter bpg, final int integer2, final int integer3) {
         final Iterator<MapBanner> iterator5 = this.bannerMarkers.values().iterator();
         while (iterator5.hasNext()) {
-            final MapBanner crc6 = iterator5.next();
-            if (crc6.getPos().getX() == integer2 && crc6.getPos().getZ() == integer3) {
-                final MapBanner crc7 = MapBanner.fromWorld(bjg, crc6.getPos());
-                if (crc6.equals(crc7)) {
+            final MapBanner czr6 = iterator5.next();
+            if (czr6.getPos().getX() == integer2 && czr6.getPos().getZ() == integer3) {
+                final MapBanner czr7 = MapBanner.fromWorld(bpg, czr6.getPos());
+                if (czr6.equals(czr7)) {
                     continue;
                 }
                 iterator5.remove();
-                this.decorations.remove(crc6.getId());
+                this.decorations.remove(czr6.getId());
             }
         }
     }
     
-    public void removedFromFrame(final BlockPos fk, final int integer) {
+    public void removedFromFrame(final BlockPos fu, final int integer) {
         this.decorations.remove("frame-" + integer);
-        this.frameMarkers.remove(MapFrame.frameId(fk));
+        this.frameMarkers.remove(MapFrame.frameId(fu));
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
     }
     
     public class HoldingPlayer {
@@ -333,21 +346,21 @@ public class MapItemSavedData extends SavedData {
         private int tick;
         public int step;
         
-        public HoldingPlayer(final Player ayj) {
+        public HoldingPlayer(final Player bec) {
             this.dirtyData = true;
             this.maxDirtyX = 127;
             this.maxDirtyY = 127;
-            this.player = ayj;
+            this.player = bec;
         }
         
         @Nullable
-        public Packet<?> nextUpdatePacket(final ItemStack ben) {
+        public Packet<?> nextUpdatePacket(final ItemStack bki) {
             if (this.dirtyData) {
                 this.dirtyData = false;
-                return new ClientboundMapItemDataPacket(MapItem.getMapId(ben), MapItemSavedData.this.scale, MapItemSavedData.this.trackingPosition, MapItemSavedData.this.locked, MapItemSavedData.this.decorations.values(), MapItemSavedData.this.colors, this.minDirtyX, this.minDirtyY, this.maxDirtyX + 1 - this.minDirtyX, this.maxDirtyY + 1 - this.minDirtyY);
+                return new ClientboundMapItemDataPacket(MapItem.getMapId(bki), MapItemSavedData.this.scale, MapItemSavedData.this.trackingPosition, MapItemSavedData.this.locked, MapItemSavedData.this.decorations.values(), MapItemSavedData.this.colors, this.minDirtyX, this.minDirtyY, this.maxDirtyX + 1 - this.minDirtyX, this.maxDirtyY + 1 - this.minDirtyY);
             }
             if (this.tick++ % 5 == 0) {
-                return new ClientboundMapItemDataPacket(MapItem.getMapId(ben), MapItemSavedData.this.scale, MapItemSavedData.this.trackingPosition, MapItemSavedData.this.locked, MapItemSavedData.this.decorations.values(), MapItemSavedData.this.colors, 0, 0, 0, 0);
+                return new ClientboundMapItemDataPacket(MapItem.getMapId(bki), MapItemSavedData.this.scale, MapItemSavedData.this.trackingPosition, MapItemSavedData.this.locked, MapItemSavedData.this.decorations.values(), MapItemSavedData.this.colors, 0, 0, 0, 0);
             }
             return null;
         }
diff --git a/src/net/minecraft/world/level/storage/CommandStorage.java b/src/net/minecraft/world/level/storage/CommandStorage.java
index 0f4df42..b679a94 100644
--- a/src/net/minecraft/world/level/storage/CommandStorage.java
+++ b/src/net/minecraft/world/level/storage/CommandStorage.java
@@ -13,9 +13,9 @@ public class CommandStorage {
     private final Map<String, Container> namespaces;
     private final DimensionDataStorage storage;
     
-    public CommandStorage(final DimensionDataStorage crl) {
+    public CommandStorage(final DimensionDataStorage daa) {
         this.namespaces = Maps.newHashMap();
-        this.storage = crl;
+        this.storage = daa;
     }
     
     private Container newStorage(final String string1, final String string2) {
@@ -24,17 +24,17 @@ public class CommandStorage {
         return a4;
     }
     
-    public CompoundTag get(final ResourceLocation sm) {
-        final String string3 = sm.getNamespace();
+    public CompoundTag get(final ResourceLocation uh) {
+        final String string3 = uh.getNamespace();
         final String string4 = createId(string3);
         final Container a5 = this.storage.<Container>get(() -> this.newStorage(string3, string4), string4);
-        return (a5 != null) ? a5.get(sm.getPath()) : new CompoundTag();
+        return (a5 != null) ? a5.get(uh.getPath()) : new CompoundTag();
     }
     
-    public void set(final ResourceLocation sm, final CompoundTag jt) {
-        final String string4 = sm.getNamespace();
+    public void set(final ResourceLocation uh, final CompoundTag le) {
+        final String string4 = uh.getNamespace();
         final String string5 = createId(string4);
-        this.storage.<Container>computeIfAbsent(() -> this.newStorage(string4, string5), string5).put(sm.getPath(), jt);
+        this.storage.<Container>computeIfAbsent(() -> this.newStorage(string4, string5), string5).put(uh.getPath(), le);
     }
     
     public Stream<ResourceLocation> keys() {
@@ -54,32 +54,32 @@ public class CommandStorage {
         }
         
         @Override
-        public void load(final CompoundTag jt) {
-            final CompoundTag jt2 = jt.getCompound("contents");
-            for (final String string5 : jt2.getAllKeys()) {
-                this.storage.put(string5, jt2.getCompound(string5));
+        public void load(final CompoundTag le) {
+            final CompoundTag le2 = le.getCompound("contents");
+            for (final String string5 : le2.getAllKeys()) {
+                this.storage.put(string5, le2.getCompound(string5));
             }
         }
         
         @Override
-        public CompoundTag save(final CompoundTag jt) {
-            final CompoundTag jt4 = new CompoundTag();
-            this.storage.forEach((string, jt3) -> jt4.put(string, jt3.copy()));
-            jt.put("contents", jt4);
-            return jt;
+        public CompoundTag save(final CompoundTag le) {
+            final CompoundTag le4 = new CompoundTag();
+            this.storage.forEach((string, le3) -> le4.put(string, le3.copy()));
+            le.put("contents", le4);
+            return le;
         }
         
         public CompoundTag get(final String string) {
-            final CompoundTag jt3 = this.storage.get(string);
-            return (jt3 != null) ? jt3 : new CompoundTag();
+            final CompoundTag le3 = this.storage.get(string);
+            return (le3 != null) ? le3 : new CompoundTag();
         }
         
-        public void put(final String string, final CompoundTag jt) {
-            if (jt.isEmpty()) {
+        public void put(final String string, final CompoundTag le) {
+            if (le.isEmpty()) {
                 this.storage.remove(string);
             }
             else {
-                this.storage.put(string, jt);
+                this.storage.put(string, le);
             }
             this.setDirty();
         }
diff --git a/src/net/minecraft/world/level/storage/DerivedLevelData.java b/src/net/minecraft/world/level/storage/DerivedLevelData.java
index 3375f9e..e6418a5 100644
--- a/src/net/minecraft/world/level/storage/DerivedLevelData.java
+++ b/src/net/minecraft/world/level/storage/DerivedLevelData.java
@@ -1,32 +1,22 @@
 package net.minecraft.world.level.storage;
 
 import net.minecraft.CrashReportCategory;
-import net.minecraft.world.level.dimension.DimensionType;
+import java.util.UUID;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.timers.TimerQueue;
 import net.minecraft.world.Difficulty;
+import net.minecraft.world.level.border.WorldBorder;
 import net.minecraft.world.level.GameRules;
-import net.minecraft.world.level.LevelType;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.GameType;
-import javax.annotation.Nullable;
-import net.minecraft.nbt.CompoundTag;
 
-public class DerivedLevelData extends LevelData {
-    private final LevelData wrapped;
+public class DerivedLevelData implements ServerLevelData {
+    private final WorldData worldData;
+    private final ServerLevelData wrapped;
     
-    public DerivedLevelData(final LevelData crm) {
-        this.wrapped = crm;
-    }
-    
-    @Override
-    public CompoundTag createTag(@Nullable final CompoundTag jt) {
-        return this.wrapped.createTag(jt);
-    }
-    
-    @Override
-    public long getSeed() {
-        return this.wrapped.getSeed();
+    public DerivedLevelData(final WorldData dal, final ServerLevelData dak) {
+        this.worldData = dal;
+        this.wrapped = dak;
     }
     
     @Override
@@ -54,24 +44,18 @@ public class DerivedLevelData extends LevelData {
         return this.wrapped.getDayTime();
     }
     
-    @Override
-    public CompoundTag getLoadedPlayerTag() {
-        return this.wrapped.getLoadedPlayerTag();
-    }
-    
     @Override
     public String getLevelName() {
-        return this.wrapped.getLevelName();
+        return this.worldData.getLevelName();
     }
     
     @Override
-    public int getVersion() {
-        return this.wrapped.getVersion();
+    public int getClearWeatherTime() {
+        return this.wrapped.getClearWeatherTime();
     }
     
     @Override
-    public long getLastPlayed() {
-        return this.wrapped.getLastPlayed();
+    public void setClearWeatherTime(final int integer) {
     }
     
     @Override
@@ -96,7 +80,7 @@ public class DerivedLevelData extends LevelData {
     
     @Override
     public GameType getGameType() {
-        return this.wrapped.getGameType();
+        return this.worldData.getGameType();
     }
     
     @Override
@@ -120,15 +104,7 @@ public class DerivedLevelData extends LevelData {
     }
     
     @Override
-    public void setSpawn(final BlockPos fk) {
-    }
-    
-    @Override
-    public void setLevelName(final String string) {
-    }
-    
-    @Override
-    public void setVersion(final int integer) {
+    public void setSpawn(final BlockPos fu) {
     }
     
     @Override
@@ -148,31 +124,17 @@ public class DerivedLevelData extends LevelData {
     }
     
     @Override
-    public boolean isGenerateMapFeatures() {
-        return this.wrapped.isGenerateMapFeatures();
+    public void setGameType(final GameType bpy) {
     }
     
     @Override
     public boolean isHardcore() {
-        return this.wrapped.isHardcore();
-    }
-    
-    @Override
-    public LevelType getGeneratorType() {
-        return this.wrapped.getGeneratorType();
-    }
-    
-    @Override
-    public void setGenerator(final LevelType bkd) {
+        return this.worldData.isHardcore();
     }
     
     @Override
     public boolean getAllowCommands() {
-        return this.wrapped.getAllowCommands();
-    }
-    
-    @Override
-    public void setAllowCommands(final boolean boolean1) {
+        return this.worldData.getAllowCommands();
     }
     
     @Override
@@ -186,25 +148,26 @@ public class DerivedLevelData extends LevelData {
     
     @Override
     public GameRules getGameRules() {
-        return this.wrapped.getGameRules();
+        return this.worldData.getGameRules();
+    }
+    
+    @Override
+    public WorldBorder.Settings getWorldBorder() {
+        return this.wrapped.getWorldBorder();
+    }
+    
+    @Override
+    public void setWorldBorder(final WorldBorder.Settings c) {
     }
     
     @Override
     public Difficulty getDifficulty() {
-        return this.wrapped.getDifficulty();
-    }
-    
-    @Override
-    public void setDifficulty(final Difficulty aji) {
+        return this.worldData.getDifficulty();
     }
     
     @Override
     public boolean isDifficultyLocked() {
-        return this.wrapped.isDifficultyLocked();
-    }
-    
-    @Override
-    public void setDifficultyLocked(final boolean boolean1) {
+        return this.worldData.isDifficultyLocked();
     }
     
     @Override
@@ -213,18 +176,30 @@ public class DerivedLevelData extends LevelData {
     }
     
     @Override
-    public void setDimensionData(final DimensionType cbi, final CompoundTag jt) {
-        this.wrapped.setDimensionData(cbi, jt);
+    public int getWanderingTraderSpawnDelay() {
+        return 0;
     }
     
     @Override
-    public CompoundTag getDimensionData(final DimensionType cbi) {
-        return this.wrapped.getDimensionData(cbi);
+    public void setWanderingTraderSpawnDelay(final int integer) {
     }
     
     @Override
-    public void fillCrashReportCategory(final CrashReportCategory i) {
-        i.setDetail("Derived", true);
-        this.wrapped.fillCrashReportCategory(i);
+    public int getWanderingTraderSpawnChance() {
+        return 0;
+    }
+    
+    @Override
+    public void setWanderingTraderSpawnChance(final int integer) {
+    }
+    
+    @Override
+    public void setWanderingTraderId(final UUID uUID) {
+    }
+    
+    @Override
+    public void fillCrashReportCategory(final CrashReportCategory k) {
+        k.setDetail("Derived", true);
+        this.wrapped.fillCrashReportCategory(k);
     }
 }
diff --git a/src/net/minecraft/world/level/storage/DimensionDataStorage.java b/src/net/minecraft/world/level/storage/DimensionDataStorage.java
index 13dbe14..cdcdba9 100644
--- a/src/net/minecraft/world/level/storage/DimensionDataStorage.java
+++ b/src/net/minecraft/world/level/storage/DimensionDataStorage.java
@@ -38,23 +38,23 @@ public class DimensionDataStorage {
     }
     
     public <T extends SavedData> T computeIfAbsent(final Supplier<T> supplier, final String string) {
-        final T crb4 = (T)this.<SavedData>get((Supplier<SavedData>)supplier, string);
-        if (crb4 != null) {
-            return crb4;
+        final T czq4 = (T)this.<SavedData>get((Supplier<SavedData>)supplier, string);
+        if (czq4 != null) {
+            return czq4;
         }
-        final T crb5 = supplier.get();
-        this.set(crb5);
-        return crb5;
+        final T czq5 = supplier.get();
+        this.set(czq5);
+        return czq5;
     }
     
     @Nullable
     public <T extends SavedData> T get(final Supplier<T> supplier, final String string) {
-        SavedData crb4 = this.cache.get(string);
-        if (crb4 == null && !this.cache.containsKey(string)) {
-            crb4 = this.<SavedData>readSavedData((Supplier<SavedData>)supplier, string);
-            this.cache.put(string, crb4);
+        SavedData czq4 = this.cache.get(string);
+        if (czq4 == null && !this.cache.containsKey(string)) {
+            czq4 = this.<SavedData>readSavedData((Supplier<SavedData>)supplier, string);
+            this.cache.put(string, czq4);
         }
-        return (T)crb4;
+        return (T)czq4;
     }
     
     @Nullable
@@ -62,10 +62,10 @@ public class DimensionDataStorage {
         try {
             final File file4 = this.getDataFile(string);
             if (file4.exists()) {
-                final T crb5 = supplier.get();
-                final CompoundTag jt6 = this.readTagFromDisk(string, SharedConstants.getCurrentVersion().getWorldVersion());
-                crb5.load(jt6.getCompound("data"));
-                return crb5;
+                final T czq5 = supplier.get();
+                final CompoundTag le6 = this.readTagFromDisk(string, SharedConstants.getCurrentVersion().getWorldVersion());
+                czq5.load(le6.getCompound("data"));
+                return czq5;
             }
         }
         catch (Exception exception4) {
@@ -74,24 +74,24 @@ public class DimensionDataStorage {
         return null;
     }
     
-    public void set(final SavedData crb) {
-        this.cache.put(crb.getId(), crb);
+    public void set(final SavedData czq) {
+        this.cache.put(czq.getId(), czq);
     }
     
     public CompoundTag readTagFromDisk(final String string, final int integer) throws IOException {
         final File file4 = this.getDataFile(string);
         try (final PushbackInputStream pushbackInputStream5 = new PushbackInputStream(new FileInputStream(file4), 2)) {
-            CompoundTag jt7;
+            CompoundTag le7;
             if (this.isGzip(pushbackInputStream5)) {
-                jt7 = NbtIo.readCompressed(pushbackInputStream5);
+                le7 = NbtIo.readCompressed(pushbackInputStream5);
             }
             else {
                 try (final DataInputStream dataInputStream8 = new DataInputStream(pushbackInputStream5)) {
-                    jt7 = NbtIo.read(dataInputStream8);
+                    le7 = NbtIo.read(dataInputStream8);
                 }
             }
-            final int integer2 = jt7.contains("DataVersion", 99) ? jt7.getInt("DataVersion") : 1343;
-            return NbtUtils.update(this.fixerUpper, DataFixTypes.SAVED_DATA, jt7, integer2, integer);
+            final int integer2 = le7.contains("DataVersion", 99) ? le7.getInt("DataVersion") : 1343;
+            return NbtUtils.update(this.fixerUpper, DataFixTypes.SAVED_DATA, le7, integer2, integer);
         }
     }
     
@@ -112,9 +112,9 @@ public class DimensionDataStorage {
     }
     
     public void save() {
-        for (final SavedData crb3 : this.cache.values()) {
-            if (crb3 != null) {
-                crb3.save(this.getDataFile(crb3.getId()));
+        for (final SavedData czq3 : this.cache.values()) {
+            if (czq3 != null) {
+                czq3.save(this.getDataFile(czq3.getId()));
             }
         }
     }
diff --git a/src/net/minecraft/world/level/storage/LevelData.java b/src/net/minecraft/world/level/storage/LevelData.java
index 75d53f1..e4d5a46 100644
--- a/src/net/minecraft/world/level/storage/LevelData.java
+++ b/src/net/minecraft/world/level/storage/LevelData.java
@@ -1,786 +1,36 @@
 package net.minecraft.world.level.storage;
 
-import java.util.AbstractList;
 import net.minecraft.CrashReportCategory;
-import net.minecraft.core.BlockPos;
-import net.minecraft.nbt.NbtUtils;
-import net.minecraft.util.datafix.DataFixTypes;
-import com.google.common.hash.Hashing;
-import net.minecraft.Util;
-import net.minecraft.nbt.Tag;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import net.minecraft.nbt.StringTag;
-import com.mojang.datafixers.types.DynamicOps;
-import com.mojang.datafixers.Dynamic;
-import net.minecraft.nbt.NbtOps;
-import com.mojang.datafixers.types.JsonOps;
-import net.minecraft.world.level.LevelSettings;
-import java.util.Iterator;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.SharedConstants;
-import net.minecraft.world.level.timers.TimerCallbacks;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.timers.TimerQueue;
-import net.minecraft.world.level.GameRules;
-import java.util.UUID;
-import net.minecraft.world.level.dimension.DimensionType;
-import java.util.Map;
-import java.util.Set;
-import net.minecraft.world.level.GameType;
-import com.mojang.datafixers.DataFixer;
-import javax.annotation.Nullable;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.LevelType;
 import net.minecraft.world.Difficulty;
+import net.minecraft.world.level.GameRules;
 
-public class LevelData {
-    private String minecraftVersionName;
-    private int minecraftVersion;
-    private boolean snapshot;
-    public static final Difficulty DEFAULT_DIFFICULTY;
-    private long seed;
-    private LevelType generator;
-    private CompoundTag generatorOptions;
-    @Nullable
-    private String legacyCustomOptions;
-    private int xSpawn;
-    private int ySpawn;
-    private int zSpawn;
-    private long gameTime;
-    private long dayTime;
-    private long lastPlayed;
-    private long sizeOnDisk;
-    @Nullable
-    private final DataFixer fixerUpper;
-    private final int playerDataVersion;
-    private boolean upgradedPlayerTag;
-    private CompoundTag loadedPlayerTag;
-    private String levelName;
-    private int version;
-    private int clearWeatherTime;
-    private boolean raining;
-    private int rainTime;
-    private boolean thundering;
-    private int thunderTime;
-    private GameType gameType;
-    private boolean generateMapFeatures;
-    private boolean hardcore;
-    private boolean allowCommands;
-    private boolean initialized;
-    private Difficulty difficulty;
-    private boolean difficultyLocked;
-    private double borderX;
-    private double borderZ;
-    private double borderSize;
-    private long borderSizeLerpTime;
-    private double borderSizeLerpTarget;
-    private double borderSafeZone;
-    private double borderDamagePerBlock;
-    private int borderWarningBlocks;
-    private int borderWarningTime;
-    private final Set<String> disabledDataPacks;
-    private final Set<String> enabledDataPacks;
-    private final Map<DimensionType, CompoundTag> dimensionData;
-    private CompoundTag customBossEvents;
-    private int wanderingTraderSpawnDelay;
-    private int wanderingTraderSpawnChance;
-    private UUID wanderingTraderId;
-    private Set<String> knownServerBrands;
-    private boolean wasModded;
-    private final GameRules gameRules;
-    private final TimerQueue<MinecraftServer> scheduledEvents;
+public interface LevelData {
+    int getXSpawn();
     
-    protected LevelData() {
-        this.generator = LevelType.NORMAL;
-        this.generatorOptions = new CompoundTag();
-        this.borderSize = 6.0E7;
-        this.borderSafeZone = 5.0;
-        this.borderDamagePerBlock = 0.2;
-        this.borderWarningBlocks = 5;
-        this.borderWarningTime = 15;
-        this.disabledDataPacks = Sets.newHashSet();
-        this.enabledDataPacks = Sets.newLinkedHashSet();
-        this.dimensionData = Maps.newIdentityHashMap();
-        this.knownServerBrands = Sets.newLinkedHashSet();
-        this.gameRules = new GameRules();
-        this.scheduledEvents = new TimerQueue<MinecraftServer>(TimerCallbacks.SERVER_CALLBACKS);
-        this.fixerUpper = null;
-        this.playerDataVersion = SharedConstants.getCurrentVersion().getWorldVersion();
-        this.setGeneratorOptions(new CompoundTag());
-    }
+    int getYSpawn();
     
-    public LevelData(final CompoundTag jt1, final DataFixer dataFixer, final int integer, @Nullable final CompoundTag jt4) {
-        this.generator = LevelType.NORMAL;
-        this.generatorOptions = new CompoundTag();
-        this.borderSize = 6.0E7;
-        this.borderSafeZone = 5.0;
-        this.borderDamagePerBlock = 0.2;
-        this.borderWarningBlocks = 5;
-        this.borderWarningTime = 15;
-        this.disabledDataPacks = Sets.newHashSet();
-        this.enabledDataPacks = Sets.newLinkedHashSet();
-        this.dimensionData = Maps.newIdentityHashMap();
-        this.knownServerBrands = Sets.newLinkedHashSet();
-        this.gameRules = new GameRules();
-        this.scheduledEvents = new TimerQueue<MinecraftServer>(TimerCallbacks.SERVER_CALLBACKS);
-        this.fixerUpper = dataFixer;
-        final ListTag jz6 = jt1.getList("ServerBrands", 8);
-        for (int integer2 = 0; integer2 < jz6.size(); ++integer2) {
-            this.knownServerBrands.add(jz6.getString(integer2));
-        }
-        this.wasModded = jt1.getBoolean("WasModded");
-        if (jt1.contains("Version", 10)) {
-            final CompoundTag jt5 = jt1.getCompound("Version");
-            this.minecraftVersionName = jt5.getString("Name");
-            this.minecraftVersion = jt5.getInt("Id");
-            this.snapshot = jt5.getBoolean("Snapshot");
-        }
-        this.seed = jt1.getLong("RandomSeed");
-        if (jt1.contains("generatorName", 8)) {
-            final String string7 = jt1.getString("generatorName");
-            this.generator = LevelType.getLevelType(string7);
-            if (this.generator == null) {
-                this.generator = LevelType.NORMAL;
-            }
-            else if (this.generator == LevelType.CUSTOMIZED) {
-                this.legacyCustomOptions = jt1.getString("generatorOptions");
-            }
-            else if (this.generator.hasReplacement()) {
-                int integer3 = 0;
-                if (jt1.contains("generatorVersion", 99)) {
-                    integer3 = jt1.getInt("generatorVersion");
-                }
-                this.generator = this.generator.getReplacementForVersion(integer3);
-            }
-            this.setGeneratorOptions(jt1.getCompound("generatorOptions"));
-        }
-        this.gameType = GameType.byId(jt1.getInt("GameType"));
-        if (jt1.contains("legacy_custom_options", 8)) {
-            this.legacyCustomOptions = jt1.getString("legacy_custom_options");
-        }
-        if (jt1.contains("MapFeatures", 99)) {
-            this.generateMapFeatures = jt1.getBoolean("MapFeatures");
-        }
-        else {
-            this.generateMapFeatures = true;
-        }
-        this.xSpawn = jt1.getInt("SpawnX");
-        this.ySpawn = jt1.getInt("SpawnY");
-        this.zSpawn = jt1.getInt("SpawnZ");
-        this.gameTime = jt1.getLong("Time");
-        if (jt1.contains("DayTime", 99)) {
-            this.dayTime = jt1.getLong("DayTime");
-        }
-        else {
-            this.dayTime = this.gameTime;
-        }
-        this.lastPlayed = jt1.getLong("LastPlayed");
-        this.sizeOnDisk = jt1.getLong("SizeOnDisk");
-        this.levelName = jt1.getString("LevelName");
-        this.version = jt1.getInt("version");
-        this.clearWeatherTime = jt1.getInt("clearWeatherTime");
-        this.rainTime = jt1.getInt("rainTime");
-        this.raining = jt1.getBoolean("raining");
-        this.thunderTime = jt1.getInt("thunderTime");
-        this.thundering = jt1.getBoolean("thundering");
-        this.hardcore = jt1.getBoolean("hardcore");
-        if (jt1.contains("initialized", 99)) {
-            this.initialized = jt1.getBoolean("initialized");
-        }
-        else {
-            this.initialized = true;
-        }
-        if (jt1.contains("allowCommands", 99)) {
-            this.allowCommands = jt1.getBoolean("allowCommands");
-        }
-        else {
-            this.allowCommands = (this.gameType == GameType.CREATIVE);
-        }
-        this.playerDataVersion = integer;
-        if (jt4 != null) {
-            this.loadedPlayerTag = jt4;
-        }
-        if (jt1.contains("GameRules", 10)) {
-            this.gameRules.loadFromTag(jt1.getCompound("GameRules"));
-        }
-        if (jt1.contains("Difficulty", 99)) {
-            this.difficulty = Difficulty.byId(jt1.getByte("Difficulty"));
-        }
-        if (jt1.contains("DifficultyLocked", 1)) {
-            this.difficultyLocked = jt1.getBoolean("DifficultyLocked");
-        }
-        if (jt1.contains("BorderCenterX", 99)) {
-            this.borderX = jt1.getDouble("BorderCenterX");
-        }
-        if (jt1.contains("BorderCenterZ", 99)) {
-            this.borderZ = jt1.getDouble("BorderCenterZ");
-        }
-        if (jt1.contains("BorderSize", 99)) {
-            this.borderSize = jt1.getDouble("BorderSize");
-        }
-        if (jt1.contains("BorderSizeLerpTime", 99)) {
-            this.borderSizeLerpTime = jt1.getLong("BorderSizeLerpTime");
-        }
-        if (jt1.contains("BorderSizeLerpTarget", 99)) {
-            this.borderSizeLerpTarget = jt1.getDouble("BorderSizeLerpTarget");
-        }
-        if (jt1.contains("BorderSafeZone", 99)) {
-            this.borderSafeZone = jt1.getDouble("BorderSafeZone");
-        }
-        if (jt1.contains("BorderDamagePerBlock", 99)) {
-            this.borderDamagePerBlock = jt1.getDouble("BorderDamagePerBlock");
-        }
-        if (jt1.contains("BorderWarningBlocks", 99)) {
-            this.borderWarningBlocks = jt1.getInt("BorderWarningBlocks");
-        }
-        if (jt1.contains("BorderWarningTime", 99)) {
-            this.borderWarningTime = jt1.getInt("BorderWarningTime");
-        }
-        if (jt1.contains("DimensionData", 10)) {
-            final CompoundTag jt5 = jt1.getCompound("DimensionData");
-            for (final String string8 : jt5.getAllKeys()) {
-                this.dimensionData.put(DimensionType.getById(Integer.parseInt(string8)), jt5.getCompound(string8));
-            }
-        }
-        if (jt1.contains("DataPacks", 10)) {
-            final CompoundTag jt5 = jt1.getCompound("DataPacks");
-            final ListTag jz7 = jt5.getList("Disabled", 8);
-            for (int integer4 = 0; integer4 < jz7.size(); ++integer4) {
-                this.disabledDataPacks.add(jz7.getString(integer4));
-            }
-            final ListTag jz8 = jt5.getList("Enabled", 8);
-            for (int integer5 = 0; integer5 < jz8.size(); ++integer5) {
-                this.enabledDataPacks.add(jz8.getString(integer5));
-            }
-        }
-        if (jt1.contains("CustomBossEvents", 10)) {
-            this.customBossEvents = jt1.getCompound("CustomBossEvents");
-        }
-        if (jt1.contains("ScheduledEvents", 9)) {
-            this.scheduledEvents.load(jt1.getList("ScheduledEvents", 10));
-        }
-        if (jt1.contains("WanderingTraderSpawnDelay", 99)) {
-            this.wanderingTraderSpawnDelay = jt1.getInt("WanderingTraderSpawnDelay");
-        }
-        if (jt1.contains("WanderingTraderSpawnChance", 99)) {
-            this.wanderingTraderSpawnChance = jt1.getInt("WanderingTraderSpawnChance");
-        }
-        if (jt1.contains("WanderingTraderId", 8)) {
-            this.wanderingTraderId = UUID.fromString(jt1.getString("WanderingTraderId"));
-        }
-    }
+    int getZSpawn();
     
-    public LevelData(final LevelSettings bka, final String string) {
-        this.generator = LevelType.NORMAL;
-        this.generatorOptions = new CompoundTag();
-        this.borderSize = 6.0E7;
-        this.borderSafeZone = 5.0;
-        this.borderDamagePerBlock = 0.2;
-        this.borderWarningBlocks = 5;
-        this.borderWarningTime = 15;
-        this.disabledDataPacks = Sets.newHashSet();
-        this.enabledDataPacks = Sets.newLinkedHashSet();
-        this.dimensionData = Maps.newIdentityHashMap();
-        this.knownServerBrands = Sets.newLinkedHashSet();
-        this.gameRules = new GameRules();
-        this.scheduledEvents = new TimerQueue<MinecraftServer>(TimerCallbacks.SERVER_CALLBACKS);
-        this.fixerUpper = null;
-        this.playerDataVersion = SharedConstants.getCurrentVersion().getWorldVersion();
-        this.setLevelSettings(bka);
-        this.levelName = string;
-        this.difficulty = LevelData.DEFAULT_DIFFICULTY;
-        this.initialized = false;
-    }
+    long getGameTime();
     
-    public void setLevelSettings(final LevelSettings bka) {
-        this.seed = bka.getSeed();
-        this.gameType = bka.getGameType();
-        this.generateMapFeatures = bka.isGenerateMapFeatures();
-        this.hardcore = bka.isHardcore();
-        this.generator = bka.getLevelType();
-        this.setGeneratorOptions((CompoundTag)Dynamic.convert((DynamicOps)JsonOps.INSTANCE, (DynamicOps)NbtOps.INSTANCE, bka.getLevelTypeOptions()));
-        this.allowCommands = bka.getAllowCommands();
-    }
+    long getDayTime();
     
-    public CompoundTag createTag(@Nullable CompoundTag jt) {
-        this.updatePlayerTag();
-        if (jt == null) {
-            jt = this.loadedPlayerTag;
-        }
-        final CompoundTag jt2 = new CompoundTag();
-        this.setTagData(jt2, jt);
-        return jt2;
-    }
+    boolean isThundering();
     
-    private void setTagData(final CompoundTag jt1, final CompoundTag jt2) {
-        final ListTag jz4 = new ListTag();
-        this.knownServerBrands.stream().map(StringTag::valueOf).forEach(jz4::add);
-        jt1.put("ServerBrands", jz4);
-        jt1.putBoolean("WasModded", this.wasModded);
-        final CompoundTag jt3 = new CompoundTag();
-        jt3.putString("Name", SharedConstants.getCurrentVersion().getName());
-        jt3.putInt("Id", SharedConstants.getCurrentVersion().getWorldVersion());
-        jt3.putBoolean("Snapshot", !SharedConstants.getCurrentVersion().isStable());
-        jt1.put("Version", jt3);
-        jt1.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
-        jt1.putLong("RandomSeed", this.seed);
-        jt1.putString("generatorName", this.generator.getSerialization());
-        jt1.putInt("generatorVersion", this.generator.getVersion());
-        if (!this.generatorOptions.isEmpty()) {
-            jt1.put("generatorOptions", this.generatorOptions);
-        }
-        if (this.legacyCustomOptions != null) {
-            jt1.putString("legacy_custom_options", this.legacyCustomOptions);
-        }
-        jt1.putInt("GameType", this.gameType.getId());
-        jt1.putBoolean("MapFeatures", this.generateMapFeatures);
-        jt1.putInt("SpawnX", this.xSpawn);
-        jt1.putInt("SpawnY", this.ySpawn);
-        jt1.putInt("SpawnZ", this.zSpawn);
-        jt1.putLong("Time", this.gameTime);
-        jt1.putLong("DayTime", this.dayTime);
-        jt1.putLong("SizeOnDisk", this.sizeOnDisk);
-        jt1.putLong("LastPlayed", Util.getEpochMillis());
-        jt1.putString("LevelName", this.levelName);
-        jt1.putInt("version", this.version);
-        jt1.putInt("clearWeatherTime", this.clearWeatherTime);
-        jt1.putInt("rainTime", this.rainTime);
-        jt1.putBoolean("raining", this.raining);
-        jt1.putInt("thunderTime", this.thunderTime);
-        jt1.putBoolean("thundering", this.thundering);
-        jt1.putBoolean("hardcore", this.hardcore);
-        jt1.putBoolean("allowCommands", this.allowCommands);
-        jt1.putBoolean("initialized", this.initialized);
-        jt1.putDouble("BorderCenterX", this.borderX);
-        jt1.putDouble("BorderCenterZ", this.borderZ);
-        jt1.putDouble("BorderSize", this.borderSize);
-        jt1.putLong("BorderSizeLerpTime", this.borderSizeLerpTime);
-        jt1.putDouble("BorderSafeZone", this.borderSafeZone);
-        jt1.putDouble("BorderDamagePerBlock", this.borderDamagePerBlock);
-        jt1.putDouble("BorderSizeLerpTarget", this.borderSizeLerpTarget);
-        jt1.putDouble("BorderWarningBlocks", this.borderWarningBlocks);
-        jt1.putDouble("BorderWarningTime", this.borderWarningTime);
-        if (this.difficulty != null) {
-            jt1.putByte("Difficulty", (byte)this.difficulty.getId());
-        }
-        jt1.putBoolean("DifficultyLocked", this.difficultyLocked);
-        jt1.put("GameRules", this.gameRules.createTag());
-        final CompoundTag jt4 = new CompoundTag();
-        for (final Map.Entry<DimensionType, CompoundTag> entry8 : this.dimensionData.entrySet()) {
-            jt4.put(String.valueOf(entry8.getKey().getId()), entry8.getValue());
-        }
-        jt1.put("DimensionData", jt4);
-        if (jt2 != null) {
-            jt1.put("Player", jt2);
-        }
-        final CompoundTag jt5 = new CompoundTag();
-        final ListTag jz5 = new ListTag();
-        for (final String string10 : this.enabledDataPacks) {
-            ((AbstractList<StringTag>)jz5).add(StringTag.valueOf(string10));
-        }
-        jt5.put("Enabled", jz5);
-        final ListTag jz6 = new ListTag();
-        for (final String string11 : this.disabledDataPacks) {
-            ((AbstractList<StringTag>)jz6).add(StringTag.valueOf(string11));
-        }
-        jt5.put("Disabled", jz6);
-        jt1.put("DataPacks", jt5);
-        if (this.customBossEvents != null) {
-            jt1.put("CustomBossEvents", this.customBossEvents);
-        }
-        jt1.put("ScheduledEvents", this.scheduledEvents.store());
-        jt1.putInt("WanderingTraderSpawnDelay", this.wanderingTraderSpawnDelay);
-        jt1.putInt("WanderingTraderSpawnChance", this.wanderingTraderSpawnChance);
-        if (this.wanderingTraderId != null) {
-            jt1.putString("WanderingTraderId", this.wanderingTraderId.toString());
-        }
-    }
+    boolean isRaining();
     
-    public long getSeed() {
-        return this.seed;
-    }
+    void setRaining(final boolean boolean1);
     
-    public static long obfuscateSeed(final long long1) {
-        return Hashing.sha256().hashLong(long1).asLong();
-    }
+    boolean isHardcore();
     
-    public int getXSpawn() {
-        return this.xSpawn;
-    }
+    GameRules getGameRules();
     
-    public int getYSpawn() {
-        return this.ySpawn;
-    }
+    Difficulty getDifficulty();
     
-    public int getZSpawn() {
-        return this.zSpawn;
-    }
+    boolean isDifficultyLocked();
     
-    public long getGameTime() {
-        return this.gameTime;
-    }
-    
-    public long getDayTime() {
-        return this.dayTime;
-    }
-    
-    private void updatePlayerTag() {
-        if (this.upgradedPlayerTag || this.loadedPlayerTag == null) {
-            return;
-        }
-        if (this.playerDataVersion < SharedConstants.getCurrentVersion().getWorldVersion()) {
-            if (this.fixerUpper == null) {
-                throw Util.<NullPointerException>pauseInIde(new NullPointerException("Fixer Upper not set inside LevelData, and the player tag is not upgraded."));
-            }
-            this.loadedPlayerTag = NbtUtils.update(this.fixerUpper, DataFixTypes.PLAYER, this.loadedPlayerTag, this.playerDataVersion);
-        }
-        this.upgradedPlayerTag = true;
-    }
-    
-    public CompoundTag getLoadedPlayerTag() {
-        this.updatePlayerTag();
-        return this.loadedPlayerTag;
-    }
-    
-    public void setXSpawn(final int integer) {
-        this.xSpawn = integer;
-    }
-    
-    public void setYSpawn(final int integer) {
-        this.ySpawn = integer;
-    }
-    
-    public void setZSpawn(final int integer) {
-        this.zSpawn = integer;
-    }
-    
-    public void setGameTime(final long long1) {
-        this.gameTime = long1;
-    }
-    
-    public void setDayTime(final long long1) {
-        this.dayTime = long1;
-    }
-    
-    public void setSpawn(final BlockPos fk) {
-        this.xSpawn = fk.getX();
-        this.ySpawn = fk.getY();
-        this.zSpawn = fk.getZ();
-    }
-    
-    public String getLevelName() {
-        return this.levelName;
-    }
-    
-    public void setLevelName(final String string) {
-        this.levelName = string;
-    }
-    
-    public int getVersion() {
-        return this.version;
-    }
-    
-    public void setVersion(final int integer) {
-        this.version = integer;
-    }
-    
-    public long getLastPlayed() {
-        return this.lastPlayed;
-    }
-    
-    public int getClearWeatherTime() {
-        return this.clearWeatherTime;
-    }
-    
-    public void setClearWeatherTime(final int integer) {
-        this.clearWeatherTime = integer;
-    }
-    
-    public boolean isThundering() {
-        return this.thundering;
-    }
-    
-    public void setThundering(final boolean boolean1) {
-        this.thundering = boolean1;
-    }
-    
-    public int getThunderTime() {
-        return this.thunderTime;
-    }
-    
-    public void setThunderTime(final int integer) {
-        this.thunderTime = integer;
-    }
-    
-    public boolean isRaining() {
-        return this.raining;
-    }
-    
-    public void setRaining(final boolean boolean1) {
-        this.raining = boolean1;
-    }
-    
-    public int getRainTime() {
-        return this.rainTime;
-    }
-    
-    public void setRainTime(final int integer) {
-        this.rainTime = integer;
-    }
-    
-    public GameType getGameType() {
-        return this.gameType;
-    }
-    
-    public boolean isGenerateMapFeatures() {
-        return this.generateMapFeatures;
-    }
-    
-    public void setGenerateMapFeatures(final boolean boolean1) {
-        this.generateMapFeatures = boolean1;
-    }
-    
-    public void setGameType(final GameType bjt) {
-        this.gameType = bjt;
-    }
-    
-    public boolean isHardcore() {
-        return this.hardcore;
-    }
-    
-    public void setHardcore(final boolean boolean1) {
-        this.hardcore = boolean1;
-    }
-    
-    public LevelType getGeneratorType() {
-        return this.generator;
-    }
-    
-    public void setGenerator(final LevelType bkd) {
-        this.generator = bkd;
-    }
-    
-    public CompoundTag getGeneratorOptions() {
-        return this.generatorOptions;
-    }
-    
-    public void setGeneratorOptions(final CompoundTag jt) {
-        this.generatorOptions = jt;
-    }
-    
-    public boolean getAllowCommands() {
-        return this.allowCommands;
-    }
-    
-    public void setAllowCommands(final boolean boolean1) {
-        this.allowCommands = boolean1;
-    }
-    
-    public boolean isInitialized() {
-        return this.initialized;
-    }
-    
-    public void setInitialized(final boolean boolean1) {
-        this.initialized = boolean1;
-    }
-    
-    public GameRules getGameRules() {
-        return this.gameRules;
-    }
-    
-    public double getBorderX() {
-        return this.borderX;
-    }
-    
-    public double getBorderZ() {
-        return this.borderZ;
-    }
-    
-    public double getBorderSize() {
-        return this.borderSize;
-    }
-    
-    public void setBorderSize(final double double1) {
-        this.borderSize = double1;
-    }
-    
-    public long getBorderSizeLerpTime() {
-        return this.borderSizeLerpTime;
-    }
-    
-    public void setBorderSizeLerpTime(final long long1) {
-        this.borderSizeLerpTime = long1;
-    }
-    
-    public double getBorderSizeLerpTarget() {
-        return this.borderSizeLerpTarget;
-    }
-    
-    public void setBorderSizeLerpTarget(final double double1) {
-        this.borderSizeLerpTarget = double1;
-    }
-    
-    public void setBorderZ(final double double1) {
-        this.borderZ = double1;
-    }
-    
-    public void setBorderX(final double double1) {
-        this.borderX = double1;
-    }
-    
-    public double getBorderSafeZone() {
-        return this.borderSafeZone;
-    }
-    
-    public void setBorderSafeZone(final double double1) {
-        this.borderSafeZone = double1;
-    }
-    
-    public double getBorderDamagePerBlock() {
-        return this.borderDamagePerBlock;
-    }
-    
-    public void setBorderDamagePerBlock(final double double1) {
-        this.borderDamagePerBlock = double1;
-    }
-    
-    public int getBorderWarningBlocks() {
-        return this.borderWarningBlocks;
-    }
-    
-    public int getBorderWarningTime() {
-        return this.borderWarningTime;
-    }
-    
-    public void setBorderWarningBlocks(final int integer) {
-        this.borderWarningBlocks = integer;
-    }
-    
-    public void setBorderWarningTime(final int integer) {
-        this.borderWarningTime = integer;
-    }
-    
-    public Difficulty getDifficulty() {
-        return this.difficulty;
-    }
-    
-    public void setDifficulty(final Difficulty aji) {
-        this.difficulty = aji;
-    }
-    
-    public boolean isDifficultyLocked() {
-        return this.difficultyLocked;
-    }
-    
-    public void setDifficultyLocked(final boolean boolean1) {
-        this.difficultyLocked = boolean1;
-    }
-    
-    public TimerQueue<MinecraftServer> getScheduledEvents() {
-        return this.scheduledEvents;
-    }
-    
-    public void fillCrashReportCategory(final CrashReportCategory i) {
-        i.setDetail("Level name", () -> this.levelName);
-        i.setDetail("Level seed", () -> String.valueOf(this.seed));
-        i.setDetail("Level generator", () -> String.format("ID %02d - %s, ver %d. Features enabled: %b", this.generator.getId(), this.generator.getName(), this.generator.getVersion(), this.generateMapFeatures));
-        i.setDetail("Level generator options", () -> this.generatorOptions.toString());
-        i.setDetail("Level spawn location", () -> CrashReportCategory.formatLocation(this.xSpawn, this.ySpawn, this.zSpawn));
-        i.setDetail("Level time", () -> String.format("%d game time, %d day time", this.gameTime, this.dayTime));
-        i.setDetail("Known server brands", () -> String.join(", ", this.knownServerBrands));
-        i.setDetail("Level was modded", () -> Boolean.toString(this.wasModded));
-        String string2;
-        i.setDetail("Level storage version", () -> {
-            string2 = "Unknown?";
-            try {
-                switch (this.version) {
-                    case 19133: {
-                        string2 = "Anvil";
-                        break;
-                    }
-                    case 19132: {
-                        string2 = "McRegion";
-                        break;
-                    }
-                }
-            }
-            catch (Throwable t) {}
-            return String.format("0x%05X - %s", this.version, string2);
-        });
-        i.setDetail("Level weather", () -> String.format("Rain time: %d (now: %b), thunder time: %d (now: %b)", this.rainTime, this.raining, this.thunderTime, this.thundering));
-        i.setDetail("Level game mode", () -> String.format("Game mode: %s (ID %d). Hardcore: %b. Cheats: %b", this.gameType.getName(), this.gameType.getId(), this.hardcore, this.allowCommands));
-    }
-    
-    public CompoundTag getDimensionData(final DimensionType cbi) {
-        final CompoundTag jt3 = this.dimensionData.get(cbi);
-        if (jt3 == null) {
-            return new CompoundTag();
-        }
-        return jt3;
-    }
-    
-    public void setDimensionData(final DimensionType cbi, final CompoundTag jt) {
-        this.dimensionData.put(cbi, jt);
-    }
-    
-    public int getMinecraftVersion() {
-        return this.minecraftVersion;
-    }
-    
-    public boolean isSnapshot() {
-        return this.snapshot;
-    }
-    
-    public String getMinecraftVersionName() {
-        return this.minecraftVersionName;
-    }
-    
-    public Set<String> getDisabledDataPacks() {
-        return this.disabledDataPacks;
-    }
-    
-    public Set<String> getEnabledDataPacks() {
-        return this.enabledDataPacks;
-    }
-    
-    @Nullable
-    public CompoundTag getCustomBossEvents() {
-        return this.customBossEvents;
-    }
-    
-    public void setCustomBossEvents(@Nullable final CompoundTag jt) {
-        this.customBossEvents = jt;
-    }
-    
-    public int getWanderingTraderSpawnDelay() {
-        return this.wanderingTraderSpawnDelay;
-    }
-    
-    public void setWanderingTraderSpawnDelay(final int integer) {
-        this.wanderingTraderSpawnDelay = integer;
-    }
-    
-    public int getWanderingTraderSpawnChance() {
-        return this.wanderingTraderSpawnChance;
-    }
-    
-    public void setWanderingTraderSpawnChance(final int integer) {
-        this.wanderingTraderSpawnChance = integer;
-    }
-    
-    public void setWanderingTraderId(final UUID uUID) {
-        this.wanderingTraderId = uUID;
-    }
-    
-    public void setModdedInfo(final String string, final boolean boolean2) {
-        this.knownServerBrands.add(string);
-        this.wasModded |= boolean2;
-    }
-    
-    static {
-        DEFAULT_DIFFICULTY = Difficulty.NORMAL;
+    default void fillCrashReportCategory(final CrashReportCategory k) {
+        k.setDetail("Level spawn location", () -> CrashReportCategory.formatLocation(this.getXSpawn(), this.getYSpawn(), this.getZSpawn()));
+        k.setDetail("Level time", () -> String.format("%d game time, %d day time", this.getGameTime(), this.getDayTime()));
     }
 }
diff --git a/src/net/minecraft/world/level/storage/LevelResource.java b/src/net/minecraft/world/level/storage/LevelResource.java
new file mode 100644
index 0000000..b328afd
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/LevelResource.java
@@ -0,0 +1,39 @@
+package net.minecraft.world.level.storage;
+
+public class LevelResource {
+    public static final LevelResource PLAYER_ADVANCEMENTS_DIR;
+    public static final LevelResource PLAYER_STATS_DIR;
+    public static final LevelResource PLAYER_DATA_DIR;
+    public static final LevelResource PLAYER_OLD_DATA_DIR;
+    public static final LevelResource LEVEL_DATA_FILE;
+    public static final LevelResource GENERATED_DIR;
+    public static final LevelResource DATAPACK_DIR;
+    public static final LevelResource MAP_RESOURCE_FILE;
+    public static final LevelResource ROOT;
+    private final String id;
+    
+    private LevelResource(final String string) {
+        this.id = string;
+    }
+    
+    public String getId() {
+        return this.id;
+    }
+    
+    @Override
+    public String toString() {
+        return "/" + this.id;
+    }
+    
+    static {
+        PLAYER_ADVANCEMENTS_DIR = new LevelResource("advancements");
+        PLAYER_STATS_DIR = new LevelResource("stats");
+        PLAYER_DATA_DIR = new LevelResource("playerdata");
+        PLAYER_OLD_DATA_DIR = new LevelResource("players");
+        LEVEL_DATA_FILE = new LevelResource("level.dat");
+        GENERATED_DIR = new LevelResource("generated");
+        DATAPACK_DIR = new LevelResource("datapacks");
+        MAP_RESOURCE_FILE = new LevelResource("resources.zip");
+        ROOT = new LevelResource(".");
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/LevelStorage.java b/src/net/minecraft/world/level/storage/LevelStorage.java
deleted file mode 100644
index c63a271..0000000
--- a/src/net/minecraft/world/level/storage/LevelStorage.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package net.minecraft.world.level.storage;
-
-import org.apache.logging.log4j.LogManager;
-import net.minecraft.nbt.NbtUtils;
-import net.minecraft.util.datafix.DataFixTypes;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.LevelConflictException;
-import java.io.InputStream;
-import java.io.DataInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.DataOutputStream;
-import java.io.OutputStream;
-import net.minecraft.nbt.NbtIo;
-import java.io.FileOutputStream;
-import net.minecraft.nbt.Tag;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.Util;
-import javax.annotation.Nullable;
-import net.minecraft.server.MinecraftServer;
-import com.mojang.datafixers.DataFixer;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
-import java.io.File;
-import org.apache.logging.log4j.Logger;
-
-public class LevelStorage implements PlayerIO {
-    private static final Logger LOGGER;
-    private final File worldDir;
-    private final File playerDir;
-    private final long sessionId;
-    private final String levelId;
-    private final StructureManager structureManager;
-    protected final DataFixer fixerUpper;
-    
-    public LevelStorage(final File file, final String string, @Nullable final MinecraftServer minecraftServer, final DataFixer dataFixer) {
-        this.sessionId = Util.getMillis();
-        this.fixerUpper = dataFixer;
-        (this.worldDir = new File(file, string)).mkdirs();
-        this.playerDir = new File(this.worldDir, "playerdata");
-        this.levelId = string;
-        if (minecraftServer != null) {
-            this.playerDir.mkdirs();
-            this.structureManager = new StructureManager(minecraftServer, this.worldDir, dataFixer);
-        }
-        else {
-            this.structureManager = null;
-        }
-        this.initiateSession();
-    }
-    
-    public void saveLevelData(final LevelData crm, @Nullable final CompoundTag jt) {
-        crm.setVersion(19133);
-        final CompoundTag jt2 = crm.createTag(jt);
-        final CompoundTag jt3 = new CompoundTag();
-        jt3.put("Data", jt2);
-        try {
-            final File file6 = new File(this.worldDir, "level.dat_new");
-            final File file7 = new File(this.worldDir, "level.dat_old");
-            final File file8 = new File(this.worldDir, "level.dat");
-            NbtIo.writeCompressed(jt3, new FileOutputStream(file6));
-            if (file7.exists()) {
-                file7.delete();
-            }
-            file8.renameTo(file7);
-            if (file8.exists()) {
-                file8.delete();
-            }
-            file6.renameTo(file8);
-            if (file6.exists()) {
-                file6.delete();
-            }
-        }
-        catch (Exception exception6) {
-            exception6.printStackTrace();
-        }
-    }
-    
-    private void initiateSession() {
-        try {
-            final File file2 = new File(this.worldDir, "session.lock");
-            final DataOutputStream dataOutputStream3 = new DataOutputStream(new FileOutputStream(file2));
-            try {
-                dataOutputStream3.writeLong(this.sessionId);
-            }
-            finally {
-                dataOutputStream3.close();
-            }
-        }
-        catch (IOException iOException2) {
-            iOException2.printStackTrace();
-            throw new RuntimeException("Failed to check session lock, aborting");
-        }
-    }
-    
-    public File getFolder() {
-        return this.worldDir;
-    }
-    
-    public void checkSession() throws LevelConflictException {
-        try {
-            final File file2 = new File(this.worldDir, "session.lock");
-            final DataInputStream dataInputStream3 = new DataInputStream(new FileInputStream(file2));
-            try {
-                if (dataInputStream3.readLong() != this.sessionId) {
-                    throw new LevelConflictException("The save is being accessed from another location, aborting");
-                }
-            }
-            finally {
-                dataInputStream3.close();
-            }
-        }
-        catch (IOException iOException2) {
-            throw new LevelConflictException("Failed to check session lock, aborting");
-        }
-    }
-    
-    @Nullable
-    public LevelData prepareLevel() {
-        File file2 = new File(this.worldDir, "level.dat");
-        if (file2.exists()) {
-            final LevelData crm3 = LevelStorageSource.getLevelData(file2, this.fixerUpper);
-            if (crm3 != null) {
-                return crm3;
-            }
-        }
-        file2 = new File(this.worldDir, "level.dat_old");
-        if (file2.exists()) {
-            return LevelStorageSource.getLevelData(file2, this.fixerUpper);
-        }
-        return null;
-    }
-    
-    public void saveLevelData(final LevelData crm) {
-        this.saveLevelData(crm, null);
-    }
-    
-    @Override
-    public void save(final Player ayj) {
-        try {
-            final CompoundTag jt3 = ayj.saveWithoutId(new CompoundTag());
-            final File file4 = new File(this.playerDir, ayj.getStringUUID() + ".dat.tmp");
-            final File file5 = new File(this.playerDir, ayj.getStringUUID() + ".dat");
-            NbtIo.writeCompressed(jt3, new FileOutputStream(file4));
-            if (file5.exists()) {
-                file5.delete();
-            }
-            file4.renameTo(file5);
-        }
-        catch (Exception exception3) {
-            LevelStorage.LOGGER.warn("Failed to save player data for {}", ayj.getName().getString());
-        }
-    }
-    
-    @Nullable
-    @Override
-    public CompoundTag load(final Player ayj) {
-        CompoundTag jt3 = null;
-        try {
-            final File file4 = new File(this.playerDir, ayj.getStringUUID() + ".dat");
-            if (file4.exists() && file4.isFile()) {
-                jt3 = NbtIo.readCompressed(new FileInputStream(file4));
-            }
-        }
-        catch (Exception exception4) {
-            LevelStorage.LOGGER.warn("Failed to load player data for {}", ayj.getName().getString());
-        }
-        if (jt3 != null) {
-            final int integer4 = jt3.contains("DataVersion", 3) ? jt3.getInt("DataVersion") : -1;
-            ayj.load(NbtUtils.update(this.fixerUpper, DataFixTypes.PLAYER, jt3, integer4));
-        }
-        return jt3;
-    }
-    
-    public String[] getSeenPlayers() {
-        String[] arr2 = this.playerDir.list();
-        if (arr2 == null) {
-            arr2 = new String[0];
-        }
-        for (int integer3 = 0; integer3 < arr2.length; ++integer3) {
-            if (arr2[integer3].endsWith(".dat")) {
-                arr2[integer3] = arr2[integer3].substring(0, arr2[integer3].length() - 4);
-            }
-        }
-        return arr2;
-    }
-    
-    public StructureManager getStructureManager() {
-        return this.structureManager;
-    }
-    
-    public DataFixer getFixerUpper() {
-        return this.fixerUpper;
-    }
-    
-    static {
-        LOGGER = LogManager.getLogger();
-    }
-}
diff --git a/src/net/minecraft/world/level/storage/LevelStorageSource.java b/src/net/minecraft/world/level/storage/LevelStorageSource.java
index f519b06..179ea5f 100644
--- a/src/net/minecraft/world/level/storage/LevelStorageSource.java
+++ b/src/net/minecraft/world/level/storage/LevelStorageSource.java
@@ -1,49 +1,75 @@
 package net.minecraft.world.level.storage;
 
-import java.time.temporal.TemporalField;
-import java.time.format.SignStyle;
-import java.time.temporal.ChronoField;
-import java.time.format.DateTimeFormatterBuilder;
-import org.apache.logging.log4j.LogManager;
-import java.nio.file.FileVisitor;
 import java.util.zip.ZipEntry;
-import java.nio.file.FileVisitResult;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.SimpleFileVisitor;
 import java.nio.file.Paths;
 import java.util.zip.ZipOutputStream;
 import java.io.BufferedOutputStream;
 import java.nio.file.OpenOption;
 import net.minecraft.FileUtil;
 import java.time.LocalDateTime;
+import java.nio.file.FileVisitor;
+import java.nio.file.FileVisitResult;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.SimpleFileVisitor;
 import java.io.OutputStream;
 import java.io.FileOutputStream;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.util.ProgressListener;
+import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.Level;
+import net.minecraft.resources.ResourceKey;
+import com.google.common.collect.Maps;
+import java.util.Map;
+import java.time.temporal.TemporalField;
+import java.time.format.SignStyle;
+import java.time.temporal.ChronoField;
+import java.time.format.DateTimeFormatterBuilder;
+import org.apache.logging.log4j.LogManager;
+import net.minecraft.world.level.LevelSettings;
+import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtUtils;
+import java.util.function.Function;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.util.datafix.DataFixTypes;
 import java.io.InputStream;
 import net.minecraft.nbt.NbtIo;
 import java.io.FileInputStream;
-import net.minecraft.util.ProgressListener;
 import javax.annotation.Nullable;
-import net.minecraft.server.MinecraftServer;
+import java.util.function.BiFunction;
 import java.io.File;
-import org.apache.commons.lang3.StringUtils;
+import net.minecraft.util.DirectoryLock;
 import com.google.common.collect.Lists;
 import net.minecraft.network.chat.TranslatableComponent;
 import java.util.List;
+import net.minecraft.world.level.DataPackConfig;
+import com.mojang.serialization.DataResult;
+import java.util.Optional;
+import com.google.common.collect.UnmodifiableIterator;
+import java.util.function.Supplier;
+import java.util.function.Consumer;
+import net.minecraft.Util;
+import net.minecraft.SharedConstants;
+import net.minecraft.util.datafix.fixes.References;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.util.datafix.DataFixers;
 import java.io.IOException;
 import java.nio.file.attribute.FileAttribute;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import com.mojang.datafixers.DataFixer;
 import java.nio.file.Path;
+import com.google.common.collect.ImmutableList;
 import java.time.format.DateTimeFormatter;
 import org.apache.logging.log4j.Logger;
 
 public class LevelStorageSource {
     private static final Logger LOGGER;
     private static final DateTimeFormatter FORMATTER;
+    private static final ImmutableList<String> OLD_SETTINGS_KEYS;
     private final Path baseDir;
     private final Path backupDir;
     private final DataFixer fixerUpper;
@@ -60,29 +86,49 @@ public class LevelStorageSource {
         this.backupDir = path2;
     }
     
-    public String getName() {
-        return "Anvil";
+    public static LevelStorageSource createDefault(final Path path) {
+        return new LevelStorageSource(path, path.resolve("../backups"), DataFixers.getDataFixer());
+    }
+    
+    private static Pair<WorldGenSettings, Lifecycle> readWorldGenSettings(final Dynamic<?> dynamic, final DataFixer dataFixer, final int integer) {
+        Dynamic<?> dynamic2 = dynamic.get("WorldGenSettings").orElseEmptyMap();
+        for (final String string6 : LevelStorageSource.OLD_SETTINGS_KEYS) {
+            final Optional<? extends Dynamic<?>> optional7 = dynamic.get(string6).result();
+            if (optional7.isPresent()) {
+                dynamic2 = dynamic2.set(string6, (Dynamic)optional7.get());
+            }
+        }
+        final Dynamic<?> dynamic3 = dataFixer.update(References.WORLD_GEN_SETTINGS, (Dynamic)dynamic2, integer, SharedConstants.getCurrentVersion().getWorldVersion());
+        final DataResult<WorldGenSettings> dataResult6 = (DataResult<WorldGenSettings>)WorldGenSettings.CODEC.parse((Dynamic)dynamic3);
+        return (Pair<WorldGenSettings, Lifecycle>)Pair.of(dataResult6.resultOrPartial((Consumer)Util.prefix("WorldGenSettings: ", LevelStorageSource.LOGGER::error)).orElseGet(WorldGenSettings::makeDefault), dataResult6.lifecycle());
+    }
+    
+    private static DataPackConfig readDataPackConfig(final Dynamic<?> dynamic) {
+        return DataPackConfig.CODEC.parse((Dynamic)dynamic).resultOrPartial((Consumer)LevelStorageSource.LOGGER::error).orElse(DataPackConfig.DEFAULT);
     }
     
     public List<LevelSummary> getLevelList() throws LevelStorageException {
         if (!Files.isDirectory(this.baseDir)) {
-            throw new LevelStorageException(new TranslatableComponent("selectWorld.load_folder_access", new Object[0]).getString());
+            throw new LevelStorageException(new TranslatableComponent("selectWorld.load_folder_access").getString());
         }
         final List<LevelSummary> list2 = Lists.newArrayList();
         final File[] listFiles;
         final File[] arr3 = listFiles = this.baseDir.toFile().listFiles();
         for (final File file7 : listFiles) {
-            if (file7.isDirectory()) {
-                final String string8 = file7.getName();
-                final LevelData crm9 = this.getDataTagFor(string8);
-                if (crm9 != null && (crm9.getVersion() == 19132 || crm9.getVersion() == 19133)) {
-                    final boolean boolean10 = crm9.getVersion() != this.getStorageVersion();
-                    String string9 = crm9.getLevelName();
-                    if (StringUtils.isEmpty((CharSequence)string9)) {
-                        string9 = string8;
+            Label_0151: {
+                if (file7.isDirectory()) {
+                    boolean boolean8;
+                    try {
+                        boolean8 = DirectoryLock.isLocked(file7.toPath());
+                    }
+                    catch (Exception exception9) {
+                        LevelStorageSource.LOGGER.warn("Failed to read {} lock", file7, exception9);
+                        break Label_0151;
+                    }
+                    final LevelSummary daf9 = this.<LevelSummary>readLevelData(file7, this.levelSummaryReader(file7, boolean8));
+                    if (daf9 != null) {
+                        list2.add(daf9);
                     }
-                    final long long12 = 0L;
-                    list2.add(new LevelSummary(crm9, string8, string9, 0L, boolean10));
                 }
             }
         }
@@ -93,57 +139,34 @@ public class LevelStorageSource {
         return 19133;
     }
     
-    public LevelStorage selectLevel(final String string, @Nullable final MinecraftServer minecraftServer) {
-        return selectLevel(this.baseDir, this.fixerUpper, string, minecraftServer);
-    }
-    
-    protected static LevelStorage selectLevel(final Path path, final DataFixer dataFixer, final String string, @Nullable final MinecraftServer minecraftServer) {
-        return new LevelStorage(path.toFile(), string, minecraftServer, dataFixer);
-    }
-    
-    public boolean requiresConversion(final String string) {
-        final LevelData crm3 = this.getDataTagFor(string);
-        return crm3 != null && crm3.getVersion() != this.getStorageVersion();
-    }
-    
-    public boolean convertLevel(final String string, final ProgressListener abs) {
-        return McRegionUpgrader.convertLevel(this.baseDir, this.fixerUpper, string, abs);
-    }
-    
     @Nullable
-    public LevelData getDataTagFor(final String string) {
-        return getDataTagFor(this.baseDir, this.fixerUpper, string);
-    }
-    
-    @Nullable
-    protected static LevelData getDataTagFor(final Path path, final DataFixer dataFixer, final String string) {
-        final File file4 = new File(path.toFile(), string);
-        if (!file4.exists()) {
+    private <T> T readLevelData(final File file, final BiFunction<File, DataFixer, T> biFunction) {
+        if (!file.exists()) {
             return null;
         }
-        File file5 = new File(file4, "level.dat");
-        if (file5.exists()) {
-            final LevelData crm6 = getLevelData(file5, dataFixer);
-            if (crm6 != null) {
-                return crm6;
+        File file2 = new File(file, "level.dat");
+        if (file2.exists()) {
+            final T object5 = biFunction.apply(file2, this.fixerUpper);
+            if (object5 != null) {
+                return object5;
             }
         }
-        file5 = new File(file4, "level.dat_old");
-        if (file5.exists()) {
-            return getLevelData(file5, dataFixer);
+        file2 = new File(file, "level.dat_old");
+        if (file2.exists()) {
+            return biFunction.apply(file2, this.fixerUpper);
         }
         return null;
     }
     
     @Nullable
-    public static LevelData getLevelData(final File file, final DataFixer dataFixer) {
+    private static DataPackConfig getDataPacks(final File file, final DataFixer dataFixer) {
         try {
-            final CompoundTag jt3 = NbtIo.readCompressed(new FileInputStream(file));
-            final CompoundTag jt4 = jt3.getCompound("Data");
-            final CompoundTag jt5 = jt4.contains("Player", 10) ? jt4.getCompound("Player") : null;
-            jt4.remove("Player");
-            final int integer6 = jt4.contains("DataVersion", 99) ? jt4.getInt("DataVersion") : -1;
-            return new LevelData(NbtUtils.update(dataFixer, DataFixTypes.LEVEL, jt4, integer6), dataFixer, integer6, jt5);
+            final CompoundTag le3 = NbtIo.readCompressed(new FileInputStream(file));
+            final CompoundTag le4 = le3.getCompound("Data");
+            le4.remove("Player");
+            final int integer5 = le4.contains("DataVersion", 99) ? le4.getInt("DataVersion") : -1;
+            final Dynamic<Tag> dynamic6 = (Dynamic<Tag>)dataFixer.update(DataFixTypes.LEVEL.getType(), new Dynamic((DynamicOps)NbtOps.INSTANCE, le4), integer5, SharedConstants.getCurrentVersion().getWorldVersion());
+            return dynamic6.get("DataPacks").result().<DataPackConfig>map(LevelStorageSource::readDataPackConfig).orElse(DataPackConfig.DEFAULT);
         }
         catch (Exception exception3) {
             LevelStorageSource.LOGGER.error("Exception reading {}", file, exception3);
@@ -151,23 +174,71 @@ public class LevelStorageSource {
         }
     }
     
-    public void renameLevel(final String string1, final String string2) {
-        final File file4 = new File(this.baseDir.toFile(), string1);
-        if (!file4.exists()) {
-            return;
-        }
-        final File file5 = new File(file4, "level.dat");
-        if (file5.exists()) {
+    private static BiFunction<File, DataFixer, PrimaryLevelData> getLevelData(final DynamicOps<Tag> dynamicOps, final DataPackConfig bpn) {
+        CompoundTag le5;
+        CompoundTag le6;
+        CompoundTag le7;
+        int integer8;
+        Dynamic<Tag> dynamic9;
+        Pair<WorldGenSettings, Lifecycle> pair10;
+        LevelVersion dag11;
+        LevelSettings bqe12;
+        return (BiFunction<File, DataFixer, PrimaryLevelData>)((file, dataFixer) -> {
             try {
-                final CompoundTag jt6 = NbtIo.readCompressed(new FileInputStream(file5));
-                final CompoundTag jt7 = jt6.getCompound("Data");
-                jt7.putString("LevelName", string2);
-                NbtIo.writeCompressed(jt6, new FileOutputStream(file5));
+                le5 = NbtIo.readCompressed(new FileInputStream(file));
+                le6 = le5.getCompound("Data");
+                le7 = (le6.contains("Player", 10) ? le6.getCompound("Player") : null);
+                le6.remove("Player");
+                integer8 = (le6.contains("DataVersion", 99) ? le6.getInt("DataVersion") : -1);
+                dynamic9 = (Dynamic<Tag>)dataFixer.update(DataFixTypes.LEVEL.getType(), new Dynamic((DynamicOps)dynamicOps, le6), integer8, SharedConstants.getCurrentVersion().getWorldVersion());
+                pair10 = readWorldGenSettings(dynamic9, dataFixer, integer8);
+                dag11 = LevelVersion.parse(dynamic9);
+                bqe12 = LevelSettings.parse(dynamic9, bpn);
+                return PrimaryLevelData.parse(dynamic9, dataFixer, integer8, le7, bqe12, dag11, (WorldGenSettings)pair10.getFirst(), (Lifecycle)pair10.getSecond());
+            }
+            catch (Exception exception5) {
+                LevelStorageSource.LOGGER.error("Exception reading {}", file, exception5);
+                return null;
+            }
+        });
+    }
+    
+    private BiFunction<File, DataFixer, LevelSummary> levelSummaryReader(final File file, final boolean boolean2) {
+        CompoundTag le6;
+        CompoundTag le7;
+        int integer8;
+        Dynamic dynamic9;
+        LevelVersion dag10;
+        int integer9;
+        boolean boolean3;
+        File file4;
+        DataPackConfig bpn14;
+        LevelSettings bqe15;
+        return (BiFunction<File, DataFixer, LevelSummary>)((file3, dataFixer) -> {
+            try {
+                le6 = NbtIo.readCompressed(new FileInputStream(file3));
+                le7 = le6.getCompound("Data");
+                le7.remove("Player");
+                integer8 = (le7.contains("DataVersion", 99) ? le7.getInt("DataVersion") : -1);
+                dynamic9 = dataFixer.update(DataFixTypes.LEVEL.getType(), new Dynamic((DynamicOps)NbtOps.INSTANCE, le7), integer8, SharedConstants.getCurrentVersion().getWorldVersion());
+                dag10 = LevelVersion.parse(dynamic9);
+                integer9 = dag10.levelDataVersion();
+                if (integer9 == 19132 || integer9 == 19133) {
+                    boolean3 = (integer9 != this.getStorageVersion());
+                    file4 = new File(file, "icon.png");
+                    bpn14 = dynamic9.get("DataPacks").result().map(LevelStorageSource::readDataPackConfig).orElse(DataPackConfig.DEFAULT);
+                    bqe15 = LevelSettings.parse(dynamic9, bpn14);
+                    return new LevelSummary(bqe15, dag10, file.getName(), boolean3, boolean2, file4);
+                }
+                else {
+                    return null;
+                }
             }
             catch (Exception exception6) {
-                exception6.printStackTrace();
+                LevelStorageSource.LOGGER.error("Exception reading {}", file3, exception6);
+                return null;
             }
-        }
+        });
     }
     
     public boolean isNewLevelIdAcceptable(final String string) {
@@ -182,43 +253,6 @@ public class LevelStorageSource {
         }
     }
     
-    public boolean deleteLevel(final String string) {
-        final File file3 = new File(this.baseDir.toFile(), string);
-        if (!file3.exists()) {
-            return true;
-        }
-        LevelStorageSource.LOGGER.info("Deleting level {}", string);
-        for (int integer4 = 1; integer4 <= 5; ++integer4) {
-            LevelStorageSource.LOGGER.info("Attempt {}...", integer4);
-            if (deleteRecursive(file3.listFiles())) {
-                break;
-            }
-            LevelStorageSource.LOGGER.warn("Unsuccessful in deleting contents.");
-            if (integer4 < 5) {
-                try {
-                    Thread.sleep(500L);
-                }
-                catch (InterruptedException ex) {}
-            }
-        }
-        return file3.delete();
-    }
-    
-    private static boolean deleteRecursive(final File[] arr) {
-        for (final File file5 : arr) {
-            LevelStorageSource.LOGGER.debug("Deleting {}", file5);
-            if (file5.isDirectory() && !deleteRecursive(file5.listFiles())) {
-                LevelStorageSource.LOGGER.warn("Couldn't delete directory {}", file5);
-                return false;
-            }
-            if (!file5.delete()) {
-                LevelStorageSource.LOGGER.warn("Couldn't delete file {}", file5);
-                return false;
-            }
-        }
-        return true;
-    }
-    
     public boolean levelExists(final String string) {
         return Files.isDirectory(this.baseDir.resolve(string));
     }
@@ -227,48 +261,206 @@ public class LevelStorageSource {
         return this.baseDir;
     }
     
-    public File getFile(final String string1, final String string2) {
-        return this.baseDir.resolve(string1).resolve(string2).toFile();
-    }
-    
-    private Path getLevelPath(final String string) {
-        return this.baseDir.resolve(string);
-    }
-    
     public Path getBackupPath() {
         return this.backupDir;
     }
     
-    public long makeWorldBackup(final String string) throws IOException {
-        final Path path3 = this.getLevelPath(string);
-        final String string2 = LocalDateTime.now().format(LevelStorageSource.FORMATTER) + "_" + string;
-        final Path path4 = this.getBackupPath();
-        try {
-            Files.createDirectories(Files.exists(path4) ? path4.toRealPath() : path4, new FileAttribute[0]);
-        }
-        catch (IOException iOException6) {
-            throw new RuntimeException(iOException6);
-        }
-        final Path path5 = path4.resolve(FileUtil.findAvailableName(path4, string2, ".zip"));
-        try (final ZipOutputStream zipOutputStream7 = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(path5)))) {
-            final Path path6 = Paths.get(string);
-            Files.walkFileTree(path3, new SimpleFileVisitor<Path>() {
-                @Override
-                public FileVisitResult visitFile(final Path path, final BasicFileAttributes basicFileAttributes) throws IOException {
-                    final String string4 = path6.resolve(path3.relativize(path)).toString().replace('\\', '/');
-                    final ZipEntry zipEntry5 = new ZipEntry(string4);
-                    zipOutputStream7.putNextEntry(zipEntry5);
-                    com.google.common.io.Files.asByteSource(path.toFile()).copyTo(zipOutputStream7);
-                    zipOutputStream7.closeEntry();
-                    return FileVisitResult.CONTINUE;
-                }
-            });
-        }
-        return Files.size(path5);
+    public LevelStorageAccess createAccess(final String string) throws IOException {
+        return new LevelStorageAccess(string);
     }
     
     static {
         LOGGER = LogManager.getLogger();
         FORMATTER = new DateTimeFormatterBuilder().appendValue(ChronoField.YEAR, 4, 10, SignStyle.EXCEEDS_PAD).appendLiteral('-').appendValue(ChronoField.MONTH_OF_YEAR, 2).appendLiteral('-').appendValue(ChronoField.DAY_OF_MONTH, 2).appendLiteral('_').appendValue(ChronoField.HOUR_OF_DAY, 2).appendLiteral('-').appendValue(ChronoField.MINUTE_OF_HOUR, 2).appendLiteral('-').appendValue(ChronoField.SECOND_OF_MINUTE, 2).toFormatter();
+        OLD_SETTINGS_KEYS = ImmutableList.<String>of("RandomSeed", "generatorName", "generatorOptions", "generatorVersion", "legacy_custom_options", "MapFeatures", "BonusChest");
+    }
+    
+    public class LevelStorageAccess implements AutoCloseable {
+        private final DirectoryLock lock;
+        private final Path levelPath;
+        private final String levelId;
+        private final Map<LevelResource, Path> resources;
+        
+        public LevelStorageAccess(final String string) throws IOException {
+            this.resources = Maps.newHashMap();
+            this.levelId = string;
+            this.levelPath = LevelStorageSource.this.baseDir.resolve(string);
+            this.lock = DirectoryLock.create(this.levelPath);
+        }
+        
+        public String getLevelId() {
+            return this.levelId;
+        }
+        
+        public Path getLevelPath(final LevelResource dac) {
+            return this.resources.computeIfAbsent(dac, dac -> this.levelPath.resolve(dac.getId()));
+        }
+        
+        public File getDimensionPath(final ResourceKey<Level> ug) {
+            return DimensionType.getStorageFolder(ug, this.levelPath.toFile());
+        }
+        
+        private void checkLock() {
+            if (!this.lock.isValid()) {
+                throw new IllegalStateException("Lock is no longer valid");
+            }
+        }
+        
+        public PlayerDataStorage createPlayerStorage() {
+            this.checkLock();
+            return new PlayerDataStorage(this, LevelStorageSource.this.fixerUpper);
+        }
+        
+        public boolean requiresConversion() {
+            final LevelSummary daf2 = this.getSummary();
+            return daf2 != null && daf2.levelVersion().levelDataVersion() != LevelStorageSource.this.getStorageVersion();
+        }
+        
+        public boolean convertLevel(final ProgressListener aed) {
+            this.checkLock();
+            return McRegionUpgrader.convertLevel(this, aed);
+        }
+        
+        @Nullable
+        public LevelSummary getSummary() {
+            this.checkLock();
+            return (LevelSummary)LevelStorageSource.this.readLevelData(this.levelPath.toFile(), (BiFunction<File, DataFixer, Object>)LevelStorageSource.this.levelSummaryReader(this.levelPath.toFile(), false));
+        }
+        
+        @Nullable
+        public WorldData getDataTag(final DynamicOps<Tag> dynamicOps, final DataPackConfig bpn) {
+            this.checkLock();
+            return (WorldData)LevelStorageSource.this.readLevelData(this.levelPath.toFile(), (BiFunction<File, DataFixer, Object>)getLevelData(dynamicOps, bpn));
+        }
+        
+        @Nullable
+        public DataPackConfig getDataPacks() {
+            this.checkLock();
+            return (DataPackConfig)LevelStorageSource.this.readLevelData(this.levelPath.toFile(), (BiFunction<File, DataFixer, Object>)((file, dataFixer) -> getDataPacks(file, dataFixer)));
+        }
+        
+        public void saveDataTag(final RegistryAccess gm, final WorldData dal) {
+            this.saveDataTag(gm, dal, null);
+        }
+        
+        public void saveDataTag(final RegistryAccess gm, final WorldData dal, @Nullable final CompoundTag le) {
+            final File file5 = this.levelPath.toFile();
+            final CompoundTag le2 = dal.createTag(gm, le);
+            final CompoundTag le3 = new CompoundTag();
+            le3.put("Data", le2);
+            try {
+                final File file6 = File.createTempFile("level", ".dat", file5);
+                NbtIo.writeCompressed(le3, new FileOutputStream(file6));
+                final File file7 = new File(file5, "level.dat_old");
+                final File file8 = new File(file5, "level.dat");
+                Util.safeReplaceFile(file8, file6, file7);
+            }
+            catch (Exception exception8) {
+                LevelStorageSource.LOGGER.error("Failed to save level {}", file5, exception8);
+            }
+        }
+        
+        public File getIconFile() {
+            this.checkLock();
+            return this.levelPath.resolve("icon.png").toFile();
+        }
+        
+        public void deleteLevel() throws IOException {
+            this.checkLock();
+            final Path path2 = this.levelPath.resolve("session.lock");
+            int integer3 = 1;
+            while (integer3 <= 5) {
+                LevelStorageSource.LOGGER.info("Attempt {}...", integer3);
+                try {
+                    Files.walkFileTree(this.levelPath, new SimpleFileVisitor<Path>() {
+                        @Override
+                        public FileVisitResult visitFile(final Path path, final BasicFileAttributes basicFileAttributes) throws IOException {
+                            if (!path.equals(path2)) {
+                                LevelStorageSource.LOGGER.debug("Deleting {}", path);
+                                Files.delete(path);
+                            }
+                            return FileVisitResult.CONTINUE;
+                        }
+                        
+                        @Override
+                        public FileVisitResult postVisitDirectory(final Path path, final IOException iOException) throws IOException {
+                            if (iOException != null) {
+                                throw iOException;
+                            }
+                            if (path.equals(LevelStorageAccess.this.levelPath)) {
+                                LevelStorageAccess.this.lock.close();
+                                Files.deleteIfExists(path2);
+                            }
+                            Files.delete(path);
+                            return FileVisitResult.CONTINUE;
+                        }
+                    });
+                }
+                catch (IOException iOException4) {
+                    if (integer3 < 5) {
+                        LevelStorageSource.LOGGER.warn("Failed to delete {}", this.levelPath, iOException4);
+                        try {
+                            Thread.sleep(500L);
+                        }
+                        catch (InterruptedException ex) {}
+                        ++integer3;
+                        continue;
+                    }
+                    throw iOException4;
+                }
+                break;
+            }
+        }
+        
+        public void renameLevel(final String string) throws IOException {
+            this.checkLock();
+            final File file3 = new File(LevelStorageSource.this.baseDir.toFile(), this.levelId);
+            if (!file3.exists()) {
+                return;
+            }
+            final File file4 = new File(file3, "level.dat");
+            if (file4.exists()) {
+                final CompoundTag le5 = NbtIo.readCompressed(new FileInputStream(file4));
+                final CompoundTag le6 = le5.getCompound("Data");
+                le6.putString("LevelName", string);
+                NbtIo.writeCompressed(le5, new FileOutputStream(file4));
+            }
+        }
+        
+        public long makeWorldBackup() throws IOException {
+            this.checkLock();
+            final String string2 = LocalDateTime.now().format(LevelStorageSource.FORMATTER) + "_" + this.levelId;
+            final Path path3 = LevelStorageSource.this.getBackupPath();
+            try {
+                Files.createDirectories(Files.exists(path3) ? path3.toRealPath() : path3, new FileAttribute[0]);
+            }
+            catch (IOException iOException4) {
+                throw new RuntimeException(iOException4);
+            }
+            final Path path4 = path3.resolve(FileUtil.findAvailableName(path3, string2, ".zip"));
+            try (final ZipOutputStream zipOutputStream5 = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(path4)))) {
+                final Path path5 = Paths.get(this.levelId);
+                Files.walkFileTree(this.levelPath, new SimpleFileVisitor<Path>() {
+                    @Override
+                    public FileVisitResult visitFile(final Path path, final BasicFileAttributes basicFileAttributes) throws IOException {
+                        if (path.endsWith("session.lock")) {
+                            return FileVisitResult.CONTINUE;
+                        }
+                        final String string4 = path5.resolve(LevelStorageAccess.this.levelPath.relativize(path)).toString().replace('\\', '/');
+                        final ZipEntry zipEntry5 = new ZipEntry(string4);
+                        zipOutputStream5.putNextEntry(zipEntry5);
+                        com.google.common.io.Files.asByteSource(path.toFile()).copyTo(zipOutputStream5);
+                        zipOutputStream5.closeEntry();
+                        return FileVisitResult.CONTINUE;
+                    }
+                });
+            }
+            return Files.size(path4);
+        }
+        
+        @Override
+        public void close() throws IOException {
+            this.lock.close();
+        }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/LevelSummary.java b/src/net/minecraft/world/level/storage/LevelSummary.java
index c190b71..c67e5fa 100644
--- a/src/net/minecraft/world/level/storage/LevelSummary.java
+++ b/src/net/minecraft/world/level/storage/LevelSummary.java
@@ -1,40 +1,35 @@
 package net.minecraft.world.level.storage;
 
+import net.minecraft.ChatFormatting;
 import net.minecraft.SharedConstants;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.StringUtil;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.level.LevelType;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.level.GameType;
+import org.apache.commons.lang3.StringUtils;
+import javax.annotation.Nullable;
+import net.minecraft.network.chat.Component;
+import java.io.File;
+import net.minecraft.world.level.LevelSettings;
 
 public class LevelSummary implements Comparable<LevelSummary> {
+    private final LevelSettings settings;
+    private final LevelVersion levelVersion;
     private final String levelId;
-    private final String levelName;
-    private final long lastPlayed;
-    private final long sizeOnDisk;
     private final boolean requiresConversion;
-    private final GameType gameMode;
-    private final boolean hardcore;
-    private final boolean hasCheats;
-    private final String worldVersionName;
-    private final int worldVersion;
-    private final boolean snapshot;
-    private final LevelType generatorType;
+    private final boolean locked;
+    private final File icon;
+    @Nullable
+    private Component info;
     
-    public LevelSummary(final LevelData crm, final String string2, final String string3, final long long4, final boolean boolean5) {
-        this.levelId = string2;
-        this.levelName = string3;
-        this.lastPlayed = crm.getLastPlayed();
-        this.sizeOnDisk = long4;
-        this.gameMode = crm.getGameType();
-        this.requiresConversion = boolean5;
-        this.hardcore = crm.isHardcore();
-        this.hasCheats = crm.getAllowCommands();
-        this.worldVersionName = crm.getMinecraftVersionName();
-        this.worldVersion = crm.getMinecraftVersion();
-        this.snapshot = crm.isSnapshot();
-        this.generatorType = crm.getGeneratorType();
+    public LevelSummary(final LevelSettings bqe, final LevelVersion dag, final String string, final boolean boolean4, final boolean boolean5, final File file) {
+        this.settings = bqe;
+        this.levelVersion = dag;
+        this.levelId = string;
+        this.locked = boolean5;
+        this.icon = file;
+        this.requiresConversion = boolean4;
     }
     
     public String getLevelId() {
@@ -42,11 +37,11 @@ public class LevelSummary implements Comparable<LevelSummary> {
     }
     
     public String getLevelName() {
-        return this.levelName;
+        return StringUtils.isEmpty((CharSequence)this.settings.levelName()) ? this.levelId : this.settings.levelName();
     }
     
-    public long getSizeOnDisk() {
-        return this.sizeOnDisk;
+    public File getIcon() {
+        return this.icon;
     }
     
     public boolean isRequiresConversion() {
@@ -54,52 +49,86 @@ public class LevelSummary implements Comparable<LevelSummary> {
     }
     
     public long getLastPlayed() {
-        return this.lastPlayed;
+        return this.levelVersion.lastPlayed();
     }
     
     @Override
-    public int compareTo(final LevelSummary crq) {
-        if (this.lastPlayed < crq.lastPlayed) {
+    public int compareTo(final LevelSummary daf) {
+        if (this.levelVersion.lastPlayed() < daf.levelVersion.lastPlayed()) {
             return 1;
         }
-        if (this.lastPlayed > crq.lastPlayed) {
+        if (this.levelVersion.lastPlayed() > daf.levelVersion.lastPlayed()) {
             return -1;
         }
-        return this.levelId.compareTo(crq.levelId);
+        return this.levelId.compareTo(daf.levelId);
     }
     
     public GameType getGameMode() {
-        return this.gameMode;
+        return this.settings.gameType();
     }
     
     public boolean isHardcore() {
-        return this.hardcore;
+        return this.settings.hardcore();
     }
     
     public boolean hasCheats() {
-        return this.hasCheats;
+        return this.settings.allowCommands();
     }
     
-    public Component getWorldVersionName() {
-        if (StringUtil.isNullOrEmpty(this.worldVersionName)) {
-            return new TranslatableComponent("selectWorld.versionUnknown", new Object[0]);
+    public MutableComponent getWorldVersionName() {
+        if (StringUtil.isNullOrEmpty(this.levelVersion.minecraftVersionName())) {
+            return new TranslatableComponent("selectWorld.versionUnknown");
         }
-        return new TextComponent(this.worldVersionName);
+        return new TextComponent(this.levelVersion.minecraftVersionName());
+    }
+    
+    public LevelVersion levelVersion() {
+        return this.levelVersion;
     }
     
     public boolean markVersionInList() {
-        return this.askToOpenWorld() || (!SharedConstants.getCurrentVersion().isStable() && !this.snapshot) || this.shouldBackup() || this.isOldCustomizedWorld();
+        return this.askToOpenWorld() || (!SharedConstants.getCurrentVersion().isStable() && !this.levelVersion.snapshot()) || this.shouldBackup();
     }
     
     public boolean askToOpenWorld() {
-        return this.worldVersion > SharedConstants.getCurrentVersion().getWorldVersion();
-    }
-    
-    public boolean isOldCustomizedWorld() {
-        return this.generatorType == LevelType.CUSTOMIZED && this.worldVersion < 1466;
+        return this.levelVersion.minecraftVersion() > SharedConstants.getCurrentVersion().getWorldVersion();
     }
     
     public boolean shouldBackup() {
-        return this.worldVersion < SharedConstants.getCurrentVersion().getWorldVersion();
+        return this.levelVersion.minecraftVersion() < SharedConstants.getCurrentVersion().getWorldVersion();
+    }
+    
+    public boolean isLocked() {
+        return this.locked;
+    }
+    
+    public Component getInfo() {
+        if (this.info == null) {
+            this.info = this.createInfo();
+        }
+        return this.info;
+    }
+    
+    private Component createInfo() {
+        if (this.isLocked()) {
+            return new TranslatableComponent("selectWorld.locked").withStyle(ChatFormatting.RED);
+        }
+        if (this.isRequiresConversion()) {
+            return new TranslatableComponent("selectWorld.conversion");
+        }
+        final MutableComponent mx2 = this.isHardcore() ? new TextComponent("").append(new TranslatableComponent("gameMode.hardcore").withStyle(ChatFormatting.DARK_RED)) : new TranslatableComponent("gameMode." + this.getGameMode().getName());
+        if (this.hasCheats()) {
+            mx2.append(", ").append(new TranslatableComponent("selectWorld.cheats"));
+        }
+        final MutableComponent mx3 = this.getWorldVersionName();
+        final MutableComponent mx4 = new TextComponent(", ").append(new TranslatableComponent("selectWorld.version")).append(" ");
+        if (this.markVersionInList()) {
+            mx4.append(mx3.withStyle(this.askToOpenWorld() ? ChatFormatting.RED : ChatFormatting.ITALIC));
+        }
+        else {
+            mx4.append(mx3);
+        }
+        mx2.append(mx4);
+        return mx2;
     }
 }
diff --git a/src/net/minecraft/world/level/storage/LevelVersion.java b/src/net/minecraft/world/level/storage/LevelVersion.java
new file mode 100644
index 0000000..7a8ed6a
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/LevelVersion.java
@@ -0,0 +1,51 @@
+package net.minecraft.world.level.storage;
+
+import com.mojang.serialization.OptionalDynamic;
+import net.minecraft.SharedConstants;
+import com.mojang.serialization.Dynamic;
+
+public class LevelVersion {
+    private final int levelDataVersion;
+    private final long lastPlayed;
+    private final String minecraftVersionName;
+    private final int minecraftVersion;
+    private final boolean snapshot;
+    
+    public LevelVersion(final int integer1, final long long2, final String string, final int integer4, final boolean boolean5) {
+        this.levelDataVersion = integer1;
+        this.lastPlayed = long2;
+        this.minecraftVersionName = string;
+        this.minecraftVersion = integer4;
+        this.snapshot = boolean5;
+    }
+    
+    public static LevelVersion parse(final Dynamic<?> dynamic) {
+        final int integer2 = dynamic.get("version").asInt(0);
+        final long long3 = dynamic.get("LastPlayed").asLong(0L);
+        final OptionalDynamic<?> optionalDynamic5 = dynamic.get("Version");
+        if (optionalDynamic5.result().isPresent()) {
+            return new LevelVersion(integer2, long3, optionalDynamic5.get("Name").asString(SharedConstants.getCurrentVersion().getName()), optionalDynamic5.get("Id").asInt(SharedConstants.getCurrentVersion().getWorldVersion()), optionalDynamic5.get("Snapshot").asBoolean(!SharedConstants.getCurrentVersion().isStable()));
+        }
+        return new LevelVersion(integer2, long3, "", 0, false);
+    }
+    
+    public int levelDataVersion() {
+        return this.levelDataVersion;
+    }
+    
+    public long lastPlayed() {
+        return this.lastPlayed;
+    }
+    
+    public String minecraftVersionName() {
+        return this.minecraftVersionName;
+    }
+    
+    public int minecraftVersion() {
+        return this.minecraftVersion;
+    }
+    
+    public boolean snapshot() {
+        return this.snapshot;
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/McRegionUpgrader.java b/src/net/minecraft/world/level/storage/McRegionUpgrader.java
index b5a2510..b33a1f5 100644
--- a/src/net/minecraft/world/level/storage/McRegionUpgrader.java
+++ b/src/net/minecraft/world/level/storage/McRegionUpgrader.java
@@ -5,7 +5,6 @@ import java.util.Collections;
 import java.io.DataOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutput;
-import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.chunk.storage.OldChunkStorage;
 import java.io.IOException;
@@ -13,130 +12,121 @@ import net.minecraft.nbt.NbtIo;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import java.util.Iterator;
-import net.minecraft.world.level.biome.OverworldBiomeSource;
-import net.minecraft.world.level.biome.OverworldBiomeSourceSettings;
-import net.minecraft.world.level.biome.FixedBiomeSource;
 import java.util.List;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.biome.OverworldBiomeSource;
+import net.minecraft.world.level.biome.FixedBiomeSource;
 import net.minecraft.world.level.biome.Biomes;
-import net.minecraft.world.level.biome.FixedBiomeSourceSettings;
-import net.minecraft.world.level.LevelType;
-import net.minecraft.world.level.biome.BiomeSourceType;
-import java.util.Collection;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.DataPackConfig;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.nbt.Tag;
+import net.minecraft.resources.RegistryReadOps;
+import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.core.RegistryAccess;
 import java.io.File;
+import java.util.Collection;
+import net.minecraft.world.level.Level;
 import com.google.common.collect.Lists;
 import net.minecraft.util.ProgressListener;
-import com.mojang.datafixers.DataFixer;
-import java.nio.file.Path;
 import org.apache.logging.log4j.Logger;
 
 public class McRegionUpgrader {
     private static final Logger LOGGER;
     
-    static boolean convertLevel(final Path path, final DataFixer dataFixer, final String string, final ProgressListener abs) {
-        abs.progressStagePercentage(0);
+    static boolean convertLevel(final LevelStorageSource.LevelStorageAccess a, final ProgressListener aed) {
+        aed.progressStagePercentage(0);
+        final List<File> list3 = Lists.newArrayList();
+        final List<File> list4 = Lists.newArrayList();
         final List<File> list5 = Lists.newArrayList();
-        final List<File> list6 = Lists.newArrayList();
-        final List<File> list7 = Lists.newArrayList();
-        final File file8 = new File(path.toFile(), string);
-        final File file9 = DimensionType.NETHER.getStorageFolder(file8);
-        final File file10 = DimensionType.THE_END.getStorageFolder(file8);
+        final File file6 = a.getDimensionPath(Level.OVERWORLD);
+        final File file7 = a.getDimensionPath(Level.NETHER);
+        final File file8 = a.getDimensionPath(Level.END);
         McRegionUpgrader.LOGGER.info("Scanning folders...");
-        addRegionFiles(file8, list5);
-        if (file9.exists()) {
-            addRegionFiles(file9, list6);
+        addRegionFiles(file6, list3);
+        if (file7.exists()) {
+            addRegionFiles(file7, list4);
         }
-        if (file10.exists()) {
-            addRegionFiles(file10, list7);
+        if (file8.exists()) {
+            addRegionFiles(file8, list5);
         }
-        final int integer11 = list5.size() + list6.size() + list7.size();
-        McRegionUpgrader.LOGGER.info("Total conversion count is {}", integer11);
-        final LevelData crm12 = LevelStorageSource.getDataTagFor(path, dataFixer, string);
-        final BiomeSourceType<FixedBiomeSourceSettings, FixedBiomeSource> bky14 = BiomeSourceType.FIXED;
-        final BiomeSourceType<OverworldBiomeSourceSettings, OverworldBiomeSource> bky15 = BiomeSourceType.VANILLA_LAYERED;
-        BiomeSource bkw13;
-        if (crm12 != null && crm12.getGeneratorType() == LevelType.FLAT) {
-            bkw13 = bky14.create(bky14.createSettings(crm12).setBiome(Biomes.PLAINS));
+        final int integer9 = list3.size() + list4.size() + list5.size();
+        McRegionUpgrader.LOGGER.info("Total conversion count is {}", integer9);
+        final RegistryAccess.RegistryHolder a2 = RegistryAccess.builtin();
+        final RegistryReadOps<Tag> ue11 = RegistryReadOps.<Tag>create((com.mojang.serialization.DynamicOps<Tag>)NbtOps.INSTANCE, ResourceManager.Empty.INSTANCE, a2);
+        final WorldData dal12 = a.getDataTag((DynamicOps<Tag>)ue11, DataPackConfig.DEFAULT);
+        final long long13 = (dal12 != null) ? dal12.worldGenSettings().seed() : 0L;
+        BiomeSource brh15;
+        if (dal12 != null && dal12.worldGenSettings().isFlatWorld()) {
+            brh15 = new FixedBiomeSource(Biomes.PLAINS);
         }
         else {
-            bkw13 = bky15.create(bky15.createSettings(crm12));
+            brh15 = new OverworldBiomeSource(long13, false, false);
         }
-        convertRegions(new File(file8, "region"), list5, bkw13, 0, integer11, abs);
-        convertRegions(new File(file9, "region"), list6, bky14.create(bky14.createSettings(crm12).setBiome(Biomes.NETHER)), list5.size(), integer11, abs);
-        convertRegions(new File(file10, "region"), list7, bky14.create(bky14.createSettings(crm12).setBiome(Biomes.THE_END)), list5.size() + list6.size(), integer11, abs);
-        crm12.setVersion(19133);
-        if (crm12.getGeneratorType() == LevelType.NORMAL_1_1) {
-            crm12.setGenerator(LevelType.NORMAL);
-        }
-        makeMcrLevelDatBackup(path, string);
-        final LevelStorage crn16 = LevelStorageSource.selectLevel(path, dataFixer, string, null);
-        crn16.saveLevelData(crm12);
+        convertRegions(new File(file6, "region"), list3, brh15, 0, integer9, aed);
+        convertRegions(new File(file7, "region"), list4, new FixedBiomeSource(Biomes.NETHER_WASTES), list3.size(), integer9, aed);
+        convertRegions(new File(file8, "region"), list5, new FixedBiomeSource(Biomes.THE_END), list3.size() + list4.size(), integer9, aed);
+        makeMcrLevelDatBackup(a);
+        a.saveDataTag(a2, dal12);
         return true;
     }
     
-    private static void makeMcrLevelDatBackup(final Path path, final String string) {
-        final File file3 = new File(path.toFile(), string);
-        if (!file3.exists()) {
+    private static void makeMcrLevelDatBackup(final LevelStorageSource.LevelStorageAccess a) {
+        final File file2 = a.getLevelPath(LevelResource.LEVEL_DATA_FILE).toFile();
+        if (!file2.exists()) {
             McRegionUpgrader.LOGGER.warn("Unable to create level.dat_mcr backup");
             return;
         }
-        final File file4 = new File(file3, "level.dat");
-        if (!file4.exists()) {
-            McRegionUpgrader.LOGGER.warn("Unable to create level.dat_mcr backup");
-            return;
-        }
-        final File file5 = new File(file3, "level.dat_mcr");
-        if (!file4.renameTo(file5)) {
+        final File file3 = new File(file2.getParent(), "level.dat_mcr");
+        if (!file2.renameTo(file3)) {
             McRegionUpgrader.LOGGER.warn("Unable to create level.dat_mcr backup");
         }
     }
     
-    private static void convertRegions(final File file, final Iterable<File> iterable, final BiomeSource bkw, int integer4, final int integer5, final ProgressListener abs) {
+    private static void convertRegions(final File file, final Iterable<File> iterable, final BiomeSource brh, int integer4, final int integer5, final ProgressListener aed) {
         for (final File file2 : iterable) {
-            convertRegion(file, file2, bkw, integer4, integer5, abs);
+            convertRegion(file, file2, brh, integer4, integer5, aed);
             ++integer4;
             final int integer6 = (int)Math.round(100.0 * integer4 / integer5);
-            abs.progressStagePercentage(integer6);
+            aed.progressStagePercentage(integer6);
         }
     }
     
-    private static void convertRegion(final File file1, final File file2, final BiomeSource bkw, final int integer4, final int integer5, final ProgressListener abs) {
+    private static void convertRegion(final File file1, final File file2, final BiomeSource brh, final int integer4, final int integer5, final ProgressListener aed) {
         final String string7 = file2.getName();
-        try (final RegionFile cbc8 = new RegionFile(file2, file1);
-             final RegionFile cbc9 = new RegionFile(new File(file1, string7.substring(0, string7.length() - ".mcr".length()) + ".mca"), file1)) {
+        try (final RegionFile cia8 = new RegionFile(file2, file1, true);
+             final RegionFile cia9 = new RegionFile(new File(file1, string7.substring(0, string7.length() - ".mcr".length()) + ".mca"), file1, true)) {
             for (int integer6 = 0; integer6 < 32; ++integer6) {
                 for (int integer7 = 0; integer7 < 32; ++integer7) {
-                    final ChunkPos bjh14 = new ChunkPos(integer6, integer7);
-                    if (cbc8.hasChunk(bjh14) && !cbc9.hasChunk(bjh14)) {
-                        CompoundTag jt15;
-                        try (final DataInputStream dataInputStream16 = cbc8.getChunkDataInputStream(bjh14)) {
+                    final ChunkPos bph14 = new ChunkPos(integer6, integer7);
+                    if (cia8.hasChunk(bph14) && !cia9.hasChunk(bph14)) {
+                        CompoundTag le15;
+                        try (final DataInputStream dataInputStream16 = cia8.getChunkDataInputStream(bph14)) {
                             if (dataInputStream16 == null) {
-                                McRegionUpgrader.LOGGER.warn("Failed to fetch input stream for chunk {}", bjh14);
+                                McRegionUpgrader.LOGGER.warn("Failed to fetch input stream for chunk {}", bph14);
                                 continue;
                             }
-                            jt15 = NbtIo.read(dataInputStream16);
+                            le15 = NbtIo.read(dataInputStream16);
                         }
                         catch (IOException iOException16) {
-                            McRegionUpgrader.LOGGER.warn("Failed to read data for chunk {}", bjh14, iOException16);
+                            McRegionUpgrader.LOGGER.warn("Failed to read data for chunk {}", bph14, iOException16);
                             continue;
                         }
-                        final CompoundTag jt16 = jt15.getCompound("Level");
-                        final OldChunkStorage.OldLevelChunk a17 = OldChunkStorage.load(jt16);
-                        final CompoundTag jt17 = new CompoundTag();
-                        final CompoundTag jt18 = new CompoundTag();
-                        jt17.put("Level", jt18);
-                        OldChunkStorage.convertToAnvilFormat(a17, jt18, bkw);
-                        try (final DataOutputStream dataOutputStream20 = cbc9.getChunkDataOutputStream(bjh14)) {
-                            NbtIo.write(jt17, dataOutputStream20);
+                        final CompoundTag le16 = le15.getCompound("Level");
+                        final OldChunkStorage.OldLevelChunk a17 = OldChunkStorage.load(le16);
+                        final CompoundTag le17 = new CompoundTag();
+                        final CompoundTag le18 = new CompoundTag();
+                        le17.put("Level", le18);
+                        OldChunkStorage.convertToAnvilFormat(a17, le18, brh);
+                        try (final DataOutputStream dataOutputStream20 = cia9.getChunkDataOutputStream(bph14)) {
+                            NbtIo.write(le17, dataOutputStream20);
                         }
                     }
                 }
                 int integer7 = (int)Math.round(100.0 * (integer4 * 1024) / (integer5 * 1024));
                 final int integer8 = (int)Math.round(100.0 * ((integer6 + 1) * 32 + integer4 * 1024) / (integer5 * 1024));
                 if (integer8 > integer7) {
-                    abs.progressStagePercentage(integer8);
+                    aed.progressStagePercentage(integer8);
                 }
             }
         }
diff --git a/src/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/net/minecraft/world/level/storage/PlayerDataStorage.java
new file mode 100644
index 0000000..81f15bb
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/PlayerDataStorage.java
@@ -0,0 +1,78 @@
+package net.minecraft.world.level.storage;
+
+import org.apache.logging.log4j.LogManager;
+import javax.annotation.Nullable;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.util.datafix.DataFixTypes;
+import java.io.InputStream;
+import java.io.FileInputStream;
+import net.minecraft.Util;
+import java.io.OutputStream;
+import net.minecraft.nbt.NbtIo;
+import java.io.FileOutputStream;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.entity.player.Player;
+import com.mojang.datafixers.DataFixer;
+import java.io.File;
+import org.apache.logging.log4j.Logger;
+
+public class PlayerDataStorage {
+    private static final Logger LOGGER;
+    private final File playerDir;
+    protected final DataFixer fixerUpper;
+    
+    public PlayerDataStorage(final LevelStorageSource.LevelStorageAccess a, final DataFixer dataFixer) {
+        this.fixerUpper = dataFixer;
+        (this.playerDir = a.getLevelPath(LevelResource.PLAYER_DATA_DIR).toFile()).mkdirs();
+    }
+    
+    public void save(final Player bec) {
+        try {
+            final CompoundTag le3 = bec.saveWithoutId(new CompoundTag());
+            final File file4 = File.createTempFile(bec.getStringUUID() + "-", ".dat", this.playerDir);
+            NbtIo.writeCompressed(le3, new FileOutputStream(file4));
+            final File file5 = new File(this.playerDir, bec.getStringUUID() + ".dat");
+            final File file6 = new File(this.playerDir, bec.getStringUUID() + ".dat_old");
+            Util.safeReplaceFile(file5, file4, file6);
+        }
+        catch (Exception exception3) {
+            PlayerDataStorage.LOGGER.warn("Failed to save player data for {}", bec.getName().getString());
+        }
+    }
+    
+    @Nullable
+    public CompoundTag load(final Player bec) {
+        CompoundTag le3 = null;
+        try {
+            final File file4 = new File(this.playerDir, bec.getStringUUID() + ".dat");
+            if (file4.exists() && file4.isFile()) {
+                le3 = NbtIo.readCompressed(new FileInputStream(file4));
+            }
+        }
+        catch (Exception exception4) {
+            PlayerDataStorage.LOGGER.warn("Failed to load player data for {}", bec.getName().getString());
+        }
+        if (le3 != null) {
+            final int integer4 = le3.contains("DataVersion", 3) ? le3.getInt("DataVersion") : -1;
+            bec.load(NbtUtils.update(this.fixerUpper, DataFixTypes.PLAYER, le3, integer4));
+        }
+        return le3;
+    }
+    
+    public String[] getSeenPlayers() {
+        String[] arr2 = this.playerDir.list();
+        if (arr2 == null) {
+            arr2 = new String[0];
+        }
+        for (int integer3 = 0; integer3 < arr2.length; ++integer3) {
+            if (arr2[integer3].endsWith(".dat")) {
+                arr2[integer3] = arr2[integer3].substring(0, arr2[integer3].length() - 4);
+            }
+        }
+        return arr2;
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/PlayerIO.java b/src/net/minecraft/world/level/storage/PlayerIO.java
deleted file mode 100644
index bb943cb..0000000
--- a/src/net/minecraft/world/level/storage/PlayerIO.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.minecraft.world.level.storage;
-
-import javax.annotation.Nullable;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.entity.player.Player;
-
-public interface PlayerIO {
-    void save(final Player ayj);
-    
-    @Nullable
-    CompoundTag load(final Player ayj);
-}
diff --git a/src/net/minecraft/world/level/storage/PrimaryLevelData.java b/src/net/minecraft/world/level/storage/PrimaryLevelData.java
new file mode 100644
index 0000000..097c21b
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/PrimaryLevelData.java
@@ -0,0 +1,493 @@
+package net.minecraft.world.level.storage;
+
+import org.apache.logging.log4j.LogManager;
+import java.util.Collection;
+import com.google.common.collect.ImmutableSet;
+import net.minecraft.CrashReportCategory;
+import net.minecraft.world.Difficulty;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.GameType;
+import net.minecraft.core.BlockPos;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.util.datafix.DataFixTypes;
+import net.minecraft.world.level.DataPackConfig;
+import com.mojang.serialization.DynamicOps;
+import net.minecraft.resources.RegistryWriteOps;
+import net.minecraft.nbt.NbtOps;
+import java.util.function.Consumer;
+import net.minecraft.nbt.StringTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.core.RegistryAccess;
+import java.util.stream.Stream;
+import java.util.stream.Collectors;
+import java.util.Optional;
+import net.minecraft.Util;
+import com.mojang.serialization.Decoder;
+import net.minecraft.core.SerializableUUID;
+import com.mojang.serialization.DynamicLike;
+import java.util.function.Function;
+import net.minecraft.nbt.Tag;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.world.level.timers.TimerCallbacks;
+import com.google.common.collect.Sets;
+import net.minecraft.SharedConstants;
+import java.util.LinkedHashSet;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.timers.TimerQueue;
+import java.util.Set;
+import java.util.UUID;
+import net.minecraft.world.level.border.WorldBorder;
+import net.minecraft.nbt.CompoundTag;
+import javax.annotation.Nullable;
+import com.mojang.datafixers.DataFixer;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import net.minecraft.world.level.LevelSettings;
+import org.apache.logging.log4j.Logger;
+
+public class PrimaryLevelData implements ServerLevelData, WorldData {
+    private static final Logger LOGGER;
+    private LevelSettings settings;
+    private final WorldGenSettings worldGenSettings;
+    private final Lifecycle worldGenSettingsLifecycle;
+    private int xSpawn;
+    private int ySpawn;
+    private int zSpawn;
+    private long gameTime;
+    private long dayTime;
+    @Nullable
+    private final DataFixer fixerUpper;
+    private final int playerDataVersion;
+    private boolean upgradedPlayerTag;
+    @Nullable
+    private CompoundTag loadedPlayerTag;
+    private final int version;
+    private int clearWeatherTime;
+    private boolean raining;
+    private int rainTime;
+    private boolean thundering;
+    private int thunderTime;
+    private boolean initialized;
+    private boolean difficultyLocked;
+    private WorldBorder.Settings worldBorder;
+    private CompoundTag endDragonFightData;
+    @Nullable
+    private CompoundTag customBossEvents;
+    private int wanderingTraderSpawnDelay;
+    private int wanderingTraderSpawnChance;
+    @Nullable
+    private UUID wanderingTraderId;
+    private final Set<String> knownServerBrands;
+    private boolean wasModded;
+    private final TimerQueue<MinecraftServer> scheduledEvents;
+    
+    private PrimaryLevelData(@Nullable final DataFixer dataFixer, final int integer2, @Nullable final CompoundTag le3, final boolean boolean4, final int integer5, final int integer6, final int integer7, final long long8, final long long9, final int integer10, final int integer11, final int integer12, final boolean boolean13, final int integer14, final boolean boolean15, final boolean boolean16, final boolean boolean17, final WorldBorder.Settings c, final int integer19, final int integer20, @Nullable final UUID uUID, final LinkedHashSet<String> linkedHashSet, final TimerQueue<MinecraftServer> ded, @Nullable final CompoundTag le24, final CompoundTag le25, final LevelSettings bqe, final WorldGenSettings cix, final Lifecycle lifecycle) {
+        this.fixerUpper = dataFixer;
+        this.wasModded = boolean4;
+        this.xSpawn = integer5;
+        this.ySpawn = integer6;
+        this.zSpawn = integer7;
+        this.gameTime = long8;
+        this.dayTime = long9;
+        this.version = integer10;
+        this.clearWeatherTime = integer11;
+        this.rainTime = integer12;
+        this.raining = boolean13;
+        this.thunderTime = integer14;
+        this.thundering = boolean15;
+        this.initialized = boolean16;
+        this.difficultyLocked = boolean17;
+        this.worldBorder = c;
+        this.wanderingTraderSpawnDelay = integer19;
+        this.wanderingTraderSpawnChance = integer20;
+        this.wanderingTraderId = uUID;
+        this.knownServerBrands = linkedHashSet;
+        this.loadedPlayerTag = le3;
+        this.playerDataVersion = integer2;
+        this.scheduledEvents = ded;
+        this.customBossEvents = le24;
+        this.endDragonFightData = le25;
+        this.settings = bqe;
+        this.worldGenSettings = cix;
+        this.worldGenSettingsLifecycle = lifecycle;
+    }
+    
+    public PrimaryLevelData(final LevelSettings bqe, final WorldGenSettings cix, final Lifecycle lifecycle) {
+        this(null, SharedConstants.getCurrentVersion().getWorldVersion(), null, false, 0, 0, 0, 0L, 0L, 19133, 0, 0, false, 0, false, false, false, WorldBorder.DEFAULT_SETTINGS, 0, 0, null, Sets.<String>newLinkedHashSet(), new TimerQueue<MinecraftServer>(TimerCallbacks.SERVER_CALLBACKS), null, new CompoundTag(), bqe.copy(), cix, lifecycle);
+    }
+    
+    public static PrimaryLevelData parse(final Dynamic<Tag> dynamic, final DataFixer dataFixer, final int integer, @Nullable final CompoundTag le, final LevelSettings bqe, final LevelVersion dag, final WorldGenSettings cix, final Lifecycle lifecycle) {
+        final long long9 = dynamic.get("Time").asLong(0L);
+        final CompoundTag le2 = dynamic.get("DragonFight").result().<CompoundTag>map(Dynamic::getValue).orElseGet(() -> (Tag)dynamic.get("DimensionData").get("1").get("DragonFight").orElseEmptyMap().getValue());
+        return new PrimaryLevelData(dataFixer, integer, le, dynamic.get("WasModded").asBoolean(false), dynamic.get("SpawnX").asInt(0), dynamic.get("SpawnY").asInt(0), dynamic.get("SpawnZ").asInt(0), long9, dynamic.get("DayTime").asLong(long9), dag.levelDataVersion(), dynamic.get("clearWeatherTime").asInt(0), dynamic.get("rainTime").asInt(0), dynamic.get("raining").asBoolean(false), dynamic.get("thunderTime").asInt(0), dynamic.get("thundering").asBoolean(false), dynamic.get("initialized").asBoolean(true), dynamic.get("DifficultyLocked").asBoolean(false), WorldBorder.Settings.read(dynamic, WorldBorder.DEFAULT_SETTINGS), dynamic.get("WanderingTraderSpawnDelay").asInt(0), dynamic.get("WanderingTraderSpawnChance").asInt(0), dynamic.get("WanderingTraderId").read((Decoder)SerializableUUID.CODEC).result().orElse(null), dynamic.get("ServerBrands").asStream().flatMap(dynamic -> Util.toStream(dynamic.asString().result())).collect(Collectors.toCollection(Sets::newLinkedHashSet)), new TimerQueue<MinecraftServer>(TimerCallbacks.SERVER_CALLBACKS, dynamic.get("ScheduledEvents").asStream()), (CompoundTag)dynamic.get("CustomBossEvents").orElseEmptyMap().getValue(), le2, bqe, cix, lifecycle);
+    }
+    
+    @Override
+    public CompoundTag createTag(final RegistryAccess gm, @Nullable CompoundTag le) {
+        this.updatePlayerTag();
+        if (le == null) {
+            le = this.loadedPlayerTag;
+        }
+        final CompoundTag le2 = new CompoundTag();
+        this.setTagData(gm, le2, le);
+        return le2;
+    }
+    
+    private void setTagData(final RegistryAccess gm, final CompoundTag le2, @Nullable final CompoundTag le3) {
+        final ListTag lk5 = new ListTag();
+        this.knownServerBrands.stream().map(StringTag::valueOf).forEach(lk5::add);
+        le2.put("ServerBrands", lk5);
+        le2.putBoolean("WasModded", this.wasModded);
+        final CompoundTag le4 = new CompoundTag();
+        le4.putString("Name", SharedConstants.getCurrentVersion().getName());
+        le4.putInt("Id", SharedConstants.getCurrentVersion().getWorldVersion());
+        le4.putBoolean("Snapshot", !SharedConstants.getCurrentVersion().isStable());
+        le2.put("Version", le4);
+        le2.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
+        final RegistryWriteOps<Tag> uf7 = RegistryWriteOps.<Tag>create((com.mojang.serialization.DynamicOps<Tag>)NbtOps.INSTANCE, gm);
+        WorldGenSettings.CODEC.encodeStart((DynamicOps)uf7, this.worldGenSettings).resultOrPartial((Consumer)Util.prefix("WorldGenSettings: ", PrimaryLevelData.LOGGER::error)).ifPresent(lu -> le2.put("WorldGenSettings", lu));
+        le2.putInt("GameType", this.settings.gameType().getId());
+        le2.putInt("SpawnX", this.xSpawn);
+        le2.putInt("SpawnY", this.ySpawn);
+        le2.putInt("SpawnZ", this.zSpawn);
+        le2.putLong("Time", this.gameTime);
+        le2.putLong("DayTime", this.dayTime);
+        le2.putLong("LastPlayed", Util.getEpochMillis());
+        le2.putString("LevelName", this.settings.levelName());
+        le2.putInt("version", 19133);
+        le2.putInt("clearWeatherTime", this.clearWeatherTime);
+        le2.putInt("rainTime", this.rainTime);
+        le2.putBoolean("raining", this.raining);
+        le2.putInt("thunderTime", this.thunderTime);
+        le2.putBoolean("thundering", this.thundering);
+        le2.putBoolean("hardcore", this.settings.hardcore());
+        le2.putBoolean("allowCommands", this.settings.allowCommands());
+        le2.putBoolean("initialized", this.initialized);
+        this.worldBorder.write(le2);
+        le2.putByte("Difficulty", (byte)this.settings.difficulty().getId());
+        le2.putBoolean("DifficultyLocked", this.difficultyLocked);
+        le2.put("GameRules", this.settings.gameRules().createTag());
+        le2.put("DragonFight", this.endDragonFightData);
+        if (le3 != null) {
+            le2.put("Player", le3);
+        }
+        DataPackConfig.CODEC.encodeStart((DynamicOps)NbtOps.INSTANCE, this.settings.getDataPackConfig()).result().ifPresent(lu -> le2.put("DataPacks", lu));
+        if (this.customBossEvents != null) {
+            le2.put("CustomBossEvents", this.customBossEvents);
+        }
+        le2.put("ScheduledEvents", this.scheduledEvents.store());
+        le2.putInt("WanderingTraderSpawnDelay", this.wanderingTraderSpawnDelay);
+        le2.putInt("WanderingTraderSpawnChance", this.wanderingTraderSpawnChance);
+        if (this.wanderingTraderId != null) {
+            le2.putUUID("WanderingTraderId", this.wanderingTraderId);
+        }
+    }
+    
+    @Override
+    public int getXSpawn() {
+        return this.xSpawn;
+    }
+    
+    @Override
+    public int getYSpawn() {
+        return this.ySpawn;
+    }
+    
+    @Override
+    public int getZSpawn() {
+        return this.zSpawn;
+    }
+    
+    @Override
+    public long getGameTime() {
+        return this.gameTime;
+    }
+    
+    @Override
+    public long getDayTime() {
+        return this.dayTime;
+    }
+    
+    private void updatePlayerTag() {
+        if (this.upgradedPlayerTag || this.loadedPlayerTag == null) {
+            return;
+        }
+        if (this.playerDataVersion < SharedConstants.getCurrentVersion().getWorldVersion()) {
+            if (this.fixerUpper == null) {
+                throw Util.<NullPointerException>pauseInIde(new NullPointerException("Fixer Upper not set inside LevelData, and the player tag is not upgraded."));
+            }
+            this.loadedPlayerTag = NbtUtils.update(this.fixerUpper, DataFixTypes.PLAYER, this.loadedPlayerTag, this.playerDataVersion);
+        }
+        this.upgradedPlayerTag = true;
+    }
+    
+    @Override
+    public CompoundTag getLoadedPlayerTag() {
+        this.updatePlayerTag();
+        return this.loadedPlayerTag;
+    }
+    
+    @Override
+    public void setXSpawn(final int integer) {
+        this.xSpawn = integer;
+    }
+    
+    @Override
+    public void setYSpawn(final int integer) {
+        this.ySpawn = integer;
+    }
+    
+    @Override
+    public void setZSpawn(final int integer) {
+        this.zSpawn = integer;
+    }
+    
+    @Override
+    public void setGameTime(final long long1) {
+        this.gameTime = long1;
+    }
+    
+    @Override
+    public void setDayTime(final long long1) {
+        this.dayTime = long1;
+    }
+    
+    @Override
+    public void setSpawn(final BlockPos fu) {
+        this.xSpawn = fu.getX();
+        this.ySpawn = fu.getY();
+        this.zSpawn = fu.getZ();
+    }
+    
+    @Override
+    public String getLevelName() {
+        return this.settings.levelName();
+    }
+    
+    @Override
+    public int getVersion() {
+        return this.version;
+    }
+    
+    @Override
+    public int getClearWeatherTime() {
+        return this.clearWeatherTime;
+    }
+    
+    @Override
+    public void setClearWeatherTime(final int integer) {
+        this.clearWeatherTime = integer;
+    }
+    
+    @Override
+    public boolean isThundering() {
+        return this.thundering;
+    }
+    
+    @Override
+    public void setThundering(final boolean boolean1) {
+        this.thundering = boolean1;
+    }
+    
+    @Override
+    public int getThunderTime() {
+        return this.thunderTime;
+    }
+    
+    @Override
+    public void setThunderTime(final int integer) {
+        this.thunderTime = integer;
+    }
+    
+    @Override
+    public boolean isRaining() {
+        return this.raining;
+    }
+    
+    @Override
+    public void setRaining(final boolean boolean1) {
+        this.raining = boolean1;
+    }
+    
+    @Override
+    public int getRainTime() {
+        return this.rainTime;
+    }
+    
+    @Override
+    public void setRainTime(final int integer) {
+        this.rainTime = integer;
+    }
+    
+    @Override
+    public GameType getGameType() {
+        return this.settings.gameType();
+    }
+    
+    @Override
+    public void setGameType(final GameType bpy) {
+        this.settings = this.settings.withGameType(bpy);
+    }
+    
+    @Override
+    public boolean isHardcore() {
+        return this.settings.hardcore();
+    }
+    
+    @Override
+    public boolean getAllowCommands() {
+        return this.settings.allowCommands();
+    }
+    
+    @Override
+    public boolean isInitialized() {
+        return this.initialized;
+    }
+    
+    @Override
+    public void setInitialized(final boolean boolean1) {
+        this.initialized = boolean1;
+    }
+    
+    @Override
+    public GameRules getGameRules() {
+        return this.settings.gameRules();
+    }
+    
+    @Override
+    public WorldBorder.Settings getWorldBorder() {
+        return this.worldBorder;
+    }
+    
+    @Override
+    public void setWorldBorder(final WorldBorder.Settings c) {
+        this.worldBorder = c;
+    }
+    
+    @Override
+    public Difficulty getDifficulty() {
+        return this.settings.difficulty();
+    }
+    
+    @Override
+    public void setDifficulty(final Difficulty and) {
+        this.settings = this.settings.withDifficulty(and);
+    }
+    
+    @Override
+    public boolean isDifficultyLocked() {
+        return this.difficultyLocked;
+    }
+    
+    @Override
+    public void setDifficultyLocked(final boolean boolean1) {
+        this.difficultyLocked = boolean1;
+    }
+    
+    @Override
+    public TimerQueue<MinecraftServer> getScheduledEvents() {
+        return this.scheduledEvents;
+    }
+    
+    @Override
+    public void fillCrashReportCategory(final CrashReportCategory k) {
+        super.fillCrashReportCategory(k);
+        super.fillCrashReportCategory(k);
+    }
+    
+    @Override
+    public WorldGenSettings worldGenSettings() {
+        return this.worldGenSettings;
+    }
+    
+    @Override
+    public Lifecycle worldGenSettingsLifecycle() {
+        return this.worldGenSettingsLifecycle;
+    }
+    
+    @Override
+    public CompoundTag endDragonFightData() {
+        return this.endDragonFightData;
+    }
+    
+    @Override
+    public void setEndDragonFightData(final CompoundTag le) {
+        this.endDragonFightData = le;
+    }
+    
+    @Override
+    public DataPackConfig getDataPackConfig() {
+        return this.settings.getDataPackConfig();
+    }
+    
+    @Override
+    public void setDataPackConfig(final DataPackConfig bpn) {
+        this.settings = this.settings.withDataPackConfig(bpn);
+    }
+    
+    @Nullable
+    @Override
+    public CompoundTag getCustomBossEvents() {
+        return this.customBossEvents;
+    }
+    
+    @Override
+    public void setCustomBossEvents(@Nullable final CompoundTag le) {
+        this.customBossEvents = le;
+    }
+    
+    @Override
+    public int getWanderingTraderSpawnDelay() {
+        return this.wanderingTraderSpawnDelay;
+    }
+    
+    @Override
+    public void setWanderingTraderSpawnDelay(final int integer) {
+        this.wanderingTraderSpawnDelay = integer;
+    }
+    
+    @Override
+    public int getWanderingTraderSpawnChance() {
+        return this.wanderingTraderSpawnChance;
+    }
+    
+    @Override
+    public void setWanderingTraderSpawnChance(final int integer) {
+        this.wanderingTraderSpawnChance = integer;
+    }
+    
+    @Override
+    public void setWanderingTraderId(final UUID uUID) {
+        this.wanderingTraderId = uUID;
+    }
+    
+    @Override
+    public void setModdedInfo(final String string, final boolean boolean2) {
+        this.knownServerBrands.add(string);
+        this.wasModded |= boolean2;
+    }
+    
+    @Override
+    public boolean wasModded() {
+        return this.wasModded;
+    }
+    
+    @Override
+    public Set<String> getKnownServerBrands() {
+        return ImmutableSet.copyOf(this.knownServerBrands);
+    }
+    
+    @Override
+    public ServerLevelData overworldData() {
+        return this;
+    }
+    
+    @Override
+    public LevelSettings getLevelSettings() {
+        return this.settings.copy();
+    }
+    
+    static {
+        LOGGER = LogManager.getLogger();
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/ServerLevelData.java b/src/net/minecraft/world/level/storage/ServerLevelData.java
new file mode 100644
index 0000000..2860f88
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/ServerLevelData.java
@@ -0,0 +1,63 @@
+package net.minecraft.world.level.storage;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.timers.TimerQueue;
+import net.minecraft.world.level.border.WorldBorder;
+import net.minecraft.world.level.GameType;
+import java.util.UUID;
+import net.minecraft.CrashReportCategory;
+
+public interface ServerLevelData extends WritableLevelData {
+    String getLevelName();
+    
+    void setThundering(final boolean boolean1);
+    
+    int getRainTime();
+    
+    void setRainTime(final int integer);
+    
+    void setThunderTime(final int integer);
+    
+    int getThunderTime();
+    
+    default void fillCrashReportCategory(final CrashReportCategory k) {
+        super.fillCrashReportCategory(k);
+        k.setDetail("Level name", this::getLevelName);
+        k.setDetail("Level game mode", () -> String.format("Game mode: %s (ID %d). Hardcore: %b. Cheats: %b", this.getGameType().getName(), this.getGameType().getId(), this.isHardcore(), this.getAllowCommands()));
+        k.setDetail("Level weather", () -> String.format("Rain time: %d (now: %b), thunder time: %d (now: %b)", this.getRainTime(), this.isRaining(), this.getThunderTime(), this.isThundering()));
+    }
+    
+    int getClearWeatherTime();
+    
+    void setClearWeatherTime(final int integer);
+    
+    int getWanderingTraderSpawnDelay();
+    
+    void setWanderingTraderSpawnDelay(final int integer);
+    
+    int getWanderingTraderSpawnChance();
+    
+    void setWanderingTraderSpawnChance(final int integer);
+    
+    void setWanderingTraderId(final UUID uUID);
+    
+    GameType getGameType();
+    
+    void setWorldBorder(final WorldBorder.Settings c);
+    
+    WorldBorder.Settings getWorldBorder();
+    
+    boolean isInitialized();
+    
+    void setInitialized(final boolean boolean1);
+    
+    boolean getAllowCommands();
+    
+    void setGameType(final GameType bpy);
+    
+    TimerQueue<MinecraftServer> getScheduledEvents();
+    
+    void setGameTime(final long long1);
+    
+    void setDayTime(final long long1);
+}
diff --git a/src/net/minecraft/world/level/storage/WorldData.java b/src/net/minecraft/world/level/storage/WorldData.java
new file mode 100644
index 0000000..9c2c45d
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/WorldData.java
@@ -0,0 +1,93 @@
+package net.minecraft.world.level.storage;
+
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.world.level.levelgen.WorldGenSettings;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.Difficulty;
+import net.minecraft.world.level.GameType;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.level.LevelSettings;
+import javax.annotation.Nullable;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.CrashReportCategory;
+import java.util.Set;
+import net.minecraft.world.level.DataPackConfig;
+
+public interface WorldData {
+    DataPackConfig getDataPackConfig();
+    
+    void setDataPackConfig(final DataPackConfig bpn);
+    
+    boolean wasModded();
+    
+    Set<String> getKnownServerBrands();
+    
+    void setModdedInfo(final String string, final boolean boolean2);
+    
+    default void fillCrashReportCategory(final CrashReportCategory k) {
+        k.setDetail("Known server brands", () -> String.join(", ", this.getKnownServerBrands()));
+        k.setDetail("Level was modded", () -> Boolean.toString(this.wasModded()));
+        final int integer2;
+        k.setDetail("Level storage version", () -> {
+            integer2 = this.getVersion();
+            return String.format("0x%05X - %s", integer2, this.getStorageVersionName(integer2));
+        });
+    }
+    
+    default String getStorageVersionName(final int integer) {
+        switch (integer) {
+            case 19133: {
+                return "Anvil";
+            }
+            case 19132: {
+                return "McRegion";
+            }
+            default: {
+                return "Unknown?";
+            }
+        }
+    }
+    
+    @Nullable
+    CompoundTag getCustomBossEvents();
+    
+    void setCustomBossEvents(@Nullable final CompoundTag le);
+    
+    ServerLevelData overworldData();
+    
+    LevelSettings getLevelSettings();
+    
+    CompoundTag createTag(final RegistryAccess gm, @Nullable final CompoundTag le);
+    
+    boolean isHardcore();
+    
+    int getVersion();
+    
+    String getLevelName();
+    
+    GameType getGameType();
+    
+    void setGameType(final GameType bpy);
+    
+    boolean getAllowCommands();
+    
+    Difficulty getDifficulty();
+    
+    void setDifficulty(final Difficulty and);
+    
+    boolean isDifficultyLocked();
+    
+    void setDifficultyLocked(final boolean boolean1);
+    
+    GameRules getGameRules();
+    
+    CompoundTag getLoadedPlayerTag();
+    
+    CompoundTag endDragonFightData();
+    
+    void setEndDragonFightData(final CompoundTag le);
+    
+    WorldGenSettings worldGenSettings();
+    
+    Lifecycle worldGenSettingsLifecycle();
+}
diff --git a/src/net/minecraft/world/level/storage/WritableLevelData.java b/src/net/minecraft/world/level/storage/WritableLevelData.java
new file mode 100644
index 0000000..f21e95c
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/WritableLevelData.java
@@ -0,0 +1,17 @@
+package net.minecraft.world.level.storage;
+
+import net.minecraft.core.BlockPos;
+
+public interface WritableLevelData extends LevelData {
+    void setXSpawn(final int integer);
+    
+    void setYSpawn(final int integer);
+    
+    void setZSpawn(final int integer);
+    
+    default void setSpawn(final BlockPos fu) {
+        this.setXSpawn(fu.getX());
+        this.setYSpawn(fu.getY());
+        this.setZSpawn(fu.getZ());
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/loot/BinomialDistributionGenerator.java b/src/net/minecraft/world/level/storage/loot/BinomialDistributionGenerator.java
index b8bae56..5ab2623 100644
--- a/src/net/minecraft/world/level/storage/loot/BinomialDistributionGenerator.java
+++ b/src/net/minecraft/world/level/storage/loot/BinomialDistributionGenerator.java
@@ -51,10 +51,10 @@ public final class BinomialDistributionGenerator implements RandomIntGenerator {
         }
         
         @Override
-        public JsonElement serialize(final BinomialDistributionGenerator crt, final Type type, final JsonSerializationContext jsonSerializationContext) {
+        public JsonElement serialize(final BinomialDistributionGenerator dan, final Type type, final JsonSerializationContext jsonSerializationContext) {
             final JsonObject jsonObject5 = new JsonObject();
-            jsonObject5.addProperty("n", crt.n);
-            jsonObject5.addProperty("p", crt.p);
+            jsonObject5.addProperty("n", dan.n);
+            jsonObject5.addProperty("p", dan.p);
             return jsonObject5;
         }
     }
diff --git a/src/net/minecraft/world/level/storage/loot/BuiltInLootTables.java b/src/net/minecraft/world/level/storage/loot/BuiltInLootTables.java
index 8ed9430..ae78c52 100644
--- a/src/net/minecraft/world/level/storage/loot/BuiltInLootTables.java
+++ b/src/net/minecraft/world/level/storage/loot/BuiltInLootTables.java
@@ -45,6 +45,11 @@ public class BuiltInLootTables {
     public static final ResourceLocation SHIPWRECK_SUPPLY;
     public static final ResourceLocation SHIPWRECK_TREASURE;
     public static final ResourceLocation PILLAGER_OUTPOST;
+    public static final ResourceLocation BASTION_TREASURE;
+    public static final ResourceLocation BASTION_OTHER;
+    public static final ResourceLocation BASTION_BRIDGE;
+    public static final ResourceLocation BASTION_HOGLIN_STABLE;
+    public static final ResourceLocation RUINED_PORTAL;
     public static final ResourceLocation SHEEP_WHITE;
     public static final ResourceLocation SHEEP_ORANGE;
     public static final ResourceLocation SHEEP_MAGENTA;
@@ -79,16 +84,17 @@ public class BuiltInLootTables {
     public static final ResourceLocation SHEPHERD_GIFT;
     public static final ResourceLocation TOOLSMITH_GIFT;
     public static final ResourceLocation WEAPONSMITH_GIFT;
+    public static final ResourceLocation PIGLIN_BARTERING;
     
     private static ResourceLocation register(final String string) {
         return register(new ResourceLocation(string));
     }
     
-    private static ResourceLocation register(final ResourceLocation sm) {
-        if (BuiltInLootTables.LOCATIONS.add(sm)) {
-            return sm;
+    private static ResourceLocation register(final ResourceLocation uh) {
+        if (BuiltInLootTables.LOCATIONS.add(uh)) {
+            return uh;
         }
-        throw new IllegalArgumentException(sm + " is already a registered built-in loot table");
+        throw new IllegalArgumentException(uh + " is already a registered built-in loot table");
     }
     
     public static Set<ResourceLocation> all() {
@@ -135,6 +141,11 @@ public class BuiltInLootTables {
         SHIPWRECK_SUPPLY = register("chests/shipwreck_supply");
         SHIPWRECK_TREASURE = register("chests/shipwreck_treasure");
         PILLAGER_OUTPOST = register("chests/pillager_outpost");
+        BASTION_TREASURE = register("chests/bastion_treasure");
+        BASTION_OTHER = register("chests/bastion_other");
+        BASTION_BRIDGE = register("chests/bastion_bridge");
+        BASTION_HOGLIN_STABLE = register("chests/bastion_hoglin_stable");
+        RUINED_PORTAL = register("chests/ruined_portal");
         SHEEP_WHITE = register("entities/sheep/white");
         SHEEP_ORANGE = register("entities/sheep/orange");
         SHEEP_MAGENTA = register("entities/sheep/magenta");
@@ -169,5 +180,6 @@ public class BuiltInLootTables {
         SHEPHERD_GIFT = register("gameplay/hero_of_the_village/shepherd_gift");
         TOOLSMITH_GIFT = register("gameplay/hero_of_the_village/toolsmith_gift");
         WEAPONSMITH_GIFT = register("gameplay/hero_of_the_village/weaponsmith_gift");
+        PIGLIN_BARTERING = register("gameplay/piglin_bartering");
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/ConstantIntValue.java b/src/net/minecraft/world/level/storage/loot/ConstantIntValue.java
index dde71fa..061b6be 100644
--- a/src/net/minecraft/world/level/storage/loot/ConstantIntValue.java
+++ b/src/net/minecraft/world/level/storage/loot/ConstantIntValue.java
@@ -40,8 +40,8 @@ public final class ConstantIntValue implements RandomIntGenerator {
         }
         
         @Override
-        public JsonElement serialize(final ConstantIntValue crv, final Type type, final JsonSerializationContext jsonSerializationContext) {
-            return new JsonPrimitive(crv.value);
+        public JsonElement serialize(final ConstantIntValue dap, final Type type, final JsonSerializationContext jsonSerializationContext) {
+            return new JsonPrimitive(dap.value);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/Deserializers.java b/src/net/minecraft/world/level/storage/loot/Deserializers.java
new file mode 100644
index 0000000..dab0035
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/loot/Deserializers.java
@@ -0,0 +1,24 @@
+package net.minecraft.world.level.storage.loot;
+
+import net.minecraft.world.level.storage.loot.functions.LootItemFunctions;
+import net.minecraft.world.level.storage.loot.functions.LootItemFunction;
+import net.minecraft.world.level.storage.loot.entries.LootPoolEntries;
+import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer;
+import net.minecraft.world.level.storage.loot.predicates.LootItemConditions;
+import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+import java.lang.reflect.Type;
+import com.google.gson.GsonBuilder;
+
+public class Deserializers {
+    public static GsonBuilder createConditionSerializer() {
+        return new GsonBuilder().registerTypeAdapter(RandomValueBounds.class, new RandomValueBounds.Serializer()).registerTypeAdapter(BinomialDistributionGenerator.class, new BinomialDistributionGenerator.Serializer()).registerTypeAdapter(ConstantIntValue.class, new ConstantIntValue.Serializer()).registerTypeHierarchyAdapter(LootItemCondition.class, LootItemConditions.createGsonAdapter()).registerTypeHierarchyAdapter(LootContext.EntityTarget.class, new LootContext.EntityTarget.Serializer());
+    }
+    
+    public static GsonBuilder createFunctionSerializer() {
+        return createConditionSerializer().registerTypeAdapter(IntLimiter.class, new IntLimiter.Serializer()).registerTypeHierarchyAdapter(LootPoolEntryContainer.class, LootPoolEntries.createGsonAdapter()).registerTypeHierarchyAdapter(LootItemFunction.class, LootItemFunctions.createGsonAdapter());
+    }
+    
+    public static GsonBuilder createLootTableSerializer() {
+        return createFunctionSerializer().registerTypeAdapter(LootPool.class, new LootPool.Serializer()).registerTypeAdapter(LootTable.class, new LootTable.Serializer());
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/loot/GsonAdapterFactory.java b/src/net/minecraft/world/level/storage/loot/GsonAdapterFactory.java
new file mode 100644
index 0000000..7ccead7
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/loot/GsonAdapterFactory.java
@@ -0,0 +1,100 @@
+package net.minecraft.world.level.storage.loot;
+
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.GsonHelper;
+import com.google.gson.JsonDeserializationContext;
+import java.lang.reflect.Type;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonDeserializer;
+import javax.annotation.Nullable;
+import com.mojang.datafixers.util.Pair;
+import java.util.function.Function;
+import net.minecraft.core.Registry;
+
+public class GsonAdapterFactory {
+    public static <E, T extends SerializerType<E>> Builder<E, T> builder(final Registry<T> gl, final String string2, final String string3, final Function<E, T> function) {
+        return new Builder<E, T>((Registry)gl, string2, string3, (Function)function);
+    }
+    
+    public static class Builder<E, T extends SerializerType<E>> {
+        private final Registry<T> registry;
+        private final String elementName;
+        private final String typeKey;
+        private final Function<E, T> typeGetter;
+        @Nullable
+        private Pair<T, DefaultSerializer<? extends E>> defaultType;
+        
+        private Builder(final Registry<T> gl, final String string2, final String string3, final Function<E, T> function) {
+            this.registry = gl;
+            this.elementName = string2;
+            this.typeKey = string3;
+            this.typeGetter = function;
+        }
+        
+        public Object build() {
+            return new JsonAdapter((Registry)this.registry, this.elementName, this.typeKey, (Function)this.typeGetter, (Pair)this.defaultType);
+        }
+    }
+    
+    static class JsonAdapter<E, T extends SerializerType<E>> implements JsonDeserializer<E>, JsonSerializer<E> {
+        private final Registry<T> registry;
+        private final String elementName;
+        private final String typeKey;
+        private final Function<E, T> typeGetter;
+        @Nullable
+        private final Pair<T, DefaultSerializer<? extends E>> defaultType;
+        
+        private JsonAdapter(final Registry<T> gl, final String string2, final String string3, final Function<E, T> function, @Nullable final Pair<T, DefaultSerializer<? extends E>> pair) {
+            this.registry = gl;
+            this.elementName = string2;
+            this.typeKey = string3;
+            this.typeGetter = function;
+            this.defaultType = pair;
+        }
+        
+        @Override
+        public E deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
+            if (jsonElement.isJsonObject()) {
+                final JsonObject jsonObject5 = GsonHelper.convertToJsonObject(jsonElement, this.elementName);
+                final ResourceLocation uh6 = new ResourceLocation(GsonHelper.getAsString(jsonObject5, this.typeKey));
+                final T dbd7 = this.registry.get(uh6);
+                if (dbd7 == null) {
+                    throw new JsonSyntaxException("Unknown type '" + uh6 + "'");
+                }
+                return (E)dbd7.getSerializer().deserialize(jsonObject5, jsonDeserializationContext);
+            }
+            else {
+                if (this.defaultType == null) {
+                    throw new UnsupportedOperationException("Object " + jsonElement + " can't be deserialized");
+                }
+                return ((DefaultSerializer)this.defaultType.getSecond()).deserialize(jsonElement, jsonDeserializationContext);
+            }
+        }
+        
+        @Override
+        public JsonElement serialize(final E object, final Type type, final JsonSerializationContext jsonSerializationContext) {
+            final T dbd5 = this.typeGetter.apply(object);
+            if (this.defaultType != null && this.defaultType.getFirst() == dbd5) {
+                return ((DefaultSerializer)this.defaultType.getSecond()).serialize(object, jsonSerializationContext);
+            }
+            if (dbd5 == null) {
+                throw new JsonSyntaxException("Unknown type: " + object);
+            }
+            final JsonObject jsonObject6 = new JsonObject();
+            jsonObject6.addProperty(this.typeKey, this.registry.getKey(dbd5).toString());
+            dbd5.getSerializer().serialize(jsonObject6, (E)object, jsonSerializationContext);
+            return jsonObject6;
+        }
+    }
+    
+    public interface DefaultSerializer<T> {
+        JsonElement serialize(final T object, final JsonSerializationContext jsonSerializationContext);
+        
+        T deserialize(final JsonElement jsonElement, final JsonDeserializationContext jsonDeserializationContext);
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/loot/IntLimiter.java b/src/net/minecraft/world/level/storage/loot/IntLimiter.java
index 455f887..a58b93b 100644
--- a/src/net/minecraft/world/level/storage/loot/IntLimiter.java
+++ b/src/net/minecraft/world/level/storage/loot/IntLimiter.java
@@ -71,13 +71,13 @@ public class IntLimiter implements IntUnaryOperator {
         }
         
         @Override
-        public JsonElement serialize(final IntLimiter crw, final Type type, final JsonSerializationContext jsonSerializationContext) {
+        public JsonElement serialize(final IntLimiter das, final Type type, final JsonSerializationContext jsonSerializationContext) {
             final JsonObject jsonObject5 = new JsonObject();
-            if (crw.max != null) {
-                jsonObject5.addProperty("max", crw.max);
+            if (das.max != null) {
+                jsonObject5.addProperty("max", das.max);
             }
-            if (crw.min != null) {
-                jsonObject5.addProperty("min", crw.min);
+            if (das.min != null) {
+                jsonObject5.addProperty("min", das.min);
             }
             return jsonObject5;
         }
diff --git a/src/net/minecraft/world/level/storage/loot/LootContext.java b/src/net/minecraft/world/level/storage/loot/LootContext.java
index 2603abb..8e4b43c 100644
--- a/src/net/minecraft/world/level/storage/loot/LootContext.java
+++ b/src/net/minecraft/world/level/storage/loot/LootContext.java
@@ -34,56 +34,56 @@ public class LootContext {
     private final Map<LootContextParam<?>, Object> params;
     private final Map<ResourceLocation, DynamicDrop> dynamicDrops;
     
-    private LootContext(final Random random, final float float2, final ServerLevel xd, final Function<ResourceLocation, LootTable> function4, final Function<ResourceLocation, LootItemCondition> function5, final Map<LootContextParam<?>, Object> map6, final Map<ResourceLocation, DynamicDrop> map7) {
+    private LootContext(final Random random, final float float2, final ServerLevel zd, final Function<ResourceLocation, LootTable> function4, final Function<ResourceLocation, LootItemCondition> function5, final Map<LootContextParam<?>, Object> map6, final Map<ResourceLocation, DynamicDrop> map7) {
         this.visitedTables = Sets.newLinkedHashSet();
         this.visitedConditions = Sets.newLinkedHashSet();
         this.random = random;
         this.luck = float2;
-        this.level = xd;
+        this.level = zd;
         this.lootTables = function4;
         this.conditions = function5;
         this.params = ImmutableMap.copyOf(map6);
         this.dynamicDrops = ImmutableMap.copyOf(map7);
     }
     
-    public boolean hasParam(final LootContextParam<?> ctx) {
-        return this.params.containsKey(ctx);
+    public boolean hasParam(final LootContextParam<?> dcx) {
+        return this.params.containsKey(dcx);
     }
     
-    public void addDynamicDrops(final ResourceLocation sm, final Consumer<ItemStack> consumer) {
-        final DynamicDrop b4 = this.dynamicDrops.get(sm);
+    public void addDynamicDrops(final ResourceLocation uh, final Consumer<ItemStack> consumer) {
+        final DynamicDrop b4 = this.dynamicDrops.get(uh);
         if (b4 != null) {
             b4.add(this, consumer);
         }
     }
     
     @Nullable
-    public <T> T getParamOrNull(final LootContextParam<T> ctx) {
-        return (T)this.params.get(ctx);
+    public <T> T getParamOrNull(final LootContextParam<T> dcx) {
+        return (T)this.params.get(dcx);
     }
     
-    public boolean addVisitedTable(final LootTable csa) {
-        return this.visitedTables.add(csa);
+    public boolean addVisitedTable(final LootTable daw) {
+        return this.visitedTables.add(daw);
     }
     
-    public void removeVisitedTable(final LootTable csa) {
-        this.visitedTables.remove(csa);
+    public void removeVisitedTable(final LootTable daw) {
+        this.visitedTables.remove(daw);
     }
     
-    public boolean addVisitedCondition(final LootItemCondition cum) {
-        return this.visitedConditions.add(cum);
+    public boolean addVisitedCondition(final LootItemCondition ddm) {
+        return this.visitedConditions.add(ddm);
     }
     
-    public void removeVisitedCondition(final LootItemCondition cum) {
-        this.visitedConditions.remove(cum);
+    public void removeVisitedCondition(final LootItemCondition ddm) {
+        this.visitedConditions.remove(ddm);
     }
     
-    public LootTable getLootTable(final ResourceLocation sm) {
-        return this.lootTables.apply(sm);
+    public LootTable getLootTable(final ResourceLocation uh) {
+        return this.lootTables.apply(uh);
     }
     
-    public LootItemCondition getCondition(final ResourceLocation sm) {
-        return this.conditions.apply(sm);
+    public LootItemCondition getCondition(final ResourceLocation uh) {
+        return this.conditions.apply(uh);
     }
     
     public Random getRandom() {
@@ -105,10 +105,10 @@ public class LootContext {
         private Random random;
         private float luck;
         
-        public Builder(final ServerLevel xd) {
+        public Builder(final ServerLevel zd) {
             this.params = Maps.newIdentityHashMap();
             this.dynamicDrops = Maps.newHashMap();
-            this.level = xd;
+            this.level = zd;
         }
         
         public Builder withRandom(final Random random) {
@@ -138,23 +138,23 @@ public class LootContext {
             return this;
         }
         
-        public <T> Builder withParameter(final LootContextParam<T> ctx, final T object) {
-            this.params.put(ctx, object);
+        public <T> Builder withParameter(final LootContextParam<T> dcx, final T object) {
+            this.params.put(dcx, object);
             return this;
         }
         
-        public <T> Builder withOptionalParameter(final LootContextParam<T> ctx, @Nullable final T object) {
+        public <T> Builder withOptionalParameter(final LootContextParam<T> dcx, @Nullable final T object) {
             if (object == null) {
-                this.params.remove(ctx);
+                this.params.remove(dcx);
             }
             else {
-                this.params.put(ctx, object);
+                this.params.put(dcx, object);
             }
             return this;
         }
         
-        public Builder withDynamicDrop(final ResourceLocation sm, final DynamicDrop b) {
-            final DynamicDrop b2 = this.dynamicDrops.put(sm, b);
+        public Builder withDynamicDrop(final ResourceLocation uh, final DynamicDrop b) {
+            final DynamicDrop b2 = this.dynamicDrops.put(uh, b);
             if (b2 != null) {
                 throw new IllegalStateException("Duplicated dynamic drop '" + this.dynamicDrops + "'");
             }
@@ -165,25 +165,25 @@ public class LootContext {
             return this.level;
         }
         
-        public <T> T getParameter(final LootContextParam<T> ctx) {
-            final T object3 = (T)this.params.get(ctx);
+        public <T> T getParameter(final LootContextParam<T> dcx) {
+            final T object3 = (T)this.params.get(dcx);
             if (object3 == null) {
-                throw new IllegalArgumentException("No parameter " + ctx);
+                throw new IllegalArgumentException("No parameter " + dcx);
             }
             return object3;
         }
         
         @Nullable
-        public <T> T getOptionalParameter(final LootContextParam<T> ctx) {
-            return (T)this.params.get(ctx);
+        public <T> T getOptionalParameter(final LootContextParam<T> dcx) {
+            return (T)this.params.get(dcx);
         }
         
-        public LootContext create(final LootContextParamSet cty) {
-            final Set<LootContextParam<?>> set3 = Sets.<LootContextParam<?>>difference(this.params.keySet(), cty.getAllowed());
+        public LootContext create(final LootContextParamSet dcy) {
+            final Set<LootContextParam<?>> set3 = Sets.<LootContextParam<?>>difference(this.params.keySet(), dcy.getAllowed());
             if (!set3.isEmpty()) {
                 throw new IllegalArgumentException("Parameters not allowed in this parameter set: " + set3);
             }
-            final Set<LootContextParam<?>> set4 = Sets.<LootContextParam<?>>difference(cty.getRequired(), this.params.keySet());
+            final Set<LootContextParam<?>> set4 = Sets.<LootContextParam<?>>difference(dcy.getRequired(), this.params.keySet());
             if (!set4.isEmpty()) {
                 throw new IllegalArgumentException("Missing required parameters: " + set4);
             }
@@ -205,9 +205,9 @@ public class LootContext {
         private final String name;
         private final LootContextParam<? extends Entity> param;
         
-        private EntityTarget(final String string3, final LootContextParam<? extends Entity> ctx) {
+        private EntityTarget(final String string3, final LootContextParam<? extends Entity> dcx) {
             this.name = string3;
-            this.param = ctx;
+            this.param = dcx;
         }
         
         public LootContextParam<? extends Entity> getParam() {
@@ -238,6 +238,6 @@ public class LootContext {
     
     @FunctionalInterface
     public interface DynamicDrop {
-        void add(final LootContext crx, final Consumer<ItemStack> consumer);
+        void add(final LootContext dat, final Consumer<ItemStack> consumer);
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/LootContextUser.java b/src/net/minecraft/world/level/storage/loot/LootContextUser.java
index 5b6eada..ead545e 100644
--- a/src/net/minecraft/world/level/storage/loot/LootContextUser.java
+++ b/src/net/minecraft/world/level/storage/loot/LootContextUser.java
@@ -9,7 +9,7 @@ public interface LootContextUser {
         return ImmutableSet.of();
     }
     
-    default void validate(final ValidationContext csg) {
-        csg.validateUser(this);
+    default void validate(final ValidationContext dbe) {
+        dbe.validateUser(this);
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/LootPool.java b/src/net/minecraft/world/level/storage/loot/LootPool.java
index 9985dc5..b9dc1ea 100644
--- a/src/net/minecraft/world/level/storage/loot/LootPool.java
+++ b/src/net/minecraft/world/level/storage/loot/LootPool.java
@@ -38,28 +38,28 @@ public class LootPool {
     private final RandomIntGenerator rolls;
     private final RandomValueBounds bonusRolls;
     
-    private LootPool(final LootPoolEntryContainer[] arr, final LootItemCondition[] arr, final LootItemFunction[] arr, final RandomIntGenerator csd, final RandomValueBounds csf) {
+    private LootPool(final LootPoolEntryContainer[] arr, final LootItemCondition[] arr, final LootItemFunction[] arr, final RandomIntGenerator daz, final RandomValueBounds dbb) {
         this.entries = arr;
         this.conditions = arr;
         this.compositeCondition = LootItemConditions.<LootContext>andConditions(arr);
         this.functions = arr;
         this.compositeFunction = LootItemFunctions.compose(arr);
-        this.rolls = csd;
-        this.bonusRolls = csf;
+        this.rolls = daz;
+        this.bonusRolls = dbb;
     }
     
-    private void addRandomItem(final Consumer<ItemStack> consumer, final LootContext crx) {
-        final Random random4 = crx.getRandom();
+    private void addRandomItem(final Consumer<ItemStack> consumer, final LootContext dat) {
+        final Random random4 = dat.getRandom();
         final List<LootPoolEntry> list5 = Lists.newArrayList();
         final MutableInt mutableInt6 = new MutableInt();
-        for (final LootPoolEntryContainer csq10 : this.entries) {
+        for (final LootPoolEntryContainer dbo10 : this.entries) {
             final int integer5;
             final List<LootPoolEntry> list6;
             final MutableInt mutableInt7;
-            csq10.expand(crx, csp -> {
-                integer5 = csp.getWeight(crx.getLuck());
+            dbo10.expand(dat, dbn -> {
+                integer5 = dbn.getWeight(dat.getLuck());
                 if (integer5 > 0) {
-                    list6.add(csp);
+                    list6.add(dbn);
                     mutableInt7.add(integer5);
                 }
                 return;
@@ -70,38 +70,38 @@ public class LootPool {
             return;
         }
         if (integer6 == 1) {
-            list5.get(0).createItemStack(consumer, crx);
+            list5.get(0).createItemStack(consumer, dat);
             return;
         }
         int integer7 = random4.nextInt(mutableInt6.intValue());
-        for (final LootPoolEntry csp2 : list5) {
-            integer7 -= csp2.getWeight(crx.getLuck());
+        for (final LootPoolEntry dbn2 : list5) {
+            integer7 -= dbn2.getWeight(dat.getLuck());
             if (integer7 < 0) {
-                csp2.createItemStack(consumer, crx);
+                dbn2.createItemStack(consumer, dat);
             }
         }
     }
     
-    public void addRandomItems(final Consumer<ItemStack> consumer, final LootContext crx) {
-        if (!this.compositeCondition.test(crx)) {
+    public void addRandomItems(final Consumer<ItemStack> consumer, final LootContext dat) {
+        if (!this.compositeCondition.test(dat)) {
             return;
         }
-        final Consumer<ItemStack> consumer2 = LootItemFunction.decorate(this.compositeFunction, consumer, crx);
-        final Random random5 = crx.getRandom();
-        for (int integer6 = this.rolls.getInt(random5) + Mth.floor(this.bonusRolls.getFloat(random5) * crx.getLuck()), integer7 = 0; integer7 < integer6; ++integer7) {
-            this.addRandomItem(consumer2, crx);
+        final Consumer<ItemStack> consumer2 = LootItemFunction.decorate(this.compositeFunction, consumer, dat);
+        final Random random5 = dat.getRandom();
+        for (int integer6 = this.rolls.getInt(random5) + Mth.floor(this.bonusRolls.getFloat(random5) * dat.getLuck()), integer7 = 0; integer7 < integer6; ++integer7) {
+            this.addRandomItem(consumer2, dat);
         }
     }
     
-    public void validate(final ValidationContext csg) {
+    public void validate(final ValidationContext dbe) {
         for (int integer3 = 0; integer3 < this.conditions.length; ++integer3) {
-            this.conditions[integer3].validate(csg.forChild(".condition[" + integer3 + "]"));
+            this.conditions[integer3].validate(dbe.forChild(".condition[" + integer3 + "]"));
         }
         for (int integer3 = 0; integer3 < this.functions.length; ++integer3) {
-            this.functions[integer3].validate(csg.forChild(".functions[" + integer3 + "]"));
+            this.functions[integer3].validate(dbe.forChild(".functions[" + integer3 + "]"));
         }
         for (int integer3 = 0; integer3 < this.entries.length; ++integer3) {
-            this.entries[integer3].validate(csg.forChild(".entries[" + integer3 + "]"));
+            this.entries[integer3].validate(dbe.forChild(".entries[" + integer3 + "]"));
         }
     }
     
@@ -124,8 +124,8 @@ public class LootPool {
             this.bonusRolls = new RandomValueBounds(0.0f, 0.0f);
         }
         
-        public Builder setRolls(final RandomIntGenerator csd) {
-            this.rolls = csd;
+        public Builder setRolls(final RandomIntGenerator daz) {
+            this.rolls = daz;
             return this;
         }
         
@@ -166,24 +166,24 @@ public class LootPool {
             final LootPoolEntryContainer[] arr6 = GsonHelper.<LootPoolEntryContainer[]>getAsObject(jsonObject5, "entries", jsonDeserializationContext, LootPoolEntryContainer[].class);
             final LootItemCondition[] arr7 = GsonHelper.<LootItemCondition[]>getAsObject(jsonObject5, "conditions", new LootItemCondition[0], jsonDeserializationContext, LootItemCondition[].class);
             final LootItemFunction[] arr8 = GsonHelper.<LootItemFunction[]>getAsObject(jsonObject5, "functions", new LootItemFunction[0], jsonDeserializationContext, LootItemFunction[].class);
-            final RandomIntGenerator csd9 = RandomIntGenerators.deserialize(jsonObject5.get("rolls"), jsonDeserializationContext);
-            final RandomValueBounds csf10 = GsonHelper.<RandomValueBounds>getAsObject(jsonObject5, "bonus_rolls", new RandomValueBounds(0.0f, 0.0f), jsonDeserializationContext, RandomValueBounds.class);
-            return new LootPool(arr6, arr7, arr8, csd9, csf10, null);
+            final RandomIntGenerator daz9 = RandomIntGenerators.deserialize(jsonObject5.get("rolls"), jsonDeserializationContext);
+            final RandomValueBounds dbb10 = GsonHelper.<RandomValueBounds>getAsObject(jsonObject5, "bonus_rolls", new RandomValueBounds(0.0f, 0.0f), jsonDeserializationContext, RandomValueBounds.class);
+            return new LootPool(arr6, arr7, arr8, daz9, dbb10, null);
         }
         
         @Override
-        public JsonElement serialize(final LootPool crz, final Type type, final JsonSerializationContext jsonSerializationContext) {
+        public JsonElement serialize(final LootPool dav, final Type type, final JsonSerializationContext jsonSerializationContext) {
             final JsonObject jsonObject5 = new JsonObject();
-            jsonObject5.add("rolls", RandomIntGenerators.serialize(crz.rolls, jsonSerializationContext));
-            jsonObject5.add("entries", jsonSerializationContext.serialize(crz.entries));
-            if (crz.bonusRolls.getMin() != 0.0f && crz.bonusRolls.getMax() != 0.0f) {
-                jsonObject5.add("bonus_rolls", jsonSerializationContext.serialize(crz.bonusRolls));
+            jsonObject5.add("rolls", RandomIntGenerators.serialize(dav.rolls, jsonSerializationContext));
+            jsonObject5.add("entries", jsonSerializationContext.serialize(dav.entries));
+            if (dav.bonusRolls.getMin() != 0.0f && dav.bonusRolls.getMax() != 0.0f) {
+                jsonObject5.add("bonus_rolls", jsonSerializationContext.serialize(dav.bonusRolls));
             }
-            if (!ArrayUtils.isEmpty((Object[])crz.conditions)) {
-                jsonObject5.add("conditions", jsonSerializationContext.serialize(crz.conditions));
+            if (!ArrayUtils.isEmpty((Object[])dav.conditions)) {
+                jsonObject5.add("conditions", jsonSerializationContext.serialize(dav.conditions));
             }
-            if (!ArrayUtils.isEmpty((Object[])crz.functions)) {
-                jsonObject5.add("functions", jsonSerializationContext.serialize(crz.functions));
+            if (!ArrayUtils.isEmpty((Object[])dav.functions)) {
+                jsonObject5.add("functions", jsonSerializationContext.serialize(dav.functions));
             }
             return jsonObject5;
         }
diff --git a/src/net/minecraft/world/level/storage/loot/LootTable.java b/src/net/minecraft/world/level/storage/loot/LootTable.java
index 36a77d6..7e924ad 100644
--- a/src/net/minecraft/world/level/storage/loot/LootTable.java
+++ b/src/net/minecraft/world/level/storage/loot/LootTable.java
@@ -39,8 +39,8 @@ public class LootTable {
     private final LootItemFunction[] functions;
     private final BiFunction<ItemStack, LootContext, ItemStack> compositeFunction;
     
-    private LootTable(final LootContextParamSet cty, final LootPool[] arr, final LootItemFunction[] arr) {
-        this.paramSet = cty;
+    private LootTable(final LootContextParamSet dcy, final LootPool[] arr, final LootItemFunction[] arr) {
+        this.paramSet = dcy;
         this.pools = arr;
         this.functions = arr;
         this.compositeFunction = LootItemFunctions.compose(arr);
@@ -48,43 +48,43 @@ public class LootTable {
     
     public static Consumer<ItemStack> createStackSplitter(final Consumer<ItemStack> consumer) {
         int integer3;
-        ItemStack ben2;
-        return ben -> {
-            if (ben.getCount() < ben.getMaxStackSize()) {
-                consumer.accept(ben);
+        ItemStack bki2;
+        return bki -> {
+            if (bki.getCount() < bki.getMaxStackSize()) {
+                consumer.accept(bki);
             }
             else {
-                integer3 = ben.getCount();
+                integer3 = bki.getCount();
                 while (integer3 > 0) {
-                    ben2 = ben.copy();
-                    ben2.setCount(Math.min(ben.getMaxStackSize(), integer3));
-                    integer3 -= ben2.getCount();
-                    consumer.accept(ben2);
+                    bki2 = bki.copy();
+                    bki2.setCount(Math.min(bki.getMaxStackSize(), integer3));
+                    integer3 -= bki2.getCount();
+                    consumer.accept(bki2);
                 }
             }
         };
     }
     
-    public void getRandomItemsRaw(final LootContext crx, final Consumer<ItemStack> consumer) {
-        if (crx.addVisitedTable(this)) {
-            final Consumer<ItemStack> consumer2 = LootItemFunction.decorate(this.compositeFunction, consumer, crx);
-            for (final LootPool crz8 : this.pools) {
-                crz8.addRandomItems(consumer2, crx);
+    public void getRandomItemsRaw(final LootContext dat, final Consumer<ItemStack> consumer) {
+        if (dat.addVisitedTable(this)) {
+            final Consumer<ItemStack> consumer2 = LootItemFunction.decorate(this.compositeFunction, consumer, dat);
+            for (final LootPool dav8 : this.pools) {
+                dav8.addRandomItems(consumer2, dat);
             }
-            crx.removeVisitedTable(this);
+            dat.removeVisitedTable(this);
         }
         else {
             LootTable.LOGGER.warn("Detected infinite loop in loot tables");
         }
     }
     
-    public void getRandomItems(final LootContext crx, final Consumer<ItemStack> consumer) {
-        this.getRandomItemsRaw(crx, createStackSplitter(consumer));
+    public void getRandomItems(final LootContext dat, final Consumer<ItemStack> consumer) {
+        this.getRandomItemsRaw(dat, createStackSplitter(consumer));
     }
     
-    public List<ItemStack> getRandomItems(final LootContext crx) {
+    public List<ItemStack> getRandomItems(final LootContext dat) {
         final List<ItemStack> list3 = Lists.newArrayList();
-        this.getRandomItems(crx, list3::add);
+        this.getRandomItems(dat, list3::add);
         return list3;
     }
     
@@ -92,30 +92,30 @@ public class LootTable {
         return this.paramSet;
     }
     
-    public void validate(final ValidationContext csg) {
+    public void validate(final ValidationContext dbe) {
         for (int integer3 = 0; integer3 < this.pools.length; ++integer3) {
-            this.pools[integer3].validate(csg.forChild(".pools[" + integer3 + "]"));
+            this.pools[integer3].validate(dbe.forChild(".pools[" + integer3 + "]"));
         }
         for (int integer3 = 0; integer3 < this.functions.length; ++integer3) {
-            this.functions[integer3].validate(csg.forChild(".functions[" + integer3 + "]"));
+            this.functions[integer3].validate(dbe.forChild(".functions[" + integer3 + "]"));
         }
     }
     
-    public void fill(final Container aje, final LootContext crx) {
-        final List<ItemStack> list4 = this.getRandomItems(crx);
-        final Random random5 = crx.getRandom();
-        final List<Integer> list5 = this.getAvailableSlots(aje, random5);
+    public void fill(final Container amz, final LootContext dat) {
+        final List<ItemStack> list4 = this.getRandomItems(dat);
+        final Random random5 = dat.getRandom();
+        final List<Integer> list5 = this.getAvailableSlots(amz, random5);
         this.shuffleAndSplitItems(list4, list5.size(), random5);
-        for (final ItemStack ben8 : list4) {
+        for (final ItemStack bki8 : list4) {
             if (list5.isEmpty()) {
                 LootTable.LOGGER.warn("Tried to over-fill a container");
                 return;
             }
-            if (ben8.isEmpty()) {
-                aje.setItem(list5.remove(list5.size() - 1), ItemStack.EMPTY);
+            if (bki8.isEmpty()) {
+                amz.setItem(list5.remove(list5.size() - 1), ItemStack.EMPTY);
             }
             else {
-                aje.setItem(list5.remove(list5.size() - 1), ben8);
+                amz.setItem(list5.remove(list5.size() - 1), bki8);
             }
         }
     }
@@ -124,43 +124,43 @@ public class LootTable {
         final List<ItemStack> list2 = Lists.newArrayList();
         final Iterator<ItemStack> iterator6 = list.iterator();
         while (iterator6.hasNext()) {
-            final ItemStack ben7 = iterator6.next();
-            if (ben7.isEmpty()) {
+            final ItemStack bki7 = iterator6.next();
+            if (bki7.isEmpty()) {
                 iterator6.remove();
             }
             else {
-                if (ben7.getCount() <= 1) {
+                if (bki7.getCount() <= 1) {
                     continue;
                 }
-                list2.add(ben7);
+                list2.add(bki7);
                 iterator6.remove();
             }
         }
         while (integer - list.size() - list2.size() > 0 && !list2.isEmpty()) {
-            final ItemStack ben8 = list2.remove(Mth.nextInt(random, 0, list2.size() - 1));
-            final int integer2 = Mth.nextInt(random, 1, ben8.getCount() / 2);
-            final ItemStack ben9 = ben8.split(integer2);
-            if (ben8.getCount() > 1 && random.nextBoolean()) {
-                list2.add(ben8);
+            final ItemStack bki8 = list2.remove(Mth.nextInt(random, 0, list2.size() - 1));
+            final int integer2 = Mth.nextInt(random, 1, bki8.getCount() / 2);
+            final ItemStack bki9 = bki8.split(integer2);
+            if (bki8.getCount() > 1 && random.nextBoolean()) {
+                list2.add(bki8);
             }
             else {
-                list.add(ben8);
+                list.add(bki8);
             }
-            if (ben9.getCount() > 1 && random.nextBoolean()) {
-                list2.add(ben9);
+            if (bki9.getCount() > 1 && random.nextBoolean()) {
+                list2.add(bki9);
             }
             else {
-                list.add(ben9);
+                list.add(bki9);
             }
         }
         list.addAll(list2);
         Collections.shuffle(list, random);
     }
     
-    private List<Integer> getAvailableSlots(final Container aje, final Random random) {
+    private List<Integer> getAvailableSlots(final Container amz, final Random random) {
         final List<Integer> list4 = Lists.newArrayList();
-        for (int integer5 = 0; integer5 < aje.getContainerSize(); ++integer5) {
-            if (aje.getItem(integer5).isEmpty()) {
+        for (int integer5 = 0; integer5 < amz.getContainerSize(); ++integer5) {
+            if (amz.getItem(integer5).isEmpty()) {
                 list4.add(integer5);
             }
         }
@@ -194,8 +194,8 @@ public class LootTable {
             return this;
         }
         
-        public Builder setParamSet(final LootContextParamSet cty) {
-            this.paramSet = cty;
+        public Builder setParamSet(final LootContextParamSet dcy) {
+            this.paramSet = dcy;
             return this;
         }
         
@@ -220,32 +220,32 @@ public class LootTable {
         public LootTable deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             final JsonObject jsonObject5 = GsonHelper.convertToJsonObject(jsonElement, "loot table");
             final LootPool[] arr6 = GsonHelper.<LootPool[]>getAsObject(jsonObject5, "pools", new LootPool[0], jsonDeserializationContext, LootPool[].class);
-            LootContextParamSet cty7 = null;
+            LootContextParamSet dcy7 = null;
             if (jsonObject5.has("type")) {
                 final String string8 = GsonHelper.getAsString(jsonObject5, "type");
-                cty7 = LootContextParamSets.get(new ResourceLocation(string8));
+                dcy7 = LootContextParamSets.get(new ResourceLocation(string8));
             }
             final LootItemFunction[] arr7 = GsonHelper.<LootItemFunction[]>getAsObject(jsonObject5, "functions", new LootItemFunction[0], jsonDeserializationContext, LootItemFunction[].class);
-            return new LootTable((cty7 != null) ? cty7 : LootContextParamSets.ALL_PARAMS, arr6, arr7, null);
+            return new LootTable((dcy7 != null) ? dcy7 : LootContextParamSets.ALL_PARAMS, arr6, arr7, null);
         }
         
         @Override
-        public JsonElement serialize(final LootTable csa, final Type type, final JsonSerializationContext jsonSerializationContext) {
+        public JsonElement serialize(final LootTable daw, final Type type, final JsonSerializationContext jsonSerializationContext) {
             final JsonObject jsonObject5 = new JsonObject();
-            if (csa.paramSet != LootTable.DEFAULT_PARAM_SET) {
-                final ResourceLocation sm6 = LootContextParamSets.getKey(csa.paramSet);
-                if (sm6 != null) {
-                    jsonObject5.addProperty("type", sm6.toString());
+            if (daw.paramSet != LootTable.DEFAULT_PARAM_SET) {
+                final ResourceLocation uh6 = LootContextParamSets.getKey(daw.paramSet);
+                if (uh6 != null) {
+                    jsonObject5.addProperty("type", uh6.toString());
                 }
                 else {
-                    LootTable.LOGGER.warn("Failed to find id for param set " + csa.paramSet);
+                    LootTable.LOGGER.warn("Failed to find id for param set " + daw.paramSet);
                 }
             }
-            if (csa.pools.length > 0) {
-                jsonObject5.add("pools", jsonSerializationContext.serialize(csa.pools));
+            if (daw.pools.length > 0) {
+                jsonObject5.add("pools", jsonSerializationContext.serialize(daw.pools));
             }
-            if (!ArrayUtils.isEmpty((Object[])csa.functions)) {
-                jsonObject5.add("functions", jsonSerializationContext.serialize(csa.functions));
+            if (!ArrayUtils.isEmpty((Object[])daw.functions)) {
+                jsonObject5.add("functions", jsonSerializationContext.serialize(daw.functions));
             }
             return jsonObject5;
         }
diff --git a/src/net/minecraft/world/level/storage/loot/LootTables.java b/src/net/minecraft/world/level/storage/loot/LootTables.java
index 529e878..acc5534 100644
--- a/src/net/minecraft/world/level/storage/loot/LootTables.java
+++ b/src/net/minecraft/world/level/storage/loot/LootTables.java
@@ -1,20 +1,11 @@
 package net.minecraft.world.level.storage.loot;
 
-import net.minecraft.world.level.storage.loot.predicates.LootItemConditions;
-import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
-import net.minecraft.world.level.storage.loot.functions.LootItemFunctions;
-import net.minecraft.world.level.storage.loot.functions.LootItemFunction;
-import net.minecraft.world.level.storage.loot.entries.LootPoolEntries;
-import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer;
-import java.lang.reflect.Type;
-import com.google.gson.GsonBuilder;
 import org.apache.logging.log4j.LogManager;
 import java.util.Set;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
-import com.google.gson.JsonElement;
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.server.packs.resources.ResourceManager;
-import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.resources.ResourceLocation;
 import java.util.Map;
@@ -28,49 +19,49 @@ public class LootTables extends SimpleJsonResourceReloadListener {
     private Map<ResourceLocation, LootTable> tables;
     private final PredicateManager predicateManager;
     
-    public LootTables(final PredicateManager csc) {
+    public LootTables(final PredicateManager day) {
         super(LootTables.GSON, "loot_tables");
         this.tables = ImmutableMap.of();
-        this.predicateManager = csc;
+        this.predicateManager = day;
     }
     
-    public LootTable get(final ResourceLocation sm) {
-        return this.tables.getOrDefault(sm, LootTable.EMPTY);
+    public LootTable get(final ResourceLocation uh) {
+        return this.tables.getOrDefault(uh, LootTable.EMPTY);
     }
     
     @Override
-    protected void apply(final Map<ResourceLocation, JsonObject> map, final ResourceManager zb, final ProfilerFiller aio) {
+    protected void apply(final Map<ResourceLocation, JsonElement> map, final ResourceManager abc, final ProfilerFiller ami) {
         final ImmutableMap.Builder<ResourceLocation, LootTable> builder5 = ImmutableMap.<ResourceLocation, LootTable>builder();
-        final JsonObject jsonObject2 = map.remove(BuiltInLootTables.EMPTY);
-        if (jsonObject2 != null) {
+        final JsonElement jsonElement2 = map.remove(BuiltInLootTables.EMPTY);
+        if (jsonElement2 != null) {
             LootTables.LOGGER.warn("Datapack tried to redefine {} loot table, ignoring", BuiltInLootTables.EMPTY);
         }
-        LootTable csa2;
+        LootTable daw2;
         final ImmutableMap.Builder<ResourceLocation, LootTable> builder6;
-        map.forEach((sm, jsonObject) -> {
+        map.forEach((uh, jsonElement) -> {
             try {
-                csa2 = LootTables.GSON.<LootTable>fromJson(jsonObject, LootTable.class);
-                builder6.put(sm, csa2);
+                daw2 = LootTables.GSON.<LootTable>fromJson(jsonElement, LootTable.class);
+                builder6.put(uh, daw2);
             }
             catch (Exception exception4) {
-                LootTables.LOGGER.error("Couldn't parse loot table {}", sm, exception4);
+                LootTables.LOGGER.error("Couldn't parse loot table {}", uh, exception4);
             }
             return;
         });
         builder5.put(BuiltInLootTables.EMPTY, LootTable.EMPTY);
         final ImmutableMap<ResourceLocation, LootTable> immutableMap7 = builder5.build();
-        final ValidationContext csg8 = new ValidationContext(LootContextParamSets.ALL_PARAMS, this.predicateManager::get, immutableMap7::get);
-        immutableMap7.forEach((sm, csa) -> validate(csg8, sm, csa));
-        csg8.getProblems().forEach((string1, string2) -> LootTables.LOGGER.warn("Found validation problem in " + string1 + ": " + string2));
+        final ValidationContext dbe8 = new ValidationContext(LootContextParamSets.ALL_PARAMS, this.predicateManager::get, immutableMap7::get);
+        immutableMap7.forEach((uh, daw) -> validate(dbe8, uh, daw));
+        dbe8.getProblems().forEach((string1, string2) -> LootTables.LOGGER.warn("Found validation problem in " + string1 + ": " + string2));
         this.tables = immutableMap7;
     }
     
-    public static void validate(final ValidationContext csg, final ResourceLocation sm, final LootTable csa) {
-        csa.validate(csg.setParams(csa.getParamSet()).enterTable("{" + sm + "}", sm));
+    public static void validate(final ValidationContext dbe, final ResourceLocation uh, final LootTable daw) {
+        daw.validate(dbe.setParams(daw.getParamSet()).enterTable("{" + uh + "}", uh));
     }
     
-    public static JsonElement serialize(final LootTable csa) {
-        return LootTables.GSON.toJsonTree(csa);
+    public static JsonElement serialize(final LootTable daw) {
+        return LootTables.GSON.toJsonTree(daw);
     }
     
     public Set<ResourceLocation> getIds() {
@@ -79,6 +70,6 @@ public class LootTables extends SimpleJsonResourceReloadListener {
     
     static {
         LOGGER = LogManager.getLogger();
-        GSON = new GsonBuilder().registerTypeAdapter(RandomValueBounds.class, new RandomValueBounds.Serializer()).registerTypeAdapter(BinomialDistributionGenerator.class, new BinomialDistributionGenerator.Serializer()).registerTypeAdapter(ConstantIntValue.class, new ConstantIntValue.Serializer()).registerTypeAdapter(IntLimiter.class, new IntLimiter.Serializer()).registerTypeAdapter(LootPool.class, new LootPool.Serializer()).registerTypeAdapter(LootTable.class, new LootTable.Serializer()).registerTypeHierarchyAdapter(LootPoolEntryContainer.class, new LootPoolEntries.Serializer()).registerTypeHierarchyAdapter(LootItemFunction.class, new LootItemFunctions.Serializer()).registerTypeHierarchyAdapter(LootItemCondition.class, new LootItemConditions.Serializer()).registerTypeHierarchyAdapter(LootContext.EntityTarget.class, new LootContext.EntityTarget.Serializer()).create();
+        GSON = Deserializers.createLootTableSerializer().create();
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/PredicateManager.java b/src/net/minecraft/world/level/storage/loot/PredicateManager.java
index c283afe..398c06f 100644
--- a/src/net/minecraft/world/level/storage/loot/PredicateManager.java
+++ b/src/net/minecraft/world/level/storage/loot/PredicateManager.java
@@ -1,16 +1,15 @@
 package net.minecraft.world.level.storage.loot;
 
+import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
 import net.minecraft.world.level.storage.loot.predicates.LootItemConditions;
-import java.lang.reflect.Type;
-import com.google.gson.GsonBuilder;
+import java.util.function.Predicate;
 import org.apache.logging.log4j.LogManager;
 import java.util.Collections;
 import java.util.Set;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
-import com.google.gson.JsonElement;
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.server.packs.resources.ResourceManager;
-import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import javax.annotation.Nullable;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
@@ -31,29 +30,36 @@ public class PredicateManager extends SimpleJsonResourceReloadListener {
     }
     
     @Nullable
-    public LootItemCondition get(final ResourceLocation sm) {
-        return this.conditions.get(sm);
+    public LootItemCondition get(final ResourceLocation uh) {
+        return this.conditions.get(uh);
     }
     
     @Override
-    protected void apply(final Map<ResourceLocation, JsonObject> map, final ResourceManager zb, final ProfilerFiller aio) {
+    protected void apply(final Map<ResourceLocation, JsonElement> map, final ResourceManager abc, final ProfilerFiller ami) {
         final ImmutableMap.Builder<ResourceLocation, LootItemCondition> builder5 = ImmutableMap.<ResourceLocation, LootItemCondition>builder();
-        LootItemCondition cum2;
-        final ImmutableMap.Builder<ResourceLocation, LootItemCondition> builder6;
-        map.forEach((sm, jsonObject) -> {
+        LootItemCondition[] arr4;
+        final ImmutableMap.Builder<ResourceLocation, CompositePredicate> builder6;
+        LootItemCondition ddm2;
+        map.forEach((uh, jsonElement) -> {
             try {
-                cum2 = PredicateManager.GSON.<LootItemCondition>fromJson(jsonObject, LootItemCondition.class);
-                builder6.put(sm, cum2);
+                if (jsonElement.isJsonArray()) {
+                    arr4 = PredicateManager.GSON.<LootItemCondition[]>fromJson(jsonElement, LootItemCondition[].class);
+                    builder6.put(uh, new CompositePredicate(arr4));
+                }
+                else {
+                    ddm2 = PredicateManager.GSON.<LootItemCondition>fromJson(jsonElement, LootItemCondition.class);
+                    builder6.put(uh, (CompositePredicate)ddm2);
+                }
             }
             catch (Exception exception4) {
-                PredicateManager.LOGGER.error("Couldn't parse loot table {}", sm, exception4);
+                PredicateManager.LOGGER.error("Couldn't parse loot table {}", uh, exception4);
             }
             return;
         });
         final Map<ResourceLocation, LootItemCondition> map2 = builder5.build();
-        final ValidationContext csg7 = new ValidationContext(LootContextParamSets.ALL_PARAMS, map2::get, sm -> null);
-        map2.forEach((sm, cum) -> cum.validate(csg7.enterCondition("{" + sm + "}", sm)));
-        csg7.getProblems().forEach((string1, string2) -> PredicateManager.LOGGER.warn("Found validation problem in " + string1 + ": " + string2));
+        final ValidationContext dbe7 = new ValidationContext(LootContextParamSets.ALL_PARAMS, map2::get, uh -> null);
+        map2.forEach((uh, ddm) -> ddm.validate(dbe7.enterCondition("{" + uh + "}", uh)));
+        dbe7.getProblems().forEach((string1, string2) -> PredicateManager.LOGGER.warn("Found validation problem in " + string1 + ": " + string2));
         this.conditions = map2;
     }
     
@@ -63,6 +69,34 @@ public class PredicateManager extends SimpleJsonResourceReloadListener {
     
     static {
         LOGGER = LogManager.getLogger();
-        GSON = new GsonBuilder().registerTypeAdapter(RandomValueBounds.class, new RandomValueBounds.Serializer()).registerTypeAdapter(BinomialDistributionGenerator.class, new BinomialDistributionGenerator.Serializer()).registerTypeAdapter(ConstantIntValue.class, new ConstantIntValue.Serializer()).registerTypeHierarchyAdapter(LootItemCondition.class, new LootItemConditions.Serializer()).registerTypeHierarchyAdapter(LootContext.EntityTarget.class, new LootContext.EntityTarget.Serializer()).create();
+        GSON = Deserializers.createConditionSerializer().create();
+    }
+    
+    static class CompositePredicate implements LootItemCondition {
+        private final LootItemCondition[] terms;
+        private final Predicate<LootContext> composedPredicate;
+        
+        private CompositePredicate(final LootItemCondition[] arr) {
+            this.terms = arr;
+            this.composedPredicate = LootItemConditions.<LootContext>andConditions(arr);
+        }
+        
+        @Override
+        public final boolean test(final LootContext dat) {
+            return this.composedPredicate.test(dat);
+        }
+        
+        @Override
+        public void validate(final ValidationContext dbe) {
+            super.validate(dbe);
+            for (int integer3 = 0; integer3 < this.terms.length; ++integer3) {
+                this.terms[integer3].validate(dbe.forChild(".term[" + integer3 + "]"));
+            }
+        }
+        
+        @Override
+        public LootItemConditionType getType() {
+            throw new UnsupportedOperationException();
+        }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/RandomIntGenerators.java b/src/net/minecraft/world/level/storage/loot/RandomIntGenerators.java
index aa82dbc..694b991 100644
--- a/src/net/minecraft/world/level/storage/loot/RandomIntGenerators.java
+++ b/src/net/minecraft/world/level/storage/loot/RandomIntGenerators.java
@@ -27,10 +27,10 @@ public class RandomIntGenerators {
         return jsonDeserializationContext.<RandomIntGenerator>deserialize(jsonObject3, class5);
     }
     
-    public static JsonElement serialize(final RandomIntGenerator csd, final JsonSerializationContext jsonSerializationContext) {
-        final JsonElement jsonElement3 = jsonSerializationContext.serialize(csd);
+    public static JsonElement serialize(final RandomIntGenerator daz, final JsonSerializationContext jsonSerializationContext) {
+        final JsonElement jsonElement3 = jsonSerializationContext.serialize(daz);
         if (jsonElement3.isJsonObject()) {
-            jsonElement3.getAsJsonObject().addProperty("type", csd.getType().toString());
+            jsonElement3.getAsJsonObject().addProperty("type", daz.getType().toString());
         }
         return jsonElement3;
     }
diff --git a/src/net/minecraft/world/level/storage/loot/RandomValueBounds.java b/src/net/minecraft/world/level/storage/loot/RandomValueBounds.java
index 69eda0f..3f79f89 100644
--- a/src/net/minecraft/world/level/storage/loot/RandomValueBounds.java
+++ b/src/net/minecraft/world/level/storage/loot/RandomValueBounds.java
@@ -71,13 +71,13 @@ public class RandomValueBounds implements RandomIntGenerator {
         }
         
         @Override
-        public JsonElement serialize(final RandomValueBounds csf, final Type type, final JsonSerializationContext jsonSerializationContext) {
-            if (csf.min == csf.max) {
-                return new JsonPrimitive(csf.min);
+        public JsonElement serialize(final RandomValueBounds dbb, final Type type, final JsonSerializationContext jsonSerializationContext) {
+            if (dbb.min == dbb.max) {
+                return new JsonPrimitive(dbb.min);
             }
             final JsonObject jsonObject5 = new JsonObject();
-            jsonObject5.addProperty("min", csf.min);
-            jsonObject5.addProperty("max", csf.max);
+            jsonObject5.addProperty("min", dbb.min);
+            jsonObject5.addProperty("max", dbb.max);
             return jsonObject5;
         }
     }
diff --git a/src/net/minecraft/world/level/storage/loot/Serializer.java b/src/net/minecraft/world/level/storage/loot/Serializer.java
new file mode 100644
index 0000000..c7c1cbc
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/loot/Serializer.java
@@ -0,0 +1,11 @@
+package net.minecraft.world.level.storage.loot;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonObject;
+
+public interface Serializer<T> {
+    void serialize(final JsonObject jsonObject, final T object, final JsonSerializationContext jsonSerializationContext);
+    
+    T deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext);
+}
diff --git a/src/net/minecraft/world/level/storage/loot/SerializerType.java b/src/net/minecraft/world/level/storage/loot/SerializerType.java
new file mode 100644
index 0000000..3b84718
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/loot/SerializerType.java
@@ -0,0 +1,13 @@
+package net.minecraft.world.level.storage.loot;
+
+public class SerializerType<T> {
+    private final Serializer<? extends T> serializer;
+    
+    public SerializerType(final Serializer<? extends T> dbc) {
+        this.serializer = dbc;
+    }
+    
+    public Serializer<? extends T> getSerializer() {
+        return this.serializer;
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/loot/ValidationContext.java b/src/net/minecraft/world/level/storage/loot/ValidationContext.java
index 01286fb..2802b7c 100644
--- a/src/net/minecraft/world/level/storage/loot/ValidationContext.java
+++ b/src/net/minecraft/world/level/storage/loot/ValidationContext.java
@@ -22,14 +22,14 @@ public class ValidationContext {
     private final Set<ResourceLocation> visitedTables;
     private String contextCache;
     
-    public ValidationContext(final LootContextParamSet cty, final Function<ResourceLocation, LootItemCondition> function2, final Function<ResourceLocation, LootTable> function3) {
-        this(HashMultimap.create(), () -> "", cty, function2, ImmutableSet.of(), function3, ImmutableSet.of());
+    public ValidationContext(final LootContextParamSet dcy, final Function<ResourceLocation, LootItemCondition> function2, final Function<ResourceLocation, LootTable> function3) {
+        this(HashMultimap.create(), () -> "", dcy, function2, ImmutableSet.of(), function3, ImmutableSet.of());
     }
     
-    public ValidationContext(final Multimap<String, String> multimap, final Supplier<String> supplier, final LootContextParamSet cty, final Function<ResourceLocation, LootItemCondition> function4, final Set<ResourceLocation> set5, final Function<ResourceLocation, LootTable> function6, final Set<ResourceLocation> set7) {
+    public ValidationContext(final Multimap<String, String> multimap, final Supplier<String> supplier, final LootContextParamSet dcy, final Function<ResourceLocation, LootItemCondition> function4, final Set<ResourceLocation> set5, final Function<ResourceLocation, LootTable> function6, final Set<ResourceLocation> set7) {
         this.problems = multimap;
         this.context = supplier;
-        this.params = cty;
+        this.params = dcy;
         this.conditionResolver = function4;
         this.visitedConditions = set5;
         this.tableResolver = function6;
@@ -51,43 +51,43 @@ public class ValidationContext {
         return new ValidationContext(this.problems, () -> this.getContext() + string, this.params, this.conditionResolver, this.visitedConditions, this.tableResolver, this.visitedTables);
     }
     
-    public ValidationContext enterTable(final String string, final ResourceLocation sm) {
-        final ImmutableSet<ResourceLocation> immutableSet4 = ImmutableSet.<ResourceLocation>builder().addAll(this.visitedTables).add(sm).build();
+    public ValidationContext enterTable(final String string, final ResourceLocation uh) {
+        final ImmutableSet<ResourceLocation> immutableSet4 = ImmutableSet.<ResourceLocation>builder().addAll(this.visitedTables).add(uh).build();
         return new ValidationContext(this.problems, () -> this.getContext() + string, this.params, this.conditionResolver, this.visitedConditions, this.tableResolver, immutableSet4);
     }
     
-    public ValidationContext enterCondition(final String string, final ResourceLocation sm) {
-        final ImmutableSet<ResourceLocation> immutableSet4 = ImmutableSet.<ResourceLocation>builder().addAll(this.visitedConditions).add(sm).build();
+    public ValidationContext enterCondition(final String string, final ResourceLocation uh) {
+        final ImmutableSet<ResourceLocation> immutableSet4 = ImmutableSet.<ResourceLocation>builder().addAll(this.visitedConditions).add(uh).build();
         return new ValidationContext(this.problems, () -> this.getContext() + string, this.params, this.conditionResolver, immutableSet4, this.tableResolver, this.visitedTables);
     }
     
-    public boolean hasVisitedTable(final ResourceLocation sm) {
-        return this.visitedTables.contains(sm);
+    public boolean hasVisitedTable(final ResourceLocation uh) {
+        return this.visitedTables.contains(uh);
     }
     
-    public boolean hasVisitedCondition(final ResourceLocation sm) {
-        return this.visitedConditions.contains(sm);
+    public boolean hasVisitedCondition(final ResourceLocation uh) {
+        return this.visitedConditions.contains(uh);
     }
     
     public Multimap<String, String> getProblems() {
         return ImmutableMultimap.copyOf(this.problems);
     }
     
-    public void validateUser(final LootContextUser cry) {
-        this.params.validateUser(this, cry);
+    public void validateUser(final LootContextUser dau) {
+        this.params.validateUser(this, dau);
     }
     
     @Nullable
-    public LootTable resolveLootTable(final ResourceLocation sm) {
-        return this.tableResolver.apply(sm);
+    public LootTable resolveLootTable(final ResourceLocation uh) {
+        return this.tableResolver.apply(uh);
     }
     
     @Nullable
-    public LootItemCondition resolveCondition(final ResourceLocation sm) {
-        return this.conditionResolver.apply(sm);
+    public LootItemCondition resolveCondition(final ResourceLocation uh) {
+        return this.conditionResolver.apply(uh);
     }
     
-    public ValidationContext setParams(final LootContextParamSet cty) {
-        return new ValidationContext(this.problems, this.context, cty, this.conditionResolver, this.visitedConditions, this.tableResolver, this.visitedTables);
+    public ValidationContext setParams(final LootContextParamSet dcy) {
+        return new ValidationContext(this.problems, this.context, dcy, this.conditionResolver, this.visitedConditions, this.tableResolver, this.visitedTables);
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/entries/AlternativesEntry.java b/src/net/minecraft/world/level/storage/loot/entries/AlternativesEntry.java
index cf3c530..d6d8b9b 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/AlternativesEntry.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/AlternativesEntry.java
@@ -13,6 +13,11 @@ public class AlternativesEntry extends CompositeEntryBase {
         super(arr, arr);
     }
     
+    @Override
+    public LootPoolEntryType getType() {
+        return LootPoolEntries.ALTERNATIVES;
+    }
+    
     @Override
     protected ComposableEntryContainer compose(final ComposableEntryContainer[] arr) {
         switch (arr.length) {
@@ -28,12 +33,12 @@ public class AlternativesEntry extends CompositeEntryBase {
             default: {
                 final int length;
                 int i = 0;
-                ComposableEntryContainer csi7;
-                return (crx, consumer) -> {
+                ComposableEntryContainer dbg7;
+                return (dat, consumer) -> {
                     length = arr.length;
                     while (i < length) {
-                        csi7 = arr[i];
-                        if (csi7.expand(crx, consumer)) {
+                        dbg7 = arr[i];
+                        if (dbg7.expand(dat, consumer)) {
                             return true;
                         }
                         else {
@@ -47,11 +52,11 @@ public class AlternativesEntry extends CompositeEntryBase {
     }
     
     @Override
-    public void validate(final ValidationContext csg) {
-        super.validate(csg);
+    public void validate(final ValidationContext dbe) {
+        super.validate(dbe);
         for (int integer3 = 0; integer3 < this.children.length - 1; ++integer3) {
             if (ArrayUtils.isEmpty((Object[])this.children[integer3].conditions)) {
-                csg.reportProblem("Unreachable entry!");
+                dbe.reportProblem("Unreachable entry!");
             }
         }
     }
diff --git a/src/net/minecraft/world/level/storage/loot/entries/ComposableEntryContainer.java b/src/net/minecraft/world/level/storage/loot/entries/ComposableEntryContainer.java
index 761aad3..87941fd 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/ComposableEntryContainer.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/ComposableEntryContainer.java
@@ -6,18 +6,18 @@ import net.minecraft.world.level.storage.loot.LootContext;
 
 @FunctionalInterface
 interface ComposableEntryContainer {
-    public static final ComposableEntryContainer ALWAYS_FALSE = (crx, consumer) -> false;
-    public static final ComposableEntryContainer ALWAYS_TRUE = (crx, consumer) -> true;
+    public static final ComposableEntryContainer ALWAYS_FALSE = (dat, consumer) -> false;
+    public static final ComposableEntryContainer ALWAYS_TRUE = (dat, consumer) -> true;
     
-    boolean expand(final LootContext crx, final Consumer<LootPoolEntry> consumer);
+    boolean expand(final LootContext dat, final Consumer<LootPoolEntry> consumer);
     
-    default ComposableEntryContainer and(final ComposableEntryContainer csi) {
-        Objects.<ComposableEntryContainer>requireNonNull(csi);
-        return (crx, consumer) -> this.expand(crx, consumer) && csi.expand(crx, consumer);
+    default ComposableEntryContainer and(final ComposableEntryContainer dbg) {
+        Objects.<ComposableEntryContainer>requireNonNull(dbg);
+        return (dat, consumer) -> this.expand(dat, consumer) && dbg.expand(dat, consumer);
     }
     
-    default ComposableEntryContainer or(final ComposableEntryContainer csi) {
-        Objects.<ComposableEntryContainer>requireNonNull(csi);
-        return (crx, consumer) -> this.expand(crx, consumer) || csi.expand(crx, consumer);
+    default ComposableEntryContainer or(final ComposableEntryContainer dbg) {
+        Objects.<ComposableEntryContainer>requireNonNull(dbg);
+        return (dat, consumer) -> this.expand(dat, consumer) || dbg.expand(dat, consumer);
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java b/src/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
index 6f2937e..145274f 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
@@ -1,10 +1,9 @@
 package net.minecraft.world.level.storage.loot.entries;
 
 import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import java.util.function.Consumer;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.ValidationContext;
@@ -21,51 +20,38 @@ public abstract class CompositeEntryBase extends LootPoolEntryContainer {
     }
     
     @Override
-    public void validate(final ValidationContext csg) {
-        super.validate(csg);
+    public void validate(final ValidationContext dbe) {
+        super.validate(dbe);
         if (this.children.length == 0) {
-            csg.reportProblem("Empty children list");
+            dbe.reportProblem("Empty children list");
         }
         for (int integer3 = 0; integer3 < this.children.length; ++integer3) {
-            this.children[integer3].validate(csg.forChild(".entry[" + integer3 + "]"));
+            this.children[integer3].validate(dbe.forChild(".entry[" + integer3 + "]"));
         }
     }
     
     protected abstract ComposableEntryContainer compose(final ComposableEntryContainer[] arr);
     
     @Override
-    public final boolean expand(final LootContext crx, final Consumer<LootPoolEntry> consumer) {
-        return this.canRun(crx) && this.composedChildren.expand(crx, consumer);
+    public final boolean expand(final LootContext dat, final Consumer<LootPoolEntry> consumer) {
+        return this.canRun(dat) && this.composedChildren.expand(dat, consumer);
     }
     
-    public static <T extends CompositeEntryBase> Serializer<T> createSerializer(final ResourceLocation sm, final Class<T> class2, final CompositeEntryConstructor<T> a) {
-        return new Serializer<T>(sm, class2) {
+    public static <T extends CompositeEntryBase> Serializer<T> createSerializer(final CompositeEntryConstructor<T> a) {
+        return new Serializer<T>() {
             @Override
-            protected T deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootPoolEntryContainer[] arr, final LootItemCondition[] arr) {
-                return a.create(arr, arr);
+            public void serialize(final JsonObject jsonObject, final T dbh, final JsonSerializationContext jsonSerializationContext) {
+                jsonObject.add("children", jsonSerializationContext.serialize(dbh.children));
+            }
+            
+            @Override
+            public final T deserializeCustom(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
+                final LootPoolEntryContainer[] arr2 = GsonHelper.<LootPoolEntryContainer[]>getAsObject(jsonObject, "children", jsonDeserializationContext, LootPoolEntryContainer[].class);
+                return a.create(arr2, arr);
             }
         };
     }
     
-    public abstract static class Serializer<T extends CompositeEntryBase> extends LootPoolEntryContainer.Serializer<T> {
-        public Serializer(final ResourceLocation sm, final Class<T> class2) {
-            super(sm, class2);
-        }
-        
-        @Override
-        public void serialize(final JsonObject jsonObject, final T csj, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.add("children", jsonSerializationContext.serialize(csj.children));
-        }
-        
-        @Override
-        public final T deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
-            final LootPoolEntryContainer[] arr2 = GsonHelper.<LootPoolEntryContainer[]>getAsObject(jsonObject, "children", jsonDeserializationContext, LootPoolEntryContainer[].class);
-            return this.deserialize(jsonObject, jsonDeserializationContext, arr2, arr);
-        }
-        
-        protected abstract T deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootPoolEntryContainer[] arr, final LootItemCondition[] arr);
-    }
-    
     @FunctionalInterface
     public interface CompositeEntryConstructor<T extends CompositeEntryBase> {
         T create(final LootPoolEntryContainer[] arr, final LootItemCondition[] arr);
diff --git a/src/net/minecraft/world/level/storage/loot/entries/DynamicLoot.java b/src/net/minecraft/world/level/storage/loot/entries/DynamicLoot.java
index 6f5bedb..f660b6f 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/DynamicLoot.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/DynamicLoot.java
@@ -12,41 +12,37 @@ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 import net.minecraft.resources.ResourceLocation;
 
 public class DynamicLoot extends LootPoolSingletonContainer {
-    public static final ResourceLocation TYPE;
     private final ResourceLocation name;
     
-    private DynamicLoot(final ResourceLocation sm, final int integer2, final int integer3, final LootItemCondition[] arr, final LootItemFunction[] arr) {
+    private DynamicLoot(final ResourceLocation uh, final int integer2, final int integer3, final LootItemCondition[] arr, final LootItemFunction[] arr) {
         super(integer2, integer3, arr, arr);
-        this.name = sm;
+        this.name = uh;
     }
     
-    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext crx) {
-        crx.addDynamicDrops(this.name, consumer);
+    @Override
+    public LootPoolEntryType getType() {
+        return LootPoolEntries.DYNAMIC;
     }
     
-    public static Builder<?> dynamicEntry(final ResourceLocation sm) {
-        return LootPoolSingletonContainer.simpleBuilder((integer2, integer3, arr, arr) -> new DynamicLoot(sm, integer2, integer3, arr, arr));
+    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext dat) {
+        dat.addDynamicDrops(this.name, consumer);
     }
     
-    static {
-        TYPE = new ResourceLocation("dynamic");
+    public static Builder<?> dynamicEntry(final ResourceLocation uh) {
+        return LootPoolSingletonContainer.simpleBuilder((integer2, integer3, arr, arr) -> new DynamicLoot(uh, integer2, integer3, arr, arr));
     }
     
     public static class Serializer extends LootPoolSingletonContainer.Serializer<DynamicLoot> {
-        public Serializer() {
-            super(new ResourceLocation("dynamic"), DynamicLoot.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final DynamicLoot csk, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, csk, jsonSerializationContext);
-            jsonObject.addProperty("name", csk.name.toString());
+        public void serialize(final JsonObject jsonObject, final DynamicLoot dbi, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dbi, jsonSerializationContext);
+            jsonObject.addProperty("name", dbi.name.toString());
         }
         
         @Override
         protected DynamicLoot deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final int integer3, final int integer4, final LootItemCondition[] arr, final LootItemFunction[] arr) {
-            final ResourceLocation sm8 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "name"));
-            return new DynamicLoot(sm8, integer3, integer4, arr, arr, null);
+            final ResourceLocation uh8 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "name"));
+            return new DynamicLoot(uh8, integer3, integer4, arr, arr, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/entries/EmptyLootItem.java b/src/net/minecraft/world/level/storage/loot/entries/EmptyLootItem.java
index 6be2ee8..4416053 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/EmptyLootItem.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/EmptyLootItem.java
@@ -2,7 +2,6 @@ package net.minecraft.world.level.storage.loot.entries;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
 import java.util.function.Consumer;
@@ -14,7 +13,12 @@ public class EmptyLootItem extends LootPoolSingletonContainer {
         super(integer1, integer2, arr, arr);
     }
     
-    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext crx) {
+    @Override
+    public LootPoolEntryType getType() {
+        return LootPoolEntries.EMPTY;
+    }
+    
+    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext dat) {
     }
     
     public static Builder<?> emptyItem() {
@@ -22,12 +26,7 @@ public class EmptyLootItem extends LootPoolSingletonContainer {
     }
     
     public static class Serializer extends LootPoolSingletonContainer.Serializer<EmptyLootItem> {
-        public Serializer() {
-            super(new ResourceLocation("empty"), EmptyLootItem.class);
-        }
-        
-        @Override
-        protected EmptyLootItem deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final int integer3, final int integer4, final LootItemCondition[] arr, final LootItemFunction[] arr) {
+        public EmptyLootItem deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final int integer3, final int integer4, final LootItemCondition[] arr, final LootItemFunction[] arr) {
             return new EmptyLootItem(integer3, integer4, arr, arr, null);
         }
     }
diff --git a/src/net/minecraft/world/level/storage/loot/entries/EntryGroup.java b/src/net/minecraft/world/level/storage/loot/entries/EntryGroup.java
index bf2adf0..c941601 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/EntryGroup.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/EntryGroup.java
@@ -9,6 +9,11 @@ public class EntryGroup extends CompositeEntryBase {
         super(arr, arr);
     }
     
+    @Override
+    public LootPoolEntryType getType() {
+        return LootPoolEntries.GROUP;
+    }
+    
     @Override
     protected ComposableEntryContainer compose(final ComposableEntryContainer[] arr) {
         switch (arr.length) {
@@ -19,24 +24,24 @@ public class EntryGroup extends CompositeEntryBase {
                 return arr[0];
             }
             case 2: {
-                final ComposableEntryContainer csi3 = arr[0];
-                final ComposableEntryContainer csi4 = arr[1];
+                final ComposableEntryContainer dbg3 = arr[0];
+                final ComposableEntryContainer dbg4 = arr[1];
                 final ComposableEntryContainer composableEntryContainer;
                 final ComposableEntryContainer composableEntryContainer2;
-                return (crx, consumer) -> {
-                    composableEntryContainer.expand(crx, consumer);
-                    composableEntryContainer2.expand(crx, consumer);
+                return (dat, consumer) -> {
+                    composableEntryContainer.expand(dat, consumer);
+                    composableEntryContainer2.expand(dat, consumer);
                     return true;
                 };
             }
             default: {
                 int length;
                 int i = 0;
-                ComposableEntryContainer csi5;
-                return (crx, consumer) -> {
+                ComposableEntryContainer dbg5;
+                return (dat, consumer) -> {
                     for (length = arr.length; i < length; ++i) {
-                        csi5 = arr[i];
-                        csi5.expand(crx, consumer);
+                        dbg5 = arr[i];
+                        dbg5.expand(dat, consumer);
                     }
                     return true;
                 };
diff --git a/src/net/minecraft/world/level/storage/loot/entries/LootItem.java b/src/net/minecraft/world/level/storage/loot/entries/LootItem.java
index 01072a0..9f0dd7d 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/LootItem.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/LootItem.java
@@ -2,10 +2,10 @@ package net.minecraft.world.level.storage.loot.entries;
 
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.core.Registry;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
@@ -17,38 +17,39 @@ import net.minecraft.world.item.Item;
 public class LootItem extends LootPoolSingletonContainer {
     private final Item item;
     
-    private LootItem(final Item bei, final int integer2, final int integer3, final LootItemCondition[] arr, final LootItemFunction[] arr) {
+    private LootItem(final Item bke, final int integer2, final int integer3, final LootItemCondition[] arr, final LootItemFunction[] arr) {
         super(integer2, integer3, arr, arr);
-        this.item = bei;
+        this.item = bke;
     }
     
-    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext crx) {
+    @Override
+    public LootPoolEntryType getType() {
+        return LootPoolEntries.ITEM;
+    }
+    
+    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext dat) {
         consumer.accept(new ItemStack(this.item));
     }
     
-    public static Builder<?> lootTableItem(final ItemLike bjv) {
-        return LootPoolSingletonContainer.simpleBuilder((integer2, integer3, arr, arr) -> new LootItem(bjv.asItem(), integer2, integer3, arr, arr));
+    public static Builder<?> lootTableItem(final ItemLike bqa) {
+        return LootPoolSingletonContainer.simpleBuilder((integer2, integer3, arr, arr) -> new LootItem(bqa.asItem(), integer2, integer3, arr, arr));
     }
     
     public static class Serializer extends LootPoolSingletonContainer.Serializer<LootItem> {
-        public Serializer() {
-            super(new ResourceLocation("item"), LootItem.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final LootItem csn, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, csn, jsonSerializationContext);
-            final ResourceLocation sm5 = Registry.ITEM.getKey(csn.item);
-            if (sm5 == null) {
-                throw new IllegalArgumentException("Can't serialize unknown item " + csn.item);
+        public void serialize(final JsonObject jsonObject, final LootItem dbl, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dbl, jsonSerializationContext);
+            final ResourceLocation uh5 = Registry.ITEM.getKey(dbl.item);
+            if (uh5 == null) {
+                throw new IllegalArgumentException("Can't serialize unknown item " + dbl.item);
             }
-            jsonObject.addProperty("name", sm5.toString());
+            jsonObject.addProperty("name", uh5.toString());
         }
         
         @Override
         protected LootItem deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final int integer3, final int integer4, final LootItemCondition[] arr, final LootItemFunction[] arr) {
-            final Item bei8 = GsonHelper.getAsItem(jsonObject, "name");
-            return new LootItem(bei8, integer3, integer4, arr, arr, null);
+            final Item bke8 = GsonHelper.getAsItem(jsonObject, "name");
+            return new LootItem(bke8, integer3, integer4, arr, arr, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntries.java b/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntries.java
index 41ac45c..3b50f6c 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntries.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntries.java
@@ -1,73 +1,36 @@
 package net.minecraft.world.level.storage.loot.entries;
 
-import org.apache.commons.lang3.ArrayUtils;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonObject;
-import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
-import com.google.gson.JsonParseException;
-import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
-import java.lang.reflect.Type;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonSerializer;
-import com.google.gson.JsonDeserializer;
-import com.google.common.collect.Maps;
+import net.minecraft.world.level.storage.loot.GsonAdapterFactory;
 import net.minecraft.resources.ResourceLocation;
-import java.util.Map;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.storage.loot.Serializer;
 
 public class LootPoolEntries {
-    private static final Map<ResourceLocation, LootPoolEntryContainer.Serializer<?>> ID_TO_SERIALIZER;
-    private static final Map<Class<?>, LootPoolEntryContainer.Serializer<?>> CLASS_TO_SERIALIZER;
+    public static final LootPoolEntryType EMPTY;
+    public static final LootPoolEntryType ITEM;
+    public static final LootPoolEntryType REFERENCE;
+    public static final LootPoolEntryType DYNAMIC;
+    public static final LootPoolEntryType TAG;
+    public static final LootPoolEntryType ALTERNATIVES;
+    public static final LootPoolEntryType SEQUENCE;
+    public static final LootPoolEntryType GROUP;
     
-    private static void register(final LootPoolEntryContainer.Serializer<?> b) {
-        LootPoolEntries.ID_TO_SERIALIZER.put(b.getName(), b);
-        LootPoolEntries.CLASS_TO_SERIALIZER.put(b.getContainerClass(), b);
+    private static LootPoolEntryType register(final String string, final Serializer<? extends LootPoolEntryContainer> dbc) {
+        return Registry.<LootPoolEntryType, LootPoolEntryType>register(Registry.LOOT_POOL_ENTRY_TYPE, new ResourceLocation(string), new LootPoolEntryType(dbc));
+    }
+    
+    public static Object createGsonAdapter() {
+        return GsonAdapterFactory.<Object, LootPoolEntryType>builder(Registry.LOOT_POOL_ENTRY_TYPE, "entry", "type", LootPoolEntryContainer::getType).build();
     }
     
     static {
-        ID_TO_SERIALIZER = Maps.newHashMap();
-        CLASS_TO_SERIALIZER = Maps.newHashMap();
-        register(CompositeEntryBase.<AlternativesEntry>createSerializer(new ResourceLocation("alternatives"), AlternativesEntry.class, AlternativesEntry::new));
-        register(CompositeEntryBase.<SequentialEntry>createSerializer(new ResourceLocation("sequence"), SequentialEntry.class, SequentialEntry::new));
-        register(CompositeEntryBase.<EntryGroup>createSerializer(new ResourceLocation("group"), EntryGroup.class, EntryGroup::new));
-        register(new EmptyLootItem.Serializer());
-        register(new LootItem.Serializer());
-        register(new LootTableReference.Serializer());
-        register(new DynamicLoot.Serializer());
-        register(new TagEntry.Serializer());
-    }
-    
-    public static class Serializer implements JsonDeserializer<LootPoolEntryContainer>, JsonSerializer<LootPoolEntryContainer> {
-        @Override
-        public LootPoolEntryContainer deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) {
-            final JsonObject jsonObject5 = GsonHelper.convertToJsonObject(jsonElement, "entry");
-            final ResourceLocation sm6 = new ResourceLocation(GsonHelper.getAsString(jsonObject5, "type"));
-            final LootPoolEntryContainer.Serializer<?> b7 = LootPoolEntries.ID_TO_SERIALIZER.get(sm6);
-            if (b7 == null) {
-                throw new JsonParseException("Unknown item type: " + sm6);
-            }
-            final LootItemCondition[] arr8 = GsonHelper.<LootItemCondition[]>getAsObject(jsonObject5, "conditions", new LootItemCondition[0], jsonDeserializationContext, LootItemCondition[].class);
-            return (LootPoolEntryContainer)b7.deserialize(jsonObject5, jsonDeserializationContext, arr8);
-        }
-        
-        @Override
-        public JsonElement serialize(final LootPoolEntryContainer csq, final Type type, final JsonSerializationContext jsonSerializationContext) {
-            final JsonObject jsonObject5 = new JsonObject();
-            final LootPoolEntryContainer.Serializer<LootPoolEntryContainer> b6 = getSerializer(csq.getClass());
-            jsonObject5.addProperty("type", b6.getName().toString());
-            if (!ArrayUtils.isEmpty((Object[])csq.conditions)) {
-                jsonObject5.add("conditions", jsonSerializationContext.serialize(csq.conditions));
-            }
-            b6.serialize(jsonObject5, csq, jsonSerializationContext);
-            return jsonObject5;
-        }
-        
-        private static LootPoolEntryContainer.Serializer<LootPoolEntryContainer> getSerializer(final Class<?> class1) {
-            final LootPoolEntryContainer.Serializer<?> b2 = LootPoolEntries.CLASS_TO_SERIALIZER.get(class1);
-            if (b2 == null) {
-                throw new JsonParseException("Unknown item type: " + class1);
-            }
-            return (LootPoolEntryContainer.Serializer<LootPoolEntryContainer>)b2;
-        }
+        EMPTY = register("empty", new EmptyLootItem.Serializer());
+        ITEM = register("item", new LootItem.Serializer());
+        REFERENCE = register("loot_table", new LootTableReference.Serializer());
+        DYNAMIC = register("dynamic", new DynamicLoot.Serializer());
+        TAG = register("tag", new TagEntry.Serializer());
+        ALTERNATIVES = register("alternatives", CompositeEntryBase.<AlternativesEntry>createSerializer(AlternativesEntry::new));
+        SEQUENCE = register("sequence", CompositeEntryBase.<SequentialEntry>createSerializer(SequentialEntry::new));
+        GROUP = register("group", CompositeEntryBase.<EntryGroup>createSerializer(EntryGroup::new));
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntry.java b/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntry.java
index 79700f6..789d6f1 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntry.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntry.java
@@ -7,5 +7,5 @@ import java.util.function.Consumer;
 public interface LootPoolEntry {
     int getWeight(final float float1);
     
-    void createItemStack(final Consumer<ItemStack> consumer, final LootContext crx);
+    void createItemStack(final Consumer<ItemStack> consumer, final LootContext dat);
 }
diff --git a/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java b/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
index 57c4d05..11e070a 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
@@ -1,9 +1,11 @@
 package net.minecraft.world.level.storage.loot.entries;
 
+import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
+import org.apache.commons.lang3.ArrayUtils;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import com.google.common.collect.Lists;
 import java.util.List;
 import net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder;
@@ -22,16 +24,18 @@ public abstract class LootPoolEntryContainer implements ComposableEntryContainer
         this.compositeCondition = LootItemConditions.<LootContext>andConditions(arr);
     }
     
-    public void validate(final ValidationContext csg) {
+    public void validate(final ValidationContext dbe) {
         for (int integer3 = 0; integer3 < this.conditions.length; ++integer3) {
-            this.conditions[integer3].validate(csg.forChild(".condition[" + integer3 + "]"));
+            this.conditions[integer3].validate(dbe.forChild(".condition[" + integer3 + "]"));
         }
     }
     
-    protected final boolean canRun(final LootContext crx) {
-        return this.compositeCondition.test(crx);
+    protected final boolean canRun(final LootContext dat) {
+        return this.compositeCondition.test(dat);
     }
     
+    public abstract LootPoolEntryType getType();
+    
     public abstract static class Builder<T extends Builder<T>> implements ConditionUserBuilder<T> {
         private final List<LootItemCondition> conditions;
         
@@ -63,25 +67,24 @@ public abstract class LootPoolEntryContainer implements ComposableEntryContainer
         public abstract LootPoolEntryContainer build();
     }
     
-    public abstract static class Serializer<T extends LootPoolEntryContainer> {
-        private final ResourceLocation name;
-        private final Class<T> clazz;
-        
-        protected Serializer(final ResourceLocation sm, final Class<T> class2) {
-            this.name = sm;
-            this.clazz = class2;
+    public abstract static class Serializer<T extends LootPoolEntryContainer> implements net.minecraft.world.level.storage.loot.Serializer<T> {
+        @Override
+        public final void serialize(final JsonObject jsonObject, final T dbo, final JsonSerializationContext jsonSerializationContext) {
+            if (!ArrayUtils.isEmpty((Object[])dbo.conditions)) {
+                jsonObject.add("conditions", jsonSerializationContext.serialize(dbo.conditions));
+            }
+            this.serialize(jsonObject, dbo, jsonSerializationContext);
         }
         
-        public ResourceLocation getName() {
-            return this.name;
+        @Override
+        public final T deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
+            final LootItemCondition[] arr4 = GsonHelper.<LootItemCondition[]>getAsObject(jsonObject, "conditions", new LootItemCondition[0], jsonDeserializationContext, LootItemCondition[].class);
+            return this.deserializeCustom(jsonObject, jsonDeserializationContext, arr4);
         }
         
-        public Class<T> getContainerClass() {
-            return this.clazz;
-        }
+        @Override
+        public abstract void serialize(final JsonObject jsonObject, final T dbo, final JsonSerializationContext jsonSerializationContext);
         
-        public abstract void serialize(final JsonObject jsonObject, final T csq, final JsonSerializationContext jsonSerializationContext);
-        
-        public abstract T deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr);
+        public abstract T deserializeCustom(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr);
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntryType.java b/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntryType.java
new file mode 100644
index 0000000..cf824dc
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/loot/entries/LootPoolEntryType.java
@@ -0,0 +1,10 @@
+package net.minecraft.world.level.storage.loot.entries;
+
+import net.minecraft.world.level.storage.loot.Serializer;
+import net.minecraft.world.level.storage.loot.SerializerType;
+
+public class LootPoolEntryType extends SerializerType<LootPoolEntryContainer> {
+    public LootPoolEntryType(final Serializer<? extends LootPoolEntryContainer> dbc) {
+        super(dbc);
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java b/src/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java
index 32312d1..1719ead 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java
@@ -5,7 +5,6 @@ import com.google.gson.JsonDeserializationContext;
 import org.apache.commons.lang3.ArrayUtils;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import com.google.common.collect.Lists;
 import java.util.List;
 import net.minecraft.world.level.storage.loot.functions.FunctionUserBuilder;
@@ -30,8 +29,8 @@ public abstract class LootPoolSingletonContainer extends LootPoolEntryContainer
         super(arr);
         this.entry = new EntryBase() {
             @Override
-            public void createItemStack(final Consumer<ItemStack> consumer, final LootContext crx) {
-                LootPoolSingletonContainer.this.createItemStack(LootItemFunction.decorate(LootPoolSingletonContainer.this.compositeFunction, consumer, crx), crx);
+            public void createItemStack(final Consumer<ItemStack> consumer, final LootContext dat) {
+                LootPoolSingletonContainer.this.createItemStack(LootItemFunction.decorate(LootPoolSingletonContainer.this.compositeFunction, consumer, dat), dat);
             }
         };
         this.weight = integer1;
@@ -41,18 +40,18 @@ public abstract class LootPoolSingletonContainer extends LootPoolEntryContainer
     }
     
     @Override
-    public void validate(final ValidationContext csg) {
-        super.validate(csg);
+    public void validate(final ValidationContext dbe) {
+        super.validate(dbe);
         for (int integer3 = 0; integer3 < this.functions.length; ++integer3) {
-            this.functions[integer3].validate(csg.forChild(".functions[" + integer3 + "]"));
+            this.functions[integer3].validate(dbe.forChild(".functions[" + integer3 + "]"));
         }
     }
     
-    protected abstract void createItemStack(final Consumer<ItemStack> consumer, final LootContext crx);
+    protected abstract void createItemStack(final Consumer<ItemStack> consumer, final LootContext dat);
     
     @Override
-    public boolean expand(final LootContext crx, final Consumer<LootPoolEntry> consumer) {
-        if (this.canRun(crx)) {
+    public boolean expand(final LootContext dat, final Consumer<LootPoolEntry> consumer) {
+        if (this.canRun(dat)) {
             consumer.accept(this.entry);
             return true;
         }
@@ -124,25 +123,21 @@ public abstract class LootPoolSingletonContainer extends LootPoolEntryContainer
     }
     
     public abstract static class Serializer<T extends LootPoolSingletonContainer> extends LootPoolEntryContainer.Serializer<T> {
-        public Serializer(final ResourceLocation sm, final Class<T> class2) {
-            super(sm, class2);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final T csr, final JsonSerializationContext jsonSerializationContext) {
-            if (csr.weight != 1) {
-                jsonObject.addProperty("weight", csr.weight);
+        public void serialize(final JsonObject jsonObject, final T dbq, final JsonSerializationContext jsonSerializationContext) {
+            if (dbq.weight != 1) {
+                jsonObject.addProperty("weight", dbq.weight);
             }
-            if (csr.quality != 0) {
-                jsonObject.addProperty("quality", csr.quality);
+            if (dbq.quality != 0) {
+                jsonObject.addProperty("quality", dbq.quality);
             }
-            if (!ArrayUtils.isEmpty((Object[])csr.functions)) {
-                jsonObject.add("functions", jsonSerializationContext.serialize(csr.functions));
+            if (!ArrayUtils.isEmpty((Object[])dbq.functions)) {
+                jsonObject.add("functions", jsonSerializationContext.serialize(dbq.functions));
             }
         }
         
         @Override
-        public final T deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
+        public final T deserializeCustom(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
             final int integer5 = GsonHelper.getAsInt(jsonObject, "weight", 1);
             final int integer6 = GsonHelper.getAsInt(jsonObject, "quality", 0);
             final LootItemFunction[] arr2 = GsonHelper.<LootItemFunction[]>getAsObject(jsonObject, "functions", new LootItemFunction[0], jsonDeserializationContext, LootItemFunction[].class);
diff --git a/src/net/minecraft/world/level/storage/loot/entries/LootTableReference.java b/src/net/minecraft/world/level/storage/loot/entries/LootTableReference.java
index 6184e17..bf59131 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/LootTableReference.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/LootTableReference.java
@@ -16,51 +16,52 @@ import net.minecraft.resources.ResourceLocation;
 public class LootTableReference extends LootPoolSingletonContainer {
     private final ResourceLocation name;
     
-    private LootTableReference(final ResourceLocation sm, final int integer2, final int integer3, final LootItemCondition[] arr, final LootItemFunction[] arr) {
+    private LootTableReference(final ResourceLocation uh, final int integer2, final int integer3, final LootItemCondition[] arr, final LootItemFunction[] arr) {
         super(integer2, integer3, arr, arr);
-        this.name = sm;
-    }
-    
-    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext crx) {
-        final LootTable csa4 = crx.getLootTable(this.name);
-        csa4.getRandomItemsRaw(crx, consumer);
+        this.name = uh;
     }
     
     @Override
-    public void validate(final ValidationContext csg) {
-        if (csg.hasVisitedTable(this.name)) {
-            csg.reportProblem("Table " + this.name + " is recursively called");
+    public LootPoolEntryType getType() {
+        return LootPoolEntries.REFERENCE;
+    }
+    
+    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext dat) {
+        final LootTable daw4 = dat.getLootTable(this.name);
+        daw4.getRandomItemsRaw(dat, consumer);
+    }
+    
+    @Override
+    public void validate(final ValidationContext dbe) {
+        if (dbe.hasVisitedTable(this.name)) {
+            dbe.reportProblem("Table " + this.name + " is recursively called");
             return;
         }
-        super.validate(csg);
-        final LootTable csa3 = csg.resolveLootTable(this.name);
-        if (csa3 == null) {
-            csg.reportProblem("Unknown loot table called " + this.name);
+        super.validate(dbe);
+        final LootTable daw3 = dbe.resolveLootTable(this.name);
+        if (daw3 == null) {
+            dbe.reportProblem("Unknown loot table called " + this.name);
         }
         else {
-            csa3.validate(csg.enterTable("->{" + this.name + "}", this.name));
+            daw3.validate(dbe.enterTable("->{" + this.name + "}", this.name));
         }
     }
     
-    public static Builder<?> lootTableReference(final ResourceLocation sm) {
-        return LootPoolSingletonContainer.simpleBuilder((integer2, integer3, arr, arr) -> new LootTableReference(sm, integer2, integer3, arr, arr));
+    public static Builder<?> lootTableReference(final ResourceLocation uh) {
+        return LootPoolSingletonContainer.simpleBuilder((integer2, integer3, arr, arr) -> new LootTableReference(uh, integer2, integer3, arr, arr));
     }
     
     public static class Serializer extends LootPoolSingletonContainer.Serializer<LootTableReference> {
-        public Serializer() {
-            super(new ResourceLocation("loot_table"), LootTableReference.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final LootTableReference css, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, css, jsonSerializationContext);
-            jsonObject.addProperty("name", css.name.toString());
+        public void serialize(final JsonObject jsonObject, final LootTableReference dbr, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dbr, jsonSerializationContext);
+            jsonObject.addProperty("name", dbr.name.toString());
         }
         
         @Override
         protected LootTableReference deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final int integer3, final int integer4, final LootItemCondition[] arr, final LootItemFunction[] arr) {
-            final ResourceLocation sm8 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "name"));
-            return new LootTableReference(sm8, integer3, integer4, arr, arr, null);
+            final ResourceLocation uh8 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "name"));
+            return new LootTableReference(uh8, integer3, integer4, arr, arr, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/entries/SequentialEntry.java b/src/net/minecraft/world/level/storage/loot/entries/SequentialEntry.java
index 969dbcf..ac817d0 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/SequentialEntry.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/SequentialEntry.java
@@ -9,6 +9,11 @@ public class SequentialEntry extends CompositeEntryBase {
         super(arr, arr);
     }
     
+    @Override
+    public LootPoolEntryType getType() {
+        return LootPoolEntries.SEQUENCE;
+    }
+    
     @Override
     protected ComposableEntryContainer compose(final ComposableEntryContainer[] arr) {
         switch (arr.length) {
@@ -24,12 +29,12 @@ public class SequentialEntry extends CompositeEntryBase {
             default: {
                 final int length;
                 int i = 0;
-                ComposableEntryContainer csi7;
-                return (crx, consumer) -> {
+                ComposableEntryContainer dbg7;
+                return (dat, consumer) -> {
                     length = arr.length;
                     while (i < length) {
-                        csi7 = arr[i];
-                        if (!csi7.expand(crx, consumer)) {
+                        dbg7 = arr[i];
+                        if (!dbg7.expand(dat, consumer)) {
                             return false;
                         }
                         else {
diff --git a/src/net/minecraft/world/level/storage/loot/entries/TagEntry.java b/src/net/minecraft/world/level/storage/loot/entries/TagEntry.java
index 053bd7d..0e6b353 100644
--- a/src/net/minecraft/world/level/storage/loot/entries/TagEntry.java
+++ b/src/net/minecraft/world/level/storage/loot/entries/TagEntry.java
@@ -1,12 +1,12 @@
 package net.minecraft.world.level.storage.loot.entries;
 
 import com.google.gson.JsonParseException;
-import net.minecraft.tags.ItemTags;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
+import net.minecraft.tags.SerializationTags;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import java.util.Iterator;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.storage.loot.LootContext;
@@ -21,23 +21,28 @@ public class TagEntry extends LootPoolSingletonContainer {
     private final Tag<Item> tag;
     private final boolean expand;
     
-    private TagEntry(final Tag<Item> aaz, final boolean boolean2, final int integer3, final int integer4, final LootItemCondition[] arr, final LootItemFunction[] arr) {
+    private TagEntry(final Tag<Item> adf, final boolean boolean2, final int integer3, final int integer4, final LootItemCondition[] arr, final LootItemFunction[] arr) {
         super(integer3, integer4, arr, arr);
-        this.tag = aaz;
+        this.tag = adf;
         this.expand = boolean2;
     }
     
-    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext crx) {
-        this.tag.getValues().forEach(bei -> consumer.accept(new ItemStack(bei)));
+    @Override
+    public LootPoolEntryType getType() {
+        return LootPoolEntries.TAG;
     }
     
-    private boolean expandTag(final LootContext crx, final Consumer<LootPoolEntry> consumer) {
-        if (this.canRun(crx)) {
-            for (final Item bei5 : this.tag.getValues()) {
+    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext dat) {
+        this.tag.getValues().forEach(bke -> consumer.accept(new ItemStack(bke)));
+    }
+    
+    private boolean expandTag(final LootContext dat, final Consumer<LootPoolEntry> consumer) {
+        if (this.canRun(dat)) {
+            for (final Item bke5 : this.tag.getValues()) {
                 consumer.accept(new EntryBase() {
                     @Override
-                    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext crx) {
-                        consumer.accept(new ItemStack(bei5));
+                    public void createItemStack(final Consumer<ItemStack> consumer, final LootContext dat) {
+                        consumer.accept(new ItemStack(bke5));
                     }
                 });
             }
@@ -47,38 +52,34 @@ public class TagEntry extends LootPoolSingletonContainer {
     }
     
     @Override
-    public boolean expand(final LootContext crx, final Consumer<LootPoolEntry> consumer) {
+    public boolean expand(final LootContext dat, final Consumer<LootPoolEntry> consumer) {
         if (this.expand) {
-            return this.expandTag(crx, consumer);
+            return this.expandTag(dat, consumer);
         }
-        return super.expand(crx, consumer);
+        return super.expand(dat, consumer);
     }
     
-    public static Builder<?> expandTag(final Tag<Item> aaz) {
-        return LootPoolSingletonContainer.simpleBuilder((integer2, integer3, arr, arr) -> new TagEntry(aaz, true, integer2, integer3, arr, arr));
+    public static Builder<?> expandTag(final Tag<Item> adf) {
+        return LootPoolSingletonContainer.simpleBuilder((integer2, integer3, arr, arr) -> new TagEntry(adf, true, integer2, integer3, arr, arr));
     }
     
     public static class Serializer extends LootPoolSingletonContainer.Serializer<TagEntry> {
-        public Serializer() {
-            super(new ResourceLocation("tag"), TagEntry.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final TagEntry csu, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, csu, jsonSerializationContext);
-            jsonObject.addProperty("name", csu.tag.getId().toString());
-            jsonObject.addProperty("expand", csu.expand);
+        public void serialize(final JsonObject jsonObject, final TagEntry dbt, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dbt, jsonSerializationContext);
+            jsonObject.addProperty("name", SerializationTags.getInstance().getItems().getIdOrThrow(dbt.tag).toString());
+            jsonObject.addProperty("expand", dbt.expand);
         }
         
         @Override
         protected TagEntry deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final int integer3, final int integer4, final LootItemCondition[] arr, final LootItemFunction[] arr) {
-            final ResourceLocation sm8 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "name"));
-            final Tag<Item> aaz9 = ItemTags.getAllTags().getTag(sm8);
-            if (aaz9 == null) {
-                throw new JsonParseException("Can't find tag: " + sm8);
+            final ResourceLocation uh8 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "name"));
+            final Tag<Item> adf9 = SerializationTags.getInstance().getItems().getTag(uh8);
+            if (adf9 == null) {
+                throw new JsonParseException("Can't find tag: " + uh8);
             }
             final boolean boolean10 = GsonHelper.getAsBoolean(jsonObject, "expand");
-            return new TagEntry(aaz9, boolean10, integer3, integer4, arr, arr, null);
+            return new TagEntry(adf9, boolean10, integer3, integer4, arr, arr, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/functions/ApplyBonusCount.java b/src/net/minecraft/world/level/storage/loot/functions/ApplyBonusCount.java
index e7c461e..f5a16e7 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/ApplyBonusCount.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/ApplyBonusCount.java
@@ -26,55 +26,60 @@ public class ApplyBonusCount extends LootItemConditionalFunction {
     private final Enchantment enchantment;
     private final Formula formula;
     
-    private ApplyBonusCount(final LootItemCondition[] arr, final Enchantment bhx, final Formula b) {
+    private ApplyBonusCount(final LootItemCondition[] arr, final Enchantment bnw, final Formula b) {
         super(arr);
-        this.enchantment = bhx;
+        this.enchantment = bnw;
         this.formula = b;
     }
     
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.APPLY_BONUS;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(LootContextParams.TOOL);
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        final ItemStack ben2 = crx.<ItemStack>getParamOrNull(LootContextParams.TOOL);
-        if (ben2 != null) {
-            final int integer5 = EnchantmentHelper.getItemEnchantmentLevel(this.enchantment, ben2);
-            final int integer6 = this.formula.calculateNewCount(crx.getRandom(), ben.getCount(), integer5);
-            ben.setCount(integer6);
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        final ItemStack bki2 = dat.<ItemStack>getParamOrNull(LootContextParams.TOOL);
+        if (bki2 != null) {
+            final int integer5 = EnchantmentHelper.getItemEnchantmentLevel(this.enchantment, bki2);
+            final int integer6 = this.formula.calculateNewCount(dat.getRandom(), bki.getCount(), integer5);
+            bki.setCount(integer6);
         }
-        return ben;
+        return bki;
     }
     
-    public static Builder<?> addBonusBinomialDistributionCount(final Enchantment bhx, final float float2, final int integer) {
+    public static Builder<?> addBonusBinomialDistributionCount(final Enchantment bnw, final float float2, final int integer) {
         final ApplyBonusCount applyBonusCount;
         return LootItemConditionalFunction.simpleBuilder(arr -> {
-            new ApplyBonusCount(arr, bhx, new BinomialWithBonusCount(integer, float2));
+            new ApplyBonusCount(arr, bnw, new BinomialWithBonusCount(integer, float2));
             return applyBonusCount;
         });
     }
     
-    public static Builder<?> addOreBonusCount(final Enchantment bhx) {
+    public static Builder<?> addOreBonusCount(final Enchantment bnw) {
         final ApplyBonusCount applyBonusCount;
         return LootItemConditionalFunction.simpleBuilder(arr -> {
-            new ApplyBonusCount(arr, bhx, new OreDrops());
+            new ApplyBonusCount(arr, bnw, new OreDrops());
             return applyBonusCount;
         });
     }
     
-    public static Builder<?> addUniformBonusCount(final Enchantment bhx) {
+    public static Builder<?> addUniformBonusCount(final Enchantment bnw) {
         final ApplyBonusCount applyBonusCount;
         return LootItemConditionalFunction.simpleBuilder(arr -> {
-            new ApplyBonusCount(arr, bhx, new UniformBonusCount(1));
+            new ApplyBonusCount(arr, bnw, new UniformBonusCount(1));
             return applyBonusCount;
         });
     }
     
-    public static Builder<?> addUniformBonusCount(final Enchantment bhx, final int integer) {
+    public static Builder<?> addUniformBonusCount(final Enchantment bnw, final int integer) {
         final ApplyBonusCount applyBonusCount;
         return LootItemConditionalFunction.simpleBuilder(arr -> {
-            new ApplyBonusCount(arr, bhx, new UniformBonusCount(integer));
+            new ApplyBonusCount(arr, bnw, new UniformBonusCount(integer));
             return applyBonusCount;
         });
     }
@@ -197,17 +202,13 @@ public class ApplyBonusCount extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<ApplyBonusCount> {
-        public Serializer() {
-            super(new ResourceLocation("apply_bonus"), ApplyBonusCount.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final ApplyBonusCount csw, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, csw, jsonSerializationContext);
-            jsonObject.addProperty("enchantment", Registry.ENCHANTMENT.getKey(csw.enchantment).toString());
-            jsonObject.addProperty("formula", csw.formula.getType().toString());
+        public void serialize(final JsonObject jsonObject, final ApplyBonusCount dbv, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dbv, jsonSerializationContext);
+            jsonObject.addProperty("enchantment", Registry.ENCHANTMENT.getKey(dbv.enchantment).toString());
+            jsonObject.addProperty("formula", dbv.formula.getType().toString());
             final JsonObject jsonObject2 = new JsonObject();
-            csw.formula.serializeParams(jsonObject2, jsonSerializationContext);
+            dbv.formula.serializeParams(jsonObject2, jsonSerializationContext);
             if (jsonObject2.size() > 0) {
                 jsonObject.add("parameters", jsonObject2);
             }
@@ -215,17 +216,17 @@ public class ApplyBonusCount extends LootItemConditionalFunction {
         
         @Override
         public ApplyBonusCount deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
-            final ResourceLocation sm5 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "enchantment"));
+            final ResourceLocation uh5 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "enchantment"));
             final Object o;
             final Object obj;
-            final Enchantment bhx6 = Registry.ENCHANTMENT.getOptional(sm5).<Throwable>orElseThrow(() -> {
+            final Enchantment bnw6 = Registry.ENCHANTMENT.getOptional(uh5).<Throwable>orElseThrow(() -> {
                 new JsonParseException("Invalid enchantment id: " + obj);
                 return o;
             });
-            final ResourceLocation sm6 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "formula"));
-            final FormulaDeserializer c8 = ApplyBonusCount.FORMULAS.get(sm6);
+            final ResourceLocation uh6 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "formula"));
+            final FormulaDeserializer c8 = ApplyBonusCount.FORMULAS.get(uh6);
             if (c8 == null) {
-                throw new JsonParseException("Invalid formula id: " + sm6);
+                throw new JsonParseException("Invalid formula id: " + uh6);
             }
             Formula b9;
             if (jsonObject.has("parameters")) {
@@ -234,7 +235,7 @@ public class ApplyBonusCount extends LootItemConditionalFunction {
             else {
                 b9 = c8.deserialize(new JsonObject(), jsonDeserializationContext);
             }
-            return new ApplyBonusCount(arr, bhx6, b9, null);
+            return new ApplyBonusCount(arr, bnw6, b9, null);
         }
     }
     
diff --git a/src/net/minecraft/world/level/storage/loot/functions/ApplyExplosionDecay.java b/src/net/minecraft/world/level/storage/loot/functions/ApplyExplosionDecay.java
index 61a2678..60b059a 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/ApplyExplosionDecay.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/ApplyExplosionDecay.java
@@ -2,7 +2,6 @@ package net.minecraft.world.level.storage.loot.functions;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import java.util.function.Function;
 import java.util.Random;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
@@ -15,21 +14,26 @@ public class ApplyExplosionDecay extends LootItemConditionalFunction {
         super(arr);
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        final Float float4 = crx.<Float>getParamOrNull(LootContextParams.EXPLOSION_RADIUS);
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.EXPLOSION_DECAY;
+    }
+    
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        final Float float4 = dat.<Float>getParamOrNull(LootContextParams.EXPLOSION_RADIUS);
         if (float4 != null) {
-            final Random random5 = crx.getRandom();
+            final Random random5 = dat.getRandom();
             final float float5 = 1.0f / float4;
-            final int integer7 = ben.getCount();
+            final int integer7 = bki.getCount();
             int integer8 = 0;
             for (int integer9 = 0; integer9 < integer7; ++integer9) {
                 if (random5.nextFloat() <= float5) {
                     ++integer8;
                 }
             }
-            ben.setCount(integer8);
+            bki.setCount(integer8);
         }
-        return ben;
+        return bki;
     }
     
     public static Builder<?> explosionDecay() {
@@ -37,10 +41,6 @@ public class ApplyExplosionDecay extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<ApplyExplosionDecay> {
-        protected Serializer() {
-            super(new ResourceLocation("explosion_decay"), ApplyExplosionDecay.class);
-        }
-        
         @Override
         public ApplyExplosionDecay deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
             return new ApplyExplosionDecay(arr, null);
diff --git a/src/net/minecraft/world/level/storage/loot/functions/CopyBlockState.java b/src/net/minecraft/world/level/storage/loot/functions/CopyBlockState.java
index 7e20755..5453843 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/CopyBlockState.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/CopyBlockState.java
@@ -1,6 +1,7 @@
 package net.minecraft.world.level.storage.loot.functions;
 
 import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonElement;
@@ -8,7 +9,6 @@ import com.google.gson.JsonArray;
 import net.minecraft.core.Registry;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import com.google.common.collect.Sets;
 import java.util.function.Predicate;
 import net.minecraft.nbt.Tag;
@@ -28,58 +28,63 @@ public class CopyBlockState extends LootItemConditionalFunction {
     private final Block block;
     private final Set<Property<?>> properties;
     
-    private CopyBlockState(final LootItemCondition[] arr, final Block bph, final Set<Property<?>> set) {
+    private CopyBlockState(final LootItemCondition[] arr, final Block bvr, final Set<Property<?>> set) {
         super(arr);
-        this.block = bph;
+        this.block = bvr;
         this.properties = set;
     }
     
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.COPY_STATE;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(LootContextParams.BLOCK_STATE);
     }
     
     @Override
-    protected ItemStack run(final ItemStack ben, final LootContext crx) {
-        final BlockState byj4 = crx.<BlockState>getParamOrNull(LootContextParams.BLOCK_STATE);
-        if (byj4 != null) {
-            final CompoundTag jt5 = ben.getOrCreateTag();
-            CompoundTag jt6;
-            if (jt5.contains("BlockStateTag", 10)) {
-                jt6 = jt5.getCompound("BlockStateTag");
+    protected ItemStack run(final ItemStack bki, final LootContext dat) {
+        final BlockState cfj4 = dat.<BlockState>getParamOrNull(LootContextParams.BLOCK_STATE);
+        if (cfj4 != null) {
+            final CompoundTag le5 = bki.getOrCreateTag();
+            CompoundTag le6;
+            if (le5.contains("BlockStateTag", 10)) {
+                le6 = le5.getCompound("BlockStateTag");
             }
             else {
-                jt6 = new CompoundTag();
-                jt5.put("BlockStateTag", jt6);
+                le6 = new CompoundTag();
+                le5.put("BlockStateTag", le6);
             }
-            this.properties.stream().filter(byj4::hasProperty).forEach(bzm -> jt6.putString(bzm.getName(), CopyBlockState.<Comparable>serialize(byj4, bzm)));
+            this.properties.stream().filter(cfj4::hasProperty).forEach(cgl -> le6.putString(cgl.getName(), CopyBlockState.<Comparable>serialize(cfj4, cgl)));
         }
-        return ben;
+        return bki;
     }
     
-    public static Builder copyState(final Block bph) {
-        return new Builder(bph);
+    public static Builder copyState(final Block bvr) {
+        return new Builder(bvr);
     }
     
-    private static <T extends Comparable<T>> String serialize(final BlockState byj, final Property<T> bzm) {
-        final T comparable3 = byj.<T>getValue(bzm);
-        return bzm.getName(comparable3);
+    private static <T extends Comparable<T>> String serialize(final BlockState cfj, final Property<T> cgl) {
+        final T comparable3 = cfj.<T>getValue(cgl);
+        return cgl.getName(comparable3);
     }
     
     public static class Builder extends LootItemConditionalFunction.Builder<Builder> {
         private final Block block;
         private final Set<Property<?>> properties;
         
-        private Builder(final Block bph) {
+        private Builder(final Block bvr) {
             this.properties = Sets.newHashSet();
-            this.block = bph;
+            this.block = bvr;
         }
         
-        public Builder copy(final Property<?> bzm) {
-            if (!this.block.getStateDefinition().getProperties().contains(bzm)) {
-                throw new IllegalStateException("Property " + bzm + " is not present on block " + this.block);
+        public Builder copy(final Property<?> cgl) {
+            if (!this.block.getStateDefinition().getProperties().contains(cgl)) {
+                throw new IllegalStateException("Property " + cgl + " is not present on block " + this.block);
             }
-            this.properties.add(bzm);
+            this.properties.add(cgl);
             return this;
         }
         
@@ -95,35 +100,31 @@ public class CopyBlockState extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<CopyBlockState> {
-        public Serializer() {
-            super(new ResourceLocation("copy_state"), CopyBlockState.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final CopyBlockState csy, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, csy, jsonSerializationContext);
-            jsonObject.addProperty("block", Registry.BLOCK.getKey(csy.block).toString());
+        public void serialize(final JsonObject jsonObject, final CopyBlockState dbx, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dbx, jsonSerializationContext);
+            jsonObject.addProperty("block", Registry.BLOCK.getKey(dbx.block).toString());
             final JsonArray jsonArray5 = new JsonArray();
-            csy.properties.forEach(bzm -> jsonArray5.add(bzm.getName()));
+            dbx.properties.forEach(cgl -> jsonArray5.add(cgl.getName()));
             jsonObject.add("properties", jsonArray5);
         }
         
         @Override
         public CopyBlockState deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
-            final ResourceLocation sm5 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
+            final ResourceLocation uh5 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
             final Object o;
             final Object obj;
-            final Block bph6 = Registry.BLOCK.getOptional(sm5).<Throwable>orElseThrow(() -> {
+            final Block bvr6 = Registry.BLOCK.getOptional(uh5).<Throwable>orElseThrow(() -> {
                 new IllegalArgumentException("Can't find block " + obj);
                 return o;
             });
-            final StateDefinition<Block, BlockState> byk7 = bph6.getStateDefinition();
+            final StateDefinition<Block, BlockState> cfk7 = bvr6.getStateDefinition();
             final Set<Property<?>> set8 = Sets.newHashSet();
             final JsonArray jsonArray9 = GsonHelper.getAsJsonArray(jsonObject, "properties", null);
             if (jsonArray9 != null) {
-                jsonArray9.forEach(jsonElement -> set8.add(byk7.getProperty(GsonHelper.convertToString(jsonElement, "property"))));
+                jsonArray9.forEach(jsonElement -> set8.add(cfk7.getProperty(GsonHelper.convertToString(jsonElement, "property"))));
             }
-            return new CopyBlockState(arr, bph6, set8, null);
+            return new CopyBlockState(arr, bvr6, set8, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/functions/CopyNameFunction.java b/src/net/minecraft/world/level/storage/loot/functions/CopyNameFunction.java
index 64c5bf5..f0fe8a9 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/CopyNameFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/CopyNameFunction.java
@@ -4,7 +4,6 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.Nameable;
 import net.minecraft.world.level.storage.loot.LootContext;
@@ -22,20 +21,25 @@ public class CopyNameFunction extends LootItemConditionalFunction {
         this.source = a;
     }
     
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.COPY_NAME;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.<LootContextParam<?>>of(this.source.param);
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        final Object object4 = crx.getParamOrNull(this.source.param);
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        final Object object4 = dat.getParamOrNull(this.source.param);
         if (object4 instanceof Nameable) {
-            final Nameable ajp5 = (Nameable)object4;
-            if (ajp5.hasCustomName()) {
-                ben.setHoverName(ajp5.getDisplayName());
+            final Nameable ank5 = (Nameable)object4;
+            if (ank5.hasCustomName()) {
+                bki.setHoverName(ank5.getDisplayName());
             }
         }
-        return ben;
+        return bki;
     }
     
     public static Builder<?> copyName(final NameSource a) {
@@ -51,9 +55,9 @@ public class CopyNameFunction extends LootItemConditionalFunction {
         public final String name;
         public final LootContextParam<?> param;
         
-        private NameSource(final String string3, final LootContextParam<?> ctx) {
+        private NameSource(final String string3, final LootContextParam<?> dcx) {
             this.name = string3;
-            this.param = ctx;
+            this.param = dcx;
         }
         
         public static NameSource getByName(final String string) {
@@ -67,14 +71,10 @@ public class CopyNameFunction extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<CopyNameFunction> {
-        public Serializer() {
-            super(new ResourceLocation("copy_name"), CopyNameFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final CopyNameFunction csz, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, csz, jsonSerializationContext);
-            jsonObject.addProperty("source", csz.source.name);
+        public void serialize(final JsonObject jsonObject, final CopyNameFunction dby, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dby, jsonSerializationContext);
+            jsonObject.addProperty("source", dby.source.name);
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/storage/loot/functions/CopyNbtFunction.java b/src/net/minecraft/world/level/storage/loot/functions/CopyNbtFunction.java
index 97e34e8..271b8ce 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/CopyNbtFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/CopyNbtFunction.java
@@ -6,7 +6,6 @@ import com.google.gson.JsonElement;
 import java.util.function.Consumer;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonSerializationContext;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.nbt.ListTag;
 import com.google.common.collect.Iterables;
@@ -45,6 +44,11 @@ public class CopyNbtFunction extends LootItemConditionalFunction {
         this.operations = ImmutableList.copyOf(list);
     }
     
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.COPY_NBT;
+    }
+    
     private static NbtPathArgument.NbtPath compileNbtPath(final String string) {
         try {
             return new NbtPathArgument().parse(new StringReader(string));
@@ -59,12 +63,12 @@ public class CopyNbtFunction extends LootItemConditionalFunction {
         return ImmutableSet.<LootContextParam<?>>of(this.source.param);
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        final Tag kj4 = this.source.getter.apply(crx);
-        if (kj4 != null) {
-            this.operations.forEach(b -> b.apply((Supplier<Tag>)ben::getOrCreateTag, kj4));
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        final Tag lu4 = this.source.getter.apply(dat);
+        if (lu4 != null) {
+            this.operations.forEach(b -> b.apply((Supplier<Tag>)bki::getOrCreateTag, lu4));
         }
-        return ben;
+        return bki;
     }
     
     public static Builder copyData(final DataSource c) {
@@ -73,7 +77,7 @@ public class CopyNbtFunction extends LootItemConditionalFunction {
     
     static {
         ENTITY_GETTER = NbtPredicate::getEntityTagToCompare;
-        BLOCK_ENTITY_GETTER = (bwl -> bwl.save(new CompoundTag()));
+        BLOCK_ENTITY_GETTER = (cdl -> cdl.save(new CompoundTag()));
     }
     
     static class CopyOperation {
@@ -91,9 +95,9 @@ public class CopyNbtFunction extends LootItemConditionalFunction {
             this.op = d;
         }
         
-        public void apply(final Supplier<Tag> supplier, final Tag kj) {
+        public void apply(final Supplier<Tag> supplier, final Tag lu) {
             try {
-                final List<Tag> list4 = this.sourcePath.get(kj);
+                final List<Tag> list4 = this.sourcePath.get(lu);
                 if (!list4.isEmpty()) {
                     this.op.merge(supplier.get(), this.targetPath, list4);
                 }
@@ -149,30 +153,30 @@ public class CopyNbtFunction extends LootItemConditionalFunction {
     public enum MergeStrategy {
         REPLACE("replace") {
             @Override
-            public void merge(final Tag kj, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException {
-                h.set(kj, (Tag)Iterables.<Tag>getLast(list)::copy);
+            public void merge(final Tag lu, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException {
+                h.set(lu, (Tag)Iterables.<Tag>getLast(list)::copy);
             }
         }, 
         APPEND("append") {
             @Override
-            public void merge(final Tag kj, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException {
-                final List<Tag> list2 = h.getOrCreate(kj, (Supplier<Tag>)ListTag::new);
-                list2.forEach(kj -> {
-                    if (kj instanceof ListTag) {
-                        list.forEach(kj2 -> kj.add(kj2.copy()));
+            public void merge(final Tag lu, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException {
+                final List<Tag> list2 = h.getOrCreate(lu, (Supplier<Tag>)ListTag::new);
+                list2.forEach(lu -> {
+                    if (lu instanceof ListTag) {
+                        list.forEach(lu2 -> lu.add(lu2.copy()));
                     }
                 });
             }
         }, 
         MERGE("merge") {
             @Override
-            public void merge(final Tag kj, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException {
-                final List<Tag> list2 = h.getOrCreate(kj, (Supplier<Tag>)CompoundTag::new);
-                list2.forEach(kj -> {
-                    if (kj instanceof CompoundTag) {
-                        list.forEach(kj2 -> {
-                            if (kj2 instanceof CompoundTag) {
-                                kj.merge(kj2);
+            public void merge(final Tag lu, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException {
+                final List<Tag> list2 = h.getOrCreate(lu, (Supplier<Tag>)CompoundTag::new);
+                list2.forEach(lu -> {
+                    if (lu instanceof CompoundTag) {
+                        list.forEach(lu2 -> {
+                            if (lu2 instanceof CompoundTag) {
+                                lu.merge(lu2);
                             }
                         });
                     }
@@ -182,7 +186,7 @@ public class CopyNbtFunction extends LootItemConditionalFunction {
         
         private final String name;
         
-        public abstract void merge(final Tag kj, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException;
+        public abstract void merge(final Tag lu, final NbtPathArgument.NbtPath h, final List<Tag> list) throws CommandSyntaxException;
         
         private MergeStrategy(final String string3) {
             this.name = string3;
@@ -208,12 +212,12 @@ public class CopyNbtFunction extends LootItemConditionalFunction {
         public final LootContextParam<?> param;
         public final Function<LootContext, Tag> getter;
         
-        private <T> DataSource(final String string3, final LootContextParam<T> ctx, final Function<? super T, Tag> function) {
+        private <T> DataSource(final String string3, final LootContextParam<T> dcx, final Function<? super T, Tag> function) {
             this.name = string3;
-            this.param = ctx;
+            this.param = dcx;
             final Object object4;
-            this.getter = (Function<LootContext, Tag>)(crx -> {
-                object4 = crx.<T>getParamOrNull(ctx);
+            this.getter = (Function<LootContext, Tag>)(dat -> {
+                object4 = dat.<T>getParamOrNull(dcx);
                 return (object4 != null) ? function.apply(object4) : null;
             });
         }
@@ -229,16 +233,12 @@ public class CopyNbtFunction extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<CopyNbtFunction> {
-        public Serializer() {
-            super(new ResourceLocation("copy_nbt"), CopyNbtFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final CopyNbtFunction cta, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, cta, jsonSerializationContext);
-            jsonObject.addProperty("source", cta.source.name);
+        public void serialize(final JsonObject jsonObject, final CopyNbtFunction dbz, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dbz, jsonSerializationContext);
+            jsonObject.addProperty("source", dbz.source.name);
             final JsonArray jsonArray5 = new JsonArray();
-            cta.operations.stream().map(CopyOperation::toJson).forEach(jsonArray5::add);
+            dbz.operations.stream().map(CopyOperation::toJson).forEach(jsonArray5::add);
             jsonObject.add("ops", jsonArray5);
         }
         
diff --git a/src/net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.java b/src/net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.java
index 7c74481..e1f42da 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/EnchantRandomlyFunction.java
@@ -2,23 +2,27 @@ package net.minecraft.world.level.storage.loot.functions;
 
 import com.google.gson.JsonSyntaxException;
 import net.minecraft.util.GsonHelper;
+import com.google.common.collect.Lists;
 import com.google.gson.JsonDeserializationContext;
+import net.minecraft.resources.ResourceLocation;
+import java.util.Iterator;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import com.google.common.collect.Sets;
+import java.util.Set;
 import org.apache.logging.log4j.LogManager;
-import java.util.Iterator;
-import java.util.Random;
 import net.minecraft.world.item.EnchantedBookItem;
 import net.minecraft.world.item.enchantment.EnchantmentInstance;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.util.Mth;
-import net.minecraft.world.item.Items;
+import java.util.Random;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 import net.minecraft.core.Registry;
-import com.google.common.collect.Lists;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
 import com.google.common.collect.ImmutableList;
@@ -37,37 +41,42 @@ public class EnchantRandomlyFunction extends LootItemConditionalFunction {
         this.enchantments = ImmutableList.copyOf(collection);
     }
     
-    public ItemStack run(ItemStack ben, final LootContext crx) {
-        final Random random5 = crx.getRandom();
-        Enchantment bhx9;
-        if (this.enchantments.isEmpty()) {
-            final List<Enchantment> list6 = Lists.newArrayList();
-            for (final Enchantment bhx8 : Registry.ENCHANTMENT) {
-                if (ben.getItem() == Items.BOOK || bhx8.canEnchant(ben)) {
-                    list6.add(bhx8);
-                }
-            }
-            if (list6.isEmpty()) {
-                EnchantRandomlyFunction.LOGGER.warn("Couldn't find a compatible enchantment for {}", ben);
-                return ben;
-            }
-            bhx9 = list6.get(random5.nextInt(list6.size()));
-        }
-        else {
-            bhx9 = this.enchantments.get(random5.nextInt(this.enchantments.size()));
-        }
-        final int integer6 = Mth.nextInt(random5, bhx9.getMinLevel(), bhx9.getMaxLevel());
-        if (ben.getItem() == Items.BOOK) {
-            ben = new ItemStack(Items.ENCHANTED_BOOK);
-            EnchantedBookItem.addEnchantment(ben, new EnchantmentInstance(bhx9, integer6));
-        }
-        else {
-            ben.enchant(bhx9, integer6);
-        }
-        return ben;
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.ENCHANT_RANDOMLY;
     }
     
-    public static Builder<?> randomApplicableEnchantment() {
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        final Random random5 = dat.getRandom();
+        Enchantment bnw2;
+        if (this.enchantments.isEmpty()) {
+            final boolean boolean6 = bki.getItem() == Items.BOOK;
+            final List<Enchantment> list7 = Registry.ENCHANTMENT.stream().filter(Enchantment::isDiscoverable).filter(bnw -> boolean6 || bnw.canEnchant(bki)).collect(Collectors.toList());
+            if (list7.isEmpty()) {
+                EnchantRandomlyFunction.LOGGER.warn("Couldn't find a compatible enchantment for {}", bki);
+                return bki;
+            }
+            bnw2 = list7.get(random5.nextInt(list7.size()));
+        }
+        else {
+            bnw2 = this.enchantments.get(random5.nextInt(this.enchantments.size()));
+        }
+        return enchantItem(bki, bnw2, random5);
+    }
+    
+    private static ItemStack enchantItem(ItemStack bki, final Enchantment bnw, final Random random) {
+        final int integer4 = Mth.nextInt(random, bnw.getMinLevel(), bnw.getMaxLevel());
+        if (bki.getItem() == Items.BOOK) {
+            bki = new ItemStack(Items.ENCHANTED_BOOK);
+            EnchantedBookItem.addEnchantment(bki, new EnchantmentInstance(bnw, integer4));
+        }
+        else {
+            bki.enchant(bnw, integer4);
+        }
+        return bki;
+    }
+    
+    public static LootItemConditionalFunction.Builder<?> randomApplicableEnchantment() {
         return LootItemConditionalFunction.simpleBuilder(arr -> new EnchantRandomlyFunction(arr, ImmutableList.of()));
     }
     
@@ -75,22 +84,41 @@ public class EnchantRandomlyFunction extends LootItemConditionalFunction {
         LOGGER = LogManager.getLogger();
     }
     
-    public static class Serializer extends LootItemConditionalFunction.Serializer<EnchantRandomlyFunction> {
-        public Serializer() {
-            super(new ResourceLocation("enchant_randomly"), EnchantRandomlyFunction.class);
+    public static class Builder extends LootItemConditionalFunction.Builder<Builder> {
+        private final Set<Enchantment> enchantments;
+        
+        public Builder() {
+            this.enchantments = Sets.newHashSet();
         }
         
         @Override
-        public void serialize(final JsonObject jsonObject, final EnchantRandomlyFunction ctb, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctb, jsonSerializationContext);
-            if (!ctb.enchantments.isEmpty()) {
+        protected Builder getThis() {
+            return this;
+        }
+        
+        public Builder withEnchantment(final Enchantment bnw) {
+            this.enchantments.add(bnw);
+            return this;
+        }
+        
+        @Override
+        public LootItemFunction build() {
+            return new EnchantRandomlyFunction(this.getConditions(), this.enchantments, null);
+        }
+    }
+    
+    public static class Serializer extends LootItemConditionalFunction.Serializer<EnchantRandomlyFunction> {
+        @Override
+        public void serialize(final JsonObject jsonObject, final EnchantRandomlyFunction dca, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dca, jsonSerializationContext);
+            if (!dca.enchantments.isEmpty()) {
                 final JsonArray jsonArray5 = new JsonArray();
-                for (final Enchantment bhx7 : ctb.enchantments) {
-                    final ResourceLocation sm8 = Registry.ENCHANTMENT.getKey(bhx7);
-                    if (sm8 == null) {
-                        throw new IllegalArgumentException("Don't know how to serialize enchantment " + bhx7);
+                for (final Enchantment bnw7 : dca.enchantments) {
+                    final ResourceLocation uh8 = Registry.ENCHANTMENT.getKey(bnw7);
+                    if (uh8 == null) {
+                        throw new IllegalArgumentException("Don't know how to serialize enchantment " + bnw7);
                     }
-                    jsonArray5.add(new JsonPrimitive(sm8.toString()));
+                    jsonArray5.add(new JsonPrimitive(uh8.toString()));
                 }
                 jsonObject.add("enchantments", jsonArray5);
             }
@@ -105,11 +133,11 @@ public class EnchantRandomlyFunction extends LootItemConditionalFunction {
                     final String string9 = GsonHelper.convertToString(jsonElement8, "enchantment");
                     final Object o;
                     final String str;
-                    final Enchantment bhx10 = Registry.ENCHANTMENT.getOptional(new ResourceLocation(string9)).<Throwable>orElseThrow(() -> {
+                    final Enchantment bnw10 = Registry.ENCHANTMENT.getOptional(new ResourceLocation(string9)).<Throwable>orElseThrow(() -> {
                         new JsonSyntaxException("Unknown enchantment '" + str + "'");
                         return o;
                     });
-                    list5.add(bhx10);
+                    list5.add(bnw10);
                 }
             }
             return new EnchantRandomlyFunction(arr, list5, null);
diff --git a/src/net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.java b/src/net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.java
index 00052f7..b806ad8 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/EnchantWithLevelsFunction.java
@@ -5,7 +5,6 @@ import com.google.gson.JsonDeserializationContext;
 import net.minecraft.world.level.storage.loot.RandomIntGenerators;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import java.util.Random;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.storage.loot.LootContext;
@@ -17,27 +16,32 @@ public class EnchantWithLevelsFunction extends LootItemConditionalFunction {
     private final RandomIntGenerator levels;
     private final boolean treasure;
     
-    private EnchantWithLevelsFunction(final LootItemCondition[] arr, final RandomIntGenerator csd, final boolean boolean3) {
+    private EnchantWithLevelsFunction(final LootItemCondition[] arr, final RandomIntGenerator daz, final boolean boolean3) {
         super(arr);
-        this.levels = csd;
+        this.levels = daz;
         this.treasure = boolean3;
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        final Random random4 = crx.getRandom();
-        return EnchantmentHelper.enchantItem(random4, ben, this.levels.getInt(random4), this.treasure);
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.ENCHANT_WITH_LEVELS;
     }
     
-    public static Builder enchantWithLevels(final RandomIntGenerator csd) {
-        return new Builder(csd);
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        final Random random4 = dat.getRandom();
+        return EnchantmentHelper.enchantItem(random4, bki, this.levels.getInt(random4), this.treasure);
+    }
+    
+    public static Builder enchantWithLevels(final RandomIntGenerator daz) {
+        return new Builder(daz);
     }
     
     public static class Builder extends LootItemConditionalFunction.Builder<Builder> {
         private final RandomIntGenerator levels;
         private boolean treasure;
         
-        public Builder(final RandomIntGenerator csd) {
-            this.levels = csd;
+        public Builder(final RandomIntGenerator daz) {
+            this.levels = daz;
         }
         
         @Override
@@ -57,22 +61,18 @@ public class EnchantWithLevelsFunction extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<EnchantWithLevelsFunction> {
-        public Serializer() {
-            super(new ResourceLocation("enchant_with_levels"), EnchantWithLevelsFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final EnchantWithLevelsFunction ctc, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctc, jsonSerializationContext);
-            jsonObject.add("levels", RandomIntGenerators.serialize(ctc.levels, jsonSerializationContext));
-            jsonObject.addProperty("treasure", ctc.treasure);
+        public void serialize(final JsonObject jsonObject, final EnchantWithLevelsFunction dcb, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcb, jsonSerializationContext);
+            jsonObject.add("levels", RandomIntGenerators.serialize(dcb.levels, jsonSerializationContext));
+            jsonObject.addProperty("treasure", dcb.treasure);
         }
         
         @Override
         public EnchantWithLevelsFunction deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
-            final RandomIntGenerator csd5 = RandomIntGenerators.deserialize(jsonObject.get("levels"), jsonDeserializationContext);
+            final RandomIntGenerator daz5 = RandomIntGenerators.deserialize(jsonObject.get("levels"), jsonDeserializationContext);
             final boolean boolean6 = GsonHelper.getAsBoolean(jsonObject, "treasure", false);
-            return new EnchantWithLevelsFunction(arr, csd5, boolean6, null);
+            return new EnchantWithLevelsFunction(arr, daz5, boolean6, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java b/src/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java
index 87261cf..e6897b2 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java
@@ -1,11 +1,9 @@
 package net.minecraft.world.level.storage.loot.functions;
 
-import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.network.chat.Component;
@@ -24,48 +22,55 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParam;
 import java.util.Set;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 import net.minecraft.world.level.saveddata.maps.MapDecoration;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import org.apache.logging.log4j.Logger;
 
 public class ExplorationMapFunction extends LootItemConditionalFunction {
     private static final Logger LOGGER;
+    public static final StructureFeature<?> DEFAULT_FEATURE;
     public static final MapDecoration.Type DEFAULT_DECORATION;
-    private final String destination;
+    private final StructureFeature<?> destination;
     private final MapDecoration.Type mapDecoration;
     private final byte zoom;
     private final int searchRadius;
     private final boolean skipKnownStructures;
     
-    private ExplorationMapFunction(final LootItemCondition[] arr, final String string, final MapDecoration.Type a, final byte byte4, final int integer, final boolean boolean6) {
+    private ExplorationMapFunction(final LootItemCondition[] arr, final StructureFeature<?> cml, final MapDecoration.Type a, final byte byte4, final int integer, final boolean boolean6) {
         super(arr);
-        this.destination = string;
+        this.destination = cml;
         this.mapDecoration = a;
         this.zoom = byte4;
         this.searchRadius = integer;
         this.skipKnownStructures = boolean6;
     }
     
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.EXPLORATION_MAP;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(LootContextParams.BLOCK_POS);
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        if (ben.getItem() != Items.MAP) {
-            return ben;
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        if (bki.getItem() != Items.MAP) {
+            return bki;
         }
-        final BlockPos fk4 = crx.<BlockPos>getParamOrNull(LootContextParams.BLOCK_POS);
-        if (fk4 != null) {
-            final ServerLevel xd5 = crx.getLevel();
-            final BlockPos fk5 = xd5.findNearestMapFeature(this.destination, fk4, this.searchRadius, this.skipKnownStructures);
-            if (fk5 != null) {
-                final ItemStack ben2 = MapItem.create(xd5, fk5.getX(), fk5.getZ(), this.zoom, true, true);
-                MapItem.renderBiomePreviewMap(xd5, ben2);
-                MapItemSavedData.addTargetDecoration(ben2, fk5, "+", this.mapDecoration);
-                ben2.setHoverName(new TranslatableComponent("filled_map." + this.destination.toLowerCase(Locale.ROOT), new Object[0]));
-                return ben2;
+        final BlockPos fu4 = dat.<BlockPos>getParamOrNull(LootContextParams.BLOCK_POS);
+        if (fu4 != null) {
+            final ServerLevel zd5 = dat.getLevel();
+            final BlockPos fu5 = zd5.findNearestMapFeature(this.destination, fu4, this.searchRadius, this.skipKnownStructures);
+            if (fu5 != null) {
+                final ItemStack bki2 = MapItem.create(zd5, fu5.getX(), fu5.getZ(), this.zoom, true, true);
+                MapItem.renderBiomePreviewMap(zd5, bki2);
+                MapItemSavedData.addTargetDecoration(bki2, fu5, "+", this.mapDecoration);
+                bki2.setHoverName(new TranslatableComponent("filled_map." + this.destination.getFeatureName().toLowerCase(Locale.ROOT)));
+                return bki2;
             }
         }
-        return ben;
+        return bki;
     }
     
     public static Builder makeExplorationMap() {
@@ -74,18 +79,19 @@ public class ExplorationMapFunction extends LootItemConditionalFunction {
     
     static {
         LOGGER = LogManager.getLogger();
+        DEFAULT_FEATURE = StructureFeature.BURIED_TREASURE;
         DEFAULT_DECORATION = MapDecoration.Type.MANSION;
     }
     
     public static class Builder extends LootItemConditionalFunction.Builder<Builder> {
-        private String destination;
+        private StructureFeature<?> destination;
         private MapDecoration.Type mapDecoration;
         private byte zoom;
         private int searchRadius;
         private boolean skipKnownStructures;
         
         public Builder() {
-            this.destination = "Buried_Treasure";
+            this.destination = ExplorationMapFunction.DEFAULT_FEATURE;
             this.mapDecoration = ExplorationMapFunction.DEFAULT_DECORATION;
             this.zoom = 2;
             this.searchRadius = 50;
@@ -97,8 +103,8 @@ public class ExplorationMapFunction extends LootItemConditionalFunction {
             return this;
         }
         
-        public Builder setDestination(final String string) {
-            this.destination = string;
+        public Builder setDestination(final StructureFeature<?> cml) {
+            this.destination = cml;
             return this;
         }
         
@@ -124,34 +130,29 @@ public class ExplorationMapFunction extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<ExplorationMapFunction> {
-        protected Serializer() {
-            super(new ResourceLocation("exploration_map"), ExplorationMapFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final ExplorationMapFunction ctd, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctd, jsonSerializationContext);
-            if (!ctd.destination.equals("Buried_Treasure")) {
-                jsonObject.add("destination", jsonSerializationContext.serialize(ctd.destination));
+        public void serialize(final JsonObject jsonObject, final ExplorationMapFunction dcc, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcc, jsonSerializationContext);
+            if (!dcc.destination.equals(ExplorationMapFunction.DEFAULT_FEATURE)) {
+                jsonObject.add("destination", jsonSerializationContext.serialize(dcc.destination.getFeatureName()));
             }
-            if (ctd.mapDecoration != ExplorationMapFunction.DEFAULT_DECORATION) {
-                jsonObject.add("decoration", jsonSerializationContext.serialize(ctd.mapDecoration.toString().toLowerCase(Locale.ROOT)));
+            if (dcc.mapDecoration != ExplorationMapFunction.DEFAULT_DECORATION) {
+                jsonObject.add("decoration", jsonSerializationContext.serialize(dcc.mapDecoration.toString().toLowerCase(Locale.ROOT)));
             }
-            if (ctd.zoom != 2) {
-                jsonObject.addProperty("zoom", ctd.zoom);
+            if (dcc.zoom != 2) {
+                jsonObject.addProperty("zoom", dcc.zoom);
             }
-            if (ctd.searchRadius != 50) {
-                jsonObject.addProperty("search_radius", ctd.searchRadius);
+            if (dcc.searchRadius != 50) {
+                jsonObject.addProperty("search_radius", dcc.searchRadius);
             }
-            if (!ctd.skipKnownStructures) {
-                jsonObject.addProperty("skip_existing_chunks", ctd.skipKnownStructures);
+            if (!dcc.skipKnownStructures) {
+                jsonObject.addProperty("skip_existing_chunks", dcc.skipKnownStructures);
             }
         }
         
         @Override
         public ExplorationMapFunction deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
-            String string5 = jsonObject.has("destination") ? GsonHelper.getAsString(jsonObject, "destination") : "Buried_Treasure";
-            string5 = (Feature.STRUCTURES_REGISTRY.containsKey(string5.toLowerCase(Locale.ROOT)) ? string5 : "Buried_Treasure");
+            final StructureFeature<?> cml5 = readStructure(jsonObject);
             final String string6 = jsonObject.has("decoration") ? GsonHelper.getAsString(jsonObject, "decoration") : "mansion";
             MapDecoration.Type a7 = ExplorationMapFunction.DEFAULT_DECORATION;
             try {
@@ -163,7 +164,18 @@ public class ExplorationMapFunction extends LootItemConditionalFunction {
             final byte byte8 = GsonHelper.getAsByte(jsonObject, "zoom", (byte)2);
             final int integer9 = GsonHelper.getAsInt(jsonObject, "search_radius", 50);
             final boolean boolean10 = GsonHelper.getAsBoolean(jsonObject, "skip_existing_chunks", true);
-            return new ExplorationMapFunction(arr, string5, a7, byte8, integer9, boolean10, null);
+            return new ExplorationMapFunction(arr, cml5, a7, byte8, integer9, boolean10, null);
+        }
+        
+        private static StructureFeature<?> readStructure(final JsonObject jsonObject) {
+            if (jsonObject.has("destination")) {
+                final String string2 = GsonHelper.getAsString(jsonObject, "destination");
+                final StructureFeature<?> cml3 = StructureFeature.STRUCTURES_REGISTRY.get(string2.toLowerCase(Locale.ROOT));
+                if (cml3 != null) {
+                    return cml3;
+                }
+            }
+            return ExplorationMapFunction.DEFAULT_FEATURE;
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/functions/FillPlayerHead.java b/src/net/minecraft/world/level/storage/loot/functions/FillPlayerHead.java
index 489efbf..4d2f162 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/FillPlayerHead.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/FillPlayerHead.java
@@ -4,7 +4,6 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.NbtUtils;
@@ -27,31 +26,32 @@ public class FillPlayerHead extends LootItemConditionalFunction {
         this.entityTarget = c;
     }
     
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.FILL_PLAYER_HEAD;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(this.entityTarget.getParam());
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        if (ben.getItem() == Items.PLAYER_HEAD) {
-            final Entity akq4 = crx.<Entity>getParamOrNull(this.entityTarget.getParam());
-            if (akq4 instanceof Player) {
-                final GameProfile gameProfile5 = ((Player)akq4).getGameProfile();
-                ben.getOrCreateTag().put("SkullOwner", NbtUtils.writeGameProfile(new CompoundTag(), gameProfile5));
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        if (bki.getItem() == Items.PLAYER_HEAD) {
+            final Entity aom4 = dat.<Entity>getParamOrNull(this.entityTarget.getParam());
+            if (aom4 instanceof Player) {
+                final GameProfile gameProfile5 = ((Player)aom4).getGameProfile();
+                bki.getOrCreateTag().put("SkullOwner", NbtUtils.writeGameProfile(new CompoundTag(), gameProfile5));
             }
         }
-        return ben;
+        return bki;
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<FillPlayerHead> {
-        public Serializer() {
-            super(new ResourceLocation("fill_player_head"), FillPlayerHead.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final FillPlayerHead cte, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, cte, jsonSerializationContext);
-            jsonObject.add("entity", jsonSerializationContext.serialize(cte.entityTarget));
+        public void serialize(final JsonObject jsonObject, final FillPlayerHead dcd, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcd, jsonSerializationContext);
+            jsonObject.add("entity", jsonSerializationContext.serialize(dcd.entityTarget));
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/storage/loot/functions/LimitCount.java b/src/net/minecraft/world/level/storage/loot/functions/LimitCount.java
index 2f8e200..f3551c1 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/LimitCount.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/LimitCount.java
@@ -4,7 +4,6 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
@@ -13,36 +12,37 @@ import net.minecraft.world.level.storage.loot.IntLimiter;
 public class LimitCount extends LootItemConditionalFunction {
     private final IntLimiter limiter;
     
-    private LimitCount(final LootItemCondition[] arr, final IntLimiter crw) {
+    private LimitCount(final LootItemCondition[] arr, final IntLimiter das) {
         super(arr);
-        this.limiter = crw;
+        this.limiter = das;
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        final int integer4 = this.limiter.applyAsInt(ben.getCount());
-        ben.setCount(integer4);
-        return ben;
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.LIMIT_COUNT;
     }
     
-    public static Builder<?> limitCount(final IntLimiter crw) {
-        return LootItemConditionalFunction.simpleBuilder(arr -> new LimitCount(arr, crw));
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        final int integer4 = this.limiter.applyAsInt(bki.getCount());
+        bki.setCount(integer4);
+        return bki;
+    }
+    
+    public static Builder<?> limitCount(final IntLimiter das) {
+        return LootItemConditionalFunction.simpleBuilder(arr -> new LimitCount(arr, das));
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<LimitCount> {
-        protected Serializer() {
-            super(new ResourceLocation("limit_count"), LimitCount.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final LimitCount ctg, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctg, jsonSerializationContext);
-            jsonObject.add("limit", jsonSerializationContext.serialize(ctg.limiter));
+        public void serialize(final JsonObject jsonObject, final LimitCount dcf, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcf, jsonSerializationContext);
+            jsonObject.add("limit", jsonSerializationContext.serialize(dcf.limiter));
         }
         
         @Override
         public LimitCount deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
-            final IntLimiter crw5 = GsonHelper.<IntLimiter>getAsObject(jsonObject, "limit", jsonDeserializationContext, IntLimiter.class);
-            return new LimitCount(arr, crw5, null);
+            final IntLimiter das5 = GsonHelper.<IntLimiter>getAsObject(jsonObject, "limit", jsonDeserializationContext, IntLimiter.class);
+            return new LimitCount(arr, das5, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction.java b/src/net/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction.java
index ac80019..a23f03f 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction.java
@@ -5,7 +5,7 @@ import com.google.gson.JsonDeserializationContext;
 import org.apache.commons.lang3.ArrayUtils;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import com.google.common.collect.Lists;
 import java.util.List;
 import net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder;
@@ -27,17 +27,17 @@ public abstract class LootItemConditionalFunction implements LootItemFunction {
     }
     
     @Override
-    public final ItemStack apply(final ItemStack ben, final LootContext crx) {
-        return this.compositePredicates.test(crx) ? this.run(ben, crx) : ben;
+    public final ItemStack apply(final ItemStack bki, final LootContext dat) {
+        return this.compositePredicates.test(dat) ? this.run(bki, dat) : bki;
     }
     
-    protected abstract ItemStack run(final ItemStack ben, final LootContext crx);
+    protected abstract ItemStack run(final ItemStack bki, final LootContext dat);
     
     @Override
-    public void validate(final ValidationContext csg) {
-        super.validate(csg);
+    public void validate(final ValidationContext dbe) {
+        super.validate(dbe);
         for (int integer3 = 0; integer3 < this.predicates.length; ++integer3) {
-            this.predicates[integer3].validate(csg.forChild(".conditions[" + integer3 + "]"));
+            this.predicates[integer3].validate(dbe.forChild(".conditions[" + integer3 + "]"));
         }
     }
     
@@ -88,15 +88,11 @@ public abstract class LootItemConditionalFunction implements LootItemFunction {
         }
     }
     
-    public abstract static class Serializer<T extends LootItemConditionalFunction> extends LootItemFunction.Serializer<T> {
-        public Serializer(final ResourceLocation sm, final Class<T> class2) {
-            super(sm, class2);
-        }
-        
+    public abstract static class Serializer<T extends LootItemConditionalFunction> implements net.minecraft.world.level.storage.loot.Serializer<T> {
         @Override
-        public void serialize(final JsonObject jsonObject, final T cth, final JsonSerializationContext jsonSerializationContext) {
-            if (!ArrayUtils.isEmpty((Object[])cth.predicates)) {
-                jsonObject.add("conditions", jsonSerializationContext.serialize(cth.predicates));
+        public void serialize(final JsonObject jsonObject, final T dcg, final JsonSerializationContext jsonSerializationContext) {
+            if (!ArrayUtils.isEmpty((Object[])dcg.predicates)) {
+                jsonObject.add("conditions", jsonSerializationContext.serialize(dcg.predicates));
             }
         }
         
diff --git a/src/net/minecraft/world/level/storage/loot/functions/LootItemFunction.java b/src/net/minecraft/world/level/storage/loot/functions/LootItemFunction.java
index bbf9db6..ec41be3 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/LootItemFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/LootItemFunction.java
@@ -1,9 +1,5 @@
 package net.minecraft.world.level.storage.loot.functions;
 
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import java.util.function.Consumer;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
@@ -11,30 +7,10 @@ import java.util.function.BiFunction;
 import net.minecraft.world.level.storage.loot.LootContextUser;
 
 public interface LootItemFunction extends LootContextUser, BiFunction<ItemStack, LootContext, ItemStack> {
-    default Consumer<ItemStack> decorate(final BiFunction<ItemStack, LootContext, ItemStack> biFunction, final Consumer<ItemStack> consumer, final LootContext crx) {
-        return ben -> consumer.accept(biFunction.apply(ben, crx));
-    }
+    LootItemFunctionType getType();
     
-    public abstract static class Serializer<T extends LootItemFunction> {
-        private final ResourceLocation name;
-        private final Class<T> clazz;
-        
-        protected Serializer(final ResourceLocation sm, final Class<T> class2) {
-            this.name = sm;
-            this.clazz = class2;
-        }
-        
-        public ResourceLocation getName() {
-            return this.name;
-        }
-        
-        public Class<T> getFunctionClass() {
-            return this.clazz;
-        }
-        
-        public abstract void serialize(final JsonObject jsonObject, final T cti, final JsonSerializationContext jsonSerializationContext);
-        
-        public abstract T deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext);
+    default Consumer<ItemStack> decorate(final BiFunction<ItemStack, LootContext, ItemStack> biFunction, final Consumer<ItemStack> consumer, final LootContext dat) {
+        return bki -> consumer.accept(biFunction.apply(bki, dat));
     }
     
     public interface Builder {
diff --git a/src/net/minecraft/world/level/storage/loot/functions/LootItemFunctionType.java b/src/net/minecraft/world/level/storage/loot/functions/LootItemFunctionType.java
new file mode 100644
index 0000000..87f758e
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/loot/functions/LootItemFunctionType.java
@@ -0,0 +1,10 @@
+package net.minecraft.world.level.storage.loot.functions;
+
+import net.minecraft.world.level.storage.loot.Serializer;
+import net.minecraft.world.level.storage.loot.SerializerType;
+
+public class LootItemFunctionType extends SerializerType<LootItemFunction> {
+    public LootItemFunctionType(final Serializer<? extends LootItemFunction> dbc) {
+        super(dbc);
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/loot/functions/LootItemFunctions.java b/src/net/minecraft/world/level/storage/loot/functions/LootItemFunctions.java
index 5164425..4e33c27 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/LootItemFunctions.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/LootItemFunctions.java
@@ -1,54 +1,43 @@
 package net.minecraft.world.level.storage.loot.functions;
 
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
-import java.lang.reflect.Type;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonSerializer;
-import com.google.gson.JsonDeserializer;
-import com.google.common.collect.Maps;
+import net.minecraft.world.level.storage.loot.GsonAdapterFactory;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
 import java.util.function.BiFunction;
-import net.minecraft.resources.ResourceLocation;
-import java.util.Map;
 
 public class LootItemFunctions {
-    private static final Map<ResourceLocation, LootItemFunction.Serializer<?>> FUNCTIONS_BY_NAME;
-    private static final Map<Class<? extends LootItemFunction>, LootItemFunction.Serializer<?>> FUNCTIONS_BY_CLASS;
     public static final BiFunction<ItemStack, LootContext, ItemStack> IDENTITY;
+    public static final LootItemFunctionType SET_COUNT;
+    public static final LootItemFunctionType ENCHANT_WITH_LEVELS;
+    public static final LootItemFunctionType ENCHANT_RANDOMLY;
+    public static final LootItemFunctionType SET_NBT;
+    public static final LootItemFunctionType FURNACE_SMELT;
+    public static final LootItemFunctionType LOOTING_ENCHANT;
+    public static final LootItemFunctionType SET_DAMAGE;
+    public static final LootItemFunctionType SET_ATTRIBUTES;
+    public static final LootItemFunctionType SET_NAME;
+    public static final LootItemFunctionType EXPLORATION_MAP;
+    public static final LootItemFunctionType SET_STEW_EFFECT;
+    public static final LootItemFunctionType COPY_NAME;
+    public static final LootItemFunctionType SET_CONTENTS;
+    public static final LootItemFunctionType LIMIT_COUNT;
+    public static final LootItemFunctionType APPLY_BONUS;
+    public static final LootItemFunctionType SET_LOOT_TABLE;
+    public static final LootItemFunctionType EXPLOSION_DECAY;
+    public static final LootItemFunctionType SET_LORE;
+    public static final LootItemFunctionType FILL_PLAYER_HEAD;
+    public static final LootItemFunctionType COPY_NBT;
+    public static final LootItemFunctionType COPY_STATE;
     
-    public static <T extends LootItemFunction> void register(final LootItemFunction.Serializer<? extends T> b) {
-        final ResourceLocation sm2 = b.getName();
-        final Class<T> class3 = (Class<T>)b.getFunctionClass();
-        if (LootItemFunctions.FUNCTIONS_BY_NAME.containsKey(sm2)) {
-            throw new IllegalArgumentException("Can't re-register item function name " + sm2);
-        }
-        if (LootItemFunctions.FUNCTIONS_BY_CLASS.containsKey(class3)) {
-            throw new IllegalArgumentException("Can't re-register item function class " + class3.getName());
-        }
-        LootItemFunctions.FUNCTIONS_BY_NAME.put(sm2, b);
-        LootItemFunctions.FUNCTIONS_BY_CLASS.put(class3, b);
+    private static LootItemFunctionType register(final String string, final Serializer<? extends LootItemFunction> dbc) {
+        return Registry.<LootItemFunctionType, LootItemFunctionType>register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(string), new LootItemFunctionType(dbc));
     }
     
-    public static LootItemFunction.Serializer<?> getSerializer(final ResourceLocation sm) {
-        final LootItemFunction.Serializer<?> b2 = LootItemFunctions.FUNCTIONS_BY_NAME.get(sm);
-        if (b2 == null) {
-            throw new IllegalArgumentException("Unknown loot item function '" + sm + "'");
-        }
-        return b2;
-    }
-    
-    public static <T extends LootItemFunction> LootItemFunction.Serializer<T> getSerializer(final T cti) {
-        final LootItemFunction.Serializer<T> b2 = (LootItemFunction.Serializer<T>)LootItemFunctions.FUNCTIONS_BY_CLASS.get(cti.getClass());
-        if (b2 == null) {
-            throw new IllegalArgumentException("Unknown loot item function " + cti);
-        }
-        return b2;
+    public static Object createGsonAdapter() {
+        return GsonAdapterFactory.<Object, LootItemFunctionType>builder(Registry.LOOT_FUNCTION_TYPE, "function", "function", LootItemFunction::getType).build();
     }
     
     public static BiFunction<ItemStack, LootContext, ItemStack> compose(final BiFunction<ItemStack, LootContext, ItemStack>[] arr) {
@@ -62,72 +51,45 @@ public class LootItemFunctions {
             case 2: {
                 final BiFunction<ItemStack, LootContext, ItemStack> biFunction2 = arr[0];
                 final BiFunction<ItemStack, LootContext, ItemStack> biFunction3 = arr[1];
-                return (BiFunction<ItemStack, LootContext, ItemStack>)((ben, crx) -> biFunction3.apply(biFunction2.apply(ben, crx), crx));
+                return (BiFunction<ItemStack, LootContext, ItemStack>)((bki, dat) -> biFunction3.apply(biFunction2.apply(bki, dat), dat));
             }
             default: {
                 int length;
                 int i = 0;
                 BiFunction<ItemStack, LootContext, ItemStack> biFunction4;
-                return (BiFunction<ItemStack, LootContext, ItemStack>)((ben, crx) -> {
+                return (BiFunction<ItemStack, LootContext, ItemStack>)((bki, dat) -> {
                     for (length = arr.length; i < length; ++i) {
                         biFunction4 = arr[i];
-                        ben = biFunction4.apply(ben, crx);
+                        bki = biFunction4.apply(bki, dat);
                     }
-                    return ben;
+                    return bki;
                 });
             }
         }
     }
     
     static {
-        FUNCTIONS_BY_NAME = Maps.newHashMap();
-        FUNCTIONS_BY_CLASS = Maps.newHashMap();
-        IDENTITY = ((ben, crx) -> ben);
-        LootItemFunctions.<LootItemFunction>register(new SetItemCountFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new EnchantWithLevelsFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new EnchantRandomlyFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new SetNbtFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new SmeltItemFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new LootingEnchantFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new SetItemDamageFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new SetAttributesFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new SetNameFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new ExplorationMapFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new SetStewEffectFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new CopyNameFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new SetContainerContents.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new LimitCount.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new ApplyBonusCount.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new SetContainerLootTable.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new ApplyExplosionDecay.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new SetLoreFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new FillPlayerHead.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new CopyNbtFunction.Serializer());
-        LootItemFunctions.<LootItemFunction>register(new CopyBlockState.Serializer());
-    }
-    
-    public static class Serializer implements JsonDeserializer<LootItemFunction>, JsonSerializer<LootItemFunction> {
-        @Override
-        public LootItemFunction deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
-            final JsonObject jsonObject5 = GsonHelper.convertToJsonObject(jsonElement, "function");
-            final ResourceLocation sm6 = new ResourceLocation(GsonHelper.getAsString(jsonObject5, "function"));
-            LootItemFunction.Serializer<?> b7;
-            try {
-                b7 = LootItemFunctions.getSerializer(sm6);
-            }
-            catch (IllegalArgumentException illegalArgumentException8) {
-                throw new JsonSyntaxException("Unknown function '" + sm6 + "'");
-            }
-            return (LootItemFunction)b7.deserialize(jsonObject5, jsonDeserializationContext);
-        }
-        
-        @Override
-        public JsonElement serialize(final LootItemFunction cti, final Type type, final JsonSerializationContext jsonSerializationContext) {
-            final LootItemFunction.Serializer<LootItemFunction> b5 = LootItemFunctions.<LootItemFunction>getSerializer(cti);
-            final JsonObject jsonObject6 = new JsonObject();
-            jsonObject6.addProperty("function", b5.getName().toString());
-            b5.serialize(jsonObject6, cti, jsonSerializationContext);
-            return jsonObject6;
-        }
+        IDENTITY = ((bki, dat) -> bki);
+        SET_COUNT = register("set_count", new SetItemCountFunction.Serializer());
+        ENCHANT_WITH_LEVELS = register("enchant_with_levels", new EnchantWithLevelsFunction.Serializer());
+        ENCHANT_RANDOMLY = register("enchant_randomly", new EnchantRandomlyFunction.Serializer());
+        SET_NBT = register("set_nbt", new SetNbtFunction.Serializer());
+        FURNACE_SMELT = register("furnace_smelt", new SmeltItemFunction.Serializer());
+        LOOTING_ENCHANT = register("looting_enchant", new LootingEnchantFunction.Serializer());
+        SET_DAMAGE = register("set_damage", new SetItemDamageFunction.Serializer());
+        SET_ATTRIBUTES = register("set_attributes", new SetAttributesFunction.Serializer());
+        SET_NAME = register("set_name", new SetNameFunction.Serializer());
+        EXPLORATION_MAP = register("exploration_map", new ExplorationMapFunction.Serializer());
+        SET_STEW_EFFECT = register("set_stew_effect", new SetStewEffectFunction.Serializer());
+        COPY_NAME = register("copy_name", new CopyNameFunction.Serializer());
+        SET_CONTENTS = register("set_contents", new SetContainerContents.Serializer());
+        LIMIT_COUNT = register("limit_count", new LimitCount.Serializer());
+        APPLY_BONUS = register("apply_bonus", new ApplyBonusCount.Serializer());
+        SET_LOOT_TABLE = register("set_loot_table", new SetContainerLootTable.Serializer());
+        EXPLOSION_DECAY = register("explosion_decay", new ApplyExplosionDecay.Serializer());
+        SET_LORE = register("set_lore", new SetLoreFunction.Serializer());
+        FILL_PLAYER_HEAD = register("fill_player_head", new FillPlayerHead.Serializer());
+        COPY_NBT = register("copy_nbt", new CopyNbtFunction.Serializer());
+        COPY_STATE = register("copy_state", new CopyBlockState.Serializer());
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.java b/src/net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.java
index b782296..b936405 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.java
@@ -4,7 +4,6 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.storage.loot.LootContext;
@@ -21,12 +20,17 @@ public class LootingEnchantFunction extends LootItemConditionalFunction {
     private final RandomValueBounds value;
     private final int limit;
     
-    private LootingEnchantFunction(final LootItemCondition[] arr, final RandomValueBounds csf, final int integer) {
+    private LootingEnchantFunction(final LootItemCondition[] arr, final RandomValueBounds dbb, final int integer) {
         super(arr);
-        this.value = csf;
+        this.value = dbb;
         this.limit = integer;
     }
     
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.LOOTING_ENCHANT;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(LootContextParams.KILLER_ENTITY);
@@ -36,33 +40,33 @@ public class LootingEnchantFunction extends LootItemConditionalFunction {
         return this.limit > 0;
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        final Entity akq4 = crx.<Entity>getParamOrNull(LootContextParams.KILLER_ENTITY);
-        if (akq4 instanceof LivingEntity) {
-            final int integer5 = EnchantmentHelper.getMobLooting((LivingEntity)akq4);
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        final Entity aom4 = dat.<Entity>getParamOrNull(LootContextParams.KILLER_ENTITY);
+        if (aom4 instanceof LivingEntity) {
+            final int integer5 = EnchantmentHelper.getMobLooting((LivingEntity)aom4);
             if (integer5 == 0) {
-                return ben;
+                return bki;
             }
-            final float float6 = integer5 * this.value.getFloat(crx.getRandom());
-            ben.grow(Math.round(float6));
-            if (this.hasLimit() && ben.getCount() > this.limit) {
-                ben.setCount(this.limit);
+            final float float6 = integer5 * this.value.getFloat(dat.getRandom());
+            bki.grow(Math.round(float6));
+            if (this.hasLimit() && bki.getCount() > this.limit) {
+                bki.setCount(this.limit);
             }
         }
-        return ben;
+        return bki;
     }
     
-    public static Builder lootingMultiplier(final RandomValueBounds csf) {
-        return new Builder(csf);
+    public static Builder lootingMultiplier(final RandomValueBounds dbb) {
+        return new Builder(dbb);
     }
     
     public static class Builder extends LootItemConditionalFunction.Builder<Builder> {
         private final RandomValueBounds count;
         private int limit;
         
-        public Builder(final RandomValueBounds csf) {
+        public Builder(final RandomValueBounds dbb) {
             this.limit = 0;
-            this.count = csf;
+            this.count = dbb;
         }
         
         @Override
@@ -82,16 +86,12 @@ public class LootingEnchantFunction extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<LootingEnchantFunction> {
-        protected Serializer() {
-            super(new ResourceLocation("looting_enchant"), LootingEnchantFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final LootingEnchantFunction ctk, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctk, jsonSerializationContext);
-            jsonObject.add("count", jsonSerializationContext.serialize(ctk.value));
-            if (ctk.hasLimit()) {
-                jsonObject.add("limit", jsonSerializationContext.serialize(ctk.limit));
+        public void serialize(final JsonObject jsonObject, final LootingEnchantFunction dck, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dck, jsonSerializationContext);
+            jsonObject.add("count", jsonSerializationContext.serialize(dck.value));
+            if (dck.hasLimit()) {
+                jsonObject.add("limit", jsonSerializationContext.serialize(dck.limit));
             }
         }
         
diff --git a/src/net/minecraft/world/level/storage/loot/functions/SetAttributesFunction.java b/src/net/minecraft/world/level/storage/loot/functions/SetAttributesFunction.java
index 5f36022..afa7df6 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/SetAttributesFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/SetAttributesFunction.java
@@ -1,8 +1,11 @@
 package net.minecraft.world.level.storage.loot.functions;
 
+import net.minecraft.resources.ResourceLocation;
 import com.google.gson.JsonPrimitive;
+import net.minecraft.core.Registry;
 import javax.annotation.Nullable;
 import net.minecraft.world.level.storage.loot.RandomValueBounds;
+import net.minecraft.world.entity.ai.attributes.Attribute;
 import com.google.gson.JsonSyntaxException;
 import com.google.common.collect.Lists;
 import net.minecraft.util.GsonHelper;
@@ -11,11 +14,11 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EquipmentSlot;
 import java.util.Iterator;
 import java.util.Random;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.Util;
+import net.minecraft.world.entity.EquipmentSlot;
 import java.util.UUID;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
@@ -32,29 +35,30 @@ public class SetAttributesFunction extends LootItemConditionalFunction {
         this.modifiers = ImmutableList.copyOf(list);
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        final Random random4 = crx.getRandom();
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.SET_ATTRIBUTES;
+    }
+    
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        final Random random4 = dat.getRandom();
         for (final Modifier b6 : this.modifiers) {
             UUID uUID7 = b6.id;
             if (uUID7 == null) {
                 uUID7 = UUID.randomUUID();
             }
-            final EquipmentSlot akv8 = b6.slots[random4.nextInt(b6.slots.length)];
-            ben.addAttributeModifier(b6.attribute, new AttributeModifier(uUID7, b6.name, b6.amount.getFloat(random4), b6.operation), akv8);
+            final EquipmentSlot aor8 = Util.<EquipmentSlot>getRandom(b6.slots, random4);
+            bki.addAttributeModifier(b6.attribute, new AttributeModifier(uUID7, b6.name, b6.amount.getFloat(random4), b6.operation), aor8);
         }
-        return ben;
+        return bki;
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<SetAttributesFunction> {
-        public Serializer() {
-            super(new ResourceLocation("set_attributes"), SetAttributesFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final SetAttributesFunction ctl, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctl, jsonSerializationContext);
+        public void serialize(final JsonObject jsonObject, final SetAttributesFunction dcl, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcl, jsonSerializationContext);
             final JsonArray jsonArray5 = new JsonArray();
-            for (final Modifier b7 : ctl.modifiers) {
+            for (final Modifier b7 : dcl.modifiers) {
                 jsonArray5.add(b7.serialize(jsonSerializationContext));
             }
             jsonObject.add("modifiers", jsonArray5);
@@ -76,18 +80,18 @@ public class SetAttributesFunction extends LootItemConditionalFunction {
     
     static class Modifier {
         private final String name;
-        private final String attribute;
+        private final Attribute attribute;
         private final AttributeModifier.Operation operation;
         private final RandomValueBounds amount;
         @Nullable
         private final UUID id;
         private final EquipmentSlot[] slots;
         
-        private Modifier(final String string1, final String string2, final AttributeModifier.Operation a, final RandomValueBounds csf, final EquipmentSlot[] arr, @Nullable final UUID uUID) {
-            this.name = string1;
-            this.attribute = string2;
+        private Modifier(final String string, final Attribute aps, final AttributeModifier.Operation a, final RandomValueBounds dbb, final EquipmentSlot[] arr, @Nullable final UUID uUID) {
+            this.name = string;
+            this.attribute = aps;
             this.operation = a;
-            this.amount = csf;
+            this.amount = dbb;
             this.id = uUID;
             this.slots = arr;
         }
@@ -95,7 +99,7 @@ public class SetAttributesFunction extends LootItemConditionalFunction {
         public JsonObject serialize(final JsonSerializationContext jsonSerializationContext) {
             final JsonObject jsonObject3 = new JsonObject();
             jsonObject3.addProperty("name", this.name);
-            jsonObject3.addProperty("attribute", this.attribute);
+            jsonObject3.addProperty("attribute", Registry.ATTRIBUTE.getKey(this.attribute).toString());
             jsonObject3.addProperty("operation", operationToString(this.operation));
             jsonObject3.add("amount", jsonSerializationContext.serialize(this.amount));
             if (this.id != null) {
@@ -106,8 +110,8 @@ public class SetAttributesFunction extends LootItemConditionalFunction {
             }
             else {
                 final JsonArray jsonArray4 = new JsonArray();
-                for (final EquipmentSlot akv8 : this.slots) {
-                    jsonArray4.add(new JsonPrimitive(akv8.getName()));
+                for (final EquipmentSlot aor8 : this.slots) {
+                    jsonArray4.add(new JsonPrimitive(aor8.getName()));
                 }
                 jsonObject3.add("slot", jsonArray4);
             }
@@ -116,38 +120,42 @@ public class SetAttributesFunction extends LootItemConditionalFunction {
         
         public static Modifier deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
             final String string3 = GsonHelper.getAsString(jsonObject, "name");
-            final String string4 = GsonHelper.getAsString(jsonObject, "attribute");
-            final AttributeModifier.Operation a5 = operationFromString(GsonHelper.getAsString(jsonObject, "operation"));
-            final RandomValueBounds csf6 = GsonHelper.<RandomValueBounds>getAsObject(jsonObject, "amount", jsonDeserializationContext, RandomValueBounds.class);
-            UUID uUID8 = null;
-            EquipmentSlot[] arr7;
+            final ResourceLocation uh4 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "attribute"));
+            final Attribute aps5 = Registry.ATTRIBUTE.get(uh4);
+            if (aps5 == null) {
+                throw new JsonSyntaxException("Unknown attribute: " + uh4);
+            }
+            final AttributeModifier.Operation a6 = operationFromString(GsonHelper.getAsString(jsonObject, "operation"));
+            final RandomValueBounds dbb7 = GsonHelper.<RandomValueBounds>getAsObject(jsonObject, "amount", jsonDeserializationContext, RandomValueBounds.class);
+            UUID uUID9 = null;
+            EquipmentSlot[] arr8;
             if (GsonHelper.isStringValue(jsonObject, "slot")) {
-                arr7 = new EquipmentSlot[] { EquipmentSlot.byName(GsonHelper.getAsString(jsonObject, "slot")) };
+                arr8 = new EquipmentSlot[] { EquipmentSlot.byName(GsonHelper.getAsString(jsonObject, "slot")) };
             }
             else {
                 if (!GsonHelper.isArrayNode(jsonObject, "slot")) {
                     throw new JsonSyntaxException("Invalid or missing attribute modifier slot; must be either string or array of strings.");
                 }
-                final JsonArray jsonArray9 = GsonHelper.getAsJsonArray(jsonObject, "slot");
-                arr7 = new EquipmentSlot[jsonArray9.size()];
-                int integer10 = 0;
-                for (final JsonElement jsonElement12 : jsonArray9) {
-                    arr7[integer10++] = EquipmentSlot.byName(GsonHelper.convertToString(jsonElement12, "slot"));
+                final JsonArray jsonArray10 = GsonHelper.getAsJsonArray(jsonObject, "slot");
+                arr8 = new EquipmentSlot[jsonArray10.size()];
+                int integer11 = 0;
+                for (final JsonElement jsonElement13 : jsonArray10) {
+                    arr8[integer11++] = EquipmentSlot.byName(GsonHelper.convertToString(jsonElement13, "slot"));
                 }
-                if (arr7.length == 0) {
+                if (arr8.length == 0) {
                     throw new JsonSyntaxException("Invalid attribute modifier slot; must contain at least one entry.");
                 }
             }
             if (jsonObject.has("id")) {
-                final String string5 = GsonHelper.getAsString(jsonObject, "id");
+                final String string4 = GsonHelper.getAsString(jsonObject, "id");
                 try {
-                    uUID8 = UUID.fromString(string5);
+                    uUID9 = UUID.fromString(string4);
                 }
-                catch (IllegalArgumentException illegalArgumentException10) {
-                    throw new JsonSyntaxException("Invalid attribute modifier id '" + string5 + "' (must be UUID format, with dashes)");
+                catch (IllegalArgumentException illegalArgumentException11) {
+                    throw new JsonSyntaxException("Invalid attribute modifier id '" + string4 + "' (must be UUID format, with dashes)");
                 }
             }
-            return new Modifier(string3, string4, a5, csf6, arr7, uUID8);
+            return new Modifier(string3, aps5, a6, dbb7, arr8, uUID9);
         }
         
         private static String operationToString(final AttributeModifier.Operation a) {
diff --git a/src/net/minecraft/world/level/storage/loot/functions/SetContainerContents.java b/src/net/minecraft/world/level/storage/loot/functions/SetContainerContents.java
index c9ff357..ae7fbb2 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/SetContainerContents.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/SetContainerContents.java
@@ -5,7 +5,6 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import com.google.common.collect.Lists;
 import net.minecraft.world.level.storage.loot.entries.LootPoolEntry;
 import net.minecraft.world.level.storage.loot.ValidationContext;
@@ -30,24 +29,29 @@ public class SetContainerContents extends LootItemConditionalFunction {
         this.entries = ImmutableList.copyOf(list);
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        if (ben.isEmpty()) {
-            return ben;
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.SET_CONTENTS;
+    }
+    
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        if (bki.isEmpty()) {
+            return bki;
         }
-        final NonNullList<ItemStack> fy4 = NonNullList.<ItemStack>create();
-        this.entries.forEach(csq -> csq.expand(crx, csp -> csp.createItemStack(LootTable.createStackSplitter(fy4::add), crx)));
-        final CompoundTag jt5 = new CompoundTag();
-        ContainerHelper.saveAllItems(jt5, fy4);
-        final CompoundTag jt6 = ben.getOrCreateTag();
-        jt6.put("BlockEntityTag", jt5.merge(jt6.getCompound("BlockEntityTag")));
-        return ben;
+        final NonNullList<ItemStack> gi4 = NonNullList.<ItemStack>create();
+        this.entries.forEach(dbo -> dbo.expand(dat, dbn -> dbn.createItemStack(LootTable.createStackSplitter(gi4::add), dat)));
+        final CompoundTag le5 = new CompoundTag();
+        ContainerHelper.saveAllItems(le5, gi4);
+        final CompoundTag le6 = bki.getOrCreateTag();
+        le6.put("BlockEntityTag", le5.merge(le6.getCompound("BlockEntityTag")));
+        return bki;
     }
     
     @Override
-    public void validate(final ValidationContext csg) {
-        super.validate(csg);
+    public void validate(final ValidationContext dbe) {
+        super.validate(dbe);
         for (int integer3 = 0; integer3 < this.entries.size(); ++integer3) {
-            this.entries.get(integer3).validate(csg.forChild(".entry[" + integer3 + "]"));
+            this.entries.get(integer3).validate(dbe.forChild(".entry[" + integer3 + "]"));
         }
     }
     
@@ -79,14 +83,10 @@ public class SetContainerContents extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<SetContainerContents> {
-        protected Serializer() {
-            super(new ResourceLocation("set_contents"), SetContainerContents.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final SetContainerContents ctm, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctm, jsonSerializationContext);
-            jsonObject.add("entries", jsonSerializationContext.serialize(ctm.entries));
+        public void serialize(final JsonObject jsonObject, final SetContainerContents dcm, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcm, jsonSerializationContext);
+            jsonObject.add("entries", jsonSerializationContext.serialize(dcm.entries));
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/storage/loot/functions/SetContainerLootTable.java b/src/net/minecraft/world/level/storage/loot/functions/SetContainerLootTable.java
index 3424948..50a908d 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/SetContainerLootTable.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/SetContainerLootTable.java
@@ -17,60 +17,61 @@ public class SetContainerLootTable extends LootItemConditionalFunction {
     private final ResourceLocation name;
     private final long seed;
     
-    private SetContainerLootTable(final LootItemCondition[] arr, final ResourceLocation sm, final long long3) {
+    private SetContainerLootTable(final LootItemCondition[] arr, final ResourceLocation uh, final long long3) {
         super(arr);
-        this.name = sm;
+        this.name = uh;
         this.seed = long3;
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        if (ben.isEmpty()) {
-            return ben;
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.SET_LOOT_TABLE;
+    }
+    
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        if (bki.isEmpty()) {
+            return bki;
         }
-        final CompoundTag jt4 = new CompoundTag();
-        jt4.putString("LootTable", this.name.toString());
+        final CompoundTag le4 = new CompoundTag();
+        le4.putString("LootTable", this.name.toString());
         if (this.seed != 0L) {
-            jt4.putLong("LootTableSeed", this.seed);
+            le4.putLong("LootTableSeed", this.seed);
         }
-        ben.getOrCreateTag().put("BlockEntityTag", jt4);
-        return ben;
+        bki.getOrCreateTag().put("BlockEntityTag", le4);
+        return bki;
     }
     
     @Override
-    public void validate(final ValidationContext csg) {
-        if (csg.hasVisitedTable(this.name)) {
-            csg.reportProblem("Table " + this.name + " is recursively called");
+    public void validate(final ValidationContext dbe) {
+        if (dbe.hasVisitedTable(this.name)) {
+            dbe.reportProblem("Table " + this.name + " is recursively called");
             return;
         }
-        super.validate(csg);
-        final LootTable csa3 = csg.resolveLootTable(this.name);
-        if (csa3 == null) {
-            csg.reportProblem("Unknown loot table called " + this.name);
+        super.validate(dbe);
+        final LootTable daw3 = dbe.resolveLootTable(this.name);
+        if (daw3 == null) {
+            dbe.reportProblem("Unknown loot table called " + this.name);
         }
         else {
-            csa3.validate(csg.enterTable("->{" + this.name + "}", this.name));
+            daw3.validate(dbe.enterTable("->{" + this.name + "}", this.name));
         }
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<SetContainerLootTable> {
-        protected Serializer() {
-            super(new ResourceLocation("set_loot_table"), SetContainerLootTable.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final SetContainerLootTable ctn, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctn, jsonSerializationContext);
-            jsonObject.addProperty("name", ctn.name.toString());
-            if (ctn.seed != 0L) {
-                jsonObject.addProperty("seed", ctn.seed);
+        public void serialize(final JsonObject jsonObject, final SetContainerLootTable dcn, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcn, jsonSerializationContext);
+            jsonObject.addProperty("name", dcn.name.toString());
+            if (dcn.seed != 0L) {
+                jsonObject.addProperty("seed", dcn.seed);
             }
         }
         
         @Override
         public SetContainerLootTable deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
-            final ResourceLocation sm5 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "name"));
+            final ResourceLocation uh5 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "name"));
             final long long6 = GsonHelper.getAsLong(jsonObject, "seed", 0L);
-            return new SetContainerLootTable(arr, sm5, long6, null);
+            return new SetContainerLootTable(arr, uh5, long6, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.java b/src/net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.java
index 4a991e6..2976d62 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/SetItemCountFunction.java
@@ -4,7 +4,6 @@ import com.google.gson.JsonDeserializationContext;
 import net.minecraft.world.level.storage.loot.RandomIntGenerators;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
@@ -13,35 +12,36 @@ import net.minecraft.world.level.storage.loot.RandomIntGenerator;
 public class SetItemCountFunction extends LootItemConditionalFunction {
     private final RandomIntGenerator value;
     
-    private SetItemCountFunction(final LootItemCondition[] arr, final RandomIntGenerator csd) {
+    private SetItemCountFunction(final LootItemCondition[] arr, final RandomIntGenerator daz) {
         super(arr);
-        this.value = csd;
+        this.value = daz;
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        ben.setCount(this.value.getInt(crx.getRandom()));
-        return ben;
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.SET_COUNT;
     }
     
-    public static Builder<?> setCount(final RandomIntGenerator csd) {
-        return LootItemConditionalFunction.simpleBuilder(arr -> new SetItemCountFunction(arr, csd));
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        bki.setCount(this.value.getInt(dat.getRandom()));
+        return bki;
+    }
+    
+    public static Builder<?> setCount(final RandomIntGenerator daz) {
+        return LootItemConditionalFunction.simpleBuilder(arr -> new SetItemCountFunction(arr, daz));
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<SetItemCountFunction> {
-        protected Serializer() {
-            super(new ResourceLocation("set_count"), SetItemCountFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final SetItemCountFunction cto, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, cto, jsonSerializationContext);
-            jsonObject.add("count", RandomIntGenerators.serialize(cto.value, jsonSerializationContext));
+        public void serialize(final JsonObject jsonObject, final SetItemCountFunction dco, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dco, jsonSerializationContext);
+            jsonObject.add("count", RandomIntGenerators.serialize(dco.value, jsonSerializationContext));
         }
         
         @Override
         public SetItemCountFunction deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
-            final RandomIntGenerator csd5 = RandomIntGenerators.deserialize(jsonObject.get("count"), jsonDeserializationContext);
-            return new SetItemCountFunction(arr, csd5, null);
+            final RandomIntGenerator daz5 = RandomIntGenerators.deserialize(jsonObject.get("count"), jsonDeserializationContext);
+            return new SetItemCountFunction(arr, daz5, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.java b/src/net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.java
index 3fec94b..8683c02 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/SetItemDamageFunction.java
@@ -4,7 +4,6 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.storage.loot.LootContext;
@@ -17,24 +16,29 @@ public class SetItemDamageFunction extends LootItemConditionalFunction {
     private static final Logger LOGGER;
     private final RandomValueBounds damage;
     
-    private SetItemDamageFunction(final LootItemCondition[] arr, final RandomValueBounds csf) {
+    private SetItemDamageFunction(final LootItemCondition[] arr, final RandomValueBounds dbb) {
         super(arr);
-        this.damage = csf;
+        this.damage = dbb;
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        if (ben.isDamageableItem()) {
-            final float float4 = 1.0f - this.damage.getFloat(crx.getRandom());
-            ben.setDamageValue(Mth.floor(float4 * ben.getMaxDamage()));
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.SET_DAMAGE;
+    }
+    
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        if (bki.isDamageableItem()) {
+            final float float4 = 1.0f - this.damage.getFloat(dat.getRandom());
+            bki.setDamageValue(Mth.floor(float4 * bki.getMaxDamage()));
         }
         else {
-            SetItemDamageFunction.LOGGER.warn("Couldn't set damage of loot item {}", ben);
+            SetItemDamageFunction.LOGGER.warn("Couldn't set damage of loot item {}", bki);
         }
-        return ben;
+        return bki;
     }
     
-    public static Builder<?> setDamage(final RandomValueBounds csf) {
-        return LootItemConditionalFunction.simpleBuilder(arr -> new SetItemDamageFunction(arr, csf));
+    public static Builder<?> setDamage(final RandomValueBounds dbb) {
+        return LootItemConditionalFunction.simpleBuilder(arr -> new SetItemDamageFunction(arr, dbb));
     }
     
     static {
@@ -42,14 +46,10 @@ public class SetItemDamageFunction extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<SetItemDamageFunction> {
-        protected Serializer() {
-            super(new ResourceLocation("set_damage"), SetItemDamageFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final SetItemDamageFunction ctp, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctp, jsonSerializationContext);
-            jsonObject.add("damage", jsonSerializationContext.serialize(ctp.damage));
+        public void serialize(final JsonObject jsonObject, final SetItemDamageFunction dcp, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcp, jsonSerializationContext);
+            jsonObject.add("damage", jsonSerializationContext.serialize(dcp.damage));
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/storage/loot/functions/SetLoreFunction.java b/src/net/minecraft/world/level/storage/loot/functions/SetLoreFunction.java
index 6e386a2..4f32475 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/SetLoreFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/SetLoreFunction.java
@@ -9,7 +9,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.CompoundTag;
 import java.util.function.UnaryOperator;
@@ -43,74 +42,75 @@ public class SetLoreFunction extends LootItemConditionalFunction {
         this.resolutionContext = c;
     }
     
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.SET_LORE;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return (Set<LootContextParam<?>>)((this.resolutionContext != null) ? ImmutableSet.<LootContextParam<? extends Entity>>of(this.resolutionContext.getParam()) : ImmutableSet.<LootContextParam<? extends Entity>>of());
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        final ListTag jz4 = this.getLoreTag(ben, !this.lore.isEmpty());
-        if (jz4 != null) {
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        final ListTag lk4 = this.getLoreTag(bki, !this.lore.isEmpty());
+        if (lk4 != null) {
             if (this.replace) {
-                jz4.clear();
+                lk4.clear();
             }
-            final UnaryOperator<Component> unaryOperator5 = SetNameFunction.createResolver(crx, this.resolutionContext);
-            this.lore.stream().map(unaryOperator5).map(Component.Serializer::toJson).map(StringTag::valueOf).forEach(jz4::add);
+            final UnaryOperator<Component> unaryOperator5 = SetNameFunction.createResolver(dat, this.resolutionContext);
+            this.lore.stream().map(unaryOperator5).map(Component.Serializer::toJson).map(StringTag::valueOf).forEach(lk4::add);
         }
-        return ben;
+        return bki;
     }
     
     @Nullable
-    private ListTag getLoreTag(final ItemStack ben, final boolean boolean2) {
-        CompoundTag jt4;
-        if (ben.hasTag()) {
-            jt4 = ben.getTag();
+    private ListTag getLoreTag(final ItemStack bki, final boolean boolean2) {
+        CompoundTag le4;
+        if (bki.hasTag()) {
+            le4 = bki.getTag();
         }
         else {
             if (!boolean2) {
                 return null;
             }
-            jt4 = new CompoundTag();
-            ben.setTag(jt4);
+            le4 = new CompoundTag();
+            bki.setTag(le4);
         }
-        CompoundTag jt5;
-        if (jt4.contains("display", 10)) {
-            jt5 = jt4.getCompound("display");
+        CompoundTag le5;
+        if (le4.contains("display", 10)) {
+            le5 = le4.getCompound("display");
         }
         else {
             if (!boolean2) {
                 return null;
             }
-            jt5 = new CompoundTag();
-            jt4.put("display", jt5);
+            le5 = new CompoundTag();
+            le4.put("display", le5);
         }
-        if (jt5.contains("Lore", 9)) {
-            return jt5.getList("Lore", 8);
+        if (le5.contains("Lore", 9)) {
+            return le5.getList("Lore", 8);
         }
         if (boolean2) {
-            final ListTag jz6 = new ListTag();
-            jt5.put("Lore", jz6);
-            return jz6;
+            final ListTag lk6 = new ListTag();
+            le5.put("Lore", lk6);
+            return lk6;
         }
         return null;
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<SetLoreFunction> {
-        public Serializer() {
-            super(new ResourceLocation("set_lore"), SetLoreFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final SetLoreFunction ctq, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctq, jsonSerializationContext);
-            jsonObject.addProperty("replace", ctq.replace);
+        public void serialize(final JsonObject jsonObject, final SetLoreFunction dcq, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcq, jsonSerializationContext);
+            jsonObject.addProperty("replace", dcq.replace);
             final JsonArray jsonArray5 = new JsonArray();
-            for (final Component lf7 : ctq.lore) {
-                jsonArray5.add(Component.Serializer.toJsonTree(lf7));
+            for (final Component mr7 : dcq.lore) {
+                jsonArray5.add(Component.Serializer.toJsonTree(mr7));
             }
             jsonObject.add("lore", jsonArray5);
-            if (ctq.resolutionContext != null) {
-                jsonObject.add("entity", jsonSerializationContext.serialize(ctq.resolutionContext));
+            if (dcq.resolutionContext != null) {
+                jsonObject.add("entity", jsonSerializationContext.serialize(dcq.resolutionContext));
             }
         }
         
diff --git a/src/net/minecraft/world/level/storage/loot/functions/SetNameFunction.java b/src/net/minecraft/world/level/storage/loot/functions/SetNameFunction.java
index 4a4d3b5..f54d8c7 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/SetNameFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/SetNameFunction.java
@@ -4,7 +4,6 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.commands.CommandSourceStack;
@@ -27,43 +26,48 @@ public class SetNameFunction extends LootItemConditionalFunction {
     @Nullable
     private final LootContext.EntityTarget resolutionContext;
     
-    private SetNameFunction(final LootItemCondition[] arr, @Nullable final Component lf, @Nullable final LootContext.EntityTarget c) {
+    private SetNameFunction(final LootItemCondition[] arr, @Nullable final Component mr, @Nullable final LootContext.EntityTarget c) {
         super(arr);
-        this.name = lf;
+        this.name = mr;
         this.resolutionContext = c;
     }
     
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.SET_NAME;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return (Set<LootContextParam<?>>)((this.resolutionContext != null) ? ImmutableSet.<LootContextParam<? extends Entity>>of(this.resolutionContext.getParam()) : ImmutableSet.<LootContextParam<? extends Entity>>of());
     }
     
-    public static UnaryOperator<Component> createResolver(final LootContext crx, @Nullable final LootContext.EntityTarget c) {
+    public static UnaryOperator<Component> createResolver(final LootContext dat, @Nullable final LootContext.EntityTarget c) {
         if (c != null) {
-            final Entity akq3 = crx.<Entity>getParamOrNull(c.getParam());
-            if (akq3 != null) {
-                final CommandSourceStack cq4 = akq3.createCommandSourceStack().withPermission(2);
-                final CommandSourceStack cq5;
-                final Entity akq4;
-                return (UnaryOperator<Component>)(lf -> {
+            final Entity aom3 = dat.<Entity>getParamOrNull(c.getParam());
+            if (aom3 != null) {
+                final CommandSourceStack cz4 = aom3.createCommandSourceStack().withPermission(2);
+                final CommandSourceStack cz5;
+                final Entity aom4;
+                return (UnaryOperator<Component>)(mr -> {
                     try {
-                        return ComponentUtils.updateForEntity(cq5, lf, akq4, 0);
+                        return ComponentUtils.updateForEntity(cz5, mr, aom4, 0);
                     }
                     catch (CommandSyntaxException commandSyntaxException4) {
                         SetNameFunction.LOGGER.warn("Failed to resolve text component", (Throwable)commandSyntaxException4);
-                        return lf;
+                        return mr;
                     }
                 });
             }
         }
-        return (UnaryOperator<Component>)(lf -> lf);
+        return (UnaryOperator<Component>)(mr -> mr);
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
         if (this.name != null) {
-            ben.setHoverName(createResolver(crx, this.resolutionContext).apply(this.name));
+            bki.setHoverName(createResolver(dat, this.resolutionContext).apply(this.name));
         }
-        return ben;
+        return bki;
     }
     
     static {
@@ -71,26 +75,22 @@ public class SetNameFunction extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<SetNameFunction> {
-        public Serializer() {
-            super(new ResourceLocation("set_name"), SetNameFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final SetNameFunction ctr, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctr, jsonSerializationContext);
-            if (ctr.name != null) {
-                jsonObject.add("name", Component.Serializer.toJsonTree(ctr.name));
+        public void serialize(final JsonObject jsonObject, final SetNameFunction dcr, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcr, jsonSerializationContext);
+            if (dcr.name != null) {
+                jsonObject.add("name", Component.Serializer.toJsonTree(dcr.name));
             }
-            if (ctr.resolutionContext != null) {
-                jsonObject.add("entity", jsonSerializationContext.serialize(ctr.resolutionContext));
+            if (dcr.resolutionContext != null) {
+                jsonObject.add("entity", jsonSerializationContext.serialize(dcr.resolutionContext));
             }
         }
         
         @Override
         public SetNameFunction deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
-            final Component lf5 = Component.Serializer.fromJson(jsonObject.get("name"));
+            final Component mr5 = Component.Serializer.fromJson(jsonObject.get("name"));
             final LootContext.EntityTarget c6 = GsonHelper.<LootContext.EntityTarget>getAsObject(jsonObject, "entity", (LootContext.EntityTarget)null, jsonDeserializationContext, LootContext.EntityTarget.class);
-            return new SetNameFunction(arr, lf5, c6, null);
+            return new SetNameFunction(arr, mr5, c6, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/functions/SetNbtFunction.java b/src/net/minecraft/world/level/storage/loot/functions/SetNbtFunction.java
index 19093e3..31d964c 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/SetNbtFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/SetNbtFunction.java
@@ -7,7 +7,6 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
@@ -16,36 +15,37 @@ import net.minecraft.nbt.CompoundTag;
 public class SetNbtFunction extends LootItemConditionalFunction {
     private final CompoundTag tag;
     
-    private SetNbtFunction(final LootItemCondition[] arr, final CompoundTag jt) {
+    private SetNbtFunction(final LootItemCondition[] arr, final CompoundTag le) {
         super(arr);
-        this.tag = jt;
+        this.tag = le;
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        ben.getOrCreateTag().merge(this.tag);
-        return ben;
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.SET_NBT;
     }
     
-    public static Builder<?> setTag(final CompoundTag jt) {
-        return LootItemConditionalFunction.simpleBuilder(arr -> new SetNbtFunction(arr, jt));
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        bki.getOrCreateTag().merge(this.tag);
+        return bki;
+    }
+    
+    public static Builder<?> setTag(final CompoundTag le) {
+        return LootItemConditionalFunction.simpleBuilder(arr -> new SetNbtFunction(arr, le));
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<SetNbtFunction> {
-        public Serializer() {
-            super(new ResourceLocation("set_nbt"), SetNbtFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final SetNbtFunction cts, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, cts, jsonSerializationContext);
-            jsonObject.addProperty("tag", cts.tag.toString());
+        public void serialize(final JsonObject jsonObject, final SetNbtFunction dcs, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dcs, jsonSerializationContext);
+            jsonObject.addProperty("tag", dcs.tag.toString());
         }
         
         @Override
         public SetNbtFunction deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
             try {
-                final CompoundTag jt5 = TagParser.parseTag(GsonHelper.getAsString(jsonObject, "tag"));
-                return new SetNbtFunction(arr, jt5, null);
+                final CompoundTag le5 = TagParser.parseTag(GsonHelper.getAsString(jsonObject, "tag"));
+                return new SetNbtFunction(arr, le5, null);
             }
             catch (CommandSyntaxException commandSyntaxException5) {
                 throw new JsonSyntaxException(commandSyntaxException5.getMessage());
diff --git a/src/net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction.java b/src/net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction.java
index 8bdd1a8..e4d9826 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/SetStewEffectFunction.java
@@ -3,6 +3,7 @@ package net.minecraft.world.level.storage.loot.functions;
 import com.google.gson.JsonSyntaxException;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
+import net.minecraft.resources.ResourceLocation;
 import java.util.Iterator;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
@@ -10,7 +11,6 @@ import net.minecraft.core.Registry;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import com.google.common.collect.Maps;
 import java.util.Random;
 import net.minecraft.world.item.SuspiciousStewItem;
@@ -32,20 +32,25 @@ public class SetStewEffectFunction extends LootItemConditionalFunction {
         this.effectDurationMap = ImmutableMap.copyOf(map);
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        if (ben.getItem() != Items.SUSPICIOUS_STEW || this.effectDurationMap.isEmpty()) {
-            return ben;
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.SET_STEW_EFFECT;
+    }
+    
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        if (bki.getItem() != Items.SUSPICIOUS_STEW || this.effectDurationMap.isEmpty()) {
+            return bki;
         }
-        final Random random4 = crx.getRandom();
+        final Random random4 = dat.getRandom();
         final int integer5 = random4.nextInt(this.effectDurationMap.size());
         final Map.Entry<MobEffect, RandomValueBounds> entry6 = Iterables.<Map.Entry<MobEffect, RandomValueBounds>>get(this.effectDurationMap.entrySet(), integer5);
-        final MobEffect aki7 = entry6.getKey();
+        final MobEffect aoe7 = entry6.getKey();
         int integer6 = entry6.getValue().getInt(random4);
-        if (!aki7.isInstantenous()) {
+        if (!aoe7.isInstantenous()) {
             integer6 *= 20;
         }
-        SuspiciousStewItem.saveMobEffect(ben, aki7, integer6);
-        return ben;
+        SuspiciousStewItem.saveMobEffect(bki, aoe7, integer6);
+        return bki;
     }
     
     public static Builder stewEffect() {
@@ -64,8 +69,8 @@ public class SetStewEffectFunction extends LootItemConditionalFunction {
             return this;
         }
         
-        public Builder withEffect(final MobEffect aki, final RandomValueBounds csf) {
-            this.effectDurationMap.put(aki, csf);
+        public Builder withEffect(final MobEffect aoe, final RandomValueBounds dbb) {
+            this.effectDurationMap.put(aoe, dbb);
             return this;
         }
         
@@ -76,23 +81,19 @@ public class SetStewEffectFunction extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<SetStewEffectFunction> {
-        public Serializer() {
-            super(new ResourceLocation("set_stew_effect"), SetStewEffectFunction.class);
-        }
-        
         @Override
-        public void serialize(final JsonObject jsonObject, final SetStewEffectFunction ctt, final JsonSerializationContext jsonSerializationContext) {
-            super.serialize(jsonObject, ctt, jsonSerializationContext);
-            if (!ctt.effectDurationMap.isEmpty()) {
+        public void serialize(final JsonObject jsonObject, final SetStewEffectFunction dct, final JsonSerializationContext jsonSerializationContext) {
+            super.serialize(jsonObject, dct, jsonSerializationContext);
+            if (!dct.effectDurationMap.isEmpty()) {
                 final JsonArray jsonArray5 = new JsonArray();
-                for (final MobEffect aki7 : ctt.effectDurationMap.keySet()) {
+                for (final MobEffect aoe7 : dct.effectDurationMap.keySet()) {
                     final JsonObject jsonObject2 = new JsonObject();
-                    final ResourceLocation sm9 = Registry.MOB_EFFECT.getKey(aki7);
-                    if (sm9 == null) {
-                        throw new IllegalArgumentException("Don't know how to serialize mob effect " + aki7);
+                    final ResourceLocation uh9 = Registry.MOB_EFFECT.getKey(aoe7);
+                    if (uh9 == null) {
+                        throw new IllegalArgumentException("Don't know how to serialize mob effect " + aoe7);
                     }
-                    jsonObject2.add("type", new JsonPrimitive(sm9.toString()));
-                    jsonObject2.add("duration", jsonSerializationContext.serialize(ctt.effectDurationMap.get(aki7)));
+                    jsonObject2.add("type", new JsonPrimitive(uh9.toString()));
+                    jsonObject2.add("duration", jsonSerializationContext.serialize(dct.effectDurationMap.get(aoe7)));
                     jsonArray5.add(jsonObject2);
                 }
                 jsonObject.add("effects", jsonArray5);
@@ -108,12 +109,12 @@ public class SetStewEffectFunction extends LootItemConditionalFunction {
                     final String string9 = GsonHelper.getAsString(jsonElement8.getAsJsonObject(), "type");
                     final Object o;
                     final String str;
-                    final MobEffect aki10 = Registry.MOB_EFFECT.getOptional(new ResourceLocation(string9)).<Throwable>orElseThrow(() -> {
+                    final MobEffect aoe10 = Registry.MOB_EFFECT.getOptional(new ResourceLocation(string9)).<Throwable>orElseThrow(() -> {
                         new JsonSyntaxException("Unknown mob effect '" + str + "'");
                         return o;
                     });
-                    final RandomValueBounds csf11 = GsonHelper.<RandomValueBounds>getAsObject(jsonElement8.getAsJsonObject(), "duration", jsonDeserializationContext, RandomValueBounds.class);
-                    map5.put(aki10, csf11);
+                    final RandomValueBounds dbb11 = GsonHelper.<RandomValueBounds>getAsObject(jsonElement8.getAsJsonObject(), "duration", jsonDeserializationContext, RandomValueBounds.class);
+                    map5.put(aoe10, dbb11);
                 }
             }
             return new SetStewEffectFunction(arr, map5, null);
diff --git a/src/net/minecraft/world/level/storage/loot/functions/SmeltItemFunction.java b/src/net/minecraft/world/level/storage/loot/functions/SmeltItemFunction.java
index 845fe12..0bd2288 100644
--- a/src/net/minecraft/world/level/storage/loot/functions/SmeltItemFunction.java
+++ b/src/net/minecraft/world/level/storage/loot/functions/SmeltItemFunction.java
@@ -2,7 +2,6 @@ package net.minecraft.world.level.storage.loot.functions;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.LogManager;
 import java.util.function.Function;
 import java.util.Optional;
@@ -22,21 +21,26 @@ public class SmeltItemFunction extends LootItemConditionalFunction {
         super(arr);
     }
     
-    public ItemStack run(final ItemStack ben, final LootContext crx) {
-        if (ben.isEmpty()) {
-            return ben;
+    @Override
+    public LootItemFunctionType getType() {
+        return LootItemFunctions.FURNACE_SMELT;
+    }
+    
+    public ItemStack run(final ItemStack bki, final LootContext dat) {
+        if (bki.isEmpty()) {
+            return bki;
         }
-        final Optional<SmeltingRecipe> optional4 = crx.getLevel().getRecipeManager().<SimpleContainer, SmeltingRecipe>getRecipeFor(RecipeType.SMELTING, new SimpleContainer(new ItemStack[] { ben }), crx.getLevel());
+        final Optional<SmeltingRecipe> optional4 = dat.getLevel().getRecipeManager().<SimpleContainer, SmeltingRecipe>getRecipeFor(RecipeType.SMELTING, new SimpleContainer(new ItemStack[] { bki }), dat.getLevel());
         if (optional4.isPresent()) {
-            final ItemStack ben2 = optional4.get().getResultItem();
-            if (!ben2.isEmpty()) {
-                final ItemStack ben3 = ben2.copy();
-                ben3.setCount(ben.getCount());
-                return ben3;
+            final ItemStack bki2 = optional4.get().getResultItem();
+            if (!bki2.isEmpty()) {
+                final ItemStack bki3 = bki2.copy();
+                bki3.setCount(bki.getCount());
+                return bki3;
             }
         }
-        SmeltItemFunction.LOGGER.warn("Couldn't smelt {} because there is no smelting recipe", ben);
-        return ben;
+        SmeltItemFunction.LOGGER.warn("Couldn't smelt {} because there is no smelting recipe", bki);
+        return bki;
     }
     
     public static Builder<?> smelted() {
@@ -48,10 +52,6 @@ public class SmeltItemFunction extends LootItemConditionalFunction {
     }
     
     public static class Serializer extends LootItemConditionalFunction.Serializer<SmeltItemFunction> {
-        protected Serializer() {
-            super(new ResourceLocation("furnace_smelt"), SmeltItemFunction.class);
-        }
-        
         @Override
         public SmeltItemFunction deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext, final LootItemCondition[] arr) {
             return new SmeltItemFunction(arr, null);
diff --git a/src/net/minecraft/world/level/storage/loot/parameters/LootContextParam.java b/src/net/minecraft/world/level/storage/loot/parameters/LootContextParam.java
index 5542718..bbb479e 100644
--- a/src/net/minecraft/world/level/storage/loot/parameters/LootContextParam.java
+++ b/src/net/minecraft/world/level/storage/loot/parameters/LootContextParam.java
@@ -5,8 +5,8 @@ import net.minecraft.resources.ResourceLocation;
 public class LootContextParam<T> {
     private final ResourceLocation name;
     
-    public LootContextParam(final ResourceLocation sm) {
-        this.name = sm;
+    public LootContextParam(final ResourceLocation uh) {
+        this.name = uh;
     }
     
     public ResourceLocation getName() {
diff --git a/src/net/minecraft/world/level/storage/loot/parameters/LootContextParamSet.java b/src/net/minecraft/world/level/storage/loot/parameters/LootContextParamSet.java
index 352f3a5..2bf6e92 100644
--- a/src/net/minecraft/world/level/storage/loot/parameters/LootContextParamSet.java
+++ b/src/net/minecraft/world/level/storage/loot/parameters/LootContextParamSet.java
@@ -27,14 +27,14 @@ public class LootContextParamSet {
     
     @Override
     public String toString() {
-        return "[" + Joiner.on(", ").join(this.all.stream().map(ctx -> (this.required.contains(ctx) ? "!" : "") + ctx.getName()).iterator()) + "]";
+        return "[" + Joiner.on(", ").join(this.all.stream().map(dcx -> (this.required.contains(dcx) ? "!" : "") + dcx.getName()).iterator()) + "]";
     }
     
-    public void validateUser(final ValidationContext csg, final LootContextUser cry) {
-        final Set<LootContextParam<?>> set4 = cry.getReferencedContextParams();
+    public void validateUser(final ValidationContext dbe, final LootContextUser dau) {
+        final Set<LootContextParam<?>> set4 = dau.getReferencedContextParams();
         final Set<LootContextParam<?>> set5 = Sets.<LootContextParam<?>>difference(set4, this.all);
         if (!set5.isEmpty()) {
-            csg.reportProblem("Parameters " + set5 + " are not provided in this context");
+            dbe.reportProblem("Parameters " + set5 + " are not provided in this context");
         }
     }
     
@@ -47,19 +47,19 @@ public class LootContextParamSet {
             this.optional = Sets.<LootContextParam<?>>newIdentityHashSet();
         }
         
-        public Builder required(final LootContextParam<?> ctx) {
-            if (this.optional.contains(ctx)) {
-                throw new IllegalArgumentException("Parameter " + ctx.getName() + " is already optional");
+        public Builder required(final LootContextParam<?> dcx) {
+            if (this.optional.contains(dcx)) {
+                throw new IllegalArgumentException("Parameter " + dcx.getName() + " is already optional");
             }
-            this.required.add(ctx);
+            this.required.add(dcx);
             return this;
         }
         
-        public Builder optional(final LootContextParam<?> ctx) {
-            if (this.required.contains(ctx)) {
-                throw new IllegalArgumentException("Parameter " + ctx.getName() + " is already required");
+        public Builder optional(final LootContextParam<?> dcx) {
+            if (this.required.contains(dcx)) {
+                throw new IllegalArgumentException("Parameter " + dcx.getName() + " is already required");
             }
-            this.optional.add(ctx);
+            this.optional.add(dcx);
             return this;
         }
         
diff --git a/src/net/minecraft/world/level/storage/loot/parameters/LootContextParamSets.java b/src/net/minecraft/world/level/storage/loot/parameters/LootContextParamSets.java
index c8b531f..e9ebbc5 100644
--- a/src/net/minecraft/world/level/storage/loot/parameters/LootContextParamSets.java
+++ b/src/net/minecraft/world/level/storage/loot/parameters/LootContextParamSets.java
@@ -15,30 +15,32 @@ public class LootContextParamSets {
     public static final LootContextParamSet FISHING;
     public static final LootContextParamSet ENTITY;
     public static final LootContextParamSet GIFT;
+    public static final LootContextParamSet PIGLIN_BARTER;
     public static final LootContextParamSet ADVANCEMENT_REWARD;
+    public static final LootContextParamSet ADVANCEMENT_ENTITY;
     public static final LootContextParamSet ALL_PARAMS;
     public static final LootContextParamSet BLOCK;
     
     private static LootContextParamSet register(final String string, final Consumer<LootContextParamSet.Builder> consumer) {
         final LootContextParamSet.Builder a3 = new LootContextParamSet.Builder();
         consumer.accept(a3);
-        final LootContextParamSet cty4 = a3.build();
-        final ResourceLocation sm5 = new ResourceLocation(string);
-        final LootContextParamSet cty5 = LootContextParamSets.REGISTRY.put(sm5, cty4);
-        if (cty5 != null) {
-            throw new IllegalStateException("Loot table parameter set " + sm5 + " is already registered");
+        final LootContextParamSet dcy4 = a3.build();
+        final ResourceLocation uh5 = new ResourceLocation(string);
+        final LootContextParamSet dcy5 = LootContextParamSets.REGISTRY.put(uh5, dcy4);
+        if (dcy5 != null) {
+            throw new IllegalStateException("Loot table parameter set " + uh5 + " is already registered");
         }
-        return cty4;
+        return dcy4;
     }
     
     @Nullable
-    public static LootContextParamSet get(final ResourceLocation sm) {
-        return LootContextParamSets.REGISTRY.get(sm);
+    public static LootContextParamSet get(final ResourceLocation uh) {
+        return LootContextParamSets.REGISTRY.get(uh);
     }
     
     @Nullable
-    public static ResourceLocation getKey(final LootContextParamSet cty) {
-        return LootContextParamSets.REGISTRY.inverse().get(cty);
+    public static ResourceLocation getKey(final LootContextParamSet dcy) {
+        return LootContextParamSets.REGISTRY.inverse().get(dcy);
     }
     
     static {
@@ -47,10 +49,12 @@ public class LootContextParamSets {
         CHEST = register("chest", a -> a.required(LootContextParams.BLOCK_POS).optional(LootContextParams.THIS_ENTITY));
         COMMAND = register("command", a -> a.required(LootContextParams.BLOCK_POS).optional(LootContextParams.THIS_ENTITY));
         SELECTOR = register("selector", a -> a.required(LootContextParams.BLOCK_POS).required(LootContextParams.THIS_ENTITY));
-        FISHING = register("fishing", a -> a.required(LootContextParams.BLOCK_POS).required(LootContextParams.TOOL));
+        FISHING = register("fishing", a -> a.required(LootContextParams.BLOCK_POS).required(LootContextParams.TOOL).optional(LootContextParams.THIS_ENTITY));
         ENTITY = register("entity", a -> a.required(LootContextParams.THIS_ENTITY).required(LootContextParams.BLOCK_POS).required(LootContextParams.DAMAGE_SOURCE).optional(LootContextParams.KILLER_ENTITY).optional(LootContextParams.DIRECT_KILLER_ENTITY).optional(LootContextParams.LAST_DAMAGE_PLAYER));
         GIFT = register("gift", a -> a.required(LootContextParams.BLOCK_POS).required(LootContextParams.THIS_ENTITY));
+        PIGLIN_BARTER = register("barter", a -> a.required(LootContextParams.THIS_ENTITY));
         ADVANCEMENT_REWARD = register("advancement_reward", a -> a.required(LootContextParams.THIS_ENTITY).required(LootContextParams.BLOCK_POS));
+        ADVANCEMENT_ENTITY = register("advancement_entity", a -> a.required(LootContextParams.THIS_ENTITY).required(LootContextParams.ORIGIN).required(LootContextParams.BLOCK_POS));
         ALL_PARAMS = register("generic", a -> a.required(LootContextParams.THIS_ENTITY).required(LootContextParams.LAST_DAMAGE_PLAYER).required(LootContextParams.DAMAGE_SOURCE).required(LootContextParams.KILLER_ENTITY).required(LootContextParams.DIRECT_KILLER_ENTITY).required(LootContextParams.BLOCK_POS).required(LootContextParams.BLOCK_STATE).required(LootContextParams.BLOCK_ENTITY).required(LootContextParams.TOOL).required(LootContextParams.EXPLOSION_RADIUS));
         BLOCK = register("block", a -> a.required(LootContextParams.BLOCK_STATE).required(LootContextParams.BLOCK_POS).required(LootContextParams.TOOL).optional(LootContextParams.THIS_ENTITY).optional(LootContextParams.BLOCK_ENTITY).optional(LootContextParams.EXPLOSION_RADIUS));
     }
diff --git a/src/net/minecraft/world/level/storage/loot/parameters/LootContextParams.java b/src/net/minecraft/world/level/storage/loot/parameters/LootContextParams.java
index d57de33..d3ea759 100644
--- a/src/net/minecraft/world/level/storage/loot/parameters/LootContextParams.java
+++ b/src/net/minecraft/world/level/storage/loot/parameters/LootContextParams.java
@@ -4,6 +4,7 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.player.Player;
@@ -16,6 +17,7 @@ public class LootContextParams {
     public static final LootContextParam<Entity> KILLER_ENTITY;
     public static final LootContextParam<Entity> DIRECT_KILLER_ENTITY;
     public static final LootContextParam<BlockPos> BLOCK_POS;
+    public static final LootContextParam<Vec3> ORIGIN;
     public static final LootContextParam<BlockState> BLOCK_STATE;
     public static final LootContextParam<BlockEntity> BLOCK_ENTITY;
     public static final LootContextParam<ItemStack> TOOL;
@@ -32,6 +34,7 @@ public class LootContextParams {
         KILLER_ENTITY = LootContextParams.<Entity>create("killer_entity");
         DIRECT_KILLER_ENTITY = LootContextParams.<Entity>create("direct_killer_entity");
         BLOCK_POS = LootContextParams.<BlockPos>create("position");
+        ORIGIN = LootContextParams.<Vec3>create("origin");
         BLOCK_STATE = LootContextParams.<BlockState>create("block_state");
         BLOCK_ENTITY = LootContextParams.<BlockEntity>create("block_entity");
         TOOL = LootContextParams.<ItemStack>create("tool");
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition.java
index 2c8931e..a3ff1e1 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/AlternativeLootItemCondition.java
@@ -4,7 +4,7 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import com.google.common.collect.Lists;
 import java.util.List;
 import net.minecraft.world.level.storage.loot.ValidationContext;
@@ -21,15 +21,20 @@ public class AlternativeLootItemCondition implements LootItemCondition {
     }
     
     @Override
-    public final boolean test(final LootContext crx) {
-        return this.composedPredicate.test(crx);
+    public LootItemConditionType getType() {
+        return LootItemConditions.ALTERNATIVE;
     }
     
     @Override
-    public void validate(final ValidationContext csg) {
-        super.validate(csg);
+    public final boolean test(final LootContext dat) {
+        return this.composedPredicate.test(dat);
+    }
+    
+    @Override
+    public void validate(final ValidationContext dbe) {
+        super.validate(dbe);
         for (int integer3 = 0; integer3 < this.terms.length; ++integer3) {
-            this.terms[integer3].validate(csg.forChild(".term[" + integer3 + "]"));
+            this.terms[integer3].validate(dbe.forChild(".term[" + integer3 + "]"));
         }
     }
     
@@ -59,14 +64,10 @@ public class AlternativeLootItemCondition implements LootItemCondition {
         }
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<AlternativeLootItemCondition> {
-        public Serializer() {
-            super(new ResourceLocation("alternative"), AlternativeLootItemCondition.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<AlternativeLootItemCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final AlternativeLootItemCondition cuc, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.add("terms", jsonSerializationContext.serialize(cuc.terms));
+        public void serialize(final JsonObject jsonObject, final AlternativeLootItemCondition ddc, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.add("terms", jsonSerializationContext.serialize(ddc.terms));
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/BonusLevelTableCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/BonusLevelTableCondition.java
index e35e34e..809279c 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/BonusLevelTableCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/BonusLevelTableCondition.java
@@ -1,12 +1,13 @@
 package net.minecraft.world.level.storage.loot.predicates;
 
 import com.google.gson.JsonParseException;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import net.minecraft.core.Registry;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
@@ -20,50 +21,51 @@ public class BonusLevelTableCondition implements LootItemCondition {
     private final Enchantment enchantment;
     private final float[] values;
     
-    private BonusLevelTableCondition(final Enchantment bhx, final float[] arr) {
-        this.enchantment = bhx;
+    private BonusLevelTableCondition(final Enchantment bnw, final float[] arr) {
+        this.enchantment = bnw;
         this.values = arr;
     }
     
+    @Override
+    public LootItemConditionType getType() {
+        return LootItemConditions.TABLE_BONUS;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(LootContextParams.TOOL);
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final ItemStack ben3 = crx.<ItemStack>getParamOrNull(LootContextParams.TOOL);
-        final int integer4 = (ben3 != null) ? EnchantmentHelper.getItemEnchantmentLevel(this.enchantment, ben3) : 0;
+    public boolean test(final LootContext dat) {
+        final ItemStack bki3 = dat.<ItemStack>getParamOrNull(LootContextParams.TOOL);
+        final int integer4 = (bki3 != null) ? EnchantmentHelper.getItemEnchantmentLevel(this.enchantment, bki3) : 0;
         final float float5 = this.values[Math.min(integer4, this.values.length - 1)];
-        return crx.getRandom().nextFloat() < float5;
+        return dat.getRandom().nextFloat() < float5;
     }
     
-    public static Builder bonusLevelFlatChance(final Enchantment bhx, final float... arr) {
-        return () -> new BonusLevelTableCondition(bhx, arr);
+    public static Builder bonusLevelFlatChance(final Enchantment bnw, final float... arr) {
+        return () -> new BonusLevelTableCondition(bnw, arr);
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<BonusLevelTableCondition> {
-        public Serializer() {
-            super(new ResourceLocation("table_bonus"), BonusLevelTableCondition.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<BonusLevelTableCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final BonusLevelTableCondition cud, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.addProperty("enchantment", Registry.ENCHANTMENT.getKey(cud.enchantment).toString());
-            jsonObject.add("chances", jsonSerializationContext.serialize(cud.values));
+        public void serialize(final JsonObject jsonObject, final BonusLevelTableCondition ddd, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.addProperty("enchantment", Registry.ENCHANTMENT.getKey(ddd.enchantment).toString());
+            jsonObject.add("chances", jsonSerializationContext.serialize(ddd.values));
         }
         
         @Override
         public BonusLevelTableCondition deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-            final ResourceLocation sm4 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "enchantment"));
+            final ResourceLocation uh4 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "enchantment"));
             final Object o;
             final Object obj;
-            final Enchantment bhx5 = Registry.ENCHANTMENT.getOptional(sm4).<Throwable>orElseThrow(() -> {
+            final Enchantment bnw5 = Registry.ENCHANTMENT.getOptional(uh4).<Throwable>orElseThrow(() -> {
                 new JsonParseException("Invalid enchantment id: " + obj);
                 return o;
             });
             final float[] arr6 = GsonHelper.<float[]>getAsObject(jsonObject, "chances", jsonDeserializationContext, float[].class);
-            return new BonusLevelTableCondition(bhx5, arr6, null);
+            return new BonusLevelTableCondition(bnw5, arr6, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/ConditionReference.java b/src/net/minecraft/world/level/storage/loot/predicates/ConditionReference.java
index 75058de..d48be94 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/ConditionReference.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/ConditionReference.java
@@ -4,6 +4,7 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
+import net.minecraft.world.level.storage.loot.Serializer;
 import org.apache.logging.log4j.LogManager;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.ValidationContext;
@@ -14,35 +15,40 @@ public class ConditionReference implements LootItemCondition {
     private static final Logger LOGGER;
     private final ResourceLocation name;
     
-    public ConditionReference(final ResourceLocation sm) {
-        this.name = sm;
+    private ConditionReference(final ResourceLocation uh) {
+        this.name = uh;
     }
     
     @Override
-    public void validate(final ValidationContext csg) {
-        if (csg.hasVisitedCondition(this.name)) {
-            csg.reportProblem("Condition " + this.name + " is recursively called");
+    public LootItemConditionType getType() {
+        return LootItemConditions.REFERENCE;
+    }
+    
+    @Override
+    public void validate(final ValidationContext dbe) {
+        if (dbe.hasVisitedCondition(this.name)) {
+            dbe.reportProblem("Condition " + this.name + " is recursively called");
             return;
         }
-        super.validate(csg);
-        final LootItemCondition cum3 = csg.resolveCondition(this.name);
-        if (cum3 == null) {
-            csg.reportProblem("Unknown condition table called " + this.name);
+        super.validate(dbe);
+        final LootItemCondition ddm3 = dbe.resolveCondition(this.name);
+        if (ddm3 == null) {
+            dbe.reportProblem("Unknown condition table called " + this.name);
         }
         else {
-            cum3.validate(csg.enterTable(".{" + this.name + "}", this.name));
+            ddm3.validate(dbe.enterTable(".{" + this.name + "}", this.name));
         }
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final LootItemCondition cum3 = crx.getCondition(this.name);
-        if (crx.addVisitedCondition(cum3)) {
+    public boolean test(final LootContext dat) {
+        final LootItemCondition ddm3 = dat.getCondition(this.name);
+        if (dat.addVisitedCondition(ddm3)) {
             try {
-                return cum3.test(crx);
+                return ddm3.test(dat);
             }
             finally {
-                crx.removeVisitedCondition(cum3);
+                dat.removeVisitedCondition(ddm3);
             }
         }
         ConditionReference.LOGGER.warn("Detected infinite loop in loot tables");
@@ -53,20 +59,16 @@ public class ConditionReference implements LootItemCondition {
         LOGGER = LogManager.getLogger();
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<ConditionReference> {
-        protected Serializer() {
-            super(new ResourceLocation("reference"), ConditionReference.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<ConditionReference> {
         @Override
-        public void serialize(final JsonObject jsonObject, final ConditionReference cue, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.addProperty("name", cue.name.toString());
+        public void serialize(final JsonObject jsonObject, final ConditionReference dde, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.addProperty("name", dde.name.toString());
         }
         
         @Override
         public ConditionReference deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-            final ResourceLocation sm4 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "name"));
-            return new ConditionReference(sm4);
+            final ResourceLocation uh4 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "name"));
+            return new ConditionReference(uh4, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/DamageSourceCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/DamageSourceCondition.java
index f0fe022..d042711 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/DamageSourceCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/DamageSourceCondition.java
@@ -3,7 +3,7 @@ package net.minecraft.world.level.storage.loot.predicates;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.damagesource.DamageSource;
@@ -18,8 +18,13 @@ import net.minecraft.advancements.critereon.DamageSourcePredicate;
 public class DamageSourceCondition implements LootItemCondition {
     private final DamageSourcePredicate predicate;
     
-    private DamageSourceCondition(final DamageSourcePredicate as) {
-        this.predicate = as;
+    private DamageSourceCondition(final DamageSourcePredicate au) {
+        this.predicate = au;
+    }
+    
+    @Override
+    public LootItemConditionType getType() {
+        return LootItemConditions.DAMAGE_SOURCE_PROPERTIES;
     }
     
     @Override
@@ -28,30 +33,26 @@ public class DamageSourceCondition implements LootItemCondition {
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final DamageSource ajz3 = crx.<DamageSource>getParamOrNull(LootContextParams.DAMAGE_SOURCE);
-        final BlockPos fk4 = crx.<BlockPos>getParamOrNull(LootContextParams.BLOCK_POS);
-        return fk4 != null && ajz3 != null && this.predicate.matches(crx.getLevel(), new Vec3(fk4), ajz3);
+    public boolean test(final LootContext dat) {
+        final DamageSource anw3 = dat.<DamageSource>getParamOrNull(LootContextParams.DAMAGE_SOURCE);
+        final BlockPos fu4 = dat.<BlockPos>getParamOrNull(LootContextParams.BLOCK_POS);
+        return fu4 != null && anw3 != null && this.predicate.matches(dat.getLevel(), Vec3.atLowerCornerOf(fu4), anw3);
     }
     
     public static Builder hasDamageSource(final DamageSourcePredicate.Builder a) {
         return () -> new DamageSourceCondition(a.build());
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<DamageSourceCondition> {
-        protected Serializer() {
-            super(new ResourceLocation("damage_source_properties"), DamageSourceCondition.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<DamageSourceCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final DamageSourceCondition cug, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.add("predicate", cug.predicate.serializeToJson());
+        public void serialize(final JsonObject jsonObject, final DamageSourceCondition ddg, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.add("predicate", ddg.predicate.serializeToJson());
         }
         
         @Override
         public DamageSourceCondition deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-            final DamageSourcePredicate as4 = DamageSourcePredicate.fromJson(jsonObject.get("predicate"));
-            return new DamageSourceCondition(as4, null);
+            final DamageSourcePredicate au4 = DamageSourcePredicate.fromJson(jsonObject.get("predicate"));
+            return new DamageSourceCondition(au4, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/EntityHasScoreCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/EntityHasScoreCondition.java
index a53c5f9..1358bd6 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/EntityHasScoreCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/EntityHasScoreCondition.java
@@ -6,7 +6,7 @@ import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.scores.Objective;
 import java.util.Iterator;
 import net.minecraft.world.scores.Scoreboard;
@@ -28,48 +28,49 @@ public class EntityHasScoreCondition implements LootItemCondition {
         this.entityTarget = c;
     }
     
+    @Override
+    public LootItemConditionType getType() {
+        return LootItemConditions.ENTITY_SCORES;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(this.entityTarget.getParam());
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final Entity akq3 = crx.<Entity>getParamOrNull(this.entityTarget.getParam());
-        if (akq3 == null) {
+    public boolean test(final LootContext dat) {
+        final Entity aom3 = dat.<Entity>getParamOrNull(this.entityTarget.getParam());
+        if (aom3 == null) {
             return false;
         }
-        final Scoreboard cwl4 = akq3.level.getScoreboard();
+        final Scoreboard dfm4 = aom3.level.getScoreboard();
         for (final Map.Entry<String, RandomValueBounds> entry6 : this.scores.entrySet()) {
-            if (!this.hasScore(akq3, cwl4, entry6.getKey(), entry6.getValue())) {
+            if (!this.hasScore(aom3, dfm4, entry6.getKey(), entry6.getValue())) {
                 return false;
             }
         }
         return true;
     }
     
-    protected boolean hasScore(final Entity akq, final Scoreboard cwl, final String string, final RandomValueBounds csf) {
-        final Objective cwi6 = cwl.getObjective(string);
-        if (cwi6 == null) {
+    protected boolean hasScore(final Entity aom, final Scoreboard dfm, final String string, final RandomValueBounds dbb) {
+        final Objective dfj6 = dfm.getObjective(string);
+        if (dfj6 == null) {
             return false;
         }
-        final String string2 = akq.getScoreboardName();
-        return cwl.hasPlayerScore(string2, cwi6) && csf.matchesValue(cwl.getOrCreatePlayerScore(string2, cwi6).getScore());
+        final String string2 = aom.getScoreboardName();
+        return dfm.hasPlayerScore(string2, dfj6) && dbb.matchesValue(dfm.getOrCreatePlayerScore(string2, dfj6).getScore());
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<EntityHasScoreCondition> {
-        protected Serializer() {
-            super(new ResourceLocation("entity_scores"), EntityHasScoreCondition.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<EntityHasScoreCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final EntityHasScoreCondition cuh, final JsonSerializationContext jsonSerializationContext) {
+        public void serialize(final JsonObject jsonObject, final EntityHasScoreCondition ddh, final JsonSerializationContext jsonSerializationContext) {
             final JsonObject jsonObject2 = new JsonObject();
-            for (final Map.Entry<String, RandomValueBounds> entry7 : cuh.scores.entrySet()) {
+            for (final Map.Entry<String, RandomValueBounds> entry7 : ddh.scores.entrySet()) {
                 jsonObject2.add(entry7.getKey(), jsonSerializationContext.serialize(entry7.getValue()));
             }
             jsonObject.add("scores", jsonObject2);
-            jsonObject.add("entity", jsonSerializationContext.serialize(cuh.entityTarget));
+            jsonObject.add("entity", jsonSerializationContext.serialize(ddh.entityTarget));
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/ExplosionCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/ExplosionCondition.java
index 5d13426..0453ccb 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/ExplosionCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/ExplosionCondition.java
@@ -3,7 +3,7 @@ package net.minecraft.world.level.storage.loot.predicates;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import java.util.Random;
 import net.minecraft.world.level.storage.loot.LootContext;
 import com.google.common.collect.ImmutableSet;
@@ -17,16 +17,21 @@ public class ExplosionCondition implements LootItemCondition {
     private ExplosionCondition() {
     }
     
+    @Override
+    public LootItemConditionType getType() {
+        return LootItemConditions.SURVIVES_EXPLOSION;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(LootContextParams.EXPLOSION_RADIUS);
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final Float float3 = crx.<Float>getParamOrNull(LootContextParams.EXPLOSION_RADIUS);
+    public boolean test(final LootContext dat) {
+        final Float float3 = dat.<Float>getParamOrNull(LootContextParams.EXPLOSION_RADIUS);
         if (float3 != null) {
-            final Random random4 = crx.getRandom();
+            final Random random4 = dat.getRandom();
             final float float4 = 1.0f / float3;
             return random4.nextFloat() <= float4;
         }
@@ -41,13 +46,9 @@ public class ExplosionCondition implements LootItemCondition {
         INSTANCE = new ExplosionCondition();
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<ExplosionCondition> {
-        protected Serializer() {
-            super(new ResourceLocation("survives_explosion"), ExplosionCondition.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<ExplosionCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final ExplosionCondition cui, final JsonSerializationContext jsonSerializationContext) {
+        public void serialize(final JsonObject jsonObject, final ExplosionCondition ddi, final JsonSerializationContext jsonSerializationContext) {
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/InvertedLootItemCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/InvertedLootItemCondition.java
index 4e9a70d..4e6ff71 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/InvertedLootItemCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/InvertedLootItemCondition.java
@@ -4,7 +4,7 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.level.storage.loot.ValidationContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParam;
 import java.util.Set;
@@ -13,13 +13,18 @@ import net.minecraft.world.level.storage.loot.LootContext;
 public class InvertedLootItemCondition implements LootItemCondition {
     private final LootItemCondition term;
     
-    private InvertedLootItemCondition(final LootItemCondition cum) {
-        this.term = cum;
+    private InvertedLootItemCondition(final LootItemCondition ddm) {
+        this.term = ddm;
     }
     
     @Override
-    public final boolean test(final LootContext crx) {
-        return !this.term.test(crx);
+    public LootItemConditionType getType() {
+        return LootItemConditions.INVERTED;
+    }
+    
+    @Override
+    public final boolean test(final LootContext dat) {
+        return !this.term.test(dat);
     }
     
     @Override
@@ -28,30 +33,26 @@ public class InvertedLootItemCondition implements LootItemCondition {
     }
     
     @Override
-    public void validate(final ValidationContext csg) {
-        super.validate(csg);
-        this.term.validate(csg);
+    public void validate(final ValidationContext dbe) {
+        super.validate(dbe);
+        this.term.validate(dbe);
     }
     
     public static Builder invert(final Builder a) {
-        final InvertedLootItemCondition cuj2 = new InvertedLootItemCondition(a.build());
-        return () -> cuj2;
+        final InvertedLootItemCondition ddj2 = new InvertedLootItemCondition(a.build());
+        return () -> ddj2;
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<InvertedLootItemCondition> {
-        public Serializer() {
-            super(new ResourceLocation("inverted"), InvertedLootItemCondition.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<InvertedLootItemCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final InvertedLootItemCondition cuj, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.add("term", jsonSerializationContext.serialize(cuj.term));
+        public void serialize(final JsonObject jsonObject, final InvertedLootItemCondition ddj, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.add("term", jsonSerializationContext.serialize(ddj.term));
         }
         
         @Override
         public InvertedLootItemCondition deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-            final LootItemCondition cum4 = GsonHelper.<LootItemCondition>getAsObject(jsonObject, "term", jsonDeserializationContext, LootItemCondition.class);
-            return new InvertedLootItemCondition(cum4, null);
+            final LootItemCondition ddm4 = GsonHelper.<LootItemCondition>getAsObject(jsonObject, "term", jsonDeserializationContext, LootItemCondition.class);
+            return new InvertedLootItemCondition(ddm4, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/LocationCheck.java b/src/net/minecraft/world/level/storage/loot/predicates/LocationCheck.java
index e37a478..df27df5 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/LocationCheck.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/LocationCheck.java
@@ -4,7 +4,7 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.core.BlockPos;
@@ -14,47 +14,52 @@ public class LocationCheck implements LootItemCondition {
     private final LocationPredicate predicate;
     private final BlockPos offset;
     
-    public LocationCheck(final LocationPredicate bp, final BlockPos fk) {
-        this.predicate = bp;
-        this.offset = fk;
+    private LocationCheck(final LocationPredicate bu, final BlockPos fu) {
+        this.predicate = bu;
+        this.offset = fu;
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final BlockPos fk3 = crx.<BlockPos>getParamOrNull(LootContextParams.BLOCK_POS);
-        return fk3 != null && this.predicate.matches(crx.getLevel(), (float)(fk3.getX() + this.offset.getX()), (float)(fk3.getY() + this.offset.getY()), (float)(fk3.getZ() + this.offset.getZ()));
+    public LootItemConditionType getType() {
+        return LootItemConditions.LOCATION_CHECK;
+    }
+    
+    @Override
+    public boolean test(final LootContext dat) {
+        final BlockPos fu3 = dat.<BlockPos>getParamOrNull(LootContextParams.BLOCK_POS);
+        return fu3 != null && this.predicate.matches(dat.getLevel(), (float)(fu3.getX() + this.offset.getX()), (float)(fu3.getY() + this.offset.getY()), (float)(fu3.getZ() + this.offset.getZ()));
     }
     
     public static Builder checkLocation(final LocationPredicate.Builder a) {
         return () -> new LocationCheck(a.build(), BlockPos.ZERO);
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<LocationCheck> {
-        public Serializer() {
-            super(new ResourceLocation("location_check"), LocationCheck.class);
-        }
-        
+    public static Builder checkLocation(final LocationPredicate.Builder a, final BlockPos fu) {
+        return () -> new LocationCheck(a.build(), fu);
+    }
+    
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<LocationCheck> {
         @Override
-        public void serialize(final JsonObject jsonObject, final LocationCheck cuk, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.add("predicate", cuk.predicate.serializeToJson());
-            if (cuk.offset.getX() != 0) {
-                jsonObject.addProperty("offsetX", cuk.offset.getX());
+        public void serialize(final JsonObject jsonObject, final LocationCheck ddk, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.add("predicate", ddk.predicate.serializeToJson());
+            if (ddk.offset.getX() != 0) {
+                jsonObject.addProperty("offsetX", ddk.offset.getX());
             }
-            if (cuk.offset.getY() != 0) {
-                jsonObject.addProperty("offsetY", cuk.offset.getY());
+            if (ddk.offset.getY() != 0) {
+                jsonObject.addProperty("offsetY", ddk.offset.getY());
             }
-            if (cuk.offset.getZ() != 0) {
-                jsonObject.addProperty("offsetZ", cuk.offset.getZ());
+            if (ddk.offset.getZ() != 0) {
+                jsonObject.addProperty("offsetZ", ddk.offset.getZ());
             }
         }
         
         @Override
         public LocationCheck deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-            final LocationPredicate bp4 = LocationPredicate.fromJson(jsonObject.get("predicate"));
+            final LocationPredicate bu4 = LocationPredicate.fromJson(jsonObject.get("predicate"));
             final int integer5 = GsonHelper.getAsInt(jsonObject, "offsetX", 0);
             final int integer6 = GsonHelper.getAsInt(jsonObject, "offsetY", 0);
             final int integer7 = GsonHelper.getAsInt(jsonObject, "offsetZ", 0);
-            return new LocationCheck(bp4, new BlockPos(integer5, integer6, integer7));
+            return new LocationCheck(bu4, new BlockPos(integer5, integer6, integer7), null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/LootItemBlockStatePropertyCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/LootItemBlockStatePropertyCondition.java
index cb6f9f9..202136e 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/LootItemBlockStatePropertyCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/LootItemBlockStatePropertyCondition.java
@@ -2,12 +2,13 @@ package net.minecraft.world.level.storage.loot.predicates;
 
 import net.minecraft.world.level.block.state.StateDefinition;
 import com.google.gson.JsonSyntaxException;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import net.minecraft.core.Registry;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.block.state.BlockState;
 import com.google.common.collect.ImmutableSet;
@@ -21,9 +22,14 @@ public class LootItemBlockStatePropertyCondition implements LootItemCondition {
     private final Block block;
     private final StatePropertiesPredicate properties;
     
-    private LootItemBlockStatePropertyCondition(final Block bph, final StatePropertiesPredicate cc) {
-        this.block = bph;
-        this.properties = cc;
+    private LootItemBlockStatePropertyCondition(final Block bvr, final StatePropertiesPredicate ck) {
+        this.block = bvr;
+        this.properties = ck;
+    }
+    
+    @Override
+    public LootItemConditionType getType() {
+        return LootItemConditions.BLOCK_STATE_PROPERTY;
     }
     
     @Override
@@ -32,22 +38,22 @@ public class LootItemBlockStatePropertyCondition implements LootItemCondition {
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final BlockState byj3 = crx.<BlockState>getParamOrNull(LootContextParams.BLOCK_STATE);
-        return byj3 != null && this.block == byj3.getBlock() && this.properties.matches(byj3);
+    public boolean test(final LootContext dat) {
+        final BlockState cfj3 = dat.<BlockState>getParamOrNull(LootContextParams.BLOCK_STATE);
+        return cfj3 != null && this.block == cfj3.getBlock() && this.properties.matches(cfj3);
     }
     
-    public static Builder hasBlockStateProperties(final Block bph) {
-        return new Builder(bph);
+    public static Builder hasBlockStateProperties(final Block bvr) {
+        return new Builder(bvr);
     }
     
     public static class Builder implements LootItemCondition.Builder {
         private final Block block;
         private StatePropertiesPredicate properties;
         
-        public Builder(final Block bph) {
+        public Builder(final Block bvr) {
             this.properties = StatePropertiesPredicate.ANY;
-            this.block = bph;
+            this.block = bvr;
         }
         
         public Builder setProperties(final StatePropertiesPredicate.Builder a) {
@@ -61,34 +67,30 @@ public class LootItemBlockStatePropertyCondition implements LootItemCondition {
         }
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<LootItemBlockStatePropertyCondition> {
-        protected Serializer() {
-            super(new ResourceLocation("block_state_property"), LootItemBlockStatePropertyCondition.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<LootItemBlockStatePropertyCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final LootItemBlockStatePropertyCondition cul, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.addProperty("block", Registry.BLOCK.getKey(cul.block).toString());
-            jsonObject.add("properties", cul.properties.serializeToJson());
+        public void serialize(final JsonObject jsonObject, final LootItemBlockStatePropertyCondition ddl, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.addProperty("block", Registry.BLOCK.getKey(ddl.block).toString());
+            jsonObject.add("properties", ddl.properties.serializeToJson());
         }
         
         @Override
         public LootItemBlockStatePropertyCondition deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-            final ResourceLocation sm4 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
+            final ResourceLocation uh4 = new ResourceLocation(GsonHelper.getAsString(jsonObject, "block"));
             final Object o;
             final Object obj;
-            final Block bph5 = Registry.BLOCK.getOptional(sm4).<Throwable>orElseThrow(() -> {
+            final Block bvr5 = Registry.BLOCK.getOptional(uh4).<Throwable>orElseThrow(() -> {
                 new IllegalArgumentException("Can't find block " + obj);
                 return o;
             });
-            final StatePropertiesPredicate cc6 = StatePropertiesPredicate.fromJson(jsonObject.get("properties"));
+            final StatePropertiesPredicate ck6 = StatePropertiesPredicate.fromJson(jsonObject.get("properties"));
             final JsonSyntaxException ex;
             final Object obj2;
-            cc6.checkState(bph5.getStateDefinition(), string -> {
+            ck6.checkState(bvr5.getStateDefinition(), string -> {
                 new JsonSyntaxException("Block " + obj2 + " has no property " + string);
                 throw ex;
             });
-            return new LootItemBlockStatePropertyCondition(bph5, cc6, null);
+            return new LootItemBlockStatePropertyCondition(bvr5, ck6, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/LootItemCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/LootItemCondition.java
index c93c657..bc07218 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/LootItemCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/LootItemCondition.java
@@ -1,15 +1,12 @@
 package net.minecraft.world.level.storage.loot.predicates;
 
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.storage.loot.LootContext;
 import java.util.function.Predicate;
 import net.minecraft.world.level.storage.loot.LootContextUser;
 
-@FunctionalInterface
 public interface LootItemCondition extends LootContextUser, Predicate<LootContext> {
+    LootItemConditionType getType();
+    
     @FunctionalInterface
     public interface Builder {
         LootItemCondition build();
@@ -22,26 +19,4 @@ public interface LootItemCondition extends LootContextUser, Predicate<LootContex
             return AlternativeLootItemCondition.alternative(this, a);
         }
     }
-    
-    public abstract static class Serializer<T extends LootItemCondition> {
-        private final ResourceLocation name;
-        private final Class<T> clazz;
-        
-        protected Serializer(final ResourceLocation sm, final Class<T> class2) {
-            this.name = sm;
-            this.clazz = class2;
-        }
-        
-        public ResourceLocation getName() {
-            return this.name;
-        }
-        
-        public Class<T> getPredicateClass() {
-            return this.clazz;
-        }
-        
-        public abstract void serialize(final JsonObject jsonObject, final T cum, final JsonSerializationContext jsonSerializationContext);
-        
-        public abstract T deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext);
-    }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/LootItemConditionType.java b/src/net/minecraft/world/level/storage/loot/predicates/LootItemConditionType.java
new file mode 100644
index 0000000..234fadf
--- /dev/null
+++ b/src/net/minecraft/world/level/storage/loot/predicates/LootItemConditionType.java
@@ -0,0 +1,10 @@
+package net.minecraft.world.level.storage.loot.predicates;
+
+import net.minecraft.world.level.storage.loot.Serializer;
+import net.minecraft.world.level.storage.loot.SerializerType;
+
+public class LootItemConditionType extends SerializerType<LootItemCondition> {
+    public LootItemConditionType(final Serializer<? extends LootItemCondition> dbc) {
+        super(dbc);
+    }
+}
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/LootItemConditions.java b/src/net/minecraft/world/level/storage/loot/predicates/LootItemConditions.java
index a0990d3..6b1f432 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/LootItemConditions.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/LootItemConditions.java
@@ -1,51 +1,35 @@
 package net.minecraft.world.level.storage.loot.predicates;
 
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import net.minecraft.util.GsonHelper;
-import com.google.gson.JsonDeserializationContext;
-import java.lang.reflect.Type;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonSerializer;
-import com.google.gson.JsonDeserializer;
-import com.google.common.collect.Maps;
 import java.util.function.Predicate;
+import net.minecraft.world.level.storage.loot.GsonAdapterFactory;
 import net.minecraft.resources.ResourceLocation;
-import java.util.Map;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.storage.loot.Serializer;
 
 public class LootItemConditions {
-    private static final Map<ResourceLocation, LootItemCondition.Serializer<?>> CONDITIONS_BY_NAME;
-    private static final Map<Class<? extends LootItemCondition>, LootItemCondition.Serializer<?>> CONDITIONS_BY_CLASS;
+    public static final LootItemConditionType INVERTED;
+    public static final LootItemConditionType ALTERNATIVE;
+    public static final LootItemConditionType RANDOM_CHANCE;
+    public static final LootItemConditionType RANDOM_CHANCE_WITH_LOOTING;
+    public static final LootItemConditionType ENTITY_PROPERTIES;
+    public static final LootItemConditionType KILLED_BY_PLAYER;
+    public static final LootItemConditionType ENTITY_SCORES;
+    public static final LootItemConditionType BLOCK_STATE_PROPERTY;
+    public static final LootItemConditionType MATCH_TOOL;
+    public static final LootItemConditionType TABLE_BONUS;
+    public static final LootItemConditionType SURVIVES_EXPLOSION;
+    public static final LootItemConditionType DAMAGE_SOURCE_PROPERTIES;
+    public static final LootItemConditionType LOCATION_CHECK;
+    public static final LootItemConditionType WEATHER_CHECK;
+    public static final LootItemConditionType REFERENCE;
+    public static final LootItemConditionType TIME_CHECK;
     
-    public static <T extends LootItemCondition> void register(final LootItemCondition.Serializer<? extends T> b) {
-        final ResourceLocation sm2 = b.getName();
-        final Class<T> class3 = (Class<T>)b.getPredicateClass();
-        if (LootItemConditions.CONDITIONS_BY_NAME.containsKey(sm2)) {
-            throw new IllegalArgumentException("Can't re-register item condition name " + sm2);
-        }
-        if (LootItemConditions.CONDITIONS_BY_CLASS.containsKey(class3)) {
-            throw new IllegalArgumentException("Can't re-register item condition class " + class3.getName());
-        }
-        LootItemConditions.CONDITIONS_BY_NAME.put(sm2, b);
-        LootItemConditions.CONDITIONS_BY_CLASS.put(class3, b);
+    private static LootItemConditionType register(final String string, final Serializer<? extends LootItemCondition> dbc) {
+        return Registry.<LootItemConditionType, LootItemConditionType>register(Registry.LOOT_CONDITION_TYPE, new ResourceLocation(string), new LootItemConditionType(dbc));
     }
     
-    public static LootItemCondition.Serializer<?> getSerializer(final ResourceLocation sm) {
-        final LootItemCondition.Serializer<?> b2 = LootItemConditions.CONDITIONS_BY_NAME.get(sm);
-        if (b2 == null) {
-            throw new IllegalArgumentException("Unknown loot item condition '" + sm + "'");
-        }
-        return b2;
-    }
-    
-    public static <T extends LootItemCondition> LootItemCondition.Serializer<T> getSerializer(final T cum) {
-        final LootItemCondition.Serializer<T> b2 = (LootItemCondition.Serializer<T>)LootItemConditions.CONDITIONS_BY_CLASS.get(cum.getClass());
-        if (b2 == null) {
-            throw new IllegalArgumentException("Unknown loot item condition " + cum);
-        }
-        return b2;
+    public static Object createGsonAdapter() {
+        return GsonAdapterFactory.<Object, LootItemConditionType>builder(Registry.LOOT_CONDITION_TYPE, "condition", "condition", LootItemCondition::getType).build();
     }
     
     public static <T> Predicate<T> andConditions(final Predicate<T>[] arr) {
@@ -113,48 +97,21 @@ public class LootItemConditions {
     }
     
     static {
-        CONDITIONS_BY_NAME = Maps.newHashMap();
-        CONDITIONS_BY_CLASS = Maps.newHashMap();
-        LootItemConditions.<LootItemCondition>register(new InvertedLootItemCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new AlternativeLootItemCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new LootItemRandomChanceCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new LootItemRandomChanceWithLootingCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new LootItemEntityPropertyCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new LootItemKilledByPlayerCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new EntityHasScoreCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new LootItemBlockStatePropertyCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new MatchTool.Serializer());
-        LootItemConditions.<LootItemCondition>register(new BonusLevelTableCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new ExplosionCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new DamageSourceCondition.Serializer());
-        LootItemConditions.<LootItemCondition>register(new LocationCheck.Serializer());
-        LootItemConditions.<LootItemCondition>register(new WeatherCheck.Serializer());
-        LootItemConditions.<LootItemCondition>register(new ConditionReference.Serializer());
-        LootItemConditions.<LootItemCondition>register(new TimeCheck.Serializer());
-    }
-    
-    public static class Serializer implements JsonDeserializer<LootItemCondition>, JsonSerializer<LootItemCondition> {
-        @Override
-        public LootItemCondition deserialize(final JsonElement jsonElement, final Type type, final JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
-            final JsonObject jsonObject5 = GsonHelper.convertToJsonObject(jsonElement, "condition");
-            final ResourceLocation sm6 = new ResourceLocation(GsonHelper.getAsString(jsonObject5, "condition"));
-            LootItemCondition.Serializer<?> b7;
-            try {
-                b7 = LootItemConditions.getSerializer(sm6);
-            }
-            catch (IllegalArgumentException illegalArgumentException8) {
-                throw new JsonSyntaxException("Unknown condition '" + sm6 + "'");
-            }
-            return (LootItemCondition)b7.deserialize(jsonObject5, jsonDeserializationContext);
-        }
-        
-        @Override
-        public JsonElement serialize(final LootItemCondition cum, final Type type, final JsonSerializationContext jsonSerializationContext) {
-            final LootItemCondition.Serializer<LootItemCondition> b5 = LootItemConditions.<LootItemCondition>getSerializer(cum);
-            final JsonObject jsonObject6 = new JsonObject();
-            jsonObject6.addProperty("condition", b5.getName().toString());
-            b5.serialize(jsonObject6, cum, jsonSerializationContext);
-            return jsonObject6;
-        }
+        INVERTED = register("inverted", new InvertedLootItemCondition.Serializer());
+        ALTERNATIVE = register("alternative", new AlternativeLootItemCondition.Serializer());
+        RANDOM_CHANCE = register("random_chance", new LootItemRandomChanceCondition.Serializer());
+        RANDOM_CHANCE_WITH_LOOTING = register("random_chance_with_looting", new LootItemRandomChanceWithLootingCondition.Serializer());
+        ENTITY_PROPERTIES = register("entity_properties", new LootItemEntityPropertyCondition.Serializer());
+        KILLED_BY_PLAYER = register("killed_by_player", new LootItemKilledByPlayerCondition.Serializer());
+        ENTITY_SCORES = register("entity_scores", new EntityHasScoreCondition.Serializer());
+        BLOCK_STATE_PROPERTY = register("block_state_property", new LootItemBlockStatePropertyCondition.Serializer());
+        MATCH_TOOL = register("match_tool", new MatchTool.Serializer());
+        TABLE_BONUS = register("table_bonus", new BonusLevelTableCondition.Serializer());
+        SURVIVES_EXPLOSION = register("survives_explosion", new ExplosionCondition.Serializer());
+        DAMAGE_SOURCE_PROPERTIES = register("damage_source_properties", new DamageSourceCondition.Serializer());
+        LOCATION_CHECK = register("location_check", new LocationCheck.Serializer());
+        WEATHER_CHECK = register("weather_check", new WeatherCheck.Serializer());
+        REFERENCE = register("reference", new ConditionReference.Serializer());
+        TIME_CHECK = register("time_check", new TimeCheck.Serializer());
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/LootItemEntityPropertyCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/LootItemEntityPropertyCondition.java
index 2fb667c..254ad2e 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/LootItemEntityPropertyCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/LootItemEntityPropertyCondition.java
@@ -4,8 +4,7 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.core.BlockPos;
@@ -20,21 +19,26 @@ public class LootItemEntityPropertyCondition implements LootItemCondition {
     private final EntityPredicate predicate;
     private final LootContext.EntityTarget entityTarget;
     
-    private LootItemEntityPropertyCondition(final EntityPredicate bb, final LootContext.EntityTarget c) {
-        this.predicate = bb;
+    private LootItemEntityPropertyCondition(final EntityPredicate be, final LootContext.EntityTarget c) {
+        this.predicate = be;
         this.entityTarget = c;
     }
     
+    @Override
+    public LootItemConditionType getType() {
+        return LootItemConditions.ENTITY_PROPERTIES;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(LootContextParams.BLOCK_POS, (LootContextParam<BlockPos>)this.entityTarget.getParam());
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final Entity akq3 = crx.<Entity>getParamOrNull(this.entityTarget.getParam());
-        final BlockPos fk4 = crx.<BlockPos>getParamOrNull(LootContextParams.BLOCK_POS);
-        return this.predicate.matches(crx.getLevel(), (fk4 != null) ? new Vec3(fk4) : null, akq3);
+    public boolean test(final LootContext dat) {
+        final Entity aom3 = dat.<Entity>getParamOrNull(this.entityTarget.getParam());
+        final Vec3 dem4 = dat.<Vec3>getParamOrNull(LootContextParams.ORIGIN);
+        return this.predicate.matches(dat.getLevel(), dem4, aom3);
     }
     
     public static Builder entityPresent(final LootContext.EntityTarget c) {
@@ -45,21 +49,21 @@ public class LootItemEntityPropertyCondition implements LootItemCondition {
         return () -> new LootItemEntityPropertyCondition(a.build(), c);
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<LootItemEntityPropertyCondition> {
-        protected Serializer() {
-            super(new ResourceLocation("entity_properties"), LootItemEntityPropertyCondition.class);
-        }
-        
+    public static Builder hasProperties(final LootContext.EntityTarget c, final EntityPredicate be) {
+        return () -> new LootItemEntityPropertyCondition(be, c);
+    }
+    
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<LootItemEntityPropertyCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final LootItemEntityPropertyCondition cuo, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.add("predicate", cuo.predicate.serializeToJson());
-            jsonObject.add("entity", jsonSerializationContext.serialize(cuo.entityTarget));
+        public void serialize(final JsonObject jsonObject, final LootItemEntityPropertyCondition ddp, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.add("predicate", ddp.predicate.serializeToJson());
+            jsonObject.add("entity", jsonSerializationContext.serialize(ddp.entityTarget));
         }
         
         @Override
         public LootItemEntityPropertyCondition deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-            final EntityPredicate bb4 = EntityPredicate.fromJson(jsonObject.get("predicate"));
-            return new LootItemEntityPropertyCondition(bb4, GsonHelper.<LootContext.EntityTarget>getAsObject(jsonObject, "entity", jsonDeserializationContext, LootContext.EntityTarget.class), null);
+            final EntityPredicate be4 = EntityPredicate.fromJson(jsonObject.get("predicate"));
+            return new LootItemEntityPropertyCondition(be4, GsonHelper.<LootContext.EntityTarget>getAsObject(jsonObject, "entity", jsonDeserializationContext, LootContext.EntityTarget.class), null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.java
index 2b931a6..708c858 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/LootItemKilledByPlayerCondition.java
@@ -3,7 +3,7 @@ package net.minecraft.world.level.storage.loot.predicates;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.entity.player.Player;
 import com.google.common.collect.ImmutableSet;
@@ -17,14 +17,19 @@ public class LootItemKilledByPlayerCondition implements LootItemCondition {
     private LootItemKilledByPlayerCondition() {
     }
     
+    @Override
+    public LootItemConditionType getType() {
+        return LootItemConditions.KILLED_BY_PLAYER;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(LootContextParams.LAST_DAMAGE_PLAYER);
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        return crx.hasParam(LootContextParams.LAST_DAMAGE_PLAYER);
+    public boolean test(final LootContext dat) {
+        return dat.hasParam(LootContextParams.LAST_DAMAGE_PLAYER);
     }
     
     public static Builder killedByPlayer() {
@@ -35,13 +40,9 @@ public class LootItemKilledByPlayerCondition implements LootItemCondition {
         INSTANCE = new LootItemKilledByPlayerCondition();
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<LootItemKilledByPlayerCondition> {
-        protected Serializer() {
-            super(new ResourceLocation("killed_by_player"), LootItemKilledByPlayerCondition.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<LootItemKilledByPlayerCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final LootItemKilledByPlayerCondition cup, final JsonSerializationContext jsonSerializationContext) {
+        public void serialize(final JsonObject jsonObject, final LootItemKilledByPlayerCondition ddq, final JsonSerializationContext jsonSerializationContext) {
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceCondition.java
index 4c4b46b..129493f 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceCondition.java
@@ -4,7 +4,7 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.level.storage.loot.LootContext;
 
 public class LootItemRandomChanceCondition implements LootItemCondition {
@@ -15,22 +15,23 @@ public class LootItemRandomChanceCondition implements LootItemCondition {
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        return crx.getRandom().nextFloat() < this.probability;
+    public LootItemConditionType getType() {
+        return LootItemConditions.RANDOM_CHANCE;
+    }
+    
+    @Override
+    public boolean test(final LootContext dat) {
+        return dat.getRandom().nextFloat() < this.probability;
     }
     
     public static Builder randomChance(final float float1) {
         return () -> new LootItemRandomChanceCondition(float1);
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<LootItemRandomChanceCondition> {
-        protected Serializer() {
-            super(new ResourceLocation("random_chance"), LootItemRandomChanceCondition.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<LootItemRandomChanceCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final LootItemRandomChanceCondition cuq, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.addProperty("chance", cuq.probability);
+        public void serialize(final JsonObject jsonObject, final LootItemRandomChanceCondition ddr, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.addProperty("chance", ddr.probability);
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceWithLootingCondition.java b/src/net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceWithLootingCondition.java
index 8a30141..263c866 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceWithLootingCondition.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/LootItemRandomChanceWithLootingCondition.java
@@ -4,7 +4,7 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.storage.loot.LootContext;
@@ -23,34 +23,35 @@ public class LootItemRandomChanceWithLootingCondition implements LootItemConditi
         this.lootingMultiplier = float2;
     }
     
+    @Override
+    public LootItemConditionType getType() {
+        return LootItemConditions.RANDOM_CHANCE_WITH_LOOTING;
+    }
+    
     @Override
     public Set<LootContextParam<?>> getReferencedContextParams() {
         return ImmutableSet.of(LootContextParams.KILLER_ENTITY);
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final Entity akq3 = crx.<Entity>getParamOrNull(LootContextParams.KILLER_ENTITY);
+    public boolean test(final LootContext dat) {
+        final Entity aom3 = dat.<Entity>getParamOrNull(LootContextParams.KILLER_ENTITY);
         int integer4 = 0;
-        if (akq3 instanceof LivingEntity) {
-            integer4 = EnchantmentHelper.getMobLooting((LivingEntity)akq3);
+        if (aom3 instanceof LivingEntity) {
+            integer4 = EnchantmentHelper.getMobLooting((LivingEntity)aom3);
         }
-        return crx.getRandom().nextFloat() < this.percent + integer4 * this.lootingMultiplier;
+        return dat.getRandom().nextFloat() < this.percent + integer4 * this.lootingMultiplier;
     }
     
     public static Builder randomChanceAndLootingBoost(final float float1, final float float2) {
         return () -> new LootItemRandomChanceWithLootingCondition(float1, float2);
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<LootItemRandomChanceWithLootingCondition> {
-        protected Serializer() {
-            super(new ResourceLocation("random_chance_with_looting"), LootItemRandomChanceWithLootingCondition.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<LootItemRandomChanceWithLootingCondition> {
         @Override
-        public void serialize(final JsonObject jsonObject, final LootItemRandomChanceWithLootingCondition cur, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.addProperty("chance", cur.percent);
-            jsonObject.addProperty("looting_multiplier", cur.lootingMultiplier);
+        public void serialize(final JsonObject jsonObject, final LootItemRandomChanceWithLootingCondition dds, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.addProperty("chance", dds.percent);
+            jsonObject.addProperty("looting_multiplier", dds.lootingMultiplier);
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/MatchTool.java b/src/net/minecraft/world/level/storage/loot/predicates/MatchTool.java
index a45fccd..e9d0e83 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/MatchTool.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/MatchTool.java
@@ -3,7 +3,7 @@ package net.minecraft.world.level.storage.loot.predicates;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.item.ItemStack;
 import com.google.common.collect.ImmutableSet;
@@ -15,8 +15,13 @@ import net.minecraft.advancements.critereon.ItemPredicate;
 public class MatchTool implements LootItemCondition {
     private final ItemPredicate predicate;
     
-    public MatchTool(final ItemPredicate bj) {
-        this.predicate = bj;
+    public MatchTool(final ItemPredicate bo) {
+        this.predicate = bo;
+    }
+    
+    @Override
+    public LootItemConditionType getType() {
+        return LootItemConditions.MATCH_TOOL;
     }
     
     @Override
@@ -25,29 +30,25 @@ public class MatchTool implements LootItemCondition {
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final ItemStack ben3 = crx.<ItemStack>getParamOrNull(LootContextParams.TOOL);
-        return ben3 != null && this.predicate.matches(ben3);
+    public boolean test(final LootContext dat) {
+        final ItemStack bki3 = dat.<ItemStack>getParamOrNull(LootContextParams.TOOL);
+        return bki3 != null && this.predicate.matches(bki3);
     }
     
     public static Builder toolMatches(final ItemPredicate.Builder a) {
         return () -> new MatchTool(a.build());
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<MatchTool> {
-        protected Serializer() {
-            super(new ResourceLocation("match_tool"), MatchTool.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<MatchTool> {
         @Override
-        public void serialize(final JsonObject jsonObject, final MatchTool cus, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.add("predicate", cus.predicate.serializeToJson());
+        public void serialize(final JsonObject jsonObject, final MatchTool ddt, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.add("predicate", ddt.predicate.serializeToJson());
         }
         
         @Override
         public MatchTool deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
-            final ItemPredicate bj4 = ItemPredicate.fromJson(jsonObject.get("predicate"));
-            return new MatchTool(bj4);
+            final ItemPredicate bo4 = ItemPredicate.fromJson(jsonObject.get("predicate"));
+            return new MatchTool(bo4);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/TimeCheck.java b/src/net/minecraft/world/level/storage/loot/predicates/TimeCheck.java
index 499ccd5..bfc3685 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/TimeCheck.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/TimeCheck.java
@@ -4,7 +4,7 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.RandomValueBounds;
@@ -15,37 +15,38 @@ public class TimeCheck implements LootItemCondition {
     private final Long period;
     private final RandomValueBounds value;
     
-    private TimeCheck(@Nullable final Long long1, final RandomValueBounds csf) {
+    private TimeCheck(@Nullable final Long long1, final RandomValueBounds dbb) {
         this.period = long1;
-        this.value = csf;
+        this.value = dbb;
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final ServerLevel xd3 = crx.getLevel();
-        long long4 = xd3.getDayTime();
+    public LootItemConditionType getType() {
+        return LootItemConditions.TIME_CHECK;
+    }
+    
+    @Override
+    public boolean test(final LootContext dat) {
+        final ServerLevel zd3 = dat.getLevel();
+        long long4 = zd3.getDayTime();
         if (this.period != null) {
             long4 %= this.period;
         }
         return this.value.matchesValue((int)long4);
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<TimeCheck> {
-        public Serializer() {
-            super(new ResourceLocation("time_check"), TimeCheck.class);
-        }
-        
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<TimeCheck> {
         @Override
-        public void serialize(final JsonObject jsonObject, final TimeCheck cut, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.addProperty("period", cut.period);
-            jsonObject.add("value", jsonSerializationContext.serialize(cut.value));
+        public void serialize(final JsonObject jsonObject, final TimeCheck ddu, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.addProperty("period", ddu.period);
+            jsonObject.add("value", jsonSerializationContext.serialize(ddu.value));
         }
         
         @Override
         public TimeCheck deserialize(final JsonObject jsonObject, final JsonDeserializationContext jsonDeserializationContext) {
             final Long long4 = jsonObject.has("period") ? Long.valueOf(GsonHelper.getAsLong(jsonObject, "period")) : null;
-            final RandomValueBounds csf5 = GsonHelper.<RandomValueBounds>getAsObject(jsonObject, "value", jsonDeserializationContext, RandomValueBounds.class);
-            return new TimeCheck(long4, csf5, null);
+            final RandomValueBounds dbb5 = GsonHelper.<RandomValueBounds>getAsObject(jsonObject, "value", jsonDeserializationContext, RandomValueBounds.class);
+            return new TimeCheck(long4, dbb5, null);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/storage/loot/predicates/WeatherCheck.java b/src/net/minecraft/world/level/storage/loot/predicates/WeatherCheck.java
index f10c1d5..e8d1450 100644
--- a/src/net/minecraft/world/level/storage/loot/predicates/WeatherCheck.java
+++ b/src/net/minecraft/world/level/storage/loot/predicates/WeatherCheck.java
@@ -4,7 +4,7 @@ import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonObject;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.storage.loot.LootContext;
 import javax.annotation.Nullable;
@@ -21,20 +21,21 @@ public class WeatherCheck implements LootItemCondition {
     }
     
     @Override
-    public boolean test(final LootContext crx) {
-        final ServerLevel xd3 = crx.getLevel();
-        return (this.isRaining == null || this.isRaining == xd3.isRaining()) && (this.isThundering == null || this.isThundering == xd3.isThundering());
+    public LootItemConditionType getType() {
+        return LootItemConditions.WEATHER_CHECK;
     }
     
-    public static class Serializer extends LootItemCondition.Serializer<WeatherCheck> {
-        public Serializer() {
-            super(new ResourceLocation("weather_check"), WeatherCheck.class);
-        }
-        
+    @Override
+    public boolean test(final LootContext dat) {
+        final ServerLevel zd3 = dat.getLevel();
+        return (this.isRaining == null || this.isRaining == zd3.isRaining()) && (this.isThundering == null || this.isThundering == zd3.isThundering());
+    }
+    
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<WeatherCheck> {
         @Override
-        public void serialize(final JsonObject jsonObject, final WeatherCheck cuu, final JsonSerializationContext jsonSerializationContext) {
-            jsonObject.addProperty("raining", cuu.isRaining);
-            jsonObject.addProperty("thundering", cuu.isThundering);
+        public void serialize(final JsonObject jsonObject, final WeatherCheck ddv, final JsonSerializationContext jsonSerializationContext) {
+            jsonObject.addProperty("raining", ddv.isRaining);
+            jsonObject.addProperty("thundering", ddv.isThundering);
         }
         
         @Override
diff --git a/src/net/minecraft/world/level/timers/FunctionCallback.java b/src/net/minecraft/world/level/timers/FunctionCallback.java
index 753cb26..c90d0a8 100644
--- a/src/net/minecraft/world/level/timers/FunctionCallback.java
+++ b/src/net/minecraft/world/level/timers/FunctionCallback.java
@@ -9,15 +9,15 @@ import net.minecraft.server.MinecraftServer;
 public class FunctionCallback implements TimerCallback<MinecraftServer> {
     private final ResourceLocation functionId;
     
-    public FunctionCallback(final ResourceLocation sm) {
-        this.functionId = sm;
+    public FunctionCallback(final ResourceLocation uh) {
+        this.functionId = uh;
     }
     
     @Override
-    public void handle(final MinecraftServer minecraftServer, final TimerQueue<MinecraftServer> cvc, final long long3) {
-        final ServerFunctionManager sy6 = minecraftServer.getFunctions();
+    public void handle(final MinecraftServer minecraftServer, final TimerQueue<MinecraftServer> ded, final long long3) {
+        final ServerFunctionManager uu6 = minecraftServer.getFunctions();
         final ServerFunctionManager serverFunctionManager;
-        sy6.get(this.functionId).ifPresent(cn -> serverFunctionManager.execute(cn, serverFunctionManager.getGameLoopSender()));
+        uu6.get(this.functionId).ifPresent(cw -> serverFunctionManager.execute(cw, serverFunctionManager.getGameLoopSender()));
     }
     
     public static class Serializer extends TimerCallback.Serializer<MinecraftServer, FunctionCallback> {
@@ -26,14 +26,14 @@ public class FunctionCallback implements TimerCallback<MinecraftServer> {
         }
         
         @Override
-        public void serialize(final CompoundTag jt, final FunctionCallback cuy) {
-            jt.putString("Name", cuy.functionId.toString());
+        public void serialize(final CompoundTag le, final FunctionCallback ddz) {
+            le.putString("Name", ddz.functionId.toString());
         }
         
         @Override
-        public FunctionCallback deserialize(final CompoundTag jt) {
-            final ResourceLocation sm3 = new ResourceLocation(jt.getString("Name"));
-            return new FunctionCallback(sm3);
+        public FunctionCallback deserialize(final CompoundTag le) {
+            final ResourceLocation uh3 = new ResourceLocation(le.getString("Name"));
+            return new FunctionCallback(uh3);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/timers/FunctionTagCallback.java b/src/net/minecraft/world/level/timers/FunctionTagCallback.java
index 6f2c7b1..c9e4055 100644
--- a/src/net/minecraft/world/level/timers/FunctionTagCallback.java
+++ b/src/net/minecraft/world/level/timers/FunctionTagCallback.java
@@ -11,16 +11,16 @@ import net.minecraft.server.MinecraftServer;
 public class FunctionTagCallback implements TimerCallback<MinecraftServer> {
     private final ResourceLocation tagId;
     
-    public FunctionTagCallback(final ResourceLocation sm) {
-        this.tagId = sm;
+    public FunctionTagCallback(final ResourceLocation uh) {
+        this.tagId = uh;
     }
     
     @Override
-    public void handle(final MinecraftServer minecraftServer, final TimerQueue<MinecraftServer> cvc, final long long3) {
-        final ServerFunctionManager sy6 = minecraftServer.getFunctions();
-        final Tag<CommandFunction> aaz7 = sy6.getTags().getTagOrEmpty(this.tagId);
-        for (final CommandFunction cn9 : aaz7.getValues()) {
-            sy6.execute(cn9, sy6.getGameLoopSender());
+    public void handle(final MinecraftServer minecraftServer, final TimerQueue<MinecraftServer> ded, final long long3) {
+        final ServerFunctionManager uu6 = minecraftServer.getFunctions();
+        final Tag<CommandFunction> adf7 = uu6.getTag(this.tagId);
+        for (final CommandFunction cw9 : adf7.getValues()) {
+            uu6.execute(cw9, uu6.getGameLoopSender());
         }
     }
     
@@ -30,14 +30,14 @@ public class FunctionTagCallback implements TimerCallback<MinecraftServer> {
         }
         
         @Override
-        public void serialize(final CompoundTag jt, final FunctionTagCallback cuz) {
-            jt.putString("Name", cuz.tagId.toString());
+        public void serialize(final CompoundTag le, final FunctionTagCallback dea) {
+            le.putString("Name", dea.tagId.toString());
         }
         
         @Override
-        public FunctionTagCallback deserialize(final CompoundTag jt) {
-            final ResourceLocation sm3 = new ResourceLocation(jt.getString("Name"));
-            return new FunctionTagCallback(sm3);
+        public FunctionTagCallback deserialize(final CompoundTag le) {
+            final ResourceLocation uh3 = new ResourceLocation(le.getString("Name"));
+            return new FunctionTagCallback(uh3);
         }
     }
 }
diff --git a/src/net/minecraft/world/level/timers/TimerCallback.java b/src/net/minecraft/world/level/timers/TimerCallback.java
index f23d45e..ff33635 100644
--- a/src/net/minecraft/world/level/timers/TimerCallback.java
+++ b/src/net/minecraft/world/level/timers/TimerCallback.java
@@ -5,14 +5,14 @@ import net.minecraft.resources.ResourceLocation;
 
 @FunctionalInterface
 public interface TimerCallback<T> {
-    void handle(final T object, final TimerQueue<T> cvc, final long long3);
+    void handle(final T object, final TimerQueue<T> ded, final long long3);
     
     public abstract static class Serializer<T, C extends TimerCallback<T>> {
         private final ResourceLocation id;
         private final Class<?> cls;
         
-        public Serializer(final ResourceLocation sm, final Class<?> class2) {
-            this.id = sm;
+        public Serializer(final ResourceLocation uh, final Class<?> class2) {
+            this.id = uh;
             this.cls = class2;
         }
         
@@ -24,8 +24,8 @@ public interface TimerCallback<T> {
             return this.cls;
         }
         
-        public abstract void serialize(final CompoundTag jt, final C cva);
+        public abstract void serialize(final CompoundTag le, final C deb);
         
-        public abstract C deserialize(final CompoundTag jt);
+        public abstract C deserialize(final CompoundTag le);
     }
 }
diff --git a/src/net/minecraft/world/level/timers/TimerCallbacks.java b/src/net/minecraft/world/level/timers/TimerCallbacks.java
index 9d6a713..9b2c16d 100644
--- a/src/net/minecraft/world/level/timers/TimerCallbacks.java
+++ b/src/net/minecraft/world/level/timers/TimerCallbacks.java
@@ -32,27 +32,27 @@ public class TimerCallbacks<C> {
         return (TimerCallback.Serializer<C, T>)this.classToSerializer.get(class1);
     }
     
-    public <T extends TimerCallback<C>> CompoundTag serialize(final T cva) {
-        final TimerCallback.Serializer<C, T> a3 = this.<T>getSerializer(cva.getClass());
-        final CompoundTag jt4 = new CompoundTag();
-        a3.serialize(jt4, cva);
-        jt4.putString("Type", a3.getId().toString());
-        return jt4;
+    public <T extends TimerCallback<C>> CompoundTag serialize(final T deb) {
+        final TimerCallback.Serializer<C, T> a3 = this.<T>getSerializer(deb.getClass());
+        final CompoundTag le4 = new CompoundTag();
+        a3.serialize(le4, deb);
+        le4.putString("Type", a3.getId().toString());
+        return le4;
     }
     
     @Nullable
-    public TimerCallback<C> deserialize(final CompoundTag jt) {
-        final ResourceLocation sm3 = ResourceLocation.tryParse(jt.getString("Type"));
-        final TimerCallback.Serializer<C, ?> a4 = this.idToSerializer.get(sm3);
+    public TimerCallback<C> deserialize(final CompoundTag le) {
+        final ResourceLocation uh3 = ResourceLocation.tryParse(le.getString("Type"));
+        final TimerCallback.Serializer<C, ?> a4 = this.idToSerializer.get(uh3);
         if (a4 == null) {
-            TimerCallbacks.LOGGER.error("Failed to deserialize timer callback: " + jt);
+            TimerCallbacks.LOGGER.error("Failed to deserialize timer callback: " + le);
             return null;
         }
         try {
-            return (TimerCallback<C>)a4.deserialize(jt);
+            return (TimerCallback<C>)a4.deserialize(le);
         }
         catch (Exception exception5) {
-            TimerCallbacks.LOGGER.error("Failed to deserialize timer callback: " + jt, (Throwable)exception5);
+            TimerCallbacks.LOGGER.error("Failed to deserialize timer callback: " + le, (Throwable)exception5);
             return null;
         }
     }
diff --git a/src/net/minecraft/world/level/timers/TimerQueue.java b/src/net/minecraft/world/level/timers/TimerQueue.java
index 2e62c7a..83ed82c 100644
--- a/src/net/minecraft/world/level/timers/TimerQueue.java
+++ b/src/net/minecraft/world/level/timers/TimerQueue.java
@@ -2,16 +2,17 @@ package net.minecraft.world.level.timers;
 
 import org.apache.logging.log4j.LogManager;
 import java.util.function.Function;
-import java.util.Iterator;
-import net.minecraft.nbt.Tag;
 import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.CompoundTag;
 import java.util.Collections;
 import java.util.Set;
 import java.util.Collection;
 import java.util.function.Consumer;
 import com.google.common.collect.HashBasedTable;
 import java.util.PriorityQueue;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import com.mojang.serialization.Dynamic;
+import java.util.stream.Stream;
 import java.util.Comparator;
 import com.google.common.collect.Table;
 import com.google.common.primitives.UnsignedLong;
@@ -29,11 +30,26 @@ public class TimerQueue<T> {
         return Comparator.<Event<T>>comparingLong(a -> a.triggerTime).<Comparable>thenComparing(a -> a.sequentialId);
     }
     
-    public TimerQueue(final TimerCallbacks<T> cvb) {
+    public TimerQueue(final TimerCallbacks<T> dec, final Stream<Dynamic<Tag>> stream) {
+        this(dec);
+        this.queue.clear();
+        this.events.clear();
+        this.sequentialId = UnsignedLong.ZERO;
+        stream.forEach(dynamic -> {
+            if (!(dynamic.getValue() instanceof CompoundTag)) {
+                TimerQueue.LOGGER.warn("Invalid format of events: {}", dynamic);
+            }
+            else {
+                this.loadEvent((CompoundTag)dynamic.getValue());
+            }
+        });
+    }
+    
+    public TimerQueue(final TimerCallbacks<T> dec) {
         this.queue = new PriorityQueue<Event<T>>(TimerQueue.createComparator());
         this.sequentialId = UnsignedLong.ZERO;
         this.events = HashBasedTable.create();
-        this.callbacksRegistry = cvb;
+        this.callbacksRegistry = dec;
     }
     
     public void tick(final T object, final long long2) {
@@ -48,12 +64,12 @@ public class TimerQueue<T> {
         }
     }
     
-    public void schedule(final String string, final long long2, final TimerCallback<T> cva) {
+    public void schedule(final String string, final long long2, final TimerCallback<T> deb) {
         if (this.events.contains(string, long2)) {
             return;
         }
         this.sequentialId = this.sequentialId.plus(UnsignedLong.ONE);
-        final Event<T> a6 = new Event<T>(long2, this.sequentialId, string, (TimerCallback)cva);
+        final Event<T> a6 = new Event<T>(long2, this.sequentialId, string, (TimerCallback)deb);
         this.events.put(string, long2, a6);
         this.queue.add(a6);
     }
@@ -70,44 +86,28 @@ public class TimerQueue<T> {
         return Collections.<String>unmodifiableSet(this.events.rowKeySet());
     }
     
-    private void loadEvent(final CompoundTag jt) {
-        final CompoundTag jt2 = jt.getCompound("Callback");
-        final TimerCallback<T> cva4 = this.callbacksRegistry.deserialize(jt2);
-        if (cva4 != null) {
-            final String string5 = jt.getString("Name");
-            final long long6 = jt.getLong("TriggerTime");
-            this.schedule(string5, long6, cva4);
-        }
-    }
-    
-    public void load(final ListTag jz) {
-        this.queue.clear();
-        this.events.clear();
-        this.sequentialId = UnsignedLong.ZERO;
-        if (jz.isEmpty()) {
-            return;
-        }
-        if (jz.getElementType() != 10) {
-            TimerQueue.LOGGER.warn("Invalid format of events: " + jz);
-            return;
-        }
-        for (final Tag kj4 : jz) {
-            this.loadEvent((CompoundTag)kj4);
+    private void loadEvent(final CompoundTag le) {
+        final CompoundTag le2 = le.getCompound("Callback");
+        final TimerCallback<T> deb4 = this.callbacksRegistry.deserialize(le2);
+        if (deb4 != null) {
+            final String string5 = le.getString("Name");
+            final long long6 = le.getLong("TriggerTime");
+            this.schedule(string5, long6, deb4);
         }
     }
     
     private CompoundTag storeEvent(final Event<T> a) {
-        final CompoundTag jt3 = new CompoundTag();
-        jt3.putString("Name", a.id);
-        jt3.putLong("TriggerTime", a.triggerTime);
-        jt3.put("Callback", this.callbacksRegistry.<TimerCallback<T>>serialize(a.callback));
-        return jt3;
+        final CompoundTag le3 = new CompoundTag();
+        le3.putString("Name", a.id);
+        le3.putLong("TriggerTime", a.triggerTime);
+        le3.put("Callback", this.callbacksRegistry.<TimerCallback<T>>serialize(a.callback));
+        return le3;
     }
     
     public ListTag store() {
-        final ListTag jz2 = new ListTag();
-        this.queue.stream().sorted(TimerQueue.createComparator()).map(this::storeEvent).forEach(jz2::add);
-        return jz2;
+        final ListTag lk2 = new ListTag();
+        this.queue.stream().sorted(TimerQueue.createComparator()).map(this::storeEvent).forEach(lk2::add);
+        return lk2;
     }
     
     static {
@@ -120,11 +120,11 @@ public class TimerQueue<T> {
         public final String id;
         public final TimerCallback<T> callback;
         
-        private Event(final long long1, final UnsignedLong unsignedLong, final String string, final TimerCallback<T> cva) {
+        private Event(final long long1, final UnsignedLong unsignedLong, final String string, final TimerCallback<T> deb) {
             this.triggerTime = long1;
             this.sequentialId = unsignedLong;
             this.id = string;
-            this.callback = cva;
+            this.callback = deb;
         }
     }
 }
diff --git a/src/net/minecraft/world/phys/AABB.java b/src/net/minecraft/world/phys/AABB.java
index 0ab4a3c..7cbd599 100644
--- a/src/net/minecraft/world/phys/AABB.java
+++ b/src/net/minecraft/world/phys/AABB.java
@@ -25,20 +25,24 @@ public class AABB {
         this.maxZ = Math.max(double3, double6);
     }
     
-    public AABB(final BlockPos fk) {
-        this(fk.getX(), fk.getY(), fk.getZ(), fk.getX() + 1, fk.getY() + 1, fk.getZ() + 1);
+    public AABB(final BlockPos fu) {
+        this(fu.getX(), fu.getY(), fu.getZ(), fu.getX() + 1, fu.getY() + 1, fu.getZ() + 1);
     }
     
-    public AABB(final BlockPos fk1, final BlockPos fk2) {
-        this(fk1.getX(), fk1.getY(), fk1.getZ(), fk2.getX(), fk2.getY(), fk2.getZ());
+    public AABB(final BlockPos fu1, final BlockPos fu2) {
+        this(fu1.getX(), fu1.getY(), fu1.getZ(), fu2.getX(), fu2.getY(), fu2.getZ());
     }
     
-    public AABB(final Vec3 cvl1, final Vec3 cvl2) {
-        this(cvl1.x, cvl1.y, cvl1.z, cvl2.x, cvl2.y, cvl2.z);
+    public AABB(final Vec3 dem1, final Vec3 dem2) {
+        this(dem1.x, dem1.y, dem1.z, dem2.x, dem2.y, dem2.z);
     }
     
-    public static AABB of(final BoundingBox clb) {
-        return new AABB(clb.x0, clb.y0, clb.z0, clb.x1 + 1, clb.y1 + 1, clb.z1 + 1);
+    public static AABB of(final BoundingBox ctd) {
+        return new AABB(ctd.x0, ctd.y0, ctd.z0, ctd.x1 + 1, ctd.y1 + 1, ctd.z1 + 1);
+    }
+    
+    public static AABB unitCubeFromLowerCorner(final Vec3 dem) {
+        return new AABB(dem.x, dem.y, dem.z, dem.x + 1.0, dem.y + 1.0, dem.z + 1.0);
     }
     
     public double min(final Direction.Axis a) {
@@ -57,8 +61,8 @@ public class AABB {
         if (!(object instanceof AABB)) {
             return false;
         }
-        final AABB cvf3 = (AABB)object;
-        return Double.compare(cvf3.minX, this.minX) == 0 && Double.compare(cvf3.minY, this.minY) == 0 && Double.compare(cvf3.minZ, this.minZ) == 0 && Double.compare(cvf3.maxX, this.maxX) == 0 && Double.compare(cvf3.maxY, this.maxY) == 0 && Double.compare(cvf3.maxZ, this.maxZ) == 0;
+        final AABB deg3 = (AABB)object;
+        return Double.compare(deg3.minX, this.minX) == 0 && Double.compare(deg3.minY, this.minY) == 0 && Double.compare(deg3.minZ, this.minZ) == 0 && Double.compare(deg3.maxX, this.maxX) == 0 && Double.compare(deg3.maxY, this.maxY) == 0 && Double.compare(deg3.maxZ, this.maxZ) == 0;
     }
     
     @Override
@@ -106,8 +110,8 @@ public class AABB {
         return new AABB(double4, double5, double6, double7, double8, double9);
     }
     
-    public AABB expandTowards(final Vec3 cvl) {
-        return this.expandTowards(cvl.x, cvl.y, cvl.z);
+    public AABB expandTowards(final Vec3 dem) {
+        return this.expandTowards(dem.x, dem.y, dem.z);
     }
     
     public AABB expandTowards(final double double1, final double double2, final double double3) {
@@ -152,23 +156,23 @@ public class AABB {
         return this.inflate(double1, double1, double1);
     }
     
-    public AABB intersect(final AABB cvf) {
-        final double double3 = Math.max(this.minX, cvf.minX);
-        final double double4 = Math.max(this.minY, cvf.minY);
-        final double double5 = Math.max(this.minZ, cvf.minZ);
-        final double double6 = Math.min(this.maxX, cvf.maxX);
-        final double double7 = Math.min(this.maxY, cvf.maxY);
-        final double double8 = Math.min(this.maxZ, cvf.maxZ);
+    public AABB intersect(final AABB deg) {
+        final double double3 = Math.max(this.minX, deg.minX);
+        final double double4 = Math.max(this.minY, deg.minY);
+        final double double5 = Math.max(this.minZ, deg.minZ);
+        final double double6 = Math.min(this.maxX, deg.maxX);
+        final double double7 = Math.min(this.maxY, deg.maxY);
+        final double double8 = Math.min(this.maxZ, deg.maxZ);
         return new AABB(double3, double4, double5, double6, double7, double8);
     }
     
-    public AABB minmax(final AABB cvf) {
-        final double double3 = Math.min(this.minX, cvf.minX);
-        final double double4 = Math.min(this.minY, cvf.minY);
-        final double double5 = Math.min(this.minZ, cvf.minZ);
-        final double double6 = Math.max(this.maxX, cvf.maxX);
-        final double double7 = Math.max(this.maxY, cvf.maxY);
-        final double double8 = Math.max(this.maxZ, cvf.maxZ);
+    public AABB minmax(final AABB deg) {
+        final double double3 = Math.min(this.minX, deg.minX);
+        final double double4 = Math.min(this.minY, deg.minY);
+        final double double5 = Math.min(this.minZ, deg.minZ);
+        final double double6 = Math.max(this.maxX, deg.maxX);
+        final double double7 = Math.max(this.maxY, deg.maxY);
+        final double double8 = Math.max(this.maxZ, deg.maxZ);
         return new AABB(double3, double4, double5, double6, double7, double8);
     }
     
@@ -176,28 +180,28 @@ public class AABB {
         return new AABB(this.minX + double1, this.minY + double2, this.minZ + double3, this.maxX + double1, this.maxY + double2, this.maxZ + double3);
     }
     
-    public AABB move(final BlockPos fk) {
-        return new AABB(this.minX + fk.getX(), this.minY + fk.getY(), this.minZ + fk.getZ(), this.maxX + fk.getX(), this.maxY + fk.getY(), this.maxZ + fk.getZ());
+    public AABB move(final BlockPos fu) {
+        return new AABB(this.minX + fu.getX(), this.minY + fu.getY(), this.minZ + fu.getZ(), this.maxX + fu.getX(), this.maxY + fu.getY(), this.maxZ + fu.getZ());
     }
     
-    public AABB move(final Vec3 cvl) {
-        return this.move(cvl.x, cvl.y, cvl.z);
+    public AABB move(final Vec3 dem) {
+        return this.move(dem.x, dem.y, dem.z);
     }
     
-    public boolean intersects(final AABB cvf) {
-        return this.intersects(cvf.minX, cvf.minY, cvf.minZ, cvf.maxX, cvf.maxY, cvf.maxZ);
+    public boolean intersects(final AABB deg) {
+        return this.intersects(deg.minX, deg.minY, deg.minZ, deg.maxX, deg.maxY, deg.maxZ);
     }
     
     public boolean intersects(final double double1, final double double2, final double double3, final double double4, final double double5, final double double6) {
         return this.minX < double4 && this.maxX > double1 && this.minY < double5 && this.maxY > double2 && this.minZ < double6 && this.maxZ > double3;
     }
     
-    public boolean intersects(final Vec3 cvl1, final Vec3 cvl2) {
-        return this.intersects(Math.min(cvl1.x, cvl2.x), Math.min(cvl1.y, cvl2.y), Math.min(cvl1.z, cvl2.z), Math.max(cvl1.x, cvl2.x), Math.max(cvl1.y, cvl2.y), Math.max(cvl1.z, cvl2.z));
+    public boolean intersects(final Vec3 dem1, final Vec3 dem2) {
+        return this.intersects(Math.min(dem1.x, dem2.x), Math.min(dem1.y, dem2.y), Math.min(dem1.z, dem2.z), Math.max(dem1.x, dem2.x), Math.max(dem1.y, dem2.y), Math.max(dem1.z, dem2.z));
     }
     
-    public boolean contains(final Vec3 cvl) {
-        return this.contains(cvl.x, cvl.y, cvl.z);
+    public boolean contains(final Vec3 dem) {
+        return this.contains(dem.x, dem.y, dem.z);
     }
     
     public boolean contains(final double double1, final double double2, final double double3) {
@@ -227,74 +231,74 @@ public class AABB {
         return this.inflate(-double1);
     }
     
-    public Optional<Vec3> clip(final Vec3 cvl1, final Vec3 cvl2) {
+    public Optional<Vec3> clip(final Vec3 dem1, final Vec3 dem2) {
         final double[] arr4 = { 1.0 };
-        final double double5 = cvl2.x - cvl1.x;
-        final double double6 = cvl2.y - cvl1.y;
-        final double double7 = cvl2.z - cvl1.z;
-        final Direction fp11 = getDirection(this, cvl1, arr4, null, double5, double6, double7);
-        if (fp11 == null) {
+        final double double5 = dem2.x - dem1.x;
+        final double double6 = dem2.y - dem1.y;
+        final double double7 = dem2.z - dem1.z;
+        final Direction fz11 = getDirection(this, dem1, arr4, null, double5, double6, double7);
+        if (fz11 == null) {
             return Optional.<Vec3>empty();
         }
         final double double8 = arr4[0];
-        return Optional.<Vec3>of(cvl1.add(double8 * double5, double8 * double6, double8 * double7));
+        return Optional.<Vec3>of(dem1.add(double8 * double5, double8 * double6, double8 * double7));
     }
     
     @Nullable
-    public static BlockHitResult clip(final Iterable<AABB> iterable, final Vec3 cvl2, final Vec3 cvl3, final BlockPos fk) {
+    public static BlockHitResult clip(final Iterable<AABB> iterable, final Vec3 dem2, final Vec3 dem3, final BlockPos fu) {
         final double[] arr5 = { 1.0 };
-        Direction fp6 = null;
-        final double double7 = cvl3.x - cvl2.x;
-        final double double8 = cvl3.y - cvl2.y;
-        final double double9 = cvl3.z - cvl2.z;
-        for (final AABB cvf14 : iterable) {
-            fp6 = getDirection(cvf14.move(fk), cvl2, arr5, fp6, double7, double8, double9);
+        Direction fz6 = null;
+        final double double7 = dem3.x - dem2.x;
+        final double double8 = dem3.y - dem2.y;
+        final double double9 = dem3.z - dem2.z;
+        for (final AABB deg14 : iterable) {
+            fz6 = getDirection(deg14.move(fu), dem2, arr5, fz6, double7, double8, double9);
         }
-        if (fp6 == null) {
+        if (fz6 == null) {
             return null;
         }
         final double double10 = arr5[0];
-        return new BlockHitResult(cvl2.add(double10 * double7, double10 * double8, double10 * double9), fp6, fk, false);
+        return new BlockHitResult(dem2.add(double10 * double7, double10 * double8, double10 * double9), fz6, fu, false);
     }
     
     @Nullable
-    private static Direction getDirection(final AABB cvf, final Vec3 cvl, final double[] arr, @Nullable Direction fp, final double double5, final double double6, final double double7) {
+    private static Direction getDirection(final AABB deg, final Vec3 dem, final double[] arr, @Nullable Direction fz, final double double5, final double double6, final double double7) {
         if (double5 > 1.0E-7) {
-            fp = clipPoint(arr, fp, double5, double6, double7, cvf.minX, cvf.minY, cvf.maxY, cvf.minZ, cvf.maxZ, Direction.WEST, cvl.x, cvl.y, cvl.z);
+            fz = clipPoint(arr, fz, double5, double6, double7, deg.minX, deg.minY, deg.maxY, deg.minZ, deg.maxZ, Direction.WEST, dem.x, dem.y, dem.z);
         }
         else if (double5 < -1.0E-7) {
-            fp = clipPoint(arr, fp, double5, double6, double7, cvf.maxX, cvf.minY, cvf.maxY, cvf.minZ, cvf.maxZ, Direction.EAST, cvl.x, cvl.y, cvl.z);
+            fz = clipPoint(arr, fz, double5, double6, double7, deg.maxX, deg.minY, deg.maxY, deg.minZ, deg.maxZ, Direction.EAST, dem.x, dem.y, dem.z);
         }
         if (double6 > 1.0E-7) {
-            fp = clipPoint(arr, fp, double6, double7, double5, cvf.minY, cvf.minZ, cvf.maxZ, cvf.minX, cvf.maxX, Direction.DOWN, cvl.y, cvl.z, cvl.x);
+            fz = clipPoint(arr, fz, double6, double7, double5, deg.minY, deg.minZ, deg.maxZ, deg.minX, deg.maxX, Direction.DOWN, dem.y, dem.z, dem.x);
         }
         else if (double6 < -1.0E-7) {
-            fp = clipPoint(arr, fp, double6, double7, double5, cvf.maxY, cvf.minZ, cvf.maxZ, cvf.minX, cvf.maxX, Direction.UP, cvl.y, cvl.z, cvl.x);
+            fz = clipPoint(arr, fz, double6, double7, double5, deg.maxY, deg.minZ, deg.maxZ, deg.minX, deg.maxX, Direction.UP, dem.y, dem.z, dem.x);
         }
         if (double7 > 1.0E-7) {
-            fp = clipPoint(arr, fp, double7, double5, double6, cvf.minZ, cvf.minX, cvf.maxX, cvf.minY, cvf.maxY, Direction.NORTH, cvl.z, cvl.x, cvl.y);
+            fz = clipPoint(arr, fz, double7, double5, double6, deg.minZ, deg.minX, deg.maxX, deg.minY, deg.maxY, Direction.NORTH, dem.z, dem.x, dem.y);
         }
         else if (double7 < -1.0E-7) {
-            fp = clipPoint(arr, fp, double7, double5, double6, cvf.maxZ, cvf.minX, cvf.maxX, cvf.minY, cvf.maxY, Direction.SOUTH, cvl.z, cvl.x, cvl.y);
+            fz = clipPoint(arr, fz, double7, double5, double6, deg.maxZ, deg.minX, deg.maxX, deg.minY, deg.maxY, Direction.SOUTH, dem.z, dem.x, dem.y);
         }
-        return fp;
+        return fz;
     }
     
     @Nullable
-    private static Direction clipPoint(final double[] arr, @Nullable final Direction fp2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8, final double double9, final double double10, final Direction fp11, final double double12, final double double13, final double double14) {
+    private static Direction clipPoint(final double[] arr, @Nullable final Direction fz2, final double double3, final double double4, final double double5, final double double6, final double double7, final double double8, final double double9, final double double10, final Direction fz11, final double double12, final double double13, final double double14) {
         final double double15 = (double6 - double12) / double3;
         final double double16 = double13 + double15 * double4;
         final double double17 = double14 + double15 * double5;
         if (0.0 < double15 && double15 < arr[0] && double7 - 1.0E-7 < double16 && double16 < double8 + 1.0E-7 && double9 - 1.0E-7 < double17 && double17 < double10 + 1.0E-7) {
             arr[0] = double15;
-            return fp11;
+            return fz11;
         }
-        return fp2;
+        return fz2;
     }
     
     @Override
     public String toString() {
-        return "box[" + this.minX + ", " + this.minY + ", " + this.minZ + "] -> [" + this.maxX + ", " + this.maxY + ", " + this.maxZ + "]";
+        return "AABB[" + this.minX + ", " + this.minY + ", " + this.minZ + "] -> [" + this.maxX + ", " + this.maxY + ", " + this.maxZ + "]";
     }
     
     public boolean hasNaN() {
@@ -304,4 +308,8 @@ public class AABB {
     public Vec3 getCenter() {
         return new Vec3(Mth.lerp(0.5, this.minX, this.maxX), Mth.lerp(0.5, this.minY, this.maxY), Mth.lerp(0.5, this.minZ, this.maxZ));
     }
+    
+    public static AABB ofSize(final double double1, final double double2, final double double3) {
+        return new AABB(-double1 / 2.0, -double2 / 2.0, -double3 / 2.0, double1 / 2.0, double2 / 2.0, double3 / 2.0);
+    }
 }
diff --git a/src/net/minecraft/world/phys/BlockHitResult.java b/src/net/minecraft/world/phys/BlockHitResult.java
index c158aaf..c520fc6 100644
--- a/src/net/minecraft/world/phys/BlockHitResult.java
+++ b/src/net/minecraft/world/phys/BlockHitResult.java
@@ -9,24 +9,28 @@ public class BlockHitResult extends HitResult {
     private final boolean miss;
     private final boolean inside;
     
-    public static BlockHitResult miss(final Vec3 cvl, final Direction fp, final BlockPos fk) {
-        return new BlockHitResult(true, cvl, fp, fk, false);
+    public static BlockHitResult miss(final Vec3 dem, final Direction fz, final BlockPos fu) {
+        return new BlockHitResult(true, dem, fz, fu, false);
     }
     
-    public BlockHitResult(final Vec3 cvl, final Direction fp, final BlockPos fk, final boolean boolean4) {
-        this(false, cvl, fp, fk, boolean4);
+    public BlockHitResult(final Vec3 dem, final Direction fz, final BlockPos fu, final boolean boolean4) {
+        this(false, dem, fz, fu, boolean4);
     }
     
-    private BlockHitResult(final boolean boolean1, final Vec3 cvl, final Direction fp, final BlockPos fk, final boolean boolean5) {
-        super(cvl);
+    private BlockHitResult(final boolean boolean1, final Vec3 dem, final Direction fz, final BlockPos fu, final boolean boolean5) {
+        super(dem);
         this.miss = boolean1;
-        this.direction = fp;
-        this.blockPos = fk;
+        this.direction = fz;
+        this.blockPos = fu;
         this.inside = boolean5;
     }
     
-    public BlockHitResult withDirection(final Direction fp) {
-        return new BlockHitResult(this.miss, this.location, fp, this.blockPos, this.inside);
+    public BlockHitResult withDirection(final Direction fz) {
+        return new BlockHitResult(this.miss, this.location, fz, this.blockPos, this.inside);
+    }
+    
+    public BlockHitResult withPosition(final BlockPos fu) {
+        return new BlockHitResult(this.miss, this.location, this.direction, fu, this.inside);
     }
     
     public BlockPos getBlockPos() {
diff --git a/src/net/minecraft/world/phys/EntityHitResult.java b/src/net/minecraft/world/phys/EntityHitResult.java
index a3601c6..7b32c69 100644
--- a/src/net/minecraft/world/phys/EntityHitResult.java
+++ b/src/net/minecraft/world/phys/EntityHitResult.java
@@ -5,13 +5,13 @@ import net.minecraft.world.entity.Entity;
 public class EntityHitResult extends HitResult {
     private final Entity entity;
     
-    public EntityHitResult(final Entity akq) {
-        this(akq, akq.position());
+    public EntityHitResult(final Entity aom) {
+        this(aom, aom.position());
     }
     
-    public EntityHitResult(final Entity akq, final Vec3 cvl) {
-        super(cvl);
-        this.entity = akq;
+    public EntityHitResult(final Entity aom, final Vec3 dem) {
+        super(dem);
+        this.entity = aom;
     }
     
     public Entity getEntity() {
diff --git a/src/net/minecraft/world/phys/HitResult.java b/src/net/minecraft/world/phys/HitResult.java
index 6b8e2d9..aea2a2a 100644
--- a/src/net/minecraft/world/phys/HitResult.java
+++ b/src/net/minecraft/world/phys/HitResult.java
@@ -1,10 +1,19 @@
 package net.minecraft.world.phys;
 
+import net.minecraft.world.entity.Entity;
+
 public abstract class HitResult {
     protected final Vec3 location;
     
-    protected HitResult(final Vec3 cvl) {
-        this.location = cvl;
+    protected HitResult(final Vec3 dem) {
+        this.location = dem;
+    }
+    
+    public double distanceTo(final Entity aom) {
+        final double double3 = this.location.x - aom.getX();
+        final double double4 = this.location.y - aom.getY();
+        final double double5 = this.location.z - aom.getZ();
+        return double3 * double3 + double4 * double4 + double5 * double5;
     }
     
     public abstract Type getType();
diff --git a/src/net/minecraft/world/phys/PosAndRot.java b/src/net/minecraft/world/phys/PosAndRot.java
index ccb151c..0f97f11 100644
--- a/src/net/minecraft/world/phys/PosAndRot.java
+++ b/src/net/minecraft/world/phys/PosAndRot.java
@@ -7,8 +7,8 @@ public class PosAndRot {
     private final float xRot;
     private final float yRot;
     
-    public PosAndRot(final Vec3 cvl, final float float2, final float float3) {
-        this.pos = cvl;
+    public PosAndRot(final Vec3 dem, final float float2, final float float3) {
+        this.pos = dem;
         this.xRot = float2;
         this.yRot = float3;
     }
@@ -33,8 +33,8 @@ public class PosAndRot {
         if (object == null || this.getClass() != object.getClass()) {
             return false;
         }
-        final PosAndRot cvj3 = (PosAndRot)object;
-        return Float.compare(cvj3.xRot, this.xRot) == 0 && Float.compare(cvj3.yRot, this.yRot) == 0 && Objects.equals(this.pos, cvj3.pos);
+        final PosAndRot dek3 = (PosAndRot)object;
+        return Float.compare(dek3.xRot, this.xRot) == 0 && Float.compare(dek3.yRot, this.yRot) == 0 && Objects.equals(this.pos, dek3.pos);
     }
     
     @Override
diff --git a/src/net/minecraft/world/phys/Vec2.java b/src/net/minecraft/world/phys/Vec2.java
index 5bc6c73..93b0b38 100644
--- a/src/net/minecraft/world/phys/Vec2.java
+++ b/src/net/minecraft/world/phys/Vec2.java
@@ -17,8 +17,8 @@ public class Vec2 {
         this.y = float2;
     }
     
-    public boolean equals(final Vec2 cvk) {
-        return this.x == cvk.x && this.y == cvk.y;
+    public boolean equals(final Vec2 del) {
+        return this.x == del.x && this.y == del.y;
     }
     
     static {
diff --git a/src/net/minecraft/world/phys/Vec3.java b/src/net/minecraft/world/phys/Vec3.java
index 7c3e4a4..f4f0d5a 100644
--- a/src/net/minecraft/world/phys/Vec3.java
+++ b/src/net/minecraft/world/phys/Vec3.java
@@ -3,8 +3,8 @@ package net.minecraft.world.phys;
 import net.minecraft.core.Direction;
 import java.util.EnumSet;
 import net.minecraft.util.Mth;
-import net.minecraft.core.Vec3i;
 import com.mojang.math.Vector3f;
+import net.minecraft.core.Vec3i;
 import net.minecraft.core.Position;
 
 public class Vec3 implements Position {
@@ -13,22 +13,41 @@ public class Vec3 implements Position {
     public final double y;
     public final double z;
     
+    public static Vec3 fromRGB24(final int integer) {
+        final double double2 = (integer >> 16 & 0xFF) / 255.0;
+        final double double3 = (integer >> 8 & 0xFF) / 255.0;
+        final double double4 = (integer & 0xFF) / 255.0;
+        return new Vec3(double2, double3, double4);
+    }
+    
+    public static Vec3 atCenterOf(final Vec3i gr) {
+        return new Vec3(gr.getX() + 0.5, gr.getY() + 0.5, gr.getZ() + 0.5);
+    }
+    
+    public static Vec3 atLowerCornerOf(final Vec3i gr) {
+        return new Vec3(gr.getX(), gr.getY(), gr.getZ());
+    }
+    
+    public static Vec3 atBottomCenterOf(final Vec3i gr) {
+        return new Vec3(gr.getX() + 0.5, gr.getY(), gr.getZ() + 0.5);
+    }
+    
+    public static Vec3 upFromBottomCenterOf(final Vec3i gr, final double double2) {
+        return new Vec3(gr.getX() + 0.5, gr.getY() + double2, gr.getZ() + 0.5);
+    }
+    
     public Vec3(final double double1, final double double2, final double double3) {
         this.x = double1;
         this.y = double2;
         this.z = double3;
     }
     
-    public Vec3(final Vector3f e) {
-        this(e.x(), e.y(), e.z());
+    public Vec3(final Vector3f g) {
+        this(g.x(), g.y(), g.z());
     }
     
-    public Vec3(final Vec3i gg) {
-        this(gg.getX(), gg.getY(), gg.getZ());
-    }
-    
-    public Vec3 vectorTo(final Vec3 cvl) {
-        return new Vec3(cvl.x - this.x, cvl.y - this.y, cvl.z - this.z);
+    public Vec3 vectorTo(final Vec3 dem) {
+        return new Vec3(dem.x - this.x, dem.y - this.y, dem.z - this.z);
     }
     
     public Vec3 normalize() {
@@ -39,41 +58,45 @@ public class Vec3 implements Position {
         return new Vec3(this.x / double2, this.y / double2, this.z / double2);
     }
     
-    public double dot(final Vec3 cvl) {
-        return this.x * cvl.x + this.y * cvl.y + this.z * cvl.z;
+    public double dot(final Vec3 dem) {
+        return this.x * dem.x + this.y * dem.y + this.z * dem.z;
     }
     
-    public Vec3 cross(final Vec3 cvl) {
-        return new Vec3(this.y * cvl.z - this.z * cvl.y, this.z * cvl.x - this.x * cvl.z, this.x * cvl.y - this.y * cvl.x);
+    public Vec3 cross(final Vec3 dem) {
+        return new Vec3(this.y * dem.z - this.z * dem.y, this.z * dem.x - this.x * dem.z, this.x * dem.y - this.y * dem.x);
     }
     
-    public Vec3 subtract(final Vec3 cvl) {
-        return this.subtract(cvl.x, cvl.y, cvl.z);
+    public Vec3 subtract(final Vec3 dem) {
+        return this.subtract(dem.x, dem.y, dem.z);
     }
     
     public Vec3 subtract(final double double1, final double double2, final double double3) {
         return this.add(-double1, -double2, -double3);
     }
     
-    public Vec3 add(final Vec3 cvl) {
-        return this.add(cvl.x, cvl.y, cvl.z);
+    public Vec3 add(final Vec3 dem) {
+        return this.add(dem.x, dem.y, dem.z);
     }
     
     public Vec3 add(final double double1, final double double2, final double double3) {
         return new Vec3(this.x + double1, this.y + double2, this.z + double3);
     }
     
-    public double distanceTo(final Vec3 cvl) {
-        final double double3 = cvl.x - this.x;
-        final double double4 = cvl.y - this.y;
-        final double double5 = cvl.z - this.z;
+    public boolean closerThan(final Position gj, final double double2) {
+        return this.distanceToSqr(gj.x(), gj.y(), gj.z()) < double2 * double2;
+    }
+    
+    public double distanceTo(final Vec3 dem) {
+        final double double3 = dem.x - this.x;
+        final double double4 = dem.y - this.y;
+        final double double5 = dem.z - this.z;
         return Mth.sqrt(double3 * double3 + double4 * double4 + double5 * double5);
     }
     
-    public double distanceToSqr(final Vec3 cvl) {
-        final double double3 = cvl.x - this.x;
-        final double double4 = cvl.y - this.y;
-        final double double5 = cvl.z - this.z;
+    public double distanceToSqr(final Vec3 dem) {
+        final double double3 = dem.x - this.x;
+        final double double4 = dem.y - this.y;
+        final double double5 = dem.z - this.z;
         return double3 * double3 + double4 * double4 + double5 * double5;
     }
     
@@ -92,8 +115,8 @@ public class Vec3 implements Position {
         return this.scale(-1.0);
     }
     
-    public Vec3 multiply(final Vec3 cvl) {
-        return this.multiply(cvl.x, cvl.y, cvl.z);
+    public Vec3 multiply(final Vec3 dem) {
+        return this.multiply(dem.x, dem.y, dem.z);
     }
     
     public Vec3 multiply(final double double1, final double double2, final double double3) {
@@ -116,8 +139,8 @@ public class Vec3 implements Position {
         if (!(object instanceof Vec3)) {
             return false;
         }
-        final Vec3 cvl3 = (Vec3)object;
-        return Double.compare(cvl3.x, this.x) == 0 && Double.compare(cvl3.y, this.y) == 0 && Double.compare(cvl3.z, this.z) == 0;
+        final Vec3 dem3 = (Vec3)object;
+        return Double.compare(dem3.x, this.x) == 0 && Double.compare(dem3.y, this.y) == 0 && Double.compare(dem3.z, this.z) == 0;
     }
     
     @Override
@@ -154,8 +177,8 @@ public class Vec3 implements Position {
         return new Vec3(double5, double6, double7);
     }
     
-    public static Vec3 directionFromRotation(final Vec2 cvk) {
-        return directionFromRotation(cvk.x, cvk.y);
+    public static Vec3 directionFromRotation(final Vec2 del) {
+        return directionFromRotation(del.x, del.y);
     }
     
     public static Vec3 directionFromRotation(final float float1, final float float2) {
diff --git a/src/net/minecraft/world/phys/shapes/ArrayVoxelShape.java b/src/net/minecraft/world/phys/shapes/ArrayVoxelShape.java
index 133ac37..d5d1652 100644
--- a/src/net/minecraft/world/phys/shapes/ArrayVoxelShape.java
+++ b/src/net/minecraft/world/phys/shapes/ArrayVoxelShape.java
@@ -11,15 +11,15 @@ public final class ArrayVoxelShape extends VoxelShape {
     private final DoubleList ys;
     private final DoubleList zs;
     
-    protected ArrayVoxelShape(final DiscreteVoxelShape cvu, final double[] arr2, final double[] arr3, final double[] arr4) {
-        this(cvu, (DoubleList)DoubleArrayList.wrap(Arrays.copyOf(arr2, cvu.getXSize() + 1)), (DoubleList)DoubleArrayList.wrap(Arrays.copyOf(arr3, cvu.getYSize() + 1)), (DoubleList)DoubleArrayList.wrap(Arrays.copyOf(arr4, cvu.getZSize() + 1)));
+    protected ArrayVoxelShape(final DiscreteVoxelShape dev, final double[] arr2, final double[] arr3, final double[] arr4) {
+        this(dev, (DoubleList)DoubleArrayList.wrap(Arrays.copyOf(arr2, dev.getXSize() + 1)), (DoubleList)DoubleArrayList.wrap(Arrays.copyOf(arr3, dev.getYSize() + 1)), (DoubleList)DoubleArrayList.wrap(Arrays.copyOf(arr4, dev.getZSize() + 1)));
     }
     
-    ArrayVoxelShape(final DiscreteVoxelShape cvu, final DoubleList doubleList2, final DoubleList doubleList3, final DoubleList doubleList4) {
-        super(cvu);
-        final int integer6 = cvu.getXSize() + 1;
-        final int integer7 = cvu.getYSize() + 1;
-        final int integer8 = cvu.getZSize() + 1;
+    ArrayVoxelShape(final DiscreteVoxelShape dev, final DoubleList doubleList2, final DoubleList doubleList3, final DoubleList doubleList4) {
+        super(dev);
+        final int integer6 = dev.getXSize() + 1;
+        final int integer7 = dev.getYSize() + 1;
+        final int integer8 = dev.getZSize() + 1;
         if (integer6 != doubleList2.size() || integer7 != doubleList3.size() || integer8 != doubleList4.size()) {
             throw Util.<IllegalArgumentException>pauseInIde(new IllegalArgumentException("Lengths of point arrays must be consistent with the size of the VoxelShape."));
         }
diff --git a/src/net/minecraft/world/phys/shapes/BitSetDiscreteVoxelShape.java b/src/net/minecraft/world/phys/shapes/BitSetDiscreteVoxelShape.java
index ce0ffdc..fb5fb2e 100644
--- a/src/net/minecraft/world/phys/shapes/BitSetDiscreteVoxelShape.java
+++ b/src/net/minecraft/world/phys/shapes/BitSetDiscreteVoxelShape.java
@@ -27,29 +27,29 @@ public final class BitSetDiscreteVoxelShape extends DiscreteVoxelShape {
         this.zMax = integer9;
     }
     
-    public BitSetDiscreteVoxelShape(final DiscreteVoxelShape cvu) {
-        super(cvu.xSize, cvu.ySize, cvu.zSize);
-        if (cvu instanceof BitSetDiscreteVoxelShape) {
-            this.storage = (BitSet)((BitSetDiscreteVoxelShape)cvu).storage.clone();
+    public BitSetDiscreteVoxelShape(final DiscreteVoxelShape dev) {
+        super(dev.xSize, dev.ySize, dev.zSize);
+        if (dev instanceof BitSetDiscreteVoxelShape) {
+            this.storage = (BitSet)((BitSetDiscreteVoxelShape)dev).storage.clone();
         }
         else {
             this.storage = new BitSet(this.xSize * this.ySize * this.zSize);
             for (int integer3 = 0; integer3 < this.xSize; ++integer3) {
                 for (int integer4 = 0; integer4 < this.ySize; ++integer4) {
                     for (int integer5 = 0; integer5 < this.zSize; ++integer5) {
-                        if (cvu.isFull(integer3, integer4, integer5)) {
+                        if (dev.isFull(integer3, integer4, integer5)) {
                             this.storage.set(this.getIndex(integer3, integer4, integer5));
                         }
                     }
                 }
             }
         }
-        this.xMin = cvu.firstFull(Direction.Axis.X);
-        this.yMin = cvu.firstFull(Direction.Axis.Y);
-        this.zMin = cvu.firstFull(Direction.Axis.Z);
-        this.xMax = cvu.lastFull(Direction.Axis.X);
-        this.yMax = cvu.lastFull(Direction.Axis.Y);
-        this.zMax = cvu.lastFull(Direction.Axis.Z);
+        this.xMin = dev.firstFull(Direction.Axis.X);
+        this.yMin = dev.firstFull(Direction.Axis.Y);
+        this.zMin = dev.firstFull(Direction.Axis.Z);
+        this.xMax = dev.lastFull(Direction.Axis.X);
+        this.yMax = dev.lastFull(Direction.Axis.Y);
+        this.zMax = dev.lastFull(Direction.Axis.Z);
     }
     
     protected int getIndex(final int integer1, final int integer2, final int integer3) {
@@ -99,8 +99,8 @@ public final class BitSetDiscreteVoxelShape extends DiscreteVoxelShape {
         this.storage.set(this.getIndex(integer3, integer4, integer1), this.getIndex(integer3, integer4, integer2), boolean5);
     }
     
-    static BitSetDiscreteVoxelShape join(final DiscreteVoxelShape cvu1, final DiscreteVoxelShape cvu2, final IndexMerger cvx3, final IndexMerger cvx4, final IndexMerger cvx5, final BooleanOp cvp) {
-        final BitSetDiscreteVoxelShape cvo7 = new BitSetDiscreteVoxelShape(cvx3.getList().size() - 1, cvx4.getList().size() - 1, cvx5.getList().size() - 1);
+    static BitSetDiscreteVoxelShape join(final DiscreteVoxelShape dev1, final DiscreteVoxelShape dev2, final IndexMerger dey3, final IndexMerger dey4, final IndexMerger dey5, final BooleanOp deq) {
+        final BitSetDiscreteVoxelShape dep7 = new BitSetDiscreteVoxelShape(dey3.getList().size() - 1, dey4.getList().size() - 1, dey5.getList().size() - 1);
         final int[] arr8 = { Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE };
         final boolean[] arr9;
         final boolean[] arr10;
@@ -113,12 +113,12 @@ public final class BitSetDiscreteVoxelShape extends DiscreteVoxelShape {
         final Object o4;
         final boolean boolean12;
         final Object o5;
-        cvx3.forMergedIndexes((integer8, integer9, integer10) -> {
+        dey3.forMergedIndexes((integer8, integer9, integer10) -> {
             arr9 = new boolean[] { false };
-            boolean12 = cvx4.forMergedIndexes((integer11, integer12, integer13) -> {
+            boolean12 = dey4.forMergedIndexes((integer11, integer12, integer13) -> {
                 arr10 = new boolean[] { false };
-                boolean13 = cvx5.forMergedIndexes((integer13, integer14, integer15) -> {
-                    boolean14 = cvp.apply(cvu1.isFullWide(integer8, integer11, integer13), cvu2.isFullWide(integer9, integer12, integer14));
+                boolean13 = dey5.forMergedIndexes((integer13, integer14, integer15) -> {
+                    boolean14 = deq.apply(dev1.isFullWide(integer8, integer11, integer13), dev2.isFullWide(integer9, integer12, integer14));
                     if (boolean14) {
                         bitSetDiscreteVoxelShape.storage.set(bitSetDiscreteVoxelShape.getIndex(integer10, integer13, integer15));
                         o[2] = Math.min(o[2], integer15);
@@ -140,12 +140,12 @@ public final class BitSetDiscreteVoxelShape extends DiscreteVoxelShape {
             }
             return boolean12;
         });
-        cvo7.xMin = arr8[0];
-        cvo7.yMin = arr8[1];
-        cvo7.zMin = arr8[2];
-        cvo7.xMax = arr8[3] + 1;
-        cvo7.yMax = arr8[4] + 1;
-        cvo7.zMax = arr8[5] + 1;
-        return cvo7;
+        dep7.xMin = arr8[0];
+        dep7.yMin = arr8[1];
+        dep7.zMin = arr8[2];
+        dep7.xMax = arr8[3] + 1;
+        dep7.yMax = arr8[4] + 1;
+        dep7.zMax = arr8[5] + 1;
+        return dep7;
     }
 }
diff --git a/src/net/minecraft/world/phys/shapes/CollisionContext.java b/src/net/minecraft/world/phys/shapes/CollisionContext.java
index 87b8935..3d0fad0 100644
--- a/src/net/minecraft/world/phys/shapes/CollisionContext.java
+++ b/src/net/minecraft/world/phys/shapes/CollisionContext.java
@@ -1,5 +1,7 @@
 package net.minecraft.world.phys.shapes;
 
+import net.minecraft.world.level.material.FlowingFluid;
+import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.item.Item;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
@@ -9,13 +11,15 @@ public interface CollisionContext {
         return EntityCollisionContext.EMPTY;
     }
     
-    default CollisionContext of(final Entity akq) {
-        return new EntityCollisionContext(akq);
+    default CollisionContext of(final Entity aom) {
+        return new EntityCollisionContext(aom);
     }
     
     boolean isDescending();
     
-    boolean isAbove(final VoxelShape cwf, final BlockPos fk, final boolean boolean3);
+    boolean isAbove(final VoxelShape dfg, final BlockPos fu, final boolean boolean3);
     
-    boolean isHoldingItem(final Item bei);
+    boolean isHoldingItem(final Item bke);
+    
+    boolean canStandOnFluid(final FluidState cxa, final FlowingFluid cwy);
 }
diff --git a/src/net/minecraft/world/phys/shapes/CubeVoxelShape.java b/src/net/minecraft/world/phys/shapes/CubeVoxelShape.java
index 49ca5cb..df0a999 100644
--- a/src/net/minecraft/world/phys/shapes/CubeVoxelShape.java
+++ b/src/net/minecraft/world/phys/shapes/CubeVoxelShape.java
@@ -5,8 +5,8 @@ import it.unimi.dsi.fastutil.doubles.DoubleList;
 import net.minecraft.core.Direction;
 
 public final class CubeVoxelShape extends VoxelShape {
-    protected CubeVoxelShape(final DiscreteVoxelShape cvu) {
-        super(cvu);
+    protected CubeVoxelShape(final DiscreteVoxelShape dev) {
+        super(dev);
     }
     
     @Override
diff --git a/src/net/minecraft/world/phys/shapes/DiscreteVoxelShape.java b/src/net/minecraft/world/phys/shapes/DiscreteVoxelShape.java
index 304804a..9843fdc 100644
--- a/src/net/minecraft/world/phys/shapes/DiscreteVoxelShape.java
+++ b/src/net/minecraft/world/phys/shapes/DiscreteVoxelShape.java
@@ -15,16 +15,16 @@ public abstract class DiscreteVoxelShape {
         this.zSize = integer3;
     }
     
-    public boolean isFullWide(final AxisCycle fi, final int integer2, final int integer3, final int integer4) {
-        return this.isFullWide(fi.cycle(integer2, integer3, integer4, Direction.Axis.X), fi.cycle(integer2, integer3, integer4, Direction.Axis.Y), fi.cycle(integer2, integer3, integer4, Direction.Axis.Z));
+    public boolean isFullWide(final AxisCycle fs, final int integer2, final int integer3, final int integer4) {
+        return this.isFullWide(fs.cycle(integer2, integer3, integer4, Direction.Axis.X), fs.cycle(integer2, integer3, integer4, Direction.Axis.Y), fs.cycle(integer2, integer3, integer4, Direction.Axis.Z));
     }
     
     public boolean isFullWide(final int integer1, final int integer2, final int integer3) {
         return integer1 >= 0 && integer2 >= 0 && integer3 >= 0 && integer1 < this.xSize && integer2 < this.ySize && integer3 < this.zSize && this.isFull(integer1, integer2, integer3);
     }
     
-    public boolean isFull(final AxisCycle fi, final int integer2, final int integer3, final int integer4) {
-        return this.isFull(fi.cycle(integer2, integer3, integer4, Direction.Axis.X), fi.cycle(integer2, integer3, integer4, Direction.Axis.Y), fi.cycle(integer2, integer3, integer4, Direction.Axis.Z));
+    public boolean isFull(final AxisCycle fs, final int integer2, final int integer3, final int integer4) {
+        return this.isFull(fs.cycle(integer2, integer3, integer4, Direction.Axis.X), fs.cycle(integer2, integer3, integer4, Direction.Axis.Y), fs.cycle(integer2, integer3, integer4, Direction.Axis.Z));
     }
     
     public abstract boolean isFull(final int integer1, final int integer2, final int integer3);
@@ -44,25 +44,6 @@ public abstract class DiscreteVoxelShape {
     
     public abstract int lastFull(final Direction.Axis a);
     
-    public int firstFull(final Direction.Axis a, final int integer2, final int integer3) {
-        final int integer4 = this.getSize(a);
-        if (integer2 < 0 || integer3 < 0) {
-            return integer4;
-        }
-        final Direction.Axis a2 = AxisCycle.FORWARD.cycle(a);
-        final Direction.Axis a3 = AxisCycle.BACKWARD.cycle(a);
-        if (integer2 >= this.getSize(a2) || integer3 >= this.getSize(a3)) {
-            return integer4;
-        }
-        final AxisCycle fi8 = AxisCycle.between(Direction.Axis.X, a);
-        for (int integer5 = 0; integer5 < integer4; ++integer5) {
-            if (this.isFull(fi8, integer5, integer2, integer3)) {
-                return integer5;
-            }
-        }
-        return integer4;
-    }
-    
     public int lastFull(final Direction.Axis a, final int integer2, final int integer3) {
         if (integer2 < 0 || integer3 < 0) {
             return 0;
@@ -73,9 +54,9 @@ public abstract class DiscreteVoxelShape {
             return 0;
         }
         final int integer4 = this.getSize(a);
-        final AxisCycle fi8 = AxisCycle.between(Direction.Axis.X, a);
+        final AxisCycle fs8 = AxisCycle.between(Direction.Axis.X, a);
         for (int integer5 = integer4 - 1; integer5 >= 0; --integer5) {
-            if (this.isFull(fi8, integer5, integer2, integer3)) {
+            if (this.isFull(fs8, integer5, integer2, integer3)) {
                 return integer5 + 1;
             }
         }
@@ -104,11 +85,11 @@ public abstract class DiscreteVoxelShape {
         this.forAllAxisEdges(b, AxisCycle.BACKWARD, boolean2);
     }
     
-    private void forAllAxisEdges(final IntLineConsumer b, final AxisCycle fi, final boolean boolean3) {
-        final AxisCycle fi2 = fi.inverse();
-        final int integer7 = this.getSize(fi2.cycle(Direction.Axis.X));
-        final int integer8 = this.getSize(fi2.cycle(Direction.Axis.Y));
-        final int integer9 = this.getSize(fi2.cycle(Direction.Axis.Z));
+    private void forAllAxisEdges(final IntLineConsumer b, final AxisCycle fs, final boolean boolean3) {
+        final AxisCycle fs2 = fs.inverse();
+        final int integer7 = this.getSize(fs2.cycle(Direction.Axis.X));
+        final int integer8 = this.getSize(fs2.cycle(Direction.Axis.Y));
+        final int integer9 = this.getSize(fs2.cycle(Direction.Axis.Z));
         for (int integer10 = 0; integer10 <= integer7; ++integer10) {
             for (int integer11 = 0; integer11 <= integer8; ++integer11) {
                 int integer12 = -1;
@@ -117,7 +98,7 @@ public abstract class DiscreteVoxelShape {
                     int integer15 = 0;
                     for (int integer16 = 0; integer16 <= 1; ++integer16) {
                         for (int integer17 = 0; integer17 <= 1; ++integer17) {
-                            if (this.isFullWide(fi2, integer10 + integer16 - 1, integer11 + integer17 - 1, integer13)) {
+                            if (this.isFullWide(fs2, integer10 + integer16 - 1, integer11 + integer17 - 1, integer13)) {
                                 ++integer14;
                                 integer15 ^= (integer16 ^ integer17);
                             }
@@ -130,11 +111,11 @@ public abstract class DiscreteVoxelShape {
                             }
                         }
                         else {
-                            b.consume(fi2.cycle(integer10, integer11, integer13, Direction.Axis.X), fi2.cycle(integer10, integer11, integer13, Direction.Axis.Y), fi2.cycle(integer10, integer11, integer13, Direction.Axis.Z), fi2.cycle(integer10, integer11, integer13 + 1, Direction.Axis.X), fi2.cycle(integer10, integer11, integer13 + 1, Direction.Axis.Y), fi2.cycle(integer10, integer11, integer13 + 1, Direction.Axis.Z));
+                            b.consume(fs2.cycle(integer10, integer11, integer13, Direction.Axis.X), fs2.cycle(integer10, integer11, integer13, Direction.Axis.Y), fs2.cycle(integer10, integer11, integer13, Direction.Axis.Z), fs2.cycle(integer10, integer11, integer13 + 1, Direction.Axis.X), fs2.cycle(integer10, integer11, integer13 + 1, Direction.Axis.Y), fs2.cycle(integer10, integer11, integer13 + 1, Direction.Axis.Z));
                         }
                     }
                     else if (integer12 != -1) {
-                        b.consume(fi2.cycle(integer10, integer11, integer12, Direction.Axis.X), fi2.cycle(integer10, integer11, integer12, Direction.Axis.Y), fi2.cycle(integer10, integer11, integer12, Direction.Axis.Z), fi2.cycle(integer10, integer11, integer13, Direction.Axis.X), fi2.cycle(integer10, integer11, integer13, Direction.Axis.Y), fi2.cycle(integer10, integer11, integer13, Direction.Axis.Z));
+                        b.consume(fs2.cycle(integer10, integer11, integer12, Direction.Axis.X), fs2.cycle(integer10, integer11, integer12, Direction.Axis.Y), fs2.cycle(integer10, integer11, integer12, Direction.Axis.Z), fs2.cycle(integer10, integer11, integer13, Direction.Axis.X), fs2.cycle(integer10, integer11, integer13, Direction.Axis.Y), fs2.cycle(integer10, integer11, integer13, Direction.Axis.Z));
                         integer12 = -1;
                     }
                 }
@@ -167,12 +148,12 @@ public abstract class DiscreteVoxelShape {
     }
     
     public void forAllBoxes(final IntLineConsumer b, final boolean boolean2) {
-        final DiscreteVoxelShape cvu4 = new BitSetDiscreteVoxelShape(this);
+        final DiscreteVoxelShape dev4 = new BitSetDiscreteVoxelShape(this);
         for (int integer5 = 0; integer5 <= this.xSize; ++integer5) {
             for (int integer6 = 0; integer6 <= this.ySize; ++integer6) {
                 int integer7 = -1;
                 for (int integer8 = 0; integer8 <= this.zSize; ++integer8) {
-                    if (cvu4.isFullWide(integer5, integer6, integer8)) {
+                    if (dev4.isFullWide(integer5, integer6, integer8)) {
                         if (boolean2) {
                             if (integer7 == -1) {
                                 integer7 = integer8;
@@ -187,24 +168,24 @@ public abstract class DiscreteVoxelShape {
                         int integer10 = integer5;
                         int integer11 = integer6;
                         int integer12 = integer6;
-                        cvu4.setZStrip(integer7, integer8, integer5, integer6, false);
-                        while (cvu4.isZStripFull(integer7, integer8, integer9 - 1, integer11)) {
-                            cvu4.setZStrip(integer7, integer8, integer9 - 1, integer11, false);
+                        dev4.setZStrip(integer7, integer8, integer5, integer6, false);
+                        while (dev4.isZStripFull(integer7, integer8, integer9 - 1, integer11)) {
+                            dev4.setZStrip(integer7, integer8, integer9 - 1, integer11, false);
                             --integer9;
                         }
-                        while (cvu4.isZStripFull(integer7, integer8, integer10 + 1, integer11)) {
-                            cvu4.setZStrip(integer7, integer8, integer10 + 1, integer11, false);
+                        while (dev4.isZStripFull(integer7, integer8, integer10 + 1, integer11)) {
+                            dev4.setZStrip(integer7, integer8, integer10 + 1, integer11, false);
                             ++integer10;
                         }
-                        while (cvu4.isXZRectangleFull(integer9, integer10 + 1, integer7, integer8, integer11 - 1)) {
+                        while (dev4.isXZRectangleFull(integer9, integer10 + 1, integer7, integer8, integer11 - 1)) {
                             for (int integer13 = integer9; integer13 <= integer10; ++integer13) {
-                                cvu4.setZStrip(integer7, integer8, integer13, integer11 - 1, false);
+                                dev4.setZStrip(integer7, integer8, integer13, integer11 - 1, false);
                             }
                             --integer11;
                         }
-                        while (cvu4.isXZRectangleFull(integer9, integer10 + 1, integer7, integer8, integer12 + 1)) {
+                        while (dev4.isXZRectangleFull(integer9, integer10 + 1, integer7, integer8, integer12 + 1)) {
                             for (int integer13 = integer9; integer13 <= integer10; ++integer13) {
-                                cvu4.setZStrip(integer7, integer8, integer13, integer12 + 1, false);
+                                dev4.setZStrip(integer7, integer8, integer13, integer12 + 1, false);
                             }
                             ++integer12;
                         }
@@ -222,24 +203,24 @@ public abstract class DiscreteVoxelShape {
         this.forAllAxisFaces(a, AxisCycle.BACKWARD);
     }
     
-    private void forAllAxisFaces(final IntFaceConsumer a, final AxisCycle fi) {
-        final AxisCycle fi2 = fi.inverse();
-        final Direction.Axis a2 = fi2.cycle(Direction.Axis.Z);
-        final int integer6 = this.getSize(fi2.cycle(Direction.Axis.X));
-        final int integer7 = this.getSize(fi2.cycle(Direction.Axis.Y));
+    private void forAllAxisFaces(final IntFaceConsumer a, final AxisCycle fs) {
+        final AxisCycle fs2 = fs.inverse();
+        final Direction.Axis a2 = fs2.cycle(Direction.Axis.Z);
+        final int integer6 = this.getSize(fs2.cycle(Direction.Axis.X));
+        final int integer7 = this.getSize(fs2.cycle(Direction.Axis.Y));
         final int integer8 = this.getSize(a2);
-        final Direction fp9 = Direction.fromAxisAndDirection(a2, Direction.AxisDirection.NEGATIVE);
-        final Direction fp10 = Direction.fromAxisAndDirection(a2, Direction.AxisDirection.POSITIVE);
+        final Direction fz9 = Direction.fromAxisAndDirection(a2, Direction.AxisDirection.NEGATIVE);
+        final Direction fz10 = Direction.fromAxisAndDirection(a2, Direction.AxisDirection.POSITIVE);
         for (int integer9 = 0; integer9 < integer6; ++integer9) {
             for (int integer10 = 0; integer10 < integer7; ++integer10) {
                 boolean boolean13 = false;
                 for (int integer11 = 0; integer11 <= integer8; ++integer11) {
-                    final boolean boolean14 = integer11 != integer8 && this.isFull(fi2, integer9, integer10, integer11);
+                    final boolean boolean14 = integer11 != integer8 && this.isFull(fs2, integer9, integer10, integer11);
                     if (!boolean13 && boolean14) {
-                        a.consume(fp9, fi2.cycle(integer9, integer10, integer11, Direction.Axis.X), fi2.cycle(integer9, integer10, integer11, Direction.Axis.Y), fi2.cycle(integer9, integer10, integer11, Direction.Axis.Z));
+                        a.consume(fz9, fs2.cycle(integer9, integer10, integer11, Direction.Axis.X), fs2.cycle(integer9, integer10, integer11, Direction.Axis.Y), fs2.cycle(integer9, integer10, integer11, Direction.Axis.Z));
                     }
                     if (boolean13 && !boolean14) {
-                        a.consume(fp10, fi2.cycle(integer9, integer10, integer11 - 1, Direction.Axis.X), fi2.cycle(integer9, integer10, integer11 - 1, Direction.Axis.Y), fi2.cycle(integer9, integer10, integer11 - 1, Direction.Axis.Z));
+                        a.consume(fz10, fs2.cycle(integer9, integer10, integer11 - 1, Direction.Axis.X), fs2.cycle(integer9, integer10, integer11 - 1, Direction.Axis.Y), fs2.cycle(integer9, integer10, integer11 - 1, Direction.Axis.Z));
                     }
                     boolean13 = boolean14;
                 }
@@ -252,7 +233,7 @@ public abstract class DiscreteVoxelShape {
     }
     
     public interface IntFaceConsumer {
-        void consume(final Direction fp, final int integer2, final int integer3, final int integer4);
+        void consume(final Direction fz, final int integer2, final int integer3, final int integer4);
     }
     
     public interface IntLineConsumer {
diff --git a/src/net/minecraft/world/phys/shapes/EntityCollisionContext.java b/src/net/minecraft/world/phys/shapes/EntityCollisionContext.java
index 70fa1d0..dc36706 100644
--- a/src/net/minecraft/world/phys/shapes/EntityCollisionContext.java
+++ b/src/net/minecraft/world/phys/shapes/EntityCollisionContext.java
@@ -2,9 +2,13 @@ package net.minecraft.world.phys.shapes;
 
 import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.material.FlowingFluid;
+import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.material.Fluid;
+import java.util.function.Predicate;
 import net.minecraft.world.item.Item;
 
 public class EntityCollisionContext implements CollisionContext {
@@ -12,21 +16,28 @@ public class EntityCollisionContext implements CollisionContext {
     private final boolean descending;
     private final double entityBottom;
     private final Item heldItem;
+    private final Predicate<Fluid> canStandOnFluid;
     
-    protected EntityCollisionContext(final boolean boolean1, final double double2, final Item bei) {
+    protected EntityCollisionContext(final boolean boolean1, final double double2, final Item bke, final Predicate<Fluid> predicate) {
         this.descending = boolean1;
         this.entityBottom = double2;
-        this.heldItem = bei;
+        this.heldItem = bke;
+        this.canStandOnFluid = predicate;
     }
     
     @Deprecated
-    protected EntityCollisionContext(final Entity akq) {
-        this(akq.isDescending(), akq.getY(), (akq instanceof LivingEntity) ? ((LivingEntity)akq).getMainHandItem().getItem() : Items.AIR);
+    protected EntityCollisionContext(final Entity aom) {
+        this(aom.isDescending(), aom.getY(), (aom instanceof LivingEntity) ? ((LivingEntity)aom).getMainHandItem().getItem() : Items.AIR, (aom instanceof LivingEntity) ? (LivingEntity)aom::canStandOnFluid : (cwz -> false));
     }
     
     @Override
-    public boolean isHoldingItem(final Item bei) {
-        return this.heldItem == bei;
+    public boolean isHoldingItem(final Item bke) {
+        return this.heldItem == bke;
+    }
+    
+    @Override
+    public boolean canStandOnFluid(final FluidState cxa, final FlowingFluid cwy) {
+        return this.canStandOnFluid.test(cwy) && !cxa.getType().isSame(cwy);
     }
     
     @Override
@@ -35,14 +46,14 @@ public class EntityCollisionContext implements CollisionContext {
     }
     
     @Override
-    public boolean isAbove(final VoxelShape cwf, final BlockPos fk, final boolean boolean3) {
-        return this.entityBottom > fk.getY() + cwf.max(Direction.Axis.Y) - 9.999999747378752E-6;
+    public boolean isAbove(final VoxelShape dfg, final BlockPos fu, final boolean boolean3) {
+        return this.entityBottom > fu.getY() + dfg.max(Direction.Axis.Y) - 9.999999747378752E-6;
     }
     
     static {
-        EMPTY = new EntityCollisionContext(false, -1.7976931348623157E308, Items.AIR) {
+        EMPTY = new EntityCollisionContext(false, -1.7976931348623157E308, Items.AIR, cwz -> false) {
             @Override
-            public boolean isAbove(final VoxelShape cwf, final BlockPos fk, final boolean boolean3) {
+            public boolean isAbove(final VoxelShape dfg, final BlockPos fu, final boolean boolean3) {
                 return boolean3;
             }
         };
diff --git a/src/net/minecraft/world/phys/shapes/Shapes.java b/src/net/minecraft/world/phys/shapes/Shapes.java
index 01e96c5..86a26fc 100644
--- a/src/net/minecraft/world/phys/shapes/Shapes.java
+++ b/src/net/minecraft/world/phys/shapes/Shapes.java
@@ -37,34 +37,34 @@ public final class Shapes {
         return create(new AABB(double1, double2, double3, double4, double5, double6));
     }
     
-    public static VoxelShape create(final AABB cvf) {
-        final int integer2 = findBits(cvf.minX, cvf.maxX);
-        final int integer3 = findBits(cvf.minY, cvf.maxY);
-        final int integer4 = findBits(cvf.minZ, cvf.maxZ);
+    public static VoxelShape create(final AABB deg) {
+        final int integer2 = findBits(deg.minX, deg.maxX);
+        final int integer3 = findBits(deg.minY, deg.maxY);
+        final int integer4 = findBits(deg.minZ, deg.maxZ);
         if (integer2 < 0 || integer3 < 0 || integer4 < 0) {
-            return new ArrayVoxelShape(Shapes.BLOCK.shape, new double[] { cvf.minX, cvf.maxX }, new double[] { cvf.minY, cvf.maxY }, new double[] { cvf.minZ, cvf.maxZ });
+            return new ArrayVoxelShape(Shapes.BLOCK.shape, new double[] { deg.minX, deg.maxX }, new double[] { deg.minY, deg.maxY }, new double[] { deg.minZ, deg.maxZ });
         }
         if (integer2 == 0 && integer3 == 0 && integer4 == 0) {
-            return cvf.contains(0.5, 0.5, 0.5) ? block() : empty();
+            return deg.contains(0.5, 0.5, 0.5) ? block() : empty();
         }
         final int integer5 = 1 << integer2;
         final int integer6 = 1 << integer3;
         final int integer7 = 1 << integer4;
-        final int integer8 = (int)Math.round(cvf.minX * integer5);
-        final int integer9 = (int)Math.round(cvf.maxX * integer5);
-        final int integer10 = (int)Math.round(cvf.minY * integer6);
-        final int integer11 = (int)Math.round(cvf.maxY * integer6);
-        final int integer12 = (int)Math.round(cvf.minZ * integer7);
-        final int integer13 = (int)Math.round(cvf.maxZ * integer7);
-        final BitSetDiscreteVoxelShape cvo14 = new BitSetDiscreteVoxelShape(integer5, integer6, integer7, integer8, integer10, integer12, integer9, integer11, integer13);
+        final int integer8 = (int)Math.round(deg.minX * integer5);
+        final int integer9 = (int)Math.round(deg.maxX * integer5);
+        final int integer10 = (int)Math.round(deg.minY * integer6);
+        final int integer11 = (int)Math.round(deg.maxY * integer6);
+        final int integer12 = (int)Math.round(deg.minZ * integer7);
+        final int integer13 = (int)Math.round(deg.maxZ * integer7);
+        final BitSetDiscreteVoxelShape dep14 = new BitSetDiscreteVoxelShape(integer5, integer6, integer7, integer8, integer10, integer12, integer9, integer11, integer13);
         for (long long15 = integer8; long15 < integer9; ++long15) {
             for (long long16 = integer10; long16 < integer11; ++long16) {
                 for (long long17 = integer12; long17 < integer13; ++long17) {
-                    cvo14.setFull((int)long15, (int)long16, (int)long17, false, true);
+                    dep14.setFull((int)long15, (int)long16, (int)long17, false, true);
                 }
             }
         }
-        return new CubeVoxelShape(cvo14);
+        return new CubeVoxelShape(dep14);
     }
     
     private static int findBits(final double double1, final double double2) {
@@ -87,111 +87,111 @@ public final class Shapes {
         return integer1 * (long)(integer2 / IntMath.gcd(integer1, integer2));
     }
     
-    public static VoxelShape or(final VoxelShape cwf1, final VoxelShape cwf2) {
-        return join(cwf1, cwf2, BooleanOp.OR);
+    public static VoxelShape or(final VoxelShape dfg1, final VoxelShape dfg2) {
+        return join(dfg1, dfg2, BooleanOp.OR);
     }
     
-    public static VoxelShape or(final VoxelShape cwf, final VoxelShape... arr) {
-        return Arrays.<VoxelShape>stream(arr).reduce(cwf, Shapes::or);
+    public static VoxelShape or(final VoxelShape dfg, final VoxelShape... arr) {
+        return Arrays.<VoxelShape>stream(arr).reduce(dfg, Shapes::or);
     }
     
-    public static VoxelShape join(final VoxelShape cwf1, final VoxelShape cwf2, final BooleanOp cvp) {
-        return joinUnoptimized(cwf1, cwf2, cvp).optimize();
+    public static VoxelShape join(final VoxelShape dfg1, final VoxelShape dfg2, final BooleanOp deq) {
+        return joinUnoptimized(dfg1, dfg2, deq).optimize();
     }
     
-    public static VoxelShape joinUnoptimized(final VoxelShape cwf1, final VoxelShape cwf2, final BooleanOp cvp) {
-        if (cvp.apply(false, false)) {
+    public static VoxelShape joinUnoptimized(final VoxelShape dfg1, final VoxelShape dfg2, final BooleanOp deq) {
+        if (deq.apply(false, false)) {
             throw Util.<IllegalArgumentException>pauseInIde(new IllegalArgumentException());
         }
-        if (cwf1 == cwf2) {
-            return cvp.apply(true, true) ? cwf1 : empty();
+        if (dfg1 == dfg2) {
+            return deq.apply(true, true) ? dfg1 : empty();
         }
-        final boolean boolean4 = cvp.apply(true, false);
-        final boolean boolean5 = cvp.apply(false, true);
-        if (cwf1.isEmpty()) {
-            return boolean5 ? cwf2 : empty();
+        final boolean boolean4 = deq.apply(true, false);
+        final boolean boolean5 = deq.apply(false, true);
+        if (dfg1.isEmpty()) {
+            return boolean5 ? dfg2 : empty();
         }
-        if (cwf2.isEmpty()) {
-            return boolean4 ? cwf1 : empty();
+        if (dfg2.isEmpty()) {
+            return boolean4 ? dfg1 : empty();
         }
-        final IndexMerger cvx6 = createIndexMerger(1, cwf1.getCoords(Direction.Axis.X), cwf2.getCoords(Direction.Axis.X), boolean4, boolean5);
-        final IndexMerger cvx7 = createIndexMerger(cvx6.getList().size() - 1, cwf1.getCoords(Direction.Axis.Y), cwf2.getCoords(Direction.Axis.Y), boolean4, boolean5);
-        final IndexMerger cvx8 = createIndexMerger((cvx6.getList().size() - 1) * (cvx7.getList().size() - 1), cwf1.getCoords(Direction.Axis.Z), cwf2.getCoords(Direction.Axis.Z), boolean4, boolean5);
-        final BitSetDiscreteVoxelShape cvo9 = BitSetDiscreteVoxelShape.join(cwf1.shape, cwf2.shape, cvx6, cvx7, cvx8, cvp);
-        if (cvx6 instanceof DiscreteCubeMerger && cvx7 instanceof DiscreteCubeMerger && cvx8 instanceof DiscreteCubeMerger) {
-            return new CubeVoxelShape(cvo9);
+        final IndexMerger dey6 = createIndexMerger(1, dfg1.getCoords(Direction.Axis.X), dfg2.getCoords(Direction.Axis.X), boolean4, boolean5);
+        final IndexMerger dey7 = createIndexMerger(dey6.getList().size() - 1, dfg1.getCoords(Direction.Axis.Y), dfg2.getCoords(Direction.Axis.Y), boolean4, boolean5);
+        final IndexMerger dey8 = createIndexMerger((dey6.getList().size() - 1) * (dey7.getList().size() - 1), dfg1.getCoords(Direction.Axis.Z), dfg2.getCoords(Direction.Axis.Z), boolean4, boolean5);
+        final BitSetDiscreteVoxelShape dep9 = BitSetDiscreteVoxelShape.join(dfg1.shape, dfg2.shape, dey6, dey7, dey8, deq);
+        if (dey6 instanceof DiscreteCubeMerger && dey7 instanceof DiscreteCubeMerger && dey8 instanceof DiscreteCubeMerger) {
+            return new CubeVoxelShape(dep9);
         }
-        return new ArrayVoxelShape(cvo9, cvx6.getList(), cvx7.getList(), cvx8.getList());
+        return new ArrayVoxelShape(dep9, dey6.getList(), dey7.getList(), dey8.getList());
     }
     
-    public static boolean joinIsNotEmpty(final VoxelShape cwf1, final VoxelShape cwf2, final BooleanOp cvp) {
-        if (cvp.apply(false, false)) {
+    public static boolean joinIsNotEmpty(final VoxelShape dfg1, final VoxelShape dfg2, final BooleanOp deq) {
+        if (deq.apply(false, false)) {
             throw Util.<IllegalArgumentException>pauseInIde(new IllegalArgumentException());
         }
-        if (cwf1 == cwf2) {
-            return cvp.apply(true, true);
+        if (dfg1 == dfg2) {
+            return deq.apply(true, true);
         }
-        if (cwf1.isEmpty()) {
-            return cvp.apply(false, !cwf2.isEmpty());
+        if (dfg1.isEmpty()) {
+            return deq.apply(false, !dfg2.isEmpty());
         }
-        if (cwf2.isEmpty()) {
-            return cvp.apply(!cwf1.isEmpty(), false);
+        if (dfg2.isEmpty()) {
+            return deq.apply(!dfg1.isEmpty(), false);
         }
-        final boolean boolean4 = cvp.apply(true, false);
-        final boolean boolean5 = cvp.apply(false, true);
+        final boolean boolean4 = deq.apply(true, false);
+        final boolean boolean5 = deq.apply(false, true);
         for (final Direction.Axis a9 : AxisCycle.AXIS_VALUES) {
-            if (cwf1.max(a9) < cwf2.min(a9) - 1.0E-7) {
+            if (dfg1.max(a9) < dfg2.min(a9) - 1.0E-7) {
                 return boolean4 || boolean5;
             }
-            if (cwf2.max(a9) < cwf1.min(a9) - 1.0E-7) {
+            if (dfg2.max(a9) < dfg1.min(a9) - 1.0E-7) {
                 return boolean4 || boolean5;
             }
         }
-        final IndexMerger cvx6 = createIndexMerger(1, cwf1.getCoords(Direction.Axis.X), cwf2.getCoords(Direction.Axis.X), boolean4, boolean5);
-        final IndexMerger cvx7 = createIndexMerger(cvx6.getList().size() - 1, cwf1.getCoords(Direction.Axis.Y), cwf2.getCoords(Direction.Axis.Y), boolean4, boolean5);
-        final IndexMerger cvx8 = createIndexMerger((cvx6.getList().size() - 1) * (cvx7.getList().size() - 1), cwf1.getCoords(Direction.Axis.Z), cwf2.getCoords(Direction.Axis.Z), boolean4, boolean5);
-        return joinIsNotEmpty(cvx6, cvx7, cvx8, cwf1.shape, cwf2.shape, cvp);
+        final IndexMerger dey6 = createIndexMerger(1, dfg1.getCoords(Direction.Axis.X), dfg2.getCoords(Direction.Axis.X), boolean4, boolean5);
+        final IndexMerger dey7 = createIndexMerger(dey6.getList().size() - 1, dfg1.getCoords(Direction.Axis.Y), dfg2.getCoords(Direction.Axis.Y), boolean4, boolean5);
+        final IndexMerger dey8 = createIndexMerger((dey6.getList().size() - 1) * (dey7.getList().size() - 1), dfg1.getCoords(Direction.Axis.Z), dfg2.getCoords(Direction.Axis.Z), boolean4, boolean5);
+        return joinIsNotEmpty(dey6, dey7, dey8, dfg1.shape, dfg2.shape, deq);
     }
     
-    private static boolean joinIsNotEmpty(final IndexMerger cvx1, final IndexMerger cvx2, final IndexMerger cvx3, final DiscreteVoxelShape cvu4, final DiscreteVoxelShape cvu5, final BooleanOp cvp) {
-        return !cvx1.forMergedIndexes((integer6, integer7, integer8) -> cvx2.forMergedIndexes((integer7, integer8, integer9) -> cvx3.forMergedIndexes((integer8, integer9, integer10) -> !cvp.apply(cvu4.isFullWide(integer6, integer7, integer8), cvu5.isFullWide(integer7, integer8, integer9)))));
+    private static boolean joinIsNotEmpty(final IndexMerger dey1, final IndexMerger dey2, final IndexMerger dey3, final DiscreteVoxelShape dev4, final DiscreteVoxelShape dev5, final BooleanOp deq) {
+        return !dey1.forMergedIndexes((integer6, integer7, integer8) -> dey2.forMergedIndexes((integer7, integer8, integer9) -> dey3.forMergedIndexes((integer8, integer9, integer10) -> !deq.apply(dev4.isFullWide(integer6, integer7, integer8), dev5.isFullWide(integer7, integer8, integer9)))));
     }
     
-    public static double collide(final Direction.Axis a, final AABB cvf, final Stream<VoxelShape> stream, double double4) {
+    public static double collide(final Direction.Axis a, final AABB deg, final Stream<VoxelShape> stream, double double4) {
         final Iterator<VoxelShape> iterator6 = stream.iterator();
         while (iterator6.hasNext()) {
             if (Math.abs(double4) < 1.0E-7) {
                 return 0.0;
             }
-            double4 = iterator6.next().collide(a, cvf, double4);
+            double4 = iterator6.next().collide(a, deg, double4);
         }
         return double4;
     }
     
-    public static double collide(final Direction.Axis a, final AABB cvf, final LevelReader bjz, final double double4, final CollisionContext cvq, final Stream<VoxelShape> stream) {
-        return collide(cvf, bjz, double4, cvq, AxisCycle.between(a, Direction.Axis.Z), stream);
+    public static double collide(final Direction.Axis a, final AABB deg, final LevelReader bqd, final double double4, final CollisionContext der, final Stream<VoxelShape> stream) {
+        return collide(deg, bqd, double4, der, AxisCycle.between(a, Direction.Axis.Z), stream);
     }
     
-    private static double collide(final AABB cvf, final LevelReader bjz, double double3, final CollisionContext cvq, final AxisCycle fi, final Stream<VoxelShape> stream) {
-        if (cvf.getXsize() < 1.0E-6 || cvf.getYsize() < 1.0E-6 || cvf.getZsize() < 1.0E-6) {
+    private static double collide(final AABB deg, final LevelReader bqd, double double3, final CollisionContext der, final AxisCycle fs, final Stream<VoxelShape> stream) {
+        if (deg.getXsize() < 1.0E-6 || deg.getYsize() < 1.0E-6 || deg.getZsize() < 1.0E-6) {
             return double3;
         }
         if (Math.abs(double3) < 1.0E-7) {
             return 0.0;
         }
-        final AxisCycle fi2 = fi.inverse();
-        final Direction.Axis a9 = fi2.cycle(Direction.Axis.X);
-        final Direction.Axis a10 = fi2.cycle(Direction.Axis.Y);
-        final Direction.Axis a11 = fi2.cycle(Direction.Axis.Z);
+        final AxisCycle fs2 = fs.inverse();
+        final Direction.Axis a9 = fs2.cycle(Direction.Axis.X);
+        final Direction.Axis a10 = fs2.cycle(Direction.Axis.Y);
+        final Direction.Axis a11 = fs2.cycle(Direction.Axis.Z);
         final BlockPos.MutableBlockPos a12 = new BlockPos.MutableBlockPos();
-        final int integer13 = Mth.floor(cvf.min(a9) - 1.0E-7) - 1;
-        final int integer14 = Mth.floor(cvf.max(a9) + 1.0E-7) + 1;
-        final int integer15 = Mth.floor(cvf.min(a10) - 1.0E-7) - 1;
-        final int integer16 = Mth.floor(cvf.max(a10) + 1.0E-7) + 1;
-        final double double4 = cvf.min(a11) - 1.0E-7;
-        final double double5 = cvf.max(a11) + 1.0E-7;
+        final int integer13 = Mth.floor(deg.min(a9) - 1.0E-7) - 1;
+        final int integer14 = Mth.floor(deg.max(a9) + 1.0E-7) + 1;
+        final int integer15 = Mth.floor(deg.min(a10) - 1.0E-7) - 1;
+        final int integer16 = Mth.floor(deg.max(a10) + 1.0E-7) + 1;
+        final double double4 = deg.min(a11) - 1.0E-7;
+        final double double5 = deg.max(a11) + 1.0E-7;
         final boolean boolean21 = double3 > 0.0;
-        final int integer17 = boolean21 ? (Mth.floor(cvf.max(a11) - 1.0E-7) - 1) : (Mth.floor(cvf.min(a11) + 1.0E-7) + 1);
+        final int integer17 = boolean21 ? (Mth.floor(deg.max(a11) - 1.0E-7) - 1) : (Mth.floor(deg.min(a11) + 1.0E-7) + 1);
         int integer18 = lastC(double3, double4, double5);
         final int integer19 = boolean21 ? 1 : -1;
         int integer20 = integer17;
@@ -217,11 +217,11 @@ public final class Shapes {
                         ++integer23;
                     }
                     if (integer23 < 3) {
-                        a12.set(fi2, integer21, integer22, integer20);
-                        final BlockState byj29 = bjz.getBlockState(a12);
-                        if (integer23 != 1 || byj29.hasLargeCollisionShape()) {
-                            if (integer23 != 2 || byj29.getBlock() == Blocks.MOVING_PISTON) {
-                                double3 = byj29.getCollisionShape(bjz, a12, cvq).collide(a11, cvf.move(-a12.getX(), -a12.getY(), -a12.getZ()), double3);
+                        a12.set(fs2, integer21, integer22, integer20);
+                        final BlockState cfj29 = bqd.getBlockState(a12);
+                        if (integer23 != 1 || cfj29.hasLargeCollisionShape()) {
+                            if (integer23 != 2 || cfj29.is(Blocks.MOVING_PISTON)) {
+                                double3 = cfj29.getCollisionShape(bqd, a12, der).collide(a11, deg.move(-a12.getX(), -a12.getY(), -a12.getZ()), double3);
                                 if (Math.abs(double3) < 1.0E-7) {
                                     return 0.0;
                                 }
@@ -235,7 +235,7 @@ public final class Shapes {
         }
         final double[] arr25 = { double3 };
         final Object o;
-        stream.forEach(cwf -> o[0] = cwf.collide(a11, cvf, o[0]));
+        stream.forEach(dfg -> o[0] = dfg.collide(a11, deg, o[0]));
         return arr25[0];
     }
     
@@ -243,61 +243,61 @@ public final class Shapes {
         return (double1 > 0.0) ? (Mth.floor(double3 + double1) + 1) : (Mth.floor(double2 + double1) - 1);
     }
     
-    public static boolean blockOccudes(final VoxelShape cwf1, final VoxelShape cwf2, final Direction fp) {
-        if (cwf1 == block() && cwf2 == block()) {
+    public static boolean blockOccudes(final VoxelShape dfg1, final VoxelShape dfg2, final Direction fz) {
+        if (dfg1 == block() && dfg2 == block()) {
             return true;
         }
-        if (cwf2.isEmpty()) {
+        if (dfg2.isEmpty()) {
             return false;
         }
-        final Direction.Axis a4 = fp.getAxis();
-        final Direction.AxisDirection b5 = fp.getAxisDirection();
-        final VoxelShape cwf3 = (b5 == Direction.AxisDirection.POSITIVE) ? cwf1 : cwf2;
-        final VoxelShape cwf4 = (b5 == Direction.AxisDirection.POSITIVE) ? cwf2 : cwf1;
-        final BooleanOp cvp8 = (b5 == Direction.AxisDirection.POSITIVE) ? BooleanOp.ONLY_FIRST : BooleanOp.ONLY_SECOND;
-        return DoubleMath.fuzzyEquals(cwf3.max(a4), 1.0, 1.0E-7) && DoubleMath.fuzzyEquals(cwf4.min(a4), 0.0, 1.0E-7) && !joinIsNotEmpty(new SliceShape(cwf3, a4, cwf3.shape.getSize(a4) - 1), new SliceShape(cwf4, a4, 0), cvp8);
+        final Direction.Axis a4 = fz.getAxis();
+        final Direction.AxisDirection b5 = fz.getAxisDirection();
+        final VoxelShape dfg3 = (b5 == Direction.AxisDirection.POSITIVE) ? dfg1 : dfg2;
+        final VoxelShape dfg4 = (b5 == Direction.AxisDirection.POSITIVE) ? dfg2 : dfg1;
+        final BooleanOp deq8 = (b5 == Direction.AxisDirection.POSITIVE) ? BooleanOp.ONLY_FIRST : BooleanOp.ONLY_SECOND;
+        return DoubleMath.fuzzyEquals(dfg3.max(a4), 1.0, 1.0E-7) && DoubleMath.fuzzyEquals(dfg4.min(a4), 0.0, 1.0E-7) && !joinIsNotEmpty(new SliceShape(dfg3, a4, dfg3.shape.getSize(a4) - 1), new SliceShape(dfg4, a4, 0), deq8);
     }
     
-    public static VoxelShape getFaceShape(final VoxelShape cwf, final Direction fp) {
-        if (cwf == block()) {
+    public static VoxelShape getFaceShape(final VoxelShape dfg, final Direction fz) {
+        if (dfg == block()) {
             return block();
         }
-        final Direction.Axis a5 = fp.getAxis();
+        final Direction.Axis a5 = fz.getAxis();
         boolean boolean3;
         int integer4;
-        if (fp.getAxisDirection() == Direction.AxisDirection.POSITIVE) {
-            boolean3 = DoubleMath.fuzzyEquals(cwf.max(a5), 1.0, 1.0E-7);
-            integer4 = cwf.shape.getSize(a5) - 1;
+        if (fz.getAxisDirection() == Direction.AxisDirection.POSITIVE) {
+            boolean3 = DoubleMath.fuzzyEquals(dfg.max(a5), 1.0, 1.0E-7);
+            integer4 = dfg.shape.getSize(a5) - 1;
         }
         else {
-            boolean3 = DoubleMath.fuzzyEquals(cwf.min(a5), 0.0, 1.0E-7);
+            boolean3 = DoubleMath.fuzzyEquals(dfg.min(a5), 0.0, 1.0E-7);
             integer4 = 0;
         }
         if (!boolean3) {
             return empty();
         }
-        return new SliceShape(cwf, a5, integer4);
+        return new SliceShape(dfg, a5, integer4);
     }
     
-    public static boolean mergedFaceOccludes(final VoxelShape cwf1, final VoxelShape cwf2, final Direction fp) {
-        if (cwf1 == block() || cwf2 == block()) {
+    public static boolean mergedFaceOccludes(final VoxelShape dfg1, final VoxelShape dfg2, final Direction fz) {
+        if (dfg1 == block() || dfg2 == block()) {
             return true;
         }
-        final Direction.Axis a4 = fp.getAxis();
-        final Direction.AxisDirection b5 = fp.getAxisDirection();
-        VoxelShape cwf3 = (b5 == Direction.AxisDirection.POSITIVE) ? cwf1 : cwf2;
-        VoxelShape cwf4 = (b5 == Direction.AxisDirection.POSITIVE) ? cwf2 : cwf1;
-        if (!DoubleMath.fuzzyEquals(cwf3.max(a4), 1.0, 1.0E-7)) {
-            cwf3 = empty();
+        final Direction.Axis a4 = fz.getAxis();
+        final Direction.AxisDirection b5 = fz.getAxisDirection();
+        VoxelShape dfg3 = (b5 == Direction.AxisDirection.POSITIVE) ? dfg1 : dfg2;
+        VoxelShape dfg4 = (b5 == Direction.AxisDirection.POSITIVE) ? dfg2 : dfg1;
+        if (!DoubleMath.fuzzyEquals(dfg3.max(a4), 1.0, 1.0E-7)) {
+            dfg3 = empty();
         }
-        if (!DoubleMath.fuzzyEquals(cwf4.min(a4), 0.0, 1.0E-7)) {
-            cwf4 = empty();
+        if (!DoubleMath.fuzzyEquals(dfg4.min(a4), 0.0, 1.0E-7)) {
+            dfg4 = empty();
         }
-        return !joinIsNotEmpty(block(), joinUnoptimized(new SliceShape(cwf3, a4, cwf3.shape.getSize(a4) - 1), new SliceShape(cwf4, a4, 0), BooleanOp.OR), BooleanOp.ONLY_FIRST);
+        return !joinIsNotEmpty(block(), joinUnoptimized(new SliceShape(dfg3, a4, dfg3.shape.getSize(a4) - 1), new SliceShape(dfg4, a4, 0), BooleanOp.OR), BooleanOp.ONLY_FIRST);
     }
     
-    public static boolean faceShapeOccludes(final VoxelShape cwf1, final VoxelShape cwf2) {
-        return cwf1 == block() || cwf2 == block() || ((!cwf1.isEmpty() || !cwf2.isEmpty()) && !joinIsNotEmpty(block(), joinUnoptimized(cwf1, cwf2, BooleanOp.OR), BooleanOp.ONLY_FIRST));
+    public static boolean faceShapeOccludes(final VoxelShape dfg1, final VoxelShape dfg2) {
+        return dfg1 == block() || dfg2 == block() || ((!dfg1.isEmpty() || !dfg2.isEmpty()) && !joinIsNotEmpty(block(), joinUnoptimized(dfg1, dfg2, BooleanOp.OR), BooleanOp.ONLY_FIRST));
     }
     
     @VisibleForTesting
@@ -329,11 +329,11 @@ public final class Shapes {
     }
     
     static {
-        final BitSetDiscreteVoxelShape cvu1;
+        final BitSetDiscreteVoxelShape dev1;
         BLOCK = Util.<CubeVoxelShape>make(() -> {
-            cvu1 = new BitSetDiscreteVoxelShape(1, 1, 1);
-            cvu1.setFull(0, 0, 0, true, true);
-            return new CubeVoxelShape(cvu1);
+            dev1 = new BitSetDiscreteVoxelShape(1, 1, 1);
+            dev1.setFull(0, 0, 0, true, true);
+            return new CubeVoxelShape(dev1);
         });
         INFINITY = box(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
         EMPTY = new ArrayVoxelShape(new BitSetDiscreteVoxelShape(0, 0, 0), (DoubleList)new DoubleArrayList(new double[] { 0.0 }), (DoubleList)new DoubleArrayList(new double[] { 0.0 }), (DoubleList)new DoubleArrayList(new double[] { 0.0 }));
diff --git a/src/net/minecraft/world/phys/shapes/SliceShape.java b/src/net/minecraft/world/phys/shapes/SliceShape.java
index bec97c4..6b711e9 100644
--- a/src/net/minecraft/world/phys/shapes/SliceShape.java
+++ b/src/net/minecraft/world/phys/shapes/SliceShape.java
@@ -8,14 +8,14 @@ public class SliceShape extends VoxelShape {
     private final Direction.Axis axis;
     private static final DoubleList SLICE_COORDS;
     
-    public SliceShape(final VoxelShape cwf, final Direction.Axis a, final int integer) {
-        super(makeSlice(cwf.shape, a, integer));
-        this.delegate = cwf;
+    public SliceShape(final VoxelShape dfg, final Direction.Axis a, final int integer) {
+        super(makeSlice(dfg.shape, a, integer));
+        this.delegate = dfg;
         this.axis = a;
     }
     
-    private static DiscreteVoxelShape makeSlice(final DiscreteVoxelShape cvu, final Direction.Axis a, final int integer) {
-        return new SubShape(cvu, a.choose(integer, 0, 0), a.choose(0, integer, 0), a.choose(0, 0, integer), a.choose(integer + 1, cvu.xSize, cvu.xSize), a.choose(cvu.ySize, integer + 1, cvu.ySize), a.choose(cvu.zSize, cvu.zSize, integer + 1));
+    private static DiscreteVoxelShape makeSlice(final DiscreteVoxelShape dev, final Direction.Axis a, final int integer) {
+        return new SubShape(dev, a.choose(integer, 0, 0), a.choose(0, integer, 0), a.choose(0, 0, integer), a.choose(integer + 1, dev.xSize, dev.xSize), a.choose(dev.ySize, integer + 1, dev.ySize), a.choose(dev.zSize, dev.zSize, integer + 1));
     }
     
     @Override
diff --git a/src/net/minecraft/world/phys/shapes/SubShape.java b/src/net/minecraft/world/phys/shapes/SubShape.java
index dc57691..9f9460e 100644
--- a/src/net/minecraft/world/phys/shapes/SubShape.java
+++ b/src/net/minecraft/world/phys/shapes/SubShape.java
@@ -11,9 +11,9 @@ public final class SubShape extends DiscreteVoxelShape {
     private final int endY;
     private final int endZ;
     
-    protected SubShape(final DiscreteVoxelShape cvu, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7) {
+    protected SubShape(final DiscreteVoxelShape dev, final int integer2, final int integer3, final int integer4, final int integer5, final int integer6, final int integer7) {
         super(integer5 - integer2, integer6 - integer3, integer7 - integer4);
-        this.parent = cvu;
+        this.parent = dev;
         this.startX = integer2;
         this.startY = integer3;
         this.startZ = integer4;
diff --git a/src/net/minecraft/world/phys/shapes/VoxelShape.java b/src/net/minecraft/world/phys/shapes/VoxelShape.java
index c2c2c50..97a8b90 100644
--- a/src/net/minecraft/world/phys/shapes/VoxelShape.java
+++ b/src/net/minecraft/world/phys/shapes/VoxelShape.java
@@ -19,8 +19,8 @@ public abstract class VoxelShape {
     @Nullable
     private VoxelShape[] faces;
     
-    VoxelShape(final DiscreteVoxelShape cvu) {
-        this.shape = cvu;
+    VoxelShape(final DiscreteVoxelShape dev) {
+        this.shape = dev;
     }
     
     public double min(final Direction.Axis a) {
@@ -90,18 +90,6 @@ public abstract class VoxelShape {
         return list2;
     }
     
-    public double min(final Direction.Axis a, final double double2, final double double3) {
-        final Direction.Axis a2 = AxisCycle.FORWARD.cycle(a);
-        final Direction.Axis a3 = AxisCycle.BACKWARD.cycle(a);
-        final int integer9 = this.findIndex(a2, double2);
-        final int integer10 = this.findIndex(a3, double3);
-        final int integer11 = this.shape.firstFull(a, integer9, integer10);
-        if (integer11 >= this.shape.getSize(a)) {
-            return Double.POSITIVE_INFINITY;
-        }
-        return this.get(a, integer11);
-    }
-    
     public double max(final Direction.Axis a, final double double2, final double double3) {
         final Direction.Axis a2 = AxisCycle.FORWARD.cycle(a);
         final Direction.Axis a3 = AxisCycle.BACKWARD.cycle(a);
@@ -133,41 +121,41 @@ public abstract class VoxelShape {
     }
     
     @Nullable
-    public BlockHitResult clip(final Vec3 cvl1, final Vec3 cvl2, final BlockPos fk) {
+    public BlockHitResult clip(final Vec3 dem1, final Vec3 dem2, final BlockPos fu) {
         if (this.isEmpty()) {
             return null;
         }
-        final Vec3 cvl3 = cvl2.subtract(cvl1);
-        if (cvl3.lengthSqr() < 1.0E-7) {
+        final Vec3 dem3 = dem2.subtract(dem1);
+        if (dem3.lengthSqr() < 1.0E-7) {
             return null;
         }
-        final Vec3 cvl4 = cvl1.add(cvl3.scale(0.001));
-        if (this.isFullWide(cvl4.x - fk.getX(), cvl4.y - fk.getY(), cvl4.z - fk.getZ())) {
-            return new BlockHitResult(cvl4, Direction.getNearest(cvl3.x, cvl3.y, cvl3.z).getOpposite(), fk, true);
+        final Vec3 dem4 = dem1.add(dem3.scale(0.001));
+        if (this.isFullWide(dem4.x - fu.getX(), dem4.y - fu.getY(), dem4.z - fu.getZ())) {
+            return new BlockHitResult(dem4, Direction.getNearest(dem3.x, dem3.y, dem3.z).getOpposite(), fu, true);
         }
-        return AABB.clip(this.toAabbs(), cvl1, cvl2, fk);
+        return AABB.clip(this.toAabbs(), dem1, dem2, fu);
     }
     
-    public VoxelShape getFaceShape(final Direction fp) {
+    public VoxelShape getFaceShape(final Direction fz) {
         if (this.isEmpty() || this == Shapes.block()) {
             return this;
         }
         if (this.faces != null) {
-            final VoxelShape cwf3 = this.faces[fp.ordinal()];
-            if (cwf3 != null) {
-                return cwf3;
+            final VoxelShape dfg3 = this.faces[fz.ordinal()];
+            if (dfg3 != null) {
+                return dfg3;
             }
         }
         else {
             this.faces = new VoxelShape[6];
         }
-        final VoxelShape cwf3 = this.calculateFace(fp);
-        return this.faces[fp.ordinal()] = cwf3;
+        final VoxelShape dfg3 = this.calculateFace(fz);
+        return this.faces[fz.ordinal()] = dfg3;
     }
     
-    private VoxelShape calculateFace(final Direction fp) {
-        final Direction.Axis a3 = fp.getAxis();
-        final Direction.AxisDirection b4 = fp.getAxisDirection();
+    private VoxelShape calculateFace(final Direction fz) {
+        final Direction.Axis a3 = fz.getAxis();
+        final Direction.AxisDirection b4 = fz.getAxisDirection();
         final DoubleList doubleList5 = this.getCoords(a3);
         if (doubleList5.size() == 2 && DoubleMath.fuzzyEquals(doubleList5.getDouble(0), 0.0, 1.0E-7) && DoubleMath.fuzzyEquals(doubleList5.getDouble(1), 1.0, 1.0E-7)) {
             return this;
@@ -176,35 +164,35 @@ public abstract class VoxelShape {
         return new SliceShape(this, a3, integer6);
     }
     
-    public double collide(final Direction.Axis a, final AABB cvf, final double double3) {
-        return this.collideX(AxisCycle.between(a, Direction.Axis.X), cvf, double3);
+    public double collide(final Direction.Axis a, final AABB deg, final double double3) {
+        return this.collideX(AxisCycle.between(a, Direction.Axis.X), deg, double3);
     }
     
-    protected double collideX(final AxisCycle fi, final AABB cvf, double double3) {
+    protected double collideX(final AxisCycle fs, final AABB deg, double double3) {
         if (this.isEmpty()) {
             return double3;
         }
         if (Math.abs(double3) < 1.0E-7) {
             return 0.0;
         }
-        final AxisCycle fi2 = fi.inverse();
-        final Direction.Axis a7 = fi2.cycle(Direction.Axis.X);
-        final Direction.Axis a8 = fi2.cycle(Direction.Axis.Y);
-        final Direction.Axis a9 = fi2.cycle(Direction.Axis.Z);
-        final double double4 = cvf.max(a7);
-        final double double5 = cvf.min(a7);
+        final AxisCycle fs2 = fs.inverse();
+        final Direction.Axis a7 = fs2.cycle(Direction.Axis.X);
+        final Direction.Axis a8 = fs2.cycle(Direction.Axis.Y);
+        final Direction.Axis a9 = fs2.cycle(Direction.Axis.Z);
+        final double double4 = deg.max(a7);
+        final double double5 = deg.min(a7);
         final int integer14 = this.findIndex(a7, double5 + 1.0E-7);
         final int integer15 = this.findIndex(a7, double4 - 1.0E-7);
-        final int integer16 = Math.max(0, this.findIndex(a8, cvf.min(a8) + 1.0E-7));
-        final int integer17 = Math.min(this.shape.getSize(a8), this.findIndex(a8, cvf.max(a8) - 1.0E-7) + 1);
-        final int integer18 = Math.max(0, this.findIndex(a9, cvf.min(a9) + 1.0E-7));
-        final int integer19 = Math.min(this.shape.getSize(a9), this.findIndex(a9, cvf.max(a9) - 1.0E-7) + 1);
+        final int integer16 = Math.max(0, this.findIndex(a8, deg.min(a8) + 1.0E-7));
+        final int integer17 = Math.min(this.shape.getSize(a8), this.findIndex(a8, deg.max(a8) - 1.0E-7) + 1);
+        final int integer18 = Math.max(0, this.findIndex(a9, deg.min(a9) + 1.0E-7));
+        final int integer19 = Math.min(this.shape.getSize(a9), this.findIndex(a9, deg.max(a9) - 1.0E-7) + 1);
         final int integer20 = this.shape.getSize(a7);
         if (double3 > 0.0) {
             for (int integer21 = integer15 + 1; integer21 < integer20; ++integer21) {
                 for (int integer22 = integer16; integer22 < integer17; ++integer22) {
                     for (int integer23 = integer18; integer23 < integer19; ++integer23) {
-                        if (this.shape.isFullWide(fi2, integer21, integer22, integer23)) {
+                        if (this.shape.isFullWide(fs2, integer21, integer22, integer23)) {
                             final double double6 = this.get(a7, integer21) - double4;
                             if (double6 >= -1.0E-7) {
                                 double3 = Math.min(double3, double6);
@@ -219,7 +207,7 @@ public abstract class VoxelShape {
             for (int integer21 = integer14 - 1; integer21 >= 0; --integer21) {
                 for (int integer22 = integer16; integer22 < integer17; ++integer22) {
                     for (int integer23 = integer18; integer23 < integer19; ++integer23) {
-                        if (this.shape.isFullWide(fi2, integer21, integer22, integer23)) {
+                        if (this.shape.isFullWide(fs2, integer21, integer22, integer23)) {
                             final double double6 = this.get(a7, integer21 + 1) - double5;
                             if (double6 <= 1.0E-7) {
                                 double3 = Math.max(double3, double6);
diff --git a/src/net/minecraft/world/scores/Objective.java b/src/net/minecraft/world/scores/Objective.java
index d9dd080..5b4291f 100644
--- a/src/net/minecraft/world/scores/Objective.java
+++ b/src/net/minecraft/world/scores/Objective.java
@@ -12,13 +12,15 @@ public class Objective {
     private final String name;
     private final ObjectiveCriteria criteria;
     private Component displayName;
+    private Component formattedDisplayName;
     private ObjectiveCriteria.RenderType renderType;
     
-    public Objective(final Scoreboard cwl, final String string, final ObjectiveCriteria cwo, final Component lf, final ObjectiveCriteria.RenderType a) {
-        this.scoreboard = cwl;
+    public Objective(final Scoreboard dfm, final String string, final ObjectiveCriteria dfp, final Component mr, final ObjectiveCriteria.RenderType a) {
+        this.scoreboard = dfm;
         this.name = string;
-        this.criteria = cwo;
-        this.displayName = lf;
+        this.criteria = dfp;
+        this.displayName = mr;
+        this.formattedDisplayName = this.createFormattedDisplayName();
         this.renderType = a;
     }
     
@@ -38,16 +40,21 @@ public class Objective {
         return this.displayName;
     }
     
-    public Component getFormattedDisplayName() {
-        final HoverEvent hoverEvent;
-        return ComponentUtils.wrapInSquareBrackets(this.displayName.deepCopy().withStyle(ln -> {
-            new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent(this.getName()));
-            ln.setHoverEvent(hoverEvent);
+    private Component createFormattedDisplayName() {
+        final HoverEvent mv;
+        return ComponentUtils.wrapInSquareBrackets(this.displayName.copy().withStyle(nb -> {
+            new HoverEvent((HoverEvent.Action<TextComponent>)HoverEvent.Action.SHOW_TEXT, new TextComponent(this.name));
+            return nb.withHoverEvent(mv);
         }));
     }
     
-    public void setDisplayName(final Component lf) {
-        this.displayName = lf;
+    public Component getFormattedDisplayName() {
+        return this.formattedDisplayName;
+    }
+    
+    public void setDisplayName(final Component mr) {
+        this.displayName = mr;
+        this.formattedDisplayName = this.createFormattedDisplayName();
         this.scoreboard.onObjectiveChanged(this);
     }
     
diff --git a/src/net/minecraft/world/scores/PlayerTeam.java b/src/net/minecraft/world/scores/PlayerTeam.java
index 00a530b..3251451 100644
--- a/src/net/minecraft/world/scores/PlayerTeam.java
+++ b/src/net/minecraft/world/scores/PlayerTeam.java
@@ -1,12 +1,13 @@
 package net.minecraft.world.scores;
 
-import net.minecraft.network.chat.Style;
 import java.util.Collection;
 import javax.annotation.Nullable;
 import net.minecraft.network.chat.ComponentUtils;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.TextComponent;
 import com.google.common.collect.Sets;
+import net.minecraft.network.chat.Style;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import java.util.Set;
@@ -24,20 +25,22 @@ public class PlayerTeam extends Team {
     private Visibility deathMessageVisibility;
     private ChatFormatting color;
     private CollisionRule collisionRule;
+    private final Style displayNameStyle;
     
-    public PlayerTeam(final Scoreboard cwl, final String string) {
+    public PlayerTeam(final Scoreboard dfm, final String string) {
         this.players = Sets.newHashSet();
-        this.playerPrefix = new TextComponent("");
-        this.playerSuffix = new TextComponent("");
+        this.playerPrefix = TextComponent.EMPTY;
+        this.playerSuffix = TextComponent.EMPTY;
         this.allowFriendlyFire = true;
         this.seeFriendlyInvisibles = true;
         this.nameTagVisibility = Visibility.ALWAYS;
         this.deathMessageVisibility = Visibility.ALWAYS;
         this.color = ChatFormatting.RESET;
         this.collisionRule = CollisionRule.ALWAYS;
-        this.scoreboard = cwl;
+        this.scoreboard = dfm;
         this.name = string;
         this.displayName = new TextComponent(string);
+        this.displayNameStyle = Style.EMPTY.withInsertion(string).withHoverEvent(new HoverEvent((HoverEvent.Action<T>)HoverEvent.Action.SHOW_TEXT, (T)new TextComponent(string)));
     }
     
     @Override
@@ -49,32 +52,25 @@ public class PlayerTeam extends Team {
         return this.displayName;
     }
     
-    public Component getFormattedDisplayName() {
-        final HoverEvent hoverEvent;
-        final Object o;
-        final Component lf2 = ComponentUtils.wrapInSquareBrackets(this.displayName.deepCopy().withStyle(ln -> {
-            ln.setInsertion(this.name);
-            new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent(this.name));
-            ((Style)o).setHoverEvent(hoverEvent);
-            return;
-        }));
-        final ChatFormatting g3 = this.getColor();
-        if (g3 != ChatFormatting.RESET) {
-            lf2.withStyle(g3);
+    public MutableComponent getFormattedDisplayName() {
+        final MutableComponent mx2 = ComponentUtils.wrapInSquareBrackets(this.displayName.copy().withStyle(this.displayNameStyle));
+        final ChatFormatting i3 = this.getColor();
+        if (i3 != ChatFormatting.RESET) {
+            mx2.withStyle(i3);
         }
-        return lf2;
+        return mx2;
     }
     
-    public void setDisplayName(final Component lf) {
-        if (lf == null) {
+    public void setDisplayName(final Component mr) {
+        if (mr == null) {
             throw new IllegalArgumentException("Name cannot be null");
         }
-        this.displayName = lf;
+        this.displayName = mr;
         this.scoreboard.onTeamChanged(this);
     }
     
-    public void setPlayerPrefix(@Nullable final Component lf) {
-        this.playerPrefix = ((lf == null) ? new TextComponent("") : lf.deepCopy());
+    public void setPlayerPrefix(@Nullable final Component mr) {
+        this.playerPrefix = ((mr == null) ? TextComponent.EMPTY : mr);
         this.scoreboard.onTeamChanged(this);
     }
     
@@ -82,8 +78,8 @@ public class PlayerTeam extends Team {
         return this.playerPrefix;
     }
     
-    public void setPlayerSuffix(@Nullable final Component lf) {
-        this.playerSuffix = ((lf == null) ? new TextComponent("") : lf.deepCopy());
+    public void setPlayerSuffix(@Nullable final Component mr) {
+        this.playerSuffix = ((mr == null) ? TextComponent.EMPTY : mr);
         this.scoreboard.onTeamChanged(this);
     }
     
@@ -97,20 +93,20 @@ public class PlayerTeam extends Team {
     }
     
     @Override
-    public Component getFormattedName(final Component lf) {
-        final Component lf2 = new TextComponent("").append(this.playerPrefix).append(lf).append(this.playerSuffix);
-        final ChatFormatting g4 = this.getColor();
-        if (g4 != ChatFormatting.RESET) {
-            lf2.withStyle(g4);
+    public MutableComponent getFormattedName(final Component mr) {
+        final MutableComponent mx3 = new TextComponent("").append(this.playerPrefix).append(mr).append(this.playerSuffix);
+        final ChatFormatting i4 = this.getColor();
+        if (i4 != ChatFormatting.RESET) {
+            mx3.withStyle(i4);
         }
-        return lf2;
+        return mx3;
     }
     
-    public static Component formatNameForTeam(@Nullable final Team cwn, final Component lf) {
-        if (cwn == null) {
-            return lf.deepCopy();
+    public static MutableComponent formatNameForTeam(@Nullable final Team dfo, final Component mr) {
+        if (dfo == null) {
+            return mr.copy();
         }
-        return cwn.getFormattedName(lf);
+        return dfo.getFormattedName(mr);
     }
     
     @Override
@@ -179,8 +175,8 @@ public class PlayerTeam extends Team {
         this.setSeeFriendlyInvisibles((integer & 0x2) > 0);
     }
     
-    public void setColor(final ChatFormatting g) {
-        this.color = g;
+    public void setColor(final ChatFormatting i) {
+        this.color = i;
         this.scoreboard.onTeamChanged(this);
     }
     
diff --git a/src/net/minecraft/world/scores/Score.java b/src/net/minecraft/world/scores/Score.java
index 88a6bf2..d437f1d 100644
--- a/src/net/minecraft/world/scores/Score.java
+++ b/src/net/minecraft/world/scores/Score.java
@@ -13,9 +13,9 @@ public class Score {
     private boolean locked;
     private boolean forceUpdate;
     
-    public Score(final Scoreboard cwl, final Objective cwi, final String string) {
-        this.scoreboard = cwl;
-        this.objective = cwi;
+    public Score(final Scoreboard dfm, final Objective dfj, final String string) {
+        this.scoreboard = dfm;
+        this.objective = dfj;
         this.owner = string;
         this.locked = true;
         this.forceUpdate = true;
@@ -71,15 +71,15 @@ public class Score {
     }
     
     static {
-        SCORE_COMPARATOR = ((cwk1, cwk2) -> {
-            if (cwk1.getScore() > cwk2.getScore()) {
+        SCORE_COMPARATOR = ((dfl1, dfl2) -> {
+            if (dfl1.getScore() > dfl2.getScore()) {
                 return 1;
             }
-            else if (cwk1.getScore() < cwk2.getScore()) {
+            else if (dfl1.getScore() < dfl2.getScore()) {
                 return -1;
             }
             else {
-                return cwk2.getOwner().compareToIgnoreCase(cwk1.getOwner());
+                return dfl2.getOwner().compareToIgnoreCase(dfl1.getOwner());
             }
         });
     }
diff --git a/src/net/minecraft/world/scores/Scoreboard.java b/src/net/minecraft/world/scores/Scoreboard.java
index a4a5e2f..78c446a 100644
--- a/src/net/minecraft/world/scores/Scoreboard.java
+++ b/src/net/minecraft/world/scores/Scoreboard.java
@@ -51,52 +51,52 @@ public class Scoreboard {
         return this.objectivesByName.get(string);
     }
     
-    public Objective addObjective(final String string, final ObjectiveCriteria cwo, final Component lf, final ObjectiveCriteria.RenderType a) {
+    public Objective addObjective(final String string, final ObjectiveCriteria dfp, final Component mr, final ObjectiveCriteria.RenderType a) {
         if (string.length() > 16) {
             throw new IllegalArgumentException("The objective name '" + string + "' is too long!");
         }
         if (this.objectivesByName.containsKey(string)) {
             throw new IllegalArgumentException("An objective with the name '" + string + "' already exists!");
         }
-        final Objective cwi6 = new Objective(this, string, cwo, lf, a);
-        this.objectivesByCriteria.computeIfAbsent(cwo, cwo -> Lists.newArrayList()).add(cwi6);
-        this.objectivesByName.put(string, cwi6);
-        this.onObjectiveAdded(cwi6);
-        return cwi6;
+        final Objective dfj6 = new Objective(this, string, dfp, mr, a);
+        this.objectivesByCriteria.computeIfAbsent(dfp, dfp -> Lists.newArrayList()).add(dfj6);
+        this.objectivesByName.put(string, dfj6);
+        this.onObjectiveAdded(dfj6);
+        return dfj6;
     }
     
-    public final void forAllObjectives(final ObjectiveCriteria cwo, final String string, final Consumer<Score> consumer) {
-        this.objectivesByCriteria.getOrDefault(cwo, Collections.<Objective>emptyList()).forEach(cwi -> consumer.accept(this.getOrCreatePlayerScore(string, cwi)));
+    public final void forAllObjectives(final ObjectiveCriteria dfp, final String string, final Consumer<Score> consumer) {
+        this.objectivesByCriteria.getOrDefault(dfp, Collections.<Objective>emptyList()).forEach(dfj -> consumer.accept(this.getOrCreatePlayerScore(string, dfj)));
     }
     
-    public boolean hasPlayerScore(final String string, final Objective cwi) {
+    public boolean hasPlayerScore(final String string, final Objective dfj) {
         final Map<Objective, Score> map4 = this.playerScores.get(string);
         if (map4 == null) {
             return false;
         }
-        final Score cwk5 = map4.get(cwi);
-        return cwk5 != null;
+        final Score dfl5 = map4.get(dfj);
+        return dfl5 != null;
     }
     
-    public Score getOrCreatePlayerScore(final String string, final Objective cwi) {
+    public Score getOrCreatePlayerScore(final String string, final Objective dfj) {
         if (string.length() > 40) {
             throw new IllegalArgumentException("The player name '" + string + "' is too long!");
         }
         final Map<Objective, Score> map4 = this.playerScores.computeIfAbsent(string, string -> Maps.newHashMap());
-        final Score cwk4;
-        return map4.computeIfAbsent(cwi, cwi -> {
-            cwk4 = new Score(this, cwi, string);
-            cwk4.setScore(0);
-            return cwk4;
+        final Score dfl4;
+        return map4.computeIfAbsent(dfj, dfj -> {
+            dfl4 = new Score(this, dfj, string);
+            dfl4.setScore(0);
+            return dfl4;
         });
     }
     
-    public Collection<Score> getPlayerScores(final Objective cwi) {
+    public Collection<Score> getPlayerScores(final Objective dfj) {
         final List<Score> list3 = Lists.newArrayList();
         for (final Map<Objective, Score> map5 : this.playerScores.values()) {
-            final Score cwk6 = map5.get(cwi);
-            if (cwk6 != null) {
-                list3.add(cwk6);
+            final Score dfl6 = map5.get(dfj);
+            if (dfl6 != null) {
+                list3.add(dfl6);
             }
         }
         list3.sort(Score.SCORE_COMPARATOR);
@@ -115,8 +115,8 @@ public class Scoreboard {
         return Lists.newArrayList(this.playerScores.keySet());
     }
     
-    public void resetPlayerScore(final String string, @Nullable final Objective cwi) {
-        if (cwi == null) {
+    public void resetPlayerScore(final String string, @Nullable final Objective dfj) {
+        if (dfj == null) {
             final Map<Objective, Score> map4 = this.playerScores.remove(string);
             if (map4 != null) {
                 this.onPlayerRemoved(string);
@@ -125,15 +125,15 @@ public class Scoreboard {
         else {
             final Map<Objective, Score> map4 = this.playerScores.get(string);
             if (map4 != null) {
-                final Score cwk5 = map4.remove(cwi);
+                final Score dfl5 = map4.remove(dfj);
                 if (map4.size() < 1) {
                     final Map<Objective, Score> map5 = this.playerScores.remove(string);
                     if (map5 != null) {
                         this.onPlayerRemoved(string);
                     }
                 }
-                else if (cwk5 != null) {
-                    this.onPlayerScoreRemoved(string, cwi);
+                else if (dfl5 != null) {
+                    this.onPlayerScoreRemoved(string, dfj);
                 }
             }
         }
@@ -147,25 +147,25 @@ public class Scoreboard {
         return map3;
     }
     
-    public void removeObjective(final Objective cwi) {
-        this.objectivesByName.remove(cwi.getName());
+    public void removeObjective(final Objective dfj) {
+        this.objectivesByName.remove(dfj.getName());
         for (int integer3 = 0; integer3 < 19; ++integer3) {
-            if (this.getDisplayObjective(integer3) == cwi) {
+            if (this.getDisplayObjective(integer3) == dfj) {
                 this.setDisplayObjective(integer3, null);
             }
         }
-        final List<Objective> list3 = this.objectivesByCriteria.get(cwi.getCriteria());
+        final List<Objective> list3 = this.objectivesByCriteria.get(dfj.getCriteria());
         if (list3 != null) {
-            list3.remove(cwi);
+            list3.remove(dfj);
         }
         for (final Map<Objective, Score> map5 : this.playerScores.values()) {
-            map5.remove(cwi);
+            map5.remove(dfj);
         }
-        this.onObjectiveRemoved(cwi);
+        this.onObjectiveRemoved(dfj);
     }
     
-    public void setDisplayObjective(final int integer, @Nullable final Objective cwi) {
-        this.displayObjectives[integer] = cwi;
+    public void setDisplayObjective(final int integer, @Nullable final Objective dfj) {
+        this.displayObjectives[integer] = dfj;
     }
     
     @Nullable
@@ -181,50 +181,50 @@ public class Scoreboard {
         if (string.length() > 16) {
             throw new IllegalArgumentException("The team name '" + string + "' is too long!");
         }
-        PlayerTeam cwj3 = this.getPlayerTeam(string);
-        if (cwj3 != null) {
+        PlayerTeam dfk3 = this.getPlayerTeam(string);
+        if (dfk3 != null) {
             throw new IllegalArgumentException("A team with the name '" + string + "' already exists!");
         }
-        cwj3 = new PlayerTeam(this, string);
-        this.teamsByName.put(string, cwj3);
-        this.onTeamAdded(cwj3);
-        return cwj3;
+        dfk3 = new PlayerTeam(this, string);
+        this.teamsByName.put(string, dfk3);
+        this.onTeamAdded(dfk3);
+        return dfk3;
     }
     
-    public void removePlayerTeam(final PlayerTeam cwj) {
-        this.teamsByName.remove(cwj.getName());
-        for (final String string4 : cwj.getPlayers()) {
+    public void removePlayerTeam(final PlayerTeam dfk) {
+        this.teamsByName.remove(dfk.getName());
+        for (final String string4 : dfk.getPlayers()) {
             this.teamsByPlayer.remove(string4);
         }
-        this.onTeamRemoved(cwj);
+        this.onTeamRemoved(dfk);
     }
     
-    public boolean addPlayerToTeam(final String string, final PlayerTeam cwj) {
+    public boolean addPlayerToTeam(final String string, final PlayerTeam dfk) {
         if (string.length() > 40) {
             throw new IllegalArgumentException("The player name '" + string + "' is too long!");
         }
         if (this.getPlayersTeam(string) != null) {
             this.removePlayerFromTeam(string);
         }
-        this.teamsByPlayer.put(string, cwj);
-        return cwj.getPlayers().add(string);
+        this.teamsByPlayer.put(string, dfk);
+        return dfk.getPlayers().add(string);
     }
     
     public boolean removePlayerFromTeam(final String string) {
-        final PlayerTeam cwj3 = this.getPlayersTeam(string);
-        if (cwj3 != null) {
-            this.removePlayerFromTeam(string, cwj3);
+        final PlayerTeam dfk3 = this.getPlayersTeam(string);
+        if (dfk3 != null) {
+            this.removePlayerFromTeam(string, dfk3);
             return true;
         }
         return false;
     }
     
-    public void removePlayerFromTeam(final String string, final PlayerTeam cwj) {
-        if (this.getPlayersTeam(string) != cwj) {
-            throw new IllegalStateException("Player is either on another team or not on any team. Cannot remove from team '" + cwj.getName() + "'.");
+    public void removePlayerFromTeam(final String string, final PlayerTeam dfk) {
+        if (this.getPlayersTeam(string) != dfk) {
+            throw new IllegalStateException("Player is either on another team or not on any team. Cannot remove from team '" + dfk.getName() + "'.");
         }
         this.teamsByPlayer.remove(string);
-        cwj.getPlayers().remove(string);
+        dfk.getPlayers().remove(string);
     }
     
     public Collection<String> getTeamNames() {
@@ -240,31 +240,31 @@ public class Scoreboard {
         return this.teamsByPlayer.get(string);
     }
     
-    public void onObjectiveAdded(final Objective cwi) {
+    public void onObjectiveAdded(final Objective dfj) {
     }
     
-    public void onObjectiveChanged(final Objective cwi) {
+    public void onObjectiveChanged(final Objective dfj) {
     }
     
-    public void onObjectiveRemoved(final Objective cwi) {
+    public void onObjectiveRemoved(final Objective dfj) {
     }
     
-    public void onScoreChanged(final Score cwk) {
+    public void onScoreChanged(final Score dfl) {
     }
     
     public void onPlayerRemoved(final String string) {
     }
     
-    public void onPlayerScoreRemoved(final String string, final Objective cwi) {
+    public void onPlayerScoreRemoved(final String string, final Objective dfj) {
     }
     
-    public void onTeamAdded(final PlayerTeam cwj) {
+    public void onTeamAdded(final PlayerTeam dfk) {
     }
     
-    public void onTeamChanged(final PlayerTeam cwj) {
+    public void onTeamChanged(final PlayerTeam dfk) {
     }
     
-    public void onTeamRemoved(final PlayerTeam cwj) {
+    public void onTeamRemoved(final PlayerTeam dfk) {
     }
     
     public static String getDisplaySlotName(final int integer) {
@@ -280,9 +280,9 @@ public class Scoreboard {
             }
             default: {
                 if (integer >= 3 && integer <= 18) {
-                    final ChatFormatting g2 = ChatFormatting.getById(integer - 3);
-                    if (g2 != null && g2 != ChatFormatting.RESET) {
-                        return "sidebar.team." + g2.getName();
+                    final ChatFormatting i2 = ChatFormatting.getById(integer - 3);
+                    if (i2 != null && i2 != ChatFormatting.RESET) {
+                        return "sidebar.team." + i2.getName();
                     }
                 }
                 return null;
@@ -302,9 +302,9 @@ public class Scoreboard {
         }
         if (string.startsWith("sidebar.team.")) {
             final String string2 = string.substring("sidebar.team.".length());
-            final ChatFormatting g3 = ChatFormatting.getByName(string2);
-            if (g3 != null && g3.getId() >= 0) {
-                return g3.getId() + 3;
+            final ChatFormatting i3 = ChatFormatting.getByName(string2);
+            if (i3 != null && i3.getId() >= 0) {
+                return i3.getId() + 3;
             }
         }
         return -1;
@@ -320,42 +320,42 @@ public class Scoreboard {
         return Scoreboard.displaySlotNames;
     }
     
-    public void entityRemoved(final Entity akq) {
-        if (akq == null || akq instanceof Player || akq.isAlive()) {
+    public void entityRemoved(final Entity aom) {
+        if (aom == null || aom instanceof Player || aom.isAlive()) {
             return;
         }
-        final String string3 = akq.getStringUUID();
+        final String string3 = aom.getStringUUID();
         this.resetPlayerScore(string3, null);
         this.removePlayerFromTeam(string3);
     }
     
     protected ListTag savePlayerScores() {
-        final ListTag jz2 = new ListTag();
-        final CompoundTag jt3;
+        final ListTag lk2 = new ListTag();
+        final CompoundTag le3;
         final AbstractList<CompoundTag> list;
-        this.playerScores.values().stream().map(Map::values).forEach(collection -> collection.stream().filter(cwk -> cwk.getObjective() != null).forEach(cwk -> {
-            jt3 = new CompoundTag();
-            jt3.putString("Name", cwk.getOwner());
-            jt3.putString("Objective", cwk.getObjective().getName());
-            jt3.putInt("Score", cwk.getScore());
-            jt3.putBoolean("Locked", cwk.isLocked());
-            list.add(jt3);
+        this.playerScores.values().stream().map(Map::values).forEach(collection -> collection.stream().filter(dfl -> dfl.getObjective() != null).forEach(dfl -> {
+            le3 = new CompoundTag();
+            le3.putString("Name", dfl.getOwner());
+            le3.putString("Objective", dfl.getObjective().getName());
+            le3.putInt("Score", dfl.getScore());
+            le3.putBoolean("Locked", dfl.isLocked());
+            list.add(le3);
         }));
-        return jz2;
+        return lk2;
     }
     
-    protected void loadPlayerScores(final ListTag jz) {
-        for (int integer3 = 0; integer3 < jz.size(); ++integer3) {
-            final CompoundTag jt4 = jz.getCompound(integer3);
-            final Objective cwi5 = this.getOrCreateObjective(jt4.getString("Objective"));
-            String string6 = jt4.getString("Name");
+    protected void loadPlayerScores(final ListTag lk) {
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            final CompoundTag le4 = lk.getCompound(integer3);
+            final Objective dfj5 = this.getOrCreateObjective(le4.getString("Objective"));
+            String string6 = le4.getString("Name");
             if (string6.length() > 40) {
                 string6 = string6.substring(0, 40);
             }
-            final Score cwk7 = this.getOrCreatePlayerScore(string6, cwi5);
-            cwk7.setScore(jt4.getInt("Score"));
-            if (jt4.contains("Locked")) {
-                cwk7.setLocked(jt4.getBoolean("Locked"));
+            final Score dfl7 = this.getOrCreatePlayerScore(string6, dfj5);
+            dfl7.setScore(le4.getInt("Score"));
+            if (le4.contains("Locked")) {
+                dfl7.setLocked(le4.getBoolean("Locked"));
             }
         }
     }
diff --git a/src/net/minecraft/world/scores/ScoreboardSaveData.java b/src/net/minecraft/world/scores/ScoreboardSaveData.java
index ed46f85..268ac00 100644
--- a/src/net/minecraft/world/scores/ScoreboardSaveData.java
+++ b/src/net/minecraft/world/scores/ScoreboardSaveData.java
@@ -23,190 +23,190 @@ public class ScoreboardSaveData extends SavedData {
         super("scoreboard");
     }
     
-    public void setScoreboard(final Scoreboard cwl) {
-        this.scoreboard = cwl;
+    public void setScoreboard(final Scoreboard dfm) {
+        this.scoreboard = dfm;
         if (this.delayLoad != null) {
             this.load(this.delayLoad);
         }
     }
     
     @Override
-    public void load(final CompoundTag jt) {
+    public void load(final CompoundTag le) {
         if (this.scoreboard == null) {
-            this.delayLoad = jt;
+            this.delayLoad = le;
             return;
         }
-        this.loadObjectives(jt.getList("Objectives", 10));
-        this.scoreboard.loadPlayerScores(jt.getList("PlayerScores", 10));
-        if (jt.contains("DisplaySlots", 10)) {
-            this.loadDisplaySlots(jt.getCompound("DisplaySlots"));
+        this.loadObjectives(le.getList("Objectives", 10));
+        this.scoreboard.loadPlayerScores(le.getList("PlayerScores", 10));
+        if (le.contains("DisplaySlots", 10)) {
+            this.loadDisplaySlots(le.getCompound("DisplaySlots"));
         }
-        if (jt.contains("Teams", 9)) {
-            this.loadTeams(jt.getList("Teams", 10));
+        if (le.contains("Teams", 9)) {
+            this.loadTeams(le.getList("Teams", 10));
         }
     }
     
-    protected void loadTeams(final ListTag jz) {
-        for (int integer3 = 0; integer3 < jz.size(); ++integer3) {
-            final CompoundTag jt4 = jz.getCompound(integer3);
-            String string5 = jt4.getString("Name");
+    protected void loadTeams(final ListTag lk) {
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            final CompoundTag le4 = lk.getCompound(integer3);
+            String string5 = le4.getString("Name");
             if (string5.length() > 16) {
                 string5 = string5.substring(0, 16);
             }
-            final PlayerTeam cwj6 = this.scoreboard.addPlayerTeam(string5);
-            final Component lf7 = Component.Serializer.fromJson(jt4.getString("DisplayName"));
-            if (lf7 != null) {
-                cwj6.setDisplayName(lf7);
+            final PlayerTeam dfk6 = this.scoreboard.addPlayerTeam(string5);
+            final Component mr7 = Component.Serializer.fromJson(le4.getString("DisplayName"));
+            if (mr7 != null) {
+                dfk6.setDisplayName(mr7);
             }
-            if (jt4.contains("TeamColor", 8)) {
-                cwj6.setColor(ChatFormatting.getByName(jt4.getString("TeamColor")));
+            if (le4.contains("TeamColor", 8)) {
+                dfk6.setColor(ChatFormatting.getByName(le4.getString("TeamColor")));
             }
-            if (jt4.contains("AllowFriendlyFire", 99)) {
-                cwj6.setAllowFriendlyFire(jt4.getBoolean("AllowFriendlyFire"));
+            if (le4.contains("AllowFriendlyFire", 99)) {
+                dfk6.setAllowFriendlyFire(le4.getBoolean("AllowFriendlyFire"));
             }
-            if (jt4.contains("SeeFriendlyInvisibles", 99)) {
-                cwj6.setSeeFriendlyInvisibles(jt4.getBoolean("SeeFriendlyInvisibles"));
+            if (le4.contains("SeeFriendlyInvisibles", 99)) {
+                dfk6.setSeeFriendlyInvisibles(le4.getBoolean("SeeFriendlyInvisibles"));
             }
-            if (jt4.contains("MemberNamePrefix", 8)) {
-                final Component lf8 = Component.Serializer.fromJson(jt4.getString("MemberNamePrefix"));
-                if (lf8 != null) {
-                    cwj6.setPlayerPrefix(lf8);
+            if (le4.contains("MemberNamePrefix", 8)) {
+                final Component mr8 = Component.Serializer.fromJson(le4.getString("MemberNamePrefix"));
+                if (mr8 != null) {
+                    dfk6.setPlayerPrefix(mr8);
                 }
             }
-            if (jt4.contains("MemberNameSuffix", 8)) {
-                final Component lf8 = Component.Serializer.fromJson(jt4.getString("MemberNameSuffix"));
-                if (lf8 != null) {
-                    cwj6.setPlayerSuffix(lf8);
+            if (le4.contains("MemberNameSuffix", 8)) {
+                final Component mr8 = Component.Serializer.fromJson(le4.getString("MemberNameSuffix"));
+                if (mr8 != null) {
+                    dfk6.setPlayerSuffix(mr8);
                 }
             }
-            if (jt4.contains("NameTagVisibility", 8)) {
-                final Team.Visibility b8 = Team.Visibility.byName(jt4.getString("NameTagVisibility"));
+            if (le4.contains("NameTagVisibility", 8)) {
+                final Team.Visibility b8 = Team.Visibility.byName(le4.getString("NameTagVisibility"));
                 if (b8 != null) {
-                    cwj6.setNameTagVisibility(b8);
+                    dfk6.setNameTagVisibility(b8);
                 }
             }
-            if (jt4.contains("DeathMessageVisibility", 8)) {
-                final Team.Visibility b8 = Team.Visibility.byName(jt4.getString("DeathMessageVisibility"));
+            if (le4.contains("DeathMessageVisibility", 8)) {
+                final Team.Visibility b8 = Team.Visibility.byName(le4.getString("DeathMessageVisibility"));
                 if (b8 != null) {
-                    cwj6.setDeathMessageVisibility(b8);
+                    dfk6.setDeathMessageVisibility(b8);
                 }
             }
-            if (jt4.contains("CollisionRule", 8)) {
-                final Team.CollisionRule a8 = Team.CollisionRule.byName(jt4.getString("CollisionRule"));
+            if (le4.contains("CollisionRule", 8)) {
+                final Team.CollisionRule a8 = Team.CollisionRule.byName(le4.getString("CollisionRule"));
                 if (a8 != null) {
-                    cwj6.setCollisionRule(a8);
+                    dfk6.setCollisionRule(a8);
                 }
             }
-            this.loadTeamPlayers(cwj6, jt4.getList("Players", 8));
+            this.loadTeamPlayers(dfk6, le4.getList("Players", 8));
         }
     }
     
-    protected void loadTeamPlayers(final PlayerTeam cwj, final ListTag jz) {
-        for (int integer4 = 0; integer4 < jz.size(); ++integer4) {
-            this.scoreboard.addPlayerToTeam(jz.getString(integer4), cwj);
+    protected void loadTeamPlayers(final PlayerTeam dfk, final ListTag lk) {
+        for (int integer4 = 0; integer4 < lk.size(); ++integer4) {
+            this.scoreboard.addPlayerToTeam(lk.getString(integer4), dfk);
         }
     }
     
-    protected void loadDisplaySlots(final CompoundTag jt) {
+    protected void loadDisplaySlots(final CompoundTag le) {
         for (int integer3 = 0; integer3 < 19; ++integer3) {
-            if (jt.contains("slot_" + integer3, 8)) {
-                final String string4 = jt.getString("slot_" + integer3);
-                final Objective cwi5 = this.scoreboard.getObjective(string4);
-                this.scoreboard.setDisplayObjective(integer3, cwi5);
+            if (le.contains("slot_" + integer3, 8)) {
+                final String string4 = le.getString("slot_" + integer3);
+                final Objective dfj5 = this.scoreboard.getObjective(string4);
+                this.scoreboard.setDisplayObjective(integer3, dfj5);
             }
         }
     }
     
-    protected void loadObjectives(final ListTag jz) {
-        for (int integer3 = 0; integer3 < jz.size(); ++integer3) {
-            final CompoundTag jt4 = jz.getCompound(integer3);
+    protected void loadObjectives(final ListTag lk) {
+        for (int integer3 = 0; integer3 < lk.size(); ++integer3) {
+            final CompoundTag le4 = lk.getCompound(integer3);
             final CompoundTag compoundTag;
             String string4;
-            final Component lf5;
+            final Component mr5;
             final ObjectiveCriteria.RenderType a6;
-            ObjectiveCriteria.byName(jt4.getString("CriteriaName")).ifPresent(cwo -> {
+            ObjectiveCriteria.byName(le4.getString("CriteriaName")).ifPresent(dfp -> {
                 string4 = compoundTag.getString("Name");
                 if (string4.length() > 16) {
                     string4 = string4.substring(0, 16);
                 }
-                lf5 = Component.Serializer.fromJson(compoundTag.getString("DisplayName"));
+                mr5 = Component.Serializer.fromJson(compoundTag.getString("DisplayName"));
                 a6 = ObjectiveCriteria.RenderType.byId(compoundTag.getString("RenderType"));
-                this.scoreboard.addObjective(string4, cwo, lf5, a6);
+                this.scoreboard.addObjective(string4, dfp, mr5, a6);
                 return;
             });
         }
     }
     
     @Override
-    public CompoundTag save(final CompoundTag jt) {
+    public CompoundTag save(final CompoundTag le) {
         if (this.scoreboard == null) {
             ScoreboardSaveData.LOGGER.warn("Tried to save scoreboard without having a scoreboard...");
-            return jt;
+            return le;
         }
-        jt.put("Objectives", this.saveObjectives());
-        jt.put("PlayerScores", this.scoreboard.savePlayerScores());
-        jt.put("Teams", this.saveTeams());
-        this.saveDisplaySlots(jt);
-        return jt;
+        le.put("Objectives", this.saveObjectives());
+        le.put("PlayerScores", this.scoreboard.savePlayerScores());
+        le.put("Teams", this.saveTeams());
+        this.saveDisplaySlots(le);
+        return le;
     }
     
     protected ListTag saveTeams() {
-        final ListTag jz2 = new ListTag();
+        final ListTag lk2 = new ListTag();
         final Collection<PlayerTeam> collection3 = this.scoreboard.getPlayerTeams();
-        for (final PlayerTeam cwj5 : collection3) {
-            final CompoundTag jt6 = new CompoundTag();
-            jt6.putString("Name", cwj5.getName());
-            jt6.putString("DisplayName", Component.Serializer.toJson(cwj5.getDisplayName()));
-            if (cwj5.getColor().getId() >= 0) {
-                jt6.putString("TeamColor", cwj5.getColor().getName());
+        for (final PlayerTeam dfk5 : collection3) {
+            final CompoundTag le6 = new CompoundTag();
+            le6.putString("Name", dfk5.getName());
+            le6.putString("DisplayName", Component.Serializer.toJson(dfk5.getDisplayName()));
+            if (dfk5.getColor().getId() >= 0) {
+                le6.putString("TeamColor", dfk5.getColor().getName());
             }
-            jt6.putBoolean("AllowFriendlyFire", cwj5.isAllowFriendlyFire());
-            jt6.putBoolean("SeeFriendlyInvisibles", cwj5.canSeeFriendlyInvisibles());
-            jt6.putString("MemberNamePrefix", Component.Serializer.toJson(cwj5.getPlayerPrefix()));
-            jt6.putString("MemberNameSuffix", Component.Serializer.toJson(cwj5.getPlayerSuffix()));
-            jt6.putString("NameTagVisibility", cwj5.getNameTagVisibility().name);
-            jt6.putString("DeathMessageVisibility", cwj5.getDeathMessageVisibility().name);
-            jt6.putString("CollisionRule", cwj5.getCollisionRule().name);
-            final ListTag jz3 = new ListTag();
-            for (final String string9 : cwj5.getPlayers()) {
-                ((AbstractList<StringTag>)jz3).add(StringTag.valueOf(string9));
+            le6.putBoolean("AllowFriendlyFire", dfk5.isAllowFriendlyFire());
+            le6.putBoolean("SeeFriendlyInvisibles", dfk5.canSeeFriendlyInvisibles());
+            le6.putString("MemberNamePrefix", Component.Serializer.toJson(dfk5.getPlayerPrefix()));
+            le6.putString("MemberNameSuffix", Component.Serializer.toJson(dfk5.getPlayerSuffix()));
+            le6.putString("NameTagVisibility", dfk5.getNameTagVisibility().name);
+            le6.putString("DeathMessageVisibility", dfk5.getDeathMessageVisibility().name);
+            le6.putString("CollisionRule", dfk5.getCollisionRule().name);
+            final ListTag lk3 = new ListTag();
+            for (final String string9 : dfk5.getPlayers()) {
+                ((AbstractList<StringTag>)lk3).add(StringTag.valueOf(string9));
             }
-            jt6.put("Players", jz3);
-            ((AbstractList<CompoundTag>)jz2).add(jt6);
+            le6.put("Players", lk3);
+            ((AbstractList<CompoundTag>)lk2).add(le6);
         }
-        return jz2;
+        return lk2;
     }
     
-    protected void saveDisplaySlots(final CompoundTag jt) {
-        final CompoundTag jt2 = new CompoundTag();
+    protected void saveDisplaySlots(final CompoundTag le) {
+        final CompoundTag le2 = new CompoundTag();
         boolean boolean4 = false;
         for (int integer5 = 0; integer5 < 19; ++integer5) {
-            final Objective cwi6 = this.scoreboard.getDisplayObjective(integer5);
-            if (cwi6 != null) {
-                jt2.putString("slot_" + integer5, cwi6.getName());
+            final Objective dfj6 = this.scoreboard.getDisplayObjective(integer5);
+            if (dfj6 != null) {
+                le2.putString("slot_" + integer5, dfj6.getName());
                 boolean4 = true;
             }
         }
         if (boolean4) {
-            jt.put("DisplaySlots", jt2);
+            le.put("DisplaySlots", le2);
         }
     }
     
     protected ListTag saveObjectives() {
-        final ListTag jz2 = new ListTag();
+        final ListTag lk2 = new ListTag();
         final Collection<Objective> collection3 = this.scoreboard.getObjectives();
-        for (final Objective cwi5 : collection3) {
-            if (cwi5.getCriteria() == null) {
+        for (final Objective dfj5 : collection3) {
+            if (dfj5.getCriteria() == null) {
                 continue;
             }
-            final CompoundTag jt6 = new CompoundTag();
-            jt6.putString("Name", cwi5.getName());
-            jt6.putString("CriteriaName", cwi5.getCriteria().getName());
-            jt6.putString("DisplayName", Component.Serializer.toJson(cwi5.getDisplayName()));
-            jt6.putString("RenderType", cwi5.getRenderType().getId());
-            ((AbstractList<CompoundTag>)jz2).add(jt6);
+            final CompoundTag le6 = new CompoundTag();
+            le6.putString("Name", dfj5.getName());
+            le6.putString("CriteriaName", dfj5.getCriteria().getName());
+            le6.putString("DisplayName", Component.Serializer.toJson(dfj5.getDisplayName()));
+            le6.putString("RenderType", dfj5.getRenderType().getId());
+            ((AbstractList<CompoundTag>)lk2).add(le6);
         }
-        return jz2;
+        return lk2;
     }
     
     static {
diff --git a/src/net/minecraft/world/scores/Team.java b/src/net/minecraft/world/scores/Team.java
index 52ed2cf..8dac17a 100644
--- a/src/net/minecraft/world/scores/Team.java
+++ b/src/net/minecraft/world/scores/Team.java
@@ -6,17 +6,18 @@ import net.minecraft.network.chat.TranslatableComponent;
 import java.util.Map;
 import java.util.Collection;
 import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.Component;
 import javax.annotation.Nullable;
 
 public abstract class Team {
-    public boolean isAlliedTo(@Nullable final Team cwn) {
-        return cwn != null && this == cwn;
+    public boolean isAlliedTo(@Nullable final Team dfo) {
+        return dfo != null && this == dfo;
     }
     
     public abstract String getName();
     
-    public abstract Component getFormattedName(final Component lf);
+    public abstract MutableComponent getFormattedName(final Component mr);
     
     public abstract boolean canSeeFriendlyInvisibles();
     
@@ -53,7 +54,7 @@ public abstract class Team {
         }
         
         public Component getDisplayName() {
-            return new TranslatableComponent("team.visibility." + this.name, new Object[0]);
+            return new TranslatableComponent("team.visibility." + this.name);
         }
         
         static {
@@ -82,7 +83,7 @@ public abstract class Team {
         }
         
         public Component getDisplayName() {
-            return new TranslatableComponent("team.collision." + this.name, new Object[0]);
+            return new TranslatableComponent("team.collision." + this.name);
         }
         
         static {
diff --git a/src/net/minecraft/world/scores/criteria/ObjectiveCriteria.java b/src/net/minecraft/world/scores/criteria/ObjectiveCriteria.java
index c7e2cdc..1445961 100644
--- a/src/net/minecraft/world/scores/criteria/ObjectiveCriteria.java
+++ b/src/net/minecraft/world/scores/criteria/ObjectiveCriteria.java
@@ -48,11 +48,11 @@ public class ObjectiveCriteria {
         if (integer2 < 0) {
             return Optional.<ObjectiveCriteria>empty();
         }
-        return Registry.STAT_TYPE.getOptional(ResourceLocation.of(string.substring(0, integer2), '.')).<ObjectiveCriteria>flatMap(aaq -> ObjectiveCriteria.getStat(aaq, ResourceLocation.of(string.substring(integer2 + 1), '.')));
+        return Registry.STAT_TYPE.getOptional(ResourceLocation.of(string.substring(0, integer2), '.')).<ObjectiveCriteria>flatMap(act -> ObjectiveCriteria.getStat(act, ResourceLocation.of(string.substring(integer2 + 1), '.')));
     }
     
-    private static <T> Optional<ObjectiveCriteria> getStat(final StatType<T> aaq, final ResourceLocation sm) {
-        return aaq.getRegistry().getOptional(sm).<ObjectiveCriteria>map(aaq::get);
+    private static <T> Optional<ObjectiveCriteria> getStat(final StatType<T> act, final ResourceLocation uh) {
+        return act.getRegistry().getOptional(uh).<ObjectiveCriteria>map(act::get);
     }
     
     public String getName() {